From 246cdba79c650db614d2b4d633d2b9a5bd94f11b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20G=C3=B6cer?= <dev@hig.dev>
Date: Thu, 18 Apr 2024 18:37:33 +0200
Subject: [PATCH 001/314] feat: implement monitoring section

---
 .../lib/common_views/standard_table.dart      |   4 +-
 .../participant_details_form_controller.dart  |  42 ++++
 .../participant_details_form_view.dart        |  46 +++++
 .../features/monitor/study_monitor_page.dart  | 109 +++++++++-
 .../features/monitor/study_monitor_table.dart | 188 ++++++++++++++++++
 designer_v2/lib/localization/app_de.arb       |  17 ++
 designer_v2/lib/localization/app_en.arb       |  17 ++
 designer_v2/pubspec.lock                      |   2 +-
 designer_v2/pubspec.yaml                      |   1 +
 9 files changed, 417 insertions(+), 9 deletions(-)
 create mode 100644 designer_v2/lib/features/monitor/participant_details_form_controller.dart
 create mode 100644 designer_v2/lib/features/monitor/participant_details_form_view.dart
 create mode 100644 designer_v2/lib/features/monitor/study_monitor_table.dart

diff --git a/designer_v2/lib/common_views/standard_table.dart b/designer_v2/lib/common_views/standard_table.dart
index 912d93785..9285867d7 100644
--- a/designer_v2/lib/common_views/standard_table.dart
+++ b/designer_v2/lib/common_views/standard_table.dart
@@ -52,6 +52,7 @@ class StandardTable<T> extends StatefulWidget {
     this.cellSpacing = 10.0,
     this.rowSpacing = 9.0,
     this.minRowHeight = 60.0,
+    this.headerMaxLines = 1,
     this.showTableHeader = true,
     this.tableWrapper,
     this.leadingWidget,
@@ -98,6 +99,7 @@ class StandardTable<T> extends StatefulWidget {
   final double rowSpacing;
   final double? minRowHeight;
 
+  final int headerMaxLines;
   final bool showTableHeader;
   final bool hideLeadingTrailingWhenEmpty;
 
@@ -329,7 +331,7 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
                   Text(
                     columns[i].label,
                     overflow: TextOverflow.visible,
-                    maxLines: 1,
+                    maxLines: widget.headerMaxLines,
                     softWrap: false,
                     style: theme.textTheme.bodySmall!.copyWith(
                       color: theme.colorScheme.onSurface.withOpacity(0.8),
diff --git a/designer_v2/lib/features/monitor/participant_details_form_controller.dart b/designer_v2/lib/features/monitor/participant_details_form_controller.dart
new file mode 100644
index 000000000..90f8ec706
--- /dev/null
+++ b/designer_v2/lib/features/monitor/participant_details_form_controller.dart
@@ -0,0 +1,42 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:reactive_forms/reactive_forms.dart';
+import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
+import 'package:studyu_designer_v2/features/monitor/study_monitor_table.dart';
+import 'package:studyu_designer_v2/localization/app_translation.dart';
+
+class ParticipantDetailsFormViewModel extends FormViewModel<StudyMonitorItem> {
+  ParticipantDetailsFormViewModel() : super();
+
+  @override
+  Map<FormMode, String> get titles => {
+        FormMode.create: tr.participant_details_title,
+        FormMode.readonly: tr.participant_details_title,
+      };
+
+  final participantIdControl = FormControl<String>(value: '');
+
+  final rawDataControl = FormControl<String>(value: '');
+
+  @override
+  late final form = FormGroup({
+    'participantId': participantIdControl,
+    'rawData': rawDataControl,
+  });
+
+  @override
+  void initControls() {}
+
+  @override
+  StudyMonitorItem buildFormData() {
+    throw UnsupportedError("This form is read-only");
+  }
+
+  @override
+  void setControlsFrom(StudyMonitorItem data) {
+    participantIdControl.value = data.participantId;
+    rawDataControl.value = data.rawData;
+  }
+}
+
+final participantDetailsFormViewModelProvider = Provider.autoDispose
+    .family<ParticipantDetailsFormViewModel, StudyMonitorItem>((ref, item) => ParticipantDetailsFormViewModel());
diff --git a/designer_v2/lib/features/monitor/participant_details_form_view.dart b/designer_v2/lib/features/monitor/participant_details_form_view.dart
new file mode 100644
index 000000000..4d30104ef
--- /dev/null
+++ b/designer_v2/lib/features/monitor/participant_details_form_view.dart
@@ -0,0 +1,46 @@
+import 'package:flutter/material.dart';
+import 'package:reactive_forms/reactive_forms.dart';
+import 'package:studyu_designer_v2/common_views/form_consumer_widget.dart';
+import 'package:studyu_designer_v2/common_views/form_table_layout.dart';
+import 'package:studyu_designer_v2/features/monitor/participant_details_form_controller.dart';
+import 'package:studyu_designer_v2/localization/app_translation.dart';
+
+class ParticipantDetailsFormView extends FormConsumerWidget {
+  const ParticipantDetailsFormView({required this.formViewModel, super.key});
+
+  final ParticipantDetailsFormViewModel formViewModel;
+
+  @override
+  Widget build(BuildContext context, FormGroup form) {
+    return Column(
+      children: [
+        FormTableLayout(rows: [
+          FormTableRow(
+            label: tr.monitoring_table_column_participant_id,
+            labelStyle: const TextStyle(fontWeight: FontWeight.bold),
+            control: formViewModel.participantIdControl,
+            input: ReactiveTextField(
+              formControl: formViewModel.participantIdControl,
+              readOnly: true,
+            ),
+          ),
+        ]),
+        const SizedBox(height: 16.0),
+        Align(
+          alignment: Alignment.centerLeft,
+          child: FormLabel(
+              labelText: tr.participant_details_raw_data,
+              labelTextStyle: const TextStyle(
+                fontWeight: FontWeight.bold,
+              )),
+        ),
+        const SizedBox(height: 8.0),
+        ReactiveTextField(
+          formControl: formViewModel.rawDataControl,
+          maxLines: null,
+          readOnly: true,
+        ),
+      ],
+    );
+  }
+}
diff --git a/designer_v2/lib/features/monitor/study_monitor_page.dart b/designer_v2/lib/features/monitor/study_monitor_page.dart
index 4b8a7aee7..83193aa43 100644
--- a/designer_v2/lib/features/monitor/study_monitor_page.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_page.dart
@@ -1,20 +1,115 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:studyu_designer_v2/common_views/under_construction.dart';
+import 'package:studyu_core/core.dart';
+import 'package:studyu_designer_v2/common_views/async_value_widget.dart';
+import 'package:studyu_designer_v2/common_views/empty_body.dart';
+import 'package:studyu_designer_v2/common_views/form_buttons.dart';
+import 'package:studyu_designer_v2/common_views/sidesheet/sidesheet_form.dart';
+import 'package:studyu_designer_v2/common_views/utils.dart';
+import 'package:studyu_designer_v2/features/monitor/participant_details_form_controller.dart';
+import 'package:studyu_designer_v2/features/monitor/participant_details_form_view.dart';
+import 'package:studyu_designer_v2/features/monitor/study_monitor_table.dart';
+import 'package:studyu_designer_v2/features/study/study_controller.dart';
 import 'package:studyu_designer_v2/features/study/study_page_view.dart';
+import 'package:studyu_designer_v2/localization/app_translation.dart';
 
 class StudyMonitorScreen extends StudyPageWidget {
   const StudyMonitorScreen(super.studyId, {super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    return Container(
-      width: double.infinity,
-      color: Theme.of(context).colorScheme.secondary.withOpacity(0.03),
-      height: 300,
-      child: const Center(
-        child: UnderConstruction(),
+    final state = ref.watch(studyControllerProvider(studyId));
+    return AsyncValueWidget<Study>(
+        value: state.study,
+        data: (study) {
+          final studyMonitorItems = StudyMonitorItem.fromStudy(study);
+          return Column(
+            mainAxisAlignment: MainAxisAlignment.start,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: <Widget>[
+              _monitorSectionHeader(context, study),
+              const SizedBox(height: 40.0), // spacing between body elements
+              studyMonitorItems.isNotEmpty
+                  ? StudyMonitorTable(
+                      studyMonitorItems: studyMonitorItems,
+                      onSelectItem: (item) => _onSelectParticipant(context, ref, item),
+                    )
+                  : EmptyBody(
+                      icon: Icons.person_off_rounded,
+                      title: tr.monitoring_no_participants_title,
+                      description: tr.monitoring_no_participants_description),
+            ],
+          );
+        });
+  }
+
+  Widget _monitorSectionHeader(BuildContext context, Study study) {
+    // Using study.participants.length because participantCount does not include soft deleted participants
+    final enrolled = study.participants?.length ?? study.participantCount;
+    // Active participants are those who were active in the last 3 days
+    final active = study.activeSubjectCount;
+    // Ended participants are those with days in study >= study duration
+    final ended = study.endedCount;
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        SelectableText(tr.monitoring_participants_title, style: Theme.of(context).textTheme.headlineSmall),
+        const Spacer(),
+        Expanded(
+          child: Row(
+            children: [
+              Expanded(
+                  child: _buildStat(context, tr.monitoring_active, tr.monitoring_active_tooltip, active, enrolled)),
+              const SizedBox(width: 20.0),
+              Expanded(child: _buildStat(context, tr.monitoring_ended, tr.monitoring_ended_tooltip, ended, enrolled)),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildStat(BuildContext context, String title, String tooltip, int value, int total) {
+    final theme = Theme.of(context);
+    return Tooltip(
+      message: tooltip,
+      child: Column(
+        children: [
+          Row(
+            children: [
+              Text("$title:"),
+              const SizedBox(width: 8.0),
+              Text("$value/$total", style: theme.textTheme.headlineSmall),
+            ],
+          ),
+          SizedBox(
+              height: 4.0,
+              child: LinearProgressIndicator(
+                value: total <= 0 ? 0 : value / total,
+                backgroundColor: theme.colorScheme.secondary.withOpacity(0.2),
+                valueColor: AlwaysStoppedAnimation(theme.colorScheme.secondary),
+              )),
+        ],
+      ),
+    );
+  }
+
+  _onSelectParticipant(BuildContext context, WidgetRef ref, StudyMonitorItem item) {
+    // TODO: refactor to use [RoutingIntent] for sidesheet (so that it can be triggered from controller)
+    final formViewModel = ref.read(participantDetailsFormViewModelProvider(item));
+    formViewModel.setControlsFrom(item);
+    showFormSideSheet<ParticipantDetailsFormViewModel>(
+      context: context,
+      formViewModel: formViewModel,
+      formViewBuilder: (formViewModel) => ParticipantDetailsFormView(
+        formViewModel: formViewModel,
       ),
+      actionButtons: [
+        retainSizeInAppBar(DismissButton(
+          text: tr.dialog_close,
+          onPressed: () => Navigator.maybePop(context),
+        ))
+      ],
     );
   }
 }
diff --git a/designer_v2/lib/features/monitor/study_monitor_table.dart b/designer_v2/lib/features/monitor/study_monitor_table.dart
new file mode 100644
index 000000000..be7b3ff9e
--- /dev/null
+++ b/designer_v2/lib/features/monitor/study_monitor_table.dart
@@ -0,0 +1,188 @@
+import 'dart:convert';
+import 'dart:math';
+
+import 'package:equatable/equatable.dart';
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:studyu_core/core.dart';
+import 'package:studyu_designer_v2/common_views/standard_table.dart';
+import 'package:studyu_designer_v2/localization/app_translation.dart';
+
+class StudyMonitorItem extends Equatable {
+  final String participantId;
+  final String? inviteCode;
+  final DateTime enrolledAt;
+  final DateTime lastActivityAt;
+  final int currentDayOfStudy;
+  final int studyDurationInDays;
+  final int completedInterventions;
+  final int missedInterventions;
+  final int completedSurveys;
+  final int missedSurveys;
+  final String rawData;
+
+  const StudyMonitorItem({
+    required this.participantId,
+    required this.inviteCode,
+    required this.enrolledAt,
+    required this.lastActivityAt,
+    required this.currentDayOfStudy,
+    required this.studyDurationInDays,
+    required this.completedInterventions,
+    required this.missedInterventions,
+    required this.completedSurveys,
+    required this.missedSurveys,
+    required this.rawData,
+  });
+
+  static List<StudyMonitorItem> fromStudy(Study study) {
+    final List<StudyMonitorItem> items = [];
+
+    final participants = study.participants ?? [];
+    final participantsProgress = study.participantsProgress ?? [];
+
+    participants.sort((a, b) => a.startedAt!.compareTo(b.startedAt!)); // ascending
+
+    for (final participant in participants) {
+      final progresses = participantsProgress.where((progress) => progress.subjectId == participant.id).toList();
+      progresses.sort((b, a) => a.completedAt!.compareTo(b.completedAt!)); // descending
+      final interventions = participant.selectedInterventionIds;
+      final lastActivityAt = progresses.isNotEmpty ? progresses.first.completedAt! : participant.startedAt!;
+      final studyDurationInDays = study.schedule.length;
+      final currentDayOfStudy =
+          min(studyDurationInDays, DateTime.now().toUtc().difference(participant.startedAt!).inDays);
+      final daysInBaseline = study.schedule.includeBaseline ? study.schedule.phaseDuration : 0;
+
+      final totalInterventions = max(0, currentDayOfStudy - daysInBaseline) * interventions.length;
+      final totalSurveys = currentDayOfStudy * study.observations.length;
+
+      final completedInterventions = progresses.where((p) => p.resultType == "bool").toList();
+      final completedSurveys = progresses.where((p) => p.resultType != "bool").toList();
+
+      final missedInterventions = totalInterventions - completedInterventions.length;
+      final missedSurveys = totalSurveys - completedSurveys.length;
+
+      final rawDataDict = {
+        "participant": participant.toJson(),
+        "interventions": completedInterventions.map((p) => p.toJson()).toList(),
+        "surveys": completedSurveys.map((p) => p.toJson()).toList(),
+      };
+
+      final rawData = const JsonEncoder.withIndent('    ').convert(rawDataDict);
+
+      items.add(StudyMonitorItem(
+        participantId: participant.id,
+        inviteCode: participant.inviteCode,
+        enrolledAt: participant.startedAt!,
+        lastActivityAt: lastActivityAt,
+        currentDayOfStudy: currentDayOfStudy,
+        studyDurationInDays: studyDurationInDays,
+        completedInterventions: completedInterventions.length,
+        missedInterventions: missedInterventions,
+        completedSurveys: completedSurveys.length,
+        missedSurveys: missedSurveys,
+        rawData: rawData,
+      ));
+    }
+
+    return items;
+  }
+
+  @override
+  List<Object?> get props => [participantId];
+}
+
+class StudyMonitorTable extends StatelessWidget {
+  final List<StudyMonitorItem> studyMonitorItems;
+  final OnSelectHandler<StudyMonitorItem> onSelectItem;
+
+  const StudyMonitorTable({required this.studyMonitorItems, required this.onSelectItem, super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return StandardTable<StudyMonitorItem>(
+      items: studyMonitorItems,
+      columns: [
+        StandardTableColumn(
+            label: tr.monitoring_table_column_participant_id,
+            columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth(1.6))),
+        StandardTableColumn(
+            label: tr.monitoring_table_column_invite_code,
+            columnWidth: const MaxColumnWidth(FixedColumnWidth(200), FlexColumnWidth(1.6))),
+        StandardTableColumn(
+            label: tr.monitoring_table_column_enrolled,
+            columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth(1.6))),
+        StandardTableColumn(
+            label: tr.monitoring_table_column_last_activity,
+            columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth(1.6))),
+        StandardTableColumn(
+            label: tr.monitoring_table_column_day_in_study,
+            columnWidth: const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.6))),
+        StandardTableColumn(
+            label: tr.monitoring_table_column_completed_interventions,
+            columnWidth: const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.6))),
+        StandardTableColumn(
+            label: tr.monitoring_table_column_completed_surveys,
+            columnWidth: const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.6))),
+      ],
+      buildCellsAt: _buildRow,
+      cellSpacing: 10.0,
+      rowSpacing: 5.0,
+      minRowHeight: 30.0,
+      headerMaxLines: 2,
+      onSelectItem: onSelectItem,
+    );
+  }
+
+  List<Widget> _buildRow(BuildContext context, StudyMonitorItem item, int rowIdx, Set<MaterialState> states) {
+    return [
+      Tooltip(
+        message: item.participantId,
+        child: Text(item.participantId.split("-").first),
+      ),
+      Text(item.inviteCode ?? "-"),
+      Tooltip(
+        message: _formatTime(item.enrolledAt, true),
+        child: Text(_formatTime(item.enrolledAt, false)),
+      ),
+      Tooltip(
+        message: _formatTime(item.lastActivityAt, true),
+        child: Text(_formatTime(item.lastActivityAt, false)),
+      ),
+      _buildProgressCell(context, item.currentDayOfStudy, item.studyDurationInDays),
+      _buildProgressCell(context, item.completedInterventions, item.completedInterventions + item.missedInterventions),
+      _buildProgressCell(context, item.completedSurveys, item.completedSurveys + item.missedSurveys),
+    ];
+  }
+
+  String _formatTime(DateTime time, bool showTime) {
+    final localTime = time.toLocal();
+    final timeZoneOffsetInHours = localTime.timeZoneOffset.inHours;
+    final timeZoneString = timeZoneOffsetInHours >= 0 ? "GMT +$timeZoneOffsetInHours" : "GMT $timeZoneOffsetInHours";
+    final locale = tr.localeName == "de" ? "de_DE" : "en_US";
+    final formattedDate = DateFormat("MMM d, yyyy", locale);
+    if (!showTime) return formattedDate.format(localTime);
+    final formattedTime = DateFormat.jm(locale);
+    return "${formattedDate.format(localTime)}, ${formattedTime.format(localTime)} $timeZoneString";
+  }
+
+  Widget _buildProgressCell(BuildContext context, int progress, int total) {
+    final theme = Theme.of(context);
+    return Stack(
+      children: [
+        SizedBox.expand(
+          child: LinearProgressIndicator(
+            value: total <= 0 ? 0 : progress / total,
+            backgroundColor: theme.primaryColor.withOpacity(0.7),
+            valueColor: AlwaysStoppedAnimation<Color>(theme.primaryColor),
+          ),
+        ),
+        Align(
+          alignment: Alignment.center,
+          child: Text("$progress/$total",
+              style: TextStyle(color: theme.colorScheme.onPrimary, fontWeight: FontWeight.bold)),
+        ),
+      ],
+    );
+  }
+}
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index 08dd0bff9..cf780d847 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -473,6 +473,23 @@
   "action_button_code_new": "Neuer Code",
   "notification_code_deleted": "Teilnahmecode gelöscht",
   "notification_code_clipboard": "Code wurde in die Zwischenablage kopiert",
+  "@__________________STUDYPAGE_MONITOR__________________": {},
+  "participant_details_title": "Teilnehmerdetails",
+  "participant_details_raw_data": "Rohdaten",
+  "monitoring_no_participants_title": "Es gibt noch keine Teilnehmer in dieser Studie",
+  "monitoring_no_participants_description": "Sobald Teilnehmer in Ihrer Studie eingeschrieben sind, können Sie hier deren Fortschritt überwachen und ihre Daten einsehen.",
+  "monitoring_participants_title": "Teilnehmer",
+  "monitoring_active": "Aktiv",
+  "monitoring_active_tooltip": "Anzahl der Teilnehmer, die in den letzten 3 Tagen aktiv waren",
+  "monitoring_ended": "Beendet",
+  "monitoring_ended_tooltip": "Anzahl der Teilnehmer, die das Ende der Studie erreicht haben",
+  "monitoring_table_column_participant_id": "Teilnehmer-ID",
+  "monitoring_table_column_invite_code": "Einladungscode",
+  "monitoring_table_column_enrolled": "Eingeschrieben",
+  "monitoring_table_column_last_activity": "Letzte Aktivität",
+  "monitoring_table_column_day_in_study": "Studientag",
+  "monitoring_table_column_completed_interventions": "Abgeschlossene\nInterventionen",
+  "monitoring_table_column_completed_surveys": "Abgeschlossene\nFragebögen",
   "@__________________STUDYPAGE_ANALYZE__________________": {},
   "banner_text_study_analyze_draft": "Solange die Studie noch nicht live ist, basieren die Ergebnisse hier auf dem letzten Testlauf der Studie (siehe Testmodus).\nDie Ergebnisdaten werden automatisch zurückgesetzt sobald die Studie mit echten Teilnehmern startet.",
   "action_button_study_export": "Daten exportieren",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index 33e423333..6ee1ae956 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -519,6 +519,23 @@
   "code_list_empty_description": "Add participants to your study via access codes.",
   "code_list_header_code": "Code",
   "action_button_code_new": "New code",
+  "@__________________STUDYPAGE_MONITOR__________________": {},
+  "participant_details_title": "Participant Details",
+  "participant_details_raw_data": "Raw Data",
+  "monitoring_no_participants_title": "There are no participants in this study yet",
+  "monitoring_no_participants_description": "Once participants have enrolled in your study, you can monitor their progress and view their data here.",
+  "monitoring_participants_title": "Participants",
+  "monitoring_active": "Active",
+  "monitoring_active_tooltip": "Number of participants that were active in the last 3 days",
+  "monitoring_ended": "Ended",
+  "monitoring_ended_tooltip": "Number of participants who reached the end of the study",
+  "monitoring_table_column_participant_id": "Participant ID",
+  "monitoring_table_column_invite_code": "Invite Code",
+  "monitoring_table_column_enrolled": "Enrolled",
+  "monitoring_table_column_last_activity": "Last Activity",
+  "monitoring_table_column_day_in_study": "Day in Study",
+  "monitoring_table_column_completed_interventions": "Completed\nInterventions",
+  "monitoring_table_column_completed_surveys": "Completed\nSurveys",
   "@__________________STUDYPAGE_ANALYZE__________________": {},
   "banner_text_study_analyze_draft": "Because this study has not been launched yet, this page is currently based on the data generated during study testing (only the latest test session).\nThe data on this page will be reset once you launch the study with real participants.",
   "action_button_study_export": "Export data",
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 03c407eaf..848d1fa09 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -405,7 +405,7 @@ packages:
     source: sdk
     version: "0.0.0"
   intl:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: intl
       sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 460b8affe..dfb2ed1d7 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -24,6 +24,7 @@ dependencies:
   flutter_web_plugins:
     sdk: flutter
   go_router: ^13.2.1
+  intl:
   material_color_utilities:
   material_design_icons_flutter: ^7.0.7296
   pointer_interceptor: ^0.10.1

From aedd46d3cb683ee7e720873eddfb4af300f56ce4 Mon Sep 17 00:00:00 2001
From: StudyU Documenter <studyu-documenter>
Date: Thu, 18 Apr 2024 16:40:14 +0000
Subject: [PATCH 002/314] docs: update UML documentation

---
 docs/uml/designer_v2/lib/common_views/uml.svg |  3624 +--
 .../designer_v2/lib/features/monitor/uml.svg  |   297 +-
 docs/uml/designer_v2/lib/features/uml.svg     | 11386 ++++-----
 docs/uml/designer_v2/lib/uml.svg              | 20514 ++++++++--------
 4 files changed, 18267 insertions(+), 17554 deletions(-)

diff --git a/docs/uml/designer_v2/lib/common_views/uml.svg b/docs/uml/designer_v2/lib/common_views/uml.svg
index 425f28f48..315b900bc 100644
--- a/docs/uml/designer_v2/lib/common_views/uml.svg
+++ b/docs/uml/designer_v2/lib/common_views/uml.svg
@@ -1,40 +1,59 @@
-<svg version="1.1" baseProfile="full" width="21546.0" height="982.0" viewbox="0 0 21546 982" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;ISyncIndicatorViewModel
+<svg version="1.1" baseProfile="full" width="19632.8" height="997.0" viewbox="0 0 19632.75 997" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[AsyncValueWidget
 	  |
-	  +isDirty: bool;
-	  +lastSynced: DateTime?
-	]
-	
-	[SyncIndicator
+	  +value: AsyncValue&lt;T&gt;;
+	  +data: Widget Function(T);
+	  +error: Widget Function(Object, StackTrace?)?;
+	  +loading: Widget Function()?;
+	  +empty: Widget Function()?
 	  |
-	  +state: AsyncValue&lt;T&gt;;
-	  +lastSynced: DateTime?;
-	  +isDirty: bool;
-	  +animationDuration: int;
-	  +iconSize: double
+	  +Widget build();
+	  -Widget _buildDataOrEmptyWidget();
+	  -Widget _defaultError();
+	  -Widget _defaultLoad()
 	]
 	
-	[SyncIndicator]o-[&lt;abstract&gt;AsyncValue]
+	[AsyncValueWidget]o-[&lt;abstract&gt;AsyncValue]
+	[AsyncValueWidget]o-[Widget Function(T)]
+	[AsyncValueWidget]o-[Widget Function(Object, StackTrace?)?]
+	[AsyncValueWidget]o-[Widget Function()?]
 	
-	[EmptyBody
+	[FormControlLabel
 	  |
-	  +icon: IconData?;
-	  +leading: Widget?;
-	  +leadingSpacing: double?;
-	  +title: String?;
-	  +description: String?;
-	  +button: Widget?
+	  +formControl: AbstractControl&lt;dynamic&gt;;
+	  +text: String;
+	  +isClickable: bool;
+	  +textStyle: TextStyle?;
+	  +onClick: void Function(AbstractControl&lt;dynamic&gt;)?
 	  |
 	  +Widget build()
 	]
 	
-	[EmptyBody]o-[IconData]
-	[EmptyBody]o-[&lt;abstract&gt;Widget]
+	[FormControlLabel]o-[&lt;abstract&gt;AbstractControl]
+	[FormControlLabel]o-[TextStyle]
+	[FormControlLabel]o-[void Function(AbstractControl&lt;dynamic&gt;)?]
 	
-	[NullHelperDecoration
+	[ActionPopUpMenuButton
+	  |
+	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
+	  +triggerIconColor: Color?;
+	  +triggerIconColorHover: Color?;
+	  +triggerIconSize: double;
+	  +disableSplashEffect: bool;
+	  +hideOnEmpty: bool;
+	  +orientation: Axis;
+	  +elevation: double?;
+	  +splashRadius: double?;
+	  +enabled: bool;
+	  +position: PopupMenuPosition
+	  |
+	  +Widget build();
+	  -Widget _buildPopupMenu()
 	]
 	
-	[InputDecoration]&lt;:-[NullHelperDecoration]
+	[ActionPopUpMenuButton]o-[Color]
+	[ActionPopUpMenuButton]o-[Axis]
+	[ActionPopUpMenuButton]o-[PopupMenuPosition]
 	
 	[Search
 	  |
@@ -54,6 +73,18 @@
 	
 	[SearchController]o-[void Function(String)]
 	
+	[FormScaffold
+	  |
+	  +formViewModel: T;
+	  +actions: List&lt;Widget&gt;?;
+	  +body: Widget;
+	  +drawer: Widget?;
+	  +actionsSpacing: double;
+	  +actionsPadding: double
+	]
+	
+	[FormScaffold]o-[&lt;abstract&gt;Widget]
+	
 	[ConstrainedWidthFlexible
 	  |
 	  +minWidth: double;
@@ -70,47 +101,6 @@
 	[ConstrainedWidthFlexible]o-[&lt;abstract&gt;Widget]
 	[ConstrainedWidthFlexible]o-[BoxConstraints]
 	
-	[AsyncValueWidget
-	  |
-	  +value: AsyncValue&lt;T&gt;;
-	  +data: Widget Function(T);
-	  +error: Widget Function(Object, StackTrace?)?;
-	  +loading: Widget Function()?;
-	  +empty: Widget Function()?
-	  |
-	  +Widget build();
-	  -Widget _buildDataOrEmptyWidget();
-	  -Widget _defaultError();
-	  -Widget _defaultLoad()
-	]
-	
-	[AsyncValueWidget]o-[&lt;abstract&gt;AsyncValue]
-	[AsyncValueWidget]o-[Widget Function(T)]
-	[AsyncValueWidget]o-[Widget Function(Object, StackTrace?)?]
-	[AsyncValueWidget]o-[Widget Function()?]
-	
-	[ActionPopUpMenuButton
-	  |
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +triggerIconColor: Color?;
-	  +triggerIconColorHover: Color?;
-	  +triggerIconSize: double;
-	  +disableSplashEffect: bool;
-	  +hideOnEmpty: bool;
-	  +orientation: Axis;
-	  +elevation: double?;
-	  +splashRadius: double?;
-	  +enabled: bool;
-	  +position: PopupMenuPosition
-	  |
-	  +Widget build();
-	  -Widget _buildPopupMenu()
-	]
-	
-	[ActionPopUpMenuButton]o-[Color]
-	[ActionPopUpMenuButton]o-[Axis]
-	[ActionPopUpMenuButton]o-[PopupMenuPosition]
-	
 	[PrimaryButton
 	  |
 	  +text: String;
@@ -133,36 +123,6 @@
 	[PrimaryButton]o-[EdgeInsets]
 	[PrimaryButton]o-[Size]
 	
-	[Hyperlink
-	  |
-	  +text: String;
-	  +url: String?;
-	  +onClick: void Function()?;
-	  +linkColor: Color;
-	  +hoverColor: Color?;
-	  +visitedColor: Color?;
-	  +style: TextStyle?;
-	  +hoverStyle: TextStyle?;
-	  +visitedStyle: TextStyle?;
-	  +icon: IconData?;
-	  +iconSize: double?
-	]
-	
-	[Hyperlink]o-[void Function()?]
-	[Hyperlink]o-[Color]
-	[Hyperlink]o-[TextStyle]
-	[Hyperlink]o-[IconData]
-	
-	[DismissButton
-	  |
-	  +onPressed: void Function()?;
-	  +text: String?
-	  |
-	  +Widget build()
-	]
-	
-	[DismissButton]o-[void Function()?]
-	
 	[FormTableRow
 	  |
 	  +label: String?;
@@ -232,83 +192,184 @@
 	[FormTableRowLayout]o-[FormTableRowLayout]
 	[Enum]&lt;:--[FormTableRowLayout]
 	
-	[ActionMenuType
+	[DismissButton
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ActionMenuType&gt;;
-	  &lt;static&gt;+inline: ActionMenuType;
-	  &lt;static&gt;+popup: ActionMenuType
+	  +onPressed: void Function()?;
+	  +text: String?
+	  |
+	  +Widget build()
 	]
 	
-	[ActionMenuType]o-[ActionMenuType]
-	[Enum]&lt;:--[ActionMenuType]
+	[DismissButton]o-[void Function()?]
 	
-	[ReactiveCustomColorPicker
+	[Badge
+	  |
+	  +icon: IconData?;
+	  +color: Color?;
+	  +borderRadius: double;
+	  +label: String;
+	  +type: BadgeType;
+	  +padding: EdgeInsets;
+	  +iconSize: double?;
+	  +labelStyle: TextStyle?;
+	  +center: bool
+	  |
+	  +Widget build();
+	  -Color? _getBackgroundColor();
+	  -Color _getBorderColor();
+	  -Color? _getLabelColor()
 	]
 	
-	[ReactiveFormField]&lt;:-[ReactiveCustomColorPicker]
+	[Badge]o-[IconData]
+	[Badge]o-[Color]
+	[Badge]o-[BadgeType]
+	[Badge]o-[EdgeInsets]
+	[Badge]o-[TextStyle]
 	
-	[NavbarTab
+	[BadgeType
 	  |
-	  +title: String;
-	  +intent: RoutingIntent?;
 	  +index: int;
-	  +enabled: bool
+	  &lt;static&gt;+values: List&lt;BadgeType&gt;;
+	  &lt;static&gt;+filled: BadgeType;
+	  &lt;static&gt;+outlined: BadgeType;
+	  &lt;static&gt;+outlineFill: BadgeType;
+	  &lt;static&gt;+plain: BadgeType
 	]
 	
-	[NavbarTab]o-[RoutingIntent]
+	[BadgeType]o-[BadgeType]
+	[Enum]&lt;:--[BadgeType]
 	
-	[TabbedNavbar
+	[StandardDialog
 	  |
-	  +tabs: List&lt;T&gt;;
-	  +selectedTab: T?;
-	  +indicator: BoxDecoration?;
-	  +height: double?;
-	  +disabledBackgroundColor: Color?;
-	  +disabledTooltipText: String?;
-	  +onSelect: void Function(int, T)?;
-	  +labelPadding: EdgeInsets?;
-	  +labelSpacing: double?;
-	  +indicatorSize: TabBarIndicatorSize?;
-	  +isScrollable: bool;
+	  +title: Widget?;
+	  +titleText: String?;
+	  +body: Widget;
+	  +actionButtons: List&lt;Widget&gt;;
 	  +backgroundColor: Color?;
-	  +labelColorHover: Color?;
-	  +unselectedLabelColorHover: Color?
+	  +borderRadius: double?;
+	  +width: double?;
+	  +height: double?;
+	  +minWidth: double;
+	  +minHeight: double;
+	  +maxWidth: double?;
+	  +maxHeight: double?;
+	  +padding: EdgeInsets
+	  |
+	  +Widget build()
 	]
 	
-	[TabbedNavbar]o-[BoxDecoration]
-	[TabbedNavbar]o-[Color]
-	[TabbedNavbar]o-[void Function(int, T)?]
-	[TabbedNavbar]o-[EdgeInsets]
-	[TabbedNavbar]o-[TabBarIndicatorSize]
+	[StandardDialog]o-[&lt;abstract&gt;Widget]
+	[StandardDialog]o-[Color]
+	[StandardDialog]o-[EdgeInsets]
 	
-	[Collapsible
+	[&lt;abstract&gt;ISyncIndicatorViewModel
 	  |
-	  +contentBuilder: Widget Function(BuildContext, bool);
-	  +headerBuilder: Widget Function(BuildContext, bool)?;
-	  +title: String?;
-	  +isCollapsed: bool
+	  +isDirty: bool;
+	  +lastSynced: DateTime?
 	]
 	
-	[Collapsible]o-[Widget Function(BuildContext, bool)]
-	[Collapsible]o-[Widget Function(BuildContext, bool)?]
-	
-	[StudyULogo
-	  |
-	  +onTap: void Function()?
+	[SyncIndicator
 	  |
-	  +Widget build()
+	  +state: AsyncValue&lt;T&gt;;
+	  +lastSynced: DateTime?;
+	  +isDirty: bool;
+	  +animationDuration: int;
+	  +iconSize: double
 	]
 	
-	[StudyULogo]o-[void Function()?]
+	[SyncIndicator]o-[&lt;abstract&gt;AsyncValue]
 	
-	[FormSideSheetTab
+	[&lt;abstract&gt;IWithBanner
 	  |
-	  +formViewBuilder: Widget Function(T)
+	  +Widget? banner()
 	]
 	
-	[FormSideSheetTab]o-[Widget Function(T)]
-	[NavbarTab]&lt;:-[FormSideSheetTab]
+	[BannerBox
+	  |
+	  +prefixIcon: Widget?;
+	  +body: Widget;
+	  +style: BannerStyle;
+	  +padding: EdgeInsets?;
+	  +noPrefix: bool;
+	  +dismissable: bool;
+	  +isDismissed: bool?;
+	  +onDismissed: dynamic Function()?;
+	  +dismissIconSize: double
+	]
+	
+	[BannerBox]o-[&lt;abstract&gt;Widget]
+	[BannerBox]o-[BannerStyle]
+	[BannerBox]o-[EdgeInsets]
+	[BannerBox]o-[dynamic Function()?]
+	
+	[BannerStyle
+	  |
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;BannerStyle&gt;;
+	  &lt;static&gt;+warning: BannerStyle;
+	  &lt;static&gt;+info: BannerStyle;
+	  &lt;static&gt;+error: BannerStyle
+	]
+	
+	[BannerStyle]o-[BannerStyle]
+	[Enum]&lt;:--[BannerStyle]
+	
+	[ActionMenuInline
+	  |
+	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
+	  +iconSize: double?;
+	  +visible: bool;
+	  +splashRadius: double?;
+	  +paddingVertical: double?;
+	  +paddingHorizontal: double?
+	  |
+	  +Widget build()
+	]
+	
+	[Collapsible
+	  |
+	  +contentBuilder: Widget Function(BuildContext, bool);
+	  +headerBuilder: Widget Function(BuildContext, bool)?;
+	  +title: String?;
+	  +isCollapsed: bool
+	]
+	
+	[Collapsible]o-[Widget Function(BuildContext, bool)]
+	[Collapsible]o-[Widget Function(BuildContext, bool)?]
+	
+	[NavbarTab
+	  |
+	  +title: String;
+	  +intent: RoutingIntent?;
+	  +index: int;
+	  +enabled: bool
+	]
+	
+	[NavbarTab]o-[RoutingIntent]
+	
+	[TabbedNavbar
+	  |
+	  +tabs: List&lt;T&gt;;
+	  +selectedTab: T?;
+	  +indicator: BoxDecoration?;
+	  +height: double?;
+	  +disabledBackgroundColor: Color?;
+	  +disabledTooltipText: String?;
+	  +onSelect: void Function(int, T)?;
+	  +labelPadding: EdgeInsets?;
+	  +labelSpacing: double?;
+	  +indicatorSize: TabBarIndicatorSize?;
+	  +isScrollable: bool;
+	  +backgroundColor: Color?;
+	  +labelColorHover: Color?;
+	  +unselectedLabelColorHover: Color?
+	]
+	
+	[TabbedNavbar]o-[BoxDecoration]
+	[TabbedNavbar]o-[Color]
+	[TabbedNavbar]o-[void Function(int, T)?]
+	[TabbedNavbar]o-[EdgeInsets]
+	[TabbedNavbar]o-[TabBarIndicatorSize]
 	
 	[SidesheetTab
 	  |
@@ -337,6 +398,49 @@
 	[Sidesheet]o-[EdgeInsets]
 	[Sidesheet]o-[Widget Function(Widget)?]
 	
+	[FormSideSheetTab
+	  |
+	  +formViewBuilder: Widget Function(T)
+	]
+	
+	[FormSideSheetTab]o-[Widget Function(T)]
+	[NavbarTab]&lt;:-[FormSideSheetTab]
+	
+	[HelpIcon
+	  |
+	  +tooltipText: String?
+	  |
+	  +Widget build()
+	]
+	
+	[EmptyBody
+	  |
+	  +icon: IconData?;
+	  +leading: Widget?;
+	  +leadingSpacing: double?;
+	  +title: String?;
+	  +description: String?;
+	  +button: Widget?
+	  |
+	  +Widget build()
+	]
+	
+	[EmptyBody]o-[IconData]
+	[EmptyBody]o-[&lt;abstract&gt;Widget]
+	
+	[IndicatorRangeSliderThumbShape
+	  |
+	  +buildContext: BuildContext;
+	  +start: T;
+	  +end: T
+	  |
+	  +Size getPreferredSize();
+	  +void paint()
+	]
+	
+	[IndicatorRangeSliderThumbShape]o-[&lt;abstract&gt;BuildContext]
+	[&lt;abstract&gt;RangeSliderThumbShape]&lt;:-[IndicatorRangeSliderThumbShape]
+	
 	[MouseEventsRegion
 	  |
 	  +onTap: void Function()?;
@@ -355,140 +459,86 @@
 	[MouseEventsRegion]o-[void Function(PointerExitEvent)?]
 	[MouseEventsRegion]o-[SystemMouseCursor]
 	
-	[FormControlLabel
+	[ReactiveCustomColorPicker
+	]
+	
+	[ReactiveFormField]&lt;:-[ReactiveCustomColorPicker]
+	
+	[TextParagraph
 	  |
-	  +formControl: AbstractControl&lt;dynamic&gt;;
-	  +text: String;
-	  +isClickable: bool;
-	  +textStyle: TextStyle?;
-	  +onClick: void Function(AbstractControl&lt;dynamic&gt;)?
+	  +text: String?;
+	  +style: TextStyle?;
+	  +selectable: bool;
+	  +span: List&lt;TextSpan&gt;?
 	  |
 	  +Widget build()
 	]
 	
-	[FormControlLabel]o-[&lt;abstract&gt;AbstractControl]
-	[FormControlLabel]o-[TextStyle]
-	[FormControlLabel]o-[void Function(AbstractControl&lt;dynamic&gt;)?]
+	[TextParagraph]o-[TextStyle]
 	
-	[&lt;abstract&gt;IWithBanner
+	[UnderConstruction
 	  |
-	  +Widget? banner()
+	  +Widget build()
 	]
 	
-	[BannerBox
-	  |
-	  +prefixIcon: Widget?;
-	  +body: Widget;
-	  +style: BannerStyle;
-	  +padding: EdgeInsets?;
-	  +noPrefix: bool;
-	  +dismissable: bool;
-	  +isDismissed: bool?;
-	  +onDismissed: dynamic Function()?;
-	  +dismissIconSize: double
+	[NullHelperDecoration
 	]
 	
-	[BannerBox]o-[&lt;abstract&gt;Widget]
-	[BannerBox]o-[BannerStyle]
-	[BannerBox]o-[EdgeInsets]
-	[BannerBox]o-[dynamic Function()?]
+	[InputDecoration]&lt;:-[NullHelperDecoration]
 	
-	[BannerStyle
+	[ActionMenuType
 	  |
 	  +index: int;
-	  &lt;static&gt;+values: List&lt;BannerStyle&gt;;
-	  &lt;static&gt;+warning: BannerStyle;
-	  &lt;static&gt;+info: BannerStyle;
-	  &lt;static&gt;+error: BannerStyle
+	  &lt;static&gt;+values: List&lt;ActionMenuType&gt;;
+	  &lt;static&gt;+inline: ActionMenuType;
+	  &lt;static&gt;+popup: ActionMenuType
 	]
 	
-	[BannerStyle]o-[BannerStyle]
-	[Enum]&lt;:--[BannerStyle]
+	[ActionMenuType]o-[ActionMenuType]
+	[Enum]&lt;:--[ActionMenuType]
 	
-	[SecondaryButton
+	[HtmlStylingBanner
 	  |
-	  +text: String;
-	  +icon: IconData?;
-	  +isLoading: bool;
-	  +onPressed: void Function()?
+	  +isDismissed: bool;
+	  +onDismissed: dynamic Function()?
 	  |
 	  +Widget build()
 	]
 	
-	[SecondaryButton]o-[IconData]
-	[SecondaryButton]o-[void Function()?]
+	[HtmlStylingBanner]o-[dynamic Function()?]
 	
-	[IconPack
-	  |
-	  &lt;static&gt;+defaultPack: List&lt;IconOption&gt;;
-	  &lt;static&gt;+material: List&lt;IconOption&gt;
+	[&lt;abstract&gt;FormConsumerWidget
 	  |
-	  &lt;static&gt;+IconOption? resolveIconByName()
+	  +Widget build()
 	]
 	
-	[IconOption
-	  |
-	  +name: String;
-	  +icon: IconData?;
-	  +isEmpty: bool;
-	  +props: List&lt;Object?&gt;
+	[&lt;abstract&gt;FormConsumerRefWidget
 	  |
-	  +String toJson();
-	  &lt;static&gt;+IconOption fromJson()
-	]
-	
-	[IconOption]o-[IconData]
-	[&lt;abstract&gt;Equatable]&lt;:-[IconOption]
-	
-	[ReactiveIconPicker
+	  +Widget build()
 	]
 	
-	[ReactiveFocusableFormField]&lt;:-[ReactiveIconPicker]
-	
-	[IconPicker
-	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +selectedOption: IconOption?;
-	  +onSelect: void Function(IconOption)?;
-	  +galleryIconSize: double?;
-	  +selectedIconSize: double?;
-	  +focusNode: FocusNode?;
-	  +isDisabled: bool
+	[SplashPage
 	  |
 	  +Widget build()
 	]
 	
-	[IconPicker]o-[IconOption]
-	[IconPicker]o-[void Function(IconOption)?]
-	[IconPicker]o-[FocusNode]
-	
-	[IconPickerField
+	[ErrorPage
 	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +selectedOption: IconOption?;
-	  +selectedIconSize: double?;
-	  +galleryIconSize: double?;
-	  +onSelect: void Function(IconOption)?;
-	  +focusNode: FocusNode?;
-	  +isDisabled: bool
+	  +error: Exception?
 	  |
 	  +Widget build()
 	]
 	
-	[IconPickerField]o-[IconOption]
-	[IconPickerField]o-[void Function(IconOption)?]
-	[IconPickerField]o-[FocusNode]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ErrorPage]
 	
-	[IconPickerGallery
+	[StudyULogo
 	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +onSelect: void Function(IconOption)?;
-	  +iconSize: double
+	  +onTap: void Function()?
 	  |
 	  +Widget build()
 	]
 	
-	[IconPickerGallery]o-[void Function(IconOption)?]
+	[StudyULogo]o-[void Function()?]
 	
 	[SingleColumnLayout
 	  |
@@ -510,71 +560,36 @@
 	
 	[SingleColumnLayoutType
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;;
-	  &lt;static&gt;+boundedWide: SingleColumnLayoutType;
-	  &lt;static&gt;+boundedNarrow: SingleColumnLayoutType;
-	  &lt;static&gt;+stretched: SingleColumnLayoutType;
-	  &lt;static&gt;+split: SingleColumnLayoutType
-	]
-	
-	[SingleColumnLayoutType]o-[SingleColumnLayoutType]
-	[Enum]&lt;:--[SingleColumnLayoutType]
-	
-	[&lt;abstract&gt;FormConsumerWidget
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;FormConsumerRefWidget
-	  |
-	  +Widget build()
-	]
-	
-	[FormScaffold
-	  |
-	  +formViewModel: T;
-	  +actions: List&lt;Widget&gt;?;
-	  +body: Widget;
-	  +drawer: Widget?;
-	  +actionsSpacing: double;
-	  +actionsPadding: double
-	]
-	
-	[FormScaffold]o-[&lt;abstract&gt;Widget]
-	
-	[StandardDialog
-	  |
-	  +title: Widget?;
-	  +titleText: String?;
-	  +body: Widget;
-	  +actionButtons: List&lt;Widget&gt;;
-	  +backgroundColor: Color?;
-	  +borderRadius: double?;
-	  +width: double?;
-	  +height: double?;
-	  +minWidth: double;
-	  +minHeight: double;
-	  +maxWidth: double?;
-	  +maxHeight: double?;
-	  +padding: EdgeInsets
-	  |
-	  +Widget build()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;;
+	  &lt;static&gt;+boundedWide: SingleColumnLayoutType;
+	  &lt;static&gt;+boundedNarrow: SingleColumnLayoutType;
+	  &lt;static&gt;+stretched: SingleColumnLayoutType;
+	  &lt;static&gt;+split: SingleColumnLayoutType
 	]
 	
-	[StandardDialog]o-[&lt;abstract&gt;Widget]
-	[StandardDialog]o-[Color]
-	[StandardDialog]o-[EdgeInsets]
+	[SingleColumnLayoutType]o-[SingleColumnLayoutType]
+	[Enum]&lt;:--[SingleColumnLayoutType]
 	
-	[HtmlStylingBanner
-	  |
-	  +isDismissed: bool;
-	  +onDismissed: dynamic Function()?
+	[Hyperlink
 	  |
-	  +Widget build()
+	  +text: String;
+	  +url: String?;
+	  +onClick: void Function()?;
+	  +linkColor: Color;
+	  +hoverColor: Color?;
+	  +visitedColor: Color?;
+	  +style: TextStyle?;
+	  +hoverStyle: TextStyle?;
+	  +visitedStyle: TextStyle?;
+	  +icon: IconData?;
+	  +iconSize: double?
 	]
 	
-	[HtmlStylingBanner]o-[dynamic Function()?]
+	[Hyperlink]o-[void Function()?]
+	[Hyperlink]o-[Color]
+	[Hyperlink]o-[TextStyle]
+	[Hyperlink]o-[IconData]
 	
 	[StandardTableColumn
 	  |
@@ -605,6 +620,7 @@
 	  +cellSpacing: double;
 	  +rowSpacing: double;
 	  +minRowHeight: double?;
+	  +headerMaxLines: int;
 	  +showTableHeader: bool;
 	  +hideLeadingTrailingWhenEmpty: bool;
 	  +leadingWidget: Widget?;
@@ -637,756 +653,822 @@
 	[StandardTableStyle]o-[StandardTableStyle]
 	[Enum]&lt;:--[StandardTableStyle]
 	
-	[TwoColumnLayout
-	  |
-	  &lt;static&gt;+defaultDivider: VerticalDivider;
-	  &lt;static&gt;+defaultContentPadding: EdgeInsets;
-	  &lt;static&gt;+slimContentPadding: EdgeInsets;
-	  +leftWidget: Widget;
-	  +rightWidget: Widget;
-	  +dividerWidget: Widget?;
-	  +headerWidget: Widget?;
-	  +flexLeft: int?;
-	  +flexRight: int?;
-	  +constraintsLeft: BoxConstraints?;
-	  +constraintsRight: BoxConstraints?;
-	  +scrollLeft: bool;
-	  +scrollRight: bool;
-	  +paddingLeft: EdgeInsets?;
-	  +paddingRight: EdgeInsets?;
-	  +backgroundColorLeft: Color?;
-	  +backgroundColorRight: Color?;
-	  +stretchHeight: bool
-	]
-	
-	[TwoColumnLayout]o-[VerticalDivider]
-	[TwoColumnLayout]o-[EdgeInsets]
-	[TwoColumnLayout]o-[&lt;abstract&gt;Widget]
-	[TwoColumnLayout]o-[BoxConstraints]
-	[TwoColumnLayout]o-[Color]
-	
-	[ActionMenuInline
+	[IconPack
 	  |
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +iconSize: double?;
-	  +visible: bool;
-	  +splashRadius: double?;
-	  +paddingVertical: double?;
-	  +paddingHorizontal: double?
+	  &lt;static&gt;+defaultPack: List&lt;IconOption&gt;;
+	  &lt;static&gt;+material: List&lt;IconOption&gt;
 	  |
-	  +Widget build()
+	  &lt;static&gt;+IconOption? resolveIconByName()
 	]
 	
-	[TextParagraph
+	[IconOption
 	  |
-	  +text: String?;
-	  +style: TextStyle?;
-	  +selectable: bool;
-	  +span: List&lt;TextSpan&gt;?
+	  +name: String;
+	  +icon: IconData?;
+	  +isEmpty: bool;
+	  +props: List&lt;Object?&gt;
 	  |
-	  +Widget build()
+	  +String toJson();
+	  &lt;static&gt;+IconOption fromJson()
 	]
 	
-	[TextParagraph]o-[TextStyle]
+	[IconOption]o-[IconData]
+	[&lt;abstract&gt;Equatable]&lt;:-[IconOption]
 	
-	[SplashPage
-	  |
-	  +Widget build()
+	[ReactiveIconPicker
 	]
 	
-	[ErrorPage
+	[ReactiveFocusableFormField]&lt;:-[ReactiveIconPicker]
+	
+	[IconPicker
 	  |
-	  +error: Exception?
+	  +iconOptions: List&lt;IconOption&gt;;
+	  +selectedOption: IconOption?;
+	  +onSelect: void Function(IconOption)?;
+	  +galleryIconSize: double?;
+	  +selectedIconSize: double?;
+	  +focusNode: FocusNode?;
+	  +isDisabled: bool
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ErrorPage]
+	[IconPicker]o-[IconOption]
+	[IconPicker]o-[void Function(IconOption)?]
+	[IconPicker]o-[FocusNode]
 	
-	[Badge
-	  |
-	  +icon: IconData?;
-	  +color: Color?;
-	  +borderRadius: double;
-	  +label: String;
-	  +type: BadgeType;
-	  +padding: EdgeInsets;
-	  +iconSize: double?;
-	  +labelStyle: TextStyle?;
-	  +center: bool
+	[IconPickerField
 	  |
-	  +Widget build();
-	  -Color? _getBackgroundColor();
-	  -Color _getBorderColor();
-	  -Color? _getLabelColor()
-	]
-	
-	[Badge]o-[IconData]
-	[Badge]o-[Color]
-	[Badge]o-[BadgeType]
-	[Badge]o-[EdgeInsets]
-	[Badge]o-[TextStyle]
-	
-	[BadgeType
+	  +iconOptions: List&lt;IconOption&gt;;
+	  +selectedOption: IconOption?;
+	  +selectedIconSize: double?;
+	  +galleryIconSize: double?;
+	  +onSelect: void Function(IconOption)?;
+	  +focusNode: FocusNode?;
+	  +isDisabled: bool
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;BadgeType&gt;;
-	  &lt;static&gt;+filled: BadgeType;
-	  &lt;static&gt;+outlined: BadgeType;
-	  &lt;static&gt;+outlineFill: BadgeType;
-	  &lt;static&gt;+plain: BadgeType
+	  +Widget build()
 	]
 	
-	[BadgeType]o-[BadgeType]
-	[Enum]&lt;:--[BadgeType]
+	[IconPickerField]o-[IconOption]
+	[IconPickerField]o-[void Function(IconOption)?]
+	[IconPickerField]o-[FocusNode]
 	
-	[IndicatorRangeSliderThumbShape
+	[IconPickerGallery
 	  |
-	  +buildContext: BuildContext;
-	  +start: T;
-	  +end: T
+	  +iconOptions: List&lt;IconOption&gt;;
+	  +onSelect: void Function(IconOption)?;
+	  +iconSize: double
 	  |
-	  +Size getPreferredSize();
-	  +void paint()
+	  +Widget build()
 	]
 	
-	[IndicatorRangeSliderThumbShape]o-[&lt;abstract&gt;BuildContext]
-	[&lt;abstract&gt;RangeSliderThumbShape]&lt;:-[IndicatorRangeSliderThumbShape]
+	[IconPickerGallery]o-[void Function(IconOption)?]
 	
-	[HelpIcon
+	[SecondaryButton
 	  |
-	  +tooltipText: String?
+	  +text: String;
+	  +icon: IconData?;
+	  +isLoading: bool;
+	  +onPressed: void Function()?
 	  |
 	  +Widget build()
 	]
 	
-	[UnderConstruction
+	[SecondaryButton]o-[IconData]
+	[SecondaryButton]o-[void Function()?]
+	
+	[TwoColumnLayout
 	  |
-	  +Widget build()
+	  &lt;static&gt;+defaultDivider: VerticalDivider;
+	  &lt;static&gt;+defaultContentPadding: EdgeInsets;
+	  &lt;static&gt;+slimContentPadding: EdgeInsets;
+	  +leftWidget: Widget;
+	  +rightWidget: Widget;
+	  +dividerWidget: Widget?;
+	  +headerWidget: Widget?;
+	  +flexLeft: int?;
+	  +flexRight: int?;
+	  +constraintsLeft: BoxConstraints?;
+	  +constraintsRight: BoxConstraints?;
+	  +scrollLeft: bool;
+	  +scrollRight: bool;
+	  +paddingLeft: EdgeInsets?;
+	  +paddingRight: EdgeInsets?;
+	  +backgroundColorLeft: Color?;
+	  +backgroundColorRight: Color?;
+	  +stretchHeight: bool
 	]
 	
+	[TwoColumnLayout]o-[VerticalDivider]
+	[TwoColumnLayout]o-[EdgeInsets]
+	[TwoColumnLayout]o-[&lt;abstract&gt;Widget]
+	[TwoColumnLayout]o-[BoxConstraints]
+	[TwoColumnLayout]o-[Color]
+	
 	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
+	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="982.0" width="21546.0" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="997.0" width="19632.8" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M7515.9 600.3 L5413.5 769 L5429.997175141243 842 L5430.0 842.0 " fill="none"></path>
+				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
+					<path d="M2089.5 652.7 L2673.5 784 L2750.830508474576 857 L2750.8 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7525.6 604.9 L7515.9 600.3 L7524.8 594.3 L7534.5 598.8 Z"></path>
+						<path d="M2081.5 645.5 L2089.5 652.7 L2079.2 655.9 L2071.3 648.7 Z"></path>
 					</g>
-					<path d="M2123.0 686.2 L2020.25 769 L2102.7358757062148 842 L2102.7 842.0 " fill="none"></path>
+					<path d="M2089.8 625.0 L3802.25 784 L3933.4025423728813 857 L3933.4 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2133.6 684.5 L2123.0 686.2 L2126.9 676.2 L2137.5 674.5 Z"></path>
+						<path d="M2081.0 618.9 L2089.8 625.0 L2080.1 629.5 L2071.3 623.3 Z"></path>
 					</g>
-					<path d="M2370.8 625.4 L2901 769 L3335 850.8083067092651 L3335.0 850.8 " fill="none"></path>
+					<path d="M1668.7 630.4 L369 784 L369 857 L369.0 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2363.2 617.8 L2370.8 625.4 L2360.4 628.1 L2352.8 620.6 Z"></path>
+						<path d="M1678.6 634.6 L1668.7 630.4 L1677.4 624.0 L1687.3 628.2 Z"></path>
 					</g>
-					<path d="M915.5 222.3 L1054.5 412 L1054.5 575 L1054.5 575.0 " fill="none"></path>
-					<path d="M919.8 219.1 L915.5 222.3 L911.2 225.4 L907.6 211.5 Z"></path>
-					<path d="M645.1 247.8 L1293 412 L1293 575 L1293.0 575.0 " fill="none"></path>
+					<path d="M1668.7 626.4 L83 784 L83 857 L83.0 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M637.4 240.4 L645.1 247.8 L634.7 250.7 L627.0 243.3 Z"></path>
+						<path d="M1678.5 630.8 L1668.7 626.4 L1677.4 620.2 L1687.3 624.6 Z"></path>
 					</g>
-					<path d="M440.5 268.2 L440.5 412 L440.5 559.5 L440.5 559.5 " fill="none"></path>
+					<path d="M2345.7 689.4 L2128.25 784 L2193.826271186441 857 L2193.8 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M445.8 258.8 L440.5 268.2 L435.2 258.8 L440.5 249.5 Z"></path>
+						<path d="M2356.4 690.6 L2345.7 689.4 L2352.1 680.8 L2362.8 682.0 Z"></path>
 					</g>
-					<path d="M440.5 640.2 L440.5 769 L440.5 842 L440.5 842.0 " fill="none"></path>
+					<path d="M2772.3 626.9 L4491 784 L4678.036723163842 857 L4678.0 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M445.8 630.8 L440.5 640.2 L435.2 630.8 L440.5 621.5 Z"></path>
+						<path d="M2763.5 620.7 L2772.3 626.9 L2762.6 631.3 L2753.8 625.2 Z"></path>
 					</g>
-					<path d="M3304.1 692.4 L3190.5 769 L3338.9745762711864 842 L3339.0 842.0 " fill="none"></path>
+					<path d="M2305.2 628.8 L748 784 L748 857 L748.0 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3314.8 691.6 L3304.1 692.4 L3308.8 682.8 L3319.5 682.0 Z"></path>
+						<path d="M2315.0 633.2 L2305.2 628.8 L2313.9 622.5 L2323.8 626.9 Z"></path>
 					</g>
-					<path d="M3617.3 604.4 L5534.75 769 L5820.975988700565 842 L5821.0 842.0 " fill="none"></path>
+					<path d="M4711.1 613.9 L8363.75 784 L10234.25 871.1488549618321 L10234.3 871.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3608.5 598.3 L3617.3 604.4 L3607.6 608.9 L3598.8 602.8 Z"></path>
+						<path d="M4702.1 608.2 L4711.1 613.9 L4701.6 618.8 L4692.5 613.0 Z"></path>
 					</g>
-					<path d="M4169.5 615.0 L5494.75 769 L5444.227401129943 842 L5444.2 842.0 " fill="none"></path>
+					<path d="M4349.9 617.5 L1854.25 784 L1854.25 857 L1854.3 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4160.9 608.6 L4169.5 615.0 L4159.7 619.2 L4151.0 612.8 Z"></path>
+						<path d="M4359.5 622.2 L4349.9 617.5 L4358.8 611.6 L4368.5 616.3 Z"></path>
 					</g>
-					<path d="M3748.4 601.7 L603.25 769 L720.9985875706215 842 L721.0 842.0 " fill="none"></path>
+					<path d="M4349.9 614.8 L1051 784 L1051 857 L1051.0 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3758.0 606.5 L3748.4 601.7 L3757.4 595.9 L3767.0 600.7 Z"></path>
+						<path d="M4359.5 619.6 L4349.9 614.8 L4358.9 609.0 L4368.5 613.8 Z"></path>
 					</g>
-					<path d="M4169.6 607.6 L6152.75 769 L6152.75 842 L6152.8 842.0 " fill="none"></path>
+					<path d="M1551.2 233.0 L2900.25 427 L2900.25 590 L2900.3 590.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4160.7 601.6 L4169.6 607.6 L4159.9 612.2 L4151.0 606.1 Z"></path>
+						<path d="M1542.7 226.4 L1551.2 233.0 L1541.2 236.9 L1532.8 230.3 Z"></path>
 					</g>
-					<path d="M4169.6 605.7 L6438.75 769 L6438.75 842 L6438.8 842.0 " fill="none"></path>
+					<path d="M1141.8 260.5 L544.75 427 L544.75 574.5 L544.8 574.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4160.7 599.7 L4169.6 605.7 L4159.9 610.3 L4151.0 604.3 Z"></path>
+						<path d="M1152.2 263.2 L1141.8 260.5 L1149.3 252.9 L1159.8 255.5 Z"></path>
 					</g>
-					<path d="M9151.9 602.0 L6534.75 769 L8120.25 855.910343759678 L8120.3 855.9 " fill="none"></path>
+					<path d="M692.3 623.5 L2008.75 784 L2008.75 857 L2008.8 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9161.5 606.8 L9151.9 602.0 L9160.8 596.1 L9170.5 600.8 Z"></path>
+						<path d="M683.7 617.1 L692.3 623.5 L682.4 627.7 L673.8 621.2 Z"></path>
 					</g>
-					<path d="M9152.1 622.2 L8316 769 L8316 842 L8316.0 842.0 " fill="none"></path>
+					<path d="M6878.6 690.0 L6821.75 784 L7398.5 867.368517762352 L7398.5 867.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9162.2 625.8 L9152.1 622.2 L9160.4 615.3 L9170.5 618.9 Z"></path>
+						<path d="M6888.0 684.7 L6878.6 690.0 L6878.9 679.2 L6888.3 674.0 Z"></path>
 					</g>
-					<path d="M9152.2 627.7 L8467.5 769 L8467.5 842 L8467.5 842.0 " fill="none"></path>
+					<path d="M10038.4 614.4 L6959.75 784 L7398.5 865.8753294675804 L7398.5 865.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9162.4 631.0 L9152.2 627.7 L9160.3 620.6 L9170.5 623.9 Z"></path>
+						<path d="M10048.0 619.2 L10038.4 614.4 L10047.4 608.6 L10057.0 613.4 Z"></path>
 					</g>
-					<path d="M9515.8 594.8 L2060.25 769 L2109.741525423729 842 L2109.7 842.0 " fill="none"></path>
+					<path d="M10362.6 614.3 L13471.5 784 L13526.765536723164 857 L13526.8 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9525.3 599.9 L9515.8 594.8 L9525.0 589.3 L9534.5 594.4 Z"></path>
+						<path d="M10353.6 608.5 L10362.6 614.3 L10353.0 619.2 L10344.0 613.3 Z"></path>
 					</g>
-					<path d="M9516.1 620.1 L8587 769 L8669.485875706214 842 L8669.5 842.0 " fill="none"></path>
+					<path d="M10035.7 609.9 L17395.5 784 L17477.985875706214 857 L17478.0 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9526.1 623.9 L9516.1 620.1 L9524.4 613.4 L9534.5 617.2 Z"></path>
+						<path d="M10026.5 604.3 L10035.7 609.9 L10026.2 615.0 L10017.0 609.4 Z"></path>
 					</g>
-					<path d="M9886.0 618.4 L10885 769 L11346.5 843.2595454545454 L11346.5 843.3 " fill="none"></path>
+					<path d="M10035.7 612.5 L14597.75 784 L16337 868.9819875776398 L16337.0 869.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9877.5 611.7 L9886.0 618.4 L9875.9 622.3 L9867.5 615.6 Z"></path>
+						<path d="M10026.5 606.8 L10035.7 612.5 L10026.1 617.4 L10017.0 611.8 Z"></path>
 					</g>
-					<path d="M9886.2 598.2 L13997.75 769 L14113.2302259887 842 L14113.2 842.0 " fill="none"></path>
+					<path d="M9665.4 614.6 L6214.75 784 L6332.498587570622 857 L6332.5 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9877.0 592.5 L9886.2 598.2 L9876.6 603.1 L9867.5 597.4 Z"></path>
+						<path d="M9674.9 619.5 L9665.4 614.6 L9674.4 608.8 L9684.0 613.7 Z"></path>
 					</g>
-					<path d="M9886.2 597.6 L14356.5 769 L14356.5 842 L14356.5 842.0 " fill="none"></path>
+					<path d="M10035.2 648.6 L10615.75 784 L11105 863.923627134287 L11105.0 863.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9877.0 591.9 L9886.2 597.6 L9876.6 602.6 L9867.5 596.9 Z"></path>
+						<path d="M10027.3 641.3 L10035.2 648.6 L10024.9 651.7 L10017.0 644.3 Z"></path>
 					</g>
-					<path d="M8660.4 712.6 L8627 769 L8676.49152542373 842 L8676.5 842.0 " fill="none"></path>
+					<path d="M9665.3 609.9 L2341.75 784 L2341.75 857 L2341.8 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8669.7 707.2 L8660.4 712.6 L8660.5 701.8 L8669.9 696.5 Z"></path>
+						<path d="M9674.8 615.0 L9665.3 609.9 L9674.5 604.3 L9684.0 609.5 Z"></path>
 					</g>
-					<path d="M8602.9 601.2 L6574.75 769 L8120.25 855.869958717053 L8120.3 855.9 " fill="none"></path>
+					<path d="M3578.0 635.3 L2539.75 784 L2539.75 857 L2539.8 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8612.6 605.8 L8602.9 601.2 L8611.8 595.1 L8621.5 599.7 Z"></path>
+						<path d="M3588.0 639.2 L3578.0 635.3 L3586.5 628.7 L3596.5 632.6 Z"></path>
 					</g>
-					<path d="M8862.2 594.6 L14431.25 769 L15842 854.7937639580828 L15842.0 854.8 " fill="none"></path>
+					<path d="M3993.7 655.3 L4531 784 L4685.042372881356 857 L4685.0 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8853.0 588.9 L8862.2 594.6 L8852.7 599.6 L8843.5 594.0 Z"></path>
+						<path d="M3985.8 647.9 L3993.7 655.3 L3983.3 658.3 L3975.5 650.9 Z"></path>
 					</g>
-					<path d="M8602.8 594.0 L2100.25 769 L2116.747175141243 842 L2116.7 842.0 " fill="none"></path>
+					<path d="M3994.1 617.1 L6999.75 784 L7398.5 865.2651122625216 L7398.5 865.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8612.3 599.1 L8602.8 594.0 L8612.0 588.4 L8621.5 593.5 Z"></path>
+						<path d="M3985.1 611.2 L3994.1 617.1 L3984.5 621.9 L3975.5 616.0 Z"></path>
 					</g>
-					<path d="M9889.0 609.2 L8667 769 L8683.497175141243 842 L8683.5 842.0 " fill="none"></path>
+					<path d="M3578.0 629.8 L2254.75 784 L2215.981638418079 857 L2216.0 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9898.9 613.3 L9889.0 609.2 L9897.6 602.7 L9907.5 606.8 Z"></path>
+						<path d="M3587.8 634.0 L3578.0 629.8 L3586.6 623.4 L3596.5 627.6 Z"></path>
 					</g>
-					<path d="M15974.2 618.9 L17075 769 L17075 842 L17075.0 842.0 " fill="none"></path>
+					<path d="M3641.1 691.0 L3483.5 784 L3530.858757062147 819 L3530.9 819.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15965.7 612.3 L15974.2 618.9 L15964.3 622.9 L15955.8 616.3 Z"></path>
+						<path d="M3651.9 690.8 L3641.1 691.0 L3646.5 681.6 L3657.2 681.5 Z"></path>
 					</g>
-					<path d="M15558.3 619.2 L14471.25 769 L15842 854.7172760996291 L15842.0 854.7 " fill="none"></path>
+					<path d="M5888.8 632.8 L7039.75 784 L7398.5 864.5310716550413 L7398.5 864.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15568.2 623.2 L15558.3 619.2 L15566.8 612.6 L15576.8 616.6 Z"></path>
+						<path d="M5880.2 626.3 L5888.8 632.8 L5878.8 636.9 L5870.3 630.4 Z"></path>
 					</g>
-					<path d="M15558.1 593.5 L3230.5 769 L3345.9802259887006 842 L3346.0 842.0 " fill="none"></path>
+					<path d="M5472.7 623.5 L3622.5 784 L3614.8870056497176 819 L3614.9 819.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15567.5 598.7 L15558.1 593.5 L15567.3 588.0 L15576.8 593.2 Z"></path>
+						<path d="M5482.4 628.1 L5472.7 623.5 L5481.5 617.4 L5491.3 621.9 Z"></path>
 					</g>
-					<path d="M15974.3 616.1 L17216 769 L17299.310734463277 842 L17299.3 842.0 " fill="none"></path>
+					<path d="M5472.8 638.9 L4571 784 L4692.04802259887 857 L4692.0 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15965.7 609.7 L15974.3 616.1 L15964.4 620.3 L15955.8 613.8 Z"></path>
+						<path d="M5482.9 642.7 L5472.8 638.9 L5481.2 632.2 L5491.3 636.0 Z"></path>
 					</g>
-					<path d="M15974.3 612.4 L17464 769 L17522.13559322034 804 L17522.1 804.0 " fill="none"></path>
+					<path d="M5213.1 636.8 L4611 784 L4699.053672316384 857 L4699.1 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15965.6 606.1 L15974.3 612.4 L15964.5 616.7 L15955.8 610.4 Z"></path>
+						<path d="M5223.4 639.8 L5213.1 636.8 L5220.9 629.4 L5231.3 632.4 Z"></path>
 					</g>
-					<path d="M13130.1 594.2 L3270.5 769 L3352.9858757062148 842 L3353.0 842.0 " fill="none"></path>
+					<path d="M4908.2 671.3 L4651 784 L4706.059322033899 857 L4706.1 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13139.5 599.4 L13130.1 594.2 L13139.3 588.7 L13148.8 593.9 Z"></path>
+						<path d="M4918.8 672.4 L4908.2 671.3 L4914.6 662.7 L4925.3 663.8 Z"></path>
 					</g>
-					<path d="M13546.4 599.4 L17504 769 L17546.31638418079 804 L17546.3 804.0 " fill="none"></path>
+					<path d="M4906.7 624.9 L3662.5 784 L3639.0677966101694 819 L3639.1 819.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13537.3 593.7 L13546.4 599.4 L13536.8 604.3 L13527.8 598.6 Z"></path>
+						<path d="M4916.7 629.0 L4906.7 624.9 L4915.3 618.4 L4925.3 622.5 Z"></path>
 					</g>
-					<path d="M13546.2 622.1 L14511.25 769 L15842 854.6363388474823 L15842.0 854.6 " fill="none"></path>
+					<path d="M3806.4 822.0 L3818.25 819 L3825.75 819 L3825.75 819 L3833.25 872.5 L3833.25 872.5 L3825.75 926 L3825.75 926 L3818.25 926 L3818.25 926 L3788.25 918.5348837209302 L3788.3 918.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13537.8 615.5 L13546.2 622.1 L13536.2 626.0 L13527.8 619.3 Z"></path>
+						<path d="M3796.0 819.0 L3806.4 822.0 L3798.6 829.4 L3788.3 826.5 Z"></path>
 					</g>
-					<path d="M16961.6 621.8 L16358 769 L15931 849.1474019088017 L15931.0 849.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16971.9 624.7 L16961.6 621.8 L16969.4 614.4 L16979.8 617.3 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M7062.4 607.8 L3762.25 784 L3699.3686440677966 819 L3699.4 819.0 " fill="none"></path>
 					</g>
-					<path d="M17817.3 614.2 L16826.25 769 L15931 853.3092577813248 L15931.0 853.3 " fill="none"></path>
+					<path d="M7062.7 613.2 L7062.4 607.8 L7062.2 602.5 L7075.8 607.1 Z"></path>
+					<path d="M15364.0 678.2 L15364 784 L16337 866.4023923444976 L16337.0 866.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17827.4 618.0 L17817.3 614.2 L17825.7 607.5 L17835.8 611.3 Z"></path>
+						<path d="M15369.3 668.8 L15364.0 678.2 L15358.7 668.8 L15364.0 659.5 Z"></path>
 					</g>
-					<path d="M17847.3 669.7 L17695 769 L17661.77966101695 804 L17661.8 804.0 " fill="none"></path>
+					<path d="M9375.7 608.8 L17435.5 784 L17484.991525423728 857 L17485.0 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17858.0 669.1 L17847.3 669.7 L17852.2 660.1 L17862.9 659.5 Z"></path>
+						<path d="M9366.4 603.2 L9375.7 608.8 L9366.2 613.9 L9357.0 608.4 Z"></path>
 					</g>
-					<path d="M17814.1 807.0 L17826 804 L17833.5 804 L17833.5 804 L17841 857.5 L17841 857.5 L17833.5 911 L17833.5 911 L17826 911 L17826 911 L17796 903.5348837209302 L17796.0 903.5 " fill="none"></path>
+					<path d="M9225.5 753.2 L9225.5 784 L10234.25 870.02686099735 L10234.3 870.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17803.8 804.0 L17814.1 807.0 L17806.3 814.4 L17796.0 811.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M16070.0 594.9 L17802 769 L17726.46327683616 804 L17726.5 804.0 " fill="none"></path>
+						<path d="M9230.8 743.8 L9225.5 753.2 L9220.2 743.8 L9225.5 734.5 Z"></path>
 					</g>
-					<path d="M16070.5 589.6 L16070.0 594.9 L16069.5 600.2 L16056.8 593.6 Z"></path>
-					<path d="M2647.5 807.3 L2659.5 804 L2667 804 L2667 804 L2674.5 857.5 L2674.5 857.5 L2667 911 L2667 911 L2659.5 911 L2659.5 911 L2629.5 902.7692307692307 L2629.5 902.8 " fill="none"></path>
+					<path d="M9075.4 612.4 L5335.75 784 L5357.049435028249 804 L5357.0 804.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2637.1 804.6 L2647.5 807.3 L2639.9 814.9 L2629.5 812.2 Z"></path>
+						<path d="M9084.9 617.3 L9075.4 612.4 L9084.4 606.6 L9094.0 611.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M15982.4 591.1 L2360.25 769 L2401.478813559322 804 L2401.5 804.0 " fill="none"></path>
-					</g>
-					<path d="M15982.5 596.4 L15982.4 591.1 L15982.3 585.7 L15995.8 590.9 Z"></path>
-					<path d="M4068.5 207.2 L5793.25 412 L5793.25 575 L5793.3 575.0 " fill="none"></path>
-					<path d="M4069.1 202.0 L4068.5 207.2 L4067.9 212.5 L4055.3 205.7 Z"></path>
-					<path d="M3870.8 207.2 L6012.25 412 L6012.25 575 L6012.3 575.0 " fill="none"></path>
+					<path d="M9375.6 621.3 L10919.5 784 L11115.816384180791 857 L11115.8 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3862.0 201.0 L3870.8 207.2 L3861.0 211.6 L3852.3 205.4 Z"></path>
+						<path d="M9366.8 615.0 L9375.6 621.3 L9365.7 625.6 L9357.0 619.4 Z"></path>
 					</g>
-					<path d="M17814.3 609.9 L19230 769 L19230 842 L19230.0 842.0 " fill="none"></path>
+					<path d="M9075.4 612.0 L5129 784 L4762.25 862.9237082066869 L4762.3 862.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17805.6 603.6 L17814.3 609.9 L17804.4 614.2 L17795.8 607.8 Z"></path>
+						<path d="M9084.9 617.0 L9075.4 612.0 L9084.4 606.3 L9094.0 611.2 Z"></path>
 					</g>
-					<path d="M17469.1 593.3 L6614.75 769 L8120.25 855.8274682306941 L8120.3 855.8 " fill="none"></path>
+					<path d="M5591.4 809.0 L5604 804 L5611.5 804 L5611.5 804 L5619 872.5 L5619 872.5 L5611.5 941 L5611.5 941 L5604 941 L5604 941 L5574 929.1896551724138 L5574.0 929.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17478.5 598.5 L17469.1 593.3 L17478.3 587.8 L17487.8 593.0 Z"></path>
+						<path d="M5580.7 807.4 L5591.4 809.0 L5584.6 817.4 L5574.0 815.8 Z"></path>
 					</g>
-					<path d="M17814.3 607.8 L19427.5 769 L19427.5 842 L19427.5 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17805.6 601.5 L17814.3 607.8 L17804.5 612.1 L17795.8 605.9 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M7062.5 610.7 L5600.5 784 L5561.968926553673 804 L5562.0 804.0 " fill="none"></path>
 					</g>
-					<path d="M17469.1 599.1 L14037.75 769 L14120.235875706214 842 L14120.2 842.0 " fill="none"></path>
+					<path d="M7063.1 616.0 L7062.5 610.7 L7061.9 605.4 L7075.8 609.1 Z"></path>
+					<path d="M9378.4 615.9 L7079.75 784 L7398.5 863.6312632321807 L7398.5 863.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17478.7 603.9 L17469.1 599.1 L17478.2 593.3 L17487.8 598.1 Z"></path>
+						<path d="M9388.1 620.5 L9378.4 615.9 L9387.3 609.9 L9397.0 614.5 Z"></path>
 					</g>
-					<path d="M17814.3 605.9 L19647 769 L19647 842 L19647.0 842.0 " fill="none"></path>
+					<path d="M9520.5 760.7 L9520.5 784 L10234.25 869.0445977785257 L10234.3 869.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17805.5 599.7 L17814.3 605.9 L17804.6 610.3 L17795.8 604.2 Z"></path>
+						<path d="M9525.8 751.3 L9520.5 760.7 L9515.2 751.3 L9520.5 742.0 Z"></path>
 					</g>
-					<path d="M7341.0 257.1 L6994.5 412 L6994.5 575 L6994.5 575.0 " fill="none"></path>
+					<path d="M9662.5 623.1 L10959.5 784 L11122.822033898305 857 L11122.8 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7351.7 258.2 L7341.0 257.1 L7347.4 248.4 L7358.1 249.5 Z"></path>
+						<path d="M9653.9 616.7 L9662.5 623.1 L9652.6 627.3 L9644.0 620.8 Z"></path>
 					</g>
-					<path d="M7433.4 265.2 L7339.5 412 L7339.5 575 L7339.5 575.0 " fill="none"></path>
+					<path d="M3212.5 680.9 L3296.75 784 L2821.75 863.3909348441927 L2821.8 863.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7443.0 260.2 L7433.4 265.2 L7434.0 254.5 L7443.5 249.5 Z"></path>
+						<path d="M3210.7 670.3 L3212.5 680.9 L3202.4 677.1 L3200.6 666.5 Z"></path>
 					</g>
-					<path d="M10177.9 604.5 L8707 769 L8690.502824858757 842 L8690.5 842.0 " fill="none"></path>
+					<path d="M7612.0 715.2 L7612 784 L7465.175141242938 857 L7465.2 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10187.8 608.8 L10177.9 604.5 L10186.6 598.2 L10196.5 602.5 Z"></path>
+						<path d="M7617.3 705.8 L7612.0 715.2 L7606.7 705.8 L7612.0 696.5 Z"></path>
 					</g>
-					<path d="M766.0 640.2 L766 769 L749.5028248587571 842 L749.5 842.0 " fill="none"></path>
+					<path d="M7444.4 620.7 L5640.5 784 L5885 839.2701149425287 L5885.0 839.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M771.3 630.8 L766.0 640.2 L760.7 630.8 L766.0 621.5 Z"></path>
+						<path d="M7454.2 625.1 L7444.4 620.7 L7453.2 614.5 L7463.0 619.0 Z"></path>
 					</g>
-					<path d="M3643.0 204.0 L766 412 L766 559.5 L766.0 559.5 " fill="none"></path>
-					<path d="M3643.3 209.4 L3643.0 204.0 L3642.6 198.7 L3656.3 203.1 Z"></path>
-					<path d="M1604.5 640.2 L1604.5 769 L1604.5 842 L1604.5 842.0 " fill="none"></path>
+					<path d="M7779.6 614.3 L10999.5 784 L11129.827683615818 857 L11129.8 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1609.8 630.8 L1604.5 640.2 L1599.2 630.8 L1604.5 621.5 Z"></path>
+						<path d="M7770.6 608.5 L7779.6 614.3 L7770.0 619.2 L7761.0 613.4 Z"></path>
 					</g>
-					<path d="M3643.0 207.2 L1604.5 412 L1604.5 559.5 L1604.5 559.5 " fill="none"></path>
-					<path d="M3643.5 212.5 L3643.0 207.2 L3642.5 201.9 L3656.3 205.8 Z"></path>
-					<path d="M7763.8 597.8 L3310.5 769 L3359.991525423729 842 L3360.0 842.0 " fill="none"></path>
+					<path d="M7444.5 627.5 L6254.75 784 L6339.504237288135 857 L6339.5 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7773.4 602.7 L7763.8 597.8 L7773.0 592.1 L7782.5 597.1 Z"></path>
+						<path d="M7454.4 631.6 L7444.5 627.5 L7453.1 621.0 L7463.0 625.1 Z"></path>
 					</g>
-					<path d="M8142.2 596.0 L14077.75 769 L14127.24152542373 842 L14127.2 842.0 " fill="none"></path>
+					<path d="M6196.6 815.8 L6209 811.5 L6216.5 811.5 L6216.5 811.5 L6224 872.5 L6224 872.5 L6216.5 933.5 L6216.5 933.5 L6209 933.5 L6209 933.5 L6179 923.1610169491526 L6179.0 923.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8133.0 590.4 L8142.2 596.0 L8132.7 601.1 L8123.5 595.5 Z"></path>
+						<path d="M6186.1 813.8 L6196.6 815.8 L6189.6 823.8 L6179.0 821.8 Z"></path>
 					</g>
-					<path d="M7763.9 598.7 L3855.5 769 L4013.8728813559323 842 L4013.9 842.0 " fill="none"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M7062.7 613.9 L6174.75 784 L6130.392655367232 811.5 L6130.4 811.5 " fill="none"></path>
+					</g>
+					<path d="M7063.7 619.1 L7062.7 613.9 L7061.7 608.6 L7075.8 611.3 Z"></path>
+					<path d="M7478.6 262.6 L8002 427 L8002 590 L8002.0 590.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7773.4 603.7 L7763.9 598.7 L7772.9 593.0 L7782.5 597.9 Z"></path>
+						<path d="M7471.3 254.7 L7478.6 262.6 L7468.1 264.9 L7460.8 257.0 Z"></path>
 					</g>
-					<path d="M19726.6 593.8 L8747 769 L8697.50847457627 842 L8697.5 842.0 " fill="none"></path>
+					<path d="M7529.3 254.0 L8347 427 L8347 590 L8347.0 590.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19736.0 599.0 L19726.6 593.8 L19735.8 588.3 L19745.3 593.5 Z"></path>
+						<path d="M7521.2 246.9 L7529.3 254.0 L7519.0 257.3 L7511.0 250.1 Z"></path>
 					</g>
-					<path d="M19926.9 692.6 L19921 769 L19921 842 L19921.0 842.0 " fill="none"></path>
+					<path d="M11158.4 214.9 L8993 427 L8993 590 L8993.0 590.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19932.9 683.7 L19926.9 692.6 L19922.3 682.9 L19928.3 674.0 Z"></path>
+						<path d="M11168.2 219.3 L11158.4 214.9 L11167.2 208.7 L11177.0 213.1 Z"></path>
 					</g>
-					<path d="M20098.7 683.2 L20250.5 769 L20250.5 842 L20250.5 842.0 " fill="none"></path>
+					<path d="M10710.6 616.4 L13364.5 784 L13364.5 857 L13364.5 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20093.2 674.0 L20098.7 683.2 L20088.0 683.2 L20082.5 674.0 Z"></path>
+						<path d="M10701.7 610.5 L10710.6 616.4 L10701.0 621.1 L10692.0 615.2 Z"></path>
 					</g>
-					<path d="M20142.2 648.7 L20571 769 L20571 842 L20571.0 842.0 " fill="none"></path>
+					<path d="M10365.7 640.0 L9645.5 784 L10234.25 868.345406717928 L10234.3 868.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20134.7 641.1 L20142.2 648.7 L20131.8 651.3 L20124.3 643.7 Z"></path>
+						<path d="M10375.9 643.4 L10365.7 640.0 L10373.8 632.9 L10384.0 636.3 Z"></path>
 					</g>
-					<path d="M20142.6 631.6 L20838 769 L20838 842 L20838.0 842.0 " fill="none"></path>
+					<path d="M10710.6 619.6 L12724 784 L12724 857 L12724.0 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20134.4 624.5 L20142.6 631.6 L20132.4 635.0 L20124.3 627.9 Z"></path>
+						<path d="M10701.7 613.5 L10710.6 619.6 L10700.9 624.2 L10692.0 618.1 Z"></path>
 					</g>
-					<path d="M18123.4 635.2 L17424 769 L17335.74011299435 842 L17335.7 842.0 " fill="none"></path>
+					<path d="M10709.6 666.6 L11039.5 784 L11136.833333333334 857 L11136.8 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18133.6 638.6 L18123.4 635.2 L18131.6 628.2 L18141.8 631.6 Z"></path>
+						<path d="M10702.6 658.4 L10709.6 666.6 L10699.0 668.5 L10692.0 660.3 Z"></path>
 					</g>
-					<path d="M18123.2 618.5 L16866.25 769 L15931 853.4803521306455 L15931.0 853.5 " fill="none"></path>
+					<path d="M10365.4 619.1 L8265.25 784 L8265.25 857 L8265.3 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18133.1 622.7 L18123.2 618.5 L18131.8 612.1 L18141.8 616.2 Z"></path>
+						<path d="M10375.1 623.6 L10365.4 619.1 L10374.3 613.0 L10384.0 617.6 Z"></path>
 					</g>
-					<path d="M18590.4 605.5 L21144 769 L21144 842 L21144.0 842.0 " fill="none"></path>
+					<path d="M17050.3 646.4 L17269.75 784 L17269.75 857 L17269.8 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18581.4 599.5 L18590.4 605.5 L18580.7 610.2 L18571.8 604.3 Z"></path>
+						<path d="M17045.2 636.9 L17050.3 646.4 L17039.5 646.0 L17034.5 636.5 Z"></path>
 					</g>
-					<path d="M12792.1 593.6 L3350.5 769 L3366.997175141243 842 L3367.0 842.0 " fill="none"></path>
+					<path d="M11386.3 207.9 L16985 427 L16985 574.5 L16985.0 574.5 " fill="none"></path>
+					<path d="M11386.5 202.5 L11386.3 207.9 L11386.1 213.2 L11373.0 207.3 Z"></path>
+					<path d="M12195.3 612.6 L7652 784 L7469.5 858.0883027522935 L7469.5 858.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12801.5 598.8 L12792.1 593.6 L12801.3 588.1 L12810.8 593.3 Z"></path>
+						<path d="M12204.9 617.6 L12195.3 612.6 L12204.5 607.0 L12214.0 611.9 Z"></path>
 					</g>
-					<path d="M13127.4 596.6 L17842 769 L17901.350282485877 796.5 L17901.4 796.5 " fill="none"></path>
+					<path d="M12195.9 650.9 L11642.75 784 L11210 862.9250386398763 L11210.0 862.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13118.3 591.0 L13127.4 596.6 L13117.9 601.6 L13108.8 595.9 Z"></path>
+						<path d="M12206.2 653.9 L12195.9 650.9 L12203.7 643.5 L12214.0 646.5 Z"></path>
 					</g>
-					<path d="M13127.2 616.3 L14117.75 769 L14134.247175141243 842 L14134.2 842.0 " fill="none"></path>
+					<path d="M12573.7 610.6 L18963 784 L19068.78813559322 857 L19068.8 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13118.8 609.6 L13127.2 616.3 L13117.2 620.2 L13108.8 613.5 Z"></path>
+						<path d="M12564.5 605.0 L12573.7 610.6 L12564.2 615.7 L12555.0 610.1 Z"></path>
 					</g>
-					<path d="M13126.1 656.8 L13407.75 769 L11523.5 853.5297807628945 L11523.5 853.5 " fill="none"></path>
+					<path d="M4137.1 651.4 L4036.25 784 L3974.385593220339 857 L3974.4 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13119.4 648.4 L13126.1 656.8 L13115.4 658.3 L13108.8 649.9 Z"></path>
+						<path d="M4147.0 647.2 L4137.1 651.4 L4138.5 640.7 L4148.4 636.5 Z"></path>
 					</g>
-					<path d="M18197.6 800.8 L18210 796.5 L18217.5 796.5 L18217.5 796.5 L18225 857.5 L18225 857.5 L18217.5 918.5 L18217.5 918.5 L18210 918.5 L18210 918.5 L18180 908.1610169491526 L18180.0 908.2 " fill="none"></path>
+					<path d="M11163.7 207.0 L4172 427 L4172 574.5 L4172.0 574.5 " fill="none"></path>
+					<path d="M11163.8 212.3 L11163.7 207.0 L11163.5 201.7 L11177.0 206.6 Z"></path>
+					<path d="M11968.7 609.6 L17475.5 784 L17491.99717514124 857 L17492.0 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18187.1 798.8 L18197.6 800.8 L18190.6 808.8 L18180.0 806.8 Z"></path>
+						<path d="M11959.5 604.0 L11968.7 609.6 L11959.2 614.6 L11950.0 609.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M16070.0 594.0 L18238 769 L18174.29943502825 796.5 L18174.3 796.5 " fill="none"></path>
+					<path d="M11709.4 611.1 L7692 784 L7469.5 860.3226744186046 L7469.5 860.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M11718.9 616.0 L11709.4 611.1 L11718.4 605.4 L11728.0 610.3 Z"></path>
 					</g>
-					<path d="M16070.5 588.7 L16070.0 594.0 L16069.6 599.4 L16056.8 593.0 Z"></path>
-					<path d="M5367.6 598.1 L2140.25 769 L2123.752824858757 842 L2123.8 842.0 " fill="none"></path>
+					<path d="M6648.5 693.1 L6657 784 L6657 857 L6657.0 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5377.2 602.9 L5367.6 598.1 L5376.6 592.3 L5386.3 597.1 Z"></path>
+						<path d="M6652.9 683.3 L6648.5 693.1 L6642.3 684.3 L6646.7 674.5 Z"></path>
 					</g>
-					<path d="M5653.9 598.3 L8787 769 L8704.514124293786 842 L8704.5 842.0 " fill="none"></path>
+					<path d="M5688.7 221.8 L6640.25 427 L6640.25 536.5 L6640.3 536.5 " fill="none"></path>
+					<path d="M5689.8 216.6 L5688.7 221.8 L5687.5 227.0 L5675.6 219.0 Z"></path>
+					<path d="M17936.6 622.3 L15928.75 784 L16337 859.2319104633003 L16337.0 859.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5644.9 592.5 L5653.9 598.3 L5644.3 603.1 L5635.3 597.3 Z"></path>
+						<path d="M17946.4 626.8 L17936.6 622.3 L17945.5 616.2 L17955.3 620.8 Z"></path>
 					</g>
-					<path d="M2068.2 678.7 L2180.25 769 L2130.758474576271 842 L2130.8 842.0 " fill="none"></path>
+					<path d="M18352.3 662.5 L18794.75 784 L18794.75 857 L18794.8 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2064.3 668.7 L2068.2 678.7 L2057.6 677.0 L2053.7 667.0 Z"></path>
+						<path d="M18344.7 654.9 L18352.3 662.5 L18341.8 665.2 L18334.3 657.5 Z"></path>
 					</g>
-					<path d="M1116.1 213.4 L1810.25 412 L1895.107142857143 514 L1895.1 514.0 " fill="none"></path>
-					<path d="M1117.5 208.3 L1116.1 213.4 L1114.6 218.5 L1103.3 209.7 Z"></path>
-					<path d="M11879.6 213.4 L10534.5 412 L10534.5 575 L10534.5 575.0 " fill="none"></path>
-					<path d="M11880.3 218.7 L11879.6 213.4 L11878.8 208.2 L11892.7 211.5 Z"></path>
-					<path d="M6879.6 203.6 L2007.25 412 L1979.5357142857142 514 L1979.5 514.0 " fill="none"></path>
+					<path d="M18311.0 698.1 L18465.25 784 L18465.25 857 L18465.3 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6889.2 208.5 L6879.6 203.6 L6888.7 197.9 L6898.3 202.8 Z"></path>
+						<path d="M18305.4 688.9 L18311.0 698.1 L18300.2 698.2 L18294.7 689.0 Z"></path>
 					</g>
-					<path d="M7235.9 206.1 L10881.5 412 L10990.62324929972 575 L10990.6 575.0 " fill="none"></path>
+					<path d="M18144.8 707.7 L18144.75 784 L18144.75 857 L18144.8 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7226.9 200.2 L7235.9 206.1 L7226.3 210.9 L7217.3 205.0 Z"></path>
+						<path d="M18150.1 698.3 L18144.8 707.7 L18139.4 698.3 L18144.8 689.0 Z"></path>
 					</g>
-					<path d="M7235.9 205.4 L11145 412 L11528.529411764706 575 L11528.5 575.0 " fill="none"></path>
+					<path d="M18004.3 699.4 L17877.75 784 L17877.75 857 L17877.8 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7226.9 199.6 L7235.9 205.4 L7226.3 210.2 L7217.3 204.4 Z"></path>
+						<path d="M18015.1 698.6 L18004.3 699.4 L18009.1 689.8 L18019.9 689.0 Z"></path>
 					</g>
-					<path d="M7719.6 202.7 L2155.75 412 L2043.1785714285713 514 L2043.2 514.0 " fill="none"></path>
+					<path d="M9079.8 211.7 L11570 427 L11570 590 L11570.0 590.0 " fill="none"></path>
+					<path d="M9080.2 206.4 L9079.8 211.7 L9079.3 217.0 L9066.5 210.5 Z"></path>
+					<path d="M5892.1 634.3 L5255.75 784 L4762.25 865.1798327137546 L4762.3 865.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7729.1 207.7 L7719.6 202.7 L7728.7 197.0 L7738.3 202.0 Z"></path>
+						<path d="M5902.4 637.3 L5892.1 634.3 L5899.9 626.9 L5910.3 630.0 Z"></path>
 					</g>
-					<path d="M8075.9 208.4 L11001 412 L11001 575 L11001.0 575.0 " fill="none"></path>
+					<path d="M9421.5 210.4 L12082 427 L12082 590 L12082.0 590.0 " fill="none"></path>
+					<path d="M9422.0 205.0 L9421.5 210.4 L9421.1 215.7 L9408.3 209.3 Z"></path>
+					<path d="M13995.1 856.0 L14408.333333333334 819 L14516.291666666666 819 L14516.291666666666 819 L14624.25 872.5 L14624.25 872.5 L14516.291666666666 926 L14516.291666666666 926 L14408.333333333334 926 L14408.333333333334 926 L13976.5 887.2905612957275 L13976.5 887.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8066.9 202.4 L8075.9 208.4 L8066.2 213.1 L8057.3 207.1 Z"></path>
+						<path d="M13985.3 851.6 L13995.1 856.0 L13986.3 862.2 L13976.5 857.7 Z"></path>
 					</g>
-					<path d="M8075.9 204.3 L12530.5 412 L11618 580.7014500258933 L11618.0 580.7 " fill="none"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M7150.1 606.7 L13695 784 L13741.073446327684 819 L13741.1 819.0 " fill="none"></path>
+					</g>
+					<path d="M7150.2 601.4 L7150.1 606.7 L7149.9 612.0 L7136.8 606.3 Z"></path>
+					<path d="M6343.3 676.2 L6397.5 784 L6364.505649717514 857 L6364.5 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8066.8 198.5 L8075.9 204.3 L8066.3 209.2 L8057.3 203.4 Z"></path>
+						<path d="M6343.9 665.4 L6343.3 676.2 L6334.3 670.2 L6334.9 659.5 Z"></path>
 					</g>
-					<path d="M12681.7 217.9 L11105 412 L11010.03081232493 575 L11010.0 575.0 " fill="none"></path>
+					<path d="M9919.0 210.5 L12676 427 L12676 559 L12676.0 559.0 " fill="none"></path>
+					<path d="M9919.5 205.2 L9919.0 210.5 L9918.6 215.8 L9905.8 209.5 Z"></path>
+					<path d="M16673.0 670.7 L16673 784 L16455.237288135595 857 L16455.2 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12691.6 222.1 L12681.7 217.9 L12690.3 211.5 L12700.3 215.6 Z"></path>
+						<path d="M16678.3 661.3 L16673.0 670.7 L16667.7 661.3 L16673.0 652.0 Z"></path>
 					</g>
-					<path d="M8144.9 607.3 L5957.25 769 L5894.973163841808 842 L5895.0 842.0 " fill="none"></path>
+					<path d="M11168.6 620.8 L13588 784 L13547.169491525423 857 L13547.2 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8154.6 612.0 L8144.9 607.3 L8153.8 601.3 L8163.5 605.9 Z"></path>
+						<path d="M11159.7 614.9 L11168.6 620.8 L11159.0 625.5 L11150.0 619.6 Z"></path>
 					</g>
-					<path d="M8144.8 598.7 L3390.5 769 L3374.002824858757 842 L3374.0 842.0 " fill="none"></path>
+					<path d="M10713.4 618.2 L7732 784 L7469.5 861.9572147651006 L7469.5 862.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8154.4 603.7 L8144.8 598.7 L8154.0 593.0 L8163.5 598.0 Z"></path>
+						<path d="M10723.0 623.0 L10713.4 618.2 L10722.4 612.3 L10732.0 617.1 Z"></path>
 					</g>
-					<path d="M8600.2 597.5 L14157.75 769 L14141.252824858757 842 L14141.3 842.0 " fill="none"></path>
+					<path d="M11168.1 660.2 L11682.75 784 L11210 863.6542122798668 L11210.0 863.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8591.0 591.9 L8600.2 597.5 L8590.7 602.6 L8581.5 596.9 Z"></path>
+						<path d="M11160.3 652.8 L11168.1 660.2 L11157.8 663.2 L11150.0 655.8 Z"></path>
 					</g>
-					<path d="M18714.0 792.4 L18726 789 L18733.5 789 L18733.5 789 L18741 857.5 L18741 857.5 L18733.5 926 L18733.5 926 L18726 926 L18726 926 L18696 917.5432098765432 L18696.0 917.5 " fill="none"></path>
+					<path d="M4528.2 807.4 L4540.25 804 L4547.75 804 L4547.75 804 L4555.25 872.5 L4555.25 872.5 L4547.75 941 L4547.75 941 L4540.25 941 L4540.25 941 L4510.25 932.5432098765432 L4510.3 932.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18703.5 789.8 L18714.0 792.4 L18706.4 800.1 L18696.0 797.5 Z"></path>
+						<path d="M4517.8 804.8 L4528.2 807.4 L4520.7 815.1 L4510.3 812.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M16070.0 593.7 L18483 769 L18483 789 L18483.0 789.0 " fill="none"></path>
+						<path d="M7062.4 608.3 L4297.25 784 L4297.25 804 L4297.3 804.0 " fill="none"></path>
 					</g>
-					<path d="M16070.4 588.4 L16070.0 593.7 L16069.7 599.0 L16056.8 592.7 Z"></path>
-					<path d="M3282.8 669.4 L3430.5 769 L3381.008474576271 842 L3381.0 842.0 " fill="none"></path>
+					<path d="M7062.8 613.6 L7062.4 608.3 L7062.1 603.0 L7075.8 607.4 Z"></path>
+					<path d="M11430.7 609.7 L16809 784 L16479.05649717514 857 L16479.1 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3278.1 659.8 L3282.8 669.4 L3272.1 668.6 L3267.3 659.0 Z"></path>
+						<path d="M11421.5 604.1 L11430.7 609.7 L11421.2 614.7 L11412.0 609.1 Z"></path>
 					</g>
-					<path d="M8864.8 595.2 L3647 769 L3406 846.1374321880651 L3406.0 846.1 " fill="none"></path>
+					<path d="M11171.8 635.6 L10535.75 784 L10292.25 863.0816513761467 L10292.3 863.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8874.3 600.3 L8864.8 595.2 L8874.0 589.6 L8883.5 594.6 Z"></path>
+						<path d="M11182.1 638.7 L11171.8 635.6 L11179.7 628.3 L11190.0 631.4 Z"></path>
 					</g>
-					<path d="M8864.9 601.7 L6752 769 L8120.25 855.663177670424 L8120.3 855.7 " fill="none"></path>
+					<path d="M11171.3 609.4 L5295.75 784 L4762.25 865.6864186851211 L4762.3 865.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8874.6 606.3 L8864.9 601.7 L8873.8 595.7 L8883.5 600.3 Z"></path>
+						<path d="M11180.8 614.4 L11171.3 609.4 L11180.5 603.7 L11190.0 608.8 Z"></path>
 					</g>
-					<path d="M9149.2 595.4 L14197.75 769 L14148.25847457627 842 L14148.3 842.0 " fill="none"></path>
+					<path d="M11430.7 609.2 L17515.5 784 L17499.00282485876 857 L17499.0 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9140.0 589.7 L9149.2 595.4 L9139.6 600.4 L9130.5 594.7 Z"></path>
+						<path d="M11421.5 603.6 L11430.7 609.2 L11421.2 614.3 L11412.0 608.7 Z"></path>
 					</g>
-					<path d="M13994.9 662.1 L13957.75 769 L11523.5 854.3953522941234 L11523.5 854.4 " fill="none"></path>
+					<path d="M13728.2 610.5 L19324.25 784 L19324.25 857 L19324.3 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14003.0 655.1 L13994.9 662.1 L13992.9 651.6 L14001.0 644.5 Z"></path>
+						<path d="M13719.0 604.9 L13728.2 610.5 L13718.7 615.6 L13709.5 609.9 Z"></path>
 					</g>
-					<path d="M2802.0 677.7 L2802 769 L2802 842 L2802.0 842.0 " fill="none"></path>
+					<path d="M13403.8 610.5 L7772 784 L7469.5 863.2048816568048 L7469.5 863.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2807.3 668.3 L2802.0 677.7 L2796.7 668.3 L2802.0 659.0 Z"></path>
+						<path d="M13413.3 615.5 L13403.8 610.5 L13413.0 604.9 L13422.5 609.9 Z"></path>
 					</g>
-					<path d="M2963.8 623.1 L3687 769 L3406 847.5734597156398 L3406.0 847.6 " fill="none"></path>
+					<path d="M13943.5 425.7 L13943.5 427 L13943.5 590 L13943.5 590.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2955.7 616.1 L2963.8 623.1 L2953.6 626.5 L2945.5 619.4 Z"></path>
+						<path d="M13948.8 416.3 L13943.5 425.7 L13938.2 416.3 L13943.5 407.0 Z"></path>
 					</g>
-					<path d="M8969.2 209.8 L14280.75 412 L14280.75 575 L14280.8 575.0 " fill="none"></path>
+					<path d="M14233.9 418.1 L14246 427 L14246 590 L14246.0 590.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8960.0 204.1 L8969.2 209.8 L8959.6 214.8 L8950.5 209.1 Z"></path>
+						<path d="M14229.6 408.3 L14233.9 418.1 L14223.3 416.8 L14218.9 407.0 Z"></path>
 					</g>
-					<path d="M8969.2 209.1 L14583.25 412 L14583.25 575 L14583.3 575.0 " fill="none"></path>
+					<path d="M13833.2 423.7 L13831.5 427 L13831.5 605.5 L13831.5 605.5 L13831.5 784 L13831.5 784 L13823.590395480225 819 L13823.6 819.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8960.0 203.4 L8969.2 209.1 L8959.6 214.1 L8950.5 208.4 Z"></path>
+						<path d="M13842.1 417.7 L13833.2 423.7 L13832.6 413.0 L13841.5 407.0 Z"></path>
 					</g>
-					<path d="M8243.8 208.9 L2541.5 412 L2541.5 590.5 L2541.5 590.5 L2541.5 769 L2541.5 769 L2511.04802259887 804 L2511.0 804.0 " fill="none"></path>
+					<path d="M14305.0 335.3 L14556.5 427 L14556.5 590 L14556.5 590.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8253.4 213.9 L8243.8 208.9 L8253.0 203.3 L8262.5 208.3 Z"></path>
+						<path d="M14298.1 327.1 L14305.0 335.3 L14294.4 337.1 L14287.5 328.9 Z"></path>
 					</g>
-					<path d="M8969.2 208.5 L14893.75 412 L14893.75 575 L14893.8 575.0 " fill="none"></path>
+					<path d="M14305.7 284.9 L14938 427 L14938 590 L14938.0 590.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8960.0 202.8 L8969.2 208.5 L8959.6 213.5 L8950.5 207.8 Z"></path>
+						<path d="M14297.8 277.7 L14305.7 284.9 L14295.4 288.1 L14287.5 280.8 Z"></path>
 					</g>
-					<path d="M8969.2 207.7 L15275.25 412 L15275.25 575 L15275.3 575.0 " fill="none"></path>
+					<path d="M13583.7 416.5 L13566 427 L13566 537 L13566.0 537.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8960.0 202.1 L8969.2 207.7 L8959.7 212.8 L8950.5 207.1 Z"></path>
+						<path d="M13594.5 416.3 L13583.7 416.5 L13589.0 407.2 L13599.8 407.0 Z"></path>
 					</g>
-					<path d="M8243.8 209.5 L2802 412 L2802 522 L2802.0 522.0 " fill="none"></path>
+					<path d="M14306.1 219.0 L19187.75 427 L19187.75 605.5 L19187.75 605.5 L19187.75 784 L19187.75 784 L19108.151129943504 857 L19108.2 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8253.4 214.5 L8243.8 209.5 L8253.0 203.8 L8262.5 208.8 Z"></path>
+						<path d="M14297.1 213.2 L14306.1 219.0 L14296.6 223.9 L14287.5 218.2 Z"></path>
 					</g>
-					<path d="M8243.9 213.7 L4191 412 L4191 590.5 L4191 590.5 L4191 769 L4191 769 L4072.632768361582 842 L4072.6 842.0 " fill="none"></path>
+					<path d="M13580.8 216.7 L7812 427 L7812 605.5 L7812 605.5 L7812 784 L7812 784 L7469.5 864.188492063492 L7469.5 864.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8253.4 218.6 L8243.9 213.7 L8252.9 208.0 L8262.5 212.8 Z"></path>
+						<path d="M13590.4 221.7 L13580.8 216.7 L13590.0 211.0 L13599.5 216.0 Z"></path>
 					</g>
-					<path d="M8243.9 212.1 L3727 412 L3727 590.5 L3727 590.5 L3727 769 L3727 769 L3406 848.687237026648 L3406.0 848.7 " fill="none"></path>
+					<path d="M13581.3 285.2 L12952.25 427 L12952.25 605.5 L12952.25 605.5 L12952.25 784 L12952.25 784 L12983.7895480226 819 L12983.8 819.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8253.4 217.0 L8243.9 212.1 L8252.9 206.3 L8262.5 211.2 Z"></path>
+						<path d="M13591.6 288.3 L13581.3 285.2 L13589.2 277.9 L13599.5 281.1 Z"></path>
 					</g>
-					<path d="M8243.9 213.9 L4231 412 L4231 590.5 L4231 590.5 L4231 769 L4231 769 L4287.751412429378 804 L4287.8 804.0 " fill="none"></path>
+					<path d="M13226.6 822.1 L13238.5 819 L13246 819 L13246 819 L13253.5 872.5 L13253.5 872.5 L13246 926 L13246 926 L13238.5 926 L13238.5 926 L13208.5 918.227602905569 L13208.5 918.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8253.4 218.8 L8243.9 213.9 L8252.9 208.1 L8262.5 213.0 Z"></path>
+						<path d="M13216.2 819.3 L13226.6 822.1 L13218.9 829.6 L13208.5 826.8 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M7150.1 606.8 L13178.25 784 L13120.411016949152 819 L13120.4 819.0 " fill="none"></path>
 					</g>
-					<path d="M4569.1 807.1 L4581 804 L4588.5 804 L4588.5 804 L4596 857.5 L4596 857.5 L4588.5 911 L4588.5 911 L4581 911 L4581 911 L4551 903.227602905569 L4551.0 903.2 " fill="none"></path>
+					<path d="M7150.2 601.5 L7150.1 606.8 L7149.9 612.1 L7136.8 606.4 Z"></path>
+					<path d="M17638.8 695.6 L17555.5 784 L17506.008474576272 857 L17506.0 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4558.7 804.3 L4569.1 807.1 L4561.4 814.6 L4551.0 811.8 Z"></path>
+						<path d="M17649.1 692.4 L17638.8 695.6 L17641.4 685.1 L17651.6 682.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M15982.4 591.2 L4516.75 769 L4460.492937853107 804 L4460.5 804.0 " fill="none"></path>
+					<path d="M18582.6 214.1 L17359 427 L17591.75 540.9023303632625 L17591.8 540.9 " fill="none"></path>
+					<path d="M18583.5 219.4 L18582.6 214.1 L18581.7 208.9 L18595.8 211.9 Z"></path>
+					<path d="M16444.3 222.2 L15612.5 427 L15612.5 590 L15612.5 590.0 " fill="none"></path>
+					<path d="M16445.6 227.4 L16444.3 222.2 L16443.1 217.0 L16457.3 219.0 Z"></path>
+					<path d="M17378.9 248.2 L18089.5 427 L17855.75 541.078947368421 L17855.8 541.1 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M17371.1 240.7 L17378.9 248.2 L17368.5 251.1 L17360.8 243.6 Z"></path>
 					</g>
-					<path d="M15982.5 596.5 L15982.4 591.2 L15982.3 585.8 L15995.8 591.0 Z"></path>
-					<path d="M12789.4 594.6 L21425 769 L21425 842 L21425.0 842.0 " fill="none"></path>
+					<path d="M17023.3 231.0 L15753.5 427 L15882.25630252101 590 L15882.3 590.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12780.2 589.1 L12789.4 594.6 L12780.0 599.7 L12770.8 594.2 Z"></path>
+						<path d="M17033.3 234.8 L17023.3 231.0 L17031.7 224.3 L17041.8 228.1 Z"></path>
 					</g>
-					<path d="M12789.3 612.4 L14237.75 769 L14155.264124293786 842 L14155.3 842.0 " fill="none"></path>
+					<path d="M17023.6 247.2 L16293.5 427 L16457.413165266105 590 L16457.4 590.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12780.6 606.1 L12789.3 612.4 L12779.5 616.7 L12770.8 610.4 Z"></path>
+						<path d="M17034.0 250.2 L17023.6 247.2 L17031.4 239.8 L17041.8 242.8 Z"></path>
 					</g>
-					<path d="M12384.1 594.6 L3815.5 769 L3406 850.4398876404495 L3406.0 850.4 " fill="none"></path>
+					<path d="M17794.3 250.9 L18454.25 427 L17855.75 573.2453798767967 L17855.8 573.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12393.5 599.8 L12384.1 594.6 L12393.3 589.1 L12402.8 594.2 Z"></path>
+						<path d="M17786.6 243.3 L17794.3 250.9 L17783.9 253.6 L17776.3 246.1 Z"></path>
 					</g>
-					<path d="M12384.1 596.0 L5997.25 769 L5901.978813559322 842 L5902.0 842.0 " fill="none"></path>
+					<path d="M17438.7 225.3 L15793.5 427 L15885.729691876752 590 L15885.7 590.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12393.6 601.1 L12384.1 596.0 L12393.3 590.4 L12402.8 595.5 Z"></path>
+						<path d="M17448.6 229.5 L17438.7 225.3 L17447.3 218.9 L17457.3 223.1 Z"></path>
 					</g>
-					<path d="M12384.1 598.8 L8209.25 769 L8159.7584745762715 842 L8159.8 842.0 " fill="none"></path>
+					<path d="M17439.1 247.2 L16709 427 L16493.49299719888 590 L16493.5 590.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12393.6 603.7 L12384.1 598.8 L12393.2 593.1 L12402.8 598.0 Z"></path>
+						<path d="M17449.5 250.2 L17439.1 247.2 L17446.9 239.8 L17457.3 242.8 Z"></path>
 					</g>
-					<path d="M17222.5 640.0 L16906.25 769 L15931 853.6380240254964 L15931.0 853.6 " fill="none"></path>
+					<path d="M16664.6 247.2 L15934.5 427 L15897.973389355742 590 L15898.0 590.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17233.1 641.4 L17222.5 640.0 L17229.1 631.5 L17239.8 632.9 Z"></path>
+						<path d="M16675.0 250.2 L16664.6 247.2 L16672.4 239.8 L16682.8 242.8 Z"></path>
 					</g>
-					<path d="M16794.0 224.8 L16794 412 L16794 544 L16794.0 544.0 " fill="none"></path>
-					<path d="M16799.3 224.8 L16794.0 224.8 L16788.7 224.8 L16794.0 211.5 Z"></path>
-					<path d="M13549.1 592.9 L2320.25 769 L2155.2782485875705 842 L2155.3 842.0 " fill="none"></path>
+					<path d="M17463.3 685.6 L17595.5 784 L17513.014124293786 857 L17513.0 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13558.5 598.0 L13549.1 592.9 L13558.3 587.4 L13567.8 592.6 Z"></path>
+						<path d="M17458.9 675.8 L17463.3 685.6 L17452.6 684.3 L17448.3 674.5 Z"></path>
 					</g>
-					<path d="M13549.1 595.4 L8249.25 769 L8166.764124293785 842 L8166.8 842.0 " fill="none"></path>
+					<path d="M17253.6 686.1 L17129.75 784 L16481 863.659209157128 L16481.0 863.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13558.6 600.4 L13549.1 595.4 L13558.2 589.8 L13567.8 594.8 Z"></path>
+						<path d="M17264.2 684.5 L17253.6 686.1 L17257.6 676.1 L17268.2 674.5 Z"></path>
 					</g>
-					<path d="M13849.4 595.8 L18726.5 769 L18786 794.8759213759214 L18786.0 794.9 " fill="none"></path>
+					<path d="M13401.2 611.2 L19511.75 784 L19511.75 857 L19511.8 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13840.3 590.2 L13849.4 595.8 L13839.9 600.8 L13830.8 595.2 Z"></path>
+						<path d="M13392.0 605.6 L13401.2 611.2 L13391.7 616.3 L13382.5 610.7 Z"></path>
 					</g>
-					<path d="M13848.6 636.6 L14277.75 769 L14162.2697740113 842 L14162.3 842.0 " fill="none"></path>
+					<path d="M12996.6 666.9 L12612 784 L11210 869.3056033001031 L11210.0 869.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13841.2 628.7 L13848.6 636.6 L13838.1 638.9 L13830.8 631.1 Z"></path>
+						<path d="M13007.1 669.3 L12996.6 666.9 L13004.0 659.1 L13014.5 661.5 Z"></path>
 					</g>
-					<path d="M13849.4 598.8 L16946.25 769 L15931 853.7837933474876 L15931.0 853.8 " fill="none"></path>
+					<path d="M12995.8 612.8 L8225.25 784 L7469.5 868.5293838862559 L7469.5 868.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13840.4 592.9 L13849.4 598.8 L13839.8 603.6 L13830.8 597.7 Z"></path>
+						<path d="M13005.4 617.8 L12995.8 612.8 L13005.0 607.1 L13014.5 612.1 Z"></path>
 					</g>
-					<path d="M19091.4 794.0 L19104 789 L19111.5 789 L19111.5 789 L19119 857.5 L19119 857.5 L19111.5 926 L19111.5 926 L19104 926 L19104 926 L19074 914.1896551724138 L19074.0 914.2 " fill="none"></path>
+					<path d="M13399.9 684.2 L13655 784 L13558.90395480226 857 L13558.9 857.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19080.7 792.4 L19091.4 794.0 L19084.6 802.4 L19074.0 800.8 Z"></path>
+						<path d="M13393.1 675.9 L13399.9 684.2 L13389.3 685.8 L13382.5 677.4 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M16070.1 593.1 L19060 769 L19030.621468926554 789 L19030.6 789.0 " fill="none"></path>
+					<path d="M12995.9 619.3 L10575.75 784 L10292.25 864.2872 L10292.3 864.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M13005.6 624.0 L12995.9 619.3 L13004.8 613.3 L13014.5 618.0 Z"></path>
+					</g>
+					<g data-name="AsyncValueWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValueWidget">
+							<rect x="1687.3" y="506.5" height="198.0" width="384.0" data-name="AsyncValueWidget"></rect>
+							<path d="M1687.3 537.5 L2071.3 537.5" fill="none" data-name="AsyncValueWidget"></path>
+							<path d="M1687.3 628.5 L2071.3 628.5" fill="none" data-name="AsyncValueWidget"></path>
+						</g>
+						<g transform="translate(1687.25, 506.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AsyncValueWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValueWidget">
+								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValueWidget">AsyncValueWidget</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1687.25, 537.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+value: AsyncValue&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">+data: Widget Function(T)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">+error: Widget Function(Object, StackTrace?)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">+loading: Widget Function()?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AsyncValueWidget">+empty: Widget Function()?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1687.25, 628.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">-Widget _buildDataOrEmptyWidget()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultError()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultLoad()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="AsyncValue">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
+							<rect x="2712.8" y="857.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
+						</g>
+						<g transform="translate(2712.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
+								
+							</g>
+						</g>
 					</g>
-					<path d="M16070.4 587.8 L16070.1 593.1 L16069.7 598.4 L16056.8 592.3 Z"></path>
-					<path d="M6498.9 606.5 L4848.5 769 L4848.5 842 L4848.5 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6508.7 610.9 L6498.9 606.5 L6507.7 600.2 L6517.5 604.6 Z"></path>
+					<g data-name="Widget Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
+							<rect x="3878.3" y="857.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
+						</g>
+						<g transform="translate(3878.25, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
+								
+							</g>
+						</g>
 					</g>
-					<path d="M4929.5 210.2 L6661 412 L6661 521.5 L6661.0 521.5 " fill="none"></path>
-					<path d="M4930.1 204.9 L4929.5 210.2 L4928.9 215.5 L4916.3 208.7 Z"></path>
-					<g data-name="ISyncIndicatorViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ISyncIndicatorViewModel">
-							<rect x="0.0" y="157.5" height="77.0" width="214.0" data-name="ISyncIndicatorViewModel"></rect>
-							<path d="M0.0 188.5 L214.0 188.5" fill="none" data-name="ISyncIndicatorViewModel"></path>
+					<g data-name="Widget Function(Object, StackTrace?)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Object, StackTrace?)?">
+							<rect x="206.0" y="857.0" height="31.0" width="326.0" data-name="Widget Function(Object, StackTrace?)?"></rect>
 						</g>
-						<g transform="translate(0, 157.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ISyncIndicatorViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ISyncIndicatorViewModel">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="ISyncIndicatorViewModel">ISyncIndicatorViewModel</text>
+						<g transform="translate(206, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Object, StackTrace?)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Object, StackTrace?)?">
+								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Object, StackTrace?)?">Widget Function(Object, StackTrace?)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 188.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ISyncIndicatorViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ISyncIndicatorViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ISyncIndicatorViewModel">+isDirty: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ISyncIndicatorViewModel">+lastSynced: DateTime?</text>
+					</g>
+					<g data-name="Widget Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function()?">
+							<rect x="0.0" y="857.0" height="31.0" width="166.0" data-name="Widget Function()?"></rect>
+						</g>
+						<g transform="translate(0, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function()?">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function()?">Widget Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SyncIndicator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SyncIndicator">
-							<rect x="7534.5" y="529.5" height="122.0" width="208.0" data-name="SyncIndicator"></rect>
-							<path d="M7534.5 560.5 L7742.5 560.5" fill="none" data-name="SyncIndicator"></path>
+					<g data-name="FormControlLabel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlLabel">
+							<rect x="2323.8" y="529.0" height="153.0" width="430.0" data-name="FormControlLabel"></rect>
+							<path d="M2323.8 560.0 L2753.8 560.0" fill="none" data-name="FormControlLabel"></path>
+							<path d="M2323.8 651.0 L2753.8 651.0" fill="none" data-name="FormControlLabel"></path>
 						</g>
-						<g transform="translate(7534.5, 529.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SyncIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SyncIndicator">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="SyncIndicator">SyncIndicator</text>
+						<g transform="translate(2323.75, 529)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlLabel">
+								<text x="207.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlLabel">FormControlLabel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7534.5, 560.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SyncIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SyncIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="SyncIndicator">+state: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SyncIndicator">+lastSynced: DateTime?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SyncIndicator">+isDirty: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SyncIndicator">+animationDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SyncIndicator">+iconSize: double</text>
+						<g transform="translate(2323.75, 560)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+formControl: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlLabel">+text: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlLabel">+isClickable: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlLabel">+textStyle: TextStyle?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormControlLabel">+onClick: void Function(AbstractControl&lt;dynamic&gt;)?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2323.75, 651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="5379.0" y="842.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
+					<g data-name="AbstractControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
+							<rect x="2138.8" y="857.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
 						</g>
-						<g transform="translate(5379, 842)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
+						<g transform="translate(2138.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
+								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EmptyBody">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmptyBody">
-							<rect x="2130.8" y="506.5" height="168.0" width="222.0" data-name="EmptyBody"></rect>
-							<path d="M2130.8 537.5 L2352.8 537.5" fill="none" data-name="EmptyBody"></path>
-							<path d="M2130.8 643.5 L2352.8 643.5" fill="none" data-name="EmptyBody"></path>
+					<g data-name="TextStyle">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
+							<rect x="4673.3" y="857.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
 						</g>
-						<g transform="translate(2130.75, 506.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmptyBody">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="EmptyBody">EmptyBody</text>
+						<g transform="translate(4673.25, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
+								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2130.75, 537.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+icon: IconData?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmptyBody">+leading: Widget?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmptyBody">+leadingSpacing: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmptyBody">+title: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EmptyBody">+description: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EmptyBody">+button: Widget?</text>
+					</g>
+					<g data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+							<rect x="572.0" y="857.0" height="31.0" width="352.0" data-name="void Function(AbstractControl&lt;dynamic&gt;)?"></rect>
+						</g>
+						<g transform="translate(572, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">void Function(AbstractControl&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2130.75, 643.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+Widget build()</text>
+					</g>
+					<g data-name="ActionPopUpMenuButton">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ActionPopUpMenuButton">
+							<rect x="4368.5" y="476.5" height="258.0" width="324.0" data-name="ActionPopUpMenuButton"></rect>
+							<path d="M4368.5 507.5 L4692.5 507.5" fill="none" data-name="ActionPopUpMenuButton"></path>
+							<path d="M4368.5 688.5 L4692.5 688.5" fill="none" data-name="ActionPopUpMenuButton"></path>
+						</g>
+						<g transform="translate(4368.5, 476.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionPopUpMenuButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionPopUpMenuButton">
+								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionPopUpMenuButton">ActionPopUpMenuButton</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="2076.8" y="842.0" height="31.0" width="87.0" data-name="IconData"></rect>
+						<g transform="translate(4368.5, 507.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColor: Color?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColorHover: Color?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconSize: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ActionPopUpMenuButton">+disableSplashEffect: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ActionPopUpMenuButton">+hideOnEmpty: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ActionPopUpMenuButton">+orientation: Axis</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ActionPopUpMenuButton">+elevation: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ActionPopUpMenuButton">+splashRadius: double?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ActionPopUpMenuButton">+enabled: bool</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ActionPopUpMenuButton">+position: PopupMenuPosition</text>
+								
+							</g>
 						</g>
-						<g transform="translate(2076.75, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
+						<g transform="translate(4368.5, 688.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">-Widget _buildPopupMenu()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="3335.0" y="842.0" height="31.0" width="71.0" data-name="Widget"></rect>
+					<g data-name="Color">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
+							<rect x="10234.3" y="857.0" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(3335, 842)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
+						<g transform="translate(10234.25, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
+								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NullHelperDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NullHelperDecoration">
-							<rect x="962.5" y="575.0" height="31.0" width="184.0" data-name="NullHelperDecoration"></rect>
+					<g data-name="Axis">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Axis">
+							<rect x="1829.8" y="857.0" height="31.0" width="49.0" data-name="Axis"></rect>
 						</g>
-						<g transform="translate(962.5, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NullHelperDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NullHelperDecoration">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="NullHelperDecoration">NullHelperDecoration</text>
+						<g transform="translate(1829.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Axis">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Axis">
+								<text x="16.5" y="13.5" stroke="none" text-anchor="middle" data-name="Axis">Axis</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InputDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InputDecoration">
-							<rect x="825.3" y="180.5" height="31.0" width="142.0" data-name="InputDecoration"></rect>
+					<g data-name="PopupMenuPosition">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PopupMenuPosition">
+							<rect x="964.0" y="857.0" height="31.0" width="174.0" data-name="PopupMenuPosition"></rect>
 						</g>
-						<g transform="translate(825.25, 180.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InputDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InputDecoration">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="InputDecoration">InputDecoration</text>
+						<g transform="translate(964, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PopupMenuPosition">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PopupMenuPosition">
+								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="PopupMenuPosition">PopupMenuPosition</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="Search">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Search">
-							<rect x="254.0" y="142.5" height="107.0" width="373.0" data-name="Search"></rect>
-							<path d="M254.0 173.5 L627.0 173.5" fill="none" data-name="Search"></path>
+							<rect x="1159.8" y="150.0" height="107.0" width="373.0" data-name="Search"></rect>
+							<path d="M1159.8 181.0 L1532.8 181.0" fill="none" data-name="Search"></path>
 						</g>
-						<g transform="translate(254, 142.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Search">
+						<g transform="translate(1159.75, 150)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Search">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Search">
 								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="Search">Search</text>
 								
 							</g>
 						</g>
-						<g transform="translate(254, 173.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Search">
+						<g transform="translate(1159.75, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Search">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Search">
 								<text x="0.0" y="13.5" stroke="none" data-name="Search">+onQueryChanged: dynamic Function(String)</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Search">+searchController: SearchController?</text>
@@ -1398,9 +1480,9 @@
 					</g>
 					<g data-name="dynamic Function(String)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(String)">
-							<rect x="1186.5" y="575.0" height="31.0" width="213.0" data-name="dynamic Function(String)"></rect>
+							<rect x="2793.8" y="590.0" height="31.0" width="213.0" data-name="dynamic Function(String)"></rect>
 						</g>
-						<g transform="translate(1186.5, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(String)">
+						<g transform="translate(2793.75, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(String)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(String)">
 								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(String)">dynamic Function(String)</text>
 								
@@ -1409,16 +1491,16 @@
 					</g>
 					<g data-name="SearchController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="311.5" y="559.5" height="62.0" width="258.0" data-name="SearchController"></rect>
-							<path d="M311.5 590.5 L569.5 590.5" fill="none" data-name="SearchController"></path>
+							<rect x="415.8" y="574.5" height="62.0" width="258.0" data-name="SearchController"></rect>
+							<path d="M415.8 605.5 L673.8 605.5" fill="none" data-name="SearchController"></path>
 						</g>
-						<g transform="translate(311.5, 559.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
+						<g transform="translate(415.75, 574.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
 								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(311.5, 590.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SearchController">
+						<g transform="translate(415.75, 605.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SearchController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SearchController">
 								<text x="0.0" y="13.5" stroke="none" data-name="SearchController">+setText: void Function(String)</text>
 								
@@ -1427,203 +1509,103 @@
 					</g>
 					<g data-name="void Function(String)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(String)">
-							<rect x="350.5" y="842.0" height="31.0" width="180.0" data-name="void Function(String)"></rect>
+							<rect x="1918.8" y="857.0" height="31.0" width="180.0" data-name="void Function(String)"></rect>
 						</g>
-						<g transform="translate(350.5, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(String)">
+						<g transform="translate(1918.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(String)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(String)">
 								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(String)">void Function(String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConstrainedWidthFlexible">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConstrainedWidthFlexible">
-							<rect x="3311.8" y="499.0" height="183.0" width="287.0" data-name="ConstrainedWidthFlexible"></rect>
-							<path d="M3311.8 530.0 L3598.8 530.0" fill="none" data-name="ConstrainedWidthFlexible"></path>
-							<path d="M3311.8 636.0 L3598.8 636.0" fill="none" data-name="ConstrainedWidthFlexible"></path>
-						</g>
-						<g transform="translate(3311.75, 499)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConstrainedWidthFlexible">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConstrainedWidthFlexible">ConstrainedWidthFlexible</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3311.75, 530)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+minWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">+maxWidth: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConstrainedWidthFlexible">+flex: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConstrainedWidthFlexible">+flexSum: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConstrainedWidthFlexible">+child: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConstrainedWidthFlexible">+outerConstraints: BoxConstraints</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3311.75, 636)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">-double _getWidth()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoxConstraints">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoxConstraints">
-							<rect x="5813.8" y="842.0" height="31.0" width="136.0" data-name="BoxConstraints"></rect>
-						</g>
-						<g transform="translate(5813.75, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxConstraints">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxConstraints">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxConstraints">BoxConstraints</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AsyncValueWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValueWidget">
-							<rect x="3767.0" y="491.5" height="198.0" width="384.0" data-name="AsyncValueWidget"></rect>
-							<path d="M3767.0 522.5 L4151.0 522.5" fill="none" data-name="AsyncValueWidget"></path>
-							<path d="M3767.0 613.5 L4151.0 613.5" fill="none" data-name="AsyncValueWidget"></path>
-						</g>
-						<g transform="translate(3767, 491.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValueWidget">
-								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValueWidget">AsyncValueWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3767, 522.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+value: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">+data: Widget Function(T)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">+error: Widget Function(Object, StackTrace?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">+loading: Widget Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AsyncValueWidget">+empty: Widget Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3767, 613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">-Widget _buildDataOrEmptyWidget()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultLoad()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="663.0" y="842.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
-						</g>
-						<g transform="translate(663, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(Object, StackTrace?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Object, StackTrace?)?">
-							<rect x="5989.8" y="842.0" height="31.0" width="326.0" data-name="Widget Function(Object, StackTrace?)?"></rect>
+					<g data-name="FormScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormScaffold">
+							<rect x="6823.8" y="537.0" height="137.0" width="212.0" data-name="FormScaffold"></rect>
+							<path d="M6823.8 568.0 L7035.8 568.0" fill="none" data-name="FormScaffold"></path>
 						</g>
-						<g transform="translate(5989.75, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Object, StackTrace?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Object, StackTrace?)?">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Object, StackTrace?)?">Widget Function(Object, StackTrace?)?</text>
+						<g transform="translate(6823.75, 537)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormScaffold">
+								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormScaffold">FormScaffold</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function()?">
-							<rect x="6355.8" y="842.0" height="31.0" width="166.0" data-name="Widget Function()?"></rect>
-						</g>
-						<g transform="translate(6355.75, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function()?">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function()?">Widget Function()?</text>
+						<g transform="translate(6823.75, 568)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormScaffold">+formViewModel: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormScaffold">+actions: List&lt;Widget&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormScaffold">+body: Widget</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormScaffold">+drawer: Widget?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormScaffold">+actionsSpacing: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormScaffold">+actionsPadding: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ActionPopUpMenuButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionPopUpMenuButton">
-							<rect x="9170.5" y="461.5" height="258.0" width="324.0" data-name="ActionPopUpMenuButton"></rect>
-							<path d="M9170.5 492.5 L9494.5 492.5" fill="none" data-name="ActionPopUpMenuButton"></path>
-							<path d="M9170.5 673.5 L9494.5 673.5" fill="none" data-name="ActionPopUpMenuButton"></path>
-						</g>
-						<g transform="translate(9170.5, 461.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionPopUpMenuButton">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionPopUpMenuButton">ActionPopUpMenuButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9170.5, 492.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColor: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColorHover: Color?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconSize: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ActionPopUpMenuButton">+disableSplashEffect: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ActionPopUpMenuButton">+hideOnEmpty: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ActionPopUpMenuButton">+orientation: Axis</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ActionPopUpMenuButton">+elevation: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ActionPopUpMenuButton">+splashRadius: double?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ActionPopUpMenuButton">+enabled: bool</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ActionPopUpMenuButton">+position: PopupMenuPosition</text>
-								
-							</g>
+					<g data-name="Widget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
+							<rect x="7398.5" y="857.0" height="31.0" width="71.0" data-name="Widget"></rect>
 						</g>
-						<g transform="translate(9170.5, 673.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">-Widget _buildPopupMenu()</text>
+						<g transform="translate(7398.5, 857)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
+								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="8120.3" y="842.0" height="31.0" width="58.0" data-name="Color"></rect>
+					<g data-name="ConstrainedWidthFlexible">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConstrainedWidthFlexible">
+							<rect x="10057.0" y="514.0" height="183.0" width="287.0" data-name="ConstrainedWidthFlexible"></rect>
+							<path d="M10057.0 545.0 L10344.0 545.0" fill="none" data-name="ConstrainedWidthFlexible"></path>
+							<path d="M10057.0 651.0 L10344.0 651.0" fill="none" data-name="ConstrainedWidthFlexible"></path>
 						</g>
-						<g transform="translate(8120.25, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
+						<g transform="translate(10057, 514)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConstrainedWidthFlexible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConstrainedWidthFlexible">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConstrainedWidthFlexible">ConstrainedWidthFlexible</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Axis">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Axis">
-							<rect x="8291.5" y="842.0" height="31.0" width="49.0" data-name="Axis"></rect>
+						<g transform="translate(10057, 545)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+minWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">+maxWidth: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConstrainedWidthFlexible">+flex: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConstrainedWidthFlexible">+flexSum: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConstrainedWidthFlexible">+child: Widget</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ConstrainedWidthFlexible">+outerConstraints: BoxConstraints</text>
+								
+							</g>
 						</g>
-						<g transform="translate(8291.5, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Axis">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Axis">
-								<text x="16.5" y="13.5" stroke="none" text-anchor="middle" data-name="Axis">Axis</text>
+						<g transform="translate(10057, 651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">-double _getWidth()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PopupMenuPosition">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PopupMenuPosition">
-							<rect x="8380.5" y="842.0" height="31.0" width="174.0" data-name="PopupMenuPosition"></rect>
+					<g data-name="BoxConstraints">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoxConstraints">
+							<rect x="13470.5" y="857.0" height="31.0" width="136.0" data-name="BoxConstraints"></rect>
 						</g>
-						<g transform="translate(8380.5, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PopupMenuPosition">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PopupMenuPosition">
-								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="PopupMenuPosition">PopupMenuPosition</text>
+						<g transform="translate(13470.5, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxConstraints">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxConstraints">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxConstraints">BoxConstraints</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="PrimaryButton">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PrimaryButton">
-							<rect x="9534.5" y="477.0" height="227.0" width="333.0" data-name="PrimaryButton"></rect>
-							<path d="M9534.5 508.0 L9867.5 508.0" fill="none" data-name="PrimaryButton"></path>
+							<rect x="9684.0" y="492.0" height="227.0" width="333.0" data-name="PrimaryButton"></rect>
+							<path d="M9684.0 523.0 L10017.0 523.0" fill="none" data-name="PrimaryButton"></path>
 						</g>
-						<g transform="translate(9534.5, 477)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PrimaryButton">
+						<g transform="translate(9684, 492)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PrimaryButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PrimaryButton">
 								<text x="158.5" y="13.5" stroke="none" text-anchor="middle" data-name="PrimaryButton">PrimaryButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9534.5, 508)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PrimaryButton">
+						<g transform="translate(9684, 523)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PrimaryButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PrimaryButton">
 								<text x="0.0" y="13.5" stroke="none" data-name="PrimaryButton">+text: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PrimaryButton">+icon: IconData?</text>
@@ -1641,11 +1623,22 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="IconData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
+							<rect x="17452.0" y="857.0" height="31.0" width="87.0" data-name="IconData"></rect>
+						</g>
+						<g transform="translate(17452, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
+								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="void Function()?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="8615.0" y="842.0" height="31.0" width="144.0" data-name="void Function()?"></rect>
+							<rect x="16337.0" y="857.0" height="31.0" width="144.0" data-name="void Function()?"></rect>
 						</g>
-						<g transform="translate(8615, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
+						<g transform="translate(16337, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
 								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
 								
@@ -1654,9 +1647,9 @@
 					</g>
 					<g data-name="dynamic Function()?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="11346.5" y="842.0" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
+							<rect x="6269.0" y="857.0" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
 						</g>
-						<g transform="translate(11346.5, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
+						<g transform="translate(6269, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
 								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
 								
@@ -1665,9 +1658,9 @@
 					</g>
 					<g data-name="EdgeInsets">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="14085.3" y="842.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
+							<rect x="11105.0" y="857.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
 						</g>
-						<g transform="translate(14085.25, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
+						<g transform="translate(11105, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
 								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
 								
@@ -1676,299 +1669,482 @@
 					</g>
 					<g data-name="Size">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Size">
-							<rect x="14331.5" y="842.0" height="31.0" width="50.0" data-name="Size"></rect>
+							<rect x="2316.8" y="857.0" height="31.0" width="50.0" data-name="Size"></rect>
 						</g>
-						<g transform="translate(14331.5, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Size">
+						<g transform="translate(2316.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Size">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Size">
 								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Size">Size</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Hyperlink">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Hyperlink">
-							<rect x="8621.5" y="484.5" height="212.0" width="222.0" data-name="Hyperlink"></rect>
-							<path d="M8621.5 515.5 L8843.5 515.5" fill="none" data-name="Hyperlink"></path>
+					<g data-name="FormTableRow">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRow">
+							<rect x="3596.5" y="529.5" height="152.0" width="379.0" data-name="FormTableRow"></rect>
+							<path d="M3596.5 560.5 L3975.5 560.5" fill="none" data-name="FormTableRow"></path>
 						</g>
-						<g transform="translate(8621.5, 484.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Hyperlink">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Hyperlink">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="Hyperlink">Hyperlink</text>
+						<g transform="translate(3596.5, 529.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRow">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRow">
+								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRow">FormTableRow</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8621.5, 515.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Hyperlink">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Hyperlink">
-								<text x="0.0" y="13.5" stroke="none" data-name="Hyperlink">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Hyperlink">+url: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Hyperlink">+onClick: void Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Hyperlink">+linkColor: Color</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Hyperlink">+hoverColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Hyperlink">+visitedColor: Color?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Hyperlink">+style: TextStyle?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Hyperlink">+hoverStyle: TextStyle?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Hyperlink">+visitedStyle: TextStyle?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Hyperlink">+icon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Hyperlink">+iconSize: double?</text>
+						<g transform="translate(3596.5, 560.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRow">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRow">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRow">+label: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRow">+labelBuilder: Widget Function(BuildContext)?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRow">+labelStyle: TextStyle?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRow">+labelHelpText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormTableRow">+input: Widget</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormTableRow">+control: AbstractControl&lt;dynamic&gt;?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormTableRow">+layout: FormTableRowLayout?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TextStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
-							<rect x="15842.0" y="842.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
+					<g data-name="Widget Function(BuildContext)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
+							<rect x="2406.8" y="857.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
 						</g>
-						<g transform="translate(15842, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
-								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
+						<g transform="translate(2406.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
+								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormTableRowLayout">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRowLayout">
+							<rect x="3418.3" y="819.0" height="107.0" width="370.0" data-name="FormTableRowLayout"></rect>
+							<path d="M3418.3 850.0 L3788.3 850.0" fill="none" data-name="FormTableRowLayout"></path>
+						</g>
+						<g transform="translate(3418.25, 819)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRowLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRowLayout">
+								<text x="177.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRowLayout">FormTableRowLayout</text>
+								
+							</g>
+						</g>
+						<g transform="translate(3418.25, 850)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRowLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRowLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRowLayout">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+values: List&lt;FormTableRowLayout&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+vertical: FormTableRowLayout</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+horizontal: FormTableRowLayout</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormTableLayout">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableLayout">
+							<rect x="5491.3" y="529.0" height="153.0" width="379.0" data-name="FormTableLayout"></rect>
+							<path d="M5491.3 560.0 L5870.3 560.0" fill="none" data-name="FormTableLayout"></path>
+							<path d="M5491.3 651.0 L5870.3 651.0" fill="none" data-name="FormTableLayout"></path>
+						</g>
+						<g transform="translate(5491.25, 529)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableLayout">
+								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableLayout">FormTableLayout</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5491.25, 560)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+rows: List&lt;FormTableRow&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormTableLayout">+columnWidths: Map&lt;int, TableColumnWidth&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormTableLayout">+rowDivider: Widget?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormTableLayout">+rowLayout: FormTableRowLayout?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormTableLayout">+rowLabelStyle: TextStyle?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5491.25, 651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormSectionHeader">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormSectionHeader">
+							<rect x="5231.3" y="529.0" height="153.0" width="220.0" data-name="FormSectionHeader"></rect>
+							<path d="M5231.3 560.0 L5451.3 560.0" fill="none" data-name="FormSectionHeader"></path>
+							<path d="M5231.3 651.0 L5451.3 651.0" fill="none" data-name="FormSectionHeader"></path>
+						</g>
+						<g transform="translate(5231.25, 529)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSectionHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSectionHeader">
+								<text x="102.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormSectionHeader">FormSectionHeader</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5231.25, 560)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormSectionHeader">+titleTextStyle: TextStyle?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormSectionHeader">+helpText: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormSectionHeader">+divider: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormSectionHeader">+helpTextDisabled: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5231.25, 651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormLabel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormLabel">
+							<rect x="4925.3" y="536.5" height="138.0" width="266.0" data-name="FormLabel"></rect>
+							<path d="M4925.3 567.5 L5191.3 567.5" fill="none" data-name="FormLabel"></path>
+							<path d="M4925.3 643.5 L5191.3 643.5" fill="none" data-name="FormLabel"></path>
+						</g>
+						<g transform="translate(4925.25, 536.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormLabel">
+								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormLabel">FormLabel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4925.25, 567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+labelText: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormLabel">+helpText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormLabel">+labelTextStyle: TextStyle?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormLabel">+layout: FormTableRowLayout?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4925.25, 643.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="Enum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
+							<rect x="7075.8" y="590.0" height="31.0" width="61.0" data-name="Enum"></rect>
+						</g>
+						<g transform="translate(7075.75, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="DismissButton">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DismissButton">
-							<rect x="9907.5" y="536.5" height="108.0" width="249.0" data-name="DismissButton"></rect>
-							<path d="M9907.5 567.5 L10156.5 567.5" fill="none" data-name="DismissButton"></path>
-							<path d="M9907.5 613.5 L10156.5 613.5" fill="none" data-name="DismissButton"></path>
+							<rect x="15239.5" y="551.5" height="108.0" width="249.0" data-name="DismissButton"></rect>
+							<path d="M15239.5 582.5 L15488.5 582.5" fill="none" data-name="DismissButton"></path>
+							<path d="M15239.5 628.5 L15488.5 628.5" fill="none" data-name="DismissButton"></path>
 						</g>
-						<g transform="translate(9907.5, 536.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DismissButton">
+						<g transform="translate(15239.5, 551.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DismissButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DismissButton">
 								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="DismissButton">DismissButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9907.5, 567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
+						<g transform="translate(15239.5, 582.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
 								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+onPressed: void Function()?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DismissButton">+text: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9907.5, 613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
+						<g transform="translate(15239.5, 628.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
 								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormTableRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRow">
-							<rect x="15576.8" y="514.5" height="152.0" width="379.0" data-name="FormTableRow"></rect>
-							<path d="M15576.8 545.5 L15955.8 545.5" fill="none" data-name="FormTableRow"></path>
+					<g data-name="Badge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Badge">
+							<rect x="9094.0" y="476.5" height="258.0" width="263.0" data-name="Badge"></rect>
+							<path d="M9094.0 507.5 L9357.0 507.5" fill="none" data-name="Badge"></path>
+							<path d="M9094.0 658.5 L9357.0 658.5" fill="none" data-name="Badge"></path>
 						</g>
-						<g transform="translate(15576.75, 514.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRow">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRow">FormTableRow</text>
+						<g transform="translate(9094, 476.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Badge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Badge">
+								<text x="123.5" y="13.5" stroke="none" text-anchor="middle" data-name="Badge">Badge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15576.75, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRow">+label: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRow">+labelBuilder: Widget Function(BuildContext)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRow">+labelStyle: TextStyle?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRow">+labelHelpText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormTableRow">+input: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormTableRow">+control: AbstractControl&lt;dynamic&gt;?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormTableRow">+layout: FormTableRowLayout?</text>
+						<g transform="translate(9094, 507.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
+								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+icon: IconData?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Badge">+color: Color?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Badge">+borderRadius: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Badge">+label: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Badge">+type: BadgeType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Badge">+padding: EdgeInsets</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Badge">+iconSize: double?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Badge">+labelStyle: TextStyle?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="Badge">+center: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(9094, 658.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
+								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Badge">-Color? _getBackgroundColor()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Badge">-Color _getBorderColor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Badge">-Color? _getLabelColor()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="BadgeType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
+							<rect x="5286.0" y="804.0" height="137.0" width="288.0" data-name="BadgeType"></rect>
+							<path d="M5286.0 835.0 L5574.0 835.0" fill="none" data-name="BadgeType"></path>
+						</g>
+						<g transform="translate(5286, 804)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
+								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5286, 835)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BadgeType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BadgeType">
+								<text x="0.0" y="13.5" stroke="none" data-name="BadgeType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BadgeType">&lt;static&gt;+values: List&lt;BadgeType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BadgeType">&lt;static&gt;+filled: BadgeType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlined: BadgeType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlineFill: BadgeType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="BadgeType">&lt;static&gt;+plain: BadgeType</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StandardDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StandardDialog">
+							<rect x="9397.0" y="469.0" height="273.0" width="247.0" data-name="StandardDialog"></rect>
+							<path d="M9397.0 500.0 L9644.0 500.0" fill="none" data-name="StandardDialog"></path>
+							<path d="M9397.0 711.0 L9644.0 711.0" fill="none" data-name="StandardDialog"></path>
+						</g>
+						<g transform="translate(9397, 469)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardDialog">
+								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardDialog">StandardDialog</text>
+								
+							</g>
+						</g>
+						<g transform="translate(9397, 500)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+title: Widget?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StandardDialog">+titleText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StandardDialog">+body: Widget</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StandardDialog">+actionButtons: List&lt;Widget&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StandardDialog">+backgroundColor: Color?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StandardDialog">+borderRadius: double?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StandardDialog">+width: double?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StandardDialog">+height: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StandardDialog">+minWidth: double</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StandardDialog">+minHeight: double</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StandardDialog">+maxWidth: double?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StandardDialog">+maxHeight: double?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StandardDialog">+padding: EdgeInsets</text>
+								
+							</g>
+						</g>
+						<g transform="translate(9397, 711)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
-							<rect x="16942.0" y="842.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
+					<g data-name="ISyncIndicatorViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ISyncIndicatorViewModel">
+							<rect x="1838.0" y="165.0" height="77.0" width="214.0" data-name="ISyncIndicatorViewModel"></rect>
+							<path d="M1838.0 196.0 L2052.0 196.0" fill="none" data-name="ISyncIndicatorViewModel"></path>
 						</g>
-						<g transform="translate(16942, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
+						<g transform="translate(1838, 165)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ISyncIndicatorViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ISyncIndicatorViewModel">
+								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="ISyncIndicatorViewModel">ISyncIndicatorViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="17248.0" y="842.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(17248, 842)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
+						<g transform="translate(1838, 196)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ISyncIndicatorViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ISyncIndicatorViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ISyncIndicatorViewModel">+isDirty: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ISyncIndicatorViewModel">+lastSynced: DateTime?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormTableRowLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRowLayout">
-							<rect x="17426.0" y="804.0" height="107.0" width="370.0" data-name="FormTableRowLayout"></rect>
-							<path d="M17426.0 835.0 L17796.0 835.0" fill="none" data-name="FormTableRowLayout"></path>
+					<g data-name="SyncIndicator">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SyncIndicator">
+							<rect x="3046.8" y="544.5" height="122.0" width="208.0" data-name="SyncIndicator"></rect>
+							<path d="M3046.8 575.5 L3254.8 575.5" fill="none" data-name="SyncIndicator"></path>
 						</g>
-						<g transform="translate(17426, 804)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRowLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRowLayout">
-								<text x="177.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRowLayout">FormTableRowLayout</text>
+						<g transform="translate(3046.75, 544.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SyncIndicator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SyncIndicator">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="SyncIndicator">SyncIndicator</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17426, 835)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRowLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRowLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRowLayout">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+values: List&lt;FormTableRowLayout&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+vertical: FormTableRowLayout</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+horizontal: FormTableRowLayout</text>
+						<g transform="translate(3046.75, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SyncIndicator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SyncIndicator">
+								<text x="0.0" y="13.5" stroke="none" data-name="SyncIndicator">+state: AsyncValue&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SyncIndicator">+lastSynced: DateTime?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SyncIndicator">+isDirty: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SyncIndicator">+animationDuration: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SyncIndicator">+iconSize: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormTableLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableLayout">
-							<rect x="13148.8" y="514.0" height="153.0" width="379.0" data-name="FormTableLayout"></rect>
-							<path d="M13148.8 545.0 L13527.8 545.0" fill="none" data-name="FormTableLayout"></path>
-							<path d="M13148.8 636.0 L13527.8 636.0" fill="none" data-name="FormTableLayout"></path>
-						</g>
-						<g transform="translate(13148.75, 514)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableLayout">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableLayout">FormTableLayout</text>
-								
-							</g>
+					<g data-name="IWithBanner">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
+							<rect x="2092.0" y="172.5" height="62.0" width="164.0" data-name="IWithBanner"></rect>
+							<path d="M2092.0 203.5 L2256.0 203.5" fill="none" data-name="IWithBanner"></path>
 						</g>
-						<g transform="translate(13148.75, 545)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+rows: List&lt;FormTableRow&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableLayout">+columnWidths: Map&lt;int, TableColumnWidth&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableLayout">+rowDivider: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableLayout">+rowLayout: FormTableRowLayout?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormTableLayout">+rowLabelStyle: TextStyle?</text>
+						<g transform="translate(2092, 172.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13148.75, 636)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+Widget build()</text>
+						<g transform="translate(2092, 203.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IWithBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IWithBanner">
+								<text x="0.0" y="13.5" stroke="none" data-name="IWithBanner">+Widget? banner()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormSectionHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSectionHeader">
-							<rect x="16979.8" y="514.0" height="153.0" width="220.0" data-name="FormSectionHeader"></rect>
-							<path d="M16979.8 545.0 L17199.8 545.0" fill="none" data-name="FormSectionHeader"></path>
-							<path d="M16979.8 636.0 L17199.8 636.0" fill="none" data-name="FormSectionHeader"></path>
-						</g>
-						<g transform="translate(16979.75, 514)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSectionHeader">
-								<text x="102.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormSectionHeader">FormSectionHeader</text>
-								
-							</g>
+					<g data-name="BannerBox">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BannerBox">
+							<rect x="7463.0" y="514.5" height="182.0" width="298.0" data-name="BannerBox"></rect>
+							<path d="M7463.0 545.5 L7761.0 545.5" fill="none" data-name="BannerBox"></path>
 						</g>
-						<g transform="translate(16979.75, 545)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormSectionHeader">+titleTextStyle: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormSectionHeader">+helpText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormSectionHeader">+divider: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormSectionHeader">+helpTextDisabled: bool</text>
+						<g transform="translate(7463, 514.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerBox">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerBox">
+								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerBox">BannerBox</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16979.75, 636)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+Widget build()</text>
+						<g transform="translate(7463, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerBox">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerBox">
+								<text x="0.0" y="13.5" stroke="none" data-name="BannerBox">+prefixIcon: Widget?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BannerBox">+body: Widget</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BannerBox">+style: BannerStyle</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="BannerBox">+padding: EdgeInsets?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="BannerBox">+noPrefix: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="BannerBox">+dismissable: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="BannerBox">+isDismissed: bool?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="BannerBox">+onDismissed: dynamic Function()?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="BannerBox">+dismissIconSize: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormLabel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormLabel">
-							<rect x="17835.8" y="521.5" height="138.0" width="266.0" data-name="FormLabel"></rect>
-							<path d="M17835.8 552.5 L18101.8 552.5" fill="none" data-name="FormLabel"></path>
-							<path d="M17835.8 628.5 L18101.8 628.5" fill="none" data-name="FormLabel"></path>
+					<g data-name="BannerStyle">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BannerStyle">
+							<rect x="5885.0" y="811.5" height="122.0" width="294.0" data-name="BannerStyle"></rect>
+							<path d="M5885.0 842.5 L6179.0 842.5" fill="none" data-name="BannerStyle"></path>
 						</g>
-						<g transform="translate(17835.75, 521.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormLabel">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormLabel">FormLabel</text>
+						<g transform="translate(5885, 811.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerStyle">
+								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerStyle">BannerStyle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17835.75, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+labelText: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormLabel">+helpText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormLabel">+labelTextStyle: TextStyle?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormLabel">+layout: FormTableRowLayout?</text>
+						<g transform="translate(5885, 842.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerStyle">
+								<text x="0.0" y="13.5" stroke="none" data-name="BannerStyle">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+values: List&lt;BannerStyle&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+warning: BannerStyle</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+info: BannerStyle</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+error: BannerStyle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17835.75, 628.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+Widget build()</text>
+					</g>
+					<g data-name="ActionMenuInline">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuInline">
+							<rect x="2296.0" y="119.5" height="168.0" width="324.0" data-name="ActionMenuInline"></rect>
+							<path d="M2296.0 150.5 L2620.0 150.5" fill="none" data-name="ActionMenuInline"></path>
+							<path d="M2296.0 256.5 L2620.0 256.5" fill="none" data-name="ActionMenuInline"></path>
+						</g>
+						<g transform="translate(2296, 119.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuInline">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuInline">
+								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuInline">ActionMenuInline</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="15995.8" y="575.0" height="31.0" width="61.0" data-name="Enum"></rect>
+						<g transform="translate(2296, 150.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuInline">+iconSize: double?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuInline">+visible: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuInline">+splashRadius: double?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ActionMenuInline">+paddingVertical: double?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ActionMenuInline">+paddingHorizontal: double?</text>
+								
+							</g>
 						</g>
-						<g transform="translate(15995.75, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
+						<g transform="translate(2296, 256.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ActionMenuType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuType">
-							<rect x="2299.5" y="804.0" height="107.0" width="330.0" data-name="ActionMenuType"></rect>
-							<path d="M2299.5 835.0 L2629.5 835.0" fill="none" data-name="ActionMenuType"></path>
+					<g data-name="Collapsible">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Collapsible">
+							<rect x="7070.0" y="150.0" height="107.0" width="441.0" data-name="Collapsible"></rect>
+							<path d="M7070.0 181.0 L7511.0 181.0" fill="none" data-name="Collapsible"></path>
 						</g>
-						<g transform="translate(2299.5, 804)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuType">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuType">ActionMenuType</text>
+						<g transform="translate(7070, 150)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Collapsible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Collapsible">
+								<text x="212.5" y="13.5" stroke="none" text-anchor="middle" data-name="Collapsible">Collapsible</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2299.5, 835)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+values: List&lt;ActionMenuType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+inline: ActionMenuType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+popup: ActionMenuType</text>
+						<g transform="translate(7070, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Collapsible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Collapsible">
+								<text x="0.0" y="13.5" stroke="none" data-name="Collapsible">+contentBuilder: Widget Function(BuildContext, bool)</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Collapsible">+headerBuilder: Widget Function(BuildContext, bool)?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Collapsible">+title: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Collapsible">+isCollapsed: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReactiveCustomColorPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveCustomColorPicker">
-							<rect x="5675.3" y="575.0" height="31.0" width="236.0" data-name="ReactiveCustomColorPicker"></rect>
+					<g data-name="Widget Function(BuildContext, bool)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)">
+							<rect x="7852.0" y="590.0" height="31.0" width="300.0" data-name="Widget Function(BuildContext, bool)"></rect>
 						</g>
-						<g transform="translate(5675.25, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveCustomColorPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveCustomColorPicker">
-								<text x="110.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveCustomColorPicker">ReactiveCustomColorPicker</text>
+						<g transform="translate(7852, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)">
+								<text x="142.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)">Widget Function(BuildContext, bool)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReactiveFormField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFormField">
-							<rect x="3892.3" y="180.5" height="31.0" width="163.0" data-name="ReactiveFormField"></rect>
+					<g data-name="Widget Function(BuildContext, bool)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)?">
+							<rect x="8192.0" y="590.0" height="31.0" width="310.0" data-name="Widget Function(BuildContext, bool)?"></rect>
 						</g>
-						<g transform="translate(3892.25, 180.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFormField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFormField">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFormField">ReactiveFormField</text>
+						<g transform="translate(8192, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)?">
+								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)?">Widget Function(BuildContext, bool)?</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="NavbarTab">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="3656.3" y="142.5" height="107.0" width="196.0" data-name="NavbarTab"></rect>
-							<path d="M3656.3 173.5 L3852.3 173.5" fill="none" data-name="NavbarTab"></path>
+							<rect x="11177.0" y="150.0" height="107.0" width="196.0" data-name="NavbarTab"></rect>
+							<path d="M11177.0 181.0 L11373.0 181.0" fill="none" data-name="NavbarTab"></path>
 						</g>
-						<g transform="translate(3656.25, 142.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
+						<g transform="translate(11177, 150)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
 								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3656.25, 173.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NavbarTab">
+						<g transform="translate(11177, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NavbarTab">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NavbarTab">
 								<text x="0.0" y="13.5" stroke="none" data-name="NavbarTab">+title: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="NavbarTab">+intent: RoutingIntent?</text>
@@ -1980,9 +2156,9 @@
 					</g>
 					<g data-name="RoutingIntent">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="5951.3" y="575.0" height="31.0" width="122.0" data-name="RoutingIntent"></rect>
+							<rect x="8932.0" y="590.0" height="31.0" width="122.0" data-name="RoutingIntent"></rect>
 						</g>
-						<g transform="translate(5951.25, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
+						<g transform="translate(8932, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
 								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
 								
@@ -1991,16 +2167,16 @@
 					</g>
 					<g data-name="TabbedNavbar">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TabbedNavbar">
-							<rect x="17487.8" y="462.0" height="257.0" width="308.0" data-name="TabbedNavbar"></rect>
-							<path d="M17487.8 493.0 L17795.8 493.0" fill="none" data-name="TabbedNavbar"></path>
+							<rect x="10384.0" y="477.0" height="257.0" width="308.0" data-name="TabbedNavbar"></rect>
+							<path d="M10384.0 508.0 L10692.0 508.0" fill="none" data-name="TabbedNavbar"></path>
 						</g>
-						<g transform="translate(17487.75, 462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabbedNavbar">
+						<g transform="translate(10384, 477)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabbedNavbar">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabbedNavbar">
 								<text x="146.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabbedNavbar">TabbedNavbar</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17487.75, 493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TabbedNavbar">
+						<g transform="translate(10384, 508)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TabbedNavbar">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TabbedNavbar">
 								<text x="0.0" y="13.5" stroke="none" data-name="TabbedNavbar">+tabs: List&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TabbedNavbar">+selectedTab: T?</text>
@@ -2022,9 +2198,9 @@
 					</g>
 					<g data-name="BoxDecoration">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BoxDecoration">
-							<rect x="19164.0" y="842.0" height="31.0" width="132.0" data-name="BoxDecoration"></rect>
+							<rect x="13298.5" y="857.0" height="31.0" width="132.0" data-name="BoxDecoration"></rect>
 						</g>
-						<g transform="translate(19164, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxDecoration">
+						<g transform="translate(13298.5, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxDecoration">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxDecoration">
 								<text x="58.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxDecoration">BoxDecoration</text>
 								
@@ -2033,9 +2209,9 @@
 					</g>
 					<g data-name="void Function(int, T)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(int, T)?">
-							<rect x="19336.0" y="842.0" height="31.0" width="183.0" data-name="void Function(int, T)?"></rect>
+							<rect x="12632.5" y="857.0" height="31.0" width="183.0" data-name="void Function(int, T)?"></rect>
 						</g>
-						<g transform="translate(19336, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(int, T)?">
+						<g transform="translate(12632.5, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(int, T)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(int, T)?">
 								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(int, T)?">void Function(int, T)?</text>
 								
@@ -2044,181 +2220,218 @@
 					</g>
 					<g data-name="TabBarIndicatorSize">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TabBarIndicatorSize">
-							<rect x="19559.0" y="842.0" height="31.0" width="176.0" data-name="TabBarIndicatorSize"></rect>
+							<rect x="8177.3" y="857.0" height="31.0" width="176.0" data-name="TabBarIndicatorSize"></rect>
 						</g>
-						<g transform="translate(19559, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabBarIndicatorSize">
+						<g transform="translate(8177.25, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabBarIndicatorSize">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabBarIndicatorSize">
 								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabBarIndicatorSize">TabBarIndicatorSize</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Collapsible">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Collapsible">
-							<rect x="7257.3" y="142.5" height="107.0" width="441.0" data-name="Collapsible"></rect>
-							<path d="M7257.3 173.5 L7698.3 173.5" fill="none" data-name="Collapsible"></path>
+					<g data-name="SidesheetTab">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SidesheetTab">
+							<rect x="16820.0" y="574.5" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
+							<path d="M16820.0 605.5 L17150.0 605.5" fill="none" data-name="SidesheetTab"></path>
 						</g>
-						<g transform="translate(7257.25, 142.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Collapsible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Collapsible">
-								<text x="212.5" y="13.5" stroke="none" text-anchor="middle" data-name="Collapsible">Collapsible</text>
+						<g transform="translate(16820, 574.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SidesheetTab">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="SidesheetTab">SidesheetTab</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7257.25, 173.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Collapsible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Collapsible">
-								<text x="0.0" y="13.5" stroke="none" data-name="Collapsible">+contentBuilder: Widget Function(BuildContext, bool)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Collapsible">+headerBuilder: Widget Function(BuildContext, bool)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Collapsible">+title: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Collapsible">+isCollapsed: bool</text>
+						<g transform="translate(16820, 605.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SidesheetTab">
+								<text x="0.0" y="13.5" stroke="none" data-name="SidesheetTab">+builder: Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext, bool)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)">
-							<rect x="6844.5" y="575.0" height="31.0" width="300.0" data-name="Widget Function(BuildContext, bool)"></rect>
+					<g data-name="Widget Function(BuildContext)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
+							<rect x="17141.8" y="857.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
 						</g>
-						<g transform="translate(6844.5, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)">
-								<text x="142.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)">Widget Function(BuildContext, bool)</text>
+						<g transform="translate(17141.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
+								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)?">
-							<rect x="7184.5" y="575.0" height="31.0" width="310.0" data-name="Widget Function(BuildContext, bool)?"></rect>
+					<g data-name="Sidesheet">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Sidesheet">
+							<rect x="12214.0" y="499.5" height="212.0" width="341.0" data-name="Sidesheet"></rect>
+							<path d="M12214.0 530.5 L12555.0 530.5" fill="none" data-name="Sidesheet"></path>
 						</g>
-						<g transform="translate(7184.5, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)?">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)?">Widget Function(BuildContext, bool)?</text>
+						<g transform="translate(12214, 499.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Sidesheet">
+								<text x="162.5" y="13.5" stroke="none" text-anchor="middle" data-name="Sidesheet">Sidesheet</text>
+								
+							</g>
+						</g>
+						<g transform="translate(12214, 530.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Sidesheet">
+								<text x="0.0" y="13.5" stroke="none" data-name="Sidesheet">&lt;static&gt;+kDefaultWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Sidesheet">+titleText: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Sidesheet">+body: Widget?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Sidesheet">+tabs: List&lt;SidesheetTab&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Sidesheet">+actionButtons: List&lt;Widget&gt;?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Sidesheet">+width: double?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Sidesheet">+withCloseButton: bool</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Sidesheet">+ignoreAppBar: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="Sidesheet">+collapseSingleTab: bool</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="Sidesheet">+bodyPadding: EdgeInsets?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="Sidesheet">+wrapContent: Widget Function(Widget)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyULogo">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyULogo">
-							<rect x="10196.5" y="544.0" height="93.0" width="214.0" data-name="StudyULogo"></rect>
-							<path d="M10196.5 575.0 L10410.5 575.0" fill="none" data-name="StudyULogo"></path>
-							<path d="M10196.5 606.0 L10410.5 606.0" fill="none" data-name="StudyULogo"></path>
+					<g data-name="Widget Function(Widget)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Widget)?">
+							<rect x="18980.8" y="857.0" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
 						</g>
-						<g transform="translate(10196.5, 544)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyULogo">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyULogo">StudyULogo</text>
+						<g transform="translate(18980.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Widget)?">
+								<text x="102.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Widget)?">Widget Function(Widget)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10196.5, 575)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+onTap: void Function()?</text>
+					</g>
+					<g data-name="FormSideSheetTab">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormSideSheetTab">
+							<rect x="4015.5" y="574.5" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
+							<path d="M4015.5 605.5 L4328.5 605.5" fill="none" data-name="FormSideSheetTab"></path>
+						</g>
+						<g transform="translate(4015.5, 574.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSideSheetTab">
+								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormSideSheetTab">FormSideSheetTab</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10196.5, 606)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+Widget build()</text>
+						<g transform="translate(4015.5, 605.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSideSheetTab">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormSideSheetTab">+formViewBuilder: Widget Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormSideSheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSideSheetTab">
-							<rect x="609.5" y="559.5" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
-							<path d="M609.5 590.5 L922.5 590.5" fill="none" data-name="FormSideSheetTab"></path>
+					<g data-name="HelpIcon">
+						<g fill="#eee8d5" stroke="#33322E" data-name="HelpIcon">
+							<rect x="7551.0" y="157.0" height="93.0" width="174.0" data-name="HelpIcon"></rect>
+							<path d="M7551.0 188.0 L7725.0 188.0" fill="none" data-name="HelpIcon"></path>
+							<path d="M7551.0 219.0 L7725.0 219.0" fill="none" data-name="HelpIcon"></path>
+						</g>
+						<g transform="translate(7551, 157)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HelpIcon">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HelpIcon">
+								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="HelpIcon">HelpIcon</text>
+								
+							</g>
+						</g>
+						<g transform="translate(7551, 188)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
+								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+tooltipText: String?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(7551, 219)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
+								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="EmptyBody">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EmptyBody">
+							<rect x="11728.0" y="521.5" height="168.0" width="222.0" data-name="EmptyBody"></rect>
+							<path d="M11728.0 552.5 L11950.0 552.5" fill="none" data-name="EmptyBody"></path>
+							<path d="M11728.0 658.5 L11950.0 658.5" fill="none" data-name="EmptyBody"></path>
+						</g>
+						<g transform="translate(11728, 521.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmptyBody">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmptyBody">
+								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="EmptyBody">EmptyBody</text>
+								
+							</g>
 						</g>
-						<g transform="translate(609.5, 559.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSideSheetTab">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormSideSheetTab">FormSideSheetTab</text>
+						<g transform="translate(11728, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
+								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+icon: IconData?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EmptyBody">+leading: Widget?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EmptyBody">+leadingSpacing: double?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EmptyBody">+title: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EmptyBody">+description: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EmptyBody">+button: Widget?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(609.5, 590.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSideSheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSideSheetTab">+formViewBuilder: Widget Function(T)</text>
+						<g transform="translate(11728, 658.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
+								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SidesheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SidesheetTab">
-							<rect x="1439.5" y="559.5" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
-							<path d="M1439.5 590.5 L1769.5 590.5" fill="none" data-name="SidesheetTab"></path>
+					<g data-name="IndicatorRangeSliderThumbShape">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IndicatorRangeSliderThumbShape">
+							<rect x="6496.8" y="536.5" height="138.0" width="287.0" data-name="IndicatorRangeSliderThumbShape"></rect>
+							<path d="M6496.8 567.5 L6783.8 567.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
+							<path d="M6496.8 628.5 L6783.8 628.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
 						</g>
-						<g transform="translate(1439.5, 559.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SidesheetTab">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="SidesheetTab">SidesheetTab</text>
+						<g transform="translate(6496.75, 536.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IndicatorRangeSliderThumbShape">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="IndicatorRangeSliderThumbShape">IndicatorRangeSliderThumbShape</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1439.5, 590.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SidesheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="SidesheetTab">+builder: Widget Function(BuildContext)</text>
+						<g transform="translate(6496.75, 567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
+								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+buildContext: BuildContext</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+start: T</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+end: T</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="1476.5" y="842.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
-						</g>
-						<g transform="translate(1476.5, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
+						<g transform="translate(6496.75, 628.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
+								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+Size getPreferredSize()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+void paint()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Sidesheet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Sidesheet">
-							<rect x="7782.5" y="484.5" height="212.0" width="341.0" data-name="Sidesheet"></rect>
-							<path d="M7782.5 515.5 L8123.5 515.5" fill="none" data-name="Sidesheet"></path>
-						</g>
-						<g transform="translate(7782.5, 484.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Sidesheet">
-								<text x="162.5" y="13.5" stroke="none" text-anchor="middle" data-name="Sidesheet">Sidesheet</text>
-								
-							</g>
+					<g data-name="BuildContext">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
+							<rect x="6599.0" y="857.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
 						</g>
-						<g transform="translate(7782.5, 515.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Sidesheet">
-								<text x="0.0" y="13.5" stroke="none" data-name="Sidesheet">&lt;static&gt;+kDefaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Sidesheet">+titleText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Sidesheet">+body: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Sidesheet">+tabs: List&lt;SidesheetTab&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Sidesheet">+actionButtons: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Sidesheet">+width: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Sidesheet">+withCloseButton: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Sidesheet">+ignoreAppBar: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Sidesheet">+collapseSingleTab: bool</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Sidesheet">+bodyPadding: EdgeInsets?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Sidesheet">+wrapContent: Widget Function(Widget)?</text>
+						<g transform="translate(6599, 857)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
+								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(Widget)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Widget)?">
-							<rect x="3937.0" y="842.0" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
+					<g data-name="RangeSliderThumbShape">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RangeSliderThumbShape">
+							<rect x="5494.8" y="188.0" height="31.0" width="218.0" data-name="RangeSliderThumbShape"></rect>
 						</g>
-						<g transform="translate(3937, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Widget)?">
-								<text x="102.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Widget)?">Widget Function(Widget)?</text>
+						<g transform="translate(5494.75, 188)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="RangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RangeSliderThumbShape">
+								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="RangeSliderThumbShape">RangeSliderThumbShape</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="MouseEventsRegion">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MouseEventsRegion">
-							<rect x="19745.3" y="507.0" height="167.0" width="379.0" data-name="MouseEventsRegion"></rect>
-							<path d="M19745.3 538.0 L20124.3 538.0" fill="none" data-name="MouseEventsRegion"></path>
+							<rect x="17955.3" y="522.0" height="167.0" width="379.0" data-name="MouseEventsRegion"></rect>
+							<path d="M17955.3 553.0 L18334.3 553.0" fill="none" data-name="MouseEventsRegion"></path>
 						</g>
-						<g transform="translate(19745.25, 507)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MouseEventsRegion">
+						<g transform="translate(17955.25, 522)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MouseEventsRegion">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MouseEventsRegion">
 								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="MouseEventsRegion">MouseEventsRegion</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19745.25, 538)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MouseEventsRegion">
+						<g transform="translate(17955.25, 553)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MouseEventsRegion">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MouseEventsRegion">
 								<text x="0.0" y="13.5" stroke="none" data-name="MouseEventsRegion">+onTap: void Function()?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MouseEventsRegion">+onHover: void Function(PointerHoverEvent)?</text>
@@ -2234,9 +2447,9 @@
 					</g>
 					<g data-name="void Function(PointerHoverEvent)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerHoverEvent)?">
-							<rect x="19775.0" y="842.0" height="31.0" width="292.0" data-name="void Function(PointerHoverEvent)?"></rect>
+							<rect x="18648.8" y="857.0" height="31.0" width="292.0" data-name="void Function(PointerHoverEvent)?"></rect>
 						</g>
-						<g transform="translate(19775, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerHoverEvent)?">
+						<g transform="translate(18648.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerHoverEvent)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerHoverEvent)?">
 								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerHoverEvent)?">void Function(PointerHoverEvent)?</text>
 								
@@ -2245,9 +2458,9 @@
 					</g>
 					<g data-name="void Function(PointerEnterEvent)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerEnterEvent)?">
-							<rect x="20107.0" y="842.0" height="31.0" width="287.0" data-name="void Function(PointerEnterEvent)?"></rect>
+							<rect x="18321.8" y="857.0" height="31.0" width="287.0" data-name="void Function(PointerEnterEvent)?"></rect>
 						</g>
-						<g transform="translate(20107, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerEnterEvent)?">
+						<g transform="translate(18321.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerEnterEvent)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerEnterEvent)?">
 								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerEnterEvent)?">void Function(PointerEnterEvent)?</text>
 								
@@ -2256,9 +2469,9 @@
 					</g>
 					<g data-name="void Function(PointerExitEvent)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerExitEvent)?">
-							<rect x="20434.0" y="842.0" height="31.0" width="274.0" data-name="void Function(PointerExitEvent)?"></rect>
+							<rect x="18007.8" y="857.0" height="31.0" width="274.0" data-name="void Function(PointerExitEvent)?"></rect>
 						</g>
-						<g transform="translate(20434, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerExitEvent)?">
+						<g transform="translate(18007.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerExitEvent)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerExitEvent)?">
 								<text x="129.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerExitEvent)?">void Function(PointerExitEvent)?</text>
 								
@@ -2267,361 +2480,280 @@
 					</g>
 					<g data-name="SystemMouseCursor">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SystemMouseCursor">
-							<rect x="20748.0" y="842.0" height="31.0" width="180.0" data-name="SystemMouseCursor"></rect>
+							<rect x="17787.8" y="857.0" height="31.0" width="180.0" data-name="SystemMouseCursor"></rect>
 						</g>
-						<g transform="translate(20748, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SystemMouseCursor">
+						<g transform="translate(17787.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SystemMouseCursor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SystemMouseCursor">
 								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="SystemMouseCursor">SystemMouseCursor</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControlLabel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlLabel">
-							<rect x="18141.8" y="514.0" height="153.0" width="430.0" data-name="FormControlLabel"></rect>
-							<path d="M18141.8 545.0 L18571.8 545.0" fill="none" data-name="FormControlLabel"></path>
-							<path d="M18141.8 636.0 L18571.8 636.0" fill="none" data-name="FormControlLabel"></path>
-						</g>
-						<g transform="translate(18141.75, 514)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlLabel">
-								<text x="207.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlLabel">FormControlLabel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18141.75, 545)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+formControl: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlLabel">+text: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlLabel">+isClickable: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlLabel">+textStyle: TextStyle?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormControlLabel">+onClick: void Function(AbstractControl&lt;dynamic&gt;)?</text>
-								
-							</g>
+					<g data-name="ReactiveCustomColorPicker">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveCustomColorPicker">
+							<rect x="11452.0" y="590.0" height="31.0" width="236.0" data-name="ReactiveCustomColorPicker"></rect>
 						</g>
-						<g transform="translate(18141.75, 636)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+Widget build()</text>
+						<g transform="translate(11452, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveCustomColorPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveCustomColorPicker">
+								<text x="110.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveCustomColorPicker">ReactiveCustomColorPicker</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<rect x="20968.0" y="842.0" height="31.0" width="352.0" data-name="void Function(AbstractControl&lt;dynamic&gt;)?"></rect>
+					<g data-name="ReactiveFormField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFormField">
+							<rect x="8903.5" y="188.0" height="31.0" width="163.0" data-name="ReactiveFormField"></rect>
 						</g>
-						<g transform="translate(20968, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">void Function(AbstractControl&lt;dynamic&gt;)?</text>
+						<g transform="translate(8903.5, 188)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFormField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFormField">
+								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFormField">ReactiveFormField</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IWithBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="4095.3" y="165.0" height="62.0" width="164.0" data-name="IWithBanner"></rect>
-							<path d="M4095.3 196.0 L4259.3 196.0" fill="none" data-name="IWithBanner"></path>
-						</g>
-						<g transform="translate(4095.25, 165)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
-								
-							</g>
+					<g data-name="TextParagraph">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TextParagraph">
+							<rect x="5910.3" y="536.5" height="138.0" width="208.0" data-name="TextParagraph"></rect>
+							<path d="M5910.3 567.5 L6118.3 567.5" fill="none" data-name="TextParagraph"></path>
+							<path d="M5910.3 643.5 L6118.3 643.5" fill="none" data-name="TextParagraph"></path>
 						</g>
-						<g transform="translate(4095.25, 196)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IWithBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="IWithBanner">+Widget? banner()</text>
+						<g transform="translate(5910.25, 536.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextParagraph">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextParagraph">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextParagraph">TextParagraph</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="BannerBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BannerBox">
-							<rect x="12810.8" y="499.5" height="182.0" width="298.0" data-name="BannerBox"></rect>
-							<path d="M12810.8 530.5 L13108.8 530.5" fill="none" data-name="BannerBox"></path>
-						</g>
-						<g transform="translate(12810.75, 499.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerBox">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerBox">BannerBox</text>
+						<g transform="translate(5910.25, 567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
+								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+text: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TextParagraph">+style: TextStyle?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TextParagraph">+selectable: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TextParagraph">+span: List&lt;TextSpan&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12810.75, 530.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="BannerBox">+prefixIcon: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BannerBox">+body: Widget</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BannerBox">+style: BannerStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BannerBox">+padding: EdgeInsets?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BannerBox">+noPrefix: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BannerBox">+dismissable: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="BannerBox">+isDismissed: bool?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="BannerBox">+onDismissed: dynamic Function()?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="BannerBox">+dismissIconSize: double</text>
+						<g transform="translate(5910.25, 643.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
+								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BannerStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BannerStyle">
-							<rect x="17886.0" y="796.5" height="122.0" width="294.0" data-name="BannerStyle"></rect>
-							<path d="M17886.0 827.5 L18180.0 827.5" fill="none" data-name="BannerStyle"></path>
+					<g data-name="UnderConstruction">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UnderConstruction">
+							<rect x="9448.3" y="172.5" height="62.0" width="164.0" data-name="UnderConstruction"></rect>
+							<path d="M9448.3 203.5 L9612.3 203.5" fill="none" data-name="UnderConstruction"></path>
 						</g>
-						<g transform="translate(17886, 796.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerStyle">
-								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerStyle">BannerStyle</text>
+						<g transform="translate(9448.25, 172.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnderConstruction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnderConstruction">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="UnderConstruction">UnderConstruction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17886, 827.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerStyle">
-								<text x="0.0" y="13.5" stroke="none" data-name="BannerStyle">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+values: List&lt;BannerStyle&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+warning: BannerStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+info: BannerStyle</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+error: BannerStyle</text>
+						<g transform="translate(9448.25, 203.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnderConstruction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnderConstruction">
+								<text x="0.0" y="13.5" stroke="none" data-name="UnderConstruction">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SecondaryButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SecondaryButton">
-							<rect x="5386.3" y="521.5" height="138.0" width="249.0" data-name="SecondaryButton"></rect>
-							<path d="M5386.3 552.5 L5635.3 552.5" fill="none" data-name="SecondaryButton"></path>
-							<path d="M5386.3 628.5 L5635.3 628.5" fill="none" data-name="SecondaryButton"></path>
-						</g>
-						<g transform="translate(5386.25, 521.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecondaryButton">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecondaryButton">SecondaryButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5386.25, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SecondaryButton">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SecondaryButton">+isLoading: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SecondaryButton">+onPressed: void Function()?</text>
-								
-							</g>
+					<g data-name="NullHelperDecoration">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NullHelperDecoration">
+							<rect x="11990.0" y="590.0" height="31.0" width="184.0" data-name="NullHelperDecoration"></rect>
 						</g>
-						<g transform="translate(5386.25, 628.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+Widget build()</text>
+						<g transform="translate(11990, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NullHelperDecoration">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NullHelperDecoration">
+								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="NullHelperDecoration">NullHelperDecoration</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconPack">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPack">
-							<rect x="4299.3" y="142.0" height="108.0" width="359.0" data-name="IconPack"></rect>
-							<path d="M4299.3 173.0 L4658.3 173.0" fill="none" data-name="IconPack"></path>
-							<path d="M4299.3 219.0 L4658.3 219.0" fill="none" data-name="IconPack"></path>
-						</g>
-						<g transform="translate(4299.25, 142)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPack">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPack">IconPack</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4299.25, 173)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+defaultPack: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPack">&lt;static&gt;+material: List&lt;IconOption&gt;</text>
-								
-							</g>
+					<g data-name="InputDecoration">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InputDecoration">
+							<rect x="9266.3" y="188.0" height="31.0" width="142.0" data-name="InputDecoration"></rect>
 						</g>
-						<g transform="translate(4299.25, 219)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+IconOption? resolveIconByName()</text>
+						<g transform="translate(9266.25, 188)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InputDecoration">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InputDecoration">
+								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="InputDecoration">InputDecoration</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconOption">
-							<rect x="1826.8" y="514.0" height="153.0" width="264.0" data-name="IconOption"></rect>
-							<path d="M1826.8 545.0 L2090.8 545.0" fill="none" data-name="IconOption"></path>
-							<path d="M1826.8 621.0 L2090.8 621.0" fill="none" data-name="IconOption"></path>
-						</g>
-						<g transform="translate(1826.75, 514)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconOption">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="IconOption">IconOption</text>
-								
-							</g>
+					<g data-name="ActionMenuType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuType">
+							<rect x="13646.5" y="819.0" height="107.0" width="330.0" data-name="ActionMenuType"></rect>
+							<path d="M13646.5 850.0 L13976.5 850.0" fill="none" data-name="ActionMenuType"></path>
 						</g>
-						<g transform="translate(1826.75, 545)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconOption">+isEmpty: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconOption">+props: List&lt;Object?&gt;</text>
+						<g transform="translate(13646.5, 819)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuType">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuType">ActionMenuType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1826.75, 621)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+String toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">&lt;static&gt;+IconOption fromJson()</text>
+						<g transform="translate(13646.5, 850)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuType">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+values: List&lt;ActionMenuType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+inline: ActionMenuType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+popup: ActionMenuType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="1007.3" y="180.5" height="31.0" width="96.0" data-name="Equatable"></rect>
+					<g data-name="HtmlStylingBanner">
+						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlStylingBanner">
+							<rect x="6158.8" y="551.5" height="108.0" width="298.0" data-name="HtmlStylingBanner"></rect>
+							<path d="M6158.8 582.5 L6456.8 582.5" fill="none" data-name="HtmlStylingBanner"></path>
+							<path d="M6158.8 628.5 L6456.8 628.5" fill="none" data-name="HtmlStylingBanner"></path>
 						</g>
-						<g transform="translate(1007.25, 180.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
+						<g transform="translate(6158.75, 551.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlStylingBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlStylingBanner">
+								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlStylingBanner">HtmlStylingBanner</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReactiveIconPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveIconPicker">
-							<rect x="10450.5" y="575.0" height="31.0" width="168.0" data-name="ReactiveIconPicker"></rect>
-						</g>
-						<g transform="translate(10450.5, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveIconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveIconPicker">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveIconPicker">ReactiveIconPicker</text>
+						<g transform="translate(6158.75, 582.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
+								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+isDismissed: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="HtmlStylingBanner">+onDismissed: dynamic Function()?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReactiveFocusableFormField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFocusableFormField">
-							<rect x="11875.3" y="180.5" height="31.0" width="245.0" data-name="ReactiveFocusableFormField"></rect>
-						</g>
-						<g transform="translate(11875.25, 180.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFocusableFormField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFocusableFormField">
-								<text x="114.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFocusableFormField">ReactiveFocusableFormField</text>
+						<g transform="translate(6158.75, 628.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
+								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPicker">
-							<rect x="6898.3" y="104.5" height="183.0" width="319.0" data-name="IconPicker"></rect>
-							<path d="M6898.3 135.5 L7217.3 135.5" fill="none" data-name="IconPicker"></path>
-							<path d="M6898.3 256.5 L7217.3 256.5" fill="none" data-name="IconPicker"></path>
-						</g>
-						<g transform="translate(6898.25, 104.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPicker">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPicker">IconPicker</text>
-								
-							</g>
+					<g data-name="FormConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
+							<rect x="9945.8" y="172.5" height="62.0" width="192.0" data-name="FormConsumerWidget"></rect>
+							<path d="M9945.8 203.5 L10137.8 203.5" fill="none" data-name="FormConsumerWidget"></path>
 						</g>
-						<g transform="translate(6898.25, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPicker">+selectedOption: IconOption?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPicker">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconPicker">+galleryIconSize: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IconPicker">+selectedIconSize: double?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IconPicker">+focusNode: FocusNode?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IconPicker">+isDisabled: bool</text>
+						<g transform="translate(9945.75, 172.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
+								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6898.25, 256.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+Widget build()</text>
+						<g transform="translate(9945.75, 203.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerWidget">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(IconOption)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(IconOption)?">
-							<rect x="10886.0" y="575.0" height="31.0" width="230.0" data-name="void Function(IconOption)?"></rect>
+					<g data-name="FormConsumerRefWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
+							<rect x="10177.8" y="172.5" height="62.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
+							<path d="M10177.8 203.5 L10396.8 203.5" fill="none" data-name="FormConsumerRefWidget"></path>
 						</g>
-						<g transform="translate(10886, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(IconOption)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(IconOption)?">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(IconOption)?">void Function(IconOption)?</text>
+						<g transform="translate(10177.75, 172.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
+								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
+								
+							</g>
+						</g>
+						<g transform="translate(10177.75, 203.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerRefWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerRefWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerRefWidget">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FocusNode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FocusNode">
-							<rect x="11512.0" y="575.0" height="31.0" width="106.0" data-name="FocusNode"></rect>
+					<g data-name="SplashPage">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SplashPage">
+							<rect x="10436.8" y="172.5" height="62.0" width="136.0" data-name="SplashPage"></rect>
+							<path d="M10436.8 203.5 L10572.8 203.5" fill="none" data-name="SplashPage"></path>
 						</g>
-						<g transform="translate(11512, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FocusNode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FocusNode">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="FocusNode">FocusNode</text>
+						<g transform="translate(10436.75, 172.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SplashPage">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SplashPage">SplashPage</text>
+								
+							</g>
+						</g>
+						<g transform="translate(10436.75, 203.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SplashPage">
+								<text x="0.0" y="13.5" stroke="none" data-name="SplashPage">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconPickerField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerField">
-							<rect x="7738.3" y="104.5" height="183.0" width="319.0" data-name="IconPickerField"></rect>
-							<path d="M7738.3 135.5 L8057.3 135.5" fill="none" data-name="IconPickerField"></path>
-							<path d="M7738.3 256.5 L8057.3 256.5" fill="none" data-name="IconPickerField"></path>
+					<g data-name="ErrorPage">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ErrorPage">
+							<rect x="12595.0" y="559.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
+							<path d="M12595.0 590.0 L12757.0 590.0" fill="none" data-name="ErrorPage"></path>
+							<path d="M12595.0 621.0 L12757.0 621.0" fill="none" data-name="ErrorPage"></path>
 						</g>
-						<g transform="translate(7738.25, 104.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerField">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerField">IconPickerField</text>
+						<g transform="translate(12595, 559)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ErrorPage">
+								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="ErrorPage">ErrorPage</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7738.25, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerField">+selectedOption: IconOption?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerField">+selectedIconSize: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconPickerField">+galleryIconSize: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IconPickerField">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IconPickerField">+focusNode: FocusNode?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IconPickerField">+isDisabled: bool</text>
+						<g transform="translate(12595, 590)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
+								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+error: Exception?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7738.25, 256.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+Widget build()</text>
+						<g transform="translate(12595, 621)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
+								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconPickerGallery">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerGallery">
-							<rect x="12700.3" y="134.5" height="123.0" width="319.0" data-name="IconPickerGallery"></rect>
-							<path d="M12700.3 165.5 L13019.3 165.5" fill="none" data-name="IconPickerGallery"></path>
-							<path d="M12700.3 226.5 L13019.3 226.5" fill="none" data-name="IconPickerGallery"></path>
+					<g data-name="ConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
+							<rect x="9753.8" y="188.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
 						</g>
-						<g transform="translate(12700.25, 134.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerGallery">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerGallery">IconPickerGallery</text>
+						<g transform="translate(9753.75, 188)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12700.25, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerGallery">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerGallery">+iconSize: double</text>
+					</g>
+					<g data-name="StudyULogo">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyULogo">
+							<rect x="16566.0" y="559.0" height="93.0" width="214.0" data-name="StudyULogo"></rect>
+							<path d="M16566.0 590.0 L16780.0 590.0" fill="none" data-name="StudyULogo"></path>
+							<path d="M16566.0 621.0 L16780.0 621.0" fill="none" data-name="StudyULogo"></path>
+						</g>
+						<g transform="translate(16566, 559)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyULogo">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyULogo">
+								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyULogo">StudyULogo</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12700.25, 226.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+Widget build()</text>
+						<g transform="translate(16566, 590)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+onTap: void Function()?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(16566, 621)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="SingleColumnLayout">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayout">
-							<rect x="8163.5" y="491.5" height="198.0" width="418.0" data-name="SingleColumnLayout"></rect>
-							<path d="M8163.5 522.5 L8581.5 522.5" fill="none" data-name="SingleColumnLayout"></path>
-							<path d="M8163.5 658.5 L8581.5 658.5" fill="none" data-name="SingleColumnLayout"></path>
+							<rect x="10732.0" y="506.5" height="198.0" width="418.0" data-name="SingleColumnLayout"></rect>
+							<path d="M10732.0 537.5 L11150.0 537.5" fill="none" data-name="SingleColumnLayout"></path>
+							<path d="M10732.0 673.5 L11150.0 673.5" fill="none" data-name="SingleColumnLayout"></path>
 						</g>
-						<g transform="translate(8163.5, 491.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayout">
+						<g transform="translate(10732, 506.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayout">
 								<text x="201.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayout">SingleColumnLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8163.5, 522.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
+						<g transform="translate(10732, 537.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
 								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraints: BoxConstraints</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraintsNarrow: BoxConstraints</text>
@@ -2634,7 +2766,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(8163.5, 658.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
+						<g transform="translate(10732, 673.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
 								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+dynamic fromType()</text>
 								
@@ -2643,16 +2775,16 @@
 					</g>
 					<g data-name="SingleColumnLayoutType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="18270.0" y="789.0" height="137.0" width="426.0" data-name="SingleColumnLayoutType"></rect>
-							<path d="M18270.0 820.0 L18696.0 820.0" fill="none" data-name="SingleColumnLayoutType"></path>
+							<rect x="4084.3" y="804.0" height="137.0" width="426.0" data-name="SingleColumnLayoutType"></rect>
+							<path d="M4084.3 835.0 L4510.3 835.0" fill="none" data-name="SingleColumnLayoutType"></path>
 						</g>
-						<g transform="translate(18270, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
+						<g transform="translate(4084.25, 804)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
 								<text x="205.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18270, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayoutType">
+						<g transform="translate(4084.25, 835)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayoutType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayoutType">
 								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayoutType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;</text>
@@ -2664,140 +2796,46 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="11384.3" y="165.0" height="62.0" width="192.0" data-name="FormConsumerWidget"></rect>
-							<path d="M11384.3 196.0 L11576.3 196.0" fill="none" data-name="FormConsumerWidget"></path>
-						</g>
-						<g transform="translate(11384.25, 165)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11384.25, 196)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerRefWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="11616.3" y="165.0" height="62.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
-							<path d="M11616.3 196.0 L11835.3 196.0" fill="none" data-name="FormConsumerRefWidget"></path>
-						</g>
-						<g transform="translate(11616.25, 165)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11616.25, 196)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerRefWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerRefWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormScaffold">
-							<rect x="3059.8" y="522.0" height="137.0" width="212.0" data-name="FormScaffold"></rect>
-							<path d="M3059.8 553.0 L3271.8 553.0" fill="none" data-name="FormScaffold"></path>
-						</g>
-						<g transform="translate(3059.75, 522)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormScaffold">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormScaffold">FormScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3059.75, 553)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormScaffold">+formViewModel: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormScaffold">+actions: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormScaffold">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormScaffold">+actionsPadding: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StandardDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardDialog">
-							<rect x="8883.5" y="454.0" height="273.0" width="247.0" data-name="StandardDialog"></rect>
-							<path d="M8883.5 485.0 L9130.5 485.0" fill="none" data-name="StandardDialog"></path>
-							<path d="M8883.5 696.0 L9130.5 696.0" fill="none" data-name="StandardDialog"></path>
-						</g>
-						<g transform="translate(8883.5, 454)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardDialog">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardDialog">StandardDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8883.5, 485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+title: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardDialog">+titleText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardDialog">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardDialog">+actionButtons: List&lt;Widget&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardDialog">+backgroundColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardDialog">+borderRadius: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StandardDialog">+width: double?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StandardDialog">+height: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StandardDialog">+minWidth: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StandardDialog">+minHeight: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StandardDialog">+maxWidth: double?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StandardDialog">+maxHeight: double?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StandardDialog">+padding: EdgeInsets</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8883.5, 696)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="HtmlStylingBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlStylingBanner">
-							<rect x="13870.8" y="536.5" height="108.0" width="298.0" data-name="HtmlStylingBanner"></rect>
-							<path d="M13870.8 567.5 L14168.8 567.5" fill="none" data-name="HtmlStylingBanner"></path>
-							<path d="M13870.8 613.5 L14168.8 613.5" fill="none" data-name="HtmlStylingBanner"></path>
-						</g>
-						<g transform="translate(13870.75, 536.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlStylingBanner">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlStylingBanner">HtmlStylingBanner</text>
-								
-							</g>
+					<g data-name="Hyperlink">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Hyperlink">
+							<rect x="11190.0" y="499.5" height="212.0" width="222.0" data-name="Hyperlink"></rect>
+							<path d="M11190.0 530.5 L11412.0 530.5" fill="none" data-name="Hyperlink"></path>
 						</g>
-						<g transform="translate(13870.75, 567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+isDismissed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="HtmlStylingBanner">+onDismissed: dynamic Function()?</text>
+						<g transform="translate(11190, 499.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Hyperlink">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Hyperlink">
+								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="Hyperlink">Hyperlink</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13870.75, 613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+Widget build()</text>
+						<g transform="translate(11190, 530.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Hyperlink">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Hyperlink">
+								<text x="0.0" y="13.5" stroke="none" data-name="Hyperlink">+text: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Hyperlink">+url: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Hyperlink">+onClick: void Function()?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Hyperlink">+linkColor: Color</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Hyperlink">+hoverColor: Color?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Hyperlink">+visitedColor: Color?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Hyperlink">+style: TextStyle?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Hyperlink">+hoverStyle: TextStyle?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="Hyperlink">+visitedStyle: TextStyle?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="Hyperlink">+icon: IconData?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="Hyperlink">+iconSize: double?</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="StandardTableColumn">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableColumn">
-							<rect x="2658.5" y="522.0" height="137.0" width="287.0" data-name="StandardTableColumn"></rect>
-							<path d="M2658.5 553.0 L2945.5 553.0" fill="none" data-name="StandardTableColumn"></path>
+							<rect x="13422.5" y="537.0" height="137.0" width="287.0" data-name="StandardTableColumn"></rect>
+							<path d="M13422.5 568.0 L13709.5 568.0" fill="none" data-name="StandardTableColumn"></path>
 						</g>
-						<g transform="translate(2658.5, 522)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableColumn">
+						<g transform="translate(13422.5, 537)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableColumn">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableColumn">
 								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableColumn">StandardTableColumn</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2658.5, 553)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableColumn">
+						<g transform="translate(13422.5, 568)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableColumn">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableColumn">
 								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableColumn">+label: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableColumn">+tooltip: String?</text>
@@ -2811,9 +2849,9 @@
 					</g>
 					<g data-name="TableColumnWidth">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TableColumnWidth">
-							<rect x="2719.5" y="842.0" height="31.0" width="165.0" data-name="TableColumnWidth"></rect>
+							<rect x="19241.8" y="857.0" height="31.0" width="165.0" data-name="TableColumnWidth"></rect>
 						</g>
-						<g transform="translate(2719.5, 842)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TableColumnWidth">
+						<g transform="translate(19241.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TableColumnWidth">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableColumnWidth">
 								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableColumnWidth">TableColumnWidth</text>
 								
@@ -2822,16 +2860,16 @@
 					</g>
 					<g data-name="StandardTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTable">
-							<rect x="8262.5" y="0.0" height="392.0" width="688.0" data-name="StandardTable"></rect>
-							<path d="M8262.5 31.0 L8950.5 31.0" fill="none" data-name="StandardTable"></path>
+							<rect x="13599.5" y="0.0" height="407.0" width="688.0" data-name="StandardTable"></rect>
+							<path d="M13599.5 31.0 L14287.5 31.0" fill="none" data-name="StandardTable"></path>
 						</g>
-						<g transform="translate(8262.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTable">
+						<g transform="translate(13599.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTable">
 								<text x="336.0" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTable">StandardTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8262.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTable">
+						<g transform="translate(13599.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StandardTable">+items: List&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StandardTable">+inputColumns: List&lt;StandardTableColumn&gt;</text>
@@ -2847,24 +2885,25 @@
 								<text x="0.0" y="178.5" stroke="none" data-name="StandardTable">+cellSpacing: double</text>
 								<text x="0.0" y="193.5" stroke="none" data-name="StandardTable">+rowSpacing: double</text>
 								<text x="0.0" y="208.5" stroke="none" data-name="StandardTable">+minRowHeight: double?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StandardTable">+showTableHeader: bool</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StandardTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StandardTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StandardTable">+trailingWidget: Widget?</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StandardTable">+leadingWidgetSpacing: double?</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StandardTable">+trailingWidgetSpacing: double?</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StandardTable">+emptyWidget: Widget?</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StandardTable">+rowStyle: StandardTableStyle</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StandardTable">+disableRowInteractions: bool</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StandardTable">+headerMaxLines: int</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StandardTable">+showTableHeader: bool</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StandardTable">+hideLeadingTrailingWhenEmpty: bool</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StandardTable">+leadingWidget: Widget?</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StandardTable">+trailingWidget: Widget?</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="StandardTable">+leadingWidgetSpacing: double?</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="StandardTable">+trailingWidgetSpacing: double?</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="StandardTable">+emptyWidget: Widget?</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="StandardTable">+rowStyle: StandardTableStyle</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="StandardTable">+disableRowInteractions: bool</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="void Function(T)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="14208.8" y="575.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
+							<rect x="13871.5" y="590.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
 						</g>
-						<g transform="translate(14208.75, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
+						<g transform="translate(13871.5, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
 								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
 								
@@ -2873,9 +2912,9 @@
 					</g>
 					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-							<rect x="14392.8" y="575.0" height="31.0" width="381.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?"></rect>
+							<rect x="14055.5" y="590.0" height="31.0" width="381.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?"></rect>
 						</g>
-						<g transform="translate(14392.75, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
+						<g transform="translate(14055.5, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
 								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
 								
@@ -2884,353 +2923,316 @@
 					</g>
 					<g data-name="int Function(T, T)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(T, T)?">
-							<rect x="14813.8" y="575.0" height="31.0" width="160.0" data-name="int Function(T, T)?"></rect>
-						</g>
-						<g transform="translate(14813.75, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(T, T)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(T, T)?">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(T, T)?">int Function(T, T)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<rect x="15013.8" y="575.0" height="31.0" width="523.0" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?"></rect>
-						</g>
-						<g transform="translate(15013.75, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-								<text x="253.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StandardTableStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableStyle">
-							<rect x="4198.0" y="804.0" height="107.0" width="353.0" data-name="StandardTableStyle"></rect>
-							<path d="M4198.0 835.0 L4551.0 835.0" fill="none" data-name="StandardTableStyle"></path>
-						</g>
-						<g transform="translate(4198, 804)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableStyle">
-								<text x="168.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableStyle">StandardTableStyle</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4198, 835)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableStyle">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableStyle">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+values: List&lt;StandardTableStyle&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+plain: StandardTableStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+material: StandardTableStyle</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TwoColumnLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TwoColumnLayout">
-							<rect x="12402.8" y="432.0" height="317.0" width="368.0" data-name="TwoColumnLayout"></rect>
-							<path d="M12402.8 463.0 L12770.8 463.0" fill="none" data-name="TwoColumnLayout"></path>
-						</g>
-						<g transform="translate(12402.75, 432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TwoColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TwoColumnLayout">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="TwoColumnLayout">TwoColumnLayout</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12402.75, 463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TwoColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TwoColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultDivider: VerticalDivider</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultContentPadding: EdgeInsets</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+slimContentPadding: EdgeInsets</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TwoColumnLayout">+leftWidget: Widget</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TwoColumnLayout">+rightWidget: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TwoColumnLayout">+dividerWidget: Widget?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TwoColumnLayout">+headerWidget: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TwoColumnLayout">+flexLeft: int?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="TwoColumnLayout">+flexRight: int?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="TwoColumnLayout">+constraintsLeft: BoxConstraints?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="TwoColumnLayout">+constraintsRight: BoxConstraints?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="TwoColumnLayout">+scrollLeft: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="TwoColumnLayout">+scrollRight: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="TwoColumnLayout">+paddingLeft: EdgeInsets?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="TwoColumnLayout">+paddingRight: EdgeInsets?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorLeft: Color?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorRight: Color?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="TwoColumnLayout">+stretchHeight: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VerticalDivider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VerticalDivider">
-							<rect x="21360.0" y="842.0" height="31.0" width="130.0" data-name="VerticalDivider"></rect>
-						</g>
-						<g transform="translate(21360, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VerticalDivider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VerticalDivider">
-								<text x="57.0" y="13.5" stroke="none" text-anchor="middle" data-name="VerticalDivider">VerticalDivider</text>
+							<rect x="14476.5" y="590.0" height="31.0" width="160.0" data-name="int Function(T, T)?"></rect>
+						</g>
+						<g transform="translate(14476.5, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(T, T)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(T, T)?">
+								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(T, T)?">int Function(T, T)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ActionMenuInline">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuInline">
-							<rect x="12160.3" y="112.0" height="168.0" width="324.0" data-name="ActionMenuInline"></rect>
-							<path d="M12160.3 143.0 L12484.3 143.0" fill="none" data-name="ActionMenuInline"></path>
-							<path d="M12160.3 249.0 L12484.3 249.0" fill="none" data-name="ActionMenuInline"></path>
+					<g data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+							<rect x="14676.5" y="590.0" height="31.0" width="523.0" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?"></rect>
 						</g>
-						<g transform="translate(12160.25, 112)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuInline">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuInline">ActionMenuInline</text>
+						<g transform="translate(14676.5, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+								<text x="253.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12160.25, 143)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuInline">+iconSize: double?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuInline">+visible: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuInline">+splashRadius: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ActionMenuInline">+paddingVertical: double?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ActionMenuInline">+paddingHorizontal: double?</text>
+					</g>
+					<g data-name="StandardTableStyle">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableStyle">
+							<rect x="12855.5" y="819.0" height="107.0" width="353.0" data-name="StandardTableStyle"></rect>
+							<path d="M12855.5 850.0 L13208.5 850.0" fill="none" data-name="StandardTableStyle"></path>
+						</g>
+						<g transform="translate(12855.5, 819)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableStyle">
+								<text x="168.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableStyle">StandardTableStyle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12160.25, 249)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+Widget build()</text>
+						<g transform="translate(12855.5, 850)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableStyle">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableStyle">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+values: List&lt;StandardTableStyle&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+plain: StandardTableStyle</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+material: StandardTableStyle</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TextParagraph">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextParagraph">
-							<rect x="17239.8" y="521.5" height="138.0" width="208.0" data-name="TextParagraph"></rect>
-							<path d="M17239.8 552.5 L17447.8 552.5" fill="none" data-name="TextParagraph"></path>
-							<path d="M17239.8 628.5 L17447.8 628.5" fill="none" data-name="TextParagraph"></path>
+					<g data-name="IconPack">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPack">
+							<rect x="15998.8" y="149.5" height="108.0" width="359.0" data-name="IconPack"></rect>
+							<path d="M15998.8 180.5 L16357.8 180.5" fill="none" data-name="IconPack"></path>
+							<path d="M15998.8 226.5 L16357.8 226.5" fill="none" data-name="IconPack"></path>
 						</g>
-						<g transform="translate(17239.75, 521.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextParagraph">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextParagraph">TextParagraph</text>
+						<g transform="translate(15998.75, 149.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPack">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPack">
+								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPack">IconPack</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17239.75, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
-								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+text: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TextParagraph">+style: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TextParagraph">+selectable: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TextParagraph">+span: List&lt;TextSpan&gt;?</text>
+						<g transform="translate(15998.75, 180.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+defaultPack: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPack">&lt;static&gt;+material: List&lt;IconOption&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17239.75, 628.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
-								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+Widget build()</text>
+						<g transform="translate(15998.75, 226.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+IconOption? resolveIconByName()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SplashPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SplashPage">
-							<rect x="12524.3" y="165.0" height="62.0" width="136.0" data-name="SplashPage"></rect>
-							<path d="M12524.3 196.0 L12660.3 196.0" fill="none" data-name="SplashPage"></path>
+					<g data-name="IconOption">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconOption">
+							<rect x="17591.8" y="529.0" height="153.0" width="264.0" data-name="IconOption"></rect>
+							<path d="M17591.8 560.0 L17855.8 560.0" fill="none" data-name="IconOption"></path>
+							<path d="M17591.8 636.0 L17855.8 636.0" fill="none" data-name="IconOption"></path>
 						</g>
-						<g transform="translate(12524.25, 165)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SplashPage">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SplashPage">SplashPage</text>
+						<g transform="translate(17591.75, 529)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconOption">
+								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="IconOption">IconOption</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12524.25, 196)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SplashPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SplashPage">+Widget build()</text>
+						<g transform="translate(17591.75, 560)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+name: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconOption">+isEmpty: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IconOption">+props: List&lt;Object?&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ErrorPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ErrorPage">
-							<rect x="16713.0" y="544.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
-							<path d="M16713.0 575.0 L16875.0 575.0" fill="none" data-name="ErrorPage"></path>
-							<path d="M16713.0 606.0 L16875.0 606.0" fill="none" data-name="ErrorPage"></path>
-						</g>
-						<g transform="translate(16713, 544)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ErrorPage">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="ErrorPage">ErrorPage</text>
+						<g transform="translate(17591.75, 636)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+String toJson()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">&lt;static&gt;+IconOption fromJson()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16713, 575)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+error: Exception?</text>
+					</g>
+					<g data-name="Equatable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
+							<rect x="18595.8" y="188.0" height="31.0" width="96.0" data-name="Equatable"></rect>
+						</g>
+						<g transform="translate(18595.75, 188)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
+								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16713, 606)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+Widget build()</text>
+					</g>
+					<g data-name="ReactiveIconPicker">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveIconPicker">
+							<rect x="15528.5" y="590.0" height="31.0" width="168.0" data-name="ReactiveIconPicker"></rect>
+						</g>
+						<g transform="translate(15528.5, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveIconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveIconPicker">
+								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveIconPicker">ReactiveIconPicker</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="16718.0" y="180.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+					<g data-name="ReactiveFocusableFormField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFocusableFormField">
+							<rect x="16397.8" y="188.0" height="31.0" width="245.0" data-name="ReactiveFocusableFormField"></rect>
 						</g>
-						<g transform="translate(16718, 180.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
+						<g transform="translate(16397.75, 188)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFocusableFormField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFocusableFormField">
+								<text x="114.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFocusableFormField">ReactiveFocusableFormField</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Badge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Badge">
-							<rect x="13567.8" y="461.5" height="258.0" width="263.0" data-name="Badge"></rect>
-							<path d="M13567.8 492.5 L13830.8 492.5" fill="none" data-name="Badge"></path>
-							<path d="M13567.8 643.5 L13830.8 643.5" fill="none" data-name="Badge"></path>
+					<g data-name="IconPicker">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPicker">
+							<rect x="17041.8" y="112.0" height="183.0" width="319.0" data-name="IconPicker"></rect>
+							<path d="M17041.8 143.0 L17360.8 143.0" fill="none" data-name="IconPicker"></path>
+							<path d="M17041.8 264.0 L17360.8 264.0" fill="none" data-name="IconPicker"></path>
 						</g>
-						<g transform="translate(13567.75, 461.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Badge">
-								<text x="123.5" y="13.5" stroke="none" text-anchor="middle" data-name="Badge">Badge</text>
+						<g transform="translate(17041.75, 112)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPicker">
+								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPicker">IconPicker</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13567.75, 492.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
-								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+icon: IconData?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Badge">+color: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Badge">+borderRadius: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Badge">+label: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Badge">+type: BadgeType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Badge">+padding: EdgeInsets</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Badge">+iconSize: double?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Badge">+labelStyle: TextStyle?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Badge">+center: bool</text>
+						<g transform="translate(17041.75, 143)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+iconOptions: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPicker">+selectedOption: IconOption?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconPicker">+onSelect: void Function(IconOption)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IconPicker">+galleryIconSize: double?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IconPicker">+selectedIconSize: double?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IconPicker">+focusNode: FocusNode?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="IconPicker">+isDisabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13567.75, 643.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
-								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Badge">-Color? _getBackgroundColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Badge">-Color _getBorderColor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Badge">-Color? _getLabelColor()</text>
+						<g transform="translate(17041.75, 264)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="18786.0" y="789.0" height="137.0" width="288.0" data-name="BadgeType"></rect>
-							<path d="M18786.0 820.0 L19074.0 820.0" fill="none" data-name="BadgeType"></path>
+					<g data-name="void Function(IconOption)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(IconOption)?">
+							<rect x="15779.5" y="590.0" height="31.0" width="230.0" data-name="void Function(IconOption)?"></rect>
 						</g>
-						<g transform="translate(18786, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
+						<g transform="translate(15779.5, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(IconOption)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(IconOption)?">
+								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(IconOption)?">void Function(IconOption)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18786, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BadgeType">
-								<text x="0.0" y="13.5" stroke="none" data-name="BadgeType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BadgeType">&lt;static&gt;+values: List&lt;BadgeType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BadgeType">&lt;static&gt;+filled: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlined: BadgeType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlineFill: BadgeType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BadgeType">&lt;static&gt;+plain: BadgeType</text>
+					</g>
+					<g data-name="FocusNode">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FocusNode">
+							<rect x="16420.0" y="590.0" height="31.0" width="106.0" data-name="FocusNode"></rect>
+						</g>
+						<g transform="translate(16420, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FocusNode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FocusNode">
+								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="FocusNode">FocusNode</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IndicatorRangeSliderThumbShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IndicatorRangeSliderThumbShape">
-							<rect x="6517.5" y="521.5" height="138.0" width="287.0" data-name="IndicatorRangeSliderThumbShape"></rect>
-							<path d="M6517.5 552.5 L6804.5 552.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
-							<path d="M6517.5 613.5 L6804.5 613.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
+					<g data-name="IconPickerField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerField">
+							<rect x="17457.3" y="112.0" height="183.0" width="319.0" data-name="IconPickerField"></rect>
+							<path d="M17457.3 143.0 L17776.3 143.0" fill="none" data-name="IconPickerField"></path>
+							<path d="M17457.3 264.0 L17776.3 264.0" fill="none" data-name="IconPickerField"></path>
 						</g>
-						<g transform="translate(6517.5, 521.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IndicatorRangeSliderThumbShape">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="IndicatorRangeSliderThumbShape">IndicatorRangeSliderThumbShape</text>
+						<g transform="translate(17457.25, 112)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerField">
+								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerField">IconPickerField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6517.5, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+buildContext: BuildContext</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+start: T</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+end: T</text>
+						<g transform="translate(17457.25, 143)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+iconOptions: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerField">+selectedOption: IconOption?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerField">+selectedIconSize: double?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IconPickerField">+galleryIconSize: double?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IconPickerField">+onSelect: void Function(IconOption)?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IconPickerField">+focusNode: FocusNode?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="IconPickerField">+isDisabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6517.5, 613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+Size getPreferredSize()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+void paint()</text>
+						<g transform="translate(17457.25, 264)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BuildContext">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
-							<rect x="4790.5" y="842.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
+					<g data-name="IconPickerGallery">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerGallery">
+							<rect x="16682.8" y="142.0" height="123.0" width="319.0" data-name="IconPickerGallery"></rect>
+							<path d="M16682.8 173.0 L17001.8 173.0" fill="none" data-name="IconPickerGallery"></path>
+							<path d="M16682.8 234.0 L17001.8 234.0" fill="none" data-name="IconPickerGallery"></path>
 						</g>
-						<g transform="translate(4790.5, 842)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
+						<g transform="translate(16682.75, 142)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerGallery">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerGallery">
+								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerGallery">IconPickerGallery</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="RangeSliderThumbShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RangeSliderThumbShape">
-							<rect x="4698.3" y="180.5" height="31.0" width="218.0" data-name="RangeSliderThumbShape"></rect>
+						<g transform="translate(16682.75, 173)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+iconOptions: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerGallery">+onSelect: void Function(IconOption)?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerGallery">+iconSize: double</text>
+								
+							</g>
 						</g>
-						<g transform="translate(4698.25, 180.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="RangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RangeSliderThumbShape">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="RangeSliderThumbShape">RangeSliderThumbShape</text>
+						<g transform="translate(16682.75, 234)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="HelpIcon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HelpIcon">
-							<rect x="16910.0" y="149.5" height="93.0" width="174.0" data-name="HelpIcon"></rect>
-							<path d="M16910.0 180.5 L17084.0 180.5" fill="none" data-name="HelpIcon"></path>
-							<path d="M16910.0 211.5 L17084.0 211.5" fill="none" data-name="HelpIcon"></path>
+					<g data-name="SecondaryButton">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SecondaryButton">
+							<rect x="17231.0" y="536.5" height="138.0" width="249.0" data-name="SecondaryButton"></rect>
+							<path d="M17231.0 567.5 L17480.0 567.5" fill="none" data-name="SecondaryButton"></path>
+							<path d="M17231.0 643.5 L17480.0 643.5" fill="none" data-name="SecondaryButton"></path>
 						</g>
-						<g transform="translate(16910, 149.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HelpIcon">
-								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="HelpIcon">HelpIcon</text>
+						<g transform="translate(17231, 536.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecondaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecondaryButton">
+								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecondaryButton">SecondaryButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16910, 180.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
-								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+tooltipText: String?</text>
+						<g transform="translate(17231, 567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+text: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SecondaryButton">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SecondaryButton">+isLoading: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SecondaryButton">+onPressed: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16910, 211.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
-								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+Widget build()</text>
+						<g transform="translate(17231, 643.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="UnderConstruction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnderConstruction">
-							<rect x="17124.0" y="165.0" height="62.0" width="164.0" data-name="UnderConstruction"></rect>
-							<path d="M17124.0 196.0 L17288.0 196.0" fill="none" data-name="UnderConstruction"></path>
+					<g data-name="TwoColumnLayout">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TwoColumnLayout">
+							<rect x="13014.5" y="447.0" height="317.0" width="368.0" data-name="TwoColumnLayout"></rect>
+							<path d="M13014.5 478.0 L13382.5 478.0" fill="none" data-name="TwoColumnLayout"></path>
 						</g>
-						<g transform="translate(17124, 165)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnderConstruction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnderConstruction">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="UnderConstruction">UnderConstruction</text>
+						<g transform="translate(13014.5, 447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TwoColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TwoColumnLayout">
+								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="TwoColumnLayout">TwoColumnLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17124, 196)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnderConstruction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnderConstruction">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnderConstruction">+Widget build()</text>
+						<g transform="translate(13014.5, 478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TwoColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TwoColumnLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultDivider: VerticalDivider</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultContentPadding: EdgeInsets</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+slimContentPadding: EdgeInsets</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TwoColumnLayout">+leftWidget: Widget</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TwoColumnLayout">+rightWidget: Widget</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TwoColumnLayout">+dividerWidget: Widget?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="TwoColumnLayout">+headerWidget: Widget?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="TwoColumnLayout">+flexLeft: int?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="TwoColumnLayout">+flexRight: int?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="TwoColumnLayout">+constraintsLeft: BoxConstraints?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="TwoColumnLayout">+constraintsRight: BoxConstraints?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="TwoColumnLayout">+scrollLeft: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="TwoColumnLayout">+scrollRight: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="TwoColumnLayout">+paddingLeft: EdgeInsets?</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="TwoColumnLayout">+paddingRight: EdgeInsets?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorLeft: Color?</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorRight: Color?</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="TwoColumnLayout">+stretchHeight: bool</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="VerticalDivider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="VerticalDivider">
+							<rect x="19446.8" y="857.0" height="31.0" width="130.0" data-name="VerticalDivider"></rect>
+						</g>
+						<g transform="translate(19446.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VerticalDivider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VerticalDivider">
+								<text x="57.0" y="13.5" stroke="none" text-anchor="middle" data-name="VerticalDivider">VerticalDivider</text>
 								
 							</g>
 						</g>
diff --git a/docs/uml/designer_v2/lib/features/monitor/uml.svg b/docs/uml/designer_v2/lib/features/monitor/uml.svg
index a3d10873a..598d7fc1a 100644
--- a/docs/uml/designer_v2/lib/features/monitor/uml.svg
+++ b/docs/uml/designer_v2/lib/features/monitor/uml.svg
@@ -1,50 +1,323 @@
-<svg version="1.1" baseProfile="full" width="232.0" height="189.0" viewbox="0 0 232 189" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudyMonitorScreen
+<svg version="1.1" baseProfile="full" width="1699.0" height="786.0" viewbox="0 0 1699 786" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[ParticipantDetailsFormView
+	  |
+	  +formViewModel: ParticipantDetailsFormViewModel
 	  |
 	  +Widget build()
 	]
 	
+	[ParticipantDetailsFormView]o-[ParticipantDetailsFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ParticipantDetailsFormView]
+	
+	[StudyMonitorScreen
+	  |
+	  +Widget build();
+	  -Widget _monitorSectionHeader();
+	  -Widget _buildStat();
+	  -dynamic _onSelectParticipant()
+	]
+	
 	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
 	
+	[StudyMonitorItem
+	  |
+	  +participantId: String;
+	  +inviteCode: String?;
+	  +enrolledAt: DateTime;
+	  +lastActivityAt: DateTime;
+	  +currentDayOfStudy: int;
+	  +studyDurationInDays: int;
+	  +completedInterventions: int;
+	  +missedInterventions: int;
+	  +completedSurveys: int;
+	  +missedSurveys: int;
+	  +rawData: String;
+	  +props: List&lt;Object?&gt;
+	  |
+	  &lt;static&gt;+List&lt;StudyMonitorItem&gt; fromStudy()
+	]
+	
+	[&lt;abstract&gt;Equatable]&lt;:-[StudyMonitorItem]
+	
+	[StudyMonitorTable
+	  |
+	  +studyMonitorItems: List&lt;StudyMonitorItem&gt;;
+	  +onSelectItem: void Function(StudyMonitorItem)
+	  |
+	  +Widget build();
+	  -List&lt;Widget&gt; _buildRow();
+	  -String _formatTime();
+	  -Widget _buildProgressCell()
+	]
+	
+	[StudyMonitorTable]o-[void Function(StudyMonitorItem)]
+	
+	[ParticipantDetailsFormViewModel
+	  |
+	  +participantIdControl: FormControl&lt;String&gt;;
+	  +rawDataControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void initControls();
+	  +StudyMonitorItem buildFormData();
+	  +void setControlsFrom()
+	]
+	
+	[ParticipantDetailsFormViewModel]o-[FormControl]
+	[ParticipantDetailsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[ParticipantDetailsFormViewModel]
+	
 	</desc>
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="189.0" width="232.0" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="786.0" width="1699.0" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
 				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M88.0 44.3 L88 51 L88 71 L88.0 71.0 " fill="none"></path>
-					<path d="M93.3 44.3 L88.0 44.3 L82.7 44.3 L88.0 31.0 Z"></path>
+					<path d="M209.5 387.2 L209.5 471 L714 547.98899486427 L714.0 548.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M214.8 377.8 L209.5 387.2 L204.2 377.8 L209.5 368.5 Z"></path>
+					</g>
+					<path d="M209.5 105.3 L209.5 173 L209.5 275.5 L209.5 275.5 " fill="none"></path>
+					<path d="M214.8 105.3 L209.5 105.3 L204.2 105.3 L209.5 92.0 Z"></path>
+					<path d="M599.0 105.3 L599 173 L599 268.5 L599.0 268.5 " fill="none"></path>
+					<path d="M604.3 105.3 L599.0 105.3 L593.7 105.3 L599.0 92.0 Z"></path>
+					<path d="M964.5 105.3 L964.5 173 L964.5 193 L964.5 193.0 " fill="none"></path>
+					<path d="M969.8 105.3 L964.5 105.3 L959.2 105.3 L964.5 92.0 Z"></path>
+					<path d="M1326.0 171.7 L1326 173 L1326 306.5 L1326.0 306.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1331.3 162.3 L1326.0 171.7 L1320.7 162.3 L1326.0 153.0 Z"></path>
+					</g>
+					<path d="M820.0 674.2 L816.5 679 L816.5 699 L816.5 699.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M829.7 669.7 L820.0 674.2 L821.1 663.5 L830.8 659.0 Z"></path>
+					</g>
+					<path d="M962.0 674.2 L965.5 679 L965.5 699 L965.5 699.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M960.9 663.5 L962.0 674.2 L952.3 669.7 L951.2 659.0 Z"></path>
+					</g>
+					<path d="M1572.5 350.8 L1572.5 471 L1068 547.98899486427 L1068.0 548.0 " fill="none"></path>
+					<path d="M1577.8 350.8 L1572.5 350.8 L1567.2 350.8 L1572.5 337.5 Z"></path>
+					<g data-name="ParticipantDetailsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsFormView">
+							<rect x="0.0" y="275.5" height="93.0" width="419.0" data-name="ParticipantDetailsFormView"></rect>
+							<path d="M0.0 306.5 L419.0 306.5" fill="none" data-name="ParticipantDetailsFormView"></path>
+							<path d="M0.0 337.5 L419.0 337.5" fill="none" data-name="ParticipantDetailsFormView"></path>
+						</g>
+						<g transform="translate(0, 275.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsFormView">
+								<text x="201.5" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsFormView">ParticipantDetailsFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(0, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormView">+formViewModel: ParticipantDetailsFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(0, 337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormView">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ParticipantDetailsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsFormViewModel">
+							<rect x="714.0" y="491.0" height="168.0" width="354.0" data-name="ParticipantDetailsFormViewModel"></rect>
+							<path d="M714.0 522.0 L1068.0 522.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
+							<path d="M714.0 598.0 L1068.0 598.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
+						</g>
+						<g transform="translate(714, 491)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsFormViewModel">
+								<text x="169.0" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsFormViewModel">ParticipantDetailsFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(714, 522)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+participantIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+rawDataControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(714, 598)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+void initControls()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+StudyMonitorItem buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+void setControlsFrom()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
+							<rect x="113.5" y="61.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
+						</g>
+						<g transform="translate(113.5, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
+								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="StudyMonitorScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="0.0" y="71.0" height="62.0" width="176.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M0.0 102.0 L176.0 102.0" fill="none" data-name="StudyMonitorScreen"></path>
+							<rect x="459.0" y="268.5" height="107.0" width="280.0" data-name="StudyMonitorScreen"></rect>
+							<path d="M459.0 299.5 L739.0 299.5" fill="none" data-name="StudyMonitorScreen"></path>
 						</g>
-						<g transform="translate(0, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
+						<g transform="translate(459, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
+								<text x="132.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
+						<g transform="translate(459, 299.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorScreen">-Widget _monitorSectionHeader()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorScreen">-Widget _buildStat()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorScreen">-dynamic _onSelectParticipant()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="StudyPageWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="9.5" y="0.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
+							<rect x="520.5" y="61.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
 						</g>
-						<g transform="translate(9.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
+						<g transform="translate(520.5, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
 								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
 								
 							</g>
 						</g>
 					</g>
+					<g data-name="StudyMonitorItem">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorItem">
+							<rect x="779.0" y="193.0" height="258.0" width="371.0" data-name="StudyMonitorItem"></rect>
+							<path d="M779.0 224.0 L1150.0 224.0" fill="none" data-name="StudyMonitorItem"></path>
+							<path d="M779.0 420.0 L1150.0 420.0" fill="none" data-name="StudyMonitorItem"></path>
+						</g>
+						<g transform="translate(779, 193)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorItem">
+								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorItem">StudyMonitorItem</text>
+								
+							</g>
+						</g>
+						<g transform="translate(779, 224)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">+participantId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorItem">+inviteCode: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorItem">+enrolledAt: DateTime</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorItem">+lastActivityAt: DateTime</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyMonitorItem">+currentDayOfStudy: int</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyMonitorItem">+studyDurationInDays: int</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyMonitorItem">+completedInterventions: int</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyMonitorItem">+missedInterventions: int</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyMonitorItem">+completedSurveys: int</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyMonitorItem">+missedSurveys: int</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyMonitorItem">+rawData: String</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyMonitorItem">+props: List&lt;Object?&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(779, 420)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">&lt;static&gt;+List&lt;StudyMonitorItem&gt; fromStudy()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="Equatable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
+							<rect x="916.5" y="61.0" height="31.0" width="96.0" data-name="Equatable"></rect>
+						</g>
+						<g transform="translate(916.5, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
+								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StudyMonitorTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorTable">
+							<rect x="1128.5" y="0.0" height="153.0" width="395.0" data-name="StudyMonitorTable"></rect>
+							<path d="M1128.5 31.0 L1523.5 31.0" fill="none" data-name="StudyMonitorTable"></path>
+							<path d="M1128.5 77.0 L1523.5 77.0" fill="none" data-name="StudyMonitorTable"></path>
+						</g>
+						<g transform="translate(1128.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorTable">
+								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorTable">StudyMonitorTable</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1128.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+studyMonitorItems: List&lt;StudyMonitorItem&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">+onSelectItem: void Function(StudyMonitorItem)</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1128.5, 77)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">-List&lt;Widget&gt; _buildRow()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorTable">-String _formatTime()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorTable">-Widget _buildProgressCell()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="void Function(StudyMonitorItem)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyMonitorItem)">
+							<rect x="1190.0" y="306.5" height="31.0" width="272.0" data-name="void Function(StudyMonitorItem)"></rect>
+						</g>
+						<g transform="translate(1190, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyMonitorItem)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyMonitorItem)">
+								<text x="128.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyMonitorItem)">void Function(StudyMonitorItem)</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="760.0" y="699.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+						</g>
+						<g transform="translate(760, 699)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormGroup">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
+							<rect x="913.0" y="699.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
+						</g>
+						<g transform="translate(913, 699)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
+							<rect x="1502.0" y="306.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
+						</g>
+						<g transform="translate(1502, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
+								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+								
+							</g>
+						</g>
+					</g>
 				</g>
 			</g>
 		</g>
diff --git a/docs/uml/designer_v2/lib/features/uml.svg b/docs/uml/designer_v2/lib/features/uml.svg
index 9ad270e1a..a6d29463e 100644
--- a/docs/uml/designer_v2/lib/features/uml.svg
+++ b/docs/uml/designer_v2/lib/features/uml.svg
@@ -1,5 +1,122 @@
-<svg version="1.1" baseProfile="full" width="41802.0" height="3658.0" viewbox="0 0 41802 3658" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[SignupForm
+<svg version="1.1" baseProfile="full" width="46783.5" height="3658.0" viewbox="0 0 46783.5 3658" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[&lt;abstract&gt;IAppDelegate
+	  |
+	  +dynamic onAppStart()
+	]
+	
+	[AppController
+	  |
+	  +sharedPreferences: SharedPreferences;
+	  +appDelegates: List&lt;IAppDelegate&gt;;
+	  -_delayedFuture: dynamic;
+	  +isInitialized: dynamic
+	  |
+	  +dynamic onAppStart();
+	  -dynamic _callDelegates()
+	]
+	
+	[AppController]o-[SharedPreferences]
+	
+	[ParticipantDetailsFormView
+	  |
+	  +formViewModel: ParticipantDetailsFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[ParticipantDetailsFormView]o-[ParticipantDetailsFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ParticipantDetailsFormView]
+	
+	[StudyMonitorScreen
+	  |
+	  +Widget build();
+	  -Widget _monitorSectionHeader();
+	  -Widget _buildStat();
+	  -dynamic _onSelectParticipant()
+	]
+	
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
+	
+	[StudyMonitorItem
+	  |
+	  +participantId: String;
+	  +inviteCode: String?;
+	  +enrolledAt: DateTime;
+	  +lastActivityAt: DateTime;
+	  +currentDayOfStudy: int;
+	  +studyDurationInDays: int;
+	  +completedInterventions: int;
+	  +missedInterventions: int;
+	  +completedSurveys: int;
+	  +missedSurveys: int;
+	  +rawData: String;
+	  +props: List&lt;Object?&gt;
+	  |
+	  &lt;static&gt;+List&lt;StudyMonitorItem&gt; fromStudy()
+	]
+	
+	[&lt;abstract&gt;Equatable]&lt;:-[StudyMonitorItem]
+	
+	[StudyMonitorTable
+	  |
+	  +studyMonitorItems: List&lt;StudyMonitorItem&gt;;
+	  +onSelectItem: void Function(StudyMonitorItem)
+	  |
+	  +Widget build();
+	  -List&lt;Widget&gt; _buildRow();
+	  -String _formatTime();
+	  -Widget _buildProgressCell()
+	]
+	
+	[StudyMonitorTable]o-[void Function(StudyMonitorItem)]
+	
+	[ParticipantDetailsFormViewModel
+	  |
+	  +participantIdControl: FormControl&lt;String&gt;;
+	  +rawDataControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void initControls();
+	  +StudyMonitorItem buildFormData();
+	  +void setControlsFrom()
+	]
+	
+	[ParticipantDetailsFormViewModel]o-[FormControl]
+	[ParticipantDetailsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[ParticipantDetailsFormViewModel]
+	
+	[LoginForm
+	  |
+	  +formKey: AuthFormKey
+	  |
+	  +Widget build()
+	]
+	
+	[LoginForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
+	
+	[PasswordRecoveryForm
+	  |
+	  +formKey: AuthFormKey
+	  |
+	  +Widget build()
+	]
+	
+	[PasswordRecoveryForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
+	
+	[PasswordForgotForm
+	  |
+	  +formKey: AuthFormKey
+	  |
+	  +Widget build()
+	]
+	
+	[PasswordForgotForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
+	
+	[SignupForm
 	  |
 	  +formKey: AuthFormKey
 	  |
@@ -11,6 +128,46 @@
 	[SignupForm]o-[AuthFormKey]
 	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
 	
+	[AuthScaffold
+	  |
+	  +body: Widget;
+	  +formKey: AuthFormKey;
+	  +leftContentMinWidth: double;
+	  +leftPanelMinWidth: double;
+	  +leftPanelPadding: EdgeInsets
+	]
+	
+	[AuthScaffold]o-[&lt;abstract&gt;Widget]
+	[AuthScaffold]o-[AuthFormKey]
+	[AuthScaffold]o-[EdgeInsets]
+	
+	[EmailTextField
+	  |
+	  +labelText: String;
+	  +hintText: String?;
+	  +formControlName: String?;
+	  +formControl: FormControl&lt;dynamic&gt;?
+	]
+	
+	[EmailTextField]o-[FormControl]
+	
+	[PasswordTextField
+	  |
+	  +labelText: String;
+	  +hintText: String?;
+	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
+	  +formControlName: String?;
+	  +formControl: FormControl&lt;dynamic&gt;?
+	]
+	
+	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
+	[PasswordTextField]o-[FormControl]
+	
+	[StudyUJobsToBeDone
+	  |
+	  +Widget build()
+	]
+	
 	[AuthFormController
 	  |
 	  +authRepository: IAuthRepository;
@@ -76,332 +233,380 @@
 	[AuthFormKey]o-[AuthFormKey]
 	[Enum]&lt;:--[AuthFormKey]
 	
-	[PasswordForgotForm
-	  |
-	  +formKey: AuthFormKey
+	[AppStatus
 	  |
-	  +Widget build()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
+	  &lt;static&gt;+initializing: AppStatus;
+	  &lt;static&gt;+initialized: AppStatus
 	]
 	
-	[PasswordForgotForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
+	[AppStatus]o-[AppStatus]
+	[Enum]&lt;:--[AppStatus]
 	
-	[EmailTextField
+	[FormArrayTable
 	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
+	  +control: AbstractControl&lt;dynamic&gt;;
+	  +items: List&lt;T&gt;;
+	  +onSelectItem: void Function(T);
+	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
+	  +onNewItem: void Function()?;
+	  +rowTitle: String Function(T);
+	  +onNewItemLabel: String;
+	  +sectionTitle: String?;
+	  +sectionDescription: String?;
+	  +emptyIcon: IconData?;
+	  +emptyTitle: String?;
+	  +emptyDescription: String?;
+	  +sectionTitleDivider: bool?;
+	  +rowPrefix: Widget Function(BuildContext, T, int)?;
+	  +rowSuffix: Widget Function(BuildContext, T, int)?;
+	  +leadingWidget: Widget?;
+	  +itemsSectionPadding: EdgeInsets?;
+	  +hideLeadingTrailingWhenEmpty: bool;
+	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
+	  |
+	  +Widget build();
+	  -List&lt;Widget&gt; _buildRow();
+	  -Widget _newItemButton()
 	]
 	
-	[EmailTextField]o-[FormControl]
+	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
+	[FormArrayTable]o-[void Function(T)]
+	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
+	[FormArrayTable]o-[void Function()?]
+	[FormArrayTable]o-[String Function(T)]
+	[FormArrayTable]o-[IconData]
+	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
+	[FormArrayTable]o-[&lt;abstract&gt;Widget]
+	[FormArrayTable]o-[EdgeInsets]
 	
-	[PasswordTextField
+	[&lt;abstract&gt;ManagedFormViewModel
 	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
+	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
 	]
 	
-	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
-	[PasswordTextField]o-[FormControl]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
 	
-	[PasswordRecoveryForm
+	[FormViewModelNotFoundException
+	]
+	
+	[Exception]&lt;:--[FormViewModelNotFoundException]
+	
+	[FormViewModelCollection
 	  |
-	  +formKey: AuthFormKey
+	  +formViewModels: List&lt;T&gt;;
+	  +formArray: FormArray&lt;dynamic&gt;;
+	  +stagedViewModels: List&lt;T&gt;;
+	  +retrievableViewModels: List&lt;T&gt;;
+	  +formData: List&lt;D&gt;
 	  |
-	  +Widget build()
+	  +void add();
+	  +T remove();
+	  +T? findWhere();
+	  +T? removeWhere();
+	  +bool contains();
+	  +void stage();
+	  +T commit();
+	  +void reset();
+	  +void read()
 	]
 	
-	[PasswordRecoveryForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
+	[FormViewModelCollection]o-[FormArray]
 	
-	[AuthScaffold
+	[CustomFormControl
 	  |
-	  +body: Widget;
-	  +formKey: AuthFormKey;
-	  +leftContentMinWidth: double;
-	  +leftPanelMinWidth: double;
-	  +leftPanelPadding: EdgeInsets
+	  -_onValueChangedDebouncer: Debouncer?;
+	  -_onStatusChangedDebouncer: Debouncer?;
+	  +onValueChanged: void Function(T?)?;
+	  +onStatusChanged: void Function(ControlStatus)?;
+	  +onStatusChangedDebounceTime: int?;
+	  +onValueChangedDebounceTime: int?
+	  |
+	  +void dispose()
 	]
 	
-	[AuthScaffold]o-[&lt;abstract&gt;Widget]
-	[AuthScaffold]o-[AuthFormKey]
-	[AuthScaffold]o-[EdgeInsets]
+	[CustomFormControl]o-[Debouncer]
+	[CustomFormControl]o-[void Function(T?)?]
+	[CustomFormControl]o-[void Function(ControlStatus)?]
+	[FormControl]&lt;:-[CustomFormControl]
 	
-	[StudyUJobsToBeDone
+	[UnsavedChangesDialog
 	  |
 	  +Widget build()
 	]
 	
-	[LoginForm
+	[&lt;abstract&gt;FormValidationSetEnum
+	]
+	
+	[FormControlValidation
 	  |
-	  +formKey: AuthFormKey
+	  +control: AbstractControl&lt;dynamic&gt;;
+	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
+	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
+	  +validationMessages: Map&lt;String, String Function(Object)&gt;
 	  |
-	  +Widget build()
+	  +FormControlValidation merge()
 	]
 	
-	[LoginForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
+	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
 	
-	[&lt;abstract&gt;IAppDelegate
+	[&lt;abstract&gt;IFormData
 	  |
-	  +dynamic onAppStart()
+	  +id: String
+	  |
+	  +IFormData copy()
 	]
 	
-	[AppController
-	  |
-	  +sharedPreferences: SharedPreferences;
-	  +appDelegates: List&lt;IAppDelegate&gt;;
-	  -_delayedFuture: dynamic;
-	  +isInitialized: dynamic
-	  |
-	  +dynamic onAppStart();
-	  -dynamic _callDelegates()
+	[FormInvalidException
 	]
 	
-	[AppController]o-[SharedPreferences]
+	[Exception]&lt;:--[FormInvalidException]
 	
-	[App
+	[FormConfigException
+	  |
+	  +message: String?
 	]
 	
-	[AppContent
-	]
+	[Exception]&lt;:--[FormConfigException]
 	
-	[AppStatus
+	[&lt;abstract&gt;IFormViewModelDelegate
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
-	  &lt;static&gt;+initializing: AppStatus;
-	  &lt;static&gt;+initialized: AppStatus
+	  +dynamic onSave();
+	  +void onCancel()
 	]
 	
-	[AppStatus]o-[AppStatus]
-	[Enum]&lt;:--[AppStatus]
-	
-	[StudyAnalyzeScreen
+	[&lt;abstract&gt;IFormGroupController
 	  |
-	  +Widget? banner();
-	  +Widget build()
+	  +form: FormGroup
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
+	[&lt;abstract&gt;IFormGroupController]o-[FormGroup]
 	
-	[StudyAnalyzeController
+	[FormControlOption
 	  |
-	  +dynamic onExport()
+	  +value: T;
+	  +label: String;
+	  +description: String?;
+	  +props: List&lt;Object?&gt;
 	]
 	
-	[StudyBaseController]&lt;:-[StudyAnalyzeController]
+	[&lt;abstract&gt;Equatable]&lt;:-[FormControlOption]
 	
-	[StudyParticipationBadge
+	[&lt;abstract&gt;FormViewModel
 	  |
-	  +participation: Participation;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +center: bool
+	  -_formData: T?;
+	  -_formMode: FormMode;
+	  -_validationSet: FormValidationSetEnum?;
+	  +delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?;
+	  +autosave: bool;
+	  -_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;;
+	  -_immediateFormChildrenListenerDebouncer: Debouncer?;
+	  -_autosaveOperation: CancelableOperation&lt;dynamic&gt;?;
+	  -_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;;
+	  +prevFormValue: Map&lt;String, dynamic&gt;?;
+	  &lt;static&gt;-_formKey: String;
+	  +formData: T?;
+	  +formMode: FormMode;
+	  +isReadonly: bool;
+	  +validationSet: FormValidationSetEnum?;
+	  +isDirty: bool;
+	  +title: String;
+	  +isValid: bool;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;
 	  |
-	  +Widget build()
+	  -dynamic _setFormData();
+	  -dynamic _rememberDefaultControlValidators();
+	  -Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators();
+	  -dynamic _disableAllControls();
+	  -dynamic _formModeUpdated();
+	  -dynamic _restoreControlsFromFormData();
+	  +void revalidate();
+	  -void _applyValidationSet();
+	  +void read();
+	  +dynamic save();
+	  +dynamic cancel();
+	  +void enableAutosave();
+	  +void listenToImmediateFormChildren();
+	  +dynamic markFormGroupChanged();
+	  +void dispose();
+	  +void setControlsFrom();
+	  +T buildFormData();
+	  +void initControls()
 	]
 	
-	[StudyParticipationBadge]o-[Participation]
-	[StudyParticipationBadge]o-[BadgeType]
+	[&lt;abstract&gt;FormViewModel]o-[FormMode]
+	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;FormValidationSetEnum]
+	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;IFormViewModelDelegate]
+	[&lt;abstract&gt;FormViewModel]o-[Debouncer]
+	[&lt;abstract&gt;FormViewModel]o-[CancelableOperation]
+	[&lt;abstract&gt;IFormGroupController]&lt;:--[&lt;abstract&gt;FormViewModel]
 	
-	[PreviewFrame
+	[FormMode
 	  |
-	  +studyId: String;
-	  +routeArgs: StudyFormRouteArgs?;
-	  +route: String?
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;FormMode&gt;;
+	  &lt;static&gt;+create: FormMode;
+	  &lt;static&gt;+readonly: FormMode;
+	  &lt;static&gt;+edit: FormMode
 	]
 	
-	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
+	[FormMode]o-[FormMode]
+	[Enum]&lt;:--[FormMode]
 	
-	[FrameControlsWidget
+	[EnrolledBadge
 	  |
-	  +onRefresh: void Function()?;
-	  +onOpenNewTab: void Function()?;
-	  +enabled: bool
+	  +enrolledCount: int
 	  |
 	  +Widget build()
 	]
 	
-	[FrameControlsWidget]o-[void Function()?]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
+	[StudyRecruitController
+	  |
+	  +inviteCodeRepository: IInviteCodeRepository;
+	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
+	  |
+	  -dynamic _subscribeInvites();
+	  +Intervention? getIntervention();
+	  +int getParticipantCountForInvite();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void dispose()
+	]
 	
-	[&lt;abstract&gt;IStudyNavViewModel
+	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
+	[StudyRecruitController]o-[StreamSubscription]
+	[StudyBaseController]&lt;:-[StudyRecruitController]
+	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
+	
+	[StudyRecruitScreen
 	  |
-	  +isEditTabEnabled: bool;
-	  +isTestTabEnabled: bool;
-	  +isRecruitTabEnabled: bool;
-	  +isMonitorTabEnabled: bool;
-	  +isAnalyzeTabEnabled: bool;
-	  +isSettingsEnabled: bool
+	  +Widget build();
+	  -Widget _inviteCodesSectionHeader();
+	  -Widget _newInviteCodeButton();
+	  -dynamic _onSelectInvite()
 	]
 	
-	[StudyNav
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
+	
+	[InviteCodeFormView
 	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic edit();
-	  &lt;static&gt;+dynamic test();
-	  &lt;static&gt;+dynamic recruit();
-	  &lt;static&gt;+dynamic monitor();
-	  &lt;static&gt;+dynamic analyze()
+	  +formViewModel: InviteCodeFormViewModel
+	  |
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
 	]
 	
-	[StudyDesignNav
+	[InviteCodeFormView]o-[InviteCodeFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
+	
+	[StudyInvitesTable
 	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic info();
-	  &lt;static&gt;+dynamic enrollment();
-	  &lt;static&gt;+dynamic interventions();
-	  &lt;static&gt;+dynamic measurements();
-	  &lt;static&gt;+dynamic reports()
+	  +invites: List&lt;StudyInvite&gt;;
+	  +onSelect: void Function(StudyInvite);
+	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
+	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
+	  +getIntervention: Intervention? Function(String);
+	  +getParticipantCountForInvite: int Function(StudyInvite)
+	  |
+	  +Widget build();
+	  -List&lt;Widget&gt; _buildRow()
 	]
 	
-	[StudySettingsFormViewModel
+	[StudyInvitesTable]o-[void Function(StudyInvite)]
+	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
+	[StudyInvitesTable]o-[Intervention? Function(String)]
+	[StudyInvitesTable]o-[int Function(StudyInvite)]
+	
+	[InviteCodeFormViewModel
 	  |
-	  +study: AsyncValue&lt;Study&gt;;
-	  +studyRepository: IStudyRepository;
-	  &lt;static&gt;+defaultPublishedToRegistry: bool;
-	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
-	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
-	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
+	  +study: Study;
+	  +inviteCodeRepository: IInviteCodeRepository;
+	  +codeControl: FormControl&lt;String&gt;;
+	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
+	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
+	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
+	  +interventionAControl: FormControl&lt;String&gt;;
+	  +interventionBControl: FormControl&lt;String&gt;;
 	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
+	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
+	  +isPreconfiguredSchedule: bool;
+	  +preconfiguredSchedule: List&lt;String&gt;?
 	  |
+	  +void initControls();
+	  -dynamic _uniqueInviteCode();
+	  +void regenerateCode();
+	  -String _generateCode();
+	  +StudyInvite buildFormData();
 	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +dynamic keepControlsSynced();
-	  +dynamic save();
-	  +dynamic setLaunchDefaults()
+	  +dynamic save()
 	]
 	
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudySettingsFormViewModel]o-[FormControl]
-	[StudySettingsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
+	[InviteCodeFormViewModel]o-[Study]
+	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
+	[InviteCodeFormViewModel]o-[FormControl]
+	[InviteCodeFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
 	
-	[StudySettingsDialog
+	[PublishSuccessDialog
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
 	
-	[StudyTestScreen
-	  |
-	  +previewRoute: String?
+	[PublishDialog
 	  |
-	  +Widget build();
-	  +Widget? banner();
-	  +dynamic load();
-	  +dynamic save();
-	  +dynamic showHelp()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
 	
-	[StudyBaseController
-	  |
-	  +studyId: String;
-	  +studyRepository: IStudyRepository;
-	  +router: GoRouter;
-	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
+	[PublishConfirmationDialog
 	  |
-	  +dynamic subscribeStudy();
-	  +dynamic onStudySubscriptionUpdate();
-	  +dynamic onStudySubscriptionError();
-	  +void dispose()
+	  +Widget build()
 	]
 	
-	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyBaseController]o-[GoRouter]
-	[StudyBaseController]o-[StreamSubscription]
-	
-	[StudyTestController
-	  |
-	  +authRepository: IAuthRepository;
-	  +languageCode: String
-	]
-	
-	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyBaseController]&lt;:-[StudyTestController]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
 	
-	[WebFrame
+	[FrameControlsWidget
 	  |
-	  +previewSrc: String;
-	  +studyId: String
+	  +onRefresh: void Function()?;
+	  +onOpenNewTab: void Function()?;
+	  +enabled: bool
 	  |
 	  +Widget build()
 	]
 	
-	[DisabledFrame
-	  |
-	  +Widget build()
-	]
+	[FrameControlsWidget]o-[void Function()?]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
 	
-	[PhoneContainer
-	  |
-	  &lt;static&gt;+defaultWidth: double;
-	  &lt;static&gt;+defaultHeight: double;
-	  +width: double;
-	  +height: double;
-	  +borderColor: Color;
-	  +borderWidth: double;
-	  +borderRadius: double;
-	  +innerContent: Widget;
-	  +innerContentBackgroundColor: Color?
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel
 	  |
-	  +Widget build()
+	  +studyParticipation: Participation?;
+	  +studyStatus: StudyStatus?
 	]
 	
-	[PhoneContainer]o-[Color]
-	[PhoneContainer]o-[&lt;abstract&gt;Widget]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
 	
-	[MobileFrame
+	[StudyStatusBadge
 	  |
-	  +Widget build()
-	]
-	
-	[DesktopFrame
+	  +participation: Participation?;
+	  +status: StudyStatus?;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +showTooltip: bool
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IStudyAppBarViewModel
-	  |
-	  +isSyncIndicatorVisible: bool;
-	  +isStatusBadgeVisible: bool;
-	  +isPublishVisible: bool
-	]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	
-	[StudyScaffold
-	  |
-	  +studyId: String;
-	  +tabs: List&lt;NavbarTab&gt;?;
-	  +tabsSubnav: List&lt;NavbarTab&gt;?;
-	  +selectedTab: NavbarTab?;
-	  +selectedTabSubnav: NavbarTab?;
-	  +body: StudyPageWidget;
-	  +drawer: Widget?;
-	  +disableActions: bool;
-	  +actionsSpacing: double;
-	  +actionsPadding: double;
-	  +layoutType: SingleColumnLayoutType?;
-	  +appbarHeight: double;
-	  +appbarSubnavHeight: double
-	]
-	
-	[StudyScaffold]o-[NavbarTab]
-	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
-	[StudyScaffold]o-[&lt;abstract&gt;Widget]
-	[StudyScaffold]o-[SingleColumnLayoutType]
+	[StudyStatusBadge]o-[Participation]
+	[StudyStatusBadge]o-[StudyStatus]
+	[StudyStatusBadge]o-[BadgeType]
 	
 	[RouteInformation
 	  |
@@ -465,50 +670,6 @@
 	
 	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel
-	  |
-	  +studyParticipation: Participation?;
-	  +studyStatus: StudyStatus?
-	]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
-	
-	[StudyStatusBadge
-	  |
-	  +participation: Participation?;
-	  +status: StudyStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
-	  |
-	  +Widget build()
-	]
-	
-	[StudyStatusBadge]o-[Participation]
-	[StudyStatusBadge]o-[StudyStatus]
-	[StudyStatusBadge]o-[BadgeType]
-	
-	[TestAppRoutes
-	  |
-	  &lt;static&gt;+studyOverview: String;
-	  &lt;static&gt;+eligibility: String;
-	  &lt;static&gt;+intervention: String;
-	  &lt;static&gt;+consent: String;
-	  &lt;static&gt;+journey: String;
-	  &lt;static&gt;+dashboard: String
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget
-	  |
-	  +studyId: String
-	  |
-	  +Widget? banner()
-	]
-	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
-	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
-	
 	[StudyController
 	  |
 	  +notificationService: INotificationService;
@@ -529,1121 +690,1008 @@
 	[StudyController]o-[StreamSubscription]
 	[StudyBaseController]&lt;:-[StudyController]
 	
-	[StudyMonitorScreen
+	[&lt;abstract&gt;IStudyNavViewModel
 	  |
-	  +Widget build()
+	  +isEditTabEnabled: bool;
+	  +isTestTabEnabled: bool;
+	  +isRecruitTabEnabled: bool;
+	  +isMonitorTabEnabled: bool;
+	  +isAnalyzeTabEnabled: bool;
+	  +isSettingsEnabled: bool
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
-	
-	[StudiesTableColumnHeader
+	[StudyNav
 	  |
-	  +title: String;
-	  +sortable: bool;
-	  +sortAscending: bool;
-	  +sortingActive: bool;
-	  +onSort: void Function()?
+	  &lt;static&gt;+dynamic tabs();
+	  &lt;static&gt;+dynamic edit();
+	  &lt;static&gt;+dynamic test();
+	  &lt;static&gt;+dynamic recruit();
+	  &lt;static&gt;+dynamic monitor();
+	  &lt;static&gt;+dynamic analyze()
 	]
 	
-	[StudiesTableColumnHeader]o-[void Function()?]
+	[StudyDesignNav
+	  |
+	  &lt;static&gt;+dynamic tabs();
+	  &lt;static&gt;+dynamic info();
+	  &lt;static&gt;+dynamic enrollment();
+	  &lt;static&gt;+dynamic interventions();
+	  &lt;static&gt;+dynamic measurements();
+	  &lt;static&gt;+dynamic reports()
+	]
 	
-	[DashboardScaffold
+	[&lt;abstract&gt;StudyPageWidget
 	  |
-	  &lt;static&gt;+compactWidthThreshold: double;
-	  +body: Widget
+	  +studyId: String
 	  |
-	  +Widget build()
+	  +Widget? banner()
 	]
 	
-	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
+	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
 	
-	[StudiesTableColumnSize
+	[StudyParticipationBadge
 	  |
-	  +collapsed: bool;
-	  +flex: int?;
-	  +width: double?
+	  +participation: Participation;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +center: bool
 	  |
-	  +Widget createContainer()
+	  +Widget build()
 	]
 	
-	[StudiesTable
+	[StudyParticipationBadge]o-[Participation]
+	[StudyParticipationBadge]o-[BadgeType]
+	
+	[StudyBaseController
 	  |
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +compactWidthThreshold: double;
-	  +superCompactWidthThreshold: double;
-	  +compactStatTitleThreshold: double;
-	  +studies: List&lt;Study&gt;;
-	  +onSelect: void Function(Study);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study);
-	  +emptyWidget: Widget;
-	  +pinnedStudies: Iterable&lt;String&gt;;
-	  +dashboardController: DashboardController
+	  +studyId: String;
+	  +studyRepository: IStudyRepository;
+	  +router: GoRouter;
+	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
 	  |
-	  +Widget build();
-	  -Widget _buildColumnHeader()
+	  +dynamic subscribeStudy();
+	  +dynamic onStudySubscriptionUpdate();
+	  +dynamic onStudySubscriptionError();
+	  +void dispose()
 	]
 	
-	[StudiesTable]o-[void Function(Study)]
-	[StudiesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)]
-	[StudiesTable]o-[&lt;abstract&gt;Widget]
-	[StudiesTable]o-[DashboardController]
+	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
+	[StudyBaseController]o-[GoRouter]
+	[StudyBaseController]o-[StreamSubscription]
 	
-	[StudiesTableColumn
+	[PreviewFrame
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesTableColumn&gt;;
-	  &lt;static&gt;+pin: StudiesTableColumn;
-	  &lt;static&gt;+title: StudiesTableColumn;
-	  &lt;static&gt;+status: StudiesTableColumn;
-	  &lt;static&gt;+participation: StudiesTableColumn;
-	  &lt;static&gt;+createdAt: StudiesTableColumn;
-	  &lt;static&gt;+enrolled: StudiesTableColumn;
-	  &lt;static&gt;+active: StudiesTableColumn;
-	  &lt;static&gt;+completed: StudiesTableColumn;
-	  &lt;static&gt;+action: StudiesTableColumn
+	  +studyId: String;
+	  +routeArgs: StudyFormRouteArgs?;
+	  +route: String?
 	]
 	
-	[StudiesTableColumn]o-[StudiesTableColumn]
-	[Enum]&lt;:--[StudiesTableColumn]
+	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
 	
-	[DashboardScreen
+	[&lt;abstract&gt;IStudyAppBarViewModel
 	  |
-	  +filter: StudiesFilter?
+	  +isSyncIndicatorVisible: bool;
+	  +isStatusBadgeVisible: bool;
+	  +isPublishVisible: bool
 	]
 	
-	[DashboardScreen]o-[StudiesFilter]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
+	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
 	
-	[DashboardController
+	[StudyScaffold
 	  |
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +userRepository: IUserRepository;
-	  +router: GoRouter;
-	  -_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?;
-	  +searchController: SearchController;
-	  +isSortAscending: bool
+	  +studyId: String;
+	  +tabs: List&lt;NavbarTab&gt;?;
+	  +tabsSubnav: List&lt;NavbarTab&gt;?;
+	  +selectedTab: NavbarTab?;
+	  +selectedTabSubnav: NavbarTab?;
+	  +body: StudyPageWidget;
+	  +drawer: Widget?;
+	  +disableActions: bool;
+	  +actionsSpacing: double;
+	  +actionsPadding: double;
+	  +layoutType: SingleColumnLayoutType?;
+	  +appbarHeight: double;
+	  +appbarSubnavHeight: double
+	]
+	
+	[StudyScaffold]o-[NavbarTab]
+	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
+	[StudyScaffold]o-[&lt;abstract&gt;Widget]
+	[StudyScaffold]o-[SingleColumnLayoutType]
+	
+	[WebFrame
 	  |
-	  -dynamic _subscribeStudies();
-	  +dynamic setSearchText();
-	  +dynamic setStudiesFilter();
-	  +dynamic onSelectStudy();
-	  +dynamic onClickNewStudy();
-	  +dynamic pinStudy();
-	  +dynamic pinOffStudy();
-	  +void setSorting();
-	  +void filterStudies();
-	  +void sortStudies();
-	  +bool isSortingActiveForColumn();
-	  +bool isPinned();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void dispose()
+	  +previewSrc: String;
+	  +studyId: String
+	  |
+	  +Widget build()
 	]
 	
-	[DashboardController]o-[&lt;abstract&gt;IStudyRepository]
-	[DashboardController]o-[&lt;abstract&gt;IAuthRepository]
-	[DashboardController]o-[&lt;abstract&gt;IUserRepository]
-	[DashboardController]o-[GoRouter]
-	[DashboardController]o-[StreamSubscription]
-	[DashboardController]o-[SearchController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
+	[DisabledFrame
+	  |
+	  +Widget build()
+	]
 	
-	[StudiesTableItem
+	[PhoneContainer
 	  |
-	  +study: Study;
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
-	  +isPinned: bool;
-	  +onPinnedChanged: void Function(Study, bool)?;
-	  +onTap: void Function(Study)?
+	  &lt;static&gt;+defaultWidth: double;
+	  &lt;static&gt;+defaultHeight: double;
+	  +width: double;
+	  +height: double;
+	  +borderColor: Color;
+	  +borderWidth: double;
+	  +borderRadius: double;
+	  +innerContent: Widget;
+	  +innerContentBackgroundColor: Color?
+	  |
+	  +Widget build()
 	]
 	
-	[StudiesTableItem]o-[Study]
-	[StudiesTableItem]o-[void Function(Study, bool)?]
-	[StudiesTableItem]o-[void Function(Study)?]
+	[PhoneContainer]o-[Color]
+	[PhoneContainer]o-[&lt;abstract&gt;Widget]
 	
-	[StudiesFilter
+	[MobileFrame
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
+	  +Widget build()
 	]
 	
-	[Enum]&lt;:--[StudiesFilter]
+	[DesktopFrame
+	  |
+	  +Widget build()
+	]
 	
-	[FormArrayTable
+	[StudyTestScreen
 	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +items: List&lt;T&gt;;
-	  +onSelectItem: void Function(T);
-	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
-	  +onNewItem: void Function()?;
-	  +rowTitle: String Function(T);
-	  +onNewItemLabel: String;
-	  +sectionTitle: String?;
-	  +sectionDescription: String?;
-	  +emptyIcon: IconData?;
-	  +emptyTitle: String?;
-	  +emptyDescription: String?;
-	  +sectionTitleDivider: bool?;
-	  +rowPrefix: Widget Function(BuildContext, T, int)?;
-	  +rowSuffix: Widget Function(BuildContext, T, int)?;
-	  +leadingWidget: Widget?;
-	  +itemsSectionPadding: EdgeInsets?;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
+	  +previewRoute: String?
 	  |
 	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow();
-	  -Widget _newItemButton()
+	  +Widget? banner();
+	  +dynamic load();
+	  +dynamic save();
+	  +dynamic showHelp()
 	]
 	
-	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
-	[FormArrayTable]o-[void Function(T)]
-	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
-	[FormArrayTable]o-[void Function()?]
-	[FormArrayTable]o-[String Function(T)]
-	[FormArrayTable]o-[IconData]
-	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
-	[FormArrayTable]o-[&lt;abstract&gt;Widget]
-	[FormArrayTable]o-[EdgeInsets]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
 	
-	[CustomFormControl
+	[StudySettingsFormViewModel
 	  |
-	  -_onValueChangedDebouncer: Debouncer?;
-	  -_onStatusChangedDebouncer: Debouncer?;
-	  +onValueChanged: void Function(T?)?;
-	  +onStatusChanged: void Function(ControlStatus)?;
-	  +onStatusChangedDebounceTime: int?;
-	  +onValueChangedDebounceTime: int?
+	  +study: AsyncValue&lt;Study&gt;;
+	  +studyRepository: IStudyRepository;
+	  &lt;static&gt;+defaultPublishedToRegistry: bool;
+	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
+	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
+	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +void dispose()
+	  +void setControlsFrom();
+	  +Study buildFormData();
+	  +dynamic keepControlsSynced();
+	  +dynamic save();
+	  +dynamic setLaunchDefaults()
 	]
 	
-	[CustomFormControl]o-[Debouncer]
-	[CustomFormControl]o-[void Function(T?)?]
-	[CustomFormControl]o-[void Function(ControlStatus)?]
-	[FormControl]&lt;:-[CustomFormControl]
+	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
+	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
+	[StudySettingsFormViewModel]o-[FormControl]
+	[StudySettingsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
 	
-	[FormInvalidException
+	[StudySettingsDialog
+	  |
+	  +Widget build()
 	]
 	
-	[Exception]&lt;:--[FormInvalidException]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
 	
-	[FormConfigException
+	[StudyTestController
 	  |
-	  +message: String?
+	  +authRepository: IAuthRepository;
+	  +languageCode: String
 	]
 	
-	[Exception]&lt;:--[FormConfigException]
+	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyBaseController]&lt;:-[StudyTestController]
 	
-	[&lt;abstract&gt;IFormViewModelDelegate
+	[TestAppRoutes
 	  |
-	  +dynamic onSave();
-	  +void onCancel()
+	  &lt;static&gt;+studyOverview: String;
+	  &lt;static&gt;+eligibility: String;
+	  &lt;static&gt;+intervention: String;
+	  &lt;static&gt;+consent: String;
+	  &lt;static&gt;+journey: String;
+	  &lt;static&gt;+dashboard: String
 	]
 	
-	[&lt;abstract&gt;IFormGroupController
+	[DrawerEntry
 	  |
-	  +form: FormGroup
+	  +localizedTitle: String Function();
+	  +icon: IconData?;
+	  +localizedHelpText: String Function()?;
+	  +enabled: bool;
+	  +onSelected: void Function(BuildContext, WidgetRef)?;
+	  +autoCloseDrawer: bool;
+	  +title: String;
+	  +helpText: String?
+	  |
+	  +void onClick()
 	]
 	
-	[&lt;abstract&gt;IFormGroupController]o-[FormGroup]
+	[DrawerEntry]o-[String Function()]
+	[DrawerEntry]o-[IconData]
+	[DrawerEntry]o-[String Function()?]
+	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
 	
-	[FormControlOption
+	[GoRouterDrawerEntry
 	  |
-	  +value: T;
-	  +label: String;
-	  +description: String?;
-	  +props: List&lt;Object?&gt;
+	  +intent: RoutingIntent;
+	  +onNavigated: void Function()?
+	  |
+	  +void onClick()
 	]
 	
-	[&lt;abstract&gt;Equatable]&lt;:-[FormControlOption]
+	[GoRouterDrawerEntry]o-[RoutingIntent]
+	[GoRouterDrawerEntry]o-[void Function()?]
+	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
 	
-	[&lt;abstract&gt;FormViewModel
+	[AppDrawer
 	  |
-	  -_formData: T?;
-	  -_formMode: FormMode;
-	  -_validationSet: FormValidationSetEnum?;
-	  +delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?;
-	  +autosave: bool;
-	  -_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;;
-	  -_immediateFormChildrenListenerDebouncer: Debouncer?;
-	  -_autosaveOperation: CancelableOperation&lt;dynamic&gt;?;
-	  -_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  +prevFormValue: Map&lt;String, dynamic&gt;?;
-	  &lt;static&gt;-_formKey: String;
-	  +formData: T?;
-	  +formMode: FormMode;
-	  +isReadonly: bool;
-	  +validationSet: FormValidationSetEnum?;
-	  +isDirty: bool;
-	  +title: String;
-	  +isValid: bool;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;
+	  +width: int;
+	  +autoCloseDrawer: bool;
+	  +leftPaddingEntries: double;
+	  +logoPaddingVertical: double;
+	  +logoPaddingHorizontal: double;
+	  +logoMaxHeight: double;
+	  +logoSectionMinHeight: double;
+	  +logoSectionMaxHeight: double
+	]
+	
+	[StudyAnalyzeScreen
 	  |
-	  -dynamic _setFormData();
-	  -dynamic _rememberDefaultControlValidators();
-	  -Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators();
-	  -dynamic _disableAllControls();
-	  -dynamic _formModeUpdated();
-	  -dynamic _restoreControlsFromFormData();
-	  +void revalidate();
-	  -void _applyValidationSet();
-	  +void read();
-	  +dynamic save();
-	  +dynamic cancel();
-	  +void enableAutosave();
-	  +void listenToImmediateFormChildren();
-	  +dynamic markFormGroupChanged();
-	  +void dispose();
-	  +void setControlsFrom();
-	  +T buildFormData();
-	  +void initControls()
+	  +Widget? banner();
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;FormViewModel]o-[FormMode]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;FormValidationSetEnum]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;IFormViewModelDelegate]
-	[&lt;abstract&gt;FormViewModel]o-[Debouncer]
-	[&lt;abstract&gt;FormViewModel]o-[CancelableOperation]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[&lt;abstract&gt;FormViewModel]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
 	
-	[FormMode
+	[StudyAnalyzeController
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;FormMode&gt;;
-	  &lt;static&gt;+create: FormMode;
-	  &lt;static&gt;+readonly: FormMode;
-	  &lt;static&gt;+edit: FormMode
+	  +dynamic onExport()
 	]
 	
-	[FormMode]o-[FormMode]
-	[Enum]&lt;:--[FormMode]
+	[StudyBaseController]&lt;:-[StudyAnalyzeController]
 	
-	[&lt;abstract&gt;IFormData
-	  |
-	  +id: String
+	[StudyDesignInterventionsFormView
 	  |
-	  +IFormData copy()
+	  +Widget build()
 	]
 	
-	[UnsavedChangesDialog
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
+	
+	[InterventionFormView
 	  |
-	  +Widget build()
+	  +formViewModel: InterventionFormViewModel
 	]
 	
-	[&lt;abstract&gt;FormValidationSetEnum
-	]
+	[InterventionFormView]o-[InterventionFormViewModel]
 	
-	[FormControlValidation
+	[InterventionPreview
 	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
-	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
-	  +validationMessages: Map&lt;String, String Function(Object)&gt;
+	  +routeArgs: InterventionFormRouteArgs
 	  |
-	  +FormControlValidation merge()
+	  +Widget build()
 	]
 	
-	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
+	[InterventionPreview]o-[InterventionFormRouteArgs]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
 	
-	[&lt;abstract&gt;ManagedFormViewModel
+	[StudyScheduleFormView
 	  |
-	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
+	  +formViewModel: StudyScheduleControls
+	  |
+	  -FormTableRow _renderCustomSequence();
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
+	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
 	
-	[FormViewModelNotFoundException
+	[InterventionTaskFormData
+	  |
+	  +taskId: String;
+	  +taskTitle: String;
+	  +taskDescription: String?;
+	  &lt;static&gt;+kDefaultTitle: String;
+	  +id: String
+	  |
+	  +CheckmarkTask toTask();
+	  +InterventionTaskFormData copy()
 	]
 	
-	[Exception]&lt;:--[FormViewModelNotFoundException]
+	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
 	
-	[FormViewModelCollection
+	[InterventionsFormViewModel
 	  |
-	  +formViewModels: List&lt;T&gt;;
-	  +formArray: FormArray&lt;dynamic&gt;;
-	  +stagedViewModels: List&lt;T&gt;;
-	  +retrievableViewModels: List&lt;T&gt;;
-	  +formData: List&lt;D&gt;
+	  +study: Study;
+	  +router: GoRouter;
+	  +interventionsArray: FormArray&lt;dynamic&gt;;
+	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
+	  +form: FormGroup;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +interventionsRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestStudySchedule: bool
 	  |
-	  +void add();
-	  +T remove();
-	  +T? findWhere();
-	  +T? removeWhere();
-	  +bool contains();
-	  +void stage();
-	  +T commit();
-	  +void reset();
-	  +void read()
+	  +void setControlsFrom();
+	  +InterventionsFormData buildFormData();
+	  +void read();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +InterventionFormViewModel provide();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +dynamic testStudySchedule()
 	]
 	
-	[FormViewModelCollection]o-[FormArray]
+	[InterventionsFormViewModel]o-[Study]
+	[InterventionsFormViewModel]o-[GoRouter]
+	[InterventionsFormViewModel]o-[FormArray]
+	[InterventionsFormViewModel]o-[FormViewModelCollection]
+	[InterventionsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
+	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
 	
-	[DrawerEntry
+	[InterventionTaskFormViewModel
 	  |
-	  +localizedTitle: String Function();
-	  +icon: IconData?;
-	  +localizedHelpText: String Function()?;
-	  +enabled: bool;
-	  +onSelected: void Function(BuildContext, WidgetRef)?;
-	  +autoCloseDrawer: bool;
-	  +title: String;
-	  +helpText: String?
+	  +taskIdControl: FormControl&lt;String&gt;;
+	  +instanceIdControl: FormControl&lt;String&gt;;
+	  +taskTitleControl: FormControl&lt;String&gt;;
+	  +taskDescriptionControl: FormControl&lt;String&gt;;
+	  +markAsCompletedControl: FormControl&lt;bool&gt;;
+	  +form: FormGroup;
+	  +taskId: String;
+	  +instanceId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +void onClick()
+	  +void setControlsFrom();
+	  +InterventionTaskFormData buildFormData();
+	  +InterventionTaskFormViewModel createDuplicate()
 	]
 	
-	[DrawerEntry]o-[String Function()]
-	[DrawerEntry]o-[IconData]
-	[DrawerEntry]o-[String Function()?]
-	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
+	[InterventionTaskFormViewModel]o-[FormControl]
+	[InterventionTaskFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
+	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
 	
-	[GoRouterDrawerEntry
+	[&lt;abstract&gt;StudyScheduleControls
 	  |
-	  +intent: RoutingIntent;
-	  +onNavigated: void Function()?
+	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
+	  &lt;static&gt;+defaultScheduleTypeSequence: String;
+	  &lt;static&gt;+defaultNumCycles: int;
+	  &lt;static&gt;+defaultPeriodLength: int;
+	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
+	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
+	  +phaseDurationControl: FormControl&lt;int&gt;;
+	  +numCyclesControl: FormControl&lt;int&gt;;
+	  +includeBaselineControl: FormControl&lt;bool&gt;;
+	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
+	  &lt;static&gt;+kNumCyclesMin: int;
+	  &lt;static&gt;+kNumCyclesMax: int;
+	  &lt;static&gt;+kPhaseDurationMin: int;
+	  &lt;static&gt;+kPhaseDurationMax: int;
+	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
+	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +numCyclesRange: dynamic;
+	  +phaseDurationRange: dynamic;
+	  +customSequenceRequired: dynamic
 	  |
-	  +void onClick()
+	  +void setStudyScheduleControlsFrom();
+	  +StudyScheduleFormData buildStudyScheduleFormData();
+	  +bool isSequencingCustom()
 	]
 	
-	[GoRouterDrawerEntry]o-[RoutingIntent]
-	[GoRouterDrawerEntry]o-[void Function()?]
-	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
+	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
+	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
 	
-	[AppDrawer
+	[InterventionFormData
 	  |
-	  +width: int;
-	  +autoCloseDrawer: bool;
-	  +leftPaddingEntries: double;
-	  +logoPaddingVertical: double;
-	  +logoPaddingHorizontal: double;
-	  +logoMaxHeight: double;
-	  +logoSectionMinHeight: double;
-	  +logoSectionMaxHeight: double
+	  +interventionId: String;
+	  +title: String;
+	  +description: String?;
+	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
+	  +iconName: String?;
+	  &lt;static&gt;+kDefaultTitle: String;
+	  +id: String
+	  |
+	  +Intervention toIntervention();
+	  +InterventionFormData copy()
 	]
 	
-	[StudyInvitesTable
+	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
+	
+	[StudyScheduleFormData
 	  |
-	  +invites: List&lt;StudyInvite&gt;;
-	  +onSelect: void Function(StudyInvite);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getIntervention: Intervention? Function(String);
-	  +getParticipantCountForInvite: int Function(StudyInvite)
+	  +sequenceType: PhaseSequence;
+	  +sequenceTypeCustom: String;
+	  +numCycles: int;
+	  +phaseDuration: int;
+	  +includeBaseline: bool;
+	  +id: String
 	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow()
+	  +StudySchedule toStudySchedule();
+	  +Study apply();
+	  +StudyScheduleFormData copy()
 	]
 	
-	[StudyInvitesTable]o-[void Function(StudyInvite)]
-	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
-	[StudyInvitesTable]o-[Intervention? Function(String)]
-	[StudyInvitesTable]o-[int Function(StudyInvite)]
+	[StudyScheduleFormData]o-[PhaseSequence]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
 	
-	[InviteCodeFormView
-	  |
-	  +formViewModel: InviteCodeFormViewModel
+	[InterventionTaskFormView
 	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
+	  +formViewModel: InterventionTaskFormViewModel
 	]
 	
-	[InviteCodeFormView]o-[InviteCodeFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
+	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
 	
-	[InviteCodeFormViewModel
+	[InterventionsFormData
 	  |
-	  +study: Study;
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  +codeControl: FormControl&lt;String&gt;;
-	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
-	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +interventionAControl: FormControl&lt;String&gt;;
-	  +interventionBControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
-	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +isPreconfiguredSchedule: bool;
-	  +preconfiguredSchedule: List&lt;String&gt;?
+	  +interventionsData: List&lt;InterventionFormData&gt;;
+	  +studyScheduleData: StudyScheduleFormData;
+	  +id: String
 	  |
-	  +void initControls();
-	  -dynamic _uniqueInviteCode();
-	  +void regenerateCode();
-	  -String _generateCode();
-	  +StudyInvite buildFormData();
-	  +void setControlsFrom();
-	  +dynamic save()
+	  +Study apply();
+	  +InterventionsFormData copy()
 	]
 	
-	[InviteCodeFormViewModel]o-[Study]
-	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[InviteCodeFormViewModel]o-[FormControl]
-	[InviteCodeFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
+	[InterventionsFormData]o-[StudyScheduleFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
 	
-	[StudyRecruitController
+	[InterventionFormViewModel
 	  |
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
+	  +study: Study;
+	  +interventionIdControl: FormControl&lt;String&gt;;
+	  +interventionTitleControl: FormControl&lt;String&gt;;
+	  +interventionIconControl: FormControl&lt;IconOption&gt;;
+	  +interventionDescriptionControl: FormControl&lt;String&gt;;
+	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
+	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
+	  +form: FormGroup;
+	  +interventionId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +atLeastOneTask: dynamic;
+	  +breadcrumbsTitle: String;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  -dynamic _subscribeInvites();
-	  +Intervention? getIntervention();
-	  +int getParticipantCountForInvite();
+	  +void setControlsFrom();
+	  +InterventionFormData buildFormData();
 	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
 	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void dispose()
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +InterventionTaskFormViewModel provide();
+	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
+	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
+	  +InterventionFormViewModel createDuplicate()
 	]
 	
-	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[StudyRecruitController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyRecruitController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
+	[InterventionFormViewModel]o-[Study]
+	[InterventionFormViewModel]o-[FormControl]
+	[InterventionFormViewModel]o-[FormArray]
+	[InterventionFormViewModel]o-[FormViewModelCollection]
+	[InterventionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
 	
-	[StudyRecruitScreen
+	[StudyDesignReportsFormView
 	  |
 	  +Widget build();
-	  -Widget _inviteCodesSectionHeader();
-	  -Widget _newInviteCodeButton();
-	  -dynamic _onSelectInvite()
+	  -dynamic _showReportItemSidesheetWithArgs()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
 	
-	[EnrolledBadge
-	  |
-	  +enrolledCount: int
+	[ReportItemFormData
 	  |
-	  +Widget build()
-	]
-	
-	[PublishConfirmationDialog
+	  +isPrimary: bool;
+	  +section: ReportSection;
+	  +id: String
 	  |
-	  +Widget build()
+	  &lt;static&gt;+dynamic fromDomainModel();
+	  +ReportItemFormData copy()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
+	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
+	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
 	
-	[PublishSuccessDialog
+	[DataReferenceEditor
 	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
-	
-	[PublishDialog
+	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
+	  +availableTasks: List&lt;Task&gt;;
+	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
 	  |
-	  +Widget build()
+	  +FormTableRow buildFormTableRow();
+	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
+	[DataReferenceEditor]o-[FormControl]
+	[DataReferenceEditor]o-[ReactiveDropdownField]
 	
-	[StudyFormScaffold
-	  |
-	  +studyId: String;
-	  +formViewModelBuilder: T Function(WidgetRef);
-	  +formViewBuilder: Widget Function(T)
+	[TemporalAggregationFormatted
 	  |
-	  +Widget build()
-	]
-	
-	[StudyFormScaffold]o-[T Function(WidgetRef)]
-	[StudyFormScaffold]o-[Widget Function(T)]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
-	
-	[StudyFormValidationSet
+	  -_value: TemporalAggregation;
+	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
+	  +value: TemporalAggregation;
+	  +string: String;
+	  +icon: IconData?;
+	  +hashCode: int
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
+	  +bool ==();
+	  +String toString();
+	  +String toJson();
+	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
 	]
 	
-	[Enum]&lt;:--[StudyFormValidationSet]
+	[TemporalAggregationFormatted]o-[TemporalAggregation]
+	[TemporalAggregationFormatted]o-[IconData]
 	
-	[&lt;abstract&gt;QuestionFormData
+	[ImprovementDirectionFormatted
 	  |
-	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
-	  +questionId: String;
-	  +questionText: String;
-	  +questionInfoText: String?;
-	  +questionType: SurveyQuestionType;
-	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
-	  +responseOptions: List&lt;dynamic&gt;;
-	  +id: String
+	  -_value: ImprovementDirection;
+	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
+	  +value: ImprovementDirection;
+	  +string: String;
+	  +icon: IconData?;
+	  +hashCode: int
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +EligibilityCriterion toEligibilityCriterion();
-	  +Answer&lt;dynamic&gt; constructAnswerFor();
-	  +dynamic setResponseOptionsValidityFrom();
-	  +QuestionFormData copy()
+	  +bool ==();
+	  +String toString();
+	  +String toJson();
+	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
+	[ImprovementDirectionFormatted]o-[ImprovementDirection]
+	[ImprovementDirectionFormatted]o-[IconData]
 	
-	[ChoiceQuestionFormData
-	  |
-	  +isMultipleChoice: bool;
-	  +answerOptions: List&lt;String&gt;;
-	  +responseOptions: List&lt;String&gt;
+	[ReportSectionType
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +QuestionFormData copy();
-	  -Choice _buildChoiceForValue();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
+	  &lt;static&gt;+average: ReportSectionType;
+	  &lt;static&gt;+linearRegression: ReportSectionType
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
+	[ReportSectionType]o-[ReportSectionType]
+	[Enum]&lt;:--[ReportSectionType]
 	
-	[BoolQuestionFormData
+	[AverageSectionFormView
 	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
-	  +responseOptions: List&lt;String&gt;
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +BoolQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
+	[AverageSectionFormView]o-[ReportItemFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
 	
-	[ScaleQuestionFormData
+	[DataReferenceIdentifier
 	  |
-	  +minValue: double;
-	  +maxValue: double;
-	  +minLabel: String?;
-	  +maxLabel: String?;
-	  +midValues: List&lt;double?&gt;;
-	  +midLabels: List&lt;String?&gt;;
-	  +stepSize: double;
-	  +initialValue: double?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +responseOptions: List&lt;double&gt;;
-	  +midAnnotations: List&lt;Annotation&gt;
+	  +hashCode: int
 	  |
-	  +ScaleQuestion toQuestion();
-	  +QuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +bool ==()
 	]
 	
-	[ScaleQuestionFormData]o-[Color]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
+	[DataReference]&lt;:-[DataReferenceIdentifier]
 	
-	[FreeTextQuestionFormData
+	[LinearRegressionSectionFormView
 	  |
-	  +textLengthRange: List&lt;int&gt;;
-	  +textType: FreeTextQuestionType;
-	  +textTypeExpression: String?;
-	  +responseOptions: List&lt;String&gt;
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +FreeTextQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +Widget build()
 	]
 	
-	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
+	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
 	
-	[SurveyQuestionFormView
+	[ReportItemFormViewModel
 	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
-	]
-	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
-	
-	[SurveyQuestionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
-	]
-	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	]
-	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
-	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
-	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
+	  &lt;static&gt;+defaultSectionType: ReportSectionType;
+	  +sectionIdControl: FormControl&lt;String&gt;;
+	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +sectionControl: FormControl&lt;ReportSection&gt;;
+	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
+	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
+	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
+	  +alphaControl: FormControl&lt;double&gt;;
+	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +form: FormGroup;
+	  +sectionId: String;
+	  +sectionType: ReportSectionType;
+	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
+	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
+	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +dataReferenceRequired: dynamic;
+	  +aggregationRequired: dynamic;
+	  +improvementDirectionRequired: dynamic;
+	  +alphaConfidenceRequired: dynamic
 	  |
-	  +Widget build()
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +ReportItemFormData buildFormData();
+	  +ReportItemFormViewModel createDuplicate();
+	  +dynamic onSectionTypeChanged();
+	  -void _updateFormControls();
+	  +void setControlsFrom()
 	]
 	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
+	[ReportItemFormViewModel]o-[ReportSectionType]
+	[ReportItemFormViewModel]o-[FormControl]
+	[ReportItemFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
 	
-	[FreeTextQuestionFormView
+	[ReportItemFormView
 	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: dynamic;
+	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
 	  |
 	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
+	  -dynamic _buildSectionText();
+	  -dynamic _buildSectionTypeHeader()
 	]
 	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
+	[ReportItemFormView]o-[ReportItemFormViewModel]
+	[ReportItemFormView]o-[Widget Function(BuildContext)]
 	
-	[QuestionFormViewModel
+	[ReportsFormViewModel
 	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +study: Study;
+	  +router: GoRouter;
+	  +reportItemDelegate: ReportFormItemDelegate;
+	  +reportItemArray: FormArray&lt;dynamic&gt;;
+	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
 	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
+	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
 	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
 	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
+	  +canTestConsent: bool
 	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
 	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
-	]
-	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls
-	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
+	  +ReportsFormData buildFormData();
 	  +void read();
+	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
+	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
+	  +dynamic testReport();
 	  +void onCancel();
 	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
-	]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	
-	[QuestionnaireFormData
-	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
-	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule
-	  |
-	  +instanceId: String;
-	  +isTimeLocked: bool;
-	  +timeLockStart: StudyUTimeOfDay?;
-	  +timeLockEnd: StudyUTimeOfDay?;
-	  +hasReminder: bool;
-	  +reminderTime: StudyUTimeOfDay?
-	  |
-	  +Schedule toSchedule()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
-	
-	[ScheduleControls
-	  |
-	  +formViewModel: WithScheduleControls
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
-	]
-	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
-	
-	[&lt;abstract&gt;WithScheduleControls
-	  |
-	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
-	  +instanceID: FormControl&lt;String&gt;;
-	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +hasReminderControl: FormControl&lt;bool&gt;;
-	  +reminderTimeControl: FormControl&lt;Time&gt;;
-	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
-	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
-	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  +hasReminder: bool;
-	  +isTimeRestricted: bool;
-	  +timeRestriction: List&lt;Time&gt;?
-	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
+	  +ReportItemFormViewModel provide()
 	]
 	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
+	[ReportsFormViewModel]o-[Study]
+	[ReportsFormViewModel]o-[GoRouter]
+	[ReportsFormViewModel]o-[ReportFormItemDelegate]
+	[ReportsFormViewModel]o-[FormArray]
+	[ReportsFormViewModel]o-[FormViewModelCollection]
+	[ReportsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
 	
-	[InterventionFormViewModel
+	[ReportFormItemDelegate
 	  |
-	  +study: Study;
-	  +interventionIdControl: FormControl&lt;String&gt;;
-	  +interventionTitleControl: FormControl&lt;String&gt;;
-	  +interventionIconControl: FormControl&lt;IconOption&gt;;
-	  +interventionDescriptionControl: FormControl&lt;String&gt;;
-	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
-	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
-	  +form: FormGroup;
-	  +interventionId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneTask: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
+	  +owner: ReportsFormViewModel;
+	  +propagateOnSave: bool;
+	  +validationSet: dynamic
 	  |
-	  +void setControlsFrom();
-	  +InterventionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
 	  +void onCancel();
 	  +dynamic onSave();
-	  +InterventionTaskFormViewModel provide();
-	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
-	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
-	  +InterventionFormViewModel createDuplicate()
+	  +ReportItemFormViewModel provide();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem()
+	]
+	
+	[ReportFormItemDelegate]o-[FormViewModelCollection]
+	[ReportFormItemDelegate]o-[ReportsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
+	
+	[ReportBadge
+	  |
+	  +status: ReportStatus?;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +showTooltip: bool
+	  |
+	  +Widget build()
 	]
 	
-	[InterventionFormViewModel]o-[Study]
-	[InterventionFormViewModel]o-[FormControl]
-	[InterventionFormViewModel]o-[FormArray]
-	[InterventionFormViewModel]o-[FormViewModelCollection]
-	[InterventionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
+	[ReportBadge]o-[ReportStatus]
+	[ReportBadge]o-[BadgeType]
 	
-	[StudyScheduleFormData
+	[ReportsFormData
 	  |
-	  +sequenceType: PhaseSequence;
-	  +sequenceTypeCustom: String;
-	  +numCycles: int;
-	  +phaseDuration: int;
-	  +includeBaseline: bool;
+	  +reportItems: List&lt;ReportItemFormData&gt;;
 	  +id: String
 	  |
-	  +StudySchedule toStudySchedule();
 	  +Study apply();
-	  +StudyScheduleFormData copy()
+	  +ReportsFormData copy()
 	]
 	
-	[StudyScheduleFormData]o-[PhaseSequence]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
 	
-	[StudyScheduleFormView
-	  |
-	  +formViewModel: StudyScheduleControls
+	[ReportStatus
 	  |
-	  -FormTableRow _renderCustomSequence();
-	  +Widget build()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
+	  &lt;static&gt;+primary: ReportStatus;
+	  &lt;static&gt;+secondary: ReportStatus
 	]
 	
-	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
+	[ReportStatus]o-[ReportStatus]
+	[Enum]&lt;:--[ReportStatus]
 	
-	[InterventionTaskFormView
+	[&lt;abstract&gt;IStudyFormData
 	  |
-	  +formViewModel: InterventionTaskFormViewModel
+	  +Study apply()
 	]
 	
-	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
 	
-	[InterventionPreview
+	[StudyInfoFormViewModel
 	  |
-	  +routeArgs: InterventionFormRouteArgs
+	  +study: Study;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +iconControl: FormControl&lt;IconOption&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +organizationControl: FormControl&lt;String&gt;;
+	  +reviewBoardControl: FormControl&lt;String&gt;;
+	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
+	  +researchersControl: FormControl&lt;String&gt;;
+	  +emailControl: FormControl&lt;String&gt;;
+	  +websiteControl: FormControl&lt;String&gt;;
+	  +phoneControl: FormControl&lt;String&gt;;
+	  +additionalInfoControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +iconRequired: dynamic;
+	  +organizationRequired: dynamic;
+	  +reviewBoardRequired: dynamic;
+	  +reviewBoardNumberRequired: dynamic;
+	  +researchersRequired: dynamic;
+	  +emailRequired: dynamic;
+	  +phoneRequired: dynamic;
+	  +emailFormat: dynamic;
+	  +websiteFormat: dynamic
+	  |
+	  +void setControlsFrom();
+	  +StudyInfoFormData buildFormData()
+	]
+	
+	[StudyInfoFormViewModel]o-[Study]
+	[StudyInfoFormViewModel]o-[FormControl]
+	[StudyInfoFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
+	
+	[StudyDesignInfoFormView
 	  |
 	  +Widget build()
 	]
 	
-	[InterventionPreview]o-[InterventionFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
 	
-	[InterventionsFormData
+	[StudyInfoFormData
 	  |
-	  +interventionsData: List&lt;InterventionFormData&gt;;
-	  +studyScheduleData: StudyScheduleFormData;
+	  +title: String;
+	  +description: String?;
+	  +iconName: String;
+	  +contactInfoFormData: StudyContactInfoFormData;
 	  +id: String
 	  |
 	  +Study apply();
-	  +InterventionsFormData copy()
+	  +StudyInfoFormData copy()
 	]
 	
-	[InterventionsFormData]o-[StudyScheduleFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
+	[StudyInfoFormData]o-[StudyContactInfoFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
 	
-	[InterventionTaskFormData
+	[StudyContactInfoFormData
 	  |
-	  +taskId: String;
-	  +taskTitle: String;
-	  +taskDescription: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
+	  +organization: String?;
+	  +institutionalReviewBoard: String?;
+	  +institutionalReviewBoardNumber: String?;
+	  +researchers: String?;
+	  +email: String?;
+	  +website: String?;
+	  +phone: String?;
+	  +additionalInfo: String?;
 	  +id: String
 	  |
-	  +CheckmarkTask toTask();
-	  +InterventionTaskFormData copy()
+	  +Study apply();
+	  +StudyInfoFormData copy()
 	]
 	
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
 	
-	[InterventionFormView
+	[StudyFormValidationSet
 	  |
-	  +formViewModel: InterventionFormViewModel
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
 	]
 	
-	[InterventionFormView]o-[InterventionFormViewModel]
+	[Enum]&lt;:--[StudyFormValidationSet]
 	
-	[InterventionTaskFormViewModel
+	[MeasurementsFormData
 	  |
-	  +taskIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +taskTitleControl: FormControl&lt;String&gt;;
-	  +taskDescriptionControl: FormControl&lt;String&gt;;
-	  +markAsCompletedControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +taskId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
+	  +id: String
 	  |
-	  +void setControlsFrom();
-	  +InterventionTaskFormData buildFormData();
-	  +InterventionTaskFormViewModel createDuplicate()
+	  +Study apply();
+	  +MeasurementsFormData copy()
 	]
 	
-	[InterventionTaskFormViewModel]o-[FormControl]
-	[InterventionTaskFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
 	
-	[StudyDesignInterventionsFormView
+	[MeasurementSurveyFormView
+	  |
+	  +formViewModel: MeasurementSurveyFormViewModel
+	]
+	
+	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
+	
+	[SurveyPreview
+	  |
+	  +routeArgs: MeasurementFormRouteArgs
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
+	[SurveyPreview]o-[MeasurementFormRouteArgs]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
 	
-	[InterventionsFormViewModel
+	[MeasurementSurveyFormData
+	  |
+	  +measurementId: String;
+	  +title: String;
+	  +introText: String?;
+	  +outroText: String?;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  &lt;static&gt;+kDefaultTitle: String;
+	  +id: String
+	  |
+	  +QuestionnaireTask toQuestionnaireTask();
+	  +MeasurementSurveyFormData copy()
+	]
+	
+	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
+	
+	[MeasurementSurveyFormViewModel
 	  |
 	  +study: Study;
-	  +router: GoRouter;
-	  +interventionsArray: FormArray&lt;dynamic&gt;;
-	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
+	  +measurementIdControl: FormControl&lt;String&gt;;
+	  +instanceIdControl: FormControl&lt;String&gt;;
+	  +surveyTitleControl: FormControl&lt;String&gt;;
+	  +surveyIntroTextControl: FormControl&lt;String&gt;;
+	  +surveyOutroTextControl: FormControl&lt;String&gt;;
 	  +form: FormGroup;
+	  +measurementId: String;
+	  +instanceId: String;
 	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +interventionsRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestStudySchedule: bool
+	  +titleRequired: dynamic;
+	  +atLeastOneQuestion: dynamic;
+	  +breadcrumbsTitle: String;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
 	  +void setControlsFrom();
-	  +InterventionsFormData buildFormData();
-	  +void read();
+	  +MeasurementSurveyFormData buildFormData();
 	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
 	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
 	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
 	  +void onSelectItem();
 	  +void onNewItem();
-	  +InterventionFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +dynamic testStudySchedule()
+	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
+	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
+	  +MeasurementSurveyFormViewModel createDuplicate()
 	]
 	
-	[InterventionsFormViewModel]o-[Study]
-	[InterventionsFormViewModel]o-[GoRouter]
-	[InterventionsFormViewModel]o-[FormArray]
-	[InterventionsFormViewModel]o-[FormViewModelCollection]
-	[InterventionsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
-	
-	[InterventionFormData
-	  |
-	  +interventionId: String;
-	  +title: String;
-	  +description: String?;
-	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
-	  +iconName: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
+	[MeasurementSurveyFormViewModel]o-[Study]
+	[MeasurementSurveyFormViewModel]o-[FormControl]
+	[MeasurementSurveyFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
+	
+	[StudyDesignMeasurementsFormView
 	  |
-	  +Intervention toIntervention();
-	  +InterventionFormData copy()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
 	
-	[&lt;abstract&gt;StudyScheduleControls
+	[MeasurementsFormViewModel
 	  |
-	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
-	  &lt;static&gt;+defaultScheduleTypeSequence: String;
-	  &lt;static&gt;+defaultNumCycles: int;
-	  &lt;static&gt;+defaultPeriodLength: int;
-	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
-	  +phaseDurationControl: FormControl&lt;int&gt;;
-	  +numCyclesControl: FormControl&lt;int&gt;;
-	  +includeBaselineControl: FormControl&lt;bool&gt;;
-	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  &lt;static&gt;+kNumCyclesMin: int;
-	  &lt;static&gt;+kNumCyclesMax: int;
-	  &lt;static&gt;+kPhaseDurationMin: int;
-	  &lt;static&gt;+kPhaseDurationMax: int;
-	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +numCyclesRange: dynamic;
-	  +phaseDurationRange: dynamic;
-	  +customSequenceRequired: dynamic
+	  +study: Study;
+	  +router: GoRouter;
+	  +measurementsArray: FormArray&lt;dynamic&gt;;
+	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
+	  +form: FormGroup;
+	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +measurementRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +void setStudyScheduleControlsFrom();
-	  +StudyScheduleFormData buildStudyScheduleFormData();
-	  +bool isSequencingCustom()
+	  +void read();
+	  +void setControlsFrom();
+	  +MeasurementsFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +MeasurementSurveyFormViewModel provide();
+	  +void onCancel();
+	  +dynamic onSave()
 	]
 	
-	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
-	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
+	[MeasurementsFormViewModel]o-[Study]
+	[MeasurementsFormViewModel]o-[GoRouter]
+	[MeasurementsFormViewModel]o-[FormArray]
+	[MeasurementsFormViewModel]o-[FormViewModelCollection]
+	[MeasurementsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
 	
-	[EnrollmentFormData
+	[StudyFormScaffold
 	  |
-	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
-	  +enrollmentType: Participation;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
-	  +id: String
+	  +studyId: String;
+	  +formViewModelBuilder: T Function(WidgetRef);
+	  +formViewBuilder: Widget Function(T)
 	  |
-	  +Study apply();
-	  +EnrollmentFormData copy()
+	  +Widget build()
 	]
 	
-	[EnrollmentFormData]o-[Participation]
-	[EnrollmentFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
+	[StudyFormScaffold]o-[T Function(WidgetRef)]
+	[StudyFormScaffold]o-[Widget Function(T)]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
 	
 	[ConsentItemFormViewModel
 	  |
@@ -1667,12 +1715,14 @@
 	[ConsentItemFormViewModel]o-[FormGroup]
 	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
 	
-	[ConsentItemFormView
+	[StudyDesignEnrollmentFormView
 	  |
-	  +formViewModel: ConsentItemFormViewModel
+	  +Widget build();
+	  -dynamic _showScreenerQuestionSidesheetWithArgs();
+	  -dynamic _showConsentItemSidesheetWithArgs()
 	]
 	
-	[ConsentItemFormView]o-[ConsentItemFormViewModel]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
 	
 	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
 	  |
@@ -1692,6 +1742,43 @@
 	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
 	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
 	
+	[ConsentItemFormData
+	  |
+	  +consentId: String;
+	  +title: String;
+	  +description: String;
+	  +iconName: String?;
+	  +id: String
+	  |
+	  +ConsentItem toConsentItem();
+	  +ConsentItemFormData copy()
+	]
+	
+	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
+	
+	[ConsentItemFormView
+	  |
+	  +formViewModel: ConsentItemFormViewModel
+	]
+	
+	[ConsentItemFormView]o-[ConsentItemFormViewModel]
+	
+	[EnrollmentFormData
+	  |
+	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
+	  +enrollmentType: Participation;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
+	  +id: String
+	  |
+	  +Study apply();
+	  +EnrollmentFormData copy()
+	]
+	
+	[EnrollmentFormData]o-[Participation]
+	[EnrollmentFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
+	
 	[ScreenerQuestionFormViewModel
 	  |
 	  &lt;static&gt;+defaultResponseOptionValidity: bool;
@@ -1719,29 +1806,6 @@
 	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
 	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
 	
-	[StudyDesignEnrollmentFormView
-	  |
-	  +Widget build();
-	  -dynamic _showScreenerQuestionSidesheetWithArgs();
-	  -dynamic _showConsentItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
-	
-	[ConsentItemFormData
-	  |
-	  +consentId: String;
-	  +title: String;
-	  +description: String;
-	  +iconName: String?;
-	  +id: String
-	  |
-	  +ConsentItem toConsentItem();
-	  +ConsentItemFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
-	
 	[EnrollmentFormViewModel
 	  |
 	  +study: Study;
@@ -1810,525 +1874,523 @@
 	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
 	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
 	
-	[MeasurementsFormViewModel
+	[StudyFormViewModel
 	  |
-	  +study: Study;
+	  +studyDirtyCopy: Study?;
+	  +studyRepository: IStudyRepository;
+	  +authRepository: IAuthRepository;
 	  +router: GoRouter;
-	  +measurementsArray: FormArray&lt;dynamic&gt;;
-	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
+	  +studyInfoFormViewModel: StudyInfoFormViewModel;
+	  +enrollmentFormViewModel: EnrollmentFormViewModel;
+	  +measurementsFormViewModel: MeasurementsFormViewModel;
+	  +reportsFormViewModel: ReportsFormViewModel;
+	  +interventionsFormViewModel: InterventionsFormViewModel;
 	  +form: FormGroup;
-	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
+	  +isStudyReadonly: bool;
 	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +measurementRequired: dynamic;
 	  +titles: Map&lt;FormMode, String&gt;
 	  |
 	  +void read();
 	  +void setControlsFrom();
-	  +MeasurementsFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +MeasurementSurveyFormViewModel provide();
+	  +Study buildFormData();
+	  +void dispose();
 	  +void onCancel();
-	  +dynamic onSave()
+	  +dynamic onSave();
+	  -dynamic _applyAndSaveSubform()
 	]
 	
-	[MeasurementsFormViewModel]o-[Study]
-	[MeasurementsFormViewModel]o-[GoRouter]
-	[MeasurementsFormViewModel]o-[FormArray]
-	[MeasurementsFormViewModel]o-[FormViewModelCollection]
-	[MeasurementsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
+	[StudyFormViewModel]o-[Study]
+	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
+	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyFormViewModel]o-[GoRouter]
+	[StudyFormViewModel]o-[StudyInfoFormViewModel]
+	[StudyFormViewModel]o-[EnrollmentFormViewModel]
+	[StudyFormViewModel]o-[MeasurementsFormViewModel]
+	[StudyFormViewModel]o-[ReportsFormViewModel]
+	[StudyFormViewModel]o-[InterventionsFormViewModel]
+	[StudyFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
 	
-	[MeasurementSurveyFormData
+	[&lt;abstract&gt;WithQuestionnaireControls
 	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
+	  +questionsArray: FormArray&lt;dynamic&gt;;
+	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
+	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
+	  +propagateOnSave: bool;
+	  +questionModels: List&lt;Q&gt;;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  |
+	  +void setQuestionnaireControlsFrom();
+	  +QuestionnaireFormData buildQuestionnaireFormData();
+	  +void read();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +Q provide();
+	  +Q provideQuestionFormViewModel()
+	]
+	
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	
+	[QuestionnaireFormData
+	  |
+	  +questionsData: List&lt;QuestionFormData&gt;?;
 	  +id: String
 	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
+	  +StudyUQuestionnaire toQuestionnaire();
+	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
+	  +QuestionnaireFormData copy()
 	]
 	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
+	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
+	
+	[&lt;abstract&gt;QuestionFormData
+	  |
+	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
+	  +questionId: String;
+	  +questionText: String;
+	  +questionInfoText: String?;
+	  +questionType: SurveyQuestionType;
+	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
+	  +responseOptions: List&lt;dynamic&gt;;
+	  +id: String
+	  |
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +EligibilityCriterion toEligibilityCriterion();
+	  +Answer&lt;dynamic&gt; constructAnswerFor();
+	  +dynamic setResponseOptionsValidityFrom();
+	  +QuestionFormData copy()
+	]
 	
-	[SurveyPreview
+	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
+	
+	[ChoiceQuestionFormData
 	  |
-	  +routeArgs: MeasurementFormRouteArgs
+	  +isMultipleChoice: bool;
+	  +answerOptions: List&lt;String&gt;;
+	  +responseOptions: List&lt;String&gt;
 	  |
-	  +Widget build()
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +QuestionFormData copy();
+	  -Choice _buildChoiceForValue();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
 	
-	[MeasurementSurveyFormViewModel
+	[BoolQuestionFormData
 	  |
-	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
+	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
+	  +responseOptions: List&lt;String&gt;
 	  |
-	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +BoolQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
 	
-	[MeasurementSurveyFormView
+	[ScaleQuestionFormData
 	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
+	  +minValue: double;
+	  +maxValue: double;
+	  +minLabel: String?;
+	  +maxLabel: String?;
+	  +midValues: List&lt;double?&gt;;
+	  +midLabels: List&lt;String?&gt;;
+	  +stepSize: double;
+	  +initialValue: double?;
+	  +minColor: Color?;
+	  +maxColor: Color?;
+	  +responseOptions: List&lt;double&gt;;
+	  +midAnnotations: List&lt;Annotation&gt;
+	  |
+	  +ScaleQuestion toQuestion();
+	  +QuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
+	[ScaleQuestionFormData]o-[Color]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
 	
-	[MeasurementsFormData
+	[FreeTextQuestionFormData
 	  |
-	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
-	  +id: String
+	  +textLengthRange: List&lt;int&gt;;
+	  +textType: FreeTextQuestionType;
+	  +textTypeExpression: String?;
+	  +responseOptions: List&lt;String&gt;
 	  |
-	  +Study apply();
-	  +MeasurementsFormData copy()
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +FreeTextQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
+	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
 	
-	[StudyDesignMeasurementsFormView
+	[FreeTextQuestionFormView
 	  |
-	  +Widget build()
+	  +formViewModel: QuestionFormViewModel;
+	  +generateLabelHelpTextMap: dynamic
+	  |
+	  +Widget build();
+	  +Widget disableOnReadonly();
+	  +Widget generateRow()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
+	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget
+	[SurveyQuestionType
 	  |
-	  +Widget? banner()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
+	  &lt;static&gt;+choice: SurveyQuestionType;
+	  &lt;static&gt;+bool: SurveyQuestionType;
+	  &lt;static&gt;+scale: SurveyQuestionType;
+	  &lt;static&gt;+freeText: SurveyQuestionType
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
+	[SurveyQuestionType]o-[SurveyQuestionType]
+	[Enum]&lt;:--[SurveyQuestionType]
 	
-	[StudyDesignInfoFormView
+	[&lt;abstract&gt;IScaleQuestionFormViewModel
 	  |
-	  +Widget build()
+	  +isMidValuesClearedInfoVisible: bool
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
-	
-	[StudyInfoFormData
-	  |
-	  +title: String;
-	  +description: String?;
-	  +iconName: String;
-	  +contactInfoFormData: StudyContactInfoFormData;
-	  +id: String
+	[ScaleQuestionFormView
 	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
+	  +formViewModel: QuestionFormViewModel
 	]
 	
-	[StudyInfoFormData]o-[StudyContactInfoFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
+	[ScaleQuestionFormView]o-[QuestionFormViewModel]
 	
-	[StudyContactInfoFormData
+	[ChoiceQuestionFormView
 	  |
-	  +organization: String?;
-	  +institutionalReviewBoard: String?;
-	  +institutionalReviewBoardNumber: String?;
-	  +researchers: String?;
-	  +email: String?;
-	  +website: String?;
-	  +phone: String?;
-	  +additionalInfo: String?;
-	  +id: String
+	  +formViewModel: QuestionFormViewModel
 	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
+	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
 	
-	[StudyInfoFormViewModel
+	[BoolQuestionFormView
 	  |
-	  +study: Study;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +organizationControl: FormControl&lt;String&gt;;
-	  +reviewBoardControl: FormControl&lt;String&gt;;
-	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
-	  +researchersControl: FormControl&lt;String&gt;;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +websiteControl: FormControl&lt;String&gt;;
-	  +phoneControl: FormControl&lt;String&gt;;
-	  +additionalInfoControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +iconRequired: dynamic;
-	  +organizationRequired: dynamic;
-	  +reviewBoardRequired: dynamic;
-	  +reviewBoardNumberRequired: dynamic;
-	  +researchersRequired: dynamic;
-	  +emailRequired: dynamic;
-	  +phoneRequired: dynamic;
-	  +emailFormat: dynamic;
-	  +websiteFormat: dynamic
+	  +formViewModel: QuestionFormViewModel
 	  |
-	  +void setControlsFrom();
-	  +StudyInfoFormData buildFormData()
+	  +Widget build()
 	]
 	
-	[StudyInfoFormViewModel]o-[Study]
-	[StudyInfoFormViewModel]o-[FormControl]
-	[StudyInfoFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
+	[BoolQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
 	
-	[StudyFormViewModel
+	[QuestionFormViewModel
 	  |
-	  +studyDirtyCopy: Study?;
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +router: GoRouter;
-	  +studyInfoFormViewModel: StudyInfoFormViewModel;
-	  +enrollmentFormViewModel: EnrollmentFormViewModel;
-	  +measurementsFormViewModel: MeasurementsFormViewModel;
-	  +reportsFormViewModel: ReportsFormViewModel;
-	  +interventionsFormViewModel: InterventionsFormViewModel;
+	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
+	  -_titles: Map&lt;FormMode, String Function()&gt;?;
+	  +questionIdControl: FormControl&lt;String&gt;;
+	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
+	  +questionTextControl: FormControl&lt;String&gt;;
+	  +questionInfoTextControl: FormControl&lt;String&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
+	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +customOptionsMin: int;
+	  +customOptionsMax: int;
+	  +customOptionsInitial: int;
+	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
+	  &lt;static&gt;+kDefaultScaleMinValue: int;
+	  &lt;static&gt;+kDefaultScaleMaxValue: int;
+	  &lt;static&gt;+kNumMidValueControls: int;
+	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
+	  +scaleMinValueControl: FormControl&lt;int&gt;;
+	  +scaleMaxValueControl: FormControl&lt;int&gt;;
+	  -_scaleRangeControl: FormControl&lt;int&gt;;
+	  +scaleMinLabelControl: FormControl&lt;String&gt;;
+	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
+	  +scaleMidValueControls: FormArray&lt;int&gt;;
+	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
+	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
+	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
+	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
+	  +prevMidValues: List&lt;int?&gt;?;
+	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
+	  +customRegexControl: FormControl&lt;String&gt;;
+	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
+	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
+	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
+	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
+	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
+	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
+	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
 	  +form: FormGroup;
-	  +isStudyReadonly: bool;
+	  +questionId: String;
+	  +questionType: SurveyQuestionType;
+	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
+	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
+	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +validAnswerOptions: List&lt;String&gt;;
+	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +scaleMinValue: int;
+	  +scaleMaxValue: int;
+	  +scaleRange: int;
+	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
 	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +questionTextRequired: dynamic;
+	  +numValidChoiceOptions: dynamic;
+	  +scaleRangeValid: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +isAddOptionButtonVisible: bool;
+	  +isMidValuesClearedInfoVisible: bool
 	  |
-	  +void read();
+	  +String? scaleMidLabelAt();
+	  -dynamic _onScaleRangeChanged();
+	  -dynamic _applyInputFormatters();
+	  -dynamic _updateScaleMidValueControls();
+	  -Map&lt;String, dynamic&gt;? _validateFreeText();
+	  -dynamic _onFreeTextLengthChanged();
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +dynamic onQuestionTypeChanged();
+	  +dynamic onResponseOptionsChanged();
+	  -void _updateFormControls();
+	  +void initControls();
 	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +void dispose();
-	  +void onCancel();
-	  +dynamic onSave();
-	  -dynamic _applyAndSaveSubform()
+	  +QuestionFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem();
+	  +dynamic save();
+	  +QuestionFormViewModel createDuplicate()
 	]
 	
-	[StudyFormViewModel]o-[Study]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyFormViewModel]o-[GoRouter]
-	[StudyFormViewModel]o-[StudyInfoFormViewModel]
-	[StudyFormViewModel]o-[EnrollmentFormViewModel]
-	[StudyFormViewModel]o-[MeasurementsFormViewModel]
-	[StudyFormViewModel]o-[ReportsFormViewModel]
-	[StudyFormViewModel]o-[InterventionsFormViewModel]
-	[StudyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
+	[QuestionFormViewModel]o-[SurveyQuestionType]
+	[QuestionFormViewModel]o-[FormControl]
+	[QuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
+	[QuestionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
 	
-	[&lt;abstract&gt;IStudyFormData
+	[SurveyQuestionFormView
 	  |
-	  +Study apply()
+	  +formViewModel: QuestionFormViewModel;
+	  +isHtmlStyleable: bool
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
+	[SurveyQuestionFormView]o-[QuestionFormViewModel]
 	
-	[ReportsFormData
-	  |
-	  +reportItems: List&lt;ReportItemFormData&gt;;
-	  +id: String
+	[&lt;abstract&gt;IFormDataWithSchedule
 	  |
-	  +Study apply();
-	  +ReportsFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
-	
-	[ReportStatus
+	  +instanceId: String;
+	  +isTimeLocked: bool;
+	  +timeLockStart: StudyUTimeOfDay?;
+	  +timeLockEnd: StudyUTimeOfDay?;
+	  +hasReminder: bool;
+	  +reminderTime: StudyUTimeOfDay?
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
-	  &lt;static&gt;+primary: ReportStatus;
-	  &lt;static&gt;+secondary: ReportStatus
+	  +Schedule toSchedule()
 	]
 	
-	[ReportStatus]o-[ReportStatus]
-	[Enum]&lt;:--[ReportStatus]
+	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
 	
-	[ReportItemFormData
+	[ScheduleControls
 	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
-	  +id: String
+	  +formViewModel: WithScheduleControls
 	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
 	]
 	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
+	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
 	
-	[ReportItemFormViewModel
+	[&lt;abstract&gt;WithScheduleControls
 	  |
-	  &lt;static&gt;+defaultSectionType: ReportSectionType;
-	  +sectionIdControl: FormControl&lt;String&gt;;
-	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +sectionControl: FormControl&lt;ReportSection&gt;;
-	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
-	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
-	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
-	  +alphaControl: FormControl&lt;double&gt;;
-	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +form: FormGroup;
-	  +sectionId: String;
-	  +sectionType: ReportSectionType;
-	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
-	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
-	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +dataReferenceRequired: dynamic;
-	  +aggregationRequired: dynamic;
-	  +improvementDirectionRequired: dynamic;
-	  +alphaConfidenceRequired: dynamic
+	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
+	  +instanceID: FormControl&lt;String&gt;;
+	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
+	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
+	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
+	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
+	  +hasReminderControl: FormControl&lt;bool&gt;;
+	  +reminderTimeControl: FormControl&lt;Time&gt;;
+	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
+	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
+	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
+	  +hasReminder: bool;
+	  +isTimeRestricted: bool;
+	  +timeRestriction: List&lt;Time&gt;?
 	  |
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +ReportItemFormData buildFormData();
-	  +ReportItemFormViewModel createDuplicate();
-	  +dynamic onSectionTypeChanged();
-	  -void _updateFormControls();
-	  +void setControlsFrom()
+	  +void setScheduleControlsFrom();
+	  -dynamic _initReminderControl()
 	]
 	
-	[ReportItemFormViewModel]o-[ReportSectionType]
-	[ReportItemFormViewModel]o-[FormControl]
-	[ReportItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
+	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
+	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
 	
-	[LinearRegressionSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
+	[&lt;abstract&gt;StudyDesignPageWidget
 	  |
-	  +Widget build()
+	  +Widget? banner()
 	]
 	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
 	
-	[AverageSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
+	[StudiesTableColumnHeader
 	  |
-	  +Widget build()
+	  +title: String;
+	  +sortable: bool;
+	  +sortAscending: bool;
+	  +sortingActive: bool;
+	  +onSort: void Function()?
 	]
 	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
+	[StudiesTableColumnHeader]o-[void Function()?]
 	
-	[TemporalAggregationFormatted
-	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
+	[DashboardScreen
 	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
+	  +filter: StudiesFilter?
 	]
 	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
+	[DashboardScreen]o-[StudiesFilter]
 	
-	[ImprovementDirectionFormatted
+	[DashboardScaffold
 	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
+	  &lt;static&gt;+compactWidthThreshold: double;
+	  +body: Widget
 	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
+	  +Widget build()
 	]
 	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
+	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
 	
-	[ReportSectionType
+	[DashboardController
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
+	  +studyRepository: IStudyRepository;
+	  +authRepository: IAuthRepository;
+	  +userRepository: IUserRepository;
+	  +router: GoRouter;
+	  -_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?;
+	  +searchController: SearchController;
+	  +isSortAscending: bool
+	  |
+	  -dynamic _subscribeStudies();
+	  +dynamic setSearchText();
+	  +dynamic setStudiesFilter();
+	  +dynamic onSelectStudy();
+	  +dynamic onClickNewStudy();
+	  +dynamic pinStudy();
+	  +dynamic pinOffStudy();
+	  +void setSorting();
+	  +void filterStudies();
+	  +void sortStudies();
+	  +bool isSortingActiveForColumn();
+	  +bool isPinned();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void dispose()
 	]
 	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
+	[DashboardController]o-[&lt;abstract&gt;IStudyRepository]
+	[DashboardController]o-[&lt;abstract&gt;IAuthRepository]
+	[DashboardController]o-[&lt;abstract&gt;IUserRepository]
+	[DashboardController]o-[GoRouter]
+	[DashboardController]o-[StreamSubscription]
+	[DashboardController]o-[SearchController]
+	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
 	
-	[DataReferenceEditor
-	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
+	[StudiesFilter
 	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
 	]
 	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
+	[Enum]&lt;:--[StudiesFilter]
 	
-	[DataReferenceIdentifier
+	[StudiesTableColumnSize
 	  |
-	  +hashCode: int
+	  +collapsed: bool;
+	  +flex: int?;
+	  +width: double?
 	  |
-	  +bool ==()
+	  +Widget createContainer()
 	]
 	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
-	
-	[ReportItemFormView
+	[StudiesTable
 	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
+	  +itemHeight: double;
+	  +itemPadding: double;
+	  +rowSpacing: double;
+	  +columnSpacing: double;
+	  +compactWidthThreshold: double;
+	  +superCompactWidthThreshold: double;
+	  +compactStatTitleThreshold: double;
+	  +studies: List&lt;Study&gt;;
+	  +onSelect: void Function(Study);
+	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study);
+	  +emptyWidget: Widget;
+	  +pinnedStudies: Iterable&lt;String&gt;;
+	  +dashboardController: DashboardController
 	  |
 	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
+	  -Widget _buildColumnHeader()
 	]
 	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
+	[StudiesTable]o-[void Function(Study)]
+	[StudiesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)]
+	[StudiesTable]o-[&lt;abstract&gt;Widget]
+	[StudiesTable]o-[DashboardController]
 	
-	[StudyDesignReportsFormView
+	[StudiesTableColumn
 	  |
-	  +Widget build();
-	  -dynamic _showReportItemSidesheetWithArgs()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudiesTableColumn&gt;;
+	  &lt;static&gt;+pin: StudiesTableColumn;
+	  &lt;static&gt;+title: StudiesTableColumn;
+	  &lt;static&gt;+status: StudiesTableColumn;
+	  &lt;static&gt;+participation: StudiesTableColumn;
+	  &lt;static&gt;+createdAt: StudiesTableColumn;
+	  &lt;static&gt;+enrolled: StudiesTableColumn;
+	  &lt;static&gt;+active: StudiesTableColumn;
+	  &lt;static&gt;+completed: StudiesTableColumn;
+	  &lt;static&gt;+action: StudiesTableColumn
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
+	[StudiesTableColumn]o-[StudiesTableColumn]
+	[Enum]&lt;:--[StudiesTableColumn]
 	
-	[ReportsFormViewModel
+	[StudiesTableItem
 	  |
 	  +study: Study;
-	  +router: GoRouter;
-	  +reportItemDelegate: ReportFormItemDelegate;
-	  +reportItemArray: FormArray&lt;dynamic&gt;;
-	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +form: FormGroup;
-	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestConsent: bool
-	  |
-	  +void setControlsFrom();
-	  +ReportsFormData buildFormData();
-	  +void read();
-	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
-	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
-	  +dynamic testReport();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide()
+	  +itemHeight: double;
+	  +itemPadding: double;
+	  +rowSpacing: double;
+	  +columnSpacing: double;
+	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
+	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
+	  +isPinned: bool;
+	  +onPinnedChanged: void Function(Study, bool)?;
+	  +onTap: void Function(Study)?
 	]
 	
-	[ReportsFormViewModel]o-[Study]
-	[ReportsFormViewModel]o-[GoRouter]
-	[ReportsFormViewModel]o-[ReportFormItemDelegate]
-	[ReportsFormViewModel]o-[FormArray]
-	[ReportsFormViewModel]o-[FormViewModelCollection]
-	[ReportsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
+	[StudiesTableItem]o-[Study]
+	[StudiesTableItem]o-[void Function(Study, bool)?]
+	[StudiesTableItem]o-[void Function(Study)?]
 	
-	[ReportFormItemDelegate
-	  |
-	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +owner: ReportsFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
-	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
+	[App
 	]
 	
-	[ReportFormItemDelegate]o-[FormViewModelCollection]
-	[ReportFormItemDelegate]o-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
-	
-	[ReportBadge
-	  |
-	  +status: ReportStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
-	  |
-	  +Widget build()
+	[AppContent
 	]
 	
-	[ReportBadge]o-[ReportStatus]
-	[ReportBadge]o-[BadgeType]
-	
 	[AccountSettingsDialog
 	  |
 	  +Widget build()
@@ -2340,1569 +2402,1748 @@
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="3658.0" width="41802.0" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="3658.0" width="46783.5" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
 				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M139.0 2316.2 L139 2865 L2137.75 3036.2886272257324 L2137.8 3036.3 " fill="none"></path>
+					<path d="M568.8 2331.2 L568.75 2865 L15061.75 3050.418933287601 L15061.8 3050.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M144.3 2306.8 L139.0 2316.2 L133.7 2306.8 L139.0 2297.5 Z"></path>
+						<path d="M574.1 2321.8 L568.8 2331.2 L563.4 2321.8 L568.8 2312.5 Z"></path>
 					</g>
-					<path d="M774.5 1409.9 L139 1607 L139 2174.5 L139.0 2174.5 " fill="none"></path>
-					<path d="M776.1 1415.0 L774.5 1409.9 L772.9 1404.9 L787.3 1406.0 Z"></path>
-					<path d="M33054.9 2553.5 L32869.5 2865 L27849.25 3048.8991652344707 L27849.3 3048.9 " fill="none"></path>
+					<path d="M209.5 1455.7 L209.5 1607 L15848.25 2228.9606246937387 L15848.3 2229.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33064.3 2548.2 L33054.9 2553.5 L33055.1 2542.8 L33064.5 2537.5 Z"></path>
+						<path d="M214.8 1446.3 L209.5 1455.7 L204.2 1446.3 L209.5 1437.0 Z"></path>
 					</g>
-					<path d="M33259.8 2556.1 L33275 2865 L23766 3049.857299213009 L23766.0 3049.9 " fill="none"></path>
+					<path d="M7287.2 544.6 L209.5 876 L209.5 1025 L209.5 1025 L209.5 1174 L209.5 1174 L209.5 1344 L209.5 1344.0 " fill="none"></path>
+					<path d="M7287.4 549.9 L7287.2 544.6 L7286.9 539.3 L7300.5 544.0 Z"></path>
+					<path d="M15149.6 1406.7 L13973.25 1607 L12827.739666136726 2182.5 L12827.7 2182.5 " fill="none"></path>
+					<path d="M15150.5 1412.0 L15149.6 1406.7 L15148.7 1401.4 L15162.8 1404.5 Z"></path>
+					<path d="M34312.4 111.4 L34049 203 L34049 410.5 L34049.0 410.5 " fill="none"></path>
+					<path d="M34314.1 116.4 L34312.4 111.4 L34310.6 106.3 L34324.9 107.0 Z"></path>
+					<path d="M33687.5 186.7 L33687.5 203 L33687.5 524 L33687.5 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33264.6 2546.6 L33259.8 2556.1 L33254.0 2547.1 L33258.9 2537.5 Z"></path>
+						<path d="M33692.8 177.3 L33687.5 186.7 L33682.2 177.3 L33687.5 168.0 Z"></path>
 					</g>
-					<path d="M33280.1 2556.0 L33315 2865 L24346 3049.7695239147242 L24346.0 3049.8 " fill="none"></path>
+					<path d="M15829.8 2269.4 L12340 2865 L26715.5 3050.76986904102 L26715.5 3050.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33284.4 2546.2 L33280.1 2556.0 L33273.8 2547.4 L33278.0 2537.5 Z"></path>
+						<path d="M15839.9 2273.0 L15829.8 2269.4 L15838.2 2262.5 L15848.3 2266.2 Z"></path>
 					</g>
-					<path d="M33458.4 2553.0 L33669.5 2865 L32709.5 3042.9721669980117 L32709.5 3043.0 " fill="none"></path>
+					<path d="M16068.0 2337.2 L16291 2865 L34132 3050.952804090871 L34132.0 3051.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33457.6 2542.2 L33458.4 2553.0 L33448.8 2548.2 L33448.0 2537.5 Z"></path>
+						<path d="M16069.3 2326.5 L16068.0 2337.2 L16059.5 2330.7 L16060.7 2320.0 Z"></path>
 					</g>
-					<path d="M33478.2 2552.5 L33709.5 2865 L32498.25 3043.1882271741274 L32498.3 3043.2 " fill="none"></path>
+					<path d="M41651.4 693.6 L41120.5 876 L41120.5 1025 L41120.5 1025 L41120.5 1174 L41120.5 1174 L41120.5 1390.5 L41120.5 1390.5 L41120.5 1607 L41120.5 1607 L16202.25 2231.5635827497235 L16202.3 2231.6 " fill="none"></path>
+					<path d="M41653.1 698.7 L41651.4 693.6 L41649.7 688.6 L41664.0 689.3 Z"></path>
+					<path d="M882.3 2301.2 L882.25 2865 L2927 3036.6034987062662 L2927.0 3036.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33477.0 2541.8 L33478.2 2552.5 L33468.4 2548.2 L33467.1 2537.5 Z"></path>
+						<path d="M887.6 2291.8 L882.3 2301.2 L876.9 2291.8 L882.3 2282.5 Z"></path>
 					</g>
-					<path d="M33498.0 2552.1 L33749.5 2865 L34455.5 3038.591298615689 L34455.5 3038.6 " fill="none"></path>
+					<path d="M1102.0 1414.8 L882.25 1607 L882.25 2189.5 L882.3 2189.5 " fill="none"></path>
+					<path d="M1105.5 1418.8 L1102.0 1414.8 L1098.5 1410.8 L1112.0 1406.0 Z"></path>
+					<path d="M1129.8 2301.2 L1129.75 2865 L2927 3034.7364856310924 L2927.0 3034.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33496.3 2541.4 L33498.0 2552.1 L33488.0 2548.1 L33486.3 2537.5 Z"></path>
+						<path d="M1135.1 2291.8 L1129.8 2301.2 L1124.4 2291.8 L1129.8 2282.5 Z"></path>
 					</g>
-					<path d="M33517.7 2551.6 L33789.5 2865 L2492.75 3050.4482275193213 L2492.8 3050.4 " fill="none"></path>
+					<path d="M1129.8 1419.3 L1129.75 1607 L1129.75 2189.5 L1129.8 2189.5 " fill="none"></path>
+					<path d="M1135.1 1419.3 L1129.8 1419.3 L1124.4 1419.3 L1129.8 1406.0 Z"></path>
+					<path d="M1377.3 2301.2 L1377.25 2865 L2927 3032.3344188739325 L2927.0 3032.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33515.6 2541.1 L33517.7 2551.6 L33507.6 2548.0 L33505.5 2537.5 Z"></path>
+						<path d="M1382.6 2291.8 L1377.3 2301.2 L1371.9 2291.8 L1377.3 2282.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M35890.4 95.8 L33244 203 L33244 539.5 L33244 539.5 L33244 876 L33244 876 L33244 1025 L33244 1025 L33244 1174 L33244 1174 L33244 1390.5 L33244 1390.5 L33244 1607 L33244 1607 L33244 1934.5 L33244.0 1934.5 " fill="none"></path>
+					<path d="M1157.5 1414.8 L1377.25 1607 L1377.25 2189.5 L1377.3 2189.5 " fill="none"></path>
+					<path d="M1161.0 1410.8 L1157.5 1414.8 L1154.0 1418.8 L1147.5 1406.0 Z"></path>
+					<path d="M1659.8 2316.2 L1659.75 2865 L2927 3028.586866239834 L2927.0 3028.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1665.1 2306.8 L1659.8 2316.2 L1654.4 2306.8 L1659.8 2297.5 Z"></path>
 					</g>
-					<path d="M35890.6 101.2 L35890.4 95.8 L35890.2 90.5 L35903.8 95.3 Z"></path>
-					<path d="M2510.2 2976.3 L2531.75 2968 L2541.5 2968 L2541.5 2968 L2551.25 3051.5 L2551.25 3051.5 L2541.5 3135 L2541.5 3135 L2531.75 3135 L2531.75 3135 L2492.75 3119.958429561201 L2492.8 3120.0 " fill="none"></path>
+					<path d="M1180.0 1411.0 L1659.75 1607 L1659.75 2174.5 L1659.8 2174.5 " fill="none"></path>
+					<path d="M1182.1 1406.1 L1180.0 1411.0 L1178.0 1416.0 L1167.7 1406.0 Z"></path>
+					<path d="M1744.0 1469.3 L1699.75 1607 L13409.25 2234.098808003406 L13409.3 2234.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2499.5 2974.7 L2510.2 2976.3 L2503.4 2984.7 L2492.8 2983.0 Z"></path>
+						<path d="M1751.9 1462.0 L1744.0 1469.3 L1741.7 1458.8 L1749.7 1451.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M781.8 2263.8 L528.5 2865 L2137.75 3032.972645865398 L2137.8 3033.0 " fill="none"></path>
+					<path d="M1827.8 1466.3 L1936.5 1607 L1936.5 2236 L1936.5 2236 L1936.5 2865 L1936.5 2865 L2927 3023.1577482876714 L2927.0 3023.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1826.3 1455.6 L1827.8 1466.3 L1817.9 1462.1 L1816.4 1451.5 Z"></path>
+					</g>
+					<path d="M1840.6 1465.0 L1976.5 1607 L3544.387519872814 2220.5 L3544.4 2220.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1838.0 1454.6 L1840.6 1465.0 L1830.2 1461.9 L1827.6 1451.5 Z"></path>
+					</g>
+					<path d="M2812.0 2308.2 L2812 2865 L26715.5 3051.0602149415695 L26715.5 3051.1 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M2817.3 2298.8 L2812.0 2308.2 L2806.7 2298.8 L2812.0 2289.5 Z"></path>
 					</g>
-					<path d="M786.7 2265.9 L781.8 2263.8 L776.9 2261.7 L787.0 2251.5 Z"></path>
-					<path d="M421.5 2301.2 L421.5 2865 L2137.75 3034.0194719471947 L2137.8 3034.0 " fill="none"></path>
+					<path d="M3226.9 2314.8 L3052 2865 L1537.06836461126 3036 L1537.1 3036.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M426.8 2291.8 L421.5 2301.2 L416.2 2291.8 L421.5 2282.5 Z"></path>
+						<path d="M3234.9 2307.5 L3226.9 2314.8 L3224.7 2304.3 L3232.6 2297.0 Z"></path>
 					</g>
-					<path d="M795.7 1412.2 L421.5 1607 L421.5 2189.5 L421.5 2189.5 " fill="none"></path>
-					<path d="M798.1 1416.9 L795.7 1412.2 L793.2 1407.4 L807.5 1406.0 Z"></path>
-					<path d="M1907.0 2308.2 L1907 2865 L32385.25 3051.154909570244 L32385.3 3051.2 " fill="none"></path>
+					<path d="M3278.0 2314.7 L3459.5 2865 L26715.5 3051.048 L26715.5 3051.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1912.3 2298.8 L1907.0 2308.2 L1901.7 2298.8 L1907.0 2289.5 Z"></path>
+						<path d="M3280.1 2304.2 L3278.0 2314.7 L3270.0 2307.5 L3272.1 2297.0 Z"></path>
 					</g>
-					<path d="M2321.9 2314.8 L2147 2865 L1694.2855227882037 3036 L1694.3 3036.0 " fill="none"></path>
+					<path d="M40206.7 2553.5 L40019.5 2865 L28671.25 3050.340422969985 L28671.3 3050.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2329.9 2307.5 L2321.9 2314.8 L2319.7 2304.3 L2327.6 2297.0 Z"></path>
+						<path d="M40216.1 2548.2 L40206.7 2553.5 L40206.9 2542.8 L40216.3 2537.5 Z"></path>
 					</g>
-					<path d="M2368.5 2315.0 L2518.5 2865 L32385.25 3051.147857435272 L32385.3 3051.1 " fill="none"></path>
+					<path d="M40273.0 2554.9 L40152 2865 L15230.75 3050.869774951761 L15230.8 3050.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2371.2 2304.6 L2368.5 2315.0 L2360.9 2307.4 L2363.6 2297.0 Z"></path>
+						<path d="M40281.4 2548.1 L40273.0 2554.9 L40271.5 2544.3 L40279.8 2537.5 Z"></path>
 					</g>
-					<path d="M1602.5 2301.2 L1602.5 2865 L2137.75 3005.054893019993 L2137.8 3005.1 " fill="none"></path>
+					<path d="M40293.2 2555.2 L40192 2865 L26675.5 3050.3481305834343 L26675.5 3050.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1607.8 2291.8 L1602.5 2301.2 L1597.2 2291.8 L1602.5 2282.5 Z"></path>
+						<path d="M40301.2 2548.0 L40293.2 2555.2 L40291.0 2544.7 L40299.0 2537.5 Z"></path>
 					</g>
-					<path d="M904.9 1409.6 L1602.5 1607 L1602.5 2189.5 L1602.5 2189.5 " fill="none"></path>
-					<path d="M906.3 1404.5 L904.9 1409.6 L903.4 1414.8 L892.0 1406.0 Z"></path>
-					<path d="M2802.8 1469.7 L2770 1607 L8908.75 2232.383447382273 L8908.8 2232.4 " fill="none"></path>
+					<path d="M40475.0 2555.6 L40550 2865 L32334.75 3050.4615372976245 L32334.8 3050.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2810.2 1461.8 L2802.8 1469.7 L2799.8 1459.3 L2807.2 1451.5 Z"></path>
+						<path d="M40478.0 2545.3 L40475.0 2555.6 L40467.6 2547.8 L40470.6 2537.5 Z"></path>
 					</g>
-					<path d="M2875.0 1466.8 L2972.75 1607 L2972.75 2236 L2972.75 2236 L2972.75 2865 L2972.75 2865 L2492.75 3001.152091254753 L2492.8 3001.2 " fill="none"></path>
+					<path d="M40495.2 2555.3 L40590 2865 L26828.5 3050.737425821392 L26828.5 3050.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2874.0 1456.1 L2875.0 1466.8 L2865.3 1462.2 L2864.3 1451.5 Z"></path>
+						<path d="M40497.6 2544.9 L40495.2 2555.3 L40487.4 2548.0 L40489.8 2537.5 Z"></path>
 					</g>
-					<path d="M2897.4 1464.6 L3043 1607 L8763.75 2230.2800848742045 L8763.8 2230.3 " fill="none"></path>
+					<path d="M40515.4 2555.0 L40630 2865 L34237 3049.9809169187806 L34237.0 3050.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2894.5 1454.2 L2897.4 1464.6 L2887.0 1461.8 L2884.1 1451.5 Z"></path>
+						<path d="M40517.2 2544.4 L40515.4 2555.0 L40507.2 2548.1 L40508.9 2537.5 Z"></path>
 					</g>
-					<path d="M2730.0 2301.2 L2730 2865 L2492.75 2971.6838456901746 L2492.8 2971.7 " fill="none"></path>
+					<path d="M40535.5 2554.6 L40670 2865 L3282 3050.6187725439568 L3282.0 3050.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2735.3 2291.8 L2730.0 2301.2 L2724.7 2291.8 L2730.0 2282.5 Z"></path>
+						<path d="M40536.7 2543.9 L40535.5 2554.6 L40526.9 2548.2 L40528.1 2537.5 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M41388.0 102.3 L40397.5 203 L40397.5 539.5 L40397.5 539.5 L40397.5 876 L40397.5 876 L40397.5 1025 L40397.5 1025 L40397.5 1174 L40397.5 1174 L40397.5 1390.5 L40397.5 1390.5 L40397.5 1607 L40397.5 1607 L40397.5 1934.5 L40397.5 1934.5 " fill="none"></path>
 					</g>
-					<path d="M960.0 1404.5 L2730 1607 L2730 2189.5 L2730.0 2189.5 " fill="none"></path>
-					<path d="M960.6 1399.2 L960.0 1404.5 L959.4 1409.8 L946.8 1403.0 Z"></path>
-					<path d="M3463.8 2331.2 L3463.75 2865 L23597 3050.720524044466 L23597.0 3050.7 " fill="none"></path>
+					<path d="M41388.5 107.7 L41388.0 102.3 L41387.4 97.0 L41401.3 101.0 Z"></path>
+					<path d="M3299.3 2973.1 L3312 2968 L3319.5 2968 L3319.5 2968 L3327 3051.5 L3327 3051.5 L3319.5 3135 L3319.5 3135 L3312 3135 L3312 3135 L3282 3122.9277108433735 L3282.0 3122.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3469.1 2321.8 L3463.8 2331.2 L3458.4 2321.8 L3463.8 2312.5 Z"></path>
+						<path d="M3288.7 2971.6 L3299.3 2973.1 L3292.6 2981.5 L3282.0 2980.1 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M3697.7 2264.2 L3499.5 2865 L3281.3498659517427 2968 L3281.3 2968.0 " fill="none"></path>
 					</g>
-					<path d="M477.6 3001.9 L489.75 2998 L497.25 2998 L497.25 2998 L504.75 3051.5 L504.75 3051.5 L497.25 3105 L497.25 3105 L489.75 3105 L489.75 3105 L459.75 3095.5309734513276 L459.8 3095.5 " fill="none"></path>
+					<path d="M3702.8 2265.8 L3697.7 2264.2 L3692.6 2262.5 L3701.9 2251.5 Z"></path>
+					<path d="M1976.8 3001.9 L1989 2998 L1996.5 2998 L1996.5 2998 L2004 3051.5 L2004 3051.5 L1996.5 3105 L1996.5 3105 L1989 3105 L1989 3105 L1959 3095.5309734513276 L1959.0 3095.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M467.0 2999.6 L477.6 3001.9 L470.3 3009.7 L459.8 3007.5 Z"></path>
+						<path d="M1966.3 2999.6 L1976.8 3001.9 L1969.5 3009.7 L1959.0 3007.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M783.5 2264.1 L568.5 2865 L391.4638069705094 2998 L391.5 2998.0 " fill="none"></path>
+						<path d="M3699.4 2264.4 L3539.5 2865 L1959 3036.3739825581397 L1959.0 3036.4 " fill="none"></path>
 					</g>
-					<path d="M788.5 2265.9 L783.5 2264.1 L778.4 2262.3 L788.0 2251.5 Z"></path>
-					<path d="M9624.6 2295.1 L9421 2865 L7198.75 3044.2408368472265 L7198.8 3044.2 " fill="none"></path>
-					<path d="M9629.7 2296.9 L9624.6 2295.1 L9619.6 2293.3 L9629.1 2282.5 Z"></path>
-					<path d="M3275.8 1489.8 L3113.25 1607 L3113.25 2205 L3113.3 2205.0 " fill="none"></path>
-					<path d="M3278.9 1494.1 L3275.8 1489.8 L3272.7 1485.5 L3286.6 1482.0 Z"></path>
-					<path d="M4454.2 1478.1 L4442.25 1607 L11813.75 2231.173588207579 L11813.8 2231.2 " fill="none"></path>
+					<path d="M3704.6 2265.8 L3699.4 2264.4 L3694.3 2263.0 L3702.9 2251.5 Z"></path>
+					<path d="M2217.8 1512.9 L2016.5 1607 L2016.5 2236 L2016.5 2236 L2016.5 2865 L2016.5 2865 L3547.75 3043.458443993126 L3547.8 3043.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4460.3 1469.3 L4454.2 1478.1 L4449.7 1468.3 L4455.9 1459.5 Z"></path>
+						<path d="M2228.6 1513.8 L2217.8 1512.9 L2224.0 1504.1 L2234.8 1505.0 Z"></path>
 					</g>
-					<path d="M4513.5 1475.5 L4592.75 1607 L13508.75 2232.283086185751 L13508.8 2232.3 " fill="none"></path>
+					<path d="M2218.9 1551.3 L2128.5 1607 L2128.5 2220.5 L2128.5 2220.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4513.2 1464.7 L4513.5 1475.5 L4504.1 1470.2 L4503.8 1459.5 Z"></path>
+						<path d="M2229.6 1550.9 L2218.9 1551.3 L2224.0 1541.9 L2234.8 1541.5 Z"></path>
 					</g>
-					<path d="M24861.3 156.2 L24861.25 203 L24861.25 524 L24861.3 524.0 " fill="none"></path>
+					<path d="M2426.5 1605.1 L2426 1607 L2426 2220.5 L2426.0 2220.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24866.6 146.8 L24861.3 156.2 L24855.9 146.8 L24861.3 137.5 Z"></path>
+						<path d="M2433.9 1597.3 L2426.5 1605.1 L2423.5 1594.8 L2431.0 1587.0 Z"></path>
 					</g>
-					<path d="M4763.3 1470.7 L4763.25 1607 L12191.75 2229.9620025331647 L12191.8 2230.0 " fill="none"></path>
+					<path d="M2741.5 1517.8 L2925 1607 L13751.25 2231.8444704425024 L13751.3 2231.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4768.6 1461.3 L4763.3 1470.7 L4757.9 1461.3 L4763.3 1452.0 Z"></path>
+						<path d="M2735.5 1508.9 L2741.5 1517.8 L2730.8 1518.5 L2724.8 1509.6 Z"></path>
 					</g>
-					<path d="M14842.4 1026.3 L4763.25 1174 L4763.25 1329 L4763.3 1329.0 " fill="none"></path>
-					<path d="M14842.5 1031.6 L14842.4 1026.3 L14842.3 1021.0 L14855.8 1026.1 Z"></path>
-					<path d="M35190.7 2383.3 L35099 2865 L35099 3036 L35099.0 3036.0 " fill="none"></path>
+					<path d="M2742.0 1498.5 L3005.5 1607 L3978.6631558028616 2220.5 L3978.7 2220.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35197.7 2375.2 L35190.7 2383.3 L35187.2 2373.2 L35194.2 2365.0 Z"></path>
+						<path d="M2735.4 1490.0 L2742.0 1498.5 L2731.3 1499.9 L2724.8 1491.4 Z"></path>
 					</g>
-					<path d="M35214.1 2383.7 L35198.75 2865 L28040.25 3049.553531932541 L28040.3 3049.6 " fill="none"></path>
+					<path d="M2742.2 1490.9 L3045.5 1607 L15501.25 2233.810948656919 L15501.3 2233.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35219.7 2374.5 L35214.1 2383.7 L35209.0 2374.2 L35214.6 2365.0 Z"></path>
+						<path d="M2735.4 1482.6 L2742.2 1490.9 L2731.6 1492.6 L2724.8 1484.3 Z"></path>
 					</g>
-					<path d="M35242.1 2383.4 L35318.5 2865 L32498.25 3047.837099157035 L32498.3 3047.8 " fill="none"></path>
+					<path d="M2742.6 1471.4 L3183.5 1607 L4252.248211446741 2220.5 L4252.2 2220.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35245.9 2373.4 L35242.1 2383.4 L35235.4 2375.1 L35239.2 2365.0 Z"></path>
+						<path d="M2735.2 1463.5 L2742.6 1471.4 L2732.1 1473.7 L2724.8 1465.9 Z"></path>
 					</g>
-					<path d="M35251.5 2383.2 L35358.5 2865 L34560.5 3039.9876543209875 L34560.5 3040.0 " fill="none"></path>
+					<path d="M2742.7 1467.0 L3223.5 1607 L13409.25 2233.8153846153846 L13409.3 2233.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35254.6 2373.0 L35251.5 2383.2 L35244.2 2375.3 L35247.4 2365.0 Z"></path>
+						<path d="M2735.2 1459.3 L2742.7 1467.0 L2732.2 1469.5 L2724.8 1461.8 Z"></path>
 					</g>
-					<path d="M37713.0 590.9 L35218.75 876 L35218.75 1025 L35218.75 1025 L35218.75 1174 L35218.75 1174 L35218.75 1390.5 L35218.75 1390.5 L35218.75 1607 L35218.75 1607 L35218.75 2107 L35218.8 2107.0 " fill="none"></path>
-					<path d="M37713.6 596.2 L37713.0 590.9 L37712.4 585.6 L37726.3 589.3 Z"></path>
-					<path d="M9661.6 2295.4 L9813.5 2865 L7413.75 3044.939039099407 L7413.8 3044.9 " fill="none"></path>
-					<path d="M9666.7 2294.0 L9661.6 2295.4 L9656.4 2296.8 L9658.2 2282.5 Z"></path>
-					<path d="M9665.3 2295.2 L9853.5 2865 L7653.75 3043.390422872051 L7653.8 3043.4 " fill="none"></path>
-					<path d="M9670.4 2293.5 L9665.3 2295.2 L9660.2 2296.8 L9661.1 2282.5 Z"></path>
-					<path d="M3334.9 1497.0 L3253.75 1607 L3253.75 2236 L3253.75 2236 L3253.75 2865 L3253.75 2865 L27889.25 3050.9301829144915 L27889.3 3050.9 " fill="none"></path>
+					<path d="M2743.1 1442.1 L3584 1607 L3584 2220.5 L3584.0 2220.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3344.7 1492.7 L3334.9 1497.0 L3336.2 1486.3 L3346.0 1482.0 Z"></path>
+						<path d="M2734.9 1435.1 L2743.1 1442.1 L2732.9 1445.6 L2724.8 1438.5 Z"></path>
+					</g>
+					<path d="M41651.9 742.9 L41358.5 876 L41358.5 1025 L41358.5 1025 L41358.5 1174 L41358.5 1174 L41358.5 1359.5 L41358.5 1359.5 " fill="none"></path>
+					<path d="M41654.1 747.7 L41651.9 742.9 L41649.7 738.0 L41664.0 737.4 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M35189.1 102.7 L34652.5 203 L34652.5 524 L34652.5 524.0 " fill="none"></path>
 					</g>
-					<path d="M3537.8 1493.9 L3673.75 1607 L3673.75 2236 L3673.75 2236 L3673.75 2865 L3673.75 2865 L32617.5 3051.2040678170733 L32617.5 3051.2 " fill="none"></path>
+					<path d="M35190.1 108.0 L35189.1 102.7 L35188.2 97.5 L35202.3 100.3 Z"></path>
+					<path d="M38719.8 3549.7 L38719.75 3551 L36263.5 3585.805658117952 L36263.5 3585.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3534.1 1483.9 L3537.8 1493.9 L3527.3 1492.1 L3523.5 1482.0 Z"></path>
+						<path d="M38725.1 3540.3 L38719.8 3549.7 L38714.4 3540.3 L38719.8 3531.0 Z"></path>
 					</g>
-					<path d="M3555.5 1492.9 L3713.75 1607 L3713.75 2236 L3713.75 2236 L3713.75 2865 L3713.75 2865 L13816.25 3049.943926380368 L13816.3 3049.9 " fill="none"></path>
+					<path d="M26547.8 3471.0 L26313.25 3551 L40467 3586.3712975836397 L40467.0 3586.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3551.1 1483.1 L3555.5 1492.9 L3544.8 1491.8 L3540.4 1482.0 Z"></path>
+						<path d="M26558.4 3473.0 L26547.8 3471.0 L26554.9 3462.9 L26565.5 3464.9 Z"></path>
 					</g>
-					<path d="M3894.8 2293.2 L3894.75 2865 L27707.25 3050.945579584232 L27707.3 3050.9 " fill="none"></path>
+					<path d="M26996.2 3471.1 L27229.75 3551 L27229.75 3571 L27229.8 3571.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3900.1 2283.8 L3894.8 2293.2 L3889.4 2283.8 L3894.8 2274.5 Z"></path>
+						<path d="M26989.1 3463.1 L26996.2 3471.1 L26985.6 3473.2 L26978.5 3465.1 Z"></path>
 					</g>
-					<path d="M3629.1 1487.5 L3894.75 1607 L3894.75 2197.5 L3894.8 2197.5 " fill="none"></path>
-					<path d="M3631.2 1482.6 L3629.1 1487.5 L3626.9 1492.3 L3616.9 1482.0 Z"></path>
-					<path d="M5650.2 1515.6 L5641.75 1607 L11057.75 2232.649954086318 L11057.8 2232.6 " fill="none"></path>
+					<path d="M26996.7 3444.4 L27477.25 3551 L27477.25 3571 L27477.3 3571.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5656.4 1506.8 L5650.2 1515.6 L5645.7 1505.8 L5651.9 1497.0 Z"></path>
+						<path d="M26988.8 3437.1 L26996.7 3444.4 L26986.5 3447.6 L26978.5 3440.3 Z"></path>
 					</g>
-					<path d="M5747.8 1512.2 L5814.75 1607 L8908.75 2228.864834638121 L8908.8 2228.9 " fill="none"></path>
+					<path d="M26772.0 3080.3 L26772 3238 L26772 3310.5 L26772.0 3310.5 " fill="none"></path>
+					<path d="M26777.3 3080.3 L26772.0 3080.3 L26766.7 3080.3 L26772.0 3067.0 Z"></path>
+					<path d="M5452.3 2323.7 L5452.25 2865 L3685.75 3044.489103786434 L3685.8 3044.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5746.8 1501.5 L5747.8 1512.2 L5738.0 1507.7 L5737.0 1497.0 Z"></path>
+						<path d="M5457.6 2314.3 L5452.3 2323.7 L5446.9 2314.3 L5452.3 2305.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M5972.8 1439.9 L5854.75 1607 L5295.385135135135 2190 L5295.4 2190.0 " fill="none"></path>
+						<path d="M35309.6 93.3 L38947.75 203 L38947.75 524 L38947.8 524.0 " fill="none"></path>
 					</g>
-					<path d="M5977.2 1443.0 L5972.8 1439.9 L5968.5 1436.8 L5980.5 1429.0 Z"></path>
+					<path d="M35309.7 88.0 L35309.6 93.3 L35309.4 98.6 L35296.3 92.9 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M5069.3 1472.3 L5069.25 1607 L5237.939984101748 2190 L5237.9 2190.0 " fill="none"></path>
+						<path d="M35309.6 93.2 L39173.25 203 L39173.25 508.5 L39173.3 508.5 " fill="none"></path>
 					</g>
-					<path d="M5074.6 1472.3 L5069.3 1472.3 L5063.9 1472.3 L5069.3 1459.0 Z"></path>
-					<path d="M6260.3 1526.7 L6202.75 1607 L5960.373608903021 2220.5 L5960.4 2220.5 " fill="none"></path>
+					<path d="M35309.7 87.9 L35309.6 93.2 L35309.4 98.5 L35296.3 92.8 Z"></path>
+					<path d="M41382.9 111.2 L40862.5 203 L40862.5 539.5 L40862.5 539.5 L40862.5 876 L40862.5 876 L40862.5 1025 L40862.5 1025 L40862.5 1174 L40862.5 1174 L40862.5 1390.5 L40862.5 1390.5 L40862.5 1607 L40862.5 1607 L40862.5 2236 L40862.5 2236 L40862.5 2865 L40862.5 2865 L34237 3050.0338050314467 L34237.0 3050.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6270.0 1522.2 L6260.3 1526.7 L6261.4 1516.0 L6271.1 1511.5 Z"></path>
+						<path d="M41393.0 114.9 L41382.9 111.2 L41391.1 104.4 L41401.3 108.0 Z"></path>
 					</g>
-					<path d="M6309.9 1529.1 L6283 1607 L9563.75 2220.66195821872 L9563.8 2220.7 " fill="none"></path>
+					<path d="M34369.5 120.3 L34369.5 203 L34369.5 486 L34369.5 486.0 " fill="none"></path>
+					<path d="M34374.8 120.3 L34369.5 120.3 L34364.2 120.3 L34369.5 107.0 Z"></path>
+					<path d="M41648.5 841.9 L41597.5 876 L41597.5 1025 L41597.5 1025 L41597.5 1174 L41597.5 1174 L41597.5 1390.5 L41597.5 1390.5 L41597.5 1607 L41597.5 1607 L41597.5 2236 L41597.5 2236 L41597.5 2865 L41597.5 2865 L26417.5 3049.783630311337 L26417.5 3049.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6318.0 1522.1 L6309.9 1529.1 L6307.9 1518.6 L6316.0 1511.5 Z"></path>
+						<path d="M41659.2 841.1 L41648.5 841.9 L41653.3 832.2 L41664.0 831.5 Z"></path>
 					</g>
-					<path d="M6335.4 1529.9 L6323 1607 L8908.75 2227.4813543156893 L8908.8 2227.5 " fill="none"></path>
+					<path d="M41747.8 868.7 L41740 876 L41740 1009.5 L41740.0 1009.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6342.1 1521.6 L6335.4 1529.9 L6331.6 1519.9 L6338.3 1511.5 Z"></path>
+						<path d="M41758.2 866.3 L41747.8 868.7 L41750.9 858.5 L41761.4 856.0 Z"></path>
 					</g>
-					<path d="M6421.6 1528.4 L6458 1607 L6215.623608903021 2220.5 L6215.6 2220.5 " fill="none"></path>
+					<path d="M42301.8 872.0 L42304.25 876 L42304.25 986.5 L42304.3 986.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6422.5 1517.7 L6421.6 1528.4 L6412.9 1522.2 L6413.8 1511.5 Z"></path>
+						<path d="M42301.5 861.2 L42301.8 872.0 L42292.4 866.7 L42292.1 856.0 Z"></path>
 					</g>
-					<path d="M6643.8 1534.5 L6590.5 1607 L6451.612877583466 2167 L6451.6 2167.0 " fill="none"></path>
+					<path d="M42552.9 751.4 L42819.25 876 L42819.25 1025 L42819.25 1025 L42819.25 1174 L42819.25 1174 L42819.25 1390.5 L42819.25 1390.5 L42819.25 1607 L42819.25 1607 L42819.25 2236 L42819.25 2236 L42819.25 2865 L42819.25 2865 L42819.25 3051.5 L42819.25 3051.5 L42819.25 3238 L42819.25 3238 L42819.25 3394.5 L42819.25 3394.5 L42819.25 3551 L42819.25 3551 L40570 3585.705367814843 L40570.0 3585.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6653.6 1530.2 L6643.8 1534.5 L6645.0 1523.9 L6654.9 1519.5 Z"></path>
+						<path d="M42546.7 742.6 L42552.9 751.4 L42542.2 752.3 L42536.0 743.5 Z"></path>
 					</g>
-					<path d="M6720.2 1537.8 L6706.25 1607 L8908.75 2226.022564789991 L8908.8 2226.0 " fill="none"></path>
+					<path d="M42553.4 718.8 L42950.75 876 L42950.75 1009.5 L42950.8 1009.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6727.2 1529.7 L6720.2 1537.8 L6716.8 1527.6 L6723.8 1519.5 Z"></path>
+						<path d="M42546.6 710.4 L42553.4 718.8 L42542.7 720.3 L42536.0 712.0 Z"></path>
 					</g>
-					<path d="M9156.3 2353.7 L9156.25 2865 L6978.75 3045.8925389755013 L6978.8 3045.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9161.6 2344.3 L9156.3 2353.7 L9150.9 2344.3 L9156.3 2335.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M41601.4 111.1 L42100 203 L42100 223 L42100.0 223.0 " fill="none"></path>
 					</g>
-					<path d="M6747.4 1532.8 L6746.25 1607 L9019.75 2200.3740663900417 L9019.8 2200.4 " fill="none"></path>
-					<path d="M6752.8 1532.9 L6747.4 1532.8 L6742.1 1532.7 L6747.7 1519.5 Z"></path>
-					<path d="M6837.7 1530.8 L6885.5 1607 L9332.75 2212.376167535149 L9332.8 2212.4 " fill="none"></path>
-					<path d="M6842.2 1528.0 L6837.7 1530.8 L6833.2 1533.6 L6830.6 1519.5 Z"></path>
-					<path d="M6008.3 1447.7 L6009.75 1607 L11813.75 2229.882784507763 L11813.8 2229.9 " fill="none"></path>
+					<path d="M41602.3 105.9 L41601.4 111.1 L41600.4 116.4 L41588.3 108.7 Z"></path>
+					<path d="M26435.1 2994.9 L26447.5 2990.5 L26455 2990.5 L26455 2990.5 L26462.5 3051.5 L26462.5 3051.5 L26455 3112.5 L26455 3112.5 L26447.5 3112.5 L26447.5 3112.5 L26417.5 3101.7982456140353 L26417.5 3101.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6013.5 1438.3 L6008.3 1447.7 L6002.9 1438.4 L6008.1 1429.0 Z"></path>
+						<path d="M26424.5 2993.0 L26435.1 2994.9 L26428.1 3003.1 L26417.5 3001.2 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M3707.2 2264.8 L3711 2865 L26135.5 3050.334659103499 L26135.5 3050.3 " fill="none"></path>
 					</g>
-					<path d="M6046.2 1444.2 L6162.75 1607 L6844.037360890302 2220.5 L6844.0 2220.5 " fill="none"></path>
+					<path d="M3712.5 2264.8 L3707.2 2264.8 L3701.9 2264.9 L3707.1 2251.5 Z"></path>
+					<path d="M6071.9 2345.6 L5937.5 2865 L13097.75 3049.045291665231 L13097.8 3049.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6045.1 1433.5 L6046.2 1444.2 L6036.4 1439.7 L6035.3 1429.0 Z"></path>
+						<path d="M6079.4 2337.9 L6071.9 2345.6 L6069.1 2335.2 L6076.6 2327.5 Z"></path>
 					</g>
-					<path d="M7003.4 1482.8 L6925.5 1607 L11813.75 2228.75001263839 L11813.8 2228.8 " fill="none"></path>
+					<path d="M6128.6 2345.6 L6263 2865 L12887.75 3049.1373933455047 L12887.8 3049.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7012.8 1477.7 L7003.4 1482.8 L7003.8 1472.1 L7013.3 1467.0 Z"></path>
+						<path d="M6131.4 2335.2 L6128.6 2345.6 L6121.1 2337.9 L6123.9 2327.5 Z"></path>
+					</g>
+					<path d="M5198.6 1467.4 L4680 1607 L5893.647655007949 2144.5 L5893.6 2144.5 " fill="none"></path>
+					<path d="M5200.0 1472.6 L5198.6 1467.4 L5197.2 1462.3 L5211.5 1464.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M6985.6 1419.3 L6968.25 1607 L6226.517090620032 2144.5 L6226.5 2144.5 " fill="none"></path>
 					</g>
-					<path d="M7040.6 1485.2 L7014 1607 L6865.014109697933 2220.5 L6865.0 2220.5 " fill="none"></path>
+					<path d="M6990.9 1419.8 L6985.6 1419.3 L6980.3 1418.8 L6986.8 1406.0 Z"></path>
+					<path d="M15149.7 1411.0 L14238.75 1607 L13299.559618441972 2182.5 L13299.6 2182.5 " fill="none"></path>
+					<path d="M15150.8 1416.2 L15149.7 1411.0 L15148.6 1405.7 L15162.8 1408.1 Z"></path>
+					<path d="M678.0 1463.2 L678 1607 L18370.5 2224.3628370132033 L18370.5 2224.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7047.8 1477.3 L7040.6 1485.2 L7037.4 1475.0 L7044.6 1467.0 Z"></path>
+						<path d="M683.3 1453.8 L678.0 1463.2 L672.7 1453.8 L678.0 1444.5 Z"></path>
 					</g>
-					<path d="M7099.6 1484.3 L7149.75 1607 L13508.75 2230.8008421709296 L13508.8 2230.8 " fill="none"></path>
+					<path d="M7287.2 545.0 L678 876 L678 1025 L678 1025 L678 1174 L678 1174 L678 1336.5 L678.0 1336.5 " fill="none"></path>
+					<path d="M7287.5 550.3 L7287.2 545.0 L7286.9 539.6 L7300.5 544.3 Z"></path>
+					<path d="M42840.4 165.4 L42687 203 L42687 524 L42687.0 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7101.0 1473.6 L7099.6 1484.3 L7091.1 1477.7 L7092.5 1467.0 Z"></path>
+						<path d="M42850.7 168.3 L42840.4 165.4 L42848.2 158.0 L42858.5 160.9 Z"></path>
 					</g>
-					<path d="M14842.6 1038.3 L13932.25 1174 L13932.25 1390.5 L13932.25 1390.5 L13932.25 1607 L13932.25 1607 L9727.75 2223.9673393211247 L9727.8 2224.0 " fill="none"></path>
-					<path d="M14843.3 1043.6 L14842.6 1038.3 L14841.8 1033.0 L14855.8 1036.3 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M7278.3 1419.3 L7278.25 1607 L9563.75 2214.214149947202 L9563.8 2214.2 " fill="none"></path>
+					<path d="M43052.8 197.3 L43048 203 L43048 524 L43048.0 524.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M43062.9 193.6 L43052.8 197.3 L43054.7 186.7 L43064.8 183.0 Z"></path>
 					</g>
-					<path d="M7283.6 1419.3 L7278.3 1419.3 L7272.9 1419.3 L7278.3 1406.0 Z"></path>
-					<path d="M4317.5 2367.7 L4148.5 2865 L24178 3050.7211201431874 L24178.0 3050.7 " fill="none"></path>
+					<path d="M43390.3 189.9 L43423.5 203 L43423.5 524 L43423.5 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4325.6 2360.6 L4317.5 2367.7 L4315.5 2357.1 L4323.5 2350.0 Z"></path>
+						<path d="M43383.6 181.5 L43390.3 189.9 L43379.6 191.4 L43372.9 183.0 Z"></path>
 					</g>
-					<path d="M4666.6 2331.0 L6377 2865 L13816.25 3049.393145496229 L13816.3 3049.4 " fill="none"></path>
+					<path d="M43442.8 152.4 L43693 203 L43693 524 L43693.0 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4659.2 2323.1 L4666.6 2331.0 L4656.1 2333.3 L4648.8 2325.4 Z"></path>
+						<path d="M43434.7 145.3 L43442.8 152.4 L43432.6 155.8 L43424.5 148.7 Z"></path>
 					</g>
-					<path d="M3699.5 1455.8 L4362.25 1607 L4362.25 2122 L4362.3 2122.0 " fill="none"></path>
-					<path d="M3700.7 1450.6 L3699.5 1455.8 L3698.3 1461.0 L3686.5 1452.8 Z"></path>
-					<path d="M9669.0 2294.9 L9893.5 2865 L7869.75 3043.72824671481 L7869.8 3043.7 " fill="none"></path>
-					<path d="M9673.9 2293.0 L9669.0 2294.9 L9664.0 2296.9 L9664.1 2282.5 Z"></path>
-					<path d="M7493.3 1470.2 L7493.25 1607 L12191.75 2226.5066554868463 L12191.8 2226.5 " fill="none"></path>
+					<path d="M18649.1 2443.0 L18537.25 2865 L37659.25 3051.2030022190315 L37659.3 3051.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7498.6 1460.8 L7493.3 1470.2 L7487.9 1460.8 L7493.3 1451.5 Z"></path>
+						<path d="M18656.7 2435.4 L18649.1 2443.0 L18646.3 2432.7 L18653.9 2425.0 Z"></path>
 					</g>
-					<path d="M7823.3 1463.2 L7823.25 1607 L8916.625993640699 2220.5 L8916.6 2220.5 " fill="none"></path>
+					<path d="M18907.8 2438.1 L19338.25 2865 L13288.75 3048.6015866558178 L13288.8 3048.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7828.6 1453.8 L7823.3 1463.2 L7817.9 1453.8 L7823.3 1444.5 Z"></path>
+						<path d="M18905.0 2427.8 L18907.8 2438.1 L18897.4 2435.4 L18894.6 2425.0 Z"></path>
 					</g>
-					<path d="M8125.0 1548.0 L8069 1607 L9813.183426073132 2220.5 L9813.2 2220.5 " fill="none"></path>
+					<path d="M18920.2 2437.7 L19378.25 2865 L26715.5 3050.0748436179206 L26715.5 3050.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8135.3 1544.9 L8125.0 1548.0 L8127.6 1537.6 L8137.9 1534.5 Z"></path>
+						<path d="M18917.1 2427.5 L18920.2 2437.7 L18909.8 2435.3 L18906.6 2425.0 Z"></path>
 					</g>
-					<path d="M8230.0 1552.5 L8215 1607 L10126.944952305246 2220.5 L10126.9 2220.5 " fill="none"></path>
+					<path d="M18965.5 2436.4 L19525 2865 L34132 3050.8320884068353 L34132.0 3050.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8237.7 1544.9 L8230.0 1552.5 L8227.4 1542.1 L8235.0 1534.5 Z"></path>
+						<path d="M18961.3 2426.4 L18965.5 2436.4 L18954.9 2434.9 L18950.7 2425.0 Z"></path>
 					</g>
-					<path d="M8259.9 1553.1 L8255 1607 L8927.265302066773 2220.5 L8927.3 2220.5 " fill="none"></path>
+					<path d="M42548.6 693.2 L43082.25 876 L43082.25 1025 L43082.25 1025 L43082.25 1174 L43082.25 1174 L43082.25 1390.5 L43082.25 1390.5 L43082.25 1607 L43082.25 1607 L19037.5 2227.3951370586487 L19037.5 2227.4 " fill="none"></path>
+					<path d="M42550.3 688.1 L42548.6 693.2 L42546.9 698.2 L42536.0 688.9 Z"></path>
+					<path d="M15149.9 1416.7 L14460.5 1607 L13657.383147853736 2205 L13657.4 2205.0 " fill="none"></path>
+					<path d="M15151.3 1421.8 L15149.9 1416.7 L15148.5 1411.5 L15162.8 1413.1 Z"></path>
+					<path d="M15150.3 1426.3 L14674.25 1607 L14674.25 2205 L14674.3 2205.0 " fill="none"></path>
+					<path d="M15152.2 1431.3 L15150.3 1426.3 L15148.4 1421.4 L15162.8 1421.6 Z"></path>
+					<path d="M15158.1 1444.0 L14894.25 1607 L14894.25 2205 L14894.3 2205.0 " fill="none"></path>
+					<path d="M15160.9 1448.5 L15158.1 1444.0 L15155.3 1439.5 L15169.5 1437.0 Z"></path>
+					<path d="M8554.5 1470.7 L8554.5 1607 L13751.25 2227.404412811388 L13751.3 2227.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8266.1 1544.3 L8259.9 1553.1 L8255.5 1543.3 L8261.6 1534.5 Z"></path>
+						<path d="M8559.8 1461.3 L8554.5 1470.7 L8549.2 1461.3 L8554.5 1452.0 Z"></path>
 					</g>
-					<path d="M8396.5 1549.3 L8440.75 1607 L10403.75 2150.9325991189426 L10403.8 2150.9 " fill="none"></path>
+					<path d="M13093.2 1027.9 L8554.5 1174 L8554.5 1329 L8554.5 1329.0 " fill="none"></path>
+					<path d="M13093.3 1033.2 L13093.2 1027.9 L13093.0 1022.5 L13106.5 1027.4 Z"></path>
+					<path d="M9214.4 1444.2 L9098.75 1607 L12901.25 2226.7104547221143 L12901.3 2226.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8395.1 1538.7 L8396.5 1549.3 L8386.6 1545.2 L8385.2 1534.5 Z"></path>
+						<path d="M9224.1 1439.7 L9214.4 1444.2 L9215.4 1433.5 L9225.2 1429.0 Z"></path>
 					</g>
-					<path d="M927.4 2952.2 L940.75 2945.5 L948.25 2945.5 L948.25 2945.5 L955.75 3051.5 L955.75 3051.5 L948.25 3157.5 L948.25 3157.5 L940.75 3157.5 L940.75 3157.5 L910.75 3142.393111638955 L910.8 3142.4 " fill="none"></path>
+					<path d="M9246.6 1447.6 L9230.25 1607 L8251.47853736089 2220.5 L8251.5 2220.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M916.7 2951.6 L927.4 2952.2 L921.5 2961.2 L910.8 2960.6 Z"></path>
+						<path d="M9252.9 1438.8 L9246.6 1447.6 L9242.3 1437.7 L9248.5 1429.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M801.8 2264.3 L978.5 2865 L871.3465147453082 2945.5 L871.3 2945.5 " fill="none"></path>
+					<path d="M9499.3 1483.0 L9424 1607 L12901.25 2225.8555563415152 L12901.3 2225.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M9508.7 1477.7 L9499.3 1483.0 L9499.6 1472.2 L9509.0 1467.0 Z"></path>
 					</g>
-					<path d="M806.9 2262.8 L801.8 2264.3 L796.7 2265.8 L798.1 2251.5 Z"></path>
-					<path d="M11244.8 2285.7 L11244.75 2865 L6803.75 3045.4851819568535 L6803.8 3045.5 " fill="none"></path>
+					<path d="M9557.4 1485.7 L9559.75 1607 L8259.598171701113 2220.5 L8259.6 2220.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11250.1 2276.3 L11244.8 2285.7 L11239.4 2276.3 L11244.8 2267.0 Z"></path>
+						<path d="M9562.5 1476.2 L9557.4 1485.7 L9551.9 1476.4 L9557.0 1467.0 Z"></path>
 					</g>
-					<path d="M10570.2 2440.4 L10278.25 2865 L27889.25 3050.703870183473 L27889.3 3050.7 " fill="none"></path>
+					<path d="M9613.4 1482.8 L9691.25 1607 L12017 2221.9854965843406 L12017.0 2222.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10579.9 2435.7 L10570.2 2440.4 L10571.1 2429.7 L10580.8 2425.0 Z"></path>
+						<path d="M9612.9 1472.1 L9613.4 1482.8 L9603.9 1477.7 L9603.5 1467.0 Z"></path>
 					</g>
-					<path d="M10630.2 2442.4 L10465.25 2865 L27707.25 3050.7351701033904 L27707.3 3050.7 " fill="none"></path>
+					<path d="M9776.2 1535.3 L9731.25 1607 L8584.25 2196.9125102207686 L8584.3 2196.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10638.6 2435.6 L10630.2 2442.4 L10628.6 2431.8 L10637.0 2425.0 Z"></path>
+						<path d="M9785.7 1530.2 L9776.2 1535.3 L9776.6 1524.6 L9786.1 1519.5 Z"></path>
 					</g>
-					<path d="M10643.2 2442.7 L10505.25 2865 L11924.5 3042.555005869529 L11924.5 3042.6 " fill="none"></path>
+					<path d="M9853.4 1538.1 L9847 1607 L13409.25 2229.7934820373844 L13409.3 2229.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10651.2 2435.5 L10643.2 2442.7 L10641.0 2432.2 L10649.0 2425.0 Z"></path>
+						<path d="M9859.5 1529.3 L9853.4 1538.1 L9848.9 1528.3 L9855.1 1519.5 Z"></path>
 					</g>
-					<path d="M10778.8 2442.7 L10917.75 2865 L32617.5 3051.105486129474 L32617.5 3051.1 " fill="none"></path>
+					<path d="M9777.5 2353.7 L9777.5 2865 L5650.25 3048.4989272304665 L5650.3 3048.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10780.9 2432.2 L10778.8 2442.7 L10770.8 2435.5 L10772.9 2425.0 Z"></path>
+						<path d="M9782.8 2344.3 L9777.5 2353.7 L9772.2 2344.3 L9777.5 2335.0 Z"></path>
 					</g>
-					<path d="M10791.8 2442.4 L10957.75 2865 L13816.25 3046.11440462035 L13816.3 3046.1 " fill="none"></path>
+					<path d="M9880.1 1532.8 L9887 1607 L9794.734499205088 2137 L9794.7 2137.0 " fill="none"></path>
+					<path d="M9885.5 1532.3 L9880.1 1532.8 L9874.8 1533.3 L9878.9 1519.5 Z"></path>
+					<path d="M9955.0 1530.8 L10002.75 1607 L10043.293918918918 2152.5 L10043.3 2152.5 " fill="none"></path>
+					<path d="M9959.5 1528.0 L9955.0 1530.8 L9950.5 1533.6 L9947.9 1519.5 Z"></path>
+					<path d="M4813.1 2368.2 L4700 2865 L26507.5 3050.7843797821074 L26507.5 3050.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10793.3 2431.7 L10791.8 2442.4 L10783.4 2435.6 L10785.0 2425.0 Z"></path>
+						<path d="M4820.4 2360.3 L4813.1 2368.2 L4810.0 2357.9 L4817.3 2350.0 Z"></path>
 					</g>
-					<path d="M10804.7 2442.0 L10997.75 2865 L12947.25 3044.6352519762845 L12947.3 3044.6 " fill="none"></path>
+					<path d="M4873.4 2368.2 L4986.5 2865 L12887.75 3049.5150258256376 L12887.8 3049.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10805.7 2431.3 L10804.7 2442.0 L10796.0 2435.7 L10797.0 2425.0 Z"></path>
+						<path d="M4876.5 2357.9 L4873.4 2368.2 L4866.1 2360.3 L4869.2 2350.0 Z"></path>
 					</g>
+					<path d="M5200.9 1486.3 L4843.25 1607 L4843.25 2122 L4843.3 2122.0 " fill="none"></path>
+					<path d="M5202.6 1491.3 L5200.9 1486.3 L5199.1 1481.2 L5213.5 1482.0 Z"></path>
+					<path d="M13093.2 1028.0 L8729.75 1174 L15162.75 1387.7750575594782 L15162.8 1387.8 " fill="none"></path>
+					<path d="M13093.4 1033.3 L13093.2 1028.0 L13093.0 1022.7 L13106.5 1027.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M8626.8 1416.6 L8480.75 1607 L10403.75 2149.406726457399 L10403.8 2149.4 " fill="none"></path>
+						<path d="M15636.5 1053.8 L15636.5 1174 L15326.75 1345.1828334396937 L15326.8 1345.2 " fill="none"></path>
 					</g>
-					<path d="M8631.0 1419.8 L8626.8 1416.6 L8622.5 1413.3 L8634.9 1406.0 Z"></path>
-					<path d="M11546.9 2352.7 L11429.25 2865 L33799 3051.2460631019744 L33799.0 3051.2 " fill="none"></path>
+					<path d="M15641.8 1053.8 L15636.5 1053.8 L15631.2 1053.8 L15636.5 1040.5 Z"></path>
+					<path d="M10408.0 1475.9 L10336.5 1607 L12901.25 2222.324783064747 L12901.3 2222.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11554.2 2344.8 L11546.9 2352.7 L11543.8 2342.4 L11551.1 2334.5 Z"></path>
+						<path d="M10417.1 1470.2 L10408.0 1475.9 L10407.7 1465.1 L10416.9 1459.5 Z"></path>
 					</g>
-					<path d="M11602.9 2352.6 L11730.75 2865 L13136.25 3037.224540078844 L13136.3 3037.2 " fill="none"></path>
+					<path d="M10522.9 1473.9 L10632 1607 L12034.56438791733 2220.5 L12034.6 2220.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11605.8 2342.3 L11602.9 2352.6 L11595.4 2344.8 L11598.3 2334.5 Z"></path>
+						<path d="M10521.1 1463.3 L10522.9 1473.9 L10512.9 1470.1 L10511.1 1459.5 Z"></path>
 					</g>
-					<path d="M11610.2 2352.3 L11770.75 2865 L13409.25 3041.330207732256 L13409.3 3041.3 " fill="none"></path>
+					<path d="M5336.1 1492.6 L5169.75 1607 L5169.75 2236 L5169.75 2236 L5169.75 2865 L5169.75 2865 L30874 3050.953805797186 L30874.0 3051.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11612.5 2341.8 L11610.2 2352.3 L11602.3 2345.0 L11604.6 2334.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M810.4 2262.8 L1190.5 2865 L6507.75 3046.449544851562 L6507.8 3046.4 " fill="none"></path>
+						<path d="M5346.8 1491.7 L5336.1 1492.6 L5340.8 1482.9 L5351.5 1482.0 Z"></path>
 					</g>
-					<path d="M814.9 2259.9 L810.4 2262.8 L805.9 2265.6 L803.3 2251.5 Z"></path>
-					<path d="M12416.1 1470.5 L11967.75 1607 L11967.75 2236 L11967.75 2236 L11967.75 2865 L11967.75 2865 L13638.25 3044.1021845357864 L13638.3 3044.1 " fill="none"></path>
+					<path d="M5604.4 1494.2 L5734.75 1607 L5734.75 2236 L5734.75 2236 L5734.75 2865 L5734.75 2865 L32242.75 3051.1769224975524 L32242.8 3051.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12426.6 1472.9 L12416.1 1470.5 L12423.5 1462.7 L12434.0 1465.1 Z"></path>
+						<path d="M5600.8 1484.1 L5604.4 1494.2 L5593.8 1492.1 L5590.3 1482.0 Z"></path>
 					</g>
-					<path d="M12416.4 1485.4 L12079.75 1607 L12079.75 2220.5 L12079.8 2220.5 " fill="none"></path>
+					<path d="M5775.7 1454.8 L6465.75 1607 L6465.75 2236 L6465.75 2236 L6465.75 2865 L6465.75 2865 L12887.75 3049.0637774704164 L12887.8 3049.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12427.0 1487.2 L12416.4 1485.4 L12423.4 1477.2 L12434.0 1479.0 Z"></path>
+						<path d="M5767.8 1447.5 L5775.7 1454.8 L5765.5 1458.0 L5757.5 1450.7 Z"></path>
 					</g>
-					<path d="M12416.8 1502.4 L12171.75 1607 L12551.651828298887 2220.5 L12551.7 2220.5 " fill="none"></path>
+					<path d="M44211.0 156.2 L44211 203 L44211 524 L44211.0 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12427.5 1503.6 L12416.8 1502.4 L12423.3 1493.8 L12434.0 1495.1 Z"></path>
+						<path d="M44216.3 146.8 L44211.0 156.2 L44205.7 146.8 L44211.0 137.5 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M9282.8 1440.4 L9384 1607 L8925.89546899841 2190 L8925.9 2190.0 " fill="none"></path>
+					</g>
+					<path d="M9287.4 1437.6 L9282.8 1440.4 L9278.2 1443.2 L9275.9 1429.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M10178.5 1472.3 L10178.5 1607 L8983.99880763116 2190 L8984.0 2190.0 " fill="none"></path>
 					</g>
-					<path d="M12417.4 1526.9 L12263.75 1607 L12263.75 2220.5 L12263.8 2220.5 " fill="none"></path>
+					<path d="M10183.8 1472.3 L10178.5 1472.3 L10173.2 1472.3 L10178.5 1459.0 Z"></path>
+					<path d="M18486.1 1104.3 L18324 1174 L18324 1375 L18324.0 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12428.2 1527.3 L12417.4 1526.9 L12423.3 1517.8 L12434.0 1518.2 Z"></path>
+						<path d="M18496.8 1105.6 L18486.1 1104.3 L18492.6 1095.8 L18503.3 1097.0 Z"></path>
 					</g>
-					<path d="M12941.9 1470.5 L13390.25 1607 L13390.25 2220.5 L13390.3 2220.5 " fill="none"></path>
+					<path d="M18601.9 1162.7 L18596.25 1174 L15326.75 1385.2029688199314 L15326.8 1385.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12934.5 1462.7 L12941.9 1470.5 L12931.4 1472.9 L12924.0 1465.1 Z"></path>
+						<path d="M18610.8 1156.7 L18601.9 1162.7 L18601.3 1152.0 L18610.3 1146.0 Z"></path>
 					</g>
-					<path d="M12942.2 1452.3 L13601.25 1607 L22519.75 2232.946942646731 L22519.8 2232.9 " fill="none"></path>
+					<path d="M18846.2 1157.2 L18868.5 1174 L18868.5 1390.5 L18868.5 1390.5 L18868.5 1607 L18868.5 1607 L13480.25 2231.8830145194747 L13480.3 2231.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12934.3 1445.0 L12942.2 1452.3 L12931.9 1455.3 L12924.0 1448.0 Z"></path>
+						<path d="M18842.0 1147.4 L18846.2 1157.2 L18835.6 1155.9 L18831.3 1146.0 Z"></path>
 					</g>
-					<path d="M12942.3 1440.8 L13812.25 1607 L13812.25 2220.5 L13812.3 2220.5 " fill="none"></path>
+					<path d="M18855.4 1104.3 L19017.5 1174 L19017.5 1375 L19017.5 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12934.2 1433.8 L12942.3 1440.8 L12932.2 1444.3 L12924.0 1437.3 Z"></path>
+						<path d="M18848.9 1095.8 L18855.4 1104.3 L18844.7 1105.6 L18838.3 1097.0 Z"></path>
 					</g>
-					<path d="M12942.4 1439.1 L13852.25 1607 L8979.75 2231.4503871230645 L8979.8 2231.5 " fill="none"></path>
+					<path d="M11699.7 1510.7 L11610 1607 L21401.75 2234.1426062164296 L21401.8 2234.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12934.1 1432.2 L12942.4 1439.1 L12932.2 1442.6 L12924.0 1435.7 Z"></path>
+						<path d="M11709.9 1507.5 L11699.7 1510.7 L11702.1 1500.2 L11712.4 1497.0 Z"></path>
 					</g>
-					<path d="M12942.4 1437.5 L13892.25 1607 L8868.75 2229.4943853427894 L8868.8 2229.5 " fill="none"></path>
+					<path d="M11905.5 1511.8 L11979.25 1607 L13409.25 2220.7632207437737 L13409.3 2220.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12934.1 1430.6 L12942.4 1437.5 L12932.3 1441.1 L12924.0 1434.2 Z"></path>
+						<path d="M11904.0 1501.1 L11905.5 1511.8 L11895.5 1507.6 L11894.0 1497.0 Z"></path>
 					</g>
-					<path d="M32376.1 3494.1 L32338.5 3551 L37901.5 3586.17436993499 L37901.5 3586.2 " fill="none"></path>
+					<path d="M15218.1 1449.1 L15146.25 1607 L15146.25 2159.5 L15146.3 2159.5 " fill="none"></path>
+					<path d="M15222.9 1451.3 L15218.1 1449.1 L15213.2 1446.9 L15223.6 1437.0 Z"></path>
+					<path d="M43097.8 2383.4 L43018 2865 L43018 3036 L43018.0 3036.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32385.6 3489.2 L32376.1 3494.1 L32376.7 3483.4 L32386.3 3478.5 Z"></path>
+						<path d="M43104.6 2375.1 L43097.8 2383.4 L43094.1 2373.3 L43100.9 2365.0 Z"></path>
 					</g>
-					<path d="M32474.1 3496.3 L32491.5 3551 L35304.25 3585.4943863891526 L35304.3 3585.5 " fill="none"></path>
+					<path d="M43133.9 2383.6 L43172 2865 L31025 3050.3479648189814 L31025.0 3050.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32476.4 3485.8 L32474.1 3496.3 L32466.2 3489.0 L32468.5 3478.5 Z"></path>
+						<path d="M43138.5 2373.9 L43133.9 2383.6 L43127.9 2374.7 L43132.5 2365.0 Z"></path>
 					</g>
-					<path d="M32560.1 3490.2 L32635.25 3551 L35508.25 3585.014173753543 L35508.3 3585.0 " fill="none"></path>
+					<path d="M43158.3 2383.1 L43276.25 2865 L26828.5 3050.861543238863 L26828.5 3050.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32556.2 3480.2 L32560.1 3490.2 L32549.5 3488.5 L32545.6 3478.5 Z"></path>
+						<path d="M43161.2 2372.8 L43158.3 2383.1 L43150.9 2375.3 L43153.8 2365.0 Z"></path>
 					</g>
-					<path d="M32441.8 3080.3 L32441.75 3238 L32441.75 3310.5 L32441.8 3310.5 " fill="none"></path>
-					<path d="M32447.1 3080.3 L32441.8 3080.3 L32436.4 3080.3 L32441.8 3067.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M25740.6 100.9 L25086.25 203 L25086.25 524 L25086.3 524.0 " fill="none"></path>
+					<path d="M43167.5 2382.8 L43316.25 2865 L34237 3050.427779450817 L34237.0 3050.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M43169.9 2372.3 L43167.5 2382.8 L43159.7 2375.5 L43162.0 2365.0 Z"></path>
 					</g>
-					<path d="M25741.4 106.2 L25740.6 100.9 L25739.8 95.6 L25753.8 98.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M25754.6 112.5 L25556.25 203 L25556.25 508.5 L25556.3 508.5 " fill="none"></path>
+					<path d="M42548.7 687.2 L43122.25 876 L43122.25 1025 L43122.25 1025 L43122.25 1174 L43122.25 1174 L43122.25 1390.5 L43122.25 1390.5 L43122.25 1607 L43122.25 1607 L43122.25 2107 L43122.3 2107.0 " fill="none"></path>
+					<path d="M42550.3 682.1 L42548.7 687.2 L42547.0 692.3 L42536.0 683.0 Z"></path>
+					<path d="M15279.3 1448.5 L15373.75 1607 L15373.75 2205 L15373.8 2205.0 " fill="none"></path>
+					<path d="M15283.9 1445.7 L15279.3 1448.5 L15274.7 1451.2 L15272.5 1437.0 Z"></path>
+					<path d="M6646.8 2293.2 L6646.75 2865 L28529.25 3050.896838772861 L28529.3 3050.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M6652.1 2283.8 L6646.8 2293.2 L6641.4 2283.8 L6646.8 2274.5 Z"></path>
 					</g>
-					<path d="M25756.8 117.4 L25754.6 112.5 L25752.4 107.7 L25766.8 107.0 Z"></path>
-					<path d="M35885.2 102.3 L34841 203 L34841 539.5 L34841 539.5 L34841 876 L34841 876 L34841 1025 L34841 1025 L34841 1174 L34841 1174 L34841 1390.5 L34841 1390.5 L34841 1607 L34841 1607 L34841 2236 L34841 2236 L34841 2865 L34841 2865 L34535.67560321716 3036 L34535.7 3036.0 " fill="none"></path>
+					<path d="M5770.6 1443.8 L6646.75 1607 L6646.75 2197.5 L6646.8 2197.5 " fill="none"></path>
+					<path d="M5771.6 1438.6 L5770.6 1443.8 L5769.6 1449.0 L5757.5 1441.4 Z"></path>
+					<path d="M21084.1 1063.9 L20401.5 1174 L20401.5 1375 L20401.5 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35895.0 106.7 L35885.2 102.3 L35893.9 96.1 L35903.8 100.5 Z"></path>
+						<path d="M21094.1 1067.7 L21084.1 1063.9 L21092.4 1057.1 L21102.5 1060.9 Z"></path>
 					</g>
-					<path d="M27838.8 120.3 L27838.75 203 L27838.75 486 L27838.8 486.0 " fill="none"></path>
-					<path d="M27844.1 120.3 L27838.8 120.3 L27833.4 120.3 L27838.8 107.0 Z"></path>
-					<path d="M37707.7 596.9 L35498.25 876 L35498.25 1025 L35498.25 1025 L35498.25 1174 L35498.25 1174 L35498.25 1390.5 L35498.25 1390.5 L35498.25 1607 L35498.25 1607 L35498.25 2236 L35498.25 2236 L35498.25 2865 L35498.25 2865 L24088 3049.2234931284493 L24088.0 3049.2 " fill="none"></path>
+					<path d="M21084.1 1069.3 L20515 1174 L20515 1390.5 L20515 1390.5 L20515 1607 L20515 1607 L15588.25 2230.4949449222877 L15588.3 2230.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37717.7 601.0 L37707.7 596.9 L37716.3 590.5 L37726.3 594.6 Z"></path>
+						<path d="M21094.3 1072.9 L21084.1 1069.3 L21092.4 1062.4 L21102.5 1065.9 Z"></path>
 					</g>
-					<path d="M37707.7 600.2 L35640.75 876 L35640.75 1009.5 L35640.8 1009.5 " fill="none"></path>
+					<path d="M21566.1 1043.8 L23234.75 1174 L23234.75 1375 L23234.8 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37717.7 604.2 L37707.7 600.2 L37716.3 593.6 L37726.3 597.7 Z"></path>
+						<path d="M21557.2 1037.8 L21566.1 1043.8 L21556.4 1048.4 L21547.5 1042.4 Z"></path>
 					</g>
-					<path d="M37708.0 633.9 L36542.5 876 L36542.5 986.5 L36542.5 986.5 " fill="none"></path>
+					<path d="M21566.1 1041.4 L23521.25 1174 L23521.25 1375 L23521.3 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37718.2 637.2 L37708.0 633.9 L37716.0 626.8 L37726.3 630.1 Z"></path>
+						<path d="M21557.2 1035.4 L21566.1 1041.4 L21556.5 1046.0 L21547.5 1040.1 Z"></path>
 					</g>
-					<path d="M37709.2 739.6 L37400.25 876 L37400.25 1025 L37400.25 1025 L37400.25 1174 L37400.25 1174 L37400.25 1390.5 L37400.25 1390.5 L37400.25 1607 L37400.25 1607 L37400.25 2236 L37400.25 2236 L37400.25 2865 L37400.25 2865 L37400.25 3051.5 L37400.25 3051.5 L37400.25 3238 L37400.25 3238 L37400.25 3394.5 L37400.25 3394.5 L37400.25 3551 L37400.25 3551 L37901.5 3583.192446856626 L37901.5 3583.2 " fill="none"></path>
+					<path d="M24942.8 1463.1 L24929.5 1607 L24929.5 2220.5 L24929.5 2220.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37719.9 740.7 L37709.2 739.6 L37715.6 730.9 L37726.3 732.0 Z"></path>
+						<path d="M24949.0 1454.3 L24942.8 1463.1 L24938.3 1453.3 L24944.5 1444.5 Z"></path>
 					</g>
-					<path d="M37710.1 799.6 L37577.25 876 L37577.25 1009.5 L37577.3 1009.5 " fill="none"></path>
+					<path d="M25005.5 1459.0 L25126.5 1607 L13895.25 2231.9933647402295 L13895.3 2232.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37720.8 799.6 L37710.1 799.6 L37715.5 790.3 L37726.3 790.3 Z"></path>
+						<path d="M25003.7 1448.4 L25005.5 1459.0 L24995.4 1455.1 L24993.6 1444.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M36104.1 97.0 L38162.25 203 L38162.25 223 L38162.3 223.0 " fill="none"></path>
+					<path d="M21560.8 1034.7 L24949.5 1174 L24949.5 1336.5 L24949.5 1336.5 " fill="none"></path>
+					<path d="M21561.0 1029.4 L21560.8 1034.7 L21560.6 1040.0 L21547.5 1034.1 Z"></path>
+					<path d="M15338.9 1433.5 L15718.25 1607 L15718.25 2197.5 L15718.3 2197.5 " fill="none"></path>
+					<path d="M15341.1 1428.7 L15338.9 1433.5 L15336.7 1438.4 L15326.8 1428.0 Z"></path>
+					<path d="M5770.7 1433.4 L6928.25 1607 L6928.25 2205 L6928.3 2205.0 " fill="none"></path>
+					<path d="M5771.5 1428.1 L5770.7 1433.4 L5769.9 1438.7 L5757.5 1431.4 Z"></path>
+					<path d="M17081.3 2279.5 L16867 2865 L12151.75 3045.824371562227 L12151.8 3045.8 " fill="none"></path>
+					<path d="M17086.3 2281.4 L17081.3 2279.5 L17076.3 2277.7 L17085.9 2267.0 Z"></path>
+					<path d="M13798.5 1440.2 L13798.5 1607 L26742 2215.889499663451 L26742.0 2215.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M13803.8 1430.8 L13798.5 1440.2 L13793.2 1430.8 L13798.5 1421.5 Z"></path>
 					</g>
-					<path d="M36104.3 91.7 L36104.1 97.0 L36103.8 102.3 L36090.8 96.3 Z"></path>
-					<path d="M24105.6 2994.9 L24118 2990.5 L24125.5 2990.5 L24125.5 2990.5 L24133 3051.5 L24133 3051.5 L24125.5 3112.5 L24125.5 3112.5 L24118 3112.5 L24118 3112.5 L24088 3101.7982456140353 L24088.0 3101.8 " fill="none"></path>
+					<path d="M8905.0 1455.7 L8905 1607 L7648.007750397456 2220.5 L7648.0 2220.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24095.0 2993.0 L24105.6 2994.9 L24098.6 3003.1 L24088.0 3001.2 Z"></path>
+						<path d="M8910.3 1446.3 L8905.0 1455.7 L8899.7 1446.3 L8905.0 1437.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M811.9 2262.5 L1230.5 2865 L23806 3050.342405300112 L23806.0 3050.3 " fill="none"></path>
+					<path d="M13093.2 1028.1 L8905 1174 L8905 1344 L8905.0 1344.0 " fill="none"></path>
+					<path d="M13093.4 1033.4 L13093.2 1028.1 L13093.0 1022.8 L13106.5 1027.6 Z"></path>
+					<path d="M4294.0 1097.7 L4294 1174 L4294 1194 L4294.0 1194.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M4299.3 1088.3 L4294.0 1097.7 L4288.7 1088.3 L4294.0 1079.0 Z"></path>
 					</g>
-					<path d="M816.3 2259.4 L811.9 2262.5 L807.5 2265.5 L804.3 2251.5 Z"></path>
-					<path d="M13029.3 2323.7 L13029.25 2865 L13650.90147453083 3036 L13650.9 3036.0 " fill="none"></path>
+					<path d="M7287.2 551.3 L4294 876 L4294 971 L4294.0 971.0 " fill="none"></path>
+					<path d="M7287.8 556.7 L7287.2 551.3 L7286.7 546.0 L7300.5 549.9 Z"></path>
+					<path d="M36804.6 1065.6 L36371.5 1174 L36371.5 1306.5 L36371.5 1306.5 " fill="none"></path>
+					<path d="M36805.9 1070.7 L36804.6 1065.6 L36803.3 1060.4 L36817.5 1062.3 Z"></path>
+					<path d="M30702.1 2442.9 L30578.5 2865 L37659.25 3050.7001054666903 L37659.3 3050.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13034.6 2314.3 L13029.3 2323.7 L13023.9 2314.3 L13029.3 2305.0 Z"></path>
+						<path d="M30709.9 2435.5 L30702.1 2442.9 L30699.6 2432.5 L30707.4 2425.0 Z"></path>
 					</g>
-					<path d="M37725.0 863.9 L37708.75 876 L37708.75 1025 L37708.75 1025 L37708.75 1174 L37708.75 1174 L37708.75 1359.5 L37708.8 1359.5 " fill="none"></path>
-					<path d="M37728.2 868.2 L37725.0 863.9 L37721.8 859.7 L37735.7 856.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M25830.7 115.3 L25941 203 L25941 524 L25941.0 524.0 " fill="none"></path>
+					<path d="M30815.3 2443.1 L30922.25 2865 L32242.75 3045.221917306989 L32242.8 3045.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M30818.1 2432.7 L30815.3 2443.1 L30807.8 2435.4 L30810.7 2425.0 Z"></path>
 					</g>
-					<path d="M25834.0 111.1 L25830.7 115.3 L25827.4 119.5 L25820.2 107.0 Z"></path>
-					<path d="M32980.3 3549.7 L32980.25 3551 L30701.75 3585.7526315789473 L30701.8 3585.8 " fill="none"></path>
+					<path d="M30875.0 2441.4 L31106.5 2865 L31106.5 3051.5 L31106.5 3051.5 L31106.5 3238 L31106.5 3238 L31106.5 3394.5 L31106.5 3394.5 L31106.5 3551 L31106.5 3551 L36165.5 3586.1594557556773 L36165.5 3586.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32985.6 3540.3 L32980.3 3549.7 L32974.9 3540.3 L32980.3 3531.0 Z"></path>
+						<path d="M30875.2 2430.6 L30875.0 2441.4 L30865.8 2435.7 L30866.0 2425.0 Z"></path>
 					</g>
-					<path d="M22541.4 1131.8 L22449.75 1174 L22449.75 1375 L22449.8 1375.0 " fill="none"></path>
+					<path d="M30887.8 2440.9 L31146.5 2865 L31146.5 3051.5 L31146.5 3051.5 L31146.5 3238 L31146.5 3238 L38579.25 3391.5965899712805 L38579.3 3391.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22552.1 1132.7 L22541.4 1131.8 L22547.6 1123.1 L22558.3 1124.0 Z"></path>
+						<path d="M30887.5 2430.2 L30887.8 2440.9 L30878.4 2435.7 L30878.1 2425.0 Z"></path>
 					</g>
-					<path d="M22618.5 1134.8 L22563.25 1174 L22563.25 1390.5 L22563.25 1390.5 L22563.25 1607 L22563.25 1607 L22563.25 2220.5 L22563.3 2220.5 " fill="none"></path>
+					<path d="M30900.5 2440.5 L31186.5 2865 L34132 3048.2340727151436 L34132.0 3048.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22629.2 1133.8 L22618.5 1134.8 L22623.0 1125.1 L22633.7 1124.0 Z"></path>
+						<path d="M30899.7 2429.8 L30900.5 2440.5 L30890.9 2435.7 L30890.1 2425.0 Z"></path>
+					</g>
+					<path d="M42549.2 605.4 L44392 876 L44392 1025 L44392 1025 L44392 1174 L44392 1174 L44392 1390.5 L44392 1390.5 L44392 1607 L44392 1607 L31182.25 2216.6397637434193 L31182.3 2216.6 " fill="none"></path>
+					<path d="M42550.0 600.2 L42549.2 605.4 L42548.4 610.7 L42536.0 603.5 Z"></path>
+					<path d="M3962.5 1594.0 L3941.25 1607 L30343.25 2226.162164681319 L30343.3 2226.2 " fill="none"></path>
+					<path d="M3965.3 1598.5 L3962.5 1594.0 L3959.7 1589.4 L3973.8 1587.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M42183.0 1061.9 L41814.25 1174 L41814.25 1390.5 L41814.25 1390.5 L41814.25 1607 L41814.25 1607 L31182.25 2212.124010315342 L31182.3 2212.1 " fill="none"></path>
+					</g>
+					<path d="M42184.5 1067.0 L42183.0 1061.9 L42181.4 1056.8 L42195.8 1058.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M17918.3 1412.3 L17552.25 1607 L30343.25 2216.026077741191 L30343.3 2216.0 " fill="none"></path>
+					</g>
+					<path d="M17920.8 1417.0 L17918.3 1412.3 L17915.8 1407.6 L17930.1 1406.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M27770.5 1039.8 L26773.75 1174 L26773.75 1390.5 L26773.75 1390.5 L26773.75 1607 L26773.75 1607 L30343.25 2169.8517172223615 L30343.3 2169.9 " fill="none"></path>
 					</g>
-					<path d="M23005.1 1131.8 L23096.75 1174 L23096.75 1375 L23096.8 1375.0 " fill="none"></path>
+					<path d="M27771.2 1045.1 L27770.5 1039.8 L27769.8 1034.5 L27783.8 1038.0 Z"></path>
+					<path d="M27900.5 2388.8 L27637.25 2865 L26828.5 3039.3217278243283 L26828.5 3039.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22998.9 1123.1 L23005.1 1131.8 L22994.4 1132.7 L22988.2 1124.0 Z"></path>
+						<path d="M27909.7 2383.2 L27900.5 2388.8 L27900.4 2378.1 L27909.5 2372.5 Z"></path>
 					</g>
-					<path d="M23014.2 1059.8 L23804.25 1174 L23804.25 1375 L23804.3 1375.0 " fill="none"></path>
+					<path d="M28038.5 2390.1 L28203.5 2865 L34132 3049.862940979769 L34132.0 3049.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23005.8 1053.2 L23014.2 1059.8 L23004.2 1063.8 L22995.8 1057.2 Z"></path>
+						<path d="M28040.5 2379.6 L28038.5 2390.1 L28030.4 2383.1 L28032.4 2372.5 Z"></path>
 					</g>
-					<path d="M24041.3 1454.3 L23795 1607 L23795 2220.5 L23795.0 2220.5 " fill="none"></path>
+					<path d="M41338.8 1433.6 L41259.5 1607 L28333 2219.510339372481 L28333.0 2219.5 " fill="none"></path>
+					<path d="M41343.6 1435.8 L41338.8 1433.6 L41333.9 1431.4 L41344.3 1421.5 Z"></path>
+					<path d="M26141.2 1549.9 L26064.25 1607 L27637 2122.0382663022256 L27637.0 2122.0 " fill="none"></path>
+					<path d="M26144.4 1554.2 L26141.2 1549.9 L26138.0 1545.7 L26151.9 1542.0 Z"></path>
+					<path d="M4471.9 1601.3 L4476.75 1607 L4476.75 2236 L4476.75 2236 L4476.75 2865 L4476.75 2865 L14875.75 3050.1999140565317 L14875.8 3050.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24052.0 1454.0 L24041.3 1454.3 L24046.4 1444.9 L24057.1 1444.5 Z"></path>
+						<path d="M4470.0 1590.7 L4471.9 1601.3 L4461.8 1597.6 L4459.9 1587.0 Z"></path>
 					</g>
-					<path d="M24294.2 1434.2 L24887.25 1607 L12335.75 2232.412405434309 L12335.8 2232.4 " fill="none"></path>
+					<path d="M4509.6 1600.0 L4516.75 1607 L4516.75 2236 L4516.75 2236 L4516.75 2865 L4516.75 2865 L26715.5 3051.0265274485796 L26715.5 3051.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24286.7 1426.5 L24294.2 1434.2 L24283.7 1436.7 L24276.3 1429.0 Z"></path>
+						<path d="M4506.6 1589.7 L4509.6 1600.0 L4499.1 1597.3 L4496.2 1587.0 Z"></path>
 					</g>
-					<path d="M23009.0 1050.6 L24144.25 1174 L24144.25 1336.5 L24144.3 1336.5 " fill="none"></path>
-					<path d="M23009.6 1045.3 L23009.0 1050.6 L23008.4 1055.9 L22995.8 1049.2 Z"></path>
-					<path d="M40018.6 140.4 L39632.5 203 L39632.5 524 L39632.5 524.0 " fill="none"></path>
+					<path d="M34827.2 544.6 L28712.75 876 L28712.75 926 L28712.8 926.0 " fill="none"></path>
+					<path d="M34827.5 550.0 L34827.2 544.6 L34826.9 539.3 L34840.5 543.9 Z"></path>
+					<path d="M29715.3 2353.7 L29715.25 2865 L15021.75 3050.578014424542 L15021.8 3050.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40028.6 144.2 L40018.6 140.4 L40026.9 133.6 L40037.0 137.4 Z"></path>
+						<path d="M29720.6 2344.3 L29715.3 2353.7 L29709.9 2344.3 L29715.3 2335.0 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M31508.2 1031.3 L29596.75 1174 L29596.75 1390.5 L29596.75 1390.5 L29596.75 1607 L29596.75 1607 L29696.598966613674 2137 L29696.6 2137.0 " fill="none"></path>
 					</g>
-					<path d="M40034.4 189.0 L39993.5 203 L39993.5 524 L39993.5 524.0 " fill="none"></path>
+					<path d="M31508.6 1036.6 L31508.2 1031.3 L31507.8 1026.0 L31521.5 1030.3 Z"></path>
+					<path d="M18622.0 1440.2 L18622 1607 L27637 2212.621595642422 L27637.0 2212.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40045.0 191.1 L40034.4 189.0 L40041.5 181.0 L40052.1 183.0 Z"></path>
+						<path d="M18627.3 1430.8 L18622.0 1440.2 L18616.7 1430.8 L18622.0 1421.5 Z"></path>
 					</g>
-					<path d="M40621.2 162.9 L40790 203 L40790 524 L40790.0 524.0 " fill="none"></path>
+					<path d="M29928.0 1478.2 L29928 1607 L29748.735294117647 2137 L29748.7 2137.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40613.3 155.6 L40621.2 162.9 L40610.9 166.0 L40603.0 158.6 Z"></path>
+						<path d="M29933.3 1468.8 L29928.0 1478.2 L29922.7 1468.8 L29928.0 1459.5 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M31508.2 1032.6 L29928 1174 L29928 1321.5 L29928.0 1321.5 " fill="none"></path>
 					</g>
-					<path d="M40621.5 137.0 L41059.5 203 L41059.5 524 L41059.5 524.0 " fill="none"></path>
+					<path d="M31508.7 1037.9 L31508.2 1032.6 L31507.7 1027.3 L31521.5 1031.4 Z"></path>
+					<path d="M26979.8 2484.8 L26690 2865 L37659.25 3050.9828746107864 L37659.3 3051.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40613.0 130.3 L40621.5 137.0 L40611.4 140.8 L40603.0 134.2 Z"></path>
+						<path d="M26989.7 2480.7 L26979.8 2484.8 L26981.2 2474.2 L26991.1 2470.0 Z"></path>
 					</g>
-					<path d="M39942.0 1463.2 L39942 1607 L39767.46899841017 2047 L39767.5 2047.0 " fill="none"></path>
+					<path d="M27243.2 2487.9 L27353.5 2865 L26820.32841823056 3036 L26820.3 3036.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39947.3 1453.8 L39942.0 1463.2 L39936.7 1453.8 L39942.0 1444.5 Z"></path>
+						<path d="M27245.7 2477.5 L27243.2 2487.9 L27235.5 2480.5 L27238.0 2470.0 Z"></path>
 					</g>
-					<path d="M40489.9 561.6 L39942 876 L39942 1025 L39942 1025 L39942 1174 L39942 1174 L39942 1336.5 L39942.0 1336.5 " fill="none"></path>
-					<path d="M40492.6 566.3 L40489.9 561.6 L40487.3 557.0 L40501.5 555.0 Z"></path>
-					<path d="M39610.6 2442.4 L39443 2865 L33860 3050.486683887058 L33860.0 3050.5 " fill="none"></path>
+					<path d="M27307.9 2486.3 L27517.25 2865 L27517.25 3051.5 L27517.25 3051.5 L27517.25 3238 L27517.25 3238 L27517.25 3394.5 L27517.25 3394.5 L27517.25 3551 L27517.25 3551 L36165.5 3586.2999942510564 L36165.5 3586.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39619.0 2435.6 L39610.6 2442.4 L39609.1 2431.7 L39617.5 2425.0 Z"></path>
+						<path d="M27308.1 2475.6 L27307.9 2486.3 L27298.7 2480.7 L27298.9 2470.0 Z"></path>
 					</g>
-					<path d="M39762.6 2442.7 L39905.75 2865 L30713.25 3049.5823912575365 L30713.3 3049.6 " fill="none"></path>
+					<path d="M27323.5 2485.9 L27557.25 2865 L27557.25 3051.5 L27557.25 3051.5 L27557.25 3238 L27557.25 3238 L38579.25 3392.530167973124 L38579.3 3392.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39764.6 2432.1 L39762.6 2442.7 L39754.5 2435.6 L39756.6 2425.0 Z"></path>
+						<path d="M27323.2 2475.1 L27323.5 2485.9 L27314.1 2480.7 L27313.8 2470.0 Z"></path>
 					</g>
-					<path d="M39842.6 2440.0 L40155.25 2865 L32498.25 3050.133921047514 L32498.3 3050.1 " fill="none"></path>
+					<path d="M27339.1 2485.4 L27597.25 2865 L34132 3050.0136058294433 L34132.0 3050.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39841.4 2429.4 L39842.6 2440.0 L39832.8 2435.7 L39831.5 2425.0 Z"></path>
+						<path d="M27338.3 2474.7 L27339.1 2485.4 L27329.5 2480.7 L27328.6 2470.0 Z"></path>
+					</g>
+					<path d="M41346.5 1434.4 L41299.5 1607 L27597 2216.9697452229298 L27597.0 2217.0 " fill="none"></path>
+					<path d="M41351.7 1435.8 L41346.5 1434.4 L41341.4 1433.0 L41350.1 1421.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M42183.1 1065.1 L41854.25 1174 L41854.25 1390.5 L41854.25 1390.5 L41854.25 1607 L41854.25 1607 L27597 2217.6886565995337 L27597.0 2217.7 " fill="none"></path>
+					</g>
+					<path d="M42184.8 1070.2 L42183.1 1065.1 L42181.4 1060.1 L42195.8 1060.9 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M17921.5 1412.8 L17592.25 1607 L26742 2207.923307838889 L26742.0 2207.9 " fill="none"></path>
+					</g>
+					<path d="M17924.2 1417.4 L17921.5 1412.8 L17918.8 1408.2 L17933.0 1406.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M27793.3 1043.2 L27169.5 1174 L27169.5 1390.5 L27169.5 1390.5 L27169.5 1607 L27169.5 1607 L27169.5 2002 L27169.5 2002.0 " fill="none"></path>
 					</g>
-					<path d="M39855.2 2439.6 L40195.25 2865 L34560.5 3049.7783858631146 L34560.5 3049.8 " fill="none"></path>
+					<path d="M27794.4 1048.5 L27793.3 1043.2 L27792.2 1038.0 L27806.3 1040.5 Z"></path>
+					<path d="M17099.8 2280.3 L17133 2865 L12584.75 3043.776252700353 L12584.8 3043.8 " fill="none"></path>
+					<path d="M17105.1 2280.0 L17099.8 2280.3 L17094.4 2280.6 L17099.0 2267.0 Z"></path>
+					<path d="M29100.8 1112.7 L29100.75 1174 L29100.75 1375 L29100.8 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39853.6 2429.0 L39855.2 2439.6 L39845.2 2435.6 L39843.6 2425.0 Z"></path>
+						<path d="M29106.1 1103.3 L29100.8 1112.7 L29095.4 1103.3 L29100.8 1094.0 Z"></path>
 					</g>
-					<path d="M38611.1 657.4 L39443 876 L39443 1025 L39443 1025 L39443 1174 L39443 1174 L39443 1390.5 L39443 1390.5 L39443 1607 L39443 1607 L39617.53100158983 2047 L39617.5 2047.0 " fill="none"></path>
-					<path d="M38612.5 652.3 L38611.1 657.4 L38609.8 662.6 L38598.3 654.1 Z"></path>
-					<path d="M8092.2 2333.1 L6417 2865 L30522.25 3050.7640414036755 L30522.3 3050.8 " fill="none"></path>
+					<path d="M34827.2 545.0 L29100.75 876 L29100.75 956 L29100.8 956.0 " fill="none"></path>
+					<path d="M34827.5 550.3 L34827.2 545.0 L34826.9 539.7 L34840.5 544.2 Z"></path>
+					<path d="M16560.3 2322.2 L16331 2865 L26715.5 3050.490781534336 L26715.5 3050.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8102.8 2335.4 L8092.2 2333.1 L8099.5 2325.2 L8110.0 2327.5 Z"></path>
+						<path d="M16568.9 2315.7 L16560.3 2322.2 L16559.1 2311.5 L16567.6 2305.0 Z"></path>
 					</g>
-					<path d="M8459.7 2343.7 L8757.25 2865 L13816.25 3048.418254276827 L13816.3 3048.4 " fill="none"></path>
+					<path d="M16628.4 2322.5 L16827 2865 L10440.75 3048.582231898578 L10440.8 3048.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8459.7 2333.0 L8459.7 2343.7 L8450.5 2338.2 L8450.5 2327.5 Z"></path>
+						<path d="M16630.2 2311.9 L16628.4 2322.5 L16620.2 2315.6 L16622.0 2305.0 Z"></path>
 					</g>
-					<path d="M3699.5 1453.1 L4402.25 1607 L8072.75 2184.7638888888887 L8072.8 2184.8 " fill="none"></path>
-					<path d="M3700.7 1447.9 L3699.5 1453.1 L3698.4 1458.3 L3686.5 1450.3 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M8649.4 1419.3 L8666.75 1607 L8437.308426073132 2144.5 L8437.3 2144.5 " fill="none"></path>
+					<path d="M19269.0 1510.1 L19170.5 1607 L19170.5 2220.5 L19170.5 2220.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M19279.4 1507.3 L19269.0 1510.1 L19271.9 1499.7 L19282.3 1497.0 Z"></path>
 					</g>
-					<path d="M8654.7 1418.8 L8649.4 1419.3 L8644.1 1419.8 L8648.2 1406.0 Z"></path>
-					<path d="M9685.3 2293.5 L10078.25 2865 L8223.75 3036.943450161571 L8223.8 3036.9 " fill="none"></path>
-					<path d="M9689.7 2290.5 L9685.3 2293.5 L9680.9 2296.5 L9677.7 2282.5 Z"></path>
-					<path d="M9688.7 2293.2 L10118.25 2865 L8487.75 3039.51262553802 L8487.8 3039.5 " fill="none"></path>
-					<path d="M9693.0 2290.0 L9688.7 2293.2 L9684.4 2296.4 L9680.7 2282.5 Z"></path>
-					<path d="M9692.1 2292.8 L10158.25 2865 L8718.75 3039.896905537459 L8718.8 3039.9 " fill="none"></path>
-					<path d="M9696.2 2289.5 L9692.1 2292.8 L9687.9 2296.2 L9683.6 2282.5 Z"></path>
-					<path d="M9695.4 2292.5 L10198.25 2865 L8894.75 3042.253189938024 L8894.8 3042.3 " fill="none"></path>
-					<path d="M9699.4 2289.0 L9695.4 2292.5 L9691.4 2296.0 L9686.6 2282.5 Z"></path>
-					<path d="M14206.4 1468.6 L14136.25 1607 L14136.25 2220.5 L14136.3 2220.5 " fill="none"></path>
+					<path d="M19514.5 1510.0 L19615.25 1607 L15588.25 2229.278098513696 L15588.3 2229.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14215.4 1462.7 L14206.4 1468.6 L14205.8 1457.9 L14214.8 1452.0 Z"></path>
+						<path d="M19511.5 1499.6 L19514.5 1510.0 L19504.1 1507.3 L19501.1 1497.0 Z"></path>
 					</g>
-					<path d="M14310.7 1466.2 L14431 1607 L14431 2220.5 L14431.0 2220.5 " fill="none"></path>
+					<path d="M20050.9 1515.6 L20042.5 1607 L20702.817170111288 2220.5 L20702.8 2220.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14308.7 1455.6 L14310.7 1466.2 L14300.6 1462.6 L14298.6 1452.0 Z"></path>
+						<path d="M20057.1 1506.8 L20050.9 1515.6 L20046.5 1505.8 L20052.7 1497.0 Z"></path>
 					</g>
-					<path d="M14847.4 1043.3 L14246 1174 L14246 1329 L14246.0 1329.0 " fill="none"></path>
-					<path d="M14848.5 1048.5 L14847.4 1043.3 L14846.3 1038.1 L14860.4 1040.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M819.1 2260.8 L1442.5 2865 L1245.4973190348526 3013 L1245.5 3013.0 " fill="none"></path>
+					<path d="M20176.8 1510.5 L20268.75 1607 L15588.25 2230.2079805249787 L15588.3 2230.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M20174.3 1500.1 L20176.8 1510.5 L20166.5 1507.4 L20164.0 1497.0 Z"></path>
 					</g>
-					<path d="M822.8 2256.9 L819.1 2260.8 L815.4 2264.6 L809.5 2251.5 Z"></path>
-					<path d="M17781.7 1152.8 L17682 1174 L17682 1390.5 L17682 1390.5 L17682 1607 L17682 1607 L17682 2236 L17682 2236 L17682 2865 L17682 2865 L11582.5 3046.1107705779336 L11582.5 3046.1 " fill="none"></path>
+					<path d="M10165.9 3000.9 L10177.75 2998 L10185.25 2998 L10185.25 2998 L10192.75 3051.5 L10192.75 3051.5 L10185.25 3105 L10185.25 3105 L10177.75 3105 L10177.75 3105 L10147.75 3097.7539503386006 L10147.8 3097.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17792.0 1156.1 L17781.7 1152.8 L17789.8 1145.7 L17800.0 1149.0 Z"></path>
+						<path d="M10155.6 2997.9 L10165.9 3000.9 L10158.1 3008.2 L10147.8 3005.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M27960.4 542.8 L18384 876 L18384 896 L18384.0 896.0 " fill="none"></path>
+						<path d="M3709.0 2264.8 L3751 2865 L9764.75 3045.744430119657 L9764.8 3045.7 " fill="none"></path>
 					</g>
-					<path d="M27960.6 548.1 L27960.4 542.8 L27960.2 537.5 L27973.8 542.3 Z"></path>
-					<path d="M18794.3 1158.1 L18843.25 1174 L18843.25 1306.5 L18843.3 1306.5 " fill="none"></path>
-					<path d="M18795.9 1153.0 L18794.3 1158.1 L18792.6 1163.2 L18781.6 1154.0 Z"></path>
-					<path d="M18981.1 1127.6 L19251.25 1174 L19251.25 1321.5 L19251.3 1321.5 " fill="none"></path>
-					<path d="M18982.0 1122.3 L18981.1 1127.6 L18980.2 1132.8 L18968.0 1125.3 Z"></path>
-					<path d="M19659.3 1553.2 L19659.25 1607 L11115.75 2233.872149314669 L11115.8 2233.9 " fill="none"></path>
+					<path d="M3714.3 2264.4 L3709.0 2264.8 L3703.7 2265.2 L3708.1 2251.5 Z"></path>
+					<path d="M10849.5 1470.7 L10849.5 1607 L19598 2202.412951742047 L19598.0 2202.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19664.6 1543.8 L19659.3 1553.2 L19653.9 1543.8 L19659.3 1534.5 Z"></path>
+						<path d="M10854.8 1461.3 L10849.5 1470.7 L10844.2 1461.3 L10849.5 1452.0 Z"></path>
 					</g>
-					<path d="M18981.2 1094.8 L19659.25 1174 L19659.25 1246.5 L19659.3 1246.5 " fill="none"></path>
-					<path d="M18981.9 1089.5 L18981.2 1094.8 L18980.6 1100.1 L18968.0 1093.2 Z"></path>
-					<path d="M20657.8 1493.2 L20657.75 1607 L20657.75 2220.5 L20657.8 2220.5 " fill="none"></path>
+					<path d="M13093.2 1030.7 L10849.5 1174 L10849.5 1329 L10849.5 1329.0 " fill="none"></path>
+					<path d="M13093.5 1036.0 L13093.2 1030.7 L13092.9 1025.4 L13106.5 1029.9 Z"></path>
+					<path d="M45810.0 120.3 L45810 203 L45810 493 L45810.0 493.0 " fill="none"></path>
+					<path d="M45815.3 120.3 L45810.0 120.3 L45804.7 120.3 L45810.0 107.0 Z"></path>
+					<path d="M11368.5 1470.7 L11368.5 1607 L19598 2200.414593603118 L19598.0 2200.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20663.1 1483.8 L20657.8 1493.2 L20652.4 1483.8 L20657.8 1474.5 Z"></path>
+						<path d="M11373.8 1461.3 L11368.5 1470.7 L11363.2 1461.3 L11368.5 1452.0 Z"></path>
 					</g>
-					<path d="M18981.3 1064.1 L20657.75 1174 L20657.75 1306.5 L20657.8 1306.5 " fill="none"></path>
-					<path d="M18981.7 1058.8 L18981.3 1064.1 L18981.0 1069.5 L18968.0 1063.3 Z"></path>
-					<path d="M18063.3 1447.7 L18063.25 1607 L18577 1923.7348689046803 L18577.0 1923.7 " fill="none"></path>
+					<path d="M13093.2 1032.3 L11368.5 1174 L11368.5 1329 L11368.5 1329.0 " fill="none"></path>
+					<path d="M13093.6 1037.6 L13093.2 1032.3 L13092.8 1027.0 L13106.5 1031.2 Z"></path>
+					<path d="M19839.7 2536.8 L19565 2865 L10147.75 3047.7831013399245 L10147.8 3047.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18068.6 1438.3 L18063.3 1447.7 L18057.9 1438.3 L18063.3 1429.0 Z"></path>
+						<path d="M19849.8 2533.1 L19839.7 2536.8 L19841.6 2526.2 L19851.7 2522.5 Z"></path>
 					</g>
-					<path d="M11600.3 2987.0 L11612.5 2983 L11620 2983 L11620 2983 L11627.5 3051.5 L11627.5 3051.5 L11620 3120 L11620 3120 L11612.5 3120 L11612.5 3120 L11582.5 3110.2836879432625 L11582.5 3110.3 " fill="none"></path>
+					<path d="M20106.9 2541.1 L20123.25 2865 L26715.5 3049.9151532242904 L26715.5 3049.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11589.7 2984.8 L11600.3 2987.0 L11593.0 2994.9 L11582.5 2992.7 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M820.3 2260.5 L1482.5 2865 L11219.5 3048.0872107677574 L11219.5 3048.1 " fill="none"></path>
+						<path d="M20111.8 2531.6 L20106.9 2541.1 L20101.1 2532.1 L20106.0 2522.5 Z"></path>
 					</g>
-					<path d="M823.9 2256.6 L820.3 2260.5 L816.7 2264.4 L810.5 2251.5 Z"></path>
-					<path d="M18455.3 1440.2 L18455.25 1607 L18577 1728.8953442101074 L18577.0 1728.9 " fill="none"></path>
+					<path d="M20358.2 2536.5 L20649.75 2865 L34132 3050.7765843476977 L34132.0 3050.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18460.6 1430.8 L18455.3 1440.2 L18449.9 1430.8 L18455.3 1421.5 Z"></path>
+						<path d="M20356.0 2525.9 L20358.2 2536.5 L20348.0 2533.0 L20345.8 2522.5 Z"></path>
 					</g>
-					<path d="M14656.0 1455.7 L14656 1607 L18577 2164.0432523997742 L18577.0 2164.0 " fill="none"></path>
+					<path d="M41354.6 1434.8 L41339.5 1607 L20585 2221.3910250376507 L20585.0 2221.4 " fill="none"></path>
+					<path d="M41359.9 1435.2 L41354.6 1434.8 L41349.3 1434.3 L41355.8 1421.5 Z"></path>
+					<path d="M20734.3 1490.9 L20671.75 1607 L20355.79511128776 1949.5 L20355.8 1949.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14661.3 1446.3 L14656.0 1455.7 L14650.7 1446.3 L14656.0 1437.0 Z"></path>
+						<path d="M20743.5 1485.2 L20734.3 1490.9 L20734.1 1480.2 L20743.2 1474.5 Z"></path>
 					</g>
-					<path d="M14891.3 1046.8 L14656 1174 L14656 1344 L14656.0 1344.0 " fill="none"></path>
-					<path d="M14893.9 1051.5 L14891.3 1046.8 L14888.8 1042.1 L14903.1 1040.5 Z"></path>
-					<path d="M15048.0 1455.7 L15048 1607 L18577 2157.0535249659274 L18577.0 2157.1 " fill="none"></path>
+					<path d="M20978.0 1482.7 L21233.75 1607 L21233.75 2220.5 L21233.8 2220.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15053.3 1446.3 L15048.0 1455.7 L15042.7 1446.3 L15048.0 1437.0 Z"></path>
+						<path d="M20972.0 1473.8 L20978.0 1482.7 L20967.3 1483.4 L20961.3 1474.5 Z"></path>
 					</g>
-					<path d="M14952.0 1051.0 L15048 1174 L15048 1344 L15048.0 1344.0 " fill="none"></path>
-					<path d="M14956.2 1047.7 L14952.0 1051.0 L14947.8 1054.3 L14943.8 1040.5 Z"></path>
-					<path d="M15440.0 1478.2 L15440 1607 L18577 2148.5597639632224 L18577.0 2148.6 " fill="none"></path>
+					<path d="M42003.7 2427.7 L41854.25 2865 L37720.25 3050.134109737063 L37720.3 3050.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15445.3 1468.8 L15440.0 1478.2 L15434.7 1468.8 L15440.0 1459.5 Z"></path>
+						<path d="M42011.8 2420.6 L42003.7 2427.7 L42001.7 2417.1 L42009.8 2410.0 Z"></path>
 					</g>
-					<path d="M14997.4 1044.3 L15440 1174 L15440 1321.5 L15440.0 1321.5 " fill="none"></path>
-					<path d="M14998.9 1039.1 L14997.4 1044.3 L14995.9 1049.4 L14984.6 1040.5 Z"></path>
-					<path d="M18560.8 2532.7 L17975.25 2865 L11582.5 3046.351161729475 L11582.5 3046.4 " fill="none"></path>
+					<path d="M42044.8 2428.5 L41989.25 2865 L32334.75 3050.615612597289 L32334.8 3050.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18571.5 2532.7 L18560.8 2532.7 L18566.3 2523.4 L18577.0 2523.5 Z"></path>
+						<path d="M42051.2 2419.9 L42044.8 2428.5 L42040.7 2418.6 L42047.1 2410.0 Z"></path>
 					</g>
-					<path d="M18920.8 2863.1 L18920.25 2865 L32385.25 3050.720704063898 L32385.3 3050.7 " fill="none"></path>
+					<path d="M42057.0 2428.6 L42029.25 2865 L38870.5 3029.5435025487045 L38870.5 3029.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18928.3 2855.4 L18920.8 2863.1 L18917.9 2852.7 L18925.4 2845.0 Z"></path>
+						<path d="M42062.9 2419.7 L42057.0 2428.6 L42052.3 2419.0 L42058.2 2410.0 Z"></path>
 					</g>
-					<path d="M19605.4 2590.9 L20008.5 2865 L20008.5 3051.5 L20008.5 3051.5 L20008.5 3238 L20008.5 3238 L20008.5 3394.5 L20008.5 3394.5 L20008.5 3551 L20008.5 3551 L30603.75 3586.336578434366 L30603.8 3586.3 " fill="none"></path>
+					<path d="M42116.6 2428.1 L42224.25 2865 L42224.25 3051.5 L42224.25 3051.5 L42224.25 3238 L42224.25 3238 L42224.25 3394.5 L42224.25 3394.5 L42224.25 3551 L42224.25 3551 L36263.5 3586.2105536835975 L36263.5 3586.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19600.7 2581.3 L19605.4 2590.9 L19594.7 2590.1 L19590.0 2580.4 Z"></path>
+						<path d="M42119.5 2417.8 L42116.6 2428.1 L42109.2 2420.3 L42112.1 2410.0 Z"></path>
 					</g>
-					<path d="M19605.6 2576.3 L20048.5 2865 L13776.25 3049.4706682436426 L13776.3 3049.5 " fill="none"></path>
+					<path d="M42128.7 2427.8 L42264.25 2865 L42264.25 3051.5 L42264.25 3051.5 L42264.25 3238 L42264.25 3238 L38860.25 3388.2965157285935 L38860.3 3388.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19600.7 2566.8 L19605.6 2576.3 L19594.9 2575.7 L19590.0 2566.1 Z"></path>
+						<path d="M42131.1 2417.3 L42128.7 2427.8 L42120.9 2420.5 L42123.2 2410.0 Z"></path>
 					</g>
-					<path d="M19605.8 2562.9 L20088.5 2865 L34455.5 3050.820971600957 L34455.5 3050.8 " fill="none"></path>
+					<path d="M42140.8 2427.5 L42304.25 2865 L34237 3050.2941439083716 L34237.0 3050.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19600.7 2553.4 L19605.8 2562.9 L19595.1 2562.5 L19590.0 2553.0 Z"></path>
+						<path d="M42142.5 2416.9 L42140.8 2427.5 L42132.5 2420.6 L42134.3 2410.0 Z"></path>
+					</g>
+					<path d="M42549.2 604.3 L44432 876 L44432 1025 L44432 1025 L44432 1174 L44432 1174 L44432 1390.5 L44432 1390.5 L44432 1607 L44432 1607 L42499.25 2121.527457411914 L42499.3 2121.5 " fill="none"></path>
+					<path d="M42550.0 599.0 L42549.2 604.3 L42548.4 609.6 L42536.0 602.4 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M42232.3 1070.6 L42069.25 1174 L42069.25 1390.5 L42069.25 1390.5 L42069.25 1607 L42069.25 1607 L42069.25 2062 L42069.3 2062.0 " fill="none"></path>
 					</g>
-					<path d="M37686.7 1433.4 L37597.25 1607 L19590 2218.7917898858955 L19590.0 2218.8 " fill="none"></path>
-					<path d="M37691.4 1435.8 L37686.7 1433.4 L37681.9 1430.9 L37692.8 1421.5 Z"></path>
+					<path d="M42235.1 1075.1 L42232.3 1070.6 L42229.4 1066.1 L42243.5 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M20271.7 1414.3 L20028.5 1607 L19590 1898.8693121693123 L19590.0 1898.9 " fill="none"></path>
+						<path d="M27913.0 1048.2 L28090.75 1174 L28090.75 1390.5 L28090.75 1390.5 L28090.75 1607 L28090.75 1607 L41639.25 2216.6509997496155 L41639.3 2216.7 " fill="none"></path>
 					</g>
-					<path d="M20275.0 1418.5 L20271.7 1414.3 L20268.4 1410.1 L20282.2 1406.0 Z"></path>
-					<path d="M29087.8 1482.9 L28639.25 1607 L28639.25 2236 L28639.25 2236 L28639.25 2865 L28639.25 2865 L28639.25 3051.5 L28639.25 3051.5 L28639.25 3238 L28639.25 3238 L28639.25 3394.5 L28639.25 3394.5 L28639.25 3551 L28639.25 3551 L30603.75 3585.636081450211 L30603.8 3585.6 " fill="none"></path>
+					<path d="M27916.1 1043.9 L27913.0 1048.2 L27909.9 1052.6 L27902.1 1040.5 Z"></path>
+					<path d="M38449.0 3176.7 L38449 3238 L38579.25 3313.287626962142 L38579.3 3313.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29098.2 1485.6 L29087.8 1482.9 L29095.3 1475.3 L29105.8 1477.9 Z"></path>
+						<path d="M38454.3 3167.3 L38449.0 3176.7 L38443.7 3167.3 L38449.0 3158.0 Z"></path>
 					</g>
-					<path d="M29755.7 1487.9 L30164.25 1607 L30164.25 2236 L30164.25 2236 L30164.25 2865 L30164.25 2865 L30164.25 3051.5 L30164.25 3051.5 L30164.25 3238 L30164.25 3238 L32839.75 3386.6916725852275 L32839.8 3386.7 " fill="none"></path>
+					<path d="M38889.1 3030.4 L42344.25 2865 L42145.32313195548 2410 L42145.3 2410.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29748.2 1480.1 L29755.7 1487.9 L29745.2 1490.4 L29737.8 1482.6 Z"></path>
+						<path d="M38879.6 3025.5 L38889.1 3030.4 L38880.1 3036.2 L38870.5 3031.3 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M36420.9 1046.9 L35715 1174 L29737.75 1379.6289874071426 L29737.8 1379.6 " fill="none"></path>
+						<path d="M42376.2 1070.6 L42539.25 1174 L42539.25 1390.5 L42539.25 1390.5 L42539.25 1607 L42539.25 1607 L42539.25 2236 L42539.25 2236 L42539.25 2865 L42539.25 2865 L38870.5 3032.2811869690117 L38870.5 3032.3 " fill="none"></path>
 					</g>
-					<path d="M36421.8 1052.1 L36420.9 1046.9 L36419.9 1041.7 L36434.0 1044.5 Z"></path>
+					<path d="M42379.1 1066.1 L42376.2 1070.6 L42373.4 1075.1 L42365.0 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M25549.2 1043.8 L25038.25 1174 L29105.75 1374.8928367742672 L29105.8 1374.9 " fill="none"></path>
+						<path d="M17924.7 1413.4 L17632.25 1607 L17632.25 2236 L17632.25 2236 L17632.25 2865 L17632.25 2865 L38027.5 3047.7237260859642 L38027.5 3047.7 " fill="none"></path>
 					</g>
-					<path d="M25550.6 1049.0 L25549.2 1043.8 L25547.9 1038.6 L25562.2 1040.5 Z"></path>
+					<path d="M17927.7 1417.8 L17924.7 1413.4 L17921.8 1408.9 L17935.8 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M27960.4 543.9 L20869.75 876 L20869.75 1025 L20869.75 1025 L20869.75 1174 L20869.75 1174 L20869.75 1390.5 L20869.75 1390.5 L20869.75 1607 L20869.75 1607 L25295 2210.8904919455445 L25295.0 2210.9 " fill="none"></path>
+						<path d="M27967.2 1043.2 L28591 1174 L28591 1390.5 L28591 1390.5 L28591 1607 L28591 1607 L28591 2236 L28591 2236 L28591 2865 L28591 2865 L38027.5 3043.5257912355446 L38027.5 3043.5 " fill="none"></path>
+					</g>
+					<path d="M27968.3 1038.0 L27967.2 1043.2 L27966.1 1048.5 L27954.2 1040.5 Z"></path>
+					<path d="M21531.4 1477.6 L21499.75 1607 L21499.75 2236 L21499.75 2236 L21499.75 2865 L21499.75 2865 L11765.75 3048.6603773584907 L11765.8 3048.7 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M21538.8 1469.8 L21531.4 1477.6 L21528.5 1467.3 L21535.9 1459.5 Z"></path>
 					</g>
-					<path d="M27960.7 549.3 L27960.4 543.9 L27960.2 538.6 L27973.8 543.3 Z"></path>
-					<path d="M21069.6 1122.9 L21024.25 1174 L21024.25 1375 L21024.3 1375.0 " fill="none"></path>
+					<path d="M21669.8 1404.1 L23419.5 1607 L12123 2233.0626899863432 L12123.0 2233.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21079.8 1119.5 L21069.6 1122.9 L21071.9 1112.4 L21082.1 1109.0 Z"></path>
+						<path d="M21661.1 1397.7 L21669.8 1404.1 L21659.9 1408.3 L21651.3 1401.9 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M27960.4 544.1 L21156.75 876 L21156.75 941 L21156.8 941.0 " fill="none"></path>
+						<path d="M31508.4 1039.5 L30726 1174 L30726 1329 L30726.0 1329.0 " fill="none"></path>
 					</g>
-					<path d="M27960.7 549.5 L27960.4 544.1 L27960.2 538.8 L27973.8 543.5 Z"></path>
-					<path d="M40448.5 1097.7 L40448.5 1174 L40448.5 1239 L40448.5 1239.0 " fill="none"></path>
+					<path d="M31509.3 1044.8 L31508.4 1039.5 L31507.5 1034.3 L31521.5 1037.3 Z"></path>
+					<path d="M11783.6 3001.6 L11795.75 2998 L11803.25 2998 L11803.25 2998 L11810.75 3051.5 L11810.75 3051.5 L11803.25 3105 L11803.25 3105 L11795.75 3105 L11795.75 3105 L11765.75 3096.1080332409974 L11765.8 3096.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40453.8 1088.3 L40448.5 1097.7 L40443.2 1088.3 L40448.5 1079.0 Z"></path>
+						<path d="M11773.2 2999.1 L11783.6 3001.6 L11776.2 3009.4 L11765.8 3006.9 Z"></path>
 					</g>
-					<path d="M40521.7 568.0 L40448.5 876 L40448.5 971 L40448.5 971.0 " fill="none"></path>
-					<path d="M40526.9 569.2 L40521.7 568.0 L40516.5 566.7 L40524.8 555.0 Z"></path>
-					<path d="M40396.5 1559.8 L40382 1607 L40382 2236 L40382 2236 L40382 2865 L40382 2865 L32498.25 3050.172932212462 L32498.3 3050.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40404.3 1552.5 L40396.5 1559.8 L40394.1 1549.4 L40402.0 1542.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3716.5 2264.1 L3918.5 2865 L11464.75 3047.8532335076493 L11464.8 3047.9 " fill="none"></path>
 					</g>
-					<path d="M40620.7 1554.9 L40675.25 1607 L40675.25 2236 L40675.25 2236 L40675.25 2865 L40675.25 2865 L13986.25 3050.907914394562 L13986.3 3050.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40617.6 1544.6 L40620.7 1554.9 L40610.2 1552.3 L40607.2 1542.0 Z"></path>
+					<path d="M3721.5 2262.4 L3716.5 2264.1 L3711.4 2265.8 L3712.2 2251.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M34827.2 549.1 L31593 876 L31593 994 L31593.0 994.0 " fill="none"></path>
 					</g>
-					<path d="M26726.6 2484.9 L26440.75 2865 L33799 3050.730147183218 L33799.0 3050.7 " fill="none"></path>
+					<path d="M34827.8 554.4 L34827.2 549.1 L34826.7 543.8 L34840.5 547.7 Z"></path>
+					<path d="M43892.2 2495.5 L43790 2865 L37720.25 3050.567538215647 L37720.3 3050.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26736.4 2480.7 L26726.6 2484.9 L26727.9 2474.3 L26737.8 2470.0 Z"></path>
+						<path d="M43899.8 2487.9 L43892.2 2495.5 L43889.6 2485.1 L43897.2 2477.5 Z"></path>
 					</g>
-					<path d="M26853.1 2488.1 L26762.5 2865 L32385.25 3049.6446053616232 L32385.3 3049.6 " fill="none"></path>
+					<path d="M44027.6 2495.6 L44118 2865 L26828.5 3050.8925256543293 L26828.5 3050.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26860.5 2480.3 L26853.1 2488.1 L26850.1 2477.8 L26857.5 2470.0 Z"></path>
+						<path d="M44030.5 2485.3 L44027.6 2495.6 L44020.2 2487.8 L44023.1 2477.5 Z"></path>
 					</g>
-					<path d="M27041.9 2486.6 L27235.5 2865 L27235.5 3051.5 L27235.5 3051.5 L27235.5 3238 L27235.5 3238 L27235.5 3394.5 L27235.5 3394.5 L27235.5 3551 L27235.5 3551 L30603.75 3585.9909649572023 L30603.8 3586.0 " fill="none"></path>
+					<path d="M44044.0 2495.3 L44158 2865 L34237 3050.518273424575 L34237.0 3050.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27042.4 2475.9 L27041.9 2486.6 L27032.9 2480.7 L27033.4 2470.0 Z"></path>
+						<path d="M44046.3 2484.8 L44044.0 2495.3 L44036.1 2488.0 L44038.5 2477.5 Z"></path>
 					</g>
-					<path d="M27057.6 2486.2 L27275.5 2865 L27275.5 3051.5 L27275.5 3051.5 L27275.5 3238 L27275.5 3238 L32839.75 3390.6456242604845 L32839.8 3390.6 " fill="none"></path>
+					<path d="M42549.2 603.2 L44472 876 L44472 1025 L44472 1025 L44472 1174 L44472 1174 L44472 1390.5 L44472 1390.5 L44472 1607 L44472 1607 L44159.04292527822 1994.5 L44159.0 1994.5 " fill="none"></path>
+					<path d="M42550.0 597.9 L42549.2 603.2 L42548.5 608.5 L42536.0 601.4 Z"></path>
+					<path d="M17102.6 2280.2 L17173 2865 L12847.75 3046.813066997239 L12847.8 3046.8 " fill="none"></path>
+					<path d="M17107.9 2279.6 L17102.6 2280.2 L17097.3 2280.9 L17101.0 2267.0 Z"></path>
+					<path d="M32830.5 1493.2 L32830.5 1607 L32931.61685214626 2122 L32931.6 2122.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27057.6 2475.4 L27057.6 2486.2 L27048.4 2480.7 L27048.3 2470.0 Z"></path>
+						<path d="M32835.8 1483.8 L32830.5 1493.2 L32825.2 1483.8 L32830.5 1474.5 Z"></path>
 					</g>
-					<path d="M27073.3 2485.7 L27315.5 2865 L34455.5 3050.1386861313867 L34455.5 3050.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M27072.7 2475.0 L27073.3 2485.7 L27063.7 2480.7 L27063.2 2470.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M31677.7 1035.2 L32830.5 1174 L32830.5 1306.5 L32830.5 1306.5 " fill="none"></path>
 					</g>
-					<path d="M37728.9 1433.6 L37810.25 1607 L27341.25 2211.3225806451615 L27341.3 2211.3 " fill="none"></path>
-					<path d="M37733.8 1431.3 L37728.9 1433.6 L37724.1 1435.8 L37723.3 1421.5 Z"></path>
+					<path d="M31678.4 1029.9 L31677.7 1035.2 L31677.1 1040.5 L31664.5 1033.6 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M36420.9 1048.0 L35755 1174 L35755 1390.5 L35755 1390.5 L35755 1607 L35755 1607 L27341.25 2205.5860313869644 L27341.3 2205.6 " fill="none"></path>
+						<path d="M31677.8 1033.5 L33077.5 1174 L33077.5 1390.5 L33077.5 1390.5 L33077.5 1607 L33077.5 1607 L32976.38314785374 2122 L32976.4 2122.0 " fill="none"></path>
 					</g>
-					<path d="M36421.9 1053.2 L36420.9 1048.0 L36419.9 1042.8 L36434.0 1045.5 Z"></path>
+					<path d="M31678.3 1028.2 L31677.8 1033.5 L31677.2 1038.8 L31664.5 1032.2 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M20275.3 1415.1 L20068.5 1607 L26486.25 2196.7176509258243 L26486.3 2196.7 " fill="none"></path>
+						<path d="M3718.3 2263.9 L3962.5 2865 L2436 3030.51875 L2436.0 3030.5 " fill="none"></path>
 					</g>
-					<path d="M20278.9 1419.0 L20275.3 1415.1 L20271.7 1411.2 L20285.1 1406.0 Z"></path>
+					<path d="M3723.3 2261.8 L3718.3 2263.9 L3713.4 2265.9 L3713.3 2251.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M25584.8 1047.2 L25366.25 1174 L25366.25 1390.5 L25366.25 1390.5 L25366.25 1607 L25366.25 1607 L26486.25 2062.237479806139 L26486.3 2062.2 " fill="none"></path>
+						<path d="M31677.8 1032.1 L33364.5 1174 L33364.5 1329 L33364.5 1329.0 " fill="none"></path>
 					</g>
-					<path d="M25587.4 1051.8 L25584.8 1047.2 L25582.1 1042.6 L25596.3 1040.5 Z"></path>
-					<path d="M28150.3 2353.7 L28150.25 2865 L35773.5 3049.7310216014293 L35773.5 3049.7 " fill="none"></path>
+					<path d="M31678.2 1026.8 L31677.8 1032.1 L31677.3 1037.4 L31664.5 1031.0 Z"></path>
+					<path d="M25343.5 1440.2 L25343.5 1607 L31222.25 2200.8465090135305 L31222.3 2200.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28155.6 2344.3 L28150.3 2353.7 L28144.9 2344.3 L28150.3 2335.0 Z"></path>
+						<path d="M25348.8 1430.8 L25343.5 1440.2 L25338.2 1430.8 L25343.5 1421.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M30607.2 1029.8 L28031.75 1174 L28031.75 1390.5 L28031.75 1390.5 L28031.75 1607 L28031.75 1607 L28131.598966613674 2137 L28131.6 2137.0 " fill="none"></path>
+					<path d="M12187.0 1455.7 L12187 1607 L10930.007750397457 2220.5 L10930.0 2220.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M12192.3 1446.3 L12187.0 1455.7 L12181.7 1446.3 L12187.0 1437.0 Z"></path>
 					</g>
-					<path d="M30607.5 1035.1 L30607.2 1029.8 L30606.9 1024.4 L30620.5 1029.0 Z"></path>
-					<path d="M41115.0 1097.7 L41115 1174 L41115 1194 L41115.0 1194.0 " fill="none"></path>
+					<path d="M13093.3 1038.3 L12187 1174 L12187 1344 L12187.0 1344.0 " fill="none"></path>
+					<path d="M13094.1 1043.6 L13093.3 1038.3 L13092.5 1033.1 L13106.5 1036.4 Z"></path>
+					<path d="M36761.0 1508.2 L36761 1607 L34362.5 2191.1845111326234 L34362.5 2191.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41120.3 1088.3 L41115.0 1097.7 L41109.7 1088.3 L41115.0 1079.0 Z"></path>
+						<path d="M36766.3 1498.8 L36761.0 1508.2 L36755.7 1498.8 L36761.0 1489.5 Z"></path>
 					</g>
-					<path d="M40567.1 561.6 L41115 876 L41115 971 L41115.0 971.0 " fill="none"></path>
-					<path d="M40569.7 557.0 L40567.1 561.6 L40564.4 566.3 L40555.5 555.0 Z"></path>
-					<path d="M21680.8 1440.2 L21680.75 1607 L36424.25 2221.495676374118 L36424.3 2221.5 " fill="none"></path>
+					<path d="M36839.9 1116.8 L36761 1174 L36761 1291.5 L36761.0 1291.5 " fill="none"></path>
+					<path d="M36843.0 1121.1 L36839.9 1116.8 L36836.7 1112.5 L36850.6 1109.0 Z"></path>
+					<path d="M31445.7 2463.9 L31226.5 2865 L37659.25 3050.619908714656 L37659.3 3050.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21686.1 1430.8 L21680.8 1440.2 L21675.4 1430.8 L21680.8 1421.5 Z"></path>
+						<path d="M31454.9 2458.2 L31445.7 2463.9 L31445.5 2453.1 L31454.7 2447.5 Z"></path>
 					</g>
-					<path d="M15821.0 1455.7 L15821 1607 L15821 2220.5 L15821.0 2220.5 " fill="none"></path>
+					<path d="M31898.6 2458.0 L32500.75 2865 L26828.5 3049.6606371372463 L26828.5 3049.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15826.3 1446.3 L15821.0 1455.7 L15815.7 1446.3 L15821.0 1437.0 Z"></path>
+						<path d="M31893.8 2448.3 L31898.6 2458.0 L31887.9 2457.1 L31883.1 2447.5 Z"></path>
 					</g>
-					<path d="M15020.9 1039.9 L15821 1174 L15821 1344 L15821.0 1344.0 " fill="none"></path>
-					<path d="M15021.8 1034.7 L15020.9 1039.9 L15020.0 1045.2 L15007.8 1037.7 Z"></path>
-					<path d="M28268.8 1478.2 L28268.75 1607 L28168.901033386326 2137 L28168.9 2137.0 " fill="none"></path>
+					<path d="M31912.2 2457.7 L32540.75 2865 L34132 3045.5433460076047 L34132.0 3045.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28274.1 1468.8 L28268.8 1478.2 L28263.4 1468.8 L28268.8 1459.5 Z"></path>
+						<path d="M31907.3 2448.1 L31912.2 2457.7 L31901.5 2457.1 L31896.6 2447.5 Z"></path>
 					</g>
+					<path d="M41370.7 1434.3 L41418.5 1607 L31918.25 2213.773513060696 L31918.3 2213.8 " fill="none"></path>
+					<path d="M41375.8 1432.9 L41370.7 1434.3 L41365.5 1435.8 L41367.1 1421.5 Z"></path>
+					<path d="M37156.2 1528.0 L37061.25 1607 L31918.25 2196.136222910217 L31918.3 2196.1 " fill="none"></path>
+					<path d="M37159.6 1532.1 L37156.2 1528.0 L37152.8 1523.9 L37166.4 1519.5 Z"></path>
+					<path d="M26169.8 1550.7 L26104.25 1607 L31222.25 2195.953896816685 L31222.3 2196.0 " fill="none"></path>
+					<path d="M26173.3 1554.7 L26169.8 1550.7 L26166.3 1546.6 L26179.9 1542.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M30607.2 1030.2 L28268.75 1174 L28268.75 1321.5 L28268.8 1321.5 " fill="none"></path>
-					</g>
-					<path d="M30607.5 1035.5 L30607.2 1030.2 L30606.9 1024.9 L30620.5 1029.4 Z"></path>
-					<path d="M21240.3 1119.0 L21289.25 1174 L21289.25 1306.5 L21289.3 1306.5 " fill="none"></path>
-					<path d="M21244.3 1115.4 L21240.3 1119.0 L21236.3 1122.5 L21231.4 1109.0 Z"></path>
-					<path d="M22790.8 1440.2 L22790.75 1607 L26486.25 2170.7811059907835 L26486.3 2170.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22796.1 1430.8 L22790.8 1440.2 L22785.4 1430.8 L22790.8 1421.5 Z"></path>
+						<path d="M42387.0 1069.9 L42579.25 1174 L42579.25 1390.5 L42579.25 1390.5 L42579.25 1607 L42579.25 1607 L31918.25 2216.1169951857573 L31918.3 2216.1 " fill="none"></path>
 					</g>
-					<path d="M36688.7 2388.9 L36428.5 2865 L32498.25 3048.856932338371 L32498.3 3048.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36697.9 2383.2 L36688.7 2388.9 L36688.5 2378.1 L36697.7 2372.5 Z"></path>
+					<path d="M42389.6 1065.2 L42387.0 1069.9 L42384.5 1074.5 L42375.3 1063.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M17956.6 1419.3 L17939.25 1607 L31222.25 2219.9416036974544 L31222.3 2219.9 " fill="none"></path>
 					</g>
-					<path d="M36815.0 2390.5 L36946.25 2865 L34560.5 3047.4843125192247 L34560.5 3047.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36817.6 2380.1 L36815.0 2390.5 L36807.4 2382.9 L36810.0 2372.5 Z"></path>
+					<path d="M17961.9 1419.8 L17956.6 1419.3 L17951.3 1418.8 L17957.8 1406.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M27971.4 1043.1 L28631 1174 L28631 1390.5 L28631 1390.5 L28631 1607 L28631 1607 L31222.25 2161.5279408012248 L31222.3 2161.5 " fill="none"></path>
 					</g>
-					<path d="M37736.3 1432.7 L37850.25 1607 L37006.18799682035 2099.5 L37006.2 2099.5 " fill="none"></path>
-					<path d="M37740.8 1429.7 L37736.3 1432.7 L37731.8 1435.6 L37729.0 1421.5 Z"></path>
-					<path d="M40664.4 1549.9 L40741.75 1607 L37120.25 2180.8565310492504 L37120.3 2180.9 " fill="none"></path>
-					<path d="M40667.6 1545.6 L40664.4 1549.9 L40661.3 1554.2 L40653.7 1542.0 Z"></path>
-					<path d="M11659.5 3078.2 L10946.5 3238 L10946.5 3363.5 L10946.5 3363.5 " fill="none"></path>
-					<path d="M11660.7 3083.4 L11659.5 3078.2 L11658.3 3073.0 L11672.5 3075.3 Z"></path>
-					<path d="M35895.8 2442.7 L35755 2865 L33860 3048.545832251363 L33860.0 3048.5 " fill="none"></path>
+					<path d="M27972.5 1037.9 L27971.4 1043.1 L27970.4 1048.3 L27958.3 1040.5 Z"></path>
+					<path d="M17105.4 2280.1 L17213 2865 L13638.75 3043.7484413756115 L13638.8 3043.7 " fill="none"></path>
+					<path d="M17110.6 2279.1 L17105.4 2280.1 L17100.1 2281.1 L17103.0 2267.0 Z"></path>
+					<path d="M37866.0 2434.8 L37689.75 2865 L37689.75 3036 L37689.8 3036.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35903.8 2435.5 L35895.8 2442.7 L35893.7 2432.2 L35901.7 2425.0 Z"></path>
+						<path d="M37874.5 2428.2 L37866.0 2434.8 L37864.7 2424.1 L37873.1 2417.5 Z"></path>
 					</g>
-					<path d="M36008.9 2443.3 L36098.75 2865 L32709.5 3049.002656284113 L32709.5 3049.0 " fill="none"></path>
+					<path d="M37878.6 2435.1 L37729.75 2865 L32334.75 3049.9232677816576 L32334.8 3049.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36012.2 2433.0 L36008.9 2443.3 L36001.7 2435.2 L36005.0 2425.0 Z"></path>
+						<path d="M37886.7 2428.1 L37878.6 2435.1 L37876.6 2424.6 L37884.7 2417.5 Z"></path>
 					</g>
-					<path d="M36077.0 2441.4 L36308.5 2865 L36308.5 3051.5 L36308.5 3051.5 L36308.5 3238 L36308.5 3238 L36308.5 3394.5 L36308.5 3394.5 L36308.5 3551 L36308.5 3551 L30701.75 3586.1924369004996 L30701.8 3586.2 " fill="none"></path>
+					<path d="M37960.2 2436.1 L37987.5 2865 L37987.5 3051.5 L37987.5 3051.5 L37987.5 3238 L37987.5 3238 L37987.5 3394.5 L37987.5 3394.5 L37987.5 3551 L37987.5 3551 L36263.5 3585.518894529047 L36263.5 3585.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36077.2 2430.6 L36077.0 2441.4 L36067.8 2435.7 L36068.0 2425.0 Z"></path>
+						<path d="M37965.0 2426.5 L37960.2 2436.1 L37954.3 2427.2 L37959.0 2417.5 Z"></path>
 					</g>
-					<path d="M36089.8 2440.9 L36348.5 2865 L36348.5 3051.5 L36348.5 3051.5 L36348.5 3238 L36348.5 3238 L33120.75 3387.971906776516 L33120.8 3388.0 " fill="none"></path>
+					<path d="M38241.0 2427.7 L38910.5 2865 L38910.5 3051.5 L38910.5 3051.5 L38910.5 3238 L38910.5 3238 L38860.25 3279.2273918741807 L38860.3 3279.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36089.5 2430.2 L36089.8 2440.9 L36080.4 2435.7 L36080.1 2425.0 Z"></path>
+						<path d="M38236.1 2418.1 L38241.0 2427.7 L38230.3 2427.1 L38225.4 2417.5 Z"></path>
 					</g>
-					<path d="M36102.5 2440.5 L36388.5 2865 L34560.5 3046.293273065674 L34560.5 3046.3 " fill="none"></path>
+					<path d="M38252.7 2427.4 L38950.5 2865 L34237 3049.445604280319 L34237.0 3049.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36101.7 2429.8 L36102.5 2440.5 L36092.9 2435.7 L36092.1 2425.0 Z"></path>
+						<path d="M38247.7 2417.9 L38252.7 2427.4 L38242.0 2427.0 L38236.9 2417.5 Z"></path>
 					</g>
-					<path d="M38611.2 653.9 L39483 876 L39483 1025 L39483 1025 L39483 1174 L39483 1174 L39483 1390.5 L39483 1390.5 L39483 1607 L39483 1607 L36384.25 2161.0009237547074 L36384.3 2161.0 " fill="none"></path>
-					<path d="M38612.5 648.7 L38611.2 653.9 L38609.9 659.0 L38598.3 650.6 Z"></path>
-					<path d="M40838.1 1594.9 L40821.75 1607 L36384.25 2181.673152151534 L36384.3 2181.7 " fill="none"></path>
-					<path d="M40841.3 1599.2 L40838.1 1594.9 L40834.9 1590.6 L40848.8 1587.0 Z"></path>
+					<path d="M42549.2 602.2 L44512 876 L44512 1025 L44512 1025 L44512 1174 L44512 1174 L44512 1390.5 L44512 1390.5 L44512 1607 L44512 1607 L38493.5 2183.6831441846293 L38493.5 2183.7 " fill="none"></path>
+					<path d="M42549.9 596.9 L42549.2 602.2 L42548.5 607.5 L42536.0 600.3 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M36421.1 1056.3 L35964.75 1174 L35964.75 1390.5 L35964.75 1390.5 L35964.75 1607 L35964.75 1607 L35964.75 2047 L35964.8 2047.0 " fill="none"></path>
+						<path d="M42397.7 1069.2 L42619.25 1174 L42619.25 1390.5 L42619.25 1390.5 L42619.25 1607 L42619.25 1607 L38493.5 2162.4870765773 L38493.5 2162.5 " fill="none"></path>
 					</g>
-					<path d="M36422.4 1061.5 L36421.1 1056.3 L36419.8 1051.1 L36434.0 1053.0 Z"></path>
+					<path d="M42400.0 1064.4 L42397.7 1069.2 L42395.4 1074.0 L42385.6 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M20279.0 1415.9 L20108.5 1607 L35545.25 2219.358896334253 L35545.3 2219.4 " fill="none"></path>
+						<path d="M17961.9 1419.3 L17979.25 1607 L37401.5 2218.800996582074 L37401.5 2218.8 " fill="none"></path>
 					</g>
-					<path d="M20283.0 1419.5 L20279.0 1415.9 L20275.1 1412.4 L20287.9 1406.0 Z"></path>
+					<path d="M17967.2 1418.8 L17961.9 1419.3 L17956.6 1419.8 L17960.7 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M25589.5 1048.1 L25406.25 1174 L25406.25 1390.5 L25406.25 1390.5 L25406.25 1607 L25406.25 1607 L35545.25 2211.0091869110197 L35545.3 2211.0 " fill="none"></path>
+						<path d="M27975.6 1043.0 L28671 1174 L28671 1390.5 L28671 1390.5 L28671 1607 L28671 1607 L37401.5 2198.978062846979 L37401.5 2199.0 " fill="none"></path>
 					</g>
-					<path d="M25592.5 1052.4 L25589.5 1048.1 L25586.4 1043.7 L25600.5 1040.5 Z"></path>
-					<path d="M27960.5 551.1 L25295.5 876 L25295.5 926 L25295.5 926.0 " fill="none"></path>
-					<path d="M27961.2 556.3 L27960.5 551.1 L27959.9 545.8 L27973.8 549.4 Z"></path>
-					<path d="M41177.9 1604.9 L41178.5 1607 L41178.5 2236 L41178.5 2236 L41178.5 2865 L41178.5 2865 L35919.5 3048.946642910728 L35919.5 3048.9 " fill="none"></path>
+					<path d="M27976.6 1037.7 L27975.6 1043.0 L27974.6 1048.2 L27962.5 1040.5 Z"></path>
+					<path d="M12529.0 1466.3 L12410 1607 L11260.297098569157 2220.5 L11260.3 2220.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41180.4 1594.5 L41177.9 1604.9 L41170.1 1597.5 L41172.6 1587.0 Z"></path>
+						<path d="M12539.1 1462.6 L12529.0 1466.3 L12530.9 1455.7 L12541.0 1452.0 Z"></path>
 					</g>
-					<path d="M41217.0 1603.8 L41218.5 1607 L41218.5 2236 L41218.5 2236 L41218.5 2865 L41218.5 2865 L32498.25 3050.2994132224344 L32498.3 3050.3 " fill="none"></path>
+					<path d="M12657.7 1466.2 L12778 1607 L11556.852146263911 2220.5 L11556.9 2220.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41217.8 1593.1 L41217.0 1603.8 L41208.2 1597.7 L41208.9 1587.0 Z"></path>
+						<path d="M12655.7 1455.6 L12657.7 1466.2 L12647.6 1462.6 L12645.6 1452.0 Z"></path>
 					</g>
-					<path d="M31014.5 1491.5 L30962.5 1607 L11927.75 2234.1220684327 L11927.8 2234.1 " fill="none"></path>
+					<path d="M13108.2 1043.8 L12593 1174 L12593 1329 L12593.0 1329.0 " fill="none"></path>
+					<path d="M13109.6 1048.9 L13108.2 1043.8 L13106.9 1038.6 L13121.2 1040.5 Z"></path>
+					<path d="M33380.2 2374.8 L32580.75 2865 L26828.5 3049.685969442651 L26828.5 3049.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31023.2 1485.2 L31014.5 1491.5 L31013.5 1480.8 L31022.2 1474.5 Z"></path>
+						<path d="M33391.0 2374.4 L33380.2 2374.8 L33385.4 2365.3 L33396.1 2365.0 Z"></path>
 					</g>
-					<path d="M31264.8 1482.1 L31544 1607 L25663 2216.9173948887055 L25663.0 2216.9 " fill="none"></path>
+					<path d="M33737.7 2378.7 L34184.5 2865 L34184.5 3036 L34184.5 3036.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31258.5 1473.4 L31264.8 1482.1 L31254.1 1483.2 L31247.8 1474.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M30775.9 1059.0 L31060 1174 L31060 1306.5 L31060.0 1306.5 " fill="none"></path>
+						<path d="M33735.3 2368.3 L33737.7 2378.7 L33727.4 2375.5 L33725.0 2365.0 Z"></path>
 					</g>
-					<path d="M30777.9 1054.0 L30775.9 1059.0 L30773.9 1063.9 L30763.5 1053.9 Z"></path>
-					<path d="M29695.1 2381.3 L29425 2865 L32385.25 3048.0070854396286 L32385.3 3048.0 " fill="none"></path>
+					<path d="M41378.4 1433.6 L41458.5 1607 L33954.5 2208.1227712684667 L33954.5 2208.1 " fill="none"></path>
+					<path d="M41383.3 1431.4 L41378.4 1433.6 L41373.6 1435.8 L41372.8 1421.5 Z"></path>
+					<path d="M17118.2 2279.0 L17403.25 2865 L14127.75 3039.537357142857 L14127.8 3039.5 " fill="none"></path>
+					<path d="M17123.0 2276.7 L17118.2 2279.0 L17113.4 2281.3 L17112.3 2267.0 Z"></path>
+					<path d="M25605.5 2323.7 L25605.5 2865 L25627.91286863271 2885 L25627.9 2885.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29704.3 2375.7 L29695.1 2381.3 L29695.0 2370.5 L29704.2 2365.0 Z"></path>
+						<path d="M25610.8 2314.3 L25605.5 2323.7 L25600.2 2314.3 L25605.5 2305.0 Z"></path>
 					</g>
-					<path d="M29816.9 2383.0 L29950.25 2865 L34455.5 3049.351736053974 L34455.5 3049.4 " fill="none"></path>
+					<path d="M7505.8 541.5 L25605.5 876 L25605.5 1025 L25605.5 1025 L25605.5 1174 L25605.5 1174 L25605.5 1390.5 L25605.5 1390.5 L25605.5 1607 L25605.5 1607 L25605.5 2167 L25605.5 2167.0 " fill="none"></path>
+					<path d="M7505.9 536.2 L7505.8 541.5 L7505.7 546.9 L7492.5 541.3 Z"></path>
+					<path d="M34828.0 574.2 L34009.5 876 L34009.5 941 L34009.5 941.0 " fill="none"></path>
+					<path d="M34829.8 579.2 L34828.0 574.2 L34826.1 569.2 L34840.5 569.6 Z"></path>
+					<path d="M27860.3 1440.2 L27860.25 1607 L33258.5 2197.9069828148795 L33258.5 2197.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29819.6 2372.6 L29816.9 2383.0 L29809.3 2375.4 L29811.9 2365.0 Z"></path>
+						<path d="M27865.6 1430.8 L27860.3 1440.2 L27854.9 1430.8 L27860.3 1421.5 Z"></path>
 					</g>
-					<path d="M37751.9 1430.6 L37941.75 1607 L30124.25 2209.193068397526 L30124.3 2209.2 " fill="none"></path>
-					<path d="M37755.5 1426.7 L37751.9 1430.6 L37748.2 1434.5 L37742.1 1421.5 Z"></path>
-					<path d="M23405.8 1440.2 L23405.75 1607 L29428.25 2201.6397457028493 L29428.3 2201.6 " fill="none"></path>
+					<path d="M33714.6 1483.7 L33498 1607 L13015.25 2234.254457819594 L13015.3 2234.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23411.1 1430.8 L23405.8 1440.2 L23400.4 1430.8 L23405.8 1421.5 Z"></path>
+						<path d="M33725.4 1483.8 L33714.6 1483.7 L33720.1 1474.5 L33730.9 1474.5 Z"></path>
 					</g>
-					<path d="M41534.0 2323.7 L41534 2865 L32155.25 3046.0747560754676 L32155.3 3046.1 " fill="none"></path>
+					<path d="M33931.2 1491.0 L33992 1607 L34158.0413354531 2167 L34158.0 2167.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41539.3 2314.3 L41534.0 2323.7 L41528.7 2314.3 L41534.0 2305.0 Z"></path>
+						<path d="M33931.6 1480.3 L33931.2 1491.0 L33922.1 1485.2 L33922.5 1474.5 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M31677.8 1030.5 L33878.5 1174 L33878.5 1306.5 L33878.5 1306.5 " fill="none"></path>
 					</g>
-					<path d="M40587.5 559.2 L41534 876 L41534 1025 L41534 1025 L41534 1174 L41534 1174 L41534 1390.5 L41534 1390.5 L41534 1607 L41534 1607 L41534 2167 L41534.0 2167.0 " fill="none"></path>
-					<path d="M40589.2 554.2 L40587.5 559.2 L40585.8 564.3 L40574.8 555.0 Z"></path>
-					<path d="M31874.3 3236.7 L31874.25 3238 L31874.25 3394.5 L31874.25 3394.5 L31874.25 3551 L31874.25 3551 L30701.75 3585.0759312320915 L30701.8 3585.1 " fill="none"></path>
+					<path d="M31678.2 1025.2 L31677.8 1030.5 L31677.5 1035.9 L31664.5 1029.7 Z"></path>
+					<path d="M25814.5 3236.7 L25814.5 3238 L25814.5 3394.5 L25814.5 3394.5 L25814.5 3551 L25814.5 3551 L36165.5 3586.3327403846156 L36165.5 3586.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31879.6 3227.3 L31874.3 3236.7 L31868.9 3227.3 L31874.3 3218.0 Z"></path>
+						<path d="M25819.8 3227.3 L25814.5 3236.7 L25809.2 3227.3 L25814.5 3218.0 Z"></path>
 					</g>
-					<path d="M19601.4 2547.7 L20128.5 2865 L31593.25 3047.0382585190387 L31593.3 3047.0 " fill="none"></path>
-					<path d="M19604.2 2543.2 L19601.4 2547.7 L19598.7 2552.3 L19590.0 2540.9 Z"></path>
+					<path d="M23803.7 2503.4 L23102.75 2865 L25533.5 3032.1742878215173 L25533.5 3032.2 " fill="none"></path>
+					<path d="M23806.1 2508.2 L23803.7 2503.4 L23801.2 2498.7 L23815.5 2497.3 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M24062.0 2280.3 L24062 2865 L31593.25 3044.791753336107 L31593.3 3044.8 " fill="none"></path>
+						<path d="M26190.3 2280.3 L26190.25 2865 L26095.5 2912.028276779774 L26095.5 2912.0 " fill="none"></path>
 					</g>
-					<path d="M24067.3 2280.3 L24062.0 2280.3 L24056.7 2280.3 L24062.0 2267.0 Z"></path>
-					<path d="M11696.6 3087.9 L11359 3238 L11359 3348.5 L11359.0 3348.5 " fill="none"></path>
-					<path d="M11698.8 3092.8 L11696.6 3087.9 L11694.4 3083.0 L11708.8 3082.5 Z"></path>
-					<path d="M27961.0 568.9 L26978.25 876 L26978.25 941 L26978.3 941.0 " fill="none"></path>
-					<path d="M27962.6 574.0 L27961.0 568.9 L27959.4 563.8 L27973.8 565.0 Z"></path>
-					<path d="M31374.7 2498.3 L31011.75 2865 L33799 3049.481279389584 L33799.0 3049.5 " fill="none"></path>
+					<path d="M26195.6 2280.3 L26190.3 2280.3 L26184.9 2280.3 L26190.3 2267.0 Z"></path>
+					<path d="M39385.9 2502.6 L39256 2865 L37720.25 3047.8682362330405 L37720.3 3047.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31385.0 2495.4 L31374.7 2498.3 L31377.5 2487.9 L31387.8 2485.0 Z"></path>
+						<path d="M39394.1 2495.6 L39385.9 2502.6 L39384.1 2492.0 L39392.2 2485.0 Z"></path>
 					</g>
-					<path d="M31391.0 2498.7 L31051.75 2865 L32617.5 3046.177214208159 L32617.5 3046.2 " fill="none"></path>
+					<path d="M39529.3 2503.4 L39594 2865 L32334.75 3050.3256390951715 L32334.8 3050.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31401.2 2495.5 L31391.0 2498.7 L31393.4 2488.2 L31403.7 2485.0 Z"></path>
+						<path d="M39532.9 2493.2 L39529.3 2503.4 L39522.4 2495.1 L39526.0 2485.0 Z"></path>
 					</g>
-					<path d="M31432.5 2499.8 L31153.25 2865 L31153.25 2945 L31153.3 2945.0 " fill="none"></path>
+					<path d="M39546.3 2503.1 L39634 2865 L33174.75 3040.624175383606 L33174.8 3040.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31442.4 2495.7 L31432.5 2499.8 L31433.9 2489.2 L31443.8 2485.0 Z"></path>
+						<path d="M39549.3 2492.8 L39546.3 2503.1 L39538.9 2495.3 L39541.9 2485.0 Z"></path>
 					</g>
-					<path d="M31651.3 2503.6 L31674.25 2865 L32385.25 3037.770684039088 L32385.3 3037.8 " fill="none"></path>
+					<path d="M39563.2 2502.8 L39674 2865 L26828.5 3050.683285537126 L26828.5 3050.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31656.0 2494.0 L31651.3 2503.6 L31645.4 2494.7 L31650.1 2485.0 Z"></path>
+						<path d="M39565.5 2492.4 L39563.2 2502.8 L39555.3 2495.5 L39557.7 2485.0 Z"></path>
 					</g>
-					<path d="M31868.8 2498.9 L32195.25 2865 L32195.25 3051.5 L32195.25 3051.5 L32195.25 3238 L32195.25 3238 L32195.25 3394.5 L32195.25 3394.5 L32195.25 3551 L32195.25 3551 L30701.75 3585.3722852512155 L30701.8 3585.4 " fill="none"></path>
+					<path d="M39640.8 2501.0 L39859.5 2865 L39859.5 3051.5 L39859.5 3051.5 L39859.5 3238 L39859.5 3238 L39859.5 3394.5 L39859.5 3394.5 L39859.5 3551 L39859.5 3551 L36263.5 3586.022770919067 L36263.5 3586.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31866.5 2488.4 L31868.8 2498.9 L31858.6 2495.5 L31856.3 2485.0 Z"></path>
+						<path d="M39640.5 2490.3 L39640.8 2501.0 L39631.4 2495.7 L39631.1 2485.0 Z"></path>
 					</g>
-					<path d="M32092.0 2494.2 L32749.5 2865 L32749.5 3051.5 L32749.5 3051.5 L32749.5 3238 L32749.5 3238 L32839.75 3299.209642470206 L32839.8 3299.2 " fill="none"></path>
+					<path d="M39657.3 2500.5 L39899.5 2865 L39899.5 3051.5 L39899.5 3051.5 L39899.5 3238 L39899.5 3238 L38860.25 3375.861941089214 L38860.3 3375.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32086.5 2484.9 L32092.0 2494.2 L32081.2 2494.2 L32075.7 2485.0 Z"></path>
+						<path d="M39656.6 2489.8 L39657.3 2500.5 L39647.7 2495.7 L39647.0 2485.0 Z"></path>
 					</g>
-					<path d="M32101.6 2490.5 L32789.5 2865 L34455.5 3045.8024439918536 L34455.5 3045.8 " fill="none"></path>
+					<path d="M39673.8 2500.1 L39939.5 2865 L34237 3049.7986533449175 L34237.0 3049.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32096.0 2481.3 L32101.6 2490.5 L32090.9 2490.7 L32085.3 2481.6 Z"></path>
+						<path d="M39672.6 2489.4 L39673.8 2500.1 L39664.0 2495.7 L39662.8 2485.0 Z"></path>
 					</g>
-					<path d="M38611.2 650.5 L39523 876 L39523 1025 L39523 1025 L39523 1174 L39523 1174 L39523 1390.5 L39523 1390.5 L39523 1607 L39523 1607 L32085.25 2200.040057043258 L32085.3 2200.0 " fill="none"></path>
-					<path d="M38612.5 645.3 L38611.2 650.5 L38609.9 655.7 L38598.3 647.3 Z"></path>
-					<path d="M29750.7 1466.6 L30358.25 1607 L31183.25 2013.6810344827586 L31183.3 2013.7 " fill="none"></path>
-					<path d="M29751.9 1461.4 L29750.7 1466.6 L29749.5 1471.8 L29737.8 1463.6 Z"></path>
+					<path d="M42549.2 601.1 L44552 876 L44552 1025 L44552 1025 L44552 1174 L44552 1174 L44552 1390.5 L44552 1390.5 L44552 1607 L44552 1607 L39932.5 2180.0530519672616 L39932.5 2180.1 " fill="none"></path>
+					<path d="M42549.9 595.9 L42549.2 601.1 L42548.5 606.4 L42536.0 599.3 Z"></path>
+					<path d="M37180.8 1528.8 L37101.25 1607 L39030.5 2116.819661800231 L39030.5 2116.8 " fill="none"></path>
+					<path d="M37184.5 1532.7 L37180.8 1528.8 L37177.0 1525.0 L37190.3 1519.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M36549.4 1076.7 L36562.5 1174 L36562.5 1390.5 L36562.5 1390.5 L36562.5 1607 L36562.5 1607 L32085.25 2178.438187997768 L32085.3 2178.4 " fill="none"></path>
+						<path d="M42408.3 1068.7 L42659.25 1174 L42659.25 1390.5 L42659.25 1390.5 L42659.25 1607 L42659.25 1607 L39932.5 2146.7296042797575 L39932.5 2146.7 " fill="none"></path>
 					</g>
-					<path d="M36554.7 1076.0 L36549.4 1076.7 L36544.2 1077.4 L36547.7 1063.5 Z"></path>
+					<path d="M42410.3 1063.7 L42408.3 1068.7 L42406.2 1073.6 L42396.0 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M20283.1 1416.9 L20148.5 1607 L31183.25 2211.301656400322 L31183.3 2211.3 " fill="none"></path>
+						<path d="M17967.1 1418.8 L18019.25 1607 L39030.5 2222.7824202961015 L39030.5 2222.8 " fill="none"></path>
 					</g>
-					<path d="M20287.4 1420.0 L20283.1 1416.9 L20278.7 1413.8 L20290.8 1406.0 Z"></path>
+					<path d="M17972.2 1417.4 L17967.1 1418.8 L17962.0 1420.3 L17963.5 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M25594.4 1049.1 L25446.25 1174 L25446.25 1390.5 L25446.25 1390.5 L25446.25 1607 L25446.25 1607 L31183.25 2190.1565934065934 L31183.3 2190.2 " fill="none"></path>
+						<path d="M27979.8 1042.9 L28711 1174 L28711 1390.5 L28711 1390.5 L28711 1607 L28711 1607 L39030.5 2209.6614827538183 L39030.5 2209.7 " fill="none"></path>
 					</g>
-					<path d="M25597.9 1053.2 L25594.4 1049.1 L25591.0 1045.0 L25604.6 1040.5 Z"></path>
-					<path d="M31153.3 3176.7 L31153.25 3238 L32839.75 3382.4648330596606 L32839.8 3382.5 " fill="none"></path>
+					<path d="M27980.7 1037.6 L27979.8 1042.9 L27978.9 1048.1 L27966.7 1040.5 Z"></path>
+					<path d="M32774.8 3176.7 L32774.75 3238 L38579.25 3390.8013877207736 L38579.3 3390.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31158.6 3167.3 L31153.3 3176.7 L31147.9 3167.3 L31153.3 3158.0 Z"></path>
+						<path d="M32780.1 3167.3 L32774.8 3176.7 L32769.4 3167.3 L32774.8 3158.0 Z"></path>
 					</g>
-					<path d="M31571.8 3004.9 L32829.5 2865 L32085.25 2473.338632085338 L32085.3 2473.3 " fill="none"></path>
+					<path d="M33193.4 3040.7 L39979.5 2865 L39678.641494435615 2485 L39678.6 2485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31561.9 3000.7 L31571.8 3004.9 L31563.1 3011.3 L31553.3 3007.0 Z"></path>
+						<path d="M33183.9 3035.6 L33193.4 3040.7 L33184.2 3046.2 L33174.8 3041.1 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M36664.0 1054.3 L37160.25 1174 L37160.25 1390.5 L37160.25 1390.5 L37160.25 1607 L37160.25 1607 L37160.25 2236 L37160.25 2236 L37160.25 2865 L37160.25 2865 L31553.25 3039.0811553187946 L31553.3 3039.1 " fill="none"></path>
+						<path d="M42418.8 1068.2 L42699.25 1174 L42699.25 1390.5 L42699.25 1390.5 L42699.25 1607 L42699.25 1607 L42699.25 2236 L42699.25 2236 L42699.25 2865 L42699.25 2865 L33174.75 3043.983248526374 L33174.8 3044.0 " fill="none"></path>
 					</g>
-					<path d="M36665.2 1049.1 L36664.0 1054.3 L36662.7 1059.5 L36651.0 1051.2 Z"></path>
+					<path d="M42420.7 1063.2 L42418.8 1068.2 L42416.9 1073.2 L42406.3 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M20312.1 1418.5 L20381.75 1607 L20381.75 2236 L20381.75 2236 L20381.75 2865 L20381.75 2865 L30753.25 3044.5743164833125 L30753.3 3044.6 " fill="none"></path>
+						<path d="M17997.0 1412.8 L18326.25 1607 L18326.25 2236 L18326.25 2236 L18326.25 2865 L18326.25 2865 L32374.75 3046.336834273454 L32374.8 3046.3 " fill="none"></path>
 					</g>
-					<path d="M20317.1 1416.7 L20312.1 1418.5 L20307.1 1420.4 L20307.5 1406.0 Z"></path>
+					<path d="M17999.7 1408.2 L17997.0 1412.8 L17994.3 1417.4 L17985.5 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M25637.6 1052.2 L25703 1174 L25703 1390.5 L25703 1390.5 L25703 1607 L25703 1607 L25703 2236 L25703 2236 L25703 2865 L25703 2865 L30753.25 3037.8125544699783 L30753.3 3037.8 " fill="none"></path>
+						<path d="M27984.0 1042.7 L28751 1174 L28751 1390.5 L28751 1390.5 L28751 1607 L28751 1607 L28751 2236 L28751 2236 L28751 2865 L28751 2865 L32374.75 3032.9600807704255 L32374.8 3033.0 " fill="none"></path>
 					</g>
-					<path d="M25642.3 1049.7 L25637.6 1052.2 L25632.9 1054.8 L25631.3 1040.5 Z"></path>
-					<path d="M34121.8 2433.0 L33829.5 2865 L33829.5 3036 L33829.5 3036.0 " fill="none"></path>
+					<path d="M27984.9 1037.5 L27984.0 1042.7 L27983.1 1048.0 L27970.8 1040.5 Z"></path>
+					<path d="M43485.6 1583.6 L43456 1607 L43456 2236 L43456 2236 L43456 2865 L43456 2865 L37720.25 3050.5135269889442 L37720.3 3050.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34131.4 2428.2 L34121.8 2433.0 L34122.6 2422.2 L34132.2 2417.5 Z"></path>
+						<path d="M43496.3 1582.0 L43485.6 1583.6 L43489.7 1573.6 L43500.3 1572.0 Z"></path>
 					</g>
-					<path d="M34171.3 2434.7 L33990 2865 L32709.5 3045.0326045985676 L32709.5 3045.0 " fill="none"></path>
+					<path d="M43520.1 1584.7 L43496 1607 L43496 2236 L43496 2236 L43496 2865 L43496 2865 L31025 3050.37771490057 L31025.0 3050.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34179.8 2428.2 L34171.3 2434.7 L34170.0 2424.0 L34178.5 2417.5 Z"></path>
+						<path d="M43530.6 1582.3 L43520.1 1584.7 L43523.4 1574.4 L43533.8 1572.0 Z"></path>
 					</g>
-					<path d="M34305.9 2435.6 L34415.5 2865 L34415.5 3051.5 L34415.5 3051.5 L34415.5 3238 L34415.5 3238 L34415.5 3394.5 L34415.5 3394.5 L34415.5 3551 L34415.5 3551 L30701.75 3586.0377051358714 L30701.8 3586.0 " fill="none"></path>
+					<path d="M43554.9 1585.9 L43536 1607 L43536 2236 L43536 2236 L43536 2865 L43536 2865 L28671.25 3050.6134358837016 L28671.3 3050.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34308.8 2425.2 L34305.9 2435.6 L34298.5 2427.9 L34301.3 2417.5 Z"></path>
+						<path d="M43565.1 1582.5 L43554.9 1585.9 L43557.2 1575.4 L43567.4 1572.0 Z"></path>
 					</g>
-					<path d="M34363.7 2433.9 L34600.5 2865 L34600.5 3051.5 L34600.5 3051.5 L34600.5 3238 L34600.5 3238 L33120.75 3380.9291004474617 L33120.8 3380.9 " fill="none"></path>
+					<path d="M43590.1 1587.2 L43576 1607 L43576 2236 L43576 2236 L43576 2865 L43576 2865 L32334.75 3050.739938869078 L32334.8 3050.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34363.9 2423.1 L34363.7 2433.9 L34354.5 2428.2 L34354.7 2417.5 Z"></path>
+						<path d="M43599.8 1582.7 L43590.1 1587.2 L43591.1 1576.5 L43600.9 1572.0 Z"></path>
 					</g>
-					<path d="M34376.0 2433.4 L34640.5 2865 L34519.012064343166 3036 L34519.0 3036.0 " fill="none"></path>
+					<path d="M43939.9 1584.7 L43964 1607 L43964 1994.5 L43964.0 1994.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34375.7 2422.7 L34376.0 2433.4 L34366.6 2428.2 L34366.2 2417.5 Z"></path>
-					</g>
-					<path d="M38611.2 647.4 L39563 876 L39563 1025 L39563 1025 L39563 1174 L39563 1174 L39563 1390.5 L39563 1390.5 L39563 1607 L39563 1607 L34801 2171.298794272796 L34801.0 2171.3 " fill="none"></path>
-					<path d="M38612.5 642.2 L38611.2 647.4 L38610.0 652.5 L38598.3 644.2 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M36664.0 1052.5 L37200.25 1174 L37200.25 1390.5 L37200.25 1390.5 L37200.25 1607 L37200.25 1607 L34801 2119.3939393939395 L34801.0 2119.4 " fill="none"></path>
-					</g>
-					<path d="M36665.2 1047.3 L36664.0 1052.5 L36662.8 1057.7 L36651.0 1049.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M20316.8 1417.7 L20421.75 1607 L33709 2211.173296224676 L33709.0 2211.2 " fill="none"></path>
-					</g>
-					<path d="M20321.5 1415.1 L20316.8 1417.7 L20312.1 1420.2 L20310.3 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M25643.8 1050.9 L25743 1174 L25743 1390.5 L25743 1390.5 L25743 1607 L25743 1607 L33709 2195.652960526316 L33709.0 2195.7 " fill="none"></path>
+						<path d="M43936.6 1574.4 L43939.9 1584.7 L43929.4 1582.3 L43926.2 1572.0 Z"></path>
 					</g>
-					<path d="M25648.0 1047.5 L25643.8 1050.9 L25639.7 1054.2 L25635.5 1040.5 Z"></path>
-					<path d="M22131.8 1508.2 L22131.75 1607 L25295 2201.423556650982 L25295.0 2201.4 " fill="none"></path>
+					<path d="M44054.6 1581.5 L44098 1607 L39932.5 2174.551066825517 L39932.5 2174.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22137.1 1498.8 L22131.8 1508.2 L22126.4 1498.8 L22131.8 1489.5 Z"></path>
+						<path d="M44049.3 1572.1 L44054.6 1581.5 L44043.8 1581.3 L44038.5 1572.0 Z"></path>
 					</g>
-					<path d="M21318.9 1049.8 L22131.75 1174 L22131.75 1291.5 L22131.8 1291.5 " fill="none"></path>
-					<path d="M21319.7 1044.5 L21318.9 1049.8 L21318.1 1055.1 L21305.8 1047.8 Z"></path>
-					<path d="M16198.0 1455.7 L16198 1607 L16198 2220.5 L16198.0 2220.5 " fill="none"></path>
+					<path d="M44088.5 1580.7 L44138 1607 L38493.5 2180.522413375333 L38493.5 2180.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16203.3 1446.3 L16198.0 1455.7 L16192.7 1446.3 L16198.0 1437.0 Z"></path>
+						<path d="M44082.8 1571.7 L44088.5 1580.7 L44077.8 1581.1 L44072.0 1572.0 Z"></path>
 					</g>
-					<path d="M15021.0 1035.5 L16198 1174 L16198 1344 L16198.0 1344.0 " fill="none"></path>
-					<path d="M15021.6 1030.2 L15021.0 1035.5 L15020.4 1040.8 L15007.8 1033.9 Z"></path>
-					<path d="M30488.8 2465.5 L30378.25 2865 L33799 3049.8518290474467 L33799.0 3049.9 " fill="none"></path>
+					<path d="M44094.8 1566.8 L44178 1607 L42499.25 2107.739181979846 L42499.3 2107.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30496.4 2457.9 L30488.8 2465.5 L30486.1 2455.1 L30493.7 2447.5 Z"></path>
+						<path d="M44088.7 1557.9 L44094.8 1566.8 L44084.1 1567.5 L44078.0 1558.7 Z"></path>
 					</g>
-					<path d="M30689.5 2463.5 L30931.75 2865 L32385.25 3044.521688741722 L32385.3 3044.5 " fill="none"></path>
+					<path d="M44095.1 1552.5 L44218 1607 L31182.25 2216.389401906319 L31182.3 2216.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30689.2 2452.7 L30689.5 2463.5 L30680.1 2458.2 L30679.9 2447.5 Z"></path>
+						<path d="M44088.7 1543.8 L44095.1 1552.5 L44084.4 1553.5 L44078.0 1544.9 Z"></path>
 					</g>
-					<path d="M30703.7 2463.0 L30971.75 2865 L34455.5 3048.7311770943797 L34455.5 3048.7 " fill="none"></path>
+					<path d="M44095.6 1517.8 L44352 1607 L44352 2236 L44352 2236 L44352 2865 L44352 2865 L34237 3050.5370051635114 L34237.0 3050.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30702.9 2452.3 L30703.7 2463.0 L30694.0 2458.2 L30693.3 2447.5 Z"></path>
-					</g>
-					<path d="M37758.3 1429.8 L37981.75 1607 L30900.25 2206.5374520492633 L30900.3 2206.5 " fill="none"></path>
-					<path d="M37761.6 1425.6 L37758.3 1429.8 L37755.0 1434.0 L37747.8 1421.5 Z"></path>
-					<path d="M29750.8 1453.5 L30552.25 1607 L30552.25 2024.5 L30552.3 2024.5 " fill="none"></path>
-					<path d="M29751.8 1448.3 L29750.8 1453.5 L29749.8 1458.8 L29737.8 1451.0 Z"></path>
-					<path d="M40692.9 1549.3 L40781.75 1607 L30900.25 2214.60188670023 L30900.3 2214.6 " fill="none"></path>
-					<path d="M40695.8 1544.8 L40692.9 1549.3 L40690.0 1553.7 L40681.7 1542.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M36664.0 1051.0 L37240.25 1174 L37240.25 1390.5 L37240.25 1390.5 L37240.25 1607 L37240.25 1607 L30900.25 2203.270933014354 L30900.3 2203.3 " fill="none"></path>
+						<path d="M44088.6 1509.7 L44095.6 1517.8 L44085.1 1519.7 L44078.0 1511.6 Z"></path>
 					</g>
-					<path d="M36665.2 1045.7 L36664.0 1051.0 L36662.9 1056.2 L36651.0 1048.2 Z"></path>
+					<path d="M42549.2 600.2 L44592 876 L44592 1025 L44592 1025 L44592 1174 L44592 1174 L44078 1303.0962877030163 L44078.0 1303.1 " fill="none"></path>
+					<path d="M42549.9 594.9 L42549.2 600.2 L42548.5 605.4 L42536.0 598.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M20321.1 1416.7 L20461.75 1607 L30204.25 2214.3071205589417 L30204.3 2214.3 " fill="none"></path>
+						<path d="M42425.4 1066.5 L42739.25 1174 L43382 1314.4545798637396 L43382.0 1314.5 " fill="none"></path>
 					</g>
-					<path d="M20325.4 1413.6 L20321.1 1416.7 L20316.8 1419.9 L20313.2 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M25649.4 1049.6 L25783 1174 L25783 1390.5 L25783 1390.5 L25783 1607 L25783 1607 L30204.25 2190.1034753892122 L30204.3 2190.1 " fill="none"></path>
+					<path d="M42427.1 1061.4 L42425.4 1066.5 L42423.6 1071.5 L42412.8 1062.2 Z"></path>
+					<path d="M37348.7 1537.9 L37361.5 1607 L37361.5 2236 L37361.5 2236 L37361.5 2865 L37361.5 2865 L37361.5 3051.5 L37361.5 3051.5 L37361.5 3238 L37361.5 3238 L37361.5 3394.5 L37361.5 3394.5 L37361.5 3551 L37361.5 3551 L36263.5 3584.9834350479514 L36263.5 3585.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M37352.3 1527.7 L37348.7 1537.9 L37341.8 1529.6 L37345.3 1519.5 Z"></path>
 					</g>
-					<path d="M25653.0 1045.7 L25649.4 1049.6 L25645.8 1053.5 L25639.6 1040.5 Z"></path>
-					<path d="M25104.3 1440.2 L25104.25 1607 L30204.25 2195.821585903084 L30204.3 2195.8 " fill="none"></path>
+					<path d="M37656.0 1433.9 L38990.5 1607 L38990.5 2236 L38990.5 2236 L38990.5 2865 L38990.5 2865 L38990.5 3051.5 L38990.5 3051.5 L38990.5 3238 L38990.5 3238 L38860.25 3313.287626962142 L38860.3 3313.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25109.6 1430.8 L25104.3 1440.2 L25098.9 1430.8 L25104.3 1421.5 Z"></path>
+						<path d="M37647.4 1427.4 L37656.0 1433.9 L37646.1 1438.0 L37637.5 1431.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M30776.6 1039.3 L31574 1174 L31574 1329 L31574.0 1329.0 " fill="none"></path>
-					</g>
-					<path d="M30777.5 1034.0 L30776.6 1039.3 L30775.8 1044.6 L30763.5 1037.1 Z"></path>
-					<path d="M11778.5 3095.8 L11778.5 3238 L11778.5 3363.5 L11778.5 3363.5 " fill="none"></path>
-					<path d="M11783.8 3095.8 L11778.5 3095.8 L11773.2 3095.8 L11778.5 3082.5 Z"></path>
-					<path d="M9698.7 2292.2 L10238.25 2865 L11672.5 3038.665070605421 L11672.5 3038.7 " fill="none"></path>
-					<path d="M9702.6 2288.5 L9698.7 2292.2 L9694.8 2295.9 L9689.6 2282.5 Z"></path>
-					<path d="M11897.8 3054.6 L18970 3238 L18970 3363.5 L18970.0 3363.5 " fill="none"></path>
-					<path d="M11898.0 3049.3 L11897.8 3054.6 L11897.7 3059.9 L11884.5 3054.2 Z"></path>
-					<path d="M32068.0 1493.2 L32068 1607 L32373.80683624801 2122 L32373.8 2122.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32073.3 1483.8 L32068.0 1493.2 L32062.7 1483.8 L32068.0 1474.5 Z"></path>
+						<path d="M42425.5 1063.0 L42779.25 1174 L37637.5 1377.9647977646466 L37637.5 1378.0 " fill="none"></path>
 					</g>
+					<path d="M42427.1 1057.9 L42425.5 1063.0 L42423.9 1068.1 L42412.8 1059.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M30776.8 1034.2 L32068 1174 L32068 1306.5 L32068.0 1306.5 " fill="none"></path>
+						<path d="M27989.4 1042.6 L28803 1174 L37005.5 1382.4687738451605 L37005.5 1382.5 " fill="none"></path>
 					</g>
-					<path d="M30777.3 1028.9 L30776.8 1034.2 L30776.2 1039.5 L30763.5 1032.7 Z"></path>
+					<path d="M27990.3 1037.4 L27989.4 1042.6 L27988.6 1047.9 L27976.2 1040.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M30776.8 1031.7 L32565 1174 L32565 1390.5 L32565 1390.5 L32565 1607 L32565 1607 L32463.883147853736 2122 L32463.9 2122.0 " fill="none"></path>
+						<path d="M34828.4 581.9 L34178.5 876 L34178.5 1025 L34178.5 1025 L34178.5 1174 L34178.5 1174 L34178.5 1390.5 L34178.5 1390.5 L34178.5 1607 L34178.5 1607 L34178.5 2167 L34178.5 2167.0 " fill="none"></path>
 					</g>
-					<path d="M30777.2 1026.4 L30776.8 1031.7 L30776.4 1037.1 L30763.5 1030.7 Z"></path>
-					<path d="M38776.5 2495.5 L38674.25 2865 L33860 3050.3258940089786 L33860.0 3050.3 " fill="none"></path>
+					<path d="M34830.6 586.7 L34828.4 581.9 L34826.2 577.0 L34840.5 576.4 Z"></path>
+					<path d="M34627.3 1162.1 L34602.5 1174 L34602.5 1390.5 L34602.5 1390.5 L34602.5 1607 L34602.5 1607 L34602.5 2236 L34602.5 2236 L34602.5 2865 L34602.5 2865 L21826.5 3048.8876326451864 L21826.5 3048.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38784.1 2487.9 L38776.5 2495.5 L38773.8 2485.1 L38781.4 2477.5 Z"></path>
+						<path d="M34638.0 1162.9 L34627.3 1162.1 L34633.4 1153.2 L34644.1 1154.0 Z"></path>
 					</g>
-					<path d="M38911.8 2495.6 L39002.25 2865 L32498.25 3049.893834311409 L32498.3 3049.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38914.8 2485.3 L38911.8 2495.6 L38904.4 2487.8 L38907.4 2477.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M34920.3 599.3 L34912.5 876 L34912.5 896 L34912.5 896.0 " fill="none"></path>
 					</g>
-					<path d="M38928.2 2495.3 L39042.25 2865 L34560.5 3049.3406020841376 L34560.5 3049.3 " fill="none"></path>
+					<path d="M34925.6 599.5 L34920.3 599.3 L34915.0 599.2 L34920.7 586.0 Z"></path>
+					<path d="M34820.3 1165.1 L34814.5 1174 L34814.5 1306.5 L34814.5 1306.5 " fill="none"></path>
+					<path d="M34824.8 1168.1 L34820.3 1165.1 L34815.9 1162.2 L34827.7 1154.0 Z"></path>
+					<path d="M35192.9 1159.8 L35222.5 1174 L35222.5 1321.5 L35222.5 1321.5 " fill="none"></path>
+					<path d="M35195.2 1155.0 L35192.9 1159.8 L35190.6 1164.6 L35180.9 1154.0 Z"></path>
+					<path d="M35630.5 1553.2 L35630.5 1607 L21459.75 2234.7153999190127 L21459.8 2234.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38930.6 2484.8 L38928.2 2495.3 L38920.4 2488.0 L38922.7 2477.5 Z"></path>
+						<path d="M35635.8 1543.8 L35630.5 1553.2 L35625.2 1543.8 L35630.5 1534.5 Z"></path>
 					</g>
-					<path d="M38611.2 644.4 L39603 876 L39603 1025 L39603 1025 L39603 1174 L39603 1174 L39603 1390.5 L39603 1390.5 L39603 1607 L39603 1607 L39138.030802861686 1994.5 L39138.0 1994.5 " fill="none"></path>
-					<path d="M38612.4 639.2 L38611.2 644.4 L38610.0 649.6 L38598.3 641.3 Z"></path>
-					<path d="M38369.9 1583.6 L38340.25 1607 L38340.25 2236 L38340.25 2236 L38340.25 2865 L38340.25 2865 L33860 3050.238956936208 L33860.0 3050.2 " fill="none"></path>
+					<path d="M35509.6 1148.9 L35630.5 1174 L35630.5 1246.5 L35630.5 1246.5 " fill="none"></path>
+					<path d="M35510.6 1143.7 L35509.6 1148.9 L35508.5 1154.1 L35496.5 1146.2 Z"></path>
+					<path d="M36014.5 1493.2 L36014.5 1607 L36014.5 2220.5 L36014.5 2220.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38380.5 1582.0 L38369.9 1583.6 L38373.9 1573.6 L38384.5 1572.0 Z"></path>
+						<path d="M36019.8 1483.8 L36014.5 1493.2 L36009.2 1483.8 L36014.5 1474.5 Z"></path>
 					</g>
-					<path d="M38404.4 1584.7 L38380.25 1607 L38380.25 2236 L38380.25 2236 L38380.25 2865 L38380.25 2865 L28040.25 3050.1480965868177 L28040.3 3050.1 " fill="none"></path>
+					<path d="M35509.7 1105.7 L36014.5 1174 L36014.5 1306.5 L36014.5 1306.5 " fill="none"></path>
+					<path d="M35510.4 1100.5 L35509.7 1105.7 L35509.0 1111.0 L35496.5 1104.0 Z"></path>
+					<path d="M13003.0 1478.2 L13003 1607 L23815.5 2207.8536531495715 L23815.5 2207.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38414.9 1582.3 L38404.4 1584.7 L38407.6 1574.4 L38418.1 1572.0 Z"></path>
+						<path d="M13008.3 1468.8 L13003.0 1478.2 L12997.7 1468.8 L13003.0 1459.5 Z"></path>
 					</g>
-					<path d="M38439.2 1585.9 L38420.25 1607 L38420.25 2236 L38420.25 2236 L38420.25 2865 L38420.25 2865 L27849.25 3050.255732005262 L27849.3 3050.3 " fill="none"></path>
+					<path d="M13153.6 1049.0 L13003 1174 L13003 1321.5 L13003.0 1321.5 " fill="none"></path>
+					<path d="M13157.0 1053.1 L13153.6 1049.0 L13150.2 1044.9 L13163.8 1040.5 Z"></path>
+					<path d="M21845.2 3045.1 L23774.333333333332 2983 L24261.291666666668 2983 L24261.291666666668 2983 L24748.25 3051.5 L24748.25 3051.5 L24261.291666666668 3120 L24261.291666666668 3120 L23774.333333333332 3120 L23774.333333333332 3120 L21826.5 3057.3387993112087 L21826.5 3057.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38449.4 1582.5 L38439.2 1585.9 L38441.4 1575.4 L38451.6 1572.0 Z"></path>
+						<path d="M21835.7 3040.0 L21845.2 3045.1 L21836.0 3050.7 L21826.5 3045.7 Z"></path>
 					</g>
-					<path d="M38474.3 1587.2 L38460.25 1607 L38460.25 2236 L38460.25 2236 L38460.25 2865 L38460.25 2865 L32709.5 3050.020032776987 L32709.5 3050.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38484.1 1582.7 L38474.3 1587.2 L38475.4 1576.5 L38485.1 1572.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3725.6 2262.4 L4149.5 2865 L21463.5 3049.565231059415 L21463.5 3049.6 " fill="none"></path>
 					</g>
-					<path d="M38824.1 1584.7 L38848.25 1607 L38848.25 1994.5 L38848.3 1994.5 " fill="none"></path>
+					<path d="M3729.9 2259.3 L3725.6 2262.4 L3721.2 2265.5 L3717.9 2251.5 Z"></path>
+					<path d="M29380.8 1440.2 L29380.75 1607 L24828.5 2173.022288114653 L24828.5 2173.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38820.9 1574.4 L38824.1 1584.7 L38813.6 1582.3 L38810.4 1572.0 Z"></path>
+						<path d="M29386.1 1430.8 L29380.8 1440.2 L29375.4 1430.8 L29380.8 1421.5 Z"></path>
 					</g>
-					<path d="M38938.8 1581.5 L38982.25 1607 L32085.25 2197.3937125748503 L32085.3 2197.4 " fill="none"></path>
+					<path d="M13395.0 1455.7 L13395 1607 L23815.5 2206.8439187334125 L23815.5 2206.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38933.5 1572.1 L38938.8 1581.5 L38928.1 1581.3 L38922.8 1572.0 Z"></path>
+						<path d="M13400.3 1446.3 L13395.0 1455.7 L13389.7 1446.3 L13395.0 1437.0 Z"></path>
 					</g>
-					<path d="M38972.8 1580.7 L39022.25 1607 L34801 2163.9597252084536 L34801.0 2164.0 " fill="none"></path>
+					<path d="M13215.5 1048.2 L13395 1174 L13395 1344 L13395.0 1344.0 " fill="none"></path>
+					<path d="M13218.6 1043.8 L13215.5 1048.2 L13212.5 1052.5 L13204.6 1040.5 Z"></path>
+					<path d="M17266.3 1455.7 L17266.25 1607 L23815.5 2190.846968784325 L23815.5 2190.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38967.0 1571.7 L38972.8 1580.7 L38962.0 1581.1 L38956.3 1572.0 Z"></path>
+						<path d="M17271.6 1446.3 L17266.3 1455.7 L17260.9 1446.3 L17266.3 1437.0 Z"></path>
 					</g>
-					<path d="M38979.1 1566.8 L39062.25 1607 L38199.99244833068 2062 L38200.0 2062.0 " fill="none"></path>
+					<path d="M13271.8 1031.1 L15353.75 1174 L17090.25 1370.5763398692811 L17090.3 1370.6 " fill="none"></path>
+					<path d="M13272.2 1025.8 L13271.8 1031.1 L13271.4 1036.4 L13258.5 1030.2 Z"></path>
+					<path d="M24521.0 2862.8 L24521.75 2865 L21826.5 3039.7333362301206 L21826.5 3039.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38973.0 1557.9 L38979.1 1566.8 L38968.3 1567.5 L38962.3 1558.7 Z"></path>
+						<path d="M24523.3 2852.3 L24521.0 2862.8 L24513.1 2855.5 L24515.4 2845.0 Z"></path>
 					</g>
-					<path d="M38979.3 1552.5 L39102.25 1607 L36384.25 2151.8994422310757 L36384.3 2151.9 " fill="none"></path>
+					<path d="M24655.6 2861.5 L24657.5 2865 L26715.5 3046.516670607709 L26715.5 3046.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38972.9 1543.8 L38979.3 1552.5 L38968.6 1553.5 L38962.3 1544.9 Z"></path>
+						<path d="M24655.9 2850.7 L24655.6 2861.5 L24646.5 2855.7 L24646.8 2845.0 Z"></path>
 					</g>
-					<path d="M38979.9 1517.8 L39236.25 1607 L39236.25 2236 L39236.25 2236 L39236.25 2865 L39236.25 2865 L34560.5 3049.429202136097 L34560.5 3049.4 " fill="none"></path>
+					<path d="M24789.5 2859.9 L24793.25 2865 L24793.25 3051.5 L24793.25 3051.5 L24793.25 3238 L24793.25 3238 L24793.25 3394.5 L24793.25 3394.5 L24793.25 3551 L24793.25 3551 L36165.5 3586.3476961803653 L36165.5 3586.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38972.8 1509.7 L38979.9 1517.8 L38969.3 1519.7 L38962.3 1511.6 Z"></path>
-					</g>
-					<path d="M38611.3 641.5 L39643 876 L39643 1025 L39643 1025 L39643 1174 L39643 1174 L38962.25 1317.2635479951398 L38962.3 1317.3 " fill="none"></path>
-					<path d="M38612.4 636.3 L38611.3 641.5 L38610.1 646.7 L38598.3 638.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M36664.1 1049.6 L37280.25 1174 L38266.25 1334.0217391304348 L38266.3 1334.0 " fill="none"></path>
-					</g>
-					<path d="M36665.1 1044.3 L36664.1 1049.6 L36663.0 1054.8 L36651.0 1046.9 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M28150.0 551.6 L30692 876 L30692 994 L30692.0 994.0 " fill="none"></path>
-					</g>
-					<path d="M28150.7 546.3 L28150.0 551.6 L28149.3 556.9 L28136.8 549.9 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M30776.8 1031.1 L32774 1174 L32774 1329 L32774.0 1329.0 " fill="none"></path>
+						<path d="M24788.1 2849.3 L24789.5 2859.9 L24779.6 2855.7 L24778.3 2845.0 Z"></path>
 					</g>
-					<path d="M30777.2 1025.7 L30776.8 1031.1 L30776.4 1036.4 L30763.5 1030.1 Z"></path>
-					<path d="M12427.1 3032.6 L12737.666666666668 2998 L12819.958333333332 2998 L12819.958333333332 2998 L12902.25 3051.5 L12902.25 3051.5 L12819.958333333332 3105 L12819.958333333332 3105 L12737.666666666668 3105 L12737.666666666668 3105 L12408.5 3068.2861362056983 L12408.5 3068.3 " fill="none"></path>
+					<path d="M24841.5 2770.2 L24933.75 2865 L3685.75 3050.896326875264 L3685.8 3050.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12417.2 3028.4 L12427.1 3032.6 L12418.4 3039.0 L12408.5 3034.7 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M821.6 2260.2 L1522.5 2865 L12107.5 3048.8854734292768 L12107.5 3048.9 " fill="none"></path>
+						<path d="M24838.8 2759.8 L24841.5 2770.2 L24831.2 2767.2 L24828.5 2756.8 Z"></path>
 					</g>
-					<path d="M825.0 2256.2 L821.6 2260.2 L818.1 2264.2 L811.5 2251.5 Z"></path>
-					<path d="M33047.0 1112.7 L33047 1174 L33047 1375 L33047.0 1375.0 " fill="none"></path>
+					<path d="M24841.9 2737.8 L24973.75 2865 L34132 3050.4369758163016 L34132.0 3050.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33052.3 1103.3 L33047.0 1112.7 L33041.7 1103.3 L33047.0 1094.0 Z"></path>
+						<path d="M24838.9 2727.5 L24841.9 2737.8 L24831.5 2735.1 L24828.5 2724.8 Z"></path>
 					</g>
-					<path d="M28150.1 545.9 L33047 876 L33047 956 L33047.0 956.0 " fill="none"></path>
-					<path d="M28150.4 540.6 L28150.1 545.9 L28149.7 551.2 L28136.8 545.0 Z"></path>
-					<path d="M24602.6 2539.0 L24431.75 2865 L9317.75 3049.166541439352 L9317.8 3049.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24611.7 2533.2 L24602.6 2539.0 L24602.2 2528.3 L24611.3 2522.5 Z"></path>
+					<path d="M41385.8 1432.7 L41498.5 1607 L24828.5 2217.452071143714 L24828.5 2217.5 " fill="none"></path>
+					<path d="M41390.3 1429.8 L41385.8 1432.7 L41381.3 1435.6 L41378.5 1421.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M18000.2 1412.3 L18366.25 1607 L23815.5 2182.5074088066153 L23815.5 2182.5 " fill="none"></path>
 					</g>
-					<path d="M24968.2 2537.9 L25192.25 2865 L32385.25 3050.0464859645494 L32385.3 3050.0 " fill="none"></path>
+					<path d="M18002.7 1407.6 L18000.2 1412.3 L17997.7 1417.0 L17988.4 1406.0 Z"></path>
+					<path d="M30341.0 1447.7 L30341 1607 L24828.5 2183.0695298222295 L24828.5 2183.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24967.4 2527.2 L24968.2 2537.9 L24958.6 2533.2 L24957.7 2522.5 Z"></path>
+						<path d="M30346.3 1438.3 L30341.0 1447.7 L30335.7 1438.3 L30341.0 1429.0 Z"></path>
 					</g>
-					<path d="M24987.1 2537.4 L25232.25 2865 L34455.5 3050.4444249791122 L34455.5 3050.4 " fill="none"></path>
+					<path d="M37134.1 1036.9 L39057.5 1174 L39057.5 1375 L39057.5 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24985.8 2526.8 L24987.1 2537.4 L24977.2 2533.2 L24975.9 2522.5 Z"></path>
+						<path d="M37125.2 1031.0 L37134.1 1036.9 L37124.4 1041.6 L37115.5 1035.6 Z"></path>
 					</g>
-					<path d="M37764.5 1429.1 L38021.75 1607 L25255 2212.5908259648195 L25255.0 2212.6 " fill="none"></path>
-					<path d="M37767.6 1424.7 L37764.5 1429.1 L37761.5 1433.5 L37753.6 1421.5 Z"></path>
-					<path d="M16649.5 1470.7 L16649.5 1607 L24268 2197.734282544379 L24268.0 2197.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16654.8 1461.3 L16649.5 1470.7 L16644.2 1461.3 L16649.5 1452.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M35016.7 555.1 L36966.5 876 L36966.5 941 L36966.5 941.0 " fill="none"></path>
 					</g>
-					<path d="M15021.0 1032.7 L16649.5 1174 L16649.5 1329 L16649.5 1329.0 " fill="none"></path>
-					<path d="M15021.5 1027.4 L15021.0 1032.7 L15020.6 1038.1 L15007.8 1031.6 Z"></path>
-					<path d="M17168.5 1470.7 L17168.5 1607 L24268 2195.1187277755826 L24268.0 2195.1 " fill="none"></path>
+					<path d="M35017.5 549.8 L35016.7 555.1 L35015.8 560.3 L35003.5 552.9 Z"></path>
+					<path d="M26356.3 1097.7 L26356.25 1174 L26356.25 1239 L26356.3 1239.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17173.8 1461.3 L17168.5 1470.7 L17163.2 1461.3 L17168.5 1452.0 Z"></path>
+						<path d="M26361.6 1088.3 L26356.3 1097.7 L26350.9 1088.3 L26356.3 1079.0 Z"></path>
 					</g>
-					<path d="M15021.1 1030.9 L17168.5 1174 L17168.5 1329 L17168.5 1329.0 " fill="none"></path>
-					<path d="M15021.4 1025.6 L15021.1 1030.9 L15020.7 1036.3 L15007.8 1030.1 Z"></path>
-					<path d="M26023.3 1513.6 L25975 1607 L25975 2220.5 L25975.0 2220.5 " fill="none"></path>
+					<path d="M7505.8 541.4 L26356.25 876 L26356.25 971 L26356.3 971.0 " fill="none"></path>
+					<path d="M7505.9 536.1 L7505.8 541.4 L7505.7 546.8 L7492.5 541.2 Z"></path>
+					<path d="M26387.6 1560.4 L26396.25 1607 L26396.25 2236 L26396.25 2236 L26396.25 2865 L26396.25 2865 L26740.77144772118 3036 L26740.8 3036.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26032.4 1507.7 L26023.3 1513.6 L26022.9 1502.8 L26031.9 1497.0 Z"></path>
+						<path d="M26391.2 1550.2 L26387.6 1560.4 L26380.7 1552.1 L26384.2 1542.0 Z"></path>
 					</g>
-					<path d="M26211.0 1510.0 L26311.75 1607 L22606.75 2228.700680272109 L22606.8 2228.7 " fill="none"></path>
+					<path d="M26418.7 1559.5 L26436.25 1607 L26436.25 2236 L26436.25 2236 L26436.25 2865 L26436.25 2865 L13057.75 3050.32255728451 L13057.8 3050.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26208.0 1499.6 L26211.0 1510.0 L26200.6 1507.3 L26197.6 1497.0 Z"></path>
+						<path d="M26420.5 1548.9 L26418.7 1559.5 L26410.5 1552.6 L26412.2 1542.0 Z"></path>
 					</g>
-					<path d="M26452.5 1510.0 L26351.75 1607 L26351.75 2220.5 L26351.8 2220.5 " fill="none"></path>
+					<path d="M15340.0 1401.6 L17097.25 1607 L17097.25 2205 L17097.3 2205.0 " fill="none"></path>
+					<path d="M15340.6 1396.3 L15340.0 1401.6 L15339.4 1406.9 L15326.8 1400.1 Z"></path>
+					<path d="M31053.5 1470.2 L31053.5 1607 L13895.25 2233.371599367392 L13895.3 2233.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26462.9 1507.3 L26452.5 1510.0 L26455.5 1499.6 L26465.9 1497.0 Z"></path>
+						<path d="M31058.8 1460.8 L31053.5 1470.2 L31048.2 1460.8 L31053.5 1451.5 Z"></path>
 					</g>
-					<path d="M26818.1 1505.0 L27033.25 1607 L22606.75 2229.8788590604026 L22606.8 2229.9 " fill="none"></path>
+					<path d="M28462.0 2285.7 L28462 2865 L14646.75 3049.5232395753137 L14646.8 3049.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26811.9 1496.2 L26818.1 1505.0 L26807.3 1505.8 L26801.2 1497.0 Z"></path>
+						<path d="M28467.3 2276.3 L28462.0 2285.7 L28456.7 2276.3 L28462.0 2267.0 Z"></path>
 					</g>
-					<path d="M9335.9 3000.9 L9347.75 2998 L9355.25 2998 L9355.25 2998 L9362.75 3051.5 L9362.75 3051.5 L9355.25 3105 L9355.25 3105 L9347.75 3105 L9347.75 3105 L9317.75 3097.7539503386006 L9317.8 3097.8 " fill="none"></path>
+					<path d="M31383.5 1463.2 L31383.5 1607 L13480.25 2234.7552365688803 L13480.3 2234.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9325.6 2997.9 L9335.9 3000.9 L9328.1 3008.2 L9317.8 3005.2 Z"></path>
+						<path d="M31388.8 1453.8 L31383.5 1463.2 L31378.2 1453.8 L31383.5 1444.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M822.8 2259.9 L1562.5 2865 L8934.75 3046.778168897703 L8934.8 3046.8 " fill="none"></path>
+					<path d="M17928.7 2443.1 L17825.75 2865 L30874 3050.4270787694068 L30874.0 3050.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M17936.1 2435.3 L17928.7 2443.1 L17925.7 2432.8 L17933.1 2425.0 Z"></path>
 					</g>
-					<path d="M826.1 2255.8 L822.8 2259.9 L819.4 2264.1 L812.4 2251.5 Z"></path>
-					<path d="M29009.2 2323.0 L28856.5 2865 L32385.25 3048.5609441461543 L32385.3 3048.6 " fill="none"></path>
+					<path d="M17959.4 2443.6 L17919.25 2865 L28529.25 3050.260275255126 L28529.3 3050.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29016.9 2315.4 L29009.2 2323.0 L29006.6 2312.5 L29014.3 2305.0 Z"></path>
+						<path d="M17965.6 2434.8 L17959.4 2443.6 L17955.0 2433.8 L17961.2 2425.0 Z"></path>
 					</g>
-					<path d="M29081.4 2321.3 L29385 2865 L29385 3036 L29385.0 3036.0 " fill="none"></path>
+					<path d="M17972.6 2443.7 L17959.25 2865 L14310.75 3047.9153897849465 L14310.8 3047.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29081.5 2310.5 L29081.4 2321.3 L29072.2 2315.7 L29072.3 2305.0 Z"></path>
+						<path d="M17978.3 2434.5 L17972.6 2443.7 L17967.6 2434.2 L17973.2 2425.0 Z"></path>
 					</g>
-					<path d="M41520.5 120.3 L41520.5 203 L41520.5 493 L41520.5 493.0 " fill="none"></path>
-					<path d="M41525.8 120.3 L41520.5 120.3 L41515.2 120.3 L41520.5 107.0 Z"></path>
-					<path d="M27262.0 1484.7 L27073.25 1607 L25255 2101.7244511733534 L25255.0 2101.7 " fill="none"></path>
+					<path d="M17985.9 2443.7 L17999.25 2865 L32242.75 3050.899629098289 L32242.8 3050.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27272.7 1484.1 L27262.0 1484.7 L27266.9 1475.1 L27277.7 1474.5 Z"></path>
+						<path d="M17990.9 2434.2 L17985.9 2443.7 L17980.2 2434.5 L17985.3 2425.0 Z"></path>
 					</g>
-					<path d="M27454.8 1491.4 L27509.25 1607 L27509.25 2220.5 L27509.3 2220.5 " fill="none"></path>
+					<path d="M17999.1 2443.6 L18039.25 2865 L13057.75 3048.3711141813874 L13057.8 3048.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27455.6 1480.7 L27454.8 1491.4 L27446.0 1485.2 L27446.8 1474.5 Z"></path>
+						<path d="M18003.5 2433.8 L17999.1 2443.6 L17992.9 2434.8 L17997.3 2425.0 Z"></path>
 					</g>
-					<path d="M11897.8 3054.5 L19318 3238 L19318 3356 L19318.0 3356.0 " fill="none"></path>
-					<path d="M11898.0 3049.1 L11897.8 3054.5 L11897.7 3059.8 L11884.5 3054.1 Z"></path>
-					<path d="M37804.7 2427.7 L37655.25 2865 L33860 3050.0131673528067 L33860.0 3050.0 " fill="none"></path>
+					<path d="M18029.8 2443.1 L18132.75 2865 L14835.75 3047.37891146374 L14835.8 3047.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37812.8 2420.6 L37804.7 2427.7 L37802.7 2417.1 L37810.8 2410.0 Z"></path>
+						<path d="M18032.8 2432.8 L18029.8 2443.1 L18022.4 2435.3 L18025.4 2425.0 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M7003.2 1417.7 L7107 1607 L17672.25 2218.238910988986 L17672.3 2218.2 " fill="none"></path>
+					</g>
+					<path d="M7007.8 1415.1 L7003.2 1417.7 L6998.5 1420.3 L6996.8 1406.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3727.0 2262.1 L4189.5 2865 L14350.75 3048.8225986371463 L14350.8 3048.8 " fill="none"></path>
 					</g>
-					<path d="M37845.8 2428.5 L37790.25 2865 L32709.5 3049.8266201784754 L32709.5 3049.8 " fill="none"></path>
+					<path d="M3731.2 2258.8 L3727.0 2262.1 L3722.8 2265.3 L3718.9 2251.5 Z"></path>
+					<path d="M32095.8 1548.9 L32047.75 1607 L32047.75 2220.5 L32047.8 2220.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37852.2 2419.9 L37845.8 2428.5 L37841.7 2418.6 L37848.1 2410.0 Z"></path>
+						<path d="M32105.9 1545.1 L32095.8 1548.9 L32097.6 1538.3 L32107.7 1534.5 Z"></path>
 					</g>
-					<path d="M37858.0 2428.6 L37830.25 2865 L33721.25 3034.1487694514954 L33721.3 3034.1 " fill="none"></path>
+					<path d="M32329.3 1550.2 L32365.75 1607 L32365.75 2220.5 L32365.8 2220.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37863.9 2419.7 L37858.0 2428.6 L37853.3 2419.0 L37859.2 2410.0 Z"></path>
+						<path d="M32328.7 1539.5 L32329.3 1550.2 L32319.8 1545.2 L32319.2 1534.5 Z"></path>
 					</g>
-					<path d="M37917.6 2428.1 L38025.25 2865 L38025.25 3051.5 L38025.25 3051.5 L38025.25 3238 L38025.25 3238 L38025.25 3394.5 L38025.25 3394.5 L38025.25 3551 L38025.25 3551 L30701.75 3586.264055612072 L30701.8 3586.3 " fill="none"></path>
+					<path d="M32455.2 1545.0 L32547 1607 L13480.25 2234.831053933437 L13480.3 2234.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37920.5 2417.8 L37917.6 2428.1 L37910.2 2420.3 L37913.1 2410.0 Z"></path>
+						<path d="M32450.5 1535.3 L32455.2 1545.0 L32444.5 1544.1 L32439.8 1534.5 Z"></path>
 					</g>
-					<path d="M37929.7 2427.8 L38065.25 2865 L38065.25 3051.5 L38065.25 3051.5 L38065.25 3238 L38065.25 3238 L33120.75 3390.175860373648 L33120.8 3390.2 " fill="none"></path>
+					<path d="M32482.4 1544.1 L32587 1607 L18286.25 2222.780784172785 L18286.3 2222.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37932.1 2417.3 L37929.7 2427.8 L37921.9 2420.5 L37924.2 2410.0 Z"></path>
+						<path d="M32477.1 1534.7 L32482.4 1544.1 L32471.6 1543.9 L32466.4 1534.5 Z"></path>
 					</g>
-					<path d="M37941.8 2427.5 L38105.25 2865 L34560.5 3048.778129126416 L34560.5 3048.8 " fill="none"></path>
+					<path d="M2853.7 2952.2 L2867 2945.5 L2874.5 2945.5 L2874.5 2945.5 L2882 3051.5 L2882 3051.5 L2874.5 3157.5 L2874.5 3157.5 L2867 3157.5 L2867 3157.5 L2837 3142.393111638955 L2837.0 3142.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37943.5 2416.9 L37941.8 2427.5 L37933.5 2420.6 L37935.3 2410.0 Z"></path>
+						<path d="M2842.9 2951.6 L2853.7 2952.2 L2847.7 2961.2 L2837.0 2960.6 Z"></path>
 					</g>
-					<path d="M38611.3 638.9 L39683 876 L39683 1025 L39683 1025 L39683 1174 L39683 1174 L39683 1390.5 L39683 1390.5 L39683 1607 L39683 1607 L38300.25 2086.7957523100263 L38300.3 2086.8 " fill="none"></path>
-					<path d="M38612.4 633.6 L38611.3 638.9 L38610.1 644.1 L38598.3 636.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M36664.1 1048.3 L37320.25 1174 L37320.25 1390.5 L37320.25 1390.5 L37320.25 1607 L37320.25 1607 L37718.10373608903 2062 L37718.1 2062.0 " fill="none"></path>
+						<path d="M3733.2 2260.6 L4376.5 2865 L2837 3031.928343023256 L2837.0 3031.9 " fill="none"></path>
 					</g>
-					<path d="M36665.1 1043.1 L36664.1 1048.3 L36663.1 1053.5 L36651.0 1045.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M25654.5 1048.5 L25823 1174 L25823 1390.5 L25823 1390.5 L25823 1607 L25823 1607 L37440.25 2213.5492332275 L37440.3 2213.5 " fill="none"></path>
+					<path d="M3736.9 2256.7 L3733.2 2260.6 L3729.6 2264.5 L3723.5 2251.5 Z"></path>
+					<path d="M30071.0 2352.5 L29929.25 2865 L37659.25 3050.7670253205333 L37659.3 3050.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M30078.7 2344.9 L30071.0 2352.5 L30068.4 2342.1 L30076.0 2334.5 Z"></path>
 					</g>
-					<path d="M25657.7 1044.2 L25654.5 1048.5 L25651.3 1052.7 L25643.8 1040.5 Z"></path>
-					<path d="M33299.8 3176.7 L33299.75 3238 L33120.75 3325.679186228482 L33120.8 3325.7 " fill="none"></path>
+					<path d="M30137.4 2352.4 L30287.5 2865 L30287.5 3036 L30287.5 3036.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33305.1 3167.3 L33299.8 3176.7 L33294.4 3167.3 L33299.8 3158.0 Z"></path>
+						<path d="M30139.8 2342.0 L30137.4 2352.4 L30129.6 2345.0 L30132.1 2334.5 Z"></path>
 					</g>
-					<path d="M33739.9 3034.6 L38145.25 2865 L37946.32313195548 2410 L37946.3 2410.0 " fill="none"></path>
+					<path d="M30182.0 2349.9 L30538.5 2865 L30538.5 3036 L30538.5 3036.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33730.4 3029.6 L33739.9 3034.6 L33730.8 3040.2 L33721.3 3035.3 Z"></path>
+						<path d="M30181.1 2339.1 L30182.0 2349.9 L30172.3 2345.2 L30171.4 2334.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M36664.1 1047.2 L37360.25 1174 L37360.25 1390.5 L37360.25 1390.5 L37360.25 1607 L37360.25 1607 L37360.25 2236 L37360.25 2236 L37360.25 2865 L37360.25 2865 L33721.25 3032.1403768008868 L33721.3 3032.1 " fill="none"></path>
+					<path d="M13271.8 1030.7 L15530.25 1174 L17482.25 1380.2508540751587 L17482.3 1380.3 " fill="none"></path>
+					<path d="M13272.1 1025.3 L13271.8 1030.7 L13271.5 1036.0 L13258.5 1029.8 Z"></path>
+					<g data-name="IAppDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
+							<rect x="33253.0" y="60.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
+							<path d="M33253.0 91.5 L33450.0 91.5" fill="none" data-name="IAppDelegate"></path>
+						</g>
+						<g transform="translate(33253, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
+								
+							</g>
+						</g>
+						<g transform="translate(33253, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
+								
+							</g>
+						</g>
 					</g>
-					<path d="M36665.1 1041.9 L36664.1 1047.2 L36663.2 1052.4 L36651.0 1044.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M20325.1 1415.8 L20501.75 1607 L20501.75 2236 L20501.75 2236 L20501.75 2865 L20501.75 2865 L32878.25 3045.3576535396155 L32878.3 3045.4 " fill="none"></path>
+					<g data-name="AppController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
+							<rect x="398.8" y="2159.5" height="153.0" width="340.0" data-name="AppController"></rect>
+							<path d="M398.8 2190.5 L738.8 2190.5" fill="none" data-name="AppController"></path>
+							<path d="M398.8 2266.5 L738.8 2266.5" fill="none" data-name="AppController"></path>
+						</g>
+						<g transform="translate(398.75, 2159.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
+								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
+								
+							</g>
+						</g>
+						<g transform="translate(398.75, 2190.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+sharedPreferences: SharedPreferences</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
+								
+							</g>
+						</g>
+						<g transform="translate(398.75, 2266.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
+								
+							</g>
+						</g>
 					</g>
-					<path d="M20329.0 1412.2 L20325.1 1415.8 L20321.2 1419.4 L20316.1 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M25732.8 1032.1 L27917.75 1174 L27917.75 1390.5 L27917.75 1390.5 L27917.75 1607 L27917.75 1607 L27917.75 2236 L27917.75 2236 L27917.75 2865 L27917.75 2865 L32878.25 3036.8939520624303 L32878.3 3036.9 " fill="none"></path>
+					<g data-name="SharedPreferences">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SharedPreferences">
+							<rect x="15061.8" y="3036.0" height="31.0" width="169.0" data-name="SharedPreferences"></rect>
+						</g>
+						<g transform="translate(15061.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SharedPreferences">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SharedPreferences">
+								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="SharedPreferences">SharedPreferences</text>
+								
+							</g>
+						</g>
 					</g>
-					<path d="M25733.2 1026.8 L25732.8 1032.1 L25732.5 1037.5 L25719.5 1031.3 Z"></path>
-					<path d="M27738.8 1476.4 L27677.25 1607 L27677.25 2236 L27677.25 2236 L27677.25 2865 L27677.25 2865 L12408.5 3049.6796617864034 L12408.5 3049.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M27747.6 1470.2 L27738.8 1476.4 L27737.9 1465.7 L27746.7 1459.5 Z"></path>
+					<g data-name="ParticipantDetailsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsFormView">
+							<rect x="0.0" y="1344.0" height="93.0" width="419.0" data-name="ParticipantDetailsFormView"></rect>
+							<path d="M0.0 1375.0 L419.0 1375.0" fill="none" data-name="ParticipantDetailsFormView"></path>
+							<path d="M0.0 1406.0 L419.0 1406.0" fill="none" data-name="ParticipantDetailsFormView"></path>
+						</g>
+						<g transform="translate(0, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsFormView">
+								<text x="201.5" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsFormView">ParticipantDetailsFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(0, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormView">+formViewModel: ParticipantDetailsFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(0, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormView">+Widget build()</text>
+								
+							</g>
+						</g>
 					</g>
-					<path d="M27799.1 1477.7 L27828.5 1607 L13614.75 2233.663308041425 L13614.8 2233.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M27802.2 1467.4 L27799.1 1477.7 L27791.8 1469.8 L27794.9 1459.5 Z"></path>
+					<g data-name="ParticipantDetailsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsFormViewModel">
+							<rect x="15848.3" y="2152.0" height="168.0" width="354.0" data-name="ParticipantDetailsFormViewModel"></rect>
+							<path d="M15848.3 2183.0 L16202.3 2183.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
+							<path d="M15848.3 2259.0 L16202.3 2259.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
+						</g>
+						<g transform="translate(15848.25, 2152)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsFormViewModel">
+								<text x="169.0" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsFormViewModel">ParticipantDetailsFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(15848.25, 2183)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+participantIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+rawDataControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(15848.25, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+void initControls()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+StudyMonitorItem buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+void setControlsFrom()</text>
+								
+							</g>
+						</g>
 					</g>
-					<path d="M15021.1 1030.1 L17545 1174 L17545 1359.5 L17545.0 1359.5 " fill="none"></path>
-					<path d="M15021.4 1024.8 L15021.1 1030.1 L15020.8 1035.4 L15007.8 1029.3 Z"></path>
-					<g data-name="SignupForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
-							<rect x="0.0" y="2174.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
-							<path d="M0.0 2205.5 L278.0 2205.5" fill="none" data-name="SignupForm"></path>
-							<path d="M0.0 2236.5 L278.0 2236.5" fill="none" data-name="SignupForm"></path>
+					<g data-name="FormConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
+							<rect x="7300.5" y="524.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
 						</g>
-						<g transform="translate(0, 2174.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
-								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
+						<g transform="translate(7300.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
+								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 2205.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
+					</g>
+					<g data-name="StudyMonitorScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
+							<rect x="12581.3" y="2182.5" height="107.0" width="280.0" data-name="StudyMonitorScreen"></rect>
+							<path d="M12581.3 2213.5 L12861.3 2213.5" fill="none" data-name="StudyMonitorScreen"></path>
+						</g>
+						<g transform="translate(12581.25, 2182.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
+								<text x="132.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 2236.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
+						<g transform="translate(12581.25, 2213.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorScreen">-Widget _monitorSectionHeader()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorScreen">-Widget _buildStat()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorScreen">-dynamic _onSelectParticipant()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthFormKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
-							<rect x="2137.8" y="2968.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
-							<path d="M2137.8 2999.0 L2492.8 2999.0" fill="none" data-name="AuthFormKey"></path>
+					<g data-name="StudyPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
+							<rect x="15162.8" y="1344.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
+							<path d="M15162.8 1375.0 L15326.8 1375.0" fill="none" data-name="StudyPageWidget"></path>
+							<path d="M15162.8 1406.0 L15326.8 1406.0" fill="none" data-name="StudyPageWidget"></path>
 						</g>
-						<g transform="translate(2137.75, 2968)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
-								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
+						<g transform="translate(15162.75, 1344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2137.75, 2999)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
+						<g transform="translate(15162.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(15162.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConsumerRefWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="727.8" y="1375.0" height="31.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
+					<g data-name="StudyMonitorItem">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorItem">
+							<rect x="33863.5" y="410.5" height="258.0" width="371.0" data-name="StudyMonitorItem"></rect>
+							<path d="M33863.5 441.5 L34234.5 441.5" fill="none" data-name="StudyMonitorItem"></path>
+							<path d="M33863.5 637.5 L34234.5 637.5" fill="none" data-name="StudyMonitorItem"></path>
 						</g>
-						<g transform="translate(727.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
+						<g transform="translate(33863.5, 410.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorItem">
+								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorItem">StudyMonitorItem</text>
+								
+							</g>
+						</g>
+						<g transform="translate(33863.5, 441.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">+participantId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorItem">+inviteCode: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorItem">+enrolledAt: DateTime</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorItem">+lastActivityAt: DateTime</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyMonitorItem">+currentDayOfStudy: int</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyMonitorItem">+studyDurationInDays: int</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyMonitorItem">+completedInterventions: int</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyMonitorItem">+missedInterventions: int</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyMonitorItem">+completedSurveys: int</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyMonitorItem">+missedSurveys: int</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyMonitorItem">+rawData: String</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyMonitorItem">+props: List&lt;Object?&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(33863.5, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">&lt;static&gt;+List&lt;StudyMonitorItem&gt; fromStudy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthFormController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
-							<rect x="32819.0" y="1934.5" height="603.0" width="850.0" data-name="AuthFormController"></rect>
-							<path d="M32819.0 1965.5 L33669.0 1965.5" fill="none" data-name="AuthFormController"></path>
-							<path d="M32819.0 2266.5 L33669.0 2266.5" fill="none" data-name="AuthFormController"></path>
+					<g data-name="Equatable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
+							<rect x="34321.5" y="76.0" height="31.0" width="96.0" data-name="Equatable"></rect>
 						</g>
-						<g transform="translate(32819, 1934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
-								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
+						<g transform="translate(34321.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
+								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32819, 1965.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+sharedPreferences: SharedPreferences</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">+rememberMeControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="AuthFormController">+shouldRemember: bool</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
+					</g>
+					<g data-name="StudyMonitorTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorTable">
+							<rect x="33490.0" y="15.0" height="153.0" width="395.0" data-name="StudyMonitorTable"></rect>
+							<path d="M33490.0 46.0 L33885.0 46.0" fill="none" data-name="StudyMonitorTable"></path>
+							<path d="M33490.0 92.0 L33885.0 92.0" fill="none" data-name="StudyMonitorTable"></path>
+						</g>
+						<g transform="translate(33490, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorTable">
+								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorTable">StudyMonitorTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32819, 2266.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">-void _setRememberMe()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">-void _delRememberMe()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="AuthFormController">-void _initRememberMe()</text>
+						<g transform="translate(33490, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+studyMonitorItems: List&lt;StudyMonitorItem&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">+onSelectItem: void Function(StudyMonitorItem)</text>
+								
+							</g>
+						</g>
+						<g transform="translate(33490, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">-List&lt;Widget&gt; _buildRow()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorTable">-String _formatTime()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorTable">-Widget _buildProgressCell()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="27707.3" y="3036.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
+					<g data-name="void Function(StudyMonitorItem)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyMonitorItem)">
+							<rect x="33551.5" y="524.0" height="31.0" width="272.0" data-name="void Function(StudyMonitorItem)"></rect>
 						</g>
-						<g transform="translate(27707.25, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
+						<g transform="translate(33551.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyMonitorItem)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyMonitorItem)">
+								<text x="128.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyMonitorItem)">void Function(StudyMonitorItem)</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="26715.5" y="3036.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+						</g>
+						<g transform="translate(26715.5, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormGroup">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
+							<rect x="34132.0" y="3036.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
+						</g>
+						<g transform="translate(34132, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
+							<rect x="41664.0" y="223.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
+							<path d="M41664.0 254.0 L42536.0 254.0" fill="none" data-name="FormViewModel"></path>
+							<path d="M41664.0 570.0 L42536.0 570.0" fill="none" data-name="FormViewModel"></path>
+						</g>
+						<g transform="translate(41664, 223)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
+								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(41664, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(41664, 570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SharedPreferences">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SharedPreferences">
-							<rect x="23597.0" y="3036.0" height="31.0" width="169.0" data-name="SharedPreferences"></rect>
+					<g data-name="LoginForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
+							<rect x="778.8" y="2189.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
+							<path d="M778.8 2220.5 L985.8 2220.5" fill="none" data-name="LoginForm"></path>
+							<path d="M778.8 2251.5 L985.8 2251.5" fill="none" data-name="LoginForm"></path>
 						</g>
-						<g transform="translate(23597, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SharedPreferences">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SharedPreferences">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="SharedPreferences">SharedPreferences</text>
+						<g transform="translate(778.75, 2189.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="INotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="24178.0" y="3036.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
+						<g transform="translate(778.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
+								
+							</g>
 						</g>
-						<g transform="translate(24178, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
+						<g transform="translate(778.75, 2251.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="32617.5" y="3036.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
+					<g data-name="AuthFormKey">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
+							<rect x="2927.0" y="2968.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
+							<path d="M2927.0 2999.0 L3282.0 2999.0" fill="none" data-name="AuthFormKey"></path>
 						</g>
-						<g transform="translate(32617.5, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
+						<g transform="translate(2927, 2968)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
+								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="32385.3" y="3036.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(32385.25, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+						<g transform="translate(2927, 2999)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="34455.5" y="3036.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
+					<g data-name="FormConsumerRefWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
+							<rect x="1020.3" y="1375.0" height="31.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
 						</g>
-						<g transform="translate(34455.5, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+						<g transform="translate(1020.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
+								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormGroupController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="35903.8" y="60.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
-							<path d="M35903.8 91.5 L36090.8 91.5" fill="none" data-name="IFormGroupController"></path>
+					<g data-name="PasswordRecoveryForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
+							<rect x="1025.8" y="2189.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
+							<path d="M1025.8 2220.5 L1233.8 2220.5" fill="none" data-name="PasswordRecoveryForm"></path>
+							<path d="M1025.8 2251.5 L1233.8 2251.5" fill="none" data-name="PasswordRecoveryForm"></path>
 						</g>
-						<g transform="translate(35903.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
-								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
+						<g transform="translate(1025.75, 2189.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35903.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
+						<g transform="translate(1025.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="763.0" y="2220.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(763, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
+						<g transform="translate(1025.75, 2251.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="PasswordForgotForm">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
-							<rect x="318.0" y="2189.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
-							<path d="M318.0 2220.5 L525.0 2220.5" fill="none" data-name="PasswordForgotForm"></path>
-							<path d="M318.0 2251.5 L525.0 2251.5" fill="none" data-name="PasswordForgotForm"></path>
+							<rect x="1273.8" y="2189.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
+							<path d="M1273.8 2220.5 L1480.8 2220.5" fill="none" data-name="PasswordForgotForm"></path>
+							<path d="M1273.8 2251.5 L1480.8 2251.5" fill="none" data-name="PasswordForgotForm"></path>
 						</g>
-						<g transform="translate(318, 2189.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
+						<g transform="translate(1273.75, 2189.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
 								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(318, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+						<g transform="translate(1273.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(318, 2251.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+						<g transform="translate(1273.75, 2251.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EmailTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
-							<rect x="1746.5" y="2182.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
-							<path d="M1746.5 2213.5 L2067.5 2213.5" fill="none" data-name="EmailTextField"></path>
-						</g>
-						<g transform="translate(1746.5, 2182.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1746.5, 2213.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
-							<rect x="2107.5" y="2175.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
-							<path d="M2107.5 2206.0 L2586.5 2206.0" fill="none" data-name="PasswordTextField"></path>
-						</g>
-						<g transform="translate(2107.5, 2175)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2107.5, 2206)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<rect x="1473.3" y="3036.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(1473.25, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordRecoveryForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
-							<rect x="1498.5" y="2189.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
-							<path d="M1498.5 2220.5 L1706.5 2220.5" fill="none" data-name="PasswordRecoveryForm"></path>
-							<path d="M1498.5 2251.5 L1706.5 2251.5" fill="none" data-name="PasswordRecoveryForm"></path>
+					<g data-name="SignupForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
+							<rect x="1520.8" y="2174.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
+							<path d="M1520.8 2205.5 L1798.8 2205.5" fill="none" data-name="SignupForm"></path>
+							<path d="M1520.8 2236.5 L1798.8 2236.5" fill="none" data-name="SignupForm"></path>
 						</g>
-						<g transform="translate(1498.5, 2189.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
+						<g transform="translate(1520.75, 2174.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
+								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1498.5, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
+						<g transform="translate(1520.75, 2205.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1498.5, 2251.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
+						<g transform="translate(1520.75, 2236.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="AuthScaffold">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
-							<rect x="2692.3" y="1329.5" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
-							<path d="M2692.3 1360.5 L2951.3 1360.5" fill="none" data-name="AuthScaffold"></path>
+							<rect x="1639.8" y="1329.5" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
+							<path d="M1639.8 1360.5 L1898.8 1360.5" fill="none" data-name="AuthScaffold"></path>
 						</g>
-						<g transform="translate(2692.25, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
+						<g transform="translate(1639.75, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
 								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2692.25, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
+						<g transform="translate(1639.75, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
@@ -3915,9 +4156,9 @@
 					</g>
 					<g data-name="Widget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="8908.8" y="2220.5" height="31.0" width="71.0" data-name="Widget"></rect>
+							<rect x="13409.3" y="2220.5" height="31.0" width="71.0" data-name="Widget"></rect>
 						</g>
-						<g transform="translate(8908.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
+						<g transform="translate(13409.25, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
 								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
 								
@@ -3926,1916 +4167,1817 @@
 					</g>
 					<g data-name="EdgeInsets">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="8763.8" y="2220.5" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
+							<rect x="3531.5" y="2220.5" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
 						</g>
-						<g transform="translate(8763.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
+						<g transform="translate(3531.5, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
 								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyUJobsToBeDone">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
-							<rect x="25046.8" y="60.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
-							<path d="M25046.8 91.5 L25240.8 91.5" fill="none" data-name="StudyUJobsToBeDone"></path>
-						</g>
-						<g transform="translate(25046.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25046.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LoginForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
-							<rect x="2626.5" y="2189.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
-							<path d="M2626.5 2220.5 L2833.5 2220.5" fill="none" data-name="LoginForm"></path>
-							<path d="M2626.5 2251.5 L2833.5 2251.5" fill="none" data-name="LoginForm"></path>
-						</g>
-						<g transform="translate(2626.5, 2189.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2626.5, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2626.5, 2251.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAppDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
-							<rect x="25280.8" y="60.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
-							<path d="M25280.8 91.5 L25477.8 91.5" fill="none" data-name="IAppDelegate"></path>
-						</g>
-						<g transform="translate(25280.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25280.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
-							<rect x="3293.8" y="2159.5" height="153.0" width="340.0" data-name="AppController"></rect>
-							<path d="M3293.8 2190.5 L3633.8 2190.5" fill="none" data-name="AppController"></path>
-							<path d="M3293.8 2266.5 L3633.8 2266.5" fill="none" data-name="AppController"></path>
-						</g>
-						<g transform="translate(3293.75, 2159.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
-								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
-								
-							</g>
+					<g data-name="EmailTextField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
+							<rect x="2651.5" y="2182.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
+							<path d="M2651.5 2213.5 L2972.5 2213.5" fill="none" data-name="EmailTextField"></path>
 						</g>
-						<g transform="translate(3293.75, 2190.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+sharedPreferences: SharedPreferences</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
+						<g transform="translate(2651.5, 2182.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
+								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3293.75, 2266.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
+						<g transform="translate(2651.5, 2213.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
+								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="App">
-						<g fill="#eee8d5" stroke="#33322E" data-name="App">
-							<rect x="25517.8" y="76.0" height="31.0" width="47.0" data-name="App"></rect>
+					<g data-name="PasswordTextField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
+							<rect x="3012.5" y="2175.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
+							<path d="M3012.5 2206.0 L3491.5 2206.0" fill="none" data-name="PasswordTextField"></path>
 						</g>
-						<g transform="translate(25517.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
-								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
+						<g transform="translate(3012.5, 2175)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AppContent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
-							<rect x="25604.8" y="76.0" height="31.0" width="109.0" data-name="AppContent"></rect>
-						</g>
-						<g transform="translate(25604.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
+						<g transform="translate(3012.5, 2206)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
-							<rect x="180.8" y="2998.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
-							<path d="M180.8 3029.0 L459.8 3029.0" fill="none" data-name="AppStatus"></path>
-						</g>
-						<g transform="translate(180.75, 2998)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
-								
-							</g>
+					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+							<rect x="1219.8" y="3036.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
 						</g>
-						<g transform="translate(180.75, 3029)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
+						<g transform="translate(1219.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyAnalyzeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
-							<rect x="7018.8" y="3013.0" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
-							<path d="M7018.8 3044.0 L7198.8 3044.0" fill="none" data-name="StudyAnalyzeScreen"></path>
+					<g data-name="StudyUJobsToBeDone">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
+							<rect x="34457.5" y="60.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
+							<path d="M34457.5 91.5 L34651.5 91.5" fill="none" data-name="StudyUJobsToBeDone"></path>
 						</g>
-						<g transform="translate(7018.75, 3013)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
+						<g transform="translate(34457.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
+								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7018.75, 3044)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
+						<g transform="translate(34457.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="9563.8" y="2189.5" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
-							<path d="M9563.8 2220.5 L9727.8 2220.5" fill="none" data-name="StudyPageWidget"></path>
-							<path d="M9563.8 2251.5 L9727.8 2251.5" fill="none" data-name="StudyPageWidget"></path>
+					<g data-name="AuthFormController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
+							<rect x="39972.5" y="1934.5" height="603.0" width="850.0" data-name="AuthFormController"></rect>
+							<path d="M39972.5 1965.5 L40822.5 1965.5" fill="none" data-name="AuthFormController"></path>
+							<path d="M39972.5 2266.5 L40822.5 2266.5" fill="none" data-name="AuthFormController"></path>
 						</g>
-						<g transform="translate(9563.75, 2189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
+						<g transform="translate(39972.5, 1934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
+								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9563.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
+						<g transform="translate(39972.5, 1965.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+sharedPreferences: SharedPreferences</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">+rememberMeControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="AuthFormController">+shouldRemember: bool</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9563.75, 2251.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
+						<g transform="translate(39972.5, 2266.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">-void _setRememberMe()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">-void _delRememberMe()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="AuthFormController">-void _initRememberMe()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyAnalyzeController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
-							<rect x="3012.8" y="2205.0" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
-							<path d="M3012.8 2236.0 L3213.8 2236.0" fill="none" data-name="StudyAnalyzeController"></path>
+					<g data-name="IAuthRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
+							<rect x="28529.3" y="3036.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
 						</g>
-						<g transform="translate(3012.75, 2205)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
-								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
+						<g transform="translate(28529.25, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
+								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3012.75, 2236)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
+					</g>
+					<g data-name="INotificationService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
+							<rect x="26507.5" y="3036.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
+						</g>
+						<g transform="translate(26507.5, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
+								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyBaseController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="3140.5" y="1299.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
-							<path d="M3140.5 1330.0 L3686.5 1330.0" fill="none" data-name="StudyBaseController"></path>
-							<path d="M3140.5 1406.0 L3686.5 1406.0" fill="none" data-name="StudyBaseController"></path>
+					<g data-name="GoRouter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
+							<rect x="32242.8" y="3036.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
 						</g>
-						<g transform="translate(3140.5, 1299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
-								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
+						<g transform="translate(32242.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
+								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3140.5, 1330)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
+					</g>
+					<g data-name="IFormGroupController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
+							<rect x="41401.3" y="60.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
+							<path d="M41401.3 91.5 L41588.3 91.5" fill="none" data-name="IFormGroupController"></path>
+						</g>
+						<g transform="translate(41401.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
+								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3140.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
+						<g transform="translate(41401.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyParticipationBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
-							<rect x="4346.8" y="1321.5" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
-							<path d="M4346.8 1352.5 L4577.8 1352.5" fill="none" data-name="StudyParticipationBadge"></path>
-							<path d="M4346.8 1428.5 L4577.8 1428.5" fill="none" data-name="StudyParticipationBadge"></path>
+					<g data-name="Enum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
+							<rect x="3676.5" y="2220.5" height="31.0" width="61.0" data-name="Enum"></rect>
 						</g>
-						<g transform="translate(4346.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
+						<g transform="translate(3676.5, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4346.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
-								
-							</g>
+					</g>
+					<g data-name="AppStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
+							<rect x="1680.0" y="2998.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
+							<path d="M1680.0 3029.0 L1959.0 3029.0" fill="none" data-name="AppStatus"></path>
 						</g>
-						<g transform="translate(4346.75, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
+						<g transform="translate(1680, 2998)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
+								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="11813.8" y="2220.5" height="31.0" width="114.0" data-name="Participation"></rect>
-						</g>
-						<g transform="translate(11813.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
+						<g transform="translate(1680, 3029)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="13508.8" y="2220.5" height="31.0" width="106.0" data-name="BadgeType"></rect>
+					<g data-name="FormArrayTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
+							<rect x="2234.8" y="1194.0" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
+							<path d="M2234.8 1225.0 L2724.8 1225.0" fill="none" data-name="FormArrayTable"></path>
+							<path d="M2234.8 1526.0 L2724.8 1526.0" fill="none" data-name="FormArrayTable"></path>
 						</g>
-						<g transform="translate(13508.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
+						<g transform="translate(2234.75, 1194)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
+								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PreviewFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
-							<rect x="24715.8" y="45.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
-							<path d="M24715.8 76.5 L25006.8 76.5" fill="none" data-name="PreviewFrame"></path>
-						</g>
-						<g transform="translate(24715.75, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
+						<g transform="translate(2234.75, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24715.75, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
+						<g transform="translate(2234.75, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="24769.3" y="524.0" height="31.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
+					<g data-name="AbstractControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
+							<rect x="3547.8" y="3036.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
 						</g>
-						<g transform="translate(24769.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
+						<g transform="translate(3547.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
+								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FrameControlsWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
-							<rect x="4617.8" y="1329.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
-							<path d="M4617.8 1360.0 L4908.8 1360.0" fill="none" data-name="FrameControlsWidget"></path>
-							<path d="M4617.8 1421.0 L4908.8 1421.0" fill="none" data-name="FrameControlsWidget"></path>
+					<g data-name="void Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
+							<rect x="2056.5" y="2220.5" height="31.0" width="144.0" data-name="void Function(T)"></rect>
 						</g>
-						<g transform="translate(4617.75, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
+						<g transform="translate(2056.5, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
+								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4617.75, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
-								
-							</g>
+					</g>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+							<rect x="2240.5" y="2220.5" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
 						</g>
-						<g transform="translate(4617.75, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
+						<g transform="translate(2240.5, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="void Function()?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="12191.8" y="2220.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
+							<rect x="13751.3" y="2220.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
 						</g>
-						<g transform="translate(12191.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
+						<g transform="translate(13751.25, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
 								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="14855.8" y="1009.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+					<g data-name="String Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
+							<rect x="3924.8" y="2220.5" height="31.0" width="157.0" data-name="String Function(T)"></rect>
 						</g>
-						<g transform="translate(14855.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
+						<g transform="translate(3924.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
+								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyNavViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
-							<rect x="4948.8" y="1322.0" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
-							<path d="M4948.8 1353.0 L5189.8 1353.0" fill="none" data-name="IStudyNavViewModel"></path>
-						</g>
-						<g transform="translate(4948.75, 1322)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
-								
-							</g>
+					<g data-name="IconData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
+							<rect x="15501.3" y="2220.5" height="31.0" width="87.0" data-name="IconData"></rect>
 						</g>
-						<g transform="translate(4948.75, 1353)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
+						<g transform="translate(15501.25, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
+								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
-							<rect x="25887.8" y="23.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
-							<path d="M25887.8 54.0 L26120.8 54.0" fill="none" data-name="StudyNav"></path>
+					<g data-name="Widget Function(BuildContext, T, int)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
+							<rect x="4121.8" y="2220.5" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
 						</g>
-						<g transform="translate(25887.75, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
+						<g transform="translate(4121.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
+								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25887.75, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
+					</g>
+					<g data-name="ManagedFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
+							<rect x="41160.5" y="1359.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
+							<path d="M41160.5 1390.5 L41556.5 1390.5" fill="none" data-name="ManagedFormViewModel"></path>
+						</g>
+						<g transform="translate(41160.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
+								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyDesignNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
-							<rect x="26160.8" y="23.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
-							<path d="M26160.8 54.0 L26448.8 54.0" fill="none" data-name="StudyDesignNav"></path>
-						</g>
-						<g transform="translate(26160.75, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
+						<g transform="translate(41160.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26160.75, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
+					</g>
+					<g data-name="FormViewModelNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
+							<rect x="34504.5" y="524.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
+						</g>
+						<g transform="translate(34504.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudySettingsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="34979.3" y="2107.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M34979.3 2138.0 L35458.3 2138.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M34979.3 2274.0 L35458.3 2274.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+					<g data-name="Exception">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
+							<rect x="35202.3" y="76.0" height="31.0" width="94.0" data-name="Exception"></rect>
 						</g>
-						<g transform="translate(34979.25, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
+						<g transform="translate(35202.25, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
+								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34979.25, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+					</g>
+					<g data-name="FormViewModelCollection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
+							<rect x="38579.3" y="3258.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
+							<path d="M38579.3 3289.0 L38860.3 3289.0" fill="none" data-name="FormViewModelCollection"></path>
+							<path d="M38579.3 3380.0 L38860.3 3380.0" fill="none" data-name="FormViewModelCollection"></path>
+						</g>
+						<g transform="translate(38579.25, 3258)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
+								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34979.25, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
+						<g transform="translate(38579.25, 3289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="35044.5" y="3036.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
-						</g>
-						<g transform="translate(35044.5, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
+						<g transform="translate(38579.25, 3380)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="27889.3" y="3036.0" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
+					<g data-name="FormArray">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
+							<rect x="36165.5" y="3571.0" height="31.0" width="98.0" data-name="FormArray"></rect>
 						</g>
-						<g transform="translate(27889.25, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
+						<g transform="translate(36165.5, 3571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="37726.3" y="223.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
-							<path d="M37726.3 254.0 L38598.3 254.0" fill="none" data-name="FormViewModel"></path>
-							<path d="M37726.3 570.0 L38598.3 570.0" fill="none" data-name="FormViewModel"></path>
+					<g data-name="CustomFormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
+							<rect x="26565.5" y="3310.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
+							<path d="M26565.5 3341.5 L26978.5 3341.5" fill="none" data-name="CustomFormControl"></path>
+							<path d="M26565.5 3447.5 L26978.5 3447.5" fill="none" data-name="CustomFormControl"></path>
 						</g>
-						<g transform="translate(37726.25, 223)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+						<g transform="translate(26565.5, 3310.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37726.25, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+						<g transform="translate(26565.5, 3341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37726.25, 570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
+						<g transform="translate(26565.5, 3447.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudySettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="7238.8" y="3020.5" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M7238.8 3051.5 L7413.8 3051.5" fill="none" data-name="StudySettingsDialog"></path>
+					<g data-name="Debouncer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
+							<rect x="40467.0" y="3571.0" height="31.0" width="103.0" data-name="Debouncer"></rect>
 						</g>
-						<g transform="translate(7238.75, 3020.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
-								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
+						<g transform="translate(40467, 3571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
+								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7238.75, 3051.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
+					</g>
+					<g data-name="void Function(T?)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
+							<rect x="27147.8" y="3571.0" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
+						</g>
+						<g transform="translate(27147.75, 3571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTestScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
-							<rect x="7453.8" y="2975.0" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
-							<path d="M7453.8 3006.0 L7653.8 3006.0" fill="none" data-name="StudyTestScreen"></path>
-							<path d="M7453.8 3037.0 L7653.8 3037.0" fill="none" data-name="StudyTestScreen"></path>
+					<g data-name="void Function(ControlStatus)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
+							<rect x="27351.8" y="3571.0" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
 						</g>
-						<g transform="translate(7453.75, 2975)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
-								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
+						<g transform="translate(27351.75, 3571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7453.75, 3006)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
+					</g>
+					<g data-name="UnsavedChangesDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
+							<rect x="41957.5" y="60.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
+							<path d="M41957.5 91.5 L42164.5 91.5" fill="none" data-name="UnsavedChangesDialog"></path>
+						</g>
+						<g transform="translate(41957.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7453.75, 3037)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
+						<g transform="translate(41957.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="13816.3" y="3036.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+					<g data-name="FormValidationSetEnum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
+							<rect x="41637.5" y="1009.5" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
 						</g>
-						<g transform="translate(13816.25, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
+						<g transform="translate(41637.5, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
+								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTestController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
-							<rect x="3753.8" y="2197.5" height="77.0" width="282.0" data-name="StudyTestController"></rect>
-							<path d="M3753.8 2228.5 L4035.8 2228.5" fill="none" data-name="StudyTestController"></path>
+					<g data-name="FormControlValidation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
+							<rect x="5209.8" y="2167.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
+							<path d="M5209.8 2198.0 L5694.8 2198.0" fill="none" data-name="FormControlValidation"></path>
+							<path d="M5209.8 2274.0 L5694.8 2274.0" fill="none" data-name="FormControlValidation"></path>
 						</g>
-						<g transform="translate(3753.75, 2197.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
+						<g transform="translate(5209.75, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
+								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3753.75, 2228.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
+						<g transform="translate(5209.75, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5209.75, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WebFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
-							<rect x="26488.8" y="37.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
-							<path d="M26488.8 68.5 L26657.8 68.5" fill="none" data-name="WebFrame"></path>
-							<path d="M26488.8 114.5 L26657.8 114.5" fill="none" data-name="WebFrame"></path>
+					<g data-name="IFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
+							<rect x="34840.5" y="493.0" height="93.0" width="163.0" data-name="IFormData"></rect>
+							<path d="M34840.5 524.0 L35003.5 524.0" fill="none" data-name="IFormData"></path>
+							<path d="M34840.5 555.0 L35003.5 555.0" fill="none" data-name="IFormData"></path>
 						</g>
-						<g transform="translate(26488.75, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
+						<g transform="translate(34840.5, 493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
+								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26488.75, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
+						<g transform="translate(34840.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26488.75, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
+						<g transform="translate(34840.5, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DisabledFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
-							<rect x="26697.8" y="60.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
-							<path d="M26697.8 91.5 L26833.8 91.5" fill="none" data-name="DisabledFrame"></path>
-						</g>
-						<g transform="translate(26697.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
-								
-							</g>
+					<g data-name="FormInvalidException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
+							<rect x="38854.8" y="524.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
 						</g>
-						<g transform="translate(26697.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
+						<g transform="translate(38854.75, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
+								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PhoneContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
-							<rect x="5498.3" y="1284.0" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
-							<path d="M5498.3 1315.0 L5825.3 1315.0" fill="none" data-name="PhoneContainer"></path>
-							<path d="M5498.3 1466.0 L5825.3 1466.0" fill="none" data-name="PhoneContainer"></path>
+					<g data-name="FormConfigException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
+							<rect x="39080.8" y="508.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
+							<path d="M39080.8 539.5 L39265.8 539.5" fill="none" data-name="FormConfigException"></path>
 						</g>
-						<g transform="translate(5498.25, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
-								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
+						<g transform="translate(39080.75, 508.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
+								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5498.25, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
+						<g transform="translate(39080.75, 539.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5498.25, 1466)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
+					</g>
+					<g data-name="IFormViewModelDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
+							<rect x="42195.8" y="986.5" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
+							<path d="M42195.8 1017.5 L42412.8 1017.5" fill="none" data-name="IFormViewModelDelegate"></path>
+						</g>
+						<g transform="translate(42195.75, 986.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
+								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="11057.8" y="2220.5" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(11057.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
+						<g transform="translate(42195.75, 1017.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MobileFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
-							<rect x="26873.8" y="60.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
-							<path d="M26873.8 91.5 L27009.8 91.5" fill="none" data-name="MobileFrame"></path>
+					<g data-name="FormControlOption">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
+							<rect x="34274.5" y="486.0" height="107.0" width="190.0" data-name="FormControlOption"></rect>
+							<path d="M34274.5 517.0 L34464.5 517.0" fill="none" data-name="FormControlOption"></path>
 						</g>
-						<g transform="translate(26873.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
+						<g transform="translate(34274.5, 486)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
+								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26873.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
+						<g transform="translate(34274.5, 517)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DesktopFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
-							<rect x="27049.8" y="60.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
-							<path d="M27049.8 91.5 L27185.8 91.5" fill="none" data-name="DesktopFrame"></path>
+					<g data-name="FormMode">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
+							<rect x="26135.5" y="2990.5" height="122.0" width="282.0" data-name="FormMode"></rect>
+							<path d="M26135.5 3021.5 L26417.5 3021.5" fill="none" data-name="FormMode"></path>
 						</g>
-						<g transform="translate(27049.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
+						<g transform="translate(26135.5, 2990.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27049.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
+						<g transform="translate(26135.5, 3021.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyAppBarViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
-							<rect x="5129.8" y="2190.0" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
-							<path d="M5129.8 2221.0 L5372.8 2221.0" fill="none" data-name="IStudyAppBarViewModel"></path>
+					<g data-name="CancelableOperation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
+							<rect x="42859.3" y="1009.5" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
 						</g>
-						<g transform="translate(5129.75, 2190)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
+						<g transform="translate(42859.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
+								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5129.75, 2221)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
+					</g>
+					<g data-name="EnrolledBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
+							<rect x="42204.5" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
+							<path d="M42204.5 76.0 L42370.5 76.0" fill="none" data-name="EnrolledBadge"></path>
+							<path d="M42204.5 107.0 L42370.5 107.0" fill="none" data-name="EnrolledBadge"></path>
+						</g>
+						<g transform="translate(42204.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IStudyStatusBadgeViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
-							<rect x="5865.3" y="1352.0" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
-							<path d="M5865.3 1383.0 L6150.3 1383.0" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
-						</g>
-						<g transform="translate(5865.25, 1352)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
+						<g transform="translate(42204.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5865.25, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
+						<g transform="translate(42204.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
-							<rect x="6190.3" y="1269.5" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
-							<path d="M6190.3 1300.5 L6525.3 1300.5" fill="none" data-name="StudyScaffold"></path>
+					<g data-name="StudyRecruitController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
+							<rect x="5774.8" y="2144.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
+							<path d="M5774.8 2175.5 L6425.8 2175.5" fill="none" data-name="StudyRecruitController"></path>
+							<path d="M5774.8 2221.5 L6425.8 2221.5" fill="none" data-name="StudyRecruitController"></path>
 						</g>
-						<g transform="translate(6190.25, 1269.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
-								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
+						<g transform="translate(5774.75, 2144.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
+								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6190.25, 1300.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
+						<g transform="translate(5774.75, 2175.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5774.75, 2221.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NavbarTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="5902.8" y="2220.5" height="31.0" width="103.0" data-name="NavbarTab"></rect>
+					<g data-name="IInviteCodeRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
+							<rect x="13097.8" y="3036.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
 						</g>
-						<g transform="translate(5902.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
+						<g transform="translate(13097.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SingleColumnLayoutType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="6100.5" y="2220.5" height="31.0" width="218.0" data-name="SingleColumnLayoutType"></rect>
+					<g data-name="StreamSubscription">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
+							<rect x="12887.8" y="3036.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
 						</g>
-						<g transform="translate(6100.5, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
+						<g transform="translate(12887.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
+								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RouteInformation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
-							<rect x="6358.5" y="2167.0" height="138.0" width="152.0" data-name="RouteInformation"></rect>
-							<path d="M6358.5 2198.0 L6510.5 2198.0" fill="none" data-name="RouteInformation"></path>
-							<path d="M6358.5 2274.0 L6510.5 2274.0" fill="none" data-name="RouteInformation"></path>
+					<g data-name="StudyBaseController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
+							<rect x="5211.5" y="1299.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
+							<path d="M5211.5 1330.0 L5757.5 1330.0" fill="none" data-name="StudyBaseController"></path>
+							<path d="M5211.5 1406.0 L5757.5 1406.0" fill="none" data-name="StudyBaseController"></path>
 						</g>
-						<g transform="translate(6358.5, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
+						<g transform="translate(5211.5, 1299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
+								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6358.5, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
+						<g transform="translate(5211.5, 1330)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6358.5, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
+						<g transform="translate(5211.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
-							<rect x="6598.8" y="1261.5" height="258.0" width="302.0" data-name="PlatformController"></rect>
-							<path d="M6598.8 1292.5 L6900.8 1292.5" fill="none" data-name="PlatformController"></path>
-							<path d="M6598.8 1383.5 L6900.8 1383.5" fill="none" data-name="PlatformController"></path>
+					<g data-name="IModelActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
+							<rect x="6896.3" y="1375.0" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
 						</g>
-						<g transform="translate(6598.75, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
-								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
+						<g transform="translate(6896.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
+								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6598.75, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
+					</g>
+					<g data-name="StudyRecruitScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
+							<rect x="13055.3" y="2182.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
+							<path d="M13055.3 2213.5 L13369.3 2213.5" fill="none" data-name="StudyRecruitScreen"></path>
+						</g>
+						<g transform="translate(13055.25, 2182.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
+								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6598.75, 1383.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
+						<g transform="translate(13055.25, 2213.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WebController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
-							<rect x="9019.8" y="2137.0" height="198.0" width="273.0" data-name="WebController"></rect>
-							<path d="M9019.8 2168.0 L9292.8 2168.0" fill="none" data-name="WebController"></path>
-							<path d="M9019.8 2199.0 L9292.8 2199.0" fill="none" data-name="WebController"></path>
-						</g>
-						<g transform="translate(9019.75, 2137)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
-								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
-								
-							</g>
+					<g data-name="InviteCodeFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
+							<rect x="459.0" y="1336.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
+							<path d="M459.0 1367.5 L897.0 1367.5" fill="none" data-name="InviteCodeFormView"></path>
+							<path d="M459.0 1398.5 L897.0 1398.5" fill="none" data-name="InviteCodeFormView"></path>
 						</g>
-						<g transform="translate(9019.75, 2168)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
+						<g transform="translate(459, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
+								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9019.75, 2199)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
+						<g transform="translate(459, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IFrameElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
-							<rect x="6843.8" y="3036.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
-						</g>
-						<g transform="translate(6843.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
+						<g transform="translate(459, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MobileController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
-							<rect x="9332.8" y="2152.5" height="167.0" width="191.0" data-name="MobileController"></rect>
-							<path d="M9332.8 2183.5 L9523.8 2183.5" fill="none" data-name="MobileController"></path>
+					<g data-name="InviteCodeFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
+							<rect x="18370.5" y="2047.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
+							<path d="M18370.5 2078.0 L19037.5 2078.0" fill="none" data-name="InviteCodeFormViewModel"></path>
+							<path d="M18370.5 2304.0 L19037.5 2304.0" fill="none" data-name="InviteCodeFormViewModel"></path>
 						</g>
-						<g transform="translate(9332.75, 2152.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
+						<g transform="translate(18370.5, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
+								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9332.75, 2183.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
+						<g transform="translate(18370.5, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
-							<rect x="6805.8" y="2220.5" height="31.0" width="111.0" data-name="StudyStatus"></rect>
-						</g>
-						<g transform="translate(6805.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
-								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
+						<g transform="translate(18370.5, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyStatusBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
-							<rect x="6940.8" y="1314.0" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
-							<path d="M6940.8 1345.0 L7181.8 1345.0" fill="none" data-name="StudyStatusBadge"></path>
-							<path d="M6940.8 1436.0 L7181.8 1436.0" fill="none" data-name="StudyStatusBadge"></path>
+					<g data-name="StudyInvitesTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
+							<rect x="42858.5" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
+							<path d="M42858.5 31.0 L43424.5 31.0" fill="none" data-name="StudyInvitesTable"></path>
+							<path d="M42858.5 137.0 L43424.5 137.0" fill="none" data-name="StudyInvitesTable"></path>
 						</g>
-						<g transform="translate(6940.75, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
+						<g transform="translate(42858.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
+								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6940.75, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
+						<g transform="translate(42858.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6940.75, 1436)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
+						<g transform="translate(42858.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TestAppRoutes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
-							<rect x="27225.8" y="23.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
-							<path d="M27225.8 54.0 L27485.8 54.0" fill="none" data-name="TestAppRoutes"></path>
+					<g data-name="void Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
+							<rect x="42576.0" y="524.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(27225.75, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
+						<g transform="translate(42576, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
+								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27225.75, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
-								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
+					</g>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+							<rect x="42838.0" y="524.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
+						</g>
+						<g transform="translate(42838, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IWithBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="7221.8" y="1375.0" height="31.0" width="113.0" data-name="IWithBanner"></rect>
+					<g data-name="Intervention? Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
+							<rect x="43298.0" y="524.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
 						</g>
-						<g transform="translate(7221.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
+						<g transform="translate(43298, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
-							<rect x="4075.8" y="2122.0" height="228.0" width="573.0" data-name="StudyController"></rect>
-							<path d="M4075.8 2153.0 L4648.8 2153.0" fill="none" data-name="StudyController"></path>
-							<path d="M4075.8 2214.0 L4648.8 2214.0" fill="none" data-name="StudyController"></path>
+					<g data-name="int Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
+							<rect x="43589.0" y="524.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(4075.75, 2122)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
-								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
+						<g transform="translate(43589, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4075.75, 2153)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								
-							</g>
+					</g>
+					<g data-name="Study">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
+							<rect x="37659.3" y="3036.0" height="31.0" width="61.0" data-name="Study"></rect>
 						</g>
-						<g transform="translate(4075.75, 2214)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
+						<g transform="translate(37659.25, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyMonitorScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="7693.8" y="3020.5" height="62.0" width="176.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M7693.8 3051.5 L7869.8 3051.5" fill="none" data-name="StudyMonitorScreen"></path>
+					<g data-name="PublishSuccessDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
+							<rect x="13520.3" y="2205.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
+							<path d="M13520.3 2236.0 L13711.3 2236.0" fill="none" data-name="PublishSuccessDialog"></path>
 						</g>
-						<g transform="translate(7693.75, 3020.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
+						<g transform="translate(13520.25, 2205)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7693.75, 3051.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
+						<g transform="translate(13520.25, 2236)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumnHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
-							<rect x="7374.8" y="1329.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
-							<path d="M7374.8 1360.5 L7611.8 1360.5" fill="none" data-name="StudiesTableColumnHeader"></path>
+					<g data-name="PublishDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
+							<rect x="14606.3" y="2205.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
+							<path d="M14606.3 2236.0 L14742.3 2236.0" fill="none" data-name="PublishDialog"></path>
 						</g>
-						<g transform="translate(7374.75, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
-								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
+						<g transform="translate(14606.25, 2205)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7374.75, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
+						<g transform="translate(14606.25, 2236)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
-							<rect x="7651.8" y="1336.5" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
-							<path d="M7651.8 1367.5 L7994.8 1367.5" fill="none" data-name="DashboardScaffold"></path>
-							<path d="M7651.8 1413.5 L7994.8 1413.5" fill="none" data-name="DashboardScaffold"></path>
-						</g>
-						<g transform="translate(7651.75, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
-								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
-								
-							</g>
+					<g data-name="PublishConfirmationDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
+							<rect x="14782.3" y="2205.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
+							<path d="M14782.3 2236.0 L15006.3 2236.0" fill="none" data-name="PublishConfirmationDialog"></path>
 						</g>
-						<g transform="translate(7651.75, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
+						<g transform="translate(14782.25, 2205)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
+								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7651.75, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
+						<g transform="translate(14782.25, 2236)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumnSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
-							<rect x="27525.8" y="30.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
-							<path d="M27525.8 61.0 L27750.8 61.0" fill="none" data-name="StudiesTableColumnSize"></path>
-							<path d="M27525.8 122.0 L27750.8 122.0" fill="none" data-name="StudiesTableColumnSize"></path>
+					<g data-name="FrameControlsWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
+							<rect x="8409.0" y="1329.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
+							<path d="M8409.0 1360.0 L8700.0 1360.0" fill="none" data-name="FrameControlsWidget"></path>
+							<path d="M8409.0 1421.0 L8700.0 1421.0" fill="none" data-name="FrameControlsWidget"></path>
 						</g>
-						<g transform="translate(27525.75, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
+						<g transform="translate(8409, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
+								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27525.75, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
+						<g transform="translate(8409, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27525.75, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
+						<g transform="translate(8409, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
-							<rect x="8034.8" y="1246.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
-							<path d="M8034.8 1277.5 L8514.8 1277.5" fill="none" data-name="StudiesTable"></path>
-							<path d="M8034.8 1488.5 L8514.8 1488.5" fill="none" data-name="StudiesTable"></path>
+					<g data-name="ConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
+							<rect x="13106.5" y="1009.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
 						</g>
-						<g transform="translate(8034.75, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
-								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
+						<g transform="translate(13106.5, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8034.75, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
+					</g>
+					<g data-name="IStudyStatusBadgeViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
+							<rect x="9110.0" y="1352.0" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
+							<path d="M9110.0 1383.0 L9395.0 1383.0" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
+						</g>
+						<g transform="translate(9110, 1352)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
+								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8034.75, 1488.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
+						<g transform="translate(9110, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
-							<rect x="9767.8" y="2220.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
+					<g data-name="Participation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
+							<rect x="12901.3" y="2220.5" height="31.0" width="114.0" data-name="Participation"></rect>
 						</g>
-						<g transform="translate(9767.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
+						<g transform="translate(12901.25, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
+								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<rect x="9986.8" y="2220.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
+					<g data-name="StudyStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
+							<rect x="8171.3" y="2220.5" height="31.0" width="111.0" data-name="StudyStatus"></rect>
 						</g>
-						<g transform="translate(9986.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
+						<g transform="translate(8171.25, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
+								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
-							<rect x="10403.8" y="2047.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
-							<path d="M10403.8 2078.0 L11017.8 2078.0" fill="none" data-name="DashboardController"></path>
-							<path d="M10403.8 2199.0 L11017.8 2199.0" fill="none" data-name="DashboardController"></path>
+					<g data-name="StudyStatusBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
+							<rect x="9435.0" y="1314.0" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
+							<path d="M9435.0 1345.0 L9676.0 1345.0" fill="none" data-name="StudyStatusBadge"></path>
+							<path d="M9435.0 1436.0 L9676.0 1436.0" fill="none" data-name="StudyStatusBadge"></path>
 						</g>
-						<g transform="translate(10403.75, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
-								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
+						<g transform="translate(9435, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
+								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10403.75, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
+						<g transform="translate(9435, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10403.75, 2199)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
+						<g transform="translate(9435, 1436)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
-							<rect x="549.8" y="2945.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
-							<path d="M549.8 2976.5 L910.8 2976.5" fill="none" data-name="StudiesTableColumn"></path>
-						</g>
-						<g transform="translate(549.75, 2945.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
-								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
-								
-							</g>
+					<g data-name="BadgeType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
+							<rect x="12017.0" y="2220.5" height="31.0" width="106.0" data-name="BadgeType"></rect>
 						</g>
-						<g transform="translate(549.75, 2976.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
+						<g transform="translate(12017, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
+								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="11155.8" y="2205.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
-							<path d="M11155.8 2236.0 L11333.8 2236.0" fill="none" data-name="DashboardScreen"></path>
+					<g data-name="RouteInformation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
+							<rect x="8432.3" y="2167.0" height="138.0" width="152.0" data-name="RouteInformation"></rect>
+							<path d="M8432.3 2198.0 L8584.3 2198.0" fill="none" data-name="RouteInformation"></path>
+							<path d="M8432.3 2274.0 L8584.3 2274.0" fill="none" data-name="RouteInformation"></path>
 						</g>
-						<g transform="translate(11155.75, 2205)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
+						<g transform="translate(8432.25, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11155.75, 2236)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
+						<g transform="translate(8432.25, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(8432.25, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesFilter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
-							<rect x="6507.8" y="3013.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
-							<path d="M6507.8 3044.0 L6803.8 3044.0" fill="none" data-name="StudiesFilter"></path>
+					<g data-name="PlatformController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
+							<rect x="9716.0" y="1261.5" height="258.0" width="302.0" data-name="PlatformController"></rect>
+							<path d="M9716.0 1292.5 L10018.0 1292.5" fill="none" data-name="PlatformController"></path>
+							<path d="M9716.0 1383.5 L10018.0 1383.5" fill="none" data-name="PlatformController"></path>
 						</g>
-						<g transform="translate(6507.75, 3013)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
+						<g transform="translate(9716, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
+								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6507.75, 3044)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
+						<g transform="translate(9716, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
+								
+							</g>
+						</g>
+						<g transform="translate(9716, 1383.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IUserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="11924.5" y="3036.0" height="31.0" width="143.0" data-name="IUserRepository"></rect>
+					<g data-name="WebController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
+							<rect x="9641.0" y="2137.0" height="198.0" width="273.0" data-name="WebController"></rect>
+							<path d="M9641.0 2168.0 L9914.0 2168.0" fill="none" data-name="WebController"></path>
+							<path d="M9641.0 2199.0 L9914.0 2199.0" fill="none" data-name="WebController"></path>
 						</g>
-						<g transform="translate(11924.5, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
+						<g transform="translate(9641, 2137)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
+								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SearchController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="12947.3" y="3036.0" height="31.0" width="149.0" data-name="SearchController"></rect>
+						<g transform="translate(9641, 2168)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
+								
+							</g>
 						</g>
-						<g transform="translate(12947.25, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
+						<g transform="translate(9641, 2199)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="8554.8" y="1375.0" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
+					<g data-name="IFrameElement">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
+							<rect x="5515.3" y="3036.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
 						</g>
-						<g transform="translate(8554.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
+						<g transform="translate(5515.25, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
+								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
-							<rect x="11373.8" y="2137.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
-							<path d="M11373.8 2168.5 L11773.8 2168.5" fill="none" data-name="StudiesTableItem"></path>
+					<g data-name="MobileController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
+							<rect x="9954.0" y="2152.5" height="167.0" width="191.0" data-name="MobileController"></rect>
+							<path d="M9954.0 2183.5 L10145.0 2183.5" fill="none" data-name="MobileController"></path>
 						</g>
-						<g transform="translate(11373.75, 2137.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
-								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
+						<g transform="translate(9954, 2152.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11373.75, 2168.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
+						<g transform="translate(9954, 2183.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
+								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="33799.0" y="3036.0" height="31.0" width="61.0" data-name="Study"></rect>
+					<g data-name="StudyController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
+							<rect x="4556.8" y="2122.0" height="228.0" width="573.0" data-name="StudyController"></rect>
+							<path d="M4556.8 2153.0 L5129.8 2153.0" fill="none" data-name="StudyController"></path>
+							<path d="M4556.8 2214.0 L5129.8 2214.0" fill="none" data-name="StudyController"></path>
 						</g>
-						<g transform="translate(33799, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
+						<g transform="translate(4556.75, 2122)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
+								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(Study, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
-							<rect x="13136.3" y="3036.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
+						<g transform="translate(4556.75, 2153)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(13136.25, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
+						<g transform="translate(4556.75, 2214)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(Study)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
-							<rect x="13409.3" y="3036.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
+					<g data-name="IStudyNavViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
+							<rect x="10058.0" y="1322.0" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
+							<path d="M10058.0 1353.0 L10299.0 1353.0" fill="none" data-name="IStudyNavViewModel"></path>
 						</g>
-						<g transform="translate(13409.25, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
+						<g transform="translate(10058, 1322)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
+								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormArrayTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
-							<rect x="12434.0" y="1194.0" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
-							<path d="M12434.0 1225.0 L12924.0 1225.0" fill="none" data-name="FormArrayTable"></path>
-							<path d="M12434.0 1526.0 L12924.0 1526.0" fill="none" data-name="FormArrayTable"></path>
-						</g>
-						<g transform="translate(12434, 1194)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
-								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
+						<g transform="translate(10058, 1353)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12434, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
+					</g>
+					<g data-name="StudyNav">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
+							<rect x="43464.5" y="23.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
+							<path d="M43464.5 54.0 L43697.5 54.0" fill="none" data-name="StudyNav"></path>
+						</g>
+						<g transform="translate(43464.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12434, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
+						<g transform="translate(43464.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="13638.3" y="3036.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+					<g data-name="StudyDesignNav">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
+							<rect x="43737.5" y="23.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
+							<path d="M43737.5 54.0 L44025.5 54.0" fill="none" data-name="StudyDesignNav"></path>
 						</g>
-						<g transform="translate(13638.25, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
+						<g transform="translate(43737.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
+								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="12007.8" y="2220.5" height="31.0" width="144.0" data-name="void Function(T)"></rect>
-						</g>
-						<g transform="translate(12007.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
+						<g transform="translate(43737.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<rect x="12375.8" y="2220.5" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
+					<g data-name="IWithBanner">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
+							<rect x="15580.0" y="1009.5" height="31.0" width="113.0" data-name="IWithBanner"></rect>
 						</g>
-						<g transform="translate(12375.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
+						<g transform="translate(15580, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="String Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
-							<rect x="13311.8" y="2220.5" height="31.0" width="157.0" data-name="String Function(T)"></rect>
+					<g data-name="StudyParticipationBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
+							<rect x="10339.0" y="1321.5" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
+							<path d="M10339.0 1352.5 L10570.0 1352.5" fill="none" data-name="StudyParticipationBadge"></path>
+							<path d="M10339.0 1428.5 L10570.0 1428.5" fill="none" data-name="StudyParticipationBadge"></path>
 						</g>
-						<g transform="translate(13311.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
+						<g transform="translate(10339, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
+								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="22519.8" y="2220.5" height="31.0" width="87.0" data-name="IconData"></rect>
+						<g transform="translate(10339, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
+								
+							</g>
 						</g>
-						<g transform="translate(22519.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
+						<g transform="translate(10339, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext, T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
-							<rect x="13654.8" y="2220.5" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
-						</g>
-						<g transform="translate(13654.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
-								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
+					<g data-name="IStudyRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
+							<rect x="30874.0" y="3036.0" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
+						</g>
+						<g transform="translate(30874, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
+								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CustomFormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
-							<rect x="32235.3" y="3310.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
-							<path d="M32235.3 3341.5 L32648.3 3341.5" fill="none" data-name="CustomFormControl"></path>
-							<path d="M32235.3 3447.5 L32648.3 3447.5" fill="none" data-name="CustomFormControl"></path>
+					<g data-name="PreviewFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
+							<rect x="44065.5" y="45.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
+							<path d="M44065.5 76.5 L44356.5 76.5" fill="none" data-name="PreviewFrame"></path>
 						</g>
-						<g transform="translate(32235.25, 3310.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
+						<g transform="translate(44065.5, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
+								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32235.25, 3341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
+						<g transform="translate(44065.5, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32235.25, 3447.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
+					</g>
+					<g data-name="StudyFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
+							<rect x="44119.0" y="524.0" height="31.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
+						</g>
+						<g transform="translate(44119, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
+								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Debouncer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="37901.5" y="3571.0" height="31.0" width="103.0" data-name="Debouncer"></rect>
+					<g data-name="IStudyAppBarViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
+							<rect x="8768.3" y="2190.0" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
+							<path d="M8768.3 2221.0 L9011.3 2221.0" fill="none" data-name="IStudyAppBarViewModel"></path>
 						</g>
-						<g transform="translate(37901.5, 3571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
+						<g transform="translate(8768.25, 2190)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
+								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(T?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
-							<rect x="35304.3" y="3571.0" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
-						</g>
-						<g transform="translate(35304.25, 3571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
+						<g transform="translate(8768.25, 2221)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(ControlStatus)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
-							<rect x="35508.3" y="3571.0" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
+					<g data-name="StudyScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
+							<rect x="18503.3" y="904.0" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
+							<path d="M18503.3 935.0 L18838.3 935.0" fill="none" data-name="StudyScaffold"></path>
 						</g>
-						<g transform="translate(35508.25, 3571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
+						<g transform="translate(18503.25, 904)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
+								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormInvalidException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
-							<rect x="24993.3" y="524.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
-						</g>
-						<g transform="translate(24993.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
+						<g transform="translate(18503.25, 935)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Exception">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="25753.8" y="76.0" height="31.0" width="94.0" data-name="Exception"></rect>
+					<g data-name="NavbarTab">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
+							<rect x="18272.5" y="1375.0" height="31.0" width="103.0" data-name="NavbarTab"></rect>
 						</g>
-						<g transform="translate(25753.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
+						<g transform="translate(18272.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
+								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConfigException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
-							<rect x="25463.8" y="508.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
-							<path d="M25463.8 539.5 L25648.8 539.5" fill="none" data-name="FormConfigException"></path>
+					<g data-name="SingleColumnLayoutType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
+							<rect x="18908.5" y="1375.0" height="31.0" width="218.0" data-name="SingleColumnLayoutType"></rect>
 						</g>
-						<g transform="translate(25463.75, 508.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
-								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
+						<g transform="translate(18908.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
+								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25463.75, 539.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
+					</g>
+					<g data-name="WebFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
+							<rect x="44396.5" y="37.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
+							<path d="M44396.5 68.5 L44565.5 68.5" fill="none" data-name="WebFrame"></path>
+							<path d="M44396.5 114.5 L44565.5 114.5" fill="none" data-name="WebFrame"></path>
+						</g>
+						<g transform="translate(44396.5, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
+								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="36434.0" y="986.5" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-							<path d="M36434.0 1017.5 L36651.0 1017.5" fill="none" data-name="IFormViewModelDelegate"></path>
-						</g>
-						<g transform="translate(36434, 986.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
+						<g transform="translate(44396.5, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36434, 1017.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
+						<g transform="translate(44396.5, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControlOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
-							<rect x="27743.8" y="486.0" height="107.0" width="190.0" data-name="FormControlOption"></rect>
-							<path d="M27743.8 517.0 L27933.8 517.0" fill="none" data-name="FormControlOption"></path>
+					<g data-name="DisabledFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
+							<rect x="44605.5" y="60.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
+							<path d="M44605.5 91.5 L44741.5 91.5" fill="none" data-name="DisabledFrame"></path>
 						</g>
-						<g transform="translate(27743.75, 486)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
+						<g transform="translate(44605.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27743.75, 517)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
+						<g transform="translate(44605.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="27790.8" y="76.0" height="31.0" width="96.0" data-name="Equatable"></rect>
+					<g data-name="PhoneContainer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
+							<rect x="11648.0" y="1284.0" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
+							<path d="M11648.0 1315.0 L11975.0 1315.0" fill="none" data-name="PhoneContainer"></path>
+							<path d="M11648.0 1466.0 L11975.0 1466.0" fill="none" data-name="PhoneContainer"></path>
 						</g>
-						<g transform="translate(27790.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
+						<g transform="translate(11648, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
+								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
-							<rect x="23806.0" y="2990.5" height="122.0" width="282.0" data-name="FormMode"></rect>
-							<path d="M23806.0 3021.5 L24088.0 3021.5" fill="none" data-name="FormMode"></path>
-						</g>
-						<g transform="translate(23806, 2990.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
+						<g transform="translate(11648, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
+								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23806, 3021.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
+						<g transform="translate(11648, 1466)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
+								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormValidationSetEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
-							<rect x="35538.3" y="1009.5" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
+					<g data-name="Color">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
+							<rect x="21401.8" y="2220.5" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(35538.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
-								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
+						<g transform="translate(21401.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
+								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CancelableOperation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="37485.8" y="1009.5" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
+					<g data-name="MobileFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
+							<rect x="44781.5" y="60.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
+							<path d="M44781.5 91.5 L44917.5 91.5" fill="none" data-name="MobileFrame"></path>
 						</g>
-						<g transform="translate(37485.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
+						<g transform="translate(44781.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="27973.8" y="493.0" height="93.0" width="163.0" data-name="IFormData"></rect>
-							<path d="M27973.8 524.0 L28136.8 524.0" fill="none" data-name="IFormData"></path>
-							<path d="M27973.8 555.0 L28136.8 555.0" fill="none" data-name="IFormData"></path>
-						</g>
-						<g transform="translate(27973.75, 493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
+						<g transform="translate(44781.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27973.75, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
+					</g>
+					<g data-name="DesktopFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
+							<rect x="44957.5" y="60.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
+							<path d="M44957.5 91.5 L45093.5 91.5" fill="none" data-name="DesktopFrame"></path>
+						</g>
+						<g transform="translate(44957.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27973.75, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
+						<g transform="translate(44957.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="UnsavedChangesDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
-							<rect x="38762.0" y="60.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
-							<path d="M38762.0 91.5 L38969.0 91.5" fill="none" data-name="UnsavedChangesDialog"></path>
+					<g data-name="StudyTestScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
+							<rect x="15046.3" y="2159.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
+							<path d="M15046.3 2190.5 L15246.3 2190.5" fill="none" data-name="StudyTestScreen"></path>
+							<path d="M15046.3 2221.5 L15246.3 2221.5" fill="none" data-name="StudyTestScreen"></path>
 						</g>
-						<g transform="translate(38762, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
+						<g transform="translate(15046.25, 2159.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
+								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38762, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
+						<g transform="translate(15046.25, 2190.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(15046.25, 2221.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControlValidation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
-							<rect x="12786.8" y="2167.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
-							<path d="M12786.8 2198.0 L13271.8 2198.0" fill="none" data-name="FormControlValidation"></path>
-							<path d="M12786.8 2274.0 L13271.8 2274.0" fill="none" data-name="FormControlValidation"></path>
+					<g data-name="StudySettingsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
+							<rect x="42882.8" y="2107.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
+							<path d="M42882.8 2138.0 L43361.8 2138.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+							<path d="M42882.8 2274.0 L43361.8 2274.0" fill="none" data-name="StudySettingsFormViewModel"></path>
 						</g>
-						<g transform="translate(12786.75, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
-								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
+						<g transform="translate(42882.75, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12786.75, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
+						<g transform="translate(42882.75, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12786.75, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
+						<g transform="translate(42882.75, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="37510.8" y="1359.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
-							<path d="M37510.8 1390.5 L37906.8 1390.5" fill="none" data-name="ManagedFormViewModel"></path>
+					<g data-name="AsyncValue">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
+							<rect x="42963.5" y="3036.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
 						</g>
-						<g transform="translate(37510.75, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
+						<g transform="translate(42963.5, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37510.75, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
+					</g>
+					<g data-name="StudySettingsDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
+							<rect x="15286.3" y="2205.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
+							<path d="M15286.3 2236.0 L15461.3 2236.0" fill="none" data-name="StudySettingsDialog"></path>
+						</g>
+						<g transform="translate(15286.25, 2205)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
+								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormViewModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
-							<rect x="25793.0" y="524.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
-						</g>
-						<g transform="translate(25793, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
+						<g transform="translate(15286.25, 2236)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="32839.8" y="3258.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
-							<path d="M32839.8 3289.0 L33120.8 3289.0" fill="none" data-name="FormViewModelCollection"></path>
-							<path d="M32839.8 3380.0 L33120.8 3380.0" fill="none" data-name="FormViewModelCollection"></path>
+					<g data-name="StudyTestController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
+							<rect x="6505.8" y="2197.5" height="77.0" width="282.0" data-name="StudyTestController"></rect>
+							<path d="M6505.8 2228.5 L6787.8 2228.5" fill="none" data-name="StudyTestController"></path>
 						</g>
-						<g transform="translate(32839.75, 3258)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
+						<g transform="translate(6505.75, 2197.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32839.75, 3289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
+						<g transform="translate(6505.75, 2228.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32839.75, 3380)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
+					</g>
+					<g data-name="TestAppRoutes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
+							<rect x="45133.5" y="23.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
+							<path d="M45133.5 54.0 L45393.5 54.0" fill="none" data-name="TestAppRoutes"></path>
+						</g>
+						<g transform="translate(45133.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
+								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="30603.8" y="3571.0" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(30603.75, 3571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
+						<g transform="translate(45133.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
+								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="DrawerEntry">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
-							<rect x="22550.8" y="926.0" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
-							<path d="M22550.8 957.0 L22995.8 957.0" fill="none" data-name="DrawerEntry"></path>
-							<path d="M22550.8 1093.0 L22995.8 1093.0" fill="none" data-name="DrawerEntry"></path>
+							<rect x="21102.5" y="926.0" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
+							<path d="M21102.5 957.0 L21547.5 957.0" fill="none" data-name="DrawerEntry"></path>
+							<path d="M21102.5 1093.0 L21547.5 1093.0" fill="none" data-name="DrawerEntry"></path>
 						</g>
-						<g transform="translate(22550.75, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
+						<g transform="translate(21102.5, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
 								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22550.75, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+						<g transform="translate(21102.5, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
@@ -5848,7 +5990,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(22550.75, 1093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+						<g transform="translate(21102.5, 1093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
 								
@@ -5857,9 +5999,9 @@
 					</g>
 					<g data-name="String Function()">
 						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
-							<rect x="22376.3" y="1375.0" height="31.0" width="147.0" data-name="String Function()"></rect>
+							<rect x="20328.0" y="1375.0" height="31.0" width="147.0" data-name="String Function()"></rect>
 						</g>
-						<g transform="translate(22376.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
+						<g transform="translate(20328, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
 								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
 								
@@ -5868,9 +6010,9 @@
 					</g>
 					<g data-name="String Function()?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
-							<rect x="23018.3" y="1375.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
+							<rect x="23156.3" y="1375.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
 						</g>
-						<g transform="translate(23018.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
+						<g transform="translate(23156.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
 								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
 								
@@ -5879,9 +6021,9 @@
 					</g>
 					<g data-name="void Function(BuildContext, WidgetRef)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
-							<rect x="23636.3" y="1375.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
+							<rect x="23353.3" y="1375.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
 						</g>
-						<g transform="translate(23636.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
+						<g transform="translate(23353.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
 								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
 								
@@ -5890,24 +6032,24 @@
 					</g>
 					<g data-name="GoRouterDrawerEntry">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
-							<rect x="24012.3" y="1336.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
-							<path d="M24012.3 1367.5 L24276.3 1367.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-							<path d="M24012.3 1413.5 L24276.3 1413.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+							<rect x="24817.5" y="1336.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
+							<path d="M24817.5 1367.5 L25081.5 1367.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+							<path d="M24817.5 1413.5 L25081.5 1413.5" fill="none" data-name="GoRouterDrawerEntry"></path>
 						</g>
-						<g transform="translate(24012.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
+						<g transform="translate(24817.5, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
 								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24012.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+						<g transform="translate(24817.5, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24012.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+						<g transform="translate(24817.5, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
 								
@@ -5916,9 +6058,9 @@
 					</g>
 					<g data-name="RoutingIntent">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="23734.0" y="2220.5" height="31.0" width="122.0" data-name="RoutingIntent"></rect>
+							<rect x="24868.5" y="2220.5" height="31.0" width="122.0" data-name="RoutingIntent"></rect>
 						</g>
-						<g transform="translate(23734, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
+						<g transform="translate(24868.5, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
 								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
 								
@@ -5927,16 +6069,16 @@
 					</g>
 					<g data-name="AppDrawer">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
-							<rect x="39009.0" y="8.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
-							<path d="M39009.0 39.0 L39278.0 39.0" fill="none" data-name="AppDrawer"></path>
+							<rect x="45433.5" y="8.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
+							<path d="M45433.5 39.0 L45702.5 39.0" fill="none" data-name="AppDrawer"></path>
 						</g>
-						<g transform="translate(39009, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
+						<g transform="translate(45433.5, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
 								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39009, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
+						<g transform="translate(45433.5, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
@@ -5950,1497 +6092,1639 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInvitesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="40037.0" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M40037.0 31.0 L40603.0 31.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M40037.0 137.0 L40603.0 137.0" fill="none" data-name="StudyInvitesTable"></path>
+					<g data-name="StudyAnalyzeScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
+							<rect x="15628.3" y="2197.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
+							<path d="M15628.3 2228.5 L15808.3 2228.5" fill="none" data-name="StudyAnalyzeScreen"></path>
 						</g>
-						<g transform="translate(40037, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
-								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
+						<g transform="translate(15628.25, 2197.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
+								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40037, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
+						<g transform="translate(15628.25, 2228.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40037, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
+					</g>
+					<g data-name="StudyAnalyzeController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
+							<rect x="6827.8" y="2205.0" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
+							<path d="M6827.8 2236.0 L7028.8 2236.0" fill="none" data-name="StudyAnalyzeController"></path>
+						</g>
+						<g transform="translate(6827.75, 2205)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
+								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
+								
+							</g>
+						</g>
+						<g transform="translate(6827.75, 2236)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="39521.5" y="524.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
+					<g data-name="StudyDesignInterventionsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
+							<rect x="11855.8" y="3020.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
+							<path d="M11855.8 3051.5 L12151.8 3051.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
 						</g>
-						<g transform="translate(39521.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
+						<g transform="translate(11855.75, 3020.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(11855.75, 3051.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="39783.5" y="524.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
+					<g data-name="StudyDesignPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
+							<rect x="16991.3" y="2205.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
+							<path d="M16991.3 2236.0 L17203.3 2236.0" fill="none" data-name="StudyDesignPageWidget"></path>
 						</g>
-						<g transform="translate(39783.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+						<g transform="translate(16991.25, 2205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
+								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
+								
+							</g>
+						</g>
+						<g transform="translate(16991.25, 2236)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Intervention? Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="40664.5" y="524.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
+					<g data-name="InterventionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
+							<rect x="13611.0" y="1359.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
+							<path d="M13611.0 1390.5 L13986.0 1390.5" fill="none" data-name="InterventionFormView"></path>
 						</g>
-						<g transform="translate(40664.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
+						<g transform="translate(13611, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
+								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(13611, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="int Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="40955.5" y="524.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
+					<g data-name="InterventionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
+							<rect x="26742.0" y="2002.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
+							<path d="M26742.0 2033.0 L27597.0 2033.0" fill="none" data-name="InterventionFormViewModel"></path>
+							<path d="M26742.0 2259.0 L27597.0 2259.0" fill="none" data-name="InterventionFormViewModel"></path>
 						</g>
-						<g transform="translate(40955.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
+						<g transform="translate(26742, 2002)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
+								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(26742, 2033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(26742, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
-							<rect x="39723.0" y="1336.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
-							<path d="M39723.0 1367.5 L40161.0 1367.5" fill="none" data-name="InviteCodeFormView"></path>
-							<path d="M39723.0 1398.5 L40161.0 1398.5" fill="none" data-name="InviteCodeFormView"></path>
+					<g data-name="InterventionPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
+							<rect x="8740.0" y="1344.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
+							<path d="M8740.0 1375.0 L9070.0 1375.0" fill="none" data-name="InterventionPreview"></path>
+							<path d="M8740.0 1406.0 L9070.0 1406.0" fill="none" data-name="InterventionPreview"></path>
 						</g>
-						<g transform="translate(39723, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
-								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
+						<g transform="translate(8740, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39723, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
+						<g transform="translate(8740, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39723, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
+						<g transform="translate(8740, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="39359.0" y="2047.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M39359.0 2078.0 L40026.0 2078.0" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M39359.0 2304.0 L40026.0 2304.0" fill="none" data-name="InviteCodeFormViewModel"></path>
+					<g data-name="InterventionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
+							<rect x="7499.8" y="2220.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(39359, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
-								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
+						<g transform="translate(7499.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39359, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
+					</g>
+					<g data-name="StudyScheduleFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
+							<rect x="4114.5" y="971.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
+							<path d="M4114.5 1002.0 L4473.5 1002.0" fill="none" data-name="StudyScheduleFormView"></path>
+							<path d="M4114.5 1033.0 L4473.5 1033.0" fill="none" data-name="StudyScheduleFormView"></path>
+						</g>
+						<g transform="translate(4114.5, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
+								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4114.5, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4114.5, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StudyScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
+							<rect x="3915.0" y="1194.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
+							<path d="M3915.0 1225.0 L4673.0 1225.0" fill="none" data-name="StudyScheduleControls"></path>
+							<path d="M3915.0 1526.0 L4673.0 1526.0" fill="none" data-name="StudyScheduleControls"></path>
+						</g>
+						<g transform="translate(3915, 1194)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
+								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
+								
+							</g>
+						</g>
+						<g transform="translate(3915, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39359, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
+						<g transform="translate(3915, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="40432.5" y="524.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
+					<g data-name="InterventionTaskFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
+							<rect x="36226.5" y="1306.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
+							<path d="M36226.5 1337.5 L36516.5 1337.5" fill="none" data-name="InterventionTaskFormData"></path>
+							<path d="M36226.5 1428.5 L36516.5 1428.5" fill="none" data-name="InterventionTaskFormData"></path>
 						</g>
-						<g transform="translate(40432.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
+						<g transform="translate(36226.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
+								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IInviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="30522.3" y="3036.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
+						<g transform="translate(36226.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
+								
+							</g>
 						</g>
-						<g transform="translate(30522.25, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
+						<g transform="translate(36226.5, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRecruitController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="8072.8" y="2144.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M8072.8 2175.5 L8723.8 2175.5" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M8072.8 2221.5 L8723.8 2221.5" fill="none" data-name="StudyRecruitController"></path>
+					<g data-name="IFormDataWithSchedule">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
+							<rect x="36817.5" y="941.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
+							<path d="M36817.5 972.0 L37115.5 972.0" fill="none" data-name="IFormDataWithSchedule"></path>
+							<path d="M36817.5 1078.0 L37115.5 1078.0" fill="none" data-name="IFormDataWithSchedule"></path>
 						</g>
-						<g transform="translate(8072.75, 2144.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
-								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
+						<g transform="translate(36817.5, 941)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
+								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8072.75, 2175.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
+						<g transform="translate(36817.5, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8072.75, 2221.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
+						<g transform="translate(36817.5, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRecruitScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="7909.8" y="2998.0" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M7909.8 3029.0 L8223.8 3029.0" fill="none" data-name="StudyRecruitScreen"></path>
+					<g data-name="InterventionsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
+							<rect x="30343.3" y="2047.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
+							<path d="M30343.3 2078.0 L31182.3 2078.0" fill="none" data-name="InterventionsFormViewModel"></path>
+							<path d="M30343.3 2229.0 L31182.3 2229.0" fill="none" data-name="InterventionsFormViewModel"></path>
 						</g>
-						<g transform="translate(7909.75, 2998)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
+						<g transform="translate(30343.25, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
+								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7909.75, 3029)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
+						<g transform="translate(30343.25, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="EnrolledBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="40898.0" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M40898.0 76.0 L41064.0 76.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M40898.0 107.0 L41064.0 107.0" fill="none" data-name="EnrolledBadge"></path>
-						</g>
-						<g transform="translate(40898, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
+						<g transform="translate(30343.25, 2229)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40898, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
-								
-							</g>
+					</g>
+					<g data-name="IListActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
+							<rect x="17877.3" y="1375.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
 						</g>
-						<g transform="translate(40898, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
+						<g transform="translate(17877.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PublishConfirmationDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
-							<rect x="8263.8" y="3020.5" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
-							<path d="M8263.8 3051.5 L8487.8 3051.5" fill="none" data-name="PublishConfirmationDialog"></path>
+					<g data-name="IProviderArgsResolver">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
+							<rect x="27783.8" y="1009.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
 						</g>
-						<g transform="translate(8263.75, 3020.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
+						<g transform="translate(27783.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8263.75, 3051.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
+					</g>
+					<g data-name="InterventionTaskFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
+							<rect x="27637.0" y="2099.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
+							<path d="M27637.0 2130.5 L28333.0 2130.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<path d="M27637.0 2311.5 L28333.0 2311.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+						</g>
+						<g transform="translate(27637, 2099.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PublishSuccessDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
-							<rect x="8527.8" y="3020.5" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
-							<path d="M8527.8 3051.5 L8718.8 3051.5" fill="none" data-name="PublishSuccessDialog"></path>
-						</g>
-						<g transform="translate(8527.75, 3020.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
+						<g transform="translate(27637, 2130.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8527.75, 3051.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
+						<g transform="translate(27637, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PublishDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
-							<rect x="8758.8" y="3020.5" height="62.0" width="136.0" data-name="PublishDialog"></rect>
-							<path d="M8758.8 3051.5 L8894.8 3051.5" fill="none" data-name="PublishDialog"></path>
+					<g data-name="WithScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
+							<rect x="26108.8" y="1239.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
+							<path d="M26108.8 1270.0 L26603.8 1270.0" fill="none" data-name="WithScheduleControls"></path>
+							<path d="M26108.8 1496.0 L26603.8 1496.0" fill="none" data-name="WithScheduleControls"></path>
 						</g>
-						<g transform="translate(8758.75, 3020.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
+						<g transform="translate(26108.75, 1239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
+								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8758.75, 3051.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
+						<g transform="translate(26108.75, 1270)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyFormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="14052.0" y="1329.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M14052.0 1360.0 L14440.0 1360.0" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M14052.0 1421.0 L14440.0 1421.0" fill="none" data-name="StudyFormScaffold"></path>
-						</g>
-						<g transform="translate(14052, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
+						<g transform="translate(26108.75, 1496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14052, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
-								
-							</g>
+					</g>
+					<g data-name="PhaseSequence">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
+							<rect x="14875.8" y="3036.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
 						</g>
-						<g transform="translate(14052, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
+						<g transform="translate(14875.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
+								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="T Function(WidgetRef)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="14039.8" y="2220.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
+					<g data-name="InterventionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
+							<rect x="28521.8" y="926.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
+							<path d="M28521.8 957.0 L28903.8 957.0" fill="none" data-name="InterventionFormData"></path>
+							<path d="M28521.8 1078.0 L28903.8 1078.0" fill="none" data-name="InterventionFormData"></path>
 						</g>
-						<g transform="translate(14039.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
+						<g transform="translate(28521.75, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
+								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="14348.0" y="2220.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
+						<g transform="translate(28521.75, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
+								
+							</g>
 						</g>
-						<g transform="translate(14348, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
+						<g transform="translate(28521.75, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormValidationSet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="1000.8" y="3013.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M1000.8 3044.0 L1387.8 3044.0" fill="none" data-name="StudyFormValidationSet"></path>
+					<g data-name="StudyScheduleFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
+							<rect x="29567.3" y="2137.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
+							<path d="M29567.3 2168.0 L29863.3 2168.0" fill="none" data-name="StudyScheduleFormData"></path>
+							<path d="M29567.3 2274.0 L29863.3 2274.0" fill="none" data-name="StudyScheduleFormData"></path>
 						</g>
-						<g transform="translate(1000.75, 3013)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
-								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
+						<g transform="translate(29567.25, 2137)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1000.75, 3044)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
+						<g transform="translate(29567.25, 2168)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="17800.0" y="896.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M17800.0 927.0 L18968.0 927.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M17800.0 1063.0 L18968.0 1063.0" fill="none" data-name="QuestionFormData"></path>
-						</g>
-						<g transform="translate(17800, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
+						<g transform="translate(29567.25, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17800, 927)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
+					</g>
+					<g data-name="IStudyFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
+							<rect x="31521.5" y="994.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
+							<path d="M31521.5 1025.0 L31664.5 1025.0" fill="none" data-name="IStudyFormData"></path>
+						</g>
+						<g transform="translate(31521.5, 994)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
+								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17800, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
+						<g transform="translate(31521.5, 1025)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="11219.5" y="2983.0" height="137.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M11219.5 3014.0 L11582.5 3014.0" fill="none" data-name="SurveyQuestionType"></path>
+					<g data-name="InterventionTaskFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
+							<rect x="18415.5" y="1359.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
+							<path d="M18415.5 1390.5 L18828.5 1390.5" fill="none" data-name="InterventionTaskFormView"></path>
 						</g>
-						<g transform="translate(11219.5, 2983)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
+						<g transform="translate(18415.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11219.5, 3014)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
+						<g transform="translate(18415.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="18671.3" y="1306.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M18671.3 1337.5 L19015.3 1337.5" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M18671.3 1398.5 L19015.3 1398.5" fill="none" data-name="ChoiceQuestionFormData"></path>
+					<g data-name="InterventionsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
+							<rect x="29731.0" y="1321.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
+							<path d="M29731.0 1352.5 L30125.0 1352.5" fill="none" data-name="InterventionsFormData"></path>
+							<path d="M29731.0 1413.5 L30125.0 1413.5" fill="none" data-name="InterventionsFormData"></path>
 						</g>
-						<g transform="translate(18671.25, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
+						<g transform="translate(29731, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
+								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18671.25, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(29731, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18671.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(29731, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="19055.3" y="1321.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M19055.3 1352.5 L19447.3 1352.5" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M19055.3 1398.5 L19447.3 1398.5" fill="none" data-name="BoolQuestionFormData"></path>
+					<g data-name="StudyDesignReportsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
+							<rect x="12191.8" y="3013.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
+							<path d="M12191.8 3044.0 L12584.8 3044.0" fill="none" data-name="StudyDesignReportsFormView"></path>
 						</g>
-						<g transform="translate(19055.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
+						<g transform="translate(12191.75, 3013)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
+								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19055.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(12191.75, 3044)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19055.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+					</g>
+					<g data-name="ReportItemFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
+							<rect x="28943.8" y="956.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
+							<path d="M28943.8 987.0 L29257.8 987.0" fill="none" data-name="ReportItemFormData"></path>
+							<path d="M28943.8 1048.0 L29257.8 1048.0" fill="none" data-name="ReportItemFormData"></path>
+						</g>
+						<g transform="translate(28943.75, 956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
+								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="19487.3" y="1246.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M19487.3 1277.5 L19831.3 1277.5" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M19487.3 1473.5 L19831.3 1473.5" fill="none" data-name="ScaleQuestionFormData"></path>
-						</g>
-						<g transform="translate(19487.25, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
+						<g transform="translate(28943.75, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19487.25, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
+						<g transform="translate(28943.75, 1048)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19487.25, 1473.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+					</g>
+					<g data-name="ReportSection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
+							<rect x="29036.8" y="1375.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
+						</g>
+						<g transform="translate(29036.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
+								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="20485.8" y="1306.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M20485.8 1337.5 L20829.8 1337.5" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M20485.8 1413.5 L20829.8 1413.5" fill="none" data-name="FreeTextQuestionFormData"></path>
+					<g data-name="DataReferenceEditor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
+							<rect x="16242.3" y="2167.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
+							<path d="M16242.3 2198.0 L16951.3 2198.0" fill="none" data-name="DataReferenceEditor"></path>
+							<path d="M16242.3 2259.0 L16951.3 2259.0" fill="none" data-name="DataReferenceEditor"></path>
 						</g>
-						<g transform="translate(20485.75, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
+						<g transform="translate(16242.25, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
+								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20485.75, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(16242.25, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20485.75, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(16242.25, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="20559.8" y="2220.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+					<g data-name="ReactiveDropdownField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
+							<rect x="10237.8" y="3036.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
 						</g>
-						<g transform="translate(20559.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
+						<g transform="translate(10237.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
+								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="17887.3" y="1352.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M17887.3 1383.0 L18239.3 1383.0" fill="none" data-name="SurveyQuestionFormView"></path>
+					<g data-name="TemporalAggregationFormatted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
+							<rect x="19166.5" y="1284.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
+							<path d="M19166.5 1315.0 L19614.5 1315.0" fill="none" data-name="TemporalAggregationFormatted"></path>
+							<path d="M19166.5 1421.0 L19614.5 1421.0" fill="none" data-name="TemporalAggregationFormatted"></path>
 						</g>
-						<g transform="translate(17887.25, 1352)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
+						<g transform="translate(19166.5, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
+								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17887.25, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
+						<g transform="translate(19166.5, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="18577.0" y="1627.0" height="1218.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M18577.0 1658.0 L19590.0 1658.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M18577.0 2559.0 L19590.0 2559.0" fill="none" data-name="QuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(18577, 1627)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
+						<g transform="translate(19166.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18577, 1658)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+					</g>
+					<g data-name="TemporalAggregation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
+							<rect x="19077.5" y="2220.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
+						</g>
+						<g transform="translate(19077.5, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
+								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18577, 2559)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
+					</g>
+					<g data-name="ImprovementDirectionFormatted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
+							<rect x="19837.0" y="1284.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
+							<path d="M19837.0 1315.0 L20288.0 1315.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
+							<path d="M19837.0 1421.0 L20288.0 1421.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
+						</g>
+						<g transform="translate(19837, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
+								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="41104.0" y="60.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M41104.0 91.5 L41413.0 91.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
+						<g transform="translate(19837, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
+								
+							</g>
 						</g>
-						<g transform="translate(41104, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
+						<g transform="translate(19837, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41104, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+					</g>
+					<g data-name="ImprovementDirection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
+							<rect x="20625.0" y="2220.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
+						</g>
+						<g transform="translate(20625, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
+								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="18279.3" y="1359.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M18279.3 1390.5 L18631.3 1390.5" fill="none" data-name="ScaleQuestionFormView"></path>
+					<g data-name="ReportSectionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
+							<rect x="9764.8" y="2998.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
+							<path d="M9764.8 3029.0 L10147.8 3029.0" fill="none" data-name="ReportSectionType"></path>
 						</g>
-						<g transform="translate(18279.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
+						<g transform="translate(9764.75, 2998)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
+								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18279.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(9764.75, 3029)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="14480.0" y="1344.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M14480.0 1375.0 L14832.0 1375.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M14480.0 1406.0 L14832.0 1406.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+					<g data-name="AverageSectionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
+							<rect x="10610.0" y="1329.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
+							<path d="M10610.0 1360.0 L11089.0 1360.0" fill="none" data-name="AverageSectionFormView"></path>
+							<path d="M10610.0 1421.0 L11089.0 1421.0" fill="none" data-name="AverageSectionFormView"></path>
 						</g>
-						<g transform="translate(14480, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
+						<g transform="translate(10610, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14480, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(10610, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14480, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
+						<g transform="translate(10610, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="14872.0" y="1344.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M14872.0 1375.0 L15224.0 1375.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M14872.0 1406.0 L15224.0 1406.0" fill="none" data-name="BoolQuestionFormView"></path>
+					<g data-name="ReportItemFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
+							<rect x="19598.0" y="1949.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
+							<path d="M19598.0 1980.5 L20585.0 1980.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<path d="M19598.0 2416.5 L20585.0 2416.5" fill="none" data-name="ReportItemFormViewModel"></path>
 						</g>
-						<g transform="translate(14872, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
+						<g transform="translate(19598, 1949.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
+								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14872, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(19598, 1980.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14872, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+						<g transform="translate(19598, 2416.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="15264.0" y="1321.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M15264.0 1352.5 L15616.0 1352.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M15264.0 1398.5 L15616.0 1398.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+					<g data-name="DataReferenceIdentifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
+							<rect x="45708.0" y="493.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
+							<path d="M45708.0 524.0 L45912.0 524.0" fill="none" data-name="DataReferenceIdentifier"></path>
+							<path d="M45708.0 555.0 L45912.0 555.0" fill="none" data-name="DataReferenceIdentifier"></path>
 						</g>
-						<g transform="translate(15264, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
+						<g transform="translate(45708, 493)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
+								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15264, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
+						<g transform="translate(45708, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15264, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
+						<g transform="translate(45708, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="20219.8" y="1375.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
+					<g data-name="DataReference">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
+							<rect x="45742.5" y="76.0" height="31.0" width="135.0" data-name="DataReference"></rect>
 						</g>
-						<g transform="translate(20219.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
+						<g transform="translate(45742.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
+								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="29105.8" y="1261.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M29105.8 1292.5 L29737.8 1292.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M29105.8 1398.5 L29737.8 1398.5" fill="none" data-name="WithQuestionnaireControls"></path>
+					<g data-name="LinearRegressionSectionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
+							<rect x="11129.0" y="1329.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
+							<path d="M11129.0 1360.0 L11608.0 1360.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<path d="M11129.0 1421.0 L11608.0 1421.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
 						</g>
-						<g transform="translate(29105.75, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
+						<g transform="translate(11129, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29105.75, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
+						<g transform="translate(11129, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29105.75, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
+						<g transform="translate(11129, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="25526.5" y="1009.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
+					<g data-name="ReportItemFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
+							<rect x="20555.0" y="1306.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
+							<path d="M20555.0 1337.5 L21022.0 1337.5" fill="none" data-name="ReportItemFormView"></path>
+							<path d="M20555.0 1413.5 L21022.0 1413.5" fill="none" data-name="ReportItemFormView"></path>
 						</g>
-						<g transform="translate(25526.5, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
+						<g transform="translate(20555, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
+								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(20555, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
+								
+							</g>
+						</g>
+						<g transform="translate(20555, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="Widget Function(BuildContext)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
+							<rect x="21105.8" y="2220.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
+						</g>
+						<g transform="translate(21105.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
+								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ReportsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
+							<rect x="41639.3" y="2062.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
+							<path d="M41639.3 2093.0 L42499.3 2093.0" fill="none" data-name="ReportsFormViewModel"></path>
+							<path d="M41639.3 2259.0 L42499.3 2259.0" fill="none" data-name="ReportsFormViewModel"></path>
+						</g>
+						<g transform="translate(41639.25, 2062)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
+								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(41639.25, 2093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(41639.25, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="25295.0" y="2167.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M25295.0 2198.0 L25663.0 2198.0" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M25295.0 2244.0 L25663.0 2244.0" fill="none" data-name="QuestionnaireFormData"></path>
+					<g data-name="ReportFormItemDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
+							<rect x="38027.5" y="2945.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
+							<path d="M38027.5 2976.0 L38870.5 2976.0" fill="none" data-name="ReportFormItemDelegate"></path>
+							<path d="M38027.5 3052.0 L38870.5 3052.0" fill="none" data-name="ReportFormItemDelegate"></path>
 						</g>
-						<g transform="translate(25295, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
+						<g transform="translate(38027.5, 2945)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
+								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25295, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
+						<g transform="translate(38027.5, 2976)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25295, 2244)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
+						<g transform="translate(38027.5, 3052)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="21007.8" y="941.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M21007.8 972.0 L21305.8 972.0" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M21007.8 1078.0 L21305.8 1078.0" fill="none" data-name="IFormDataWithSchedule"></path>
+					<g data-name="ReportBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
+							<rect x="21454.3" y="1321.5" height="138.0" width="197.0" data-name="ReportBadge"></rect>
+							<path d="M21454.3 1352.5 L21651.3 1352.5" fill="none" data-name="ReportBadge"></path>
+							<path d="M21454.3 1428.5 L21651.3 1428.5" fill="none" data-name="ReportBadge"></path>
 						</g>
-						<g transform="translate(21007.75, 941)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
+						<g transform="translate(21454.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21007.75, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
+						<g transform="translate(21454.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21007.75, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
+						<g transform="translate(21454.25, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="20944.3" y="1375.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
+					<g data-name="ReportStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
+							<rect x="11464.8" y="2998.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
+							<path d="M11464.8 3029.0 L11765.8 3029.0" fill="none" data-name="ReportStatus"></path>
 						</g>
-						<g transform="translate(20944.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
+						<g transform="translate(11464.75, 2998)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
+								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
+								
+							</g>
+						</g>
+						<g transform="translate(11464.75, 3029)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="40232.5" y="971.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M40232.5 1002.0 L40664.5 1002.0" fill="none" data-name="ScheduleControls"></path>
-							<path d="M40232.5 1033.0 L40664.5 1033.0" fill="none" data-name="ScheduleControls"></path>
+					<g data-name="ReportsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
+							<rect x="30557.0" y="1329.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
+							<path d="M30557.0 1360.0 L30895.0 1360.0" fill="none" data-name="ReportsFormData"></path>
+							<path d="M30557.0 1406.0 L30895.0 1406.0" fill="none" data-name="ReportsFormData"></path>
 						</g>
-						<g transform="translate(40232.5, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
+						<g transform="translate(30557, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
+								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40232.5, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
+						<g transform="translate(30557, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40232.5, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
+						<g transform="translate(30557, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="40201.0" y="1239.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M40201.0 1270.0 L40696.0 1270.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M40201.0 1496.0 L40696.0 1496.0" fill="none" data-name="WithScheduleControls"></path>
+					<g data-name="StudyInfoFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
+							<rect x="43616.0" y="1994.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
+							<path d="M43616.0 2025.5 L44312.0 2025.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+							<path d="M43616.0 2431.5 L44312.0 2431.5" fill="none" data-name="StudyInfoFormViewModel"></path>
 						</g>
-						<g transform="translate(40201, 1239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
+						<g transform="translate(43616, 1994.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40201, 1270)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
+						<g transform="translate(43616, 2025.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40201, 1496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
+						<g transform="translate(43616, 2431.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="26486.3" y="2002.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M26486.3 2033.0 L27341.3 2033.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M26486.3 2259.0 L27341.3 2259.0" fill="none" data-name="InterventionFormViewModel"></path>
-						</g>
-						<g transform="translate(26486.25, 2002)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
-								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
-								
-							</g>
+					<g data-name="StudyDesignInfoFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
+							<rect x="12624.8" y="3020.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
+							<path d="M12624.8 3051.5 L12847.8 3051.5" fill="none" data-name="StudyDesignInfoFormView"></path>
 						</g>
-						<g transform="translate(26486.25, 2033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(12624.75, 3020.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
+								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26486.25, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
+						<g transform="translate(12624.75, 3051.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="28002.3" y="2137.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M28002.3 2168.0 L28298.3 2168.0" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M28002.3 2274.0 L28298.3 2274.0" fill="none" data-name="StudyScheduleFormData"></path>
-						</g>
-						<g transform="translate(28002.25, 2137)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
-								
-							</g>
+					<g data-name="StudyInfoFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
+							<rect x="32623.5" y="1306.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
+							<path d="M32623.5 1337.5 L33037.5 1337.5" fill="none" data-name="StudyInfoFormData"></path>
+							<path d="M32623.5 1428.5 L33037.5 1428.5" fill="none" data-name="StudyInfoFormData"></path>
 						</g>
-						<g transform="translate(28002.25, 2168)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
+						<g transform="translate(32623.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
+								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28002.25, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
+						<g transform="translate(32623.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PhaseSequence">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="35773.5" y="3036.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
-						</g>
-						<g transform="translate(35773.5, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
-								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
+						<g transform="translate(32623.5, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="30620.5" y="994.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M30620.5 1025.0 L30763.5 1025.0" fill="none" data-name="IStudyFormData"></path>
+					<g data-name="StudyContactInfoFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
+							<rect x="32780.0" y="2122.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
+							<path d="M32780.0 2153.0 L33128.0 2153.0" fill="none" data-name="StudyContactInfoFormData"></path>
+							<path d="M32780.0 2304.0 L33128.0 2304.0" fill="none" data-name="StudyContactInfoFormData"></path>
 						</g>
-						<g transform="translate(30620.5, 994)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
+						<g transform="translate(32780, 2122)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
+								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30620.5, 1025)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
+						<g transform="translate(32780, 2153)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyScheduleFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="40935.5" y="971.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M40935.5 1002.0 L41294.5 1002.0" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M40935.5 1033.0 L41294.5 1033.0" fill="none" data-name="StudyScheduleFormView"></path>
-						</g>
-						<g transform="translate(40935.5, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
+						<g transform="translate(32780, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40935.5, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
+					</g>
+					<g data-name="StudyFormValidationSet">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
+							<rect x="2049.0" y="3013.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
+							<path d="M2049.0 3044.0 L2436.0 3044.0" fill="none" data-name="StudyFormValidationSet"></path>
+						</g>
+						<g transform="translate(2049, 3013)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
+								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40935.5, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
+						<g transform="translate(2049, 3044)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="40736.0" y="1194.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M40736.0 1225.0 L41494.0 1225.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M40736.0 1526.0 L41494.0 1526.0" fill="none" data-name="StudyScheduleControls"></path>
+					<g data-name="MeasurementsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
+							<rect x="33117.5" y="1329.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
+							<path d="M33117.5 1360.0 L33611.5 1360.0" fill="none" data-name="MeasurementsFormData"></path>
+							<path d="M33117.5 1406.0 L33611.5 1406.0" fill="none" data-name="MeasurementsFormData"></path>
 						</g>
-						<g transform="translate(40736, 1194)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
-								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
+						<g transform="translate(33117.5, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
+								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40736, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
+						<g transform="translate(33117.5, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40736, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
+						<g transform="translate(33117.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="21474.3" y="1359.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M21474.3 1390.5 L21887.3 1390.5" fill="none" data-name="InterventionTaskFormView"></path>
+					<g data-name="MeasurementSurveyFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
+							<rect x="25121.5" y="1359.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
+							<path d="M25121.5 1390.5 L25565.5 1390.5" fill="none" data-name="MeasurementSurveyFormView"></path>
 						</g>
-						<g transform="translate(21474.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
+						<g transform="translate(25121.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
+								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21474.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
+						<g transform="translate(25121.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="36424.3" y="2099.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M36424.3 2130.5 L37120.3 2130.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M36424.3 2311.5 L37120.3 2311.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+					<g data-name="MeasurementSurveyFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
+							<rect x="31222.3" y="2024.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
+							<path d="M31222.3 2055.5 L31918.3 2055.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+							<path d="M31222.3 2281.5 L31918.3 2281.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
 						</g>
-						<g transform="translate(36424.25, 2099.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
+						<g transform="translate(31222.25, 2024.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36424.25, 2130.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(31222.25, 2055.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36424.25, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
+						<g transform="translate(31222.25, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="15656.0" y="1344.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M15656.0 1375.0 L15986.0 1375.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M15656.0 1406.0 L15986.0 1406.0" fill="none" data-name="InterventionPreview"></path>
+					<g data-name="SurveyPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
+							<rect x="12015.0" y="1344.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
+							<path d="M12015.0 1375.0 L12359.0 1375.0" fill="none" data-name="SurveyPreview"></path>
+							<path d="M12015.0 1406.0 L12359.0 1406.0" fill="none" data-name="SurveyPreview"></path>
 						</g>
-						<g transform="translate(15656, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
+						<g transform="translate(12015, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15656, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
+						<g transform="translate(12015, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15656, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
+						<g transform="translate(12015, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="15704.5" y="2220.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
+					<g data-name="MeasurementFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
+							<rect x="10774.8" y="2220.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(15704.5, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
+						<g transform="translate(10774.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
+								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="28071.8" y="1321.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M28071.8 1352.5 L28465.8 1352.5" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M28071.8 1413.5 L28465.8 1413.5" fill="none" data-name="InterventionsFormData"></path>
+					<g data-name="MeasurementSurveyFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
+							<rect x="36556.5" y="1291.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
+							<path d="M36556.5 1322.5 L36965.5 1322.5" fill="none" data-name="MeasurementSurveyFormData"></path>
+							<path d="M36556.5 1443.5 L36965.5 1443.5" fill="none" data-name="MeasurementSurveyFormData"></path>
 						</g>
-						<g transform="translate(28071.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
+						<g transform="translate(36556.5, 1291.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
+								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28071.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
+						<g transform="translate(36556.5, 1322.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28071.75, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
+						<g transform="translate(36556.5, 1443.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="21144.3" y="1306.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M21144.3 1337.5 L21434.3 1337.5" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M21144.3 1428.5 L21434.3 1428.5" fill="none" data-name="InterventionTaskFormData"></path>
+					<g data-name="QuestionnaireFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
+							<rect x="33994.5" y="2167.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
+							<path d="M33994.5 2198.0 L34362.5 2198.0" fill="none" data-name="QuestionnaireFormData"></path>
+							<path d="M33994.5 2244.0 L34362.5 2244.0" fill="none" data-name="QuestionnaireFormData"></path>
 						</g>
-						<g transform="translate(21144.25, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
+						<g transform="translate(33994.5, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
+								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21144.25, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
+						<g transform="translate(33994.5, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21144.25, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
+						<g transform="translate(33994.5, 2244)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="22603.3" y="1359.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M22603.3 1390.5 L22978.3 1390.5" fill="none" data-name="InterventionFormView"></path>
-						</g>
-						<g transform="translate(22603.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
-								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
-								
-							</g>
+					<g data-name="WithQuestionnaireControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
+							<rect x="37005.5" y="1261.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
+							<path d="M37005.5 1292.5 L37637.5 1292.5" fill="none" data-name="WithQuestionnaireControls"></path>
+							<path d="M37005.5 1398.5 L37637.5 1398.5" fill="none" data-name="WithQuestionnaireControls"></path>
 						</g>
-						<g transform="translate(22603.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
+						<g transform="translate(37005.5, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
+								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyDesignInterventionsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="10798.5" y="3363.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M10798.5 3394.5 L11094.5 3394.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
-						</g>
-						<g transform="translate(10798.5, 3363.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
+						<g transform="translate(37005.5, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10798.5, 3394.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
+						<g transform="translate(37005.5, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="11672.5" y="3020.5" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M11672.5 3051.5 L11884.5 3051.5" fill="none" data-name="StudyDesignPageWidget"></path>
+					<g data-name="StudyDesignMeasurementsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
+							<rect x="13328.8" y="3020.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
+							<path d="M13328.8 3051.5 L13638.8 3051.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
 						</g>
-						<g transform="translate(11672.5, 3020.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
+						<g transform="translate(13328.75, 3020.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
+								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11672.5, 3051.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
+						<g transform="translate(13328.75, 3051.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="35545.3" y="2047.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M35545.3 2078.0 L36384.3 2078.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M35545.3 2229.0 L36384.3 2229.0" fill="none" data-name="InterventionsFormViewModel"></path>
-						</g>
-						<g transform="translate(35545.25, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
-								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
-								
-							</g>
+					<g data-name="MeasurementsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
+							<rect x="37401.5" y="2054.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
+							<path d="M37401.5 2085.5 L38493.5 2085.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+							<path d="M37401.5 2236.5 L38493.5 2236.5" fill="none" data-name="MeasurementsFormViewModel"></path>
 						</g>
-						<g transform="translate(35545.25, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
+						<g transform="translate(37401.5, 2054.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
+								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35545.25, 2229)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
+						<g transform="translate(37401.5, 2085.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(37401.5, 2236.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="25104.5" y="926.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M25104.5 957.0 L25486.5 957.0" fill="none" data-name="InterventionFormData"></path>
-							<path d="M25104.5 1078.0 L25486.5 1078.0" fill="none" data-name="InterventionFormData"></path>
+					<g data-name="StudyFormScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
+							<rect x="12399.0" y="1329.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
+							<path d="M12399.0 1360.0 L12787.0 1360.0" fill="none" data-name="StudyFormScaffold"></path>
+							<path d="M12399.0 1421.0 L12787.0 1421.0" fill="none" data-name="StudyFormScaffold"></path>
 						</g>
-						<g transform="translate(25104.5, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
+						<g transform="translate(12399, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
+								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25104.5, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
+						<g transform="translate(12399, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25104.5, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
+						<g transform="translate(12399, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="30833.0" y="1306.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M30833.0 1337.5 L31287.0 1337.5" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M30833.0 1428.5 L31287.0 1428.5" fill="none" data-name="EnrollmentFormData"></path>
+					<g data-name="T Function(WidgetRef)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
+							<rect x="11134.8" y="2220.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
 						</g>
-						<g transform="translate(30833, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
-								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
+						<g transform="translate(11134.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30833, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
-								
-							</g>
+					</g>
+					<g data-name="Widget Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
+							<rect x="11443.0" y="2220.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
 						</g>
-						<g transform="translate(30833, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
+						<g transform="translate(11443, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ConsentItemFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="29428.3" y="2107.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M29428.3 2138.0 L30124.3 2138.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M29428.3 2304.0 L30124.3 2304.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+							<rect x="33258.5" y="2107.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
+							<path d="M33258.5 2138.0 L33954.5 2138.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+							<path d="M33258.5 2304.0 L33954.5 2304.0" fill="none" data-name="ConsentItemFormViewModel"></path>
 						</g>
-						<g transform="translate(29428.25, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
+						<g transform="translate(33258.5, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29428.25, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+						<g transform="translate(33258.5, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
@@ -7455,7 +7739,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(29428.25, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+						<g transform="translate(33258.5, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
@@ -7464,36 +7748,38 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="23215.3" y="1359.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M23215.3 1390.5 L23596.3 1390.5" fill="none" data-name="ConsentItemFormView"></path>
+					<g data-name="StudyDesignEnrollmentFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
+							<rect x="13678.8" y="3005.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
+							<path d="M13678.8 3036.5 L14127.8 3036.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
 						</g>
-						<g transform="translate(23215.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
+						<g transform="translate(13678.75, 3005.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
+								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23215.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
+						<g transform="translate(13678.75, 3036.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="IScreenerQuestionLogicFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="23896.0" y="2205.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M23896.0 2236.0 L24228.0 2236.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
+							<rect x="26024.3" y="2205.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
+							<path d="M26024.3 2236.0 L26356.3 2236.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
 						</g>
-						<g transform="translate(23896, 2205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
+						<g transform="translate(26024.25, 2205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
 								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23896, 2236)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
+						<g transform="translate(26024.25, 2236)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
@@ -7502,1162 +7788,1094 @@
 					</g>
 					<g data-name="ScreenerQuestionLogicFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="41322.0" y="2167.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M41322.0 2198.0 L41746.0 2198.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M41322.0 2229.0 L41746.0 2229.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+							<rect x="25393.5" y="2167.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
+							<path d="M25393.5 2198.0 L25817.5 2198.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+							<path d="M25393.5 2229.0 L25817.5 2229.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
 						</g>
-						<g transform="translate(41322, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+						<g transform="translate(25393.5, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
 								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41322, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+						<g transform="translate(25393.5, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
 								
 							</g>
-						</g>
-						<g transform="translate(41322, 2229)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="31593.3" y="2885.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M31593.3 2916.0 L32155.3 2916.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M31593.3 3097.0 L32155.3 3097.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(31593.25, 2885)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
-								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31593.25, 2916)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31593.25, 3097)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignEnrollmentFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="11134.5" y="3348.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M11134.5 3379.5 L11583.5 3379.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
-						</g>
-						<g transform="translate(11134.5, 3348.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11134.5, 3379.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="26849.3" y="941.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M26849.3 972.0 L27107.3 972.0" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M26849.3 1063.0 L27107.3 1063.0" fill="none" data-name="ConsentItemFormData"></path>
-						</g>
-						<g transform="translate(26849.25, 941)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26849.25, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26849.25, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="31183.3" y="1987.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M31183.3 2018.0 L32085.3 2018.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M31183.3 2244.0 L32085.3 2244.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-						</g>
-						<g transform="translate(31183.25, 1987)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
-								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31183.25, 2018)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31183.25, 2244)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormConsentItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="30753.3" y="2945.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M30753.3 2976.0 L31553.3 2976.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M30753.3 3052.0 L31553.3 3052.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-						</g>
-						<g transform="translate(30753.25, 2945)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(30753.25, 2976)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(30753.25, 3052)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
+						</g>
+						<g transform="translate(25393.5, 2229)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="33709.0" y="2054.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M33709.0 2085.5 L34801.0 2085.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M33709.0 2236.5 L34801.0 2236.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+					<g data-name="ScreenerQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
+							<rect x="25533.5" y="2885.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
+							<path d="M25533.5 2916.0 L26095.5 2916.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+							<path d="M25533.5 3097.0 L26095.5 3097.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(33709, 2054.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
-								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
+						<g transform="translate(25533.5, 2885)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
+								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33709, 2085.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(25533.5, 2916)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33709, 2236.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
+						<g transform="translate(25533.5, 3097)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="21927.3" y="1291.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M21927.3 1322.5 L22336.3 1322.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M21927.3 1443.5 L22336.3 1443.5" fill="none" data-name="MeasurementSurveyFormData"></path>
+					<g data-name="ConsentItemFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
+							<rect x="33880.5" y="941.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
+							<path d="M33880.5 972.0 L34138.5 972.0" fill="none" data-name="ConsentItemFormData"></path>
+							<path d="M33880.5 1063.0 L34138.5 1063.0" fill="none" data-name="ConsentItemFormData"></path>
 						</g>
-						<g transform="translate(21927.25, 1291.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
+						<g transform="translate(33880.5, 941)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
+								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21927.25, 1322.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
+						<g transform="translate(33880.5, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21927.25, 1443.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
+						<g transform="translate(33880.5, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="16026.0" y="1344.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M16026.0 1375.0 L16370.0 1375.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M16026.0 1406.0 L16370.0 1406.0" fill="none" data-name="SurveyPreview"></path>
+					<g data-name="ConsentItemFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
+							<rect x="27669.8" y="1359.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
+							<path d="M27669.8 1390.5 L28050.8 1390.5" fill="none" data-name="ConsentItemFormView"></path>
 						</g>
-						<g transform="translate(16026, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
+						<g transform="translate(27669.75, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
+								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16026, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
+						<g transform="translate(27669.75, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16026, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
+					</g>
+					<g data-name="EnrollmentFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
+							<rect x="33651.5" y="1306.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
+							<path d="M33651.5 1337.5 L34105.5 1337.5" fill="none" data-name="EnrollmentFormData"></path>
+							<path d="M33651.5 1428.5 L34105.5 1428.5" fill="none" data-name="EnrollmentFormData"></path>
+						</g>
+						<g transform="translate(33651.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
+								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="16074.5" y="2220.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
+						<g transform="translate(33651.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
+								
+							</g>
 						</g>
-						<g transform="translate(16074.5, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
+						<g transform="translate(33651.5, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="30204.3" y="2024.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M30204.3 2055.5 L30900.3 2055.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M30204.3 2281.5 L30900.3 2281.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+					<g data-name="QuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
+							<rect x="23815.5" y="1627.0" height="1218.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M23815.5 1658.0 L24828.5 1658.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M23815.5 2559.0 L24828.5 2559.0" fill="none" data-name="QuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(30204.25, 2024.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
+						<g transform="translate(23815.5, 1627)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
+								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30204.25, 2055.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(23815.5, 1658)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
+								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
+								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
+								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
+								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
+								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
+								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
+								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
+								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
+								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
+								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
+								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
+								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
+								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
+								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
+								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
+								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30204.25, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
+						<g transform="translate(23815.5, 2559)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="24882.3" y="1359.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M24882.3 1390.5 L25326.3 1390.5" fill="none" data-name="MeasurementSurveyFormView"></path>
+					<g data-name="EnrollmentFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
+							<rect x="39030.5" y="1987.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
+							<path d="M39030.5 2018.0 L39932.5 2018.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+							<path d="M39030.5 2244.0 L39932.5 2244.0" fill="none" data-name="EnrollmentFormViewModel"></path>
 						</g>
-						<g transform="translate(24882.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
+						<g transform="translate(39030.5, 1987)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
+								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(39030.5, 2018)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24882.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
+						<g transform="translate(39030.5, 2244)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="31327.0" y="1329.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M31327.0 1360.0 L31821.0 1360.0" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M31327.0 1406.0 L31821.0 1406.0" fill="none" data-name="MeasurementsFormData"></path>
+					<g data-name="EnrollmentFormConsentItemDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
+							<rect x="32374.8" y="2945.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
+							<path d="M32374.8 2976.0 L33174.8 2976.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+							<path d="M32374.8 3052.0 L33174.8 3052.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
 						</g>
-						<g transform="translate(31327, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
-								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
+						<g transform="translate(32374.75, 2945)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31327, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
+						<g transform="translate(32374.75, 2976)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31327, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
+						<g transform="translate(32374.75, 3052)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignMeasurementsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="11623.5" y="3363.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M11623.5 3394.5 L11933.5 3394.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
+					<g data-name="StudyFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
+							<rect x="43382.0" y="1209.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
+							<path d="M43382.0 1240.0 L44078.0 1240.0" fill="none" data-name="StudyFormViewModel"></path>
+							<path d="M43382.0 1451.0 L44078.0 1451.0" fill="none" data-name="StudyFormViewModel"></path>
 						</g>
-						<g transform="translate(11623.5, 3363.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
+						<g transform="translate(43382, 1209)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11623.5, 3394.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
+						<g transform="translate(43382, 1240)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(43382, 1451)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignInfoFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="18858.5" y="3363.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M18858.5 3394.5 L19081.5 3394.5" fill="none" data-name="StudyDesignInfoFormView"></path>
+					<g data-name="QuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
+							<rect x="34328.5" y="896.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M34328.5 927.0 L35496.5 927.0" fill="none" data-name="QuestionFormData"></path>
+							<path d="M34328.5 1063.0 L35496.5 1063.0" fill="none" data-name="QuestionFormData"></path>
 						</g>
-						<g transform="translate(18858.5, 3363.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
+						<g transform="translate(34328.5, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
+								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18858.5, 3394.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
+						<g transform="translate(34328.5, 927)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="31861.0" y="1306.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M31861.0 1337.5 L32275.0 1337.5" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M31861.0 1428.5 L32275.0 1428.5" fill="none" data-name="StudyInfoFormData"></path>
-						</g>
-						<g transform="translate(31861, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
+						<g transform="translate(34328.5, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31861, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
+					</g>
+					<g data-name="SurveyQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
+							<rect x="21463.5" y="2983.0" height="137.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M21463.5 3014.0 L21826.5 3014.0" fill="none" data-name="SurveyQuestionType"></path>
+						</g>
+						<g transform="translate(21463.5, 2983)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
+								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31861, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
+						<g transform="translate(21463.5, 3014)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyContactInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="32267.5" y="2122.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M32267.5 2153.0 L32615.5 2153.0" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M32267.5 2304.0 L32615.5 2304.0" fill="none" data-name="StudyContactInfoFormData"></path>
+					<g data-name="ChoiceQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
+							<rect x="34642.5" y="1306.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M34642.5 1337.5 L34986.5 1337.5" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M34642.5 1398.5 L34986.5 1398.5" fill="none" data-name="ChoiceQuestionFormData"></path>
 						</g>
-						<g transform="translate(32267.5, 2122)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
-								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
+						<g transform="translate(34642.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32267.5, 2153)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
+						<g transform="translate(34642.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32267.5, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
+						<g transform="translate(34642.5, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInfoFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="38500.3" y="1994.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M38500.3 2025.5 L39196.3 2025.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M38500.3 2431.5 L39196.3 2431.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+					<g data-name="BoolQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
+							<rect x="35026.5" y="1321.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M35026.5 1352.5 L35418.5 1352.5" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M35026.5 1398.5 L35418.5 1398.5" fill="none" data-name="BoolQuestionFormData"></path>
 						</g>
-						<g transform="translate(38500.25, 1994.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
+						<g transform="translate(35026.5, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
+								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38500.25, 2025.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
+						<g transform="translate(35026.5, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38500.25, 2431.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
+						<g transform="translate(35026.5, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="38266.3" y="1209.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M38266.3 1240.0 L38962.3 1240.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M38266.3 1451.0 L38962.3 1451.0" fill="none" data-name="StudyFormViewModel"></path>
+					<g data-name="ScaleQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
+							<rect x="35458.5" y="1246.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M35458.5 1277.5 L35802.5 1277.5" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M35458.5 1473.5 L35802.5 1473.5" fill="none" data-name="ScaleQuestionFormData"></path>
 						</g>
-						<g transform="translate(38266.25, 1209)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
+						<g transform="translate(35458.5, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38266.25, 1240)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(35458.5, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38266.25, 1451)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
+						<g transform="translate(35458.5, 1473.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="37440.3" y="2062.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M37440.3 2093.0 L38300.3 2093.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M37440.3 2259.0 L38300.3 2259.0" fill="none" data-name="ReportsFormViewModel"></path>
+					<g data-name="FreeTextQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
+							<rect x="35842.5" y="1306.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M35842.5 1337.5 L36186.5 1337.5" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M35842.5 1413.5 L36186.5 1413.5" fill="none" data-name="FreeTextQuestionFormData"></path>
 						</g>
-						<g transform="translate(37440.25, 2062)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
-								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
+						<g transform="translate(35842.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37440.25, 2093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
+						<g transform="translate(35842.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37440.25, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
+						<g transform="translate(35842.5, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="32605.0" y="1329.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M32605.0 1360.0 L32943.0 1360.0" fill="none" data-name="ReportsFormData"></path>
-							<path d="M32605.0 1406.0 L32943.0 1406.0" fill="none" data-name="ReportsFormData"></path>
+					<g data-name="FreeTextQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
+							<rect x="35916.5" y="2220.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
 						</g>
-						<g transform="translate(32605, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
+						<g transform="translate(35916.5, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
+								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32605, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
-								
-							</g>
+					</g>
+					<g data-name="FreeTextQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
+							<rect x="12827.0" y="1321.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M12827.0 1352.5 L13179.0 1352.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M12827.0 1398.5 L13179.0 1398.5" fill="none" data-name="FreeTextQuestionFormView"></path>
 						</g>
-						<g transform="translate(32605, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
+						<g transform="translate(12827, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReportStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="12107.5" y="2998.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M12107.5 3029.0 L12408.5 3029.0" fill="none" data-name="ReportStatus"></path>
-						</g>
-						<g transform="translate(12107.5, 2998)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
+						<g transform="translate(12827, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12107.5, 3029)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
+						<g transform="translate(12827, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="32890.0" y="956.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M32890.0 987.0 L33204.0 987.0" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M32890.0 1048.0 L33204.0 1048.0" fill="none" data-name="ReportItemFormData"></path>
+					<g data-name="IScaleQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
+							<rect x="45917.5" y="60.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M45917.5 91.5 L46226.5 91.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(32890, 956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
+						<g transform="translate(45917.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
+								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32890, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
+						<g transform="translate(45917.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32890, 1048)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
+					</g>
+					<g data-name="ScaleQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
+							<rect x="29204.8" y="1359.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M29204.8 1390.5 L29556.8 1390.5" fill="none" data-name="ScaleQuestionFormView"></path>
+						</g>
+						<g transform="translate(29204.75, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="32983.0" y="1375.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(32983, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
+						<g transform="translate(29204.75, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="24268.0" y="1949.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M24268.0 1980.5 L25255.0 1980.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M24268.0 2416.5 L25255.0 2416.5" fill="none" data-name="ReportItemFormViewModel"></path>
+					<g data-name="ChoiceQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
+							<rect x="13219.0" y="1344.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M13219.0 1375.0 L13571.0 1375.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M13219.0 1406.0 L13571.0 1406.0" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(24268, 1949.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
-								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
+						<g transform="translate(13219, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24268, 1980.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
+						<g transform="translate(13219, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24268, 2416.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
+						<g transform="translate(13219, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="8934.8" y="2998.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M8934.8 3029.0 L9317.8 3029.0" fill="none" data-name="ReportSectionType"></path>
+					<g data-name="BoolQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
+							<rect x="17090.3" y="1344.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M17090.3 1375.0 L17442.3 1375.0" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M17090.3 1406.0 L17442.3 1406.0" fill="none" data-name="BoolQuestionFormView"></path>
 						</g>
-						<g transform="translate(8934.75, 2998)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
+						<g transform="translate(17090.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8934.75, 3029)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
+						<g transform="translate(17090.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(17090.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="16410.0" y="1329.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M16410.0 1360.0 L16889.0 1360.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M16410.0 1421.0 L16889.0 1421.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+					<g data-name="SurveyQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
+							<rect x="30165.0" y="1352.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M30165.0 1383.0 L30517.0 1383.0" fill="none" data-name="SurveyQuestionFormView"></path>
 						</g>
-						<g transform="translate(16410, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
+						<g transform="translate(30165, 1352)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16410, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+						<g transform="translate(30165, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16410, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
+					</g>
+					<g data-name="StudyUTimeOfDay">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
+							<rect x="38977.5" y="1375.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
+						</g>
+						<g transform="translate(38977.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
+								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="16929.0" y="1329.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M16929.0 1360.0 L17408.0 1360.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M16929.0 1421.0 L17408.0 1421.0" fill="none" data-name="AverageSectionFormView"></path>
+					<g data-name="ScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
+							<rect x="26140.3" y="971.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
+							<path d="M26140.3 1002.0 L26572.3 1002.0" fill="none" data-name="ScheduleControls"></path>
+							<path d="M26140.3 1033.0 L26572.3 1033.0" fill="none" data-name="ScheduleControls"></path>
 						</g>
-						<g transform="translate(16929, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
+						<g transform="translate(26140.25, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
+								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16929, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+						<g transform="translate(26140.25, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16929, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
+						<g transform="translate(26140.25, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="25863.0" y="1284.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M25863.0 1315.0 L26311.0 1315.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M25863.0 1421.0 L26311.0 1421.0" fill="none" data-name="TemporalAggregationFormatted"></path>
+					<g data-name="StudiesTableColumnHeader">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
+							<rect x="30935.0" y="1329.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
+							<path d="M30935.0 1360.5 L31172.0 1360.5" fill="none" data-name="StudiesTableColumnHeader"></path>
 						</g>
-						<g transform="translate(25863, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
+						<g transform="translate(30935, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
+								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25863, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
+						<g transform="translate(30935, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25863, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
+					</g>
+					<g data-name="DashboardScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
+							<rect x="28373.0" y="2205.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
+							<path d="M28373.0 2236.0 L28551.0 2236.0" fill="none" data-name="DashboardScreen"></path>
+						</g>
+						<g transform="translate(28373, 2205)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
+								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
+								
+							</g>
+						</g>
+						<g transform="translate(28373, 2236)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="25882.0" y="2220.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
+					<g data-name="StudiesFilter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
+							<rect x="14350.8" y="3013.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
+							<path d="M14350.8 3044.0 L14646.8 3044.0" fill="none" data-name="StudiesFilter"></path>
 						</g>
-						<g transform="translate(25882, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
+						<g transform="translate(14350.75, 3013)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
+								
+							</g>
+						</g>
+						<g transform="translate(14350.75, 3044)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="26351.0" y="1284.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M26351.0 1315.0 L26802.0 1315.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M26351.0 1421.0 L26802.0 1421.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
+					<g data-name="DashboardScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
+							<rect x="31212.0" y="1336.5" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
+							<path d="M31212.0 1367.5 L31555.0 1367.5" fill="none" data-name="DashboardScaffold"></path>
+							<path d="M31212.0 1413.5 L31555.0 1413.5" fill="none" data-name="DashboardScaffold"></path>
 						</g>
-						<g transform="translate(26351, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
+						<g transform="translate(31212, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
+								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26351, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
+						<g transform="translate(31212, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26351, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
+						<g transform="translate(31212, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="26257.3" y="2220.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
+					<g data-name="DashboardController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
+							<rect x="17672.3" y="2047.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
+							<path d="M17672.3 2078.0 L18286.3 2078.0" fill="none" data-name="DashboardController"></path>
+							<path d="M17672.3 2199.0 L18286.3 2199.0" fill="none" data-name="DashboardController"></path>
 						</g>
-						<g transform="translate(26257.25, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
+						<g transform="translate(17672.25, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
+								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="28679.3" y="2167.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M28679.3 2198.0 L29388.3 2198.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M28679.3 2259.0 L29388.3 2259.0" fill="none" data-name="DataReferenceEditor"></path>
-						</g>
-						<g transform="translate(28679.25, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
+						<g transform="translate(17672.25, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28679.25, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
+						<g transform="translate(17672.25, 2199)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28679.25, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
+					</g>
+					<g data-name="IUserRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
+							<rect x="14167.8" y="3036.0" height="31.0" width="143.0" data-name="IUserRepository"></rect>
+						</g>
+						<g transform="translate(14167.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
+								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="29283.5" y="3036.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
+					<g data-name="SearchController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
+							<rect x="14686.8" y="3036.0" height="31.0" width="149.0" data-name="SearchController"></rect>
 						</g>
-						<g transform="translate(29283.5, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
+						<g transform="translate(14686.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
+								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="41418.5" y="493.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M41418.5 524.0 L41622.5 524.0" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M41418.5 555.0 L41622.5 555.0" fill="none" data-name="DataReferenceIdentifier"></path>
+					<g data-name="StudiesTableColumnSize">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
+							<rect x="46266.5" y="30.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
+							<path d="M46266.5 61.0 L46491.5 61.0" fill="none" data-name="StudiesTableColumnSize"></path>
+							<path d="M46266.5 122.0 L46491.5 122.0" fill="none" data-name="StudiesTableColumnSize"></path>
 						</g>
-						<g transform="translate(41418.5, 493)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
+						<g transform="translate(46266.5, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
+								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41418.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
+						<g transform="translate(46266.5, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41418.5, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
+						<g transform="translate(46266.5, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="41453.0" y="76.0" height="31.0" width="135.0" data-name="DataReference"></rect>
+					<g data-name="StudiesTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
+							<rect x="31986.8" y="1246.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
+							<path d="M31986.8 1277.5 L32466.8 1277.5" fill="none" data-name="StudiesTable"></path>
+							<path d="M31986.8 1488.5 L32466.8 1488.5" fill="none" data-name="StudiesTable"></path>
 						</g>
-						<g transform="translate(41453, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
+						<g transform="translate(31986.75, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
+								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReportItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="27173.8" y="1306.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M27173.8 1337.5 L27640.8 1337.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M27173.8 1413.5 L27640.8 1413.5" fill="none" data-name="ReportItemFormView"></path>
-						</g>
-						<g transform="translate(27173.75, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
-								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
+						<g transform="translate(31986.75, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27173.75, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
+						<g transform="translate(31986.75, 1488.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27173.75, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
+					</g>
+					<g data-name="void Function(Study)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
+							<rect x="31958.3" y="2220.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
+						</g>
+						<g transform="translate(31958.25, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
+								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="27381.3" y="2220.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+							<rect x="32177.3" y="2220.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
 						</g>
-						<g transform="translate(27381.25, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
+						<g transform="translate(32177.25, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignReportsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="19121.5" y="3356.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M19121.5 3387.0 L19514.5 3387.0" fill="none" data-name="StudyDesignReportsFormView"></path>
+					<g data-name="StudiesTableColumn">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
+							<rect x="2476.0" y="2945.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
+							<path d="M2476.0 2976.5 L2837.0 2976.5" fill="none" data-name="StudiesTableColumn"></path>
 						</g>
-						<g transform="translate(19121.5, 3356)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
+						<g transform="translate(2476, 2945.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
+								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19121.5, 3387)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
+						<g transform="translate(2476, 2976.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportFormItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="32878.3" y="2945.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M32878.3 2976.0 L33721.3 2976.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M32878.3 3052.0 L33721.3 3052.0" fill="none" data-name="ReportFormItemDelegate"></path>
+					<g data-name="StudiesTableItem">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
+							<rect x="29903.3" y="2137.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
+							<path d="M29903.3 2168.5 L30303.3 2168.5" fill="none" data-name="StudiesTableItem"></path>
 						</g>
-						<g transform="translate(32878.25, 2945)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
-								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
+						<g transform="translate(29903.25, 2137.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
+								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32878.25, 2976)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
+						<g transform="translate(29903.25, 2168.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32878.25, 3052)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
+					</g>
+					<g data-name="void Function(Study, bool)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
+							<rect x="30171.0" y="3036.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
+						</g>
+						<g transform="translate(30171, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="27680.8" y="1321.5" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M27680.8 1352.5 L27877.8 1352.5" fill="none" data-name="ReportBadge"></path>
-							<path d="M27680.8 1428.5 L27877.8 1428.5" fill="none" data-name="ReportBadge"></path>
+					<g data-name="void Function(Study)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
+							<rect x="30444.0" y="3036.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
 						</g>
-						<g transform="translate(27680.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
+						<g transform="translate(30444, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
+								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27680.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
+					</g>
+					<g data-name="App">
+						<g fill="#eee8d5" stroke="#33322E" data-name="App">
+							<rect x="46531.5" y="76.0" height="31.0" width="47.0" data-name="App"></rect>
+						</g>
+						<g transform="translate(46531.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
+								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27680.75, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
+					</g>
+					<g data-name="AppContent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
+							<rect x="46618.5" y="76.0" height="31.0" width="109.0" data-name="AppContent"></rect>
+						</g>
+						<g transform="translate(46618.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="AccountSettingsDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
-							<rect x="17448.0" y="1359.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
-							<path d="M17448.0 1390.5 L17642.0 1390.5" fill="none" data-name="AccountSettingsDialog"></path>
+							<rect x="17482.3" y="1359.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
+							<path d="M17482.3 1390.5 L17676.3 1390.5" fill="none" data-name="AccountSettingsDialog"></path>
 						</g>
-						<g transform="translate(17448, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
+						<g transform="translate(17482.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
 								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17448, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
+						<g transform="translate(17482.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
 								
diff --git a/docs/uml/designer_v2/lib/uml.svg b/docs/uml/designer_v2/lib/uml.svg
index d18e94f75..88247b56d 100644
--- a/docs/uml/designer_v2/lib/uml.svg
+++ b/docs/uml/designer_v2/lib/uml.svg
@@ -1,4 +1,4 @@
-<svg version="1.1" baseProfile="full" width="81165.3" height="4628.0" viewbox="0 0 81165.25 4628" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+<svg version="1.1" baseProfile="full" width="81384.0" height="4628.0" viewbox="0 0 81384 4628" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
 	<desc >[Config
 	  |
 	  &lt;static&gt;+isDebugMode: bool;
@@ -10,203 +10,238 @@
 	  &lt;static&gt;+formAutosaveDebounce: int
 	]
 	
-	[RoutingIntents
+	[&lt;abstract&gt;ResultTypes
+	]
+	
+	[MeasurementResultTypes
 	  |
-	  &lt;static&gt;+root: RoutingIntent;
-	  &lt;static&gt;+studies: RoutingIntent;
-	  &lt;static&gt;+studiesShared: RoutingIntent;
-	  &lt;static&gt;+publicRegistry: RoutingIntent;
-	  &lt;static&gt;+study: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEdit: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditInfo: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditInterventions: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String);
-	  &lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditReports: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String);
-	  &lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute});
-	  &lt;static&gt;+studyRecruit: RoutingIntent Function(String);
-	  &lt;static&gt;+studyMonitor: RoutingIntent Function(String);
-	  &lt;static&gt;+studyAnalyze: RoutingIntent Function(String);
-	  &lt;static&gt;+studySettings: RoutingIntent Function(String);
-	  &lt;static&gt;+accountSettings: RoutingIntent;
-	  &lt;static&gt;+studyNew: RoutingIntent;
-	  &lt;static&gt;+login: RoutingIntent;
-	  &lt;static&gt;+signup: RoutingIntent;
-	  &lt;static&gt;+passwordForgot: RoutingIntent;
-	  &lt;static&gt;+passwordForgot2: RoutingIntent Function(String);
-	  &lt;static&gt;+passwordRecovery: RoutingIntent;
-	  &lt;static&gt;+error: RoutingIntent Function(Exception)
+	  &lt;static&gt;+questionnaire: String;
+	  &lt;static&gt;+values: List&lt;String&gt;
 	]
 	
-	[RoutingIntents]o-[RoutingIntent]
-	[RoutingIntents]o-[RoutingIntent Function(String)]
-	[RoutingIntents]o-[RoutingIntent Function(String, String)]
-	[RoutingIntents]o-[RoutingIntent Function(String, {String? appRoute})]
-	[RoutingIntents]o-[RoutingIntent Function(Exception)]
+	[&lt;abstract&gt;ResultTypes]&lt;:-[MeasurementResultTypes]
 	
-	[RoutingIntent
-	  |
-	  +route: GoRoute;
-	  +params: Map&lt;String, String&gt;;
-	  +queryParams: Map&lt;String, String&gt;;
-	  +dispatch: RoutingIntentDispatch?;
-	  +extra: Object?;
-	  +routeName: String;
-	  +arguments: Map&lt;String, String&gt;;
-	  +props: List&lt;Object?&gt;
+	[InterventionResultTypes
 	  |
-	  -dynamic _validateRoute();
-	  +bool matches()
+	  &lt;static&gt;+checkmarkTask: String;
+	  &lt;static&gt;+values: List&lt;String&gt;
 	]
 	
-	[RoutingIntent]o-[GoRoute]
-	[RoutingIntent]o-[RoutingIntentDispatch]
-	[&lt;abstract&gt;Equatable]&lt;:-[RoutingIntent]
+	[&lt;abstract&gt;ResultTypes]&lt;:-[InterventionResultTypes]
 	
-	[RoutingIntentDispatch
+	[StudyExportData
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;;
-	  &lt;static&gt;+go: RoutingIntentDispatch;
-	  &lt;static&gt;+push: RoutingIntentDispatch
+	  +study: Study;
+	  +measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
+	  +interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
+	  +isEmpty: bool
 	]
 	
-	[RoutingIntentDispatch]o-[RoutingIntentDispatch]
-	[Enum]&lt;:--[RoutingIntentDispatch]
+	[StudyExportData]o-[Study]
 	
-	[&lt;abstract&gt;GoRouteParamEnum
+	[StudyTemplates
 	  |
-	  +String toRouteParam();
-	  +String toShortString()
+	  &lt;static&gt;+kUnnamedStudyTitle: String
+	  |
+	  &lt;static&gt;+Study emptyDraft()
 	]
 	
-	[RouterKeys
+	[StudyActionType
 	  |
-	  &lt;static&gt;+studyKey: ValueKey&lt;String&gt;;
-	  &lt;static&gt;+authKey: ValueKey&lt;String&gt;
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudyActionType&gt;;
+	  &lt;static&gt;+pin: StudyActionType;
+	  &lt;static&gt;+pinoff: StudyActionType;
+	  &lt;static&gt;+edit: StudyActionType;
+	  &lt;static&gt;+duplicate: StudyActionType;
+	  &lt;static&gt;+duplicateDraft: StudyActionType;
+	  &lt;static&gt;+addCollaborator: StudyActionType;
+	  &lt;static&gt;+export: StudyActionType;
+	  &lt;static&gt;+delete: StudyActionType
 	]
 	
-	[RouterKeys]o-[ValueKey]
+	[StudyActionType]o-[StudyActionType]
+	[Enum]&lt;:--[StudyActionType]
 	
-	[RouteParams
+	[Notifications
 	  |
-	  &lt;static&gt;+studiesFilter: String;
-	  &lt;static&gt;+studyId: String;
-	  &lt;static&gt;+measurementId: String;
-	  &lt;static&gt;+interventionId: String;
-	  &lt;static&gt;+testAppRoute: String
+	  &lt;static&gt;+credentialsInvalid: SnackbarIntent;
+	  &lt;static&gt;+userAlreadyRegistered: SnackbarIntent;
+	  &lt;static&gt;+passwordReset: SnackbarIntent;
+	  &lt;static&gt;+passwordResetSuccess: SnackbarIntent;
+	  &lt;static&gt;+studyDeleted: SnackbarIntent;
+	  &lt;static&gt;+inviteCodeDeleted: SnackbarIntent;
+	  &lt;static&gt;+inviteCodeClipped: SnackbarIntent;
+	  &lt;static&gt;+studyDeleteConfirmation: AlertIntent
 	]
 	
-	[RouterConf
-	  |
-	  &lt;static&gt;+router: GoRouter;
-	  &lt;static&gt;+routes: List&lt;GoRoute&gt;;
-	  &lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;;
-	  &lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;
+	[Notifications]o-[SnackbarIntent]
+	[Notifications]o-[AlertIntent]
+	
+	[NotificationDefaultActions
 	  |
-	  &lt;static&gt;+GoRoute route()
+	  &lt;static&gt;+cancel: NotificationAction
 	]
 	
-	[RouterConf]o-[GoRouter]
+	[NotificationDefaultActions]o-[NotificationAction]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs
+	[&lt;abstract&gt;INotificationService
 	  |
-	  +studyId: String
+	  +void showMessage();
+	  +void show();
+	  +Stream&lt;NotificationIntent&gt; watchNotifications();
+	  +void dispose()
 	]
 	
-	[&lt;abstract&gt;QuestionFormRouteArgs
+	[NotificationService
 	  |
-	  +questionId: String
+	  -_streamController: BehaviorSubject&lt;NotificationIntent&gt;
+	  |
+	  +Stream&lt;NotificationIntent&gt; watchNotifications();
+	  +void showMessage();
+	  +void show();
+	  +void dispose()
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[&lt;abstract&gt;QuestionFormRouteArgs]
+	[NotificationService]o-[BehaviorSubject]
+	[&lt;abstract&gt;INotificationService]&lt;:--[NotificationService]
 	
-	[ScreenerQuestionFormRouteArgs
+	[&lt;abstract&gt;NotificationIntent
+	  |
+	  +message: String?;
+	  +customContent: Widget?;
+	  +icon: IconData?;
+	  +actions: List&lt;NotificationAction&gt;?;
+	  +type: NotificationType
+	  |
+	  +void register()
 	]
 	
-	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:-[ScreenerQuestionFormRouteArgs]
+	[&lt;abstract&gt;NotificationIntent]o-[&lt;abstract&gt;Widget]
+	[&lt;abstract&gt;NotificationIntent]o-[IconData]
+	[&lt;abstract&gt;NotificationIntent]o-[NotificationType]
 	
-	[ConsentItemFormRouteArgs
+	[NotificationAction
 	  |
-	  +consentId: String
+	  +label: String;
+	  +onSelect: dynamic Function();
+	  +isDestructive: bool
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ConsentItemFormRouteArgs]
+	[NotificationAction]o-[dynamic Function()]
 	
-	[MeasurementFormRouteArgs
+	[SnackbarIntent
 	  |
-	  +measurementId: String
+	  +duration: int?
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[MeasurementFormRouteArgs]
+	[&lt;abstract&gt;NotificationIntent]&lt;:-[SnackbarIntent]
 	
-	[SurveyQuestionFormRouteArgs
+	[AlertIntent
 	  |
-	  +questionId: String
+	  +title: String;
+	  +dismissOnAction: bool;
+	  +isDestructive: dynamic
 	]
 	
-	[MeasurementFormRouteArgs]&lt;:-[SurveyQuestionFormRouteArgs]
-	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:--[SurveyQuestionFormRouteArgs]
+	[&lt;abstract&gt;NotificationIntent]&lt;:-[AlertIntent]
 	
-	[InterventionFormRouteArgs
+	[NotificationType
 	  |
-	  +interventionId: String
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;NotificationType&gt;;
+	  &lt;static&gt;+snackbar: NotificationType;
+	  &lt;static&gt;+alert: NotificationType;
+	  &lt;static&gt;+custom: NotificationType
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[InterventionFormRouteArgs]
+	[NotificationType]o-[NotificationType]
+	[Enum]&lt;:--[NotificationType]
 	
-	[InterventionTaskFormRouteArgs
+	[&lt;abstract&gt;IClipboardService
 	  |
-	  +taskId: String
+	  +dynamic copy()
 	]
 	
-	[InterventionFormRouteArgs]&lt;:-[InterventionTaskFormRouteArgs]
+	[ClipboardService
+	  |
+	  +dynamic copy()
+	]
 	
-	[ReportItemFormRouteArgs
+	[&lt;abstract&gt;IClipboardService]&lt;:--[ClipboardService]
+	
+	[NotificationDispatcher
 	  |
-	  +sectionId: String
+	  +child: Widget?;
+	  +snackbarInnerPadding: double;
+	  +snackbarWidth: double?;
+	  +snackbarBehavior: SnackBarBehavior;
+	  +snackbarDefaultDuration: int
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ReportItemFormRouteArgs]
+	[NotificationDispatcher]o-[&lt;abstract&gt;Widget]
+	[NotificationDispatcher]o-[SnackBarBehavior]
 	
-	[&lt;abstract&gt;ISyncIndicatorViewModel
+	[Assets
 	  |
-	  +isDirty: bool;
-	  +lastSynced: DateTime?
+	  &lt;static&gt;+logoWide: String
 	]
 	
-	[SyncIndicator
+	[AsyncValueWidget
 	  |
-	  +state: AsyncValue&lt;T&gt;;
-	  +lastSynced: DateTime?;
-	  +isDirty: bool;
-	  +animationDuration: int;
-	  +iconSize: double
+	  +value: AsyncValue&lt;T&gt;;
+	  +data: Widget Function(T);
+	  +error: Widget Function(Object, StackTrace?)?;
+	  +loading: Widget Function()?;
+	  +empty: Widget Function()?
+	  |
+	  +Widget build();
+	  -Widget _buildDataOrEmptyWidget();
+	  -Widget _defaultError();
+	  -Widget _defaultLoad()
 	]
 	
-	[SyncIndicator]o-[&lt;abstract&gt;AsyncValue]
+	[AsyncValueWidget]o-[&lt;abstract&gt;AsyncValue]
+	[AsyncValueWidget]o-[Widget Function(T)]
+	[AsyncValueWidget]o-[Widget Function(Object, StackTrace?)?]
+	[AsyncValueWidget]o-[Widget Function()?]
 	
-	[EmptyBody
+	[FormControlLabel
 	  |
-	  +icon: IconData?;
-	  +leading: Widget?;
-	  +leadingSpacing: double?;
-	  +title: String?;
-	  +description: String?;
-	  +button: Widget?
+	  +formControl: AbstractControl&lt;dynamic&gt;;
+	  +text: String;
+	  +isClickable: bool;
+	  +textStyle: TextStyle?;
+	  +onClick: void Function(AbstractControl&lt;dynamic&gt;)?
 	  |
 	  +Widget build()
 	]
 	
-	[EmptyBody]o-[IconData]
-	[EmptyBody]o-[&lt;abstract&gt;Widget]
-	
-	[NullHelperDecoration
+	[FormControlLabel]o-[&lt;abstract&gt;AbstractControl]
+	[FormControlLabel]o-[TextStyle]
+	[FormControlLabel]o-[void Function(AbstractControl&lt;dynamic&gt;)?]
+	
+	[ActionPopUpMenuButton
+	  |
+	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
+	  +triggerIconColor: Color?;
+	  +triggerIconColorHover: Color?;
+	  +triggerIconSize: double;
+	  +disableSplashEffect: bool;
+	  +hideOnEmpty: bool;
+	  +orientation: Axis;
+	  +elevation: double?;
+	  +splashRadius: double?;
+	  +enabled: bool;
+	  +position: PopupMenuPosition
+	  |
+	  +Widget build();
+	  -Widget _buildPopupMenu()
 	]
 	
-	[InputDecoration]&lt;:-[NullHelperDecoration]
+	[ActionPopUpMenuButton]o-[Color]
+	[ActionPopUpMenuButton]o-[Axis]
+	[ActionPopUpMenuButton]o-[PopupMenuPosition]
 	
 	[Search
 	  |
@@ -226,6 +261,18 @@
 	
 	[SearchController]o-[void Function(String)]
 	
+	[FormScaffold
+	  |
+	  +formViewModel: T;
+	  +actions: List&lt;Widget&gt;?;
+	  +body: Widget;
+	  +drawer: Widget?;
+	  +actionsSpacing: double;
+	  +actionsPadding: double
+	]
+	
+	[FormScaffold]o-[&lt;abstract&gt;Widget]
+	
 	[ConstrainedWidthFlexible
 	  |
 	  +minWidth: double;
@@ -242,47 +289,6 @@
 	[ConstrainedWidthFlexible]o-[&lt;abstract&gt;Widget]
 	[ConstrainedWidthFlexible]o-[BoxConstraints]
 	
-	[AsyncValueWidget
-	  |
-	  +value: AsyncValue&lt;T&gt;;
-	  +data: Widget Function(T);
-	  +error: Widget Function(Object, StackTrace?)?;
-	  +loading: Widget Function()?;
-	  +empty: Widget Function()?
-	  |
-	  +Widget build();
-	  -Widget _buildDataOrEmptyWidget();
-	  -Widget _defaultError();
-	  -Widget _defaultLoad()
-	]
-	
-	[AsyncValueWidget]o-[&lt;abstract&gt;AsyncValue]
-	[AsyncValueWidget]o-[Widget Function(T)]
-	[AsyncValueWidget]o-[Widget Function(Object, StackTrace?)?]
-	[AsyncValueWidget]o-[Widget Function()?]
-	
-	[ActionPopUpMenuButton
-	  |
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +triggerIconColor: Color?;
-	  +triggerIconColorHover: Color?;
-	  +triggerIconSize: double;
-	  +disableSplashEffect: bool;
-	  +hideOnEmpty: bool;
-	  +orientation: Axis;
-	  +elevation: double?;
-	  +splashRadius: double?;
-	  +enabled: bool;
-	  +position: PopupMenuPosition
-	  |
-	  +Widget build();
-	  -Widget _buildPopupMenu()
-	]
-	
-	[ActionPopUpMenuButton]o-[Color]
-	[ActionPopUpMenuButton]o-[Axis]
-	[ActionPopUpMenuButton]o-[PopupMenuPosition]
-	
 	[PrimaryButton
 	  |
 	  +text: String;
@@ -305,36 +311,6 @@
 	[PrimaryButton]o-[EdgeInsets]
 	[PrimaryButton]o-[Size]
 	
-	[Hyperlink
-	  |
-	  +text: String;
-	  +url: String?;
-	  +onClick: void Function()?;
-	  +linkColor: Color;
-	  +hoverColor: Color?;
-	  +visitedColor: Color?;
-	  +style: TextStyle?;
-	  +hoverStyle: TextStyle?;
-	  +visitedStyle: TextStyle?;
-	  +icon: IconData?;
-	  +iconSize: double?
-	]
-	
-	[Hyperlink]o-[void Function()?]
-	[Hyperlink]o-[Color]
-	[Hyperlink]o-[TextStyle]
-	[Hyperlink]o-[IconData]
-	
-	[DismissButton
-	  |
-	  +onPressed: void Function()?;
-	  +text: String?
-	  |
-	  +Widget build()
-	]
-	
-	[DismissButton]o-[void Function()?]
-	
 	[FormTableRow
 	  |
 	  +label: String?;
@@ -404,21 +380,150 @@
 	[FormTableRowLayout]o-[FormTableRowLayout]
 	[Enum]&lt;:--[FormTableRowLayout]
 	
-	[ActionMenuType
+	[DismissButton
+	  |
+	  +onPressed: void Function()?;
+	  +text: String?
+	  |
+	  +Widget build()
+	]
+	
+	[DismissButton]o-[void Function()?]
+	
+	[Badge
+	  |
+	  +icon: IconData?;
+	  +color: Color?;
+	  +borderRadius: double;
+	  +label: String;
+	  +type: BadgeType;
+	  +padding: EdgeInsets;
+	  +iconSize: double?;
+	  +labelStyle: TextStyle?;
+	  +center: bool
+	  |
+	  +Widget build();
+	  -Color? _getBackgroundColor();
+	  -Color _getBorderColor();
+	  -Color? _getLabelColor()
+	]
+	
+	[Badge]o-[IconData]
+	[Badge]o-[Color]
+	[Badge]o-[BadgeType]
+	[Badge]o-[EdgeInsets]
+	[Badge]o-[TextStyle]
+	
+	[BadgeType
 	  |
 	  +index: int;
-	  &lt;static&gt;+values: List&lt;ActionMenuType&gt;;
-	  &lt;static&gt;+inline: ActionMenuType;
-	  &lt;static&gt;+popup: ActionMenuType
+	  &lt;static&gt;+values: List&lt;BadgeType&gt;;
+	  &lt;static&gt;+filled: BadgeType;
+	  &lt;static&gt;+outlined: BadgeType;
+	  &lt;static&gt;+outlineFill: BadgeType;
+	  &lt;static&gt;+plain: BadgeType
 	]
 	
-	[ActionMenuType]o-[ActionMenuType]
-	[Enum]&lt;:--[ActionMenuType]
+	[BadgeType]o-[BadgeType]
+	[Enum]&lt;:--[BadgeType]
 	
-	[ReactiveCustomColorPicker
+	[StandardDialog
+	  |
+	  +title: Widget?;
+	  +titleText: String?;
+	  +body: Widget;
+	  +actionButtons: List&lt;Widget&gt;;
+	  +backgroundColor: Color?;
+	  +borderRadius: double?;
+	  +width: double?;
+	  +height: double?;
+	  +minWidth: double;
+	  +minHeight: double;
+	  +maxWidth: double?;
+	  +maxHeight: double?;
+	  +padding: EdgeInsets
+	  |
+	  +Widget build()
 	]
 	
-	[ReactiveFormField]&lt;:-[ReactiveCustomColorPicker]
+	[StandardDialog]o-[&lt;abstract&gt;Widget]
+	[StandardDialog]o-[Color]
+	[StandardDialog]o-[EdgeInsets]
+	
+	[&lt;abstract&gt;ISyncIndicatorViewModel
+	  |
+	  +isDirty: bool;
+	  +lastSynced: DateTime?
+	]
+	
+	[SyncIndicator
+	  |
+	  +state: AsyncValue&lt;T&gt;;
+	  +lastSynced: DateTime?;
+	  +isDirty: bool;
+	  +animationDuration: int;
+	  +iconSize: double
+	]
+	
+	[SyncIndicator]o-[&lt;abstract&gt;AsyncValue]
+	
+	[&lt;abstract&gt;IWithBanner
+	  |
+	  +Widget? banner()
+	]
+	
+	[BannerBox
+	  |
+	  +prefixIcon: Widget?;
+	  +body: Widget;
+	  +style: BannerStyle;
+	  +padding: EdgeInsets?;
+	  +noPrefix: bool;
+	  +dismissable: bool;
+	  +isDismissed: bool?;
+	  +onDismissed: dynamic Function()?;
+	  +dismissIconSize: double
+	]
+	
+	[BannerBox]o-[&lt;abstract&gt;Widget]
+	[BannerBox]o-[BannerStyle]
+	[BannerBox]o-[EdgeInsets]
+	[BannerBox]o-[dynamic Function()?]
+	
+	[BannerStyle
+	  |
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;BannerStyle&gt;;
+	  &lt;static&gt;+warning: BannerStyle;
+	  &lt;static&gt;+info: BannerStyle;
+	  &lt;static&gt;+error: BannerStyle
+	]
+	
+	[BannerStyle]o-[BannerStyle]
+	[Enum]&lt;:--[BannerStyle]
+	
+	[ActionMenuInline
+	  |
+	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
+	  +iconSize: double?;
+	  +visible: bool;
+	  +splashRadius: double?;
+	  +paddingVertical: double?;
+	  +paddingHorizontal: double?
+	  |
+	  +Widget build()
+	]
+	
+	[Collapsible
+	  |
+	  +contentBuilder: Widget Function(BuildContext, bool);
+	  +headerBuilder: Widget Function(BuildContext, bool)?;
+	  +title: String?;
+	  +isCollapsed: bool
+	]
+	
+	[Collapsible]o-[Widget Function(BuildContext, bool)]
+	[Collapsible]o-[Widget Function(BuildContext, bool)?]
 	
 	[NavbarTab
 	  |
@@ -454,35 +559,7 @@
 	[TabbedNavbar]o-[EdgeInsets]
 	[TabbedNavbar]o-[TabBarIndicatorSize]
 	
-	[Collapsible
-	  |
-	  +contentBuilder: Widget Function(BuildContext, bool);
-	  +headerBuilder: Widget Function(BuildContext, bool)?;
-	  +title: String?;
-	  +isCollapsed: bool
-	]
-	
-	[Collapsible]o-[Widget Function(BuildContext, bool)]
-	[Collapsible]o-[Widget Function(BuildContext, bool)?]
-	
-	[StudyULogo
-	  |
-	  +onTap: void Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[StudyULogo]o-[void Function()?]
-	
-	[FormSideSheetTab
-	  |
-	  +formViewBuilder: Widget Function(T)
-	]
-	
-	[FormSideSheetTab]o-[Widget Function(T)]
-	[NavbarTab]&lt;:-[FormSideSheetTab]
-	
-	[SidesheetTab
+	[SidesheetTab
 	  |
 	  +builder: Widget Function(BuildContext)
 	]
@@ -509,6 +586,49 @@
 	[Sidesheet]o-[EdgeInsets]
 	[Sidesheet]o-[Widget Function(Widget)?]
 	
+	[FormSideSheetTab
+	  |
+	  +formViewBuilder: Widget Function(T)
+	]
+	
+	[FormSideSheetTab]o-[Widget Function(T)]
+	[NavbarTab]&lt;:-[FormSideSheetTab]
+	
+	[HelpIcon
+	  |
+	  +tooltipText: String?
+	  |
+	  +Widget build()
+	]
+	
+	[EmptyBody
+	  |
+	  +icon: IconData?;
+	  +leading: Widget?;
+	  +leadingSpacing: double?;
+	  +title: String?;
+	  +description: String?;
+	  +button: Widget?
+	  |
+	  +Widget build()
+	]
+	
+	[EmptyBody]o-[IconData]
+	[EmptyBody]o-[&lt;abstract&gt;Widget]
+	
+	[IndicatorRangeSliderThumbShape
+	  |
+	  +buildContext: BuildContext;
+	  +start: T;
+	  +end: T
+	  |
+	  +Size getPreferredSize();
+	  +void paint()
+	]
+	
+	[IndicatorRangeSliderThumbShape]o-[&lt;abstract&gt;BuildContext]
+	[&lt;abstract&gt;RangeSliderThumbShape]&lt;:-[IndicatorRangeSliderThumbShape]
+	
 	[MouseEventsRegion
 	  |
 	  +onTap: void Function()?;
@@ -527,140 +647,86 @@
 	[MouseEventsRegion]o-[void Function(PointerExitEvent)?]
 	[MouseEventsRegion]o-[SystemMouseCursor]
 	
-	[FormControlLabel
+	[ReactiveCustomColorPicker
+	]
+	
+	[ReactiveFormField]&lt;:-[ReactiveCustomColorPicker]
+	
+	[TextParagraph
 	  |
-	  +formControl: AbstractControl&lt;dynamic&gt;;
-	  +text: String;
-	  +isClickable: bool;
-	  +textStyle: TextStyle?;
-	  +onClick: void Function(AbstractControl&lt;dynamic&gt;)?
+	  +text: String?;
+	  +style: TextStyle?;
+	  +selectable: bool;
+	  +span: List&lt;TextSpan&gt;?
 	  |
 	  +Widget build()
 	]
 	
-	[FormControlLabel]o-[&lt;abstract&gt;AbstractControl]
-	[FormControlLabel]o-[TextStyle]
-	[FormControlLabel]o-[void Function(AbstractControl&lt;dynamic&gt;)?]
+	[TextParagraph]o-[TextStyle]
 	
-	[&lt;abstract&gt;IWithBanner
+	[UnderConstruction
 	  |
-	  +Widget? banner()
+	  +Widget build()
 	]
 	
-	[BannerBox
-	  |
-	  +prefixIcon: Widget?;
-	  +body: Widget;
-	  +style: BannerStyle;
-	  +padding: EdgeInsets?;
-	  +noPrefix: bool;
-	  +dismissable: bool;
-	  +isDismissed: bool?;
-	  +onDismissed: dynamic Function()?;
-	  +dismissIconSize: double
+	[NullHelperDecoration
 	]
 	
-	[BannerBox]o-[&lt;abstract&gt;Widget]
-	[BannerBox]o-[BannerStyle]
-	[BannerBox]o-[EdgeInsets]
-	[BannerBox]o-[dynamic Function()?]
+	[InputDecoration]&lt;:-[NullHelperDecoration]
 	
-	[BannerStyle
+	[ActionMenuType
 	  |
 	  +index: int;
-	  &lt;static&gt;+values: List&lt;BannerStyle&gt;;
-	  &lt;static&gt;+warning: BannerStyle;
-	  &lt;static&gt;+info: BannerStyle;
-	  &lt;static&gt;+error: BannerStyle
+	  &lt;static&gt;+values: List&lt;ActionMenuType&gt;;
+	  &lt;static&gt;+inline: ActionMenuType;
+	  &lt;static&gt;+popup: ActionMenuType
 	]
 	
-	[BannerStyle]o-[BannerStyle]
-	[Enum]&lt;:--[BannerStyle]
+	[ActionMenuType]o-[ActionMenuType]
+	[Enum]&lt;:--[ActionMenuType]
 	
-	[SecondaryButton
+	[HtmlStylingBanner
 	  |
-	  +text: String;
-	  +icon: IconData?;
-	  +isLoading: bool;
-	  +onPressed: void Function()?
+	  +isDismissed: bool;
+	  +onDismissed: dynamic Function()?
 	  |
 	  +Widget build()
 	]
 	
-	[SecondaryButton]o-[IconData]
-	[SecondaryButton]o-[void Function()?]
+	[HtmlStylingBanner]o-[dynamic Function()?]
 	
-	[IconPack
-	  |
-	  &lt;static&gt;+defaultPack: List&lt;IconOption&gt;;
-	  &lt;static&gt;+material: List&lt;IconOption&gt;
+	[&lt;abstract&gt;FormConsumerWidget
 	  |
-	  &lt;static&gt;+IconOption? resolveIconByName()
+	  +Widget build()
 	]
 	
-	[IconOption
-	  |
-	  +name: String;
-	  +icon: IconData?;
-	  +isEmpty: bool;
-	  +props: List&lt;Object?&gt;
+	[&lt;abstract&gt;FormConsumerRefWidget
 	  |
-	  +String toJson();
-	  &lt;static&gt;+IconOption fromJson()
-	]
-	
-	[IconOption]o-[IconData]
-	[&lt;abstract&gt;Equatable]&lt;:-[IconOption]
-	
-	[ReactiveIconPicker
+	  +Widget build()
 	]
 	
-	[ReactiveFocusableFormField]&lt;:-[ReactiveIconPicker]
-	
-	[IconPicker
-	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +selectedOption: IconOption?;
-	  +onSelect: void Function(IconOption)?;
-	  +galleryIconSize: double?;
-	  +selectedIconSize: double?;
-	  +focusNode: FocusNode?;
-	  +isDisabled: bool
+	[SplashPage
 	  |
 	  +Widget build()
 	]
 	
-	[IconPicker]o-[IconOption]
-	[IconPicker]o-[void Function(IconOption)?]
-	[IconPicker]o-[FocusNode]
-	
-	[IconPickerField
+	[ErrorPage
 	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +selectedOption: IconOption?;
-	  +selectedIconSize: double?;
-	  +galleryIconSize: double?;
-	  +onSelect: void Function(IconOption)?;
-	  +focusNode: FocusNode?;
-	  +isDisabled: bool
+	  +error: Exception?
 	  |
 	  +Widget build()
 	]
 	
-	[IconPickerField]o-[IconOption]
-	[IconPickerField]o-[void Function(IconOption)?]
-	[IconPickerField]o-[FocusNode]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ErrorPage]
 	
-	[IconPickerGallery
+	[StudyULogo
 	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +onSelect: void Function(IconOption)?;
-	  +iconSize: double
+	  +onTap: void Function()?
 	  |
 	  +Widget build()
 	]
 	
-	[IconPickerGallery]o-[void Function(IconOption)?]
+	[StudyULogo]o-[void Function()?]
 	
 	[SingleColumnLayout
 	  |
@@ -693,75 +759,40 @@
 	[SingleColumnLayoutType]o-[SingleColumnLayoutType]
 	[Enum]&lt;:--[SingleColumnLayoutType]
 	
-	[&lt;abstract&gt;FormConsumerWidget
+	[Hyperlink
 	  |
-	  +Widget build()
+	  +text: String;
+	  +url: String?;
+	  +onClick: void Function()?;
+	  +linkColor: Color;
+	  +hoverColor: Color?;
+	  +visitedColor: Color?;
+	  +style: TextStyle?;
+	  +hoverStyle: TextStyle?;
+	  +visitedStyle: TextStyle?;
+	  +icon: IconData?;
+	  +iconSize: double?
 	]
 	
-	[&lt;abstract&gt;FormConsumerRefWidget
-	  |
-	  +Widget build()
-	]
+	[Hyperlink]o-[void Function()?]
+	[Hyperlink]o-[Color]
+	[Hyperlink]o-[TextStyle]
+	[Hyperlink]o-[IconData]
 	
-	[FormScaffold
+	[StandardTableColumn
 	  |
-	  +formViewModel: T;
-	  +actions: List&lt;Widget&gt;?;
-	  +body: Widget;
-	  +drawer: Widget?;
-	  +actionsSpacing: double;
-	  +actionsPadding: double
+	  +label: String;
+	  +tooltip: String?;
+	  +columnWidth: TableColumnWidth;
+	  +sortable: bool;
+	  +sortAscending: bool?;
+	  +sortableIcon: Widget?
 	]
 	
-	[FormScaffold]o-[&lt;abstract&gt;Widget]
+	[StandardTableColumn]o-[&lt;abstract&gt;TableColumnWidth]
+	[StandardTableColumn]o-[&lt;abstract&gt;Widget]
 	
-	[StandardDialog
-	  |
-	  +title: Widget?;
-	  +titleText: String?;
-	  +body: Widget;
-	  +actionButtons: List&lt;Widget&gt;;
-	  +backgroundColor: Color?;
-	  +borderRadius: double?;
-	  +width: double?;
-	  +height: double?;
-	  +minWidth: double;
-	  +minHeight: double;
-	  +maxWidth: double?;
-	  +maxHeight: double?;
-	  +padding: EdgeInsets
-	  |
-	  +Widget build()
-	]
-	
-	[StandardDialog]o-[&lt;abstract&gt;Widget]
-	[StandardDialog]o-[Color]
-	[StandardDialog]o-[EdgeInsets]
-	
-	[HtmlStylingBanner
-	  |
-	  +isDismissed: bool;
-	  +onDismissed: dynamic Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[HtmlStylingBanner]o-[dynamic Function()?]
-	
-	[StandardTableColumn
-	  |
-	  +label: String;
-	  +tooltip: String?;
-	  +columnWidth: TableColumnWidth;
-	  +sortable: bool;
-	  +sortAscending: bool?;
-	  +sortableIcon: Widget?
-	]
-	
-	[StandardTableColumn]o-[&lt;abstract&gt;TableColumnWidth]
-	[StandardTableColumn]o-[&lt;abstract&gt;Widget]
-	
-	[StandardTable
+	[StandardTable
 	  |
 	  +items: List&lt;T&gt;;
 	  +inputColumns: List&lt;StandardTableColumn&gt;;
@@ -777,6 +808,7 @@
 	  +cellSpacing: double;
 	  +rowSpacing: double;
 	  +minRowHeight: double?;
+	  +headerMaxLines: int;
 	  +showTableHeader: bool;
 	  +hideLeadingTrailingWhenEmpty: bool;
 	  +leadingWidget: Widget?;
@@ -809,6 +841,91 @@
 	[StandardTableStyle]o-[StandardTableStyle]
 	[Enum]&lt;:--[StandardTableStyle]
 	
+	[IconPack
+	  |
+	  &lt;static&gt;+defaultPack: List&lt;IconOption&gt;;
+	  &lt;static&gt;+material: List&lt;IconOption&gt;
+	  |
+	  &lt;static&gt;+IconOption? resolveIconByName()
+	]
+	
+	[IconOption
+	  |
+	  +name: String;
+	  +icon: IconData?;
+	  +isEmpty: bool;
+	  +props: List&lt;Object?&gt;
+	  |
+	  +String toJson();
+	  &lt;static&gt;+IconOption fromJson()
+	]
+	
+	[IconOption]o-[IconData]
+	[&lt;abstract&gt;Equatable]&lt;:-[IconOption]
+	
+	[ReactiveIconPicker
+	]
+	
+	[ReactiveFocusableFormField]&lt;:-[ReactiveIconPicker]
+	
+	[IconPicker
+	  |
+	  +iconOptions: List&lt;IconOption&gt;;
+	  +selectedOption: IconOption?;
+	  +onSelect: void Function(IconOption)?;
+	  +galleryIconSize: double?;
+	  +selectedIconSize: double?;
+	  +focusNode: FocusNode?;
+	  +isDisabled: bool
+	  |
+	  +Widget build()
+	]
+	
+	[IconPicker]o-[IconOption]
+	[IconPicker]o-[void Function(IconOption)?]
+	[IconPicker]o-[FocusNode]
+	
+	[IconPickerField
+	  |
+	  +iconOptions: List&lt;IconOption&gt;;
+	  +selectedOption: IconOption?;
+	  +selectedIconSize: double?;
+	  +galleryIconSize: double?;
+	  +onSelect: void Function(IconOption)?;
+	  +focusNode: FocusNode?;
+	  +isDisabled: bool
+	  |
+	  +Widget build()
+	]
+	
+	[IconPickerField]o-[IconOption]
+	[IconPickerField]o-[void Function(IconOption)?]
+	[IconPickerField]o-[FocusNode]
+	
+	[IconPickerGallery
+	  |
+	  +iconOptions: List&lt;IconOption&gt;;
+	  +onSelect: void Function(IconOption)?;
+	  +iconSize: double
+	  |
+	  +Widget build()
+	]
+	
+	[IconPickerGallery]o-[void Function(IconOption)?]
+	
+	[SecondaryButton
+	  |
+	  +text: String;
+	  +icon: IconData?;
+	  +isLoading: bool;
+	  +onPressed: void Function()?
+	  |
+	  +Widget build()
+	]
+	
+	[SecondaryButton]o-[IconData]
+	[SecondaryButton]o-[void Function()?]
+	
 	[TwoColumnLayout
 	  |
 	  &lt;static&gt;+defaultDivider: VerticalDivider;
@@ -837,906 +954,793 @@
 	[TwoColumnLayout]o-[BoxConstraints]
 	[TwoColumnLayout]o-[Color]
 	
-	[ActionMenuInline
-	  |
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +iconSize: double?;
-	  +visible: bool;
-	  +splashRadius: double?;
-	  +paddingVertical: double?;
-	  +paddingHorizontal: double?
+	[AppTranslation
 	  |
-	  +Widget build()
+	  &lt;static&gt;+dynamic init()
 	]
 	
-	[TextParagraph
-	  |
-	  +text: String?;
-	  +style: TextStyle?;
-	  +selectable: bool;
-	  +span: List&lt;TextSpan&gt;?
+	[&lt;abstract&gt;PlatformLocale
 	  |
-	  +Widget build()
+	  +Locale getPlatformLocale()
 	]
 	
-	[TextParagraph]o-[TextStyle]
-	
-	[SplashPage
+	[PlatformLocaleWeb
 	  |
-	  +Widget build()
+	  +Locale getPlatformLocale()
 	]
 	
-	[ErrorPage
-	  |
-	  +error: Exception?
+	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleWeb]
+	
+	[PlatformLocaleMobile
 	  |
-	  +Widget build()
+	  +Locale getPlatformLocale()
 	]
 	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ErrorPage]
+	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleMobile]
 	
-	[Badge
-	  |
-	  +icon: IconData?;
-	  +color: Color?;
-	  +borderRadius: double;
-	  +label: String;
-	  +type: BadgeType;
-	  +padding: EdgeInsets;
-	  +iconSize: double?;
-	  +labelStyle: TextStyle?;
-	  +center: bool
+	[LanguagePicker
 	  |
-	  +Widget build();
-	  -Color? _getBackgroundColor();
-	  -Color _getBorderColor();
-	  -Color? _getLabelColor()
+	  +languagePickerType: LanguagePickerType;
+	  +iconColor: Color?;
+	  +offset: Offset?
 	]
 	
-	[Badge]o-[IconData]
-	[Badge]o-[Color]
-	[Badge]o-[BadgeType]
-	[Badge]o-[EdgeInsets]
-	[Badge]o-[TextStyle]
+	[LanguagePicker]o-[LanguagePickerType]
+	[LanguagePicker]o-[Color]
+	[LanguagePicker]o-[Offset]
 	
-	[BadgeType
+	[LanguagePickerType
 	  |
 	  +index: int;
-	  &lt;static&gt;+values: List&lt;BadgeType&gt;;
-	  &lt;static&gt;+filled: BadgeType;
-	  &lt;static&gt;+outlined: BadgeType;
-	  &lt;static&gt;+outlineFill: BadgeType;
-	  &lt;static&gt;+plain: BadgeType
+	  &lt;static&gt;+values: List&lt;LanguagePickerType&gt;;
+	  &lt;static&gt;+field: LanguagePickerType;
+	  &lt;static&gt;+icon: LanguagePickerType
 	]
 	
-	[BadgeType]o-[BadgeType]
-	[Enum]&lt;:--[BadgeType]
+	[LanguagePickerType]o-[LanguagePickerType]
+	[Enum]&lt;:--[LanguagePickerType]
 	
-	[IndicatorRangeSliderThumbShape
+	[&lt;abstract&gt;GoRouteParamEnum
 	  |
-	  +buildContext: BuildContext;
-	  +start: T;
-	  +end: T
+	  +String toRouteParam();
+	  +String toShortString()
+	]
+	
+	[RoutingIntents
 	  |
-	  +Size getPreferredSize();
-	  +void paint()
+	  &lt;static&gt;+root: RoutingIntent;
+	  &lt;static&gt;+studies: RoutingIntent;
+	  &lt;static&gt;+studiesShared: RoutingIntent;
+	  &lt;static&gt;+publicRegistry: RoutingIntent;
+	  &lt;static&gt;+study: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEdit: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditInfo: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditInterventions: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String);
+	  &lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditReports: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String);
+	  &lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute});
+	  &lt;static&gt;+studyRecruit: RoutingIntent Function(String);
+	  &lt;static&gt;+studyMonitor: RoutingIntent Function(String);
+	  &lt;static&gt;+studyAnalyze: RoutingIntent Function(String);
+	  &lt;static&gt;+studySettings: RoutingIntent Function(String);
+	  &lt;static&gt;+accountSettings: RoutingIntent;
+	  &lt;static&gt;+studyNew: RoutingIntent;
+	  &lt;static&gt;+login: RoutingIntent;
+	  &lt;static&gt;+signup: RoutingIntent;
+	  &lt;static&gt;+passwordForgot: RoutingIntent;
+	  &lt;static&gt;+passwordForgot2: RoutingIntent Function(String);
+	  &lt;static&gt;+passwordRecovery: RoutingIntent;
+	  &lt;static&gt;+error: RoutingIntent Function(Exception)
 	]
 	
-	[IndicatorRangeSliderThumbShape]o-[&lt;abstract&gt;BuildContext]
-	[&lt;abstract&gt;RangeSliderThumbShape]&lt;:-[IndicatorRangeSliderThumbShape]
+	[RoutingIntents]o-[RoutingIntent]
+	[RoutingIntents]o-[RoutingIntent Function(String)]
+	[RoutingIntents]o-[RoutingIntent Function(String, String)]
+	[RoutingIntents]o-[RoutingIntent Function(String, {String? appRoute})]
+	[RoutingIntents]o-[RoutingIntent Function(Exception)]
 	
-	[HelpIcon
+	[RoutingIntent
 	  |
-	  +tooltipText: String?
+	  +route: GoRoute;
+	  +params: Map&lt;String, String&gt;;
+	  +queryParams: Map&lt;String, String&gt;;
+	  +dispatch: RoutingIntentDispatch?;
+	  +extra: Object?;
+	  +routeName: String;
+	  +arguments: Map&lt;String, String&gt;;
+	  +props: List&lt;Object?&gt;
 	  |
-	  +Widget build()
+	  -dynamic _validateRoute();
+	  +bool matches()
 	]
 	
-	[UnderConstruction
-	  |
-	  +Widget build()
-	]
+	[RoutingIntent]o-[GoRoute]
+	[RoutingIntent]o-[RoutingIntentDispatch]
+	[&lt;abstract&gt;Equatable]&lt;:-[RoutingIntent]
 	
-	[NotificationDispatcher
-	  |
-	  +child: Widget?;
-	  +snackbarInnerPadding: double;
-	  +snackbarWidth: double?;
-	  +snackbarBehavior: SnackBarBehavior;
-	  +snackbarDefaultDuration: int
-	]
-	
-	[NotificationDispatcher]o-[&lt;abstract&gt;Widget]
-	[NotificationDispatcher]o-[SnackBarBehavior]
-	
-	[&lt;abstract&gt;NotificationIntent
-	  |
-	  +message: String?;
-	  +customContent: Widget?;
-	  +icon: IconData?;
-	  +actions: List&lt;NotificationAction&gt;?;
-	  +type: NotificationType
+	[RoutingIntentDispatch
 	  |
-	  +void register()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;;
+	  &lt;static&gt;+go: RoutingIntentDispatch;
+	  &lt;static&gt;+push: RoutingIntentDispatch
 	]
 	
-	[&lt;abstract&gt;NotificationIntent]o-[&lt;abstract&gt;Widget]
-	[&lt;abstract&gt;NotificationIntent]o-[IconData]
-	[&lt;abstract&gt;NotificationIntent]o-[NotificationType]
+	[RoutingIntentDispatch]o-[RoutingIntentDispatch]
+	[Enum]&lt;:--[RoutingIntentDispatch]
 	
-	[NotificationAction
+	[RouterKeys
 	  |
-	  +label: String;
-	  +onSelect: dynamic Function();
-	  +isDestructive: bool
+	  &lt;static&gt;+studyKey: ValueKey&lt;String&gt;;
+	  &lt;static&gt;+authKey: ValueKey&lt;String&gt;
 	]
 	
-	[NotificationAction]o-[dynamic Function()]
+	[RouterKeys]o-[ValueKey]
 	
-	[SnackbarIntent
+	[RouteParams
 	  |
-	  +duration: int?
+	  &lt;static&gt;+studiesFilter: String;
+	  &lt;static&gt;+studyId: String;
+	  &lt;static&gt;+measurementId: String;
+	  &lt;static&gt;+interventionId: String;
+	  &lt;static&gt;+testAppRoute: String
 	]
 	
-	[&lt;abstract&gt;NotificationIntent]&lt;:-[SnackbarIntent]
-	
-	[AlertIntent
+	[RouterConf
 	  |
-	  +title: String;
-	  +dismissOnAction: bool;
-	  +isDestructive: dynamic
-	]
-	
-	[&lt;abstract&gt;NotificationIntent]&lt;:-[AlertIntent]
-	
-	[NotificationType
+	  &lt;static&gt;+router: GoRouter;
+	  &lt;static&gt;+routes: List&lt;GoRoute&gt;;
+	  &lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;;
+	  &lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;NotificationType&gt;;
-	  &lt;static&gt;+snackbar: NotificationType;
-	  &lt;static&gt;+alert: NotificationType;
-	  &lt;static&gt;+custom: NotificationType
+	  &lt;static&gt;+GoRoute route()
 	]
 	
-	[NotificationType]o-[NotificationType]
-	[Enum]&lt;:--[NotificationType]
+	[RouterConf]o-[GoRouter]
 	
-	[&lt;abstract&gt;INotificationService
+	[&lt;abstract&gt;StudyFormRouteArgs
 	  |
-	  +void showMessage();
-	  +void show();
-	  +Stream&lt;NotificationIntent&gt; watchNotifications();
-	  +void dispose()
+	  +studyId: String
 	]
 	
-	[NotificationService
-	  |
-	  -_streamController: BehaviorSubject&lt;NotificationIntent&gt;
+	[&lt;abstract&gt;QuestionFormRouteArgs
 	  |
-	  +Stream&lt;NotificationIntent&gt; watchNotifications();
-	  +void showMessage();
-	  +void show();
-	  +void dispose()
+	  +questionId: String
 	]
 	
-	[NotificationService]o-[BehaviorSubject]
-	[&lt;abstract&gt;INotificationService]&lt;:--[NotificationService]
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[&lt;abstract&gt;QuestionFormRouteArgs]
 	
-	[Notifications
-	  |
-	  &lt;static&gt;+credentialsInvalid: SnackbarIntent;
-	  &lt;static&gt;+userAlreadyRegistered: SnackbarIntent;
-	  &lt;static&gt;+passwordReset: SnackbarIntent;
-	  &lt;static&gt;+passwordResetSuccess: SnackbarIntent;
-	  &lt;static&gt;+studyDeleted: SnackbarIntent;
-	  &lt;static&gt;+inviteCodeDeleted: SnackbarIntent;
-	  &lt;static&gt;+inviteCodeClipped: SnackbarIntent;
-	  &lt;static&gt;+studyDeleteConfirmation: AlertIntent
+	[ScreenerQuestionFormRouteArgs
 	]
 	
-	[Notifications]o-[SnackbarIntent]
-	[Notifications]o-[AlertIntent]
+	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:-[ScreenerQuestionFormRouteArgs]
 	
-	[NotificationDefaultActions
+	[ConsentItemFormRouteArgs
 	  |
-	  &lt;static&gt;+cancel: NotificationAction
+	  +consentId: String
 	]
 	
-	[NotificationDefaultActions]o-[NotificationAction]
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ConsentItemFormRouteArgs]
 	
-	[&lt;abstract&gt;IClipboardService
+	[MeasurementFormRouteArgs
 	  |
-	  +dynamic copy()
+	  +measurementId: String
 	]
 	
-	[ClipboardService
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[MeasurementFormRouteArgs]
+	
+	[SurveyQuestionFormRouteArgs
 	  |
-	  +dynamic copy()
+	  +questionId: String
 	]
 	
-	[&lt;abstract&gt;IClipboardService]&lt;:--[ClipboardService]
+	[MeasurementFormRouteArgs]&lt;:-[SurveyQuestionFormRouteArgs]
+	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:--[SurveyQuestionFormRouteArgs]
 	
-	[Assets
+	[InterventionFormRouteArgs
 	  |
-	  &lt;static&gt;+logoWide: String
+	  +interventionId: String
 	]
 	
-	[SignupForm
-	  |
-	  +formKey: AuthFormKey
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[InterventionFormRouteArgs]
+	
+	[InterventionTaskFormRouteArgs
 	  |
-	  +Widget build();
-	  -dynamic _onClickTermsOfUse();
-	  -dynamic _onClickPrivacyPolicy()
+	  +taskId: String
 	]
 	
-	[SignupForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
+	[InterventionFormRouteArgs]&lt;:-[InterventionTaskFormRouteArgs]
 	
-	[AuthFormController
-	  |
-	  +authRepository: IAuthRepository;
-	  +sharedPreferences: SharedPreferences;
-	  +notificationService: INotificationService;
-	  +router: GoRouter;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +passwordControl: FormControl&lt;String&gt;;
-	  +passwordConfirmationControl: FormControl&lt;String&gt;;
-	  +rememberMeControl: FormControl&lt;bool&gt;;
-	  +termsOfServiceControl: FormControl&lt;bool&gt;;
-	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +loginForm: FormGroup;
-	  +signupForm: FormGroup;
-	  +passwordForgotForm: FormGroup;
-	  +passwordRecoveryForm: FormGroup;
-	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  -_formKey: AuthFormKey;
-	  +shouldRemember: bool;
-	  +formKey: AuthFormKey;
-	  +form: FormGroup
+	[ReportItemFormRouteArgs
 	  |
-	  -dynamic _getFormFor();
-	  -dynamic _onChangeFormKey();
-	  +dynamic resetControlsFor();
-	  -dynamic _forceValidationMessages();
-	  +dynamic signUp();
-	  -dynamic _signUp();
-	  +dynamic signIn();
-	  -dynamic _signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic sendPasswordResetLink();
-	  +dynamic recoverPassword();
-	  +dynamic updateUser();
-	  -dynamic _readDebugUser();
-	  -void _setRememberMe();
-	  -void _delRememberMe();
-	  -void _initRememberMe()
+	  +sectionId: String
 	]
 	
-	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
-	[AuthFormController]o-[SharedPreferences]
-	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
-	[AuthFormController]o-[GoRouter]
-	[AuthFormController]o-[FormControl]
-	[AuthFormController]o-[FormGroup]
-	[AuthFormController]o-[AuthFormKey]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[AuthFormController]
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ReportItemFormRouteArgs]
 	
-	[AuthFormKey
+	[DropdownMenuItemTheme
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AuthFormKey&gt;;
-	  &lt;static&gt;+login: AuthFormKey;
-	  &lt;static&gt;+signup: AuthFormKey;
-	  &lt;static&gt;+passwordForgot: AuthFormKey;
-	  &lt;static&gt;+passwordRecovery: AuthFormKey;
-	  &lt;static&gt;-_loginSubmit: AuthFormKey;
-	  &lt;static&gt;-_signupSubmit: AuthFormKey
+	  +iconTheme: IconThemeData?
 	]
 	
-	[AuthFormKey]o-[AuthFormKey]
-	[Enum]&lt;:--[AuthFormKey]
+	[DropdownMenuItemTheme]o-[IconThemeData]
+	[&lt;abstract&gt;Diagnosticable]&lt;:-[DropdownMenuItemTheme]
 	
-	[PasswordForgotForm
+	[ThemeConfig
 	  |
-	  +formKey: AuthFormKey
+	  &lt;static&gt;+kMinContentWidth: double;
+	  &lt;static&gt;+kMaxContentWidth: double;
+	  &lt;static&gt;+kHoverFadeFactor: double;
+	  &lt;static&gt;+kMuteFadeFactor: double
 	  |
-	  +Widget build()
+	  &lt;static&gt;+dynamic bodyBackgroundColor();
+	  &lt;static&gt;+Color modalBarrierColor();
+	  &lt;static&gt;+Color containerColor();
+	  &lt;static&gt;+Color colorPickerInitialColor();
+	  &lt;static&gt;+TextStyle bodyTextMuted();
+	  &lt;static&gt;+TextStyle bodyTextBackground();
+	  &lt;static&gt;+double iconSplashRadius();
+	  &lt;static&gt;+Color sidesheetBackgroundColor();
+	  &lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme();
+	  &lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()
 	]
 	
-	[PasswordForgotForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
-	
-	[EmailTextField
+	[NoAnimationPageTransitionsBuilder
 	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
+	  +Widget buildTransitions()
 	]
 	
-	[EmailTextField]o-[FormControl]
+	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[NoAnimationPageTransitionsBuilder]
 	
-	[PasswordTextField
+	[WebTransitionBuilder
 	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
+	  +Widget buildTransitions()
 	]
 	
-	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
-	[PasswordTextField]o-[FormControl]
+	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[WebTransitionBuilder]
 	
-	[PasswordRecoveryForm
-	  |
-	  +formKey: AuthFormKey
+	[ThemeSettingChange
 	  |
-	  +Widget build()
+	  +settings: ThemeSettings
 	]
 	
-	[PasswordRecoveryForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
+	[ThemeSettingChange]o-[ThemeSettings]
+	[&lt;abstract&gt;Notification]&lt;:-[ThemeSettingChange]
 	
-	[AuthScaffold
+	[ThemeProvider
 	  |
-	  +body: Widget;
-	  +formKey: AuthFormKey;
-	  +leftContentMinWidth: double;
-	  +leftPanelMinWidth: double;
-	  +leftPanelPadding: EdgeInsets
+	  +settings: ValueNotifier&lt;ThemeSettings&gt;;
+	  +lightDynamic: ColorScheme?;
+	  +darkDynamic: ColorScheme?;
+	  +pageTransitionsTheme: PageTransitionsTheme;
+	  +shapeMedium: ShapeBorder
+	  |
+	  +Color custom();
+	  +Color blend();
+	  +Color source();
+	  +ColorScheme colors();
+	  +CardTheme cardTheme();
+	  +ListTileThemeData listTileTheme();
+	  +AppBarTheme appBarTheme();
+	  +SnackBarThemeData snackBarThemeData();
+	  +TabBarTheme tabBarTheme();
+	  +BottomAppBarTheme bottomAppBarTheme();
+	  +BottomNavigationBarThemeData bottomNavigationBarTheme();
+	  +SwitchThemeData switchTheme();
+	  +InputDecorationTheme inputDecorationTheme();
+	  +TextTheme textTheme();
+	  +DividerThemeData dividerTheme();
+	  +NavigationRailThemeData navigationRailTheme();
+	  +DrawerThemeData drawerTheme();
+	  +IconThemeData iconTheme();
+	  +CheckboxThemeData checkboxTheme();
+	  +RadioThemeData radioTheme();
+	  +TooltipThemeData tooltipTheme();
+	  +ThemeData light();
+	  +ThemeData dark();
+	  +ThemeMode themeMode();
+	  +ThemeData theme();
+	  &lt;static&gt;+ThemeProvider of();
+	  +bool updateShouldNotify()
 	]
 	
-	[AuthScaffold]o-[&lt;abstract&gt;Widget]
-	[AuthScaffold]o-[AuthFormKey]
-	[AuthScaffold]o-[EdgeInsets]
+	[ThemeProvider]o-[ValueNotifier]
+	[ThemeProvider]o-[ColorScheme]
+	[ThemeProvider]o-[PageTransitionsTheme]
+	[ThemeProvider]o-[&lt;abstract&gt;ShapeBorder]
+	[&lt;abstract&gt;InheritedWidget]&lt;:-[ThemeProvider]
 	
-	[StudyUJobsToBeDone
+	[ThemeSettings
 	  |
-	  +Widget build()
+	  +sourceColor: Color;
+	  +themeMode: ThemeMode
 	]
 	
-	[LoginForm
+	[ThemeSettings]o-[Color]
+	[ThemeSettings]o-[ThemeMode]
+	
+	[CustomColor
 	  |
-	  +formKey: AuthFormKey
+	  +name: String;
+	  +color: Color;
+	  +blend: bool
 	  |
-	  +Widget build()
+	  +Color value()
 	]
 	
-	[LoginForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
-	
-	[&lt;abstract&gt;IAppDelegate
-	  |
-	  +dynamic onAppStart()
-	]
+	[CustomColor]o-[Color]
 	
-	[AppController
+	[SuppressedBehaviorSubject
 	  |
-	  +sharedPreferences: SharedPreferences;
-	  +appDelegates: List&lt;IAppDelegate&gt;;
-	  -_delayedFuture: dynamic;
-	  +isInitialized: dynamic
+	  +subject: BehaviorSubject&lt;T&gt;;
+	  +didSuppressInitialEvent: bool;
+	  -_controller: StreamController&lt;T&gt;
 	  |
-	  +dynamic onAppStart();
-	  -dynamic _callDelegates()
+	  -StreamController&lt;T&gt; _buildDerivedController();
+	  +dynamic close()
 	]
 	
-	[AppController]o-[SharedPreferences]
+	[SuppressedBehaviorSubject]o-[BehaviorSubject]
+	[SuppressedBehaviorSubject]o-[StreamController]
 	
-	[App
+	[Time
+	  |
+	  &lt;static&gt;+dynamic fromTimeOfDay();
+	  +Map&lt;String, dynamic&gt; toJson();
+	  &lt;static&gt;+Time fromJson()
 	]
 	
-	[AppContent
-	]
+	[TimeOfDay]&lt;:-[Time]
 	
-	[AppStatus
+	[TimeValueAccessor
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
-	  &lt;static&gt;+initializing: AppStatus;
-	  &lt;static&gt;+initialized: AppStatus
+	  +String modelToViewValue();
+	  +Time? viewToModelValue();
+	  -String _addLeadingZeroIfNeeded()
 	]
 	
-	[AppStatus]o-[AppStatus]
-	[Enum]&lt;:--[AppStatus]
+	[&lt;abstract&gt;ControlValueAccessor]&lt;:-[TimeValueAccessor]
 	
-	[StudyAnalyzeScreen
+	[ModelAction
 	  |
-	  +Widget? banner();
-	  +Widget build()
+	  +type: T;
+	  +label: String;
+	  +icon: IconData?;
+	  +onExecute: Function;
+	  +isAvailable: bool;
+	  +isDestructive: bool
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
+	[ModelAction]o-[IconData]
 	
-	[StudyAnalyzeController
+	[&lt;abstract&gt;IModelActionProvider
 	  |
-	  +dynamic onExport()
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
 	]
 	
-	[StudyBaseController]&lt;:-[StudyAnalyzeController]
-	
-	[StudyParticipationBadge
-	  |
-	  +participation: Participation;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +center: bool
+	[&lt;abstract&gt;IListActionProvider
 	  |
-	  +Widget build()
+	  +void onSelectItem();
+	  +void onNewItem()
 	]
 	
-	[StudyParticipationBadge]o-[Participation]
-	[StudyParticipationBadge]o-[BadgeType]
+	[&lt;abstract&gt;IModelActionProvider]&lt;:-[&lt;abstract&gt;IListActionProvider]
 	
-	[PreviewFrame
+	[ModelActionType
 	  |
-	  +studyId: String;
-	  +routeArgs: StudyFormRouteArgs?;
-	  +route: String?
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ModelActionType&gt;;
+	  &lt;static&gt;+edit: ModelActionType;
+	  &lt;static&gt;+delete: ModelActionType;
+	  &lt;static&gt;+remove: ModelActionType;
+	  &lt;static&gt;+duplicate: ModelActionType;
+	  &lt;static&gt;+clipboard: ModelActionType;
+	  &lt;static&gt;+primary: ModelActionType
 	]
 	
-	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
+	[ModelActionType]o-[ModelActionType]
+	[Enum]&lt;:--[ModelActionType]
 	
-	[FrameControlsWidget
+	[OptimisticUpdate
 	  |
-	  +onRefresh: void Function()?;
-	  +onOpenNewTab: void Function()?;
-	  +enabled: bool
+	  +applyOptimistic: void Function();
+	  +apply: dynamic Function();
+	  +rollback: void Function();
+	  +onUpdate: void Function()?;
+	  +onError: void Function(Object, StackTrace?)?;
+	  +rethrowErrors: bool;
+	  +runOptimistically: bool;
+	  +completeFutureOptimistically: bool
 	  |
-	  +Widget build()
+	  +dynamic execute();
+	  -void _runUpdateHandlerIfAny()
 	]
 	
-	[FrameControlsWidget]o-[void Function()?]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
+	[OptimisticUpdate]o-[void Function()]
+	[OptimisticUpdate]o-[dynamic Function()]
+	[OptimisticUpdate]o-[void Function()?]
+	[OptimisticUpdate]o-[void Function(Object, StackTrace?)?]
 	
-	[&lt;abstract&gt;IStudyNavViewModel
+	[&lt;abstract&gt;FileFormatEncoder
 	  |
-	  +isEditTabEnabled: bool;
-	  +isTestTabEnabled: bool;
-	  +isRecruitTabEnabled: bool;
-	  +isMonitorTabEnabled: bool;
-	  +isAnalyzeTabEnabled: bool;
-	  +isSettingsEnabled: bool
+	  +dynamic encodeAsync();
+	  +String encode();
+	  +dynamic call()
 	]
 	
-	[StudyNav
+	[CSVStringEncoder
 	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic edit();
-	  &lt;static&gt;+dynamic test();
-	  &lt;static&gt;+dynamic recruit();
-	  &lt;static&gt;+dynamic monitor();
-	  &lt;static&gt;+dynamic analyze()
+	  +String encode()
 	]
 	
-	[StudyDesignNav
-	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic info();
-	  &lt;static&gt;+dynamic enrollment();
-	  &lt;static&gt;+dynamic interventions();
-	  &lt;static&gt;+dynamic measurements();
-	  &lt;static&gt;+dynamic reports()
-	]
+	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[CSVStringEncoder]
 	
-	[StudySettingsFormViewModel
-	  |
-	  +study: AsyncValue&lt;Study&gt;;
-	  +studyRepository: IStudyRepository;
-	  &lt;static&gt;+defaultPublishedToRegistry: bool;
-	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
-	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
-	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
+	[JsonStringEncoder
 	  |
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +dynamic keepControlsSynced();
-	  +dynamic save();
-	  +dynamic setLaunchDefaults()
+	  +String encode()
 	]
 	
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudySettingsFormViewModel]o-[FormControl]
-	[StudySettingsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
+	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[JsonStringEncoder]
 	
-	[StudySettingsDialog
+	[&lt;abstract&gt;ExecutionLimiter
 	  |
-	  +Widget build()
+	  +milliseconds: int;
+	  &lt;static&gt;-_timer: Timer?
+	  |
+	  +void dispose()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
+	[&lt;abstract&gt;ExecutionLimiter]o-[Timer]
 	
-	[StudyTestScreen
+	[Debouncer
 	  |
-	  +previewRoute: String?
+	  +leading: bool;
+	  +cancelUncompleted: bool;
+	  -_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?
 	  |
-	  +Widget build();
-	  +Widget? banner();
-	  +dynamic load();
-	  +dynamic save();
-	  +dynamic showHelp()
+	  +dynamic call()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
+	[Debouncer]o-[CancelableOperation]
+	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Debouncer]
 	
-	[StudyBaseController
+	[Throttler
 	  |
-	  +studyId: String;
-	  +studyRepository: IStudyRepository;
-	  +router: GoRouter;
-	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
-	  |
-	  +dynamic subscribeStudy();
-	  +dynamic onStudySubscriptionUpdate();
-	  +dynamic onStudySubscriptionError();
-	  +void dispose()
+	  +dynamic call()
 	]
 	
-	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyBaseController]o-[GoRouter]
-	[StudyBaseController]o-[StreamSubscription]
+	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Throttler]
 	
-	[StudyTestController
+	[SerializableColor
 	  |
-	  +authRepository: IAuthRepository;
-	  +languageCode: String
+	  +Map&lt;String, dynamic&gt; toJson();
+	  &lt;static&gt;+SerializableColor fromJson()
 	]
 	
-	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyBaseController]&lt;:-[StudyTestController]
+	[Color]&lt;:-[SerializableColor]
 	
-	[WebFrame
-	  |
-	  +previewSrc: String;
-	  +studyId: String
+	[&lt;abstract&gt;IProviderArgsResolver
 	  |
-	  +Widget build()
+	  +R provide()
 	]
 	
-	[DisabledFrame
+	[CombinedStreamNotifier
 	  |
-	  +Widget build()
+	  -_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;
+	  |
+	  +void dispose()
 	]
 	
-	[PhoneContainer
+	[ChangeNotifier]&lt;:-[CombinedStreamNotifier]
+	
+	[CountWhereValidator
 	  |
-	  &lt;static&gt;+defaultWidth: double;
-	  &lt;static&gt;+defaultHeight: double;
-	  +width: double;
-	  +height: double;
-	  +borderColor: Color;
-	  +borderWidth: double;
-	  +borderRadius: double;
-	  +innerContent: Widget;
-	  +innerContentBackgroundColor: Color?
+	  +predicate: bool Function(T?);
+	  +minCount: int?;
+	  +maxCount: int?;
+	  &lt;static&gt;+kValidationMessageMinCount: String;
+	  &lt;static&gt;+kValidationMessageMaxCount: String
 	  |
-	  +Widget build()
+	  +Map&lt;String, dynamic&gt;? validate()
 	]
 	
-	[PhoneContainer]o-[Color]
-	[PhoneContainer]o-[&lt;abstract&gt;Widget]
+	[CountWhereValidator]o-[bool Function(T?)]
+	[&lt;abstract&gt;Validator]&lt;:-[CountWhereValidator]
 	
-	[MobileFrame
+	[Patterns
 	  |
-	  +Widget build()
+	  &lt;static&gt;+timeFormatString: String;
+	  &lt;static&gt;+emailFormatString: String;
+	  &lt;static&gt;+url: String
 	]
 	
-	[DesktopFrame
+	[NumericalRangeFormatter
 	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;IStudyAppBarViewModel
+	  +min: int?;
+	  +max: int?
 	  |
-	  +isSyncIndicatorVisible: bool;
-	  +isStatusBadgeVisible: bool;
-	  +isPublishVisible: bool
+	  +TextEditingValue formatEditUpdate()
 	]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
+	[&lt;abstract&gt;TextInputFormatter]&lt;:-[NumericalRangeFormatter]
 	
-	[StudyScaffold
+	[StudySequenceFormatter
 	  |
-	  +studyId: String;
-	  +tabs: List&lt;NavbarTab&gt;?;
-	  +tabsSubnav: List&lt;NavbarTab&gt;?;
-	  +selectedTab: NavbarTab?;
-	  +selectedTabSubnav: NavbarTab?;
-	  +body: StudyPageWidget;
-	  +drawer: Widget?;
-	  +disableActions: bool;
-	  +actionsSpacing: double;
-	  +actionsPadding: double;
-	  +layoutType: SingleColumnLayoutType?;
-	  +appbarHeight: double;
-	  +appbarSubnavHeight: double
+	  +TextEditingValue formatEditUpdate()
 	]
 	
-	[StudyScaffold]o-[NavbarTab]
-	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
-	[StudyScaffold]o-[&lt;abstract&gt;Widget]
-	[StudyScaffold]o-[SingleColumnLayoutType]
+	[&lt;abstract&gt;TextInputFormatter]&lt;:-[StudySequenceFormatter]
 	
-	[RouteInformation
+	[Tuple
 	  |
-	  +route: String?;
-	  +extra: String?;
-	  +cmd: String?;
-	  +data: String?
+	  +first: T1;
+	  +second: T2;
+	  +props: List&lt;Object?&gt;
 	  |
-	  +String toString()
+	  +Map&lt;String, dynamic&gt; toJson();
+	  &lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson();
+	  +Tuple&lt;T1, T2&gt; copy();
+	  +Tuple&lt;T1, T2&gt; copyWith()
 	]
 	
-	[&lt;abstract&gt;PlatformController
+	[&lt;abstract&gt;Equatable]&lt;:-[Tuple]
+	
+	[&lt;abstract&gt;JsonFileLoader
 	  |
-	  +studyId: String;
-	  +baseSrc: String;
-	  +previewSrc: String;
-	  +routeInformation: RouteInformation;
-	  +frameWidget: Widget
+	  +jsonAssetsPath: String
 	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void listen();
-	  +void send();
-	  +void openNewPage()
+	  +dynamic loadJson();
+	  +dynamic parseJsonMapFromAssets();
+	  +dynamic parseJsonListFromAssets()
 	]
 	
-	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
-	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
-	
-	[WebController
-	  |
-	  +iFrameElement: IFrameElement
+	[&lt;abstract&gt;IAppDelegate
 	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void openNewPage();
-	  +void listen();
-	  +void send()
+	  +dynamic onAppStart()
 	]
 	
-	[WebController]o-[IFrameElement]
-	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
-	
-	[MobileController
+	[AppController
 	  |
-	  +void openNewPage();
-	  +void refresh();
-	  +void registerViews();
-	  +void listen();
-	  +void send();
-	  +void navigate();
-	  +void activate();
-	  +void generateUrl()
+	  +sharedPreferences: SharedPreferences;
+	  +appDelegates: List&lt;IAppDelegate&gt;;
+	  -_delayedFuture: dynamic;
+	  +isInitialized: dynamic
+	  |
+	  +dynamic onAppStart();
+	  -dynamic _callDelegates()
 	]
 	
-	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
+	[AppController]o-[SharedPreferences]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel
+	[ParticipantDetailsFormView
 	  |
-	  +studyParticipation: Participation?;
-	  +studyStatus: StudyStatus?
+	  +formViewModel: ParticipantDetailsFormViewModel
+	  |
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
+	[ParticipantDetailsFormView]o-[ParticipantDetailsFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ParticipantDetailsFormView]
 	
-	[StudyStatusBadge
-	  |
-	  +participation: Participation?;
-	  +status: StudyStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
+	[StudyMonitorScreen
 	  |
-	  +Widget build()
+	  +Widget build();
+	  -Widget _monitorSectionHeader();
+	  -Widget _buildStat();
+	  -dynamic _onSelectParticipant()
 	]
 	
-	[StudyStatusBadge]o-[Participation]
-	[StudyStatusBadge]o-[StudyStatus]
-	[StudyStatusBadge]o-[BadgeType]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
 	
-	[TestAppRoutes
+	[StudyMonitorItem
+	  |
+	  +participantId: String;
+	  +inviteCode: String?;
+	  +enrolledAt: DateTime;
+	  +lastActivityAt: DateTime;
+	  +currentDayOfStudy: int;
+	  +studyDurationInDays: int;
+	  +completedInterventions: int;
+	  +missedInterventions: int;
+	  +completedSurveys: int;
+	  +missedSurveys: int;
+	  +rawData: String;
+	  +props: List&lt;Object?&gt;
 	  |
-	  &lt;static&gt;+studyOverview: String;
-	  &lt;static&gt;+eligibility: String;
-	  &lt;static&gt;+intervention: String;
-	  &lt;static&gt;+consent: String;
-	  &lt;static&gt;+journey: String;
-	  &lt;static&gt;+dashboard: String
+	  &lt;static&gt;+List&lt;StudyMonitorItem&gt; fromStudy()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget
+	[&lt;abstract&gt;Equatable]&lt;:-[StudyMonitorItem]
+	
+	[StudyMonitorTable
 	  |
-	  +studyId: String
+	  +studyMonitorItems: List&lt;StudyMonitorItem&gt;;
+	  +onSelectItem: void Function(StudyMonitorItem)
 	  |
-	  +Widget? banner()
+	  +Widget build();
+	  -List&lt;Widget&gt; _buildRow();
+	  -String _formatTime();
+	  -Widget _buildProgressCell()
 	]
 	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
-	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
+	[StudyMonitorTable]o-[void Function(StudyMonitorItem)]
 	
-	[StudyController
+	[ParticipantDetailsFormViewModel
 	  |
-	  +notificationService: INotificationService;
-	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
-	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
+	  +participantIdControl: FormControl&lt;String&gt;;
+	  +rawDataControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +dynamic syncStudyStatus();
-	  +dynamic onStudySubscriptionUpdate();
-	  -dynamic _redirectNewToActualStudyID();
-	  +dynamic publishStudy();
-	  +void onChangeStudyParticipation();
-	  +void onAddParticipants();
-	  +void onSettingsPressed();
-	  +void dispose()
+	  +void initControls();
+	  +StudyMonitorItem buildFormData();
+	  +void setControlsFrom()
 	]
 	
-	[StudyController]o-[&lt;abstract&gt;INotificationService]
-	[StudyController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyController]
+	[ParticipantDetailsFormViewModel]o-[FormControl]
+	[ParticipantDetailsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[ParticipantDetailsFormViewModel]
 	
-	[StudyMonitorScreen
+	[LoginForm
+	  |
+	  +formKey: AuthFormKey
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
+	[LoginForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
 	
-	[StudiesTableColumnHeader
+	[PasswordRecoveryForm
 	  |
-	  +title: String;
-	  +sortable: bool;
-	  +sortAscending: bool;
-	  +sortingActive: bool;
-	  +onSort: void Function()?
+	  +formKey: AuthFormKey
+	  |
+	  +Widget build()
 	]
 	
-	[StudiesTableColumnHeader]o-[void Function()?]
+	[PasswordRecoveryForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
 	
-	[DashboardScaffold
+	[PasswordForgotForm
 	  |
-	  &lt;static&gt;+compactWidthThreshold: double;
-	  +body: Widget
+	  +formKey: AuthFormKey
 	  |
 	  +Widget build()
 	]
 	
-	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
+	[PasswordForgotForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
 	
-	[StudiesTableColumnSize
+	[SignupForm
 	  |
-	  +collapsed: bool;
-	  +flex: int?;
-	  +width: double?
+	  +formKey: AuthFormKey
 	  |
-	  +Widget createContainer()
+	  +Widget build();
+	  -dynamic _onClickTermsOfUse();
+	  -dynamic _onClickPrivacyPolicy()
 	]
 	
-	[StudiesTable
-	  |
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +compactWidthThreshold: double;
-	  +superCompactWidthThreshold: double;
-	  +compactStatTitleThreshold: double;
-	  +studies: List&lt;Study&gt;;
-	  +onSelect: void Function(Study);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study);
-	  +emptyWidget: Widget;
-	  +pinnedStudies: Iterable&lt;String&gt;;
-	  +dashboardController: DashboardController
+	[SignupForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
+	
+	[AuthScaffold
 	  |
-	  +Widget build();
-	  -Widget _buildColumnHeader()
+	  +body: Widget;
+	  +formKey: AuthFormKey;
+	  +leftContentMinWidth: double;
+	  +leftPanelMinWidth: double;
+	  +leftPanelPadding: EdgeInsets
 	]
 	
-	[StudiesTable]o-[void Function(Study)]
-	[StudiesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)]
-	[StudiesTable]o-[&lt;abstract&gt;Widget]
-	[StudiesTable]o-[DashboardController]
+	[AuthScaffold]o-[&lt;abstract&gt;Widget]
+	[AuthScaffold]o-[AuthFormKey]
+	[AuthScaffold]o-[EdgeInsets]
 	
-	[StudiesTableColumn
+	[EmailTextField
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesTableColumn&gt;;
-	  &lt;static&gt;+pin: StudiesTableColumn;
-	  &lt;static&gt;+title: StudiesTableColumn;
-	  &lt;static&gt;+status: StudiesTableColumn;
-	  &lt;static&gt;+participation: StudiesTableColumn;
-	  &lt;static&gt;+createdAt: StudiesTableColumn;
-	  &lt;static&gt;+enrolled: StudiesTableColumn;
-	  &lt;static&gt;+active: StudiesTableColumn;
-	  &lt;static&gt;+completed: StudiesTableColumn;
-	  &lt;static&gt;+action: StudiesTableColumn
+	  +labelText: String;
+	  +hintText: String?;
+	  +formControlName: String?;
+	  +formControl: FormControl&lt;dynamic&gt;?
 	]
 	
-	[StudiesTableColumn]o-[StudiesTableColumn]
-	[Enum]&lt;:--[StudiesTableColumn]
+	[EmailTextField]o-[FormControl]
 	
-	[DashboardScreen
+	[PasswordTextField
 	  |
-	  +filter: StudiesFilter?
+	  +labelText: String;
+	  +hintText: String?;
+	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
+	  +formControlName: String?;
+	  +formControl: FormControl&lt;dynamic&gt;?
 	]
 	
-	[DashboardScreen]o-[StudiesFilter]
+	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
+	[PasswordTextField]o-[FormControl]
 	
-	[DashboardController
+	[StudyUJobsToBeDone
+	  |
+	  +Widget build()
+	]
+	
+	[AuthFormController
 	  |
-	  +studyRepository: IStudyRepository;
 	  +authRepository: IAuthRepository;
-	  +userRepository: IUserRepository;
+	  +sharedPreferences: SharedPreferences;
+	  +notificationService: INotificationService;
 	  +router: GoRouter;
-	  -_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?;
-	  +searchController: SearchController;
-	  +isSortAscending: bool
+	  +emailControl: FormControl&lt;String&gt;;
+	  +passwordControl: FormControl&lt;String&gt;;
+	  +passwordConfirmationControl: FormControl&lt;String&gt;;
+	  +rememberMeControl: FormControl&lt;bool&gt;;
+	  +termsOfServiceControl: FormControl&lt;bool&gt;;
+	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
+	  +loginForm: FormGroup;
+	  +signupForm: FormGroup;
+	  +passwordForgotForm: FormGroup;
+	  +passwordRecoveryForm: FormGroup;
+	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
+	  -_formKey: AuthFormKey;
+	  +shouldRemember: bool;
+	  +formKey: AuthFormKey;
+	  +form: FormGroup
 	  |
-	  -dynamic _subscribeStudies();
-	  +dynamic setSearchText();
-	  +dynamic setStudiesFilter();
-	  +dynamic onSelectStudy();
-	  +dynamic onClickNewStudy();
-	  +dynamic pinStudy();
-	  +dynamic pinOffStudy();
-	  +void setSorting();
-	  +void filterStudies();
-	  +void sortStudies();
-	  +bool isSortingActiveForColumn();
-	  +bool isPinned();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void dispose()
+	  -dynamic _getFormFor();
+	  -dynamic _onChangeFormKey();
+	  +dynamic resetControlsFor();
+	  -dynamic _forceValidationMessages();
+	  +dynamic signUp();
+	  -dynamic _signUp();
+	  +dynamic signIn();
+	  -dynamic _signInWith();
+	  +dynamic signOut();
+	  +dynamic resetPasswordForEmail();
+	  +dynamic sendPasswordResetLink();
+	  +dynamic recoverPassword();
+	  +dynamic updateUser();
+	  -dynamic _readDebugUser();
+	  -void _setRememberMe();
+	  -void _delRememberMe();
+	  -void _initRememberMe()
 	]
 	
-	[DashboardController]o-[&lt;abstract&gt;IStudyRepository]
-	[DashboardController]o-[&lt;abstract&gt;IAuthRepository]
-	[DashboardController]o-[&lt;abstract&gt;IUserRepository]
-	[DashboardController]o-[GoRouter]
-	[DashboardController]o-[StreamSubscription]
-	[DashboardController]o-[SearchController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
+	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
+	[AuthFormController]o-[SharedPreferences]
+	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
+	[AuthFormController]o-[GoRouter]
+	[AuthFormController]o-[FormControl]
+	[AuthFormController]o-[FormGroup]
+	[AuthFormController]o-[AuthFormKey]
+	[&lt;abstract&gt;IFormGroupController]&lt;:--[AuthFormController]
 	
-	[StudiesTableItem
+	[AuthFormKey
 	  |
-	  +study: Study;
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
-	  +isPinned: bool;
-	  +onPinnedChanged: void Function(Study, bool)?;
-	  +onTap: void Function(Study)?
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;AuthFormKey&gt;;
+	  &lt;static&gt;+login: AuthFormKey;
+	  &lt;static&gt;+signup: AuthFormKey;
+	  &lt;static&gt;+passwordForgot: AuthFormKey;
+	  &lt;static&gt;+passwordRecovery: AuthFormKey;
+	  &lt;static&gt;-_loginSubmit: AuthFormKey;
+	  &lt;static&gt;-_signupSubmit: AuthFormKey
 	]
 	
-	[StudiesTableItem]o-[Study]
-	[StudiesTableItem]o-[void Function(Study, bool)?]
-	[StudiesTableItem]o-[void Function(Study)?]
+	[AuthFormKey]o-[AuthFormKey]
+	[Enum]&lt;:--[AuthFormKey]
 	
-	[StudiesFilter
+	[AppStatus
 	  |
 	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
+	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
+	  &lt;static&gt;+initializing: AppStatus;
+	  &lt;static&gt;+initialized: AppStatus
 	]
 	
-	[Enum]&lt;:--[StudiesFilter]
+	[AppStatus]o-[AppStatus]
+	[Enum]&lt;:--[AppStatus]
 	
 	[FormArrayTable
 	  |
@@ -1775,6 +1779,39 @@
 	[FormArrayTable]o-[&lt;abstract&gt;Widget]
 	[FormArrayTable]o-[EdgeInsets]
 	
+	[&lt;abstract&gt;ManagedFormViewModel
+	  |
+	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
+	]
+	
+	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
+	
+	[FormViewModelNotFoundException
+	]
+	
+	[Exception]&lt;:--[FormViewModelNotFoundException]
+	
+	[FormViewModelCollection
+	  |
+	  +formViewModels: List&lt;T&gt;;
+	  +formArray: FormArray&lt;dynamic&gt;;
+	  +stagedViewModels: List&lt;T&gt;;
+	  +retrievableViewModels: List&lt;T&gt;;
+	  +formData: List&lt;D&gt;
+	  |
+	  +void add();
+	  +T remove();
+	  +T? findWhere();
+	  +T? removeWhere();
+	  +bool contains();
+	  +void stage();
+	  +T commit();
+	  +void reset();
+	  +void read()
+	]
+	
+	[FormViewModelCollection]o-[FormArray]
+	
 	[CustomFormControl
 	  |
 	  -_onValueChangedDebouncer: Debouncer?;
@@ -1792,6 +1829,33 @@
 	[CustomFormControl]o-[void Function(ControlStatus)?]
 	[FormControl]&lt;:-[CustomFormControl]
 	
+	[UnsavedChangesDialog
+	  |
+	  +Widget build()
+	]
+	
+	[&lt;abstract&gt;FormValidationSetEnum
+	]
+	
+	[FormControlValidation
+	  |
+	  +control: AbstractControl&lt;dynamic&gt;;
+	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
+	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
+	  +validationMessages: Map&lt;String, String Function(Object)&gt;
+	  |
+	  +FormControlValidation merge()
+	]
+	
+	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
+	
+	[&lt;abstract&gt;IFormData
+	  |
+	  +id: String
+	  |
+	  +IFormData copy()
+	]
+	
 	[FormInvalidException
 	]
 	
@@ -1889,108 +1953,51 @@
 	[FormMode]o-[FormMode]
 	[Enum]&lt;:--[FormMode]
 	
-	[&lt;abstract&gt;IFormData
-	  |
-	  +id: String
+	[EnrolledBadge
 	  |
-	  +IFormData copy()
-	]
-	
-	[UnsavedChangesDialog
+	  +enrolledCount: int
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;FormValidationSetEnum
-	]
-	
-	[FormControlValidation
-	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
-	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
-	  +validationMessages: Map&lt;String, String Function(Object)&gt;
-	  |
-	  +FormControlValidation merge()
-	]
-	
-	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
-	
-	[&lt;abstract&gt;ManagedFormViewModel
-	  |
-	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
-	]
-	
-	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
-	
-	[FormViewModelNotFoundException
-	]
-	
-	[Exception]&lt;:--[FormViewModelNotFoundException]
-	
-	[FormViewModelCollection
+	[StudyRecruitController
 	  |
-	  +formViewModels: List&lt;T&gt;;
-	  +formArray: FormArray&lt;dynamic&gt;;
-	  +stagedViewModels: List&lt;T&gt;;
-	  +retrievableViewModels: List&lt;T&gt;;
-	  +formData: List&lt;D&gt;
+	  +inviteCodeRepository: IInviteCodeRepository;
+	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
 	  |
-	  +void add();
-	  +T remove();
-	  +T? findWhere();
-	  +T? removeWhere();
-	  +bool contains();
-	  +void stage();
-	  +T commit();
-	  +void reset();
-	  +void read()
+	  -dynamic _subscribeInvites();
+	  +Intervention? getIntervention();
+	  +int getParticipantCountForInvite();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void dispose()
 	]
 	
-	[FormViewModelCollection]o-[FormArray]
+	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
+	[StudyRecruitController]o-[StreamSubscription]
+	[StudyBaseController]&lt;:-[StudyRecruitController]
+	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
 	
-	[DrawerEntry
-	  |
-	  +localizedTitle: String Function();
-	  +icon: IconData?;
-	  +localizedHelpText: String Function()?;
-	  +enabled: bool;
-	  +onSelected: void Function(BuildContext, WidgetRef)?;
-	  +autoCloseDrawer: bool;
-	  +title: String;
-	  +helpText: String?
+	[StudyRecruitScreen
 	  |
-	  +void onClick()
+	  +Widget build();
+	  -Widget _inviteCodesSectionHeader();
+	  -Widget _newInviteCodeButton();
+	  -dynamic _onSelectInvite()
 	]
 	
-	[DrawerEntry]o-[String Function()]
-	[DrawerEntry]o-[IconData]
-	[DrawerEntry]o-[String Function()?]
-	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
 	
-	[GoRouterDrawerEntry
+	[InviteCodeFormView
 	  |
-	  +intent: RoutingIntent;
-	  +onNavigated: void Function()?
+	  +formViewModel: InviteCodeFormViewModel
 	  |
-	  +void onClick()
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
 	]
 	
-	[GoRouterDrawerEntry]o-[RoutingIntent]
-	[GoRouterDrawerEntry]o-[void Function()?]
-	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
-	
-	[AppDrawer
-	  |
-	  +width: int;
-	  +autoCloseDrawer: bool;
-	  +leftPaddingEntries: double;
-	  +logoPaddingVertical: double;
-	  +logoPaddingHorizontal: double;
-	  +logoMaxHeight: double;
-	  +logoSectionMinHeight: double;
-	  +logoSectionMaxHeight: double
-	]
+	[InviteCodeFormView]o-[InviteCodeFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
 	
 	[StudyInvitesTable
 	  |
@@ -2010,17 +2017,6 @@
 	[StudyInvitesTable]o-[Intervention? Function(String)]
 	[StudyInvitesTable]o-[int Function(StudyInvite)]
 	
-	[InviteCodeFormView
-	  |
-	  +formViewModel: InviteCodeFormViewModel
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
-	]
-	
-	[InviteCodeFormView]o-[InviteCodeFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
-	
 	[InviteCodeFormViewModel
 	  |
 	  +study: Study;
@@ -2053,41 +2049,20 @@
 	[InviteCodeFormViewModel]o-[FormGroup]
 	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
 	
-	[StudyRecruitController
-	  |
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
-	  |
-	  -dynamic _subscribeInvites();
-	  +Intervention? getIntervention();
-	  +int getParticipantCountForInvite();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void dispose()
-	]
-	
-	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[StudyRecruitController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyRecruitController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
-	
-	[StudyRecruitScreen
+	[PublishSuccessDialog
 	  |
-	  +Widget build();
-	  -Widget _inviteCodesSectionHeader();
-	  -Widget _newInviteCodeButton();
-	  -dynamic _onSelectInvite()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
 	
-	[EnrolledBadge
-	  |
-	  +enrolledCount: int
+	[PublishDialog
 	  |
 	  +Widget build()
 	]
 	
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
+	
 	[PublishConfirmationDialog
 	  |
 	  +Widget build()
@@ -2095,443 +2070,410 @@
 	
 	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
 	
-	[PublishSuccessDialog
+	[FrameControlsWidget
+	  |
+	  +onRefresh: void Function()?;
+	  +onOpenNewTab: void Function()?;
+	  +enabled: bool
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
+	[FrameControlsWidget]o-[void Function()?]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
 	
-	[PublishDialog
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel
 	  |
-	  +Widget build()
+	  +studyParticipation: Participation?;
+	  +studyStatus: StudyStatus?
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
 	
-	[StudyFormScaffold
+	[StudyStatusBadge
 	  |
-	  +studyId: String;
-	  +formViewModelBuilder: T Function(WidgetRef);
-	  +formViewBuilder: Widget Function(T)
+	  +participation: Participation?;
+	  +status: StudyStatus?;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +showTooltip: bool
 	  |
 	  +Widget build()
 	]
 	
-	[StudyFormScaffold]o-[T Function(WidgetRef)]
-	[StudyFormScaffold]o-[Widget Function(T)]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
-	
-	[StudyFormValidationSet
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
-	]
-	
-	[Enum]&lt;:--[StudyFormValidationSet]
+	[StudyStatusBadge]o-[Participation]
+	[StudyStatusBadge]o-[StudyStatus]
+	[StudyStatusBadge]o-[BadgeType]
 	
-	[&lt;abstract&gt;QuestionFormData
+	[RouteInformation
 	  |
-	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
-	  +questionId: String;
-	  +questionText: String;
-	  +questionInfoText: String?;
-	  +questionType: SurveyQuestionType;
-	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
-	  +responseOptions: List&lt;dynamic&gt;;
-	  +id: String
+	  +route: String?;
+	  +extra: String?;
+	  +cmd: String?;
+	  +data: String?
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +EligibilityCriterion toEligibilityCriterion();
-	  +Answer&lt;dynamic&gt; constructAnswerFor();
-	  +dynamic setResponseOptionsValidityFrom();
-	  +QuestionFormData copy()
+	  +String toString()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
-	
-	[ChoiceQuestionFormData
+	[&lt;abstract&gt;PlatformController
 	  |
-	  +isMultipleChoice: bool;
-	  +answerOptions: List&lt;String&gt;;
-	  +responseOptions: List&lt;String&gt;
+	  +studyId: String;
+	  +baseSrc: String;
+	  +previewSrc: String;
+	  +routeInformation: RouteInformation;
+	  +frameWidget: Widget
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +QuestionFormData copy();
-	  -Choice _buildChoiceForValue();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +void activate();
+	  +void registerViews();
+	  +void generateUrl();
+	  +void navigate();
+	  +void refresh();
+	  +void listen();
+	  +void send();
+	  +void openNewPage()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
+	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
+	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
 	
-	[BoolQuestionFormData
+	[WebController
 	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
-	  +responseOptions: List&lt;String&gt;
+	  +iFrameElement: IFrameElement
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +BoolQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +void activate();
+	  +void registerViews();
+	  +void generateUrl();
+	  +void navigate();
+	  +void refresh();
+	  +void openNewPage();
+	  +void listen();
+	  +void send()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
+	[WebController]o-[IFrameElement]
+	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
 	
-	[ScaleQuestionFormData
+	[MobileController
 	  |
-	  +minValue: double;
-	  +maxValue: double;
-	  +minLabel: String?;
-	  +maxLabel: String?;
-	  +midValues: List&lt;double?&gt;;
-	  +midLabels: List&lt;String?&gt;;
-	  +stepSize: double;
-	  +initialValue: double?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +responseOptions: List&lt;double&gt;;
-	  +midAnnotations: List&lt;Annotation&gt;
+	  +void openNewPage();
+	  +void refresh();
+	  +void registerViews();
+	  +void listen();
+	  +void send();
+	  +void navigate();
+	  +void activate();
+	  +void generateUrl()
+	]
+	
+	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
+	
+	[StudyController
 	  |
-	  +ScaleQuestion toQuestion();
-	  +QuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +notificationService: INotificationService;
+	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
+	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
+	  |
+	  +dynamic syncStudyStatus();
+	  +dynamic onStudySubscriptionUpdate();
+	  -dynamic _redirectNewToActualStudyID();
+	  +dynamic publishStudy();
+	  +void onChangeStudyParticipation();
+	  +void onAddParticipants();
+	  +void onSettingsPressed();
+	  +void dispose()
 	]
 	
-	[ScaleQuestionFormData]o-[Color]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
+	[StudyController]o-[&lt;abstract&gt;INotificationService]
+	[StudyController]o-[StreamSubscription]
+	[StudyBaseController]&lt;:-[StudyController]
 	
-	[FreeTextQuestionFormData
+	[&lt;abstract&gt;IStudyNavViewModel
 	  |
-	  +textLengthRange: List&lt;int&gt;;
-	  +textType: FreeTextQuestionType;
-	  +textTypeExpression: String?;
-	  +responseOptions: List&lt;String&gt;
+	  +isEditTabEnabled: bool;
+	  +isTestTabEnabled: bool;
+	  +isRecruitTabEnabled: bool;
+	  +isMonitorTabEnabled: bool;
+	  +isAnalyzeTabEnabled: bool;
+	  +isSettingsEnabled: bool
+	]
+	
+	[StudyNav
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +FreeTextQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  &lt;static&gt;+dynamic tabs();
+	  &lt;static&gt;+dynamic edit();
+	  &lt;static&gt;+dynamic test();
+	  &lt;static&gt;+dynamic recruit();
+	  &lt;static&gt;+dynamic monitor();
+	  &lt;static&gt;+dynamic analyze()
 	]
 	
-	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
+	[StudyDesignNav
+	  |
+	  &lt;static&gt;+dynamic tabs();
+	  &lt;static&gt;+dynamic info();
+	  &lt;static&gt;+dynamic enrollment();
+	  &lt;static&gt;+dynamic interventions();
+	  &lt;static&gt;+dynamic measurements();
+	  &lt;static&gt;+dynamic reports()
+	]
 	
-	[SurveyQuestionFormView
+	[&lt;abstract&gt;StudyPageWidget
 	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
+	  +studyId: String
+	  |
+	  +Widget? banner()
 	]
 	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
+	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
 	
-	[SurveyQuestionType
+	[StudyParticipationBadge
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
+	  +participation: Participation;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +center: bool
+	  |
+	  +Widget build()
 	]
 	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
+	[StudyParticipationBadge]o-[Participation]
+	[StudyParticipationBadge]o-[BadgeType]
 	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
+	[StudyBaseController
 	  |
-	  +isMidValuesClearedInfoVisible: bool
+	  +studyId: String;
+	  +studyRepository: IStudyRepository;
+	  +router: GoRouter;
+	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
+	  |
+	  +dynamic subscribeStudy();
+	  +dynamic onStudySubscriptionUpdate();
+	  +dynamic onStudySubscriptionError();
+	  +void dispose()
 	]
 	
-	[ScaleQuestionFormView
+	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
+	[StudyBaseController]o-[GoRouter]
+	[StudyBaseController]o-[StreamSubscription]
+	
+	[PreviewFrame
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  +studyId: String;
+	  +routeArgs: StudyFormRouteArgs?;
+	  +route: String?
 	]
 	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
+	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
 	
-	[ChoiceQuestionFormView
+	[&lt;abstract&gt;IStudyAppBarViewModel
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  +isSyncIndicatorVisible: bool;
+	  +isStatusBadgeVisible: bool;
+	  +isPublishVisible: bool
+	]
+	
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
+	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
+	
+	[StudyScaffold
+	  |
+	  +studyId: String;
+	  +tabs: List&lt;NavbarTab&gt;?;
+	  +tabsSubnav: List&lt;NavbarTab&gt;?;
+	  +selectedTab: NavbarTab?;
+	  +selectedTabSubnav: NavbarTab?;
+	  +body: StudyPageWidget;
+	  +drawer: Widget?;
+	  +disableActions: bool;
+	  +actionsSpacing: double;
+	  +actionsPadding: double;
+	  +layoutType: SingleColumnLayoutType?;
+	  +appbarHeight: double;
+	  +appbarSubnavHeight: double
+	]
+	
+	[StudyScaffold]o-[NavbarTab]
+	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
+	[StudyScaffold]o-[&lt;abstract&gt;Widget]
+	[StudyScaffold]o-[SingleColumnLayoutType]
+	
+	[WebFrame
+	  |
+	  +previewSrc: String;
+	  +studyId: String
 	  |
 	  +Widget build()
 	]
 	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
+	[DisabledFrame
+	  |
+	  +Widget build()
+	]
 	
-	[BoolQuestionFormView
+	[PhoneContainer
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  &lt;static&gt;+defaultWidth: double;
+	  &lt;static&gt;+defaultHeight: double;
+	  +width: double;
+	  +height: double;
+	  +borderColor: Color;
+	  +borderWidth: double;
+	  +borderRadius: double;
+	  +innerContent: Widget;
+	  +innerContentBackgroundColor: Color?
 	  |
 	  +Widget build()
 	]
 	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
+	[PhoneContainer]o-[Color]
+	[PhoneContainer]o-[&lt;abstract&gt;Widget]
 	
-	[FreeTextQuestionFormView
+	[MobileFrame
 	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
+	  +Widget build()
+	]
+	
+	[DesktopFrame
+	  |
+	  +Widget build()
+	]
+	
+	[StudyTestScreen
+	  |
+	  +previewRoute: String?
 	  |
 	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
+	  +Widget? banner();
+	  +dynamic load();
+	  +dynamic save();
+	  +dynamic showHelp()
 	]
 	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
 	
-	[QuestionFormViewModel
+	[StudySettingsFormViewModel
 	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +study: AsyncValue&lt;Study&gt;;
+	  +studyRepository: IStudyRepository;
+	  &lt;static&gt;+defaultPublishedToRegistry: bool;
+	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
+	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
+	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
 	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
 	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
+	  +Study buildFormData();
+	  +dynamic keepControlsSynced();
 	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
+	  +dynamic setLaunchDefaults()
 	]
 	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
+	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
+	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
+	[StudySettingsFormViewModel]o-[FormControl]
+	[StudySettingsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
 	
-	[&lt;abstract&gt;WithQuestionnaireControls
-	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	[StudySettingsDialog
 	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
-	  +void read();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
 	
-	[QuestionnaireFormData
-	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
+	[StudyTestController
 	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
+	  +authRepository: IAuthRepository;
+	  +languageCode: String
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
+	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyBaseController]&lt;:-[StudyTestController]
 	
-	[&lt;abstract&gt;IFormDataWithSchedule
-	  |
-	  +instanceId: String;
-	  +isTimeLocked: bool;
-	  +timeLockStart: StudyUTimeOfDay?;
-	  +timeLockEnd: StudyUTimeOfDay?;
-	  +hasReminder: bool;
-	  +reminderTime: StudyUTimeOfDay?
+	[TestAppRoutes
 	  |
-	  +Schedule toSchedule()
+	  &lt;static&gt;+studyOverview: String;
+	  &lt;static&gt;+eligibility: String;
+	  &lt;static&gt;+intervention: String;
+	  &lt;static&gt;+consent: String;
+	  &lt;static&gt;+journey: String;
+	  &lt;static&gt;+dashboard: String
 	]
 	
-	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
-	
-	[ScheduleControls
+	[DrawerEntry
 	  |
-	  +formViewModel: WithScheduleControls
+	  +localizedTitle: String Function();
+	  +icon: IconData?;
+	  +localizedHelpText: String Function()?;
+	  +enabled: bool;
+	  +onSelected: void Function(BuildContext, WidgetRef)?;
+	  +autoCloseDrawer: bool;
+	  +title: String;
+	  +helpText: String?
 	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
+	  +void onClick()
 	]
 	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
+	[DrawerEntry]o-[String Function()]
+	[DrawerEntry]o-[IconData]
+	[DrawerEntry]o-[String Function()?]
+	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
 	
-	[&lt;abstract&gt;WithScheduleControls
+	[GoRouterDrawerEntry
 	  |
-	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
-	  +instanceID: FormControl&lt;String&gt;;
-	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +hasReminderControl: FormControl&lt;bool&gt;;
-	  +reminderTimeControl: FormControl&lt;Time&gt;;
-	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
-	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
-	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  +hasReminder: bool;
-	  +isTimeRestricted: bool;
-	  +timeRestriction: List&lt;Time&gt;?
+	  +intent: RoutingIntent;
+	  +onNavigated: void Function()?
 	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
+	  +void onClick()
 	]
 	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
+	[GoRouterDrawerEntry]o-[RoutingIntent]
+	[GoRouterDrawerEntry]o-[void Function()?]
+	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
 	
-	[InterventionFormViewModel
+	[AppDrawer
 	  |
-	  +study: Study;
-	  +interventionIdControl: FormControl&lt;String&gt;;
-	  +interventionTitleControl: FormControl&lt;String&gt;;
-	  +interventionIconControl: FormControl&lt;IconOption&gt;;
-	  +interventionDescriptionControl: FormControl&lt;String&gt;;
-	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
-	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
-	  +form: FormGroup;
-	  +interventionId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneTask: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +width: int;
+	  +autoCloseDrawer: bool;
+	  +leftPaddingEntries: double;
+	  +logoPaddingVertical: double;
+	  +logoPaddingHorizontal: double;
+	  +logoMaxHeight: double;
+	  +logoSectionMinHeight: double;
+	  +logoSectionMaxHeight: double
+	]
+	
+	[StudyAnalyzeScreen
 	  |
-	  +void setControlsFrom();
-	  +InterventionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +InterventionTaskFormViewModel provide();
-	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
-	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
-	  +InterventionFormViewModel createDuplicate()
+	  +Widget? banner();
+	  +Widget build()
 	]
 	
-	[InterventionFormViewModel]o-[Study]
-	[InterventionFormViewModel]o-[FormControl]
-	[InterventionFormViewModel]o-[FormArray]
-	[InterventionFormViewModel]o-[FormViewModelCollection]
-	[InterventionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
 	
-	[StudyScheduleFormData
-	  |
-	  +sequenceType: PhaseSequence;
-	  +sequenceTypeCustom: String;
-	  +numCycles: int;
-	  +phaseDuration: int;
-	  +includeBaseline: bool;
-	  +id: String
+	[StudyAnalyzeController
 	  |
-	  +StudySchedule toStudySchedule();
-	  +Study apply();
-	  +StudyScheduleFormData copy()
+	  +dynamic onExport()
 	]
 	
-	[StudyScheduleFormData]o-[PhaseSequence]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
+	[StudyBaseController]&lt;:-[StudyAnalyzeController]
 	
-	[StudyScheduleFormView
-	  |
-	  +formViewModel: StudyScheduleControls
+	[StudyDesignInterventionsFormView
 	  |
-	  -FormTableRow _renderCustomSequence();
 	  +Widget build()
 	]
 	
-	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
 	
-	[InterventionTaskFormView
+	[InterventionFormView
 	  |
-	  +formViewModel: InterventionTaskFormViewModel
+	  +formViewModel: InterventionFormViewModel
 	]
 	
-	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
+	[InterventionFormView]o-[InterventionFormViewModel]
 	
 	[InterventionPreview
 	  |
@@ -2543,18 +2485,16 @@
 	[InterventionPreview]o-[InterventionFormRouteArgs]
 	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
 	
-	[InterventionsFormData
+	[StudyScheduleFormView
 	  |
-	  +interventionsData: List&lt;InterventionFormData&gt;;
-	  +studyScheduleData: StudyScheduleFormData;
-	  +id: String
+	  +formViewModel: StudyScheduleControls
 	  |
-	  +Study apply();
-	  +InterventionsFormData copy()
+	  -FormTableRow _renderCustomSequence();
+	  +Widget build()
 	]
 	
-	[InterventionsFormData]o-[StudyScheduleFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
+	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
 	
 	[InterventionTaskFormData
 	  |
@@ -2570,45 +2510,7 @@
 	
 	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
 	
-	[InterventionFormView
-	  |
-	  +formViewModel: InterventionFormViewModel
-	]
-	
-	[InterventionFormView]o-[InterventionFormViewModel]
-	
-	[InterventionTaskFormViewModel
-	  |
-	  +taskIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +taskTitleControl: FormControl&lt;String&gt;;
-	  +taskDescriptionControl: FormControl&lt;String&gt;;
-	  +markAsCompletedControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +taskId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +InterventionTaskFormData buildFormData();
-	  +InterventionTaskFormViewModel createDuplicate()
-	]
-	
-	[InterventionTaskFormViewModel]o-[FormControl]
-	[InterventionTaskFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
-	
-	[StudyDesignInterventionsFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
-	
-	[InterventionsFormViewModel
+	[InterventionsFormViewModel
 	  |
 	  +study: Study;
 	  +router: GoRouter;
@@ -2645,21 +2547,29 @@
 	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
 	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
 	
-	[InterventionFormData
+	[InterventionTaskFormViewModel
 	  |
-	  +interventionId: String;
-	  +title: String;
-	  +description: String?;
-	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
-	  +iconName: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
+	  +taskIdControl: FormControl&lt;String&gt;;
+	  +instanceIdControl: FormControl&lt;String&gt;;
+	  +taskTitleControl: FormControl&lt;String&gt;;
+	  +taskDescriptionControl: FormControl&lt;String&gt;;
+	  +markAsCompletedControl: FormControl&lt;bool&gt;;
+	  +form: FormGroup;
+	  +taskId: String;
+	  +instanceId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +Intervention toIntervention();
-	  +InterventionFormData copy()
+	  +void setControlsFrom();
+	  +InterventionTaskFormData buildFormData();
+	  +InterventionTaskFormViewModel createDuplicate()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
+	[InterventionTaskFormViewModel]o-[FormControl]
+	[InterventionTaskFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
+	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
 	
 	[&lt;abstract&gt;StudyScheduleControls
 	  |
@@ -2691,359 +2601,370 @@
 	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
 	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
 	
-	[EnrollmentFormData
+	[InterventionFormData
 	  |
-	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
-	  +enrollmentType: Participation;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
+	  +interventionId: String;
+	  +title: String;
+	  +description: String?;
+	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
+	  +iconName: String?;
+	  &lt;static&gt;+kDefaultTitle: String;
 	  +id: String
 	  |
-	  +Study apply();
-	  +EnrollmentFormData copy()
+	  +Intervention toIntervention();
+	  +InterventionFormData copy()
 	]
 	
-	[EnrollmentFormData]o-[Participation]
-	[EnrollmentFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
+	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
 	
-	[ConsentItemFormViewModel
+	[StudyScheduleFormData
 	  |
-	  +consentIdControl: FormControl&lt;String&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +form: FormGroup;
-	  +consentId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +sequenceType: PhaseSequence;
+	  +sequenceTypeCustom: String;
+	  +numCycles: int;
+	  +phaseDuration: int;
+	  +includeBaseline: bool;
+	  +id: String
 	  |
-	  +void setControlsFrom();
-	  +ConsentItemFormData buildFormData();
-	  +ConsentItemFormViewModel createDuplicate()
+	  +StudySchedule toStudySchedule();
+	  +Study apply();
+	  +StudyScheduleFormData copy()
 	]
 	
-	[ConsentItemFormViewModel]o-[FormControl]
-	[ConsentItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
+	[StudyScheduleFormData]o-[PhaseSequence]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
 	
-	[ConsentItemFormView
+	[InterventionTaskFormView
 	  |
-	  +formViewModel: ConsentItemFormViewModel
+	  +formViewModel: InterventionTaskFormViewModel
 	]
 	
-	[ConsentItemFormView]o-[ConsentItemFormViewModel]
-	
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
-	  |
-	  +isDirtyOptionsBannerVisible: bool
-	]
+	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
 	
-	[ScreenerQuestionLogicFormView
+	[InterventionsFormData
 	  |
-	  +formViewModel: ScreenerQuestionFormViewModel
+	  +interventionsData: List&lt;InterventionFormData&gt;;
+	  +studyScheduleData: StudyScheduleFormData;
+	  +id: String
 	  |
-	  +Widget build();
-	  -dynamic _buildInfoBanner();
-	  -dynamic _buildAnswerOptionsLogicControls();
-	  -List&lt;Widget&gt; _buildOptionLogicRow()
+	  +Study apply();
+	  +InterventionsFormData copy()
 	]
 	
-	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
+	[InterventionsFormData]o-[StudyScheduleFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
 	
-	[ScreenerQuestionFormViewModel
+	[InterventionFormViewModel
 	  |
-	  &lt;static&gt;+defaultResponseOptionValidity: bool;
-	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
-	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
-	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
-	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionValues: List&lt;dynamic&gt;;
-	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isDirtyOptionsBannerVisible: bool
+	  +study: Study;
+	  +interventionIdControl: FormControl&lt;String&gt;;
+	  +interventionTitleControl: FormControl&lt;String&gt;;
+	  +interventionIconControl: FormControl&lt;IconOption&gt;;
+	  +interventionDescriptionControl: FormControl&lt;String&gt;;
+	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
+	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
+	  +form: FormGroup;
+	  +interventionId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +atLeastOneTask: dynamic;
+	  +breadcrumbsTitle: String;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +dynamic onResponseOptionsChanged();
 	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
-	  +ScreenerQuestionFormViewModel createDuplicate()
+	  +InterventionFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +InterventionTaskFormViewModel provide();
+	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
+	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
+	  +InterventionFormViewModel createDuplicate()
 	]
 	
-	[ScreenerQuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
+	[InterventionFormViewModel]o-[Study]
+	[InterventionFormViewModel]o-[FormControl]
+	[InterventionFormViewModel]o-[FormArray]
+	[InterventionFormViewModel]o-[FormViewModelCollection]
+	[InterventionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
 	
-	[StudyDesignEnrollmentFormView
+	[StudyDesignReportsFormView
 	  |
 	  +Widget build();
-	  -dynamic _showScreenerQuestionSidesheetWithArgs();
-	  -dynamic _showConsentItemSidesheetWithArgs()
+	  -dynamic _showReportItemSidesheetWithArgs()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
 	
-	[ConsentItemFormData
+	[ReportItemFormData
 	  |
-	  +consentId: String;
-	  +title: String;
-	  +description: String;
-	  +iconName: String?;
+	  +isPrimary: bool;
+	  +section: ReportSection;
 	  +id: String
 	  |
-	  +ConsentItem toConsentItem();
-	  +ConsentItemFormData copy()
+	  &lt;static&gt;+dynamic fromDomainModel();
+	  +ReportItemFormData copy()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
+	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
+	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
 	
-	[EnrollmentFormViewModel
+	[DataReferenceEditor
 	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
-	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
-	  +consentItemArray: FormArray&lt;dynamic&gt;;
-	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +form: FormGroup;
-	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
-	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestScreener: bool;
-	  +canTestConsent: bool;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
+	  +availableTasks: List&lt;Task&gt;;
+	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
 	  |
-	  +void setControlsFrom();
-	  +EnrollmentFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
-	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
-	  +dynamic testScreener();
-	  +dynamic testConsent();
-	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
-	]
+	  +FormTableRow buildFormTableRow();
+	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
+	]
 	
-	[EnrollmentFormViewModel]o-[Study]
-	[EnrollmentFormViewModel]o-[GoRouter]
-	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
-	[EnrollmentFormViewModel]o-[FormControl]
-	[EnrollmentFormViewModel]o-[FormArray]
-	[EnrollmentFormViewModel]o-[FormViewModelCollection]
-	[EnrollmentFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
+	[DataReferenceEditor]o-[FormControl]
+	[DataReferenceEditor]o-[ReactiveDropdownField]
 	
-	[EnrollmentFormConsentItemDelegate
+	[TemporalAggregationFormatted
 	  |
-	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +owner: EnrollmentFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
+	  -_value: TemporalAggregation;
+	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
+	  +value: TemporalAggregation;
+	  +string: String;
+	  +icon: IconData?;
+	  +hashCode: int
 	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ConsentItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
+	  +bool ==();
+	  +String toString();
+	  +String toJson();
+	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
 	]
 	
-	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
-	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[TemporalAggregationFormatted]o-[TemporalAggregation]
+	[TemporalAggregationFormatted]o-[IconData]
 	
-	[MeasurementsFormViewModel
+	[ImprovementDirectionFormatted
 	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +measurementsArray: FormArray&lt;dynamic&gt;;
-	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
-	  +form: FormGroup;
-	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +measurementRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
+	  -_value: ImprovementDirection;
+	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
+	  +value: ImprovementDirection;
+	  +string: String;
+	  +icon: IconData?;
+	  +hashCode: int
 	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +MeasurementsFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +MeasurementSurveyFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave()
+	  +bool ==();
+	  +String toString();
+	  +String toJson();
+	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
 	]
 	
-	[MeasurementsFormViewModel]o-[Study]
-	[MeasurementsFormViewModel]o-[GoRouter]
-	[MeasurementsFormViewModel]o-[FormArray]
-	[MeasurementsFormViewModel]o-[FormViewModelCollection]
-	[MeasurementsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
+	[ImprovementDirectionFormatted]o-[ImprovementDirection]
+	[ImprovementDirectionFormatted]o-[IconData]
 	
-	[MeasurementSurveyFormData
-	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
+	[ReportSectionType
 	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
+	  &lt;static&gt;+average: ReportSectionType;
+	  &lt;static&gt;+linearRegression: ReportSectionType
 	]
 	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
+	[ReportSectionType]o-[ReportSectionType]
+	[Enum]&lt;:--[ReportSectionType]
 	
-	[SurveyPreview
+	[AverageSectionFormView
 	  |
-	  +routeArgs: MeasurementFormRouteArgs
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
 	  |
 	  +Widget build()
 	]
 	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
+	[AverageSectionFormView]o-[ReportItemFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
 	
-	[MeasurementSurveyFormViewModel
-	  |
-	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
+	[DataReferenceIdentifier
 	  |
-	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
-	]
-	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
-	
-	[MeasurementSurveyFormView
+	  +hashCode: int
 	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
+	  +bool ==()
 	]
 	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
+	[DataReference]&lt;:-[DataReferenceIdentifier]
 	
-	[MeasurementsFormData
-	  |
-	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
-	  +id: String
+	[LinearRegressionSectionFormView
 	  |
-	  +Study apply();
-	  +MeasurementsFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
-	
-	[StudyDesignMeasurementsFormView
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
+	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget
+	[ReportItemFormViewModel
 	  |
-	  +Widget? banner()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
-	
-	[StudyDesignInfoFormView
+	  &lt;static&gt;+defaultSectionType: ReportSectionType;
+	  +sectionIdControl: FormControl&lt;String&gt;;
+	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +sectionControl: FormControl&lt;ReportSection&gt;;
+	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
+	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
+	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
+	  +alphaControl: FormControl&lt;double&gt;;
+	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +form: FormGroup;
+	  +sectionId: String;
+	  +sectionType: ReportSectionType;
+	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
+	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
+	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +dataReferenceRequired: dynamic;
+	  +aggregationRequired: dynamic;
+	  +improvementDirectionRequired: dynamic;
+	  +alphaConfidenceRequired: dynamic
 	  |
-	  +Widget build()
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +ReportItemFormData buildFormData();
+	  +ReportItemFormViewModel createDuplicate();
+	  +dynamic onSectionTypeChanged();
+	  -void _updateFormControls();
+	  +void setControlsFrom()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
+	[ReportItemFormViewModel]o-[ReportSectionType]
+	[ReportItemFormViewModel]o-[FormControl]
+	[ReportItemFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
 	
-	[StudyInfoFormData
+	[ReportItemFormView
 	  |
-	  +title: String;
-	  +description: String?;
-	  +iconName: String;
-	  +contactInfoFormData: StudyContactInfoFormData;
-	  +id: String
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: dynamic;
+	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
 	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
+	  +Widget build();
+	  -dynamic _buildSectionText();
+	  -dynamic _buildSectionTypeHeader()
 	]
 	
-	[StudyInfoFormData]o-[StudyContactInfoFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
+	[ReportItemFormView]o-[ReportItemFormViewModel]
+	[ReportItemFormView]o-[Widget Function(BuildContext)]
 	
-	[StudyContactInfoFormData
+	[ReportsFormViewModel
 	  |
-	  +organization: String?;
-	  +institutionalReviewBoard: String?;
-	  +institutionalReviewBoardNumber: String?;
-	  +researchers: String?;
-	  +email: String?;
-	  +website: String?;
-	  +phone: String?;
-	  +additionalInfo: String?;
+	  +study: Study;
+	  +router: GoRouter;
+	  +reportItemDelegate: ReportFormItemDelegate;
+	  +reportItemArray: FormArray&lt;dynamic&gt;;
+	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
+	  +form: FormGroup;
+	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestConsent: bool
+	  |
+	  +void setControlsFrom();
+	  +ReportsFormData buildFormData();
+	  +void read();
+	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
+	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
+	  +dynamic testReport();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +ReportItemFormViewModel provide()
+	]
+	
+	[ReportsFormViewModel]o-[Study]
+	[ReportsFormViewModel]o-[GoRouter]
+	[ReportsFormViewModel]o-[ReportFormItemDelegate]
+	[ReportsFormViewModel]o-[FormArray]
+	[ReportsFormViewModel]o-[FormViewModelCollection]
+	[ReportsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
+	
+	[ReportFormItemDelegate
+	  |
+	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
+	  +owner: ReportsFormViewModel;
+	  +propagateOnSave: bool;
+	  +validationSet: dynamic
+	  |
+	  +void onCancel();
+	  +dynamic onSave();
+	  +ReportItemFormViewModel provide();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem()
+	]
+	
+	[ReportFormItemDelegate]o-[FormViewModelCollection]
+	[ReportFormItemDelegate]o-[ReportsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
+	
+	[ReportBadge
+	  |
+	  +status: ReportStatus?;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +showTooltip: bool
+	  |
+	  +Widget build()
+	]
+	
+	[ReportBadge]o-[ReportStatus]
+	[ReportBadge]o-[BadgeType]
+	
+	[ReportsFormData
+	  |
+	  +reportItems: List&lt;ReportItemFormData&gt;;
 	  +id: String
 	  |
 	  +Study apply();
-	  +StudyInfoFormData copy()
+	  +ReportsFormData copy()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
+	
+	[ReportStatus
+	  |
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
+	  &lt;static&gt;+primary: ReportStatus;
+	  &lt;static&gt;+secondary: ReportStatus
+	]
+	
+	[ReportStatus]o-[ReportStatus]
+	[Enum]&lt;:--[ReportStatus]
+	
+	[&lt;abstract&gt;IStudyFormData
+	  |
+	  +Study apply()
+	]
+	
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
 	
 	[StudyInfoFormViewModel
 	  |
@@ -3083,611 +3004,898 @@
 	[StudyInfoFormViewModel]o-[FormGroup]
 	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
 	
-	[StudyFormViewModel
-	  |
-	  +studyDirtyCopy: Study?;
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +router: GoRouter;
-	  +studyInfoFormViewModel: StudyInfoFormViewModel;
-	  +enrollmentFormViewModel: EnrollmentFormViewModel;
-	  +measurementsFormViewModel: MeasurementsFormViewModel;
-	  +reportsFormViewModel: ReportsFormViewModel;
-	  +interventionsFormViewModel: InterventionsFormViewModel;
-	  +form: FormGroup;
-	  +isStudyReadonly: bool;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;
+	[StudyDesignInfoFormView
 	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +void dispose();
-	  +void onCancel();
-	  +dynamic onSave();
-	  -dynamic _applyAndSaveSubform()
+	  +Widget build()
 	]
 	
-	[StudyFormViewModel]o-[Study]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyFormViewModel]o-[GoRouter]
-	[StudyFormViewModel]o-[StudyInfoFormViewModel]
-	[StudyFormViewModel]o-[EnrollmentFormViewModel]
-	[StudyFormViewModel]o-[MeasurementsFormViewModel]
-	[StudyFormViewModel]o-[ReportsFormViewModel]
-	[StudyFormViewModel]o-[InterventionsFormViewModel]
-	[StudyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
 	
-	[&lt;abstract&gt;IStudyFormData
+	[StudyInfoFormData
 	  |
-	  +Study apply()
+	  +title: String;
+	  +description: String?;
+	  +iconName: String;
+	  +contactInfoFormData: StudyContactInfoFormData;
+	  +id: String
+	  |
+	  +Study apply();
+	  +StudyInfoFormData copy()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
+	[StudyInfoFormData]o-[StudyContactInfoFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
 	
-	[ReportsFormData
+	[StudyContactInfoFormData
 	  |
-	  +reportItems: List&lt;ReportItemFormData&gt;;
+	  +organization: String?;
+	  +institutionalReviewBoard: String?;
+	  +institutionalReviewBoardNumber: String?;
+	  +researchers: String?;
+	  +email: String?;
+	  +website: String?;
+	  +phone: String?;
+	  +additionalInfo: String?;
 	  +id: String
 	  |
 	  +Study apply();
-	  +ReportsFormData copy()
+	  +StudyInfoFormData copy()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
 	
-	[ReportStatus
+	[StudyFormValidationSet
 	  |
 	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
-	  &lt;static&gt;+primary: ReportStatus;
-	  &lt;static&gt;+secondary: ReportStatus
+	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
 	]
 	
-	[ReportStatus]o-[ReportStatus]
-	[Enum]&lt;:--[ReportStatus]
+	[Enum]&lt;:--[StudyFormValidationSet]
 	
-	[ReportItemFormData
+	[MeasurementsFormData
 	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
+	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
 	  +id: String
 	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
+	  +Study apply();
+	  +MeasurementsFormData copy()
 	]
 	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
 	
-	[ReportItemFormViewModel
-	  |
-	  &lt;static&gt;+defaultSectionType: ReportSectionType;
-	  +sectionIdControl: FormControl&lt;String&gt;;
-	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +sectionControl: FormControl&lt;ReportSection&gt;;
-	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
-	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
-	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
-	  +alphaControl: FormControl&lt;double&gt;;
-	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +form: FormGroup;
-	  +sectionId: String;
-	  +sectionType: ReportSectionType;
-	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
-	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
-	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +dataReferenceRequired: dynamic;
-	  +aggregationRequired: dynamic;
-	  +improvementDirectionRequired: dynamic;
-	  +alphaConfidenceRequired: dynamic
+	[MeasurementSurveyFormView
 	  |
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +ReportItemFormData buildFormData();
-	  +ReportItemFormViewModel createDuplicate();
-	  +dynamic onSectionTypeChanged();
-	  -void _updateFormControls();
-	  +void setControlsFrom()
+	  +formViewModel: MeasurementSurveyFormViewModel
 	]
 	
-	[ReportItemFormViewModel]o-[ReportSectionType]
-	[ReportItemFormViewModel]o-[FormControl]
-	[ReportItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
+	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
 	
-	[LinearRegressionSectionFormView
+	[SurveyPreview
 	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
+	  +routeArgs: MeasurementFormRouteArgs
 	  |
 	  +Widget build()
 	]
 	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
+	[SurveyPreview]o-[MeasurementFormRouteArgs]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
 	
-	[AverageSectionFormView
+	[MeasurementSurveyFormData
 	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
+	  +measurementId: String;
+	  +title: String;
+	  +introText: String?;
+	  +outroText: String?;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  &lt;static&gt;+kDefaultTitle: String;
+	  +id: String
 	  |
-	  +Widget build()
+	  +QuestionnaireTask toQuestionnaireTask();
+	  +MeasurementSurveyFormData copy()
 	]
 	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
+	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
 	
-	[TemporalAggregationFormatted
+	[MeasurementSurveyFormViewModel
 	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
-	]
-	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
-	
-	[ImprovementDirectionFormatted
-	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
+	  +study: Study;
+	  +measurementIdControl: FormControl&lt;String&gt;;
+	  +instanceIdControl: FormControl&lt;String&gt;;
+	  +surveyTitleControl: FormControl&lt;String&gt;;
+	  +surveyIntroTextControl: FormControl&lt;String&gt;;
+	  +surveyOutroTextControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +measurementId: String;
+	  +instanceId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +atLeastOneQuestion: dynamic;
+	  +breadcrumbsTitle: String;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
+	  +void setControlsFrom();
+	  +MeasurementSurveyFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
+	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
+	  +MeasurementSurveyFormViewModel createDuplicate()
 	]
 	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
+	[MeasurementSurveyFormViewModel]o-[Study]
+	[MeasurementSurveyFormViewModel]o-[FormControl]
+	[MeasurementSurveyFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
 	
-	[ReportSectionType
+	[StudyDesignMeasurementsFormView
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
+	  +Widget build()
 	]
 	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
 	
-	[DataReferenceEditor
+	[MeasurementsFormViewModel
 	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
+	  +study: Study;
+	  +router: GoRouter;
+	  +measurementsArray: FormArray&lt;dynamic&gt;;
+	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
+	  +form: FormGroup;
+	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +measurementRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
+	  +void read();
+	  +void setControlsFrom();
+	  +MeasurementsFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +MeasurementSurveyFormViewModel provide();
+	  +void onCancel();
+	  +dynamic onSave()
 	]
 	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
+	[MeasurementsFormViewModel]o-[Study]
+	[MeasurementsFormViewModel]o-[GoRouter]
+	[MeasurementsFormViewModel]o-[FormArray]
+	[MeasurementsFormViewModel]o-[FormViewModelCollection]
+	[MeasurementsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
 	
-	[DataReferenceIdentifier
+	[StudyFormScaffold
 	  |
-	  +hashCode: int
+	  +studyId: String;
+	  +formViewModelBuilder: T Function(WidgetRef);
+	  +formViewBuilder: Widget Function(T)
 	  |
-	  +bool ==()
+	  +Widget build()
 	]
 	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
+	[StudyFormScaffold]o-[T Function(WidgetRef)]
+	[StudyFormScaffold]o-[Widget Function(T)]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
 	
-	[ReportItemFormView
+	[ConsentItemFormViewModel
 	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
+	  +consentIdControl: FormControl&lt;String&gt;;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +iconControl: FormControl&lt;IconOption&gt;;
+	  +form: FormGroup;
+	  +consentId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
+	  +void setControlsFrom();
+	  +ConsentItemFormData buildFormData();
+	  +ConsentItemFormViewModel createDuplicate()
 	]
 	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
+	[ConsentItemFormViewModel]o-[FormControl]
+	[ConsentItemFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
 	
-	[StudyDesignReportsFormView
+	[StudyDesignEnrollmentFormView
 	  |
 	  +Widget build();
-	  -dynamic _showReportItemSidesheetWithArgs()
+	  -dynamic _showScreenerQuestionSidesheetWithArgs();
+	  -dynamic _showConsentItemSidesheetWithArgs()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
 	
-	[ReportsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +reportItemDelegate: ReportFormItemDelegate;
-	  +reportItemArray: FormArray&lt;dynamic&gt;;
-	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +form: FormGroup;
-	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestConsent: bool
+	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
 	  |
-	  +void setControlsFrom();
-	  +ReportsFormData buildFormData();
-	  +void read();
-	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
-	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
-	  +dynamic testReport();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide()
+	  +isDirtyOptionsBannerVisible: bool
 	]
 	
-	[ReportsFormViewModel]o-[Study]
-	[ReportsFormViewModel]o-[GoRouter]
-	[ReportsFormViewModel]o-[ReportFormItemDelegate]
-	[ReportsFormViewModel]o-[FormArray]
-	[ReportsFormViewModel]o-[FormViewModelCollection]
-	[ReportsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
-	
-	[ReportFormItemDelegate
+	[ScreenerQuestionLogicFormView
 	  |
-	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +owner: ReportsFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
+	  +formViewModel: ScreenerQuestionFormViewModel
 	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
+	  +Widget build();
+	  -dynamic _buildInfoBanner();
+	  -dynamic _buildAnswerOptionsLogicControls();
+	  -List&lt;Widget&gt; _buildOptionLogicRow()
 	]
 	
-	[ReportFormItemDelegate]o-[FormViewModelCollection]
-	[ReportFormItemDelegate]o-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
+	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
 	
-	[ReportBadge
+	[ConsentItemFormData
 	  |
-	  +status: ReportStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
+	  +consentId: String;
+	  +title: String;
+	  +description: String;
+	  +iconName: String?;
+	  +id: String
 	  |
-	  +Widget build()
+	  +ConsentItem toConsentItem();
+	  +ConsentItemFormData copy()
 	]
 	
-	[ReportBadge]o-[ReportStatus]
-	[ReportBadge]o-[BadgeType]
+	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
 	
-	[AccountSettingsDialog
+	[ConsentItemFormView
 	  |
-	  +Widget build()
+	  +formViewModel: ConsentItemFormViewModel
 	]
 	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AccountSettingsDialog]
-	
-	[&lt;abstract&gt;IAppRepository
-	  |
-	  +dynamic fetchAppConfig();
-	  +void dispose()
-	]
+	[ConsentItemFormView]o-[ConsentItemFormViewModel]
 	
-	[AppRepository
+	[EnrollmentFormData
 	  |
-	  +apiClient: StudyUApi
+	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
+	  +enrollmentType: Participation;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
+	  +id: String
 	  |
-	  +dynamic fetchAppConfig();
-	  +void dispose()
+	  +Study apply();
+	  +EnrollmentFormData copy()
 	]
 	
-	[AppRepository]o-[&lt;abstract&gt;StudyUApi]
-	[&lt;abstract&gt;IAppRepository]&lt;:--[AppRepository]
+	[EnrollmentFormData]o-[Participation]
+	[EnrollmentFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
 	
-	[&lt;abstract&gt;IAuthRepository
+	[ScreenerQuestionFormViewModel
 	  |
-	  +allowPasswordReset: bool;
-	  +currentUser: User?;
-	  +isLoggedIn: bool;
-	  +session: Session?;
-	  +serializedSession: String?
+	  &lt;static&gt;+defaultResponseOptionValidity: bool;
+	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
+	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
+	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
+	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +prevResponseOptionValues: List&lt;dynamic&gt;;
+	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isDirtyOptionsBannerVisible: bool
 	  |
-	  +dynamic signUp();
-	  +dynamic signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic updateUser();
-	  +void dispose()
+	  +dynamic onResponseOptionsChanged();
+	  +void setControlsFrom();
+	  +QuestionFormData buildFormData();
+	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
+	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
+	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
+	  +ScreenerQuestionFormViewModel createDuplicate()
 	]
 	
-	[&lt;abstract&gt;IAuthRepository]o-[User]
-	[&lt;abstract&gt;IAuthRepository]o-[Session]
-	[&lt;abstract&gt;IAppDelegate]&lt;:-[&lt;abstract&gt;IAuthRepository]
+	[ScreenerQuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
+	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
 	
-	[AuthRepository
+	[EnrollmentFormViewModel
 	  |
-	  +supabaseClient: SupabaseClient;
-	  +sharedPreferences: SharedPreferences;
-	  +allowPasswordReset: bool;
-	  +authClient: GoTrueClient;
-	  +session: Session?;
-	  +serializedSession: String?;
-	  +currentUser: User?;
-	  +isLoggedIn: bool
+	  +study: Study;
+	  +router: GoRouter;
+	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
+	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
+	  +consentItemArray: FormArray&lt;dynamic&gt;;
+	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
+	  +form: FormGroup;
+	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
+	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestScreener: bool;
+	  +canTestConsent: bool;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
 	  |
-	  -void _registerAuthListener();
-	  +dynamic signUp();
-	  +dynamic signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic updateUser();
+	  +void setControlsFrom();
+	  +EnrollmentFormData buildFormData();
+	  +void read();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
+	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
+	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
+	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
+	  +dynamic testScreener();
+	  +dynamic testConsent();
+	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
+	]
+	
+	[EnrollmentFormViewModel]o-[Study]
+	[EnrollmentFormViewModel]o-[GoRouter]
+	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
+	[EnrollmentFormViewModel]o-[FormControl]
+	[EnrollmentFormViewModel]o-[FormArray]
+	[EnrollmentFormViewModel]o-[FormViewModelCollection]
+	[EnrollmentFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
+	
+	[EnrollmentFormConsentItemDelegate
+	  |
+	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
+	  +owner: EnrollmentFormViewModel;
+	  +propagateOnSave: bool;
+	  +validationSet: dynamic
+	  |
+	  +void onCancel();
+	  +dynamic onSave();
+	  +ConsentItemFormViewModel provide();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem()
+	]
+	
+	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
+	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
+	
+	[StudyFormViewModel
+	  |
+	  +studyDirtyCopy: Study?;
+	  +studyRepository: IStudyRepository;
+	  +authRepository: IAuthRepository;
+	  +router: GoRouter;
+	  +studyInfoFormViewModel: StudyInfoFormViewModel;
+	  +enrollmentFormViewModel: EnrollmentFormViewModel;
+	  +measurementsFormViewModel: MeasurementsFormViewModel;
+	  +reportsFormViewModel: ReportsFormViewModel;
+	  +interventionsFormViewModel: InterventionsFormViewModel;
+	  +form: FormGroup;
+	  +isStudyReadonly: bool;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void read();
+	  +void setControlsFrom();
+	  +Study buildFormData();
 	  +void dispose();
-	  +dynamic onAppStart()
+	  +void onCancel();
+	  +dynamic onSave();
+	  -dynamic _applyAndSaveSubform()
 	]
 	
-	[AuthRepository]o-[SupabaseClient]
-	[AuthRepository]o-[SharedPreferences]
-	[AuthRepository]o-[GoTrueClient]
-	[AuthRepository]o-[Session]
-	[AuthRepository]o-[User]
-	[&lt;abstract&gt;IAuthRepository]&lt;:--[AuthRepository]
+	[StudyFormViewModel]o-[Study]
+	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
+	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyFormViewModel]o-[GoRouter]
+	[StudyFormViewModel]o-[StudyInfoFormViewModel]
+	[StudyFormViewModel]o-[EnrollmentFormViewModel]
+	[StudyFormViewModel]o-[MeasurementsFormViewModel]
+	[StudyFormViewModel]o-[ReportsFormViewModel]
+	[StudyFormViewModel]o-[InterventionsFormViewModel]
+	[StudyFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
 	
-	[StudyLaunched
+	[&lt;abstract&gt;WithQuestionnaireControls
+	  |
+	  +questionsArray: FormArray&lt;dynamic&gt;;
+	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
+	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
+	  +propagateOnSave: bool;
+	  +questionModels: List&lt;Q&gt;;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  |
+	  +void setQuestionnaireControlsFrom();
+	  +QuestionnaireFormData buildQuestionnaireFormData();
+	  +void read();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +Q provide();
+	  +Q provideQuestionFormViewModel()
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[StudyLaunched]
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
 	
-	[&lt;abstract&gt;StudyUApi
+	[QuestionnaireFormData
 	  |
-	  +dynamic saveStudy();
-	  +dynamic fetchStudy();
-	  +dynamic getUserStudies();
-	  +dynamic deleteStudy();
-	  +dynamic saveStudyInvite();
-	  +dynamic fetchStudyInvite();
-	  +dynamic deleteStudyInvite();
-	  +dynamic deleteParticipants();
-	  +dynamic fetchAppConfig();
-	  +dynamic fetchUser();
-	  +dynamic saveUser()
+	  +questionsData: List&lt;QuestionFormData&gt;?;
+	  +id: String
+	  |
+	  +StudyUQuestionnaire toQuestionnaire();
+	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
+	  +QuestionnaireFormData copy()
 	]
 	
-	[APIException
+	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
+	
+	[&lt;abstract&gt;QuestionFormData
+	  |
+	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
+	  +questionId: String;
+	  +questionText: String;
+	  +questionInfoText: String?;
+	  +questionType: SurveyQuestionType;
+	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
+	  +responseOptions: List&lt;dynamic&gt;;
+	  +id: String
+	  |
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +EligibilityCriterion toEligibilityCriterion();
+	  +Answer&lt;dynamic&gt; constructAnswerFor();
+	  +dynamic setResponseOptionsValidityFrom();
+	  +QuestionFormData copy()
 	]
 	
-	[Exception]&lt;:--[APIException]
+	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
 	
-	[StudyNotFoundException
+	[ChoiceQuestionFormData
+	  |
+	  +isMultipleChoice: bool;
+	  +answerOptions: List&lt;String&gt;;
+	  +responseOptions: List&lt;String&gt;
+	  |
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +QuestionFormData copy();
+	  -Choice _buildChoiceForValue();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[APIException]&lt;:-[StudyNotFoundException]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
 	
-	[MeasurementNotFoundException
+	[BoolQuestionFormData
+	  |
+	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
+	  +responseOptions: List&lt;String&gt;
+	  |
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +BoolQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[APIException]&lt;:-[MeasurementNotFoundException]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
 	
-	[QuestionNotFoundException
+	[ScaleQuestionFormData
+	  |
+	  +minValue: double;
+	  +maxValue: double;
+	  +minLabel: String?;
+	  +maxLabel: String?;
+	  +midValues: List&lt;double?&gt;;
+	  +midLabels: List&lt;String?&gt;;
+	  +stepSize: double;
+	  +initialValue: double?;
+	  +minColor: Color?;
+	  +maxColor: Color?;
+	  +responseOptions: List&lt;double&gt;;
+	  +midAnnotations: List&lt;Annotation&gt;
+	  |
+	  +ScaleQuestion toQuestion();
+	  +QuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[APIException]&lt;:-[QuestionNotFoundException]
+	[ScaleQuestionFormData]o-[Color]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
 	
-	[ConsentItemNotFoundException
+	[FreeTextQuestionFormData
+	  |
+	  +textLengthRange: List&lt;int&gt;;
+	  +textType: FreeTextQuestionType;
+	  +textTypeExpression: String?;
+	  +responseOptions: List&lt;String&gt;
+	  |
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +FreeTextQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[APIException]&lt;:-[ConsentItemNotFoundException]
+	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
 	
-	[InterventionNotFoundException
+	[FreeTextQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel;
+	  +generateLabelHelpTextMap: dynamic
+	  |
+	  +Widget build();
+	  +Widget disableOnReadonly();
+	  +Widget generateRow()
 	]
 	
-	[APIException]&lt;:-[InterventionNotFoundException]
+	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
 	
-	[InterventionTaskNotFoundException
+	[SurveyQuestionType
+	  |
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
+	  &lt;static&gt;+choice: SurveyQuestionType;
+	  &lt;static&gt;+bool: SurveyQuestionType;
+	  &lt;static&gt;+scale: SurveyQuestionType;
+	  &lt;static&gt;+freeText: SurveyQuestionType
+	]
+	
+	[SurveyQuestionType]o-[SurveyQuestionType]
+	[Enum]&lt;:--[SurveyQuestionType]
+	
+	[&lt;abstract&gt;IScaleQuestionFormViewModel
+	  |
+	  +isMidValuesClearedInfoVisible: bool
+	]
+	
+	[ScaleQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	]
+	
+	[ScaleQuestionFormView]o-[QuestionFormViewModel]
+	
+	[ChoiceQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
+	
+	[BoolQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[BoolQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
+	
+	[QuestionFormViewModel
+	  |
+	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
+	  -_titles: Map&lt;FormMode, String Function()&gt;?;
+	  +questionIdControl: FormControl&lt;String&gt;;
+	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
+	  +questionTextControl: FormControl&lt;String&gt;;
+	  +questionInfoTextControl: FormControl&lt;String&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
+	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +customOptionsMin: int;
+	  +customOptionsMax: int;
+	  +customOptionsInitial: int;
+	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
+	  &lt;static&gt;+kDefaultScaleMinValue: int;
+	  &lt;static&gt;+kDefaultScaleMaxValue: int;
+	  &lt;static&gt;+kNumMidValueControls: int;
+	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
+	  +scaleMinValueControl: FormControl&lt;int&gt;;
+	  +scaleMaxValueControl: FormControl&lt;int&gt;;
+	  -_scaleRangeControl: FormControl&lt;int&gt;;
+	  +scaleMinLabelControl: FormControl&lt;String&gt;;
+	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
+	  +scaleMidValueControls: FormArray&lt;int&gt;;
+	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
+	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
+	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
+	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
+	  +prevMidValues: List&lt;int?&gt;?;
+	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
+	  +customRegexControl: FormControl&lt;String&gt;;
+	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
+	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
+	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
+	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
+	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
+	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
+	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +form: FormGroup;
+	  +questionId: String;
+	  +questionType: SurveyQuestionType;
+	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
+	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
+	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +validAnswerOptions: List&lt;String&gt;;
+	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +scaleMinValue: int;
+	  +scaleMaxValue: int;
+	  +scaleRange: int;
+	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +questionTextRequired: dynamic;
+	  +numValidChoiceOptions: dynamic;
+	  +scaleRangeValid: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +isAddOptionButtonVisible: bool;
+	  +isMidValuesClearedInfoVisible: bool
+	  |
+	  +String? scaleMidLabelAt();
+	  -dynamic _onScaleRangeChanged();
+	  -dynamic _applyInputFormatters();
+	  -dynamic _updateScaleMidValueControls();
+	  -Map&lt;String, dynamic&gt;? _validateFreeText();
+	  -dynamic _onFreeTextLengthChanged();
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +dynamic onQuestionTypeChanged();
+	  +dynamic onResponseOptionsChanged();
+	  -void _updateFormControls();
+	  +void initControls();
+	  +void setControlsFrom();
+	  +QuestionFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem();
+	  +dynamic save();
+	  +QuestionFormViewModel createDuplicate()
+	]
+	
+	[QuestionFormViewModel]o-[SurveyQuestionType]
+	[QuestionFormViewModel]o-[FormControl]
+	[QuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
+	[QuestionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
+	
+	[SurveyQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel;
+	  +isHtmlStyleable: bool
+	]
+	
+	[SurveyQuestionFormView]o-[QuestionFormViewModel]
+	
+	[&lt;abstract&gt;IFormDataWithSchedule
+	  |
+	  +instanceId: String;
+	  +isTimeLocked: bool;
+	  +timeLockStart: StudyUTimeOfDay?;
+	  +timeLockEnd: StudyUTimeOfDay?;
+	  +hasReminder: bool;
+	  +reminderTime: StudyUTimeOfDay?
+	  |
+	  +Schedule toSchedule()
 	]
 	
-	[APIException]&lt;:-[InterventionTaskNotFoundException]
+	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
 	
-	[ReportNotFoundException
+	[ScheduleControls
+	  |
+	  +formViewModel: WithScheduleControls
+	  |
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
 	]
 	
-	[APIException]&lt;:-[ReportNotFoundException]
+	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
 	
-	[ReportSectionNotFoundException
+	[&lt;abstract&gt;WithScheduleControls
+	  |
+	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
+	  +instanceID: FormControl&lt;String&gt;;
+	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
+	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
+	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
+	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
+	  +hasReminderControl: FormControl&lt;bool&gt;;
+	  +reminderTimeControl: FormControl&lt;Time&gt;;
+	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
+	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
+	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
+	  +hasReminder: bool;
+	  +isTimeRestricted: bool;
+	  +timeRestriction: List&lt;Time&gt;?
+	  |
+	  +void setScheduleControlsFrom();
+	  -dynamic _initReminderControl()
 	]
 	
-	[APIException]&lt;:-[ReportSectionNotFoundException]
+	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
+	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
 	
-	[StudyInviteNotFoundException
+	[&lt;abstract&gt;StudyDesignPageWidget
+	  |
+	  +Widget? banner()
 	]
 	
-	[APIException]&lt;:-[StudyInviteNotFoundException]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
 	
-	[UserNotFoundException
+	[StudiesTableColumnHeader
+	  |
+	  +title: String;
+	  +sortable: bool;
+	  +sortAscending: bool;
+	  +sortingActive: bool;
+	  +onSort: void Function()?
 	]
 	
-	[APIException]&lt;:-[UserNotFoundException]
+	[StudiesTableColumnHeader]o-[void Function()?]
 	
-	[StudyUApiClient
-	  |
-	  +supabaseClient: SupabaseClient;
-	  &lt;static&gt;+studyColumns: List&lt;String&gt;;
-	  &lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;;
-	  +testDelayMilliseconds: int
+	[DashboardScreen
 	  |
-	  +dynamic deleteParticipants();
-	  +dynamic getUserStudies();
-	  +dynamic fetchStudy();
-	  +dynamic deleteStudy();
-	  +dynamic saveStudy();
-	  +dynamic fetchStudyInvite();
-	  +dynamic saveStudyInvite();
-	  +dynamic deleteStudyInvite();
-	  +dynamic fetchAppConfig();
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  -dynamic _awaitGuarded();
-	  -dynamic _apiException();
-	  -dynamic _testDelay()
+	  +filter: StudiesFilter?
 	]
 	
-	[StudyUApiClient]o-[SupabaseClient]
-	[&lt;abstract&gt;SupabaseClientDependant]&lt;:-[StudyUApiClient]
-	[&lt;abstract&gt;SupabaseQueryMixin]&lt;:-[StudyUApiClient]
-	[&lt;abstract&gt;StudyUApi]&lt;:--[StudyUApiClient]
+	[DashboardScreen]o-[StudiesFilter]
 	
-	[WrappedModel
+	[DashboardScaffold
 	  |
-	  -_model: T;
-	  +asyncValue: AsyncValue&lt;T&gt;;
-	  +isLocalOnly: bool;
-	  +isDirty: bool;
-	  +isDeleted: bool;
-	  +lastSaved: DateTime?;
-	  +lastFetched: DateTime?;
-	  +lastUpdated: DateTime?;
-	  +model: T
+	  &lt;static&gt;+compactWidthThreshold: double;
+	  +body: Widget
 	  |
-	  +dynamic markWithError();
-	  +dynamic markAsLoading();
-	  +dynamic markAsFetched();
-	  +dynamic markAsSaved()
-	]
-	
-	[WrappedModel]o-[&lt;abstract&gt;AsyncValue]
-	
-	[ModelRepositoryException
+	  +Widget build()
 	]
 	
-	[Exception]&lt;:--[ModelRepositoryException]
+	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
 	
-	[ModelNotFoundException
+	[DashboardController
+	  |
+	  +studyRepository: IStudyRepository;
+	  +authRepository: IAuthRepository;
+	  +userRepository: IUserRepository;
+	  +router: GoRouter;
+	  -_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?;
+	  +searchController: SearchController;
+	  +isSortAscending: bool
+	  |
+	  -dynamic _subscribeStudies();
+	  +dynamic setSearchText();
+	  +dynamic setStudiesFilter();
+	  +dynamic onSelectStudy();
+	  +dynamic onClickNewStudy();
+	  +dynamic pinStudy();
+	  +dynamic pinOffStudy();
+	  +void setSorting();
+	  +void filterStudies();
+	  +void sortStudies();
+	  +bool isSortingActiveForColumn();
+	  +bool isPinned();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void dispose()
 	]
 	
-	[ModelRepositoryException]&lt;:--[ModelNotFoundException]
+	[DashboardController]o-[&lt;abstract&gt;IStudyRepository]
+	[DashboardController]o-[&lt;abstract&gt;IAuthRepository]
+	[DashboardController]o-[&lt;abstract&gt;IUserRepository]
+	[DashboardController]o-[GoRouter]
+	[DashboardController]o-[StreamSubscription]
+	[DashboardController]o-[SearchController]
+	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
 	
-	[&lt;abstract&gt;IModelRepository
+	[StudiesFilter
 	  |
-	  +String getKey();
-	  +WrappedModel&lt;T&gt;? get();
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic duplicateAndSave();
-	  +dynamic duplicateAndSaveFromRemote();
-	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
-	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
-	  +dynamic ensurePersisted();
-	  +void dispose()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
 	]
 	
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[&lt;abstract&gt;IModelRepository]
+	[Enum]&lt;:--[StudiesFilter]
 	
-	[&lt;abstract&gt;IModelRepositoryDelegate
+	[StudiesTableColumnSize
 	  |
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +T createNewInstance();
-	  +T createDuplicate();
-	  +dynamic onError()
+	  +collapsed: bool;
+	  +flex: int?;
+	  +width: double?
+	  |
+	  +Widget createContainer()
 	]
 	
-	[&lt;abstract&gt;ModelRepository
+	[StudiesTable
 	  |
-	  +delegate: IModelRepositoryDelegate&lt;T&gt;;
-	  -_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;;
-	  -_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;;
-	  +modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;;
-	  +modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;;
-	  -_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;
+	  +itemHeight: double;
+	  +itemPadding: double;
+	  +rowSpacing: double;
+	  +columnSpacing: double;
+	  +compactWidthThreshold: double;
+	  +superCompactWidthThreshold: double;
+	  +compactStatTitleThreshold: double;
+	  +studies: List&lt;Study&gt;;
+	  +onSelect: void Function(Study);
+	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study);
+	  +emptyWidget: Widget;
+	  +pinnedStudies: Iterable&lt;String&gt;;
+	  +dashboardController: DashboardController
 	  |
-	  +WrappedModel&lt;T&gt;? get();
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic duplicateAndSave();
-	  +dynamic duplicateAndSaveFromRemote();
-	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
-	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
-	  -dynamic _buildModelSpecificController();
-	  +dynamic ensurePersisted();
-	  +WrappedModel&lt;T&gt; upsertLocally();
-	  +List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally();
-	  +dynamic emitUpdate();
-	  +dynamic emitModelEvent();
-	  +dynamic emitError();
-	  +void dispose();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
+	  +Widget build();
+	  -Widget _buildColumnHeader()
 	]
 	
-	[&lt;abstract&gt;ModelRepository]o-[&lt;abstract&gt;IModelRepositoryDelegate]
-	[&lt;abstract&gt;ModelRepository]o-[BehaviorSubject]
-	[&lt;abstract&gt;IModelRepository]&lt;:-[&lt;abstract&gt;ModelRepository]
+	[StudiesTable]o-[void Function(Study)]
+	[StudiesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)]
+	[StudiesTable]o-[&lt;abstract&gt;Widget]
+	[StudiesTable]o-[DashboardController]
 	
-	[&lt;abstract&gt;SupabaseClientDependant
+	[StudiesTableColumn
 	  |
-	  +supabaseClient: SupabaseClient
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudiesTableColumn&gt;;
+	  &lt;static&gt;+pin: StudiesTableColumn;
+	  &lt;static&gt;+title: StudiesTableColumn;
+	  &lt;static&gt;+status: StudiesTableColumn;
+	  &lt;static&gt;+participation: StudiesTableColumn;
+	  &lt;static&gt;+createdAt: StudiesTableColumn;
+	  &lt;static&gt;+enrolled: StudiesTableColumn;
+	  &lt;static&gt;+active: StudiesTableColumn;
+	  &lt;static&gt;+completed: StudiesTableColumn;
+	  &lt;static&gt;+action: StudiesTableColumn
 	]
 	
-	[&lt;abstract&gt;SupabaseClientDependant]o-[SupabaseClient]
+	[StudiesTableColumn]o-[StudiesTableColumn]
+	[Enum]&lt;:--[StudiesTableColumn]
 	
-	[SupabaseQueryError
+	[StudiesTableItem
 	  |
-	  +statusCode: String?;
-	  +message: String;
-	  +details: dynamic
+	  +study: Study;
+	  +itemHeight: double;
+	  +itemPadding: double;
+	  +rowSpacing: double;
+	  +columnSpacing: double;
+	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
+	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
+	  +isPinned: bool;
+	  +onPinnedChanged: void Function(Study, bool)?;
+	  +onTap: void Function(Study)?
+	]
+	
+	[StudiesTableItem]o-[Study]
+	[StudiesTableItem]o-[void Function(Study, bool)?]
+	[StudiesTableItem]o-[void Function(Study)?]
+	
+	[App
 	]
 	
-	[Exception]&lt;:--[SupabaseQueryError]
+	[AppContent
+	]
 	
-	[&lt;abstract&gt;SupabaseQueryMixin
+	[AccountSettingsDialog
 	  |
-	  +dynamic deleteAll();
-	  +dynamic getAll();
-	  +dynamic getById();
-	  +dynamic getByColumn();
-	  +List&lt;T&gt; deserializeList();
-	  +T deserializeObject()
+	  +Widget build()
 	]
 	
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AccountSettingsDialog]
+	
 	[&lt;abstract&gt;IInviteCodeRepository
 	  |
 	  +dynamic isCodeAlreadyUsed()
@@ -3784,2753 +3992,2630 @@
 	[StudyRepositoryDelegate]o-[&lt;abstract&gt;IAuthRepository]
 	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[StudyRepositoryDelegate]
 	
-	[&lt;abstract&gt;ModelEvent
-	  |
-	  +modelId: String;
-	  +model: T
-	]
-	
-	[IsFetched
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsFetched]
-	
-	[IsSaving
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaving]
-	
-	[IsSaved
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaved]
-	
-	[IsDeleted
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsDeleted]
-	
-	[&lt;abstract&gt;IUserRepository
-	  |
-	  +user: StudyUUser
-	  |
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  +dynamic updatePreferences()
-	]
-	
-	[&lt;abstract&gt;IUserRepository]o-[StudyUUser]
-	
-	[UserRepository
-	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +ref: Ref&lt;Object?&gt;;
-	  +user: StudyUUser
+	[&lt;abstract&gt;StudyUApi
 	  |
+	  +dynamic saveStudy();
+	  +dynamic fetchStudy();
+	  +dynamic getUserStudies();
+	  +dynamic deleteStudy();
+	  +dynamic saveStudyInvite();
+	  +dynamic fetchStudyInvite();
+	  +dynamic deleteStudyInvite();
+	  +dynamic deleteParticipants();
+	  +dynamic fetchAppConfig();
 	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  +dynamic updatePreferences()
-	]
-	
-	[UserRepository]o-[&lt;abstract&gt;StudyUApi]
-	[UserRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[UserRepository]o-[&lt;abstract&gt;Ref]
-	[UserRepository]o-[StudyUUser]
-	[&lt;abstract&gt;IUserRepository]&lt;:--[UserRepository]
-	
-	[PreferenceAction
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;PreferenceAction&gt;;
-	  &lt;static&gt;+pin: PreferenceAction;
-	  &lt;static&gt;+pinOff: PreferenceAction
-	]
-	
-	[PreferenceAction]o-[PreferenceAction]
-	[Enum]&lt;:--[PreferenceAction]
-	
-	[DropdownMenuItemTheme
-	  |
-	  +iconTheme: IconThemeData?
-	]
-	
-	[DropdownMenuItemTheme]o-[IconThemeData]
-	[&lt;abstract&gt;Diagnosticable]&lt;:-[DropdownMenuItemTheme]
-	
-	[ThemeConfig
-	  |
-	  &lt;static&gt;+kMinContentWidth: double;
-	  &lt;static&gt;+kMaxContentWidth: double;
-	  &lt;static&gt;+kHoverFadeFactor: double;
-	  &lt;static&gt;+kMuteFadeFactor: double
-	  |
-	  &lt;static&gt;+dynamic bodyBackgroundColor();
-	  &lt;static&gt;+Color modalBarrierColor();
-	  &lt;static&gt;+Color containerColor();
-	  &lt;static&gt;+Color colorPickerInitialColor();
-	  &lt;static&gt;+TextStyle bodyTextMuted();
-	  &lt;static&gt;+TextStyle bodyTextBackground();
-	  &lt;static&gt;+double iconSplashRadius();
-	  &lt;static&gt;+Color sidesheetBackgroundColor();
-	  &lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme();
-	  &lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()
-	]
-	
-	[NoAnimationPageTransitionsBuilder
-	  |
-	  +Widget buildTransitions()
-	]
-	
-	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[NoAnimationPageTransitionsBuilder]
-	
-	[WebTransitionBuilder
-	  |
-	  +Widget buildTransitions()
-	]
-	
-	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[WebTransitionBuilder]
-	
-	[ThemeSettingChange
-	  |
-	  +settings: ThemeSettings
-	]
-	
-	[ThemeSettingChange]o-[ThemeSettings]
-	[&lt;abstract&gt;Notification]&lt;:-[ThemeSettingChange]
-	
-	[ThemeProvider
-	  |
-	  +settings: ValueNotifier&lt;ThemeSettings&gt;;
-	  +lightDynamic: ColorScheme?;
-	  +darkDynamic: ColorScheme?;
-	  +pageTransitionsTheme: PageTransitionsTheme;
-	  +shapeMedium: ShapeBorder
-	  |
-	  +Color custom();
-	  +Color blend();
-	  +Color source();
-	  +ColorScheme colors();
-	  +CardTheme cardTheme();
-	  +ListTileThemeData listTileTheme();
-	  +AppBarTheme appBarTheme();
-	  +SnackBarThemeData snackBarThemeData();
-	  +TabBarTheme tabBarTheme();
-	  +BottomAppBarTheme bottomAppBarTheme();
-	  +BottomNavigationBarThemeData bottomNavigationBarTheme();
-	  +SwitchThemeData switchTheme();
-	  +InputDecorationTheme inputDecorationTheme();
-	  +TextTheme textTheme();
-	  +DividerThemeData dividerTheme();
-	  +NavigationRailThemeData navigationRailTheme();
-	  +DrawerThemeData drawerTheme();
-	  +IconThemeData iconTheme();
-	  +CheckboxThemeData checkboxTheme();
-	  +RadioThemeData radioTheme();
-	  +TooltipThemeData tooltipTheme();
-	  +ThemeData light();
-	  +ThemeData dark();
-	  +ThemeMode themeMode();
-	  +ThemeData theme();
-	  &lt;static&gt;+ThemeProvider of();
-	  +bool updateShouldNotify()
+	  +dynamic saveUser()
 	]
 	
-	[ThemeProvider]o-[ValueNotifier]
-	[ThemeProvider]o-[ColorScheme]
-	[ThemeProvider]o-[PageTransitionsTheme]
-	[ThemeProvider]o-[&lt;abstract&gt;ShapeBorder]
-	[&lt;abstract&gt;InheritedWidget]&lt;:-[ThemeProvider]
-	
-	[ThemeSettings
-	  |
-	  +sourceColor: Color;
-	  +themeMode: ThemeMode
+	[APIException
 	]
 	
-	[ThemeSettings]o-[Color]
-	[ThemeSettings]o-[ThemeMode]
+	[Exception]&lt;:--[APIException]
 	
-	[CustomColor
-	  |
-	  +name: String;
-	  +color: Color;
-	  +blend: bool
-	  |
-	  +Color value()
+	[StudyNotFoundException
 	]
 	
-	[CustomColor]o-[Color]
-	
-	[StudyTemplates
-	  |
-	  &lt;static&gt;+kUnnamedStudyTitle: String
-	  |
-	  &lt;static&gt;+Study emptyDraft()
-	]
+	[APIException]&lt;:-[StudyNotFoundException]
 	
-	[StudyActionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyActionType&gt;;
-	  &lt;static&gt;+pin: StudyActionType;
-	  &lt;static&gt;+pinoff: StudyActionType;
-	  &lt;static&gt;+edit: StudyActionType;
-	  &lt;static&gt;+duplicate: StudyActionType;
-	  &lt;static&gt;+duplicateDraft: StudyActionType;
-	  &lt;static&gt;+addCollaborator: StudyActionType;
-	  &lt;static&gt;+export: StudyActionType;
-	  &lt;static&gt;+delete: StudyActionType
+	[MeasurementNotFoundException
 	]
 	
-	[StudyActionType]o-[StudyActionType]
-	[Enum]&lt;:--[StudyActionType]
-	
-	[&lt;abstract&gt;ResultTypes
-	]
+	[APIException]&lt;:-[MeasurementNotFoundException]
 	
-	[MeasurementResultTypes
-	  |
-	  &lt;static&gt;+questionnaire: String;
-	  &lt;static&gt;+values: List&lt;String&gt;
+	[QuestionNotFoundException
 	]
 	
-	[&lt;abstract&gt;ResultTypes]&lt;:-[MeasurementResultTypes]
+	[APIException]&lt;:-[QuestionNotFoundException]
 	
-	[InterventionResultTypes
-	  |
-	  &lt;static&gt;+checkmarkTask: String;
-	  &lt;static&gt;+values: List&lt;String&gt;
+	[ConsentItemNotFoundException
 	]
 	
-	[&lt;abstract&gt;ResultTypes]&lt;:-[InterventionResultTypes]
+	[APIException]&lt;:-[ConsentItemNotFoundException]
 	
-	[StudyExportData
-	  |
-	  +study: Study;
-	  +measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
-	  +interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
-	  +isEmpty: bool
+	[InterventionNotFoundException
 	]
 	
-	[StudyExportData]o-[Study]
+	[APIException]&lt;:-[InterventionNotFoundException]
 	
-	[CombinedStreamNotifier
-	  |
-	  -_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;
-	  |
-	  +void dispose()
+	[InterventionTaskNotFoundException
 	]
 	
-	[ChangeNotifier]&lt;:-[CombinedStreamNotifier]
+	[APIException]&lt;:-[InterventionTaskNotFoundException]
 	
-	[OptimisticUpdate
-	  |
-	  +applyOptimistic: void Function();
-	  +apply: dynamic Function();
-	  +rollback: void Function();
-	  +onUpdate: void Function()?;
-	  +onError: void Function(Object, StackTrace?)?;
-	  +rethrowErrors: bool;
-	  +runOptimistically: bool;
-	  +completeFutureOptimistically: bool
-	  |
-	  +dynamic execute();
-	  -void _runUpdateHandlerIfAny()
+	[ReportNotFoundException
 	]
 	
-	[OptimisticUpdate]o-[void Function()]
-	[OptimisticUpdate]o-[dynamic Function()]
-	[OptimisticUpdate]o-[void Function()?]
-	[OptimisticUpdate]o-[void Function(Object, StackTrace?)?]
+	[APIException]&lt;:-[ReportNotFoundException]
 	
-	[Time
-	  |
-	  &lt;static&gt;+dynamic fromTimeOfDay();
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+Time fromJson()
+	[ReportSectionNotFoundException
 	]
 	
-	[TimeOfDay]&lt;:-[Time]
+	[APIException]&lt;:-[ReportSectionNotFoundException]
 	
-	[TimeValueAccessor
-	  |
-	  +String modelToViewValue();
-	  +Time? viewToModelValue();
-	  -String _addLeadingZeroIfNeeded()
+	[StudyInviteNotFoundException
 	]
 	
-	[&lt;abstract&gt;ControlValueAccessor]&lt;:-[TimeValueAccessor]
+	[APIException]&lt;:-[StudyInviteNotFoundException]
 	
-	[ModelAction
-	  |
-	  +type: T;
-	  +label: String;
-	  +icon: IconData?;
-	  +onExecute: Function;
-	  +isAvailable: bool;
-	  +isDestructive: bool
+	[UserNotFoundException
 	]
 	
-	[ModelAction]o-[IconData]
+	[APIException]&lt;:-[UserNotFoundException]
 	
-	[&lt;abstract&gt;IModelActionProvider
+	[StudyUApiClient
 	  |
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
-	]
-	
-	[&lt;abstract&gt;IListActionProvider
+	  +supabaseClient: SupabaseClient;
+	  &lt;static&gt;+studyColumns: List&lt;String&gt;;
+	  &lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;;
+	  +testDelayMilliseconds: int
 	  |
-	  +void onSelectItem();
-	  +void onNewItem()
+	  +dynamic deleteParticipants();
+	  +dynamic getUserStudies();
+	  +dynamic fetchStudy();
+	  +dynamic deleteStudy();
+	  +dynamic saveStudy();
+	  +dynamic fetchStudyInvite();
+	  +dynamic saveStudyInvite();
+	  +dynamic deleteStudyInvite();
+	  +dynamic fetchAppConfig();
+	  +dynamic fetchUser();
+	  +dynamic saveUser();
+	  -dynamic _awaitGuarded();
+	  -dynamic _apiException();
+	  -dynamic _testDelay()
 	]
 	
-	[&lt;abstract&gt;IModelActionProvider]&lt;:-[&lt;abstract&gt;IListActionProvider]
+	[StudyUApiClient]o-[SupabaseClient]
+	[&lt;abstract&gt;SupabaseClientDependant]&lt;:-[StudyUApiClient]
+	[&lt;abstract&gt;SupabaseQueryMixin]&lt;:-[StudyUApiClient]
+	[&lt;abstract&gt;StudyUApi]&lt;:--[StudyUApiClient]
 	
-	[ModelActionType
+	[&lt;abstract&gt;IAppRepository
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ModelActionType&gt;;
-	  &lt;static&gt;+edit: ModelActionType;
-	  &lt;static&gt;+delete: ModelActionType;
-	  &lt;static&gt;+remove: ModelActionType;
-	  &lt;static&gt;+duplicate: ModelActionType;
-	  &lt;static&gt;+clipboard: ModelActionType;
-	  &lt;static&gt;+primary: ModelActionType
+	  +dynamic fetchAppConfig();
+	  +void dispose()
 	]
 	
-	[ModelActionType]o-[ModelActionType]
-	[Enum]&lt;:--[ModelActionType]
-	
-	[SerializableColor
+	[AppRepository
 	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+SerializableColor fromJson()
+	  +apiClient: StudyUApi
+	  |
+	  +dynamic fetchAppConfig();
+	  +void dispose()
 	]
 	
-	[Color]&lt;:-[SerializableColor]
+	[AppRepository]o-[&lt;abstract&gt;StudyUApi]
+	[&lt;abstract&gt;IAppRepository]&lt;:--[AppRepository]
 	
-	[Tuple
+	[&lt;abstract&gt;IUserRepository
 	  |
-	  +first: T1;
-	  +second: T2;
-	  +props: List&lt;Object?&gt;
+	  +user: StudyUUser
 	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson();
-	  +Tuple&lt;T1, T2&gt; copy();
-	  +Tuple&lt;T1, T2&gt; copyWith()
+	  +dynamic fetchUser();
+	  +dynamic saveUser();
+	  +dynamic updatePreferences()
 	]
 	
-	[&lt;abstract&gt;Equatable]&lt;:-[Tuple]
+	[&lt;abstract&gt;IUserRepository]o-[StudyUUser]
 	
-	[CountWhereValidator
+	[UserRepository
 	  |
-	  +predicate: bool Function(T?);
-	  +minCount: int?;
-	  +maxCount: int?;
-	  &lt;static&gt;+kValidationMessageMinCount: String;
-	  &lt;static&gt;+kValidationMessageMaxCount: String
+	  +apiClient: StudyUApi;
+	  +authRepository: IAuthRepository;
+	  +ref: Ref&lt;Object?&gt;;
+	  +user: StudyUUser
 	  |
-	  +Map&lt;String, dynamic&gt;? validate()
+	  +dynamic fetchUser();
+	  +dynamic saveUser();
+	  +dynamic updatePreferences()
 	]
 	
-	[CountWhereValidator]o-[bool Function(T?)]
-	[&lt;abstract&gt;Validator]&lt;:-[CountWhereValidator]
+	[UserRepository]o-[&lt;abstract&gt;StudyUApi]
+	[UserRepository]o-[&lt;abstract&gt;IAuthRepository]
+	[UserRepository]o-[&lt;abstract&gt;Ref]
+	[UserRepository]o-[StudyUUser]
+	[&lt;abstract&gt;IUserRepository]&lt;:--[UserRepository]
 	
-	[Patterns
+	[PreferenceAction
 	  |
-	  &lt;static&gt;+timeFormatString: String;
-	  &lt;static&gt;+emailFormatString: String;
-	  &lt;static&gt;+url: String
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;PreferenceAction&gt;;
+	  &lt;static&gt;+pin: PreferenceAction;
+	  &lt;static&gt;+pinOff: PreferenceAction
 	]
 	
-	[&lt;abstract&gt;ExecutionLimiter
+	[PreferenceAction]o-[PreferenceAction]
+	[Enum]&lt;:--[PreferenceAction]
+	
+	[&lt;abstract&gt;IAuthRepository
 	  |
-	  +milliseconds: int;
-	  &lt;static&gt;-_timer: Timer?
+	  +allowPasswordReset: bool;
+	  +currentUser: User?;
+	  +isLoggedIn: bool;
+	  +session: Session?;
+	  +serializedSession: String?
 	  |
+	  +dynamic signUp();
+	  +dynamic signInWith();
+	  +dynamic signOut();
+	  +dynamic resetPasswordForEmail();
+	  +dynamic updateUser();
 	  +void dispose()
 	]
 	
-	[&lt;abstract&gt;ExecutionLimiter]o-[Timer]
+	[&lt;abstract&gt;IAuthRepository]o-[User]
+	[&lt;abstract&gt;IAuthRepository]o-[Session]
+	[&lt;abstract&gt;IAppDelegate]&lt;:-[&lt;abstract&gt;IAuthRepository]
 	
-	[Debouncer
+	[AuthRepository
 	  |
-	  +leading: bool;
-	  +cancelUncompleted: bool;
-	  -_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?
+	  +supabaseClient: SupabaseClient;
+	  +sharedPreferences: SharedPreferences;
+	  +allowPasswordReset: bool;
+	  +authClient: GoTrueClient;
+	  +session: Session?;
+	  +serializedSession: String?;
+	  +currentUser: User?;
+	  +isLoggedIn: bool
 	  |
-	  +dynamic call()
+	  -void _registerAuthListener();
+	  +dynamic signUp();
+	  +dynamic signInWith();
+	  +dynamic signOut();
+	  +dynamic resetPasswordForEmail();
+	  +dynamic updateUser();
+	  +void dispose();
+	  +dynamic onAppStart()
 	]
 	
-	[Debouncer]o-[CancelableOperation]
-	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Debouncer]
+	[AuthRepository]o-[SupabaseClient]
+	[AuthRepository]o-[SharedPreferences]
+	[AuthRepository]o-[GoTrueClient]
+	[AuthRepository]o-[Session]
+	[AuthRepository]o-[User]
+	[&lt;abstract&gt;IAuthRepository]&lt;:--[AuthRepository]
 	
-	[Throttler
-	  |
-	  +dynamic call()
+	[StudyLaunched
 	]
 	
-	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Throttler]
+	[&lt;abstract&gt;ModelEvent]&lt;:-[StudyLaunched]
 	
-	[SuppressedBehaviorSubject
+	[&lt;abstract&gt;SupabaseClientDependant
 	  |
-	  +subject: BehaviorSubject&lt;T&gt;;
-	  +didSuppressInitialEvent: bool;
-	  -_controller: StreamController&lt;T&gt;
+	  +supabaseClient: SupabaseClient
+	]
+	
+	[&lt;abstract&gt;SupabaseClientDependant]o-[SupabaseClient]
+	
+	[SupabaseQueryError
 	  |
-	  -StreamController&lt;T&gt; _buildDerivedController();
-	  +dynamic close()
+	  +statusCode: String?;
+	  +message: String;
+	  +details: dynamic
 	]
 	
-	[SuppressedBehaviorSubject]o-[BehaviorSubject]
-	[SuppressedBehaviorSubject]o-[StreamController]
+	[Exception]&lt;:--[SupabaseQueryError]
 	
-	[&lt;abstract&gt;JsonFileLoader
+	[&lt;abstract&gt;SupabaseQueryMixin
 	  |
-	  +jsonAssetsPath: String
+	  +dynamic deleteAll();
+	  +dynamic getAll();
+	  +dynamic getById();
+	  +dynamic getByColumn();
+	  +List&lt;T&gt; deserializeList();
+	  +T deserializeObject()
+	]
+	
+	[WrappedModel
 	  |
-	  +dynamic loadJson();
-	  +dynamic parseJsonMapFromAssets();
-	  +dynamic parseJsonListFromAssets()
+	  -_model: T;
+	  +asyncValue: AsyncValue&lt;T&gt;;
+	  +isLocalOnly: bool;
+	  +isDirty: bool;
+	  +isDeleted: bool;
+	  +lastSaved: DateTime?;
+	  +lastFetched: DateTime?;
+	  +lastUpdated: DateTime?;
+	  +model: T
+	  |
+	  +dynamic markWithError();
+	  +dynamic markAsLoading();
+	  +dynamic markAsFetched();
+	  +dynamic markAsSaved()
 	]
 	
-	[&lt;abstract&gt;IProviderArgsResolver
-	  |
-	  +R provide()
-	]
+	[WrappedModel]o-[&lt;abstract&gt;AsyncValue]
 	
-	[NumericalRangeFormatter
-	  |
-	  +min: int?;
-	  +max: int?
-	  |
-	  +TextEditingValue formatEditUpdate()
+	[ModelRepositoryException
 	]
 	
-	[&lt;abstract&gt;TextInputFormatter]&lt;:-[NumericalRangeFormatter]
+	[Exception]&lt;:--[ModelRepositoryException]
 	
-	[StudySequenceFormatter
-	  |
-	  +TextEditingValue formatEditUpdate()
+	[ModelNotFoundException
 	]
 	
-	[&lt;abstract&gt;TextInputFormatter]&lt;:-[StudySequenceFormatter]
+	[ModelRepositoryException]&lt;:--[ModelNotFoundException]
 	
-	[&lt;abstract&gt;FileFormatEncoder
+	[&lt;abstract&gt;IModelRepository
 	  |
-	  +dynamic encodeAsync();
-	  +String encode();
-	  +dynamic call()
+	  +String getKey();
+	  +WrappedModel&lt;T&gt;? get();
+	  +dynamic fetchAll();
+	  +dynamic fetch();
+	  +dynamic save();
+	  +dynamic delete();
+	  +dynamic duplicateAndSave();
+	  +dynamic duplicateAndSaveFromRemote();
+	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
+	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
+	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
+	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
+	  +dynamic ensurePersisted();
+	  +void dispose()
 	]
 	
-	[CSVStringEncoder
+	[&lt;abstract&gt;IModelActionProvider]&lt;:--[&lt;abstract&gt;IModelRepository]
+	
+	[&lt;abstract&gt;IModelRepositoryDelegate
 	  |
-	  +String encode()
+	  +dynamic fetchAll();
+	  +dynamic fetch();
+	  +dynamic save();
+	  +dynamic delete();
+	  +T createNewInstance();
+	  +T createDuplicate();
+	  +dynamic onError()
 	]
 	
-	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[CSVStringEncoder]
-	
-	[JsonStringEncoder
+	[&lt;abstract&gt;ModelRepository
 	  |
-	  +String encode()
+	  +delegate: IModelRepositoryDelegate&lt;T&gt;;
+	  -_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;;
+	  -_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;;
+	  +modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;;
+	  +modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;;
+	  -_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;
+	  |
+	  +WrappedModel&lt;T&gt;? get();
+	  +dynamic fetchAll();
+	  +dynamic fetch();
+	  +dynamic save();
+	  +dynamic delete();
+	  +dynamic duplicateAndSave();
+	  +dynamic duplicateAndSaveFromRemote();
+	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
+	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
+	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
+	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
+	  -dynamic _buildModelSpecificController();
+	  +dynamic ensurePersisted();
+	  +WrappedModel&lt;T&gt; upsertLocally();
+	  +List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally();
+	  +dynamic emitUpdate();
+	  +dynamic emitModelEvent();
+	  +dynamic emitError();
+	  +void dispose();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
 	]
 	
-	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[JsonStringEncoder]
+	[&lt;abstract&gt;ModelRepository]o-[&lt;abstract&gt;IModelRepositoryDelegate]
+	[&lt;abstract&gt;ModelRepository]o-[BehaviorSubject]
+	[&lt;abstract&gt;IModelRepository]&lt;:-[&lt;abstract&gt;ModelRepository]
 	
-	[PlatformLocaleWeb
+	[&lt;abstract&gt;ModelEvent
 	  |
-	  +Locale getPlatformLocale()
+	  +modelId: String;
+	  +model: T
 	]
 	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleWeb]
-	
-	[PlatformLocaleMobile
-	  |
-	  +Locale getPlatformLocale()
+	[IsFetched
 	]
 	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleMobile]
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsFetched]
 	
-	[&lt;abstract&gt;PlatformLocale
-	  |
-	  +Locale getPlatformLocale()
+	[IsSaving
 	]
 	
-	[AppTranslation
-	  |
-	  &lt;static&gt;+dynamic init()
-	]
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaving]
 	
-	[LanguagePicker
-	  |
-	  +languagePickerType: LanguagePickerType;
-	  +iconColor: Color?;
-	  +offset: Offset?
+	[IsSaved
 	]
 	
-	[LanguagePicker]o-[LanguagePickerType]
-	[LanguagePicker]o-[Color]
-	[LanguagePicker]o-[Offset]
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaved]
 	
-	[LanguagePickerType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;LanguagePickerType&gt;;
-	  &lt;static&gt;+field: LanguagePickerType;
-	  &lt;static&gt;+icon: LanguagePickerType
+	[IsDeleted
 	]
 	
-	[LanguagePickerType]o-[LanguagePickerType]
-	[Enum]&lt;:--[LanguagePickerType]
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsDeleted]
 	
 	</desc>
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="4628.0" width="81165.3" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="4628.0" width="81384.0" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
 				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M358.8 1823.2 L86.5 1936 L28133 2561.68712537684 L28133.0 2561.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M369.4 1824.5 L358.8 1823.2 L365.3 1814.7 L376.0 1816.0 Z"></path>
-					</g>
-					<path d="M358.9 1832.5 L126.5 1936 L126.5 2549.5 L126.5 2549.5 " fill="none"></path>
+					<path d="M28091.5 158.2 L27833 293 L27833 591 L27833.0 591.0 " fill="none"></path>
+					<path d="M28093.9 162.9 L28091.5 158.2 L28089.0 153.4 L28103.3 152.0 Z"></path>
+					<path d="M28133.0 165.3 L28133 293 L28133 591 L28133.0 591.0 " fill="none"></path>
+					<path d="M28138.3 165.3 L28133.0 165.3 L28127.7 165.3 L28133.0 152.0 Z"></path>
+					<path d="M207.0 2637.2 L207 3194 L67831.5 3380.4159226960314 L67831.5 3380.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M369.6 1833.5 L358.9 1832.5 L365.3 1823.8 L376.0 1824.9 Z"></path>
+						<path d="M212.3 2627.8 L207.0 2637.2 L201.7 2627.8 L207.0 2618.5 Z"></path>
 					</g>
-					<path d="M453.0 1929.9 L447.5 1936 L447.5 2549.5 L447.5 2549.5 " fill="none"></path>
+					<path d="M442.9 3288.2 L456 3282 L463.5 3282 L463.5 3282 L471 3380.5 L471 3380.5 L463.5 3479 L463.5 3479 L456 3479 L456 3479 L426 3464.8612440191387 L426.0 3464.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M463.2 1926.5 L453.0 1929.9 L455.3 1919.4 L465.5 1916.0 Z"></path>
+						<path d="M432.2 3287.3 L442.9 3288.2 L436.7 3297.0 L426.0 3296.1 Z"></path>
 					</g>
-					<path d="M844.4 1930.7 L848.5 1936 L848.5 2549.5 L848.5 2549.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M842.8 1920.1 L844.4 1930.7 L834.4 1926.6 L832.9 1916.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3061.7 2574.6 L247 3194 L247 3282 L247.0 3282.0 " fill="none"></path>
 					</g>
-					<path d="M965.2 1823.2 L1237.5 1936 L1237.5 2549.5 L1237.5 2549.5 " fill="none"></path>
+					<path d="M3062.9 2579.8 L3061.7 2574.6 L3060.6 2569.4 L3074.8 2571.7 Z"></path>
+					<path d="M3819.6 2666.9 L3721.5 3194 L3481.7882037533514 3349.5 L3481.8 3349.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M958.7 1814.7 L965.2 1823.2 L954.6 1824.5 L948.0 1816.0 Z"></path>
+						<path d="M3826.5 2658.7 L3819.6 2666.9 L3816.0 2656.7 L3823.0 2648.5 Z"></path>
 					</g>
-					<path d="M28232.7 2688.9 L28033.75 3194 L30417.75 3377.1957148743304 L30417.8 3377.2 " fill="none"></path>
+					<path d="M3866.5 2666.5 L4012.25 3194 L3734.828418230563 3334.5 L3734.8 3334.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28241.1 2682.1 L28232.7 2688.9 L28231.2 2678.2 L28239.6 2671.5 Z"></path>
+						<path d="M3869.2 2656.1 L3866.5 2666.5 L3858.9 2658.9 L3861.6 2648.5 Z"></path>
 					</g>
-					<path d="M28313.2 2689.6 L28441.5 3194 L12299.5 3378.369844137551 L12299.5 3378.4 " fill="none"></path>
+					<path d="M1880.5 3430.2 L1880.5 3567 L1880.5 3677.5 L1880.5 3677.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28316.1 2679.2 L28313.2 2689.6 L28305.7 2681.9 L28308.6 2671.5 Z"></path>
+						<path d="M1885.8 3420.8 L1880.5 3430.2 L1875.2 3420.8 L1880.5 3411.5 Z"></path>
 					</g>
-					<path d="M1826.4 1718.6 L1356.25 1936 L28133 2561.53089572056 L28133.0 2561.5 " fill="none"></path>
-					<path d="M1828.6 1723.4 L1826.4 1718.6 L1824.1 1713.8 L1838.5 1713.0 Z"></path>
-					<path d="M12317.6 3329.9 L12329.5 3327 L12337 3327 L12337 3327 L12344.5 3380.5 L12344.5 3380.5 L12337 3434 L12337 3434 L12329.5 3434 L12329.5 3434 L12299.5 3426.5866050808313 L12299.5 3426.6 " fill="none"></path>
+					<path d="M63500.8 3811.2 L63500.75 3880 L63000.88339552239 3998.5 L63000.9 3998.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12307.3 3327.0 L12317.6 3329.9 L12309.8 3337.4 L12299.5 3334.4 Z"></path>
+						<path d="M63506.1 3801.8 L63500.8 3811.2 L63495.4 3801.8 L63500.8 3792.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M1637.5 2581.3 L26.75 3194 L11926.5 3377.622163615679 L11926.5 3377.6 " fill="none"></path>
+						<path d="M63500.8 3447.3 L63500.75 3567 L63500.75 3654.5 L63500.8 3654.5 " fill="none"></path>
 					</g>
-					<path d="M1639.4 2586.3 L1637.5 2581.3 L1635.6 2576.4 L1650.0 2576.6 Z"></path>
-					<path d="M29241.0 193.7 L29241 293 L29241 614 L29241.0 614.0 " fill="none"></path>
+					<path d="M63506.1 3447.3 L63500.8 3447.3 L63495.4 3447.3 L63500.8 3434.0 Z"></path>
+					<path d="M4199.9 2659.5 L4052.25 3194 L21264.5 3380.1161383368844 L21264.5 3380.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29246.3 184.3 L29241.0 193.7 L29235.7 184.3 L29241.0 175.0 Z"></path>
+						<path d="M4207.5 2651.9 L4199.9 2659.5 L4197.2 2649.1 L4204.9 2641.5 Z"></path>
 					</g>
-					<path d="M2705.5 2652.7 L2705.5 3194 L55895.75 3380.3388504073823 L55895.8 3380.3 " fill="none"></path>
+					<path d="M4205.9 2659.8 L4092.25 3194 L27437 3380.1531271044223 L27437.0 3380.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2710.8 2643.3 L2705.5 2652.7 L2700.2 2643.3 L2705.5 2634.0 Z"></path>
-					</g>
-					<path d="M32760.6 1734.6 L32367.25 1936 L38122.25 2553.7295221843005 L38122.3 2553.7 " fill="none"></path>
-					<path d="M32763.0 1739.3 L32760.6 1734.6 L32758.2 1729.8 L32772.5 1728.5 Z"></path>
-					<path d="M38217.9 2609.0 L38093.25 3194 L38359.83579088472 3365 L38359.8 3365.0 " fill="none"></path>
-					<path d="M38223.1 2610.2 L38217.9 2609.0 L38212.7 2607.9 L38220.6 2596.0 Z"></path>
-					<path d="M32792.8 1738.0 L32596 1936 L38372.25 2552.2509010728068 L38372.3 2552.3 " fill="none"></path>
-					<path d="M32796.6 1741.7 L32792.8 1738.0 L32789.0 1734.2 L32802.2 1728.5 Z"></path>
-					<path d="M32798.9 1738.8 L32636 1936 L36503.75 2545.5370497964295 L36503.8 2545.5 " fill="none"></path>
-					<path d="M32803.0 1742.2 L32798.9 1738.8 L32794.8 1735.4 L32807.4 1728.5 Z"></path>
-					<path d="M36627.3 2609.3 L36627.25 3194 L36894.059651474534 3349.5 L36894.1 3349.5 " fill="none"></path>
-					<path d="M36632.6 2609.3 L36627.3 2609.3 L36621.9 2609.3 L36627.3 2596.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M38254.3 2607.2 L38630.5 3194 L37079.75 3365.8193227387496 L37079.8 3365.8 " fill="none"></path>
+						<path d="M4213.0 2651.7 L4205.9 2659.8 L4202.6 2649.5 L4209.7 2641.5 Z"></path>
 					</g>
-					<path d="M38258.8 2604.3 L38254.3 2607.2 L38249.8 2610.1 L38247.1 2596.0 Z"></path>
-					<path d="M32805.3 1739.6 L32676 1936 L36816.75 2547.787362734159 L36816.8 2547.8 " fill="none"></path>
-					<path d="M32809.7 1742.6 L32805.3 1739.6 L32800.8 1736.7 L32812.6 1728.5 Z"></path>
-					<path d="M36933.3 2609.3 L36933.25 3194 L36688.118632707774 3349.5 L36688.1 3349.5 " fill="none"></path>
-					<path d="M36938.6 2609.3 L36933.3 2609.3 L36927.9 2609.3 L36933.3 2596.0 Z"></path>
-					<path d="M32860.7 1739.6 L32989.5 1936 L38651.25 2552.691761548119 L38651.3 2552.7 " fill="none"></path>
-					<path d="M32865.1 1736.7 L32860.7 1739.6 L32856.2 1742.6 L32853.3 1728.5 Z"></path>
-					<path d="M4260.5 2644.7 L4260.5 3194 L28726.75 3380.0854837229695 L28726.8 3380.1 " fill="none"></path>
+					<path d="M4211.8 2660.0 L4132.25 3194 L1647 3369.0539609102066 L1647.0 3369.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4265.8 2635.3 L4260.5 2644.7 L4255.2 2635.3 L4260.5 2626.0 Z"></path>
+						<path d="M4218.5 2651.5 L4211.8 2660.0 L4207.9 2649.9 L4214.6 2641.5 Z"></path>
 					</g>
-					<path d="M4498.0 2667.4 L4408 3194 L21383 3380.023298175515 L21383.0 3380.0 " fill="none"></path>
+					<path d="M1880.5 3788.2 L1880.5 3880 L8413 4012.3087968561063 L8413.0 4012.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4504.8 2659.1 L4498.0 2667.4 L4494.3 2657.3 L4501.1 2649.0 Z"></path>
+						<path d="M1885.8 3778.8 L1880.5 3788.2 L1875.2 3778.8 L1880.5 3769.5 Z"></path>
 					</g>
-					<path d="M4539.7 2667.2 L4664.25 3194 L19048 3380.040839502748 L19048.0 3380.0 " fill="none"></path>
+					<path d="M4346.5 2649.1 L5127 3194 L3502 3373.0091553455404 L3502.0 3373.0 " fill="none"></path>
+					<path d="M4349.6 2644.8 L4346.5 2649.1 L4343.5 2653.5 L4335.6 2641.5 Z"></path>
+					<path d="M4373.8 2648.0 L5345.75 3194 L3746 3369.321507271926 L3746.0 3369.3 " fill="none"></path>
+					<path d="M4376.4 2643.4 L4373.8 2648.0 L4371.2 2652.7 L4362.2 2641.5 Z"></path>
+					<path d="M1664.8 3323.4 L1677 3319.5 L1684.5 3319.5 L1684.5 3319.5 L1692 3380.5 L1692 3380.5 L1684.5 3441.5 L1684.5 3441.5 L1677 3441.5 L1677 3441.5 L1647 3431.9935064935066 L1647.0 3432.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4542.7 2656.9 L4539.7 2667.2 L4532.3 2659.3 L4535.4 2649.0 Z"></path>
+						<path d="M1654.3 3321.1 L1664.8 3323.4 L1657.5 3331.3 L1647.0 3329.0 Z"></path>
 					</g>
-					<path d="M30069.0 165.3 L30069 293 L30069 614 L30069.0 614.0 " fill="none"></path>
-					<path d="M30074.3 165.3 L30069.0 165.3 L30063.7 165.3 L30069.0 152.0 Z"></path>
-					<path d="M4836.1 2636.7 L4704.25 3194 L4704.25 3365 L4704.3 3365.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4843.4 2628.8 L4836.1 2636.7 L4833.0 2626.4 L4840.3 2618.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3062.0 2578.0 L1016 3194 L1331.2640750670241 3319.5 L1331.3 3319.5 " fill="none"></path>
+					</g>
+					<path d="M3063.5 2583.1 L3062.0 2578.0 L3060.4 2572.9 L3074.8 2574.2 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M28655.0 180.8 L28655 293 L28655 598.5 L28655.0 598.5 " fill="none"></path>
 					</g>
-					<path d="M4871.8 2636.6 L5018 3194 L25967.25 3379.3586101787387 L25967.3 3379.4 " fill="none"></path>
+					<path d="M28660.3 180.8 L28655.0 180.8 L28649.7 180.8 L28655.0 167.5 Z"></path>
+					<path d="M5519.7 2644.1 L5385.75 3194 L21264.5 3380.0839734828846 L21264.5 3380.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4874.6 2626.2 L4871.8 2636.6 L4864.2 2628.9 L4867.0 2618.5 Z"></path>
+						<path d="M5527.1 2636.3 L5519.7 2644.1 L5516.7 2633.8 L5524.1 2626.0 Z"></path>
 					</g>
-					<path d="M26096.3 3430.2 L26096.25 3567 L26096.25 3708 L26096.3 3708.0 " fill="none"></path>
+					<path d="M5551.0 2644.5 L5634.25 3194 L3948 3371.9519734050077 L3948.0 3372.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26101.6 3420.8 L26096.3 3430.2 L26090.9 3420.8 L26096.3 3411.5 Z"></path>
+						<path d="M5554.9 2634.4 L5551.0 2644.5 L5544.4 2636.0 L5548.2 2626.0 Z"></path>
 					</g>
-					<path d="M5194.3 2674.6 L5058 3194 L19048 3380.027949092724 L19048.0 3380.0 " fill="none"></path>
+					<path d="M5900.5 2682.0 L5756.25 3194 L42757.25 3380.225701987559 L42757.3 3380.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5201.8 2666.9 L5194.3 2674.6 L5191.5 2664.2 L5199.0 2656.5 Z"></path>
+						<path d="M5908.2 2674.4 L5900.5 2682.0 L5897.9 2671.5 L5905.6 2664.0 Z"></path>
 					</g>
-					<path d="M5248.8 2674.7 L5370.75 3194 L11750.5 3378.5331123260053 L11750.5 3378.5 " fill="none"></path>
+					<path d="M5907.9 2682.2 L5796.25 3194 L28762 3379.828401757145 L28762.0 3379.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5251.8 2664.4 L5248.8 2674.7 L5241.4 2666.8 L5244.5 2656.5 Z"></path>
+						<path d="M5915.1 2674.3 L5907.9 2682.2 L5904.7 2672.0 L5911.9 2664.0 Z"></path>
 					</g>
-					<path d="M5563.6 2681.9 L5410.75 3194 L28726.75 3380.065082047881 L28726.8 3380.1 " fill="none"></path>
+					<path d="M5915.3 2682.4 L5836.25 3194 L4341.719168900804 3365 L4341.7 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5571.4 2674.5 L5563.6 2681.9 L5561.2 2671.4 L5568.9 2664.0 Z"></path>
+						<path d="M5922.0 2674.0 L5915.3 2682.4 L5911.5 2672.4 L5918.2 2664.0 Z"></path>
 					</g>
-					<path d="M5571.0 2682.2 L5450.75 3194 L19834 3379.429957660071 L19834.0 3379.4 " fill="none"></path>
+					<path d="M5967.5 2681.9 L6116.5 3194 L4575.25 3370.969755271664 L4575.3 3371.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5578.3 2674.3 L5571.0 2682.2 L5567.9 2671.9 L5575.2 2664.0 Z"></path>
+						<path d="M5970.0 2671.5 L5967.5 2681.9 L5959.8 2674.5 L5962.3 2664.0 Z"></path>
 					</g>
-					<path d="M5602.2 2682.7 L5618.5 3194 L5618.5 3365 L5618.5 3365.0 " fill="none"></path>
+					<path d="M6419.0 2659.3 L6246 3194 L25722.75 3379.841621580139 L25722.8 3379.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5607.3 2673.2 L5602.2 2682.7 L5596.6 2673.5 L5601.6 2664.0 Z"></path>
+						<path d="M6427.0 2652.0 L6419.0 2659.3 L6416.8 2648.7 L6424.8 2641.5 Z"></path>
 					</g>
-					<path d="M5654.8 2680.8 L5904.5 3194 L5904.5 3365 L5904.5 3365.0 " fill="none"></path>
+					<path d="M6424.9 2659.6 L6286 3194 L11251.5 3378.8434630738525 L11251.5 3378.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5655.5 2670.1 L5654.8 2680.8 L5645.9 2674.7 L5646.7 2664.0 Z"></path>
+						<path d="M6432.4 2651.9 L6424.9 2659.6 L6422.1 2649.2 L6429.6 2641.5 Z"></path>
 					</g>
-					<path d="M6034.7 2712.5 L5978.25 3194 L26630.25 3380.2384797640348 L26630.3 3380.2 " fill="none"></path>
+					<path d="M6455.5 2660.1 L6489.5 3194 L4932.391420911528 3365 L4932.4 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6041.1 2703.9 L6034.7 2712.5 L6030.5 2702.6 L6036.9 2694.0 Z"></path>
+						<path d="M6460.3 2650.5 L6455.5 2660.1 L6449.6 2651.2 L6454.4 2641.5 Z"></path>
 					</g>
-					<path d="M6052.0 2712.7 L6052 3194 L6052 3365 L6052.0 3365.0 " fill="none"></path>
+					<path d="M6946.2 2711.9 L6801.75 3194 L21675 3380.137068227952 L21675.0 3380.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6057.3 2703.3 L6052.0 2712.7 L6046.7 2703.3 L6052.0 2694.0 Z"></path>
+						<path d="M6954.0 2704.5 L6946.2 2711.9 L6943.8 2701.4 L6951.6 2694.0 Z"></path>
 					</g>
-					<path d="M6087.4 2712.1 L6203.5 3194 L6203.5 3365 L6203.5 3365.0 " fill="none"></path>
+					<path d="M6955.5 2712.2 L6841.75 3194 L5780.5 3376.291618696753 L5780.5 3376.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6090.4 2701.8 L6087.4 2712.1 L6080.1 2704.3 L6083.1 2694.0 Z"></path>
+						<path d="M6962.8 2704.3 L6955.5 2712.2 L6952.5 2701.9 L6959.8 2694.0 Z"></path>
 					</g>
-					<path d="M6958.3 2691.7 L6459 3194 L21383 3379.95797561383 L21383.0 3380.0 " fill="none"></path>
+					<path d="M7012.7 2712.5 L7086 3194 L5994.5 3366.732074671192 L5994.5 3366.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6968.6 2688.9 L6958.3 2691.7 L6961.1 2681.4 L6971.4 2678.5 Z"></path>
+						<path d="M7016.6 2702.4 L7012.7 2712.5 L7006.0 2704.0 L7009.9 2694.0 Z"></path>
 					</g>
-					<path d="M7008.1 2694.6 L6714.5 3194 L6714.5 3380.5 L6714.5 3380.5 L6714.5 3567 L6714.5 3567 L6714.5 3723.5 L6714.5 3723.5 L6714.5 3880 L6714.5 3880 L9895.5 4011.034122348601 L9895.5 4011.0 " fill="none"></path>
+					<path d="M7388.1 2637.0 L7319.5 3194 L6238.945040214478 3365 L6238.9 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7017.4 2689.2 L7008.1 2694.6 L7008.2 2683.8 L7017.5 2678.5 Z"></path>
+						<path d="M7394.6 2628.4 L7388.1 2637.0 L7384.0 2627.1 L7390.4 2618.5 Z"></path>
 					</g>
-					<path d="M7057.6 2696.8 L6957 3194 L11533.5 3376.9618971061095 L11533.5 3377.0 " fill="none"></path>
+					<path d="M7413.7 2636.7 L7543.25 3194 L45104.25 3379.861674184134 L45104.3 3379.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7064.7 2688.7 L7057.6 2696.8 L7054.2 2686.6 L7061.3 2678.5 Z"></path>
+						<path d="M7416.7 2626.4 L7413.7 2636.7 L7406.4 2628.8 L7409.4 2618.5 Z"></path>
 					</g>
-					<path d="M7065.9 2697.0 L6997 3194 L15898 3379.406433238398 L15898.0 3379.4 " fill="none"></path>
+					<path d="M45233.3 3430.2 L45233.25 3567 L45233.25 3708 L45233.3 3708.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7072.5 2688.5 L7065.9 2697.0 L7061.9 2687.0 L7068.5 2678.5 Z"></path>
+						<path d="M45238.6 3420.8 L45233.3 3430.2 L45227.9 3420.8 L45233.3 3411.5 Z"></path>
 					</g>
-					<path d="M7116.7 2696.6 L7239.5 3194 L7239.5 3365 L7239.5 3365.0 " fill="none"></path>
+					<path d="M7729.5 2652.2 L7729.5 3194 L21264.5 3380.0121218820236 L21264.5 3380.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7119.7 2686.3 L7116.7 2696.6 L7109.3 2688.8 L7112.3 2678.5 Z"></path>
+						<path d="M7734.8 2642.8 L7729.5 2652.2 L7724.2 2642.8 L7729.5 2633.5 Z"></path>
 					</g>
-					<path d="M7674.9 2686.1 L7304.5 3194 L7304.5 3380.5 L7304.5 3380.5 L7304.5 3567 L7304.5 3567 L7304.5 3723.5 L7304.5 3723.5 L7304.5 3880 L7304.5 3880 L9895.5 4010.3770184003006 L9895.5 4010.4 " fill="none"></path>
+					<path d="M7997.2 2674.8 L7894.25 3194 L21264.5 3380.0061261026053 L21264.5 3380.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7684.8 2681.7 L7674.9 2686.1 L7676.1 2675.4 L7685.9 2671.0 Z"></path>
+						<path d="M8004.3 2666.7 L7997.2 2674.8 L7993.8 2664.6 L8000.9 2656.5 Z"></path>
 					</g>
-					<path d="M7805.8 2688.7 L7979.75 3194 L26630.25 3380.210457988704 L26630.3 3380.2 " fill="none"></path>
+					<path d="M8046.0 2674.6 L8174 3194 L12912 3377.861215147732 L12912.0 3377.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7807.8 2678.1 L7805.8 2688.7 L7797.7 2681.6 L7799.7 2671.0 Z"></path>
+						<path d="M8049.0 2664.3 L8046.0 2674.6 L8038.6 2666.8 L8041.5 2656.5 Z"></path>
 					</g>
-					<path d="M7813.5 2688.3 L8019.75 3194 L10282.75 3376.9033586132177 L10282.8 3376.9 " fill="none"></path>
+					<path d="M8336.6 2696.6 L8214 3194 L27437 3380.0789193678147 L27437.0 3380.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7814.9 2677.6 L7813.5 2688.3 L7805.1 2681.7 L7806.5 2671.0 Z"></path>
+						<path d="M8344.0 2688.8 L8336.6 2696.6 L8333.6 2686.3 L8341.0 2678.5 Z"></path>
 					</g>
-					<path d="M7821.2 2687.9 L8059.75 3194 L21383 3379.8930648811415 L21383.0 3379.9 " fill="none"></path>
+					<path d="M8348.9 2697.0 L8273 3194 L8273 3380.5 L8273 3380.5 L8273 3567 L8273 3567 L8273 3723.5 L8273 3723.5 L8273 3880 L8273 3880 L17849.5 4013.0000518215265 L17849.5 4013.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7822.0 2677.2 L7821.2 2687.9 L7812.4 2681.7 L7813.2 2671.0 Z"></path>
+						<path d="M8355.5 2688.5 L8348.9 2697.0 L8345.0 2686.9 L8351.7 2678.5 Z"></path>
 					</g>
-					<path d="M4766.8 3796.2 L4766.75 3880 L9895.5 4012.1448829495744 L9895.5 4012.1 " fill="none"></path>
+					<path d="M8357.2 2697.1 L8313 3194 L11770 3375.8447327598365 L11770.0 3375.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4772.1 3786.8 L4766.8 3796.2 L4761.4 3786.8 L4766.8 3777.5 Z"></path>
+						<path d="M8363.4 2688.3 L8357.2 2697.1 L8352.8 2687.3 L8358.9 2678.5 Z"></path>
 					</g>
-					<path d="M8350.2 2659.6 L8316.25 3194 L7932.302278820375 3365 L7932.3 3365.0 " fill="none"></path>
+					<path d="M8365.6 2697.2 L8353 3194 L13551 3378.6351776021334 L13551.0 3378.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8356.1 2650.7 L8350.2 2659.6 L8345.5 2650.0 L8351.4 2641.0 Z"></path>
+						<path d="M8371.2 2688.0 L8365.6 2697.2 L8360.5 2687.7 L8366.1 2678.5 Z"></path>
 					</g>
-					<path d="M8372.7 2659.4 L8465.75 3194 L10282.75 3376.0416330915928 L10282.8 3376.0 " fill="none"></path>
+					<path d="M8389.8 2696.9 L8468 3194 L8468 3365 L8468.0 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8376.3 2649.3 L8372.7 2659.4 L8365.8 2651.1 L8369.5 2641.0 Z"></path>
+						<path d="M8393.6 2686.9 L8389.8 2696.9 L8383.0 2688.5 L8386.9 2678.5 Z"></path>
 					</g>
-					<path d="M8378.6 2659.2 L8505.75 3194 L19048 3379.874087116825 L19048.0 3379.9 " fill="none"></path>
+					<path d="M8750.1 2659.4 L8666 3194 L8666 3365 L8666.0 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8381.7 2648.8 L8378.6 2659.2 L8371.3 2651.3 L8374.3 2641.0 Z"></path>
+						<path d="M8756.9 2651.0 L8750.1 2659.4 L8746.3 2649.4 L8753.0 2641.0 Z"></path>
 					</g>
-					<path d="M8384.5 2658.9 L8545.75 3194 L25103.25 3379.726024719574 L25103.3 3379.7 " fill="none"></path>
+					<path d="M8828.8 2656.3 L9204.5 3194 L11251.5 3376.531914893617 L11251.5 3376.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8386.9 2648.4 L8384.5 2658.9 L8376.7 2651.5 L8379.1 2641.0 Z"></path>
+						<path d="M8827.8 2645.6 L8828.8 2656.3 L8819.1 2651.7 L8818.1 2641.0 Z"></path>
 					</g>
-					<path d="M8390.4 2658.5 L8585.75 3194 L7124.5 3359.541761579347 L7124.5 3359.5 " fill="none"></path>
+					<path d="M8834.3 2655.8 L9244.5 3194 L21264.5 3379.9508108332298 L21264.5 3380.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8392.2 2647.9 L8390.4 2658.5 L8382.2 2651.6 L8384.0 2641.0 Z"></path>
+						<path d="M8832.8 2645.2 L8834.3 2655.8 L8824.4 2651.7 L8822.9 2641.0 Z"></path>
 					</g>
-					<path d="M8752.8 2659.7 L8625.75 3194 L19048 3379.866904926968 L19048.0 3379.9 " fill="none"></path>
+					<path d="M8839.7 2655.4 L9284.5 3194 L25722.75 3379.72043344591 L25722.8 3379.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8760.1 2651.8 L8752.8 2659.7 L8749.7 2649.3 L8757.1 2641.5 Z"></path>
+						<path d="M8837.8 2644.8 L8839.7 2655.4 L8829.6 2651.6 L8827.8 2641.0 Z"></path>
 					</g>
-					<path d="M8794.8 2659.8 L8905 3194 L7124.5 3362.9459425082678 L7124.5 3362.9 " fill="none"></path>
+					<path d="M8847.5 2654.7 L9343.5 3194 L6879.25 3367.4765027838066 L6879.3 3367.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8798.1 2649.6 L8794.8 2659.8 L8787.7 2651.7 L8791.0 2641.5 Z"></path>
+						<path d="M8845.1 2644.3 L8847.5 2654.7 L8837.3 2651.5 L8834.9 2641.0 Z"></path>
 					</g>
-					<path d="M8800.8 2659.5 L8945 3194 L10282.75 3374.4958401157533 L10282.8 3374.5 " fill="none"></path>
+					<path d="M9544.6 2659.4 L9383.5 3194 L21264.5 3379.9444048168507 L21264.5 3379.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8803.5 2649.1 L8800.8 2659.5 L8793.2 2651.9 L8795.9 2641.5 Z"></path>
+						<path d="M9552.4 2652.0 L9544.6 2659.4 L9542.2 2648.9 L9550.0 2641.5 Z"></path>
 					</g>
-					<path d="M9114.8 2660.2 L9114.75 3194 L10282.75 3373.655257731959 L10282.8 3373.7 " fill="none"></path>
+					<path d="M9567.0 2660.1 L9533.25 3194 L6879.25 3368.3469531525184 L6879.3 3368.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9120.1 2650.8 L9114.8 2660.2 L9109.4 2650.8 L9114.8 2641.5 Z"></path>
+						<path d="M9572.9 2651.2 L9567.0 2660.1 L9562.3 2650.5 L9568.2 2641.5 Z"></path>
 					</g>
-					<path d="M9582.2 2652.7 L9565 3194 L10282.75 3369.6121679239095 L10282.8 3369.6 " fill="none"></path>
+					<path d="M9595.5 2659.7 L9722.75 3194 L11251.5 3375.2247735579217 L11251.5 3375.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9587.8 2643.5 L9582.2 2652.7 L9577.2 2643.2 L9582.8 2634.0 Z"></path>
+						<path d="M9598.6 2649.3 L9595.5 2659.7 L9588.2 2651.8 L9591.2 2641.5 Z"></path>
 					</g>
-					<path d="M9604.9 2652.2 L9728.5 3194 L7124.5 3368.129078522768 L7124.5 3368.1 " fill="none"></path>
+					<path d="M9912.5 2660.2 L9912.5 3194 L11251.5 3374.5012649078426 L11251.5 3374.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9608.0 2641.9 L9604.9 2652.2 L9597.6 2644.3 L9600.7 2634.0 Z"></path>
+						<path d="M9917.8 2650.8 L9912.5 2660.2 L9907.2 2650.8 L9912.5 2641.5 Z"></path>
 					</g>
-					<path d="M7142.6 3330.0 L7154.5 3327 L7162 3327 L7162 3327 L7169.5 3380.5 L7169.5 3380.5 L7162 3434 L7162 3434 L7154.5 3434 L7154.5 3434 L7124.5 3426.5348837209303 L7124.5 3426.5 " fill="none"></path>
+					<path d="M10361.2 2652.7 L10344 3194 L11251.5 3371.782300420168 L11251.5 3371.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7132.3 3327.0 L7142.6 3330.0 L7134.8 3337.4 L7124.5 3334.5 Z"></path>
+						<path d="M10366.8 2643.5 L10361.2 2652.7 L10356.2 2643.2 L10361.8 2634.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1637.6 2581.7 L66.75 3194 L6754.5 3375.479811574697 L6754.5 3375.5 " fill="none"></path>
+					<path d="M10382.3 2652.3 L10496.25 3194 L6879.25 3371.4251709626515 L6879.3 3371.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M10385.6 2642.0 L10382.3 2652.3 L10375.2 2644.2 L10378.5 2634.0 Z"></path>
 					</g>
-					<path d="M1639.5 2586.7 L1637.6 2581.7 L1635.6 2576.8 L1650.0 2576.9 Z"></path>
-					<path d="M7692.5 3330.3 L7704.5 3327 L7712 3327 L7712 3327 L7719.5 3380.5 L7719.5 3380.5 L7712 3434 L7712 3434 L7704.5 3434 L7704.5 3434 L7674.5 3425.769230769231 L7674.5 3425.8 " fill="none"></path>
+					<path d="M6897.9 3369.6 L7694.9166666666715 3327 L7898.8333333333285 3327 L7898.8333333333285 3327 L8102.75 3380.5 L8102.75 3380.5 L7898.8333333333285 3434 L7898.8333333333285 3434 L7694.9166666666715 3434 L7694.9166666666715 3434 L6879.25 3390.3909060626247 L6879.3 3390.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7682.1 3327.6 L7692.5 3330.3 L7684.9 3337.9 L7674.5 3335.2 Z"></path>
+						<path d="M6888.3 3364.8 L6897.9 3369.6 L6888.9 3375.4 L6879.3 3370.6 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M1637.6 2582.1 L106.75 3194 L7344.5 3376.343098848401 L7344.5 3376.3 " fill="none"></path>
+						<path d="M3062.0 2578.3 L1056 3194 L6509.25 3374.3806367223874 L6509.3 3374.4 " fill="none"></path>
 					</g>
-					<path d="M1639.6 2587.1 L1637.6 2582.1 L1635.6 2577.2 L1650.0 2577.2 Z"></path>
-					<path d="M30319.0 165.3 L30319 293 L30319 614 L30319.0 614.0 " fill="none"></path>
-					<path d="M30324.3 165.3 L30319.0 165.3 L30313.7 165.3 L30319.0 152.0 Z"></path>
-					<path d="M37045.1 1704.2 L33029.5 1936 L28430 2545.327190395956 L28430.0 2545.3 " fill="none"></path>
+					<path d="M3063.6 2583.4 L3062.0 2578.3 L3060.4 2573.2 L3074.8 2574.4 Z"></path>
+					<path d="M15302.8 3796.2 L15302.75 3880 L17849.5 4010.315799522673 L17849.5 4010.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37054.7 1709.0 L37045.1 1704.2 L37054.1 1698.4 L37063.8 1703.2 Z"></path>
+						<path d="M15308.1 3786.8 L15302.8 3796.2 L15297.4 3786.8 L15302.8 3777.5 Z"></path>
 					</g>
-					<path d="M9878.5 2711.7 L9768.5 3194 L8871.25 3367.721385933039 L8871.3 3367.7 " fill="none"></path>
+					<path d="M10637.5 2712.3 L10536.25 3194 L27437 3380.0212092597785 L27437.0 3380.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9885.8 2703.8 L9878.5 2711.7 L9875.4 2701.4 L9882.7 2693.5 Z"></path>
+						<path d="M10644.7 2704.2 L10637.5 2712.3 L10634.2 2702.0 L10641.4 2694.0 Z"></path>
 					</g>
-					<path d="M9901.5 2712.1 L9867.25 3194 L26630.25 3380.1779121010004 L26630.3 3380.2 " fill="none"></path>
+					<path d="M10658.0 2712.6 L10623.75 3194 L21675 3380.011879244602 L21675.0 3380.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9907.5 2703.2 L9901.5 2712.1 L9896.9 2702.4 L9902.9 2693.5 Z"></path>
+						<path d="M10664.0 2703.7 L10658.0 2712.6 L10653.3 2702.9 L10659.3 2694.0 Z"></path>
 					</g>
-					<path d="M9910.9 2712.2 L9907.25 3194 L9118.953753351207 3365 L9119.0 3365.0 " fill="none"></path>
+					<path d="M10667.4 2712.7 L10663.75 3194 L26003.75 3378.7655644536294 L26003.8 3378.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9916.3 2702.9 L9910.9 2712.2 L9905.6 2702.8 L9911.0 2693.5 Z"></path>
+						<path d="M10672.8 2703.4 L10667.4 2712.7 L10662.1 2703.3 L10667.5 2694.0 Z"></path>
 					</g>
-					<path d="M9987.3 2710.1 L10238.5 3194 L15898 3378.785845588235 L15898.0 3378.8 " fill="none"></path>
+					<path d="M10676.8 2712.6 L10703.75 3194 L13551 3377.123415811708 L13551.0 3377.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9987.7 2699.3 L9987.3 2710.1 L9978.3 2704.2 L9978.7 2693.5 Z"></path>
+						<path d="M10681.6 2703.0 L10676.8 2712.6 L10670.9 2703.6 L10675.7 2694.0 Z"></path>
 					</g>
-					<path d="M10041.8 2707.3 L10486 3194 L9774.49329758713 3365 L9774.5 3365.0 " fill="none"></path>
+					<path d="M10698.4 2712.3 L10796 3194 L11254.445040214478 3365 L11254.4 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10039.5 2696.8 L10041.8 2707.3 L10031.6 2704.0 L10029.3 2693.5 Z"></path>
+						<path d="M10701.7 2702.1 L10698.4 2712.3 L10691.3 2704.2 L10694.6 2694.0 Z"></path>
 					</g>
-					<path d="M30743.7 202.5 L30644 293 L30644 614 L30644.0 614.0 " fill="none"></path>
+					<path d="M26309.1 3317.0 L26321.75 3312 L26329.25 3312 L26329.25 3312 L26336.75 3380.5 L26336.75 3380.5 L26329.25 3449 L26329.25 3449 L26321.75 3449 L26321.75 3449 L26291.75 3437.189655172414 L26291.8 3437.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30754.2 200.2 L30743.7 202.5 L30747.0 192.3 L30757.5 190.0 Z"></path>
+						<path d="M26298.5 3315.4 L26309.1 3317.0 L26302.4 3325.4 L26291.8 3323.8 Z"></path>
 					</g>
-					<path d="M30918.3 199.9 L31068 293 L31068 614 L31068.0 614.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M30913.2 190.4 L30918.3 199.9 L30907.6 199.5 L30902.5 190.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3062.0 2578.5 L1096 3194 L26003.75 3379.4279790832975 L26003.8 3379.4 " fill="none"></path>
 					</g>
-					<path d="M5038.3 3788.7 L5038.25 3880 L9895.5 4012.0427042653546 L9895.5 4012.0 " fill="none"></path>
+					<path d="M3063.6 2583.6 L3062.0 2578.5 L3060.4 2573.4 L3074.8 2574.5 Z"></path>
+					<path d="M10932.1 2719.8 L10836 3194 L21264.5 3379.8672830657492 L21264.5 3379.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5043.6 3779.3 L5038.3 3788.7 L5032.9 3779.3 L5038.3 3770.0 Z"></path>
+						<path d="M10939.2 2711.7 L10932.1 2719.8 L10928.7 2709.6 L10935.8 2701.5 Z"></path>
 					</g>
-					<path d="M39073.8 2614.7 L39073.75 3194 L20000 3379.6919558380205 L20000.0 3379.7 " fill="none"></path>
+					<path d="M10960.1 2720.2 L10949.75 3194 L21675 3379.99708254876 L21675.0 3380.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39079.1 2605.3 L39073.8 2614.7 L39068.4 2605.3 L39073.8 2596.0 Z"></path>
+						<path d="M10965.6 2710.9 L10960.1 2720.2 L10955.0 2710.7 L10960.5 2701.5 Z"></path>
 					</g>
-					<path d="M37273.0 1711.4 L39073.75 1936 L39073.75 2534 L39073.8 2534.0 " fill="none"></path>
-					<path d="M37273.6 1706.1 L37273.0 1711.4 L37272.3 1716.7 L37259.8 1709.7 Z"></path>
-					<path d="M39435.3 2614.7 L39435.25 3194 L49267 3378.1031526895754 L49267.0 3378.1 " fill="none"></path>
+					<path d="M10991.5 2719.9 L11077.25 3194 L13551 3376.6241959426025 L13551.0 3376.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39440.6 2605.3 L39435.3 2614.7 L39429.9 2605.3 L39435.3 2596.0 Z"></path>
+						<path d="M10995.1 2709.7 L10991.5 2719.9 L10984.6 2711.6 L10988.2 2701.5 Z"></path>
 					</g>
-					<path d="M37273.0 1709.2 L39435.25 1936 L39435.25 2534 L39435.3 2534.0 " fill="none"></path>
-					<path d="M37273.6 1703.9 L37273.0 1709.2 L37272.5 1714.5 L37259.8 1707.8 Z"></path>
-					<path d="M11097.9 2689.2 L10988 3194 L19048 3379.6821691062937 L19048.0 3379.7 " fill="none"></path>
+					<path d="M11231.0 2644.7 L11231 3194 L42757.25 3380.1781504555784 L42757.3 3380.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11105.1 2681.3 L11097.9 2689.2 L11094.7 2679.0 L11101.9 2671.0 Z"></path>
+						<path d="M11236.3 2635.3 L11231.0 2644.7 L11225.7 2635.3 L11231.0 2626.0 Z"></path>
 					</g>
-					<path d="M11158.6 2689.0 L11295.25 3194 L15898 3378.396729498953 L15898.0 3378.4 " fill="none"></path>
+					<path d="M11502.0 2674.3 L11397.5 3194 L21264.5 3379.831406210553 L21264.5 3379.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11161.3 2678.6 L11158.6 2689.0 L11151.0 2681.4 L11153.7 2671.0 Z"></path>
+						<path d="M11509.1 2666.2 L11502.0 2674.3 L11498.6 2664.1 L11505.7 2656.0 Z"></path>
 					</g>
-					<path d="M11166.3 2688.7 L11335.25 3194 L16941.25 3376.8949532056326 L16941.3 3376.9 " fill="none"></path>
+					<path d="M11520.5 2674.7 L11503.75 3194 L5301.25 3376.1822584455467 L5301.3 3376.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11168.4 2678.2 L11166.3 2688.7 L11158.3 2681.5 L11160.4 2671.0 Z"></path>
+						<path d="M11526.1 2665.5 L11520.5 2674.7 L11515.4 2665.2 L11521.1 2656.0 Z"></path>
 					</g>
-					<path d="M5497.6 3786.1 L5186.5 3880 L9895.5 4011.9820121313533 L9895.5 4012.0 " fill="none"></path>
+					<path d="M11527.4 2674.7 L11543.75 3194 L13551 3375.746389124894 L13551.0 3375.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5508.1 3788.5 L5497.6 3786.1 L5505.0 3778.3 L5515.5 3780.7 Z"></path>
+						<path d="M11532.5 2665.2 L11527.4 2674.7 L11521.8 2665.5 L11526.9 2656.0 Z"></path>
 					</g>
-					<path d="M5497.8 3791.3 L5226.5 3880 L3278.75 4004.656 L3278.8 4004.7 " fill="none"></path>
+					<path d="M11545.9 2674.3 L11650.25 3194 L11841.19235924933 3365 L11841.2 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5508.3 3793.4 L5497.8 3791.3 L5505.0 3783.3 L5515.5 3785.5 Z"></path>
+						<path d="M11549.3 2664.1 L11545.9 2674.3 L11538.9 2666.2 L11542.3 2656.0 Z"></path>
 					</g>
-					<path d="M5531.8 3815.8 L5411.25 3880 L3605.75 4004.1339148281168 L3605.8 4004.1 " fill="none"></path>
+					<path d="M5318.9 3323.8 L5331.25 3319.5 L5338.75 3319.5 L5338.75 3319.5 L5346.25 3380.5 L5346.25 3380.5 L5338.75 3441.5 L5338.75 3441.5 L5331.25 3441.5 L5331.25 3441.5 L5301.25 3431.1610169491523 L5301.3 3431.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5542.5 3816.1 L5531.8 3815.8 L5537.5 3806.7 L5548.3 3807.0 Z"></path>
+						<path d="M5308.3 3321.8 L5318.9 3323.8 L5311.8 3331.8 L5301.3 3329.8 Z"></path>
 					</g>
-					<path d="M5667.1 3824.5 L5646.25 3880 L3919.75 4004.1486450228067 L3919.8 4004.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5675.4 3817.6 L5667.1 3824.5 L5665.4 3813.9 L5673.7 3807.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3095.3 2593.1 L2883.25 3194 L5007.25 3368.428005284016 L5007.3 3368.4 " fill="none"></path>
 					</g>
-					<path d="M5765.2 3823.0 L5799.75 3880 L4139.75 4007.1085714285714 L4139.8 4007.1 " fill="none"></path>
+					<path d="M3100.4 2594.8 L3095.3 2593.1 L3090.3 2591.3 L3099.8 2580.5 Z"></path>
+					<path d="M29630.6 175.9 L28920.5 293 L28920.5 614 L28920.5 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5764.9 3812.2 L5765.2 3823.0 L5755.8 3817.7 L5755.6 3807.0 Z"></path>
+						<path d="M29640.7 179.6 L29630.6 175.9 L29638.9 169.1 L29649.0 172.9 Z"></path>
 					</g>
-					<path d="M11524.2 2659.5 L11375.25 3194 L25103.25 3379.56729723853 L25103.3 3379.6 " fill="none"></path>
+					<path d="M29869.5 208.7 L29869.5 293 L29869.5 614 L29869.5 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11531.8 2651.9 L11524.2 2659.5 L11521.5 2649.1 L11529.2 2641.5 Z"></path>
+						<path d="M29874.8 199.3 L29869.5 208.7 L29864.2 199.3 L29869.5 190.0 Z"></path>
 					</g>
-					<path d="M11574.5 2659.6 L11710 3194 L10371.75 3374.4980112095463 L10371.8 3374.5 " fill="none"></path>
+					<path d="M56441.6 1755.8 L56087.5 1936 L37118.75 2560.114020060417 L37118.8 2560.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11577.4 2649.2 L11574.5 2659.6 L11567.0 2651.9 L11569.9 2641.5 Z"></path>
+						<path d="M56452.4 1756.3 L56441.6 1755.8 L56447.5 1746.8 L56458.3 1747.4 Z"></path>
 					</g>
-					<path d="M11580.4 2659.3 L11750 3194 L12497.723860589813 3365 L12497.7 3365.0 " fill="none"></path>
+					<path d="M12145.3 2711.2 L11985.25 3194 L12047.369302949062 3365 L12047.4 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11582.7 2648.8 L11580.4 2659.3 L11572.5 2652.0 L11574.8 2641.5 Z"></path>
+						<path d="M12153.3 2704.0 L12145.3 2711.2 L12143.2 2700.7 L12151.2 2693.5 Z"></path>
 					</g>
-					<path d="M11926.0 2674.1 L11790 3194 L19048 3379.5922396654555 L19048.0 3379.6 " fill="none"></path>
+					<path d="M12168.1 2711.9 L12084 3194 L21675 3379.937785862786 L21675.0 3379.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11933.5 2666.4 L11926.0 2674.1 L11923.2 2663.7 L11930.7 2656.0 Z"></path>
+						<path d="M12175.0 2703.6 L12168.1 2711.9 L12164.5 2701.8 L12171.3 2693.5 Z"></path>
 					</g>
-					<path d="M11932.9 2674.3 L11830 3194 L6624.5 3375.378000934143 L6624.5 3375.4 " fill="none"></path>
+					<path d="M12191.2 2712.2 L12182.75 3194 L12244.869302949062 3365 L12244.9 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11939.9 2666.2 L11932.9 2674.3 L11929.4 2664.1 L11936.5 2656.0 Z"></path>
+						<path d="M12196.7 2702.9 L12191.2 2712.2 L12186.0 2702.7 L12191.5 2693.5 Z"></path>
 					</g>
-					<path d="M11961.0 2674.6 L11992 3194 L15898 3378.026525198939 L15898.0 3378.0 " fill="none"></path>
+					<path d="M12216.8 2711.9 L12292.5 3194 L13551 3373.0314645308927 L13551.0 3373.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11965.8 2665.0 L11961.0 2674.6 L11955.2 2665.6 L11959.9 2656.0 Z"></path>
+						<path d="M12220.6 2701.9 L12216.8 2711.9 L12210.1 2703.5 L12213.9 2693.5 Z"></path>
 					</g>
-					<path d="M11968.0 2674.5 L12032 3194 L11656.075067024129 3365 L11656.1 3365.0 " fill="none"></path>
+					<path d="M12242.2 2711.2 L12402.25 3194 L12464.369302949062 3365 L12464.4 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11972.1 2664.6 L11968.0 2674.5 L11961.6 2665.9 L11965.7 2656.0 Z"></path>
+						<path d="M12244.3 2700.7 L12242.2 2711.2 L12234.2 2704.0 L12236.3 2693.5 Z"></path>
 					</g>
-					<path d="M6642.1 3323.8 L6654.5 3319.5 L6662 3319.5 L6662 3319.5 L6669.5 3380.5 L6669.5 3380.5 L6662 3441.5 L6662 3441.5 L6654.5 3441.5 L6654.5 3441.5 L6624.5 3431.1610169491523 L6624.5 3431.2 " fill="none"></path>
+					<path d="M56576.3 2614.7 L56576.25 3194 L51838.25 3375.594122482532 L51838.3 3375.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6631.6 3321.8 L6642.1 3323.8 L6635.1 3331.8 L6624.5 3329.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1637.7 2582.6 L146.75 3194 L6330.5 3376.1694704418906 L6330.5 3376.2 " fill="none"></path>
+						<path d="M56581.6 2605.3 L56576.3 2614.7 L56570.9 2605.3 L56576.3 2596.0 Z"></path>
 					</g>
-					<path d="M1639.7 2587.5 L1637.7 2582.6 L1635.6 2577.6 L1650.0 2577.5 Z"></path>
-					<path d="M13003.5 2646.2 L12369.75 3194 L21383 3379.6042316504263 L21383.0 3379.6 " fill="none"></path>
+					<path d="M56561.9 1764.3 L56576.25 1936 L56576.25 2534 L56576.3 2534.0 " fill="none"></path>
+					<path d="M56567.2 1763.8 L56561.9 1764.3 L56556.5 1764.7 L56560.7 1751.0 Z"></path>
+					<path d="M12958.2 2688.2 L12748.5 3194 L21264.5 3379.7257791030815 L21264.5 3379.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13014.1 2644.1 L13003.5 2646.2 L13007.1 2636.1 L13017.7 2634.0 Z"></path>
+						<path d="M12966.7 2681.7 L12958.2 2688.2 L12956.8 2677.6 L12965.3 2671.0 Z"></path>
 					</g>
-					<path d="M13100.3 2652.7 L13117.5 3194 L13117.5 3380.5 L13117.5 3380.5 L13117.5 3567 L13117.5 3567 L13117.5 3723.5 L13117.5 3723.5 L13117.5 3880 L13117.5 3880 L10039.5 4010.937142857143 L10039.5 4010.9 " fill="none"></path>
+					<path d="M13028.4 2689.4 L13106.25 3194 L13562.173592493298 3365 L13562.2 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13105.3 2643.2 L13100.3 2652.7 L13094.7 2643.5 L13099.7 2634.0 Z"></path>
+						<path d="M13032.3 2679.4 L13028.4 2689.4 L13021.7 2681.0 L13025.6 2671.0 Z"></path>
 					</g>
-					<path d="M3533.5 2660.2 L3533.5 3194 L21383 3380.04659643436 L21383.0 3380.0 " fill="none"></path>
+					<path d="M13036.3 2689.2 L13146.25 3194 L18868 3376.9665009215996 L18868.0 3377.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3538.8 2650.8 L3533.5 2660.2 L3528.2 2650.8 L3533.5 2641.5 Z"></path>
+						<path d="M13039.5 2679.0 L13036.3 2689.2 L13029.1 2681.3 L13032.3 2671.0 Z"></path>
 					</g>
-					<path d="M1829.2 1719.0 L1396.25 1936 L3401.5 2526.15194759621 L3401.5 2526.2 " fill="none"></path>
-					<path d="M1831.6 1723.7 L1829.2 1719.0 L1826.8 1714.2 L1841.1 1713.0 Z"></path>
-					<path d="M31598.5 165.3 L31598.5 293 L31598.5 614 L31598.5 614.0 " fill="none"></path>
-					<path d="M31603.8 165.3 L31598.5 165.3 L31593.2 165.3 L31598.5 152.0 Z"></path>
-					<path d="M3721.2 1800.0 L3533.5 1936 L3533.5 2488.5 L3533.5 2488.5 " fill="none"></path>
+					<path d="M56937.8 2614.7 L56937.75 3194 L28928 3379.948985948332 L28928.0 3379.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3731.9 1798.8 L3721.2 1800.0 L3725.6 1790.2 L3736.3 1789.0 Z"></path>
+						<path d="M56943.1 2605.3 L56937.8 2614.7 L56932.4 2605.3 L56937.8 2596.0 Z"></path>
 					</g>
-					<path d="M3820.3 1806.4 L3770 1936 L3995.7953100158984 2549.5 L3995.8 2549.5 " fill="none"></path>
+					<path d="M56653.1 1758.1 L56937.75 1936 L56937.75 2534 L56937.8 2534.0 " fill="none"></path>
+					<path d="M56656.0 1753.5 L56653.1 1758.1 L56650.3 1762.6 L56641.8 1751.0 Z"></path>
+					<path d="M13560.3 2667.4 L13470.5 3194 L27437 3379.920931477516 L27437.0 3379.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3828.6 1799.6 L3820.3 1806.4 L3818.7 1795.8 L3827.0 1789.0 Z"></path>
+						<path d="M13567.1 2659.1 L13560.3 2667.4 L13556.6 2657.3 L13563.4 2649.0 Z"></path>
 					</g>
-					<path d="M3990.1 1800.7 L4157.25 1936 L3768.3261128775835 2549.5 L3768.3 2549.5 " fill="none"></path>
+					<path d="M13595.3 2667.4 L13685.25 3194 L21264.5 3379.6305361305363 L21264.5 3379.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3986.2 1790.7 L3990.1 1800.7 L3979.5 1799.0 L3975.6 1789.0 Z"></path>
+						<path d="M13598.9 2657.3 L13595.3 2667.4 L13588.4 2659.1 L13592.1 2649.0 Z"></path>
 					</g>
-					<path d="M4349.2 1804.5 L4261.25 1936 L3622.010135135135 2488.5 L3622.0 2488.5 " fill="none"></path>
+					<path d="M30453.0 717.2 L30453 966 L30453 1197 L30453.0 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4358.8 1799.7 L4349.2 1804.5 L4349.9 1793.8 L4359.6 1789.0 Z"></path>
+						<path d="M30458.3 707.8 L30453.0 717.2 L30447.7 707.8 L30453.0 698.5 Z"></path>
 					</g>
-					<path d="M4395.2 1807.2 L4365.25 1936 L4010.4636327503977 2549.5 L4010.5 2549.5 " fill="none"></path>
+					<path d="M30453.0 165.3 L30453 293 L30453 560.5 L30453.0 560.5 " fill="none"></path>
+					<path d="M30458.3 165.3 L30453.0 165.3 L30447.7 165.3 L30453.0 152.0 Z"></path>
+					<path d="M15575.5 3818.7 L15499.75 3880 L17849.5 4010.0161040569837 L17849.5 4010.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4402.5 1799.3 L4395.2 1807.2 L4392.1 1796.9 L4399.5 1789.0 Z"></path>
+						<path d="M15586.1 3817.0 L15575.5 3818.7 L15579.4 3808.7 L15590.0 3807.0 Z"></path>
 					</g>
-					<path d="M4598.9 1711.9 L7378.5 1936 L3811.5 2555.7908839779006 L3811.5 2555.8 " fill="none"></path>
+					<path d="M15598.3 3820.3 L15539.75 3880 L7800.75 4011.5188332276475 L7800.8 4011.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4590.0 1705.8 L4598.9 1711.9 L4589.1 1716.4 L4580.3 1710.4 Z"></path>
+						<path d="M15608.6 3817.4 L15598.3 3820.3 L15601.0 3809.9 L15611.4 3807.0 Z"></path>
 					</g>
-					<path d="M7578.0 1777.7 L7578 1936 L4089.633147853736 2549.5 L4089.6 2549.5 " fill="none"></path>
+					<path d="M15713.6 3825.3 L15724.5 3880 L8127.75 4011.515713316753 L8127.8 4011.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7583.3 1768.3 L7578.0 1777.7 L7572.7 1768.3 L7578.0 1759.0 Z"></path>
+						<path d="M15717.0 3815.1 L15713.6 3825.3 L15706.5 3817.2 L15709.9 3807.0 Z"></path>
 					</g>
-					<path d="M15608.5 2682.4 L15523.5 3194 L11886.5 3377.0770580296894 L11886.5 3377.1 " fill="none"></path>
+					<path d="M15739.0 3824.0 L15764.5 3880 L15602.004664179105 3998.5 L15602.0 3998.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15615.3 2674.1 L15608.5 2682.4 L15604.8 2672.3 L15611.6 2664.0 Z"></path>
+						<path d="M15740.0 3813.3 L15739.0 3824.0 L15730.3 3817.7 L15731.3 3807.0 Z"></path>
 					</g>
-					<path d="M15637.9 2682.6 L15681 3194 L19048 3378.554151359295 L19048.0 3378.6 " fill="none"></path>
+					<path d="M15828.5 3817.7 L15918 3880 L15855.875932835821 3998.5 L15855.9 3998.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15642.4 2672.9 L15637.9 2682.6 L15631.8 2673.7 L15636.3 2664.0 Z"></path>
+						<path d="M15823.9 3808.0 L15828.5 3817.7 L15817.8 3816.7 L15813.2 3807.0 Z"></path>
 					</g>
-					<path d="M15657.3 2682.1 L15785.5 3194 L15936.786863270778 3365 L15936.8 3365.0 " fill="none"></path>
+					<path d="M34458.3 165.3 L34458.25 293 L34458.25 614 L34458.3 614.0 " fill="none"></path>
+					<path d="M34463.6 165.3 L34458.3 165.3 L34452.9 165.3 L34458.3 152.0 Z"></path>
+					<path d="M13832.8 2652.7 L13832.75 3194 L11340.5 3377.228392628363 L11340.5 3377.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15660.2 2671.8 L15657.3 2682.1 L15649.9 2674.3 L15652.8 2664.0 Z"></path>
+						<path d="M13838.1 2643.3 L13832.8 2652.7 L13827.4 2643.3 L13832.8 2634.0 Z"></path>
 					</g>
-					<path d="M13601.5 3315.4 L13613.5 3312 L13621 3312 L13621 3312 L13628.5 3380.5 L13628.5 3380.5 L13621 3449 L13621 3449 L13613.5 3449 L13613.5 3449 L13583.5 3440.543209876543 L13583.5 3440.5 " fill="none"></path>
+					<path d="M34854.8 165.3 L34854.75 293 L34854.75 614 L34854.8 614.0 " fill="none"></path>
+					<path d="M34860.1 165.3 L34854.8 165.3 L34849.4 165.3 L34854.8 152.0 Z"></path>
+					<path d="M9187.0 3330.3 L9199 3327 L9206.5 3327 L9206.5 3327 L9214 3380.5 L9214 3380.5 L9206.5 3434 L9206.5 3434 L9199 3434 L9199 3434 L9169 3425.769230769231 L9169.0 3425.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13591.0 3312.8 L13601.5 3315.4 L13593.9 3323.1 L13583.5 3320.5 Z"></path>
+						<path d="M9176.6 3327.6 L9187.0 3330.3 L9179.4 3337.9 L9169.0 3335.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M1637.7 2583.0 L186.75 3194 L13157.5 3377.486858822414 L13157.5 3377.5 " fill="none"></path>
+						<path d="M3097.1 2593.3 L2923.25 3194 L8839 3375.439357809481 L8839.0 3375.4 " fill="none"></path>
 					</g>
-					<path d="M1639.8 2587.9 L1637.7 2583.0 L1635.6 2578.1 L1650.0 2577.8 Z"></path>
-					<path d="M15983.0 2652.2 L15983 3194 L19048 3378.3646186099018 L19048.0 3378.4 " fill="none"></path>
+					<path d="M3102.2 2594.8 L3097.1 2593.3 L3091.9 2591.8 L3100.8 2580.5 Z"></path>
+					<path d="M14125.8 2637.7 L14125.75 3194 L11947 3373.2201455507775 L11947.0 3373.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15988.3 2642.8 L15983.0 2652.2 L15977.7 2642.8 L15983.0 2633.5 Z"></path>
+						<path d="M14131.1 2628.3 L14125.8 2637.7 L14120.4 2628.3 L14125.8 2619.0 Z"></path>
 					</g>
-					<path d="M16224.2 2719.9 L16137.75 3194 L19048 3378.252439955869 L19048.0 3378.3 " fill="none"></path>
+					<path d="M31778.7 1213.7 L13596 1459 L13596 1651 L13596.0 1651.0 " fill="none"></path>
+					<path d="M31778.7 1219.0 L31778.7 1213.7 L31778.6 1208.4 L31792.0 1213.5 Z"></path>
+					<path d="M16106.3 3788.7 L16106.25 3880 L17849.5 4008.6850296102466 L17849.5 4008.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16231.2 2711.6 L16224.2 2719.9 L16220.7 2709.7 L16227.6 2701.5 Z"></path>
+						<path d="M16111.6 3779.3 L16106.3 3788.7 L16100.9 3779.3 L16106.3 3770.0 Z"></path>
 					</g>
-					<path d="M16257.8 2720.2 L16274 3194 L26630.25 3379.9792133073347 L26630.3 3380.0 " fill="none"></path>
+					<path d="M14490.5 2682.0 L14344.75 3194 L13048 3371.2074555779445 L13048.0 3371.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16262.8 2710.6 L16257.8 2720.2 L16252.2 2711.0 L16257.2 2701.5 Z"></path>
+						<path d="M14498.2 2674.4 L14490.5 2682.0 L14487.9 2671.5 L14495.6 2664.0 Z"></path>
 					</g>
-					<path d="M16286.0 2719.7 L16388.75 3194 L15986.922922252012 3365 L15986.9 3365.0 " fill="none"></path>
+					<path d="M14595.9 2679.8 L14919.25 3194 L21264.5 3379.4623868667477 L21264.5 3379.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16289.3 2709.5 L16286.0 2719.7 L16278.8 2711.8 L16282.1 2701.5 Z"></path>
+						<path d="M14595.5 2669.1 L14595.9 2679.8 L14586.5 2674.7 L14586.0 2664.0 Z"></path>
 					</g>
-					<path d="M16565.0 2637.7 L16565 3194 L11710.5 3377.1608840784947 L11710.5 3377.2 " fill="none"></path>
+					<path d="M14626.8 2677.8 L15098.25 3194 L13656 3373.9495735072755 L13656.0 3373.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16570.3 2628.3 L16565.0 2637.7 L16559.7 2628.3 L16565.0 2619.0 Z"></path>
+						<path d="M14624.4 2667.3 L14626.8 2677.8 L14616.5 2674.5 L14614.2 2664.0 Z"></path>
 					</g>
-					<path d="M20196.6 2651.5 L20047 3194 L20859.82305630027 3365 L20859.8 3365.0 " fill="none"></path>
+					<path d="M24594.7 3315.4 L24606.75 3312 L24614.25 3312 L24614.25 3312 L24621.75 3380.5 L24621.75 3380.5 L24614.25 3449 L24614.25 3449 L24606.75 3449 L24606.75 3449 L24576.75 3440.543209876543 L24576.8 3440.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20204.3 2643.9 L20196.6 2651.5 L20194.0 2641.1 L20201.6 2633.5 Z"></path>
+						<path d="M24584.3 3312.8 L24594.7 3315.4 L24587.2 3323.1 L24576.8 3320.5 Z"></path>
 					</g>
-					<path d="M20230.4 2652.0 L20292.25 3194 L19119 3375.022647362978 L19119.0 3375.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20234.7 2642.2 L20230.4 2652.0 L20224.1 2643.4 L20228.3 2633.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3098.8 2593.5 L2963.25 3194 L24150.75 3378.6437583234037 L24150.8 3378.6 " fill="none"></path>
 					</g>
-					<path d="M18008.9 1726.4 L15379 1936 L15379 2565 L15379 2565 L15379 3194 L15379 3194 L24063.25 3378.966466809422 L24063.3 3379.0 " fill="none"></path>
+					<path d="M3104.0 2594.7 L3098.8 2593.5 L3093.6 2592.3 L3101.8 2580.5 Z"></path>
+					<path d="M15266.7 2689.1 L15138.25 3194 L15138.25 3380.5 L15138.25 3380.5 L15138.25 3567 L15138.25 3567 L15138.25 3723.5 L15138.25 3723.5 L15138.25 3880 L15138.25 3880 L17849.5 4010.53354890865 L17849.5 4010.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18018.6 1731.0 L18008.9 1726.4 L18017.8 1720.3 L18027.5 1724.9 Z"></path>
+						<path d="M15274.2 2681.4 L15266.7 2689.1 L15263.8 2678.7 L15271.3 2671.0 Z"></path>
 					</g>
-					<path d="M18009.1 1758.1 L16944.5 1936 L16944.5 2549.5 L16944.5 2549.5 " fill="none"></path>
+					<path d="M15426.4 2620.3 L16755.25 3194 L21675 3379.4070977519577 L21675.0 3379.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18019.2 1761.8 L18009.1 1758.1 L18017.4 1751.3 L18027.5 1755.0 Z"></path>
+						<path d="M15419.9 2611.7 L15426.4 2620.3 L15415.7 2621.5 L15409.3 2612.9 Z"></path>
 					</g>
-					<path d="M18009.2 1769.7 L17175 1936 L17175 2565 L17175 2565 L17175 3194 L17175 3194 L7674.5 3377.31625368579 L7674.5 3377.3 " fill="none"></path>
+					<path d="M15426.5 2618.9 L16795.25 3194 L11340.5 3378.9908396599535 L11340.5 3379.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18019.4 1773.1 L18009.2 1769.7 L18017.3 1762.7 L18027.5 1766.1 Z"></path>
+						<path d="M15419.9 2610.3 L15426.5 2618.9 L15415.8 2620.2 L15409.3 2611.6 Z"></path>
 					</g>
-					<path d="M18009.3 1777.8 L17295 1936 L17295 2549.5 L17295.0 2549.5 " fill="none"></path>
+					<path d="M15426.7 2614.3 L16935.25 3194 L27437 3379.7306725777007 L27437.0 3379.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18019.5 1780.9 L18009.3 1777.8 L18017.2 1770.5 L18027.5 1773.7 Z"></path>
+						<path d="M15419.9 2606.0 L15426.7 2614.3 L15416.0 2616.0 L15409.3 2607.7 Z"></path>
 					</g>
-					<path d="M18009.8 1821.6 L17676.5 1936 L17676.5 2549.5 L17676.5 2549.5 " fill="none"></path>
+					<path d="M21446.5 2652.2 L21429.25 3194 L26381.75 3377.4441410129098 L26381.8 3377.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18020.4 1823.6 L18009.8 1821.6 L18016.9 1813.5 L18027.5 1815.5 Z"></path>
+						<path d="M21452.1 2643.0 L21446.5 2652.2 L21441.4 2642.7 L21447.1 2633.5 Z"></path>
 					</g>
-					<path d="M18734.0 1744.3 L20220.5 1936 L20220.5 2496.5 L20220.5 2496.5 " fill="none"></path>
+					<path d="M21459.2 2652.0 L21521 3194 L21318.3672922252 3365 L21318.4 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18725.4 1737.8 L18734.0 1744.3 L18724.1 1748.4 L18715.5 1741.9 Z"></path>
+						<path d="M21463.4 2642.2 L21459.2 2652.0 L21452.8 2643.4 L21457.1 2633.5 Z"></path>
 					</g>
-					<path d="M18734.0 1740.0 L20404 1936 L20404 2565 L20404 2565 L20404 3194 L20404 3194 L17162.25 3374.352412558729 L17162.3 3374.4 " fill="none"></path>
+					<path d="M19862.3 1746.5 L18460.5 1936 L18460.5 2565 L18460.5 2565 L18460.5 3194 L18460.5 3194 L28578 3379.182172824967 L28578.0 3379.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18725.4 1733.7 L18734.0 1740.0 L18724.1 1744.3 L18715.5 1737.9 Z"></path>
+						<path d="M19872.2 1750.5 L19862.3 1746.5 L19870.8 1740.0 L19880.8 1744.0 Z"></path>
 					</g>
-					<path d="M18734.1 1738.2 L20494.75 1936 L20494.75 2565 L20494.75 2565 L20494.75 3194 L20494.75 3194 L19119 3375.808591674048 L19119.0 3375.8 " fill="none"></path>
+					<path d="M19862.3 1753.9 L18691 1936 L18691 2549.5 L18691.0 2549.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18725.4 1731.9 L18734.1 1738.2 L18724.2 1742.5 L18715.5 1736.1 Z"></path>
+						<path d="M19872.3 1757.7 L19862.3 1753.9 L19870.7 1747.2 L19880.8 1751.0 Z"></path>
 					</g>
-					<path d="M18734.1 1725.9 L21414.75 1936 L21414.75 2565 L21414.75 2565 L21414.75 3194 L21414.75 3194 L9532 3377.7703733648445 L9532.0 3377.8 " fill="none"></path>
+					<path d="M19862.4 1763.8 L18921.5 1936 L18921.5 2565 L18921.5 2565 L18921.5 3194 L18921.5 3194 L9169 3377.397151499874 L9169.0 3377.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18725.2 1719.9 L18734.1 1725.9 L18724.4 1730.5 L18715.5 1724.5 Z"></path>
+						<path d="M19872.5 1767.4 L19862.4 1763.8 L19870.6 1756.9 L19880.8 1760.5 Z"></path>
 					</g>
-					<path d="M9550.1 3330.1 L9562 3327 L9569.5 3327 L9569.5 3327 L9577 3380.5 L9577 3380.5 L9569.5 3434 L9569.5 3434 L9562 3434 L9562 3434 L9532 3426.227602905569 L9532.0 3426.2 " fill="none"></path>
+					<path d="M19862.5 1770.5 L19041.5 1936 L19041.5 2549.5 L19041.5 2549.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9539.7 3327.3 L9550.1 3330.1 L9542.4 3337.6 L9532.0 3334.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1637.8 2583.5 L226.75 3194 L9179 3376.8941120087634 L9179.0 3376.9 " fill="none"></path>
+						<path d="M19872.7 1773.9 L19862.5 1770.5 L19870.5 1763.5 L19880.8 1766.8 Z"></path>
 					</g>
-					<path d="M1639.9 2588.4 L1637.8 2583.5 L1635.6 2578.6 L1650.0 2578.2 Z"></path>
-					<path d="M18031.5 2738.4 L17688.5 3194 L17302.260053619302 3365 L17302.3 3365.0 " fill="none"></path>
+					<path d="M19862.9 1805.2 L19423 1936 L19423 2549.5 L19423.0 2549.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18041.3 2734.2 L18031.5 2738.4 L18032.8 2727.7 L18042.7 2723.5 Z"></path>
+						<path d="M19873.3 1807.6 L19862.9 1805.2 L19870.3 1797.4 L19880.8 1799.8 Z"></path>
 					</g>
-					<path d="M18059.4 2739.6 L17792.5 3194 L16003 3375.1844462540716 L16003.0 3375.2 " fill="none"></path>
+					<path d="M20587.1 1768.1 L21449.25 1936 L21449.25 2496.5 L21449.3 2496.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18068.8 2734.2 L18059.4 2739.6 L18059.6 2728.8 L18068.9 2723.5 Z"></path>
+						<path d="M20578.9 1761.1 L20587.1 1768.1 L20576.9 1771.5 L20568.8 1764.5 Z"></path>
 					</g>
-					<path d="M18070.3 2740.0 L17832.5 3194 L19048 3375.2076338928855 L19048.0 3375.2 " fill="none"></path>
+					<path d="M20587.2 1758.9 L21632.75 1936 L21632.75 2565 L21632.75 2565 L21632.75 3194 L21632.75 3194 L19089 3372.735753979467 L19089.0 3372.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18079.4 2734.2 L18070.3 2740.0 L18069.9 2729.3 L18079.0 2723.5 Z"></path>
+						<path d="M20578.8 1752.1 L20587.2 1758.9 L20577.1 1762.6 L20568.8 1755.8 Z"></path>
 					</g>
-					<path d="M18081.2 2740.5 L17872.5 3194 L11886.5 3378.4051866534523 L11886.5 3378.4 " fill="none"></path>
+					<path d="M20587.2 1757.2 L21672.75 1936 L21672.75 2565 L21672.75 2565 L21672.75 3194 L21672.75 3194 L21330.97922252011 3365 L21331.0 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18090.0 2734.2 L18081.2 2740.5 L18080.3 2729.7 L18089.0 2723.5 Z"></path>
+						<path d="M20578.8 1750.4 L20587.2 1757.2 L20577.1 1760.9 L20568.8 1754.2 Z"></path>
 					</g>
-					<path d="M18202.5 2741.7 L18306 3194 L26630.25 3379.852527459372 L26630.3 3379.9 " fill="none"></path>
+					<path d="M20587.2 1755.6 L21712.75 1936 L21712.75 2565 L21712.75 2565 L21712.75 3194 L21712.75 3194 L10068 3377.7154171513166 L10068.0 3377.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18205.6 2731.4 L18202.5 2741.7 L18195.2 2733.8 L18198.3 2723.5 Z"></path>
+						<path d="M20578.8 1748.8 L20587.2 1755.6 L20577.1 1759.4 L20568.8 1752.6 Z"></path>
 					</g>
-					<path d="M18490.0 2652.7 L18490 3194 L10371.75 3379.4832776944045 L10371.8 3379.5 " fill="none"></path>
+					<path d="M10086.1 3330.1 L10098 3327 L10105.5 3327 L10105.5 3327 L10113 3380.5 L10113 3380.5 L10105.5 3434 L10105.5 3434 L10098 3434 L10098 3434 L10068 3426.227602905569 L10068.0 3426.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18495.3 2643.3 L18490.0 2652.7 L18484.7 2643.3 L18490.0 2634.0 Z"></path>
+						<path d="M10075.7 3327.3 L10086.1 3330.1 L10078.4 3337.6 L10068.0 3334.8 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M3100.6 2593.7 L3003.25 3194 L9715 3375.721246325264 L9715.0 3375.7 " fill="none"></path>
 					</g>
-					<path d="M26651.2 1213.4 L3240.5 1459 L3240.5 1651 L3240.5 1651.0 " fill="none"></path>
-					<path d="M26651.2 1218.8 L26651.2 1213.4 L26651.1 1208.1 L26664.5 1213.3 Z"></path>
-					<path d="M18737.9 2712.3 L18647.75 3194 L21383 3377.580431848853 L21383.0 3377.6 " fill="none"></path>
+					<path d="M3105.9 2594.5 L3100.6 2593.7 L3095.3 2592.8 L3102.7 2580.5 Z"></path>
+					<path d="M23315.8 2660.2 L23315.75 3194 L27437 3378.5520439402126 L27437.0 3378.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18744.9 2704.2 L18737.9 2712.3 L18734.4 2702.2 L18741.4 2694.0 Z"></path>
+						<path d="M23321.1 2650.8 L23315.8 2660.2 L23310.4 2650.8 L23315.8 2641.5 Z"></path>
 					</g>
-					<path d="M18763.0 2712.7 L18754.75 3194 L26630.25 3379.815769498387 L26630.3 3379.8 " fill="none"></path>
+					<path d="M22585.1 1717.6 L21991.75 1936 L23183.75 2502.2900302114804 L23183.8 2502.3 " fill="none"></path>
+					<path d="M22587.0 1722.6 L22585.1 1717.6 L22583.3 1712.6 L22597.6 1713.0 Z"></path>
+					<path d="M35088.3 165.3 L35088.25 293 L35088.25 614 L35088.3 614.0 " fill="none"></path>
+					<path d="M35093.6 165.3 L35088.3 165.3 L35082.9 165.3 L35088.3 152.0 Z"></path>
+					<path d="M23377.1 1805.9 L23315.75 1936 L23315.75 2488.5 L23315.8 2488.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18768.5 2703.4 L18763.0 2712.7 L18757.8 2703.2 L18763.3 2694.0 Z"></path>
+						<path d="M23385.9 1799.7 L23377.1 1805.9 L23376.3 1795.2 L23385.1 1789.0 Z"></path>
 					</g>
-					<path d="M18772.4 2712.6 L18794.75 3194 L21510 3371.1073270962665 L21510.0 3371.1 " fill="none"></path>
+					<path d="M23449.9 1807.3 L23475.25 1936 L23806.87162162162 2549.5 L23806.9 2549.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18777.3 2703.1 L18772.4 2712.6 L18766.6 2703.6 L18771.5 2694.0 Z"></path>
+						<path d="M23453.3 1797.1 L23449.9 1807.3 L23442.9 1799.2 L23446.3 1789.0 Z"></path>
 					</g>
-					<path d="M18781.7 2712.6 L18834.75 3194 L16003 3377.1052700008668 L16003.0 3377.1 " fill="none"></path>
+					<path d="M23499.8 1804.5 L23587.75 1936 L23587.75 2549.5 L23587.8 2549.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18786.0 2702.7 L18781.7 2712.6 L18775.4 2703.9 L18779.7 2694.0 Z"></path>
+						<path d="M23499.1 1793.8 L23499.8 1804.5 L23490.2 1799.7 L23489.4 1789.0 Z"></path>
 					</g>
-					<path d="M18799.9 2712.2 L18912.5 3194 L10371.75 3379.5333129495357 L10371.8 3379.5 " fill="none"></path>
+					<path d="M23715.7 1804.5 L23627.75 1936 L23353.695945945947 2488.5 L23353.7 2488.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18803.0 2701.9 L18799.9 2712.2 L18792.6 2704.3 L18795.6 2694.0 Z"></path>
+						<path d="M23725.3 1799.7 L23715.7 1804.5 L23716.4 1793.8 L23726.1 1789.0 Z"></path>
 					</g>
-					<path d="M21816.7 3373.6 L23278.166666666668 3312 L23648.208333333332 3312 L23648.208333333332 3312 L24018.25 3380.5 L24018.25 3380.5 L23648.208333333332 3449 L23648.208333333332 3449 L23278.166666666668 3449 L23278.166666666668 3449 L21798 3386.57326834274 L21798.0 3386.6 " fill="none"></path>
+					<path d="M23800.2 1807.5 L23815.25 1936 L23815.25 2549.5 L23815.3 2549.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21807.1 3368.7 L21816.7 3373.6 L21807.5 3379.4 L21798.0 3374.4 Z"></path>
+						<path d="M23804.4 1797.6 L23800.2 1807.5 L23793.8 1798.9 L23798.0 1789.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1637.8 2584.0 L266.75 3194 L21510 3379.2442985891125 L21510.0 3379.2 " fill="none"></path>
+					<path d="M23858.8 1804.5 L23946.75 1936 L23596.596581875994 2549.5 L23596.6 2549.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M23858.1 1793.8 L23858.8 1804.5 L23849.2 1799.7 L23848.4 1789.0 Z"></path>
 					</g>
-					<path d="M1640.0 2588.9 L1637.8 2584.0 L1635.6 2579.1 L1650.0 2578.6 Z"></path>
-					<path d="M31870.0 717.2 L31870 966 L31870 1197 L31870.0 1197.0 " fill="none"></path>
+					<path d="M24146.3 1777.7 L24146.25 1936 L23823.406597774247 2549.5 L23823.4 2549.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31875.3 707.8 L31870.0 717.2 L31864.7 707.8 L31870.0 698.5 Z"></path>
+						<path d="M24151.6 1768.3 L24146.3 1777.7 L24140.9 1768.3 L24146.3 1759.0 Z"></path>
 					</g>
-					<path d="M31870.0 165.3 L31870 293 L31870 560.5 L31870.0 560.5 " fill="none"></path>
-					<path d="M31875.3 165.3 L31870.0 165.3 L31864.7 165.3 L31870.0 152.0 Z"></path>
-					<path d="M19081.0 2644.2 L18952.5 3194 L19072.612600536195 3365 L19072.6 3365.0 " fill="none"></path>
+					<path d="M19789.6 2649.3 L19405.25 3194 L27437 3379.4953561809234 L27437.0 3379.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19088.3 2636.3 L19081.0 2644.2 L19077.9 2633.9 L19085.2 2626.0 Z"></path>
+						<path d="M19799.3 2644.7 L19789.6 2649.3 L19790.6 2638.6 L19800.3 2634.0 Z"></path>
 					</g>
-					<path d="M19118.8 2644.1 L19252.75 3194 L19674.748659517427 3365 L19674.7 3365.0 " fill="none"></path>
+					<path d="M19858.2 2652.6 L19915.25 3194 L19915.25 3380.5 L19915.25 3380.5 L19915.25 3567 L19915.25 3567 L19915.25 3723.5 L19915.25 3723.5 L19915.25 3880 L19915.25 3880 L17993.5 4009.160877742947 L17993.5 4009.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19121.8 2633.8 L19118.8 2644.1 L19111.4 2636.3 L19114.4 2626.0 Z"></path>
+						<path d="M19862.5 2642.7 L19858.2 2652.6 L19851.9 2643.8 L19856.3 2634.0 Z"></path>
 					</g>
-					<path d="M19422.9 2659.6 L19292.75 3194 L19100.89075067024 3365 L19100.9 3365.0 " fill="none"></path>
+					<path d="M20188.7 2742.0 L20131.25 3194 L21375.5 3371.240882184457 L21375.5 3371.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19430.3 2651.8 L19422.9 2659.6 L19420.0 2649.3 L19427.4 2641.5 Z"></path>
+						<path d="M20195.2 2733.4 L20188.7 2742.0 L20184.6 2732.1 L20191.1 2723.5 Z"></path>
 					</g>
-					<path d="M19443.0 2660.2 L19426.5 3194 L21383 3376.443625 L21383.0 3376.4 " fill="none"></path>
+					<path d="M20229.1 2742.1 L20274.75 3194 L13656 3379.032321528949 L13656.0 3379.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19448.7 2651.0 L19443.0 2660.2 L19438.0 2650.7 L19443.6 2641.5 Z"></path>
+						<path d="M20233.5 2732.3 L20229.1 2742.1 L20222.9 2733.3 L20227.3 2723.5 Z"></path>
 					</g>
-					<path d="M19449.1 2660.2 L19466.5 3194 L8395.5 3377.8021542707083 L8395.5 3377.8 " fill="none"></path>
+					<path d="M20240.4 2741.9 L20314.75 3194 L21264.5 3373.7801319462064 L21264.5 3373.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19454.1 2650.7 L19449.1 2660.2 L19443.5 2651.0 L19448.5 2641.5 Z"></path>
+						<path d="M20244.1 2731.8 L20240.4 2741.9 L20233.6 2733.6 L20237.3 2723.5 Z"></path>
 					</g>
-					<path d="M21199.5 3788.2 L21199.5 3880 L21199.5 3998.5 L21199.5 3998.5 " fill="none"></path>
+					<path d="M20251.6 2741.7 L20354.75 3194 L13048 3378.7803484863894 L13048.0 3378.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21204.8 3778.8 L21199.5 3788.2 L21194.2 3778.8 L21199.5 3769.5 Z"></path>
+						<path d="M20254.7 2731.4 L20251.6 2741.7 L20244.3 2733.8 L20247.4 2723.5 Z"></path>
 					</g>
-					<path d="M19454.6 2654.8 L19506.5 3194 L20040 3359.41604322527 L20040.0 3359.4 " fill="none"></path>
-					<path d="M19459.9 2654.3 L19454.6 2654.8 L19449.3 2655.3 L19453.4 2641.5 Z"></path>
-					<path d="M19470.7 2654.4 L19619.75 3194 L20607 3363.035689694744 L20607.0 3363.0 " fill="none"></path>
-					<path d="M19475.8 2652.9 L19470.7 2654.4 L19465.5 2655.8 L19467.1 2641.5 Z"></path>
-					<path d="M8413.3 3323.4 L8425.5 3319.5 L8433 3319.5 L8433 3319.5 L8440.5 3380.5 L8440.5 3380.5 L8433 3441.5 L8433 3441.5 L8425.5 3441.5 L8425.5 3441.5 L8395.5 3431.9935064935066 L8395.5 3432.0 " fill="none"></path>
+					<path d="M20262.7 2741.4 L20394.75 3194 L21675 3376.3690089746037 L21675.0 3376.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8402.8 3321.1 L8413.3 3323.4 L8406.0 3331.3 L8395.5 3329.0 Z"></path>
+						<path d="M20265.2 2731.0 L20262.7 2741.4 L20255.0 2734.0 L20257.5 2723.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M1637.9 2584.5 L306.75 3194 L8070.5 3376.676470588235 L8070.5 3376.7 " fill="none"></path>
-					</g>
-					<path d="M1640.1 2589.4 L1637.9 2584.5 L1635.7 2579.7 L1650.0 2579.0 Z"></path>
-					<path d="M57147.5 3811.2 L57147.5 3880 L66403.75 4012.958595738979 L66403.8 4013.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M57152.8 3801.8 L57147.5 3811.2 L57142.2 3801.8 L57147.5 3792.5 Z"></path>
+						<path d="M35872.6 173.6 L35638.5 293 L35638.5 598.5 L35638.5 598.5 " fill="none"></path>
 					</g>
+					<path d="M35875.0 178.3 L35872.6 173.6 L35870.2 168.8 L35884.5 167.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M57147.5 3447.3 L57147.5 3567 L57147.5 3654.5 L57147.5 3654.5 " fill="none"></path>
+						<path d="M35989.2 176.5 L36117.5 293 L36117.5 598.5 L36117.5 598.5 " fill="none"></path>
 					</g>
-					<path d="M57152.8 3447.3 L57147.5 3447.3 L57142.2 3447.3 L57147.5 3434.0 Z"></path>
-					<path d="M19805.5 2666.5 L19659.75 3194 L20040 3352.207752370329 L20040.0 3352.2 " fill="none"></path>
+					<path d="M35992.8 172.5 L35989.2 176.5 L35985.7 180.4 L35979.4 167.5 Z"></path>
+					<path d="M20927.9 2625.1 L20434.75 3194 L9625 3377.3952718837418 L9625.0 3377.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19813.1 2658.9 L19805.5 2666.5 L19802.8 2656.1 L19810.4 2648.5 Z"></path>
+						<path d="M20938.0 2621.5 L20927.9 2625.1 L20930.0 2614.6 L20940.1 2611.0 Z"></path>
 					</g>
-					<path d="M19861.5 2666.5 L20007 3194 L20607 3353.4017094017095 L20607.0 3353.4 " fill="none"></path>
+					<path d="M20942.4 2627.0 L20598 3194 L21675 3375.6098553345387 L21675.0 3375.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19864.2 2656.1 L19861.5 2666.5 L19853.9 2658.9 L19856.5 2648.5 Z"></path>
+						<path d="M20951.8 2621.7 L20942.4 2627.0 L20942.7 2616.2 L20952.1 2611.0 Z"></path>
 					</g>
-					<path d="M21199.5 3430.2 L21199.5 3567 L21199.5 3677.5 L21199.5 3677.5 " fill="none"></path>
+					<path d="M20996.6 2629.1 L21143.25 3194 L25900.75 3379.273282522447 L25900.8 3379.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21204.8 3420.8 L21199.5 3430.2 L21194.2 3420.8 L21199.5 3411.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M32637.0 180.8 L32637 293 L32637 598.5 L32637.0 598.5 " fill="none"></path>
+						<path d="M20999.4 2618.7 L20996.6 2629.1 L20989.1 2621.4 L20991.9 2611.0 Z"></path>
 					</g>
-					<path d="M32642.3 180.8 L32637.0 180.8 L32631.7 180.8 L32637.0 167.5 Z"></path>
-					<path d="M10528.5 2645.2 L10528.5 3194 L17372.25 3375.785205625779 L17372.3 3375.8 " fill="none"></path>
+					<path d="M9643.1 3330.0 L9655 3327 L9662.5 3327 L9662.5 3327 L9670 3380.5 L9670 3380.5 L9662.5 3434 L9662.5 3434 L9655 3434 L9655 3434 L9625 3426.4647887323945 L9625.0 3426.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10533.8 2635.8 L10528.5 2645.2 L10523.2 2635.8 L10528.5 2626.5 Z"></path>
+						<path d="M9632.8 3327.1 L9643.1 3330.0 L9635.4 3337.4 L9625.0 3334.5 Z"></path>
 					</g>
-					<path d="M12054.1 1715.3 L10528.5 1936 L10528.5 2503.5 L10528.5 2503.5 " fill="none"></path>
-					<path d="M12054.8 1720.5 L12054.1 1715.3 L12053.3 1710.0 L12067.3 1713.3 Z"></path>
-					<path d="M63315.7 2795.7 L62553.5 3194 L62553.5 3380.5 L62553.5 3380.5 L62553.5 3567 L62553.5 3567 L62553.5 3723.5 L62553.5 3723.5 L62553.5 3880 L62553.5 3880 L63587 3997.264182895851 L63587.0 3997.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M63326.4 2796.1 L63315.7 2795.7 L63321.5 2786.7 L63332.3 2787.1 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3102.4 2593.8 L3043.25 3194 L9259 3375.16622387185 L9259.0 3375.2 " fill="none"></path>
 					</g>
-					<path d="M63592.5 2883.1 L63431.5 3194 L63431.5 3380.5 L63431.5 3380.5 L63431.5 3567 L63431.5 3567 L63431.5 3723.5 L63431.5 3723.5 L63431.5 3880 L63431.5 3880 L63431.5 4014 L63431.5 4014 L63431.5 4148 L63431.5 4148 L63431.5 4334.5 L63431.5 4334.5 L63431.5 4521 L63431.5 4521 L63166 4547.9292857142855 L63166.0 4547.9 " fill="none"></path>
+					<path d="M3107.7 2594.3 L3102.4 2593.8 L3097.1 2593.2 L3103.7 2580.5 Z"></path>
+					<path d="M29564.0 1933.7 L29563.25 1936 L36821.75 2552.3894289185905 L36821.8 2552.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63601.6 2877.2 L63592.5 2883.1 L63592.1 2872.3 L63601.1 2866.5 Z"></path>
+						<path d="M29572.0 1926.5 L29564.0 1933.7 L29561.9 1923.2 L29570.0 1916.0 Z"></path>
 					</g>
-					<path d="M63736.9 2885.1 L63717.25 3194 L57345 3374.893432017961 L57345.0 3374.9 " fill="none"></path>
+					<path d="M29603.5 1934.4 L29603.25 1936 L24618.68441971383 2549.5 L24618.7 2549.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63742.8 2876.2 L63736.9 2885.1 L63732.2 2875.5 L63738.1 2866.5 Z"></path>
+						<path d="M29610.3 1926.1 L29603.5 1934.4 L29599.8 1924.3 L29606.6 1916.0 Z"></path>
 					</g>
-					<path d="M63757.3 2885.2 L63757.25 3194 L55987.75 3379.402309513147 L55987.8 3379.4 " fill="none"></path>
+					<path d="M29781.4 1932.1 L29783.75 1936 L24936.222178060412 2549.5 L24936.2 2549.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63762.6 2875.8 L63757.3 2885.2 L63751.9 2875.8 L63757.3 2866.5 Z"></path>
+						<path d="M29781.3 1921.3 L29781.4 1932.1 L29772.1 1926.7 L29772.0 1916.0 Z"></path>
 					</g>
-					<path d="M63896.4 2883.6 L64032 3194 L64690.25 3365.7574326687654 L64690.3 3365.8 " fill="none"></path>
+					<path d="M29944.8 1896.7 L30004.25 1936 L25332.77424483307 2549.5 L25332.8 2549.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63897.6 2872.9 L63896.4 2883.6 L63887.8 2877.2 L63888.9 2866.5 Z"></path>
+						<path d="M29940.0 1887.1 L29944.8 1896.7 L29934.1 1896.0 L29929.3 1886.5 Z"></path>
 					</g>
-					<path d="M63931.8 2882.9 L64102.75 3194 L66253.5 3376.0559968228754 L66253.5 3376.1 " fill="none"></path>
+					<path d="M29946.5 1823.2 L30218.75 1936 L25717.474165341813 2549.5 L25717.5 2549.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63932.0 2872.1 L63931.8 2882.9 L63922.7 2877.2 L63922.9 2866.5 Z"></path>
+						<path d="M29939.9 1814.7 L29946.5 1823.2 L29935.8 1824.5 L29929.3 1816.0 Z"></path>
 					</g>
-					<path d="M63951.8 2882.4 L64142.75 3194 L17727.25 3379.789512373103 L17727.3 3379.8 " fill="none"></path>
+					<path d="M36939.3 2689.6 L36814.25 3194 L45402.25 3379.57084926428 L45402.3 3379.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63951.5 2871.7 L63951.8 2882.4 L63942.4 2877.2 L63942.0 2866.5 Z"></path>
+						<path d="M36946.8 2681.8 L36939.3 2689.6 L36936.4 2679.3 L36943.8 2671.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M66411.2 142.6 L63757.25 293 L63757.25 629.5 L63757.25 629.5 L63757.25 966 L63757.25 966 L63757.25 1212.5 L63757.25 1212.5 L63757.25 1459 L63757.25 1459 L63757.25 1697.5 L63757.25 1697.5 L63757.25 1936 L63757.25 1936 L63757.25 2263.5 L63757.3 2263.5 " fill="none"></path>
+					<path d="M37134.4 2671.3 L37941.25 3194 L13461 3379.0899135475893 L13461.0 3379.1 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M37129.5 2661.8 L37134.4 2671.3 L37123.7 2670.7 L37118.8 2661.2 Z"></path>
 					</g>
-					<path d="M66411.5 147.9 L66411.2 142.6 L66410.9 137.2 L66424.5 141.8 Z"></path>
-					<path d="M17744.6 3302.1 L17757.25 3297 L17764.75 3297 L17764.75 3297 L17772.25 3380.5 L17772.25 3380.5 L17764.75 3464 L17764.75 3464 L17757.25 3464 L17757.25 3464 L17727.25 3451.9277108433735 L17727.3 3451.9 " fill="none"></path>
+					<path d="M22587.8 1717.9 L22031.75 1936 L36821.75 2558.747263781504 L36821.8 2558.7 " fill="none"></path>
+					<path d="M22589.8 1722.8 L22587.8 1717.9 L22585.9 1712.9 L22600.2 1713.0 Z"></path>
+					<path d="M13479.1 3329.9 L13491 3327 L13498.5 3327 L13498.5 3327 L13506 3380.5 L13506 3380.5 L13498.5 3434 L13498.5 3434 L13491 3434 L13491 3434 L13461 3426.5866050808313 L13461.0 3426.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17733.9 3300.6 L17744.6 3302.1 L17737.9 3310.5 L17727.3 3309.1 Z"></path>
+						<path d="M13468.8 3327.0 L13479.1 3329.9 L13471.3 3337.4 L13461.0 3334.4 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M1637.9 2585.1 L346.75 3194 L17372.25 3378.575699005987 L17372.3 3378.6 " fill="none"></path>
+						<path d="M3104.2 2593.8 L3083.25 3194 L13088 3377.0870477124986 L13088.0 3377.1 " fill="none"></path>
 					</g>
-					<path d="M1640.2 2589.9 L1637.9 2585.1 L1635.7 2580.2 L1650.0 2579.4 Z"></path>
-					<path d="M10811.0 2630.2 L10811 3194 L17372.25 3375.5875533296235 L17372.3 3375.6 " fill="none"></path>
+					<path d="M3109.6 2594.0 L3104.2 2593.8 L3098.9 2593.6 L3104.7 2580.5 Z"></path>
+					<path d="M36494.8 193.7 L36494.75 293 L36494.75 614 L36494.8 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10816.3 2620.8 L10811.0 2630.2 L10805.7 2620.8 L10811.0 2611.5 Z"></path>
+						<path d="M36500.1 184.3 L36494.8 193.7 L36489.4 184.3 L36494.8 175.0 Z"></path>
 					</g>
-					<path d="M12054.1 1718.9 L10811 1936 L10811 2518.5 L10811.0 2518.5 " fill="none"></path>
-					<path d="M12055.0 1724.2 L12054.1 1718.9 L12053.2 1713.7 L12067.3 1716.6 Z"></path>
-					<path d="M20695.3 2637.2 L20695.25 3194 L64690.25 3380.2607970216677 L64690.3 3380.3 " fill="none"></path>
+					<path d="M21915.8 2652.7 L21915.75 3194 L67699.5 3380.312807183107 L67699.5 3380.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20700.6 2627.8 L20695.3 2637.2 L20689.9 2627.8 L20695.3 2618.5 Z"></path>
+						<path d="M21921.1 2643.3 L21915.8 2652.7 L21910.4 2643.3 L21915.8 2634.0 Z"></path>
 					</g>
-					<path d="M21110.2 2643.8 L20935.25 3194 L24703.25 3371.996960486322 L24703.3 3372.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21118.1 2636.5 L21110.2 2643.8 L21107.9 2633.3 L21115.9 2626.0 Z"></path>
+					<path d="M54027.2 1728.9 L53337 1936 L53337 2534 L53337.0 2534.0 " fill="none"></path>
+					<path d="M54028.8 1734.0 L54027.2 1728.9 L54025.7 1723.8 L54040.0 1725.1 Z"></path>
+					<path d="M53320.7 2608.5 L53101.5 3194 L55705.5 3370.920218579235 L55705.5 3370.9 " fill="none"></path>
+					<path d="M53325.7 2610.4 L53320.7 2608.5 L53315.7 2606.6 L53325.4 2596.0 Z"></path>
+					<path d="M54050.9 1734.0 L53601.5 1936 L53601.5 2534 L53601.5 2534.0 " fill="none"></path>
+					<path d="M54053.1 1738.8 L54050.9 1734.0 L54048.7 1729.1 L54063.0 1728.5 Z"></path>
+					<path d="M54091.7 1737.9 L53894.5 1936 L40927 2559.066037735849 L40927.0 2559.1 " fill="none"></path>
+					<path d="M54095.5 1741.7 L54091.7 1737.9 L54087.9 1734.2 L54101.1 1728.5 Z"></path>
+					<path d="M40803.5 2609.3 L40803.5 3194 L50832.25 3378.068089555911 L50832.3 3378.1 " fill="none"></path>
+					<path d="M40808.8 2609.3 L40803.5 2609.3 L40798.2 2609.3 L40803.5 2596.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M53349.3 2608.8 L53513.75 3194 L51097.25 3370.805511965477 L51097.3 3370.8 " fill="none"></path>
 					</g>
-					<path d="M21150.4 2644.3 L21255 3194 L64690.25 3380.257718417861 L64690.3 3380.3 " fill="none"></path>
+					<path d="M53354.5 2607.4 L53349.3 2608.8 L53344.2 2610.3 L53345.7 2596.0 Z"></path>
+					<path d="M54097.8 1738.8 L53934.5 1936 L38303.25 2560.346732072836 L38303.3 2560.3 " fill="none"></path>
+					<path d="M54101.9 1742.2 L54097.8 1738.8 L54093.7 1735.4 L54106.3 1728.5 Z"></path>
+					<path d="M38186.8 2609.3 L38186.75 3194 L46410 3377.47673097054 L46410.0 3377.5 " fill="none"></path>
+					<path d="M38192.1 2609.3 L38186.8 2609.3 L38181.4 2609.3 L38186.8 2596.0 Z"></path>
+					<path d="M54201.6 1734.8 L54577.25 1936 L56175.40262321145 2534 L56175.4 2534.0 " fill="none"></path>
+					<path d="M54204.1 1730.1 L54201.6 1734.8 L54199.1 1739.5 L54189.9 1728.5 Z"></path>
+					<path d="M36999.3 679.2 L36999.25 966 L36999.25 1197 L36999.3 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21153.8 2634.2 L21150.4 2644.3 L21143.4 2636.2 L21146.9 2626.0 Z"></path>
+						<path d="M37004.6 669.8 L36999.3 679.2 L36993.9 669.8 L36999.3 660.5 Z"></path>
 					</g>
-					<path d="M13681.8 2630.2 L13681.75 3194 L17372.25 3371.9416365046536 L17372.3 3371.9 " fill="none"></path>
+					<path d="M36999.3 165.3 L36999.25 293 L36999.25 598.5 L36999.3 598.5 " fill="none"></path>
+					<path d="M37004.6 165.3 L36999.3 165.3 L36993.9 165.3 L36999.3 152.0 Z"></path>
+					<path d="M37541.4 161.6 L37415 293 L37415 598.5 L37415.0 598.5 " fill="none"></path>
+					<path d="M37545.2 165.3 L37541.4 161.6 L37537.5 157.9 L37550.6 152.0 Z"></path>
+					<path d="M37594.7 160.5 L37756.5 293 L37756.5 598.5 L37756.5 598.5 " fill="none"></path>
+					<path d="M37598.1 156.3 L37594.7 160.5 L37591.4 164.6 L37584.4 152.0 Z"></path>
+					<path d="M37813.8 1747.2 L37813.75 1936 L35158.25 2539.2175875767425 L35158.3 2539.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13687.1 2620.8 L13681.8 2630.2 L13676.4 2620.8 L13681.8 2611.5 Z"></path>
+						<path d="M37819.1 1737.8 L37813.8 1747.2 L37808.4 1737.8 L37813.8 1728.5 Z"></path>
 					</g>
-					<path d="M12299.4 1716.9 L13681.75 1936 L13681.75 2518.5 L13681.8 2518.5 " fill="none"></path>
-					<path d="M12300.3 1711.7 L12299.4 1716.9 L12298.6 1722.2 L12286.3 1714.9 Z"></path>
-					<path d="M21576.1 2644.6 L21519.5 3194 L19119 3377.7821223316914 L19119.0 3377.8 " fill="none"></path>
+					<path d="M37813.8 1241.3 L37813.75 1459 L37813.75 1666.5 L37813.8 1666.5 " fill="none"></path>
+					<path d="M37819.1 1241.3 L37813.8 1241.3 L37808.4 1241.3 L37813.8 1228.0 Z"></path>
+					<path d="M38084.8 863.1 L37964.25 966 L37964.25 1197 L37964.3 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21582.3 2635.8 L21576.1 2644.6 L21571.7 2634.7 L21578.0 2626.0 Z"></path>
+						<path d="M38095.4 861.1 L38084.8 863.1 L38088.4 853.0 L38099.0 851.0 Z"></path>
 					</g>
-					<path d="M21596.5 2644.4 L21681.25 3194 L17727.25 3372.487474282948 L17727.3 3372.5 " fill="none"></path>
+					<path d="M38632.6 849.5 L38777.75 966 L38777.75 1197 L38777.8 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21600.4 2634.4 L21596.5 2644.4 L21589.8 2636.0 L21593.7 2626.0 Z"></path>
+						<path d="M38628.6 839.5 L38632.6 849.5 L38621.9 847.8 L38618.0 837.8 Z"></path>
 					</g>
-					<path d="M21604.6 2644.1 L21746 3194 L16003 3378.8105426624106 L16003.0 3378.8 " fill="none"></path>
+					<path d="M38634.4 779.4 L38977.75 966 L38977.75 1197 L38977.8 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21607.4 2633.7 L21604.6 2644.1 L21597.1 2636.4 L21599.9 2626.0 Z"></path>
+						<path d="M38628.7 770.3 L38634.4 779.4 L38623.7 779.7 L38618.0 770.5 Z"></path>
 					</g>
-					<path d="M13929.3 2630.2 L13929.25 3194 L17372.25 3371.3565805827925 L17372.3 3371.4 " fill="none"></path>
+					<path d="M38635.6 729.4 L39291.75 966 L39291.75 1197 L39291.8 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13934.6 2620.8 L13929.3 2630.2 L13923.9 2620.8 L13929.3 2611.5 Z"></path>
+						<path d="M38628.6 721.2 L38635.6 729.4 L38625.0 731.3 L38618.0 723.1 Z"></path>
 					</g>
-					<path d="M12299.5 1714.2 L13929.25 1936 L13929.25 2518.5 L13929.3 2518.5 " fill="none"></path>
-					<path d="M12300.2 1708.9 L12299.5 1714.2 L12298.7 1719.5 L12286.3 1712.4 Z"></path>
-					<path d="M61589.5 4429.7 L61589.5 4521 L62997 4554.489443699732 L62997.0 4554.5 " fill="none"></path>
+					<path d="M38358.5 165.3 L38358.5 293 L38358.5 358 L38358.5 358.0 " fill="none"></path>
+					<path d="M38363.8 165.3 L38358.5 165.3 L38353.2 165.3 L38358.5 152.0 Z"></path>
+					<path d="M35034.6 2621.9 L34932.5 3194 L21733 3380.0911479003666 L21733.0 3380.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M61594.8 4420.3 L61589.5 4429.7 L61584.2 4420.3 L61589.5 4411.0 Z"></path>
+						<path d="M35041.5 2613.6 L35034.6 2621.9 L35031.0 2611.8 L35037.9 2603.5 Z"></path>
 					</g>
-					<path d="M544.1 3330.9 L556.25 3327 L563.75 3327 L563.75 3327 L571.25 3380.5 L571.25 3380.5 L563.75 3434 L563.75 3434 L556.25 3434 L556.25 3434 L526.25 3424.5309734513276 L526.3 3424.5 " fill="none"></path>
+					<path d="M35109.9 2614.8 L35866.25 3194 L43925.25 3379.1901798915724 L43925.3 3379.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M533.5 3328.6 L544.1 3330.9 L536.8 3338.7 L526.3 3336.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1638.0 2585.7 L386.75 3194 L386.75 3327 L386.8 3327.0 " fill="none"></path>
+						<path d="M35105.7 2604.9 L35109.9 2614.8 L35099.2 2613.4 L35095.0 2603.5 Z"></path>
 					</g>
-					<path d="M1640.3 2590.5 L1638.0 2585.7 L1635.7 2580.9 L1650.0 2579.8 Z"></path>
-					<path d="M27937.7 1703.1 L23986 1936 L23986 2526.5 L23986.0 2526.5 " fill="none"></path>
-					<path d="M27938.0 1708.4 L27937.7 1703.1 L27937.4 1697.8 L27951.0 1702.3 Z"></path>
-					<path d="M54183.9 633.9 L32547 966 L32547 1181.5 L32547.0 1181.5 " fill="none"></path>
-					<path d="M54184.0 639.2 L54183.9 633.9 L54183.8 628.6 L54197.3 633.7 Z"></path>
-					<path d="M22966.3 2651.2 L22738.25 3194 L30816.75 3379.1933194026183 L30816.8 3379.2 " fill="none"></path>
+					<path d="M24034.3 2645.2 L24034.25 3194 L21733 3378.17900439867 L21733.0 3378.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22974.8 2644.7 L22966.3 2651.2 L22965.0 2640.5 L22973.5 2634.0 Z"></path>
+						<path d="M24039.6 2635.8 L24034.3 2645.2 L24028.9 2635.8 L24034.3 2626.5 Z"></path>
 					</g>
-					<path d="M23018.9 2652.3 L23120.5 3194 L21798 3362.1870098874874 L21798.0 3362.2 " fill="none"></path>
+					<path d="M16368.0 3806.0 L16296.75 3880 L62863 4013.7916968186328 L62863.0 4013.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23022.4 2642.2 L23018.9 2652.3 L23011.9 2644.2 L23015.4 2634.0 Z"></path>
+						<path d="M16378.3 3802.9 L16368.0 3806.0 L16370.6 3795.5 L16380.9 3792.5 Z"></path>
 					</g>
-					<path d="M32833.0 1277.2 L32833 1459 L32833 1666.5 L32833.0 1666.5 " fill="none"></path>
+					<path d="M16546.7 3804.3 L16640 3880 L16329.379664179105 3998.5 L16329.4 3998.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32838.3 1267.8 L32833.0 1277.2 L32827.7 1267.8 L32833.0 1258.5 Z"></path>
+						<path d="M16542.8 3794.2 L16546.7 3804.3 L16536.1 3802.5 L16532.2 3792.5 Z"></path>
 					</g>
-					<path d="M3361.5 3803.7 L3361.5 3880 L9895.5 4012.539509536785 L9895.5 4012.5 " fill="none"></path>
+					<path d="M38804.5 165.3 L38804.5 293 L38804.5 583.5 L38804.5 583.5 " fill="none"></path>
+					<path d="M38809.8 165.3 L38804.5 165.3 L38799.2 165.3 L38804.5 152.0 Z"></path>
+					<path d="M39139.5 165.3 L39139.5 293 L39139.5 583.5 L39139.5 583.5 " fill="none"></path>
+					<path d="M39144.8 165.3 L39139.5 165.3 L39134.2 165.3 L39139.5 152.0 Z"></path>
+					<path d="M24232.3 2652.2 L24232.25 3194 L27437 3378.0024243823595 L27437.0 3378.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3366.8 3794.3 L3361.5 3803.7 L3356.2 3794.3 L3361.5 3785.0 Z"></path>
+						<path d="M24237.6 2642.8 L24232.3 2652.2 L24226.9 2642.8 L24232.3 2633.5 Z"></path>
 					</g>
-					<path d="M26651.2 1213.4 L3361.5 1459 L3361.5 1697.5 L3361.5 1697.5 L3361.5 1936 L3361.5 1936 L3361.5 2565 L3361.5 2565 L3361.5 3194 L3361.5 3194 L3361.5 3380.5 L3361.5 3380.5 L3361.5 3567 L3361.5 3567 L3361.5 3662 L3361.5 3662.0 " fill="none"></path>
-					<path d="M26651.2 1218.8 L26651.2 1213.4 L26651.1 1208.1 L26664.5 1213.3 Z"></path>
-					<path d="M64784.8 2712.2 L64677.75 3194 L28835.75 3380.216845653476 L28835.8 3380.2 " fill="none"></path>
+					<path d="M80530.1 172.1 L80202 293 L80202 629.5 L80202 629.5 L80202 966 L80202 966 L80202 1174 L80202.0 1174.0 " fill="none"></path>
+					<path d="M80531.9 177.1 L80530.1 172.1 L80528.3 167.1 L80542.6 167.5 Z"></path>
+					<path d="M867.2 3302.4 L880 3297 L887.5 3297 L887.5 3297 L895 3380.5 L895 3380.5 L887.5 3464 L887.5 3464 L880 3464 L880 3464 L850 3451.284263959391 L850.0 3451.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64792.0 2704.3 L64784.8 2712.2 L64781.6 2702.0 L64788.8 2694.0 Z"></path>
+						<path d="M856.5 3301.2 L867.2 3302.4 L860.7 3311.0 L850.0 3309.7 Z"></path>
 					</g>
-					<path d="M64794.1 2712.4 L64717.75 3194 L67088 3371.1217569868777 L67088.0 3371.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M64800.8 2704.1 L64794.1 2712.4 L64790.3 2702.4 L64797.0 2694.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3106.1 2593.8 L3123.25 3194 L850 3367.7367585288393 L850.0 3367.7 " fill="none"></path>
 					</g>
-					<path d="M64840.9 2712.4 L64917.25 3194 L64760.92024128686 3365 L64760.9 3365.0 " fill="none"></path>
+					<path d="M3111.4 2593.7 L3106.1 2593.8 L3100.7 2594.0 L3105.7 2580.5 Z"></path>
+					<path d="M16873.9 3821.9 L16750.75 3880 L16502.69589552239 3998.5 L16502.7 3998.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64844.7 2702.4 L64840.9 2712.4 L64834.2 2704.1 L64838.0 2694.0 Z"></path>
+						<path d="M16884.6 3822.7 L16873.9 3821.9 L16880.0 3813.1 L16890.8 3813.9 Z"></path>
 					</g>
-					<path d="M64850.2 2712.2 L64957.25 3194 L66253.5 3373.240500463392 L66253.5 3373.2 " fill="none"></path>
+					<path d="M16874.3 3835.1 L16790.75 3880 L8580 4012.6509931579108 L8580.0 4012.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64853.4 2702.0 L64850.2 2712.2 L64843.0 2704.3 L64846.2 2694.0 Z"></path>
+						<path d="M16885.0 3835.4 L16874.3 3835.1 L16880.0 3826.0 L16890.8 3826.3 Z"></path>
 					</g>
-					<path d="M68088.0 670.1 L64817.5 966 L64817.5 1212.5 L64817.5 1212.5 L64817.5 1459 L64817.5 1459 L64817.5 1697.5 L64817.5 1697.5 L64817.5 1936 L64817.5 1936 L64817.5 2436 L64817.5 2436.0 " fill="none"></path>
-					<path d="M68088.5 675.5 L68088.0 670.1 L68087.5 664.8 L68101.3 668.9 Z"></path>
-					<path d="M27937.8 1709.2 L26092.5 1936 L26092.5 2534 L26092.5 2534.0 " fill="none"></path>
-					<path d="M27938.4 1714.5 L27937.8 1709.2 L27937.1 1703.9 L27951.0 1707.6 Z"></path>
-					<path d="M27937.8 1713.2 L26586.25 1936 L28853 2538.423471004542 L28853.0 2538.4 " fill="none"></path>
-					<path d="M27938.7 1718.4 L27937.8 1713.2 L27937.0 1707.9 L27951.0 1711.0 Z"></path>
-					<path d="M54178.6 636.2 L39784 966 L39784 1212.5 L39784 1212.5 L39784 1459 L39784 1459 L39784 1697.5 L39784 1697.5 L39784 1936 L39784 1936 L39784 2565 L39784 2565 L39784 3194 L39784 3194 L67088 3379.6466942525385 L67088.0 3379.6 " fill="none"></path>
+					<path d="M17291.7 3781.4 L17648.5 3880 L17889.921641791047 3998.5 L17889.9 3998.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54188.0 641.3 L54178.6 636.2 L54187.8 630.6 L54197.3 635.8 Z"></path>
+						<path d="M17284.2 3773.8 L17291.7 3781.4 L17281.3 3784.1 L17273.8 3776.4 Z"></path>
 					</g>
-					<path d="M54178.6 636.2 L39824 966 L39824 1212.5 L39824 1212.5 L39824 1459 L39824 1459 L39824 1697.5 L39824 1697.5 L39824 1936 L39824 1936 L39824 2565 L39824 2565 L39824 3194 L39824 3194 L55895.75 3379.967729676909 L55895.8 3380.0 " fill="none"></path>
+					<path d="M17291.8 3777.6 L17688.5 3880 L16840.20802238806 3998.5 L16840.2 3998.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54188.0 641.3 L54178.6 636.2 L54187.8 630.7 L54197.3 635.8 Z"></path>
+						<path d="M17284.1 3770.1 L17291.8 3777.6 L17281.5 3780.4 L17273.8 3772.9 Z"></path>
 					</g>
-					<path d="M54761.2 713.6 L55634.75 966 L55634.75 1212.5 L55634.75 1212.5 L55634.75 1459 L55634.75 1459 L55634.75 1697.5 L55634.75 1697.5 L55634.75 1936 L55634.75 1936 L55634.75 2565 L55634.75 2565 L55634.75 3194 L55634.75 3194 L64843.25 3378.7942379082156 L64843.3 3378.8 " fill="none"></path>
+					<path d="M39473.7 193.7 L39409 293 L39409 598.5 L39409.0 598.5 " fill="none"></path>
+					<path d="M39478.2 196.6 L39473.7 193.7 L39469.3 190.8 L39481.0 182.5 Z"></path>
+					<path d="M39548.3 193.7 L39613 293 L39613 598.5 L39613.0 598.5 " fill="none"></path>
+					<path d="M39552.7 190.8 L39548.3 193.7 L39543.8 196.6 L39541.0 182.5 Z"></path>
+					<path d="M17901.8 3791.2 L17819.5 3880 L16981.25 4009.369997120645 L16981.3 4009.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54753.7 705.9 L54761.2 713.6 L54750.7 716.1 L54743.3 708.4 Z"></path>
+						<path d="M17912.0 3788.0 L17901.8 3791.2 L17904.2 3780.7 L17914.5 3777.5 Z"></path>
 					</g>
-					<path d="M55674.8 3780.7 L55674.75 3880 L63587 4011.547690685195 L63587.0 4011.5 " fill="none"></path>
+					<path d="M41583.3 4094.2 L41583.25 4148 L41583.25 4319 L41583.3 4319.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55680.1 3771.3 L55674.8 3780.7 L55669.4 3771.3 L55674.8 3762.0 Z"></path>
+						<path d="M41588.6 4084.8 L41583.3 4094.2 L41577.9 4084.8 L41583.3 4075.5 Z"></path>
 					</g>
-					<path d="M54756.1 709.4 L55674.75 966 L55674.75 1212.5 L55674.75 1212.5 L55674.75 1459 L55674.75 1459 L55674.75 1697.5 L55674.75 1697.5 L55674.75 1936 L55674.75 1936 L55674.75 2565 L55674.75 2565 L55674.75 3194 L55674.75 3194 L55674.75 3380.5 L55674.75 3380.5 L55674.75 3567 L55674.75 3567 L55674.75 3685 L55674.8 3685.0 " fill="none"></path>
-					<path d="M54757.5 704.2 L54756.1 709.4 L54754.7 714.5 L54743.3 705.8 Z"></path>
-					<path d="M24241.6 2689.4 L24087.75 3194 L26630.25 3378.396752867976 L26630.3 3378.4 " fill="none"></path>
+					<path d="M17954.6 3790.7 L17941.5 3880 L41315.25 4012.480992312329 L41315.3 4012.5 " fill="none"></path>
+					<path d="M17959.9 3791.5 L17954.6 3790.7 L17949.3 3789.9 L17956.6 3777.5 Z"></path>
+					<path d="M18014.8 3788.0 L18086.5 3880 L39671.5 4013.579180713989 L39671.5 4013.6 " fill="none"></path>
+					<path d="M18019.0 3784.7 L18014.8 3788.0 L18010.6 3791.3 L18006.6 3777.5 Z"></path>
+					<path d="M21704.0 3409.3 L21704 3567 L21704 3685 L21704.0 3685.0 " fill="none"></path>
+					<path d="M21709.3 3409.3 L21704.0 3409.3 L21698.7 3409.3 L21704.0 3396.0 Z"></path>
+					<path d="M39953.5 165.3 L39953.5 293 L39953.5 583 L39953.5 583.0 " fill="none"></path>
+					<path d="M39958.8 165.3 L39953.5 165.3 L39948.2 165.3 L39953.5 152.0 Z"></path>
+					<path d="M40402.5 724.7 L40402.5 966 L40402.5 1197 L40402.5 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24249.4 2682.0 L24241.6 2689.4 L24239.2 2678.9 L24247.0 2671.5 Z"></path>
+						<path d="M40407.8 715.3 L40402.5 724.7 L40397.2 715.3 L40402.5 706.0 Z"></path>
 					</g>
-					<path d="M24309.8 2689.6 L24432.5 3194 L19119 3379.2622452794917 L19119.0 3379.3 " fill="none"></path>
+					<path d="M40402.5 165.3 L40402.5 293 L40402.5 553 L40402.5 553.0 " fill="none"></path>
+					<path d="M40407.8 165.3 L40402.5 165.3 L40397.2 165.3 L40402.5 152.0 Z"></path>
+					<path d="M40939.5 160.8 L40790.5 293 L40790.5 575.5 L40790.5 575.5 " fill="none"></path>
+					<path d="M40943.1 164.8 L40939.5 160.8 L40936.0 156.9 L40949.5 152.0 Z"></path>
+					<path d="M40994.5 160.8 L41143.5 293 L41143.5 598.5 L41143.5 598.5 " fill="none"></path>
+					<path d="M40998.0 156.9 L40994.5 160.8 L40990.9 164.8 L40984.5 152.0 Z"></path>
+					<path d="M22607.6 1720.8 L22310.75 1936 L22310.75 2481 L22310.8 2481.0 " fill="none"></path>
+					<path d="M22610.7 1725.1 L22607.6 1720.8 L22604.4 1716.5 L22618.4 1713.0 Z"></path>
+					<path d="M65421.0 4429.7 L65421 4521 L67612.75 4555.182152663372 L67612.8 4555.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24312.8 2679.3 L24309.8 2689.6 L24302.4 2681.8 L24305.4 2671.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M24977.3 2613.6 L24472.5 3194 L28875.75 3375.4920437593237 L28875.8 3375.5 " fill="none"></path>
-					</g>
-					<path d="M24981.3 2617.1 L24977.3 2613.6 L24973.2 2610.1 L24986.0 2603.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M23278.5 2646.8 L23278.5 3194 L28875.75 3376.5376393442625 L28875.8 3376.5 " fill="none"></path>
+						<path d="M65426.3 4420.3 L65421.0 4429.7 L65415.7 4420.3 L65421.0 4411.0 Z"></path>
 					</g>
-					<path d="M23283.8 2646.8 L23278.5 2646.8 L23273.2 2646.8 L23278.5 2633.5 Z"></path>
-					<path d="M37381.4 1223.4 L33345 1459 L37063.75 1691.3762035763411 L37063.8 1691.4 " fill="none"></path>
+					<path d="M77914.3 1762.7 L77914.25 1936 L73596 2540.2331905900674 L73596.0 2540.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37391.0 1228.1 L37381.4 1223.4 L37390.4 1217.5 L37400.0 1222.3 Z"></path>
+						<path d="M77919.6 1753.3 L77914.3 1762.7 L77908.9 1753.3 L77914.3 1744.0 Z"></path>
 					</g>
-					<path d="M37751.1 1319.1 L37992.25 1459 L28115 1695.5362979139995 L28115.0 1695.5 " fill="none"></path>
+					<path d="M78840.1 153.0 L77914.25 293 L77914.25 629.5 L77914.25 629.5 L77914.25 966 L77914.25 966 L77914.25 1212.5 L77914.25 1212.5 L77914.25 1459 L77914.25 1459 L77914.25 1651 L77914.3 1651.0 " fill="none"></path>
+					<path d="M78840.9 158.3 L78840.1 153.0 L78839.3 147.7 L78853.3 151.0 Z"></path>
+					<path d="M34986.5 1710.1 L33280.25 1936 L27601.5 2549.866165413534 L27601.5 2549.9 " fill="none"></path>
+					<path d="M34987.2 1715.4 L34986.5 1710.1 L34985.8 1704.8 L34999.8 1708.4 Z"></path>
+					<path d="M22650.1 1725.5 L22728.25 1936 L22728.25 2436 L22728.3 2436.0 " fill="none"></path>
+					<path d="M22655.1 1723.6 L22650.1 1725.5 L22645.1 1727.4 L22645.5 1713.0 Z"></path>
+					<path d="M41476.0 231.7 L41476 293 L41476 614 L41476.0 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37745.7 1309.8 L37751.1 1319.1 L37740.4 1319.0 L37735.0 1309.7 Z"></path>
+						<path d="M41481.3 222.3 L41476.0 231.7 L41470.7 222.3 L41476.0 213.0 Z"></path>
 					</g>
-					<path d="M37753.5 1234.6 L39640.25 1459 L39640.25 1697.5 L39640.25 1697.5 L39640.25 1936 L39640.25 1936 L39640.25 2565 L39640.25 2565 L39640.25 3194 L39640.25 3194 L19119 3380.177928174444 L19119.0 3380.2 " fill="none"></path>
+					<path d="M73404.6 2667.5 L73330.5 3194 L65014 3379.2415203630717 L65014.0 3379.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37744.9 1228.2 L37753.5 1234.6 L37743.6 1238.8 L37735.0 1232.4 Z"></path>
+						<path d="M73411.2 2659.0 L73404.6 2667.5 L73400.6 2657.5 L73407.2 2649.0 Z"></path>
 					</g>
-					<path d="M37753.5 1234.2 L39680.25 1459 L39680.25 1697.5 L39680.25 1697.5 L39680.25 1936 L39680.25 1936 L39680.25 2565 L39680.25 2565 L39680.25 3194 L39680.25 3194 L13583.5 3378.99012248311 L13583.5 3379.0 " fill="none"></path>
+					<path d="M73458.0 2666.4 L73661 3194 L68373 3378.6666042505385 L68373.0 3378.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37744.9 1227.8 L37753.5 1234.2 L37743.7 1238.4 L37735.0 1232.0 Z"></path>
+						<path d="M73459.6 2655.8 L73458.0 2666.4 L73449.7 2659.6 L73451.3 2649.0 Z"></path>
 					</g>
-					<path d="M25318.7 2712.2 L25206.25 3194 L29530.75 3377.2790023860925 L29530.8 3377.3 " fill="none"></path>
+					<path d="M73797.4 650.0 L66868.25 966 L66868.25 1212.5 L66868.25 1212.5 L66868.25 1459 L66868.25 1459 L66868.25 1697.5 L66868.25 1697.5 L66868.25 1936 L66868.25 1936 L73242 2548.004541464718 L73242.0 2548.0 " fill="none"></path>
+					<path d="M73797.7 655.3 L73797.4 650.0 L73797.2 644.7 L73810.8 649.4 Z"></path>
+					<path d="M11816.5 2630.2 L11816.5 3194 L19129 3376.080273698264 L19129.0 3376.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25326.0 2704.3 L25318.7 2712.2 L25315.6 2701.9 L25322.9 2694.0 Z"></path>
+						<path d="M11821.8 2620.8 L11816.5 2630.2 L11811.2 2620.8 L11816.5 2611.5 Z"></path>
 					</g>
-					<path d="M25345.7 2712.6 L25322 3194 L19119 3379.438727258155 L19119.0 3379.4 " fill="none"></path>
+					<path d="M13703.8 1712.1 L11816.5 1936 L11816.5 2518.5 L11816.5 2518.5 " fill="none"></path>
+					<path d="M13704.4 1717.4 L13703.8 1712.1 L13703.1 1706.8 L13717.0 1710.5 Z"></path>
+					<path d="M12571.3 2630.2 L12571.25 3194 L19129 3375.5850005567722 L19129.0 3375.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25351.5 2703.6 L25345.7 2712.6 L25340.9 2703.1 L25346.6 2694.0 Z"></path>
+						<path d="M12576.6 2620.8 L12571.3 2630.2 L12565.9 2620.8 L12571.3 2611.5 Z"></path>
 					</g>
-					<path d="M29859.3 3498.2 L29859.25 3567 L29859.25 3708 L29859.3 3708.0 " fill="none"></path>
+					<path d="M13703.9 1720.8 L12571.25 1936 L12571.25 2518.5 L12571.3 2518.5 " fill="none"></path>
+					<path d="M13704.9 1726.0 L13703.9 1720.8 L13702.9 1715.6 L13717.0 1718.3 Z"></path>
+					<path d="M13323.3 2630.2 L13323.25 3194 L19129 3374.9672627752475 L19129.0 3375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29864.6 3488.8 L29859.3 3498.2 L29853.9 3488.8 L29859.3 3479.5 Z"></path>
+						<path d="M13328.6 2620.8 L13323.3 2630.2 L13317.9 2620.8 L13323.3 2611.5 Z"></path>
 					</g>
-					<path d="M25355.0 2707.3 L25362 3194 L29722.75 3374.8393740619267 L29722.8 3374.8 " fill="none"></path>
-					<path d="M25360.4 2707.3 L25355.0 2707.3 L25349.7 2707.4 L25354.8 2694.0 Z"></path>
-					<path d="M25383.7 2707.0 L25488.75 3194 L30186.75 3376.784395535621 L30186.8 3376.8 " fill="none"></path>
-					<path d="M25388.9 2705.9 L25383.7 2707.0 L25378.4 2708.2 L25380.8 2694.0 Z"></path>
-					<path d="M24985.0 2619.2 L24619.25 3194 L30816.75 3378.800343752498 L30816.8 3378.8 " fill="none"></path>
+					<path d="M13749.0 1734.2 L13323.25 1936 L13323.25 2518.5 L13323.3 2518.5 " fill="none"></path>
+					<path d="M13751.3 1739.0 L13749.0 1734.2 L13746.8 1729.4 L13761.1 1728.5 Z"></path>
+					<path d="M18069.5 2645.2 L18069.5 3194 L19129 3353.738682295877 L19129.0 3353.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24994.5 2614.2 L24985.0 2619.2 L24985.5 2608.5 L24995.0 2603.5 Z"></path>
+						<path d="M18074.8 2635.8 L18069.5 2645.2 L18064.2 2635.8 L18069.5 2626.5 Z"></path>
 					</g>
-					<path d="M25032.7 2621.7 L25166.25 3194 L30035.75 3378.3983248730965 L30035.8 3378.4 " fill="none"></path>
+					<path d="M13949.3 1704.4 L18069.5 1936 L18069.5 2503.5 L18069.5 2503.5 " fill="none"></path>
+					<path d="M13949.6 1699.1 L13949.3 1704.4 L13949.0 1709.7 L13936.0 1703.7 Z"></path>
+					<path d="M28283.4 2639.4 L27741.75 3194 L21335.5 3379.4722125198896 L21335.5 3379.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25035.8 2611.4 L25032.7 2621.7 L25025.4 2613.8 L25028.5 2603.5 Z"></path>
+						<path d="M28293.7 2636.4 L28283.4 2639.4 L28286.1 2629.0 L28296.4 2626.0 Z"></path>
 					</g>
-					<path d="M25838.5 2660.1 L25804.5 3194 L30816.75 3378.4029442225183 L30816.8 3378.4 " fill="none"></path>
+					<path d="M28356.9 2644.7 L28362.75 3194 L19484 3376.844651483782 L19484.0 3376.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25844.4 2651.2 L25838.5 2660.1 L25833.7 2650.5 L25839.6 2641.5 Z"></path>
+						<path d="M28362.1 2635.3 L28356.9 2644.7 L28351.4 2635.4 L28356.7 2626.0 Z"></path>
 					</g>
-					<path d="M25982.7 2611.1 L27731.75 3194 L30035.75 3376.113159567705 L30035.8 3376.1 " fill="none"></path>
+					<path d="M28374.3 2644.2 L28501 3194 L13656 3379.8427588521563 L13656.0 3379.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25975.5 2603.1 L25982.7 2611.1 L25972.2 2613.2 L25965.0 2605.2 Z"></path>
+						<path d="M28377.4 2633.9 L28374.3 2644.2 L28367.0 2636.3 L28370.1 2626.0 Z"></path>
 					</g>
-					<path d="M25982.9 2605.5 L27993.75 3194 L21798 3376.2638708150953 L21798.0 3376.3 " fill="none"></path>
+					<path d="M28686.0 2637.2 L28686 3194 L64901 3380.2094895441323 L64901.0 3380.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25975.5 2597.8 L25982.9 2605.5 L25972.5 2608.0 L25965.0 2600.3 Z"></path>
-					</g>
-					<path d="M26651.2 1214.0 L12221 1459 L27951 1696.2631545661523 L27951.0 1696.3 " fill="none"></path>
-					<path d="M26651.3 1219.3 L26651.2 1214.0 L26651.1 1208.7 L26664.5 1213.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3200.5 1256.8 L3200.5 1459 L27951 1696.7124433705828 L27951.0 1696.7 " fill="none"></path>
+						<path d="M28691.3 2627.8 L28686.0 2637.2 L28680.7 2627.8 L28686.0 2618.5 Z"></path>
 					</g>
-					<path d="M3205.8 1256.8 L3200.5 1256.8 L3195.2 1256.8 L3200.5 1243.5 Z"></path>
-					<path d="M57210.1 2697.5 L57147.5 3194 L57147.5 3327 L57147.5 3327.0 " fill="none"></path>
+					<path d="M29100.9 2643.8 L28926 3194 L30132.627345844503 3365 L30132.6 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57216.5 2688.9 L57210.1 2697.5 L57205.9 2687.6 L57212.4 2679.0 Z"></path>
+						<path d="M29108.9 2636.5 L29100.9 2643.8 L29098.7 2633.3 L29106.6 2626.0 Z"></path>
 					</g>
-					<path d="M57531.4 2635.5 L59944.25 3194 L64843.25 3377.3193218298557 L64843.3 3377.3 " fill="none"></path>
+					<path d="M29166.7 2642.5 L29456.25 3194 L64901 3380.2031865075173 L64901.0 3380.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57523.5 2628.2 L57531.4 2635.5 L57521.1 2638.6 L57513.3 2631.3 Z"></path>
+						<path d="M29167.1 2631.8 L29166.7 2642.5 L29157.6 2636.7 L29158.0 2626.0 Z"></path>
 					</g>
-					<path d="M54756.5 664.4 L57226.75 966 L57226.75 1212.5 L57226.75 1212.5 L57226.75 1459 L57226.75 1459 L57226.75 1697.5 L57226.75 1697.5 L57226.75 1936 L57226.75 1936 L57226.75 2451 L57226.8 2451.0 " fill="none"></path>
-					<path d="M54757.1 659.1 L54756.5 664.4 L54755.8 669.7 L54743.3 662.8 Z"></path>
-					<path d="M27937.9 1714.8 L26720.25 1936 L29093 2542.506044905009 L29093.0 2542.5 " fill="none"></path>
-					<path d="M27938.8 1720.0 L27937.9 1714.8 L27936.9 1709.5 L27951.0 1712.4 Z"></path>
-					<path d="M26344.8 3803.2 L26344.75 3880 L10039.5 4013.410890106703 L10039.5 4013.4 " fill="none"></path>
+					<path d="M65952.3 2882.5 L65763 3194 L65763 3380.5 L65763 3380.5 L65763 3567 L65763 3567 L65763 3723.5 L65763 3723.5 L65763 3880 L65763 3880 L75100.5 4011.916183447549 L75100.5 4011.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26350.1 3793.8 L26344.8 3803.2 L26339.4 3793.8 L26344.8 3784.5 Z"></path>
+						<path d="M65961.7 2877.2 L65952.3 2882.5 L65952.6 2871.7 L65962.0 2866.5 Z"></path>
 					</g>
-					<path d="M28641.5 2637.7 L28641.5 3194 L19119 3379.807308014229 L19119.0 3379.8 " fill="none"></path>
+					<path d="M66040.2 2884.2 L65938.25 3194 L65938.25 3380.5 L65938.25 3380.5 L65938.25 3567 L65938.25 3567 L65938.25 3723.5 L65938.25 3723.5 L65938.25 3880 L65938.25 3880 L65938.25 4014 L65938.25 4014 L65938.25 4148 L65938.25 4148 L65938.25 4334.5 L65938.25 4334.5 L65938.25 4521 L65938.25 4521 L67612.75 4554.794627629335 L67612.8 4554.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28646.8 2628.3 L28641.5 2637.7 L28636.2 2628.3 L28641.5 2619.0 Z"></path>
+						<path d="M66048.2 2877.0 L66040.2 2884.2 L66038.0 2873.7 L66046.0 2866.5 Z"></path>
 					</g>
-					<path d="M23069.5 1805.3 L22757.5 1936 L22757.5 2549.5 L22757.5 2549.5 " fill="none"></path>
+					<path d="M66060.4 2884.5 L65978.25 3194 L63698.25 3365.632694248234 L63698.3 3365.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23080.2 1806.6 L23069.5 1805.3 L23076.1 1796.7 L23086.8 1798.1 Z"></path>
+						<path d="M66068.0 2876.9 L66060.4 2884.5 L66057.7 2874.2 L66065.2 2866.5 Z"></path>
 					</g>
-					<path d="M23523.0 1853.1 L23627.5 1936 L23627.5 2549.5 L23627.5 2549.5 " fill="none"></path>
+					<path d="M66222.7 2884.6 L66297.75 3194 L67699.5 3374.574253151442 L67699.5 3374.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23519.0 1843.1 L23523.0 1853.1 L23512.3 1851.5 L23508.3 1841.5 Z"></path>
+						<path d="M66225.7 2874.3 L66222.7 2884.6 L66215.4 2876.8 L66218.3 2866.5 Z"></path>
 					</g>
-					<path d="M23583.8 1813.3 L23856 1936 L23856 2565 L23856 2565 L23856 3194 L23856 3194 L19119 3379.1127291775797 L19119.0 3379.1 " fill="none"></path>
+					<path d="M66243.0 2884.3 L66337.75 3194 L65014 3372.8656946205397 L65014.0 3372.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23577.5 1804.6 L23583.8 1813.3 L23573.1 1814.4 L23566.8 1805.7 Z"></path>
+						<path d="M66245.4 2873.9 L66243.0 2884.3 L66235.2 2877.0 L66237.5 2866.5 Z"></path>
 					</g>
-					<path d="M23584.1 1800.8 L23921 1936 L54037.5 2558.6528341578055 L54037.5 2558.7 " fill="none"></path>
+					<path d="M66263.2 2884.0 L66377.75 3194 L68268 3375.4601080941966 L68268.0 3375.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23577.4 1792.3 L23584.1 1800.8 L23573.4 1802.2 L23566.8 1793.8 Z"></path>
+						<path d="M66264.9 2873.4 L66263.2 2884.0 L66254.9 2877.1 L66256.7 2866.5 Z"></path>
 					</g>
-					<path d="M993.9 3281.2 L1007.25 3274.5 L1014.75 3274.5 L1014.75 3274.5 L1022.25 3380.5 L1022.25 3380.5 L1014.75 3486.5 L1014.75 3486.5 L1007.25 3486.5 L1007.25 3486.5 L977.25 3471.393111638955 L977.3 3471.4 " fill="none"></path>
+					<path d="M66283.3 2883.6 L66417.75 3194 L19484 3379.797328132877 L19484.0 3379.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M983.2 3280.6 L993.9 3281.2 L988.0 3290.2 L977.3 3289.6 Z"></path>
+						<path d="M66284.5 2872.9 L66283.3 2883.6 L66274.7 2877.2 L66275.9 2866.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M1647.9 2588.2 L796.75 3194 L796.75 3274.5 L796.8 3274.5 " fill="none"></path>
-					</g>
-					<path d="M1651.0 2592.6 L1647.9 2588.2 L1644.8 2583.9 L1658.7 2580.5 Z"></path>
-					<path d="M29752.0 2614.7 L29752 3194 L13077.5 3378.8592212810227 L13077.5 3378.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M29757.3 2605.3 L29752.0 2614.7 L29746.7 2605.3 L29752.0 2596.0 Z"></path>
-					</g>
-					<path d="M54020.5 2710.6 L52944.25 3194 L67088 3378.8597070623896 L67088.0 3378.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M54031.2 2711.6 L54020.5 2710.6 L54026.8 2701.9 L54037.5 2702.9 Z"></path>
-					</g>
-					<path d="M54020.6 2714.8 L52984.25 3194 L52984.25 3380.5 L52984.25 3380.5 L52984.25 3567 L52984.25 3567 L52984.25 3723.5 L52984.25 3723.5 L52984.25 3880 L52984.25 3880 L63587 4012.1614381060904 L63587.0 4012.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M54031.3 2715.7 L54020.6 2714.8 L54026.8 2706.0 L54037.5 2707.0 Z"></path>
-					</g>
-					<path d="M54337.9 2772.7 L54324.5 3194 L54324.5 3319 L54324.5 3319.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M54343.5 2763.5 L54337.9 2772.7 L54332.9 2763.2 L54338.5 2754.0 Z"></path>
+						<path d="M67858.5 145.7 L66145.25 293 L66145.25 629.5 L66145.25 629.5 L66145.25 966 L66145.25 966 L66145.25 1212.5 L66145.25 1212.5 L66145.25 1459 L66145.25 1459 L66145.25 1697.5 L66145.25 1697.5 L66145.25 1936 L66145.25 1936 L66145.25 2263.5 L66145.3 2263.5 " fill="none"></path>
 					</g>
-					<path d="M54667.5 2757.3 L55401.25 3194 L55896.82908847185 3365 L55896.8 3365.0 " fill="none"></path>
+					<path d="M67858.9 151.0 L67858.5 145.7 L67858.0 140.4 L67871.8 144.5 Z"></path>
+					<path d="M19501.3 3302.1 L19514 3297 L19521.5 3297 L19521.5 3297 L19529 3380.5 L19529 3380.5 L19521.5 3464 L19521.5 3464 L19514 3464 L19514 3464 L19484 3451.9277108433735 L19484.0 3451.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54662.2 2747.9 L54667.5 2757.3 L54656.8 2757.1 L54651.5 2747.7 Z"></path>
+						<path d="M19490.7 3300.6 L19501.3 3302.1 L19494.6 3310.5 L19484.0 3309.1 Z"></path>
 					</g>
-					<path d="M54667.7 2750.4 L55441.25 3194 L64843.25 3378.8290291978496 L64843.3 3378.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M54662.2 2741.1 L54667.7 2750.4 L54656.9 2750.3 L54651.5 2741.1 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3114.9 2593.1 L3321.5 3194 L19129 3378.4290741319987 L19129.0 3378.4 " fill="none"></path>
 					</g>
-					<path d="M54667.8 2743.9 L55481.25 3194 L26225.25 3379.6812659520165 L26225.3 3379.7 " fill="none"></path>
+					<path d="M3120.0 2591.4 L3114.9 2593.1 L3109.9 2594.8 L3110.6 2580.5 Z"></path>
+					<path d="M1236.8 3330.9 L1249 3327 L1256.5 3327 L1256.5 3327 L1264 3380.5 L1264 3380.5 L1256.5 3434 L1256.5 3434 L1249 3434 L1249 3434 L1219 3424.5309734513276 L1219.0 3424.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54662.2 2734.7 L54667.8 2743.9 L54657.1 2744.1 L54651.5 2734.9 Z"></path>
+						<path d="M1226.3 3328.6 L1236.8 3330.9 L1229.5 3338.7 L1219.0 3336.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M76768.2 171.3 L76363 293 L76363 629.5 L76363 629.5 L76363 966 L76363 966 L76363 1212.5 L76363 1212.5 L76363 1459 L76363 1459 L76363 1697.5 L76363 1697.5 L76363 1936 L76363 1936 L54651.5 2556.2299657106523 L54651.5 2556.2 " fill="none"></path>
+						<path d="M3116.6 2592.8 L3361.5 3194 L1219 3369.0991454864156 L1219.0 3369.1 " fill="none"></path>
 					</g>
-					<path d="M76769.8 176.4 L76768.2 171.3 L76766.7 166.2 L76781.0 167.5 Z"></path>
-					<path d="M30050.5 2681.6 L29916.5 3194 L67432.25 3380.3485001831077 L67432.3 3380.3 " fill="none"></path>
+					<path d="M3121.5 2590.8 L3116.6 2592.8 L3111.7 2594.9 L3111.6 2580.5 Z"></path>
+					<path d="M30500.3 2695.1 L29496.25 3194 L25860.75 3377.026251855851 L25860.8 3377.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30058.0 2673.9 L30050.5 2681.6 L30047.7 2671.2 L30055.2 2663.5 Z"></path>
+						<path d="M30511.0 2695.7 L30500.3 2695.1 L30506.3 2686.1 L30517.0 2686.7 Z"></path>
 					</g>
-					<path d="M30081.0 2682.2 L30081 3194 L30612.10857908847 3365 L30612.1 3365.0 " fill="none"></path>
+					<path d="M30588.7 2775.9 L30245.25 3194 L28722 3372.082510578279 L28722.0 3372.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30086.3 2672.8 L30081.0 2682.2 L30075.7 2672.8 L30081.0 2663.5 Z"></path>
+						<path d="M30598.8 2772.1 L30588.7 2775.9 L30590.5 2765.3 L30600.6 2761.5 Z"></path>
 					</g>
-					<path d="M30088.4 2682.1 L30121 3194 L33190.75 3374.9301967290826 L33190.8 3374.9 " fill="none"></path>
+					<path d="M30849.5 2778.8 L31019.5 3194 L31019.5 3365 L31019.5 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30093.2 2672.5 L30088.4 2682.1 L30082.5 2673.2 L30087.3 2663.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1654.2 2589.6 L1008.75 3194 L12781.5 3378.1845416605497 L12781.5 3378.2 " fill="none"></path>
+						<path d="M30850.9 2768.1 L30849.5 2778.8 L30841.0 2772.2 L30842.4 2761.5 Z"></path>
 					</g>
-					<path d="M1657.9 2593.5 L1654.2 2589.6 L1650.6 2585.7 L1663.9 2580.5 Z"></path>
-					<path d="M32933.7 2621.4 L30261 3194 L25241.25 3377.971186440678 L25241.3 3378.0 " fill="none"></path>
+					<path d="M30924.3 2776.3 L31245 3194 L31245 3380.5 L31245 3380.5 L31245 3567 L31245 3567 L31245 3723.5 L31245 3723.5 L31245 3880 L31245 3880 L17993.5 4013.275865951139 L17993.5 4013.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32944.0 2624.7 L32933.7 2621.4 L32941.8 2614.2 L32952.0 2617.5 Z"></path>
+						<path d="M30922.8 2765.7 L30924.3 2776.3 L30914.3 2772.2 L30912.9 2761.5 Z"></path>
 					</g>
-					<path d="M32934.0 2638.9 L30959.5 3194 L24207.25 3378.5323112429937 L24207.3 3378.5 " fill="none"></path>
+					<path d="M31021.6 2772.0 L31550.75 3194 L39932.75 3378.7695762661783 L39932.8 3378.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32944.5 2641.5 L32934.0 2638.9 L32941.6 2631.3 L32952.0 2633.9 Z"></path>
+						<path d="M31017.6 2762.0 L31021.6 2772.0 L31011.0 2770.4 L31007.0 2760.4 Z"></path>
 					</g>
-					<path d="M33334.7 2777.2 L33605.25 3194 L33605.25 3365 L33605.3 3365.0 " fill="none"></path>
+					<path d="M31022.8 2730.3 L31754.5 3194 L27524 3378.6018366869444 L27524.0 3378.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33334.1 2766.4 L33334.7 2777.2 L33325.1 2772.2 L33324.5 2761.5 Z"></path>
+						<path d="M31017.7 2720.8 L31022.8 2730.3 L31012.0 2729.8 L31007.0 2720.3 Z"></path>
 					</g>
-					<path d="M33408.2 2774.6 L33830.75 3194 L33830.75 3380.5 L33830.75 3380.5 L33830.75 3567 L33830.75 3567 L33830.75 3723.5 L33830.75 3723.5 L33830.75 3880 L33830.75 3880 L10039.5 4013.5956963112735 L10039.5 4013.6 " fill="none"></path>
+					<path d="M31022.9 2724.0 L31794.5 3194 L40195.5 3377.0678857276394 L40195.5 3377.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33405.4 2764.3 L33408.2 2774.6 L33397.9 2771.9 L33395.0 2761.5 Z"></path>
+						<path d="M31017.7 2714.6 L31022.9 2724.0 L31012.2 2723.7 L31007.0 2714.3 Z"></path>
 					</g>
-					<path d="M33446.3 2773.5 L33949.25 3194 L33949.25 3365 L33949.3 3365.0 " fill="none"></path>
+					<path d="M31023.1 2718.1 L31834.5 3194 L21335.5 3379.871517395225 L21335.5 3379.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33442.6 2763.4 L33446.3 2773.5 L33435.7 2771.6 L33432.0 2761.5 Z"></path>
+						<path d="M31017.7 2708.8 L31023.1 2718.1 L31012.4 2718.0 L31007.0 2708.7 Z"></path>
 					</g>
-					<path d="M33457.8 2729.8 L34192.25 3194 L21470 3379.8644909229774 L21470.0 3379.9 " fill="none"></path>
+					<path d="M31023.2 2712.7 L31874.5 3194 L13656 3379.9641097914728 L13656.0 3380.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33452.7 2720.3 L33457.8 2729.8 L33447.0 2729.3 L33442.0 2719.8 Z"></path>
+						<path d="M31017.7 2703.5 L31023.2 2712.7 L31012.5 2712.8 L31007.0 2703.5 Z"></path>
 					</g>
-					<path d="M33458.3 2710.0 L34330.25 3194 L34330.25 3365 L34330.3 3365.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M33452.7 2700.9 L33458.3 2710.0 L33447.6 2710.2 L33442.0 2701.0 Z"></path>
+					<path d="M73797.4 650.8 L67161.25 966 L67161.25 1212.5 L67161.25 1212.5 L67161.25 1459 L67161.25 1459 L67161.25 1666.5 L67161.3 1666.5 " fill="none"></path>
+					<path d="M73797.7 656.2 L73797.4 650.8 L73797.2 645.5 L73810.8 650.2 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M59308.7 137.0 L41943.75 293 L41943.75 614 L41943.8 614.0 " fill="none"></path>
 					</g>
-					<path d="M33458.7 2695.0 L34463 3194 L19119 3380.0695081114472 L19119.0 3380.1 " fill="none"></path>
+					<path d="M59308.7 142.4 L59308.7 137.0 L59308.6 131.7 L59322.0 136.9 Z"></path>
+					<path d="M69196.8 3878.7 L69196.75 3880 L63146 4012.9235624410835 L63146.0 4012.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33452.7 2686.1 L33458.7 2695.0 L33448.0 2695.7 L33442.0 2686.7 Z"></path>
+						<path d="M69202.1 3869.3 L69196.8 3878.7 L69191.4 3869.3 L69196.8 3860.0 Z"></path>
 					</g>
-					<path d="M33458.8 2691.1 L34503 3194 L16003 3379.972240937879 L16003.0 3380.0 " fill="none"></path>
+					<path d="M64838.3 3819.2 L64762.5 3880 L41851.25 4012.450683261969 L41851.3 4012.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33452.7 2682.2 L33458.8 2691.1 L33448.1 2691.9 L33442.0 2683.0 Z"></path>
+						<path d="M64848.9 3817.5 L64838.3 3819.2 L64842.2 3809.2 L64852.8 3807.5 Z"></path>
 					</g>
-					<path d="M64522.0 3768.9 L63972 3880 L62772.5 3989.528449744463 L62772.5 3989.5 " fill="none"></path>
+					<path d="M65076.7 3819.2 L65152.5 3880 L42055.25 4013.5259553264236 L42055.3 4013.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64532.2 3772.3 L64522.0 3768.9 L64530.0 3761.8 L64540.3 3765.2 Z"></path>
+						<path d="M65072.8 3809.2 L65076.7 3819.2 L65066.1 3817.5 L65062.2 3807.5 Z"></path>
 					</g>
-					<path d="M64746.8 3826.2 L64746.75 3880 L64746.75 3998.5 L64746.8 3998.5 " fill="none"></path>
+					<path d="M65182.3 3769.5 L65723 3880 L65723 3998.5 L65723.0 3998.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64752.1 3816.8 L64746.8 3826.2 L64741.4 3816.8 L64746.8 3807.5 Z"></path>
+						<path d="M65174.2 3762.4 L65182.3 3769.5 L65172.1 3772.8 L65164.0 3765.7 Z"></path>
 					</g>
-					<path d="M64971.4 3779.8 L65370.75 3880 L65619.24626865672 3998.5 L65619.2 3998.5 " fill="none"></path>
+					<path d="M64957.5 3409.3 L64957.5 3567 L64957.5 3639.5 L64957.5 3639.5 " fill="none"></path>
+					<path d="M64962.8 3409.3 L64957.5 3409.3 L64952.2 3409.3 L64957.5 3396.0 Z"></path>
+					<path d="M32078.3 2652.7 L32078.25 3194 L25860.75 3378.45299451205 L25860.8 3378.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64963.6 3772.4 L64971.4 3779.8 L64961.0 3782.7 L64953.3 3775.3 Z"></path>
+						<path d="M32083.6 2643.3 L32078.3 2652.7 L32072.9 2643.3 L32078.3 2634.0 Z"></path>
 					</g>
-					<path d="M64746.8 3409.3 L64746.75 3567 L64746.75 3639.5 L64746.8 3639.5 " fill="none"></path>
-					<path d="M64752.1 3409.3 L64746.8 3409.3 L64741.4 3409.3 L64746.8 3396.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M58524.1 145.4 L57526.5 293 L57526.5 614 L57526.5 614.0 " fill="none"></path>
+						<path d="M59308.7 137.1 L42224.75 293 L42224.75 614 L42224.8 614.0 " fill="none"></path>
 					</g>
-					<path d="M58524.8 150.7 L58524.1 145.4 L58523.3 140.1 L58537.3 143.5 Z"></path>
+					<path d="M59308.7 142.4 L59308.7 137.1 L59308.6 131.7 L59322.0 136.9 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M58524.1 147.8 L57752 293 L57752 598.5 L57752.0 598.5 " fill="none"></path>
+						<path d="M59308.7 137.1 L42450.25 293 L42450.25 598.5 L42450.3 598.5 " fill="none"></path>
 					</g>
-					<path d="M58525.1 153.0 L58524.1 147.8 L58523.2 142.6 L58537.3 145.3 Z"></path>
-					<path d="M66405.9 145.4 L64538 293 L64538 629.5 L64538 629.5 L64538 966 L64538 966 L64538 1212.5 L64538 1212.5 L64538 1459 L64538 1459 L64538 1697.5 L64538 1697.5 L64538 1936 L64538 1936 L64538 2565 L64538 2565 L64538 3194 L64538 3194 L66253.5 3374.961962669683 L66253.5 3375.0 " fill="none"></path>
+					<path d="M59308.7 142.4 L59308.7 137.1 L59308.6 131.7 L59322.0 136.9 Z"></path>
+					<path d="M67853.2 149.4 L66610.25 293 L66610.25 629.5 L66610.25 629.5 L66610.25 966 L66610.25 966 L66610.25 1212.5 L66610.25 1212.5 L66610.25 1459 L66610.25 1459 L66610.25 1697.5 L66610.25 1697.5 L66610.25 1936 L66610.25 1936 L66610.25 2565 L66610.25 2565 L66610.25 3194 L66610.25 3194 L68268 3374.7749598011987 L68268.0 3374.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66415.6 149.9 L66405.9 145.4 L66414.8 139.3 L66424.5 143.9 Z"></path>
+						<path d="M67863.1 153.7 L67853.2 149.4 L67861.9 143.1 L67871.8 147.3 Z"></path>
 					</g>
-					<path d="M1837.7 1720.4 L1515 1936 L1515 2511.5 L1515.0 2511.5 " fill="none"></path>
-					<path d="M1840.7 1724.8 L1837.7 1720.4 L1834.7 1716.0 L1848.8 1713.0 Z"></path>
-					<path d="M68082.7 674.0 L65097 966 L65097 1212.5 L65097 1212.5 L65097 1459 L65097 1459 L65097 1697.5 L65097 1697.5 L65097 1936 L65097 1936 L65097 2565 L65097 2565 L65097 3194 L65097 3194 L29440.75 3379.765404465427 L29440.8 3379.8 " fill="none"></path>
+					<path d="M22677.8 1719.7 L23048.75 1936 L23048.75 2511.5 L23048.8 2511.5 " fill="none"></path>
+					<path d="M22680.5 1715.1 L22677.8 1719.7 L22675.2 1724.3 L22666.3 1713.0 Z"></path>
+					<path d="M73792.1 656.2 L68509.25 966 L68509.25 1212.5 L68509.25 1212.5 L68509.25 1459 L68509.25 1459 L68509.25 1697.5 L68509.25 1697.5 L68509.25 1936 L68509.25 1936 L68509.25 2565 L68509.25 2565 L68509.25 3194 L68509.25 3194 L30744 3379.806275350371 L30744.0 3379.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68092.5 678.4 L68082.7 674.0 L68091.4 667.7 L68101.3 672.1 Z"></path>
+						<path d="M73801.7 660.9 L73792.1 656.2 L73801.1 650.3 L73810.8 655.1 Z"></path>
 					</g>
-					<path d="M68082.7 680.0 L65510.25 966 L65510.25 1197 L65510.3 1197.0 " fill="none"></path>
+					<path d="M73792.1 656.8 L68651.75 966 L68651.75 1197 L68651.8 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68092.6 684.3 L68082.7 680.0 L68091.4 673.7 L68101.3 678.0 Z"></path>
+						<path d="M73801.8 661.6 L73792.1 656.8 L73801.1 651.0 L73810.8 655.7 Z"></path>
 					</g>
-					<path d="M68082.8 691.0 L66052 966 L66052 1174 L66052.0 1174.0 " fill="none"></path>
+					<path d="M73792.1 664.0 L69815.25 966 L69815.25 1174 L69815.3 1174.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68092.7 695.1 L68082.8 691.0 L68091.3 684.5 L68101.3 688.5 Z"></path>
+						<path d="M73801.8 668.6 L73792.1 664.0 L73801.0 658.0 L73810.8 662.6 Z"></path>
 					</g>
-					<path d="M68083.0 729.5 L67008 966 L67008 1212.5 L67008 1212.5 L67008 1459 L67008 1459 L67008 1697.5 L67008 1697.5 L67008 1936 L67008 1936 L67008 2565 L67008 2565 L67008 3194 L67008 3194 L67008 3380.5 L67008 3380.5 L67008 3567 L67008 3567 L67008 3723.5 L67008 3723.5 L67008 3880 L67008 3880 L62772.5 4006.025757743977 L62772.5 4006.0 " fill="none"></path>
+					<path d="M73792.4 715.6 L72471 966 L72471 1212.5 L72471 1212.5 L72471 1459 L72471 1459 L72471 1697.5 L72471 1697.5 L72471 1936 L72471 1936 L72471 2565 L72471 2565 L72471 3194 L72471 3194 L72471 3380.5 L72471 3380.5 L72471 3567 L72471 3567 L72471 3723.5 L72471 3723.5 L72471 3880 L72471 3880 L41851.25 4012.8373384270462 L41851.3 4012.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68093.3 732.7 L68083.0 729.5 L68091.0 722.2 L68101.3 725.4 Z"></path>
+						<path d="M73802.6 719.1 L73792.4 715.6 L73800.6 708.6 L73810.8 712.1 Z"></path>
 					</g>
-					<path d="M68083.0 732.1 L67048 966 L67048 1212.5 L67048 1212.5 L67048 1459 L67048 1459 L67048 1697.5 L67048 1697.5 L67048 1936 L67048 1936 L67048 2565 L67048 2565 L67048 3194 L67048 3194 L67048 3380.5 L67048 3380.5 L67048 3567 L67048 3567 L67048 3723.5 L67048 3723.5 L67048 3880 L67048 3880 L67048 4014 L67048 4014 L67048 4148 L67048 4148 L63694.5 4329.546516690856 L63694.5 4329.5 " fill="none"></path>
+					<path d="M73793.0 775.7 L73202 966 L73202 1212.5 L73202 1212.5 L73202 1459 L73202 1459 L73202 1697.5 L73202 1697.5 L73202 1936 L73202 1936 L73202 2565 L73202 2565 L73202 3194 L73202 3194 L73202 3380.5 L73202 3380.5 L73202 3567 L73202 3567 L73202 3723.5 L73202 3723.5 L73202 3880 L73202 3880 L73202 4014 L73202 4014 L73202 4148 L73202 4148 L41674.75 4333.960296501285 L41674.8 4334.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68093.3 735.3 L68083.0 732.1 L68091.0 724.9 L68101.3 728.0 Z"></path>
+						<path d="M73803.5 777.9 L73793.0 775.7 L73800.2 767.7 L73810.8 769.9 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M66624.8 144.8 L68537.25 293 L68537.25 313 L68537.3 313.0 " fill="none"></path>
+						<path d="M68072.1 139.2 L74246.75 293 L74246.75 313 L74246.8 313.0 " fill="none"></path>
 					</g>
-					<path d="M66625.2 139.5 L66624.8 144.8 L66624.4 150.1 L66611.5 143.7 Z"></path>
-					<path d="M29458.3 3323.9 L29470.75 3319.5 L29478.25 3319.5 L29478.25 3319.5 L29485.75 3380.5 L29485.75 3380.5 L29478.25 3441.5 L29478.25 3441.5 L29470.75 3441.5 L29470.75 3441.5 L29440.75 3430.7982456140353 L29440.8 3430.8 " fill="none"></path>
+					<path d="M68072.2 133.8 L68072.1 139.2 L68071.9 144.5 L68058.8 138.8 Z"></path>
+					<path d="M30761.6 3323.9 L30774 3319.5 L30781.5 3319.5 L30781.5 3319.5 L30789 3380.5 L30789 3380.5 L30781.5 3441.5 L30781.5 3441.5 L30774 3441.5 L30774 3441.5 L30744 3430.7982456140353 L30744.0 3430.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29447.7 3322.0 L29458.3 3323.9 L29451.3 3332.1 L29440.8 3330.2 Z"></path>
+						<path d="M30751.0 3322.0 L30761.6 3323.9 L30754.6 3332.1 L30744.0 3330.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M1655.5 2589.9 L1048.75 3194 L29158.75 3379.5691833917385 L29158.8 3379.6 " fill="none"></path>
+						<path d="M3118.2 2592.6 L3401.5 3194 L30462 3379.5332702240685 L30462.0 3379.5 " fill="none"></path>
+					</g>
+					<path d="M3123.1 2590.3 L3118.2 2592.6 L3113.4 2594.8 L3112.6 2580.5 Z"></path>
+					<path d="M72765.8 1319.6 L72673.75 1459 L76921.5 1690.2855145254266 L76921.5 1690.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M72775.4 1314.7 L72765.8 1319.6 L72766.5 1308.9 L72776.1 1304.0 Z"></path>
 					</g>
-					<path d="M1659.2 2593.7 L1655.5 2589.9 L1651.7 2586.1 L1664.9 2580.5 Z"></path>
-					<path d="M34740.8 2652.7 L34740.75 3194 L25241.25 3379.155118357109 L25241.3 3379.2 " fill="none"></path>
+					<path d="M72907.2 1319.6 L72999.25 1459 L72999.25 1697.5 L72999.25 1697.5 L72999.25 1936 L72999.25 1936 L72999.25 2565 L72999.25 2565 L72999.25 3194 L72999.25 3194 L70852 3373.398420875798 L70852.0 3373.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34746.1 2643.3 L34740.8 2652.7 L34735.4 2643.3 L34740.8 2634.0 Z"></path>
+						<path d="M72906.5 1308.9 L72907.2 1319.6 L72897.6 1314.7 L72896.9 1304.0 Z"></path>
 					</g>
-					<path d="M68088.4 754.4 L67327.75 966 L67327.75 1212.5 L67327.75 1212.5 L67327.75 1459 L67327.75 1459 L67327.75 1666.5 L67327.8 1666.5 " fill="none"></path>
-					<path d="M68089.8 759.5 L68088.4 754.4 L68087.0 749.2 L68101.3 750.8 Z"></path>
+					<path d="M62544.0 725.9 L61929.75 966 L72511 1205.143477662915 L72511.0 1205.1 " fill="none"></path>
+					<path d="M62546.0 730.8 L62544.0 725.9 L62542.1 720.9 L62556.4 721.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M58524.4 153.5 L58032.5 293 L58032.5 614 L58032.5 614.0 " fill="none"></path>
+						<path d="M80562.8 174.3 L80362 293 L80362 629.5 L80362 629.5 L80362 966 L80362 966 L73162 1201.8381502890174 L73162.0 1201.8 " fill="none"></path>
 					</g>
-					<path d="M58525.9 158.6 L58524.4 153.5 L58523.0 148.3 L58537.3 149.8 Z"></path>
-					<path d="M68718.5 3878.7 L68718.5 3880 L65486.25 4011.9989333333333 L65486.3 4012.0 " fill="none"></path>
+					<path d="M80565.5 178.9 L80562.8 174.3 L80560.1 169.7 L80574.3 167.5 Z"></path>
+					<path d="M34986.6 1711.6 L33468.75 1936 L27955.5 2547.584013050571 L27955.5 2547.6 " fill="none"></path>
+					<path d="M34987.3 1716.9 L34986.6 1711.6 L34985.8 1706.3 L34999.8 1709.6 Z"></path>
+					<path d="M78228.5 702.2 L78228.5 966 L76841.5 1164.7186864283638 L76841.5 1164.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68723.8 3869.3 L68718.5 3878.7 L68713.2 3869.3 L68718.5 3860.0 Z"></path>
+						<path d="M78233.8 692.8 L78228.5 702.2 L78223.2 692.8 L78228.5 683.5 Z"></path>
 					</g>
-					<path d="M50969.4 1322.6 L50785 1459 L50785 1682 L50785.0 1682.0 " fill="none"></path>
+					<path d="M78840.2 160.2 L78228.5 293 L78228.5 575.5 L78228.5 575.5 " fill="none"></path>
+					<path d="M78841.4 165.4 L78840.2 160.2 L78839.1 155.0 L78853.3 157.3 Z"></path>
+					<path d="M65131.0 235.3 L64995.25 293 L64995.25 614 L64995.3 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M50980.1 1321.3 L50969.4 1322.6 L50973.7 1312.8 L50984.4 1311.5 Z"></path>
+						<path d="M65141.7 236.6 L65131.0 235.3 L65137.5 226.7 L65148.2 228.0 Z"></path>
 					</g>
-					<path d="M51017.6 1325.4 L50898.5 1459 L50898.5 1697.5 L50898.5 1697.5 L50898.5 1936 L50898.5 1936 L50898.5 2565 L50898.5 2565 L50898.5 3194 L50898.5 3194 L21470 3380.224730252443 L21470.0 3380.2 " fill="none"></path>
+					<path d="M65358.4 246.6 L65356.25 293 L65356.25 614 L65356.3 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51027.8 1322.0 L51017.6 1325.4 L51019.8 1314.9 L51030.0 1311.5 Z"></path>
+						<path d="M65364.2 237.6 L65358.4 246.6 L65353.5 237.1 L65359.3 228.0 Z"></path>
 					</g>
-					<path d="M51118.3 1330.2 L51118.25 1459 L51118.25 1682 L51118.3 1682.0 " fill="none"></path>
+					<path d="M65596.0 235.3 L65731.75 293 L65731.75 614 L65731.8 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51123.6 1320.8 L51118.3 1330.2 L51112.9 1320.8 L51118.3 1311.5 Z"></path>
+						<path d="M65589.5 226.7 L65596.0 235.3 L65585.3 236.6 L65578.8 228.0 Z"></path>
 					</g>
-					<path d="M51358.9 1271.6 L52121.5 1459 L52121.5 1682 L52121.5 1682.0 " fill="none"></path>
+					<path d="M65664.6 210.4 L66001.25 293 L66001.25 614 L66001.3 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51351.1 1264.2 L51358.9 1271.6 L51348.5 1274.6 L51340.8 1267.2 Z"></path>
+						<path d="M65656.8 203.0 L65664.6 210.4 L65654.3 213.4 L65646.5 205.9 Z"></path>
 					</g>
-					<path d="M52734.4 1742.5 L52090.75 1936 L28430 2561.0768818841416 L28430.0 2561.1 " fill="none"></path>
+					<path d="M76369.7 1417.0 L76341.25 1459 L76341.25 1697.5 L76341.25 1697.5 L76341.25 1936 L76341.25 1936 L76341.25 2565 L76341.25 2565 L76341.25 3194 L76341.25 3194 L67892.5 3379.8291564702067 L67892.5 3379.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M52744.8 1745.0 L52734.4 1742.5 L52741.8 1734.8 L52752.3 1737.2 Z"></path>
+						<path d="M76379.3 1412.2 L76369.7 1417.0 L76370.5 1406.2 L76380.1 1401.5 Z"></path>
 					</g>
-					<path d="M52890.3 1770.1 L52904.25 1936 L52904.25 2565 L52904.25 2565 L52904.25 3194 L52904.25 3194 L52904.25 3380.5 L52904.25 3380.5 L52904.25 3567 L52904.25 3567 L52904.25 3723.5 L52904.25 3723.5 L52904.25 3880 L52904.25 3880 L10039.5 4013.775297385107 L10039.5 4013.8 " fill="none"></path>
+					<path d="M76491.2 1420.1 L76488 1459 L76980.4318658281 1666.5 L76980.4 1666.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M52894.9 1760.4 L52890.3 1770.1 L52884.2 1761.2 L52888.8 1751.5 Z"></path>
+						<path d="M76497.2 1411.2 L76491.2 1420.1 L76486.6 1410.4 L76492.7 1401.5 Z"></path>
 					</g>
-					<path d="M51354.0 1245.4 L52884.25 1459 L52884.25 1643.5 L52884.3 1643.5 " fill="none"></path>
-					<path d="M51354.7 1240.1 L51354.0 1245.4 L51353.2 1250.7 L51340.8 1243.6 Z"></path>
-					<path d="M56531.3 222.3 L56283.5 293 L56283.5 614 L56283.5 614.0 " fill="none"></path>
+					<path d="M76630.1 1417.5 L76654.75 1459 L76654.75 1697.5 L76654.75 1697.5 L76654.75 1936 L76654.75 1936 L76654.75 2565 L76654.75 2565 L76654.75 3194 L76654.75 3194 L65014 3379.599168608006 L65014.0 3379.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56541.7 224.9 L56531.3 222.3 L56538.8 214.6 L56549.3 217.2 Z"></path>
+						<path d="M76629.9 1406.8 L76630.1 1417.5 L76620.7 1412.2 L76620.5 1401.5 Z"></path>
 					</g>
-					<path d="M56708.1 240.0 L56644.5 293 L56644.5 614 L56644.5 614.0 " fill="none"></path>
+					<path d="M76662.5 1416.4 L76694.75 1459 L76694.75 1697.5 L76694.75 1697.5 L76694.75 1936 L76694.75 1936 L76694.75 2565 L76694.75 2565 L76694.75 3194 L76694.75 3194 L68373 3379.330790817088 L68373.0 3379.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56718.7 238.1 L56708.1 240.0 L56711.9 229.9 L56722.5 228.0 Z"></path>
+						<path d="M76661.1 1405.7 L76662.5 1416.4 L76652.6 1412.2 L76651.2 1401.5 Z"></path>
 					</g>
-					<path d="M56956.4 240.0 L57020 293 L57020 614 L57020.0 614.0 " fill="none"></path>
+					<path d="M74021.7 957.0 L74015.5 966 L76174.5 1179.5179538615848 L76174.5 1179.5 " fill="none"></path>
+					<path d="M74026.1 960.0 L74021.7 957.0 L74017.3 954.0 L74029.2 946.0 Z"></path>
+					<path d="M34986.6 1713.2 L33635 1936 L28186.5 2554.164953102453 L28186.5 2554.2 " fill="none"></path>
+					<path d="M34987.5 1718.4 L34986.6 1713.2 L34985.7 1707.9 L34999.8 1711.0 Z"></path>
+					<path d="M34987.1 1728.2 L34346.25 1936 L29541.5 2556.222205120312 L29541.5 2556.2 " fill="none"></path>
+					<path d="M34988.7 1733.3 L34987.1 1728.2 L34985.4 1723.1 L34999.8 1724.1 Z"></path>
+					<path d="M35176.8 1717.3 L36224 1936 L32584.75 2546.2201266244583 L32584.8 2546.2 " fill="none"></path>
+					<path d="M35177.9 1712.1 L35176.8 1717.3 L35175.7 1722.6 L35163.8 1714.6 Z"></path>
+					<path d="M18248.5 3803.7 L18248.5 3880 L17959.324626865673 3998.5 L17959.3 3998.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56952.6 229.9 L56956.4 240.0 L56945.8 238.1 L56942.0 228.0 Z"></path>
+						<path d="M18253.8 3794.3 L18248.5 3803.7 L18243.2 3794.3 L18248.5 3785.0 Z"></path>
 					</g>
-					<path d="M57117.2 234.0 L57289.5 293 L57289.5 614 L57289.5 614.0 " fill="none"></path>
+					<path d="M31778.7 1214.1 L18248.5 1459 L18248.5 1697.5 L18248.5 1697.5 L18248.5 1936 L18248.5 1936 L18248.5 2565 L18248.5 2565 L18248.5 3194 L18248.5 3194 L18248.5 3380.5 L18248.5 3380.5 L18248.5 3567 L18248.5 3567 L18248.5 3662 L18248.5 3662.0 " fill="none"></path>
+					<path d="M31778.8 1219.4 L31778.7 1214.1 L31778.6 1208.8 L31792.0 1213.9 Z"></path>
+					<path d="M34118.1 2622.0 L34041.5 3194 L44079.25 3379.44692785854 L44079.3 3379.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57110.1 226.0 L57117.2 234.0 L57106.7 236.1 L57099.6 228.0 Z"></path>
+						<path d="M34124.6 2613.5 L34118.1 2622.0 L34114.1 2612.0 L34120.6 2603.5 Z"></path>
 					</g>
-					<path d="M79552.8 702.2 L79552.75 966 L73999.75 1198.5345281576488 L73999.8 1198.5 " fill="none"></path>
+					<path d="M34135.8 2621.9 L34237.25 3194 L42606.25 3379.2713514155143 L42606.3 3379.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M79558.1 692.8 L79552.8 702.2 L79547.4 692.8 L79552.8 683.5 Z"></path>
+						<path d="M34139.5 2611.8 L34135.8 2621.9 L34129.0 2613.6 L34132.6 2603.5 Z"></path>
 					</g>
-					<path d="M80462.1 153.3 L79552.75 293 L79552.75 575.5 L79552.8 575.5 " fill="none"></path>
-					<path d="M80462.9 158.5 L80462.1 153.3 L80461.3 148.0 L80475.3 151.3 Z"></path>
-					<path d="M73511.8 1416.4 L73479.5 1459 L73479.5 1697.5 L73479.5 1697.5 L73479.5 1936 L73479.5 1936 L73479.5 2565 L73479.5 2565 L73479.5 3194 L73479.5 3194 L67493.25 3379.554597581751 L67493.3 3379.6 " fill="none"></path>
+					<path d="M34411.9 2659.9 L34317.25 3194 L44079.25 3379.4173541093796 L44079.3 3379.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73521.7 1412.2 L73511.8 1416.4 L73513.2 1405.7 L73523.1 1401.5 Z"></path>
+						<path d="M34418.8 2651.6 L34411.9 2659.9 L34408.3 2649.8 L34415.2 2641.5 Z"></path>
 					</g>
-					<path d="M73544.2 1417.5 L73519.5 1459 L73067.74161425576 1666.5 L73067.7 1666.5 " fill="none"></path>
+					<path d="M34446.2 2659.9 L34544.5 3194 L42606.25 3379.2248452369954 L42606.3 3379.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73553.5 1412.2 L73544.2 1417.5 L73544.4 1406.8 L73553.7 1401.5 Z"></path>
+						<path d="M34449.8 2649.7 L34446.2 2659.9 L34439.3 2651.6 L34442.8 2641.5 Z"></path>
 					</g>
-					<path d="M73683.1 1420.1 L73686.25 1459 L73686.25 1697.5 L73686.25 1697.5 L73686.25 1936 L73686.25 1936 L73686.25 2565 L73686.25 2565 L73686.25 3194 L73686.25 3194 L64803.25 3379.3212707645844 L64803.3 3379.3 " fill="none"></path>
+					<path d="M34452.2 2659.6 L34584.5 3194 L26291.75 3377.3167837141077 L26291.8 3377.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73687.7 1410.4 L73683.1 1420.1 L73677.0 1411.2 L73681.6 1401.5 Z"></path>
+						<path d="M34455.1 2649.3 L34452.2 2659.6 L34444.8 2651.8 L34447.7 2641.5 Z"></path>
 					</g>
-					<path d="M74016.5 1384.1 L74169.25 1459 L74169.25 1697.5 L74169.25 1697.5 L74169.25 1936 L74169.25 1936 L74169.25 2565 L74169.25 2565 L74169.25 3194 L74169.25 3194 L66358.5 3379.2548087622804 L66358.5 3379.3 " fill="none"></path>
+					<path d="M34713.1 2712.4 L34624.5 3194 L42906.25 3378.8040890191737 L42906.3 3378.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M74010.5 1375.3 L74016.5 1384.1 L74005.8 1384.8 L73999.8 1375.9 Z"></path>
+						<path d="M34720.1 2704.1 L34713.1 2712.4 L34709.6 2702.2 L34716.5 2694.0 Z"></path>
 					</g>
-					<path d="M68986.3 728.2 L70067.5 966 L73332.75 1189.6565821465788 L73332.8 1189.7 " fill="none"></path>
-					<path d="M68987.4 723.0 L68986.3 728.2 L68985.1 733.4 L68973.3 725.4 Z"></path>
-					<path d="M64081.4 1318.1 L63960 1459 L72867.75 1694.0043831752441 L72867.8 1694.0 " fill="none"></path>
+					<path d="M34739.4 2712.7 L34736.75 3194 L21335.5 3380.0072655217964 L21335.5 3380.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64091.6 1314.6 L64081.4 1318.1 L64083.5 1307.6 L64093.6 1304.0 Z"></path>
+						<path d="M34744.8 2703.4 L34739.4 2712.7 L34734.1 2703.3 L34739.5 2694.0 Z"></path>
 					</g>
-					<path d="M64243.2 1319.6 L64335.25 1459 L64335.25 1697.5 L64335.25 1697.5 L64335.25 1936 L64335.25 1936 L64335.25 2565 L64335.25 2565 L64335.25 3194 L64335.25 3194 L64878.96581769437 3365 L64879.0 3365.0 " fill="none"></path>
+					<path d="M43517.8 3498.2 L43517.75 3567 L43517.75 3708 L43517.8 3708.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64242.5 1308.9 L64243.2 1319.6 L64233.6 1314.7 L64232.9 1304.0 Z"></path>
-					</g>
-					<path d="M54756.5 663.5 L57300.75 966 L63847 1200.8238258085642 L63847.0 1200.8 " fill="none"></path>
-					<path d="M54757.1 658.2 L54756.5 663.5 L54755.9 668.8 L54743.3 662.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M76805.8 173.1 L76549 293 L76549 629.5 L76549 629.5 L76549 966 L76549 966 L64498 1206.0170888377165 L64498.0 1206.0 " fill="none"></path>
+						<path d="M43523.1 3488.8 L43517.8 3498.2 L43512.4 3488.8 L43517.8 3479.5 Z"></path>
 					</g>
-					<path d="M76808.0 178.0 L76805.8 173.1 L76803.5 168.3 L76817.8 167.5 Z"></path>
-					<path d="M27937.9 1717.2 L26882.75 1936 L29309 2526.7717990902934 L29309.0 2526.8 " fill="none"></path>
-					<path d="M27939.0 1722.4 L27937.9 1717.2 L27936.9 1712.0 L27951.0 1714.5 Z"></path>
-					<path d="M28005.0 1756.0 L27918.75 1936 L34234.25 2554.039595488137 L34234.3 2554.0 " fill="none"></path>
-					<path d="M28009.8 1758.3 L28005.0 1756.0 L28000.2 1753.7 L28010.7 1744.0 Z"></path>
-					<path d="M28100.3 1752.4 L28325 1936 L35061.5 2556.20762587822 L35061.5 2556.2 " fill="none"></path>
-					<path d="M28103.6 1748.3 L28100.3 1752.4 L28096.9 1756.6 L28089.9 1744.0 Z"></path>
-					<path d="M28125.2 1750.7 L28446.75 1936 L35292.5 2558.8134876152594 L35292.5 2558.8 " fill="none"></path>
-					<path d="M28127.9 1746.0 L28125.2 1750.7 L28122.6 1755.3 L28113.7 1744.0 Z"></path>
-					<path d="M21927.3 2644.6 L21786 3194 L25734.25 3376.050466654305 L25734.3 3376.1 " fill="none"></path>
+					<path d="M34765.6 2707.1 L34852.5 3194 L43381.25 3377.562144773665 L43381.3 3377.6 " fill="none"></path>
+					<path d="M34770.9 2706.2 L34765.6 2707.1 L34760.4 2708.1 L34763.3 2694.0 Z"></path>
+					<path d="M34774.6 2707.0 L34892.5 3194 L43694.25 3378.498173592964 L43694.3 3378.5 " fill="none"></path>
+					<path d="M34779.8 2705.7 L34774.6 2707.0 L34769.4 2708.2 L34771.5 2694.0 Z"></path>
+					<path d="M61892.4 2693.2 L61465.25 3194 L63303.25 3362.404323262098 L63303.3 3362.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21934.8 2636.9 L21927.3 2644.6 L21924.4 2634.2 L21931.9 2626.5 Z"></path>
+						<path d="M61902.5 2689.6 L61892.4 2693.2 L61894.4 2682.6 L61904.5 2679.0 Z"></path>
 					</g>
-					<path d="M21950.3 2645.2 L21967.75 3194 L20000 3372.9517859319762 L20000.0 3373.0 " fill="none"></path>
+					<path d="M62075.7 2695.2 L62358.75 3194 L70682 3378.614649302768 L70682.0 3378.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21955.3 2635.7 L21950.3 2645.2 L21944.7 2636.0 L21949.7 2626.5 Z"></path>
+						<path d="M62075.7 2684.5 L62075.7 2695.2 L62066.4 2689.7 L62066.5 2679.0 Z"></path>
 					</g>
-					<path d="M26651.2 1217.1 L21947.75 1459 L21947.75 1697.5 L21947.75 1697.5 L21947.75 1936 L21947.75 1936 L21947.75 2503.5 L21947.8 2503.5 " fill="none"></path>
-					<path d="M26651.5 1222.4 L26651.2 1217.1 L26650.9 1211.8 L26664.5 1216.4 Z"></path>
+					<path d="M62563.8 726.2 L62001.75 966 L62001.75 1212.5 L62001.75 1212.5 L62001.75 1459 L62001.75 1459 L62001.75 1697.5 L62001.75 1697.5 L62001.75 1936 L62001.75 1936 L62001.75 2451 L62001.8 2451.0 " fill="none"></path>
+					<path d="M62565.9 731.1 L62563.8 726.2 L62561.7 721.3 L62576.0 721.0 Z"></path>
+					<path d="M31778.7 1214.7 L21826.25 1459 L34999.75 1696.0246124250311 L34999.8 1696.0 " fill="none"></path>
+					<path d="M31778.8 1220.0 L31778.7 1214.7 L31778.5 1209.4 L31792.0 1214.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M1662.8 2591.6 L1260.75 3194 L1260.75 3342 L1260.8 3342.0 " fill="none"></path>
+						<path d="M13527.0 1256.8 L13527 1459 L34999.75 1696.5926825873648 L34999.8 1696.6 " fill="none"></path>
 					</g>
-					<path d="M1667.2 2594.6 L1662.8 2591.6 L1658.3 2588.6 L1670.2 2580.5 Z"></path>
-					<path d="M40131.2 1833.2 L39864 1936 L39864 2565 L39864 2565 L39864 3194 L39864 3194 L25644.25 3378.1495269507855 L25644.3 3378.1 " fill="none"></path>
+					<path d="M13532.3 1256.8 L13527.0 1256.8 L13521.7 1256.8 L13527.0 1243.5 Z"></path>
+					<path d="M36282.9 2652.3 L36181.25 3194 L44079.25 3379.1636706473914 L44079.3 3379.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40141.9 1834.8 L40131.2 1833.2 L40138.0 1824.9 L40148.7 1826.5 Z"></path>
+						<path d="M36289.8 2644.2 L36282.9 2652.3 L36279.3 2642.2 L36286.3 2634.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M44360.7 1218.4 L40484 1459 L40484 1568.5 L40484.0 1568.5 " fill="none"></path>
+					<path d="M36318.6 2652.2 L36438.75 3194 L26291.75 3377.8903410747257 L26291.8 3377.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M36321.8 2642.0 L36318.6 2652.2 L36311.4 2644.3 L36314.6 2634.0 Z"></path>
 					</g>
-					<path d="M44361.0 1223.7 L44360.7 1218.4 L44360.4 1213.1 L44374.0 1217.6 Z"></path>
-					<path d="M40251.8 1833.2 L40076 1936 L40076 2481 L40076.0 2481.0 " fill="none"></path>
-					<path d="M40254.5 1837.8 L40251.8 1833.2 L40249.1 1828.6 L40263.3 1826.5 Z"></path>
-					<path d="M40484.0 1839.8 L40484 1936 L40484 2496 L40484.0 2496.0 " fill="none"></path>
-					<path d="M40489.3 1839.8 L40484.0 1839.8 L40478.7 1839.8 L40484.0 1826.5 Z"></path>
-					<path d="M40892.0 2727.7 L40892 3194 L26688.25 3380.119996135673 L26688.3 3380.1 " fill="none"></path>
+					<path d="M63081.4 717.7 L63899.75 966 L63899.75 1212.5 L63899.75 1212.5 L63899.75 1459 L63899.75 1459 L63899.75 1697.5 L63899.75 1697.5 L63899.75 1936 L63899.75 1936 L63899.75 2565 L63899.75 2565 L63899.75 3194 L63899.75 3194 L74947.5 3378.4051976819637 L74947.5 3378.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40897.3 2718.3 L40892.0 2727.7 L40886.7 2718.3 L40892.0 2709.0 Z"></path>
+						<path d="M63074.0 709.9 L63081.4 717.7 L63070.9 720.1 L63063.5 712.3 Z"></path>
 					</g>
-					<path d="M40716.2 1833.2 L40892 1936 L40892 2421 L40892.0 2421.0 " fill="none"></path>
-					<path d="M40718.9 1828.6 L40716.2 1833.2 L40713.5 1837.8 L40704.7 1826.5 Z"></path>
-					<path d="M41276.0 2667.7 L41276 3194 L41276 3365 L41276.0 3365.0 " fill="none"></path>
+					<path d="M63081.4 714.7 L63939.75 966 L63939.75 1212.5 L63939.75 1212.5 L63939.75 1459 L63939.75 1459 L63939.75 1697.5 L63939.75 1697.5 L63939.75 1936 L63939.75 1936 L63939.75 2565 L63939.75 2565 L63939.75 3194 L63939.75 3194 L67699.5 3378.245779412731 L67699.5 3378.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41281.3 2658.3 L41276.0 2667.7 L41270.7 2658.3 L41276.0 2649.0 Z"></path>
+						<path d="M63074.0 706.9 L63081.4 714.7 L63071.0 717.2 L63063.5 709.4 Z"></path>
 					</g>
-					<path d="M40925.1 1830.3 L41276 1936 L41276 2481 L41276.0 2481.0 " fill="none"></path>
-					<path d="M40926.7 1825.2 L40925.1 1830.3 L40923.6 1835.5 L40912.4 1826.5 Z"></path>
-					<path d="M31684.3 1754.7 L31684.25 1936 L41900 2535.2871598778243 L41900.0 2535.3 " fill="none"></path>
+					<path d="M63081.5 711.8 L63979.75 966 L63979.75 1212.5 L63979.75 1212.5 L63979.75 1459 L63979.75 1459 L63979.75 1697.5 L63979.75 1697.5 L63979.75 1936 L63979.75 1936 L63979.75 2565 L63979.75 2565 L63979.75 3194 L63979.75 3194 L70682 3378.164370695053 L70682.0 3378.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31689.6 1745.3 L31684.3 1754.7 L31678.9 1745.3 L31684.3 1736.0 Z"></path>
+						<path d="M63073.9 704.2 L63081.5 711.8 L63071.0 714.4 L63063.5 706.7 Z"></path>
 					</g>
-					<path d="M25662.0 3316.0 L25674.25 3312 L25681.75 3312 L25681.75 3312 L25689.25 3380.5 L25689.25 3380.5 L25681.75 3449 L25681.75 3449 L25674.25 3449 L25674.25 3449 L25644.25 3439.2836879432625 L25644.3 3439.3 " fill="none"></path>
+					<path d="M54132.0 1277.2 L54132 1459 L54132 1666.5 L54132.0 1666.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25651.5 3313.8 L25662.0 3316.0 L25654.8 3323.9 L25644.3 3321.7 Z"></path>
+						<path d="M54137.3 1267.8 L54132.0 1277.2 L54126.7 1267.8 L54132.0 1258.5 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M34138.1 2616.5 L34277.25 3194 L43098.25 3377.966060944926 L43098.3 3378.0 " fill="none"></path>
 					</g>
+					<path d="M34143.3 2615.2 L34138.1 2616.5 L34133.0 2617.7 L34135.0 2603.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M1669.0 2592.8 L1421 3194 L25281.25 3379.0920430085166 L25281.3 3379.1 " fill="none"></path>
+						<path d="M36023.3 2646.8 L36023.25 3194 L43098.25 3377.351281873133 L43098.3 3377.4 " fill="none"></path>
 					</g>
-					<path d="M1674.0 2594.9 L1669.0 2592.8 L1664.1 2590.8 L1674.1 2580.5 Z"></path>
-					<path d="M32076.3 1747.2 L32076.25 1936 L41900 2534.159652476949 L41900.0 2534.2 " fill="none"></path>
+					<path d="M36028.6 2646.8 L36023.3 2646.8 L36017.9 2646.8 L36023.3 2633.5 Z"></path>
+					<path d="M56787.5 1321.6 L56556.25 1459 L56556.25 1644 L56556.3 1644.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32081.6 1737.8 L32076.3 1747.2 L32070.9 1737.8 L32076.3 1728.5 Z"></path>
+						<path d="M56798.2 1321.4 L56787.5 1321.6 L56792.8 1312.2 L56803.5 1312.1 Z"></path>
 					</g>
-					<path d="M22475.8 1762.7 L22475.75 1936 L41900 2549.0152277260013 L41900.0 2549.0 " fill="none"></path>
+					<path d="M56906.2 1350.4 L56855.25 1459 L35163.75 1696.6017980572715 L35163.8 1696.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22481.1 1753.3 L22475.8 1762.7 L22470.4 1753.3 L22475.8 1744.0 Z"></path>
+						<path d="M56915.0 1344.2 L56906.2 1350.4 L56905.4 1339.7 L56914.2 1333.5 Z"></path>
 					</g>
-					<path d="M26651.2 1217.7 L22475.75 1459 L22475.75 1651 L22475.8 1651.0 " fill="none"></path>
-					<path d="M26651.5 1223.0 L26651.2 1217.7 L26650.9 1212.3 L26664.5 1216.9 Z"></path>
-					<path d="M29108.3 1762.7 L29108.25 1936 L41900 2541.0428251837648 L41900.0 2541.0 " fill="none"></path>
+					<path d="M57061.4 1349.1 L57134.25 1459 L57134.25 1697.5 L57134.25 1697.5 L57134.25 1936 L57134.25 1936 L57134.25 2565 L57134.25 2565 L57134.25 3194 L57134.25 3194 L21335.5 3380.3152396101495 L21335.5 3380.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29113.6 1753.3 L29108.3 1762.7 L29102.9 1753.3 L29108.3 1744.0 Z"></path>
+						<path d="M57060.7 1338.3 L57061.4 1349.1 L57051.8 1344.2 L57051.1 1333.5 Z"></path>
 					</g>
-					<path d="M26829.8 1221.8 L29108.25 1459 L29108.25 1651 L29108.3 1651.0 " fill="none"></path>
-					<path d="M26830.3 1216.5 L26829.8 1221.8 L26829.2 1227.1 L26816.5 1220.4 Z"></path>
-					<path d="M29500.3 1785.2 L29500.25 1936 L41900 2540.3151767554477 L41900.0 2540.3 " fill="none"></path>
+					<path d="M57157.1 1227.5 L60032.75 1459 L60032.75 1697.5 L60032.75 1697.5 L60032.75 1936 L60032.75 1936 L60032.75 2565 L60032.75 2565 L60032.75 3194 L60032.75 3194 L24576.75 3379.3863018307215 L24576.8 3379.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29505.6 1775.8 L29500.3 1785.2 L29494.9 1775.8 L29500.3 1766.5 Z"></path>
+						<path d="M57148.2 1221.4 L57157.1 1227.5 L57147.4 1232.1 L57138.5 1226.0 Z"></path>
 					</g>
-					<path d="M26829.8 1220.5 L29500.25 1459 L29500.25 1628.5 L29500.3 1628.5 " fill="none"></path>
-					<path d="M26830.3 1215.2 L26829.8 1220.5 L26829.3 1225.8 L26816.5 1219.3 Z"></path>
-					<path d="M42114.7 3190.9 L42113.25 3194 L25644.25 3378.467043031741 L25644.3 3378.5 " fill="none"></path>
+					<path d="M36590.6 2689.7 L36478.75 3194 L21733 3380.1339362764174 L21733.0 3380.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42123.5 3184.7 L42114.7 3190.9 L42113.8 3180.2 L42122.6 3174.0 Z"></path>
+						<path d="M36597.8 2681.8 L36590.6 2689.7 L36587.4 2679.5 L36594.6 2671.5 Z"></path>
 					</g>
-					<path d="M42154.3 3191.3 L42153.25 3194 L64690.25 3380.0336158629693 L64690.3 3380.0 " fill="none"></path>
+					<path d="M36649.2 2689.6 L36774.25 3194 L21335.5 3380.0721440457532 L21335.5 3380.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42162.8 3184.6 L42154.3 3191.3 L42152.9 3180.7 L42161.3 3174.0 Z"></path>
+						<path d="M36652.1 2679.3 L36649.2 2689.6 L36641.7 2681.8 L36644.7 2671.5 Z"></path>
 					</g>
-					<path d="M42194.0 3191.7 L42193.25 3194 L42193.25 3380.5 L42193.25 3380.5 L42193.25 3567 L42193.25 3567 L42193.25 3723.5 L42193.25 3723.5 L42193.25 3880 L42193.25 3880 L65388.25 4013.7175184993976 L65388.3 4013.7 " fill="none"></path>
+					<path d="M35176.9 1715.1 L36370 1936 L32824.75 2547.7446677182634 L32824.8 2547.7 " fill="none"></path>
+					<path d="M35177.8 1709.9 L35176.9 1715.1 L35175.9 1720.4 L35163.8 1712.7 Z"></path>
+					<path d="M74624.9 2711.5 L74446 3194 L42866.25 3380.178694769119 L42866.3 3380.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42202.1 3184.6 L42194.0 3191.7 L42192.0 3181.1 L42200.0 3174.0 Z"></path>
+						<path d="M74633.2 2704.6 L74624.9 2711.5 L74623.2 2700.9 L74631.4 2694.0 Z"></path>
 					</g>
-					<path d="M42925.7 3127.5 L42987 3194 L25241.25 3379.777649139056 L25241.3 3379.8 " fill="none"></path>
+					<path d="M74665.3 2712.6 L74620 3194 L74979.4852546917 3342 L74979.5 3342.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42923.2 3117.1 L42925.7 3127.5 L42915.4 3124.3 L42913.0 3113.8 Z"></path>
+						<path d="M74671.5 2703.8 L74665.3 2712.6 L74660.9 2702.8 L74667.1 2694.0 Z"></path>
 					</g>
-					<path d="M42926.1 3091.7 L43027 3194 L66253.5 3380.079395592594 L66253.5 3380.1 " fill="none"></path>
+					<path d="M74719.9 2712.0 L74853.25 3194 L65014 3379.4351741909404 L65014.0 3379.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42923.4 3081.3 L42926.1 3091.7 L42915.8 3088.8 L42913.0 3078.4 Z"></path>
+						<path d="M74722.6 2701.6 L74719.9 2712.0 L74712.3 2704.4 L74714.9 2694.0 Z"></path>
 					</g>
-					<path d="M67303.0 1740.0 L67188.75 1936 L42913 2552.1444884947896 L42913.0 2552.1 " fill="none"></path>
-					<path d="M67307.6 1742.7 L67303.0 1740.0 L67298.4 1737.3 L67309.7 1728.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M77222.6 1746.5 L77075.25 1936 L42913 2555.810499369028 L42913.0 2555.8 " fill="none"></path>
+					<path d="M74729.2 2711.7 L74893.25 3194 L68373 3379.0103267277777 L68373.0 3379.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M74731.2 2701.1 L74729.2 2711.7 L74721.1 2704.6 L74723.1 2694.0 Z"></path>
 					</g>
-					<path d="M77226.8 1749.8 L77222.6 1746.5 L77218.4 1743.3 L77230.8 1736.0 Z"></path>
-					<path d="M56833.7 1844.6 L56810.75 1936 L56810.75 2565 L56810.75 2565 L56810.75 3194 L56810.75 3194 L56810.75 3380.5 L56810.75 3380.5 L56810.75 3567 L56810.75 3567 L56810.75 3723.5 L56810.75 3723.5 L56810.75 3880 L56810.75 3880 L65388.25 4013.238857010375 L65388.3 4013.2 " fill="none"></path>
+					<path d="M74664.1 954.2 L74679.25 966 L74679.25 1212.5 L74679.25 1212.5 L74679.25 1459 L74679.25 1459 L74679.25 1697.5 L74679.25 1697.5 L74679.25 1936 L74679.25 1936 L74679.25 2436 L74679.3 2436.0 " fill="none"></path>
+					<path d="M74667.3 950.0 L74664.1 954.2 L74660.8 958.4 L74653.5 946.0 Z"></path>
+					<path d="M35176.9 1713.5 L36503.75 1936 L33039.75 2549.5030268900464 L33039.8 2549.5 " fill="none"></path>
+					<path d="M35177.8 1708.2 L35176.9 1713.5 L35176.0 1718.7 L35163.8 1711.3 Z"></path>
+					<path d="M64340.3 3780.7 L64340.25 3880 L75100.5 4012.1879856065643 L75100.5 4012.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56841.2 1836.9 L56833.7 1844.6 L56830.8 1834.3 L56838.3 1826.5 Z"></path>
+						<path d="M64345.6 3771.3 L64340.3 3780.7 L64334.9 3771.3 L64340.3 3762.0 Z"></path>
 					</g>
-					<path d="M56858.4 1845.1 L56850.75 1936 L56850.75 2565 L56850.75 2565 L56850.75 3194 L56850.75 3194 L56850.75 3380.5 L56850.75 3380.5 L56850.75 3567 L56850.75 3567 L68578 3721.647226727897 L68578.0 3721.6 " fill="none"></path>
+					<path d="M63076.5 691.6 L64340.25 966 L64340.25 1212.5 L64340.25 1212.5 L64340.25 1459 L64340.25 1459 L64340.25 1697.5 L64340.25 1697.5 L64340.25 1936 L64340.25 1936 L64340.25 2565 L64340.25 2565 L64340.25 3194 L64340.25 3194 L64340.25 3380.5 L64340.25 3380.5 L64340.25 3567 L64340.25 3567 L64340.25 3685 L64340.3 3685.0 " fill="none"></path>
+					<path d="M63077.7 686.4 L63076.5 691.6 L63075.4 696.8 L63063.5 688.8 Z"></path>
+					<path d="M60207.7 1328.4 L60146.25 1459 L60146.25 1682 L60146.3 1682.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56864.5 1836.2 L56858.4 1845.1 L56853.8 1835.4 L56859.9 1826.5 Z"></path>
+						<path d="M60216.5 1322.2 L60207.7 1328.4 L60206.9 1317.7 L60215.7 1311.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M65930.9 1253.9 L65330.75 1459 L57186.75 1688.591489361702 L57186.8 1688.6 " fill="none"></path>
+					<path d="M60378.0 1324.5 L60517 1459 L60517 1697.5 L60517 1697.5 L60517 1936 L60517 1936 L60517 2565 L60517 2565 L60517 3194 L60517 3194 L27524 3380.254430705432 L27524.0 3380.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M60375.0 1314.2 L60378.0 1324.5 L60367.6 1321.8 L60364.6 1311.5 Z"></path>
 					</g>
-					<path d="M65932.6 1258.9 L65930.9 1253.9 L65929.2 1248.8 L65943.5 1249.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M55847.4 1254.7 L55714.75 1459 L56554.75 1632.3044982698962 L56554.8 1632.3 " fill="none"></path>
+					<path d="M60427.7 1321.8 L60635.5 1459 L60635.5 1682 L60635.5 1682.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M60422.9 1312.2 L60427.7 1321.8 L60417.0 1321.1 L60412.2 1311.5 Z"></path>
 					</g>
-					<path d="M55851.8 1257.6 L55847.4 1254.7 L55842.9 1251.8 L55854.6 1243.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M44360.7 1221.5 L41860 1459 L41860 1697.5 L41860 1697.5 L41860 1936 L41860 1936 L41860 2565 L41860 2565 L41860 3194 L41860 3194 L44827.5 3369.6112168808504 L44827.5 3369.6 " fill="none"></path>
+					<path d="M60502.2 1302.2 L60922 1459 L60922 1682 L60922.0 1682.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M60495.4 1293.9 L60502.2 1302.2 L60491.6 1303.9 L60484.8 1295.6 Z"></path>
 					</g>
-					<path d="M44361.2 1226.8 L44360.7 1221.5 L44360.2 1216.2 L44374.0 1220.2 Z"></path>
-					<path d="M43190.8 1794.0 L43033 1936 L43033 2549.5 L43033.0 2549.5 " fill="none"></path>
+					<path d="M61166.7 1762.0 L60909.5 1936 L37118.75 2561.098186033397 L37118.8 2561.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43201.3 1791.7 L43190.8 1794.0 L43194.2 1783.8 L43204.7 1781.5 Z"></path>
+						<path d="M61177.4 1761.1 L61166.7 1762.0 L61171.5 1752.3 L61182.2 1751.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M44361.0 1232.6 L43298 1459 L43298 1613.5 L43298.0 1613.5 " fill="none"></path>
+					<path d="M61268.1 1770.1 L61282 1936 L61282 2565 L61282 2565 L61282 3194 L61282 3194 L61282 3380.5 L61282 3380.5 L61282 3567 L61282 3567 L61282 3723.5 L61282 3723.5 L61282 3880 L61282 3880 L17993.5 4013.777493340713 L17993.5 4013.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M61272.6 1760.4 L61268.1 1770.1 L61262.0 1761.2 L61266.5 1751.5 Z"></path>
 					</g>
-					<path d="M44362.1 1237.8 L44361.0 1232.6 L44359.8 1227.4 L44374.0 1229.9 Z"></path>
-					<path d="M79811.8 1285.2 L79811.75 1459 L79811.75 1546 L79811.8 1546.0 " fill="none"></path>
+					<path d="M60497.7 1270.6 L61262 1459 L61262 1643.5 L61262.0 1643.5 " fill="none"></path>
+					<path d="M60499.0 1265.4 L60497.7 1270.6 L60496.4 1275.7 L60484.8 1267.4 Z"></path>
+					<path d="M35176.9 1712.1 L36632.5 1936 L33259.75 2548.651721897336 L33259.8 2548.7 " fill="none"></path>
+					<path d="M35177.7 1706.9 L35176.9 1712.1 L35176.1 1717.4 L35163.8 1710.1 Z"></path>
+					<path d="M63076.6 686.5 L64480.75 966 L64480.75 1181.5 L64480.8 1181.5 " fill="none"></path>
+					<path d="M63077.6 681.2 L63076.6 686.5 L63075.5 691.7 L63063.5 683.8 Z"></path>
+					<path d="M33344.7 2603.0 L32395.75 3194 L40735.25 3377.2479234167895 L40735.3 3377.2 " fill="none"></path>
+					<path d="M33347.5 2607.6 L33344.7 2603.0 L33341.8 2598.5 L33356.0 2596.0 Z"></path>
+					<path d="M37478.3 1747.2 L37478.25 1936 L62328.25 2554.3621798041736 L62328.3 2554.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M79817.1 1275.8 L79811.8 1285.2 L79806.4 1275.8 L79811.8 1266.5 Z"></path>
+						<path d="M37483.6 1737.8 L37478.3 1747.2 L37472.9 1737.8 L37478.3 1728.5 Z"></path>
 					</g>
-					<path d="M80462.2 159.0 L79811.75 293 L79811.75 629.5 L79811.75 629.5 L79811.75 966 L79811.75 966 L79811.75 1158.5 L79811.8 1158.5 " fill="none"></path>
-					<path d="M80463.3 164.2 L80462.2 159.0 L80461.1 153.7 L80475.3 156.3 Z"></path>
-					<path d="M79545.9 1748.1 L78559 1936 L78559 2565 L78559 2565 L78559 3194 L78559 3194 L64803.25 3379.7371083639523 L64803.3 3379.7 " fill="none"></path>
+					<path d="M30484.3 1762.7 L30484.25 1936 L38070.25 2555.4864005193117 L38070.3 2555.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M79556.1 1751.6 L79545.9 1748.1 L79554.1 1741.1 L79564.3 1744.6 Z"></path>
+						<path d="M30489.6 1753.3 L30484.3 1762.7 L30478.9 1753.3 L30484.3 1744.0 Z"></path>
 					</g>
-					<path d="M79545.9 1749.8 L78599 1936 L78599 2565 L78599 2565 L78599 3194 L78599 3194 L65013.25 3379.3404074392406 L65013.3 3379.3 " fill="none"></path>
+					<path d="M31778.9 1228.4 L30484.25 1459 L30484.25 1651 L30484.3 1651.0 " fill="none"></path>
+					<path d="M31779.8 1233.6 L31778.9 1228.4 L31777.9 1223.1 L31792.0 1226.0 Z"></path>
+					<path d="M78542.8 1285.2 L78542.75 1459 L78542.75 1501 L78542.8 1501.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M79556.1 1753.2 L79545.9 1749.8 L79554.1 1742.7 L79564.3 1746.2 Z"></path>
+						<path d="M78548.1 1275.8 L78542.8 1285.2 L78537.4 1275.8 L78542.8 1266.5 Z"></path>
 					</g>
-					<path d="M65463.1 2816.3 L65310.75 3194 L67432.25 3377.8567611524163 L67432.3 3377.9 " fill="none"></path>
+					<path d="M78856.3 172.3 L78542.75 293 L78542.75 629.5 L78542.75 629.5 L78542.75 966 L78542.75 966 L78542.75 1158.5 L78542.8 1158.5 " fill="none"></path>
+					<path d="M78858.2 177.3 L78856.3 172.3 L78854.4 167.3 L78868.7 167.5 Z"></path>
+					<path d="M52407.8 1768.3 L52026 1936 L52026 2481 L52026.0 2481.0 " fill="none"></path>
+					<path d="M52409.9 1773.2 L52407.8 1768.3 L52405.6 1763.4 L52420.0 1762.9 Z"></path>
+					<path d="M70637.2 2770.0 L70384.25 3194 L67892.5 3378.2447715333533 L67892.5 3378.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65471.6 2809.7 L65463.1 2816.3 L65461.7 2805.7 L65470.1 2799.0 Z"></path>
+						<path d="M70646.5 2764.7 L70637.2 2770.0 L70637.4 2759.3 L70646.7 2754.0 Z"></path>
 					</g>
-					<path d="M65479.0 2816.7 L65350.75 3194 L64796.94839142091 3365 L64796.9 3365.0 " fill="none"></path>
+					<path d="M70781.8 2772.6 L70827 3194 L67791.5 3377.7159662502027 L67791.5 3377.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65487.0 2809.6 L65479.0 2816.7 L65476.9 2806.1 L65485.0 2799.0 Z"></path>
+						<path d="M70786.1 2762.7 L70781.8 2772.6 L70775.5 2763.8 L70779.8 2754.0 Z"></path>
 					</g>
-					<path d="M65564.5 2817.7 L65564.5 3194 L65564.5 3380.5 L65564.5 3380.5 L65564.5 3567 L65564.5 3567 L65564.5 3723.5 L65564.5 3723.5 L65564.5 3880 L65564.5 3880 L65451.96921641791 3998.5 L65452.0 3998.5 " fill="none"></path>
+					<path d="M70903.3 2769.3 L71202.25 3194 L71202.25 3380.5 L71202.25 3380.5 L71202.25 3567 L71202.25 3567 L71202.25 3723.5 L71202.25 3723.5 L71202.25 3880 L71202.25 3880 L63146 4013.1899077758244 L63146.0 4013.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65569.8 2808.3 L65564.5 2817.7 L65559.2 2808.3 L65564.5 2799.0 Z"></path>
+						<path d="M70902.3 2758.6 L70903.3 2769.3 L70893.5 2764.7 L70892.5 2754.0 Z"></path>
 					</g>
-					<path d="M65639.6 2816.9 L65752 3194 L65752 3380.5 L65752 3380.5 L65752 3567 L65752 3567 L68578 3716.0878139221304 L68578.0 3716.1 " fill="none"></path>
+					<path d="M70915.9 2768.8 L71242.25 3194 L71242.25 3380.5 L71242.25 3380.5 L71242.25 3567 L71242.25 3567 L69337.25 3712.750427768272 L69337.3 3712.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65642.0 2806.4 L65639.6 2816.9 L65631.8 2809.5 L65634.3 2799.0 Z"></path>
+						<path d="M70914.5 2758.2 L70915.9 2768.8 L70906.0 2764.7 L70904.6 2754.0 Z"></path>
 					</g>
-					<path d="M65665.9 2816.3 L65818.25 3194 L66265.46313672922 3365 L66265.5 3365.0 " fill="none"></path>
+					<path d="M70928.5 2768.4 L71282.25 3194 L68373 3377.194099772094 L68373.0 3377.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65667.3 2805.7 L65665.9 2816.3 L65657.4 2809.7 L65658.9 2799.0 Z"></path>
+						<path d="M70926.6 2757.8 L70928.5 2768.4 L70918.4 2764.6 L70916.6 2754.0 Z"></path>
 					</g>
-					<path d="M67309.8 1740.8 L67228.75 1936 L65992 2403.427219468229 L65992.0 2403.4 " fill="none"></path>
-					<path d="M67314.7 1742.9 L67309.8 1740.8 L67304.8 1738.8 L67314.9 1728.5 Z"></path>
+					<path d="M74693.6 947.7 L74719.25 966 L74719.25 1212.5 L74719.25 1212.5 L74719.25 1459 L74719.25 1459 L74719.25 1697.5 L74719.25 1697.5 L74719.25 1936 L74719.25 1936 L71179 2498.3630911042364 L71179.0 2498.4 " fill="none"></path>
+					<path d="M74696.7 943.4 L74693.6 947.7 L74690.5 952.1 L74682.8 940.0 Z"></path>
+					<path d="M78290.0 1902.4 L78248.5 1936 L71179 2529.7662571771934 L71179.0 2529.8 " fill="none"></path>
+					<path d="M78293.3 1906.5 L78290.0 1902.4 L78286.6 1898.3 L78300.3 1894.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M65964.0 1257.0 L65564.5 1459 L65564.5 1697.5 L65564.5 1697.5 L65564.5 1936 L65564.5 1936 L65564.5 2331 L65564.5 2331.0 " fill="none"></path>
+						<path d="M69693.7 1240.0 L68726 1459 L68726 1697.5 L68726 1697.5 L68726 1936 L68726 1936 L70340 2435.2407179739366 L70340.0 2435.2 " fill="none"></path>
 					</g>
-					<path d="M65966.4 1261.8 L65964.0 1257.0 L65961.6 1252.3 L65975.9 1251.0 Z"></path>
+					<path d="M69694.9 1245.2 L69693.7 1240.0 L69692.6 1234.8 L69706.8 1237.1 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M77230.3 1747.4 L77115.25 1936 L65992 2541.7203428348807 L65992.0 2541.7 " fill="none"></path>
+						<path d="M80173.5 1262.6 L80062 1459 L80062 1697.5 L80062 1697.5 L80062 1936 L80062 1936 L71179 2536.6349905939264 L71179.0 2536.6 " fill="none"></path>
 					</g>
-					<path d="M77234.9 1750.2 L77230.3 1747.4 L77225.8 1744.6 L77237.3 1736.0 Z"></path>
+					<path d="M80178.2 1265.2 L80173.5 1262.6 L80168.9 1260.0 L80180.1 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M55853.8 1255.5 L55754.75 1459 L55754.75 1697.5 L55754.75 1697.5 L55754.75 1936 L55754.75 1936 L65137 2537.588750987538 L65137.0 2537.6 " fill="none"></path>
+						<path d="M41321.8 1230.2 L39907 1459 L39907 1697.5 L39907 1697.5 L39907 1936 L39907 1936 L70340 2556.447516408719 L70340.0 2556.4 " fill="none"></path>
 					</g>
-					<path d="M55858.6 1257.8 L55853.8 1255.5 L55849.0 1253.2 L55859.7 1243.5 Z"></path>
-					<path d="M45657.5 3498.2 L45657.5 3567 L67615.25 3722.981429365773 L67615.3 3723.0 " fill="none"></path>
+					<path d="M41322.7 1235.5 L41321.8 1230.2 L41321.0 1225.0 L41335.0 1228.1 Z"></path>
+					<path d="M65066.3 2720.2 L65051.25 3194 L64965.29155495978 3365 L64965.3 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45662.8 3488.8 L45657.5 3498.2 L45652.2 3488.8 L45657.5 3479.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M47115.7 1705.3 L44607.5 1936 L44607.5 2565 L44607.5 2565 L44607.5 3194 L44607.5 3194 L45509.5 3354.212380952381 L45509.5 3354.2 " fill="none"></path>
+						<path d="M65071.9 2711.0 L65066.3 2720.2 L65061.3 2710.7 L65066.9 2701.5 Z"></path>
 					</g>
-					<path d="M47116.2 1710.6 L47115.7 1705.3 L47115.2 1700.0 L47129.0 1704.1 Z"></path>
-					<path d="M80478.3 1285.2 L80478.25 1459 L80478.25 1501 L80478.3 1501.0 " fill="none"></path>
+					<path d="M65164.9 2717.4 L65457.75 3194 L68268 3377.0797746921667 L68268.0 3377.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M80483.6 1275.8 L80478.3 1285.2 L80472.9 1275.8 L80478.3 1266.5 Z"></path>
+						<path d="M65164.6 2706.7 L65164.9 2717.4 L65155.5 2712.2 L65155.1 2701.5 Z"></path>
 					</g>
-					<path d="M80546.0 179.0 L80478.25 293 L80478.25 629.5 L80478.25 629.5 L80478.25 966 L80478.25 966 L80478.25 1158.5 L80478.3 1158.5 " fill="none"></path>
-					<path d="M80550.6 181.7 L80546.0 179.0 L80541.4 176.2 L80552.8 167.5 Z"></path>
-					<path d="M42504.5 1747.2 L42504.5 1936 L66272 2555.923182185731 L66272.0 2555.9 " fill="none"></path>
+					<path d="M67134.0 1739.7 L67007.25 1936 L65419.25 2451.935950413223 L65419.3 2451.9 " fill="none"></path>
+					<path d="M67138.5 1742.6 L67134.0 1739.7 L67129.5 1736.8 L67141.2 1728.5 Z"></path>
+					<path d="M79357.3 1823.5 L79125.5 1936 L65419.25 2549.4252094562144 L65419.3 2549.4 " fill="none"></path>
+					<path d="M79359.6 1828.3 L79357.3 1823.5 L79354.9 1818.7 L79369.3 1817.7 Z"></path>
+					<path d="M78356.8 1908.0 L78332 1936 L78332 2565 L78332 2565 L78332 3194 L78332 3194 L78332 3380.5 L78332 3380.5 L78332 3567 L78332 3567 L70046 3722.133269529848 L70046.0 3722.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42509.8 1737.8 L42504.5 1747.2 L42499.2 1737.8 L42504.5 1728.5 Z"></path>
+						<path d="M78366.9 1904.5 L78356.8 1908.0 L78358.9 1897.5 L78369.1 1894.0 Z"></path>
 					</g>
-					<path d="M29881.3 1762.7 L29881.25 1936 L36816.75 2554.6088343732276 L36816.8 2554.6 " fill="none"></path>
+					<path d="M78617.7 1911.6 L78626.25 1936 L78626.25 2565 L78626.25 2565 L78626.25 3194 L78626.25 3194 L65014 3379.7290992226795 L65014.0 3379.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29886.6 1753.3 L29881.3 1762.7 L29875.9 1753.3 L29881.3 1744.0 Z"></path>
+						<path d="M78619.7 1901.0 L78617.7 1911.6 L78609.6 1904.6 L78611.5 1894.0 Z"></path>
 					</g>
-					<path d="M26829.8 1219.5 L29881.25 1459 L29881.25 1651 L29881.3 1651.0 " fill="none"></path>
-					<path d="M26830.2 1214.2 L26829.8 1219.5 L26829.4 1224.8 L26816.5 1218.5 Z"></path>
-					<path d="M44844.5 2652.7 L44844.5 3194 L45509.5 3346.5492004920047 L45509.5 3346.5 " fill="none"></path>
+					<path d="M46381.7 1217.7 L41996 1459 L41996 1598.5 L41996.0 1598.5 " fill="none"></path>
+					<path d="M46382.0 1223.0 L46381.7 1217.7 L46381.4 1212.4 L46395.0 1217.0 Z"></path>
+					<path d="M49558.3 3498.2 L49558.25 3567 L69900 3722.940380117317 L69900.0 3722.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44849.8 2643.3 L44844.5 2652.7 L44839.2 2643.3 L44844.5 2634.0 Z"></path>
+						<path d="M49563.6 3488.8 L49558.3 3498.2 L49552.9 3488.8 L49558.3 3479.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M47115.7 1706.1 L44844.5 1936 L44844.5 2496 L44844.5 2496.0 " fill="none"></path>
+						<path d="M45551.5 1707.4 L43600.25 1936 L43600.25 2565 L43600.25 2565 L43600.25 3194 L43600.25 3194 L49410.25 3375.8672373279624 L49410.3 3375.9 " fill="none"></path>
 					</g>
-					<path d="M47116.3 1711.4 L47115.7 1706.1 L47115.2 1700.8 L47129.0 1704.7 Z"></path>
-					<path d="M43298.0 1794.8 L43298 1936 L43298 2481 L43298.0 2481.0 " fill="none"></path>
-					<path d="M43303.3 1794.8 L43298.0 1794.8 L43292.7 1794.8 L43298.0 1781.5 Z"></path>
-					<path d="M43727.5 1747.2 L43727.5 1936 L65137 2552.6861519439485 L65137.0 2552.7 " fill="none"></path>
+					<path d="M45552.1 1712.7 L45551.5 1707.4 L45550.9 1702.1 L45564.8 1705.9 Z"></path>
+					<path d="M40353.5 1747.2 L40353.5 1936 L64723.25 2556.1443395940164 L64723.3 2556.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43732.8 1737.8 L43727.5 1747.2 L43722.2 1737.8 L43727.5 1728.5 Z"></path>
+						<path d="M40358.8 1737.8 L40353.5 1747.2 L40348.2 1737.8 L40353.5 1728.5 Z"></path>
 					</g>
-					<path d="M66577.3 2719.5 L66446 3194 L64803.25 3374.298881859644 L64803.3 3374.3 " fill="none"></path>
+					<path d="M43837.3 2652.7 L43837.25 3194 L49410.25 3375.6753190001746 L49410.3 3375.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66584.9 2711.9 L66577.3 2719.5 L66574.6 2709.1 L66582.2 2701.5 Z"></path>
+						<path d="M43842.6 2643.3 L43837.3 2652.7 L43831.9 2643.3 L43837.3 2634.0 Z"></path>
 					</g>
-					<path d="M66662.7 2719.5 L66794 3194 L66346.55764075067 3365 L66346.6 3365.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M66665.4 2709.1 L66662.7 2719.5 L66655.1 2711.9 L66657.8 2701.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M45551.5 1708.7 L43837.25 1936 L43837.25 2496 L43837.3 2496.0 " fill="none"></path>
 					</g>
-					<path d="M67316.9 1741.4 L67268.75 1936 L66760.78596979332 2428.5 L66760.8 2428.5 " fill="none"></path>
-					<path d="M67322.1 1742.7 L67316.9 1741.4 L67311.7 1740.2 L67320.1 1728.5 Z"></path>
-					<path d="M79995.4 1857.8 L80085 1936 L66968 2548.743631637579 L66968.0 2548.7 " fill="none"></path>
-					<path d="M79998.9 1853.7 L79995.4 1857.8 L79991.9 1861.8 L79985.3 1849.0 Z"></path>
-					<path d="M35561.1 2604.0 L34780.75 3194 L34780.75 3349.5 L34780.8 3349.5 " fill="none"></path>
-					<path d="M35564.3 2608.3 L35561.1 2604.0 L35557.9 2599.8 L35571.7 2596.0 Z"></path>
-					<path d="M71510.3 2771.3 L71342.5 3194 L67493.25 3379.033861717894 L67493.3 3379.0 " fill="none"></path>
+					<path d="M45552.2 1714.0 L45551.5 1708.7 L45550.8 1703.4 L45564.8 1707.0 Z"></path>
+					<path d="M62613.7 2815.2 L62398.75 3194 L67831.5 3379.4588157232415 L67831.5 3379.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71518.7 2764.6 L71510.3 2771.3 L71508.8 2760.7 L71517.2 2754.0 Z"></path>
+						<path d="M62623.0 2809.7 L62613.7 2815.2 L62613.7 2804.5 L62622.9 2799.0 Z"></path>
 					</g>
-					<path d="M71523.3 2771.7 L71382.5 3194 L55987.75 3379.9443922736914 L55987.8 3379.9 " fill="none"></path>
+					<path d="M62636.8 2815.9 L62457.5 3194 L64901 3376.2851 L64901.0 3376.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71531.3 2764.5 L71523.3 2771.7 L71521.2 2761.2 L71529.2 2754.0 Z"></path>
+						<path d="M62645.6 2809.7 L62636.8 2815.9 L62636.0 2805.1 L62644.8 2799.0 Z"></path>
 					</g>
-					<path d="M71592.3 2772.7 L71592.25 3194 L71592.25 3380.5 L71592.25 3380.5 L71592.25 3567 L71592.25 3567 L71592.25 3723.5 L71592.25 3723.5 L71592.25 3880 L71592.25 3880 L65486.25 4012.933225020309 L65486.3 4012.9 " fill="none"></path>
+					<path d="M62779.3 2817.6 L62814.5 3194 L62814.5 3380.5 L62814.5 3380.5 L62814.5 3567 L62814.5 3567 L62814.5 3723.5 L62814.5 3723.5 L62814.5 3880 L62814.5 3880 L63064.32276119403 3998.5 L63064.3 3998.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71597.6 2763.3 L71592.3 2772.7 L71586.9 2763.3 L71592.3 2754.0 Z"></path>
+						<path d="M62783.8 2807.8 L62779.3 2817.6 L62773.2 2808.8 L62777.6 2799.0 Z"></path>
 					</g>
-					<path d="M71710.9 2770.2 L71956 3194 L71956 3380.5 L71956 3380.5 L71956 3567 L71956 3567 L68859 3716.7082625482626 L68859.0 3716.7 " fill="none"></path>
+					<path d="M62795.4 2817.4 L62854.5 3194 L62854.5 3380.5 L62854.5 3380.5 L62854.5 3567 L62854.5 3567 L69056.25 3720.033052150262 L69056.3 3720.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71710.8 2759.4 L71710.9 2770.2 L71701.6 2764.7 L71701.5 2754.0 Z"></path>
+						<path d="M62799.2 2807.4 L62795.4 2817.4 L62788.7 2809.0 L62792.5 2799.0 Z"></path>
 					</g>
-					<path d="M71723.7 2769.7 L71996 3194 L66358.5 3378.7792179261864 L66358.5 3378.8 " fill="none"></path>
+					<path d="M62857.1 2816.3 L63009.5 3194 L68268 3378.656420636415 L68268.0 3378.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71723.1 2759.0 L71723.7 2769.7 L71714.1 2764.7 L71713.6 2754.0 Z"></path>
+						<path d="M62858.6 2805.7 L62857.1 2816.3 L62848.7 2809.7 L62850.1 2799.0 Z"></path>
 					</g>
-					<path d="M68986.5 664.7 L72827.75 966 L72827.75 1212.5 L72827.75 1212.5 L72827.75 1459 L72827.75 1459 L72827.75 1697.5 L72827.75 1697.5 L72827.75 1936 L72827.75 1936 L71963.48926868045 2376 L71963.5 2376.0 " fill="none"></path>
-					<path d="M68987.0 659.4 L68986.5 664.7 L68986.1 670.1 L68973.3 663.7 Z"></path>
-					<path d="M80209.6 1902.1 L80165 1936 L72011.75 2534.220436849319 L72011.8 2534.2 " fill="none"></path>
-					<path d="M80212.8 1906.3 L80209.6 1902.1 L80206.3 1897.8 L80220.2 1894.0 Z"></path>
+					<path d="M67140.7 1740.5 L67047.25 1936 L63183.25 2502.3418385180007 L63183.3 2502.3 " fill="none"></path>
+					<path d="M67145.5 1742.8 L67140.7 1740.5 L67135.9 1738.2 L67146.4 1728.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M65999.3 1259.9 L65778.25 1459 L65778.25 1697.5 L65778.25 1697.5 L65778.25 1936 L65778.25 1936 L71172.75 2519.6154970760235 L71172.8 2519.6 " fill="none"></path>
+						<path d="M69781.8 1262.1 L69649 1459 L69649 1697.5 L69649 1697.5 L69649 1936 L69649 1936 L63183.25 2525.991187030791 L63183.3 2526.0 " fill="none"></path>
 					</g>
-					<path d="M66002.9 1263.9 L65999.3 1259.9 L65995.8 1256.0 L66009.2 1251.0 Z"></path>
+					<path d="M69786.3 1265.0 L69781.8 1262.1 L69777.4 1259.1 L69789.3 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M77238.3 1748.2 L77155.25 1936 L72011.75 2517.5677691892865 L72011.8 2517.6 " fill="none"></path>
+						<path d="M80181.4 1263.4 L80102 1459 L80102 1697.5 L80102 1697.5 L80102 1936 L80102 1936 L63183.25 2549.498234488722 L63183.3 2549.5 " fill="none"></path>
 					</g>
-					<path d="M77243.2 1750.4 L77238.3 1748.2 L77233.4 1746.0 L77243.7 1736.0 Z"></path>
+					<path d="M80186.3 1265.4 L80181.4 1263.4 L80176.4 1261.4 L80186.4 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M55860.6 1256.2 L55794.75 1459 L55794.75 1697.5 L55794.75 1697.5 L55794.75 1936 L55794.75 1936 L71172.75 2548.2970090204144 L71172.8 2548.3 " fill="none"></path>
+						<path d="M41321.8 1230.7 L39947 1459 L39947 1697.5 L39947 1697.5 L39947 1936 L39947 1936 L62328.25 2553.2107743738698 L62328.3 2553.2 " fill="none"></path>
+					</g>
+					<path d="M41322.7 1236.0 L41321.8 1230.7 L41321.0 1225.4 L41335.0 1228.5 Z"></path>
+					<path d="M33356.0 2604.3 L32608 3194 L41071.25 3376.268093767141 L41071.3 3376.3 " fill="none"></path>
+					<path d="M33359.3 2608.4 L33356.0 2604.3 L33352.7 2600.1 L33366.4 2596.0 Z"></path>
+					<path d="M42994.5 1785.2 L42994.5 1936 L42994.5 2549.5 L42994.5 2549.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M42999.8 1775.8 L42994.5 1785.2 L42989.2 1775.8 L42994.5 1766.5 Z"></path>
+					</g>
+					<path d="M46381.7 1219.2 L42994.5 1459 L42994.5 1628.5 L42994.5 1628.5 " fill="none"></path>
+					<path d="M46382.1 1224.5 L46381.7 1219.2 L46381.3 1213.9 L46395.0 1218.3 Z"></path>
+					<path d="M45222.3 2651.0 L44980 3194 L64901 3379.9725441121263 L64901.0 3380.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M45231.0 2644.7 L45222.3 2651.0 L45221.3 2640.3 L45230.0 2634.0 Z"></path>
+					</g>
+					<path d="M45300.3 2651.0 L45550 3194 L49746.25 3376.095427840149 L49746.3 3376.1 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M45301.2 2640.3 L45300.3 2651.0 L45291.5 2644.7 L45292.5 2634.0 Z"></path>
+					</g>
+					<path d="M45822.5 2688.5 L45590 3194 L49989.25 3376.6390171962826 L49989.3 3376.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M45831.2 2682.2 L45822.5 2688.5 L45821.5 2677.8 L45830.3 2671.5 Z"></path>
 					</g>
-					<path d="M55865.6 1257.8 L55860.6 1256.2 L55855.5 1254.5 L55864.7 1243.5 Z"></path>
-					<path d="M44386.7 1267.3 L44146 1459 L44146 1598.5 L44146.0 1598.5 " fill="none"></path>
-					<path d="M44390.0 1271.5 L44386.7 1267.3 L44383.4 1263.1 L44397.1 1259.0 Z"></path>
-					<path d="M80478.3 1912.7 L80478.25 1936 L80478.25 2565 L80478.25 2565 L80478.25 3194 L80478.25 3194 L80478.25 3380.5 L80478.25 3380.5 L80478.25 3567 L80478.25 3567 L67761.25 3722.606763096169 L67761.3 3722.6 " fill="none"></path>
+					<path d="M45923.6 2689.1 L46104 3194 L27524 3380.064381023975 L27524.0 3380.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M80483.6 1903.3 L80478.3 1912.7 L80472.9 1903.3 L80478.3 1894.0 Z"></path>
+						<path d="M45925.5 2678.5 L45923.6 2689.1 L45915.4 2682.1 L45917.3 2671.5 Z"></path>
 					</g>
-					<path d="M80571.0 1911.1 L80581.75 1936 L80581.75 2565 L80581.75 2565 L80581.75 3194 L80581.75 3194 L64803.25 3379.8345595200503 L64803.3 3379.8 " fill="none"></path>
+					<path d="M46324.4 2689.1 L46144 3194 L50603.25 3376.6297282459514 L50603.3 3376.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M80572.1 1900.4 L80571.0 1911.1 L80562.3 1904.7 L80563.5 1894.0 Z"></path>
+						<path d="M46332.6 2682.1 L46324.4 2689.1 L46322.5 2678.5 L46330.7 2671.5 Z"></path>
 					</g>
-					<path d="M46281.2 2665.4 L45995.25 3194 L30930.75 3379.7969943457992 L30930.8 3379.8 " fill="none"></path>
+					<path d="M46391.1 2689.9 L46481.5 3194 L27524 3380.0730356297036 L27524.0 3380.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M46290.3 2659.7 L46281.2 2665.4 L46280.9 2654.7 L46290.1 2649.0 Z"></path>
+						<path d="M46394.7 2679.7 L46391.1 2689.9 L46384.2 2681.6 L46387.8 2671.5 Z"></path>
 					</g>
-					<path d="M46411.5 2663.8 L46819.5 3194 L45195.5 3361.5199115044247 L45195.5 3361.5 " fill="none"></path>
+					<path d="M14551.9 3329.9 L14563.75 3327 L14571.25 3327 L14571.25 3327 L14578.75 3380.5 L14578.75 3380.5 L14571.25 3434 L14571.25 3434 L14563.75 3434 L14563.75 3434 L14533.75 3426.7539503386006 L14533.8 3426.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M46410.1 2653.1 L46411.5 2663.8 L46401.6 2659.6 L46400.1 2649.0 Z"></path>
+						<path d="M14541.6 3326.9 L14551.9 3329.9 L14544.1 3337.2 L14533.8 3334.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M47116.1 1720.8 L46335.5 1936 L46335.5 2481 L46335.5 2481.0 " fill="none"></path>
+						<path d="M3119.8 2592.3 L3441.5 3194 L14150.75 3377.22364286861 L14150.8 3377.2 " fill="none"></path>
 					</g>
-					<path d="M47117.6 1725.9 L47116.1 1720.8 L47114.7 1715.6 L47129.0 1717.2 Z"></path>
-					<path d="M56382.1 2712.0 L56248.75 3194 L64690.25 3379.2600317721817 L64690.3 3379.3 " fill="none"></path>
+					<path d="M3124.5 2589.7 L3119.8 2592.3 L3115.1 2594.8 L3113.5 2580.5 Z"></path>
+					<path d="M30928.8 1777.7 L30928.75 1936 L40967 2535.5261233888004 L40967.0 2535.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56389.7 2704.4 L56382.1 2712.0 L56379.4 2701.6 L56387.1 2694.0 Z"></path>
+						<path d="M30934.1 1768.3 L30928.8 1777.7 L30923.4 1768.3 L30928.8 1759.0 Z"></path>
 					</g>
-					<path d="M56463.4 2712.0 L56596.75 3194 L66253.5 3379.491554445503 L66253.5 3379.5 " fill="none"></path>
+					<path d="M31796.0 1231.4 L30928.75 1459 L30928.75 1636 L30928.8 1636.0 " fill="none"></path>
+					<path d="M31797.4 1236.5 L31796.0 1231.4 L31794.7 1226.2 L31808.9 1228.0 Z"></path>
+					<path d="M76104.5 165.3 L76104.5 293 L76104.5 583 L76104.5 583.0 " fill="none"></path>
+					<path d="M76109.8 165.3 L76104.5 165.3 L76099.2 165.3 L76104.5 152.0 Z"></path>
+					<path d="M31447.8 1777.7 L31447.75 1936 L40967 2533.9983770692365 L40967.0 2534.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56466.1 2701.6 L56463.4 2712.0 L56455.8 2704.4 L56458.4 2694.0 Z"></path>
+						<path d="M31453.1 1768.3 L31447.8 1777.7 L31442.4 1768.3 L31447.8 1759.0 Z"></path>
 					</g>
-					<path d="M67331.5 1741.8 L67347.75 1936 L56770.75 2544.964118993135 L56770.8 2545.0 " fill="none"></path>
-					<path d="M67336.8 1741.3 L67331.5 1741.8 L67326.1 1742.2 L67330.3 1728.5 Z"></path>
-					<path d="M44567.5 1747.2 L44567.5 1936 L56074.75 2546.536281394319 L56074.8 2546.5 " fill="none"></path>
+					<path d="M31830.1 1234.7 L31447.75 1459 L31447.75 1636 L31447.8 1636.0 " fill="none"></path>
+					<path d="M31832.8 1239.3 L31830.1 1234.7 L31827.4 1230.1 L31841.6 1228.0 Z"></path>
+					<path d="M41311.8 2868.3 L41152 3194 L14533.75 3379.1678447206705 L14533.8 3379.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44572.8 1737.8 L44567.5 1747.2 L44562.2 1737.8 L44567.5 1728.5 Z"></path>
+						<path d="M41320.7 2862.2 L41311.8 2868.3 L41311.1 2857.5 L41320.0 2851.5 Z"></path>
 					</g>
-					<path d="M80897.3 2652.7 L80897.25 3194 L56589.75 3378.368658112532 L56589.8 3378.4 " fill="none"></path>
+					<path d="M41430.6 2870.1 L41398.75 3194 L64901 3380.05272457155 L64901.0 3380.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M80902.6 2643.3 L80897.3 2652.7 L80891.9 2643.3 L80897.3 2634.0 Z"></path>
+						<path d="M41436.8 2861.3 L41430.6 2870.1 L41426.2 2860.3 L41432.4 2851.5 Z"></path>
 					</g>
-					<path d="M80647.8 173.3 L80897.25 293 L80897.25 629.5 L80897.25 629.5 L80897.25 966 L80897.25 966 L80897.25 1212.5 L80897.25 1212.5 L80897.25 1459 L80897.25 1459 L80897.25 1697.5 L80897.25 1697.5 L80897.25 1936 L80897.25 1936 L80897.25 2496 L80897.3 2496.0 " fill="none"></path>
-					<path d="M80650.2 168.5 L80647.8 173.3 L80645.5 178.1 L80635.8 167.5 Z"></path>
-					<path d="M56308.8 3565.7 L56308.75 3567 L56308.75 3723.5 L56308.75 3723.5 L56308.75 3880 L56308.75 3880 L65388.25 4013.2807142465904 L65388.3 4013.3 " fill="none"></path>
+					<path d="M41579.7 2868.9 L41707.25 3194 L68268 3380.1320911576 L68268.0 3380.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56314.1 3556.3 L56308.8 3565.7 L56303.4 3556.3 L56308.8 3547.0 Z"></path>
+						<path d="M41581.3 2858.2 L41579.7 2868.9 L41571.3 2862.1 L41572.9 2851.5 Z"></path>
 					</g>
-					<path d="M42922.7 3056.5 L43067 3194 L56027.75 3376.542328242113 L56027.8 3376.5 " fill="none"></path>
-					<path d="M42926.3 3052.7 L42922.7 3056.5 L42919.0 3060.4 L42913.0 3047.3 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M41654.0 2609.3 L41654 3194 L56027.75 3376.923923983691 L56027.8 3376.9 " fill="none"></path>
+					<path d="M67147.7 1741.2 L67087.25 1936 L41954 2552.8872077028886 L41954.0 2552.9 " fill="none"></path>
+					<path d="M67152.8 1742.8 L67147.7 1741.2 L67142.6 1739.7 L67151.6 1728.5 Z"></path>
+					<path d="M42208.8 1757.5 L41460.5 1936 L41460.5 2278.5 L41460.5 2278.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M42219.2 1760.5 L42208.8 1757.5 L42216.7 1750.2 L42227.0 1753.2 Z"></path>
+					</g>
+					<path d="M42568.4 1793.9 L42727.25 1936 L42727.25 2565 L42727.25 2565 L42727.25 3194 L42727.25 3194 L51582.25 3377.8425359011467 L51582.3 3377.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M42565.0 1783.7 L42568.4 1793.9 L42557.9 1791.7 L42554.4 1781.5 Z"></path>
+					</g>
+					<path d="M67927.7 2755.1 L67670.25 3194 L67846.06367292225 3365 L67846.1 3365.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M67937.1 2749.7 L67927.7 2755.1 L67927.9 2744.4 L67937.2 2739.0 Z"></path>
 					</g>
-					<path d="M41659.3 2609.3 L41654.0 2609.3 L41648.7 2609.3 L41654.0 2596.0 Z"></path>
-					<path d="M35584.7 2607.1 L35193.25 3194 L35193.25 3334.5 L35193.3 3334.5 " fill="none"></path>
-					<path d="M35589.1 2610.1 L35584.7 2607.1 L35580.2 2604.1 L35592.1 2596.0 Z"></path>
-					<path d="M44550.1 1230.3 L45768 1459 L45768 1613.5 L45768.0 1613.5 " fill="none"></path>
-					<path d="M44551.1 1225.0 L44550.1 1230.3 L44549.1 1235.5 L44537.0 1227.8 Z"></path>
-					<path d="M68068.4 2826.5 L67662.25 3194 L67479.33042895442 3365 L67479.3 3365.0 " fill="none"></path>
+					<path d="M67972.2 2756.6 L67819 3194 L67751.60857908847 3365 L67751.6 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68078.9 2824.2 L68068.4 2826.5 L68071.8 2816.3 L68082.3 2814.0 Z"></path>
+						<path d="M67980.3 2749.6 L67972.2 2756.6 L67970.2 2746.0 L67978.3 2739.0 Z"></path>
 					</g>
-					<path d="M68084.6 2826.9 L67702.25 3194 L55987.75 3379.770524212406 L55987.8 3379.8 " fill="none"></path>
+					<path d="M68437.7 2383.3 L69418.25 1936 L69290.5393081761 1804 L69290.5 1804.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68095.1 2824.3 L68084.6 2826.9 L68087.7 2816.6 L68098.1 2814.0 Z"></path>
+						<path d="M68427.0 2382.3 L68437.7 2383.3 L68431.4 2392.0 L68420.7 2391.0 Z"></path>
 					</g>
-					<path d="M68180.9 2829.5 L67937.5 3194 L67937.5 3274 L67937.5 3274.0 " fill="none"></path>
+					<path d="M68084.7 2757.2 L68188 3194 L68188 3380.5 L68188 3380.5 L68188 3567 L68188 3567 L68188 3723.5 L68188 3723.5 L68188 3880 L68188 3880 L63146 4012.710273030839 L63146.0 4012.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68190.5 2824.7 L68180.9 2829.5 L68181.6 2818.8 L68191.2 2814.0 Z"></path>
+						<path d="M68087.7 2746.9 L68084.7 2757.2 L68077.4 2749.3 L68080.4 2739.0 Z"></path>
 					</g>
-					<path d="M68272.7 2831.8 L68157.5 3194 L64803.25 3377.4105768525983 L64803.3 3377.4 " fill="none"></path>
+					<path d="M68096.8 2756.9 L68228 3194 L68228 3380.5 L68228 3380.5 L68228 3567 L68228 3567 L69056.25 3700.802451612903 L69056.3 3700.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68280.6 2824.5 L68272.7 2831.8 L68270.4 2821.3 L68278.3 2814.0 Z"></path>
+						<path d="M68099.3 2746.4 L68096.8 2756.9 L68089.0 2749.5 L68091.5 2739.0 Z"></path>
 					</g>
-					<path d="M68366.0 2832.7 L68377.5 3194 L68377.5 3380.5 L68377.5 3380.5 L68377.5 3567 L68377.5 3567 L68377.5 3723.5 L68377.5 3723.5 L68377.5 3880 L68377.5 3880 L65486.25 4011.7668565598165 L65486.3 4011.8 " fill="none"></path>
+					<path d="M68124.7 2756.0 L68320.5 3194 L68320.5 3365 L68320.5 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68371.0 2823.2 L68366.0 2832.7 L68360.4 2823.5 L68365.4 2814.0 Z"></path>
+						<path d="M68125.7 2745.3 L68124.7 2756.0 L68116.0 2749.7 L68117.1 2739.0 Z"></path>
+					</g>
+					<path d="M74695.9 711.3 L76094.5 966 L76094.5 1212.5 L76094.5 1212.5 L76094.5 1459 L76094.5 1459 L76094.5 1697.5 L76094.5 1697.5 L76094.5 1936 L76094.5 1936 L68469.25 2531.423140188076 L68469.3 2531.4 " fill="none"></path>
+					<path d="M74696.8 706.0 L74695.9 711.3 L74694.9 716.5 L74682.8 708.9 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M69789.5 1262.9 L69689 1459 L69689 1697.5 L69689 1697.5 L69689 1936 L69689 1936 L68469.25 2401.0539475678133 L68469.3 2401.1 " fill="none"></path>
+					</g>
+					<path d="M69794.2 1265.3 L69789.5 1262.9 L69784.7 1260.4 L69795.5 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M41321.9 1231.2 L39987 1459 L39987 1697.5 L39987 1697.5 L39987 1936 L39987 1936 L67609.25 2555.358349152029 L67609.3 2555.4 " fill="none"></path>
 					</g>
-					<path d="M68412.8 2832.3 L68487.75 3194 L68487.75 3380.5 L68487.75 3380.5 L68487.75 3567 L68487.75 3567 L68578 3628.209642470206 L68578.0 3628.2 " fill="none"></path>
+					<path d="M41322.8 1236.5 L41321.9 1231.2 L41321.0 1226.0 L41335.0 1229.0 Z"></path>
+					<path d="M69081.0 1818.0 L68976.75 1936 L68976.75 2565 L68976.75 2565 L68976.75 3194 L68976.75 3194 L68976.75 3380.5 L68976.75 3380.5 L68976.75 3567 L68976.75 3567 L69056.25 3623.553409090909 L69056.3 3623.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68416.2 2822.1 L68412.8 2832.3 L68405.7 2824.2 L68409.1 2814.0 Z"></path>
+						<path d="M69091.2 1814.5 L69081.0 1818.0 L69083.2 1807.5 L69093.4 1804.0 Z"></path>
 					</g>
-					<path d="M68484.7 2830.8 L68658.5 3194 L66358.5 3376.3379383634433 L66358.5 3376.3 " fill="none"></path>
+					<path d="M69284.3 1818.6 L69378.25 1936 L68409.65699523053 2391 L68409.7 2391.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68485.5 2820.1 L68484.7 2830.8 L68475.9 2824.7 L68476.7 2814.0 Z"></path>
+						<path d="M69282.7 1808.0 L69284.3 1818.6 L69274.3 1814.6 L69272.7 1804.0 Z"></path>
 					</g>
-					<path d="M68986.5 662.1 L73172.75 966 L73172.75 1212.5 L73172.75 1212.5 L73172.75 1459 L73172.75 1459 L73172.75 1697.5 L73172.75 1697.5 L73172.75 1936 L73172.75 1936 L68808.5 2506.0873786407765 L68808.5 2506.1 " fill="none"></path>
-					<path d="M68986.9 656.8 L68986.5 662.1 L68986.2 667.4 L68973.3 661.2 Z"></path>
-					<path d="M56952.1 1838.0 L57008.75 1936 L67906.5 2540.003502588391 L67906.5 2540.0 " fill="none"></path>
-					<path d="M56956.7 1835.4 L56952.1 1838.0 L56947.5 1840.7 L56945.4 1826.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M66006.3 1260.7 L65818.25 1459 L65818.25 1697.5 L65818.25 1697.5 L65818.25 1936 L65818.25 1936 L67906.5 2453.2823668406027 L67906.5 2453.3 " fill="none"></path>
+						<path d="M69797.4 1263.6 L69729 1459 L69429.30188679245 1591 L69429.3 1591.0 " fill="none"></path>
 					</g>
-					<path d="M66010.2 1264.3 L66006.3 1260.7 L66002.4 1257.0 L66015.5 1251.0 Z"></path>
+					<path d="M69802.4 1265.3 L69797.4 1263.6 L69792.3 1261.8 L69801.8 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M77246.6 1748.9 L77195.25 1936 L68808.5 2532.901445503663 L68808.5 2532.9 " fill="none"></path>
+						<path d="M80189.5 1264.0 L80142 1459 L69609 1688.3231548678625 L69609.0 1688.3 " fill="none"></path>
 					</g>
-					<path d="M77251.8 1750.3 L77246.6 1748.9 L77241.5 1747.4 L77250.2 1736.0 Z"></path>
+					<path d="M80194.7 1265.2 L80189.5 1264.0 L80184.3 1262.7 L80192.6 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M55867.6 1256.7 L55834.75 1459 L55834.75 1697.5 L55834.75 1697.5 L55834.75 1936 L55834.75 1936 L67906.5 2542.3469086263003 L67906.5 2542.3 " fill="none"></path>
+						<path d="M41321.9 1231.7 L40027 1459 L68766 1694.0526054080005 L68766.0 1694.1 " fill="none"></path>
 					</g>
-					<path d="M55872.8 1257.5 L55867.6 1256.7 L55862.3 1255.8 L55869.7 1243.5 Z"></path>
-					<path d="M67937.5 3505.7 L67937.5 3567 L68578 3695.3460307298337 L68578.0 3695.3 " fill="none"></path>
+					<path d="M41322.8 1237.0 L41321.9 1231.7 L41320.9 1226.5 L41335.0 1229.4 Z"></path>
+					<path d="M47263.7 2650.7 L46990.5 3194 L17010.25 3379.5684516648275 L17010.3 3379.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67942.8 3496.3 L67937.5 3505.7 L67932.2 3496.3 L67937.5 3487.0 Z"></path>
+						<path d="M47272.6 2644.7 L47263.7 2650.7 L47263.1 2639.9 L47272.1 2634.0 Z"></path>
 					</g>
-					<path d="M68355.6 3278.0 L68698.5 3194 L68492.49046104928 2814 L68492.5 2814.0 " fill="none"></path>
+					<path d="M47329.3 2652.1 L47469.5 3194 L26291.75 3379.240441098878 L26291.8 3379.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68345.3 3275.1 L68355.6 3278.0 L68347.8 3285.4 L68337.5 3282.5 Z"></path>
+						<path d="M47332.1 2641.7 L47329.3 2652.1 L47321.8 2644.4 L47324.6 2634.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M66047.8 1264.3 L66032 1459 L66032 1697.5 L66032 1697.5 L66032 1936 L66032 1936 L66032 2565 L66032 2565 L66032 3194 L66032 3194 L67537.5 3341.3501705589083 L67537.5 3341.4 " fill="none"></path>
+						<path d="M45551.6 1712.0 L44243.25 1936 L44243.25 2503.5 L44243.3 2503.5 " fill="none"></path>
+					</g>
+					<path d="M45552.5 1717.2 L45551.6 1712.0 L45550.7 1706.7 L45564.8 1709.7 Z"></path>
+					<path d="M17028.1 3330.6 L17040.25 3327 L17047.75 3327 L17047.75 3327 L17055.25 3380.5 L17055.25 3380.5 L17047.75 3434 L17047.75 3434 L17040.25 3434 L17040.25 3434 L17010.25 3425.1080332409974 L17010.3 3425.1 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M17017.7 3328.1 L17028.1 3330.6 L17020.7 3338.4 L17010.3 3335.9 Z"></path>
 					</g>
-					<path d="M66053.1 1264.7 L66047.8 1264.3 L66042.5 1263.9 L66048.9 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M77363.3 1719.0 L78399 1936 L78399 2565 L78399 2565 L78399 3194 L78399 3194 L68337.5 3373.3690914304834 L68337.5 3373.4 " fill="none"></path>
+						<path d="M3121.4 2591.9 L3481.5 3194 L16709.25 3378.401949059107 L16709.3 3378.4 " fill="none"></path>
 					</g>
-					<path d="M77364.4 1713.8 L77363.3 1719.0 L77362.2 1724.2 L77350.3 1716.3 Z"></path>
+					<path d="M3125.9 2589.2 L3121.4 2591.9 L3116.8 2594.7 L3114.5 2580.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M55874.8 1256.8 L55874.75 1459 L55874.75 1697.5 L55874.75 1697.5 L55874.75 1936 L55874.75 1936 L55874.75 2565 L55874.75 2565 L55874.75 3194 L55874.75 3194 L67537.5 3374.3156722140475 L67537.5 3374.3 " fill="none"></path>
+						<path d="M46382.2 1240.2 L45636.25 1459 L45636.25 1666.5 L45636.3 1666.5 " fill="none"></path>
 					</g>
-					<path d="M55880.1 1256.8 L55874.8 1256.8 L55869.4 1256.8 L55874.8 1243.5 Z"></path>
-					<path d="M70408.1 2763.2 L70193.75 3194 L67493.25 3378.417154888319 L67493.3 3378.4 " fill="none"></path>
+					<path d="M46383.7 1245.3 L46382.2 1240.2 L46380.7 1235.0 L46395.0 1236.4 Z"></path>
+					<path d="M75594.7 2824.5 L75492.5 3194 L67892.5 3379.754537710504 L67892.5 3379.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70417.0 2757.2 L70408.1 2763.2 L70407.5 2752.5 L70416.4 2746.5 Z"></path>
+						<path d="M75602.3 2816.9 L75594.7 2824.5 L75592.1 2814.1 L75599.7 2806.5 Z"></path>
 					</g>
-					<path d="M70420.5 2763.6 L70233.75 3194 L55987.75 3379.8997341169884 L55987.8 3379.9 " fill="none"></path>
+					<path d="M75730.1 2824.6 L75820.5 3194 L65014 3379.5299871122156 L65014.0 3379.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70429.2 2757.2 L70420.5 2763.6 L70419.4 2752.9 L70428.0 2746.5 Z"></path>
+						<path d="M75733.0 2814.3 L75730.1 2824.6 L75722.7 2816.8 L75725.6 2806.5 Z"></path>
 					</g>
-					<path d="M70506.8 2765.2 L70506.75 3194 L70506.75 3380.5 L70506.75 3380.5 L70506.75 3567 L70506.75 3567 L70506.75 3723.5 L70506.75 3723.5 L70506.75 3880 L70506.75 3880 L65486.25 4012.704803235033 L65486.3 4012.7 " fill="none"></path>
+					<path d="M75746.5 2824.3 L75860.5 3194 L68373 3379.201425729443 L68373.0 3379.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70512.1 2755.8 L70506.8 2765.2 L70501.4 2755.8 L70506.8 2746.5 Z"></path>
+						<path d="M75748.8 2813.8 L75746.5 2824.3 L75738.6 2817.0 L75741.0 2806.5 Z"></path>
 					</g>
-					<path d="M70593.0 2763.6 L70779.75 3194 L70779.75 3380.5 L70779.75 3380.5 L70779.75 3567 L70779.75 3567 L68859 3712.832565191025 L68859.0 3712.8 " fill="none"></path>
+					<path d="M74695.9 709.6 L76134.5 966 L76134.5 1212.5 L76134.5 1212.5 L76134.5 1459 L76134.5 1459 L76134.5 1697.5 L76134.5 1697.5 L76134.5 1936 L76134.5 1936 L75846.18521462638 2323.5 L75846.2 2323.5 " fill="none"></path>
+					<path d="M74696.8 704.3 L74695.9 709.6 L74694.9 714.8 L74682.8 707.2 Z"></path>
+					<path d="M33405.8 2609.3 L33405.75 3194 L41504.25 3377.967143727162 L41504.3 3378.0 " fill="none"></path>
+					<path d="M33411.1 2609.3 L33405.8 2609.3 L33400.4 2609.3 L33405.8 2596.0 Z"></path>
+					<path d="M44659.3 2667.7 L44659.25 3194 L50215.25 3374.8366492146597 L50215.3 3374.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70594.1 2752.9 L70593.0 2763.6 L70584.3 2757.2 L70585.5 2746.5 Z"></path>
+						<path d="M44664.6 2658.3 L44659.3 2667.7 L44653.9 2658.3 L44659.3 2649.0 Z"></path>
 					</g>
-					<path d="M70605.4 2763.2 L70819.75 3194 L66358.5 3378.330794793686 L66358.5 3378.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M70606.0 2752.5 L70605.4 2763.2 L70596.5 2757.2 L70597.1 2746.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M45551.8 1718.1 L44659.25 1936 L44659.25 2481 L44659.3 2481.0 " fill="none"></path>
 					</g>
-					<path d="M68986.5 661.8 L73212.75 966 L73212.75 1212.5 L73212.75 1212.5 L73212.75 1459 L73212.75 1459 L73212.75 1697.5 L73212.75 1697.5 L73212.75 1936 L73212.75 1936 L71052.75 2438.0842572062083 L71052.8 2438.1 " fill="none"></path>
-					<path d="M68986.9 656.5 L68986.5 661.8 L68986.2 667.2 L68973.3 660.9 Z"></path>
+					<path d="M45553.1 1723.3 L45551.8 1718.1 L45550.5 1712.9 L45564.8 1715.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M66056.2 1264.3 L66072 1459 L66072 1697.5 L66072 1697.5 L66072 1936 L66072 1936 L69960.75 2487.5584305766956 L69960.8 2487.6 " fill="none"></path>
+						<path d="M45720.7 1717.7 L46634.25 1936 L46634.25 2565 L46634.25 2565 L46634.25 3194 L46634.25 3194 L50215.25 3371.8579227696405 L50215.3 3371.9 " fill="none"></path>
 					</g>
-					<path d="M66061.5 1263.9 L66056.2 1264.3 L66050.9 1264.7 L66055.1 1251.0 Z"></path>
+					<path d="M45722.0 1712.5 L45720.7 1717.7 L45719.5 1722.9 L45707.8 1714.6 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M77363.3 1718.3 L78439 1936 L71052.75 2521.704087743074 L71052.8 2521.7 " fill="none"></path>
+						<path d="M3122.9 2591.6 L3521.5 3194 L2451 3351.949564873418 L2451.0 3351.9 " fill="none"></path>
 					</g>
-					<path d="M77364.4 1713.0 L77363.3 1718.3 L77362.3 1723.5 L77350.3 1715.6 Z"></path>
+					<path d="M3127.3 2588.7 L3122.9 2591.6 L3118.4 2594.6 L3115.5 2580.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M55881.9 1256.7 L55914.75 1459 L55914.75 1697.5 L55914.75 1697.5 L55914.75 1936 L55914.75 1936 L69960.75 2541.464226973684 L69960.8 2541.5 " fill="none"></path>
+						<path d="M45720.9 1713.2 L46921.25 1936 L46921.25 2503.5 L46921.3 2503.5 " fill="none"></path>
+					</g>
+					<path d="M45721.8 1708.0 L45720.9 1713.2 L45719.9 1718.4 L45707.8 1710.8 Z"></path>
+					<path d="M43413.5 1747.2 L43413.5 1936 L66873.25 2555.8058510359024 L66873.3 2555.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M43418.8 1737.8 L43413.5 1747.2 L43408.2 1737.8 L43413.5 1728.5 Z"></path>
 					</g>
-					<path d="M55887.2 1255.8 L55881.9 1256.7 L55876.7 1257.5 L55879.8 1243.5 Z"></path>
-					<path d="M43687.5 2682.7 L43687.5 3194 L44827.5 3354.581570996979 L44827.5 3354.6 " fill="none"></path>
+					<path d="M31899.3 1762.7 L31899.25 1936 L40680 2556.275907572227 L40680.0 2556.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43692.8 2673.3 L43687.5 2682.7 L43682.2 2673.3 L43687.5 2664.0 Z"></path>
+						<path d="M31904.6 1753.3 L31899.3 1762.7 L31893.9 1753.3 L31899.3 1744.0 Z"></path>
 					</g>
-					<path d="M43446.6 1788.5 L43687.5 1936 L43687.5 2466 L43687.5 2466.0 " fill="none"></path>
-					<path d="M43449.3 1783.9 L43446.6 1788.5 L43443.8 1793.0 L43435.2 1781.5 Z"></path>
-					<path d="M30258.3 1762.7 L30258.25 1936 L36503.75 2552.80318731355 L36503.8 2552.8 " fill="none"></path>
+					<path d="M31871.6 1241.2 L31899.25 1459 L31899.25 1651 L31899.3 1651.0 " fill="none"></path>
+					<path d="M31876.9 1240.6 L31871.6 1241.2 L31866.4 1241.9 L31870.0 1228.0 Z"></path>
+					<path d="M52415.5 2682.7 L52415.5 3194 L54133.25 3362.4555672406996 L54133.3 3362.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30263.6 1753.3 L30258.3 1762.7 L30252.9 1753.3 L30258.3 1744.0 Z"></path>
+						<path d="M52420.8 2673.3 L52415.5 2682.7 L52410.2 2673.3 L52415.5 2664.0 Z"></path>
 					</g>
-					<path d="M26829.8 1218.8 L30258.25 1459 L30258.25 1651 L30258.3 1651.0 " fill="none"></path>
-					<path d="M26830.2 1213.4 L26829.8 1218.8 L26829.4 1224.1 L26816.5 1217.8 Z"></path>
-					<path d="M67372.0 2794.3 L67248.75 3194 L67444.96447721179 3365 L67445.0 3365.0 " fill="none"></path>
+					<path d="M52507.7 1792.7 L52415.5 1936 L52415.5 2466 L52415.5 2466.0 " fill="none"></path>
+					<path d="M52512.2 1795.6 L52507.7 1792.7 L52503.2 1789.8 L52514.9 1781.5 Z"></path>
+					<path d="M67157.8 2794.5 L67047.25 3194 L67831.5 3373.518410555385 L67831.5 3373.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67379.9 2787.0 L67372.0 2794.3 L67369.7 2783.8 L67377.5 2776.5 Z"></path>
+						<path d="M67165.4 2786.9 L67157.8 2794.5 L67155.1 2784.1 L67162.7 2776.5 Z"></path>
 					</g>
-					<path d="M67442.8 2795.2 L67442.75 3194 L64803.25 3376.591524480712 L64803.3 3376.6 " fill="none"></path>
+					<path d="M67354.8 2792.6 L67590.25 3194 L65014 3376.497626056405 L65014.0 3376.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67448.1 2785.8 L67442.8 2795.2 L67437.4 2785.8 L67442.8 2776.5 Z"></path>
+						<path d="M67354.6 2781.9 L67354.8 2792.6 L67345.4 2787.2 L67345.3 2776.5 Z"></path>
 					</g>
-					<path d="M67508.2 2794.5 L67622.25 3194 L66358.5 3373.0612535612536 L66358.5 3373.1 " fill="none"></path>
+					<path d="M67369.0 2792.1 L67630.25 3194 L68268 3366.314922129663 L68268.0 3366.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67510.8 2784.0 L67508.2 2794.5 L67500.5 2786.9 L67503.1 2776.5 Z"></path>
+						<path d="M67368.3 2781.4 L67369.0 2792.1 L67359.4 2787.2 L67358.8 2776.5 Z"></path>
 					</g>
-					<path d="M67348.5 1740.5 L67442.75 1936 L67442.75 2353.5 L67442.8 2353.5 " fill="none"></path>
-					<path d="M67353.3 1738.2 L67348.5 1740.5 L67343.7 1742.8 L67342.7 1728.5 Z"></path>
-					<path d="M56975.0 1837.2 L57048.75 1936 L67094.75 2543.9405426207427 L67094.8 2543.9 " fill="none"></path>
-					<path d="M56979.3 1834.0 L56975.0 1837.2 L56970.7 1840.4 L56967.0 1826.5 Z"></path>
-					<path d="M80021.3 1857.1 L80125 1936 L67790.75 2547.740286621065 L67790.8 2547.7 " fill="none"></path>
-					<path d="M80024.6 1852.8 L80021.3 1857.1 L80018.1 1861.3 L80010.7 1849.0 Z"></path>
+					<path d="M67172.3 1741.4 L67221.25 1936 L67221.25 2353.5 L67221.3 2353.5 " fill="none"></path>
+					<path d="M67177.5 1740.1 L67172.3 1741.4 L67167.1 1742.7 L67169.0 1728.5 Z"></path>
+					<path d="M62854.9 1830.1 L62592.5 1936 L66873.25 2517.7103429651634 L66873.3 2517.7 " fill="none"></path>
+					<path d="M62856.9 1835.0 L62854.9 1830.1 L62852.9 1825.1 L62867.3 1825.1 Z"></path>
+					<path d="M79357.5 1834.5 L79165.5 1936 L67569.25 2546.67385980702 L67569.3 2546.7 " fill="none"></path>
+					<path d="M79360.0 1839.3 L79357.5 1834.5 L79355.0 1829.8 L79369.3 1828.3 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M66064.5 1264.0 L66112 1459 L66112 1697.5 L66112 1697.5 L66112 1936 L66112 1936 L67094.75 2400.512305091114 L67094.8 2400.5 " fill="none"></path>
+						<path d="M69805.6 1264.1 L69769 1459 L69769 1697.5 L69769 1697.5 L69769 1936 L69769 1936 L67569.25 2479.0841919340596 L67569.3 2479.1 " fill="none"></path>
 					</g>
-					<path d="M66069.7 1262.7 L66064.5 1264.0 L66059.3 1265.2 L66061.4 1251.0 Z"></path>
+					<path d="M69810.8 1265.1 L69805.6 1264.1 L69800.3 1263.1 L69808.0 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M77363.3 1717.6 L78479 1936 L67790.75 2545.1660890248045 L67790.8 2545.2 " fill="none"></path>
+						<path d="M80197.8 1264.3 L80182 1459 L80182 1697.5 L80182 1697.5 L80182 1936 L80182 1936 L67569.25 2548.1111625484637 L67569.3 2548.1 " fill="none"></path>
 					</g>
-					<path d="M77364.4 1712.3 L77363.3 1717.6 L77362.3 1722.8 L77350.3 1715.0 Z"></path>
+					<path d="M80203.1 1264.7 L80197.8 1264.3 L80192.5 1263.9 L80198.9 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M55888.9 1256.2 L55954.75 1459 L55954.75 1697.5 L55954.75 1697.5 L55954.75 1936 L55954.75 1936 L67094.75 2545.9460306406686 L67094.8 2545.9 " fill="none"></path>
+						<path d="M41321.9 1232.3 L40067 1459 L40067 1697.5 L40067 1697.5 L40067 1936 L40067 1936 L66873.25 2556.93894141801 L66873.3 2556.9 " fill="none"></path>
 					</g>
-					<path d="M55894.0 1254.5 L55888.9 1256.2 L55883.9 1257.8 L55884.8 1243.5 Z"></path>
-					<path d="M50095.5 1747.2 L50095.5 1936 L67094.75 2552.3817463863147 L67094.8 2552.4 " fill="none"></path>
+					<path d="M41322.8 1237.6 L41321.9 1232.3 L41320.9 1227.1 L41335.0 1229.9 Z"></path>
+					<path d="M33417.8 2608.9 L33579 3194 L41767.25 3377.035223084529 L41767.3 3377.0 " fill="none"></path>
+					<path d="M33423.0 2607.4 L33417.8 2608.9 L33412.7 2610.3 L33414.3 2596.0 Z"></path>
+					<path d="M71626.5 2761.8 L71322.25 3194 L67892.5 3378.8561158875805 L67892.5 3378.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M50100.8 1737.8 L50095.5 1747.2 L50090.2 1737.8 L50095.5 1728.5 Z"></path>
+						<path d="M71636.2 2757.2 L71626.5 2761.8 L71627.5 2751.1 L71637.2 2746.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M47143.8 1736.0 L46849.5 1936 L46849.5 2503.5 L46849.5 2503.5 " fill="none"></path>
+					<path d="M71698.6 2764.2 L71555.25 3194 L67791.5 3378.248146203819 L67791.5 3378.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M71706.6 2757.0 L71698.6 2764.2 L71696.5 2753.7 L71704.5 2746.5 Z"></path>
+					</g>
+					<path d="M71838.7 2764.0 L71998 3194 L71998 3380.5 L71998 3380.5 L71998 3567 L71998 3567 L71998 3723.5 L71998 3723.5 L71998 3880 L71998 3880 L63146 4013.2623300752725 L63146.0 4013.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M71840.5 2753.4 L71838.7 2764.0 L71830.5 2757.1 L71832.2 2746.5 Z"></path>
+					</g>
+					<path d="M71851.2 2763.6 L72038 3194 L72038 3380.5 L72038 3380.5 L72038 3567 L72038 3567 L69337.25 3715.761064672239 L69337.3 3715.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M71852.4 2752.9 L71851.2 2763.6 L71842.6 2757.2 L71843.8 2746.5 Z"></path>
 					</g>
-					<path d="M47146.8 1740.4 L47143.8 1736.0 L47140.9 1731.6 L47154.9 1728.5 Z"></path>
-					<path d="M35612.8 2609.3 L35612.75 3194 L35612.75 3349.5 L35612.8 3349.5 " fill="none"></path>
-					<path d="M35618.1 2609.3 L35612.8 2609.3 L35607.4 2609.3 L35612.8 2596.0 Z"></path>
-					<path d="M28127.9 1722.5 L28939.25 1936 L35506.75 2555.0091406308534 L35506.8 2555.0 " fill="none"></path>
-					<path d="M28129.3 1717.3 L28127.9 1722.5 L28126.5 1727.6 L28115.0 1719.1 Z"></path>
-					<path d="M35633.7 2608.0 L35919.25 3194 L35919.25 3349.5 L35919.3 3349.5 " fill="none"></path>
-					<path d="M35638.5 2605.6 L35633.7 2608.0 L35628.9 2610.3 L35627.9 2596.0 Z"></path>
-					<path d="M47343.5 2667.7 L47343.5 3194 L49563 3366.9420304992686 L49563.0 3366.9 " fill="none"></path>
+					<path d="M71863.6 2763.2 L72078 3194 L68373 3377.8942115768464 L68373.0 3377.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47348.8 2658.3 L47343.5 2667.7 L47338.2 2658.3 L47343.5 2649.0 Z"></path>
+						<path d="M71864.3 2752.5 L71863.6 2763.2 L71854.7 2757.2 L71855.3 2746.5 Z"></path>
+					</g>
+					<path d="M74696.0 686.9 L76881.5 966 L76881.5 1212.5 L76881.5 1212.5 L76881.5 1459 L76881.5 1459 L76881.5 1697.5 L76881.5 1697.5 L76881.5 1936 L76881.5 1936 L72311 2497.8771621225446 L72311.0 2497.9 " fill="none"></path>
+					<path d="M74696.7 681.6 L74696.0 686.9 L74695.3 692.2 L74682.8 685.2 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M69813.9 1264.3 L69809 1459 L69809 1697.5 L69809 1697.5 L69809 1936 L69809 1936 L71219 2389.420245398773 L71219.0 2389.4 " fill="none"></path>
 					</g>
+					<path d="M69819.3 1264.5 L69813.9 1264.3 L69808.6 1264.2 L69814.3 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M47225.9 1739.9 L47343.5 1936 L47343.5 2481 L47343.5 2481.0 " fill="none"></path>
+						<path d="M80206.2 1264.3 L80222 1459 L80222 1697.5 L80222 1697.5 L80222 1936 L80222 1936 L72311 2524.3905640297976 L72311.0 2524.4 " fill="none"></path>
 					</g>
-					<path d="M47230.5 1737.2 L47225.9 1739.9 L47221.4 1742.7 L47219.1 1728.5 Z"></path>
+					<path d="M80211.5 1263.9 L80206.2 1264.3 L80200.9 1264.7 L80205.1 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M47262.6 1735.5 L47590.5 1936 L47590.5 2565 L47590.5 2565 L47590.5 3194 L47590.5 3194 L49563 3365.3819007686934 L49563.0 3365.4 " fill="none"></path>
+						<path d="M41321.9 1232.9 L40107 1459 L40107 1697.5 L40107 1697.5 L40107 1936 L40107 1936 L71219 2554.1517467938593 L71219.0 2554.2 " fill="none"></path>
+					</g>
+					<path d="M41322.9 1238.1 L41321.9 1232.9 L41320.9 1227.7 L41335.0 1230.5 Z"></path>
+					<path d="M26527.0 2637.6 L25771.5 3194 L28968 3375.034694807167 L28968.0 3375.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M26537.6 2636.3 L26527.0 2637.6 L26531.3 2627.7 L26542.0 2626.5 Z"></path>
+					</g>
+					<path d="M26746.8 2635.9 L27701.75 3194 L28762 3366.960091843429 L28762.0 3367.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M26741.5 2626.6 L26746.8 2635.9 L26736.1 2635.8 L26730.7 2626.5 Z"></path>
+					</g>
+					<path d="M31892.7 1237.5 L32111.25 1459 L32111.25 1697.5 L32111.25 1697.5 L32111.25 1936 L32111.25 1936 L26819.5 2542.755821902201 L26819.5 2542.8 " fill="none"></path>
+					<path d="M31896.5 1233.7 L31892.7 1237.5 L31888.9 1241.2 L31883.3 1228.0 Z"></path>
+					<path d="M58986.6 2709.0 L58625.5 3194 L64901 3378.8358733417563 L64901.0 3378.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M58996.4 2704.7 L58986.6 2709.0 L58987.9 2698.3 L58997.7 2694.0 Z"></path>
 					</g>
-					<path d="M47265.3 1730.9 L47262.6 1735.5 L47259.8 1740.0 L47251.2 1728.5 Z"></path>
-					<path d="M72250.7 2822.7 L72036 3194 L67493.25 3379.2561908926914 L67493.3 3379.3 " fill="none"></path>
+					<path d="M59134.4 2712.0 L59267.75 3194 L68268 3379.4184225787744 L68268.0 3379.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72260.0 2817.2 L72250.7 2822.7 L72250.8 2811.9 L72260.1 2806.5 Z"></path>
+						<path d="M59137.1 2701.6 L59134.4 2712.0 L59126.8 2704.4 L59129.4 2694.0 Z"></path>
 					</g>
-					<path d="M72399.8 2825.2 L72399.75 3194 L64803.25 3379.12312165164 L64803.3 3379.1 " fill="none"></path>
+					<path d="M67262.7 1732.9 L67845.25 1936 L59441.75 2539.988059189853 L59441.8 2540.0 " fill="none"></path>
+					<path d="M67264.5 1727.9 L67262.7 1732.9 L67261.0 1737.9 L67250.2 1728.5 Z"></path>
+					<path d="M33432.8 2607.2 L33808.75 3194 L42117.25 3375.5932555959216 L42117.3 3375.6 " fill="none"></path>
+					<path d="M33437.3 2604.3 L33432.8 2607.2 L33428.3 2610.1 L33425.6 2596.0 Z"></path>
+					<path d="M78961.8 2652.7 L78961.75 3194 L64300.25 3376.9927890245945 L64300.3 3377.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72405.1 2815.8 L72399.8 2825.2 L72394.4 2815.8 L72399.8 2806.5 Z"></path>
+						<path d="M78967.1 2643.3 L78961.8 2652.7 L78956.4 2643.3 L78961.8 2634.0 Z"></path>
 					</g>
-					<path d="M72479.7 2824.3 L72593.75 3194 L66358.5 3378.9428054550517 L66358.5 3378.9 " fill="none"></path>
+					<path d="M78952.8 180.8 L78961.75 293 L78961.75 629.5 L78961.75 629.5 L78961.75 966 L78961.75 966 L78961.75 1212.5 L78961.75 1212.5 L78961.75 1459 L78961.75 1459 L78961.75 1697.5 L78961.75 1697.5 L78961.75 1936 L78961.75 1936 L78961.75 2496 L78961.8 2496.0 " fill="none"></path>
+					<path d="M78958.1 180.4 L78952.8 180.8 L78947.5 181.2 L78951.7 167.5 Z"></path>
+					<path d="M46571.1 1229.6 L47841.5 1459 L47841.5 1613.5 L47841.5 1613.5 " fill="none"></path>
+					<path d="M46572.1 1224.3 L46571.1 1229.6 L46570.2 1234.8 L46558.0 1227.2 Z"></path>
+					<path d="M48241.0 1747.2 L48241 1936 L58745.75 2544.8307341457235 L58745.8 2544.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72482.1 2813.8 L72479.7 2824.3 L72471.9 2817.0 L72474.2 2806.5 Z"></path>
+						<path d="M48246.3 1737.8 L48241.0 1747.2 L48235.7 1737.8 L48241.0 1728.5 Z"></path>
 					</g>
-					<path d="M68986.5 661.6 L73252.75 966 L73252.75 1212.5 L73252.75 1212.5 L73252.75 1459 L73252.75 1459 L73252.75 1697.5 L73252.75 1697.5 L73252.75 1936 L73252.75 1936 L72727.25317965024 2323.5 L72727.3 2323.5 " fill="none"></path>
-					<path d="M68986.9 656.2 L68986.5 661.6 L68986.2 666.9 L68973.3 660.6 Z"></path>
-					<path d="M71535.7 1740.7 L69880.75 1936 L69880.75 2565 L69880.75 2565 L69880.75 3194 L69880.75 3194 L67493.25 3378.147539288668 L67493.3 3378.1 " fill="none"></path>
+					<path d="M47645.8 2667.1 L47509.5 3194 L44193.25 3377.348588156822 L44193.3 3377.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71545.6 1744.9 L71535.7 1740.7 L71544.4 1734.4 L71554.3 1738.6 Z"></path>
+						<path d="M47653.3 2659.4 L47645.8 2667.1 L47643.0 2656.7 L47650.5 2649.0 Z"></path>
 					</g>
-					<path d="M71535.7 1741.6 L69920.75 1936 L69920.75 2565 L69920.75 2565 L69920.75 3194 L69920.75 3194 L67339 3371.8544186905533 L67339.0 3371.9 " fill="none"></path>
+					<path d="M47690.7 2667.4 L47785.75 3194 L54133.25 3375.246076705198 L54133.3 3375.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71545.6 1745.8 L71535.7 1741.6 L71544.3 1735.2 L71554.3 1739.4 Z"></path>
+						<path d="M47694.3 2657.2 L47690.7 2667.4 L47683.8 2659.1 L47687.4 2649.0 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M45721.0 1707.4 L47672.25 1936 L47672.25 2481 L47672.3 2481.0 " fill="none"></path>
 					</g>
-					<path d="M71536.3 1805.3 L71092.75 1936 L71092.75 2565 L71092.75 2565 L71092.75 3194 L71092.75 3194 L71092.75 3380.5 L71092.75 3380.5 L71092.75 3567 L71092.75 3567 L71092.75 3723.5 L71092.75 3723.5 L71092.75 3880 L71092.75 3880 L63882 4011.313899364659 L63882.0 4011.3 " fill="none"></path>
+					<path d="M45721.6 1702.1 L45721.0 1707.4 L45720.4 1712.7 L45707.8 1705.9 Z"></path>
+					<path d="M64019.3 3565.7 L64019.25 3567 L64019.25 3723.5 L64019.25 3723.5 L64019.25 3880 L64019.25 3880 L63146 4006.8804554079697 L63146.0 4006.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71546.8 1807.8 L71536.3 1805.3 L71543.8 1797.6 L71554.3 1800.0 Z"></path>
+						<path d="M64024.6 3556.3 L64019.3 3565.7 L64013.9 3556.3 L64019.3 3547.0 Z"></path>
+					</g>
+					<path d="M55079.7 2748.8 L53822.25 3194 L63738.25 3375.3605962538 L63738.3 3375.4 " fill="none"></path>
+					<path d="M55081.5 2753.8 L55079.7 2748.8 L55077.9 2743.8 L55092.3 2744.3 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M52826.0 2609.3 L52826 3194 L63738.25 3375.818026489179 L63738.3 3375.8 " fill="none"></path>
 					</g>
-					<path d="M71536.4 1810.9 L71132.75 1936 L71132.75 2565 L71132.75 2565 L71132.75 3194 L71132.75 3194 L55987.75 3379.935257718386 L55987.8 3379.9 " fill="none"></path>
+					<path d="M52831.3 2609.3 L52826.0 2609.3 L52820.7 2609.3 L52826.0 2596.0 Z"></path>
+					<path d="M69630.6 2828.4 L69327.5 3194 L67892.5 3376.6185602183555 L67892.5 3376.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71546.9 1813.2 L71536.4 1810.9 L71543.8 1803.0 L71554.3 1805.4 Z"></path>
+						<path d="M69640.7 2824.6 L69630.6 2828.4 L69632.5 2817.8 L69642.6 2814.0 Z"></path>
 					</g>
-					<path d="M71805.8 1895.8 L71786.25 1936 L72164.20111287758 2323.5 L72164.2 2323.5 " fill="none"></path>
+					<path d="M69770.0 2831.9 L69662.75 3194 L67791.5 3376.0253618463944 L67791.5 3376.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71814.7 1889.7 L71805.8 1895.8 L71805.1 1885.1 L71814.0 1879.0 Z"></path>
+						<path d="M69777.7 2824.5 L69770.0 2831.9 L69767.5 2821.4 L69775.3 2814.0 Z"></path>
 					</g>
-					<path d="M71917.4 1897.6 L71920.25 1936 L68808.5 2485.3763946389727 L68808.5 2485.4 " fill="none"></path>
+					<path d="M69854.9 2832.7 L69862.75 3194 L69785.53820375336 3274 L69785.5 3274.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71922.0 1887.9 L71917.4 1897.6 L71911.3 1888.7 L71915.9 1879.0 Z"></path>
+						<path d="M69860.0 2823.2 L69854.9 2832.7 L69849.3 2823.4 L69854.4 2814.0 Z"></path>
 					</g>
-					<path d="M71950.8 1897.1 L71960.25 1936 L70926.16216216216 2383.5 L70926.2 2383.5 " fill="none"></path>
+					<path d="M69871.9 2832.6 L69902.75 3194 L65014 3378.3692179364034 L65014.0 3378.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71953.8 1886.8 L71950.8 1897.1 L71943.4 1889.3 L71946.4 1879.0 Z"></path>
+						<path d="M69876.4 2822.8 L69871.9 2832.6 L69865.8 2823.8 L69870.3 2814.0 Z"></path>
 					</g>
-					<path d="M71983.9 1896.3 L72000.25 1936 L69840.75 2460.5512647229193 L69840.8 2460.6 " fill="none"></path>
+					<path d="M70007.1 2830.0 L70224.25 3194 L70224.25 3380.5 L70224.25 3380.5 L70224.25 3567 L70224.25 3567 L70224.25 3723.5 L70224.25 3723.5 L70224.25 3880 L70224.25 3880 L63146 4013.0787470623313 L63146.0 4013.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71985.3 1885.6 L71983.9 1896.3 L71975.4 1889.7 L71976.8 1879.0 Z"></path>
+						<path d="M70006.9 2819.3 L70007.1 2830.0 L69997.8 2824.7 L69997.5 2814.0 Z"></path>
 					</g>
-					<path d="M72119.9 1891.4 L72170 1936 L71765.85055643879 2376 L71765.9 2376.0 " fill="none"></path>
+					<path d="M70023.7 2829.6 L70264.25 3194 L70264.25 3380.5 L70264.25 3380.5 L70264.25 3567 L70264.25 3567 L69337.25 3702.9021077283373 L69337.3 3702.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72116.5 1881.2 L72119.9 1891.4 L72109.4 1889.2 L72106.0 1879.0 Z"></path>
+						<path d="M70023.0 2818.9 L70023.7 2829.6 L70014.1 2824.7 L70013.4 2814.0 Z"></path>
 					</g>
-					<path d="M72268.3 1796.1 L72787.75 1936 L72787.75 2565 L72787.75 2565 L72787.75 3194 L72787.75 3194 L66358.5 3378.989412581479 L66358.5 3379.0 " fill="none"></path>
+					<path d="M70040.2 2829.1 L70304.25 3194 L68373 3375.5642722117204 L68373.0 3375.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72260.6 1788.5 L72268.3 1796.1 L72257.9 1798.8 L72250.3 1791.2 Z"></path>
+						<path d="M70039.0 2818.4 L70040.2 2829.1 L70030.4 2824.7 L70029.2 2814.0 Z"></path>
 					</g>
-					<path d="M68986.6 661.3 L73292.75 966 L73292.75 1212.5 L73292.75 1212.5 L73292.75 1459 L73292.75 1459 L72250.25 1637.8106796116506 L72250.3 1637.8 " fill="none"></path>
-					<path d="M68986.9 656.0 L68986.6 661.3 L68986.2 666.6 L68973.3 660.4 Z"></path>
+					<path d="M74696.0 680.2 L77226.5 966 L77226.5 1212.5 L77226.5 1212.5 L77226.5 1459 L77226.5 1459 L77226.5 1697.5 L77226.5 1697.5 L77226.5 1936 L77226.5 1936 L70300 2526.5480853947815 L70300.0 2526.5 " fill="none"></path>
+					<path d="M74696.6 674.9 L74696.0 680.2 L74695.4 685.5 L74682.8 678.7 Z"></path>
+					<path d="M62873.1 1831.8 L62632.5 1936 L69398 2525.6902237926975 L69398.0 2525.7 " fill="none"></path>
+					<path d="M62875.2 1836.7 L62873.1 1831.8 L62871.0 1826.9 L62885.4 1826.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M66072.6 1263.4 L66152 1459 L71554.25 1683.0661927742271 L71554.3 1683.1 " fill="none"></path>
+						<path d="M69822.3 1264.2 L69849 1459 L69849 1697.5 L69849 1697.5 L69849 1936 L69849 1936 L69849 2316 L69849.0 2316.0 " fill="none"></path>
 					</g>
-					<path d="M66077.6 1261.4 L66072.6 1263.4 L66067.7 1265.4 L66067.6 1251.0 Z"></path>
+					<path d="M69827.6 1263.5 L69822.3 1264.2 L69817.0 1264.9 L69820.5 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M44550.3 1221.0 L47200.5 1459 L47200.5 1666.5 L47200.5 1666.5 " fill="none"></path>
+						<path d="M80214.5 1264.0 L80262 1459 L80262 1697.5 L80262 1697.5 L80262 1936 L80262 1936 L70300 2537.7572265437434 L70300.0 2537.8 " fill="none"></path>
 					</g>
-					<path d="M44550.8 1215.7 L44550.3 1221.0 L44549.8 1226.3 L44537.0 1219.8 Z"></path>
+					<path d="M80219.7 1262.7 L80214.5 1264.0 L80209.3 1265.2 L80211.4 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M47285.3 1704.6 L50055.5 1936 L50055.5 2503.5 L50055.5 2503.5 " fill="none"></path>
+						<path d="M41322.2 1244.9 L40600 1459 L40600 1697.5 L40600 1697.5 L40600 1936 L40600 1936 L69398 2555.301241068071 L69398.0 2555.3 " fill="none"></path>
+					</g>
+					<path d="M41323.7 1250.0 L41322.2 1244.9 L41320.7 1239.8 L41335.0 1241.1 Z"></path>
+					<path d="M69682.8 3505.7 L69682.75 3567 L69337.25 3678.2566872427983 L69337.3 3678.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M69688.1 3496.3 L69682.8 3505.7 L69677.4 3496.3 L69682.8 3487.0 Z"></path>
 					</g>
-					<path d="M47285.7 1699.3 L47285.3 1704.6 L47284.8 1709.9 L47272.0 1703.5 Z"></path>
-					<path d="M20534.9 3330.6 L20547 3327 L20554.5 3327 L20554.5 3327 L20562 3380.5 L20562 3380.5 L20554.5 3434 L20554.5 3434 L20547 3434 L20547 3434 L20517 3425.1080332409974 L20517.0 3425.1 " fill="none"></path>
+					<path d="M70078.5 3268.9 L70344.25 3194 L70045.05286168521 2814 L70045.1 2814.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20524.4 3328.1 L20534.9 3330.6 L20527.5 3338.4 L20517.0 3335.9 Z"></path>
+						<path d="M70068.0 3266.3 L70078.5 3268.9 L70070.9 3276.6 L70060.5 3274.0 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M69937.0 1224.3 L72351 1459 L72351 1697.5 L72351 1697.5 L72351 1936 L72351 1936 L72351 2565 L72351 2565 L72351 3194 L72351 3194 L70082.75 3352.5416002998218 L70082.8 3352.5 " fill="none"></path>
 					</g>
+					<path d="M69937.5 1219.0 L69937.0 1224.3 L69936.5 1229.6 L69923.8 1223.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M1670.7 2593.1 L1461 3194 L20216 3379.0153394514823 L20216.0 3379.0 " fill="none"></path>
+						<path d="M80222.6 1263.4 L80302 1459 L80302 1697.5 L80302 1697.5 L80302 1936 L80302 1936 L80302 2565 L80302 2565 L80302 3194 L80302 3194 L70082.75 3373.475021776491 L70082.8 3373.5 " fill="none"></path>
 					</g>
-					<path d="M1675.7 2594.8 L1670.7 2593.1 L1665.7 2591.3 L1675.1 2580.5 Z"></path>
-					<path d="M50514.5 1785.2 L50514.5 1936 L50514.5 2549.5 L50514.5 2549.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M50519.8 1775.8 L50514.5 1785.2 L50509.2 1775.8 L50514.5 1766.5 Z"></path>
+					<path d="M80227.6 1261.4 L80222.6 1263.4 L80217.7 1265.4 L80217.6 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M41322.3 1246.5 L40640 1459 L40640 1697.5 L40640 1697.5 L40640 1936 L40640 1936 L40640 2565 L40640 2565 L40640 3194 L40640 3194 L69282.75 3377.931372717804 L69282.8 3377.9 " fill="none"></path>
 					</g>
-					<path d="M44550.3 1216.4 L50514.5 1459 L50514.5 1628.5 L50514.5 1628.5 " fill="none"></path>
-					<path d="M44550.5 1211.0 L44550.3 1216.4 L44550.1 1221.7 L44537.0 1215.8 Z"></path>
-					<path d="M45399.3 2867.6 L45209.75 3194 L19542 3379.1188791244913 L19542.0 3379.1 " fill="none"></path>
+					<path d="M41323.9 1251.6 L41322.3 1246.5 L41320.7 1241.4 L41335.0 1242.6 Z"></path>
+					<path d="M75098.2 1889.8 L75033 1936 L75033 2565 L75033 2565 L75033 3194 L75033 3194 L67892.5 3379.70677032492 L67892.5 3379.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45408.6 2862.2 L45399.3 2867.6 L45399.3 2856.9 L45408.6 2851.5 Z"></path>
+						<path d="M75108.9 1888.7 L75098.2 1889.8 L75102.8 1880.0 L75113.5 1879.0 Z"></path>
 					</g>
-					<path d="M45575.0 2870.2 L45575 3194 L64690.25 3379.950376204572 L64690.3 3380.0 " fill="none"></path>
+					<path d="M75129.4 1890.7 L75073 1936 L75073 2565 L75073 2565 L75073 3194 L75073 3194 L75073 3342 L75073.0 3342.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45580.3 2860.8 L45575.0 2870.2 L45569.7 2860.8 L45575.0 2851.5 Z"></path>
+						<path d="M75140.0 1889.0 L75129.4 1890.7 L75133.3 1880.7 L75143.9 1879.0 Z"></path>
 					</g>
-					<path d="M45757.9 2867.5 L45955.25 3194 L66253.5 3380.0188752257286 L66253.5 3380.0 " fill="none"></path>
+					<path d="M75260.9 1895.4 L75238.5 1936 L75238.5 2565 L75238.5 2565 L75238.5 3194 L75238.5 3194 L75238.5 3380.5 L75238.5 3380.5 L75238.5 3567 L75238.5 3567 L75238.5 3723.5 L75238.5 3723.5 L75238.5 3880 L75238.5 3880 L75239.91791044777 3900 L75239.9 3900.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45757.6 2856.7 L45757.9 2867.5 L45748.5 2862.2 L45748.2 2851.5 Z"></path>
+						<path d="M75270.0 1889.7 L75260.9 1895.4 L75260.7 1884.6 L75269.9 1879.0 Z"></path>
 					</g>
-					<path d="M67515.2 1730.8 L68669 1936 L46068.5 2551.558781501689 L46068.5 2551.6 " fill="none"></path>
-					<path d="M67516.1 1725.6 L67515.2 1730.8 L67514.3 1736.1 L67502.1 1728.5 Z"></path>
-					<path d="M30709.8 1777.7 L30709.75 1936 L45081.5 2544.118312843713 L45081.5 2544.1 " fill="none"></path>
+					<path d="M75293.6 1896.4 L75278.5 1936 L75278.5 2565 L75278.5 2565 L75278.5 3194 L75278.5 3194 L67791.5 3379.36114429842 L67791.5 3379.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30715.1 1768.3 L30709.8 1777.7 L30704.4 1768.3 L30709.8 1759.0 Z"></path>
+						<path d="M75302.0 1889.6 L75293.6 1896.4 L75292.0 1885.8 L75300.3 1879.0 Z"></path>
 					</g>
-					<path d="M26829.8 1218.0 L30709.75 1459 L30709.75 1636 L30709.8 1636.0 " fill="none"></path>
-					<path d="M26830.1 1212.7 L26829.8 1218.0 L26829.5 1223.4 L26816.5 1217.2 Z"></path>
-					<path d="M31228.8 1777.7 L31228.75 1936 L45081.5 2543.3628822863116 L45081.5 2543.4 " fill="none"></path>
+					<path d="M75610.1 1890.7 L75666.5 1936 L75666.5 2323.5 L75666.5 2323.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31234.1 1768.3 L31228.8 1777.7 L31223.4 1768.3 L31228.8 1759.0 Z"></path>
+						<path d="M75606.2 1880.7 L75610.1 1890.7 L75599.5 1889.0 L75595.6 1879.0 Z"></path>
 					</g>
-					<path d="M26829.8 1217.4 L31228.75 1459 L31228.75 1636 L31228.8 1636.0 " fill="none"></path>
-					<path d="M26830.1 1212.1 L26829.8 1217.4 L26829.5 1222.7 L26816.5 1216.7 Z"></path>
-					<path d="M47832.3 2689.9 L47742.5 3194 L50053 3373.2836488454336 L50053.0 3373.3 " fill="none"></path>
+					<path d="M75713.9 1888.0 L75800.5 1936 L70300 2517.334873561287 L70300.0 2517.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47839.2 2681.6 L47832.3 2689.9 L47828.6 2679.8 L47835.5 2671.5 Z"></path>
+						<path d="M75708.3 1878.9 L75713.9 1888.0 L75703.1 1888.2 L75697.6 1879.0 Z"></path>
 					</g>
-					<path d="M47898.8 2689.1 L48079.25 3194 L21470 3380.1956130230465 L21470.0 3380.2 " fill="none"></path>
+					<path d="M75734.4 1882.2 L75840.5 1936 L72311 2480.732057416268 L72311.0 2480.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47900.7 2678.5 L47898.8 2689.1 L47890.7 2682.1 L47892.6 2671.5 Z"></path>
+						<path d="M75728.5 1873.3 L75734.4 1882.2 L75723.7 1882.8 L75717.8 1873.8 Z"></path>
 					</g>
-					<path d="M48299.7 2689.1 L48119.25 3194 L50410 3373.111151870873 L50410.0 3373.1 " fill="none"></path>
+					<path d="M75734.7 1867.9 L75880.5 1936 L68469.25 2530.506775067751 L68469.3 2530.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48307.8 2682.1 L48299.7 2689.1 L48297.8 2678.5 L48305.9 2671.5 Z"></path>
+						<path d="M75728.5 1859.1 L75734.7 1867.9 L75724.0 1868.8 L75717.8 1860.0 Z"></path>
 					</g>
-					<path d="M48400.9 2688.5 L48634 3194 L21470 3380.2018193512818 L21470.0 3380.2 " fill="none"></path>
+					<path d="M75734.9 1855.6 L75920.5 1936 L71179 2513.8731834915716 L71179.0 2513.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48401.9 2677.7 L48400.9 2688.5 L48392.2 2682.2 L48393.1 2671.5 Z"></path>
+						<path d="M75728.4 1847.0 L75734.9 1855.6 L75724.2 1856.8 L75717.8 1848.2 Z"></path>
 					</g>
-					<path d="M19560.1 3329.9 L19572 3327 L19579.5 3327 L19579.5 3327 L19587 3380.5 L19587 3380.5 L19579.5 3434 L19579.5 3434 L19572 3434 L19572 3434 L19542 3426.7539503386006 L19542.0 3426.8 " fill="none"></path>
+					<path d="M75735.4 1824.8 L76054.5 1936 L76054.5 2565 L76054.5 2565 L76054.5 3194 L76054.5 3194 L68373 3379.233999224205 L68373.0 3379.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19549.8 3326.9 L19560.1 3329.9 L19552.3 3337.2 L19542.0 3334.2 Z"></path>
+						<path d="M75728.3 1816.7 L75735.4 1824.8 L75724.8 1826.8 L75717.8 1818.7 Z"></path>
 					</g>
+					<path d="M74696.0 678.2 L77351.25 966 L77351.25 1212.5 L77351.25 1212.5 L77351.25 1459 L77351.25 1459 L75717.75 1655.613550340651 L75717.8 1655.6 " fill="none"></path>
+					<path d="M74696.6 672.9 L74696.0 678.2 L74695.4 683.5 L74682.8 676.8 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M1672.4 2593.3 L1501 3194 L19159 3378.4991176223425 L19159.0 3378.5 " fill="none"></path>
+						<path d="M69937.0 1224.2 L72391 1459 L75021.75 1669.6366344943349 L75021.8 1669.6 " fill="none"></path>
 					</g>
-					<path d="M1677.5 2594.8 L1672.4 2593.3 L1667.3 2591.9 L1676.1 2580.5 Z"></path>
-					<path d="M48924.4 2651.0 L48674 3194 L64690.25 3379.844402793548 L64690.3 3379.8 " fill="none"></path>
+					<path d="M69937.5 1218.8 L69937.0 1224.2 L69936.5 1229.5 L69923.8 1222.9 Z"></path>
+					<path d="M63208.0 1844.9 L63223.25 1936 L63223.25 2565 L63223.25 2565 L63223.25 3194 L63223.25 3194 L63223.25 3380.5 L63223.25 3380.5 L63223.25 3567 L63223.25 3567 L63223.25 3723.5 L63223.25 3723.5 L63223.25 3880 L63223.25 3880 L63111.60354477612 3998.5 L63111.6 3998.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48933.1 2644.7 L48924.4 2651.0 L48923.4 2640.2 L48932.2 2634.0 Z"></path>
+						<path d="M63211.7 1834.8 L63208.0 1844.9 L63201.2 1836.6 L63204.9 1826.5 Z"></path>
 					</g>
-					<path d="M48995.2 2651.6 L49190.5 3194 L51057.5 3370.8836677673357 L51057.5 3370.9 " fill="none"></path>
+					<path d="M63232.5 1844.2 L63263.25 1936 L63263.25 2565 L63263.25 2565 L63263.25 3194 L63263.25 3194 L63263.25 3380.5 L63263.25 3380.5 L63263.25 3567 L63263.25 3567 L69056.25 3719.7942192635037 L69056.3 3719.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48997.0 2641.0 L48995.2 2651.6 L48987.0 2644.6 L48988.8 2634.0 Z"></path>
+						<path d="M63234.5 1833.7 L63232.5 1844.2 L63224.4 1837.0 L63226.5 1826.5 Z"></path>
 					</g>
-					<path d="M61111.8 165.3 L61111.75 293 L61111.75 583 L61111.8 583.0 " fill="none"></path>
-					<path d="M61117.1 165.3 L61111.8 165.3 L61106.4 165.3 L61111.8 152.0 Z"></path>
-					<path d="M51514.0 1790.6 L51255 1936 L46068.5 2510.350088028169 L46068.5 2510.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M51524.8 1790.7 L51514.0 1790.6 L51519.6 1781.4 L51530.3 1781.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M69937.0 1224.0 L72431 1459 L63499.25 1689.350341975075 L63499.3 1689.4 " fill="none"></path>
 					</g>
-					<path d="M51725.9 1798.5 L51788.5 1936 L51788.5 2565 L51788.5 2565 L51788.5 3194 L51788.5 3194 L49523 3370.5263212868185 L49523.0 3370.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M51726.9 1787.8 L51725.9 1798.5 L51717.2 1792.2 L51718.2 1781.5 Z"></path>
+					<path d="M69937.5 1218.7 L69937.0 1224.0 L69936.5 1229.3 L69923.8 1222.7 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M41509.5 1249.2 L41956 1459 L62867.25 1693.9495636504964 L62867.3 1693.9 " fill="none"></path>
 					</g>
-					<path d="M35654.6 2605.2 L36267.25 3194 L36267.25 3342 L36267.3 3342.0 " fill="none"></path>
-					<path d="M35658.3 2601.4 L35654.6 2605.2 L35650.9 2609.1 L35645.0 2596.0 Z"></path>
-					<path d="M69211.2 2751.8 L68738.5 3194 L67493.25 3376.041250244954 L67493.3 3376.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M69221.6 2749.3 L69211.2 2751.8 L69214.3 2741.5 L69224.8 2739.0 Z"></path>
+					<path d="M41511.8 1244.3 L41509.5 1249.2 L41507.3 1254.0 L41497.5 1243.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M46571.2 1227.7 L48010.5 1459 L48010.5 1697.5 L48010.5 1697.5 L48010.5 1936 L48010.5 1936 L48010.5 2565 L48010.5 2565 L48010.5 3194 L48010.5 3194 L54133.25 3375.0588456812147 L54133.3 3375.1 " fill="none"></path>
 					</g>
-					<path d="M69222.6 2752.2 L68778.5 3194 L55987.75 3379.83168442168 L55987.8 3379.8 " fill="none"></path>
+					<path d="M46572.0 1222.4 L46571.2 1227.7 L46570.3 1233.0 L46558.0 1225.6 Z"></path>
+					<path d="M48974.7 1832.5 L48668.25 1936 L48668.25 2565 L48668.25 2565 L48668.25 3194 L48668.25 3194 L39842.75 3376.7418396802486 L39842.8 3376.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69233.0 2749.4 L69222.6 2752.2 L69225.5 2741.8 L69235.9 2739.0 Z"></path>
+						<path d="M48985.3 1834.5 L48974.7 1832.5 L48981.8 1824.4 L48992.4 1826.5 Z"></path>
 					</g>
-					<path d="M69272.0 2754.1 L68949.25 3194 L68949.25 3274 L68949.3 3274.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M69281.9 2749.7 L69272.0 2754.1 L69273.3 2743.4 L69283.1 2739.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M46571.3 1220.6 L49374.25 1459 L49374.25 1568.5 L49374.3 1568.5 " fill="none"></path>
 					</g>
-					<path d="M69410.8 2757.7 L69410.75 3194 L69410.75 3380.5 L69410.75 3380.5 L69410.75 3567 L69410.75 3567 L69410.75 3723.5 L69410.75 3723.5 L69410.75 3880 L69410.75 3880 L65486.25 4012.347552535548 L65486.3 4012.3 " fill="none"></path>
+					<path d="M46571.7 1215.2 L46571.3 1220.6 L46570.8 1225.9 L46558.0 1219.4 Z"></path>
+					<path d="M49971.3 1827.6 L50469 1936 L50469 2481 L50469.0 2481.0 " fill="none"></path>
+					<path d="M49972.4 1822.4 L49971.3 1827.6 L49970.1 1832.8 L49958.3 1824.7 Z"></path>
+					<path d="M49971.4 1792.3 L50877 1936 L50877 2496 L50877.0 2496.0 " fill="none"></path>
+					<path d="M49972.3 1787.0 L49971.4 1792.3 L49970.6 1797.5 L49958.3 1790.2 Z"></path>
+					<path d="M51285.0 2727.7 L51285 3194 L21733 3380.3171630438455 L21733.0 3380.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69416.1 2748.3 L69410.8 2757.7 L69405.4 2748.3 L69410.8 2739.0 Z"></path>
+						<path d="M51290.3 2718.3 L51285.0 2727.7 L51279.7 2718.3 L51285.0 2709.0 Z"></path>
 					</g>
-					<path d="M69470.2 2756.8 L69605.75 3194 L69605.75 3380.5 L69605.75 3380.5 L69605.75 3567 L69605.75 3567 L68859 3698.71752606368 L68859.0 3698.7 " fill="none"></path>
+					<path d="M49971.5 1772.0 L51285 1936 L51285 2421 L51285.0 2421.0 " fill="none"></path>
+					<path d="M49972.1 1766.8 L49971.5 1772.0 L49970.8 1777.3 L49958.3 1770.4 Z"></path>
+					<path d="M51669.0 2667.7 L51669 3194 L55318.75 3375.623207257688 L55318.8 3375.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69472.6 2746.3 L69470.2 2756.8 L69462.4 2749.5 L69464.7 2739.0 Z"></path>
+						<path d="M51674.3 2658.3 L51669.0 2667.7 L51663.7 2658.3 L51669.0 2649.0 Z"></path>
 					</g>
-					<path d="M69482.3 2756.5 L69645.75 3194 L66358.5 3377.568268582978 L66358.5 3377.6 " fill="none"></path>
+					<path d="M49971.5 1759.6 L51669 1936 L51669 2481 L51669.0 2481.0 " fill="none"></path>
+					<path d="M49972.1 1754.3 L49971.5 1759.6 L49971.0 1764.9 L49958.3 1758.2 Z"></path>
+					<path d="M32327.3 1785.2 L32327.25 1936 L55092.25 2551.309928453258 L55092.3 2551.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69484.0 2745.9 L69482.3 2756.5 L69474.0 2749.6 L69475.8 2739.0 Z"></path>
+						<path d="M32332.6 1775.8 L32327.3 1785.2 L32321.9 1775.8 L32327.3 1766.5 Z"></path>
 					</g>
-					<path d="M68986.6 656.2 L74209.25 966 L74209.25 1212.5 L74209.25 1212.5 L74209.25 1459 L74209.25 1459 L74209.25 1697.5 L74209.25 1697.5 L74209.25 1936 L74209.25 1936 L69840.75 2508.6344691049285 L69840.8 2508.6 " fill="none"></path>
-					<path d="M68986.9 650.8 L68986.6 656.2 L68986.2 661.5 L68973.3 655.4 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M66080.5 1262.6 L66192 1459 L66192 1697.5 L66192 1697.5 L66192 1936 L66192 1936 L68980.75 2480.9704854368933 L68980.8 2481.0 " fill="none"></path>
+					<path d="M31908.6 1234.3 L32327.25 1459 L32327.25 1628.5 L32327.3 1628.5 " fill="none"></path>
+					<path d="M31911.1 1229.6 L31908.6 1234.3 L31906.1 1239.0 L31896.9 1228.0 Z"></path>
+					<path d="M39860.5 3316.0 L39872.75 3312 L39880.25 3312 L39880.25 3312 L39887.75 3380.5 L39887.75 3380.5 L39880.25 3449 L39880.25 3449 L39872.75 3449 L39872.75 3449 L39842.75 3439.2836879432625 L39842.8 3439.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M39850.0 3313.8 L39860.5 3316.0 L39853.3 3323.9 L39842.8 3321.7 Z"></path>
 					</g>
-					<path d="M66085.1 1260.0 L66080.5 1262.6 L66075.8 1265.2 L66073.9 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M55895.7 1255.5 L55994.75 1459 L55994.75 1697.5 L55994.75 1697.5 L55994.75 1936 L55994.75 1936 L68980.75 2544.8397435897436 L68980.8 2544.8 " fill="none"></path>
+						<path d="M3124.3 2591.3 L3561.5 3194 L39479.75 3379.5623273014357 L39479.8 3379.6 " fill="none"></path>
 					</g>
-					<path d="M55900.5 1253.2 L55895.7 1255.5 L55890.9 1257.8 L55889.8 1243.5 Z"></path>
-					<path d="M68949.3 3505.7 L68949.25 3567 L68859 3628.209642470206 L68859.0 3628.2 " fill="none"></path>
+					<path d="M3128.6 2588.2 L3124.3 2591.3 L3120.0 2594.4 L3116.5 2580.5 Z"></path>
+					<path d="M55598.8 1747.2 L55598.75 1936 L55598.75 1956 L55598.8 1956.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68954.6 3496.3 L68949.3 3505.7 L68943.9 3496.3 L68949.3 3487.0 Z"></path>
+						<path d="M55604.1 1737.8 L55598.8 1747.2 L55593.4 1737.8 L55598.8 1728.5 Z"></path>
 					</g>
-					<path d="M69387.9 3269.4 L69685.75 3194 L69486.82313195549 2739 L69486.8 2739.0 " fill="none"></path>
+					<path d="M32719.3 1762.7 L32719.25 1936 L55092.25 2551.075373150637 L55092.3 2551.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69377.6 3266.5 L69387.9 3269.4 L69380.2 3276.9 L69369.8 3274.0 Z"></path>
+						<path d="M32724.6 1753.3 L32719.3 1762.7 L32713.9 1753.3 L32719.3 1744.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M66088.0 1261.8 L66232 1459 L66232 1697.5 L66232 1697.5 L66232 1936 L66232 1936 L66232 2565 L66232 2565 L66232 3194 L66232 3194 L68527.75 3351.5701076455975 L68527.8 3351.6 " fill="none"></path>
+					<path d="M31934.3 1231.7 L32719.25 1459 L32719.25 1651 L32719.3 1651.0 " fill="none"></path>
+					<path d="M31935.8 1226.6 L31934.3 1231.7 L31932.9 1236.8 L31921.5 1228.0 Z"></path>
+					<path d="M33111.3 1762.7 L33111.25 1936 L55092.25 2550.832640355753 L55092.3 2550.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M33116.6 1753.3 L33111.3 1762.7 L33105.9 1753.3 L33111.3 1744.0 Z"></path>
 					</g>
-					<path d="M66092.3 1258.6 L66088.0 1261.8 L66083.7 1264.9 L66080.1 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M77363.4 1716.9 L78519 1936 L78519 2565 L78519 2565 L78519 3194 L78519 3194 L69370.75 3372.285600459782 L69370.8 3372.3 " fill="none"></path>
+					<path d="M31957.1 1230.2 L33111.25 1459 L33111.25 1651 L33111.3 1651.0 " fill="none"></path>
+					<path d="M31958.1 1224.9 L31957.1 1230.2 L31956.0 1235.4 L31944.0 1227.6 Z"></path>
+					<path d="M55075.3 2805.7 L54231 3194 L39842.75 3378.176710307315 L39842.8 3378.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M55086.0 2806.7 L55075.3 2805.7 L55081.5 2797.0 L55092.3 2797.9 Z"></path>
 					</g>
-					<path d="M77364.3 1711.7 L77363.4 1716.9 L77362.4 1722.2 L77350.3 1714.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M55902.1 1254.7 L56034.75 1459 L56034.75 1697.5 L56034.75 1697.5 L56034.75 1936 L56034.75 1936 L56034.75 2565 L56034.75 2565 L56034.75 3194 L56034.75 3194 L68527.75 3374.413062836347 L68527.8 3374.4 " fill="none"></path>
+					<path d="M55075.4 2812.9 L54271 3194 L64901 3379.5139662190613 L64901.0 3379.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M55086.1 2813.8 L55075.4 2812.9 L55081.5 2804.1 L55092.3 2804.9 Z"></path>
 					</g>
-					<path d="M55906.6 1251.8 L55902.1 1254.7 L55897.7 1257.6 L55894.9 1243.5 Z"></path>
-					<path d="M49425.8 2651.6 L49230.5 3194 L20517 3379.527568944013 L20517.0 3379.5 " fill="none"></path>
+					<path d="M56024.4 3189.4 L56027.5 3194 L56027.5 3380.5 L56027.5 3380.5 L56027.5 3567 L56027.5 3567 L56027.5 3723.5 L56027.5 3723.5 L56027.5 3880 L56027.5 3880 L63048 4013.0712214442324 L63048.0 4013.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49434.0 2644.6 L49425.8 2651.6 L49424.0 2641.0 L49432.2 2634.0 Z"></path>
+						<path d="M56023.5 3178.7 L56024.4 3189.4 L56014.7 3184.7 L56013.9 3174.0 Z"></path>
 					</g>
-					<path d="M49472.6 2652.4 L49569 3194 L21798 3379.5379365932295 L21798.0 3379.5 " fill="none"></path>
+					<path d="M56063.7 3189.0 L56067.5 3194 L25860.75 3380.0749568549086 L25860.8 3380.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49476.2 2642.3 L49472.6 2652.4 L49465.7 2644.1 L49469.3 2634.0 Z"></path>
+						<path d="M56062.4 3178.3 L56063.7 3189.0 L56053.9 3184.7 L56052.6 3174.0 Z"></path>
 					</g>
-					<path d="M26829.8 1216.4 L32389.25 1459 L32389.25 1666.5 L32389.3 1666.5 " fill="none"></path>
-					<path d="M26830.1 1211.1 L26829.8 1216.4 L26829.6 1221.7 L26816.5 1215.8 Z"></path>
-					<path d="M52749.3 3796.2 L52749.25 3880 L73228.25 4013.18381906865 L73228.3 4013.2 " fill="none"></path>
+					<path d="M56103.1 3188.5 L56107.5 3194 L68268 3379.698292802751 L68268.0 3379.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M52754.6 3786.8 L52749.3 3796.2 L52743.9 3786.8 L52749.3 3777.5 Z"></path>
+						<path d="M56101.3 3177.9 L56103.1 3188.5 L56093.0 3184.6 L56091.3 3174.0 Z"></path>
 					</g>
+					<path d="M67268.0 1732.7 L67885.25 1936 L56105.25 2539.070036218614 L56105.3 2539.1 " fill="none"></path>
+					<path d="M67269.7 1727.6 L67268.0 1732.7 L67266.4 1737.7 L67255.4 1728.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M52749.3 3432.3 L52749.25 3567 L52749.25 3669.5 L52749.3 3669.5 " fill="none"></path>
+						<path d="M80230.5 1262.6 L80342 1459 L80342 1697.5 L80342 1697.5 L80342 1936 L80342 1936 L56105.25 2552.124225798955 L56105.3 2552.1 " fill="none"></path>
 					</g>
-					<path d="M52754.6 3432.3 L52749.3 3432.3 L52743.9 3432.3 L52749.3 3419.0 Z"></path>
-					<path d="M63570.4 4097.6 L63471.5 4148 L63471.5 4334.5 L63471.5 4334.5 L63471.5 4521 L63471.5 4521 L63769.5 4553.600924499229 L63769.5 4553.6 " fill="none"></path>
+					<path d="M80235.1 1260.0 L80230.5 1262.6 L80225.8 1265.2 L80223.9 1251.0 Z"></path>
+					<path d="M57350.3 1754.7 L57350.25 1936 L56105.25 2383.105338281473 L56105.3 2383.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63581.1 4098.1 L63570.4 4097.6 L63576.3 4088.6 L63587.0 4089.2 Z"></path>
+						<path d="M57355.6 1745.3 L57350.3 1754.7 L57344.9 1745.3 L57350.3 1736.0 Z"></path>
 					</g>
-					<path d="M63734.5 4146.7 L63734.5 4148 L63734.5 4334.5 L63734.5 4334.5 L63734.5 4521 L63734.5 4521 L63941 4550.799796747968 L63941.0 4550.8 " fill="none"></path>
+					<path d="M52735.1 1770.5 L53112 1936 L53112 2549.5 L53112.0 2549.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63739.8 4137.3 L63734.5 4146.7 L63729.2 4137.3 L63734.5 4128.0 Z"></path>
+						<path d="M52728.7 1761.8 L52735.1 1770.5 L52724.4 1771.6 L52718.0 1762.9 Z"></path>
 					</g>
-					<path d="M10264.8 3767.8 L10264.75 3880 L63587 4013.630351740938 L63587.0 4013.6 " fill="none"></path>
-					<path d="M10270.1 3767.8 L10264.8 3767.8 L10259.4 3767.8 L10264.8 3754.5 Z"></path>
-					<path d="M63837.0 4500.3 L63819.5 4521 L62692.75 4554.409584464398 L62692.8 4554.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M63847.1 4496.6 L63837.0 4500.3 L63839.0 4489.7 L63849.1 4486.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M46571.3 1216.3 L52569 1459 L52569 1613.5 L52569.0 1613.5 " fill="none"></path>
 					</g>
-					<path d="M63940.6 4504.3 L63937 4521 L63166 4552.993571011105 L63166.0 4553.0 " fill="none"></path>
+					<path d="M46571.5 1211.0 L46571.3 1216.3 L46571.1 1221.7 L46558.0 1215.8 Z"></path>
+					<path d="M79616.8 1285.2 L79616.75 1459 L79616.75 1546 L79616.8 1546.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63947.8 4496.2 L63940.6 4504.3 L63937.3 4494.0 L63944.5 4486.0 Z"></path>
+						<path d="M79622.1 1275.8 L79616.8 1285.2 L79611.4 1275.8 L79616.8 1266.5 Z"></path>
 					</g>
-					<path d="M63977.0 4504.7 L63977 4521 L64095.25 4544.55049088359 L64095.3 4544.6 " fill="none"></path>
+					<path d="M79058.2 162.1 L79616.75 293 L79616.75 629.5 L79616.75 629.5 L79616.75 966 L79616.75 966 L79616.75 1158.5 L79616.8 1158.5 " fill="none"></path>
+					<path d="M79059.4 156.9 L79058.2 162.1 L79057.0 167.2 L79045.3 159.0 Z"></path>
+					<path d="M79382.1 1859.6 L79271.5 1936 L79271.5 2565 L79271.5 2565 L79271.5 3194 L79271.5 3194 L65014 3379.763850076848 L65014.0 3379.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63982.3 4495.3 L63977.0 4504.7 L63971.7 4495.3 L63977.0 4486.0 Z"></path>
+						<path d="M79392.8 1858.7 L79382.1 1859.6 L79386.7 1849.9 L79397.4 1849.0 Z"></path>
 					</g>
-					<path d="M64013.4 4504.3 L64017 4521 L63996.43661971831 4541 L63996.4 4541.0 " fill="none"></path>
+					<path d="M79809.8 1861.1 L79898.25 1936 L79898.25 2565 L79898.25 2565 L79898.25 3194 L79898.25 3194 L70852 3378.7639288158794 L70852.0 3378.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64016.7 4494.0 L64013.4 4504.3 L64006.2 4496.2 L64009.5 4486.0 Z"></path>
+						<path d="M79806.1 1851.0 L79809.8 1861.1 L79799.2 1859.1 L79795.6 1849.0 Z"></path>
 					</g>
-					<path d="M64063.1 4502.6 L64072.5 4521 L63822.5 4553.097649186257 L63822.5 4553.1 " fill="none"></path>
+					<path d="M35177.0 1710.9 L36770.5 1936 L33511.75 2545.184560517126 L33511.8 2545.2 " fill="none"></path>
+					<path d="M35177.7 1705.7 L35177.0 1710.9 L35176.2 1716.2 L35163.8 1709.1 Z"></path>
+					<path d="M58693.0 3803.2 L58693 3880 L17993.5 4013.763364114639 L17993.5 4013.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64063.6 4491.9 L64063.1 4502.6 L64054.1 4496.7 L64054.6 4486.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M63893.7 4102.0 L63977 4148 L63977 4183 L63977.0 4183.0 " fill="none"></path>
+						<path d="M58698.3 3793.8 L58693.0 3803.2 L58687.7 3793.8 L58693.0 3784.5 Z"></path>
 					</g>
-					<path d="M63896.2 4097.3 L63893.7 4102.0 L63891.1 4106.6 L63882.0 4095.5 Z"></path>
-					<path d="M62032.9 170.5 L61726.75 293 L61726.75 614 L61726.8 614.0 " fill="none"></path>
-					<path d="M62034.9 175.4 L62032.9 170.5 L62030.9 165.5 L62045.3 165.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M58607.7 161.8 L58729.25 293 L58729.25 614 L58729.3 614.0 " fill="none"></path>
-					</g>
-					<path d="M58611.6 158.2 L58607.7 161.8 L58603.8 165.4 L58598.6 152.0 Z"></path>
-					<path d="M58655.8 647.7 L57374.75 966 L57374.75 1197 L57374.8 1197.0 " fill="none"></path>
-					<path d="M58657.1 652.9 L58655.8 647.7 L58654.5 642.6 L58668.8 644.5 Z"></path>
-					<path d="M58667.4 649.0 L57662.25 966 L57662.25 1197 L57662.3 1197.0 " fill="none"></path>
-					<path d="M58669.0 654.1 L58667.4 649.0 L58665.8 643.9 L58680.1 645.0 Z"></path>
-					<path d="M58681.7 650.4 L57962.75 966 L57962.75 1197 L57962.8 1197.0 " fill="none"></path>
-					<path d="M58683.9 655.2 L58681.7 650.4 L58679.6 645.5 L58693.9 645.0 Z"></path>
-					<path d="M58696.8 652.8 L58259.25 966 L58259.25 1197 L58259.3 1197.0 " fill="none"></path>
-					<path d="M58699.9 657.1 L58696.8 652.8 L58693.7 648.4 L58707.6 645.0 Z"></path>
-					<path d="M58716.0 657.0 L58567.25 966 L58567.25 1197 L58567.3 1197.0 " fill="none"></path>
-					<path d="M58720.8 659.3 L58716.0 657.0 L58711.2 654.7 L58721.8 645.0 Z"></path>
-					<path d="M58742.5 657.0 L58891.25 966 L58891.25 1197 L58891.3 1197.0 " fill="none"></path>
-					<path d="M58747.3 654.7 L58742.5 657.0 L58737.7 659.3 L58736.7 645.0 Z"></path>
-					<path d="M58761.5 652.8 L59194.75 966 L59194.75 1197 L59194.8 1197.0 " fill="none"></path>
-					<path d="M58764.6 648.5 L58761.5 652.8 L58758.4 657.1 L58750.7 645.0 Z"></path>
-					<path d="M58776.4 650.4 L59488.25 966 L59488.25 1197 L59488.3 1197.0 " fill="none"></path>
-					<path d="M58778.6 645.5 L58776.4 650.4 L58774.2 655.3 L58764.2 645.0 Z"></path>
-					<path d="M58791.3 649.0 L59799.25 966 L59799.25 1197 L59799.3 1197.0 " fill="none"></path>
-					<path d="M58792.9 643.9 L58791.3 649.0 L58789.7 654.1 L58778.5 645.0 Z"></path>
-					<path d="M58802.7 647.9 L60072.75 966 L60072.75 1197 L60072.8 1197.0 " fill="none"></path>
-					<path d="M58804.0 642.7 L58802.7 647.9 L58801.4 653.1 L58789.8 644.7 Z"></path>
-					<path d="M62089.0 4519.7 L62089 4521 L62551.75 4551.806610407876 L62551.8 4551.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M62094.3 4510.3 L62089.0 4519.7 L62083.7 4510.3 L62089.0 4501.0 Z"></path>
-					</g>
-					<path d="M61786.4 4057.8 L61759.5 4148 L61849.5 4198.940819423368 L61849.5 4198.9 " fill="none"></path>
-					<path d="M61791.5 4059.3 L61786.4 4057.8 L61781.3 4056.3 L61790.2 4045.0 Z"></path>
-					<path d="M62089.0 4095.8 L62089 4148 L62089 4168 L62089.0 4168.0 " fill="none"></path>
-					<path d="M62094.3 4095.8 L62089.0 4095.8 L62083.7 4095.8 L62089.0 4082.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M73353.8 4133.3 L73353.75 4148 L62328.5 4330.53482101245 L62328.5 4330.5 " fill="none"></path>
+					<path d="M57816.8 2614.7 L57816.75 3194 L24962.75 3379.663626446882 L24962.8 3379.7 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M57822.1 2605.3 L57816.8 2614.7 L57811.4 2605.3 L57816.8 2596.0 Z"></path>
 					</g>
-					<path d="M73359.1 4133.3 L73353.8 4133.3 L73348.4 4133.3 L73353.8 4120.0 Z"></path>
-					<path d="M49721.0 2712.7 L49721 3194 L28835.75 3380.0145954464597 L28835.8 3380.0 " fill="none"></path>
+					<path d="M58117.3 2637.7 L58117.25 3194 L21335.5 3380.3201726093066 L21335.5 3380.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49726.3 2703.3 L49721.0 2712.7 L49715.7 2703.3 L49721.0 2694.0 Z"></path>
+						<path d="M58122.6 2628.3 L58117.3 2637.7 L58111.9 2628.3 L58117.3 2619.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M58644.5 141.9 L60326.25 293 L60326.25 614 L60326.3 614.0 " fill="none"></path>
+					<path d="M73863.6 2771.4 L73701 3194 L74947.5 3363.440415451895 L74947.5 3363.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M73871.9 2764.6 L73863.6 2771.4 L73862.0 2760.8 L73870.3 2754.0 Z"></path>
 					</g>
-					<path d="M58645.0 136.6 L58644.5 141.9 L58644.1 147.2 L58631.3 140.7 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M60326.3 658.3 L60326.25 966 L60326.25 1197 L60326.3 1197.0 " fill="none"></path>
+					<path d="M73876.6 2771.8 L73741 3194 L73741 3380.5 L73741 3380.5 L73741 3567 L73741 3567 L73741 3723.5 L73741 3723.5 L73741 3880 L73741 3880 L75100.5 4000.8845388188456 L75100.5 4000.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M73884.5 2764.5 L73876.6 2771.8 L73874.4 2761.3 L73882.3 2754.0 Z"></path>
 					</g>
-					<path d="M60331.6 658.3 L60326.3 658.3 L60320.9 658.3 L60326.3 645.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M76885.8 180.8 L76889.75 293 L76889.75 501 L76889.8 501.0 " fill="none"></path>
+					<path d="M73940.9 2772.7 L73936.5 3194 L73936.5 3319 L73936.5 3319.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M73946.3 2763.4 L73940.9 2772.7 L73935.6 2763.3 L73941.0 2754.0 Z"></path>
 					</g>
-					<path d="M76891.1 180.6 L76885.8 180.8 L76880.5 181.0 L76885.3 167.5 Z"></path>
-					<path d="M76566.2 1450.0 L76554 1459 L76554 1621.5 L76554.0 1621.5 " fill="none"></path>
+					<path d="M74067.8 2769.9 L74326 3194 L67791.5 3379.1962996732773 L67791.5 3379.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M76576.9 1448.8 L76566.2 1450.0 L76570.6 1440.2 L76581.2 1439.0 Z"></path>
+						<path d="M74067.5 2759.2 L74067.8 2769.9 L74058.4 2764.7 L74058.1 2754.0 Z"></path>
 					</g>
-					<path d="M76830.2 1457.1 L76829.75 1459 L76829.75 1697.5 L76829.75 1697.5 L76829.75 1936 L76829.75 1936 L76829.75 2565 L76829.75 2565 L76829.75 3194 L76829.75 3194 L76829.75 3380.5 L76829.75 3380.5 L76829.75 3567 L76829.75 3567 L76829.75 3723.5 L76829.75 3723.5 L76829.75 3880 L76829.75 3880 L66548.75 4013.061669966678 L66548.8 4013.1 " fill="none"></path>
+					<path d="M74080.5 2769.5 L74366 3194 L70852 3376.095304251181 L70852.0 3376.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M76837.6 1449.3 L76830.2 1457.1 L76827.2 1446.8 L76834.6 1439.0 Z"></path>
+						<path d="M74079.7 2758.8 L74080.5 2769.5 L74070.9 2764.7 L74070.1 2754.0 Z"></path>
 					</g>
-					<path d="M76889.8 771.3 L76889.75 966 L76889.75 986 L76889.8 986.0 " fill="none"></path>
-					<path d="M76895.1 771.3 L76889.8 771.3 L76884.4 771.3 L76889.8 758.0 Z"></path>
-					<path d="M61799.5 4063.7 L61799.5 4148 L61799.5 4334.5 L61799.5 4334.5 L61799.5 4521 L61799.5 4521 L62551.75 4553.4580674567005 L62551.8 4553.5 " fill="none"></path>
+					<path d="M74093.2 2769.0 L74406 3194 L45362.25 3379.675309149806 L45362.3 3379.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M61804.8 4054.3 L61799.5 4063.7 L61794.2 4054.3 L61799.5 4045.0 Z"></path>
+						<path d="M74091.9 2758.4 L74093.2 2769.0 L74083.4 2764.7 L74082.1 2754.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M58644.5 141.2 L60571.25 293 L60571.25 583.5 L60571.3 583.5 " fill="none"></path>
+						<path d="M80576.6 175.7 L80426.75 293 L80426.75 629.5 L80426.75 629.5 L80426.75 966 L80426.75 966 L80426.75 1212.5 L80426.75 1212.5 L80426.75 1459 L80426.75 1459 L80426.75 1697.5 L80426.75 1697.5 L80426.75 1936 L80426.75 1936 L74250 2535.217389627916 L74250.0 2535.2 " fill="none"></path>
 					</g>
-					<path d="M58645.0 135.9 L58644.5 141.2 L58644.1 146.6 L58631.3 140.2 Z"></path>
+					<path d="M80579.9 179.9 L80576.6 175.7 L80573.3 171.5 L80587.1 167.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M76870.3 1452.3 L76869.75 1459 L73132.75 1689.3332471895594 L73132.8 1689.3 " fill="none"></path>
+						<path d="M3125.7 2591.0 L3601.5 3194 L24666.75 3379.1988320978635 L24666.8 3379.2 " fill="none"></path>
 					</g>
-					<path d="M76875.6 1452.7 L76870.3 1452.3 L76865.0 1451.9 L76871.4 1439.0 Z"></path>
-					<path d="M73899.8 2689.7 L73787 3194 L73787 3380.5 L73787 3380.5 L73787 3567 L73787 3567 L73787 3723.5 L73787 3723.5 L73787 3880 L73787 3880 L74150.68003731343 3998.5 L74150.7 3998.5 " fill="none"></path>
+					<path d="M3129.9 2587.7 L3125.7 2591.0 L3121.6 2594.3 L3117.5 2580.5 Z"></path>
+					<path d="M58281.9 1762.9 L57598.25 1936 L57598.25 2549.5 L57598.3 2549.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73907.1 2681.8 L73899.8 2689.7 L73896.7 2679.4 L73903.9 2671.5 Z"></path>
+						<path d="M58292.3 1765.7 L58281.9 1762.9 L58289.6 1755.4 L58300.0 1758.3 Z"></path>
 					</g>
-					<path d="M73907.7 2689.9 L73827 3194 L73827 3380.5 L73827 3380.5 L73827 3567 L73827 3567 L73827 3723.5 L73827 3723.5 L73827 3880 L73827 3880 L73479.25 3978.4648705758054 L73479.3 3978.5 " fill="none"></path>
+					<path d="M58524.5 1860.1 L58517.25 1936 L58517.25 2549.5 L58517.3 2549.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73914.5 2681.6 L73907.7 2689.9 L73903.9 2679.9 L73910.7 2671.5 Z"></path>
+						<path d="M58530.7 1851.3 L58524.5 1860.1 L58520.1 1850.3 L58526.3 1841.5 Z"></path>
 					</g>
-					<path d="M73927.8 2690.2 L73927.75 3194 L73927.75 3380.5 L73927.75 3380.5 L73927.75 3567 L73927.75 3567 L73927.75 3723.5 L73927.75 3723.5 L73927.75 3880 L73927.75 3880 L63882 4012.0609717214825 L63882.0 4012.1 " fill="none"></path>
+					<path d="M58798.1 1762.9 L59481.75 1936 L59481.75 2565 L59481.75 2565 L59481.75 3194 L59481.75 3194 L21335.5 3380.326599095117 L21335.5 3380.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73933.1 2680.8 L73927.8 2690.2 L73922.4 2680.8 L73927.8 2671.5 Z"></path>
+						<path d="M58790.4 1755.4 L58798.1 1762.9 L58787.7 1765.7 L58780.0 1758.3 Z"></path>
 					</g>
-					<path d="M73947.8 2689.9 L74028.5 3194 L67339 3377.065553925165 L67339.0 3377.1 " fill="none"></path>
+					<path d="M58798.3 1747.7 L59767.25 1936 L73636 2551.377934148105 L73636.0 2551.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73951.6 2679.9 L73947.8 2689.9 L73941.0 2681.6 L73944.8 2671.5 Z"></path>
+						<path d="M58790.2 1740.7 L58798.3 1747.7 L58788.1 1751.2 L58780.0 1744.1 Z"></path>
 					</g>
-					<path d="M73955.7 2689.7 L74068.5 3194 L67493.25 3379.6388941452524 L67493.3 3379.6 " fill="none"></path>
+					<path d="M2868.7 3281.2 L2882 3274.5 L2889.5 3274.5 L2889.5 3274.5 L2897 3380.5 L2897 3380.5 L2889.5 3486.5 L2889.5 3486.5 L2882 3486.5 L2882 3486.5 L2852 3471.393111638955 L2852.0 3471.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73958.8 2679.4 L73955.7 2689.7 L73948.4 2681.8 L73951.6 2671.5 Z"></path>
+						<path d="M2857.9 3280.6 L2868.7 3281.2 L2862.7 3290.2 L2852.0 3289.6 Z"></path>
 					</g>
-					<path d="M76953.4 1451.9 L76955.25 1459 L76955.25 1697.5 L76955.25 1697.5 L76955.25 1936 L76955.25 1936 L74129.25 2523.1359207266723 L74129.3 2523.1 " fill="none"></path>
-					<path d="M76958.5 1450.5 L76953.4 1451.9 L76948.2 1453.3 L76949.9 1439.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M73000.3 1741.8 L73000.25 1936 L73770.70906200318 2458.5 L73770.7 2458.5 " fill="none"></path>
+						<path d="M3127.1 2590.6 L3641.5 3194 L2852 3345.795618556701 L2852.0 3345.8 " fill="none"></path>
 					</g>
-					<path d="M73005.6 1741.8 L73000.3 1741.8 L72994.9 1741.8 L73000.3 1728.5 Z"></path>
-					<path d="M76293.4 2656.0 L75312.5 3194 L67493.25 3379.775359087869 L67493.3 3379.8 " fill="none"></path>
+					<path d="M3131.2 2587.2 L3127.1 2590.6 L3123.1 2594.1 L3118.5 2580.5 Z"></path>
+					<path d="M59703.2 2681.9 L59621.75 3194 L67831.5 3379.809699341646 L67831.5 3379.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M76304.1 2656.2 L76293.4 2656.0 L76299.0 2646.8 L76309.8 2647.0 Z"></path>
+						<path d="M59709.9 2673.6 L59703.2 2681.9 L59699.4 2671.9 L59706.1 2663.5 Z"></path>
 					</g>
-					<path d="M76459.3 2690.2 L76459.25 3194 L76459.25 3380.5 L76459.25 3380.5 L76459.25 3567 L76459.25 3567 L76459.25 3723.5 L76459.25 3723.5 L76459.25 3880 L76459.25 3880 L73479.25 4008.5847689582997 L73479.3 4008.6 " fill="none"></path>
+					<path d="M59725.5 2682.2 L59741.75 3194 L59741.75 3365 L59741.8 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M76464.6 2680.8 L76459.3 2690.2 L76453.9 2680.8 L76459.3 2671.5 Z"></path>
+						<path d="M59730.5 2672.7 L59725.5 2682.2 L59719.8 2673.0 L59724.9 2663.5 Z"></path>
 					</g>
-					<path d="M76478.1 2690.0 L76554 3194 L67339 3377.994165194583 L67339.0 3378.0 " fill="none"></path>
+					<path d="M59771.6 2680.6 L59992.75 3194 L59992.75 3365 L59992.8 3365.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M76482.0 2679.9 L76478.1 2690.0 L76471.4 2681.5 L76475.3 2671.5 Z"></path>
+						<path d="M59772.8 2670.0 L59771.6 2680.6 L59763.0 2674.2 L59764.2 2663.5 Z"></path>
 					</g>
-					<path d="M76518.9 1785.9 L76459.25 1936 L76459.25 2458.5 L76459.3 2458.5 " fill="none"></path>
-					<path d="M76523.8 1787.9 L76518.9 1785.9 L76513.9 1783.9 L76523.8 1773.5 Z"></path>
+					<path d="M31957.3 1216.7 L37153.75 1459 L37153.75 1666.5 L37153.8 1666.5 " fill="none"></path>
+					<path d="M31957.6 1211.3 L31957.3 1216.7 L31957.1 1222.0 L31944.0 1216.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M76991.9 1451.3 L76995.25 1459 L76995.25 1697.5 L76995.25 1697.5 L76995.25 1936 L76995.25 1936 L76995.25 2565 L76995.25 2565 L76995.25 3194 L76995.25 3194 L67339 3378.1072021877476 L67339.0 3378.1 " fill="none"></path>
+						<path d="M80649.0 1446.8 L80632.25 1459 L77186.5 1688.668518130371 L77186.5 1688.7 " fill="none"></path>
 					</g>
-					<path d="M76996.8 1449.2 L76991.9 1451.3 L76987.0 1453.4 L76986.7 1439.0 Z"></path>
-					<path d="M70711.8 3829.4 L70669.75 3880 L73228.25 4007.7343517138597 L73228.3 4007.7 " fill="none"></path>
+					<path d="M80652.2 1451.1 L80649.0 1446.8 L80645.9 1442.5 L80659.8 1439.0 Z"></path>
+					<path d="M79493.0 2689.9 L79412.25 3194 L79412.25 3380.5 L79412.25 3380.5 L79412.25 3567 L79412.25 3567 L79412.25 3723.5 L79412.25 3723.5 L79412.25 3880 L79412.25 3880 L80391.5 4006.9354292623943 L80391.5 4006.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70721.9 3825.6 L70711.8 3829.4 L70713.7 3818.8 L70723.7 3815.0 Z"></path>
+						<path d="M79499.7 2681.6 L79493.0 2689.9 L79489.2 2679.9 L79495.9 2671.5 Z"></path>
 					</g>
-					<path d="M70744.0 3831.6 L70719 3880 L63882 4011.1701625026844 L63882.0 4011.2 " fill="none"></path>
+					<path d="M79505.0 2690.1 L79473 3194 L79473 3380.5 L79473 3380.5 L79473 3567 L79473 3567 L79473 3723.5 L79473 3723.5 L79473 3880 L79473 3880 L78509 3998.564479118862 L78509.0 3998.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70753.0 3825.7 L70744.0 3831.6 L70743.5 3820.8 L70752.5 3815.0 Z"></path>
+						<path d="M79511.0 2681.2 L79505.0 2690.1 L79500.3 2680.5 L79506.2 2671.5 Z"></path>
 					</g>
-					<path d="M70855.5 3831.6 L70880.5 3880 L74143.75 4011.7988094341044 L74143.8 4011.8 " fill="none"></path>
+					<path d="M79513.0 2690.2 L79513 3194 L79513 3380.5 L79513 3380.5 L79513 3567 L79513 3567 L79513 3723.5 L79513 3723.5 L79513 3880 L79513 3880 L75395.5 4009.3657678780773 L75395.5 4009.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70856.0 3820.8 L70855.5 3831.6 L70846.5 3825.7 L70847.0 3815.0 Z"></path>
+						<path d="M79518.3 2680.8 L79513.0 2690.2 L79507.7 2680.8 L79513.0 2671.5 Z"></path>
 					</g>
-					<path d="M70881.8 3829.8 L70920.5 3880 L10039.5 4013.841714107591 L10039.5 4013.8 " fill="none"></path>
+					<path d="M79521.0 2690.1 L79553 3194 L75198.5 3375.275502232143 L75198.5 3375.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70880.3 3819.1 L70881.8 3829.8 L70871.8 3825.6 L70870.3 3815.0 Z"></path>
+						<path d="M79525.7 2680.5 L79521.0 2690.1 L79515.0 2681.2 L79519.8 2671.5 Z"></path>
 					</g>
-					<path d="M77030.2 1450.5 L77035.25 1459 L77035.25 1697.5 L77035.25 1697.5 L77035.25 1936 L77035.25 1936 L77035.25 2565 L77035.25 2565 L77035.25 3194 L77035.25 3194 L77035.25 3380.5 L77035.25 3380.5 L77035.25 3567 L77035.25 3567 L71001.25 3718.4427070804268 L71001.3 3718.4 " fill="none"></path>
-					<path d="M77034.8 1447.8 L77030.2 1450.5 L77025.6 1453.2 L77023.4 1439.0 Z"></path>
+					<path d="M79533.0 2689.9 L79613.75 3194 L67892.5 3380.015965707235 L67892.5 3380.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M79536.8 2679.9 L79533.0 2689.9 L79526.3 2681.6 L79530.1 2671.5 Z"></path>
+					</g>
+					<path d="M80686.3 1447.5 L80672.25 1459 L80672.25 1697.5 L80672.25 1697.5 L80672.25 1936 L80672.25 1936 L79709.28000794913 2458.5 L79709.3 2458.5 " fill="none"></path>
+					<path d="M80689.7 1451.6 L80686.3 1447.5 L80682.9 1443.3 L80696.6 1439.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M67213.5 3432.3 L67213.5 3567 L70598.25 3714.7067619379573 L70598.3 3714.7 " fill="none"></path>
+						<path d="M77054.0 1741.8 L77054 1936 L79311.5 2513.4572997153314 L79311.5 2513.5 " fill="none"></path>
 					</g>
-					<path d="M67218.8 3432.3 L67213.5 3432.3 L67208.2 3432.3 L67213.5 3419.0 Z"></path>
-					<path d="M76593.4 3839.3 L76574 3880 L73479.25 4008.777734647931 L73479.3 4008.8 " fill="none"></path>
+					<path d="M77059.3 1741.8 L77054.0 1741.8 L77048.7 1741.8 L77054.0 1728.5 Z"></path>
+					<path d="M80926.9 2690.0 L80867 3194 L67892.5 3380.06261053441 L67892.5 3380.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M76602.3 3833.2 L76593.4 3839.3 L76592.6 3828.6 L76601.5 3822.5 Z"></path>
+						<path d="M80933.3 2681.4 L80926.9 2690.0 L80922.7 2680.1 L80929.1 2671.5 Z"></path>
 					</g>
-					<path d="M76701.0 3839.5 L76719.25 3880 L63882 4012.477829761836 L63882.0 4012.5 " fill="none"></path>
+					<path d="M80934.8 2690.1 L80907 3194 L80907 3380.5 L80907 3380.5 L80907 3567 L80907 3567 L80907 3723.5 L80907 3723.5 L80907 3880 L80907 3880 L78509 4007.335843075094 L78509.0 4007.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M76702.0 3828.8 L76701.0 3839.5 L76692.3 3833.2 L76693.3 3822.5 Z"></path>
+						<path d="M80940.7 2681.1 L80934.8 2690.1 L80930.0 2680.5 L80935.9 2671.5 Z"></path>
 					</g>
-					<path d="M76589.1 1785.9 L76648.75 1936 L76648.75 2565 L76648.75 2565 L76648.75 3194 L76648.75 3194 L76648.75 3380.5 L76648.75 3380.5 L76648.75 3567 L76648.75 3567 L76648.75 3624.5 L76648.8 3624.5 " fill="none"></path>
-					<path d="M76594.1 1783.9 L76589.1 1785.9 L76584.2 1787.9 L76584.2 1773.5 Z"></path>
-					<path d="M62049.1 182.4 L61883.75 293 L61883.75 614 L61883.8 614.0 " fill="none"></path>
-					<path d="M62052.1 186.8 L62049.1 182.4 L62046.1 178.0 L62060.2 175.0 Z"></path>
-					<path d="M62117.8 188.3 L62117.75 293 L62117.75 614 L62117.8 614.0 " fill="none"></path>
-					<path d="M62123.1 188.3 L62117.8 188.3 L62112.4 188.3 L62117.8 175.0 Z"></path>
-					<path d="M62176.1 183.4 L62312.5 293 L62312.5 614 L62312.5 614.0 " fill="none"></path>
-					<path d="M62179.4 179.2 L62176.1 183.4 L62172.7 187.5 L62165.7 175.0 Z"></path>
-					<path d="M62202.2 177.8 L62438 293 L62438 614 L62438.0 614.0 " fill="none"></path>
-					<path d="M62204.6 173.0 L62202.2 177.8 L62199.9 182.6 L62190.3 171.9 Z"></path>
-					<path d="M54177.2 3439.6 L53859.75 3567 L53859.75 3723.5 L53859.75 3723.5 L53859.75 3880 L53859.75 3880 L54289.5 3998.7962867457454 L54289.5 3998.8 " fill="none"></path>
+					<path d="M80959.7 2690.0 L81032.25 3194 L75198.5 3376.5723664890716 L75198.5 3376.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54187.8 3441.1 L54177.2 3439.6 L54183.9 3431.2 L54194.5 3432.7 Z"></path>
+						<path d="M80963.7 2680.0 L80959.7 2690.0 L80953.1 2681.5 L80957.1 2671.5 Z"></path>
 					</g>
-					<path d="M55185.3 3819.5 L55112.75 3880 L73228.25 4013.07806589551 L73228.3 4013.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M55195.9 3817.6 L55185.3 3819.5 L55189.0 3809.4 L55199.6 3807.5 Z"></path>
+					<path d="M81001.4 1785.9 L80941.75 1936 L80941.75 2458.5 L80941.8 2458.5 " fill="none"></path>
+					<path d="M81006.3 1787.9 L81001.4 1785.9 L80996.4 1783.9 L81006.3 1773.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M80723.7 1448.2 L80712.25 1459 L80712.25 1697.5 L80712.25 1697.5 L80712.25 1936 L80712.25 1936 L80712.25 2565 L80712.25 2565 L80712.25 3194 L80712.25 3194 L75198.5 3376.349492397039 L75198.5 3376.3 " fill="none"></path>
 					</g>
-					<path d="M55208.3 3821.1 L55152.75 3880 L63587 4011.6968567017216 L63587.0 4011.7 " fill="none"></path>
+					<path d="M80727.3 1452.0 L80723.7 1448.2 L80720.0 1444.3 L80733.3 1439.0 Z"></path>
+					<path d="M77087.2 3830.7 L77055.5 3880 L78258 4001.336596385542 L78258.0 4001.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55218.6 3818.0 L55208.3 3821.1 L55210.8 3810.6 L55221.1 3807.5 Z"></path>
+						<path d="M77096.8 3825.7 L77087.2 3830.7 L77087.8 3820.0 L77097.3 3815.0 Z"></path>
 					</g>
-					<path d="M55376.6 3822.3 L55421.25 3880 L54671.5 4010.264505672609 L54671.5 4010.3 " fill="none"></path>
+					<path d="M77162.8 3833.6 L77165.5 3880 L75395.5 4003.6923076923076 L75395.5 4003.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55375.1 3811.6 L55376.6 3822.3 L55366.7 3818.1 L55365.2 3807.5 Z"></path>
+						<path d="M77167.5 3824.0 L77162.8 3833.6 L77156.9 3824.6 L77161.7 3815.0 Z"></path>
 					</g>
-					<path d="M55400.1 3820.5 L55461.25 3880 L54399.5 4007.4004925005597 L54399.5 4007.4 " fill="none"></path>
+					<path d="M77231.3 3830.3 L77266.25 3880 L80391.5 4011.7032785596352 L80391.5 4011.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55397.1 3810.2 L55400.1 3820.5 L55389.6 3817.8 L55386.7 3807.5 Z"></path>
+						<path d="M77230.3 3819.6 L77231.3 3830.3 L77221.6 3825.7 L77220.6 3815.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M54467.6 3407.9 L55300.25 3567 L55300.25 3639.5 L55300.3 3639.5 " fill="none"></path>
-					</g>
-					<path d="M54468.6 3402.6 L54467.6 3407.9 L54466.6 3413.1 L54454.5 3405.3 Z"></path>
-					<path d="M1846.3 3330.3 L1858.25 3327 L1865.75 3327 L1865.75 3327 L1873.25 3380.5 L1873.25 3380.5 L1865.75 3434 L1865.75 3434 L1858.25 3434 L1858.25 3434 L1828.25 3425.8527918781724 L1828.3 3425.9 " fill="none"></path>
+					<path d="M77256.9 3828.5 L77306.25 3880 L17993.5 4013.8375340470407 L17993.5 4013.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1835.9 3327.6 L1846.3 3330.3 L1838.7 3337.8 L1828.3 3335.1 Z"></path>
+						<path d="M77254.3 3818.0 L77256.9 3828.5 L77246.6 3825.4 L77243.9 3815.0 Z"></path>
 					</g>
+					<path d="M80761.2 1448.9 L80752.25 1459 L80752.25 1697.5 L80752.25 1697.5 L80752.25 1936 L80752.25 1936 L80752.25 2565 L80752.25 2565 L80752.25 3194 L80752.25 3194 L80752.25 3380.5 L80752.25 3380.5 L80752.25 3567 L80752.25 3567 L77357.75 3714.730603448276 L77357.8 3714.7 " fill="none"></path>
+					<path d="M80765.2 1452.5 L80761.2 1448.9 L80757.2 1445.4 L80770.1 1439.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M1679.6 2593.8 L1661.25 3194 L1661.25 3327 L1661.3 3327.0 " fill="none"></path>
+						<path d="M75073.0 3432.3 L75073 3567 L76954.75 3708.36271450858 L76954.8 3708.4 " fill="none"></path>
 					</g>
-					<path d="M1684.9 2594.0 L1679.6 2593.8 L1674.3 2593.7 L1680.0 2580.5 Z"></path>
-					<path d="M61382.8 679.2 L61382.75 966 L61382.75 1197 L61382.8 1197.0 " fill="none"></path>
+					<path d="M75078.3 3432.3 L75073.0 3432.3 L75067.7 3432.3 L75073.0 3419.0 Z"></path>
+					<path d="M81053.2 3836.9 L81017.5 3880 L78509 4007.6154138192865 L78509.0 4007.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M61388.1 669.8 L61382.8 679.2 L61377.4 669.8 L61382.8 660.5 Z"></path>
+						<path d="M81063.2 3833.1 L81053.2 3836.9 L81055.0 3826.3 L81065.1 3822.5 Z"></path>
 					</g>
-					<path d="M61382.8 165.3 L61382.75 293 L61382.75 598.5 L61382.8 598.5 " fill="none"></path>
-					<path d="M61388.1 165.3 L61382.8 165.3 L61377.4 165.3 L61382.8 152.0 Z"></path>
-					<path d="M63431.1 161.6 L63304.75 293 L63304.75 598.5 L63304.8 598.5 " fill="none"></path>
-					<path d="M63434.9 165.3 L63431.1 161.6 L63427.3 157.9 L63440.3 152.0 Z"></path>
-					<path d="M63479.4 161.6 L63605.75 293 L63605.75 598.5 L63605.8 598.5 " fill="none"></path>
-					<path d="M63483.2 157.9 L63479.4 161.6 L63475.6 165.3 L63470.2 152.0 Z"></path>
-					<path d="M62436.5 1747.2 L62436.5 1936 L62436.5 2526.5 L62436.5 2526.5 " fill="none"></path>
+					<path d="M81199.3 3839.5 L81217.5 3880 L75395.5 4010.689002429014 L75395.5 4010.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62441.8 1737.8 L62436.5 1747.2 L62431.2 1737.8 L62436.5 1728.5 Z"></path>
+						<path d="M81200.3 3828.8 L81199.3 3839.5 L81190.6 3833.2 L81191.6 3822.5 Z"></path>
 					</g>
-					<path d="M62436.5 1241.3 L62436.5 1459 L62436.5 1666.5 L62436.5 1666.5 " fill="none"></path>
-					<path d="M62441.8 1241.3 L62436.5 1241.3 L62431.2 1241.3 L62436.5 1228.0 Z"></path>
-					<path d="M62579.3 756.6 L62124 966 L62124 1197 L62124.0 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M62590.0 757.6 L62579.3 756.6 L62585.5 747.9 L62596.3 748.8 Z"></path>
+					<path d="M81077.3 1785.6 L81147 1936 L81147 2565 L81147 2565 L81147 3194 L81147 3194 L81147 3380.5 L81147 3380.5 L81147 3567 L81147 3567 L81147 3624.5 L81147.0 3624.5 " fill="none"></path>
+					<path d="M81082.2 1783.4 L81077.3 1785.6 L81072.5 1787.8 L81071.7 1773.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M59330.1 158.6 L59093.25 293 L59093.25 614 L59093.3 614.0 " fill="none"></path>
+					</g>
+					<path d="M59332.7 163.2 L59330.1 158.6 L59327.5 153.9 L59341.7 152.0 Z"></path>
+					<path d="M59019.4 630.9 L41824 966 L41824 1197 L41824.0 1197.0 " fill="none"></path>
+					<path d="M59019.5 636.3 L59019.4 630.9 L59019.3 625.6 L59032.8 630.7 Z"></path>
+					<path d="M59019.4 631.0 L42111.5 966 L42111.5 1197 L42111.5 1197.0 " fill="none"></path>
+					<path d="M59019.5 636.3 L59019.4 631.0 L59019.3 625.6 L59032.8 630.7 Z"></path>
+					<path d="M59019.4 633.5 L52884.5 966 L52884.5 1197 L52884.5 1197.0 " fill="none"></path>
+					<path d="M59019.7 638.8 L59019.4 633.5 L59019.1 628.2 L59032.8 632.8 Z"></path>
+					<path d="M59019.4 633.7 L53181 966 L53181 1197 L53181.0 1197.0 " fill="none"></path>
+					<path d="M59019.7 639.0 L59019.4 633.7 L59019.1 628.4 L59032.8 632.9 Z"></path>
+					<path d="M59019.4 633.9 L53489 966 L53489 1197 L53489.0 1197.0 " fill="none"></path>
+					<path d="M59019.8 639.3 L59019.4 633.9 L59019.1 628.6 L59032.8 633.1 Z"></path>
+					<path d="M59166.8 645.1 L60676.25 966 L60676.25 1197 L60676.3 1197.0 " fill="none"></path>
+					<path d="M59167.9 639.9 L59166.8 645.1 L59165.7 650.3 L59153.8 642.4 Z"></path>
+					<path d="M59166.9 642.6 L60979.75 966 L60979.75 1197 L60979.8 1197.0 " fill="none"></path>
+					<path d="M59167.8 637.4 L59166.9 642.6 L59165.9 647.9 L59153.8 640.3 Z"></path>
+					<path d="M59166.9 640.9 L61273.25 966 L61273.25 1197 L61273.3 1197.0 " fill="none"></path>
+					<path d="M59167.7 635.6 L59166.9 640.9 L59166.1 646.1 L59153.8 638.8 Z"></path>
+					<path d="M59167.0 639.5 L61584.25 966 L61584.25 1197 L61584.3 1197.0 " fill="none"></path>
+					<path d="M59167.7 634.2 L59167.0 639.5 L59166.2 644.7 L59153.8 637.7 Z"></path>
+					<path d="M59167.0 638.5 L61857.75 966 L61857.75 1197 L61857.8 1197.0 " fill="none"></path>
+					<path d="M59167.6 633.2 L59167.0 638.5 L59166.3 643.8 L59153.8 636.9 Z"></path>
+					<path d="M76110.8 4519.7 L76110.75 4521 L75756.75 4550.604240282685 L75756.8 4550.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M76116.1 4510.3 L76110.8 4519.7 L76105.4 4510.3 L76110.8 4501.0 Z"></path>
+					</g>
+					<path d="M75791.3 4058.3 L75791.25 4148 L75871.25 4194.697965571205 L75871.3 4194.7 " fill="none"></path>
+					<path d="M75796.6 4058.3 L75791.3 4058.3 L75785.9 4058.3 L75791.3 4045.0 Z"></path>
+					<path d="M76110.8 4095.8 L76110.75 4148 L76110.75 4168 L76110.8 4168.0 " fill="none"></path>
+					<path d="M76116.1 4095.8 L76110.8 4095.8 L76105.4 4095.8 L76110.8 4082.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M78383.5 4133.3 L78383.5 4148 L76350.25 4314.846826531735 L76350.3 4314.8 " fill="none"></path>
 					</g>
-					<path d="M62580.2 791.6 L62283.5 966 L62283.5 1197 L62283.5 1197.0 " fill="none"></path>
+					<path d="M78388.8 4133.3 L78383.5 4133.3 L78378.2 4133.3 L78383.5 4120.0 Z"></path>
+					<path d="M63009.5 3796.2 L63009.5 3880 L78258 4012.9061402367633 L78258.0 4012.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62590.9 791.4 L62580.2 791.6 L62585.5 782.2 L62596.3 782.1 Z"></path>
+						<path d="M63014.8 3786.8 L63009.5 3796.2 L63004.2 3786.8 L63009.5 3777.5 Z"></path>
 					</g>
-					<path d="M63111.3 914.9 L63157 966 L63157 1197 L63157.0 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M63109.0 904.4 L63111.3 914.9 L63101.1 911.5 L63098.8 901.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M63009.5 3432.3 L63009.5 3567 L63009.5 3669.5 L63009.5 3669.5 " fill="none"></path>
 					</g>
-					<path d="M63130.7 814.5 L63356 966 L63356 1197 L63356.0 1197.0 " fill="none"></path>
+					<path d="M63014.8 3432.3 L63009.5 3432.3 L63004.2 3432.3 L63009.5 3419.0 Z"></path>
+					<path d="M73898.5 3458.8 L73846 3567 L73846 3723.5 L73846 3723.5 L73846 3880 L73846 3880 L76258.25 4011.0128685783766 L76258.3 4011.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63126.0 804.8 L63130.7 814.5 L63120.0 813.7 L63115.3 804.1 Z"></path>
+						<path d="M73907.4 3452.7 L73898.5 3458.8 L73897.8 3448.1 L73906.7 3442.0 Z"></path>
 					</g>
-					<path d="M62855.8 165.3 L62855.75 293 L62855.75 358 L62855.8 358.0 " fill="none"></path>
-					<path d="M62861.1 165.3 L62855.8 165.3 L62850.4 165.3 L62855.8 152.0 Z"></path>
-					<path d="M62304.9 2598.8 L59984.25 3194 L26688.25 3380.3377044261065 L26688.3 3380.3 " fill="none"></path>
+					<path d="M73981.5 3824.5 L73956.5 3880 L78258 4010.201264964988 L78258.0 4010.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62315.3 2601.6 L62304.9 2598.8 L62312.6 2591.3 L62323.0 2594.1 Z"></path>
+						<path d="M73990.2 3818.2 L73981.5 3824.5 L73980.5 3813.8 L73989.2 3807.5 Z"></path>
 					</g>
-					<path d="M62438.3 2622.2 L62456.5 3194 L62456.5 3365 L62456.5 3365.0 " fill="none"></path>
+					<path d="M74007.1 3825.8 L73996.5 3880 L75100.5 3998.2069516580104 L75100.5 3998.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62443.4 2612.7 L62438.3 2622.2 L62432.7 2613.0 L62437.7 2603.5 Z"></path>
+						<path d="M74014.1 3817.7 L74007.1 3825.8 L74003.6 3815.6 L74010.6 3807.5 Z"></path>
 					</g>
-					<path d="M51002.5 2645.2 L51002.5 3194 L26688.25 3380.277823421277 L26688.3 3380.3 " fill="none"></path>
+					<path d="M74185.9 3770.9 L74551.25 3880 L78175 4013.209656402167 L78175.0 4013.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51007.8 2635.8 L51002.5 2645.2 L50997.2 2635.8 L51002.5 2626.5 Z"></path>
+						<path d="M74178.5 3763.2 L74185.9 3770.9 L74175.4 3773.4 L74168.0 3765.6 Z"></path>
 					</g>
-					<path d="M2293.1 3288.2 L2306.25 3282 L2313.75 3282 L2313.75 3282 L2321.25 3380.5 L2321.25 3380.5 L2313.75 3479 L2313.75 3479 L2306.25 3479 L2306.25 3479 L2276.25 3464.8612440191387 L2276.3 3464.9 " fill="none"></path>
+					<path d="M74186.0 3767.6 L74591.25 3880 L76258.25 4009.720092915215 L76258.3 4009.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2282.4 3287.3 L2293.1 3288.2 L2287.0 3297.0 L2276.3 3296.1 Z"></path>
+						<path d="M74178.4 3760.0 L74186.0 3767.6 L74175.6 3770.2 L74168.0 3762.6 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M1698.1 2591.6 L2097.25 3194 L2097.25 3282 L2097.3 3282.0 " fill="none"></path>
+						<path d="M73972.2 3454.0 L74027 3567 L74027 3639.5 L74027.0 3639.5 " fill="none"></path>
 					</g>
-					<path d="M1702.6 2588.7 L1698.1 2591.6 L1693.7 2594.6 L1690.8 2580.5 Z"></path>
-					<path d="M74810.2 161.6 L74684.25 293 L74684.25 591 L74684.3 591.0 " fill="none"></path>
-					<path d="M74814.0 165.3 L74810.2 161.6 L74806.3 157.9 L74819.4 152.0 Z"></path>
-					<path d="M74858.3 161.6 L74984.25 293 L74984.25 591 L74984.3 591.0 " fill="none"></path>
-					<path d="M74862.2 157.9 L74858.3 161.6 L74854.5 165.3 L74849.1 152.0 Z"></path>
-					<path d="M51313.5 2637.2 L51313.5 3194 L67432.25 3380.1477700202795 L67432.3 3380.1 " fill="none"></path>
+					<path d="M73977.0 3451.7 L73972.2 3454.0 L73967.4 3456.3 L73966.3 3442.0 Z"></path>
+					<path d="M3294.0 3330.3 L3306 3327 L3313.5 3327 L3313.5 3327 L3321 3380.5 L3321 3380.5 L3313.5 3434 L3313.5 3434 L3306 3434 L3306 3434 L3276 3425.8527918781724 L3276.0 3425.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51318.8 2627.8 L51313.5 2637.2 L51308.2 2627.8 L51313.5 2618.5 Z"></path>
+						<path d="M3283.6 3327.6 L3294.0 3330.3 L3286.4 3337.8 L3276.0 3335.1 Z"></path>
 					</g>
-					<path d="M75435.5 165.3 L75435.5 293 L75435.5 583 L75435.5 583.0 " fill="none"></path>
-					<path d="M75440.8 165.3 L75435.5 165.3 L75430.2 165.3 L75435.5 152.0 Z"></path>
-					<path d="M53075.4 3842.0 L53030.5 3880 L53285.84981343283 3998.5 L53285.8 3998.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M53086.0 3840.1 L53075.4 3842.0 L53079.1 3831.9 L53089.7 3830.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3128.5 2590.3 L3681.5 3194 L3273.229222520107 3327 L3273.2 3327.0 " fill="none"></path>
 					</g>
-					<path d="M53156.1 3846.8 L53140 3880 L21283 4013.6496923968 L21283.0 4013.6 " fill="none"></path>
+					<path d="M3132.4 2586.7 L3128.5 2590.3 L3124.5 2593.9 L3119.5 2580.5 Z"></path>
+					<path d="M75081.9 4029.5 L73808 4148 L73808 4334.5 L73808 4334.5 L73808 4521 L73808 4521 L75168.5 4555.821737563086 L75168.5 4555.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53164.9 3840.7 L53156.1 3846.8 L53155.3 3836.1 L53164.2 3830.0 Z"></path>
+						<path d="M75091.7 4033.9 L75081.9 4029.5 L75090.7 4023.3 L75100.5 4027.7 Z"></path>
 					</g>
-					<path d="M53231.7 3848.5 L53235.75 3880 L10039.5 4013.777018945763 L10039.5 4013.8 " fill="none"></path>
+					<path d="M75300.0 4145.4 L75301 4148 L75301 4334.5 L75301 4334.5 L75301 4521 L75301 4521 L75301 4541 L75301.0 4541.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53235.8 3838.6 L53231.7 3848.5 L53225.3 3839.9 L53229.4 3830.0 Z"></path>
+						<path d="M75301.5 4134.7 L75300.0 4145.4 L75291.6 4138.6 L75293.1 4128.0 Z"></path>
 					</g>
-					<path d="M53424.4 3813.6 L53578.25 3880 L53578.25 3998.5 L53578.3 3998.5 " fill="none"></path>
+					<path d="M19273.8 3767.8 L19273.75 3880 L75100.5 4013.646891204438 L75100.5 4013.6 " fill="none"></path>
+					<path d="M19279.1 3767.8 L19273.8 3767.8 L19268.4 3767.8 L19273.8 3754.5 Z"></path>
+					<path d="M75564.6 4504.3 L75561 4521 L75631.56338028169 4541 L75631.6 4541.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53417.9 3805.0 L53424.4 3813.6 L53413.7 3814.8 L53407.3 3806.2 Z"></path>
+						<path d="M75571.8 4496.2 L75564.6 4504.3 L75561.3 4494.0 L75568.5 4486.0 Z"></path>
 					</g>
-					<path d="M75839.5 165.3 L75839.5 293 L75839.5 583.5 L75839.5 583.5 " fill="none"></path>
-					<path d="M75844.8 165.3 L75839.5 165.3 L75834.2 165.3 L75839.5 152.0 Z"></path>
-					<path d="M76174.5 165.3 L76174.5 293 L76174.5 583.5 L76174.5 583.5 " fill="none"></path>
-					<path d="M76179.8 165.3 L76174.5 165.3 L76169.2 165.3 L76174.5 152.0 Z"></path>
-					<path d="M51654.5 2652.2 L51654.5 3194 L21470 3380.2316147280667 L21470.0 3380.2 " fill="none"></path>
+					<path d="M75601.0 4504.7 L75601 4521 L67781.75 4556.12046496916 L67781.8 4556.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51659.8 2642.8 L51654.5 2652.2 L51649.2 2642.8 L51654.5 2633.5 Z"></path>
+						<path d="M75606.3 4495.3 L75601.0 4504.7 L75595.7 4495.3 L75601.0 4486.0 Z"></path>
 					</g>
-					<path d="M76971.1 172.6 L77260.75 293 L77260.75 629.5 L77260.75 629.5 L77260.75 966 L77260.75 966 L77260.75 1212.5 L77260.75 1212.5 L77260.75 1459 L77260.75 1459 L77260.75 1659 L77260.8 1659.0 " fill="none"></path>
-					<path d="M76973.2 167.7 L76971.1 172.6 L76969.1 177.5 L76958.8 167.5 Z"></path>
-					<path d="M2718.4 3335.9 L2880.25 3297 L2925.25 3297 L2925.25 3297 L2970.25 3380.5 L2970.25 3380.5 L2925.25 3464 L2925.25 3464 L2880.25 3464 L2880.25 3464 L2700.25 3420.685878962536 L2700.3 3420.7 " fill="none"></path>
+					<path d="M75637.4 4504.3 L75641 4521 L75570.43661971831 4541 L75570.4 4541.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2708.1 3332.9 L2718.4 3335.9 L2710.6 3343.3 L2700.3 3340.3 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1712.2 2588.4 L2533.25 3194 L2533.25 3297 L2533.3 3297.0 " fill="none"></path>
+						<path d="M75640.7 4494.0 L75637.4 4504.3 L75630.2 4496.2 L75633.5 4486.0 Z"></path>
 					</g>
-					<path d="M1715.4 2584.1 L1712.2 2588.4 L1709.1 2592.7 L1701.5 2580.5 Z"></path>
-					<path d="M26659.3 3409.3 L26659.25 3567 L26659.25 3685 L26659.3 3685.0 " fill="none"></path>
-					<path d="M26664.6 3409.3 L26659.3 3409.3 L26653.9 3409.3 L26659.3 3396.0 Z"></path>
-					<path d="M1933.1 1709.4 L3100.5 1936 L3100.5 2481 L3100.5 2481.0 " fill="none"></path>
-					<path d="M1934.1 1704.1 L1933.1 1709.4 L1932.1 1714.6 L1920.0 1706.8 Z"></path>
-					<path d="M74326.8 724.7 L74326.75 966 L74326.75 1197 L74326.8 1197.0 " fill="none"></path>
+					<path d="M75734.8 4500.5 L75751.25 4521 L75340.5 4553.3856191005 L75340.5 4553.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M74332.1 715.3 L74326.8 724.7 L74321.4 715.3 L74326.8 706.0 Z"></path>
+						<path d="M75733.1 4489.9 L75734.8 4500.5 L75724.8 4496.6 L75723.1 4486.0 Z"></path>
 					</g>
-					<path d="M74326.8 165.3 L74326.75 293 L74326.75 553 L74326.8 553.0 " fill="none"></path>
-					<path d="M74332.1 165.3 L74326.8 165.3 L74321.4 165.3 L74326.8 152.0 Z"></path>
-					<path d="M54574.3 3795.6 L54552.75 3880 L53830.25 4008.65780730897 L53830.3 4008.7 " fill="none"></path>
+					<path d="M75768.9 4499.1 L75791.25 4521 L75221.5 4554.922222222222 L75221.5 4554.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54581.8 3787.9 L54574.3 3795.6 L54571.5 3785.2 L54578.9 3777.5 Z"></path>
+						<path d="M75765.9 4488.7 L75768.9 4499.1 L75758.5 4496.3 L75755.5 4486.0 Z"></path>
 					</g>
-					<path d="M62504.5 4094.2 L62504.5 4148 L63511.703753351205 4319 L63511.7 4319.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M62509.8 4084.8 L62504.5 4094.2 L62499.2 4084.8 L62504.5 4075.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M75408.0 4074.7 L75601 4148 L75601 4183 L75601.0 4183.0 " fill="none"></path>
 					</g>
-					<path d="M54592.8 3790.8 L54592.75 3880 L62236.5 4009.460928366038 L62236.5 4009.5 " fill="none"></path>
-					<path d="M54598.1 3790.8 L54592.8 3790.8 L54587.4 3790.8 L54592.8 3777.5 Z"></path>
-					<path d="M54670.5 3785.8 L54788 3880 L54006.25 4003.2768461312153 L54006.3 4003.3 " fill="none"></path>
-					<path d="M54673.9 3781.7 L54670.5 3785.8 L54667.2 3790.0 L54660.1 3777.5 Z"></path>
-					<path d="M54872.5 3808.4 L54828 3880 L66403.75 4013.165969136995 L66403.8 4013.2 " fill="none"></path>
+					<path d="M75409.9 4069.7 L75408.0 4074.7 L75406.1 4079.7 L75395.5 4070.0 Z"></path>
+					<path d="M76716.6 181.7 L76527 293 L76527 614 L76527.0 614.0 " fill="none"></path>
+					<path d="M76719.3 186.3 L76716.6 181.7 L76713.9 177.1 L76728.1 175.0 Z"></path>
+					<path d="M75805.8 4062.9 L75831.25 4148 L75831.25 4334.5 L75831.25 4334.5 L75831.25 4521 L75831.25 4521 L75749.55985915494 4541 L75749.6 4541.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54882.0 3803.2 L54872.5 3808.4 L54872.9 3797.6 L54882.4 3792.5 Z"></path>
+						<path d="M75808.3 4052.4 L75805.8 4062.9 L75798.1 4055.5 L75800.5 4045.0 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M59429.3 138.4 L64254.75 293 L64254.75 583.5 L64254.8 583.5 " fill="none"></path>
 					</g>
-					<path d="M55003.1 3806.1 L55072.75 3880 L54578.63152985075 3998.5 L54578.6 3998.5 " fill="none"></path>
+					<path d="M59429.5 133.1 L59429.3 138.4 L59429.2 143.8 L59416.0 138.0 Z"></path>
+					<path d="M60909.5 2712.7 L60909.5 3194 L42866.25 3379.9383694105622 L42866.3 3379.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55000.6 3795.6 L55003.1 3806.1 L54992.8 3803.0 L54990.3 3792.5 Z"></path>
+						<path d="M60914.8 2703.3 L60909.5 2712.7 L60904.2 2703.3 L60909.5 2694.0 Z"></path>
 					</g>
-					<path d="M77606.3 160.8 L77457.25 293 L77457.25 575.5 L77457.3 575.5 " fill="none"></path>
-					<path d="M77609.8 164.8 L77606.3 160.8 L77602.8 156.9 L77616.3 152.0 Z"></path>
-					<path d="M77677.4 157.9 L77953.5 293 L77953.5 598.5 L77953.5 598.5 " fill="none"></path>
-					<path d="M77679.7 153.1 L77677.4 157.9 L77675.0 162.7 L77665.4 152.0 Z"></path>
-					<path d="M78444.8 188.4 L78231 293 L78231 598.5 L78231.0 598.5 " fill="none"></path>
-					<path d="M78447.1 193.2 L78444.8 188.4 L78442.4 183.6 L78456.8 182.5 Z"></path>
-					<path d="M78588.0 193.7 L78652.75 293 L78652.75 598.5 L78652.8 598.5 " fill="none"></path>
-					<path d="M78592.5 190.8 L78588.0 193.7 L78583.5 196.6 L78580.7 182.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M79016.0 176.7 L78895.25 293 L78895.25 598.5 L78895.3 598.5 " fill="none"></path>
+						<path d="M59429.3 138.3 L64730.75 293 L64730.75 614 L64730.8 614.0 " fill="none"></path>
 					</g>
-					<path d="M79019.7 180.6 L79016.0 176.7 L79012.3 172.9 L79025.6 167.5 Z"></path>
+					<path d="M59429.5 132.9 L59429.3 138.3 L59429.2 143.6 L59416.0 137.9 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M79088.8 178.2 L79174.25 293 L79174.25 598.5 L79174.3 598.5 " fill="none"></path>
-					</g>
-					<path d="M79093.1 175.0 L79088.8 178.2 L79084.5 181.4 L79080.8 167.5 Z"></path>
-					<path d="M52000.1 2629.4 L51900 3194 L24613.25 3379.2575605893758 L24613.3 3379.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M52007.0 2621.1 L52000.1 2629.4 L51996.5 2619.3 L52003.3 2611.0 Z"></path>
+						<path d="M64730.8 658.3 L64730.75 966 L64730.75 1197 L64730.8 1197.0 " fill="none"></path>
 					</g>
-					<path d="M52011.5 2629.7 L52011.5 3194 L26688.25 3380.286665877782 L26688.3 3380.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M52016.8 2620.3 L52011.5 2629.7 L52006.2 2620.3 L52011.5 2611.0 Z"></path>
+					<path d="M64736.1 658.3 L64730.8 658.3 L64725.4 658.3 L64730.8 645.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M80707.3 173.0 L80972.25 293 L80972.25 501 L80972.3 501.0 " fill="none"></path>
 					</g>
-					<path d="M52064.1 2625.0 L52562.75 3194 L52562.75 3365 L52562.8 3365.0 " fill="none"></path>
+					<path d="M80709.5 168.1 L80707.3 173.0 L80705.1 177.9 L80695.2 167.5 Z"></path>
+					<path d="M81036.0 1457.1 L81036.5 1459 L81036.5 1621.5 L81036.5 1621.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M52062.0 2614.5 L52064.1 2625.0 L52054.0 2621.5 L52051.8 2611.0 Z"></path>
+						<path d="M81038.8 1446.7 L81036.0 1457.1 L81028.5 1449.4 L81031.3 1439.0 Z"></path>
 					</g>
-					<path d="M24631.4 3330.0 L24643.25 3327 L24650.75 3327 L24650.75 3327 L24658.25 3380.5 L24658.25 3380.5 L24650.75 3434 L24650.75 3434 L24643.25 3434 L24643.25 3434 L24613.25 3426.4647887323945 L24613.3 3426.5 " fill="none"></path>
+					<path d="M81314.5 1449.6 L81328 1459 L81328 1697.5 L81328 1697.5 L81328 1936 L81328 1936 L81328 2565 L81328 2565 L81328 3194 L81328 3194 L81328 3380.5 L81328 3380.5 L81328 3567 L81328 3567 L81328 3723.5 L81328 3723.5 L81328 3880 L81328 3880 L63008 4013.471795568846 L63008.0 4013.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24621.0 3327.1 L24631.4 3330.0 L24623.6 3337.4 L24613.3 3334.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1713.4 2588.2 L2573.25 3194 L24247.25 3378.938509402022 L24247.3 3378.9 " fill="none"></path>
+						<path d="M81309.8 1439.9 L81314.5 1449.6 L81303.8 1448.7 L81299.1 1439.0 Z"></path>
 					</g>
-					<path d="M1716.5 2583.8 L1713.4 2588.2 L1710.3 2592.5 L1702.5 2580.5 Z"></path>
+					<path d="M80972.3 771.3 L80972.25 966 L80972.25 986 L80972.3 986.0 " fill="none"></path>
+					<path d="M80977.6 771.3 L80972.3 771.3 L80966.9 771.3 L80972.3 758.0 Z"></path>
+					<path d="M76879.2 156.8 L77452.25 293 L77452.25 614 L77452.3 614.0 " fill="none"></path>
+					<path d="M76880.5 151.6 L76879.2 156.8 L76878.0 162.0 L76866.3 153.7 Z"></path>
+					<path d="M76879.3 153.5 L77581.25 293 L77581.25 614 L77581.3 614.0 " fill="none"></path>
+					<path d="M76880.4 148.3 L76879.3 153.5 L76878.3 158.7 L76866.3 150.9 Z"></path>
+					<path d="M76879.4 151.2 L77703.25 293 L77703.25 614 L77703.3 614.0 " fill="none"></path>
+					<path d="M76880.3 146.0 L76879.4 151.2 L76878.5 156.5 L76866.3 149.0 Z"></path>
+					<path d="M76879.4 149.5 L77828.75 293 L77828.75 614 L77828.8 614.0 " fill="none"></path>
+					<path d="M76880.2 144.2 L76879.4 149.5 L76878.6 154.7 L76866.3 147.5 Z"></path>
 					<g data-name="Config">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Config">
-							<rect x="28407.0" y="60.5" height="152.0" width="396.0" data-name="Config"></rect>
-							<path d="M28407.0 91.5 L28803.0 91.5" fill="none" data-name="Config"></path>
+							<rect x="27640.0" y="60.5" height="152.0" width="396.0" data-name="Config"></rect>
+							<path d="M27640.0 91.5 L28036.0 91.5" fill="none" data-name="Config"></path>
 						</g>
-						<g transform="translate(28407, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Config">
+						<g transform="translate(27640, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Config">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Config">
 								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="Config">Config</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28407, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Config">
+						<g transform="translate(27640, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Config">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Config">
 								<text x="0.0" y="13.5" stroke="none" data-name="Config">&lt;static&gt;+isDebugMode: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Config">&lt;static&gt;+defaultLocale: Set&lt;String&gt;</text>
@@ -6543,687 +6628,495 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="RoutingIntents">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntents">
-							<rect x="376.0" y="1479.0" height="437.0" width="572.0" data-name="RoutingIntents"></rect>
-							<path d="M376.0 1510.0 L948.0 1510.0" fill="none" data-name="RoutingIntents"></path>
-						</g>
-						<g transform="translate(376, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntents">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntents">
-								<text x="278.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntents">RoutingIntents</text>
-								
-							</g>
-						</g>
-						<g transform="translate(376, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntents">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntents">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+root: RoutingIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studies: RoutingIntent</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studiesShared: RoutingIntent</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+publicRegistry: RoutingIntent</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+study: RoutingIntent Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEdit: RoutingIntent Function(String)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInfo: RoutingIntent Function(String)</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String)</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInterventions: RoutingIntent Function(String)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String)</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditReports: RoutingIntent Function(String)</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String)</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute})</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyRecruit: RoutingIntent Function(String)</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyMonitor: RoutingIntent Function(String)</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyAnalyze: RoutingIntent Function(String)</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studySettings: RoutingIntent Function(String)</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+accountSettings: RoutingIntent</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyNew: RoutingIntent</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+login: RoutingIntent</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+signup: RoutingIntent</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot: RoutingIntent</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot2: RoutingIntent Function(String)</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordRecovery: RoutingIntent</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+error: RoutingIntent Function(Exception)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="28133.0" y="2458.5" height="213.0" width="297.0" data-name="RoutingIntent"></rect>
-							<path d="M28133.0 2489.5 L28430.0 2489.5" fill="none" data-name="RoutingIntent"></path>
-							<path d="M28133.0 2625.5 L28430.0 2625.5" fill="none" data-name="RoutingIntent"></path>
-						</g>
-						<g transform="translate(28133, 2458.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28133, 2489.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">+route: GoRoute</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+params: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntent">+queryParams: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntent">+dispatch: RoutingIntentDispatch?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntent">+extra: Object?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntent">+routeName: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntent">+arguments: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntent">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28133, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">-dynamic _validateRoute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+bool matches()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String)">
-							<rect x="0.0" y="2549.5" height="31.0" width="253.0" data-name="RoutingIntent Function(String)"></rect>
-						</g>
-						<g transform="translate(0, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String)">
-								<text x="118.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String)">RoutingIntent Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(String, String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, String)">
-							<rect x="293.0" y="2549.5" height="31.0" width="309.0" data-name="RoutingIntent Function(String, String)"></rect>
-						</g>
-						<g transform="translate(293, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, String)">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, String)">RoutingIntent Function(String, String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(String, {String? appRoute})">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, {String? appRoute})">
-							<rect x="642.0" y="2549.5" height="31.0" width="413.0" data-name="RoutingIntent Function(String, {String? appRoute})"></rect>
-						</g>
-						<g transform="translate(642, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, {String? appRoute})">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, {String? appRoute})">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, {String? appRoute})">RoutingIntent Function(String, {String? appRoute})</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(Exception)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(Exception)">
-							<rect x="1095.0" y="2549.5" height="31.0" width="285.0" data-name="RoutingIntent Function(Exception)"></rect>
-						</g>
-						<g transform="translate(1095, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(Exception)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(Exception)">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(Exception)">RoutingIntent Function(Exception)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRoute">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRoute">
-							<rect x="30417.8" y="3365.0" height="31.0" width="86.0" data-name="GoRoute"></rect>
-						</g>
-						<g transform="translate(30417.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRoute">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRoute">
-								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRoute">GoRoute</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntentDispatch">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntentDispatch">
-							<rect x="11926.5" y="3327.0" height="107.0" width="373.0" data-name="RoutingIntentDispatch"></rect>
-							<path d="M11926.5 3358.0 L12299.5 3358.0" fill="none" data-name="RoutingIntentDispatch"></path>
-						</g>
-						<g transform="translate(11926.5, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntentDispatch">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntentDispatch">
-								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntentDispatch">RoutingIntentDispatch</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11926.5, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntentDispatch">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntentDispatch">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntentDispatch">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+go: RoutingIntentDispatch</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+push: RoutingIntentDispatch</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="1824.0" y="1682.0" height="31.0" width="96.0" data-name="Equatable"></rect>
-						</g>
-						<g transform="translate(1824, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="1650.0" y="2549.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(1650, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouteParamEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouteParamEnum">
-							<rect x="28843.0" y="98.0" height="77.0" width="202.0" data-name="GoRouteParamEnum"></rect>
-							<path d="M28843.0 129.0 L29045.0 129.0" fill="none" data-name="GoRouteParamEnum"></path>
-						</g>
-						<g transform="translate(28843, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GoRouteParamEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouteParamEnum">
-								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouteParamEnum">GoRouteParamEnum</text>
-								
-							</g>
+					<g data-name="ResultTypes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ResultTypes">
+							<rect x="28076.0" y="121.0" height="31.0" width="114.0" data-name="ResultTypes"></rect>
 						</g>
-						<g transform="translate(28843, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouteParamEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouteParamEnum">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouteParamEnum">+String toRouteParam()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GoRouteParamEnum">+String toShortString()</text>
+						<g transform="translate(28076, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ResultTypes">
+								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ResultTypes">ResultTypes</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RouterKeys">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouterKeys">
-							<rect x="29085.0" y="98.0" height="77.0" width="312.0" data-name="RouterKeys"></rect>
-							<path d="M29085.0 129.0 L29397.0 129.0" fill="none" data-name="RouterKeys"></path>
-						</g>
-						<g transform="translate(29085, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterKeys">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterKeys">
-								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterKeys">RouterKeys</text>
-								
-							</g>
+					<g data-name="MeasurementResultTypes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementResultTypes">
+							<rect x="27707.0" y="591.0" height="77.0" width="252.0" data-name="MeasurementResultTypes"></rect>
+							<path d="M27707.0 622.0 L27959.0 622.0" fill="none" data-name="MeasurementResultTypes"></path>
 						</g>
-						<g transform="translate(29085, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterKeys">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterKeys">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+studyKey: ValueKey&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+authKey: ValueKey&lt;String&gt;</text>
+						<g transform="translate(27707, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementResultTypes">
+								<text x="118.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementResultTypes">MeasurementResultTypes</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ValueKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ValueKey">
-							<rect x="29195.5" y="614.0" height="31.0" width="91.0" data-name="ValueKey"></rect>
-						</g>
-						<g transform="translate(29195.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueKey">
-								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueKey">ValueKey</text>
+						<g transform="translate(27707, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementResultTypes">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+questionnaire: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RouteParams">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteParams">
-							<rect x="29437.0" y="75.5" height="122.0" width="267.0" data-name="RouteParams"></rect>
-							<path d="M29437.0 106.5 L29704.0 106.5" fill="none" data-name="RouteParams"></path>
+					<g data-name="InterventionResultTypes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionResultTypes">
+							<rect x="27999.0" y="591.0" height="77.0" width="268.0" data-name="InterventionResultTypes"></rect>
+							<path d="M27999.0 622.0 L28267.0 622.0" fill="none" data-name="InterventionResultTypes"></path>
 						</g>
-						<g transform="translate(29437, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteParams">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteParams">
-								<text x="125.5" y="13.5" stroke="none" text-anchor="middle" data-name="RouteParams">RouteParams</text>
+						<g transform="translate(27999, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionResultTypes">
+								<text x="126.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionResultTypes">InterventionResultTypes</text>
 								
-							</g>
-						</g>
-						<g transform="translate(29437, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteParams">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteParams">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studiesFilter: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteParams">&lt;static&gt;+measurementId: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteParams">&lt;static&gt;+interventionId: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RouteParams">&lt;static&gt;+testAppRoute: String</text>
+							</g>
+						</g>
+						<g transform="translate(27999, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResultTypes">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+checkmarkTask: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RouterConf">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouterConf">
-							<rect x="2542.5" y="2496.0" height="138.0" width="326.0" data-name="RouterConf"></rect>
-							<path d="M2542.5 2527.0 L2868.5 2527.0" fill="none" data-name="RouterConf"></path>
-							<path d="M2542.5 2603.0 L2868.5 2603.0" fill="none" data-name="RouterConf"></path>
+					<g data-name="StudyExportData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyExportData">
+							<rect x="0.0" y="2511.5" height="107.0" width="414.0" data-name="StudyExportData"></rect>
+							<path d="M0.0 2542.5 L414.0 2542.5" fill="none" data-name="StudyExportData"></path>
 						</g>
-						<g transform="translate(2542.5, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterConf">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterConf">RouterConf</text>
+						<g transform="translate(0, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyExportData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyExportData">
+								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyExportData">StudyExportData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2542.5, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+router: GoRouter</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouterConf">&lt;static&gt;+routes: List&lt;GoRoute&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouterConf">&lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouterConf">&lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;</text>
+						<g transform="translate(0, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyExportData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyExportData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyExportData">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyExportData">+measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyExportData">+interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyExportData">+isEmpty: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2542.5, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+GoRoute route()</text>
+					</g>
+					<g data-name="Study">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
+							<rect x="67831.5" y="3365.0" height="31.0" width="61.0" data-name="Study"></rect>
+						</g>
+						<g transform="translate(67831.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="55895.8" y="3365.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
+					<g data-name="StudyTemplates">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTemplates">
+							<rect x="28230.0" y="90.0" height="93.0" width="307.0" data-name="StudyTemplates"></rect>
+							<path d="M28230.0 121.0 L28537.0 121.0" fill="none" data-name="StudyTemplates"></path>
+							<path d="M28230.0 152.0 L28537.0 152.0" fill="none" data-name="StudyTemplates"></path>
 						</g>
-						<g transform="translate(55895.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
+						<g transform="translate(28230, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTemplates">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTemplates">
+								<text x="145.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTemplates">StudyTemplates</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="32741.0" y="1666.5" height="62.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
-							<path d="M32741.0 1697.5 L32925.0 1697.5" fill="none" data-name="StudyFormRouteArgs"></path>
-						</g>
-						<g transform="translate(32741, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
+						<g transform="translate(28230, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+kUnnamedStudyTitle: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32741, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormRouteArgs">+studyId: String</text>
+						<g transform="translate(28230, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+Study emptyDraft()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormRouteArgs">
-							<rect x="38122.3" y="2534.0" height="62.0" width="210.0" data-name="QuestionFormRouteArgs"></rect>
-							<path d="M38122.3 2565.0 L38332.3 2565.0" fill="none" data-name="QuestionFormRouteArgs"></path>
+					<g data-name="StudyActionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyActionType">
+							<rect x="68.0" y="3282.0" height="197.0" width="358.0" data-name="StudyActionType"></rect>
+							<path d="M68.0 3313.0 L426.0 3313.0" fill="none" data-name="StudyActionType"></path>
 						</g>
-						<g transform="translate(38122.25, 2534)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormRouteArgs">
-								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormRouteArgs">QuestionFormRouteArgs</text>
+						<g transform="translate(68, 3282)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyActionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyActionType">
+								<text x="171.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyActionType">StudyActionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38122.25, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormRouteArgs">+questionId: String</text>
+						<g transform="translate(68, 3313)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyActionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyActionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyActionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+values: List&lt;StudyActionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pin: StudyActionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pinoff: StudyActionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+edit: StudyActionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicate: StudyActionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicateDraft: StudyActionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+addCollaborator: StudyActionType</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+export: StudyActionType</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+delete: StudyActionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormRouteArgs">
-							<rect x="38243.0" y="3365.0" height="31.0" width="282.0" data-name="ScreenerQuestionFormRouteArgs"></rect>
+					<g data-name="Enum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
+							<rect x="3074.8" y="2549.5" height="31.0" width="61.0" data-name="Enum"></rect>
 						</g>
-						<g transform="translate(38243, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormRouteArgs">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormRouteArgs">ScreenerQuestionFormRouteArgs</text>
+						<g transform="translate(3074.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormRouteArgs">
-							<rect x="38372.3" y="2534.0" height="62.0" width="239.0" data-name="ConsentItemFormRouteArgs"></rect>
-							<path d="M38372.3 2565.0 L38611.3 2565.0" fill="none" data-name="ConsentItemFormRouteArgs"></path>
+					<g data-name="Notifications">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Notifications">
+							<rect x="3635.0" y="2481.5" height="167.0" width="407.0" data-name="Notifications"></rect>
+							<path d="M3635.0 2512.5 L4042.0 2512.5" fill="none" data-name="Notifications"></path>
 						</g>
-						<g transform="translate(38372.25, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormRouteArgs">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormRouteArgs">ConsentItemFormRouteArgs</text>
+						<g transform="translate(3635, 2481.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Notifications">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notifications">
+								<text x="195.5" y="13.5" stroke="none" text-anchor="middle" data-name="Notifications">Notifications</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38372.25, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormRouteArgs">+consentId: String</text>
+						<g transform="translate(3635, 2512.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Notifications">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Notifications">
+								<text x="0.0" y="13.5" stroke="none" data-name="Notifications">&lt;static&gt;+credentialsInvalid: SnackbarIntent</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Notifications">&lt;static&gt;+userAlreadyRegistered: SnackbarIntent</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordReset: SnackbarIntent</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordResetSuccess: SnackbarIntent</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleted: SnackbarIntent</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeDeleted: SnackbarIntent</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeClipped: SnackbarIntent</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleteConfirmation: AlertIntent</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="36503.8" y="2534.0" height="62.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
-							<path d="M36503.8 2565.0 L36750.8 2565.0" fill="none" data-name="MeasurementFormRouteArgs"></path>
+					<g data-name="SnackbarIntent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SnackbarIntent">
+							<rect x="3366.0" y="3349.5" height="62.0" width="136.0" data-name="SnackbarIntent"></rect>
+							<path d="M3366.0 3380.5 L3502.0 3380.5" fill="none" data-name="SnackbarIntent"></path>
 						</g>
-						<g transform="translate(36503.75, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
+						<g transform="translate(3366, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackbarIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackbarIntent">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackbarIntent">SnackbarIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36503.75, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementFormRouteArgs">+measurementId: String</text>
+						<g transform="translate(3366, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SnackbarIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SnackbarIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="SnackbarIntent">+duration: int?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormRouteArgs">
-							<rect x="36814.8" y="3349.5" height="62.0" width="265.0" data-name="SurveyQuestionFormRouteArgs"></rect>
-							<path d="M36814.8 3380.5 L37079.8 3380.5" fill="none" data-name="SurveyQuestionFormRouteArgs"></path>
+					<g data-name="AlertIntent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AlertIntent">
+							<rect x="3542.0" y="3334.5" height="92.0" width="204.0" data-name="AlertIntent"></rect>
+							<path d="M3542.0 3365.5 L3746.0 3365.5" fill="none" data-name="AlertIntent"></path>
 						</g>
-						<g transform="translate(36814.75, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormRouteArgs">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormRouteArgs">SurveyQuestionFormRouteArgs</text>
+						<g transform="translate(3542, 3334.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AlertIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AlertIntent">
+								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="AlertIntent">AlertIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36814.75, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormRouteArgs">+questionId: String</text>
+						<g transform="translate(3542, 3365.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AlertIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AlertIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="AlertIntent">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AlertIntent">+dismissOnAction: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AlertIntent">+isDestructive: dynamic</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="36816.8" y="2534.0" height="62.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
-							<path d="M36816.8 2565.0 L37049.8 2565.0" fill="none" data-name="InterventionFormRouteArgs"></path>
+					<g data-name="NotificationDefaultActions">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDefaultActions">
+							<rect x="1737.0" y="3349.5" height="62.0" width="287.0" data-name="NotificationDefaultActions"></rect>
+							<path d="M1737.0 3380.5 L2024.0 3380.5" fill="none" data-name="NotificationDefaultActions"></path>
 						</g>
-						<g transform="translate(36816.75, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
+						<g transform="translate(1737, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDefaultActions">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDefaultActions">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDefaultActions">NotificationDefaultActions</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36816.75, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormRouteArgs">+interventionId: String</text>
+						<g transform="translate(1737, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDefaultActions">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDefaultActions">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDefaultActions">&lt;static&gt;+cancel: NotificationAction</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormRouteArgs">
-							<rect x="36503.8" y="3349.5" height="62.0" width="271.0" data-name="InterventionTaskFormRouteArgs"></rect>
-							<path d="M36503.8 3380.5 L36774.8 3380.5" fill="none" data-name="InterventionTaskFormRouteArgs"></path>
+					<g data-name="NotificationAction">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationAction">
+							<rect x="1752.5" y="3677.5" height="92.0" width="256.0" data-name="NotificationAction"></rect>
+							<path d="M1752.5 3708.5 L2008.5 3708.5" fill="none" data-name="NotificationAction"></path>
 						</g>
-						<g transform="translate(36503.75, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormRouteArgs">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormRouteArgs">InterventionTaskFormRouteArgs</text>
+						<g transform="translate(1752.5, 3677.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationAction">
+								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationAction">NotificationAction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36503.75, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormRouteArgs">+taskId: String</text>
+						<g transform="translate(1752.5, 3708.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationAction">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationAction">+label: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationAction">+onSelect: dynamic Function()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationAction">+isDestructive: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormRouteArgs">
-							<rect x="38651.3" y="2534.0" height="62.0" width="226.0" data-name="ReportItemFormRouteArgs"></rect>
-							<path d="M38651.3 2565.0 L38877.3 2565.0" fill="none" data-name="ReportItemFormRouteArgs"></path>
+					<g data-name="INotificationService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
+							<rect x="63303.3" y="3327.0" height="107.0" width="395.0" data-name="INotificationService"></rect>
+							<path d="M63303.3 3358.0 L63698.3 3358.0" fill="none" data-name="INotificationService"></path>
 						</g>
-						<g transform="translate(38651.25, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormRouteArgs">
-								<text x="105.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormRouteArgs">ReportItemFormRouteArgs</text>
+						<g transform="translate(63303.25, 3327)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
+								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38651.25, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormRouteArgs">+sectionId: String</text>
+						<g transform="translate(63303.25, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="INotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="INotificationService">
+								<text x="0.0" y="13.5" stroke="none" data-name="INotificationService">+void showMessage()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="INotificationService">+void show()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="INotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="INotificationService">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ISyncIndicatorViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ISyncIndicatorViewModel">
-							<rect x="29744.0" y="98.0" height="77.0" width="214.0" data-name="ISyncIndicatorViewModel"></rect>
-							<path d="M29744.0 129.0 L29958.0 129.0" fill="none" data-name="ISyncIndicatorViewModel"></path>
-						</g>
-						<g transform="translate(29744, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ISyncIndicatorViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ISyncIndicatorViewModel">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="ISyncIndicatorViewModel">ISyncIndicatorViewModel</text>
-								
-							</g>
+					<g data-name="NotificationService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationService">
+							<rect x="63273.3" y="3654.5" height="138.0" width="455.0" data-name="NotificationService"></rect>
+							<path d="M63273.3 3685.5 L63728.3 3685.5" fill="none" data-name="NotificationService"></path>
+							<path d="M63273.3 3716.5 L63728.3 3716.5" fill="none" data-name="NotificationService"></path>
 						</g>
-						<g transform="translate(29744, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ISyncIndicatorViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ISyncIndicatorViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ISyncIndicatorViewModel">+isDirty: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ISyncIndicatorViewModel">+lastSynced: DateTime?</text>
+						<g transform="translate(63273.25, 3654.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationService">
+								<text x="219.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationService">NotificationService</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SyncIndicator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SyncIndicator">
-							<rect x="4156.5" y="2504.0" height="122.0" width="208.0" data-name="SyncIndicator"></rect>
-							<path d="M4156.5 2535.0 L4364.5 2535.0" fill="none" data-name="SyncIndicator"></path>
-						</g>
-						<g transform="translate(4156.5, 2504)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SyncIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SyncIndicator">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="SyncIndicator">SyncIndicator</text>
+						<g transform="translate(63273.25, 3685.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">-_streamController: BehaviorSubject&lt;NotificationIntent&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4156.5, 2535)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SyncIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SyncIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="SyncIndicator">+state: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SyncIndicator">+lastSynced: DateTime?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SyncIndicator">+isDirty: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SyncIndicator">+animationDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SyncIndicator">+iconSize: double</text>
+						<g transform="translate(63273.25, 3716.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationService">+void showMessage()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationService">+void show()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NotificationService">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="28726.8" y="3365.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
+					<g data-name="BehaviorSubject">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BehaviorSubject">
+							<rect x="62863.0" y="3998.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
 						</g>
-						<g transform="translate(28726.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
+						<g transform="translate(62863, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BehaviorSubject">
+								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="BehaviorSubject">BehaviorSubject</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EmptyBody">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmptyBody">
-							<rect x="4404.5" y="2481.0" height="168.0" width="222.0" data-name="EmptyBody"></rect>
-							<path d="M4404.5 2512.0 L4626.5 2512.0" fill="none" data-name="EmptyBody"></path>
-							<path d="M4404.5 2618.0 L4626.5 2618.0" fill="none" data-name="EmptyBody"></path>
-						</g>
-						<g transform="translate(4404.5, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmptyBody">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="EmptyBody">EmptyBody</text>
-								
-							</g>
+					<g data-name="NotificationIntent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationIntent">
+							<rect x="4082.0" y="2488.5" height="153.0" width="288.0" data-name="NotificationIntent"></rect>
+							<path d="M4082.0 2519.5 L4370.0 2519.5" fill="none" data-name="NotificationIntent"></path>
+							<path d="M4082.0 2610.5 L4370.0 2610.5" fill="none" data-name="NotificationIntent"></path>
 						</g>
-						<g transform="translate(4404.5, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+icon: IconData?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmptyBody">+leading: Widget?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmptyBody">+leadingSpacing: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmptyBody">+title: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EmptyBody">+description: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EmptyBody">+button: Widget?</text>
+						<g transform="translate(4082, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="NotificationIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationIntent">
+								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationIntent">NotificationIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4404.5, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+Widget build()</text>
+						<g transform="translate(4082, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+message: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationIntent">+customContent: Widget?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationIntent">+icon: IconData?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NotificationIntent">+actions: List&lt;NotificationAction&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="NotificationIntent">+type: NotificationType</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="21383.0" y="3365.0" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(21383, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
+						<g transform="translate(4082, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+void register()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="Widget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="19048.0" y="3365.0" height="31.0" width="71.0" data-name="Widget"></rect>
+							<rect x="21264.5" y="3365.0" height="31.0" width="71.0" data-name="Widget"></rect>
 						</g>
-						<g transform="translate(19048, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
+						<g transform="translate(21264.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
 								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NullHelperDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NullHelperDecoration">
-							<rect x="29977.0" y="614.0" height="31.0" width="184.0" data-name="NullHelperDecoration"></rect>
-						</g>
-						<g transform="translate(29977, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NullHelperDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NullHelperDecoration">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="NullHelperDecoration">NullHelperDecoration</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InputDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InputDecoration">
-							<rect x="29998.0" y="121.0" height="31.0" width="142.0" data-name="InputDecoration"></rect>
+					<g data-name="IconData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
+							<rect x="27437.0" y="3365.0" height="31.0" width="87.0" data-name="IconData"></rect>
 						</g>
-						<g transform="translate(29998, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InputDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InputDecoration">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="InputDecoration">InputDecoration</text>
+						<g transform="translate(27437, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
+								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Search">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Search">
-							<rect x="4666.5" y="2511.5" height="107.0" width="373.0" data-name="Search"></rect>
-							<path d="M4666.5 2542.5 L5039.5 2542.5" fill="none" data-name="Search"></path>
+					<g data-name="NotificationType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationType">
+							<rect x="1322.0" y="3319.5" height="122.0" width="325.0" data-name="NotificationType"></rect>
+							<path d="M1322.0 3350.5 L1647.0 3350.5" fill="none" data-name="NotificationType"></path>
 						</g>
-						<g transform="translate(4666.5, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Search">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Search">
-								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="Search">Search</text>
+						<g transform="translate(1322, 3319.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationType">
+								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationType">NotificationType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4666.5, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Search">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Search">
-								<text x="0.0" y="13.5" stroke="none" data-name="Search">+onQueryChanged: dynamic Function(String)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Search">+searchController: SearchController?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Search">+hintText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Search">+initialText: String?</text>
+						<g transform="translate(1322, 3350.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationType">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationType">&lt;static&gt;+values: List&lt;NotificationType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationType">&lt;static&gt;+snackbar: NotificationType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NotificationType">&lt;static&gt;+alert: NotificationType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="NotificationType">&lt;static&gt;+custom: NotificationType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(String)">
-							<rect x="4597.8" y="3365.0" height="31.0" width="213.0" data-name="dynamic Function(String)"></rect>
+					<g data-name="dynamic Function()">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
+							<rect x="8413.0" y="3998.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
 						</g>
-						<g transform="translate(4597.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(String)">
-								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(String)">dynamic Function(String)</text>
+						<g transform="translate(8413, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
+								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SearchController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="25967.3" y="3349.5" height="62.0" width="258.0" data-name="SearchController"></rect>
-							<path d="M25967.3 3380.5 L26225.3 3380.5" fill="none" data-name="SearchController"></path>
+					<g data-name="IClipboardService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IClipboardService">
+							<rect x="28577.0" y="105.5" height="62.0" width="156.0" data-name="IClipboardService"></rect>
+							<path d="M28577.0 136.5 L28733.0 136.5" fill="none" data-name="IClipboardService"></path>
 						</g>
-						<g transform="translate(25967.25, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
+						<g transform="translate(28577, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IClipboardService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IClipboardService">
+								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="IClipboardService">IClipboardService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25967.25, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SearchController">
-								<text x="0.0" y="13.5" stroke="none" data-name="SearchController">+setText: void Function(String)</text>
+						<g transform="translate(28577, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IClipboardService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IClipboardService">
+								<text x="0.0" y="13.5" stroke="none" data-name="IClipboardService">+dynamic copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(String)">
-							<rect x="26006.3" y="3708.0" height="31.0" width="180.0" data-name="void Function(String)"></rect>
+					<g data-name="ClipboardService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ClipboardService">
+							<rect x="28579.5" y="598.5" height="62.0" width="151.0" data-name="ClipboardService"></rect>
+							<path d="M28579.5 629.5 L28730.5 629.5" fill="none" data-name="ClipboardService"></path>
 						</g>
-						<g transform="translate(26006.25, 3708)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(String)">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(String)">void Function(String)</text>
+						<g transform="translate(28579.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ClipboardService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ClipboardService">
+								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="ClipboardService">ClipboardService</text>
+								
+							</g>
+						</g>
+						<g transform="translate(28579.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ClipboardService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ClipboardService">
+								<text x="0.0" y="13.5" stroke="none" data-name="ClipboardService">+dynamic copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConstrainedWidthFlexible">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConstrainedWidthFlexible">
-							<rect x="5079.5" y="2473.5" height="183.0" width="287.0" data-name="ConstrainedWidthFlexible"></rect>
-							<path d="M5079.5 2504.5 L5366.5 2504.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
-							<path d="M5079.5 2610.5 L5366.5 2610.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
+					<g data-name="NotificationDispatcher">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDispatcher">
+							<rect x="5376.5" y="2504.0" height="122.0" width="325.0" data-name="NotificationDispatcher"></rect>
+							<path d="M5376.5 2535.0 L5701.5 2535.0" fill="none" data-name="NotificationDispatcher"></path>
 						</g>
-						<g transform="translate(5079.5, 2473.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConstrainedWidthFlexible">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConstrainedWidthFlexible">ConstrainedWidthFlexible</text>
+						<g transform="translate(5376.5, 2504)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDispatcher">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDispatcher">
+								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDispatcher">NotificationDispatcher</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5079.5, 2504.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+minWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">+maxWidth: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConstrainedWidthFlexible">+flex: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConstrainedWidthFlexible">+flexSum: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConstrainedWidthFlexible">+child: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConstrainedWidthFlexible">+outerConstraints: BoxConstraints</text>
+						<g transform="translate(5376.5, 2535)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDispatcher">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDispatcher">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDispatcher">+child: Widget?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationDispatcher">+snackbarInnerPadding: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationDispatcher">+snackbarWidth: double?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NotificationDispatcher">+snackbarBehavior: SnackBarBehavior</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="NotificationDispatcher">+snackbarDefaultDuration: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5079.5, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">-double _getWidth()</text>
+					</g>
+					<g data-name="SnackBarBehavior">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SnackBarBehavior">
+							<rect x="3786.0" y="3365.0" height="31.0" width="162.0" data-name="SnackBarBehavior"></rect>
+						</g>
+						<g transform="translate(3786, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackBarBehavior">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackBarBehavior">
+								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackBarBehavior">SnackBarBehavior</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoxConstraints">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoxConstraints">
-							<rect x="11750.5" y="3365.0" height="31.0" width="136.0" data-name="BoxConstraints"></rect>
+					<g data-name="Assets">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Assets">
+							<rect x="28773.0" y="105.5" height="62.0" width="218.0" data-name="Assets"></rect>
+							<path d="M28773.0 136.5 L28991.0 136.5" fill="none" data-name="Assets"></path>
 						</g>
-						<g transform="translate(11750.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxConstraints">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxConstraints">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxConstraints">BoxConstraints</text>
+						<g transform="translate(28773, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Assets">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Assets">
+								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="Assets">Assets</text>
+								
+							</g>
+						</g>
+						<g transform="translate(28773, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Assets">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Assets">
+								<text x="0.0" y="13.5" stroke="none" data-name="Assets">&lt;static&gt;+logoWide: String</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="AsyncValueWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValueWidget">
-							<rect x="5406.5" y="2466.0" height="198.0" width="384.0" data-name="AsyncValueWidget"></rect>
-							<path d="M5406.5 2497.0 L5790.5 2497.0" fill="none" data-name="AsyncValueWidget"></path>
-							<path d="M5406.5 2588.0 L5790.5 2588.0" fill="none" data-name="AsyncValueWidget"></path>
+							<rect x="5741.5" y="2466.0" height="198.0" width="384.0" data-name="AsyncValueWidget"></rect>
+							<path d="M5741.5 2497.0 L6125.5 2497.0" fill="none" data-name="AsyncValueWidget"></path>
+							<path d="M5741.5 2588.0 L6125.5 2588.0" fill="none" data-name="AsyncValueWidget"></path>
 						</g>
-						<g transform="translate(5406.5, 2466)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AsyncValueWidget">
+						<g transform="translate(5741.5, 2466)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AsyncValueWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValueWidget">
 								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValueWidget">AsyncValueWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5406.5, 2497)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
+						<g transform="translate(5741.5, 2497)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+value: AsyncValue&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">+data: Widget Function(T)</text>
@@ -7233,7 +7126,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(5406.5, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
+						<g transform="translate(5741.5, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">-Widget _buildDataOrEmptyWidget()</text>
@@ -7243,11 +7136,22 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="AsyncValue">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
+							<rect x="42757.3" y="3365.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
+						</g>
+						<g transform="translate(42757.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="Widget Function(T)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="19834.0" y="3365.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
+							<rect x="28762.0" y="3365.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
 						</g>
-						<g transform="translate(19834, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
+						<g transform="translate(28762, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
 								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
 								
@@ -7256,9 +7160,9 @@
 					</g>
 					<g data-name="Widget Function(Object, StackTrace?)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Object, StackTrace?)?">
-							<rect x="5455.5" y="3365.0" height="31.0" width="326.0" data-name="Widget Function(Object, StackTrace?)?"></rect>
+							<rect x="4043.3" y="3365.0" height="31.0" width="326.0" data-name="Widget Function(Object, StackTrace?)?"></rect>
 						</g>
-						<g transform="translate(5455.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Object, StackTrace?)?">
+						<g transform="translate(4043.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Object, StackTrace?)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Object, StackTrace?)?">
 								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Object, StackTrace?)?">Widget Function(Object, StackTrace?)?</text>
 								
@@ -7267,778 +7171,662 @@
 					</g>
 					<g data-name="Widget Function()?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function()?">
-							<rect x="5821.5" y="3365.0" height="31.0" width="166.0" data-name="Widget Function()?"></rect>
+							<rect x="4409.3" y="3365.0" height="31.0" width="166.0" data-name="Widget Function()?"></rect>
 						</g>
-						<g transform="translate(5821.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function()?">
+						<g transform="translate(4409.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function()?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function()?">
 								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function()?">Widget Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ActionPopUpMenuButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionPopUpMenuButton">
-							<rect x="5890.0" y="2436.0" height="258.0" width="324.0" data-name="ActionPopUpMenuButton"></rect>
-							<path d="M5890.0 2467.0 L6214.0 2467.0" fill="none" data-name="ActionPopUpMenuButton"></path>
-							<path d="M5890.0 2648.0 L6214.0 2648.0" fill="none" data-name="ActionPopUpMenuButton"></path>
-						</g>
-						<g transform="translate(5890, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionPopUpMenuButton">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionPopUpMenuButton">ActionPopUpMenuButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5890, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColor: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColorHover: Color?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconSize: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ActionPopUpMenuButton">+disableSplashEffect: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ActionPopUpMenuButton">+hideOnEmpty: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ActionPopUpMenuButton">+orientation: Axis</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ActionPopUpMenuButton">+elevation: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ActionPopUpMenuButton">+splashRadius: double?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ActionPopUpMenuButton">+enabled: bool</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ActionPopUpMenuButton">+position: PopupMenuPosition</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5890, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">-Widget _buildPopupMenu()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="26630.3" y="3365.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(26630.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Axis">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Axis">
-							<rect x="6027.5" y="3365.0" height="31.0" width="49.0" data-name="Axis"></rect>
-						</g>
-						<g transform="translate(6027.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Axis">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Axis">
-								<text x="16.5" y="13.5" stroke="none" text-anchor="middle" data-name="Axis">Axis</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PopupMenuPosition">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PopupMenuPosition">
-							<rect x="6116.5" y="3365.0" height="31.0" width="174.0" data-name="PopupMenuPosition"></rect>
-						</g>
-						<g transform="translate(6116.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PopupMenuPosition">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PopupMenuPosition">
-								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="PopupMenuPosition">PopupMenuPosition</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PrimaryButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PrimaryButton">
-							<rect x="6917.8" y="2451.5" height="227.0" width="333.0" data-name="PrimaryButton"></rect>
-							<path d="M6917.8 2482.5 L7250.8 2482.5" fill="none" data-name="PrimaryButton"></path>
-						</g>
-						<g transform="translate(6917.75, 2451.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PrimaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PrimaryButton">
-								<text x="158.5" y="13.5" stroke="none" text-anchor="middle" data-name="PrimaryButton">PrimaryButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6917.75, 2482.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PrimaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PrimaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="PrimaryButton">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PrimaryButton">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PrimaryButton">+isLoading: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PrimaryButton">+showLoadingEarliestAfterMs: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PrimaryButton">+onPressed: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PrimaryButton">+tooltip: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PrimaryButton">+tooltipDisabled: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PrimaryButton">+enabled: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PrimaryButton">+onPressedFuture: dynamic Function()?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="PrimaryButton">+innerPadding: EdgeInsets</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="PrimaryButton">+minimumSize: Size?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="PrimaryButton">+isDisabled: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="9895.5" y="3998.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(9895.5, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="11533.5" y="3365.0" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
+					<g data-name="FormControlLabel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlLabel">
+							<rect x="6234.5" y="2488.5" height="153.0" width="430.0" data-name="FormControlLabel"></rect>
+							<path d="M6234.5 2519.5 L6664.5 2519.5" fill="none" data-name="FormControlLabel"></path>
+							<path d="M6234.5 2610.5 L6664.5 2610.5" fill="none" data-name="FormControlLabel"></path>
 						</g>
-						<g transform="translate(11533.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
-								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
+						<g transform="translate(6234.5, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlLabel">
+								<text x="207.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlLabel">FormControlLabel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="EdgeInsets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="15898.0" y="3365.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
-						</g>
-						<g transform="translate(15898, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
+						<g transform="translate(6234.5, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+formControl: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlLabel">+text: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlLabel">+isClickable: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlLabel">+textStyle: TextStyle?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormControlLabel">+onClick: void Function(AbstractControl&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Size">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Size">
-							<rect x="7214.5" y="3365.0" height="31.0" width="50.0" data-name="Size"></rect>
-						</g>
-						<g transform="translate(7214.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Size">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Size">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Size">Size</text>
+						<g transform="translate(6234.5, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Hyperlink">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Hyperlink">
-							<rect x="7652.3" y="2459.0" height="212.0" width="222.0" data-name="Hyperlink"></rect>
-							<path d="M7652.3 2490.0 L7874.3 2490.0" fill="none" data-name="Hyperlink"></path>
-						</g>
-						<g transform="translate(7652.25, 2459)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Hyperlink">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Hyperlink">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="Hyperlink">Hyperlink</text>
-								
-							</g>
+					<g data-name="AbstractControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
+							<rect x="25722.8" y="3365.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
 						</g>
-						<g transform="translate(7652.25, 2490)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Hyperlink">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Hyperlink">
-								<text x="0.0" y="13.5" stroke="none" data-name="Hyperlink">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Hyperlink">+url: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Hyperlink">+onClick: void Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Hyperlink">+linkColor: Color</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Hyperlink">+hoverColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Hyperlink">+visitedColor: Color?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Hyperlink">+style: TextStyle?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Hyperlink">+hoverStyle: TextStyle?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Hyperlink">+visitedStyle: TextStyle?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Hyperlink">+icon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Hyperlink">+iconSize: double?</text>
+						<g transform="translate(25722.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
+								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="TextStyle">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
-							<rect x="10282.8" y="3365.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
+							<rect x="11251.5" y="3365.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
 						</g>
-						<g transform="translate(10282.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
+						<g transform="translate(11251.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
 								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DismissButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DismissButton">
-							<rect x="4642.3" y="3669.5" height="108.0" width="249.0" data-name="DismissButton"></rect>
-							<path d="M4642.3 3700.5 L4891.3 3700.5" fill="none" data-name="DismissButton"></path>
-							<path d="M4642.3 3746.5 L4891.3 3746.5" fill="none" data-name="DismissButton"></path>
+					<g data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+							<rect x="4615.3" y="3365.0" height="31.0" width="352.0" data-name="void Function(AbstractControl&lt;dynamic&gt;)?"></rect>
 						</g>
-						<g transform="translate(4642.25, 3669.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DismissButton">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="DismissButton">DismissButton</text>
+						<g transform="translate(4615.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">void Function(AbstractControl&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4642.25, 3700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+onPressed: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DismissButton">+text: String?</text>
+					</g>
+					<g data-name="ActionPopUpMenuButton">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ActionPopUpMenuButton">
+							<rect x="6828.3" y="2436.0" height="258.0" width="324.0" data-name="ActionPopUpMenuButton"></rect>
+							<path d="M6828.3 2467.0 L7152.3 2467.0" fill="none" data-name="ActionPopUpMenuButton"></path>
+							<path d="M6828.3 2648.0 L7152.3 2648.0" fill="none" data-name="ActionPopUpMenuButton"></path>
+						</g>
+						<g transform="translate(6828.25, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionPopUpMenuButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionPopUpMenuButton">
+								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionPopUpMenuButton">ActionPopUpMenuButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4642.25, 3746.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+Widget build()</text>
+						<g transform="translate(6828.25, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColor: Color?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColorHover: Color?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconSize: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ActionPopUpMenuButton">+disableSplashEffect: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ActionPopUpMenuButton">+hideOnEmpty: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ActionPopUpMenuButton">+orientation: Axis</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ActionPopUpMenuButton">+elevation: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ActionPopUpMenuButton">+splashRadius: double?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ActionPopUpMenuButton">+enabled: bool</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ActionPopUpMenuButton">+position: PopupMenuPosition</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormTableRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRow">
-							<rect x="8166.8" y="2489.0" height="152.0" width="379.0" data-name="FormTableRow"></rect>
-							<path d="M8166.8 2520.0 L8545.8 2520.0" fill="none" data-name="FormTableRow"></path>
-						</g>
-						<g transform="translate(8166.75, 2489)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRow">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRow">FormTableRow</text>
+						<g transform="translate(6828.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">-Widget _buildPopupMenu()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8166.75, 2520)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRow">+label: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRow">+labelBuilder: Widget Function(BuildContext)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRow">+labelStyle: TextStyle?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRow">+labelHelpText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormTableRow">+input: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormTableRow">+control: AbstractControl&lt;dynamic&gt;?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormTableRow">+layout: FormTableRowLayout?</text>
+					</g>
+					<g data-name="Color">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
+							<rect x="21675.0" y="3365.0" height="31.0" width="58.0" data-name="Color"></rect>
+						</g>
+						<g transform="translate(21675, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
+								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
-							<rect x="7764.5" y="3365.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
+					<g data-name="Axis">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Axis">
+							<rect x="5731.5" y="3365.0" height="31.0" width="49.0" data-name="Axis"></rect>
 						</g>
-						<g transform="translate(7764.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
+						<g transform="translate(5731.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Axis">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Axis">
+								<text x="16.5" y="13.5" stroke="none" text-anchor="middle" data-name="Axis">Axis</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="25103.3" y="3365.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+					<g data-name="PopupMenuPosition">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PopupMenuPosition">
+							<rect x="5820.5" y="3365.0" height="31.0" width="174.0" data-name="PopupMenuPosition"></rect>
 						</g>
-						<g transform="translate(25103.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
+						<g transform="translate(5820.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PopupMenuPosition">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PopupMenuPosition">
+								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="PopupMenuPosition">PopupMenuPosition</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormTableRowLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRowLayout">
-							<rect x="6754.5" y="3327.0" height="107.0" width="370.0" data-name="FormTableRowLayout"></rect>
-							<path d="M6754.5 3358.0 L7124.5 3358.0" fill="none" data-name="FormTableRowLayout"></path>
+					<g data-name="Search">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Search">
+							<rect x="7210.5" y="2511.5" height="107.0" width="373.0" data-name="Search"></rect>
+							<path d="M7210.5 2542.5 L7583.5 2542.5" fill="none" data-name="Search"></path>
 						</g>
-						<g transform="translate(6754.5, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRowLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRowLayout">
-								<text x="177.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRowLayout">FormTableRowLayout</text>
+						<g transform="translate(7210.5, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Search">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Search">
+								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="Search">Search</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6754.5, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRowLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRowLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRowLayout">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+values: List&lt;FormTableRowLayout&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+vertical: FormTableRowLayout</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+horizontal: FormTableRowLayout</text>
+						<g transform="translate(7210.5, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Search">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Search">
+								<text x="0.0" y="13.5" stroke="none" data-name="Search">+onQueryChanged: dynamic Function(String)</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Search">+searchController: SearchController?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Search">+hintText: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Search">+initialText: String?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormTableLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableLayout">
-							<rect x="8585.8" y="2488.5" height="153.0" width="379.0" data-name="FormTableLayout"></rect>
-							<path d="M8585.8 2519.5 L8964.8 2519.5" fill="none" data-name="FormTableLayout"></path>
-							<path d="M8585.8 2610.5 L8964.8 2610.5" fill="none" data-name="FormTableLayout"></path>
+					<g data-name="dynamic Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(String)">
+							<rect x="6034.5" y="3365.0" height="31.0" width="213.0" data-name="dynamic Function(String)"></rect>
 						</g>
-						<g transform="translate(8585.75, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableLayout">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableLayout">FormTableLayout</text>
+						<g transform="translate(6034.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(String)">
+								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(String)">dynamic Function(String)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8585.75, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+rows: List&lt;FormTableRow&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableLayout">+columnWidths: Map&lt;int, TableColumnWidth&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableLayout">+rowDivider: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableLayout">+rowLayout: FormTableRowLayout?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormTableLayout">+rowLabelStyle: TextStyle?</text>
+					</g>
+					<g data-name="SearchController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
+							<rect x="45104.3" y="3349.5" height="62.0" width="258.0" data-name="SearchController"></rect>
+							<path d="M45104.3 3380.5 L45362.3 3380.5" fill="none" data-name="SearchController"></path>
+						</g>
+						<g transform="translate(45104.25, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
+								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8585.75, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+Widget build()</text>
+						<g transform="translate(45104.25, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SearchController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SearchController">
+								<text x="0.0" y="13.5" stroke="none" data-name="SearchController">+setText: void Function(String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormSectionHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSectionHeader">
-							<rect x="9004.8" y="2488.5" height="153.0" width="220.0" data-name="FormSectionHeader"></rect>
-							<path d="M9004.8 2519.5 L9224.8 2519.5" fill="none" data-name="FormSectionHeader"></path>
-							<path d="M9004.8 2610.5 L9224.8 2610.5" fill="none" data-name="FormSectionHeader"></path>
+					<g data-name="void Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(String)">
+							<rect x="45143.3" y="3708.0" height="31.0" width="180.0" data-name="void Function(String)"></rect>
 						</g>
-						<g transform="translate(9004.75, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSectionHeader">
-								<text x="102.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormSectionHeader">FormSectionHeader</text>
+						<g transform="translate(45143.25, 3708)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(String)">
+								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(String)">void Function(String)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9004.75, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormSectionHeader">+titleTextStyle: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormSectionHeader">+helpText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormSectionHeader">+divider: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormSectionHeader">+helpTextDisabled: bool</text>
+					</g>
+					<g data-name="FormScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormScaffold">
+							<rect x="7623.5" y="2496.5" height="137.0" width="212.0" data-name="FormScaffold"></rect>
+							<path d="M7623.5 2527.5 L7835.5 2527.5" fill="none" data-name="FormScaffold"></path>
+						</g>
+						<g transform="translate(7623.5, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormScaffold">
+								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormScaffold">FormScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9004.75, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+Widget build()</text>
+						<g transform="translate(7623.5, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormScaffold">+formViewModel: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormScaffold">+actions: List&lt;Widget&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormScaffold">+body: Widget</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormScaffold">+drawer: Widget?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormScaffold">+actionsSpacing: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormScaffold">+actionsPadding: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormLabel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormLabel">
-							<rect x="9452.0" y="2496.0" height="138.0" width="266.0" data-name="FormLabel"></rect>
-							<path d="M9452.0 2527.0 L9718.0 2527.0" fill="none" data-name="FormLabel"></path>
-							<path d="M9452.0 2603.0 L9718.0 2603.0" fill="none" data-name="FormLabel"></path>
+					<g data-name="ConstrainedWidthFlexible">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConstrainedWidthFlexible">
+							<rect x="7875.5" y="2473.5" height="183.0" width="287.0" data-name="ConstrainedWidthFlexible"></rect>
+							<path d="M7875.5 2504.5 L8162.5 2504.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
+							<path d="M7875.5 2610.5 L8162.5 2610.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
 						</g>
-						<g transform="translate(9452, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormLabel">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormLabel">FormLabel</text>
+						<g transform="translate(7875.5, 2473.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConstrainedWidthFlexible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConstrainedWidthFlexible">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConstrainedWidthFlexible">ConstrainedWidthFlexible</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9452, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+labelText: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormLabel">+helpText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormLabel">+labelTextStyle: TextStyle?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormLabel">+layout: FormTableRowLayout?</text>
+						<g transform="translate(7875.5, 2504.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+minWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">+maxWidth: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConstrainedWidthFlexible">+flex: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConstrainedWidthFlexible">+flexSum: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConstrainedWidthFlexible">+child: Widget</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ConstrainedWidthFlexible">+outerConstraints: BoxConstraints</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9452, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+Widget build()</text>
+						<g transform="translate(7875.5, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">-double _getWidth()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ActionMenuType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuType">
-							<rect x="7344.5" y="3327.0" height="107.0" width="330.0" data-name="ActionMenuType"></rect>
-							<path d="M7344.5 3358.0 L7674.5 3358.0" fill="none" data-name="ActionMenuType"></path>
-						</g>
-						<g transform="translate(7344.5, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuType">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuType">ActionMenuType</text>
-								
-							</g>
+					<g data-name="BoxConstraints">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoxConstraints">
+							<rect x="12912.0" y="3365.0" height="31.0" width="136.0" data-name="BoxConstraints"></rect>
 						</g>
-						<g transform="translate(7344.5, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+values: List&lt;ActionMenuType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+inline: ActionMenuType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+popup: ActionMenuType</text>
+						<g transform="translate(12912, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxConstraints">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxConstraints">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxConstraints">BoxConstraints</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReactiveCustomColorPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveCustomColorPicker">
-							<rect x="30201.0" y="614.0" height="31.0" width="236.0" data-name="ReactiveCustomColorPicker"></rect>
+					<g data-name="PrimaryButton">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PrimaryButton">
+							<rect x="8202.5" y="2451.5" height="227.0" width="333.0" data-name="PrimaryButton"></rect>
+							<path d="M8202.5 2482.5 L8535.5 2482.5" fill="none" data-name="PrimaryButton"></path>
 						</g>
-						<g transform="translate(30201, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveCustomColorPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveCustomColorPicker">
-								<text x="110.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveCustomColorPicker">ReactiveCustomColorPicker</text>
+						<g transform="translate(8202.5, 2451.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PrimaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PrimaryButton">
+								<text x="158.5" y="13.5" stroke="none" text-anchor="middle" data-name="PrimaryButton">PrimaryButton</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReactiveFormField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFormField">
-							<rect x="30237.5" y="121.0" height="31.0" width="163.0" data-name="ReactiveFormField"></rect>
-						</g>
-						<g transform="translate(30237.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFormField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFormField">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFormField">ReactiveFormField</text>
+						<g transform="translate(8202.5, 2482.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PrimaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PrimaryButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="PrimaryButton">+text: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PrimaryButton">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PrimaryButton">+isLoading: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PrimaryButton">+showLoadingEarliestAfterMs: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PrimaryButton">+onPressed: void Function()?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PrimaryButton">+tooltip: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PrimaryButton">+tooltipDisabled: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PrimaryButton">+enabled: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="PrimaryButton">+onPressedFuture: dynamic Function()?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="PrimaryButton">+innerPadding: EdgeInsets</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="PrimaryButton">+minimumSize: Size?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="PrimaryButton">+isDisabled: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NavbarTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="37063.8" y="1644.0" height="107.0" width="196.0" data-name="NavbarTab"></rect>
-							<path d="M37063.8 1675.0 L37259.8 1675.0" fill="none" data-name="NavbarTab"></path>
+					<g data-name="void Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
+							<rect x="17849.5" y="3998.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
 						</g>
-						<g transform="translate(37063.75, 1644)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
+						<g transform="translate(17849.5, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
+								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37063.75, 1675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NavbarTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="NavbarTab">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NavbarTab">+intent: RoutingIntent?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NavbarTab">+index: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NavbarTab">+enabled: bool</text>
+					</g>
+					<g data-name="dynamic Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
+							<rect x="11770.0" y="3365.0" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
+						</g>
+						<g transform="translate(11770, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
+								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TabbedNavbar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TabbedNavbar">
-							<rect x="9758.0" y="2436.5" height="257.0" width="308.0" data-name="TabbedNavbar"></rect>
-							<path d="M9758.0 2467.5 L10066.0 2467.5" fill="none" data-name="TabbedNavbar"></path>
+					<g data-name="EdgeInsets">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
+							<rect x="13551.0" y="3365.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
 						</g>
-						<g transform="translate(9758, 2436.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabbedNavbar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabbedNavbar">
-								<text x="146.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabbedNavbar">TabbedNavbar</text>
+						<g transform="translate(13551, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9758, 2467.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TabbedNavbar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TabbedNavbar">
-								<text x="0.0" y="13.5" stroke="none" data-name="TabbedNavbar">+tabs: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TabbedNavbar">+selectedTab: T?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TabbedNavbar">+indicator: BoxDecoration?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TabbedNavbar">+height: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TabbedNavbar">+disabledBackgroundColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TabbedNavbar">+disabledTooltipText: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TabbedNavbar">+onSelect: void Function(int, T)?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TabbedNavbar">+labelPadding: EdgeInsets?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="TabbedNavbar">+labelSpacing: double?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="TabbedNavbar">+indicatorSize: TabBarIndicatorSize?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="TabbedNavbar">+isScrollable: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="TabbedNavbar">+backgroundColor: Color?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="TabbedNavbar">+labelColorHover: Color?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="TabbedNavbar">+unselectedLabelColorHover: Color?</text>
+					</g>
+					<g data-name="Size">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Size">
+							<rect x="8443.0" y="3365.0" height="31.0" width="50.0" data-name="Size"></rect>
+						</g>
+						<g transform="translate(8443, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Size">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Size">
+								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Size">Size</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoxDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoxDecoration">
-							<rect x="8739.3" y="3365.0" height="31.0" width="132.0" data-name="BoxDecoration"></rect>
+					<g data-name="FormTableRow">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRow">
+							<rect x="8575.5" y="2489.0" height="152.0" width="379.0" data-name="FormTableRow"></rect>
+							<path d="M8575.5 2520.0 L8954.5 2520.0" fill="none" data-name="FormTableRow"></path>
 						</g>
-						<g transform="translate(8739.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxDecoration">
-								<text x="58.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxDecoration">BoxDecoration</text>
+						<g transform="translate(8575.5, 2489)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRow">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRow">
+								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRow">FormTableRow</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(int, T)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(int, T)?">
-							<rect x="8956.0" y="3365.0" height="31.0" width="183.0" data-name="void Function(int, T)?"></rect>
-						</g>
-						<g transform="translate(8956, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(int, T)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(int, T)?">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(int, T)?">void Function(int, T)?</text>
+						<g transform="translate(8575.5, 2520)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRow">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRow">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRow">+label: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRow">+labelBuilder: Widget Function(BuildContext)?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRow">+labelStyle: TextStyle?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRow">+labelHelpText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormTableRow">+input: Widget</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormTableRow">+control: AbstractControl&lt;dynamic&gt;?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormTableRow">+layout: FormTableRowLayout?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TabBarIndicatorSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TabBarIndicatorSize">
-							<rect x="9622.0" y="3365.0" height="31.0" width="176.0" data-name="TabBarIndicatorSize"></rect>
+					<g data-name="Widget Function(BuildContext)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
+							<rect x="8533.0" y="3365.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
 						</g>
-						<g transform="translate(9622, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabBarIndicatorSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabBarIndicatorSize">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabBarIndicatorSize">TabBarIndicatorSize</text>
+						<g transform="translate(8533, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
+								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Collapsible">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Collapsible">
-							<rect x="30596.0" y="83.0" height="107.0" width="441.0" data-name="Collapsible"></rect>
-							<path d="M30596.0 114.0 L31037.0 114.0" fill="none" data-name="Collapsible"></path>
+					<g data-name="FormTableRowLayout">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRowLayout">
+							<rect x="6509.3" y="3327.0" height="107.0" width="370.0" data-name="FormTableRowLayout"></rect>
+							<path d="M6509.3 3358.0 L6879.3 3358.0" fill="none" data-name="FormTableRowLayout"></path>
 						</g>
-						<g transform="translate(30596, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Collapsible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Collapsible">
-								<text x="212.5" y="13.5" stroke="none" text-anchor="middle" data-name="Collapsible">Collapsible</text>
+						<g transform="translate(6509.25, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRowLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRowLayout">
+								<text x="177.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRowLayout">FormTableRowLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30596, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Collapsible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Collapsible">
-								<text x="0.0" y="13.5" stroke="none" data-name="Collapsible">+contentBuilder: Widget Function(BuildContext, bool)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Collapsible">+headerBuilder: Widget Function(BuildContext, bool)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Collapsible">+title: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Collapsible">+isCollapsed: bool</text>
+						<g transform="translate(6509.25, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRowLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRowLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRowLayout">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+values: List&lt;FormTableRowLayout&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+vertical: FormTableRowLayout</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+horizontal: FormTableRowLayout</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext, bool)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)">
-							<rect x="30494.0" y="614.0" height="31.0" width="300.0" data-name="Widget Function(BuildContext, bool)"></rect>
+					<g data-name="FormTableLayout">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableLayout">
+							<rect x="9383.5" y="2488.5" height="153.0" width="379.0" data-name="FormTableLayout"></rect>
+							<path d="M9383.5 2519.5 L9762.5 2519.5" fill="none" data-name="FormTableLayout"></path>
+							<path d="M9383.5 2610.5 L9762.5 2610.5" fill="none" data-name="FormTableLayout"></path>
 						</g>
-						<g transform="translate(30494, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)">
-								<text x="142.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)">Widget Function(BuildContext, bool)</text>
+						<g transform="translate(9383.5, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableLayout">
+								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableLayout">FormTableLayout</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)?">
-							<rect x="30913.0" y="614.0" height="31.0" width="310.0" data-name="Widget Function(BuildContext, bool)?"></rect>
+						<g transform="translate(9383.5, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+rows: List&lt;FormTableRow&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormTableLayout">+columnWidths: Map&lt;int, TableColumnWidth&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormTableLayout">+rowDivider: Widget?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormTableLayout">+rowLayout: FormTableRowLayout?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormTableLayout">+rowLabelStyle: TextStyle?</text>
+								
+							</g>
 						</g>
-						<g transform="translate(30913, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)?">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)?">Widget Function(BuildContext, bool)?</text>
+						<g transform="translate(9383.5, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyULogo">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyULogo">
-							<rect x="4931.3" y="3677.0" height="93.0" width="214.0" data-name="StudyULogo"></rect>
-							<path d="M4931.3 3708.0 L5145.3 3708.0" fill="none" data-name="StudyULogo"></path>
-							<path d="M4931.3 3739.0 L5145.3 3739.0" fill="none" data-name="StudyULogo"></path>
+					<g data-name="FormSectionHeader">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormSectionHeader">
+							<rect x="9802.5" y="2488.5" height="153.0" width="220.0" data-name="FormSectionHeader"></rect>
+							<path d="M9802.5 2519.5 L10022.5 2519.5" fill="none" data-name="FormSectionHeader"></path>
+							<path d="M9802.5 2610.5 L10022.5 2610.5" fill="none" data-name="FormSectionHeader"></path>
 						</g>
-						<g transform="translate(4931.25, 3677)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyULogo">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyULogo">StudyULogo</text>
+						<g transform="translate(9802.5, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSectionHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSectionHeader">
+								<text x="102.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormSectionHeader">FormSectionHeader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4931.25, 3708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+onTap: void Function()?</text>
+						<g transform="translate(9802.5, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormSectionHeader">+titleTextStyle: TextStyle?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormSectionHeader">+helpText: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormSectionHeader">+divider: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormSectionHeader">+helpTextDisabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4931.25, 3739)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+Widget build()</text>
+						<g transform="translate(9802.5, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormSideSheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSideSheetTab">
-							<rect x="38917.3" y="2534.0" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
-							<path d="M38917.3 2565.0 L39230.3 2565.0" fill="none" data-name="FormSideSheetTab"></path>
-						</g>
-						<g transform="translate(38917.25, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSideSheetTab">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormSideSheetTab">FormSideSheetTab</text>
-								
-							</g>
+					<g data-name="FormLabel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormLabel">
+							<rect x="10231.0" y="2496.0" height="138.0" width="266.0" data-name="FormLabel"></rect>
+							<path d="M10231.0 2527.0 L10497.0 2527.0" fill="none" data-name="FormLabel"></path>
+							<path d="M10231.0 2603.0 L10497.0 2603.0" fill="none" data-name="FormLabel"></path>
 						</g>
-						<g transform="translate(38917.25, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSideSheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSideSheetTab">+formViewBuilder: Widget Function(T)</text>
+						<g transform="translate(10231, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormLabel">
+								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormLabel">FormLabel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SidesheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SidesheetTab">
-							<rect x="39270.3" y="2534.0" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
-							<path d="M39270.3 2565.0 L39600.3 2565.0" fill="none" data-name="SidesheetTab"></path>
-						</g>
-						<g transform="translate(39270.25, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SidesheetTab">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="SidesheetTab">SidesheetTab</text>
+						<g transform="translate(10231, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+labelText: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormLabel">+helpText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormLabel">+labelTextStyle: TextStyle?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormLabel">+layout: FormTableRowLayout?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39270.25, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SidesheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="SidesheetTab">+builder: Widget Function(BuildContext)</text>
+						<g transform="translate(10231, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="49267.0" y="3365.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
+					<g data-name="DismissButton">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DismissButton">
+							<rect x="15178.3" y="3669.5" height="108.0" width="249.0" data-name="DismissButton"></rect>
+							<path d="M15178.3 3700.5 L15427.3 3700.5" fill="none" data-name="DismissButton"></path>
+							<path d="M15178.3 3746.5 L15427.3 3746.5" fill="none" data-name="DismissButton"></path>
 						</g>
-						<g transform="translate(49267, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
+						<g transform="translate(15178.25, 3669.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DismissButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DismissButton">
+								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="DismissButton">DismissButton</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Sidesheet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Sidesheet">
-							<rect x="10954.5" y="2459.0" height="212.0" width="341.0" data-name="Sidesheet"></rect>
-							<path d="M10954.5 2490.0 L11295.5 2490.0" fill="none" data-name="Sidesheet"></path>
-						</g>
-						<g transform="translate(10954.5, 2459)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Sidesheet">
-								<text x="162.5" y="13.5" stroke="none" text-anchor="middle" data-name="Sidesheet">Sidesheet</text>
+						<g transform="translate(15178.25, 3700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+onPressed: void Function()?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DismissButton">+text: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10954.5, 2490)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Sidesheet">
-								<text x="0.0" y="13.5" stroke="none" data-name="Sidesheet">&lt;static&gt;+kDefaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Sidesheet">+titleText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Sidesheet">+body: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Sidesheet">+tabs: List&lt;SidesheetTab&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Sidesheet">+actionButtons: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Sidesheet">+width: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Sidesheet">+withCloseButton: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Sidesheet">+ignoreAppBar: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Sidesheet">+collapseSingleTab: bool</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Sidesheet">+bodyPadding: EdgeInsets?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Sidesheet">+wrapContent: Widget Function(Widget)?</text>
+						<g transform="translate(15178.25, 3746.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(Widget)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Widget)?">
-							<rect x="16941.3" y="3365.0" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
+					<g data-name="Badge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Badge">
+							<rect x="10537.0" y="2436.0" height="258.0" width="263.0" data-name="Badge"></rect>
+							<path d="M10537.0 2467.0 L10800.0 2467.0" fill="none" data-name="Badge"></path>
+							<path d="M10537.0 2618.0 L10800.0 2618.0" fill="none" data-name="Badge"></path>
 						</g>
-						<g transform="translate(16941.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Widget)?">
-								<text x="102.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Widget)?">Widget Function(Widget)?</text>
+						<g transform="translate(10537, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Badge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Badge">
+								<text x="123.5" y="13.5" stroke="none" text-anchor="middle" data-name="Badge">Badge</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="MouseEventsRegion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MouseEventsRegion">
-							<rect x="5515.5" y="3640.0" height="167.0" width="379.0" data-name="MouseEventsRegion"></rect>
-							<path d="M5515.5 3671.0 L5894.5 3671.0" fill="none" data-name="MouseEventsRegion"></path>
-						</g>
-						<g transform="translate(5515.5, 3640)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MouseEventsRegion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MouseEventsRegion">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="MouseEventsRegion">MouseEventsRegion</text>
+						<g transform="translate(10537, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
+								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+icon: IconData?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Badge">+color: Color?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Badge">+borderRadius: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Badge">+label: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Badge">+type: BadgeType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Badge">+padding: EdgeInsets</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Badge">+iconSize: double?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Badge">+labelStyle: TextStyle?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="Badge">+center: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5515.5, 3671)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MouseEventsRegion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MouseEventsRegion">
-								<text x="0.0" y="13.5" stroke="none" data-name="MouseEventsRegion">+onTap: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MouseEventsRegion">+onHover: void Function(PointerHoverEvent)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MouseEventsRegion">+onEnter: void Function(PointerEnterEvent)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MouseEventsRegion">+onExit: void Function(PointerExitEvent)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MouseEventsRegion">+autoselectCursor: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MouseEventsRegion">+cursor: SystemMouseCursor</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MouseEventsRegion">&lt;static&gt;+defaultCursor: SystemMouseCursor</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MouseEventsRegion">+autoCursor: SystemMouseCursor</text>
+						<g transform="translate(10537, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
+								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Badge">-Color? _getBackgroundColor()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Badge">-Color _getBorderColor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Badge">-Color? _getLabelColor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(PointerHoverEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerHoverEvent)?">
-							<rect x="2986.8" y="3998.5" height="31.0" width="292.0" data-name="void Function(PointerHoverEvent)?"></rect>
+					<g data-name="BadgeType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
+							<rect x="26003.8" y="3312.0" height="137.0" width="288.0" data-name="BadgeType"></rect>
+							<path d="M26003.8 3343.0 L26291.8 3343.0" fill="none" data-name="BadgeType"></path>
 						</g>
-						<g transform="translate(2986.75, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerHoverEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerHoverEvent)?">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerHoverEvent)?">void Function(PointerHoverEvent)?</text>
+						<g transform="translate(26003.75, 3312)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
+								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(PointerEnterEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerEnterEvent)?">
-							<rect x="3318.8" y="3998.5" height="31.0" width="287.0" data-name="void Function(PointerEnterEvent)?"></rect>
-						</g>
-						<g transform="translate(3318.75, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerEnterEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerEnterEvent)?">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerEnterEvent)?">void Function(PointerEnterEvent)?</text>
+						<g transform="translate(26003.75, 3343)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BadgeType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BadgeType">
+								<text x="0.0" y="13.5" stroke="none" data-name="BadgeType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BadgeType">&lt;static&gt;+values: List&lt;BadgeType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BadgeType">&lt;static&gt;+filled: BadgeType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlined: BadgeType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlineFill: BadgeType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="BadgeType">&lt;static&gt;+plain: BadgeType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(PointerExitEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerExitEvent)?">
-							<rect x="3645.8" y="3998.5" height="31.0" width="274.0" data-name="void Function(PointerExitEvent)?"></rect>
+					<g data-name="StandardDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StandardDialog">
+							<rect x="10840.0" y="2428.5" height="273.0" width="247.0" data-name="StandardDialog"></rect>
+							<path d="M10840.0 2459.5 L11087.0 2459.5" fill="none" data-name="StandardDialog"></path>
+							<path d="M10840.0 2670.5 L11087.0 2670.5" fill="none" data-name="StandardDialog"></path>
 						</g>
-						<g transform="translate(3645.75, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerExitEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerExitEvent)?">
-								<text x="129.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerExitEvent)?">void Function(PointerExitEvent)?</text>
+						<g transform="translate(10840, 2428.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardDialog">
+								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardDialog">StandardDialog</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SystemMouseCursor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SystemMouseCursor">
-							<rect x="3959.8" y="3998.5" height="31.0" width="180.0" data-name="SystemMouseCursor"></rect>
+						<g transform="translate(10840, 2459.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+title: Widget?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StandardDialog">+titleText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StandardDialog">+body: Widget</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StandardDialog">+actionButtons: List&lt;Widget&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StandardDialog">+backgroundColor: Color?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StandardDialog">+borderRadius: double?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StandardDialog">+width: double?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StandardDialog">+height: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StandardDialog">+minWidth: double</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StandardDialog">+minHeight: double</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StandardDialog">+maxWidth: double?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StandardDialog">+maxHeight: double?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StandardDialog">+padding: EdgeInsets</text>
+								
+							</g>
 						</g>
-						<g transform="translate(3959.75, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SystemMouseCursor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SystemMouseCursor">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="SystemMouseCursor">SystemMouseCursor</text>
+						<g transform="translate(10840, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControlLabel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlLabel">
-							<rect x="11335.5" y="2488.5" height="153.0" width="430.0" data-name="FormControlLabel"></rect>
-							<path d="M11335.5 2519.5 L11765.5 2519.5" fill="none" data-name="FormControlLabel"></path>
-							<path d="M11335.5 2610.5 L11765.5 2610.5" fill="none" data-name="FormControlLabel"></path>
+					<g data-name="ISyncIndicatorViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ISyncIndicatorViewModel">
+							<rect x="29031.0" y="98.0" height="77.0" width="214.0" data-name="ISyncIndicatorViewModel"></rect>
+							<path d="M29031.0 129.0 L29245.0 129.0" fill="none" data-name="ISyncIndicatorViewModel"></path>
 						</g>
-						<g transform="translate(11335.5, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlLabel">
-								<text x="207.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlLabel">FormControlLabel</text>
+						<g transform="translate(29031, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ISyncIndicatorViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ISyncIndicatorViewModel">
+								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="ISyncIndicatorViewModel">ISyncIndicatorViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11335.5, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+formControl: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlLabel">+text: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlLabel">+isClickable: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlLabel">+textStyle: TextStyle?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormControlLabel">+onClick: void Function(AbstractControl&lt;dynamic&gt;)?</text>
+						<g transform="translate(29031, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ISyncIndicatorViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ISyncIndicatorViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ISyncIndicatorViewModel">+isDirty: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ISyncIndicatorViewModel">+lastSynced: DateTime?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11335.5, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+Widget build()</text>
+					</g>
+					<g data-name="SyncIndicator">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SyncIndicator">
+							<rect x="11127.0" y="2504.0" height="122.0" width="208.0" data-name="SyncIndicator"></rect>
+							<path d="M11127.0 2535.0 L11335.0 2535.0" fill="none" data-name="SyncIndicator"></path>
+						</g>
+						<g transform="translate(11127, 2504)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SyncIndicator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SyncIndicator">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="SyncIndicator">SyncIndicator</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<rect x="12389.5" y="3365.0" height="31.0" width="352.0" data-name="void Function(AbstractControl&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(12389.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">void Function(AbstractControl&lt;dynamic&gt;)?</text>
+						<g transform="translate(11127, 2535)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SyncIndicator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SyncIndicator">
+								<text x="0.0" y="13.5" stroke="none" data-name="SyncIndicator">+state: AsyncValue&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SyncIndicator">+lastSynced: DateTime?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SyncIndicator">+isDirty: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SyncIndicator">+animationDuration: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SyncIndicator">+iconSize: double</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="IWithBanner">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="3118.5" y="1181.5" height="62.0" width="164.0" data-name="IWithBanner"></rect>
-							<path d="M3118.5 1212.5 L3282.5 1212.5" fill="none" data-name="IWithBanner"></path>
+							<rect x="13445.0" y="1181.5" height="62.0" width="164.0" data-name="IWithBanner"></rect>
+							<path d="M13445.0 1212.5 L13609.0 1212.5" fill="none" data-name="IWithBanner"></path>
 						</g>
-						<g transform="translate(3118.5, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
+						<g transform="translate(13445, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
 								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3118.5, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IWithBanner">
+						<g transform="translate(13445, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IWithBanner">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IWithBanner">
 								<text x="0.0" y="13.5" stroke="none" data-name="IWithBanner">+Widget? banner()</text>
 								
@@ -8047,16 +7835,16 @@
 					</g>
 					<g data-name="BannerBox">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BannerBox">
-							<rect x="11805.5" y="2474.0" height="182.0" width="298.0" data-name="BannerBox"></rect>
-							<path d="M11805.5 2505.0 L12103.5 2505.0" fill="none" data-name="BannerBox"></path>
+							<rect x="11375.0" y="2474.0" height="182.0" width="298.0" data-name="BannerBox"></rect>
+							<path d="M11375.0 2505.0 L11673.0 2505.0" fill="none" data-name="BannerBox"></path>
 						</g>
-						<g transform="translate(11805.5, 2474)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerBox">
+						<g transform="translate(11375, 2474)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerBox">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerBox">
 								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerBox">BannerBox</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11805.5, 2505)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerBox">
+						<g transform="translate(11375, 2505)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerBox">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerBox">
 								<text x="0.0" y="13.5" stroke="none" data-name="BannerBox">+prefixIcon: Widget?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BannerBox">+body: Widget</text>
@@ -8073,16 +7861,16 @@
 					</g>
 					<g data-name="BannerStyle">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BannerStyle">
-							<rect x="6330.5" y="3319.5" height="122.0" width="294.0" data-name="BannerStyle"></rect>
-							<path d="M6330.5 3350.5 L6624.5 3350.5" fill="none" data-name="BannerStyle"></path>
+							<rect x="5007.3" y="3319.5" height="122.0" width="294.0" data-name="BannerStyle"></rect>
+							<path d="M5007.3 3350.5 L5301.3 3350.5" fill="none" data-name="BannerStyle"></path>
 						</g>
-						<g transform="translate(6330.5, 3319.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerStyle">
+						<g transform="translate(5007.25, 3319.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerStyle">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerStyle">
 								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerStyle">BannerStyle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6330.5, 3350.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerStyle">
+						<g transform="translate(5007.25, 3350.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerStyle">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerStyle">
 								<text x="0.0" y="13.5" stroke="none" data-name="BannerStyle">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+values: List&lt;BannerStyle&gt;</text>
@@ -8093,654 +7881,642 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="SecondaryButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SecondaryButton">
-							<rect x="12973.0" y="2496.0" height="138.0" width="249.0" data-name="SecondaryButton"></rect>
-							<path d="M12973.0 2527.0 L13222.0 2527.0" fill="none" data-name="SecondaryButton"></path>
-							<path d="M12973.0 2603.0 L13222.0 2603.0" fill="none" data-name="SecondaryButton"></path>
+					<g data-name="ActionMenuInline">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuInline">
+							<rect x="29285.0" y="52.5" height="168.0" width="324.0" data-name="ActionMenuInline"></rect>
+							<path d="M29285.0 83.5 L29609.0 83.5" fill="none" data-name="ActionMenuInline"></path>
+							<path d="M29285.0 189.5 L29609.0 189.5" fill="none" data-name="ActionMenuInline"></path>
 						</g>
-						<g transform="translate(12973, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecondaryButton">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecondaryButton">SecondaryButton</text>
+						<g transform="translate(29285, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuInline">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuInline">
+								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuInline">ActionMenuInline</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12973, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SecondaryButton">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SecondaryButton">+isLoading: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SecondaryButton">+onPressed: void Function()?</text>
+						<g transform="translate(29285, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuInline">+iconSize: double?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuInline">+visible: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuInline">+splashRadius: double?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ActionMenuInline">+paddingVertical: double?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ActionMenuInline">+paddingHorizontal: double?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12973, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+Widget build()</text>
+						<g transform="translate(29285, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconPack">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPack">
-							<rect x="31077.0" y="82.5" height="108.0" width="359.0" data-name="IconPack"></rect>
-							<path d="M31077.0 113.5 L31436.0 113.5" fill="none" data-name="IconPack"></path>
-							<path d="M31077.0 159.5 L31436.0 159.5" fill="none" data-name="IconPack"></path>
-						</g>
-						<g transform="translate(31077, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPack">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPack">IconPack</text>
-								
-							</g>
+					<g data-name="Collapsible">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Collapsible">
+							<rect x="29649.0" y="83.0" height="107.0" width="441.0" data-name="Collapsible"></rect>
+							<path d="M29649.0 114.0 L30090.0 114.0" fill="none" data-name="Collapsible"></path>
 						</g>
-						<g transform="translate(31077, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+defaultPack: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPack">&lt;static&gt;+material: List&lt;IconOption&gt;</text>
+						<g transform="translate(29649, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Collapsible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Collapsible">
+								<text x="212.5" y="13.5" stroke="none" text-anchor="middle" data-name="Collapsible">Collapsible</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31077, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+IconOption? resolveIconByName()</text>
+						<g transform="translate(29649, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Collapsible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Collapsible">
+								<text x="0.0" y="13.5" stroke="none" data-name="Collapsible">+contentBuilder: Widget Function(BuildContext, bool)</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Collapsible">+headerBuilder: Widget Function(BuildContext, bool)?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Collapsible">+title: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Collapsible">+isCollapsed: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconOption">
-							<rect x="3401.5" y="2488.5" height="153.0" width="264.0" data-name="IconOption"></rect>
-							<path d="M3401.5 2519.5 L3665.5 2519.5" fill="none" data-name="IconOption"></path>
-							<path d="M3401.5 2595.5 L3665.5 2595.5" fill="none" data-name="IconOption"></path>
+					<g data-name="Widget Function(BuildContext, bool)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)">
+							<rect x="28770.5" y="614.0" height="31.0" width="300.0" data-name="Widget Function(BuildContext, bool)"></rect>
 						</g>
-						<g transform="translate(3401.5, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconOption">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="IconOption">IconOption</text>
+						<g transform="translate(28770.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)">
+								<text x="142.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)">Widget Function(BuildContext, bool)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3401.5, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconOption">+isEmpty: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconOption">+props: List&lt;Object?&gt;</text>
-								
-							</g>
+					</g>
+					<g data-name="Widget Function(BuildContext, bool)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)?">
+							<rect x="29714.5" y="614.0" height="31.0" width="310.0" data-name="Widget Function(BuildContext, bool)?"></rect>
 						</g>
-						<g transform="translate(3401.5, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+String toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">&lt;static&gt;+IconOption fromJson()</text>
+						<g transform="translate(29714.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)?">
+								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)?">Widget Function(BuildContext, bool)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReactiveIconPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveIconPicker">
-							<rect x="31514.5" y="614.0" height="31.0" width="168.0" data-name="ReactiveIconPicker"></rect>
+					<g data-name="NavbarTab">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
+							<rect x="56458.3" y="1644.0" height="107.0" width="196.0" data-name="NavbarTab"></rect>
+							<path d="M56458.3 1675.0 L56654.3 1675.0" fill="none" data-name="NavbarTab"></path>
 						</g>
-						<g transform="translate(31514.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveIconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveIconPicker">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveIconPicker">ReactiveIconPicker</text>
+						<g transform="translate(56458.25, 1644)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
+								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReactiveFocusableFormField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFocusableFormField">
-							<rect x="31476.0" y="121.0" height="31.0" width="245.0" data-name="ReactiveFocusableFormField"></rect>
-						</g>
-						<g transform="translate(31476, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFocusableFormField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFocusableFormField">
-								<text x="114.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFocusableFormField">ReactiveFocusableFormField</text>
+						<g transform="translate(56458.25, 1675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NavbarTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NavbarTab">
+								<text x="0.0" y="13.5" stroke="none" data-name="NavbarTab">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NavbarTab">+intent: RoutingIntent?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NavbarTab">+index: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NavbarTab">+enabled: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPicker">
-							<rect x="3703.0" y="1606.0" height="183.0" width="319.0" data-name="IconPicker"></rect>
-							<path d="M3703.0 1637.0 L4022.0 1637.0" fill="none" data-name="IconPicker"></path>
-							<path d="M3703.0 1758.0 L4022.0 1758.0" fill="none" data-name="IconPicker"></path>
+					<g data-name="RoutingIntent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
+							<rect x="36821.8" y="2458.5" height="213.0" width="297.0" data-name="RoutingIntent"></rect>
+							<path d="M36821.8 2489.5 L37118.8 2489.5" fill="none" data-name="RoutingIntent"></path>
+							<path d="M36821.8 2625.5 L37118.8 2625.5" fill="none" data-name="RoutingIntent"></path>
 						</g>
-						<g transform="translate(3703, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPicker">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPicker">IconPicker</text>
+						<g transform="translate(36821.75, 2458.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
+								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3703, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPicker">+selectedOption: IconOption?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPicker">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconPicker">+galleryIconSize: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IconPicker">+selectedIconSize: double?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IconPicker">+focusNode: FocusNode?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IconPicker">+isDisabled: bool</text>
+						<g transform="translate(36821.75, 2489.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">+route: GoRoute</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+params: Map&lt;String, String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntent">+queryParams: Map&lt;String, String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntent">+dispatch: RoutingIntentDispatch?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntent">+extra: Object?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntent">+routeName: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntent">+arguments: Map&lt;String, String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntent">+props: List&lt;Object?&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3703, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+Widget build()</text>
+						<g transform="translate(36821.75, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">-dynamic _validateRoute()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+bool matches()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(IconOption)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(IconOption)?">
-							<rect x="3886.5" y="2549.5" height="31.0" width="230.0" data-name="void Function(IconOption)?"></rect>
+					<g data-name="TabbedNavbar">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TabbedNavbar">
+							<rect x="12039.8" y="2436.5" height="257.0" width="308.0" data-name="TabbedNavbar"></rect>
+							<path d="M12039.8 2467.5 L12347.8 2467.5" fill="none" data-name="TabbedNavbar"></path>
 						</g>
-						<g transform="translate(3886.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(IconOption)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(IconOption)?">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(IconOption)?">void Function(IconOption)?</text>
+						<g transform="translate(12039.75, 2436.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabbedNavbar">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabbedNavbar">
+								<text x="146.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabbedNavbar">TabbedNavbar</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FocusNode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FocusNode">
-							<rect x="3705.5" y="2549.5" height="31.0" width="106.0" data-name="FocusNode"></rect>
-						</g>
-						<g transform="translate(3705.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FocusNode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FocusNode">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="FocusNode">FocusNode</text>
+						<g transform="translate(12039.75, 2467.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TabbedNavbar">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TabbedNavbar">
+								<text x="0.0" y="13.5" stroke="none" data-name="TabbedNavbar">+tabs: List&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TabbedNavbar">+selectedTab: T?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TabbedNavbar">+indicator: BoxDecoration?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TabbedNavbar">+height: double?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TabbedNavbar">+disabledBackgroundColor: Color?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TabbedNavbar">+disabledTooltipText: String?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="TabbedNavbar">+onSelect: void Function(int, T)?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="TabbedNavbar">+labelPadding: EdgeInsets?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="TabbedNavbar">+labelSpacing: double?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="TabbedNavbar">+indicatorSize: TabBarIndicatorSize?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="TabbedNavbar">+isScrollable: bool</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="TabbedNavbar">+backgroundColor: Color?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="TabbedNavbar">+labelColorHover: Color?</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="TabbedNavbar">+unselectedLabelColorHover: Color?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconPickerField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerField">
-							<rect x="4261.3" y="1606.0" height="183.0" width="319.0" data-name="IconPickerField"></rect>
-							<path d="M4261.3 1637.0 L4580.3 1637.0" fill="none" data-name="IconPickerField"></path>
-							<path d="M4261.3 1758.0 L4580.3 1758.0" fill="none" data-name="IconPickerField"></path>
-						</g>
-						<g transform="translate(4261.25, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerField">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerField">IconPickerField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4261.25, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerField">+selectedOption: IconOption?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerField">+selectedIconSize: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconPickerField">+galleryIconSize: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IconPickerField">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IconPickerField">+focusNode: FocusNode?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IconPickerField">+isDisabled: bool</text>
-								
-							</g>
+					<g data-name="BoxDecoration">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoxDecoration">
+							<rect x="11987.0" y="3365.0" height="31.0" width="132.0" data-name="BoxDecoration"></rect>
 						</g>
-						<g transform="translate(4261.25, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+Widget build()</text>
+						<g transform="translate(11987, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxDecoration">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxDecoration">
+								<text x="58.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxDecoration">BoxDecoration</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconPickerGallery">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerGallery">
-							<rect x="7418.5" y="1636.0" height="123.0" width="319.0" data-name="IconPickerGallery"></rect>
-							<path d="M7418.5 1667.0 L7737.5 1667.0" fill="none" data-name="IconPickerGallery"></path>
-							<path d="M7418.5 1728.0 L7737.5 1728.0" fill="none" data-name="IconPickerGallery"></path>
+					<g data-name="void Function(int, T)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(int, T)?">
+							<rect x="12159.0" y="3365.0" height="31.0" width="183.0" data-name="void Function(int, T)?"></rect>
 						</g>
-						<g transform="translate(7418.5, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerGallery">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerGallery">IconPickerGallery</text>
+						<g transform="translate(12159, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(int, T)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(int, T)?">
+								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(int, T)?">void Function(int, T)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7418.5, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerGallery">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerGallery">+iconSize: double</text>
-								
-							</g>
+					</g>
+					<g data-name="TabBarIndicatorSize">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TabBarIndicatorSize">
+							<rect x="12382.0" y="3365.0" height="31.0" width="176.0" data-name="TabBarIndicatorSize"></rect>
 						</g>
-						<g transform="translate(7418.5, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+Widget build()</text>
+						<g transform="translate(12382, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabBarIndicatorSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabBarIndicatorSize">
+								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabBarIndicatorSize">TabBarIndicatorSize</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SingleColumnLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayout">
-							<rect x="15419.0" y="2466.0" height="198.0" width="418.0" data-name="SingleColumnLayout"></rect>
-							<path d="M15419.0 2497.0 L15837.0 2497.0" fill="none" data-name="SingleColumnLayout"></path>
-							<path d="M15419.0 2633.0 L15837.0 2633.0" fill="none" data-name="SingleColumnLayout"></path>
+					<g data-name="SidesheetTab">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SidesheetTab">
+							<rect x="56411.3" y="2534.0" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
+							<path d="M56411.3 2565.0 L56741.3 2565.0" fill="none" data-name="SidesheetTab"></path>
 						</g>
-						<g transform="translate(15419, 2466)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayout">
-								<text x="201.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayout">SingleColumnLayout</text>
+						<g transform="translate(56411.25, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SidesheetTab">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="SidesheetTab">SidesheetTab</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15419, 2497)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraints: BoxConstraints</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraintsNarrow: BoxConstraints</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayout">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayout">+header: Widget?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayout">+stickyHeader: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayout">+constraints: BoxConstraints?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SingleColumnLayout">+scroll: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SingleColumnLayout">+padding: EdgeInsets?</text>
+						<g transform="translate(56411.25, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SidesheetTab">
+								<text x="0.0" y="13.5" stroke="none" data-name="SidesheetTab">+builder: Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15419, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+dynamic fromType()</text>
+					</g>
+					<g data-name="Widget Function(BuildContext)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
+							<rect x="51582.3" y="3365.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
+						</g>
+						<g transform="translate(51582.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
+								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SingleColumnLayoutType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="13157.5" y="3312.0" height="137.0" width="426.0" data-name="SingleColumnLayoutType"></rect>
-							<path d="M13157.5 3343.0 L13583.5 3343.0" fill="none" data-name="SingleColumnLayoutType"></path>
+					<g data-name="Sidesheet">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Sidesheet">
+							<rect x="12838.8" y="2459.0" height="212.0" width="341.0" data-name="Sidesheet"></rect>
+							<path d="M12838.8 2490.0 L13179.8 2490.0" fill="none" data-name="Sidesheet"></path>
 						</g>
-						<g transform="translate(13157.5, 3312)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
-								<text x="205.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
+						<g transform="translate(12838.75, 2459)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Sidesheet">
+								<text x="162.5" y="13.5" stroke="none" text-anchor="middle" data-name="Sidesheet">Sidesheet</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13157.5, 3343)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayoutType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayoutType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedWide: SingleColumnLayoutType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedNarrow: SingleColumnLayoutType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+stretched: SingleColumnLayoutType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+split: SingleColumnLayoutType</text>
+						<g transform="translate(12838.75, 2490)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Sidesheet">
+								<text x="0.0" y="13.5" stroke="none" data-name="Sidesheet">&lt;static&gt;+kDefaultWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Sidesheet">+titleText: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Sidesheet">+body: Widget?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Sidesheet">+tabs: List&lt;SidesheetTab&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Sidesheet">+actionButtons: List&lt;Widget&gt;?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Sidesheet">+width: double?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Sidesheet">+withCloseButton: bool</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Sidesheet">+ignoreAppBar: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="Sidesheet">+collapseSingleTab: bool</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="Sidesheet">+bodyPadding: EdgeInsets?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="Sidesheet">+wrapContent: Widget Function(Widget)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="80475.3" y="105.5" height="62.0" width="192.0" data-name="FormConsumerWidget"></rect>
-							<path d="M80475.3 136.5 L80667.3 136.5" fill="none" data-name="FormConsumerWidget"></path>
-						</g>
-						<g transform="translate(80475.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
+					<g data-name="Widget Function(Widget)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Widget)?">
+							<rect x="18868.0" y="3365.0" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
 						</g>
-						<g transform="translate(80475.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerWidget">+Widget build()</text>
+						<g transform="translate(18868, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Widget)?">
+								<text x="102.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Widget)?">Widget Function(Widget)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConsumerRefWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="12067.3" y="1666.5" height="62.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
-							<path d="M12067.3 1697.5 L12286.3 1697.5" fill="none" data-name="FormConsumerRefWidget"></path>
+					<g data-name="FormSideSheetTab">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormSideSheetTab">
+							<rect x="56781.3" y="2534.0" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
+							<path d="M56781.3 2565.0 L57094.3 2565.0" fill="none" data-name="FormSideSheetTab"></path>
 						</g>
-						<g transform="translate(12067.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
+						<g transform="translate(56781.25, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSideSheetTab">
+								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormSideSheetTab">FormSideSheetTab</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12067.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerRefWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerRefWidget">+Widget build()</text>
+						<g transform="translate(56781.25, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSideSheetTab">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormSideSheetTab">+formViewBuilder: Widget Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormScaffold">
-							<rect x="15877.0" y="2496.5" height="137.0" width="212.0" data-name="FormScaffold"></rect>
-							<path d="M15877.0 2527.5 L16089.0 2527.5" fill="none" data-name="FormScaffold"></path>
+					<g data-name="HelpIcon">
+						<g fill="#eee8d5" stroke="#33322E" data-name="HelpIcon">
+							<rect x="30130.0" y="90.0" height="93.0" width="174.0" data-name="HelpIcon"></rect>
+							<path d="M30130.0 121.0 L30304.0 121.0" fill="none" data-name="HelpIcon"></path>
+							<path d="M30130.0 152.0 L30304.0 152.0" fill="none" data-name="HelpIcon"></path>
 						</g>
-						<g transform="translate(15877, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormScaffold">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormScaffold">FormScaffold</text>
+						<g transform="translate(30130, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HelpIcon">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HelpIcon">
+								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="HelpIcon">HelpIcon</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15877, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormScaffold">+formViewModel: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormScaffold">+actions: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormScaffold">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormScaffold">+actionsPadding: double</text>
+						<g transform="translate(30130, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
+								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+tooltipText: String?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(30130, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
+								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StandardDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardDialog">
-							<rect x="16129.0" y="2428.5" height="273.0" width="247.0" data-name="StandardDialog"></rect>
-							<path d="M16129.0 2459.5 L16376.0 2459.5" fill="none" data-name="StandardDialog"></path>
-							<path d="M16129.0 2670.5 L16376.0 2670.5" fill="none" data-name="StandardDialog"></path>
+					<g data-name="EmptyBody">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EmptyBody">
+							<rect x="13466.8" y="2481.0" height="168.0" width="222.0" data-name="EmptyBody"></rect>
+							<path d="M13466.8 2512.0 L13688.8 2512.0" fill="none" data-name="EmptyBody"></path>
+							<path d="M13466.8 2618.0 L13688.8 2618.0" fill="none" data-name="EmptyBody"></path>
 						</g>
-						<g transform="translate(16129, 2428.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardDialog">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardDialog">StandardDialog</text>
+						<g transform="translate(13466.75, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmptyBody">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmptyBody">
+								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="EmptyBody">EmptyBody</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16129, 2459.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+title: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardDialog">+titleText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardDialog">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardDialog">+actionButtons: List&lt;Widget&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardDialog">+backgroundColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardDialog">+borderRadius: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StandardDialog">+width: double?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StandardDialog">+height: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StandardDialog">+minWidth: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StandardDialog">+minHeight: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StandardDialog">+maxWidth: double?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StandardDialog">+maxHeight: double?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StandardDialog">+padding: EdgeInsets</text>
+						<g transform="translate(13466.75, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
+								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+icon: IconData?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EmptyBody">+leading: Widget?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EmptyBody">+leadingSpacing: double?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EmptyBody">+title: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EmptyBody">+description: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EmptyBody">+button: Widget?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16129, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+Widget build()</text>
+						<g transform="translate(13466.75, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
+								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="HtmlStylingBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlStylingBanner">
-							<rect x="16416.0" y="2511.0" height="108.0" width="298.0" data-name="HtmlStylingBanner"></rect>
-							<path d="M16416.0 2542.0 L16714.0 2542.0" fill="none" data-name="HtmlStylingBanner"></path>
-							<path d="M16416.0 2588.0 L16714.0 2588.0" fill="none" data-name="HtmlStylingBanner"></path>
+					<g data-name="IndicatorRangeSliderThumbShape">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IndicatorRangeSliderThumbShape">
+							<rect x="30309.5" y="560.5" height="138.0" width="287.0" data-name="IndicatorRangeSliderThumbShape"></rect>
+							<path d="M30309.5 591.5 L30596.5 591.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
+							<path d="M30309.5 652.5 L30596.5 652.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
 						</g>
-						<g transform="translate(16416, 2511)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlStylingBanner">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlStylingBanner">HtmlStylingBanner</text>
+						<g transform="translate(30309.5, 560.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IndicatorRangeSliderThumbShape">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="IndicatorRangeSliderThumbShape">IndicatorRangeSliderThumbShape</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16416, 2542)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+isDismissed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="HtmlStylingBanner">+onDismissed: dynamic Function()?</text>
+						<g transform="translate(30309.5, 591.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
+								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+buildContext: BuildContext</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+start: T</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+end: T</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16416, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+Widget build()</text>
+						<g transform="translate(30309.5, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
+								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+Size getPreferredSize()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+void paint()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StandardTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableColumn">
-							<rect x="20077.0" y="2496.5" height="137.0" width="287.0" data-name="StandardTableColumn"></rect>
-							<path d="M20077.0 2527.5 L20364.0 2527.5" fill="none" data-name="StandardTableColumn"></path>
+					<g data-name="BuildContext">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
+							<rect x="30395.0" y="1197.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
 						</g>
-						<g transform="translate(20077, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableColumn">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableColumn">StandardTableColumn</text>
+						<g transform="translate(30395, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
+								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20077, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableColumn">+label: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableColumn">+tooltip: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableColumn">+columnWidth: TableColumnWidth</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableColumn">+sortable: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardTableColumn">+sortAscending: bool?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardTableColumn">+sortableIcon: Widget?</text>
+					</g>
+					<g data-name="RangeSliderThumbShape">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RangeSliderThumbShape">
+							<rect x="30344.0" y="121.0" height="31.0" width="218.0" data-name="RangeSliderThumbShape"></rect>
+						</g>
+						<g transform="translate(30344, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="RangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RangeSliderThumbShape">
+								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="RangeSliderThumbShape">RangeSliderThumbShape</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TableColumnWidth">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TableColumnWidth">
-							<rect x="20851.0" y="3365.0" height="31.0" width="165.0" data-name="TableColumnWidth"></rect>
+					<g data-name="MouseEventsRegion">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MouseEventsRegion">
+							<rect x="15503.8" y="3640.0" height="167.0" width="379.0" data-name="MouseEventsRegion"></rect>
+							<path d="M15503.8 3671.0 L15882.8 3671.0" fill="none" data-name="MouseEventsRegion"></path>
 						</g>
-						<g transform="translate(20851, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TableColumnWidth">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableColumnWidth">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableColumnWidth">TableColumnWidth</text>
+						<g transform="translate(15503.75, 3640)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MouseEventsRegion">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MouseEventsRegion">
+								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="MouseEventsRegion">MouseEventsRegion</text>
+								
+							</g>
+						</g>
+						<g transform="translate(15503.75, 3671)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MouseEventsRegion">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MouseEventsRegion">
+								<text x="0.0" y="13.5" stroke="none" data-name="MouseEventsRegion">+onTap: void Function()?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MouseEventsRegion">+onHover: void Function(PointerHoverEvent)?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MouseEventsRegion">+onEnter: void Function(PointerEnterEvent)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MouseEventsRegion">+onExit: void Function(PointerExitEvent)?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MouseEventsRegion">+autoselectCursor: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MouseEventsRegion">+cursor: SystemMouseCursor</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MouseEventsRegion">&lt;static&gt;+defaultCursor: SystemMouseCursor</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MouseEventsRegion">+autoCursor: SystemMouseCursor</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StandardTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTable">
-							<rect x="18027.5" y="1501.5" height="392.0" width="688.0" data-name="StandardTable"></rect>
-							<path d="M18027.5 1532.5 L18715.5 1532.5" fill="none" data-name="StandardTable"></path>
+					<g data-name="void Function(PointerHoverEvent)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerHoverEvent)?">
+							<rect x="7508.8" y="3998.5" height="31.0" width="292.0" data-name="void Function(PointerHoverEvent)?"></rect>
 						</g>
-						<g transform="translate(18027.5, 1501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTable">
-								<text x="336.0" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTable">StandardTable</text>
+						<g transform="translate(7508.75, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerHoverEvent)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerHoverEvent)?">
+								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerHoverEvent)?">void Function(PointerHoverEvent)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18027.5, 1532.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTable">+inputColumns: List&lt;StandardTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTable">+trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardTable">+trailingActionsMenuType: ActionMenuType?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardTable">+sortColumnPredicates: List&lt;int Function(T, T)?&gt;?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StandardTable">+pinnedPredicates: int Function(T, T)?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StandardTable">+headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StandardTable">+dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StandardTable">+inputTrailingActionsColumn: StandardTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StandardTable">+tableWrapper: Widget Function(Widget)?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StandardTable">+cellSpacing: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StandardTable">+rowSpacing: double</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StandardTable">+minRowHeight: double?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StandardTable">+showTableHeader: bool</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StandardTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StandardTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StandardTable">+trailingWidget: Widget?</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StandardTable">+leadingWidgetSpacing: double?</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StandardTable">+trailingWidgetSpacing: double?</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StandardTable">+emptyWidget: Widget?</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StandardTable">+rowStyle: StandardTableStyle</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StandardTable">+disableRowInteractions: bool</text>
+					</g>
+					<g data-name="void Function(PointerEnterEvent)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerEnterEvent)?">
+							<rect x="7840.8" y="3998.5" height="31.0" width="287.0" data-name="void Function(PointerEnterEvent)?"></rect>
+						</g>
+						<g transform="translate(7840.75, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerEnterEvent)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerEnterEvent)?">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerEnterEvent)?">void Function(PointerEnterEvent)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="24063.3" y="3365.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
+					<g data-name="void Function(PointerExitEvent)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerExitEvent)?">
+							<rect x="15443.8" y="3998.5" height="31.0" width="274.0" data-name="void Function(PointerExitEvent)?"></rect>
 						</g>
-						<g transform="translate(24063.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
+						<g transform="translate(15443.75, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerExitEvent)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerExitEvent)?">
+								<text x="129.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerExitEvent)?">void Function(PointerExitEvent)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-							<rect x="16754.0" y="2549.5" height="31.0" width="381.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?"></rect>
+					<g data-name="SystemMouseCursor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SystemMouseCursor">
+							<rect x="15757.8" y="3998.5" height="31.0" width="180.0" data-name="SystemMouseCursor"></rect>
 						</g>
-						<g transform="translate(16754, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
+						<g transform="translate(15757.75, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SystemMouseCursor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SystemMouseCursor">
+								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="SystemMouseCursor">SystemMouseCursor</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="int Function(T, T)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(T, T)?">
-							<rect x="17215.0" y="2549.5" height="31.0" width="160.0" data-name="int Function(T, T)?"></rect>
+					<g data-name="ReactiveCustomColorPicker">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveCustomColorPicker">
+							<rect x="34340.3" y="614.0" height="31.0" width="236.0" data-name="ReactiveCustomColorPicker"></rect>
 						</g>
-						<g transform="translate(17215, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(T, T)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(T, T)?">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(T, T)?">int Function(T, T)?</text>
+						<g transform="translate(34340.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveCustomColorPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveCustomColorPicker">
+								<text x="110.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveCustomColorPicker">ReactiveCustomColorPicker</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<rect x="17415.0" y="2549.5" height="31.0" width="523.0" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?"></rect>
+					<g data-name="ReactiveFormField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFormField">
+							<rect x="34376.8" y="121.0" height="31.0" width="163.0" data-name="ReactiveFormField"></rect>
 						</g>
-						<g transform="translate(17415, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-								<text x="253.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
+						<g transform="translate(34376.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFormField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFormField">
+								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFormField">ReactiveFormField</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StandardTableStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableStyle">
-							<rect x="9179.0" y="3327.0" height="107.0" width="353.0" data-name="StandardTableStyle"></rect>
-							<path d="M9179.0 3358.0 L9532.0 3358.0" fill="none" data-name="StandardTableStyle"></path>
+					<g data-name="TextParagraph">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TextParagraph">
+							<rect x="13728.8" y="2496.0" height="138.0" width="208.0" data-name="TextParagraph"></rect>
+							<path d="M13728.8 2527.0 L13936.8 2527.0" fill="none" data-name="TextParagraph"></path>
+							<path d="M13728.8 2603.0 L13936.8 2603.0" fill="none" data-name="TextParagraph"></path>
 						</g>
-						<g transform="translate(9179, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableStyle">
-								<text x="168.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableStyle">StandardTableStyle</text>
+						<g transform="translate(13728.75, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextParagraph">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextParagraph">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextParagraph">TextParagraph</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9179, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableStyle">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableStyle">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+values: List&lt;StandardTableStyle&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+plain: StandardTableStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+material: StandardTableStyle</text>
+						<g transform="translate(13728.75, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
+								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+text: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TextParagraph">+style: TextStyle?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TextParagraph">+selectable: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TextParagraph">+span: List&lt;TextSpan&gt;?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(13728.75, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
+								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TwoColumnLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TwoColumnLayout">
-							<rect x="17978.0" y="2406.5" height="317.0" width="368.0" data-name="TwoColumnLayout"></rect>
-							<path d="M17978.0 2437.5 L18346.0 2437.5" fill="none" data-name="TwoColumnLayout"></path>
+					<g data-name="UnderConstruction">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UnderConstruction">
+							<rect x="34579.8" y="105.5" height="62.0" width="164.0" data-name="UnderConstruction"></rect>
+							<path d="M34579.8 136.5 L34743.8 136.5" fill="none" data-name="UnderConstruction"></path>
 						</g>
-						<g transform="translate(17978, 2406.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TwoColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TwoColumnLayout">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="TwoColumnLayout">TwoColumnLayout</text>
+						<g transform="translate(34579.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnderConstruction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnderConstruction">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="UnderConstruction">UnderConstruction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17978, 2437.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TwoColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TwoColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultDivider: VerticalDivider</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultContentPadding: EdgeInsets</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+slimContentPadding: EdgeInsets</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TwoColumnLayout">+leftWidget: Widget</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TwoColumnLayout">+rightWidget: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TwoColumnLayout">+dividerWidget: Widget?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TwoColumnLayout">+headerWidget: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TwoColumnLayout">+flexLeft: int?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="TwoColumnLayout">+flexRight: int?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="TwoColumnLayout">+constraintsLeft: BoxConstraints?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="TwoColumnLayout">+constraintsRight: BoxConstraints?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="TwoColumnLayout">+scrollLeft: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="TwoColumnLayout">+scrollRight: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="TwoColumnLayout">+paddingLeft: EdgeInsets?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="TwoColumnLayout">+paddingRight: EdgeInsets?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorLeft: Color?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorRight: Color?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="TwoColumnLayout">+stretchHeight: bool</text>
+						<g transform="translate(34579.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnderConstruction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnderConstruction">
+								<text x="0.0" y="13.5" stroke="none" data-name="UnderConstruction">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="VerticalDivider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VerticalDivider">
-							<rect x="17202.3" y="3365.0" height="31.0" width="130.0" data-name="VerticalDivider"></rect>
+					<g data-name="NullHelperDecoration">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NullHelperDecoration">
+							<rect x="34762.8" y="614.0" height="31.0" width="184.0" data-name="NullHelperDecoration"></rect>
 						</g>
-						<g transform="translate(17202.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VerticalDivider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VerticalDivider">
-								<text x="57.0" y="13.5" stroke="none" text-anchor="middle" data-name="VerticalDivider">VerticalDivider</text>
+						<g transform="translate(34762.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NullHelperDecoration">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NullHelperDecoration">
+								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="NullHelperDecoration">NullHelperDecoration</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ActionMenuInline">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuInline">
-							<rect x="32019.0" y="52.5" height="168.0" width="324.0" data-name="ActionMenuInline"></rect>
-							<path d="M32019.0 83.5 L32343.0 83.5" fill="none" data-name="ActionMenuInline"></path>
-							<path d="M32019.0 189.5 L32343.0 189.5" fill="none" data-name="ActionMenuInline"></path>
+					<g data-name="InputDecoration">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InputDecoration">
+							<rect x="34783.8" y="121.0" height="31.0" width="142.0" data-name="InputDecoration"></rect>
 						</g>
-						<g transform="translate(32019, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuInline">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuInline">ActionMenuInline</text>
+						<g transform="translate(34783.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InputDecoration">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InputDecoration">
+								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="InputDecoration">InputDecoration</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32019, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuInline">+iconSize: double?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuInline">+visible: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuInline">+splashRadius: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ActionMenuInline">+paddingVertical: double?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ActionMenuInline">+paddingHorizontal: double?</text>
+					</g>
+					<g data-name="ActionMenuType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuType">
+							<rect x="8839.0" y="3327.0" height="107.0" width="330.0" data-name="ActionMenuType"></rect>
+							<path d="M8839.0 3358.0 L9169.0 3358.0" fill="none" data-name="ActionMenuType"></path>
+						</g>
+						<g transform="translate(8839, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuType">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuType">ActionMenuType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32019, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+Widget build()</text>
+						<g transform="translate(8839, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuType">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+values: List&lt;ActionMenuType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+inline: ActionMenuType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+popup: ActionMenuType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TextParagraph">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextParagraph">
-							<rect x="18386.0" y="2496.0" height="138.0" width="208.0" data-name="TextParagraph"></rect>
-							<path d="M18386.0 2527.0 L18594.0 2527.0" fill="none" data-name="TextParagraph"></path>
-							<path d="M18386.0 2603.0 L18594.0 2603.0" fill="none" data-name="TextParagraph"></path>
+					<g data-name="HtmlStylingBanner">
+						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlStylingBanner">
+							<rect x="13976.8" y="2511.0" height="108.0" width="298.0" data-name="HtmlStylingBanner"></rect>
+							<path d="M13976.8 2542.0 L14274.8 2542.0" fill="none" data-name="HtmlStylingBanner"></path>
+							<path d="M13976.8 2588.0 L14274.8 2588.0" fill="none" data-name="HtmlStylingBanner"></path>
 						</g>
-						<g transform="translate(18386, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextParagraph">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextParagraph">TextParagraph</text>
+						<g transform="translate(13976.75, 2511)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlStylingBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlStylingBanner">
+								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlStylingBanner">HtmlStylingBanner</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18386, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
-								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+text: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TextParagraph">+style: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TextParagraph">+selectable: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TextParagraph">+span: List&lt;TextSpan&gt;?</text>
+						<g transform="translate(13976.75, 2542)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
+								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+isDismissed: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="HtmlStylingBanner">+onDismissed: dynamic Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18386, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
-								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+Widget build()</text>
+						<g transform="translate(13976.75, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
+								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
+							<rect x="78853.3" y="105.5" height="62.0" width="192.0" data-name="FormConsumerWidget"></rect>
+							<path d="M78853.3 136.5 L79045.3 136.5" fill="none" data-name="FormConsumerWidget"></path>
+						</g>
+						<g transform="translate(78853.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
+								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
+								
+							</g>
+						</g>
+						<g transform="translate(78853.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerWidget">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormConsumerRefWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
+							<rect x="13717.0" y="1666.5" height="62.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
+							<path d="M13717.0 1697.5 L13936.0 1697.5" fill="none" data-name="FormConsumerRefWidget"></path>
+						</g>
+						<g transform="translate(13717, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
+								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
+								
+							</g>
+						</g>
+						<g transform="translate(13717, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerRefWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerRefWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerRefWidget">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="SplashPage">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SplashPage">
-							<rect x="32383.0" y="105.5" height="62.0" width="136.0" data-name="SplashPage"></rect>
-							<path d="M32383.0 136.5 L32519.0 136.5" fill="none" data-name="SplashPage"></path>
+							<rect x="35250.8" y="105.5" height="62.0" width="136.0" data-name="SplashPage"></rect>
+							<path d="M35250.8 136.5 L35386.8 136.5" fill="none" data-name="SplashPage"></path>
 						</g>
-						<g transform="translate(32383, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
+						<g transform="translate(35250.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SplashPage">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SplashPage">SplashPage</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32383, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
+						<g transform="translate(35250.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SplashPage">
 								<text x="0.0" y="13.5" stroke="none" data-name="SplashPage">+Widget build()</text>
 								
@@ -8749,23 +8525,23 @@
 					</g>
 					<g data-name="ErrorPage">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ErrorPage">
-							<rect x="3159.5" y="1651.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
-							<path d="M3159.5 1682.0 L3321.5 1682.0" fill="none" data-name="ErrorPage"></path>
-							<path d="M3159.5 1713.0 L3321.5 1713.0" fill="none" data-name="ErrorPage"></path>
+							<rect x="13515.0" y="1651.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
+							<path d="M13515.0 1682.0 L13677.0 1682.0" fill="none" data-name="ErrorPage"></path>
+							<path d="M13515.0 1713.0 L13677.0 1713.0" fill="none" data-name="ErrorPage"></path>
 						</g>
-						<g transform="translate(3159.5, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
+						<g transform="translate(13515, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ErrorPage">
 								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="ErrorPage">ErrorPage</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3159.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
+						<g transform="translate(13515, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
 								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+error: Exception?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3159.5, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
+						<g transform="translate(13515, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
 								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+Widget build()</text>
 								
@@ -8774,4967 +8550,5013 @@
 					</g>
 					<g data-name="ConsumerWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="26664.5" y="1197.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+							<rect x="31792.0" y="1197.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
 						</g>
-						<g transform="translate(26664.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+						<g transform="translate(31792, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
 								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Badge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Badge">
-							<rect x="18634.0" y="2436.0" height="258.0" width="263.0" data-name="Badge"></rect>
-							<path d="M18634.0 2467.0 L18897.0 2467.0" fill="none" data-name="Badge"></path>
-							<path d="M18634.0 2618.0 L18897.0 2618.0" fill="none" data-name="Badge"></path>
+					<g data-name="StudyULogo">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyULogo">
+							<rect x="15999.3" y="3677.0" height="93.0" width="214.0" data-name="StudyULogo"></rect>
+							<path d="M15999.3 3708.0 L16213.3 3708.0" fill="none" data-name="StudyULogo"></path>
+							<path d="M15999.3 3739.0 L16213.3 3739.0" fill="none" data-name="StudyULogo"></path>
 						</g>
-						<g transform="translate(18634, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Badge">
-								<text x="123.5" y="13.5" stroke="none" text-anchor="middle" data-name="Badge">Badge</text>
+						<g transform="translate(15999.25, 3677)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyULogo">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyULogo">
+								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyULogo">StudyULogo</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18634, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
-								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+icon: IconData?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Badge">+color: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Badge">+borderRadius: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Badge">+label: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Badge">+type: BadgeType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Badge">+padding: EdgeInsets</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Badge">+iconSize: double?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Badge">+labelStyle: TextStyle?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Badge">+center: bool</text>
+						<g transform="translate(15999.25, 3708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+onTap: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18634, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
-								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Badge">-Color? _getBackgroundColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Badge">-Color _getBorderColor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Badge">-Color? _getLabelColor()</text>
+						<g transform="translate(15999.25, 3739)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="21510.0" y="3312.0" height="137.0" width="288.0" data-name="BadgeType"></rect>
-							<path d="M21510.0 3343.0 L21798.0 3343.0" fill="none" data-name="BadgeType"></path>
+					<g data-name="SingleColumnLayout">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayout">
+							<rect x="14314.8" y="2466.0" height="198.0" width="418.0" data-name="SingleColumnLayout"></rect>
+							<path d="M14314.8 2497.0 L14732.8 2497.0" fill="none" data-name="SingleColumnLayout"></path>
+							<path d="M14314.8 2633.0 L14732.8 2633.0" fill="none" data-name="SingleColumnLayout"></path>
 						</g>
-						<g transform="translate(21510, 3312)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
+						<g transform="translate(14314.75, 2466)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayout">
+								<text x="201.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayout">SingleColumnLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21510, 3343)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BadgeType">
-								<text x="0.0" y="13.5" stroke="none" data-name="BadgeType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BadgeType">&lt;static&gt;+values: List&lt;BadgeType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BadgeType">&lt;static&gt;+filled: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlined: BadgeType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlineFill: BadgeType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BadgeType">&lt;static&gt;+plain: BadgeType</text>
+						<g transform="translate(14314.75, 2497)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraints: BoxConstraints</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraintsNarrow: BoxConstraints</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayout">+body: Widget</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayout">+header: Widget?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayout">+stickyHeader: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayout">+constraints: BoxConstraints?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="SingleColumnLayout">+scroll: bool</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="SingleColumnLayout">+padding: EdgeInsets?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(14314.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+dynamic fromType()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IndicatorRangeSliderThumbShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IndicatorRangeSliderThumbShape">
-							<rect x="31726.5" y="560.5" height="138.0" width="287.0" data-name="IndicatorRangeSliderThumbShape"></rect>
-							<path d="M31726.5 591.5 L32013.5 591.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
-							<path d="M31726.5 652.5 L32013.5 652.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
+					<g data-name="SingleColumnLayoutType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
+							<rect x="24150.8" y="3312.0" height="137.0" width="426.0" data-name="SingleColumnLayoutType"></rect>
+							<path d="M24150.8 3343.0 L24576.8 3343.0" fill="none" data-name="SingleColumnLayoutType"></path>
 						</g>
-						<g transform="translate(31726.5, 560.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IndicatorRangeSliderThumbShape">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="IndicatorRangeSliderThumbShape">IndicatorRangeSliderThumbShape</text>
+						<g transform="translate(24150.75, 3312)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
+								<text x="205.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31726.5, 591.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+buildContext: BuildContext</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+start: T</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+end: T</text>
+						<g transform="translate(24150.75, 3343)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayoutType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayoutType">
+								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayoutType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedWide: SingleColumnLayoutType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedNarrow: SingleColumnLayoutType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+stretched: SingleColumnLayoutType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+split: SingleColumnLayoutType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31726.5, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+Size getPreferredSize()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+void paint()</text>
+					</g>
+					<g data-name="Hyperlink">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Hyperlink">
+							<rect x="15187.3" y="2459.0" height="212.0" width="222.0" data-name="Hyperlink"></rect>
+							<path d="M15187.3 2490.0 L15409.3 2490.0" fill="none" data-name="Hyperlink"></path>
+						</g>
+						<g transform="translate(15187.25, 2459)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Hyperlink">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Hyperlink">
+								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="Hyperlink">Hyperlink</text>
+								
+							</g>
+						</g>
+						<g transform="translate(15187.25, 2490)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Hyperlink">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Hyperlink">
+								<text x="0.0" y="13.5" stroke="none" data-name="Hyperlink">+text: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Hyperlink">+url: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Hyperlink">+onClick: void Function()?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Hyperlink">+linkColor: Color</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Hyperlink">+hoverColor: Color?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Hyperlink">+visitedColor: Color?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Hyperlink">+style: TextStyle?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Hyperlink">+hoverStyle: TextStyle?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="Hyperlink">+visitedStyle: TextStyle?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="Hyperlink">+icon: IconData?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="Hyperlink">+iconSize: double?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BuildContext">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
-							<rect x="31812.0" y="1197.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
+					<g data-name="StandardTableColumn">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableColumn">
+							<rect x="21305.8" y="2496.5" height="137.0" width="287.0" data-name="StandardTableColumn"></rect>
+							<path d="M21305.8 2527.5 L21592.8 2527.5" fill="none" data-name="StandardTableColumn"></path>
 						</g>
-						<g transform="translate(31812, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
+						<g transform="translate(21305.75, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableColumn">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableColumn">StandardTableColumn</text>
+								
+							</g>
+						</g>
+						<g transform="translate(21305.75, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableColumn">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableColumn">+label: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableColumn">+tooltip: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableColumn">+columnWidth: TableColumnWidth</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableColumn">+sortable: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StandardTableColumn">+sortAscending: bool?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StandardTableColumn">+sortableIcon: Widget?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RangeSliderThumbShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RangeSliderThumbShape">
-							<rect x="31761.0" y="121.0" height="31.0" width="218.0" data-name="RangeSliderThumbShape"></rect>
+					<g data-name="TableColumnWidth">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TableColumnWidth">
+							<rect x="26381.8" y="3365.0" height="31.0" width="165.0" data-name="TableColumnWidth"></rect>
 						</g>
-						<g transform="translate(31761, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="RangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RangeSliderThumbShape">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="RangeSliderThumbShape">RangeSliderThumbShape</text>
+						<g transform="translate(26381.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TableColumnWidth">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableColumnWidth">
+								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableColumnWidth">TableColumnWidth</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="HelpIcon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HelpIcon">
-							<rect x="46086.0" y="90.0" height="93.0" width="174.0" data-name="HelpIcon"></rect>
-							<path d="M46086.0 121.0 L46260.0 121.0" fill="none" data-name="HelpIcon"></path>
-							<path d="M46086.0 152.0 L46260.0 152.0" fill="none" data-name="HelpIcon"></path>
+					<g data-name="StandardTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTable">
+							<rect x="19880.8" y="1494.0" height="407.0" width="688.0" data-name="StandardTable"></rect>
+							<path d="M19880.8 1525.0 L20568.8 1525.0" fill="none" data-name="StandardTable"></path>
 						</g>
-						<g transform="translate(46086, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HelpIcon">
-								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="HelpIcon">HelpIcon</text>
+						<g transform="translate(19880.75, 1494)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTable">
+								<text x="336.0" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTable">StandardTable</text>
+								
+							</g>
+						</g>
+						<g transform="translate(19880.75, 1525)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardTable">+items: List&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StandardTable">+inputColumns: List&lt;StandardTableColumn&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StandardTable">+onSelectItem: void Function(T)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StandardTable">+trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StandardTable">+trailingActionsMenuType: ActionMenuType?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StandardTable">+sortColumnPredicates: List&lt;int Function(T, T)?&gt;?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StandardTable">+pinnedPredicates: int Function(T, T)?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StandardTable">+headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StandardTable">+dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StandardTable">+inputTrailingActionsColumn: StandardTableColumn</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StandardTable">+tableWrapper: Widget Function(Widget)?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StandardTable">+cellSpacing: double</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StandardTable">+rowSpacing: double</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StandardTable">+minRowHeight: double?</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StandardTable">+headerMaxLines: int</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StandardTable">+showTableHeader: bool</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StandardTable">+hideLeadingTrailingWhenEmpty: bool</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StandardTable">+leadingWidget: Widget?</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StandardTable">+trailingWidget: Widget?</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="StandardTable">+leadingWidgetSpacing: double?</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="StandardTable">+trailingWidgetSpacing: double?</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="StandardTable">+emptyWidget: Widget?</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="StandardTable">+rowStyle: StandardTableStyle</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="StandardTable">+disableRowInteractions: bool</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="void Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
+							<rect x="28578.0" y="3365.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
+						</g>
+						<g transform="translate(28578, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
+								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
+							<rect x="18500.5" y="2549.5" height="31.0" width="381.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?"></rect>
+						</g>
+						<g transform="translate(18500.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
+								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46086, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
-								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+tooltipText: String?</text>
+					</g>
+					<g data-name="int Function(T, T)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(T, T)?">
+							<rect x="18961.5" y="2549.5" height="31.0" width="160.0" data-name="int Function(T, T)?"></rect>
+						</g>
+						<g transform="translate(18961.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(T, T)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(T, T)?">
+								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(T, T)?">int Function(T, T)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46086, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
-								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+Widget build()</text>
+					</g>
+					<g data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+							<rect x="19161.5" y="2549.5" height="31.0" width="523.0" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?"></rect>
+						</g>
+						<g transform="translate(19161.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+								<text x="253.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="UnderConstruction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnderConstruction">
-							<rect x="46300.0" y="105.5" height="62.0" width="164.0" data-name="UnderConstruction"></rect>
-							<path d="M46300.0 136.5 L46464.0 136.5" fill="none" data-name="UnderConstruction"></path>
+					<g data-name="StandardTableStyle">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableStyle">
+							<rect x="9715.0" y="3327.0" height="107.0" width="353.0" data-name="StandardTableStyle"></rect>
+							<path d="M9715.0 3358.0 L10068.0 3358.0" fill="none" data-name="StandardTableStyle"></path>
 						</g>
-						<g transform="translate(46300, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnderConstruction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnderConstruction">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="UnderConstruction">UnderConstruction</text>
+						<g transform="translate(9715, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableStyle">
+								<text x="168.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableStyle">StandardTableStyle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46300, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnderConstruction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnderConstruction">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnderConstruction">+Widget build()</text>
+						<g transform="translate(9715, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableStyle">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableStyle">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+values: List&lt;StandardTableStyle&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+plain: StandardTableStyle</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+material: StandardTableStyle</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationDispatcher">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDispatcher">
-							<rect x="18937.0" y="2504.0" height="122.0" width="325.0" data-name="NotificationDispatcher"></rect>
-							<path d="M18937.0 2535.0 L19262.0 2535.0" fill="none" data-name="NotificationDispatcher"></path>
+					<g data-name="IconPack">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPack">
+							<rect x="35426.8" y="82.5" height="108.0" width="359.0" data-name="IconPack"></rect>
+							<path d="M35426.8 113.5 L35785.8 113.5" fill="none" data-name="IconPack"></path>
+							<path d="M35426.8 159.5 L35785.8 159.5" fill="none" data-name="IconPack"></path>
 						</g>
-						<g transform="translate(18937, 2504)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDispatcher">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDispatcher">
-								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDispatcher">NotificationDispatcher</text>
+						<g transform="translate(35426.75, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPack">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPack">
+								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPack">IconPack</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18937, 2535)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDispatcher">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDispatcher">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDispatcher">+child: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationDispatcher">+snackbarInnerPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationDispatcher">+snackbarWidth: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationDispatcher">+snackbarBehavior: SnackBarBehavior</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationDispatcher">+snackbarDefaultDuration: int</text>
+						<g transform="translate(35426.75, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+defaultPack: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPack">&lt;static&gt;+material: List&lt;IconOption&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SnackBarBehavior">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SnackBarBehavior">
-							<rect x="19632.0" y="3365.0" height="31.0" width="162.0" data-name="SnackBarBehavior"></rect>
-						</g>
-						<g transform="translate(19632, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackBarBehavior">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackBarBehavior">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackBarBehavior">SnackBarBehavior</text>
+						<g transform="translate(35426.75, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+IconOption? resolveIconByName()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationIntent">
-							<rect x="19302.0" y="2488.5" height="153.0" width="288.0" data-name="NotificationIntent"></rect>
-							<path d="M19302.0 2519.5 L19590.0 2519.5" fill="none" data-name="NotificationIntent"></path>
-							<path d="M19302.0 2610.5 L19590.0 2610.5" fill="none" data-name="NotificationIntent"></path>
+					<g data-name="IconOption">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconOption">
+							<rect x="23183.8" y="2488.5" height="153.0" width="264.0" data-name="IconOption"></rect>
+							<path d="M23183.8 2519.5 L23447.8 2519.5" fill="none" data-name="IconOption"></path>
+							<path d="M23183.8 2595.5 L23447.8 2595.5" fill="none" data-name="IconOption"></path>
 						</g>
-						<g transform="translate(19302, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationIntent">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationIntent">NotificationIntent</text>
+						<g transform="translate(23183.75, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconOption">
+								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="IconOption">IconOption</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19302, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+message: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationIntent">+customContent: Widget?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationIntent">+icon: IconData?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationIntent">+actions: List&lt;NotificationAction&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationIntent">+type: NotificationType</text>
+						<g transform="translate(23183.75, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+name: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconOption">+isEmpty: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IconOption">+props: List&lt;Object?&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19302, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+void register()</text>
+						<g transform="translate(23183.75, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+String toJson()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">&lt;static&gt;+IconOption fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationType">
-							<rect x="8070.5" y="3319.5" height="122.0" width="325.0" data-name="NotificationType"></rect>
-							<path d="M8070.5 3350.5 L8395.5 3350.5" fill="none" data-name="NotificationType"></path>
-						</g>
-						<g transform="translate(8070.5, 3319.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationType">
-								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationType">NotificationType</text>
-								
-							</g>
+					<g data-name="Equatable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
+							<rect x="22591.8" y="1682.0" height="31.0" width="96.0" data-name="Equatable"></rect>
 						</g>
-						<g transform="translate(8070.5, 3350.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationType">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationType">&lt;static&gt;+values: List&lt;NotificationType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationType">&lt;static&gt;+snackbar: NotificationType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationType">&lt;static&gt;+alert: NotificationType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationType">&lt;static&gt;+custom: NotificationType</text>
+						<g transform="translate(22591.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
+								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationAction">
-							<rect x="21071.5" y="3677.5" height="92.0" width="256.0" data-name="NotificationAction"></rect>
-							<path d="M21071.5 3708.5 L21327.5 3708.5" fill="none" data-name="NotificationAction"></path>
+					<g data-name="ReactiveIconPicker">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveIconPicker">
+							<rect x="35004.3" y="614.0" height="31.0" width="168.0" data-name="ReactiveIconPicker"></rect>
 						</g>
-						<g transform="translate(21071.5, 3677.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationAction">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationAction">NotificationAction</text>
+						<g transform="translate(35004.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveIconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveIconPicker">
+								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveIconPicker">ReactiveIconPicker</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21071.5, 3708.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationAction">+label: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationAction">+onSelect: dynamic Function()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationAction">+isDestructive: bool</text>
+					</g>
+					<g data-name="ReactiveFocusableFormField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFocusableFormField">
+							<rect x="34965.8" y="121.0" height="31.0" width="245.0" data-name="ReactiveFocusableFormField"></rect>
+						</g>
+						<g transform="translate(34965.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFocusableFormField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFocusableFormField">
+								<text x="114.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFocusableFormField">ReactiveFocusableFormField</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="21116.0" y="3998.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
+					<g data-name="IconPicker">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPicker">
+							<rect x="23268.8" y="1606.0" height="183.0" width="319.0" data-name="IconPicker"></rect>
+							<path d="M23268.8 1637.0 L23587.8 1637.0" fill="none" data-name="IconPicker"></path>
+							<path d="M23268.8 1758.0 L23587.8 1758.0" fill="none" data-name="IconPicker"></path>
 						</g>
-						<g transform="translate(21116, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
+						<g transform="translate(23268.75, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPicker">
+								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPicker">IconPicker</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SnackbarIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SnackbarIntent">
-							<rect x="20040.0" y="3349.5" height="62.0" width="136.0" data-name="SnackbarIntent"></rect>
-							<path d="M20040.0 3380.5 L20176.0 3380.5" fill="none" data-name="SnackbarIntent"></path>
-						</g>
-						<g transform="translate(20040, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackbarIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackbarIntent">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackbarIntent">SnackbarIntent</text>
+						<g transform="translate(23268.75, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+iconOptions: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPicker">+selectedOption: IconOption?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconPicker">+onSelect: void Function(IconOption)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IconPicker">+galleryIconSize: double?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IconPicker">+selectedIconSize: double?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IconPicker">+focusNode: FocusNode?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="IconPicker">+isDisabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20040, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SnackbarIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SnackbarIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="SnackbarIntent">+duration: int?</text>
+						<g transform="translate(23268.75, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AlertIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AlertIntent">
-							<rect x="20607.0" y="3334.5" height="92.0" width="204.0" data-name="AlertIntent"></rect>
-							<path d="M20607.0 3365.5 L20811.0 3365.5" fill="none" data-name="AlertIntent"></path>
+					<g data-name="void Function(IconOption)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(IconOption)?">
+							<rect x="23700.3" y="2549.5" height="31.0" width="230.0" data-name="void Function(IconOption)?"></rect>
 						</g>
-						<g transform="translate(20607, 3334.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AlertIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AlertIntent">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="AlertIntent">AlertIntent</text>
+						<g transform="translate(23700.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(IconOption)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(IconOption)?">
+								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(IconOption)?">void Function(IconOption)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20607, 3365.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AlertIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AlertIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="AlertIntent">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AlertIntent">+dismissOnAction: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AlertIntent">+isDestructive: dynamic</text>
+					</g>
+					<g data-name="FocusNode">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FocusNode">
+							<rect x="23534.8" y="2549.5" height="31.0" width="106.0" data-name="FocusNode"></rect>
+						</g>
+						<g transform="translate(23534.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FocusNode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FocusNode">
+								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="FocusNode">FocusNode</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="INotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="56950.0" y="3327.0" height="107.0" width="395.0" data-name="INotificationService"></rect>
-							<path d="M56950.0 3358.0 L57345.0 3358.0" fill="none" data-name="INotificationService"></path>
+					<g data-name="IconPickerField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerField">
+							<rect x="23627.8" y="1606.0" height="183.0" width="319.0" data-name="IconPickerField"></rect>
+							<path d="M23627.8 1637.0 L23946.8 1637.0" fill="none" data-name="IconPickerField"></path>
+							<path d="M23627.8 1758.0 L23946.8 1758.0" fill="none" data-name="IconPickerField"></path>
 						</g>
-						<g transform="translate(56950, 3327)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
-								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
+						<g transform="translate(23627.75, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerField">
+								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerField">IconPickerField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56950, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="INotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="INotificationService">+void showMessage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="INotificationService">+void show()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="INotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="INotificationService">+void dispose()</text>
+						<g transform="translate(23627.75, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+iconOptions: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerField">+selectedOption: IconOption?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerField">+selectedIconSize: double?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IconPickerField">+galleryIconSize: double?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IconPickerField">+onSelect: void Function(IconOption)?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IconPickerField">+focusNode: FocusNode?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="IconPickerField">+isDisabled: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(23627.75, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationService">
-							<rect x="56920.0" y="3654.5" height="138.0" width="455.0" data-name="NotificationService"></rect>
-							<path d="M56920.0 3685.5 L57375.0 3685.5" fill="none" data-name="NotificationService"></path>
-							<path d="M56920.0 3716.5 L57375.0 3716.5" fill="none" data-name="NotificationService"></path>
+					<g data-name="IconPickerGallery">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerGallery">
+							<rect x="23986.8" y="1636.0" height="123.0" width="319.0" data-name="IconPickerGallery"></rect>
+							<path d="M23986.8 1667.0 L24305.8 1667.0" fill="none" data-name="IconPickerGallery"></path>
+							<path d="M23986.8 1728.0 L24305.8 1728.0" fill="none" data-name="IconPickerGallery"></path>
 						</g>
-						<g transform="translate(56920, 3654.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationService">
-								<text x="219.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationService">NotificationService</text>
+						<g transform="translate(23986.75, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerGallery">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerGallery">
+								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerGallery">IconPickerGallery</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56920, 3685.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">-_streamController: BehaviorSubject&lt;NotificationIntent&gt;</text>
+						<g transform="translate(23986.75, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+iconOptions: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerGallery">+onSelect: void Function(IconOption)?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerGallery">+iconSize: double</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56920, 3716.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationService">+void showMessage()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationService">+void show()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationService">+void dispose()</text>
+						<g transform="translate(23986.75, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BehaviorSubject">
-							<rect x="66403.8" y="3998.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
+					<g data-name="SecondaryButton">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SecondaryButton">
+							<rect x="19724.5" y="2496.0" height="138.0" width="249.0" data-name="SecondaryButton"></rect>
+							<path d="M19724.5 2527.0 L19973.5 2527.0" fill="none" data-name="SecondaryButton"></path>
+							<path d="M19724.5 2603.0 L19973.5 2603.0" fill="none" data-name="SecondaryButton"></path>
 						</g>
-						<g transform="translate(66403.75, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BehaviorSubject">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="BehaviorSubject">BehaviorSubject</text>
+						<g transform="translate(19724.5, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecondaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecondaryButton">
+								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecondaryButton">SecondaryButton</text>
+								
+							</g>
+						</g>
+						<g transform="translate(19724.5, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+text: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SecondaryButton">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SecondaryButton">+isLoading: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SecondaryButton">+onPressed: void Function()?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(19724.5, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Notifications">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Notifications">
-							<rect x="19630.0" y="2481.5" height="167.0" width="407.0" data-name="Notifications"></rect>
-							<path d="M19630.0 2512.5 L20037.0 2512.5" fill="none" data-name="Notifications"></path>
+					<g data-name="TwoColumnLayout">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TwoColumnLayout">
+							<rect x="20027.3" y="2406.5" height="317.0" width="368.0" data-name="TwoColumnLayout"></rect>
+							<path d="M20027.3 2437.5 L20395.3 2437.5" fill="none" data-name="TwoColumnLayout"></path>
 						</g>
-						<g transform="translate(19630, 2481.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Notifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notifications">
-								<text x="195.5" y="13.5" stroke="none" text-anchor="middle" data-name="Notifications">Notifications</text>
+						<g transform="translate(20027.25, 2406.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TwoColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TwoColumnLayout">
+								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="TwoColumnLayout">TwoColumnLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19630, 2512.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Notifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Notifications">
-								<text x="0.0" y="13.5" stroke="none" data-name="Notifications">&lt;static&gt;+credentialsInvalid: SnackbarIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Notifications">&lt;static&gt;+userAlreadyRegistered: SnackbarIntent</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordReset: SnackbarIntent</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordResetSuccess: SnackbarIntent</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleted: SnackbarIntent</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeDeleted: SnackbarIntent</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeClipped: SnackbarIntent</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleteConfirmation: AlertIntent</text>
+						<g transform="translate(20027.25, 2437.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TwoColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TwoColumnLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultDivider: VerticalDivider</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultContentPadding: EdgeInsets</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+slimContentPadding: EdgeInsets</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TwoColumnLayout">+leftWidget: Widget</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TwoColumnLayout">+rightWidget: Widget</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TwoColumnLayout">+dividerWidget: Widget?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="TwoColumnLayout">+headerWidget: Widget?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="TwoColumnLayout">+flexLeft: int?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="TwoColumnLayout">+flexRight: int?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="TwoColumnLayout">+constraintsLeft: BoxConstraints?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="TwoColumnLayout">+constraintsRight: BoxConstraints?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="TwoColumnLayout">+scrollLeft: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="TwoColumnLayout">+scrollRight: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="TwoColumnLayout">+paddingLeft: EdgeInsets?</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="TwoColumnLayout">+paddingRight: EdgeInsets?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorLeft: Color?</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorRight: Color?</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="TwoColumnLayout">+stretchHeight: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationDefaultActions">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDefaultActions">
-							<rect x="21056.0" y="3349.5" height="62.0" width="287.0" data-name="NotificationDefaultActions"></rect>
-							<path d="M21056.0 3380.5 L21343.0 3380.5" fill="none" data-name="NotificationDefaultActions"></path>
-						</g>
-						<g transform="translate(21056, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDefaultActions">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDefaultActions">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDefaultActions">NotificationDefaultActions</text>
-								
-							</g>
+					<g data-name="VerticalDivider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="VerticalDivider">
+							<rect x="21375.5" y="3365.0" height="31.0" width="130.0" data-name="VerticalDivider"></rect>
 						</g>
-						<g transform="translate(21056, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDefaultActions">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDefaultActions">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDefaultActions">&lt;static&gt;+cancel: NotificationAction</text>
+						<g transform="translate(21375.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VerticalDivider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VerticalDivider">
+								<text x="57.0" y="13.5" stroke="none" text-anchor="middle" data-name="VerticalDivider">VerticalDivider</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IClipboardService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IClipboardService">
-							<rect x="32559.0" y="105.5" height="62.0" width="156.0" data-name="IClipboardService"></rect>
-							<path d="M32559.0 136.5 L32715.0 136.5" fill="none" data-name="IClipboardService"></path>
+					<g data-name="AppTranslation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppTranslation">
+							<rect x="36104.8" y="105.5" height="62.0" width="194.0" data-name="AppTranslation"></rect>
+							<path d="M36104.8 136.5 L36298.8 136.5" fill="none" data-name="AppTranslation"></path>
 						</g>
-						<g transform="translate(32559, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IClipboardService">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="IClipboardService">IClipboardService</text>
+						<g transform="translate(36104.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppTranslation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppTranslation">
+								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppTranslation">AppTranslation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32559, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IClipboardService">
-								<text x="0.0" y="13.5" stroke="none" data-name="IClipboardService">+dynamic copy()</text>
+						<g transform="translate(36104.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppTranslation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppTranslation">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppTranslation">&lt;static&gt;+dynamic init()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ClipboardService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ClipboardService">
-							<rect x="32561.5" y="598.5" height="62.0" width="151.0" data-name="ClipboardService"></rect>
-							<path d="M32561.5 629.5 L32712.5 629.5" fill="none" data-name="ClipboardService"></path>
+					<g data-name="PlatformLocale">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocale">
+							<rect x="35825.8" y="105.5" height="62.0" width="239.0" data-name="PlatformLocale"></rect>
+							<path d="M35825.8 136.5 L36064.8 136.5" fill="none" data-name="PlatformLocale"></path>
 						</g>
-						<g transform="translate(32561.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ClipboardService">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="ClipboardService">ClipboardService</text>
+						<g transform="translate(35825.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformLocale">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocale">
+								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocale">PlatformLocale</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32561.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ClipboardService">
-								<text x="0.0" y="13.5" stroke="none" data-name="ClipboardService">+dynamic copy()</text>
+						<g transform="translate(35825.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocale">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocale">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocale">+Locale getPlatformLocale()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Assets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Assets">
-							<rect x="57535.3" y="105.5" height="62.0" width="218.0" data-name="Assets"></rect>
-							<path d="M57535.3 136.5 L57753.3 136.5" fill="none" data-name="Assets"></path>
+					<g data-name="PlatformLocaleWeb">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleWeb">
+							<rect x="35519.0" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleWeb"></rect>
+							<path d="M35519.0 629.5 L35758.0 629.5" fill="none" data-name="PlatformLocaleWeb"></path>
 						</g>
-						<g transform="translate(57535.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Assets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Assets">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="Assets">Assets</text>
+						<g transform="translate(35519, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleWeb">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleWeb">
+								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleWeb">PlatformLocaleWeb</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57535.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Assets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Assets">
-								<text x="0.0" y="13.5" stroke="none" data-name="Assets">&lt;static&gt;+logoWide: String</text>
+						<g transform="translate(35519, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleWeb">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleWeb">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleWeb">+Locale getPlatformLocale()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SignupForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
-							<rect x="10389.5" y="2503.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
-							<path d="M10389.5 2534.5 L10667.5 2534.5" fill="none" data-name="SignupForm"></path>
-							<path d="M10389.5 2565.5 L10667.5 2565.5" fill="none" data-name="SignupForm"></path>
-						</g>
-						<g transform="translate(10389.5, 2503.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
-								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
-								
-							</g>
+					<g data-name="PlatformLocaleMobile">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleMobile">
+							<rect x="35998.0" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleMobile"></rect>
+							<path d="M35998.0 629.5 L36237.0 629.5" fill="none" data-name="PlatformLocaleMobile"></path>
 						</g>
-						<g transform="translate(10389.5, 2534.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
+						<g transform="translate(35998, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleMobile">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleMobile">
+								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleMobile">PlatformLocaleMobile</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10389.5, 2565.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
+						<g transform="translate(35998, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleMobile">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleMobile">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleMobile">+Locale getPlatformLocale()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthFormKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
-							<rect x="17372.3" y="3297.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
-							<path d="M17372.3 3328.0 L17727.3 3328.0" fill="none" data-name="AuthFormKey"></path>
+					<g data-name="LanguagePicker">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePicker">
+							<rect x="20797.0" y="2519.0" height="92.0" width="366.0" data-name="LanguagePicker"></rect>
+							<path d="M20797.0 2550.0 L21163.0 2550.0" fill="none" data-name="LanguagePicker"></path>
 						</g>
-						<g transform="translate(17372.25, 3297)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
-								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
+						<g transform="translate(20797, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePicker">
+								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePicker">LanguagePicker</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17372.25, 3328)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
+						<g transform="translate(20797, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePicker">
+								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePicker">+languagePickerType: LanguagePickerType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePicker">+iconColor: Color?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePicker">+offset: Offset?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthFormController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
-							<rect x="63332.3" y="2263.5" height="603.0" width="850.0" data-name="AuthFormController"></rect>
-							<path d="M63332.3 2294.5 L64182.3 2294.5" fill="none" data-name="AuthFormController"></path>
-							<path d="M63332.3 2595.5 L64182.3 2595.5" fill="none" data-name="AuthFormController"></path>
-						</g>
-						<g transform="translate(63332.25, 2263.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
-								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
-								
-							</g>
+					<g data-name="LanguagePickerType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePickerType">
+							<rect x="9259.0" y="3327.0" height="107.0" width="366.0" data-name="LanguagePickerType"></rect>
+							<path d="M9259.0 3358.0 L9625.0 3358.0" fill="none" data-name="LanguagePickerType"></path>
 						</g>
-						<g transform="translate(63332.25, 2294.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+sharedPreferences: SharedPreferences</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">+rememberMeControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="AuthFormController">+shouldRemember: bool</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
+						<g transform="translate(9259, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePickerType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePickerType">
+								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePickerType">LanguagePickerType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63332.25, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">-void _setRememberMe()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">-void _delRememberMe()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="AuthFormController">-void _initRememberMe()</text>
+						<g transform="translate(9259, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePickerType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePickerType">
+								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePickerType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+values: List&lt;LanguagePickerType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+field: LanguagePickerType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+icon: LanguagePickerType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="63587.0" y="3900.0" height="228.0" width="295.0" data-name="IAuthRepository"></rect>
-							<path d="M63587.0 3931.0 L63882.0 3931.0" fill="none" data-name="IAuthRepository"></path>
-							<path d="M63587.0 4022.0 L63882.0 4022.0" fill="none" data-name="IAuthRepository"></path>
+					<g data-name="Offset">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Offset">
+							<rect x="25900.8" y="3365.0" height="31.0" width="63.0" data-name="Offset"></rect>
 						</g>
-						<g transform="translate(63587, 3900)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
+						<g transform="translate(25900.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Offset">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Offset">
+								<text x="23.5" y="13.5" stroke="none" text-anchor="middle" data-name="Offset">Offset</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63587, 3931)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+allowPasswordReset: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+currentUser: User?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+isLoggedIn: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+session: Session?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+serializedSession: String?</text>
+					</g>
+					<g data-name="GoRouteParamEnum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouteParamEnum">
+							<rect x="36690.8" y="98.0" height="77.0" width="202.0" data-name="GoRouteParamEnum"></rect>
+							<path d="M36690.8 129.0 L36892.8 129.0" fill="none" data-name="GoRouteParamEnum"></path>
+						</g>
+						<g transform="translate(36690.75, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GoRouteParamEnum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouteParamEnum">
+								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouteParamEnum">GoRouteParamEnum</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63587, 4022)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+dynamic signUp()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+dynamic signInWith()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+dynamic signOut()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+dynamic updateUser()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IAuthRepository">+void dispose()</text>
+						<g transform="translate(36690.75, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouteParamEnum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouteParamEnum">
+								<text x="0.0" y="13.5" stroke="none" data-name="GoRouteParamEnum">+String toRouteParam()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="GoRouteParamEnum">+String toShortString()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SharedPreferences">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SharedPreferences">
-							<rect x="62997.0" y="4541.0" height="31.0" width="169.0" data-name="SharedPreferences"></rect>
+					<g data-name="RoutingIntents">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntents">
+							<rect x="29357.3" y="1479.0" height="437.0" width="572.0" data-name="RoutingIntents"></rect>
+							<path d="M29357.3 1510.0 L29929.3 1510.0" fill="none" data-name="RoutingIntents"></path>
 						</g>
-						<g transform="translate(62997, 4541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SharedPreferences">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SharedPreferences">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="SharedPreferences">SharedPreferences</text>
+						<g transform="translate(29357.25, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntents">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntents">
+								<text x="278.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntents">RoutingIntents</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="64690.3" y="3365.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(64690.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+						<g transform="translate(29357.25, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntents">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntents">
+								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+root: RoutingIntent</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studies: RoutingIntent</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studiesShared: RoutingIntent</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+publicRegistry: RoutingIntent</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+study: RoutingIntent Function(String)</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEdit: RoutingIntent Function(String)</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInfo: RoutingIntent Function(String)</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String)</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInterventions: RoutingIntent Function(String)</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String)</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String)</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditReports: RoutingIntent Function(String)</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String)</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute})</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyRecruit: RoutingIntent Function(String)</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyMonitor: RoutingIntent Function(String)</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyAnalyze: RoutingIntent Function(String)</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studySettings: RoutingIntent Function(String)</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+accountSettings: RoutingIntent</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyNew: RoutingIntent</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+login: RoutingIntent</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+signup: RoutingIntent</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot: RoutingIntent</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot2: RoutingIntent Function(String)</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordRecovery: RoutingIntent</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+error: RoutingIntent Function(Exception)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="66253.5" y="3365.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
+					<g data-name="RoutingIntent Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String)">
+							<rect x="24366.3" y="2549.5" height="31.0" width="253.0" data-name="RoutingIntent Function(String)"></rect>
 						</g>
-						<g transform="translate(66253.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+						<g transform="translate(24366.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String)">
+								<text x="118.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String)">RoutingIntent Function(String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormGroupController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="66424.5" y="105.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
-							<path d="M66424.5 136.5 L66611.5 136.5" fill="none" data-name="IFormGroupController"></path>
-						</g>
-						<g transform="translate(66424.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
-								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
-								
-							</g>
+					<g data-name="RoutingIntent Function(String, String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, String)">
+							<rect x="24659.3" y="2549.5" height="31.0" width="309.0" data-name="RoutingIntent Function(String, String)"></rect>
 						</g>
-						<g transform="translate(66424.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
+						<g transform="translate(24659.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, String)">
+								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, String)">RoutingIntent Function(String, String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PasswordForgotForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
-							<rect x="10707.5" y="2518.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
-							<path d="M10707.5 2549.5 L10914.5 2549.5" fill="none" data-name="PasswordForgotForm"></path>
-							<path d="M10707.5 2580.5 L10914.5 2580.5" fill="none" data-name="PasswordForgotForm"></path>
+					<g data-name="RoutingIntent Function(String, {String? appRoute})">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, {String? appRoute})">
+							<rect x="25008.3" y="2549.5" height="31.0" width="413.0" data-name="RoutingIntent Function(String, {String? appRoute})"></rect>
 						</g>
-						<g transform="translate(10707.5, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
+						<g transform="translate(25008.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, {String? appRoute})">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, {String? appRoute})">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, {String? appRoute})">RoutingIntent Function(String, {String? appRoute})</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10707.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
+					</g>
+					<g data-name="RoutingIntent Function(Exception)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(Exception)">
+							<rect x="25461.3" y="2549.5" height="31.0" width="285.0" data-name="RoutingIntent Function(Exception)"></rect>
+						</g>
+						<g transform="translate(25461.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(Exception)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(Exception)">
+								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(Exception)">RoutingIntent Function(Exception)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10707.5, 2580.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
+					</g>
+					<g data-name="GoRoute">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRoute">
+							<rect x="45402.3" y="3365.0" height="31.0" width="86.0" data-name="GoRoute"></rect>
+						</g>
+						<g transform="translate(45402.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRoute">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRoute">
+								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRoute">GoRoute</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EmailTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
-							<rect x="20534.8" y="2511.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
-							<path d="M20534.8 2542.5 L20855.8 2542.5" fill="none" data-name="EmailTextField"></path>
+					<g data-name="RoutingIntentDispatch">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntentDispatch">
+							<rect x="13088.0" y="3327.0" height="107.0" width="373.0" data-name="RoutingIntentDispatch"></rect>
+							<path d="M13088.0 3358.0 L13461.0 3358.0" fill="none" data-name="RoutingIntentDispatch"></path>
 						</g>
-						<g transform="translate(20534.75, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
+						<g transform="translate(13088, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntentDispatch">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntentDispatch">
+								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntentDispatch">RoutingIntentDispatch</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20534.75, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
+						<g transform="translate(13088, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntentDispatch">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntentDispatch">
+								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntentDispatch">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+go: RoutingIntentDispatch</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+push: RoutingIntentDispatch</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PasswordTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
-							<rect x="20895.8" y="2504.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
-							<path d="M20895.8 2535.0 L21374.8 2535.0" fill="none" data-name="PasswordTextField"></path>
+					<g data-name="RouterKeys">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouterKeys">
+							<rect x="36338.8" y="98.0" height="77.0" width="312.0" data-name="RouterKeys"></rect>
+							<path d="M36338.8 129.0 L36650.8 129.0" fill="none" data-name="RouterKeys"></path>
 						</g>
-						<g transform="translate(20895.75, 2504)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
+						<g transform="translate(36338.75, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterKeys">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterKeys">
+								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterKeys">RouterKeys</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20895.75, 2535)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
+						<g transform="translate(36338.75, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterKeys">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterKeys">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+studyKey: ValueKey&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+authKey: ValueKey&lt;String&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<rect x="24703.3" y="3365.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
+					<g data-name="ValueKey">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ValueKey">
+							<rect x="36449.3" y="614.0" height="31.0" width="91.0" data-name="ValueKey"></rect>
 						</g>
-						<g transform="translate(24703.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
+						<g transform="translate(36449.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueKey">
+								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueKey">ValueKey</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PasswordRecoveryForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
-							<rect x="13577.8" y="2518.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
-							<path d="M13577.8 2549.5 L13785.8 2549.5" fill="none" data-name="PasswordRecoveryForm"></path>
-							<path d="M13577.8 2580.5 L13785.8 2580.5" fill="none" data-name="PasswordRecoveryForm"></path>
-						</g>
-						<g transform="translate(13577.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
-								
-							</g>
+					<g data-name="RouteParams">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouteParams">
+							<rect x="37105.8" y="75.5" height="122.0" width="267.0" data-name="RouteParams"></rect>
+							<path d="M37105.8 106.5 L37372.8 106.5" fill="none" data-name="RouteParams"></path>
 						</g>
-						<g transform="translate(13577.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
+						<g transform="translate(37105.75, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteParams">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteParams">
+								<text x="125.5" y="13.5" stroke="none" text-anchor="middle" data-name="RouteParams">RouteParams</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13577.75, 2580.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
+						<g transform="translate(37105.75, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteParams">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteParams">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studiesFilter: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RouteParams">&lt;static&gt;+measurementId: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RouteParams">&lt;static&gt;+interventionId: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="RouteParams">&lt;static&gt;+testAppRoute: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
-							<rect x="21454.8" y="2504.0" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
-							<path d="M21454.8 2535.0 L21713.8 2535.0" fill="none" data-name="AuthScaffold"></path>
-						</g>
-						<g transform="translate(21454.75, 2504)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
-								
-							</g>
+					<g data-name="RouterConf">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouterConf">
+							<rect x="21752.8" y="2496.0" height="138.0" width="326.0" data-name="RouterConf"></rect>
+							<path d="M21752.8 2527.0 L22078.8 2527.0" fill="none" data-name="RouterConf"></path>
+							<path d="M21752.8 2603.0 L22078.8 2603.0" fill="none" data-name="RouterConf"></path>
 						</g>
-						<g transform="translate(21454.75, 2535)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
+						<g transform="translate(21752.75, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterConf">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterConf">
+								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterConf">RouterConf</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyUJobsToBeDone">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
-							<rect x="58671.3" y="105.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
-							<path d="M58671.3 136.5 L58865.3 136.5" fill="none" data-name="StudyUJobsToBeDone"></path>
-						</g>
-						<g transform="translate(58671.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
+						<g transform="translate(21752.75, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+router: GoRouter</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouterConf">&lt;static&gt;+routes: List&lt;GoRoute&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RouterConf">&lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RouterConf">&lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58671.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
+						<g transform="translate(21752.75, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+GoRoute route()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LoginForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
-							<rect x="13825.8" y="2518.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
-							<path d="M13825.8 2549.5 L14032.8 2549.5" fill="none" data-name="LoginForm"></path>
-							<path d="M13825.8 2580.5 L14032.8 2580.5" fill="none" data-name="LoginForm"></path>
+					<g data-name="GoRouter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
+							<rect x="67699.5" y="3365.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
 						</g>
-						<g transform="translate(13825.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
+						<g transform="translate(67699.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
+								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13825.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
+					</g>
+					<g data-name="StudyFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
+							<rect x="54040.0" y="1666.5" height="62.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
+							<path d="M54040.0 1697.5 L54224.0 1697.5" fill="none" data-name="StudyFormRouteArgs"></path>
+						</g>
+						<g transform="translate(54040, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
+								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13825.75, 2580.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
+						<g transform="translate(54040, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormRouteArgs">+studyId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IAppDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
-							<rect x="10166.3" y="3692.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
-							<path d="M10166.3 3723.5 L10363.3 3723.5" fill="none" data-name="IAppDelegate"></path>
+					<g data-name="QuestionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormRouteArgs">
+							<rect x="53232.0" y="2534.0" height="62.0" width="210.0" data-name="QuestionFormRouteArgs"></rect>
+							<path d="M53232.0 2565.0 L53442.0 2565.0" fill="none" data-name="QuestionFormRouteArgs"></path>
 						</g>
-						<g transform="translate(10166.25, 3692.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
+						<g transform="translate(53232, 2534)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormRouteArgs">
+								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormRouteArgs">QuestionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10166.25, 3723.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
+						<g transform="translate(53232, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormRouteArgs">+questionId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
-							<rect x="61419.5" y="4258.0" height="153.0" width="340.0" data-name="AppController"></rect>
-							<path d="M61419.5 4289.0 L61759.5 4289.0" fill="none" data-name="AppController"></path>
-							<path d="M61419.5 4365.0 L61759.5 4365.0" fill="none" data-name="AppController"></path>
+					<g data-name="ScreenerQuestionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormRouteArgs">
+							<rect x="55705.5" y="3365.0" height="31.0" width="282.0" data-name="ScreenerQuestionFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(61419.5, 4258)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
-								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
+						<g transform="translate(55705.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormRouteArgs">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormRouteArgs">ScreenerQuestionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61419.5, 4289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+sharedPreferences: SharedPreferences</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
+					</g>
+					<g data-name="ConsentItemFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormRouteArgs">
+							<rect x="53482.0" y="2534.0" height="62.0" width="239.0" data-name="ConsentItemFormRouteArgs"></rect>
+							<path d="M53482.0 2565.0 L53721.0 2565.0" fill="none" data-name="ConsentItemFormRouteArgs"></path>
+						</g>
+						<g transform="translate(53482, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormRouteArgs">
+								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormRouteArgs">ConsentItemFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61419.5, 4365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
+						<g transform="translate(53482, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormRouteArgs">+consentId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="App">
-						<g fill="#eee8d5" stroke="#33322E" data-name="App">
-							<rect x="58905.3" y="121.0" height="31.0" width="47.0" data-name="App"></rect>
+					<g data-name="MeasurementFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
+							<rect x="40680.0" y="2534.0" height="62.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
+							<path d="M40680.0 2565.0 L40927.0 2565.0" fill="none" data-name="MeasurementFormRouteArgs"></path>
 						</g>
-						<g transform="translate(58905.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
-								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
+						<g transform="translate(40680, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
+								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AppContent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
-							<rect x="58992.3" y="121.0" height="31.0" width="109.0" data-name="AppContent"></rect>
-						</g>
-						<g transform="translate(58992.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
+						<g transform="translate(40680, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementFormRouteArgs">+measurementId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
-							<rect x="247.3" y="3327.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
-							<path d="M247.3 3358.0 L526.3 3358.0" fill="none" data-name="AppStatus"></path>
+					<g data-name="SurveyQuestionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormRouteArgs">
+							<rect x="50832.3" y="3349.5" height="62.0" width="265.0" data-name="SurveyQuestionFormRouteArgs"></rect>
+							<path d="M50832.3 3380.5 L51097.3 3380.5" fill="none" data-name="SurveyQuestionFormRouteArgs"></path>
 						</g>
-						<g transform="translate(247.25, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
+						<g transform="translate(50832.25, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormRouteArgs">
+								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormRouteArgs">SurveyQuestionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(247.25, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
+						<g transform="translate(50832.25, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormRouteArgs">+questionId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyAnalyzeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
-							<rect x="23896.0" y="2526.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
-							<path d="M23896.0 2557.5 L24076.0 2557.5" fill="none" data-name="StudyAnalyzeScreen"></path>
+					<g data-name="InterventionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
+							<rect x="38070.3" y="2534.0" height="62.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
+							<path d="M38070.3 2565.0 L38303.3 2565.0" fill="none" data-name="InterventionFormRouteArgs"></path>
 						</g>
-						<g transform="translate(23896, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
+						<g transform="translate(38070.25, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23896, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
+						<g transform="translate(38070.25, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormRouteArgs">+interventionId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="27951.0" y="1651.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
-							<path d="M27951.0 1682.0 L28115.0 1682.0" fill="none" data-name="StudyPageWidget"></path>
-							<path d="M27951.0 1713.0 L28115.0 1713.0" fill="none" data-name="StudyPageWidget"></path>
-						</g>
-						<g transform="translate(27951, 1651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
+					<g data-name="InterventionTaskFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormRouteArgs">
+							<rect x="46410.0" y="3349.5" height="62.0" width="271.0" data-name="InterventionTaskFormRouteArgs"></rect>
+							<path d="M46410.0 3380.5 L46681.0 3380.5" fill="none" data-name="InterventionTaskFormRouteArgs"></path>
 						</g>
-						<g transform="translate(27951, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
+						<g transform="translate(46410, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormRouteArgs">
+								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormRouteArgs">InterventionTaskFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27951, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
+						<g transform="translate(46410, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormRouteArgs">+taskId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyAnalyzeController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
-							<rect x="32446.5" y="1181.5" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
-							<path d="M32446.5 1212.5 L32647.5 1212.5" fill="none" data-name="StudyAnalyzeController"></path>
+					<g data-name="ReportItemFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormRouteArgs">
+							<rect x="56145.3" y="2534.0" height="62.0" width="226.0" data-name="ReportItemFormRouteArgs"></rect>
+							<path d="M56145.3 2565.0 L56371.3 2565.0" fill="none" data-name="ReportItemFormRouteArgs"></path>
 						</g>
-						<g transform="translate(32446.5, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
-								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
+						<g transform="translate(56145.25, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormRouteArgs">
+								<text x="105.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormRouteArgs">ReportItemFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32446.5, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
+						<g transform="translate(56145.25, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormRouteArgs">+sectionId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyBaseController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="54197.3" y="538.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
-							<path d="M54197.3 569.0 L54743.3 569.0" fill="none" data-name="StudyBaseController"></path>
-							<path d="M54197.3 645.0 L54743.3 645.0" fill="none" data-name="StudyBaseController"></path>
-						</g>
-						<g transform="translate(54197.25, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
-								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
-								
-							</g>
+					<g data-name="DropdownMenuItemTheme">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DropdownMenuItemTheme">
+							<rect x="36870.3" y="598.5" height="62.0" width="258.0" data-name="DropdownMenuItemTheme"></rect>
+							<path d="M36870.3 629.5 L37128.3 629.5" fill="none" data-name="DropdownMenuItemTheme"></path>
 						</g>
-						<g transform="translate(54197.25, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
+						<g transform="translate(36870.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DropdownMenuItemTheme">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DropdownMenuItemTheme">
+								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="DropdownMenuItemTheme">DropdownMenuItemTheme</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54197.25, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
+						<g transform="translate(36870.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DropdownMenuItemTheme">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DropdownMenuItemTheme">
+								<text x="0.0" y="13.5" stroke="none" data-name="DropdownMenuItemTheme">+iconTheme: IconThemeData?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyParticipationBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
-							<rect x="22887.0" y="2496.0" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
-							<path d="M22887.0 2527.0 L23118.0 2527.0" fill="none" data-name="StudyParticipationBadge"></path>
-							<path d="M22887.0 2603.0 L23118.0 2603.0" fill="none" data-name="StudyParticipationBadge"></path>
+					<g data-name="IconThemeData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconThemeData">
+							<rect x="36928.8" y="1197.0" height="31.0" width="141.0" data-name="IconThemeData"></rect>
 						</g>
-						<g transform="translate(22887, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
+						<g transform="translate(36928.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconThemeData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconThemeData">
+								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconThemeData">IconThemeData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22887, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
-								
-							</g>
+					</g>
+					<g data-name="Diagnosticable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Diagnosticable">
+							<rect x="36932.8" y="121.0" height="31.0" width="133.0" data-name="Diagnosticable"></rect>
 						</g>
-						<g transform="translate(22887, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
+						<g transform="translate(36932.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Diagnosticable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Diagnosticable">
+								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="Diagnosticable">Diagnosticable</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="30816.8" y="3365.0" height="31.0" width="114.0" data-name="Participation"></rect>
+					<g data-name="ThemeConfig">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeConfig">
+							<rect x="37705.0" y="0.0" height="273.0" width="543.0" data-name="ThemeConfig"></rect>
+							<path d="M37705.0 31.0 L38248.0 31.0" fill="none" data-name="ThemeConfig"></path>
+							<path d="M37705.0 107.0 L38248.0 107.0" fill="none" data-name="ThemeConfig"></path>
 						</g>
-						<g transform="translate(30816.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
+						<g transform="translate(37705, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeConfig">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeConfig">
+								<text x="263.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeConfig">ThemeConfig</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PreviewFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
-							<rect x="32687.5" y="1166.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
-							<path d="M32687.5 1197.5 L32978.5 1197.5" fill="none" data-name="PreviewFrame"></path>
-						</g>
-						<g transform="translate(32687.5, 1166.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
+						<g transform="translate(37705, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMinContentWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMaxContentWidth: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kHoverFadeFactor: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMuteFadeFactor: double</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32687.5, 1197.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
+						<g transform="translate(37705, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+dynamic bodyBackgroundColor()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color modalBarrierColor()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color containerColor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color colorPickerInitialColor()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextMuted()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextBackground()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+double iconSplashRadius()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color sidesheetBackgroundColor()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FrameControlsWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
-							<rect x="3216.0" y="3662.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
-							<path d="M3216.0 3693.0 L3507.0 3693.0" fill="none" data-name="FrameControlsWidget"></path>
-							<path d="M3216.0 3754.0 L3507.0 3754.0" fill="none" data-name="FrameControlsWidget"></path>
+					<g data-name="NoAnimationPageTransitionsBuilder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NoAnimationPageTransitionsBuilder">
+							<rect x="37265.5" y="598.5" height="62.0" width="299.0" data-name="NoAnimationPageTransitionsBuilder"></rect>
+							<path d="M37265.5 629.5 L37564.5 629.5" fill="none" data-name="NoAnimationPageTransitionsBuilder"></path>
 						</g>
-						<g transform="translate(3216, 3662)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
+						<g transform="translate(37265.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NoAnimationPageTransitionsBuilder">
+								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="NoAnimationPageTransitionsBuilder">NoAnimationPageTransitionsBuilder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3216, 3693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
+						<g transform="translate(37265.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NoAnimationPageTransitionsBuilder">
+								<text x="0.0" y="13.5" stroke="none" data-name="NoAnimationPageTransitionsBuilder">+Widget buildTransitions()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3216, 3754)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
+					</g>
+					<g data-name="PageTransitionsBuilder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsBuilder">
+							<rect x="37466.0" y="121.0" height="31.0" width="199.0" data-name="PageTransitionsBuilder"></rect>
+						</g>
+						<g transform="translate(37466, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PageTransitionsBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsBuilder">
+								<text x="91.5" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsBuilder">PageTransitionsBuilder</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyNavViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
-							<rect x="23158.0" y="2496.5" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
-							<path d="M23158.0 2527.5 L23399.0 2527.5" fill="none" data-name="IStudyNavViewModel"></path>
+					<g data-name="WebTransitionBuilder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebTransitionBuilder">
+							<rect x="37645.0" y="598.5" height="62.0" width="223.0" data-name="WebTransitionBuilder"></rect>
+							<path d="M37645.0 629.5 L37868.0 629.5" fill="none" data-name="WebTransitionBuilder"></path>
 						</g>
-						<g transform="translate(23158, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
+						<g transform="translate(37645, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebTransitionBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebTransitionBuilder">
+								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebTransitionBuilder">WebTransitionBuilder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23158, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
+						<g transform="translate(37645, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebTransitionBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebTransitionBuilder">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebTransitionBuilder">+Widget buildTransitions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
-							<rect x="59141.3" y="68.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
-							<path d="M59141.3 99.0 L59374.3 99.0" fill="none" data-name="StudyNav"></path>
+					<g data-name="ThemeSettingChange">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettingChange">
+							<rect x="37705.8" y="1666.5" height="62.0" width="216.0" data-name="ThemeSettingChange"></rect>
+							<path d="M37705.8 1697.5 L37921.8 1697.5" fill="none" data-name="ThemeSettingChange"></path>
 						</g>
-						<g transform="translate(59141.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
+						<g transform="translate(37705.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettingChange">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettingChange">
+								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettingChange">ThemeSettingChange</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59141.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
+						<g transform="translate(37705.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettingChange">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettingChange">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettingChange">+settings: ThemeSettings</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
-							<rect x="59414.3" y="68.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
-							<path d="M59414.3 99.0 L59702.3 99.0" fill="none" data-name="StudyDesignNav"></path>
+					<g data-name="ThemeSettings">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettings">
+							<rect x="34931.3" y="2526.5" height="77.0" width="227.0" data-name="ThemeSettings"></rect>
+							<path d="M34931.3 2557.5 L35158.3 2557.5" fill="none" data-name="ThemeSettings"></path>
 						</g>
-						<g transform="translate(59414.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
+						<g transform="translate(34931.25, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettings">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettings">
+								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettings">ThemeSettings</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59414.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
+						<g transform="translate(34931.25, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettings">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettings">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettings">+sourceColor: Color</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeSettings">+themeMode: ThemeMode</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudySettingsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="64578.0" y="2436.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M64578.0 2467.0 L65057.0 2467.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M64578.0 2603.0 L65057.0 2603.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+					<g data-name="Notification">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Notification">
+							<rect x="37761.8" y="1197.0" height="31.0" width="104.0" data-name="Notification"></rect>
 						</g>
-						<g transform="translate(64578, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
+						<g transform="translate(37761.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Notification">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notification">
+								<text x="44.0" y="13.5" stroke="none" text-anchor="middle" data-name="Notification">Notification</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64578, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
+					</g>
+					<g data-name="ThemeProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeProvider">
+							<rect x="38099.0" y="358.0" height="543.0" width="519.0" data-name="ThemeProvider"></rect>
+							<path d="M38099.0 389.0 L38618.0 389.0" fill="none" data-name="ThemeProvider"></path>
+							<path d="M38099.0 480.0 L38618.0 480.0" fill="none" data-name="ThemeProvider"></path>
 						</g>
-						<g transform="translate(64578, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
+						<g transform="translate(38099, 358)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeProvider">
+								<text x="251.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeProvider">ThemeProvider</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="67088.0" y="3342.0" height="77.0" width="251.0" data-name="IStudyRepository"></rect>
-							<path d="M67088.0 3373.0 L67339.0 3373.0" fill="none" data-name="IStudyRepository"></path>
-						</g>
-						<g transform="translate(67088, 3342)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
+						<g transform="translate(38099, 389)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+settings: ValueNotifier&lt;ThemeSettings&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+lightDynamic: ColorScheme?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+darkDynamic: ColorScheme?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+pageTransitionsTheme: PageTransitionsTheme</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+shapeMedium: ShapeBorder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67088, 3373)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyRepository">+dynamic launch()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyRepository">+dynamic deleteParticipants()</text>
+						<g transform="translate(38099, 480)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+Color custom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+Color blend()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+Color source()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+ColorScheme colors()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+CardTheme cardTheme()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ThemeProvider">+ListTileThemeData listTileTheme()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ThemeProvider">+AppBarTheme appBarTheme()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ThemeProvider">+SnackBarThemeData snackBarThemeData()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ThemeProvider">+TabBarTheme tabBarTheme()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ThemeProvider">+BottomAppBarTheme bottomAppBarTheme()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ThemeProvider">+BottomNavigationBarThemeData bottomNavigationBarTheme()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ThemeProvider">+SwitchThemeData switchTheme()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="ThemeProvider">+InputDecorationTheme inputDecorationTheme()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="ThemeProvider">+TextTheme textTheme()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="ThemeProvider">+DividerThemeData dividerTheme()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="ThemeProvider">+NavigationRailThemeData navigationRailTheme()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="ThemeProvider">+DrawerThemeData drawerTheme()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="ThemeProvider">+IconThemeData iconTheme()</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="ThemeProvider">+CheckboxThemeData checkboxTheme()</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="ThemeProvider">+RadioThemeData radioTheme()</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="ThemeProvider">+TooltipThemeData tooltipTheme()</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="ThemeProvider">+ThemeData light()</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="ThemeProvider">+ThemeData dark()</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="ThemeProvider">+ThemeMode themeMode()</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="ThemeProvider">+ThemeData theme()</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="ThemeProvider">&lt;static&gt;+ThemeProvider of()</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="ThemeProvider">+bool updateShouldNotify()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="68101.3" y="313.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
-							<path d="M68101.3 344.0 L68973.3 344.0" fill="none" data-name="FormViewModel"></path>
-							<path d="M68101.3 660.0 L68973.3 660.0" fill="none" data-name="FormViewModel"></path>
+					<g data-name="ValueNotifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ValueNotifier">
+							<rect x="37905.8" y="1197.0" height="31.0" width="117.0" data-name="ValueNotifier"></rect>
 						</g>
-						<g transform="translate(68101.25, 313)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+						<g transform="translate(37905.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueNotifier">
+								<text x="50.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueNotifier">ValueNotifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68101.25, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								
-							</g>
+					</g>
+					<g data-name="ColorScheme">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ColorScheme">
+							<rect x="38716.8" y="1197.0" height="31.0" width="122.0" data-name="ColorScheme"></rect>
 						</g>
-						<g transform="translate(68101.25, 660)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
+						<g transform="translate(38716.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ColorScheme">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ColorScheme">
+								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="ColorScheme">ColorScheme</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudySettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="26005.0" y="2534.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M26005.0 2565.0 L26180.0 2565.0" fill="none" data-name="StudySettingsDialog"></path>
+					<g data-name="PageTransitionsTheme">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsTheme">
+							<rect x="38878.8" y="1197.0" height="31.0" width="198.0" data-name="PageTransitionsTheme"></rect>
 						</g>
-						<g transform="translate(26005, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
-								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
+						<g transform="translate(38878.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PageTransitionsTheme">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsTheme">
+								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsTheme">PageTransitionsTheme</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26005, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
+					</g>
+					<g data-name="ShapeBorder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ShapeBorder">
+							<rect x="39231.8" y="1197.0" height="31.0" width="120.0" data-name="ShapeBorder"></rect>
+						</g>
+						<g transform="translate(39231.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ShapeBorder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ShapeBorder">
+								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="ShapeBorder">ShapeBorder</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTestScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
-							<rect x="28853.0" y="2488.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
-							<path d="M28853.0 2519.5 L29053.0 2519.5" fill="none" data-name="StudyTestScreen"></path>
-							<path d="M28853.0 2550.5 L29053.0 2550.5" fill="none" data-name="StudyTestScreen"></path>
+					<g data-name="InheritedWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InheritedWidget">
+							<rect x="38288.0" y="121.0" height="31.0" width="141.0" data-name="InheritedWidget"></rect>
 						</g>
-						<g transform="translate(28853, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
-								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
+						<g transform="translate(38288, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="InheritedWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InheritedWidget">
+								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="InheritedWidget">InheritedWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28853, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
-								
-							</g>
+					</g>
+					<g data-name="ThemeMode">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeMode">
+							<rect x="43925.3" y="3365.0" height="31.0" width="114.0" data-name="ThemeMode"></rect>
 						</g>
-						<g transform="translate(28853, 2550.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
+						<g transform="translate(43925.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeMode">
+								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeMode">ThemeMode</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="64843.3" y="3365.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+					<g data-name="CustomColor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CustomColor">
+							<rect x="23970.3" y="2503.5" height="123.0" width="128.0" data-name="CustomColor"></rect>
+							<path d="M23970.3 2534.5 L24098.3 2534.5" fill="none" data-name="CustomColor"></path>
+							<path d="M23970.3 2595.5 L24098.3 2595.5" fill="none" data-name="CustomColor"></path>
 						</g>
-						<g transform="translate(64843.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
+						<g transform="translate(23970.25, 2503.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomColor">
+								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomColor">CustomColor</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyTestController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
-							<rect x="55533.8" y="3685.0" height="77.0" width="282.0" data-name="StudyTestController"></rect>
-							<path d="M55533.8 3716.0 L55815.8 3716.0" fill="none" data-name="StudyTestController"></path>
-						</g>
-						<g transform="translate(55533.75, 3685)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
+						<g transform="translate(23970.25, 2534.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+name: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="CustomColor">+color: Color</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="CustomColor">+blend: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55533.75, 3716)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
+						<g transform="translate(23970.25, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+Color value()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WebFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
-							<rect x="59742.3" y="82.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
-							<path d="M59742.3 113.5 L59911.3 113.5" fill="none" data-name="WebFrame"></path>
-							<path d="M59742.3 159.5 L59911.3 159.5" fill="none" data-name="WebFrame"></path>
+					<g data-name="SuppressedBehaviorSubject">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SuppressedBehaviorSubject">
+							<rect x="16253.3" y="3654.5" height="138.0" width="388.0" data-name="SuppressedBehaviorSubject"></rect>
+							<path d="M16253.3 3685.5 L16641.3 3685.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
+							<path d="M16253.3 3746.5 L16641.3 3746.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
 						</g>
-						<g transform="translate(59742.25, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
+						<g transform="translate(16253.25, 3654.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SuppressedBehaviorSubject">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SuppressedBehaviorSubject">
+								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="SuppressedBehaviorSubject">SuppressedBehaviorSubject</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59742.25, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
+						<g transform="translate(16253.25, 3685.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
+								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">+subject: BehaviorSubject&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+didSuppressInitialEvent: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SuppressedBehaviorSubject">-_controller: StreamController&lt;T&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59742.25, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
+						<g transform="translate(16253.25, 3746.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
+								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">-StreamController&lt;T&gt; _buildDerivedController()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+dynamic close()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DisabledFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
-							<rect x="59951.3" y="105.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
-							<path d="M59951.3 136.5 L60087.3 136.5" fill="none" data-name="DisabledFrame"></path>
-						</g>
-						<g transform="translate(59951.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
-								
-							</g>
+					<g data-name="StreamController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
+							<rect x="16214.3" y="3998.5" height="31.0" width="149.0" data-name="StreamController"></rect>
 						</g>
-						<g transform="translate(59951.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
+						<g transform="translate(16214.25, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
+								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PhoneContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
-							<rect x="24116.0" y="2458.5" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
-							<path d="M24116.0 2489.5 L24443.0 2489.5" fill="none" data-name="PhoneContainer"></path>
-							<path d="M24116.0 2640.5 L24443.0 2640.5" fill="none" data-name="PhoneContainer"></path>
+					<g data-name="Time">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Time">
+							<rect x="38658.0" y="583.5" height="92.0" width="293.0" data-name="Time"></rect>
+							<path d="M38658.0 614.5 L38951.0 614.5" fill="none" data-name="Time"></path>
 						</g>
-						<g transform="translate(24116, 2458.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
-								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
+						<g transform="translate(38658, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Time">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Time">
+								<text x="138.5" y="13.5" stroke="none" text-anchor="middle" data-name="Time">Time</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24116, 2489.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
+						<g transform="translate(38658, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Time">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Time">
+								<text x="0.0" y="13.5" stroke="none" data-name="Time">&lt;static&gt;+dynamic fromTimeOfDay()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Time">+Map&lt;String, dynamic&gt; toJson()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Time">&lt;static&gt;+Time fromJson()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24116, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
+					</g>
+					<g data-name="TimeOfDay">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TimeOfDay">
+							<rect x="38753.0" y="121.0" height="31.0" width="103.0" data-name="TimeOfDay"></rect>
+						</g>
+						<g transform="translate(38753, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeOfDay">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeOfDay">
+								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeOfDay">TimeOfDay</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MobileFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
-							<rect x="60127.3" y="105.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
-							<path d="M60127.3 136.5 L60263.3 136.5" fill="none" data-name="MobileFrame"></path>
+					<g data-name="TimeValueAccessor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TimeValueAccessor">
+							<rect x="38991.0" y="583.5" height="92.0" width="297.0" data-name="TimeValueAccessor"></rect>
+							<path d="M38991.0 614.5 L39288.0 614.5" fill="none" data-name="TimeValueAccessor"></path>
 						</g>
-						<g transform="translate(60127.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
+						<g transform="translate(38991, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeValueAccessor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeValueAccessor">
+								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeValueAccessor">TimeValueAccessor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60127.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
+						<g transform="translate(38991, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimeValueAccessor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimeValueAccessor">
+								<text x="0.0" y="13.5" stroke="none" data-name="TimeValueAccessor">+String modelToViewValue()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TimeValueAccessor">+Time? viewToModelValue()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TimeValueAccessor">-String _addLeadingZeroIfNeeded()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DesktopFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
-							<rect x="60303.3" y="105.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
-							<path d="M60303.3 136.5 L60439.3 136.5" fill="none" data-name="DesktopFrame"></path>
-						</g>
-						<g transform="translate(60303.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
-								
-							</g>
+					<g data-name="ControlValueAccessor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ControlValueAccessor">
+							<rect x="39044.0" y="121.0" height="31.0" width="191.0" data-name="ControlValueAccessor"></rect>
 						</g>
-						<g transform="translate(60303.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
+						<g transform="translate(39044, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ControlValueAccessor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ControlValueAccessor">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="ControlValueAccessor">ControlValueAccessor</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyAppBarViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
-							<rect x="28875.8" y="3334.5" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
-							<path d="M28875.8 3365.5 L29118.8 3365.5" fill="none" data-name="IStudyAppBarViewModel"></path>
+					<g data-name="ModelAction">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelAction">
+							<rect x="24138.3" y="2496.5" height="137.0" width="188.0" data-name="ModelAction"></rect>
+							<path d="M24138.3 2527.5 L24326.3 2527.5" fill="none" data-name="ModelAction"></path>
 						</g>
-						<g transform="translate(28875.75, 3334.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
+						<g transform="translate(24138.25, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelAction">
+								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelAction">ModelAction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28875.75, 3365.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
+						<g transform="translate(24138.25, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelAction">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelAction">+type: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelAction">+label: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ModelAction">+icon: IconData?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ModelAction">+onExecute: Function</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ModelAction">+isAvailable: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ModelAction">+isDestructive: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyStatusBadgeViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
-							<rect x="24877.0" y="2526.5" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
-							<path d="M24877.0 2557.5 L25162.0 2557.5" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
+					<g data-name="IModelActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
+							<rect x="80425.3" y="105.5" height="62.0" width="403.0" data-name="IModelActionProvider"></rect>
+							<path d="M80425.3 136.5 L80828.3 136.5" fill="none" data-name="IModelActionProvider"></path>
 						</g>
-						<g transform="translate(24877, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
+						<g transform="translate(80425.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
+								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24877, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
+						<g transform="translate(80425.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelActionProvider">
+								<text x="0.0" y="13.5" stroke="none" data-name="IModelActionProvider">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
-							<rect x="37400.0" y="1091.5" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
-							<path d="M37400.0 1122.5 L37735.0 1122.5" fill="none" data-name="StudyScaffold"></path>
+					<g data-name="IListActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
+							<rect x="80112.5" y="1174.0" height="77.0" width="179.0" data-name="IListActionProvider"></rect>
+							<path d="M80112.5 1205.0 L80291.5 1205.0" fill="none" data-name="IListActionProvider"></path>
 						</g>
-						<g transform="translate(37400, 1091.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
-								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
+						<g transform="translate(80112.5, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
+								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37400, 1122.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
+						<g transform="translate(80112.5, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IListActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IListActionProvider">
+								<text x="0.0" y="13.5" stroke="none" data-name="IListActionProvider">+void onSelectItem()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IListActionProvider">+void onNewItem()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RouteInformation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
-							<rect x="29530.8" y="3311.5" height="138.0" width="152.0" data-name="RouteInformation"></rect>
-							<path d="M29530.8 3342.5 L29682.8 3342.5" fill="none" data-name="RouteInformation"></path>
-							<path d="M29530.8 3418.5 L29682.8 3418.5" fill="none" data-name="RouteInformation"></path>
-						</g>
-						<g transform="translate(29530.75, 3311.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
-								
-							</g>
+					<g data-name="ModelActionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelActionType">
+							<rect x="516.0" y="3297.0" height="167.0" width="334.0" data-name="ModelActionType"></rect>
+							<path d="M516.0 3328.0 L850.0 3328.0" fill="none" data-name="ModelActionType"></path>
 						</g>
-						<g transform="translate(29530.75, 3342.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
+						<g transform="translate(516, 3297)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelActionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelActionType">
+								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelActionType">ModelActionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29530.75, 3418.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
+						<g transform="translate(516, 3328)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelActionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelActionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelActionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+values: List&lt;ModelActionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+edit: ModelActionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+delete: ModelActionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+remove: ModelActionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+duplicate: ModelActionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+clipboard: ModelActionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+primary: ModelActionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
-							<rect x="25202.0" y="2436.0" height="258.0" width="302.0" data-name="PlatformController"></rect>
-							<path d="M25202.0 2467.0 L25504.0 2467.0" fill="none" data-name="PlatformController"></path>
-							<path d="M25202.0 2558.0 L25504.0 2558.0" fill="none" data-name="PlatformController"></path>
+					<g data-name="OptimisticUpdate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="OptimisticUpdate">
+							<rect x="16890.8" y="3617.0" height="213.0" width="383.0" data-name="OptimisticUpdate"></rect>
+							<path d="M16890.8 3648.0 L17273.8 3648.0" fill="none" data-name="OptimisticUpdate"></path>
+							<path d="M16890.8 3784.0 L17273.8 3784.0" fill="none" data-name="OptimisticUpdate"></path>
 						</g>
-						<g transform="translate(25202, 2436)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
-								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
+						<g transform="translate(16890.75, 3617)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptimisticUpdate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptimisticUpdate">
+								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptimisticUpdate">OptimisticUpdate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25202, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
+						<g transform="translate(16890.75, 3648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
+								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+applyOptimistic: void Function()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">+apply: dynamic Function()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="OptimisticUpdate">+rollback: void Function()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="OptimisticUpdate">+onUpdate: void Function()?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="OptimisticUpdate">+onError: void Function(Object, StackTrace?)?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="OptimisticUpdate">+rethrowErrors: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="OptimisticUpdate">+runOptimistically: bool</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="OptimisticUpdate">+completeFutureOptimistically: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25202, 2558)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
+						<g transform="translate(16890.75, 3784)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
+								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+dynamic execute()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">-void _runUpdateHandlerIfAny()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WebController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
-							<rect x="29722.8" y="3281.5" height="198.0" width="273.0" data-name="WebController"></rect>
-							<path d="M29722.8 3312.5 L29995.8 3312.5" fill="none" data-name="WebController"></path>
-							<path d="M29722.8 3343.5 L29995.8 3343.5" fill="none" data-name="WebController"></path>
+					<g data-name="void Function()">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()">
+							<rect x="16403.3" y="3998.5" height="31.0" width="134.0" data-name="void Function()"></rect>
 						</g>
-						<g transform="translate(29722.75, 3281.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
-								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
+						<g transform="translate(16403.25, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()">
+								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()">void Function()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29722.75, 3312.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
-								
-							</g>
+					</g>
+					<g data-name="void Function(Object, StackTrace?)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Object, StackTrace?)?">
+							<rect x="16577.3" y="3998.5" height="31.0" width="304.0" data-name="void Function(Object, StackTrace?)?"></rect>
 						</g>
-						<g transform="translate(29722.75, 3343.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
+						<g transform="translate(16577.25, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Object, StackTrace?)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Object, StackTrace?)?">
+								<text x="144.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Object, StackTrace?)?">void Function(Object, StackTrace?)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFrameElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
-							<rect x="29791.8" y="3708.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
+					<g data-name="FileFormatEncoder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FileFormatEncoder">
+							<rect x="39403.0" y="90.5" height="92.0" width="216.0" data-name="FileFormatEncoder"></rect>
+							<path d="M39403.0 121.5 L39619.0 121.5" fill="none" data-name="FileFormatEncoder"></path>
 						</g>
-						<g transform="translate(29791.75, 3708)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
+						<g transform="translate(39403, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FileFormatEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FileFormatEncoder">
+								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="FileFormatEncoder">FileFormatEncoder</text>
+								
+							</g>
+						</g>
+						<g transform="translate(39403, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FileFormatEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FileFormatEncoder">
+								<text x="0.0" y="13.5" stroke="none" data-name="FileFormatEncoder">+dynamic encodeAsync()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FileFormatEncoder">+String encode()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FileFormatEncoder">+dynamic call()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MobileController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
-							<rect x="30186.8" y="3297.0" height="167.0" width="191.0" data-name="MobileController"></rect>
-							<path d="M30186.8 3328.0 L30377.8 3328.0" fill="none" data-name="MobileController"></path>
+					<g data-name="CSVStringEncoder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CSVStringEncoder">
+							<rect x="39328.0" y="598.5" height="62.0" width="162.0" data-name="CSVStringEncoder"></rect>
+							<path d="M39328.0 629.5 L39490.0 629.5" fill="none" data-name="CSVStringEncoder"></path>
 						</g>
-						<g transform="translate(30186.75, 3297)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
+						<g transform="translate(39328, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CSVStringEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CSVStringEncoder">
+								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="CSVStringEncoder">CSVStringEncoder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30186.75, 3328)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
+						<g transform="translate(39328, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CSVStringEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CSVStringEncoder">
+								<text x="0.0" y="13.5" stroke="none" data-name="CSVStringEncoder">+String encode()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
-							<rect x="30035.8" y="3365.0" height="31.0" width="111.0" data-name="StudyStatus"></rect>
+					<g data-name="JsonStringEncoder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="JsonStringEncoder">
+							<rect x="39530.0" y="598.5" height="62.0" width="166.0" data-name="JsonStringEncoder"></rect>
+							<path d="M39530.0 629.5 L39696.0 629.5" fill="none" data-name="JsonStringEncoder"></path>
 						</g>
-						<g transform="translate(30035.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
-								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
+						<g transform="translate(39530, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JsonStringEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonStringEncoder">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="JsonStringEncoder">JsonStringEncoder</text>
+								
+							</g>
+						</g>
+						<g transform="translate(39530, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonStringEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonStringEncoder">
+								<text x="0.0" y="13.5" stroke="none" data-name="JsonStringEncoder">+String encode()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyStatusBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
-							<rect x="25724.0" y="2488.5" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
-							<path d="M25724.0 2519.5 L25965.0 2519.5" fill="none" data-name="StudyStatusBadge"></path>
-							<path d="M25724.0 2610.5 L25965.0 2610.5" fill="none" data-name="StudyStatusBadge"></path>
+					<g data-name="ExecutionLimiter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ExecutionLimiter">
+							<rect x="17866.0" y="3669.5" height="108.0" width="197.0" data-name="ExecutionLimiter"></rect>
+							<path d="M17866.0 3700.5 L18063.0 3700.5" fill="none" data-name="ExecutionLimiter"></path>
+							<path d="M17866.0 3746.5 L18063.0 3746.5" fill="none" data-name="ExecutionLimiter"></path>
 						</g>
-						<g transform="translate(25724, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
+						<g transform="translate(17866, 3669.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ExecutionLimiter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ExecutionLimiter">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ExecutionLimiter">ExecutionLimiter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25724, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
+						<g transform="translate(17866, 3700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
+								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+milliseconds: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ExecutionLimiter">&lt;static&gt;-_timer: Timer?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25724, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
+						<g transform="translate(17866, 3746.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
+								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TestAppRoutes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
-							<rect x="60479.3" y="68.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
-							<path d="M60479.3 99.0 L60739.3 99.0" fill="none" data-name="TestAppRoutes"></path>
+					<g data-name="Timer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Timer">
+							<rect x="16921.3" y="3998.5" height="31.0" width="60.0" data-name="Timer"></rect>
 						</g>
-						<g transform="translate(60479.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
+						<g transform="translate(16921.25, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timer">
+								<text x="22.0" y="13.5" stroke="none" text-anchor="middle" data-name="Timer">Timer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60479.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
-								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
+					</g>
+					<g data-name="Debouncer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
+							<rect x="41315.3" y="3952.5" height="123.0" width="536.0" data-name="Debouncer"></rect>
+							<path d="M41315.3 3983.5 L41851.3 3983.5" fill="none" data-name="Debouncer"></path>
+							<path d="M41315.3 4044.5 L41851.3 4044.5" fill="none" data-name="Debouncer"></path>
+						</g>
+						<g transform="translate(41315.25, 3952.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
+								<text x="260.0" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
-							<rect x="56940.3" y="2451.0" height="228.0" width="573.0" data-name="StudyController"></rect>
-							<path d="M56940.3 2482.0 L57513.3 2482.0" fill="none" data-name="StudyController"></path>
-							<path d="M56940.3 2543.0 L57513.3 2543.0" fill="none" data-name="StudyController"></path>
-						</g>
-						<g transform="translate(56940.25, 2451)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
-								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
+						<g transform="translate(41315.25, 3983.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
+								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+leading: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Debouncer">+cancelUncompleted: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Debouncer">-_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56940.25, 2482)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+						<g transform="translate(41315.25, 4044.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
+								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+dynamic call()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56940.25, 2543)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
+					</g>
+					<g data-name="CancelableOperation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
+							<rect x="41491.8" y="4319.0" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
+						</g>
+						<g transform="translate(41491.75, 4319)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
+								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyMonitorScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="29093.0" y="2534.0" height="62.0" width="176.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M29093.0 2565.0 L29269.0 2565.0" fill="none" data-name="StudyMonitorScreen"></path>
+					<g data-name="Throttler">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Throttler">
+							<rect x="39671.5" y="3983.0" height="62.0" width="136.0" data-name="Throttler"></rect>
+							<path d="M39671.5 4014.0 L39807.5 4014.0" fill="none" data-name="Throttler"></path>
 						</g>
-						<g transform="translate(29093, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
+						<g transform="translate(39671.5, 3983)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Throttler">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Throttler">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="Throttler">Throttler</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29093, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
+						<g transform="translate(39671.5, 4014)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Throttler">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Throttler">
+								<text x="0.0" y="13.5" stroke="none" data-name="Throttler">+dynamic call()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumnHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
-							<rect x="26226.3" y="3662.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
-							<path d="M26226.3 3693.5 L26463.3 3693.5" fill="none" data-name="StudiesTableColumnHeader"></path>
+					<g data-name="SerializableColor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SerializableColor">
+							<rect x="21548.0" y="3685.0" height="77.0" width="312.0" data-name="SerializableColor"></rect>
+							<path d="M21548.0 3716.0 L21860.0 3716.0" fill="none" data-name="SerializableColor"></path>
 						</g>
-						<g transform="translate(26226.25, 3662.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
-								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
+						<g transform="translate(21548, 3685)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SerializableColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SerializableColor">
+								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="SerializableColor">SerializableColor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26226.25, 3693.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
+						<g transform="translate(21548, 3716)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SerializableColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SerializableColor">
+								<text x="0.0" y="13.5" stroke="none" data-name="SerializableColor">+Map&lt;String, dynamic&gt; toJson()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SerializableColor">&lt;static&gt;+SerializableColor fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
-							<rect x="28470.0" y="2511.0" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
-							<path d="M28470.0 2542.0 L28813.0 2542.0" fill="none" data-name="DashboardScaffold"></path>
-							<path d="M28470.0 2588.0 L28813.0 2588.0" fill="none" data-name="DashboardScaffold"></path>
-						</g>
-						<g transform="translate(28470, 2511)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
-								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
-								
-							</g>
+					<g data-name="IProviderArgsResolver">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
+							<rect x="41335.0" y="1181.5" height="62.0" width="193.0" data-name="IProviderArgsResolver"></rect>
+							<path d="M41335.0 1212.5 L41528.0 1212.5" fill="none" data-name="IProviderArgsResolver"></path>
 						</g>
-						<g transform="translate(28470, 2542)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
+						<g transform="translate(41335, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28470, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
+						<g transform="translate(41335, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IProviderArgsResolver">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IProviderArgsResolver">
+								<text x="0.0" y="13.5" stroke="none" data-name="IProviderArgsResolver">+R provide()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumnSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
-							<rect x="60779.3" y="75.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
-							<path d="M60779.3 106.0 L61004.3 106.0" fill="none" data-name="StudiesTableColumnSize"></path>
-							<path d="M60779.3 167.0 L61004.3 167.0" fill="none" data-name="StudiesTableColumnSize"></path>
+					<g data-name="CombinedStreamNotifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CombinedStreamNotifier">
+							<rect x="39736.0" y="583.0" height="93.0" width="435.0" data-name="CombinedStreamNotifier"></rect>
+							<path d="M39736.0 614.0 L40171.0 614.0" fill="none" data-name="CombinedStreamNotifier"></path>
+							<path d="M39736.0 645.0 L40171.0 645.0" fill="none" data-name="CombinedStreamNotifier"></path>
 						</g>
-						<g transform="translate(60779.25, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
+						<g transform="translate(39736, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CombinedStreamNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CombinedStreamNotifier">
+								<text x="209.5" y="13.5" stroke="none" text-anchor="middle" data-name="CombinedStreamNotifier">CombinedStreamNotifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60779.25, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
+						<g transform="translate(39736, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">-_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60779.25, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
+						<g transform="translate(39736, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
-							<rect x="23086.8" y="1553.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
-							<path d="M23086.8 1584.5 L23566.8 1584.5" fill="none" data-name="StudiesTable"></path>
-							<path d="M23086.8 1795.5 L23566.8 1795.5" fill="none" data-name="StudiesTable"></path>
+					<g data-name="ChangeNotifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
+							<rect x="39886.5" y="121.0" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
 						</g>
-						<g transform="translate(23086.75, 1553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
-								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
+						<g transform="translate(39886.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
+								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23086.75, 1584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
+					</g>
+					<g data-name="CountWhereValidator">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CountWhereValidator">
+							<rect x="40211.0" y="553.0" height="153.0" width="383.0" data-name="CountWhereValidator"></rect>
+							<path d="M40211.0 584.0 L40594.0 584.0" fill="none" data-name="CountWhereValidator"></path>
+							<path d="M40211.0 675.0 L40594.0 675.0" fill="none" data-name="CountWhereValidator"></path>
+						</g>
+						<g transform="translate(40211, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CountWhereValidator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CountWhereValidator">
+								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="CountWhereValidator">CountWhereValidator</text>
+								
+							</g>
+						</g>
+						<g transform="translate(40211, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
+								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+predicate: bool Function(T?)</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="CountWhereValidator">+minCount: int?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="CountWhereValidator">+maxCount: int?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMinCount: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMaxCount: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23086.75, 1795.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
+						<g transform="translate(40211, 675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
+								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+Map&lt;String, dynamic&gt;? validate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
-							<rect x="22668.0" y="2549.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
+					<g data-name="bool Function(T?)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="bool Function(T?)">
+							<rect x="40325.0" y="1197.0" height="31.0" width="155.0" data-name="bool Function(T?)"></rect>
 						</g>
-						<g transform="translate(22668, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
+						<g transform="translate(40325, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="bool Function(T?)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="bool Function(T?)">
+								<text x="69.5" y="13.5" stroke="none" text-anchor="middle" data-name="bool Function(T?)">bool Function(T?)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<rect x="23439.0" y="2549.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
+					<g data-name="Validator">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Validator">
+							<rect x="40359.5" y="121.0" height="31.0" width="86.0" data-name="Validator"></rect>
 						</g>
-						<g transform="translate(23439, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
+						<g transform="translate(40359.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Validator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Validator">
+								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="Validator">Validator</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
-							<rect x="54037.5" y="2376.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
-							<path d="M54037.5 2407.0 L54651.5 2407.0" fill="none" data-name="DashboardController"></path>
-							<path d="M54037.5 2528.0 L54651.5 2528.0" fill="none" data-name="DashboardController"></path>
+					<g data-name="Patterns">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Patterns">
+							<rect x="41713.5" y="90.5" height="92.0" width="287.0" data-name="Patterns"></rect>
+							<path d="M41713.5 121.5 L42000.5 121.5" fill="none" data-name="Patterns"></path>
 						</g>
-						<g transform="translate(54037.5, 2376)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
-								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
+						<g transform="translate(41713.5, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Patterns">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Patterns">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="Patterns">Patterns</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54037.5, 2407)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
+						<g transform="translate(41713.5, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Patterns">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Patterns">
+								<text x="0.0" y="13.5" stroke="none" data-name="Patterns">&lt;static&gt;+timeFormatString: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Patterns">&lt;static&gt;+emailFormatString: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Patterns">&lt;static&gt;+url: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54037.5, 2528)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
+					</g>
+					<g data-name="NumericalRangeFormatter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NumericalRangeFormatter">
+							<rect x="40634.0" y="575.5" height="108.0" width="313.0" data-name="NumericalRangeFormatter"></rect>
+							<path d="M40634.0 606.5 L40947.0 606.5" fill="none" data-name="NumericalRangeFormatter"></path>
+							<path d="M40634.0 652.5 L40947.0 652.5" fill="none" data-name="NumericalRangeFormatter"></path>
+						</g>
+						<g transform="translate(40634, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericalRangeFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NumericalRangeFormatter">
+								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="NumericalRangeFormatter">NumericalRangeFormatter</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudiesTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
-							<rect x="616.3" y="3274.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
-							<path d="M616.3 3305.5 L977.3 3305.5" fill="none" data-name="StudiesTableColumn"></path>
+						<g transform="translate(40634, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
+								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+min: int?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NumericalRangeFormatter">+max: int?</text>
+								
+							</g>
 						</g>
-						<g transform="translate(616.25, 3274.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
-								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
+						<g transform="translate(40634, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
+								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+TextEditingValue formatEditUpdate()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(616.25, 3305.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
+					</g>
+					<g data-name="TextInputFormatter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TextInputFormatter">
+							<rect x="40884.0" y="121.0" height="31.0" width="166.0" data-name="TextInputFormatter"></rect>
+						</g>
+						<g transform="translate(40884, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TextInputFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextInputFormatter">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextInputFormatter">TextInputFormatter</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="29663.0" y="2534.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
-							<path d="M29663.0 2565.0 L29841.0 2565.0" fill="none" data-name="DashboardScreen"></path>
+					<g data-name="StudySequenceFormatter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySequenceFormatter">
+							<rect x="40987.0" y="598.5" height="62.0" width="313.0" data-name="StudySequenceFormatter"></rect>
+							<path d="M40987.0 629.5 L41300.0 629.5" fill="none" data-name="StudySequenceFormatter"></path>
 						</g>
-						<g transform="translate(29663, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
+						<g transform="translate(40987, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySequenceFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySequenceFormatter">
+								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySequenceFormatter">StudySequenceFormatter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29663, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
+						<g transform="translate(40987, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySequenceFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySequenceFormatter">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySequenceFormatter">+TextEditingValue formatEditUpdate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesFilter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
-							<rect x="12781.5" y="3342.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
-							<path d="M12781.5 3373.0 L13077.5 3373.0" fill="none" data-name="StudiesFilter"></path>
+					<g data-name="Tuple">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Tuple">
+							<rect x="22118.8" y="2481.0" height="168.0" width="384.0" data-name="Tuple"></rect>
+							<path d="M22118.8 2512.0 L22502.8 2512.0" fill="none" data-name="Tuple"></path>
+							<path d="M22118.8 2573.0 L22502.8 2573.0" fill="none" data-name="Tuple"></path>
 						</g>
-						<g transform="translate(12781.5, 3342)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
+						<g transform="translate(22118.75, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Tuple">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Tuple">
+								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="Tuple">Tuple</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12781.5, 3373)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
+						<g transform="translate(22118.75, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
+								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+first: T1</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">+second: T2</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+props: List&lt;Object?&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(22118.75, 2573)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
+								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+Map&lt;String, dynamic&gt; toJson()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">&lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copy()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copyWith()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IUserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="54194.5" y="3319.0" height="123.0" width="260.0" data-name="IUserRepository"></rect>
-							<path d="M54194.5 3350.0 L54454.5 3350.0" fill="none" data-name="IUserRepository"></path>
-							<path d="M54194.5 3381.0 L54454.5 3381.0" fill="none" data-name="IUserRepository"></path>
+					<g data-name="JsonFileLoader">
+						<g fill="#eee8d5" stroke="#33322E" data-name="JsonFileLoader">
+							<rect x="63822.3" y="75.0" height="123.0" width="319.0" data-name="JsonFileLoader"></rect>
+							<path d="M63822.3 106.0 L64141.3 106.0" fill="none" data-name="JsonFileLoader"></path>
+							<path d="M63822.3 137.0 L64141.3 137.0" fill="none" data-name="JsonFileLoader"></path>
 						</g>
-						<g transform="translate(54194.5, 3319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
+						<g transform="translate(63822.25, 75)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="JsonFileLoader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonFileLoader">
+								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="JsonFileLoader">JsonFileLoader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54194.5, 3350)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+user: StudyUUser</text>
+						<g transform="translate(63822.25, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
+								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+jsonAssetsPath: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54194.5, 3381)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+dynamic fetchUser()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IUserRepository">+dynamic saveUser()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IUserRepository">+dynamic updatePreferences()</text>
+						<g transform="translate(63822.25, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
+								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+dynamic loadJson()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonMapFromAssets()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonListFromAssets()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="76682.8" y="105.5" height="62.0" width="403.0" data-name="IModelActionProvider"></rect>
-							<path d="M76682.8 136.5 L77085.8 136.5" fill="none" data-name="IModelActionProvider"></path>
+					<g data-name="IAppDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
+							<rect x="19175.3" y="3692.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
+							<path d="M19175.3 3723.5 L19372.3 3723.5" fill="none" data-name="IAppDelegate"></path>
 						</g>
-						<g transform="translate(76682.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
+						<g transform="translate(19175.25, 3692.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76682.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelActionProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelActionProvider">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+						<g transform="translate(19175.25, 3723.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
-							<rect x="29881.0" y="2466.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
-							<path d="M29881.0 2497.5 L30281.0 2497.5" fill="none" data-name="StudiesTableItem"></path>
+					<g data-name="AppController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
+							<rect x="65251.0" y="4258.0" height="153.0" width="340.0" data-name="AppController"></rect>
+							<path d="M65251.0 4289.0 L65591.0 4289.0" fill="none" data-name="AppController"></path>
+							<path d="M65251.0 4365.0 L65591.0 4365.0" fill="none" data-name="AppController"></path>
 						</g>
-						<g transform="translate(29881, 2466.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
-								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
+						<g transform="translate(65251, 4258)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
+								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29881, 2497.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
+						<g transform="translate(65251, 4289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+sharedPreferences: SharedPreferences</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
+								
+							</g>
+						</g>
+						<g transform="translate(65251, 4365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="67432.3" y="3365.0" height="31.0" width="61.0" data-name="Study"></rect>
+					<g data-name="SharedPreferences">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SharedPreferences">
+							<rect x="67612.8" y="4541.0" height="31.0" width="169.0" data-name="SharedPreferences"></rect>
 						</g>
-						<g transform="translate(67432.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
+						<g transform="translate(67612.75, 4541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SharedPreferences">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SharedPreferences">
+								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="SharedPreferences">SharedPreferences</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(Study, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
-							<rect x="30543.8" y="3365.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
+					<g data-name="ParticipantDetailsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsFormView">
+							<rect x="77704.8" y="1651.0" height="93.0" width="419.0" data-name="ParticipantDetailsFormView"></rect>
+							<path d="M77704.8 1682.0 L78123.8 1682.0" fill="none" data-name="ParticipantDetailsFormView"></path>
+							<path d="M77704.8 1713.0 L78123.8 1713.0" fill="none" data-name="ParticipantDetailsFormView"></path>
 						</g>
-						<g transform="translate(30543.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
+						<g transform="translate(77704.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsFormView">
+								<text x="201.5" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsFormView">ParticipantDetailsFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(Study)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
-							<rect x="33190.8" y="3365.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
+						<g transform="translate(77704.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormView">+formViewModel: ParticipantDetailsFormViewModel</text>
+								
+							</g>
 						</g>
-						<g transform="translate(33190.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
+						<g transform="translate(77704.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormArrayTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
-							<rect x="32952.0" y="2368.5" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
-							<path d="M32952.0 2399.5 L33442.0 2399.5" fill="none" data-name="FormArrayTable"></path>
-							<path d="M32952.0 2700.5 L33442.0 2700.5" fill="none" data-name="FormArrayTable"></path>
+					<g data-name="ParticipantDetailsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsFormViewModel">
+							<rect x="73242.0" y="2481.0" height="168.0" width="354.0" data-name="ParticipantDetailsFormViewModel"></rect>
+							<path d="M73242.0 2512.0 L73596.0 2512.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
+							<path d="M73242.0 2588.0 L73596.0 2588.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
 						</g>
-						<g transform="translate(32952, 2368.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
-								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
+						<g transform="translate(73242, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsFormViewModel">
+								<text x="169.0" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsFormViewModel">ParticipantDetailsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32952, 2399.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
+						<g transform="translate(73242, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+participantIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+rawDataControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32952, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
+						<g transform="translate(73242, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+void initControls()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+StudyMonitorItem buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+void setControlsFrom()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StudyMonitorScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
+							<rect x="27321.5" y="2511.5" height="107.0" width="280.0" data-name="StudyMonitorScreen"></rect>
+							<path d="M27321.5 2542.5 L27601.5 2542.5" fill="none" data-name="StudyMonitorScreen"></path>
+						</g>
+						<g transform="translate(27321.5, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
+								<text x="132.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
+								
+							</g>
+						</g>
+						<g transform="translate(27321.5, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorScreen">-Widget _monitorSectionHeader()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorScreen">-Widget _buildStat()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorScreen">-dynamic _onSelectParticipant()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<rect x="33419.8" y="3365.0" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
+					<g data-name="StudyPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
+							<rect x="34999.8" y="1651.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
+							<path d="M34999.8 1682.0 L35163.8 1682.0" fill="none" data-name="StudyPageWidget"></path>
+							<path d="M34999.8 1713.0 L35163.8 1713.0" fill="none" data-name="StudyPageWidget"></path>
 						</g>
-						<g transform="translate(33419.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
+						<g transform="translate(34999.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="String Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
-							<rect x="33870.8" y="3365.0" height="31.0" width="157.0" data-name="String Function(T)"></rect>
-						</g>
-						<g transform="translate(33870.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
+						<g transform="translate(34999.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
-							<rect x="34172.8" y="3365.0" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
-						</g>
-						<g transform="translate(34172.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
-								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
+						<g transform="translate(34999.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CustomFormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
-							<rect x="64540.3" y="3639.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
-							<path d="M64540.3 3670.5 L64953.3 3670.5" fill="none" data-name="CustomFormControl"></path>
-							<path d="M64540.3 3776.5 L64953.3 3776.5" fill="none" data-name="CustomFormControl"></path>
+					<g data-name="StudyMonitorItem">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorItem">
+							<rect x="22542.8" y="2436.0" height="258.0" width="371.0" data-name="StudyMonitorItem"></rect>
+							<path d="M22542.8 2467.0 L22913.8 2467.0" fill="none" data-name="StudyMonitorItem"></path>
+							<path d="M22542.8 2663.0 L22913.8 2663.0" fill="none" data-name="StudyMonitorItem"></path>
 						</g>
-						<g transform="translate(64540.25, 3639.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
+						<g transform="translate(22542.75, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorItem">
+								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorItem">StudyMonitorItem</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64540.25, 3670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
+						<g transform="translate(22542.75, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">+participantId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorItem">+inviteCode: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorItem">+enrolledAt: DateTime</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorItem">+lastActivityAt: DateTime</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyMonitorItem">+currentDayOfStudy: int</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyMonitorItem">+studyDurationInDays: int</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyMonitorItem">+completedInterventions: int</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyMonitorItem">+missedInterventions: int</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyMonitorItem">+completedSurveys: int</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyMonitorItem">+missedSurveys: int</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyMonitorItem">+rawData: String</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyMonitorItem">+props: List&lt;Object?&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64540.25, 3776.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
+						<g transform="translate(22542.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">&lt;static&gt;+List&lt;StudyMonitorItem&gt; fromStudy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Debouncer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="62236.5" y="3952.5" height="123.0" width="536.0" data-name="Debouncer"></rect>
-							<path d="M62236.5 3983.5 L62772.5 3983.5" fill="none" data-name="Debouncer"></path>
-							<path d="M62236.5 4044.5 L62772.5 4044.5" fill="none" data-name="Debouncer"></path>
+					<g data-name="StudyMonitorTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorTable">
+							<rect x="41278.5" y="60.0" height="153.0" width="395.0" data-name="StudyMonitorTable"></rect>
+							<path d="M41278.5 91.0 L41673.5 91.0" fill="none" data-name="StudyMonitorTable"></path>
+							<path d="M41278.5 137.0 L41673.5 137.0" fill="none" data-name="StudyMonitorTable"></path>
 						</g>
-						<g transform="translate(62236.5, 3952.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
-								<text x="260.0" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
+						<g transform="translate(41278.5, 60)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorTable">
+								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorTable">StudyMonitorTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62236.5, 3983.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
-								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+leading: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Debouncer">+cancelUncompleted: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Debouncer">-_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?</text>
+						<g transform="translate(41278.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+studyMonitorItems: List&lt;StudyMonitorItem&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">+onSelectItem: void Function(StudyMonitorItem)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62236.5, 4044.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
-								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+dynamic call()</text>
+						<g transform="translate(41278.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">-List&lt;Widget&gt; _buildRow()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorTable">-String _formatTime()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorTable">-Widget _buildProgressCell()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(T?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
-							<rect x="64664.8" y="3998.5" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
+					<g data-name="void Function(StudyMonitorItem)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyMonitorItem)">
+							<rect x="41340.0" y="614.0" height="31.0" width="272.0" data-name="void Function(StudyMonitorItem)"></rect>
 						</g>
-						<g transform="translate(64664.75, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
+						<g transform="translate(41340, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyMonitorItem)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyMonitorItem)">
+								<text x="128.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyMonitorItem)">void Function(StudyMonitorItem)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(ControlStatus)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
-							<rect x="65526.3" y="3998.5" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="64901.0" y="3365.0" height="31.0" width="113.0" data-name="FormControl"></rect>
 						</g>
-						<g transform="translate(65526.25, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
+						<g transform="translate(64901, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormInvalidException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
-							<rect x="57433.5" y="614.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
+					<g data-name="FormGroup">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
+							<rect x="68268.0" y="3365.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
 						</g>
-						<g transform="translate(57433.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
+						<g transform="translate(68268, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Exception">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="58537.3" y="121.0" height="31.0" width="94.0" data-name="Exception"></rect>
+					<g data-name="FormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
+							<rect x="73810.8" y="313.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
+							<path d="M73810.8 344.0 L74682.8 344.0" fill="none" data-name="FormViewModel"></path>
+							<path d="M73810.8 660.0 L74682.8 660.0" fill="none" data-name="FormViewModel"></path>
 						</g>
-						<g transform="translate(58537.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
+						<g transform="translate(73810.75, 313)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
+								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(73810.75, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(73810.75, 660)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConfigException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
-							<rect x="57659.5" y="598.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
-							<path d="M57659.5 629.5 L57844.5 629.5" fill="none" data-name="FormConfigException"></path>
+					<g data-name="LoginForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
+							<rect x="11713.0" y="2518.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
+							<path d="M11713.0 2549.5 L11920.0 2549.5" fill="none" data-name="LoginForm"></path>
+							<path d="M11713.0 2580.5 L11920.0 2580.5" fill="none" data-name="LoginForm"></path>
 						</g>
-						<g transform="translate(57659.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
-								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
+						<g transform="translate(11713, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57659.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
+						<g transform="translate(11713, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
+								
+							</g>
+						</g>
+						<g transform="translate(11713, 2580.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="65943.5" y="1174.0" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-							<path d="M65943.5 1205.0 L66160.5 1205.0" fill="none" data-name="IFormViewModelDelegate"></path>
+					<g data-name="AuthFormKey">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
+							<rect x="19129.0" y="3297.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
+							<path d="M19129.0 3328.0 L19484.0 3328.0" fill="none" data-name="AuthFormKey"></path>
 						</g>
-						<g transform="translate(65943.5, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
+						<g transform="translate(19129, 3297)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
+								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65943.5, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
+						<g transform="translate(19129, 3328)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControlOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
-							<rect x="1420.0" y="2511.5" height="107.0" width="190.0" data-name="FormControlOption"></rect>
-							<path d="M1420.0 2542.5 L1610.0 2542.5" fill="none" data-name="FormControlOption"></path>
+					<g data-name="PasswordRecoveryForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
+							<rect x="12467.3" y="2518.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
+							<path d="M12467.3 2549.5 L12675.3 2549.5" fill="none" data-name="PasswordRecoveryForm"></path>
+							<path d="M12467.3 2580.5 L12675.3 2580.5" fill="none" data-name="PasswordRecoveryForm"></path>
 						</g>
-						<g transform="translate(1420, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
+						<g transform="translate(12467.25, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1420, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
+						<g transform="translate(12467.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
+								
+							</g>
+						</g>
+						<g transform="translate(12467.25, 2580.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
-							<rect x="29158.8" y="3319.5" height="122.0" width="282.0" data-name="FormMode"></rect>
-							<path d="M29158.8 3350.5 L29440.8 3350.5" fill="none" data-name="FormMode"></path>
+					<g data-name="PasswordForgotForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
+							<rect x="13219.8" y="2518.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
+							<path d="M13219.8 2549.5 L13426.8 2549.5" fill="none" data-name="PasswordForgotForm"></path>
+							<path d="M13219.8 2580.5 L13426.8 2580.5" fill="none" data-name="PasswordForgotForm"></path>
 						</g>
-						<g transform="translate(29158.75, 3319.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
+						<g transform="translate(13219.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29158.75, 3350.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
+						<g transform="translate(13219.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
+								
+							</g>
+						</g>
+						<g transform="translate(13219.75, 2580.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormValidationSetEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
-							<rect x="65407.8" y="1197.0" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
+					<g data-name="SignupForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
+							<rect x="17930.5" y="2503.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
+							<path d="M17930.5 2534.5 L18208.5 2534.5" fill="none" data-name="SignupForm"></path>
+							<path d="M17930.5 2565.5 L18208.5 2565.5" fill="none" data-name="SignupForm"></path>
 						</g>
-						<g transform="translate(65407.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
-								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
+						<g transform="translate(17930.5, 2503.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
+								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="CancelableOperation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="63511.5" y="4319.0" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
+						<g transform="translate(17930.5, 2534.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
+								
+							</g>
 						</g>
-						<g transform="translate(63511.5, 4319)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
+						<g transform="translate(17930.5, 2565.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="44374.0" y="1166.0" height="93.0" width="163.0" data-name="IFormData"></rect>
-							<path d="M44374.0 1197.0 L44537.0 1197.0" fill="none" data-name="IFormData"></path>
-							<path d="M44374.0 1228.0 L44537.0 1228.0" fill="none" data-name="IFormData"></path>
+					<g data-name="AuthScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
+							<rect x="28226.5" y="2504.0" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
+							<path d="M28226.5 2535.0 L28485.5 2535.0" fill="none" data-name="AuthScaffold"></path>
 						</g>
-						<g transform="translate(44374, 1166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
+						<g transform="translate(28226.5, 2504)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
+								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44374, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
+						<g transform="translate(28226.5, 2535)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44374, 1228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
+					</g>
+					<g data-name="EmailTextField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
+							<rect x="28525.5" y="2511.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
+							<path d="M28525.5 2542.5 L28846.5 2542.5" fill="none" data-name="EmailTextField"></path>
+						</g>
+						<g transform="translate(28525.5, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
+								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
+								
+							</g>
+						</g>
+						<g transform="translate(28525.5, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
+								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="UnsavedChangesDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
-							<rect x="61489.3" y="105.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
-							<path d="M61489.3 136.5 L61696.3 136.5" fill="none" data-name="UnsavedChangesDialog"></path>
+					<g data-name="PasswordTextField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
+							<rect x="28886.5" y="2504.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
+							<path d="M28886.5 2535.0 L29365.5 2535.0" fill="none" data-name="PasswordTextField"></path>
 						</g>
-						<g transform="translate(61489.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
+						<g transform="translate(28886.5, 2504)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61489.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
+						<g transform="translate(28886.5, 2535)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControlValidation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
-							<rect x="34498.3" y="2496.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
-							<path d="M34498.3 2527.0 L34983.3 2527.0" fill="none" data-name="FormControlValidation"></path>
-							<path d="M34498.3 2603.0 L34983.3 2603.0" fill="none" data-name="FormControlValidation"></path>
+					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+							<rect x="30062.0" y="3365.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
 						</g>
-						<g transform="translate(34498.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
-								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
+						<g transform="translate(30062, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34498.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
+					</g>
+					<g data-name="StudyUJobsToBeDone">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
+							<rect x="65936.3" y="105.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
+							<path d="M65936.3 136.5 L66130.3 136.5" fill="none" data-name="StudyUJobsToBeDone"></path>
+						</g>
+						<g transform="translate(65936.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
+								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34498.25, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
+						<g transform="translate(65936.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="67129.8" y="1666.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
-							<path d="M67129.8 1697.5 L67525.8 1697.5" fill="none" data-name="ManagedFormViewModel"></path>
+					<g data-name="AuthFormController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
+							<rect x="65720.3" y="2263.5" height="603.0" width="850.0" data-name="AuthFormController"></rect>
+							<path d="M65720.3 2294.5 L66570.3 2294.5" fill="none" data-name="AuthFormController"></path>
+							<path d="M65720.3 2595.5 L66570.3 2595.5" fill="none" data-name="AuthFormController"></path>
 						</g>
-						<g transform="translate(67129.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
+						<g transform="translate(65720.25, 2263.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
+								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67129.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
+						<g transform="translate(65720.25, 2294.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+sharedPreferences: SharedPreferences</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">+rememberMeControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="AuthFormController">+shouldRemember: bool</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormViewModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
-							<rect x="57884.5" y="614.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
-						</g>
-						<g transform="translate(57884.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
+						<g transform="translate(65720.25, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">-void _setRememberMe()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">-void _delRememberMe()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="AuthFormController">-void _initRememberMe()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="68578.0" y="3587.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
-							<path d="M68578.0 3618.0 L68859.0 3618.0" fill="none" data-name="FormViewModelCollection"></path>
-							<path d="M68578.0 3709.0 L68859.0 3709.0" fill="none" data-name="FormViewModelCollection"></path>
+					<g data-name="IAuthRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
+							<rect x="75100.5" y="3900.0" height="228.0" width="295.0" data-name="IAuthRepository"></rect>
+							<path d="M75100.5 3931.0 L75395.5 3931.0" fill="none" data-name="IAuthRepository"></path>
+							<path d="M75100.5 4022.0 L75395.5 4022.0" fill="none" data-name="IAuthRepository"></path>
 						</g>
-						<g transform="translate(68578, 3587)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
+						<g transform="translate(75100.5, 3900)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
+								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68578, 3618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
+						<g transform="translate(75100.5, 3931)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+allowPasswordReset: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+currentUser: User?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+isLoggedIn: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+session: Session?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+serializedSession: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68578, 3709)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
+						<g transform="translate(75100.5, 4022)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+dynamic signUp()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+dynamic signInWith()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+dynamic signOut()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+dynamic resetPasswordForEmail()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+dynamic updateUser()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IAuthRepository">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="65388.3" y="3998.5" height="31.0" width="98.0" data-name="FormArray"></rect>
+					<g data-name="IFormGroupController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
+							<rect x="67871.8" y="105.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
+							<path d="M67871.8 136.5 L68058.8 136.5" fill="none" data-name="IFormGroupController"></path>
 						</g>
-						<g transform="translate(65388.25, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
+						<g transform="translate(67871.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
+								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="DrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
-							<rect x="50895.8" y="1113.5" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
-							<path d="M50895.8 1144.5 L51340.8 1144.5" fill="none" data-name="DrawerEntry"></path>
-							<path d="M50895.8 1280.5 L51340.8 1280.5" fill="none" data-name="DrawerEntry"></path>
-						</g>
-						<g transform="translate(50895.75, 1113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
-								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
+						<g transform="translate(67871.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50895.75, 1144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DrawerEntry">+localizedHelpText: String Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DrawerEntry">+enabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DrawerEntry">+onSelected: void Function(BuildContext, WidgetRef)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DrawerEntry">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DrawerEntry">+title: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DrawerEntry">+helpText: String?</text>
+					</g>
+					<g data-name="AppStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
+							<rect x="940.0" y="3327.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
+							<path d="M940.0 3358.0 L1219.0 3358.0" fill="none" data-name="AppStatus"></path>
+						</g>
+						<g transform="translate(940, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
+								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50895.75, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
+						<g transform="translate(940, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="String Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
-							<rect x="50711.5" y="1682.0" height="31.0" width="147.0" data-name="String Function()"></rect>
+					<g data-name="FormArrayTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
+							<rect x="30517.0" y="2368.5" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
+							<path d="M30517.0 2399.5 L31007.0 2399.5" fill="none" data-name="FormArrayTable"></path>
+							<path d="M30517.0 2700.5 L31007.0 2700.5" fill="none" data-name="FormArrayTable"></path>
 						</g>
-						<g transform="translate(50711.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
-								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
+						<g transform="translate(30517, 2368.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
+								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="String Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
-							<rect x="51039.8" y="1682.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
-						</g>
-						<g transform="translate(51039.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
+						<g transform="translate(30517, 2399.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(BuildContext, WidgetRef)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
-							<rect x="51953.5" y="1682.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
-						</g>
-						<g transform="translate(51953.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
-								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
+						<g transform="translate(30517, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="GoRouterDrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
-							<rect x="52752.3" y="1643.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
-							<path d="M52752.3 1674.5 L53016.3 1674.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-							<path d="M52752.3 1720.5 L53016.3 1720.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+							<rect x="30834.0" y="3365.0" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
 						</g>
-						<g transform="translate(52752.25, 1643.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
+						<g transform="translate(30834, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52752.25, 1674.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
-								
-							</g>
+					</g>
+					<g data-name="String Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
+							<rect x="39932.8" y="3365.0" height="31.0" width="157.0" data-name="String Function(T)"></rect>
 						</g>
-						<g transform="translate(52752.25, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
+						<g transform="translate(39932.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
+								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppDrawer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
-							<rect x="61736.3" y="53.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
-							<path d="M61736.3 84.0 L62005.3 84.0" fill="none" data-name="AppDrawer"></path>
-						</g>
-						<g transform="translate(61736.25, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
-								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
-								
-							</g>
+					<g data-name="Widget Function(BuildContext, T, int)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
+							<rect x="40195.5" y="3365.0" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
 						</g>
-						<g transform="translate(61736.25, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppDrawer">+leftPaddingEntries: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppDrawer">+logoPaddingVertical: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppDrawer">+logoPaddingHorizontal: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AppDrawer">+logoMaxHeight: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AppDrawer">+logoSectionMinHeight: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AppDrawer">+logoSectionMaxHeight: double</text>
+						<g transform="translate(40195.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
+								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInvitesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="56549.3" y="45.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M56549.3 76.0 L57115.3 76.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M56549.3 182.0 L57115.3 182.0" fill="none" data-name="StudyInvitesTable"></path>
+					<g data-name="ManagedFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
+							<rect x="66963.3" y="1666.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
+							<path d="M66963.3 1697.5 L67359.3 1697.5" fill="none" data-name="ManagedFormViewModel"></path>
 						</g>
-						<g transform="translate(56549.25, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
-								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
+						<g transform="translate(66963.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
+								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56549.25, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
+						<g transform="translate(66963.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56549.25, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
+					</g>
+					<g data-name="FormViewModelNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
+							<rect x="41795.8" y="614.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
+						</g>
+						<g transform="translate(41795.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="56172.5" y="614.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
+					<g data-name="Exception">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
+							<rect x="59322.0" y="121.0" height="31.0" width="94.0" data-name="Exception"></rect>
 						</g>
-						<g transform="translate(56172.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
+						<g transform="translate(59322, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
+								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="56434.5" y="614.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
+					<g data-name="FormViewModelCollection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
+							<rect x="69056.3" y="3587.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
+							<path d="M69056.3 3618.0 L69337.3 3618.0" fill="none" data-name="FormViewModelCollection"></path>
+							<path d="M69056.3 3709.0 L69337.3 3709.0" fill="none" data-name="FormViewModelCollection"></path>
 						</g>
-						<g transform="translate(56434.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+						<g transform="translate(69056.25, 3587)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
+								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Intervention? Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="56894.5" y="614.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
+						<g transform="translate(69056.25, 3618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(56894.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
+						<g transform="translate(69056.25, 3709)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="int Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="57185.5" y="614.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
+					<g data-name="FormArray">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
+							<rect x="63048.0" y="3998.5" height="31.0" width="98.0" data-name="FormArray"></rect>
 						</g>
-						<g transform="translate(57185.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
+						<g transform="translate(63048, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
-							<rect x="79333.8" y="575.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
-							<path d="M79333.8 606.5 L79771.8 606.5" fill="none" data-name="InviteCodeFormView"></path>
-							<path d="M79333.8 637.5 L79771.8 637.5" fill="none" data-name="InviteCodeFormView"></path>
+					<g data-name="CustomFormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
+							<rect x="64751.0" y="3639.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
+							<path d="M64751.0 3670.5 L65164.0 3670.5" fill="none" data-name="CustomFormControl"></path>
+							<path d="M64751.0 3776.5 L65164.0 3776.5" fill="none" data-name="CustomFormControl"></path>
 						</g>
-						<g transform="translate(79333.75, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
-								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
+						<g transform="translate(64751, 3639.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79333.75, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
+						<g transform="translate(64751, 3670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79333.75, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
+						<g transform="translate(64751, 3776.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="73332.8" y="1023.5" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M73332.8 1054.5 L73999.8 1054.5" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M73332.8 1280.5 L73999.8 1280.5" fill="none" data-name="InviteCodeFormViewModel"></path>
+					<g data-name="void Function(T?)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
+							<rect x="41891.3" y="3998.5" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
 						</g>
-						<g transform="translate(73332.75, 1023.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
-								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
+						<g transform="translate(41891.25, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73332.75, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
-								
-							</g>
+					</g>
+					<g data-name="void Function(ControlStatus)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
+							<rect x="65597.5" y="3998.5" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
 						</g>
-						<g transform="translate(73332.75, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
+						<g transform="translate(65597.5, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IInviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="72867.8" y="1666.5" height="62.0" width="265.0" data-name="IInviteCodeRepository"></rect>
-							<path d="M72867.8 1697.5 L73132.8 1697.5" fill="none" data-name="IInviteCodeRepository"></path>
+					<g data-name="UnsavedChangesDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
+							<rect x="76212.0" y="105.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
+							<path d="M76212.0 136.5 L76419.0 136.5" fill="none" data-name="UnsavedChangesDialog"></path>
 						</g>
-						<g transform="translate(72867.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
+						<g transform="translate(76212, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72867.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IInviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IInviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
+						<g transform="translate(76212, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRecruitController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="63847.0" y="1121.0" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M63847.0 1152.0 L64498.0 1152.0" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M63847.0 1198.0 L64498.0 1198.0" fill="none" data-name="StudyRecruitController"></path>
+					<g data-name="FormValidationSetEnum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
+							<rect x="68549.3" y="1197.0" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
 						</g>
-						<g transform="translate(63847, 1121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
-								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
+						<g transform="translate(68549.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
+								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63847, 1152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
+					</g>
+					<g data-name="FormControlValidation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
+							<rect x="31835.8" y="2496.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
+							<path d="M31835.8 2527.0 L32320.8 2527.0" fill="none" data-name="FormControlValidation"></path>
+							<path d="M31835.8 2603.0 L32320.8 2603.0" fill="none" data-name="FormControlValidation"></path>
+						</g>
+						<g transform="translate(31835.75, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
+								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63847, 1198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
+						<g transform="translate(31835.75, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(31835.75, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRecruitScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="29309.0" y="2511.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M29309.0 2542.5 L29623.0 2542.5" fill="none" data-name="StudyRecruitScreen"></path>
+					<g data-name="IFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
+							<rect x="46395.0" y="1166.0" height="93.0" width="163.0" data-name="IFormData"></rect>
+							<path d="M46395.0 1197.0 L46558.0 1197.0" fill="none" data-name="IFormData"></path>
+							<path d="M46395.0 1228.0 L46558.0 1228.0" fill="none" data-name="IFormData"></path>
 						</g>
-						<g transform="translate(29309, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
+						<g transform="translate(46395, 1166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
+								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29309, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
+						<g transform="translate(46395, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(46395, 1228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrolledBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="62230.3" y="90.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M62230.3 121.0 L62396.3 121.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M62230.3 152.0 L62396.3 152.0" fill="none" data-name="EnrolledBadge"></path>
+					<g data-name="FormInvalidException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
+							<rect x="42131.8" y="614.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
 						</g>
-						<g transform="translate(62230.25, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
+						<g transform="translate(42131.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
+								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62230.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
+					</g>
+					<g data-name="FormConfigException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
+							<rect x="42357.8" y="598.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
+							<path d="M42357.8 629.5 L42542.8 629.5" fill="none" data-name="FormConfigException"></path>
+						</g>
+						<g transform="translate(42357.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
+								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62230.25, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
+						<g transform="translate(42357.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PublishConfirmationDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
-							<rect x="34234.3" y="2534.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
-							<path d="M34234.3 2565.0 L34458.3 2565.0" fill="none" data-name="PublishConfirmationDialog"></path>
+					<g data-name="IFormViewModelDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
+							<rect x="69706.8" y="1174.0" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
+							<path d="M69706.8 1205.0 L69923.8 1205.0" fill="none" data-name="IFormViewModelDelegate"></path>
 						</g>
-						<g transform="translate(34234.25, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
+						<g transform="translate(69706.75, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
+								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34234.25, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
+						<g transform="translate(69706.75, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PublishSuccessDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
-							<rect x="35061.5" y="2534.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
-							<path d="M35061.5 2565.0 L35252.5 2565.0" fill="none" data-name="PublishSuccessDialog"></path>
+					<g data-name="FormControlOption">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
+							<rect x="22953.8" y="2511.5" height="107.0" width="190.0" data-name="FormControlOption"></rect>
+							<path d="M22953.8 2542.5 L23143.8 2542.5" fill="none" data-name="FormControlOption"></path>
 						</g>
-						<g transform="translate(35061.5, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
+						<g transform="translate(22953.75, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
+								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35061.5, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
+						<g transform="translate(22953.75, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PublishDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
-							<rect x="35292.5" y="2534.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
-							<path d="M35292.5 2565.0 L35428.5 2565.0" fill="none" data-name="PublishDialog"></path>
+					<g data-name="FormMode">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
+							<rect x="30462.0" y="3319.5" height="122.0" width="282.0" data-name="FormMode"></rect>
+							<path d="M30462.0 3350.5 L30744.0 3350.5" fill="none" data-name="FormMode"></path>
 						</g>
-						<g transform="translate(35292.5, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
+						<g transform="translate(30462, 3319.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35292.5, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
+						<g transform="translate(30462, 3350.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="21753.8" y="2503.5" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M21753.8 2534.5 L22141.8 2534.5" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M21753.8 2595.5 L22141.8 2595.5" fill="none" data-name="StudyFormScaffold"></path>
+					<g data-name="EnrolledBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
+							<rect x="76459.0" y="90.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
+							<path d="M76459.0 121.0 L76625.0 121.0" fill="none" data-name="EnrolledBadge"></path>
+							<path d="M76459.0 152.0 L76625.0 152.0" fill="none" data-name="EnrolledBadge"></path>
 						</g>
-						<g transform="translate(21753.75, 2503.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
+						<g transform="translate(76459, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21753.75, 2534.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
+						<g transform="translate(76459, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21753.75, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
+						<g transform="translate(76459, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="T Function(WidgetRef)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="25734.3" y="3365.0" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
+					<g data-name="StudyRecruitController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
+							<rect x="72511.0" y="1121.0" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
+							<path d="M72511.0 1152.0 L73162.0 1152.0" fill="none" data-name="StudyRecruitController"></path>
+							<path d="M72511.0 1198.0 L73162.0 1198.0" fill="none" data-name="StudyRecruitController"></path>
 						</g>
-						<g transform="translate(25734.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
+						<g transform="translate(72511, 1121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
+								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyFormValidationSet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="1067.3" y="3342.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M1067.3 3373.0 L1454.3 3373.0" fill="none" data-name="StudyFormValidationSet"></path>
-						</g>
-						<g transform="translate(1067.25, 3342)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
-								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
+						<g transform="translate(72511, 1152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1067.25, 3373)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
+						<g transform="translate(72511, 1198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="39900.0" y="1568.5" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M39900.0 1599.5 L41068.0 1599.5" fill="none" data-name="QuestionFormData"></path>
-							<path d="M39900.0 1735.5 L41068.0 1735.5" fill="none" data-name="QuestionFormData"></path>
+					<g data-name="IInviteCodeRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
+							<rect x="76921.5" y="1666.5" height="62.0" width="265.0" data-name="IInviteCodeRepository"></rect>
+							<path d="M76921.5 1697.5 L77186.5 1697.5" fill="none" data-name="IInviteCodeRepository"></path>
 						</g>
-						<g transform="translate(39900, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
+						<g transform="translate(76921.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
+								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39900, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
+						<g transform="translate(76921.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IInviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IInviteCodeRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IInviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39900, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
+					</g>
+					<g data-name="StreamSubscription">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
+							<rect x="70682.0" y="3365.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+						</g>
+						<g transform="translate(70682, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
+								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="25281.3" y="3312.0" height="137.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M25281.3 3343.0 L25644.3 3343.0" fill="none" data-name="SurveyQuestionType"></path>
+					<g data-name="StudyBaseController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
+							<rect x="62517.5" y="538.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
+							<path d="M62517.5 569.0 L63063.5 569.0" fill="none" data-name="StudyBaseController"></path>
+							<path d="M62517.5 645.0 L63063.5 645.0" fill="none" data-name="StudyBaseController"></path>
 						</g>
-						<g transform="translate(25281.25, 3312)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
+						<g transform="translate(62517.5, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
+								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25281.25, 3343)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
+						<g transform="translate(62517.5, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="39904.0" y="2481.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M39904.0 2512.0 L40248.0 2512.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M39904.0 2573.0 L40248.0 2573.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-						</g>
-						<g transform="translate(39904, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
+						<g transform="translate(62517.5, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39904, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+					</g>
+					<g data-name="StudyRecruitScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
+							<rect x="27641.5" y="2511.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
+							<path d="M27641.5 2542.5 L27955.5 2542.5" fill="none" data-name="StudyRecruitScreen"></path>
+						</g>
+						<g transform="translate(27641.5, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
+								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39904, 2573)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(27641.5, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="40288.0" y="2496.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M40288.0 2527.0 L40680.0 2527.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M40288.0 2573.0 L40680.0 2573.0" fill="none" data-name="BoolQuestionFormData"></path>
+					<g data-name="InviteCodeFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
+							<rect x="78009.5" y="575.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
+							<path d="M78009.5 606.5 L78447.5 606.5" fill="none" data-name="InviteCodeFormView"></path>
+							<path d="M78009.5 637.5 L78447.5 637.5" fill="none" data-name="InviteCodeFormView"></path>
 						</g>
-						<g transform="translate(40288, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
+						<g transform="translate(78009.5, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
+								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40288, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(78009.5, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40288, 2573)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(78009.5, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="40720.0" y="2421.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M40720.0 2452.0 L41064.0 2452.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M40720.0 2648.0 L41064.0 2648.0" fill="none" data-name="ScaleQuestionFormData"></path>
+					<g data-name="InviteCodeFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
+							<rect x="76174.5" y="1023.5" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
+							<path d="M76174.5 1054.5 L76841.5 1054.5" fill="none" data-name="InviteCodeFormViewModel"></path>
+							<path d="M76174.5 1280.5 L76841.5 1280.5" fill="none" data-name="InviteCodeFormViewModel"></path>
 						</g>
-						<g transform="translate(40720, 2421)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
+						<g transform="translate(76174.5, 1023.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
+								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40720, 2452)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
+						<g transform="translate(76174.5, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40720, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(76174.5, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="41104.0" y="2481.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M41104.0 2512.0 L41448.0 2512.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M41104.0 2588.0 L41448.0 2588.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+					<g data-name="StudyInvitesTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
+							<rect x="65080.5" y="45.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
+							<path d="M65080.5 76.0 L65646.5 76.0" fill="none" data-name="StudyInvitesTable"></path>
+							<path d="M65080.5 182.0 L65646.5 182.0" fill="none" data-name="StudyInvitesTable"></path>
 						</g>
-						<g transform="translate(41104, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
+						<g transform="translate(65080.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
+								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41104, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(65080.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41104, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(65080.5, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="41178.0" y="3365.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+					<g data-name="void Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
+							<rect x="64884.3" y="614.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(41178, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
+						<g transform="translate(64884.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
+								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="31508.3" y="1659.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M31508.3 1690.0 L31860.3 1690.0" fill="none" data-name="SurveyQuestionFormView"></path>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+							<rect x="65146.3" y="614.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(31508.25, 1659)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
+						<g transform="translate(65146.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31508.25, 1690)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
+					</g>
+					<g data-name="Intervention? Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
+							<rect x="65606.3" y="614.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
+						</g>
+						<g transform="translate(65606.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="41900.0" y="1956.0" height="1218.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M41900.0 1987.0 L42913.0 1987.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M41900.0 2888.0 L42913.0 2888.0" fill="none" data-name="QuestionFormViewModel"></path>
+					<g data-name="int Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
+							<rect x="65897.3" y="614.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(41900, 1956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
+						<g transform="translate(65897.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41900, 1987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+					</g>
+					<g data-name="PublishSuccessDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
+							<rect x="27995.5" y="2534.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
+							<path d="M27995.5 2565.0 L28186.5 2565.0" fill="none" data-name="PublishSuccessDialog"></path>
+						</g>
+						<g transform="translate(27995.5, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41900, 2888)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
+						<g transform="translate(27995.5, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="62436.3" y="105.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M62436.3 136.5 L62745.3 136.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
+					<g data-name="PublishDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
+							<rect x="29405.5" y="2534.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
+							<path d="M29405.5 2565.0 L29541.5 2565.0" fill="none" data-name="PublishDialog"></path>
 						</g>
-						<g transform="translate(62436.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
+						<g transform="translate(29405.5, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62436.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(29405.5, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="31900.3" y="1666.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M31900.3 1697.5 L32252.3 1697.5" fill="none" data-name="ScaleQuestionFormView"></path>
+					<g data-name="PublishConfirmationDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
+							<rect x="32360.8" y="2534.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
+							<path d="M32360.8 2565.0 L32584.8 2565.0" fill="none" data-name="PublishConfirmationDialog"></path>
 						</g>
-						<g transform="translate(31900.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
+						<g transform="translate(32360.75, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
+								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31900.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(32360.75, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="22299.8" y="1651.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M22299.8 1682.0 L22651.8 1682.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M22299.8 1713.0 L22651.8 1713.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+					<g data-name="FrameControlsWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
+							<rect x="18103.0" y="3662.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
+							<path d="M18103.0 3693.0 L18394.0 3693.0" fill="none" data-name="FrameControlsWidget"></path>
+							<path d="M18103.0 3754.0 L18394.0 3754.0" fill="none" data-name="FrameControlsWidget"></path>
 						</g>
-						<g transform="translate(22299.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
+						<g transform="translate(18103, 3662)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
+								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22299.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(18103, 3693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22299.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
+						<g transform="translate(18103, 3754)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="28932.3" y="1651.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M28932.3 1682.0 L29284.3 1682.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M28932.3 1713.0 L29284.3 1713.0" fill="none" data-name="BoolQuestionFormView"></path>
+					<g data-name="IStudyStatusBadgeViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
+							<rect x="33983.3" y="2526.5" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
+							<path d="M33983.3 2557.5 L34268.3 2557.5" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
 						</g>
-						<g transform="translate(28932.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
+						<g transform="translate(33983.25, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
+								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28932.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(33983.25, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28932.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+					</g>
+					<g data-name="Participation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
+							<rect x="44079.3" y="3365.0" height="31.0" width="114.0" data-name="Participation"></rect>
+						</g>
+						<g transform="translate(44079.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
+								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="29324.3" y="1628.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M29324.3 1659.5 L29676.3 1659.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M29324.3 1705.5 L29676.3 1705.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+					<g data-name="StudyStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
+							<rect x="42606.3" y="3365.0" height="31.0" width="111.0" data-name="StudyStatus"></rect>
 						</g>
-						<g transform="translate(29324.25, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
+						<g transform="translate(42606.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
+								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29324.25, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
+					</g>
+					<g data-name="StudyStatusBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
+							<rect x="34308.3" y="2488.5" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
+							<path d="M34308.3 2519.5 L34549.3 2519.5" fill="none" data-name="StudyStatusBadge"></path>
+							<path d="M34308.3 2610.5 L34549.3 2610.5" fill="none" data-name="StudyStatusBadge"></path>
+						</g>
+						<g transform="translate(34308.25, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
+								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29324.25, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
+						<g transform="translate(34308.25, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(34308.25, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="77171.3" y="1659.0" height="77.0" width="179.0" data-name="IListActionProvider"></rect>
-							<path d="M77171.3 1690.0 L77350.3 1690.0" fill="none" data-name="IListActionProvider"></path>
+					<g data-name="RouteInformation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
+							<rect x="42906.3" y="3311.5" height="138.0" width="152.0" data-name="RouteInformation"></rect>
+							<path d="M42906.3 3342.5 L43058.3 3342.5" fill="none" data-name="RouteInformation"></path>
+							<path d="M42906.3 3418.5 L43058.3 3418.5" fill="none" data-name="RouteInformation"></path>
 						</g>
-						<g transform="translate(77171.25, 1659)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
+						<g transform="translate(42906.25, 3311.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77171.25, 1690)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IListActionProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="IListActionProvider">+void onSelectItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IListActionProvider">+void onNewItem()</text>
+						<g transform="translate(42906.25, 3342.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(42906.25, 3418.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="56554.8" y="1568.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M56554.8 1599.5 L57186.8 1599.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M56554.8 1705.5 L57186.8 1705.5" fill="none" data-name="WithQuestionnaireControls"></path>
+					<g data-name="PlatformController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
+							<rect x="34589.3" y="2436.0" height="258.0" width="302.0" data-name="PlatformController"></rect>
+							<path d="M34589.3 2467.0 L34891.3 2467.0" fill="none" data-name="PlatformController"></path>
+							<path d="M34589.3 2558.0 L34891.3 2558.0" fill="none" data-name="PlatformController"></path>
 						</g>
-						<g transform="translate(56554.75, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
+						<g transform="translate(34589.25, 2436)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
+								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56554.75, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
+						<g transform="translate(34589.25, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56554.75, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
+						<g transform="translate(34589.25, 2558)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="55778.3" y="1181.5" height="62.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-							<path d="M55778.3 1212.5 L55971.3 1212.5" fill="none" data-name="IProviderArgsResolver"></path>
+					<g data-name="WebController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
+							<rect x="43381.3" y="3281.5" height="198.0" width="273.0" data-name="WebController"></rect>
+							<path d="M43381.3 3312.5 L43654.3 3312.5" fill="none" data-name="WebController"></path>
+							<path d="M43381.3 3343.5 L43654.3 3343.5" fill="none" data-name="WebController"></path>
 						</g>
-						<g transform="translate(55778.25, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
+						<g transform="translate(43381.25, 3281.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
+								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55778.25, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IProviderArgsResolver">
-								<text x="0.0" y="13.5" stroke="none" data-name="IProviderArgsResolver">+R provide()</text>
+						<g transform="translate(43381.25, 3312.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
+								
+							</g>
+						</g>
+						<g transform="translate(43381.25, 3343.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="44827.5" y="3311.5" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M44827.5 3342.5 L45195.5 3342.5" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M44827.5 3388.5 L45195.5 3388.5" fill="none" data-name="QuestionnaireFormData"></path>
+					<g data-name="IFrameElement">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
+							<rect x="43450.3" y="3708.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
 						</g>
-						<g transform="translate(44827.5, 3311.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
+						<g transform="translate(43450.25, 3708)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
+								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44827.5, 3342.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
+					</g>
+					<g data-name="MobileController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
+							<rect x="43694.3" y="3297.0" height="167.0" width="191.0" data-name="MobileController"></rect>
+							<path d="M43694.3 3328.0 L43885.3 3328.0" fill="none" data-name="MobileController"></path>
+						</g>
+						<g transform="translate(43694.25, 3297)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44827.5, 3388.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
+						<g transform="translate(43694.25, 3328)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
+								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="43149.0" y="1613.5" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M43149.0 1644.5 L43447.0 1644.5" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M43149.0 1750.5 L43447.0 1750.5" fill="none" data-name="IFormDataWithSchedule"></path>
+					<g data-name="StudyController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
+							<rect x="61715.3" y="2451.0" height="228.0" width="573.0" data-name="StudyController"></rect>
+							<path d="M61715.3 2482.0 L62288.3 2482.0" fill="none" data-name="StudyController"></path>
+							<path d="M61715.3 2543.0 L62288.3 2543.0" fill="none" data-name="StudyController"></path>
 						</g>
-						<g transform="translate(43149, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
+						<g transform="translate(61715.25, 2451)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
+								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43149, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
+						<g transform="translate(61715.25, 2482)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43149, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
+						<g transform="translate(61715.25, 2543)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="42953.0" y="2549.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
+					<g data-name="IStudyNavViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
+							<rect x="35902.8" y="2496.5" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
+							<path d="M35902.8 2527.5 L36143.8 2527.5" fill="none" data-name="IStudyNavViewModel"></path>
 						</g>
-						<g transform="translate(42953, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
+						<g transform="translate(35902.75, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
+								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="79595.8" y="1158.5" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M79595.8 1189.5 L80027.8 1189.5" fill="none" data-name="ScheduleControls"></path>
-							<path d="M79595.8 1220.5 L80027.8 1220.5" fill="none" data-name="ScheduleControls"></path>
-						</g>
-						<g transform="translate(79595.75, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
+						<g transform="translate(35902.75, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79595.75, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
+					</g>
+					<g data-name="StudyNav">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
+							<rect x="76906.3" y="68.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
+							<path d="M76906.3 99.0 L77139.3 99.0" fill="none" data-name="StudyNav"></path>
+						</g>
+						<g transform="translate(76906.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79595.75, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
+						<g transform="translate(76906.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="79564.3" y="1546.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M79564.3 1577.0 L80059.3 1577.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M79564.3 1803.0 L80059.3 1803.0" fill="none" data-name="WithScheduleControls"></path>
-						</g>
-						<g transform="translate(79564.25, 1546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
-								
-							</g>
+					<g data-name="StudyDesignNav">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
+							<rect x="77179.3" y="68.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
+							<path d="M77179.3 99.0 L77467.3 99.0" fill="none" data-name="StudyDesignNav"></path>
 						</g>
-						<g transform="translate(79564.25, 1577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
+						<g transform="translate(77179.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
+								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79564.25, 1803)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
+						<g transform="translate(77179.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="65137.0" y="2331.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M65137.0 2362.0 L65992.0 2362.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M65137.0 2588.0 L65992.0 2588.0" fill="none" data-name="InterventionFormViewModel"></path>
+					<g data-name="StudyParticipationBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
+							<rect x="36183.8" y="2496.0" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
+							<path d="M36183.8 2527.0 L36414.8 2527.0" fill="none" data-name="StudyParticipationBadge"></path>
+							<path d="M36183.8 2603.0 L36414.8 2603.0" fill="none" data-name="StudyParticipationBadge"></path>
 						</g>
-						<g transform="translate(65137, 2331)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
-								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
+						<g transform="translate(36183.75, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
+								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65137, 2362)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(36183.75, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65137, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
+						<g transform="translate(36183.75, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="45509.5" y="3281.5" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M45509.5 3312.5 L45805.5 3312.5" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M45509.5 3418.5 L45805.5 3418.5" fill="none" data-name="StudyScheduleFormData"></path>
+					<g data-name="IStudyRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
+							<rect x="74947.5" y="3342.0" height="77.0" width="251.0" data-name="IStudyRepository"></rect>
+							<path d="M74947.5 3373.0 L75198.5 3373.0" fill="none" data-name="IStudyRepository"></path>
 						</g>
-						<g transform="translate(45509.5, 3281.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
+						<g transform="translate(74947.5, 3342)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45509.5, 3312.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
+						<g transform="translate(74947.5, 3373)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyRepository">+dynamic launch()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyRepository">+dynamic deleteParticipants()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45509.5, 3418.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
+					</g>
+					<g data-name="PreviewFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
+							<rect x="53986.5" y="1166.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
+							<path d="M53986.5 1197.5 L54277.5 1197.5" fill="none" data-name="PreviewFrame"></path>
+						</g>
+						<g transform="translate(53986.5, 1166.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
+								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PhaseSequence">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="67615.3" y="3708.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
-						</g>
-						<g transform="translate(67615.25, 3708)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
-								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
+						<g transform="translate(53986.5, 1197.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="47129.0" y="1666.5" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M47129.0 1697.5 L47272.0 1697.5" fill="none" data-name="IStudyFormData"></path>
+					<g data-name="IStudyAppBarViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
+							<rect x="43098.3" y="3334.5" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
+							<path d="M43098.3 3365.5 L43341.3 3365.5" fill="none" data-name="IStudyAppBarViewModel"></path>
 						</g>
-						<g transform="translate(47129, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
+						<g transform="translate(43098.25, 3334.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
+								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47129, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
+						<g transform="translate(43098.25, 3365.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="80298.8" y="1158.5" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M80298.8 1189.5 L80657.8 1189.5" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M80298.8 1220.5 L80657.8 1220.5" fill="none" data-name="StudyScheduleFormView"></path>
-						</g>
-						<g transform="translate(80298.75, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
-								
-							</g>
+					<g data-name="StudyScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
+							<rect x="56803.5" y="1091.5" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
+							<path d="M56803.5 1122.5 L57138.5 1122.5" fill="none" data-name="StudyScaffold"></path>
 						</g>
-						<g transform="translate(80298.75, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
+						<g transform="translate(56803.5, 1091.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
+								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80298.75, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
+						<g transform="translate(56803.5, 1122.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="80099.3" y="1501.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M80099.3 1532.0 L80857.3 1532.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M80099.3 1833.0 L80857.3 1833.0" fill="none" data-name="StudyScheduleControls"></path>
+					<g data-name="WebFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
+							<rect x="77507.3" y="82.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
+							<path d="M77507.3 113.5 L77676.3 113.5" fill="none" data-name="WebFrame"></path>
+							<path d="M77507.3 159.5 L77676.3 159.5" fill="none" data-name="WebFrame"></path>
 						</g>
-						<g transform="translate(80099.25, 1501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
-								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
+						<g transform="translate(77507.25, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
+								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80099.25, 1532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
+						<g transform="translate(77507.25, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80099.25, 1833)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
+						<g transform="translate(77507.25, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="42298.0" y="1666.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M42298.0 1697.5 L42711.0 1697.5" fill="none" data-name="InterventionTaskFormView"></path>
+					<g data-name="DisabledFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
+							<rect x="77716.3" y="105.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
+							<path d="M77716.3 136.5 L77852.3 136.5" fill="none" data-name="DisabledFrame"></path>
 						</g>
-						<g transform="translate(42298, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
+						<g transform="translate(77716.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42298, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
+						<g transform="translate(77716.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="66272.0" y="2428.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M66272.0 2459.5 L66968.0 2459.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M66272.0 2640.5 L66968.0 2640.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+					<g data-name="PhoneContainer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
+							<rect x="36454.8" y="2458.5" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
+							<path d="M36454.8 2489.5 L36781.8 2489.5" fill="none" data-name="PhoneContainer"></path>
+							<path d="M36454.8 2640.5 L36781.8 2640.5" fill="none" data-name="PhoneContainer"></path>
 						</g>
-						<g transform="translate(66272, 2428.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
+						<g transform="translate(36454.75, 2458.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
+								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(66272, 2459.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(36454.75, 2489.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
+								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(66272, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
+						<g transform="translate(36454.75, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
+								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="29716.3" y="1651.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M29716.3 1682.0 L30046.3 1682.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M29716.3 1713.0 L30046.3 1713.0" fill="none" data-name="InterventionPreview"></path>
+					<g data-name="MobileFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
+							<rect x="77892.3" y="105.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
+							<path d="M77892.3 136.5 L78028.3 136.5" fill="none" data-name="MobileFrame"></path>
 						</g>
-						<g transform="translate(29716.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
+						<g transform="translate(77892.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29716.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
+						<g transform="translate(77892.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29716.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
+					</g>
+					<g data-name="DesktopFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
+							<rect x="78068.3" y="105.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
+							<path d="M78068.3 136.5 L78204.3 136.5" fill="none" data-name="DesktopFrame"></path>
+						</g>
+						<g transform="translate(78068.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
+								
+							</g>
+						</g>
+						<g transform="translate(78068.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="44647.5" y="2496.0" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M44647.5 2527.0 L45041.5 2527.0" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M44647.5 2588.0 L45041.5 2588.0" fill="none" data-name="InterventionsFormData"></path>
+					<g data-name="StudyTestScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
+							<rect x="32624.8" y="2488.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
+							<path d="M32624.8 2519.5 L32824.8 2519.5" fill="none" data-name="StudyTestScreen"></path>
+							<path d="M32624.8 2550.5 L32824.8 2550.5" fill="none" data-name="StudyTestScreen"></path>
 						</g>
-						<g transform="translate(44647.5, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
+						<g transform="translate(32624.75, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
+								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44647.5, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
+						<g transform="translate(32624.75, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44647.5, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
+						<g transform="translate(32624.75, 2550.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="43153.0" y="2481.0" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M43153.0 2512.0 L43443.0 2512.0" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M43153.0 2603.0 L43443.0 2603.0" fill="none" data-name="InterventionTaskFormData"></path>
+					<g data-name="StudySettingsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
+							<rect x="74439.8" y="2436.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
+							<path d="M74439.8 2467.0 L74918.8 2467.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+							<path d="M74439.8 2603.0 L74918.8 2603.0" fill="none" data-name="StudySettingsFormViewModel"></path>
 						</g>
-						<g transform="translate(43153, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
+						<g transform="translate(74439.75, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43153, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
+						<g transform="translate(74439.75, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43153, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
+						<g transform="translate(74439.75, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="43540.0" y="1666.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M43540.0 1697.5 L43915.0 1697.5" fill="none" data-name="InterventionFormView"></path>
+					<g data-name="StudySettingsDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
+							<rect x="32864.8" y="2534.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
+							<path d="M32864.8 2565.0 L33039.8 2565.0" fill="none" data-name="StudySettingsDialog"></path>
 						</g>
-						<g transform="translate(43540, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
-								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
+						<g transform="translate(32864.75, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
+								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43540, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
+						<g transform="translate(32864.75, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignInterventionsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="34632.8" y="3349.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M34632.8 3380.5 L34928.8 3380.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
+					<g data-name="StudyTestController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
+							<rect x="64199.3" y="3685.0" height="77.0" width="282.0" data-name="StudyTestController"></rect>
+							<path d="M64199.3 3716.0 L64481.3 3716.0" fill="none" data-name="StudyTestController"></path>
 						</g>
-						<g transform="translate(34632.75, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
+						<g transform="translate(64199.25, 3685)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34632.75, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
+						<g transform="translate(64199.25, 3716)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="35506.8" y="2534.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M35506.8 2565.0 L35718.8 2565.0" fill="none" data-name="StudyDesignPageWidget"></path>
+					<g data-name="TestAppRoutes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
+							<rect x="78244.3" y="68.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
+							<path d="M78244.3 99.0 L78504.3 99.0" fill="none" data-name="TestAppRoutes"></path>
 						</g>
-						<g transform="translate(35506.75, 2534)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
+						<g transform="translate(78244.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
+								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35506.75, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
+						<g transform="translate(78244.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
+								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="71172.8" y="2376.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M71172.8 2407.0 L72011.8 2407.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M71172.8 2558.0 L72011.8 2558.0" fill="none" data-name="InterventionsFormViewModel"></path>
-						</g>
-						<g transform="translate(71172.75, 2376)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
-								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
-								
-							</g>
+					<g data-name="DrawerEntry">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
+							<rect x="60039.8" y="1113.5" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
+							<path d="M60039.8 1144.5 L60484.8 1144.5" fill="none" data-name="DrawerEntry"></path>
+							<path d="M60039.8 1280.5 L60484.8 1280.5" fill="none" data-name="DrawerEntry"></path>
 						</g>
-						<g transform="translate(71172.75, 2407)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
+						<g transform="translate(60039.75, 1113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
+								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(71172.75, 2558)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
+						<g transform="translate(60039.75, 1144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DrawerEntry">+localizedHelpText: String Function()?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DrawerEntry">+enabled: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DrawerEntry">+onSelected: void Function(BuildContext, WidgetRef)?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DrawerEntry">+autoCloseDrawer: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DrawerEntry">+title: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="DrawerEntry">+helpText: String?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(60039.75, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="43955.0" y="1598.5" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M43955.0 1629.5 L44337.0 1629.5" fill="none" data-name="InterventionFormData"></path>
-							<path d="M43955.0 1750.5 L44337.0 1750.5" fill="none" data-name="InterventionFormData"></path>
+					<g data-name="String Function()">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
+							<rect x="60072.8" y="1682.0" height="31.0" width="147.0" data-name="String Function()"></rect>
 						</g>
-						<g transform="translate(43955, 1598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
+						<g transform="translate(60072.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
+								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43955, 1629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
+					</g>
+					<g data-name="String Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
+							<rect x="60557.0" y="1682.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
+						</g>
+						<g transform="translate(60557, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
+								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43955, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
+					</g>
+					<g data-name="void Function(BuildContext, WidgetRef)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
+							<rect x="60754.0" y="1682.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
+						</g>
+						<g transform="translate(60754, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
+								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="46108.5" y="2481.0" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M46108.5 2512.0 L46562.5 2512.0" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M46108.5 2603.0 L46562.5 2603.0" fill="none" data-name="EnrollmentFormData"></path>
+					<g data-name="GoRouterDrawerEntry">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
+							<rect x="61130.0" y="1643.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
+							<path d="M61130.0 1674.5 L61394.0 1674.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+							<path d="M61130.0 1720.5 L61394.0 1720.5" fill="none" data-name="GoRouterDrawerEntry"></path>
 						</g>
-						<g transform="translate(46108.5, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
-								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
+						<g transform="translate(61130, 1643.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
+								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46108.5, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
+						<g transform="translate(61130, 1674.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46108.5, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
+						<g transform="translate(61130, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="56074.8" y="2436.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M56074.8 2467.0 L56770.8 2467.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M56074.8 2633.0 L56770.8 2633.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+					<g data-name="AppDrawer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
+							<rect x="78544.3" y="53.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
+							<path d="M78544.3 84.0 L78813.3 84.0" fill="none" data-name="AppDrawer"></path>
 						</g>
-						<g transform="translate(56074.75, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
+						<g transform="translate(78544.25, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
+								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56074.75, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(78544.25, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppDrawer">+leftPaddingEntries: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AppDrawer">+logoPaddingVertical: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AppDrawer">+logoPaddingHorizontal: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AppDrawer">+logoMaxHeight: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AppDrawer">+logoSectionMinHeight: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AppDrawer">+logoSectionMaxHeight: double</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56074.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
+					</g>
+					<g data-name="StudyAnalyzeScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
+							<rect x="33079.8" y="2526.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
+							<path d="M33079.8 2557.5 L33259.8 2557.5" fill="none" data-name="StudyAnalyzeScreen"></path>
+						</g>
+						<g transform="translate(33079.75, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
+								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
+								
+							</g>
+						</g>
+						<g transform="translate(33079.75, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="44377.0" y="1666.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M44377.0 1697.5 L44758.0 1697.5" fill="none" data-name="ConsentItemFormView"></path>
+					<g data-name="StudyAnalyzeController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
+							<rect x="64380.3" y="1181.5" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
+							<path d="M64380.3 1212.5 L64581.3 1212.5" fill="none" data-name="StudyAnalyzeController"></path>
 						</g>
-						<g transform="translate(44377, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
+						<g transform="translate(64380.25, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
+								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44377, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
+						<g transform="translate(64380.25, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IScreenerQuestionLogicFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="41488.0" y="2534.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M41488.0 2565.0 L41820.0 2565.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
+					<g data-name="StudyDesignInterventionsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
+							<rect x="40735.3" y="3349.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
+							<path d="M40735.3 3380.5 L41031.3 3380.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
 						</g>
-						<g transform="translate(41488, 2534)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
+						<g transform="translate(40735.25, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41488, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+						<g transform="translate(40735.25, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionLogicFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="80685.3" y="2496.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M80685.3 2527.0 L81109.3 2527.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M80685.3 2558.0 L81109.3 2558.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+					<g data-name="StudyDesignPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
+							<rect x="33299.8" y="2534.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
+							<path d="M33299.8 2565.0 L33511.8 2565.0" fill="none" data-name="StudyDesignPageWidget"></path>
 						</g>
-						<g transform="translate(80685.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
-								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
+						<g transform="translate(33299.75, 2534)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
+								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80685.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
+						<g transform="translate(33299.75, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80685.25, 2558)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
+					</g>
+					<g data-name="InterventionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
+							<rect x="37290.8" y="1666.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
+							<path d="M37290.8 1697.5 L37665.8 1697.5" fill="none" data-name="InterventionFormView"></path>
+						</g>
+						<g transform="translate(37290.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
+								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(37290.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="56027.8" y="3214.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M56027.8 3245.0 L56589.8 3245.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M56027.8 3426.0 L56589.8 3426.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+					<g data-name="InterventionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
+							<rect x="62328.3" y="2331.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
+							<path d="M62328.3 2362.0 L63183.3 2362.0" fill="none" data-name="InterventionFormViewModel"></path>
+							<path d="M62328.3 2588.0 L63183.3 2588.0" fill="none" data-name="InterventionFormViewModel"></path>
 						</g>
-						<g transform="translate(56027.75, 3214)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
-								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
+						<g transform="translate(62328.25, 2331)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
+								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56027.75, 3245)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+						<g transform="translate(62328.25, 2362)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56027.75, 3426)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
+						<g transform="translate(62328.25, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignEnrollmentFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="34968.8" y="3334.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M34968.8 3365.5 L35417.8 3365.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
+					<g data-name="InterventionPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
+							<rect x="30319.3" y="1651.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
+							<path d="M30319.3 1682.0 L30649.3 1682.0" fill="none" data-name="InterventionPreview"></path>
+							<path d="M30319.3 1713.0 L30649.3 1713.0" fill="none" data-name="InterventionPreview"></path>
 						</g>
-						<g transform="translate(34968.75, 3334.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
+						<g transform="translate(30319.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34968.75, 3365.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
+						<g transform="translate(30319.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
+								
+							</g>
+						</g>
+						<g transform="translate(30319.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="45639.0" y="1613.5" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M45639.0 1644.5 L45897.0 1644.5" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M45639.0 1735.5 L45897.0 1735.5" fill="none" data-name="ConsentItemFormData"></path>
+					<g data-name="StudyScheduleFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
+							<rect x="78363.3" y="1158.5" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
+							<path d="M78363.3 1189.5 L78722.3 1189.5" fill="none" data-name="StudyScheduleFormView"></path>
+							<path d="M78363.3 1220.5 L78722.3 1220.5" fill="none" data-name="StudyScheduleFormView"></path>
 						</g>
-						<g transform="translate(45639, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
+						<g transform="translate(78363.25, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
+								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45639, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
+						<g transform="translate(78363.25, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45639, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
+						<g transform="translate(78363.25, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="67906.5" y="2316.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M67906.5 2347.0 L68808.5 2347.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M67906.5 2573.0 L68808.5 2573.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+					<g data-name="StudyScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
+							<rect x="78163.8" y="1501.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
+							<path d="M78163.8 1532.0 L78921.8 1532.0" fill="none" data-name="StudyScheduleControls"></path>
+							<path d="M78163.8 1833.0 L78921.8 1833.0" fill="none" data-name="StudyScheduleControls"></path>
 						</g>
-						<g transform="translate(67906.5, 2316)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
-								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
+						<g transform="translate(78163.75, 1501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
+								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67906.5, 2347)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
+						<g transform="translate(78163.75, 1532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67906.5, 2573)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
+						<g transform="translate(78163.75, 1833)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormConsentItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="67537.5" y="3274.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M67537.5 3305.0 L68337.5 3305.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M67537.5 3381.0 L68337.5 3381.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+					<g data-name="InterventionTaskFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
+							<rect x="51881.0" y="2481.0" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
+							<path d="M51881.0 2512.0 L52171.0 2512.0" fill="none" data-name="InterventionTaskFormData"></path>
+							<path d="M51881.0 2603.0 L52171.0 2603.0" fill="none" data-name="InterventionTaskFormData"></path>
 						</g>
-						<g transform="translate(67537.5, 3274)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
+						<g transform="translate(51881, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
+								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67537.5, 3305)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
+						<g transform="translate(51881, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67537.5, 3381)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
+						<g transform="translate(51881, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="69960.8" y="2383.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M69960.8 2414.5 L71052.8 2414.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M69960.8 2565.5 L71052.8 2565.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+					<g data-name="IFormDataWithSchedule">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
+							<rect x="52420.0" y="1613.5" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
+							<path d="M52420.0 1644.5 L52718.0 1644.5" fill="none" data-name="IFormDataWithSchedule"></path>
+							<path d="M52420.0 1750.5 L52718.0 1750.5" fill="none" data-name="IFormDataWithSchedule"></path>
 						</g>
-						<g transform="translate(69960.75, 2383.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
-								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
+						<g transform="translate(52420, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
+								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
 								
 							</g>
 						</g>
-						<g transform="translate(69960.75, 2414.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(52420, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(69960.75, 2565.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
+						<g transform="translate(52420, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="43483.0" y="2466.0" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M43483.0 2497.0 L43892.0 2497.0" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M43483.0 2618.0 L43892.0 2618.0" fill="none" data-name="MeasurementSurveyFormData"></path>
+					<g data-name="InterventionsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
+							<rect x="70340.0" y="2376.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
+							<path d="M70340.0 2407.0 L71179.0 2407.0" fill="none" data-name="InterventionsFormViewModel"></path>
+							<path d="M70340.0 2558.0 L71179.0 2558.0" fill="none" data-name="InterventionsFormViewModel"></path>
 						</g>
-						<g transform="translate(43483, 2466)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
+						<g transform="translate(70340, 2376)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
+								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43483, 2497)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
+						<g transform="translate(70340, 2407)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43483, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
+						<g transform="translate(70340, 2558)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="30086.3" y="1651.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M30086.3 1682.0 L30430.3 1682.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M30086.3 1713.0 L30430.3 1713.0" fill="none" data-name="SurveyPreview"></path>
+					<g data-name="InterventionTaskFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
+							<rect x="64723.3" y="2428.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
+							<path d="M64723.3 2459.5 L65419.3 2459.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<path d="M64723.3 2640.5 L65419.3 2640.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
 						</g>
-						<g transform="translate(30086.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
+						<g transform="translate(64723.25, 2428.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30086.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
+						<g transform="translate(64723.25, 2459.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30086.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
+						<g transform="translate(64723.25, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="67094.8" y="2353.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M67094.8 2384.5 L67790.8 2384.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M67094.8 2610.5 L67790.8 2610.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+					<g data-name="WithScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
+							<rect x="79369.3" y="1546.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
+							<path d="M79369.3 1577.0 L79864.3 1577.0" fill="none" data-name="WithScheduleControls"></path>
+							<path d="M79369.3 1803.0 L79864.3 1803.0" fill="none" data-name="WithScheduleControls"></path>
 						</g>
-						<g transform="translate(67094.75, 2353.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
+						<g transform="translate(79369.25, 1546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
+								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67094.75, 2384.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(79369.25, 1577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67094.75, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
+						<g transform="translate(79369.25, 1803)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="49873.5" y="1666.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M49873.5 1697.5 L50317.5 1697.5" fill="none" data-name="MeasurementSurveyFormView"></path>
+					<g data-name="PhaseSequence">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
+							<rect x="69900.0" y="3708.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
 						</g>
-						<g transform="translate(49873.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
+						<g transform="translate(69900, 3708)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
+								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49873.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
+					</g>
+					<g data-name="InterventionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
+							<rect x="41805.0" y="1598.5" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
+							<path d="M41805.0 1629.5 L42187.0 1629.5" fill="none" data-name="InterventionFormData"></path>
+							<path d="M41805.0 1750.5 L42187.0 1750.5" fill="none" data-name="InterventionFormData"></path>
+						</g>
+						<g transform="translate(41805, 1598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
+								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(41805, 1629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(41805, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="46602.5" y="2503.5" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M46602.5 2534.5 L47096.5 2534.5" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M46602.5 2580.5 L47096.5 2580.5" fill="none" data-name="MeasurementsFormData"></path>
+					<g data-name="StudyScheduleFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
+							<rect x="49410.3" y="3281.5" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
+							<path d="M49410.3 3312.5 L49706.3 3312.5" fill="none" data-name="StudyScheduleFormData"></path>
+							<path d="M49410.3 3418.5 L49706.3 3418.5" fill="none" data-name="StudyScheduleFormData"></path>
 						</g>
-						<g transform="translate(46602.5, 2503.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
-								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
+						<g transform="translate(49410.25, 3281.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46602.5, 2534.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
+						<g transform="translate(49410.25, 3312.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46602.5, 2580.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
+						<g transform="translate(49410.25, 3418.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignMeasurementsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="35457.8" y="3349.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M35457.8 3380.5 L35767.8 3380.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
+					<g data-name="IStudyFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
+							<rect x="45564.8" y="1666.5" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
+							<path d="M45564.8 1697.5 L45707.8 1697.5" fill="none" data-name="IStudyFormData"></path>
 						</g>
-						<g transform="translate(35457.75, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
+						<g transform="translate(45564.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
+								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35457.75, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
+						<g transform="translate(45564.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignInfoFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="35807.8" y="3349.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M35807.8 3380.5 L36030.8 3380.5" fill="none" data-name="StudyDesignInfoFormView"></path>
+					<g data-name="InterventionTaskFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
+							<rect x="40147.0" y="1666.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
+							<path d="M40147.0 1697.5 L40560.0 1697.5" fill="none" data-name="InterventionTaskFormView"></path>
 						</g>
-						<g transform="translate(35807.75, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
+						<g transform="translate(40147, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35807.75, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
+						<g transform="translate(40147, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="47136.5" y="2481.0" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M47136.5 2512.0 L47550.5 2512.0" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M47136.5 2603.0 L47550.5 2603.0" fill="none" data-name="StudyInfoFormData"></path>
+					<g data-name="InterventionsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
+							<rect x="43640.3" y="2496.0" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
+							<path d="M43640.3 2527.0 L44034.3 2527.0" fill="none" data-name="InterventionsFormData"></path>
+							<path d="M43640.3 2588.0 L44034.3 2588.0" fill="none" data-name="InterventionsFormData"></path>
 						</g>
-						<g transform="translate(47136.5, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
+						<g transform="translate(43640.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
+								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47136.5, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
+						<g transform="translate(43640.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47136.5, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
+						<g transform="translate(43640.25, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyContactInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="49563.0" y="3266.5" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M49563.0 3297.5 L49911.0 3297.5" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M49563.0 3448.5 L49911.0 3448.5" fill="none" data-name="StudyContactInfoFormData"></path>
+					<g data-name="StudyDesignReportsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
+							<rect x="41071.3" y="3342.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
+							<path d="M41071.3 3373.0 L41464.3 3373.0" fill="none" data-name="StudyDesignReportsFormView"></path>
 						</g>
-						<g transform="translate(49563, 3266.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
-								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
+						<g transform="translate(41071.25, 3342)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
+								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49563, 3297.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
+						<g transform="translate(41071.25, 3373)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49563, 3448.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
+					</g>
+					<g data-name="ReportItemFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
+							<rect x="42837.5" y="1628.5" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
+							<path d="M42837.5 1659.5 L43151.5 1659.5" fill="none" data-name="ReportItemFormData"></path>
+							<path d="M42837.5 1720.5 L43151.5 1720.5" fill="none" data-name="ReportItemFormData"></path>
+						</g>
+						<g transform="translate(42837.5, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
+								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyInfoFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="72051.8" y="2323.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M72051.8 2354.5 L72747.8 2354.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M72051.8 2760.5 L72747.8 2760.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-						</g>
-						<g transform="translate(72051.75, 2323.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
+						<g transform="translate(42837.5, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72051.75, 2354.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
+						<g transform="translate(42837.5, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72051.75, 2760.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
+					</g>
+					<g data-name="ReportSection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
+							<rect x="42930.5" y="2549.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
+						</g>
+						<g transform="translate(42930.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
+								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="71554.3" y="1516.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M71554.3 1547.0 L72250.3 1547.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M71554.3 1758.0 L72250.3 1758.0" fill="none" data-name="StudyFormViewModel"></path>
+					<g data-name="DataReferenceEditor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
+							<rect x="44906.3" y="2496.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
+							<path d="M44906.3 2527.0 L45615.3 2527.0" fill="none" data-name="DataReferenceEditor"></path>
+							<path d="M44906.3 2588.0 L45615.3 2588.0" fill="none" data-name="DataReferenceEditor"></path>
 						</g>
-						<g transform="translate(71554.25, 1516)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
+						<g transform="translate(44906.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
+								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(71554.25, 1547)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(44906.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(71554.25, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
+						<g transform="translate(44906.25, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="68980.8" y="2391.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M68980.8 2422.0 L69840.8 2422.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M68980.8 2588.0 L69840.8 2588.0" fill="none" data-name="ReportsFormViewModel"></path>
+					<g data-name="ReactiveDropdownField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
+							<rect x="49746.3" y="3365.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
 						</g>
-						<g transform="translate(68980.75, 2391)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
-								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
+						<g transform="translate(49746.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
+								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68980.75, 2422)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
+					</g>
+					<g data-name="TemporalAggregationFormatted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
+							<rect x="45655.3" y="2458.5" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
+							<path d="M45655.3 2489.5 L46103.3 2489.5" fill="none" data-name="TemporalAggregationFormatted"></path>
+							<path d="M45655.3 2595.5 L46103.3 2595.5" fill="none" data-name="TemporalAggregationFormatted"></path>
+						</g>
+						<g transform="translate(45655.25, 2458.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
+								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
+								
+							</g>
+						</g>
+						<g transform="translate(45655.25, 2489.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68980.75, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
+						<g transform="translate(45655.25, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="49886.5" y="2503.5" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M49886.5 2534.5 L50224.5 2534.5" fill="none" data-name="ReportsFormData"></path>
-							<path d="M49886.5 2580.5 L50224.5 2580.5" fill="none" data-name="ReportsFormData"></path>
+					<g data-name="TemporalAggregation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
+							<rect x="49989.3" y="3365.0" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
 						</g>
-						<g transform="translate(49886.5, 2503.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
+						<g transform="translate(49989.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
+								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49886.5, 2534.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
+					</g>
+					<g data-name="ImprovementDirectionFormatted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
+							<rect x="46143.3" y="2458.5" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
+							<path d="M46143.3 2489.5 L46594.3 2489.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
+							<path d="M46143.3 2595.5 L46594.3 2595.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
+						</g>
+						<g transform="translate(46143.25, 2458.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
+								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49886.5, 2580.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
+						<g transform="translate(46143.25, 2489.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReportStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="20216.0" y="3327.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M20216.0 3358.0 L20517.0 3358.0" fill="none" data-name="ReportStatus"></path>
-						</g>
-						<g transform="translate(20216, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
+						<g transform="translate(46143.25, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20216, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
+					</g>
+					<g data-name="ImprovementDirection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
+							<rect x="50603.3" y="3365.0" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
+						</g>
+						<g transform="translate(50603.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
+								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="50357.5" y="1628.5" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M50357.5 1659.5 L50671.5 1659.5" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M50357.5 1720.5 L50671.5 1720.5" fill="none" data-name="ReportItemFormData"></path>
+					<g data-name="ReportSectionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
+							<rect x="14150.8" y="3327.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
+							<path d="M14150.8 3358.0 L14533.8 3358.0" fill="none" data-name="ReportSectionType"></path>
 						</g>
-						<g transform="translate(50357.5, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
+						<g transform="translate(14150.75, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
+								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50357.5, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
+						<g transform="translate(14150.75, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50357.5, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
+					</g>
+					<g data-name="AverageSectionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
+							<rect x="30689.3" y="1636.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
+							<path d="M30689.3 1667.0 L31168.3 1667.0" fill="none" data-name="AverageSectionFormView"></path>
+							<path d="M30689.3 1728.0 L31168.3 1728.0" fill="none" data-name="AverageSectionFormView"></path>
+						</g>
+						<g transform="translate(30689.25, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="50450.5" y="2549.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
+						<g transform="translate(30689.25, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(50450.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
+						<g transform="translate(30689.25, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ReportItemFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="45081.5" y="2278.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M45081.5 2309.5 L46068.5 2309.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M45081.5 2745.5 L46068.5 2745.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<rect x="40967.0" y="2278.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
+							<path d="M40967.0 2309.5 L41954.0 2309.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<path d="M40967.0 2745.5 L41954.0 2745.5" fill="none" data-name="ReportItemFormViewModel"></path>
 						</g>
-						<g transform="translate(45081.5, 2278.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(40967, 2278.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
 								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45081.5, 2309.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(40967, 2309.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
@@ -13767,7 +13589,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(45081.5, 2745.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(40967, 2745.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
@@ -13779,40 +13601,55 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="19159.0" y="3327.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M19159.0 3358.0 L19542.0 3358.0" fill="none" data-name="ReportSectionType"></path>
+					<g data-name="DataReferenceIdentifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
+							<rect x="76002.5" y="583.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
+							<path d="M76002.5 614.0 L76206.5 614.0" fill="none" data-name="DataReferenceIdentifier"></path>
+							<path d="M76002.5 645.0 L76206.5 645.0" fill="none" data-name="DataReferenceIdentifier"></path>
 						</g>
-						<g transform="translate(19159, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
+						<g transform="translate(76002.5, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
+								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19159, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
+						<g transform="translate(76002.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
+								
+							</g>
+						</g>
+						<g transform="translate(76002.5, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="DataReference">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
+							<rect x="76037.0" y="121.0" height="31.0" width="135.0" data-name="DataReference"></rect>
+						</g>
+						<g transform="translate(76037, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
+								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="LinearRegressionSectionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="30470.3" y="1636.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M30470.3 1667.0 L30949.3 1667.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M30470.3 1728.0 L30949.3 1728.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<rect x="31208.3" y="1636.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
+							<path d="M31208.3 1667.0 L31687.3 1667.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<path d="M31208.3 1728.0 L31687.3 1728.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
 						</g>
-						<g transform="translate(30470.25, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
+						<g transform="translate(31208.25, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30470.25, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+						<g transform="translate(31208.25, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
@@ -13820,2274 +13657,2657 @@
 								
 							</g>
 						</g>
-						<g transform="translate(30470.25, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
+						<g transform="translate(31208.25, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ReportItemFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
+							<rect x="42227.0" y="1613.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
+							<path d="M42227.0 1644.5 L42694.0 1644.5" fill="none" data-name="ReportItemFormView"></path>
+							<path d="M42227.0 1720.5 L42694.0 1720.5" fill="none" data-name="ReportItemFormView"></path>
+						</g>
+						<g transform="translate(42227, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
+								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(42227, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
+								
+							</g>
+						</g>
+						<g transform="translate(42227, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ReportsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
+							<rect x="67609.3" y="2391.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
+							<path d="M67609.3 2422.0 L68469.3 2422.0" fill="none" data-name="ReportsFormViewModel"></path>
+							<path d="M67609.3 2588.0 L68469.3 2588.0" fill="none" data-name="ReportsFormViewModel"></path>
+						</g>
+						<g transform="translate(67609.25, 2391)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
+								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(67609.25, 2422)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(67609.25, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ReportFormItemDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
+							<rect x="68766.0" y="1591.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
+							<path d="M68766.0 1622.0 L69609.0 1622.0" fill="none" data-name="ReportFormItemDelegate"></path>
+							<path d="M68766.0 1698.0 L69609.0 1698.0" fill="none" data-name="ReportFormItemDelegate"></path>
+						</g>
+						<g transform="translate(68766, 1591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
+								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
+								
+							</g>
+						</g>
+						<g transform="translate(68766, 1622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
+								
+							</g>
+						</g>
+						<g transform="translate(68766, 1698)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ReportBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
+							<rect x="47208.3" y="2496.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
+							<path d="M47208.3 2527.0 L47405.3 2527.0" fill="none" data-name="ReportBadge"></path>
+							<path d="M47208.3 2603.0 L47405.3 2603.0" fill="none" data-name="ReportBadge"></path>
+						</g>
+						<g transform="translate(47208.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
+								
+							</g>
+						</g>
+						<g transform="translate(47208.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(47208.25, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ReportStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
+							<rect x="16709.3" y="3327.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
+							<path d="M16709.3 3358.0 L17010.3 3358.0" fill="none" data-name="ReportStatus"></path>
+						</g>
+						<g transform="translate(16709.25, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
+								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
+								
+							</g>
+						</g>
+						<g transform="translate(16709.25, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="30989.3" y="1636.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M30989.3 1667.0 L31468.3 1667.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M30989.3 1728.0 L31468.3 1728.0" fill="none" data-name="AverageSectionFormView"></path>
+					<g data-name="ReportsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
+							<rect x="44074.3" y="2503.5" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
+							<path d="M44074.3 2534.5 L44412.3 2534.5" fill="none" data-name="ReportsFormData"></path>
+							<path d="M44074.3 2580.5 L44412.3 2580.5" fill="none" data-name="ReportsFormData"></path>
 						</g>
-						<g transform="translate(30989.25, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
+						<g transform="translate(44074.25, 2503.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
+								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30989.25, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+						<g transform="translate(44074.25, 2534.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30989.25, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
+						<g transform="translate(44074.25, 2580.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="47630.5" y="2458.5" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M47630.5 2489.5 L48078.5 2489.5" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M47630.5 2595.5 L48078.5 2595.5" fill="none" data-name="TemporalAggregationFormatted"></path>
+					<g data-name="StudyInfoFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
+							<rect x="75318.5" y="2323.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
+							<path d="M75318.5 2354.5 L76014.5 2354.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+							<path d="M75318.5 2760.5 L76014.5 2760.5" fill="none" data-name="StudyInfoFormViewModel"></path>
 						</g>
-						<g transform="translate(47630.5, 2458.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
+						<g transform="translate(75318.5, 2323.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47630.5, 2489.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
+						<g transform="translate(75318.5, 2354.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47630.5, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
+						<g transform="translate(75318.5, 2760.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="50053.0" y="3365.0" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
+					<g data-name="StudyDesignInfoFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
+							<rect x="41504.3" y="3349.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
+							<path d="M41504.3 3380.5 L41727.3 3380.5" fill="none" data-name="StudyDesignInfoFormView"></path>
 						</g>
-						<g transform="translate(50053, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
+						<g transform="translate(41504.25, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
+								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="48118.5" y="2458.5" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M48118.5 2489.5 L48569.5 2489.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M48118.5 2595.5 L48569.5 2595.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
-						</g>
-						<g transform="translate(48118.5, 2458.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
+						<g transform="translate(41504.25, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(48118.5, 2489.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
+					</g>
+					<g data-name="StudyInfoFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
+							<rect x="44452.3" y="2481.0" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
+							<path d="M44452.3 2512.0 L44866.3 2512.0" fill="none" data-name="StudyInfoFormData"></path>
+							<path d="M44452.3 2603.0 L44866.3 2603.0" fill="none" data-name="StudyInfoFormData"></path>
+						</g>
+						<g transform="translate(44452.25, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
+								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(48118.5, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
+						<g transform="translate(44452.25, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="50410.0" y="3365.0" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
-						</g>
-						<g transform="translate(50410, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
+						<g transform="translate(44452.25, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="48609.5" y="2496.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M48609.5 2527.0 L49318.5 2527.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M48609.5 2588.0 L49318.5 2588.0" fill="none" data-name="DataReferenceEditor"></path>
+					<g data-name="StudyContactInfoFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
+							<rect x="50215.3" y="3266.5" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
+							<path d="M50215.3 3297.5 L50563.3 3297.5" fill="none" data-name="StudyContactInfoFormData"></path>
+							<path d="M50215.3 3448.5 L50563.3 3448.5" fill="none" data-name="StudyContactInfoFormData"></path>
 						</g>
-						<g transform="translate(48609.5, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
+						<g transform="translate(50215.25, 3266.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
+								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(48609.5, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
+						<g transform="translate(50215.25, 3297.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(48609.5, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
+						<g transform="translate(50215.25, 3448.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="51057.5" y="3365.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
+					<g data-name="StudyFormValidationSet">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
+							<rect x="2064.0" y="3342.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
+							<path d="M2064.0 3373.0 L2451.0 3373.0" fill="none" data-name="StudyFormValidationSet"></path>
 						</g>
-						<g transform="translate(51057.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
+						<g transform="translate(2064, 3342)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
+								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="61009.8" y="583.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M61009.8 614.0 L61213.8 614.0" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M61009.8 645.0 L61213.8 645.0" fill="none" data-name="DataReferenceIdentifier"></path>
-						</g>
-						<g transform="translate(61009.75, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
+						<g transform="translate(2064, 3373)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61009.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
+					</g>
+					<g data-name="MeasurementsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
+							<rect x="46674.3" y="2503.5" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
+							<path d="M46674.3 2534.5 L47168.3 2534.5" fill="none" data-name="MeasurementsFormData"></path>
+							<path d="M46674.3 2580.5 L47168.3 2580.5" fill="none" data-name="MeasurementsFormData"></path>
+						</g>
+						<g transform="translate(46674.25, 2503.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
+								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61009.75, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
+						<g transform="translate(46674.25, 2534.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="61044.3" y="121.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(61044.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
+						<g transform="translate(46674.25, 2580.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="51446.5" y="1613.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M51446.5 1644.5 L51913.5 1644.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M51446.5 1720.5 L51913.5 1720.5" fill="none" data-name="ReportItemFormView"></path>
+					<g data-name="MeasurementSurveyFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
+							<rect x="43191.5" y="1666.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
+							<path d="M43191.5 1697.5 L43635.5 1697.5" fill="none" data-name="MeasurementSurveyFormView"></path>
 						</g>
-						<g transform="translate(51446.5, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
-								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
+						<g transform="translate(43191.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
+								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51446.5, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
+						<g transform="translate(43191.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51446.5, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
+					</g>
+					<g data-name="MeasurementSurveyFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
+							<rect x="66873.3" y="2353.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
+							<path d="M66873.3 2384.5 L67569.3 2384.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+							<path d="M66873.3 2610.5 L67569.3 2610.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+						</g>
+						<g transform="translate(66873.25, 2353.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyDesignReportsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="36070.8" y="3342.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M36070.8 3373.0 L36463.8 3373.0" fill="none" data-name="StudyDesignReportsFormView"></path>
-						</g>
-						<g transform="translate(36070.75, 3342)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
+						<g transform="translate(66873.25, 2384.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36070.75, 3373)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
+						<g transform="translate(66873.25, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReportFormItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="68527.8" y="3274.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M68527.8 3305.0 L69370.8 3305.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M68527.8 3381.0 L69370.8 3381.0" fill="none" data-name="ReportFormItemDelegate"></path>
+					</g>
+					<g data-name="SurveyPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
+							<rect x="31727.3" y="1651.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
+							<path d="M31727.3 1682.0 L32071.3 1682.0" fill="none" data-name="SurveyPreview"></path>
+							<path d="M31727.3 1713.0 L32071.3 1713.0" fill="none" data-name="SurveyPreview"></path>
 						</g>
-						<g transform="translate(68527.75, 3274)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
-								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
+						<g transform="translate(31727.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68527.75, 3305)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
+						<g transform="translate(31727.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68527.75, 3381)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
+						<g transform="translate(31727.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="49358.5" y="2496.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M49358.5 2527.0 L49555.5 2527.0" fill="none" data-name="ReportBadge"></path>
-							<path d="M49358.5 2603.0 L49555.5 2603.0" fill="none" data-name="ReportBadge"></path>
+					<g data-name="MeasurementSurveyFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
+							<rect x="52211.0" y="2466.0" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
+							<path d="M52211.0 2497.0 L52620.0 2497.0" fill="none" data-name="MeasurementSurveyFormData"></path>
+							<path d="M52211.0 2618.0 L52620.0 2618.0" fill="none" data-name="MeasurementSurveyFormData"></path>
 						</g>
-						<g transform="translate(49358.5, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
+						<g transform="translate(52211, 2466)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
+								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49358.5, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
+						<g transform="translate(52211, 2497)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49358.5, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
+						<g transform="translate(52211, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AccountSettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
-							<rect x="32292.3" y="1666.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
-							<path d="M32292.3 1697.5 L32486.3 1697.5" fill="none" data-name="AccountSettingsDialog"></path>
-						</g>
-						<g transform="translate(32292.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
-								
-							</g>
+					<g data-name="QuestionnaireFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
+							<rect x="54133.3" y="3311.5" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
+							<path d="M54133.3 3342.5 L54501.3 3342.5" fill="none" data-name="QuestionnaireFormData"></path>
+							<path d="M54133.3 3388.5 L54501.3 3388.5" fill="none" data-name="QuestionnaireFormData"></path>
 						</g>
-						<g transform="translate(32292.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
+						<g transform="translate(54133.25, 3311.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
+								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IAppRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppRepository">
-							<rect x="52634.3" y="3342.0" height="77.0" width="230.0" data-name="IAppRepository"></rect>
-							<path d="M52634.3 3373.0 L52864.3 3373.0" fill="none" data-name="IAppRepository"></path>
-						</g>
-						<g transform="translate(52634.25, 3342)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppRepository">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAppRepository">IAppRepository</text>
+						<g transform="translate(54133.25, 3342.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52634.25, 3373)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppRepository">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAppRepository">+void dispose()</text>
+						<g transform="translate(54133.25, 3388.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppRepository">
-							<rect x="52634.3" y="3669.5" height="108.0" width="230.0" data-name="AppRepository"></rect>
-							<path d="M52634.3 3700.5 L52864.3 3700.5" fill="none" data-name="AppRepository"></path>
-							<path d="M52634.3 3731.5 L52864.3 3731.5" fill="none" data-name="AppRepository"></path>
+					<g data-name="WithQuestionnaireControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
+							<rect x="62867.3" y="1568.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
+							<path d="M62867.3 1599.5 L63499.3 1599.5" fill="none" data-name="WithQuestionnaireControls"></path>
+							<path d="M62867.3 1705.5 L63499.3 1705.5" fill="none" data-name="WithQuestionnaireControls"></path>
 						</g>
-						<g transform="translate(52634.25, 3669.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppRepository">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppRepository">AppRepository</text>
+						<g transform="translate(62867.25, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
+								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52634.25, 3700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+apiClient: StudyUApi</text>
+						<g transform="translate(62867.25, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52634.25, 3731.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppRepository">+void dispose()</text>
+						<g transform="translate(62867.25, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyUApi">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApi">
-							<rect x="73228.3" y="3908.0" height="212.0" width="251.0" data-name="StudyUApi"></rect>
-							<path d="M73228.3 3939.0 L73479.3 3939.0" fill="none" data-name="StudyUApi"></path>
+					<g data-name="StudyDesignMeasurementsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
+							<rect x="41767.3" y="3349.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
+							<path d="M41767.3 3380.5 L42077.3 3380.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
 						</g>
-						<g transform="translate(73228.25, 3908)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyUApi">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApi">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApi">StudyUApi</text>
+						<g transform="translate(41767.25, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
+								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73228.25, 3939)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApi">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApi">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApi">+dynamic saveStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApi">+dynamic getUserStudies()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApi">+dynamic saveStudyInvite()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudyInvite()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudyInvite()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApi">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApi">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApi">+dynamic fetchUser()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApi">+dynamic saveUser()</text>
+						<g transform="translate(41767.25, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="User">
-						<g fill="#eee8d5" stroke="#33322E" data-name="User">
-							<rect x="63769.5" y="4541.0" height="31.0" width="53.0" data-name="User"></rect>
+					<g data-name="MeasurementsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
+							<rect x="71219.0" y="2383.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
+							<path d="M71219.0 2414.5 L72311.0 2414.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+							<path d="M71219.0 2565.5 L72311.0 2565.5" fill="none" data-name="MeasurementsFormViewModel"></path>
 						</g>
-						<g transform="translate(63769.5, 4541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="User">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="User">
-								<text x="18.5" y="13.5" stroke="none" text-anchor="middle" data-name="User">User</text>
+						<g transform="translate(71219, 2383.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
+								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Session">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Session">
-							<rect x="63941.0" y="4541.0" height="31.0" width="79.0" data-name="Session"></rect>
+						<g transform="translate(71219, 2414.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(63941, 4541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Session">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Session">
-								<text x="31.5" y="13.5" stroke="none" text-anchor="middle" data-name="Session">Session</text>
+						<g transform="translate(71219, 2565.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthRepository">
-							<rect x="63807.0" y="4183.0" height="303.0" width="340.0" data-name="AuthRepository"></rect>
-							<path d="M63807.0 4214.0 L64147.0 4214.0" fill="none" data-name="AuthRepository"></path>
-							<path d="M63807.0 4350.0 L64147.0 4350.0" fill="none" data-name="AuthRepository"></path>
+					<g data-name="StudyFormScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
+							<rect x="26431.5" y="2503.5" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
+							<path d="M26431.5 2534.5 L26819.5 2534.5" fill="none" data-name="StudyFormScaffold"></path>
+							<path d="M26431.5 2595.5 L26819.5 2595.5" fill="none" data-name="StudyFormScaffold"></path>
 						</g>
-						<g transform="translate(63807, 4183)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthRepository">
-								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthRepository">AuthRepository</text>
+						<g transform="translate(26431.5, 2503.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
+								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63807, 4214)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">+supabaseClient: SupabaseClient</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+sharedPreferences: SharedPreferences</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+allowPasswordReset: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+authClient: GoTrueClient</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+session: Session?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+serializedSession: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+currentUser: User?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthRepository">+isLoggedIn: bool</text>
+						<g transform="translate(26431.5, 2534.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63807, 4350)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">-void _registerAuthListener()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+dynamic signUp()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+dynamic signInWith()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+dynamic signOut()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+dynamic updateUser()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+void dispose()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthRepository">+dynamic onAppStart()</text>
+						<g transform="translate(26431.5, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SupabaseClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClient">
-							<rect x="62551.8" y="4541.0" height="31.0" width="141.0" data-name="SupabaseClient"></rect>
+					<g data-name="T Function(WidgetRef)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
+							<rect x="28968.0" y="3365.0" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
 						</g>
-						<g transform="translate(62551.75, 4541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClient">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClient">SupabaseClient</text>
+						<g transform="translate(28968, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="GoTrueClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoTrueClient">
-							<rect x="64095.3" y="4541.0" height="31.0" width="120.0" data-name="GoTrueClient"></rect>
+					<g data-name="ConsentItemFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
+							<rect x="58745.8" y="2436.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
+							<path d="M58745.8 2467.0 L59441.8 2467.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+							<path d="M58745.8 2633.0 L59441.8 2633.0" fill="none" data-name="ConsentItemFormViewModel"></path>
 						</g>
-						<g transform="translate(64095.25, 4541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoTrueClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoTrueClient">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoTrueClient">GoTrueClient</text>
+						<g transform="translate(58745.75, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyLaunched">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyLaunched">
-							<rect x="61656.8" y="614.0" height="31.0" width="140.0" data-name="StudyLaunched"></rect>
-						</g>
-						<g transform="translate(61656.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyLaunched">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyLaunched">
-								<text x="62.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyLaunched">StudyLaunched</text>
+						<g transform="translate(58745.75, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ModelEvent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelEvent">
-							<rect x="62045.3" y="98.0" height="77.0" width="145.0" data-name="ModelEvent"></rect>
-							<path d="M62045.3 129.0 L62190.3 129.0" fill="none" data-name="ModelEvent"></path>
-						</g>
-						<g transform="translate(62045.25, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelEvent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelEvent">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelEvent">ModelEvent</text>
+						<g transform="translate(58745.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62045.25, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelEvent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelEvent">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelEvent">+modelId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelEvent">+model: T</text>
+					</g>
+					<g data-name="StudyDesignEnrollmentFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
+							<rect x="42117.3" y="3334.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
+							<path d="M42117.3 3365.5 L42566.3 3365.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
+						</g>
+						<g transform="translate(42117.25, 3334.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
+								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="APIException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="APIException">
-							<rect x="58668.8" y="614.0" height="31.0" width="121.0" data-name="APIException"></rect>
-						</g>
-						<g transform="translate(58668.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="APIException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="APIException">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="APIException">APIException</text>
+						<g transform="translate(42117.25, 3365.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotFoundException">
-							<rect x="57266.8" y="1197.0" height="31.0" width="216.0" data-name="StudyNotFoundException"></rect>
+					<g data-name="IScreenerQuestionLogicFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
+							<rect x="52660.0" y="2534.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
+							<path d="M52660.0 2565.0 L52992.0 2565.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
 						</g>
-						<g transform="translate(57266.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotFoundException">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotFoundException">StudyNotFoundException</text>
+						<g transform="translate(52660, 2534)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
+								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="MeasurementNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementNotFoundException">
-							<rect x="57522.8" y="1197.0" height="31.0" width="279.0" data-name="MeasurementNotFoundException"></rect>
-						</g>
-						<g transform="translate(57522.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementNotFoundException">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementNotFoundException">MeasurementNotFoundException</text>
+						<g transform="translate(52660, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionNotFoundException">
-							<rect x="57841.8" y="1197.0" height="31.0" width="242.0" data-name="QuestionNotFoundException"></rect>
+					<g data-name="ScreenerQuestionLogicFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
+							<rect x="78749.8" y="2496.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
+							<path d="M78749.8 2527.0 L79173.8 2527.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+							<path d="M78749.8 2558.0 L79173.8 2558.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
 						</g>
-						<g transform="translate(57841.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionNotFoundException">
-								<text x="113.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionNotFoundException">QuestionNotFoundException</text>
+						<g transform="translate(78749.75, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
+								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ConsentItemNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemNotFoundException">
-							<rect x="58123.8" y="1197.0" height="31.0" width="271.0" data-name="ConsentItemNotFoundException"></rect>
+						<g transform="translate(78749.75, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
+								
+							</g>
 						</g>
-						<g transform="translate(58123.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemNotFoundException">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemNotFoundException">ConsentItemNotFoundException</text>
+						<g transform="translate(78749.75, 2558)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionNotFoundException">
-							<rect x="58434.8" y="1197.0" height="31.0" width="265.0" data-name="InterventionNotFoundException"></rect>
+					<g data-name="ScreenerQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
+							<rect x="63738.3" y="3214.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
+							<path d="M63738.3 3245.0 L64300.3 3245.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+							<path d="M63738.3 3426.0 L64300.3 3426.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(58434.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionNotFoundException">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionNotFoundException">InterventionNotFoundException</text>
+						<g transform="translate(63738.25, 3214)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
+								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InterventionTaskNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskNotFoundException">
-							<rect x="58739.8" y="1197.0" height="31.0" width="303.0" data-name="InterventionTaskNotFoundException"></rect>
+						<g transform="translate(63738.25, 3245)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+								
+							</g>
 						</g>
-						<g transform="translate(58739.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskNotFoundException">
-								<text x="143.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskNotFoundException">InterventionTaskNotFoundException</text>
+						<g transform="translate(63738.25, 3426)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportNotFoundException">
-							<rect x="59082.8" y="1197.0" height="31.0" width="224.0" data-name="ReportNotFoundException"></rect>
+					<g data-name="ConsentItemFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
+							<rect x="47712.5" y="1613.5" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
+							<path d="M47712.5 1644.5 L47970.5 1644.5" fill="none" data-name="ConsentItemFormData"></path>
+							<path d="M47712.5 1735.5 L47970.5 1735.5" fill="none" data-name="ConsentItemFormData"></path>
 						</g>
-						<g transform="translate(59082.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportNotFoundException">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportNotFoundException">ReportNotFoundException</text>
+						<g transform="translate(47712.5, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
+								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReportSectionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionNotFoundException">
-							<rect x="59346.8" y="1197.0" height="31.0" width="283.0" data-name="ReportSectionNotFoundException"></rect>
+						<g transform="translate(47712.5, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
+								
+							</g>
 						</g>
-						<g transform="translate(59346.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionNotFoundException">
-								<text x="133.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionNotFoundException">ReportSectionNotFoundException</text>
+						<g transform="translate(47712.5, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInviteNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInviteNotFoundException">
-							<rect x="59669.8" y="1197.0" height="31.0" width="259.0" data-name="StudyInviteNotFoundException"></rect>
+					<g data-name="ConsentItemFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
+							<rect x="48050.5" y="1666.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
+							<path d="M48050.5 1697.5 L48431.5 1697.5" fill="none" data-name="ConsentItemFormView"></path>
 						</g>
-						<g transform="translate(59669.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInviteNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInviteNotFoundException">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInviteNotFoundException">StudyInviteNotFoundException</text>
+						<g transform="translate(48050.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
+								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="UserNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UserNotFoundException">
-							<rect x="59968.8" y="1197.0" height="31.0" width="208.0" data-name="UserNotFoundException"></rect>
-						</g>
-						<g transform="translate(59968.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserNotFoundException">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserNotFoundException">UserNotFoundException</text>
+						<g transform="translate(48050.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyUApiClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApiClient">
-							<rect x="61849.5" y="4168.0" height="333.0" width="479.0" data-name="StudyUApiClient"></rect>
-							<path d="M61849.5 4199.0 L62328.5 4199.0" fill="none" data-name="StudyUApiClient"></path>
-							<path d="M61849.5 4275.0 L62328.5 4275.0" fill="none" data-name="StudyUApiClient"></path>
+					<g data-name="EnrollmentFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
+							<rect x="47445.3" y="2481.0" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
+							<path d="M47445.3 2512.0 L47899.3 2512.0" fill="none" data-name="EnrollmentFormData"></path>
+							<path d="M47445.3 2603.0 L47899.3 2603.0" fill="none" data-name="EnrollmentFormData"></path>
 						</g>
-						<g transform="translate(61849.5, 4168)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApiClient">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApiClient">StudyUApiClient</text>
+						<g transform="translate(47445.25, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
+								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61849.5, 4199)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+supabaseClient: SupabaseClient</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyColumns: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+testDelayMilliseconds: int</text>
+						<g transform="translate(47445.25, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61849.5, 4275)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">+dynamic getUserStudies()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudy()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudyInvite()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudyInvite()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudyInvite()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchUser()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApiClient">+dynamic saveUser()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyUApiClient">-dynamic _awaitGuarded()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyUApiClient">-dynamic _apiException()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyUApiClient">-dynamic _testDelay()</text>
+						<g transform="translate(47445.25, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SupabaseClientDependant">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClientDependant">
-							<rect x="61657.5" y="3983.0" height="62.0" width="284.0" data-name="SupabaseClientDependant"></rect>
-							<path d="M61657.5 4014.0 L61941.5 4014.0" fill="none" data-name="SupabaseClientDependant"></path>
-						</g>
-						<g transform="translate(61657.5, 3983)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseClientDependant">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClientDependant">
-								<text x="134.0" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClientDependant">SupabaseClientDependant</text>
-								
-							</g>
+					<g data-name="QuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
+							<rect x="55092.3" y="1956.0" height="1218.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M55092.3 1987.0 L56105.3 1987.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M55092.3 2888.0 L56105.3 2888.0" fill="none" data-name="QuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(61657.5, 4014)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseClientDependant">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseClientDependant">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseClientDependant">+supabaseClient: SupabaseClient</text>
+						<g transform="translate(55092.25, 1956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
+								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SupabaseQueryMixin">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryMixin">
-							<rect x="61981.5" y="3945.5" height="137.0" width="215.0" data-name="SupabaseQueryMixin"></rect>
-							<path d="M61981.5 3976.5 L62196.5 3976.5" fill="none" data-name="SupabaseQueryMixin"></path>
-						</g>
-						<g transform="translate(61981.5, 3945.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseQueryMixin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryMixin">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryMixin">SupabaseQueryMixin</text>
+						<g transform="translate(55092.25, 1987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
+								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
+								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
+								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
+								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
+								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
+								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
+								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
+								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
+								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
+								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
+								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
+								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
+								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
+								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
+								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
+								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61981.5, 3976.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryMixin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryMixin">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic deleteAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getById()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getByColumn()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseQueryMixin">+List&lt;T&gt; deserializeList()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SupabaseQueryMixin">+T deserializeObject()</text>
+						<g transform="translate(55092.25, 2888)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WrappedModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WrappedModel">
-							<rect x="49595.5" y="2436.0" height="258.0" width="251.0" data-name="WrappedModel"></rect>
-							<path d="M49595.5 2467.0 L49846.5 2467.0" fill="none" data-name="WrappedModel"></path>
-							<path d="M49595.5 2618.0 L49846.5 2618.0" fill="none" data-name="WrappedModel"></path>
+					<g data-name="EnrollmentFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
+							<rect x="69398.0" y="2316.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
+							<path d="M69398.0 2347.0 L70300.0 2347.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+							<path d="M69398.0 2573.0 L70300.0 2573.0" fill="none" data-name="EnrollmentFormViewModel"></path>
 						</g>
-						<g transform="translate(49595.5, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WrappedModel">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="WrappedModel">WrappedModel</text>
+						<g transform="translate(69398, 2316)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
+								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49595.5, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">-_model: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+asyncValue: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+isLocalOnly: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+isDirty: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WrappedModel">+isDeleted: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WrappedModel">+lastSaved: DateTime?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WrappedModel">+lastFetched: DateTime?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WrappedModel">+lastUpdated: DateTime?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WrappedModel">+model: T</text>
+						<g transform="translate(69398, 2347)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49595.5, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">+dynamic markWithError()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+dynamic markAsLoading()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+dynamic markAsFetched()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+dynamic markAsSaved()</text>
+						<g transform="translate(69398, 2573)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ModelRepositoryException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepositoryException">
-							<rect x="60212.8" y="614.0" height="31.0" width="227.0" data-name="ModelRepositoryException"></rect>
+					<g data-name="EnrollmentFormConsentItemDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
+							<rect x="69282.8" y="3274.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
+							<path d="M69282.8 3305.0 L70082.8 3305.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+							<path d="M69282.8 3381.0 L70082.8 3381.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
 						</g>
-						<g transform="translate(60212.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelRepositoryException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepositoryException">
-								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepositoryException">ModelRepositoryException</text>
+						<g transform="translate(69282.75, 3274)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelNotFoundException">
-							<rect x="60216.8" y="1197.0" height="31.0" width="219.0" data-name="ModelNotFoundException"></rect>
+						<g transform="translate(69282.75, 3305)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
+								
+							</g>
 						</g>
-						<g transform="translate(60216.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelNotFoundException">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelNotFoundException">ModelNotFoundException</text>
+						<g transform="translate(69282.75, 3381)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IModelRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepository">
-							<rect x="76698.8" y="501.0" height="257.0" width="382.0" data-name="IModelRepository"></rect>
-							<path d="M76698.8 532.0 L77080.8 532.0" fill="none" data-name="IModelRepository"></path>
+					<g data-name="StudyFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
+							<rect x="75021.8" y="1516.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
+							<path d="M75021.8 1547.0 L75717.8 1547.0" fill="none" data-name="StudyFormViewModel"></path>
+							<path d="M75021.8 1758.0 L75717.8 1758.0" fill="none" data-name="StudyFormViewModel"></path>
 						</g>
-						<g transform="translate(76698.75, 501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepository">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepository">IModelRepository</text>
+						<g transform="translate(75021.75, 1516)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76698.75, 532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepository">+WrappedModel&lt;T&gt;? get()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepository">+dynamic fetchAll()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepository">+dynamic fetch()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepository">+dynamic save()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepository">+dynamic delete()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSave()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="IModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="IModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="IModelRepository">+dynamic ensurePersisted()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="IModelRepository">+void dispose()</text>
+						<g transform="translate(75021.75, 1547)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(75021.75, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IModelRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepositoryDelegate">
-							<rect x="76441.5" y="1621.5" height="152.0" width="225.0" data-name="IModelRepositoryDelegate"></rect>
-							<path d="M76441.5 1652.5 L76666.5 1652.5" fill="none" data-name="IModelRepositoryDelegate"></path>
+					<g data-name="QuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
+							<rect x="48790.3" y="1568.5" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M48790.3 1599.5 L49958.3 1599.5" fill="none" data-name="QuestionFormData"></path>
+							<path d="M48790.3 1735.5 L49958.3 1735.5" fill="none" data-name="QuestionFormData"></path>
 						</g>
-						<g transform="translate(76441.5, 1621.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepositoryDelegate">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepositoryDelegate">IModelRepositoryDelegate</text>
+						<g transform="translate(48790.25, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
+								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76441.5, 1652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepositoryDelegate">+T createNewInstance()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepositoryDelegate">+T createDuplicate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic onError()</text>
+						<g transform="translate(48790.25, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ModelRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepository">
-							<rect x="76558.8" y="986.0" height="453.0" width="662.0" data-name="ModelRepository"></rect>
-							<path d="M76558.8 1017.0 L77220.8 1017.0" fill="none" data-name="ModelRepository"></path>
-							<path d="M76558.8 1123.0 L77220.8 1123.0" fill="none" data-name="ModelRepository"></path>
-						</g>
-						<g transform="translate(76558.75, 986)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepository">
-								<text x="323.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepository">ModelRepository</text>
+						<g transform="translate(48790.25, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76558.75, 1017)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+delegate: IModelRepositoryDelegate&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">-_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">-_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">-_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;</text>
+					</g>
+					<g data-name="SurveyQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
+							<rect x="39479.8" y="3312.0" height="137.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M39479.8 3343.0 L39842.8 3343.0" fill="none" data-name="SurveyQuestionType"></path>
+						</g>
+						<g transform="translate(39479.75, 3312)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
+								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76558.75, 1123)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt;? get()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">+dynamic fetchAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">+dynamic fetch()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ModelRepository">-dynamic _buildModelSpecificController()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ModelRepository">+dynamic ensurePersisted()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt; upsertLocally()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ModelRepository">+List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ModelRepository">+dynamic emitUpdate()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ModelRepository">+dynamic emitModelEvent()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ModelRepository">+dynamic emitError()</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ModelRepository">+void dispose()</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ModelRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+						<g transform="translate(39479.75, 3343)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SupabaseQueryError">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryError">
-							<rect x="60479.8" y="583.5" height="92.0" width="183.0" data-name="SupabaseQueryError"></rect>
-							<path d="M60479.8 614.5 L60662.8 614.5" fill="none" data-name="SupabaseQueryError"></path>
+					<g data-name="ChoiceQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
+							<rect x="50297.0" y="2481.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M50297.0 2512.0 L50641.0 2512.0" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M50297.0 2573.0 L50641.0 2573.0" fill="none" data-name="ChoiceQuestionFormData"></path>
 						</g>
-						<g transform="translate(60479.75, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseQueryError">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryError">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryError">SupabaseQueryError</text>
+						<g transform="translate(50297, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60479.75, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryError">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryError">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryError">+statusCode: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryError">+message: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryError">+details: dynamic</text>
+						<g transform="translate(50297, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepository">
-							<rect x="73726.3" y="2458.5" height="213.0" width="403.0" data-name="InviteCodeRepository"></rect>
-							<path d="M73726.3 2489.5 L74129.3 2489.5" fill="none" data-name="InviteCodeRepository"></path>
-							<path d="M73726.3 2595.5 L74129.3 2595.5" fill="none" data-name="InviteCodeRepository"></path>
-						</g>
-						<g transform="translate(73726.25, 2458.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepository">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepository">InviteCodeRepository</text>
+						<g transform="translate(50297, 2573)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73726.25, 2489.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepository">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepository">+study: Study</text>
+					</g>
+					<g data-name="BoolQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
+							<rect x="50681.0" y="2496.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M50681.0 2527.0 L51073.0 2527.0" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M50681.0 2573.0 L51073.0 2573.0" fill="none" data-name="BoolQuestionFormData"></path>
+						</g>
+						<g transform="translate(50681, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
+								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73726.25, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+dynamic emitUpdate()</text>
+						<g transform="translate(50681, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ProviderRef">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ProviderRef">
-							<rect x="74143.8" y="3998.5" height="31.0" width="109.0" data-name="ProviderRef"></rect>
-						</g>
-						<g transform="translate(74143.75, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ProviderRef">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProviderRef">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProviderRef">ProviderRef</text>
+						<g transform="translate(50681, 2573)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepositoryDelegate">
-							<rect x="76309.8" y="2458.5" height="213.0" width="299.0" data-name="InviteCodeRepositoryDelegate"></rect>
-							<path d="M76309.8 2489.5 L76608.8 2489.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
-							<path d="M76309.8 2550.5 L76608.8 2550.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
+					<g data-name="ScaleQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
+							<rect x="51113.0" y="2421.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M51113.0 2452.0 L51457.0 2452.0" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M51113.0 2648.0 L51457.0 2648.0" fill="none" data-name="ScaleQuestionFormData"></path>
 						</g>
-						<g transform="translate(76309.75, 2458.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepositoryDelegate">
-								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepositoryDelegate">InviteCodeRepositoryDelegate</text>
+						<g transform="translate(51113, 2421)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76309.75, 2489.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+apiClient: StudyUApi</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+studyRepository: IStudyRepository</text>
+						<g transform="translate(51113, 2452)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76309.75, 2550.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic onError()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createDuplicate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createNewInstance()</text>
+						<g transform="translate(51113, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepository">
-							<rect x="70598.3" y="3632.0" height="183.0" width="403.0" data-name="StudyRepository"></rect>
-							<path d="M70598.3 3663.0 L71001.3 3663.0" fill="none" data-name="StudyRepository"></path>
-							<path d="M70598.3 3739.0 L71001.3 3739.0" fill="none" data-name="StudyRepository"></path>
+					<g data-name="FreeTextQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
+							<rect x="51497.0" y="2481.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M51497.0 2512.0 L51841.0 2512.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M51497.0 2588.0 L51841.0 2588.0" fill="none" data-name="FreeTextQuestionFormData"></path>
 						</g>
-						<g transform="translate(70598.25, 3632)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepository">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepository">StudyRepository</text>
+						<g transform="translate(51497, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(70598.25, 3663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+sortCallback: void Function()?</text>
+						<g transform="translate(51497, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(70598.25, 3739)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+dynamic launch()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+						<g transform="translate(51497, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepositoryDelegate">
-							<rect x="76507.8" y="3624.5" height="198.0" width="282.0" data-name="StudyRepositoryDelegate"></rect>
-							<path d="M76507.8 3655.5 L76789.8 3655.5" fill="none" data-name="StudyRepositoryDelegate"></path>
-							<path d="M76507.8 3701.5 L76789.8 3701.5" fill="none" data-name="StudyRepositoryDelegate"></path>
+					<g data-name="FreeTextQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
+							<rect x="55318.8" y="3365.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
 						</g>
-						<g transform="translate(76507.75, 3624.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepositoryDelegate">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepositoryDelegate">StudyRepositoryDelegate</text>
+						<g transform="translate(55318.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
+								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76507.75, 3655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+authRepository: IAuthRepository</text>
+					</g>
+					<g data-name="FreeTextQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
+							<rect x="32151.3" y="1628.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M32151.3 1659.5 L32503.3 1659.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M32151.3 1705.5 L32503.3 1705.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+						</g>
+						<g transform="translate(32151.25, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76507.75, 3701.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic onError()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createNewInstance()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createDuplicate()</text>
+						<g transform="translate(32151.25, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IsFetched">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsFetched">
-							<rect x="61836.8" y="614.0" height="31.0" width="94.0" data-name="IsFetched"></rect>
-						</g>
-						<g transform="translate(61836.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsFetched">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsFetched">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsFetched">IsFetched</text>
+						<g transform="translate(32151.25, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IsSaving">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaving">
-							<rect x="62075.8" y="614.0" height="31.0" width="84.0" data-name="IsSaving"></rect>
+					<g data-name="IScaleQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
+							<rect x="79460.5" y="105.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M79460.5 136.5 L79769.5 136.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(62075.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaving">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaving">
-								<text x="34.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaving">IsSaving</text>
+						<g transform="translate(79460.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
+								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IsSaved">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaved">
-							<rect x="62272.5" y="614.0" height="31.0" width="80.0" data-name="IsSaved"></rect>
-						</g>
-						<g transform="translate(62272.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaved">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaved">
-								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaved">IsSaved</text>
+						<g transform="translate(79460.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IsDeleted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsDeleted">
-							<rect x="62392.5" y="614.0" height="31.0" width="91.0" data-name="IsDeleted"></rect>
+					<g data-name="ScaleQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
+							<rect x="55422.8" y="1666.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M55422.8 1697.5 L55774.8 1697.5" fill="none" data-name="ScaleQuestionFormView"></path>
 						</g>
-						<g transform="translate(62392.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsDeleted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsDeleted">
-								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="IsDeleted">IsDeleted</text>
+						<g transform="translate(55422.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyUUser">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUUser">
-							<rect x="54289.5" y="3998.5" height="31.0" width="110.0" data-name="StudyUUser"></rect>
-						</g>
-						<g transform="translate(54289.5, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUUser">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUUser">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUUser">StudyUUser</text>
+						<g transform="translate(55422.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="UserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UserRepository">
-							<rect x="55159.3" y="3639.5" height="168.0" width="282.0" data-name="UserRepository"></rect>
-							<path d="M55159.3 3670.5 L55441.3 3670.5" fill="none" data-name="UserRepository"></path>
-							<path d="M55159.3 3746.5 L55441.3 3746.5" fill="none" data-name="UserRepository"></path>
+					<g data-name="ChoiceQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
+							<rect x="32543.3" y="1651.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M32543.3 1682.0 L32895.3 1682.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M32543.3 1713.0 L32895.3 1713.0" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(55159.25, 3639.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserRepository">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserRepository">UserRepository</text>
+						<g transform="translate(32543.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55159.25, 3670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+ref: Ref&lt;Object?&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="UserRepository">+user: StudyUUser</text>
+						<g transform="translate(32543.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55159.25, 3746.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+dynamic fetchUser()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+dynamic saveUser()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+dynamic updatePreferences()</text>
+						<g transform="translate(32543.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Ref">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Ref">
-							<rect x="54628.5" y="3998.5" height="31.0" width="43.0" data-name="Ref"></rect>
+					<g data-name="BoolQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
+							<rect x="32935.3" y="1651.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M32935.3 1682.0 L33287.3 1682.0" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M32935.3 1713.0 L33287.3 1713.0" fill="none" data-name="BoolQuestionFormView"></path>
 						</g>
-						<g transform="translate(54628.5, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Ref">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Ref">
-								<text x="13.5" y="13.5" stroke="none" text-anchor="middle" data-name="Ref">Ref</text>
+						<g transform="translate(32935.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PreferenceAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreferenceAction">
-							<rect x="1494.3" y="3327.0" height="107.0" width="334.0" data-name="PreferenceAction"></rect>
-							<path d="M1494.3 3358.0 L1828.3 3358.0" fill="none" data-name="PreferenceAction"></path>
-						</g>
-						<g transform="translate(1494.25, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreferenceAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreferenceAction">
-								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="PreferenceAction">PreferenceAction</text>
+						<g transform="translate(32935.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1494.25, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreferenceAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreferenceAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreferenceAction">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+values: List&lt;PreferenceAction&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pin: PreferenceAction</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pinOff: PreferenceAction</text>
+						<g transform="translate(32935.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DropdownMenuItemTheme">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DropdownMenuItemTheme">
-							<rect x="61253.8" y="598.5" height="62.0" width="258.0" data-name="DropdownMenuItemTheme"></rect>
-							<path d="M61253.8 629.5 L61511.8 629.5" fill="none" data-name="DropdownMenuItemTheme"></path>
+					<g data-name="SurveyQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
+							<rect x="57174.3" y="1659.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M57174.3 1690.0 L57526.3 1690.0" fill="none" data-name="SurveyQuestionFormView"></path>
 						</g>
-						<g transform="translate(61253.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DropdownMenuItemTheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DropdownMenuItemTheme">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="DropdownMenuItemTheme">DropdownMenuItemTheme</text>
+						<g transform="translate(57174.25, 1659)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61253.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DropdownMenuItemTheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DropdownMenuItemTheme">
-								<text x="0.0" y="13.5" stroke="none" data-name="DropdownMenuItemTheme">+iconTheme: IconThemeData?</text>
+						<g transform="translate(57174.25, 1690)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconThemeData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconThemeData">
-							<rect x="61312.3" y="1197.0" height="31.0" width="141.0" data-name="IconThemeData"></rect>
+					<g data-name="StudyUTimeOfDay">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
+							<rect x="53032.0" y="2549.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
 						</g>
-						<g transform="translate(61312.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconThemeData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconThemeData">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconThemeData">IconThemeData</text>
+						<g transform="translate(53032, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
+								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Diagnosticable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Diagnosticable">
-							<rect x="61316.3" y="121.0" height="31.0" width="133.0" data-name="Diagnosticable"></rect>
+					<g data-name="ScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
+							<rect x="79400.8" y="1158.5" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
+							<path d="M79400.8 1189.5 L79832.8 1189.5" fill="none" data-name="ScheduleControls"></path>
+							<path d="M79400.8 1220.5 L79832.8 1220.5" fill="none" data-name="ScheduleControls"></path>
 						</g>
-						<g transform="translate(61316.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Diagnosticable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Diagnosticable">
-								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="Diagnosticable">Diagnosticable</text>
+						<g transform="translate(79400.75, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
+								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
+								
+							</g>
+						</g>
+						<g transform="translate(79400.75, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
+								
+							</g>
+						</g>
+						<g transform="translate(79400.75, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ThemeConfig">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeConfig">
-							<rect x="73544.3" y="0.0" height="273.0" width="543.0" data-name="ThemeConfig"></rect>
-							<path d="M73544.3 31.0 L74087.3 31.0" fill="none" data-name="ThemeConfig"></path>
-							<path d="M73544.3 107.0 L74087.3 107.0" fill="none" data-name="ThemeConfig"></path>
+					<g data-name="StudiesTableColumnHeader">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
+							<rect x="58574.5" y="3662.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
+							<path d="M58574.5 3693.5 L58811.5 3693.5" fill="none" data-name="StudiesTableColumnHeader"></path>
 						</g>
-						<g transform="translate(73544.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeConfig">
-								<text x="263.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeConfig">ThemeConfig</text>
+						<g transform="translate(58574.5, 3662.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
+								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73544.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMinContentWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMaxContentWidth: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kHoverFadeFactor: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMuteFadeFactor: double</text>
+						<g transform="translate(58574.5, 3693.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="DashboardScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
+							<rect x="57727.8" y="2534.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
+							<path d="M57727.8 2565.0 L57905.8 2565.0" fill="none" data-name="DashboardScreen"></path>
+						</g>
+						<g transform="translate(57727.75, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
+								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73544.25, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+dynamic bodyBackgroundColor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color modalBarrierColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color containerColor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color colorPickerInitialColor()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextMuted()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextBackground()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+double iconSplashRadius()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color sidesheetBackgroundColor()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()</text>
+						<g transform="translate(57727.75, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NoAnimationPageTransitionsBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NoAnimationPageTransitionsBuilder">
-							<rect x="63155.3" y="598.5" height="62.0" width="299.0" data-name="NoAnimationPageTransitionsBuilder"></rect>
-							<path d="M63155.3 629.5 L63454.3 629.5" fill="none" data-name="NoAnimationPageTransitionsBuilder"></path>
+					<g data-name="StudiesFilter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
+							<rect x="24666.8" y="3342.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
+							<path d="M24666.8 3373.0 L24962.8 3373.0" fill="none" data-name="StudiesFilter"></path>
 						</g>
-						<g transform="translate(63155.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NoAnimationPageTransitionsBuilder">
-								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="NoAnimationPageTransitionsBuilder">NoAnimationPageTransitionsBuilder</text>
+						<g transform="translate(24666.75, 3342)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63155.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NoAnimationPageTransitionsBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="NoAnimationPageTransitionsBuilder">+Widget buildTransitions()</text>
+						<g transform="translate(24666.75, 3373)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PageTransitionsBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsBuilder">
-							<rect x="63355.8" y="121.0" height="31.0" width="199.0" data-name="PageTransitionsBuilder"></rect>
+					<g data-name="DashboardScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
+							<rect x="57945.8" y="2511.0" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
+							<path d="M57945.8 2542.0 L58288.8 2542.0" fill="none" data-name="DashboardScaffold"></path>
+							<path d="M57945.8 2588.0 L58288.8 2588.0" fill="none" data-name="DashboardScaffold"></path>
 						</g>
-						<g transform="translate(63355.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PageTransitionsBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsBuilder">
-								<text x="91.5" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsBuilder">PageTransitionsBuilder</text>
+						<g transform="translate(57945.75, 2511)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
+								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="WebTransitionBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebTransitionBuilder">
-							<rect x="63494.3" y="598.5" height="62.0" width="223.0" data-name="WebTransitionBuilder"></rect>
-							<path d="M63494.3 629.5 L63717.3 629.5" fill="none" data-name="WebTransitionBuilder"></path>
-						</g>
-						<g transform="translate(63494.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebTransitionBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebTransitionBuilder">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebTransitionBuilder">WebTransitionBuilder</text>
+						<g transform="translate(57945.75, 2542)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63494.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebTransitionBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebTransitionBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebTransitionBuilder">+Widget buildTransitions()</text>
+						<g transform="translate(57945.75, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ThemeSettingChange">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettingChange">
-							<rect x="62328.5" y="1666.5" height="62.0" width="216.0" data-name="ThemeSettingChange"></rect>
-							<path d="M62328.5 1697.5 L62544.5 1697.5" fill="none" data-name="ThemeSettingChange"></path>
+					<g data-name="DashboardController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
+							<rect x="73636.0" y="2376.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
+							<path d="M73636.0 2407.0 L74250.0 2407.0" fill="none" data-name="DashboardController"></path>
+							<path d="M73636.0 2528.0 L74250.0 2528.0" fill="none" data-name="DashboardController"></path>
 						</g>
-						<g transform="translate(62328.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettingChange">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettingChange">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettingChange">ThemeSettingChange</text>
+						<g transform="translate(73636, 2376)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
+								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62328.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettingChange">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettingChange">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettingChange">+settings: ThemeSettings</text>
+						<g transform="translate(73636, 2407)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(73636, 2528)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ThemeSettings">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettings">
-							<rect x="62323.0" y="2526.5" height="77.0" width="227.0" data-name="ThemeSettings"></rect>
-							<path d="M62323.0 2557.5 L62550.0 2557.5" fill="none" data-name="ThemeSettings"></path>
+					<g data-name="IUserRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
+							<rect x="73806.5" y="3319.0" height="123.0" width="260.0" data-name="IUserRepository"></rect>
+							<path d="M73806.5 3350.0 L74066.5 3350.0" fill="none" data-name="IUserRepository"></path>
+							<path d="M73806.5 3381.0 L74066.5 3381.0" fill="none" data-name="IUserRepository"></path>
 						</g>
-						<g transform="translate(62323, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettings">
-								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettings">ThemeSettings</text>
+						<g transform="translate(73806.5, 3319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
+								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62323, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettings">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettings">+sourceColor: Color</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeSettings">+themeMode: ThemeMode</text>
+						<g transform="translate(73806.5, 3350)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+user: StudyUUser</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Notification">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Notification">
-							<rect x="62384.5" y="1197.0" height="31.0" width="104.0" data-name="Notification"></rect>
-						</g>
-						<g transform="translate(62384.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Notification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notification">
-								<text x="44.0" y="13.5" stroke="none" text-anchor="middle" data-name="Notification">Notification</text>
+						<g transform="translate(73806.5, 3381)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+dynamic fetchUser()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IUserRepository">+dynamic saveUser()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IUserRepository">+dynamic updatePreferences()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ThemeProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeProvider">
-							<rect x="62596.3" y="358.0" height="543.0" width="519.0" data-name="ThemeProvider"></rect>
-							<path d="M62596.3 389.0 L63115.3 389.0" fill="none" data-name="ThemeProvider"></path>
-							<path d="M62596.3 480.0 L63115.3 480.0" fill="none" data-name="ThemeProvider"></path>
+					<g data-name="StudiesTableColumnSize">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
+							<rect x="79809.5" y="75.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
+							<path d="M79809.5 106.0 L80034.5 106.0" fill="none" data-name="StudiesTableColumnSize"></path>
+							<path d="M79809.5 167.0 L80034.5 167.0" fill="none" data-name="StudiesTableColumnSize"></path>
 						</g>
-						<g transform="translate(62596.25, 358)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeProvider">
-								<text x="251.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeProvider">ThemeProvider</text>
+						<g transform="translate(79809.5, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
+								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62596.25, 389)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+settings: ValueNotifier&lt;ThemeSettings&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+lightDynamic: ColorScheme?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+darkDynamic: ColorScheme?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+pageTransitionsTheme: PageTransitionsTheme</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+shapeMedium: ShapeBorder</text>
+						<g transform="translate(79809.5, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62596.25, 480)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+Color custom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+Color blend()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+Color source()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+ColorScheme colors()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+CardTheme cardTheme()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ThemeProvider">+ListTileThemeData listTileTheme()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ThemeProvider">+AppBarTheme appBarTheme()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ThemeProvider">+SnackBarThemeData snackBarThemeData()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ThemeProvider">+TabBarTheme tabBarTheme()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ThemeProvider">+BottomAppBarTheme bottomAppBarTheme()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ThemeProvider">+BottomNavigationBarThemeData bottomNavigationBarTheme()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ThemeProvider">+SwitchThemeData switchTheme()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ThemeProvider">+InputDecorationTheme inputDecorationTheme()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ThemeProvider">+TextTheme textTheme()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ThemeProvider">+DividerThemeData dividerTheme()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ThemeProvider">+NavigationRailThemeData navigationRailTheme()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ThemeProvider">+DrawerThemeData drawerTheme()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ThemeProvider">+IconThemeData iconTheme()</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ThemeProvider">+CheckboxThemeData checkboxTheme()</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ThemeProvider">+RadioThemeData radioTheme()</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ThemeProvider">+TooltipThemeData tooltipTheme()</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ThemeProvider">+ThemeData light()</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ThemeProvider">+ThemeData dark()</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ThemeProvider">+ThemeMode themeMode()</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ThemeProvider">+ThemeData theme()</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ThemeProvider">&lt;static&gt;+ThemeProvider of()</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ThemeProvider">+bool updateShouldNotify()</text>
+						<g transform="translate(79809.5, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ValueNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ValueNotifier">
-							<rect x="62065.5" y="1197.0" height="31.0" width="117.0" data-name="ValueNotifier"></rect>
+					<g data-name="StudiesTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
+							<rect x="58300.0" y="1553.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
+							<path d="M58300.0 1584.5 L58780.0 1584.5" fill="none" data-name="StudiesTable"></path>
+							<path d="M58300.0 1795.5 L58780.0 1795.5" fill="none" data-name="StudiesTable"></path>
 						</g>
-						<g transform="translate(62065.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueNotifier">
-								<text x="50.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueNotifier">ValueNotifier</text>
+						<g transform="translate(58300, 1553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
+								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ColorScheme">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ColorScheme">
-							<rect x="62222.5" y="1197.0" height="31.0" width="122.0" data-name="ColorScheme"></rect>
-						</g>
-						<g transform="translate(62222.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ColorScheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ColorScheme">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="ColorScheme">ColorScheme</text>
+						<g transform="translate(58300, 1584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PageTransitionsTheme">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsTheme">
-							<rect x="63058.0" y="1197.0" height="31.0" width="198.0" data-name="PageTransitionsTheme"></rect>
-						</g>
-						<g transform="translate(63058, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PageTransitionsTheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsTheme">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsTheme">PageTransitionsTheme</text>
+						<g transform="translate(58300, 1795.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ShapeBorder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ShapeBorder">
-							<rect x="63296.0" y="1197.0" height="31.0" width="120.0" data-name="ShapeBorder"></rect>
+					<g data-name="void Function(Study)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
+							<rect x="57508.8" y="2549.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
 						</g>
-						<g transform="translate(63296, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ShapeBorder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ShapeBorder">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="ShapeBorder">ShapeBorder</text>
+						<g transform="translate(57508.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
+								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InheritedWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InheritedWidget">
-							<rect x="62785.3" y="121.0" height="31.0" width="141.0" data-name="InheritedWidget"></rect>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+							<rect x="58328.8" y="2549.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
 						</g>
-						<g transform="translate(62785.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="InheritedWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InheritedWidget">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="InheritedWidget">InheritedWidget</text>
+						<g transform="translate(58328.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ThemeMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeMode">
-							<rect x="62399.5" y="3365.0" height="31.0" width="114.0" data-name="ThemeMode"></rect>
+					<g data-name="StudiesTableColumn">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
+							<rect x="2491.0" y="3274.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
+							<path d="M2491.0 3305.5 L2852.0 3305.5" fill="none" data-name="StudiesTableColumn"></path>
 						</g>
-						<g transform="translate(62399.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeMode">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeMode">ThemeMode</text>
+						<g transform="translate(2491, 3274.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
+								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="CustomColor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomColor">
-							<rect x="50938.5" y="2503.5" height="123.0" width="128.0" data-name="CustomColor"></rect>
-							<path d="M50938.5 2534.5 L51066.5 2534.5" fill="none" data-name="CustomColor"></path>
-							<path d="M50938.5 2595.5 L51066.5 2595.5" fill="none" data-name="CustomColor"></path>
-						</g>
-						<g transform="translate(50938.5, 2503.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomColor">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomColor">CustomColor</text>
+						<g transform="translate(2491, 3305.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50938.5, 2534.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomColor">+color: Color</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomColor">+blend: bool</text>
+					</g>
+					<g data-name="StudiesTableItem">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
+							<rect x="59521.8" y="2466.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
+							<path d="M59521.8 2497.5 L59921.8 2497.5" fill="none" data-name="StudiesTableItem"></path>
+						</g>
+						<g transform="translate(59521.75, 2466.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
+								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50938.5, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+Color value()</text>
+						<g transform="translate(59521.75, 2497.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTemplates">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTemplates">
-							<rect x="75021.5" y="90.0" height="93.0" width="307.0" data-name="StudyTemplates"></rect>
-							<path d="M75021.5 121.0 L75328.5 121.0" fill="none" data-name="StudyTemplates"></path>
-							<path d="M75021.5 152.0 L75328.5 152.0" fill="none" data-name="StudyTemplates"></path>
+					<g data-name="void Function(Study, bool)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
+							<rect x="59625.3" y="3365.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
 						</g>
-						<g transform="translate(75021.5, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTemplates">
-								<text x="145.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTemplates">StudyTemplates</text>
+						<g transform="translate(59625.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75021.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+kUnnamedStudyTitle: String</text>
-								
-							</g>
+					</g>
+					<g data-name="void Function(Study)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
+							<rect x="59898.3" y="3365.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
 						</g>
-						<g transform="translate(75021.5, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+Study emptyDraft()</text>
+						<g transform="translate(59898.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
+								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyActionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyActionType">
-							<rect x="1918.3" y="3282.0" height="197.0" width="358.0" data-name="StudyActionType"></rect>
-							<path d="M1918.3 3313.0 L2276.3 3313.0" fill="none" data-name="StudyActionType"></path>
-						</g>
-						<g transform="translate(1918.25, 3282)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyActionType">
-								<text x="171.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyActionType">StudyActionType</text>
-								
-							</g>
+					<g data-name="App">
+						<g fill="#eee8d5" stroke="#33322E" data-name="App">
+							<rect x="80074.5" y="121.0" height="31.0" width="47.0" data-name="App"></rect>
 						</g>
-						<g transform="translate(1918.25, 3313)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyActionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyActionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+values: List&lt;StudyActionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pin: StudyActionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pinoff: StudyActionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+edit: StudyActionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicate: StudyActionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicateDraft: StudyActionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+addCollaborator: StudyActionType</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+export: StudyActionType</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+delete: StudyActionType</text>
+						<g transform="translate(80074.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
+								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ResultTypes">
-							<rect x="74777.3" y="121.0" height="31.0" width="114.0" data-name="ResultTypes"></rect>
+					<g data-name="AppContent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
+							<rect x="80161.5" y="121.0" height="31.0" width="109.0" data-name="AppContent"></rect>
 						</g>
-						<g transform="translate(74777.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ResultTypes">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ResultTypes">ResultTypes</text>
+						<g transform="translate(80161.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementResultTypes">
-							<rect x="74558.3" y="591.0" height="77.0" width="252.0" data-name="MeasurementResultTypes"></rect>
-							<path d="M74558.3 622.0 L74810.3 622.0" fill="none" data-name="MeasurementResultTypes"></path>
+					<g data-name="AccountSettingsDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
+							<rect x="37056.8" y="1666.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
+							<path d="M37056.8 1697.5 L37250.8 1697.5" fill="none" data-name="AccountSettingsDialog"></path>
 						</g>
-						<g transform="translate(74558.25, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementResultTypes">
-								<text x="118.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementResultTypes">MeasurementResultTypes</text>
+						<g transform="translate(37056.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
+								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74558.25, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementResultTypes">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+questionnaire: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
+						<g transform="translate(37056.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionResultTypes">
-							<rect x="74850.3" y="591.0" height="77.0" width="268.0" data-name="InterventionResultTypes"></rect>
-							<path d="M74850.3 622.0 L75118.3 622.0" fill="none" data-name="InterventionResultTypes"></path>
-						</g>
-						<g transform="translate(74850.25, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionResultTypes">
-								<text x="126.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionResultTypes">InterventionResultTypes</text>
-								
-							</g>
+					<g data-name="ModelRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepository">
+							<rect x="80641.3" y="986.0" height="453.0" width="662.0" data-name="ModelRepository"></rect>
+							<path d="M80641.3 1017.0 L81303.3 1017.0" fill="none" data-name="ModelRepository"></path>
+							<path d="M80641.3 1123.0 L81303.3 1123.0" fill="none" data-name="ModelRepository"></path>
 						</g>
-						<g transform="translate(74850.25, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResultTypes">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+checkmarkTask: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
+						<g transform="translate(80641.25, 986)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepository">
+								<text x="323.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepository">ModelRepository</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyExportData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyExportData">
-							<rect x="51106.5" y="2511.5" height="107.0" width="414.0" data-name="StudyExportData"></rect>
-							<path d="M51106.5 2542.5 L51520.5 2542.5" fill="none" data-name="StudyExportData"></path>
-						</g>
-						<g transform="translate(51106.5, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyExportData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyExportData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyExportData">StudyExportData</text>
+						<g transform="translate(80641.25, 1017)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+delegate: IModelRepositoryDelegate&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">-_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">-_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">-_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51106.5, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyExportData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyExportData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyExportData">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyExportData">+measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyExportData">+interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyExportData">+isEmpty: bool</text>
+						<g transform="translate(80641.25, 1123)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt;? get()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">+dynamic fetchAll()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">+dynamic fetch()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+dynamic delete()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSave()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ModelRepository">-dynamic _buildModelSpecificController()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="ModelRepository">+dynamic ensurePersisted()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt; upsertLocally()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="ModelRepository">+List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="ModelRepository">+dynamic emitUpdate()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="ModelRepository">+dynamic emitModelEvent()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="ModelRepository">+dynamic emitError()</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="ModelRepository">+void dispose()</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="ModelRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CombinedStreamNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CombinedStreamNotifier">
-							<rect x="75218.0" y="583.0" height="93.0" width="435.0" data-name="CombinedStreamNotifier"></rect>
-							<path d="M75218.0 614.0 L75653.0 614.0" fill="none" data-name="CombinedStreamNotifier"></path>
-							<path d="M75218.0 645.0 L75653.0 645.0" fill="none" data-name="CombinedStreamNotifier"></path>
+					<g data-name="InviteCodeRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepository">
+							<rect x="79311.5" y="2458.5" height="213.0" width="403.0" data-name="InviteCodeRepository"></rect>
+							<path d="M79311.5 2489.5 L79714.5 2489.5" fill="none" data-name="InviteCodeRepository"></path>
+							<path d="M79311.5 2595.5 L79714.5 2595.5" fill="none" data-name="InviteCodeRepository"></path>
 						</g>
-						<g transform="translate(75218, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CombinedStreamNotifier">
-								<text x="209.5" y="13.5" stroke="none" text-anchor="middle" data-name="CombinedStreamNotifier">CombinedStreamNotifier</text>
+						<g transform="translate(79311.5, 2458.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepository">
+								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepository">InviteCodeRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75218, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">-_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
+						<g transform="translate(79311.5, 2489.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+apiClient: StudyUApi</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepository">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepository">+study: Study</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75218, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">+void dispose()</text>
+						<g transform="translate(79311.5, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+String getKey()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+dynamic emitUpdate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChangeNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
-							<rect x="75368.5" y="121.0" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
+					<g data-name="ProviderRef">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ProviderRef">
+							<rect x="80391.5" y="3998.5" height="31.0" width="109.0" data-name="ProviderRef"></rect>
 						</g>
-						<g transform="translate(75368.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
+						<g transform="translate(80391.5, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ProviderRef">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProviderRef">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProviderRef">ProviderRef</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="OptimisticUpdate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OptimisticUpdate">
-							<rect x="53024.3" y="3617.0" height="213.0" width="383.0" data-name="OptimisticUpdate"></rect>
-							<path d="M53024.3 3648.0 L53407.3 3648.0" fill="none" data-name="OptimisticUpdate"></path>
-							<path d="M53024.3 3784.0 L53407.3 3784.0" fill="none" data-name="OptimisticUpdate"></path>
-						</g>
-						<g transform="translate(53024.25, 3617)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptimisticUpdate">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptimisticUpdate">OptimisticUpdate</text>
-								
-							</g>
+					<g data-name="StudyUApi">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApi">
+							<rect x="78258.0" y="3908.0" height="212.0" width="251.0" data-name="StudyUApi"></rect>
+							<path d="M78258.0 3939.0 L78509.0 3939.0" fill="none" data-name="StudyUApi"></path>
 						</g>
-						<g transform="translate(53024.25, 3648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+applyOptimistic: void Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">+apply: dynamic Function()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="OptimisticUpdate">+rollback: void Function()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="OptimisticUpdate">+onUpdate: void Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="OptimisticUpdate">+onError: void Function(Object, StackTrace?)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="OptimisticUpdate">+rethrowErrors: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="OptimisticUpdate">+runOptimistically: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="OptimisticUpdate">+completeFutureOptimistically: bool</text>
+						<g transform="translate(78258, 3908)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyUApi">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApi">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApi">StudyUApi</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53024.25, 3784)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+dynamic execute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">-void _runUpdateHandlerIfAny()</text>
+						<g transform="translate(78258, 3939)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApi">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApi">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApi">+dynamic saveStudy()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApi">+dynamic getUserStudies()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApi">+dynamic saveStudyInvite()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudyInvite()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudyInvite()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApi">+dynamic deleteParticipants()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApi">+dynamic fetchAppConfig()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApi">+dynamic fetchUser()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApi">+dynamic saveUser()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()">
-							<rect x="53252.3" y="3998.5" height="31.0" width="134.0" data-name="void Function()"></rect>
+					<g data-name="InviteCodeRepositoryDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepositoryDelegate">
+							<rect x="80792.3" y="2458.5" height="213.0" width="299.0" data-name="InviteCodeRepositoryDelegate"></rect>
+							<path d="M80792.3 2489.5 L81091.3 2489.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
+							<path d="M80792.3 2550.5 L81091.3 2550.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(53252.25, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()">void Function()</text>
+						<g transform="translate(80792.25, 2458.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepositoryDelegate">
+								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepositoryDelegate">InviteCodeRepositoryDelegate</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(Object, StackTrace?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Object, StackTrace?)?">
-							<rect x="53426.3" y="3998.5" height="31.0" width="304.0" data-name="void Function(Object, StackTrace?)?"></rect>
+						<g transform="translate(80792.25, 2489.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+apiClient: StudyUApi</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+studyRepository: IStudyRepository</text>
+								
+							</g>
 						</g>
-						<g transform="translate(53426.25, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Object, StackTrace?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Object, StackTrace?)?">
-								<text x="144.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Object, StackTrace?)?">void Function(Object, StackTrace?)?</text>
+						<g transform="translate(80792.25, 2550.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetch()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetchAll()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic save()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic delete()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic onError()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createDuplicate()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createNewInstance()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Time">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Time">
-							<rect x="75693.0" y="583.5" height="92.0" width="293.0" data-name="Time"></rect>
-							<path d="M75693.0 614.5 L75986.0 614.5" fill="none" data-name="Time"></path>
+					<g data-name="IModelRepositoryDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepositoryDelegate">
+							<rect x="80924.0" y="1621.5" height="152.0" width="225.0" data-name="IModelRepositoryDelegate"></rect>
+							<path d="M80924.0 1652.5 L81149.0 1652.5" fill="none" data-name="IModelRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(75693, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Time">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Time">
-								<text x="138.5" y="13.5" stroke="none" text-anchor="middle" data-name="Time">Time</text>
+						<g transform="translate(80924, 1621.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepositoryDelegate">
+								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepositoryDelegate">IModelRepositoryDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75693, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Time">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Time">
-								<text x="0.0" y="13.5" stroke="none" data-name="Time">&lt;static&gt;+dynamic fromTimeOfDay()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Time">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Time">&lt;static&gt;+Time fromJson()</text>
+						<g transform="translate(80924, 1652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetchAll()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetch()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic save()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic delete()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepositoryDelegate">+T createNewInstance()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepositoryDelegate">+T createDuplicate()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic onError()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimeOfDay">
-							<rect x="75788.0" y="121.0" height="31.0" width="103.0" data-name="TimeOfDay"></rect>
+					<g data-name="StudyRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepository">
+							<rect x="76954.8" y="3632.0" height="183.0" width="403.0" data-name="StudyRepository"></rect>
+							<path d="M76954.8 3663.0 L77357.8 3663.0" fill="none" data-name="StudyRepository"></path>
+							<path d="M76954.8 3739.0 L77357.8 3739.0" fill="none" data-name="StudyRepository"></path>
 						</g>
-						<g transform="translate(75788, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeOfDay">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeOfDay">TimeOfDay</text>
+						<g transform="translate(76954.75, 3632)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepository">
+								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepository">StudyRepository</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="TimeValueAccessor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimeValueAccessor">
-							<rect x="76026.0" y="583.5" height="92.0" width="297.0" data-name="TimeValueAccessor"></rect>
-							<path d="M76026.0 614.5 L76323.0 614.5" fill="none" data-name="TimeValueAccessor"></path>
-						</g>
-						<g transform="translate(76026, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeValueAccessor">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeValueAccessor">TimeValueAccessor</text>
+						<g transform="translate(76954.75, 3663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+apiClient: StudyUApi</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+sortCallback: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76026, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimeValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimeValueAccessor">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimeValueAccessor">+String modelToViewValue()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TimeValueAccessor">+Time? viewToModelValue()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TimeValueAccessor">-String _addLeadingZeroIfNeeded()</text>
+						<g transform="translate(76954.75, 3739)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+String getKey()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+dynamic deleteParticipants()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+dynamic launch()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ControlValueAccessor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ControlValueAccessor">
-							<rect x="76079.0" y="121.0" height="31.0" width="191.0" data-name="ControlValueAccessor"></rect>
+					<g data-name="StudyRepositoryDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepositoryDelegate">
+							<rect x="81006.0" y="3624.5" height="198.0" width="282.0" data-name="StudyRepositoryDelegate"></rect>
+							<path d="M81006.0 3655.5 L81288.0 3655.5" fill="none" data-name="StudyRepositoryDelegate"></path>
+							<path d="M81006.0 3701.5 L81288.0 3701.5" fill="none" data-name="StudyRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(76079, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ControlValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ControlValueAccessor">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="ControlValueAccessor">ControlValueAccessor</text>
+						<g transform="translate(81006, 3624.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepositoryDelegate">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepositoryDelegate">StudyRepositoryDelegate</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ModelAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelAction">
-							<rect x="51560.5" y="2496.5" height="137.0" width="188.0" data-name="ModelAction"></rect>
-							<path d="M51560.5 2527.5 L51748.5 2527.5" fill="none" data-name="ModelAction"></path>
-						</g>
-						<g transform="translate(51560.5, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelAction">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelAction">ModelAction</text>
+						<g transform="translate(81006, 3655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+apiClient: StudyUApi</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+authRepository: IAuthRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51560.5, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelAction">+type: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelAction">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelAction">+icon: IconData?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelAction">+onExecute: Function</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelAction">+isAvailable: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelAction">+isDestructive: bool</text>
+						<g transform="translate(81006, 3701.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetchAll()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetch()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic save()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic delete()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic onError()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createNewInstance()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ModelActionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelActionType">
-							<rect x="2366.3" y="3297.0" height="167.0" width="334.0" data-name="ModelActionType"></rect>
-							<path d="M2366.3 3328.0 L2700.3 3328.0" fill="none" data-name="ModelActionType"></path>
+					<g data-name="APIException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="APIException">
+							<rect x="59032.8" y="614.0" height="31.0" width="121.0" data-name="APIException"></rect>
 						</g>
-						<g transform="translate(2366.25, 3297)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelActionType">
-								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelActionType">ModelActionType</text>
+						<g transform="translate(59032.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="APIException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="APIException">
+								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="APIException">APIException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2366.25, 3328)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelActionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelActionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+values: List&lt;ModelActionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+edit: ModelActionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+delete: ModelActionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+remove: ModelActionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+duplicate: ModelActionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+clipboard: ModelActionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+primary: ModelActionType</text>
+					</g>
+					<g data-name="StudyNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotFoundException">
+							<rect x="41716.0" y="1197.0" height="31.0" width="216.0" data-name="StudyNotFoundException"></rect>
+						</g>
+						<g transform="translate(41716, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotFoundException">
+								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotFoundException">StudyNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SerializableColor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SerializableColor">
-							<rect x="26503.3" y="3685.0" height="77.0" width="312.0" data-name="SerializableColor"></rect>
-							<path d="M26503.3 3716.0 L26815.3 3716.0" fill="none" data-name="SerializableColor"></path>
+					<g data-name="MeasurementNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementNotFoundException">
+							<rect x="41972.0" y="1197.0" height="31.0" width="279.0" data-name="MeasurementNotFoundException"></rect>
 						</g>
-						<g transform="translate(26503.25, 3685)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SerializableColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SerializableColor">
-								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="SerializableColor">SerializableColor</text>
+						<g transform="translate(41972, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementNotFoundException">
+								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementNotFoundException">MeasurementNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26503.25, 3716)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SerializableColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SerializableColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="SerializableColor">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SerializableColor">&lt;static&gt;+SerializableColor fromJson()</text>
+					</g>
+					<g data-name="QuestionNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionNotFoundException">
+							<rect x="52763.5" y="1197.0" height="31.0" width="242.0" data-name="QuestionNotFoundException"></rect>
+						</g>
+						<g transform="translate(52763.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionNotFoundException">
+								<text x="113.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionNotFoundException">QuestionNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Tuple">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Tuple">
-							<rect x="2908.5" y="2481.0" height="168.0" width="384.0" data-name="Tuple"></rect>
-							<path d="M2908.5 2512.0 L3292.5 2512.0" fill="none" data-name="Tuple"></path>
-							<path d="M2908.5 2573.0 L3292.5 2573.0" fill="none" data-name="Tuple"></path>
+					<g data-name="ConsentItemNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemNotFoundException">
+							<rect x="53045.5" y="1197.0" height="31.0" width="271.0" data-name="ConsentItemNotFoundException"></rect>
 						</g>
-						<g transform="translate(2908.5, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Tuple">
-								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="Tuple">Tuple</text>
+						<g transform="translate(53045.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemNotFoundException">
+								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemNotFoundException">ConsentItemNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2908.5, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
-								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+first: T1</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">+second: T2</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+props: List&lt;Object?&gt;</text>
-								
-							</g>
+					</g>
+					<g data-name="InterventionNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionNotFoundException">
+							<rect x="53356.5" y="1197.0" height="31.0" width="265.0" data-name="InterventionNotFoundException"></rect>
 						</g>
-						<g transform="translate(2908.5, 2573)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
-								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">&lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copy()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copyWith()</text>
+						<g transform="translate(53356.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionNotFoundException">
+								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionNotFoundException">InterventionNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CountWhereValidator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CountWhereValidator">
-							<rect x="74135.3" y="553.0" height="153.0" width="383.0" data-name="CountWhereValidator"></rect>
-							<path d="M74135.3 584.0 L74518.3 584.0" fill="none" data-name="CountWhereValidator"></path>
-							<path d="M74135.3 675.0 L74518.3 675.0" fill="none" data-name="CountWhereValidator"></path>
+					<g data-name="InterventionTaskNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskNotFoundException">
+							<rect x="60524.8" y="1197.0" height="31.0" width="303.0" data-name="InterventionTaskNotFoundException"></rect>
 						</g>
-						<g transform="translate(74135.25, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CountWhereValidator">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="CountWhereValidator">CountWhereValidator</text>
+						<g transform="translate(60524.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskNotFoundException">
+								<text x="143.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskNotFoundException">InterventionTaskNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74135.25, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
-								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+predicate: bool Function(T?)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CountWhereValidator">+minCount: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CountWhereValidator">+maxCount: int?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMinCount: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMaxCount: String</text>
+					</g>
+					<g data-name="ReportNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportNotFoundException">
+							<rect x="60867.8" y="1197.0" height="31.0" width="224.0" data-name="ReportNotFoundException"></rect>
+						</g>
+						<g transform="translate(60867.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportNotFoundException">
+								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportNotFoundException">ReportNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74135.25, 675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
-								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+Map&lt;String, dynamic&gt;? validate()</text>
+					</g>
+					<g data-name="ReportSectionNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionNotFoundException">
+							<rect x="61131.8" y="1197.0" height="31.0" width="283.0" data-name="ReportSectionNotFoundException"></rect>
+						</g>
+						<g transform="translate(61131.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionNotFoundException">
+								<text x="133.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionNotFoundException">ReportSectionNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="bool Function(T?)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="bool Function(T?)">
-							<rect x="74249.3" y="1197.0" height="31.0" width="155.0" data-name="bool Function(T?)"></rect>
+					<g data-name="StudyInviteNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInviteNotFoundException">
+							<rect x="61454.8" y="1197.0" height="31.0" width="259.0" data-name="StudyInviteNotFoundException"></rect>
 						</g>
-						<g transform="translate(74249.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="bool Function(T?)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="bool Function(T?)">
-								<text x="69.5" y="13.5" stroke="none" text-anchor="middle" data-name="bool Function(T?)">bool Function(T?)</text>
+						<g transform="translate(61454.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInviteNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInviteNotFoundException">
+								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInviteNotFoundException">StudyInviteNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Validator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Validator">
-							<rect x="74283.8" y="121.0" height="31.0" width="86.0" data-name="Validator"></rect>
+					<g data-name="UserNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UserNotFoundException">
+							<rect x="61753.8" y="1197.0" height="31.0" width="208.0" data-name="UserNotFoundException"></rect>
 						</g>
-						<g transform="translate(74283.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Validator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Validator">
-								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="Validator">Validator</text>
+						<g transform="translate(61753.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserNotFoundException">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserNotFoundException">UserNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Patterns">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Patterns">
-							<rect x="77756.8" y="90.5" height="92.0" width="287.0" data-name="Patterns"></rect>
-							<path d="M77756.8 121.5 L78043.8 121.5" fill="none" data-name="Patterns"></path>
+					<g data-name="StudyUApiClient">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApiClient">
+							<rect x="75871.3" y="4168.0" height="333.0" width="479.0" data-name="StudyUApiClient"></rect>
+							<path d="M75871.3 4199.0 L76350.3 4199.0" fill="none" data-name="StudyUApiClient"></path>
+							<path d="M75871.3 4275.0 L76350.3 4275.0" fill="none" data-name="StudyUApiClient"></path>
 						</g>
-						<g transform="translate(77756.75, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Patterns">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Patterns">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="Patterns">Patterns</text>
+						<g transform="translate(75871.25, 4168)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUApiClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApiClient">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApiClient">StudyUApiClient</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77756.75, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Patterns">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Patterns">
-								<text x="0.0" y="13.5" stroke="none" data-name="Patterns">&lt;static&gt;+timeFormatString: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Patterns">&lt;static&gt;+emailFormatString: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Patterns">&lt;static&gt;+url: String</text>
+						<g transform="translate(75871.25, 4199)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+supabaseClient: SupabaseClient</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyColumns: List&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+testDelayMilliseconds: int</text>
+								
+							</g>
+						</g>
+						<g transform="translate(75871.25, 4275)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteParticipants()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">+dynamic getUserStudies()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudy()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudy()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudyInvite()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudyInvite()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudyInvite()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchAppConfig()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchUser()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApiClient">+dynamic saveUser()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyUApiClient">-dynamic _awaitGuarded()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyUApiClient">-dynamic _apiException()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyUApiClient">-dynamic _testDelay()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ExecutionLimiter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ExecutionLimiter">
-							<rect x="54494.3" y="3669.5" height="108.0" width="197.0" data-name="ExecutionLimiter"></rect>
-							<path d="M54494.3 3700.5 L54691.3 3700.5" fill="none" data-name="ExecutionLimiter"></path>
-							<path d="M54494.3 3746.5 L54691.3 3746.5" fill="none" data-name="ExecutionLimiter"></path>
+					<g data-name="SupabaseClient">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClient">
+							<rect x="75615.8" y="4541.0" height="31.0" width="141.0" data-name="SupabaseClient"></rect>
 						</g>
-						<g transform="translate(54494.25, 3669.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ExecutionLimiter">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ExecutionLimiter">ExecutionLimiter</text>
+						<g transform="translate(75615.75, 4541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClient">
+								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClient">SupabaseClient</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54494.25, 3700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
-								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+milliseconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ExecutionLimiter">&lt;static&gt;-_timer: Timer?</text>
+					</g>
+					<g data-name="SupabaseClientDependant">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClientDependant">
+							<rect x="75649.3" y="3983.0" height="62.0" width="284.0" data-name="SupabaseClientDependant"></rect>
+							<path d="M75649.3 4014.0 L75933.3 4014.0" fill="none" data-name="SupabaseClientDependant"></path>
+						</g>
+						<g transform="translate(75649.25, 3983)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseClientDependant">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClientDependant">
+								<text x="134.0" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClientDependant">SupabaseClientDependant</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54494.25, 3746.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
-								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+void dispose()</text>
+						<g transform="translate(75649.25, 4014)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseClientDependant">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseClientDependant">
+								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseClientDependant">+supabaseClient: SupabaseClient</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Timer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Timer">
-							<rect x="53770.3" y="3998.5" height="31.0" width="60.0" data-name="Timer"></rect>
+					<g data-name="SupabaseQueryMixin">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryMixin">
+							<rect x="76003.3" y="3945.5" height="137.0" width="215.0" data-name="SupabaseQueryMixin"></rect>
+							<path d="M76003.3 3976.5 L76218.3 3976.5" fill="none" data-name="SupabaseQueryMixin"></path>
 						</g>
-						<g transform="translate(53770.25, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timer">
-								<text x="22.0" y="13.5" stroke="none" text-anchor="middle" data-name="Timer">Timer</text>
+						<g transform="translate(76003.25, 3945.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseQueryMixin">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryMixin">
+								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryMixin">SupabaseQueryMixin</text>
+								
+							</g>
+						</g>
+						<g transform="translate(76003.25, 3976.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryMixin">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryMixin">
+								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic deleteAll()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getAll()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getById()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getByColumn()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseQueryMixin">+List&lt;T&gt; deserializeList()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SupabaseQueryMixin">+T deserializeObject()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Throttler">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Throttler">
-							<rect x="53870.3" y="3983.0" height="62.0" width="136.0" data-name="Throttler"></rect>
-							<path d="M53870.3 4014.0 L54006.3 4014.0" fill="none" data-name="Throttler"></path>
+					<g data-name="IAppRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAppRepository">
+							<rect x="62894.5" y="3342.0" height="77.0" width="230.0" data-name="IAppRepository"></rect>
+							<path d="M62894.5 3373.0 L63124.5 3373.0" fill="none" data-name="IAppRepository"></path>
 						</g>
-						<g transform="translate(53870.25, 3983)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Throttler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Throttler">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="Throttler">Throttler</text>
+						<g transform="translate(62894.5, 3342)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppRepository">
+								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAppRepository">IAppRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53870.25, 4014)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Throttler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Throttler">
-								<text x="0.0" y="13.5" stroke="none" data-name="Throttler">+dynamic call()</text>
+						<g transform="translate(62894.5, 3373)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAppRepository">+dynamic fetchAppConfig()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IAppRepository">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SuppressedBehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SuppressedBehaviorSubject">
-							<rect x="54731.3" y="3654.5" height="138.0" width="388.0" data-name="SuppressedBehaviorSubject"></rect>
-							<path d="M54731.3 3685.5 L55119.3 3685.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
-							<path d="M54731.3 3746.5 L55119.3 3746.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
+					<g data-name="AppRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppRepository">
+							<rect x="62894.5" y="3669.5" height="108.0" width="230.0" data-name="AppRepository"></rect>
+							<path d="M62894.5 3700.5 L63124.5 3700.5" fill="none" data-name="AppRepository"></path>
+							<path d="M62894.5 3731.5 L63124.5 3731.5" fill="none" data-name="AppRepository"></path>
 						</g>
-						<g transform="translate(54731.25, 3654.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SuppressedBehaviorSubject">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="SuppressedBehaviorSubject">SuppressedBehaviorSubject</text>
+						<g transform="translate(62894.5, 3669.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppRepository">
+								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppRepository">AppRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54731.25, 3685.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
-								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">+subject: BehaviorSubject&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+didSuppressInitialEvent: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SuppressedBehaviorSubject">-_controller: StreamController&lt;T&gt;</text>
+						<g transform="translate(62894.5, 3700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+apiClient: StudyUApi</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54731.25, 3746.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
-								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">-StreamController&lt;T&gt; _buildDerivedController()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+dynamic close()</text>
+						<g transform="translate(62894.5, 3731.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+dynamic fetchAppConfig()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppRepository">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StreamController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
-							<rect x="54439.5" y="3998.5" height="31.0" width="149.0" data-name="StreamController"></rect>
-						</g>
-						<g transform="translate(54439.5, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
+					<g data-name="StudyUUser">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUUser">
+							<rect x="76258.3" y="3998.5" height="31.0" width="110.0" data-name="StudyUUser"></rect>
+						</g>
+						<g transform="translate(76258.25, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUUser">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUUser">
+								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUUser">StudyUUser</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="JsonFileLoader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JsonFileLoader">
-							<rect x="78083.8" y="75.0" height="123.0" width="319.0" data-name="JsonFileLoader"></rect>
-							<path d="M78083.8 106.0 L78402.8 106.0" fill="none" data-name="JsonFileLoader"></path>
-							<path d="M78083.8 137.0 L78402.8 137.0" fill="none" data-name="JsonFileLoader"></path>
+					<g data-name="UserRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UserRepository">
+							<rect x="73886.0" y="3639.5" height="168.0" width="282.0" data-name="UserRepository"></rect>
+							<path d="M73886.0 3670.5 L74168.0 3670.5" fill="none" data-name="UserRepository"></path>
+							<path d="M73886.0 3746.5 L74168.0 3746.5" fill="none" data-name="UserRepository"></path>
 						</g>
-						<g transform="translate(78083.75, 75)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonFileLoader">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="JsonFileLoader">JsonFileLoader</text>
+						<g transform="translate(73886, 3639.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserRepository">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserRepository">UserRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78083.75, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+jsonAssetsPath: String</text>
+						<g transform="translate(73886, 3670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+apiClient: StudyUApi</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+ref: Ref&lt;Object?&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="UserRepository">+user: StudyUUser</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78083.75, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+dynamic loadJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonMapFromAssets()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonListFromAssets()</text>
+						<g transform="translate(73886, 3746.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+dynamic fetchUser()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+dynamic saveUser()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+dynamic updatePreferences()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NumericalRangeFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NumericalRangeFormatter">
-							<rect x="77300.8" y="575.5" height="108.0" width="313.0" data-name="NumericalRangeFormatter"></rect>
-							<path d="M77300.8 606.5 L77613.8 606.5" fill="none" data-name="NumericalRangeFormatter"></path>
-							<path d="M77300.8 652.5 L77613.8 652.5" fill="none" data-name="NumericalRangeFormatter"></path>
+					<g data-name="Ref">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Ref">
+							<rect x="78175.0" y="3998.5" height="31.0" width="43.0" data-name="Ref"></rect>
 						</g>
-						<g transform="translate(77300.75, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NumericalRangeFormatter">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="NumericalRangeFormatter">NumericalRangeFormatter</text>
+						<g transform="translate(78175, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Ref">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Ref">
+								<text x="13.5" y="13.5" stroke="none" text-anchor="middle" data-name="Ref">Ref</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77300.75, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+min: int?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NumericalRangeFormatter">+max: int?</text>
+					</g>
+					<g data-name="PreferenceAction">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PreferenceAction">
+							<rect x="2942.0" y="3327.0" height="107.0" width="334.0" data-name="PreferenceAction"></rect>
+							<path d="M2942.0 3358.0 L3276.0 3358.0" fill="none" data-name="PreferenceAction"></path>
+						</g>
+						<g transform="translate(2942, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreferenceAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreferenceAction">
+								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="PreferenceAction">PreferenceAction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77300.75, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+TextEditingValue formatEditUpdate()</text>
+						<g transform="translate(2942, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreferenceAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreferenceAction">
+								<text x="0.0" y="13.5" stroke="none" data-name="PreferenceAction">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+values: List&lt;PreferenceAction&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pin: PreferenceAction</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pinOff: PreferenceAction</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TextInputFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextInputFormatter">
-							<rect x="77550.8" y="121.0" height="31.0" width="166.0" data-name="TextInputFormatter"></rect>
+					<g data-name="User">
+						<g fill="#eee8d5" stroke="#33322E" data-name="User">
+							<rect x="75168.5" y="4541.0" height="31.0" width="53.0" data-name="User"></rect>
 						</g>
-						<g transform="translate(77550.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TextInputFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextInputFormatter">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextInputFormatter">TextInputFormatter</text>
+						<g transform="translate(75168.5, 4541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="User">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="User">
+								<text x="18.5" y="13.5" stroke="none" text-anchor="middle" data-name="User">User</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudySequenceFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySequenceFormatter">
-							<rect x="77797.0" y="598.5" height="62.0" width="313.0" data-name="StudySequenceFormatter"></rect>
-							<path d="M77797.0 629.5 L78110.0 629.5" fill="none" data-name="StudySequenceFormatter"></path>
+					<g data-name="Session">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Session">
+							<rect x="75261.5" y="4541.0" height="31.0" width="79.0" data-name="Session"></rect>
 						</g>
-						<g transform="translate(77797, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySequenceFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySequenceFormatter">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySequenceFormatter">StudySequenceFormatter</text>
+						<g transform="translate(75261.5, 4541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Session">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Session">
+								<text x="31.5" y="13.5" stroke="none" text-anchor="middle" data-name="Session">Session</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77797, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySequenceFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySequenceFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySequenceFormatter">+TextEditingValue formatEditUpdate()</text>
+					</g>
+					<g data-name="AuthRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthRepository">
+							<rect x="75431.0" y="4183.0" height="303.0" width="340.0" data-name="AuthRepository"></rect>
+							<path d="M75431.0 4214.0 L75771.0 4214.0" fill="none" data-name="AuthRepository"></path>
+							<path d="M75431.0 4350.0 L75771.0 4350.0" fill="none" data-name="AuthRepository"></path>
+						</g>
+						<g transform="translate(75431, 4183)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthRepository">
+								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthRepository">AuthRepository</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FileFormatEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FileFormatEncoder">
-							<rect x="78442.8" y="90.5" height="92.0" width="216.0" data-name="FileFormatEncoder"></rect>
-							<path d="M78442.8 121.5 L78658.8 121.5" fill="none" data-name="FileFormatEncoder"></path>
-						</g>
-						<g transform="translate(78442.75, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FileFormatEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FileFormatEncoder">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="FileFormatEncoder">FileFormatEncoder</text>
+						<g transform="translate(75431, 4214)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">+supabaseClient: SupabaseClient</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+sharedPreferences: SharedPreferences</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+allowPasswordReset: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+authClient: GoTrueClient</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+session: Session?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+serializedSession: String?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+currentUser: User?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthRepository">+isLoggedIn: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78442.75, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FileFormatEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FileFormatEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="FileFormatEncoder">+dynamic encodeAsync()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FileFormatEncoder">+String encode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FileFormatEncoder">+dynamic call()</text>
+						<g transform="translate(75431, 4350)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">-void _registerAuthListener()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+dynamic signUp()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+dynamic signInWith()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+dynamic signOut()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+dynamic resetPasswordForEmail()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+dynamic updateUser()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+void dispose()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthRepository">+dynamic onAppStart()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CSVStringEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CSVStringEncoder">
-							<rect x="78150.0" y="598.5" height="62.0" width="162.0" data-name="CSVStringEncoder"></rect>
-							<path d="M78150.0 629.5 L78312.0 629.5" fill="none" data-name="CSVStringEncoder"></path>
+					<g data-name="GoTrueClient">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoTrueClient">
+							<rect x="75455.8" y="4541.0" height="31.0" width="120.0" data-name="GoTrueClient"></rect>
 						</g>
-						<g transform="translate(78150, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CSVStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CSVStringEncoder">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="CSVStringEncoder">CSVStringEncoder</text>
+						<g transform="translate(75455.75, 4541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoTrueClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoTrueClient">
+								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoTrueClient">GoTrueClient</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78150, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CSVStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CSVStringEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="CSVStringEncoder">+String encode()</text>
+					</g>
+					<g data-name="StudyLaunched">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyLaunched">
+							<rect x="76457.0" y="614.0" height="31.0" width="140.0" data-name="StudyLaunched"></rect>
+						</g>
+						<g transform="translate(76457, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyLaunched">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyLaunched">
+								<text x="62.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyLaunched">StudyLaunched</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="JsonStringEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JsonStringEncoder">
-							<rect x="78569.8" y="598.5" height="62.0" width="166.0" data-name="JsonStringEncoder"></rect>
-							<path d="M78569.8 629.5 L78735.8 629.5" fill="none" data-name="JsonStringEncoder"></path>
+					<g data-name="ModelEvent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelEvent">
+							<rect x="76721.3" y="98.0" height="77.0" width="145.0" data-name="ModelEvent"></rect>
+							<path d="M76721.3 129.0 L76866.3 129.0" fill="none" data-name="ModelEvent"></path>
 						</g>
-						<g transform="translate(78569.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JsonStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonStringEncoder">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="JsonStringEncoder">JsonStringEncoder</text>
+						<g transform="translate(76721.25, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelEvent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelEvent">
+								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelEvent">ModelEvent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78569.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonStringEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonStringEncoder">+String encode()</text>
+						<g transform="translate(76721.25, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelEvent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelEvent">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelEvent">+modelId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelEvent">+model: T</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformLocaleWeb">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleWeb">
-							<rect x="78775.8" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleWeb"></rect>
-							<path d="M78775.8 629.5 L79014.8 629.5" fill="none" data-name="PlatformLocaleWeb"></path>
+					<g data-name="SupabaseQueryError">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryError">
+							<rect x="64163.3" y="583.5" height="92.0" width="183.0" data-name="SupabaseQueryError"></rect>
+							<path d="M64163.3 614.5 L64346.3 614.5" fill="none" data-name="SupabaseQueryError"></path>
 						</g>
-						<g transform="translate(78775.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleWeb">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleWeb">PlatformLocaleWeb</text>
+						<g transform="translate(64163.25, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseQueryError">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryError">
+								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryError">SupabaseQueryError</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78775.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleWeb">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleWeb">+Locale getPlatformLocale()</text>
+						<g transform="translate(64163.25, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryError">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryError">
+								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryError">+statusCode: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryError">+message: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryError">+details: dynamic</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformLocale">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocale">
-							<rect x="78938.3" y="105.5" height="62.0" width="239.0" data-name="PlatformLocale"></rect>
-							<path d="M78938.3 136.5 L79177.3 136.5" fill="none" data-name="PlatformLocale"></path>
+					<g data-name="WrappedModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WrappedModel">
+							<rect x="60784.0" y="2436.0" height="258.0" width="251.0" data-name="WrappedModel"></rect>
+							<path d="M60784.0 2467.0 L61035.0 2467.0" fill="none" data-name="WrappedModel"></path>
+							<path d="M60784.0 2618.0 L61035.0 2618.0" fill="none" data-name="WrappedModel"></path>
 						</g>
-						<g transform="translate(78938.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocale">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocale">PlatformLocale</text>
+						<g transform="translate(60784, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WrappedModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WrappedModel">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="WrappedModel">WrappedModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78938.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocale">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocale">+Locale getPlatformLocale()</text>
+						<g transform="translate(60784, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">-_model: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+asyncValue: AsyncValue&lt;T&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+isLocalOnly: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+isDirty: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WrappedModel">+isDeleted: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WrappedModel">+lastSaved: DateTime?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WrappedModel">+lastFetched: DateTime?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WrappedModel">+lastUpdated: DateTime?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="WrappedModel">+model: T</text>
+								
+							</g>
+						</g>
+						<g transform="translate(60784, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">+dynamic markWithError()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+dynamic markAsLoading()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+dynamic markAsFetched()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+dynamic markAsSaved()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformLocaleMobile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleMobile">
-							<rect x="79054.8" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleMobile"></rect>
-							<path d="M79054.8 629.5 L79293.8 629.5" fill="none" data-name="PlatformLocaleMobile"></path>
+					<g data-name="ModelRepositoryException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepositoryException">
+							<rect x="64617.3" y="614.0" height="31.0" width="227.0" data-name="ModelRepositoryException"></rect>
 						</g>
-						<g transform="translate(79054.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleMobile">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleMobile">PlatformLocaleMobile</text>
+						<g transform="translate(64617.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelRepositoryException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepositoryException">
+								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepositoryException">ModelRepositoryException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79054.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleMobile">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleMobile">+Locale getPlatformLocale()</text>
+					</g>
+					<g data-name="ModelNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelNotFoundException">
+							<rect x="64621.3" y="1197.0" height="31.0" width="219.0" data-name="ModelNotFoundException"></rect>
+						</g>
+						<g transform="translate(64621.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelNotFoundException">
+								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelNotFoundException">ModelNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppTranslation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppTranslation">
-							<rect x="80707.3" y="105.5" height="62.0" width="194.0" data-name="AppTranslation"></rect>
-							<path d="M80707.3 136.5 L80901.3 136.5" fill="none" data-name="AppTranslation"></path>
+					<g data-name="IModelRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepository">
+							<rect x="80781.3" y="501.0" height="257.0" width="382.0" data-name="IModelRepository"></rect>
+							<path d="M80781.3 532.0 L81163.3 532.0" fill="none" data-name="IModelRepository"></path>
 						</g>
-						<g transform="translate(80707.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppTranslation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppTranslation">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppTranslation">AppTranslation</text>
+						<g transform="translate(80781.25, 501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepository">
+								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepository">IModelRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80707.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppTranslation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppTranslation">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppTranslation">&lt;static&gt;+dynamic init()</text>
+						<g transform="translate(80781.25, 532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepository">+String getKey()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepository">+WrappedModel&lt;T&gt;? get()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepository">+dynamic fetchAll()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepository">+dynamic fetch()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepository">+dynamic save()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepository">+dynamic delete()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSave()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="IModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="IModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="IModelRepository">+dynamic ensurePersisted()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="IModelRepository">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LanguagePicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePicker">
-							<rect x="51828.5" y="2519.0" height="92.0" width="366.0" data-name="LanguagePicker"></rect>
-							<path d="M51828.5 2550.0 L52194.5 2550.0" fill="none" data-name="LanguagePicker"></path>
-						</g>
-						<g transform="translate(51828.5, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePicker">
-								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePicker">LanguagePicker</text>
-								
-							</g>
+					<g data-name="IsFetched">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsFetched">
+							<rect x="77405.3" y="614.0" height="31.0" width="94.0" data-name="IsFetched"></rect>
 						</g>
-						<g transform="translate(51828.5, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePicker">+languagePickerType: LanguagePickerType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePicker">+iconColor: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePicker">+offset: Offset?</text>
+						<g transform="translate(77405.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsFetched">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsFetched">
+								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsFetched">IsFetched</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LanguagePickerType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePickerType">
-							<rect x="24247.3" y="3327.0" height="107.0" width="366.0" data-name="LanguagePickerType"></rect>
-							<path d="M24247.3 3358.0 L24613.3 3358.0" fill="none" data-name="LanguagePickerType"></path>
+					<g data-name="IsSaving">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaving">
+							<rect x="77539.3" y="614.0" height="31.0" width="84.0" data-name="IsSaving"></rect>
 						</g>
-						<g transform="translate(24247.25, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePickerType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePickerType">
-								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePickerType">LanguagePickerType</text>
+						<g transform="translate(77539.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaving">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaving">
+								<text x="34.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaving">IsSaving</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24247.25, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePickerType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePickerType">
-								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePickerType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+values: List&lt;LanguagePickerType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+field: LanguagePickerType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+icon: LanguagePickerType</text>
+					</g>
+					<g data-name="IsSaved">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaved">
+							<rect x="77663.3" y="614.0" height="31.0" width="80.0" data-name="IsSaved"></rect>
+						</g>
+						<g transform="translate(77663.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaved">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaved">
+								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaved">IsSaved</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Offset">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Offset">
-							<rect x="52531.3" y="3365.0" height="31.0" width="63.0" data-name="Offset"></rect>
+					<g data-name="IsDeleted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsDeleted">
+							<rect x="77783.3" y="614.0" height="31.0" width="91.0" data-name="IsDeleted"></rect>
 						</g>
-						<g transform="translate(52531.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Offset">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Offset">
-								<text x="23.5" y="13.5" stroke="none" text-anchor="middle" data-name="Offset">Offset</text>
+						<g transform="translate(77783.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsDeleted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsDeleted">
+								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="IsDeleted">IsDeleted</text>
 								
 							</g>
 						</g>

From d4bbcbe8f0d9f7b130965830f8750610388862f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20G=C3=B6cer?= <dev@hig.dev>
Date: Thu, 18 Apr 2024 18:42:42 +0200
Subject: [PATCH 003/314] fix: merge mistake

---
 designer_v2/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index aa09fb95c..0714e744f 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -23,7 +23,7 @@ dependencies:
   flutter_riverpod: ^2.5.1
   flutter_web_plugins:
     sdk: flutter
-  go_router: ^13.2.1
+  go_router: ^13.2.4
   intl:
   material_color_utilities:
   material_design_icons_flutter: ^7.0.7296

From fa3167e9368254ef4a371618a22c8f8473b09679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20G=C3=B6cer?= <dev@hig.dev>
Date: Thu, 18 Apr 2024 19:02:03 +0200
Subject: [PATCH 004/314] fix: total interventions calculation

---
 designer_v2/lib/features/monitor/study_monitor_table.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_v2/lib/features/monitor/study_monitor_table.dart b/designer_v2/lib/features/monitor/study_monitor_table.dart
index be7b3ff9e..62e8e60a0 100644
--- a/designer_v2/lib/features/monitor/study_monitor_table.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_table.dart
@@ -53,7 +53,7 @@ class StudyMonitorItem extends Equatable {
           min(studyDurationInDays, DateTime.now().toUtc().difference(participant.startedAt!).inDays);
       final daysInBaseline = study.schedule.includeBaseline ? study.schedule.phaseDuration : 0;
 
-      final totalInterventions = max(0, currentDayOfStudy - daysInBaseline) * interventions.length;
+      final totalInterventions = max(0, currentDayOfStudy - daysInBaseline);
       final totalSurveys = currentDayOfStudy * study.observations.length;
 
       final completedInterventions = progresses.where((p) => p.resultType == "bool").toList();

From f8c8fc3ca48f0ccb602c0f5db102eb8666d72548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20G=C3=B6cer?= <dev@hig.dev>
Date: Thu, 18 Apr 2024 19:03:11 +0200
Subject: [PATCH 005/314] feat: also enable monitor page if results are public
 but not creator

---
 designer_v2/lib/features/study/study_controller_state.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_v2/lib/features/study/study_controller_state.dart b/designer_v2/lib/features/study/study_controller_state.dart
index 3c41c6566..581fc711f 100644
--- a/designer_v2/lib/features/study/study_controller_state.dart
+++ b/designer_v2/lib/features/study/study_controller_state.dart
@@ -46,7 +46,7 @@ class StudyControllerState extends StudyControllerBaseState implements IStudyApp
       study.value == null || (study.value != null && study.value!.canEdit(super.currentUser));
 
   @override
-  bool get isMonitorTabEnabled => isRecruitTabEnabled;
+  bool get isMonitorTabEnabled => isAnalyzeTabEnabled;
 
   @override
   bool get isAnalyzeTabEnabled =>

From 13c823f6ce3672067db205022d544c831667d90b Mon Sep 17 00:00:00 2001
From: StudyU Documenter <studyu-documenter>
Date: Thu, 18 Apr 2024 17:05:48 +0000
Subject: [PATCH 006/314] docs: update UML documentation

---
 .../designer_v2/lib/features/study/uml.svg    | 1488 ++--
 docs/uml/designer_v2/lib/features/uml.svg     | 3590 ++++-----
 docs/uml/designer_v2/lib/uml.svg              | 6541 +++++++++--------
 3 files changed, 5959 insertions(+), 5660 deletions(-)

diff --git a/docs/uml/designer_v2/lib/features/study/uml.svg b/docs/uml/designer_v2/lib/features/study/uml.svg
index d5afd8d04..ecd129fbe 100644
--- a/docs/uml/designer_v2/lib/features/study/uml.svg
+++ b/docs/uml/designer_v2/lib/features/study/uml.svg
@@ -1,34 +1,40 @@
-<svg version="1.1" baseProfile="full" width="5569.5" height="951.0" viewbox="0 0 5569.5 951" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;IStudyNavViewModel
+<svg version="1.1" baseProfile="full" width="6780.3" height="951.0" viewbox="0 0 6780.25 951" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[FrameControlsWidget
 	  |
-	  +isEditTabEnabled: bool;
-	  +isTestTabEnabled: bool;
-	  +isRecruitTabEnabled: bool;
-	  +isMonitorTabEnabled: bool;
-	  +isAnalyzeTabEnabled: bool;
-	  +isSettingsEnabled: bool
+	  +onRefresh: void Function()?;
+	  +onOpenNewTab: void Function()?;
+	  +enabled: bool
+	  |
+	  +Widget build()
 	]
 	
-	[StudyNav
+	[FrameControlsWidget]o-[void Function()?]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
+	
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel
 	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic edit();
-	  &lt;static&gt;+dynamic test();
-	  &lt;static&gt;+dynamic recruit();
-	  &lt;static&gt;+dynamic monitor();
-	  &lt;static&gt;+dynamic analyze()
+	  +studyParticipation: Participation?;
+	  +studyStatus: StudyStatus?
 	]
 	
-	[StudyDesignNav
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
+	
+	[StudyStatusBadge
 	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic info();
-	  &lt;static&gt;+dynamic enrollment();
-	  &lt;static&gt;+dynamic interventions();
-	  &lt;static&gt;+dynamic measurements();
-	  &lt;static&gt;+dynamic reports()
+	  +participation: Participation?;
+	  +status: StudyStatus?;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +showTooltip: bool
+	  |
+	  +Widget build()
 	]
 	
+	[StudyStatusBadge]o-[Participation]
+	[StudyStatusBadge]o-[StudyStatus]
+	[StudyStatusBadge]o-[BadgeType]
+	
 	[RouteInformation
 	  |
 	  +route: String?;
@@ -91,58 +97,55 @@
 	
 	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
 	
-	[TestAppRoutes
-	  |
-	  &lt;static&gt;+studyOverview: String;
-	  &lt;static&gt;+eligibility: String;
-	  &lt;static&gt;+intervention: String;
-	  &lt;static&gt;+consent: String;
-	  &lt;static&gt;+journey: String;
-	  &lt;static&gt;+dashboard: String
-	]
-	
-	[StudySettingsFormViewModel
+	[StudyController
 	  |
-	  +study: AsyncValue&lt;Study&gt;;
-	  +studyRepository: IStudyRepository;
-	  &lt;static&gt;+defaultPublishedToRegistry: bool;
-	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
-	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
-	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +notificationService: INotificationService;
+	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
+	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
 	  |
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +dynamic keepControlsSynced();
-	  +dynamic save();
-	  +dynamic setLaunchDefaults()
+	  +dynamic syncStudyStatus();
+	  +dynamic onStudySubscriptionUpdate();
+	  -dynamic _redirectNewToActualStudyID();
+	  +dynamic publishStudy();
+	  +void onChangeStudyParticipation();
+	  +void onAddParticipants();
+	  +void onSettingsPressed();
+	  +void dispose()
 	]
 	
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudySettingsFormViewModel]o-[FormControl]
-	[StudySettingsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
+	[StudyController]o-[&lt;abstract&gt;INotificationService]
+	[StudyController]o-[StreamSubscription]
+	[StudyBaseController]&lt;:-[StudyController]
 	
-	[StudySettingsDialog
+	[&lt;abstract&gt;IStudyNavViewModel
 	  |
-	  +Widget build()
+	  +isEditTabEnabled: bool;
+	  +isTestTabEnabled: bool;
+	  +isRecruitTabEnabled: bool;
+	  +isMonitorTabEnabled: bool;
+	  +isAnalyzeTabEnabled: bool;
+	  +isSettingsEnabled: bool
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
-	
-	[FrameControlsWidget
-	  |
-	  +onRefresh: void Function()?;
-	  +onOpenNewTab: void Function()?;
-	  +enabled: bool
+	[StudyNav
 	  |
-	  +Widget build()
+	  &lt;static&gt;+dynamic tabs();
+	  &lt;static&gt;+dynamic edit();
+	  &lt;static&gt;+dynamic test();
+	  &lt;static&gt;+dynamic recruit();
+	  &lt;static&gt;+dynamic monitor();
+	  &lt;static&gt;+dynamic analyze()
 	]
 	
-	[FrameControlsWidget]o-[void Function()?]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
+	[StudyDesignNav
+	  |
+	  &lt;static&gt;+dynamic tabs();
+	  &lt;static&gt;+dynamic info();
+	  &lt;static&gt;+dynamic enrollment();
+	  &lt;static&gt;+dynamic interventions();
+	  &lt;static&gt;+dynamic measurements();
+	  &lt;static&gt;+dynamic reports()
+	]
 	
 	[&lt;abstract&gt;StudyPageWidget
 	  |
@@ -154,19 +157,6 @@
 	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
 	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
 	
-	[StudyTestScreen
-	  |
-	  +previewRoute: String?
-	  |
-	  +Widget build();
-	  +Widget? banner();
-	  +dynamic load();
-	  +dynamic save();
-	  +dynamic showHelp()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
-	
 	[StudyParticipationBadge
 	  |
 	  +participation: Participation;
@@ -180,49 +170,22 @@
 	[StudyParticipationBadge]o-[Participation]
 	[StudyParticipationBadge]o-[BadgeType]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel
-	  |
-	  +studyParticipation: Participation?;
-	  +studyStatus: StudyStatus?
-	]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
-	
-	[StudyStatusBadge
-	  |
-	  +participation: Participation?;
-	  +status: StudyStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
-	  |
-	  +Widget build()
-	]
-	
-	[StudyStatusBadge]o-[Participation]
-	[StudyStatusBadge]o-[StudyStatus]
-	[StudyStatusBadge]o-[BadgeType]
-	
-	[StudyController
+	[StudyBaseController
 	  |
-	  +notificationService: INotificationService;
-	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
-	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
+	  +studyId: String;
+	  +studyRepository: IStudyRepository;
+	  +router: GoRouter;
+	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
 	  |
-	  +dynamic syncStudyStatus();
+	  +dynamic subscribeStudy();
 	  +dynamic onStudySubscriptionUpdate();
-	  -dynamic _redirectNewToActualStudyID();
-	  +dynamic publishStudy();
-	  +void onChangeStudyParticipation();
-	  +void onAddParticipants();
-	  +void onSettingsPressed();
+	  +dynamic onStudySubscriptionError();
 	  +void dispose()
 	]
 	
-	[StudyController]o-[&lt;abstract&gt;INotificationService]
-	[StudyController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyController]
+	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
+	[StudyBaseController]o-[GoRouter]
+	[StudyBaseController]o-[StreamSubscription]
 	
 	[PreviewFrame
 	  |
@@ -233,15 +196,6 @@
 	
 	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
 	
-	[StudyTestController
-	  |
-	  +authRepository: IAuthRepository;
-	  +languageCode: String
-	]
-	
-	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyBaseController]&lt;:-[StudyTestController]
-	
 	[&lt;abstract&gt;IStudyAppBarViewModel
 	  |
 	  +isSyncIndicatorVisible: bool;
@@ -315,255 +269,362 @@
 	  +Widget build()
 	]
 	
-	[StudyBaseController
+	[StudyTestScreen
 	  |
-	  +studyId: String;
+	  +previewRoute: String?
+	  |
+	  +Widget build();
+	  +Widget? banner();
+	  +dynamic load();
+	  +dynamic save();
+	  +dynamic showHelp()
+	]
+	
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
+	
+	[StudySettingsFormViewModel
+	  |
+	  +study: AsyncValue&lt;Study&gt;;
 	  +studyRepository: IStudyRepository;
-	  +router: GoRouter;
-	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
+	  &lt;static&gt;+defaultPublishedToRegistry: bool;
+	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
+	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
+	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +dynamic subscribeStudy();
-	  +dynamic onStudySubscriptionUpdate();
-	  +dynamic onStudySubscriptionError();
-	  +void dispose()
+	  +void setControlsFrom();
+	  +Study buildFormData();
+	  +dynamic keepControlsSynced();
+	  +dynamic save();
+	  +dynamic setLaunchDefaults()
 	]
 	
-	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyBaseController]o-[GoRouter]
-	[StudyBaseController]o-[StreamSubscription]
+	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
+	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
+	[StudySettingsFormViewModel]o-[FormControl]
+	[StudySettingsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
 	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="951.0" width="5569.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M419.8 197.1 L620 278 L620 358 L620.0 358.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M413.2 188.6 L419.8 197.1 L409.2 198.5 L402.5 190.1 Z"></path>
-					</g>
-					<path d="M418.4 231.7 L493.75 278 L2046.25 423.66908060453403 L2046.3 423.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M413.2 222.2 L418.4 231.7 L407.7 231.3 L402.5 221.9 Z"></path>
-					</g>
-					<path d="M367.5 544.7 L367.5 576 L367.5 694.5 L367.5 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M372.8 535.3 L367.5 544.7 L362.2 535.3 L367.5 526.0 Z"></path>
-					</g>
-					<path d="M360.1 268.5 L367.5 278 L367.5 328 L367.5 328.0 " fill="none"></path>
-					<path d="M364.3 265.2 L360.1 268.5 L355.9 271.8 L351.9 258.0 Z"></path>
-					<path d="M106.8 267.2 L95.5 278 L95.5 343.5 L95.5 343.5 " fill="none"></path>
-					<path d="M110.5 271.1 L106.8 267.2 L103.1 263.4 L116.4 258.0 Z"></path>
-					<path d="M1350.6 565.3 L1369 576 L1235.6875 694.5 L1235.7 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1345.2 556.1 L1350.6 565.3 L1339.8 565.3 L1334.4 556.0 Z"></path>
-					</g>
-					<path d="M1315.2 566.5 L1329 576 L1880.1576492537313 694.5 L1880.2 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1310.5 556.9 L1315.2 566.5 L1304.5 565.7 L1299.8 556.0 Z"></path>
-					</g>
-					<path d="M855.5 560.6 L826 576 L826 694.5 L826.0 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M866.2 561.0 L855.5 560.6 L861.3 551.6 L872.0 552.0 Z"></path>
-					</g>
-					<path d="M854.3 515.2 L677 576 L677 694.5 L677.0 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M864.9 517.2 L854.3 515.2 L861.4 507.1 L872.0 509.1 Z"></path>
-					</g>
-					<path d="M1122.8 157.8 L1122.75 278 L1121.239932885906 298 L1121.2 298.0 " fill="none"></path>
-					<path d="M1128.1 157.8 L1122.8 157.8 L1117.4 157.8 L1122.8 144.5 Z"></path>
-					<path d="M2400.4 463.7 L2689.25 576 L2689.25 679 L2689.3 679.0 " fill="none"></path>
-					<path d="M2402.4 458.7 L2400.4 463.7 L2398.5 468.7 L2388.0 458.9 Z"></path>
-					<path d="M1675.5 507.2 L1675.5 576 L1542.1875 694.5 L1542.2 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1680.8 497.8 L1675.5 507.2 L1670.2 497.8 L1675.5 488.5 Z"></path>
-					</g>
-					<path d="M1621.6 156.7 L1675.5 278 L1675.5 365.5 L1675.5 365.5 " fill="none"></path>
-					<path d="M1626.4 154.5 L1621.6 156.7 L1616.7 158.9 L1616.1 144.5 Z"></path>
-					<path d="M1574.9 151.9 L1386 278 L2224 413.7195652173913 L2224.0 413.7 " fill="none"></path>
-					<path d="M1577.9 156.3 L1574.9 151.9 L1572.0 147.5 L1586.0 144.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1841.5 157.8 L1841.5 278 L2224 400.6964477933262 L2224.0 400.7 " fill="none"></path>
+	[StudySettingsDialog
+	  |
+	  +Widget build()
+	]
+	
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
+	
+	[StudyTestController
+	  |
+	  +authRepository: IAuthRepository;
+	  +languageCode: String
+	]
+	
+	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyBaseController]&lt;:-[StudyTestController]
+	
+	[TestAppRoutes
+	  |
+	  &lt;static&gt;+studyOverview: String;
+	  &lt;static&gt;+eligibility: String;
+	  &lt;static&gt;+intervention: String;
+	  &lt;static&gt;+consent: String;
+	  &lt;static&gt;+journey: String;
+	  &lt;static&gt;+dashboard: String
+	]
+	
+	</desc>
+	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
+		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
+			<g stroke="transparent" fill="transparent">
+				<rect x="0.0" y="0.0" height="951.0" width="6780.3" stroke="none"></rect>
+			</g>
+			<g transform="translate(8, 8)" fill="#33322E">
+				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
+					<path d="M2771.0 507.2 L2771 576 L2771 694.5 L2771.0 694.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M2776.3 497.8 L2771.0 507.2 L2765.7 497.8 L2771.0 488.5 Z"></path>
+					</g>
+					<path d="M1868.4 150.3 L2133 278 L2625.5 393.01959247648904 L2625.5 393.0 " fill="none"></path>
+					<path d="M1870.7 145.5 L1868.4 150.3 L1866.1 155.1 L1856.4 144.5 Z"></path>
+					<path d="M1074.8 181.7 L1156.75 278 L517 414.81054897739506 L517.0 414.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1072.9 171.2 L1074.8 181.7 L1064.7 178.1 L1062.8 167.5 Z"></path>
+					</g>
+					<path d="M1041.9 185.8 L1061.25 278 L672.621644295302 411.5 L672.6 411.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1045.2 175.5 L1041.9 185.8 L1034.8 177.7 L1038.1 167.5 Z"></path>
 					</g>
-					<path d="M1846.8 157.8 L1841.5 157.8 L1836.2 157.8 L1841.5 144.5 Z"></path>
-					<path d="M2212.1 474.3 L2010.25 576 L1836.75 661.0054844606947 L1836.8 661.0 " fill="none"></path>
-					<path d="M2214.5 479.1 L2212.1 474.3 L2209.7 469.5 L2224.0 468.3 Z"></path>
-					<path d="M3747.2 216.0 L3763.75 278 L3965.567953020134 411.5 L3965.6 411.5 " fill="none"></path>
+					<path d="M499.6 218.3 L563 278 L470.7147651006711 411.5 L470.7 411.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3750.0 205.6 L3747.2 216.0 L3739.7 208.4 L3742.4 198.0 Z"></path>
+						<path d="M496.5 208.0 L499.6 218.3 L489.1 215.8 L486.0 205.5 Z"></path>
 					</g>
-					<path d="M3712.3 216.5 L3704 278 L3580.3557046979868 411.5 L3580.4 411.5 " fill="none"></path>
+					<path d="M417.5 224.0 L424.75 278 L606.4085570469799 411.5 L606.4 411.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3718.8 208.0 L3712.3 216.5 L3708.2 206.5 L3714.7 198.0 Z"></path>
+						<path d="M421.5 214.0 L417.5 224.0 L411.0 215.5 L415.0 205.5 Z"></path>
 					</g>
-					<path d="M4094.4 178.0 L4242.25 278 L4015.344798657718 411.5 L4015.3 411.5 " fill="none"></path>
+					<path d="M332.6 220.1 L286.75 278 L133.31459731543623 411.5 L133.3 411.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4089.6 168.3 L4094.4 178.0 L4083.7 177.1 L4078.9 167.5 Z"></path>
+						<path d="M342.6 216.1 L332.6 220.1 L334.2 209.5 L344.2 205.5 Z"></path>
 					</g>
-					<path d="M4066.0 181.8 L4146 278 L3865.5604026845635 411.5 L3865.6 411.5 " fill="none"></path>
+					<path d="M1647.3 273.2 L1650.75 278 L1419 390.2038992688871 L1419.0 390.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4064.1 171.3 L4066.0 181.8 L4055.9 178.1 L4054.0 167.5 Z"></path>
+						<path d="M1646.2 262.5 L1647.3 273.2 L1637.6 268.7 L1636.5 258.0 Z"></path>
 					</g>
-					<path d="M3519.9 220.1 L3565.75 278 L3944.9706375838928 411.5 L3945.0 411.5 " fill="none"></path>
+					<path d="M1480.3 275.1 L1479 278 L4812.5 425.4299495399228 L4812.5 425.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3518.3 209.5 L3519.9 220.1 L3509.9 216.1 L3508.3 205.5 Z"></path>
+						<path d="M1488.9 268.7 L1480.3 275.1 L1479.2 264.4 L1487.8 258.0 Z"></path>
+					</g>
+					<path d="M1090.5 544.7 L1090.5 576 L1090.5 694.5 L1090.5 694.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1095.8 535.3 L1090.5 544.7 L1085.2 535.3 L1090.5 526.0 Z"></path>
+					</g>
+					<path d="M1408.1 267.5 L1397.75 278 L1227 360.8047192839707 L1227.0 360.8 " fill="none"></path>
+					<path d="M1411.9 271.2 L1408.1 267.5 L1404.3 263.8 L1417.4 258.0 Z"></path>
+					<path d="M1381.5 209.2 L1241.75 278 L914 393.3803898405198 L914.0 393.4 " fill="none"></path>
+					<path d="M1383.9 214.0 L1381.5 209.2 L1379.2 204.4 L1393.5 203.3 Z"></path>
+					<path d="M3728.5 842.7 L3728.5 844 L3728.5 864 L3728.5 864.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M3733.8 833.3 L3728.5 842.7 L3723.2 833.3 L3728.5 824.0 Z"></path>
+					</g>
+					<path d="M3434.1 831.1 L3402.75 844 L3350.4964788732395 864 L3350.5 864.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M3444.8 832.5 L3434.1 831.1 L3440.7 822.6 L3451.4 824.0 Z"></path>
+					</g>
+					<path d="M3925.0 524.7 L4022 576 L3978.194029850746 596 L3978.2 596.0 " fill="none"></path>
+					<path d="M3927.5 520.0 L3925.0 524.7 L3922.5 529.4 L3913.2 518.5 Z"></path>
+					<path d="M1801.5 154.4 L1690.75 278 L5339.5 423.72505528379014 L5339.5 423.7 " fill="none"></path>
+					<path d="M1805.4 158.0 L1801.5 154.4 L1797.5 150.9 L1810.4 144.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M6367.8 157.8 L6367.75 278 L5503.5 414.0879788639366 L5503.5 414.1 " fill="none"></path>
 					</g>
-					<path d="M3496.5 222.0 L3525.75 278 L3801.037751677852 411.5 L3801.0 411.5 " fill="none"></path>
+					<path d="M6373.1 157.8 L6367.8 157.8 L6362.4 157.8 L6367.8 144.5 Z"></path>
+					<path d="M169.5 213.7 L210.5 278 L434.0453020134228 411.5 L434.0 411.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3496.9 211.3 L3496.5 222.0 L3487.4 216.2 L3487.8 205.5 Z"></path>
+						<path d="M169.0 203.0 L169.5 213.7 L160.0 208.7 L159.5 198.0 Z"></path>
 					</g>
-					<path d="M3389.4 221.3 L3353.5 278 L3543.8942953020132 411.5 L3543.9 411.5 " fill="none"></path>
+					<path d="M115.5 216.7 L115.5 278 L115.5 411.5 L115.5 411.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3398.9 216.2 L3389.4 221.3 L3389.9 210.5 L3399.4 205.5 Z"></path>
+						<path d="M120.8 207.3 L115.5 216.7 L110.2 207.3 L115.5 198.0 Z"></path>
 					</g>
-					<path d="M3944.4 838.7 L3948.5 844 L3948.5 864 L3948.5 864.0 " fill="none"></path>
+					<path d="M3808.9 534.2 L3835.75 576 L4224.633395522388 694.5 L4224.6 694.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3942.8 828.1 L3944.4 838.7 L3934.4 834.6 L3932.9 824.0 Z"></path>
+						<path d="M3808.3 523.5 L3808.9 534.2 L3799.4 529.2 L3798.8 518.5 Z"></path>
 					</g>
-					<path d="M3715.2 837.1 L3708.25 844 L3662.193661971831 864 L3662.2 864.0 " fill="none"></path>
+					<path d="M3486.8 525.3 L3356 576 L3356 694.5 L3356.0 694.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3725.6 834.4 L3715.2 837.1 L3718.1 826.8 L3728.5 824.0 Z"></path>
+						<path d="M3497.4 526.8 L3486.8 525.3 L3493.6 516.9 L3504.2 518.5 Z"></path>
 					</g>
-					<path d="M3486.0 493.2 L3844 576 L3844 596 L3844.0 596.0 " fill="none"></path>
-					<path d="M3487.2 488.0 L3486.0 493.2 L3484.8 498.4 L3473.0 490.2 Z"></path>
-					<path d="M4350.0 193.7 L4350 278 L4773.123322147651 411.5 L4773.1 411.5 " fill="none"></path>
+					<path d="M3449.2 519.2 L3270 576 L3270 710 L3270 710 L3270 844 L3270 844 L3292.5352112676055 864 L3292.5 864.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4355.3 184.3 L4350.0 193.7 L4344.7 184.3 L4350.0 175.0 Z"></path>
+						<path d="M3459.7 521.5 L3449.2 519.2 L3456.5 511.3 L3467.0 513.5 Z"></path>
 					</g>
-					<path d="M3376.5 767.2 L3376.5 844 L3376.5 864 L3376.5 864.0 " fill="none"></path>
+					<path d="M3929.8 193.7 L3929.75 278 L5115.5 416.27176677753863 L5115.5 416.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3381.8 757.8 L3376.5 767.2 L3371.2 757.8 L3376.5 748.5 Z"></path>
+						<path d="M3935.1 184.3 L3929.8 193.7 L3924.4 184.3 L3929.8 175.0 Z"></path>
 					</g>
-					<path d="M3318.6 527.1 L3376.5 576 L3376.5 671.5 L3376.5 671.5 " fill="none"></path>
-					<path d="M3322.0 523.0 L3318.6 527.1 L3315.1 531.2 L3308.4 518.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M4008.2 180.4 L3982 278 L4399.75 393.42837273991654 L4399.8 393.4 " fill="none"></path>
+						<path d="M1009.5 179.9 L970 278 L2218.5 413.78576642335764 L2218.5 413.8 " fill="none"></path>
 					</g>
-					<path d="M4013.4 181.8 L4008.2 180.4 L4003.1 179.0 L4011.7 167.5 Z"></path>
+					<path d="M1014.5 181.9 L1009.5 179.9 L1004.6 177.9 L1014.5 167.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M5041.0 210.8 L5041 278 L4642.75 392.16883116883116 L4642.8 392.2 " fill="none"></path>
+						<path d="M4235.8 210.8 L4235.75 278 L2461.5 417.4504813398391 L2461.5 417.5 " fill="none"></path>
 					</g>
-					<path d="M5046.3 210.8 L5041.0 210.8 L5035.7 210.8 L5041.0 197.5 Z"></path>
-					<path d="M2707.1 216.8 L2835.5 278 L2835.5 411.5 L2835.5 411.5 " fill="none"></path>
+					<path d="M4241.1 210.8 L4235.8 210.8 L4230.4 210.8 L4235.8 197.5 Z"></path>
+					<path d="M5935.8 224.2 L6039.75 278 L6417.178691275168 411.5 L6417.2 411.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2701.0 208.0 L2707.1 216.8 L2696.4 217.6 L2690.3 208.8 Z"></path>
+						<path d="M5930.0 215.2 L5935.8 224.2 L5925.1 224.7 L5919.3 215.7 Z"></path>
 					</g>
-					<path d="M2548.9 268.3 L2550.75 278 L2382.381711409396 380.5 L2382.4 380.5 " fill="none"></path>
+					<path d="M5723.5 268.3 L5721.5 278 L5503.5 386.2733333333333 L5503.5 386.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2552.5 258.2 L2548.9 268.3 L2542.0 260.2 L2545.5 250.0 Z"></path>
+						<path d="M5730.6 260.2 L5723.5 268.3 L5720.1 258.1 L5727.2 250.0 Z"></path>
 					</g>
-					<path d="M2504.0 268.5 L2502.75 278 L2117.25 414.43586698337293 L2117.3 414.4 " fill="none"></path>
+					<path d="M5686.7 266.9 L5681.5 278 L4883.5 420.65386922615477 L4883.5 420.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2510.6 260.0 L2504.0 268.5 L2500.0 258.5 L2506.5 250.0 Z"></path>
+						<path d="M5695.5 260.7 L5686.7 266.9 L5685.9 256.2 L5694.7 250.0 Z"></path>
 					</g>
-					<path d="M2430.9 265.5 L2422.5 278 L2612.8942953020132 411.5 L2612.9 411.5 " fill="none"></path>
+					<path d="M5567.7 224.6 L5464.75 278 L6177.720637583892 411.5 L6177.7 411.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2440.6 260.7 L2430.9 265.5 L2431.7 254.8 L2441.3 250.0 Z"></path>
+						<path d="M5578.4 225.0 L5567.7 224.6 L5573.5 215.5 L5584.3 216.0 Z"></path>
 					</g>
-					<path d="M2216.6 249.0 L2244.5 278 L2434.8942953020132 411.5 L2434.9 411.5 " fill="none"></path>
+					<path d="M3654.3 251.5 L3670.25 278 L4923.5 423.63014232793915 L4923.5 423.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2214.0 238.5 L2216.6 249.0 L2206.3 245.9 L2203.7 235.5 Z"></path>
+						<path d="M3654.1 240.8 L3654.3 251.5 L3645.0 246.2 L3644.7 235.5 Z"></path>
 					</g>
-					<path d="M2003.1 250.0 L1980.25 278 L2071.191275167785 411.5 L2071.2 411.5 " fill="none"></path>
+					<path d="M3485.4 250.2 L3463.5 278 L4812.5 423.1794871794872 L4812.5 423.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2013.1 246.1 L2003.1 250.0 L2004.8 239.4 L2014.8 235.5 Z"></path>
+						<path d="M3495.4 246.1 L3485.4 250.2 L3487.0 239.5 L3496.9 235.5 Z"></path>
 					</g>
-					<path d="M3296.4 532.3 L3336.5 576 L2027.75 702.6913491060141 L2027.8 702.7 " fill="none"></path>
+					<path d="M5465.1 484.1 L5535.25 576 L5535.25 633.5 L5535.3 633.5 " fill="none"></path>
+					<path d="M5469.3 480.9 L5465.1 484.1 L5460.9 487.3 L5457.0 473.5 Z"></path>
+					<path d="M4721.3 567.1 L4733.25 576 L4733.25 694.5 L4733.3 694.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3294.1 521.8 L3296.4 532.3 L3286.2 529.0 L3283.8 518.5 Z"></path>
+						<path d="M4717.0 557.3 L4721.3 567.1 L4710.7 565.9 L4706.4 556.0 Z"></path>
 					</g>
-					<path d="M3000.8 526.9 L2902.75 576 L2902.75 694.5 L2902.8 694.5 " fill="none"></path>
+					<path d="M4531.3 574.7 L4531.25 576 L4305.083022388059 694.5 L4305.1 694.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3011.5 527.5 L3000.8 526.9 L3006.7 517.9 L3017.5 518.5 Z"></path>
+						<path d="M4536.7 565.4 L4531.3 574.7 L4526.0 565.3 L4531.5 556.0 Z"></path>
 					</g>
-					<path d="M2947.3 525.3 L2816.75 576 L2816.75 710 L2816.75 710 L2816.75 844 L2816.75 844 L3541.5 875.7735412164249 L3541.5 875.8 " fill="none"></path>
+					<path d="M4313.3 566.0 L4297.5 576 L4430.149253731343 694.5 L4430.1 694.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2957.9 526.9 L2947.3 525.3 L2954.0 516.9 L2964.6 518.5 Z"></path>
+						<path d="M4324.1 565.5 L4313.3 566.0 L4318.4 556.5 L4329.1 556.0 Z"></path>
 					</g>
-					<g data-name="IStudyNavViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
-							<rect x="4920.5" y="60.5" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
-							<path d="M4920.5 91.5 L5161.5 91.5" fill="none" data-name="IStudyNavViewModel"></path>
+					<path d="M4276.8 553.6 L4231.5 576 L4121.8432835820895 694.5 L4121.8 694.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M4287.5 554.3 L4276.8 553.6 L4282.8 544.7 L4293.5 545.4 Z"></path>
+					</g>
+					<path d="M3234.0 157.8 L3234 278 L4293.5 399.52848344880675 L4293.5 399.5 " fill="none"></path>
+					<path d="M3239.3 157.8 L3234.0 157.8 L3228.7 157.8 L3234.0 144.5 Z"></path>
+					<path d="M5326.7 454.9 L4915.25 576 L4915.25 679 L4915.3 679.0 " fill="none"></path>
+					<path d="M5328.2 460.0 L5326.7 454.9 L5325.2 449.8 L5339.5 451.1 Z"></path>
+					<path d="M3089.0 767.2 L3089 844 L3089 864 L3089.0 864.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M3094.3 757.8 L3089.0 767.2 L3083.7 757.8 L3089.0 748.5 Z"></path>
+					</g>
+					<path d="M3454.0 492.5 L3089 576 L3089 671.5 L3089.0 671.5 " fill="none"></path>
+					<path d="M3455.2 497.7 L3454.0 492.5 L3452.8 487.3 L3467.0 489.5 Z"></path>
+					<g data-name="FrameControlsWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
+							<rect x="2625.5" y="365.5" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
+							<path d="M2625.5 396.5 L2916.5 396.5" fill="none" data-name="FrameControlsWidget"></path>
+							<path d="M2625.5 457.5 L2916.5 457.5" fill="none" data-name="FrameControlsWidget"></path>
 						</g>
-						<g transform="translate(4920.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
+						<g transform="translate(2625.5, 365.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
+								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4920.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
+						<g transform="translate(2625.5, 396.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2625.5, 457.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
-							<rect x="451.3" y="60.5" height="137.0" width="233.0" data-name="StudyNav"></rect>
-							<path d="M451.3 91.5 L684.3 91.5" fill="none" data-name="StudyNav"></path>
+					<g data-name="void Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
+							<rect x="2699.0" y="694.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
 						</g>
-						<g transform="translate(451.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
+						<g transform="translate(2699, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
+								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(451.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
+					</g>
+					<g data-name="ConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
+							<rect x="1748.3" y="113.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+						</g>
+						<g transform="translate(1748.25, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
-							<rect x="724.3" y="60.5" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
-							<path d="M724.3 91.5 L1012.3 91.5" fill="none" data-name="StudyDesignNav"></path>
+					<g data-name="IStudyStatusBadgeViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
+							<rect x="887.5" y="90.5" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
+							<path d="M887.5 121.5 L1172.5 121.5" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
 						</g>
-						<g transform="translate(724.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
+						<g transform="translate(887.5, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
+								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(724.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
+						<g transform="translate(887.5, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="Participation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
+							<rect x="403.0" y="411.5" height="31.0" width="114.0" data-name="Participation"></rect>
+						</g>
+						<g transform="translate(403, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
+								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StudyStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
+							<rect x="572.0" y="411.5" height="31.0" width="111.0" data-name="StudyStatus"></rect>
+						</g>
+						<g transform="translate(572, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
+								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StudyStatusBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
+							<rect x="284.3" y="52.5" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
+							<path d="M284.3 83.5 L525.3 83.5" fill="none" data-name="StudyStatusBadge"></path>
+							<path d="M284.3 174.5 L525.3 174.5" fill="none" data-name="StudyStatusBadge"></path>
+						</g>
+						<g transform="translate(284.25, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
+								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
+								
+							</g>
+						</g>
+						<g transform="translate(284.25, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(284.25, 174.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="BadgeType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
+							<rect x="62.5" y="411.5" height="31.0" width="106.0" data-name="BadgeType"></rect>
+						</g>
+						<g transform="translate(62.5, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
+								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="RouteInformation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
-							<rect x="544.0" y="358.0" height="138.0" width="152.0" data-name="RouteInformation"></rect>
-							<path d="M544.0 389.0 L696.0 389.0" fill="none" data-name="RouteInformation"></path>
-							<path d="M544.0 465.0 L696.0 465.0" fill="none" data-name="RouteInformation"></path>
+							<rect x="1267.0" y="358.0" height="138.0" width="152.0" data-name="RouteInformation"></rect>
+							<path d="M1267.0 389.0 L1419.0 389.0" fill="none" data-name="RouteInformation"></path>
+							<path d="M1267.0 465.0 L1419.0 465.0" fill="none" data-name="RouteInformation"></path>
 						</g>
-						<g transform="translate(544, 358)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
+						<g transform="translate(1267, 358)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
 								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(544, 389)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+						<g transform="translate(1267, 389)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
 								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
@@ -572,7 +633,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(544, 465)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+						<g transform="translate(1267, 465)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
 								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
 								
@@ -581,17 +642,17 @@
 					</g>
 					<g data-name="PlatformController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
-							<rect x="100.5" y="0.0" height="258.0" width="302.0" data-name="PlatformController"></rect>
-							<path d="M100.5 31.0 L402.5 31.0" fill="none" data-name="PlatformController"></path>
-							<path d="M100.5 122.0 L402.5 122.0" fill="none" data-name="PlatformController"></path>
+							<rect x="1393.5" y="0.0" height="258.0" width="302.0" data-name="PlatformController"></rect>
+							<path d="M1393.5 31.0 L1695.5 31.0" fill="none" data-name="PlatformController"></path>
+							<path d="M1393.5 122.0 L1695.5 122.0" fill="none" data-name="PlatformController"></path>
 						</g>
-						<g transform="translate(100.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
+						<g transform="translate(1393.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
 								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(100.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+						<g transform="translate(1393.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
 								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
@@ -601,7 +662,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(100.5, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+						<g transform="translate(1393.5, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
 								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
@@ -617,9 +678,9 @@
 					</g>
 					<g data-name="Widget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="2046.3" y="411.5" height="31.0" width="71.0" data-name="Widget"></rect>
+							<rect x="4812.5" y="411.5" height="31.0" width="71.0" data-name="Widget"></rect>
 						</g>
-						<g transform="translate(2046.25, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
+						<g transform="translate(4812.5, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
 								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
 								
@@ -628,23 +689,23 @@
 					</g>
 					<g data-name="WebController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
-							<rect x="231.0" y="328.0" height="198.0" width="273.0" data-name="WebController"></rect>
-							<path d="M231.0 359.0 L504.0 359.0" fill="none" data-name="WebController"></path>
-							<path d="M231.0 390.0 L504.0 390.0" fill="none" data-name="WebController"></path>
+							<rect x="954.0" y="328.0" height="198.0" width="273.0" data-name="WebController"></rect>
+							<path d="M954.0 359.0 L1227.0 359.0" fill="none" data-name="WebController"></path>
+							<path d="M954.0 390.0 L1227.0 390.0" fill="none" data-name="WebController"></path>
 						</g>
-						<g transform="translate(231, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
+						<g transform="translate(954, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
 								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(231, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+						<g transform="translate(954, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
 								
 							</g>
 						</g>
-						<g transform="translate(231, 390)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+						<g transform="translate(954, 390)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
@@ -660,9 +721,9 @@
 					</g>
 					<g data-name="IFrameElement">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
-							<rect x="300.0" y="694.5" height="31.0" width="135.0" data-name="IFrameElement"></rect>
+							<rect x="1023.0" y="694.5" height="31.0" width="135.0" data-name="IFrameElement"></rect>
 						</g>
-						<g transform="translate(300, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
+						<g transform="translate(1023, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
 								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
 								
@@ -671,16 +732,16 @@
 					</g>
 					<g data-name="MobileController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
-							<rect x="0.0" y="343.5" height="167.0" width="191.0" data-name="MobileController"></rect>
-							<path d="M0.0 374.5 L191.0 374.5" fill="none" data-name="MobileController"></path>
+							<rect x="723.0" y="343.5" height="167.0" width="191.0" data-name="MobileController"></rect>
+							<path d="M723.0 374.5 L914.0 374.5" fill="none" data-name="MobileController"></path>
 						</g>
-						<g transform="translate(0, 343.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
+						<g transform="translate(723, 343.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
 								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 374.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
+						<g transform="translate(723, 374.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
 								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
@@ -694,460 +755,260 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="TestAppRoutes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
-							<rect x="1233.3" y="60.5" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
-							<path d="M1233.3 91.5 L1493.3 91.5" fill="none" data-name="TestAppRoutes"></path>
-						</g>
-						<g transform="translate(1233.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1233.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
-								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySettingsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="872.0" y="298.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M872.0 329.0 L1351.0 329.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M872.0 465.0 L1351.0 465.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-						</g>
-						<g transform="translate(872, 298)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(872, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(872, 465)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="1163.8" y="694.5" height="31.0" width="109.0" data-name="AsyncValue"></rect>
-						</g>
-						<g transform="translate(1163.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="1876.8" y="694.5" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
-						</g>
-						<g transform="translate(1876.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="769.5" y="694.5" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(769.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="624.5" y="694.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(624.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="1052.3" y="113.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(1052.25, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="2601.8" y="679.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M2601.8 710.0 L2776.8 710.0" fill="none" data-name="StudySettingsDialog"></path>
-						</g>
-						<g transform="translate(2601.75, 679)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
-								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2601.75, 710)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="2224.0" y="380.5" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
-							<path d="M2224.0 411.5 L2388.0 411.5" fill="none" data-name="StudyPageWidget"></path>
-							<path d="M2224.0 442.5 L2388.0 442.5" fill="none" data-name="StudyPageWidget"></path>
-						</g>
-						<g transform="translate(2224, 380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2224, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2224, 442.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FrameControlsWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
-							<rect x="1530.0" y="365.5" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
-							<path d="M1530.0 396.5 L1821.0 396.5" fill="none" data-name="FrameControlsWidget"></path>
-							<path d="M1530.0 457.5 L1821.0 457.5" fill="none" data-name="FrameControlsWidget"></path>
-						</g>
-						<g transform="translate(1530, 365.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1530, 396.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
-								
-							</g>
+					<g data-name="StudyController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
+							<rect x="3442.0" y="596.0" height="228.0" width="573.0" data-name="StudyController"></rect>
+							<path d="M3442.0 627.0 L4015.0 627.0" fill="none" data-name="StudyController"></path>
+							<path d="M3442.0 688.0 L4015.0 688.0" fill="none" data-name="StudyController"></path>
 						</g>
-						<g transform="translate(1530, 457.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
+						<g transform="translate(3442, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
+								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="1452.8" y="694.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(1452.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
+						<g transform="translate(3442, 627)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="1533.3" y="113.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(1533.25, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
+						<g transform="translate(3442, 688)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IWithBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="1785.0" y="113.5" height="31.0" width="113.0" data-name="IWithBanner"></rect>
+					<g data-name="INotificationService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
+							<rect x="3644.5" y="864.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
 						</g>
-						<g transform="translate(1785, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
+						<g transform="translate(3644.5, 864)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
+								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTestScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
-							<rect x="1636.8" y="633.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
-							<path d="M1636.8 664.5 L1836.8 664.5" fill="none" data-name="StudyTestScreen"></path>
-							<path d="M1636.8 695.5 L1836.8 695.5" fill="none" data-name="StudyTestScreen"></path>
-						</g>
-						<g transform="translate(1636.75, 633.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
-								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1636.75, 664.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
-								
-							</g>
+					<g data-name="StreamSubscription">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
+							<rect x="3225.0" y="864.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
 						</g>
-						<g transform="translate(1636.75, 695.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
+						<g transform="translate(3225, 864)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
+								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyParticipationBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
-							<rect x="3608.5" y="60.0" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
-							<path d="M3608.5 91.0 L3839.5 91.0" fill="none" data-name="StudyParticipationBadge"></path>
-							<path d="M3608.5 167.0 L3839.5 167.0" fill="none" data-name="StudyParticipationBadge"></path>
+					<g data-name="StudyBaseController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
+							<rect x="3467.0" y="335.5" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
+							<path d="M3467.0 366.5 L4013.0 366.5" fill="none" data-name="StudyBaseController"></path>
+							<path d="M3467.0 442.5 L4013.0 442.5" fill="none" data-name="StudyBaseController"></path>
 						</g>
-						<g transform="translate(3608.5, 60)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
+						<g transform="translate(3467, 335.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
+								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3608.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
+						<g transform="translate(3467, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3608.5, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
+						<g transform="translate(3467, 442.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="3932.0" y="411.5" height="31.0" width="114.0" data-name="Participation"></rect>
+					<g data-name="IStudyNavViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
+							<rect x="4115.3" y="60.5" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
+							<path d="M4115.3 91.5 L4356.3 91.5" fill="none" data-name="IStudyNavViewModel"></path>
 						</g>
-						<g transform="translate(3932, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
+						<g transform="translate(4115.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
+								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="3513.0" y="411.5" height="31.0" width="106.0" data-name="BadgeType"></rect>
-						</g>
-						<g transform="translate(3513, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
+						<g transform="translate(4115.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyStatusBadgeViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
-							<rect x="3879.5" y="90.5" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
-							<path d="M3879.5 121.5 L4164.5 121.5" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
-						</g>
-						<g transform="translate(3879.5, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
-								
-							</g>
+					<g data-name="StudyNav">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
+							<rect x="1940.3" y="60.5" height="137.0" width="233.0" data-name="StudyNav"></rect>
+							<path d="M1940.3 91.5 L2173.3 91.5" fill="none" data-name="StudyNav"></path>
 						</g>
-						<g transform="translate(3879.5, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
+						<g transform="translate(1940.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
-							<rect x="3777.5" y="411.5" height="31.0" width="111.0" data-name="StudyStatus"></rect>
-						</g>
-						<g transform="translate(3777.5, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
-								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
+						<g transform="translate(1940.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyStatusBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
-							<rect x="3327.3" y="52.5" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
-							<path d="M3327.3 83.5 L3568.3 83.5" fill="none" data-name="StudyStatusBadge"></path>
-							<path d="M3327.3 174.5 L3568.3 174.5" fill="none" data-name="StudyStatusBadge"></path>
-						</g>
-						<g transform="translate(3327.25, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
-								
-							</g>
+					<g data-name="StudyDesignNav">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
+							<rect x="2213.3" y="60.5" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
+							<path d="M2213.3 91.5 L2501.3 91.5" fill="none" data-name="StudyDesignNav"></path>
 						</g>
-						<g transform="translate(3327.25, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
+						<g transform="translate(2213.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
+								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3327.25, 174.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
+						<g transform="translate(2213.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
-							<rect x="3557.5" y="596.0" height="228.0" width="573.0" data-name="StudyController"></rect>
-							<path d="M3557.5 627.0 L4130.5 627.0" fill="none" data-name="StudyController"></path>
-							<path d="M3557.5 688.0 L4130.5 688.0" fill="none" data-name="StudyController"></path>
+					<g data-name="StudyPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
+							<rect x="5339.5" y="380.5" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
+							<path d="M5339.5 411.5 L5503.5 411.5" fill="none" data-name="StudyPageWidget"></path>
+							<path d="M5339.5 442.5 L5503.5 442.5" fill="none" data-name="StudyPageWidget"></path>
 						</g>
-						<g transform="translate(3557.5, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
-								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
+						<g transform="translate(5339.5, 380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3557.5, 627)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+						<g transform="translate(5339.5, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3557.5, 688)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
+						<g transform="translate(5339.5, 442.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="INotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="3864.5" y="864.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
+					<g data-name="IWithBanner">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
+							<rect x="6311.3" y="113.5" height="31.0" width="113.0" data-name="IWithBanner"></rect>
 						</g>
-						<g transform="translate(3864.5, 864)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
+						<g transform="translate(6311.25, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="3541.5" y="864.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+					<g data-name="StudyParticipationBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
+							<rect x="0.0" y="60.0" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
+							<path d="M0.0 91.0 L231.0 91.0" fill="none" data-name="StudyParticipationBadge"></path>
+							<path d="M0.0 167.0 L231.0 167.0" fill="none" data-name="StudyParticipationBadge"></path>
 						</g>
-						<g transform="translate(3541.5, 864)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
+						<g transform="translate(0, 60)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
+								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyBaseController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="2927.0" y="335.5" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
-							<path d="M2927.0 366.5 L3473.0 366.5" fill="none" data-name="StudyBaseController"></path>
-							<path d="M2927.0 442.5 L3473.0 442.5" fill="none" data-name="StudyBaseController"></path>
+						<g transform="translate(0, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
+								
+							</g>
 						</g>
-						<g transform="translate(2927, 335.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
-								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
+						<g transform="translate(0, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2927, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
+					</g>
+					<g data-name="IStudyRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
+							<rect x="4200.0" y="694.5" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
+						</g>
+						<g transform="translate(4200, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
+								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2927, 442.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
+					</g>
+					<g data-name="GoRouter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
+							<rect x="3310.0" y="694.5" height="31.0" width="92.0" data-name="GoRouter"></rect>
+						</g>
+						<g transform="translate(3310, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
+								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="PreviewFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
-							<rect x="4204.5" y="83.0" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
-							<path d="M4204.5 114.0 L4495.5 114.0" fill="none" data-name="PreviewFrame"></path>
+							<rect x="3784.3" y="83.0" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
+							<path d="M3784.3 114.0 L4075.3 114.0" fill="none" data-name="PreviewFrame"></path>
 						</g>
-						<g transform="translate(4204.5, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
+						<g transform="translate(3784.25, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
 								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4204.5, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
+						<g transform="translate(3784.25, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
@@ -1158,57 +1019,27 @@
 					</g>
 					<g data-name="StudyFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="4730.3" y="411.5" height="31.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
+							<rect x="5115.5" y="411.5" height="31.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(4730.25, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
+						<g transform="translate(5115.5, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
 								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTestController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
-							<rect x="3235.5" y="671.5" height="77.0" width="282.0" data-name="StudyTestController"></rect>
-							<path d="M3235.5 702.5 L3517.5 702.5" fill="none" data-name="StudyTestController"></path>
-						</g>
-						<g transform="translate(3235.5, 671.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3235.5, 702.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="3305.5" y="864.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
-						</g>
-						<g transform="translate(3305.5, 864)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
-								
-							</g>
-						</g>
-					</g>
 					<g data-name="IStudyAppBarViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
-							<rect x="4399.8" y="381.0" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
-							<path d="M4399.8 412.0 L4642.8 412.0" fill="none" data-name="IStudyAppBarViewModel"></path>
+							<rect x="2218.5" y="381.0" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
+							<path d="M2218.5 412.0 L2461.5 412.0" fill="none" data-name="IStudyAppBarViewModel"></path>
 						</g>
-						<g transform="translate(4399.75, 381)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
+						<g transform="translate(2218.5, 381)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
 								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4399.75, 412)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
+						<g transform="translate(2218.5, 412)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
@@ -1219,16 +1050,16 @@
 					</g>
 					<g data-name="StudyScaffold">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
-							<rect x="2355.3" y="8.0" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
-							<path d="M2355.3 39.0 L2690.3 39.0" fill="none" data-name="StudyScaffold"></path>
+							<rect x="5584.3" y="8.0" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
+							<path d="M5584.3 39.0 L5919.3 39.0" fill="none" data-name="StudyScaffold"></path>
 						</g>
-						<g transform="translate(2355.25, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
+						<g transform="translate(5584.25, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
 								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2355.25, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
+						<g transform="translate(5584.25, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
@@ -1249,9 +1080,9 @@
 					</g>
 					<g data-name="NavbarTab">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="2784.0" y="411.5" height="31.0" width="103.0" data-name="NavbarTab"></rect>
+							<rect x="6409.5" y="411.5" height="31.0" width="103.0" data-name="NavbarTab"></rect>
 						</g>
-						<g transform="translate(2784, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
+						<g transform="translate(6409.5, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
 								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
 								
@@ -1260,9 +1091,9 @@
 					</g>
 					<g data-name="SingleColumnLayoutType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="2526.0" y="411.5" height="31.0" width="218.0" data-name="SingleColumnLayoutType"></rect>
+							<rect x="6151.5" y="411.5" height="31.0" width="218.0" data-name="SingleColumnLayoutType"></rect>
 						</g>
-						<g transform="translate(2526, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
+						<g transform="translate(6151.5, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
 								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
 								
@@ -1271,24 +1102,24 @@
 					</g>
 					<g data-name="WebFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
-							<rect x="4535.5" y="75.0" height="108.0" width="169.0" data-name="WebFrame"></rect>
-							<path d="M4535.5 106.0 L4704.5 106.0" fill="none" data-name="WebFrame"></path>
-							<path d="M4535.5 152.0 L4704.5 152.0" fill="none" data-name="WebFrame"></path>
+							<rect x="5199.3" y="75.0" height="108.0" width="169.0" data-name="WebFrame"></rect>
+							<path d="M5199.3 106.0 L5368.3 106.0" fill="none" data-name="WebFrame"></path>
+							<path d="M5199.3 152.0 L5368.3 152.0" fill="none" data-name="WebFrame"></path>
 						</g>
-						<g transform="translate(4535.5, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
+						<g transform="translate(5199.25, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
 								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4535.5, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+						<g transform="translate(5199.25, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4535.5, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+						<g transform="translate(5199.25, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
 								
@@ -1297,16 +1128,16 @@
 					</g>
 					<g data-name="DisabledFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
-							<rect x="4744.5" y="98.0" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
-							<path d="M4744.5 129.0 L4880.5 129.0" fill="none" data-name="DisabledFrame"></path>
+							<rect x="5408.3" y="98.0" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
+							<path d="M5408.3 129.0 L5544.3 129.0" fill="none" data-name="DisabledFrame"></path>
 						</g>
-						<g transform="translate(4744.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
+						<g transform="translate(5408.25, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4744.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
+						<g transform="translate(5408.25, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
 								
@@ -1315,17 +1146,17 @@
 					</g>
 					<g data-name="PhoneContainer">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
-							<rect x="1938.0" y="22.5" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
-							<path d="M1938.0 53.5 L2265.0 53.5" fill="none" data-name="PhoneContainer"></path>
-							<path d="M1938.0 204.5 L2265.0 204.5" fill="none" data-name="PhoneContainer"></path>
+							<rect x="3417.3" y="22.5" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
+							<path d="M3417.3 53.5 L3744.3 53.5" fill="none" data-name="PhoneContainer"></path>
+							<path d="M3417.3 204.5 L3744.3 204.5" fill="none" data-name="PhoneContainer"></path>
 						</g>
-						<g transform="translate(1938, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
+						<g transform="translate(3417.25, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
 								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1938, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+						<g transform="translate(3417.25, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
 								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
@@ -1339,7 +1170,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(1938, 204.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+						<g transform="translate(3417.25, 204.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
 								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
 								
@@ -1348,9 +1179,9 @@
 					</g>
 					<g data-name="Color">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="2428.0" y="411.5" height="31.0" width="58.0" data-name="Color"></rect>
+							<rect x="4923.5" y="411.5" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(2428, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+						<g transform="translate(4923.5, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
 								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
@@ -1359,16 +1190,16 @@
 					</g>
 					<g data-name="MobileFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
-							<rect x="5201.5" y="98.0" height="62.0" width="136.0" data-name="MobileFrame"></rect>
-							<path d="M5201.5 129.0 L5337.5 129.0" fill="none" data-name="MobileFrame"></path>
+							<rect x="5959.3" y="98.0" height="62.0" width="136.0" data-name="MobileFrame"></rect>
+							<path d="M5959.3 129.0 L6095.3 129.0" fill="none" data-name="MobileFrame"></path>
 						</g>
-						<g transform="translate(5201.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
+						<g transform="translate(5959.25, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5201.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
+						<g transform="translate(5959.25, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
 								
@@ -1377,29 +1208,198 @@
 					</g>
 					<g data-name="DesktopFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
-							<rect x="5377.5" y="98.0" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
-							<path d="M5377.5 129.0 L5513.5 129.0" fill="none" data-name="DesktopFrame"></path>
+							<rect x="6135.3" y="98.0" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
+							<path d="M6135.3 129.0 L6271.3 129.0" fill="none" data-name="DesktopFrame"></path>
 						</g>
-						<g transform="translate(5377.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
+						<g transform="translate(6135.25, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5377.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
+						<g transform="translate(6135.25, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="2856.8" y="694.5" height="31.0" width="92.0" data-name="GoRouter"></rect>
+					<g data-name="StudyTestScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
+							<rect x="5435.3" y="633.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
+							<path d="M5435.3 664.5 L5635.3 664.5" fill="none" data-name="StudyTestScreen"></path>
+							<path d="M5435.3 695.5 L5635.3 695.5" fill="none" data-name="StudyTestScreen"></path>
 						</g>
-						<g transform="translate(2856.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
+						<g transform="translate(5435.25, 633.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
+								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5435.25, 664.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5435.25, 695.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StudySettingsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
+							<rect x="4293.5" y="298.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
+							<path d="M4293.5 329.0 L4772.5 329.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+							<path d="M4293.5 465.0 L4772.5 465.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+						</g>
+						<g transform="translate(4293.5, 298)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4293.5, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4293.5, 465)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="AsyncValue">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
+							<rect x="4678.8" y="694.5" height="31.0" width="109.0" data-name="AsyncValue"></rect>
+						</g>
+						<g transform="translate(4678.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="4391.0" y="694.5" height="31.0" width="113.0" data-name="FormControl"></rect>
+						</g>
+						<g transform="translate(4391, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormGroup">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
+							<rect x="4055.0" y="694.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
+						</g>
+						<g transform="translate(4055, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
+							<rect x="3163.5" y="113.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
+						</g>
+						<g transform="translate(3163.5, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
+								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StudySettingsDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
+							<rect x="4827.8" y="679.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
+							<path d="M4827.8 710.0 L5002.8 710.0" fill="none" data-name="StudySettingsDialog"></path>
+						</g>
+						<g transform="translate(4827.75, 679)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
+								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4827.75, 710)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StudyTestController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
+							<rect x="2948.0" y="671.5" height="77.0" width="282.0" data-name="StudyTestController"></rect>
+							<path d="M2948.0 702.5 L3230.0 702.5" fill="none" data-name="StudyTestController"></path>
+						</g>
+						<g transform="translate(2948, 671.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2948, 702.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="IAuthRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
+							<rect x="3018.0" y="864.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
+						</g>
+						<g transform="translate(3018, 864)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
+								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="TestAppRoutes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
+							<rect x="6464.3" y="60.5" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
+							<path d="M6464.3 91.5 L6724.3 91.5" fill="none" data-name="TestAppRoutes"></path>
+						</g>
+						<g transform="translate(6464.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
+								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
+								
+							</g>
+						</g>
+						<g transform="translate(6464.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
+								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
 								
 							</g>
 						</g>
diff --git a/docs/uml/designer_v2/lib/features/uml.svg b/docs/uml/designer_v2/lib/features/uml.svg
index a6d29463e..35e9bd57c 100644
--- a/docs/uml/designer_v2/lib/features/uml.svg
+++ b/docs/uml/designer_v2/lib/features/uml.svg
@@ -1,4 +1,4 @@
-<svg version="1.1" baseProfile="full" width="46783.5" height="3658.0" viewbox="0 0 46783.5 3658" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+<svg version="1.1" baseProfile="full" width="48029.8" height="3778.0" viewbox="0 0 48029.75 3778" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
 	<desc >[&lt;abstract&gt;IAppDelegate
 	  |
 	  +dynamic onAppStart()
@@ -6,7 +6,6 @@
 	
 	[AppController
 	  |
-	  +sharedPreferences: SharedPreferences;
 	  +appDelegates: List&lt;IAppDelegate&gt;;
 	  -_delayedFuture: dynamic;
 	  +isInitialized: dynamic
@@ -15,8 +14,6 @@
 	  -dynamic _callDelegates()
 	]
 	
-	[AppController]o-[SharedPreferences]
-	
 	[ParticipantDetailsFormView
 	  |
 	  +formViewModel: ParticipantDetailsFormViewModel
@@ -171,13 +168,11 @@
 	[AuthFormController
 	  |
 	  +authRepository: IAuthRepository;
-	  +sharedPreferences: SharedPreferences;
 	  +notificationService: INotificationService;
 	  +router: GoRouter;
 	  +emailControl: FormControl&lt;String&gt;;
 	  +passwordControl: FormControl&lt;String&gt;;
 	  +passwordConfirmationControl: FormControl&lt;String&gt;;
-	  +rememberMeControl: FormControl&lt;bool&gt;;
 	  +termsOfServiceControl: FormControl&lt;bool&gt;;
 	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
 	  +loginForm: FormGroup;
@@ -186,7 +181,6 @@
 	  +passwordRecoveryForm: FormGroup;
 	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
 	  -_formKey: AuthFormKey;
-	  +shouldRemember: bool;
 	  +formKey: AuthFormKey;
 	  +form: FormGroup
 	  |
@@ -203,14 +197,10 @@
 	  +dynamic sendPasswordResetLink();
 	  +dynamic recoverPassword();
 	  +dynamic updateUser();
-	  -dynamic _readDebugUser();
-	  -void _setRememberMe();
-	  -void _delRememberMe();
-	  -void _initRememberMe()
+	  -dynamic _readDebugUser()
 	]
 	
 	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
-	[AuthFormController]o-[SharedPreferences]
 	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
 	[AuthFormController]o-[GoRouter]
 	[AuthFormController]o-[FormControl]
@@ -1994,6 +1984,31 @@
 	
 	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
 	
+	[ImageQuestionFormData
+	  |
+	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
+	  +responseOptions: List&lt;String&gt;
+	  |
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +ImageQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	]
+	
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
+	
+	[AudioQuestionFormData
+	  |
+	  +maxRecordingDurationSeconds: int;
+	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
+	  +responseOptions: List&lt;String&gt;
+	  |
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +AudioQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	]
+	
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
+	
 	[ScaleQuestionFormData
 	  |
 	  +minValue: double;
@@ -2032,6 +2047,16 @@
 	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
 	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
 	
+	[AudioRecordingQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
+	
 	[FreeTextQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel;
@@ -2052,12 +2077,24 @@
 	  &lt;static&gt;+choice: SurveyQuestionType;
 	  &lt;static&gt;+bool: SurveyQuestionType;
 	  &lt;static&gt;+scale: SurveyQuestionType;
+	  &lt;static&gt;+image: SurveyQuestionType;
+	  &lt;static&gt;+audio: SurveyQuestionType;
 	  &lt;static&gt;+freeText: SurveyQuestionType
 	]
 	
 	[SurveyQuestionType]o-[SurveyQuestionType]
 	[Enum]&lt;:--[SurveyQuestionType]
 	
+	[ImageCapturingQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
+	
 	[&lt;abstract&gt;IScaleQuestionFormViewModel
 	  |
 	  +isMidValuesClearedInfoVisible: bool
@@ -2105,6 +2142,11 @@
 	  +customOptionsMax: int;
 	  +customOptionsInitial: int;
 	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
+	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
+	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
+	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
+	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
+	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
 	  &lt;static&gt;+kDefaultScaleMinValue: int;
 	  &lt;static&gt;+kDefaultScaleMaxValue: int;
 	  &lt;static&gt;+kNumMidValueControls: int;
@@ -2140,6 +2182,8 @@
 	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
 	  +validAnswerOptions: List&lt;String&gt;;
 	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
 	  +scaleMinValue: int;
 	  +scaleMaxValue: int;
 	  +scaleRange: int;
@@ -2148,6 +2192,7 @@
 	  +questionTextRequired: dynamic;
 	  +numValidChoiceOptions: dynamic;
 	  +scaleRangeValid: dynamic;
+	  +maxRecordingDurationValid: dynamic;
 	  +titles: Map&lt;FormMode, String&gt;;
 	  +isAddOptionButtonVisible: bool;
 	  +isMidValuesClearedInfoVisible: bool
@@ -2402,1270 +2447,1278 @@
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="3658.0" width="46783.5" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="3778.0" width="48029.8" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
 				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M568.8 2331.2 L568.75 2865 L15061.75 3050.418933287601 L15061.8 3050.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M574.1 2321.8 L568.8 2331.2 L563.4 2321.8 L568.8 2312.5 Z"></path>
-					</g>
-					<path d="M209.5 1455.7 L209.5 1607 L15848.25 2228.9606246937387 L15848.3 2229.0 " fill="none"></path>
+					<path d="M209.5 1455.7 L209.5 1607 L15575 2288.153578896574 L15575.0 2288.2 " fill="none"></path>
 					<g fill="#eee8d5">
 						<path d="M214.8 1446.3 L209.5 1455.7 L204.2 1446.3 L209.5 1437.0 Z"></path>
 					</g>
-					<path d="M7287.2 544.6 L209.5 876 L209.5 1025 L209.5 1025 L209.5 1174 L209.5 1174 L209.5 1344 L209.5 1344.0 " fill="none"></path>
-					<path d="M7287.4 549.9 L7287.2 544.6 L7286.9 539.3 L7300.5 544.0 Z"></path>
-					<path d="M15149.6 1406.7 L13973.25 1607 L12827.739666136726 2182.5 L12827.7 2182.5 " fill="none"></path>
-					<path d="M15150.5 1412.0 L15149.6 1406.7 L15148.7 1401.4 L15162.8 1404.5 Z"></path>
-					<path d="M34312.4 111.4 L34049 203 L34049 410.5 L34049.0 410.5 " fill="none"></path>
-					<path d="M34314.1 116.4 L34312.4 111.4 L34310.6 106.3 L34324.9 107.0 Z"></path>
-					<path d="M33687.5 186.7 L33687.5 203 L33687.5 524 L33687.5 524.0 " fill="none"></path>
+					<path d="M6298.9 545.4 L209.5 876 L209.5 1025 L209.5 1025 L209.5 1174 L209.5 1174 L209.5 1344 L209.5 1344.0 " fill="none"></path>
+					<path d="M6299.2 550.8 L6298.9 545.4 L6298.6 540.1 L6312.3 544.7 Z"></path>
+					<path d="M13775.2 1417.8 L13119 1607 L13119 2242.5 L13119.0 2242.5 " fill="none"></path>
+					<path d="M13776.7 1423.0 L13775.2 1417.8 L13773.7 1412.7 L13788.0 1414.1 Z"></path>
+					<path d="M34946.9 111.4 L34683.5 203 L34683.5 410.5 L34683.5 410.5 " fill="none"></path>
+					<path d="M34948.6 116.4 L34946.9 111.4 L34945.1 106.3 L34959.4 107.0 Z"></path>
+					<path d="M34322.0 186.7 L34322 203 L34322 524 L34322.0 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33692.8 177.3 L33687.5 186.7 L33682.2 177.3 L33687.5 168.0 Z"></path>
+						<path d="M34327.3 177.3 L34322.0 186.7 L34316.7 177.3 L34322.0 168.0 Z"></path>
 					</g>
-					<path d="M15829.8 2269.4 L12340 2865 L26715.5 3050.76986904102 L26715.5 3050.8 " fill="none"></path>
+					<path d="M15556.7 2337.8 L12536 2985 L27416.75 3170.7945655994245 L27416.8 3170.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15839.9 2273.0 L15829.8 2269.4 L15838.2 2262.5 L15848.3 2266.2 Z"></path>
+						<path d="M15567.0 2341.1 L15556.7 2337.8 L15564.8 2330.7 L15575.0 2333.9 Z"></path>
 					</g>
-					<path d="M16068.0 2337.2 L16291 2865 L34132 3050.952804090871 L34132.0 3051.0 " fill="none"></path>
+					<path d="M15791.1 2397.4 L16017.75 2985 L34918.25 3170.983393130375 L34918.3 3171.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16069.3 2326.5 L16068.0 2337.2 L16059.5 2330.7 L16060.7 2320.0 Z"></path>
+						<path d="M15792.7 2386.8 L15791.1 2397.4 L15782.8 2390.6 L15784.4 2380.0 Z"></path>
 					</g>
-					<path d="M41651.4 693.6 L41120.5 876 L41120.5 1025 L41120.5 1025 L41120.5 1174 L41120.5 1174 L41120.5 1390.5 L41120.5 1390.5 L41120.5 1607 L41120.5 1607 L16202.25 2231.5635827497235 L16202.3 2231.6 " fill="none"></path>
-					<path d="M41653.1 698.7 L41651.4 693.6 L41649.7 688.6 L41664.0 689.3 Z"></path>
-					<path d="M882.3 2301.2 L882.25 2865 L2927 3036.6034987062662 L2927.0 3036.6 " fill="none"></path>
+					<path d="M42897.6 693.6 L42366.75 876 L42366.75 1025 L42366.75 1025 L42366.75 1174 L42366.75 1174 L42366.75 1390.5 L42366.75 1390.5 L42366.75 1607 L42366.75 1607 L15929 2291.417841610385 L15929.0 2291.4 " fill="none"></path>
+					<path d="M42899.4 698.7 L42897.6 693.6 L42895.9 688.6 L42910.3 689.3 Z"></path>
+					<path d="M882.3 2361.2 L882.25 2985 L2927 3156.6034987062662 L2927.0 3156.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M887.6 2291.8 L882.3 2301.2 L876.9 2291.8 L882.3 2282.5 Z"></path>
+						<path d="M887.6 2351.8 L882.3 2361.2 L876.9 2351.8 L882.3 2342.5 Z"></path>
 					</g>
-					<path d="M1102.0 1414.8 L882.25 1607 L882.25 2189.5 L882.3 2189.5 " fill="none"></path>
+					<path d="M1102.0 1414.8 L882.25 1607 L882.25 2249.5 L882.3 2249.5 " fill="none"></path>
 					<path d="M1105.5 1418.8 L1102.0 1414.8 L1098.5 1410.8 L1112.0 1406.0 Z"></path>
-					<path d="M1129.8 2301.2 L1129.75 2865 L2927 3034.7364856310924 L2927.0 3034.7 " fill="none"></path>
+					<path d="M1129.8 2361.2 L1129.75 2985 L2927 3154.7364856310924 L2927.0 3154.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1135.1 2291.8 L1129.8 2301.2 L1124.4 2291.8 L1129.8 2282.5 Z"></path>
+						<path d="M1135.1 2351.8 L1129.8 2361.2 L1124.4 2351.8 L1129.8 2342.5 Z"></path>
 					</g>
-					<path d="M1129.8 1419.3 L1129.75 1607 L1129.75 2189.5 L1129.8 2189.5 " fill="none"></path>
+					<path d="M1129.8 1419.3 L1129.75 1607 L1129.75 2249.5 L1129.8 2249.5 " fill="none"></path>
 					<path d="M1135.1 1419.3 L1129.8 1419.3 L1124.4 1419.3 L1129.8 1406.0 Z"></path>
-					<path d="M1377.3 2301.2 L1377.25 2865 L2927 3032.3344188739325 L2927.0 3032.3 " fill="none"></path>
+					<path d="M1377.3 2361.2 L1377.25 2985 L2927 3152.3344188739325 L2927.0 3152.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1382.6 2291.8 L1377.3 2301.2 L1371.9 2291.8 L1377.3 2282.5 Z"></path>
+						<path d="M1382.6 2351.8 L1377.3 2361.2 L1371.9 2351.8 L1377.3 2342.5 Z"></path>
 					</g>
-					<path d="M1157.5 1414.8 L1377.25 1607 L1377.25 2189.5 L1377.3 2189.5 " fill="none"></path>
+					<path d="M1157.5 1414.8 L1377.25 1607 L1377.25 2249.5 L1377.3 2249.5 " fill="none"></path>
 					<path d="M1161.0 1410.8 L1157.5 1414.8 L1154.0 1418.8 L1147.5 1406.0 Z"></path>
-					<path d="M1659.8 2316.2 L1659.75 2865 L2927 3028.586866239834 L2927.0 3028.6 " fill="none"></path>
+					<path d="M1659.8 2376.2 L1659.75 2985 L2927 3148.586866239834 L2927.0 3148.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1665.1 2306.8 L1659.8 2316.2 L1654.4 2306.8 L1659.8 2297.5 Z"></path>
+						<path d="M1665.1 2366.8 L1659.8 2376.2 L1654.4 2366.8 L1659.8 2357.5 Z"></path>
 					</g>
-					<path d="M1180.0 1411.0 L1659.75 1607 L1659.75 2174.5 L1659.8 2174.5 " fill="none"></path>
+					<path d="M1180.0 1411.0 L1659.75 1607 L1659.75 2234.5 L1659.8 2234.5 " fill="none"></path>
 					<path d="M1182.1 1406.1 L1180.0 1411.0 L1178.0 1416.0 L1167.7 1406.0 Z"></path>
-					<path d="M1744.0 1469.3 L1699.75 1607 L13409.25 2234.098808003406 L13409.3 2234.1 " fill="none"></path>
+					<path d="M1744.0 1469.3 L1699.75 1607 L14038 2294.0232750782907 L14038.0 2294.0 " fill="none"></path>
 					<g fill="#eee8d5">
 						<path d="M1751.9 1462.0 L1744.0 1469.3 L1741.7 1458.8 L1749.7 1451.5 Z"></path>
 					</g>
-					<path d="M1827.8 1466.3 L1936.5 1607 L1936.5 2236 L1936.5 2236 L1936.5 2865 L1936.5 2865 L2927 3023.1577482876714 L2927.0 3023.2 " fill="none"></path>
+					<path d="M1827.8 1466.3 L1936.5 1607 L1936.5 2296 L1936.5 2296 L1936.5 2985 L1936.5 2985 L2927 3143.1577482876714 L2927.0 3143.2 " fill="none"></path>
 					<g fill="#eee8d5">
 						<path d="M1826.3 1455.6 L1827.8 1466.3 L1817.9 1462.1 L1816.4 1451.5 Z"></path>
 					</g>
-					<path d="M1840.6 1465.0 L1976.5 1607 L3544.387519872814 2220.5 L3544.4 2220.5 " fill="none"></path>
+					<path d="M1840.6 1465.0 L1976.5 1607 L3547.837082728592 2280.5 L3547.8 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
 						<path d="M1838.0 1454.6 L1840.6 1465.0 L1830.2 1461.9 L1827.6 1451.5 Z"></path>
 					</g>
-					<path d="M2812.0 2308.2 L2812 2865 L26715.5 3051.0602149415695 L26715.5 3051.1 " fill="none"></path>
+					<path d="M2812.0 2368.2 L2812 2985 L27416.75 3171.07272036089 L27416.8 3171.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2817.3 2298.8 L2812.0 2308.2 L2806.7 2298.8 L2812.0 2289.5 Z"></path>
+						<path d="M2817.3 2358.8 L2812.0 2368.2 L2806.7 2358.8 L2812.0 2349.5 Z"></path>
 					</g>
-					<path d="M3226.9 2314.8 L3052 2865 L1537.06836461126 3036 L1537.1 3036.0 " fill="none"></path>
+					<path d="M3229.1 2374.9 L3052 2985 L1537.06836461126 3156 L1537.1 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3234.9 2307.5 L3226.9 2314.8 L3224.7 2304.3 L3232.6 2297.0 Z"></path>
+						<path d="M3236.8 2367.5 L3229.1 2374.9 L3226.6 2364.5 L3234.3 2357.0 Z"></path>
 					</g>
-					<path d="M3278.0 2314.7 L3459.5 2865 L26715.5 3051.048 L26715.5 3051.0 " fill="none"></path>
+					<path d="M3275.8 2374.9 L3459.5 2985 L27416.75 3171.0611993128937 L27416.8 3171.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3280.1 2304.2 L3278.0 2314.7 L3270.0 2307.5 L3272.1 2297.0 Z"></path>
+						<path d="M3278.2 2364.4 L3275.8 2374.9 L3268.0 2367.5 L3270.4 2357.0 Z"></path>
 					</g>
-					<path d="M40206.7 2553.5 L40019.5 2865 L28671.25 3050.340422969985 L28671.3 3050.3 " fill="none"></path>
+					<path d="M41494.1 2568.9 L41265.75 2985 L29258.75 3170.403667825799 L29258.8 3170.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40216.1 2548.2 L40206.7 2553.5 L40206.9 2542.8 L40216.3 2537.5 Z"></path>
+						<path d="M41503.2 2563.2 L41494.1 2568.9 L41493.9 2558.1 L41503.0 2552.5 Z"></path>
 					</g>
-					<path d="M40273.0 2554.9 L40152 2865 L15230.75 3050.869774951761 L15230.8 3050.9 " fill="none"></path>
+					<path d="M41554.0 2570.2 L41418.25 2985 L27376.75 3170.3909419135607 L27376.8 3170.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40281.4 2548.1 L40273.0 2554.9 L40271.5 2544.3 L40279.8 2537.5 Z"></path>
+						<path d="M41562.0 2563.0 L41554.0 2570.2 L41551.8 2559.7 L41559.8 2552.5 Z"></path>
 					</g>
-					<path d="M40293.2 2555.2 L40192 2865 L26675.5 3050.3481305834343 L26675.5 3050.3 " fill="none"></path>
+					<path d="M41569.8 2570.5 L41458.25 2985 L33194.25 3170.467629362214 L33194.3 3170.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40301.2 2548.0 L40293.2 2555.2 L40291.0 2544.7 L40299.0 2537.5 Z"></path>
+						<path d="M41577.4 2562.9 L41569.8 2570.5 L41567.1 2560.1 L41574.7 2552.5 Z"></path>
 					</g>
-					<path d="M40475.0 2555.6 L40550 2865 L32334.75 3050.4615372976245 L32334.8 3050.5 " fill="none"></path>
+					<path d="M41712.5 2570.6 L41816.25 2985 L27529.75 3170.7653384926443 L27529.8 3170.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40478.0 2545.3 L40475.0 2555.6 L40467.6 2547.8 L40470.6 2537.5 Z"></path>
+						<path d="M41715.4 2560.3 L41712.5 2570.6 L41705.1 2562.8 L41708.0 2552.5 Z"></path>
 					</g>
-					<path d="M40495.2 2555.3 L40590 2865 L26828.5 3050.737425821392 L26828.5 3050.7 " fill="none"></path>
+					<path d="M41728.4 2570.3 L41856.25 2985 L35023.25 3170.0779899789413 L35023.3 3170.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40497.6 2544.9 L40495.2 2555.3 L40487.4 2548.0 L40489.8 2537.5 Z"></path>
+						<path d="M41730.7 2559.8 L41728.4 2570.3 L41720.5 2563.0 L41722.9 2552.5 Z"></path>
 					</g>
-					<path d="M40515.4 2555.0 L40630 2865 L34237 3049.9809169187806 L34237.0 3050.0 " fill="none"></path>
+					<path d="M41744.2 2570.0 L41896.25 2985 L3282 3170.646629115727 L3282.0 3170.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40517.2 2544.4 L40515.4 2555.0 L40507.2 2548.1 L40508.9 2537.5 Z"></path>
-					</g>
-					<path d="M40535.5 2554.6 L40670 2865 L3282 3050.6187725439568 L3282.0 3050.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40536.7 2543.9 L40535.5 2554.6 L40526.9 2548.2 L40528.1 2537.5 Z"></path>
+						<path d="M41746.0 2559.4 L41744.2 2570.0 L41736.0 2563.1 L41737.8 2552.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M41388.0 102.3 L40397.5 203 L40397.5 539.5 L40397.5 539.5 L40397.5 876 L40397.5 876 L40397.5 1025 L40397.5 1025 L40397.5 1174 L40397.5 1174 L40397.5 1390.5 L40397.5 1390.5 L40397.5 1607 L40397.5 1607 L40397.5 1934.5 L40397.5 1934.5 " fill="none"></path>
+						<path d="M42634.2 102.3 L41643.75 203 L41643.75 539.5 L41643.75 539.5 L41643.75 876 L41643.75 876 L41643.75 1025 L41643.75 1025 L41643.75 1174 L41643.75 1174 L41643.75 1390.5 L41643.75 1390.5 L41643.75 1607 L41643.75 1607 L41643.75 2039.5 L41643.8 2039.5 " fill="none"></path>
 					</g>
-					<path d="M41388.5 107.7 L41388.0 102.3 L41387.4 97.0 L41401.3 101.0 Z"></path>
-					<path d="M3299.3 2973.1 L3312 2968 L3319.5 2968 L3319.5 2968 L3327 3051.5 L3327 3051.5 L3319.5 3135 L3319.5 3135 L3312 3135 L3312 3135 L3282 3122.9277108433735 L3282.0 3122.9 " fill="none"></path>
+					<path d="M42634.8 107.7 L42634.2 102.3 L42633.7 97.0 L42647.5 101.0 Z"></path>
+					<path d="M3300.3 3134.4 L3545.3333333333358 3088 L3611.1666666666642 3088 L3611.1666666666642 3088 L3677 3171.5 L3677 3171.5 L3611.1666666666642 3255 L3611.1666666666642 3255 L3545.3333333333358 3255 L3545.3333333333358 3255 L3282 3205.120982986767 L3282.0 3205.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3288.7 2971.6 L3299.3 2973.1 L3292.6 2981.5 L3282.0 2980.1 Z"></path>
+						<path d="M3290.2 3130.9 L3300.3 3134.4 L3292.2 3141.4 L3282.0 3137.9 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3697.7 2264.2 L3499.5 2865 L3281.3498659517427 2968 L3281.3 2968.0 " fill="none"></path>
+						<path d="M3698.5 2324.3 L3499.5 2985 L3281.3498659517427 3088 L3281.3 3088.0 " fill="none"></path>
 					</g>
-					<path d="M3702.8 2265.8 L3697.7 2264.2 L3692.6 2262.5 L3701.9 2251.5 Z"></path>
-					<path d="M1976.8 3001.9 L1989 2998 L1996.5 2998 L1996.5 2998 L2004 3051.5 L2004 3051.5 L1996.5 3105 L1996.5 3105 L1989 3105 L1989 3105 L1959 3095.5309734513276 L1959.0 3095.5 " fill="none"></path>
+					<path d="M3703.6 2325.8 L3698.5 2324.3 L3693.4 2322.7 L3702.3 2311.5 Z"></path>
+					<path d="M1976.8 3121.9 L1989 3118 L1996.5 3118 L1996.5 3118 L2004 3171.5 L2004 3171.5 L1996.5 3225 L1996.5 3225 L1989 3225 L1989 3225 L1959 3215.5309734513276 L1959.0 3215.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1966.3 2999.6 L1976.8 3001.9 L1969.5 3009.7 L1959.0 3007.5 Z"></path>
+						<path d="M1966.3 3119.6 L1976.8 3121.9 L1969.5 3129.7 L1959.0 3127.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3699.4 2264.4 L3539.5 2865 L1959 3036.3739825581397 L1959.0 3036.4 " fill="none"></path>
+						<path d="M3700.1 2324.5 L3539.5 2985 L1959 3156.3739825581397 L1959.0 3156.4 " fill="none"></path>
 					</g>
-					<path d="M3704.6 2265.8 L3699.4 2264.4 L3694.3 2263.0 L3702.9 2251.5 Z"></path>
-					<path d="M2217.8 1512.9 L2016.5 1607 L2016.5 2236 L2016.5 2236 L2016.5 2865 L2016.5 2865 L3547.75 3043.458443993126 L3547.8 3043.5 " fill="none"></path>
+					<path d="M3705.3 2325.7 L3700.1 2324.5 L3694.9 2323.2 L3703.2 2311.5 Z"></path>
+					<path d="M2025.1 1599.4 L2016.5 1607 L2016.5 2296 L2016.5 2296 L2016.5 2985 L2016.5 2985 L3897.75 3164.9016151775413 L3897.8 3164.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2228.6 1513.8 L2217.8 1512.9 L2224.0 1504.1 L2234.8 1505.0 Z"></path>
+						<path d="M2035.7 1597.2 L2025.1 1599.4 L2028.6 1589.2 L2039.1 1587.0 Z"></path>
 					</g>
-					<path d="M2218.9 1551.3 L2128.5 1607 L2128.5 2220.5 L2128.5 2220.5 " fill="none"></path>
+					<path d="M2131.0 1602.9 L2128.5 1607 L2128.5 2280.5 L2128.5 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2229.6 1550.9 L2218.9 1551.3 L2224.0 1541.9 L2234.8 1541.5 Z"></path>
+						<path d="M2140.4 1597.7 L2131.0 1602.9 L2131.3 1592.2 L2140.8 1587.0 Z"></path>
 					</g>
-					<path d="M2426.5 1605.1 L2426 1607 L2426 2220.5 L2426.0 2220.5 " fill="none"></path>
+					<path d="M2422.1 1601.9 L2426 1607 L2426 2280.5 L2426.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2433.9 1597.3 L2426.5 1605.1 L2423.5 1594.8 L2431.0 1587.0 Z"></path>
+						<path d="M2420.7 1591.2 L2422.1 1601.9 L2412.2 1597.7 L2410.8 1587.0 Z"></path>
 					</g>
-					<path d="M2741.5 1517.8 L2925 1607 L13751.25 2231.8444704425024 L13751.3 2231.8 " fill="none"></path>
+					<path d="M2524.0 1476.2 L2925 1607 L14325 2291.675732217573 L14325.0 2291.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2735.5 1508.9 L2741.5 1517.8 L2730.8 1518.5 L2724.8 1509.6 Z"></path>
+						<path d="M2516.8 1468.2 L2524.0 1476.2 L2513.5 1478.4 L2506.3 1470.4 Z"></path>
 					</g>
-					<path d="M2742.0 1498.5 L3005.5 1607 L3978.6631558028616 2220.5 L3978.7 2220.5 " fill="none"></path>
+					<path d="M2524.1 1471.4 L2965 1607 L3979.8931422351234 2280.5 L3979.9 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2735.4 1490.0 L2742.0 1498.5 L2731.3 1499.9 L2724.8 1491.4 Z"></path>
+						<path d="M2516.7 1463.5 L2524.1 1471.4 L2513.6 1473.7 L2506.3 1465.9 Z"></path>
 					</g>
-					<path d="M2742.2 1490.9 L3045.5 1607 L15501.25 2233.810948656919 L15501.3 2233.8 " fill="none"></path>
+					<path d="M2524.2 1467.0 L3005 1607 L15448 2293.5996876626755 L15448.0 2293.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2735.4 1482.6 L2742.2 1490.9 L2731.6 1492.6 L2724.8 1484.3 Z"></path>
+						<path d="M2516.7 1459.3 L2524.2 1467.0 L2513.7 1469.5 L2506.3 1461.8 Z"></path>
 					</g>
-					<path d="M2742.6 1471.4 L3183.5 1607 L4252.248211446741 2220.5 L4252.2 2220.5 " fill="none"></path>
+					<path d="M2524.2 1463.1 L3045 1607 L4251.48385341074 2280.5 L4251.5 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2735.2 1463.5 L2742.6 1471.4 L2732.1 1473.7 L2724.8 1465.9 Z"></path>
+						<path d="M2516.7 1455.5 L2524.2 1463.1 L2513.8 1465.8 L2506.3 1458.2 Z"></path>
 					</g>
-					<path d="M2742.7 1467.0 L3223.5 1607 L13409.25 2233.8153846153846 L13409.3 2233.8 " fill="none"></path>
+					<path d="M2524.3 1459.6 L3085 1607 L14038 2293.7740819948126 L14038.0 2293.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2735.2 1459.3 L2742.7 1467.0 L2732.2 1469.5 L2724.8 1461.8 Z"></path>
+						<path d="M2516.6 1452.1 L2524.3 1459.6 L2513.9 1462.4 L2506.3 1454.9 Z"></path>
 					</g>
-					<path d="M2743.1 1442.1 L3584 1607 L3584 2220.5 L3584.0 2220.5 " fill="none"></path>
+					<path d="M2524.7 1433.6 L3584 1607 L3584 2280.5 L3584.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2734.9 1435.1 L2743.1 1442.1 L2732.9 1445.6 L2724.8 1438.5 Z"></path>
+						<path d="M2516.3 1426.8 L2524.7 1433.6 L2514.6 1437.4 L2506.3 1430.6 Z"></path>
 					</g>
-					<path d="M41651.9 742.9 L41358.5 876 L41358.5 1025 L41358.5 1025 L41358.5 1174 L41358.5 1174 L41358.5 1359.5 L41358.5 1359.5 " fill="none"></path>
-					<path d="M41654.1 747.7 L41651.9 742.9 L41649.7 738.0 L41664.0 737.4 Z"></path>
+					<path d="M42898.1 742.9 L42604.75 876 L42604.75 1025 L42604.75 1025 L42604.75 1174 L42604.75 1174 L42604.75 1359.5 L42604.8 1359.5 " fill="none"></path>
+					<path d="M42900.3 747.7 L42898.1 742.9 L42895.9 738.0 L42910.3 737.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M35189.1 102.7 L34652.5 203 L34652.5 524 L34652.5 524.0 " fill="none"></path>
+						<path d="M35823.6 102.7 L35287 203 L35287 524 L35287.0 524.0 " fill="none"></path>
 					</g>
-					<path d="M35190.1 108.0 L35189.1 102.7 L35188.2 97.5 L35202.3 100.3 Z"></path>
-					<path d="M38719.8 3549.7 L38719.75 3551 L36263.5 3585.805658117952 L36263.5 3585.8 " fill="none"></path>
+					<path d="M35824.6 108.0 L35823.6 102.7 L35822.7 97.5 L35836.8 100.3 Z"></path>
+					<path d="M39148.8 3669.7 L39148.75 3671 L37334.5 3705.5664162082385 L37334.5 3705.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38725.1 3540.3 L38719.8 3549.7 L38714.4 3540.3 L38719.8 3531.0 Z"></path>
+						<path d="M39154.1 3660.3 L39148.8 3669.7 L39143.4 3660.3 L39148.8 3651.0 Z"></path>
 					</g>
-					<path d="M26547.8 3471.0 L26313.25 3551 L40467 3586.3712975836397 L40467.0 3586.4 " fill="none"></path>
+					<path d="M27249.1 3591.0 L27014.5 3671 L41307.5 3706.3725469692217 L41307.5 3706.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26558.4 3473.0 L26547.8 3471.0 L26554.9 3462.9 L26565.5 3464.9 Z"></path>
+						<path d="M27259.6 3593.0 L27249.1 3591.0 L27256.2 3582.9 L27266.8 3584.9 Z"></path>
 					</g>
-					<path d="M26996.2 3471.1 L27229.75 3551 L27229.75 3571 L27229.8 3571.0 " fill="none"></path>
+					<path d="M27697.4 3591.1 L27931 3671 L27849.169014084506 3691 L27849.2 3691.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26989.1 3463.1 L26996.2 3471.1 L26985.6 3473.2 L26978.5 3465.1 Z"></path>
+						<path d="M27690.3 3583.1 L27697.4 3591.1 L27686.9 3593.2 L27679.8 3585.1 Z"></path>
 					</g>
-					<path d="M26996.7 3444.4 L27477.25 3551 L27477.25 3571 L27477.3 3571.0 " fill="none"></path>
+					<path d="M27698.0 3564.4 L28178.5 3671 L28096.669014084506 3691 L28096.7 3691.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26988.8 3437.1 L26996.7 3444.4 L26986.5 3447.6 L26978.5 3440.3 Z"></path>
+						<path d="M27690.0 3557.1 L27698.0 3564.4 L27687.7 3567.6 L27679.8 3560.3 Z"></path>
 					</g>
-					<path d="M26772.0 3080.3 L26772 3238 L26772 3310.5 L26772.0 3310.5 " fill="none"></path>
-					<path d="M26777.3 3080.3 L26772.0 3080.3 L26766.7 3080.3 L26772.0 3067.0 Z"></path>
-					<path d="M5452.3 2323.7 L5452.25 2865 L3685.75 3044.489103786434 L3685.8 3044.5 " fill="none"></path>
+					<path d="M27473.3 3200.3 L27473.25 3358 L27473.25 3430.5 L27473.3 3430.5 " fill="none"></path>
+					<path d="M27478.6 3200.3 L27473.3 3200.3 L27467.9 3200.3 L27473.3 3187.0 Z"></path>
+					<path d="M5452.3 2383.7 L5452.25 2985 L4035.75 3162.837260181757 L4035.8 3162.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5457.6 2314.3 L5452.3 2323.7 L5446.9 2314.3 L5452.3 2305.0 Z"></path>
+						<path d="M5457.6 2374.3 L5452.3 2383.7 L5446.9 2374.3 L5452.3 2365.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M35309.6 93.3 L38947.75 203 L38947.75 524 L38947.8 524.0 " fill="none"></path>
+						<path d="M35944.1 93.1 L40194 203 L40194 524 L40194.0 524.0 " fill="none"></path>
 					</g>
-					<path d="M35309.7 88.0 L35309.6 93.3 L35309.4 98.6 L35296.3 92.9 Z"></path>
+					<path d="M35944.2 87.7 L35944.1 93.1 L35943.9 98.4 L35930.8 92.7 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M35309.6 93.2 L39173.25 203 L39173.25 508.5 L39173.3 508.5 " fill="none"></path>
+						<path d="M35944.1 93.0 L40419.5 203 L40419.5 508.5 L40419.5 508.5 " fill="none"></path>
 					</g>
-					<path d="M35309.7 87.9 L35309.6 93.2 L35309.4 98.5 L35296.3 92.8 Z"></path>
-					<path d="M41382.9 111.2 L40862.5 203 L40862.5 539.5 L40862.5 539.5 L40862.5 876 L40862.5 876 L40862.5 1025 L40862.5 1025 L40862.5 1174 L40862.5 1174 L40862.5 1390.5 L40862.5 1390.5 L40862.5 1607 L40862.5 1607 L40862.5 2236 L40862.5 2236 L40862.5 2865 L40862.5 2865 L34237 3050.0338050314467 L34237.0 3050.0 " fill="none"></path>
+					<path d="M35944.2 87.7 L35944.1 93.0 L35943.9 98.3 L35930.8 92.7 Z"></path>
+					<path d="M42629.1 111.2 L42108.75 203 L42108.75 539.5 L42108.75 539.5 L42108.75 876 L42108.75 876 L42108.75 1025 L42108.75 1025 L42108.75 1174 L42108.75 1174 L42108.75 1390.5 L42108.75 1390.5 L42108.75 1607 L42108.75 1607 L42108.75 2296 L42108.75 2296 L42108.75 2985 L42108.75 2985 L35023.25 3170.128292238722 L35023.3 3170.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41393.0 114.9 L41382.9 111.2 L41391.1 104.4 L41401.3 108.0 Z"></path>
+						<path d="M42639.2 114.9 L42629.1 111.2 L42637.4 104.4 L42647.5 108.0 Z"></path>
 					</g>
-					<path d="M34369.5 120.3 L34369.5 203 L34369.5 486 L34369.5 486.0 " fill="none"></path>
-					<path d="M34374.8 120.3 L34369.5 120.3 L34364.2 120.3 L34369.5 107.0 Z"></path>
-					<path d="M41648.5 841.9 L41597.5 876 L41597.5 1025 L41597.5 1025 L41597.5 1174 L41597.5 1174 L41597.5 1390.5 L41597.5 1390.5 L41597.5 1607 L41597.5 1607 L41597.5 2236 L41597.5 2236 L41597.5 2865 L41597.5 2865 L26417.5 3049.783630311337 L26417.5 3049.8 " fill="none"></path>
+					<path d="M35004.0 120.3 L35004 203 L35004 486 L35004.0 486.0 " fill="none"></path>
+					<path d="M35009.3 120.3 L35004.0 120.3 L34998.7 120.3 L35004.0 107.0 Z"></path>
+					<path d="M42894.7 841.9 L42843.75 876 L42843.75 1025 L42843.75 1025 L42843.75 1174 L42843.75 1174 L42843.75 1390.5 L42843.75 1390.5 L42843.75 1607 L42843.75 1607 L42843.75 2296 L42843.75 2296 L42843.75 2985 L42843.75 2985 L27118.75 3169.8425879238625 L27118.8 3169.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41659.2 841.1 L41648.5 841.9 L41653.3 832.2 L41664.0 831.5 Z"></path>
+						<path d="M42905.5 841.1 L42894.7 841.9 L42899.5 832.2 L42910.3 831.5 Z"></path>
 					</g>
-					<path d="M41747.8 868.7 L41740 876 L41740 1009.5 L41740.0 1009.5 " fill="none"></path>
+					<path d="M42994.0 868.7 L42986.25 876 L42986.25 1009.5 L42986.3 1009.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41758.2 866.3 L41747.8 868.7 L41750.9 858.5 L41761.4 856.0 Z"></path>
+						<path d="M43004.5 866.3 L42994.0 868.7 L42997.2 858.5 L43007.6 856.0 Z"></path>
 					</g>
-					<path d="M42301.8 872.0 L42304.25 876 L42304.25 986.5 L42304.3 986.5 " fill="none"></path>
+					<path d="M43548.0 872.0 L43550.5 876 L43550.5 986.5 L43550.5 986.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42301.5 861.2 L42301.8 872.0 L42292.4 866.7 L42292.1 856.0 Z"></path>
+						<path d="M43547.8 861.2 L43548.0 872.0 L43538.6 866.7 L43538.4 856.0 Z"></path>
 					</g>
-					<path d="M42552.9 751.4 L42819.25 876 L42819.25 1025 L42819.25 1025 L42819.25 1174 L42819.25 1174 L42819.25 1390.5 L42819.25 1390.5 L42819.25 1607 L42819.25 1607 L42819.25 2236 L42819.25 2236 L42819.25 2865 L42819.25 2865 L42819.25 3051.5 L42819.25 3051.5 L42819.25 3238 L42819.25 3238 L42819.25 3394.5 L42819.25 3394.5 L42819.25 3551 L42819.25 3551 L40570 3585.705367814843 L40570.0 3585.7 " fill="none"></path>
+					<path d="M43799.2 751.4 L44065.5 876 L44065.5 1025 L44065.5 1025 L44065.5 1174 L44065.5 1174 L44065.5 1390.5 L44065.5 1390.5 L44065.5 1607 L44065.5 1607 L44065.5 2296 L44065.5 2296 L44065.5 2985 L44065.5 2985 L44065.5 3171.5 L44065.5 3171.5 L44065.5 3358 L44065.5 3358 L44065.5 3514.5 L44065.5 3514.5 L44065.5 3671 L44065.5 3671 L41410.5 3705.824496582302 L41410.5 3705.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42546.7 742.6 L42552.9 751.4 L42542.2 752.3 L42536.0 743.5 Z"></path>
+						<path d="M43793.0 742.6 L43799.2 751.4 L43788.4 752.3 L43782.3 743.5 Z"></path>
 					</g>
-					<path d="M42553.4 718.8 L42950.75 876 L42950.75 1009.5 L42950.8 1009.5 " fill="none"></path>
+					<path d="M43799.6 718.8 L44197 876 L44197 1009.5 L44197.0 1009.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42546.6 710.4 L42553.4 718.8 L42542.7 720.3 L42536.0 712.0 Z"></path>
+						<path d="M43792.9 710.4 L43799.6 718.8 L43789.0 720.3 L43782.3 712.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M41601.4 111.1 L42100 203 L42100 223 L42100.0 223.0 " fill="none"></path>
+						<path d="M42847.6 111.1 L43346.25 203 L43346.25 223 L43346.3 223.0 " fill="none"></path>
 					</g>
-					<path d="M41602.3 105.9 L41601.4 111.1 L41600.4 116.4 L41588.3 108.7 Z"></path>
-					<path d="M26435.1 2994.9 L26447.5 2990.5 L26455 2990.5 L26455 2990.5 L26462.5 3051.5 L26462.5 3051.5 L26455 3112.5 L26455 3112.5 L26447.5 3112.5 L26447.5 3112.5 L26417.5 3101.7982456140353 L26417.5 3101.8 " fill="none"></path>
+					<path d="M42848.6 105.9 L42847.6 111.1 L42846.6 116.4 L42834.5 108.7 Z"></path>
+					<path d="M27136.3 3114.9 L27148.75 3110.5 L27156.25 3110.5 L27156.25 3110.5 L27163.75 3171.5 L27163.75 3171.5 L27156.25 3232.5 L27156.25 3232.5 L27148.75 3232.5 L27148.75 3232.5 L27118.75 3221.7982456140353 L27118.8 3221.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26424.5 2993.0 L26435.1 2994.9 L26428.1 3003.1 L26417.5 3001.2 Z"></path>
+						<path d="M27125.7 3113.0 L27136.3 3114.9 L27129.3 3123.1 L27118.8 3121.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3707.2 2264.8 L3711 2865 L26135.5 3050.334659103499 L26135.5 3050.3 " fill="none"></path>
+						<path d="M3706.6 2324.8 L3698 2985 L26836.75 3170.370413127289 L26836.8 3170.4 " fill="none"></path>
 					</g>
-					<path d="M3712.5 2264.8 L3707.2 2264.8 L3701.9 2264.9 L3707.1 2251.5 Z"></path>
-					<path d="M6071.9 2345.6 L5937.5 2865 L13097.75 3049.045291665231 L13097.8 3049.0 " fill="none"></path>
+					<path d="M3712.0 2324.9 L3706.6 2324.8 L3701.3 2324.8 L3706.8 2311.5 Z"></path>
+					<path d="M6074.3 2405.7 L5937.5 2985 L12754.5 3168.9233996383364 L12754.5 3168.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6079.4 2337.9 L6071.9 2345.6 L6069.1 2335.2 L6076.6 2327.5 Z"></path>
+						<path d="M6081.7 2397.8 L6074.3 2405.7 L6071.3 2395.4 L6078.6 2387.5 Z"></path>
 					</g>
-					<path d="M6128.6 2345.6 L6263 2865 L12887.75 3049.1373933455047 L12887.8 3049.1 " fill="none"></path>
+					<path d="M6126.2 2405.7 L6263 2985 L12544.5 3169.010013351135 L12544.5 3169.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6131.4 2335.2 L6128.6 2345.6 L6121.1 2337.9 L6123.9 2327.5 Z"></path>
+						<path d="M6129.2 2395.4 L6126.2 2405.7 L6118.8 2397.8 L6121.9 2387.5 Z"></path>
 					</g>
-					<path d="M5198.6 1467.4 L4680 1607 L5893.647655007949 2144.5 L5893.6 2144.5 " fill="none"></path>
-					<path d="M5200.0 1472.6 L5198.6 1467.4 L5197.2 1462.3 L5211.5 1464.0 Z"></path>
+					<path d="M5007.6 1486.6 L4680 1607 L5911.639150943396 2204.5 L5911.6 2204.5 " fill="none"></path>
+					<path d="M5009.4 1491.6 L5007.6 1486.6 L5005.7 1481.6 L5020.1 1482.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M6985.6 1419.3 L6968.25 1607 L6226.517090620032 2144.5 L6226.5 2144.5 " fill="none"></path>
+						<path d="M6985.6 1419.3 L6968.25 1607 L6215.521407837446 2204.5 L6215.5 2204.5 " fill="none"></path>
 					</g>
 					<path d="M6990.9 1419.8 L6985.6 1419.3 L6980.3 1418.8 L6986.8 1406.0 Z"></path>
-					<path d="M15149.7 1411.0 L14238.75 1607 L13299.559618441972 2182.5 L13299.6 2182.5 " fill="none"></path>
-					<path d="M15150.8 1416.2 L15149.7 1411.0 L15148.6 1405.7 L15162.8 1408.1 Z"></path>
-					<path d="M678.0 1463.2 L678 1607 L18370.5 2224.3628370132033 L18370.5 2224.4 " fill="none"></path>
+					<path d="M13803.9 1445.5 L13610 1607 L13610 2242.5 L13610.0 2242.5 " fill="none"></path>
+					<path d="M13807.3 1449.6 L13803.9 1445.5 L13800.5 1441.4 L13814.2 1437.0 Z"></path>
+					<path d="M678.0 1463.2 L678 1607 L18545 2283.3749896980853 L18545.0 2283.4 " fill="none"></path>
 					<g fill="#eee8d5">
 						<path d="M683.3 1453.8 L678.0 1463.2 L672.7 1453.8 L678.0 1444.5 Z"></path>
 					</g>
-					<path d="M7287.2 545.0 L678 876 L678 1025 L678 1025 L678 1174 L678 1174 L678 1336.5 L678.0 1336.5 " fill="none"></path>
-					<path d="M7287.5 550.3 L7287.2 545.0 L7286.9 539.6 L7300.5 544.3 Z"></path>
-					<path d="M42840.4 165.4 L42687 203 L42687 524 L42687.0 524.0 " fill="none"></path>
+					<path d="M6298.9 545.9 L678 876 L678 1025 L678 1025 L678 1174 L678 1174 L678 1336.5 L678.0 1336.5 " fill="none"></path>
+					<path d="M6299.3 551.2 L6298.9 545.9 L6298.6 540.6 L6312.3 545.1 Z"></path>
+					<path d="M44000.6 182.6 L43933.25 203 L43933.25 524 L43933.3 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42850.7 168.3 L42840.4 165.4 L42848.2 158.0 L42858.5 160.9 Z"></path>
+						<path d="M44011.1 185.0 L44000.6 182.6 L44008.0 174.8 L44018.5 177.2 Z"></path>
 					</g>
-					<path d="M43052.8 197.3 L43048 203 L43048 524 L43048.0 524.0 " fill="none"></path>
+					<path d="M44294.3 201.6 L44294.25 203 L44294.25 524 L44294.3 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43062.9 193.6 L43052.8 197.3 L43054.7 186.7 L43064.8 183.0 Z"></path>
+						<path d="M44300.3 192.7 L44294.3 201.6 L44289.6 192.0 L44295.6 183.0 Z"></path>
 					</g>
-					<path d="M43390.3 189.9 L43423.5 203 L43423.5 524 L43423.5 524.0 " fill="none"></path>
+					<path d="M44602.4 182.6 L44669.75 203 L44669.75 524 L44669.8 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43383.6 181.5 L43390.3 189.9 L43379.6 191.4 L43372.9 183.0 Z"></path>
+						<path d="M44595.0 174.8 L44602.4 182.6 L44591.9 185.0 L44584.5 177.2 Z"></path>
 					</g>
-					<path d="M43442.8 152.4 L43693 203 L43693 524 L43693.0 524.0 " fill="none"></path>
+					<path d="M44602.9 144.2 L44939.25 203 L44939.25 524 L44939.3 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43434.7 145.3 L43442.8 152.4 L43432.6 155.8 L43424.5 148.7 Z"></path>
+						<path d="M44594.6 137.3 L44602.9 144.2 L44592.8 147.8 L44584.5 141.0 Z"></path>
 					</g>
-					<path d="M18649.1 2443.0 L18537.25 2865 L37659.25 3051.2030022190315 L37659.3 3051.2 " fill="none"></path>
+					<path d="M18828.4 2503.1 L18711.75 2985 L39165.25 3171.222307654755 L39165.3 3171.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18656.7 2435.4 L18649.1 2443.0 L18646.3 2432.7 L18653.9 2425.0 Z"></path>
+						<path d="M18835.7 2495.3 L18828.4 2503.1 L18825.4 2492.8 L18832.8 2485.0 Z"></path>
 					</g>
-					<path d="M18907.8 2438.1 L19338.25 2865 L13288.75 3048.6015866558178 L13288.8 3048.6 " fill="none"></path>
+					<path d="M18946.5 2502.7 L19105.25 2985 L12945.5 3168.6526717557254 L12945.5 3168.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18905.0 2427.8 L18907.8 2438.1 L18897.4 2435.4 L18894.6 2425.0 Z"></path>
+						<path d="M18948.7 2492.2 L18946.5 2502.7 L18938.6 2495.5 L18940.7 2485.0 Z"></path>
 					</g>
-					<path d="M18920.2 2437.7 L19378.25 2865 L26715.5 3050.0748436179206 L26715.5 3050.1 " fill="none"></path>
+					<path d="M18995.7 2501.2 L19272 2985 L27416.75 3170.2151653711326 L27416.8 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18917.1 2427.5 L18920.2 2437.7 L18909.8 2435.3 L18906.6 2425.0 Z"></path>
+						<path d="M18995.7 2490.5 L18995.7 2501.2 L18986.4 2495.7 L18986.4 2485.0 Z"></path>
 					</g>
-					<path d="M18965.5 2436.4 L19525 2865 L34132 3050.8320884068353 L34132.0 3050.8 " fill="none"></path>
+					<path d="M19007.4 2500.8 L19312 2985 L34918.25 3170.87471062505 L34918.3 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18961.3 2426.4 L18965.5 2436.4 L18954.9 2434.9 L18950.7 2425.0 Z"></path>
+						<path d="M19006.9 2490.1 L19007.4 2500.8 L18997.9 2495.7 L18997.4 2485.0 Z"></path>
 					</g>
-					<path d="M42548.6 693.2 L43082.25 876 L43082.25 1025 L43082.25 1025 L43082.25 1174 L43082.25 1174 L43082.25 1390.5 L43082.25 1390.5 L43082.25 1607 L43082.25 1607 L19037.5 2227.3951370586487 L19037.5 2227.4 " fill="none"></path>
-					<path d="M42550.3 688.1 L42548.6 693.2 L42546.9 698.2 L42536.0 688.9 Z"></path>
-					<path d="M15149.9 1416.7 L14460.5 1607 L13657.383147853736 2205 L13657.4 2205.0 " fill="none"></path>
-					<path d="M15151.3 1421.8 L15149.9 1416.7 L15148.5 1411.5 L15162.8 1413.1 Z"></path>
-					<path d="M15150.3 1426.3 L14674.25 1607 L14674.25 2205 L14674.3 2205.0 " fill="none"></path>
-					<path d="M15152.2 1431.3 L15150.3 1426.3 L15148.4 1421.4 L15162.8 1421.6 Z"></path>
-					<path d="M15158.1 1444.0 L14894.25 1607 L14894.25 2205 L14894.3 2205.0 " fill="none"></path>
-					<path d="M15160.9 1448.5 L15158.1 1444.0 L15155.3 1439.5 L15169.5 1437.0 Z"></path>
-					<path d="M8554.5 1470.7 L8554.5 1607 L13751.25 2227.404412811388 L13751.3 2227.4 " fill="none"></path>
+					<path d="M43794.9 693.2 L44328.5 876 L44328.5 1025 L44328.5 1025 L44328.5 1174 L44328.5 1174 L44328.5 1390.5 L44328.5 1390.5 L44328.5 1607 L44328.5 1607 L19212 2286.971257367387 L19212.0 2287.0 " fill="none"></path>
+					<path d="M43796.6 688.1 L43794.9 693.2 L43793.1 698.2 L43782.3 688.9 Z"></path>
+					<path d="M13879.0 1450.2 L13902.5 1607 L13902.5 2265 L13902.5 2265.0 " fill="none"></path>
+					<path d="M13884.2 1449.4 L13879.0 1450.2 L13873.7 1451.0 L13877.0 1437.0 Z"></path>
+					<path d="M13955.8 1444.1 L14217 1607 L14217 2265 L14217.0 2265.0 " fill="none"></path>
+					<path d="M13958.7 1439.5 L13955.8 1444.1 L13953.0 1448.6 L13944.5 1437.0 Z"></path>
+					<path d="M13964.8 1417.8 L14621 1607 L14621 2265 L14621.0 2265.0 " fill="none"></path>
+					<path d="M13966.3 1412.7 L13964.8 1417.8 L13963.3 1423.0 L13952.0 1414.1 Z"></path>
+					<path d="M7265.8 1470.7 L7265.75 1607 L14325 2289.0435758106923 L14325.0 2289.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8559.8 1461.3 L8554.5 1470.7 L8549.2 1461.3 L8554.5 1452.0 Z"></path>
+						<path d="M7271.1 1461.3 L7265.8 1470.7 L7260.4 1461.3 L7265.8 1452.0 Z"></path>
 					</g>
-					<path d="M13093.2 1027.9 L8554.5 1174 L8554.5 1329 L8554.5 1329.0 " fill="none"></path>
-					<path d="M13093.3 1033.2 L13093.2 1027.9 L13093.0 1022.5 L13106.5 1027.4 Z"></path>
-					<path d="M9214.4 1444.2 L9098.75 1607 L12901.25 2226.7104547221143 L12901.3 2226.7 " fill="none"></path>
+					<path d="M14597.4 1026.8 L7265.75 1174 L7265.75 1329 L7265.8 1329.0 " fill="none"></path>
+					<path d="M14597.5 1032.1 L14597.4 1026.8 L14597.3 1021.5 L14610.8 1026.5 Z"></path>
+					<path d="M7925.6 1444.2 L7810 1607 L13299 2288.9186801298233 L13299.0 2288.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9224.1 1439.7 L9214.4 1444.2 L9215.4 1433.5 L9225.2 1429.0 Z"></path>
+						<path d="M7935.4 1439.7 L7925.6 1444.2 L7926.7 1433.5 L7936.4 1429.0 Z"></path>
 					</g>
-					<path d="M9246.6 1447.6 L9230.25 1607 L8251.47853736089 2220.5 L8251.5 2220.5 " fill="none"></path>
+					<path d="M7992.1 1445.6 L8075.25 1607 L8223.341799709724 2280.5 L8223.3 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9252.9 1438.8 L9246.6 1447.6 L9242.3 1437.7 L9248.5 1429.0 Z"></path>
+						<path d="M7992.6 1434.9 L7992.1 1445.6 L7983.1 1439.7 L7983.6 1429.0 Z"></path>
 					</g>
-					<path d="M9499.3 1483.0 L9424 1607 L12901.25 2225.8555563415152 L12901.3 2225.9 " fill="none"></path>
+					<path d="M8218.8 1483.6 L8155.25 1607 L13299 2288.448589145796 L13299.0 2288.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9508.7 1477.7 L9499.3 1483.0 L9499.6 1472.2 L9509.0 1467.0 Z"></path>
+						<path d="M8227.8 1477.7 L8218.8 1483.6 L8218.3 1472.9 L8227.4 1467.0 Z"></path>
 					</g>
-					<path d="M9557.4 1485.7 L9559.75 1607 L8259.598171701113 2220.5 L8259.6 2220.5 " fill="none"></path>
+					<path d="M8316.5 1483.5 L8382.5 1607 L8230.253809869377 2280.5 L8230.3 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9562.5 1476.2 L9557.4 1485.7 L9551.9 1476.4 L9557.0 1467.0 Z"></path>
+						<path d="M8316.8 1472.7 L8316.5 1483.5 L8307.3 1477.7 L8307.7 1467.0 Z"></path>
 					</g>
-					<path d="M9613.4 1482.8 L9691.25 1607 L12017 2221.9854965843406 L12017.0 2222.0 " fill="none"></path>
+					<path d="M8332.7 1482.2 L8422.5 1607 L12213 2286.4990243267853 L12213.0 2286.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9612.9 1472.1 L9613.4 1482.8 L9603.9 1477.7 L9603.5 1467.0 Z"></path>
+						<path d="M8331.6 1471.5 L8332.7 1482.2 L8322.9 1477.7 L8321.8 1467.0 Z"></path>
 					</g>
-					<path d="M9776.2 1535.3 L9731.25 1607 L8584.25 2196.9125102207686 L8584.3 2196.9 " fill="none"></path>
+					<path d="M8530.8 1537.3 L8508.25 1607 L8508.25 2227 L8508.3 2227.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9785.7 1530.2 L9776.2 1535.3 L9776.6 1524.6 L9786.1 1519.5 Z"></path>
+						<path d="M8538.7 1530.0 L8530.8 1537.3 L8528.6 1526.7 L8536.5 1519.5 Z"></path>
 					</g>
-					<path d="M9853.4 1538.1 L9847 1607 L13409.25 2229.7934820373844 L13409.3 2229.8 " fill="none"></path>
+					<path d="M8609.4 1537.8 L8624 1607 L14038 2291.51160656941 L14038.0 2291.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9859.5 1529.3 L9853.4 1538.1 L9848.9 1528.3 L9855.1 1519.5 Z"></path>
+						<path d="M8612.7 1527.5 L8609.4 1537.8 L8602.2 1529.7 L8605.5 1519.5 Z"></path>
 					</g>
-					<path d="M9777.5 2353.7 L9777.5 2865 L5650.25 3048.4989272304665 L5650.3 3048.5 " fill="none"></path>
+					<path d="M9777.5 2413.7 L9777.5 2985 L6480.25 3167.7586373430418 L6480.3 3167.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9782.8 2344.3 L9777.5 2353.7 L9772.2 2344.3 L9777.5 2335.0 Z"></path>
+						<path d="M9782.8 2404.3 L9777.5 2413.7 L9772.2 2404.3 L9777.5 2395.0 Z"></path>
 					</g>
-					<path d="M9880.1 1532.8 L9887 1607 L9794.734499205088 2137 L9794.7 2137.0 " fill="none"></path>
-					<path d="M9885.5 1532.3 L9880.1 1532.8 L9874.8 1533.3 L9878.9 1519.5 Z"></path>
-					<path d="M9955.0 1530.8 L10002.75 1607 L10043.293918918918 2152.5 L10043.3 2152.5 " fill="none"></path>
-					<path d="M9959.5 1528.0 L9955.0 1530.8 L9950.5 1533.6 L9947.9 1519.5 Z"></path>
-					<path d="M4813.1 2368.2 L4700 2865 L26507.5 3050.7843797821074 L26507.5 3050.8 " fill="none"></path>
+					<path d="M8653.5 1531.3 L8694 1607 L9641 2209.199353945547 L9641.0 2209.2 " fill="none"></path>
+					<path d="M8658.2 1528.7 L8653.5 1531.3 L8648.8 1533.8 L8647.2 1519.5 Z"></path>
+					<path d="M8678.8 1530.3 L8734 1607 L9954 2245.981375902699 L9954.0 2246.0 " fill="none"></path>
+					<path d="M8683.2 1527.2 L8678.8 1530.3 L8674.5 1533.4 L8671.1 1519.5 Z"></path>
+					<path d="M4815.7 2428.3 L4700 2985 L27208.75 3170.806591716369 L27208.8 3170.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4820.4 2360.3 L4813.1 2368.2 L4810.0 2357.9 L4817.3 2350.0 Z"></path>
+						<path d="M4822.9 2420.2 L4815.7 2428.3 L4812.4 2418.1 L4819.5 2410.0 Z"></path>
 					</g>
-					<path d="M4873.4 2368.2 L4986.5 2865 L12887.75 3049.5150258256376 L12887.8 3049.5 " fill="none"></path>
+					<path d="M4870.8 2428.3 L4986.5 2985 L12544.5 3169.4258798900955 L12544.5 3169.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4876.5 2357.9 L4873.4 2368.2 L4866.1 2360.3 L4869.2 2350.0 Z"></path>
+						<path d="M4874.1 2418.1 L4870.8 2428.3 L4863.6 2420.2 L4867.0 2410.0 Z"></path>
 					</g>
-					<path d="M5200.9 1486.3 L4843.25 1607 L4843.25 2122 L4843.3 2122.0 " fill="none"></path>
-					<path d="M5202.6 1491.3 L5200.9 1486.3 L5199.1 1481.2 L5213.5 1482.0 Z"></path>
-					<path d="M13093.2 1028.0 L8729.75 1174 L15162.75 1387.7750575594782 L15162.8 1387.8 " fill="none"></path>
-					<path d="M13093.4 1033.3 L13093.2 1028.0 L13093.0 1022.7 L13106.5 1027.5 Z"></path>
+					<path d="M5077.2 1488.0 L4843.25 1607 L4843.25 2182 L4843.3 2182.0 " fill="none"></path>
+					<path d="M5079.6 1492.8 L5077.2 1488.0 L5074.8 1483.3 L5089.1 1482.0 Z"></path>
+					<path d="M14597.4 1026.8 L7441 1174 L13788 1387.7386063151346 L13788.0 1387.7 " fill="none"></path>
+					<path d="M14597.5 1032.2 L14597.4 1026.8 L14597.3 1021.5 L14610.8 1026.6 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M15636.5 1053.8 L15636.5 1174 L15326.75 1345.1828334396937 L15326.8 1345.2 " fill="none"></path>
+						<path d="M16079.0 1053.8 L16079 1174 L13952 1382.463331824355 L13952.0 1382.5 " fill="none"></path>
 					</g>
-					<path d="M15641.8 1053.8 L15636.5 1053.8 L15631.2 1053.8 L15636.5 1040.5 Z"></path>
-					<path d="M10408.0 1475.9 L10336.5 1607 L12901.25 2222.324783064747 L12901.3 2222.3 " fill="none"></path>
+					<path d="M16084.3 1053.8 L16079.0 1053.8 L16073.7 1053.8 L16079.0 1040.5 Z"></path>
+					<path d="M9119.2 1475.9 L9047.75 1607 L13299 2286.8842337375963 L13299.0 2286.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10417.1 1470.2 L10408.0 1475.9 L10407.7 1465.1 L10416.9 1459.5 Z"></path>
+						<path d="M9128.4 1470.2 L9119.2 1475.9 L9119.0 1465.1 L9128.1 1459.5 Z"></path>
 					</g>
-					<path d="M10522.9 1473.9 L10632 1607 L12034.56438791733 2220.5 L12034.6 2220.5 " fill="none"></path>
+					<path d="M9234.2 1473.9 L9343.25 1607 L12213 2283.5059447438202 L12213.0 2283.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10521.1 1463.3 L10522.9 1473.9 L10512.9 1470.1 L10511.1 1459.5 Z"></path>
+						<path d="M9232.4 1463.3 L9234.2 1473.9 L9224.1 1470.1 L9222.3 1459.5 Z"></path>
 					</g>
-					<path d="M5336.1 1492.6 L5169.75 1607 L5169.75 2236 L5169.75 2236 L5169.75 2865 L5169.75 2865 L30874 3050.953805797186 L30874.0 3051.0 " fill="none"></path>
+					<path d="M5219.3 1499.0 L5169.75 1607 L5169.75 2296 L5169.75 2296 L5169.75 2985 L5169.75 2985 L31265.5 3170.961976405407 L31265.5 3171.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5346.8 1491.7 L5336.1 1492.6 L5340.8 1482.9 L5351.5 1482.0 Z"></path>
+						<path d="M5228.0 1492.7 L5219.3 1499.0 L5218.3 1488.3 L5227.1 1482.0 Z"></path>
 					</g>
-					<path d="M5604.4 1494.2 L5734.75 1607 L5734.75 2236 L5734.75 2236 L5734.75 2865 L5734.75 2865 L32242.75 3051.1769224975524 L32242.8 3051.2 " fill="none"></path>
+					<path d="M5482.8 1489.9 L5734.75 1607 L5734.75 2296 L5734.75 2296 L5734.75 2985 L5734.75 2985 L33102.25 3171.187051999927 L33102.3 3171.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5600.8 1484.1 L5604.4 1494.2 L5593.8 1492.1 L5590.3 1482.0 Z"></path>
+						<path d="M5476.6 1481.1 L5482.8 1489.9 L5472.1 1490.8 L5465.8 1482.0 Z"></path>
 					</g>
-					<path d="M5775.7 1454.8 L6465.75 1607 L6465.75 2236 L6465.75 2236 L6465.75 2865 L6465.75 2865 L12887.75 3049.0637774704164 L12887.8 3049.1 " fill="none"></path>
+					<path d="M5560.4 1443.2 L6465.75 1607 L6465.75 2296 L6465.75 2296 L6465.75 2985 L6465.75 2985 L12544.5 3168.928107888866 L12544.5 3168.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5767.8 1447.5 L5775.7 1454.8 L5765.5 1458.0 L5757.5 1450.7 Z"></path>
+						<path d="M5552.1 1436.3 L5560.4 1443.2 L5550.2 1446.8 L5542.0 1439.9 Z"></path>
 					</g>
-					<path d="M44211.0 156.2 L44211 203 L44211 524 L44211.0 524.0 " fill="none"></path>
+					<path d="M45457.3 156.2 L45457.25 203 L45457.25 524 L45457.3 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44216.3 146.8 L44211.0 156.2 L44205.7 146.8 L44211.0 137.5 Z"></path>
+						<path d="M45462.6 146.8 L45457.3 156.2 L45451.9 146.8 L45457.3 137.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M9282.8 1440.4 L9384 1607 L8925.89546899841 2190 L8925.9 2190.0 " fill="none"></path>
+						<path d="M7998.3 1439.9 L8115.25 1607 L8838.041727140784 2250 L8838.0 2250.0 " fill="none"></path>
 					</g>
-					<path d="M9287.4 1437.6 L9282.8 1440.4 L9278.2 1443.2 L9275.9 1429.0 Z"></path>
+					<path d="M8002.7 1436.9 L7998.3 1439.9 L7994.0 1443.0 L7990.7 1429.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M10178.5 1472.3 L10178.5 1607 L8983.99880763116 2190 L8984.0 2190.0 " fill="none"></path>
+						<path d="M8889.8 1472.3 L8889.75 1607 L8889.75 2250 L8889.8 2250.0 " fill="none"></path>
 					</g>
-					<path d="M10183.8 1472.3 L10178.5 1472.3 L10173.2 1472.3 L10178.5 1459.0 Z"></path>
-					<path d="M18486.1 1104.3 L18324 1174 L18324 1375 L18324.0 1375.0 " fill="none"></path>
+					<path d="M8895.1 1472.3 L8889.8 1472.3 L8884.4 1472.3 L8889.8 1459.0 Z"></path>
+					<path d="M19448.9 1070.4 L19024.75 1174 L19024.75 1375 L19024.8 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18496.8 1105.6 L18486.1 1104.3 L18492.6 1095.8 L18503.3 1097.0 Z"></path>
+						<path d="M19459.2 1073.3 L19448.9 1070.4 L19456.7 1063.0 L19467.0 1065.9 Z"></path>
 					</g>
-					<path d="M18601.9 1162.7 L18596.25 1174 L15326.75 1385.2029688199314 L15326.8 1385.2 " fill="none"></path>
+					<path d="M19565.7 1162.7 L19560 1174 L13952 1387.3799648506151 L13952.0 1387.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18610.8 1156.7 L18601.9 1162.7 L18601.3 1152.0 L18610.3 1146.0 Z"></path>
+						<path d="M19574.6 1156.7 L19565.7 1162.7 L19565.1 1152.0 L19574.0 1146.0 Z"></path>
 					</g>
-					<path d="M18846.2 1157.2 L18868.5 1174 L18868.5 1390.5 L18868.5 1390.5 L18868.5 1607 L18868.5 1607 L13480.25 2231.8830145194747 L13480.3 2231.9 " fill="none"></path>
+					<path d="M19819.8 1084.9 L20095.25 1174 L20095.25 1390.5 L20095.25 1390.5 L20095.25 1607 L20095.25 1607 L14109 2291.938140905883 L14109.0 2291.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18842.0 1147.4 L18846.2 1157.2 L18835.6 1155.9 L18831.3 1146.0 Z"></path>
+						<path d="M19812.5 1077.0 L19819.8 1084.9 L19809.2 1087.1 L19802.0 1079.2 Z"></path>
 					</g>
-					<path d="M18855.4 1104.3 L19017.5 1174 L19017.5 1375 L19017.5 1375.0 " fill="none"></path>
+					<path d="M19820.1 1070.4 L20244.25 1174 L20244.25 1375 L20244.3 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18848.9 1095.8 L18855.4 1104.3 L18844.7 1105.6 L18838.3 1097.0 Z"></path>
+						<path d="M19812.3 1063.0 L19820.1 1070.4 L19809.8 1073.3 L19802.0 1065.9 Z"></path>
 					</g>
-					<path d="M11699.7 1510.7 L11610 1607 L21401.75 2234.1426062164296 L21401.8 2234.1 " fill="none"></path>
+					<path d="M10410.9 1510.7 L10321.25 1607 L24358.75 2294.579532932855 L24358.8 2294.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11709.9 1507.5 L11699.7 1510.7 L11702.1 1500.2 L11712.4 1497.0 Z"></path>
+						<path d="M10421.2 1507.5 L10410.9 1510.7 L10413.4 1500.2 L10423.6 1497.0 Z"></path>
 					</g>
-					<path d="M11905.5 1511.8 L11979.25 1607 L13409.25 2220.7632207437737 L13409.3 2220.8 " fill="none"></path>
+					<path d="M10616.7 1511.8 L10690.5 1607 L14038 2288.7698788057937 L14038.0 2288.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11904.0 1501.1 L11905.5 1511.8 L11895.5 1507.6 L11894.0 1497.0 Z"></path>
+						<path d="M10615.2 1501.1 L10616.7 1511.8 L10606.8 1507.6 L10605.3 1497.0 Z"></path>
 					</g>
-					<path d="M15218.1 1449.1 L15146.25 1607 L15146.25 2159.5 L15146.3 2159.5 " fill="none"></path>
-					<path d="M15222.9 1451.3 L15218.1 1449.1 L15213.2 1446.9 L15223.6 1437.0 Z"></path>
-					<path d="M43097.8 2383.4 L43018 2865 L43018 3036 L43018.0 3036.0 " fill="none"></path>
+					<path d="M13965.0 1411.0 L14873 1607 L14873 2219.5 L14873.0 2219.5 " fill="none"></path>
+					<path d="M13966.2 1405.8 L13965.0 1411.0 L13963.9 1416.2 L13952.0 1408.2 Z"></path>
+					<path d="M44346.2 2443.5 L44264.25 2985 L44264.25 3156 L44264.3 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43104.6 2375.1 L43097.8 2383.4 L43094.1 2373.3 L43100.9 2365.0 Z"></path>
+						<path d="M44352.9 2435.0 L44346.2 2443.5 L44342.3 2433.4 L44349.0 2425.0 Z"></path>
 					</g>
-					<path d="M43133.9 2383.6 L43172 2865 L31025 3050.3479648189814 L31025.0 3050.3 " fill="none"></path>
+					<path d="M44379.2 2443.6 L44418.25 2985 L31416.5 3170.423263683114 L31416.5 3170.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43138.5 2373.9 L43133.9 2383.6 L43127.9 2374.7 L43132.5 2365.0 Z"></path>
+						<path d="M44383.8 2433.9 L44379.2 2443.6 L44373.2 2434.7 L44377.8 2425.0 Z"></path>
 					</g>
-					<path d="M43158.3 2383.1 L43276.25 2865 L26828.5 3050.861543238863 L26828.5 3050.9 " fill="none"></path>
+					<path d="M44401.4 2443.2 L44522.5 2985 L27529.75 3170.881952285291 L27529.8 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43161.2 2372.8 L43158.3 2383.1 L43150.9 2375.3 L43153.8 2365.0 Z"></path>
+						<path d="M44404.6 2432.9 L44401.4 2443.2 L44394.2 2435.3 L44397.3 2425.0 Z"></path>
 					</g>
-					<path d="M43167.5 2382.8 L43316.25 2865 L34237 3050.427779450817 L34237.0 3050.4 " fill="none"></path>
+					<path d="M44409.9 2443.0 L44562.5 2985 L35023.25 3170.4792008757527 L35023.3 3170.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43169.9 2372.3 L43167.5 2382.8 L43159.7 2375.5 L43162.0 2365.0 Z"></path>
+						<path d="M44412.5 2432.5 L44409.9 2443.0 L44402.2 2435.4 L44404.8 2425.0 Z"></path>
 					</g>
-					<path d="M42548.7 687.2 L43122.25 876 L43122.25 1025 L43122.25 1025 L43122.25 1174 L43122.25 1174 L43122.25 1390.5 L43122.25 1390.5 L43122.25 1607 L43122.25 1607 L43122.25 2107 L43122.3 2107.0 " fill="none"></path>
-					<path d="M42550.3 682.1 L42548.7 687.2 L42547.0 692.3 L42536.0 683.0 Z"></path>
-					<path d="M15279.3 1448.5 L15373.75 1607 L15373.75 2205 L15373.8 2205.0 " fill="none"></path>
-					<path d="M15283.9 1445.7 L15279.3 1448.5 L15274.7 1451.2 L15272.5 1437.0 Z"></path>
-					<path d="M6646.8 2293.2 L6646.75 2865 L28529.25 3050.896838772861 L28529.3 3050.9 " fill="none"></path>
+					<path d="M43794.9 687.2 L44368.5 876 L44368.5 1025 L44368.5 1025 L44368.5 1174 L44368.5 1174 L44368.5 1390.5 L44368.5 1390.5 L44368.5 1607 L44368.5 1607 L44368.5 2167 L44368.5 2167.0 " fill="none"></path>
+					<path d="M43796.6 682.1 L43794.9 687.2 L43793.2 692.3 L43782.3 683.0 Z"></path>
+					<path d="M13965.1 1407.2 L15100.5 1607 L15100.5 2265 L15100.5 2265.0 " fill="none"></path>
+					<path d="M13966.1 1402.0 L13965.1 1407.2 L13964.2 1412.5 L13952.0 1404.9 Z"></path>
+					<path d="M6646.8 2353.2 L6646.75 2985 L29116.75 3170.9125593363206 L29116.8 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6652.1 2283.8 L6646.8 2293.2 L6641.4 2283.8 L6646.8 2274.5 Z"></path>
+						<path d="M6652.1 2343.8 L6646.8 2353.2 L6641.4 2343.8 L6646.8 2334.5 Z"></path>
 					</g>
-					<path d="M5770.6 1443.8 L6646.75 1607 L6646.75 2197.5 L6646.8 2197.5 " fill="none"></path>
-					<path d="M5771.6 1438.6 L5770.6 1443.8 L5769.6 1449.0 L5757.5 1441.4 Z"></path>
-					<path d="M21084.1 1063.9 L20401.5 1174 L20401.5 1375 L20401.5 1375.0 " fill="none"></path>
+					<path d="M5555.2 1435.5 L6646.75 1607 L6646.75 2257.5 L6646.8 2257.5 " fill="none"></path>
+					<path d="M5556.0 1430.2 L5555.2 1435.5 L5554.3 1440.7 L5542.0 1433.4 Z"></path>
+					<path d="M24749.2 1138.7 L24721.75 1174 L24721.75 1375 L24721.8 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21094.1 1067.7 L21084.1 1063.9 L21092.4 1057.1 L21102.5 1060.9 Z"></path>
+						<path d="M24759.2 1134.6 L24749.2 1138.7 L24750.7 1128.1 L24760.7 1124.0 Z"></path>
 					</g>
-					<path d="M21084.1 1069.3 L20515 1174 L20515 1390.5 L20515 1390.5 L20515 1607 L20515 1607 L15588.25 2230.4949449222877 L15588.3 2230.5 " fill="none"></path>
+					<path d="M24835.8 1142.7 L24835.25 1174 L24835.25 1390.5 L24835.25 1390.5 L24835.25 1607 L24835.25 1607 L15535 2292.792347826087 L15535.0 2292.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21094.3 1072.9 L21084.1 1069.3 L21092.4 1062.4 L21102.5 1065.9 Z"></path>
+						<path d="M24841.3 1133.4 L24835.8 1142.7 L24830.6 1133.2 L24836.1 1124.0 Z"></path>
 					</g>
-					<path d="M21566.1 1043.8 L23234.75 1174 L23234.75 1375 L23234.8 1375.0 " fill="none"></path>
+					<path d="M24926.3 1138.7 L24953.75 1174 L24953.75 1375 L24953.8 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21557.2 1037.8 L21566.1 1043.8 L21556.4 1048.4 L21547.5 1042.4 Z"></path>
+						<path d="M24924.8 1128.1 L24926.3 1138.7 L24916.3 1134.6 L24914.8 1124.0 Z"></path>
 					</g>
-					<path d="M21566.1 1041.4 L23521.25 1174 L23521.25 1375 L23521.3 1375.0 " fill="none"></path>
+					<path d="M25078.7 1065.5 L25724.25 1174 L25724.25 1375 L25724.3 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21557.2 1035.4 L21566.1 1041.4 L21556.5 1046.0 L21547.5 1040.1 Z"></path>
+						<path d="M25070.3 1058.7 L25078.7 1065.5 L25068.6 1069.2 L25060.3 1062.4 Z"></path>
 					</g>
-					<path d="M24942.8 1463.1 L24929.5 1607 L24929.5 2220.5 L24929.5 2220.5 " fill="none"></path>
+					<path d="M25957.2 1454.0 L25699.25 1607 L25699.25 2280.5 L25699.3 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24949.0 1454.3 L24942.8 1463.1 L24938.3 1453.3 L24944.5 1444.5 Z"></path>
+						<path d="M25967.9 1453.8 L25957.2 1454.0 L25962.5 1444.7 L25973.2 1444.5 Z"></path>
 					</g>
-					<path d="M25005.5 1459.0 L25126.5 1607 L13895.25 2231.9933647402295 L13895.3 2232.0 " fill="none"></path>
+					<path d="M26108.3 1460.3 L26200.75 1607 L14469 2291.797267817431 L14469.0 2291.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25003.7 1448.4 L25005.5 1459.0 L24995.4 1455.1 L24993.6 1444.5 Z"></path>
+						<path d="M26107.8 1449.6 L26108.3 1460.3 L26098.8 1455.2 L26098.3 1444.5 Z"></path>
 					</g>
-					<path d="M21560.8 1034.7 L24949.5 1174 L24949.5 1336.5 L24949.5 1336.5 " fill="none"></path>
-					<path d="M21561.0 1029.4 L21560.8 1034.7 L21560.6 1040.0 L21547.5 1034.1 Z"></path>
-					<path d="M15338.9 1433.5 L15718.25 1607 L15718.25 2197.5 L15718.3 2197.5 " fill="none"></path>
-					<path d="M15341.1 1428.7 L15338.9 1433.5 L15336.7 1438.4 L15326.8 1428.0 Z"></path>
-					<path d="M5770.7 1433.4 L6928.25 1607 L6928.25 2205 L6928.3 2205.0 " fill="none"></path>
-					<path d="M5771.5 1428.1 L5770.7 1433.4 L5769.9 1438.7 L5757.5 1431.4 Z"></path>
-					<path d="M17081.3 2279.5 L16867 2865 L12151.75 3045.824371562227 L12151.8 3045.8 " fill="none"></path>
-					<path d="M17086.3 2281.4 L17081.3 2279.5 L17076.3 2277.7 L17085.9 2267.0 Z"></path>
-					<path d="M13798.5 1440.2 L13798.5 1607 L26742 2215.889499663451 L26742.0 2215.9 " fill="none"></path>
+					<path d="M25073.5 1053.6 L26064.25 1174 L26064.25 1336.5 L26064.3 1336.5 " fill="none"></path>
+					<path d="M25074.1 1048.3 L25073.5 1053.6 L25072.8 1058.9 L25060.3 1052.0 Z"></path>
+					<path d="M13965.2 1404.7 L15318 1607 L15318 2257.5 L15318.0 2257.5 " fill="none"></path>
+					<path d="M13966.0 1399.5 L13965.2 1404.7 L13964.4 1410.0 L13952.0 1402.8 Z"></path>
+					<path d="M5555.2 1427.8 L6928.25 1607 L6928.25 2265 L6928.3 2265.0 " fill="none"></path>
+					<path d="M5555.9 1422.6 L5555.2 1427.8 L5554.5 1433.1 L5542.0 1426.1 Z"></path>
+					<path d="M16809.4 2339.6 L16593.75 2985 L11808.5 3165.9049054882685 L11808.5 3165.9 " fill="none"></path>
+					<path d="M16814.5 2341.3 L16809.4 2339.6 L16804.4 2338.0 L16813.6 2327.0 Z"></path>
+					<path d="M12546.5 1440.2 L12546.5 1607 L27443.25 2276.7789940780135 L27443.3 2276.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13803.8 1430.8 L13798.5 1440.2 L13793.2 1430.8 L13798.5 1421.5 Z"></path>
+						<path d="M12551.8 1430.8 L12546.5 1440.2 L12541.2 1430.8 L12546.5 1421.5 Z"></path>
 					</g>
-					<path d="M8905.0 1455.7 L8905 1607 L7648.007750397456 2220.5 L7648.0 2220.5 " fill="none"></path>
+					<path d="M7616.3 1455.7 L7616.25 1607 L7616.25 2280.5 L7616.3 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8910.3 1446.3 L8905.0 1455.7 L8899.7 1446.3 L8905.0 1437.0 Z"></path>
+						<path d="M7621.6 1446.3 L7616.3 1455.7 L7610.9 1446.3 L7616.3 1437.0 Z"></path>
 					</g>
-					<path d="M13093.2 1028.1 L8905 1174 L8905 1344 L8905.0 1344.0 " fill="none"></path>
-					<path d="M13093.4 1033.4 L13093.2 1028.1 L13093.0 1022.8 L13106.5 1027.6 Z"></path>
+					<path d="M14597.4 1026.9 L7616.25 1174 L7616.25 1344 L7616.3 1344.0 " fill="none"></path>
+					<path d="M14597.5 1032.2 L14597.4 1026.9 L14597.3 1021.6 L14610.8 1026.6 Z"></path>
 					<path d="M4294.0 1097.7 L4294 1174 L4294 1194 L4294.0 1194.0 " fill="none"></path>
 					<g fill="#eee8d5">
 						<path d="M4299.3 1088.3 L4294.0 1097.7 L4288.7 1088.3 L4294.0 1079.0 Z"></path>
 					</g>
-					<path d="M7287.2 551.3 L4294 876 L4294 971 L4294.0 971.0 " fill="none"></path>
-					<path d="M7287.8 556.7 L7287.2 551.3 L7286.7 546.0 L7300.5 549.9 Z"></path>
-					<path d="M36804.6 1065.6 L36371.5 1174 L36371.5 1306.5 L36371.5 1306.5 " fill="none"></path>
-					<path d="M36805.9 1070.7 L36804.6 1065.6 L36803.3 1060.4 L36817.5 1062.3 Z"></path>
-					<path d="M30702.1 2442.9 L30578.5 2865 L37659.25 3050.7001054666903 L37659.3 3050.7 " fill="none"></path>
+					<path d="M6299.1 556.9 L4294 876 L4294 971 L4294.0 971.0 " fill="none"></path>
+					<path d="M6299.9 562.1 L6299.1 556.9 L6298.2 551.6 L6312.3 554.8 Z"></path>
+					<path d="M38585.2 1070.4 L38216.25 1174 L38216.25 1306.5 L38216.3 1306.5 " fill="none"></path>
+					<path d="M38586.6 1075.6 L38585.2 1070.4 L38583.7 1065.3 L38598.0 1066.8 Z"></path>
+					<path d="M31098.9 2503.0 L30970 2985 L39165.25 3170.8084825091937 L39165.3 3170.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30709.9 2435.5 L30702.1 2442.9 L30699.6 2432.5 L30707.4 2425.0 Z"></path>
+						<path d="M31106.4 2495.4 L31098.9 2503.0 L31096.1 2492.6 L31103.7 2485.0 Z"></path>
 					</g>
-					<path d="M30815.3 2443.1 L30922.25 2865 L32242.75 3045.221917306989 L32242.8 3045.2 " fill="none"></path>
+					<path d="M31202.2 2503.2 L31313.75 2985 L33102.25 3166.8235213954754 L33102.3 3166.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30818.1 2432.7 L30815.3 2443.1 L30807.8 2435.4 L30810.7 2425.0 Z"></path>
+						<path d="M31205.3 2492.9 L31202.2 2503.2 L31194.9 2495.3 L31198.0 2485.0 Z"></path>
 					</g>
-					<path d="M30875.0 2441.4 L31106.5 2865 L31106.5 3051.5 L31106.5 3051.5 L31106.5 3238 L31106.5 3238 L31106.5 3394.5 L31106.5 3394.5 L31106.5 3551 L31106.5 3551 L36165.5 3586.1594557556773 L36165.5 3586.2 " fill="none"></path>
+					<path d="M31256.9 2501.7 L31498 2985 L31498 3171.5 L31498 3171.5 L31498 3358 L31498 3358 L31498 3514.5 L31498 3514.5 L31498 3671 L31498 3671 L37236.5 3706.1994384449245 L37236.5 3706.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30875.2 2430.6 L30875.0 2441.4 L30865.8 2435.7 L30866.0 2425.0 Z"></path>
+						<path d="M31257.5 2491.0 L31256.9 2501.7 L31247.9 2495.7 L31248.5 2485.0 Z"></path>
 					</g>
-					<path d="M30887.8 2440.9 L31146.5 2865 L31146.5 3051.5 L31146.5 3051.5 L31146.5 3238 L31146.5 3238 L38579.25 3391.5965899712805 L38579.3 3391.6 " fill="none"></path>
+					<path d="M31268.6 2501.3 L31538 2985 L31538 3171.5 L31538 3171.5 L31538 3358 L31538 3358 L39008.25 3511.6108957724273 L39008.3 3511.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30887.5 2430.2 L30887.8 2440.9 L30878.4 2435.7 L30878.1 2425.0 Z"></path>
+						<path d="M31268.7 2490.6 L31268.6 2501.3 L31259.4 2495.7 L31259.5 2485.0 Z"></path>
 					</g>
-					<path d="M30900.5 2440.5 L31186.5 2865 L34132 3048.2340727151436 L34132.0 3048.2 " fill="none"></path>
+					<path d="M31280.3 2500.9 L31578 2985 L34918.25 3168.614066760003 L34918.3 3168.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30899.7 2429.8 L30900.5 2440.5 L30890.9 2435.7 L30890.1 2425.0 Z"></path>
+						<path d="M31279.9 2490.2 L31280.3 2500.9 L31270.8 2495.7 L31270.5 2485.0 Z"></path>
 					</g>
-					<path d="M42549.2 605.4 L44392 876 L44392 1025 L44392 1025 L44392 1174 L44392 1174 L44392 1390.5 L44392 1390.5 L44392 1607 L44392 1607 L31182.25 2216.6397637434193 L31182.3 2216.6 " fill="none"></path>
-					<path d="M42550.0 600.2 L42549.2 605.4 L42548.4 610.7 L42536.0 603.5 Z"></path>
-					<path d="M3962.5 1594.0 L3941.25 1607 L30343.25 2226.162164681319 L30343.3 2226.2 " fill="none"></path>
+					<path d="M43795.4 605.4 L45638.25 876 L45638.25 1025 L45638.25 1025 L45638.25 1174 L45638.25 1174 L45638.25 1390.5 L45638.25 1390.5 L45638.25 1607 L45638.25 1607 L31573.75 2276.044497376415 L31573.8 2276.0 " fill="none"></path>
+					<path d="M43796.2 600.2 L43795.4 605.4 L43794.7 610.7 L43782.3 603.5 Z"></path>
+					<path d="M3962.5 1594.0 L3941.25 1607 L30734.75 2285.3787711755413 L30734.8 2285.4 " fill="none"></path>
 					<path d="M3965.3 1598.5 L3962.5 1594.0 L3959.7 1589.4 L3973.8 1587.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M42183.0 1061.9 L41814.25 1174 L41814.25 1390.5 L41814.25 1390.5 L41814.25 1607 L41814.25 1607 L31182.25 2212.124010315342 L31182.3 2212.1 " fill="none"></path>
+						<path d="M43429.2 1061.9 L43060.5 1174 L43060.5 1390.5 L43060.5 1390.5 L43060.5 1607 L43060.5 1607 L31573.75 2271.724052493438 L31573.8 2271.7 " fill="none"></path>
 					</g>
-					<path d="M42184.5 1067.0 L42183.0 1061.9 L42181.4 1056.8 L42195.8 1058.0 Z"></path>
+					<path d="M43430.8 1067.0 L43429.2 1061.9 L43427.7 1056.8 L43442.0 1058.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M17918.3 1412.3 L17552.25 1607 L30343.25 2216.026077741191 L30343.3 2216.0 " fill="none"></path>
+						<path d="M17438.1 1411.8 L17033 1607 L30734.75 2275.5318757192176 L30734.8 2275.5 " fill="none"></path>
 					</g>
-					<path d="M17920.8 1417.0 L17918.3 1412.3 L17915.8 1407.6 L17930.1 1406.0 Z"></path>
+					<path d="M17440.4 1416.6 L17438.1 1411.8 L17435.8 1407.0 L17450.1 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M27770.5 1039.8 L26773.75 1174 L26773.75 1390.5 L26773.75 1390.5 L26773.75 1607 L26773.75 1607 L30343.25 2169.8517172223615 L30343.3 2169.9 " fill="none"></path>
+						<path d="M28475.1 1042.7 L27685.5 1174 L27685.5 1390.5 L27685.5 1390.5 L27685.5 1607 L27685.5 1607 L30734.75 2212.6744504504504 L30734.8 2212.7 " fill="none"></path>
 					</g>
-					<path d="M27771.2 1045.1 L27770.5 1039.8 L27769.8 1034.5 L27783.8 1038.0 Z"></path>
-					<path d="M27900.5 2388.8 L27637.25 2865 L26828.5 3039.3217278243283 L26828.5 3039.3 " fill="none"></path>
+					<path d="M28476.0 1047.9 L28475.1 1042.7 L28474.3 1037.4 L28488.3 1040.5 Z"></path>
+					<path d="M28608.9 2449.2 L28338.5 2985 L27529.75 3159.3217278243283 L27529.8 3159.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27909.7 2383.2 L27900.5 2388.8 L27900.4 2378.1 L27909.5 2372.5 Z"></path>
+						<path d="M28617.9 2443.2 L28608.9 2449.2 L28608.4 2438.4 L28617.4 2432.5 Z"></path>
 					</g>
-					<path d="M28038.5 2390.1 L28203.5 2865 L34132 3049.862940979769 L34132.0 3049.9 " fill="none"></path>
+					<path d="M28735.2 2450.3 L28904.75 2985 L34918.25 3169.8858803165185 L34918.3 3169.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28040.5 2379.6 L28038.5 2390.1 L28030.4 2383.1 L28032.4 2372.5 Z"></path>
+						<path d="M28737.4 2439.8 L28735.2 2450.3 L28727.3 2443.0 L28729.5 2432.5 Z"></path>
 					</g>
-					<path d="M41338.8 1433.6 L41259.5 1607 L28333 2219.510339372481 L28333.0 2219.5 " fill="none"></path>
-					<path d="M41343.6 1435.8 L41338.8 1433.6 L41333.9 1431.4 L41344.3 1421.5 Z"></path>
-					<path d="M26141.2 1549.9 L26064.25 1607 L27637 2122.0382663022256 L27637.0 2122.0 " fill="none"></path>
-					<path d="M26144.4 1554.2 L26141.2 1549.9 L26138.0 1545.7 L26151.9 1542.0 Z"></path>
-					<path d="M4471.9 1601.3 L4476.75 1607 L4476.75 2236 L4476.75 2236 L4476.75 2865 L4476.75 2865 L14875.75 3050.1999140565317 L14875.8 3050.2 " fill="none"></path>
+					<path d="M42585.0 1433.6 L42505.75 1607 L29034.25 2278.649734071421 L29034.3 2278.6 " fill="none"></path>
+					<path d="M42589.9 1435.8 L42585.0 1433.6 L42580.2 1431.4 L42590.6 1421.5 Z"></path>
+					<path d="M26762.0 1549.9 L26685 1607 L28338.25 2176.188881948782 L28338.3 2176.2 " fill="none"></path>
+					<path d="M26765.1 1554.2 L26762.0 1549.9 L26758.8 1545.7 L26772.7 1542.0 Z"></path>
+					<path d="M4471.9 1601.3 L4476.75 1607 L4476.75 2296 L4476.75 2296 L4476.75 2985 L4476.75 2985 L14923.5 3170.2058152522636 L14923.5 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
 						<path d="M4470.0 1590.7 L4471.9 1601.3 L4461.8 1597.6 L4459.9 1587.0 Z"></path>
 					</g>
-					<path d="M4509.6 1600.0 L4516.75 1607 L4516.75 2236 L4516.75 2236 L4516.75 2865 L4516.75 2865 L26715.5 3051.0265274485796 L26715.5 3051.0 " fill="none"></path>
+					<path d="M4509.6 1600.0 L4516.75 1607 L4516.75 2296 L4516.75 2296 L4516.75 2985 L4516.75 2985 L27416.75 3171.04099056912 L27416.8 3171.0 " fill="none"></path>
 					<g fill="#eee8d5">
 						<path d="M4506.6 1589.7 L4509.6 1600.0 L4499.1 1597.3 L4496.2 1587.0 Z"></path>
 					</g>
-					<path d="M34827.2 544.6 L28712.75 876 L28712.75 926 L28712.8 926.0 " fill="none"></path>
-					<path d="M34827.5 550.0 L34827.2 544.6 L34826.9 539.3 L34840.5 543.9 Z"></path>
-					<path d="M29715.3 2353.7 L29715.25 2865 L15021.75 3050.578014424542 L15021.8 3050.6 " fill="none"></path>
+					<path d="M35461.7 544.7 L29414 876 L29414 926 L29414.0 926.0 " fill="none"></path>
+					<path d="M35462.0 550.0 L35461.7 544.7 L35461.4 539.4 L35475.0 544.0 Z"></path>
+					<path d="M30106.8 2413.7 L30106.75 2985 L15069.5 3170.5989890968053 L15069.5 3170.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29720.6 2344.3 L29715.3 2353.7 L29709.9 2344.3 L29715.3 2335.0 Z"></path>
+						<path d="M30112.1 2404.3 L30106.8 2413.7 L30101.4 2404.3 L30106.8 2395.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M31508.2 1031.3 L29596.75 1174 L29596.75 1390.5 L29596.75 1390.5 L29596.75 1607 L29596.75 1607 L29696.598966613674 2137 L29696.6 2137.0 " fill="none"></path>
+						<path d="M31038.0 1036.1 L29988.25 1174 L29988.25 1390.5 L29988.25 1390.5 L29988.25 1607 L29988.25 1607 L30089.723149492016 2197 L30089.7 2197.0 " fill="none"></path>
 					</g>
-					<path d="M31508.6 1036.6 L31508.2 1031.3 L31507.8 1026.0 L31521.5 1030.3 Z"></path>
-					<path d="M18622.0 1440.2 L18622 1607 L27637 2212.621595642422 L27637.0 2212.6 " fill="none"></path>
+					<path d="M31038.7 1041.4 L31038.0 1036.1 L31037.3 1030.8 L31051.3 1034.4 Z"></path>
+					<path d="M18480.8 1440.2 L18480.75 1607 L28338.25 2272.5056097202487 L28338.3 2272.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18627.3 1430.8 L18622.0 1440.2 L18616.7 1430.8 L18622.0 1421.5 Z"></path>
+						<path d="M18486.1 1430.8 L18480.8 1440.2 L18475.4 1430.8 L18480.8 1421.5 Z"></path>
 					</g>
-					<path d="M29928.0 1478.2 L29928 1607 L29748.735294117647 2137 L29748.7 2137.0 " fill="none"></path>
+					<path d="M30708.3 1478.2 L30708.25 1607 L30193.177431059506 2197 L30193.2 2197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29933.3 1468.8 L29928.0 1478.2 L29922.7 1468.8 L29928.0 1459.5 Z"></path>
+						<path d="M30713.6 1468.8 L30708.3 1478.2 L30702.9 1468.8 L30708.3 1459.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M31508.2 1032.6 L29928 1174 L29928 1321.5 L29928.0 1321.5 " fill="none"></path>
+						<path d="M31038.7 1055.2 L30708.25 1174 L30708.25 1321.5 L30708.3 1321.5 " fill="none"></path>
 					</g>
-					<path d="M31508.7 1037.9 L31508.2 1032.6 L31507.7 1027.3 L31521.5 1031.4 Z"></path>
-					<path d="M26979.8 2484.8 L26690 2865 L37659.25 3050.9828746107864 L37659.3 3051.0 " fill="none"></path>
+					<path d="M31040.5 1060.2 L31038.7 1055.2 L31036.9 1050.2 L31051.3 1050.7 Z"></path>
+					<path d="M27697.2 2545.3 L27391.25 2985 L39165.25 3171.0181286797406 L39165.3 3171.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26989.7 2480.7 L26979.8 2484.8 L26981.2 2474.2 L26991.1 2470.0 Z"></path>
+						<path d="M27706.9 2540.7 L27697.2 2545.3 L27698.2 2534.6 L27707.9 2530.0 Z"></path>
 					</g>
-					<path d="M27243.2 2487.9 L27353.5 2865 L26820.32841823056 3036 L26820.3 3036.0 " fill="none"></path>
+					<path d="M27938.1 2548.0 L28054.75 2985 L27521.57841823056 3156 L27521.6 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27245.7 2477.5 L27243.2 2487.9 L27235.5 2480.5 L27238.0 2470.0 Z"></path>
+						<path d="M27940.8 2537.6 L27938.1 2548.0 L27930.5 2540.4 L27933.2 2530.0 Z"></path>
 					</g>
-					<path d="M27307.9 2486.3 L27517.25 2865 L27517.25 3051.5 L27517.25 3051.5 L27517.25 3238 L27517.25 3238 L27517.25 3394.5 L27517.25 3394.5 L27517.25 3551 L27517.25 3551 L36165.5 3586.2999942510564 L36165.5 3586.3 " fill="none"></path>
+					<path d="M27997.3 2546.7 L28218.5 2985 L28218.5 3171.5 L28218.5 3171.5 L28218.5 3358 L28218.5 3358 L28218.5 3514.5 L28218.5 3514.5 L28218.5 3671 L28218.5 3671 L37236.5 3706.3081504356455 L37236.5 3706.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27308.1 2475.6 L27307.9 2486.3 L27298.7 2480.7 L27298.9 2470.0 Z"></path>
+						<path d="M27997.8 2535.9 L27997.3 2546.7 L27988.3 2540.7 L27988.9 2530.0 Z"></path>
 					</g>
-					<path d="M27323.5 2485.9 L27557.25 2865 L27557.25 3051.5 L27557.25 3051.5 L27557.25 3238 L27557.25 3238 L38579.25 3392.530167973124 L38579.3 3392.5 " fill="none"></path>
+					<path d="M28011.6 2546.3 L28258.5 2985 L28258.5 3171.5 L28258.5 3171.5 L28258.5 3358 L28258.5 3358 L39008.25 3512.4809233029546 L39008.3 3512.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27323.2 2475.1 L27323.5 2485.9 L27314.1 2480.7 L27313.8 2470.0 Z"></path>
+						<path d="M28011.7 2535.5 L28011.6 2546.3 L28002.4 2540.7 L28002.4 2530.0 Z"></path>
 					</g>
-					<path d="M27339.1 2485.4 L27597.25 2865 L34132 3050.0136058294433 L34132.0 3050.0 " fill="none"></path>
+					<path d="M28025.9 2545.9 L28298.5 2985 L34918.25 3170.032541496497 L34918.3 3170.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27338.3 2474.7 L27339.1 2485.4 L27329.5 2480.7 L27328.6 2470.0 Z"></path>
+						<path d="M28025.5 2535.1 L28025.9 2545.9 L28016.4 2540.7 L28016.0 2530.0 Z"></path>
 					</g>
-					<path d="M41346.5 1434.4 L41299.5 1607 L27597 2216.9697452229298 L27597.0 2217.0 " fill="none"></path>
-					<path d="M41351.7 1435.8 L41346.5 1434.4 L41341.4 1433.0 L41350.1 1421.5 Z"></path>
+					<path d="M42592.8 1434.4 L42545.75 1607 L28298.25 2275.9286201022146 L28298.3 2275.9 " fill="none"></path>
+					<path d="M42597.9 1435.8 L42592.8 1434.4 L42587.7 1433.0 L42596.3 1421.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M42183.1 1065.1 L41854.25 1174 L41854.25 1390.5 L41854.25 1390.5 L41854.25 1607 L41854.25 1607 L27597 2217.6886565995337 L27597.0 2217.7 " fill="none"></path>
+						<path d="M43429.3 1065.1 L43100.5 1174 L43100.5 1390.5 L43100.5 1390.5 L43100.5 1607 L43100.5 1607 L28298.25 2276.659728491932 L28298.3 2276.7 " fill="none"></path>
 					</g>
-					<path d="M42184.8 1070.2 L42183.1 1065.1 L42181.4 1060.1 L42195.8 1060.9 Z"></path>
+					<path d="M43431.0 1070.2 L43429.3 1065.1 L43427.7 1060.1 L43442.0 1060.9 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M17921.5 1412.8 L17592.25 1607 L26742 2207.923307838889 L26742.0 2207.9 " fill="none"></path>
+						<path d="M17441.2 1412.2 L17073 1607 L27443.25 2268.7214002917276 L27443.3 2268.7 " fill="none"></path>
 					</g>
-					<path d="M17924.2 1417.4 L17921.5 1412.8 L17918.8 1408.2 L17933.0 1406.0 Z"></path>
+					<path d="M17443.7 1416.9 L17441.2 1412.2 L17438.7 1407.5 L17453.0 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M27793.3 1043.2 L27169.5 1174 L27169.5 1390.5 L27169.5 1390.5 L27169.5 1607 L27169.5 1607 L27169.5 2002 L27169.5 2002.0 " fill="none"></path>
+						<path d="M28494.5 1043.2 L27870.75 1174 L27870.75 1390.5 L27870.75 1390.5 L27870.75 1607 L27870.75 1607 L27870.75 2062 L27870.8 2062.0 " fill="none"></path>
 					</g>
-					<path d="M27794.4 1048.5 L27793.3 1043.2 L27792.2 1038.0 L27806.3 1040.5 Z"></path>
-					<path d="M17099.8 2280.3 L17133 2865 L12584.75 3043.776252700353 L12584.8 3043.8 " fill="none"></path>
-					<path d="M17105.1 2280.0 L17099.8 2280.3 L17094.4 2280.6 L17099.0 2267.0 Z"></path>
-					<path d="M29100.8 1112.7 L29100.75 1174 L29100.75 1375 L29100.8 1375.0 " fill="none"></path>
+					<path d="M28495.6 1048.5 L28494.5 1043.2 L28493.4 1038.0 L28507.6 1040.5 Z"></path>
+					<path d="M16818.8 2340.2 L16742.75 2985 L12241.5 3163.698978234261 L12241.5 3163.7 " fill="none"></path>
+					<path d="M16824.1 2340.9 L16818.8 2340.2 L16813.5 2339.6 L16820.3 2327.0 Z"></path>
+					<path d="M29802.0 1112.7 L29802 1174 L29802 1375 L29802.0 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29106.1 1103.3 L29100.8 1112.7 L29095.4 1103.3 L29100.8 1094.0 Z"></path>
+						<path d="M29807.3 1103.3 L29802.0 1112.7 L29796.7 1103.3 L29802.0 1094.0 Z"></path>
 					</g>
-					<path d="M34827.2 545.0 L29100.75 876 L29100.75 956 L29100.8 956.0 " fill="none"></path>
-					<path d="M34827.5 550.3 L34827.2 545.0 L34826.9 539.7 L34840.5 544.2 Z"></path>
-					<path d="M16560.3 2322.2 L16331 2865 L26715.5 3050.490781534336 L26715.5 3050.5 " fill="none"></path>
+					<path d="M35461.7 545.0 L29802 876 L29802 956 L29802.0 956.0 " fill="none"></path>
+					<path d="M35462.0 550.4 L35461.7 545.0 L35461.4 539.7 L35475.0 544.3 Z"></path>
+					<path d="M16290.2 2382.4 L16057.75 2985 L27416.75 3170.5769348692565 L27416.8 3170.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16568.9 2315.7 L16560.3 2322.2 L16559.1 2311.5 L16567.6 2305.0 Z"></path>
+						<path d="M16298.5 2375.6 L16290.2 2382.4 L16288.6 2371.8 L16296.9 2365.0 Z"></path>
 					</g>
-					<path d="M16628.4 2322.5 L16827 2865 L10440.75 3048.582231898578 L10440.8 3048.6 " fill="none"></path>
+					<path d="M16352.5 2382.7 L16553.75 2985 L11472.5 3167.8475471516085 L11472.5 3167.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16630.2 2311.9 L16628.4 2322.5 L16620.2 2315.6 L16622.0 2305.0 Z"></path>
+						<path d="M16354.6 2372.2 L16352.5 2382.7 L16344.5 2375.5 L16346.6 2365.0 Z"></path>
 					</g>
-					<path d="M19269.0 1510.1 L19170.5 1607 L19170.5 2220.5 L19170.5 2220.5 " fill="none"></path>
+					<path d="M19119.2 1505.6 L18924.5 1607 L21885.60286647315 2280.5 L21885.6 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19279.4 1507.3 L19269.0 1510.1 L19271.9 1499.7 L19282.3 1497.0 Z"></path>
+						<path d="M19129.9 1506.0 L19119.2 1505.6 L19125.0 1496.6 L19135.7 1497.0 Z"></path>
 					</g>
-					<path d="M19514.5 1510.0 L19615.25 1607 L15588.25 2229.278098513696 L15588.3 2229.3 " fill="none"></path>
+					<path d="M19464.3 1510.0 L19565 1607 L15535 2288.642322327237 L15535.0 2288.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19511.5 1499.6 L19514.5 1510.0 L19504.1 1507.3 L19501.1 1497.0 Z"></path>
+						<path d="M19461.2 1499.6 L19464.3 1510.0 L19453.8 1507.3 L19450.8 1497.0 Z"></path>
 					</g>
-					<path d="M20050.9 1515.6 L20042.5 1607 L20702.817170111288 2220.5 L20702.8 2220.5 " fill="none"></path>
+					<path d="M19705.7 1510.0 L19605 1607 L22123.293722786646 2280.5 L22123.3 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20057.1 1506.8 L20050.9 1515.6 L20046.5 1505.8 L20052.7 1497.0 Z"></path>
+						<path d="M19716.2 1507.3 L19705.7 1510.0 L19708.8 1499.6 L19719.2 1497.0 Z"></path>
 					</g>
-					<path d="M20176.8 1510.5 L20268.75 1607 L15588.25 2230.2079805249787 L15588.3 2230.2 " fill="none"></path>
+					<path d="M19893.8 1513.6 L19942.5 1607 L15535 2289.2663446416536 L15535.0 2289.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20174.3 1500.1 L20176.8 1510.5 L20166.5 1507.4 L20164.0 1497.0 Z"></path>
+						<path d="M19894.3 1502.8 L19893.8 1513.6 L19884.8 1507.7 L19885.2 1497.0 Z"></path>
 					</g>
-					<path d="M10165.9 3000.9 L10177.75 2998 L10185.25 2998 L10185.25 2998 L10192.75 3051.5 L10192.75 3051.5 L10185.25 3105 L10185.25 3105 L10177.75 3105 L10177.75 3105 L10147.75 3097.7539503386006 L10147.8 3097.8 " fill="none"></path>
+					<path d="M11197.6 3120.9 L11209.5 3118 L11217 3118 L11217 3118 L11224.5 3171.5 L11224.5 3171.5 L11217 3225 L11217 3225 L11209.5 3225 L11209.5 3225 L11179.5 3217.7539503386006 L11179.5 3217.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10155.6 2997.9 L10165.9 3000.9 L10158.1 3008.2 L10147.8 3005.2 Z"></path>
+						<path d="M11187.3 3117.9 L11197.6 3120.9 L11189.8 3128.2 L11179.5 3125.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3709.0 2264.8 L3751 2865 L9764.75 3045.744430119657 L9764.8 3045.7 " fill="none"></path>
+						<path d="M3708.3 2324.8 L3738 2985 L10796.5 3166.573827586207 L10796.5 3166.6 " fill="none"></path>
 					</g>
-					<path d="M3714.3 2264.4 L3709.0 2264.8 L3703.7 2265.2 L3708.1 2251.5 Z"></path>
-					<path d="M10849.5 1470.7 L10849.5 1607 L19598 2202.412951742047 L19598.0 2202.4 " fill="none"></path>
+					<path d="M3713.6 2324.6 L3708.3 2324.8 L3703.0 2325.1 L3707.7 2311.5 Z"></path>
+					<path d="M9560.8 1470.7 L9560.75 1607 L19704.25 2264.0340791576573 L19704.3 2264.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10854.8 1461.3 L10849.5 1470.7 L10844.2 1461.3 L10849.5 1452.0 Z"></path>
+						<path d="M9566.1 1461.3 L9560.8 1470.7 L9555.4 1461.3 L9560.8 1452.0 Z"></path>
 					</g>
-					<path d="M13093.2 1030.7 L10849.5 1174 L10849.5 1329 L10849.5 1329.0 " fill="none"></path>
-					<path d="M13093.5 1036.0 L13093.2 1030.7 L13092.9 1025.4 L13106.5 1029.9 Z"></path>
-					<path d="M45810.0 120.3 L45810 203 L45810 493 L45810.0 493.0 " fill="none"></path>
-					<path d="M45815.3 120.3 L45810.0 120.3 L45804.7 120.3 L45810.0 107.0 Z"></path>
-					<path d="M11368.5 1470.7 L11368.5 1607 L19598 2200.414593603118 L19598.0 2200.4 " fill="none"></path>
+					<path d="M14597.4 1027.6 L9560.75 1174 L9560.75 1329 L9560.8 1329.0 " fill="none"></path>
+					<path d="M14597.6 1032.9 L14597.4 1027.6 L14597.3 1022.3 L14610.8 1027.2 Z"></path>
+					<path d="M47056.3 120.3 L47056.25 203 L47056.25 493 L47056.3 493.0 " fill="none"></path>
+					<path d="M47061.6 120.3 L47056.3 120.3 L47050.9 120.3 L47056.3 107.0 Z"></path>
+					<path d="M10079.8 1470.7 L10079.75 1607 L19704.25 2262.3943961257164 L19704.3 2262.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11373.8 1461.3 L11368.5 1470.7 L11363.2 1461.3 L11368.5 1452.0 Z"></path>
+						<path d="M10085.1 1461.3 L10079.8 1470.7 L10074.4 1461.3 L10079.8 1452.0 Z"></path>
 					</g>
-					<path d="M13093.2 1032.3 L11368.5 1174 L11368.5 1329 L11368.5 1329.0 " fill="none"></path>
-					<path d="M13093.6 1037.6 L13093.2 1032.3 L13092.8 1027.0 L13106.5 1031.2 Z"></path>
-					<path d="M19839.7 2536.8 L19565 2865 L10147.75 3047.7831013399245 L10147.8 3047.8 " fill="none"></path>
+					<path d="M14597.4 1027.9 L10079.75 1174 L10079.75 1329 L10079.8 1329.0 " fill="none"></path>
+					<path d="M14597.6 1033.2 L14597.4 1027.9 L14597.3 1022.6 L14610.8 1027.5 Z"></path>
+					<path d="M19831.6 2594.3 L19352 2985 L11179.5 3167.229943806791 L11179.5 3167.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19849.8 2533.1 L19839.7 2536.8 L19841.6 2526.2 L19851.7 2522.5 Z"></path>
+						<path d="M19842.2 2592.5 L19831.6 2594.3 L19835.5 2584.3 L19846.1 2582.5 Z"></path>
 					</g>
-					<path d="M20106.9 2541.1 L20123.25 2865 L26715.5 3049.9151532242904 L26715.5 3049.9 " fill="none"></path>
+					<path d="M20708.7 2487.7 L22034.75 2985 L27416.75 3169.5624712696517 L27416.8 3169.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20111.8 2531.6 L20106.9 2541.1 L20101.1 2532.1 L20106.0 2522.5 Z"></path>
+						<path d="M20701.9 2479.4 L20708.7 2487.7 L20698.1 2489.4 L20691.3 2481.1 Z"></path>
 					</g>
-					<path d="M20358.2 2536.5 L20649.75 2865 L34132 3050.7765843476977 L34132.0 3050.8 " fill="none"></path>
+					<path d="M20708.8 2483.6 L22074.75 2985 L34918.25 3170.74075294665 L34918.3 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20356.0 2525.9 L20358.2 2536.5 L20348.0 2533.0 L20345.8 2522.5 Z"></path>
+						<path d="M20701.8 2475.4 L20708.8 2483.6 L20698.2 2485.4 L20691.3 2477.2 Z"></path>
 					</g>
-					<path d="M41354.6 1434.8 L41339.5 1607 L20585 2221.3910250376507 L20585.0 2221.4 " fill="none"></path>
-					<path d="M41359.9 1435.2 L41354.6 1434.8 L41349.3 1434.3 L41355.8 1421.5 Z"></path>
-					<path d="M20734.3 1490.9 L20671.75 1607 L20355.79511128776 1949.5 L20355.8 1949.5 " fill="none"></path>
+					<path d="M42600.9 1434.8 L42585.75 1607 L20691.25 2280.812332499553 L20691.3 2280.8 " fill="none"></path>
+					<path d="M42606.2 1435.2 L42600.9 1434.8 L42595.6 1434.3 L42602.0 1421.5 Z"></path>
+					<path d="M21724.5 1424.7 L20381 1607 L20273.9490203193 2009.5 L20273.9 2009.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20743.5 1485.2 L20734.3 1490.9 L20734.1 1480.2 L20743.2 1474.5 Z"></path>
+						<path d="M21734.5 1428.7 L21724.5 1424.7 L21733.0 1418.2 L21743.0 1422.2 Z"></path>
 					</g>
-					<path d="M20978.0 1482.7 L21233.75 1607 L21233.75 2220.5 L21233.8 2220.5 " fill="none"></path>
+					<path d="M22228.6 1415.1 L24190.75 1607 L24190.75 2280.5 L24190.8 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20972.0 1473.8 L20978.0 1482.7 L20967.3 1483.4 L20961.3 1474.5 Z"></path>
+						<path d="M22219.8 1408.9 L22228.6 1415.1 L22218.8 1419.5 L22210.0 1413.3 Z"></path>
 					</g>
-					<path d="M42003.7 2427.7 L41854.25 2865 L37720.25 3050.134109737063 L37720.3 3050.1 " fill="none"></path>
+					<path d="M43255.6 2487.8 L43100.5 2985 L39226.25 3170.043248607465 L39226.3 3170.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42011.8 2420.6 L42003.7 2427.7 L42001.7 2417.1 L42009.8 2410.0 Z"></path>
+						<path d="M43263.5 2480.5 L43255.6 2487.8 L43253.3 2477.3 L43261.2 2470.0 Z"></path>
 					</g>
-					<path d="M42044.8 2428.5 L41989.25 2865 L32334.75 3050.615612597289 L32334.8 3050.6 " fill="none"></path>
+					<path d="M43293.1 2488.5 L43235.5 2985 L33194.25 3170.6495204342114 L33194.3 3170.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42051.2 2419.9 L42044.8 2428.5 L42040.7 2418.6 L42047.1 2410.0 Z"></path>
+						<path d="M43299.5 2479.9 L43293.1 2488.5 L43288.9 2478.7 L43295.3 2470.0 Z"></path>
 					</g>
-					<path d="M42057.0 2428.6 L42029.25 2865 L38870.5 3029.5435025487045 L38870.5 3029.5 " fill="none"></path>
+					<path d="M43304.3 2488.6 L43275.5 2985 L40109.25 3149.58940143544 L40109.3 3149.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42062.9 2419.7 L42057.0 2428.6 L42052.3 2419.0 L42058.2 2410.0 Z"></path>
+						<path d="M43310.2 2479.6 L43304.3 2488.6 L43299.5 2479.0 L43305.4 2470.0 Z"></path>
 					</g>
-					<path d="M42116.6 2428.1 L42224.25 2865 L42224.25 3051.5 L42224.25 3051.5 L42224.25 3238 L42224.25 3238 L42224.25 3394.5 L42224.25 3394.5 L42224.25 3551 L42224.25 3551 L36263.5 3586.2105536835975 L36263.5 3586.2 " fill="none"></path>
+					<path d="M43358.7 2488.2 L43470.5 2985 L43470.5 3171.5 L43470.5 3171.5 L43470.5 3358 L43470.5 3358 L43470.5 3514.5 L43470.5 3514.5 L43470.5 3671 L43470.5 3671 L37334.5 3706.2187550525464 L37334.5 3706.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42119.5 2417.8 L42116.6 2428.1 L42109.2 2420.3 L42112.1 2410.0 Z"></path>
+						<path d="M43361.9 2477.9 L43358.7 2488.2 L43351.5 2480.3 L43354.6 2470.0 Z"></path>
 					</g>
-					<path d="M42128.7 2427.8 L42264.25 2865 L42264.25 3051.5 L42264.25 3051.5 L42264.25 3238 L42264.25 3238 L38860.25 3388.2965157285935 L38860.3 3388.3 " fill="none"></path>
+					<path d="M43369.8 2488.0 L43510.5 2985 L43510.5 3171.5 L43510.5 3171.5 L43510.5 3358 L43510.5 3358 L39289.25 3509.458846793145 L39289.3 3509.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42131.1 2417.3 L42128.7 2427.8 L42120.9 2420.5 L42123.2 2410.0 Z"></path>
+						<path d="M43372.4 2477.5 L43369.8 2488.0 L43362.2 2480.4 L43364.7 2470.0 Z"></path>
 					</g>
-					<path d="M42140.8 2427.5 L42304.25 2865 L34237 3050.2941439083716 L34237.0 3050.3 " fill="none"></path>
+					<path d="M43380.9 2487.7 L43550.5 2985 L35023.25 3170.358795419447 L35023.3 3170.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42142.5 2416.9 L42140.8 2427.5 L42132.5 2420.6 L42134.3 2410.0 Z"></path>
+						<path d="M43382.9 2477.1 L43380.9 2487.7 L43372.8 2480.6 L43374.8 2470.0 Z"></path>
 					</g>
-					<path d="M42549.2 604.3 L44432 876 L44432 1025 L44432 1025 L44432 1174 L44432 1174 L44432 1390.5 L44432 1390.5 L44432 1607 L44432 1607 L42499.25 2121.527457411914 L42499.3 2121.5 " fill="none"></path>
-					<path d="M42550.0 599.0 L42549.2 604.3 L42548.4 609.6 L42536.0 602.4 Z"></path>
+					<path d="M43795.4 604.3 L45678.25 876 L45678.25 1025 L45678.25 1025 L45678.25 1174 L45678.25 1174 L45678.25 1390.5 L45678.25 1390.5 L45678.25 1607 L45678.25 1607 L43745.5 2170.607977991747 L43745.5 2170.6 " fill="none"></path>
+					<path d="M43796.2 599.0 L43795.4 604.3 L43794.7 609.6 L43782.3 602.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M42232.3 1070.6 L42069.25 1174 L42069.25 1390.5 L42069.25 1390.5 L42069.25 1607 L42069.25 1607 L42069.25 2062 L42069.3 2062.0 " fill="none"></path>
+						<path d="M43478.5 1070.6 L43315.5 1174 L43315.5 1390.5 L43315.5 1390.5 L43315.5 1607 L43315.5 1607 L43315.5 2122 L43315.5 2122.0 " fill="none"></path>
 					</g>
-					<path d="M42235.1 1075.1 L42232.3 1070.6 L42229.4 1066.1 L42243.5 1063.5 Z"></path>
+					<path d="M43481.4 1075.1 L43478.5 1070.6 L43475.7 1066.1 L43489.8 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M27913.0 1048.2 L28090.75 1174 L28090.75 1390.5 L28090.75 1390.5 L28090.75 1607 L28090.75 1607 L41639.25 2216.6509997496155 L41639.3 2216.7 " fill="none"></path>
+						<path d="M28581.5 1053.8 L28581.5 1174 L28581.5 1390.5 L28581.5 1390.5 L28581.5 1607 L28581.5 1607 L42885.5 2275.8920863309354 L42885.5 2275.9 " fill="none"></path>
 					</g>
-					<path d="M27916.1 1043.9 L27913.0 1048.2 L27909.9 1052.6 L27902.1 1040.5 Z"></path>
-					<path d="M38449.0 3176.7 L38449 3238 L38579.25 3313.287626962142 L38579.3 3313.3 " fill="none"></path>
+					<path d="M28586.8 1053.8 L28581.5 1053.8 L28576.2 1053.8 L28581.5 1040.5 Z"></path>
+					<path d="M39687.8 3296.7 L39687.75 3358 L39289.25 3473.7054730983305 L39289.3 3473.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38454.3 3167.3 L38449.0 3176.7 L38443.7 3167.3 L38449.0 3158.0 Z"></path>
+						<path d="M39693.1 3287.3 L39687.8 3296.7 L39682.4 3287.3 L39687.8 3278.0 Z"></path>
 					</g>
-					<path d="M38889.1 3030.4 L42344.25 2865 L42145.32313195548 2410 L42145.3 2410.0 " fill="none"></path>
+					<path d="M40127.9 3150.5 L43590.5 2985 L43384.94847605225 2470 L43384.9 2470.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38879.6 3025.5 L38889.1 3030.4 L38880.1 3036.2 L38870.5 3031.3 Z"></path>
+						<path d="M40118.3 3145.6 L40127.9 3150.5 L40118.8 3156.2 L40109.3 3151.4 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M42376.2 1070.6 L42539.25 1174 L42539.25 1390.5 L42539.25 1390.5 L42539.25 1607 L42539.25 1607 L42539.25 2236 L42539.25 2236 L42539.25 2865 L42539.25 2865 L38870.5 3032.2811869690117 L38870.5 3032.3 " fill="none"></path>
+						<path d="M43622.5 1070.6 L43785.5 1174 L43785.5 1390.5 L43785.5 1390.5 L43785.5 1607 L43785.5 1607 L43785.5 2296 L43785.5 2296 L43785.5 2985 L43785.5 2985 L40109.25 3152.316362638033 L40109.3 3152.3 " fill="none"></path>
 					</g>
-					<path d="M42379.1 1066.1 L42376.2 1070.6 L42373.4 1075.1 L42365.0 1063.5 Z"></path>
+					<path d="M43625.3 1066.1 L43622.5 1070.6 L43619.6 1075.1 L43611.2 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M17924.7 1413.4 L17632.25 1607 L17632.25 2236 L17632.25 2236 L17632.25 2865 L17632.25 2865 L38027.5 3047.7237260859642 L38027.5 3047.7 " fill="none"></path>
+						<path d="M17444.3 1412.7 L17113 1607 L17113 2296 L17113 2296 L17113 2985 L17113 2985 L39266.25 3168.0178019690143 L39266.3 3168.0 " fill="none"></path>
 					</g>
-					<path d="M17927.7 1417.8 L17924.7 1413.4 L17921.8 1408.9 L17935.8 1406.0 Z"></path>
+					<path d="M17447.0 1417.3 L17444.3 1412.7 L17441.6 1408.1 L17455.8 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M27967.2 1043.2 L28591 1174 L28591 1390.5 L28591 1390.5 L28591 1607 L28591 1607 L28591 2236 L28591 2236 L28591 2865 L28591 2865 L38027.5 3043.5257912355446 L38027.5 3043.5 " fill="none"></path>
+						<path d="M28668.5 1043.2 L29292.25 1174 L29292.25 1390.5 L29292.25 1390.5 L29292.25 1607 L29292.25 1607 L29292.25 2296 L29292.25 2296 L29292.25 2985 L29292.25 2985 L39266.25 3163.938098215574 L39266.3 3163.9 " fill="none"></path>
 					</g>
-					<path d="M27968.3 1038.0 L27967.2 1043.2 L27966.1 1048.5 L27954.2 1040.5 Z"></path>
-					<path d="M21531.4 1477.6 L21499.75 1607 L21499.75 2236 L21499.75 2236 L21499.75 2865 L21499.75 2865 L11765.75 3048.6603773584907 L11765.8 3048.7 " fill="none"></path>
+					<path d="M28669.6 1038.0 L28668.5 1043.2 L28667.4 1048.5 L28655.4 1040.5 Z"></path>
+					<path d="M24488.4 1477.6 L24456.75 1607 L24456.75 2296 L24456.75 2296 L24456.75 2985 L24456.75 2985 L13286.5 3169.020636883599 L13286.5 3169.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21538.8 1469.8 L21531.4 1477.6 L21528.5 1467.3 L21535.9 1459.5 Z"></path>
+						<path d="M24495.8 1469.8 L24488.4 1477.6 L24485.5 1467.3 L24492.9 1459.5 Z"></path>
 					</g>
-					<path d="M21669.8 1404.1 L23419.5 1607 L12123 2233.0626899863432 L12123.0 2233.1 " fill="none"></path>
+					<path d="M24565.5 1475.1 L24652.5 1607 L12319 2293.0518709885764 L12319.0 2293.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21661.1 1397.7 L21669.8 1404.1 L21659.9 1408.3 L21651.3 1401.9 Z"></path>
+						<path d="M24564.8 1464.4 L24565.5 1475.1 L24555.9 1470.2 L24555.2 1459.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M31508.4 1039.5 L30726 1174 L30726 1329 L30726.0 1329.0 " fill="none"></path>
+						<path d="M31206.7 1057.6 L31506.25 1174 L31506.25 1329 L31506.3 1329.0 " fill="none"></path>
 					</g>
-					<path d="M31509.3 1044.8 L31508.4 1039.5 L31507.5 1034.3 L31521.5 1037.3 Z"></path>
-					<path d="M11783.6 3001.6 L11795.75 2998 L11803.25 2998 L11803.25 2998 L11810.75 3051.5 L11810.75 3051.5 L11803.25 3105 L11803.25 3105 L11795.75 3105 L11795.75 3105 L11765.75 3096.1080332409974 L11765.8 3096.1 " fill="none"></path>
+					<path d="M31208.6 1052.6 L31206.7 1057.6 L31204.7 1062.6 L31194.3 1052.8 Z"></path>
+					<path d="M13304.4 3121.6 L13316.5 3118 L13324 3118 L13324 3118 L13331.5 3171.5 L13331.5 3171.5 L13324 3225 L13324 3225 L13316.5 3225 L13316.5 3225 L13286.5 3216.1080332409974 L13286.5 3216.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11773.2 2999.1 L11783.6 3001.6 L11776.2 3009.4 L11765.8 3006.9 Z"></path>
+						<path d="M13293.9 3119.1 L13304.4 3121.6 L13297.0 3129.4 L13286.5 3126.9 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3716.5 2264.1 L3918.5 2865 L11464.75 3047.8532335076493 L11464.8 3047.9 " fill="none"></path>
+						<path d="M3715.7 2324.2 L3918.5 2985 L12985.5 3168.4548955790615 L12985.5 3168.5 " fill="none"></path>
 					</g>
-					<path d="M3721.5 2262.4 L3716.5 2264.1 L3711.4 2265.8 L3712.2 2251.5 Z"></path>
+					<path d="M3720.8 2322.7 L3715.7 2324.2 L3710.6 2325.8 L3711.8 2311.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M34827.2 549.1 L31593 876 L31593 994 L31593.0 994.0 " fill="none"></path>
+						<path d="M35461.7 546.7 L31122.75 876 L31122.75 994 L31122.8 994.0 " fill="none"></path>
 					</g>
-					<path d="M34827.8 554.4 L34827.2 549.1 L34826.7 543.8 L34840.5 547.7 Z"></path>
-					<path d="M43892.2 2495.5 L43790 2865 L37720.25 3050.567538215647 L37720.3 3050.6 " fill="none"></path>
+					<path d="M35462.1 552.0 L35461.7 546.7 L35461.3 541.4 L35475.0 545.7 Z"></path>
+					<path d="M45144.7 2555.6 L45036.25 2985 L39226.25 3170.5260679736325 L39226.3 3170.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43899.8 2487.9 L43892.2 2495.5 L43889.6 2485.1 L43897.2 2477.5 Z"></path>
+						<path d="M45152.1 2547.9 L45144.7 2555.6 L45141.8 2545.2 L45149.3 2537.5 Z"></path>
 					</g>
-					<path d="M44027.6 2495.6 L44118 2865 L26828.5 3050.8925256543293 L26828.5 3050.9 " fill="none"></path>
+					<path d="M45268.3 2555.7 L45364.25 2985 L27529.75 3170.9110306858197 L27529.8 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44030.5 2485.3 L44027.6 2495.6 L44020.2 2487.8 L44023.1 2477.5 Z"></path>
+						<path d="M45271.5 2545.4 L45268.3 2555.7 L45261.1 2547.8 L45264.2 2537.5 Z"></path>
 					</g>
-					<path d="M44044.0 2495.3 L44158 2865 L34237 3050.518273424575 L34237.0 3050.5 " fill="none"></path>
+					<path d="M45283.3 2555.5 L45404.25 2985 L35023.25 3170.561556524656 L35023.3 3170.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44046.3 2484.8 L44044.0 2495.3 L44036.1 2488.0 L44038.5 2477.5 Z"></path>
+						<path d="M45285.9 2545.0 L45283.3 2555.5 L45275.6 2547.9 L45278.2 2537.5 Z"></path>
 					</g>
-					<path d="M42549.2 603.2 L44472 876 L44472 1025 L44472 1025 L44472 1174 L44472 1174 L44472 1390.5 L44472 1390.5 L44472 1607 L44472 1607 L44159.04292527822 1994.5 L44159.0 1994.5 " fill="none"></path>
-					<path d="M42550.0 597.9 L42549.2 603.2 L42548.5 608.5 L42536.0 601.4 Z"></path>
-					<path d="M17102.6 2280.2 L17173 2865 L12847.75 3046.813066997239 L12847.8 3046.8 " fill="none"></path>
-					<path d="M17107.9 2279.6 L17102.6 2280.2 L17097.3 2280.9 L17101.0 2267.0 Z"></path>
-					<path d="M32830.5 1493.2 L32830.5 1607 L32931.61685214626 2122 L32931.6 2122.0 " fill="none"></path>
+					<path d="M43795.5 603.2 L45718.25 876 L45718.25 1025 L45718.25 1025 L45718.25 1174 L45718.25 1174 L45718.25 1390.5 L45718.25 1390.5 L45718.25 1607 L45718.25 1607 L45388.308055152396 2054.5 L45388.3 2054.5 " fill="none"></path>
+					<path d="M43796.2 597.9 L43795.5 603.2 L43794.7 608.5 L43782.3 601.4 Z"></path>
+					<path d="M16833.5 2340.0 L16973 2985 L12504.5 3166.9596615720525 L12504.5 3167.0 " fill="none"></path>
+					<path d="M16838.7 2338.9 L16833.5 2340.0 L16828.3 2341.2 L16830.7 2327.0 Z"></path>
+					<path d="M31922.3 1493.2 L31922.25 1607 L32424.227503628448 2182 L32424.2 2182.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32835.8 1483.8 L32830.5 1493.2 L32825.2 1483.8 L32830.5 1474.5 Z"></path>
+						<path d="M31927.6 1483.8 L31922.3 1493.2 L31916.9 1483.8 L31922.3 1474.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M31677.7 1035.2 L32830.5 1174 L32830.5 1306.5 L32830.5 1306.5 " fill="none"></path>
+						<path d="M31207.4 1040.8 L31922.25 1174 L31922.25 1306.5 L31922.3 1306.5 " fill="none"></path>
 					</g>
-					<path d="M31678.4 1029.9 L31677.7 1035.2 L31677.1 1040.5 L31664.5 1033.6 Z"></path>
+					<path d="M31208.3 1035.5 L31207.4 1040.8 L31206.4 1046.0 L31194.3 1038.3 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M31677.8 1033.5 L33077.5 1174 L33077.5 1390.5 L33077.5 1390.5 L33077.5 1607 L33077.5 1607 L32976.38314785374 2122 L32976.4 2122.0 " fill="none"></path>
+						<path d="M31207.5 1032.3 L32843.25 1174 L32843.25 1390.5 L32843.25 1390.5 L32843.25 1607 L32843.25 1607 L32576.613570391874 2182 L32576.6 2182.0 " fill="none"></path>
 					</g>
-					<path d="M31678.3 1028.2 L31677.8 1033.5 L31677.2 1038.8 L31664.5 1032.2 Z"></path>
+					<path d="M31208.0 1027.0 L31207.5 1032.3 L31207.1 1037.7 L31194.3 1031.2 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3718.3 2263.9 L3962.5 2865 L2436 3030.51875 L2436.0 3030.5 " fill="none"></path>
+						<path d="M3717.4 2324.0 L3962.5 2985 L2436 3150.51875 L2436.0 3150.5 " fill="none"></path>
 					</g>
-					<path d="M3723.3 2261.8 L3718.3 2263.9 L3713.4 2265.9 L3713.3 2251.5 Z"></path>
+					<path d="M3722.4 2322.1 L3717.4 2324.0 L3712.4 2325.9 L3712.7 2311.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M31677.8 1032.1 L33364.5 1174 L33364.5 1329 L33364.5 1329.0 " fill="none"></path>
+						<path d="M31207.6 1029.0 L34310.25 1174 L34310.25 1329 L34310.3 1329.0 " fill="none"></path>
 					</g>
-					<path d="M31678.2 1026.8 L31677.8 1032.1 L31677.3 1037.4 L31664.5 1031.0 Z"></path>
-					<path d="M25343.5 1440.2 L25343.5 1607 L31222.25 2200.8465090135305 L31222.3 2200.8 " fill="none"></path>
+					<path d="M31207.8 1023.6 L31207.6 1029.0 L31207.3 1034.3 L31194.3 1028.3 Z"></path>
+					<path d="M25294.3 1440.2 L25294.25 1607 L31613.75 2260.0386951631044 L31613.8 2260.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25348.8 1430.8 L25343.5 1440.2 L25338.2 1430.8 L25343.5 1421.5 Z"></path>
+						<path d="M25299.6 1430.8 L25294.3 1440.2 L25288.9 1430.8 L25294.3 1421.5 Z"></path>
 					</g>
-					<path d="M12187.0 1455.7 L12187 1607 L10930.007750397457 2220.5 L10930.0 2220.5 " fill="none"></path>
+					<path d="M10898.3 1455.7 L10898.25 1607 L10898.25 2280.5 L10898.3 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12192.3 1446.3 L12187.0 1455.7 L12181.7 1446.3 L12187.0 1437.0 Z"></path>
+						<path d="M10903.6 1446.3 L10898.3 1455.7 L10892.9 1446.3 L10898.3 1437.0 Z"></path>
 					</g>
-					<path d="M13093.3 1038.3 L12187 1174 L12187 1344 L12187.0 1344.0 " fill="none"></path>
-					<path d="M13094.1 1043.6 L13093.3 1038.3 L13092.5 1033.1 L13106.5 1036.4 Z"></path>
-					<path d="M36761.0 1508.2 L36761 1607 L34362.5 2191.1845111326234 L34362.5 2191.2 " fill="none"></path>
+					<path d="M14597.4 1028.5 L10898.25 1174 L10898.25 1344 L10898.3 1344.0 " fill="none"></path>
+					<path d="M14597.6 1033.8 L14597.4 1028.5 L14597.2 1023.2 L14610.8 1028.0 Z"></path>
+					<path d="M40193.3 1508.2 L40193.25 1607 L36776.25 2260.7942238267146 L36776.3 2260.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36766.3 1498.8 L36761.0 1508.2 L36755.7 1498.8 L36761.0 1489.5 Z"></path>
+						<path d="M40198.6 1498.8 L40193.3 1508.2 L40187.9 1498.8 L40193.3 1489.5 Z"></path>
 					</g>
-					<path d="M36839.9 1116.8 L36761 1174 L36761 1291.5 L36761.0 1291.5 " fill="none"></path>
-					<path d="M36843.0 1121.1 L36839.9 1116.8 L36836.7 1112.5 L36850.6 1109.0 Z"></path>
-					<path d="M31445.7 2463.9 L31226.5 2865 L37659.25 3050.619908714656 L37659.3 3050.6 " fill="none"></path>
+					<path d="M38909.3 1041.7 L40193.25 1174 L40193.25 1291.5 L40193.3 1291.5 " fill="none"></path>
+					<path d="M38909.8 1036.4 L38909.3 1041.7 L38908.7 1047.0 L38896.0 1040.4 Z"></path>
+					<path d="M31847.9 2524.2 L31618 2985 L39165.25 3170.749348421365 L39165.3 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31454.9 2458.2 L31445.7 2463.9 L31445.5 2453.1 L31454.7 2447.5 Z"></path>
+						<path d="M31856.8 2518.2 L31847.9 2524.2 L31847.3 2513.5 L31856.2 2507.5 Z"></path>
 					</g>
-					<path d="M31898.6 2458.0 L32500.75 2865 L26828.5 3049.6606371372463 L26828.5 3049.7 " fill="none"></path>
+					<path d="M32327.2 2435.7 L33764.25 2985 L27529.75 3169.825027817517 L27529.8 3169.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31893.8 2448.3 L31898.6 2458.0 L31887.9 2457.1 L31883.1 2447.5 Z"></path>
+						<path d="M32320.4 2427.4 L32327.2 2435.7 L32316.6 2437.3 L32309.8 2429.0 Z"></path>
 					</g>
-					<path d="M31912.2 2457.7 L32540.75 2865 L34132 3045.5433460076047 L34132.0 3045.5 " fill="none"></path>
+					<path d="M32327.2 2432.7 L33804.25 2985 L34918.25 3163.1063009001286 L34918.3 3163.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31907.3 2448.1 L31912.2 2457.7 L31901.5 2457.1 L31896.6 2447.5 Z"></path>
+						<path d="M32320.4 2424.4 L32327.2 2432.7 L32316.6 2434.4 L32309.8 2426.1 Z"></path>
 					</g>
-					<path d="M41370.7 1434.3 L41418.5 1607 L31918.25 2213.773513060696 L31918.3 2213.8 " fill="none"></path>
-					<path d="M41375.8 1432.9 L41370.7 1434.3 L41365.5 1435.8 L41367.1 1421.5 Z"></path>
-					<path d="M37156.2 1528.0 L37061.25 1607 L31918.25 2196.136222910217 L31918.3 2196.1 " fill="none"></path>
-					<path d="M37159.6 1532.1 L37156.2 1528.0 L37152.8 1523.9 L37166.4 1519.5 Z"></path>
-					<path d="M26169.8 1550.7 L26104.25 1607 L31222.25 2195.953896816685 L31222.3 2196.0 " fill="none"></path>
-					<path d="M26173.3 1554.7 L26169.8 1550.7 L26166.3 1546.6 L26179.9 1542.0 Z"></path>
+					<path d="M42616.9 1434.3 L42664.75 1607 L32309.75 2273.597682892647 L32309.8 2273.6 " fill="none"></path>
+					<path d="M42622.0 1432.9 L42616.9 1434.3 L42611.8 1435.8 L42613.3 1421.5 Z"></path>
+					<path d="M38461.8 1525.7 L38308.25 1607 L32309.75 2258.2198061923896 L32309.8 2258.2 " fill="none"></path>
+					<path d="M38464.3 1530.5 L38461.8 1525.7 L38459.3 1521.0 L38473.6 1519.5 Z"></path>
+					<path d="M26848.7 1552.5 L26805.5 1607 L31613.75 2249.4987636363635 L31613.8 2249.5 " fill="none"></path>
+					<path d="M26852.9 1555.8 L26848.7 1552.5 L26844.5 1549.1 L26857.0 1542.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M42387.0 1069.9 L42579.25 1174 L42579.25 1390.5 L42579.25 1390.5 L42579.25 1607 L42579.25 1607 L31918.25 2216.1169951857573 L31918.3 2216.1 " fill="none"></path>
+						<path d="M43633.3 1069.9 L43825.5 1174 L43825.5 1390.5 L43825.5 1390.5 L43825.5 1607 L43825.5 1607 L32309.75 2275.7895269202404 L32309.8 2275.8 " fill="none"></path>
 					</g>
-					<path d="M42389.6 1065.2 L42387.0 1069.9 L42384.5 1074.5 L42375.3 1063.5 Z"></path>
+					<path d="M43635.8 1065.2 L43633.3 1069.9 L43630.7 1074.5 L43621.6 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M17956.6 1419.3 L17939.25 1607 L31222.25 2219.9416036974544 L31222.3 2219.9 " fill="none"></path>
+						<path d="M17474.1 1418.8 L17420 1607 L31613.75 2279.5114755789364 L31613.8 2279.5 " fill="none"></path>
 					</g>
-					<path d="M17961.9 1419.8 L17956.6 1419.3 L17951.3 1418.8 L17957.8 1406.0 Z"></path>
+					<path d="M17479.2 1420.3 L17474.1 1418.8 L17469.0 1417.3 L17477.8 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M27971.4 1043.1 L28631 1174 L28631 1390.5 L28631 1390.5 L28631 1607 L28631 1607 L31222.25 2161.5279408012248 L31222.3 2161.5 " fill="none"></path>
+						<path d="M28672.7 1043.1 L29332.25 1174 L29332.25 1390.5 L29332.25 1390.5 L29332.25 1607 L29332.25 1607 L31613.75 2204.814603536794 L31613.8 2204.8 " fill="none"></path>
 					</g>
-					<path d="M27972.5 1037.9 L27971.4 1043.1 L27970.4 1048.3 L27958.3 1040.5 Z"></path>
-					<path d="M17105.4 2280.1 L17213 2865 L13638.75 3043.7484413756115 L13638.8 3043.7 " fill="none"></path>
-					<path d="M17110.6 2279.1 L17105.4 2280.1 L17100.1 2281.1 L17103.0 2267.0 Z"></path>
-					<path d="M37866.0 2434.8 L37689.75 2865 L37689.75 3036 L37689.8 3036.0 " fill="none"></path>
+					<path d="M28673.7 1037.9 L28672.7 1043.1 L28671.6 1048.3 L28659.6 1040.5 Z"></path>
+					<path d="M16836.0 2339.9 L17013 2985 L13686.5 3163.1968260807125 L13686.5 3163.2 " fill="none"></path>
+					<path d="M16841.2 2338.4 L16836.0 2339.9 L16830.9 2341.3 L16832.5 2327.0 Z"></path>
+					<path d="M39536.3 2492.9 L39195.75 2985 L39195.75 3156 L39195.8 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37874.5 2428.2 L37866.0 2434.8 L37864.7 2424.1 L37873.1 2417.5 Z"></path>
+						<path d="M39546.0 2488.2 L39536.3 2492.9 L39537.2 2482.1 L39546.9 2477.5 Z"></path>
 					</g>
-					<path d="M37878.6 2435.1 L37729.75 2865 L32334.75 3049.9232677816576 L32334.8 3049.9 " fill="none"></path>
+					<path d="M39672.5 2496.2 L39672.5 2985 L33194.25 3170.185059585393 L33194.3 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37886.7 2428.1 L37878.6 2435.1 L37876.6 2424.6 L37884.7 2417.5 Z"></path>
+						<path d="M39677.8 2486.8 L39672.5 2496.2 L39667.2 2486.8 L39672.5 2477.5 Z"></path>
 					</g>
-					<path d="M37960.2 2436.1 L37987.5 2865 L37987.5 3051.5 L37987.5 3051.5 L37987.5 3238 L37987.5 3238 L37987.5 3394.5 L37987.5 3394.5 L37987.5 3551 L37987.5 3551 L36263.5 3585.518894529047 L36263.5 3585.5 " fill="none"></path>
+					<path d="M39808.7 2492.9 L40149.25 2985 L40149.25 3171.5 L40149.25 3171.5 L40149.25 3358 L40149.25 3358 L40149.25 3514.5 L40149.25 3514.5 L40149.25 3671 L40149.25 3671 L37334.5 3705.892579659537 L37334.5 3705.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37965.0 2426.5 L37960.2 2436.1 L37954.3 2427.2 L37959.0 2417.5 Z"></path>
+						<path d="M39807.8 2482.1 L39808.7 2492.9 L39799.0 2488.2 L39798.1 2477.5 Z"></path>
 					</g>
-					<path d="M38241.0 2427.7 L38910.5 2865 L38910.5 3051.5 L38910.5 3051.5 L38910.5 3238 L38910.5 3238 L38860.25 3279.2273918741807 L38860.3 3279.2 " fill="none"></path>
+					<path d="M39819.8 2492.4 L40189.25 2985 L40189.25 3171.5 L40189.25 3171.5 L40189.25 3358 L40189.25 3358 L39289.25 3493.367611725132 L39289.3 3493.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38236.1 2418.1 L38241.0 2427.7 L38230.3 2427.1 L38225.4 2417.5 Z"></path>
+						<path d="M39818.5 2481.8 L39819.8 2492.4 L39810.0 2488.2 L39808.6 2477.5 Z"></path>
 					</g>
-					<path d="M38252.7 2427.4 L38950.5 2865 L34237 3049.445604280319 L34237.0 3049.4 " fill="none"></path>
+					<path d="M39830.9 2492.0 L40229.25 2985 L35023.25 3169.638014642959 L35023.3 3169.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38247.7 2417.9 L38252.7 2427.4 L38242.0 2427.0 L38236.9 2417.5 Z"></path>
+						<path d="M39829.2 2481.4 L39830.9 2492.0 L39820.9 2488.1 L39819.2 2477.5 Z"></path>
 					</g>
-					<path d="M42549.2 602.2 L44512 876 L44512 1025 L44512 1025 L44512 1174 L44512 1174 L44512 1390.5 L44512 1390.5 L44512 1607 L44512 1607 L38493.5 2183.6831441846293 L38493.5 2183.7 " fill="none"></path>
-					<path d="M42549.9 596.9 L42549.2 602.2 L42548.5 607.5 L42536.0 600.3 Z"></path>
+					<path d="M43795.5 602.2 L45758.25 876 L45758.25 1025 L45758.25 1025 L45758.25 1174 L45758.25 1174 L45758.25 1390.5 L45758.25 1390.5 L45758.25 1607 L45758.25 1607 L40218.5 2234.1844472743705 L40218.5 2234.2 " fill="none"></path>
+					<path d="M43796.2 596.9 L43795.5 602.2 L43794.7 607.5 L43782.3 600.3 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M42397.7 1069.2 L42619.25 1174 L42619.25 1390.5 L42619.25 1390.5 L42619.25 1607 L42619.25 1607 L38493.5 2162.4870765773 L38493.5 2162.5 " fill="none"></path>
+						<path d="M43643.9 1069.2 L43865.5 1174 L43865.5 1390.5 L43865.5 1390.5 L43865.5 1607 L43865.5 1607 L40218.5 2206.280467445743 L40218.5 2206.3 " fill="none"></path>
 					</g>
-					<path d="M42400.0 1064.4 L42397.7 1069.2 L42395.4 1074.0 L42385.6 1063.5 Z"></path>
+					<path d="M43646.2 1064.4 L43643.9 1069.2 L43641.7 1074.0 L43631.9 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M17961.9 1419.3 L17979.25 1607 L37401.5 2218.800996582074 L37401.5 2218.8 " fill="none"></path>
+						<path d="M17485.8 1419.2 L17509 1607 L39126.5 2279.0264173077358 L39126.5 2279.0 " fill="none"></path>
 					</g>
-					<path d="M17967.2 1418.8 L17961.9 1419.3 L17956.6 1419.8 L17960.7 1406.0 Z"></path>
+					<path d="M17491.1 1418.6 L17485.8 1419.2 L17480.5 1419.9 L17484.2 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M27975.6 1043.0 L28671 1174 L28671 1390.5 L28671 1390.5 L28671 1607 L28671 1607 L37401.5 2198.978062846979 L37401.5 2199.0 " fill="none"></path>
+						<path d="M28676.9 1043.0 L29372.25 1174 L29372.25 1390.5 L29372.25 1390.5 L29372.25 1607 L29372.25 1607 L39126.5 2259.4771971554087 L39126.5 2259.5 " fill="none"></path>
 					</g>
-					<path d="M27976.6 1037.7 L27975.6 1043.0 L27974.6 1048.2 L27962.5 1040.5 Z"></path>
-					<path d="M12529.0 1466.3 L12410 1607 L11260.297098569157 2220.5 L11260.3 2220.5 " fill="none"></path>
+					<path d="M28677.8 1037.7 L28676.9 1043.0 L28675.9 1048.2 L28663.8 1040.5 Z"></path>
+					<path d="M11301.4 1468.6 L11231.25 1607 L11231.25 2280.5 L11231.3 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12539.1 1462.6 L12529.0 1466.3 L12530.9 1455.7 L12541.0 1452.0 Z"></path>
+						<path d="M11310.4 1462.7 L11301.4 1468.6 L11300.8 1457.9 L11309.8 1452.0 Z"></path>
 					</g>
-					<path d="M12657.7 1466.2 L12778 1607 L11556.852146263911 2220.5 L11556.9 2220.5 " fill="none"></path>
+					<path d="M11405.7 1466.2 L11526 1607 L11526 2280.5 L11526.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12655.7 1455.6 L12657.7 1466.2 L12647.6 1462.6 L12645.6 1452.0 Z"></path>
+						<path d="M11403.7 1455.6 L11405.7 1466.2 L11395.6 1462.6 L11393.6 1452.0 Z"></path>
 					</g>
-					<path d="M13108.2 1043.8 L12593 1174 L12593 1329 L12593.0 1329.0 " fill="none"></path>
-					<path d="M13109.6 1048.9 L13108.2 1043.8 L13106.9 1038.6 L13121.2 1040.5 Z"></path>
-					<path d="M33380.2 2374.8 L32580.75 2865 L26828.5 3049.685969442651 L26828.5 3049.7 " fill="none"></path>
+					<path d="M14597.4 1029.0 L11341 1174 L11341 1329 L11341.0 1329.0 " fill="none"></path>
+					<path d="M14597.7 1034.3 L14597.4 1029.0 L14597.2 1023.6 L14610.8 1028.4 Z"></path>
+					<path d="M34603.3 2435.9 L33844.25 2985 L27529.75 3169.8460602731125 L27529.8 3169.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33391.0 2374.4 L33380.2 2374.8 L33385.4 2365.3 L33396.1 2365.0 Z"></path>
+						<path d="M34614.0 2434.8 L34603.3 2435.9 L34607.7 2426.1 L34618.4 2425.0 Z"></path>
 					</g>
-					<path d="M33737.7 2378.7 L34184.5 2865 L34184.5 3036 L34184.5 3036.0 " fill="none"></path>
+					<path d="M34833.9 2443.1 L34970.75 2985 L34970.75 3156 L34970.8 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33735.3 2368.3 L33737.7 2378.7 L33727.4 2375.5 L33725.0 2365.0 Z"></path>
+						<path d="M34836.8 2432.7 L34833.9 2443.1 L34826.4 2435.4 L34829.3 2425.0 Z"></path>
 					</g>
-					<path d="M41378.4 1433.6 L41458.5 1607 L33954.5 2208.1227712684667 L33954.5 2208.1 " fill="none"></path>
-					<path d="M41383.3 1431.4 L41378.4 1433.6 L41373.6 1435.8 L41372.8 1421.5 Z"></path>
-					<path d="M17118.2 2279.0 L17403.25 2865 L14127.75 3039.537357142857 L14127.8 3039.5 " fill="none"></path>
-					<path d="M17123.0 2276.7 L17118.2 2279.0 L17113.4 2281.3 L17112.3 2267.0 Z"></path>
-					<path d="M25605.5 2323.7 L25605.5 2865 L25627.91286863271 2885 L25627.9 2885.0 " fill="none"></path>
+					<path d="M42624.7 1433.6 L42704.75 1607 L35144.75 2265.679817905918 L35144.8 2265.7 " fill="none"></path>
+					<path d="M42629.5 1431.4 L42624.7 1433.6 L42619.8 1435.8 L42619.1 1421.5 Z"></path>
+					<path d="M16838.5 2339.7 L17053 2985 L14175.5 3158.0024983881367 L14175.5 3158.0 " fill="none"></path>
+					<path d="M16843.6 2338.0 L16838.5 2339.7 L16833.4 2341.3 L16834.3 2327.0 Z"></path>
+					<path d="M26306.8 2383.7 L26306.75 2985 L26329.16286863271 3005 L26329.2 3005.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25610.8 2314.3 L25605.5 2323.7 L25600.2 2314.3 L25605.5 2305.0 Z"></path>
+						<path d="M26312.1 2374.3 L26306.8 2383.7 L26301.4 2374.3 L26306.8 2365.0 Z"></path>
 					</g>
-					<path d="M7505.8 541.5 L25605.5 876 L25605.5 1025 L25605.5 1025 L25605.5 1174 L25605.5 1174 L25605.5 1390.5 L25605.5 1390.5 L25605.5 1607 L25605.5 1607 L25605.5 2167 L25605.5 2167.0 " fill="none"></path>
-					<path d="M7505.9 536.2 L7505.8 541.5 L7505.7 546.9 L7492.5 541.3 Z"></path>
-					<path d="M34828.0 574.2 L34009.5 876 L34009.5 941 L34009.5 941.0 " fill="none"></path>
-					<path d="M34829.8 579.2 L34828.0 574.2 L34826.1 569.2 L34840.5 569.6 Z"></path>
-					<path d="M27860.3 1440.2 L27860.25 1607 L33258.5 2197.9069828148795 L33258.5 2197.9 " fill="none"></path>
+					<path d="M6517.6 541.3 L26306.75 876 L26306.75 1025 L26306.75 1025 L26306.75 1174 L26306.75 1174 L26306.75 1390.5 L26306.75 1390.5 L26306.75 1607 L26306.75 1607 L26306.75 2227 L26306.8 2227.0 " fill="none"></path>
+					<path d="M6517.7 536.0 L6517.6 541.3 L6517.5 546.7 L6504.3 541.1 Z"></path>
+					<path d="M35463.2 589.0 L34922.25 876 L34922.25 941 L34922.3 941.0 " fill="none"></path>
+					<path d="M35465.7 593.7 L35463.2 589.0 L35460.7 584.3 L35475.0 582.7 Z"></path>
+					<path d="M27455.0 1440.2 L27455 1607 L34448.75 2263.341301460823 L34448.8 2263.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27865.6 1430.8 L27860.3 1440.2 L27854.9 1430.8 L27860.3 1421.5 Z"></path>
+						<path d="M27460.3 1430.8 L27455.0 1440.2 L27449.7 1430.8 L27455.0 1421.5 Z"></path>
 					</g>
-					<path d="M33714.6 1483.7 L33498 1607 L13015.25 2234.254457819594 L13015.3 2234.3 " fill="none"></path>
+					<path d="M34620.8 1482.2 L34343.75 1607 L13413 2294.128765589451 L13413.0 2294.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33725.4 1483.8 L33714.6 1483.7 L33720.1 1474.5 L33730.9 1474.5 Z"></path>
+						<path d="M34631.5 1483.2 L34620.8 1482.2 L34627.1 1473.5 L34637.8 1474.5 Z"></path>
 					</g>
-					<path d="M33931.2 1491.0 L33992 1607 L34158.0413354531 2167 L34158.0 2167.0 " fill="none"></path>
+					<path d="M34877.0 1491.0 L34937.75 1607 L36426.55986937591 2227 L36426.6 2227.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33931.6 1480.3 L33931.2 1491.0 L33922.1 1485.2 L33922.5 1474.5 Z"></path>
+						<path d="M34877.3 1480.3 L34877.0 1491.0 L34867.9 1485.2 L34868.3 1474.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M31677.8 1030.5 L33878.5 1174 L33878.5 1306.5 L33878.5 1306.5 " fill="none"></path>
+						<path d="M31207.6 1028.4 L34824.25 1174 L34824.25 1306.5 L34824.3 1306.5 " fill="none"></path>
 					</g>
-					<path d="M31678.2 1025.2 L31677.8 1030.5 L31677.5 1035.9 L31664.5 1029.7 Z"></path>
-					<path d="M25814.5 3236.7 L25814.5 3238 L25814.5 3394.5 L25814.5 3394.5 L25814.5 3551 L25814.5 3551 L36165.5 3586.3327403846156 L36165.5 3586.3 " fill="none"></path>
+					<path d="M31207.8 1023.1 L31207.6 1028.4 L31207.4 1033.7 L31194.3 1027.9 Z"></path>
+					<path d="M26515.8 3356.7 L26515.75 3358 L26515.75 3514.5 L26515.75 3514.5 L26515.75 3671 L26515.75 3671 L37236.5 3706.338482787437 L37236.5 3706.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25819.8 3227.3 L25814.5 3236.7 L25809.2 3227.3 L25814.5 3218.0 Z"></path>
+						<path d="M26521.1 3347.3 L26515.8 3356.7 L26510.4 3347.3 L26515.8 3338.0 Z"></path>
 					</g>
-					<path d="M23803.7 2503.4 L23102.75 2865 L25533.5 3032.1742878215173 L25533.5 3032.2 " fill="none"></path>
-					<path d="M23806.1 2508.2 L23803.7 2503.4 L23801.2 2498.7 L23815.5 2497.3 Z"></path>
+					<path d="M22997.8 2550.9 L22114.75 2985 L26234.75 3159.5921381504204 L26234.8 3159.6 " fill="none"></path>
+					<path d="M23000.1 2555.7 L22997.8 2550.9 L22995.4 2546.1 L23009.8 2545.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M26190.3 2280.3 L26190.25 2865 L26095.5 2912.028276779774 L26095.5 2912.0 " fill="none"></path>
+						<path d="M26891.5 2340.3 L26891.5 2985 L26796.75 3032.028276779774 L26796.8 3032.0 " fill="none"></path>
 					</g>
-					<path d="M26195.6 2280.3 L26190.3 2280.3 L26184.9 2280.3 L26190.3 2267.0 Z"></path>
-					<path d="M39385.9 2502.6 L39256 2865 L37720.25 3047.8682362330405 L37720.3 3047.9 " fill="none"></path>
+					<path d="M26896.8 2340.3 L26891.5 2340.3 L26886.2 2340.3 L26891.5 2327.0 Z"></path>
+					<path d="M40551.7 2560.5 L40269.25 2985 L39226.25 3166.201210992082 L39226.3 3166.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39394.1 2495.6 L39385.9 2502.6 L39384.1 2492.0 L39392.2 2485.0 Z"></path>
+						<path d="M40561.3 2555.7 L40551.7 2560.5 L40552.4 2549.8 L40562.1 2545.0 Z"></path>
 					</g>
-					<path d="M39529.3 2503.4 L39594 2865 L32334.75 3050.3256390951715 L32334.8 3050.3 " fill="none"></path>
+					<path d="M40681.0 2563.4 L40607.25 2985 L33194.25 3170.349845823837 L33194.3 3170.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39532.9 2493.2 L39529.3 2503.4 L39522.4 2495.1 L39526.0 2485.0 Z"></path>
+						<path d="M40687.8 2555.1 L40681.0 2563.4 L40677.3 2553.3 L40684.2 2545.0 Z"></path>
 					</g>
-					<path d="M39546.3 2503.1 L39634 2865 L33174.75 3040.624175383606 L33174.8 3040.6 " fill="none"></path>
+					<path d="M40696.5 2563.5 L40647.25 2985 L34034.25 3160.862612291459 L34034.3 3160.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39549.3 2492.8 L39546.3 2503.1 L39538.9 2495.3 L39541.9 2485.0 Z"></path>
+						<path d="M40702.9 2554.9 L40696.5 2563.5 L40692.3 2553.7 L40698.7 2545.0 Z"></path>
 					</g>
-					<path d="M39563.2 2502.8 L39674 2865 L26828.5 3050.683285537126 L26828.5 3050.7 " fill="none"></path>
+					<path d="M40712.0 2563.6 L40687.25 2985 L27529.75 3170.7025692447405 L27529.8 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39565.5 2492.4 L39563.2 2502.8 L39555.3 2495.5 L39557.7 2485.0 Z"></path>
+						<path d="M40717.9 2554.6 L40712.0 2563.6 L40707.2 2554.0 L40713.1 2545.0 Z"></path>
 					</g>
-					<path d="M39640.8 2501.0 L39859.5 2865 L39859.5 3051.5 L39859.5 3051.5 L39859.5 3238 L39859.5 3238 L39859.5 3394.5 L39859.5 3394.5 L39859.5 3551 L39859.5 3551 L36263.5 3586.022770919067 L36263.5 3586.0 " fill="none"></path>
+					<path d="M40873.3 2561.4 L41105.75 2985 L41105.75 3171.5 L41105.75 3171.5 L41105.75 3358 L41105.75 3358 L41105.75 3514.5 L41105.75 3514.5 L41105.75 3671 L41105.75 3671 L37334.5 3706.0446633073752 L37334.5 3706.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39640.5 2490.3 L39640.8 2501.0 L39631.4 2495.7 L39631.1 2485.0 Z"></path>
+						<path d="M40873.5 2550.6 L40873.3 2561.4 L40864.2 2555.7 L40864.4 2545.0 Z"></path>
 					</g>
-					<path d="M39657.3 2500.5 L39899.5 2865 L39899.5 3051.5 L39899.5 3051.5 L39899.5 3238 L39899.5 3238 L38860.25 3375.861941089214 L38860.3 3375.9 " fill="none"></path>
+					<path d="M40888.5 2561.0 L41145.75 2985 L41145.75 3171.5 L41145.75 3171.5 L41145.75 3358 L41145.75 3358 L39289.25 3503.4893590385577 L39289.3 3503.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39656.6 2489.8 L39657.3 2500.5 L39647.7 2495.7 L39647.0 2485.0 Z"></path>
+						<path d="M40888.2 2550.2 L40888.5 2561.0 L40879.1 2555.7 L40878.8 2545.0 Z"></path>
 					</g>
-					<path d="M39673.8 2500.1 L39939.5 2865 L34237 3049.7986533449175 L34237.0 3049.8 " fill="none"></path>
+					<path d="M40903.6 2560.5 L41185.75 2985 L35023.25 3169.9245776347548 L35023.3 3169.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39672.6 2489.4 L39673.8 2500.1 L39664.0 2495.7 L39662.8 2485.0 Z"></path>
+						<path d="M40902.9 2549.8 L40903.6 2560.5 L40894.0 2555.7 L40893.3 2545.0 Z"></path>
 					</g>
-					<path d="M42549.2 601.1 L44552 876 L44552 1025 L44552 1025 L44552 1174 L44552 1174 L44552 1390.5 L44552 1390.5 L44552 1607 L44552 1607 L39932.5 2180.0530519672616 L39932.5 2180.1 " fill="none"></path>
-					<path d="M42549.9 595.9 L42549.2 601.1 L42548.5 606.4 L42536.0 599.3 Z"></path>
-					<path d="M37180.8 1528.8 L37101.25 1607 L39030.5 2116.819661800231 L39030.5 2116.8 " fill="none"></path>
-					<path d="M37184.5 1532.7 L37180.8 1528.8 L37177.0 1525.0 L37190.3 1519.5 Z"></path>
+					<path d="M43795.5 601.1 L45798.25 876 L45798.25 1025 L45798.25 1025 L45798.25 1174 L45798.25 1174 L45798.25 1390.5 L45798.25 1390.5 L45798.25 1607 L45798.25 1607 L41178.75 2234.7163001676363 L41178.8 2234.7 " fill="none"></path>
+					<path d="M43796.2 595.9 L43795.5 601.1 L43794.7 606.4 L43782.3 599.3 Z"></path>
+					<path d="M38485.9 1526.2 L38348.25 1607 L40276.75 2165.4099600756463 L40276.8 2165.4 " fill="none"></path>
+					<path d="M38488.6 1530.8 L38485.9 1526.2 L38483.2 1521.6 L38497.4 1519.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M42408.3 1068.7 L42659.25 1174 L42659.25 1390.5 L42659.25 1390.5 L42659.25 1607 L42659.25 1607 L39932.5 2146.7296042797575 L39932.5 2146.7 " fill="none"></path>
+						<path d="M43654.5 1068.7 L43905.5 1174 L43905.5 1390.5 L43905.5 1390.5 L43905.5 1607 L43905.5 1607 L41178.75 2198.2141452285423 L41178.8 2198.2 " fill="none"></path>
 					</g>
-					<path d="M42410.3 1063.7 L42408.3 1068.7 L42406.2 1073.6 L42396.0 1063.5 Z"></path>
+					<path d="M43656.6 1063.7 L43654.5 1068.7 L43652.5 1073.6 L43642.2 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M17967.1 1418.8 L18019.25 1607 L39030.5 2222.7824202961015 L39030.5 2222.8 " fill="none"></path>
+						<path d="M17491.0 1418.7 L17549 1607 L40276.75 2282.5937981987813 L40276.8 2282.6 " fill="none"></path>
 					</g>
-					<path d="M17972.2 1417.4 L17967.1 1418.8 L17962.0 1420.3 L17963.5 1406.0 Z"></path>
+					<path d="M17496.1 1417.2 L17491.0 1418.7 L17485.9 1420.3 L17487.0 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M27979.8 1042.9 L28711 1174 L28711 1390.5 L28711 1390.5 L28711 1607 L28711 1607 L39030.5 2209.6614827538183 L39030.5 2209.7 " fill="none"></path>
+						<path d="M28681.0 1042.9 L29412.25 1174 L29412.25 1390.5 L29412.25 1390.5 L29412.25 1607 L29412.25 1607 L40276.75 2268.5386416861825 L40276.8 2268.5 " fill="none"></path>
 					</g>
-					<path d="M27980.7 1037.6 L27979.8 1042.9 L27978.9 1048.1 L27966.7 1040.5 Z"></path>
-					<path d="M32774.8 3176.7 L32774.75 3238 L38579.25 3390.8013877207736 L38579.3 3390.8 " fill="none"></path>
+					<path d="M28682.0 1037.6 L28681.0 1042.9 L28680.1 1048.1 L28667.9 1040.5 Z"></path>
+					<path d="M33634.3 3296.7 L33634.25 3358 L39008.25 3510.5126484722095 L39008.3 3510.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32780.1 3167.3 L32774.8 3176.7 L32769.4 3167.3 L32774.8 3158.0 Z"></path>
+						<path d="M33639.6 3287.3 L33634.3 3296.7 L33628.9 3287.3 L33634.3 3278.0 Z"></path>
 					</g>
-					<path d="M33193.4 3040.7 L39979.5 2865 L39678.641494435615 2485 L39678.6 2485.0 " fill="none"></path>
+					<path d="M34052.9 3161.2 L41225.75 2985 L40907.72387518142 2545 L40907.7 2545.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33183.9 3035.6 L33193.4 3040.7 L33184.2 3046.2 L33174.8 3041.1 Z"></path>
+						<path d="M34043.4 3156.1 L34052.9 3161.2 L34043.7 3166.8 L34034.3 3161.7 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M42418.8 1068.2 L42699.25 1174 L42699.25 1390.5 L42699.25 1390.5 L42699.25 1607 L42699.25 1607 L42699.25 2236 L42699.25 2236 L42699.25 2865 L42699.25 2865 L33174.75 3043.983248526374 L33174.8 3044.0 " fill="none"></path>
+						<path d="M43665.0 1068.2 L43945.5 1174 L43945.5 1390.5 L43945.5 1390.5 L43945.5 1607 L43945.5 1607 L43945.5 2296 L43945.5 2296 L43945.5 2985 L43945.5 2985 L34034.25 3164.265183658625 L34034.3 3164.3 " fill="none"></path>
 					</g>
-					<path d="M42420.7 1063.2 L42418.8 1068.2 L42416.9 1073.2 L42406.3 1063.5 Z"></path>
+					<path d="M43666.9 1063.2 L43665.0 1068.2 L43663.2 1073.2 L43652.6 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M17997.0 1412.8 L18326.25 1607 L18326.25 2236 L18326.25 2236 L18326.25 2865 L18326.25 2865 L32374.75 3046.336834273454 L32374.8 3046.3 " fill="none"></path>
+						<path d="M17516.6 1413.4 L17807 1607 L17807 2296 L17807 2296 L17807 2985 L17807 2985 L33234.25 3166.7866101186246 L33234.3 3166.8 " fill="none"></path>
 					</g>
-					<path d="M17999.7 1408.2 L17997.0 1412.8 L17994.3 1417.4 L17985.5 1406.0 Z"></path>
+					<path d="M17519.6 1409.0 L17516.6 1413.4 L17513.6 1417.8 L17505.5 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M27984.0 1042.7 L28751 1174 L28751 1390.5 L28751 1390.5 L28751 1607 L28751 1607 L28751 2236 L28751 2236 L28751 2865 L28751 2865 L32374.75 3032.9600807704255 L32374.8 3033.0 " fill="none"></path>
+						<path d="M28685.2 1042.7 L29452.25 1174 L29452.25 1390.5 L29452.25 1390.5 L29452.25 1607 L29452.25 1607 L29452.25 2296 L29452.25 2296 L29452.25 2985 L29452.25 2985 L33234.25 3153.661645145863 L33234.3 3153.7 " fill="none"></path>
 					</g>
-					<path d="M27984.9 1037.5 L27984.0 1042.7 L27983.1 1048.0 L27970.8 1040.5 Z"></path>
-					<path d="M43485.6 1583.6 L43456 1607 L43456 2236 L43456 2236 L43456 2865 L43456 2865 L37720.25 3050.5135269889442 L37720.3 3050.5 " fill="none"></path>
+					<path d="M28686.1 1037.5 L28685.2 1042.7 L28684.3 1048.0 L28672.1 1040.5 Z"></path>
+					<path d="M44731.9 1583.6 L44702.25 1607 L44702.25 2296 L44702.25 2296 L44702.25 2985 L44702.25 2985 L39226.25 3170.4669935530737 L39226.3 3170.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43496.3 1582.0 L43485.6 1583.6 L43489.7 1573.6 L43500.3 1572.0 Z"></path>
+						<path d="M44742.5 1582.0 L44731.9 1583.6 L44735.9 1573.6 L44746.5 1572.0 Z"></path>
 					</g>
-					<path d="M43520.1 1584.7 L43496 1607 L43496 2236 L43496 2236 L43496 2865 L43496 2865 L31025 3050.37771490057 L31025.0 3050.4 " fill="none"></path>
+					<path d="M44766.4 1584.7 L44742.25 1607 L44742.25 2296 L44742.25 2296 L44742.25 2985 L44742.25 2985 L31416.5 3170.449295774648 L31416.5 3170.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43530.6 1582.3 L43520.1 1584.7 L43523.4 1574.4 L43533.8 1572.0 Z"></path>
+						<path d="M44776.9 1582.3 L44766.4 1584.7 L44769.6 1574.4 L44780.1 1572.0 Z"></path>
 					</g>
-					<path d="M43554.9 1585.9 L43536 1607 L43536 2236 L43536 2236 L43536 2865 L43536 2865 L28671.25 3050.6134358837016 L28671.3 3050.6 " fill="none"></path>
+					<path d="M44801.2 1585.9 L44782.25 1607 L44782.25 2296 L44782.25 2296 L44782.25 2985 L44782.25 2985 L29258.75 3170.6508865305077 L29258.8 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43565.1 1582.5 L43554.9 1585.9 L43557.2 1575.4 L43567.4 1572.0 Z"></path>
+						<path d="M44811.4 1582.5 L44801.2 1585.9 L44803.4 1575.4 L44813.6 1572.0 Z"></path>
 					</g>
-					<path d="M43590.1 1587.2 L43576 1607 L43576 2236 L43576 2236 L43576 2865 L43576 2865 L32334.75 3050.739938869078 L32334.8 3050.7 " fill="none"></path>
+					<path d="M44836.3 1587.2 L44822.25 1607 L44822.25 2296 L44822.25 2296 L44822.25 2985 L44822.25 2985 L33194.25 3170.7651190680144 L33194.3 3170.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43599.8 1582.7 L43590.1 1587.2 L43591.1 1576.5 L43600.9 1572.0 Z"></path>
+						<path d="M44846.1 1582.7 L44836.3 1587.2 L44837.4 1576.5 L44847.1 1572.0 Z"></path>
 					</g>
-					<path d="M43939.9 1584.7 L43964 1607 L43964 1994.5 L43964.0 1994.5 " fill="none"></path>
+					<path d="M45186.1 1584.7 L45210.25 1607 L45210.25 2054.5 L45210.3 2054.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43936.6 1574.4 L43939.9 1584.7 L43929.4 1582.3 L43926.2 1572.0 Z"></path>
+						<path d="M45182.9 1574.4 L45186.1 1584.7 L45175.6 1582.3 L45172.4 1572.0 Z"></path>
 					</g>
-					<path d="M44054.6 1581.5 L44098 1607 L39932.5 2174.551066825517 L39932.5 2174.6 " fill="none"></path>
+					<path d="M45300.8 1581.5 L45344.25 1607 L41178.75 2228.689483374851 L41178.8 2228.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44049.3 1572.1 L44054.6 1581.5 L44043.8 1581.3 L44038.5 1572.0 Z"></path>
+						<path d="M45295.5 1572.1 L45300.8 1581.5 L45290.1 1581.3 L45284.8 1572.0 Z"></path>
 					</g>
-					<path d="M44088.5 1580.7 L44138 1607 L38493.5 2180.522413375333 L38493.5 2180.5 " fill="none"></path>
+					<path d="M45334.8 1580.7 L45384.25 1607 L40218.5 2230.136823215302 L40218.5 2230.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44082.8 1571.7 L44088.5 1580.7 L44077.8 1581.1 L44072.0 1572.0 Z"></path>
+						<path d="M45329.0 1571.7 L45334.8 1580.7 L45324.0 1581.1 L45318.3 1572.0 Z"></path>
 					</g>
-					<path d="M44094.8 1566.8 L44178 1607 L42499.25 2107.739181979846 L42499.3 2107.7 " fill="none"></path>
+					<path d="M45341.1 1566.8 L45424.25 1607 L43745.5 2155.5044457617073 L43745.5 2155.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44088.7 1557.9 L44094.8 1566.8 L44084.1 1567.5 L44078.0 1558.7 Z"></path>
+						<path d="M45335.0 1557.9 L45341.1 1566.8 L45330.3 1567.5 L45324.3 1558.7 Z"></path>
 					</g>
-					<path d="M44095.1 1552.5 L44218 1607 L31182.25 2216.389401906319 L31182.3 2216.4 " fill="none"></path>
+					<path d="M45341.3 1552.5 L45464.25 1607 L31573.75 2275.801851851852 L31573.8 2275.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44088.7 1543.8 L44095.1 1552.5 L44084.4 1553.5 L44078.0 1544.9 Z"></path>
+						<path d="M45334.9 1543.8 L45341.3 1552.5 L45330.6 1553.5 L45324.3 1544.9 Z"></path>
 					</g>
-					<path d="M44095.6 1517.8 L44352 1607 L44352 2236 L44352 2236 L44352 2865 L44352 2865 L34237 3050.5370051635114 L34237.0 3050.5 " fill="none"></path>
+					<path d="M45341.9 1517.8 L45598.25 1607 L45598.25 2296 L45598.25 2296 L45598.25 2985 L45598.25 2985 L35023.25 3170.5786873676784 L35023.3 3170.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44088.6 1509.7 L44095.6 1517.8 L44085.1 1519.7 L44078.0 1511.6 Z"></path>
+						<path d="M45334.8 1509.7 L45341.9 1517.8 L45331.3 1519.7 L45324.3 1511.6 Z"></path>
 					</g>
-					<path d="M42549.2 600.2 L44592 876 L44592 1025 L44592 1025 L44592 1174 L44592 1174 L44078 1303.0962877030163 L44078.0 1303.1 " fill="none"></path>
-					<path d="M42549.9 594.9 L42549.2 600.2 L42548.5 605.4 L42536.0 598.4 Z"></path>
+					<path d="M43795.5 600.2 L45838.25 876 L45838.25 1025 L45838.25 1025 L45838.25 1174 L45838.25 1174 L45324.25 1303.0962877030163 L45324.3 1303.1 " fill="none"></path>
+					<path d="M43796.2 594.9 L43795.5 600.2 L43794.7 605.4 L43782.3 598.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M42425.4 1066.5 L42739.25 1174 L43382 1314.4545798637396 L43382.0 1314.5 " fill="none"></path>
+						<path d="M43671.6 1066.5 L43985.5 1174 L44628.25 1314.4545798637396 L44628.3 1314.5 " fill="none"></path>
 					</g>
-					<path d="M42427.1 1061.4 L42425.4 1066.5 L42423.6 1071.5 L42412.8 1062.2 Z"></path>
-					<path d="M37348.7 1537.9 L37361.5 1607 L37361.5 2236 L37361.5 2236 L37361.5 2865 L37361.5 2865 L37361.5 3051.5 L37361.5 3051.5 L37361.5 3238 L37361.5 3238 L37361.5 3394.5 L37361.5 3394.5 L37361.5 3551 L37361.5 3551 L36263.5 3584.9834350479514 L36263.5 3585.0 " fill="none"></path>
+					<path d="M43673.3 1061.4 L43671.6 1066.5 L43669.9 1071.5 L43659.0 1062.2 Z"></path>
+					<path d="M38744.5 1537.9 L38757.25 1607 L38757.25 2296 L38757.25 2296 L38757.25 2985 L38757.25 2985 L38757.25 3171.5 L38757.25 3171.5 L38757.25 3358 L38757.25 3358 L38757.25 3514.5 L38757.25 3514.5 L38757.25 3671 L38757.25 3671 L37334.5 3705.31807372176 L37334.5 3705.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37352.3 1527.7 L37348.7 1537.9 L37341.8 1529.6 L37345.3 1519.5 Z"></path>
+						<path d="M38748.0 1527.7 L38744.5 1537.9 L38737.5 1529.6 L38741.1 1519.5 Z"></path>
 					</g>
-					<path d="M37656.0 1433.9 L38990.5 1607 L38990.5 2236 L38990.5 2236 L38990.5 2865 L38990.5 2865 L38990.5 3051.5 L38990.5 3051.5 L38990.5 3238 L38990.5 3238 L38860.25 3313.287626962142 L38860.3 3313.3 " fill="none"></path>
+					<path d="M38817.4 1534.8 L38867.5 1607 L38867.5 2296 L38867.5 2296 L38867.5 2985 L38867.5 2985 L38867.5 3171.5 L38867.5 3171.5 L38867.5 3358 L38867.5 3358 L39008.25 3436.319555555556 L39008.3 3436.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37647.4 1427.4 L37656.0 1433.9 L37646.1 1438.0 L37637.5 1431.5 Z"></path>
+						<path d="M38816.5 1524.1 L38817.4 1534.8 L38807.7 1530.2 L38806.8 1519.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M42425.5 1063.0 L42779.25 1174 L37637.5 1377.9647977646466 L37637.5 1378.0 " fill="none"></path>
+						<path d="M43671.7 1063.0 L44025.5 1174 L39033.25 1377.6117599962322 L39033.3 1377.6 " fill="none"></path>
 					</g>
-					<path d="M42427.1 1057.9 L42425.5 1063.0 L42423.9 1068.1 L42412.8 1059.0 Z"></path>
+					<path d="M43673.3 1057.9 L43671.7 1063.0 L43670.1 1068.1 L43659.0 1059.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M27989.4 1042.6 L28803 1174 L37005.5 1382.4687738451605 L37005.5 1382.5 " fill="none"></path>
+						<path d="M28690.7 1042.6 L29504.25 1174 L38401.25 1383.0741886464778 L38401.3 1383.1 " fill="none"></path>
 					</g>
-					<path d="M27990.3 1037.4 L27989.4 1042.6 L27988.6 1047.9 L27976.2 1040.5 Z"></path>
+					<path d="M28691.5 1037.4 L28690.7 1042.6 L28689.8 1047.9 L28677.5 1040.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M34828.4 581.9 L34178.5 876 L34178.5 1025 L34178.5 1025 L34178.5 1174 L34178.5 1174 L34178.5 1390.5 L34178.5 1390.5 L34178.5 1607 L34178.5 1607 L34178.5 2167 L34178.5 2167.0 " fill="none"></path>
+						<path d="M35481.4 593.8 L35091.25 876 L35091.25 1025 L35091.25 1025 L35091.25 1174 L35091.25 1174 L35091.25 1390.5 L35091.25 1390.5 L35091.25 1607 L35091.25 1607 L36441.932148040636 2227 L36441.9 2227.0 " fill="none"></path>
 					</g>
-					<path d="M34830.6 586.7 L34828.4 581.9 L34826.2 577.0 L34840.5 576.4 Z"></path>
-					<path d="M34627.3 1162.1 L34602.5 1174 L34602.5 1390.5 L34602.5 1390.5 L34602.5 1607 L34602.5 1607 L34602.5 2236 L34602.5 2236 L34602.5 2865 L34602.5 2865 L21826.5 3048.8876326451864 L21826.5 3048.9 " fill="none"></path>
+					<path d="M35484.5 598.1 L35481.4 593.8 L35478.3 589.5 L35492.2 586.0 Z"></path>
+					<path d="M35478.5 1158.9 L35423.25 1174 L35423.25 1390.5 L35423.25 1390.5 L35423.25 1607 L35423.25 1607 L35423.25 2296 L35423.25 2296 L35423.25 2985 L35423.25 2985 L19111 3169.447722622205 L19111.0 3169.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34638.0 1162.9 L34627.3 1162.1 L34633.4 1153.2 L34644.1 1154.0 Z"></path>
+						<path d="M35488.9 1161.6 L35478.5 1158.9 L35486.1 1151.3 L35496.5 1154.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M34920.3 599.3 L34912.5 876 L34912.5 896 L34912.5 896.0 " fill="none"></path>
+						<path d="M35623.9 594.4 L35969.25 876 L35969.25 896 L35969.3 896.0 " fill="none"></path>
+					</g>
+					<path d="M35627.2 590.3 L35623.9 594.4 L35620.5 598.6 L35613.5 586.0 Z"></path>
+					<path d="M35667.9 1159.4 L35635.25 1174 L35635.25 1306.5 L35635.3 1306.5 " fill="none"></path>
+					<path d="M35670.1 1164.3 L35667.9 1159.4 L35665.7 1154.6 L35680.1 1154.0 Z"></path>
+					<path d="M36039.2 1165.9 L36043.25 1174 L36043.25 1321.5 L36043.3 1321.5 " fill="none"></path>
+					<path d="M36044.0 1163.6 L36039.2 1165.9 L36034.5 1168.3 L36033.3 1154.0 Z"></path>
+					<path d="M36454.8 1157.5 L36515.25 1174 L36515.25 1321.5 L36515.3 1321.5 " fill="none"></path>
+					<path d="M36456.2 1152.4 L36454.8 1157.5 L36453.4 1162.7 L36442.0 1154.0 Z"></path>
+					<path d="M36566.5 1109.1 L37027.25 1174 L37027.25 1314 L37027.3 1314.0 " fill="none"></path>
+					<path d="M36567.2 1103.8 L36566.5 1109.1 L36565.7 1114.4 L36553.3 1107.2 Z"></path>
+					<path d="M37475.3 1553.2 L37475.25 1607 L24416.75 2294.473276026743 L24416.8 2294.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M37480.6 1543.8 L37475.3 1553.2 L37469.9 1543.8 L37475.3 1534.5 Z"></path>
 					</g>
-					<path d="M34925.6 599.5 L34920.3 599.3 L34915.0 599.2 L34920.7 586.0 Z"></path>
-					<path d="M34820.3 1165.1 L34814.5 1174 L34814.5 1306.5 L34814.5 1306.5 " fill="none"></path>
-					<path d="M34824.8 1168.1 L34820.3 1165.1 L34815.9 1162.2 L34827.7 1154.0 Z"></path>
-					<path d="M35192.9 1159.8 L35222.5 1174 L35222.5 1321.5 L35222.5 1321.5 " fill="none"></path>
-					<path d="M35195.2 1155.0 L35192.9 1159.8 L35190.6 1164.6 L35180.9 1154.0 Z"></path>
-					<path d="M35630.5 1553.2 L35630.5 1607 L21459.75 2234.7153999190127 L21459.8 2234.7 " fill="none"></path>
+					<path d="M36566.5 1084.1 L37475.25 1174 L37475.25 1246.5 L37475.3 1246.5 " fill="none"></path>
+					<path d="M36567.0 1078.8 L36566.5 1084.1 L36566.0 1089.4 L36553.3 1082.8 Z"></path>
+					<path d="M37859.3 1493.2 L37859.25 1607 L37859.25 2280.5 L37859.3 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35635.8 1543.8 L35630.5 1553.2 L35625.2 1543.8 L35630.5 1534.5 Z"></path>
+						<path d="M37864.6 1483.8 L37859.3 1493.2 L37853.9 1483.8 L37859.3 1474.5 Z"></path>
 					</g>
-					<path d="M35509.6 1148.9 L35630.5 1174 L35630.5 1246.5 L35630.5 1246.5 " fill="none"></path>
-					<path d="M35510.6 1143.7 L35509.6 1148.9 L35508.5 1154.1 L35496.5 1146.2 Z"></path>
-					<path d="M36014.5 1493.2 L36014.5 1607 L36014.5 2220.5 L36014.5 2220.5 " fill="none"></path>
+					<path d="M36566.5 1072.1 L37859.25 1174 L37859.25 1306.5 L37859.3 1306.5 " fill="none"></path>
+					<path d="M36567.0 1066.8 L36566.5 1072.1 L36566.1 1077.4 L36553.3 1071.0 Z"></path>
+					<path d="M11751.0 1455.7 L11751 1607 L23009.75 2266.33819935828 L23009.8 2266.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36019.8 1483.8 L36014.5 1493.2 L36009.2 1483.8 L36014.5 1474.5 Z"></path>
+						<path d="M11756.3 1446.3 L11751.0 1455.7 L11745.7 1446.3 L11751.0 1437.0 Z"></path>
 					</g>
-					<path d="M35509.7 1105.7 L36014.5 1174 L36014.5 1306.5 L36014.5 1306.5 " fill="none"></path>
-					<path d="M35510.4 1100.5 L35509.7 1105.7 L35509.0 1111.0 L35496.5 1104.0 Z"></path>
-					<path d="M13003.0 1478.2 L13003 1607 L23815.5 2207.8536531495715 L23815.5 2207.9 " fill="none"></path>
+					<path d="M14597.4 1029.5 L11751 1174 L11751 1344 L11751.0 1344.0 " fill="none"></path>
+					<path d="M14597.7 1034.9 L14597.4 1029.5 L14597.2 1024.2 L14610.8 1028.9 Z"></path>
+					<path d="M12143.0 1478.2 L12143 1607 L23009.75 2265.3158507902313 L23009.8 2265.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13008.3 1468.8 L13003.0 1478.2 L12997.7 1468.8 L13003.0 1459.5 Z"></path>
+						<path d="M12148.3 1468.8 L12143.0 1478.2 L12137.7 1468.8 L12143.0 1459.5 Z"></path>
 					</g>
-					<path d="M13153.6 1049.0 L13003 1174 L13003 1321.5 L13003.0 1321.5 " fill="none"></path>
-					<path d="M13157.0 1053.1 L13153.6 1049.0 L13150.2 1044.9 L13163.8 1040.5 Z"></path>
-					<path d="M21845.2 3045.1 L23774.333333333332 2983 L24261.291666666668 2983 L24261.291666666668 2983 L24748.25 3051.5 L24748.25 3051.5 L24261.291666666668 3120 L24261.291666666668 3120 L23774.333333333332 3120 L23774.333333333332 3120 L21826.5 3057.3387993112087 L21826.5 3057.3 " fill="none"></path>
+					<path d="M14597.4 1030.2 L12143 1174 L12143 1321.5 L12143.0 1321.5 " fill="none"></path>
+					<path d="M14597.8 1035.6 L14597.4 1030.2 L14597.1 1024.9 L14610.8 1029.5 Z"></path>
+					<path d="M19129.7 3166.5 L22291.333333333332 3088 L23086.416666666668 3088 L23086.416666666668 3088 L23881.5 3171.5 L23881.5 3171.5 L23086.416666666668 3255 L23086.416666666668 3255 L22291.333333333332 3255 L22291.333333333332 3255 L19111 3176.0080313321105 L19111.0 3176.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21835.7 3040.0 L21845.2 3045.1 L21836.0 3050.7 L21826.5 3045.7 Z"></path>
+						<path d="M19120.2 3161.4 L19129.7 3166.5 L19120.5 3172.1 L19111.0 3167.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3725.6 2262.4 L4149.5 2865 L21463.5 3049.565231059415 L21463.5 3049.6 " fill="none"></path>
+						<path d="M3724.2 2322.7 L4149.5 2985 L18748 3169.2097598105547 L18748.0 3169.2 " fill="none"></path>
+					</g>
+					<path d="M3728.6 2319.8 L3724.2 2322.7 L3719.7 2325.6 L3717.0 2311.5 Z"></path>
+					<path d="M12950.0 1455.7 L12950 1607 L23009.75 2262.972341180646 L23009.8 2263.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M12955.3 1446.3 L12950.0 1455.7 L12944.7 1446.3 L12950.0 1437.0 Z"></path>
 					</g>
-					<path d="M3729.9 2259.3 L3725.6 2262.4 L3721.2 2265.5 L3717.9 2251.5 Z"></path>
-					<path d="M29380.8 1440.2 L29380.75 1607 L24828.5 2173.022288114653 L24828.5 2173.0 " fill="none"></path>
+					<path d="M14597.5 1032.7 L12950 1174 L12950 1344 L12950.0 1344.0 " fill="none"></path>
+					<path d="M14597.9 1038.0 L14597.5 1032.7 L14597.0 1027.3 L14610.8 1031.5 Z"></path>
+					<path d="M31121.3 1440.2 L31121.25 1607 L24022.75 2250.111965811966 L24022.8 2250.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29386.1 1430.8 L29380.8 1440.2 L29375.4 1430.8 L29380.8 1421.5 Z"></path>
+						<path d="M31126.6 1430.8 L31121.3 1440.2 L31115.9 1430.8 L31121.3 1421.5 Z"></path>
 					</g>
-					<path d="M13395.0 1455.7 L13395 1607 L23815.5 2206.8439187334125 L23815.5 2206.8 " fill="none"></path>
+					<path d="M16864.0 1455.7 L16864 1607 L23009.75 2243.5397797737605 L23009.8 2243.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13400.3 1446.3 L13395.0 1455.7 L13389.7 1446.3 L13395.0 1437.0 Z"></path>
+						<path d="M16869.3 1446.3 L16864.0 1455.7 L16858.7 1446.3 L16864.0 1437.0 Z"></path>
 					</g>
-					<path d="M13215.5 1048.2 L13395 1174 L13395 1344 L13395.0 1344.0 " fill="none"></path>
-					<path d="M13218.6 1043.8 L13215.5 1048.2 L13212.5 1052.5 L13204.6 1040.5 Z"></path>
-					<path d="M17266.3 1455.7 L17266.25 1607 L23815.5 2190.846968784325 L23815.5 2190.8 " fill="none"></path>
+					<path d="M14597.5 1037.5 L13626 1174 L16688 1378.7322421247684 L16688.0 1378.7 " fill="none"></path>
+					<path d="M14598.3 1042.8 L14597.5 1037.5 L14596.8 1032.2 L14610.8 1035.7 Z"></path>
+					<path d="M18058.3 1455.7 L18058.25 1607 L23009.75 2232.0611029681204 L23009.8 2232.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17271.6 1446.3 L17266.3 1455.7 L17260.9 1446.3 L17266.3 1437.0 Z"></path>
+						<path d="M18063.6 1446.3 L18058.3 1455.7 L18052.9 1446.3 L18058.3 1437.0 Z"></path>
 					</g>
-					<path d="M13271.8 1031.1 L15353.75 1174 L17090.25 1370.5763398692811 L17090.3 1370.6 " fill="none"></path>
-					<path d="M13272.2 1025.8 L13271.8 1031.1 L13271.4 1036.4 L13258.5 1030.2 Z"></path>
-					<path d="M24521.0 2862.8 L24521.75 2865 L21826.5 3039.7333362301206 L21826.5 3039.7 " fill="none"></path>
+					<path d="M14775.9 1040.0 L15569.75 1174 L17882.25 1375.1879646373318 L17882.3 1375.2 " fill="none"></path>
+					<path d="M14776.8 1034.8 L14775.9 1040.0 L14775.0 1045.3 L14762.8 1037.8 Z"></path>
+					<path d="M23654.7 2983.3 L23655 2985 L19111 3164.3367897576977 L19111.0 3164.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24523.3 2852.3 L24521.0 2862.8 L24513.1 2855.5 L24515.4 2845.0 Z"></path>
+						<path d="M23658.0 2973.1 L23654.7 2983.3 L23647.6 2975.2 L23651.0 2965.0 Z"></path>
 					</g>
-					<path d="M24655.6 2861.5 L24657.5 2865 L26715.5 3046.516670607709 L26715.5 3046.5 " fill="none"></path>
+					<path d="M23789.7 2982.3 L23790.75 2985 L27416.75 3168.638560760353 L27416.8 3168.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24655.9 2850.7 L24655.6 2861.5 L24646.5 2855.7 L24646.8 2845.0 Z"></path>
+						<path d="M23791.2 2971.7 L23789.7 2982.3 L23781.3 2975.6 L23782.8 2965.0 Z"></path>
 					</g>
-					<path d="M24789.5 2859.9 L24793.25 2865 L24793.25 3051.5 L24793.25 3051.5 L24793.25 3238 L24793.25 3238 L24793.25 3394.5 L24793.25 3394.5 L24793.25 3551 L24793.25 3551 L36165.5 3586.3476961803653 L36165.5 3586.3 " fill="none"></path>
+					<path d="M23924.1 2981.0 L23926.5 2985 L23926.5 3171.5 L23926.5 3171.5 L23926.5 3358 L23926.5 3358 L23926.5 3514.5 L23926.5 3514.5 L23926.5 3671 L23926.5 3671 L37236.5 3706.3697881577964 L37236.5 3706.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24788.1 2849.3 L24789.5 2859.9 L24779.6 2855.7 L24778.3 2845.0 Z"></path>
+						<path d="M23923.9 2970.3 L23924.1 2981.0 L23914.8 2975.7 L23914.6 2965.0 Z"></path>
 					</g>
-					<path d="M24841.5 2770.2 L24933.75 2865 L3685.75 3050.896326875264 L3685.8 3050.9 " fill="none"></path>
+					<path d="M23963.6 2980.6 L23966.5 2985 L4035.75 3170.856566957087 L4035.8 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24838.8 2759.8 L24841.5 2770.2 L24831.2 2767.2 L24828.5 2756.8 Z"></path>
+						<path d="M23963.0 2969.9 L23963.6 2980.6 L23954.1 2975.7 L23953.4 2965.0 Z"></path>
 					</g>
-					<path d="M24841.9 2737.8 L24973.75 2865 L34132 3050.4369758163016 L34132.0 3050.4 " fill="none"></path>
+					<path d="M24003.1 2980.2 L24006.5 2985 L34918.25 3170.6069840618375 L34918.3 3170.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24838.9 2727.5 L24841.9 2737.8 L24831.5 2735.1 L24828.5 2724.8 Z"></path>
+						<path d="M24002.0 2969.5 L24003.1 2980.2 L23993.3 2975.7 L23992.3 2965.0 Z"></path>
 					</g>
-					<path d="M41385.8 1432.7 L41498.5 1607 L24828.5 2217.452071143714 L24828.5 2217.5 " fill="none"></path>
-					<path d="M41390.3 1429.8 L41385.8 1432.7 L41381.3 1435.6 L41378.5 1421.5 Z"></path>
+					<path d="M42632.0 1432.7 L42744.75 1607 L24022.75 2277.850976415217 L24022.8 2277.9 " fill="none"></path>
+					<path d="M42636.5 1429.8 L42632.0 1432.7 L42627.6 1435.6 L42624.8 1421.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M18000.2 1412.3 L18366.25 1607 L23815.5 2182.5074088066153 L23815.5 2182.5 " fill="none"></path>
+						<path d="M17523.2 1412.3 L17889.25 1607 L23009.75 2233.9814288253065 L23009.8 2234.0 " fill="none"></path>
 					</g>
-					<path d="M18002.7 1407.6 L18000.2 1412.3 L17997.7 1417.0 L17988.4 1406.0 Z"></path>
-					<path d="M30341.0 1447.7 L30341 1607 L24828.5 2183.0695298222295 L24828.5 2183.1 " fill="none"></path>
+					<path d="M17525.7 1407.6 L17523.2 1412.3 L17520.7 1417.0 L17511.4 1406.0 Z"></path>
+					<path d="M32345.3 1447.7 L32345.25 1607 L24022.75 2256.473609695322 L24022.8 2256.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30346.3 1438.3 L30341.0 1447.7 L30335.7 1438.3 L30341.0 1429.0 Z"></path>
+						<path d="M32350.6 1438.3 L32345.3 1447.7 L32339.9 1438.3 L32345.3 1429.0 Z"></path>
 					</g>
-					<path d="M37134.1 1036.9 L39057.5 1174 L39057.5 1375 L39057.5 1375.0 " fill="none"></path>
+					<path d="M38914.6 1039.1 L40517.75 1174 L40517.75 1375 L40517.8 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37125.2 1031.0 L37134.1 1036.9 L37124.4 1041.6 L37115.5 1035.6 Z"></path>
+						<path d="M38905.7 1033.0 L38914.6 1039.1 L38904.9 1043.6 L38896.0 1037.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M35016.7 555.1 L36966.5 876 L36966.5 941 L36966.5 941.0 " fill="none"></path>
+						<path d="M35651.3 549.5 L38747 876 L38747 941 L38747.0 941.0 " fill="none"></path>
 					</g>
-					<path d="M35017.5 549.8 L35016.7 555.1 L35015.8 560.3 L35003.5 552.9 Z"></path>
-					<path d="M26356.3 1097.7 L26356.25 1174 L26356.25 1239 L26356.3 1239.0 " fill="none"></path>
+					<path d="M35651.8 544.2 L35651.3 549.5 L35650.7 554.8 L35638.0 548.1 Z"></path>
+					<path d="M26977.0 1097.7 L26977 1174 L26977 1239 L26977.0 1239.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26361.6 1088.3 L26356.3 1097.7 L26350.9 1088.3 L26356.3 1079.0 Z"></path>
+						<path d="M26982.3 1088.3 L26977.0 1097.7 L26971.7 1088.3 L26977.0 1079.0 Z"></path>
 					</g>
-					<path d="M7505.8 541.4 L26356.25 876 L26356.25 971 L26356.3 971.0 " fill="none"></path>
-					<path d="M7505.9 536.1 L7505.8 541.4 L7505.7 546.8 L7492.5 541.2 Z"></path>
-					<path d="M26387.6 1560.4 L26396.25 1607 L26396.25 2236 L26396.25 2236 L26396.25 2865 L26396.25 2865 L26740.77144772118 3036 L26740.8 3036.0 " fill="none"></path>
+					<path d="M6517.6 541.3 L26977 876 L26977 971 L26977.0 971.0 " fill="none"></path>
+					<path d="M6517.7 536.0 L6517.6 541.3 L6517.5 546.6 L6504.3 541.1 Z"></path>
+					<path d="M27070.4 1558.3 L27097.5 1607 L27097.5 2296 L27097.5 2296 L27097.5 2985 L27097.5 2985 L27442.02144772118 3156 L27442.0 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26391.2 1550.2 L26387.6 1560.4 L26380.7 1552.1 L26384.2 1542.0 Z"></path>
+						<path d="M27070.5 1547.6 L27070.4 1558.3 L27061.2 1552.7 L27061.3 1542.0 Z"></path>
 					</g>
-					<path d="M26418.7 1559.5 L26436.25 1607 L26436.25 2236 L26436.25 2236 L26436.25 2865 L26436.25 2865 L13057.75 3050.32255728451 L13057.8 3050.3 " fill="none"></path>
+					<path d="M27100.4 1557.0 L27137.5 1607 L27137.5 2296 L27137.5 2296 L27137.5 2985 L27137.5 2985 L12714.5 3170.4073269920045 L12714.5 3170.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26420.5 1548.9 L26418.7 1559.5 L26410.5 1552.6 L26412.2 1542.0 Z"></path>
+						<path d="M27099.2 1546.3 L27100.4 1557.0 L27090.6 1552.7 L27089.3 1542.0 Z"></path>
 					</g>
-					<path d="M15340.0 1401.6 L17097.25 1607 L17097.25 2205 L17097.3 2205.0 " fill="none"></path>
-					<path d="M15340.6 1396.3 L15340.0 1401.6 L15339.4 1406.9 L15326.8 1400.1 Z"></path>
-					<path d="M31053.5 1470.2 L31053.5 1607 L13895.25 2233.371599367392 L13895.3 2233.4 " fill="none"></path>
+					<path d="M13965.3 1397.5 L16824 1607 L16824 2265 L16824.0 2265.0 " fill="none"></path>
+					<path d="M13965.7 1392.2 L13965.3 1397.5 L13964.9 1402.8 L13952.0 1396.5 Z"></path>
+					<path d="M33001.8 1470.2 L33001.75 1607 L14469 2293.3335841653343 L14469.0 2293.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31058.8 1460.8 L31053.5 1470.2 L31048.2 1460.8 L31053.5 1451.5 Z"></path>
+						<path d="M33007.1 1460.8 L33001.8 1470.2 L32996.4 1460.8 L33001.8 1451.5 Z"></path>
 					</g>
-					<path d="M28462.0 2285.7 L28462 2865 L14646.75 3049.5232395753137 L14646.8 3049.5 " fill="none"></path>
+					<path d="M29163.3 2345.7 L29163.25 2985 L14694.5 3169.611618519849 L14694.5 3169.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28467.3 2276.3 L28462.0 2285.7 L28456.7 2276.3 L28462.0 2267.0 Z"></path>
+						<path d="M29168.6 2336.3 L29163.3 2345.7 L29157.9 2336.3 L29163.3 2327.0 Z"></path>
 					</g>
-					<path d="M31383.5 1463.2 L31383.5 1607 L13480.25 2234.7552365688803 L13480.3 2234.8 " fill="none"></path>
+					<path d="M33331.8 1463.2 L33331.75 1607 L14109 2294.7299209429725 L14109.0 2294.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31388.8 1453.8 L31383.5 1463.2 L31378.2 1453.8 L31383.5 1444.5 Z"></path>
+						<path d="M33337.1 1453.8 L33331.8 1463.2 L33326.4 1453.8 L33331.8 1444.5 Z"></path>
 					</g>
-					<path d="M17928.7 2443.1 L17825.75 2865 L30874 3050.4270787694068 L30874.0 3050.4 " fill="none"></path>
+					<path d="M17413.8 2503.2 L17306.5 2985 L31265.5 3170.496704549503 L31265.5 3170.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17936.1 2435.3 L17928.7 2443.1 L17925.7 2432.8 L17933.1 2425.0 Z"></path>
+						<path d="M17421.1 2495.3 L17413.8 2503.2 L17410.7 2493.0 L17417.9 2485.0 Z"></path>
 					</g>
-					<path d="M17959.4 2443.6 L17919.25 2865 L28529.25 3050.260275255126 L28529.3 3050.3 " fill="none"></path>
+					<path d="M17441.9 2503.6 L17400 2985 L29116.75 3170.3766728171195 L29116.8 3170.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17965.6 2434.8 L17959.4 2443.6 L17955.0 2433.8 L17961.2 2425.0 Z"></path>
+						<path d="M17448.0 2494.8 L17441.9 2503.6 L17437.4 2493.8 L17443.5 2485.0 Z"></path>
 					</g>
-					<path d="M17972.6 2443.7 L17959.25 2865 L14310.75 3047.9153897849465 L14310.8 3047.9 " fill="none"></path>
+					<path d="M17454.0 2503.7 L17440 2985 L14358.5 3167.2707738661593 L14358.5 3167.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17978.3 2434.5 L17972.6 2443.7 L17967.6 2434.2 L17973.2 2425.0 Z"></path>
+						<path d="M17459.6 2494.5 L17454.0 2503.7 L17448.9 2494.2 L17454.5 2485.0 Z"></path>
 					</g>
-					<path d="M17985.9 2443.7 L17999.25 2865 L32242.75 3050.899629098289 L32242.8 3050.9 " fill="none"></path>
+					<path d="M17494.2 2503.4 L17573.5 2985 L33102.25 3170.9491725388853 L33102.3 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17990.9 2434.2 L17985.9 2443.7 L17980.2 2434.5 L17985.3 2425.0 Z"></path>
+						<path d="M17497.9 2493.3 L17494.2 2503.4 L17487.4 2495.1 L17491.1 2485.0 Z"></path>
 					</g>
-					<path d="M17999.1 2443.6 L18039.25 2865 L13057.75 3048.3711141813874 L13057.8 3048.4 " fill="none"></path>
+					<path d="M17506.2 2503.2 L17613.5 2985 L12714.5 3168.3193218298557 L12714.5 3168.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18003.5 2433.8 L17999.1 2443.6 L17992.9 2434.8 L17997.3 2425.0 Z"></path>
+						<path d="M17509.3 2493.0 L17506.2 2503.2 L17498.9 2495.3 L17502.1 2485.0 Z"></path>
 					</g>
-					<path d="M18029.8 2443.1 L18132.75 2865 L14835.75 3047.37891146374 L14835.8 3047.4 " fill="none"></path>
+					<path d="M17518.1 2503.0 L17653.5 2985 L14883.5 3166.615398136755 L14883.5 3166.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18032.8 2432.8 L18029.8 2443.1 L18022.4 2435.3 L18025.4 2425.0 Z"></path>
+						<path d="M17520.7 2492.5 L17518.1 2503.0 L17510.5 2495.4 L17513.1 2485.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M7003.2 1417.7 L7107 1607 L17672.25 2218.238910988986 L17672.3 2218.2 " fill="none"></path>
+						<path d="M7003.2 1417.7 L7107 1607 L17153 2275.5689172220614 L17153.0 2275.6 " fill="none"></path>
 					</g>
 					<path d="M7007.8 1415.1 L7003.2 1417.7 L6998.5 1420.3 L6996.8 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3727.0 2262.1 L4189.5 2865 L14350.75 3048.8225986371463 L14350.8 3048.8 " fill="none"></path>
+						<path d="M3725.5 2322.4 L4189.5 2985 L14398.5 3168.834942550932 L14398.5 3168.8 " fill="none"></path>
 					</g>
-					<path d="M3731.2 2258.8 L3727.0 2262.1 L3722.8 2265.3 L3718.9 2251.5 Z"></path>
-					<path d="M32095.8 1548.9 L32047.75 1607 L32047.75 2220.5 L32047.8 2220.5 " fill="none"></path>
+					<path d="M3729.9 2319.4 L3725.5 2322.4 L3721.1 2325.5 L3717.9 2311.5 Z"></path>
+					<path d="M33633.5 1548.0 L33577.5 1607 L33577.5 2280.5 L33577.5 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32105.9 1545.1 L32095.8 1548.9 L32097.6 1538.3 L32107.7 1534.5 Z"></path>
+						<path d="M33643.8 1544.9 L33633.5 1548.0 L33636.1 1537.6 L33646.4 1534.5 Z"></path>
 					</g>
-					<path d="M32329.3 1550.2 L32365.75 1607 L32365.75 2220.5 L32365.8 2220.5 " fill="none"></path>
+					<path d="M34039.8 1524.7 L34197 1607 L34197 2280.5 L34197.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32328.7 1539.5 L32329.3 1550.2 L32319.8 1545.2 L32319.2 1534.5 Z"></path>
+						<path d="M34034.0 1515.7 L34039.8 1524.7 L34029.0 1525.1 L34023.3 1516.1 Z"></path>
 					</g>
-					<path d="M32455.2 1545.0 L32547 1607 L13480.25 2234.831053933437 L13480.3 2234.8 " fill="none"></path>
+					<path d="M34040.3 1506.3 L34263.75 1607 L14109 2294.7885489283194 L14109.0 2294.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32450.5 1535.3 L32455.2 1545.0 L32444.5 1544.1 L32439.8 1534.5 Z"></path>
+						<path d="M34034.0 1497.6 L34040.3 1506.3 L34029.6 1507.3 L34023.3 1498.6 Z"></path>
 					</g>
-					<path d="M32482.4 1544.1 L32587 1607 L18286.25 2222.780784172785 L18286.3 2222.8 " fill="none"></path>
+					<path d="M34040.5 1497.5 L34303.75 1607 L17767 2283.4420482374767 L17767.0 2283.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32477.1 1534.7 L32482.4 1544.1 L32471.6 1543.9 L32466.4 1534.5 Z"></path>
+						<path d="M34033.9 1489.0 L34040.5 1497.5 L34029.8 1498.8 L34023.3 1490.3 Z"></path>
 					</g>
-					<path d="M2853.7 2952.2 L2867 2945.5 L2874.5 2945.5 L2874.5 2945.5 L2882 3051.5 L2882 3051.5 L2874.5 3157.5 L2874.5 3157.5 L2867 3157.5 L2867 3157.5 L2837 3142.393111638955 L2837.0 3142.4 " fill="none"></path>
+					<path d="M2853.7 3072.2 L2867 3065.5 L2874.5 3065.5 L2874.5 3065.5 L2882 3171.5 L2882 3171.5 L2874.5 3277.5 L2874.5 3277.5 L2867 3277.5 L2867 3277.5 L2837 3262.393111638955 L2837.0 3262.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2842.9 2951.6 L2853.7 2952.2 L2847.7 2961.2 L2837.0 2960.6 Z"></path>
+						<path d="M2842.9 3071.6 L2853.7 3072.2 L2847.7 3081.2 L2837.0 3080.6 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3733.2 2260.6 L4376.5 2865 L2837 3031.928343023256 L2837.0 3031.9 " fill="none"></path>
+						<path d="M3731.4 2321.1 L4376.5 2985 L2837 3151.928343023256 L2837.0 3151.9 " fill="none"></path>
 					</g>
-					<path d="M3736.9 2256.7 L3733.2 2260.6 L3729.6 2264.5 L3723.5 2251.5 Z"></path>
-					<path d="M30071.0 2352.5 L29929.25 2865 L37659.25 3050.7670253205333 L37659.3 3050.8 " fill="none"></path>
+					<path d="M3735.2 2317.3 L3731.4 2321.1 L3727.5 2324.8 L3722.1 2311.5 Z"></path>
+					<path d="M30465.3 2412.6 L30320.75 2985 L39165.25 3170.8590704225353 L39165.3 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30078.7 2344.9 L30071.0 2352.5 L30068.4 2342.1 L30076.0 2334.5 Z"></path>
+						<path d="M30472.8 2404.9 L30465.3 2412.6 L30462.4 2402.2 L30469.9 2394.5 Z"></path>
 					</g>
-					<path d="M30137.4 2352.4 L30287.5 2865 L30287.5 3036 L30287.5 3036.0 " fill="none"></path>
+					<path d="M30525.9 2412.5 L30679 2985 L30679 3156 L30679.0 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30139.8 2342.0 L30137.4 2352.4 L30129.6 2345.0 L30132.1 2334.5 Z"></path>
+						<path d="M30528.7 2402.1 L30525.9 2412.5 L30518.3 2404.9 L30521.1 2394.5 Z"></path>
 					</g>
-					<path d="M30182.0 2349.9 L30538.5 2865 L30538.5 3036 L30538.5 3036.0 " fill="none"></path>
+					<path d="M30566.9 2410.3 L30930 2985 L30930 3156 L30930.0 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30181.1 2339.1 L30182.0 2349.9 L30172.3 2345.2 L30171.4 2334.5 Z"></path>
+						<path d="M30566.5 2399.5 L30566.9 2410.3 L30557.4 2405.2 L30557.0 2394.5 Z"></path>
 					</g>
-					<path d="M13271.8 1030.7 L15530.25 1174 L17482.25 1380.2508540751587 L17482.3 1380.3 " fill="none"></path>
-					<path d="M13272.1 1025.3 L13271.8 1030.7 L13271.5 1036.0 L13258.5 1029.8 Z"></path>
+					<path d="M14776.0 1035.3 L15972.75 1174 L18727.25 1383.1352796773629 L18727.3 1383.1 " fill="none"></path>
+					<path d="M14776.6 1030.0 L14776.0 1035.3 L14775.4 1040.6 L14762.8 1033.8 Z"></path>
 					<g data-name="IAppDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
-							<rect x="33253.0" y="60.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
-							<path d="M33253.0 91.5 L33450.0 91.5" fill="none" data-name="IAppDelegate"></path>
+							<rect x="33546.5" y="60.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
+							<path d="M33546.5 91.5 L33743.5 91.5" fill="none" data-name="IAppDelegate"></path>
 						</g>
-						<g transform="translate(33253, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
+						<g transform="translate(33546.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
 								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33253, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
+						<g transform="translate(33546.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
 								
@@ -3674,26 +3727,25 @@
 					</g>
 					<g data-name="AppController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
-							<rect x="398.8" y="2159.5" height="153.0" width="340.0" data-name="AppController"></rect>
-							<path d="M398.8 2190.5 L738.8 2190.5" fill="none" data-name="AppController"></path>
-							<path d="M398.8 2266.5 L738.8 2266.5" fill="none" data-name="AppController"></path>
+							<rect x="33783.5" y="22.5" height="138.0" width="301.0" data-name="AppController"></rect>
+							<path d="M33783.5 53.5 L34084.5 53.5" fill="none" data-name="AppController"></path>
+							<path d="M33783.5 114.5 L34084.5 114.5" fill="none" data-name="AppController"></path>
 						</g>
-						<g transform="translate(398.75, 2159.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
+						<g transform="translate(33783.5, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
-								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
+								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(398.75, 2190.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+						<g transform="translate(33783.5, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+sharedPreferences: SharedPreferences</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
+								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(398.75, 2266.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+						<g transform="translate(33783.5, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
@@ -3701,17 +3753,6 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="SharedPreferences">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SharedPreferences">
-							<rect x="15061.8" y="3036.0" height="31.0" width="169.0" data-name="SharedPreferences"></rect>
-						</g>
-						<g transform="translate(15061.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SharedPreferences">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SharedPreferences">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="SharedPreferences">SharedPreferences</text>
-								
-							</g>
-						</g>
-					</g>
 					<g data-name="ParticipantDetailsFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsFormView">
 							<rect x="0.0" y="1344.0" height="93.0" width="419.0" data-name="ParticipantDetailsFormView"></rect>
@@ -3739,17 +3780,17 @@
 					</g>
 					<g data-name="ParticipantDetailsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsFormViewModel">
-							<rect x="15848.3" y="2152.0" height="168.0" width="354.0" data-name="ParticipantDetailsFormViewModel"></rect>
-							<path d="M15848.3 2183.0 L16202.3 2183.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
-							<path d="M15848.3 2259.0 L16202.3 2259.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
+							<rect x="15575.0" y="2212.0" height="168.0" width="354.0" data-name="ParticipantDetailsFormViewModel"></rect>
+							<path d="M15575.0 2243.0 L15929.0 2243.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
+							<path d="M15575.0 2319.0 L15929.0 2319.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
 						</g>
-						<g transform="translate(15848.25, 2152)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsFormViewModel">
+						<g transform="translate(15575, 2212)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsFormViewModel">
 								<text x="169.0" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsFormViewModel">ParticipantDetailsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15848.25, 2183)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
+						<g transform="translate(15575, 2243)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+participantIdControl: FormControl&lt;String&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+rawDataControl: FormControl&lt;String&gt;</text>
@@ -3758,7 +3799,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(15848.25, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
+						<g transform="translate(15575, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+void initControls()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+StudyMonitorItem buildFormData()</text>
@@ -3769,9 +3810,9 @@
 					</g>
 					<g data-name="FormConsumerWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="7300.5" y="524.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
+							<rect x="6312.3" y="524.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
 						</g>
-						<g transform="translate(7300.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+						<g transform="translate(6312.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
 								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
 								
@@ -3780,16 +3821,16 @@
 					</g>
 					<g data-name="StudyMonitorScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="12581.3" y="2182.5" height="107.0" width="280.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M12581.3 2213.5 L12861.3 2213.5" fill="none" data-name="StudyMonitorScreen"></path>
+							<rect x="12979.0" y="2242.5" height="107.0" width="280.0" data-name="StudyMonitorScreen"></rect>
+							<path d="M12979.0 2273.5 L13259.0 2273.5" fill="none" data-name="StudyMonitorScreen"></path>
 						</g>
-						<g transform="translate(12581.25, 2182.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
+						<g transform="translate(12979, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
 								<text x="132.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12581.25, 2213.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
+						<g transform="translate(12979, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorScreen">-Widget _monitorSectionHeader()</text>
@@ -3801,23 +3842,23 @@
 					</g>
 					<g data-name="StudyPageWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="15162.8" y="1344.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
-							<path d="M15162.8 1375.0 L15326.8 1375.0" fill="none" data-name="StudyPageWidget"></path>
-							<path d="M15162.8 1406.0 L15326.8 1406.0" fill="none" data-name="StudyPageWidget"></path>
+							<rect x="13788.0" y="1344.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
+							<path d="M13788.0 1375.0 L13952.0 1375.0" fill="none" data-name="StudyPageWidget"></path>
+							<path d="M13788.0 1406.0 L13952.0 1406.0" fill="none" data-name="StudyPageWidget"></path>
 						</g>
-						<g transform="translate(15162.75, 1344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
+						<g transform="translate(13788, 1344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
 								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15162.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+						<g transform="translate(13788, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15162.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+						<g transform="translate(13788, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
 								
@@ -3826,17 +3867,17 @@
 					</g>
 					<g data-name="StudyMonitorItem">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorItem">
-							<rect x="33863.5" y="410.5" height="258.0" width="371.0" data-name="StudyMonitorItem"></rect>
-							<path d="M33863.5 441.5 L34234.5 441.5" fill="none" data-name="StudyMonitorItem"></path>
-							<path d="M33863.5 637.5 L34234.5 637.5" fill="none" data-name="StudyMonitorItem"></path>
+							<rect x="34498.0" y="410.5" height="258.0" width="371.0" data-name="StudyMonitorItem"></rect>
+							<path d="M34498.0 441.5 L34869.0 441.5" fill="none" data-name="StudyMonitorItem"></path>
+							<path d="M34498.0 637.5 L34869.0 637.5" fill="none" data-name="StudyMonitorItem"></path>
 						</g>
-						<g transform="translate(33863.5, 410.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorItem">
+						<g transform="translate(34498, 410.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorItem">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorItem">
 								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorItem">StudyMonitorItem</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33863.5, 441.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
+						<g transform="translate(34498, 441.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">+participantId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorItem">+inviteCode: String?</text>
@@ -3853,7 +3894,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(33863.5, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
+						<g transform="translate(34498, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">&lt;static&gt;+List&lt;StudyMonitorItem&gt; fromStudy()</text>
 								
@@ -3862,9 +3903,9 @@
 					</g>
 					<g data-name="Equatable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="34321.5" y="76.0" height="31.0" width="96.0" data-name="Equatable"></rect>
+							<rect x="34956.0" y="76.0" height="31.0" width="96.0" data-name="Equatable"></rect>
 						</g>
-						<g transform="translate(34321.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
+						<g transform="translate(34956, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
 								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
 								
@@ -3873,24 +3914,24 @@
 					</g>
 					<g data-name="StudyMonitorTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorTable">
-							<rect x="33490.0" y="15.0" height="153.0" width="395.0" data-name="StudyMonitorTable"></rect>
-							<path d="M33490.0 46.0 L33885.0 46.0" fill="none" data-name="StudyMonitorTable"></path>
-							<path d="M33490.0 92.0 L33885.0 92.0" fill="none" data-name="StudyMonitorTable"></path>
+							<rect x="34124.5" y="15.0" height="153.0" width="395.0" data-name="StudyMonitorTable"></rect>
+							<path d="M34124.5 46.0 L34519.5 46.0" fill="none" data-name="StudyMonitorTable"></path>
+							<path d="M34124.5 92.0 L34519.5 92.0" fill="none" data-name="StudyMonitorTable"></path>
 						</g>
-						<g transform="translate(33490, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorTable">
+						<g transform="translate(34124.5, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorTable">
 								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorTable">StudyMonitorTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33490, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
+						<g transform="translate(34124.5, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+studyMonitorItems: List&lt;StudyMonitorItem&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">+onSelectItem: void Function(StudyMonitorItem)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33490, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
+						<g transform="translate(34124.5, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">-List&lt;Widget&gt; _buildRow()</text>
@@ -3902,9 +3943,9 @@
 					</g>
 					<g data-name="void Function(StudyMonitorItem)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyMonitorItem)">
-							<rect x="33551.5" y="524.0" height="31.0" width="272.0" data-name="void Function(StudyMonitorItem)"></rect>
+							<rect x="34186.0" y="524.0" height="31.0" width="272.0" data-name="void Function(StudyMonitorItem)"></rect>
 						</g>
-						<g transform="translate(33551.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyMonitorItem)">
+						<g transform="translate(34186, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyMonitorItem)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyMonitorItem)">
 								<text x="128.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyMonitorItem)">void Function(StudyMonitorItem)</text>
 								
@@ -3913,9 +3954,9 @@
 					</g>
 					<g data-name="FormControl">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="26715.5" y="3036.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+							<rect x="27416.8" y="3156.0" height="31.0" width="113.0" data-name="FormControl"></rect>
 						</g>
-						<g transform="translate(26715.5, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+						<g transform="translate(27416.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
 								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
 								
@@ -3924,9 +3965,9 @@
 					</g>
 					<g data-name="FormGroup">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="34132.0" y="3036.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
+							<rect x="34918.3" y="3156.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
 						</g>
-						<g transform="translate(34132, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+						<g transform="translate(34918.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
 								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
 								
@@ -3935,17 +3976,17 @@
 					</g>
 					<g data-name="FormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="41664.0" y="223.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
-							<path d="M41664.0 254.0 L42536.0 254.0" fill="none" data-name="FormViewModel"></path>
-							<path d="M41664.0 570.0 L42536.0 570.0" fill="none" data-name="FormViewModel"></path>
+							<rect x="42910.3" y="223.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
+							<path d="M42910.3 254.0 L43782.3 254.0" fill="none" data-name="FormViewModel"></path>
+							<path d="M42910.3 570.0 L43782.3 570.0" fill="none" data-name="FormViewModel"></path>
 						</g>
-						<g transform="translate(41664, 223)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
+						<g transform="translate(42910.25, 223)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
 								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41664, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+						<g transform="translate(42910.25, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
@@ -3970,7 +4011,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(41664, 570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+						<g transform="translate(42910.25, 570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
@@ -3996,23 +4037,23 @@
 					</g>
 					<g data-name="LoginForm">
 						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
-							<rect x="778.8" y="2189.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
-							<path d="M778.8 2220.5 L985.8 2220.5" fill="none" data-name="LoginForm"></path>
-							<path d="M778.8 2251.5 L985.8 2251.5" fill="none" data-name="LoginForm"></path>
+							<rect x="778.8" y="2249.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
+							<path d="M778.8 2280.5 L985.8 2280.5" fill="none" data-name="LoginForm"></path>
+							<path d="M778.8 2311.5 L985.8 2311.5" fill="none" data-name="LoginForm"></path>
 						</g>
-						<g transform="translate(778.75, 2189.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
+						<g transform="translate(778.75, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
 								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(778.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+						<g transform="translate(778.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(778.75, 2251.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+						<g transform="translate(778.75, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
 								
@@ -4021,16 +4062,16 @@
 					</g>
 					<g data-name="AuthFormKey">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
-							<rect x="2927.0" y="2968.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
-							<path d="M2927.0 2999.0 L3282.0 2999.0" fill="none" data-name="AuthFormKey"></path>
+							<rect x="2927.0" y="3088.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
+							<path d="M2927.0 3119.0 L3282.0 3119.0" fill="none" data-name="AuthFormKey"></path>
 						</g>
-						<g transform="translate(2927, 2968)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
+						<g transform="translate(2927, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
 								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2927, 2999)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
+						<g transform="translate(2927, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
@@ -4057,23 +4098,23 @@
 					</g>
 					<g data-name="PasswordRecoveryForm">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
-							<rect x="1025.8" y="2189.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
-							<path d="M1025.8 2220.5 L1233.8 2220.5" fill="none" data-name="PasswordRecoveryForm"></path>
-							<path d="M1025.8 2251.5 L1233.8 2251.5" fill="none" data-name="PasswordRecoveryForm"></path>
+							<rect x="1025.8" y="2249.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
+							<path d="M1025.8 2280.5 L1233.8 2280.5" fill="none" data-name="PasswordRecoveryForm"></path>
+							<path d="M1025.8 2311.5 L1233.8 2311.5" fill="none" data-name="PasswordRecoveryForm"></path>
 						</g>
-						<g transform="translate(1025.75, 2189.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
+						<g transform="translate(1025.75, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
 								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1025.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+						<g transform="translate(1025.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1025.75, 2251.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+						<g transform="translate(1025.75, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
 								
@@ -4082,23 +4123,23 @@
 					</g>
 					<g data-name="PasswordForgotForm">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
-							<rect x="1273.8" y="2189.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
-							<path d="M1273.8 2220.5 L1480.8 2220.5" fill="none" data-name="PasswordForgotForm"></path>
-							<path d="M1273.8 2251.5 L1480.8 2251.5" fill="none" data-name="PasswordForgotForm"></path>
+							<rect x="1273.8" y="2249.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
+							<path d="M1273.8 2280.5 L1480.8 2280.5" fill="none" data-name="PasswordForgotForm"></path>
+							<path d="M1273.8 2311.5 L1480.8 2311.5" fill="none" data-name="PasswordForgotForm"></path>
 						</g>
-						<g transform="translate(1273.75, 2189.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
+						<g transform="translate(1273.75, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
 								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1273.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+						<g transform="translate(1273.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1273.75, 2251.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+						<g transform="translate(1273.75, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
 								
@@ -4107,23 +4148,23 @@
 					</g>
 					<g data-name="SignupForm">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
-							<rect x="1520.8" y="2174.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
-							<path d="M1520.8 2205.5 L1798.8 2205.5" fill="none" data-name="SignupForm"></path>
-							<path d="M1520.8 2236.5 L1798.8 2236.5" fill="none" data-name="SignupForm"></path>
+							<rect x="1520.8" y="2234.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
+							<path d="M1520.8 2265.5 L1798.8 2265.5" fill="none" data-name="SignupForm"></path>
+							<path d="M1520.8 2296.5 L1798.8 2296.5" fill="none" data-name="SignupForm"></path>
 						</g>
-						<g transform="translate(1520.75, 2174.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
+						<g transform="translate(1520.75, 2234.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
 								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1520.75, 2205.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+						<g transform="translate(1520.75, 2265.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1520.75, 2236.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+						<g transform="translate(1520.75, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
@@ -4156,9 +4197,9 @@
 					</g>
 					<g data-name="Widget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="13409.3" y="2220.5" height="31.0" width="71.0" data-name="Widget"></rect>
+							<rect x="14038.0" y="2280.5" height="31.0" width="71.0" data-name="Widget"></rect>
 						</g>
-						<g transform="translate(13409.25, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
+						<g transform="translate(14038, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
 								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
 								
@@ -4167,9 +4208,9 @@
 					</g>
 					<g data-name="EdgeInsets">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="3531.5" y="2220.5" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
+							<rect x="3531.5" y="2280.5" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
 						</g>
-						<g transform="translate(3531.5, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
+						<g transform="translate(3531.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
 								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
 								
@@ -4178,16 +4219,16 @@
 					</g>
 					<g data-name="EmailTextField">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
-							<rect x="2651.5" y="2182.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
-							<path d="M2651.5 2213.5 L2972.5 2213.5" fill="none" data-name="EmailTextField"></path>
+							<rect x="2651.5" y="2242.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
+							<path d="M2651.5 2273.5 L2972.5 2273.5" fill="none" data-name="EmailTextField"></path>
 						</g>
-						<g transform="translate(2651.5, 2182.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
+						<g transform="translate(2651.5, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
 								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2651.5, 2213.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
+						<g transform="translate(2651.5, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
 								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
@@ -4199,16 +4240,16 @@
 					</g>
 					<g data-name="PasswordTextField">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
-							<rect x="3012.5" y="2175.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
-							<path d="M3012.5 2206.0 L3491.5 2206.0" fill="none" data-name="PasswordTextField"></path>
+							<rect x="3012.5" y="2235.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
+							<path d="M3012.5 2266.0 L3491.5 2266.0" fill="none" data-name="PasswordTextField"></path>
 						</g>
-						<g transform="translate(3012.5, 2175)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
+						<g transform="translate(3012.5, 2235)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3012.5, 2206)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
+						<g transform="translate(3012.5, 2266)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
@@ -4221,9 +4262,9 @@
 					</g>
 					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<rect x="1219.8" y="3036.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
+							<rect x="1219.8" y="3156.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
 						</g>
-						<g transform="translate(1219.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+						<g transform="translate(1219.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
 								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
 								
@@ -4232,16 +4273,16 @@
 					</g>
 					<g data-name="StudyUJobsToBeDone">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
-							<rect x="34457.5" y="60.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
-							<path d="M34457.5 91.5 L34651.5 91.5" fill="none" data-name="StudyUJobsToBeDone"></path>
+							<rect x="35092.0" y="60.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
+							<path d="M35092.0 91.5 L35286.0 91.5" fill="none" data-name="StudyUJobsToBeDone"></path>
 						</g>
-						<g transform="translate(34457.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
+						<g transform="translate(35092, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
 								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34457.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
+						<g transform="translate(35092, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
 								
@@ -4250,41 +4291,38 @@
 					</g>
 					<g data-name="AuthFormController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
-							<rect x="39972.5" y="1934.5" height="603.0" width="850.0" data-name="AuthFormController"></rect>
-							<path d="M39972.5 1965.5 L40822.5 1965.5" fill="none" data-name="AuthFormController"></path>
-							<path d="M39972.5 2266.5 L40822.5 2266.5" fill="none" data-name="AuthFormController"></path>
+							<rect x="41218.8" y="2039.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
+							<path d="M41218.8 2070.5 L42068.8 2070.5" fill="none" data-name="AuthFormController"></path>
+							<path d="M41218.8 2326.5 L42068.8 2326.5" fill="none" data-name="AuthFormController"></path>
 						</g>
-						<g transform="translate(39972.5, 1934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
+						<g transform="translate(41218.75, 2039.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
 								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39972.5, 1965.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+						<g transform="translate(41218.75, 2070.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+sharedPreferences: SharedPreferences</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">+rememberMeControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="AuthFormController">+shouldRemember: bool</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39972.5, 2266.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
+								
+							</g>
+						</g>
+						<g transform="translate(41218.75, 2326.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
@@ -4300,18 +4338,15 @@
 								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
 								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
 								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">-void _setRememberMe()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">-void _delRememberMe()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="AuthFormController">-void _initRememberMe()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="IAuthRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="28529.3" y="3036.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
+							<rect x="29116.8" y="3156.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
 						</g>
-						<g transform="translate(28529.25, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
+						<g transform="translate(29116.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
 								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
 								
@@ -4320,9 +4355,9 @@
 					</g>
 					<g data-name="INotificationService">
 						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="26507.5" y="3036.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
+							<rect x="27208.8" y="3156.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
 						</g>
-						<g transform="translate(26507.5, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
+						<g transform="translate(27208.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
 								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
 								
@@ -4331,9 +4366,9 @@
 					</g>
 					<g data-name="GoRouter">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="32242.8" y="3036.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
+							<rect x="33102.3" y="3156.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
 						</g>
-						<g transform="translate(32242.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
+						<g transform="translate(33102.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
 								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
 								
@@ -4342,16 +4377,16 @@
 					</g>
 					<g data-name="IFormGroupController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="41401.3" y="60.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
-							<path d="M41401.3 91.5 L41588.3 91.5" fill="none" data-name="IFormGroupController"></path>
+							<rect x="42647.5" y="60.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
+							<path d="M42647.5 91.5 L42834.5 91.5" fill="none" data-name="IFormGroupController"></path>
 						</g>
-						<g transform="translate(41401.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
+						<g transform="translate(42647.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
 								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41401.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
+						<g transform="translate(42647.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
 								
@@ -4360,9 +4395,9 @@
 					</g>
 					<g data-name="Enum">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="3676.5" y="2220.5" height="31.0" width="61.0" data-name="Enum"></rect>
+							<rect x="3676.5" y="2280.5" height="31.0" width="61.0" data-name="Enum"></rect>
 						</g>
-						<g transform="translate(3676.5, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+						<g transform="translate(3676.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
 								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
@@ -4371,16 +4406,16 @@
 					</g>
 					<g data-name="AppStatus">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
-							<rect x="1680.0" y="2998.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
-							<path d="M1680.0 3029.0 L1959.0 3029.0" fill="none" data-name="AppStatus"></path>
+							<rect x="1680.0" y="3118.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
+							<path d="M1680.0 3149.0 L1959.0 3149.0" fill="none" data-name="AppStatus"></path>
 						</g>
-						<g transform="translate(1680, 2998)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
+						<g transform="translate(1680, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
 								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1680, 3029)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
+						<g transform="translate(1680, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
@@ -4392,17 +4427,17 @@
 					</g>
 					<g data-name="FormArrayTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
-							<rect x="2234.8" y="1194.0" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
-							<path d="M2234.8 1225.0 L2724.8 1225.0" fill="none" data-name="FormArrayTable"></path>
-							<path d="M2234.8 1526.0 L2724.8 1526.0" fill="none" data-name="FormArrayTable"></path>
+							<rect x="2016.3" y="1194.0" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
+							<path d="M2016.3 1225.0 L2506.3 1225.0" fill="none" data-name="FormArrayTable"></path>
+							<path d="M2016.3 1526.0 L2506.3 1526.0" fill="none" data-name="FormArrayTable"></path>
 						</g>
-						<g transform="translate(2234.75, 1194)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
+						<g transform="translate(2016.25, 1194)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
 								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2234.75, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+						<g transform="translate(2016.25, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
@@ -4426,7 +4461,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(2234.75, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+						<g transform="translate(2016.25, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
@@ -4437,9 +4472,9 @@
 					</g>
 					<g data-name="AbstractControl">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="3547.8" y="3036.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+							<rect x="3897.8" y="3156.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
 						</g>
-						<g transform="translate(3547.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+						<g transform="translate(3897.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
 								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
@@ -4448,9 +4483,9 @@
 					</g>
 					<g data-name="void Function(T)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="2056.5" y="2220.5" height="31.0" width="144.0" data-name="void Function(T)"></rect>
+							<rect x="2056.5" y="2280.5" height="31.0" width="144.0" data-name="void Function(T)"></rect>
 						</g>
-						<g transform="translate(2056.5, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
+						<g transform="translate(2056.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
 								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
 								
@@ -4459,9 +4494,9 @@
 					</g>
 					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<rect x="2240.5" y="2220.5" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
+							<rect x="2240.5" y="2280.5" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
 						</g>
-						<g transform="translate(2240.5, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+						<g transform="translate(2240.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
 								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
 								
@@ -4470,9 +4505,9 @@
 					</g>
 					<g data-name="void Function()?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="13751.3" y="2220.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
+							<rect x="14325.0" y="2280.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
 						</g>
-						<g transform="translate(13751.25, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
+						<g transform="translate(14325, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
 								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
 								
@@ -4481,9 +4516,9 @@
 					</g>
 					<g data-name="String Function(T)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
-							<rect x="3924.8" y="2220.5" height="31.0" width="157.0" data-name="String Function(T)"></rect>
+							<rect x="3924.8" y="2280.5" height="31.0" width="157.0" data-name="String Function(T)"></rect>
 						</g>
-						<g transform="translate(3924.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
+						<g transform="translate(3924.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
 								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
 								
@@ -4492,9 +4527,9 @@
 					</g>
 					<g data-name="IconData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="15501.3" y="2220.5" height="31.0" width="87.0" data-name="IconData"></rect>
+							<rect x="15448.0" y="2280.5" height="31.0" width="87.0" data-name="IconData"></rect>
 						</g>
-						<g transform="translate(15501.25, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
+						<g transform="translate(15448, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
 								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
 								
@@ -4503,9 +4538,9 @@
 					</g>
 					<g data-name="Widget Function(BuildContext, T, int)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
-							<rect x="4121.8" y="2220.5" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
+							<rect x="4121.8" y="2280.5" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
 						</g>
-						<g transform="translate(4121.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
+						<g transform="translate(4121.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
 								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
 								
@@ -4514,16 +4549,16 @@
 					</g>
 					<g data-name="ManagedFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="41160.5" y="1359.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
-							<path d="M41160.5 1390.5 L41556.5 1390.5" fill="none" data-name="ManagedFormViewModel"></path>
+							<rect x="42406.8" y="1359.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
+							<path d="M42406.8 1390.5 L42802.8 1390.5" fill="none" data-name="ManagedFormViewModel"></path>
 						</g>
-						<g transform="translate(41160.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+						<g transform="translate(42406.75, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
 								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41160.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
+						<g transform="translate(42406.75, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
 								
@@ -4532,9 +4567,9 @@
 					</g>
 					<g data-name="FormViewModelNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
-							<rect x="34504.5" y="524.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
+							<rect x="35139.0" y="524.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
 						</g>
-						<g transform="translate(34504.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
+						<g transform="translate(35139, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
 								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
 								
@@ -4543,9 +4578,9 @@
 					</g>
 					<g data-name="Exception">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="35202.3" y="76.0" height="31.0" width="94.0" data-name="Exception"></rect>
+							<rect x="35836.8" y="76.0" height="31.0" width="94.0" data-name="Exception"></rect>
 						</g>
-						<g transform="translate(35202.25, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
+						<g transform="translate(35836.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
 								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
 								
@@ -4554,17 +4589,17 @@
 					</g>
 					<g data-name="FormViewModelCollection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="38579.3" y="3258.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
-							<path d="M38579.3 3289.0 L38860.3 3289.0" fill="none" data-name="FormViewModelCollection"></path>
-							<path d="M38579.3 3380.0 L38860.3 3380.0" fill="none" data-name="FormViewModelCollection"></path>
+							<rect x="39008.3" y="3378.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
+							<path d="M39008.3 3409.0 L39289.3 3409.0" fill="none" data-name="FormViewModelCollection"></path>
+							<path d="M39008.3 3500.0 L39289.3 3500.0" fill="none" data-name="FormViewModelCollection"></path>
 						</g>
-						<g transform="translate(38579.25, 3258)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
+						<g transform="translate(39008.25, 3378)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
 								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38579.25, 3289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+						<g transform="translate(39008.25, 3409)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
@@ -4574,7 +4609,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(38579.25, 3380)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+						<g transform="translate(39008.25, 3500)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
@@ -4591,9 +4626,9 @@
 					</g>
 					<g data-name="FormArray">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="36165.5" y="3571.0" height="31.0" width="98.0" data-name="FormArray"></rect>
+							<rect x="37236.5" y="3691.0" height="31.0" width="98.0" data-name="FormArray"></rect>
 						</g>
-						<g transform="translate(36165.5, 3571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+						<g transform="translate(37236.5, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
 								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
 								
@@ -4602,17 +4637,17 @@
 					</g>
 					<g data-name="CustomFormControl">
 						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
-							<rect x="26565.5" y="3310.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
-							<path d="M26565.5 3341.5 L26978.5 3341.5" fill="none" data-name="CustomFormControl"></path>
-							<path d="M26565.5 3447.5 L26978.5 3447.5" fill="none" data-name="CustomFormControl"></path>
+							<rect x="27266.8" y="3430.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
+							<path d="M27266.8 3461.5 L27679.8 3461.5" fill="none" data-name="CustomFormControl"></path>
+							<path d="M27266.8 3567.5 L27679.8 3567.5" fill="none" data-name="CustomFormControl"></path>
 						</g>
-						<g transform="translate(26565.5, 3310.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
+						<g transform="translate(27266.75, 3430.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
 								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26565.5, 3341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+						<g transform="translate(27266.75, 3461.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
 								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
@@ -4623,7 +4658,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(26565.5, 3447.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+						<g transform="translate(27266.75, 3567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
 								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
 								
@@ -4632,9 +4667,9 @@
 					</g>
 					<g data-name="Debouncer">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="40467.0" y="3571.0" height="31.0" width="103.0" data-name="Debouncer"></rect>
+							<rect x="41307.5" y="3691.0" height="31.0" width="103.0" data-name="Debouncer"></rect>
 						</g>
-						<g transform="translate(40467, 3571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
+						<g transform="translate(41307.5, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
 								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
 								
@@ -4643,9 +4678,9 @@
 					</g>
 					<g data-name="void Function(T?)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
-							<rect x="27147.8" y="3571.0" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
+							<rect x="27703.8" y="3691.0" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
 						</g>
-						<g transform="translate(27147.75, 3571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
+						<g transform="translate(27703.75, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
 								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
 								
@@ -4654,9 +4689,9 @@
 					</g>
 					<g data-name="void Function(ControlStatus)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
-							<rect x="27351.8" y="3571.0" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
+							<rect x="27907.8" y="3691.0" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
 						</g>
-						<g transform="translate(27351.75, 3571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
+						<g transform="translate(27907.75, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
 								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
 								
@@ -4665,16 +4700,16 @@
 					</g>
 					<g data-name="UnsavedChangesDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
-							<rect x="41957.5" y="60.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
-							<path d="M41957.5 91.5 L42164.5 91.5" fill="none" data-name="UnsavedChangesDialog"></path>
+							<rect x="43203.8" y="60.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
+							<path d="M43203.8 91.5 L43410.8 91.5" fill="none" data-name="UnsavedChangesDialog"></path>
 						</g>
-						<g transform="translate(41957.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
+						<g transform="translate(43203.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
 								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41957.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
+						<g transform="translate(43203.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
 								
@@ -4683,9 +4718,9 @@
 					</g>
 					<g data-name="FormValidationSetEnum">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
-							<rect x="41637.5" y="1009.5" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
+							<rect x="42883.8" y="1009.5" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
 						</g>
-						<g transform="translate(41637.5, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
+						<g transform="translate(42883.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
 								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
 								
@@ -4694,17 +4729,17 @@
 					</g>
 					<g data-name="FormControlValidation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
-							<rect x="5209.8" y="2167.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
-							<path d="M5209.8 2198.0 L5694.8 2198.0" fill="none" data-name="FormControlValidation"></path>
-							<path d="M5209.8 2274.0 L5694.8 2274.0" fill="none" data-name="FormControlValidation"></path>
+							<rect x="5209.8" y="2227.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
+							<path d="M5209.8 2258.0 L5694.8 2258.0" fill="none" data-name="FormControlValidation"></path>
+							<path d="M5209.8 2334.0 L5694.8 2334.0" fill="none" data-name="FormControlValidation"></path>
 						</g>
-						<g transform="translate(5209.75, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
+						<g transform="translate(5209.75, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
 								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5209.75, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+						<g transform="translate(5209.75, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
@@ -4713,7 +4748,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(5209.75, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+						<g transform="translate(5209.75, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
 								
@@ -4722,23 +4757,23 @@
 					</g>
 					<g data-name="IFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="34840.5" y="493.0" height="93.0" width="163.0" data-name="IFormData"></rect>
-							<path d="M34840.5 524.0 L35003.5 524.0" fill="none" data-name="IFormData"></path>
-							<path d="M34840.5 555.0 L35003.5 555.0" fill="none" data-name="IFormData"></path>
+							<rect x="35475.0" y="493.0" height="93.0" width="163.0" data-name="IFormData"></rect>
+							<path d="M35475.0 524.0 L35638.0 524.0" fill="none" data-name="IFormData"></path>
+							<path d="M35475.0 555.0 L35638.0 555.0" fill="none" data-name="IFormData"></path>
 						</g>
-						<g transform="translate(34840.5, 493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
+						<g transform="translate(35475, 493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
 								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34840.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+						<g transform="translate(35475, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34840.5, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+						<g transform="translate(35475, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
 								
@@ -4747,9 +4782,9 @@
 					</g>
 					<g data-name="FormInvalidException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
-							<rect x="38854.8" y="524.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
+							<rect x="40101.0" y="524.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
 						</g>
-						<g transform="translate(38854.75, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
+						<g transform="translate(40101, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
 								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
 								
@@ -4758,16 +4793,16 @@
 					</g>
 					<g data-name="FormConfigException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
-							<rect x="39080.8" y="508.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
-							<path d="M39080.8 539.5 L39265.8 539.5" fill="none" data-name="FormConfigException"></path>
+							<rect x="40327.0" y="508.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
+							<path d="M40327.0 539.5 L40512.0 539.5" fill="none" data-name="FormConfigException"></path>
 						</g>
-						<g transform="translate(39080.75, 508.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
+						<g transform="translate(40327, 508.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
 								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39080.75, 539.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
+						<g transform="translate(40327, 539.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
 								
@@ -4776,16 +4811,16 @@
 					</g>
 					<g data-name="IFormViewModelDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="42195.8" y="986.5" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-							<path d="M42195.8 1017.5 L42412.8 1017.5" fill="none" data-name="IFormViewModelDelegate"></path>
+							<rect x="43442.0" y="986.5" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
+							<path d="M43442.0 1017.5 L43659.0 1017.5" fill="none" data-name="IFormViewModelDelegate"></path>
 						</g>
-						<g transform="translate(42195.75, 986.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
+						<g transform="translate(43442, 986.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
 								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42195.75, 1017.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
+						<g transform="translate(43442, 1017.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
@@ -4795,16 +4830,16 @@
 					</g>
 					<g data-name="FormControlOption">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
-							<rect x="34274.5" y="486.0" height="107.0" width="190.0" data-name="FormControlOption"></rect>
-							<path d="M34274.5 517.0 L34464.5 517.0" fill="none" data-name="FormControlOption"></path>
+							<rect x="34909.0" y="486.0" height="107.0" width="190.0" data-name="FormControlOption"></rect>
+							<path d="M34909.0 517.0 L35099.0 517.0" fill="none" data-name="FormControlOption"></path>
 						</g>
-						<g transform="translate(34274.5, 486)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
+						<g transform="translate(34909, 486)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
 								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34274.5, 517)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
+						<g transform="translate(34909, 517)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
@@ -4816,16 +4851,16 @@
 					</g>
 					<g data-name="FormMode">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
-							<rect x="26135.5" y="2990.5" height="122.0" width="282.0" data-name="FormMode"></rect>
-							<path d="M26135.5 3021.5 L26417.5 3021.5" fill="none" data-name="FormMode"></path>
+							<rect x="26836.8" y="3110.5" height="122.0" width="282.0" data-name="FormMode"></rect>
+							<path d="M26836.8 3141.5 L27118.8 3141.5" fill="none" data-name="FormMode"></path>
 						</g>
-						<g transform="translate(26135.5, 2990.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
+						<g transform="translate(26836.75, 3110.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
 								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26135.5, 3021.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
+						<g transform="translate(26836.75, 3141.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
@@ -4838,9 +4873,9 @@
 					</g>
 					<g data-name="CancelableOperation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="42859.3" y="1009.5" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
+							<rect x="44105.5" y="1009.5" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
 						</g>
-						<g transform="translate(42859.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
+						<g transform="translate(44105.5, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
 								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
 								
@@ -4849,23 +4884,23 @@
 					</g>
 					<g data-name="EnrolledBadge">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="42204.5" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M42204.5 76.0 L42370.5 76.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M42204.5 107.0 L42370.5 107.0" fill="none" data-name="EnrolledBadge"></path>
+							<rect x="43450.8" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
+							<path d="M43450.8 76.0 L43616.8 76.0" fill="none" data-name="EnrolledBadge"></path>
+							<path d="M43450.8 107.0 L43616.8 107.0" fill="none" data-name="EnrolledBadge"></path>
 						</g>
-						<g transform="translate(42204.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
+						<g transform="translate(43450.75, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
 								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42204.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+						<g transform="translate(43450.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42204.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+						<g transform="translate(43450.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
 								
@@ -4874,24 +4909,24 @@
 					</g>
 					<g data-name="StudyRecruitController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="5774.8" y="2144.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M5774.8 2175.5 L6425.8 2175.5" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M5774.8 2221.5 L6425.8 2221.5" fill="none" data-name="StudyRecruitController"></path>
+							<rect x="5774.8" y="2204.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
+							<path d="M5774.8 2235.5 L6425.8 2235.5" fill="none" data-name="StudyRecruitController"></path>
+							<path d="M5774.8 2281.5 L6425.8 2281.5" fill="none" data-name="StudyRecruitController"></path>
 						</g>
-						<g transform="translate(5774.75, 2144.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
+						<g transform="translate(5774.75, 2204.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
 								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5774.75, 2175.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+						<g transform="translate(5774.75, 2235.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5774.75, 2221.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+						<g transform="translate(5774.75, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
@@ -4905,9 +4940,9 @@
 					</g>
 					<g data-name="IInviteCodeRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="13097.8" y="3036.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
+							<rect x="12754.5" y="3156.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
 						</g>
-						<g transform="translate(13097.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
+						<g transform="translate(12754.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
 								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
 								
@@ -4916,9 +4951,9 @@
 					</g>
 					<g data-name="StreamSubscription">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="12887.8" y="3036.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+							<rect x="12544.5" y="3156.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
 						</g>
-						<g transform="translate(12887.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
+						<g transform="translate(12544.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
 								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
 								
@@ -4927,17 +4962,17 @@
 					</g>
 					<g data-name="StudyBaseController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="5211.5" y="1299.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
-							<path d="M5211.5 1330.0 L5757.5 1330.0" fill="none" data-name="StudyBaseController"></path>
-							<path d="M5211.5 1406.0 L5757.5 1406.0" fill="none" data-name="StudyBaseController"></path>
+							<rect x="4996.0" y="1299.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
+							<path d="M4996.0 1330.0 L5542.0 1330.0" fill="none" data-name="StudyBaseController"></path>
+							<path d="M4996.0 1406.0 L5542.0 1406.0" fill="none" data-name="StudyBaseController"></path>
 						</g>
-						<g transform="translate(5211.5, 1299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
+						<g transform="translate(4996, 1299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
 								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5211.5, 1330)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+						<g transform="translate(4996, 1330)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
@@ -4946,7 +4981,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(5211.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+						<g transform="translate(4996, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
@@ -4969,16 +5004,16 @@
 					</g>
 					<g data-name="StudyRecruitScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="13055.3" y="2182.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M13055.3 2213.5 L13369.3 2213.5" fill="none" data-name="StudyRecruitScreen"></path>
+							<rect x="13453.0" y="2242.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
+							<path d="M13453.0 2273.5 L13767.0 2273.5" fill="none" data-name="StudyRecruitScreen"></path>
 						</g>
-						<g transform="translate(13055.25, 2182.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
+						<g transform="translate(13453, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
 								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13055.25, 2213.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
+						<g transform="translate(13453, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
@@ -5016,17 +5051,17 @@
 					</g>
 					<g data-name="InviteCodeFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="18370.5" y="2047.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M18370.5 2078.0 L19037.5 2078.0" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M18370.5 2304.0 L19037.5 2304.0" fill="none" data-name="InviteCodeFormViewModel"></path>
+							<rect x="18545.0" y="2107.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
+							<path d="M18545.0 2138.0 L19212.0 2138.0" fill="none" data-name="InviteCodeFormViewModel"></path>
+							<path d="M18545.0 2364.0 L19212.0 2364.0" fill="none" data-name="InviteCodeFormViewModel"></path>
 						</g>
-						<g transform="translate(18370.5, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
+						<g transform="translate(18545, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
 								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18370.5, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+						<g transform="translate(18545, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
@@ -5045,7 +5080,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(18370.5, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+						<g transform="translate(18545, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
@@ -5060,17 +5095,17 @@
 					</g>
 					<g data-name="StudyInvitesTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="42858.5" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M42858.5 31.0 L43424.5 31.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M42858.5 137.0 L43424.5 137.0" fill="none" data-name="StudyInvitesTable"></path>
+							<rect x="44018.5" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
+							<path d="M44018.5 31.0 L44584.5 31.0" fill="none" data-name="StudyInvitesTable"></path>
+							<path d="M44018.5 137.0 L44584.5 137.0" fill="none" data-name="StudyInvitesTable"></path>
 						</g>
-						<g transform="translate(42858.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
+						<g transform="translate(44018.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
 								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42858.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+						<g transform="translate(44018.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
@@ -5081,7 +5116,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(42858.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+						<g transform="translate(44018.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
@@ -5091,9 +5126,9 @@
 					</g>
 					<g data-name="void Function(StudyInvite)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="42576.0" y="524.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
+							<rect x="43822.3" y="524.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(42576, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
+						<g transform="translate(43822.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
 								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
 								
@@ -5102,9 +5137,9 @@
 					</g>
 					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="42838.0" y="524.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
+							<rect x="44084.3" y="524.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(42838, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+						<g transform="translate(44084.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
 								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
 								
@@ -5113,9 +5148,9 @@
 					</g>
 					<g data-name="Intervention? Function(String)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="43298.0" y="524.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
+							<rect x="44544.3" y="524.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
 						</g>
-						<g transform="translate(43298, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
+						<g transform="translate(44544.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
 								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
 								
@@ -5124,9 +5159,9 @@
 					</g>
 					<g data-name="int Function(StudyInvite)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="43589.0" y="524.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
+							<rect x="44835.3" y="524.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(43589, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
+						<g transform="translate(44835.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
 								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
 								
@@ -5135,9 +5170,9 @@
 					</g>
 					<g data-name="Study">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="37659.3" y="3036.0" height="31.0" width="61.0" data-name="Study"></rect>
+							<rect x="39165.3" y="3156.0" height="31.0" width="61.0" data-name="Study"></rect>
 						</g>
-						<g transform="translate(37659.25, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
+						<g transform="translate(39165.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
 								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
 								
@@ -5146,16 +5181,16 @@
 					</g>
 					<g data-name="PublishSuccessDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
-							<rect x="13520.3" y="2205.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
-							<path d="M13520.3 2236.0 L13711.3 2236.0" fill="none" data-name="PublishSuccessDialog"></path>
+							<rect x="13807.0" y="2265.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
+							<path d="M13807.0 2296.0 L13998.0 2296.0" fill="none" data-name="PublishSuccessDialog"></path>
 						</g>
-						<g transform="translate(13520.25, 2205)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
+						<g transform="translate(13807, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
 								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13520.25, 2236)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
+						<g transform="translate(13807, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
 								
@@ -5164,16 +5199,16 @@
 					</g>
 					<g data-name="PublishDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
-							<rect x="14606.3" y="2205.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
-							<path d="M14606.3 2236.0 L14742.3 2236.0" fill="none" data-name="PublishDialog"></path>
+							<rect x="14149.0" y="2265.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
+							<path d="M14149.0 2296.0 L14285.0 2296.0" fill="none" data-name="PublishDialog"></path>
 						</g>
-						<g transform="translate(14606.25, 2205)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
+						<g transform="translate(14149, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14606.25, 2236)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
+						<g transform="translate(14149, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
 								
@@ -5182,16 +5217,16 @@
 					</g>
 					<g data-name="PublishConfirmationDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
-							<rect x="14782.3" y="2205.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
-							<path d="M14782.3 2236.0 L15006.3 2236.0" fill="none" data-name="PublishConfirmationDialog"></path>
+							<rect x="14509.0" y="2265.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
+							<path d="M14509.0 2296.0 L14733.0 2296.0" fill="none" data-name="PublishConfirmationDialog"></path>
 						</g>
-						<g transform="translate(14782.25, 2205)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
+						<g transform="translate(14509, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
 								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14782.25, 2236)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
+						<g transform="translate(14509, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
 								
@@ -5200,17 +5235,17 @@
 					</g>
 					<g data-name="FrameControlsWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
-							<rect x="8409.0" y="1329.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
-							<path d="M8409.0 1360.0 L8700.0 1360.0" fill="none" data-name="FrameControlsWidget"></path>
-							<path d="M8409.0 1421.0 L8700.0 1421.0" fill="none" data-name="FrameControlsWidget"></path>
+							<rect x="7120.3" y="1329.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
+							<path d="M7120.3 1360.0 L7411.3 1360.0" fill="none" data-name="FrameControlsWidget"></path>
+							<path d="M7120.3 1421.0 L7411.3 1421.0" fill="none" data-name="FrameControlsWidget"></path>
 						</g>
-						<g transform="translate(8409, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
+						<g transform="translate(7120.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
 								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8409, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+						<g transform="translate(7120.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
@@ -5218,7 +5253,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(8409, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+						<g transform="translate(7120.25, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
 								
@@ -5227,9 +5262,9 @@
 					</g>
 					<g data-name="ConsumerWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="13106.5" y="1009.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+							<rect x="14610.8" y="1009.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
 						</g>
-						<g transform="translate(13106.5, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+						<g transform="translate(14610.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
 								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
@@ -5238,16 +5273,16 @@
 					</g>
 					<g data-name="IStudyStatusBadgeViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
-							<rect x="9110.0" y="1352.0" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
-							<path d="M9110.0 1383.0 L9395.0 1383.0" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
+							<rect x="7821.3" y="1352.0" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
+							<path d="M7821.3 1383.0 L8106.3 1383.0" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
 						</g>
-						<g transform="translate(9110, 1352)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
+						<g transform="translate(7821.25, 1352)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
 								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9110, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
+						<g transform="translate(7821.25, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
@@ -5257,9 +5292,9 @@
 					</g>
 					<g data-name="Participation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="12901.3" y="2220.5" height="31.0" width="114.0" data-name="Participation"></rect>
+							<rect x="13299.0" y="2280.5" height="31.0" width="114.0" data-name="Participation"></rect>
 						</g>
-						<g transform="translate(12901.25, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
+						<g transform="translate(13299, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
 								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
 								
@@ -5268,9 +5303,9 @@
 					</g>
 					<g data-name="StudyStatus">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
-							<rect x="8171.3" y="2220.5" height="31.0" width="111.0" data-name="StudyStatus"></rect>
+							<rect x="8171.3" y="2280.5" height="31.0" width="111.0" data-name="StudyStatus"></rect>
 						</g>
-						<g transform="translate(8171.25, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
+						<g transform="translate(8171.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
 								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
 								
@@ -5279,17 +5314,17 @@
 					</g>
 					<g data-name="StudyStatusBadge">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
-							<rect x="9435.0" y="1314.0" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
-							<path d="M9435.0 1345.0 L9676.0 1345.0" fill="none" data-name="StudyStatusBadge"></path>
-							<path d="M9435.0 1436.0 L9676.0 1436.0" fill="none" data-name="StudyStatusBadge"></path>
+							<rect x="8146.3" y="1314.0" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
+							<path d="M8146.3 1345.0 L8387.3 1345.0" fill="none" data-name="StudyStatusBadge"></path>
+							<path d="M8146.3 1436.0 L8387.3 1436.0" fill="none" data-name="StudyStatusBadge"></path>
 						</g>
-						<g transform="translate(9435, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
+						<g transform="translate(8146.25, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
 								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9435, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+						<g transform="translate(8146.25, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
@@ -5299,7 +5334,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(9435, 1436)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+						<g transform="translate(8146.25, 1436)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
 								
@@ -5308,9 +5343,9 @@
 					</g>
 					<g data-name="BadgeType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="12017.0" y="2220.5" height="31.0" width="106.0" data-name="BadgeType"></rect>
+							<rect x="12213.0" y="2280.5" height="31.0" width="106.0" data-name="BadgeType"></rect>
 						</g>
-						<g transform="translate(12017, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
+						<g transform="translate(12213, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
 								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
 								
@@ -5319,17 +5354,17 @@
 					</g>
 					<g data-name="RouteInformation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
-							<rect x="8432.3" y="2167.0" height="138.0" width="152.0" data-name="RouteInformation"></rect>
-							<path d="M8432.3 2198.0 L8584.3 2198.0" fill="none" data-name="RouteInformation"></path>
-							<path d="M8432.3 2274.0 L8584.3 2274.0" fill="none" data-name="RouteInformation"></path>
+							<rect x="8432.3" y="2227.0" height="138.0" width="152.0" data-name="RouteInformation"></rect>
+							<path d="M8432.3 2258.0 L8584.3 2258.0" fill="none" data-name="RouteInformation"></path>
+							<path d="M8432.3 2334.0 L8584.3 2334.0" fill="none" data-name="RouteInformation"></path>
 						</g>
-						<g transform="translate(8432.25, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
+						<g transform="translate(8432.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
 								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8432.25, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+						<g transform="translate(8432.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
 								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
@@ -5338,7 +5373,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(8432.25, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+						<g transform="translate(8432.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
 								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
 								
@@ -5347,17 +5382,17 @@
 					</g>
 					<g data-name="PlatformController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
-							<rect x="9716.0" y="1261.5" height="258.0" width="302.0" data-name="PlatformController"></rect>
-							<path d="M9716.0 1292.5 L10018.0 1292.5" fill="none" data-name="PlatformController"></path>
-							<path d="M9716.0 1383.5 L10018.0 1383.5" fill="none" data-name="PlatformController"></path>
+							<rect x="8427.3" y="1261.5" height="258.0" width="302.0" data-name="PlatformController"></rect>
+							<path d="M8427.3 1292.5 L8729.3 1292.5" fill="none" data-name="PlatformController"></path>
+							<path d="M8427.3 1383.5 L8729.3 1383.5" fill="none" data-name="PlatformController"></path>
 						</g>
-						<g transform="translate(9716, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
+						<g transform="translate(8427.25, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
 								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9716, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+						<g transform="translate(8427.25, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
 								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
@@ -5367,7 +5402,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(9716, 1383.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+						<g transform="translate(8427.25, 1383.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
 								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
@@ -5383,23 +5418,23 @@
 					</g>
 					<g data-name="WebController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
-							<rect x="9641.0" y="2137.0" height="198.0" width="273.0" data-name="WebController"></rect>
-							<path d="M9641.0 2168.0 L9914.0 2168.0" fill="none" data-name="WebController"></path>
-							<path d="M9641.0 2199.0 L9914.0 2199.0" fill="none" data-name="WebController"></path>
+							<rect x="9641.0" y="2197.0" height="198.0" width="273.0" data-name="WebController"></rect>
+							<path d="M9641.0 2228.0 L9914.0 2228.0" fill="none" data-name="WebController"></path>
+							<path d="M9641.0 2259.0 L9914.0 2259.0" fill="none" data-name="WebController"></path>
 						</g>
-						<g transform="translate(9641, 2137)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
+						<g transform="translate(9641, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
 								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9641, 2168)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+						<g transform="translate(9641, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9641, 2199)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+						<g transform="translate(9641, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
@@ -5415,9 +5450,9 @@
 					</g>
 					<g data-name="IFrameElement">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
-							<rect x="5515.3" y="3036.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
+							<rect x="6345.3" y="3156.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
 						</g>
-						<g transform="translate(5515.25, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
+						<g transform="translate(6345.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
 								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
 								
@@ -5426,16 +5461,16 @@
 					</g>
 					<g data-name="MobileController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
-							<rect x="9954.0" y="2152.5" height="167.0" width="191.0" data-name="MobileController"></rect>
-							<path d="M9954.0 2183.5 L10145.0 2183.5" fill="none" data-name="MobileController"></path>
+							<rect x="9954.0" y="2212.5" height="167.0" width="191.0" data-name="MobileController"></rect>
+							<path d="M9954.0 2243.5 L10145.0 2243.5" fill="none" data-name="MobileController"></path>
 						</g>
-						<g transform="translate(9954, 2152.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
+						<g transform="translate(9954, 2212.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
 								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9954, 2183.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
+						<g transform="translate(9954, 2243.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
 								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
@@ -5451,17 +5486,17 @@
 					</g>
 					<g data-name="StudyController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
-							<rect x="4556.8" y="2122.0" height="228.0" width="573.0" data-name="StudyController"></rect>
-							<path d="M4556.8 2153.0 L5129.8 2153.0" fill="none" data-name="StudyController"></path>
-							<path d="M4556.8 2214.0 L5129.8 2214.0" fill="none" data-name="StudyController"></path>
+							<rect x="4556.8" y="2182.0" height="228.0" width="573.0" data-name="StudyController"></rect>
+							<path d="M4556.8 2213.0 L5129.8 2213.0" fill="none" data-name="StudyController"></path>
+							<path d="M4556.8 2274.0 L5129.8 2274.0" fill="none" data-name="StudyController"></path>
 						</g>
-						<g transform="translate(4556.75, 2122)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
+						<g transform="translate(4556.75, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
 								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4556.75, 2153)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+						<g transform="translate(4556.75, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
@@ -5469,7 +5504,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(4556.75, 2214)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+						<g transform="translate(4556.75, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
@@ -5485,16 +5520,16 @@
 					</g>
 					<g data-name="IStudyNavViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
-							<rect x="10058.0" y="1322.0" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
-							<path d="M10058.0 1353.0 L10299.0 1353.0" fill="none" data-name="IStudyNavViewModel"></path>
+							<rect x="8769.3" y="1322.0" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
+							<path d="M8769.3 1353.0 L9010.3 1353.0" fill="none" data-name="IStudyNavViewModel"></path>
 						</g>
-						<g transform="translate(10058, 1322)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
+						<g transform="translate(8769.25, 1322)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
 								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10058, 1353)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
+						<g transform="translate(8769.25, 1353)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
@@ -5508,16 +5543,16 @@
 					</g>
 					<g data-name="StudyNav">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
-							<rect x="43464.5" y="23.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
-							<path d="M43464.5 54.0 L43697.5 54.0" fill="none" data-name="StudyNav"></path>
+							<rect x="44710.8" y="23.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
+							<path d="M44710.8 54.0 L44943.8 54.0" fill="none" data-name="StudyNav"></path>
 						</g>
-						<g transform="translate(43464.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
+						<g transform="translate(44710.75, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
 								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43464.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
+						<g transform="translate(44710.75, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
@@ -5531,16 +5566,16 @@
 					</g>
 					<g data-name="StudyDesignNav">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
-							<rect x="43737.5" y="23.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
-							<path d="M43737.5 54.0 L44025.5 54.0" fill="none" data-name="StudyDesignNav"></path>
+							<rect x="44983.8" y="23.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
+							<path d="M44983.8 54.0 L45271.8 54.0" fill="none" data-name="StudyDesignNav"></path>
 						</g>
-						<g transform="translate(43737.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
+						<g transform="translate(44983.75, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
 								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43737.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
+						<g transform="translate(44983.75, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
@@ -5554,9 +5589,9 @@
 					</g>
 					<g data-name="IWithBanner">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="15580.0" y="1009.5" height="31.0" width="113.0" data-name="IWithBanner"></rect>
+							<rect x="16022.5" y="1009.5" height="31.0" width="113.0" data-name="IWithBanner"></rect>
 						</g>
-						<g transform="translate(15580, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
+						<g transform="translate(16022.5, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
 								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
 								
@@ -5565,17 +5600,17 @@
 					</g>
 					<g data-name="StudyParticipationBadge">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
-							<rect x="10339.0" y="1321.5" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
-							<path d="M10339.0 1352.5 L10570.0 1352.5" fill="none" data-name="StudyParticipationBadge"></path>
-							<path d="M10339.0 1428.5 L10570.0 1428.5" fill="none" data-name="StudyParticipationBadge"></path>
+							<rect x="9050.3" y="1321.5" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
+							<path d="M9050.3 1352.5 L9281.3 1352.5" fill="none" data-name="StudyParticipationBadge"></path>
+							<path d="M9050.3 1428.5 L9281.3 1428.5" fill="none" data-name="StudyParticipationBadge"></path>
 						</g>
-						<g transform="translate(10339, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
+						<g transform="translate(9050.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
 								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10339, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+						<g transform="translate(9050.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
@@ -5584,7 +5619,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(10339, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+						<g transform="translate(9050.25, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
 								
@@ -5593,9 +5628,9 @@
 					</g>
 					<g data-name="IStudyRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="30874.0" y="3036.0" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
+							<rect x="31265.5" y="3156.0" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
 						</g>
-						<g transform="translate(30874, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
+						<g transform="translate(31265.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
 								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
 								
@@ -5604,16 +5639,16 @@
 					</g>
 					<g data-name="PreviewFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
-							<rect x="44065.5" y="45.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
-							<path d="M44065.5 76.5 L44356.5 76.5" fill="none" data-name="PreviewFrame"></path>
+							<rect x="45311.8" y="45.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
+							<path d="M45311.8 76.5 L45602.8 76.5" fill="none" data-name="PreviewFrame"></path>
 						</g>
-						<g transform="translate(44065.5, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
+						<g transform="translate(45311.75, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
 								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44065.5, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
+						<g transform="translate(45311.75, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
@@ -5624,9 +5659,9 @@
 					</g>
 					<g data-name="StudyFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="44119.0" y="524.0" height="31.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
+							<rect x="45365.3" y="524.0" height="31.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(44119, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
+						<g transform="translate(45365.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
 								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
 								
@@ -5635,16 +5670,16 @@
 					</g>
 					<g data-name="IStudyAppBarViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
-							<rect x="8768.3" y="2190.0" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
-							<path d="M8768.3 2221.0 L9011.3 2221.0" fill="none" data-name="IStudyAppBarViewModel"></path>
+							<rect x="8768.3" y="2250.0" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
+							<path d="M8768.3 2281.0 L9011.3 2281.0" fill="none" data-name="IStudyAppBarViewModel"></path>
 						</g>
-						<g transform="translate(8768.25, 2190)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
+						<g transform="translate(8768.25, 2250)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
 								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8768.25, 2221)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
+						<g transform="translate(8768.25, 2281)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
@@ -5655,16 +5690,16 @@
 					</g>
 					<g data-name="StudyScaffold">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
-							<rect x="18503.3" y="904.0" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
-							<path d="M18503.3 935.0 L18838.3 935.0" fill="none" data-name="StudyScaffold"></path>
+							<rect x="19467.0" y="904.0" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
+							<path d="M19467.0 935.0 L19802.0 935.0" fill="none" data-name="StudyScaffold"></path>
 						</g>
-						<g transform="translate(18503.25, 904)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
+						<g transform="translate(19467, 904)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
 								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18503.25, 935)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
+						<g transform="translate(19467, 935)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
@@ -5685,9 +5720,9 @@
 					</g>
 					<g data-name="NavbarTab">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="18272.5" y="1375.0" height="31.0" width="103.0" data-name="NavbarTab"></rect>
+							<rect x="18973.3" y="1375.0" height="31.0" width="103.0" data-name="NavbarTab"></rect>
 						</g>
-						<g transform="translate(18272.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
+						<g transform="translate(18973.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
 								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
 								
@@ -5696,9 +5731,9 @@
 					</g>
 					<g data-name="SingleColumnLayoutType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="18908.5" y="1375.0" height="31.0" width="218.0" data-name="SingleColumnLayoutType"></rect>
+							<rect x="20135.3" y="1375.0" height="31.0" width="218.0" data-name="SingleColumnLayoutType"></rect>
 						</g>
-						<g transform="translate(18908.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
+						<g transform="translate(20135.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
 								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
 								
@@ -5707,24 +5742,24 @@
 					</g>
 					<g data-name="WebFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
-							<rect x="44396.5" y="37.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
-							<path d="M44396.5 68.5 L44565.5 68.5" fill="none" data-name="WebFrame"></path>
-							<path d="M44396.5 114.5 L44565.5 114.5" fill="none" data-name="WebFrame"></path>
+							<rect x="45642.8" y="37.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
+							<path d="M45642.8 68.5 L45811.8 68.5" fill="none" data-name="WebFrame"></path>
+							<path d="M45642.8 114.5 L45811.8 114.5" fill="none" data-name="WebFrame"></path>
 						</g>
-						<g transform="translate(44396.5, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
+						<g transform="translate(45642.75, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
 								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44396.5, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+						<g transform="translate(45642.75, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44396.5, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+						<g transform="translate(45642.75, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
 								
@@ -5733,16 +5768,16 @@
 					</g>
 					<g data-name="DisabledFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
-							<rect x="44605.5" y="60.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
-							<path d="M44605.5 91.5 L44741.5 91.5" fill="none" data-name="DisabledFrame"></path>
+							<rect x="45851.8" y="60.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
+							<path d="M45851.8 91.5 L45987.8 91.5" fill="none" data-name="DisabledFrame"></path>
 						</g>
-						<g transform="translate(44605.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
+						<g transform="translate(45851.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44605.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
+						<g transform="translate(45851.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
 								
@@ -5751,17 +5786,17 @@
 					</g>
 					<g data-name="PhoneContainer">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
-							<rect x="11648.0" y="1284.0" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
-							<path d="M11648.0 1315.0 L11975.0 1315.0" fill="none" data-name="PhoneContainer"></path>
-							<path d="M11648.0 1466.0 L11975.0 1466.0" fill="none" data-name="PhoneContainer"></path>
+							<rect x="10359.3" y="1284.0" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
+							<path d="M10359.3 1315.0 L10686.3 1315.0" fill="none" data-name="PhoneContainer"></path>
+							<path d="M10359.3 1466.0 L10686.3 1466.0" fill="none" data-name="PhoneContainer"></path>
 						</g>
-						<g transform="translate(11648, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
+						<g transform="translate(10359.25, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
 								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11648, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+						<g transform="translate(10359.25, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
 								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
@@ -5775,7 +5810,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(11648, 1466)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+						<g transform="translate(10359.25, 1466)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
 								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
 								
@@ -5784,9 +5819,9 @@
 					</g>
 					<g data-name="Color">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="21401.8" y="2220.5" height="31.0" width="58.0" data-name="Color"></rect>
+							<rect x="24358.8" y="2280.5" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(21401.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+						<g transform="translate(24358.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
 								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
@@ -5795,16 +5830,16 @@
 					</g>
 					<g data-name="MobileFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
-							<rect x="44781.5" y="60.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
-							<path d="M44781.5 91.5 L44917.5 91.5" fill="none" data-name="MobileFrame"></path>
+							<rect x="46027.8" y="60.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
+							<path d="M46027.8 91.5 L46163.8 91.5" fill="none" data-name="MobileFrame"></path>
 						</g>
-						<g transform="translate(44781.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
+						<g transform="translate(46027.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44781.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
+						<g transform="translate(46027.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
 								
@@ -5813,16 +5848,16 @@
 					</g>
 					<g data-name="DesktopFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
-							<rect x="44957.5" y="60.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
-							<path d="M44957.5 91.5 L45093.5 91.5" fill="none" data-name="DesktopFrame"></path>
+							<rect x="46203.8" y="60.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
+							<path d="M46203.8 91.5 L46339.8 91.5" fill="none" data-name="DesktopFrame"></path>
 						</g>
-						<g transform="translate(44957.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
+						<g transform="translate(46203.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44957.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
+						<g transform="translate(46203.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
 								
@@ -5831,23 +5866,23 @@
 					</g>
 					<g data-name="StudyTestScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
-							<rect x="15046.3" y="2159.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
-							<path d="M15046.3 2190.5 L15246.3 2190.5" fill="none" data-name="StudyTestScreen"></path>
-							<path d="M15046.3 2221.5 L15246.3 2221.5" fill="none" data-name="StudyTestScreen"></path>
+							<rect x="14773.0" y="2219.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
+							<path d="M14773.0 2250.5 L14973.0 2250.5" fill="none" data-name="StudyTestScreen"></path>
+							<path d="M14773.0 2281.5 L14973.0 2281.5" fill="none" data-name="StudyTestScreen"></path>
 						</g>
-						<g transform="translate(15046.25, 2159.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
+						<g transform="translate(14773, 2219.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
 								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15046.25, 2190.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+						<g transform="translate(14773, 2250.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15046.25, 2221.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+						<g transform="translate(14773, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
@@ -5860,17 +5895,17 @@
 					</g>
 					<g data-name="StudySettingsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="42882.8" y="2107.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M42882.8 2138.0 L43361.8 2138.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M42882.8 2274.0 L43361.8 2274.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+							<rect x="44129.0" y="2167.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
+							<path d="M44129.0 2198.0 L44608.0 2198.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+							<path d="M44129.0 2334.0 L44608.0 2334.0" fill="none" data-name="StudySettingsFormViewModel"></path>
 						</g>
-						<g transform="translate(42882.75, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
+						<g transform="translate(44129, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42882.75, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+						<g transform="translate(44129, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
@@ -5883,7 +5918,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(42882.75, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+						<g transform="translate(44129, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
@@ -5896,9 +5931,9 @@
 					</g>
 					<g data-name="AsyncValue">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="42963.5" y="3036.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
+							<rect x="44209.8" y="3156.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
 						</g>
-						<g transform="translate(42963.5, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
+						<g transform="translate(44209.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
 								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
 								
@@ -5907,16 +5942,16 @@
 					</g>
 					<g data-name="StudySettingsDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="15286.3" y="2205.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M15286.3 2236.0 L15461.3 2236.0" fill="none" data-name="StudySettingsDialog"></path>
+							<rect x="15013.0" y="2265.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
+							<path d="M15013.0 2296.0 L15188.0 2296.0" fill="none" data-name="StudySettingsDialog"></path>
 						</g>
-						<g transform="translate(15286.25, 2205)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
+						<g transform="translate(15013, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
 								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15286.25, 2236)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
+						<g transform="translate(15013, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
 								
@@ -5925,16 +5960,16 @@
 					</g>
 					<g data-name="StudyTestController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
-							<rect x="6505.8" y="2197.5" height="77.0" width="282.0" data-name="StudyTestController"></rect>
-							<path d="M6505.8 2228.5 L6787.8 2228.5" fill="none" data-name="StudyTestController"></path>
+							<rect x="6505.8" y="2257.5" height="77.0" width="282.0" data-name="StudyTestController"></rect>
+							<path d="M6505.8 2288.5 L6787.8 2288.5" fill="none" data-name="StudyTestController"></path>
 						</g>
-						<g transform="translate(6505.75, 2197.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
+						<g transform="translate(6505.75, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
 								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6505.75, 2228.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
+						<g transform="translate(6505.75, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
@@ -5944,16 +5979,16 @@
 					</g>
 					<g data-name="TestAppRoutes">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
-							<rect x="45133.5" y="23.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
-							<path d="M45133.5 54.0 L45393.5 54.0" fill="none" data-name="TestAppRoutes"></path>
+							<rect x="46379.8" y="23.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
+							<path d="M46379.8 54.0 L46639.8 54.0" fill="none" data-name="TestAppRoutes"></path>
 						</g>
-						<g transform="translate(45133.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
+						<g transform="translate(46379.75, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
 								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45133.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
+						<g transform="translate(46379.75, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
 								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
@@ -5967,17 +6002,17 @@
 					</g>
 					<g data-name="DrawerEntry">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
-							<rect x="21102.5" y="926.0" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
-							<path d="M21102.5 957.0 L21547.5 957.0" fill="none" data-name="DrawerEntry"></path>
-							<path d="M21102.5 1093.0 L21547.5 1093.0" fill="none" data-name="DrawerEntry"></path>
+							<rect x="24615.3" y="926.0" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
+							<path d="M24615.3 957.0 L25060.3 957.0" fill="none" data-name="DrawerEntry"></path>
+							<path d="M24615.3 1093.0 L25060.3 1093.0" fill="none" data-name="DrawerEntry"></path>
 						</g>
-						<g transform="translate(21102.5, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
+						<g transform="translate(24615.25, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
 								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21102.5, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+						<g transform="translate(24615.25, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
@@ -5990,7 +6025,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(21102.5, 1093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+						<g transform="translate(24615.25, 1093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
 								
@@ -5999,9 +6034,9 @@
 					</g>
 					<g data-name="String Function()">
 						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
-							<rect x="20328.0" y="1375.0" height="31.0" width="147.0" data-name="String Function()"></rect>
+							<rect x="24648.3" y="1375.0" height="31.0" width="147.0" data-name="String Function()"></rect>
 						</g>
-						<g transform="translate(20328, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
+						<g transform="translate(24648.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
 								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
 								
@@ -6010,9 +6045,9 @@
 					</g>
 					<g data-name="String Function()?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
-							<rect x="23156.3" y="1375.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
+							<rect x="24875.3" y="1375.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
 						</g>
-						<g transform="translate(23156.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
+						<g transform="translate(24875.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
 								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
 								
@@ -6021,9 +6056,9 @@
 					</g>
 					<g data-name="void Function(BuildContext, WidgetRef)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
-							<rect x="23353.3" y="1375.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
+							<rect x="25556.3" y="1375.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
 						</g>
-						<g transform="translate(23353.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
+						<g transform="translate(25556.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
 								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
 								
@@ -6032,24 +6067,24 @@
 					</g>
 					<g data-name="GoRouterDrawerEntry">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
-							<rect x="24817.5" y="1336.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
-							<path d="M24817.5 1367.5 L25081.5 1367.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-							<path d="M24817.5 1413.5 L25081.5 1413.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+							<rect x="25932.3" y="1336.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
+							<path d="M25932.3 1367.5 L26196.3 1367.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+							<path d="M25932.3 1413.5 L26196.3 1413.5" fill="none" data-name="GoRouterDrawerEntry"></path>
 						</g>
-						<g transform="translate(24817.5, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
+						<g transform="translate(25932.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
 								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24817.5, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+						<g transform="translate(25932.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24817.5, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+						<g transform="translate(25932.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
 								
@@ -6058,9 +6093,9 @@
 					</g>
 					<g data-name="RoutingIntent">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="24868.5" y="2220.5" height="31.0" width="122.0" data-name="RoutingIntent"></rect>
+							<rect x="25638.3" y="2280.5" height="31.0" width="122.0" data-name="RoutingIntent"></rect>
 						</g>
-						<g transform="translate(24868.5, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
+						<g transform="translate(25638.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
 								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
 								
@@ -6069,16 +6104,16 @@
 					</g>
 					<g data-name="AppDrawer">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
-							<rect x="45433.5" y="8.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
-							<path d="M45433.5 39.0 L45702.5 39.0" fill="none" data-name="AppDrawer"></path>
+							<rect x="46679.8" y="8.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
+							<path d="M46679.8 39.0 L46948.8 39.0" fill="none" data-name="AppDrawer"></path>
 						</g>
-						<g transform="translate(45433.5, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
+						<g transform="translate(46679.75, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
 								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45433.5, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
+						<g transform="translate(46679.75, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
@@ -6094,16 +6129,16 @@
 					</g>
 					<g data-name="StudyAnalyzeScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
-							<rect x="15628.3" y="2197.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
-							<path d="M15628.3 2228.5 L15808.3 2228.5" fill="none" data-name="StudyAnalyzeScreen"></path>
+							<rect x="15228.0" y="2257.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
+							<path d="M15228.0 2288.5 L15408.0 2288.5" fill="none" data-name="StudyAnalyzeScreen"></path>
 						</g>
-						<g transform="translate(15628.25, 2197.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
+						<g transform="translate(15228, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
 								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15628.25, 2228.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
+						<g transform="translate(15228, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
@@ -6113,16 +6148,16 @@
 					</g>
 					<g data-name="StudyAnalyzeController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
-							<rect x="6827.8" y="2205.0" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
-							<path d="M6827.8 2236.0 L7028.8 2236.0" fill="none" data-name="StudyAnalyzeController"></path>
+							<rect x="6827.8" y="2265.0" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
+							<path d="M6827.8 2296.0 L7028.8 2296.0" fill="none" data-name="StudyAnalyzeController"></path>
 						</g>
-						<g transform="translate(6827.75, 2205)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
+						<g transform="translate(6827.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
 								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6827.75, 2236)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
+						<g transform="translate(6827.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
 								
@@ -6131,16 +6166,16 @@
 					</g>
 					<g data-name="StudyDesignInterventionsFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="11855.8" y="3020.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M11855.8 3051.5 L12151.8 3051.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
+							<rect x="11512.5" y="3140.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
+							<path d="M11512.5 3171.5 L11808.5 3171.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
 						</g>
-						<g transform="translate(11855.75, 3020.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
+						<g transform="translate(11512.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
 								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11855.75, 3051.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
+						<g transform="translate(11512.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
 								
@@ -6149,16 +6184,16 @@
 					</g>
 					<g data-name="StudyDesignPageWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="16991.3" y="2205.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M16991.3 2236.0 L17203.3 2236.0" fill="none" data-name="StudyDesignPageWidget"></path>
+							<rect x="16718.0" y="2265.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
+							<path d="M16718.0 2296.0 L16930.0 2296.0" fill="none" data-name="StudyDesignPageWidget"></path>
 						</g>
-						<g transform="translate(16991.25, 2205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
+						<g transform="translate(16718, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
 								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16991.25, 2236)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
+						<g transform="translate(16718, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
 								
@@ -6167,16 +6202,16 @@
 					</g>
 					<g data-name="InterventionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="13611.0" y="1359.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M13611.0 1390.5 L13986.0 1390.5" fill="none" data-name="InterventionFormView"></path>
+							<rect x="12359.0" y="1359.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
+							<path d="M12359.0 1390.5 L12734.0 1390.5" fill="none" data-name="InterventionFormView"></path>
 						</g>
-						<g transform="translate(13611, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
+						<g transform="translate(12359, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
 								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13611, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
+						<g transform="translate(12359, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
 								
@@ -6185,17 +6220,17 @@
 					</g>
 					<g data-name="InterventionFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="26742.0" y="2002.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M26742.0 2033.0 L27597.0 2033.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M26742.0 2259.0 L27597.0 2259.0" fill="none" data-name="InterventionFormViewModel"></path>
+							<rect x="27443.3" y="2062.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
+							<path d="M27443.3 2093.0 L28298.3 2093.0" fill="none" data-name="InterventionFormViewModel"></path>
+							<path d="M27443.3 2319.0 L28298.3 2319.0" fill="none" data-name="InterventionFormViewModel"></path>
 						</g>
-						<g transform="translate(26742, 2002)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
+						<g transform="translate(27443.25, 2062)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
 								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26742, 2033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+						<g transform="translate(27443.25, 2093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
@@ -6214,7 +6249,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(26742, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+						<g transform="translate(27443.25, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
@@ -6235,23 +6270,23 @@
 					</g>
 					<g data-name="InterventionPreview">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="8740.0" y="1344.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M8740.0 1375.0 L9070.0 1375.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M8740.0 1406.0 L9070.0 1406.0" fill="none" data-name="InterventionPreview"></path>
+							<rect x="7451.3" y="1344.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
+							<path d="M7451.3 1375.0 L7781.3 1375.0" fill="none" data-name="InterventionPreview"></path>
+							<path d="M7451.3 1406.0 L7781.3 1406.0" fill="none" data-name="InterventionPreview"></path>
 						</g>
-						<g transform="translate(8740, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
+						<g transform="translate(7451.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
 								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8740, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+						<g transform="translate(7451.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8740, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+						<g transform="translate(7451.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
 								
@@ -6260,9 +6295,9 @@
 					</g>
 					<g data-name="InterventionFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="7499.8" y="2220.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
+							<rect x="7499.8" y="2280.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(7499.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
+						<g transform="translate(7499.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
 								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
 								
@@ -6342,17 +6377,17 @@
 					</g>
 					<g data-name="InterventionTaskFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="36226.5" y="1306.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M36226.5 1337.5 L36516.5 1337.5" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M36226.5 1428.5 L36516.5 1428.5" fill="none" data-name="InterventionTaskFormData"></path>
+							<rect x="38071.3" y="1306.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
+							<path d="M38071.3 1337.5 L38361.3 1337.5" fill="none" data-name="InterventionTaskFormData"></path>
+							<path d="M38071.3 1428.5 L38361.3 1428.5" fill="none" data-name="InterventionTaskFormData"></path>
 						</g>
-						<g transform="translate(36226.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
+						<g transform="translate(38071.25, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
 								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36226.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+						<g transform="translate(38071.25, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
@@ -6362,7 +6397,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(36226.5, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+						<g transform="translate(38071.25, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
@@ -6372,17 +6407,17 @@
 					</g>
 					<g data-name="IFormDataWithSchedule">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="36817.5" y="941.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M36817.5 972.0 L37115.5 972.0" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M36817.5 1078.0 L37115.5 1078.0" fill="none" data-name="IFormDataWithSchedule"></path>
+							<rect x="38598.0" y="941.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
+							<path d="M38598.0 972.0 L38896.0 972.0" fill="none" data-name="IFormDataWithSchedule"></path>
+							<path d="M38598.0 1078.0 L38896.0 1078.0" fill="none" data-name="IFormDataWithSchedule"></path>
 						</g>
-						<g transform="translate(36817.5, 941)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
+						<g transform="translate(38598, 941)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
 								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36817.5, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+						<g transform="translate(38598, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
@@ -6393,7 +6428,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(36817.5, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+						<g transform="translate(38598, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
 								
@@ -6402,17 +6437,17 @@
 					</g>
 					<g data-name="InterventionsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="30343.3" y="2047.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M30343.3 2078.0 L31182.3 2078.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M30343.3 2229.0 L31182.3 2229.0" fill="none" data-name="InterventionsFormViewModel"></path>
+							<rect x="30734.8" y="2107.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
+							<path d="M30734.8 2138.0 L31573.8 2138.0" fill="none" data-name="InterventionsFormViewModel"></path>
+							<path d="M30734.8 2289.0 L31573.8 2289.0" fill="none" data-name="InterventionsFormViewModel"></path>
 						</g>
-						<g transform="translate(30343.25, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
+						<g transform="translate(30734.75, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
 								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30343.25, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+						<g transform="translate(30734.75, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
@@ -6426,7 +6461,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(30343.25, 2229)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+						<g transform="translate(30734.75, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
@@ -6446,9 +6481,9 @@
 					</g>
 					<g data-name="IListActionProvider">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="17877.3" y="1375.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
+							<rect x="17400.3" y="1375.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
 						</g>
-						<g transform="translate(17877.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+						<g transform="translate(17400.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
 								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
 								
@@ -6457,9 +6492,9 @@
 					</g>
 					<g data-name="IProviderArgsResolver">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="27783.8" y="1009.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
+							<rect x="28485.0" y="1009.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
 						</g>
-						<g transform="translate(27783.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
+						<g transform="translate(28485, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
 								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
 								
@@ -6468,17 +6503,17 @@
 					</g>
 					<g data-name="InterventionTaskFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="27637.0" y="2099.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M27637.0 2130.5 L28333.0 2130.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M27637.0 2311.5 L28333.0 2311.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<rect x="28338.3" y="2159.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
+							<path d="M28338.3 2190.5 L29034.3 2190.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<path d="M28338.3 2371.5 L29034.3 2371.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
 						</g>
-						<g transform="translate(27637, 2099.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
+						<g transform="translate(28338.25, 2159.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27637, 2130.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+						<g transform="translate(28338.25, 2190.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
@@ -6494,7 +6529,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(27637, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+						<g transform="translate(28338.25, 2371.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
@@ -6505,17 +6540,17 @@
 					</g>
 					<g data-name="WithScheduleControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="26108.8" y="1239.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M26108.8 1270.0 L26603.8 1270.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M26108.8 1496.0 L26603.8 1496.0" fill="none" data-name="WithScheduleControls"></path>
+							<rect x="26729.5" y="1239.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
+							<path d="M26729.5 1270.0 L27224.5 1270.0" fill="none" data-name="WithScheduleControls"></path>
+							<path d="M26729.5 1496.0 L27224.5 1496.0" fill="none" data-name="WithScheduleControls"></path>
 						</g>
-						<g transform="translate(26108.75, 1239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
+						<g transform="translate(26729.5, 1239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
 								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26108.75, 1270)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+						<g transform="translate(26729.5, 1270)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
@@ -6534,7 +6569,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(26108.75, 1496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+						<g transform="translate(26729.5, 1496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
@@ -6544,9 +6579,9 @@
 					</g>
 					<g data-name="PhaseSequence">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="14875.8" y="3036.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
+							<rect x="14923.5" y="3156.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
 						</g>
-						<g transform="translate(14875.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
+						<g transform="translate(14923.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
 								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
 								
@@ -6555,17 +6590,17 @@
 					</g>
 					<g data-name="InterventionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="28521.8" y="926.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M28521.8 957.0 L28903.8 957.0" fill="none" data-name="InterventionFormData"></path>
-							<path d="M28521.8 1078.0 L28903.8 1078.0" fill="none" data-name="InterventionFormData"></path>
+							<rect x="29223.0" y="926.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
+							<path d="M29223.0 957.0 L29605.0 957.0" fill="none" data-name="InterventionFormData"></path>
+							<path d="M29223.0 1078.0 L29605.0 1078.0" fill="none" data-name="InterventionFormData"></path>
 						</g>
-						<g transform="translate(28521.75, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
+						<g transform="translate(29223, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
 								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28521.75, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+						<g transform="translate(29223, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
@@ -6577,7 +6612,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(28521.75, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+						<g transform="translate(29223, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
@@ -6587,17 +6622,17 @@
 					</g>
 					<g data-name="StudyScheduleFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="29567.3" y="2137.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M29567.3 2168.0 L29863.3 2168.0" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M29567.3 2274.0 L29863.3 2274.0" fill="none" data-name="StudyScheduleFormData"></path>
+							<rect x="29958.8" y="2197.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
+							<path d="M29958.8 2228.0 L30254.8 2228.0" fill="none" data-name="StudyScheduleFormData"></path>
+							<path d="M29958.8 2334.0 L30254.8 2334.0" fill="none" data-name="StudyScheduleFormData"></path>
 						</g>
-						<g transform="translate(29567.25, 2137)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
+						<g transform="translate(29958.75, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
 								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29567.25, 2168)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+						<g transform="translate(29958.75, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
@@ -6608,7 +6643,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(29567.25, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+						<g transform="translate(29958.75, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
@@ -6619,16 +6654,16 @@
 					</g>
 					<g data-name="IStudyFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="31521.5" y="994.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M31521.5 1025.0 L31664.5 1025.0" fill="none" data-name="IStudyFormData"></path>
+							<rect x="31051.3" y="994.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
+							<path d="M31051.3 1025.0 L31194.3 1025.0" fill="none" data-name="IStudyFormData"></path>
 						</g>
-						<g transform="translate(31521.5, 994)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
+						<g transform="translate(31051.25, 994)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
 								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31521.5, 1025)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
+						<g transform="translate(31051.25, 1025)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
 								
@@ -6637,16 +6672,16 @@
 					</g>
 					<g data-name="InterventionTaskFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="18415.5" y="1359.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M18415.5 1390.5 L18828.5 1390.5" fill="none" data-name="InterventionTaskFormView"></path>
+							<rect x="18274.3" y="1359.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
+							<path d="M18274.3 1390.5 L18687.3 1390.5" fill="none" data-name="InterventionTaskFormView"></path>
 						</g>
-						<g transform="translate(18415.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
+						<g transform="translate(18274.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
 								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18415.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
+						<g transform="translate(18274.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
 								
@@ -6655,17 +6690,17 @@
 					</g>
 					<g data-name="InterventionsFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="29731.0" y="1321.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M29731.0 1352.5 L30125.0 1352.5" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M29731.0 1413.5 L30125.0 1413.5" fill="none" data-name="InterventionsFormData"></path>
+							<rect x="30511.3" y="1321.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
+							<path d="M30511.3 1352.5 L30905.3 1352.5" fill="none" data-name="InterventionsFormData"></path>
+							<path d="M30511.3 1413.5 L30905.3 1413.5" fill="none" data-name="InterventionsFormData"></path>
 						</g>
-						<g transform="translate(29731, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
+						<g transform="translate(30511.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
 								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29731, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+						<g transform="translate(30511.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
@@ -6673,7 +6708,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(29731, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+						<g transform="translate(30511.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
@@ -6683,16 +6718,16 @@
 					</g>
 					<g data-name="StudyDesignReportsFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="12191.8" y="3013.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M12191.8 3044.0 L12584.8 3044.0" fill="none" data-name="StudyDesignReportsFormView"></path>
+							<rect x="11848.5" y="3133.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
+							<path d="M11848.5 3164.0 L12241.5 3164.0" fill="none" data-name="StudyDesignReportsFormView"></path>
 						</g>
-						<g transform="translate(12191.75, 3013)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
+						<g transform="translate(11848.5, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
 								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12191.75, 3044)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
+						<g transform="translate(11848.5, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
@@ -6702,17 +6737,17 @@
 					</g>
 					<g data-name="ReportItemFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="28943.8" y="956.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M28943.8 987.0 L29257.8 987.0" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M28943.8 1048.0 L29257.8 1048.0" fill="none" data-name="ReportItemFormData"></path>
+							<rect x="29645.0" y="956.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
+							<path d="M29645.0 987.0 L29959.0 987.0" fill="none" data-name="ReportItemFormData"></path>
+							<path d="M29645.0 1048.0 L29959.0 1048.0" fill="none" data-name="ReportItemFormData"></path>
 						</g>
-						<g transform="translate(28943.75, 956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
+						<g transform="translate(29645, 956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
 								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28943.75, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+						<g transform="translate(29645, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
@@ -6720,7 +6755,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(28943.75, 1048)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+						<g transform="translate(29645, 1048)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
@@ -6730,9 +6765,9 @@
 					</g>
 					<g data-name="ReportSection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="29036.8" y="1375.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
+							<rect x="29738.0" y="1375.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
 						</g>
-						<g transform="translate(29036.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
+						<g transform="translate(29738, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
 								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
 								
@@ -6741,17 +6776,17 @@
 					</g>
 					<g data-name="DataReferenceEditor">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="16242.3" y="2167.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M16242.3 2198.0 L16951.3 2198.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M16242.3 2259.0 L16951.3 2259.0" fill="none" data-name="DataReferenceEditor"></path>
+							<rect x="15969.0" y="2227.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
+							<path d="M15969.0 2258.0 L16678.0 2258.0" fill="none" data-name="DataReferenceEditor"></path>
+							<path d="M15969.0 2319.0 L16678.0 2319.0" fill="none" data-name="DataReferenceEditor"></path>
 						</g>
-						<g transform="translate(16242.25, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
+						<g transform="translate(15969, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
 								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16242.25, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+						<g transform="translate(15969, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
 								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
@@ -6759,7 +6794,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(16242.25, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+						<g transform="translate(15969, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
 								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
@@ -6769,9 +6804,9 @@
 					</g>
 					<g data-name="ReactiveDropdownField">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="10237.8" y="3036.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
+							<rect x="11269.5" y="3156.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
 						</g>
-						<g transform="translate(10237.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
+						<g transform="translate(11269.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
 								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
 								
@@ -6780,17 +6815,17 @@
 					</g>
 					<g data-name="TemporalAggregationFormatted">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="19166.5" y="1284.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M19166.5 1315.0 L19614.5 1315.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M19166.5 1421.0 L19614.5 1421.0" fill="none" data-name="TemporalAggregationFormatted"></path>
+							<rect x="19116.3" y="1284.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
+							<path d="M19116.3 1315.0 L19564.3 1315.0" fill="none" data-name="TemporalAggregationFormatted"></path>
+							<path d="M19116.3 1421.0 L19564.3 1421.0" fill="none" data-name="TemporalAggregationFormatted"></path>
 						</g>
-						<g transform="translate(19166.5, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
+						<g transform="translate(19116.25, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
 								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19166.5, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+						<g transform="translate(19116.25, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
@@ -6801,7 +6836,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(19166.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+						<g transform="translate(19116.25, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
@@ -6813,9 +6848,9 @@
 					</g>
 					<g data-name="TemporalAggregation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="19077.5" y="2220.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
+							<rect x="21860.8" y="2280.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
 						</g>
-						<g transform="translate(19077.5, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
+						<g transform="translate(21860.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
 								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
 								
@@ -6824,17 +6859,17 @@
 					</g>
 					<g data-name="ImprovementDirectionFormatted">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="19837.0" y="1284.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M19837.0 1315.0 L20288.0 1315.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M19837.0 1421.0 L20288.0 1421.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
+							<rect x="19604.3" y="1284.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
+							<path d="M19604.3 1315.0 L20055.3 1315.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
+							<path d="M19604.3 1421.0 L20055.3 1421.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
 						</g>
-						<g transform="translate(19837, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
+						<g transform="translate(19604.25, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
 								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19837, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+						<g transform="translate(19604.25, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
@@ -6845,7 +6880,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(19837, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+						<g transform="translate(19604.25, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
@@ -6857,9 +6892,9 @@
 					</g>
 					<g data-name="ImprovementDirection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="20625.0" y="2220.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
+							<rect x="22086.8" y="2280.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
 						</g>
-						<g transform="translate(20625, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
+						<g transform="translate(22086.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
 								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
 								
@@ -6868,16 +6903,16 @@
 					</g>
 					<g data-name="ReportSectionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="9764.8" y="2998.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M9764.8 3029.0 L10147.8 3029.0" fill="none" data-name="ReportSectionType"></path>
+							<rect x="10796.5" y="3118.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
+							<path d="M10796.5 3149.0 L11179.5 3149.0" fill="none" data-name="ReportSectionType"></path>
 						</g>
-						<g transform="translate(9764.75, 2998)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
+						<g transform="translate(10796.5, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
 								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9764.75, 3029)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
+						<g transform="translate(10796.5, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
@@ -6889,17 +6924,17 @@
 					</g>
 					<g data-name="AverageSectionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="10610.0" y="1329.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M10610.0 1360.0 L11089.0 1360.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M10610.0 1421.0 L11089.0 1421.0" fill="none" data-name="AverageSectionFormView"></path>
+							<rect x="9321.3" y="1329.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
+							<path d="M9321.3 1360.0 L9800.3 1360.0" fill="none" data-name="AverageSectionFormView"></path>
+							<path d="M9321.3 1421.0 L9800.3 1421.0" fill="none" data-name="AverageSectionFormView"></path>
 						</g>
-						<g transform="translate(10610, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
+						<g transform="translate(9321.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10610, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+						<g transform="translate(9321.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
@@ -6907,7 +6942,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(10610, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+						<g transform="translate(9321.25, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
 								
@@ -6916,17 +6951,17 @@
 					</g>
 					<g data-name="ReportItemFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="19598.0" y="1949.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M19598.0 1980.5 L20585.0 1980.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M19598.0 2416.5 L20585.0 2416.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<rect x="19704.3" y="2009.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
+							<path d="M19704.3 2040.5 L20691.3 2040.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<path d="M19704.3 2476.5 L20691.3 2476.5" fill="none" data-name="ReportItemFormViewModel"></path>
 						</g>
-						<g transform="translate(19598, 1949.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(19704.25, 2009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
 								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19598, 1980.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(19704.25, 2040.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
@@ -6959,7 +6994,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(19598, 2416.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(19704.25, 2476.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
@@ -6973,23 +7008,23 @@
 					</g>
 					<g data-name="DataReferenceIdentifier">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="45708.0" y="493.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M45708.0 524.0 L45912.0 524.0" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M45708.0 555.0 L45912.0 555.0" fill="none" data-name="DataReferenceIdentifier"></path>
+							<rect x="46954.3" y="493.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
+							<path d="M46954.3 524.0 L47158.3 524.0" fill="none" data-name="DataReferenceIdentifier"></path>
+							<path d="M46954.3 555.0 L47158.3 555.0" fill="none" data-name="DataReferenceIdentifier"></path>
 						</g>
-						<g transform="translate(45708, 493)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
+						<g transform="translate(46954.25, 493)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
 								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45708, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+						<g transform="translate(46954.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
 								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45708, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+						<g transform="translate(46954.25, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
 								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
 								
@@ -6998,9 +7033,9 @@
 					</g>
 					<g data-name="DataReference">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="45742.5" y="76.0" height="31.0" width="135.0" data-name="DataReference"></rect>
+							<rect x="46988.8" y="76.0" height="31.0" width="135.0" data-name="DataReference"></rect>
 						</g>
-						<g transform="translate(45742.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
+						<g transform="translate(46988.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
 								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
 								
@@ -7009,17 +7044,17 @@
 					</g>
 					<g data-name="LinearRegressionSectionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="11129.0" y="1329.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M11129.0 1360.0 L11608.0 1360.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M11129.0 1421.0 L11608.0 1421.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<rect x="9840.3" y="1329.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
+							<path d="M9840.3 1360.0 L10319.3 1360.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<path d="M9840.3 1421.0 L10319.3 1421.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
 						</g>
-						<g transform="translate(11129, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
+						<g transform="translate(9840.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11129, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+						<g transform="translate(9840.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
@@ -7027,7 +7062,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(11129, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+						<g transform="translate(9840.25, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
 								
@@ -7036,17 +7071,17 @@
 					</g>
 					<g data-name="ReportItemFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="20555.0" y="1306.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M20555.0 1337.5 L21022.0 1337.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M20555.0 1413.5 L21022.0 1413.5" fill="none" data-name="ReportItemFormView"></path>
+							<rect x="21743.0" y="1306.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
+							<path d="M21743.0 1337.5 L22210.0 1337.5" fill="none" data-name="ReportItemFormView"></path>
+							<path d="M21743.0 1413.5 L22210.0 1413.5" fill="none" data-name="ReportItemFormView"></path>
 						</g>
-						<g transform="translate(20555, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
+						<g transform="translate(21743, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
 								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20555, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+						<g transform="translate(21743, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
@@ -7055,7 +7090,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(20555, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+						<g transform="translate(21743, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
@@ -7066,9 +7101,9 @@
 					</g>
 					<g data-name="Widget Function(BuildContext)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="21105.8" y="2220.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
+							<rect x="24062.8" y="2280.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
 						</g>
-						<g transform="translate(21105.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
+						<g transform="translate(24062.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
 								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
 								
@@ -7077,17 +7112,17 @@
 					</g>
 					<g data-name="ReportsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="41639.3" y="2062.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M41639.3 2093.0 L42499.3 2093.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M41639.3 2259.0 L42499.3 2259.0" fill="none" data-name="ReportsFormViewModel"></path>
+							<rect x="42885.5" y="2122.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
+							<path d="M42885.5 2153.0 L43745.5 2153.0" fill="none" data-name="ReportsFormViewModel"></path>
+							<path d="M42885.5 2319.0 L43745.5 2319.0" fill="none" data-name="ReportsFormViewModel"></path>
 						</g>
-						<g transform="translate(41639.25, 2062)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
+						<g transform="translate(42885.5, 2122)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
 								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41639.25, 2093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+						<g transform="translate(42885.5, 2153)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
@@ -7102,7 +7137,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(41639.25, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+						<g transform="translate(42885.5, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
@@ -7119,17 +7154,17 @@
 					</g>
 					<g data-name="ReportFormItemDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="38027.5" y="2945.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M38027.5 2976.0 L38870.5 2976.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M38027.5 3052.0 L38870.5 3052.0" fill="none" data-name="ReportFormItemDelegate"></path>
+							<rect x="39266.3" y="3065.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
+							<path d="M39266.3 3096.0 L40109.3 3096.0" fill="none" data-name="ReportFormItemDelegate"></path>
+							<path d="M39266.3 3172.0 L40109.3 3172.0" fill="none" data-name="ReportFormItemDelegate"></path>
 						</g>
-						<g transform="translate(38027.5, 2945)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
+						<g transform="translate(39266.25, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
 								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38027.5, 2976)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+						<g transform="translate(39266.25, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
@@ -7138,7 +7173,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(38027.5, 3052)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+						<g transform="translate(39266.25, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
@@ -7152,17 +7187,17 @@
 					</g>
 					<g data-name="ReportBadge">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="21454.3" y="1321.5" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M21454.3 1352.5 L21651.3 1352.5" fill="none" data-name="ReportBadge"></path>
-							<path d="M21454.3 1428.5 L21651.3 1428.5" fill="none" data-name="ReportBadge"></path>
+							<rect x="24411.3" y="1321.5" height="138.0" width="197.0" data-name="ReportBadge"></rect>
+							<path d="M24411.3 1352.5 L24608.3 1352.5" fill="none" data-name="ReportBadge"></path>
+							<path d="M24411.3 1428.5 L24608.3 1428.5" fill="none" data-name="ReportBadge"></path>
 						</g>
-						<g transform="translate(21454.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
+						<g transform="translate(24411.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
 								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21454.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+						<g transform="translate(24411.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
@@ -7171,7 +7206,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(21454.25, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+						<g transform="translate(24411.25, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
 								
@@ -7180,16 +7215,16 @@
 					</g>
 					<g data-name="ReportStatus">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="11464.8" y="2998.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M11464.8 3029.0 L11765.8 3029.0" fill="none" data-name="ReportStatus"></path>
+							<rect x="12985.5" y="3118.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
+							<path d="M12985.5 3149.0 L13286.5 3149.0" fill="none" data-name="ReportStatus"></path>
 						</g>
-						<g transform="translate(11464.75, 2998)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
+						<g transform="translate(12985.5, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
 								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11464.75, 3029)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
+						<g transform="translate(12985.5, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
@@ -7201,24 +7236,24 @@
 					</g>
 					<g data-name="ReportsFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="30557.0" y="1329.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M30557.0 1360.0 L30895.0 1360.0" fill="none" data-name="ReportsFormData"></path>
-							<path d="M30557.0 1406.0 L30895.0 1406.0" fill="none" data-name="ReportsFormData"></path>
+							<rect x="31337.3" y="1329.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
+							<path d="M31337.3 1360.0 L31675.3 1360.0" fill="none" data-name="ReportsFormData"></path>
+							<path d="M31337.3 1406.0 L31675.3 1406.0" fill="none" data-name="ReportsFormData"></path>
 						</g>
-						<g transform="translate(30557, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
+						<g transform="translate(31337.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
 								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30557, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+						<g transform="translate(31337.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30557, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+						<g transform="translate(31337.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
@@ -7228,17 +7263,17 @@
 					</g>
 					<g data-name="StudyInfoFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="43616.0" y="1994.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M43616.0 2025.5 L44312.0 2025.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M43616.0 2431.5 L44312.0 2431.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+							<rect x="44862.3" y="2054.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
+							<path d="M44862.3 2085.5 L45558.3 2085.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+							<path d="M44862.3 2491.5 L45558.3 2491.5" fill="none" data-name="StudyInfoFormViewModel"></path>
 						</g>
-						<g transform="translate(43616, 1994.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
+						<g transform="translate(44862.25, 2054.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43616, 2025.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+						<g transform="translate(44862.25, 2085.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
@@ -7269,7 +7304,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(43616, 2431.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+						<g transform="translate(44862.25, 2491.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
@@ -7279,16 +7314,16 @@
 					</g>
 					<g data-name="StudyDesignInfoFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="12624.8" y="3020.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M12624.8 3051.5 L12847.8 3051.5" fill="none" data-name="StudyDesignInfoFormView"></path>
+							<rect x="12281.5" y="3140.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
+							<path d="M12281.5 3171.5 L12504.5 3171.5" fill="none" data-name="StudyDesignInfoFormView"></path>
 						</g>
-						<g transform="translate(12624.75, 3020.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
+						<g transform="translate(12281.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
 								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12624.75, 3051.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
+						<g transform="translate(12281.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
 								
@@ -7297,17 +7332,17 @@
 					</g>
 					<g data-name="StudyInfoFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="32623.5" y="1306.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M32623.5 1337.5 L33037.5 1337.5" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M32623.5 1428.5 L33037.5 1428.5" fill="none" data-name="StudyInfoFormData"></path>
+							<rect x="31715.3" y="1306.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
+							<path d="M31715.3 1337.5 L32129.3 1337.5" fill="none" data-name="StudyInfoFormData"></path>
+							<path d="M31715.3 1428.5 L32129.3 1428.5" fill="none" data-name="StudyInfoFormData"></path>
 						</g>
-						<g transform="translate(32623.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
+						<g transform="translate(31715.25, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
 								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32623.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+						<g transform="translate(31715.25, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
@@ -7317,7 +7352,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(32623.5, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+						<g transform="translate(31715.25, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
@@ -7327,17 +7362,17 @@
 					</g>
 					<g data-name="StudyContactInfoFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="32780.0" y="2122.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M32780.0 2153.0 L33128.0 2153.0" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M32780.0 2304.0 L33128.0 2304.0" fill="none" data-name="StudyContactInfoFormData"></path>
+							<rect x="32349.8" y="2182.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
+							<path d="M32349.8 2213.0 L32697.8 2213.0" fill="none" data-name="StudyContactInfoFormData"></path>
+							<path d="M32349.8 2364.0 L32697.8 2364.0" fill="none" data-name="StudyContactInfoFormData"></path>
 						</g>
-						<g transform="translate(32780, 2122)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
+						<g transform="translate(32349.75, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
 								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32780, 2153)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+						<g transform="translate(32349.75, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
@@ -7351,7 +7386,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(32780, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+						<g transform="translate(32349.75, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
@@ -7361,16 +7396,16 @@
 					</g>
 					<g data-name="StudyFormValidationSet">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="2049.0" y="3013.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M2049.0 3044.0 L2436.0 3044.0" fill="none" data-name="StudyFormValidationSet"></path>
+							<rect x="2049.0" y="3133.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
+							<path d="M2049.0 3164.0 L2436.0 3164.0" fill="none" data-name="StudyFormValidationSet"></path>
 						</g>
-						<g transform="translate(2049, 3013)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
+						<g transform="translate(2049, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
 								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2049, 3044)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
+						<g transform="translate(2049, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
@@ -7380,24 +7415,24 @@
 					</g>
 					<g data-name="MeasurementsFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="33117.5" y="1329.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M33117.5 1360.0 L33611.5 1360.0" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M33117.5 1406.0 L33611.5 1406.0" fill="none" data-name="MeasurementsFormData"></path>
+							<rect x="34063.3" y="1329.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
+							<path d="M34063.3 1360.0 L34557.3 1360.0" fill="none" data-name="MeasurementsFormData"></path>
+							<path d="M34063.3 1406.0 L34557.3 1406.0" fill="none" data-name="MeasurementsFormData"></path>
 						</g>
-						<g transform="translate(33117.5, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
+						<g transform="translate(34063.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
 								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33117.5, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+						<g transform="translate(34063.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33117.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+						<g transform="translate(34063.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
@@ -7407,16 +7442,16 @@
 					</g>
 					<g data-name="MeasurementSurveyFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="25121.5" y="1359.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M25121.5 1390.5 L25565.5 1390.5" fill="none" data-name="MeasurementSurveyFormView"></path>
+							<rect x="25072.3" y="1359.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
+							<path d="M25072.3 1390.5 L25516.3 1390.5" fill="none" data-name="MeasurementSurveyFormView"></path>
 						</g>
-						<g transform="translate(25121.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
+						<g transform="translate(25072.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
 								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25121.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
+						<g transform="translate(25072.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
 								
@@ -7425,17 +7460,17 @@
 					</g>
 					<g data-name="MeasurementSurveyFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="31222.3" y="2024.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M31222.3 2055.5 L31918.3 2055.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M31222.3 2281.5 L31918.3 2281.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+							<rect x="31613.8" y="2084.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
+							<path d="M31613.8 2115.5 L32309.8 2115.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+							<path d="M31613.8 2341.5 L32309.8 2341.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
 						</g>
-						<g transform="translate(31222.25, 2024.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+						<g transform="translate(31613.75, 2084.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31222.25, 2055.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+						<g transform="translate(31613.75, 2115.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
@@ -7454,7 +7489,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(31222.25, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+						<g transform="translate(31613.75, 2341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
@@ -7472,23 +7507,23 @@
 					</g>
 					<g data-name="SurveyPreview">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="12015.0" y="1344.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M12015.0 1375.0 L12359.0 1375.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M12015.0 1406.0 L12359.0 1406.0" fill="none" data-name="SurveyPreview"></path>
+							<rect x="10726.3" y="1344.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
+							<path d="M10726.3 1375.0 L11070.3 1375.0" fill="none" data-name="SurveyPreview"></path>
+							<path d="M10726.3 1406.0 L11070.3 1406.0" fill="none" data-name="SurveyPreview"></path>
 						</g>
-						<g transform="translate(12015, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
+						<g transform="translate(10726.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12015, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+						<g transform="translate(10726.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12015, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+						<g transform="translate(10726.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
 								
@@ -7497,9 +7532,9 @@
 					</g>
 					<g data-name="MeasurementFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="10774.8" y="2220.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
+							<rect x="10774.8" y="2280.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(10774.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
+						<g transform="translate(10774.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
 								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
 								
@@ -7508,17 +7543,17 @@
 					</g>
 					<g data-name="MeasurementSurveyFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="36556.5" y="1291.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M36556.5 1322.5 L36965.5 1322.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M36556.5 1443.5 L36965.5 1443.5" fill="none" data-name="MeasurementSurveyFormData"></path>
+							<rect x="39988.8" y="1291.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
+							<path d="M39988.8 1322.5 L40397.8 1322.5" fill="none" data-name="MeasurementSurveyFormData"></path>
+							<path d="M39988.8 1443.5 L40397.8 1443.5" fill="none" data-name="MeasurementSurveyFormData"></path>
 						</g>
-						<g transform="translate(36556.5, 1291.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
+						<g transform="translate(39988.75, 1291.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
 								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36556.5, 1322.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+						<g transform="translate(39988.75, 1322.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
@@ -7530,7 +7565,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(36556.5, 1443.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+						<g transform="translate(39988.75, 1443.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
@@ -7540,24 +7575,24 @@
 					</g>
 					<g data-name="QuestionnaireFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="33994.5" y="2167.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M33994.5 2198.0 L34362.5 2198.0" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M33994.5 2244.0 L34362.5 2244.0" fill="none" data-name="QuestionnaireFormData"></path>
+							<rect x="36408.3" y="2227.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
+							<path d="M36408.3 2258.0 L36776.3 2258.0" fill="none" data-name="QuestionnaireFormData"></path>
+							<path d="M36408.3 2304.0 L36776.3 2304.0" fill="none" data-name="QuestionnaireFormData"></path>
 						</g>
-						<g transform="translate(33994.5, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
+						<g transform="translate(36408.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
 								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33994.5, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+						<g transform="translate(36408.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33994.5, 2244)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+						<g transform="translate(36408.25, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
@@ -7568,17 +7603,17 @@
 					</g>
 					<g data-name="WithQuestionnaireControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="37005.5" y="1261.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M37005.5 1292.5 L37637.5 1292.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M37005.5 1398.5 L37637.5 1398.5" fill="none" data-name="WithQuestionnaireControls"></path>
+							<rect x="38401.3" y="1261.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
+							<path d="M38401.3 1292.5 L39033.3 1292.5" fill="none" data-name="WithQuestionnaireControls"></path>
+							<path d="M38401.3 1398.5 L39033.3 1398.5" fill="none" data-name="WithQuestionnaireControls"></path>
 						</g>
-						<g transform="translate(37005.5, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
+						<g transform="translate(38401.25, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
 								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37005.5, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+						<g transform="translate(38401.25, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
@@ -7589,7 +7624,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(37005.5, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+						<g transform="translate(38401.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
@@ -7604,16 +7639,16 @@
 					</g>
 					<g data-name="StudyDesignMeasurementsFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="13328.8" y="3020.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M13328.8 3051.5 L13638.8 3051.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
+							<rect x="13376.5" y="3140.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
+							<path d="M13376.5 3171.5 L13686.5 3171.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
 						</g>
-						<g transform="translate(13328.75, 3020.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+						<g transform="translate(13376.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
 								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13328.75, 3051.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+						<g transform="translate(13376.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
 								
@@ -7622,17 +7657,17 @@
 					</g>
 					<g data-name="MeasurementsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="37401.5" y="2054.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M37401.5 2085.5 L38493.5 2085.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M37401.5 2236.5 L38493.5 2236.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+							<rect x="39126.5" y="2114.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
+							<path d="M39126.5 2145.5 L40218.5 2145.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+							<path d="M39126.5 2296.5 L40218.5 2296.5" fill="none" data-name="MeasurementsFormViewModel"></path>
 						</g>
-						<g transform="translate(37401.5, 2054.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
+						<g transform="translate(39126.5, 2114.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
 								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37401.5, 2085.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+						<g transform="translate(39126.5, 2145.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
@@ -7646,7 +7681,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(37401.5, 2236.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+						<g transform="translate(39126.5, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
@@ -7665,17 +7700,17 @@
 					</g>
 					<g data-name="StudyFormScaffold">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="12399.0" y="1329.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M12399.0 1360.0 L12787.0 1360.0" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M12399.0 1421.0 L12787.0 1421.0" fill="none" data-name="StudyFormScaffold"></path>
+							<rect x="11147.0" y="1329.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
+							<path d="M11147.0 1360.0 L11535.0 1360.0" fill="none" data-name="StudyFormScaffold"></path>
+							<path d="M11147.0 1421.0 L11535.0 1421.0" fill="none" data-name="StudyFormScaffold"></path>
 						</g>
-						<g transform="translate(12399, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
+						<g transform="translate(11147, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
 								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12399, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+						<g transform="translate(11147, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
@@ -7683,7 +7718,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(12399, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+						<g transform="translate(11147, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
 								
@@ -7692,9 +7727,9 @@
 					</g>
 					<g data-name="T Function(WidgetRef)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="11134.8" y="2220.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
+							<rect x="11134.8" y="2280.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
 						</g>
-						<g transform="translate(11134.75, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
+						<g transform="translate(11134.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
 								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
 								
@@ -7703,9 +7738,9 @@
 					</g>
 					<g data-name="Widget Function(T)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="11443.0" y="2220.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
+							<rect x="11443.0" y="2280.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
 						</g>
-						<g transform="translate(11443, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
+						<g transform="translate(11443, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
 								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
 								
@@ -7714,17 +7749,17 @@
 					</g>
 					<g data-name="ConsentItemFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="33258.5" y="2107.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M33258.5 2138.0 L33954.5 2138.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M33258.5 2304.0 L33954.5 2304.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+							<rect x="34448.8" y="2167.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
+							<path d="M34448.8 2198.0 L35144.8 2198.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+							<path d="M34448.8 2364.0 L35144.8 2364.0" fill="none" data-name="ConsentItemFormViewModel"></path>
 						</g>
-						<g transform="translate(33258.5, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
+						<g transform="translate(34448.75, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33258.5, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+						<g transform="translate(34448.75, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
@@ -7739,7 +7774,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(33258.5, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+						<g transform="translate(34448.75, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
@@ -7750,16 +7785,16 @@
 					</g>
 					<g data-name="StudyDesignEnrollmentFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="13678.8" y="3005.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M13678.8 3036.5 L14127.8 3036.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
+							<rect x="13726.5" y="3125.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
+							<path d="M13726.5 3156.5 L14175.5 3156.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
 						</g>
-						<g transform="translate(13678.75, 3005.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+						<g transform="translate(13726.5, 3125.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
 								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13678.75, 3036.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+						<g transform="translate(13726.5, 3156.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
@@ -7770,16 +7805,16 @@
 					</g>
 					<g data-name="IScreenerQuestionLogicFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="26024.3" y="2205.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M26024.3 2236.0 L26356.3 2236.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
+							<rect x="26725.5" y="2265.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
+							<path d="M26725.5 2296.0 L27057.5 2296.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
 						</g>
-						<g transform="translate(26024.25, 2205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
+						<g transform="translate(26725.5, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
 								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26024.25, 2236)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
+						<g transform="translate(26725.5, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
@@ -7788,23 +7823,23 @@
 					</g>
 					<g data-name="ScreenerQuestionLogicFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="25393.5" y="2167.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M25393.5 2198.0 L25817.5 2198.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M25393.5 2229.0 L25817.5 2229.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+							<rect x="26094.8" y="2227.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
+							<path d="M26094.8 2258.0 L26518.8 2258.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+							<path d="M26094.8 2289.0 L26518.8 2289.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
 						</g>
-						<g transform="translate(25393.5, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+						<g transform="translate(26094.75, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
 								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25393.5, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+						<g transform="translate(26094.75, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25393.5, 2229)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+						<g transform="translate(26094.75, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
@@ -7816,17 +7851,17 @@
 					</g>
 					<g data-name="ScreenerQuestionFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="25533.5" y="2885.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M25533.5 2916.0 L26095.5 2916.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M25533.5 3097.0 L26095.5 3097.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+							<rect x="26234.8" y="3005.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
+							<path d="M26234.8 3036.0 L26796.8 3036.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+							<path d="M26234.8 3217.0 L26796.8 3217.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(25533.5, 2885)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+						<g transform="translate(26234.75, 3005)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
 								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25533.5, 2916)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+						<g transform="translate(26234.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
@@ -7842,7 +7877,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(25533.5, 3097)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+						<g transform="translate(26234.75, 3217)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
@@ -7857,17 +7892,17 @@
 					</g>
 					<g data-name="ConsentItemFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="33880.5" y="941.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M33880.5 972.0 L34138.5 972.0" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M33880.5 1063.0 L34138.5 1063.0" fill="none" data-name="ConsentItemFormData"></path>
+							<rect x="34793.3" y="941.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
+							<path d="M34793.3 972.0 L35051.3 972.0" fill="none" data-name="ConsentItemFormData"></path>
+							<path d="M34793.3 1063.0 L35051.3 1063.0" fill="none" data-name="ConsentItemFormData"></path>
 						</g>
-						<g transform="translate(33880.5, 941)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
+						<g transform="translate(34793.25, 941)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
 								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33880.5, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+						<g transform="translate(34793.25, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
@@ -7877,7 +7912,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(33880.5, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+						<g transform="translate(34793.25, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
@@ -7887,16 +7922,16 @@
 					</g>
 					<g data-name="ConsentItemFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="27669.8" y="1359.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M27669.8 1390.5 L28050.8 1390.5" fill="none" data-name="ConsentItemFormView"></path>
+							<rect x="27264.5" y="1359.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
+							<path d="M27264.5 1390.5 L27645.5 1390.5" fill="none" data-name="ConsentItemFormView"></path>
 						</g>
-						<g transform="translate(27669.75, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
+						<g transform="translate(27264.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
 								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27669.75, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
+						<g transform="translate(27264.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
 								
@@ -7905,17 +7940,17 @@
 					</g>
 					<g data-name="EnrollmentFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="33651.5" y="1306.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M33651.5 1337.5 L34105.5 1337.5" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M33651.5 1428.5 L34105.5 1428.5" fill="none" data-name="EnrollmentFormData"></path>
+							<rect x="34597.3" y="1306.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
+							<path d="M34597.3 1337.5 L35051.3 1337.5" fill="none" data-name="EnrollmentFormData"></path>
+							<path d="M34597.3 1428.5 L35051.3 1428.5" fill="none" data-name="EnrollmentFormData"></path>
 						</g>
-						<g transform="translate(33651.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
+						<g transform="translate(34597.25, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
 								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33651.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+						<g transform="translate(34597.25, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
@@ -7925,7 +7960,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(33651.5, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+						<g transform="translate(34597.25, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
@@ -7935,17 +7970,17 @@
 					</g>
 					<g data-name="QuestionFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="23815.5" y="1627.0" height="1218.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M23815.5 1658.0 L24828.5 1658.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M23815.5 2559.0 L24828.5 2559.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<rect x="23009.8" y="1627.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M23009.8 1658.0 L24022.8 1658.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M23009.8 2679.0 L24022.8 2679.0" fill="none" data-name="QuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(23815.5, 1627)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+						<g transform="translate(23009.75, 1627)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
 								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23815.5, 1658)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+						<g transform="translate(23009.75, 1658)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
@@ -7960,56 +7995,64 @@
 								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
 								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
 								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23815.5, 2559)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
+								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
+								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
+								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
+								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
+								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
+								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
+								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
+								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
+								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
+								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
+								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
+								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
+								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
+								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
+								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
+								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
+								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
+								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(23009.75, 2679)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
@@ -8035,17 +8078,17 @@
 					</g>
 					<g data-name="EnrollmentFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="39030.5" y="1987.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M39030.5 2018.0 L39932.5 2018.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M39030.5 2244.0 L39932.5 2244.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+							<rect x="40276.8" y="2047.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
+							<path d="M40276.8 2078.0 L41178.8 2078.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+							<path d="M40276.8 2304.0 L41178.8 2304.0" fill="none" data-name="EnrollmentFormViewModel"></path>
 						</g>
-						<g transform="translate(39030.5, 1987)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
+						<g transform="translate(40276.75, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
 								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39030.5, 2018)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+						<g transform="translate(40276.75, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
@@ -8064,7 +8107,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(39030.5, 2244)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+						<g transform="translate(40276.75, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
@@ -8087,17 +8130,17 @@
 					</g>
 					<g data-name="EnrollmentFormConsentItemDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="32374.8" y="2945.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M32374.8 2976.0 L33174.8 2976.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M32374.8 3052.0 L33174.8 3052.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+							<rect x="33234.3" y="3065.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
+							<path d="M33234.3 3096.0 L34034.3 3096.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+							<path d="M33234.3 3172.0 L34034.3 3172.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
 						</g>
-						<g transform="translate(32374.75, 2945)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+						<g transform="translate(33234.25, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
 								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32374.75, 2976)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+						<g transform="translate(33234.25, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
@@ -8106,7 +8149,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(32374.75, 3052)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+						<g transform="translate(33234.25, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
@@ -8120,17 +8163,17 @@
 					</g>
 					<g data-name="StudyFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="43382.0" y="1209.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M43382.0 1240.0 L44078.0 1240.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M43382.0 1451.0 L44078.0 1451.0" fill="none" data-name="StudyFormViewModel"></path>
+							<rect x="44628.3" y="1209.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
+							<path d="M44628.3 1240.0 L45324.3 1240.0" fill="none" data-name="StudyFormViewModel"></path>
+							<path d="M44628.3 1451.0 L45324.3 1451.0" fill="none" data-name="StudyFormViewModel"></path>
 						</g>
-						<g transform="translate(43382, 1209)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(44628.25, 1209)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43382, 1240)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(44628.25, 1240)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
@@ -8148,7 +8191,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(43382, 1451)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(44628.25, 1451)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
@@ -8163,17 +8206,17 @@
 					</g>
 					<g data-name="QuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="34328.5" y="896.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M34328.5 927.0 L35496.5 927.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M34328.5 1063.0 L35496.5 1063.0" fill="none" data-name="QuestionFormData"></path>
+							<rect x="35385.3" y="896.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M35385.3 927.0 L36553.3 927.0" fill="none" data-name="QuestionFormData"></path>
+							<path d="M35385.3 1063.0 L36553.3 1063.0" fill="none" data-name="QuestionFormData"></path>
 						</g>
-						<g transform="translate(34328.5, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+						<g transform="translate(35385.25, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
 								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34328.5, 927)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+						<g transform="translate(35385.25, 927)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
@@ -8186,7 +8229,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(34328.5, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+						<g transform="translate(35385.25, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
@@ -8199,40 +8242,42 @@
 					</g>
 					<g data-name="SurveyQuestionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="21463.5" y="2983.0" height="137.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M21463.5 3014.0 L21826.5 3014.0" fill="none" data-name="SurveyQuestionType"></path>
+							<rect x="18748.0" y="3088.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M18748.0 3119.0 L19111.0 3119.0" fill="none" data-name="SurveyQuestionType"></path>
 						</g>
-						<g transform="translate(21463.5, 2983)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+						<g transform="translate(18748, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
 								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21463.5, 3014)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+						<g transform="translate(18748, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
 								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
 								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
 								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ChoiceQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="34642.5" y="1306.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M34642.5 1337.5 L34986.5 1337.5" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M34642.5 1398.5 L34986.5 1398.5" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<rect x="35463.3" y="1306.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M35463.3 1337.5 L35807.3 1337.5" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M35463.3 1398.5 L35807.3 1398.5" fill="none" data-name="ChoiceQuestionFormData"></path>
 						</g>
-						<g transform="translate(34642.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(35463.25, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34642.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(35463.25, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
@@ -8240,7 +8285,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(34642.5, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(35463.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
@@ -8252,24 +8297,24 @@
 					</g>
 					<g data-name="BoolQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="35026.5" y="1321.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M35026.5 1352.5 L35418.5 1352.5" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M35026.5 1398.5 L35418.5 1398.5" fill="none" data-name="BoolQuestionFormData"></path>
+							<rect x="35847.3" y="1321.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M35847.3 1352.5 L36239.3 1352.5" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M35847.3 1398.5 L36239.3 1398.5" fill="none" data-name="BoolQuestionFormData"></path>
 						</g>
-						<g transform="translate(35026.5, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(35847.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
 								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35026.5, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(35847.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35026.5, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(35847.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
@@ -8278,19 +8323,76 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="ImageQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
+							<rect x="36279.3" y="1321.5" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
+							<path d="M36279.3 1352.5 L36751.3 1352.5" fill="none" data-name="ImageQuestionFormData"></path>
+							<path d="M36279.3 1398.5 L36751.3 1398.5" fill="none" data-name="ImageQuestionFormData"></path>
+						</g>
+						<g transform="translate(36279.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(36279.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(36279.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="AudioQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
+							<rect x="36791.3" y="1314.0" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
+							<path d="M36791.3 1345.0 L37263.3 1345.0" fill="none" data-name="AudioQuestionFormData"></path>
+							<path d="M36791.3 1406.0 L37263.3 1406.0" fill="none" data-name="AudioQuestionFormData"></path>
+						</g>
+						<g transform="translate(36791.25, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(36791.25, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(36791.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="ScaleQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="35458.5" y="1246.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M35458.5 1277.5 L35802.5 1277.5" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M35458.5 1473.5 L35802.5 1473.5" fill="none" data-name="ScaleQuestionFormData"></path>
+							<rect x="37303.3" y="1246.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M37303.3 1277.5 L37647.3 1277.5" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M37303.3 1473.5 L37647.3 1473.5" fill="none" data-name="ScaleQuestionFormData"></path>
 						</g>
-						<g transform="translate(35458.5, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(37303.25, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35458.5, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(37303.25, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
@@ -8307,7 +8409,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(35458.5, 1473.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(37303.25, 1473.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
@@ -8318,17 +8420,17 @@
 					</g>
 					<g data-name="FreeTextQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="35842.5" y="1306.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M35842.5 1337.5 L36186.5 1337.5" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M35842.5 1413.5 L36186.5 1413.5" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<rect x="37687.3" y="1306.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M37687.3 1337.5 L38031.3 1337.5" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M37687.3 1413.5 L38031.3 1413.5" fill="none" data-name="FreeTextQuestionFormData"></path>
 						</g>
-						<g transform="translate(35842.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(37687.25, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35842.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(37687.25, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
@@ -8337,7 +8439,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(35842.5, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(37687.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
@@ -8348,35 +8450,60 @@
 					</g>
 					<g data-name="FreeTextQuestionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="35916.5" y="2220.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+							<rect x="37761.3" y="2280.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
 						</g>
-						<g transform="translate(35916.5, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+						<g transform="translate(37761.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
 								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
+					<g data-name="AudioRecordingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
+							<rect x="11575.0" y="1344.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
+							<path d="M11575.0 1375.0 L11927.0 1375.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<path d="M11575.0 1406.0 L11927.0 1406.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+						</g>
+						<g transform="translate(11575, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(11575, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(11575, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="FreeTextQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="12827.0" y="1321.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M12827.0 1352.5 L13179.0 1352.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M12827.0 1398.5 L13179.0 1398.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<rect x="11967.0" y="1321.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M11967.0 1352.5 L12319.0 1352.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M11967.0 1398.5 L12319.0 1398.5" fill="none" data-name="FreeTextQuestionFormView"></path>
 						</g>
-						<g transform="translate(12827, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(11967, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12827, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(11967, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12827, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(11967, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
@@ -8385,18 +8512,43 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="ImageCapturingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
+							<rect x="12774.0" y="1344.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
+							<path d="M12774.0 1375.0 L13126.0 1375.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<path d="M12774.0 1406.0 L13126.0 1406.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+						</g>
+						<g transform="translate(12774, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(12774, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(12774, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="IScaleQuestionFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="45917.5" y="60.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M45917.5 91.5 L46226.5 91.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
+							<rect x="47163.8" y="60.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M47163.8 91.5 L47472.8 91.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(45917.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+						<g transform="translate(47163.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
 								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45917.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+						<g transform="translate(47163.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
@@ -8405,16 +8557,16 @@
 					</g>
 					<g data-name="ScaleQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="29204.8" y="1359.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M29204.8 1390.5 L29556.8 1390.5" fill="none" data-name="ScaleQuestionFormView"></path>
+							<rect x="30945.3" y="1359.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M30945.3 1390.5 L31297.3 1390.5" fill="none" data-name="ScaleQuestionFormView"></path>
 						</g>
-						<g transform="translate(29204.75, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+						<g transform="translate(30945.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29204.75, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+						<g transform="translate(30945.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
@@ -8423,23 +8575,23 @@
 					</g>
 					<g data-name="ChoiceQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="13219.0" y="1344.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M13219.0 1375.0 L13571.0 1375.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M13219.0 1406.0 L13571.0 1406.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<rect x="16688.0" y="1344.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M16688.0 1375.0 L17040.0 1375.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M16688.0 1406.0 L17040.0 1406.0" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(13219, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(16688, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13219, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(16688, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13219, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(16688, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
 								
@@ -8448,23 +8600,23 @@
 					</g>
 					<g data-name="BoolQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="17090.3" y="1344.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M17090.3 1375.0 L17442.3 1375.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M17090.3 1406.0 L17442.3 1406.0" fill="none" data-name="BoolQuestionFormView"></path>
+							<rect x="17882.3" y="1344.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M17882.3 1375.0 L18234.3 1375.0" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M17882.3 1406.0 L18234.3 1406.0" fill="none" data-name="BoolQuestionFormView"></path>
 						</g>
-						<g transform="translate(17090.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+						<g transform="translate(17882.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17090.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+						<g transform="translate(17882.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17090.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+						<g transform="translate(17882.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
 								
@@ -8473,16 +8625,16 @@
 					</g>
 					<g data-name="SurveyQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="30165.0" y="1352.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M30165.0 1383.0 L30517.0 1383.0" fill="none" data-name="SurveyQuestionFormView"></path>
+							<rect x="32169.3" y="1352.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M32169.3 1383.0 L32521.3 1383.0" fill="none" data-name="SurveyQuestionFormView"></path>
 						</g>
-						<g transform="translate(30165, 1352)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+						<g transform="translate(32169.25, 1352)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30165, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+						<g transform="translate(32169.25, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
@@ -8492,9 +8644,9 @@
 					</g>
 					<g data-name="StudyUTimeOfDay">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="38977.5" y="1375.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
+							<rect x="40437.8" y="1375.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
 						</g>
-						<g transform="translate(38977.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
+						<g transform="translate(40437.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
 								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
 								
@@ -8503,23 +8655,23 @@
 					</g>
 					<g data-name="ScheduleControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="26140.3" y="971.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M26140.3 1002.0 L26572.3 1002.0" fill="none" data-name="ScheduleControls"></path>
-							<path d="M26140.3 1033.0 L26572.3 1033.0" fill="none" data-name="ScheduleControls"></path>
+							<rect x="26761.0" y="971.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
+							<path d="M26761.0 1002.0 L27193.0 1002.0" fill="none" data-name="ScheduleControls"></path>
+							<path d="M26761.0 1033.0 L27193.0 1033.0" fill="none" data-name="ScheduleControls"></path>
 						</g>
-						<g transform="translate(26140.25, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
+						<g transform="translate(26761, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
 								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26140.25, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+						<g transform="translate(26761, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26140.25, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+						<g transform="translate(26761, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
@@ -8529,16 +8681,16 @@
 					</g>
 					<g data-name="StudiesTableColumnHeader">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
-							<rect x="30935.0" y="1329.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
-							<path d="M30935.0 1360.5 L31172.0 1360.5" fill="none" data-name="StudiesTableColumnHeader"></path>
+							<rect x="32883.3" y="1329.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
+							<path d="M32883.3 1360.5 L33120.3 1360.5" fill="none" data-name="StudiesTableColumnHeader"></path>
 						</g>
-						<g transform="translate(30935, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
+						<g transform="translate(32883.25, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
 								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30935, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
+						<g transform="translate(32883.25, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
@@ -8551,16 +8703,16 @@
 					</g>
 					<g data-name="DashboardScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="28373.0" y="2205.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
-							<path d="M28373.0 2236.0 L28551.0 2236.0" fill="none" data-name="DashboardScreen"></path>
+							<rect x="29074.3" y="2265.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
+							<path d="M29074.3 2296.0 L29252.3 2296.0" fill="none" data-name="DashboardScreen"></path>
 						</g>
-						<g transform="translate(28373, 2205)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
+						<g transform="translate(29074.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
 								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28373, 2236)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
+						<g transform="translate(29074.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
 								
@@ -8569,16 +8721,16 @@
 					</g>
 					<g data-name="StudiesFilter">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
-							<rect x="14350.8" y="3013.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
-							<path d="M14350.8 3044.0 L14646.8 3044.0" fill="none" data-name="StudiesFilter"></path>
+							<rect x="14398.5" y="3133.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
+							<path d="M14398.5 3164.0 L14694.5 3164.0" fill="none" data-name="StudiesFilter"></path>
 						</g>
-						<g transform="translate(14350.75, 3013)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
+						<g transform="translate(14398.5, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
 								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14350.75, 3044)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
+						<g transform="translate(14398.5, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
@@ -8588,24 +8740,24 @@
 					</g>
 					<g data-name="DashboardScaffold">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
-							<rect x="31212.0" y="1336.5" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
-							<path d="M31212.0 1367.5 L31555.0 1367.5" fill="none" data-name="DashboardScaffold"></path>
-							<path d="M31212.0 1413.5 L31555.0 1413.5" fill="none" data-name="DashboardScaffold"></path>
+							<rect x="33160.3" y="1336.5" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
+							<path d="M33160.3 1367.5 L33503.3 1367.5" fill="none" data-name="DashboardScaffold"></path>
+							<path d="M33160.3 1413.5 L33503.3 1413.5" fill="none" data-name="DashboardScaffold"></path>
 						</g>
-						<g transform="translate(31212, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
+						<g transform="translate(33160.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
 								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31212, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+						<g transform="translate(33160.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31212, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+						<g transform="translate(33160.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
 								
@@ -8614,17 +8766,17 @@
 					</g>
 					<g data-name="DashboardController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
-							<rect x="17672.3" y="2047.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
-							<path d="M17672.3 2078.0 L18286.3 2078.0" fill="none" data-name="DashboardController"></path>
-							<path d="M17672.3 2199.0 L18286.3 2199.0" fill="none" data-name="DashboardController"></path>
+							<rect x="17153.0" y="2107.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
+							<path d="M17153.0 2138.0 L17767.0 2138.0" fill="none" data-name="DashboardController"></path>
+							<path d="M17153.0 2259.0 L17767.0 2259.0" fill="none" data-name="DashboardController"></path>
 						</g>
-						<g transform="translate(17672.25, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
+						<g transform="translate(17153, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
 								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17672.25, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+						<g transform="translate(17153, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
@@ -8636,7 +8788,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(17672.25, 2199)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+						<g transform="translate(17153, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
@@ -8658,9 +8810,9 @@
 					</g>
 					<g data-name="IUserRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="14167.8" y="3036.0" height="31.0" width="143.0" data-name="IUserRepository"></rect>
+							<rect x="14215.5" y="3156.0" height="31.0" width="143.0" data-name="IUserRepository"></rect>
 						</g>
-						<g transform="translate(14167.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
+						<g transform="translate(14215.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
 								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
 								
@@ -8669,9 +8821,9 @@
 					</g>
 					<g data-name="SearchController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="14686.8" y="3036.0" height="31.0" width="149.0" data-name="SearchController"></rect>
+							<rect x="14734.5" y="3156.0" height="31.0" width="149.0" data-name="SearchController"></rect>
 						</g>
-						<g transform="translate(14686.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
+						<g transform="translate(14734.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
 								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
 								
@@ -8680,17 +8832,17 @@
 					</g>
 					<g data-name="StudiesTableColumnSize">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
-							<rect x="46266.5" y="30.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
-							<path d="M46266.5 61.0 L46491.5 61.0" fill="none" data-name="StudiesTableColumnSize"></path>
-							<path d="M46266.5 122.0 L46491.5 122.0" fill="none" data-name="StudiesTableColumnSize"></path>
+							<rect x="47512.8" y="30.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
+							<path d="M47512.8 61.0 L47737.8 61.0" fill="none" data-name="StudiesTableColumnSize"></path>
+							<path d="M47512.8 122.0 L47737.8 122.0" fill="none" data-name="StudiesTableColumnSize"></path>
 						</g>
-						<g transform="translate(46266.5, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
+						<g transform="translate(47512.75, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
 								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46266.5, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+						<g transform="translate(47512.75, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
@@ -8698,7 +8850,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(46266.5, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+						<g transform="translate(47512.75, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
 								
@@ -8707,17 +8859,17 @@
 					</g>
 					<g data-name="StudiesTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
-							<rect x="31986.8" y="1246.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
-							<path d="M31986.8 1277.5 L32466.8 1277.5" fill="none" data-name="StudiesTable"></path>
-							<path d="M31986.8 1488.5 L32466.8 1488.5" fill="none" data-name="StudiesTable"></path>
+							<rect x="33543.3" y="1246.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
+							<path d="M33543.3 1277.5 L34023.3 1277.5" fill="none" data-name="StudiesTable"></path>
+							<path d="M33543.3 1488.5 L34023.3 1488.5" fill="none" data-name="StudiesTable"></path>
 						</g>
-						<g transform="translate(31986.75, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
+						<g transform="translate(33543.25, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
 								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31986.75, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+						<g transform="translate(33543.25, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
@@ -8735,7 +8887,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(31986.75, 1488.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+						<g transform="translate(33543.25, 1488.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
@@ -8745,9 +8897,9 @@
 					</g>
 					<g data-name="void Function(Study)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
-							<rect x="31958.3" y="2220.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
+							<rect x="33488.0" y="2280.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
 						</g>
-						<g transform="translate(31958.25, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
+						<g transform="translate(33488, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
 								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
 								
@@ -8756,9 +8908,9 @@
 					</g>
 					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<rect x="32177.3" y="2220.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
+							<rect x="34008.5" y="2280.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
 						</g>
-						<g transform="translate(32177.25, 2220.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+						<g transform="translate(34008.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
 								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
 								
@@ -8767,16 +8919,16 @@
 					</g>
 					<g data-name="StudiesTableColumn">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
-							<rect x="2476.0" y="2945.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
-							<path d="M2476.0 2976.5 L2837.0 2976.5" fill="none" data-name="StudiesTableColumn"></path>
+							<rect x="2476.0" y="3065.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
+							<path d="M2476.0 3096.5 L2837.0 3096.5" fill="none" data-name="StudiesTableColumn"></path>
 						</g>
-						<g transform="translate(2476, 2945.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
+						<g transform="translate(2476, 3065.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
 								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2476, 2976.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
+						<g transform="translate(2476, 3096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
@@ -8795,16 +8947,16 @@
 					</g>
 					<g data-name="StudiesTableItem">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
-							<rect x="29903.3" y="2137.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
-							<path d="M29903.3 2168.5 L30303.3 2168.5" fill="none" data-name="StudiesTableItem"></path>
+							<rect x="30294.8" y="2197.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
+							<path d="M30294.8 2228.5 L30694.8 2228.5" fill="none" data-name="StudiesTableItem"></path>
 						</g>
-						<g transform="translate(29903.25, 2137.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
+						<g transform="translate(30294.75, 2197.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
 								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29903.25, 2168.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
+						<g transform="translate(30294.75, 2228.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
@@ -8822,9 +8974,9 @@
 					</g>
 					<g data-name="void Function(Study, bool)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
-							<rect x="30171.0" y="3036.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
+							<rect x="30562.5" y="3156.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
 						</g>
-						<g transform="translate(30171, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
+						<g transform="translate(30562.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
 								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
 								
@@ -8833,9 +8985,9 @@
 					</g>
 					<g data-name="void Function(Study)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
-							<rect x="30444.0" y="3036.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
+							<rect x="30835.5" y="3156.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
 						</g>
-						<g transform="translate(30444, 3036)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
+						<g transform="translate(30835.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
 								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
 								
@@ -8844,9 +8996,9 @@
 					</g>
 					<g data-name="App">
 						<g fill="#eee8d5" stroke="#33322E" data-name="App">
-							<rect x="46531.5" y="76.0" height="31.0" width="47.0" data-name="App"></rect>
+							<rect x="47777.8" y="76.0" height="31.0" width="47.0" data-name="App"></rect>
 						</g>
-						<g transform="translate(46531.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
+						<g transform="translate(47777.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
 								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
 								
@@ -8855,9 +9007,9 @@
 					</g>
 					<g data-name="AppContent">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
-							<rect x="46618.5" y="76.0" height="31.0" width="109.0" data-name="AppContent"></rect>
+							<rect x="47864.8" y="76.0" height="31.0" width="109.0" data-name="AppContent"></rect>
 						</g>
-						<g transform="translate(46618.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
+						<g transform="translate(47864.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
 								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
 								
@@ -8866,16 +9018,16 @@
 					</g>
 					<g data-name="AccountSettingsDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
-							<rect x="17482.3" y="1359.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
-							<path d="M17482.3 1390.5 L17676.3 1390.5" fill="none" data-name="AccountSettingsDialog"></path>
+							<rect x="18727.3" y="1359.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
+							<path d="M18727.3 1390.5 L18921.3 1390.5" fill="none" data-name="AccountSettingsDialog"></path>
 						</g>
-						<g transform="translate(17482.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
+						<g transform="translate(18727.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
 								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17482.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
+						<g transform="translate(18727.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
 								
diff --git a/docs/uml/designer_v2/lib/uml.svg b/docs/uml/designer_v2/lib/uml.svg
index 88247b56d..22e73cd1e 100644
--- a/docs/uml/designer_v2/lib/uml.svg
+++ b/docs/uml/designer_v2/lib/uml.svg
@@ -1,4 +1,4 @@
-<svg version="1.1" baseProfile="full" width="81384.0" height="4628.0" viewbox="0 0 81384 4628" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+<svg version="1.1" baseProfile="full" width="83214.0" height="4748.0" viewbox="0 0 83214 4748" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
 	<desc >[Config
 	  |
 	  &lt;static&gt;+isDebugMode: bool;
@@ -34,6 +34,7 @@
 	  +study: Study;
 	  +measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
 	  +interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
+	  +mediaData: List&lt;String&gt;;
 	  +isEmpty: bool
 	]
 	
@@ -1504,7 +1505,6 @@
 	
 	[AppController
 	  |
-	  +sharedPreferences: SharedPreferences;
 	  +appDelegates: List&lt;IAppDelegate&gt;;
 	  -_delayedFuture: dynamic;
 	  +isInitialized: dynamic
@@ -1513,8 +1513,6 @@
 	  -dynamic _callDelegates()
 	]
 	
-	[AppController]o-[SharedPreferences]
-	
 	[ParticipantDetailsFormView
 	  |
 	  +formViewModel: ParticipantDetailsFormViewModel
@@ -1669,13 +1667,11 @@
 	[AuthFormController
 	  |
 	  +authRepository: IAuthRepository;
-	  +sharedPreferences: SharedPreferences;
 	  +notificationService: INotificationService;
 	  +router: GoRouter;
 	  +emailControl: FormControl&lt;String&gt;;
 	  +passwordControl: FormControl&lt;String&gt;;
 	  +passwordConfirmationControl: FormControl&lt;String&gt;;
-	  +rememberMeControl: FormControl&lt;bool&gt;;
 	  +termsOfServiceControl: FormControl&lt;bool&gt;;
 	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
 	  +loginForm: FormGroup;
@@ -1684,7 +1680,6 @@
 	  +passwordRecoveryForm: FormGroup;
 	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
 	  -_formKey: AuthFormKey;
-	  +shouldRemember: bool;
 	  +formKey: AuthFormKey;
 	  +form: FormGroup
 	  |
@@ -1701,14 +1696,10 @@
 	  +dynamic sendPasswordResetLink();
 	  +dynamic recoverPassword();
 	  +dynamic updateUser();
-	  -dynamic _readDebugUser();
-	  -void _setRememberMe();
-	  -void _delRememberMe();
-	  -void _initRememberMe()
+	  -dynamic _readDebugUser()
 	]
 	
 	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
-	[AuthFormController]o-[SharedPreferences]
 	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
 	[AuthFormController]o-[GoRouter]
 	[AuthFormController]o-[FormControl]
@@ -3492,6 +3483,31 @@
 	
 	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
 	
+	[ImageQuestionFormData
+	  |
+	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
+	  +responseOptions: List&lt;String&gt;
+	  |
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +ImageQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	]
+	
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
+	
+	[AudioQuestionFormData
+	  |
+	  +maxRecordingDurationSeconds: int;
+	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
+	  +responseOptions: List&lt;String&gt;
+	  |
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +AudioQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	]
+	
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
+	
 	[ScaleQuestionFormData
 	  |
 	  +minValue: double;
@@ -3530,6 +3546,16 @@
 	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
 	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
 	
+	[AudioRecordingQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
+	
 	[FreeTextQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel;
@@ -3550,12 +3576,24 @@
 	  &lt;static&gt;+choice: SurveyQuestionType;
 	  &lt;static&gt;+bool: SurveyQuestionType;
 	  &lt;static&gt;+scale: SurveyQuestionType;
+	  &lt;static&gt;+image: SurveyQuestionType;
+	  &lt;static&gt;+audio: SurveyQuestionType;
 	  &lt;static&gt;+freeText: SurveyQuestionType
 	]
 	
 	[SurveyQuestionType]o-[SurveyQuestionType]
 	[Enum]&lt;:--[SurveyQuestionType]
 	
+	[ImageCapturingQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
+	
 	[&lt;abstract&gt;IScaleQuestionFormViewModel
 	  |
 	  +isMidValuesClearedInfoVisible: bool
@@ -3603,6 +3641,11 @@
 	  +customOptionsMax: int;
 	  +customOptionsInitial: int;
 	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
+	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
+	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
+	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
+	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
+	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
 	  &lt;static&gt;+kDefaultScaleMinValue: int;
 	  &lt;static&gt;+kDefaultScaleMaxValue: int;
 	  &lt;static&gt;+kNumMidValueControls: int;
@@ -3638,6 +3681,8 @@
 	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
 	  +validAnswerOptions: List&lt;String&gt;;
 	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
 	  +scaleMinValue: int;
 	  +scaleMaxValue: int;
 	  +scaleRange: int;
@@ -3646,6 +3691,7 @@
 	  +questionTextRequired: dynamic;
 	  +numValidChoiceOptions: dynamic;
 	  +scaleRangeValid: dynamic;
+	  +maxRecordingDurationValid: dynamic;
 	  +titles: Map&lt;FormMode, String&gt;;
 	  +isAddOptionButtonVisible: bool;
 	  +isMidValuesClearedInfoVisible: bool
@@ -4170,7 +4216,6 @@
 	[AuthRepository
 	  |
 	  +supabaseClient: SupabaseClient;
-	  +sharedPreferences: SharedPreferences;
 	  +allowPasswordReset: bool;
 	  +authClient: GoTrueClient;
 	  +session: Session?;
@@ -4189,7 +4234,6 @@
 	]
 	
 	[AuthRepository]o-[SupabaseClient]
-	[AuthRepository]o-[SharedPreferences]
 	[AuthRepository]o-[GoTrueClient]
 	[AuthRepository]o-[Session]
 	[AuthRepository]o-[User]
@@ -4352,2270 +4396,2274 @@
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="4628.0" width="81384.0" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="4748.0" width="83214.0" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
 				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M28091.5 158.2 L27833 293 L27833 591 L27833.0 591.0 " fill="none"></path>
-					<path d="M28093.9 162.9 L28091.5 158.2 L28089.0 153.4 L28103.3 152.0 Z"></path>
-					<path d="M28133.0 165.3 L28133 293 L28133 591 L28133.0 591.0 " fill="none"></path>
-					<path d="M28138.3 165.3 L28133.0 165.3 L28127.7 165.3 L28133.0 152.0 Z"></path>
-					<path d="M207.0 2637.2 L207 3194 L67831.5 3380.4159226960314 L67831.5 3380.4 " fill="none"></path>
+					<path d="M26842.5 158.2 L26584 293 L26584 591 L26584.0 591.0 " fill="none"></path>
+					<path d="M26844.9 162.9 L26842.5 158.2 L26840.0 153.4 L26854.3 152.0 Z"></path>
+					<path d="M26884.0 165.3 L26884 293 L26884 591 L26884.0 591.0 " fill="none"></path>
+					<path d="M26889.3 165.3 L26884.0 165.3 L26878.7 165.3 L26884.0 152.0 Z"></path>
+					<path d="M207.0 2704.7 L207 3314 L63638.5 3500.4103676215686 L63638.5 3500.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M212.3 2627.8 L207.0 2637.2 L201.7 2627.8 L207.0 2618.5 Z"></path>
+						<path d="M212.3 2695.3 L207.0 2704.7 L201.7 2695.3 L207.0 2686.0 Z"></path>
 					</g>
-					<path d="M442.9 3288.2 L456 3282 L463.5 3282 L463.5 3282 L471 3380.5 L471 3380.5 L463.5 3479 L463.5 3479 L456 3479 L456 3479 L426 3464.8612440191387 L426.0 3464.9 " fill="none"></path>
+					<path d="M442.9 3408.2 L456 3402 L463.5 3402 L463.5 3402 L471 3500.5 L471 3500.5 L463.5 3599 L463.5 3599 L456 3599 L456 3599 L426 3584.8612440191387 L426.0 3584.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M432.2 3287.3 L442.9 3288.2 L436.7 3297.0 L426.0 3296.1 Z"></path>
+						<path d="M432.2 3407.3 L442.9 3408.2 L436.7 3417.0 L426.0 3416.1 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3061.7 2574.6 L247 3194 L247 3282 L247.0 3282.0 " fill="none"></path>
+						<path d="M3061.8 2635.5 L247 3314 L247 3402 L247.0 3402.0 " fill="none"></path>
 					</g>
-					<path d="M3062.9 2579.8 L3061.7 2574.6 L3060.6 2569.4 L3074.8 2571.7 Z"></path>
-					<path d="M3819.6 2666.9 L3721.5 3194 L3481.7882037533514 3349.5 L3481.8 3349.5 " fill="none"></path>
+					<path d="M3063.0 2640.7 L3061.8 2635.5 L3060.5 2630.3 L3074.8 2632.4 Z"></path>
+					<path d="M3821.2 2726.9 L3721.5 3314 L3470.9490616621983 3469.5 L3470.9 3469.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3826.5 2658.7 L3819.6 2666.9 L3816.0 2656.7 L3823.0 2648.5 Z"></path>
+						<path d="M3828.0 2718.6 L3821.2 2726.9 L3817.5 2716.8 L3824.3 2708.5 Z"></path>
 					</g>
-					<path d="M3866.5 2666.5 L4012.25 3194 L3734.828418230563 3334.5 L3734.8 3334.5 " fill="none"></path>
+					<path d="M3864.1 2726.6 L4012.25 3314 L3725.0348525469167 3454.5 L3725.0 3454.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3869.2 2656.1 L3866.5 2666.5 L3858.9 2658.9 L3861.6 2648.5 Z"></path>
+						<path d="M3867.0 2716.2 L3864.1 2726.6 L3856.7 2718.9 L3859.6 2708.5 Z"></path>
 					</g>
-					<path d="M1880.5 3430.2 L1880.5 3567 L1880.5 3677.5 L1880.5 3677.5 " fill="none"></path>
+					<path d="M1867.5 3550.2 L1867.5 3687 L1867.5 3797.5 L1867.5 3797.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1885.8 3420.8 L1880.5 3430.2 L1875.2 3420.8 L1880.5 3411.5 Z"></path>
+						<path d="M1872.8 3540.8 L1867.5 3550.2 L1862.2 3540.8 L1867.5 3531.5 Z"></path>
 					</g>
-					<path d="M63500.8 3811.2 L63500.75 3880 L63000.88339552239 3998.5 L63000.9 3998.5 " fill="none"></path>
+					<path d="M60785.5 3931.2 L60785.5 4000 L61189.19589552239 4118.5 L61189.2 4118.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63506.1 3801.8 L63500.8 3811.2 L63495.4 3801.8 L63500.8 3792.5 Z"></path>
+						<path d="M60790.8 3921.8 L60785.5 3931.2 L60780.2 3921.8 L60785.5 3912.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M63500.8 3447.3 L63500.75 3567 L63500.75 3654.5 L63500.8 3654.5 " fill="none"></path>
+						<path d="M60785.5 3567.3 L60785.5 3687 L60785.5 3774.5 L60785.5 3774.5 " fill="none"></path>
 					</g>
-					<path d="M63506.1 3447.3 L63500.8 3447.3 L63495.4 3447.3 L63500.8 3434.0 Z"></path>
-					<path d="M4199.9 2659.5 L4052.25 3194 L21264.5 3380.1161383368844 L21264.5 3380.1 " fill="none"></path>
+					<path d="M60790.8 3567.3 L60785.5 3567.3 L60780.2 3567.3 L60785.5 3554.0 Z"></path>
+					<path d="M4202.1 2719.6 L4052.25 3314 L21865.75 3500.129068855398 L21865.8 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4207.5 2651.9 L4199.9 2659.5 L4197.2 2649.1 L4204.9 2641.5 Z"></path>
+						<path d="M4209.6 2711.9 L4202.1 2719.6 L4199.3 2709.2 L4206.7 2701.5 Z"></path>
 					</g>
-					<path d="M4205.9 2659.8 L4092.25 3194 L27437 3380.1531271044223 L27437.0 3380.2 " fill="none"></path>
+					<path d="M4207.6 2719.8 L4092.25 3314 L27961.75 3500.1607389286164 L27961.8 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4213.0 2651.7 L4205.9 2659.8 L4202.6 2649.5 L4209.7 2641.5 Z"></path>
+						<path d="M4214.6 2711.7 L4207.6 2719.8 L4204.1 2709.6 L4211.1 2701.5 Z"></path>
 					</g>
-					<path d="M4211.8 2660.0 L4132.25 3194 L1647 3369.0539609102066 L1647.0 3369.1 " fill="none"></path>
+					<path d="M4213.1 2720.0 L4132.25 3314 L1634 3489.1098844310814 L1634.0 3489.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4218.5 2651.5 L4211.8 2660.0 L4207.9 2649.9 L4214.6 2641.5 Z"></path>
+						<path d="M4219.6 2711.5 L4213.1 2720.0 L4209.0 2710.0 L4215.6 2701.5 Z"></path>
 					</g>
-					<path d="M1880.5 3788.2 L1880.5 3880 L8413 4012.3087968561063 L8413.0 4012.3 " fill="none"></path>
+					<path d="M1867.5 3908.2 L1867.5 4000 L8450 4132.321482148215 L8450.0 4132.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1885.8 3778.8 L1880.5 3788.2 L1875.2 3778.8 L1880.5 3769.5 Z"></path>
+						<path d="M1872.8 3898.8 L1867.5 3908.2 L1862.2 3898.8 L1867.5 3889.5 Z"></path>
 					</g>
-					<path d="M4346.5 2649.1 L5127 3194 L3502 3373.0091553455404 L3502.0 3373.0 " fill="none"></path>
-					<path d="M4349.6 2644.8 L4346.5 2649.1 L4343.5 2653.5 L4335.6 2641.5 Z"></path>
-					<path d="M4373.8 2648.0 L5345.75 3194 L3746 3369.321507271926 L3746.0 3369.3 " fill="none"></path>
-					<path d="M4376.4 2643.4 L4373.8 2648.0 L4371.2 2652.7 L4362.2 2641.5 Z"></path>
-					<path d="M1664.8 3323.4 L1677 3319.5 L1684.5 3319.5 L1684.5 3319.5 L1692 3380.5 L1692 3380.5 L1684.5 3441.5 L1684.5 3441.5 L1677 3441.5 L1677 3441.5 L1647 3431.9935064935066 L1647.0 3432.0 " fill="none"></path>
+					<path d="M4336.6 2709.6 L5127 3314 L3489 3493.0662368112544 L3489.0 3493.1 " fill="none"></path>
+					<path d="M4339.9 2705.4 L4336.6 2709.6 L4333.4 2713.8 L4326.0 2701.5 Z"></path>
+					<path d="M4361.7 2708.5 L5345.75 3314 L3733 3489.406254556058 L3733.0 3489.4 " fill="none"></path>
+					<path d="M4364.5 2703.9 L4361.7 2708.5 L4358.9 2713.0 L4350.3 2701.5 Z"></path>
+					<path d="M1651.8 3443.4 L1664 3439.5 L1671.5 3439.5 L1671.5 3439.5 L1679 3500.5 L1679 3500.5 L1671.5 3561.5 L1671.5 3561.5 L1664 3561.5 L1664 3561.5 L1634 3551.9935064935066 L1634.0 3552.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1654.3 3321.1 L1664.8 3323.4 L1657.5 3331.3 L1647.0 3329.0 Z"></path>
+						<path d="M1641.3 3441.1 L1651.8 3443.4 L1644.5 3451.3 L1634.0 3449.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3062.0 2578.0 L1016 3194 L1331.2640750670241 3319.5 L1331.3 3319.5 " fill="none"></path>
+						<path d="M3062.1 2639.2 L1016 3314 L1322.5160857908847 3439.5 L1322.5 3439.5 " fill="none"></path>
 					</g>
-					<path d="M3063.5 2583.1 L3062.0 2578.0 L3060.4 2572.9 L3074.8 2574.2 Z"></path>
+					<path d="M3063.8 2644.3 L3062.1 2639.2 L3060.4 2634.2 L3074.8 2635.1 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M28655.0 180.8 L28655 293 L28655 598.5 L28655.0 598.5 " fill="none"></path>
+						<path d="M27406.0 180.8 L27406 293 L27406 598.5 L27406.0 598.5 " fill="none"></path>
 					</g>
-					<path d="M28660.3 180.8 L28655.0 180.8 L28649.7 180.8 L28655.0 167.5 Z"></path>
-					<path d="M5519.7 2644.1 L5385.75 3194 L21264.5 3380.0839734828846 L21264.5 3380.1 " fill="none"></path>
+					<path d="M27411.3 180.8 L27406.0 180.8 L27400.7 180.8 L27406.0 167.5 Z"></path>
+					<path d="M5521.4 2704.2 L5385.75 3314 L21865.75 3500.0991190094155 L21865.8 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5527.1 2636.3 L5519.7 2644.1 L5516.7 2633.8 L5524.1 2626.0 Z"></path>
+						<path d="M5528.6 2696.3 L5521.4 2704.2 L5518.2 2694.0 L5525.4 2686.0 Z"></path>
 					</g>
-					<path d="M5551.0 2644.5 L5634.25 3194 L3948 3371.9519734050077 L3948.0 3372.0 " fill="none"></path>
+					<path d="M5550.0 2704.5 L5634.25 3314 L3935 3492.01439404578 L3935.0 3492.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5554.9 2634.4 L5551.0 2644.5 L5544.4 2636.0 L5548.2 2626.0 Z"></path>
+						<path d="M5554.0 2694.5 L5550.0 2704.5 L5543.4 2696.0 L5547.4 2686.0 Z"></path>
 					</g>
-					<path d="M5900.5 2682.0 L5756.25 3194 L42757.25 3380.225701987559 L42757.3 3380.2 " fill="none"></path>
+					<path d="M5903.4 2742.1 L5756.25 3314 L35656.25 3500.160677026824 L35656.3 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5908.2 2674.4 L5900.5 2682.0 L5897.9 2671.5 L5905.6 2664.0 Z"></path>
+						<path d="M5910.9 2734.4 L5903.4 2742.1 L5900.5 2731.7 L5908.0 2724.0 Z"></path>
 					</g>
-					<path d="M5907.9 2682.2 L5796.25 3194 L28762 3379.828401757145 L28762.0 3379.8 " fill="none"></path>
+					<path d="M5910.1 2742.3 L5796.25 3314 L30375.75 3499.8723466801825 L30375.8 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5915.1 2674.3 L5907.9 2682.2 L5904.7 2672.0 L5911.9 2664.0 Z"></path>
+						<path d="M5917.2 2734.2 L5910.1 2742.3 L5906.7 2732.1 L5913.8 2724.0 Z"></path>
 					</g>
-					<path d="M5915.3 2682.4 L5836.25 3194 L4341.719168900804 3365 L4341.7 3365.0 " fill="none"></path>
+					<path d="M5916.9 2742.5 L5836.25 3314 L4279.141420911528 3485 L4279.1 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5922.0 2674.0 L5915.3 2682.4 L5911.5 2672.4 L5918.2 2664.0 Z"></path>
+						<path d="M5923.5 2734.0 L5916.9 2742.5 L5912.9 2732.5 L5919.5 2724.0 Z"></path>
 					</g>
-					<path d="M5967.5 2681.9 L6116.5 3194 L4575.25 3370.969755271664 L4575.3 3371.0 " fill="none"></path>
+					<path d="M5964.6 2742.0 L6116.5 3314 L4507 3491.3540620384047 L4507.0 3491.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5970.0 2671.5 L5967.5 2681.9 L5959.8 2674.5 L5962.3 2664.0 Z"></path>
+						<path d="M5967.3 2731.7 L5964.6 2742.0 L5957.0 2734.4 L5959.8 2724.0 Z"></path>
 					</g>
-					<path d="M6419.0 2659.3 L6246 3194 L25722.75 3379.841621580139 L25722.8 3379.8 " fill="none"></path>
+					<path d="M6421.6 2719.4 L6246 3314 L25990.5 3499.8505185858126 L25990.5 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6427.0 2652.0 L6419.0 2659.3 L6416.8 2648.7 L6424.8 2641.5 Z"></path>
+						<path d="M6429.4 2712.0 L6421.6 2719.4 L6419.1 2708.9 L6426.9 2701.5 Z"></path>
 					</g>
-					<path d="M6424.9 2659.6 L6286 3194 L11251.5 3378.8434630738525 L11251.5 3378.8 " fill="none"></path>
+					<path d="M6427.0 2719.7 L6286 3314 L11066 3498.7797699243447 L11066.0 3498.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6432.4 2651.9 L6424.9 2659.6 L6422.1 2649.2 L6429.6 2641.5 Z"></path>
+						<path d="M6434.4 2711.8 L6427.0 2719.7 L6424.0 2709.3 L6431.3 2701.5 Z"></path>
 					</g>
-					<path d="M6455.5 2660.1 L6489.5 3194 L4932.391420911528 3365 L4932.4 3365.0 " fill="none"></path>
+					<path d="M6455.0 2720.1 L6489.5 3314 L4869.813672922252 3485 L4869.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6460.3 2650.5 L6455.5 2660.1 L6449.6 2651.2 L6454.4 2641.5 Z"></path>
+						<path d="M6459.8 2710.5 L6455.0 2720.1 L6449.2 2711.1 L6453.9 2701.5 Z"></path>
 					</g>
-					<path d="M6946.2 2711.9 L6801.75 3194 L21675 3380.137068227952 L21675.0 3380.1 " fill="none"></path>
+					<path d="M6950.0 2772.0 L6801.75 3314 L22088 3500.1468552586475 L22088.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6954.0 2704.5 L6946.2 2711.9 L6943.8 2701.4 L6951.6 2694.0 Z"></path>
+						<path d="M6957.6 2764.4 L6950.0 2772.0 L6947.4 2761.6 L6955.0 2754.0 Z"></path>
 					</g>
-					<path d="M6955.5 2712.2 L6841.75 3194 L5780.5 3376.291618696753 L5780.5 3376.3 " fill="none"></path>
+					<path d="M6958.5 2772.2 L6841.75 3314 L5712.25 3496.5405112651647 L5712.3 3496.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6962.8 2704.3 L6955.5 2712.2 L6952.5 2701.9 L6959.8 2694.0 Z"></path>
+						<path d="M6965.7 2764.2 L6958.5 2772.2 L6955.3 2762.0 L6962.4 2754.0 Z"></path>
 					</g>
-					<path d="M7012.7 2712.5 L7086 3194 L5994.5 3366.732074671192 L5994.5 3366.7 " fill="none"></path>
+					<path d="M7010.7 2772.5 L7086 3314 L5926.25 3487.485762983758 L5926.3 3487.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7016.6 2702.4 L7012.7 2712.5 L7006.0 2704.0 L7009.9 2694.0 Z"></path>
+						<path d="M7014.7 2762.5 L7010.7 2772.5 L7004.2 2764.0 L7008.2 2754.0 Z"></path>
 					</g>
-					<path d="M7388.1 2637.0 L7319.5 3194 L6238.945040214478 3365 L6238.9 3365.0 " fill="none"></path>
+					<path d="M7388.9 2697.0 L7319.5 3314 L6176.367292225201 3485 L6176.4 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7394.6 2628.4 L7388.1 2637.0 L7384.0 2627.1 L7390.4 2618.5 Z"></path>
+						<path d="M7395.2 2688.4 L7388.9 2697.0 L7384.6 2687.2 L7391.0 2678.5 Z"></path>
 					</g>
-					<path d="M7413.7 2636.7 L7543.25 3194 L45104.25 3379.861674184134 L45104.3 3379.9 " fill="none"></path>
+					<path d="M7412.2 2696.8 L7543.25 3314 L37488.25 3499.700023275919 L37488.3 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7416.7 2626.4 L7413.7 2636.7 L7406.4 2628.8 L7409.4 2618.5 Z"></path>
+						<path d="M7415.5 2686.5 L7412.2 2696.8 L7405.1 2688.7 L7408.4 2678.5 Z"></path>
 					</g>
-					<path d="M45233.3 3430.2 L45233.25 3567 L45233.25 3708 L45233.3 3708.0 " fill="none"></path>
+					<path d="M37617.3 3550.2 L37617.25 3687 L37617.25 3828 L37617.3 3828.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45238.6 3420.8 L45233.3 3430.2 L45227.9 3420.8 L45233.3 3411.5 Z"></path>
+						<path d="M37622.6 3540.8 L37617.3 3550.2 L37611.9 3540.8 L37617.3 3531.5 Z"></path>
 					</g>
-					<path d="M7729.5 2652.2 L7729.5 3194 L21264.5 3380.0121218820236 L21264.5 3380.0 " fill="none"></path>
+					<path d="M7729.5 2712.2 L7729.5 3314 L21865.75 3500.032820576146 L21865.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7734.8 2642.8 L7729.5 2652.2 L7724.2 2642.8 L7729.5 2633.5 Z"></path>
+						<path d="M7734.8 2702.8 L7729.5 2712.2 L7724.2 2702.8 L7729.5 2693.5 Z"></path>
 					</g>
-					<path d="M7997.2 2674.8 L7894.25 3194 L21264.5 3380.0061261026053 L21264.5 3380.0 " fill="none"></path>
+					<path d="M7999.1 2734.9 L7894.25 3314 L21865.75 3500.027325622903 L21865.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8004.3 2666.7 L7997.2 2674.8 L7993.8 2664.6 L8000.9 2656.5 Z"></path>
+						<path d="M8006.0 2726.6 L7999.1 2734.9 L7995.5 2724.7 L8002.4 2716.5 Z"></path>
 					</g>
-					<path d="M8046.0 2674.6 L8174 3194 L12912 3377.861215147732 L12912.0 3377.9 " fill="none"></path>
+					<path d="M8043.7 2734.7 L8174 3314 L12912 3497.861215147732 L12912.0 3497.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8049.0 2664.3 L8046.0 2674.6 L8038.6 2666.8 L8041.5 2656.5 Z"></path>
+						<path d="M8046.8 2724.4 L8043.7 2734.7 L8036.4 2726.8 L8039.6 2716.5 Z"></path>
 					</g>
-					<path d="M8336.6 2696.6 L8214 3194 L27437 3380.0789193678147 L27437.0 3380.1 " fill="none"></path>
+					<path d="M8339.4 2756.7 L8214 3314 L27961.75 3500.0900840017684 L27961.8 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8344.0 2688.8 L8336.6 2696.6 L8333.6 2686.3 L8341.0 2678.5 Z"></path>
+						<path d="M8346.6 2748.8 L8339.4 2756.7 L8336.2 2746.4 L8343.5 2738.5 Z"></path>
 					</g>
-					<path d="M8348.9 2697.0 L8273 3194 L8273 3380.5 L8273 3380.5 L8273 3567 L8273 3567 L8273 3723.5 L8273 3723.5 L8273 3880 L8273 3880 L17849.5 4013.0000518215265 L17849.5 4013.0 " fill="none"></path>
+					<path d="M8350.6 2757.0 L8273 3314 L8273 3500.5 L8273 3500.5 L8273 3687 L8273 3687 L8273 3843.5 L8273 3843.5 L8273 4000 L8273 4000 L18277.25 4133.042500930405 L18277.3 4133.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8355.5 2688.5 L8348.9 2697.0 L8345.0 2686.9 L8351.7 2678.5 Z"></path>
+						<path d="M8357.2 2748.5 L8350.6 2757.0 L8346.6 2747.0 L8353.2 2738.5 Z"></path>
 					</g>
-					<path d="M8357.2 2697.1 L8313 3194 L11770 3375.8447327598365 L11770.0 3375.8 " fill="none"></path>
+					<path d="M8358.3 2757.1 L8313 3314 L11584.5 3495.5877232142857 L11584.5 3495.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8363.4 2688.3 L8357.2 2697.1 L8352.8 2687.3 L8358.9 2678.5 Z"></path>
+						<path d="M8364.3 2748.2 L8358.3 2757.1 L8353.7 2747.4 L8359.8 2738.5 Z"></path>
 					</g>
-					<path d="M8365.6 2697.2 L8353 3194 L13551 3378.6351776021334 L13551.0 3378.6 " fill="none"></path>
+					<path d="M8365.9 2757.2 L8353 3314 L13098.75 3498.4594122857293 L13098.8 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8371.2 2688.0 L8365.6 2697.2 L8360.5 2687.7 L8366.1 2678.5 Z"></path>
+						<path d="M8371.5 2748.0 L8365.9 2757.2 L8360.8 2747.7 L8366.4 2738.5 Z"></path>
 					</g>
-					<path d="M8389.8 2696.9 L8468 3194 L8468 3365 L8468.0 3365.0 " fill="none"></path>
+					<path d="M8388.0 2757.0 L8468 3314 L8468 3485 L8468.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8393.6 2686.9 L8389.8 2696.9 L8383.0 2688.5 L8386.9 2678.5 Z"></path>
+						<path d="M8391.9 2747.0 L8388.0 2757.0 L8381.4 2748.5 L8385.3 2738.5 Z"></path>
 					</g>
-					<path d="M8750.1 2659.4 L8666 3194 L8666 3365 L8666.0 3365.0 " fill="none"></path>
+					<path d="M8751.4 2719.5 L8666 3314 L8666 3485 L8666.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8756.9 2651.0 L8750.1 2659.4 L8746.3 2649.4 L8753.0 2641.0 Z"></path>
+						<path d="M8758.0 2711.0 L8751.4 2719.5 L8747.5 2709.5 L8754.1 2701.0 Z"></path>
 					</g>
-					<path d="M8828.8 2656.3 L9204.5 3194 L11251.5 3376.531914893617 L11251.5 3376.5 " fill="none"></path>
+					<path d="M8823.5 2716.7 L9204.5 3314 L11066 3496.1457240293807 L11066.0 3496.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8827.8 2645.6 L8828.8 2656.3 L8819.1 2651.7 L8818.1 2641.0 Z"></path>
+						<path d="M8823.0 2706.0 L8823.5 2716.7 L8814.0 2711.7 L8813.5 2701.0 Z"></path>
 					</g>
-					<path d="M8834.3 2655.8 L9244.5 3194 L21264.5 3379.9508108332298 L21264.5 3380.0 " fill="none"></path>
+					<path d="M8828.6 2716.3 L9244.5 3314 L21865.75 3499.9768996780376 L21865.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8832.8 2645.2 L8834.3 2655.8 L8824.4 2651.7 L8822.9 2641.0 Z"></path>
+						<path d="M8827.6 2705.6 L8828.6 2716.3 L8818.8 2711.7 L8817.9 2701.0 Z"></path>
 					</g>
-					<path d="M8839.7 2655.4 L9284.5 3194 L25722.75 3379.72043344591 L25722.8 3379.7 " fill="none"></path>
+					<path d="M8833.5 2715.9 L9284.5 3314 L25990.5 3499.7328763040236 L25990.5 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8837.8 2644.8 L8839.7 2655.4 L8829.6 2651.6 L8827.8 2641.0 Z"></path>
+						<path d="M8832.2 2705.2 L8833.5 2715.9 L8823.7 2711.7 L8822.3 2701.0 Z"></path>
 					</g>
-					<path d="M8847.5 2654.7 L9343.5 3194 L6879.25 3367.4765027838066 L6879.3 3367.5 " fill="none"></path>
+					<path d="M8840.8 2715.3 L9343.5 3314 L6811 3487.8035878564856 L6811.0 3487.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8845.1 2644.3 L8847.5 2654.7 L8837.3 2651.5 L8834.9 2641.0 Z"></path>
+						<path d="M8838.9 2704.7 L8840.8 2715.3 L8830.7 2711.6 L8828.8 2701.0 Z"></path>
 					</g>
-					<path d="M9544.6 2659.4 L9383.5 3194 L21264.5 3379.9444048168507 L21264.5 3379.9 " fill="none"></path>
+					<path d="M9547.0 2719.5 L9383.5 3314 L21865.75 3499.971091050708 L21865.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9552.4 2652.0 L9544.6 2659.4 L9542.2 2648.9 L9550.0 2641.5 Z"></path>
+						<path d="M9554.6 2711.9 L9547.0 2719.5 L9544.3 2709.1 L9552.0 2701.5 Z"></path>
 					</g>
-					<path d="M9567.0 2660.1 L9533.25 3194 L6879.25 3368.3469531525184 L6879.3 3368.3 " fill="none"></path>
+					<path d="M9567.5 2720.1 L9533.25 3314 L6811 3488.6322555679767 L6811.0 3488.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9572.9 2651.2 L9567.0 2660.1 L9562.3 2650.5 L9568.2 2641.5 Z"></path>
+						<path d="M9573.4 2711.1 L9567.5 2720.1 L9562.7 2710.5 L9568.6 2701.5 Z"></path>
 					</g>
-					<path d="M9595.5 2659.7 L9722.75 3194 L11251.5 3375.2247735579217 L11251.5 3375.2 " fill="none"></path>
+					<path d="M9593.6 2719.7 L9722.75 3314 L11066 3494.5196361016033 L11066.0 3494.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9598.6 2649.3 L9595.5 2659.7 L9588.2 2651.8 L9591.2 2641.5 Z"></path>
+						<path d="M9596.8 2709.5 L9593.6 2719.7 L9586.4 2711.8 L9589.6 2701.5 Z"></path>
 					</g>
-					<path d="M9912.5 2660.2 L9912.5 3194 L11251.5 3374.5012649078426 L11251.5 3374.5 " fill="none"></path>
+					<path d="M9912.5 2720.2 L9912.5 3314 L11066 3493.572412353923 L11066.0 3493.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9917.8 2650.8 L9912.5 2660.2 L9907.2 2650.8 L9912.5 2641.5 Z"></path>
+						<path d="M9917.8 2710.8 L9912.5 2720.2 L9907.2 2710.8 L9912.5 2701.5 Z"></path>
 					</g>
-					<path d="M10361.2 2652.7 L10344 3194 L11251.5 3371.782300420168 L11251.5 3371.8 " fill="none"></path>
+					<path d="M10361.5 2712.7 L10344 3314 L11066 3489.672537508154 L11066.0 3489.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10366.8 2643.5 L10361.2 2652.7 L10356.2 2643.2 L10361.8 2634.0 Z"></path>
+						<path d="M10367.1 2703.5 L10361.5 2712.7 L10356.4 2703.2 L10362.0 2694.0 Z"></path>
 					</g>
-					<path d="M10382.3 2652.3 L10496.25 3194 L6879.25 3371.4251709626515 L6879.3 3371.4 " fill="none"></path>
+					<path d="M10380.8 2712.3 L10496.25 3314 L6811 3491.585201214392 L6811.0 3491.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10385.6 2642.0 L10382.3 2652.3 L10375.2 2644.2 L10378.5 2634.0 Z"></path>
+						<path d="M10384.2 2702.2 L10380.8 2712.3 L10373.8 2704.2 L10377.2 2694.0 Z"></path>
 					</g>
-					<path d="M6897.9 3369.6 L7694.9166666666715 3327 L7898.8333333333285 3327 L7898.8333333333285 3327 L8102.75 3380.5 L8102.75 3380.5 L7898.8333333333285 3434 L7898.8333333333285 3434 L7694.9166666666715 3434 L7694.9166666666715 3434 L6879.25 3390.3909060626247 L6879.3 3390.4 " fill="none"></path>
+					<path d="M6829.6 3490.1 L7672.1666666666715 3447 L7887.4583333333285 3447 L7887.4583333333285 3447 L8102.75 3500.5 L8102.75 3500.5 L7887.4583333333285 3554 L7887.4583333333285 3554 L7672.1666666666715 3554 L7672.1666666666715 3554 L6811 3509.9607296479207 L6811.0 3510.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6888.3 3364.8 L6897.9 3369.6 L6888.9 3375.4 L6879.3 3370.6 Z"></path>
+						<path d="M6820.0 3485.2 L6829.6 3490.1 L6820.6 3495.9 L6811.0 3491.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3062.0 2578.3 L1056 3194 L6509.25 3374.3806367223874 L6509.3 3374.4 " fill="none"></path>
+						<path d="M3062.1 2639.5 L1056 3314 L6441 3494.30565529623 L6441.0 3494.3 " fill="none"></path>
 					</g>
-					<path d="M3063.6 2583.4 L3062.0 2578.3 L3060.4 2573.2 L3074.8 2574.4 Z"></path>
-					<path d="M15302.8 3796.2 L15302.75 3880 L17849.5 4010.315799522673 L17849.5 4010.3 " fill="none"></path>
+					<path d="M3063.8 2644.6 L3062.1 2639.5 L3060.4 2634.4 L3074.8 2635.3 Z"></path>
+					<path d="M15730.5 3916.2 L15730.5 4000 L18277.25 4130.315799522673 L18277.3 4130.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15308.1 3786.8 L15302.8 3796.2 L15297.4 3786.8 L15302.8 3777.5 Z"></path>
+						<path d="M15735.8 3906.8 L15730.5 3916.2 L15725.2 3906.8 L15730.5 3897.5 Z"></path>
 					</g>
-					<path d="M10637.5 2712.3 L10536.25 3194 L27437 3380.0212092597785 L27437.0 3380.0 " fill="none"></path>
+					<path d="M10640.2 2772.3 L10536.25 3314 L27961.75 3500.0355916194403 L27961.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10644.7 2704.2 L10637.5 2712.3 L10634.2 2702.0 L10641.4 2694.0 Z"></path>
+						<path d="M10647.2 2764.2 L10640.2 2772.3 L10636.7 2762.2 L10643.7 2754.0 Z"></path>
 					</g>
-					<path d="M10658.0 2712.6 L10623.75 3194 L21675 3380.011879244602 L21675.0 3380.0 " fill="none"></path>
+					<path d="M10658.9 2772.6 L10623.75 3314 L22088 3500.029419441846 L22088.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10664.0 2703.7 L10658.0 2712.6 L10653.3 2702.9 L10659.3 2694.0 Z"></path>
+						<path d="M10664.8 2763.7 L10658.9 2772.6 L10654.2 2763.0 L10660.1 2754.0 Z"></path>
 					</g>
-					<path d="M10667.4 2712.7 L10663.75 3194 L26003.75 3378.7655644536294 L26003.8 3378.8 " fill="none"></path>
+					<path d="M10667.5 2772.7 L10663.75 3314 L26691.75 3498.8393519663614 L26691.8 3498.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10672.8 2703.4 L10667.4 2712.7 L10662.1 2703.3 L10667.5 2694.0 Z"></path>
+						<path d="M10672.9 2763.4 L10667.5 2772.7 L10662.2 2763.3 L10667.6 2754.0 Z"></path>
 					</g>
-					<path d="M10676.8 2712.6 L10703.75 3194 L13551 3377.123415811708 L13551.0 3377.1 " fill="none"></path>
+					<path d="M10676.1 2772.6 L10703.75 3314 L13098.75 3496.49948927477 L13098.8 3496.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10681.6 2703.0 L10676.8 2712.6 L10670.9 2703.6 L10675.7 2694.0 Z"></path>
+						<path d="M10680.9 2763.0 L10676.1 2772.6 L10670.3 2763.6 L10675.1 2754.0 Z"></path>
 					</g>
-					<path d="M10698.4 2712.3 L10796 3194 L11254.445040214478 3365 L11254.4 3365.0 " fill="none"></path>
+					<path d="M10695.8 2772.4 L10796 3314 L11084.361930294906 3485 L11084.4 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10701.7 2702.1 L10698.4 2712.3 L10691.3 2704.2 L10694.6 2694.0 Z"></path>
+						<path d="M10699.3 2762.2 L10695.8 2772.4 L10688.8 2764.1 L10692.4 2754.0 Z"></path>
 					</g>
-					<path d="M26309.1 3317.0 L26321.75 3312 L26329.25 3312 L26329.25 3312 L26336.75 3380.5 L26336.75 3380.5 L26329.25 3449 L26329.25 3449 L26321.75 3449 L26321.75 3449 L26291.75 3437.189655172414 L26291.8 3437.2 " fill="none"></path>
+					<path d="M26997.1 3437.0 L27009.75 3432 L27017.25 3432 L27017.25 3432 L27024.75 3500.5 L27024.75 3500.5 L27017.25 3569 L27017.25 3569 L27009.75 3569 L27009.75 3569 L26979.75 3557.189655172414 L26979.8 3557.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26298.5 3315.4 L26309.1 3317.0 L26302.4 3325.4 L26291.8 3323.8 Z"></path>
+						<path d="M26986.5 3435.4 L26997.1 3437.0 L26990.4 3445.4 L26979.8 3443.8 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3062.0 2578.5 L1096 3194 L26003.75 3379.4279790832975 L26003.8 3379.4 " fill="none"></path>
+						<path d="M3062.1 2639.8 L1096 3314 L26691.75 3499.4566332229333 L26691.8 3499.5 " fill="none"></path>
 					</g>
-					<path d="M3063.6 2583.6 L3062.0 2578.5 L3060.4 2573.4 L3074.8 2574.5 Z"></path>
-					<path d="M10932.1 2719.8 L10836 3194 L21264.5 3379.8672830657492 L21264.5 3379.9 " fill="none"></path>
+					<path d="M3063.9 2644.8 L3062.1 2639.8 L3060.4 2634.7 L3074.8 2635.5 Z"></path>
+					<path d="M10934.8 2779.9 L10836 3314 L21865.75 3499.901662863469 L21865.8 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10939.2 2711.7 L10932.1 2719.8 L10928.7 2709.6 L10935.8 2701.5 Z"></path>
+						<path d="M10941.8 2771.6 L10934.8 2779.9 L10931.3 2769.7 L10938.2 2761.5 Z"></path>
 					</g>
-					<path d="M10960.1 2720.2 L10949.75 3194 L21675 3379.99708254876 L21675.0 3380.0 " fill="none"></path>
+					<path d="M10960.4 2780.2 L10949.75 3314 L22088 3500.015682016611 L22088.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10965.6 2710.9 L10960.1 2720.2 L10955.0 2710.7 L10960.5 2701.5 Z"></path>
+						<path d="M10965.9 2770.9 L10960.4 2780.2 L10955.3 2770.7 L10960.8 2761.5 Z"></path>
 					</g>
-					<path d="M10991.5 2719.9 L11077.25 3194 L13551 3376.6241959426025 L13551.0 3376.6 " fill="none"></path>
+					<path d="M10989.1 2779.9 L11077.25 3314 L13098.75 3495.779050144648 L13098.8 3495.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10995.1 2709.7 L10991.5 2719.9 L10984.6 2711.6 L10988.2 2701.5 Z"></path>
+						<path d="M10992.8 2769.8 L10989.1 2779.9 L10982.3 2771.6 L10986.0 2761.5 Z"></path>
 					</g>
-					<path d="M11231.0 2644.7 L11231 3194 L42757.25 3380.1781504555784 L42757.3 3380.2 " fill="none"></path>
+					<path d="M11231.0 2704.7 L11231 3314 L35656.25 3500.084789468847 L35656.3 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11236.3 2635.3 L11231.0 2644.7 L11225.7 2635.3 L11231.0 2626.0 Z"></path>
+						<path d="M11236.3 2695.3 L11231.0 2704.7 L11225.7 2695.3 L11231.0 2686.0 Z"></path>
 					</g>
-					<path d="M11502.0 2674.3 L11397.5 3194 L21264.5 3379.831406210553 L21264.5 3379.8 " fill="none"></path>
+					<path d="M11503.9 2734.4 L11397.5 3314 L21865.75 3499.869677496132 L21865.8 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11509.1 2666.2 L11502.0 2674.3 L11498.6 2664.1 L11505.7 2656.0 Z"></path>
+						<path d="M11510.9 2726.1 L11503.9 2734.4 L11500.4 2724.2 L11507.3 2716.0 Z"></path>
 					</g>
-					<path d="M11520.5 2674.7 L11503.75 3194 L5301.25 3376.1822584455467 L5301.3 3376.2 " fill="none"></path>
+					<path d="M11520.8 2734.7 L11503.75 3314 L5233 3496.2281757625337 L5233.0 3496.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11526.1 2665.5 L11520.5 2674.7 L11515.4 2665.2 L11521.1 2656.0 Z"></path>
+						<path d="M11526.4 2725.5 L11520.8 2734.7 L11515.7 2725.2 L11521.3 2716.0 Z"></path>
 					</g>
-					<path d="M11527.4 2674.7 L11543.75 3194 L13551 3375.746389124894 L13551.0 3375.7 " fill="none"></path>
+					<path d="M11527.1 2734.7 L11543.75 3314 L13098.75 3494.4090202177294 L13098.8 3494.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11532.5 2665.2 L11527.4 2674.7 L11521.8 2665.5 L11526.9 2656.0 Z"></path>
+						<path d="M11532.2 2725.2 L11527.1 2734.7 L11521.5 2725.5 L11526.6 2716.0 Z"></path>
 					</g>
-					<path d="M11545.9 2674.3 L11650.25 3194 L11841.19235924933 3365 L11841.2 3365.0 " fill="none"></path>
+					<path d="M11544.0 2734.4 L11650.25 3314 L11671.109249329758 3485 L11671.1 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11549.3 2664.1 L11545.9 2674.3 L11538.9 2666.2 L11542.3 2656.0 Z"></path>
+						<path d="M11547.6 2724.2 L11544.0 2734.4 L11537.1 2726.1 L11540.7 2716.0 Z"></path>
 					</g>
-					<path d="M5318.9 3323.8 L5331.25 3319.5 L5338.75 3319.5 L5338.75 3319.5 L5346.25 3380.5 L5346.25 3380.5 L5338.75 3441.5 L5338.75 3441.5 L5331.25 3441.5 L5331.25 3441.5 L5301.25 3431.1610169491523 L5301.3 3431.2 " fill="none"></path>
+					<path d="M5250.6 3443.8 L5263 3439.5 L5270.5 3439.5 L5270.5 3439.5 L5278 3500.5 L5278 3500.5 L5270.5 3561.5 L5270.5 3561.5 L5263 3561.5 L5263 3561.5 L5233 3551.1610169491523 L5233.0 3551.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5308.3 3321.8 L5318.9 3323.8 L5311.8 3331.8 L5301.3 3329.8 Z"></path>
+						<path d="M5240.1 3441.8 L5250.6 3443.8 L5243.6 3451.8 L5233.0 3449.8 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3095.3 2593.1 L2883.25 3194 L5007.25 3368.428005284016 L5007.3 3368.4 " fill="none"></path>
+						<path d="M3096.2 2653.2 L2883.25 3314 L4939 3488.0539666326185 L4939.0 3488.1 " fill="none"></path>
 					</g>
-					<path d="M3100.4 2594.8 L3095.3 2593.1 L3090.3 2591.3 L3099.8 2580.5 Z"></path>
-					<path d="M29630.6 175.9 L28920.5 293 L28920.5 614 L28920.5 614.0 " fill="none"></path>
+					<path d="M3101.2 2654.8 L3096.2 2653.2 L3091.1 2651.6 L3100.3 2640.5 Z"></path>
+					<path d="M28381.6 175.9 L27671.5 293 L27671.5 614 L27671.5 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29640.7 179.6 L29630.6 175.9 L29638.9 169.1 L29649.0 172.9 Z"></path>
+						<path d="M28391.7 179.6 L28381.6 175.9 L28389.9 169.1 L28400.0 172.9 Z"></path>
 					</g>
-					<path d="M29869.5 208.7 L29869.5 293 L29869.5 614 L29869.5 614.0 " fill="none"></path>
+					<path d="M28620.5 208.7 L28620.5 293 L28620.5 614 L28620.5 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29874.8 199.3 L29869.5 208.7 L29864.2 199.3 L29869.5 190.0 Z"></path>
+						<path d="M28625.8 199.3 L28620.5 208.7 L28615.2 199.3 L28620.5 190.0 Z"></path>
 					</g>
-					<path d="M56441.6 1755.8 L56087.5 1936 L37118.75 2560.114020060417 L37118.8 2560.1 " fill="none"></path>
+					<path d="M61386.0 1753.9 L61015.5 1936 L44484.75 2618.8656414407124 L44484.8 2618.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56452.4 1756.3 L56441.6 1755.8 L56447.5 1746.8 L56458.3 1747.4 Z"></path>
+						<path d="M61396.7 1754.6 L61386.0 1753.9 L61392.0 1745.0 L61402.8 1745.7 Z"></path>
 					</g>
-					<path d="M12145.3 2711.2 L11985.25 3194 L12047.369302949062 3365 L12047.4 3365.0 " fill="none"></path>
+					<path d="M12149.5 2771.4 L11985.25 3314 L11877.286193029491 3485 L11877.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12153.3 2704.0 L12145.3 2711.2 L12143.2 2700.7 L12151.2 2693.5 Z"></path>
+						<path d="M12157.3 2764.0 L12149.5 2771.4 L12147.1 2760.9 L12154.9 2753.5 Z"></path>
 					</g>
-					<path d="M12168.1 2711.9 L12084 3194 L21675 3379.937785862786 L21675.0 3379.9 " fill="none"></path>
+					<path d="M12170.3 2771.9 L12084 3314 L22088 3499.9609289345162 L22088.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12175.0 2703.6 L12168.1 2711.9 L12164.5 2701.8 L12171.3 2693.5 Z"></path>
+						<path d="M12177.1 2763.6 L12170.3 2771.9 L12166.5 2761.9 L12173.3 2753.5 Z"></path>
 					</g>
-					<path d="M12191.2 2712.2 L12182.75 3194 L12244.869302949062 3365 L12244.9 3365.0 " fill="none"></path>
+					<path d="M12191.4 2772.2 L12182.75 3314 L12074.786193029491 3485 L12074.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12196.7 2702.9 L12191.2 2712.2 L12186.0 2702.7 L12191.5 2693.5 Z"></path>
+						<path d="M12196.9 2762.9 L12191.4 2772.2 L12186.2 2762.7 L12191.7 2753.5 Z"></path>
 					</g>
-					<path d="M12216.8 2711.9 L12292.5 3194 L13551 3373.0314645308927 L13551.0 3373.0 " fill="none"></path>
+					<path d="M12214.8 2772.0 L12292.5 3314 L13098.75 3489.098253275109 L13098.8 3489.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12220.6 2701.9 L12216.8 2711.9 L12210.1 2703.5 L12213.9 2693.5 Z"></path>
+						<path d="M12218.8 2762.0 L12214.8 2772.0 L12208.2 2763.5 L12212.2 2753.5 Z"></path>
 					</g>
-					<path d="M12242.2 2711.2 L12402.25 3194 L12464.369302949062 3365 L12464.4 3365.0 " fill="none"></path>
+					<path d="M12238.0 2771.4 L12402.25 3314 L12294.286193029491 3485 L12294.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12244.3 2700.7 L12242.2 2711.2 L12234.2 2704.0 L12236.3 2693.5 Z"></path>
+						<path d="M12240.4 2760.9 L12238.0 2771.4 L12230.2 2764.0 L12232.6 2753.5 Z"></path>
 					</g>
-					<path d="M56576.3 2614.7 L56576.25 3194 L51838.25 3375.594122482532 L51838.3 3375.6 " fill="none"></path>
+					<path d="M61320.0 2674.7 L61320 3314 L49258.5 3498.5415931744533 L49258.5 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56581.6 2605.3 L56576.3 2614.7 L56570.9 2605.3 L56576.3 2596.0 Z"></path>
+						<path d="M61325.3 2665.3 L61320.0 2674.7 L61314.7 2665.3 L61320.0 2656.0 Z"></path>
 					</g>
-					<path d="M56561.9 1764.3 L56576.25 1936 L56576.25 2534 L56576.3 2534.0 " fill="none"></path>
-					<path d="M56567.2 1763.8 L56561.9 1764.3 L56556.5 1764.7 L56560.7 1751.0 Z"></path>
-					<path d="M12958.2 2688.2 L12748.5 3194 L21264.5 3379.7257791030815 L21264.5 3379.7 " fill="none"></path>
+					<path d="M61452.2 1761.6 L61320 1936 L61320 2594 L61320.0 2594.0 " fill="none"></path>
+					<path d="M61456.4 1764.8 L61452.2 1761.6 L61447.9 1758.4 L61460.2 1751.0 Z"></path>
+					<path d="M12861.0 2749.3 L12748.5 3314 L21865.75 3499.776638168856 L21865.8 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12966.7 2681.7 L12958.2 2688.2 L12956.8 2677.6 L12965.3 2671.0 Z"></path>
+						<path d="M12868.0 2741.2 L12861.0 2749.3 L12857.6 2739.1 L12864.6 2731.0 Z"></path>
 					</g>
-					<path d="M13028.4 2689.4 L13106.25 3194 L13562.173592493298 3365 L13562.2 3365.0 " fill="none"></path>
+					<path d="M12885.7 2749.7 L12885.5 3314 L13129.163538873994 3485 L13129.2 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13032.3 2679.4 L13028.4 2689.4 L13021.7 2681.0 L13025.6 2671.0 Z"></path>
+						<path d="M12891.0 2740.3 L12885.7 2749.7 L12880.4 2740.3 L12885.7 2731.0 Z"></path>
 					</g>
-					<path d="M13036.3 2689.2 L13146.25 3194 L18868 3376.9665009215996 L18868.0 3377.0 " fill="none"></path>
+					<path d="M12910.5 2749.3 L13022.75 3314 L19573.75 3497.4063649328227 L19573.8 3497.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13039.5 2679.0 L13036.3 2689.2 L13029.1 2681.3 L13032.3 2671.0 Z"></path>
+						<path d="M12913.9 2739.1 L12910.5 2749.3 L12903.4 2741.2 L12906.8 2731.0 Z"></path>
 					</g>
-					<path d="M56937.8 2614.7 L56937.75 3194 L28928 3379.948985948332 L28928.0 3379.9 " fill="none"></path>
+					<path d="M61681.5 2674.7 L61681.5 3314 L30541.75 3500.004223683052 L30541.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56943.1 2605.3 L56937.8 2614.7 L56932.4 2605.3 L56937.8 2596.0 Z"></path>
+						<path d="M61686.8 2665.3 L61681.5 2674.7 L61676.2 2665.3 L61681.5 2656.0 Z"></path>
 					</g>
-					<path d="M56653.1 1758.1 L56937.75 1936 L56937.75 2534 L56937.8 2534.0 " fill="none"></path>
-					<path d="M56656.0 1753.5 L56653.1 1758.1 L56650.3 1762.6 L56641.8 1751.0 Z"></path>
-					<path d="M13560.3 2667.4 L13470.5 3194 L27437 3379.920931477516 L27437.0 3379.9 " fill="none"></path>
+					<path d="M61549.3 1761.6 L61681.5 1936 L61681.5 2594 L61681.5 2594.0 " fill="none"></path>
+					<path d="M61553.6 1758.4 L61549.3 1761.6 L61545.1 1764.8 L61541.3 1751.0 Z"></path>
+					<path d="M13767.1 2727.4 L13675.75 3314 L27961.75 3499.933842771904 L27961.8 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13567.1 2659.1 L13560.3 2667.4 L13556.6 2657.3 L13563.4 2649.0 Z"></path>
+						<path d="M13773.8 2719.0 L13767.1 2727.4 L13763.2 2717.4 L13769.9 2709.0 Z"></path>
 					</g>
-					<path d="M13595.3 2667.4 L13685.25 3194 L21264.5 3379.6305361305363 L21264.5 3379.6 " fill="none"></path>
+					<path d="M13799.0 2727.4 L13890.5 3314 L21865.75 3499.6735168367504 L21865.8 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13598.9 2657.3 L13595.3 2667.4 L13588.4 2659.1 L13592.1 2649.0 Z"></path>
+						<path d="M13802.8 2717.4 L13799.0 2727.4 L13792.3 2719.0 L13796.1 2709.0 Z"></path>
 					</g>
-					<path d="M30453.0 717.2 L30453 966 L30453 1197 L30453.0 1197.0 " fill="none"></path>
+					<path d="M29204.0 717.2 L29204 966 L29204 1197 L29204.0 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30458.3 707.8 L30453.0 717.2 L30447.7 707.8 L30453.0 698.5 Z"></path>
+						<path d="M29209.3 707.8 L29204.0 717.2 L29198.7 707.8 L29204.0 698.5 Z"></path>
 					</g>
-					<path d="M30453.0 165.3 L30453 293 L30453 560.5 L30453.0 560.5 " fill="none"></path>
-					<path d="M30458.3 165.3 L30453.0 165.3 L30447.7 165.3 L30453.0 152.0 Z"></path>
-					<path d="M15575.5 3818.7 L15499.75 3880 L17849.5 4010.0161040569837 L17849.5 4010.0 " fill="none"></path>
+					<path d="M29204.0 165.3 L29204 293 L29204 560.5 L29204.0 560.5 " fill="none"></path>
+					<path d="M29209.3 165.3 L29204.0 165.3 L29198.7 165.3 L29204.0 152.0 Z"></path>
+					<path d="M16003.2 3938.7 L15927.5 4000 L18277.25 4130.016104056984 L18277.3 4130.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15586.1 3817.0 L15575.5 3818.7 L15579.4 3808.7 L15590.0 3807.0 Z"></path>
+						<path d="M16013.9 3937.0 L16003.2 3938.7 L16007.1 3928.7 L16017.8 3927.0 Z"></path>
 					</g>
-					<path d="M15598.3 3820.3 L15539.75 3880 L7800.75 4011.5188332276475 L7800.8 4011.5 " fill="none"></path>
+					<path d="M16026.0 3940.3 L15967.5 4000 L7837.75 4131.635984653959 L7837.8 4131.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15608.6 3817.4 L15598.3 3820.3 L15601.0 3809.9 L15611.4 3807.0 Z"></path>
+						<path d="M16036.4 3937.4 L16026.0 3940.3 L16028.8 3929.9 L16039.1 3927.0 Z"></path>
 					</g>
-					<path d="M15713.6 3825.3 L15724.5 3880 L8127.75 4011.515713316753 L8127.8 4011.5 " fill="none"></path>
+					<path d="M16141.3 3945.3 L16152.25 4000 L8164.75 4131.635100233673 L8164.8 4131.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15717.0 3815.1 L15713.6 3825.3 L15706.5 3817.2 L15709.9 3807.0 Z"></path>
+						<path d="M16144.7 3935.1 L16141.3 3945.3 L16134.3 3937.2 L16137.7 3927.0 Z"></path>
 					</g>
-					<path d="M15739.0 3824.0 L15764.5 3880 L15602.004664179105 3998.5 L15602.0 3998.5 " fill="none"></path>
+					<path d="M16166.7 3944.0 L16192.25 4000 L15865.711753731342 4118.5 L15865.7 4118.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15740.0 3813.3 L15739.0 3824.0 L15730.3 3817.7 L15731.3 3807.0 Z"></path>
+						<path d="M16167.7 3933.3 L16166.7 3944.0 L16158.0 3937.7 L16159.0 3927.0 Z"></path>
 					</g>
-					<path d="M15828.5 3817.7 L15918 3880 L15855.875932835821 3998.5 L15855.9 3998.5 " fill="none"></path>
+					<path d="M16256.2 3937.7 L16345.75 4000 L16119.58302238806 4118.5 L16119.6 4118.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15823.9 3808.0 L15828.5 3817.7 L15817.8 3816.7 L15813.2 3807.0 Z"></path>
+						<path d="M16251.6 3928.0 L16256.2 3937.7 L16245.5 3936.7 L16240.9 3927.0 Z"></path>
 					</g>
-					<path d="M34458.3 165.3 L34458.25 293 L34458.25 614 L34458.3 614.0 " fill="none"></path>
-					<path d="M34463.6 165.3 L34458.3 165.3 L34452.9 165.3 L34458.3 152.0 Z"></path>
-					<path d="M13832.8 2652.7 L13832.75 3194 L11340.5 3377.228392628363 L11340.5 3377.2 " fill="none"></path>
+					<path d="M35520.5 165.3 L35520.5 293 L35520.5 614 L35520.5 614.0 " fill="none"></path>
+					<path d="M35525.8 165.3 L35520.5 165.3 L35515.2 165.3 L35520.5 152.0 Z"></path>
+					<path d="M14038.0 2712.7 L14038 3314 L11155 3497.665072587532 L11155.0 3497.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13838.1 2643.3 L13832.8 2652.7 L13827.4 2643.3 L13832.8 2634.0 Z"></path>
+						<path d="M14043.3 2703.3 L14038.0 2712.7 L14032.7 2703.3 L14038.0 2694.0 Z"></path>
 					</g>
-					<path d="M34854.8 165.3 L34854.75 293 L34854.75 614 L34854.8 614.0 " fill="none"></path>
-					<path d="M34860.1 165.3 L34854.8 165.3 L34849.4 165.3 L34854.8 152.0 Z"></path>
-					<path d="M9187.0 3330.3 L9199 3327 L9206.5 3327 L9206.5 3327 L9214 3380.5 L9214 3380.5 L9206.5 3434 L9206.5 3434 L9199 3434 L9199 3434 L9169 3425.769230769231 L9169.0 3425.8 " fill="none"></path>
+					<path d="M35917.0 165.3 L35917 293 L35917 614 L35917.0 614.0 " fill="none"></path>
+					<path d="M35922.3 165.3 L35917.0 165.3 L35911.7 165.3 L35917.0 152.0 Z"></path>
+					<path d="M9187.0 3450.3 L9199 3447 L9206.5 3447 L9206.5 3447 L9214 3500.5 L9214 3500.5 L9206.5 3554 L9206.5 3554 L9199 3554 L9199 3554 L9169 3545.769230769231 L9169.0 3545.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9176.6 3327.6 L9187.0 3330.3 L9179.4 3337.9 L9169.0 3335.2 Z"></path>
+						<path d="M9176.6 3447.6 L9187.0 3450.3 L9179.4 3457.9 L9169.0 3455.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3097.1 2593.3 L2923.25 3194 L8839 3375.439357809481 L8839.0 3375.4 " fill="none"></path>
+						<path d="M3097.8 2653.4 L2923.25 3314 L8839 3495.439357809481 L8839.0 3495.4 " fill="none"></path>
 					</g>
-					<path d="M3102.2 2594.8 L3097.1 2593.3 L3091.9 2591.8 L3100.8 2580.5 Z"></path>
-					<path d="M14125.8 2637.7 L14125.75 3194 L11947 3373.2201455507775 L11947.0 3373.2 " fill="none"></path>
+					<path d="M3102.9 2654.8 L3097.8 2653.4 L3092.6 2652.0 L3101.2 2640.5 Z"></path>
+					<path d="M14331.0 2697.7 L14331 3314 L11761.5 3494.2903498871333 L11761.5 3494.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14131.1 2628.3 L14125.8 2637.7 L14120.4 2628.3 L14125.8 2619.0 Z"></path>
+						<path d="M14336.3 2688.3 L14331.0 2697.7 L14325.7 2688.3 L14331.0 2679.0 Z"></path>
 					</g>
-					<path d="M31778.7 1213.7 L13596 1459 L13596 1651 L13596.0 1651.0 " fill="none"></path>
-					<path d="M31778.7 1219.0 L31778.7 1213.7 L31778.6 1208.4 L31792.0 1213.5 Z"></path>
-					<path d="M16106.3 3788.7 L16106.25 3880 L17849.5 4008.6850296102466 L17849.5 4008.7 " fill="none"></path>
+					<path d="M30145.4 1213.8 L13364.5 1459 L13364.5 1651 L13364.5 1651.0 " fill="none"></path>
+					<path d="M30145.5 1219.1 L30145.4 1213.8 L30145.3 1208.5 L30158.8 1213.6 Z"></path>
+					<path d="M16534.0 3908.7 L16534 4000 L18277.25 4128.685029610247 L18277.3 4128.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16111.6 3779.3 L16106.3 3788.7 L16100.9 3779.3 L16106.3 3770.0 Z"></path>
+						<path d="M16539.3 3899.3 L16534.0 3908.7 L16528.7 3899.3 L16534.0 3890.0 Z"></path>
 					</g>
-					<path d="M14490.5 2682.0 L14344.75 3194 L13048 3371.2074555779445 L13048.0 3371.2 " fill="none"></path>
+					<path d="M14698.6 2742.1 L14550 3314 L13048 3492.4222929936304 L13048.0 3492.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14498.2 2674.4 L14490.5 2682.0 L14487.9 2671.5 L14495.6 2664.0 Z"></path>
+						<path d="M14706.1 2734.4 L14698.6 2742.1 L14695.8 2731.7 L14703.3 2724.0 Z"></path>
 					</g>
-					<path d="M14595.9 2679.8 L14919.25 3194 L21264.5 3379.4623868667477 L21264.5 3379.5 " fill="none"></path>
+					<path d="M14830.3 2737.9 L15347 3314 L21865.75 3499.4898539115843 L21865.8 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14595.5 2669.1 L14595.9 2679.8 L14586.5 2674.7 L14586.0 2664.0 Z"></path>
+						<path d="M14828.0 2727.4 L14830.3 2737.9 L14820.1 2734.5 L14817.8 2724.0 Z"></path>
 					</g>
-					<path d="M14626.8 2677.8 L15098.25 3194 L13656 3373.9495735072755 L13656.0 3373.9 " fill="none"></path>
+					<path d="M14857.6 2736.2 L15526 3314 L13203.75 3496.3769344141488 L13203.8 3496.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14624.4 2667.3 L14626.8 2677.8 L14616.5 2674.5 L14614.2 2664.0 Z"></path>
+						<path d="M14854.1 2726.1 L14857.6 2736.2 L14847.1 2734.1 L14843.5 2724.0 Z"></path>
 					</g>
-					<path d="M24594.7 3315.4 L24606.75 3312 L24614.25 3312 L24614.25 3312 L24621.75 3380.5 L24621.75 3380.5 L24614.25 3449 L24614.25 3449 L24606.75 3449 L24606.75 3449 L24576.75 3440.543209876543 L24576.8 3440.5 " fill="none"></path>
+					<path d="M29586.2 3435.4 L29598.25 3432 L29605.75 3432 L29605.75 3432 L29613.25 3500.5 L29613.25 3500.5 L29605.75 3569 L29605.75 3569 L29598.25 3569 L29598.25 3569 L29568.25 3560.543209876543 L29568.3 3560.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24584.3 3312.8 L24594.7 3315.4 L24587.2 3323.1 L24576.8 3320.5 Z"></path>
+						<path d="M29575.8 3432.8 L29586.2 3435.4 L29578.7 3443.1 L29568.3 3440.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3098.8 2593.5 L2963.25 3194 L24150.75 3378.6437583234037 L24150.8 3378.6 " fill="none"></path>
+						<path d="M3099.4 2653.6 L2963.25 3314 L29142.25 3498.994827978175 L29142.3 3499.0 " fill="none"></path>
 					</g>
-					<path d="M3104.0 2594.7 L3098.8 2593.5 L3093.6 2592.3 L3101.8 2580.5 Z"></path>
-					<path d="M15266.7 2689.1 L15138.25 3194 L15138.25 3380.5 L15138.25 3380.5 L15138.25 3567 L15138.25 3567 L15138.25 3723.5 L15138.25 3723.5 L15138.25 3880 L15138.25 3880 L17849.5 4010.53354890865 L17849.5 4010.5 " fill="none"></path>
+					<path d="M3104.6 2654.6 L3099.4 2653.6 L3094.1 2652.5 L3102.1 2640.5 Z"></path>
+					<path d="M15697.2 2749.2 L15566 3314 L15566 3500.5 L15566 3500.5 L15566 3687 L15566 3687 L15566 3843.5 L15566 3843.5 L15566 4000 L15566 4000 L18277.25 4130.53354890865 L18277.3 4130.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15274.2 2681.4 L15266.7 2689.1 L15263.8 2678.7 L15271.3 2671.0 Z"></path>
+						<path d="M15704.5 2741.3 L15697.2 2749.2 L15694.1 2738.9 L15701.4 2731.0 Z"></path>
 					</g>
-					<path d="M15426.4 2620.3 L16755.25 3194 L21675 3379.4070977519577 L21675.0 3379.4 " fill="none"></path>
+					<path d="M15853.9 2685.5 L17183 3314 L22088 3499.403830563437 L22088.0 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15419.9 2611.7 L15426.4 2620.3 L15415.7 2621.5 L15409.3 2612.9 Z"></path>
+						<path d="M15847.7 2676.7 L15853.9 2685.5 L15843.2 2686.3 L15837.0 2677.5 Z"></path>
 					</g>
-					<path d="M15426.5 2618.9 L16795.25 3194 L11340.5 3378.9908396599535 L11340.5 3379.0 " fill="none"></path>
+					<path d="M15854.0 2683.9 L17223 3314 L11155 3499.1422494887524 L11155.0 3499.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15419.9 2610.3 L15426.5 2618.9 L15415.8 2620.2 L15409.3 2611.6 Z"></path>
+						<path d="M15847.7 2675.1 L15854.0 2683.9 L15843.2 2684.8 L15837.0 2676.1 Z"></path>
 					</g>
-					<path d="M15426.7 2614.3 L16935.25 3194 L27437 3379.7306725777007 L27437.0 3379.7 " fill="none"></path>
+					<path d="M15854.2 2679.0 L17363 3314 L27961.75 3499.7376847001337 L27961.8 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15419.9 2606.0 L15426.7 2614.3 L15416.0 2616.0 L15409.3 2607.7 Z"></path>
+						<path d="M15847.7 2670.4 L15854.2 2679.0 L15843.5 2680.3 L15837.0 2671.7 Z"></path>
 					</g>
-					<path d="M21446.5 2652.2 L21429.25 3194 L26381.75 3377.4441410129098 L26381.8 3377.4 " fill="none"></path>
+					<path d="M21716.1 2711.9 L21623.25 3314 L26271.5 3497.247608730117 L26271.5 3497.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21452.1 2643.0 L21446.5 2652.2 L21441.4 2642.7 L21447.1 2633.5 Z"></path>
+						<path d="M21722.8 2703.5 L21716.1 2711.9 L21712.2 2701.9 L21718.9 2693.5 Z"></path>
 					</g>
-					<path d="M21459.2 2652.0 L21521 3194 L21318.3672922252 3365 L21318.4 3365.0 " fill="none"></path>
+					<path d="M21738.6 2712.1 L21801.25 3314 L21892.939008042897 3485 L21892.9 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21463.4 2642.2 L21459.2 2652.0 L21452.8 2643.4 L21457.1 2633.5 Z"></path>
+						<path d="M21742.9 2702.2 L21738.6 2712.1 L21732.3 2703.3 L21736.6 2693.5 Z"></path>
 					</g>
-					<path d="M19862.3 1746.5 L18460.5 1936 L18460.5 2565 L18460.5 2565 L18460.5 3194 L18460.5 3194 L28578 3379.182172824967 L28578.0 3379.2 " fill="none"></path>
+					<path d="M19853.4 1762.6 L18888.25 1936 L18888.25 2625 L18888.25 2625 L18888.25 3314 L18888.25 3314 L27441.75 3498.943220682859 L27441.8 3498.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19872.2 1750.5 L19862.3 1746.5 L19870.8 1740.0 L19880.8 1744.0 Z"></path>
+						<path d="M19863.5 1766.2 L19853.4 1762.6 L19861.6 1755.7 L19871.8 1759.3 Z"></path>
 					</g>
-					<path d="M19862.3 1753.9 L18691 1936 L18691 2549.5 L18691.0 2549.5 " fill="none"></path>
+					<path d="M19853.5 1776.3 L19118.75 1936 L19118.75 2609.5 L19118.8 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19872.3 1757.7 L19862.3 1753.9 L19870.7 1747.2 L19880.8 1751.0 Z"></path>
+						<path d="M19863.8 1779.5 L19853.5 1776.3 L19861.5 1769.1 L19871.8 1772.3 Z"></path>
 					</g>
-					<path d="M19862.4 1763.8 L18921.5 1936 L18921.5 2565 L18921.5 2565 L18921.5 3194 L18921.5 3194 L9169 3377.397151499874 L9169.0 3377.4 " fill="none"></path>
+					<path d="M19853.8 1797.1 L19349.25 1936 L19349.25 2625 L19349.25 2625 L19349.25 3314 L19349.25 3314 L9169 3497.525446460936 L9169.0 3497.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19872.5 1767.4 L19862.4 1763.8 L19870.6 1756.9 L19880.8 1760.5 Z"></path>
+						<path d="M19864.2 1799.8 L19853.8 1797.1 L19861.3 1789.5 L19871.8 1792.2 Z"></path>
 					</g>
-					<path d="M19862.5 1770.5 L19041.5 1936 L19041.5 2549.5 L19041.5 2549.5 " fill="none"></path>
+					<path d="M19854.0 1813.1 L19469.25 1936 L19469.25 2609.5 L19469.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19872.7 1773.9 L19862.5 1770.5 L19870.5 1763.5 L19880.8 1766.8 Z"></path>
+						<path d="M19864.5 1815.3 L19854.0 1813.1 L19861.2 1805.2 L19871.8 1807.4 Z"></path>
 					</g>
-					<path d="M19862.9 1805.2 L19423 1936 L19423 2549.5 L19423.0 2549.5 " fill="none"></path>
+					<path d="M19888.7 1911.2 L19850.75 1936 L19850.75 2609.5 L19850.8 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19873.3 1807.6 L19862.9 1805.2 L19870.3 1797.4 L19880.8 1799.8 Z"></path>
+						<path d="M19899.4 1910.6 L19888.7 1911.2 L19893.6 1901.6 L19904.3 1901.0 Z"></path>
 					</g>
-					<path d="M20587.1 1768.1 L21449.25 1936 L21449.25 2496.5 L21449.3 2496.5 " fill="none"></path>
+					<path d="M20578.2 1754.6 L21729.5 1936 L21729.5 2556.5 L21729.5 2556.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20578.9 1761.1 L20587.1 1768.1 L20576.9 1771.5 L20568.8 1764.5 Z"></path>
+						<path d="M20569.8 1747.9 L20578.2 1754.6 L20568.1 1758.4 L20559.8 1751.7 Z"></path>
 					</g>
-					<path d="M20587.2 1758.9 L21632.75 1936 L21632.75 2565 L21632.75 2565 L21632.75 3194 L21632.75 3194 L19089 3372.735753979467 L19089.0 3372.7 " fill="none"></path>
+					<path d="M20578.2 1748.4 L21913 1936 L21913 2625 L21913 2625 L21913 3314 L21913 3314 L19794.75 3491.253449242849 L19794.8 3491.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20578.8 1752.1 L20587.2 1758.9 L20577.1 1762.6 L20568.8 1755.8 Z"></path>
+						<path d="M20569.7 1741.9 L20578.2 1748.4 L20568.3 1752.4 L20559.8 1745.8 Z"></path>
 					</g>
-					<path d="M20587.2 1757.2 L21672.75 1936 L21672.75 2565 L21672.75 2565 L21672.75 3194 L21672.75 3194 L21330.97922252011 3365 L21331.0 3365.0 " fill="none"></path>
+					<path d="M20578.2 1747.3 L21953 1936 L21953 2625 L21953 2625 L21953 3314 L21953 3314 L21905.5509383378 3485 L21905.6 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20578.8 1750.4 L20587.2 1757.2 L20577.1 1760.9 L20568.8 1754.2 Z"></path>
+						<path d="M20569.7 1740.7 L20578.2 1747.3 L20568.3 1751.3 L20559.8 1744.7 Z"></path>
 					</g>
-					<path d="M20587.2 1755.6 L21712.75 1936 L21712.75 2565 L21712.75 2565 L21712.75 3194 L21712.75 3194 L10068 3377.7154171513166 L10068.0 3377.7 " fill="none"></path>
+					<path d="M20578.3 1746.1 L21993 1936 L21993 2625 L21993 2625 L21993 3314 L21993 3314 L10068 3497.7799033177707 L10068.0 3497.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20578.8 1748.8 L20587.2 1755.6 L20577.1 1759.4 L20568.8 1752.6 Z"></path>
+						<path d="M20569.7 1739.6 L20578.3 1746.1 L20568.3 1750.2 L20559.8 1743.7 Z"></path>
 					</g>
-					<path d="M10086.1 3330.1 L10098 3327 L10105.5 3327 L10105.5 3327 L10113 3380.5 L10113 3380.5 L10105.5 3434 L10105.5 3434 L10098 3434 L10098 3434 L10068 3426.227602905569 L10068.0 3426.2 " fill="none"></path>
+					<path d="M10086.1 3450.1 L10098 3447 L10105.5 3447 L10105.5 3447 L10113 3500.5 L10113 3500.5 L10105.5 3554 L10105.5 3554 L10098 3554 L10098 3554 L10068 3546.227602905569 L10068.0 3546.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10075.7 3327.3 L10086.1 3330.1 L10078.4 3337.6 L10068.0 3334.8 Z"></path>
+						<path d="M10075.7 3447.3 L10086.1 3450.1 L10078.4 3457.6 L10068.0 3454.8 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3100.6 2593.7 L3003.25 3194 L9715 3375.721246325264 L9715.0 3375.7 " fill="none"></path>
+						<path d="M3101.0 2653.7 L3003.25 3314 L9715 3495.721246325264 L9715.0 3495.7 " fill="none"></path>
 					</g>
-					<path d="M3105.9 2594.5 L3100.6 2593.7 L3095.3 2592.8 L3102.7 2580.5 Z"></path>
-					<path d="M23315.8 2660.2 L23315.75 3194 L27437 3378.5520439402126 L27437.0 3378.6 " fill="none"></path>
+					<path d="M3106.3 2654.5 L3101.0 2653.7 L3095.7 2652.9 L3103.0 2640.5 Z"></path>
+					<path d="M23596.0 2720.2 L23596 3314 L27961.75 3498.660061234904 L27961.8 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23321.1 2650.8 L23315.8 2660.2 L23310.4 2650.8 L23315.8 2641.5 Z"></path>
+						<path d="M23601.3 2710.8 L23596.0 2720.2 L23590.7 2710.8 L23596.0 2701.5 Z"></path>
 					</g>
-					<path d="M22585.1 1717.6 L21991.75 1936 L23183.75 2502.2900302114804 L23183.8 2502.3 " fill="none"></path>
-					<path d="M22587.0 1722.6 L22585.1 1717.6 L22583.3 1712.6 L22597.6 1713.0 Z"></path>
-					<path d="M35088.3 165.3 L35088.25 293 L35088.25 614 L35088.3 614.0 " fill="none"></path>
-					<path d="M35093.6 165.3 L35088.3 165.3 L35082.9 165.3 L35088.3 152.0 Z"></path>
-					<path d="M23377.1 1805.9 L23315.75 1936 L23315.75 2488.5 L23315.8 2488.5 " fill="none"></path>
+					<path d="M22865.4 1717.6 L22272 1936 L23464 2556.308157099698 L23464.0 2556.3 " fill="none"></path>
+					<path d="M22867.2 1722.6 L22865.4 1717.6 L22863.5 1712.6 L22877.9 1713.0 Z"></path>
+					<path d="M36150.5 165.3 L36150.5 293 L36150.5 614 L36150.5 614.0 " fill="none"></path>
+					<path d="M36155.8 165.3 L36150.5 165.3 L36145.2 165.3 L36150.5 152.0 Z"></path>
+					<path d="M23657.4 1805.9 L23596 1936 L23596 2548.5 L23596.0 2548.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23385.9 1799.7 L23377.1 1805.9 L23376.3 1795.2 L23385.1 1789.0 Z"></path>
+						<path d="M23666.2 1799.7 L23657.4 1805.9 L23656.5 1795.2 L23665.3 1789.0 Z"></path>
 					</g>
-					<path d="M23449.9 1807.3 L23475.25 1936 L23806.87162162162 2549.5 L23806.9 2549.5 " fill="none"></path>
+					<path d="M23730.1 1807.3 L23755.5 1936 L24087.851233671987 2609.5 L24087.9 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23453.3 1797.1 L23449.9 1807.3 L23442.9 1799.2 L23446.3 1789.0 Z"></path>
+						<path d="M23733.6 1797.1 L23730.1 1807.3 L23723.1 1799.2 L23726.5 1789.0 Z"></path>
 					</g>
-					<path d="M23499.8 1804.5 L23587.75 1936 L23587.75 2549.5 L23587.8 2549.5 " fill="none"></path>
+					<path d="M23780.1 1804.5 L23868 1936 L23868 2609.5 L23868.0 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23499.1 1793.8 L23499.8 1804.5 L23490.2 1799.7 L23489.4 1789.0 Z"></path>
+						<path d="M23779.3 1793.8 L23780.1 1804.5 L23770.4 1799.7 L23769.7 1789.0 Z"></path>
 					</g>
-					<path d="M23715.7 1804.5 L23627.75 1936 L23353.695945945947 2488.5 L23353.7 2488.5 " fill="none"></path>
+					<path d="M23995.9 1804.5 L23908 1936 L23630.64150943396 2548.5 L23630.6 2548.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23725.3 1799.7 L23715.7 1804.5 L23716.4 1793.8 L23726.1 1789.0 Z"></path>
+						<path d="M24005.6 1799.7 L23995.9 1804.5 L23996.7 1793.8 L24006.3 1789.0 Z"></path>
 					</g>
-					<path d="M23800.2 1807.5 L23815.25 1936 L23815.25 2549.5 L23815.3 2549.5 " fill="none"></path>
+					<path d="M24080.4 1807.5 L24095.5 1936 L24095.5 2609.5 L24095.5 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23804.4 1797.6 L23800.2 1807.5 L23793.8 1798.9 L23798.0 1789.0 Z"></path>
+						<path d="M24084.6 1797.6 L24080.4 1807.5 L24074.0 1798.9 L24078.2 1789.0 Z"></path>
 					</g>
-					<path d="M23858.8 1804.5 L23946.75 1936 L23596.596581875994 2549.5 L23596.6 2549.5 " fill="none"></path>
+					<path d="M24139.1 1804.5 L24227 1936 L23876.07619738752 2609.5 L23876.1 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23858.1 1793.8 L23858.8 1804.5 L23849.2 1799.7 L23848.4 1789.0 Z"></path>
+						<path d="M24138.3 1793.8 L24139.1 1804.5 L24129.4 1799.7 L24128.7 1789.0 Z"></path>
 					</g>
-					<path d="M24146.3 1777.7 L24146.25 1936 L23823.406597774247 2549.5 L23823.4 2549.5 " fill="none"></path>
+					<path d="M24426.5 1777.7 L24426.5 1936 L24102.946298984036 2609.5 L24102.9 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24151.6 1768.3 L24146.3 1777.7 L24140.9 1768.3 L24146.3 1759.0 Z"></path>
+						<path d="M24431.8 1768.3 L24426.5 1777.7 L24421.2 1768.3 L24426.5 1759.0 Z"></path>
 					</g>
-					<path d="M19789.6 2649.3 L19405.25 3194 L27437 3379.4953561809234 L27437.0 3379.5 " fill="none"></path>
+					<path d="M20222.2 2709.7 L19833 3314 L27961.75 3499.507280736639 L27961.8 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19799.3 2644.7 L19789.6 2649.3 L19790.6 2638.6 L19800.3 2634.0 Z"></path>
+						<path d="M20231.7 2704.7 L20222.2 2709.7 L20222.8 2699.0 L20232.3 2694.0 Z"></path>
 					</g>
-					<path d="M19858.2 2652.6 L19915.25 3194 L19915.25 3380.5 L19915.25 3380.5 L19915.25 3567 L19915.25 3567 L19915.25 3723.5 L19915.25 3723.5 L19915.25 3880 L19915.25 3880 L17993.5 4009.160877742947 L17993.5 4009.2 " fill="none"></path>
+					<path d="M20292.2 2712.4 L20398.5 3314 L20398.5 3500.5 L20398.5 3500.5 L20398.5 3687 L20398.5 3687 L20398.5 3843.5 L20398.5 3843.5 L20398.5 4000 L20398.5 4000 L18421.25 4129.2919360741735 L18421.3 4129.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19862.5 2642.7 L19858.2 2652.6 L19851.9 2643.8 L19856.3 2634.0 Z"></path>
+						<path d="M20295.8 2702.3 L20292.2 2712.4 L20285.3 2704.1 L20288.9 2694.0 Z"></path>
 					</g>
-					<path d="M20188.7 2742.0 L20131.25 3194 L21375.5 3371.240882184457 L21375.5 3371.2 " fill="none"></path>
+					<path d="M20740.5 2800.4 L20503.5 3314 L20503.5 3485 L20503.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20195.2 2733.4 L20188.7 2742.0 L20184.6 2732.1 L20191.1 2723.5 Z"></path>
+						<path d="M20749.3 2794.2 L20740.5 2800.4 L20739.6 2789.7 L20748.3 2783.5 Z"></path>
 					</g>
-					<path d="M20229.1 2742.1 L20274.75 3194 L13656 3379.032321528949 L13656.0 3379.0 " fill="none"></path>
+					<path d="M20811.2 2802.1 L20781.5 3314 L13203.75 3499.216785164313 L13203.8 3499.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20233.5 2732.3 L20229.1 2742.1 L20222.9 2733.3 L20227.3 2723.5 Z"></path>
+						<path d="M20817.1 2793.1 L20811.2 2802.1 L20806.4 2792.5 L20812.3 2783.5 Z"></path>
 					</g>
-					<path d="M20240.4 2741.9 L20314.75 3194 L21264.5 3373.7801319462064 L21264.5 3373.8 " fill="none"></path>
+					<path d="M20821.5 2802.2 L20821.5 3314 L21865.75 3494.368256540866 L21865.8 3494.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20244.1 2731.8 L20240.4 2741.9 L20233.6 2733.6 L20237.3 2723.5 Z"></path>
+						<path d="M20826.8 2792.8 L20821.5 2802.2 L20816.2 2792.8 L20821.5 2783.5 Z"></path>
 					</g>
-					<path d="M20251.6 2741.7 L20354.75 3194 L13048 3378.7803484863894 L13048.0 3378.8 " fill="none"></path>
+					<path d="M20831.8 2802.1 L20861.5 3314 L13048 3498.890915434879 L13048.0 3498.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20254.7 2731.4 L20251.6 2741.7 L20244.3 2733.8 L20247.4 2723.5 Z"></path>
+						<path d="M20836.6 2792.5 L20831.8 2802.1 L20825.9 2793.1 L20830.7 2783.5 Z"></path>
 					</g>
-					<path d="M20262.7 2741.4 L20394.75 3194 L21675 3376.3690089746037 L21675.0 3376.4 " fill="none"></path>
+					<path d="M20902.5 2800.4 L21139.5 3314 L22088 3494.9670076726343 L22088.0 3495.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20265.2 2731.0 L20262.7 2741.4 L20255.0 2734.0 L20257.5 2723.5 Z"></path>
+						<path d="M20903.4 2789.7 L20902.5 2800.4 L20893.7 2794.2 L20894.7 2783.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M35872.6 173.6 L35638.5 293 L35638.5 598.5 L35638.5 598.5 " fill="none"></path>
+						<path d="M36934.9 173.6 L36700.75 293 L36700.75 598.5 L36700.8 598.5 " fill="none"></path>
 					</g>
-					<path d="M35875.0 178.3 L35872.6 173.6 L35870.2 168.8 L35884.5 167.5 Z"></path>
+					<path d="M36937.3 178.3 L36934.9 173.6 L36932.4 168.8 L36946.7 167.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M35989.2 176.5 L36117.5 293 L36117.5 598.5 L36117.5 598.5 " fill="none"></path>
+						<path d="M37051.5 176.5 L37179.75 293 L37179.75 598.5 L37179.8 598.5 " fill="none"></path>
 					</g>
-					<path d="M35992.8 172.5 L35989.2 176.5 L35985.7 180.4 L35979.4 167.5 Z"></path>
-					<path d="M20927.9 2625.1 L20434.75 3194 L9625 3377.3952718837418 L9625.0 3377.4 " fill="none"></path>
+					<path d="M37055.1 172.5 L37051.5 176.5 L37047.9 180.4 L37041.6 167.5 Z"></path>
+					<path d="M21345.9 2689.0 L21179.5 3314 L9625 3497.592268370607 L9625.0 3497.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20938.0 2621.5 L20927.9 2625.1 L20930.0 2614.6 L20940.1 2611.0 Z"></path>
+						<path d="M21353.5 2681.4 L21345.9 2689.0 L21343.2 2678.6 L21350.7 2671.0 Z"></path>
 					</g>
-					<path d="M20942.4 2627.0 L20598 3194 L21675 3375.6098553345387 L21675.0 3375.6 " fill="none"></path>
+					<path d="M21361.1 2689.7 L21342.75 3314 L22088 3493.514530190507 L22088.0 3493.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20951.8 2621.7 L20942.4 2627.0 L20942.7 2616.2 L20952.1 2611.0 Z"></path>
+						<path d="M21366.7 2680.5 L21361.1 2689.7 L21356.0 2680.2 L21361.6 2671.0 Z"></path>
 					</g>
-					<path d="M20996.6 2629.1 L21143.25 3194 L25900.75 3379.273282522447 L25900.8 3379.3 " fill="none"></path>
+					<path d="M21378.2 2689.2 L21526.25 3314 L26168.5 3499.2430328964965 L26168.5 3499.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20999.4 2618.7 L20996.6 2629.1 L20989.1 2621.4 L20991.9 2611.0 Z"></path>
+						<path d="M21381.2 2678.9 L21378.2 2689.2 L21370.9 2681.3 L21373.9 2671.0 Z"></path>
 					</g>
-					<path d="M9643.1 3330.0 L9655 3327 L9662.5 3327 L9662.5 3327 L9670 3380.5 L9670 3380.5 L9662.5 3434 L9662.5 3434 L9655 3434 L9655 3434 L9625 3426.4647887323945 L9625.0 3426.5 " fill="none"></path>
+					<path d="M9643.1 3450.0 L9655 3447 L9662.5 3447 L9662.5 3447 L9670 3500.5 L9670 3500.5 L9662.5 3554 L9662.5 3554 L9655 3554 L9655 3554 L9625 3546.4647887323945 L9625.0 3546.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9632.8 3327.1 L9643.1 3330.0 L9635.4 3337.4 L9625.0 3334.5 Z"></path>
+						<path d="M9632.8 3447.1 L9643.1 3450.0 L9635.4 3457.4 L9625.0 3454.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3102.4 2593.8 L3043.25 3194 L9259 3375.16622387185 L9259.0 3375.2 " fill="none"></path>
+						<path d="M3102.7 2653.8 L3043.25 3314 L9259 3495.16622387185 L9259.0 3495.2 " fill="none"></path>
 					</g>
-					<path d="M3107.7 2594.3 L3102.4 2593.8 L3097.1 2593.2 L3103.7 2580.5 Z"></path>
-					<path d="M29564.0 1933.7 L29563.25 1936 L36821.75 2552.3894289185905 L36821.8 2552.4 " fill="none"></path>
+					<path d="M3108.0 2654.3 L3102.7 2653.8 L3097.3 2653.3 L3103.9 2640.5 Z"></path>
+					<path d="M25005.1 1814.4 L24689.25 1936 L44187.75 2619.792258360055 L44187.8 2619.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29572.0 1926.5 L29564.0 1933.7 L29561.9 1923.2 L29570.0 1916.0 Z"></path>
+						<path d="M25015.7 1816.0 L25005.1 1814.4 L25011.9 1806.0 L25022.5 1807.7 Z"></path>
 					</g>
-					<path d="M29603.5 1934.4 L29603.25 1936 L24618.68441971383 2549.5 L24618.7 2549.5 " fill="none"></path>
+					<path d="M25005.4 1832.5 L24773 1936 L24773 2609.5 L24773.0 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29610.3 1926.1 L29603.5 1934.4 L29599.8 1924.3 L29606.6 1916.0 Z"></path>
+						<path d="M25016.1 1833.5 L25005.4 1832.5 L25011.8 1823.8 L25022.5 1824.9 Z"></path>
 					</g>
-					<path d="M29781.4 1932.1 L29783.75 1936 L24936.222178060412 2549.5 L24936.2 2549.5 " fill="none"></path>
+					<path d="M25099.5 1929.9 L25094 1936 L25094 2609.5 L25094.0 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29781.3 1921.3 L29781.4 1932.1 L29772.1 1926.7 L29772.0 1916.0 Z"></path>
+						<path d="M25109.7 1926.5 L25099.5 1929.9 L25101.8 1919.4 L25112.0 1916.0 Z"></path>
 					</g>
-					<path d="M29944.8 1896.7 L30004.25 1936 L25332.77424483307 2549.5 L25332.8 2549.5 " fill="none"></path>
+					<path d="M25490.9 1930.7 L25495 1936 L25495 2609.5 L25495.0 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29940.0 1887.1 L29944.8 1896.7 L29934.1 1896.0 L29929.3 1886.5 Z"></path>
+						<path d="M25489.3 1920.1 L25490.9 1930.7 L25480.9 1926.6 L25479.4 1916.0 Z"></path>
 					</g>
-					<path d="M29946.5 1823.2 L30218.75 1936 L25717.474165341813 2549.5 L25717.5 2549.5 " fill="none"></path>
+					<path d="M25611.7 1823.2 L25884 1936 L25884 2609.5 L25884.0 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29939.9 1814.7 L29946.5 1823.2 L29935.8 1824.5 L29929.3 1816.0 Z"></path>
+						<path d="M25605.2 1814.7 L25611.7 1823.2 L25601.1 1824.5 L25594.5 1816.0 Z"></path>
 					</g>
-					<path d="M36939.3 2689.6 L36814.25 3194 L45402.25 3379.57084926428 L45402.3 3379.6 " fill="none"></path>
+					<path d="M44322.8 2750.1 L44262 3314 L44262 3485 L44262.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36946.8 2681.8 L36939.3 2689.6 L36936.4 2679.3 L36943.8 2671.5 Z"></path>
+						<path d="M44329.1 2741.4 L44322.8 2750.1 L44318.5 2740.2 L44324.8 2731.5 Z"></path>
 					</g>
-					<path d="M37134.4 2671.3 L37941.25 3194 L13461 3379.0899135475893 L13461.0 3379.1 " fill="none"></path>
+					<path d="M44375.3 2749.3 L44552.75 3314 L14544.5 3499.348069614751 L14544.5 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37129.5 2661.8 L37134.4 2671.3 L37123.7 2670.7 L37118.8 2661.2 Z"></path>
+						<path d="M44377.6 2738.8 L44375.3 2749.3 L44367.4 2742.0 L44369.7 2731.5 Z"></path>
 					</g>
-					<path d="M22587.8 1717.9 L22031.75 1936 L36821.75 2558.747263781504 L36821.8 2558.7 " fill="none"></path>
-					<path d="M22589.8 1722.8 L22587.8 1717.9 L22585.9 1712.9 L22600.2 1713.0 Z"></path>
-					<path d="M13479.1 3329.9 L13491 3327 L13498.5 3327 L13498.5 3327 L13506 3380.5 L13506 3380.5 L13498.5 3434 L13498.5 3434 L13491 3434 L13491 3434 L13461 3426.5866050808313 L13461.0 3426.6 " fill="none"></path>
+					<path d="M22868.1 1717.9 L22312 1936 L44187.75 2620.3543707504227 L44187.8 2620.4 " fill="none"></path>
+					<path d="M22870.0 1722.8 L22868.1 1717.9 L22866.1 1712.9 L22880.5 1713.0 Z"></path>
+					<path d="M14562.6 3449.9 L14574.5 3447 L14582 3447 L14582 3447 L14589.5 3500.5 L14589.5 3500.5 L14582 3554 L14582 3554 L14574.5 3554 L14574.5 3554 L14544.5 3546.5866050808313 L14544.5 3546.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13468.8 3327.0 L13479.1 3329.9 L13471.3 3337.4 L13461.0 3334.4 Z"></path>
+						<path d="M14552.3 3447.0 L14562.6 3449.9 L14554.8 3457.4 L14544.5 3454.4 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3104.2 2593.8 L3083.25 3194 L13088 3377.0870477124986 L13088.0 3377.1 " fill="none"></path>
+						<path d="M3104.3 2653.8 L3083.25 3314 L14171.5 3497.4150313754185 L14171.5 3497.4 " fill="none"></path>
 					</g>
-					<path d="M3109.6 2594.0 L3104.2 2593.8 L3098.9 2593.6 L3104.7 2580.5 Z"></path>
-					<path d="M36494.8 193.7 L36494.75 293 L36494.75 614 L36494.8 614.0 " fill="none"></path>
+					<path d="M3109.7 2654.0 L3104.3 2653.8 L3099.0 2653.7 L3104.8 2640.5 Z"></path>
+					<path d="M37557.0 193.7 L37557 293 L37557 614 L37557.0 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36500.1 184.3 L36494.8 193.7 L36489.4 184.3 L36494.8 175.0 Z"></path>
+						<path d="M37562.3 184.3 L37557.0 193.7 L37551.7 184.3 L37557.0 175.0 Z"></path>
 					</g>
-					<path d="M21915.8 2652.7 L21915.75 3194 L67699.5 3380.312807183107 L67699.5 3380.3 " fill="none"></path>
+					<path d="M22196.0 2712.7 L22196 3314 L63069 3500.290341894963 L63069.0 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21921.1 2643.3 L21915.8 2652.7 L21910.4 2643.3 L21915.8 2634.0 Z"></path>
+						<path d="M22201.3 2703.3 L22196.0 2712.7 L22190.7 2703.3 L22196.0 2694.0 Z"></path>
 					</g>
-					<path d="M54027.2 1728.9 L53337 1936 L53337 2534 L53337.0 2534.0 " fill="none"></path>
-					<path d="M54028.8 1734.0 L54027.2 1728.9 L54025.7 1723.8 L54040.0 1725.1 Z"></path>
-					<path d="M53320.7 2608.5 L53101.5 3194 L55705.5 3370.920218579235 L55705.5 3370.9 " fill="none"></path>
-					<path d="M53325.7 2610.4 L53320.7 2608.5 L53315.7 2606.6 L53325.4 2596.0 Z"></path>
-					<path d="M54050.9 1734.0 L53601.5 1936 L53601.5 2534 L53601.5 2534.0 " fill="none"></path>
-					<path d="M54053.1 1738.8 L54050.9 1734.0 L54048.7 1729.1 L54063.0 1728.5 Z"></path>
-					<path d="M54091.7 1737.9 L53894.5 1936 L40927 2559.066037735849 L40927.0 2559.1 " fill="none"></path>
-					<path d="M54095.5 1741.7 L54091.7 1737.9 L54087.9 1734.2 L54101.1 1728.5 Z"></path>
-					<path d="M40803.5 2609.3 L40803.5 3194 L50832.25 3378.068089555911 L50832.3 3378.1 " fill="none"></path>
-					<path d="M40808.8 2609.3 L40803.5 2609.3 L40798.2 2609.3 L40803.5 2596.0 Z"></path>
+					<path d="M59910.6 1716.0 L58663.75 1936 L58663.75 2594 L58663.8 2594.0 " fill="none"></path>
+					<path d="M59911.5 1721.3 L59910.6 1716.0 L59909.7 1710.8 L59923.8 1713.7 Z"></path>
+					<path d="M58660.4 2669.3 L58611.25 3314 L58611.25 3485 L58611.3 3485.0 " fill="none"></path>
+					<path d="M58665.7 2669.7 L58660.4 2669.3 L58655.1 2668.9 L58661.4 2656.0 Z"></path>
+					<path d="M59910.7 1720.5 L58928.25 1936 L58928.25 2594 L58928.3 2594.0 " fill="none"></path>
+					<path d="M59911.9 1725.7 L59910.7 1720.5 L59909.6 1715.3 L59923.8 1717.7 Z"></path>
+					<path d="M59974.3 1737.8 L59770.5 1936 L45635.75 2619.0321217540723 L45635.8 2619.0 " fill="none"></path>
+					<path d="M59978.0 1741.6 L59974.3 1737.8 L59970.6 1734.0 L59983.9 1728.5 Z"></path>
+					<path d="M45512.3 2669.3 L45512.25 3314 L50356.25 3495.534411735155 L50356.3 3495.5 " fill="none"></path>
+					<path d="M45517.6 2669.3 L45512.3 2669.3 L45506.9 2669.3 L45512.3 2656.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M53349.3 2608.8 L53513.75 3194 L51097.25 3370.805511965477 L51097.3 3370.8 " fill="none"></path>
+						<path d="M58680.9 2668.4 L58935.75 3314 L50621.25 3497.574553095774 L50621.3 3497.6 " fill="none"></path>
 					</g>
-					<path d="M53354.5 2607.4 L53349.3 2608.8 L53344.2 2610.3 L53345.7 2596.0 Z"></path>
-					<path d="M54097.8 1738.8 L53934.5 1936 L38303.25 2560.346732072836 L38303.3 2560.3 " fill="none"></path>
-					<path d="M54101.9 1742.2 L54097.8 1738.8 L54093.7 1735.4 L54106.3 1728.5 Z"></path>
-					<path d="M38186.8 2609.3 L38186.75 3194 L46410 3377.47673097054 L46410.0 3377.5 " fill="none"></path>
-					<path d="M38192.1 2609.3 L38186.8 2609.3 L38181.4 2609.3 L38186.8 2596.0 Z"></path>
-					<path d="M54201.6 1734.8 L54577.25 1936 L56175.40262321145 2534 L56175.4 2534.0 " fill="none"></path>
-					<path d="M54204.1 1730.1 L54201.6 1734.8 L54199.1 1739.5 L54189.9 1728.5 Z"></path>
-					<path d="M36999.3 679.2 L36999.25 966 L36999.25 1197 L36999.3 1197.0 " fill="none"></path>
+					<path d="M58685.8 2666.4 L58680.9 2668.4 L58675.9 2670.4 L58676.0 2656.0 Z"></path>
+					<path d="M59980.4 1738.6 L59810.5 1936 L45225.25 2619.5402077983913 L45225.3 2619.5 " fill="none"></path>
+					<path d="M59984.4 1742.1 L59980.4 1738.6 L59976.3 1735.1 L59989.1 1728.5 Z"></path>
+					<path d="M45108.8 2669.3 L45108.75 3314 L45108.75 3469.5 L45108.8 3469.5 " fill="none"></path>
+					<path d="M45114.1 2669.3 L45108.8 2669.3 L45103.4 2669.3 L45108.8 2656.0 Z"></path>
+					<path d="M60118.7 1732.8 L60711 1936 L60711 2594 L60711.0 2594.0 " fill="none"></path>
+					<path d="M60120.5 1727.8 L60118.7 1732.8 L60117.0 1737.9 L60106.1 1728.5 Z"></path>
+					<path d="M38061.5 679.2 L38061.5 966 L38061.5 1197 L38061.5 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37004.6 669.8 L36999.3 679.2 L36993.9 669.8 L36999.3 660.5 Z"></path>
+						<path d="M38066.8 669.8 L38061.5 679.2 L38056.2 669.8 L38061.5 660.5 Z"></path>
 					</g>
-					<path d="M36999.3 165.3 L36999.25 293 L36999.25 598.5 L36999.3 598.5 " fill="none"></path>
-					<path d="M37004.6 165.3 L36999.3 165.3 L36993.9 165.3 L36999.3 152.0 Z"></path>
-					<path d="M37541.4 161.6 L37415 293 L37415 598.5 L37415.0 598.5 " fill="none"></path>
-					<path d="M37545.2 165.3 L37541.4 161.6 L37537.5 157.9 L37550.6 152.0 Z"></path>
-					<path d="M37594.7 160.5 L37756.5 293 L37756.5 598.5 L37756.5 598.5 " fill="none"></path>
-					<path d="M37598.1 156.3 L37594.7 160.5 L37591.4 164.6 L37584.4 152.0 Z"></path>
-					<path d="M37813.8 1747.2 L37813.75 1936 L35158.25 2539.2175875767425 L35158.3 2539.2 " fill="none"></path>
+					<path d="M38061.5 165.3 L38061.5 293 L38061.5 598.5 L38061.5 598.5 " fill="none"></path>
+					<path d="M38066.8 165.3 L38061.5 165.3 L38056.2 165.3 L38061.5 152.0 Z"></path>
+					<path d="M38603.6 161.6 L38477.25 293 L38477.25 598.5 L38477.3 598.5 " fill="none"></path>
+					<path d="M38607.4 165.3 L38603.6 161.6 L38599.8 157.9 L38612.8 152.0 Z"></path>
+					<path d="M38657.0 160.5 L38818.75 293 L38818.75 598.5 L38818.8 598.5 " fill="none"></path>
+					<path d="M38660.4 156.3 L38657.0 160.5 L38653.6 164.6 L38646.7 152.0 Z"></path>
+					<path d="M39057.5 1747.2 L39057.5 1936 L36986.5 2589.2016479743647 L36986.5 2589.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37819.1 1737.8 L37813.8 1747.2 L37808.4 1737.8 L37813.8 1728.5 Z"></path>
+						<path d="M39062.8 1737.8 L39057.5 1747.2 L39052.2 1737.8 L39057.5 1728.5 Z"></path>
 					</g>
-					<path d="M37813.8 1241.3 L37813.75 1459 L37813.75 1666.5 L37813.8 1666.5 " fill="none"></path>
-					<path d="M37819.1 1241.3 L37813.8 1241.3 L37808.4 1241.3 L37813.8 1228.0 Z"></path>
-					<path d="M38084.8 863.1 L37964.25 966 L37964.25 1197 L37964.3 1197.0 " fill="none"></path>
+					<path d="M39057.5 1241.3 L39057.5 1459 L39057.5 1666.5 L39057.5 1666.5 " fill="none"></path>
+					<path d="M39062.8 1241.3 L39057.5 1241.3 L39052.2 1241.3 L39057.5 1228.0 Z"></path>
+					<path d="M39239.1 916.8 L39208 966 L39208 1197 L39208.0 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38095.4 861.1 L38084.8 863.1 L38088.4 853.0 L38099.0 851.0 Z"></path>
+						<path d="M39248.6 911.7 L39239.1 916.8 L39239.6 906.0 L39249.1 901.0 Z"></path>
 					</g>
-					<path d="M38632.6 849.5 L38777.75 966 L38777.75 1197 L38777.8 1197.0 " fill="none"></path>
+					<path d="M39695.7 814.7 L39920.25 966 L39920.25 1197 L39920.3 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38628.6 839.5 L38632.6 849.5 L38621.9 847.8 L38618.0 837.8 Z"></path>
+						<path d="M39691.0 805.1 L39695.7 814.7 L39685.0 814.0 L39680.3 804.3 Z"></path>
 					</g>
-					<path d="M38634.4 779.4 L38977.75 966 L38977.75 1197 L38977.8 1197.0 " fill="none"></path>
+					<path d="M39697.5 745.8 L40221.5 966 L40221.5 1197 L40221.5 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38628.7 770.3 L38634.4 779.4 L38623.7 779.7 L38618.0 770.5 Z"></path>
+						<path d="M39690.9 737.2 L39697.5 745.8 L39686.8 747.1 L39680.3 738.5 Z"></path>
 					</g>
-					<path d="M38635.6 729.4 L39291.75 966 L39291.75 1197 L39291.8 1197.0 " fill="none"></path>
+					<path d="M39697.9 722.8 L40420.5 966 L40420.5 1197 L40420.5 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38628.6 721.2 L38635.6 729.4 L38625.0 731.3 L38618.0 723.1 Z"></path>
+						<path d="M39690.8 714.8 L39697.9 722.8 L39687.4 724.9 L39680.3 716.8 Z"></path>
 					</g>
-					<path d="M38358.5 165.3 L38358.5 293 L38358.5 358 L38358.5 358.0 " fill="none"></path>
-					<path d="M38363.8 165.3 L38358.5 165.3 L38353.2 165.3 L38358.5 152.0 Z"></path>
-					<path d="M35034.6 2621.9 L34932.5 3194 L21733 3380.0911479003666 L21733.0 3380.1 " fill="none"></path>
+					<path d="M39420.8 165.3 L39420.75 293 L39420.75 358 L39420.8 358.0 " fill="none"></path>
+					<path d="M39426.1 165.3 L39420.8 165.3 L39415.4 165.3 L39420.8 152.0 Z"></path>
+					<path d="M36854.3 2681.2 L36643.25 3314 L22146 3500.1276740383787 L22146.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35041.5 2613.6 L35034.6 2621.9 L35031.0 2611.8 L35037.9 2603.5 Z"></path>
+						<path d="M36862.3 2674.0 L36854.3 2681.2 L36852.2 2670.7 L36860.2 2663.5 Z"></path>
 					</g>
-					<path d="M35109.9 2614.8 L35866.25 3194 L43925.25 3379.1901798915724 L43925.3 3379.2 " fill="none"></path>
+					<path d="M36873.0 2682.2 L36873 3314 L37348.17828418231 3485 L37348.2 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35105.7 2604.9 L35109.9 2614.8 L35099.2 2613.4 L35095.0 2603.5 Z"></path>
+						<path d="M36878.3 2672.8 L36873.0 2682.2 L36867.7 2672.8 L36873.0 2663.5 Z"></path>
 					</g>
-					<path d="M24034.3 2645.2 L24034.25 3194 L21733 3378.17900439867 L21733.0 3378.2 " fill="none"></path>
+					<path d="M24314.5 2705.2 L24314.5 3314 L22146 3498.0387940841865 L22146.0 3498.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24039.6 2635.8 L24034.3 2645.2 L24028.9 2635.8 L24034.3 2626.5 Z"></path>
+						<path d="M24319.8 2695.8 L24314.5 2705.2 L24309.2 2695.8 L24314.5 2686.5 Z"></path>
 					</g>
-					<path d="M16368.0 3806.0 L16296.75 3880 L62863 4013.7916968186328 L62863.0 4013.8 " fill="none"></path>
+					<path d="M16795.7 3926.0 L16724.5 4000 L61169.5 4133.7817712135675 L61169.5 4133.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16378.3 3802.9 L16368.0 3806.0 L16370.6 3795.5 L16380.9 3792.5 Z"></path>
+						<path d="M16806.0 3922.9 L16795.7 3926.0 L16798.3 3915.5 L16808.6 3912.5 Z"></path>
 					</g>
-					<path d="M16546.7 3804.3 L16640 3880 L16329.379664179105 3998.5 L16329.4 3998.5 " fill="none"></path>
+					<path d="M16974.5 3924.3 L17067.75 4000 L16593.086753731342 4118.5 L16593.1 4118.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16542.8 3794.2 L16546.7 3804.3 L16536.1 3802.5 L16532.2 3792.5 Z"></path>
+						<path d="M16970.6 3914.2 L16974.5 3924.3 L16963.9 3922.5 L16960.0 3912.5 Z"></path>
 					</g>
-					<path d="M38804.5 165.3 L38804.5 293 L38804.5 583.5 L38804.5 583.5 " fill="none"></path>
-					<path d="M38809.8 165.3 L38804.5 165.3 L38799.2 165.3 L38804.5 152.0 Z"></path>
-					<path d="M39139.5 165.3 L39139.5 293 L39139.5 583.5 L39139.5 583.5 " fill="none"></path>
-					<path d="M39144.8 165.3 L39139.5 165.3 L39134.2 165.3 L39139.5 152.0 Z"></path>
-					<path d="M24232.3 2652.2 L24232.25 3194 L27437 3378.0024243823595 L27437.0 3378.0 " fill="none"></path>
+					<path d="M39866.8 165.3 L39866.75 293 L39866.75 583.5 L39866.8 583.5 " fill="none"></path>
+					<path d="M39872.1 165.3 L39866.8 165.3 L39861.4 165.3 L39866.8 152.0 Z"></path>
+					<path d="M40201.8 165.3 L40201.75 293 L40201.75 583.5 L40201.8 583.5 " fill="none"></path>
+					<path d="M40207.1 165.3 L40201.8 165.3 L40196.4 165.3 L40201.8 152.0 Z"></path>
+					<path d="M24512.5 2712.2 L24512.5 3314 L27961.75 3498.1772600386516 L27961.8 3498.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24237.6 2642.8 L24232.3 2652.2 L24226.9 2642.8 L24232.3 2633.5 Z"></path>
+						<path d="M24517.8 2702.8 L24512.5 2712.2 L24507.2 2702.8 L24512.5 2693.5 Z"></path>
 					</g>
-					<path d="M80530.1 172.1 L80202 293 L80202 629.5 L80202 629.5 L80202 966 L80202 966 L80202 1174 L80202.0 1174.0 " fill="none"></path>
-					<path d="M80531.9 177.1 L80530.1 172.1 L80528.3 167.1 L80542.6 167.5 Z"></path>
-					<path d="M867.2 3302.4 L880 3297 L887.5 3297 L887.5 3297 L895 3380.5 L895 3380.5 L887.5 3464 L887.5 3464 L880 3464 L880 3464 L850 3451.284263959391 L850.0 3451.3 " fill="none"></path>
+					<path d="M82508.8 171.4 L82116.75 293 L82116.75 629.5 L82116.75 629.5 L82116.75 966 L82116.75 966 L82116.75 1174 L82116.8 1174.0 " fill="none"></path>
+					<path d="M82510.4 176.5 L82508.8 171.4 L82507.2 166.4 L82521.5 167.5 Z"></path>
+					<path d="M867.2 3422.4 L880 3417 L887.5 3417 L887.5 3417 L895 3500.5 L895 3500.5 L887.5 3584 L887.5 3584 L880 3584 L880 3584 L850 3571.284263959391 L850.0 3571.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M856.5 3301.2 L867.2 3302.4 L860.7 3311.0 L850.0 3309.7 Z"></path>
+						<path d="M856.5 3421.2 L867.2 3422.4 L860.7 3431.0 L850.0 3429.7 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3106.1 2593.8 L3123.25 3194 L850 3367.7367585288393 L850.0 3367.7 " fill="none"></path>
-					</g>
-					<path d="M3111.4 2593.7 L3106.1 2593.8 L3100.7 2594.0 L3105.7 2580.5 Z"></path>
-					<path d="M16873.9 3821.9 L16750.75 3880 L16502.69589552239 3998.5 L16502.7 3998.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16884.6 3822.7 L16873.9 3821.9 L16880.0 3813.1 L16890.8 3813.9 Z"></path>
-					</g>
-					<path d="M16874.3 3835.1 L16790.75 3880 L8580 4012.6509931579108 L8580.0 4012.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16885.0 3835.4 L16874.3 3835.1 L16880.0 3826.0 L16890.8 3826.3 Z"></path>
+						<path d="M3106.0 2653.8 L3123.25 3314 L850 3487.7367585288393 L850.0 3487.7 " fill="none"></path>
 					</g>
-					<path d="M17291.7 3781.4 L17648.5 3880 L17889.921641791047 3998.5 L17889.9 3998.5 " fill="none"></path>
+					<path d="M3111.3 2653.7 L3106.0 2653.8 L3100.7 2654.0 L3105.7 2640.5 Z"></path>
+					<path d="M17301.6 3941.9 L17178.5 4000 L16766.402985074626 4118.5 L16766.4 4118.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17284.2 3773.8 L17291.7 3781.4 L17281.3 3784.1 L17273.8 3776.4 Z"></path>
+						<path d="M17312.3 3942.7 L17301.6 3941.9 L17307.8 3933.1 L17318.5 3933.9 Z"></path>
 					</g>
-					<path d="M17291.8 3777.6 L17688.5 3880 L16840.20802238806 3998.5 L16840.2 3998.5 " fill="none"></path>
+					<path d="M17302.1 3955.1 L17218.5 4000 L8617 4132.71168681635 L8617.0 4132.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17284.1 3770.1 L17291.8 3777.6 L17281.5 3780.4 L17273.8 3772.9 Z"></path>
+						<path d="M17312.8 3955.4 L17302.1 3955.1 L17307.8 3946.0 L17318.5 3946.3 Z"></path>
 					</g>
-					<path d="M39473.7 193.7 L39409 293 L39409 598.5 L39409.0 598.5 " fill="none"></path>
-					<path d="M39478.2 196.6 L39473.7 193.7 L39469.3 190.8 L39481.0 182.5 Z"></path>
-					<path d="M39548.3 193.7 L39613 293 L39613 598.5 L39613.0 598.5 " fill="none"></path>
-					<path d="M39552.7 190.8 L39548.3 193.7 L39543.8 196.6 L39541.0 182.5 Z"></path>
-					<path d="M17901.8 3791.2 L17819.5 3880 L16981.25 4009.369997120645 L16981.3 4009.4 " fill="none"></path>
+					<path d="M17719.5 3901.4 L18076.25 4000 L18317.671641791047 4118.5 L18317.7 4118.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17912.0 3788.0 L17901.8 3791.2 L17904.2 3780.7 L17914.5 3777.5 Z"></path>
+						<path d="M17711.9 3893.8 L17719.5 3901.4 L17709.1 3904.1 L17701.5 3896.4 Z"></path>
 					</g>
-					<path d="M41583.3 4094.2 L41583.25 4148 L41583.25 4319 L41583.3 4319.0 " fill="none"></path>
+					<path d="M17719.6 3897.6 L18116.25 4000 L17103.9151119403 4118.5 L17103.9 4118.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41588.6 4084.8 L41583.3 4094.2 L41577.9 4084.8 L41583.3 4075.5 Z"></path>
+						<path d="M17711.9 3890.1 L17719.6 3897.6 L17709.2 3900.4 L17701.5 3892.9 Z"></path>
 					</g>
-					<path d="M17954.6 3790.7 L17941.5 3880 L41315.25 4012.480992312329 L41315.3 4012.5 " fill="none"></path>
-					<path d="M17959.9 3791.5 L17954.6 3790.7 L17949.3 3789.9 L17956.6 3777.5 Z"></path>
-					<path d="M18014.8 3788.0 L18086.5 3880 L39671.5 4013.579180713989 L39671.5 4013.6 " fill="none"></path>
-					<path d="M18019.0 3784.7 L18014.8 3788.0 L18010.6 3791.3 L18006.6 3777.5 Z"></path>
-					<path d="M21704.0 3409.3 L21704 3567 L21704 3685 L21704.0 3685.0 " fill="none"></path>
-					<path d="M21709.3 3409.3 L21704.0 3409.3 L21698.7 3409.3 L21704.0 3396.0 Z"></path>
-					<path d="M39953.5 165.3 L39953.5 293 L39953.5 583 L39953.5 583.0 " fill="none"></path>
-					<path d="M39958.8 165.3 L39953.5 165.3 L39948.2 165.3 L39953.5 152.0 Z"></path>
-					<path d="M40402.5 724.7 L40402.5 966 L40402.5 1197 L40402.5 1197.0 " fill="none"></path>
+					<path d="M40536.0 193.7 L40471.25 293 L40471.25 598.5 L40471.3 598.5 " fill="none"></path>
+					<path d="M40540.5 196.6 L40536.0 193.7 L40531.5 190.8 L40543.3 182.5 Z"></path>
+					<path d="M40610.5 193.7 L40675.25 293 L40675.25 598.5 L40675.3 598.5 " fill="none"></path>
+					<path d="M40615.0 190.8 L40610.5 193.7 L40606.0 196.6 L40603.2 182.5 Z"></path>
+					<path d="M18329.5 3911.2 L18247.25 4000 L17223.5 4130.185053380783 L17223.5 4130.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40407.8 715.3 L40402.5 724.7 L40397.2 715.3 L40402.5 706.0 Z"></path>
+						<path d="M18339.8 3908.0 L18329.5 3911.2 L18332.0 3900.7 L18342.2 3897.5 Z"></path>
 					</g>
-					<path d="M40402.5 165.3 L40402.5 293 L40402.5 553 L40402.5 553.0 " fill="none"></path>
-					<path d="M40407.8 165.3 L40402.5 165.3 L40397.2 165.3 L40402.5 152.0 Z"></path>
-					<path d="M40939.5 160.8 L40790.5 293 L40790.5 575.5 L40790.5 575.5 " fill="none"></path>
-					<path d="M40943.1 164.8 L40939.5 160.8 L40936.0 156.9 L40949.5 152.0 Z"></path>
-					<path d="M40994.5 160.8 L41143.5 293 L41143.5 598.5 L41143.5 598.5 " fill="none"></path>
-					<path d="M40998.0 156.9 L40994.5 160.8 L40990.9 164.8 L40984.5 152.0 Z"></path>
-					<path d="M22607.6 1720.8 L22310.75 1936 L22310.75 2481 L22310.8 2481.0 " fill="none"></path>
-					<path d="M22610.7 1725.1 L22607.6 1720.8 L22604.4 1716.5 L22618.4 1713.0 Z"></path>
-					<path d="M65421.0 4429.7 L65421 4521 L67612.75 4555.182152663372 L67612.8 4555.2 " fill="none"></path>
+					<path d="M58808.5 4214.2 L58808.5 4268 L63871.25 4451.1891885337345 L63871.3 4451.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65426.3 4420.3 L65421.0 4429.7 L65415.7 4420.3 L65421.0 4411.0 Z"></path>
+						<path d="M58813.8 4204.8 L58808.5 4214.2 L58803.2 4204.8 L58808.5 4195.5 Z"></path>
 					</g>
-					<path d="M77914.3 1762.7 L77914.25 1936 L73596 2540.2331905900674 L73596.0 2540.2 " fill="none"></path>
+					<path d="M18382.4 3910.7 L18369.25 4000 L58540.5 4133.111951878435 L58540.5 4133.1 " fill="none"></path>
+					<path d="M18387.7 3911.5 L18382.4 3910.7 L18377.1 3909.9 L18384.3 3897.5 Z"></path>
+					<path d="M18442.5 3908.0 L18514.25 4000 L39575 4133.5687392770515 L39575.0 4133.6 " fill="none"></path>
+					<path d="M18446.7 3904.7 L18442.5 3908.0 L18438.3 3911.3 L18434.3 3897.5 Z"></path>
+					<path d="M22117.0 3529.3 L22117 3687 L22117 3805 L22117.0 3805.0 " fill="none"></path>
+					<path d="M22122.3 3529.3 L22117.0 3529.3 L22111.7 3529.3 L22117.0 3516.0 Z"></path>
+					<path d="M41015.8 165.3 L41015.75 293 L41015.75 583 L41015.8 583.0 " fill="none"></path>
+					<path d="M41021.1 165.3 L41015.8 165.3 L41010.4 165.3 L41015.8 152.0 Z"></path>
+					<path d="M41464.8 724.7 L41464.75 966 L41464.75 1197 L41464.8 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M77919.6 1753.3 L77914.3 1762.7 L77908.9 1753.3 L77914.3 1744.0 Z"></path>
+						<path d="M41470.1 715.3 L41464.8 724.7 L41459.4 715.3 L41464.8 706.0 Z"></path>
 					</g>
-					<path d="M78840.1 153.0 L77914.25 293 L77914.25 629.5 L77914.25 629.5 L77914.25 966 L77914.25 966 L77914.25 1212.5 L77914.25 1212.5 L77914.25 1459 L77914.25 1459 L77914.25 1651 L77914.3 1651.0 " fill="none"></path>
-					<path d="M78840.9 158.3 L78840.1 153.0 L78839.3 147.7 L78853.3 151.0 Z"></path>
-					<path d="M34986.5 1710.1 L33280.25 1936 L27601.5 2549.866165413534 L27601.5 2549.9 " fill="none"></path>
-					<path d="M34987.2 1715.4 L34986.5 1710.1 L34985.8 1704.8 L34999.8 1708.4 Z"></path>
-					<path d="M22650.1 1725.5 L22728.25 1936 L22728.25 2436 L22728.3 2436.0 " fill="none"></path>
-					<path d="M22655.1 1723.6 L22650.1 1725.5 L22645.1 1727.4 L22645.5 1713.0 Z"></path>
-					<path d="M41476.0 231.7 L41476 293 L41476 614 L41476.0 614.0 " fill="none"></path>
+					<path d="M41464.8 165.3 L41464.75 293 L41464.75 553 L41464.8 553.0 " fill="none"></path>
+					<path d="M41470.1 165.3 L41464.8 165.3 L41459.4 165.3 L41464.8 152.0 Z"></path>
+					<path d="M42255.0 160.8 L42106 293 L42106 575.5 L42106.0 575.5 " fill="none"></path>
+					<path d="M42258.6 164.8 L42255.0 160.8 L42251.5 156.9 L42265.0 152.0 Z"></path>
+					<path d="M42310.0 160.8 L42459 293 L42459 598.5 L42459.0 598.5 " fill="none"></path>
+					<path d="M42313.5 156.9 L42310.0 160.8 L42306.4 164.8 L42300.0 152.0 Z"></path>
+					<path d="M22887.8 1720.8 L22591 1936 L22591 2541 L22591.0 2541.0 " fill="none"></path>
+					<path d="M22891.0 1725.1 L22887.8 1720.8 L22884.7 1716.5 L22898.6 1713.0 Z"></path>
+					<path d="M79756.5 1762.7 L79756.5 1936 L64689.25 2617.0000655985045 L64689.3 2617.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41481.3 222.3 L41476.0 231.7 L41470.7 222.3 L41476.0 213.0 Z"></path>
+						<path d="M79761.8 1753.3 L79756.5 1762.7 L79751.2 1753.3 L79756.5 1744.0 Z"></path>
 					</g>
-					<path d="M73404.6 2667.5 L73330.5 3194 L65014 3379.2415203630717 L65014.0 3379.2 " fill="none"></path>
+					<path d="M80996.5 149.2 L79756.5 293 L79756.5 629.5 L79756.5 629.5 L79756.5 966 L79756.5 966 L79756.5 1212.5 L79756.5 1212.5 L79756.5 1459 L79756.5 1459 L79756.5 1651 L79756.5 1651.0 " fill="none"></path>
+					<path d="M80997.1 154.5 L80996.5 149.2 L80995.9 143.9 L81009.8 147.6 Z"></path>
+					<path d="M34466.9 1702.6 L30138.75 1936 L29166.361211901305 2571.5 L29166.4 2571.5 " fill="none"></path>
+					<path d="M34467.2 1708.0 L34466.9 1702.6 L34466.6 1697.3 L34480.3 1701.9 Z"></path>
+					<path d="M22930.4 1725.5 L23008.5 1936 L23008.5 2496 L23008.5 2496.0 " fill="none"></path>
+					<path d="M22935.4 1723.6 L22930.4 1725.5 L22925.4 1727.4 L22925.8 1713.0 Z"></path>
+					<path d="M42791.5 231.7 L42791.5 293 L42791.5 614 L42791.5 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73411.2 2659.0 L73404.6 2667.5 L73400.6 2657.5 L73407.2 2649.0 Z"></path>
+						<path d="M42796.8 222.3 L42791.5 231.7 L42786.2 222.3 L42791.5 213.0 Z"></path>
 					</g>
-					<path d="M73458.0 2666.4 L73661 3194 L68373 3378.6666042505385 L68373.0 3378.7 " fill="none"></path>
+					<path d="M64499.1 2727.5 L64423.75 3314 L59344.75 3498.448154999513 L59344.8 3498.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73459.6 2655.8 L73458.0 2666.4 L73449.7 2659.6 L73451.3 2649.0 Z"></path>
+						<path d="M64505.6 2718.9 L64499.1 2727.5 L64495.0 2717.6 L64501.5 2709.0 Z"></path>
 					</g>
-					<path d="M73797.4 650.0 L66868.25 966 L66868.25 1212.5 L66868.25 1212.5 L66868.25 1459 L66868.25 1459 L66868.25 1697.5 L66868.25 1697.5 L66868.25 1936 L66868.25 1936 L73242 2548.004541464718 L73242.0 2548.0 " fill="none"></path>
-					<path d="M73797.7 655.3 L73797.4 650.0 L73797.2 644.7 L73810.8 649.4 Z"></path>
-					<path d="M11816.5 2630.2 L11816.5 3194 L19129 3376.080273698264 L19129.0 3376.1 " fill="none"></path>
+					<path d="M64549.7 2726.5 L64766.25 3314 L63029 3495.029263863668 L63029.0 3495.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11821.8 2620.8 L11816.5 2630.2 L11811.2 2620.8 L11816.5 2611.5 Z"></path>
+						<path d="M64551.4 2715.9 L64549.7 2726.5 L64541.4 2719.6 L64543.2 2709.0 Z"></path>
 					</g>
-					<path d="M13703.8 1712.1 L11816.5 1936 L11816.5 2518.5 L11816.5 2518.5 " fill="none"></path>
-					<path d="M13704.4 1717.4 L13703.8 1712.1 L13703.1 1706.8 L13717.0 1710.5 Z"></path>
-					<path d="M12571.3 2630.2 L12571.25 3194 L19129 3375.5850005567722 L19129.0 3375.6 " fill="none"></path>
+					<path d="M66787.2 643.1 L56131.25 966 L56131.25 1212.5 L56131.25 1212.5 L56131.25 1459 L56131.25 1459 L56131.25 1697.5 L56131.25 1697.5 L56131.25 1936 L56131.25 1936 L64335.25 2610.448872449588 L64335.3 2610.4 " fill="none"></path>
+					<path d="M66787.3 648.4 L66787.2 643.1 L66787.0 637.8 L66800.5 642.7 Z"></path>
+					<path d="M11816.5 2690.2 L11816.5 3314 L14634.5 3489.4488399265565 L14634.5 3489.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12576.6 2620.8 L12571.3 2630.2 L12565.9 2620.8 L12571.3 2611.5 Z"></path>
+						<path d="M11821.8 2680.8 L11816.5 2690.2 L11811.2 2680.8 L11816.5 2671.5 Z"></path>
 					</g>
-					<path d="M13703.9 1720.8 L12571.25 1936 L12571.25 2518.5 L12571.3 2518.5 " fill="none"></path>
-					<path d="M13704.9 1726.0 L13703.9 1720.8 L13702.9 1715.6 L13717.0 1718.3 Z"></path>
-					<path d="M13323.3 2630.2 L13323.25 3194 L19129 3374.9672627752475 L19129.0 3375.0 " fill="none"></path>
+					<path d="M13472.3 1714.0 L11816.5 1936 L11816.5 2578.5 L11816.5 2578.5 " fill="none"></path>
+					<path d="M13473.0 1719.2 L13472.3 1714.0 L13471.6 1708.7 L13485.5 1712.2 Z"></path>
+					<path d="M12571.3 2690.2 L12571.25 3314 L14634.5 3485.7264866674104 L14634.5 3485.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13328.6 2620.8 L13323.3 2630.2 L13317.9 2620.8 L13323.3 2611.5 Z"></path>
+						<path d="M12576.6 2680.8 L12571.3 2690.2 L12565.9 2680.8 L12571.3 2671.5 Z"></path>
 					</g>
-					<path d="M13749.0 1734.2 L13323.25 1936 L13323.25 2518.5 L13323.3 2518.5 " fill="none"></path>
-					<path d="M13751.3 1739.0 L13749.0 1734.2 L13746.8 1729.4 L13761.1 1728.5 Z"></path>
-					<path d="M18069.5 2645.2 L18069.5 3194 L19129 3353.738682295877 L19129.0 3353.7 " fill="none"></path>
+					<path d="M13472.5 1726.0 L12571.25 1936 L12571.25 2578.5 L12571.3 2578.5 " fill="none"></path>
+					<path d="M13473.7 1731.2 L13472.5 1726.0 L13471.3 1720.8 L13485.5 1723.0 Z"></path>
+					<path d="M13528.5 2690.2 L13528.5 3314 L14634.5 3474.7082197117256 L14634.5 3474.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18074.8 2635.8 L18069.5 2645.2 L18064.2 2635.8 L18069.5 2626.5 Z"></path>
+						<path d="M13533.8 2680.8 L13528.5 2690.2 L13523.2 2680.8 L13528.5 2671.5 Z"></path>
 					</g>
-					<path d="M13949.3 1704.4 L18069.5 1936 L18069.5 2503.5 L18069.5 2503.5 " fill="none"></path>
-					<path d="M13949.6 1699.1 L13949.3 1704.4 L13949.0 1709.7 L13936.0 1703.7 Z"></path>
-					<path d="M28283.4 2639.4 L27741.75 3194 L21335.5 3379.4722125198896 L21335.5 3379.5 " fill="none"></path>
+					<path d="M13582.8 1741.3 L13528.5 1936 L13528.5 2578.5 L13528.5 2578.5 " fill="none"></path>
+					<path d="M13587.9 1742.8 L13582.8 1741.3 L13577.6 1739.9 L13586.4 1728.5 Z"></path>
+					<path d="M18497.3 2705.2 L18497.25 3314 L14989.5 3491.5172308527235 L14989.5 3491.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28293.7 2636.4 L28283.4 2639.4 L28286.1 2629.0 L28296.4 2626.0 Z"></path>
+						<path d="M18502.6 2695.8 L18497.3 2705.2 L18491.9 2695.8 L18497.3 2686.5 Z"></path>
 					</g>
-					<path d="M28356.9 2644.7 L28362.75 3194 L19484 3376.844651483782 L19484.0 3376.8 " fill="none"></path>
+					<path d="M13717.8 1703.5 L18497.25 1936 L18497.25 2563.5 L18497.3 2563.5 " fill="none"></path>
+					<path d="M13718.1 1698.1 L13717.8 1703.5 L13717.6 1708.8 L13704.5 1702.8 Z"></path>
+					<path d="M29832.4 2689.7 L28418 3314 L21936.75 3499.4840411247937 L21936.8 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28362.1 2635.3 L28356.9 2644.7 L28351.4 2635.4 L28356.7 2626.0 Z"></path>
+						<path d="M29843.1 2690.8 L29832.4 2689.7 L29838.8 2681.0 L29849.5 2682.2 Z"></path>
 					</g>
-					<path d="M28374.3 2644.2 L28501 3194 L13656 3379.8427588521563 L13656.0 3379.8 " fill="none"></path>
+					<path d="M29855.8 2695.2 L28770.75 3314 L14989.5 3498.1284588519748 L14989.5 3498.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28377.4 2633.9 L28374.3 2644.2 L28367.0 2636.3 L28370.1 2626.0 Z"></path>
+						<path d="M29866.6 2695.3 L29855.8 2695.2 L29861.3 2686.0 L29872.0 2686.0 Z"></path>
 					</g>
-					<path d="M28686.0 2637.2 L28686 3194 L64901 3380.2094895441323 L64901.0 3380.2 " fill="none"></path>
+					<path d="M29995.7 2704.3 L30124 3314 L13203.75 3499.923119411999 L13203.8 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28691.3 2627.8 L28686.0 2637.2 L28680.7 2627.8 L28686.0 2618.5 Z"></path>
+						<path d="M29999.0 2694.0 L29995.7 2704.3 L29988.5 2696.2 L29991.8 2686.0 Z"></path>
 					</g>
-					<path d="M29100.9 2643.8 L28926 3194 L30132.627345844503 3365 L30132.6 3365.0 " fill="none"></path>
+					<path d="M30309.0 2697.2 L30309 3314 L59231.75 3500.1363863799097 L59231.8 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29108.9 2636.5 L29100.9 2643.8 L29098.7 2633.3 L29106.6 2626.0 Z"></path>
+						<path d="M30314.3 2687.8 L30309.0 2697.2 L30303.7 2687.8 L30309.0 2678.5 Z"></path>
 					</g>
-					<path d="M29166.7 2642.5 L29456.25 3194 L64901 3380.2031865075173 L64901.0 3380.2 " fill="none"></path>
+					<path d="M30726.1 2703.9 L30549 3314 L31619.239946380698 3485 L31619.2 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29167.1 2631.8 L29166.7 2642.5 L29157.6 2636.7 L29158.0 2626.0 Z"></path>
+						<path d="M30733.8 2696.5 L30726.1 2703.9 L30723.6 2693.5 L30731.3 2686.0 Z"></path>
 					</g>
-					<path d="M65952.3 2882.5 L65763 3194 L65763 3380.5 L65763 3380.5 L65763 3567 L65763 3567 L65763 3723.5 L65763 3723.5 L65763 3880 L65763 3880 L75100.5 4011.916183447549 L75100.5 4011.9 " fill="none"></path>
+					<path d="M30765.4 2704.3 L30891.75 3314 L59231.75 3500.128924339267 L59231.8 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65961.7 2877.2 L65952.3 2882.5 L65952.6 2871.7 L65962.0 2866.5 Z"></path>
+						<path d="M30768.8 2694.1 L30765.4 2704.3 L30758.3 2696.2 L30761.6 2686.0 Z"></path>
 					</g>
-					<path d="M66040.2 2884.2 L65938.25 3194 L65938.25 3380.5 L65938.25 3380.5 L65938.25 3567 L65938.25 3567 L65938.25 3723.5 L65938.25 3723.5 L65938.25 3880 L65938.25 3880 L65938.25 4014 L65938.25 4014 L65938.25 4148 L65938.25 4148 L65938.25 4334.5 L65938.25 4334.5 L65938.25 4521 L65938.25 4521 L67612.75 4554.794627629335 L67612.8 4554.8 " fill="none"></path>
+					<path d="M43287.0 2899.1 L43141.25 3314 L43141.25 3500.5 L43141.25 3500.5 L43141.25 3687 L43141.25 3687 L43141.25 3843.5 L43141.25 3843.5 L43141.25 4000 L43141.25 4000 L71281.25 4133.301281484754 L71281.3 4133.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66048.2 2877.0 L66040.2 2884.2 L66038.0 2873.7 L66046.0 2866.5 Z"></path>
+						<path d="M43295.1 2892.1 L43287.0 2899.1 L43285.0 2888.5 L43293.2 2881.5 Z"></path>
 					</g>
-					<path d="M66060.4 2884.5 L65978.25 3194 L63698.25 3365.632694248234 L63698.3 3365.6 " fill="none"></path>
+					<path d="M43347.5 2900.0 L43293.75 3314 L60588 3498.3942215615934 L60588.0 3498.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66068.0 2876.9 L66060.4 2884.5 L66057.7 2874.2 L66065.2 2866.5 Z"></path>
+						<path d="M43354.0 2891.4 L43347.5 2900.0 L43343.4 2890.1 L43349.9 2881.5 Z"></path>
 					</g>
-					<path d="M66222.7 2884.6 L66297.75 3194 L67699.5 3374.574253151442 L67699.5 3374.6 " fill="none"></path>
+					<path d="M43363.5 2900.1 L43333.75 3314 L63069 3500.0663064770933 L63069.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66225.7 2874.3 L66222.7 2884.6 L66215.4 2876.8 L66218.3 2866.5 Z"></path>
+						<path d="M43369.5 2891.2 L43363.5 2900.1 L43358.8 2890.4 L43364.8 2881.5 Z"></path>
 					</g>
-					<path d="M66243.0 2884.3 L66337.75 3194 L65014 3372.8656946205397 L65014.0 3372.9 " fill="none"></path>
+					<path d="M43452.0 2899.6 L43555.75 3314 L59231.75 3499.8302240584776 L59231.8 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66245.4 2873.9 L66243.0 2884.3 L66235.2 2877.0 L66237.5 2866.5 Z"></path>
+						<path d="M43454.9 2889.3 L43452.0 2899.6 L43444.6 2891.8 L43447.5 2881.5 Z"></path>
 					</g>
-					<path d="M66263.2 2884.0 L66377.75 3194 L68268 3375.4601080941966 L68268.0 3375.5 " fill="none"></path>
+					<path d="M43467.9 2899.3 L43595.75 3314 L62924 3499.994795093069 L62924.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66264.9 2873.4 L66263.2 2884.0 L66254.9 2877.1 L66256.7 2866.5 Z"></path>
+						<path d="M43470.2 2888.8 L43467.9 2899.3 L43460.0 2892.0 L43462.4 2881.5 Z"></path>
 					</g>
-					<path d="M66283.3 2883.6 L66417.75 3194 L19484 3379.797328132877 L19484.0 3379.8 " fill="none"></path>
+					<path d="M43483.7 2899.0 L43635.75 3314 L14989.5 3499.3515113404746 L14989.5 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66284.5 2872.9 L66283.3 2883.6 L66274.7 2877.2 L66275.9 2866.5 Z"></path>
+						<path d="M43485.5 2888.4 L43483.7 2899.0 L43475.5 2892.1 L43477.3 2881.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M67858.5 145.7 L66145.25 293 L66145.25 629.5 L66145.25 629.5 L66145.25 966 L66145.25 966 L66145.25 1212.5 L66145.25 1212.5 L66145.25 1459 L66145.25 1459 L66145.25 1697.5 L66145.25 1697.5 L66145.25 1936 L66145.25 1936 L66145.25 2263.5 L66145.3 2263.5 " fill="none"></path>
+						<path d="M45929.7 142.8 L43383.25 293 L43383.25 629.5 L43383.25 629.5 L43383.25 966 L43383.25 966 L43383.25 1212.5 L43383.25 1212.5 L43383.25 1459 L43383.25 1459 L43383.25 1697.5 L43383.25 1697.5 L43383.25 1936 L43383.25 1936 L43383.25 2368.5 L43383.3 2368.5 " fill="none"></path>
 					</g>
-					<path d="M67858.9 151.0 L67858.5 145.7 L67858.0 140.4 L67871.8 144.5 Z"></path>
-					<path d="M19501.3 3302.1 L19514 3297 L19521.5 3297 L19521.5 3297 L19529 3380.5 L19529 3380.5 L19521.5 3464 L19521.5 3464 L19514 3464 L19514 3464 L19484 3451.9277108433735 L19484.0 3451.9 " fill="none"></path>
+					<path d="M45930.0 148.1 L45929.7 142.8 L45929.4 137.5 L45943.0 142.0 Z"></path>
+					<path d="M15006.8 3422.1 L15019.5 3417 L15027 3417 L15027 3417 L15034.5 3500.5 L15034.5 3500.5 L15027 3584 L15027 3584 L15019.5 3584 L15019.5 3584 L14989.5 3571.9277108433735 L14989.5 3571.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19490.7 3300.6 L19501.3 3302.1 L19494.6 3310.5 L19484.0 3309.1 Z"></path>
+						<path d="M14996.2 3420.6 L15006.8 3422.1 L15000.1 3430.5 L14989.5 3429.1 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3114.9 2593.1 L3321.5 3194 L19129 3378.4290741319987 L19129.0 3378.4 " fill="none"></path>
+						<path d="M3114.1 2653.2 L3321.5 3314 L14634.5 3497.6190331143116 L14634.5 3497.6 " fill="none"></path>
 					</g>
-					<path d="M3120.0 2591.4 L3114.9 2593.1 L3109.9 2594.8 L3110.6 2580.5 Z"></path>
-					<path d="M1236.8 3330.9 L1249 3327 L1256.5 3327 L1256.5 3327 L1264 3380.5 L1264 3380.5 L1256.5 3434 L1256.5 3434 L1249 3434 L1249 3434 L1219 3424.5309734513276 L1219.0 3424.5 " fill="none"></path>
+					<path d="M3119.2 2651.6 L3114.1 2653.2 L3109.0 2654.8 L3110.1 2640.5 Z"></path>
+					<path d="M1236.8 3450.9 L1249 3447 L1256.5 3447 L1256.5 3447 L1264 3500.5 L1264 3500.5 L1256.5 3554 L1256.5 3554 L1249 3554 L1249 3554 L1219 3544.5309734513276 L1219.0 3544.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1226.3 3328.6 L1236.8 3330.9 L1229.5 3338.7 L1219.0 3336.5 Z"></path>
+						<path d="M1226.3 3448.6 L1236.8 3450.9 L1229.5 3458.7 L1219.0 3456.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3116.6 2592.8 L3361.5 3194 L1219 3369.0991454864156 L1219.0 3369.1 " fill="none"></path>
+						<path d="M3115.7 2653.0 L3361.5 3314 L1219 3489.0991454864156 L1219.0 3489.1 " fill="none"></path>
 					</g>
-					<path d="M3121.5 2590.8 L3116.6 2592.8 L3111.7 2594.9 L3111.6 2580.5 Z"></path>
-					<path d="M30500.3 2695.1 L29496.25 3194 L25860.75 3377.026251855851 L25860.8 3377.0 " fill="none"></path>
+					<path d="M3120.7 2651.1 L3115.7 2653.0 L3110.7 2654.9 L3111.0 2640.5 Z"></path>
+					<path d="M32527.5 2722.3 L30931.75 3314 L26128.5 3497.8588177946535 L26128.5 3497.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30511.0 2695.7 L30500.3 2695.1 L30506.3 2686.1 L30517.0 2686.7 Z"></path>
+						<path d="M32538.1 2724.1 L32527.5 2722.3 L32534.4 2714.1 L32545.0 2715.8 Z"></path>
 					</g>
-					<path d="M30588.7 2775.9 L30245.25 3194 L28722 3372.082510578279 L28722.0 3372.1 " fill="none"></path>
+					<path d="M32527.7 2732.0 L31101.25 3314 L27585.75 3496.7570034843206 L27585.8 3496.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30598.8 2772.1 L30588.7 2775.9 L30590.5 2765.3 L30600.6 2761.5 Z"></path>
+						<path d="M32538.4 2733.4 L32527.7 2732.0 L32534.3 2723.5 L32545.0 2725.0 Z"></path>
 					</g>
-					<path d="M30849.5 2778.8 L31019.5 3194 L31019.5 3365 L31019.5 3365.0 " fill="none"></path>
+					<path d="M32603.4 2835.5 L32179 3314 L32179 3485 L32179.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30850.9 2768.1 L30849.5 2778.8 L30841.0 2772.2 L30842.4 2761.5 Z"></path>
+						<path d="M32613.5 2832.0 L32603.4 2835.5 L32605.6 2824.9 L32615.7 2821.5 Z"></path>
 					</g>
-					<path d="M30924.3 2776.3 L31245 3194 L31245 3380.5 L31245 3380.5 L31245 3567 L31245 3567 L31245 3723.5 L31245 3723.5 L31245 3880 L31245 3880 L17993.5 4013.275865951139 L17993.5 4013.3 " fill="none"></path>
+					<path d="M32670.9 2837.8 L32404.5 3314 L32404.5 3500.5 L32404.5 3500.5 L32404.5 3687 L32404.5 3687 L32404.5 3843.5 L32404.5 3843.5 L32404.5 4000 L32404.5 4000 L18421.25 4133.313566105192 L18421.3 4133.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30922.8 2765.7 L30924.3 2776.3 L30914.3 2772.2 L30912.9 2761.5 Z"></path>
+						<path d="M32680.2 2832.2 L32670.9 2837.8 L32670.8 2827.0 L32680.1 2821.5 Z"></path>
 					</g>
-					<path d="M31021.6 2772.0 L31550.75 3194 L39932.75 3378.7695762661783 L39932.8 3378.8 " fill="none"></path>
+					<path d="M32707.1 2838.9 L32523 3314 L32523 3485 L32523.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31017.6 2762.0 L31021.6 2772.0 L31011.0 2770.4 L31007.0 2760.4 Z"></path>
+						<path d="M32715.5 2832.1 L32707.1 2838.9 L32705.5 2828.3 L32713.9 2821.5 Z"></path>
 					</g>
-					<path d="M31022.8 2730.3 L31754.5 3194 L27524 3378.6018366869444 L27524.0 3378.6 " fill="none"></path>
+					<path d="M32719.4 2839.2 L32563 3314 L28048.75 3498.720009873293 L28048.8 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31017.7 2720.8 L31022.8 2730.3 L31012.0 2729.8 L31007.0 2720.3 Z"></path>
+						<path d="M32727.4 2832.0 L32719.4 2839.2 L32717.3 2828.7 L32725.3 2821.5 Z"></path>
 					</g>
-					<path d="M31022.9 2724.0 L31794.5 3194 L40195.5 3377.0678857276394 L40195.5 3377.1 " fill="none"></path>
+					<path d="M32932.2 2837.0 L33252 3314 L33252 3485 L33252.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31017.7 2714.6 L31022.9 2724.0 L31012.2 2723.7 L31007.0 2714.3 Z"></path>
+						<path d="M32931.4 2826.3 L32932.2 2837.0 L32922.5 2832.2 L32921.8 2821.5 Z"></path>
 					</g>
-					<path d="M31023.1 2718.1 L31834.5 3194 L21335.5 3379.871517395225 L21335.5 3379.9 " fill="none"></path>
+					<path d="M32944.2 2836.6 L33292 3314 L21936.75 3499.9187608366437 L21936.8 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31017.7 2708.8 L31023.1 2718.1 L31012.4 2718.0 L31007.0 2708.7 Z"></path>
+						<path d="M32943.0 2825.9 L32944.2 2836.6 L32934.4 2832.2 L32933.2 2821.5 Z"></path>
 					</g>
-					<path d="M31023.2 2712.7 L31874.5 3194 L13656 3379.9641097914728 L13656.0 3380.0 " fill="none"></path>
+					<path d="M32956.1 2836.2 L33332 3314 L13203.75 3500.0148222935222 L13203.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31017.7 2703.5 L31023.2 2712.7 L31012.5 2712.8 L31007.0 2703.5 Z"></path>
+						<path d="M32954.5 2825.5 L32956.1 2836.2 L32946.2 2832.1 L32944.6 2821.5 Z"></path>
 					</g>
-					<path d="M73797.4 650.8 L67161.25 966 L67161.25 1212.5 L67161.25 1212.5 L67161.25 1459 L67161.25 1459 L67161.25 1666.5 L67161.3 1666.5 " fill="none"></path>
-					<path d="M73797.7 656.2 L73797.4 650.8 L73797.2 645.5 L73810.8 650.2 Z"></path>
+					<path d="M66787.2 645.5 L57789.25 966 L57789.25 1212.5 L57789.25 1212.5 L57789.25 1459 L57789.25 1459 L57789.25 1666.5 L57789.3 1666.5 " fill="none"></path>
+					<path d="M66787.4 650.8 L66787.2 645.5 L66787.0 640.2 L66800.5 645.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M59308.7 137.0 L41943.75 293 L41943.75 614 L41943.8 614.0 " fill="none"></path>
+						<path d="M73904.2 140.2 L71424.5 293 L71424.5 614 L71424.5 614.0 " fill="none"></path>
 					</g>
-					<path d="M59308.7 142.4 L59308.7 137.0 L59308.6 131.7 L59322.0 136.9 Z"></path>
-					<path d="M69196.8 3878.7 L69196.75 3880 L63146 4012.9235624410835 L63146.0 4012.9 " fill="none"></path>
+					<path d="M73904.5 145.5 L73904.2 140.2 L73903.9 134.9 L73917.5 139.4 Z"></path>
+					<path d="M64515.3 3998.7 L64515.25 4000 L60846 4132.234115511329 L60846.0 4132.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69202.1 3869.3 L69196.8 3878.7 L69191.4 3869.3 L69196.8 3860.0 Z"></path>
+						<path d="M64520.6 3989.3 L64515.3 3998.7 L64509.9 3989.3 L64515.3 3980.0 Z"></path>
 					</g>
-					<path d="M64838.3 3819.2 L64762.5 3880 L41851.25 4012.450683261969 L41851.3 4012.5 " fill="none"></path>
+					<path d="M59063.3 3879.2 L58301.75 4000 L58575.924440298506 4072.5 L58575.9 4072.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64848.9 3817.5 L64838.3 3819.2 L64842.2 3809.2 L64852.8 3807.5 Z"></path>
+						<path d="M59073.4 3883.0 L59063.3 3879.2 L59071.7 3872.5 L59081.8 3876.3 Z"></path>
 					</g>
-					<path d="M65076.7 3819.2 L65152.5 3880 L42055.25 4013.5259553264236 L42055.3 4013.5 " fill="none"></path>
+					<path d="M59288.3 3946.2 L59288.25 4000 L59271.44776119403 4118.5 L59271.4 4118.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65072.8 3809.2 L65076.7 3819.2 L65066.1 3817.5 L65062.2 3807.5 Z"></path>
+						<path d="M59293.6 3936.8 L59288.3 3946.2 L59282.9 3936.8 L59288.3 3927.5 Z"></path>
 					</g>
-					<path d="M65182.3 3769.5 L65723 3880 L65723 3998.5 L65723.0 3998.5 " fill="none"></path>
+					<path d="M59399.4 3939.7 L59469 4000 L60081.17630597015 4118.5 L60081.2 4118.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65174.2 3762.4 L65182.3 3769.5 L65172.1 3772.8 L65164.0 3765.7 Z"></path>
+						<path d="M59395.8 3929.6 L59399.4 3939.7 L59388.8 3937.6 L59385.3 3927.5 Z"></path>
 					</g>
-					<path d="M64957.5 3409.3 L64957.5 3567 L64957.5 3639.5 L64957.5 3639.5 " fill="none"></path>
-					<path d="M64962.8 3409.3 L64957.5 3409.3 L64952.2 3409.3 L64957.5 3396.0 Z"></path>
-					<path d="M32078.3 2652.7 L32078.25 3194 L25860.75 3378.45299451205 L25860.8 3378.5 " fill="none"></path>
+					<path d="M59288.3 3529.3 L59288.25 3687 L59288.25 3759.5 L59288.3 3759.5 " fill="none"></path>
+					<path d="M59293.6 3529.3 L59288.3 3529.3 L59282.9 3529.3 L59288.3 3516.0 Z"></path>
+					<path d="M33615.8 2712.7 L33615.75 3314 L26128.5 3498.796972704715 L26128.5 3498.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32083.6 2643.3 L32078.3 2652.7 L32072.9 2643.3 L32078.3 2634.0 Z"></path>
+						<path d="M33621.1 2703.3 L33615.8 2712.7 L33610.4 2703.3 L33615.8 2694.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M59308.7 137.1 L42224.75 293 L42224.75 614 L42224.8 614.0 " fill="none"></path>
+						<path d="M73904.4 147.0 L73070.5 293 L73070.5 614 L73070.5 614.0 " fill="none"></path>
 					</g>
-					<path d="M59308.7 142.4 L59308.7 137.1 L59308.6 131.7 L59322.0 136.9 Z"></path>
+					<path d="M73905.3 152.3 L73904.4 147.0 L73903.4 141.8 L73917.5 144.7 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M59308.7 137.1 L42450.25 293 L42450.25 598.5 L42450.3 598.5 " fill="none"></path>
+						<path d="M73904.5 150.5 L73296 293 L73296 598.5 L73296.0 598.5 " fill="none"></path>
 					</g>
-					<path d="M59308.7 142.4 L59308.7 137.1 L59308.6 131.7 L59322.0 136.9 Z"></path>
-					<path d="M67853.2 149.4 L66610.25 293 L66610.25 629.5 L66610.25 629.5 L66610.25 966 L66610.25 966 L66610.25 1212.5 L66610.25 1212.5 L66610.25 1459 L66610.25 1459 L66610.25 1697.5 L66610.25 1697.5 L66610.25 1936 L66610.25 1936 L66610.25 2565 L66610.25 2565 L66610.25 3194 L66610.25 3194 L68268 3374.7749598011987 L68268.0 3374.8 " fill="none"></path>
+					<path d="M73905.7 155.7 L73904.5 150.5 L73903.3 145.3 L73917.5 147.5 Z"></path>
+					<path d="M45924.4 144.5 L43848.25 293 L43848.25 629.5 L43848.25 629.5 L43848.25 966 L43848.25 966 L43848.25 1212.5 L43848.25 1212.5 L43848.25 1459 L43848.25 1459 L43848.25 1697.5 L43848.25 1697.5 L43848.25 1936 L43848.25 1936 L43848.25 2625 L43848.25 2625 L43848.25 3314 L43848.25 3314 L62924 3499.988126200776 L62924.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67863.1 153.7 L67853.2 149.4 L67861.9 143.1 L67871.8 147.3 Z"></path>
+						<path d="M45934.1 149.2 L45924.4 144.5 L45933.3 138.5 L45943.0 143.2 Z"></path>
 					</g>
-					<path d="M22677.8 1719.7 L23048.75 1936 L23048.75 2511.5 L23048.8 2511.5 " fill="none"></path>
-					<path d="M22680.5 1715.1 L22677.8 1719.7 L22675.2 1724.3 L22666.3 1713.0 Z"></path>
-					<path d="M73792.1 656.2 L68509.25 966 L68509.25 1212.5 L68509.25 1212.5 L68509.25 1459 L68509.25 1459 L68509.25 1697.5 L68509.25 1697.5 L68509.25 1936 L68509.25 1936 L68509.25 2565 L68509.25 2565 L68509.25 3194 L68509.25 3194 L30744 3379.806275350371 L30744.0 3379.8 " fill="none"></path>
+					<path d="M22958.1 1719.7 L23329 1936 L23329 2571.5 L23329.0 2571.5 " fill="none"></path>
+					<path d="M22960.8 1715.1 L22958.1 1719.7 L22955.4 1724.3 L22946.6 1713.0 Z"></path>
+					<path d="M66781.8 647.0 L58518.75 966 L58518.75 1212.5 L58518.75 1212.5 L58518.75 1459 L58518.75 1459 L58518.75 1697.5 L58518.75 1697.5 L58518.75 1936 L58518.75 1936 L58518.75 2625 L58518.75 2625 L58518.75 3314 L58518.75 3314 L27351.75 3499.660070908394 L27351.8 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73801.7 660.9 L73792.1 656.2 L73801.1 650.3 L73810.8 655.1 Z"></path>
+						<path d="M66791.4 652.0 L66781.8 647.0 L66791.0 641.4 L66800.5 646.3 Z"></path>
 					</g>
-					<path d="M73792.1 656.8 L68651.75 966 L68651.75 1197 L68651.8 1197.0 " fill="none"></path>
+					<path d="M66782.0 681.5 L64297.25 966 L64297.25 1197 L64297.3 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73801.8 661.6 L73792.1 656.8 L73801.1 651.0 L73810.8 655.7 Z"></path>
+						<path d="M66791.8 685.8 L66782.0 681.5 L66790.6 675.2 L66800.5 679.4 Z"></path>
 					</g>
-					<path d="M73792.1 664.0 L69815.25 966 L69815.25 1174 L69815.3 1174.0 " fill="none"></path>
+					<path d="M66782.3 731.5 L65737.75 966 L65737.75 1174 L65737.8 1174.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73801.8 668.6 L73792.1 664.0 L73801.0 658.0 L73810.8 662.6 Z"></path>
+						<path d="M66792.6 734.6 L66782.3 731.5 L66790.2 724.2 L66800.5 727.4 Z"></path>
 					</g>
-					<path d="M73792.4 715.6 L72471 966 L72471 1212.5 L72471 1212.5 L72471 1459 L72471 1459 L72471 1697.5 L72471 1697.5 L72471 1936 L72471 1936 L72471 2565 L72471 2565 L72471 3194 L72471 3194 L72471 3380.5 L72471 3380.5 L72471 3567 L72471 3567 L72471 3723.5 L72471 3723.5 L72471 3880 L72471 3880 L41851.25 4012.8373384270462 L41851.3 4012.8 " fill="none"></path>
+					<path d="M67037.4 962.0 L67035 966 L67035 1212.5 L67035 1212.5 L67035 1459 L67035 1459 L67035 1697.5 L67035 1697.5 L67035 1936 L67035 1936 L67035 2625 L67035 2625 L67035 3314 L67035 3314 L67035 3500.5 L67035 3500.5 L67035 3687 L67035 3687 L67035 3843.5 L67035 3843.5 L67035 4000 L67035 4000 L59076.5 4129.634595514496 L59076.5 4129.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73802.6 719.1 L73792.4 715.6 L73800.6 708.6 L73810.8 712.1 Z"></path>
+						<path d="M67046.8 956.7 L67037.4 962.0 L67037.6 951.3 L67047.0 946.0 Z"></path>
 					</g>
-					<path d="M73793.0 775.7 L73202 966 L73202 1212.5 L73202 1212.5 L73202 1459 L73202 1459 L73202 1697.5 L73202 1697.5 L73202 1936 L73202 1936 L73202 2565 L73202 2565 L73202 3194 L73202 3194 L73202 3380.5 L73202 3380.5 L73202 3567 L73202 3567 L73202 3723.5 L73202 3723.5 L73202 3880 L73202 3880 L73202 4014 L73202 4014 L73202 4148 L73202 4148 L41674.75 4333.960296501285 L41674.8 4334.0 " fill="none"></path>
+					<path d="M67689.4 841.9 L67954 966 L67954 1212.5 L67954 1212.5 L67954 1459 L67954 1459 L67954 1697.5 L67954 1697.5 L67954 1936 L67954 1936 L67954 2625 L67954 2625 L67954 3314 L67954 3314 L67954 3500.5 L67954 3500.5 L67954 3687 L67954 3687 L67954 3843.5 L67954 3843.5 L67954 4000 L67954 4000 L67954 4134 L67954 4134 L67954 4268 L67954 4268 L64054.25 4450.2244597557155 L64054.3 4450.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73803.5 777.9 L73793.0 775.7 L73800.2 767.7 L73810.8 769.9 Z"></path>
+						<path d="M67683.2 833.1 L67689.4 841.9 L67678.7 842.8 L67672.5 834.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M68072.1 139.2 L74246.75 293 L74246.75 313 L74246.8 313.0 " fill="none"></path>
+						<path d="M46143.3 137.3 L67236.5 293 L67236.5 313 L67236.5 313.0 " fill="none"></path>
 					</g>
-					<path d="M68072.2 133.8 L68072.1 139.2 L68071.9 144.5 L68058.8 138.8 Z"></path>
-					<path d="M30761.6 3323.9 L30774 3319.5 L30781.5 3319.5 L30781.5 3319.5 L30789 3380.5 L30789 3380.5 L30781.5 3441.5 L30781.5 3441.5 L30774 3441.5 L30774 3441.5 L30744 3430.7982456140353 L30744.0 3430.8 " fill="none"></path>
+					<path d="M46143.4 132.0 L46143.3 137.3 L46143.3 142.6 L46130.0 137.2 Z"></path>
+					<path d="M27369.3 3443.9 L27381.75 3439.5 L27389.25 3439.5 L27389.25 3439.5 L27396.75 3500.5 L27396.75 3500.5 L27389.25 3561.5 L27389.25 3561.5 L27381.75 3561.5 L27381.75 3561.5 L27351.75 3550.7982456140353 L27351.8 3550.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30751.0 3322.0 L30761.6 3323.9 L30754.6 3332.1 L30744.0 3330.2 Z"></path>
+						<path d="M27358.7 3442.0 L27369.3 3443.9 L27362.3 3452.1 L27351.8 3450.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3118.2 2592.6 L3401.5 3194 L30462 3379.5332702240685 L30462.0 3379.5 " fill="none"></path>
+						<path d="M3117.2 2652.7 L3401.5 3314 L27069.75 3499.3955342986446 L27069.8 3499.4 " fill="none"></path>
 					</g>
-					<path d="M3123.1 2590.3 L3118.2 2592.6 L3113.4 2594.8 L3112.6 2580.5 Z"></path>
-					<path d="M72765.8 1319.6 L72673.75 1459 L76921.5 1690.2855145254266 L76921.5 1690.3 " fill="none"></path>
+					<path d="M3122.1 2650.6 L3117.2 2652.7 L3112.3 2654.9 L3111.9 2640.5 Z"></path>
+					<path d="M74284.7 1283.9 L73442 1459 L80804 1693.2834078324104 L80804.0 1693.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72775.4 1314.7 L72765.8 1319.6 L72766.5 1308.9 L72776.1 1304.0 Z"></path>
+						<path d="M74294.9 1287.2 L74284.7 1283.9 L74292.8 1276.8 L74303.0 1280.1 Z"></path>
 					</g>
-					<path d="M72907.2 1319.6 L72999.25 1459 L72999.25 1697.5 L72999.25 1697.5 L72999.25 1936 L72999.25 1936 L72999.25 2565 L72999.25 2565 L72999.25 3194 L72999.25 3194 L70852 3373.398420875798 L70852.0 3373.4 " fill="none"></path>
+					<path d="M74972.6 1244.0 L77318 1459 L77318 1697.5 L77318 1697.5 L77318 1936 L77318 1936 L77318 2625 L77318 2625 L77318 3314 L77318 3314 L71784.5 3497.678517397882 L71784.5 3497.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72906.5 1308.9 L72907.2 1319.6 L72897.6 1314.7 L72896.9 1304.0 Z"></path>
+						<path d="M74963.8 1237.9 L74972.6 1244.0 L74962.8 1248.5 L74954.0 1242.3 Z"></path>
 					</g>
-					<path d="M62544.0 725.9 L61929.75 966 L72511 1205.143477662915 L72511.0 1205.1 " fill="none"></path>
-					<path d="M62546.0 730.8 L62544.0 725.9 L62542.1 720.9 L62556.4 721.0 Z"></path>
+					<path d="M71892.3 725.5 L71227.75 966 L74303 1188.9064544585754 L74303.0 1188.9 " fill="none"></path>
+					<path d="M71894.1 730.6 L71892.3 725.5 L71890.5 720.5 L71904.9 721.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80562.8 174.3 L80362 293 L80362 629.5 L80362 629.5 L80362 966 L80362 966 L73162 1201.8381502890174 L73162.0 1201.8 " fill="none"></path>
+						<path d="M82528.9 172.3 L82216.75 293 L82216.75 629.5 L82216.75 629.5 L82216.75 966 L82216.75 966 L74954 1201.9263170032616 L74954.0 1201.9 " fill="none"></path>
 					</g>
-					<path d="M80565.5 178.9 L80562.8 174.3 L80560.1 169.7 L80574.3 167.5 Z"></path>
-					<path d="M34986.6 1711.6 L33468.75 1936 L27955.5 2547.584013050571 L27955.5 2547.6 " fill="none"></path>
-					<path d="M34987.3 1716.9 L34986.6 1711.6 L34985.8 1706.3 L34999.8 1709.6 Z"></path>
-					<path d="M78228.5 702.2 L78228.5 966 L76841.5 1164.7186864283638 L76841.5 1164.7 " fill="none"></path>
+					<path d="M82530.8 177.3 L82528.9 172.3 L82527.0 167.3 L82541.3 167.5 Z"></path>
+					<path d="M34466.9 1703.1 L30475.75 1936 L29503.361211901305 2571.5 L29503.4 2571.5 " fill="none"></path>
+					<path d="M34467.3 1708.4 L34466.9 1703.1 L34466.6 1697.7 L34480.3 1702.3 Z"></path>
+					<path d="M80070.8 702.2 L80070.75 966 L72549 1202.034674262436 L72549.0 1202.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M78233.8 692.8 L78228.5 702.2 L78223.2 692.8 L78228.5 683.5 Z"></path>
+						<path d="M80076.1 692.8 L80070.8 702.2 L80065.4 692.8 L80070.8 683.5 Z"></path>
 					</g>
-					<path d="M78840.2 160.2 L78228.5 293 L78228.5 575.5 L78228.5 575.5 " fill="none"></path>
-					<path d="M78841.4 165.4 L78840.2 160.2 L78839.1 155.0 L78853.3 157.3 Z"></path>
-					<path d="M65131.0 235.3 L64995.25 293 L64995.25 614 L64995.3 614.0 " fill="none"></path>
+					<path d="M80996.6 153.0 L80070.75 293 L80070.75 575.5 L80070.8 575.5 " fill="none"></path>
+					<path d="M80997.4 158.3 L80996.6 153.0 L80995.8 147.7 L81009.8 151.0 Z"></path>
+					<path d="M77319.1 205.5 L76936.75 293 L76936.75 614 L76936.8 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65141.7 236.6 L65131.0 235.3 L65137.5 226.7 L65148.2 228.0 Z"></path>
+						<path d="M77329.3 208.6 L77319.1 205.5 L77327.0 198.2 L77337.3 201.3 Z"></path>
 					</g>
-					<path d="M65358.4 246.6 L65356.25 293 L65356.25 614 L65356.3 614.0 " fill="none"></path>
+					<path d="M77414.9 236.1 L77297.75 293 L77297.75 614 L77297.8 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65364.2 237.6 L65358.4 246.6 L65353.5 237.1 L65359.3 228.0 Z"></path>
+						<path d="M77425.6 236.9 L77414.9 236.1 L77421.0 227.3 L77431.7 228.0 Z"></path>
 					</g>
-					<path d="M65596.0 235.3 L65731.75 293 L65731.75 614 L65731.8 614.0 " fill="none"></path>
+					<path d="M77657.2 245.7 L77673.25 293 L77673.25 614 L77673.3 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65589.5 226.7 L65596.0 235.3 L65585.3 236.6 L65578.8 228.0 Z"></path>
+						<path d="M77659.3 235.1 L77657.2 245.7 L77649.2 238.6 L77651.2 228.0 Z"></path>
 					</g>
-					<path d="M65664.6 210.4 L66001.25 293 L66001.25 614 L66001.3 614.0 " fill="none"></path>
+					<path d="M77825.6 236.1 L77942.75 293 L77942.75 614 L77942.8 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65656.8 203.0 L65664.6 210.4 L65654.3 213.4 L65646.5 205.9 Z"></path>
+						<path d="M77819.5 227.3 L77825.6 236.1 L77814.9 236.9 L77808.8 228.0 Z"></path>
 					</g>
-					<path d="M76369.7 1417.0 L76341.25 1459 L76341.25 1697.5 L76341.25 1697.5 L76341.25 1936 L76341.25 1936 L76341.25 2565 L76341.25 2565 L76341.25 3194 L76341.25 3194 L67892.5 3379.8291564702067 L67892.5 3379.8 " fill="none"></path>
+					<path d="M72061.0 1416.4 L72028.75 1459 L72028.75 1697.5 L72028.75 1697.5 L72028.75 1936 L72028.75 1936 L72028.75 2625 L72028.75 2625 L72028.75 3314 L72028.75 3314 L63699.5 3499.8195669726965 L63699.5 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M76379.3 1412.2 L76369.7 1417.0 L76370.5 1406.2 L76380.1 1401.5 Z"></path>
+						<path d="M72070.9 1412.2 L72061.0 1416.4 L72062.4 1405.7 L72072.3 1401.5 Z"></path>
 					</g>
-					<path d="M76491.2 1420.1 L76488 1459 L76980.4318658281 1666.5 L76980.4 1666.5 " fill="none"></path>
+					<path d="M72093.4 1417.5 L72068.75 1459 L80804 1693.936384652251 L80804.0 1693.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M76497.2 1411.2 L76491.2 1420.1 L76486.6 1410.4 L76492.7 1401.5 Z"></path>
+						<path d="M72102.8 1412.2 L72093.4 1417.5 L72093.6 1406.8 L72103.0 1401.5 Z"></path>
 					</g>
-					<path d="M76630.1 1417.5 L76654.75 1459 L76654.75 1697.5 L76654.75 1697.5 L76654.75 1936 L76654.75 1936 L76654.75 2565 L76654.75 2565 L76654.75 3194 L76654.75 3194 L65014 3379.599168608006 L65014.0 3379.6 " fill="none"></path>
+					<path d="M72567.2 1295.9 L73255.25 1459 L73255.25 1697.5 L73255.25 1697.5 L73255.25 1936 L73255.25 1936 L73255.25 2625 L73255.25 2625 L73255.25 3314 L73255.25 3314 L59344.75 3499.745560965132 L59344.8 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M76629.9 1406.8 L76630.1 1417.5 L76620.7 1412.2 L76620.5 1401.5 Z"></path>
+						<path d="M72559.3 1288.5 L72567.2 1295.9 L72556.9 1298.9 L72549.0 1291.6 Z"></path>
 					</g>
-					<path d="M76662.5 1416.4 L76694.75 1459 L76694.75 1697.5 L76694.75 1697.5 L76694.75 1936 L76694.75 1936 L76694.75 2565 L76694.75 2565 L76694.75 3194 L76694.75 3194 L68373 3379.330790817088 L68373.0 3379.3 " fill="none"></path>
+					<path d="M72567.3 1285.6 L73402 1459 L73402 1697.5 L73402 1697.5 L73402 1936 L73402 1936 L73402 2625 L73402 2625 L73402 3314 L73402 3314 L63029 3499.560836410724 L63029.0 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M76661.1 1405.7 L76662.5 1416.4 L76652.6 1412.2 L76651.2 1401.5 Z"></path>
+						<path d="M72559.2 1278.5 L72567.3 1285.6 L72557.1 1288.9 L72549.0 1281.8 Z"></path>
 					</g>
-					<path d="M74021.7 957.0 L74015.5 966 L76174.5 1179.5179538615848 L76174.5 1179.5 " fill="none"></path>
-					<path d="M74026.1 960.0 L74021.7 957.0 L74017.3 954.0 L74029.2 946.0 Z"></path>
-					<path d="M34986.6 1713.2 L33635 1936 L28186.5 2554.164953102453 L28186.5 2554.2 " fill="none"></path>
-					<path d="M34987.5 1718.4 L34986.6 1713.2 L34985.7 1707.9 L34999.8 1711.0 Z"></path>
-					<path d="M34987.1 1728.2 L34346.25 1936 L29541.5 2556.222205120312 L29541.5 2556.2 " fill="none"></path>
-					<path d="M34988.7 1733.3 L34987.1 1728.2 L34985.4 1723.1 L34999.8 1724.1 Z"></path>
-					<path d="M35176.8 1717.3 L36224 1936 L32584.75 2546.2201266244583 L32584.8 2546.2 " fill="none"></path>
-					<path d="M35177.9 1712.1 L35176.8 1717.3 L35175.7 1722.6 L35163.8 1714.6 Z"></path>
-					<path d="M18248.5 3803.7 L18248.5 3880 L17959.324626865673 3998.5 L17959.3 3998.5 " fill="none"></path>
+					<path d="M67684.9 805.5 L68093.75 966 L71882 1192.5551343482744 L71882.0 1192.6 " fill="none"></path>
+					<path d="M67686.9 800.6 L67684.9 805.5 L67683.0 810.5 L67672.5 800.6 Z"></path>
+					<path d="M34466.9 1703.5 L30768.25 1936 L29761.433599419448 2594 L29761.4 2594.0 " fill="none"></path>
+					<path d="M34467.3 1708.8 L34466.9 1703.5 L34466.6 1698.2 L34480.3 1702.7 Z"></path>
+					<path d="M34467.0 1706.9 L32150.75 1936 L31167.331277213354 2594 L31167.3 2594.0 " fill="none"></path>
+					<path d="M34467.5 1712.2 L34467.0 1706.9 L34466.5 1701.6 L34480.3 1705.6 Z"></path>
+					<path d="M34657.4 1714.4 L35907.25 1936 L34095.60123367199 2594 L34095.6 2594.0 " fill="none"></path>
+					<path d="M34658.3 1709.1 L34657.4 1714.4 L34656.4 1719.6 L34644.3 1712.0 Z"></path>
+					<path d="M18676.3 3923.7 L18676.25 4000 L18387.074626865673 4118.5 L18387.1 4118.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18253.8 3794.3 L18248.5 3803.7 L18243.2 3794.3 L18248.5 3785.0 Z"></path>
+						<path d="M18681.6 3914.3 L18676.3 3923.7 L18670.9 3914.3 L18676.3 3905.0 Z"></path>
 					</g>
-					<path d="M31778.7 1214.1 L18248.5 1459 L18248.5 1697.5 L18248.5 1697.5 L18248.5 1936 L18248.5 1936 L18248.5 2565 L18248.5 2565 L18248.5 3194 L18248.5 3194 L18248.5 3380.5 L18248.5 3380.5 L18248.5 3567 L18248.5 3567 L18248.5 3662 L18248.5 3662.0 " fill="none"></path>
-					<path d="M31778.8 1219.4 L31778.7 1214.1 L31778.6 1208.8 L31792.0 1213.9 Z"></path>
-					<path d="M34118.1 2622.0 L34041.5 3194 L44079.25 3379.44692785854 L44079.3 3379.4 " fill="none"></path>
+					<path d="M30145.4 1214.4 L18676.25 1459 L18676.25 1697.5 L18676.25 1697.5 L18676.25 1936 L18676.25 1936 L18676.25 2625 L18676.25 2625 L18676.25 3314 L18676.25 3314 L18676.25 3500.5 L18676.25 3500.5 L18676.25 3687 L18676.25 3687 L18676.25 3782 L18676.3 3782.0 " fill="none"></path>
+					<path d="M30145.5 1219.7 L30145.4 1214.4 L30145.3 1209.1 L30158.8 1214.1 Z"></path>
+					<path d="M35861.1 2681.9 L35753.5 3314 L37786.25 3495.4130278741477 L37786.3 3495.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34124.6 2613.5 L34118.1 2622.0 L34114.1 2612.0 L34120.6 2603.5 Z"></path>
+						<path d="M35867.9 2673.6 L35861.1 2681.9 L35857.4 2671.8 L35864.2 2663.5 Z"></path>
 					</g>
-					<path d="M34135.8 2621.9 L34237.25 3194 L42606.25 3379.2713514155143 L42606.3 3379.3 " fill="none"></path>
+					<path d="M35864.4 2682.1 L35793.5 3314 L35855.16085790885 3485 L35855.2 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34139.5 2611.8 L34135.8 2621.9 L34129.0 2613.6 L34132.6 2603.5 Z"></path>
+						<path d="M35870.7 2673.4 L35864.4 2682.1 L35860.1 2672.2 L35866.4 2663.5 Z"></path>
 					</g>
-					<path d="M34411.9 2659.9 L34317.25 3194 L44079.25 3379.4173541093796 L44079.3 3379.4 " fill="none"></path>
+					<path d="M36182.4 2719.0 L35965 3314 L37786.25 3494.840210302143 L37786.3 3494.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34418.8 2651.6 L34411.9 2659.9 L34408.3 2649.8 L34415.2 2641.5 Z"></path>
+						<path d="M36190.6 2712.1 L36182.4 2719.0 L36180.6 2708.4 L36188.8 2701.5 Z"></path>
 					</g>
-					<path d="M34446.2 2659.9 L34544.5 3194 L42606.25 3379.2248452369954 L42606.3 3379.2 " fill="none"></path>
+					<path d="M36206.1 2720.1 L36139.5 3314 L35883.91689008043 3485 L35883.9 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34449.8 2649.7 L34446.2 2659.9 L34439.3 2651.6 L34442.8 2641.5 Z"></path>
+						<path d="M36212.4 2711.4 L36206.1 2720.1 L36201.8 2710.2 L36208.2 2701.5 Z"></path>
 					</g>
-					<path d="M34452.2 2659.6 L34584.5 3194 L26291.75 3377.3167837141077 L26291.8 3377.3 " fill="none"></path>
+					<path d="M36224.8 2720.1 L36275.25 3314 L26979.75 3497.6549340537103 L26979.8 3497.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34455.1 2649.3 L34452.2 2659.6 L34444.8 2651.8 L34447.7 2641.5 Z"></path>
+						<path d="M36229.3 2710.3 L36224.8 2720.1 L36218.7 2711.3 L36223.2 2701.5 Z"></path>
 					</g>
-					<path d="M34713.1 2712.4 L34624.5 3194 L42906.25 3378.8040890191737 L42906.3 3378.8 " fill="none"></path>
+					<path d="M36524.3 2771.9 L36361 3314 L36108.25 3457.3851711026614 L36108.3 3457.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34720.1 2704.1 L34713.1 2712.4 L34709.6 2702.2 L34716.5 2694.0 Z"></path>
+						<path d="M36532.1 2764.5 L36524.3 2771.9 L36521.9 2761.4 L36529.7 2754.0 Z"></path>
 					</g>
-					<path d="M34739.4 2712.7 L34736.75 3194 L21335.5 3380.0072655217964 L21335.5 3380.0 " fill="none"></path>
+					<path d="M36532.7 2772.1 L36401 3314 L21936.75 3500.043388679115 L21936.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34744.8 2703.4 L34739.4 2712.7 L34734.1 2703.3 L34739.5 2694.0 Z"></path>
+						<path d="M36540.1 2764.3 L36532.7 2772.1 L36529.8 2761.8 L36537.1 2754.0 Z"></path>
 					</g>
-					<path d="M43517.8 3498.2 L43517.75 3567 L43517.75 3708 L43517.8 3708.0 " fill="none"></path>
+					<path d="M36870.8 3618.2 L36870.75 3687 L36870.75 3828 L36870.8 3828.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43523.1 3488.8 L43517.8 3498.2 L43512.4 3488.8 L43517.8 3479.5 Z"></path>
+						<path d="M36876.1 3608.8 L36870.8 3618.2 L36865.4 3608.8 L36870.8 3599.5 Z"></path>
 					</g>
-					<path d="M34765.6 2707.1 L34852.5 3194 L43381.25 3377.562144773665 L43381.3 3377.6 " fill="none"></path>
-					<path d="M34770.9 2706.2 L34765.6 2707.1 L34760.4 2708.1 L34763.3 2694.0 Z"></path>
-					<path d="M34774.6 2707.0 L34892.5 3194 L43694.25 3378.498173592964 L43694.3 3378.5 " fill="none"></path>
-					<path d="M34779.8 2705.7 L34774.6 2707.0 L34769.4 2708.2 L34771.5 2694.0 Z"></path>
-					<path d="M61892.4 2693.2 L61465.25 3194 L63303.25 3362.404323262098 L63303.3 3362.4 " fill="none"></path>
+					<path d="M36567.4 2767.3 L36563.25 3314 L36734.25 3417.712195121951 L36734.3 3417.7 " fill="none"></path>
+					<path d="M36572.7 2767.4 L36567.4 2767.3 L36562.1 2767.3 L36567.5 2754.0 Z"></path>
+					<path d="M36575.7 2767.3 L36603.25 3314 L37047.25 3467.48656163114 L37047.3 3467.5 " fill="none"></path>
+					<path d="M36581.0 2767.0 L36575.7 2767.3 L36570.4 2767.6 L36575.0 2754.0 Z"></path>
+					<path d="M71208.1 2756.0 L70953.75 3314 L60983 3496.8775723452904 L60983.0 3496.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M61902.5 2689.6 L61892.4 2693.2 L61894.4 2682.6 L61904.5 2679.0 Z"></path>
+						<path d="M71216.8 2749.7 L71208.1 2756.0 L71207.1 2745.3 L71215.8 2739.0 Z"></path>
 					</g>
-					<path d="M62075.7 2695.2 L62358.75 3194 L70682 3378.614649302768 L70682.0 3378.6 " fill="none"></path>
+					<path d="M71295.3 2757.3 L71411 3314 L71675.52278820376 3485 L71675.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62075.7 2684.5 L62075.7 2695.2 L62066.4 2689.7 L62066.5 2679.0 Z"></path>
+						<path d="M71298.6 2747.1 L71295.3 2757.3 L71288.1 2749.2 L71291.5 2739.0 Z"></path>
 					</g>
-					<path d="M62563.8 726.2 L62001.75 966 L62001.75 1212.5 L62001.75 1212.5 L62001.75 1459 L62001.75 1459 L62001.75 1697.5 L62001.75 1697.5 L62001.75 1936 L62001.75 1936 L62001.75 2451 L62001.8 2451.0 " fill="none"></path>
-					<path d="M62565.9 731.1 L62563.8 726.2 L62561.7 721.3 L62576.0 721.0 Z"></path>
-					<path d="M31778.7 1214.7 L21826.25 1459 L34999.75 1696.0246124250311 L34999.8 1696.0 " fill="none"></path>
-					<path d="M31778.8 1220.0 L31778.7 1214.7 L31778.5 1209.4 L31792.0 1214.4 Z"></path>
+					<path d="M71903.3 725.7 L71267.75 966 L71267.75 1212.5 L71267.75 1212.5 L71267.75 1459 L71267.75 1459 L71267.75 1697.5 L71267.75 1697.5 L71267.75 1936 L71267.75 1936 L71267.75 2511 L71267.8 2511.0 " fill="none"></path>
+					<path d="M71905.2 730.7 L71903.3 725.7 L71901.4 720.7 L71915.7 721.0 Z"></path>
+					<path d="M30145.4 1215.3 L22388.5 1459 L34480.25 1695.8935106273746 L34480.3 1695.9 " fill="none"></path>
+					<path d="M30145.6 1220.6 L30145.4 1215.3 L30145.3 1210.0 L30158.8 1214.9 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M13527.0 1256.8 L13527 1459 L34999.75 1696.5926825873648 L34999.8 1696.6 " fill="none"></path>
+						<path d="M13167.5 1256.8 L13167.5 1459 L34480.25 1696.5858972411456 L34480.3 1696.6 " fill="none"></path>
 					</g>
-					<path d="M13532.3 1256.8 L13527.0 1256.8 L13521.7 1256.8 L13527.0 1243.5 Z"></path>
-					<path d="M36282.9 2652.3 L36181.25 3194 L44079.25 3379.1636706473914 L44079.3 3379.2 " fill="none"></path>
+					<path d="M13172.8 1256.8 L13167.5 1256.8 L13162.2 1256.8 L13167.5 1243.5 Z"></path>
+					<path d="M37903.5 2712.6 L37843.25 3314 L37843.25 3485 L37843.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36289.8 2644.2 L36282.9 2652.3 L36279.3 2642.2 L36286.3 2634.0 Z"></path>
+						<path d="M37909.7 2703.8 L37903.5 2712.6 L37899.1 2702.8 L37905.3 2694.0 Z"></path>
 					</g>
-					<path d="M36318.6 2652.2 L36438.75 3194 L26291.75 3377.8903410747257 L26291.8 3377.9 " fill="none"></path>
+					<path d="M37915.0 2712.7 L37934.25 3314 L26979.75 3498.0802135423705 L26979.8 3498.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36321.8 2642.0 L36318.6 2652.2 L36311.4 2644.3 L36314.6 2634.0 Z"></path>
+						<path d="M37920.1 2703.2 L37915.0 2712.7 L37909.4 2703.5 L37914.5 2694.0 Z"></path>
 					</g>
-					<path d="M63081.4 717.7 L63899.75 966 L63899.75 1212.5 L63899.75 1212.5 L63899.75 1459 L63899.75 1459 L63899.75 1697.5 L63899.75 1697.5 L63899.75 1936 L63899.75 1936 L63899.75 2565 L63899.75 2565 L63899.75 3194 L63899.75 3194 L74947.5 3378.4051976819637 L74947.5 3378.4 " fill="none"></path>
+					<path d="M71988.5 730.6 L71594.25 966 L71594.25 1212.5 L71594.25 1212.5 L71594.25 1459 L71594.25 1459 L71594.25 1697.5 L71594.25 1697.5 L71594.25 1936 L71594.25 1936 L71594.25 2625 L71594.25 2625 L71594.25 3314 L71594.25 3314 L71478.9845844504 3462 L71479.0 3462.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63074.0 709.9 L63081.4 717.7 L63070.9 720.1 L63063.5 712.3 Z"></path>
+						<path d="M71999.2 730.4 L71988.5 730.6 L71993.8 721.2 L72004.5 721.0 Z"></path>
 					</g>
-					<path d="M63081.4 714.7 L63939.75 966 L63939.75 1212.5 L63939.75 1212.5 L63939.75 1459 L63939.75 1459 L63939.75 1697.5 L63939.75 1697.5 L63939.75 1936 L63939.75 1936 L63939.75 2565 L63939.75 2565 L63939.75 3194 L63939.75 3194 L67699.5 3378.245779412731 L67699.5 3378.2 " fill="none"></path>
+					<path d="M71999.7 731.1 L71634.25 966 L71634.25 1212.5 L71634.25 1212.5 L71634.25 1459 L71634.25 1459 L71634.25 1697.5 L71634.25 1697.5 L71634.25 1936 L71634.25 1936 L71634.25 2625 L71634.25 2625 L71634.25 3314 L71634.25 3314 L63161 3499.4929864718138 L63161.0 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63074.0 706.9 L63081.4 714.7 L63071.0 717.2 L63063.5 709.4 Z"></path>
+						<path d="M72010.4 730.5 L71999.7 731.1 L72004.7 721.6 L72015.4 721.0 Z"></path>
 					</g>
-					<path d="M63081.5 711.8 L63979.75 966 L63979.75 1212.5 L63979.75 1212.5 L63979.75 1459 L63979.75 1459 L63979.75 1697.5 L63979.75 1697.5 L63979.75 1936 L63979.75 1936 L63979.75 2565 L63979.75 2565 L63979.75 3194 L63979.75 3194 L70682 3378.164370695053 L70682.0 3378.2 " fill="none"></path>
+					<path d="M72035.2 733.0 L71759.5 966 L71759.5 1212.5 L71759.5 1212.5 L71759.5 1459 L71759.5 1459 L71759.5 1697.5 L71759.5 1697.5 L71759.5 1936 L71759.5 1936 L71759.5 2625 L71759.5 2625 L71759.5 3314 L71759.5 3314 L71704.48659517427 3485 L71704.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63073.9 704.2 L63081.5 711.8 L63071.0 714.4 L63063.5 706.7 Z"></path>
+						<path d="M72045.8 731.1 L72035.2 733.0 L72038.9 722.9 L72049.5 721.0 Z"></path>
 					</g>
-					<path d="M54132.0 1277.2 L54132 1459 L54132 1666.5 L54132.0 1666.5 " fill="none"></path>
+					<path d="M60015.8 1277.2 L60015.75 1459 L60015.75 1666.5 L60015.8 1666.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54137.3 1267.8 L54132.0 1277.2 L54126.7 1267.8 L54132.0 1258.5 Z"></path>
+						<path d="M60021.1 1267.8 L60015.8 1277.2 L60010.4 1267.8 L60015.8 1258.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M34138.1 2616.5 L34277.25 3194 L43098.25 3377.966060944926 L43098.3 3378.0 " fill="none"></path>
+						<path d="M35874.8 2676.8 L35925 3314 L36388.75 3461.781930798804 L36388.8 3461.8 " fill="none"></path>
 					</g>
-					<path d="M34143.3 2615.2 L34138.1 2616.5 L34133.0 2617.7 L34135.0 2603.5 Z"></path>
+					<path d="M35880.1 2676.4 L35874.8 2676.8 L35869.5 2677.2 L35873.8 2663.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M36023.3 2646.8 L36023.25 3194 L43098.25 3377.351281873133 L43098.3 3377.4 " fill="none"></path>
+						<path d="M37147.0 2706.8 L37147 3314 L36631.75 3464.9134275618376 L36631.8 3464.9 " fill="none"></path>
 					</g>
-					<path d="M36028.6 2646.8 L36023.3 2646.8 L36017.9 2646.8 L36023.3 2633.5 Z"></path>
-					<path d="M56787.5 1321.6 L56556.25 1459 L56556.25 1644 L56556.3 1644.0 " fill="none"></path>
+					<path d="M37152.3 2706.8 L37147.0 2706.8 L37141.7 2706.8 L37147.0 2693.5 Z"></path>
+					<path d="M62140.9 1267.9 L61500.75 1459 L61500.75 1644 L61500.8 1644.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56798.2 1321.4 L56787.5 1321.6 L56792.8 1312.2 L56803.5 1312.1 Z"></path>
+						<path d="M62151.3 1270.3 L62140.9 1267.9 L62148.3 1260.1 L62158.8 1262.5 Z"></path>
 					</g>
-					<path d="M56906.2 1350.4 L56855.25 1459 L35163.75 1696.6017980572715 L35163.8 1696.6 " fill="none"></path>
+					<path d="M62249.1 1349.8 L62187.75 1459 L34644.25 1696.7920671119075 L34644.3 1696.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56915.0 1344.2 L56906.2 1350.4 L56905.4 1339.7 L56914.2 1333.5 Z"></path>
+						<path d="M62258.3 1344.2 L62249.1 1349.8 L62249.0 1339.0 L62258.3 1333.5 Z"></path>
 					</g>
-					<path d="M57061.4 1349.1 L57134.25 1459 L57134.25 1697.5 L57134.25 1697.5 L57134.25 1936 L57134.25 1936 L57134.25 2565 L57134.25 2565 L57134.25 3194 L57134.25 3194 L21335.5 3380.3152396101495 L21335.5 3380.3 " fill="none"></path>
+					<path d="M62510.7 1299.0 L62852 1459 L62852 1697.5 L62852 1697.5 L62852 1936 L62852 1936 L62852 2625 L62852 2625 L62852 3314 L62852 3314 L21936.75 3500.3383240844187 L21936.8 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57060.7 1338.3 L57061.4 1349.1 L57051.8 1344.2 L57051.1 1333.5 Z"></path>
+						<path d="M62504.5 1290.2 L62510.7 1299.0 L62499.9 1299.8 L62493.8 1291.0 Z"></path>
 					</g>
-					<path d="M57157.1 1227.5 L60032.75 1459 L60032.75 1697.5 L60032.75 1697.5 L60032.75 1936 L60032.75 1936 L60032.75 2565 L60032.75 2565 L60032.75 3194 L60032.75 3194 L24576.75 3379.3863018307215 L24576.8 3379.4 " fill="none"></path>
+					<path d="M62510.9 1292.9 L62892 1459 L62892 1697.5 L62892 1697.5 L62892 1936 L62892 1936 L62892 2625 L62892 2625 L62892 3314 L62892 3314 L29568.25 3499.315493451214 L29568.3 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57148.2 1221.4 L57157.1 1227.5 L57147.4 1232.1 L57138.5 1226.0 Z"></path>
+						<path d="M62504.4 1284.3 L62510.9 1292.9 L62500.2 1294.1 L62493.8 1285.5 Z"></path>
 					</g>
-					<path d="M36590.6 2689.7 L36478.75 3194 L21733 3380.1339362764174 L21733.0 3380.1 " fill="none"></path>
+					<path d="M38185.0 2749.0 L37974.25 3314 L22146 3500.1589257279793 L22146.0 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36597.8 2681.8 L36590.6 2689.7 L36587.4 2679.5 L36594.6 2671.5 Z"></path>
+						<path d="M38193.3 2742.1 L38185.0 2749.0 L38183.3 2738.4 L38191.5 2731.5 Z"></path>
 					</g>
-					<path d="M36649.2 2689.6 L36774.25 3194 L21335.5 3380.0721440457532 L21335.5 3380.1 " fill="none"></path>
+					<path d="M38265.8 2749.5 L38422.25 3314 L21936.75 3500.0992524665576 L21936.8 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36652.1 2679.3 L36649.2 2689.6 L36641.7 2681.8 L36644.7 2671.5 Z"></path>
+						<path d="M38268.4 2739.1 L38265.8 2749.5 L38258.1 2741.9 L38260.8 2731.5 Z"></path>
 					</g>
-					<path d="M35176.9 1715.1 L36370 1936 L32824.75 2547.7446677182634 L32824.8 2547.7 " fill="none"></path>
-					<path d="M35177.8 1709.9 L35176.9 1715.1 L35175.9 1720.4 L35163.8 1712.7 Z"></path>
-					<path d="M74624.9 2711.5 L74446 3194 L42866.25 3380.178694769119 L42866.3 3380.2 " fill="none"></path>
+					<path d="M34657.4 1711.7 L36159.25 1936 L34362.25 2588.6794939377965 L34362.3 2588.7 " fill="none"></path>
+					<path d="M34658.2 1706.4 L34657.4 1711.7 L34656.6 1717.0 L34644.3 1709.7 Z"></path>
+					<path d="M68203.6 2772.3 L68093.75 3314 L35765.25 3500.1861238921656 L35765.3 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M74633.2 2704.6 L74624.9 2711.5 L74623.2 2700.9 L74631.4 2694.0 Z"></path>
+						<path d="M68210.7 2764.2 L68203.6 2772.3 L68200.3 2762.1 L68207.3 2754.0 Z"></path>
 					</g>
-					<path d="M74665.3 2712.6 L74620 3194 L74979.4852546917 3342 L74979.5 3342.0 " fill="none"></path>
+					<path d="M68212.1 2772.5 L68133.75 3314 L71323.5 3493.439974360908 L71323.5 3493.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M74671.5 2703.8 L74665.3 2712.6 L74660.9 2702.8 L74667.1 2694.0 Z"></path>
+						<path d="M68218.8 2764.0 L68212.1 2772.5 L68208.2 2762.5 L68214.8 2754.0 Z"></path>
 					</g>
-					<path d="M74719.9 2712.0 L74853.25 3194 L65014 3379.4351741909404 L65014.0 3379.4 " fill="none"></path>
+					<path d="M68237.8 2772.7 L68253.5 3314 L59344.75 3499.324656311871 L59344.8 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M74722.6 2701.6 L74719.9 2712.0 L74712.3 2704.4 L74714.9 2694.0 Z"></path>
+						<path d="M68242.8 2763.2 L68237.8 2772.7 L68232.2 2763.5 L68237.2 2754.0 Z"></path>
 					</g>
-					<path d="M74729.2 2711.7 L74893.25 3194 L68373 3379.0103267277777 L68373.0 3379.0 " fill="none"></path>
+					<path d="M68259.1 2772.4 L68353.25 3314 L63029 3498.6789649881434 L63029.0 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M74731.2 2701.1 L74729.2 2711.7 L74721.1 2704.6 L74723.1 2694.0 Z"></path>
+						<path d="M68262.8 2762.3 L68259.1 2772.4 L68252.3 2764.1 L68255.9 2754.0 Z"></path>
 					</g>
-					<path d="M74664.1 954.2 L74679.25 966 L74679.25 1212.5 L74679.25 1212.5 L74679.25 1459 L74679.25 1459 L74679.25 1697.5 L74679.25 1697.5 L74679.25 1936 L74679.25 1936 L74679.25 2436 L74679.3 2436.0 " fill="none"></path>
-					<path d="M74667.3 950.0 L74664.1 954.2 L74660.8 958.4 L74653.5 946.0 Z"></path>
-					<path d="M35176.9 1713.5 L36503.75 1936 L33039.75 2549.5030268900464 L33039.8 2549.5 " fill="none"></path>
-					<path d="M35177.8 1708.2 L35176.9 1713.5 L35176.0 1718.7 L35163.8 1711.3 Z"></path>
-					<path d="M64340.3 3780.7 L64340.25 3880 L75100.5 4012.1879856065643 L75100.5 4012.2 " fill="none"></path>
+					<path d="M67685.1 780.9 L68233.5 966 L68233.5 1212.5 L68233.5 1212.5 L68233.5 1459 L68233.5 1459 L68233.5 1697.5 L68233.5 1697.5 L68233.5 1936 L68233.5 1936 L68233.5 2496 L68233.5 2496.0 " fill="none"></path>
+					<path d="M67686.8 775.9 L67685.1 780.9 L67683.4 786.0 L67672.5 776.7 Z"></path>
+					<path d="M34657.5 1709.9 L36386.75 1936 L34575.10123367199 2594 L34575.1 2594.0 " fill="none"></path>
+					<path d="M34658.2 1704.7 L34657.5 1709.9 L34656.8 1715.2 L34644.3 1708.2 Z"></path>
+					<path d="M70517.3 3900.7 L70517.25 4000 L71281.25 4112.315962698848 L71281.3 4112.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64345.6 3771.3 L64340.3 3780.7 L64334.9 3771.3 L64340.3 3762.0 Z"></path>
+						<path d="M70522.6 3891.3 L70517.3 3900.7 L70511.9 3891.3 L70517.3 3882.0 Z"></path>
 					</g>
-					<path d="M63076.5 691.6 L64340.25 966 L64340.25 1212.5 L64340.25 1212.5 L64340.25 1459 L64340.25 1459 L64340.25 1697.5 L64340.25 1697.5 L64340.25 1936 L64340.25 1936 L64340.25 2565 L64340.25 2565 L64340.25 3194 L64340.25 3194 L64340.25 3380.5 L64340.25 3380.5 L64340.25 3567 L64340.25 3567 L64340.25 3685 L64340.3 3685.0 " fill="none"></path>
-					<path d="M63077.7 686.4 L63076.5 691.6 L63075.4 696.8 L63063.5 688.8 Z"></path>
-					<path d="M60207.7 1328.4 L60146.25 1459 L60146.25 1682 L60146.3 1682.0 " fill="none"></path>
+					<path d="M72062.8 730.7 L71842 966 L71842 1212.5 L71842 1212.5 L71842 1459 L71842 1459 L71842 1697.5 L71842 1697.5 L71842 1936 L71842 1936 L71842 2625 L71842 2625 L71842 3314 L71842 3314 L71842 3500.5 L71842 3500.5 L71842 3687 L71842 3687 L70658.25 3826.8428948858277 L70658.3 3826.8 " fill="none"></path>
+					<path d="M72066.7 734.4 L72062.8 730.7 L72058.9 727.1 L72071.9 721.0 Z"></path>
+					<path d="M63449.9 1299.0 L63005.5 1459 L63005.5 1682 L63005.5 1682.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60216.5 1322.2 L60207.7 1328.4 L60206.9 1317.7 L60215.7 1311.5 Z"></path>
+						<path d="M63460.5 1300.8 L63449.9 1299.0 L63456.9 1290.8 L63467.5 1292.6 Z"></path>
 					</g>
-					<path d="M60378.0 1324.5 L60517 1459 L60517 1697.5 L60517 1697.5 L60517 1936 L60517 1936 L60517 2565 L60517 2565 L60517 3194 L60517 3194 L27524 3380.254430705432 L27524.0 3380.3 " fill="none"></path>
+					<path d="M63450.4 1316.0 L63119 1459 L63119 1697.5 L63119 1697.5 L63119 1936 L63119 1936 L63119 2625 L63119 2625 L63119 3314 L63119 3314 L28048.75 3500.268958029262 L28048.8 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60375.0 1314.2 L60378.0 1324.5 L60367.6 1321.8 L60364.6 1311.5 Z"></path>
+						<path d="M63461.0 1317.1 L63450.4 1316.0 L63456.8 1307.4 L63467.5 1308.6 Z"></path>
 					</g>
-					<path d="M60427.7 1321.8 L60635.5 1459 L60635.5 1682 L60635.5 1682.0 " fill="none"></path>
+					<path d="M63509.0 1321.1 L63279.25 1459 L63279.25 1682 L63279.3 1682.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60422.9 1312.2 L60427.7 1321.8 L60417.0 1321.1 L60412.2 1311.5 Z"></path>
+						<path d="M63519.8 1320.9 L63509.0 1321.1 L63514.3 1311.7 L63525.0 1311.5 Z"></path>
 					</g>
-					<path d="M60502.2 1302.2 L60922 1459 L60922 1682 L60922.0 1682.0 " fill="none"></path>
+					<path d="M63631.7 1328.2 L63565.75 1459 L63565.75 1682 L63565.8 1682.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60495.4 1293.9 L60502.2 1302.2 L60491.6 1303.9 L60484.8 1295.6 Z"></path>
+						<path d="M63640.7 1322.2 L63631.7 1328.2 L63631.1 1317.4 L63640.1 1311.5 Z"></path>
 					</g>
-					<path d="M61166.7 1762.0 L60909.5 1936 L37118.75 2561.098186033397 L37118.8 2561.1 " fill="none"></path>
+					<path d="M63884.9 1760.2 L63553.25 1936 L44484.75 2619.675729822553 L44484.8 2619.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M61177.4 1761.1 L61166.7 1762.0 L61171.5 1752.3 L61182.2 1751.5 Z"></path>
+						<path d="M63895.6 1760.6 L63884.9 1760.2 L63890.6 1751.2 L63901.4 1751.5 Z"></path>
 					</g>
-					<path d="M61268.1 1770.1 L61282 1936 L61282 2565 L61282 2565 L61282 3194 L61282 3194 L61282 3380.5 L61282 3380.5 L61282 3567 L61282 3567 L61282 3723.5 L61282 3723.5 L61282 3880 L61282 3880 L17993.5 4013.777493340713 L17993.5 4013.8 " fill="none"></path>
+					<path d="M64020.1 1769.7 L64059 1936 L64059 2625 L64059 2625 L64059 3314 L64059 3314 L64059 3500.5 L64059 3500.5 L64059 3687 L64059 3687 L64059 3843.5 L64059 3843.5 L64059 4000 L64059 4000 L18421.25 4133.788929057805 L18421.3 4133.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M61272.6 1760.4 L61268.1 1770.1 L61262.0 1761.2 L61266.5 1751.5 Z"></path>
+						<path d="M64023.2 1759.4 L64020.1 1769.7 L64012.8 1761.8 L64015.9 1751.5 Z"></path>
 					</g>
-					<path d="M60497.7 1270.6 L61262 1459 L61262 1643.5 L61262.0 1643.5 " fill="none"></path>
-					<path d="M60499.0 1265.4 L60497.7 1270.6 L60496.4 1275.7 L60484.8 1267.4 Z"></path>
-					<path d="M35176.9 1712.1 L36632.5 1936 L33259.75 2548.651721897336 L33259.8 2548.7 " fill="none"></path>
-					<path d="M35177.7 1706.9 L35176.9 1712.1 L35176.1 1717.4 L35163.8 1710.1 Z"></path>
-					<path d="M63076.6 686.5 L64480.75 966 L64480.75 1181.5 L64480.8 1181.5 " fill="none"></path>
-					<path d="M63077.6 681.2 L63076.6 686.5 L63075.5 691.7 L63063.5 683.8 Z"></path>
-					<path d="M33344.7 2603.0 L32395.75 3194 L40735.25 3377.2479234167895 L40735.3 3377.2 " fill="none"></path>
-					<path d="M33347.5 2607.6 L33344.7 2603.0 L33341.8 2598.5 L33356.0 2596.0 Z"></path>
-					<path d="M37478.3 1747.2 L37478.25 1936 L62328.25 2554.3621798041736 L62328.3 2554.4 " fill="none"></path>
+					<path d="M63826.3 1319.7 L64003.25 1459 L64003.25 1643.5 L64003.3 1643.5 " fill="none"></path>
+					<path d="M63829.6 1315.6 L63826.3 1319.7 L63823.0 1323.9 L63815.8 1311.5 Z"></path>
+					<path d="M34657.5 1708.6 L36604.25 1936 L34797.25 2592.3115445440167 L34797.3 2592.3 " fill="none"></path>
+					<path d="M34658.1 1703.3 L34657.5 1708.6 L34656.9 1713.9 L34644.3 1707.1 Z"></path>
+					<path d="M72313.6 728.1 L72689.5 966 L72689.5 1181.5 L72689.5 1181.5 " fill="none"></path>
+					<path d="M72316.5 723.6 L72313.6 728.1 L72310.8 732.6 L72302.3 721.0 Z"></path>
+					<path d="M34959.4 2662.3 L33748.5 3314 L33748.5 3469.5 L33748.5 3469.5 " fill="none"></path>
+					<path d="M34961.9 2667.0 L34959.4 2662.3 L34956.9 2657.6 L34971.1 2656.0 Z"></path>
+					<path d="M29964.0 1747.2 L29964 1936 L57022.75 2614.283823730047 L57022.8 2614.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37483.6 1737.8 L37478.3 1747.2 L37472.9 1737.8 L37478.3 1728.5 Z"></path>
+						<path d="M29969.3 1737.8 L29964.0 1747.2 L29958.7 1737.8 L29964.0 1728.5 Z"></path>
 					</g>
-					<path d="M30484.3 1762.7 L30484.25 1936 L38070.25 2555.4864005193117 L38070.3 2555.5 " fill="none"></path>
+					<path d="M26149.5 1762.7 L26149.5 1936 L44992.25 2620.7662618510753 L44992.3 2620.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30489.6 1753.3 L30484.3 1762.7 L30478.9 1753.3 L30484.3 1744.0 Z"></path>
+						<path d="M26154.8 1753.3 L26149.5 1762.7 L26144.2 1753.3 L26149.5 1744.0 Z"></path>
 					</g>
-					<path d="M31778.9 1228.4 L30484.25 1459 L30484.25 1651 L30484.3 1651.0 " fill="none"></path>
-					<path d="M31779.8 1233.6 L31778.9 1228.4 L31777.9 1223.1 L31792.0 1226.0 Z"></path>
-					<path d="M78542.8 1285.2 L78542.75 1459 L78542.75 1501 L78542.8 1501.0 " fill="none"></path>
+					<path d="M30145.4 1217.9 L26149.5 1459 L26149.5 1651 L26149.5 1651.0 " fill="none"></path>
+					<path d="M30145.8 1223.2 L30145.4 1217.9 L30145.1 1212.6 L30158.8 1217.1 Z"></path>
+					<path d="M80385.0 1285.2 L80385 1459 L80385 1501 L80385.0 1501.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M78548.1 1275.8 L78542.8 1285.2 L78537.4 1275.8 L78542.8 1266.5 Z"></path>
+						<path d="M80390.3 1275.8 L80385.0 1285.2 L80379.7 1275.8 L80385.0 1266.5 Z"></path>
 					</g>
-					<path d="M78856.3 172.3 L78542.75 293 L78542.75 629.5 L78542.75 629.5 L78542.75 966 L78542.75 966 L78542.75 1158.5 L78542.8 1158.5 " fill="none"></path>
-					<path d="M78858.2 177.3 L78856.3 172.3 L78854.4 167.3 L78868.7 167.5 Z"></path>
-					<path d="M52407.8 1768.3 L52026 1936 L52026 2481 L52026.0 2481.0 " fill="none"></path>
-					<path d="M52409.9 1773.2 L52407.8 1768.3 L52405.6 1763.4 L52420.0 1762.9 Z"></path>
-					<path d="M70637.2 2770.0 L70384.25 3194 L67892.5 3378.2447715333533 L67892.5 3378.2 " fill="none"></path>
+					<path d="M80996.7 160.2 L80385 293 L80385 629.5 L80385 629.5 L80385 966 L80385 966 L80385 1158.5 L80385.0 1158.5 " fill="none"></path>
+					<path d="M80997.9 165.4 L80996.7 160.2 L80995.6 155.0 L81009.8 157.3 Z"></path>
+					<path d="M55618.8 1778.0 L55302.75 1936 L55302.75 2541 L55302.8 2541.0 " fill="none"></path>
+					<path d="M55621.2 1782.7 L55618.8 1778.0 L55616.4 1773.2 L55630.8 1772.0 Z"></path>
+					<path d="M67419.6 2831.5 L67244.75 3314 L63699.5 3498.9092148500313 L63699.5 3498.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70646.5 2764.7 L70637.2 2770.0 L70637.4 2759.3 L70646.7 2754.0 Z"></path>
+						<path d="M67427.8 2824.6 L67419.6 2831.5 L67417.8 2821.0 L67426.0 2814.0 Z"></path>
 					</g>
-					<path d="M70781.8 2772.6 L70827 3194 L67791.5 3377.7159662502027 L67791.5 3377.7 " fill="none"></path>
+					<path d="M67431.5 2831.9 L67284.75 3314 L63161 3498.442562503747 L63161.0 3498.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70786.1 2762.7 L70781.8 2772.6 L70775.5 2763.8 L70779.8 2754.0 Z"></path>
+						<path d="M67439.3 2824.5 L67431.5 2831.9 L67429.1 2821.4 L67437.0 2814.0 Z"></path>
 					</g>
-					<path d="M70903.3 2769.3 L71202.25 3194 L71202.25 3380.5 L71202.25 3380.5 L71202.25 3567 L71202.25 3567 L71202.25 3723.5 L71202.25 3723.5 L71202.25 3880 L71202.25 3880 L63146 4013.1899077758244 L63146.0 4013.2 " fill="none"></path>
+					<path d="M67443.5 2832.1 L67324.75 3314 L67324.75 3500.5 L67324.75 3500.5 L67324.75 3687 L67324.75 3687 L67324.75 3843.5 L67324.75 3843.5 L67324.75 4000 L67324.75 4000 L60846 4132.994140400598 L60846.0 4133.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70902.3 2758.6 L70903.3 2769.3 L70893.5 2764.7 L70892.5 2754.0 Z"></path>
+						<path d="M67450.9 2824.3 L67443.5 2832.1 L67440.5 2821.8 L67447.9 2814.0 Z"></path>
 					</g>
-					<path d="M70915.9 2768.8 L71242.25 3194 L71242.25 3380.5 L71242.25 3380.5 L71242.25 3567 L71242.25 3567 L69337.25 3712.750427768272 L69337.3 3712.8 " fill="none"></path>
+					<path d="M67506.6 2832.6 L67534.5 3314 L67534.5 3500.5 L67534.5 3500.5 L67534.5 3687 L67534.5 3687 L64655.75 3836.2173139024594 L64655.8 3836.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70914.5 2758.2 L70915.9 2768.8 L70906.0 2764.7 L70904.6 2754.0 Z"></path>
+						<path d="M67511.3 2823.0 L67506.6 2832.6 L67500.7 2823.6 L67505.5 2814.0 Z"></path>
 					</g>
-					<path d="M70928.5 2768.4 L71282.25 3194 L68373 3377.194099772094 L68373.0 3377.2 " fill="none"></path>
+					<path d="M67557.5 2831.9 L67704.25 3314 L63029 3498.428983131511 L63029.0 3498.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70926.6 2757.8 L70928.5 2768.4 L70918.4 2764.6 L70916.6 2754.0 Z"></path>
+						<path d="M67559.9 2821.4 L67557.5 2831.9 L67549.7 2824.5 L67552.0 2814.0 Z"></path>
 					</g>
-					<path d="M74693.6 947.7 L74719.25 966 L74719.25 1212.5 L74719.25 1212.5 L74719.25 1459 L74719.25 1459 L74719.25 1697.5 L74719.25 1697.5 L74719.25 1936 L74719.25 1936 L71179 2498.3630911042364 L71179.0 2498.4 " fill="none"></path>
-					<path d="M74696.7 943.4 L74693.6 947.7 L74690.5 952.1 L74682.8 940.0 Z"></path>
-					<path d="M78290.0 1902.4 L78248.5 1936 L71179 2529.7662571771934 L71179.0 2529.8 " fill="none"></path>
-					<path d="M78293.3 1906.5 L78290.0 1902.4 L78286.6 1898.3 L78300.3 1894.0 Z"></path>
+					<path d="M67685.8 669.8 L70987.75 966 L70987.75 1212.5 L70987.75 1212.5 L70987.75 1459 L70987.75 1459 L70987.75 1697.5 L70987.75 1697.5 L70987.75 1936 L70987.75 1936 L67914 2542.2588563658483 L67914.0 2542.3 " fill="none"></path>
+					<path d="M67686.3 664.5 L67685.8 669.8 L67685.3 675.1 L67672.5 668.6 Z"></path>
+					<path d="M80115.5 1902.1 L80070.75 1936 L67914 2602.0173541397476 L67914.0 2602.0 " fill="none"></path>
+					<path d="M80118.7 1906.3 L80115.5 1902.1 L80112.2 1897.8 L80126.1 1894.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M69693.7 1240.0 L68726 1459 L68726 1697.5 L68726 1697.5 L68726 1936 L68726 1936 L70340 2435.2407179739366 L70340.0 2435.2 " fill="none"></path>
+						<path d="M65616.1 1231.7 L64175.25 1459 L64175.25 1697.5 L64175.25 1697.5 L64175.25 1936 L64175.25 1936 L67075 2537.921443097085 L67075.0 2537.9 " fill="none"></path>
 					</g>
-					<path d="M69694.9 1245.2 L69693.7 1240.0 L69692.6 1234.8 L69706.8 1237.1 Z"></path>
+					<path d="M65616.9 1237.0 L65616.1 1231.7 L65615.2 1226.4 L65629.3 1229.6 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80173.5 1262.6 L80062 1459 L80062 1697.5 L80062 1697.5 L80062 1936 L80062 1936 L71179 2536.6349905939264 L71179.0 2536.6 " fill="none"></path>
+						<path d="M82077.1 1261.4 L81916.75 1459 L81916.75 1697.5 L81916.75 1697.5 L81916.75 1936 L81916.75 1936 L67914 2604.959056319229 L67914.0 2605.0 " fill="none"></path>
 					</g>
-					<path d="M80178.2 1265.2 L80173.5 1262.6 L80168.9 1260.0 L80180.1 1251.0 Z"></path>
+					<path d="M82081.3 1264.7 L82077.1 1261.4 L82073.0 1258.0 L82085.5 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41321.8 1230.2 L39907 1459 L39907 1697.5 L39907 1697.5 L39907 1936 L39907 1936 L70340 2556.447516408719 L70340.0 2556.4 " fill="none"></path>
+						<path d="M41569.1 1232.6 L40335.75 1459 L40335.75 1697.5 L40335.75 1697.5 L40335.75 1936 L40335.75 1936 L67075 2614.3575551157546 L67075.0 2614.4 " fill="none"></path>
 					</g>
-					<path d="M41322.7 1235.5 L41321.8 1230.2 L41321.0 1225.0 L41335.0 1228.1 Z"></path>
-					<path d="M65066.3 2720.2 L65051.25 3194 L64965.29155495978 3365 L64965.3 3365.0 " fill="none"></path>
+					<path d="M41570.1 1237.9 L41569.1 1232.6 L41568.2 1227.4 L41582.3 1230.2 Z"></path>
+					<path d="M60148.8 2778.8 L59936 3314 L59342.084450402144 3485 L59342.1 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65071.9 2711.0 L65066.3 2720.2 L65061.3 2710.7 L65066.9 2701.5 Z"></path>
+						<path d="M60157.2 2772.1 L60148.8 2778.8 L60147.3 2768.2 L60155.7 2761.5 Z"></path>
 					</g>
-					<path d="M65164.9 2717.4 L65457.75 3194 L68268 3377.0797746921667 L68268.0 3377.1 " fill="none"></path>
+					<path d="M60292.1 2777.9 L60579.75 3314 L62924 3496.414780431835 L62924.0 3496.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65164.6 2706.7 L65164.9 2717.4 L65155.5 2712.2 L65155.1 2701.5 Z"></path>
+						<path d="M60292.4 2767.2 L60292.1 2777.9 L60283.0 2772.2 L60283.3 2761.5 Z"></path>
 					</g>
-					<path d="M67134.0 1739.7 L67007.25 1936 L65419.25 2451.935950413223 L65419.3 2451.9 " fill="none"></path>
-					<path d="M67138.5 1742.6 L67134.0 1739.7 L67129.5 1736.8 L67141.2 1728.5 Z"></path>
-					<path d="M79357.3 1823.5 L79125.5 1936 L65419.25 2549.4252094562144 L65419.3 2549.4 " fill="none"></path>
-					<path d="M79359.6 1828.3 L79357.3 1823.5 L79354.9 1818.7 L79369.3 1817.7 Z"></path>
-					<path d="M78356.8 1908.0 L78332 1936 L78332 2565 L78332 2565 L78332 3194 L78332 3194 L78332 3380.5 L78332 3380.5 L78332 3567 L78332 3567 L70046 3722.133269529848 L70046.0 3722.1 " fill="none"></path>
+					<path d="M57705.2 1733.8 L57236.5 1936 L59862 2544.363712796368 L59862.0 2544.4 " fill="none"></path>
+					<path d="M57707.3 1738.7 L57705.2 1733.8 L57703.0 1728.9 L57717.4 1728.5 Z"></path>
+					<path d="M81372.5 1856.4 L81252.75 1936 L60558 2613.605481697972 L60558.0 2613.6 " fill="none"></path>
+					<path d="M81375.5 1860.8 L81372.5 1856.4 L81369.6 1851.9 L81383.6 1849.0 Z"></path>
+					<path d="M80145.0 1906.2 L80110.75 1936 L80110.75 2625 L80110.75 2625 L80110.75 3314 L80110.75 3314 L80110.75 3500.5 L80110.75 3500.5 L80110.75 3687 L80110.75 3687 L65499.5 3842.7219895466233 L65499.5 3842.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M78366.9 1904.5 L78356.8 1908.0 L78358.9 1897.5 L78369.1 1894.0 Z"></path>
+						<path d="M80155.5 1904.1 L80145.0 1906.2 L80148.5 1896.1 L80159.0 1894.0 Z"></path>
 					</g>
-					<path d="M78617.7 1911.6 L78626.25 1936 L78626.25 2565 L78626.25 2565 L78626.25 3194 L78626.25 3194 L65014 3379.7290992226795 L65014.0 3379.7 " fill="none"></path>
+					<path d="M80592.6 1907.3 L80621 1936 L80621 2625 L80621 2625 L80621 3314 L80621 3314 L59344.75 3500.006052899884 L59344.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M78619.7 1901.0 L78617.7 1911.6 L78609.6 1904.6 L78611.5 1894.0 Z"></path>
+						<path d="M80589.8 1896.9 L80592.6 1907.3 L80582.2 1904.4 L80579.4 1894.0 Z"></path>
 					</g>
-					<path d="M46381.7 1217.7 L41996 1459 L41996 1598.5 L41996.0 1598.5 " fill="none"></path>
-					<path d="M46382.0 1223.0 L46381.7 1217.7 L46381.4 1212.4 L46395.0 1217.0 Z"></path>
-					<path d="M49558.3 3498.2 L49558.25 3567 L69900 3722.940380117317 L69900.0 3722.9 " fill="none"></path>
+					<path d="M50507.2 1216.1 L44079.25 1459 L44079.25 1598.5 L44079.3 1598.5 " fill="none"></path>
+					<path d="M50507.4 1221.4 L50507.2 1216.1 L50507.0 1210.8 L50520.5 1215.6 Z"></path>
+					<path d="M45610.8 3618.2 L45610.75 3687 L65353.5 3842.923463658958 L65353.5 3842.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49563.6 3488.8 L49558.3 3498.2 L49552.9 3488.8 L49558.3 3479.5 Z"></path>
+						<path d="M45616.1 3608.8 L45610.8 3618.2 L45605.4 3608.8 L45610.8 3599.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M45551.5 1707.4 L43600.25 1936 L43600.25 2565 L43600.25 2565 L43600.25 3194 L43600.25 3194 L49410.25 3375.8672373279624 L49410.3 3375.9 " fill="none"></path>
+						<path d="M47795.2 1705.5 L45348.75 1936 L45348.75 2625 L45348.75 2625 L45348.75 3314 L45348.75 3314 L45471.67225201072 3401.5 L45471.7 3401.5 " fill="none"></path>
 					</g>
-					<path d="M45552.1 1712.7 L45551.5 1707.4 L45550.9 1702.1 L45564.8 1705.9 Z"></path>
-					<path d="M40353.5 1747.2 L40353.5 1936 L64723.25 2556.1443395940164 L64723.3 2556.1 " fill="none"></path>
+					<path d="M47795.7 1710.8 L47795.2 1705.5 L47794.7 1700.2 L47808.5 1704.2 Z"></path>
+					<path d="M40662.3 1747.2 L40662.25 1936 L59862 2612.734035886483 L59862.0 2612.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40358.8 1737.8 L40353.5 1747.2 L40348.2 1737.8 L40353.5 1728.5 Z"></path>
+						<path d="M40667.6 1737.8 L40662.3 1747.2 L40656.9 1737.8 L40662.3 1728.5 Z"></path>
 					</g>
-					<path d="M43837.3 2652.7 L43837.25 3194 L49410.25 3375.6753190001746 L49410.3 3375.7 " fill="none"></path>
+					<path d="M45872.8 2712.7 L45872.75 3314 L45749.82774798928 3401.5 L45749.8 3401.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43842.6 2643.3 L43837.3 2652.7 L43831.9 2643.3 L43837.3 2634.0 Z"></path>
+						<path d="M45878.1 2703.3 L45872.8 2712.7 L45867.4 2703.3 L45872.8 2694.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M45551.5 1708.7 L43837.25 1936 L43837.25 2496 L43837.3 2496.0 " fill="none"></path>
+						<path d="M47795.3 1707.6 L45872.75 1936 L45872.75 2556 L45872.8 2556.0 " fill="none"></path>
 					</g>
-					<path d="M45552.2 1714.0 L45551.5 1708.7 L45550.8 1703.4 L45564.8 1707.0 Z"></path>
-					<path d="M62613.7 2815.2 L62398.75 3194 L67831.5 3379.4588157232415 L67831.5 3379.5 " fill="none"></path>
+					<path d="M47795.9 1712.9 L47795.3 1707.6 L47794.6 1702.3 L47808.5 1706.0 Z"></path>
+					<path d="M57357.6 2876.5 L57196.5 3314 L63638.5 3499.621166473542 L63638.5 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62623.0 2809.7 L62613.7 2815.2 L62613.7 2804.5 L62622.9 2799.0 Z"></path>
+						<path d="M57365.8 2869.6 L57357.6 2876.5 L57355.8 2865.9 L57364.1 2859.0 Z"></path>
 					</g>
-					<path d="M62636.8 2815.9 L62457.5 3194 L64901 3376.2851 L64901.0 3376.3 " fill="none"></path>
+					<path d="M57372.1 2876.8 L57236.5 3314 L59231.75 3495.364262215182 L59231.8 3495.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62645.6 2809.7 L62636.8 2815.9 L62636.0 2805.1 L62644.8 2799.0 Z"></path>
+						<path d="M57380.0 2869.5 L57372.1 2876.8 L57369.8 2866.3 L57377.7 2859.0 Z"></path>
 					</g>
-					<path d="M62779.3 2817.6 L62814.5 3194 L62814.5 3380.5 L62814.5 3380.5 L62814.5 3567 L62814.5 3567 L62814.5 3723.5 L62814.5 3723.5 L62814.5 3880 L62814.5 3880 L63064.32276119403 3998.5 L63064.3 3998.5 " fill="none"></path>
+					<path d="M57386.7 2877.1 L57276.5 3314 L57276.5 3500.5 L57276.5 3500.5 L57276.5 3687 L57276.5 3687 L57276.5 3843.5 L57276.5 3843.5 L57276.5 4000 L57276.5 4000 L60748 4132.1349240164745 L60748.0 4132.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62783.8 2807.8 L62779.3 2817.6 L62773.2 2808.8 L62777.6 2799.0 Z"></path>
+						<path d="M57394.1 2869.4 L57386.7 2877.1 L57383.8 2866.7 L57391.2 2859.0 Z"></path>
 					</g>
-					<path d="M62795.4 2817.4 L62854.5 3194 L62854.5 3380.5 L62854.5 3380.5 L62854.5 3567 L62854.5 3567 L69056.25 3720.033052150262 L69056.3 3720.0 " fill="none"></path>
+					<path d="M57481.2 2877.5 L57534.75 3314 L57534.75 3500.5 L57534.75 3500.5 L57534.75 3687 L57534.75 3687 L64374.75 3840.3500465582692 L64374.8 3840.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62799.2 2807.4 L62795.4 2817.4 L62788.7 2809.0 L62792.5 2799.0 Z"></path>
+						<path d="M57485.4 2867.6 L57481.2 2877.5 L57474.8 2868.9 L57478.9 2859.0 Z"></path>
 					</g>
-					<path d="M62857.1 2816.3 L63009.5 3194 L68268 3378.656420636415 L68268.0 3378.7 " fill="none"></path>
+					<path d="M57544.5 2876.5 L57708.5 3314 L62924 3498.6413724373574 L62924.0 3498.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62858.6 2805.7 L62857.1 2816.3 L62848.7 2809.7 L62850.1 2799.0 Z"></path>
+						<path d="M57546.2 2865.9 L57544.5 2876.5 L57536.2 2869.6 L57538.0 2859.0 Z"></path>
 					</g>
-					<path d="M67140.7 1740.5 L67047.25 1936 L63183.25 2502.3418385180007 L63183.3 2502.3 " fill="none"></path>
-					<path d="M67145.5 1742.8 L67140.7 1740.5 L67135.9 1738.2 L67146.4 1728.5 Z"></path>
+					<path d="M57734.3 1736.2 L57450.25 1936 L57450.25 2391 L57450.3 2391.0 " fill="none"></path>
+					<path d="M57737.4 1740.5 L57734.3 1736.2 L57731.2 1731.8 L57745.2 1728.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M69781.8 1262.1 L69649 1459 L69649 1697.5 L69649 1697.5 L69649 1936 L69649 1936 L63183.25 2525.991187030791 L63183.3 2526.0 " fill="none"></path>
+						<path d="M65616.1 1232.2 L64215.25 1459 L64215.25 1697.5 L64215.25 1697.5 L64215.25 1936 L64215.25 1936 L57877.75 2581.460088691796 L57877.8 2581.5 " fill="none"></path>
 					</g>
-					<path d="M69786.3 1265.0 L69781.8 1262.1 L69777.4 1259.1 L69789.3 1251.0 Z"></path>
+					<path d="M65616.9 1237.5 L65616.1 1232.2 L65615.2 1226.9 L65629.3 1230.1 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80181.4 1263.4 L80102 1459 L80102 1697.5 L80102 1697.5 L80102 1936 L80102 1936 L63183.25 2549.498234488722 L63183.3 2549.5 " fill="none"></path>
+						<path d="M82084.5 1262.2 L81956.75 1459 L81956.75 1697.5 L81956.75 1697.5 L81956.75 1936 L81956.75 1936 L57877.75 2612.980841817477 L57877.8 2613.0 " fill="none"></path>
 					</g>
-					<path d="M80186.3 1265.4 L80181.4 1263.4 L80176.4 1261.4 L80186.4 1251.0 Z"></path>
+					<path d="M82089.0 1265.1 L82084.5 1262.2 L82080.0 1259.3 L82091.8 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41321.8 1230.7 L39947 1459 L39947 1697.5 L39947 1697.5 L39947 1936 L39947 1936 L62328.25 2553.2107743738698 L62328.3 2553.2 " fill="none"></path>
+						<path d="M41569.1 1233.2 L40375.75 1459 L40375.75 1697.5 L40375.75 1697.5 L40375.75 1936 L40375.75 1936 L57022.75 2607.7492752349995 L57022.8 2607.7 " fill="none"></path>
 					</g>
-					<path d="M41322.7 1236.0 L41321.8 1230.7 L41321.0 1225.4 L41335.0 1228.5 Z"></path>
-					<path d="M33356.0 2604.3 L32608 3194 L41071.25 3376.268093767141 L41071.3 3376.3 " fill="none"></path>
-					<path d="M33359.3 2608.4 L33356.0 2604.3 L33352.7 2600.1 L33366.4 2596.0 Z"></path>
-					<path d="M42994.5 1785.2 L42994.5 1936 L42994.5 2549.5 L42994.5 2549.5 " fill="none"></path>
+					<path d="M41570.1 1238.5 L41569.1 1233.2 L41568.2 1228.0 L41582.3 1230.8 Z"></path>
+					<path d="M34977.9 2664.1 L34133 3314 L34133 3462 L34133.0 3462.0 " fill="none"></path>
+					<path d="M34981.1 2668.4 L34977.9 2664.1 L34974.6 2659.9 L34988.4 2656.0 Z"></path>
+					<path d="M44888.3 1785.2 L44888.25 1936 L44888.25 2609.5 L44888.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42999.8 1775.8 L42994.5 1785.2 L42989.2 1775.8 L42994.5 1766.5 Z"></path>
+						<path d="M44893.6 1775.8 L44888.3 1785.2 L44882.9 1775.8 L44888.3 1766.5 Z"></path>
 					</g>
-					<path d="M46381.7 1219.2 L42994.5 1459 L42994.5 1628.5 L42994.5 1628.5 " fill="none"></path>
-					<path d="M46382.1 1224.5 L46381.7 1219.2 L46381.3 1213.9 L46395.0 1218.3 Z"></path>
-					<path d="M45222.3 2651.0 L44980 3194 L64901 3379.9725441121263 L64901.0 3380.0 " fill="none"></path>
+					<path d="M50507.2 1216.6 L44888.25 1459 L44888.25 1628.5 L44888.3 1628.5 " fill="none"></path>
+					<path d="M50507.4 1221.9 L50507.2 1216.6 L50506.9 1211.3 L50520.5 1216.0 Z"></path>
+					<path d="M46429.7 2711.3 L46188.5 3314 L59231.75 3499.6956144201226 L59231.8 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45231.0 2644.7 L45222.3 2651.0 L45221.3 2640.3 L45230.0 2634.0 Z"></path>
+						<path d="M46438.1 2704.6 L46429.7 2711.3 L46428.2 2700.7 L46436.6 2694.0 Z"></path>
 					</g>
-					<path d="M45300.3 2651.0 L45550 3194 L49746.25 3376.095427840149 L49746.3 3376.1 " fill="none"></path>
+					<path d="M46488.5 2712.0 L46656.25 3314 L46656.25 3485 L46656.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45301.2 2640.3 L45300.3 2651.0 L45291.5 2644.7 L45292.5 2634.0 Z"></path>
+						<path d="M46491.1 2701.6 L46488.5 2712.0 L46480.8 2704.4 L46483.5 2694.0 Z"></path>
 					</g>
-					<path d="M45822.5 2688.5 L45590 3194 L49989.25 3376.6390171962826 L49989.3 3376.6 " fill="none"></path>
+					<path d="M47048.1 2749.5 L46890.75 3314 L46890.75 3485 L46890.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45831.2 2682.2 L45822.5 2688.5 L45821.5 2677.8 L45830.3 2671.5 Z"></path>
+						<path d="M47055.7 2741.9 L47048.1 2749.5 L47045.4 2739.1 L47053.1 2731.5 Z"></path>
 					</g>
-					<path d="M45923.6 2689.1 L46104 3194 L27524 3380.064381023975 L27524.0 3380.1 " fill="none"></path>
+					<path d="M47123.3 2749.2 L47307.5 3314 L28048.75 3500.0796992578585 L28048.8 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45925.5 2678.5 L45923.6 2689.1 L45915.4 2682.1 L45917.3 2671.5 Z"></path>
+						<path d="M47125.5 2738.7 L47123.3 2749.2 L47115.3 2742.0 L47117.5 2731.5 Z"></path>
 					</g>
-					<path d="M46324.4 2689.1 L46144 3194 L50603.25 3376.6297282459514 L50603.3 3376.6 " fill="none"></path>
+					<path d="M47531.7 2749.2 L47347.5 3314 L47347.5 3485 L47347.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M46332.6 2682.1 L46324.4 2689.1 L46322.5 2678.5 L46330.7 2671.5 Z"></path>
+						<path d="M47539.7 2742.0 L47531.7 2749.2 L47529.5 2738.7 L47537.5 2731.5 Z"></path>
 					</g>
-					<path d="M46391.1 2689.9 L46481.5 3194 L27524 3380.0730356297036 L27524.0 3380.1 " fill="none"></path>
+					<path d="M47669.7 2746.0 L48127.25 3314 L28048.75 3500.0968218864923 L28048.8 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M46394.7 2679.7 L46391.1 2689.9 L46384.2 2681.6 L46387.8 2671.5 Z"></path>
+						<path d="M47668.0 2735.4 L47669.7 2746.0 L47659.7 2742.1 L47658.0 2731.5 Z"></path>
 					</g>
-					<path d="M14551.9 3329.9 L14563.75 3327 L14571.25 3327 L14571.25 3327 L14578.75 3380.5 L14578.75 3380.5 L14571.25 3434 L14571.25 3434 L14563.75 3434 L14563.75 3434 L14533.75 3426.7539503386006 L14533.8 3426.8 " fill="none"></path>
+					<path d="M14099.6 3449.9 L14111.5 3447 L14119 3447 L14119 3447 L14126.5 3500.5 L14126.5 3500.5 L14119 3554 L14119 3554 L14111.5 3554 L14111.5 3554 L14081.5 3546.7539503386006 L14081.5 3546.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14541.6 3326.9 L14551.9 3329.9 L14544.1 3337.2 L14533.8 3334.2 Z"></path>
+						<path d="M14089.3 3446.9 L14099.6 3449.9 L14091.8 3457.2 L14081.5 3454.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3119.8 2592.3 L3441.5 3194 L14150.75 3377.22364286861 L14150.8 3377.2 " fill="none"></path>
+						<path d="M3118.7 2652.5 L3441.5 3314 L13698.5 3497.0818299277407 L13698.5 3497.1 " fill="none"></path>
 					</g>
-					<path d="M3124.5 2589.7 L3119.8 2592.3 L3115.1 2594.8 L3113.5 2580.5 Z"></path>
-					<path d="M30928.8 1777.7 L30928.75 1936 L40967 2535.5261233888004 L40967.0 2535.5 " fill="none"></path>
+					<path d="M3123.5 2650.1 L3118.7 2652.5 L3113.9 2654.8 L3112.8 2640.5 Z"></path>
+					<path d="M26594.0 1777.7 L26594 1936 L38606.5 2597.8113305613306 L38606.5 2597.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30934.1 1768.3 L30928.8 1777.7 L30923.4 1768.3 L30928.8 1759.0 Z"></path>
+						<path d="M26599.3 1768.3 L26594.0 1777.7 L26588.7 1768.3 L26594.0 1759.0 Z"></path>
 					</g>
-					<path d="M31796.0 1231.4 L30928.75 1459 L30928.75 1636 L30928.8 1636.0 " fill="none"></path>
-					<path d="M31797.4 1236.5 L31796.0 1231.4 L31794.7 1226.2 L31808.9 1228.0 Z"></path>
-					<path d="M76104.5 165.3 L76104.5 293 L76104.5 583 L76104.5 583.0 " fill="none"></path>
-					<path d="M76109.8 165.3 L76104.5 165.3 L76099.2 165.3 L76104.5 152.0 Z"></path>
-					<path d="M31447.8 1777.7 L31447.75 1936 L40967 2533.9983770692365 L40967.0 2534.0 " fill="none"></path>
+					<path d="M30145.4 1218.5 L26594 1459 L26594 1636 L26594.0 1636.0 " fill="none"></path>
+					<path d="M30145.8 1223.9 L30145.4 1218.5 L30145.1 1213.2 L30158.8 1217.6 Z"></path>
+					<path d="M78261.0 165.3 L78261 293 L78261 583 L78261.0 583.0 " fill="none"></path>
+					<path d="M78266.3 165.3 L78261.0 165.3 L78255.7 165.3 L78261.0 152.0 Z"></path>
+					<path d="M27113.0 1777.7 L27113 1936 L38606.5 2596.634145324101 L38606.5 2596.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31453.1 1768.3 L31447.8 1777.7 L31442.4 1768.3 L31447.8 1759.0 Z"></path>
+						<path d="M27118.3 1768.3 L27113.0 1777.7 L27107.7 1768.3 L27113.0 1759.0 Z"></path>
 					</g>
-					<path d="M31830.1 1234.7 L31447.75 1459 L31447.75 1636 L31447.8 1636.0 " fill="none"></path>
-					<path d="M31832.8 1239.3 L31830.1 1234.7 L31827.4 1230.1 L31841.6 1228.0 Z"></path>
-					<path d="M41311.8 2868.3 L41152 3194 L14533.75 3379.1678447206705 L14533.8 3379.2 " fill="none"></path>
+					<path d="M30145.5 1219.6 L27113 1459 L27113 1636 L27113.0 1636.0 " fill="none"></path>
+					<path d="M30145.9 1224.9 L30145.5 1219.6 L30145.0 1214.2 L30158.8 1218.5 Z"></path>
+					<path d="M38822.1 2925.2 L38462.25 3314 L14081.5 3499.04654132202 L14081.5 3499.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41320.7 2862.2 L41311.8 2868.3 L41311.1 2857.5 L41320.0 2851.5 Z"></path>
+						<path d="M38832.4 2922.0 L38822.1 2925.2 L38824.6 2914.7 L38834.8 2911.5 Z"></path>
 					</g>
-					<path d="M41430.6 2870.1 L41398.75 3194 L64901 3380.05272457155 L64901.0 3380.1 " fill="none"></path>
+					<path d="M39048.0 2929.9 L38982.5 3314 L59231.75 3499.9810706327025 L59231.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41436.8 2861.3 L41430.6 2870.1 L41426.2 2860.3 L41432.4 2851.5 Z"></path>
+						<path d="M39054.8 2921.6 L39048.0 2929.9 L39044.3 2919.8 L39051.1 2911.5 Z"></path>
 					</g>
-					<path d="M41579.7 2868.9 L41707.25 3194 L68268 3380.1320911576 L68268.0 3380.1 " fill="none"></path>
+					<path d="M39611.8 2730.7 L42435.75 3314 L62924 3500.0233255845087 L62924.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41581.3 2858.2 L41579.7 2868.9 L41571.3 2862.1 L41572.9 2851.5 Z"></path>
+						<path d="M39603.7 2723.6 L39611.8 2730.7 L39601.6 2734.0 L39593.5 2726.9 Z"></path>
 					</g>
-					<path d="M67147.7 1741.2 L67087.25 1936 L41954 2552.8872077028886 L41954.0 2552.9 " fill="none"></path>
-					<path d="M67152.8 1742.8 L67147.7 1741.2 L67142.6 1739.7 L67151.6 1728.5 Z"></path>
-					<path d="M42208.8 1757.5 L41460.5 1936 L41460.5 2278.5 L41460.5 2278.5 " fill="none"></path>
+					<path d="M57806.8 1740.9 L57885.5 1936 L39593.5 2606.8997897314416 L39593.5 2606.9 " fill="none"></path>
+					<path d="M57811.7 1738.9 L57806.8 1740.9 L57801.8 1742.9 L57801.8 1728.5 Z"></path>
+					<path d="M42327.9 1793.9 L42169 1936 L39593.5 2514.2077223851416 L39593.5 2514.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42219.2 1760.5 L42208.8 1757.5 L42216.7 1750.2 L42227.0 1753.2 Z"></path>
+						<path d="M42338.4 1791.7 L42327.9 1793.9 L42331.3 1783.7 L42341.8 1781.5 Z"></path>
 					</g>
-					<path d="M42568.4 1793.9 L42727.25 1936 L42727.25 2565 L42727.25 2565 L42727.25 3194 L42727.25 3194 L51582.25 3377.8425359011467 L51582.3 3377.8 " fill="none"></path>
+					<path d="M42543.6 1793.9 L42702.5 1936 L42702.5 2625 L42702.5 2625 L42702.5 3314 L42702.5 3314 L49002.5 3496.786247666459 L49002.5 3496.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42565.0 1783.7 L42568.4 1793.9 L42557.9 1791.7 L42554.4 1781.5 Z"></path>
+						<path d="M42540.2 1783.7 L42543.6 1793.9 L42533.1 1791.7 L42529.7 1781.5 Z"></path>
 					</g>
-					<path d="M67927.7 2755.1 L67670.25 3194 L67846.06367292225 3365 L67846.1 3365.0 " fill="none"></path>
+					<path d="M63511.8 2816.3 L63311 3314 L63639.24664879357 3485 L63639.2 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67937.1 2749.7 L67927.7 2755.1 L67927.9 2744.4 L67937.2 2739.0 Z"></path>
+						<path d="M63520.2 2809.7 L63511.8 2816.3 L63510.4 2805.7 L63518.8 2799.0 Z"></path>
 					</g>
-					<path d="M67972.2 2756.6 L67819 3194 L67751.60857908847 3365 L67751.6 3365.0 " fill="none"></path>
+					<path d="M63522.8 2816.6 L63351 3314 L63134.61394101877 3485 L63134.6 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67980.3 2749.6 L67972.2 2756.6 L67970.2 2746.0 L67978.3 2739.0 Z"></path>
+						<path d="M63530.9 2809.6 L63522.8 2816.6 L63520.8 2806.1 L63528.9 2799.0 Z"></path>
 					</g>
-					<path d="M68437.7 2383.3 L69418.25 1936 L69290.5393081761 1804 L69290.5 1804.0 " fill="none"></path>
+					<path d="M64025.8 2443.8 L65250.25 1936 L65038.551886792455 1804 L65038.6 1804.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68427.0 2382.3 L68437.7 2383.3 L68431.4 2392.0 L68420.7 2391.0 Z"></path>
+						<path d="M64015.1 2442.5 L64025.8 2443.8 L64019.2 2452.4 L64008.5 2451.0 Z"></path>
 					</g>
-					<path d="M68084.7 2757.2 L68188 3194 L68188 3380.5 L68188 3380.5 L68188 3567 L68188 3567 L68188 3723.5 L68188 3723.5 L68188 3880 L68188 3880 L63146 4012.710273030839 L63146.0 4012.7 " fill="none"></path>
+					<path d="M63540.2 2817.1 L63414 3314 L63414 3500.5 L63414 3500.5 L63414 3687 L63414 3687 L63414 3843.5 L63414 3843.5 L63414 4000 L63414 4000 L60846 4131.491020252197 L60846.0 4131.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68087.7 2746.9 L68084.7 2757.2 L68077.4 2749.3 L68080.4 2739.0 Z"></path>
+						<path d="M63547.7 2809.4 L63540.2 2817.1 L63537.3 2806.7 L63544.8 2799.0 Z"></path>
 					</g>
-					<path d="M68096.8 2756.9 L68228 3194 L68228 3380.5 L68228 3380.5 L68228 3567 L68228 3567 L69056.25 3700.802451612903 L69056.3 3700.8 " fill="none"></path>
+					<path d="M63591.7 2817.7 L63598.5 3314 L63598.5 3500.5 L63598.5 3500.5 L63598.5 3687 L63598.5 3687 L64374.75 3819.5149986364877 L64374.8 3819.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68099.3 2746.4 L68096.8 2756.9 L68089.0 2749.5 L68091.5 2739.0 Z"></path>
+						<path d="M63596.9 2808.3 L63591.7 2817.7 L63586.2 2808.4 L63591.4 2799.0 Z"></path>
 					</g>
-					<path d="M68124.7 2756.0 L68320.5 3194 L68320.5 3365 L68320.5 3365.0 " fill="none"></path>
+					<path d="M63648.9 2816.8 L63804 3314 L63029 3488.667673716012 L63029.0 3488.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68125.7 2745.3 L68124.7 2756.0 L68116.0 2749.7 L68117.1 2739.0 Z"></path>
+						<path d="M63651.2 2806.3 L63648.9 2816.8 L63641.0 2809.5 L63643.3 2799.0 Z"></path>
 					</g>
-					<path d="M74695.9 711.3 L76094.5 966 L76094.5 1212.5 L76094.5 1212.5 L76094.5 1459 L76094.5 1459 L76094.5 1697.5 L76094.5 1697.5 L76094.5 1936 L76094.5 1936 L68469.25 2531.423140188076 L68469.3 2531.4 " fill="none"></path>
-					<path d="M74696.8 706.0 L74695.9 711.3 L74694.9 716.5 L74682.8 708.9 Z"></path>
+					<path d="M67685.8 669.4 L71027.75 966 L71027.75 1212.5 L71027.75 1212.5 L71027.75 1459 L71027.75 1459 L71027.75 1697.5 L71027.75 1697.5 L71027.75 1936 L71027.75 1936 L64019 2585.1720719206855 L64019.0 2585.2 " fill="none"></path>
+					<path d="M67686.3 664.1 L67685.8 669.4 L67685.3 674.7 L67672.5 668.2 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M69789.5 1262.9 L69689 1459 L69689 1697.5 L69689 1697.5 L69689 1936 L69689 1936 L68469.25 2401.0539475678133 L68469.3 2401.1 " fill="none"></path>
+						<path d="M65616.1 1232.7 L64255.25 1459 L64255.25 1697.5 L64255.25 1697.5 L64255.25 1936 L64255.25 1936 L63757.25471698113 2451 L63757.3 2451.0 " fill="none"></path>
 					</g>
-					<path d="M69794.2 1265.3 L69789.5 1262.9 L69784.7 1260.4 L69795.5 1251.0 Z"></path>
+					<path d="M65617.0 1238.0 L65616.1 1232.7 L65615.2 1227.5 L65629.3 1230.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41321.9 1231.2 L39987 1459 L39987 1697.5 L39987 1697.5 L39987 1936 L39987 1936 L67609.25 2555.358349152029 L67609.3 2555.4 " fill="none"></path>
+						<path d="M41569.2 1233.9 L40415.75 1459 L40415.75 1697.5 L40415.75 1697.5 L40415.75 1936 L40415.75 1936 L63159 2612.2150000539414 L63159.0 2612.2 " fill="none"></path>
 					</g>
-					<path d="M41322.8 1236.5 L41321.9 1231.2 L41321.0 1226.0 L41335.0 1229.0 Z"></path>
-					<path d="M69081.0 1818.0 L68976.75 1936 L68976.75 2565 L68976.75 2565 L68976.75 3194 L68976.75 3194 L68976.75 3380.5 L68976.75 3380.5 L68976.75 3567 L68976.75 3567 L69056.25 3623.553409090909 L69056.3 3623.6 " fill="none"></path>
+					<path d="M41570.2 1239.1 L41569.2 1233.9 L41568.1 1228.7 L41582.3 1231.3 Z"></path>
+					<path d="M64594.9 1811.2 L64295.25 1936 L64295.25 2625 L64295.25 2625 L64295.25 3314 L64295.25 3314 L64295.25 3500.5 L64295.25 3500.5 L64295.25 3687 L64295.25 3687 L64374.75 3743.553409090909 L64374.8 3743.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69091.2 1814.5 L69081.0 1818.0 L69083.2 1807.5 L69093.4 1804.0 Z"></path>
+						<path d="M64605.5 1812.5 L64594.9 1811.2 L64601.4 1802.7 L64612.1 1804.0 Z"></path>
 					</g>
-					<path d="M69284.3 1818.6 L69378.25 1936 L68409.65699523053 2391 L68409.7 2391.0 " fill="none"></path>
+					<path d="M64948.5 1819.6 L65025.5 1936 L63951.77358490566 2451 L63951.8 2451.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69282.7 1808.0 L69284.3 1818.6 L69274.3 1814.6 L69272.7 1804.0 Z"></path>
+						<path d="M64947.8 1808.8 L64948.5 1819.6 L64938.9 1814.7 L64938.2 1804.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M69797.4 1263.6 L69729 1459 L69429.30188679245 1591 L69429.3 1591.0 " fill="none"></path>
+						<path d="M65616.4 1246.9 L64867.75 1459 L64867.75 1591 L64867.8 1591.0 " fill="none"></path>
 					</g>
-					<path d="M69802.4 1265.3 L69797.4 1263.6 L69792.3 1261.8 L69801.8 1251.0 Z"></path>
+					<path d="M65617.9 1252.0 L65616.4 1246.9 L65615.0 1241.7 L65629.3 1243.2 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80189.5 1264.0 L80142 1459 L69609 1688.3231548678625 L69609.0 1688.3 " fill="none"></path>
+						<path d="M82092.2 1263.0 L81996.75 1459 L65289.25 1691.6311372526125 L65289.3 1691.6 " fill="none"></path>
 					</g>
-					<path d="M80194.7 1265.2 L80189.5 1264.0 L80184.3 1262.7 L80192.6 1251.0 Z"></path>
+					<path d="M82097.0 1265.3 L82092.2 1263.0 L82087.4 1260.7 L82098.0 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41321.9 1231.7 L40027 1459 L68766 1694.0526054080005 L68766.0 1694.1 " fill="none"></path>
+						<path d="M41569.3 1239.0 L40662.25 1459 L64446.25 1693.3469046291132 L64446.3 1693.3 " fill="none"></path>
 					</g>
-					<path d="M41322.8 1237.0 L41321.9 1231.7 L41320.9 1226.5 L41335.0 1229.4 Z"></path>
-					<path d="M47263.7 2650.7 L46990.5 3194 L17010.25 3379.5684516648275 L17010.3 3379.6 " fill="none"></path>
+					<path d="M41570.5 1244.2 L41569.3 1239.0 L41568.0 1233.9 L41582.3 1235.9 Z"></path>
+					<path d="M49334.3 2711.4 L49104.75 3314 L20909.5 3499.5097898273993 L20909.5 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47272.6 2644.7 L47263.7 2650.7 L47263.1 2639.9 L47272.1 2634.0 Z"></path>
+						<path d="M49342.6 2704.6 L49334.3 2711.4 L49332.7 2700.8 L49341.0 2694.0 Z"></path>
 					</g>
-					<path d="M47329.3 2652.1 L47469.5 3194 L26291.75 3379.240441098878 L26291.8 3379.2 " fill="none"></path>
+					<path d="M49386.6 2712.2 L49520 3314 L26979.75 3499.3160948675845 L26979.8 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47332.1 2641.7 L47329.3 2652.1 L47321.8 2644.4 L47324.6 2634.0 Z"></path>
+						<path d="M49389.8 2702.0 L49386.6 2712.2 L49379.4 2704.3 L49382.5 2694.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M45551.6 1712.0 L44243.25 1936 L44243.25 2503.5 L44243.3 2503.5 " fill="none"></path>
+						<path d="M47902.7 1740.3 L48006.75 1936 L48006.75 2563.5 L48006.8 2563.5 " fill="none"></path>
 					</g>
-					<path d="M45552.5 1717.2 L45551.6 1712.0 L45550.7 1706.7 L45564.8 1709.7 Z"></path>
-					<path d="M17028.1 3330.6 L17040.25 3327 L17047.75 3327 L17047.75 3327 L17055.25 3380.5 L17055.25 3380.5 L17047.75 3434 L17047.75 3434 L17040.25 3434 L17040.25 3434 L17010.25 3425.1080332409974 L17010.3 3425.1 " fill="none"></path>
+					<path d="M47907.4 1737.8 L47902.7 1740.3 L47898.0 1742.8 L47896.5 1728.5 Z"></path>
+					<path d="M20927.4 3450.6 L20939.5 3447 L20947 3447 L20947 3447 L20954.5 3500.5 L20954.5 3500.5 L20947 3554 L20947 3554 L20939.5 3554 L20939.5 3554 L20909.5 3545.1080332409974 L20909.5 3545.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17017.7 3328.1 L17028.1 3330.6 L17020.7 3338.4 L17010.3 3335.9 Z"></path>
+						<path d="M20916.9 3448.1 L20927.4 3450.6 L20920.0 3458.4 L20909.5 3455.9 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3121.4 2591.9 L3481.5 3194 L16709.25 3378.401949059107 L16709.3 3378.4 " fill="none"></path>
+						<path d="M3120.1 2652.2 L3481.5 3314 L20608.5 3498.8754449428448 L20608.5 3498.9 " fill="none"></path>
 					</g>
-					<path d="M3125.9 2589.2 L3121.4 2591.9 L3116.8 2594.7 L3114.5 2580.5 Z"></path>
+					<path d="M3124.8 2649.6 L3120.1 2652.2 L3115.4 2654.8 L3113.7 2640.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M46382.2 1240.2 L45636.25 1459 L45636.25 1666.5 L45636.3 1666.5 " fill="none"></path>
+						<path d="M50507.2 1221.1 L47880 1459 L47880 1666.5 L47880.0 1666.5 " fill="none"></path>
 					</g>
-					<path d="M46383.7 1245.3 L46382.2 1240.2 L46380.7 1235.0 L46395.0 1236.4 Z"></path>
-					<path d="M75594.7 2824.5 L75492.5 3194 L67892.5 3379.754537710504 L67892.5 3379.8 " fill="none"></path>
+					<path d="M50507.7 1226.4 L50507.2 1221.1 L50506.7 1215.8 L50520.5 1219.9 Z"></path>
+					<path d="M70309.4 2884.5 L70188.5 3314 L63699.5 3499.6275021090573 L63699.5 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75602.3 2816.9 L75594.7 2824.5 L75592.1 2814.1 L75599.7 2806.5 Z"></path>
+						<path d="M70317.1 2876.9 L70309.4 2884.5 L70306.8 2874.0 L70314.5 2866.5 Z"></path>
 					</g>
-					<path d="M75730.1 2824.6 L75820.5 3194 L65014 3379.5299871122156 L65014.0 3379.5 " fill="none"></path>
+					<path d="M70324.5 2884.7 L70228.5 3314 L59344.75 3499.536836452549 L59344.8 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75733.0 2814.3 L75730.1 2824.6 L75722.7 2816.8 L75725.6 2806.5 Z"></path>
+						<path d="M70331.7 2876.8 L70324.5 2884.7 L70321.3 2874.4 L70328.5 2866.5 Z"></path>
 					</g>
-					<path d="M75746.5 2824.3 L75860.5 3194 L68373 3379.201425729443 L68373.0 3379.2 " fill="none"></path>
+					<path d="M70448.1 2884.6 L70556.5 3314 L63029 3499.2082783641163 L63029.0 3499.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75748.8 2813.8 L75746.5 2824.3 L75738.6 2817.0 L75741.0 2806.5 Z"></path>
+						<path d="M70450.9 2874.2 L70448.1 2884.6 L70440.6 2876.9 L70443.5 2866.5 Z"></path>
 					</g>
-					<path d="M74695.9 709.6 L76134.5 966 L76134.5 1212.5 L76134.5 1212.5 L76134.5 1459 L76134.5 1459 L76134.5 1697.5 L76134.5 1697.5 L76134.5 1936 L76134.5 1936 L75846.18521462638 2323.5 L75846.2 2323.5 " fill="none"></path>
-					<path d="M74696.8 704.3 L74695.9 709.6 L74694.9 714.8 L74682.8 707.2 Z"></path>
-					<path d="M33405.8 2609.3 L33405.75 3194 L41504.25 3377.967143727162 L41504.3 3378.0 " fill="none"></path>
-					<path d="M33411.1 2609.3 L33405.8 2609.3 L33400.4 2609.3 L33405.8 2596.0 Z"></path>
-					<path d="M44659.3 2667.7 L44659.25 3194 L50215.25 3374.8366492146597 L50215.3 3374.8 " fill="none"></path>
+					<path d="M67685.8 669.0 L71067.75 966 L71067.75 1212.5 L71067.75 1212.5 L71067.75 1459 L71067.75 1459 L71067.75 1697.5 L71067.75 1697.5 L71067.75 1936 L71067.75 1936 L70622.68559506531 2383.5 L70622.7 2383.5 " fill="none"></path>
+					<path d="M67686.2 663.6 L67685.8 669.0 L67685.3 674.3 L67672.5 667.8 Z"></path>
+					<path d="M35006.2 2667.8 L34665.75 3314 L34665.75 3469.5 L34665.8 3469.5 " fill="none"></path>
+					<path d="M35010.9 2670.3 L35006.2 2667.8 L35001.5 2665.3 L35012.4 2656.0 Z"></path>
+					<path d="M49712.8 2727.7 L49712.75 3314 L49760.75938337802 3386.5 L49760.8 3386.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44664.6 2658.3 L44659.3 2667.7 L44653.9 2658.3 L44659.3 2649.0 Z"></path>
+						<path d="M49718.1 2718.3 L49712.8 2727.7 L49707.4 2718.3 L49712.8 2709.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M45551.8 1718.1 L44659.25 1936 L44659.25 2481 L44659.3 2481.0 " fill="none"></path>
+						<path d="M47964.7 1708.5 L49712.75 1936 L49712.75 2541 L49712.8 2541.0 " fill="none"></path>
 					</g>
-					<path d="M45553.1 1723.3 L45551.8 1718.1 L45550.5 1712.9 L45564.8 1715.0 Z"></path>
+					<path d="M47965.4 1703.2 L47964.7 1708.5 L47964.0 1713.8 L47951.5 1706.8 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M45720.7 1717.7 L46634.25 1936 L46634.25 2565 L46634.25 2565 L46634.25 3194 L46634.25 3194 L50215.25 3371.8579227696405 L50215.3 3371.9 " fill="none"></path>
+						<path d="M47964.7 1707.2 L49959.75 1936 L49959.75 2625 L49959.75 2625 L49959.75 3314 L49959.75 3314 L49911.74061662198 3386.5 L49911.7 3386.5 " fill="none"></path>
 					</g>
-					<path d="M45722.0 1712.5 L45720.7 1717.7 L45719.5 1722.9 L45707.8 1714.6 Z"></path>
+					<path d="M47965.4 1701.9 L47964.7 1707.2 L47964.1 1712.5 L47951.5 1705.7 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3122.9 2591.6 L3521.5 3194 L2451 3351.949564873418 L2451.0 3351.9 " fill="none"></path>
+						<path d="M3121.5 2651.9 L3521.5 3314 L2438 3472.240211433046 L2438.0 3472.2 " fill="none"></path>
 					</g>
-					<path d="M3127.3 2588.7 L3122.9 2591.6 L3118.4 2594.6 L3115.5 2580.5 Z"></path>
+					<path d="M3126.1 2649.2 L3121.5 2651.9 L3116.9 2654.7 L3114.6 2640.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M45720.9 1713.2 L46921.25 1936 L46921.25 2503.5 L46921.3 2503.5 " fill="none"></path>
+						<path d="M47964.8 1706.0 L50246.75 1936 L50246.75 2563.5 L50246.8 2563.5 " fill="none"></path>
 					</g>
-					<path d="M45721.8 1708.0 L45720.9 1713.2 L45719.9 1718.4 L45707.8 1710.8 Z"></path>
-					<path d="M43413.5 1747.2 L43413.5 1936 L66873.25 2555.8058510359024 L66873.3 2555.8 " fill="none"></path>
+					<path d="M47965.3 1700.7 L47964.8 1706.0 L47964.2 1711.3 L47951.5 1704.7 Z"></path>
+					<path d="M43121.3 1747.2 L43121.25 1936 L61918 2612.475835411797 L61918.0 2612.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43418.8 1737.8 L43413.5 1747.2 L43408.2 1737.8 L43413.5 1728.5 Z"></path>
+						<path d="M43126.6 1737.8 L43121.3 1747.2 L43115.9 1737.8 L43121.3 1728.5 Z"></path>
 					</g>
-					<path d="M31899.3 1762.7 L31899.25 1936 L40680 2556.275907572227 L40680.0 2556.3 " fill="none"></path>
+					<path d="M27564.5 1762.7 L27564.5 1936 L45388.75 2620.2589321781284 L45388.8 2620.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31904.6 1753.3 L31899.3 1762.7 L31893.9 1753.3 L31899.3 1744.0 Z"></path>
+						<path d="M27569.8 1753.3 L27564.5 1762.7 L27559.2 1753.3 L27564.5 1744.0 Z"></path>
 					</g>
-					<path d="M31871.6 1241.2 L31899.25 1459 L31899.25 1651 L31899.3 1651.0 " fill="none"></path>
-					<path d="M31876.9 1240.6 L31871.6 1241.2 L31866.4 1241.9 L31870.0 1228.0 Z"></path>
-					<path d="M52415.5 2682.7 L52415.5 3194 L54133.25 3362.4555672406996 L54133.3 3362.5 " fill="none"></path>
+					<path d="M30145.5 1220.7 L27564.5 1459 L27564.5 1651 L27564.5 1651.0 " fill="none"></path>
+					<path d="M30146.0 1226.1 L30145.5 1220.7 L30145.0 1215.4 L30158.8 1219.5 Z"></path>
+					<path d="M55692.3 2742.7 L55692.25 3314 L53377 3486.7694808442534 L53377.0 3486.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M52420.8 2673.3 L52415.5 2682.7 L52410.2 2673.3 L52415.5 2664.0 Z"></path>
+						<path d="M55697.6 2733.3 L55692.3 2742.7 L55686.9 2733.3 L55692.3 2724.0 Z"></path>
 					</g>
-					<path d="M52507.7 1792.7 L52415.5 1936 L52415.5 2466 L52415.5 2466.0 " fill="none"></path>
-					<path d="M52512.2 1795.6 L52507.7 1792.7 L52503.2 1789.8 L52514.9 1781.5 Z"></path>
-					<path d="M67157.8 2794.5 L67047.25 3194 L67831.5 3373.518410555385 L67831.5 3373.5 " fill="none"></path>
+					<path d="M55744.3 1794.0 L55692.25 1936 L55692.25 2526 L55692.3 2526.0 " fill="none"></path>
+					<path d="M55749.3 1795.9 L55744.3 1794.0 L55739.3 1792.2 L55748.9 1781.5 Z"></path>
+					<path d="M62201.4 2854.5 L62072 3314 L63638.5 3496.9381653099563 L63638.5 3496.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67165.4 2786.9 L67157.8 2794.5 L67155.1 2784.1 L67162.7 2776.5 Z"></path>
+						<path d="M62209.1 2846.9 L62201.4 2854.5 L62198.8 2844.0 L62206.4 2836.5 Z"></path>
 					</g>
-					<path d="M67354.8 2792.6 L67590.25 3194 L65014 3376.497626056405 L65014.0 3376.5 " fill="none"></path>
+					<path d="M62214.7 2854.7 L62112 3314 L59344.75 3496.7683488269145 L59344.8 3496.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67354.6 2781.9 L67354.8 2792.6 L67345.4 2787.2 L67345.3 2776.5 Z"></path>
+						<path d="M62221.9 2846.8 L62214.7 2854.7 L62211.5 2844.4 L62218.7 2836.5 Z"></path>
 					</g>
-					<path d="M67369.0 2792.1 L67630.25 3194 L68268 3366.314922129663 L68268.0 3366.3 " fill="none"></path>
+					<path d="M62324.0 2854.6 L62440 3314 L62931.911528150136 3485 L62931.9 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67368.3 2781.4 L67369.0 2792.1 L67359.4 2787.2 L67358.8 2776.5 Z"></path>
+						<path d="M62326.9 2844.2 L62324.0 2854.6 L62316.5 2846.9 L62319.4 2836.5 Z"></path>
 					</g>
-					<path d="M67172.3 1741.4 L67221.25 1936 L67221.25 2353.5 L67221.3 2353.5 " fill="none"></path>
-					<path d="M67177.5 1740.1 L67172.3 1741.4 L67167.1 1742.7 L67169.0 1728.5 Z"></path>
-					<path d="M62854.9 1830.1 L62592.5 1936 L66873.25 2517.7103429651634 L66873.3 2517.7 " fill="none"></path>
-					<path d="M62856.9 1835.0 L62854.9 1830.1 L62852.9 1825.1 L62867.3 1825.1 Z"></path>
-					<path d="M79357.5 1834.5 L79165.5 1936 L67569.25 2546.67385980702 L67569.3 2546.7 " fill="none"></path>
-					<path d="M79360.0 1839.3 L79357.5 1834.5 L79355.0 1829.8 L79369.3 1828.3 Z"></path>
+					<path d="M57819.9 1739.2 L57964.5 1936 L61918 2569.258514471696 L61918.0 2569.3 " fill="none"></path>
+					<path d="M57824.2 1736.1 L57819.9 1739.2 L57815.6 1742.4 L57812.0 1728.5 Z"></path>
+					<path d="M61971.0 1832.4 L61759.75 1936 L62110.59814949202 2413.5 L62110.6 2413.5 " fill="none"></path>
+					<path d="M61973.4 1837.2 L61971.0 1832.4 L61968.7 1827.6 L61983.0 1826.5 Z"></path>
+					<path d="M81398.3 1857.0 L81292.75 1936 L62614 2612.39816311246 L62614.0 2612.4 " fill="none"></path>
+					<path d="M81401.5 1861.3 L81398.3 1857.0 L81395.2 1852.7 L81409.0 1849.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M69805.6 1264.1 L69769 1459 L69769 1697.5 L69769 1697.5 L69769 1936 L69769 1936 L67569.25 2479.0841919340596 L67569.3 2479.1 " fill="none"></path>
+						<path d="M65691.5 1260.6 L65501 1459 L65501 1697.5 L65501 1697.5 L65501 1936 L65501 1936 L62614 2550.8819165378673 L62614.0 2550.9 " fill="none"></path>
 					</g>
-					<path d="M69810.8 1265.1 L69805.6 1264.1 L69800.3 1263.1 L69808.0 1251.0 Z"></path>
+					<path d="M65695.4 1264.3 L65691.5 1260.6 L65687.7 1256.9 L65700.8 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80197.8 1264.3 L80182 1459 L80182 1697.5 L80182 1697.5 L80182 1936 L80182 1936 L67569.25 2548.1111625484637 L67569.3 2548.1 " fill="none"></path>
+						<path d="M82100.1 1263.7 L82036.75 1459 L82036.75 1697.5 L82036.75 1697.5 L82036.75 1936 L82036.75 1936 L62614 2612.872387238724 L62614.0 2612.9 " fill="none"></path>
 					</g>
-					<path d="M80203.1 1264.7 L80197.8 1264.3 L80192.5 1263.9 L80198.9 1251.0 Z"></path>
+					<path d="M82105.2 1265.3 L82100.1 1263.7 L82095.1 1262.0 L82104.3 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41321.9 1232.3 L40067 1459 L40067 1697.5 L40067 1697.5 L40067 1936 L40067 1936 L66873.25 2556.93894141801 L66873.3 2556.9 " fill="none"></path>
+						<path d="M41720.2 1252.8 L41932.25 1459 L41932.25 1697.5 L41932.25 1697.5 L41932.25 1936 L41932.25 1936 L61918 2613.208176061966 L61918.0 2613.2 " fill="none"></path>
 					</g>
-					<path d="M41322.8 1237.6 L41321.9 1232.3 L41320.9 1227.1 L41335.0 1229.9 Z"></path>
-					<path d="M33417.8 2608.9 L33579 3194 L41767.25 3377.035223084529 L41767.3 3377.0 " fill="none"></path>
-					<path d="M33423.0 2607.4 L33417.8 2608.9 L33412.7 2610.3 L33414.3 2596.0 Z"></path>
-					<path d="M71626.5 2761.8 L71322.25 3194 L67892.5 3378.8561158875805 L67892.5 3378.9 " fill="none"></path>
+					<path d="M41723.9 1249.0 L41720.2 1252.8 L41716.5 1256.6 L41710.6 1243.5 Z"></path>
+					<path d="M35025.1 2669.3 L34972.25 3314 L34972.25 3469.5 L34972.3 3469.5 " fill="none"></path>
+					<path d="M35030.4 2669.7 L35025.1 2669.3 L35019.8 2668.9 L35026.2 2656.0 Z"></path>
+					<path d="M66121.4 2821.2 L65736.25 3314 L63699.5 3497.7483976297012 L63699.5 3497.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71636.2 2757.2 L71626.5 2761.8 L71627.5 2751.1 L71637.2 2746.5 Z"></path>
+						<path d="M66131.4 2817.1 L66121.4 2821.2 L66122.9 2810.6 L66132.9 2806.5 Z"></path>
 					</g>
-					<path d="M71698.6 2764.2 L71555.25 3194 L67791.5 3378.248146203819 L67791.5 3378.2 " fill="none"></path>
+					<path d="M66132.5 2821.6 L65776.25 3314 L63161 3497.276326914044 L63161.0 3497.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71706.6 2757.0 L71698.6 2764.2 L71696.5 2753.7 L71704.5 2746.5 Z"></path>
+						<path d="M66142.3 2817.2 L66132.5 2821.6 L66133.6 2810.9 L66143.4 2806.5 Z"></path>
 					</g>
-					<path d="M71838.7 2764.0 L71998 3194 L71998 3380.5 L71998 3380.5 L71998 3567 L71998 3567 L71998 3723.5 L71998 3723.5 L71998 3880 L71998 3880 L63146 4013.2623300752725 L63146.0 4013.3 " fill="none"></path>
+					<path d="M66143.6 2822.0 L65816.25 3314 L65816.25 3500.5 L65816.25 3500.5 L65816.25 3687 L65816.25 3687 L65816.25 3843.5 L65816.25 3843.5 L65816.25 4000 L65816.25 4000 L60846 4132.691836429745 L60846.0 4132.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71840.5 2753.4 L71838.7 2764.0 L71830.5 2757.1 L71832.2 2746.5 Z"></path>
+						<path d="M66153.2 2817.2 L66143.6 2822.0 L66144.4 2811.3 L66154.0 2806.5 Z"></path>
 					</g>
-					<path d="M71851.2 2763.6 L72038 3194 L72038 3380.5 L72038 3380.5 L72038 3567 L72038 3567 L69337.25 3715.761064672239 L69337.3 3715.8 " fill="none"></path>
+					<path d="M66221.0 2824.5 L66089.25 3314 L66089.25 3500.5 L66089.25 3500.5 L66089.25 3687 L66089.25 3687 L64655.75 3829.530336721728 L64655.8 3829.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71852.4 2752.9 L71851.2 2763.6 L71842.6 2757.2 L71843.8 2746.5 Z"></path>
+						<path d="M66228.6 2816.9 L66221.0 2824.5 L66218.3 2814.1 L66225.9 2806.5 Z"></path>
 					</g>
-					<path d="M71863.6 2763.2 L72078 3194 L68373 3377.8942115768464 L68373.0 3377.9 " fill="none"></path>
+					<path d="M66353.5 2823.9 L66547.75 3314 L63029 3497.758312915646 L63029.0 3497.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71864.3 2752.5 L71863.6 2763.2 L71854.7 2757.2 L71855.3 2746.5 Z"></path>
+						<path d="M66355.1 2813.2 L66353.5 2823.9 L66345.1 2817.1 L66346.7 2806.5 Z"></path>
 					</g>
-					<path d="M74696.0 686.9 L76881.5 966 L76881.5 1212.5 L76881.5 1212.5 L76881.5 1459 L76881.5 1459 L76881.5 1697.5 L76881.5 1697.5 L76881.5 1936 L76881.5 1936 L72311 2497.8771621225446 L72311.0 2497.9 " fill="none"></path>
-					<path d="M74696.7 681.6 L74696.0 686.9 L74695.3 692.2 L74682.8 685.2 Z"></path>
+					<path d="M67685.8 668.6 L71107.75 966 L71107.75 1212.5 L71107.75 1212.5 L71107.75 1459 L71107.75 1459 L71107.75 1697.5 L71107.75 1697.5 L71107.75 1936 L71107.75 1936 L66820.75 2547.16139044072 L66820.8 2547.2 " fill="none"></path>
+					<path d="M67686.2 663.2 L67685.8 668.6 L67685.3 673.9 L67672.5 667.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M69813.9 1264.3 L69809 1459 L69809 1697.5 L69809 1697.5 L69809 1936 L69809 1936 L71219 2389.420245398773 L71219.0 2389.4 " fill="none"></path>
+						<path d="M65698.7 1261.4 L65541 1459 L65541 1697.5 L65541 1697.5 L65541 1936 L65541 1936 L66081.4617198839 2443.5 L66081.5 2443.5 " fill="none"></path>
 					</g>
-					<path d="M69819.3 1264.5 L69813.9 1264.3 L69808.6 1264.2 L69814.3 1251.0 Z"></path>
+					<path d="M65702.9 1264.7 L65698.7 1261.4 L65694.5 1258.1 L65707.0 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80206.2 1264.3 L80222 1459 L80222 1697.5 L80222 1697.5 L80222 1936 L80222 1936 L72311 2524.3905640297976 L72311.0 2524.4 " fill="none"></path>
+						<path d="M82108.4 1264.2 L82076.75 1459 L82076.75 1697.5 L82076.75 1697.5 L82076.75 1936 L82076.75 1936 L66820.75 2601.1932666751045 L66820.8 2601.2 " fill="none"></path>
 					</g>
-					<path d="M80211.5 1263.9 L80206.2 1264.3 L80200.9 1264.7 L80205.1 1251.0 Z"></path>
+					<path d="M82113.6 1265.0 L82108.4 1264.2 L82103.1 1263.3 L82110.5 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41321.9 1232.9 L40107 1459 L40107 1697.5 L40107 1697.5 L40107 1936 L40107 1936 L71219 2554.1517467938593 L71219.0 2554.2 " fill="none"></path>
+						<path d="M41725.9 1252.1 L41972.25 1459 L41972.25 1697.5 L41972.25 1697.5 L41972.25 1936 L41972.25 1936 L65728.75 2609.520357987861 L65728.8 2609.5 " fill="none"></path>
 					</g>
-					<path d="M41322.9 1238.1 L41321.9 1232.9 L41320.9 1227.7 L41335.0 1230.5 Z"></path>
-					<path d="M26527.0 2637.6 L25771.5 3194 L28968 3375.034694807167 L28968.0 3375.0 " fill="none"></path>
+					<path d="M41729.3 1248.0 L41725.9 1252.1 L41722.4 1256.2 L41715.7 1243.5 Z"></path>
+					<path d="M27605.2 2693.4 L26051.75 3314 L29658.25 3495.6398190656223 L29658.3 3495.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26537.6 2636.3 L26527.0 2637.6 L26531.3 2627.7 L26542.0 2626.5 Z"></path>
+						<path d="M27615.9 2694.9 L27605.2 2693.4 L27611.9 2685.0 L27622.5 2686.5 Z"></path>
 					</g>
-					<path d="M26746.8 2635.9 L27701.75 3194 L28762 3366.960091843429 L28762.0 3367.0 " fill="none"></path>
+					<path d="M27842.5 2700.6 L28378 3314 L30375.75 3493.0606151628017 L30375.8 3493.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26741.5 2626.6 L26746.8 2635.9 L26736.1 2635.8 L26730.7 2626.5 Z"></path>
+						<path d="M27840.3 2690.0 L27842.5 2700.6 L27832.3 2697.0 L27830.2 2686.5 Z"></path>
 					</g>
-					<path d="M31892.7 1237.5 L32111.25 1459 L32111.25 1697.5 L32111.25 1697.5 L32111.25 1936 L32111.25 1936 L26819.5 2542.755821902201 L26819.5 2542.8 " fill="none"></path>
-					<path d="M31896.5 1233.7 L31892.7 1237.5 L31888.9 1241.2 L31883.3 1228.0 Z"></path>
-					<path d="M58986.6 2709.0 L58625.5 3194 L64901 3378.8358733417563 L64901.0 3378.8 " fill="none"></path>
+					<path d="M30145.5 1221.5 L27776.5 1459 L27776.5 1697.5 L27776.5 1697.5 L27776.5 1936 L27776.5 1936 L27776.5 2563.5 L27776.5 2563.5 " fill="none"></path>
+					<path d="M30146.0 1226.8 L30145.5 1221.5 L30145.0 1216.1 L30158.8 1220.1 Z"></path>
+					<path d="M54192.5 2771.5 L53987.75 3314 L59231.75 3498.5120271672486 L59231.8 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58996.4 2704.7 L58986.6 2709.0 L58987.9 2698.3 L58997.7 2694.0 Z"></path>
+						<path d="M54200.8 2764.6 L54192.5 2771.5 L54190.8 2760.8 L54199.1 2754.0 Z"></path>
 					</g>
-					<path d="M59134.4 2712.0 L59267.75 3194 L68268 3379.4184225787744 L68268.0 3379.4 " fill="none"></path>
+					<path d="M54303.0 2771.5 L54507.75 3314 L62924 3499.3438376383765 L62924.0 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59137.1 2701.6 L59134.4 2712.0 L59126.8 2704.4 L59129.4 2694.0 Z"></path>
+						<path d="M54304.7 2760.8 L54303.0 2771.5 L54294.7 2764.6 L54296.4 2754.0 Z"></path>
 					</g>
-					<path d="M67262.7 1732.9 L67845.25 1936 L59441.75 2539.988059189853 L59441.8 2540.0 " fill="none"></path>
-					<path d="M67264.5 1727.9 L67262.7 1732.9 L67261.0 1737.9 L67250.2 1728.5 Z"></path>
-					<path d="M33432.8 2607.2 L33808.75 3194 L42117.25 3375.5932555959216 L42117.3 3375.6 " fill="none"></path>
-					<path d="M33437.3 2604.3 L33432.8 2607.2 L33428.3 2610.1 L33425.6 2596.0 Z"></path>
-					<path d="M78961.8 2652.7 L78961.75 3194 L64300.25 3376.9927890245945 L64300.3 3377.0 " fill="none"></path>
+					<path d="M57826.2 1738.4 L58004.5 1936 L54595.75 2561.1756837692155 L54595.8 2561.2 " fill="none"></path>
+					<path d="M57830.1 1734.8 L57826.2 1738.4 L57822.2 1742.0 L57817.2 1728.5 Z"></path>
+					<path d="M35051.3 2667.8 L35391.75 3314 L35391.75 3454.5 L35391.8 3454.5 " fill="none"></path>
+					<path d="M35056.0 2665.3 L35051.3 2667.8 L35046.6 2670.3 L35045.1 2656.0 Z"></path>
+					<path d="M81109.0 2712.7 L81109 3314 L62547 3497.7187815103753 L62547.0 3497.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M78967.1 2643.3 L78961.8 2652.7 L78956.4 2643.3 L78961.8 2634.0 Z"></path>
+						<path d="M81114.3 2703.3 L81109.0 2712.7 L81103.7 2703.3 L81109.0 2694.0 Z"></path>
 					</g>
-					<path d="M78952.8 180.8 L78961.75 293 L78961.75 629.5 L78961.75 629.5 L78961.75 966 L78961.75 966 L78961.75 1212.5 L78961.75 1212.5 L78961.75 1459 L78961.75 1459 L78961.75 1697.5 L78961.75 1697.5 L78961.75 1936 L78961.75 1936 L78961.75 2496 L78961.8 2496.0 " fill="none"></path>
-					<path d="M78958.1 180.4 L78952.8 180.8 L78947.5 181.2 L78951.7 167.5 Z"></path>
-					<path d="M46571.1 1229.6 L47841.5 1459 L47841.5 1613.5 L47841.5 1613.5 " fill="none"></path>
-					<path d="M46572.1 1224.3 L46571.1 1229.6 L46570.2 1234.8 L46558.0 1227.2 Z"></path>
-					<path d="M48241.0 1747.2 L48241 1936 L58745.75 2544.8307341457235 L58745.8 2544.8 " fill="none"></path>
+					<path d="M81106.7 180.8 L81109 293 L81109 629.5 L81109 629.5 L81109 966 L81109 966 L81109 1212.5 L81109 1212.5 L81109 1459 L81109 1459 L81109 1697.5 L81109 1697.5 L81109 1936 L81109 1936 L81109 2556 L81109.0 2556.0 " fill="none"></path>
+					<path d="M81112.0 180.7 L81106.7 180.8 L81101.3 180.9 L81106.4 167.5 Z"></path>
+					<path d="M50637.9 1270.3 L50755.25 1459 L50755.25 1613.5 L50755.3 1613.5 " fill="none"></path>
+					<path d="M50642.5 1267.5 L50637.9 1270.3 L50633.4 1273.1 L50630.9 1259.0 Z"></path>
+					<path d="M44500.8 1747.2 L44500.75 1936 L53899.75 2600.400430901816 L53899.8 2600.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48246.3 1737.8 L48241.0 1747.2 L48235.7 1737.8 L48241.0 1728.5 Z"></path>
+						<path d="M44506.1 1737.8 L44500.8 1747.2 L44495.4 1737.8 L44500.8 1728.5 Z"></path>
 					</g>
-					<path d="M47645.8 2667.1 L47509.5 3194 L44193.25 3377.348588156822 L44193.3 3377.3 " fill="none"></path>
+					<path d="M50705.3 2725.3 L50380.25 3314 L37900.25 3499.6520698731756 L37900.3 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47653.3 2659.4 L47645.8 2667.1 L47643.0 2656.7 L47650.5 2649.0 Z"></path>
+						<path d="M50714.5 2719.7 L50705.3 2725.3 L50705.2 2714.6 L50714.4 2709.0 Z"></path>
 					</g>
-					<path d="M47690.7 2667.4 L47785.75 3194 L54133.25 3375.246076705198 L54133.3 3375.2 " fill="none"></path>
+					<path d="M50777.6 2727.4 L50874.25 3314 L53009 3485.7006469002695 L53009.0 3485.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47694.3 2657.2 L47690.7 2667.4 L47683.8 2659.1 L47687.4 2649.0 Z"></path>
+						<path d="M50781.4 2717.3 L50777.6 2727.4 L50770.8 2719.1 L50774.6 2709.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M45721.0 1707.4 L47672.25 1936 L47672.25 2481 L47672.3 2481.0 " fill="none"></path>
+						<path d="M47964.8 1704.5 L50760.75 1936 L50760.75 2541 L50760.8 2541.0 " fill="none"></path>
 					</g>
-					<path d="M45721.6 1702.1 L45721.0 1707.4 L45720.4 1712.7 L45707.8 1705.9 Z"></path>
-					<path d="M64019.3 3565.7 L64019.25 3567 L64019.25 3723.5 L64019.25 3723.5 L64019.25 3880 L64019.25 3880 L63146 4006.8804554079697 L63146.0 4006.9 " fill="none"></path>
+					<path d="M47965.2 1699.2 L47964.8 1704.5 L47964.3 1709.8 L47951.5 1703.4 Z"></path>
+					<path d="M62266.0 3685.7 L62266 3687 L62266 3843.5 L62266 3843.5 L62266 4000 L62266 4000 L60846 4129.530292716134 L60846.0 4129.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64024.6 3556.3 L64019.3 3565.7 L64013.9 3556.3 L64019.3 3547.0 Z"></path>
+						<path d="M62271.3 3676.3 L62266.0 3685.7 L62260.7 3676.3 L62266.0 3667.0 Z"></path>
 					</g>
-					<path d="M55079.7 2748.8 L53822.25 3194 L63738.25 3375.3605962538 L63738.3 3375.4 " fill="none"></path>
-					<path d="M55081.5 2753.8 L55079.7 2748.8 L55077.9 2743.8 L55092.3 2744.3 Z"></path>
+					<path d="M48207.4 3264.2 L48167.25 3314 L61985 3496.7828974199842 L61985.0 3496.8 " fill="none"></path>
+					<path d="M48211.5 3267.5 L48207.4 3264.2 L48203.2 3260.8 L48215.8 3253.8 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M52826.0 2609.3 L52826 3194 L63738.25 3375.818026489179 L63738.3 3375.8 " fill="none"></path>
+						<path d="M52797.8 2669.3 L52797.75 3314 L61985 3494.9650278562563 L61985.0 3495.0 " fill="none"></path>
 					</g>
-					<path d="M52831.3 2609.3 L52826.0 2609.3 L52820.7 2609.3 L52826.0 2596.0 Z"></path>
-					<path d="M69630.6 2828.4 L69327.5 3194 L67892.5 3376.6185602183555 L67892.5 3376.6 " fill="none"></path>
+					<path d="M52803.1 2669.3 L52797.8 2669.3 L52792.4 2669.3 L52797.8 2656.0 Z"></path>
+					<path d="M65071.9 2889.8 L64806.25 3314 L63699.5 3495.4982413717303 L63699.5 3495.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69640.7 2824.6 L69630.6 2828.4 L69632.5 2817.8 L69642.6 2814.0 Z"></path>
+						<path d="M65081.4 2884.7 L65071.9 2889.8 L65072.3 2879.1 L65081.8 2874.0 Z"></path>
 					</g>
-					<path d="M69770.0 2831.9 L69662.75 3194 L67791.5 3376.0253618463944 L67791.5 3376.0 " fill="none"></path>
+					<path d="M65087.0 2890.2 L64846.25 3314 L63161 3495.544620938628 L63161.0 3495.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69777.7 2824.5 L69770.0 2831.9 L69767.5 2821.4 L69775.3 2814.0 Z"></path>
+						<path d="M65096.3 2884.7 L65087.0 2890.2 L65087.0 2879.5 L65096.3 2874.0 Z"></path>
 					</g>
-					<path d="M69854.9 2832.7 L69862.75 3194 L69785.53820375336 3274 L69785.5 3274.0 " fill="none"></path>
+					<path d="M65102.2 2890.6 L64886.25 3314 L64908.34115281501 3394 L64908.3 3394.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69860.0 2823.2 L69854.9 2832.7 L69849.3 2823.4 L69854.4 2814.0 Z"></path>
+						<path d="M65111.2 2884.7 L65102.2 2890.6 L65101.7 2879.9 L65110.7 2874.0 Z"></path>
 					</g>
-					<path d="M69871.9 2832.6 L69902.75 3194 L65014 3378.3692179364034 L65014.0 3378.4 " fill="none"></path>
+					<path d="M65117.5 2891.0 L64926.25 3314 L59344.75 3498.631030507272 L59344.8 3498.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69876.4 2822.8 L69871.9 2832.6 L69865.8 2823.8 L69870.3 2814.0 Z"></path>
+						<path d="M65126.2 2884.7 L65117.5 2891.0 L65116.5 2880.3 L65125.2 2874.0 Z"></path>
 					</g>
-					<path d="M70007.1 2830.0 L70224.25 3194 L70224.25 3380.5 L70224.25 3380.5 L70224.25 3567 L70224.25 3567 L70224.25 3723.5 L70224.25 3723.5 L70224.25 3880 L70224.25 3880 L63146 4013.0787470623313 L63146.0 4013.1 " fill="none"></path>
+					<path d="M65368.3 2890.8 L65576.25 3314 L65576.25 3500.5 L65576.25 3500.5 L65576.25 3687 L65576.25 3687 L65576.25 3843.5 L65576.25 3843.5 L65576.25 4000 L65576.25 4000 L60846 4132.626144269499 L60846.0 4132.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70006.9 2819.3 L70007.1 2830.0 L69997.8 2824.7 L69997.5 2814.0 Z"></path>
+						<path d="M65369.0 2880.0 L65368.3 2890.8 L65359.4 2884.7 L65360.1 2874.0 Z"></path>
 					</g>
-					<path d="M70023.7 2829.6 L70264.25 3194 L70264.25 3380.5 L70264.25 3380.5 L70264.25 3567 L70264.25 3567 L69337.25 3702.9021077283373 L69337.3 3702.9 " fill="none"></path>
+					<path d="M65383.5 2890.4 L65616.25 3314 L65616.25 3500.5 L65616.25 3500.5 L65616.25 3687 L65616.25 3687 L64655.75 3823.528837420527 L64655.8 3823.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70023.0 2818.9 L70023.7 2829.6 L70014.1 2824.7 L70013.4 2814.0 Z"></path>
+						<path d="M65383.7 2879.6 L65383.5 2890.4 L65374.4 2884.7 L65374.5 2874.0 Z"></path>
 					</g>
-					<path d="M70040.2 2829.1 L70304.25 3194 L68373 3375.5642722117204 L68373.0 3375.6 " fill="none"></path>
+					<path d="M65398.7 2890.0 L65656.25 3314 L63029 3496.846207668626 L63029.0 3496.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70039.0 2818.4 L70040.2 2829.1 L70030.4 2824.7 L70029.2 2814.0 Z"></path>
+						<path d="M65398.4 2879.2 L65398.7 2890.0 L65389.3 2884.7 L65389.0 2874.0 Z"></path>
 					</g>
-					<path d="M74696.0 680.2 L77226.5 966 L77226.5 1212.5 L77226.5 1212.5 L77226.5 1459 L77226.5 1459 L77226.5 1697.5 L77226.5 1697.5 L77226.5 1936 L77226.5 1936 L70300 2526.5480853947815 L70300.0 2526.5 " fill="none"></path>
-					<path d="M74696.6 674.9 L74696.0 680.2 L74695.4 685.5 L74682.8 678.7 Z"></path>
-					<path d="M62873.1 1831.8 L62632.5 1936 L69398 2525.6902237926975 L69398.0 2525.7 " fill="none"></path>
-					<path d="M62875.2 1836.7 L62873.1 1831.8 L62871.0 1826.9 L62885.4 1826.5 Z"></path>
+					<path d="M67685.8 668.2 L71147.75 966 L71147.75 1212.5 L71147.75 1212.5 L71147.75 1459 L71147.75 1459 L71147.75 1697.5 L71147.75 1697.5 L71147.75 1936 L71147.75 1936 L65688.75 2572.421489001692 L65688.8 2572.4 " fill="none"></path>
+					<path d="M67686.2 662.8 L67685.8 668.2 L67685.3 673.5 L67672.5 667.0 Z"></path>
+					<path d="M61992.9 1832.8 L61799.75 1936 L64786.75 2534.6163467132055 L64786.8 2534.6 " fill="none"></path>
+					<path d="M61995.4 1837.5 L61992.9 1832.8 L61990.4 1828.1 L62004.6 1826.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M69822.3 1264.2 L69849 1459 L69849 1697.5 L69849 1697.5 L69849 1936 L69849 1936 L69849 2316 L69849.0 2316.0 " fill="none"></path>
+						<path d="M65709.6 1262.6 L65599.5 1459 L65599.5 1697.5 L65599.5 1697.5 L65599.5 1936 L65599.5 1936 L65368.48403483309 2376 L65368.5 2376.0 " fill="none"></path>
 					</g>
-					<path d="M69827.6 1263.5 L69822.3 1264.2 L69817.0 1264.9 L69820.5 1251.0 Z"></path>
+					<path d="M65714.3 1265.2 L65709.6 1262.6 L65705.0 1260.0 L65716.2 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80214.5 1264.0 L80262 1459 L80262 1697.5 L80262 1697.5 L80262 1936 L80262 1936 L70300 2537.7572265437434 L70300.0 2537.8 " fill="none"></path>
+						<path d="M82116.8 1264.3 L82116.75 1459 L82116.75 1697.5 L82116.75 1697.5 L82116.75 1936 L82116.75 1936 L65688.75 2606.5902008412822 L65688.8 2606.6 " fill="none"></path>
 					</g>
-					<path d="M80219.7 1262.7 L80214.5 1264.0 L80209.3 1265.2 L80211.4 1251.0 Z"></path>
+					<path d="M82122.1 1264.3 L82116.8 1264.3 L82111.4 1264.3 L82116.8 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41322.2 1244.9 L40600 1459 L40600 1697.5 L40600 1697.5 L40600 1936 L40600 1936 L69398 2555.301241068071 L69398.0 2555.3 " fill="none"></path>
+						<path d="M41731.4 1251.4 L42012.25 1459 L42012.25 1697.5 L42012.25 1697.5 L42012.25 1936 L42012.25 1936 L64786.75 2611.620783190889 L64786.8 2611.6 " fill="none"></path>
 					</g>
-					<path d="M41323.7 1250.0 L41322.2 1244.9 L41320.7 1239.8 L41335.0 1241.1 Z"></path>
-					<path d="M69682.8 3505.7 L69682.75 3567 L69337.25 3678.2566872427983 L69337.3 3678.3 " fill="none"></path>
+					<path d="M41734.6 1247.1 L41731.4 1251.4 L41728.2 1255.7 L41720.7 1243.5 Z"></path>
+					<path d="M64937.8 3625.7 L64937.75 3687 L64655.75 3791.456804733728 L64655.8 3791.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69688.1 3496.3 L69682.8 3505.7 L69677.4 3496.3 L69682.8 3487.0 Z"></path>
+						<path d="M64943.1 3616.3 L64937.8 3625.7 L64932.4 3616.3 L64937.8 3607.0 Z"></path>
 					</g>
-					<path d="M70078.5 3268.9 L70344.25 3194 L70045.05286168521 2814 L70045.1 2814.0 " fill="none"></path>
+					<path d="M65355.9 3397.7 L65696.25 3314 L65403.448838896955 2874 L65403.4 2874.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70068.0 3266.3 L70078.5 3268.9 L70070.9 3276.6 L70060.5 3274.0 Z"></path>
+						<path d="M65345.5 3394.7 L65355.9 3397.7 L65348.1 3405.1 L65337.8 3402.1 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M69937.0 1224.3 L72351 1459 L72351 1697.5 L72351 1697.5 L72351 1936 L72351 1936 L72351 2565 L72351 2565 L72351 3194 L72351 3194 L70082.75 3352.5416002998218 L70082.8 3352.5 " fill="none"></path>
+						<path d="M65859.3 1239.2 L66860.75 1459 L66860.75 1697.5 L66860.75 1697.5 L66860.75 1936 L66860.75 1936 L66860.75 2625 L66860.75 2625 L66860.75 3314 L66860.75 3314 L65337.75 3461.7064482579303 L65337.8 3461.7 " fill="none"></path>
 					</g>
-					<path d="M69937.5 1219.0 L69937.0 1224.3 L69936.5 1229.6 L69923.8 1223.0 Z"></path>
+					<path d="M65860.4 1234.0 L65859.3 1239.2 L65858.1 1244.4 L65846.3 1236.3 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80222.6 1263.4 L80302 1459 L80302 1697.5 L80302 1697.5 L80302 1936 L80302 1936 L80302 2565 L80302 2565 L80302 3194 L80302 3194 L70082.75 3373.475021776491 L70082.8 3373.5 " fill="none"></path>
+						<path d="M82125.1 1264.2 L82156.75 1459 L82156.75 1697.5 L82156.75 1697.5 L82156.75 1936 L82156.75 1936 L82156.75 2625 L82156.75 2625 L82156.75 3314 L82156.75 3314 L65337.75 3496.1675765143154 L65337.8 3496.2 " fill="none"></path>
 					</g>
-					<path d="M80227.6 1261.4 L80222.6 1263.4 L80217.7 1265.4 L80217.6 1251.0 Z"></path>
+					<path d="M82130.4 1263.3 L82125.1 1264.2 L82119.9 1265.0 L82123.0 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41322.3 1246.5 L40640 1459 L40640 1697.5 L40640 1697.5 L40640 1936 L40640 1936 L40640 2565 L40640 2565 L40640 3194 L40640 3194 L69282.75 3377.931372717804 L69282.8 3377.9 " fill="none"></path>
+						<path d="M41788.3 1235.4 L42859.25 1459 L42859.25 1697.5 L42859.25 1697.5 L42859.25 1936 L42859.25 1936 L42859.25 2625 L42859.25 2625 L42859.25 3314 L42859.25 3314 L64537.75 3497.1211472699683 L64537.8 3497.1 " fill="none"></path>
 					</g>
-					<path d="M41323.9 1251.6 L41322.3 1246.5 L41320.7 1241.4 L41335.0 1242.6 Z"></path>
-					<path d="M75098.2 1889.8 L75033 1936 L75033 2565 L75033 2565 L75033 3194 L75033 3194 L67892.5 3379.70677032492 L67892.5 3379.7 " fill="none"></path>
+					<path d="M41789.4 1230.2 L41788.3 1235.4 L41787.2 1240.6 L41775.3 1232.7 Z"></path>
+					<path d="M69651.8 1755.6 L68513 1936 L68513 2625 L68513 2625 L68513 3314 L68513 3314 L63699.5 3499.325712221305 L63699.5 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75108.9 1888.7 L75098.2 1889.8 L75102.8 1880.0 L75113.5 1879.0 Z"></path>
+						<path d="M69661.9 1759.4 L69651.8 1755.6 L69660.2 1748.8 L69670.3 1752.6 Z"></path>
 					</g>
-					<path d="M75129.4 1890.7 L75073 1936 L75073 2565 L75073 2565 L75073 3194 L75073 3194 L75073 3342 L75073.0 3342.0 " fill="none"></path>
+					<path d="M69651.8 1757.1 L68553 1936 L68553 2625 L68553 2625 L68553 3314 L68553 3314 L71323.5 3492.417904005525 L71323.5 3492.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75140.0 1889.0 L75129.4 1890.7 L75133.3 1880.7 L75143.9 1879.0 Z"></path>
+						<path d="M69661.9 1760.9 L69651.8 1757.1 L69660.2 1750.4 L69670.3 1754.1 Z"></path>
 					</g>
-					<path d="M75260.9 1895.4 L75238.5 1936 L75238.5 2565 L75238.5 2565 L75238.5 3194 L75238.5 3194 L75238.5 3380.5 L75238.5 3380.5 L75238.5 3567 L75238.5 3567 L75238.5 3723.5 L75238.5 3723.5 L75238.5 3880 L75238.5 3880 L75239.91791044777 3900 L75239.9 3900.0 " fill="none"></path>
+					<path d="M69964.9 1897.0 L69954.5 1936 L69954.5 2625 L69954.5 2625 L69954.5 3314 L69954.5 3314 L69954.5 3500.5 L69954.5 3500.5 L69954.5 3687 L69954.5 3687 L69954.5 3843.5 L69954.5 3843.5 L69954.5 4000 L69954.5 4000 L71281.25 4120.593182974394 L71281.3 4120.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75270.0 1889.7 L75260.9 1895.4 L75260.7 1884.6 L75269.9 1879.0 Z"></path>
+						<path d="M69972.5 1889.4 L69964.9 1897.0 L69962.2 1886.6 L69969.7 1879.0 Z"></path>
 					</g>
-					<path d="M75293.6 1896.4 L75278.5 1936 L75278.5 2565 L75278.5 2565 L75278.5 3194 L75278.5 3194 L67791.5 3379.36114429842 L67791.5 3379.4 " fill="none"></path>
+					<path d="M69998.3 1897.6 L69994.5 1936 L69994.5 2625 L69994.5 2625 L69994.5 3314 L69994.5 3314 L63161 3499.2529616977977 L63161.0 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75302.0 1889.6 L75293.6 1896.4 L75292.0 1885.8 L75300.3 1879.0 Z"></path>
+						<path d="M70004.6 1888.8 L69998.3 1897.6 L69993.9 1887.8 L70000.2 1879.0 Z"></path>
 					</g>
-					<path d="M75610.1 1890.7 L75666.5 1936 L75666.5 2323.5 L75666.5 2323.5 " fill="none"></path>
+					<path d="M70311.1 1889.2 L70382.5 1936 L70382.5 2383.5 L70382.5 2383.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75606.2 1880.7 L75610.1 1890.7 L75599.5 1889.0 L75595.6 1879.0 Z"></path>
+						<path d="M70306.2 1879.7 L70311.1 1889.2 L70300.3 1888.6 L70295.4 1879.0 Z"></path>
 					</g>
-					<path d="M75713.9 1888.0 L75800.5 1936 L70300 2517.334873561287 L70300.0 2517.3 " fill="none"></path>
+					<path d="M70383.1 1872.1 L70516.5 1936 L65688.75 2566.133980582524 L65688.8 2566.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75708.3 1878.9 L75713.9 1888.0 L75703.1 1888.2 L75697.6 1879.0 Z"></path>
+						<path d="M70377.0 1863.3 L70383.1 1872.1 L70372.4 1872.9 L70366.3 1864.1 Z"></path>
 					</g>
-					<path d="M75734.4 1882.2 L75840.5 1936 L72311 2480.732057416268 L72311.0 2480.7 " fill="none"></path>
+					<path d="M70383.3 1859.3 L70556.5 1936 L66820.75 2537.1401296198983 L66820.8 2537.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75728.5 1873.3 L75734.4 1882.2 L75723.7 1882.8 L75717.8 1873.8 Z"></path>
+						<path d="M70376.9 1850.6 L70383.3 1859.3 L70372.6 1860.4 L70366.3 1851.7 Z"></path>
 					</g>
-					<path d="M75734.7 1867.9 L75880.5 1936 L68469.25 2530.506775067751 L68469.3 2530.5 " fill="none"></path>
+					<path d="M70383.5 1848.2 L70596.5 1936 L64019 2582.721013200143 L64019.0 2582.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75728.5 1859.1 L75734.7 1867.9 L75724.0 1868.8 L75717.8 1860.0 Z"></path>
+						<path d="M70376.9 1839.7 L70383.5 1848.2 L70372.8 1849.5 L70366.3 1841.0 Z"></path>
 					</g>
-					<path d="M75734.9 1855.6 L75920.5 1936 L71179 2513.8731834915716 L71179.0 2513.9 " fill="none"></path>
+					<path d="M70383.7 1838.5 L70636.5 1936 L67914 2533.0090706556334 L67914.0 2533.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75728.4 1847.0 L75734.9 1855.6 L75724.2 1856.8 L75717.8 1848.2 Z"></path>
+						<path d="M70376.9 1830.1 L70383.7 1838.5 L70373.0 1840.1 L70366.3 1831.7 Z"></path>
 					</g>
-					<path d="M75735.4 1824.8 L76054.5 1936 L76054.5 2565 L76054.5 2565 L76054.5 3194 L76054.5 3194 L68373 3379.233999224205 L68373.0 3379.2 " fill="none"></path>
+					<path d="M70384.0 1813.5 L70770.5 1936 L70770.5 2625 L70770.5 2625 L70770.5 3314 L70770.5 3314 L63029 3499.2437451886067 L63029.0 3499.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75728.3 1816.7 L75735.4 1824.8 L75724.8 1826.8 L75717.8 1818.7 Z"></path>
+						<path d="M70376.8 1805.6 L70384.0 1813.5 L70373.5 1815.7 L70366.3 1807.8 Z"></path>
 					</g>
-					<path d="M74696.0 678.2 L77351.25 966 L77351.25 1212.5 L77351.25 1212.5 L77351.25 1459 L77351.25 1459 L75717.75 1655.613550340651 L75717.8 1655.6 " fill="none"></path>
-					<path d="M74696.6 672.9 L74696.0 678.2 L74695.4 683.5 L74682.8 676.8 Z"></path>
+					<path d="M67685.8 667.8 L71187.75 966 L71187.75 1212.5 L71187.75 1212.5 L71187.75 1459 L71187.75 1459 L70366.25 1626.5312099187688 L70366.3 1626.5 " fill="none"></path>
+					<path d="M67686.2 662.4 L67685.8 667.8 L67685.3 673.1 L67672.5 666.6 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M69937.0 1224.2 L72391 1459 L75021.75 1669.6366344943349 L75021.8 1669.6 " fill="none"></path>
+						<path d="M65859.3 1238.3 L66900.75 1459 L69670.25 1670.8767441860466 L69670.3 1670.9 " fill="none"></path>
 					</g>
-					<path d="M69937.5 1218.8 L69937.0 1224.2 L69936.5 1229.5 L69923.8 1222.9 Z"></path>
-					<path d="M63208.0 1844.9 L63223.25 1936 L63223.25 2565 L63223.25 2565 L63223.25 3194 L63223.25 3194 L63223.25 3380.5 L63223.25 3380.5 L63223.25 3567 L63223.25 3567 L63223.25 3723.5 L63223.25 3723.5 L63223.25 3880 L63223.25 3880 L63111.60354477612 3998.5 L63111.6 3998.5 " fill="none"></path>
+					<path d="M65860.4 1233.0 L65859.3 1238.3 L65858.2 1243.5 L65846.3 1235.5 Z"></path>
+					<path d="M62031.3 1836.7 L61878 1936 L61878 2625 L61878 2625 L61878 3314 L61878 3314 L61878 3500.5 L61878 3500.5 L61878 3687 L61878 3687 L61878 3843.5 L61878 3843.5 L61878 4000 L61878 4000 L60846 4127.925994449583 L60846.0 4127.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63211.7 1834.8 L63208.0 1844.9 L63201.2 1836.6 L63204.9 1826.5 Z"></path>
+						<path d="M62042.0 1836.1 L62031.3 1836.7 L62036.2 1827.1 L62047.0 1826.5 Z"></path>
 					</g>
-					<path d="M63232.5 1844.2 L63263.25 1936 L63263.25 2565 L63263.25 2565 L63263.25 3194 L63263.25 3194 L63263.25 3380.5 L63263.25 3380.5 L63263.25 3567 L63263.25 3567 L69056.25 3719.7942192635037 L69056.3 3719.8 " fill="none"></path>
+					<path d="M62482.8 1835.9 L62654 1936 L62654 2625 L62654 2625 L62654 3314 L62654 3314 L62654 3500.5 L62654 3500.5 L62654 3687 L62654 3687 L64374.75 3831.6862995298857 L64374.8 3831.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63234.5 1833.7 L63232.5 1844.2 L63224.4 1837.0 L63226.5 1826.5 Z"></path>
+						<path d="M62477.4 1826.6 L62482.8 1835.9 L62472.0 1835.8 L62466.7 1826.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M69937.0 1224.0 L72431 1459 L63499.25 1689.350341975075 L63499.3 1689.4 " fill="none"></path>
+						<path d="M65859.3 1237.4 L66940.75 1459 L62562 1681.4467490281697 L62562.0 1681.4 " fill="none"></path>
 					</g>
-					<path d="M69937.5 1218.7 L69937.0 1224.0 L69936.5 1229.3 L69923.8 1222.7 Z"></path>
+					<path d="M65860.4 1232.2 L65859.3 1237.4 L65858.2 1242.6 L65846.3 1234.7 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41509.5 1249.2 L41956 1459 L62867.25 1693.9495636504964 L62867.3 1693.9 " fill="none"></path>
+						<path d="M41788.4 1231.2 L43121.25 1459 L61930 1693.5592426044784 L61930.0 1693.6 " fill="none"></path>
 					</g>
-					<path d="M41511.8 1244.3 L41509.5 1249.2 L41507.3 1254.0 L41497.5 1243.5 Z"></path>
+					<path d="M41789.3 1226.0 L41788.4 1231.2 L41787.5 1236.5 L41775.3 1229.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M46571.2 1227.7 L48010.5 1459 L48010.5 1697.5 L48010.5 1697.5 L48010.5 1936 L48010.5 1936 L48010.5 2565 L48010.5 2565 L48010.5 3194 L48010.5 3194 L54133.25 3375.0588456812147 L54133.3 3375.1 " fill="none"></path>
+						<path d="M50693.9 1265.7 L51027.75 1459 L51027.75 1697.5 L51027.75 1697.5 L51027.75 1936 L51027.75 1936 L51027.75 2625 L51027.75 2625 L51027.75 3314 L51027.75 3314 L53009 3484.6514836623946 L53009.0 3484.7 " fill="none"></path>
 					</g>
-					<path d="M46572.0 1222.4 L46571.2 1227.7 L46570.3 1233.0 L46558.0 1225.6 Z"></path>
-					<path d="M48974.7 1832.5 L48668.25 1936 L48668.25 2565 L48668.25 2565 L48668.25 3194 L48668.25 3194 L39842.75 3376.7418396802486 L39842.8 3376.7 " fill="none"></path>
+					<path d="M50696.5 1261.1 L50693.9 1265.7 L50691.2 1270.3 L50682.3 1259.0 Z"></path>
+					<path d="M52425.8 1778.9 L51263.75 1936 L51263.75 2625 L51263.75 2625 L51263.75 3314 L51263.75 3314 L33004.5 3498.664404918455 L33004.5 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48985.3 1834.5 L48974.7 1832.5 L48981.8 1824.4 L48992.4 1826.5 Z"></path>
+						<path d="M52435.7 1783.0 L52425.8 1778.9 L52434.3 1772.4 L52444.3 1776.4 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M46571.3 1220.6 L49374.25 1459 L49374.25 1568.5 L49374.3 1568.5 " fill="none"></path>
+						<path d="M50696.8 1222.1 L53028.25 1459 L53028.25 1568.5 L53028.3 1568.5 " fill="none"></path>
+					</g>
+					<path d="M50697.3 1216.8 L50696.8 1222.1 L50696.2 1227.4 L50683.5 1220.8 Z"></path>
+					<path d="M52431.1 1789.2 L51475.75 1936 L51475.75 2541 L51475.8 2541.0 " fill="none"></path>
+					<path d="M52431.9 1794.5 L52431.1 1789.2 L52430.3 1784.0 L52444.3 1787.2 Z"></path>
+					<path d="M52431.2 1821.9 L51883.75 1936 L51883.75 2556 L51883.8 2556.0 " fill="none"></path>
+					<path d="M52432.3 1827.1 L52431.2 1821.9 L52430.1 1816.7 L52444.3 1819.2 Z"></path>
+					<path d="M52651.9 1831.0 L52355.75 1936 L52355.75 2556 L52355.8 2556.0 " fill="none"></path>
+					<path d="M52653.7 1836.0 L52651.9 1831.0 L52650.2 1825.9 L52664.5 1826.5 Z"></path>
+					<path d="M53151.5 1836.5 L53239.75 1936 L53239.75 2548.5 L53239.8 2548.5 " fill="none"></path>
+					<path d="M53155.5 1832.9 L53151.5 1836.5 L53147.5 1840.0 L53142.6 1826.5 Z"></path>
+					<path d="M53687.8 2787.7 L53687.75 3314 L22146 3500.3286863631683 L22146.0 3500.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M53693.1 2778.3 L53687.8 2787.7 L53682.4 2778.3 L53687.8 2769.0 Z"></path>
 					</g>
-					<path d="M46571.7 1215.2 L46571.3 1220.6 L46570.8 1225.9 L46558.0 1219.4 Z"></path>
-					<path d="M49971.3 1827.6 L50469 1936 L50469 2481 L50469.0 2481.0 " fill="none"></path>
-					<path d="M49972.4 1822.4 L49971.3 1827.6 L49970.1 1832.8 L49958.3 1824.7 Z"></path>
-					<path d="M49971.4 1792.3 L50877 1936 L50877 2496 L50877.0 2496.0 " fill="none"></path>
-					<path d="M49972.3 1787.0 L49971.4 1792.3 L49970.6 1797.5 L49958.3 1790.2 Z"></path>
-					<path d="M51285.0 2727.7 L51285 3194 L21733 3380.3171630438455 L21733.0 3380.3 " fill="none"></path>
+					<path d="M53397.5 1831.0 L53687.75 1936 L53687.75 2481 L53687.8 2481.0 " fill="none"></path>
+					<path d="M53399.3 1826.0 L53397.5 1831.0 L53395.7 1836.0 L53385.0 1826.5 Z"></path>
+					<path d="M54807.8 2727.7 L54807.75 3314 L55297.59852546917 3485 L55297.6 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51290.3 2718.3 L51285.0 2727.7 L51279.7 2718.3 L51285.0 2709.0 Z"></path>
+						<path d="M54813.1 2718.3 L54807.8 2727.7 L54802.4 2718.3 L54807.8 2709.0 Z"></path>
 					</g>
-					<path d="M49971.5 1772.0 L51285 1936 L51285 2421 L51285.0 2421.0 " fill="none"></path>
-					<path d="M49972.1 1766.8 L49971.5 1772.0 L49970.8 1777.3 L49958.3 1770.4 Z"></path>
-					<path d="M51669.0 2667.7 L51669 3194 L55318.75 3375.623207257688 L55318.8 3375.6 " fill="none"></path>
+					<path d="M53625.5 1777.5 L54807.75 1936 L54807.75 2541 L54807.8 2541.0 " fill="none"></path>
+					<path d="M53626.2 1772.3 L53625.5 1777.5 L53624.8 1782.8 L53612.3 1775.8 Z"></path>
+					<path d="M27992.5 1762.7 L27992.5 1936 L48215.75 2608.1653300208636 L48215.8 2608.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51674.3 2658.3 L51669.0 2667.7 L51663.7 2658.3 L51669.0 2649.0 Z"></path>
+						<path d="M27997.8 1753.3 L27992.5 1762.7 L27987.2 1753.3 L27992.5 1744.0 Z"></path>
 					</g>
-					<path d="M49971.5 1759.6 L51669 1936 L51669 2481 L51669.0 2481.0 " fill="none"></path>
-					<path d="M49972.1 1754.3 L49971.5 1759.6 L49971.0 1764.9 L49958.3 1758.2 Z"></path>
-					<path d="M32327.3 1785.2 L32327.25 1936 L55092.25 2551.309928453258 L55092.3 2551.3 " fill="none"></path>
+					<path d="M30145.5 1222.3 L27992.5 1459 L27992.5 1651 L27992.5 1651.0 " fill="none"></path>
+					<path d="M30146.1 1227.6 L30145.5 1222.3 L30144.9 1217.0 L30158.8 1220.9 Z"></path>
+					<path d="M28384.5 1785.2 L28384.5 1936 L48215.75 2607.840850143207 L48215.8 2607.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32332.6 1775.8 L32327.3 1785.2 L32321.9 1775.8 L32327.3 1766.5 Z"></path>
+						<path d="M28389.8 1775.8 L28384.5 1785.2 L28379.2 1775.8 L28384.5 1766.5 Z"></path>
 					</g>
-					<path d="M31908.6 1234.3 L32327.25 1459 L32327.25 1628.5 L32327.3 1628.5 " fill="none"></path>
-					<path d="M31911.1 1229.6 L31908.6 1234.3 L31906.1 1239.0 L31896.9 1228.0 Z"></path>
-					<path d="M39860.5 3316.0 L39872.75 3312 L39880.25 3312 L39880.25 3312 L39887.75 3380.5 L39887.75 3380.5 L39880.25 3449 L39880.25 3449 L39872.75 3449 L39872.75 3449 L39842.75 3439.2836879432625 L39842.8 3439.3 " fill="none"></path>
+					<path d="M30145.5 1224.4 L28384.5 1459 L28384.5 1628.5 L28384.5 1628.5 " fill="none"></path>
+					<path d="M30146.2 1229.7 L30145.5 1224.4 L30144.8 1219.1 L30158.8 1222.6 Z"></path>
+					<path d="M33021.9 3422.0 L33034.5 3417 L33042 3417 L33042 3417 L33049.5 3500.5 L33049.5 3500.5 L33042 3584 L33042 3584 L33034.5 3584 L33034.5 3584 L33004.5 3572.1560283687945 L33004.5 3572.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39850.0 3313.8 L39860.5 3316.0 L39853.3 3323.9 L39842.8 3321.7 Z"></path>
+						<path d="M33011.2 3420.5 L33021.9 3422.0 L33015.1 3430.4 L33004.5 3428.8 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3124.3 2591.3 L3561.5 3194 L39479.75 3379.5623273014357 L39479.8 3379.6 " fill="none"></path>
+						<path d="M3122.9 2651.6 L3561.5 3314 L32641.5 3499.343198400629 L32641.5 3499.3 " fill="none"></path>
 					</g>
-					<path d="M3128.6 2588.2 L3124.3 2591.3 L3120.0 2594.4 L3116.5 2580.5 Z"></path>
-					<path d="M55598.8 1747.2 L55598.75 1936 L55598.75 1956 L55598.8 1956.0 " fill="none"></path>
+					<path d="M3127.3 2648.7 L3122.9 2651.6 L3118.4 2654.6 L3115.5 2640.5 Z"></path>
+					<path d="M28776.5 1762.7 L28776.5 1936 L48215.75 2607.5036160585587 L48215.8 2607.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55604.1 1737.8 L55598.8 1747.2 L55593.4 1737.8 L55598.8 1728.5 Z"></path>
+						<path d="M28781.8 1753.3 L28776.5 1762.7 L28771.2 1753.3 L28776.5 1744.0 Z"></path>
 					</g>
-					<path d="M32719.3 1762.7 L32719.25 1936 L55092.25 2551.075373150637 L55092.3 2551.1 " fill="none"></path>
+					<path d="M30145.6 1227.6 L28776.5 1459 L28776.5 1651 L28776.5 1651.0 " fill="none"></path>
+					<path d="M30146.5 1232.8 L30145.6 1227.6 L30144.7 1222.3 L30158.8 1225.3 Z"></path>
+					<path d="M55220.3 1747.2 L55220.25 1936 L49228.75 2571.2944752231456 L49228.8 2571.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32724.6 1753.3 L32719.3 1762.7 L32713.9 1753.3 L32719.3 1744.0 Z"></path>
+						<path d="M55225.6 1737.8 L55220.3 1747.2 L55214.9 1737.8 L55220.3 1728.5 Z"></path>
 					</g>
-					<path d="M31934.3 1231.7 L32719.25 1459 L32719.25 1651 L32719.3 1651.0 " fill="none"></path>
-					<path d="M31935.8 1226.6 L31934.3 1231.7 L31932.9 1236.8 L31921.5 1228.0 Z"></path>
-					<path d="M33111.3 1762.7 L33111.25 1936 L55092.25 2550.832640355753 L55092.3 2550.8 " fill="none"></path>
+					<path d="M29168.5 1762.7 L29168.5 1936 L48215.75 2607.1528607044684 L48215.8 2607.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33116.6 1753.3 L33111.3 1762.7 L33105.9 1753.3 L33111.3 1744.0 Z"></path>
+						<path d="M29173.8 1753.3 L29168.5 1762.7 L29163.2 1753.3 L29168.5 1744.0 Z"></path>
 					</g>
-					<path d="M31957.1 1230.2 L33111.25 1459 L33111.25 1651 L33111.3 1651.0 " fill="none"></path>
-					<path d="M31958.1 1224.9 L31957.1 1230.2 L31956.0 1235.4 L31944.0 1227.6 Z"></path>
-					<path d="M55075.3 2805.7 L54231 3194 L39842.75 3378.176710307315 L39842.8 3378.2 " fill="none"></path>
+					<path d="M30154.7 1231.0 L29168.5 1459 L29168.5 1651 L29168.5 1651.0 " fill="none"></path>
+					<path d="M30155.9 1236.2 L30154.7 1231.0 L30153.5 1225.8 L30167.7 1228.0 Z"></path>
+					<path d="M29560.5 1762.7 L29560.5 1936 L48215.75 2606.787754250003 L48215.8 2606.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55086.0 2806.7 L55075.3 2805.7 L55081.5 2797.0 L55092.3 2797.9 Z"></path>
+						<path d="M29565.8 1753.3 L29560.5 1762.7 L29555.2 1753.3 L29560.5 1744.0 Z"></path>
 					</g>
-					<path d="M55075.4 2812.9 L54271 3194 L64901 3379.5139662190613 L64901.0 3379.5 " fill="none"></path>
+					<path d="M30179.8 1232.6 L29560.5 1459 L29560.5 1651 L29560.5 1651.0 " fill="none"></path>
+					<path d="M30181.7 1237.6 L30179.8 1232.6 L30178.0 1227.6 L30192.4 1228.0 Z"></path>
+					<path d="M48365.0 3310.6 L48363.25 3314 L33004.5 3498.3218014510708 L33004.5 3498.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55086.1 2813.8 L55075.4 2812.9 L55081.5 2804.1 L55092.3 2804.9 Z"></path>
+						<path d="M48374.1 3304.7 L48365.0 3310.6 L48364.6 3299.8 L48373.7 3294.0 Z"></path>
 					</g>
-					<path d="M56024.4 3189.4 L56027.5 3194 L56027.5 3380.5 L56027.5 3380.5 L56027.5 3567 L56027.5 3567 L56027.5 3723.5 L56027.5 3723.5 L56027.5 3880 L56027.5 3880 L63048 4013.0712214442324 L63048.0 4013.1 " fill="none"></path>
+					<path d="M48404.7 3310.9 L48403.25 3314 L59231.75 3499.5319476343593 L59231.8 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56023.5 3178.7 L56024.4 3189.4 L56014.7 3184.7 L56013.9 3174.0 Z"></path>
+						<path d="M48413.4 3304.7 L48404.7 3310.9 L48403.7 3300.2 L48412.5 3294.0 Z"></path>
 					</g>
-					<path d="M56063.7 3189.0 L56067.5 3194 L25860.75 3380.0749568549086 L25860.8 3380.1 " fill="none"></path>
+					<path d="M48961.7 3311.6 L48962.5 3314 L48962.5 3500.5 L48962.5 3500.5 L48962.5 3687 L48962.5 3687 L48962.5 3843.5 L48962.5 3843.5 L48962.5 4000 L48962.5 4000 L60748 4133.445181460983 L60748.0 4133.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56062.4 3178.3 L56063.7 3189.0 L56053.9 3184.7 L56052.6 3174.0 Z"></path>
+						<path d="M48963.6 3301.1 L48961.7 3311.6 L48953.6 3304.6 L48955.5 3294.0 Z"></path>
 					</g>
-					<path d="M56103.1 3188.5 L56107.5 3194 L68268 3379.698292802751 L68268.0 3379.7 " fill="none"></path>
+					<path d="M49023.5 3311.1 L49024.75 3314 L26128.5 3499.93965338936 L26128.5 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56101.3 3177.9 L56103.1 3188.5 L56093.0 3184.6 L56091.3 3174.0 Z"></path>
+						<path d="M49024.6 3300.4 L49023.5 3311.1 L49014.8 3304.7 L49016.0 3294.0 Z"></path>
 					</g>
-					<path d="M67268.0 1732.7 L67885.25 1936 L56105.25 2539.070036218614 L56105.3 2539.1 " fill="none"></path>
-					<path d="M67269.7 1727.6 L67268.0 1732.7 L67266.4 1737.7 L67255.4 1728.5 Z"></path>
+					<path d="M49063.1 3310.7 L49064.75 3314 L62924 3499.796188473772 L62924.0 3499.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M49063.7 3300.0 L49063.1 3310.7 L49054.2 3304.7 L49054.8 3294.0 Z"></path>
+					</g>
+					<path d="M57832.2 1737.6 L58044.5 1936 L49228.75 2587.5649923569954 L49228.8 2587.6 " fill="none"></path>
+					<path d="M57835.8 1733.7 L57832.2 1737.6 L57828.5 1741.5 L57822.4 1728.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80230.5 1262.6 L80342 1459 L80342 1697.5 L80342 1697.5 L80342 1936 L80342 1936 L56105.25 2552.124225798955 L56105.3 2552.1 " fill="none"></path>
+						<path d="M82133.4 1263.7 L82196.75 1459 L82196.75 1697.5 L82196.75 1697.5 L82196.75 1936 L82196.75 1936 L49228.75 2614.574795740041 L49228.8 2614.6 " fill="none"></path>
 					</g>
-					<path d="M80235.1 1260.0 L80230.5 1262.6 L80225.8 1265.2 L80223.9 1251.0 Z"></path>
-					<path d="M57350.3 1754.7 L57350.25 1936 L56105.25 2383.105338281473 L56105.3 2383.1 " fill="none"></path>
+					<path d="M82138.4 1262.0 L82133.4 1263.7 L82128.3 1265.3 L82129.2 1251.0 Z"></path>
+					<path d="M56347.3 1754.7 L56347.25 1936 L49228.75 2579.2323278688523 L49228.8 2579.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57355.6 1745.3 L57350.3 1754.7 L57344.9 1745.3 L57350.3 1736.0 Z"></path>
+						<path d="M56352.6 1745.3 L56347.3 1754.7 L56341.9 1745.3 L56347.3 1736.0 Z"></path>
 					</g>
-					<path d="M52735.1 1770.5 L53112 1936 L53112 2549.5 L53112.0 2549.5 " fill="none"></path>
+					<path d="M55876.4 1794.7 L56016.75 1936 L56016.75 2609.5 L56016.8 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M52728.7 1761.8 L52735.1 1770.5 L52724.4 1771.6 L52718.0 1762.9 Z"></path>
+						<path d="M55873.6 1784.4 L55876.4 1794.7 L55866.0 1791.9 L55863.2 1781.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M46571.3 1216.3 L52569 1459 L52569 1613.5 L52569.0 1613.5 " fill="none"></path>
+						<path d="M50696.8 1217.0 L55779.75 1459 L55779.75 1613.5 L55779.8 1613.5 " fill="none"></path>
 					</g>
-					<path d="M46571.5 1211.0 L46571.3 1216.3 L46571.1 1221.7 L46558.0 1215.8 Z"></path>
-					<path d="M79616.8 1285.2 L79616.75 1459 L79616.75 1546 L79616.8 1546.0 " fill="none"></path>
+					<path d="M50697.1 1211.7 L50696.8 1217.0 L50696.6 1222.3 L50683.5 1216.4 Z"></path>
+					<path d="M81611.5 1285.2 L81611.5 1459 L81611.5 1546 L81611.5 1546.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M79622.1 1275.8 L79616.8 1285.2 L79611.4 1275.8 L79616.8 1266.5 Z"></path>
+						<path d="M81616.8 1275.8 L81611.5 1285.2 L81606.2 1275.8 L81611.5 1266.5 Z"></path>
 					</g>
-					<path d="M79058.2 162.1 L79616.75 293 L79616.75 629.5 L79616.75 629.5 L79616.75 966 L79616.75 966 L79616.75 1158.5 L79616.8 1158.5 " fill="none"></path>
-					<path d="M79059.4 156.9 L79058.2 162.1 L79057.0 167.2 L79045.3 159.0 Z"></path>
-					<path d="M79382.1 1859.6 L79271.5 1936 L79271.5 2565 L79271.5 2565 L79271.5 3194 L79271.5 3194 L65014 3379.763850076848 L65014.0 3379.8 " fill="none"></path>
+					<path d="M81214.5 170.1 L81611.5 293 L81611.5 629.5 L81611.5 629.5 L81611.5 966 L81611.5 966 L81611.5 1158.5 L81611.5 1158.5 " fill="none"></path>
+					<path d="M81216.1 165.1 L81214.5 170.1 L81212.9 175.2 L81201.8 166.2 Z"></path>
+					<path d="M81463.9 1862.9 L81398.75 1936 L81398.75 2625 L81398.75 2625 L81398.75 3314 L81398.75 3314 L59344.75 3500.02342778318 L59344.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M79392.8 1858.7 L79382.1 1859.6 L79386.7 1849.9 L79397.4 1849.0 Z"></path>
+						<path d="M81474.1 1859.5 L81463.9 1862.9 L81466.2 1852.4 L81476.4 1849.0 Z"></path>
 					</g>
-					<path d="M79809.8 1861.1 L79898.25 1936 L79898.25 2565 L79898.25 2565 L79898.25 3194 L79898.25 3194 L70852 3378.7639288158794 L70852.0 3378.8 " fill="none"></path>
+					<path d="M81640.0 1867.4 L81651.5 1936 L81651.5 2625 L81651.5 2625 L81651.5 3314 L81651.5 3314 L71784.5 3498.9071040996782 L71784.5 3498.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M79806.1 1851.0 L79809.8 1861.1 L79799.2 1859.1 L79795.6 1849.0 Z"></path>
+						<path d="M81643.7 1857.3 L81640.0 1867.4 L81633.2 1859.1 L81636.9 1849.0 Z"></path>
 					</g>
-					<path d="M35177.0 1710.9 L36770.5 1936 L33511.75 2545.184560517126 L33511.8 2545.2 " fill="none"></path>
-					<path d="M35177.7 1705.7 L35177.0 1710.9 L35176.2 1716.2 L35163.8 1709.1 Z"></path>
-					<path d="M58693.0 3803.2 L58693 3880 L17993.5 4013.763364114639 L17993.5 4013.8 " fill="none"></path>
+					<path d="M34657.5 1707.5 L36840.25 1936 L35110.25435413643 2594 L35110.3 2594.0 " fill="none"></path>
+					<path d="M34658.1 1702.2 L34657.5 1707.5 L34657.0 1712.8 L34644.3 1706.1 Z"></path>
+					<path d="M46092.8 3923.2 L46092.75 4000 L18421.25 4133.652242867699 L18421.3 4133.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58698.3 3793.8 L58693.0 3803.2 L58687.7 3793.8 L58693.0 3784.5 Z"></path>
+						<path d="M46098.1 3913.8 L46092.8 3923.2 L46087.4 3913.8 L46092.8 3904.5 Z"></path>
 					</g>
-					<path d="M57816.8 2614.7 L57816.75 3194 L24962.75 3379.663626446882 L24962.8 3379.7 " fill="none"></path>
+					<path d="M58006.8 2674.7 L58006.75 3314 L27921.75 3499.5870241127245 L27921.8 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57822.1 2605.3 L57816.8 2614.7 L57811.4 2605.3 L57816.8 2596.0 Z"></path>
+						<path d="M58012.1 2665.3 L58006.8 2674.7 L58001.4 2665.3 L58006.8 2656.0 Z"></path>
 					</g>
-					<path d="M58117.3 2637.7 L58117.25 3194 L21335.5 3380.3201726093066 L21335.5 3380.3 " fill="none"></path>
+					<path d="M58307.3 2697.7 L58307.25 3314 L21936.75 3500.3181412404547 L21936.8 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58122.6 2628.3 L58117.3 2637.7 L58111.9 2628.3 L58117.3 2619.0 Z"></path>
+						<path d="M58312.6 2688.3 L58307.3 2697.7 L58301.9 2688.3 L58307.3 2679.0 Z"></path>
 					</g>
-					<path d="M73863.6 2771.4 L73701 3194 L74947.5 3363.440415451895 L74947.5 3363.4 " fill="none"></path>
+					<path d="M69032.3 2827.9 L68596.25 3314 L71323.5 3492.295372885812 L71323.5 3492.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73871.9 2764.6 L73863.6 2771.4 L73862.0 2760.8 L73870.3 2754.0 Z"></path>
+						<path d="M69042.5 2824.5 L69032.3 2827.9 L69034.5 2817.4 L69044.7 2814.0 Z"></path>
 					</g>
-					<path d="M73876.6 2771.8 L73741 3194 L73741 3380.5 L73741 3380.5 L73741 3567 L73741 3567 L73741 3723.5 L73741 3723.5 L73741 3880 L73741 3880 L75100.5 4000.8845388188456 L75100.5 4000.9 " fill="none"></path>
+					<path d="M69043.7 2828.3 L68636.25 3314 L68636.25 3500.5 L68636.25 3500.5 L68636.25 3687 L68636.25 3687 L68636.25 3843.5 L68636.25 3843.5 L68636.25 4000 L68636.25 4000 L71281.25 4126.922112802149 L71281.3 4126.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73884.5 2764.5 L73876.6 2771.8 L73874.4 2761.3 L73882.3 2754.0 Z"></path>
+						<path d="M69053.8 2824.6 L69043.7 2828.3 L69045.6 2817.7 L69055.7 2814.0 Z"></path>
 					</g>
-					<path d="M73940.9 2772.7 L73936.5 3194 L73936.5 3319 L73936.5 3319.0 " fill="none"></path>
+					<path d="M69196.2 2832.6 L69154.25 3314 L69154.25 3439 L69154.3 3439.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73946.3 2763.4 L73940.9 2772.7 L73935.6 2763.3 L73941.0 2754.0 Z"></path>
+						<path d="M69202.3 2823.8 L69196.2 2832.6 L69191.7 2822.8 L69197.8 2814.0 Z"></path>
 					</g>
-					<path d="M74067.8 2769.9 L74326 3194 L67791.5 3379.1962996732773 L67791.5 3379.2 " fill="none"></path>
+					<path d="M69352.8 2829.5 L69681 3314 L63161 3499.1934206518426 L63161.0 3499.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M74067.5 2759.2 L74067.8 2769.9 L74058.4 2764.7 L74058.1 2754.0 Z"></path>
+						<path d="M69351.9 2818.7 L69352.8 2829.5 L69343.1 2824.7 L69342.3 2814.0 Z"></path>
 					</g>
-					<path d="M74080.5 2769.5 L74366 3194 L70852 3376.095304251181 L70852.0 3376.1 " fill="none"></path>
+					<path d="M69364.3 2829.0 L69721 3314 L71614.5 3492.487616881476 L71614.5 3492.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M74079.7 2758.8 L74080.5 2769.5 L74070.9 2764.7 L74070.1 2754.0 Z"></path>
+						<path d="M69363.1 2818.4 L69364.3 2829.0 L69354.5 2824.7 L69353.3 2814.0 Z"></path>
 					</g>
-					<path d="M74093.2 2769.0 L74406 3194 L45362.25 3379.675309149806 L45362.3 3379.7 " fill="none"></path>
+					<path d="M69375.8 2828.6 L69761 3314 L37746.25 3499.751534124052 L37746.3 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M74091.9 2758.4 L74093.2 2769.0 L74083.4 2764.7 L74082.1 2754.0 Z"></path>
+						<path d="M69374.2 2818.0 L69375.8 2828.6 L69365.9 2824.6 L69364.2 2814.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M80576.6 175.7 L80426.75 293 L80426.75 629.5 L80426.75 629.5 L80426.75 966 L80426.75 966 L80426.75 1212.5 L80426.75 1212.5 L80426.75 1459 L80426.75 1459 L80426.75 1697.5 L80426.75 1697.5 L80426.75 1936 L80426.75 1936 L74250 2535.217389627916 L74250.0 2535.2 " fill="none"></path>
+						<path d="M82542.0 173.1 L82281.5 293 L82281.5 629.5 L82281.5 629.5 L82281.5 966 L82281.5 966 L82281.5 1212.5 L82281.5 1212.5 L82281.5 1459 L82281.5 1459 L82281.5 1697.5 L82281.5 1697.5 L82281.5 1936 L82281.5 1936 L69521.25 2608.8127379517496 L69521.3 2608.8 " fill="none"></path>
 					</g>
-					<path d="M80579.9 179.9 L80576.6 175.7 L80573.3 171.5 L80587.1 167.5 Z"></path>
+					<path d="M82544.3 177.9 L82542.0 173.1 L82539.8 168.2 L82554.2 167.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3125.7 2591.0 L3601.5 3194 L24666.75 3379.1988320978635 L24666.8 3379.2 " fill="none"></path>
+						<path d="M3124.2 2651.3 L3601.5 3314 L27625.75 3499.3581120913445 L27625.8 3499.4 " fill="none"></path>
 					</g>
-					<path d="M3129.9 2587.7 L3125.7 2591.0 L3121.6 2594.3 L3117.5 2580.5 Z"></path>
-					<path d="M58281.9 1762.9 L57598.25 1936 L57598.25 2549.5 L57598.3 2549.5 " fill="none"></path>
+					<path d="M3128.5 2648.2 L3124.2 2651.3 L3119.9 2654.4 L3116.4 2640.5 Z"></path>
+					<path d="M56632.0 1832.8 L56436.25 1936 L56436.25 2609.5 L56436.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58292.3 1765.7 L58281.9 1762.9 L58289.6 1755.4 L58300.0 1758.3 Z"></path>
+						<path d="M56642.7 1833.1 L56632.0 1832.8 L56637.8 1823.7 L56648.5 1824.1 Z"></path>
 					</g>
-					<path d="M58524.5 1860.1 L58517.25 1936 L58517.25 2549.5 L58517.3 2549.5 " fill="none"></path>
+					<path d="M56798.3 1857.8 L56754.25 1936 L56754.25 2609.5 L56754.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58530.7 1851.3 L58524.5 1860.1 L58520.1 1850.3 L58526.3 1841.5 Z"></path>
+						<path d="M56807.5 1852.2 L56798.3 1857.8 L56798.2 1847.0 L56807.4 1841.5 Z"></path>
 					</g>
-					<path d="M58798.1 1762.9 L59481.75 1936 L59481.75 2565 L59481.75 2565 L59481.75 3194 L59481.75 3194 L21335.5 3380.326599095117 L21335.5 3380.3 " fill="none"></path>
+					<path d="M56952.3 1858.9 L56982.75 1936 L56982.75 2625 L56982.75 2625 L56982.75 3314 L56982.75 3314 L21936.75 3500.3112751735243 L21936.8 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58790.4 1755.4 L58798.1 1762.9 L58787.7 1765.7 L58780.0 1758.3 Z"></path>
+						<path d="M56953.8 1848.2 L56952.3 1858.9 L56943.9 1852.1 L56945.4 1841.5 Z"></path>
 					</g>
-					<path d="M58798.3 1747.7 L59767.25 1936 L73636 2551.377934148105 L73636.0 2551.4 " fill="none"></path>
+					<path d="M57089.2 1852.9 L57196.5 1936 L68907.25 2607.399117971334 L68907.3 2607.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58790.2 1740.7 L58798.3 1747.7 L58788.1 1751.2 L58780.0 1744.1 Z"></path>
+						<path d="M57085.1 1843.0 L57089.2 1852.9 L57078.6 1851.4 L57074.5 1841.5 Z"></path>
 					</g>
-					<path d="M2868.7 3281.2 L2882 3274.5 L2889.5 3274.5 L2889.5 3274.5 L2897 3380.5 L2897 3380.5 L2889.5 3486.5 L2889.5 3486.5 L2882 3486.5 L2882 3486.5 L2852 3471.393111638955 L2852.0 3471.4 " fill="none"></path>
+					<path d="M2855.7 3401.2 L2869 3394.5 L2876.5 3394.5 L2876.5 3394.5 L2884 3500.5 L2884 3500.5 L2876.5 3606.5 L2876.5 3606.5 L2869 3606.5 L2869 3606.5 L2839 3591.393111638955 L2839.0 3591.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2857.9 3280.6 L2868.7 3281.2 L2862.7 3290.2 L2852.0 3289.6 Z"></path>
+						<path d="M2844.9 3400.6 L2855.7 3401.2 L2849.7 3410.2 L2839.0 3409.6 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3127.1 2590.6 L3641.5 3194 L2852 3345.795618556701 L2852.0 3345.8 " fill="none"></path>
+						<path d="M3125.5 2651.0 L3641.5 3314 L2839 3466.254577822991 L2839.0 3466.3 " fill="none"></path>
 					</g>
-					<path d="M3131.2 2587.2 L3127.1 2590.6 L3123.1 2594.1 L3118.5 2580.5 Z"></path>
-					<path d="M59703.2 2681.9 L59621.75 3194 L67831.5 3379.809699341646 L67831.5 3379.8 " fill="none"></path>
+					<path d="M3129.7 2647.7 L3125.5 2651.0 L3121.3 2654.3 L3117.3 2640.5 Z"></path>
+					<path d="M59400.3 2738.5 L58975.75 3314 L63638.5 3499.2879933947693 L63638.5 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59709.9 2673.6 L59703.2 2681.9 L59699.4 2671.9 L59706.1 2663.5 Z"></path>
+						<path d="M59410.1 2734.2 L59400.3 2738.5 L59401.5 2727.8 L59411.3 2723.5 Z"></path>
 					</g>
-					<path d="M59725.5 2682.2 L59741.75 3194 L59741.75 3365 L59741.8 3365.0 " fill="none"></path>
+					<path d="M59416.0 2739.6 L59075.25 3314 L59075.25 3485 L59075.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59730.5 2672.7 L59725.5 2682.2 L59719.8 2673.0 L59724.9 2663.5 Z"></path>
+						<path d="M59425.4 2734.2 L59416.0 2739.6 L59416.2 2728.8 L59425.6 2723.5 Z"></path>
 					</g>
-					<path d="M59771.6 2680.6 L59992.75 3194 L59992.75 3365 L59992.8 3365.0 " fill="none"></path>
+					<path d="M59552.5 2739.5 L59896 3314 L59898.979892761396 3485 L59899.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59772.8 2670.0 L59771.6 2680.6 L59763.0 2674.2 L59764.2 2663.5 Z"></path>
+						<path d="M59552.3 2728.8 L59552.5 2739.5 L59543.1 2734.2 L59542.9 2723.5 Z"></path>
 					</g>
-					<path d="M31957.3 1216.7 L37153.75 1459 L37153.75 1666.5 L37153.8 1666.5 " fill="none"></path>
-					<path d="M31957.6 1211.3 L31957.3 1216.7 L31957.1 1222.0 L31944.0 1216.0 Z"></path>
+					<path d="M30324.1 1215.3 L38039.25 1459 L38039.25 1666.5 L38039.3 1666.5 " fill="none"></path>
+					<path d="M30324.2 1210.0 L30324.1 1215.3 L30323.9 1220.7 L30310.8 1214.9 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80649.0 1446.8 L80632.25 1459 L77186.5 1688.668518130371 L77186.5 1688.7 " fill="none"></path>
+						<path d="M82484.8 1434.5 L82447 1459 L81069 1676.578947368421 L81069.0 1676.6 " fill="none"></path>
 					</g>
-					<path d="M80652.2 1451.1 L80649.0 1446.8 L80645.9 1442.5 L80659.8 1439.0 Z"></path>
-					<path d="M79493.0 2689.9 L79412.25 3194 L79412.25 3380.5 L79412.25 3380.5 L79412.25 3567 L79412.25 3567 L79412.25 3723.5 L79412.25 3723.5 L79412.25 3880 L79412.25 3880 L80391.5 4006.9354292623943 L80391.5 4006.9 " fill="none"></path>
+					<path d="M82487.7 1438.9 L82484.8 1434.5 L82481.9 1430.0 L82496.0 1427.2 Z"></path>
+					<path d="M81867.5 2749.8 L81752.25 3314 L81752.25 3500.5 L81752.25 3500.5 L81752.25 3687 L81752.25 3687 L81752.25 3843.5 L81752.25 3843.5 L81752.25 4000 L81752.25 4000 L82346.25 4122.738627602159 L82346.3 4122.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M79499.7 2681.6 L79493.0 2689.9 L79489.2 2679.9 L79495.9 2671.5 Z"></path>
+						<path d="M81874.6 2741.7 L81867.5 2749.8 L81864.2 2739.6 L81871.2 2731.5 Z"></path>
 					</g>
-					<path d="M79505.0 2690.1 L79473 3194 L79473 3380.5 L79473 3380.5 L79473 3567 L79473 3567 L79473 3723.5 L79473 3723.5 L79473 3880 L79473 3880 L78509 3998.564479118862 L78509.0 3998.6 " fill="none"></path>
+					<path d="M81874.7 2750.0 L81792.25 3314 L81792.25 3500.5 L81792.25 3500.5 L81792.25 3687 L81792.25 3687 L81792.25 3843.5 L81792.25 3843.5 L81792.25 4000 L81792.25 4000 L76403 4130.950541728999 L76403.0 4131.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M79511.0 2681.2 L79505.0 2690.1 L79500.3 2680.5 L79506.2 2671.5 Z"></path>
+						<path d="M81881.4 2741.5 L81874.7 2750.0 L81870.8 2740.0 L81877.4 2731.5 Z"></path>
 					</g>
-					<path d="M79513.0 2690.2 L79513 3194 L79513 3380.5 L79513 3380.5 L79513 3567 L79513 3567 L79513 3723.5 L79513 3723.5 L79513 3880 L79513 3880 L75395.5 4009.3657678780773 L75395.5 4009.4 " fill="none"></path>
+					<path d="M81882.0 2750.1 L81832.25 3314 L81832.25 3500.5 L81832.25 3500.5 L81832.25 3687 L81832.25 3687 L81832.25 3843.5 L81832.25 3843.5 L81832.25 4000 L81832.25 4000 L71576.25 4132.100158600471 L71576.3 4132.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M79518.3 2680.8 L79513.0 2690.2 L79507.7 2680.8 L79513.0 2671.5 Z"></path>
+						<path d="M81888.1 2741.3 L81882.0 2750.1 L81877.5 2740.3 L81883.6 2731.5 Z"></path>
 					</g>
-					<path d="M79521.0 2690.1 L79553 3194 L75198.5 3375.275502232143 L75198.5 3375.3 " fill="none"></path>
+					<path d="M81900.3 2750.1 L81933 3314 L71574.5 3498.267479015643 L71574.5 3498.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M79525.7 2680.5 L79521.0 2690.1 L79515.0 2681.2 L79519.8 2671.5 Z"></path>
+						<path d="M81905.0 2740.5 L81900.3 2750.1 L81894.4 2741.1 L81899.2 2731.5 Z"></path>
 					</g>
-					<path d="M79533.0 2689.9 L79613.75 3194 L67892.5 3380.015965707235 L67892.5 3380.0 " fill="none"></path>
+					<path d="M81911.3 2750.0 L81993.75 3314 L63699.5 3500.1895864882194 L63699.5 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M79536.8 2679.9 L79533.0 2689.9 L79526.3 2681.6 L79530.1 2671.5 Z"></path>
+						<path d="M81915.2 2740.0 L81911.3 2750.0 L81904.6 2741.5 L81908.6 2731.5 Z"></path>
 					</g>
-					<path d="M80686.3 1447.5 L80672.25 1459 L80672.25 1697.5 L80672.25 1697.5 L80672.25 1936 L80672.25 1936 L79709.28000794913 2458.5 L79709.3 2458.5 " fill="none"></path>
-					<path d="M80689.7 1451.6 L80686.3 1447.5 L80682.9 1443.3 L80696.6 1439.0 Z"></path>
+					<path d="M82503.8 1446.8 L82487 1459 L82487 1697.5 L82487 1697.5 L82487 1936 L82487 1936 L81984.81567489114 2518.5 L81984.8 2518.5 " fill="none"></path>
+					<path d="M82506.9 1451.1 L82503.8 1446.8 L82500.7 1442.5 L82514.6 1439.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M77054.0 1741.8 L77054 1936 L79311.5 2513.4572997153314 L79311.5 2513.5 " fill="none"></path>
+						<path d="M80936.5 1741.8 L80936.5 1936 L81745.15203193034 2518.5 L81745.2 2518.5 " fill="none"></path>
 					</g>
-					<path d="M77059.3 1741.8 L77054.0 1741.8 L77048.7 1741.8 L77054.0 1728.5 Z"></path>
-					<path d="M80926.9 2690.0 L80867 3194 L67892.5 3380.06261053441 L67892.5 3380.1 " fill="none"></path>
+					<path d="M80941.8 1741.8 L80936.5 1741.8 L80931.2 1741.8 L80936.5 1728.5 Z"></path>
+					<path d="M82739.3 2750.0 L82661.75 3314 L63699.5 3500.2005041397374 L63699.5 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M80933.3 2681.4 L80926.9 2690.0 L80922.7 2680.1 L80929.1 2671.5 Z"></path>
+						<path d="M82745.9 2741.5 L82739.3 2750.0 L82735.3 2740.0 L82741.9 2731.5 Z"></path>
 					</g>
-					<path d="M80934.8 2690.1 L80907 3194 L80907 3380.5 L80907 3380.5 L80907 3567 L80907 3567 L80907 3723.5 L80907 3723.5 L80907 3880 L80907 3880 L78509 4007.335843075094 L78509.0 4007.3 " fill="none"></path>
+					<path d="M82746.6 2750.1 L82701.75 3314 L82701.75 3500.5 L82701.75 3500.5 L82701.75 3687 L82701.75 3687 L82701.75 3843.5 L82701.75 3843.5 L82701.75 4000 L82701.75 4000 L76403 4131.382262520917 L76403.0 4131.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M80940.7 2681.1 L80934.8 2690.1 L80930.0 2680.5 L80935.9 2671.5 Z"></path>
+						<path d="M82752.6 2741.2 L82746.6 2750.1 L82742.0 2740.4 L82748.0 2731.5 Z"></path>
 					</g>
-					<path d="M80959.7 2690.0 L81032.25 3194 L75198.5 3376.5723664890716 L75198.5 3376.6 " fill="none"></path>
+					<path d="M82770.1 2750.1 L82831.25 3314 L71574.5 3498.4436622811836 L71574.5 3498.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M80963.7 2680.0 L80959.7 2690.0 L80953.1 2681.5 L80957.1 2671.5 Z"></path>
+						<path d="M82774.4 2740.2 L82770.1 2750.1 L82763.8 2741.4 L82768.1 2731.5 Z"></path>
 					</g>
-					<path d="M81001.4 1785.9 L80941.75 1936 L80941.75 2458.5 L80941.8 2458.5 " fill="none"></path>
-					<path d="M81006.3 1787.9 L81001.4 1785.9 L80996.4 1783.9 L81006.3 1773.5 Z"></path>
+					<path d="M82816.1 1785.9 L82756.5 1936 L82756.5 2518.5 L82756.5 2518.5 " fill="none"></path>
+					<path d="M82821.1 1787.9 L82816.1 1785.9 L82811.2 1783.9 L82821.1 1773.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80723.7 1448.2 L80712.25 1459 L80712.25 1697.5 L80712.25 1697.5 L80712.25 1936 L80712.25 1936 L80712.25 2565 L80712.25 2565 L80712.25 3194 L80712.25 3194 L75198.5 3376.349492397039 L75198.5 3376.3 " fill="none"></path>
+						<path d="M82541.0 1447.5 L82527 1459 L82527 1697.5 L82527 1697.5 L82527 1936 L82527 1936 L82527 2625 L82527 2625 L82527 3314 L82527 3314 L71574.5 3498.3871863152194 L71574.5 3498.4 " fill="none"></path>
 					</g>
-					<path d="M80727.3 1452.0 L80723.7 1448.2 L80720.0 1444.3 L80733.3 1439.0 Z"></path>
-					<path d="M77087.2 3830.7 L77055.5 3880 L78258 4001.336596385542 L78258.0 4001.3 " fill="none"></path>
+					<path d="M82544.4 1451.6 L82541.0 1447.5 L82537.7 1443.3 L82551.3 1439.0 Z"></path>
+					<path d="M71229.2 3889.9 L70708.5 4000 L76152 4130.980247800323 L76152.0 4131.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M77096.8 3825.7 L77087.2 3830.7 L77087.8 3820.0 L77097.3 3815.0 Z"></path>
+						<path d="M71239.5 3893.2 L71229.2 3889.9 L71237.3 3882.8 L71247.5 3886.1 Z"></path>
 					</g>
-					<path d="M77162.8 3833.6 L77165.5 3880 L75395.5 4003.6923076923076 L75395.5 4003.7 " fill="none"></path>
+					<path d="M71229.3 3892.6 L70748.5 4000 L71281.25 4104.944505696435 L71281.3 4104.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M77167.5 3824.0 L77162.8 3833.6 L77156.9 3824.6 L77161.7 3815.0 Z"></path>
+						<path d="M71239.6 3895.8 L71229.3 3892.6 L71237.2 3885.3 L71247.5 3888.5 Z"></path>
 					</g>
-					<path d="M77231.3 3830.3 L77266.25 3880 L80391.5 4011.7032785596352 L80391.5 4011.7 " fill="none"></path>
+					<path d="M71669.2 3850.7 L76213.25 4000 L82346.25 4132.8197171717175 L82346.3 4132.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M77230.3 3819.6 L77231.3 3830.3 L77221.6 3825.7 L77220.6 3815.0 Z"></path>
+						<path d="M71660.0 3845.1 L71669.2 3850.7 L71659.7 3855.8 L71650.5 3850.1 Z"></path>
 					</g>
-					<path d="M77256.9 3828.5 L77306.25 3880 L17993.5 4013.8375340470407 L17993.5 4013.8 " fill="none"></path>
+					<path d="M71669.2 3850.0 L76782.5 4000 L18421.25 4133.834888526652 L18421.3 4133.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M77254.3 3818.0 L77256.9 3828.5 L77246.6 3825.4 L77243.9 3815.0 Z"></path>
+						<path d="M71660.0 3844.4 L71669.2 3850.0 L71659.7 3855.0 L71650.5 3849.4 Z"></path>
 					</g>
-					<path d="M80761.2 1448.9 L80752.25 1459 L80752.25 1697.5 L80752.25 1697.5 L80752.25 1936 L80752.25 1936 L80752.25 2565 L80752.25 2565 L80752.25 3194 L80752.25 3194 L80752.25 3380.5 L80752.25 3380.5 L80752.25 3567 L80752.25 3567 L77357.75 3714.730603448276 L77357.8 3714.7 " fill="none"></path>
-					<path d="M80765.2 1452.5 L80761.2 1448.9 L80757.2 1445.4 L80770.1 1439.0 Z"></path>
+					<path d="M82578.4 1448.2 L82567 1459 L82567 1697.5 L82567 1697.5 L82567 1936 L82567 1936 L82567 2625 L82567 2625 L82567 3314 L82567 3314 L82567 3500.5 L82567 3500.5 L82567 3687 L82567 3687 L71650.5 3840.6636310487497 L71650.5 3840.7 " fill="none"></path>
+					<path d="M82582.1 1452.0 L82578.4 1448.2 L82574.7 1444.3 L82588.1 1439.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M75073.0 3432.3 L75073 3567 L76954.75 3708.36271450858 L76954.8 3708.4 " fill="none"></path>
+						<path d="M71449.0 3552.3 L71449 3687 L71449 3752 L71449.0 3752.0 " fill="none"></path>
 					</g>
-					<path d="M75078.3 3432.3 L75073.0 3432.3 L75067.7 3432.3 L75073.0 3419.0 Z"></path>
-					<path d="M81053.2 3836.9 L81017.5 3880 L78509 4007.6154138192865 L78509.0 4007.6 " fill="none"></path>
+					<path d="M71454.3 3552.3 L71449.0 3552.3 L71443.7 3552.3 L71449.0 3539.0 Z"></path>
+					<path d="M82852.2 3956.9 L82816.5 4000 L76403 4131.428200030586 L76403.0 4131.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81063.2 3833.1 L81053.2 3836.9 L81055.0 3826.3 L81065.1 3822.5 Z"></path>
+						<path d="M82862.2 3953.1 L82852.2 3956.9 L82854.0 3946.3 L82864.1 3942.5 Z"></path>
 					</g>
-					<path d="M81199.3 3839.5 L81217.5 3880 L75395.5 4010.689002429014 L75395.5 4010.7 " fill="none"></path>
+					<path d="M82998.3 3959.5 L83016.5 4000 L71576.25 4132.294319432159 L71576.3 4132.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81200.3 3828.8 L81199.3 3839.5 L81190.6 3833.2 L81191.6 3822.5 Z"></path>
+						<path d="M82999.3 3948.8 L82998.3 3959.5 L82989.6 3953.2 L82990.6 3942.5 Z"></path>
 					</g>
-					<path d="M81077.3 1785.6 L81147 1936 L81147 2565 L81147 2565 L81147 3194 L81147 3194 L81147 3380.5 L81147 3380.5 L81147 3567 L81147 3567 L81147 3624.5 L81147.0 3624.5 " fill="none"></path>
-					<path d="M81082.2 1783.4 L81077.3 1785.6 L81072.5 1787.8 L81071.7 1773.5 Z"></path>
+					<path d="M82886.4 1785.9 L82946 1936 L82946 2625 L82946 2625 L82946 3314 L82946 3314 L82946 3500.5 L82946 3500.5 L82946 3687 L82946 3687 L82946 3744.5 L82946.0 3744.5 " fill="none"></path>
+					<path d="M82891.3 1783.9 L82886.4 1785.9 L82881.4 1787.9 L82881.4 1773.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M59330.1 158.6 L59093.25 293 L59093.25 614 L59093.3 614.0 " fill="none"></path>
-					</g>
-					<path d="M59332.7 163.2 L59330.1 158.6 L59327.5 153.9 L59341.7 152.0 Z"></path>
-					<path d="M59019.4 630.9 L41824 966 L41824 1197 L41824.0 1197.0 " fill="none"></path>
-					<path d="M59019.5 636.3 L59019.4 630.9 L59019.3 625.6 L59032.8 630.7 Z"></path>
-					<path d="M59019.4 631.0 L42111.5 966 L42111.5 1197 L42111.5 1197.0 " fill="none"></path>
-					<path d="M59019.5 636.3 L59019.4 631.0 L59019.3 625.6 L59032.8 630.7 Z"></path>
-					<path d="M59019.4 633.5 L52884.5 966 L52884.5 1197 L52884.5 1197.0 " fill="none"></path>
-					<path d="M59019.7 638.8 L59019.4 633.5 L59019.1 628.2 L59032.8 632.8 Z"></path>
-					<path d="M59019.4 633.7 L53181 966 L53181 1197 L53181.0 1197.0 " fill="none"></path>
-					<path d="M59019.7 639.0 L59019.4 633.7 L59019.1 628.4 L59032.8 632.9 Z"></path>
-					<path d="M59019.4 633.9 L53489 966 L53489 1197 L53489.0 1197.0 " fill="none"></path>
-					<path d="M59019.8 639.3 L59019.4 633.9 L59019.1 628.6 L59032.8 633.1 Z"></path>
-					<path d="M59166.8 645.1 L60676.25 966 L60676.25 1197 L60676.3 1197.0 " fill="none"></path>
-					<path d="M59167.9 639.9 L59166.8 645.1 L59165.7 650.3 L59153.8 642.4 Z"></path>
-					<path d="M59166.9 642.6 L60979.75 966 L60979.75 1197 L60979.8 1197.0 " fill="none"></path>
-					<path d="M59167.8 637.4 L59166.9 642.6 L59165.9 647.9 L59153.8 640.3 Z"></path>
-					<path d="M59166.9 640.9 L61273.25 966 L61273.25 1197 L61273.3 1197.0 " fill="none"></path>
-					<path d="M59167.7 635.6 L59166.9 640.9 L59166.1 646.1 L59153.8 638.8 Z"></path>
-					<path d="M59167.0 639.5 L61584.25 966 L61584.25 1197 L61584.3 1197.0 " fill="none"></path>
-					<path d="M59167.7 634.2 L59167.0 639.5 L59166.2 644.7 L59153.8 637.7 Z"></path>
-					<path d="M59167.0 638.5 L61857.75 966 L61857.75 1197 L61857.8 1197.0 " fill="none"></path>
-					<path d="M59167.6 633.2 L59167.0 638.5 L59166.3 643.8 L59153.8 636.9 Z"></path>
-					<path d="M76110.8 4519.7 L76110.75 4521 L75756.75 4550.604240282685 L75756.8 4550.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M76116.1 4510.3 L76110.8 4519.7 L76105.4 4510.3 L76110.8 4501.0 Z"></path>
-					</g>
-					<path d="M75791.3 4058.3 L75791.25 4148 L75871.25 4194.697965571205 L75871.3 4194.7 " fill="none"></path>
-					<path d="M75796.6 4058.3 L75791.3 4058.3 L75785.9 4058.3 L75791.3 4045.0 Z"></path>
-					<path d="M76110.8 4095.8 L76110.75 4148 L76110.75 4168 L76110.8 4168.0 " fill="none"></path>
-					<path d="M76116.1 4095.8 L76110.8 4095.8 L76105.4 4095.8 L76110.8 4082.5 Z"></path>
+						<path d="M74024.6 146.6 L74895.5 293 L74895.5 614 L74895.5 614.0 " fill="none"></path>
+					</g>
+					<path d="M74025.5 141.4 L74024.6 146.6 L74023.8 151.9 L74011.5 144.4 Z"></path>
+					<path d="M74821.9 642.2 L72938 966 L72938 1197 L72938.0 1197.0 " fill="none"></path>
+					<path d="M74822.8 647.4 L74821.9 642.2 L74821.0 636.9 L74835.0 639.9 Z"></path>
+					<path d="M74821.9 644.3 L73225.5 966 L73225.5 1197 L73225.5 1197.0 " fill="none"></path>
+					<path d="M74823.0 649.6 L74821.9 644.3 L74820.9 639.1 L74835.0 641.7 Z"></path>
+					<path d="M74822.1 647.5 L73526 966 L73526 1197 L73526.0 1197.0 " fill="none"></path>
+					<path d="M74823.3 652.7 L74822.1 647.5 L74820.8 642.4 L74835.0 644.4 Z"></path>
+					<path d="M74833.4 649.0 L73822.5 966 L73822.5 1197 L73822.5 1197.0 " fill="none"></path>
+					<path d="M74834.9 654.1 L74833.4 649.0 L74831.8 643.9 L74846.1 645.0 Z"></path>
+					<path d="M74848.1 650.4 L74130.5 966 L74130.5 1197 L74130.5 1197.0 " fill="none"></path>
+					<path d="M74850.2 655.3 L74848.1 650.4 L74845.9 645.5 L74860.3 645.0 Z"></path>
+					<path d="M74915.0 655.7 L75145.5 966 L75145.5 1197 L75145.5 1197.0 " fill="none"></path>
+					<path d="M74919.2 652.5 L74915.0 655.7 L74910.7 658.9 L74907.0 645.0 Z"></path>
+					<path d="M74932.4 651.9 L75449 966 L75449 1197 L75449.0 1197.0 " fill="none"></path>
+					<path d="M74935.2 647.4 L74932.4 651.9 L74929.6 656.5 L74921.0 645.0 Z"></path>
+					<path d="M74946.9 649.9 L75742.5 966 L75742.5 1197 L75742.5 1197.0 " fill="none"></path>
+					<path d="M74948.9 645.0 L74946.9 649.9 L74944.9 654.9 L74934.5 645.0 Z"></path>
+					<path d="M74961.6 648.7 L76053.5 966 L76053.5 1197 L76053.5 1197.0 " fill="none"></path>
+					<path d="M74963.1 643.6 L74961.6 648.7 L74960.2 653.8 L74948.8 645.0 Z"></path>
+					<path d="M74969.0 646.8 L76327 966 L76327 1197 L76327.0 1197.0 " fill="none"></path>
+					<path d="M74970.2 641.6 L74969.0 646.8 L74967.8 652.0 L74956.0 643.7 Z"></path>
+					<path d="M76099.5 4639.7 L76099.5 4641 L75916.5 4666.627218934911 L75916.5 4666.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M76104.8 4630.3 L76099.5 4639.7 L76094.2 4630.3 L76099.5 4621.0 Z"></path>
+					</g>
+					<path d="M75578.7 4174.7 L75491 4268 L75860 4381.095316351684 L75860.0 4381.1 " fill="none"></path>
+					<path d="M75582.6 4178.4 L75578.7 4174.7 L75574.8 4171.1 L75587.9 4165.0 Z"></path>
+					<path d="M75921.5 4215.8 L75921.5 4268 L75940.58847184987 4288 L75940.6 4288.0 " fill="none"></path>
+					<path d="M75926.8 4215.8 L75921.5 4215.8 L75916.2 4215.8 L75921.5 4202.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M78383.5 4133.3 L78383.5 4148 L76350.25 4314.846826531735 L76350.3 4314.8 " fill="none"></path>
+						<path d="M76277.5 4253.3 L76277.5 4268 L76258.41152815013 4288 L76258.4 4288.0 " fill="none"></path>
 					</g>
-					<path d="M78388.8 4133.3 L78383.5 4133.3 L78378.2 4133.3 L78383.5 4120.0 Z"></path>
-					<path d="M63009.5 3796.2 L63009.5 3880 L78258 4012.9061402367633 L78258.0 4012.9 " fill="none"></path>
+					<path d="M76282.8 4253.3 L76277.5 4253.3 L76272.2 4253.3 L76277.5 4240.0 Z"></path>
+					<path d="M59649.8 3916.2 L59649.75 4000 L76152 4132.98861842402 L76152.0 4133.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63014.8 3786.8 L63009.5 3796.2 L63004.2 3786.8 L63009.5 3777.5 Z"></path>
+						<path d="M59655.1 3906.8 L59649.8 3916.2 L59644.4 3906.8 L59649.8 3897.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M63009.5 3432.3 L63009.5 3567 L63009.5 3669.5 L63009.5 3669.5 " fill="none"></path>
+						<path d="M59649.8 3552.3 L59649.75 3687 L59649.75 3789.5 L59649.8 3789.5 " fill="none"></path>
 					</g>
-					<path d="M63014.8 3432.3 L63009.5 3432.3 L63004.2 3432.3 L63009.5 3419.0 Z"></path>
-					<path d="M73898.5 3458.8 L73846 3567 L73846 3723.5 L73846 3723.5 L73846 3880 L73846 3880 L76258.25 4011.0128685783766 L76258.3 4011.0 " fill="none"></path>
+					<path d="M59655.1 3552.3 L59649.8 3552.3 L59644.4 3552.3 L59649.8 3539.0 Z"></path>
+					<path d="M69016.3 3570.4 L68786.5 3687 L68786.5 3843.5 L68786.5 3843.5 L68786.5 4000 L68786.5 4000 L75325 4132.882232501706 L75325.0 4132.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73907.4 3452.7 L73898.5 3458.8 L73897.8 3448.1 L73906.7 3442.0 Z"></path>
+						<path d="M69027.1 3571.0 L69016.3 3570.4 L69022.2 3561.5 L69033.0 3562.0 Z"></path>
 					</g>
-					<path d="M73981.5 3824.5 L73956.5 3880 L78258 4010.201264964988 L78258.0 4010.2 " fill="none"></path>
+					<path d="M69472.3 3910.8 L69262.75 4000 L76152 4131.602623044299 L76152.0 4131.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73990.2 3818.2 L73981.5 3824.5 L73980.5 3813.8 L73989.2 3807.5 Z"></path>
+						<path d="M69483.0 3912.1 L69472.3 3910.8 L69478.8 3902.3 L69489.5 3903.5 Z"></path>
 					</g>
-					<path d="M74007.1 3825.8 L73996.5 3880 L75100.5 3998.2069516580104 L75100.5 3998.2 " fill="none"></path>
+					<path d="M69472.7 3918.9 L69302.75 4000 L71281.25 4124.703198494826 L71281.3 4124.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M74014.1 3817.7 L74007.1 3825.8 L74003.6 3815.6 L74010.6 3807.5 Z"></path>
+						<path d="M69483.4 3919.7 L69472.7 3918.9 L69478.8 3910.0 L69489.5 3910.8 Z"></path>
 					</g>
-					<path d="M74185.9 3770.9 L74551.25 3880 L78175 4013.209656402167 L78175.0 4013.2 " fill="none"></path>
+					<path d="M69650.4 3945.8 L69661 4000 L76069 4133.551909168676 L76069.0 4133.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M74178.5 3763.2 L74185.9 3770.9 L74175.4 3773.4 L74168.0 3765.6 Z"></path>
+						<path d="M69653.9 3935.6 L69650.4 3945.8 L69643.4 3937.7 L69646.9 3927.5 Z"></path>
 					</g>
-					<path d="M74186.0 3767.6 L74591.25 3880 L76258.25 4009.720092915215 L76258.3 4009.7 " fill="none"></path>
+					<path d="M69676.0 3944.5 L69701 4000 L75325 4132.702236309209 L75325.0 4132.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M74178.4 3760.0 L74186.0 3767.6 L74175.6 3770.2 L74168.0 3762.6 Z"></path>
+						<path d="M69677.0 3933.8 L69676.0 3944.5 L69667.3 3938.2 L69668.3 3927.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M73972.2 3454.0 L74027 3567 L74027 3639.5 L74027.0 3639.5 " fill="none"></path>
+						<path d="M69296.7 3556.3 L69630.5 3687 L69630.5 3759.5 L69630.5 3759.5 " fill="none"></path>
 					</g>
-					<path d="M73977.0 3451.7 L73972.2 3454.0 L73967.4 3456.3 L73966.3 3442.0 Z"></path>
-					<path d="M3294.0 3330.3 L3306 3327 L3313.5 3327 L3313.5 3327 L3321 3380.5 L3321 3380.5 L3313.5 3434 L3313.5 3434 L3306 3434 L3306 3434 L3276 3425.8527918781724 L3276.0 3425.9 " fill="none"></path>
+					<path d="M69298.6 3551.3 L69296.7 3556.3 L69294.7 3561.2 L69284.3 3551.4 Z"></path>
+					<path d="M3281.0 3450.3 L3293 3447 L3300.5 3447 L3300.5 3447 L3308 3500.5 L3308 3500.5 L3300.5 3554 L3300.5 3554 L3293 3554 L3293 3554 L3263 3545.8527918781724 L3263.0 3545.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3283.6 3327.6 L3294.0 3330.3 L3286.4 3337.8 L3276.0 3335.1 Z"></path>
+						<path d="M3270.6 3447.6 L3281.0 3450.3 L3273.4 3457.8 L3263.0 3455.1 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3128.5 2590.3 L3681.5 3194 L3273.229222520107 3327 L3273.2 3327.0 " fill="none"></path>
+						<path d="M3126.8 2650.7 L3681.5 3314 L3263 3447.3052946199828 L3263.0 3447.3 " fill="none"></path>
 					</g>
-					<path d="M3132.4 2586.7 L3128.5 2590.3 L3124.5 2593.9 L3119.5 2580.5 Z"></path>
-					<path d="M75081.9 4029.5 L73808 4148 L73808 4334.5 L73808 4334.5 L73808 4521 L73808 4521 L75168.5 4555.821737563086 L75168.5 4555.8 " fill="none"></path>
+					<path d="M3130.9 2647.3 L3126.8 2650.7 L3122.7 2654.1 L3118.2 2640.5 Z"></path>
+					<path d="M71262.6 4141.1 L68309.5 4268 L68309.5 4454.5 L68309.5 4454.5 L68309.5 4641 L68309.5 4641 L71349.25 4676.193192009784 L71349.3 4676.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75091.7 4033.9 L75081.9 4029.5 L75090.7 4023.3 L75100.5 4027.7 Z"></path>
+						<path d="M71272.2 4146.1 L71262.6 4141.1 L71271.7 4135.4 L71281.3 4140.3 Z"></path>
 					</g>
-					<path d="M75300.0 4145.4 L75301 4148 L75301 4334.5 L75301 4334.5 L75301 4521 L75301 4521 L75301 4541 L75301.0 4541.0 " fill="none"></path>
+					<path d="M71594.9 4140.0 L75128.5 4268 L75128.5 4454.5 L75128.5 4454.5 L75128.5 4641 L75128.5 4641 L75255.75 4668.090704647676 L75255.8 4668.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75301.5 4134.7 L75300.0 4145.4 L75291.6 4138.6 L75293.1 4128.0 Z"></path>
+						<path d="M71585.8 4134.4 L71594.9 4140.0 L71585.4 4145.0 L71576.3 4139.3 Z"></path>
 					</g>
-					<path d="M19273.8 3767.8 L19273.75 3880 L75100.5 4013.646891204438 L75100.5 4013.6 " fill="none"></path>
-					<path d="M19279.1 3767.8 L19273.8 3767.8 L19268.4 3767.8 L19273.8 3754.5 Z"></path>
-					<path d="M75564.6 4504.3 L75561 4521 L75631.56338028169 4541 L75631.6 4541.0 " fill="none"></path>
+					<path d="M19757.0 3887.8 L19757 4000 L71281.25 4133.617489247025 L71281.3 4133.6 " fill="none"></path>
+					<path d="M19762.3 3887.8 L19757.0 3887.8 L19751.7 3887.8 L19757.0 3874.5 Z"></path>
+					<path d="M75316.5 4615.2 L75303.5 4641 L75775.5 4671.8866359447 L75775.5 4671.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75571.8 4496.2 L75564.6 4504.3 L75561.3 4494.0 L75568.5 4486.0 Z"></path>
+						<path d="M75325.4 4609.2 L75316.5 4615.2 L75315.9 4604.4 L75324.9 4598.5 Z"></path>
 					</g>
-					<path d="M75601.0 4504.7 L75601 4521 L67781.75 4556.12046496916 L67781.8 4556.1 " fill="none"></path>
+					<path d="M75350.6 4616.4 L75343.5 4641 L75394.90845070423 4661 L75394.9 4661.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75606.3 4495.3 L75601.0 4504.7 L75595.7 4495.3 L75601.0 4486.0 Z"></path>
+						<path d="M75358.3 4608.9 L75350.6 4616.4 L75348.0 4606.0 L75355.7 4598.5 Z"></path>
 					</g>
-					<path d="M75637.4 4504.3 L75641 4521 L75570.43661971831 4541 L75570.4 4541.0 " fill="none"></path>
+					<path d="M75443.9 4616.4 L75451 4641 L75334.75 4667.496789727127 L75334.8 4667.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75640.7 4494.0 L75637.4 4504.3 L75630.2 4496.2 L75633.5 4486.0 Z"></path>
+						<path d="M75446.5 4606.0 L75443.9 4616.4 L75436.2 4608.9 L75438.8 4598.5 Z"></path>
 					</g>
-					<path d="M75734.8 4500.5 L75751.25 4521 L75340.5 4553.3856191005 L75340.5 4553.4 " fill="none"></path>
+					<path d="M75478.0 4615.2 L75491 4641 L71402.25 4676.271399064455 L71402.3 4676.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75733.1 4489.9 L75734.8 4500.5 L75724.8 4496.6 L75723.1 4486.0 Z"></path>
-					</g>
-					<path d="M75768.9 4499.1 L75791.25 4521 L75221.5 4554.922222222222 L75221.5 4554.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M75765.9 4488.7 L75768.9 4499.1 L75758.5 4496.3 L75755.5 4486.0 Z"></path>
+						<path d="M75478.6 4604.4 L75478.0 4615.2 L75469.1 4609.2 L75469.6 4598.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M75408.0 4074.7 L75601 4148 L75601 4183 L75601.0 4183.0 " fill="none"></path>
+						<path d="M71589.6 4139.4 L75397.25 4268 L75397.25 4310.5 L75397.3 4310.5 " fill="none"></path>
 					</g>
-					<path d="M75409.9 4069.7 L75408.0 4074.7 L75406.1 4079.7 L75395.5 4070.0 Z"></path>
-					<path d="M76716.6 181.7 L76527 293 L76527 614 L76527.0 614.0 " fill="none"></path>
-					<path d="M76719.3 186.3 L76716.6 181.7 L76713.9 177.1 L76728.1 175.0 Z"></path>
-					<path d="M75805.8 4062.9 L75831.25 4148 L75831.25 4334.5 L75831.25 4334.5 L75831.25 4521 L75831.25 4521 L75749.55985915494 4541 L75749.6 4541.0 " fill="none"></path>
+					<path d="M71589.8 4134.1 L71589.6 4139.4 L71589.4 4144.8 L71576.3 4139.0 Z"></path>
+					<path d="M78865.3 168.9 L78540.5 293 L78540.5 614 L78540.5 614.0 " fill="none"></path>
+					<path d="M78867.2 173.9 L78865.3 168.9 L78863.4 164.0 L78877.8 164.2 Z"></path>
+					<path d="M75624.4 4183.5 L75637 4268 L75637 4454.5 L75637 4454.5 L75637 4641 L75637 4641 L75775.5 4664.525119617225 L75775.5 4664.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75808.3 4052.4 L75805.8 4062.9 L75798.1 4055.5 L75800.5 4045.0 Z"></path>
+						<path d="M75628.3 4173.4 L75624.4 4183.5 L75617.7 4175.0 L75621.6 4165.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M59429.3 138.4 L64254.75 293 L64254.75 583.5 L64254.8 583.5 " fill="none"></path>
+						<path d="M74024.8 140.3 L76427.25 293 L76427.25 583.5 L76427.3 583.5 " fill="none"></path>
 					</g>
-					<path d="M59429.5 133.1 L59429.3 138.4 L59429.2 143.8 L59416.0 138.0 Z"></path>
-					<path d="M60909.5 2712.7 L60909.5 3194 L42866.25 3379.9383694105622 L42866.3 3379.9 " fill="none"></path>
+					<path d="M74025.1 135.0 L74024.8 140.3 L74024.5 145.7 L74011.5 139.5 Z"></path>
+					<path d="M60989.5 2772.7 L60989.5 3314 L35765.25 3500.0979132670723 L35765.3 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60914.8 2703.3 L60909.5 2712.7 L60904.2 2703.3 L60909.5 2694.0 Z"></path>
+						<path d="M60994.8 2763.3 L60989.5 2772.7 L60984.2 2763.3 L60989.5 2754.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M59429.3 138.3 L64730.75 293 L64730.75 614 L64730.8 614.0 " fill="none"></path>
+						<path d="M74024.8 140.0 L76672.25 293 L76672.25 614 L76672.3 614.0 " fill="none"></path>
 					</g>
-					<path d="M59429.5 132.9 L59429.3 138.3 L59429.2 143.6 L59416.0 137.9 Z"></path>
+					<path d="M74025.1 134.7 L74024.8 140.0 L74024.5 145.3 L74011.5 139.2 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M64730.8 658.3 L64730.75 966 L64730.75 1197 L64730.8 1197.0 " fill="none"></path>
+						<path d="M76672.3 658.3 L76672.25 966 L76672.25 1197 L76672.3 1197.0 " fill="none"></path>
 					</g>
-					<path d="M64736.1 658.3 L64730.8 658.3 L64725.4 658.3 L64730.8 645.0 Z"></path>
+					<path d="M76677.6 658.3 L76672.3 658.3 L76666.9 658.3 L76672.3 645.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80707.3 173.0 L80972.25 293 L80972.25 501 L80972.3 501.0 " fill="none"></path>
+						<path d="M82672.8 175.6 L82827 293 L82827 501 L82827.0 501.0 " fill="none"></path>
 					</g>
-					<path d="M80709.5 168.1 L80707.3 173.0 L80705.1 177.9 L80695.2 167.5 Z"></path>
-					<path d="M81036.0 1457.1 L81036.5 1459 L81036.5 1621.5 L81036.5 1621.5 " fill="none"></path>
+					<path d="M82676.0 171.3 L82672.8 175.6 L82669.6 179.8 L82662.2 167.5 Z"></path>
+					<path d="M82851.1 1457.6 L82851.25 1459 L82851.25 1621.5 L82851.3 1621.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81038.8 1446.7 L81036.0 1457.1 L81028.5 1449.4 L81031.3 1439.0 Z"></path>
+						<path d="M82855.5 1447.8 L82851.1 1457.6 L82844.9 1448.8 L82849.3 1439.0 Z"></path>
 					</g>
-					<path d="M81314.5 1449.6 L81328 1459 L81328 1697.5 L81328 1697.5 L81328 1936 L81328 1936 L81328 2565 L81328 2565 L81328 3194 L81328 3194 L81328 3380.5 L81328 3380.5 L81328 3567 L81328 3567 L81328 3723.5 L81328 3723.5 L81328 3880 L81328 3880 L63008 4013.471795568846 L63008.0 4013.5 " fill="none"></path>
+					<path d="M83117.1 1450.9 L83127 1459 L83127 1697.5 L83127 1697.5 L83127 1936 L83127 1936 L83127 2625 L83127 2625 L83127 3314 L83127 3314 L83127 3500.5 L83127 3500.5 L83127 3687 L83127 3687 L83127 3843.5 L83127 3843.5 L83127 4000 L83127 4000 L61314.5 4133.55608864519 L61314.5 4133.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81309.8 1439.9 L81314.5 1449.6 L81303.8 1448.7 L81299.1 1439.0 Z"></path>
+						<path d="M83113.3 1440.8 L83117.1 1450.9 L83106.5 1449.0 L83102.7 1439.0 Z"></path>
 					</g>
-					<path d="M80972.3 771.3 L80972.25 966 L80972.25 986 L80972.3 986.0 " fill="none"></path>
-					<path d="M80977.6 771.3 L80972.3 771.3 L80966.9 771.3 L80972.3 758.0 Z"></path>
-					<path d="M76879.2 156.8 L77452.25 293 L77452.25 614 L77452.3 614.0 " fill="none"></path>
-					<path d="M76880.5 151.6 L76879.2 156.8 L76878.0 162.0 L76866.3 153.7 Z"></path>
-					<path d="M76879.3 153.5 L77581.25 293 L77581.25 614 L77581.3 614.0 " fill="none"></path>
-					<path d="M76880.4 148.3 L76879.3 153.5 L76878.3 158.7 L76866.3 150.9 Z"></path>
-					<path d="M76879.4 151.2 L77703.25 293 L77703.25 614 L77703.3 614.0 " fill="none"></path>
-					<path d="M76880.3 146.0 L76879.4 151.2 L76878.5 156.5 L76866.3 149.0 Z"></path>
-					<path d="M76879.4 149.5 L77828.75 293 L77828.75 614 L77828.8 614.0 " fill="none"></path>
-					<path d="M76880.2 144.2 L76879.4 149.5 L76878.6 154.7 L76866.3 147.5 Z"></path>
+					<path d="M82827.0 771.3 L82827 966 L82827 986 L82827.0 986.0 " fill="none"></path>
+					<path d="M82832.3 771.3 L82827.0 771.3 L82821.7 771.3 L82827.0 758.0 Z"></path>
+					<path d="M78876.7 182.0 L78697.5 293 L78697.5 614 L78697.5 614.0 " fill="none"></path>
+					<path d="M78879.5 186.6 L78876.7 182.0 L78873.9 177.5 L78888.1 175.0 Z"></path>
+					<path d="M78911.5 185.5 L78826.5 293 L78826.5 614 L78826.5 614.0 " fill="none"></path>
+					<path d="M78915.7 188.8 L78911.5 185.5 L78907.4 182.2 L78919.8 175.0 Z"></path>
+					<path d="M79035.6 159.0 L79545.5 293 L79545.5 614 L79545.5 614.0 " fill="none"></path>
+					<path d="M79037.0 153.8 L79035.6 159.0 L79034.3 164.1 L79022.8 155.6 Z"></path>
+					<path d="M79035.8 155.1 L79671 293 L79671 614 L79671.0 614.0 " fill="none"></path>
+					<path d="M79036.9 149.9 L79035.8 155.1 L79034.6 160.3 L79022.8 152.2 Z"></path>
 					<g data-name="Config">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Config">
-							<rect x="27640.0" y="60.5" height="152.0" width="396.0" data-name="Config"></rect>
-							<path d="M27640.0 91.5 L28036.0 91.5" fill="none" data-name="Config"></path>
+							<rect x="26391.0" y="60.5" height="152.0" width="396.0" data-name="Config"></rect>
+							<path d="M26391.0 91.5 L26787.0 91.5" fill="none" data-name="Config"></path>
 						</g>
-						<g transform="translate(27640, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Config">
+						<g transform="translate(26391, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Config">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Config">
 								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="Config">Config</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27640, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Config">
+						<g transform="translate(26391, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Config">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Config">
 								<text x="0.0" y="13.5" stroke="none" data-name="Config">&lt;static&gt;+isDebugMode: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Config">&lt;static&gt;+defaultLocale: Set&lt;String&gt;</text>
@@ -6630,9 +6678,9 @@
 					</g>
 					<g data-name="ResultTypes">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ResultTypes">
-							<rect x="28076.0" y="121.0" height="31.0" width="114.0" data-name="ResultTypes"></rect>
+							<rect x="26827.0" y="121.0" height="31.0" width="114.0" data-name="ResultTypes"></rect>
 						</g>
-						<g transform="translate(28076, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ResultTypes">
+						<g transform="translate(26827, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ResultTypes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ResultTypes">
 								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ResultTypes">ResultTypes</text>
 								
@@ -6641,16 +6689,16 @@
 					</g>
 					<g data-name="MeasurementResultTypes">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementResultTypes">
-							<rect x="27707.0" y="591.0" height="77.0" width="252.0" data-name="MeasurementResultTypes"></rect>
-							<path d="M27707.0 622.0 L27959.0 622.0" fill="none" data-name="MeasurementResultTypes"></path>
+							<rect x="26458.0" y="591.0" height="77.0" width="252.0" data-name="MeasurementResultTypes"></rect>
+							<path d="M26458.0 622.0 L26710.0 622.0" fill="none" data-name="MeasurementResultTypes"></path>
 						</g>
-						<g transform="translate(27707, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementResultTypes">
+						<g transform="translate(26458, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementResultTypes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementResultTypes">
 								<text x="118.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementResultTypes">MeasurementResultTypes</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27707, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementResultTypes">
+						<g transform="translate(26458, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementResultTypes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementResultTypes">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+questionnaire: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
@@ -6660,16 +6708,16 @@
 					</g>
 					<g data-name="InterventionResultTypes">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionResultTypes">
-							<rect x="27999.0" y="591.0" height="77.0" width="268.0" data-name="InterventionResultTypes"></rect>
-							<path d="M27999.0 622.0 L28267.0 622.0" fill="none" data-name="InterventionResultTypes"></path>
+							<rect x="26750.0" y="591.0" height="77.0" width="268.0" data-name="InterventionResultTypes"></rect>
+							<path d="M26750.0 622.0 L27018.0 622.0" fill="none" data-name="InterventionResultTypes"></path>
 						</g>
-						<g transform="translate(27999, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResultTypes">
+						<g transform="translate(26750, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResultTypes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionResultTypes">
 								<text x="126.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionResultTypes">InterventionResultTypes</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27999, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResultTypes">
+						<g transform="translate(26750, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResultTypes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResultTypes">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+checkmarkTask: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
@@ -6679,30 +6727,31 @@
 					</g>
 					<g data-name="StudyExportData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyExportData">
-							<rect x="0.0" y="2511.5" height="107.0" width="414.0" data-name="StudyExportData"></rect>
-							<path d="M0.0 2542.5 L414.0 2542.5" fill="none" data-name="StudyExportData"></path>
+							<rect x="0.0" y="2564.0" height="122.0" width="414.0" data-name="StudyExportData"></rect>
+							<path d="M0.0 2595.0 L414.0 2595.0" fill="none" data-name="StudyExportData"></path>
 						</g>
-						<g transform="translate(0, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyExportData">
+						<g transform="translate(0, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyExportData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyExportData">
 								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyExportData">StudyExportData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyExportData">
+						<g transform="translate(0, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyExportData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyExportData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyExportData">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyExportData">+measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
 								<text x="0.0" y="43.5" stroke="none" data-name="StudyExportData">+interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyExportData">+isEmpty: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyExportData">+mediaData: List&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyExportData">+isEmpty: bool</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="Study">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="67831.5" y="3365.0" height="31.0" width="61.0" data-name="Study"></rect>
+							<rect x="63638.5" y="3485.0" height="31.0" width="61.0" data-name="Study"></rect>
 						</g>
-						<g transform="translate(67831.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
+						<g transform="translate(63638.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
 								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
 								
@@ -6711,23 +6760,23 @@
 					</g>
 					<g data-name="StudyTemplates">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTemplates">
-							<rect x="28230.0" y="90.0" height="93.0" width="307.0" data-name="StudyTemplates"></rect>
-							<path d="M28230.0 121.0 L28537.0 121.0" fill="none" data-name="StudyTemplates"></path>
-							<path d="M28230.0 152.0 L28537.0 152.0" fill="none" data-name="StudyTemplates"></path>
+							<rect x="26981.0" y="90.0" height="93.0" width="307.0" data-name="StudyTemplates"></rect>
+							<path d="M26981.0 121.0 L27288.0 121.0" fill="none" data-name="StudyTemplates"></path>
+							<path d="M26981.0 152.0 L27288.0 152.0" fill="none" data-name="StudyTemplates"></path>
 						</g>
-						<g transform="translate(28230, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTemplates">
+						<g transform="translate(26981, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTemplates">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTemplates">
 								<text x="145.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTemplates">StudyTemplates</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28230, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
+						<g transform="translate(26981, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+kUnnamedStudyTitle: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28230, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
+						<g transform="translate(26981, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+Study emptyDraft()</text>
 								
@@ -6736,16 +6785,16 @@
 					</g>
 					<g data-name="StudyActionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyActionType">
-							<rect x="68.0" y="3282.0" height="197.0" width="358.0" data-name="StudyActionType"></rect>
-							<path d="M68.0 3313.0 L426.0 3313.0" fill="none" data-name="StudyActionType"></path>
+							<rect x="68.0" y="3402.0" height="197.0" width="358.0" data-name="StudyActionType"></rect>
+							<path d="M68.0 3433.0 L426.0 3433.0" fill="none" data-name="StudyActionType"></path>
 						</g>
-						<g transform="translate(68, 3282)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyActionType">
+						<g transform="translate(68, 3402)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyActionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyActionType">
 								<text x="171.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyActionType">StudyActionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68, 3313)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyActionType">
+						<g transform="translate(68, 3433)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyActionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyActionType">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyActionType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+values: List&lt;StudyActionType&gt;</text>
@@ -6763,9 +6812,9 @@
 					</g>
 					<g data-name="Enum">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="3074.8" y="2549.5" height="31.0" width="61.0" data-name="Enum"></rect>
+							<rect x="3074.8" y="2609.5" height="31.0" width="61.0" data-name="Enum"></rect>
 						</g>
-						<g transform="translate(3074.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+						<g transform="translate(3074.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
 								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
@@ -6774,16 +6823,16 @@
 					</g>
 					<g data-name="Notifications">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Notifications">
-							<rect x="3635.0" y="2481.5" height="167.0" width="407.0" data-name="Notifications"></rect>
-							<path d="M3635.0 2512.5 L4042.0 2512.5" fill="none" data-name="Notifications"></path>
+							<rect x="3635.0" y="2541.5" height="167.0" width="407.0" data-name="Notifications"></rect>
+							<path d="M3635.0 2572.5 L4042.0 2572.5" fill="none" data-name="Notifications"></path>
 						</g>
-						<g transform="translate(3635, 2481.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Notifications">
+						<g transform="translate(3635, 2541.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Notifications">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notifications">
 								<text x="195.5" y="13.5" stroke="none" text-anchor="middle" data-name="Notifications">Notifications</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3635, 2512.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Notifications">
+						<g transform="translate(3635, 2572.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Notifications">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Notifications">
 								<text x="0.0" y="13.5" stroke="none" data-name="Notifications">&lt;static&gt;+credentialsInvalid: SnackbarIntent</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Notifications">&lt;static&gt;+userAlreadyRegistered: SnackbarIntent</text>
@@ -6799,16 +6848,16 @@
 					</g>
 					<g data-name="SnackbarIntent">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SnackbarIntent">
-							<rect x="3366.0" y="3349.5" height="62.0" width="136.0" data-name="SnackbarIntent"></rect>
-							<path d="M3366.0 3380.5 L3502.0 3380.5" fill="none" data-name="SnackbarIntent"></path>
+							<rect x="3353.0" y="3469.5" height="62.0" width="136.0" data-name="SnackbarIntent"></rect>
+							<path d="M3353.0 3500.5 L3489.0 3500.5" fill="none" data-name="SnackbarIntent"></path>
 						</g>
-						<g transform="translate(3366, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackbarIntent">
+						<g transform="translate(3353, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackbarIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackbarIntent">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackbarIntent">SnackbarIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3366, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SnackbarIntent">
+						<g transform="translate(3353, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SnackbarIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SnackbarIntent">
 								<text x="0.0" y="13.5" stroke="none" data-name="SnackbarIntent">+duration: int?</text>
 								
@@ -6817,16 +6866,16 @@
 					</g>
 					<g data-name="AlertIntent">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AlertIntent">
-							<rect x="3542.0" y="3334.5" height="92.0" width="204.0" data-name="AlertIntent"></rect>
-							<path d="M3542.0 3365.5 L3746.0 3365.5" fill="none" data-name="AlertIntent"></path>
+							<rect x="3529.0" y="3454.5" height="92.0" width="204.0" data-name="AlertIntent"></rect>
+							<path d="M3529.0 3485.5 L3733.0 3485.5" fill="none" data-name="AlertIntent"></path>
 						</g>
-						<g transform="translate(3542, 3334.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AlertIntent">
+						<g transform="translate(3529, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AlertIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AlertIntent">
 								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="AlertIntent">AlertIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3542, 3365.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AlertIntent">
+						<g transform="translate(3529, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AlertIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AlertIntent">
 								<text x="0.0" y="13.5" stroke="none" data-name="AlertIntent">+title: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AlertIntent">+dismissOnAction: bool</text>
@@ -6837,16 +6886,16 @@
 					</g>
 					<g data-name="NotificationDefaultActions">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDefaultActions">
-							<rect x="1737.0" y="3349.5" height="62.0" width="287.0" data-name="NotificationDefaultActions"></rect>
-							<path d="M1737.0 3380.5 L2024.0 3380.5" fill="none" data-name="NotificationDefaultActions"></path>
+							<rect x="1724.0" y="3469.5" height="62.0" width="287.0" data-name="NotificationDefaultActions"></rect>
+							<path d="M1724.0 3500.5 L2011.0 3500.5" fill="none" data-name="NotificationDefaultActions"></path>
 						</g>
-						<g transform="translate(1737, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDefaultActions">
+						<g transform="translate(1724, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDefaultActions">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDefaultActions">
 								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDefaultActions">NotificationDefaultActions</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1737, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDefaultActions">
+						<g transform="translate(1724, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDefaultActions">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDefaultActions">
 								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDefaultActions">&lt;static&gt;+cancel: NotificationAction</text>
 								
@@ -6855,16 +6904,16 @@
 					</g>
 					<g data-name="NotificationAction">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationAction">
-							<rect x="1752.5" y="3677.5" height="92.0" width="256.0" data-name="NotificationAction"></rect>
-							<path d="M1752.5 3708.5 L2008.5 3708.5" fill="none" data-name="NotificationAction"></path>
+							<rect x="1739.5" y="3797.5" height="92.0" width="256.0" data-name="NotificationAction"></rect>
+							<path d="M1739.5 3828.5 L1995.5 3828.5" fill="none" data-name="NotificationAction"></path>
 						</g>
-						<g transform="translate(1752.5, 3677.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationAction">
+						<g transform="translate(1739.5, 3797.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationAction">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationAction">
 								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationAction">NotificationAction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1752.5, 3708.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationAction">
+						<g transform="translate(1739.5, 3828.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationAction">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationAction">
 								<text x="0.0" y="13.5" stroke="none" data-name="NotificationAction">+label: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="NotificationAction">+onSelect: dynamic Function()</text>
@@ -6875,16 +6924,16 @@
 					</g>
 					<g data-name="INotificationService">
 						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="63303.3" y="3327.0" height="107.0" width="395.0" data-name="INotificationService"></rect>
-							<path d="M63303.3 3358.0 L63698.3 3358.0" fill="none" data-name="INotificationService"></path>
+							<rect x="60588.0" y="3447.0" height="107.0" width="395.0" data-name="INotificationService"></rect>
+							<path d="M60588.0 3478.0 L60983.0 3478.0" fill="none" data-name="INotificationService"></path>
 						</g>
-						<g transform="translate(63303.25, 3327)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
+						<g transform="translate(60588, 3447)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
 								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63303.25, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="INotificationService">
+						<g transform="translate(60588, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="INotificationService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="INotificationService">
 								<text x="0.0" y="13.5" stroke="none" data-name="INotificationService">+void showMessage()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="INotificationService">+void show()</text>
@@ -6896,23 +6945,23 @@
 					</g>
 					<g data-name="NotificationService">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationService">
-							<rect x="63273.3" y="3654.5" height="138.0" width="455.0" data-name="NotificationService"></rect>
-							<path d="M63273.3 3685.5 L63728.3 3685.5" fill="none" data-name="NotificationService"></path>
-							<path d="M63273.3 3716.5 L63728.3 3716.5" fill="none" data-name="NotificationService"></path>
+							<rect x="60558.0" y="3774.5" height="138.0" width="455.0" data-name="NotificationService"></rect>
+							<path d="M60558.0 3805.5 L61013.0 3805.5" fill="none" data-name="NotificationService"></path>
+							<path d="M60558.0 3836.5 L61013.0 3836.5" fill="none" data-name="NotificationService"></path>
 						</g>
-						<g transform="translate(63273.25, 3654.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationService">
+						<g transform="translate(60558, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationService">
 								<text x="219.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationService">NotificationService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63273.25, 3685.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
+						<g transform="translate(60558, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
 								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">-_streamController: BehaviorSubject&lt;NotificationIntent&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63273.25, 3716.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
+						<g transform="translate(60558, 3836.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
 								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="NotificationService">+void showMessage()</text>
@@ -6924,9 +6973,9 @@
 					</g>
 					<g data-name="BehaviorSubject">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BehaviorSubject">
-							<rect x="62863.0" y="3998.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
+							<rect x="61169.5" y="4118.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
 						</g>
-						<g transform="translate(62863, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
+						<g transform="translate(61169.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BehaviorSubject">
 								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="BehaviorSubject">BehaviorSubject</text>
 								
@@ -6935,17 +6984,17 @@
 					</g>
 					<g data-name="NotificationIntent">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationIntent">
-							<rect x="4082.0" y="2488.5" height="153.0" width="288.0" data-name="NotificationIntent"></rect>
-							<path d="M4082.0 2519.5 L4370.0 2519.5" fill="none" data-name="NotificationIntent"></path>
-							<path d="M4082.0 2610.5 L4370.0 2610.5" fill="none" data-name="NotificationIntent"></path>
+							<rect x="4082.0" y="2548.5" height="153.0" width="288.0" data-name="NotificationIntent"></rect>
+							<path d="M4082.0 2579.5 L4370.0 2579.5" fill="none" data-name="NotificationIntent"></path>
+							<path d="M4082.0 2670.5 L4370.0 2670.5" fill="none" data-name="NotificationIntent"></path>
 						</g>
-						<g transform="translate(4082, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="NotificationIntent">
+						<g transform="translate(4082, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="NotificationIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationIntent">
 								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationIntent">NotificationIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4082, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
+						<g transform="translate(4082, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
 								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+message: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="NotificationIntent">+customContent: Widget?</text>
@@ -6955,7 +7004,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(4082, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
+						<g transform="translate(4082, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
 								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+void register()</text>
 								
@@ -6964,9 +7013,9 @@
 					</g>
 					<g data-name="Widget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="21264.5" y="3365.0" height="31.0" width="71.0" data-name="Widget"></rect>
+							<rect x="21865.8" y="3485.0" height="31.0" width="71.0" data-name="Widget"></rect>
 						</g>
-						<g transform="translate(21264.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
+						<g transform="translate(21865.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
 								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
 								
@@ -6975,9 +7024,9 @@
 					</g>
 					<g data-name="IconData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="27437.0" y="3365.0" height="31.0" width="87.0" data-name="IconData"></rect>
+							<rect x="27961.8" y="3485.0" height="31.0" width="87.0" data-name="IconData"></rect>
 						</g>
-						<g transform="translate(27437, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
+						<g transform="translate(27961.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
 								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
 								
@@ -6986,16 +7035,16 @@
 					</g>
 					<g data-name="NotificationType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationType">
-							<rect x="1322.0" y="3319.5" height="122.0" width="325.0" data-name="NotificationType"></rect>
-							<path d="M1322.0 3350.5 L1647.0 3350.5" fill="none" data-name="NotificationType"></path>
+							<rect x="1309.0" y="3439.5" height="122.0" width="325.0" data-name="NotificationType"></rect>
+							<path d="M1309.0 3470.5 L1634.0 3470.5" fill="none" data-name="NotificationType"></path>
 						</g>
-						<g transform="translate(1322, 3319.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationType">
+						<g transform="translate(1309, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationType">
 								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationType">NotificationType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1322, 3350.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationType">
+						<g transform="translate(1309, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationType">
 								<text x="0.0" y="13.5" stroke="none" data-name="NotificationType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="NotificationType">&lt;static&gt;+values: List&lt;NotificationType&gt;</text>
@@ -7008,9 +7057,9 @@
 					</g>
 					<g data-name="dynamic Function()">
 						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="8413.0" y="3998.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
+							<rect x="8450.0" y="4118.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
 						</g>
-						<g transform="translate(8413, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
+						<g transform="translate(8450, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
 								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
 								
@@ -7019,16 +7068,16 @@
 					</g>
 					<g data-name="IClipboardService">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IClipboardService">
-							<rect x="28577.0" y="105.5" height="62.0" width="156.0" data-name="IClipboardService"></rect>
-							<path d="M28577.0 136.5 L28733.0 136.5" fill="none" data-name="IClipboardService"></path>
+							<rect x="27328.0" y="105.5" height="62.0" width="156.0" data-name="IClipboardService"></rect>
+							<path d="M27328.0 136.5 L27484.0 136.5" fill="none" data-name="IClipboardService"></path>
 						</g>
-						<g transform="translate(28577, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IClipboardService">
+						<g transform="translate(27328, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IClipboardService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IClipboardService">
 								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="IClipboardService">IClipboardService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28577, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IClipboardService">
+						<g transform="translate(27328, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IClipboardService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IClipboardService">
 								<text x="0.0" y="13.5" stroke="none" data-name="IClipboardService">+dynamic copy()</text>
 								
@@ -7037,16 +7086,16 @@
 					</g>
 					<g data-name="ClipboardService">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ClipboardService">
-							<rect x="28579.5" y="598.5" height="62.0" width="151.0" data-name="ClipboardService"></rect>
-							<path d="M28579.5 629.5 L28730.5 629.5" fill="none" data-name="ClipboardService"></path>
+							<rect x="27330.5" y="598.5" height="62.0" width="151.0" data-name="ClipboardService"></rect>
+							<path d="M27330.5 629.5 L27481.5 629.5" fill="none" data-name="ClipboardService"></path>
 						</g>
-						<g transform="translate(28579.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ClipboardService">
+						<g transform="translate(27330.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ClipboardService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ClipboardService">
 								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="ClipboardService">ClipboardService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28579.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ClipboardService">
+						<g transform="translate(27330.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ClipboardService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ClipboardService">
 								<text x="0.0" y="13.5" stroke="none" data-name="ClipboardService">+dynamic copy()</text>
 								
@@ -7055,16 +7104,16 @@
 					</g>
 					<g data-name="NotificationDispatcher">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDispatcher">
-							<rect x="5376.5" y="2504.0" height="122.0" width="325.0" data-name="NotificationDispatcher"></rect>
-							<path d="M5376.5 2535.0 L5701.5 2535.0" fill="none" data-name="NotificationDispatcher"></path>
+							<rect x="5376.5" y="2564.0" height="122.0" width="325.0" data-name="NotificationDispatcher"></rect>
+							<path d="M5376.5 2595.0 L5701.5 2595.0" fill="none" data-name="NotificationDispatcher"></path>
 						</g>
-						<g transform="translate(5376.5, 2504)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDispatcher">
+						<g transform="translate(5376.5, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDispatcher">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDispatcher">
 								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDispatcher">NotificationDispatcher</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5376.5, 2535)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDispatcher">
+						<g transform="translate(5376.5, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDispatcher">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDispatcher">
 								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDispatcher">+child: Widget?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="NotificationDispatcher">+snackbarInnerPadding: double</text>
@@ -7077,9 +7126,9 @@
 					</g>
 					<g data-name="SnackBarBehavior">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SnackBarBehavior">
-							<rect x="3786.0" y="3365.0" height="31.0" width="162.0" data-name="SnackBarBehavior"></rect>
+							<rect x="3773.0" y="3485.0" height="31.0" width="162.0" data-name="SnackBarBehavior"></rect>
 						</g>
-						<g transform="translate(3786, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackBarBehavior">
+						<g transform="translate(3773, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackBarBehavior">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackBarBehavior">
 								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackBarBehavior">SnackBarBehavior</text>
 								
@@ -7088,16 +7137,16 @@
 					</g>
 					<g data-name="Assets">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Assets">
-							<rect x="28773.0" y="105.5" height="62.0" width="218.0" data-name="Assets"></rect>
-							<path d="M28773.0 136.5 L28991.0 136.5" fill="none" data-name="Assets"></path>
+							<rect x="27524.0" y="105.5" height="62.0" width="218.0" data-name="Assets"></rect>
+							<path d="M27524.0 136.5 L27742.0 136.5" fill="none" data-name="Assets"></path>
 						</g>
-						<g transform="translate(28773, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Assets">
+						<g transform="translate(27524, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Assets">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Assets">
 								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="Assets">Assets</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28773, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Assets">
+						<g transform="translate(27524, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Assets">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Assets">
 								<text x="0.0" y="13.5" stroke="none" data-name="Assets">&lt;static&gt;+logoWide: String</text>
 								
@@ -7106,17 +7155,17 @@
 					</g>
 					<g data-name="AsyncValueWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValueWidget">
-							<rect x="5741.5" y="2466.0" height="198.0" width="384.0" data-name="AsyncValueWidget"></rect>
-							<path d="M5741.5 2497.0 L6125.5 2497.0" fill="none" data-name="AsyncValueWidget"></path>
-							<path d="M5741.5 2588.0 L6125.5 2588.0" fill="none" data-name="AsyncValueWidget"></path>
+							<rect x="5741.5" y="2526.0" height="198.0" width="384.0" data-name="AsyncValueWidget"></rect>
+							<path d="M5741.5 2557.0 L6125.5 2557.0" fill="none" data-name="AsyncValueWidget"></path>
+							<path d="M5741.5 2648.0 L6125.5 2648.0" fill="none" data-name="AsyncValueWidget"></path>
 						</g>
-						<g transform="translate(5741.5, 2466)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AsyncValueWidget">
+						<g transform="translate(5741.5, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AsyncValueWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValueWidget">
 								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValueWidget">AsyncValueWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5741.5, 2497)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
+						<g transform="translate(5741.5, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+value: AsyncValue&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">+data: Widget Function(T)</text>
@@ -7126,7 +7175,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(5741.5, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
+						<g transform="translate(5741.5, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">-Widget _buildDataOrEmptyWidget()</text>
@@ -7138,9 +7187,9 @@
 					</g>
 					<g data-name="AsyncValue">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="42757.3" y="3365.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
+							<rect x="35656.3" y="3485.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
 						</g>
-						<g transform="translate(42757.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
+						<g transform="translate(35656.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
 								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
 								
@@ -7149,9 +7198,9 @@
 					</g>
 					<g data-name="Widget Function(T)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="28762.0" y="3365.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
+							<rect x="30375.8" y="3485.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
 						</g>
-						<g transform="translate(28762, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
+						<g transform="translate(30375.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
 								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
 								
@@ -7160,9 +7209,9 @@
 					</g>
 					<g data-name="Widget Function(Object, StackTrace?)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Object, StackTrace?)?">
-							<rect x="4043.3" y="3365.0" height="31.0" width="326.0" data-name="Widget Function(Object, StackTrace?)?"></rect>
+							<rect x="3975.0" y="3485.0" height="31.0" width="326.0" data-name="Widget Function(Object, StackTrace?)?"></rect>
 						</g>
-						<g transform="translate(4043.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Object, StackTrace?)?">
+						<g transform="translate(3975, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Object, StackTrace?)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Object, StackTrace?)?">
 								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Object, StackTrace?)?">Widget Function(Object, StackTrace?)?</text>
 								
@@ -7171,9 +7220,9 @@
 					</g>
 					<g data-name="Widget Function()?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function()?">
-							<rect x="4409.3" y="3365.0" height="31.0" width="166.0" data-name="Widget Function()?"></rect>
+							<rect x="4341.0" y="3485.0" height="31.0" width="166.0" data-name="Widget Function()?"></rect>
 						</g>
-						<g transform="translate(4409.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function()?">
+						<g transform="translate(4341, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function()?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function()?">
 								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function()?">Widget Function()?</text>
 								
@@ -7182,17 +7231,17 @@
 					</g>
 					<g data-name="FormControlLabel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlLabel">
-							<rect x="6234.5" y="2488.5" height="153.0" width="430.0" data-name="FormControlLabel"></rect>
-							<path d="M6234.5 2519.5 L6664.5 2519.5" fill="none" data-name="FormControlLabel"></path>
-							<path d="M6234.5 2610.5 L6664.5 2610.5" fill="none" data-name="FormControlLabel"></path>
+							<rect x="6234.5" y="2548.5" height="153.0" width="430.0" data-name="FormControlLabel"></rect>
+							<path d="M6234.5 2579.5 L6664.5 2579.5" fill="none" data-name="FormControlLabel"></path>
+							<path d="M6234.5 2670.5 L6664.5 2670.5" fill="none" data-name="FormControlLabel"></path>
 						</g>
-						<g transform="translate(6234.5, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlLabel">
+						<g transform="translate(6234.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlLabel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlLabel">
 								<text x="207.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlLabel">FormControlLabel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6234.5, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
+						<g transform="translate(6234.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+formControl: AbstractControl&lt;dynamic&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormControlLabel">+text: String</text>
@@ -7202,7 +7251,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(6234.5, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
+						<g transform="translate(6234.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+Widget build()</text>
 								
@@ -7211,9 +7260,9 @@
 					</g>
 					<g data-name="AbstractControl">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="25722.8" y="3365.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+							<rect x="25990.5" y="3485.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
 						</g>
-						<g transform="translate(25722.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+						<g transform="translate(25990.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
 								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
@@ -7222,9 +7271,9 @@
 					</g>
 					<g data-name="TextStyle">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
-							<rect x="11251.5" y="3365.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
+							<rect x="11066.0" y="3485.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
 						</g>
-						<g transform="translate(11251.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
+						<g transform="translate(11066, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
 								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
 								
@@ -7233,9 +7282,9 @@
 					</g>
 					<g data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<rect x="4615.3" y="3365.0" height="31.0" width="352.0" data-name="void Function(AbstractControl&lt;dynamic&gt;)?"></rect>
+							<rect x="4547.0" y="3485.0" height="31.0" width="352.0" data-name="void Function(AbstractControl&lt;dynamic&gt;)?"></rect>
 						</g>
-						<g transform="translate(4615.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+						<g transform="translate(4547, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">void Function(AbstractControl&lt;dynamic&gt;)?</text>
 								
@@ -7244,17 +7293,17 @@
 					</g>
 					<g data-name="ActionPopUpMenuButton">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ActionPopUpMenuButton">
-							<rect x="6828.3" y="2436.0" height="258.0" width="324.0" data-name="ActionPopUpMenuButton"></rect>
-							<path d="M6828.3 2467.0 L7152.3 2467.0" fill="none" data-name="ActionPopUpMenuButton"></path>
-							<path d="M6828.3 2648.0 L7152.3 2648.0" fill="none" data-name="ActionPopUpMenuButton"></path>
+							<rect x="6828.3" y="2496.0" height="258.0" width="324.0" data-name="ActionPopUpMenuButton"></rect>
+							<path d="M6828.3 2527.0 L7152.3 2527.0" fill="none" data-name="ActionPopUpMenuButton"></path>
+							<path d="M6828.3 2708.0 L7152.3 2708.0" fill="none" data-name="ActionPopUpMenuButton"></path>
 						</g>
-						<g transform="translate(6828.25, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionPopUpMenuButton">
+						<g transform="translate(6828.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionPopUpMenuButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionPopUpMenuButton">
 								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionPopUpMenuButton">ActionPopUpMenuButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6828.25, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
+						<g transform="translate(6828.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
 								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColor: Color?</text>
@@ -7270,7 +7319,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(6828.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
+						<g transform="translate(6828.25, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
 								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">-Widget _buildPopupMenu()</text>
@@ -7280,9 +7329,9 @@
 					</g>
 					<g data-name="Color">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="21675.0" y="3365.0" height="31.0" width="58.0" data-name="Color"></rect>
+							<rect x="22088.0" y="3485.0" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(21675, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+						<g transform="translate(22088, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
 								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
@@ -7291,9 +7340,9 @@
 					</g>
 					<g data-name="Axis">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Axis">
-							<rect x="5731.5" y="3365.0" height="31.0" width="49.0" data-name="Axis"></rect>
+							<rect x="5663.3" y="3485.0" height="31.0" width="49.0" data-name="Axis"></rect>
 						</g>
-						<g transform="translate(5731.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Axis">
+						<g transform="translate(5663.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Axis">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Axis">
 								<text x="16.5" y="13.5" stroke="none" text-anchor="middle" data-name="Axis">Axis</text>
 								
@@ -7302,9 +7351,9 @@
 					</g>
 					<g data-name="PopupMenuPosition">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PopupMenuPosition">
-							<rect x="5820.5" y="3365.0" height="31.0" width="174.0" data-name="PopupMenuPosition"></rect>
+							<rect x="5752.3" y="3485.0" height="31.0" width="174.0" data-name="PopupMenuPosition"></rect>
 						</g>
-						<g transform="translate(5820.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PopupMenuPosition">
+						<g transform="translate(5752.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PopupMenuPosition">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PopupMenuPosition">
 								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="PopupMenuPosition">PopupMenuPosition</text>
 								
@@ -7313,16 +7362,16 @@
 					</g>
 					<g data-name="Search">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Search">
-							<rect x="7210.5" y="2511.5" height="107.0" width="373.0" data-name="Search"></rect>
-							<path d="M7210.5 2542.5 L7583.5 2542.5" fill="none" data-name="Search"></path>
+							<rect x="7210.5" y="2571.5" height="107.0" width="373.0" data-name="Search"></rect>
+							<path d="M7210.5 2602.5 L7583.5 2602.5" fill="none" data-name="Search"></path>
 						</g>
-						<g transform="translate(7210.5, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Search">
+						<g transform="translate(7210.5, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Search">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Search">
 								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="Search">Search</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7210.5, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Search">
+						<g transform="translate(7210.5, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Search">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Search">
 								<text x="0.0" y="13.5" stroke="none" data-name="Search">+onQueryChanged: dynamic Function(String)</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Search">+searchController: SearchController?</text>
@@ -7334,9 +7383,9 @@
 					</g>
 					<g data-name="dynamic Function(String)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(String)">
-							<rect x="6034.5" y="3365.0" height="31.0" width="213.0" data-name="dynamic Function(String)"></rect>
+							<rect x="5966.3" y="3485.0" height="31.0" width="213.0" data-name="dynamic Function(String)"></rect>
 						</g>
-						<g transform="translate(6034.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(String)">
+						<g transform="translate(5966.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(String)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(String)">
 								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(String)">dynamic Function(String)</text>
 								
@@ -7345,16 +7394,16 @@
 					</g>
 					<g data-name="SearchController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="45104.3" y="3349.5" height="62.0" width="258.0" data-name="SearchController"></rect>
-							<path d="M45104.3 3380.5 L45362.3 3380.5" fill="none" data-name="SearchController"></path>
+							<rect x="37488.3" y="3469.5" height="62.0" width="258.0" data-name="SearchController"></rect>
+							<path d="M37488.3 3500.5 L37746.3 3500.5" fill="none" data-name="SearchController"></path>
 						</g>
-						<g transform="translate(45104.25, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
+						<g transform="translate(37488.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
 								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45104.25, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SearchController">
+						<g transform="translate(37488.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SearchController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SearchController">
 								<text x="0.0" y="13.5" stroke="none" data-name="SearchController">+setText: void Function(String)</text>
 								
@@ -7363,9 +7412,9 @@
 					</g>
 					<g data-name="void Function(String)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(String)">
-							<rect x="45143.3" y="3708.0" height="31.0" width="180.0" data-name="void Function(String)"></rect>
+							<rect x="37527.3" y="3828.0" height="31.0" width="180.0" data-name="void Function(String)"></rect>
 						</g>
-						<g transform="translate(45143.25, 3708)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(String)">
+						<g transform="translate(37527.25, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(String)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(String)">
 								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(String)">void Function(String)</text>
 								
@@ -7374,16 +7423,16 @@
 					</g>
 					<g data-name="FormScaffold">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormScaffold">
-							<rect x="7623.5" y="2496.5" height="137.0" width="212.0" data-name="FormScaffold"></rect>
-							<path d="M7623.5 2527.5 L7835.5 2527.5" fill="none" data-name="FormScaffold"></path>
+							<rect x="7623.5" y="2556.5" height="137.0" width="212.0" data-name="FormScaffold"></rect>
+							<path d="M7623.5 2587.5 L7835.5 2587.5" fill="none" data-name="FormScaffold"></path>
 						</g>
-						<g transform="translate(7623.5, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormScaffold">
+						<g transform="translate(7623.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormScaffold">
 								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormScaffold">FormScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7623.5, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormScaffold">
+						<g transform="translate(7623.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormScaffold">+formViewModel: T</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormScaffold">+actions: List&lt;Widget&gt;?</text>
@@ -7397,17 +7446,17 @@
 					</g>
 					<g data-name="ConstrainedWidthFlexible">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConstrainedWidthFlexible">
-							<rect x="7875.5" y="2473.5" height="183.0" width="287.0" data-name="ConstrainedWidthFlexible"></rect>
-							<path d="M7875.5 2504.5 L8162.5 2504.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
-							<path d="M7875.5 2610.5 L8162.5 2610.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
+							<rect x="7875.5" y="2533.5" height="183.0" width="287.0" data-name="ConstrainedWidthFlexible"></rect>
+							<path d="M7875.5 2564.5 L8162.5 2564.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
+							<path d="M7875.5 2670.5 L8162.5 2670.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
 						</g>
-						<g transform="translate(7875.5, 2473.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConstrainedWidthFlexible">
+						<g transform="translate(7875.5, 2533.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConstrainedWidthFlexible">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConstrainedWidthFlexible">
 								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConstrainedWidthFlexible">ConstrainedWidthFlexible</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7875.5, 2504.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
+						<g transform="translate(7875.5, 2564.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+minWidth: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">+maxWidth: double</text>
@@ -7418,7 +7467,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(7875.5, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
+						<g transform="translate(7875.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">-double _getWidth()</text>
@@ -7428,9 +7477,9 @@
 					</g>
 					<g data-name="BoxConstraints">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BoxConstraints">
-							<rect x="12912.0" y="3365.0" height="31.0" width="136.0" data-name="BoxConstraints"></rect>
+							<rect x="12912.0" y="3485.0" height="31.0" width="136.0" data-name="BoxConstraints"></rect>
 						</g>
-						<g transform="translate(12912, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxConstraints">
+						<g transform="translate(12912, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxConstraints">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxConstraints">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxConstraints">BoxConstraints</text>
 								
@@ -7439,16 +7488,16 @@
 					</g>
 					<g data-name="PrimaryButton">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PrimaryButton">
-							<rect x="8202.5" y="2451.5" height="227.0" width="333.0" data-name="PrimaryButton"></rect>
-							<path d="M8202.5 2482.5 L8535.5 2482.5" fill="none" data-name="PrimaryButton"></path>
+							<rect x="8202.5" y="2511.5" height="227.0" width="333.0" data-name="PrimaryButton"></rect>
+							<path d="M8202.5 2542.5 L8535.5 2542.5" fill="none" data-name="PrimaryButton"></path>
 						</g>
-						<g transform="translate(8202.5, 2451.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PrimaryButton">
+						<g transform="translate(8202.5, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PrimaryButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PrimaryButton">
 								<text x="158.5" y="13.5" stroke="none" text-anchor="middle" data-name="PrimaryButton">PrimaryButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8202.5, 2482.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PrimaryButton">
+						<g transform="translate(8202.5, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PrimaryButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PrimaryButton">
 								<text x="0.0" y="13.5" stroke="none" data-name="PrimaryButton">+text: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PrimaryButton">+icon: IconData?</text>
@@ -7468,9 +7517,9 @@
 					</g>
 					<g data-name="void Function()?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="17849.5" y="3998.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
+							<rect x="18277.3" y="4118.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
 						</g>
-						<g transform="translate(17849.5, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
+						<g transform="translate(18277.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
 								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
 								
@@ -7479,9 +7528,9 @@
 					</g>
 					<g data-name="dynamic Function()?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="11770.0" y="3365.0" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
+							<rect x="11584.5" y="3485.0" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
 						</g>
-						<g transform="translate(11770, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
+						<g transform="translate(11584.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
 								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
 								
@@ -7490,9 +7539,9 @@
 					</g>
 					<g data-name="EdgeInsets">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="13551.0" y="3365.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
+							<rect x="13098.8" y="3485.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
 						</g>
-						<g transform="translate(13551, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
+						<g transform="translate(13098.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
 								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
 								
@@ -7501,9 +7550,9 @@
 					</g>
 					<g data-name="Size">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Size">
-							<rect x="8443.0" y="3365.0" height="31.0" width="50.0" data-name="Size"></rect>
+							<rect x="8443.0" y="3485.0" height="31.0" width="50.0" data-name="Size"></rect>
 						</g>
-						<g transform="translate(8443, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Size">
+						<g transform="translate(8443, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Size">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Size">
 								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Size">Size</text>
 								
@@ -7512,16 +7561,16 @@
 					</g>
 					<g data-name="FormTableRow">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRow">
-							<rect x="8575.5" y="2489.0" height="152.0" width="379.0" data-name="FormTableRow"></rect>
-							<path d="M8575.5 2520.0 L8954.5 2520.0" fill="none" data-name="FormTableRow"></path>
+							<rect x="8575.5" y="2549.0" height="152.0" width="379.0" data-name="FormTableRow"></rect>
+							<path d="M8575.5 2580.0 L8954.5 2580.0" fill="none" data-name="FormTableRow"></path>
 						</g>
-						<g transform="translate(8575.5, 2489)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRow">
+						<g transform="translate(8575.5, 2549)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRow">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRow">
 								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRow">FormTableRow</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8575.5, 2520)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRow">
+						<g transform="translate(8575.5, 2580)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRow">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRow">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRow">+label: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRow">+labelBuilder: Widget Function(BuildContext)?</text>
@@ -7536,9 +7585,9 @@
 					</g>
 					<g data-name="Widget Function(BuildContext)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
-							<rect x="8533.0" y="3365.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
+							<rect x="8533.0" y="3485.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
 						</g>
-						<g transform="translate(8533, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
+						<g transform="translate(8533, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
 								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
 								
@@ -7547,16 +7596,16 @@
 					</g>
 					<g data-name="FormTableRowLayout">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRowLayout">
-							<rect x="6509.3" y="3327.0" height="107.0" width="370.0" data-name="FormTableRowLayout"></rect>
-							<path d="M6509.3 3358.0 L6879.3 3358.0" fill="none" data-name="FormTableRowLayout"></path>
+							<rect x="6441.0" y="3447.0" height="107.0" width="370.0" data-name="FormTableRowLayout"></rect>
+							<path d="M6441.0 3478.0 L6811.0 3478.0" fill="none" data-name="FormTableRowLayout"></path>
 						</g>
-						<g transform="translate(6509.25, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRowLayout">
+						<g transform="translate(6441, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRowLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRowLayout">
 								<text x="177.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRowLayout">FormTableRowLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6509.25, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRowLayout">
+						<g transform="translate(6441, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRowLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRowLayout">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRowLayout">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+values: List&lt;FormTableRowLayout&gt;</text>
@@ -7568,17 +7617,17 @@
 					</g>
 					<g data-name="FormTableLayout">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableLayout">
-							<rect x="9383.5" y="2488.5" height="153.0" width="379.0" data-name="FormTableLayout"></rect>
-							<path d="M9383.5 2519.5 L9762.5 2519.5" fill="none" data-name="FormTableLayout"></path>
-							<path d="M9383.5 2610.5 L9762.5 2610.5" fill="none" data-name="FormTableLayout"></path>
+							<rect x="9383.5" y="2548.5" height="153.0" width="379.0" data-name="FormTableLayout"></rect>
+							<path d="M9383.5 2579.5 L9762.5 2579.5" fill="none" data-name="FormTableLayout"></path>
+							<path d="M9383.5 2670.5 L9762.5 2670.5" fill="none" data-name="FormTableLayout"></path>
 						</g>
-						<g transform="translate(9383.5, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableLayout">
+						<g transform="translate(9383.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableLayout">
 								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableLayout">FormTableLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9383.5, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
+						<g transform="translate(9383.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+rows: List&lt;FormTableRow&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormTableLayout">+columnWidths: Map&lt;int, TableColumnWidth&gt;</text>
@@ -7588,7 +7637,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(9383.5, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
+						<g transform="translate(9383.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+Widget build()</text>
 								
@@ -7597,17 +7646,17 @@
 					</g>
 					<g data-name="FormSectionHeader">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormSectionHeader">
-							<rect x="9802.5" y="2488.5" height="153.0" width="220.0" data-name="FormSectionHeader"></rect>
-							<path d="M9802.5 2519.5 L10022.5 2519.5" fill="none" data-name="FormSectionHeader"></path>
-							<path d="M9802.5 2610.5 L10022.5 2610.5" fill="none" data-name="FormSectionHeader"></path>
+							<rect x="9802.5" y="2548.5" height="153.0" width="220.0" data-name="FormSectionHeader"></rect>
+							<path d="M9802.5 2579.5 L10022.5 2579.5" fill="none" data-name="FormSectionHeader"></path>
+							<path d="M9802.5 2670.5 L10022.5 2670.5" fill="none" data-name="FormSectionHeader"></path>
 						</g>
-						<g transform="translate(9802.5, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSectionHeader">
+						<g transform="translate(9802.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSectionHeader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSectionHeader">
 								<text x="102.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormSectionHeader">FormSectionHeader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9802.5, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
+						<g transform="translate(9802.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+title: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormSectionHeader">+titleTextStyle: TextStyle?</text>
@@ -7617,7 +7666,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(9802.5, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
+						<g transform="translate(9802.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+Widget build()</text>
 								
@@ -7626,17 +7675,17 @@
 					</g>
 					<g data-name="FormLabel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormLabel">
-							<rect x="10231.0" y="2496.0" height="138.0" width="266.0" data-name="FormLabel"></rect>
-							<path d="M10231.0 2527.0 L10497.0 2527.0" fill="none" data-name="FormLabel"></path>
-							<path d="M10231.0 2603.0 L10497.0 2603.0" fill="none" data-name="FormLabel"></path>
+							<rect x="10231.0" y="2556.0" height="138.0" width="266.0" data-name="FormLabel"></rect>
+							<path d="M10231.0 2587.0 L10497.0 2587.0" fill="none" data-name="FormLabel"></path>
+							<path d="M10231.0 2663.0 L10497.0 2663.0" fill="none" data-name="FormLabel"></path>
 						</g>
-						<g transform="translate(10231, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormLabel">
+						<g transform="translate(10231, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormLabel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormLabel">
 								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormLabel">FormLabel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10231, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
+						<g transform="translate(10231, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+labelText: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormLabel">+helpText: String?</text>
@@ -7645,7 +7694,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(10231, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
+						<g transform="translate(10231, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+Widget build()</text>
 								
@@ -7654,24 +7703,24 @@
 					</g>
 					<g data-name="DismissButton">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DismissButton">
-							<rect x="15178.3" y="3669.5" height="108.0" width="249.0" data-name="DismissButton"></rect>
-							<path d="M15178.3 3700.5 L15427.3 3700.5" fill="none" data-name="DismissButton"></path>
-							<path d="M15178.3 3746.5 L15427.3 3746.5" fill="none" data-name="DismissButton"></path>
+							<rect x="15606.0" y="3789.5" height="108.0" width="249.0" data-name="DismissButton"></rect>
+							<path d="M15606.0 3820.5 L15855.0 3820.5" fill="none" data-name="DismissButton"></path>
+							<path d="M15606.0 3866.5 L15855.0 3866.5" fill="none" data-name="DismissButton"></path>
 						</g>
-						<g transform="translate(15178.25, 3669.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DismissButton">
+						<g transform="translate(15606, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DismissButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DismissButton">
 								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="DismissButton">DismissButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15178.25, 3700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
+						<g transform="translate(15606, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
 								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+onPressed: void Function()?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DismissButton">+text: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15178.25, 3746.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
+						<g transform="translate(15606, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
 								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+Widget build()</text>
 								
@@ -7680,17 +7729,17 @@
 					</g>
 					<g data-name="Badge">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Badge">
-							<rect x="10537.0" y="2436.0" height="258.0" width="263.0" data-name="Badge"></rect>
-							<path d="M10537.0 2467.0 L10800.0 2467.0" fill="none" data-name="Badge"></path>
-							<path d="M10537.0 2618.0 L10800.0 2618.0" fill="none" data-name="Badge"></path>
+							<rect x="10537.0" y="2496.0" height="258.0" width="263.0" data-name="Badge"></rect>
+							<path d="M10537.0 2527.0 L10800.0 2527.0" fill="none" data-name="Badge"></path>
+							<path d="M10537.0 2678.0 L10800.0 2678.0" fill="none" data-name="Badge"></path>
 						</g>
-						<g transform="translate(10537, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Badge">
+						<g transform="translate(10537, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Badge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Badge">
 								<text x="123.5" y="13.5" stroke="none" text-anchor="middle" data-name="Badge">Badge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10537, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
+						<g transform="translate(10537, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
 								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+icon: IconData?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Badge">+color: Color?</text>
@@ -7704,7 +7753,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(10537, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
+						<g transform="translate(10537, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
 								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Badge">-Color? _getBackgroundColor()</text>
@@ -7716,16 +7765,16 @@
 					</g>
 					<g data-name="BadgeType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="26003.8" y="3312.0" height="137.0" width="288.0" data-name="BadgeType"></rect>
-							<path d="M26003.8 3343.0 L26291.8 3343.0" fill="none" data-name="BadgeType"></path>
+							<rect x="26691.8" y="3432.0" height="137.0" width="288.0" data-name="BadgeType"></rect>
+							<path d="M26691.8 3463.0 L26979.8 3463.0" fill="none" data-name="BadgeType"></path>
 						</g>
-						<g transform="translate(26003.75, 3312)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
+						<g transform="translate(26691.75, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
 								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26003.75, 3343)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BadgeType">
+						<g transform="translate(26691.75, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BadgeType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BadgeType">
 								<text x="0.0" y="13.5" stroke="none" data-name="BadgeType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BadgeType">&lt;static&gt;+values: List&lt;BadgeType&gt;</text>
@@ -7739,17 +7788,17 @@
 					</g>
 					<g data-name="StandardDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StandardDialog">
-							<rect x="10840.0" y="2428.5" height="273.0" width="247.0" data-name="StandardDialog"></rect>
-							<path d="M10840.0 2459.5 L11087.0 2459.5" fill="none" data-name="StandardDialog"></path>
-							<path d="M10840.0 2670.5 L11087.0 2670.5" fill="none" data-name="StandardDialog"></path>
+							<rect x="10840.0" y="2488.5" height="273.0" width="247.0" data-name="StandardDialog"></rect>
+							<path d="M10840.0 2519.5 L11087.0 2519.5" fill="none" data-name="StandardDialog"></path>
+							<path d="M10840.0 2730.5 L11087.0 2730.5" fill="none" data-name="StandardDialog"></path>
 						</g>
-						<g transform="translate(10840, 2428.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardDialog">
+						<g transform="translate(10840, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardDialog">
 								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardDialog">StandardDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10840, 2459.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
+						<g transform="translate(10840, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+title: Widget?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StandardDialog">+titleText: String?</text>
@@ -7767,7 +7816,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(10840, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
+						<g transform="translate(10840, 2730.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+Widget build()</text>
 								
@@ -7776,16 +7825,16 @@
 					</g>
 					<g data-name="ISyncIndicatorViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ISyncIndicatorViewModel">
-							<rect x="29031.0" y="98.0" height="77.0" width="214.0" data-name="ISyncIndicatorViewModel"></rect>
-							<path d="M29031.0 129.0 L29245.0 129.0" fill="none" data-name="ISyncIndicatorViewModel"></path>
+							<rect x="27782.0" y="98.0" height="77.0" width="214.0" data-name="ISyncIndicatorViewModel"></rect>
+							<path d="M27782.0 129.0 L27996.0 129.0" fill="none" data-name="ISyncIndicatorViewModel"></path>
 						</g>
-						<g transform="translate(29031, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ISyncIndicatorViewModel">
+						<g transform="translate(27782, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ISyncIndicatorViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ISyncIndicatorViewModel">
 								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="ISyncIndicatorViewModel">ISyncIndicatorViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29031, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ISyncIndicatorViewModel">
+						<g transform="translate(27782, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ISyncIndicatorViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ISyncIndicatorViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ISyncIndicatorViewModel">+isDirty: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ISyncIndicatorViewModel">+lastSynced: DateTime?</text>
@@ -7795,16 +7844,16 @@
 					</g>
 					<g data-name="SyncIndicator">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SyncIndicator">
-							<rect x="11127.0" y="2504.0" height="122.0" width="208.0" data-name="SyncIndicator"></rect>
-							<path d="M11127.0 2535.0 L11335.0 2535.0" fill="none" data-name="SyncIndicator"></path>
+							<rect x="11127.0" y="2564.0" height="122.0" width="208.0" data-name="SyncIndicator"></rect>
+							<path d="M11127.0 2595.0 L11335.0 2595.0" fill="none" data-name="SyncIndicator"></path>
 						</g>
-						<g transform="translate(11127, 2504)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SyncIndicator">
+						<g transform="translate(11127, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SyncIndicator">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SyncIndicator">
 								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="SyncIndicator">SyncIndicator</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11127, 2535)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SyncIndicator">
+						<g transform="translate(11127, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SyncIndicator">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SyncIndicator">
 								<text x="0.0" y="13.5" stroke="none" data-name="SyncIndicator">+state: AsyncValue&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SyncIndicator">+lastSynced: DateTime?</text>
@@ -7817,16 +7866,16 @@
 					</g>
 					<g data-name="IWithBanner">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="13445.0" y="1181.5" height="62.0" width="164.0" data-name="IWithBanner"></rect>
-							<path d="M13445.0 1212.5 L13609.0 1212.5" fill="none" data-name="IWithBanner"></path>
+							<rect x="13085.5" y="1181.5" height="62.0" width="164.0" data-name="IWithBanner"></rect>
+							<path d="M13085.5 1212.5 L13249.5 1212.5" fill="none" data-name="IWithBanner"></path>
 						</g>
-						<g transform="translate(13445, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
+						<g transform="translate(13085.5, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
 								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13445, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IWithBanner">
+						<g transform="translate(13085.5, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IWithBanner">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IWithBanner">
 								<text x="0.0" y="13.5" stroke="none" data-name="IWithBanner">+Widget? banner()</text>
 								
@@ -7835,16 +7884,16 @@
 					</g>
 					<g data-name="BannerBox">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BannerBox">
-							<rect x="11375.0" y="2474.0" height="182.0" width="298.0" data-name="BannerBox"></rect>
-							<path d="M11375.0 2505.0 L11673.0 2505.0" fill="none" data-name="BannerBox"></path>
+							<rect x="11375.0" y="2534.0" height="182.0" width="298.0" data-name="BannerBox"></rect>
+							<path d="M11375.0 2565.0 L11673.0 2565.0" fill="none" data-name="BannerBox"></path>
 						</g>
-						<g transform="translate(11375, 2474)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerBox">
+						<g transform="translate(11375, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerBox">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerBox">
 								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerBox">BannerBox</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11375, 2505)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerBox">
+						<g transform="translate(11375, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerBox">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerBox">
 								<text x="0.0" y="13.5" stroke="none" data-name="BannerBox">+prefixIcon: Widget?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BannerBox">+body: Widget</text>
@@ -7861,16 +7910,16 @@
 					</g>
 					<g data-name="BannerStyle">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BannerStyle">
-							<rect x="5007.3" y="3319.5" height="122.0" width="294.0" data-name="BannerStyle"></rect>
-							<path d="M5007.3 3350.5 L5301.3 3350.5" fill="none" data-name="BannerStyle"></path>
+							<rect x="4939.0" y="3439.5" height="122.0" width="294.0" data-name="BannerStyle"></rect>
+							<path d="M4939.0 3470.5 L5233.0 3470.5" fill="none" data-name="BannerStyle"></path>
 						</g>
-						<g transform="translate(5007.25, 3319.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerStyle">
+						<g transform="translate(4939, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerStyle">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerStyle">
 								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerStyle">BannerStyle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5007.25, 3350.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerStyle">
+						<g transform="translate(4939, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerStyle">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerStyle">
 								<text x="0.0" y="13.5" stroke="none" data-name="BannerStyle">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+values: List&lt;BannerStyle&gt;</text>
@@ -7883,17 +7932,17 @@
 					</g>
 					<g data-name="ActionMenuInline">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuInline">
-							<rect x="29285.0" y="52.5" height="168.0" width="324.0" data-name="ActionMenuInline"></rect>
-							<path d="M29285.0 83.5 L29609.0 83.5" fill="none" data-name="ActionMenuInline"></path>
-							<path d="M29285.0 189.5 L29609.0 189.5" fill="none" data-name="ActionMenuInline"></path>
+							<rect x="28036.0" y="52.5" height="168.0" width="324.0" data-name="ActionMenuInline"></rect>
+							<path d="M28036.0 83.5 L28360.0 83.5" fill="none" data-name="ActionMenuInline"></path>
+							<path d="M28036.0 189.5 L28360.0 189.5" fill="none" data-name="ActionMenuInline"></path>
 						</g>
-						<g transform="translate(29285, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuInline">
+						<g transform="translate(28036, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuInline">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuInline">
 								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuInline">ActionMenuInline</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29285, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
+						<g transform="translate(28036, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
 								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuInline">+iconSize: double?</text>
@@ -7904,7 +7953,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(29285, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
+						<g transform="translate(28036, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
 								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+Widget build()</text>
 								
@@ -7913,16 +7962,16 @@
 					</g>
 					<g data-name="Collapsible">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Collapsible">
-							<rect x="29649.0" y="83.0" height="107.0" width="441.0" data-name="Collapsible"></rect>
-							<path d="M29649.0 114.0 L30090.0 114.0" fill="none" data-name="Collapsible"></path>
+							<rect x="28400.0" y="83.0" height="107.0" width="441.0" data-name="Collapsible"></rect>
+							<path d="M28400.0 114.0 L28841.0 114.0" fill="none" data-name="Collapsible"></path>
 						</g>
-						<g transform="translate(29649, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Collapsible">
+						<g transform="translate(28400, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Collapsible">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Collapsible">
 								<text x="212.5" y="13.5" stroke="none" text-anchor="middle" data-name="Collapsible">Collapsible</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29649, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Collapsible">
+						<g transform="translate(28400, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Collapsible">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Collapsible">
 								<text x="0.0" y="13.5" stroke="none" data-name="Collapsible">+contentBuilder: Widget Function(BuildContext, bool)</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Collapsible">+headerBuilder: Widget Function(BuildContext, bool)?</text>
@@ -7934,9 +7983,9 @@
 					</g>
 					<g data-name="Widget Function(BuildContext, bool)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)">
-							<rect x="28770.5" y="614.0" height="31.0" width="300.0" data-name="Widget Function(BuildContext, bool)"></rect>
+							<rect x="27521.5" y="614.0" height="31.0" width="300.0" data-name="Widget Function(BuildContext, bool)"></rect>
 						</g>
-						<g transform="translate(28770.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)">
+						<g transform="translate(27521.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)">
 								<text x="142.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)">Widget Function(BuildContext, bool)</text>
 								
@@ -7945,9 +7994,9 @@
 					</g>
 					<g data-name="Widget Function(BuildContext, bool)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)?">
-							<rect x="29714.5" y="614.0" height="31.0" width="310.0" data-name="Widget Function(BuildContext, bool)?"></rect>
+							<rect x="28465.5" y="614.0" height="31.0" width="310.0" data-name="Widget Function(BuildContext, bool)?"></rect>
 						</g>
-						<g transform="translate(29714.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)?">
+						<g transform="translate(28465.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)?">
 								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)?">Widget Function(BuildContext, bool)?</text>
 								
@@ -7956,16 +8005,16 @@
 					</g>
 					<g data-name="NavbarTab">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="56458.3" y="1644.0" height="107.0" width="196.0" data-name="NavbarTab"></rect>
-							<path d="M56458.3 1675.0 L56654.3 1675.0" fill="none" data-name="NavbarTab"></path>
+							<rect x="61402.8" y="1644.0" height="107.0" width="196.0" data-name="NavbarTab"></rect>
+							<path d="M61402.8 1675.0 L61598.8 1675.0" fill="none" data-name="NavbarTab"></path>
 						</g>
-						<g transform="translate(56458.25, 1644)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
+						<g transform="translate(61402.75, 1644)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
 								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56458.25, 1675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NavbarTab">
+						<g transform="translate(61402.75, 1675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NavbarTab">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NavbarTab">
 								<text x="0.0" y="13.5" stroke="none" data-name="NavbarTab">+title: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="NavbarTab">+intent: RoutingIntent?</text>
@@ -7977,17 +8026,17 @@
 					</g>
 					<g data-name="RoutingIntent">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="36821.8" y="2458.5" height="213.0" width="297.0" data-name="RoutingIntent"></rect>
-							<path d="M36821.8 2489.5 L37118.8 2489.5" fill="none" data-name="RoutingIntent"></path>
-							<path d="M36821.8 2625.5 L37118.8 2625.5" fill="none" data-name="RoutingIntent"></path>
+							<rect x="44187.8" y="2518.5" height="213.0" width="297.0" data-name="RoutingIntent"></rect>
+							<path d="M44187.8 2549.5 L44484.8 2549.5" fill="none" data-name="RoutingIntent"></path>
+							<path d="M44187.8 2685.5 L44484.8 2685.5" fill="none" data-name="RoutingIntent"></path>
 						</g>
-						<g transform="translate(36821.75, 2458.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
+						<g transform="translate(44187.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
 								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36821.75, 2489.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
+						<g transform="translate(44187.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
 								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">+route: GoRoute</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+params: Map&lt;String, String&gt;</text>
@@ -8000,7 +8049,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(36821.75, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
+						<g transform="translate(44187.75, 2685.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
 								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">-dynamic _validateRoute()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+bool matches()</text>
@@ -8010,16 +8059,16 @@
 					</g>
 					<g data-name="TabbedNavbar">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TabbedNavbar">
-							<rect x="12039.8" y="2436.5" height="257.0" width="308.0" data-name="TabbedNavbar"></rect>
-							<path d="M12039.8 2467.5 L12347.8 2467.5" fill="none" data-name="TabbedNavbar"></path>
+							<rect x="12039.8" y="2496.5" height="257.0" width="308.0" data-name="TabbedNavbar"></rect>
+							<path d="M12039.8 2527.5 L12347.8 2527.5" fill="none" data-name="TabbedNavbar"></path>
 						</g>
-						<g transform="translate(12039.75, 2436.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabbedNavbar">
+						<g transform="translate(12039.75, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabbedNavbar">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabbedNavbar">
 								<text x="146.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabbedNavbar">TabbedNavbar</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12039.75, 2467.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TabbedNavbar">
+						<g transform="translate(12039.75, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TabbedNavbar">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TabbedNavbar">
 								<text x="0.0" y="13.5" stroke="none" data-name="TabbedNavbar">+tabs: List&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TabbedNavbar">+selectedTab: T?</text>
@@ -8041,9 +8090,9 @@
 					</g>
 					<g data-name="BoxDecoration">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BoxDecoration">
-							<rect x="11987.0" y="3365.0" height="31.0" width="132.0" data-name="BoxDecoration"></rect>
+							<rect x="11801.5" y="3485.0" height="31.0" width="132.0" data-name="BoxDecoration"></rect>
 						</g>
-						<g transform="translate(11987, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxDecoration">
+						<g transform="translate(11801.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxDecoration">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxDecoration">
 								<text x="58.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxDecoration">BoxDecoration</text>
 								
@@ -8052,9 +8101,9 @@
 					</g>
 					<g data-name="void Function(int, T)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(int, T)?">
-							<rect x="12159.0" y="3365.0" height="31.0" width="183.0" data-name="void Function(int, T)?"></rect>
+							<rect x="11973.5" y="3485.0" height="31.0" width="183.0" data-name="void Function(int, T)?"></rect>
 						</g>
-						<g transform="translate(12159, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(int, T)?">
+						<g transform="translate(11973.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(int, T)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(int, T)?">
 								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(int, T)?">void Function(int, T)?</text>
 								
@@ -8063,9 +8112,9 @@
 					</g>
 					<g data-name="TabBarIndicatorSize">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TabBarIndicatorSize">
-							<rect x="12382.0" y="3365.0" height="31.0" width="176.0" data-name="TabBarIndicatorSize"></rect>
+							<rect x="12196.5" y="3485.0" height="31.0" width="176.0" data-name="TabBarIndicatorSize"></rect>
 						</g>
-						<g transform="translate(12382, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabBarIndicatorSize">
+						<g transform="translate(12196.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabBarIndicatorSize">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabBarIndicatorSize">
 								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabBarIndicatorSize">TabBarIndicatorSize</text>
 								
@@ -8074,16 +8123,16 @@
 					</g>
 					<g data-name="SidesheetTab">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SidesheetTab">
-							<rect x="56411.3" y="2534.0" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
-							<path d="M56411.3 2565.0 L56741.3 2565.0" fill="none" data-name="SidesheetTab"></path>
+							<rect x="61155.0" y="2594.0" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
+							<path d="M61155.0 2625.0 L61485.0 2625.0" fill="none" data-name="SidesheetTab"></path>
 						</g>
-						<g transform="translate(56411.25, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
+						<g transform="translate(61155, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SidesheetTab">
 								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="SidesheetTab">SidesheetTab</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56411.25, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
+						<g transform="translate(61155, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SidesheetTab">
 								<text x="0.0" y="13.5" stroke="none" data-name="SidesheetTab">+builder: Widget Function(BuildContext)</text>
 								
@@ -8092,9 +8141,9 @@
 					</g>
 					<g data-name="Widget Function(BuildContext)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="51582.3" y="3365.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
+							<rect x="49002.5" y="3485.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
 						</g>
-						<g transform="translate(51582.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
+						<g transform="translate(49002.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
 								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
 								
@@ -8103,16 +8152,16 @@
 					</g>
 					<g data-name="Sidesheet">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Sidesheet">
-							<rect x="12838.8" y="2459.0" height="212.0" width="341.0" data-name="Sidesheet"></rect>
-							<path d="M12838.8 2490.0 L13179.8 2490.0" fill="none" data-name="Sidesheet"></path>
+							<rect x="12715.3" y="2519.0" height="212.0" width="341.0" data-name="Sidesheet"></rect>
+							<path d="M12715.3 2550.0 L13056.3 2550.0" fill="none" data-name="Sidesheet"></path>
 						</g>
-						<g transform="translate(12838.75, 2459)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
+						<g transform="translate(12715.25, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Sidesheet">
 								<text x="162.5" y="13.5" stroke="none" text-anchor="middle" data-name="Sidesheet">Sidesheet</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12838.75, 2490)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
+						<g transform="translate(12715.25, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Sidesheet">
 								<text x="0.0" y="13.5" stroke="none" data-name="Sidesheet">&lt;static&gt;+kDefaultWidth: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Sidesheet">+titleText: String</text>
@@ -8131,9 +8180,9 @@
 					</g>
 					<g data-name="Widget Function(Widget)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Widget)?">
-							<rect x="18868.0" y="3365.0" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
+							<rect x="19573.8" y="3485.0" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
 						</g>
-						<g transform="translate(18868, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
+						<g transform="translate(19573.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Widget)?">
 								<text x="102.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Widget)?">Widget Function(Widget)?</text>
 								
@@ -8142,16 +8191,16 @@
 					</g>
 					<g data-name="FormSideSheetTab">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormSideSheetTab">
-							<rect x="56781.3" y="2534.0" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
-							<path d="M56781.3 2565.0 L57094.3 2565.0" fill="none" data-name="FormSideSheetTab"></path>
+							<rect x="61525.0" y="2594.0" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
+							<path d="M61525.0 2625.0 L61838.0 2625.0" fill="none" data-name="FormSideSheetTab"></path>
 						</g>
-						<g transform="translate(56781.25, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
+						<g transform="translate(61525, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSideSheetTab">
 								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormSideSheetTab">FormSideSheetTab</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56781.25, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
+						<g transform="translate(61525, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSideSheetTab">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormSideSheetTab">+formViewBuilder: Widget Function(T)</text>
 								
@@ -8160,23 +8209,23 @@
 					</g>
 					<g data-name="HelpIcon">
 						<g fill="#eee8d5" stroke="#33322E" data-name="HelpIcon">
-							<rect x="30130.0" y="90.0" height="93.0" width="174.0" data-name="HelpIcon"></rect>
-							<path d="M30130.0 121.0 L30304.0 121.0" fill="none" data-name="HelpIcon"></path>
-							<path d="M30130.0 152.0 L30304.0 152.0" fill="none" data-name="HelpIcon"></path>
+							<rect x="28881.0" y="90.0" height="93.0" width="174.0" data-name="HelpIcon"></rect>
+							<path d="M28881.0 121.0 L29055.0 121.0" fill="none" data-name="HelpIcon"></path>
+							<path d="M28881.0 152.0 L29055.0 152.0" fill="none" data-name="HelpIcon"></path>
 						</g>
-						<g transform="translate(30130, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HelpIcon">
+						<g transform="translate(28881, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HelpIcon">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HelpIcon">
 								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="HelpIcon">HelpIcon</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30130, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
+						<g transform="translate(28881, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
 								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+tooltipText: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30130, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
+						<g transform="translate(28881, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
 								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+Widget build()</text>
 								
@@ -8185,17 +8234,17 @@
 					</g>
 					<g data-name="EmptyBody">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EmptyBody">
-							<rect x="13466.8" y="2481.0" height="168.0" width="222.0" data-name="EmptyBody"></rect>
-							<path d="M13466.8 2512.0 L13688.8 2512.0" fill="none" data-name="EmptyBody"></path>
-							<path d="M13466.8 2618.0 L13688.8 2618.0" fill="none" data-name="EmptyBody"></path>
+							<rect x="13672.0" y="2541.0" height="168.0" width="222.0" data-name="EmptyBody"></rect>
+							<path d="M13672.0 2572.0 L13894.0 2572.0" fill="none" data-name="EmptyBody"></path>
+							<path d="M13672.0 2678.0 L13894.0 2678.0" fill="none" data-name="EmptyBody"></path>
 						</g>
-						<g transform="translate(13466.75, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmptyBody">
+						<g transform="translate(13672, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmptyBody">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmptyBody">
 								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="EmptyBody">EmptyBody</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13466.75, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
+						<g transform="translate(13672, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
 								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+icon: IconData?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EmptyBody">+leading: Widget?</text>
@@ -8206,7 +8255,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(13466.75, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
+						<g transform="translate(13672, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
 								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+Widget build()</text>
 								
@@ -8215,17 +8264,17 @@
 					</g>
 					<g data-name="IndicatorRangeSliderThumbShape">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IndicatorRangeSliderThumbShape">
-							<rect x="30309.5" y="560.5" height="138.0" width="287.0" data-name="IndicatorRangeSliderThumbShape"></rect>
-							<path d="M30309.5 591.5 L30596.5 591.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
-							<path d="M30309.5 652.5 L30596.5 652.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
+							<rect x="29060.5" y="560.5" height="138.0" width="287.0" data-name="IndicatorRangeSliderThumbShape"></rect>
+							<path d="M29060.5 591.5 L29347.5 591.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
+							<path d="M29060.5 652.5 L29347.5 652.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
 						</g>
-						<g transform="translate(30309.5, 560.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+						<g transform="translate(29060.5, 560.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IndicatorRangeSliderThumbShape">
 								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="IndicatorRangeSliderThumbShape">IndicatorRangeSliderThumbShape</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30309.5, 591.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+						<g transform="translate(29060.5, 591.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
 								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+buildContext: BuildContext</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+start: T</text>
@@ -8233,7 +8282,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(30309.5, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+						<g transform="translate(29060.5, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
 								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+Size getPreferredSize()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+void paint()</text>
@@ -8243,9 +8292,9 @@
 					</g>
 					<g data-name="BuildContext">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
-							<rect x="30395.0" y="1197.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
+							<rect x="29146.0" y="1197.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
 						</g>
-						<g transform="translate(30395, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
+						<g transform="translate(29146, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
 								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
 								
@@ -8254,9 +8303,9 @@
 					</g>
 					<g data-name="RangeSliderThumbShape">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RangeSliderThumbShape">
-							<rect x="30344.0" y="121.0" height="31.0" width="218.0" data-name="RangeSliderThumbShape"></rect>
+							<rect x="29095.0" y="121.0" height="31.0" width="218.0" data-name="RangeSliderThumbShape"></rect>
 						</g>
-						<g transform="translate(30344, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="RangeSliderThumbShape">
+						<g transform="translate(29095, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="RangeSliderThumbShape">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RangeSliderThumbShape">
 								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="RangeSliderThumbShape">RangeSliderThumbShape</text>
 								
@@ -8265,16 +8314,16 @@
 					</g>
 					<g data-name="MouseEventsRegion">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MouseEventsRegion">
-							<rect x="15503.8" y="3640.0" height="167.0" width="379.0" data-name="MouseEventsRegion"></rect>
-							<path d="M15503.8 3671.0 L15882.8 3671.0" fill="none" data-name="MouseEventsRegion"></path>
+							<rect x="15931.5" y="3760.0" height="167.0" width="379.0" data-name="MouseEventsRegion"></rect>
+							<path d="M15931.5 3791.0 L16310.5 3791.0" fill="none" data-name="MouseEventsRegion"></path>
 						</g>
-						<g transform="translate(15503.75, 3640)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MouseEventsRegion">
+						<g transform="translate(15931.5, 3760)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MouseEventsRegion">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MouseEventsRegion">
 								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="MouseEventsRegion">MouseEventsRegion</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15503.75, 3671)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MouseEventsRegion">
+						<g transform="translate(15931.5, 3791)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MouseEventsRegion">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MouseEventsRegion">
 								<text x="0.0" y="13.5" stroke="none" data-name="MouseEventsRegion">+onTap: void Function()?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MouseEventsRegion">+onHover: void Function(PointerHoverEvent)?</text>
@@ -8290,9 +8339,9 @@
 					</g>
 					<g data-name="void Function(PointerHoverEvent)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerHoverEvent)?">
-							<rect x="7508.8" y="3998.5" height="31.0" width="292.0" data-name="void Function(PointerHoverEvent)?"></rect>
+							<rect x="7545.8" y="4118.5" height="31.0" width="292.0" data-name="void Function(PointerHoverEvent)?"></rect>
 						</g>
-						<g transform="translate(7508.75, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerHoverEvent)?">
+						<g transform="translate(7545.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerHoverEvent)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerHoverEvent)?">
 								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerHoverEvent)?">void Function(PointerHoverEvent)?</text>
 								
@@ -8301,9 +8350,9 @@
 					</g>
 					<g data-name="void Function(PointerEnterEvent)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerEnterEvent)?">
-							<rect x="7840.8" y="3998.5" height="31.0" width="287.0" data-name="void Function(PointerEnterEvent)?"></rect>
+							<rect x="7877.8" y="4118.5" height="31.0" width="287.0" data-name="void Function(PointerEnterEvent)?"></rect>
 						</g>
-						<g transform="translate(7840.75, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerEnterEvent)?">
+						<g transform="translate(7877.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerEnterEvent)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerEnterEvent)?">
 								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerEnterEvent)?">void Function(PointerEnterEvent)?</text>
 								
@@ -8312,9 +8361,9 @@
 					</g>
 					<g data-name="void Function(PointerExitEvent)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerExitEvent)?">
-							<rect x="15443.8" y="3998.5" height="31.0" width="274.0" data-name="void Function(PointerExitEvent)?"></rect>
+							<rect x="15686.0" y="4118.5" height="31.0" width="274.0" data-name="void Function(PointerExitEvent)?"></rect>
 						</g>
-						<g transform="translate(15443.75, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerExitEvent)?">
+						<g transform="translate(15686, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerExitEvent)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerExitEvent)?">
 								<text x="129.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerExitEvent)?">void Function(PointerExitEvent)?</text>
 								
@@ -8323,9 +8372,9 @@
 					</g>
 					<g data-name="SystemMouseCursor">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SystemMouseCursor">
-							<rect x="15757.8" y="3998.5" height="31.0" width="180.0" data-name="SystemMouseCursor"></rect>
+							<rect x="16000.0" y="4118.5" height="31.0" width="180.0" data-name="SystemMouseCursor"></rect>
 						</g>
-						<g transform="translate(15757.75, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SystemMouseCursor">
+						<g transform="translate(16000, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SystemMouseCursor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SystemMouseCursor">
 								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="SystemMouseCursor">SystemMouseCursor</text>
 								
@@ -8334,9 +8383,9 @@
 					</g>
 					<g data-name="ReactiveCustomColorPicker">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveCustomColorPicker">
-							<rect x="34340.3" y="614.0" height="31.0" width="236.0" data-name="ReactiveCustomColorPicker"></rect>
+							<rect x="35402.5" y="614.0" height="31.0" width="236.0" data-name="ReactiveCustomColorPicker"></rect>
 						</g>
-						<g transform="translate(34340.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveCustomColorPicker">
+						<g transform="translate(35402.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveCustomColorPicker">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveCustomColorPicker">
 								<text x="110.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveCustomColorPicker">ReactiveCustomColorPicker</text>
 								
@@ -8345,9 +8394,9 @@
 					</g>
 					<g data-name="ReactiveFormField">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFormField">
-							<rect x="34376.8" y="121.0" height="31.0" width="163.0" data-name="ReactiveFormField"></rect>
+							<rect x="35439.0" y="121.0" height="31.0" width="163.0" data-name="ReactiveFormField"></rect>
 						</g>
-						<g transform="translate(34376.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFormField">
+						<g transform="translate(35439, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFormField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFormField">
 								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFormField">ReactiveFormField</text>
 								
@@ -8356,17 +8405,17 @@
 					</g>
 					<g data-name="TextParagraph">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TextParagraph">
-							<rect x="13728.8" y="2496.0" height="138.0" width="208.0" data-name="TextParagraph"></rect>
-							<path d="M13728.8 2527.0 L13936.8 2527.0" fill="none" data-name="TextParagraph"></path>
-							<path d="M13728.8 2603.0 L13936.8 2603.0" fill="none" data-name="TextParagraph"></path>
+							<rect x="13934.0" y="2556.0" height="138.0" width="208.0" data-name="TextParagraph"></rect>
+							<path d="M13934.0 2587.0 L14142.0 2587.0" fill="none" data-name="TextParagraph"></path>
+							<path d="M13934.0 2663.0 L14142.0 2663.0" fill="none" data-name="TextParagraph"></path>
 						</g>
-						<g transform="translate(13728.75, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextParagraph">
+						<g transform="translate(13934, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextParagraph">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextParagraph">
 								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextParagraph">TextParagraph</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13728.75, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
+						<g transform="translate(13934, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
 								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+text: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TextParagraph">+style: TextStyle?</text>
@@ -8375,7 +8424,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(13728.75, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
+						<g transform="translate(13934, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
 								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+Widget build()</text>
 								
@@ -8384,16 +8433,16 @@
 					</g>
 					<g data-name="UnderConstruction">
 						<g fill="#eee8d5" stroke="#33322E" data-name="UnderConstruction">
-							<rect x="34579.8" y="105.5" height="62.0" width="164.0" data-name="UnderConstruction"></rect>
-							<path d="M34579.8 136.5 L34743.8 136.5" fill="none" data-name="UnderConstruction"></path>
+							<rect x="35642.0" y="105.5" height="62.0" width="164.0" data-name="UnderConstruction"></rect>
+							<path d="M35642.0 136.5 L35806.0 136.5" fill="none" data-name="UnderConstruction"></path>
 						</g>
-						<g transform="translate(34579.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnderConstruction">
+						<g transform="translate(35642, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnderConstruction">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnderConstruction">
 								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="UnderConstruction">UnderConstruction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34579.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnderConstruction">
+						<g transform="translate(35642, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnderConstruction">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnderConstruction">
 								<text x="0.0" y="13.5" stroke="none" data-name="UnderConstruction">+Widget build()</text>
 								
@@ -8402,9 +8451,9 @@
 					</g>
 					<g data-name="NullHelperDecoration">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NullHelperDecoration">
-							<rect x="34762.8" y="614.0" height="31.0" width="184.0" data-name="NullHelperDecoration"></rect>
+							<rect x="35825.0" y="614.0" height="31.0" width="184.0" data-name="NullHelperDecoration"></rect>
 						</g>
-						<g transform="translate(34762.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NullHelperDecoration">
+						<g transform="translate(35825, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NullHelperDecoration">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NullHelperDecoration">
 								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="NullHelperDecoration">NullHelperDecoration</text>
 								
@@ -8413,9 +8462,9 @@
 					</g>
 					<g data-name="InputDecoration">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InputDecoration">
-							<rect x="34783.8" y="121.0" height="31.0" width="142.0" data-name="InputDecoration"></rect>
+							<rect x="35846.0" y="121.0" height="31.0" width="142.0" data-name="InputDecoration"></rect>
 						</g>
-						<g transform="translate(34783.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InputDecoration">
+						<g transform="translate(35846, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InputDecoration">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InputDecoration">
 								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="InputDecoration">InputDecoration</text>
 								
@@ -8424,16 +8473,16 @@
 					</g>
 					<g data-name="ActionMenuType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuType">
-							<rect x="8839.0" y="3327.0" height="107.0" width="330.0" data-name="ActionMenuType"></rect>
-							<path d="M8839.0 3358.0 L9169.0 3358.0" fill="none" data-name="ActionMenuType"></path>
+							<rect x="8839.0" y="3447.0" height="107.0" width="330.0" data-name="ActionMenuType"></rect>
+							<path d="M8839.0 3478.0 L9169.0 3478.0" fill="none" data-name="ActionMenuType"></path>
 						</g>
-						<g transform="translate(8839, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuType">
+						<g transform="translate(8839, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuType">
 								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuType">ActionMenuType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8839, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuType">
+						<g transform="translate(8839, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuType">
 								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+values: List&lt;ActionMenuType&gt;</text>
@@ -8445,24 +8494,24 @@
 					</g>
 					<g data-name="HtmlStylingBanner">
 						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlStylingBanner">
-							<rect x="13976.8" y="2511.0" height="108.0" width="298.0" data-name="HtmlStylingBanner"></rect>
-							<path d="M13976.8 2542.0 L14274.8 2542.0" fill="none" data-name="HtmlStylingBanner"></path>
-							<path d="M13976.8 2588.0 L14274.8 2588.0" fill="none" data-name="HtmlStylingBanner"></path>
+							<rect x="14182.0" y="2571.0" height="108.0" width="298.0" data-name="HtmlStylingBanner"></rect>
+							<path d="M14182.0 2602.0 L14480.0 2602.0" fill="none" data-name="HtmlStylingBanner"></path>
+							<path d="M14182.0 2648.0 L14480.0 2648.0" fill="none" data-name="HtmlStylingBanner"></path>
 						</g>
-						<g transform="translate(13976.75, 2511)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlStylingBanner">
+						<g transform="translate(14182, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlStylingBanner">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlStylingBanner">
 								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlStylingBanner">HtmlStylingBanner</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13976.75, 2542)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
+						<g transform="translate(14182, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
 								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+isDismissed: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="HtmlStylingBanner">+onDismissed: dynamic Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13976.75, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
+						<g transform="translate(14182, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
 								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+Widget build()</text>
 								
@@ -8471,16 +8520,16 @@
 					</g>
 					<g data-name="FormConsumerWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="78853.3" y="105.5" height="62.0" width="192.0" data-name="FormConsumerWidget"></rect>
-							<path d="M78853.3 136.5 L79045.3 136.5" fill="none" data-name="FormConsumerWidget"></path>
+							<rect x="81009.8" y="105.5" height="62.0" width="192.0" data-name="FormConsumerWidget"></rect>
+							<path d="M81009.8 136.5 L81201.8 136.5" fill="none" data-name="FormConsumerWidget"></path>
 						</g>
-						<g transform="translate(78853.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+						<g transform="translate(81009.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
 								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78853.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerWidget">
+						<g transform="translate(81009.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerWidget">+Widget build()</text>
 								
@@ -8489,16 +8538,16 @@
 					</g>
 					<g data-name="FormConsumerRefWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="13717.0" y="1666.5" height="62.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
-							<path d="M13717.0 1697.5 L13936.0 1697.5" fill="none" data-name="FormConsumerRefWidget"></path>
+							<rect x="13485.5" y="1666.5" height="62.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
+							<path d="M13485.5 1697.5 L13704.5 1697.5" fill="none" data-name="FormConsumerRefWidget"></path>
 						</g>
-						<g transform="translate(13717, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
+						<g transform="translate(13485.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
 								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13717, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerRefWidget">
+						<g transform="translate(13485.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerRefWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerRefWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerRefWidget">+Widget build()</text>
 								
@@ -8507,16 +8556,16 @@
 					</g>
 					<g data-name="SplashPage">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SplashPage">
-							<rect x="35250.8" y="105.5" height="62.0" width="136.0" data-name="SplashPage"></rect>
-							<path d="M35250.8 136.5 L35386.8 136.5" fill="none" data-name="SplashPage"></path>
+							<rect x="36313.0" y="105.5" height="62.0" width="136.0" data-name="SplashPage"></rect>
+							<path d="M36313.0 136.5 L36449.0 136.5" fill="none" data-name="SplashPage"></path>
 						</g>
-						<g transform="translate(35250.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
+						<g transform="translate(36313, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SplashPage">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SplashPage">SplashPage</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35250.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
+						<g transform="translate(36313, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SplashPage">
 								<text x="0.0" y="13.5" stroke="none" data-name="SplashPage">+Widget build()</text>
 								
@@ -8525,23 +8574,23 @@
 					</g>
 					<g data-name="ErrorPage">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ErrorPage">
-							<rect x="13515.0" y="1651.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
-							<path d="M13515.0 1682.0 L13677.0 1682.0" fill="none" data-name="ErrorPage"></path>
-							<path d="M13515.0 1713.0 L13677.0 1713.0" fill="none" data-name="ErrorPage"></path>
+							<rect x="13283.5" y="1651.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
+							<path d="M13283.5 1682.0 L13445.5 1682.0" fill="none" data-name="ErrorPage"></path>
+							<path d="M13283.5 1713.0 L13445.5 1713.0" fill="none" data-name="ErrorPage"></path>
 						</g>
-						<g transform="translate(13515, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
+						<g transform="translate(13283.5, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ErrorPage">
 								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="ErrorPage">ErrorPage</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13515, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
+						<g transform="translate(13283.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
 								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+error: Exception?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13515, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
+						<g transform="translate(13283.5, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
 								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+Widget build()</text>
 								
@@ -8550,9 +8599,9 @@
 					</g>
 					<g data-name="ConsumerWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="31792.0" y="1197.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+							<rect x="30158.8" y="1197.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
 						</g>
-						<g transform="translate(31792, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+						<g transform="translate(30158.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
 								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
@@ -8561,23 +8610,23 @@
 					</g>
 					<g data-name="StudyULogo">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyULogo">
-							<rect x="15999.3" y="3677.0" height="93.0" width="214.0" data-name="StudyULogo"></rect>
-							<path d="M15999.3 3708.0 L16213.3 3708.0" fill="none" data-name="StudyULogo"></path>
-							<path d="M15999.3 3739.0 L16213.3 3739.0" fill="none" data-name="StudyULogo"></path>
+							<rect x="16427.0" y="3797.0" height="93.0" width="214.0" data-name="StudyULogo"></rect>
+							<path d="M16427.0 3828.0 L16641.0 3828.0" fill="none" data-name="StudyULogo"></path>
+							<path d="M16427.0 3859.0 L16641.0 3859.0" fill="none" data-name="StudyULogo"></path>
 						</g>
-						<g transform="translate(15999.25, 3677)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyULogo">
+						<g transform="translate(16427, 3797)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyULogo">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyULogo">
 								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyULogo">StudyULogo</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15999.25, 3708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
+						<g transform="translate(16427, 3828)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+onTap: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15999.25, 3739)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
+						<g transform="translate(16427, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+Widget build()</text>
 								
@@ -8586,17 +8635,17 @@
 					</g>
 					<g data-name="SingleColumnLayout">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayout">
-							<rect x="14314.8" y="2466.0" height="198.0" width="418.0" data-name="SingleColumnLayout"></rect>
-							<path d="M14314.8 2497.0 L14732.8 2497.0" fill="none" data-name="SingleColumnLayout"></path>
-							<path d="M14314.8 2633.0 L14732.8 2633.0" fill="none" data-name="SingleColumnLayout"></path>
+							<rect x="14520.0" y="2526.0" height="198.0" width="418.0" data-name="SingleColumnLayout"></rect>
+							<path d="M14520.0 2557.0 L14938.0 2557.0" fill="none" data-name="SingleColumnLayout"></path>
+							<path d="M14520.0 2693.0 L14938.0 2693.0" fill="none" data-name="SingleColumnLayout"></path>
 						</g>
-						<g transform="translate(14314.75, 2466)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayout">
+						<g transform="translate(14520, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayout">
 								<text x="201.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayout">SingleColumnLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14314.75, 2497)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
+						<g transform="translate(14520, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
 								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraints: BoxConstraints</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraintsNarrow: BoxConstraints</text>
@@ -8609,7 +8658,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(14314.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
+						<g transform="translate(14520, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
 								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+dynamic fromType()</text>
 								
@@ -8618,16 +8667,16 @@
 					</g>
 					<g data-name="SingleColumnLayoutType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="24150.8" y="3312.0" height="137.0" width="426.0" data-name="SingleColumnLayoutType"></rect>
-							<path d="M24150.8 3343.0 L24576.8 3343.0" fill="none" data-name="SingleColumnLayoutType"></path>
+							<rect x="29142.3" y="3432.0" height="137.0" width="426.0" data-name="SingleColumnLayoutType"></rect>
+							<path d="M29142.3 3463.0 L29568.3 3463.0" fill="none" data-name="SingleColumnLayoutType"></path>
 						</g>
-						<g transform="translate(24150.75, 3312)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
+						<g transform="translate(29142.25, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
 								<text x="205.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24150.75, 3343)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayoutType">
+						<g transform="translate(29142.25, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayoutType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayoutType">
 								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayoutType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;</text>
@@ -8641,16 +8690,16 @@
 					</g>
 					<g data-name="Hyperlink">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Hyperlink">
-							<rect x="15187.3" y="2459.0" height="212.0" width="222.0" data-name="Hyperlink"></rect>
-							<path d="M15187.3 2490.0 L15409.3 2490.0" fill="none" data-name="Hyperlink"></path>
+							<rect x="15615.0" y="2519.0" height="212.0" width="222.0" data-name="Hyperlink"></rect>
+							<path d="M15615.0 2550.0 L15837.0 2550.0" fill="none" data-name="Hyperlink"></path>
 						</g>
-						<g transform="translate(15187.25, 2459)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Hyperlink">
+						<g transform="translate(15615, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Hyperlink">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Hyperlink">
 								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="Hyperlink">Hyperlink</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15187.25, 2490)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Hyperlink">
+						<g transform="translate(15615, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Hyperlink">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Hyperlink">
 								<text x="0.0" y="13.5" stroke="none" data-name="Hyperlink">+text: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Hyperlink">+url: String?</text>
@@ -8669,16 +8718,16 @@
 					</g>
 					<g data-name="StandardTableColumn">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableColumn">
-							<rect x="21305.8" y="2496.5" height="137.0" width="287.0" data-name="StandardTableColumn"></rect>
-							<path d="M21305.8 2527.5 L21592.8 2527.5" fill="none" data-name="StandardTableColumn"></path>
+							<rect x="21586.0" y="2556.5" height="137.0" width="287.0" data-name="StandardTableColumn"></rect>
+							<path d="M21586.0 2587.5 L21873.0 2587.5" fill="none" data-name="StandardTableColumn"></path>
 						</g>
-						<g transform="translate(21305.75, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableColumn">
+						<g transform="translate(21586, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableColumn">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableColumn">
 								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableColumn">StandardTableColumn</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21305.75, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableColumn">
+						<g transform="translate(21586, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableColumn">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableColumn">
 								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableColumn">+label: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableColumn">+tooltip: String?</text>
@@ -8692,9 +8741,9 @@
 					</g>
 					<g data-name="TableColumnWidth">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TableColumnWidth">
-							<rect x="26381.8" y="3365.0" height="31.0" width="165.0" data-name="TableColumnWidth"></rect>
+							<rect x="26271.5" y="3485.0" height="31.0" width="165.0" data-name="TableColumnWidth"></rect>
 						</g>
-						<g transform="translate(26381.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TableColumnWidth">
+						<g transform="translate(26271.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TableColumnWidth">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableColumnWidth">
 								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableColumnWidth">TableColumnWidth</text>
 								
@@ -8703,16 +8752,16 @@
 					</g>
 					<g data-name="StandardTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTable">
-							<rect x="19880.8" y="1494.0" height="407.0" width="688.0" data-name="StandardTable"></rect>
-							<path d="M19880.8 1525.0 L20568.8 1525.0" fill="none" data-name="StandardTable"></path>
+							<rect x="19871.8" y="1494.0" height="407.0" width="688.0" data-name="StandardTable"></rect>
+							<path d="M19871.8 1525.0 L20559.8 1525.0" fill="none" data-name="StandardTable"></path>
 						</g>
-						<g transform="translate(19880.75, 1494)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTable">
+						<g transform="translate(19871.75, 1494)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTable">
 								<text x="336.0" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTable">StandardTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19880.75, 1525)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTable">
+						<g transform="translate(19871.75, 1525)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StandardTable">+items: List&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StandardTable">+inputColumns: List&lt;StandardTableColumn&gt;</text>
@@ -8744,9 +8793,9 @@
 					</g>
 					<g data-name="void Function(T)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="28578.0" y="3365.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
+							<rect x="27441.8" y="3485.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
 						</g>
-						<g transform="translate(28578, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
+						<g transform="translate(27441.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
 								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
 								
@@ -8755,9 +8804,9 @@
 					</g>
 					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-							<rect x="18500.5" y="2549.5" height="31.0" width="381.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?"></rect>
+							<rect x="18928.3" y="2609.5" height="31.0" width="381.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?"></rect>
 						</g>
-						<g transform="translate(18500.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
+						<g transform="translate(18928.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
 								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
 								
@@ -8766,9 +8815,9 @@
 					</g>
 					<g data-name="int Function(T, T)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(T, T)?">
-							<rect x="18961.5" y="2549.5" height="31.0" width="160.0" data-name="int Function(T, T)?"></rect>
+							<rect x="19389.3" y="2609.5" height="31.0" width="160.0" data-name="int Function(T, T)?"></rect>
 						</g>
-						<g transform="translate(18961.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(T, T)?">
+						<g transform="translate(19389.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(T, T)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(T, T)?">
 								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(T, T)?">int Function(T, T)?</text>
 								
@@ -8777,9 +8826,9 @@
 					</g>
 					<g data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<rect x="19161.5" y="2549.5" height="31.0" width="523.0" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?"></rect>
+							<rect x="19589.3" y="2609.5" height="31.0" width="523.0" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?"></rect>
 						</g>
-						<g transform="translate(19161.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+						<g transform="translate(19589.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
 								<text x="253.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
 								
@@ -8788,16 +8837,16 @@
 					</g>
 					<g data-name="StandardTableStyle">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableStyle">
-							<rect x="9715.0" y="3327.0" height="107.0" width="353.0" data-name="StandardTableStyle"></rect>
-							<path d="M9715.0 3358.0 L10068.0 3358.0" fill="none" data-name="StandardTableStyle"></path>
+							<rect x="9715.0" y="3447.0" height="107.0" width="353.0" data-name="StandardTableStyle"></rect>
+							<path d="M9715.0 3478.0 L10068.0 3478.0" fill="none" data-name="StandardTableStyle"></path>
 						</g>
-						<g transform="translate(9715, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableStyle">
+						<g transform="translate(9715, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableStyle">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableStyle">
 								<text x="168.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableStyle">StandardTableStyle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9715, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableStyle">
+						<g transform="translate(9715, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableStyle">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableStyle">
 								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableStyle">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+values: List&lt;StandardTableStyle&gt;</text>
@@ -8809,24 +8858,24 @@
 					</g>
 					<g data-name="IconPack">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IconPack">
-							<rect x="35426.8" y="82.5" height="108.0" width="359.0" data-name="IconPack"></rect>
-							<path d="M35426.8 113.5 L35785.8 113.5" fill="none" data-name="IconPack"></path>
-							<path d="M35426.8 159.5 L35785.8 159.5" fill="none" data-name="IconPack"></path>
+							<rect x="36489.0" y="82.5" height="108.0" width="359.0" data-name="IconPack"></rect>
+							<path d="M36489.0 113.5 L36848.0 113.5" fill="none" data-name="IconPack"></path>
+							<path d="M36489.0 159.5 L36848.0 159.5" fill="none" data-name="IconPack"></path>
 						</g>
-						<g transform="translate(35426.75, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPack">
+						<g transform="translate(36489, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPack">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPack">
 								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPack">IconPack</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35426.75, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
+						<g transform="translate(36489, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+defaultPack: List&lt;IconOption&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IconPack">&lt;static&gt;+material: List&lt;IconOption&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35426.75, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
+						<g transform="translate(36489, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+IconOption? resolveIconByName()</text>
 								
@@ -8835,17 +8884,17 @@
 					</g>
 					<g data-name="IconOption">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IconOption">
-							<rect x="23183.8" y="2488.5" height="153.0" width="264.0" data-name="IconOption"></rect>
-							<path d="M23183.8 2519.5 L23447.8 2519.5" fill="none" data-name="IconOption"></path>
-							<path d="M23183.8 2595.5 L23447.8 2595.5" fill="none" data-name="IconOption"></path>
+							<rect x="23464.0" y="2548.5" height="153.0" width="264.0" data-name="IconOption"></rect>
+							<path d="M23464.0 2579.5 L23728.0 2579.5" fill="none" data-name="IconOption"></path>
+							<path d="M23464.0 2655.5 L23728.0 2655.5" fill="none" data-name="IconOption"></path>
 						</g>
-						<g transform="translate(23183.75, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconOption">
+						<g transform="translate(23464, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconOption">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconOption">
 								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="IconOption">IconOption</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23183.75, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
+						<g transform="translate(23464, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+name: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">+icon: IconData?</text>
@@ -8854,7 +8903,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(23183.75, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
+						<g transform="translate(23464, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+String toJson()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">&lt;static&gt;+IconOption fromJson()</text>
@@ -8864,9 +8913,9 @@
 					</g>
 					<g data-name="Equatable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="22591.8" y="1682.0" height="31.0" width="96.0" data-name="Equatable"></rect>
+							<rect x="22872.0" y="1682.0" height="31.0" width="96.0" data-name="Equatable"></rect>
 						</g>
-						<g transform="translate(22591.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
+						<g transform="translate(22872, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
 								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
 								
@@ -8875,9 +8924,9 @@
 					</g>
 					<g data-name="ReactiveIconPicker">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveIconPicker">
-							<rect x="35004.3" y="614.0" height="31.0" width="168.0" data-name="ReactiveIconPicker"></rect>
+							<rect x="36066.5" y="614.0" height="31.0" width="168.0" data-name="ReactiveIconPicker"></rect>
 						</g>
-						<g transform="translate(35004.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveIconPicker">
+						<g transform="translate(36066.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveIconPicker">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveIconPicker">
 								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveIconPicker">ReactiveIconPicker</text>
 								
@@ -8886,9 +8935,9 @@
 					</g>
 					<g data-name="ReactiveFocusableFormField">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFocusableFormField">
-							<rect x="34965.8" y="121.0" height="31.0" width="245.0" data-name="ReactiveFocusableFormField"></rect>
+							<rect x="36028.0" y="121.0" height="31.0" width="245.0" data-name="ReactiveFocusableFormField"></rect>
 						</g>
-						<g transform="translate(34965.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFocusableFormField">
+						<g transform="translate(36028, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFocusableFormField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFocusableFormField">
 								<text x="114.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFocusableFormField">ReactiveFocusableFormField</text>
 								
@@ -8897,17 +8946,17 @@
 					</g>
 					<g data-name="IconPicker">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IconPicker">
-							<rect x="23268.8" y="1606.0" height="183.0" width="319.0" data-name="IconPicker"></rect>
-							<path d="M23268.8 1637.0 L23587.8 1637.0" fill="none" data-name="IconPicker"></path>
-							<path d="M23268.8 1758.0 L23587.8 1758.0" fill="none" data-name="IconPicker"></path>
+							<rect x="23549.0" y="1606.0" height="183.0" width="319.0" data-name="IconPicker"></rect>
+							<path d="M23549.0 1637.0 L23868.0 1637.0" fill="none" data-name="IconPicker"></path>
+							<path d="M23549.0 1758.0 L23868.0 1758.0" fill="none" data-name="IconPicker"></path>
 						</g>
-						<g transform="translate(23268.75, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPicker">
+						<g transform="translate(23549, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPicker">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPicker">
 								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPicker">IconPicker</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23268.75, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
+						<g transform="translate(23549, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+iconOptions: List&lt;IconOption&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IconPicker">+selectedOption: IconOption?</text>
@@ -8919,7 +8968,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(23268.75, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
+						<g transform="translate(23549, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+Widget build()</text>
 								
@@ -8928,9 +8977,9 @@
 					</g>
 					<g data-name="void Function(IconOption)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(IconOption)?">
-							<rect x="23700.3" y="2549.5" height="31.0" width="230.0" data-name="void Function(IconOption)?"></rect>
+							<rect x="23980.5" y="2609.5" height="31.0" width="230.0" data-name="void Function(IconOption)?"></rect>
 						</g>
-						<g transform="translate(23700.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(IconOption)?">
+						<g transform="translate(23980.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(IconOption)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(IconOption)?">
 								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(IconOption)?">void Function(IconOption)?</text>
 								
@@ -8939,9 +8988,9 @@
 					</g>
 					<g data-name="FocusNode">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FocusNode">
-							<rect x="23534.8" y="2549.5" height="31.0" width="106.0" data-name="FocusNode"></rect>
+							<rect x="23815.0" y="2609.5" height="31.0" width="106.0" data-name="FocusNode"></rect>
 						</g>
-						<g transform="translate(23534.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FocusNode">
+						<g transform="translate(23815, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FocusNode">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FocusNode">
 								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="FocusNode">FocusNode</text>
 								
@@ -8950,17 +8999,17 @@
 					</g>
 					<g data-name="IconPickerField">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerField">
-							<rect x="23627.8" y="1606.0" height="183.0" width="319.0" data-name="IconPickerField"></rect>
-							<path d="M23627.8 1637.0 L23946.8 1637.0" fill="none" data-name="IconPickerField"></path>
-							<path d="M23627.8 1758.0 L23946.8 1758.0" fill="none" data-name="IconPickerField"></path>
+							<rect x="23908.0" y="1606.0" height="183.0" width="319.0" data-name="IconPickerField"></rect>
+							<path d="M23908.0 1637.0 L24227.0 1637.0" fill="none" data-name="IconPickerField"></path>
+							<path d="M23908.0 1758.0 L24227.0 1758.0" fill="none" data-name="IconPickerField"></path>
 						</g>
-						<g transform="translate(23627.75, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerField">
+						<g transform="translate(23908, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerField">
 								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerField">IconPickerField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23627.75, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
+						<g transform="translate(23908, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+iconOptions: List&lt;IconOption&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerField">+selectedOption: IconOption?</text>
@@ -8972,7 +9021,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(23627.75, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
+						<g transform="translate(23908, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+Widget build()</text>
 								
@@ -8981,17 +9030,17 @@
 					</g>
 					<g data-name="IconPickerGallery">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerGallery">
-							<rect x="23986.8" y="1636.0" height="123.0" width="319.0" data-name="IconPickerGallery"></rect>
-							<path d="M23986.8 1667.0 L24305.8 1667.0" fill="none" data-name="IconPickerGallery"></path>
-							<path d="M23986.8 1728.0 L24305.8 1728.0" fill="none" data-name="IconPickerGallery"></path>
+							<rect x="24267.0" y="1636.0" height="123.0" width="319.0" data-name="IconPickerGallery"></rect>
+							<path d="M24267.0 1667.0 L24586.0 1667.0" fill="none" data-name="IconPickerGallery"></path>
+							<path d="M24267.0 1728.0 L24586.0 1728.0" fill="none" data-name="IconPickerGallery"></path>
 						</g>
-						<g transform="translate(23986.75, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerGallery">
+						<g transform="translate(24267, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerGallery">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerGallery">
 								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerGallery">IconPickerGallery</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23986.75, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
+						<g transform="translate(24267, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+iconOptions: List&lt;IconOption&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerGallery">+onSelect: void Function(IconOption)?</text>
@@ -8999,7 +9048,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(23986.75, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
+						<g transform="translate(24267, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+Widget build()</text>
 								
@@ -9008,17 +9057,17 @@
 					</g>
 					<g data-name="SecondaryButton">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SecondaryButton">
-							<rect x="19724.5" y="2496.0" height="138.0" width="249.0" data-name="SecondaryButton"></rect>
-							<path d="M19724.5 2527.0 L19973.5 2527.0" fill="none" data-name="SecondaryButton"></path>
-							<path d="M19724.5 2603.0 L19973.5 2603.0" fill="none" data-name="SecondaryButton"></path>
+							<rect x="20152.3" y="2556.0" height="138.0" width="249.0" data-name="SecondaryButton"></rect>
+							<path d="M20152.3 2587.0 L20401.3 2587.0" fill="none" data-name="SecondaryButton"></path>
+							<path d="M20152.3 2663.0 L20401.3 2663.0" fill="none" data-name="SecondaryButton"></path>
 						</g>
-						<g transform="translate(19724.5, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecondaryButton">
+						<g transform="translate(20152.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecondaryButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecondaryButton">
 								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecondaryButton">SecondaryButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19724.5, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
+						<g transform="translate(20152.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
 								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+text: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SecondaryButton">+icon: IconData?</text>
@@ -9027,7 +9076,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(19724.5, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
+						<g transform="translate(20152.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
 								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+Widget build()</text>
 								
@@ -9036,16 +9085,16 @@
 					</g>
 					<g data-name="TwoColumnLayout">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TwoColumnLayout">
-							<rect x="20027.3" y="2406.5" height="317.0" width="368.0" data-name="TwoColumnLayout"></rect>
-							<path d="M20027.3 2437.5 L20395.3 2437.5" fill="none" data-name="TwoColumnLayout"></path>
+							<rect x="20637.5" y="2466.5" height="317.0" width="368.0" data-name="TwoColumnLayout"></rect>
+							<path d="M20637.5 2497.5 L21005.5 2497.5" fill="none" data-name="TwoColumnLayout"></path>
 						</g>
-						<g transform="translate(20027.25, 2406.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TwoColumnLayout">
+						<g transform="translate(20637.5, 2466.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TwoColumnLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TwoColumnLayout">
 								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="TwoColumnLayout">TwoColumnLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20027.25, 2437.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TwoColumnLayout">
+						<g transform="translate(20637.5, 2497.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TwoColumnLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TwoColumnLayout">
 								<text x="0.0" y="13.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultDivider: VerticalDivider</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultContentPadding: EdgeInsets</text>
@@ -9071,9 +9120,9 @@
 					</g>
 					<g data-name="VerticalDivider">
 						<g fill="#eee8d5" stroke="#33322E" data-name="VerticalDivider">
-							<rect x="21375.5" y="3365.0" height="31.0" width="130.0" data-name="VerticalDivider"></rect>
+							<rect x="20438.5" y="3485.0" height="31.0" width="130.0" data-name="VerticalDivider"></rect>
 						</g>
-						<g transform="translate(21375.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VerticalDivider">
+						<g transform="translate(20438.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VerticalDivider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VerticalDivider">
 								<text x="57.0" y="13.5" stroke="none" text-anchor="middle" data-name="VerticalDivider">VerticalDivider</text>
 								
@@ -9082,16 +9131,16 @@
 					</g>
 					<g data-name="AppTranslation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppTranslation">
-							<rect x="36104.8" y="105.5" height="62.0" width="194.0" data-name="AppTranslation"></rect>
-							<path d="M36104.8 136.5 L36298.8 136.5" fill="none" data-name="AppTranslation"></path>
+							<rect x="37167.0" y="105.5" height="62.0" width="194.0" data-name="AppTranslation"></rect>
+							<path d="M37167.0 136.5 L37361.0 136.5" fill="none" data-name="AppTranslation"></path>
 						</g>
-						<g transform="translate(36104.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppTranslation">
+						<g transform="translate(37167, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppTranslation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppTranslation">
 								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppTranslation">AppTranslation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36104.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppTranslation">
+						<g transform="translate(37167, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppTranslation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppTranslation">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppTranslation">&lt;static&gt;+dynamic init()</text>
 								
@@ -9100,16 +9149,16 @@
 					</g>
 					<g data-name="PlatformLocale">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocale">
-							<rect x="35825.8" y="105.5" height="62.0" width="239.0" data-name="PlatformLocale"></rect>
-							<path d="M35825.8 136.5 L36064.8 136.5" fill="none" data-name="PlatformLocale"></path>
+							<rect x="36888.0" y="105.5" height="62.0" width="239.0" data-name="PlatformLocale"></rect>
+							<path d="M36888.0 136.5 L37127.0 136.5" fill="none" data-name="PlatformLocale"></path>
 						</g>
-						<g transform="translate(35825.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformLocale">
+						<g transform="translate(36888, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformLocale">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocale">
 								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocale">PlatformLocale</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35825.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocale">
+						<g transform="translate(36888, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocale">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocale">
 								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocale">+Locale getPlatformLocale()</text>
 								
@@ -9118,16 +9167,16 @@
 					</g>
 					<g data-name="PlatformLocaleWeb">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleWeb">
-							<rect x="35519.0" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleWeb"></rect>
-							<path d="M35519.0 629.5 L35758.0 629.5" fill="none" data-name="PlatformLocaleWeb"></path>
+							<rect x="36581.3" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleWeb"></rect>
+							<path d="M36581.3 629.5 L36820.3 629.5" fill="none" data-name="PlatformLocaleWeb"></path>
 						</g>
-						<g transform="translate(35519, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleWeb">
+						<g transform="translate(36581.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleWeb">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleWeb">
 								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleWeb">PlatformLocaleWeb</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35519, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleWeb">
+						<g transform="translate(36581.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleWeb">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleWeb">
 								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleWeb">+Locale getPlatformLocale()</text>
 								
@@ -9136,16 +9185,16 @@
 					</g>
 					<g data-name="PlatformLocaleMobile">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleMobile">
-							<rect x="35998.0" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleMobile"></rect>
-							<path d="M35998.0 629.5 L36237.0 629.5" fill="none" data-name="PlatformLocaleMobile"></path>
+							<rect x="37060.3" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleMobile"></rect>
+							<path d="M37060.3 629.5 L37299.3 629.5" fill="none" data-name="PlatformLocaleMobile"></path>
 						</g>
-						<g transform="translate(35998, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleMobile">
+						<g transform="translate(37060.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleMobile">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleMobile">
 								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleMobile">PlatformLocaleMobile</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35998, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleMobile">
+						<g transform="translate(37060.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleMobile">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleMobile">
 								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleMobile">+Locale getPlatformLocale()</text>
 								
@@ -9154,16 +9203,16 @@
 					</g>
 					<g data-name="LanguagePicker">
 						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePicker">
-							<rect x="20797.0" y="2519.0" height="92.0" width="366.0" data-name="LanguagePicker"></rect>
-							<path d="M20797.0 2550.0 L21163.0 2550.0" fill="none" data-name="LanguagePicker"></path>
+							<rect x="21180.0" y="2579.0" height="92.0" width="366.0" data-name="LanguagePicker"></rect>
+							<path d="M21180.0 2610.0 L21546.0 2610.0" fill="none" data-name="LanguagePicker"></path>
 						</g>
-						<g transform="translate(20797, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePicker">
+						<g transform="translate(21180, 2579)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePicker">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePicker">
 								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePicker">LanguagePicker</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20797, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePicker">
+						<g transform="translate(21180, 2610)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePicker">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePicker">
 								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePicker">+languagePickerType: LanguagePickerType</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePicker">+iconColor: Color?</text>
@@ -9174,16 +9223,16 @@
 					</g>
 					<g data-name="LanguagePickerType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePickerType">
-							<rect x="9259.0" y="3327.0" height="107.0" width="366.0" data-name="LanguagePickerType"></rect>
-							<path d="M9259.0 3358.0 L9625.0 3358.0" fill="none" data-name="LanguagePickerType"></path>
+							<rect x="9259.0" y="3447.0" height="107.0" width="366.0" data-name="LanguagePickerType"></rect>
+							<path d="M9259.0 3478.0 L9625.0 3478.0" fill="none" data-name="LanguagePickerType"></path>
 						</g>
-						<g transform="translate(9259, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePickerType">
+						<g transform="translate(9259, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePickerType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePickerType">
 								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePickerType">LanguagePickerType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9259, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePickerType">
+						<g transform="translate(9259, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePickerType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePickerType">
 								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePickerType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+values: List&lt;LanguagePickerType&gt;</text>
@@ -9195,9 +9244,9 @@
 					</g>
 					<g data-name="Offset">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Offset">
-							<rect x="25900.8" y="3365.0" height="31.0" width="63.0" data-name="Offset"></rect>
+							<rect x="26168.5" y="3485.0" height="31.0" width="63.0" data-name="Offset"></rect>
 						</g>
-						<g transform="translate(25900.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Offset">
+						<g transform="translate(26168.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Offset">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Offset">
 								<text x="23.5" y="13.5" stroke="none" text-anchor="middle" data-name="Offset">Offset</text>
 								
@@ -9206,16 +9255,16 @@
 					</g>
 					<g data-name="GoRouteParamEnum">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouteParamEnum">
-							<rect x="36690.8" y="98.0" height="77.0" width="202.0" data-name="GoRouteParamEnum"></rect>
-							<path d="M36690.8 129.0 L36892.8 129.0" fill="none" data-name="GoRouteParamEnum"></path>
+							<rect x="37753.0" y="98.0" height="77.0" width="202.0" data-name="GoRouteParamEnum"></rect>
+							<path d="M37753.0 129.0 L37955.0 129.0" fill="none" data-name="GoRouteParamEnum"></path>
 						</g>
-						<g transform="translate(36690.75, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GoRouteParamEnum">
+						<g transform="translate(37753, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GoRouteParamEnum">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouteParamEnum">
 								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouteParamEnum">GoRouteParamEnum</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36690.75, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouteParamEnum">
+						<g transform="translate(37753, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouteParamEnum">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouteParamEnum">
 								<text x="0.0" y="13.5" stroke="none" data-name="GoRouteParamEnum">+String toRouteParam()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="GoRouteParamEnum">+String toShortString()</text>
@@ -9225,16 +9274,16 @@
 					</g>
 					<g data-name="RoutingIntents">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntents">
-							<rect x="29357.3" y="1479.0" height="437.0" width="572.0" data-name="RoutingIntents"></rect>
-							<path d="M29357.3 1510.0 L29929.3 1510.0" fill="none" data-name="RoutingIntents"></path>
+							<rect x="25022.5" y="1479.0" height="437.0" width="572.0" data-name="RoutingIntents"></rect>
+							<path d="M25022.5 1510.0 L25594.5 1510.0" fill="none" data-name="RoutingIntents"></path>
 						</g>
-						<g transform="translate(29357.25, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntents">
+						<g transform="translate(25022.5, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntents">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntents">
 								<text x="278.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntents">RoutingIntents</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29357.25, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntents">
+						<g transform="translate(25022.5, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntents">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntents">
 								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+root: RoutingIntent</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studies: RoutingIntent</text>
@@ -9268,9 +9317,9 @@
 					</g>
 					<g data-name="RoutingIntent Function(String)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String)">
-							<rect x="24366.3" y="2549.5" height="31.0" width="253.0" data-name="RoutingIntent Function(String)"></rect>
+							<rect x="24646.5" y="2609.5" height="31.0" width="253.0" data-name="RoutingIntent Function(String)"></rect>
 						</g>
-						<g transform="translate(24366.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String)">
+						<g transform="translate(24646.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String)">
 								<text x="118.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String)">RoutingIntent Function(String)</text>
 								
@@ -9279,9 +9328,9 @@
 					</g>
 					<g data-name="RoutingIntent Function(String, String)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, String)">
-							<rect x="24659.3" y="2549.5" height="31.0" width="309.0" data-name="RoutingIntent Function(String, String)"></rect>
+							<rect x="24939.5" y="2609.5" height="31.0" width="309.0" data-name="RoutingIntent Function(String, String)"></rect>
 						</g>
-						<g transform="translate(24659.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, String)">
+						<g transform="translate(24939.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, String)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, String)">
 								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, String)">RoutingIntent Function(String, String)</text>
 								
@@ -9290,9 +9339,9 @@
 					</g>
 					<g data-name="RoutingIntent Function(String, {String? appRoute})">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, {String? appRoute})">
-							<rect x="25008.3" y="2549.5" height="31.0" width="413.0" data-name="RoutingIntent Function(String, {String? appRoute})"></rect>
+							<rect x="25288.5" y="2609.5" height="31.0" width="413.0" data-name="RoutingIntent Function(String, {String? appRoute})"></rect>
 						</g>
-						<g transform="translate(25008.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, {String? appRoute})">
+						<g transform="translate(25288.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, {String? appRoute})">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, {String? appRoute})">
 								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, {String? appRoute})">RoutingIntent Function(String, {String? appRoute})</text>
 								
@@ -9301,9 +9350,9 @@
 					</g>
 					<g data-name="RoutingIntent Function(Exception)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(Exception)">
-							<rect x="25461.3" y="2549.5" height="31.0" width="285.0" data-name="RoutingIntent Function(Exception)"></rect>
+							<rect x="25741.5" y="2609.5" height="31.0" width="285.0" data-name="RoutingIntent Function(Exception)"></rect>
 						</g>
-						<g transform="translate(25461.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(Exception)">
+						<g transform="translate(25741.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(Exception)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(Exception)">
 								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(Exception)">RoutingIntent Function(Exception)</text>
 								
@@ -9312,9 +9361,9 @@
 					</g>
 					<g data-name="GoRoute">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GoRoute">
-							<rect x="45402.3" y="3365.0" height="31.0" width="86.0" data-name="GoRoute"></rect>
+							<rect x="44219.0" y="3485.0" height="31.0" width="86.0" data-name="GoRoute"></rect>
 						</g>
-						<g transform="translate(45402.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRoute">
+						<g transform="translate(44219, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRoute">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRoute">
 								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRoute">GoRoute</text>
 								
@@ -9323,16 +9372,16 @@
 					</g>
 					<g data-name="RoutingIntentDispatch">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntentDispatch">
-							<rect x="13088.0" y="3327.0" height="107.0" width="373.0" data-name="RoutingIntentDispatch"></rect>
-							<path d="M13088.0 3358.0 L13461.0 3358.0" fill="none" data-name="RoutingIntentDispatch"></path>
+							<rect x="14171.5" y="3447.0" height="107.0" width="373.0" data-name="RoutingIntentDispatch"></rect>
+							<path d="M14171.5 3478.0 L14544.5 3478.0" fill="none" data-name="RoutingIntentDispatch"></path>
 						</g>
-						<g transform="translate(13088, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntentDispatch">
+						<g transform="translate(14171.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntentDispatch">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntentDispatch">
 								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntentDispatch">RoutingIntentDispatch</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13088, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntentDispatch">
+						<g transform="translate(14171.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntentDispatch">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntentDispatch">
 								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntentDispatch">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;</text>
@@ -9344,16 +9393,16 @@
 					</g>
 					<g data-name="RouterKeys">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RouterKeys">
-							<rect x="36338.8" y="98.0" height="77.0" width="312.0" data-name="RouterKeys"></rect>
-							<path d="M36338.8 129.0 L36650.8 129.0" fill="none" data-name="RouterKeys"></path>
+							<rect x="37401.0" y="98.0" height="77.0" width="312.0" data-name="RouterKeys"></rect>
+							<path d="M37401.0 129.0 L37713.0 129.0" fill="none" data-name="RouterKeys"></path>
 						</g>
-						<g transform="translate(36338.75, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterKeys">
+						<g transform="translate(37401, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterKeys">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterKeys">
 								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterKeys">RouterKeys</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36338.75, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterKeys">
+						<g transform="translate(37401, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterKeys">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterKeys">
 								<text x="0.0" y="13.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+studyKey: ValueKey&lt;String&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+authKey: ValueKey&lt;String&gt;</text>
@@ -9363,9 +9412,9 @@
 					</g>
 					<g data-name="ValueKey">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ValueKey">
-							<rect x="36449.3" y="614.0" height="31.0" width="91.0" data-name="ValueKey"></rect>
+							<rect x="37511.5" y="614.0" height="31.0" width="91.0" data-name="ValueKey"></rect>
 						</g>
-						<g transform="translate(36449.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueKey">
+						<g transform="translate(37511.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueKey">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueKey">
 								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueKey">ValueKey</text>
 								
@@ -9374,16 +9423,16 @@
 					</g>
 					<g data-name="RouteParams">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RouteParams">
-							<rect x="37105.8" y="75.5" height="122.0" width="267.0" data-name="RouteParams"></rect>
-							<path d="M37105.8 106.5 L37372.8 106.5" fill="none" data-name="RouteParams"></path>
+							<rect x="38168.0" y="75.5" height="122.0" width="267.0" data-name="RouteParams"></rect>
+							<path d="M38168.0 106.5 L38435.0 106.5" fill="none" data-name="RouteParams"></path>
 						</g>
-						<g transform="translate(37105.75, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteParams">
+						<g transform="translate(38168, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteParams">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteParams">
 								<text x="125.5" y="13.5" stroke="none" text-anchor="middle" data-name="RouteParams">RouteParams</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37105.75, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteParams">
+						<g transform="translate(38168, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteParams">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteParams">
 								<text x="0.0" y="13.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studiesFilter: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studyId: String</text>
@@ -9396,17 +9445,17 @@
 					</g>
 					<g data-name="RouterConf">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RouterConf">
-							<rect x="21752.8" y="2496.0" height="138.0" width="326.0" data-name="RouterConf"></rect>
-							<path d="M21752.8 2527.0 L22078.8 2527.0" fill="none" data-name="RouterConf"></path>
-							<path d="M21752.8 2603.0 L22078.8 2603.0" fill="none" data-name="RouterConf"></path>
+							<rect x="22033.0" y="2556.0" height="138.0" width="326.0" data-name="RouterConf"></rect>
+							<path d="M22033.0 2587.0 L22359.0 2587.0" fill="none" data-name="RouterConf"></path>
+							<path d="M22033.0 2663.0 L22359.0 2663.0" fill="none" data-name="RouterConf"></path>
 						</g>
-						<g transform="translate(21752.75, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterConf">
+						<g transform="translate(22033, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterConf">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterConf">
 								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterConf">RouterConf</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21752.75, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
+						<g transform="translate(22033, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
 								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+router: GoRouter</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="RouterConf">&lt;static&gt;+routes: List&lt;GoRoute&gt;</text>
@@ -9415,7 +9464,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(21752.75, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
+						<g transform="translate(22033, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
 								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+GoRoute route()</text>
 								
@@ -9424,9 +9473,9 @@
 					</g>
 					<g data-name="GoRouter">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="67699.5" y="3365.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
+							<rect x="63069.0" y="3485.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
 						</g>
-						<g transform="translate(67699.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
+						<g transform="translate(63069, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
 								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
 								
@@ -9435,16 +9484,16 @@
 					</g>
 					<g data-name="StudyFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="54040.0" y="1666.5" height="62.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
-							<path d="M54040.0 1697.5 L54224.0 1697.5" fill="none" data-name="StudyFormRouteArgs"></path>
+							<rect x="59923.8" y="1666.5" height="62.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
+							<path d="M59923.8 1697.5 L60107.8 1697.5" fill="none" data-name="StudyFormRouteArgs"></path>
 						</g>
-						<g transform="translate(54040, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
+						<g transform="translate(59923.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
 								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54040, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormRouteArgs">
+						<g transform="translate(59923.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormRouteArgs">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormRouteArgs">+studyId: String</text>
 								
@@ -9453,16 +9502,16 @@
 					</g>
 					<g data-name="QuestionFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormRouteArgs">
-							<rect x="53232.0" y="2534.0" height="62.0" width="210.0" data-name="QuestionFormRouteArgs"></rect>
-							<path d="M53232.0 2565.0 L53442.0 2565.0" fill="none" data-name="QuestionFormRouteArgs"></path>
+							<rect x="58558.8" y="2594.0" height="62.0" width="210.0" data-name="QuestionFormRouteArgs"></rect>
+							<path d="M58558.8 2625.0 L58768.8 2625.0" fill="none" data-name="QuestionFormRouteArgs"></path>
 						</g>
-						<g transform="translate(53232, 2534)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormRouteArgs">
+						<g transform="translate(58558.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormRouteArgs">
 								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormRouteArgs">QuestionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53232, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormRouteArgs">
+						<g transform="translate(58558.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormRouteArgs">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormRouteArgs">+questionId: String</text>
 								
@@ -9471,9 +9520,9 @@
 					</g>
 					<g data-name="ScreenerQuestionFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormRouteArgs">
-							<rect x="55705.5" y="3365.0" height="31.0" width="282.0" data-name="ScreenerQuestionFormRouteArgs"></rect>
+							<rect x="58470.3" y="3485.0" height="31.0" width="282.0" data-name="ScreenerQuestionFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(55705.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormRouteArgs">
+						<g transform="translate(58470.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormRouteArgs">
 								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormRouteArgs">ScreenerQuestionFormRouteArgs</text>
 								
@@ -9482,16 +9531,16 @@
 					</g>
 					<g data-name="ConsentItemFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormRouteArgs">
-							<rect x="53482.0" y="2534.0" height="62.0" width="239.0" data-name="ConsentItemFormRouteArgs"></rect>
-							<path d="M53482.0 2565.0 L53721.0 2565.0" fill="none" data-name="ConsentItemFormRouteArgs"></path>
+							<rect x="58808.8" y="2594.0" height="62.0" width="239.0" data-name="ConsentItemFormRouteArgs"></rect>
+							<path d="M58808.8 2625.0 L59047.8 2625.0" fill="none" data-name="ConsentItemFormRouteArgs"></path>
 						</g>
-						<g transform="translate(53482, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormRouteArgs">
+						<g transform="translate(58808.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormRouteArgs">
 								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormRouteArgs">ConsentItemFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53482, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormRouteArgs">
+						<g transform="translate(58808.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormRouteArgs">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormRouteArgs">+consentId: String</text>
 								
@@ -9500,16 +9549,16 @@
 					</g>
 					<g data-name="MeasurementFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="40680.0" y="2534.0" height="62.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
-							<path d="M40680.0 2565.0 L40927.0 2565.0" fill="none" data-name="MeasurementFormRouteArgs"></path>
+							<rect x="45388.8" y="2594.0" height="62.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
+							<path d="M45388.8 2625.0 L45635.8 2625.0" fill="none" data-name="MeasurementFormRouteArgs"></path>
 						</g>
-						<g transform="translate(40680, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
+						<g transform="translate(45388.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
 								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40680, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementFormRouteArgs">
+						<g transform="translate(45388.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementFormRouteArgs">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementFormRouteArgs">+measurementId: String</text>
 								
@@ -9518,16 +9567,16 @@
 					</g>
 					<g data-name="SurveyQuestionFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormRouteArgs">
-							<rect x="50832.3" y="3349.5" height="62.0" width="265.0" data-name="SurveyQuestionFormRouteArgs"></rect>
-							<path d="M50832.3 3380.5 L51097.3 3380.5" fill="none" data-name="SurveyQuestionFormRouteArgs"></path>
+							<rect x="50356.3" y="3469.5" height="62.0" width="265.0" data-name="SurveyQuestionFormRouteArgs"></rect>
+							<path d="M50356.3 3500.5 L50621.3 3500.5" fill="none" data-name="SurveyQuestionFormRouteArgs"></path>
 						</g>
-						<g transform="translate(50832.25, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
+						<g transform="translate(50356.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormRouteArgs">
 								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormRouteArgs">SurveyQuestionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50832.25, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
+						<g transform="translate(50356.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormRouteArgs">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormRouteArgs">+questionId: String</text>
 								
@@ -9536,16 +9585,16 @@
 					</g>
 					<g data-name="InterventionFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="38070.3" y="2534.0" height="62.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
-							<path d="M38070.3 2565.0 L38303.3 2565.0" fill="none" data-name="InterventionFormRouteArgs"></path>
+							<rect x="44992.3" y="2594.0" height="62.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
+							<path d="M44992.3 2625.0 L45225.3 2625.0" fill="none" data-name="InterventionFormRouteArgs"></path>
 						</g>
-						<g transform="translate(38070.25, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
+						<g transform="translate(44992.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
 								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38070.25, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormRouteArgs">
+						<g transform="translate(44992.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormRouteArgs">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormRouteArgs">+interventionId: String</text>
 								
@@ -9554,16 +9603,16 @@
 					</g>
 					<g data-name="InterventionTaskFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormRouteArgs">
-							<rect x="46410.0" y="3349.5" height="62.0" width="271.0" data-name="InterventionTaskFormRouteArgs"></rect>
-							<path d="M46410.0 3380.5 L46681.0 3380.5" fill="none" data-name="InterventionTaskFormRouteArgs"></path>
+							<rect x="44973.3" y="3469.5" height="62.0" width="271.0" data-name="InterventionTaskFormRouteArgs"></rect>
+							<path d="M44973.3 3500.5 L45244.3 3500.5" fill="none" data-name="InterventionTaskFormRouteArgs"></path>
 						</g>
-						<g transform="translate(46410, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormRouteArgs">
+						<g transform="translate(44973.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormRouteArgs">
 								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormRouteArgs">InterventionTaskFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46410, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormRouteArgs">
+						<g transform="translate(44973.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormRouteArgs">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormRouteArgs">+taskId: String</text>
 								
@@ -9572,16 +9621,16 @@
 					</g>
 					<g data-name="ReportItemFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormRouteArgs">
-							<rect x="56145.3" y="2534.0" height="62.0" width="226.0" data-name="ReportItemFormRouteArgs"></rect>
-							<path d="M56145.3 2565.0 L56371.3 2565.0" fill="none" data-name="ReportItemFormRouteArgs"></path>
+							<rect x="60598.0" y="2594.0" height="62.0" width="226.0" data-name="ReportItemFormRouteArgs"></rect>
+							<path d="M60598.0 2625.0 L60824.0 2625.0" fill="none" data-name="ReportItemFormRouteArgs"></path>
 						</g>
-						<g transform="translate(56145.25, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormRouteArgs">
+						<g transform="translate(60598, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormRouteArgs">
 								<text x="105.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormRouteArgs">ReportItemFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56145.25, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormRouteArgs">
+						<g transform="translate(60598, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormRouteArgs">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormRouteArgs">+sectionId: String</text>
 								
@@ -9590,16 +9639,16 @@
 					</g>
 					<g data-name="DropdownMenuItemTheme">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DropdownMenuItemTheme">
-							<rect x="36870.3" y="598.5" height="62.0" width="258.0" data-name="DropdownMenuItemTheme"></rect>
-							<path d="M36870.3 629.5 L37128.3 629.5" fill="none" data-name="DropdownMenuItemTheme"></path>
+							<rect x="37932.5" y="598.5" height="62.0" width="258.0" data-name="DropdownMenuItemTheme"></rect>
+							<path d="M37932.5 629.5 L38190.5 629.5" fill="none" data-name="DropdownMenuItemTheme"></path>
 						</g>
-						<g transform="translate(36870.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DropdownMenuItemTheme">
+						<g transform="translate(37932.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DropdownMenuItemTheme">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DropdownMenuItemTheme">
 								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="DropdownMenuItemTheme">DropdownMenuItemTheme</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36870.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DropdownMenuItemTheme">
+						<g transform="translate(37932.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DropdownMenuItemTheme">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DropdownMenuItemTheme">
 								<text x="0.0" y="13.5" stroke="none" data-name="DropdownMenuItemTheme">+iconTheme: IconThemeData?</text>
 								
@@ -9608,9 +9657,9 @@
 					</g>
 					<g data-name="IconThemeData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IconThemeData">
-							<rect x="36928.8" y="1197.0" height="31.0" width="141.0" data-name="IconThemeData"></rect>
+							<rect x="37991.0" y="1197.0" height="31.0" width="141.0" data-name="IconThemeData"></rect>
 						</g>
-						<g transform="translate(36928.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconThemeData">
+						<g transform="translate(37991, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconThemeData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconThemeData">
 								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconThemeData">IconThemeData</text>
 								
@@ -9619,9 +9668,9 @@
 					</g>
 					<g data-name="Diagnosticable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Diagnosticable">
-							<rect x="36932.8" y="121.0" height="31.0" width="133.0" data-name="Diagnosticable"></rect>
+							<rect x="37995.0" y="121.0" height="31.0" width="133.0" data-name="Diagnosticable"></rect>
 						</g>
-						<g transform="translate(36932.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Diagnosticable">
+						<g transform="translate(37995, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Diagnosticable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Diagnosticable">
 								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="Diagnosticable">Diagnosticable</text>
 								
@@ -9630,17 +9679,17 @@
 					</g>
 					<g data-name="ThemeConfig">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeConfig">
-							<rect x="37705.0" y="0.0" height="273.0" width="543.0" data-name="ThemeConfig"></rect>
-							<path d="M37705.0 31.0 L38248.0 31.0" fill="none" data-name="ThemeConfig"></path>
-							<path d="M37705.0 107.0 L38248.0 107.0" fill="none" data-name="ThemeConfig"></path>
+							<rect x="38767.3" y="0.0" height="273.0" width="543.0" data-name="ThemeConfig"></rect>
+							<path d="M38767.3 31.0 L39310.3 31.0" fill="none" data-name="ThemeConfig"></path>
+							<path d="M38767.3 107.0 L39310.3 107.0" fill="none" data-name="ThemeConfig"></path>
 						</g>
-						<g transform="translate(37705, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeConfig">
+						<g transform="translate(38767.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeConfig">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeConfig">
 								<text x="263.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeConfig">ThemeConfig</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37705, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
+						<g transform="translate(38767.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
 								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMinContentWidth: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMaxContentWidth: double</text>
@@ -9649,7 +9698,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(37705, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
+						<g transform="translate(38767.25, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
 								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+dynamic bodyBackgroundColor()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color modalBarrierColor()</text>
@@ -9667,16 +9716,16 @@
 					</g>
 					<g data-name="NoAnimationPageTransitionsBuilder">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NoAnimationPageTransitionsBuilder">
-							<rect x="37265.5" y="598.5" height="62.0" width="299.0" data-name="NoAnimationPageTransitionsBuilder"></rect>
-							<path d="M37265.5 629.5 L37564.5 629.5" fill="none" data-name="NoAnimationPageTransitionsBuilder"></path>
+							<rect x="38327.8" y="598.5" height="62.0" width="299.0" data-name="NoAnimationPageTransitionsBuilder"></rect>
+							<path d="M38327.8 629.5 L38626.8 629.5" fill="none" data-name="NoAnimationPageTransitionsBuilder"></path>
 						</g>
-						<g transform="translate(37265.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
+						<g transform="translate(38327.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NoAnimationPageTransitionsBuilder">
 								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="NoAnimationPageTransitionsBuilder">NoAnimationPageTransitionsBuilder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37265.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
+						<g transform="translate(38327.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NoAnimationPageTransitionsBuilder">
 								<text x="0.0" y="13.5" stroke="none" data-name="NoAnimationPageTransitionsBuilder">+Widget buildTransitions()</text>
 								
@@ -9685,9 +9734,9 @@
 					</g>
 					<g data-name="PageTransitionsBuilder">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsBuilder">
-							<rect x="37466.0" y="121.0" height="31.0" width="199.0" data-name="PageTransitionsBuilder"></rect>
+							<rect x="38528.3" y="121.0" height="31.0" width="199.0" data-name="PageTransitionsBuilder"></rect>
 						</g>
-						<g transform="translate(37466, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PageTransitionsBuilder">
+						<g transform="translate(38528.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PageTransitionsBuilder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsBuilder">
 								<text x="91.5" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsBuilder">PageTransitionsBuilder</text>
 								
@@ -9696,16 +9745,16 @@
 					</g>
 					<g data-name="WebTransitionBuilder">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WebTransitionBuilder">
-							<rect x="37645.0" y="598.5" height="62.0" width="223.0" data-name="WebTransitionBuilder"></rect>
-							<path d="M37645.0 629.5 L37868.0 629.5" fill="none" data-name="WebTransitionBuilder"></path>
+							<rect x="38707.3" y="598.5" height="62.0" width="223.0" data-name="WebTransitionBuilder"></rect>
+							<path d="M38707.3 629.5 L38930.3 629.5" fill="none" data-name="WebTransitionBuilder"></path>
 						</g>
-						<g transform="translate(37645, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebTransitionBuilder">
+						<g transform="translate(38707.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebTransitionBuilder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebTransitionBuilder">
 								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebTransitionBuilder">WebTransitionBuilder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37645, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebTransitionBuilder">
+						<g transform="translate(38707.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebTransitionBuilder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebTransitionBuilder">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebTransitionBuilder">+Widget buildTransitions()</text>
 								
@@ -9714,16 +9763,16 @@
 					</g>
 					<g data-name="ThemeSettingChange">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettingChange">
-							<rect x="37705.8" y="1666.5" height="62.0" width="216.0" data-name="ThemeSettingChange"></rect>
-							<path d="M37705.8 1697.5 L37921.8 1697.5" fill="none" data-name="ThemeSettingChange"></path>
+							<rect x="38949.5" y="1666.5" height="62.0" width="216.0" data-name="ThemeSettingChange"></rect>
+							<path d="M38949.5 1697.5 L39165.5 1697.5" fill="none" data-name="ThemeSettingChange"></path>
 						</g>
-						<g transform="translate(37705.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettingChange">
+						<g transform="translate(38949.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettingChange">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettingChange">
 								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettingChange">ThemeSettingChange</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37705.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettingChange">
+						<g transform="translate(38949.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettingChange">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettingChange">
 								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettingChange">+settings: ThemeSettings</text>
 								
@@ -9732,16 +9781,16 @@
 					</g>
 					<g data-name="ThemeSettings">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettings">
-							<rect x="34931.3" y="2526.5" height="77.0" width="227.0" data-name="ThemeSettings"></rect>
-							<path d="M34931.3 2557.5 L35158.3 2557.5" fill="none" data-name="ThemeSettings"></path>
+							<rect x="36759.5" y="2586.5" height="77.0" width="227.0" data-name="ThemeSettings"></rect>
+							<path d="M36759.5 2617.5 L36986.5 2617.5" fill="none" data-name="ThemeSettings"></path>
 						</g>
-						<g transform="translate(34931.25, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettings">
+						<g transform="translate(36759.5, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettings">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettings">
 								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettings">ThemeSettings</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34931.25, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettings">
+						<g transform="translate(36759.5, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettings">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettings">
 								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettings">+sourceColor: Color</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ThemeSettings">+themeMode: ThemeMode</text>
@@ -9751,9 +9800,9 @@
 					</g>
 					<g data-name="Notification">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Notification">
-							<rect x="37761.8" y="1197.0" height="31.0" width="104.0" data-name="Notification"></rect>
+							<rect x="39005.5" y="1197.0" height="31.0" width="104.0" data-name="Notification"></rect>
 						</g>
-						<g transform="translate(37761.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Notification">
+						<g transform="translate(39005.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Notification">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notification">
 								<text x="44.0" y="13.5" stroke="none" text-anchor="middle" data-name="Notification">Notification</text>
 								
@@ -9762,17 +9811,17 @@
 					</g>
 					<g data-name="ThemeProvider">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeProvider">
-							<rect x="38099.0" y="358.0" height="543.0" width="519.0" data-name="ThemeProvider"></rect>
-							<path d="M38099.0 389.0 L38618.0 389.0" fill="none" data-name="ThemeProvider"></path>
-							<path d="M38099.0 480.0 L38618.0 480.0" fill="none" data-name="ThemeProvider"></path>
+							<rect x="39161.3" y="358.0" height="543.0" width="519.0" data-name="ThemeProvider"></rect>
+							<path d="M39161.3 389.0 L39680.3 389.0" fill="none" data-name="ThemeProvider"></path>
+							<path d="M39161.3 480.0 L39680.3 480.0" fill="none" data-name="ThemeProvider"></path>
 						</g>
-						<g transform="translate(38099, 358)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeProvider">
+						<g transform="translate(39161.25, 358)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeProvider">
 								<text x="251.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeProvider">ThemeProvider</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38099, 389)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
+						<g transform="translate(39161.25, 389)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
 								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+settings: ValueNotifier&lt;ThemeSettings&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+lightDynamic: ColorScheme?</text>
@@ -9782,7 +9831,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(38099, 480)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
+						<g transform="translate(39161.25, 480)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
 								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+Color custom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+Color blend()</text>
@@ -9817,9 +9866,9 @@
 					</g>
 					<g data-name="ValueNotifier">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ValueNotifier">
-							<rect x="37905.8" y="1197.0" height="31.0" width="117.0" data-name="ValueNotifier"></rect>
+							<rect x="39149.5" y="1197.0" height="31.0" width="117.0" data-name="ValueNotifier"></rect>
 						</g>
-						<g transform="translate(37905.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueNotifier">
+						<g transform="translate(39149.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueNotifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueNotifier">
 								<text x="50.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueNotifier">ValueNotifier</text>
 								
@@ -9828,9 +9877,9 @@
 					</g>
 					<g data-name="ColorScheme">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ColorScheme">
-							<rect x="38716.8" y="1197.0" height="31.0" width="122.0" data-name="ColorScheme"></rect>
+							<rect x="39859.3" y="1197.0" height="31.0" width="122.0" data-name="ColorScheme"></rect>
 						</g>
-						<g transform="translate(38716.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ColorScheme">
+						<g transform="translate(39859.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ColorScheme">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ColorScheme">
 								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="ColorScheme">ColorScheme</text>
 								
@@ -9839,9 +9888,9 @@
 					</g>
 					<g data-name="PageTransitionsTheme">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsTheme">
-							<rect x="38878.8" y="1197.0" height="31.0" width="198.0" data-name="PageTransitionsTheme"></rect>
+							<rect x="40122.5" y="1197.0" height="31.0" width="198.0" data-name="PageTransitionsTheme"></rect>
 						</g>
-						<g transform="translate(38878.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PageTransitionsTheme">
+						<g transform="translate(40122.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PageTransitionsTheme">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsTheme">
 								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsTheme">PageTransitionsTheme</text>
 								
@@ -9850,9 +9899,9 @@
 					</g>
 					<g data-name="ShapeBorder">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ShapeBorder">
-							<rect x="39231.8" y="1197.0" height="31.0" width="120.0" data-name="ShapeBorder"></rect>
+							<rect x="40360.5" y="1197.0" height="31.0" width="120.0" data-name="ShapeBorder"></rect>
 						</g>
-						<g transform="translate(39231.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ShapeBorder">
+						<g transform="translate(40360.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ShapeBorder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ShapeBorder">
 								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="ShapeBorder">ShapeBorder</text>
 								
@@ -9861,9 +9910,9 @@
 					</g>
 					<g data-name="InheritedWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InheritedWidget">
-							<rect x="38288.0" y="121.0" height="31.0" width="141.0" data-name="InheritedWidget"></rect>
+							<rect x="39350.3" y="121.0" height="31.0" width="141.0" data-name="InheritedWidget"></rect>
 						</g>
-						<g transform="translate(38288, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="InheritedWidget">
+						<g transform="translate(39350.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="InheritedWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InheritedWidget">
 								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="InheritedWidget">InheritedWidget</text>
 								
@@ -9872,9 +9921,9 @@
 					</g>
 					<g data-name="ThemeMode">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeMode">
-							<rect x="43925.3" y="3365.0" height="31.0" width="114.0" data-name="ThemeMode"></rect>
+							<rect x="37334.3" y="3485.0" height="31.0" width="114.0" data-name="ThemeMode"></rect>
 						</g>
-						<g transform="translate(43925.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeMode">
+						<g transform="translate(37334.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeMode">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeMode">
 								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeMode">ThemeMode</text>
 								
@@ -9883,17 +9932,17 @@
 					</g>
 					<g data-name="CustomColor">
 						<g fill="#eee8d5" stroke="#33322E" data-name="CustomColor">
-							<rect x="23970.3" y="2503.5" height="123.0" width="128.0" data-name="CustomColor"></rect>
-							<path d="M23970.3 2534.5 L24098.3 2534.5" fill="none" data-name="CustomColor"></path>
-							<path d="M23970.3 2595.5 L24098.3 2595.5" fill="none" data-name="CustomColor"></path>
+							<rect x="24250.5" y="2563.5" height="123.0" width="128.0" data-name="CustomColor"></rect>
+							<path d="M24250.5 2594.5 L24378.5 2594.5" fill="none" data-name="CustomColor"></path>
+							<path d="M24250.5 2655.5 L24378.5 2655.5" fill="none" data-name="CustomColor"></path>
 						</g>
-						<g transform="translate(23970.25, 2503.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomColor">
+						<g transform="translate(24250.5, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomColor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomColor">
 								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomColor">CustomColor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23970.25, 2534.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
+						<g transform="translate(24250.5, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
 								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+name: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="CustomColor">+color: Color</text>
@@ -9901,7 +9950,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(23970.25, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
+						<g transform="translate(24250.5, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
 								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+Color value()</text>
 								
@@ -9910,17 +9959,17 @@
 					</g>
 					<g data-name="SuppressedBehaviorSubject">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SuppressedBehaviorSubject">
-							<rect x="16253.3" y="3654.5" height="138.0" width="388.0" data-name="SuppressedBehaviorSubject"></rect>
-							<path d="M16253.3 3685.5 L16641.3 3685.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
-							<path d="M16253.3 3746.5 L16641.3 3746.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
+							<rect x="16681.0" y="3774.5" height="138.0" width="388.0" data-name="SuppressedBehaviorSubject"></rect>
+							<path d="M16681.0 3805.5 L17069.0 3805.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
+							<path d="M16681.0 3866.5 L17069.0 3866.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
 						</g>
-						<g transform="translate(16253.25, 3654.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SuppressedBehaviorSubject">
+						<g transform="translate(16681, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SuppressedBehaviorSubject">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SuppressedBehaviorSubject">
 								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="SuppressedBehaviorSubject">SuppressedBehaviorSubject</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16253.25, 3685.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
+						<g transform="translate(16681, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
 								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">+subject: BehaviorSubject&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+didSuppressInitialEvent: bool</text>
@@ -9928,7 +9977,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(16253.25, 3746.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
+						<g transform="translate(16681, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
 								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">-StreamController&lt;T&gt; _buildDerivedController()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+dynamic close()</text>
@@ -9938,9 +9987,9 @@
 					</g>
 					<g data-name="StreamController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
-							<rect x="16214.3" y="3998.5" height="31.0" width="149.0" data-name="StreamController"></rect>
+							<rect x="16456.5" y="4118.5" height="31.0" width="149.0" data-name="StreamController"></rect>
 						</g>
-						<g transform="translate(16214.25, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
+						<g transform="translate(16456.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
 								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
 								
@@ -9949,16 +9998,16 @@
 					</g>
 					<g data-name="Time">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Time">
-							<rect x="38658.0" y="583.5" height="92.0" width="293.0" data-name="Time"></rect>
-							<path d="M38658.0 614.5 L38951.0 614.5" fill="none" data-name="Time"></path>
+							<rect x="39720.3" y="583.5" height="92.0" width="293.0" data-name="Time"></rect>
+							<path d="M39720.3 614.5 L40013.3 614.5" fill="none" data-name="Time"></path>
 						</g>
-						<g transform="translate(38658, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Time">
+						<g transform="translate(39720.25, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Time">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Time">
 								<text x="138.5" y="13.5" stroke="none" text-anchor="middle" data-name="Time">Time</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38658, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Time">
+						<g transform="translate(39720.25, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Time">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Time">
 								<text x="0.0" y="13.5" stroke="none" data-name="Time">&lt;static&gt;+dynamic fromTimeOfDay()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Time">+Map&lt;String, dynamic&gt; toJson()</text>
@@ -9969,9 +10018,9 @@
 					</g>
 					<g data-name="TimeOfDay">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TimeOfDay">
-							<rect x="38753.0" y="121.0" height="31.0" width="103.0" data-name="TimeOfDay"></rect>
+							<rect x="39815.3" y="121.0" height="31.0" width="103.0" data-name="TimeOfDay"></rect>
 						</g>
-						<g transform="translate(38753, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeOfDay">
+						<g transform="translate(39815.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeOfDay">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeOfDay">
 								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeOfDay">TimeOfDay</text>
 								
@@ -9980,16 +10029,16 @@
 					</g>
 					<g data-name="TimeValueAccessor">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TimeValueAccessor">
-							<rect x="38991.0" y="583.5" height="92.0" width="297.0" data-name="TimeValueAccessor"></rect>
-							<path d="M38991.0 614.5 L39288.0 614.5" fill="none" data-name="TimeValueAccessor"></path>
+							<rect x="40053.3" y="583.5" height="92.0" width="297.0" data-name="TimeValueAccessor"></rect>
+							<path d="M40053.3 614.5 L40350.3 614.5" fill="none" data-name="TimeValueAccessor"></path>
 						</g>
-						<g transform="translate(38991, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeValueAccessor">
+						<g transform="translate(40053.25, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeValueAccessor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeValueAccessor">
 								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeValueAccessor">TimeValueAccessor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38991, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimeValueAccessor">
+						<g transform="translate(40053.25, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimeValueAccessor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimeValueAccessor">
 								<text x="0.0" y="13.5" stroke="none" data-name="TimeValueAccessor">+String modelToViewValue()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TimeValueAccessor">+Time? viewToModelValue()</text>
@@ -10000,9 +10049,9 @@
 					</g>
 					<g data-name="ControlValueAccessor">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ControlValueAccessor">
-							<rect x="39044.0" y="121.0" height="31.0" width="191.0" data-name="ControlValueAccessor"></rect>
+							<rect x="40106.3" y="121.0" height="31.0" width="191.0" data-name="ControlValueAccessor"></rect>
 						</g>
-						<g transform="translate(39044, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ControlValueAccessor">
+						<g transform="translate(40106.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ControlValueAccessor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ControlValueAccessor">
 								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="ControlValueAccessor">ControlValueAccessor</text>
 								
@@ -10011,16 +10060,16 @@
 					</g>
 					<g data-name="ModelAction">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ModelAction">
-							<rect x="24138.3" y="2496.5" height="137.0" width="188.0" data-name="ModelAction"></rect>
-							<path d="M24138.3 2527.5 L24326.3 2527.5" fill="none" data-name="ModelAction"></path>
+							<rect x="24418.5" y="2556.5" height="137.0" width="188.0" data-name="ModelAction"></rect>
+							<path d="M24418.5 2587.5 L24606.5 2587.5" fill="none" data-name="ModelAction"></path>
 						</g>
-						<g transform="translate(24138.25, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelAction">
+						<g transform="translate(24418.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelAction">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelAction">
 								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelAction">ModelAction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24138.25, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelAction">
+						<g transform="translate(24418.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelAction">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelAction">
 								<text x="0.0" y="13.5" stroke="none" data-name="ModelAction">+type: T</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ModelAction">+label: String</text>
@@ -10034,16 +10083,16 @@
 					</g>
 					<g data-name="IModelActionProvider">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="80425.3" y="105.5" height="62.0" width="403.0" data-name="IModelActionProvider"></rect>
-							<path d="M80425.3 136.5 L80828.3 136.5" fill="none" data-name="IModelActionProvider"></path>
+							<rect x="82420.0" y="105.5" height="62.0" width="403.0" data-name="IModelActionProvider"></rect>
+							<path d="M82420.0 136.5 L82823.0 136.5" fill="none" data-name="IModelActionProvider"></path>
 						</g>
-						<g transform="translate(80425.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
+						<g transform="translate(82420, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
 								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80425.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelActionProvider">
+						<g transform="translate(82420, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelActionProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelActionProvider">
 								<text x="0.0" y="13.5" stroke="none" data-name="IModelActionProvider">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
 								
@@ -10052,16 +10101,16 @@
 					</g>
 					<g data-name="IListActionProvider">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="80112.5" y="1174.0" height="77.0" width="179.0" data-name="IListActionProvider"></rect>
-							<path d="M80112.5 1205.0 L80291.5 1205.0" fill="none" data-name="IListActionProvider"></path>
+							<rect x="82027.3" y="1174.0" height="77.0" width="179.0" data-name="IListActionProvider"></rect>
+							<path d="M82027.3 1205.0 L82206.3 1205.0" fill="none" data-name="IListActionProvider"></path>
 						</g>
-						<g transform="translate(80112.5, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+						<g transform="translate(82027.25, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
 								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80112.5, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IListActionProvider">
+						<g transform="translate(82027.25, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IListActionProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IListActionProvider">
 								<text x="0.0" y="13.5" stroke="none" data-name="IListActionProvider">+void onSelectItem()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IListActionProvider">+void onNewItem()</text>
@@ -10071,16 +10120,16 @@
 					</g>
 					<g data-name="ModelActionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ModelActionType">
-							<rect x="516.0" y="3297.0" height="167.0" width="334.0" data-name="ModelActionType"></rect>
-							<path d="M516.0 3328.0 L850.0 3328.0" fill="none" data-name="ModelActionType"></path>
+							<rect x="516.0" y="3417.0" height="167.0" width="334.0" data-name="ModelActionType"></rect>
+							<path d="M516.0 3448.0 L850.0 3448.0" fill="none" data-name="ModelActionType"></path>
 						</g>
-						<g transform="translate(516, 3297)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelActionType">
+						<g transform="translate(516, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelActionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelActionType">
 								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelActionType">ModelActionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(516, 3328)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelActionType">
+						<g transform="translate(516, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelActionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelActionType">
 								<text x="0.0" y="13.5" stroke="none" data-name="ModelActionType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+values: List&lt;ModelActionType&gt;</text>
@@ -10096,17 +10145,17 @@
 					</g>
 					<g data-name="OptimisticUpdate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="OptimisticUpdate">
-							<rect x="16890.8" y="3617.0" height="213.0" width="383.0" data-name="OptimisticUpdate"></rect>
-							<path d="M16890.8 3648.0 L17273.8 3648.0" fill="none" data-name="OptimisticUpdate"></path>
-							<path d="M16890.8 3784.0 L17273.8 3784.0" fill="none" data-name="OptimisticUpdate"></path>
+							<rect x="17318.5" y="3737.0" height="213.0" width="383.0" data-name="OptimisticUpdate"></rect>
+							<path d="M17318.5 3768.0 L17701.5 3768.0" fill="none" data-name="OptimisticUpdate"></path>
+							<path d="M17318.5 3904.0 L17701.5 3904.0" fill="none" data-name="OptimisticUpdate"></path>
 						</g>
-						<g transform="translate(16890.75, 3617)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptimisticUpdate">
+						<g transform="translate(17318.5, 3737)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptimisticUpdate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptimisticUpdate">
 								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptimisticUpdate">OptimisticUpdate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16890.75, 3648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
+						<g transform="translate(17318.5, 3768)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
 								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+applyOptimistic: void Function()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">+apply: dynamic Function()</text>
@@ -10119,7 +10168,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(16890.75, 3784)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
+						<g transform="translate(17318.5, 3904)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
 								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+dynamic execute()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">-void _runUpdateHandlerIfAny()</text>
@@ -10129,9 +10178,9 @@
 					</g>
 					<g data-name="void Function()">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()">
-							<rect x="16403.3" y="3998.5" height="31.0" width="134.0" data-name="void Function()"></rect>
+							<rect x="16645.5" y="4118.5" height="31.0" width="134.0" data-name="void Function()"></rect>
 						</g>
-						<g transform="translate(16403.25, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()">
+						<g transform="translate(16645.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()">
 								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()">void Function()</text>
 								
@@ -10140,9 +10189,9 @@
 					</g>
 					<g data-name="void Function(Object, StackTrace?)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Object, StackTrace?)?">
-							<rect x="16577.3" y="3998.5" height="31.0" width="304.0" data-name="void Function(Object, StackTrace?)?"></rect>
+							<rect x="16819.5" y="4118.5" height="31.0" width="304.0" data-name="void Function(Object, StackTrace?)?"></rect>
 						</g>
-						<g transform="translate(16577.25, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Object, StackTrace?)?">
+						<g transform="translate(16819.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Object, StackTrace?)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Object, StackTrace?)?">
 								<text x="144.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Object, StackTrace?)?">void Function(Object, StackTrace?)?</text>
 								
@@ -10151,16 +10200,16 @@
 					</g>
 					<g data-name="FileFormatEncoder">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FileFormatEncoder">
-							<rect x="39403.0" y="90.5" height="92.0" width="216.0" data-name="FileFormatEncoder"></rect>
-							<path d="M39403.0 121.5 L39619.0 121.5" fill="none" data-name="FileFormatEncoder"></path>
+							<rect x="40465.3" y="90.5" height="92.0" width="216.0" data-name="FileFormatEncoder"></rect>
+							<path d="M40465.3 121.5 L40681.3 121.5" fill="none" data-name="FileFormatEncoder"></path>
 						</g>
-						<g transform="translate(39403, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FileFormatEncoder">
+						<g transform="translate(40465.25, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FileFormatEncoder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FileFormatEncoder">
 								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="FileFormatEncoder">FileFormatEncoder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39403, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FileFormatEncoder">
+						<g transform="translate(40465.25, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FileFormatEncoder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FileFormatEncoder">
 								<text x="0.0" y="13.5" stroke="none" data-name="FileFormatEncoder">+dynamic encodeAsync()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FileFormatEncoder">+String encode()</text>
@@ -10171,16 +10220,16 @@
 					</g>
 					<g data-name="CSVStringEncoder">
 						<g fill="#eee8d5" stroke="#33322E" data-name="CSVStringEncoder">
-							<rect x="39328.0" y="598.5" height="62.0" width="162.0" data-name="CSVStringEncoder"></rect>
-							<path d="M39328.0 629.5 L39490.0 629.5" fill="none" data-name="CSVStringEncoder"></path>
+							<rect x="40390.3" y="598.5" height="62.0" width="162.0" data-name="CSVStringEncoder"></rect>
+							<path d="M40390.3 629.5 L40552.3 629.5" fill="none" data-name="CSVStringEncoder"></path>
 						</g>
-						<g transform="translate(39328, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CSVStringEncoder">
+						<g transform="translate(40390.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CSVStringEncoder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CSVStringEncoder">
 								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="CSVStringEncoder">CSVStringEncoder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39328, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CSVStringEncoder">
+						<g transform="translate(40390.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CSVStringEncoder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CSVStringEncoder">
 								<text x="0.0" y="13.5" stroke="none" data-name="CSVStringEncoder">+String encode()</text>
 								
@@ -10189,16 +10238,16 @@
 					</g>
 					<g data-name="JsonStringEncoder">
 						<g fill="#eee8d5" stroke="#33322E" data-name="JsonStringEncoder">
-							<rect x="39530.0" y="598.5" height="62.0" width="166.0" data-name="JsonStringEncoder"></rect>
-							<path d="M39530.0 629.5 L39696.0 629.5" fill="none" data-name="JsonStringEncoder"></path>
+							<rect x="40592.3" y="598.5" height="62.0" width="166.0" data-name="JsonStringEncoder"></rect>
+							<path d="M40592.3 629.5 L40758.3 629.5" fill="none" data-name="JsonStringEncoder"></path>
 						</g>
-						<g transform="translate(39530, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JsonStringEncoder">
+						<g transform="translate(40592.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JsonStringEncoder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonStringEncoder">
 								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="JsonStringEncoder">JsonStringEncoder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39530, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonStringEncoder">
+						<g transform="translate(40592.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonStringEncoder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonStringEncoder">
 								<text x="0.0" y="13.5" stroke="none" data-name="JsonStringEncoder">+String encode()</text>
 								
@@ -10207,24 +10256,24 @@
 					</g>
 					<g data-name="ExecutionLimiter">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ExecutionLimiter">
-							<rect x="17866.0" y="3669.5" height="108.0" width="197.0" data-name="ExecutionLimiter"></rect>
-							<path d="M17866.0 3700.5 L18063.0 3700.5" fill="none" data-name="ExecutionLimiter"></path>
-							<path d="M17866.0 3746.5 L18063.0 3746.5" fill="none" data-name="ExecutionLimiter"></path>
+							<rect x="18293.8" y="3789.5" height="108.0" width="197.0" data-name="ExecutionLimiter"></rect>
+							<path d="M18293.8 3820.5 L18490.8 3820.5" fill="none" data-name="ExecutionLimiter"></path>
+							<path d="M18293.8 3866.5 L18490.8 3866.5" fill="none" data-name="ExecutionLimiter"></path>
 						</g>
-						<g transform="translate(17866, 3669.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ExecutionLimiter">
+						<g transform="translate(18293.75, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ExecutionLimiter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ExecutionLimiter">
 								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ExecutionLimiter">ExecutionLimiter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17866, 3700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
+						<g transform="translate(18293.75, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
 								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+milliseconds: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ExecutionLimiter">&lt;static&gt;-_timer: Timer?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17866, 3746.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
+						<g transform="translate(18293.75, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
 								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+void dispose()</text>
 								
@@ -10233,9 +10282,9 @@
 					</g>
 					<g data-name="Timer">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Timer">
-							<rect x="16921.3" y="3998.5" height="31.0" width="60.0" data-name="Timer"></rect>
+							<rect x="17163.5" y="4118.5" height="31.0" width="60.0" data-name="Timer"></rect>
 						</g>
-						<g transform="translate(16921.25, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timer">
+						<g transform="translate(17163.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timer">
 								<text x="22.0" y="13.5" stroke="none" text-anchor="middle" data-name="Timer">Timer</text>
 								
@@ -10244,17 +10293,17 @@
 					</g>
 					<g data-name="Debouncer">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="41315.3" y="3952.5" height="123.0" width="536.0" data-name="Debouncer"></rect>
-							<path d="M41315.3 3983.5 L41851.3 3983.5" fill="none" data-name="Debouncer"></path>
-							<path d="M41315.3 4044.5 L41851.3 4044.5" fill="none" data-name="Debouncer"></path>
+							<rect x="58540.5" y="4072.5" height="123.0" width="536.0" data-name="Debouncer"></rect>
+							<path d="M58540.5 4103.5 L59076.5 4103.5" fill="none" data-name="Debouncer"></path>
+							<path d="M58540.5 4164.5 L59076.5 4164.5" fill="none" data-name="Debouncer"></path>
 						</g>
-						<g transform="translate(41315.25, 3952.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
+						<g transform="translate(58540.5, 4072.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
 								<text x="260.0" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41315.25, 3983.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
+						<g transform="translate(58540.5, 4103.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
 								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+leading: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Debouncer">+cancelUncompleted: bool</text>
@@ -10262,7 +10311,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(41315.25, 4044.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
+						<g transform="translate(58540.5, 4164.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
 								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+dynamic call()</text>
 								
@@ -10271,9 +10320,9 @@
 					</g>
 					<g data-name="CancelableOperation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="41491.8" y="4319.0" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
+							<rect x="63871.3" y="4439.0" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
 						</g>
-						<g transform="translate(41491.75, 4319)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
+						<g transform="translate(63871.25, 4439)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
 								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
 								
@@ -10282,16 +10331,16 @@
 					</g>
 					<g data-name="Throttler">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Throttler">
-							<rect x="39671.5" y="3983.0" height="62.0" width="136.0" data-name="Throttler"></rect>
-							<path d="M39671.5 4014.0 L39807.5 4014.0" fill="none" data-name="Throttler"></path>
+							<rect x="39575.0" y="4103.0" height="62.0" width="136.0" data-name="Throttler"></rect>
+							<path d="M39575.0 4134.0 L39711.0 4134.0" fill="none" data-name="Throttler"></path>
 						</g>
-						<g transform="translate(39671.5, 3983)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Throttler">
+						<g transform="translate(39575, 4103)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Throttler">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Throttler">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="Throttler">Throttler</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39671.5, 4014)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Throttler">
+						<g transform="translate(39575, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Throttler">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Throttler">
 								<text x="0.0" y="13.5" stroke="none" data-name="Throttler">+dynamic call()</text>
 								
@@ -10300,16 +10349,16 @@
 					</g>
 					<g data-name="SerializableColor">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SerializableColor">
-							<rect x="21548.0" y="3685.0" height="77.0" width="312.0" data-name="SerializableColor"></rect>
-							<path d="M21548.0 3716.0 L21860.0 3716.0" fill="none" data-name="SerializableColor"></path>
+							<rect x="21961.0" y="3805.0" height="77.0" width="312.0" data-name="SerializableColor"></rect>
+							<path d="M21961.0 3836.0 L22273.0 3836.0" fill="none" data-name="SerializableColor"></path>
 						</g>
-						<g transform="translate(21548, 3685)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SerializableColor">
+						<g transform="translate(21961, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SerializableColor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SerializableColor">
 								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="SerializableColor">SerializableColor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21548, 3716)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SerializableColor">
+						<g transform="translate(21961, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SerializableColor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SerializableColor">
 								<text x="0.0" y="13.5" stroke="none" data-name="SerializableColor">+Map&lt;String, dynamic&gt; toJson()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SerializableColor">&lt;static&gt;+SerializableColor fromJson()</text>
@@ -10319,16 +10368,16 @@
 					</g>
 					<g data-name="IProviderArgsResolver">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="41335.0" y="1181.5" height="62.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-							<path d="M41335.0 1212.5 L41528.0 1212.5" fill="none" data-name="IProviderArgsResolver"></path>
+							<rect x="41582.3" y="1181.5" height="62.0" width="193.0" data-name="IProviderArgsResolver"></rect>
+							<path d="M41582.3 1212.5 L41775.3 1212.5" fill="none" data-name="IProviderArgsResolver"></path>
 						</g>
-						<g transform="translate(41335, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
+						<g transform="translate(41582.25, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
 								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41335, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IProviderArgsResolver">
+						<g transform="translate(41582.25, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IProviderArgsResolver">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IProviderArgsResolver">
 								<text x="0.0" y="13.5" stroke="none" data-name="IProviderArgsResolver">+R provide()</text>
 								
@@ -10337,23 +10386,23 @@
 					</g>
 					<g data-name="CombinedStreamNotifier">
 						<g fill="#eee8d5" stroke="#33322E" data-name="CombinedStreamNotifier">
-							<rect x="39736.0" y="583.0" height="93.0" width="435.0" data-name="CombinedStreamNotifier"></rect>
-							<path d="M39736.0 614.0 L40171.0 614.0" fill="none" data-name="CombinedStreamNotifier"></path>
-							<path d="M39736.0 645.0 L40171.0 645.0" fill="none" data-name="CombinedStreamNotifier"></path>
+							<rect x="40798.3" y="583.0" height="93.0" width="435.0" data-name="CombinedStreamNotifier"></rect>
+							<path d="M40798.3 614.0 L41233.3 614.0" fill="none" data-name="CombinedStreamNotifier"></path>
+							<path d="M40798.3 645.0 L41233.3 645.0" fill="none" data-name="CombinedStreamNotifier"></path>
 						</g>
-						<g transform="translate(39736, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CombinedStreamNotifier">
+						<g transform="translate(40798.25, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CombinedStreamNotifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CombinedStreamNotifier">
 								<text x="209.5" y="13.5" stroke="none" text-anchor="middle" data-name="CombinedStreamNotifier">CombinedStreamNotifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39736, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
+						<g transform="translate(40798.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
 								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">-_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39736, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
+						<g transform="translate(40798.25, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
 								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">+void dispose()</text>
 								
@@ -10362,9 +10411,9 @@
 					</g>
 					<g data-name="ChangeNotifier">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
-							<rect x="39886.5" y="121.0" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
+							<rect x="40948.8" y="121.0" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
 						</g>
-						<g transform="translate(39886.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
+						<g transform="translate(40948.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
 								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
 								
@@ -10373,17 +10422,17 @@
 					</g>
 					<g data-name="CountWhereValidator">
 						<g fill="#eee8d5" stroke="#33322E" data-name="CountWhereValidator">
-							<rect x="40211.0" y="553.0" height="153.0" width="383.0" data-name="CountWhereValidator"></rect>
-							<path d="M40211.0 584.0 L40594.0 584.0" fill="none" data-name="CountWhereValidator"></path>
-							<path d="M40211.0 675.0 L40594.0 675.0" fill="none" data-name="CountWhereValidator"></path>
+							<rect x="41273.3" y="553.0" height="153.0" width="383.0" data-name="CountWhereValidator"></rect>
+							<path d="M41273.3 584.0 L41656.3 584.0" fill="none" data-name="CountWhereValidator"></path>
+							<path d="M41273.3 675.0 L41656.3 675.0" fill="none" data-name="CountWhereValidator"></path>
 						</g>
-						<g transform="translate(40211, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CountWhereValidator">
+						<g transform="translate(41273.25, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CountWhereValidator">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CountWhereValidator">
 								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="CountWhereValidator">CountWhereValidator</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40211, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
+						<g transform="translate(41273.25, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
 								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+predicate: bool Function(T?)</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="CountWhereValidator">+minCount: int?</text>
@@ -10393,7 +10442,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(40211, 675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
+						<g transform="translate(41273.25, 675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
 								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+Map&lt;String, dynamic&gt;? validate()</text>
 								
@@ -10402,9 +10451,9 @@
 					</g>
 					<g data-name="bool Function(T?)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="bool Function(T?)">
-							<rect x="40325.0" y="1197.0" height="31.0" width="155.0" data-name="bool Function(T?)"></rect>
+							<rect x="41387.3" y="1197.0" height="31.0" width="155.0" data-name="bool Function(T?)"></rect>
 						</g>
-						<g transform="translate(40325, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="bool Function(T?)">
+						<g transform="translate(41387.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="bool Function(T?)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="bool Function(T?)">
 								<text x="69.5" y="13.5" stroke="none" text-anchor="middle" data-name="bool Function(T?)">bool Function(T?)</text>
 								
@@ -10413,9 +10462,9 @@
 					</g>
 					<g data-name="Validator">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Validator">
-							<rect x="40359.5" y="121.0" height="31.0" width="86.0" data-name="Validator"></rect>
+							<rect x="41421.8" y="121.0" height="31.0" width="86.0" data-name="Validator"></rect>
 						</g>
-						<g transform="translate(40359.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Validator">
+						<g transform="translate(41421.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Validator">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Validator">
 								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="Validator">Validator</text>
 								
@@ -10424,16 +10473,16 @@
 					</g>
 					<g data-name="Patterns">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Patterns">
-							<rect x="41713.5" y="90.5" height="92.0" width="287.0" data-name="Patterns"></rect>
-							<path d="M41713.5 121.5 L42000.5 121.5" fill="none" data-name="Patterns"></path>
+							<rect x="43029.0" y="90.5" height="92.0" width="287.0" data-name="Patterns"></rect>
+							<path d="M43029.0 121.5 L43316.0 121.5" fill="none" data-name="Patterns"></path>
 						</g>
-						<g transform="translate(41713.5, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Patterns">
+						<g transform="translate(43029, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Patterns">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Patterns">
 								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="Patterns">Patterns</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41713.5, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Patterns">
+						<g transform="translate(43029, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Patterns">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Patterns">
 								<text x="0.0" y="13.5" stroke="none" data-name="Patterns">&lt;static&gt;+timeFormatString: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Patterns">&lt;static&gt;+emailFormatString: String</text>
@@ -10444,24 +10493,24 @@
 					</g>
 					<g data-name="NumericalRangeFormatter">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NumericalRangeFormatter">
-							<rect x="40634.0" y="575.5" height="108.0" width="313.0" data-name="NumericalRangeFormatter"></rect>
-							<path d="M40634.0 606.5 L40947.0 606.5" fill="none" data-name="NumericalRangeFormatter"></path>
-							<path d="M40634.0 652.5 L40947.0 652.5" fill="none" data-name="NumericalRangeFormatter"></path>
+							<rect x="41949.5" y="575.5" height="108.0" width="313.0" data-name="NumericalRangeFormatter"></rect>
+							<path d="M41949.5 606.5 L42262.5 606.5" fill="none" data-name="NumericalRangeFormatter"></path>
+							<path d="M41949.5 652.5 L42262.5 652.5" fill="none" data-name="NumericalRangeFormatter"></path>
 						</g>
-						<g transform="translate(40634, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericalRangeFormatter">
+						<g transform="translate(41949.5, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericalRangeFormatter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NumericalRangeFormatter">
 								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="NumericalRangeFormatter">NumericalRangeFormatter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40634, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
+						<g transform="translate(41949.5, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
 								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+min: int?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="NumericalRangeFormatter">+max: int?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40634, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
+						<g transform="translate(41949.5, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
 								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+TextEditingValue formatEditUpdate()</text>
 								
@@ -10470,9 +10519,9 @@
 					</g>
 					<g data-name="TextInputFormatter">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TextInputFormatter">
-							<rect x="40884.0" y="121.0" height="31.0" width="166.0" data-name="TextInputFormatter"></rect>
+							<rect x="42199.5" y="121.0" height="31.0" width="166.0" data-name="TextInputFormatter"></rect>
 						</g>
-						<g transform="translate(40884, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TextInputFormatter">
+						<g transform="translate(42199.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TextInputFormatter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextInputFormatter">
 								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextInputFormatter">TextInputFormatter</text>
 								
@@ -10481,16 +10530,16 @@
 					</g>
 					<g data-name="StudySequenceFormatter">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudySequenceFormatter">
-							<rect x="40987.0" y="598.5" height="62.0" width="313.0" data-name="StudySequenceFormatter"></rect>
-							<path d="M40987.0 629.5 L41300.0 629.5" fill="none" data-name="StudySequenceFormatter"></path>
+							<rect x="42302.5" y="598.5" height="62.0" width="313.0" data-name="StudySequenceFormatter"></rect>
+							<path d="M42302.5 629.5 L42615.5 629.5" fill="none" data-name="StudySequenceFormatter"></path>
 						</g>
-						<g transform="translate(40987, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySequenceFormatter">
+						<g transform="translate(42302.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySequenceFormatter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySequenceFormatter">
 								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySequenceFormatter">StudySequenceFormatter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40987, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySequenceFormatter">
+						<g transform="translate(42302.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySequenceFormatter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySequenceFormatter">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudySequenceFormatter">+TextEditingValue formatEditUpdate()</text>
 								
@@ -10499,17 +10548,17 @@
 					</g>
 					<g data-name="Tuple">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Tuple">
-							<rect x="22118.8" y="2481.0" height="168.0" width="384.0" data-name="Tuple"></rect>
-							<path d="M22118.8 2512.0 L22502.8 2512.0" fill="none" data-name="Tuple"></path>
-							<path d="M22118.8 2573.0 L22502.8 2573.0" fill="none" data-name="Tuple"></path>
+							<rect x="22399.0" y="2541.0" height="168.0" width="384.0" data-name="Tuple"></rect>
+							<path d="M22399.0 2572.0 L22783.0 2572.0" fill="none" data-name="Tuple"></path>
+							<path d="M22399.0 2633.0 L22783.0 2633.0" fill="none" data-name="Tuple"></path>
 						</g>
-						<g transform="translate(22118.75, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Tuple">
+						<g transform="translate(22399, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Tuple">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Tuple">
 								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="Tuple">Tuple</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22118.75, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
+						<g transform="translate(22399, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
 								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+first: T1</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">+second: T2</text>
@@ -10517,7 +10566,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(22118.75, 2573)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
+						<g transform="translate(22399, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
 								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+Map&lt;String, dynamic&gt; toJson()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">&lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson()</text>
@@ -10529,23 +10578,23 @@
 					</g>
 					<g data-name="JsonFileLoader">
 						<g fill="#eee8d5" stroke="#33322E" data-name="JsonFileLoader">
-							<rect x="63822.3" y="75.0" height="123.0" width="319.0" data-name="JsonFileLoader"></rect>
-							<path d="M63822.3 106.0 L64141.3 106.0" fill="none" data-name="JsonFileLoader"></path>
-							<path d="M63822.3 137.0 L64141.3 137.0" fill="none" data-name="JsonFileLoader"></path>
+							<rect x="70805.8" y="75.0" height="123.0" width="319.0" data-name="JsonFileLoader"></rect>
+							<path d="M70805.8 106.0 L71124.8 106.0" fill="none" data-name="JsonFileLoader"></path>
+							<path d="M70805.8 137.0 L71124.8 137.0" fill="none" data-name="JsonFileLoader"></path>
 						</g>
-						<g transform="translate(63822.25, 75)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="JsonFileLoader">
+						<g transform="translate(70805.75, 75)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="JsonFileLoader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonFileLoader">
 								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="JsonFileLoader">JsonFileLoader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63822.25, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
+						<g transform="translate(70805.75, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
 								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+jsonAssetsPath: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63822.25, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
+						<g transform="translate(70805.75, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
 								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+dynamic loadJson()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonMapFromAssets()</text>
@@ -10556,16 +10605,16 @@
 					</g>
 					<g data-name="IAppDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
-							<rect x="19175.3" y="3692.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
-							<path d="M19175.3 3723.5 L19372.3 3723.5" fill="none" data-name="IAppDelegate"></path>
+							<rect x="19658.5" y="3812.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
+							<path d="M19658.5 3843.5 L19855.5 3843.5" fill="none" data-name="IAppDelegate"></path>
 						</g>
-						<g transform="translate(19175.25, 3692.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
+						<g transform="translate(19658.5, 3812.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
 								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19175.25, 3723.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
+						<g transform="translate(19658.5, 3843.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
 								
@@ -10574,26 +10623,25 @@
 					</g>
 					<g data-name="AppController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
-							<rect x="65251.0" y="4258.0" height="153.0" width="340.0" data-name="AppController"></rect>
-							<path d="M65251.0 4289.0 L65591.0 4289.0" fill="none" data-name="AppController"></path>
-							<path d="M65251.0 4365.0 L65591.0 4365.0" fill="none" data-name="AppController"></path>
+							<rect x="71164.8" y="67.5" height="138.0" width="301.0" data-name="AppController"></rect>
+							<path d="M71164.8 98.5 L71465.8 98.5" fill="none" data-name="AppController"></path>
+							<path d="M71164.8 159.5 L71465.8 159.5" fill="none" data-name="AppController"></path>
 						</g>
-						<g transform="translate(65251, 4258)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
+						<g transform="translate(71164.75, 67.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
-								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
+								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65251, 4289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+						<g transform="translate(71164.75, 98.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+sharedPreferences: SharedPreferences</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
+								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65251, 4365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+						<g transform="translate(71164.75, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
@@ -10601,36 +10649,25 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="SharedPreferences">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SharedPreferences">
-							<rect x="67612.8" y="4541.0" height="31.0" width="169.0" data-name="SharedPreferences"></rect>
-						</g>
-						<g transform="translate(67612.75, 4541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SharedPreferences">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SharedPreferences">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="SharedPreferences">SharedPreferences</text>
-								
-							</g>
-						</g>
-					</g>
 					<g data-name="ParticipantDetailsFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsFormView">
-							<rect x="77704.8" y="1651.0" height="93.0" width="419.0" data-name="ParticipantDetailsFormView"></rect>
-							<path d="M77704.8 1682.0 L78123.8 1682.0" fill="none" data-name="ParticipantDetailsFormView"></path>
-							<path d="M77704.8 1713.0 L78123.8 1713.0" fill="none" data-name="ParticipantDetailsFormView"></path>
+							<rect x="79547.0" y="1651.0" height="93.0" width="419.0" data-name="ParticipantDetailsFormView"></rect>
+							<path d="M79547.0 1682.0 L79966.0 1682.0" fill="none" data-name="ParticipantDetailsFormView"></path>
+							<path d="M79547.0 1713.0 L79966.0 1713.0" fill="none" data-name="ParticipantDetailsFormView"></path>
 						</g>
-						<g transform="translate(77704.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsFormView">
+						<g transform="translate(79547, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsFormView">
 								<text x="201.5" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsFormView">ParticipantDetailsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77704.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormView">
+						<g transform="translate(79547, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormView">+formViewModel: ParticipantDetailsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77704.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormView">
+						<g transform="translate(79547, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormView">+Widget build()</text>
 								
@@ -10639,17 +10676,17 @@
 					</g>
 					<g data-name="ParticipantDetailsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsFormViewModel">
-							<rect x="73242.0" y="2481.0" height="168.0" width="354.0" data-name="ParticipantDetailsFormViewModel"></rect>
-							<path d="M73242.0 2512.0 L73596.0 2512.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
-							<path d="M73242.0 2588.0 L73596.0 2588.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
+							<rect x="64335.3" y="2541.0" height="168.0" width="354.0" data-name="ParticipantDetailsFormViewModel"></rect>
+							<path d="M64335.3 2572.0 L64689.3 2572.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
+							<path d="M64335.3 2648.0 L64689.3 2648.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
 						</g>
-						<g transform="translate(73242, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsFormViewModel">
+						<g transform="translate(64335.25, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsFormViewModel">
 								<text x="169.0" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsFormViewModel">ParticipantDetailsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73242, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
+						<g transform="translate(64335.25, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+participantIdControl: FormControl&lt;String&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+rawDataControl: FormControl&lt;String&gt;</text>
@@ -10658,7 +10695,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(73242, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
+						<g transform="translate(64335.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+void initControls()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+StudyMonitorItem buildFormData()</text>
@@ -10669,16 +10706,16 @@
 					</g>
 					<g data-name="StudyMonitorScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="27321.5" y="2511.5" height="107.0" width="280.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M27321.5 2542.5 L27601.5 2542.5" fill="none" data-name="StudyMonitorScreen"></path>
+							<rect x="28944.5" y="2571.5" height="107.0" width="280.0" data-name="StudyMonitorScreen"></rect>
+							<path d="M28944.5 2602.5 L29224.5 2602.5" fill="none" data-name="StudyMonitorScreen"></path>
 						</g>
-						<g transform="translate(27321.5, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
+						<g transform="translate(28944.5, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
 								<text x="132.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27321.5, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
+						<g transform="translate(28944.5, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorScreen">-Widget _monitorSectionHeader()</text>
@@ -10690,23 +10727,23 @@
 					</g>
 					<g data-name="StudyPageWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="34999.8" y="1651.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
-							<path d="M34999.8 1682.0 L35163.8 1682.0" fill="none" data-name="StudyPageWidget"></path>
-							<path d="M34999.8 1713.0 L35163.8 1713.0" fill="none" data-name="StudyPageWidget"></path>
+							<rect x="34480.3" y="1651.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
+							<path d="M34480.3 1682.0 L34644.3 1682.0" fill="none" data-name="StudyPageWidget"></path>
+							<path d="M34480.3 1713.0 L34644.3 1713.0" fill="none" data-name="StudyPageWidget"></path>
 						</g>
-						<g transform="translate(34999.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
+						<g transform="translate(34480.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
 								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34999.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+						<g transform="translate(34480.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34999.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+						<g transform="translate(34480.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
 								
@@ -10715,17 +10752,17 @@
 					</g>
 					<g data-name="StudyMonitorItem">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorItem">
-							<rect x="22542.8" y="2436.0" height="258.0" width="371.0" data-name="StudyMonitorItem"></rect>
-							<path d="M22542.8 2467.0 L22913.8 2467.0" fill="none" data-name="StudyMonitorItem"></path>
-							<path d="M22542.8 2663.0 L22913.8 2663.0" fill="none" data-name="StudyMonitorItem"></path>
+							<rect x="22823.0" y="2496.0" height="258.0" width="371.0" data-name="StudyMonitorItem"></rect>
+							<path d="M22823.0 2527.0 L23194.0 2527.0" fill="none" data-name="StudyMonitorItem"></path>
+							<path d="M22823.0 2723.0 L23194.0 2723.0" fill="none" data-name="StudyMonitorItem"></path>
 						</g>
-						<g transform="translate(22542.75, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorItem">
+						<g transform="translate(22823, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorItem">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorItem">
 								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorItem">StudyMonitorItem</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22542.75, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
+						<g transform="translate(22823, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">+participantId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorItem">+inviteCode: String?</text>
@@ -10742,7 +10779,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(22542.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
+						<g transform="translate(22823, 2723)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">&lt;static&gt;+List&lt;StudyMonitorItem&gt; fromStudy()</text>
 								
@@ -10751,24 +10788,24 @@
 					</g>
 					<g data-name="StudyMonitorTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorTable">
-							<rect x="41278.5" y="60.0" height="153.0" width="395.0" data-name="StudyMonitorTable"></rect>
-							<path d="M41278.5 91.0 L41673.5 91.0" fill="none" data-name="StudyMonitorTable"></path>
-							<path d="M41278.5 137.0 L41673.5 137.0" fill="none" data-name="StudyMonitorTable"></path>
+							<rect x="42594.0" y="60.0" height="153.0" width="395.0" data-name="StudyMonitorTable"></rect>
+							<path d="M42594.0 91.0 L42989.0 91.0" fill="none" data-name="StudyMonitorTable"></path>
+							<path d="M42594.0 137.0 L42989.0 137.0" fill="none" data-name="StudyMonitorTable"></path>
 						</g>
-						<g transform="translate(41278.5, 60)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorTable">
+						<g transform="translate(42594, 60)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorTable">
 								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorTable">StudyMonitorTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41278.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
+						<g transform="translate(42594, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+studyMonitorItems: List&lt;StudyMonitorItem&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">+onSelectItem: void Function(StudyMonitorItem)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41278.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
+						<g transform="translate(42594, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">-List&lt;Widget&gt; _buildRow()</text>
@@ -10780,9 +10817,9 @@
 					</g>
 					<g data-name="void Function(StudyMonitorItem)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyMonitorItem)">
-							<rect x="41340.0" y="614.0" height="31.0" width="272.0" data-name="void Function(StudyMonitorItem)"></rect>
+							<rect x="42655.5" y="614.0" height="31.0" width="272.0" data-name="void Function(StudyMonitorItem)"></rect>
 						</g>
-						<g transform="translate(41340, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyMonitorItem)">
+						<g transform="translate(42655.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyMonitorItem)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyMonitorItem)">
 								<text x="128.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyMonitorItem)">void Function(StudyMonitorItem)</text>
 								
@@ -10791,9 +10828,9 @@
 					</g>
 					<g data-name="FormControl">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="64901.0" y="3365.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+							<rect x="59231.8" y="3485.0" height="31.0" width="113.0" data-name="FormControl"></rect>
 						</g>
-						<g transform="translate(64901, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+						<g transform="translate(59231.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
 								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
 								
@@ -10802,9 +10839,9 @@
 					</g>
 					<g data-name="FormGroup">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="68268.0" y="3365.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
+							<rect x="62924.0" y="3485.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
 						</g>
-						<g transform="translate(68268, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+						<g transform="translate(62924, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
 								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
 								
@@ -10813,17 +10850,17 @@
 					</g>
 					<g data-name="FormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="73810.8" y="313.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
-							<path d="M73810.8 344.0 L74682.8 344.0" fill="none" data-name="FormViewModel"></path>
-							<path d="M73810.8 660.0 L74682.8 660.0" fill="none" data-name="FormViewModel"></path>
+							<rect x="66800.5" y="313.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
+							<path d="M66800.5 344.0 L67672.5 344.0" fill="none" data-name="FormViewModel"></path>
+							<path d="M66800.5 660.0 L67672.5 660.0" fill="none" data-name="FormViewModel"></path>
 						</g>
-						<g transform="translate(73810.75, 313)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
+						<g transform="translate(66800.5, 313)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
 								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73810.75, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+						<g transform="translate(66800.5, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
@@ -10848,7 +10885,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(73810.75, 660)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+						<g transform="translate(66800.5, 660)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
@@ -10874,23 +10911,23 @@
 					</g>
 					<g data-name="LoginForm">
 						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
-							<rect x="11713.0" y="2518.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
-							<path d="M11713.0 2549.5 L11920.0 2549.5" fill="none" data-name="LoginForm"></path>
-							<path d="M11713.0 2580.5 L11920.0 2580.5" fill="none" data-name="LoginForm"></path>
+							<rect x="11713.0" y="2578.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
+							<path d="M11713.0 2609.5 L11920.0 2609.5" fill="none" data-name="LoginForm"></path>
+							<path d="M11713.0 2640.5 L11920.0 2640.5" fill="none" data-name="LoginForm"></path>
 						</g>
-						<g transform="translate(11713, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
+						<g transform="translate(11713, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
 								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11713, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+						<g transform="translate(11713, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11713, 2580.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+						<g transform="translate(11713, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
 								
@@ -10899,16 +10936,16 @@
 					</g>
 					<g data-name="AuthFormKey">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
-							<rect x="19129.0" y="3297.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
-							<path d="M19129.0 3328.0 L19484.0 3328.0" fill="none" data-name="AuthFormKey"></path>
+							<rect x="14634.5" y="3417.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
+							<path d="M14634.5 3448.0 L14989.5 3448.0" fill="none" data-name="AuthFormKey"></path>
 						</g>
-						<g transform="translate(19129, 3297)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
+						<g transform="translate(14634.5, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
 								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19129, 3328)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
+						<g transform="translate(14634.5, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
@@ -10924,23 +10961,23 @@
 					</g>
 					<g data-name="PasswordRecoveryForm">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
-							<rect x="12467.3" y="2518.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
-							<path d="M12467.3 2549.5 L12675.3 2549.5" fill="none" data-name="PasswordRecoveryForm"></path>
-							<path d="M12467.3 2580.5 L12675.3 2580.5" fill="none" data-name="PasswordRecoveryForm"></path>
+							<rect x="12467.3" y="2578.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
+							<path d="M12467.3 2609.5 L12675.3 2609.5" fill="none" data-name="PasswordRecoveryForm"></path>
+							<path d="M12467.3 2640.5 L12675.3 2640.5" fill="none" data-name="PasswordRecoveryForm"></path>
 						</g>
-						<g transform="translate(12467.25, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
+						<g transform="translate(12467.25, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
 								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12467.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+						<g transform="translate(12467.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12467.25, 2580.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+						<g transform="translate(12467.25, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
 								
@@ -10949,23 +10986,23 @@
 					</g>
 					<g data-name="PasswordForgotForm">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
-							<rect x="13219.8" y="2518.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
-							<path d="M13219.8 2549.5 L13426.8 2549.5" fill="none" data-name="PasswordForgotForm"></path>
-							<path d="M13219.8 2580.5 L13426.8 2580.5" fill="none" data-name="PasswordForgotForm"></path>
+							<rect x="13425.0" y="2578.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
+							<path d="M13425.0 2609.5 L13632.0 2609.5" fill="none" data-name="PasswordForgotForm"></path>
+							<path d="M13425.0 2640.5 L13632.0 2640.5" fill="none" data-name="PasswordForgotForm"></path>
 						</g>
-						<g transform="translate(13219.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
+						<g transform="translate(13425, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
 								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13219.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+						<g transform="translate(13425, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13219.75, 2580.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+						<g transform="translate(13425, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
 								
@@ -10974,23 +11011,23 @@
 					</g>
 					<g data-name="SignupForm">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
-							<rect x="17930.5" y="2503.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
-							<path d="M17930.5 2534.5 L18208.5 2534.5" fill="none" data-name="SignupForm"></path>
-							<path d="M17930.5 2565.5 L18208.5 2565.5" fill="none" data-name="SignupForm"></path>
+							<rect x="18358.3" y="2563.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
+							<path d="M18358.3 2594.5 L18636.3 2594.5" fill="none" data-name="SignupForm"></path>
+							<path d="M18358.3 2625.5 L18636.3 2625.5" fill="none" data-name="SignupForm"></path>
 						</g>
-						<g transform="translate(17930.5, 2503.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
+						<g transform="translate(18358.25, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
 								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17930.5, 2534.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+						<g transform="translate(18358.25, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17930.5, 2565.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+						<g transform="translate(18358.25, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
@@ -11001,16 +11038,16 @@
 					</g>
 					<g data-name="AuthScaffold">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
-							<rect x="28226.5" y="2504.0" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
-							<path d="M28226.5 2535.0 L28485.5 2535.0" fill="none" data-name="AuthScaffold"></path>
+							<rect x="29849.5" y="2564.0" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
+							<path d="M29849.5 2595.0 L30108.5 2595.0" fill="none" data-name="AuthScaffold"></path>
 						</g>
-						<g transform="translate(28226.5, 2504)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
+						<g transform="translate(29849.5, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
 								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28226.5, 2535)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
+						<g transform="translate(29849.5, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
@@ -11023,16 +11060,16 @@
 					</g>
 					<g data-name="EmailTextField">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
-							<rect x="28525.5" y="2511.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
-							<path d="M28525.5 2542.5 L28846.5 2542.5" fill="none" data-name="EmailTextField"></path>
+							<rect x="30148.5" y="2571.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
+							<path d="M30148.5 2602.5 L30469.5 2602.5" fill="none" data-name="EmailTextField"></path>
 						</g>
-						<g transform="translate(28525.5, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
+						<g transform="translate(30148.5, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
 								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28525.5, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
+						<g transform="translate(30148.5, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
 								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
@@ -11044,16 +11081,16 @@
 					</g>
 					<g data-name="PasswordTextField">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
-							<rect x="28886.5" y="2504.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
-							<path d="M28886.5 2535.0 L29365.5 2535.0" fill="none" data-name="PasswordTextField"></path>
+							<rect x="30509.5" y="2564.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
+							<path d="M30509.5 2595.0 L30988.5 2595.0" fill="none" data-name="PasswordTextField"></path>
 						</g>
-						<g transform="translate(28886.5, 2504)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
+						<g transform="translate(30509.5, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28886.5, 2535)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
+						<g transform="translate(30509.5, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
@@ -11066,9 +11103,9 @@
 					</g>
 					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<rect x="30062.0" y="3365.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
+							<rect x="31536.3" y="3485.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
 						</g>
-						<g transform="translate(30062, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+						<g transform="translate(31536.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
 								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
 								
@@ -11077,16 +11114,16 @@
 					</g>
 					<g data-name="StudyUJobsToBeDone">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
-							<rect x="65936.3" y="105.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
-							<path d="M65936.3 136.5 L66130.3 136.5" fill="none" data-name="StudyUJobsToBeDone"></path>
+							<rect x="76770.0" y="105.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
+							<path d="M76770.0 136.5 L76964.0 136.5" fill="none" data-name="StudyUJobsToBeDone"></path>
 						</g>
-						<g transform="translate(65936.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
+						<g transform="translate(76770, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
 								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65936.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
+						<g transform="translate(76770, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
 								
@@ -11095,41 +11132,38 @@
 					</g>
 					<g data-name="AuthFormController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
-							<rect x="65720.3" y="2263.5" height="603.0" width="850.0" data-name="AuthFormController"></rect>
-							<path d="M65720.3 2294.5 L66570.3 2294.5" fill="none" data-name="AuthFormController"></path>
-							<path d="M65720.3 2595.5 L66570.3 2595.5" fill="none" data-name="AuthFormController"></path>
+							<rect x="42958.3" y="2368.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
+							<path d="M42958.3 2399.5 L43808.3 2399.5" fill="none" data-name="AuthFormController"></path>
+							<path d="M42958.3 2655.5 L43808.3 2655.5" fill="none" data-name="AuthFormController"></path>
 						</g>
-						<g transform="translate(65720.25, 2263.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
+						<g transform="translate(42958.25, 2368.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
 								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65720.25, 2294.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+						<g transform="translate(42958.25, 2399.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+sharedPreferences: SharedPreferences</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">+rememberMeControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="AuthFormController">+shouldRemember: bool</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
-								
-							</g>
-						</g>
-						<g transform="translate(65720.25, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
+								
+							</g>
+						</g>
+						<g transform="translate(42958.25, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
@@ -11145,26 +11179,23 @@
 								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
 								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
 								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">-void _setRememberMe()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">-void _delRememberMe()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="AuthFormController">-void _initRememberMe()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="IAuthRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="75100.5" y="3900.0" height="228.0" width="295.0" data-name="IAuthRepository"></rect>
-							<path d="M75100.5 3931.0 L75395.5 3931.0" fill="none" data-name="IAuthRepository"></path>
-							<path d="M75100.5 4022.0 L75395.5 4022.0" fill="none" data-name="IAuthRepository"></path>
+							<rect x="71281.3" y="4020.0" height="228.0" width="295.0" data-name="IAuthRepository"></rect>
+							<path d="M71281.3 4051.0 L71576.3 4051.0" fill="none" data-name="IAuthRepository"></path>
+							<path d="M71281.3 4142.0 L71576.3 4142.0" fill="none" data-name="IAuthRepository"></path>
 						</g>
-						<g transform="translate(75100.5, 3900)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
+						<g transform="translate(71281.25, 4020)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
 								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75100.5, 3931)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
+						<g transform="translate(71281.25, 4051)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+allowPasswordReset: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+currentUser: User?</text>
@@ -11174,7 +11205,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(75100.5, 4022)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
+						<g transform="translate(71281.25, 4142)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+dynamic signUp()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+dynamic signInWith()</text>
@@ -11188,16 +11219,16 @@
 					</g>
 					<g data-name="IFormGroupController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="67871.8" y="105.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
-							<path d="M67871.8 136.5 L68058.8 136.5" fill="none" data-name="IFormGroupController"></path>
+							<rect x="45943.0" y="105.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
+							<path d="M45943.0 136.5 L46130.0 136.5" fill="none" data-name="IFormGroupController"></path>
 						</g>
-						<g transform="translate(67871.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
+						<g transform="translate(45943, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
 								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67871.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
+						<g transform="translate(45943, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
 								
@@ -11206,16 +11237,16 @@
 					</g>
 					<g data-name="AppStatus">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
-							<rect x="940.0" y="3327.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
-							<path d="M940.0 3358.0 L1219.0 3358.0" fill="none" data-name="AppStatus"></path>
+							<rect x="940.0" y="3447.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
+							<path d="M940.0 3478.0 L1219.0 3478.0" fill="none" data-name="AppStatus"></path>
 						</g>
-						<g transform="translate(940, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
+						<g transform="translate(940, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
 								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(940, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
+						<g transform="translate(940, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
@@ -11227,17 +11258,17 @@
 					</g>
 					<g data-name="FormArrayTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
-							<rect x="30517.0" y="2368.5" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
-							<path d="M30517.0 2399.5 L31007.0 2399.5" fill="none" data-name="FormArrayTable"></path>
-							<path d="M30517.0 2700.5 L31007.0 2700.5" fill="none" data-name="FormArrayTable"></path>
+							<rect x="32545.0" y="2428.5" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
+							<path d="M32545.0 2459.5 L33035.0 2459.5" fill="none" data-name="FormArrayTable"></path>
+							<path d="M32545.0 2760.5 L33035.0 2760.5" fill="none" data-name="FormArrayTable"></path>
 						</g>
-						<g transform="translate(30517, 2368.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
+						<g transform="translate(32545, 2428.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
 								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30517, 2399.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+						<g transform="translate(32545, 2459.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
@@ -11261,7 +11292,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(30517, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+						<g transform="translate(32545, 2760.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
@@ -11272,9 +11303,9 @@
 					</g>
 					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<rect x="30834.0" y="3365.0" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
+							<rect x="31993.5" y="3485.0" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
 						</g>
-						<g transform="translate(30834, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+						<g transform="translate(31993.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
 								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
 								
@@ -11283,9 +11314,9 @@
 					</g>
 					<g data-name="String Function(T)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
-							<rect x="39932.8" y="3365.0" height="31.0" width="157.0" data-name="String Function(T)"></rect>
+							<rect x="32444.5" y="3485.0" height="31.0" width="157.0" data-name="String Function(T)"></rect>
 						</g>
-						<g transform="translate(39932.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
+						<g transform="translate(32444.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
 								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
 								
@@ -11294,9 +11325,9 @@
 					</g>
 					<g data-name="Widget Function(BuildContext, T, int)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
-							<rect x="40195.5" y="3365.0" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
+							<rect x="33094.5" y="3485.0" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
 						</g>
-						<g transform="translate(40195.5, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
+						<g transform="translate(33094.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
 								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
 								
@@ -11305,16 +11336,16 @@
 					</g>
 					<g data-name="ManagedFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="66963.3" y="1666.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
-							<path d="M66963.3 1697.5 L67359.3 1697.5" fill="none" data-name="ManagedFormViewModel"></path>
+							<rect x="57591.3" y="1666.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
+							<path d="M57591.3 1697.5 L57987.3 1697.5" fill="none" data-name="ManagedFormViewModel"></path>
 						</g>
-						<g transform="translate(66963.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+						<g transform="translate(57591.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
 								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(66963.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
+						<g transform="translate(57591.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
 								
@@ -11323,9 +11354,9 @@
 					</g>
 					<g data-name="FormViewModelNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
-							<rect x="41795.8" y="614.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
+							<rect x="71276.5" y="614.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
 						</g>
-						<g transform="translate(41795.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
+						<g transform="translate(71276.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
 								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
 								
@@ -11334,9 +11365,9 @@
 					</g>
 					<g data-name="Exception">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="59322.0" y="121.0" height="31.0" width="94.0" data-name="Exception"></rect>
+							<rect x="73917.5" y="121.0" height="31.0" width="94.0" data-name="Exception"></rect>
 						</g>
-						<g transform="translate(59322, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
+						<g transform="translate(73917.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
 								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
 								
@@ -11345,17 +11376,17 @@
 					</g>
 					<g data-name="FormViewModelCollection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="69056.3" y="3587.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
-							<path d="M69056.3 3618.0 L69337.3 3618.0" fill="none" data-name="FormViewModelCollection"></path>
-							<path d="M69056.3 3709.0 L69337.3 3709.0" fill="none" data-name="FormViewModelCollection"></path>
+							<rect x="64374.8" y="3707.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
+							<path d="M64374.8 3738.0 L64655.8 3738.0" fill="none" data-name="FormViewModelCollection"></path>
+							<path d="M64374.8 3829.0 L64655.8 3829.0" fill="none" data-name="FormViewModelCollection"></path>
 						</g>
-						<g transform="translate(69056.25, 3587)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
+						<g transform="translate(64374.75, 3707)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
 								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(69056.25, 3618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+						<g transform="translate(64374.75, 3738)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
@@ -11365,7 +11396,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(69056.25, 3709)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+						<g transform="translate(64374.75, 3829)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
@@ -11382,9 +11413,9 @@
 					</g>
 					<g data-name="FormArray">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="63048.0" y="3998.5" height="31.0" width="98.0" data-name="FormArray"></rect>
+							<rect x="60748.0" y="4118.5" height="31.0" width="98.0" data-name="FormArray"></rect>
 						</g>
-						<g transform="translate(63048, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+						<g transform="translate(60748, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
 								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
 								
@@ -11393,17 +11424,17 @@
 					</g>
 					<g data-name="CustomFormControl">
 						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
-							<rect x="64751.0" y="3639.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
-							<path d="M64751.0 3670.5 L65164.0 3670.5" fill="none" data-name="CustomFormControl"></path>
-							<path d="M64751.0 3776.5 L65164.0 3776.5" fill="none" data-name="CustomFormControl"></path>
+							<rect x="59081.8" y="3759.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
+							<path d="M59081.8 3790.5 L59494.8 3790.5" fill="none" data-name="CustomFormControl"></path>
+							<path d="M59081.8 3896.5 L59494.8 3896.5" fill="none" data-name="CustomFormControl"></path>
 						</g>
-						<g transform="translate(64751, 3639.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
+						<g transform="translate(59081.75, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
 								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64751, 3670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+						<g transform="translate(59081.75, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
 								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
@@ -11414,7 +11445,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(64751, 3776.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+						<g transform="translate(59081.75, 3896.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
 								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
 								
@@ -11423,9 +11454,9 @@
 					</g>
 					<g data-name="void Function(T?)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
-							<rect x="41891.3" y="3998.5" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
+							<rect x="59187.3" y="4118.5" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
 						</g>
-						<g transform="translate(41891.25, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
+						<g transform="translate(59187.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
 								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
 								
@@ -11434,9 +11465,9 @@
 					</g>
 					<g data-name="void Function(ControlStatus)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
-							<rect x="65597.5" y="3998.5" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
+							<rect x="60035.8" y="4118.5" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
 						</g>
-						<g transform="translate(65597.5, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
+						<g transform="translate(60035.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
 								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
 								
@@ -11445,16 +11476,16 @@
 					</g>
 					<g data-name="UnsavedChangesDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
-							<rect x="76212.0" y="105.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
-							<path d="M76212.0 136.5 L76419.0 136.5" fill="none" data-name="UnsavedChangesDialog"></path>
+							<rect x="78368.5" y="105.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
+							<path d="M78368.5 136.5 L78575.5 136.5" fill="none" data-name="UnsavedChangesDialog"></path>
 						</g>
-						<g transform="translate(76212, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
+						<g transform="translate(78368.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
 								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76212, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
+						<g transform="translate(78368.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
 								
@@ -11463,9 +11494,9 @@
 					</g>
 					<g data-name="FormValidationSetEnum">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
-							<rect x="68549.3" y="1197.0" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
+							<rect x="64194.8" y="1197.0" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
 						</g>
-						<g transform="translate(68549.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
+						<g transform="translate(64194.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
 								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
 								
@@ -11474,17 +11505,17 @@
 					</g>
 					<g data-name="FormControlValidation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
-							<rect x="31835.8" y="2496.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
-							<path d="M31835.8 2527.0 L32320.8 2527.0" fill="none" data-name="FormControlValidation"></path>
-							<path d="M31835.8 2603.0 L32320.8 2603.0" fill="none" data-name="FormControlValidation"></path>
+							<rect x="33373.3" y="2556.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
+							<path d="M33373.3 2587.0 L33858.3 2587.0" fill="none" data-name="FormControlValidation"></path>
+							<path d="M33373.3 2663.0 L33858.3 2663.0" fill="none" data-name="FormControlValidation"></path>
 						</g>
-						<g transform="translate(31835.75, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
+						<g transform="translate(33373.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
 								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31835.75, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+						<g transform="translate(33373.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
@@ -11493,7 +11524,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(31835.75, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+						<g transform="translate(33373.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
 								
@@ -11502,23 +11533,23 @@
 					</g>
 					<g data-name="IFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="46395.0" y="1166.0" height="93.0" width="163.0" data-name="IFormData"></rect>
-							<path d="M46395.0 1197.0 L46558.0 1197.0" fill="none" data-name="IFormData"></path>
-							<path d="M46395.0 1228.0 L46558.0 1228.0" fill="none" data-name="IFormData"></path>
+							<rect x="50520.5" y="1166.0" height="93.0" width="163.0" data-name="IFormData"></rect>
+							<path d="M50520.5 1197.0 L50683.5 1197.0" fill="none" data-name="IFormData"></path>
+							<path d="M50520.5 1228.0 L50683.5 1228.0" fill="none" data-name="IFormData"></path>
 						</g>
-						<g transform="translate(46395, 1166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
+						<g transform="translate(50520.5, 1166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
 								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46395, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+						<g transform="translate(50520.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46395, 1228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+						<g transform="translate(50520.5, 1228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
 								
@@ -11527,9 +11558,9 @@
 					</g>
 					<g data-name="FormInvalidException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
-							<rect x="42131.8" y="614.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
+							<rect x="72977.5" y="614.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
 						</g>
-						<g transform="translate(42131.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
+						<g transform="translate(72977.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
 								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
 								
@@ -11538,16 +11569,16 @@
 					</g>
 					<g data-name="FormConfigException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
-							<rect x="42357.8" y="598.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
-							<path d="M42357.8 629.5 L42542.8 629.5" fill="none" data-name="FormConfigException"></path>
+							<rect x="73203.5" y="598.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
+							<path d="M73203.5 629.5 L73388.5 629.5" fill="none" data-name="FormConfigException"></path>
 						</g>
-						<g transform="translate(42357.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
+						<g transform="translate(73203.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
 								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42357.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
+						<g transform="translate(73203.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
 								
@@ -11556,16 +11587,16 @@
 					</g>
 					<g data-name="IFormViewModelDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="69706.8" y="1174.0" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-							<path d="M69706.8 1205.0 L69923.8 1205.0" fill="none" data-name="IFormViewModelDelegate"></path>
+							<rect x="65629.3" y="1174.0" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
+							<path d="M65629.3 1205.0 L65846.3 1205.0" fill="none" data-name="IFormViewModelDelegate"></path>
 						</g>
-						<g transform="translate(69706.75, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
+						<g transform="translate(65629.25, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
 								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(69706.75, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
+						<g transform="translate(65629.25, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
@@ -11575,16 +11606,16 @@
 					</g>
 					<g data-name="FormControlOption">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
-							<rect x="22953.8" y="2511.5" height="107.0" width="190.0" data-name="FormControlOption"></rect>
-							<path d="M22953.8 2542.5 L23143.8 2542.5" fill="none" data-name="FormControlOption"></path>
+							<rect x="23234.0" y="2571.5" height="107.0" width="190.0" data-name="FormControlOption"></rect>
+							<path d="M23234.0 2602.5 L23424.0 2602.5" fill="none" data-name="FormControlOption"></path>
 						</g>
-						<g transform="translate(22953.75, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
+						<g transform="translate(23234, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
 								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22953.75, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
+						<g transform="translate(23234, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
@@ -11596,16 +11627,16 @@
 					</g>
 					<g data-name="FormMode">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
-							<rect x="30462.0" y="3319.5" height="122.0" width="282.0" data-name="FormMode"></rect>
-							<path d="M30462.0 3350.5 L30744.0 3350.5" fill="none" data-name="FormMode"></path>
+							<rect x="27069.8" y="3439.5" height="122.0" width="282.0" data-name="FormMode"></rect>
+							<path d="M27069.8 3470.5 L27351.8 3470.5" fill="none" data-name="FormMode"></path>
 						</g>
-						<g transform="translate(30462, 3319.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
+						<g transform="translate(27069.75, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
 								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30462, 3350.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
+						<g transform="translate(27069.75, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
@@ -11618,23 +11649,23 @@
 					</g>
 					<g data-name="EnrolledBadge">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="76459.0" y="90.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M76459.0 121.0 L76625.0 121.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M76459.0 152.0 L76625.0 152.0" fill="none" data-name="EnrolledBadge"></path>
+							<rect x="78615.5" y="90.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
+							<path d="M78615.5 121.0 L78781.5 121.0" fill="none" data-name="EnrolledBadge"></path>
+							<path d="M78615.5 152.0 L78781.5 152.0" fill="none" data-name="EnrolledBadge"></path>
 						</g>
-						<g transform="translate(76459, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
+						<g transform="translate(78615.5, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
 								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76459, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+						<g transform="translate(78615.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76459, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+						<g transform="translate(78615.5, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
 								
@@ -11643,24 +11674,24 @@
 					</g>
 					<g data-name="StudyRecruitController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="72511.0" y="1121.0" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M72511.0 1152.0 L73162.0 1152.0" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M72511.0 1198.0 L73162.0 1198.0" fill="none" data-name="StudyRecruitController"></path>
+							<rect x="74303.0" y="1121.0" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
+							<path d="M74303.0 1152.0 L74954.0 1152.0" fill="none" data-name="StudyRecruitController"></path>
+							<path d="M74303.0 1198.0 L74954.0 1198.0" fill="none" data-name="StudyRecruitController"></path>
 						</g>
-						<g transform="translate(72511, 1121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
+						<g transform="translate(74303, 1121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
 								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72511, 1152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+						<g transform="translate(74303, 1152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72511, 1198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+						<g transform="translate(74303, 1198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
@@ -11674,16 +11705,16 @@
 					</g>
 					<g data-name="IInviteCodeRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="76921.5" y="1666.5" height="62.0" width="265.0" data-name="IInviteCodeRepository"></rect>
-							<path d="M76921.5 1697.5 L77186.5 1697.5" fill="none" data-name="IInviteCodeRepository"></path>
+							<rect x="80804.0" y="1666.5" height="62.0" width="265.0" data-name="IInviteCodeRepository"></rect>
+							<path d="M80804.0 1697.5 L81069.0 1697.5" fill="none" data-name="IInviteCodeRepository"></path>
 						</g>
-						<g transform="translate(76921.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
+						<g transform="translate(80804, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
 								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76921.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IInviteCodeRepository">
+						<g transform="translate(80804, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IInviteCodeRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IInviteCodeRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IInviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
 								
@@ -11692,9 +11723,9 @@
 					</g>
 					<g data-name="StreamSubscription">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="70682.0" y="3365.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+							<rect x="71614.5" y="3485.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
 						</g>
-						<g transform="translate(70682, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
+						<g transform="translate(71614.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
 								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
 								
@@ -11703,17 +11734,17 @@
 					</g>
 					<g data-name="StudyBaseController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="62517.5" y="538.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
-							<path d="M62517.5 569.0 L63063.5 569.0" fill="none" data-name="StudyBaseController"></path>
-							<path d="M62517.5 645.0 L63063.5 645.0" fill="none" data-name="StudyBaseController"></path>
+							<rect x="71884.8" y="538.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
+							<path d="M71884.8 569.0 L72430.8 569.0" fill="none" data-name="StudyBaseController"></path>
+							<path d="M71884.8 645.0 L72430.8 645.0" fill="none" data-name="StudyBaseController"></path>
 						</g>
-						<g transform="translate(62517.5, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
+						<g transform="translate(71884.75, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
 								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62517.5, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+						<g transform="translate(71884.75, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
@@ -11722,7 +11753,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(62517.5, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+						<g transform="translate(71884.75, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
@@ -11734,16 +11765,16 @@
 					</g>
 					<g data-name="StudyRecruitScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="27641.5" y="2511.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M27641.5 2542.5 L27955.5 2542.5" fill="none" data-name="StudyRecruitScreen"></path>
+							<rect x="29264.5" y="2571.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
+							<path d="M29264.5 2602.5 L29578.5 2602.5" fill="none" data-name="StudyRecruitScreen"></path>
 						</g>
-						<g transform="translate(27641.5, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
+						<g transform="translate(29264.5, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
 								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27641.5, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
+						<g transform="translate(29264.5, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
@@ -11755,23 +11786,23 @@
 					</g>
 					<g data-name="InviteCodeFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
-							<rect x="78009.5" y="575.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
-							<path d="M78009.5 606.5 L78447.5 606.5" fill="none" data-name="InviteCodeFormView"></path>
-							<path d="M78009.5 637.5 L78447.5 637.5" fill="none" data-name="InviteCodeFormView"></path>
+							<rect x="79851.8" y="575.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
+							<path d="M79851.8 606.5 L80289.8 606.5" fill="none" data-name="InviteCodeFormView"></path>
+							<path d="M79851.8 637.5 L80289.8 637.5" fill="none" data-name="InviteCodeFormView"></path>
 						</g>
-						<g transform="translate(78009.5, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
+						<g transform="translate(79851.75, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
 								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78009.5, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+						<g transform="translate(79851.75, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78009.5, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+						<g transform="translate(79851.75, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
@@ -11781,17 +11812,17 @@
 					</g>
 					<g data-name="InviteCodeFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="76174.5" y="1023.5" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M76174.5 1054.5 L76841.5 1054.5" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M76174.5 1280.5 L76841.5 1280.5" fill="none" data-name="InviteCodeFormViewModel"></path>
+							<rect x="71882.0" y="1023.5" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
+							<path d="M71882.0 1054.5 L72549.0 1054.5" fill="none" data-name="InviteCodeFormViewModel"></path>
+							<path d="M71882.0 1280.5 L72549.0 1280.5" fill="none" data-name="InviteCodeFormViewModel"></path>
 						</g>
-						<g transform="translate(76174.5, 1023.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
+						<g transform="translate(71882, 1023.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
 								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76174.5, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+						<g transform="translate(71882, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
@@ -11810,7 +11841,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(76174.5, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+						<g transform="translate(71882, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
@@ -11825,17 +11856,17 @@
 					</g>
 					<g data-name="StudyInvitesTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="65080.5" y="45.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M65080.5 76.0 L65646.5 76.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M65080.5 182.0 L65646.5 182.0" fill="none" data-name="StudyInvitesTable"></path>
+							<rect x="77337.3" y="45.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
+							<path d="M77337.3 76.0 L77903.3 76.0" fill="none" data-name="StudyInvitesTable"></path>
+							<path d="M77337.3 182.0 L77903.3 182.0" fill="none" data-name="StudyInvitesTable"></path>
 						</g>
-						<g transform="translate(65080.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
+						<g transform="translate(77337.25, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
 								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65080.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+						<g transform="translate(77337.25, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
@@ -11846,7 +11877,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(65080.5, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+						<g transform="translate(77337.25, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
@@ -11856,9 +11887,9 @@
 					</g>
 					<g data-name="void Function(StudyInvite)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="64884.3" y="614.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
+							<rect x="76825.8" y="614.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(64884.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
+						<g transform="translate(76825.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
 								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
 								
@@ -11867,9 +11898,9 @@
 					</g>
 					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="65146.3" y="614.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
+							<rect x="77087.8" y="614.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(65146.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+						<g transform="translate(77087.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
 								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
 								
@@ -11878,9 +11909,9 @@
 					</g>
 					<g data-name="Intervention? Function(String)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="65606.3" y="614.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
+							<rect x="77547.8" y="614.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
 						</g>
-						<g transform="translate(65606.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
+						<g transform="translate(77547.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
 								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
 								
@@ -11889,9 +11920,9 @@
 					</g>
 					<g data-name="int Function(StudyInvite)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="65897.3" y="614.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
+							<rect x="77838.8" y="614.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(65897.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
+						<g transform="translate(77838.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
 								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
 								
@@ -11900,16 +11931,16 @@
 					</g>
 					<g data-name="PublishSuccessDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
-							<rect x="27995.5" y="2534.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
-							<path d="M27995.5 2565.0 L28186.5 2565.0" fill="none" data-name="PublishSuccessDialog"></path>
+							<rect x="29618.5" y="2594.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
+							<path d="M29618.5 2625.0 L29809.5 2625.0" fill="none" data-name="PublishSuccessDialog"></path>
 						</g>
-						<g transform="translate(27995.5, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
+						<g transform="translate(29618.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
 								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27995.5, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
+						<g transform="translate(29618.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
 								
@@ -11918,16 +11949,16 @@
 					</g>
 					<g data-name="PublishDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
-							<rect x="29405.5" y="2534.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
-							<path d="M29405.5 2565.0 L29541.5 2565.0" fill="none" data-name="PublishDialog"></path>
+							<rect x="31053.0" y="2594.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
+							<path d="M31053.0 2625.0 L31189.0 2625.0" fill="none" data-name="PublishDialog"></path>
 						</g>
-						<g transform="translate(29405.5, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
+						<g transform="translate(31053, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29405.5, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
+						<g transform="translate(31053, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
 								
@@ -11936,16 +11967,16 @@
 					</g>
 					<g data-name="PublishConfirmationDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
-							<rect x="32360.8" y="2534.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
-							<path d="M32360.8 2565.0 L32584.8 2565.0" fill="none" data-name="PublishConfirmationDialog"></path>
+							<rect x="33898.3" y="2594.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
+							<path d="M33898.3 2625.0 L34122.3 2625.0" fill="none" data-name="PublishConfirmationDialog"></path>
 						</g>
-						<g transform="translate(32360.75, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
+						<g transform="translate(33898.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
 								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32360.75, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
+						<g transform="translate(33898.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
 								
@@ -11954,17 +11985,17 @@
 					</g>
 					<g data-name="FrameControlsWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
-							<rect x="18103.0" y="3662.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
-							<path d="M18103.0 3693.0 L18394.0 3693.0" fill="none" data-name="FrameControlsWidget"></path>
-							<path d="M18103.0 3754.0 L18394.0 3754.0" fill="none" data-name="FrameControlsWidget"></path>
+							<rect x="18530.8" y="3782.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
+							<path d="M18530.8 3813.0 L18821.8 3813.0" fill="none" data-name="FrameControlsWidget"></path>
+							<path d="M18530.8 3874.0 L18821.8 3874.0" fill="none" data-name="FrameControlsWidget"></path>
 						</g>
-						<g transform="translate(18103, 3662)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
+						<g transform="translate(18530.75, 3782)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
 								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18103, 3693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+						<g transform="translate(18530.75, 3813)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
@@ -11972,7 +12003,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(18103, 3754)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+						<g transform="translate(18530.75, 3874)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
 								
@@ -11981,16 +12012,16 @@
 					</g>
 					<g data-name="IStudyStatusBadgeViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
-							<rect x="33983.3" y="2526.5" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
-							<path d="M33983.3 2557.5 L34268.3 2557.5" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
+							<rect x="35728.3" y="2586.5" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
+							<path d="M35728.3 2617.5 L36013.3 2617.5" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
 						</g>
-						<g transform="translate(33983.25, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
+						<g transform="translate(35728.25, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
 								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33983.25, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
+						<g transform="translate(35728.25, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
@@ -12000,9 +12031,9 @@
 					</g>
 					<g data-name="Participation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="44079.3" y="3365.0" height="31.0" width="114.0" data-name="Participation"></rect>
+							<rect x="37786.3" y="3485.0" height="31.0" width="114.0" data-name="Participation"></rect>
 						</g>
-						<g transform="translate(44079.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
+						<g transform="translate(37786.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
 								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
 								
@@ -12011,9 +12042,9 @@
 					</g>
 					<g data-name="StudyStatus">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
-							<rect x="42606.3" y="3365.0" height="31.0" width="111.0" data-name="StudyStatus"></rect>
+							<rect x="35805.3" y="3485.0" height="31.0" width="111.0" data-name="StudyStatus"></rect>
 						</g>
-						<g transform="translate(42606.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
+						<g transform="translate(35805.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
 								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
 								
@@ -12022,17 +12053,17 @@
 					</g>
 					<g data-name="StudyStatusBadge">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
-							<rect x="34308.3" y="2488.5" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
-							<path d="M34308.3 2519.5 L34549.3 2519.5" fill="none" data-name="StudyStatusBadge"></path>
-							<path d="M34308.3 2610.5 L34549.3 2610.5" fill="none" data-name="StudyStatusBadge"></path>
+							<rect x="36096.3" y="2548.5" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
+							<path d="M36096.3 2579.5 L36337.3 2579.5" fill="none" data-name="StudyStatusBadge"></path>
+							<path d="M36096.3 2670.5 L36337.3 2670.5" fill="none" data-name="StudyStatusBadge"></path>
 						</g>
-						<g transform="translate(34308.25, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
+						<g transform="translate(36096.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
 								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34308.25, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+						<g transform="translate(36096.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
@@ -12042,7 +12073,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(34308.25, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+						<g transform="translate(36096.25, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
 								
@@ -12051,17 +12082,17 @@
 					</g>
 					<g data-name="RouteInformation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
-							<rect x="42906.3" y="3311.5" height="138.0" width="152.0" data-name="RouteInformation"></rect>
-							<path d="M42906.3 3342.5 L43058.3 3342.5" fill="none" data-name="RouteInformation"></path>
-							<path d="M42906.3 3418.5 L43058.3 3418.5" fill="none" data-name="RouteInformation"></path>
+							<rect x="35956.3" y="3431.5" height="138.0" width="152.0" data-name="RouteInformation"></rect>
+							<path d="M35956.3 3462.5 L36108.3 3462.5" fill="none" data-name="RouteInformation"></path>
+							<path d="M35956.3 3538.5 L36108.3 3538.5" fill="none" data-name="RouteInformation"></path>
 						</g>
-						<g transform="translate(42906.25, 3311.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
+						<g transform="translate(35956.25, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
 								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42906.25, 3342.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+						<g transform="translate(35956.25, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
 								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
@@ -12070,7 +12101,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(42906.25, 3418.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+						<g transform="translate(35956.25, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
 								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
 								
@@ -12079,17 +12110,17 @@
 					</g>
 					<g data-name="PlatformController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
-							<rect x="34589.3" y="2436.0" height="258.0" width="302.0" data-name="PlatformController"></rect>
-							<path d="M34589.3 2467.0 L34891.3 2467.0" fill="none" data-name="PlatformController"></path>
-							<path d="M34589.3 2558.0 L34891.3 2558.0" fill="none" data-name="PlatformController"></path>
+							<rect x="36417.5" y="2496.0" height="258.0" width="302.0" data-name="PlatformController"></rect>
+							<path d="M36417.5 2527.0 L36719.5 2527.0" fill="none" data-name="PlatformController"></path>
+							<path d="M36417.5 2618.0 L36719.5 2618.0" fill="none" data-name="PlatformController"></path>
 						</g>
-						<g transform="translate(34589.25, 2436)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
+						<g transform="translate(36417.5, 2496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
 								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34589.25, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+						<g transform="translate(36417.5, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
 								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
@@ -12099,7 +12130,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(34589.25, 2558)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+						<g transform="translate(36417.5, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
 								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
@@ -12115,23 +12146,23 @@
 					</g>
 					<g data-name="WebController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
-							<rect x="43381.3" y="3281.5" height="198.0" width="273.0" data-name="WebController"></rect>
-							<path d="M43381.3 3312.5 L43654.3 3312.5" fill="none" data-name="WebController"></path>
-							<path d="M43381.3 3343.5 L43654.3 3343.5" fill="none" data-name="WebController"></path>
+							<rect x="36734.3" y="3401.5" height="198.0" width="273.0" data-name="WebController"></rect>
+							<path d="M36734.3 3432.5 L37007.3 3432.5" fill="none" data-name="WebController"></path>
+							<path d="M36734.3 3463.5 L37007.3 3463.5" fill="none" data-name="WebController"></path>
 						</g>
-						<g transform="translate(43381.25, 3281.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
+						<g transform="translate(36734.25, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
 								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43381.25, 3312.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+						<g transform="translate(36734.25, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43381.25, 3343.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+						<g transform="translate(36734.25, 3463.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
@@ -12147,9 +12178,9 @@
 					</g>
 					<g data-name="IFrameElement">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
-							<rect x="43450.3" y="3708.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
+							<rect x="36803.3" y="3828.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
 						</g>
-						<g transform="translate(43450.25, 3708)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
+						<g transform="translate(36803.25, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
 								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
 								
@@ -12158,16 +12189,16 @@
 					</g>
 					<g data-name="MobileController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
-							<rect x="43694.3" y="3297.0" height="167.0" width="191.0" data-name="MobileController"></rect>
-							<path d="M43694.3 3328.0 L43885.3 3328.0" fill="none" data-name="MobileController"></path>
+							<rect x="37047.3" y="3417.0" height="167.0" width="191.0" data-name="MobileController"></rect>
+							<path d="M37047.3 3448.0 L37238.3 3448.0" fill="none" data-name="MobileController"></path>
 						</g>
-						<g transform="translate(43694.25, 3297)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
+						<g transform="translate(37047.25, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
 								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43694.25, 3328)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
+						<g transform="translate(37047.25, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
 								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
@@ -12183,17 +12214,17 @@
 					</g>
 					<g data-name="StudyController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
-							<rect x="61715.3" y="2451.0" height="228.0" width="573.0" data-name="StudyController"></rect>
-							<path d="M61715.3 2482.0 L62288.3 2482.0" fill="none" data-name="StudyController"></path>
-							<path d="M61715.3 2543.0 L62288.3 2543.0" fill="none" data-name="StudyController"></path>
+							<rect x="70981.3" y="2511.0" height="228.0" width="573.0" data-name="StudyController"></rect>
+							<path d="M70981.3 2542.0 L71554.3 2542.0" fill="none" data-name="StudyController"></path>
+							<path d="M70981.3 2603.0 L71554.3 2603.0" fill="none" data-name="StudyController"></path>
 						</g>
-						<g transform="translate(61715.25, 2451)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
+						<g transform="translate(70981.25, 2511)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
 								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61715.25, 2482)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+						<g transform="translate(70981.25, 2542)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
@@ -12201,7 +12232,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(61715.25, 2543)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+						<g transform="translate(70981.25, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
@@ -12217,16 +12248,16 @@
 					</g>
 					<g data-name="IStudyNavViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
-							<rect x="35902.8" y="2496.5" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
-							<path d="M35902.8 2527.5 L36143.8 2527.5" fill="none" data-name="IStudyNavViewModel"></path>
+							<rect x="37026.5" y="2556.5" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
+							<path d="M37026.5 2587.5 L37267.5 2587.5" fill="none" data-name="IStudyNavViewModel"></path>
 						</g>
-						<g transform="translate(35902.75, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
+						<g transform="translate(37026.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
 								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35902.75, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
+						<g transform="translate(37026.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
@@ -12240,16 +12271,16 @@
 					</g>
 					<g data-name="StudyNav">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
-							<rect x="76906.3" y="68.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
-							<path d="M76906.3 99.0 L77139.3 99.0" fill="none" data-name="StudyNav"></path>
+							<rect x="79062.8" y="68.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
+							<path d="M79062.8 99.0 L79295.8 99.0" fill="none" data-name="StudyNav"></path>
 						</g>
-						<g transform="translate(76906.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
+						<g transform="translate(79062.75, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
 								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76906.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
+						<g transform="translate(79062.75, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
@@ -12263,16 +12294,16 @@
 					</g>
 					<g data-name="StudyDesignNav">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
-							<rect x="77179.3" y="68.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
-							<path d="M77179.3 99.0 L77467.3 99.0" fill="none" data-name="StudyDesignNav"></path>
+							<rect x="79335.8" y="68.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
+							<path d="M79335.8 99.0 L79623.8 99.0" fill="none" data-name="StudyDesignNav"></path>
 						</g>
-						<g transform="translate(77179.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
+						<g transform="translate(79335.75, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
 								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77179.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
+						<g transform="translate(79335.75, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
@@ -12286,17 +12317,17 @@
 					</g>
 					<g data-name="StudyParticipationBadge">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
-							<rect x="36183.8" y="2496.0" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
-							<path d="M36183.8 2527.0 L36414.8 2527.0" fill="none" data-name="StudyParticipationBadge"></path>
-							<path d="M36183.8 2603.0 L36414.8 2603.0" fill="none" data-name="StudyParticipationBadge"></path>
+							<rect x="37796.8" y="2556.0" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
+							<path d="M37796.8 2587.0 L38027.8 2587.0" fill="none" data-name="StudyParticipationBadge"></path>
+							<path d="M37796.8 2663.0 L38027.8 2663.0" fill="none" data-name="StudyParticipationBadge"></path>
 						</g>
-						<g transform="translate(36183.75, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
+						<g transform="translate(37796.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
 								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36183.75, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+						<g transform="translate(37796.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
@@ -12305,7 +12336,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(36183.75, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+						<g transform="translate(37796.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
 								
@@ -12314,16 +12345,16 @@
 					</g>
 					<g data-name="IStudyRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="74947.5" y="3342.0" height="77.0" width="251.0" data-name="IStudyRepository"></rect>
-							<path d="M74947.5 3373.0 L75198.5 3373.0" fill="none" data-name="IStudyRepository"></path>
+							<rect x="71323.5" y="3462.0" height="77.0" width="251.0" data-name="IStudyRepository"></rect>
+							<path d="M71323.5 3493.0 L71574.5 3493.0" fill="none" data-name="IStudyRepository"></path>
 						</g>
-						<g transform="translate(74947.5, 3342)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
+						<g transform="translate(71323.5, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
 								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74947.5, 3373)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyRepository">
+						<g transform="translate(71323.5, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyRepository">+dynamic launch()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IStudyRepository">+dynamic deleteParticipants()</text>
@@ -12333,16 +12364,16 @@
 					</g>
 					<g data-name="PreviewFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
-							<rect x="53986.5" y="1166.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
-							<path d="M53986.5 1197.5 L54277.5 1197.5" fill="none" data-name="PreviewFrame"></path>
+							<rect x="59870.3" y="1166.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
+							<path d="M59870.3 1197.5 L60161.3 1197.5" fill="none" data-name="PreviewFrame"></path>
 						</g>
-						<g transform="translate(53986.5, 1166.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
+						<g transform="translate(59870.25, 1166.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
 								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53986.5, 1197.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
+						<g transform="translate(59870.25, 1197.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
@@ -12353,16 +12384,16 @@
 					</g>
 					<g data-name="IStudyAppBarViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
-							<rect x="43098.3" y="3334.5" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
-							<path d="M43098.3 3365.5 L43341.3 3365.5" fill="none" data-name="IStudyAppBarViewModel"></path>
+							<rect x="36388.8" y="3454.5" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
+							<path d="M36388.8 3485.5 L36631.8 3485.5" fill="none" data-name="IStudyAppBarViewModel"></path>
 						</g>
-						<g transform="translate(43098.25, 3334.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
+						<g transform="translate(36388.75, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
 								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43098.25, 3365.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
+						<g transform="translate(36388.75, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
@@ -12373,16 +12404,16 @@
 					</g>
 					<g data-name="StudyScaffold">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
-							<rect x="56803.5" y="1091.5" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
-							<path d="M56803.5 1122.5 L57138.5 1122.5" fill="none" data-name="StudyScaffold"></path>
+							<rect x="62158.8" y="1091.5" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
+							<path d="M62158.8 1122.5 L62493.8 1122.5" fill="none" data-name="StudyScaffold"></path>
 						</g>
-						<g transform="translate(56803.5, 1091.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
+						<g transform="translate(62158.75, 1091.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
 								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56803.5, 1122.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
+						<g transform="translate(62158.75, 1122.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
@@ -12403,24 +12434,24 @@
 					</g>
 					<g data-name="WebFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
-							<rect x="77507.3" y="82.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
-							<path d="M77507.3 113.5 L77676.3 113.5" fill="none" data-name="WebFrame"></path>
-							<path d="M77507.3 159.5 L77676.3 159.5" fill="none" data-name="WebFrame"></path>
+							<rect x="79663.8" y="82.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
+							<path d="M79663.8 113.5 L79832.8 113.5" fill="none" data-name="WebFrame"></path>
+							<path d="M79663.8 159.5 L79832.8 159.5" fill="none" data-name="WebFrame"></path>
 						</g>
-						<g transform="translate(77507.25, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
+						<g transform="translate(79663.75, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
 								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77507.25, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+						<g transform="translate(79663.75, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77507.25, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+						<g transform="translate(79663.75, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
 								
@@ -12429,16 +12460,16 @@
 					</g>
 					<g data-name="DisabledFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
-							<rect x="77716.3" y="105.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
-							<path d="M77716.3 136.5 L77852.3 136.5" fill="none" data-name="DisabledFrame"></path>
+							<rect x="79872.8" y="105.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
+							<path d="M79872.8 136.5 L80008.8 136.5" fill="none" data-name="DisabledFrame"></path>
 						</g>
-						<g transform="translate(77716.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
+						<g transform="translate(79872.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77716.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
+						<g transform="translate(79872.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
 								
@@ -12447,17 +12478,17 @@
 					</g>
 					<g data-name="PhoneContainer">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
-							<rect x="36454.8" y="2458.5" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
-							<path d="M36454.8 2489.5 L36781.8 2489.5" fill="none" data-name="PhoneContainer"></path>
-							<path d="M36454.8 2640.5 L36781.8 2640.5" fill="none" data-name="PhoneContainer"></path>
+							<rect x="38067.8" y="2518.5" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
+							<path d="M38067.8 2549.5 L38394.8 2549.5" fill="none" data-name="PhoneContainer"></path>
+							<path d="M38067.8 2700.5 L38394.8 2700.5" fill="none" data-name="PhoneContainer"></path>
 						</g>
-						<g transform="translate(36454.75, 2458.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
+						<g transform="translate(38067.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
 								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36454.75, 2489.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+						<g transform="translate(38067.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
 								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
@@ -12471,7 +12502,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(36454.75, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+						<g transform="translate(38067.75, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
 								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
 								
@@ -12480,16 +12511,16 @@
 					</g>
 					<g data-name="MobileFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
-							<rect x="77892.3" y="105.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
-							<path d="M77892.3 136.5 L78028.3 136.5" fill="none" data-name="MobileFrame"></path>
+							<rect x="80048.8" y="105.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
+							<path d="M80048.8 136.5 L80184.8 136.5" fill="none" data-name="MobileFrame"></path>
 						</g>
-						<g transform="translate(77892.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
+						<g transform="translate(80048.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77892.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
+						<g transform="translate(80048.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
 								
@@ -12498,16 +12529,16 @@
 					</g>
 					<g data-name="DesktopFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
-							<rect x="78068.3" y="105.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
-							<path d="M78068.3 136.5 L78204.3 136.5" fill="none" data-name="DesktopFrame"></path>
+							<rect x="80224.8" y="105.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
+							<path d="M80224.8 136.5 L80360.8 136.5" fill="none" data-name="DesktopFrame"></path>
 						</g>
-						<g transform="translate(78068.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
+						<g transform="translate(80224.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78068.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
+						<g transform="translate(80224.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
 								
@@ -12516,23 +12547,23 @@
 					</g>
 					<g data-name="StudyTestScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
-							<rect x="32624.8" y="2488.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
-							<path d="M32624.8 2519.5 L32824.8 2519.5" fill="none" data-name="StudyTestScreen"></path>
-							<path d="M32624.8 2550.5 L32824.8 2550.5" fill="none" data-name="StudyTestScreen"></path>
+							<rect x="34162.3" y="2548.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
+							<path d="M34162.3 2579.5 L34362.3 2579.5" fill="none" data-name="StudyTestScreen"></path>
+							<path d="M34162.3 2610.5 L34362.3 2610.5" fill="none" data-name="StudyTestScreen"></path>
 						</g>
-						<g transform="translate(32624.75, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
+						<g transform="translate(34162.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
 								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32624.75, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+						<g transform="translate(34162.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32624.75, 2550.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+						<g transform="translate(34162.25, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
@@ -12545,17 +12576,17 @@
 					</g>
 					<g data-name="StudySettingsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="74439.8" y="2436.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M74439.8 2467.0 L74918.8 2467.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M74439.8 2603.0 L74918.8 2603.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+							<rect x="67994.0" y="2496.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
+							<path d="M67994.0 2527.0 L68473.0 2527.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+							<path d="M67994.0 2663.0 L68473.0 2663.0" fill="none" data-name="StudySettingsFormViewModel"></path>
 						</g>
-						<g transform="translate(74439.75, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
+						<g transform="translate(67994, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74439.75, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+						<g transform="translate(67994, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
@@ -12568,7 +12599,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(74439.75, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+						<g transform="translate(67994, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
@@ -12581,16 +12612,16 @@
 					</g>
 					<g data-name="StudySettingsDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="32864.8" y="2534.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M32864.8 2565.0 L33039.8 2565.0" fill="none" data-name="StudySettingsDialog"></path>
+							<rect x="34402.3" y="2594.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
+							<path d="M34402.3 2625.0 L34577.3 2625.0" fill="none" data-name="StudySettingsDialog"></path>
 						</g>
-						<g transform="translate(32864.75, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
+						<g transform="translate(34402.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
 								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32864.75, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
+						<g transform="translate(34402.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
 								
@@ -12599,16 +12630,16 @@
 					</g>
 					<g data-name="StudyTestController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
-							<rect x="64199.3" y="3685.0" height="77.0" width="282.0" data-name="StudyTestController"></rect>
-							<path d="M64199.3 3716.0 L64481.3 3716.0" fill="none" data-name="StudyTestController"></path>
+							<rect x="70376.3" y="3805.0" height="77.0" width="282.0" data-name="StudyTestController"></rect>
+							<path d="M70376.3 3836.0 L70658.3 3836.0" fill="none" data-name="StudyTestController"></path>
 						</g>
-						<g transform="translate(64199.25, 3685)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
+						<g transform="translate(70376.25, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
 								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64199.25, 3716)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
+						<g transform="translate(70376.25, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
@@ -12618,16 +12649,16 @@
 					</g>
 					<g data-name="TestAppRoutes">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
-							<rect x="78244.3" y="68.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
-							<path d="M78244.3 99.0 L78504.3 99.0" fill="none" data-name="TestAppRoutes"></path>
+							<rect x="80400.8" y="68.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
+							<path d="M80400.8 99.0 L80660.8 99.0" fill="none" data-name="TestAppRoutes"></path>
 						</g>
-						<g transform="translate(78244.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
+						<g transform="translate(80400.75, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
 								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78244.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
+						<g transform="translate(80400.75, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
 								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
@@ -12641,17 +12672,17 @@
 					</g>
 					<g data-name="DrawerEntry">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
-							<rect x="60039.8" y="1113.5" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
-							<path d="M60039.8 1144.5 L60484.8 1144.5" fill="none" data-name="DrawerEntry"></path>
-							<path d="M60039.8 1280.5 L60484.8 1280.5" fill="none" data-name="DrawerEntry"></path>
+							<rect x="63467.5" y="1113.5" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
+							<path d="M63467.5 1144.5 L63912.5 1144.5" fill="none" data-name="DrawerEntry"></path>
+							<path d="M63467.5 1280.5 L63912.5 1280.5" fill="none" data-name="DrawerEntry"></path>
 						</g>
-						<g transform="translate(60039.75, 1113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
+						<g transform="translate(63467.5, 1113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
 								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60039.75, 1144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+						<g transform="translate(63467.5, 1144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
@@ -12664,7 +12695,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(60039.75, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+						<g transform="translate(63467.5, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
 								
@@ -12673,9 +12704,9 @@
 					</g>
 					<g data-name="String Function()">
 						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
-							<rect x="60072.8" y="1682.0" height="31.0" width="147.0" data-name="String Function()"></rect>
+							<rect x="62932.0" y="1682.0" height="31.0" width="147.0" data-name="String Function()"></rect>
 						</g>
-						<g transform="translate(60072.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
+						<g transform="translate(62932, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
 								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
 								
@@ -12684,9 +12715,9 @@
 					</g>
 					<g data-name="String Function()?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
-							<rect x="60557.0" y="1682.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
+							<rect x="63200.8" y="1682.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
 						</g>
-						<g transform="translate(60557, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
+						<g transform="translate(63200.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
 								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
 								
@@ -12695,9 +12726,9 @@
 					</g>
 					<g data-name="void Function(BuildContext, WidgetRef)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
-							<rect x="60754.0" y="1682.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
+							<rect x="63397.8" y="1682.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
 						</g>
-						<g transform="translate(60754, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
+						<g transform="translate(63397.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
 								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
 								
@@ -12706,24 +12737,24 @@
 					</g>
 					<g data-name="GoRouterDrawerEntry">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
-							<rect x="61130.0" y="1643.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
-							<path d="M61130.0 1674.5 L61394.0 1674.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-							<path d="M61130.0 1720.5 L61394.0 1720.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+							<rect x="63871.3" y="1643.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
+							<path d="M63871.3 1674.5 L64135.3 1674.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+							<path d="M63871.3 1720.5 L64135.3 1720.5" fill="none" data-name="GoRouterDrawerEntry"></path>
 						</g>
-						<g transform="translate(61130, 1643.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
+						<g transform="translate(63871.25, 1643.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
 								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61130, 1674.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+						<g transform="translate(63871.25, 1674.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61130, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+						<g transform="translate(63871.25, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
 								
@@ -12732,16 +12763,16 @@
 					</g>
 					<g data-name="AppDrawer">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
-							<rect x="78544.3" y="53.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
-							<path d="M78544.3 84.0 L78813.3 84.0" fill="none" data-name="AppDrawer"></path>
+							<rect x="80700.8" y="53.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
+							<path d="M80700.8 84.0 L80969.8 84.0" fill="none" data-name="AppDrawer"></path>
 						</g>
-						<g transform="translate(78544.25, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
+						<g transform="translate(80700.75, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
 								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78544.25, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
+						<g transform="translate(80700.75, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
@@ -12757,16 +12788,16 @@
 					</g>
 					<g data-name="StudyAnalyzeScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
-							<rect x="33079.8" y="2526.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
-							<path d="M33079.8 2557.5 L33259.8 2557.5" fill="none" data-name="StudyAnalyzeScreen"></path>
+							<rect x="34617.3" y="2586.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
+							<path d="M34617.3 2617.5 L34797.3 2617.5" fill="none" data-name="StudyAnalyzeScreen"></path>
 						</g>
-						<g transform="translate(33079.75, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
+						<g transform="translate(34617.25, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
 								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33079.75, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
+						<g transform="translate(34617.25, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
@@ -12776,16 +12807,16 @@
 					</g>
 					<g data-name="StudyAnalyzeController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
-							<rect x="64380.3" y="1181.5" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
-							<path d="M64380.3 1212.5 L64581.3 1212.5" fill="none" data-name="StudyAnalyzeController"></path>
+							<rect x="72589.0" y="1181.5" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
+							<path d="M72589.0 1212.5 L72790.0 1212.5" fill="none" data-name="StudyAnalyzeController"></path>
 						</g>
-						<g transform="translate(64380.25, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
+						<g transform="translate(72589, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
 								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64380.25, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
+						<g transform="translate(72589, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
 								
@@ -12794,16 +12825,16 @@
 					</g>
 					<g data-name="StudyDesignInterventionsFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="40735.3" y="3349.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M40735.3 3380.5 L41031.3 3380.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
+							<rect x="33600.5" y="3469.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
+							<path d="M33600.5 3500.5 L33896.5 3500.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
 						</g>
-						<g transform="translate(40735.25, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
+						<g transform="translate(33600.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
 								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40735.25, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
+						<g transform="translate(33600.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
 								
@@ -12812,16 +12843,16 @@
 					</g>
 					<g data-name="StudyDesignPageWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="33299.8" y="2534.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M33299.8 2565.0 L33511.8 2565.0" fill="none" data-name="StudyDesignPageWidget"></path>
+							<rect x="34922.8" y="2594.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
+							<path d="M34922.8 2625.0 L35134.8 2625.0" fill="none" data-name="StudyDesignPageWidget"></path>
 						</g>
-						<g transform="translate(33299.75, 2534)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
+						<g transform="translate(34922.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
 								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33299.75, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
+						<g transform="translate(34922.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
 								
@@ -12830,16 +12861,16 @@
 					</g>
 					<g data-name="InterventionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="37290.8" y="1666.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M37290.8 1697.5 L37665.8 1697.5" fill="none" data-name="InterventionFormView"></path>
+							<rect x="29776.5" y="1666.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
+							<path d="M29776.5 1697.5 L30151.5 1697.5" fill="none" data-name="InterventionFormView"></path>
 						</g>
-						<g transform="translate(37290.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
+						<g transform="translate(29776.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
 								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37290.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
+						<g transform="translate(29776.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
 								
@@ -12848,17 +12879,17 @@
 					</g>
 					<g data-name="InterventionFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="62328.3" y="2331.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M62328.3 2362.0 L63183.3 2362.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M62328.3 2588.0 L63183.3 2588.0" fill="none" data-name="InterventionFormViewModel"></path>
+							<rect x="57022.8" y="2391.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
+							<path d="M57022.8 2422.0 L57877.8 2422.0" fill="none" data-name="InterventionFormViewModel"></path>
+							<path d="M57022.8 2648.0 L57877.8 2648.0" fill="none" data-name="InterventionFormViewModel"></path>
 						</g>
-						<g transform="translate(62328.25, 2331)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
+						<g transform="translate(57022.75, 2391)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
 								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62328.25, 2362)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+						<g transform="translate(57022.75, 2422)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
@@ -12877,7 +12908,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(62328.25, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+						<g transform="translate(57022.75, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
@@ -12898,23 +12929,23 @@
 					</g>
 					<g data-name="InterventionPreview">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="30319.3" y="1651.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M30319.3 1682.0 L30649.3 1682.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M30319.3 1713.0 L30649.3 1713.0" fill="none" data-name="InterventionPreview"></path>
+							<rect x="25984.5" y="1651.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
+							<path d="M25984.5 1682.0 L26314.5 1682.0" fill="none" data-name="InterventionPreview"></path>
+							<path d="M25984.5 1713.0 L26314.5 1713.0" fill="none" data-name="InterventionPreview"></path>
 						</g>
-						<g transform="translate(30319.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
+						<g transform="translate(25984.5, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
 								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30319.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+						<g transform="translate(25984.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30319.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+						<g transform="translate(25984.5, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
 								
@@ -12923,23 +12954,23 @@
 					</g>
 					<g data-name="StudyScheduleFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="78363.3" y="1158.5" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M78363.3 1189.5 L78722.3 1189.5" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M78363.3 1220.5 L78722.3 1220.5" fill="none" data-name="StudyScheduleFormView"></path>
+							<rect x="80205.5" y="1158.5" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
+							<path d="M80205.5 1189.5 L80564.5 1189.5" fill="none" data-name="StudyScheduleFormView"></path>
+							<path d="M80205.5 1220.5 L80564.5 1220.5" fill="none" data-name="StudyScheduleFormView"></path>
 						</g>
-						<g transform="translate(78363.25, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
+						<g transform="translate(80205.5, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
 								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78363.25, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+						<g transform="translate(80205.5, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78363.25, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+						<g transform="translate(80205.5, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
@@ -12949,17 +12980,17 @@
 					</g>
 					<g data-name="StudyScheduleControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="78163.8" y="1501.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M78163.8 1532.0 L78921.8 1532.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M78163.8 1833.0 L78921.8 1833.0" fill="none" data-name="StudyScheduleControls"></path>
+							<rect x="80006.0" y="1501.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
+							<path d="M80006.0 1532.0 L80764.0 1532.0" fill="none" data-name="StudyScheduleControls"></path>
+							<path d="M80006.0 1833.0 L80764.0 1833.0" fill="none" data-name="StudyScheduleControls"></path>
 						</g>
-						<g transform="translate(78163.75, 1501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
+						<g transform="translate(80006, 1501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
 								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78163.75, 1532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+						<g transform="translate(80006, 1532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
@@ -12983,7 +13014,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(78163.75, 1833)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+						<g transform="translate(80006, 1833)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
@@ -12994,17 +13025,17 @@
 					</g>
 					<g data-name="InterventionTaskFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="51881.0" y="2481.0" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M51881.0 2512.0 L52171.0 2512.0" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M51881.0 2603.0 L52171.0 2603.0" fill="none" data-name="InterventionTaskFormData"></path>
+							<rect x="55157.8" y="2541.0" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
+							<path d="M55157.8 2572.0 L55447.8 2572.0" fill="none" data-name="InterventionTaskFormData"></path>
+							<path d="M55157.8 2663.0 L55447.8 2663.0" fill="none" data-name="InterventionTaskFormData"></path>
 						</g>
-						<g transform="translate(51881, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
+						<g transform="translate(55157.75, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
 								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51881, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+						<g transform="translate(55157.75, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
@@ -13014,7 +13045,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(51881, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+						<g transform="translate(55157.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
@@ -13024,17 +13055,17 @@
 					</g>
 					<g data-name="IFormDataWithSchedule">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="52420.0" y="1613.5" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M52420.0 1644.5 L52718.0 1644.5" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M52420.0 1750.5 L52718.0 1750.5" fill="none" data-name="IFormDataWithSchedule"></path>
+							<rect x="55630.8" y="1613.5" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
+							<path d="M55630.8 1644.5 L55928.8 1644.5" fill="none" data-name="IFormDataWithSchedule"></path>
+							<path d="M55630.8 1750.5 L55928.8 1750.5" fill="none" data-name="IFormDataWithSchedule"></path>
 						</g>
-						<g transform="translate(52420, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
+						<g transform="translate(55630.75, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
 								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52420, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+						<g transform="translate(55630.75, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
@@ -13045,7 +13076,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(52420, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+						<g transform="translate(55630.75, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
 								
@@ -13054,17 +13085,17 @@
 					</g>
 					<g data-name="InterventionsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="70340.0" y="2376.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M70340.0 2407.0 L71179.0 2407.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M70340.0 2558.0 L71179.0 2558.0" fill="none" data-name="InterventionsFormViewModel"></path>
+							<rect x="67075.0" y="2436.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
+							<path d="M67075.0 2467.0 L67914.0 2467.0" fill="none" data-name="InterventionsFormViewModel"></path>
+							<path d="M67075.0 2618.0 L67914.0 2618.0" fill="none" data-name="InterventionsFormViewModel"></path>
 						</g>
-						<g transform="translate(70340, 2376)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
+						<g transform="translate(67075, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
 								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(70340, 2407)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+						<g transform="translate(67075, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
@@ -13078,7 +13109,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(70340, 2558)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+						<g transform="translate(67075, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
@@ -13098,17 +13129,17 @@
 					</g>
 					<g data-name="InterventionTaskFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="64723.3" y="2428.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M64723.3 2459.5 L65419.3 2459.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M64723.3 2640.5 L65419.3 2640.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<rect x="59862.0" y="2488.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
+							<path d="M59862.0 2519.5 L60558.0 2519.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<path d="M59862.0 2700.5 L60558.0 2700.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
 						</g>
-						<g transform="translate(64723.25, 2428.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
+						<g transform="translate(59862, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64723.25, 2459.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+						<g transform="translate(59862, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
@@ -13124,7 +13155,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(64723.25, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+						<g transform="translate(59862, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
@@ -13135,17 +13166,17 @@
 					</g>
 					<g data-name="WithScheduleControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="79369.3" y="1546.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M79369.3 1577.0 L79864.3 1577.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M79369.3 1803.0 L79864.3 1803.0" fill="none" data-name="WithScheduleControls"></path>
+							<rect x="81364.0" y="1546.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
+							<path d="M81364.0 1577.0 L81859.0 1577.0" fill="none" data-name="WithScheduleControls"></path>
+							<path d="M81364.0 1803.0 L81859.0 1803.0" fill="none" data-name="WithScheduleControls"></path>
 						</g>
-						<g transform="translate(79369.25, 1546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
+						<g transform="translate(81364, 1546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
 								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79369.25, 1577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+						<g transform="translate(81364, 1577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
@@ -13164,7 +13195,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(79369.25, 1803)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+						<g transform="translate(81364, 1803)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
@@ -13174,9 +13205,9 @@
 					</g>
 					<g data-name="PhaseSequence">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="69900.0" y="3708.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
+							<rect x="65353.5" y="3828.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
 						</g>
-						<g transform="translate(69900, 3708)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
+						<g transform="translate(65353.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
 								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
 								
@@ -13185,17 +13216,17 @@
 					</g>
 					<g data-name="InterventionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="41805.0" y="1598.5" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M41805.0 1629.5 L42187.0 1629.5" fill="none" data-name="InterventionFormData"></path>
-							<path d="M41805.0 1750.5 L42187.0 1750.5" fill="none" data-name="InterventionFormData"></path>
+							<rect x="43888.3" y="1598.5" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
+							<path d="M43888.3 1629.5 L44270.3 1629.5" fill="none" data-name="InterventionFormData"></path>
+							<path d="M43888.3 1750.5 L44270.3 1750.5" fill="none" data-name="InterventionFormData"></path>
 						</g>
-						<g transform="translate(41805, 1598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
+						<g transform="translate(43888.25, 1598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
 								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41805, 1629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+						<g transform="translate(43888.25, 1629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
@@ -13207,7 +13238,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(41805, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+						<g transform="translate(43888.25, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
@@ -13217,17 +13248,17 @@
 					</g>
 					<g data-name="StudyScheduleFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="49410.3" y="3281.5" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M49410.3 3312.5 L49706.3 3312.5" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M49410.3 3418.5 L49706.3 3418.5" fill="none" data-name="StudyScheduleFormData"></path>
+							<rect x="45462.8" y="3401.5" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
+							<path d="M45462.8 3432.5 L45758.8 3432.5" fill="none" data-name="StudyScheduleFormData"></path>
+							<path d="M45462.8 3538.5 L45758.8 3538.5" fill="none" data-name="StudyScheduleFormData"></path>
 						</g>
-						<g transform="translate(49410.25, 3281.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
+						<g transform="translate(45462.75, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
 								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49410.25, 3312.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+						<g transform="translate(45462.75, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
@@ -13238,7 +13269,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(49410.25, 3418.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+						<g transform="translate(45462.75, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
@@ -13249,16 +13280,16 @@
 					</g>
 					<g data-name="IStudyFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="45564.8" y="1666.5" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M45564.8 1697.5 L45707.8 1697.5" fill="none" data-name="IStudyFormData"></path>
+							<rect x="47808.5" y="1666.5" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
+							<path d="M47808.5 1697.5 L47951.5 1697.5" fill="none" data-name="IStudyFormData"></path>
 						</g>
-						<g transform="translate(45564.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
+						<g transform="translate(47808.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
 								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45564.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
+						<g transform="translate(47808.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
 								
@@ -13267,16 +13298,16 @@
 					</g>
 					<g data-name="InterventionTaskFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="40147.0" y="1666.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M40147.0 1697.5 L40560.0 1697.5" fill="none" data-name="InterventionTaskFormView"></path>
+							<rect x="40455.8" y="1666.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
+							<path d="M40455.8 1697.5 L40868.8 1697.5" fill="none" data-name="InterventionTaskFormView"></path>
 						</g>
-						<g transform="translate(40147, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
+						<g transform="translate(40455.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
 								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40147, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
+						<g transform="translate(40455.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
 								
@@ -13285,17 +13316,17 @@
 					</g>
 					<g data-name="InterventionsFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="43640.3" y="2496.0" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M43640.3 2527.0 L44034.3 2527.0" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M43640.3 2588.0 L44034.3 2588.0" fill="none" data-name="InterventionsFormData"></path>
+							<rect x="45675.8" y="2556.0" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
+							<path d="M45675.8 2587.0 L46069.8 2587.0" fill="none" data-name="InterventionsFormData"></path>
+							<path d="M45675.8 2648.0 L46069.8 2648.0" fill="none" data-name="InterventionsFormData"></path>
 						</g>
-						<g transform="translate(43640.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
+						<g transform="translate(45675.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
 								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43640.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+						<g transform="translate(45675.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
@@ -13303,7 +13334,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(43640.25, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+						<g transform="translate(45675.75, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
@@ -13313,16 +13344,16 @@
 					</g>
 					<g data-name="StudyDesignReportsFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="41071.3" y="3342.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M41071.3 3373.0 L41464.3 3373.0" fill="none" data-name="StudyDesignReportsFormView"></path>
+							<rect x="33936.5" y="3462.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
+							<path d="M33936.5 3493.0 L34329.5 3493.0" fill="none" data-name="StudyDesignReportsFormView"></path>
 						</g>
-						<g transform="translate(41071.25, 3342)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
+						<g transform="translate(33936.5, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
 								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41071.25, 3373)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
+						<g transform="translate(33936.5, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
@@ -13332,17 +13363,17 @@
 					</g>
 					<g data-name="ReportItemFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="42837.5" y="1628.5" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M42837.5 1659.5 L43151.5 1659.5" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M42837.5 1720.5 L43151.5 1720.5" fill="none" data-name="ReportItemFormData"></path>
+							<rect x="44731.3" y="1628.5" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
+							<path d="M44731.3 1659.5 L45045.3 1659.5" fill="none" data-name="ReportItemFormData"></path>
+							<path d="M44731.3 1720.5 L45045.3 1720.5" fill="none" data-name="ReportItemFormData"></path>
 						</g>
-						<g transform="translate(42837.5, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
+						<g transform="translate(44731.25, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
 								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42837.5, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+						<g transform="translate(44731.25, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
@@ -13350,7 +13381,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(42837.5, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+						<g transform="translate(44731.25, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
@@ -13360,9 +13391,9 @@
 					</g>
 					<g data-name="ReportSection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="42930.5" y="2549.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
+							<rect x="44824.3" y="2609.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
 						</g>
-						<g transform="translate(42930.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
+						<g transform="translate(44824.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
 								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
 								
@@ -13371,17 +13402,17 @@
 					</g>
 					<g data-name="DataReferenceEditor">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="44906.3" y="2496.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M44906.3 2527.0 L45615.3 2527.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M44906.3 2588.0 L45615.3 2588.0" fill="none" data-name="DataReferenceEditor"></path>
+							<rect x="46109.8" y="2556.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
+							<path d="M46109.8 2587.0 L46818.8 2587.0" fill="none" data-name="DataReferenceEditor"></path>
+							<path d="M46109.8 2648.0 L46818.8 2648.0" fill="none" data-name="DataReferenceEditor"></path>
 						</g>
-						<g transform="translate(44906.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
+						<g transform="translate(46109.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
 								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44906.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+						<g transform="translate(46109.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
 								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
@@ -13389,7 +13420,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(44906.25, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+						<g transform="translate(46109.75, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
 								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
@@ -13399,9 +13430,9 @@
 					</g>
 					<g data-name="ReactiveDropdownField">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="49746.3" y="3365.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
+							<rect x="46554.8" y="3485.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
 						</g>
-						<g transform="translate(49746.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
+						<g transform="translate(46554.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
 								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
 								
@@ -13410,17 +13441,17 @@
 					</g>
 					<g data-name="TemporalAggregationFormatted">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="45655.3" y="2458.5" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M45655.3 2489.5 L46103.3 2489.5" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M45655.3 2595.5 L46103.3 2595.5" fill="none" data-name="TemporalAggregationFormatted"></path>
+							<rect x="46858.8" y="2518.5" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
+							<path d="M46858.8 2549.5 L47306.8 2549.5" fill="none" data-name="TemporalAggregationFormatted"></path>
+							<path d="M46858.8 2655.5 L47306.8 2655.5" fill="none" data-name="TemporalAggregationFormatted"></path>
 						</g>
-						<g transform="translate(45655.25, 2458.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
+						<g transform="translate(46858.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
 								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45655.25, 2489.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+						<g transform="translate(46858.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
@@ -13431,7 +13462,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(45655.25, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+						<g transform="translate(46858.75, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
@@ -13443,9 +13474,9 @@
 					</g>
 					<g data-name="TemporalAggregation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="49989.3" y="3365.0" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
+							<rect x="46797.8" y="3485.0" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
 						</g>
-						<g transform="translate(49989.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
+						<g transform="translate(46797.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
 								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
 								
@@ -13454,17 +13485,17 @@
 					</g>
 					<g data-name="ImprovementDirectionFormatted">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="46143.3" y="2458.5" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M46143.3 2489.5 L46594.3 2489.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M46143.3 2595.5 L46594.3 2595.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
+							<rect x="47346.8" y="2518.5" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
+							<path d="M47346.8 2549.5 L47797.8 2549.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
+							<path d="M47346.8 2655.5 L47797.8 2655.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
 						</g>
-						<g transform="translate(46143.25, 2458.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
+						<g transform="translate(47346.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
 								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46143.25, 2489.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+						<g transform="translate(47346.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
@@ -13475,7 +13506,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(46143.25, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+						<g transform="translate(47346.75, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
@@ -13487,9 +13518,9 @@
 					</g>
 					<g data-name="ImprovementDirection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="50603.3" y="3365.0" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
+							<rect x="47253.0" y="3485.0" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
 						</g>
-						<g transform="translate(50603.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
+						<g transform="translate(47253, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
 								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
 								
@@ -13498,16 +13529,16 @@
 					</g>
 					<g data-name="ReportSectionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="14150.8" y="3327.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M14150.8 3358.0 L14533.8 3358.0" fill="none" data-name="ReportSectionType"></path>
+							<rect x="13698.5" y="3447.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
+							<path d="M13698.5 3478.0 L14081.5 3478.0" fill="none" data-name="ReportSectionType"></path>
 						</g>
-						<g transform="translate(14150.75, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
+						<g transform="translate(13698.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
 								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14150.75, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
+						<g transform="translate(13698.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
@@ -13519,17 +13550,17 @@
 					</g>
 					<g data-name="AverageSectionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="30689.3" y="1636.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M30689.3 1667.0 L31168.3 1667.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M30689.3 1728.0 L31168.3 1728.0" fill="none" data-name="AverageSectionFormView"></path>
+							<rect x="26354.5" y="1636.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
+							<path d="M26354.5 1667.0 L26833.5 1667.0" fill="none" data-name="AverageSectionFormView"></path>
+							<path d="M26354.5 1728.0 L26833.5 1728.0" fill="none" data-name="AverageSectionFormView"></path>
 						</g>
-						<g transform="translate(30689.25, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
+						<g transform="translate(26354.5, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30689.25, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+						<g transform="translate(26354.5, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
@@ -13537,7 +13568,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(30689.25, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+						<g transform="translate(26354.5, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
 								
@@ -13546,17 +13577,17 @@
 					</g>
 					<g data-name="ReportItemFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="40967.0" y="2278.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M40967.0 2309.5 L41954.0 2309.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M40967.0 2745.5 L41954.0 2745.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<rect x="38606.5" y="2338.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
+							<path d="M38606.5 2369.5 L39593.5 2369.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<path d="M38606.5 2805.5 L39593.5 2805.5" fill="none" data-name="ReportItemFormViewModel"></path>
 						</g>
-						<g transform="translate(40967, 2278.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(38606.5, 2338.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
 								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40967, 2309.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(38606.5, 2369.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
@@ -13589,7 +13620,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(40967, 2745.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(38606.5, 2805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
@@ -13603,23 +13634,23 @@
 					</g>
 					<g data-name="DataReferenceIdentifier">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="76002.5" y="583.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M76002.5 614.0 L76206.5 614.0" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M76002.5 645.0 L76206.5 645.0" fill="none" data-name="DataReferenceIdentifier"></path>
+							<rect x="78159.0" y="583.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
+							<path d="M78159.0 614.0 L78363.0 614.0" fill="none" data-name="DataReferenceIdentifier"></path>
+							<path d="M78159.0 645.0 L78363.0 645.0" fill="none" data-name="DataReferenceIdentifier"></path>
 						</g>
-						<g transform="translate(76002.5, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
+						<g transform="translate(78159, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
 								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76002.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+						<g transform="translate(78159, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
 								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76002.5, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+						<g transform="translate(78159, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
 								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
 								
@@ -13628,9 +13659,9 @@
 					</g>
 					<g data-name="DataReference">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="76037.0" y="121.0" height="31.0" width="135.0" data-name="DataReference"></rect>
+							<rect x="78193.5" y="121.0" height="31.0" width="135.0" data-name="DataReference"></rect>
 						</g>
-						<g transform="translate(76037, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
+						<g transform="translate(78193.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
 								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
 								
@@ -13639,17 +13670,17 @@
 					</g>
 					<g data-name="LinearRegressionSectionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="31208.3" y="1636.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M31208.3 1667.0 L31687.3 1667.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M31208.3 1728.0 L31687.3 1728.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<rect x="26873.5" y="1636.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
+							<path d="M26873.5 1667.0 L27352.5 1667.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<path d="M26873.5 1728.0 L27352.5 1728.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
 						</g>
-						<g transform="translate(31208.25, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
+						<g transform="translate(26873.5, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31208.25, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+						<g transform="translate(26873.5, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
@@ -13657,7 +13688,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(31208.25, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+						<g transform="translate(26873.5, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
 								
@@ -13666,17 +13697,17 @@
 					</g>
 					<g data-name="ReportItemFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="42227.0" y="1613.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M42227.0 1644.5 L42694.0 1644.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M42227.0 1720.5 L42694.0 1720.5" fill="none" data-name="ReportItemFormView"></path>
+							<rect x="42202.3" y="1613.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
+							<path d="M42202.3 1644.5 L42669.3 1644.5" fill="none" data-name="ReportItemFormView"></path>
+							<path d="M42202.3 1720.5 L42669.3 1720.5" fill="none" data-name="ReportItemFormView"></path>
 						</g>
-						<g transform="translate(42227, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
+						<g transform="translate(42202.25, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
 								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42227, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+						<g transform="translate(42202.25, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
@@ -13685,7 +13716,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(42227, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+						<g transform="translate(42202.25, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
@@ -13696,17 +13727,17 @@
 					</g>
 					<g data-name="ReportsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="67609.3" y="2391.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M67609.3 2422.0 L68469.3 2422.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M67609.3 2588.0 L68469.3 2588.0" fill="none" data-name="ReportsFormViewModel"></path>
+							<rect x="63159.0" y="2451.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
+							<path d="M63159.0 2482.0 L64019.0 2482.0" fill="none" data-name="ReportsFormViewModel"></path>
+							<path d="M63159.0 2648.0 L64019.0 2648.0" fill="none" data-name="ReportsFormViewModel"></path>
 						</g>
-						<g transform="translate(67609.25, 2391)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
+						<g transform="translate(63159, 2451)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
 								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67609.25, 2422)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+						<g transform="translate(63159, 2482)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
@@ -13721,7 +13752,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(67609.25, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+						<g transform="translate(63159, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
@@ -13738,17 +13769,17 @@
 					</g>
 					<g data-name="ReportFormItemDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="68766.0" y="1591.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M68766.0 1622.0 L69609.0 1622.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M68766.0 1698.0 L69609.0 1698.0" fill="none" data-name="ReportFormItemDelegate"></path>
+							<rect x="64446.3" y="1591.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
+							<path d="M64446.3 1622.0 L65289.3 1622.0" fill="none" data-name="ReportFormItemDelegate"></path>
+							<path d="M64446.3 1698.0 L65289.3 1698.0" fill="none" data-name="ReportFormItemDelegate"></path>
 						</g>
-						<g transform="translate(68766, 1591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
+						<g transform="translate(64446.25, 1591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
 								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68766, 1622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+						<g transform="translate(64446.25, 1622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
@@ -13757,7 +13788,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(68766, 1698)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+						<g transform="translate(64446.25, 1698)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
@@ -13771,17 +13802,17 @@
 					</g>
 					<g data-name="ReportBadge">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="47208.3" y="2496.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M47208.3 2527.0 L47405.3 2527.0" fill="none" data-name="ReportBadge"></path>
-							<path d="M47208.3 2603.0 L47405.3 2603.0" fill="none" data-name="ReportBadge"></path>
+							<rect x="49268.8" y="2556.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
+							<path d="M49268.8 2587.0 L49465.8 2587.0" fill="none" data-name="ReportBadge"></path>
+							<path d="M49268.8 2663.0 L49465.8 2663.0" fill="none" data-name="ReportBadge"></path>
 						</g>
-						<g transform="translate(47208.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
+						<g transform="translate(49268.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
 								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47208.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+						<g transform="translate(49268.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
@@ -13790,7 +13821,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(47208.25, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+						<g transform="translate(49268.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
 								
@@ -13799,16 +13830,16 @@
 					</g>
 					<g data-name="ReportStatus">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="16709.3" y="3327.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M16709.3 3358.0 L17010.3 3358.0" fill="none" data-name="ReportStatus"></path>
+							<rect x="20608.5" y="3447.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
+							<path d="M20608.5 3478.0 L20909.5 3478.0" fill="none" data-name="ReportStatus"></path>
 						</g>
-						<g transform="translate(16709.25, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
+						<g transform="translate(20608.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
 								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16709.25, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
+						<g transform="translate(20608.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
@@ -13820,24 +13851,24 @@
 					</g>
 					<g data-name="ReportsFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="44074.3" y="2503.5" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M44074.3 2534.5 L44412.3 2534.5" fill="none" data-name="ReportsFormData"></path>
-							<path d="M44074.3 2580.5 L44412.3 2580.5" fill="none" data-name="ReportsFormData"></path>
+							<rect x="47837.8" y="2563.5" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
+							<path d="M47837.8 2594.5 L48175.8 2594.5" fill="none" data-name="ReportsFormData"></path>
+							<path d="M47837.8 2640.5 L48175.8 2640.5" fill="none" data-name="ReportsFormData"></path>
 						</g>
-						<g transform="translate(44074.25, 2503.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
+						<g transform="translate(47837.75, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
 								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44074.25, 2534.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+						<g transform="translate(47837.75, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44074.25, 2580.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+						<g transform="translate(47837.75, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
@@ -13847,17 +13878,17 @@
 					</g>
 					<g data-name="StudyInfoFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="75318.5" y="2323.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M75318.5 2354.5 L76014.5 2354.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M75318.5 2760.5 L76014.5 2760.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+							<rect x="70034.5" y="2383.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
+							<path d="M70034.5 2414.5 L70730.5 2414.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+							<path d="M70034.5 2820.5 L70730.5 2820.5" fill="none" data-name="StudyInfoFormViewModel"></path>
 						</g>
-						<g transform="translate(75318.5, 2323.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
+						<g transform="translate(70034.5, 2383.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75318.5, 2354.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+						<g transform="translate(70034.5, 2414.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
@@ -13888,7 +13919,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(75318.5, 2760.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+						<g transform="translate(70034.5, 2820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
@@ -13898,16 +13929,16 @@
 					</g>
 					<g data-name="StudyDesignInfoFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="41504.3" y="3349.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M41504.3 3380.5 L41727.3 3380.5" fill="none" data-name="StudyDesignInfoFormView"></path>
+							<rect x="34554.3" y="3469.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
+							<path d="M34554.3 3500.5 L34777.3 3500.5" fill="none" data-name="StudyDesignInfoFormView"></path>
 						</g>
-						<g transform="translate(41504.25, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
+						<g transform="translate(34554.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
 								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41504.25, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
+						<g transform="translate(34554.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
 								
@@ -13916,17 +13947,17 @@
 					</g>
 					<g data-name="StudyInfoFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="44452.3" y="2481.0" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M44452.3 2512.0 L44866.3 2512.0" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M44452.3 2603.0 L44866.3 2603.0" fill="none" data-name="StudyInfoFormData"></path>
+							<rect x="49505.8" y="2541.0" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
+							<path d="M49505.8 2572.0 L49919.8 2572.0" fill="none" data-name="StudyInfoFormData"></path>
+							<path d="M49505.8 2663.0 L49919.8 2663.0" fill="none" data-name="StudyInfoFormData"></path>
 						</g>
-						<g transform="translate(44452.25, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
+						<g transform="translate(49505.75, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
 								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44452.25, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+						<g transform="translate(49505.75, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
@@ -13936,7 +13967,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(44452.25, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+						<g transform="translate(49505.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
@@ -13946,17 +13977,17 @@
 					</g>
 					<g data-name="StudyContactInfoFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="50215.3" y="3266.5" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M50215.3 3297.5 L50563.3 3297.5" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M50215.3 3448.5 L50563.3 3448.5" fill="none" data-name="StudyContactInfoFormData"></path>
+							<rect x="49662.3" y="3386.5" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
+							<path d="M49662.3 3417.5 L50010.3 3417.5" fill="none" data-name="StudyContactInfoFormData"></path>
+							<path d="M49662.3 3568.5 L50010.3 3568.5" fill="none" data-name="StudyContactInfoFormData"></path>
 						</g>
-						<g transform="translate(50215.25, 3266.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
+						<g transform="translate(49662.25, 3386.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
 								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50215.25, 3297.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+						<g transform="translate(49662.25, 3417.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
@@ -13970,7 +14001,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(50215.25, 3448.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+						<g transform="translate(49662.25, 3568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
@@ -13980,16 +14011,16 @@
 					</g>
 					<g data-name="StudyFormValidationSet">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="2064.0" y="3342.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M2064.0 3373.0 L2451.0 3373.0" fill="none" data-name="StudyFormValidationSet"></path>
+							<rect x="2051.0" y="3462.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
+							<path d="M2051.0 3493.0 L2438.0 3493.0" fill="none" data-name="StudyFormValidationSet"></path>
 						</g>
-						<g transform="translate(2064, 3342)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
+						<g transform="translate(2051, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
 								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2064, 3373)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
+						<g transform="translate(2051, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
@@ -13999,24 +14030,24 @@
 					</g>
 					<g data-name="MeasurementsFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="46674.3" y="2503.5" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M46674.3 2534.5 L47168.3 2534.5" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M46674.3 2580.5 L47168.3 2580.5" fill="none" data-name="MeasurementsFormData"></path>
+							<rect x="49999.8" y="2563.5" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
+							<path d="M49999.8 2594.5 L50493.8 2594.5" fill="none" data-name="MeasurementsFormData"></path>
+							<path d="M49999.8 2640.5 L50493.8 2640.5" fill="none" data-name="MeasurementsFormData"></path>
 						</g>
-						<g transform="translate(46674.25, 2503.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
+						<g transform="translate(49999.75, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
 								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46674.25, 2534.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+						<g transform="translate(49999.75, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46674.25, 2580.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+						<g transform="translate(49999.75, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
@@ -14026,16 +14057,16 @@
 					</g>
 					<g data-name="MeasurementSurveyFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="43191.5" y="1666.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M43191.5 1697.5 L43635.5 1697.5" fill="none" data-name="MeasurementSurveyFormView"></path>
+							<rect x="42899.3" y="1666.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
+							<path d="M42899.3 1697.5 L43343.3 1697.5" fill="none" data-name="MeasurementSurveyFormView"></path>
 						</g>
-						<g transform="translate(43191.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
+						<g transform="translate(42899.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
 								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43191.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
+						<g transform="translate(42899.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
 								
@@ -14044,17 +14075,17 @@
 					</g>
 					<g data-name="MeasurementSurveyFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="66873.3" y="2353.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M66873.3 2384.5 L67569.3 2384.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M66873.3 2610.5 L67569.3 2610.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+							<rect x="61918.0" y="2413.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
+							<path d="M61918.0 2444.5 L62614.0 2444.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+							<path d="M61918.0 2670.5 L62614.0 2670.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
 						</g>
-						<g transform="translate(66873.25, 2353.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+						<g transform="translate(61918, 2413.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(66873.25, 2384.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+						<g transform="translate(61918, 2444.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
@@ -14073,7 +14104,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(66873.25, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+						<g transform="translate(61918, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
@@ -14091,23 +14122,23 @@
 					</g>
 					<g data-name="SurveyPreview">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="31727.3" y="1651.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M31727.3 1682.0 L32071.3 1682.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M31727.3 1713.0 L32071.3 1713.0" fill="none" data-name="SurveyPreview"></path>
+							<rect x="27392.5" y="1651.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
+							<path d="M27392.5 1682.0 L27736.5 1682.0" fill="none" data-name="SurveyPreview"></path>
+							<path d="M27392.5 1713.0 L27736.5 1713.0" fill="none" data-name="SurveyPreview"></path>
 						</g>
-						<g transform="translate(31727.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
+						<g transform="translate(27392.5, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31727.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+						<g transform="translate(27392.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31727.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+						<g transform="translate(27392.5, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
 								
@@ -14116,17 +14147,17 @@
 					</g>
 					<g data-name="MeasurementSurveyFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="52211.0" y="2466.0" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M52211.0 2497.0 L52620.0 2497.0" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M52211.0 2618.0 L52620.0 2618.0" fill="none" data-name="MeasurementSurveyFormData"></path>
+							<rect x="55487.8" y="2526.0" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
+							<path d="M55487.8 2557.0 L55896.8 2557.0" fill="none" data-name="MeasurementSurveyFormData"></path>
+							<path d="M55487.8 2678.0 L55896.8 2678.0" fill="none" data-name="MeasurementSurveyFormData"></path>
 						</g>
-						<g transform="translate(52211, 2466)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
+						<g transform="translate(55487.75, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
 								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52211, 2497)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+						<g transform="translate(55487.75, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
@@ -14138,7 +14169,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(52211, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+						<g transform="translate(55487.75, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
@@ -14148,24 +14179,24 @@
 					</g>
 					<g data-name="QuestionnaireFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="54133.3" y="3311.5" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M54133.3 3342.5 L54501.3 3342.5" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M54133.3 3388.5 L54501.3 3388.5" fill="none" data-name="QuestionnaireFormData"></path>
+							<rect x="53009.0" y="3431.5" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
+							<path d="M53009.0 3462.5 L53377.0 3462.5" fill="none" data-name="QuestionnaireFormData"></path>
+							<path d="M53009.0 3508.5 L53377.0 3508.5" fill="none" data-name="QuestionnaireFormData"></path>
 						</g>
-						<g transform="translate(54133.25, 3311.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
+						<g transform="translate(53009, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
 								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54133.25, 3342.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+						<g transform="translate(53009, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54133.25, 3388.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+						<g transform="translate(53009, 3508.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
@@ -14176,17 +14207,17 @@
 					</g>
 					<g data-name="WithQuestionnaireControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="62867.3" y="1568.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M62867.3 1599.5 L63499.3 1599.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M62867.3 1705.5 L63499.3 1705.5" fill="none" data-name="WithQuestionnaireControls"></path>
+							<rect x="61930.0" y="1568.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
+							<path d="M61930.0 1599.5 L62562.0 1599.5" fill="none" data-name="WithQuestionnaireControls"></path>
+							<path d="M61930.0 1705.5 L62562.0 1705.5" fill="none" data-name="WithQuestionnaireControls"></path>
 						</g>
-						<g transform="translate(62867.25, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
+						<g transform="translate(61930, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
 								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62867.25, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+						<g transform="translate(61930, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
@@ -14197,7 +14228,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(62867.25, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+						<g transform="translate(61930, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
@@ -14212,16 +14243,16 @@
 					</g>
 					<g data-name="StudyDesignMeasurementsFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="41767.3" y="3349.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M41767.3 3380.5 L42077.3 3380.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
+							<rect x="34817.3" y="3469.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
+							<path d="M34817.3 3500.5 L35127.3 3500.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
 						</g>
-						<g transform="translate(41767.25, 3349.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+						<g transform="translate(34817.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
 								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41767.25, 3380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+						<g transform="translate(34817.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
 								
@@ -14230,17 +14261,17 @@
 					</g>
 					<g data-name="MeasurementsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="71219.0" y="2383.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M71219.0 2414.5 L72311.0 2414.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M71219.0 2565.5 L72311.0 2565.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+							<rect x="65728.8" y="2443.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
+							<path d="M65728.8 2474.5 L66820.8 2474.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+							<path d="M65728.8 2625.5 L66820.8 2625.5" fill="none" data-name="MeasurementsFormViewModel"></path>
 						</g>
-						<g transform="translate(71219, 2383.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
+						<g transform="translate(65728.75, 2443.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
 								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(71219, 2414.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+						<g transform="translate(65728.75, 2474.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
@@ -14254,7 +14285,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(71219, 2565.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+						<g transform="translate(65728.75, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
@@ -14273,17 +14304,17 @@
 					</g>
 					<g data-name="StudyFormScaffold">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="26431.5" y="2503.5" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M26431.5 2534.5 L26819.5 2534.5" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M26431.5 2595.5 L26819.5 2595.5" fill="none" data-name="StudyFormScaffold"></path>
+							<rect x="27582.5" y="2563.5" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
+							<path d="M27582.5 2594.5 L27970.5 2594.5" fill="none" data-name="StudyFormScaffold"></path>
+							<path d="M27582.5 2655.5 L27970.5 2655.5" fill="none" data-name="StudyFormScaffold"></path>
 						</g>
-						<g transform="translate(26431.5, 2503.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
+						<g transform="translate(27582.5, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
 								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26431.5, 2534.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+						<g transform="translate(27582.5, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
@@ -14291,7 +14322,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(26431.5, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+						<g transform="translate(27582.5, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
 								
@@ -14300,9 +14331,9 @@
 					</g>
 					<g data-name="T Function(WidgetRef)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="28968.0" y="3365.0" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
+							<rect x="29658.3" y="3485.0" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
 						</g>
-						<g transform="translate(28968, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
+						<g transform="translate(29658.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
 								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
 								
@@ -14311,17 +14342,17 @@
 					</g>
 					<g data-name="ConsentItemFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="58745.8" y="2436.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M58745.8 2467.0 L59441.8 2467.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M58745.8 2633.0 L59441.8 2633.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+							<rect x="53899.8" y="2496.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
+							<path d="M53899.8 2527.0 L54595.8 2527.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+							<path d="M53899.8 2693.0 L54595.8 2693.0" fill="none" data-name="ConsentItemFormViewModel"></path>
 						</g>
-						<g transform="translate(58745.75, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
+						<g transform="translate(53899.75, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58745.75, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+						<g transform="translate(53899.75, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
@@ -14336,7 +14367,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(58745.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+						<g transform="translate(53899.75, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
@@ -14347,16 +14378,16 @@
 					</g>
 					<g data-name="StudyDesignEnrollmentFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="42117.3" y="3334.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M42117.3 3365.5 L42566.3 3365.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
+							<rect x="35167.3" y="3454.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
+							<path d="M35167.3 3485.5 L35616.3 3485.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
 						</g>
-						<g transform="translate(42117.25, 3334.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+						<g transform="translate(35167.25, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
 								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42117.25, 3365.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+						<g transform="translate(35167.25, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
@@ -14367,16 +14398,16 @@
 					</g>
 					<g data-name="IScreenerQuestionLogicFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="52660.0" y="2534.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M52660.0 2565.0 L52992.0 2565.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
+							<rect x="52631.8" y="2594.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
+							<path d="M52631.8 2625.0 L52963.8 2625.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
 						</g>
-						<g transform="translate(52660, 2534)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
+						<g transform="translate(52631.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
 								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52660, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
+						<g transform="translate(52631.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
@@ -14385,23 +14416,23 @@
 					</g>
 					<g data-name="ScreenerQuestionLogicFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="78749.8" y="2496.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M78749.8 2527.0 L79173.8 2527.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M78749.8 2558.0 L79173.8 2558.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+							<rect x="80897.0" y="2556.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
+							<path d="M80897.0 2587.0 L81321.0 2587.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+							<path d="M80897.0 2618.0 L81321.0 2618.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
 						</g>
-						<g transform="translate(78749.75, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+						<g transform="translate(80897, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
 								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78749.75, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+						<g transform="translate(80897, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78749.75, 2558)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+						<g transform="translate(80897, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
@@ -14413,17 +14444,17 @@
 					</g>
 					<g data-name="ScreenerQuestionFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="63738.3" y="3214.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M63738.3 3245.0 L64300.3 3245.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M63738.3 3426.0 L64300.3 3426.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+							<rect x="61985.0" y="3334.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
+							<path d="M61985.0 3365.0 L62547.0 3365.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+							<path d="M61985.0 3546.0 L62547.0 3546.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(63738.25, 3214)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+						<g transform="translate(61985, 3334)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
 								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63738.25, 3245)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+						<g transform="translate(61985, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
@@ -14439,7 +14470,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(63738.25, 3426)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+						<g transform="translate(61985, 3546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
@@ -14454,17 +14485,17 @@
 					</g>
 					<g data-name="ConsentItemFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="47712.5" y="1613.5" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M47712.5 1644.5 L47970.5 1644.5" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M47712.5 1735.5 L47970.5 1735.5" fill="none" data-name="ConsentItemFormData"></path>
+							<rect x="50626.3" y="1613.5" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
+							<path d="M50626.3 1644.5 L50884.3 1644.5" fill="none" data-name="ConsentItemFormData"></path>
+							<path d="M50626.3 1735.5 L50884.3 1735.5" fill="none" data-name="ConsentItemFormData"></path>
 						</g>
-						<g transform="translate(47712.5, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
+						<g transform="translate(50626.25, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
 								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47712.5, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+						<g transform="translate(50626.25, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
@@ -14474,7 +14505,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(47712.5, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+						<g transform="translate(50626.25, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
@@ -14484,16 +14515,16 @@
 					</g>
 					<g data-name="ConsentItemFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="48050.5" y="1666.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M48050.5 1697.5 L48431.5 1697.5" fill="none" data-name="ConsentItemFormView"></path>
+							<rect x="44310.3" y="1666.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
+							<path d="M44310.3 1697.5 L44691.3 1697.5" fill="none" data-name="ConsentItemFormView"></path>
 						</g>
-						<g transform="translate(48050.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
+						<g transform="translate(44310.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
 								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(48050.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
+						<g transform="translate(44310.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
 								
@@ -14502,17 +14533,17 @@
 					</g>
 					<g data-name="EnrollmentFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="47445.3" y="2481.0" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M47445.3 2512.0 L47899.3 2512.0" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M47445.3 2603.0 L47899.3 2603.0" fill="none" data-name="EnrollmentFormData"></path>
+							<rect x="50533.8" y="2541.0" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
+							<path d="M50533.8 2572.0 L50987.8 2572.0" fill="none" data-name="EnrollmentFormData"></path>
+							<path d="M50533.8 2663.0 L50987.8 2663.0" fill="none" data-name="EnrollmentFormData"></path>
 						</g>
-						<g transform="translate(47445.25, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
+						<g transform="translate(50533.75, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
 								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47445.25, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+						<g transform="translate(50533.75, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
@@ -14522,7 +14553,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(47445.25, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+						<g transform="translate(50533.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
@@ -14532,17 +14563,17 @@
 					</g>
 					<g data-name="QuestionFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="55092.3" y="1956.0" height="1218.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M55092.3 1987.0 L56105.3 1987.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M55092.3 2888.0 L56105.3 2888.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<rect x="48215.8" y="1956.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M48215.8 1987.0 L49228.8 1987.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M48215.8 3008.0 L49228.8 3008.0" fill="none" data-name="QuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(55092.25, 1956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+						<g transform="translate(48215.75, 1956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
 								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55092.25, 1987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+						<g transform="translate(48215.75, 1987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
@@ -14557,56 +14588,64 @@
 								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
 								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
 								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(55092.25, 2888)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
+								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
+								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
+								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
+								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
+								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
+								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
+								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
+								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
+								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
+								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
+								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
+								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
+								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
+								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
+								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
+								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
+								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
+								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(48215.75, 3008)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
@@ -14632,17 +14671,17 @@
 					</g>
 					<g data-name="EnrollmentFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="69398.0" y="2316.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M69398.0 2347.0 L70300.0 2347.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M69398.0 2573.0 L70300.0 2573.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+							<rect x="64786.8" y="2376.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
+							<path d="M64786.8 2407.0 L65688.8 2407.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+							<path d="M64786.8 2633.0 L65688.8 2633.0" fill="none" data-name="EnrollmentFormViewModel"></path>
 						</g>
-						<g transform="translate(69398, 2316)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
+						<g transform="translate(64786.75, 2376)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
 								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(69398, 2347)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+						<g transform="translate(64786.75, 2407)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
@@ -14661,7 +14700,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(69398, 2573)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+						<g transform="translate(64786.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
@@ -14684,17 +14723,17 @@
 					</g>
 					<g data-name="EnrollmentFormConsentItemDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="69282.8" y="3274.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M69282.8 3305.0 L70082.8 3305.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M69282.8 3381.0 L70082.8 3381.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+							<rect x="64537.8" y="3394.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
+							<path d="M64537.8 3425.0 L65337.8 3425.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+							<path d="M64537.8 3501.0 L65337.8 3501.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
 						</g>
-						<g transform="translate(69282.75, 3274)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+						<g transform="translate(64537.75, 3394)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
 								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(69282.75, 3305)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+						<g transform="translate(64537.75, 3425)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
@@ -14703,7 +14742,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(69282.75, 3381)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+						<g transform="translate(64537.75, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
@@ -14717,17 +14756,17 @@
 					</g>
 					<g data-name="StudyFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="75021.8" y="1516.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M75021.8 1547.0 L75717.8 1547.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M75021.8 1758.0 L75717.8 1758.0" fill="none" data-name="StudyFormViewModel"></path>
+							<rect x="69670.3" y="1516.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
+							<path d="M69670.3 1547.0 L70366.3 1547.0" fill="none" data-name="StudyFormViewModel"></path>
+							<path d="M69670.3 1758.0 L70366.3 1758.0" fill="none" data-name="StudyFormViewModel"></path>
 						</g>
-						<g transform="translate(75021.75, 1516)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(69670.25, 1516)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75021.75, 1547)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(69670.25, 1547)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
@@ -14745,7 +14784,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(75021.75, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(69670.25, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
@@ -14760,17 +14799,17 @@
 					</g>
 					<g data-name="QuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="48790.3" y="1568.5" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M48790.3 1599.5 L49958.3 1599.5" fill="none" data-name="QuestionFormData"></path>
-							<path d="M48790.3 1735.5 L49958.3 1735.5" fill="none" data-name="QuestionFormData"></path>
+							<rect x="52444.3" y="1568.5" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M52444.3 1599.5 L53612.3 1599.5" fill="none" data-name="QuestionFormData"></path>
+							<path d="M52444.3 1735.5 L53612.3 1735.5" fill="none" data-name="QuestionFormData"></path>
 						</g>
-						<g transform="translate(48790.25, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+						<g transform="translate(52444.25, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
 								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(48790.25, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+						<g transform="translate(52444.25, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
@@ -14783,7 +14822,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(48790.25, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+						<g transform="translate(52444.25, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
@@ -14796,40 +14835,42 @@
 					</g>
 					<g data-name="SurveyQuestionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="39479.8" y="3312.0" height="137.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M39479.8 3343.0 L39842.8 3343.0" fill="none" data-name="SurveyQuestionType"></path>
+							<rect x="32641.5" y="3417.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M32641.5 3448.0 L33004.5 3448.0" fill="none" data-name="SurveyQuestionType"></path>
 						</g>
-						<g transform="translate(39479.75, 3312)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+						<g transform="translate(32641.5, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
 								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39479.75, 3343)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+						<g transform="translate(32641.5, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
 								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
 								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
 								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ChoiceQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="50297.0" y="2481.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M50297.0 2512.0 L50641.0 2512.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M50297.0 2573.0 L50641.0 2573.0" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<rect x="51303.8" y="2541.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M51303.8 2572.0 L51647.8 2572.0" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M51303.8 2633.0 L51647.8 2633.0" fill="none" data-name="ChoiceQuestionFormData"></path>
 						</g>
-						<g transform="translate(50297, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(51303.75, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50297, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(51303.75, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
@@ -14837,7 +14878,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(50297, 2573)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(51303.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
@@ -14849,24 +14890,24 @@
 					</g>
 					<g data-name="BoolQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="50681.0" y="2496.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M50681.0 2527.0 L51073.0 2527.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M50681.0 2573.0 L51073.0 2573.0" fill="none" data-name="BoolQuestionFormData"></path>
+							<rect x="51687.8" y="2556.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M51687.8 2587.0 L52079.8 2587.0" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M51687.8 2633.0 L52079.8 2633.0" fill="none" data-name="BoolQuestionFormData"></path>
 						</g>
-						<g transform="translate(50681, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(51687.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
 								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50681, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(51687.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50681, 2573)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(51687.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
@@ -14875,19 +14916,76 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="ImageQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
+							<rect x="52119.8" y="2556.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
+							<path d="M52119.8 2587.0 L52591.8 2587.0" fill="none" data-name="ImageQuestionFormData"></path>
+							<path d="M52119.8 2633.0 L52591.8 2633.0" fill="none" data-name="ImageQuestionFormData"></path>
+						</g>
+						<g transform="translate(52119.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(52119.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(52119.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="AudioQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
+							<rect x="53003.8" y="2548.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
+							<path d="M53003.8 2579.5 L53475.8 2579.5" fill="none" data-name="AudioQuestionFormData"></path>
+							<path d="M53003.8 2640.5 L53475.8 2640.5" fill="none" data-name="AudioQuestionFormData"></path>
+						</g>
+						<g transform="translate(53003.75, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(53003.75, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(53003.75, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="ScaleQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="51113.0" y="2421.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M51113.0 2452.0 L51457.0 2452.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M51113.0 2648.0 L51457.0 2648.0" fill="none" data-name="ScaleQuestionFormData"></path>
+							<rect x="53515.8" y="2481.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M53515.8 2512.0 L53859.8 2512.0" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M53515.8 2708.0 L53859.8 2708.0" fill="none" data-name="ScaleQuestionFormData"></path>
 						</g>
-						<g transform="translate(51113, 2421)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(53515.75, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51113, 2452)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(53515.75, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
@@ -14904,7 +15002,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(51113, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(53515.75, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
@@ -14915,17 +15013,17 @@
 					</g>
 					<g data-name="FreeTextQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="51497.0" y="2481.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M51497.0 2512.0 L51841.0 2512.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M51497.0 2588.0 L51841.0 2588.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<rect x="54635.8" y="2541.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M54635.8 2572.0 L54979.8 2572.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M54635.8 2648.0 L54979.8 2648.0" fill="none" data-name="FreeTextQuestionFormData"></path>
 						</g>
-						<g transform="translate(51497, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(54635.75, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51497, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(54635.75, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
@@ -14934,7 +15032,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(51497, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(54635.75, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
@@ -14945,35 +15043,60 @@
 					</g>
 					<g data-name="FreeTextQuestionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="55318.8" y="3365.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+							<rect x="55244.0" y="3485.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
 						</g>
-						<g transform="translate(55318.75, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+						<g transform="translate(55244, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
 								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
+					<g data-name="AudioRecordingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
+							<rect x="27816.5" y="1651.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
+							<path d="M27816.5 1682.0 L28168.5 1682.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<path d="M27816.5 1713.0 L28168.5 1713.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+						</g>
+						<g transform="translate(27816.5, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(27816.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(27816.5, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="FreeTextQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="32151.3" y="1628.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M32151.3 1659.5 L32503.3 1659.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M32151.3 1705.5 L32503.3 1705.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<rect x="28208.5" y="1628.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M28208.5 1659.5 L28560.5 1659.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M28208.5 1705.5 L28560.5 1705.5" fill="none" data-name="FreeTextQuestionFormView"></path>
 						</g>
-						<g transform="translate(32151.25, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(28208.5, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32151.25, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(28208.5, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32151.25, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(28208.5, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
@@ -14982,18 +15105,43 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="ImageCapturingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
+							<rect x="28600.5" y="1651.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
+							<path d="M28600.5 1682.0 L28952.5 1682.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<path d="M28600.5 1713.0 L28952.5 1713.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+						</g>
+						<g transform="translate(28600.5, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(28600.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(28600.5, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="IScaleQuestionFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="79460.5" y="105.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M79460.5 136.5 L79769.5 136.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
+							<rect x="81455.3" y="105.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M81455.3 136.5 L81764.3 136.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(79460.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+						<g transform="translate(81455.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
 								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79460.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+						<g transform="translate(81455.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
@@ -15002,16 +15150,16 @@
 					</g>
 					<g data-name="ScaleQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="55422.8" y="1666.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M55422.8 1697.5 L55774.8 1697.5" fill="none" data-name="ScaleQuestionFormView"></path>
+							<rect x="55044.3" y="1666.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M55044.3 1697.5 L55396.3 1697.5" fill="none" data-name="ScaleQuestionFormView"></path>
 						</g>
-						<g transform="translate(55422.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+						<g transform="translate(55044.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55422.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+						<g transform="translate(55044.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
@@ -15020,23 +15168,23 @@
 					</g>
 					<g data-name="ChoiceQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="32543.3" y="1651.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M32543.3 1682.0 L32895.3 1682.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M32543.3 1713.0 L32895.3 1713.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<rect x="28992.5" y="1651.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M28992.5 1682.0 L29344.5 1682.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M28992.5 1713.0 L29344.5 1713.0" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(32543.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(28992.5, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32543.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(28992.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32543.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(28992.5, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
 								
@@ -15045,23 +15193,23 @@
 					</g>
 					<g data-name="BoolQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="32935.3" y="1651.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M32935.3 1682.0 L33287.3 1682.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M32935.3 1713.0 L33287.3 1713.0" fill="none" data-name="BoolQuestionFormView"></path>
+							<rect x="29384.5" y="1651.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M29384.5 1682.0 L29736.5 1682.0" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M29384.5 1713.0 L29736.5 1713.0" fill="none" data-name="BoolQuestionFormView"></path>
 						</g>
-						<g transform="translate(32935.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+						<g transform="translate(29384.5, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32935.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+						<g transform="translate(29384.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32935.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+						<g transform="translate(29384.5, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
 								
@@ -15070,16 +15218,16 @@
 					</g>
 					<g data-name="SurveyQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="57174.3" y="1659.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M57174.3 1690.0 L57526.3 1690.0" fill="none" data-name="SurveyQuestionFormView"></path>
+							<rect x="56171.3" y="1659.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M56171.3 1690.0 L56523.3 1690.0" fill="none" data-name="SurveyQuestionFormView"></path>
 						</g>
-						<g transform="translate(57174.25, 1659)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+						<g transform="translate(56171.25, 1659)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57174.25, 1690)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+						<g transform="translate(56171.25, 1690)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
@@ -15089,9 +15237,9 @@
 					</g>
 					<g data-name="StudyUTimeOfDay">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="53032.0" y="2549.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
+							<rect x="55936.8" y="2609.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
 						</g>
-						<g transform="translate(53032, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
+						<g transform="translate(55936.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
 								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
 								
@@ -15100,23 +15248,23 @@
 					</g>
 					<g data-name="ScheduleControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="79400.8" y="1158.5" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M79400.8 1189.5 L79832.8 1189.5" fill="none" data-name="ScheduleControls"></path>
-							<path d="M79400.8 1220.5 L79832.8 1220.5" fill="none" data-name="ScheduleControls"></path>
+							<rect x="81395.5" y="1158.5" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
+							<path d="M81395.5 1189.5 L81827.5 1189.5" fill="none" data-name="ScheduleControls"></path>
+							<path d="M81395.5 1220.5 L81827.5 1220.5" fill="none" data-name="ScheduleControls"></path>
 						</g>
-						<g transform="translate(79400.75, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
+						<g transform="translate(81395.5, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
 								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79400.75, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+						<g transform="translate(81395.5, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79400.75, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+						<g transform="translate(81395.5, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
@@ -15126,16 +15274,16 @@
 					</g>
 					<g data-name="StudiesTableColumnHeader">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
-							<rect x="58574.5" y="3662.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
-							<path d="M58574.5 3693.5 L58811.5 3693.5" fill="none" data-name="StudiesTableColumnHeader"></path>
+							<rect x="45974.3" y="3782.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
+							<path d="M45974.3 3813.5 L46211.3 3813.5" fill="none" data-name="StudiesTableColumnHeader"></path>
 						</g>
-						<g transform="translate(58574.5, 3662.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
+						<g transform="translate(45974.25, 3782.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
 								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58574.5, 3693.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
+						<g transform="translate(45974.25, 3813.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
@@ -15148,16 +15296,16 @@
 					</g>
 					<g data-name="DashboardScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="57727.8" y="2534.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
-							<path d="M57727.8 2565.0 L57905.8 2565.0" fill="none" data-name="DashboardScreen"></path>
+							<rect x="57917.8" y="2594.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
+							<path d="M57917.8 2625.0 L58095.8 2625.0" fill="none" data-name="DashboardScreen"></path>
 						</g>
-						<g transform="translate(57727.75, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
+						<g transform="translate(57917.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
 								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57727.75, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
+						<g transform="translate(57917.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
 								
@@ -15166,16 +15314,16 @@
 					</g>
 					<g data-name="StudiesFilter">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
-							<rect x="24666.8" y="3342.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
-							<path d="M24666.8 3373.0 L24962.8 3373.0" fill="none" data-name="StudiesFilter"></path>
+							<rect x="27625.8" y="3462.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
+							<path d="M27625.8 3493.0 L27921.8 3493.0" fill="none" data-name="StudiesFilter"></path>
 						</g>
-						<g transform="translate(24666.75, 3342)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
+						<g transform="translate(27625.75, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
 								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24666.75, 3373)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
+						<g transform="translate(27625.75, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
@@ -15185,24 +15333,24 @@
 					</g>
 					<g data-name="DashboardScaffold">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
-							<rect x="57945.8" y="2511.0" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
-							<path d="M57945.8 2542.0 L58288.8 2542.0" fill="none" data-name="DashboardScaffold"></path>
-							<path d="M57945.8 2588.0 L58288.8 2588.0" fill="none" data-name="DashboardScaffold"></path>
+							<rect x="58135.8" y="2571.0" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
+							<path d="M58135.8 2602.0 L58478.8 2602.0" fill="none" data-name="DashboardScaffold"></path>
+							<path d="M58135.8 2648.0 L58478.8 2648.0" fill="none" data-name="DashboardScaffold"></path>
 						</g>
-						<g transform="translate(57945.75, 2511)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
+						<g transform="translate(58135.75, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
 								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57945.75, 2542)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+						<g transform="translate(58135.75, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57945.75, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+						<g transform="translate(58135.75, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
 								
@@ -15211,17 +15359,17 @@
 					</g>
 					<g data-name="DashboardController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
-							<rect x="73636.0" y="2376.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
-							<path d="M73636.0 2407.0 L74250.0 2407.0" fill="none" data-name="DashboardController"></path>
-							<path d="M73636.0 2528.0 L74250.0 2528.0" fill="none" data-name="DashboardController"></path>
+							<rect x="68907.3" y="2436.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
+							<path d="M68907.3 2467.0 L69521.3 2467.0" fill="none" data-name="DashboardController"></path>
+							<path d="M68907.3 2588.0 L69521.3 2588.0" fill="none" data-name="DashboardController"></path>
 						</g>
-						<g transform="translate(73636, 2376)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
+						<g transform="translate(68907.25, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
 								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73636, 2407)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+						<g transform="translate(68907.25, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
@@ -15233,7 +15381,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(73636, 2528)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+						<g transform="translate(68907.25, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
@@ -15255,23 +15403,23 @@
 					</g>
 					<g data-name="IUserRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="73806.5" y="3319.0" height="123.0" width="260.0" data-name="IUserRepository"></rect>
-							<path d="M73806.5 3350.0 L74066.5 3350.0" fill="none" data-name="IUserRepository"></path>
-							<path d="M73806.5 3381.0 L74066.5 3381.0" fill="none" data-name="IUserRepository"></path>
+							<rect x="69024.3" y="3439.0" height="123.0" width="260.0" data-name="IUserRepository"></rect>
+							<path d="M69024.3 3470.0 L69284.3 3470.0" fill="none" data-name="IUserRepository"></path>
+							<path d="M69024.3 3501.0 L69284.3 3501.0" fill="none" data-name="IUserRepository"></path>
 						</g>
-						<g transform="translate(73806.5, 3319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
+						<g transform="translate(69024.25, 3439)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
 								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73806.5, 3350)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
+						<g transform="translate(69024.25, 3470)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+user: StudyUUser</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73806.5, 3381)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
+						<g transform="translate(69024.25, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+dynamic fetchUser()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IUserRepository">+dynamic saveUser()</text>
@@ -15282,17 +15430,17 @@
 					</g>
 					<g data-name="StudiesTableColumnSize">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
-							<rect x="79809.5" y="75.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
-							<path d="M79809.5 106.0 L80034.5 106.0" fill="none" data-name="StudiesTableColumnSize"></path>
-							<path d="M79809.5 167.0 L80034.5 167.0" fill="none" data-name="StudiesTableColumnSize"></path>
+							<rect x="81804.3" y="75.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
+							<path d="M81804.3 106.0 L82029.3 106.0" fill="none" data-name="StudiesTableColumnSize"></path>
+							<path d="M81804.3 167.0 L82029.3 167.0" fill="none" data-name="StudiesTableColumnSize"></path>
 						</g>
-						<g transform="translate(79809.5, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
+						<g transform="translate(81804.25, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
 								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79809.5, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+						<g transform="translate(81804.25, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
@@ -15300,7 +15448,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(79809.5, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+						<g transform="translate(81804.25, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
 								
@@ -15309,17 +15457,17 @@
 					</g>
 					<g data-name="StudiesTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
-							<rect x="58300.0" y="1553.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
-							<path d="M58300.0 1584.5 L58780.0 1584.5" fill="none" data-name="StudiesTable"></path>
-							<path d="M58300.0 1795.5 L58780.0 1795.5" fill="none" data-name="StudiesTable"></path>
+							<rect x="56648.5" y="1553.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
+							<path d="M56648.5 1584.5 L57128.5 1584.5" fill="none" data-name="StudiesTable"></path>
+							<path d="M56648.5 1795.5 L57128.5 1795.5" fill="none" data-name="StudiesTable"></path>
 						</g>
-						<g transform="translate(58300, 1553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
+						<g transform="translate(56648.5, 1553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
 								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58300, 1584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+						<g transform="translate(56648.5, 1584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
@@ -15337,7 +15485,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(58300, 1795.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+						<g transform="translate(56648.5, 1795.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
@@ -15347,9 +15495,9 @@
 					</g>
 					<g data-name="void Function(Study)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
-							<rect x="57508.8" y="2549.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
+							<rect x="56346.8" y="2609.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
 						</g>
-						<g transform="translate(57508.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
+						<g transform="translate(56346.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
 								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
 								
@@ -15358,9 +15506,9 @@
 					</g>
 					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<rect x="58328.8" y="2549.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
+							<rect x="56565.8" y="2609.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
 						</g>
-						<g transform="translate(58328.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+						<g transform="translate(56565.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
 								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
 								
@@ -15369,16 +15517,16 @@
 					</g>
 					<g data-name="StudiesTableColumn">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
-							<rect x="2491.0" y="3274.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
-							<path d="M2491.0 3305.5 L2852.0 3305.5" fill="none" data-name="StudiesTableColumn"></path>
+							<rect x="2478.0" y="3394.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
+							<path d="M2478.0 3425.5 L2839.0 3425.5" fill="none" data-name="StudiesTableColumn"></path>
 						</g>
-						<g transform="translate(2491, 3274.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
+						<g transform="translate(2478, 3394.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
 								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2491, 3305.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
+						<g transform="translate(2478, 3425.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
@@ -15397,16 +15545,16 @@
 					</g>
 					<g data-name="StudiesTableItem">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
-							<rect x="59521.8" y="2466.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
-							<path d="M59521.8 2497.5 L59921.8 2497.5" fill="none" data-name="StudiesTableItem"></path>
+							<rect x="59284.0" y="2526.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
+							<path d="M59284.0 2557.5 L59684.0 2557.5" fill="none" data-name="StudiesTableItem"></path>
 						</g>
-						<g transform="translate(59521.75, 2466.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
+						<g transform="translate(59284, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
 								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59521.75, 2497.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
+						<g transform="translate(59284, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
@@ -15424,9 +15572,9 @@
 					</g>
 					<g data-name="void Function(Study, bool)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
-							<rect x="59625.3" y="3365.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
+							<rect x="58958.8" y="3485.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
 						</g>
-						<g transform="translate(59625.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
+						<g transform="translate(58958.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
 								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
 								
@@ -15435,9 +15583,9 @@
 					</g>
 					<g data-name="void Function(Study)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
-							<rect x="59898.3" y="3365.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
+							<rect x="59804.8" y="3485.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
 						</g>
-						<g transform="translate(59898.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
+						<g transform="translate(59804.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
 								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
 								
@@ -15446,9 +15594,9 @@
 					</g>
 					<g data-name="App">
 						<g fill="#eee8d5" stroke="#33322E" data-name="App">
-							<rect x="80074.5" y="121.0" height="31.0" width="47.0" data-name="App"></rect>
+							<rect x="82069.3" y="121.0" height="31.0" width="47.0" data-name="App"></rect>
 						</g>
-						<g transform="translate(80074.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
+						<g transform="translate(82069.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
 								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
 								
@@ -15457,9 +15605,9 @@
 					</g>
 					<g data-name="AppContent">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
-							<rect x="80161.5" y="121.0" height="31.0" width="109.0" data-name="AppContent"></rect>
+							<rect x="82156.3" y="121.0" height="31.0" width="109.0" data-name="AppContent"></rect>
 						</g>
-						<g transform="translate(80161.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
+						<g transform="translate(82156.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
 								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
 								
@@ -15468,16 +15616,16 @@
 					</g>
 					<g data-name="AccountSettingsDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
-							<rect x="37056.8" y="1666.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
-							<path d="M37056.8 1697.5 L37250.8 1697.5" fill="none" data-name="AccountSettingsDialog"></path>
+							<rect x="37942.3" y="1666.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
+							<path d="M37942.3 1697.5 L38136.3 1697.5" fill="none" data-name="AccountSettingsDialog"></path>
 						</g>
-						<g transform="translate(37056.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
+						<g transform="translate(37942.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
 								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37056.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
+						<g transform="translate(37942.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
 								
@@ -15486,17 +15634,17 @@
 					</g>
 					<g data-name="ModelRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepository">
-							<rect x="80641.3" y="986.0" height="453.0" width="662.0" data-name="ModelRepository"></rect>
-							<path d="M80641.3 1017.0 L81303.3 1017.0" fill="none" data-name="ModelRepository"></path>
-							<path d="M80641.3 1123.0 L81303.3 1123.0" fill="none" data-name="ModelRepository"></path>
+							<rect x="82496.0" y="986.0" height="453.0" width="662.0" data-name="ModelRepository"></rect>
+							<path d="M82496.0 1017.0 L83158.0 1017.0" fill="none" data-name="ModelRepository"></path>
+							<path d="M82496.0 1123.0 L83158.0 1123.0" fill="none" data-name="ModelRepository"></path>
 						</g>
-						<g transform="translate(80641.25, 986)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelRepository">
+						<g transform="translate(82496, 986)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepository">
 								<text x="323.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepository">ModelRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80641.25, 1017)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
+						<g transform="translate(82496, 1017)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+delegate: IModelRepositoryDelegate&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">-_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
@@ -15507,7 +15655,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(80641.25, 1123)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
+						<g transform="translate(82496, 1123)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt;? get()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">+dynamic fetchAll()</text>
@@ -15535,17 +15683,17 @@
 					</g>
 					<g data-name="InviteCodeRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepository">
-							<rect x="79311.5" y="2458.5" height="213.0" width="403.0" data-name="InviteCodeRepository"></rect>
-							<path d="M79311.5 2489.5 L79714.5 2489.5" fill="none" data-name="InviteCodeRepository"></path>
-							<path d="M79311.5 2595.5 L79714.5 2595.5" fill="none" data-name="InviteCodeRepository"></path>
+							<rect x="81691.5" y="2518.5" height="213.0" width="403.0" data-name="InviteCodeRepository"></rect>
+							<path d="M81691.5 2549.5 L82094.5 2549.5" fill="none" data-name="InviteCodeRepository"></path>
+							<path d="M81691.5 2655.5 L82094.5 2655.5" fill="none" data-name="InviteCodeRepository"></path>
 						</g>
-						<g transform="translate(79311.5, 2458.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepository">
+						<g transform="translate(81691.5, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepository">
 								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepository">InviteCodeRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79311.5, 2489.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
+						<g transform="translate(81691.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
@@ -15556,7 +15704,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(79311.5, 2595.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
+						<g transform="translate(81691.5, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+String getKey()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
@@ -15568,9 +15716,9 @@
 					</g>
 					<g data-name="ProviderRef">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ProviderRef">
-							<rect x="80391.5" y="3998.5" height="31.0" width="109.0" data-name="ProviderRef"></rect>
+							<rect x="82346.3" y="4118.5" height="31.0" width="109.0" data-name="ProviderRef"></rect>
 						</g>
-						<g transform="translate(80391.5, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ProviderRef">
+						<g transform="translate(82346.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ProviderRef">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProviderRef">
 								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProviderRef">ProviderRef</text>
 								
@@ -15579,16 +15727,16 @@
 					</g>
 					<g data-name="StudyUApi">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApi">
-							<rect x="78258.0" y="3908.0" height="212.0" width="251.0" data-name="StudyUApi"></rect>
-							<path d="M78258.0 3939.0 L78509.0 3939.0" fill="none" data-name="StudyUApi"></path>
+							<rect x="76152.0" y="4028.0" height="212.0" width="251.0" data-name="StudyUApi"></rect>
+							<path d="M76152.0 4059.0 L76403.0 4059.0" fill="none" data-name="StudyUApi"></path>
 						</g>
-						<g transform="translate(78258, 3908)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyUApi">
+						<g transform="translate(76152, 4028)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyUApi">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApi">
 								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApi">StudyUApi</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78258, 3939)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApi">
+						<g transform="translate(76152, 4059)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApi">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApi">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApi">+dynamic saveStudy()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudy()</text>
@@ -15607,17 +15755,17 @@
 					</g>
 					<g data-name="InviteCodeRepositoryDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepositoryDelegate">
-							<rect x="80792.3" y="2458.5" height="213.0" width="299.0" data-name="InviteCodeRepositoryDelegate"></rect>
-							<path d="M80792.3 2489.5 L81091.3 2489.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
-							<path d="M80792.3 2550.5 L81091.3 2550.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
+							<rect x="82607.0" y="2518.5" height="213.0" width="299.0" data-name="InviteCodeRepositoryDelegate"></rect>
+							<path d="M82607.0 2549.5 L82906.0 2549.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
+							<path d="M82607.0 2610.5 L82906.0 2610.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(80792.25, 2458.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+						<g transform="translate(82607, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepositoryDelegate">
 								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepositoryDelegate">InviteCodeRepositoryDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80792.25, 2489.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+						<g transform="translate(82607, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+apiClient: StudyUApi</text>
@@ -15625,7 +15773,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(80792.25, 2550.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+						<g transform="translate(82607, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetch()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetchAll()</text>
@@ -15640,16 +15788,16 @@
 					</g>
 					<g data-name="IModelRepositoryDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepositoryDelegate">
-							<rect x="80924.0" y="1621.5" height="152.0" width="225.0" data-name="IModelRepositoryDelegate"></rect>
-							<path d="M80924.0 1652.5 L81149.0 1652.5" fill="none" data-name="IModelRepositoryDelegate"></path>
+							<rect x="82738.8" y="1621.5" height="152.0" width="225.0" data-name="IModelRepositoryDelegate"></rect>
+							<path d="M82738.8 1652.5 L82963.8 1652.5" fill="none" data-name="IModelRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(80924, 1621.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepositoryDelegate">
+						<g transform="translate(82738.75, 1621.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepositoryDelegate">
 								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepositoryDelegate">IModelRepositoryDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80924, 1652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepositoryDelegate">
+						<g transform="translate(82738.75, 1652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepositoryDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetchAll()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetch()</text>
@@ -15664,17 +15812,17 @@
 					</g>
 					<g data-name="StudyRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepository">
-							<rect x="76954.8" y="3632.0" height="183.0" width="403.0" data-name="StudyRepository"></rect>
-							<path d="M76954.8 3663.0 L77357.8 3663.0" fill="none" data-name="StudyRepository"></path>
-							<path d="M76954.8 3739.0 L77357.8 3739.0" fill="none" data-name="StudyRepository"></path>
+							<rect x="71247.5" y="3752.0" height="183.0" width="403.0" data-name="StudyRepository"></rect>
+							<path d="M71247.5 3783.0 L71650.5 3783.0" fill="none" data-name="StudyRepository"></path>
+							<path d="M71247.5 3859.0 L71650.5 3859.0" fill="none" data-name="StudyRepository"></path>
 						</g>
-						<g transform="translate(76954.75, 3632)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepository">
+						<g transform="translate(71247.5, 3752)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepository">
 								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepository">StudyRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76954.75, 3663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
+						<g transform="translate(71247.5, 3783)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+apiClient: StudyUApi</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+authRepository: IAuthRepository</text>
@@ -15683,7 +15831,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(76954.75, 3739)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
+						<g transform="translate(71247.5, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+String getKey()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+dynamic deleteParticipants()</text>
@@ -15695,24 +15843,24 @@
 					</g>
 					<g data-name="StudyRepositoryDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepositoryDelegate">
-							<rect x="81006.0" y="3624.5" height="198.0" width="282.0" data-name="StudyRepositoryDelegate"></rect>
-							<path d="M81006.0 3655.5 L81288.0 3655.5" fill="none" data-name="StudyRepositoryDelegate"></path>
-							<path d="M81006.0 3701.5 L81288.0 3701.5" fill="none" data-name="StudyRepositoryDelegate"></path>
+							<rect x="82805.0" y="3744.5" height="198.0" width="282.0" data-name="StudyRepositoryDelegate"></rect>
+							<path d="M82805.0 3775.5 L83087.0 3775.5" fill="none" data-name="StudyRepositoryDelegate"></path>
+							<path d="M82805.0 3821.5 L83087.0 3821.5" fill="none" data-name="StudyRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(81006, 3624.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepositoryDelegate">
+						<g transform="translate(82805, 3744.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepositoryDelegate">
 								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepositoryDelegate">StudyRepositoryDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81006, 3655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
+						<g transform="translate(82805, 3775.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+apiClient: StudyUApi</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+authRepository: IAuthRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81006, 3701.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
+						<g transform="translate(82805, 3821.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetchAll()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetch()</text>
@@ -15727,9 +15875,9 @@
 					</g>
 					<g data-name="APIException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="APIException">
-							<rect x="59032.8" y="614.0" height="31.0" width="121.0" data-name="APIException"></rect>
+							<rect x="74835.0" y="614.0" height="31.0" width="121.0" data-name="APIException"></rect>
 						</g>
-						<g transform="translate(59032.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="APIException">
+						<g transform="translate(74835, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="APIException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="APIException">
 								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="APIException">APIException</text>
 								
@@ -15738,9 +15886,9 @@
 					</g>
 					<g data-name="StudyNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotFoundException">
-							<rect x="41716.0" y="1197.0" height="31.0" width="216.0" data-name="StudyNotFoundException"></rect>
+							<rect x="72830.0" y="1197.0" height="31.0" width="216.0" data-name="StudyNotFoundException"></rect>
 						</g>
-						<g transform="translate(41716, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotFoundException">
+						<g transform="translate(72830, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotFoundException">
 								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotFoundException">StudyNotFoundException</text>
 								
@@ -15749,9 +15897,9 @@
 					</g>
 					<g data-name="MeasurementNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementNotFoundException">
-							<rect x="41972.0" y="1197.0" height="31.0" width="279.0" data-name="MeasurementNotFoundException"></rect>
+							<rect x="73086.0" y="1197.0" height="31.0" width="279.0" data-name="MeasurementNotFoundException"></rect>
 						</g>
-						<g transform="translate(41972, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementNotFoundException">
+						<g transform="translate(73086, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementNotFoundException">
 								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementNotFoundException">MeasurementNotFoundException</text>
 								
@@ -15760,9 +15908,9 @@
 					</g>
 					<g data-name="QuestionNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionNotFoundException">
-							<rect x="52763.5" y="1197.0" height="31.0" width="242.0" data-name="QuestionNotFoundException"></rect>
+							<rect x="73405.0" y="1197.0" height="31.0" width="242.0" data-name="QuestionNotFoundException"></rect>
 						</g>
-						<g transform="translate(52763.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionNotFoundException">
+						<g transform="translate(73405, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionNotFoundException">
 								<text x="113.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionNotFoundException">QuestionNotFoundException</text>
 								
@@ -15771,9 +15919,9 @@
 					</g>
 					<g data-name="ConsentItemNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemNotFoundException">
-							<rect x="53045.5" y="1197.0" height="31.0" width="271.0" data-name="ConsentItemNotFoundException"></rect>
+							<rect x="73687.0" y="1197.0" height="31.0" width="271.0" data-name="ConsentItemNotFoundException"></rect>
 						</g>
-						<g transform="translate(53045.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemNotFoundException">
+						<g transform="translate(73687, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemNotFoundException">
 								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemNotFoundException">ConsentItemNotFoundException</text>
 								
@@ -15782,9 +15930,9 @@
 					</g>
 					<g data-name="InterventionNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionNotFoundException">
-							<rect x="53356.5" y="1197.0" height="31.0" width="265.0" data-name="InterventionNotFoundException"></rect>
+							<rect x="73998.0" y="1197.0" height="31.0" width="265.0" data-name="InterventionNotFoundException"></rect>
 						</g>
-						<g transform="translate(53356.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionNotFoundException">
+						<g transform="translate(73998, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionNotFoundException">
 								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionNotFoundException">InterventionNotFoundException</text>
 								
@@ -15793,9 +15941,9 @@
 					</g>
 					<g data-name="InterventionTaskNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskNotFoundException">
-							<rect x="60524.8" y="1197.0" height="31.0" width="303.0" data-name="InterventionTaskNotFoundException"></rect>
+							<rect x="74994.0" y="1197.0" height="31.0" width="303.0" data-name="InterventionTaskNotFoundException"></rect>
 						</g>
-						<g transform="translate(60524.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskNotFoundException">
+						<g transform="translate(74994, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskNotFoundException">
 								<text x="143.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskNotFoundException">InterventionTaskNotFoundException</text>
 								
@@ -15804,9 +15952,9 @@
 					</g>
 					<g data-name="ReportNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportNotFoundException">
-							<rect x="60867.8" y="1197.0" height="31.0" width="224.0" data-name="ReportNotFoundException"></rect>
+							<rect x="75337.0" y="1197.0" height="31.0" width="224.0" data-name="ReportNotFoundException"></rect>
 						</g>
-						<g transform="translate(60867.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportNotFoundException">
+						<g transform="translate(75337, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportNotFoundException">
 								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportNotFoundException">ReportNotFoundException</text>
 								
@@ -15815,9 +15963,9 @@
 					</g>
 					<g data-name="ReportSectionNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionNotFoundException">
-							<rect x="61131.8" y="1197.0" height="31.0" width="283.0" data-name="ReportSectionNotFoundException"></rect>
+							<rect x="75601.0" y="1197.0" height="31.0" width="283.0" data-name="ReportSectionNotFoundException"></rect>
 						</g>
-						<g transform="translate(61131.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionNotFoundException">
+						<g transform="translate(75601, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionNotFoundException">
 								<text x="133.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionNotFoundException">ReportSectionNotFoundException</text>
 								
@@ -15826,9 +15974,9 @@
 					</g>
 					<g data-name="StudyInviteNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInviteNotFoundException">
-							<rect x="61454.8" y="1197.0" height="31.0" width="259.0" data-name="StudyInviteNotFoundException"></rect>
+							<rect x="75924.0" y="1197.0" height="31.0" width="259.0" data-name="StudyInviteNotFoundException"></rect>
 						</g>
-						<g transform="translate(61454.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInviteNotFoundException">
+						<g transform="translate(75924, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInviteNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInviteNotFoundException">
 								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInviteNotFoundException">StudyInviteNotFoundException</text>
 								
@@ -15837,9 +15985,9 @@
 					</g>
 					<g data-name="UserNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="UserNotFoundException">
-							<rect x="61753.8" y="1197.0" height="31.0" width="208.0" data-name="UserNotFoundException"></rect>
+							<rect x="76223.0" y="1197.0" height="31.0" width="208.0" data-name="UserNotFoundException"></rect>
 						</g>
-						<g transform="translate(61753.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserNotFoundException">
+						<g transform="translate(76223, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserNotFoundException">
 								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserNotFoundException">UserNotFoundException</text>
 								
@@ -15848,17 +15996,17 @@
 					</g>
 					<g data-name="StudyUApiClient">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApiClient">
-							<rect x="75871.3" y="4168.0" height="333.0" width="479.0" data-name="StudyUApiClient"></rect>
-							<path d="M75871.3 4199.0 L76350.3 4199.0" fill="none" data-name="StudyUApiClient"></path>
-							<path d="M75871.3 4275.0 L76350.3 4275.0" fill="none" data-name="StudyUApiClient"></path>
+							<rect x="75860.0" y="4288.0" height="333.0" width="479.0" data-name="StudyUApiClient"></rect>
+							<path d="M75860.0 4319.0 L76339.0 4319.0" fill="none" data-name="StudyUApiClient"></path>
+							<path d="M75860.0 4395.0 L76339.0 4395.0" fill="none" data-name="StudyUApiClient"></path>
 						</g>
-						<g transform="translate(75871.25, 4168)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUApiClient">
+						<g transform="translate(75860, 4288)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUApiClient">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApiClient">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApiClient">StudyUApiClient</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75871.25, 4199)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
+						<g transform="translate(75860, 4319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+supabaseClient: SupabaseClient</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyColumns: List&lt;String&gt;</text>
@@ -15867,7 +16015,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(75871.25, 4275)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
+						<g transform="translate(75860, 4395)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteParticipants()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">+dynamic getUserStudies()</text>
@@ -15889,9 +16037,9 @@
 					</g>
 					<g data-name="SupabaseClient">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClient">
-							<rect x="75615.8" y="4541.0" height="31.0" width="141.0" data-name="SupabaseClient"></rect>
+							<rect x="75775.5" y="4661.0" height="31.0" width="141.0" data-name="SupabaseClient"></rect>
 						</g>
-						<g transform="translate(75615.75, 4541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseClient">
+						<g transform="translate(75775.5, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseClient">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClient">
 								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClient">SupabaseClient</text>
 								
@@ -15900,16 +16048,16 @@
 					</g>
 					<g data-name="SupabaseClientDependant">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClientDependant">
-							<rect x="75649.3" y="3983.0" height="62.0" width="284.0" data-name="SupabaseClientDependant"></rect>
-							<path d="M75649.3 4014.0 L75933.3 4014.0" fill="none" data-name="SupabaseClientDependant"></path>
+							<rect x="75475.0" y="4103.0" height="62.0" width="284.0" data-name="SupabaseClientDependant"></rect>
+							<path d="M75475.0 4134.0 L75759.0 4134.0" fill="none" data-name="SupabaseClientDependant"></path>
 						</g>
-						<g transform="translate(75649.25, 3983)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseClientDependant">
+						<g transform="translate(75475, 4103)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseClientDependant">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClientDependant">
 								<text x="134.0" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClientDependant">SupabaseClientDependant</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75649.25, 4014)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseClientDependant">
+						<g transform="translate(75475, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseClientDependant">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseClientDependant">
 								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseClientDependant">+supabaseClient: SupabaseClient</text>
 								
@@ -15918,16 +16066,16 @@
 					</g>
 					<g data-name="SupabaseQueryMixin">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryMixin">
-							<rect x="76003.3" y="3945.5" height="137.0" width="215.0" data-name="SupabaseQueryMixin"></rect>
-							<path d="M76003.3 3976.5 L76218.3 3976.5" fill="none" data-name="SupabaseQueryMixin"></path>
+							<rect x="75814.0" y="4065.5" height="137.0" width="215.0" data-name="SupabaseQueryMixin"></rect>
+							<path d="M75814.0 4096.5 L76029.0 4096.5" fill="none" data-name="SupabaseQueryMixin"></path>
 						</g>
-						<g transform="translate(76003.25, 3945.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseQueryMixin">
+						<g transform="translate(75814, 4065.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseQueryMixin">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryMixin">
 								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryMixin">SupabaseQueryMixin</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76003.25, 3976.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryMixin">
+						<g transform="translate(75814, 4096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryMixin">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryMixin">
 								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic deleteAll()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getAll()</text>
@@ -15941,16 +16089,16 @@
 					</g>
 					<g data-name="IAppRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IAppRepository">
-							<rect x="62894.5" y="3342.0" height="77.0" width="230.0" data-name="IAppRepository"></rect>
-							<path d="M62894.5 3373.0 L63124.5 3373.0" fill="none" data-name="IAppRepository"></path>
+							<rect x="59534.8" y="3462.0" height="77.0" width="230.0" data-name="IAppRepository"></rect>
+							<path d="M59534.8 3493.0 L59764.8 3493.0" fill="none" data-name="IAppRepository"></path>
 						</g>
-						<g transform="translate(62894.5, 3342)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppRepository">
+						<g transform="translate(59534.75, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppRepository">
 								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAppRepository">IAppRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62894.5, 3373)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppRepository">
+						<g transform="translate(59534.75, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IAppRepository">+dynamic fetchAppConfig()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IAppRepository">+void dispose()</text>
@@ -15960,23 +16108,23 @@
 					</g>
 					<g data-name="AppRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppRepository">
-							<rect x="62894.5" y="3669.5" height="108.0" width="230.0" data-name="AppRepository"></rect>
-							<path d="M62894.5 3700.5 L63124.5 3700.5" fill="none" data-name="AppRepository"></path>
-							<path d="M62894.5 3731.5 L63124.5 3731.5" fill="none" data-name="AppRepository"></path>
+							<rect x="59534.8" y="3789.5" height="108.0" width="230.0" data-name="AppRepository"></rect>
+							<path d="M59534.8 3820.5 L59764.8 3820.5" fill="none" data-name="AppRepository"></path>
+							<path d="M59534.8 3851.5 L59764.8 3851.5" fill="none" data-name="AppRepository"></path>
 						</g>
-						<g transform="translate(62894.5, 3669.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppRepository">
+						<g transform="translate(59534.75, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppRepository">
 								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppRepository">AppRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62894.5, 3700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
+						<g transform="translate(59534.75, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+apiClient: StudyUApi</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62894.5, 3731.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
+						<g transform="translate(59534.75, 3851.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+dynamic fetchAppConfig()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AppRepository">+void dispose()</text>
@@ -15986,9 +16134,9 @@
 					</g>
 					<g data-name="StudyUUser">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUUser">
-							<rect x="76258.3" y="3998.5" height="31.0" width="110.0" data-name="StudyUUser"></rect>
+							<rect x="75325.0" y="4118.5" height="31.0" width="110.0" data-name="StudyUUser"></rect>
 						</g>
-						<g transform="translate(76258.25, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUUser">
+						<g transform="translate(75325, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUUser">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUUser">
 								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUUser">StudyUUser</text>
 								
@@ -15997,17 +16145,17 @@
 					</g>
 					<g data-name="UserRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="UserRepository">
-							<rect x="73886.0" y="3639.5" height="168.0" width="282.0" data-name="UserRepository"></rect>
-							<path d="M73886.0 3670.5 L74168.0 3670.5" fill="none" data-name="UserRepository"></path>
-							<path d="M73886.0 3746.5 L74168.0 3746.5" fill="none" data-name="UserRepository"></path>
+							<rect x="69489.5" y="3759.5" height="168.0" width="282.0" data-name="UserRepository"></rect>
+							<path d="M69489.5 3790.5 L69771.5 3790.5" fill="none" data-name="UserRepository"></path>
+							<path d="M69489.5 3866.5 L69771.5 3866.5" fill="none" data-name="UserRepository"></path>
 						</g>
-						<g transform="translate(73886, 3639.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserRepository">
+						<g transform="translate(69489.5, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserRepository">
 								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserRepository">UserRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73886, 3670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
+						<g transform="translate(69489.5, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+apiClient: StudyUApi</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+authRepository: IAuthRepository</text>
@@ -16016,7 +16164,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(73886, 3746.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
+						<g transform="translate(69489.5, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+dynamic fetchUser()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+dynamic saveUser()</text>
@@ -16027,9 +16175,9 @@
 					</g>
 					<g data-name="Ref">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Ref">
-							<rect x="78175.0" y="3998.5" height="31.0" width="43.0" data-name="Ref"></rect>
+							<rect x="76069.0" y="4118.5" height="31.0" width="43.0" data-name="Ref"></rect>
 						</g>
-						<g transform="translate(78175, 3998.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Ref">
+						<g transform="translate(76069, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Ref">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Ref">
 								<text x="13.5" y="13.5" stroke="none" text-anchor="middle" data-name="Ref">Ref</text>
 								
@@ -16038,16 +16186,16 @@
 					</g>
 					<g data-name="PreferenceAction">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PreferenceAction">
-							<rect x="2942.0" y="3327.0" height="107.0" width="334.0" data-name="PreferenceAction"></rect>
-							<path d="M2942.0 3358.0 L3276.0 3358.0" fill="none" data-name="PreferenceAction"></path>
+							<rect x="2929.0" y="3447.0" height="107.0" width="334.0" data-name="PreferenceAction"></rect>
+							<path d="M2929.0 3478.0 L3263.0 3478.0" fill="none" data-name="PreferenceAction"></path>
 						</g>
-						<g transform="translate(2942, 3327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreferenceAction">
+						<g transform="translate(2929, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreferenceAction">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreferenceAction">
 								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="PreferenceAction">PreferenceAction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2942, 3358)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreferenceAction">
+						<g transform="translate(2929, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreferenceAction">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreferenceAction">
 								<text x="0.0" y="13.5" stroke="none" data-name="PreferenceAction">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+values: List&lt;PreferenceAction&gt;</text>
@@ -16059,9 +16207,9 @@
 					</g>
 					<g data-name="User">
 						<g fill="#eee8d5" stroke="#33322E" data-name="User">
-							<rect x="75168.5" y="4541.0" height="31.0" width="53.0" data-name="User"></rect>
+							<rect x="71349.3" y="4661.0" height="31.0" width="53.0" data-name="User"></rect>
 						</g>
-						<g transform="translate(75168.5, 4541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="User">
+						<g transform="translate(71349.25, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="User">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="User">
 								<text x="18.5" y="13.5" stroke="none" text-anchor="middle" data-name="User">User</text>
 								
@@ -16070,9 +16218,9 @@
 					</g>
 					<g data-name="Session">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Session">
-							<rect x="75261.5" y="4541.0" height="31.0" width="79.0" data-name="Session"></rect>
+							<rect x="75255.8" y="4661.0" height="31.0" width="79.0" data-name="Session"></rect>
 						</g>
-						<g transform="translate(75261.5, 4541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Session">
+						<g transform="translate(75255.75, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Session">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Session">
 								<text x="31.5" y="13.5" stroke="none" text-anchor="middle" data-name="Session">Session</text>
 								
@@ -16081,30 +16229,29 @@
 					</g>
 					<g data-name="AuthRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AuthRepository">
-							<rect x="75431.0" y="4183.0" height="303.0" width="340.0" data-name="AuthRepository"></rect>
-							<path d="M75431.0 4214.0 L75771.0 4214.0" fill="none" data-name="AuthRepository"></path>
-							<path d="M75431.0 4350.0 L75771.0 4350.0" fill="none" data-name="AuthRepository"></path>
+							<rect x="75249.8" y="4310.5" height="288.0" width="295.0" data-name="AuthRepository"></rect>
+							<path d="M75249.8 4341.5 L75544.8 4341.5" fill="none" data-name="AuthRepository"></path>
+							<path d="M75249.8 4462.5 L75544.8 4462.5" fill="none" data-name="AuthRepository"></path>
 						</g>
-						<g transform="translate(75431, 4183)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthRepository">
+						<g transform="translate(75249.75, 4310.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthRepository">
-								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthRepository">AuthRepository</text>
+								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthRepository">AuthRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75431, 4214)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
+						<g transform="translate(75249.75, 4341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">+supabaseClient: SupabaseClient</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+sharedPreferences: SharedPreferences</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+allowPasswordReset: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+authClient: GoTrueClient</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+session: Session?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+serializedSession: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+currentUser: User?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthRepository">+isLoggedIn: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+allowPasswordReset: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+authClient: GoTrueClient</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+session: Session?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+serializedSession: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+currentUser: User?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+isLoggedIn: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75431, 4350)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
+						<g transform="translate(75249.75, 4462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">-void _registerAuthListener()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+dynamic signUp()</text>
@@ -16120,9 +16267,9 @@
 					</g>
 					<g data-name="GoTrueClient">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GoTrueClient">
-							<rect x="75455.8" y="4541.0" height="31.0" width="120.0" data-name="GoTrueClient"></rect>
+							<rect x="75374.8" y="4661.0" height="31.0" width="120.0" data-name="GoTrueClient"></rect>
 						</g>
-						<g transform="translate(75455.75, 4541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoTrueClient">
+						<g transform="translate(75374.75, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoTrueClient">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoTrueClient">
 								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoTrueClient">GoTrueClient</text>
 								
@@ -16131,9 +16278,9 @@
 					</g>
 					<g data-name="StudyLaunched">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyLaunched">
-							<rect x="76457.0" y="614.0" height="31.0" width="140.0" data-name="StudyLaunched"></rect>
+							<rect x="78470.5" y="614.0" height="31.0" width="140.0" data-name="StudyLaunched"></rect>
 						</g>
-						<g transform="translate(76457, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyLaunched">
+						<g transform="translate(78470.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyLaunched">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyLaunched">
 								<text x="62.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyLaunched">StudyLaunched</text>
 								
@@ -16142,16 +16289,16 @@
 					</g>
 					<g data-name="ModelEvent">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ModelEvent">
-							<rect x="76721.3" y="98.0" height="77.0" width="145.0" data-name="ModelEvent"></rect>
-							<path d="M76721.3 129.0 L76866.3 129.0" fill="none" data-name="ModelEvent"></path>
+							<rect x="78877.8" y="98.0" height="77.0" width="145.0" data-name="ModelEvent"></rect>
+							<path d="M78877.8 129.0 L79022.8 129.0" fill="none" data-name="ModelEvent"></path>
 						</g>
-						<g transform="translate(76721.25, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelEvent">
+						<g transform="translate(78877.75, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelEvent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelEvent">
 								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelEvent">ModelEvent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76721.25, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelEvent">
+						<g transform="translate(78877.75, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelEvent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelEvent">
 								<text x="0.0" y="13.5" stroke="none" data-name="ModelEvent">+modelId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ModelEvent">+model: T</text>
@@ -16161,16 +16308,16 @@
 					</g>
 					<g data-name="SupabaseQueryError">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryError">
-							<rect x="64163.3" y="583.5" height="92.0" width="183.0" data-name="SupabaseQueryError"></rect>
-							<path d="M64163.3 614.5 L64346.3 614.5" fill="none" data-name="SupabaseQueryError"></path>
+							<rect x="76335.8" y="583.5" height="92.0" width="183.0" data-name="SupabaseQueryError"></rect>
+							<path d="M76335.8 614.5 L76518.8 614.5" fill="none" data-name="SupabaseQueryError"></path>
 						</g>
-						<g transform="translate(64163.25, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseQueryError">
+						<g transform="translate(76335.75, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseQueryError">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryError">
 								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryError">SupabaseQueryError</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64163.25, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryError">
+						<g transform="translate(76335.75, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryError">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryError">
 								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryError">+statusCode: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryError">+message: String</text>
@@ -16181,17 +16328,17 @@
 					</g>
 					<g data-name="WrappedModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WrappedModel">
-							<rect x="60784.0" y="2436.0" height="258.0" width="251.0" data-name="WrappedModel"></rect>
-							<path d="M60784.0 2467.0 L61035.0 2467.0" fill="none" data-name="WrappedModel"></path>
-							<path d="M60784.0 2618.0 L61035.0 2618.0" fill="none" data-name="WrappedModel"></path>
+							<rect x="60864.0" y="2496.0" height="258.0" width="251.0" data-name="WrappedModel"></rect>
+							<path d="M60864.0 2527.0 L61115.0 2527.0" fill="none" data-name="WrappedModel"></path>
+							<path d="M60864.0 2678.0 L61115.0 2678.0" fill="none" data-name="WrappedModel"></path>
 						</g>
-						<g transform="translate(60784, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WrappedModel">
+						<g transform="translate(60864, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WrappedModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WrappedModel">
 								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="WrappedModel">WrappedModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60784, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
+						<g transform="translate(60864, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">-_model: T</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+asyncValue: AsyncValue&lt;T&gt;</text>
@@ -16205,7 +16352,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(60784, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
+						<g transform="translate(60864, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">+dynamic markWithError()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+dynamic markAsLoading()</text>
@@ -16217,9 +16364,9 @@
 					</g>
 					<g data-name="ModelRepositoryException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepositoryException">
-							<rect x="64617.3" y="614.0" height="31.0" width="227.0" data-name="ModelRepositoryException"></rect>
+							<rect x="76558.8" y="614.0" height="31.0" width="227.0" data-name="ModelRepositoryException"></rect>
 						</g>
-						<g transform="translate(64617.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelRepositoryException">
+						<g transform="translate(76558.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelRepositoryException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepositoryException">
 								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepositoryException">ModelRepositoryException</text>
 								
@@ -16228,9 +16375,9 @@
 					</g>
 					<g data-name="ModelNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ModelNotFoundException">
-							<rect x="64621.3" y="1197.0" height="31.0" width="219.0" data-name="ModelNotFoundException"></rect>
+							<rect x="76562.8" y="1197.0" height="31.0" width="219.0" data-name="ModelNotFoundException"></rect>
 						</g>
-						<g transform="translate(64621.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelNotFoundException">
+						<g transform="translate(76562.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelNotFoundException">
 								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelNotFoundException">ModelNotFoundException</text>
 								
@@ -16239,16 +16386,16 @@
 					</g>
 					<g data-name="IModelRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepository">
-							<rect x="80781.3" y="501.0" height="257.0" width="382.0" data-name="IModelRepository"></rect>
-							<path d="M80781.3 532.0 L81163.3 532.0" fill="none" data-name="IModelRepository"></path>
+							<rect x="82636.0" y="501.0" height="257.0" width="382.0" data-name="IModelRepository"></rect>
+							<path d="M82636.0 532.0 L83018.0 532.0" fill="none" data-name="IModelRepository"></path>
 						</g>
-						<g transform="translate(80781.25, 501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepository">
+						<g transform="translate(82636, 501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepository">
 								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepository">IModelRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80781.25, 532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepository">
+						<g transform="translate(82636, 532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepository">+String getKey()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepository">+WrappedModel&lt;T&gt;? get()</text>
@@ -16270,9 +16417,9 @@
 					</g>
 					<g data-name="IsFetched">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IsFetched">
-							<rect x="77405.3" y="614.0" height="31.0" width="94.0" data-name="IsFetched"></rect>
+							<rect x="78650.5" y="614.0" height="31.0" width="94.0" data-name="IsFetched"></rect>
 						</g>
-						<g transform="translate(77405.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsFetched">
+						<g transform="translate(78650.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsFetched">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsFetched">
 								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsFetched">IsFetched</text>
 								
@@ -16281,9 +16428,9 @@
 					</g>
 					<g data-name="IsSaving">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaving">
-							<rect x="77539.3" y="614.0" height="31.0" width="84.0" data-name="IsSaving"></rect>
+							<rect x="78784.5" y="614.0" height="31.0" width="84.0" data-name="IsSaving"></rect>
 						</g>
-						<g transform="translate(77539.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaving">
+						<g transform="translate(78784.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaving">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaving">
 								<text x="34.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaving">IsSaving</text>
 								
@@ -16292,9 +16439,9 @@
 					</g>
 					<g data-name="IsSaved">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaved">
-							<rect x="77663.3" y="614.0" height="31.0" width="80.0" data-name="IsSaved"></rect>
+							<rect x="79505.5" y="614.0" height="31.0" width="80.0" data-name="IsSaved"></rect>
 						</g>
-						<g transform="translate(77663.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaved">
+						<g transform="translate(79505.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaved">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaved">
 								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaved">IsSaved</text>
 								
@@ -16303,9 +16450,9 @@
 					</g>
 					<g data-name="IsDeleted">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IsDeleted">
-							<rect x="77783.3" y="614.0" height="31.0" width="91.0" data-name="IsDeleted"></rect>
+							<rect x="79625.5" y="614.0" height="31.0" width="91.0" data-name="IsDeleted"></rect>
 						</g>
-						<g transform="translate(77783.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsDeleted">
+						<g transform="translate(79625.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsDeleted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsDeleted">
 								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="IsDeleted">IsDeleted</text>
 								

From e63fe7563e5ed4bfe6dc943a17e5870cca406ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20G=C3=B6cer?= <dev@hig.dev>
Date: Thu, 18 Apr 2024 19:35:18 +0200
Subject: [PATCH 007/314] fix: calculation of totalInterventions

---
 .../src/models/study_schedule/study_schedule.dart  |  8 ++++++++
 core/lib/src/models/tables/study_subject.dart      |  5 +----
 .../lib/features/monitor/study_monitor_table.dart  | 14 ++++++++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/core/lib/src/models/study_schedule/study_schedule.dart b/core/lib/src/models/study_schedule/study_schedule.dart
index 1b841edb7..420c989b4 100644
--- a/core/lib/src/models/study_schedule/study_schedule.dart
+++ b/core/lib/src/models/study_schedule/study_schedule.dart
@@ -1,4 +1,5 @@
 import 'package:json_annotation/json_annotation.dart';
+import 'package:studyu_core/core.dart';
 
 part 'study_schedule.g.dart';
 
@@ -29,6 +30,13 @@ class StudySchedule {
     return phases;
   }
 
+  List<String> generateInterventionIdsInOrder(List<String> interventionsIds) {
+    return [
+      if (includeBaseline) Study.baselineID,
+      ...generateWith(0).map<String>((int index) => interventionsIds[index]),
+    ];
+  }
+
   int _nextIntervention(int index) => (index + 1) % numberOfInterventions;
 
   List<int> _generateCycle(int first, int cycle) {
diff --git a/core/lib/src/models/tables/study_subject.dart b/core/lib/src/models/tables/study_subject.dart
index 90517d868..4a15d59f1 100644
--- a/core/lib/src/models/tables/study_subject.dart
+++ b/core/lib/src/models/tables/study_subject.dart
@@ -64,10 +64,7 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
       : id = const Uuid().v4(),
         studyId = study.id;
 
-  List<String> get interventionOrder => [
-        if (study.schedule.includeBaseline) Study.baselineID,
-        ...study.schedule.generateWith(0).map<String>((int index) => selectedInterventionIds[index]),
-      ];
+  List<String> get interventionOrder => study.schedule.generateInterventionIdsInOrder(selectedInterventionIds);
 
   List<Intervention> get selectedInterventions {
     final selectedInterventions = selectedInterventionIds
diff --git a/designer_v2/lib/features/monitor/study_monitor_table.dart b/designer_v2/lib/features/monitor/study_monitor_table.dart
index 62e8e60a0..3950dd8dd 100644
--- a/designer_v2/lib/features/monitor/study_monitor_table.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_table.dart
@@ -46,14 +46,24 @@ class StudyMonitorItem extends Equatable {
     for (final participant in participants) {
       final progresses = participantsProgress.where((progress) => progress.subjectId == participant.id).toList();
       progresses.sort((b, a) => a.completedAt!.compareTo(b.completedAt!)); // descending
-      final interventions = participant.selectedInterventionIds;
+      final interventionOrder = study.schedule.generateInterventionIdsInOrder(participant.selectedInterventionIds);
       final lastActivityAt = progresses.isNotEmpty ? progresses.first.completedAt! : participant.startedAt!;
       final studyDurationInDays = study.schedule.length;
       final currentDayOfStudy =
           min(studyDurationInDays, DateTime.now().toUtc().difference(participant.startedAt!).inDays);
       final daysInBaseline = study.schedule.includeBaseline ? study.schedule.phaseDuration : 0;
 
-      final totalInterventions = max(0, currentDayOfStudy - daysInBaseline);
+      int totalInterventions = 0;
+      for (int day = 0; day < currentDayOfStudy; day++) {
+        if (day < daysInBaseline) {
+          continue;
+        }
+
+        final interventionIdForThisPhase = interventionOrder[day ~/ study.schedule.phaseDuration];
+        final interventionForThisPhase = study.interventions.firstWhere((i) => i.id == interventionIdForThisPhase);
+        totalInterventions += interventionForThisPhase.tasks.length;
+      }
+
       final totalSurveys = currentDayOfStudy * study.observations.length;
 
       final completedInterventions = progresses.where((p) => p.resultType == "bool").toList();

From 45df4ce7e8eec49706d42ce081acbd9704aff9ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20G=C3=B6cer?= <dev@hig.dev>
Date: Wed, 24 Apr 2024 19:45:58 +0200
Subject: [PATCH 008/314] feat: add dropout stats to monitoring

---
 designer_v2/lib/domain/study_monitoring.dart  | 129 ++++++++++++++++++
 .../participant_details_form_controller.dart  |   4 +-
 .../features/monitor/study_monitor_page.dart  |  30 ++--
 .../features/monitor/study_monitor_table.dart | 100 +-------------
 designer_v2/lib/localization/app_de.arb       |   8 +-
 designer_v2/lib/localization/app_en.arb       |   8 +-
 6 files changed, 159 insertions(+), 120 deletions(-)
 create mode 100644 designer_v2/lib/domain/study_monitoring.dart

diff --git a/designer_v2/lib/domain/study_monitoring.dart b/designer_v2/lib/domain/study_monitoring.dart
new file mode 100644
index 000000000..8689c338e
--- /dev/null
+++ b/designer_v2/lib/domain/study_monitoring.dart
@@ -0,0 +1,129 @@
+import 'dart:math';
+
+import 'package:equatable/equatable.dart';
+import 'package:studyu_core/core.dart';
+
+class StudyMonitorData {
+  /// Number of participants who are currently active in the study
+  /// Active means that the the study has not ended yet and the participant did not drop out
+  final int activeParticipants;
+
+  /// Number of participants who dropped out of the study before the study ended
+  /// Hint: The is_deleted flag in the study_subject database table marks a participant as dropped out
+  final int dropoutParticipants;
+
+  /// Number of participants who completed the study
+  /// Completed means that the participant has reached the end of the study
+  final int completedParticipants;
+
+  /// List of all participants with their monitoring data
+  final List<StudyMonitorItem> items;
+
+  const StudyMonitorData({
+    required this.activeParticipants,
+    required this.dropoutParticipants,
+    required this.completedParticipants,
+    required this.items,
+  });
+}
+
+class StudyMonitorItem extends Equatable {
+  final String participantId;
+  final String? inviteCode;
+  final DateTime enrolledAt;
+  final DateTime lastActivityAt;
+  final int currentDayOfStudy;
+  final int studyDurationInDays;
+  final int completedInterventions;
+  final int missedInterventions;
+  final int completedSurveys;
+  final int missedSurveys;
+  final bool droppedOut;
+
+  const StudyMonitorItem({
+    required this.participantId,
+    required this.inviteCode,
+    required this.enrolledAt,
+    required this.lastActivityAt,
+    required this.currentDayOfStudy,
+    required this.studyDurationInDays,
+    required this.completedInterventions,
+    required this.missedInterventions,
+    required this.completedSurveys,
+    required this.missedSurveys,
+    required this.droppedOut,
+  });
+
+  @override
+  List<Object?> get props => [participantId];
+}
+
+extension StudyMonitoringX on Study {
+  StudyMonitorData get monitorData {
+    final List<StudyMonitorItem> items = [];
+
+    final participants = this.participants ?? [];
+    final participantsProgress = this.participantsProgress ?? [];
+
+    participants.sort((a, b) => a.startedAt!.compareTo(b.startedAt!)); // ascending
+
+    for (final participant in participants) {
+      final progresses = participantsProgress.where((progress) => progress.subjectId == participant.id).toList();
+      progresses.sort((b, a) => a.completedAt!.compareTo(b.completedAt!)); // descending
+      final interventionOrder = schedule.generateInterventionIdsInOrder(participant.selectedInterventionIds);
+      final lastActivityAt = progresses.isNotEmpty ? progresses.first.completedAt! : participant.startedAt!;
+      final studyDurationInDays = schedule.length;
+      final currentDayOfStudy =
+          min(studyDurationInDays, DateTime.now().toUtc().difference(participant.startedAt!).inDays);
+      final daysInBaseline = schedule.includeBaseline ? schedule.phaseDuration : 0;
+
+      int totalInterventions = 0;
+      for (int day = 0; day < currentDayOfStudy; day++) {
+        if (day < daysInBaseline) {
+          continue;
+        }
+
+        final interventionIdForThisPhase = interventionOrder[day ~/ schedule.phaseDuration];
+        final interventionForThisPhase = interventions.firstWhere((i) => i.id == interventionIdForThisPhase);
+        totalInterventions += interventionForThisPhase.tasks.length;
+      }
+
+      final totalSurveys = currentDayOfStudy * observations.length;
+
+      final completedInterventions = progresses.where((p) => p.resultType == "bool").toList();
+      final completedSurveys = progresses.where((p) => p.resultType != "bool").toList();
+
+      final missedInterventions = totalInterventions - completedInterventions.length;
+      final missedSurveys = totalSurveys - completedSurveys.length;
+
+      items.add(StudyMonitorItem(
+        participantId: participant.id,
+        inviteCode: participant.inviteCode,
+        enrolledAt: participant.startedAt!,
+        lastActivityAt: lastActivityAt,
+        currentDayOfStudy: currentDayOfStudy,
+        studyDurationInDays: studyDurationInDays,
+        completedInterventions: completedInterventions.length,
+        missedInterventions: missedInterventions,
+        completedSurveys: completedSurveys.length,
+        missedSurveys: missedSurveys,
+        droppedOut: participant.isDeleted,
+      ));
+    }
+
+    final activeParticipants =
+        items.where((item) => !item.droppedOut && item.currentDayOfStudy < item.studyDurationInDays).length;
+    final dropoutParticipants =
+        items.where((item) => item.droppedOut && item.currentDayOfStudy < item.studyDurationInDays).length;
+    final completedParticipants = items.where((item) => item.currentDayOfStudy >= item.studyDurationInDays).length;
+
+    assert(activeParticipants + dropoutParticipants + completedParticipants == items.length);
+
+    return StudyMonitorData(
+      activeParticipants: activeParticipants,
+      dropoutParticipants: dropoutParticipants,
+      completedParticipants: completedParticipants,
+      items: items,
+    );
+  }
+}
diff --git a/designer_v2/lib/features/monitor/participant_details_form_controller.dart b/designer_v2/lib/features/monitor/participant_details_form_controller.dart
index 90f8ec706..055d41128 100644
--- a/designer_v2/lib/features/monitor/participant_details_form_controller.dart
+++ b/designer_v2/lib/features/monitor/participant_details_form_controller.dart
@@ -1,7 +1,7 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:reactive_forms/reactive_forms.dart';
+import 'package:studyu_designer_v2/domain/study_monitoring.dart';
 import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
-import 'package:studyu_designer_v2/features/monitor/study_monitor_table.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 
 class ParticipantDetailsFormViewModel extends FormViewModel<StudyMonitorItem> {
@@ -34,7 +34,7 @@ class ParticipantDetailsFormViewModel extends FormViewModel<StudyMonitorItem> {
   @override
   void setControlsFrom(StudyMonitorItem data) {
     participantIdControl.value = data.participantId;
-    rawDataControl.value = data.rawData;
+    rawDataControl.value = "";
   }
 }
 
diff --git a/designer_v2/lib/features/monitor/study_monitor_page.dart b/designer_v2/lib/features/monitor/study_monitor_page.dart
index 83193aa43..a7150f018 100644
--- a/designer_v2/lib/features/monitor/study_monitor_page.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_page.dart
@@ -6,6 +6,7 @@ import 'package:studyu_designer_v2/common_views/empty_body.dart';
 import 'package:studyu_designer_v2/common_views/form_buttons.dart';
 import 'package:studyu_designer_v2/common_views/sidesheet/sidesheet_form.dart';
 import 'package:studyu_designer_v2/common_views/utils.dart';
+import 'package:studyu_designer_v2/domain/study_monitoring.dart';
 import 'package:studyu_designer_v2/features/monitor/participant_details_form_controller.dart';
 import 'package:studyu_designer_v2/features/monitor/participant_details_form_view.dart';
 import 'package:studyu_designer_v2/features/monitor/study_monitor_table.dart';
@@ -22,16 +23,16 @@ class StudyMonitorScreen extends StudyPageWidget {
     return AsyncValueWidget<Study>(
         value: state.study,
         data: (study) {
-          final studyMonitorItems = StudyMonitorItem.fromStudy(study);
+          final studyMonitorData = study.monitorData;
           return Column(
             mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: <Widget>[
-              _monitorSectionHeader(context, study),
+              _monitorSectionHeader(context, studyMonitorData),
               const SizedBox(height: 40.0), // spacing between body elements
-              studyMonitorItems.isNotEmpty
+              studyMonitorData.items.isNotEmpty
                   ? StudyMonitorTable(
-                      studyMonitorItems: studyMonitorItems,
+                      studyMonitorItems: studyMonitorData.items,
                       onSelectItem: (item) => _onSelectParticipant(context, ref, item),
                     )
                   : EmptyBody(
@@ -43,13 +44,9 @@ class StudyMonitorScreen extends StudyPageWidget {
         });
   }
 
-  Widget _monitorSectionHeader(BuildContext context, Study study) {
-    // Using study.participants.length because participantCount does not include soft deleted participants
-    final enrolled = study.participants?.length ?? study.participantCount;
-    // Active participants are those who were active in the last 3 days
-    final active = study.activeSubjectCount;
-    // Ended participants are those with days in study >= study duration
-    final ended = study.endedCount;
+  Widget _monitorSectionHeader(BuildContext context, StudyMonitorData monitorData) {
+    final enrolled =
+        monitorData.activeParticipants + monitorData.dropoutParticipants + monitorData.completedParticipants;
     return Row(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -59,9 +56,16 @@ class StudyMonitorScreen extends StudyPageWidget {
           child: Row(
             children: [
               Expanded(
-                  child: _buildStat(context, tr.monitoring_active, tr.monitoring_active_tooltip, active, enrolled)),
+                  child: _buildStat(context, tr.monitoring_active, tr.monitoring_active_tooltip,
+                      monitorData.activeParticipants, enrolled)),
               const SizedBox(width: 20.0),
-              Expanded(child: _buildStat(context, tr.monitoring_ended, tr.monitoring_ended_tooltip, ended, enrolled)),
+              Expanded(
+                  child: _buildStat(context, tr.monitoring_dropout, tr.monitoring_dropout_tooltip,
+                      monitorData.dropoutParticipants, enrolled)),
+              const SizedBox(width: 20.0),
+              Expanded(
+                  child: _buildStat(context, tr.monitoring_completed, tr.monitoring_completed_tooltip,
+                      monitorData.completedParticipants, enrolled)),
             ],
           ),
         ),
diff --git a/designer_v2/lib/features/monitor/study_monitor_table.dart b/designer_v2/lib/features/monitor/study_monitor_table.dart
index 3950dd8dd..a5b8322d0 100644
--- a/designer_v2/lib/features/monitor/study_monitor_table.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_table.dart
@@ -1,107 +1,9 @@
-import 'dart:convert';
-import 'dart:math';
-
-import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
-import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/common_views/standard_table.dart';
+import 'package:studyu_designer_v2/domain/study_monitoring.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 
-class StudyMonitorItem extends Equatable {
-  final String participantId;
-  final String? inviteCode;
-  final DateTime enrolledAt;
-  final DateTime lastActivityAt;
-  final int currentDayOfStudy;
-  final int studyDurationInDays;
-  final int completedInterventions;
-  final int missedInterventions;
-  final int completedSurveys;
-  final int missedSurveys;
-  final String rawData;
-
-  const StudyMonitorItem({
-    required this.participantId,
-    required this.inviteCode,
-    required this.enrolledAt,
-    required this.lastActivityAt,
-    required this.currentDayOfStudy,
-    required this.studyDurationInDays,
-    required this.completedInterventions,
-    required this.missedInterventions,
-    required this.completedSurveys,
-    required this.missedSurveys,
-    required this.rawData,
-  });
-
-  static List<StudyMonitorItem> fromStudy(Study study) {
-    final List<StudyMonitorItem> items = [];
-
-    final participants = study.participants ?? [];
-    final participantsProgress = study.participantsProgress ?? [];
-
-    participants.sort((a, b) => a.startedAt!.compareTo(b.startedAt!)); // ascending
-
-    for (final participant in participants) {
-      final progresses = participantsProgress.where((progress) => progress.subjectId == participant.id).toList();
-      progresses.sort((b, a) => a.completedAt!.compareTo(b.completedAt!)); // descending
-      final interventionOrder = study.schedule.generateInterventionIdsInOrder(participant.selectedInterventionIds);
-      final lastActivityAt = progresses.isNotEmpty ? progresses.first.completedAt! : participant.startedAt!;
-      final studyDurationInDays = study.schedule.length;
-      final currentDayOfStudy =
-          min(studyDurationInDays, DateTime.now().toUtc().difference(participant.startedAt!).inDays);
-      final daysInBaseline = study.schedule.includeBaseline ? study.schedule.phaseDuration : 0;
-
-      int totalInterventions = 0;
-      for (int day = 0; day < currentDayOfStudy; day++) {
-        if (day < daysInBaseline) {
-          continue;
-        }
-
-        final interventionIdForThisPhase = interventionOrder[day ~/ study.schedule.phaseDuration];
-        final interventionForThisPhase = study.interventions.firstWhere((i) => i.id == interventionIdForThisPhase);
-        totalInterventions += interventionForThisPhase.tasks.length;
-      }
-
-      final totalSurveys = currentDayOfStudy * study.observations.length;
-
-      final completedInterventions = progresses.where((p) => p.resultType == "bool").toList();
-      final completedSurveys = progresses.where((p) => p.resultType != "bool").toList();
-
-      final missedInterventions = totalInterventions - completedInterventions.length;
-      final missedSurveys = totalSurveys - completedSurveys.length;
-
-      final rawDataDict = {
-        "participant": participant.toJson(),
-        "interventions": completedInterventions.map((p) => p.toJson()).toList(),
-        "surveys": completedSurveys.map((p) => p.toJson()).toList(),
-      };
-
-      final rawData = const JsonEncoder.withIndent('    ').convert(rawDataDict);
-
-      items.add(StudyMonitorItem(
-        participantId: participant.id,
-        inviteCode: participant.inviteCode,
-        enrolledAt: participant.startedAt!,
-        lastActivityAt: lastActivityAt,
-        currentDayOfStudy: currentDayOfStudy,
-        studyDurationInDays: studyDurationInDays,
-        completedInterventions: completedInterventions.length,
-        missedInterventions: missedInterventions,
-        completedSurveys: completedSurveys.length,
-        missedSurveys: missedSurveys,
-        rawData: rawData,
-      ));
-    }
-
-    return items;
-  }
-
-  @override
-  List<Object?> get props => [participantId];
-}
-
 class StudyMonitorTable extends StatelessWidget {
   final List<StudyMonitorItem> studyMonitorItems;
   final OnSelectHandler<StudyMonitorItem> onSelectItem;
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index 880133dc1..ce97fd86d 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -490,9 +490,11 @@
   "monitoring_no_participants_description": "Sobald Teilnehmer in Ihrer Studie eingeschrieben sind, können Sie hier deren Fortschritt überwachen und ihre Daten einsehen.",
   "monitoring_participants_title": "Teilnehmer",
   "monitoring_active": "Aktiv",
-  "monitoring_active_tooltip": "Anzahl der Teilnehmer, die in den letzten 3 Tagen aktiv waren",
-  "monitoring_ended": "Beendet",
-  "monitoring_ended_tooltip": "Anzahl der Teilnehmer, die das Ende der Studie erreicht haben",
+  "monitoring_active_tooltip": "Anzahl der Teilnehmer, die derzeit in der Studie sind",
+  "monitoring_dropout": "Dropout",
+  "monitoring_dropout_tooltip": "Anzahl der Teilnehmer, die die Studie vorzeitig abgebrochen haben",
+  "monitoring_completed": "Abgeschlossen",
+  "monitoring_completed_tooltip": "Anzahl der Teilnehmer, die das Ende der Studie erreicht haben",
   "monitoring_table_column_participant_id": "Teilnehmer-ID",
   "monitoring_table_column_invite_code": "Einladungscode",
   "monitoring_table_column_enrolled": "Eingeschrieben",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index f39dc90f1..7dccb658a 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -538,9 +538,11 @@
   "monitoring_no_participants_description": "Once participants have enrolled in your study, you can monitor their progress and view their data here.",
   "monitoring_participants_title": "Participants",
   "monitoring_active": "Active",
-  "monitoring_active_tooltip": "Number of participants that were active in the last 3 days",
-  "monitoring_ended": "Ended",
-  "monitoring_ended_tooltip": "Number of participants who reached the end of the study",
+  "monitoring_active_tooltip": "Number of participants who are currently in the study",
+  "monitoring_dropout": "Dropout",
+  "monitoring_dropout_tooltip": "Number of participants who have dropped out before the end of the study",
+  "monitoring_completed": "Completed",
+  "monitoring_completed_tooltip": "Number of participants who reached the end of the study",
   "monitoring_table_column_participant_id": "Participant ID",
   "monitoring_table_column_invite_code": "Invite Code",
   "monitoring_table_column_enrolled": "Enrolled",

From f73af2acfb874f740801516874712b37300cb928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20G=C3=B6cer?= <dev@hig.dev>
Date: Wed, 24 Apr 2024 22:22:20 +0200
Subject: [PATCH 009/314] feat: show study days overview in participant details

---
 designer_v2/lib/domain/study_monitoring.dart  | 63 ++++++++++---
 .../participant_details_form_controller.dart  | 42 ---------
 .../participant_details_form_view.dart        | 46 ----------
 .../monitor/participant_details_view.dart     | 92 +++++++++++++++++++
 .../features/monitor/study_monitor_page.dart  | 20 ++--
 designer_v2/lib/localization/app_de.arb       |  2 +-
 designer_v2/lib/localization/app_en.arb       |  3 +-
 designer_v2/pubspec.lock                      |  2 +-
 designer_v2/pubspec.yaml                      |  1 +
 9 files changed, 152 insertions(+), 119 deletions(-)
 delete mode 100644 designer_v2/lib/features/monitor/participant_details_form_controller.dart
 delete mode 100644 designer_v2/lib/features/monitor/participant_details_form_view.dart
 create mode 100644 designer_v2/lib/features/monitor/participant_details_view.dart

diff --git a/designer_v2/lib/domain/study_monitoring.dart b/designer_v2/lib/domain/study_monitoring.dart
index 8689c338e..27a7d25fa 100644
--- a/designer_v2/lib/domain/study_monitoring.dart
+++ b/designer_v2/lib/domain/study_monitoring.dart
@@ -39,8 +39,10 @@ class StudyMonitorItem extends Equatable {
   final int completedSurveys;
   final int missedSurveys;
   final bool droppedOut;
+  final List<Set<String>> missedTasksPerDay;
+  final List<Set<String>> completedTasksPerDay;
 
-  const StudyMonitorItem({
+  StudyMonitorItem({
     required this.participantId,
     required this.inviteCode,
     required this.enrolledAt,
@@ -52,7 +54,12 @@ class StudyMonitorItem extends Equatable {
     required this.completedSurveys,
     required this.missedSurveys,
     required this.droppedOut,
-  });
+    required this.missedTasksPerDay,
+    required this.completedTasksPerDay,
+  }) {
+    assert(missedTasksPerDay.length == currentDayOfStudy);
+    assert(completedTasksPerDay.length == currentDayOfStudy);
+  }
 
   @override
   List<Object?> get props => [participantId];
@@ -77,24 +84,48 @@ extension StudyMonitoringX on Study {
           min(studyDurationInDays, DateTime.now().toUtc().difference(participant.startedAt!).inDays);
       final daysInBaseline = schedule.includeBaseline ? schedule.phaseDuration : 0;
 
-      int totalInterventions = 0;
+      final Set<String> requiredSurveyTaskIds = observations.map((o) => o.id).toSet();
+
+      int completedInterventions = 0;
+      int completedSurveys = 0;
+      final List<Set<String>> missedTasksPerDay = [];
+      final List<Set<String>> completedTasksPerDay = [];
+
       for (int day = 0; day < currentDayOfStudy; day++) {
-        if (day < daysInBaseline) {
-          continue;
+        final Set<String> requiredInterventionTaskIds = {};
+        if (day >= daysInBaseline) {
+          final interventionIdForThisPhase = interventionOrder[day ~/ schedule.phaseDuration];
+          final interventionForThisPhase = interventions.firstWhere((i) => i.id == interventionIdForThisPhase);
+          requiredInterventionTaskIds.addAll(interventionForThisPhase.tasks.map((t) => t.id));
         }
 
-        final interventionIdForThisPhase = interventionOrder[day ~/ schedule.phaseDuration];
-        final interventionForThisPhase = interventions.firstWhere((i) => i.id == interventionIdForThisPhase);
-        totalInterventions += interventionForThisPhase.tasks.length;
+        final requiredTaskIds = requiredInterventionTaskIds.union(requiredSurveyTaskIds);
+
+        final completedTaskIds = progresses
+            .where((p) =>
+                p.completedAt!.isAfter(participant.startedAt!.add(Duration(days: day))) &&
+                p.completedAt!.isBefore(participant.startedAt!.add(Duration(days: day + 1))))
+            .map((p) => p.taskId)
+            .toSet();
+
+        final missedTaskIds = requiredTaskIds.difference(completedTaskIds);
+        missedTasksPerDay.add(missedTaskIds);
+
+        final completedTaskIdsPerDay = requiredTaskIds.intersection(completedTaskIds);
+        completedTasksPerDay.add(completedTaskIdsPerDay);
+
+        final completedSurveysSet = requiredSurveyTaskIds.intersection(completedTaskIds);
+        final completedIntervention = requiredInterventionTaskIds.isNotEmpty &&
+            requiredInterventionTaskIds.intersection(completedTaskIds).length == requiredInterventionTaskIds.length;
+        completedSurveys += completedSurveysSet.length;
+        completedInterventions += completedIntervention ? 1 : 0;
       }
 
       final totalSurveys = currentDayOfStudy * observations.length;
+      final totalInterventions = max(0, currentDayOfStudy - daysInBaseline);
 
-      final completedInterventions = progresses.where((p) => p.resultType == "bool").toList();
-      final completedSurveys = progresses.where((p) => p.resultType != "bool").toList();
-
-      final missedInterventions = totalInterventions - completedInterventions.length;
-      final missedSurveys = totalSurveys - completedSurveys.length;
+      final missedInterventions = totalInterventions - completedInterventions;
+      final missedSurveys = totalSurveys - completedSurveys;
 
       items.add(StudyMonitorItem(
         participantId: participant.id,
@@ -103,11 +134,13 @@ extension StudyMonitoringX on Study {
         lastActivityAt: lastActivityAt,
         currentDayOfStudy: currentDayOfStudy,
         studyDurationInDays: studyDurationInDays,
-        completedInterventions: completedInterventions.length,
+        completedInterventions: completedInterventions,
         missedInterventions: missedInterventions,
-        completedSurveys: completedSurveys.length,
+        completedSurveys: completedSurveys,
         missedSurveys: missedSurveys,
         droppedOut: participant.isDeleted,
+        missedTasksPerDay: missedTasksPerDay,
+        completedTasksPerDay: completedTasksPerDay,
       ));
     }
 
diff --git a/designer_v2/lib/features/monitor/participant_details_form_controller.dart b/designer_v2/lib/features/monitor/participant_details_form_controller.dart
deleted file mode 100644
index 055d41128..000000000
--- a/designer_v2/lib/features/monitor/participant_details_form_controller.dart
+++ /dev/null
@@ -1,42 +0,0 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:reactive_forms/reactive_forms.dart';
-import 'package:studyu_designer_v2/domain/study_monitoring.dart';
-import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
-import 'package:studyu_designer_v2/localization/app_translation.dart';
-
-class ParticipantDetailsFormViewModel extends FormViewModel<StudyMonitorItem> {
-  ParticipantDetailsFormViewModel() : super();
-
-  @override
-  Map<FormMode, String> get titles => {
-        FormMode.create: tr.participant_details_title,
-        FormMode.readonly: tr.participant_details_title,
-      };
-
-  final participantIdControl = FormControl<String>(value: '');
-
-  final rawDataControl = FormControl<String>(value: '');
-
-  @override
-  late final form = FormGroup({
-    'participantId': participantIdControl,
-    'rawData': rawDataControl,
-  });
-
-  @override
-  void initControls() {}
-
-  @override
-  StudyMonitorItem buildFormData() {
-    throw UnsupportedError("This form is read-only");
-  }
-
-  @override
-  void setControlsFrom(StudyMonitorItem data) {
-    participantIdControl.value = data.participantId;
-    rawDataControl.value = "";
-  }
-}
-
-final participantDetailsFormViewModelProvider = Provider.autoDispose
-    .family<ParticipantDetailsFormViewModel, StudyMonitorItem>((ref, item) => ParticipantDetailsFormViewModel());
diff --git a/designer_v2/lib/features/monitor/participant_details_form_view.dart b/designer_v2/lib/features/monitor/participant_details_form_view.dart
deleted file mode 100644
index 4d30104ef..000000000
--- a/designer_v2/lib/features/monitor/participant_details_form_view.dart
+++ /dev/null
@@ -1,46 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:reactive_forms/reactive_forms.dart';
-import 'package:studyu_designer_v2/common_views/form_consumer_widget.dart';
-import 'package:studyu_designer_v2/common_views/form_table_layout.dart';
-import 'package:studyu_designer_v2/features/monitor/participant_details_form_controller.dart';
-import 'package:studyu_designer_v2/localization/app_translation.dart';
-
-class ParticipantDetailsFormView extends FormConsumerWidget {
-  const ParticipantDetailsFormView({required this.formViewModel, super.key});
-
-  final ParticipantDetailsFormViewModel formViewModel;
-
-  @override
-  Widget build(BuildContext context, FormGroup form) {
-    return Column(
-      children: [
-        FormTableLayout(rows: [
-          FormTableRow(
-            label: tr.monitoring_table_column_participant_id,
-            labelStyle: const TextStyle(fontWeight: FontWeight.bold),
-            control: formViewModel.participantIdControl,
-            input: ReactiveTextField(
-              formControl: formViewModel.participantIdControl,
-              readOnly: true,
-            ),
-          ),
-        ]),
-        const SizedBox(height: 16.0),
-        Align(
-          alignment: Alignment.centerLeft,
-          child: FormLabel(
-              labelText: tr.participant_details_raw_data,
-              labelTextStyle: const TextStyle(
-                fontWeight: FontWeight.bold,
-              )),
-        ),
-        const SizedBox(height: 8.0),
-        ReactiveTextField(
-          formControl: formViewModel.rawDataControl,
-          maxLines: null,
-          readOnly: true,
-        ),
-      ],
-    );
-  }
-}
diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
new file mode 100644
index 000000000..1c6911f79
--- /dev/null
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -0,0 +1,92 @@
+import 'package:collection/collection.dart';
+import 'package:flutter/material.dart';
+import 'package:reactive_forms/reactive_forms.dart';
+import 'package:studyu_core/core.dart';
+import 'package:studyu_designer_v2/common_views/form_table_layout.dart';
+import 'package:studyu_designer_v2/domain/study_monitoring.dart';
+import 'package:studyu_designer_v2/localization/app_translation.dart';
+
+class ParticipantDetailsView extends StatelessWidget {
+  const ParticipantDetailsView(
+      {required this.monitorItem, required this.interventions, required this.observations, super.key});
+
+  final StudyMonitorItem monitorItem;
+  final List<Intervention> interventions;
+  final List<Observation> observations;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        FormTableLayout(rows: [
+          FormTableRow(
+            label: tr.monitoring_table_column_participant_id,
+            labelStyle: const TextStyle(fontWeight: FontWeight.bold),
+            input: ReactiveTextField(
+              formControl: FormControl<String>(value: monitorItem.participantId),
+              readOnly: true,
+            ),
+          ),
+        ]),
+        const SizedBox(height: 16.0),
+        Align(
+          alignment: Alignment.centerLeft,
+          child: FormSectionHeader(
+            title: tr.participant_details_study_days_overview,
+          ),
+        ),
+        const SizedBox(height: 8.0),
+        _buildPerDayStatus(context),
+      ],
+    );
+  }
+
+  Widget _buildPerDayStatus(BuildContext context) {
+    assert(monitorItem.missedTasksPerDay.length == monitorItem.completedTasksPerDay.length);
+    return Wrap(
+      children: monitorItem.missedTasksPerDay
+          .mapIndexed((index, missed) => Tooltip(
+                message: _getTooltipText(missed, monitorItem.completedTasksPerDay[index]),
+                child: Container(
+                  height: 50,
+                  width: 50,
+                  margin: const EdgeInsets.fromLTRB(0, 0, 8, 8),
+                  decoration: BoxDecoration(
+                    color: missed.isEmpty
+                        ? Colors.green
+                        : (monitorItem.completedTasksPerDay[index].isEmpty ? Colors.red : Colors.orange),
+                    borderRadius: BorderRadius.circular(8),
+                  ),
+                  child: Center(
+                    child: Text(
+                      (index + 1).toString(),
+                      style: const TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
+                    ),
+                  ),
+                ),
+              ))
+          .toList(),
+    );
+  }
+
+  String _getTooltipText(Set<String> missedTaskIds, Set<String> completedTaskIds) {
+    final sb = StringBuffer();
+    for (final intervention in interventions) {
+      for (final task in intervention.tasks) {
+        if (missedTaskIds.contains(task.id)) {
+          sb.writeln('❌ ${intervention.name} - ${task.title}');
+        } else if (completedTaskIds.contains(task.id)) {
+          sb.writeln('✅ ${intervention.name} - ${task.title}');
+        }
+      }
+    }
+    for (final observation in observations) {
+      if (missedTaskIds.contains(observation.id)) {
+        sb.writeln('❌ ${observation.title}');
+      } else if (completedTaskIds.contains(observation.id)) {
+        sb.writeln('✅ ${observation.title}');
+      }
+    }
+    return sb.toString();
+  }
+}
diff --git a/designer_v2/lib/features/monitor/study_monitor_page.dart b/designer_v2/lib/features/monitor/study_monitor_page.dart
index a7150f018..52dbae14e 100644
--- a/designer_v2/lib/features/monitor/study_monitor_page.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_page.dart
@@ -4,11 +4,10 @@ import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/common_views/async_value_widget.dart';
 import 'package:studyu_designer_v2/common_views/empty_body.dart';
 import 'package:studyu_designer_v2/common_views/form_buttons.dart';
-import 'package:studyu_designer_v2/common_views/sidesheet/sidesheet_form.dart';
+import 'package:studyu_designer_v2/common_views/sidesheet/sidesheet.dart';
 import 'package:studyu_designer_v2/common_views/utils.dart';
 import 'package:studyu_designer_v2/domain/study_monitoring.dart';
-import 'package:studyu_designer_v2/features/monitor/participant_details_form_controller.dart';
-import 'package:studyu_designer_v2/features/monitor/participant_details_form_view.dart';
+import 'package:studyu_designer_v2/features/monitor/participant_details_view.dart';
 import 'package:studyu_designer_v2/features/monitor/study_monitor_table.dart';
 import 'package:studyu_designer_v2/features/study/study_controller.dart';
 import 'package:studyu_designer_v2/features/study/study_page_view.dart';
@@ -33,7 +32,7 @@ class StudyMonitorScreen extends StudyPageWidget {
               studyMonitorData.items.isNotEmpty
                   ? StudyMonitorTable(
                       studyMonitorItems: studyMonitorData.items,
-                      onSelectItem: (item) => _onSelectParticipant(context, ref, item),
+                      onSelectItem: (item) => _onSelectParticipant(context, ref, item, study),
                     )
                   : EmptyBody(
                       icon: Icons.person_off_rounded,
@@ -98,16 +97,13 @@ class StudyMonitorScreen extends StudyPageWidget {
     );
   }
 
-  _onSelectParticipant(BuildContext context, WidgetRef ref, StudyMonitorItem item) {
+  _onSelectParticipant(BuildContext context, WidgetRef ref, StudyMonitorItem item, Study study) {
     // TODO: refactor to use [RoutingIntent] for sidesheet (so that it can be triggered from controller)
-    final formViewModel = ref.read(participantDetailsFormViewModelProvider(item));
-    formViewModel.setControlsFrom(item);
-    showFormSideSheet<ParticipantDetailsFormViewModel>(
+    showModalSideSheet(
       context: context,
-      formViewModel: formViewModel,
-      formViewBuilder: (formViewModel) => ParticipantDetailsFormView(
-        formViewModel: formViewModel,
-      ),
+      title: tr.participant_details_title,
+      body: ParticipantDetailsView(
+          monitorItem: item, interventions: study.interventions, observations: study.observations),
       actionButtons: [
         retainSizeInAppBar(DismissButton(
           text: tr.dialog_close,
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index ce97fd86d..0cf7622b3 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -485,7 +485,7 @@
   "notification_code_clipboard": "Code wurde in die Zwischenablage kopiert",
   "@__________________STUDYPAGE_MONITOR__________________": {},
   "participant_details_title": "Teilnehmerdetails",
-  "participant_details_raw_data": "Rohdaten",
+  "participant_details_study_days_overview": "Übersicht über Studientage",
   "monitoring_no_participants_title": "Es gibt noch keine Teilnehmer in dieser Studie",
   "monitoring_no_participants_description": "Sobald Teilnehmer in Ihrer Studie eingeschrieben sind, können Sie hier deren Fortschritt überwachen und ihre Daten einsehen.",
   "monitoring_participants_title": "Teilnehmer",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index 7dccb658a..1b56ecf24 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -144,7 +144,6 @@
   "question_type_audio": "Audio",
   "form_array_response_options_bool_yes": "Yes",
   "form_array_response_options_bool_no": "No",
-  "form_field_response_image": "Image",
   "form_field_response_choice_multiple": "Select multiple",
   "form_field_response_image": "Provide directions for capturing image",
   "form_field_response_audio": "Provide directions for recording audio",
@@ -533,7 +532,7 @@
   "action_button_code_new": "New code",
   "@__________________STUDYPAGE_MONITOR__________________": {},
   "participant_details_title": "Participant Details",
-  "participant_details_raw_data": "Raw Data",
+  "participant_details_study_days_overview": "Study days overview",
   "monitoring_no_participants_title": "There are no participants in this study yet",
   "monitoring_no_participants_description": "Once participants have enrolled in your study, you can monitor their progress and view their data here.",
   "monitoring_participants_title": "Participants",
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 7ce8d7ed6..b27194271 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -106,7 +106,7 @@ packages:
     source: hosted
     version: "1.1.1"
   collection:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: collection
       sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 31602b091..28ff82b23 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -11,6 +11,7 @@ environment:
 dependencies:
   archive: ^3.4.10
   async: ^2.11.0
+  collection:
   csv: ^6.0.0
   cupertino_icons: ^1.0.8
   dynamic_color:

From 8df279885b1832f73ec46a3972c6018982d2bc2a Mon Sep 17 00:00:00 2001
From: StudyU Documenter <studyu-documenter>
Date: Wed, 24 Apr 2024 20:25:46 +0000
Subject: [PATCH 010/314] docs: update UML documentation

---
 docs/uml/designer_v2/lib/domain/uml.svg       |  175 +-
 .../designer_v2/lib/features/monitor/uml.svg  |  269 +-
 docs/uml/designer_v2/lib/features/uml.svg     | 3678 +++++----
 docs/uml/designer_v2/lib/uml.svg              | 6569 ++++++++---------
 4 files changed, 5253 insertions(+), 5438 deletions(-)

diff --git a/docs/uml/designer_v2/lib/domain/uml.svg b/docs/uml/designer_v2/lib/domain/uml.svg
index 6959fd20f..893c3e1b2 100644
--- a/docs/uml/designer_v2/lib/domain/uml.svg
+++ b/docs/uml/designer_v2/lib/domain/uml.svg
@@ -1,5 +1,33 @@
-<svg version="1.1" baseProfile="full" width="1594.8" height="415.0" viewbox="0 0 1594.75 415" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;ResultTypes
+<svg version="1.1" baseProfile="full" width="2168.3" height="475.0" viewbox="0 0 2168.25 475" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[StudyMonitorData
+	  |
+	  +activeParticipants: int;
+	  +dropoutParticipants: int;
+	  +completedParticipants: int;
+	  +items: List&lt;StudyMonitorItem&gt;
+	]
+	
+	[StudyMonitorItem
+	  |
+	  +participantId: String;
+	  +inviteCode: String?;
+	  +enrolledAt: DateTime;
+	  +lastActivityAt: DateTime;
+	  +currentDayOfStudy: int;
+	  +studyDurationInDays: int;
+	  +completedInterventions: int;
+	  +missedInterventions: int;
+	  +completedSurveys: int;
+	  +missedSurveys: int;
+	  +droppedOut: bool;
+	  +missedTasksPerDay: List&lt;Set&lt;String&gt;&gt;;
+	  +completedTasksPerDay: List&lt;Set&lt;String&gt;&gt;;
+	  +props: List&lt;Object?&gt;
+	]
+	
+	[&lt;abstract&gt;Equatable]&lt;:-[StudyMonitorItem]
+	
+	[&lt;abstract&gt;ResultTypes
 	]
 	
 	[MeasurementResultTypes
@@ -57,31 +85,96 @@
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="415.0" width="1594.8" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="475.0" width="2168.3" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
 				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M235.6 82.8 L126 142 L126 222 L126.0 222.0 " fill="none"></path>
-					<path d="M238.1 87.5 L235.6 82.8 L233.0 78.1 L247.3 76.5 Z"></path>
-					<path d="M316.4 82.8 L426 142 L426 222 L426.0 222.0 " fill="none"></path>
-					<path d="M319.0 78.1 L316.4 82.8 L313.9 87.5 L304.7 76.5 Z"></path>
-					<path d="M680.3 140.7 L680.25 142 L680.25 245 L680.3 245.0 " fill="none"></path>
+					<path d="M352.0 89.8 L352 142 L352 162 L352.0 162.0 " fill="none"></path>
+					<path d="M357.3 89.8 L352.0 89.8 L346.7 89.8 L352.0 76.5 Z"></path>
+					<path d="M809.1 82.8 L699.5 142 L699.5 252 L699.5 252.0 " fill="none"></path>
+					<path d="M811.6 87.5 L809.1 82.8 L806.5 78.1 L820.8 76.5 Z"></path>
+					<path d="M889.9 82.8 L999.5 142 L999.5 252 L999.5 252.0 " fill="none"></path>
+					<path d="M892.5 78.1 L889.9 82.8 L887.4 87.5 L878.2 76.5 Z"></path>
+					<path d="M1253.8 140.7 L1253.75 142 L1253.75 275 L1253.8 275.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M685.6 131.3 L680.3 140.7 L674.9 131.3 L680.3 122.0 Z"></path>
+						<path d="M1259.1 131.3 L1253.8 140.7 L1248.4 131.3 L1253.8 122.0 Z"></path>
 					</g>
-					<path d="M1500.6 168.2 L1513.75 162 L1521.25 162 L1521.25 162 L1528.75 260.5 L1528.75 260.5 L1521.25 359 L1521.25 359 L1513.75 359 L1513.75 359 L1483.75 344.8612440191388 L1483.8 344.9 " fill="none"></path>
+					<path d="M2074.1 198.2 L2087.25 192 L2094.75 192 L2094.75 192 L2102.25 290.5 L2102.25 290.5 L2094.75 389 L2094.75 389 L2087.25 389 L2087.25 389 L2057.25 374.8612440191388 L2057.3 374.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1489.9 167.3 L1500.6 168.2 L1494.5 177.0 L1483.8 176.1 Z"></path>
+						<path d="M2063.4 197.3 L2074.1 198.2 L2068.0 207.0 L2057.3 206.1 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M1304.8 89.8 L1304.75 142 L1304.75 162 L1304.8 162.0 " fill="none"></path>
+						<path d="M1878.3 89.8 L1878.25 142 L1878.25 192 L1878.3 192.0 " fill="none"></path>
+					</g>
+					<path d="M1883.6 89.8 L1878.3 89.8 L1872.9 89.8 L1878.3 76.5 Z"></path>
+					<g data-name="StudyMonitorData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorData">
+							<rect x="0.0" y="7.5" height="107.0" width="264.0" data-name="StudyMonitorData"></rect>
+							<path d="M0.0 38.5 L264.0 38.5" fill="none" data-name="StudyMonitorData"></path>
+						</g>
+						<g transform="translate(0, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorData">
+								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorData">StudyMonitorData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(0, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorData">+activeParticipants: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorData">+dropoutParticipants: int</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorData">+completedParticipants: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorData">+items: List&lt;StudyMonitorItem&gt;</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StudyMonitorItem">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorItem">
+							<rect x="170.5" y="162.0" height="257.0" width="363.0" data-name="StudyMonitorItem"></rect>
+							<path d="M170.5 193.0 L533.5 193.0" fill="none" data-name="StudyMonitorItem"></path>
+						</g>
+						<g transform="translate(170.5, 162)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorItem">
+								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorItem">StudyMonitorItem</text>
+								
+							</g>
+						</g>
+						<g transform="translate(170.5, 193)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">+participantId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorItem">+inviteCode: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorItem">+enrolledAt: DateTime</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorItem">+lastActivityAt: DateTime</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyMonitorItem">+currentDayOfStudy: int</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyMonitorItem">+studyDurationInDays: int</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyMonitorItem">+completedInterventions: int</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyMonitorItem">+missedInterventions: int</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyMonitorItem">+completedSurveys: int</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyMonitorItem">+missedSurveys: int</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyMonitorItem">+droppedOut: bool</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyMonitorItem">+missedTasksPerDay: List&lt;Set&lt;String&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyMonitorItem">+completedTasksPerDay: List&lt;Set&lt;String&gt;&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyMonitorItem">+props: List&lt;Object?&gt;</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="Equatable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
+							<rect x="304.0" y="45.5" height="31.0" width="96.0" data-name="Equatable"></rect>
+						</g>
+						<g transform="translate(304, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
+								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
+								
+							</g>
+						</g>
 					</g>
-					<path d="M1310.1 89.8 L1304.8 89.8 L1299.4 89.8 L1304.8 76.5 Z"></path>
 					<g data-name="ResultTypes">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ResultTypes">
-							<rect x="219.0" y="45.5" height="31.0" width="114.0" data-name="ResultTypes"></rect>
+							<rect x="792.5" y="45.5" height="31.0" width="114.0" data-name="ResultTypes"></rect>
 						</g>
-						<g transform="translate(219, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ResultTypes">
+						<g transform="translate(792.5, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ResultTypes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ResultTypes">
 								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ResultTypes">ResultTypes</text>
 								
@@ -90,16 +183,16 @@
 					</g>
 					<g data-name="MeasurementResultTypes">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementResultTypes">
-							<rect x="0.0" y="222.0" height="77.0" width="252.0" data-name="MeasurementResultTypes"></rect>
-							<path d="M0.0 253.0 L252.0 253.0" fill="none" data-name="MeasurementResultTypes"></path>
+							<rect x="573.5" y="252.0" height="77.0" width="252.0" data-name="MeasurementResultTypes"></rect>
+							<path d="M573.5 283.0 L825.5 283.0" fill="none" data-name="MeasurementResultTypes"></path>
 						</g>
-						<g transform="translate(0, 222)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementResultTypes">
+						<g transform="translate(573.5, 252)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementResultTypes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementResultTypes">
 								<text x="118.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementResultTypes">MeasurementResultTypes</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 253)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementResultTypes">
+						<g transform="translate(573.5, 283)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementResultTypes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementResultTypes">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+questionnaire: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
@@ -109,16 +202,16 @@
 					</g>
 					<g data-name="InterventionResultTypes">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionResultTypes">
-							<rect x="292.0" y="222.0" height="77.0" width="268.0" data-name="InterventionResultTypes"></rect>
-							<path d="M292.0 253.0 L560.0 253.0" fill="none" data-name="InterventionResultTypes"></path>
+							<rect x="865.5" y="252.0" height="77.0" width="268.0" data-name="InterventionResultTypes"></rect>
+							<path d="M865.5 283.0 L1133.5 283.0" fill="none" data-name="InterventionResultTypes"></path>
 						</g>
-						<g transform="translate(292, 222)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResultTypes">
+						<g transform="translate(865.5, 252)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResultTypes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionResultTypes">
 								<text x="126.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionResultTypes">InterventionResultTypes</text>
 								
 							</g>
 						</g>
-						<g transform="translate(292, 253)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResultTypes">
+						<g transform="translate(865.5, 283)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResultTypes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResultTypes">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+checkmarkTask: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
@@ -128,16 +221,16 @@
 					</g>
 					<g data-name="StudyExportData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyExportData">
-							<rect x="473.3" y="0.0" height="122.0" width="414.0" data-name="StudyExportData"></rect>
-							<path d="M473.3 31.0 L887.3 31.0" fill="none" data-name="StudyExportData"></path>
+							<rect x="1046.8" y="0.0" height="122.0" width="414.0" data-name="StudyExportData"></rect>
+							<path d="M1046.8 31.0 L1460.8 31.0" fill="none" data-name="StudyExportData"></path>
 						</g>
-						<g transform="translate(473.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyExportData">
+						<g transform="translate(1046.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyExportData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyExportData">
 								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyExportData">StudyExportData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(473.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyExportData">
+						<g transform="translate(1046.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyExportData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyExportData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyExportData">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyExportData">+measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
@@ -150,9 +243,9 @@
 					</g>
 					<g data-name="Study">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="649.8" y="245.0" height="31.0" width="61.0" data-name="Study"></rect>
+							<rect x="1223.3" y="275.0" height="31.0" width="61.0" data-name="Study"></rect>
 						</g>
-						<g transform="translate(649.75, 245)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
+						<g transform="translate(1223.25, 275)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
 								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
 								
@@ -161,23 +254,23 @@
 					</g>
 					<g data-name="StudyTemplates">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTemplates">
-							<rect x="927.3" y="14.5" height="93.0" width="307.0" data-name="StudyTemplates"></rect>
-							<path d="M927.3 45.5 L1234.3 45.5" fill="none" data-name="StudyTemplates"></path>
-							<path d="M927.3 76.5 L1234.3 76.5" fill="none" data-name="StudyTemplates"></path>
+							<rect x="1500.8" y="14.5" height="93.0" width="307.0" data-name="StudyTemplates"></rect>
+							<path d="M1500.8 45.5 L1807.8 45.5" fill="none" data-name="StudyTemplates"></path>
+							<path d="M1500.8 76.5 L1807.8 76.5" fill="none" data-name="StudyTemplates"></path>
 						</g>
-						<g transform="translate(927.25, 14.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTemplates">
+						<g transform="translate(1500.75, 14.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTemplates">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTemplates">
 								<text x="145.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTemplates">StudyTemplates</text>
 								
 							</g>
 						</g>
-						<g transform="translate(927.25, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
+						<g transform="translate(1500.75, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+kUnnamedStudyTitle: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(927.25, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
+						<g transform="translate(1500.75, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+Study emptyDraft()</text>
 								
@@ -186,16 +279,16 @@
 					</g>
 					<g data-name="StudyActionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyActionType">
-							<rect x="1125.8" y="162.0" height="197.0" width="358.0" data-name="StudyActionType"></rect>
-							<path d="M1125.8 193.0 L1483.8 193.0" fill="none" data-name="StudyActionType"></path>
+							<rect x="1699.3" y="192.0" height="197.0" width="358.0" data-name="StudyActionType"></rect>
+							<path d="M1699.3 223.0 L2057.3 223.0" fill="none" data-name="StudyActionType"></path>
 						</g>
-						<g transform="translate(1125.75, 162)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyActionType">
+						<g transform="translate(1699.25, 192)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyActionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyActionType">
 								<text x="171.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyActionType">StudyActionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1125.75, 193)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyActionType">
+						<g transform="translate(1699.25, 223)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyActionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyActionType">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyActionType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+values: List&lt;StudyActionType&gt;</text>
@@ -213,9 +306,9 @@
 					</g>
 					<g data-name="Enum">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="1274.3" y="45.5" height="31.0" width="61.0" data-name="Enum"></rect>
+							<rect x="1847.8" y="45.5" height="31.0" width="61.0" data-name="Enum"></rect>
 						</g>
-						<g transform="translate(1274.25, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+						<g transform="translate(1847.75, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
 								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
diff --git a/docs/uml/designer_v2/lib/features/monitor/uml.svg b/docs/uml/designer_v2/lib/features/monitor/uml.svg
index 598d7fc1a..fbafb4e75 100644
--- a/docs/uml/designer_v2/lib/features/monitor/uml.svg
+++ b/docs/uml/designer_v2/lib/features/monitor/uml.svg
@@ -1,15 +1,5 @@
-<svg version="1.1" baseProfile="full" width="1699.0" height="786.0" viewbox="0 0 1699 786" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[ParticipantDetailsFormView
-	  |
-	  +formViewModel: ParticipantDetailsFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ParticipantDetailsFormView]o-[ParticipantDetailsFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ParticipantDetailsFormView]
-	
-	[StudyMonitorScreen
+<svg version="1.1" baseProfile="full" width="1031.5" height="356.0" viewbox="0 0 1031.5 356" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[StudyMonitorScreen
 	  |
 	  +Widget build();
 	  -Widget _monitorSectionHeader();
@@ -19,26 +9,6 @@
 	
 	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
 	
-	[StudyMonitorItem
-	  |
-	  +participantId: String;
-	  +inviteCode: String?;
-	  +enrolledAt: DateTime;
-	  +lastActivityAt: DateTime;
-	  +currentDayOfStudy: int;
-	  +studyDurationInDays: int;
-	  +completedInterventions: int;
-	  +missedInterventions: int;
-	  +completedSurveys: int;
-	  +missedSurveys: int;
-	  +rawData: String;
-	  +props: List&lt;Object?&gt;
-	  |
-	  &lt;static&gt;+List&lt;StudyMonitorItem&gt; fromStudy()
-	]
-	
-	[&lt;abstract&gt;Equatable]&lt;:-[StudyMonitorItem]
-	
 	[StudyMonitorTable
 	  |
 	  +studyMonitorItems: List&lt;StudyMonitorItem&gt;;
@@ -52,132 +22,49 @@
 	
 	[StudyMonitorTable]o-[void Function(StudyMonitorItem)]
 	
-	[ParticipantDetailsFormViewModel
+	[ParticipantDetailsView
 	  |
-	  +participantIdControl: FormControl&lt;String&gt;;
-	  +rawDataControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +monitorItem: StudyMonitorItem;
+	  +interventions: List&lt;Intervention&gt;;
+	  +observations: List&lt;Observation&gt;
 	  |
-	  +void initControls();
-	  +StudyMonitorItem buildFormData();
-	  +void setControlsFrom()
+	  +Widget build();
+	  -Widget _buildPerDayStatus();
+	  -String _getTooltipText()
 	]
 	
-	[ParticipantDetailsFormViewModel]o-[FormControl]
-	[ParticipantDetailsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[ParticipantDetailsFormViewModel]
+	[ParticipantDetailsView]o-[StudyMonitorItem]
 	
 	</desc>
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="786.0" width="1699.0" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="356.0" width="1031.5" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M209.5 387.2 L209.5 471 L714 547.98899486427 L714.0 548.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M214.8 377.8 L209.5 387.2 L204.2 377.8 L209.5 368.5 Z"></path>
-					</g>
-					<path d="M209.5 105.3 L209.5 173 L209.5 275.5 L209.5 275.5 " fill="none"></path>
-					<path d="M214.8 105.3 L209.5 105.3 L204.2 105.3 L209.5 92.0 Z"></path>
-					<path d="M599.0 105.3 L599 173 L599 268.5 L599.0 268.5 " fill="none"></path>
-					<path d="M604.3 105.3 L599.0 105.3 L593.7 105.3 L599.0 92.0 Z"></path>
-					<path d="M964.5 105.3 L964.5 173 L964.5 193 L964.5 193.0 " fill="none"></path>
-					<path d="M969.8 105.3 L964.5 105.3 L959.2 105.3 L964.5 92.0 Z"></path>
-					<path d="M1326.0 171.7 L1326 173 L1326 306.5 L1326.0 306.5 " fill="none"></path>
+				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
+					<path d="M140.0 105.3 L140 173 L140 193 L140.0 193.0 " fill="none"></path>
+					<path d="M145.3 105.3 L140.0 105.3 L134.7 105.3 L140.0 92.0 Z"></path>
+					<path d="M456.0 171.7 L456 173 L456 231 L456.0 231.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1331.3 162.3 L1326.0 171.7 L1320.7 162.3 L1326.0 153.0 Z"></path>
+						<path d="M461.3 162.3 L456.0 171.7 L450.7 162.3 L456.0 153.0 Z"></path>
 					</g>
-					<path d="M820.0 674.2 L816.5 679 L816.5 699 L816.5 699.0 " fill="none"></path>
+					<path d="M834.5 171.7 L834.5 173 L834.5 231 L834.5 231.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M829.7 669.7 L820.0 674.2 L821.1 663.5 L830.8 659.0 Z"></path>
-					</g>
-					<path d="M962.0 674.2 L965.5 679 L965.5 699 L965.5 699.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M960.9 663.5 L962.0 674.2 L952.3 669.7 L951.2 659.0 Z"></path>
-					</g>
-					<path d="M1572.5 350.8 L1572.5 471 L1068 547.98899486427 L1068.0 548.0 " fill="none"></path>
-					<path d="M1577.8 350.8 L1572.5 350.8 L1567.2 350.8 L1572.5 337.5 Z"></path>
-					<g data-name="ParticipantDetailsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsFormView">
-							<rect x="0.0" y="275.5" height="93.0" width="419.0" data-name="ParticipantDetailsFormView"></rect>
-							<path d="M0.0 306.5 L419.0 306.5" fill="none" data-name="ParticipantDetailsFormView"></path>
-							<path d="M0.0 337.5 L419.0 337.5" fill="none" data-name="ParticipantDetailsFormView"></path>
-						</g>
-						<g transform="translate(0, 275.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsFormView">
-								<text x="201.5" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsFormView">ParticipantDetailsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormView">+formViewModel: ParticipantDetailsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ParticipantDetailsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsFormViewModel">
-							<rect x="714.0" y="491.0" height="168.0" width="354.0" data-name="ParticipantDetailsFormViewModel"></rect>
-							<path d="M714.0 522.0 L1068.0 522.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
-							<path d="M714.0 598.0 L1068.0 598.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
-						</g>
-						<g transform="translate(714, 491)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsFormViewModel">
-								<text x="169.0" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsFormViewModel">ParticipantDetailsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(714, 522)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+participantIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+rawDataControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(714, 598)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+void initControls()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+StudyMonitorItem buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+void setControlsFrom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="113.5" y="61.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
-						</g>
-						<g transform="translate(113.5, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
+						<path d="M839.8 162.3 L834.5 171.7 L829.2 162.3 L834.5 153.0 Z"></path>
 					</g>
 					<g data-name="StudyMonitorScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="459.0" y="268.5" height="107.0" width="280.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M459.0 299.5 L739.0 299.5" fill="none" data-name="StudyMonitorScreen"></path>
+							<rect x="0.0" y="193.0" height="107.0" width="280.0" data-name="StudyMonitorScreen"></rect>
+							<path d="M0.0 224.0 L280.0 224.0" fill="none" data-name="StudyMonitorScreen"></path>
 						</g>
-						<g transform="translate(459, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
+						<g transform="translate(0, 193)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
 								<text x="132.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(459, 299.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
+						<g transform="translate(0, 224)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorScreen">-Widget _monitorSectionHeader()</text>
@@ -189,82 +76,35 @@
 					</g>
 					<g data-name="StudyPageWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="520.5" y="61.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
+							<rect x="61.5" y="61.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
 						</g>
-						<g transform="translate(520.5, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
+						<g transform="translate(61.5, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
 								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyMonitorItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorItem">
-							<rect x="779.0" y="193.0" height="258.0" width="371.0" data-name="StudyMonitorItem"></rect>
-							<path d="M779.0 224.0 L1150.0 224.0" fill="none" data-name="StudyMonitorItem"></path>
-							<path d="M779.0 420.0 L1150.0 420.0" fill="none" data-name="StudyMonitorItem"></path>
-						</g>
-						<g transform="translate(779, 193)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorItem">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorItem">StudyMonitorItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(779, 224)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">+participantId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorItem">+inviteCode: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorItem">+enrolledAt: DateTime</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorItem">+lastActivityAt: DateTime</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyMonitorItem">+currentDayOfStudy: int</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyMonitorItem">+studyDurationInDays: int</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyMonitorItem">+completedInterventions: int</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyMonitorItem">+missedInterventions: int</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyMonitorItem">+completedSurveys: int</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyMonitorItem">+missedSurveys: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyMonitorItem">+rawData: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyMonitorItem">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(779, 420)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">&lt;static&gt;+List&lt;StudyMonitorItem&gt; fromStudy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="916.5" y="61.0" height="31.0" width="96.0" data-name="Equatable"></rect>
-						</g>
-						<g transform="translate(916.5, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
-								
-							</g>
-						</g>
-					</g>
 					<g data-name="StudyMonitorTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorTable">
-							<rect x="1128.5" y="0.0" height="153.0" width="395.0" data-name="StudyMonitorTable"></rect>
-							<path d="M1128.5 31.0 L1523.5 31.0" fill="none" data-name="StudyMonitorTable"></path>
-							<path d="M1128.5 77.0 L1523.5 77.0" fill="none" data-name="StudyMonitorTable"></path>
+							<rect x="258.5" y="0.0" height="153.0" width="395.0" data-name="StudyMonitorTable"></rect>
+							<path d="M258.5 31.0 L653.5 31.0" fill="none" data-name="StudyMonitorTable"></path>
+							<path d="M258.5 77.0 L653.5 77.0" fill="none" data-name="StudyMonitorTable"></path>
 						</g>
-						<g transform="translate(1128.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorTable">
+						<g transform="translate(258.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorTable">
 								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorTable">StudyMonitorTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1128.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
+						<g transform="translate(258.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+studyMonitorItems: List&lt;StudyMonitorItem&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">+onSelectItem: void Function(StudyMonitorItem)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1128.5, 77)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
+						<g transform="translate(258.5, 77)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">-List&lt;Widget&gt; _buildRow()</text>
@@ -276,44 +116,51 @@
 					</g>
 					<g data-name="void Function(StudyMonitorItem)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyMonitorItem)">
-							<rect x="1190.0" y="306.5" height="31.0" width="272.0" data-name="void Function(StudyMonitorItem)"></rect>
+							<rect x="320.0" y="231.0" height="31.0" width="272.0" data-name="void Function(StudyMonitorItem)"></rect>
 						</g>
-						<g transform="translate(1190, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyMonitorItem)">
+						<g transform="translate(320, 231)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyMonitorItem)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyMonitorItem)">
 								<text x="128.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyMonitorItem)">void Function(StudyMonitorItem)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="760.0" y="699.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+					<g data-name="ParticipantDetailsView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsView">
+							<rect x="693.5" y="0.0" height="153.0" width="282.0" data-name="ParticipantDetailsView"></rect>
+							<path d="M693.5 31.0 L975.5 31.0" fill="none" data-name="ParticipantDetailsView"></path>
+							<path d="M693.5 92.0 L975.5 92.0" fill="none" data-name="ParticipantDetailsView"></path>
 						</g>
-						<g transform="translate(760, 699)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+						<g transform="translate(693.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsView">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsView">ParticipantDetailsView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="913.0" y="699.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
+						<g transform="translate(693.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsView">+monitorItem: StudyMonitorItem</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsView">+interventions: List&lt;Intervention&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsView">+observations: List&lt;Observation&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(913, 699)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+						<g transform="translate(693.5, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsView">-Widget _buildPerDayStatus()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsView">-String _getTooltipText()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="1502.0" y="306.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
+					<g data-name="StudyMonitorItem">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorItem">
+							<rect x="757.5" y="231.0" height="31.0" width="154.0" data-name="StudyMonitorItem"></rect>
 						</g>
-						<g transform="translate(1502, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+						<g transform="translate(757.5, 231)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorItem">
+								<text x="69.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorItem">StudyMonitorItem</text>
 								
 							</g>
 						</g>
diff --git a/docs/uml/designer_v2/lib/features/uml.svg b/docs/uml/designer_v2/lib/features/uml.svg
index 35e9bd57c..562de6fb2 100644
--- a/docs/uml/designer_v2/lib/features/uml.svg
+++ b/docs/uml/designer_v2/lib/features/uml.svg
@@ -1,4 +1,4 @@
-<svg version="1.1" baseProfile="full" width="48029.8" height="3778.0" viewbox="0 0 48029.75 3778" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+<svg version="1.1" baseProfile="full" width="49294.0" height="3778.0" viewbox="0 0 49294 3778" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
 	<desc >[&lt;abstract&gt;IAppDelegate
 	  |
 	  +dynamic onAppStart()
@@ -14,16 +14,6 @@
 	  -dynamic _callDelegates()
 	]
 	
-	[ParticipantDetailsFormView
-	  |
-	  +formViewModel: ParticipantDetailsFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ParticipantDetailsFormView]o-[ParticipantDetailsFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ParticipantDetailsFormView]
-	
 	[StudyMonitorScreen
 	  |
 	  +Widget build();
@@ -34,26 +24,6 @@
 	
 	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
 	
-	[StudyMonitorItem
-	  |
-	  +participantId: String;
-	  +inviteCode: String?;
-	  +enrolledAt: DateTime;
-	  +lastActivityAt: DateTime;
-	  +currentDayOfStudy: int;
-	  +studyDurationInDays: int;
-	  +completedInterventions: int;
-	  +missedInterventions: int;
-	  +completedSurveys: int;
-	  +missedSurveys: int;
-	  +rawData: String;
-	  +props: List&lt;Object?&gt;
-	  |
-	  &lt;static&gt;+List&lt;StudyMonitorItem&gt; fromStudy()
-	]
-	
-	[&lt;abstract&gt;Equatable]&lt;:-[StudyMonitorItem]
-	
 	[StudyMonitorTable
 	  |
 	  +studyMonitorItems: List&lt;StudyMonitorItem&gt;;
@@ -67,21 +37,18 @@
 	
 	[StudyMonitorTable]o-[void Function(StudyMonitorItem)]
 	
-	[ParticipantDetailsFormViewModel
+	[ParticipantDetailsView
 	  |
-	  +participantIdControl: FormControl&lt;String&gt;;
-	  +rawDataControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +monitorItem: StudyMonitorItem;
+	  +interventions: List&lt;Intervention&gt;;
+	  +observations: List&lt;Observation&gt;
 	  |
-	  +void initControls();
-	  +StudyMonitorItem buildFormData();
-	  +void setControlsFrom()
+	  +Widget build();
+	  -Widget _buildPerDayStatus();
+	  -String _getTooltipText()
 	]
 	
-	[ParticipantDetailsFormViewModel]o-[FormControl]
-	[ParticipantDetailsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[ParticipantDetailsFormViewModel]
+	[ParticipantDetailsView]o-[StudyMonitorItem]
 	
 	[LoginForm
 	  |
@@ -2447,1278 +2414,1264 @@
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="3778.0" width="48029.8" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="3778.0" width="49294.0" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
 				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M209.5 1455.7 L209.5 1607 L15575 2288.153578896574 L15575.0 2288.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M214.8 1446.3 L209.5 1455.7 L204.2 1446.3 L209.5 1437.0 Z"></path>
-					</g>
-					<path d="M6298.9 545.4 L209.5 876 L209.5 1025 L209.5 1025 L209.5 1174 L209.5 1174 L209.5 1344 L209.5 1344.0 " fill="none"></path>
-					<path d="M6299.2 550.8 L6298.9 545.4 L6298.6 540.1 L6312.3 544.7 Z"></path>
-					<path d="M13775.2 1417.8 L13119 1607 L13119 2242.5 L13119.0 2242.5 " fill="none"></path>
-					<path d="M13776.7 1423.0 L13775.2 1417.8 L13773.7 1412.7 L13788.0 1414.1 Z"></path>
-					<path d="M34946.9 111.4 L34683.5 203 L34683.5 410.5 L34683.5 410.5 " fill="none"></path>
-					<path d="M34948.6 116.4 L34946.9 111.4 L34945.1 106.3 L34959.4 107.0 Z"></path>
-					<path d="M34322.0 186.7 L34322 203 L34322 524 L34322.0 524.0 " fill="none"></path>
+					<path d="M20147.4 1407.6 L19041.25 1607 L19041.25 2242.5 L19041.3 2242.5 " fill="none"></path>
+					<path d="M20148.3 1412.9 L20147.4 1407.6 L20146.4 1402.4 L20160.5 1405.3 Z"></path>
+					<path d="M26245.0 186.7 L26245 203 L26245 524 L26245.0 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34327.3 177.3 L34322.0 186.7 L34316.7 177.3 L34322.0 168.0 Z"></path>
+						<path d="M26250.3 177.3 L26245.0 186.7 L26239.7 177.3 L26245.0 168.0 Z"></path>
 					</g>
-					<path d="M15556.7 2337.8 L12536 2985 L27416.75 3170.7945655994245 L27416.8 3170.8 " fill="none"></path>
+					<path d="M26623.5 186.7 L26623.5 203 L26623.5 524 L26623.5 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15567.0 2341.1 L15556.7 2337.8 L15564.8 2330.7 L15575.0 2333.9 Z"></path>
+						<path d="M26628.8 177.3 L26623.5 186.7 L26618.2 177.3 L26623.5 168.0 Z"></path>
 					</g>
-					<path d="M15791.1 2397.4 L16017.75 2985 L34918.25 3170.983393130375 L34918.3 3171.0 " fill="none"></path>
+					<path d="M103.5 2361.2 L103.5 2985 L1100 3143.302597955707 L1100.0 3143.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15792.7 2386.8 L15791.1 2397.4 L15782.8 2390.6 L15784.4 2380.0 Z"></path>
+						<path d="M108.8 2351.8 L103.5 2361.2 L98.2 2351.8 L103.5 2342.5 Z"></path>
 					</g>
-					<path d="M42897.6 693.6 L42366.75 876 L42366.75 1025 L42366.75 1025 L42366.75 1174 L42366.75 1174 L42366.75 1390.5 L42366.75 1390.5 L42366.75 1607 L42366.75 1607 L15929 2291.417841610385 L15929.0 2291.4 " fill="none"></path>
-					<path d="M42899.4 698.7 L42897.6 693.6 L42895.9 688.6 L42910.3 689.3 Z"></path>
-					<path d="M882.3 2361.2 L882.25 2985 L2927 3156.6034987062662 L2927.0 3156.6 " fill="none"></path>
+					<path d="M737.6 1410.0 L103.5 1607 L103.5 2249.5 L103.5 2249.5 " fill="none"></path>
+					<path d="M739.2 1415.0 L737.6 1410.0 L736.1 1404.9 L750.4 1406.0 Z"></path>
+					<path d="M676.5 2361.2 L676.5 2985 L1100 3116.4188851913477 L1100.0 3116.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M887.6 2351.8 L882.3 2361.2 L876.9 2351.8 L882.3 2342.5 Z"></path>
+						<path d="M681.8 2351.8 L676.5 2361.2 L671.2 2351.8 L676.5 2342.5 Z"></path>
 					</g>
-					<path d="M1102.0 1414.8 L882.25 1607 L882.25 2249.5 L882.3 2249.5 " fill="none"></path>
-					<path d="M1105.5 1418.8 L1102.0 1414.8 L1098.5 1410.8 L1112.0 1406.0 Z"></path>
-					<path d="M1129.8 2361.2 L1129.75 2985 L2927 3154.7364856310924 L2927.0 3154.7 " fill="none"></path>
+					<path d="M784.8 1417.6 L676.5 1607 L676.5 2249.5 L676.5 2249.5 " fill="none"></path>
+					<path d="M789.4 1420.2 L784.8 1417.6 L780.1 1414.9 L791.4 1406.0 Z"></path>
+					<path d="M924.0 2361.2 L924 2985 L1119.230563002681 3088 L1119.2 3088.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1135.1 2351.8 L1129.8 2361.2 L1124.4 2351.8 L1129.8 2342.5 Z"></path>
+						<path d="M929.3 2351.8 L924.0 2361.2 L918.7 2351.8 L924.0 2342.5 Z"></path>
 					</g>
-					<path d="M1129.8 1419.3 L1129.75 1607 L1129.75 2249.5 L1129.8 2249.5 " fill="none"></path>
-					<path d="M1135.1 1419.3 L1129.8 1419.3 L1124.4 1419.3 L1129.8 1406.0 Z"></path>
-					<path d="M1377.3 2361.2 L1377.25 2985 L2927 3152.3344188739325 L2927.0 3152.3 " fill="none"></path>
+					<path d="M815.7 1417.6 L924 1607 L924 2249.5 L924.0 2249.5 " fill="none"></path>
+					<path d="M820.4 1414.9 L815.7 1417.6 L811.1 1420.2 L809.1 1406.0 Z"></path>
+					<path d="M1206.5 2376.2 L1206.5 2985 L1245.7117962466489 3088 L1245.7 3088.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1382.6 2351.8 L1377.3 2361.2 L1371.9 2351.8 L1377.3 2342.5 Z"></path>
+						<path d="M1211.8 2366.8 L1206.5 2376.2 L1201.2 2366.8 L1206.5 2357.5 Z"></path>
 					</g>
-					<path d="M1157.5 1414.8 L1377.25 1607 L1377.25 2249.5 L1377.3 2249.5 " fill="none"></path>
-					<path d="M1161.0 1410.8 L1157.5 1414.8 L1154.0 1418.8 L1147.5 1406.0 Z"></path>
-					<path d="M1659.8 2376.2 L1659.75 2985 L2927 3148.586866239834 L2927.0 3148.6 " fill="none"></path>
+					<path d="M841.1 1412.3 L1206.5 1607 L1206.5 2234.5 L1206.5 2234.5 " fill="none"></path>
+					<path d="M843.6 1407.6 L841.1 1412.3 L838.6 1417.0 L829.3 1406.0 Z"></path>
+					<path d="M1353.2 1468.8 L1296 1607 L14594.75 2294.165663610627 L14594.8 2294.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1665.1 2366.8 L1659.8 2376.2 L1654.4 2366.8 L1659.8 2357.5 Z"></path>
+						<path d="M1361.6 1462.2 L1353.2 1468.8 L1351.8 1458.1 L1360.3 1451.5 Z"></path>
 					</g>
-					<path d="M1180.0 1411.0 L1659.75 1607 L1659.75 2234.5 L1659.8 2234.5 " fill="none"></path>
-					<path d="M1182.1 1406.1 L1180.0 1411.0 L1178.0 1416.0 L1167.7 1406.0 Z"></path>
-					<path d="M1744.0 1469.3 L1699.75 1607 L14038 2294.0232750782907 L14038.0 2294.0 " fill="none"></path>
+					<path d="M1385.5 1470.2 L1385.5 1607 L1385.5 2296 L1385.5 2296 L1385.5 2985 L1385.5 2985 L1325.8538873994637 3088 L1325.9 3088.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1751.9 1462.0 L1744.0 1469.3 L1741.7 1458.8 L1749.7 1451.5 Z"></path>
+						<path d="M1390.8 1460.8 L1385.5 1470.2 L1380.2 1460.8 L1385.5 1451.5 Z"></path>
 					</g>
-					<path d="M1827.8 1466.3 L1936.5 1607 L1936.5 2296 L1936.5 2296 L1936.5 2985 L1936.5 2985 L2927 3143.1577482876714 L2927.0 3143.2 " fill="none"></path>
+					<path d="M1400.2 1469.9 L1425.5 1607 L3931.75 2281.8632144601856 L3931.8 2281.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1826.3 1455.6 L1827.8 1466.3 L1817.9 1462.1 L1816.4 1451.5 Z"></path>
+						<path d="M1403.7 1459.7 L1400.2 1469.9 L1393.2 1461.6 L1396.8 1451.5 Z"></path>
 					</g>
-					<path d="M1840.6 1465.0 L1976.5 1607 L3547.837082728592 2280.5 L3547.8 2280.5 " fill="none"></path>
+					<path d="M1850.0 2368.2 L1850 2985 L32934 3171.1616223246256 L32934.0 3171.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1838.0 1454.6 L1840.6 1465.0 L1830.2 1461.9 L1827.6 1451.5 Z"></path>
+						<path d="M1855.3 2358.8 L1850.0 2368.2 L1844.7 2358.8 L1850.0 2349.5 Z"></path>
 					</g>
-					<path d="M2812.0 2368.2 L2812 2985 L27416.75 3171.07272036089 L27416.8 3171.1 " fill="none"></path>
+					<path d="M2267.1 2374.9 L2090 2985 L586.9879356568365 3156 L587.0 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2817.3 2358.8 L2812.0 2368.2 L2806.7 2358.8 L2812.0 2349.5 Z"></path>
+						<path d="M2274.8 2367.5 L2267.1 2374.9 L2264.6 2364.5 L2272.3 2357.0 Z"></path>
 					</g>
-					<path d="M3229.1 2374.9 L3052 2985 L1537.06836461126 3156 L1537.1 3156.0 " fill="none"></path>
+					<path d="M2319.7 2374.5 L2550.5 2985 L32934 3171.153835413929 L32934.0 3171.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3236.8 2367.5 L3229.1 2374.9 L3226.6 2364.5 L3234.3 2357.0 Z"></path>
+						<path d="M2321.4 2363.8 L2319.7 2374.5 L2311.4 2367.6 L2313.1 2357.0 Z"></path>
 					</g>
-					<path d="M3275.8 2374.9 L3459.5 2985 L27416.75 3171.0611993128937 L27416.8 3171.1 " fill="none"></path>
+					<path d="M35940.7 2562.4 L35267.75 2985 L31367.5 3168.1656594271326 L31367.5 3168.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3278.2 2364.4 L3275.8 2374.9 L3268.0 2367.5 L3270.4 2357.0 Z"></path>
+						<path d="M35951.4 2562.0 L35940.7 2562.4 L35945.8 2552.9 L35956.5 2552.5 Z"></path>
 					</g>
-					<path d="M41494.1 2568.9 L41265.75 2985 L29258.75 3170.403667825799 L29258.8 3170.4 " fill="none"></path>
+					<path d="M35955.8 2562.7 L35307.75 2985 L16537.5 3170.6690998050835 L16537.5 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41503.2 2563.2 L41494.1 2568.9 L41493.9 2558.1 L41503.0 2552.5 Z"></path>
+						<path d="M35966.5 2562.1 L35955.8 2562.7 L35960.7 2553.1 L35971.4 2552.5 Z"></path>
 					</g>
-					<path d="M41554.0 2570.2 L41418.25 2985 L27376.75 3170.3909419135607 L27376.8 3170.4 " fill="none"></path>
+					<path d="M35970.8 2563.0 L35347.75 2985 L34603.75 3160.640506329114 L34603.8 3160.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41562.0 2563.0 L41554.0 2570.2 L41551.8 2559.7 L41559.8 2552.5 Z"></path>
+						<path d="M35981.6 2562.1 L35970.8 2563.0 L35975.6 2553.3 L35986.3 2552.5 Z"></path>
 					</g>
-					<path d="M41569.8 2570.5 L41458.25 2985 L33194.25 3170.467629362214 L33194.3 3170.5 " fill="none"></path>
+					<path d="M36433.8 2570.6 L36537.5 2985 L33047 3168.5292500704822 L33047.0 3168.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41577.4 2562.9 L41569.8 2570.5 L41567.1 2560.1 L41574.7 2552.5 Z"></path>
+						<path d="M36436.7 2560.3 L36433.8 2570.6 L36426.3 2562.8 L36429.2 2552.5 Z"></path>
 					</g>
-					<path d="M41712.5 2570.6 L41816.25 2985 L27529.75 3170.7653384926443 L27529.8 3170.8 " fill="none"></path>
+					<path d="M36449.6 2570.3 L36577.5 2985 L39422.75 3168.121085324821 L39422.8 3168.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41715.4 2560.3 L41712.5 2570.6 L41705.1 2562.8 L41708.0 2552.5 Z"></path>
+						<path d="M36452.0 2559.8 L36449.6 2570.3 L36441.8 2563.0 L36444.1 2552.5 Z"></path>
 					</g>
-					<path d="M41728.4 2570.3 L41856.25 2985 L35023.25 3170.0779899789413 L35023.3 3170.1 " fill="none"></path>
+					<path d="M36465.4 2570.0 L36617.5 2985 L1455 3170.5632781550653 L1455.0 3170.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41730.7 2559.8 L41728.4 2570.3 L41720.5 2563.0 L41722.9 2552.5 Z"></path>
-					</g>
-					<path d="M41744.2 2570.0 L41896.25 2985 L3282 3170.646629115727 L3282.0 3170.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41746.0 2559.4 L41744.2 2570.0 L41736.0 2563.1 L41737.8 2552.5 Z"></path>
+						<path d="M36467.2 2559.4 L36465.4 2570.0 L36457.2 2563.1 L36459.0 2552.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M42634.2 102.3 L41643.75 203 L41643.75 539.5 L41643.75 539.5 L41643.75 876 L41643.75 876 L41643.75 1025 L41643.75 1025 L41643.75 1174 L41643.75 1174 L41643.75 1390.5 L41643.75 1390.5 L41643.75 1607 L41643.75 1607 L41643.75 2039.5 L41643.8 2039.5 " fill="none"></path>
+						<path d="M38450.7 96.9 L36365 203 L36365 539.5 L36365 539.5 L36365 876 L36365 876 L36365 1025 L36365 1025 L36365 1174 L36365 1174 L36365 1390.5 L36365 1390.5 L36365 1607 L36365 1607 L36365 2039.5 L36365.0 2039.5 " fill="none"></path>
 					</g>
-					<path d="M42634.8 107.7 L42634.2 102.3 L42633.7 97.0 L42647.5 101.0 Z"></path>
-					<path d="M3300.3 3134.4 L3545.3333333333358 3088 L3611.1666666666642 3088 L3611.1666666666642 3088 L3677 3171.5 L3677 3171.5 L3611.1666666666642 3255 L3611.1666666666642 3255 L3545.3333333333358 3255 L3545.3333333333358 3255 L3282 3205.120982986767 L3282.0 3205.1 " fill="none"></path>
+					<path d="M38451.0 102.3 L38450.7 96.9 L38450.4 91.6 L38464.0 96.3 Z"></path>
+					<path d="M1472.3 3093.1 L1485 3088 L1492.5 3088 L1492.5 3088 L1500 3171.5 L1500 3171.5 L1492.5 3255 L1492.5 3255 L1485 3255 L1485 3255 L1455 3242.9277108433735 L1455.0 3242.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3290.2 3130.9 L3300.3 3134.4 L3292.2 3141.4 L3282.0 3137.9 Z"></path>
+						<path d="M1461.7 3091.6 L1472.3 3093.1 L1465.6 3101.5 L1455.0 3100.1 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3698.5 2324.3 L3499.5 2985 L3281.3498659517427 3088 L3281.3 3088.0 " fill="none"></path>
+						<path d="M2994.6 2322.9 L2590.5 2985 L1455 3146.2876999238383 L1455.0 3146.3 " fill="none"></path>
 					</g>
-					<path d="M3703.6 2325.8 L3698.5 2324.3 L3693.4 2322.7 L3702.3 2311.5 Z"></path>
-					<path d="M1976.8 3121.9 L1989 3118 L1996.5 3118 L1996.5 3118 L2004 3171.5 L2004 3171.5 L1996.5 3225 L1996.5 3225 L1989 3225 L1989 3225 L1959 3215.5309734513276 L1959.0 3215.5 " fill="none"></path>
+					<path d="M2999.1 2325.7 L2994.6 2322.9 L2990.0 2320.1 L3001.5 2311.5 Z"></path>
+					<path d="M1027.8 3121.9 L1040 3118 L1047.5 3118 L1047.5 3118 L1055 3171.5 L1055 3171.5 L1047.5 3225 L1047.5 3225 L1040 3225 L1040 3225 L1010 3215.5309734513276 L1010.0 3215.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1966.3 3119.6 L1976.8 3121.9 L1969.5 3129.7 L1959.0 3127.5 Z"></path>
+						<path d="M1017.3 3119.6 L1027.8 3121.9 L1020.5 3129.7 L1010.0 3127.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3700.1 2324.5 L3539.5 2985 L1959 3156.3739825581397 L1959.0 3156.4 " fill="none"></path>
+						<path d="M2996.0 2323.2 L2630.5 2985 L1010 3156.7177556818183 L1010.0 3156.7 " fill="none"></path>
 					</g>
-					<path d="M3705.3 2325.7 L3700.1 2324.5 L3694.9 2323.2 L3703.2 2311.5 Z"></path>
-					<path d="M2025.1 1599.4 L2016.5 1607 L2016.5 2296 L2016.5 2296 L2016.5 2985 L2016.5 2985 L3897.75 3164.9016151775413 L3897.8 3164.9 " fill="none"></path>
+					<path d="M3000.7 2325.8 L2996.0 2323.2 L2991.3 2320.6 L3002.4 2311.5 Z"></path>
+					<path d="M2583.1 1431.8 L1465.5 1607 L1465.5 2296 L1465.5 2296 L1465.5 2985 L1465.5 2985 L10406.25 3170.0717139765256 L10406.3 3170.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2035.7 1597.2 L2025.1 1599.4 L2028.6 1589.2 L2039.1 1587.0 Z"></path>
+						<path d="M2593.1 1435.6 L2583.1 1431.8 L2591.5 1425.1 L2601.5 1428.9 Z"></path>
 					</g>
-					<path d="M2131.0 1602.9 L2128.5 1607 L2128.5 2280.5 L2128.5 2280.5 " fill="none"></path>
+					<path d="M2583.1 1435.4 L1577.5 1607 L1577.5 2280.5 L1577.5 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2140.4 1597.7 L2131.0 1602.9 L2131.3 1592.2 L2140.8 1587.0 Z"></path>
+						<path d="M2593.2 1439.1 L2583.1 1435.4 L2591.4 1428.6 L2601.5 1432.3 Z"></path>
 					</g>
-					<path d="M2422.1 1601.9 L2426 1607 L2426 2280.5 L2426.0 2280.5 " fill="none"></path>
+					<path d="M2756.2 1604.2 L2755 1607 L2755 2280.5 L2755.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2420.7 1591.2 L2422.1 1601.9 L2412.2 1597.7 L2410.8 1587.0 Z"></path>
+						<path d="M2764.7 1597.7 L2756.2 1604.2 L2754.9 1593.5 L2763.5 1587.0 Z"></path>
 					</g>
-					<path d="M2524.0 1476.2 L2925 1607 L14325 2291.675732217573 L14325.0 2291.7 " fill="none"></path>
+					<path d="M3109.6 1456.1 L3714.75 1607 L17375.75 2292.3876793126046 L17375.8 2292.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2516.8 1468.2 L2524.0 1476.2 L2513.5 1478.4 L2506.3 1470.4 Z"></path>
+						<path d="M3101.8 1448.7 L3109.6 1456.1 L3099.3 1459.0 L3091.5 1451.6 Z"></path>
 					</g>
-					<path d="M2524.1 1471.4 L2965 1607 L3979.8931422351234 2280.5 L3979.9 2280.5 " fill="none"></path>
+					<path d="M3109.7 1453.2 L3754.75 1607 L4146.240203193033 2280.5 L4146.2 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2516.7 1463.5 L2524.1 1471.4 L2513.6 1473.7 L2506.3 1465.9 Z"></path>
+						<path d="M3101.8 1445.9 L3109.7 1453.2 L3099.3 1456.3 L3091.5 1448.9 Z"></path>
 					</g>
-					<path d="M2524.2 1467.0 L3005 1607 L15448 2293.5996876626755 L15448.0 2293.6 " fill="none"></path>
+					<path d="M3109.7 1450.6 L3794.75 1607 L16444 2293.638691378937 L16444.0 2293.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2516.7 1459.3 L2524.2 1467.0 L2513.7 1469.5 L2506.3 1461.8 Z"></path>
+						<path d="M3101.8 1443.3 L3109.7 1450.6 L3099.4 1453.7 L3091.5 1446.4 Z"></path>
 					</g>
-					<path d="M2524.2 1463.1 L3045 1607 L4251.48385341074 2280.5 L4251.5 2280.5 " fill="none"></path>
+					<path d="M3109.7 1448.2 L3834.75 1607 L4417.83091436865 2280.5 L4417.8 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2516.7 1455.5 L2524.2 1463.1 L2513.8 1465.8 L2506.3 1458.2 Z"></path>
+						<path d="M3101.8 1441.0 L3109.7 1448.2 L3099.5 1451.4 L3091.5 1444.2 Z"></path>
 					</g>
-					<path d="M2524.3 1459.6 L3085 1607 L14038 2293.7740819948126 L14038.0 2293.8 " fill="none"></path>
+					<path d="M3109.8 1445.9 L3874.75 1607 L14594.75 2293.7258611872994 L14594.8 2293.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2516.6 1452.1 L2524.3 1459.6 L2513.9 1462.4 L2506.3 1454.9 Z"></path>
+						<path d="M3101.7 1438.8 L3109.8 1445.9 L3099.5 1449.2 L3091.5 1442.1 Z"></path>
 					</g>
-					<path d="M2524.7 1433.6 L3584 1607 L3584 2280.5 L3584.0 2280.5 " fill="none"></path>
+					<path d="M3109.8 1440.6 L3984.25 1607 L3984.25 2280.5 L3984.3 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2516.3 1426.8 L2524.7 1433.6 L2514.6 1437.4 L2506.3 1430.6 Z"></path>
+						<path d="M3101.7 1433.6 L3109.8 1440.6 L3099.7 1444.1 L3091.5 1437.1 Z"></path>
 					</g>
-					<path d="M42898.1 742.9 L42604.75 876 L42604.75 1025 L42604.75 1025 L42604.75 1174 L42604.75 1174 L42604.75 1359.5 L42604.8 1359.5 " fill="none"></path>
-					<path d="M42900.3 747.7 L42898.1 742.9 L42895.9 738.0 L42910.3 737.4 Z"></path>
+					<path d="M43766.0 648.3 L42826 876 L42826 1025 L42826 1025 L42826 1174 L42826 1174 L42826 1359.5 L42826.0 1359.5 " fill="none"></path>
+					<path d="M43767.3 653.4 L43766.0 648.3 L43764.8 643.1 L43779.0 645.1 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M35823.6 102.7 L35287 203 L35287 524 L35287.0 524.0 " fill="none"></path>
+						<path d="M27118.0 111.9 L26888.5 203 L26888.5 524 L26888.5 524.0 " fill="none"></path>
 					</g>
-					<path d="M35824.6 108.0 L35823.6 102.7 L35822.7 97.5 L35836.8 100.3 Z"></path>
-					<path d="M39148.8 3669.7 L39148.75 3671 L37334.5 3705.5664162082385 L37334.5 3705.6 " fill="none"></path>
+					<path d="M27120.0 116.9 L27118.0 111.9 L27116.1 107.0 L27130.4 107.0 Z"></path>
+					<path d="M39928.3 3669.7 L39928.25 3671 L38873.25 3704.924365942029 L38873.3 3704.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39154.1 3660.3 L39148.8 3669.7 L39143.4 3660.3 L39148.8 3651.0 Z"></path>
+						<path d="M39933.6 3660.3 L39928.3 3669.7 L39922.9 3660.3 L39928.3 3651.0 Z"></path>
 					</g>
-					<path d="M27249.1 3591.0 L27014.5 3671 L41307.5 3706.3725469692217 L41307.5 3706.4 " fill="none"></path>
+					<path d="M32765.7 3561.7 L32244.75 3671 L41566.5 3706.3049502573813 L41566.5 3706.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27259.6 3593.0 L27249.1 3591.0 L27256.2 3582.9 L27266.8 3584.9 Z"></path>
+						<path d="M32776.0 3565.0 L32765.7 3561.7 L32773.8 3554.5 L32784.0 3557.8 Z"></path>
 					</g>
-					<path d="M27697.4 3591.1 L27931 3671 L27849.169014084506 3691 L27849.2 3691.0 " fill="none"></path>
+					<path d="M32990.5 3617.2 L32990.5 3671 L31830.25 3704.156671362447 L31830.3 3704.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27690.3 3583.1 L27697.4 3591.1 L27686.9 3593.2 L27679.8 3585.1 Z"></path>
+						<path d="M32995.8 3607.8 L32990.5 3617.2 L32985.2 3607.8 L32990.5 3598.5 Z"></path>
 					</g>
-					<path d="M27698.0 3564.4 L28178.5 3671 L28096.669014084506 3691 L28096.7 3691.0 " fill="none"></path>
+					<path d="M33215.7 3522.5 L37379.5 3671 L32121.25 3705.672463431623 L32121.3 3705.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27690.0 3557.1 L27698.0 3564.4 L27687.7 3567.6 L27679.8 3560.3 Z"></path>
+						<path d="M33206.5 3516.9 L33215.7 3522.5 L33206.1 3527.5 L33197.0 3521.9 Z"></path>
 					</g>
-					<path d="M27473.3 3200.3 L27473.25 3358 L27473.25 3430.5 L27473.3 3430.5 " fill="none"></path>
-					<path d="M27478.6 3200.3 L27473.3 3200.3 L27467.9 3200.3 L27473.3 3187.0 Z"></path>
-					<path d="M5452.3 2383.7 L5452.25 2985 L4035.75 3162.837260181757 L4035.8 3162.8 " fill="none"></path>
+					<path d="M32990.5 3200.3 L32990.5 3358 L32990.5 3430.5 L32990.5 3430.5 " fill="none"></path>
+					<path d="M32995.8 3200.3 L32990.5 3200.3 L32985.2 3200.3 L32990.5 3187.0 Z"></path>
+					<path d="M5564.3 2383.7 L5564.25 2985 L10406.25 3168.8796579108125 L10406.3 3168.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5457.6 2374.3 L5452.3 2383.7 L5446.9 2374.3 L5452.3 2365.0 Z"></path>
+						<path d="M5569.6 2374.3 L5564.3 2383.7 L5558.9 2374.3 L5564.3 2365.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M35944.1 93.1 L40194 203 L40194 524 L40194.0 524.0 " fill="none"></path>
+						<path d="M27169.5 120.3 L27169.5 203 L27169.5 524 L27169.5 524.0 " fill="none"></path>
 					</g>
-					<path d="M35944.2 87.7 L35944.1 93.1 L35943.9 98.4 L35930.8 92.7 Z"></path>
+					<path d="M27174.8 120.3 L27169.5 120.3 L27164.2 120.3 L27169.5 107.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M35944.1 93.0 L40419.5 203 L40419.5 508.5 L40419.5 508.5 " fill="none"></path>
+						<path d="M27229.8 92.3 L35196.75 203 L35196.75 508.5 L35196.8 508.5 " fill="none"></path>
 					</g>
-					<path d="M35944.2 87.7 L35944.1 93.0 L35943.9 98.3 L35930.8 92.7 Z"></path>
-					<path d="M42629.1 111.2 L42108.75 203 L42108.75 539.5 L42108.75 539.5 L42108.75 876 L42108.75 876 L42108.75 1025 L42108.75 1025 L42108.75 1174 L42108.75 1174 L42108.75 1390.5 L42108.75 1390.5 L42108.75 1607 L42108.75 1607 L42108.75 2296 L42108.75 2296 L42108.75 2985 L42108.75 2985 L35023.25 3170.128292238722 L35023.3 3170.1 " fill="none"></path>
+					<path d="M27229.9 87.0 L27229.8 92.3 L27229.8 97.7 L27216.5 92.2 Z"></path>
+					<path d="M38445.4 98.7 L36830 203 L36830 539.5 L36830 539.5 L36830 876 L36830 876 L36830 1025 L36830 1025 L36830 1174 L36830 1174 L36830 1390.5 L36830 1390.5 L36830 1607 L36830 1607 L36830 2296 L36830 2296 L36830 2985 L36830 2985 L39422.75 3167.798554011908 L39422.8 3167.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42639.2 114.9 L42629.1 111.2 L42637.4 104.4 L42647.5 108.0 Z"></path>
+						<path d="M38455.0 103.5 L38445.4 98.7 L38454.3 92.8 L38464.0 97.5 Z"></path>
 					</g>
-					<path d="M35004.0 120.3 L35004 203 L35004 486 L35004.0 486.0 " fill="none"></path>
-					<path d="M35009.3 120.3 L35004.0 120.3 L34998.7 120.3 L35004.0 107.0 Z"></path>
-					<path d="M42894.7 841.9 L42843.75 876 L42843.75 1025 L42843.75 1025 L42843.75 1174 L42843.75 1174 L42843.75 1390.5 L42843.75 1390.5 L42843.75 1607 L42843.75 1607 L42843.75 2296 L42843.75 2296 L42843.75 2985 L42843.75 2985 L27118.75 3169.8425879238625 L27118.8 3169.8 " fill="none"></path>
+					<path d="M44786.0 120.3 L44786 203 L44786 486 L44786.0 486.0 " fill="none"></path>
+					<path d="M44791.3 120.3 L44786.0 120.3 L44780.7 120.3 L44786.0 107.0 Z"></path>
+					<path d="M43761.1 676.0 L43095.75 876 L43095.75 1025 L43095.75 1025 L43095.75 1174 L43095.75 1174 L43095.75 1390.5 L43095.75 1390.5 L43095.75 1607 L43095.75 1607 L43095.75 2296 L43095.75 2296 L43095.75 2985 L43095.75 2985 L28888.25 3169.6672997177407 L28888.3 3169.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42905.5 841.1 L42894.7 841.9 L42899.5 832.2 L42910.3 831.5 Z"></path>
+						<path d="M43771.6 678.4 L43761.1 676.0 L43768.5 668.2 L43779.0 670.6 Z"></path>
 					</g>
-					<path d="M42994.0 868.7 L42986.25 876 L42986.25 1009.5 L42986.3 1009.5 " fill="none"></path>
+					<path d="M43762.3 762.4 L43531.5 876 L43531.5 1009.5 L43531.5 1009.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43004.5 866.3 L42994.0 868.7 L42997.2 858.5 L43007.6 856.0 Z"></path>
+						<path d="M43773.0 763.1 L43762.3 762.4 L43768.3 753.5 L43779.0 754.2 Z"></path>
 					</g>
-					<path d="M43548.0 872.0 L43550.5 876 L43550.5 986.5 L43550.5 986.5 " fill="none"></path>
+					<path d="M44096.6 873.6 L44095.75 876 L44095.75 986.5 L44095.8 986.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43547.8 861.2 L43548.0 872.0 L43538.6 866.7 L43538.4 856.0 Z"></path>
+						<path d="M44104.7 866.6 L44096.6 873.6 L44094.7 863.0 L44102.8 856.0 Z"></path>
 					</g>
-					<path d="M43799.2 751.4 L44065.5 876 L44065.5 1025 L44065.5 1025 L44065.5 1174 L44065.5 1174 L44065.5 1390.5 L44065.5 1390.5 L44065.5 1607 L44065.5 1607 L44065.5 2296 L44065.5 2296 L44065.5 2985 L44065.5 2985 L44065.5 3171.5 L44065.5 3171.5 L44065.5 3358 L44065.5 3358 L44065.5 3514.5 L44065.5 3514.5 L44065.5 3671 L44065.5 3671 L41410.5 3705.824496582302 L41410.5 3705.8 " fill="none"></path>
+					<path d="M44315.1 873.9 L44315.75 876 L44315.75 1025 L44315.75 1025 L44315.75 1174 L44315.75 1174 L44315.75 1390.5 L44315.75 1390.5 L44315.75 1607 L44315.75 1607 L44315.75 2296 L44315.75 2296 L44315.75 2985 L44315.75 2985 L44315.75 3171.5 L44315.75 3171.5 L44315.75 3358 L44315.75 3358 L44315.75 3514.5 L44315.75 3514.5 L44315.75 3671 L44315.75 3671 L41669.5 3705.822305625058 L41669.5 3705.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43793.0 742.6 L43799.2 751.4 L43788.4 752.3 L43782.3 743.5 Z"></path>
+						<path d="M44317.5 863.4 L44315.1 873.9 L44307.3 866.5 L44309.8 856.0 Z"></path>
 					</g>
-					<path d="M43799.6 718.8 L44197 876 L44197 1009.5 L44197.0 1009.5 " fill="none"></path>
+					<path d="M44444.0 871.4 L44447.25 876 L44447.25 1009.5 L44447.3 1009.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43792.9 710.4 L43799.6 718.8 L43789.0 720.3 L43782.3 712.0 Z"></path>
+						<path d="M44443.1 860.7 L44444.0 871.4 L44434.4 866.7 L44433.4 856.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M42847.6 111.1 L43346.25 203 L43346.25 223 L43346.3 223.0 " fill="none"></path>
+						<path d="M38664.3 93.6 L44215 203 L44215 223 L44215.0 223.0 " fill="none"></path>
 					</g>
-					<path d="M42848.6 105.9 L42847.6 111.1 L42846.6 116.4 L42834.5 108.7 Z"></path>
-					<path d="M27136.3 3114.9 L27148.75 3110.5 L27156.25 3110.5 L27156.25 3110.5 L27163.75 3171.5 L27163.75 3171.5 L27156.25 3232.5 L27156.25 3232.5 L27148.75 3232.5 L27148.75 3232.5 L27118.75 3221.7982456140353 L27118.8 3221.8 " fill="none"></path>
+					<path d="M38664.4 88.3 L38664.3 93.6 L38664.2 98.9 L38651.0 93.3 Z"></path>
+					<path d="M28905.8 3114.9 L28918.25 3110.5 L28925.75 3110.5 L28925.75 3110.5 L28933.25 3171.5 L28933.25 3171.5 L28925.75 3232.5 L28925.75 3232.5 L28918.25 3232.5 L28918.25 3232.5 L28888.25 3221.7982456140353 L28888.3 3221.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27125.7 3113.0 L27136.3 3114.9 L27129.3 3123.1 L27118.8 3121.2 Z"></path>
+						<path d="M28895.2 3113.0 L28905.8 3114.9 L28898.8 3123.1 L28888.3 3121.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3706.6 2324.8 L3698 2985 L26836.75 3170.370413127289 L26836.8 3170.4 " fill="none"></path>
+						<path d="M2997.4 2323.5 L2670.5 2985 L28606.25 3170.491572952918 L28606.3 3170.5 " fill="none"></path>
 					</g>
-					<path d="M3712.0 2324.9 L3706.6 2324.8 L3701.3 2324.8 L3706.8 2311.5 Z"></path>
-					<path d="M6074.3 2405.7 L5937.5 2985 L12754.5 3168.9233996383364 L12754.5 3168.9 " fill="none"></path>
+					<path d="M3002.2 2325.8 L2997.4 2323.5 L2992.7 2321.1 L3003.3 2311.5 Z"></path>
+					<path d="M6127.4 2404.8 L5888.25 2985 L31407.5 3170.804668208747 L31407.5 3170.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6081.7 2397.8 L6074.3 2405.7 L6071.3 2395.4 L6078.6 2387.5 Z"></path>
+						<path d="M6135.9 2398.2 L6127.4 2404.8 L6126.0 2394.1 L6134.5 2387.5 Z"></path>
 					</g>
-					<path d="M6126.2 2405.7 L6263 2985 L12544.5 3169.010013351135 L12544.5 3169.0 " fill="none"></path>
+					<path d="M6209.8 2405.2 L6409 2985 L13835.5 3169.389569327032 L13835.5 3169.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6129.2 2395.4 L6126.2 2405.7 L6118.8 2397.8 L6121.9 2387.5 Z"></path>
+						<path d="M6211.8 2394.6 L6209.8 2405.2 L6201.7 2398.1 L6203.7 2387.5 Z"></path>
 					</g>
-					<path d="M5007.6 1486.6 L4680 1607 L5911.639150943396 2204.5 L5911.6 2204.5 " fill="none"></path>
-					<path d="M5009.4 1491.6 L5007.6 1486.6 L5005.7 1481.6 L5020.1 1482.0 Z"></path>
+					<path d="M5365.4 1442.9 L4469.75 1607 L5946.156023222061 2204.5 L5946.2 2204.5 " fill="none"></path>
+					<path d="M5366.3 1448.2 L5365.4 1442.9 L5364.4 1437.7 L5378.5 1440.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M6985.6 1419.3 L6968.25 1607 L6215.521407837446 2204.5 L6215.5 2204.5 " fill="none"></path>
+						<path d="M7393.6 1419.3 L7376.25 1607 L6332.14259796807 2204.5 L6332.1 2204.5 " fill="none"></path>
 					</g>
-					<path d="M6990.9 1419.8 L6985.6 1419.3 L6980.3 1418.8 L6986.8 1406.0 Z"></path>
-					<path d="M13803.9 1445.5 L13610 1607 L13610 2242.5 L13610.0 2242.5 " fill="none"></path>
-					<path d="M13807.3 1449.6 L13803.9 1445.5 L13800.5 1441.4 L13814.2 1437.0 Z"></path>
-					<path d="M678.0 1463.2 L678 1607 L18545 2283.3749896980853 L18545.0 2283.4 " fill="none"></path>
+					<path d="M7398.9 1419.8 L7393.6 1419.3 L7388.3 1418.8 L7394.8 1406.0 Z"></path>
+					<path d="M20147.6 1414.3 L19378.25 1607 L19378.25 2242.5 L19378.3 2242.5 " fill="none"></path>
+					<path d="M20148.9 1419.5 L20147.6 1414.3 L20146.3 1409.1 L20160.5 1411.0 Z"></path>
+					<path d="M37089.0 1463.2 L37089 1607 L42388.75 2255.2097812097813 L42388.8 2255.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M683.3 1453.8 L678.0 1463.2 L672.7 1453.8 L678.0 1444.5 Z"></path>
+						<path d="M37094.3 1453.8 L37089.0 1463.2 L37083.7 1453.8 L37089.0 1444.5 Z"></path>
 					</g>
-					<path d="M6298.9 545.9 L678 876 L678 1025 L678 1025 L678 1174 L678 1174 L678 1336.5 L678.0 1336.5 " fill="none"></path>
-					<path d="M6299.3 551.2 L6298.9 545.9 L6298.6 540.6 L6312.3 545.1 Z"></path>
-					<path d="M44000.6 182.6 L43933.25 203 L43933.25 524 L43933.3 524.0 " fill="none"></path>
+					<path d="M39258.8 555.6 L37089 876 L37089 1025 L37089 1025 L37089 1174 L37089 1174 L37089 1336.5 L37089.0 1336.5 " fill="none"></path>
+					<path d="M39259.6 560.9 L39258.8 555.6 L39258.0 550.3 L39272.0 553.7 Z"></path>
+					<path d="M45264.9 182.6 L45197.5 203 L45197.5 524 L45197.5 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44011.1 185.0 L44000.6 182.6 L44008.0 174.8 L44018.5 177.2 Z"></path>
+						<path d="M45275.4 185.0 L45264.9 182.6 L45272.3 174.8 L45282.8 177.2 Z"></path>
 					</g>
-					<path d="M44294.3 201.6 L44294.25 203 L44294.25 524 L44294.3 524.0 " fill="none"></path>
+					<path d="M45558.6 201.6 L45558.5 203 L45558.5 524 L45558.5 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44300.3 192.7 L44294.3 201.6 L44289.6 192.0 L44295.6 183.0 Z"></path>
+						<path d="M45564.5 192.7 L45558.6 201.6 L45553.9 192.0 L45559.8 183.0 Z"></path>
 					</g>
-					<path d="M44602.4 182.6 L44669.75 203 L44669.75 524 L44669.8 524.0 " fill="none"></path>
+					<path d="M45866.6 182.6 L45934 203 L45934 524 L45934.0 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44595.0 174.8 L44602.4 182.6 L44591.9 185.0 L44584.5 177.2 Z"></path>
+						<path d="M45859.2 174.8 L45866.6 182.6 L45856.1 185.0 L45848.8 177.2 Z"></path>
 					</g>
-					<path d="M44602.9 144.2 L44939.25 203 L44939.25 524 L44939.3 524.0 " fill="none"></path>
+					<path d="M45867.1 144.2 L46203.5 203 L46203.5 524 L46203.5 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44594.6 137.3 L44602.9 144.2 L44592.8 147.8 L44584.5 141.0 Z"></path>
+						<path d="M45858.9 137.3 L45867.1 144.2 L45857.0 147.8 L45848.8 141.0 Z"></path>
 					</g>
-					<path d="M18828.4 2503.1 L18711.75 2985 L39165.25 3171.222307654755 L39165.3 3171.2 " fill="none"></path>
+					<path d="M42666.1 2503.0 L42535.5 2985 L40770.25 3168.3323820130863 L40770.3 3168.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18835.7 2495.3 L18828.4 2503.1 L18825.4 2492.8 L18832.8 2485.0 Z"></path>
+						<path d="M42673.7 2495.4 L42666.1 2503.0 L42663.4 2492.6 L42671.0 2485.0 Z"></path>
 					</g>
-					<path d="M18946.5 2502.7 L19105.25 2985 L12945.5 3168.6526717557254 L12945.5 3168.7 " fill="none"></path>
+					<path d="M42678.1 2503.3 L42575.5 2985 L31598.5 3169.8914427636037 L31598.5 3169.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18948.7 2492.2 L18946.5 2502.7 L18938.6 2495.5 L18940.7 2485.0 Z"></path>
+						<path d="M42685.3 2495.2 L42678.1 2503.3 L42674.8 2493.0 L42682.0 2485.0 Z"></path>
 					</g>
-					<path d="M18995.7 2501.2 L19272 2985 L27416.75 3170.2151653711326 L27416.8 3170.2 " fill="none"></path>
+					<path d="M42766.4 2503.3 L42869 2985 L33047 3170.43331477451 L33047.0 3170.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18995.7 2490.5 L18995.7 2501.2 L18986.4 2495.7 L18986.4 2485.0 Z"></path>
+						<path d="M42769.7 2493.0 L42766.4 2503.3 L42759.2 2495.2 L42762.5 2485.0 Z"></path>
 					</g>
-					<path d="M19007.4 2500.8 L19312 2985 L34918.25 3170.87471062505 L34918.3 3170.9 " fill="none"></path>
+					<path d="M42778.4 2503.0 L42909 2985 L39527.75 3168.648525664361 L39527.8 3168.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19006.9 2490.1 L19007.4 2500.8 L18997.9 2495.7 L18997.4 2485.0 Z"></path>
+						<path d="M42781.1 2492.6 L42778.4 2503.0 L42770.8 2495.4 L42773.5 2485.0 Z"></path>
 					</g>
-					<path d="M43794.9 693.2 L44328.5 876 L44328.5 1025 L44328.5 1025 L44328.5 1174 L44328.5 1174 L44328.5 1390.5 L44328.5 1390.5 L44328.5 1607 L44328.5 1607 L19212 2286.971257367387 L19212.0 2287.0 " fill="none"></path>
-					<path d="M43796.6 688.1 L43794.9 693.2 L43793.1 698.2 L43782.3 688.9 Z"></path>
-					<path d="M13879.0 1450.2 L13902.5 1607 L13902.5 2265 L13902.5 2265.0 " fill="none"></path>
-					<path d="M13884.2 1449.4 L13879.0 1450.2 L13873.7 1451.0 L13877.0 1437.0 Z"></path>
-					<path d="M13955.8 1444.1 L14217 1607 L14217 2265 L14217.0 2265.0 " fill="none"></path>
-					<path d="M13958.7 1439.5 L13955.8 1444.1 L13953.0 1448.6 L13944.5 1437.0 Z"></path>
-					<path d="M13964.8 1417.8 L14621 1607 L14621 2265 L14621.0 2265.0 " fill="none"></path>
-					<path d="M13966.3 1412.7 L13964.8 1417.8 L13963.3 1423.0 L13952.0 1414.1 Z"></path>
-					<path d="M7265.8 1470.7 L7265.75 1607 L14325 2289.0435758106923 L14325.0 2289.0 " fill="none"></path>
+					<path d="M44566.9 865.1 L44578.75 876 L44578.75 1025 L44578.75 1025 L44578.75 1174 L44578.75 1174 L44578.75 1390.5 L44578.75 1390.5 L44578.75 1607 L44578.75 1607 L43055.75 2172.228656073256 L43055.8 2172.2 " fill="none"></path>
+					<path d="M44570.5 861.1 L44566.9 865.1 L44563.3 869.0 L44557.1 856.0 Z"></path>
+					<path d="M20148.0 1426.3 L19670.75 1607 L19670.75 2265 L19670.8 2265.0 " fill="none"></path>
+					<path d="M20149.9 1431.3 L20148.0 1426.3 L20146.1 1421.3 L20160.5 1421.6 Z"></path>
+					<path d="M20335.9 1443.6 L20623.25 1607 L20623.25 2265 L20623.3 2265.0 " fill="none"></path>
+					<path d="M20338.5 1439.0 L20335.9 1443.6 L20333.2 1448.2 L20324.3 1437.0 Z"></path>
+					<path d="M20337.0 1424.6 L20843.25 1607 L20843.25 2265 L20843.3 2265.0 " fill="none"></path>
+					<path d="M20338.9 1419.6 L20337.0 1424.6 L20335.2 1429.6 L20324.5 1420.1 Z"></path>
+					<path d="M12101.0 1470.7 L12101 1607 L17375.75 2286.721840370318 L17375.8 2286.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7271.1 1461.3 L7265.8 1470.7 L7260.4 1461.3 L7265.8 1452.0 Z"></path>
+						<path d="M12106.3 1461.3 L12101.0 1470.7 L12095.7 1461.3 L12101.0 1452.0 Z"></path>
 					</g>
-					<path d="M14597.4 1026.8 L7265.75 1174 L7265.75 1329 L7265.8 1329.0 " fill="none"></path>
-					<path d="M14597.5 1032.1 L14597.4 1026.8 L14597.3 1021.5 L14610.8 1026.5 Z"></path>
-					<path d="M7925.6 1444.2 L7810 1607 L13299 2288.9186801298233 L13299.0 2288.9 " fill="none"></path>
+					<path d="M17769.7 1027.3 L12101 1174 L12101 1329 L12101.0 1329.0 " fill="none"></path>
+					<path d="M17769.8 1032.6 L17769.7 1027.3 L17769.5 1022.0 L17783.0 1027.0 Z"></path>
+					<path d="M8403.0 1438.6 L8124 1607 L9846.60576923077 2280.5 L9846.6 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7935.4 1439.7 L7925.6 1444.2 L7926.7 1433.5 L7936.4 1429.0 Z"></path>
+						<path d="M8413.7 1438.4 L8403.0 1438.6 L8408.2 1429.3 L8419.0 1429.0 Z"></path>
 					</g>
-					<path d="M7992.1 1445.6 L8075.25 1607 L8223.341799709724 2280.5 L8223.3 2280.5 " fill="none"></path>
+					<path d="M8511.1 1445.6 L8594.25 1607 L8694.199746008708 2280.5 L8694.2 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7992.6 1434.9 L7992.1 1445.6 L7983.1 1439.7 L7983.6 1429.0 Z"></path>
+						<path d="M8511.6 1434.9 L8511.1 1445.6 L8502.1 1439.7 L8502.6 1429.0 Z"></path>
 					</g>
-					<path d="M8218.8 1483.6 L8155.25 1607 L13299 2288.448589145796 L13299.0 2288.4 " fill="none"></path>
+					<path d="M8737.8 1483.6 L8674.25 1607 L9858.984397677794 2280.5 L9859.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8227.8 1477.7 L8218.8 1483.6 L8218.3 1472.9 L8227.4 1467.0 Z"></path>
+						<path d="M8746.8 1477.7 L8737.8 1483.6 L8737.3 1472.9 L8746.4 1467.0 Z"></path>
 					</g>
-					<path d="M8316.5 1483.5 L8382.5 1607 L8230.253809869377 2280.5 L8230.3 2280.5 " fill="none"></path>
+					<path d="M8835.5 1483.5 L8901.5 1607 L8701.11175616836 2280.5 L8701.1 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8316.8 1472.7 L8316.5 1483.5 L8307.3 1477.7 L8307.7 1467.0 Z"></path>
+						<path d="M8835.8 1472.7 L8835.5 1483.5 L8826.3 1477.7 L8826.7 1467.0 Z"></path>
 					</g>
-					<path d="M8332.7 1482.2 L8422.5 1607 L12213 2286.4990243267853 L12213.0 2286.5 " fill="none"></path>
+					<path d="M8851.7 1482.2 L8941.5 1607 L11459.25 2281.795195954488 L11459.3 2281.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8331.6 1471.5 L8332.7 1482.2 L8322.9 1477.7 L8321.8 1467.0 Z"></path>
+						<path d="M8850.6 1471.5 L8851.7 1482.2 L8841.9 1477.7 L8840.8 1467.0 Z"></path>
 					</g>
-					<path d="M8530.8 1537.3 L8508.25 1607 L8508.25 2227 L8508.3 2227.0 " fill="none"></path>
+					<path d="M9049.8 1537.3 L9027.25 1607 L8883.948113207547 2227 L8883.9 2227.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8538.7 1530.0 L8530.8 1537.3 L8528.6 1526.7 L8536.5 1519.5 Z"></path>
+						<path d="M9057.7 1530.0 L9049.8 1537.3 L9047.6 1526.7 L9055.5 1519.5 Z"></path>
 					</g>
-					<path d="M8609.4 1537.8 L8624 1607 L14038 2291.51160656941 L14038.0 2291.5 " fill="none"></path>
+					<path d="M9128.4 1537.8 L9143 1607 L14594.75 2291.542484851246 L14594.8 2291.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8612.7 1527.5 L8609.4 1537.8 L8602.2 1529.7 L8605.5 1519.5 Z"></path>
+						<path d="M9131.7 1527.5 L9128.4 1537.8 L9121.2 1529.7 L9124.5 1519.5 Z"></path>
 					</g>
-					<path d="M9777.5 2413.7 L9777.5 2985 L6480.25 3167.7586373430418 L6480.3 3167.8 " fill="none"></path>
+					<path d="M10119.8 2413.7 L10119.75 2985 L11139.75 3159.9241379310347 L11139.8 3159.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9782.8 2404.3 L9777.5 2413.7 L9772.2 2404.3 L9777.5 2395.0 Z"></path>
+						<path d="M10125.1 2404.3 L10119.8 2413.7 L10114.4 2404.3 L10119.8 2395.0 Z"></path>
 					</g>
-					<path d="M8653.5 1531.3 L8694 1607 L9641 2209.199353945547 L9641.0 2209.2 " fill="none"></path>
-					<path d="M8658.2 1528.7 L8653.5 1531.3 L8648.8 1533.8 L8647.2 1519.5 Z"></path>
-					<path d="M8678.8 1530.3 L8734 1607 L9954 2245.981375902699 L9954.0 2246.0 " fill="none"></path>
-					<path d="M8683.2 1527.2 L8678.8 1530.3 L8674.5 1533.4 L8671.1 1519.5 Z"></path>
-					<path d="M4815.7 2428.3 L4700 2985 L27208.75 3170.806591716369 L27208.8 3170.8 " fill="none"></path>
+					<path d="M9172.5 1531.3 L9213 1607 L9989.462264150943 2197 L9989.5 2197.0 " fill="none"></path>
+					<path d="M9177.2 1528.7 L9172.5 1531.3 L9167.8 1533.8 L9166.2 1519.5 Z"></path>
+					<path d="M9197.8 1530.3 L9253 1607 L10296.25 2238.2177826564216 L10296.3 2238.2 " fill="none"></path>
+					<path d="M9202.2 1527.2 L9197.8 1530.3 L9193.5 1533.4 L9190.1 1519.5 Z"></path>
+					<path d="M4879.5 2428.0 L4728.75 2985 L16369.5 3170.1638521077207 L16369.5 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4822.9 2420.2 L4815.7 2428.3 L4812.4 2418.1 L4819.5 2410.0 Z"></path>
+						<path d="M4887.1 2420.4 L4879.5 2428.0 L4876.8 2417.6 L4884.4 2410.0 Z"></path>
 					</g>
-					<path d="M4870.8 2428.3 L4986.5 2985 L12544.5 3169.4258798900955 L12544.5 3169.4 " fill="none"></path>
+					<path d="M4942.8 2428.3 L5058.5 2985 L13835.5 3169.7111825772963 L13835.5 3169.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4874.1 2418.1 L4870.8 2428.3 L4863.6 2420.2 L4867.0 2410.0 Z"></path>
+						<path d="M4946.1 2418.1 L4942.8 2428.3 L4935.6 2420.2 L4939.0 2410.0 Z"></path>
 					</g>
-					<path d="M5077.2 1488.0 L4843.25 1607 L4843.25 2182 L4843.3 2182.0 " fill="none"></path>
-					<path d="M5079.6 1492.8 L5077.2 1488.0 L5074.8 1483.3 L5089.1 1482.0 Z"></path>
-					<path d="M14597.4 1026.8 L7441 1174 L13788 1387.7386063151346 L13788.0 1387.7 " fill="none"></path>
-					<path d="M14597.5 1032.2 L14597.4 1026.8 L14597.3 1021.5 L14610.8 1026.6 Z"></path>
+					<path d="M5365.7 1474.5 L4915.25 1607 L4915.25 2182 L4915.3 2182.0 " fill="none"></path>
+					<path d="M5367.2 1479.7 L5365.7 1474.5 L5364.2 1469.4 L5378.5 1470.8 Z"></path>
+					<path d="M17769.7 1027.4 L12276.25 1174 L20160.5 1388.2714734034207 L20160.5 1388.3 " fill="none"></path>
+					<path d="M17769.8 1032.7 L17769.7 1027.4 L17769.5 1022.1 L17783.0 1027.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M16079.0 1053.8 L16079 1174 L13952 1382.463331824355 L13952.0 1382.5 " fill="none"></path>
+						<path d="M21420.3 1053.8 L21420.25 1174 L20324.5 1375.42634260242 L20324.5 1375.4 " fill="none"></path>
 					</g>
-					<path d="M16084.3 1053.8 L16079.0 1053.8 L16073.7 1053.8 L16079.0 1040.5 Z"></path>
-					<path d="M9119.2 1475.9 L9047.75 1607 L13299 2286.8842337375963 L13299.0 2286.9 " fill="none"></path>
+					<path d="M21425.6 1053.8 L21420.3 1053.8 L21414.9 1053.8 L21420.3 1040.5 Z"></path>
+					<path d="M9638.2 1475.9 L9566.75 1607 L9879.062409288825 2280.5 L9879.1 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9128.4 1470.2 L9119.2 1475.9 L9119.0 1465.1 L9128.1 1459.5 Z"></path>
+						<path d="M9647.4 1470.2 L9638.2 1475.9 L9638.0 1465.1 L9647.1 1459.5 Z"></path>
 					</g>
-					<path d="M9234.2 1473.9 L9343.25 1607 L12213 2283.5059447438202 L12213.0 2283.5 " fill="none"></path>
+					<path d="M9816.5 1464.1 L10072.25 1607 L11479.855224963716 2280.5 L11479.9 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9232.4 1463.3 L9234.2 1473.9 L9224.1 1470.1 L9222.3 1459.5 Z"></path>
+						<path d="M9811.0 1454.9 L9816.5 1464.1 L9805.8 1464.2 L9800.3 1455.0 Z"></path>
 					</g>
-					<path d="M5219.3 1499.0 L5169.75 1607 L5169.75 2296 L5169.75 2296 L5169.75 2985 L5169.75 2985 L31265.5 3170.961976405407 L31265.5 3171.0 " fill="none"></path>
+					<path d="M5461.8 1490.7 L5241.75 1607 L5241.75 2296 L5241.75 2296 L5241.75 2985 L5241.75 2985 L33316 3170.9997912947715 L33316.0 3171.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5228.0 1492.7 L5219.3 1499.0 L5218.3 1488.3 L5227.1 1482.0 Z"></path>
+						<path d="M5472.6 1491.1 L5461.8 1490.7 L5467.6 1481.6 L5478.3 1482.0 Z"></path>
 					</g>
-					<path d="M5482.8 1489.9 L5734.75 1607 L5734.75 2296 L5734.75 2296 L5734.75 2985 L5734.75 2985 L33102.25 3171.187051999927 L33102.3 3171.2 " fill="none"></path>
+					<path d="M5479.1 1491.4 L5281.75 1607 L5281.75 2296 L5281.75 2296 L5281.75 2985 L5281.75 2985 L34511.75 3171.2069613335157 L34511.8 3171.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5476.6 1481.1 L5482.8 1489.9 L5472.1 1490.8 L5465.8 1482.0 Z"></path>
+						<path d="M5489.9 1491.3 L5479.1 1491.4 L5484.5 1482.1 L5495.2 1482.0 Z"></path>
 					</g>
-					<path d="M5560.4 1443.2 L6465.75 1607 L6465.75 2296 L6465.75 2296 L6465.75 2985 L6465.75 2985 L12544.5 3168.928107888866 L12544.5 3168.9 " fill="none"></path>
+					<path d="M5942.9 1442.1 L6873.75 1607 L6873.75 2296 L6873.75 2296 L6873.75 2985 L6873.75 2985 L13835.5 3169.250381381488 L13835.5 3169.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5552.1 1436.3 L5560.4 1443.2 L5550.2 1446.8 L5542.0 1439.9 Z"></path>
+						<path d="M5934.6 1435.2 L5942.9 1442.1 L5932.8 1445.7 L5924.5 1438.9 Z"></path>
 					</g>
-					<path d="M45457.3 156.2 L45457.25 203 L45457.25 524 L45457.3 524.0 " fill="none"></path>
+					<path d="M46721.5 156.2 L46721.5 203 L46721.5 524 L46721.5 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45462.6 146.8 L45457.3 156.2 L45451.9 146.8 L45457.3 137.5 Z"></path>
+						<path d="M46726.8 146.8 L46721.5 156.2 L46716.2 146.8 L46721.5 137.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M7998.3 1439.9 L8115.25 1607 L8838.041727140784 2250 L8838.0 2250.0 " fill="none"></path>
+						<path d="M8517.3 1439.9 L8634.25 1607 L9173.89404934688 2250 L9173.9 2250.0 " fill="none"></path>
 					</g>
-					<path d="M8002.7 1436.9 L7998.3 1439.9 L7994.0 1443.0 L7990.7 1429.0 Z"></path>
+					<path d="M8521.7 1436.9 L8517.3 1439.9 L8513.0 1443.0 L8509.7 1429.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M8889.8 1472.3 L8889.75 1607 L8889.75 2250 L8889.8 2250.0 " fill="none"></path>
+						<path d="M9408.8 1472.3 L9408.75 1607 L9225.602322206096 2250 L9225.6 2250.0 " fill="none"></path>
 					</g>
-					<path d="M8895.1 1472.3 L8889.8 1472.3 L8884.4 1472.3 L8889.8 1459.0 Z"></path>
-					<path d="M19448.9 1070.4 L19024.75 1174 L19024.75 1375 L19024.8 1375.0 " fill="none"></path>
+					<path d="M9414.1 1472.3 L9408.8 1472.3 L9403.4 1472.3 L9408.8 1459.0 Z"></path>
+					<path d="M24997.6 1078.6 L24667.25 1174 L25103.60103926097 1375 L25103.6 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19459.2 1073.3 L19448.9 1070.4 L19456.7 1063.0 L19467.0 1065.9 Z"></path>
+						<path d="M25008.0 1081.1 L24997.6 1078.6 L25005.1 1070.9 L25015.5 1073.4 Z"></path>
 					</g>
-					<path d="M19565.7 1162.7 L19560 1174 L13952 1387.3799648506151 L13952.0 1387.4 " fill="none"></path>
+					<path d="M24997.7 1083.7 L24713 1174 L20324.5 1386.5288558326808 L20324.5 1386.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19574.6 1156.7 L19565.7 1162.7 L19565.1 1152.0 L19574.0 1146.0 Z"></path>
+						<path d="M25008.2 1086.0 L24997.7 1083.7 L25005.0 1075.8 L25015.5 1078.1 Z"></path>
 					</g>
-					<path d="M19819.8 1084.9 L20095.25 1174 L20095.25 1390.5 L20095.25 1390.5 L20095.25 1607 L20095.25 1607 L14109 2291.938140905883 L14109.0 2291.9 " fill="none"></path>
+					<path d="M25225.6 1163.8 L25228.75 1174 L25228.75 1390.5 L25228.75 1390.5 L25228.75 1607 L25228.75 1607 L14665.75 2293.692173420767 L14665.8 2293.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19812.5 1077.0 L19819.8 1084.9 L19809.2 1087.1 L19802.0 1079.2 Z"></path>
+						<path d="M25228.0 1153.4 L25225.6 1163.8 L25217.8 1156.5 L25220.2 1146.0 Z"></path>
 					</g>
-					<path d="M19820.1 1070.4 L20244.25 1174 L20244.25 1375 L20244.3 1375.0 " fill="none"></path>
+					<path d="M25356.0 1157.3 L25377.75 1174 L25377.75 1375 L25377.8 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19812.3 1063.0 L19820.1 1070.4 L19809.8 1073.3 L19802.0 1065.9 Z"></path>
+						<path d="M25351.8 1147.4 L25356.0 1157.3 L25345.3 1155.9 L25341.2 1146.0 Z"></path>
 					</g>
-					<path d="M10410.9 1510.7 L10321.25 1607 L24358.75 2294.579532932855 L24358.8 2294.6 " fill="none"></path>
+					<path d="M10677.2 1514.5 L10642.25 1607 L21235.25 2294.118904161175 L21235.3 2294.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10421.2 1507.5 L10410.9 1510.7 L10413.4 1500.2 L10423.6 1497.0 Z"></path>
+						<path d="M10685.5 1507.6 L10677.2 1514.5 L10675.5 1503.8 L10683.8 1497.0 Z"></path>
 					</g>
-					<path d="M10616.7 1511.8 L10690.5 1607 L14038 2288.7698788057937 L14038.0 2288.8 " fill="none"></path>
+					<path d="M10904.4 1475.0 L11186.25 1607 L14594.75 2288.8979384436702 L14594.8 2288.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10615.2 1501.1 L10616.7 1511.8 L10606.8 1507.6 L10605.3 1497.0 Z"></path>
+						<path d="M10898.2 1466.2 L10904.4 1475.0 L10893.7 1475.9 L10887.5 1467.1 Z"></path>
 					</g>
-					<path d="M13965.0 1411.0 L14873 1607 L14873 2219.5 L14873.0 2219.5 " fill="none"></path>
-					<path d="M13966.2 1405.8 L13965.0 1411.0 L13963.9 1416.2 L13952.0 1408.2 Z"></path>
-					<path d="M44346.2 2443.5 L44264.25 2985 L44264.25 3156 L44264.3 3156.0 " fill="none"></path>
+					<path d="M20337.4 1414.6 L21095.25 1607 L21095.25 2219.5 L21095.3 2219.5 " fill="none"></path>
+					<path d="M20338.7 1409.4 L20337.4 1414.6 L20336.1 1419.8 L20324.5 1411.3 Z"></path>
+					<path d="M44592.2 2443.4 L44494.5 2985 L44494.5 3156 L44494.5 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44352.9 2435.0 L44346.2 2443.5 L44342.3 2433.4 L44349.0 2425.0 Z"></path>
+						<path d="M44599.1 2435.1 L44592.2 2443.4 L44588.6 2433.2 L44595.5 2425.0 Z"></path>
 					</g>
-					<path d="M44379.2 2443.6 L44418.25 2985 L31416.5 3170.423263683114 L31416.5 3170.4 " fill="none"></path>
+					<path d="M44600.7 2443.5 L44534.5 2985 L33467 3170.2363591492417 L33467.0 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44383.8 2433.9 L44379.2 2443.6 L44373.2 2434.7 L44377.8 2425.0 Z"></path>
+						<path d="M44607.1 2434.9 L44600.7 2443.5 L44596.5 2433.6 L44603.0 2425.0 Z"></path>
 					</g>
-					<path d="M44401.4 2443.2 L44522.5 2985 L27529.75 3170.881952285291 L27529.8 3170.9 " fill="none"></path>
+					<path d="M44640.1 2443.5 L44718.5 2985 L33047 3170.6015305252386 L33047.0 3170.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44404.6 2432.9 L44401.4 2443.2 L44394.2 2435.3 L44397.3 2425.0 Z"></path>
+						<path d="M44644.0 2433.5 L44640.1 2443.5 L44633.5 2435.0 L44637.4 2425.0 Z"></path>
 					</g>
-					<path d="M44409.9 2443.0 L44562.5 2985 L35023.25 3170.4792008757527 L35023.3 3170.5 " fill="none"></path>
+					<path d="M44648.6 2443.3 L44758.5 2985 L39527.75 3169.6467373302416 L39527.8 3169.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44412.5 2432.5 L44409.9 2443.0 L44402.2 2435.4 L44404.8 2425.0 Z"></path>
+						<path d="M44652.0 2433.1 L44648.6 2443.3 L44641.5 2435.2 L44644.9 2425.0 Z"></path>
 					</g>
-					<path d="M43794.9 687.2 L44368.5 876 L44368.5 1025 L44368.5 1025 L44368.5 1174 L44368.5 1174 L44368.5 1390.5 L44368.5 1390.5 L44368.5 1607 L44368.5 1607 L44368.5 2167 L44368.5 2167.0 " fill="none"></path>
-					<path d="M43796.6 682.1 L43794.9 687.2 L43793.2 692.3 L43782.3 683.0 Z"></path>
-					<path d="M13965.1 1407.2 L15100.5 1607 L15100.5 2265 L15100.5 2265.0 " fill="none"></path>
-					<path d="M13966.1 1402.0 L13965.1 1407.2 L13964.2 1412.5 L13952.0 1404.9 Z"></path>
-					<path d="M6646.8 2353.2 L6646.75 2985 L29116.75 3170.9125593363206 L29116.8 3170.9 " fill="none"></path>
+					<path d="M44605.0 864.5 L44618.75 876 L44618.75 1025 L44618.75 1025 L44618.75 1174 L44618.75 1174 L44618.75 1390.5 L44618.75 1390.5 L44618.75 1607 L44618.75 1607 L44618.75 2167 L44618.8 2167.0 " fill="none"></path>
+					<path d="M44608.4 860.4 L44605.0 864.5 L44601.6 868.6 L44594.8 856.0 Z"></path>
+					<path d="M20337.6 1408.0 L21420.75 1607 L21420.75 2265 L21420.8 2265.0 " fill="none"></path>
+					<path d="M20338.6 1402.7 L20337.6 1408.0 L20336.6 1413.2 L20324.5 1405.6 Z"></path>
+					<path d="M7054.8 2353.2 L7054.75 2985 L31225.5 3170.9537729330596 L31225.5 3171.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6652.1 2343.8 L6646.8 2353.2 L6641.4 2343.8 L6646.8 2334.5 Z"></path>
+						<path d="M7060.1 2343.8 L7054.8 2353.2 L7049.4 2343.8 L7054.8 2334.5 Z"></path>
 					</g>
-					<path d="M5555.2 1435.5 L6646.75 1607 L6646.75 2257.5 L6646.8 2257.5 " fill="none"></path>
-					<path d="M5556.0 1430.2 L5555.2 1435.5 L5554.3 1440.7 L5542.0 1433.4 Z"></path>
-					<path d="M24749.2 1138.7 L24721.75 1174 L24721.75 1375 L24721.8 1375.0 " fill="none"></path>
+					<path d="M5937.7 1434.7 L7054.75 1607 L7054.75 2257.5 L7054.8 2257.5 " fill="none"></path>
+					<path d="M5938.5 1429.4 L5937.7 1434.7 L5936.9 1439.9 L5924.5 1432.6 Z"></path>
+					<path d="M25692.8 1131.7 L25600.25 1174 L25600.25 1375 L25600.3 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24759.2 1134.6 L24749.2 1138.7 L24750.7 1128.1 L24760.7 1124.0 Z"></path>
+						<path d="M25703.5 1132.7 L25692.8 1131.7 L25699.1 1123.0 L25709.8 1124.0 Z"></path>
 					</g>
-					<path d="M24835.8 1142.7 L24835.25 1174 L24835.25 1390.5 L24835.25 1390.5 L24835.25 1607 L24835.25 1607 L15535 2292.792347826087 L15535.0 2292.8 " fill="none"></path>
+					<path d="M26080.1 1134.9 L26134.75 1174 L26134.75 1390.5 L26134.75 1390.5 L26134.75 1607 L26134.75 1607 L16531 2292.893259737231 L16531.0 2292.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24841.3 1133.4 L24835.8 1142.7 L24830.6 1133.2 L24836.1 1124.0 Z"></path>
+						<path d="M26075.6 1125.1 L26080.1 1134.9 L26069.4 1133.8 L26065.0 1124.0 Z"></path>
 					</g>
-					<path d="M24926.3 1138.7 L24953.75 1174 L24953.75 1375 L24953.8 1375.0 " fill="none"></path>
+					<path d="M26160.7 1131.7 L26253.25 1174 L26253.25 1375 L26253.3 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24924.8 1128.1 L24926.3 1138.7 L24916.3 1134.6 L24914.8 1124.0 Z"></path>
+						<path d="M26154.4 1123.0 L26160.7 1131.7 L26150.0 1132.7 L26143.7 1124.0 Z"></path>
 					</g>
-					<path d="M25078.7 1065.5 L25724.25 1174 L25724.25 1375 L25724.3 1375.0 " fill="none"></path>
+					<path d="M26167.4 1083.5 L26539.75 1174 L26539.75 1375 L26539.8 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25070.3 1058.7 L25078.7 1065.5 L25068.6 1069.2 L25060.3 1062.4 Z"></path>
+						<path d="M26159.6 1076.1 L26167.4 1083.5 L26157.1 1086.5 L26149.3 1079.1 Z"></path>
 					</g>
-					<path d="M25957.2 1454.0 L25699.25 1607 L25699.25 2280.5 L25699.3 2280.5 " fill="none"></path>
+					<path d="M26775.9 1454.3 L26527.25 1607 L27964.66908563135 2280.5 L27964.7 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25967.9 1453.8 L25957.2 1454.0 L25962.5 1444.7 L25973.2 1444.5 Z"></path>
+						<path d="M26786.7 1453.9 L26775.9 1454.3 L26781.1 1444.8 L26791.8 1444.5 Z"></path>
 					</g>
-					<path d="M26108.3 1460.3 L26200.75 1607 L14469 2291.797267817431 L14469.0 2291.8 " fill="none"></path>
+					<path d="M26901.7 1462.4 L26945.75 1607 L17519.75 2290.7770056854074 L17519.8 2290.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26107.8 1449.6 L26108.3 1460.3 L26098.8 1455.2 L26098.3 1444.5 Z"></path>
+						<path d="M26904.0 1451.9 L26901.7 1462.4 L26893.8 1455.0 L26896.2 1444.5 Z"></path>
 					</g>
-					<path d="M25073.5 1053.6 L26064.25 1174 L26064.25 1336.5 L26064.3 1336.5 " fill="none"></path>
-					<path d="M25074.1 1048.3 L25073.5 1053.6 L25072.8 1058.9 L25060.3 1052.0 Z"></path>
-					<path d="M13965.2 1404.7 L15318 1607 L15318 2257.5 L15318.0 2257.5 " fill="none"></path>
-					<path d="M13966.0 1399.5 L13965.2 1404.7 L13964.4 1410.0 L13952.0 1402.8 Z"></path>
-					<path d="M5555.2 1427.8 L6928.25 1607 L6928.25 2265 L6928.3 2265.0 " fill="none"></path>
-					<path d="M5555.9 1422.6 L5555.2 1427.8 L5554.5 1433.1 L5542.0 1426.1 Z"></path>
-					<path d="M16809.4 2339.6 L16593.75 2985 L11808.5 3165.9049054882685 L11808.5 3165.9 " fill="none"></path>
-					<path d="M16814.5 2341.3 L16809.4 2339.6 L16804.4 2338.0 L16813.6 2327.0 Z"></path>
-					<path d="M12546.5 1440.2 L12546.5 1607 L27443.25 2276.7789940780135 L27443.3 2276.8 " fill="none"></path>
+					<path d="M26162.4 1061.8 L26879.75 1174 L26879.75 1336.5 L26879.8 1336.5 " fill="none"></path>
+					<path d="M26163.2 1056.6 L26162.4 1061.8 L26161.6 1067.1 L26149.3 1059.8 Z"></path>
+					<path d="M20337.7 1404.5 L21711.25 1607 L22611.94230769231 2257.5 L22611.9 2257.5 " fill="none"></path>
+					<path d="M20338.5 1399.3 L20337.7 1404.5 L20336.9 1409.8 L20324.5 1402.6 Z"></path>
+					<path d="M5937.7 1427.3 L7336.25 1607 L7336.25 2265 L7336.3 2265.0 " fill="none"></path>
+					<path d="M5938.4 1422.0 L5937.7 1427.3 L5937.0 1432.6 L5924.5 1425.6 Z"></path>
+					<path d="M22877.1 2338.6 L22511.5 2985 L14341.5 3168.1816542438087 L14341.5 3168.2 " fill="none"></path>
+					<path d="M22881.8 2341.2 L22877.1 2338.6 L22872.5 2336.0 L22883.7 2327.0 Z"></path>
+					<path d="M12844.0 1440.2 L12844 1607 L28098.75 2277.2177780611837 L28098.8 2277.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12551.8 1430.8 L12546.5 1440.2 L12541.2 1430.8 L12546.5 1421.5 Z"></path>
+						<path d="M12849.3 1430.8 L12844.0 1440.2 L12838.7 1430.8 L12844.0 1421.5 Z"></path>
 					</g>
-					<path d="M7616.3 1455.7 L7616.25 1607 L7616.25 2280.5 L7616.3 2280.5 " fill="none"></path>
+					<path d="M12451.5 1455.7 L12451.5 1607 L11328.59270682148 2280.5 L11328.6 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7621.6 1446.3 L7616.3 1455.7 L7610.9 1446.3 L7616.3 1437.0 Z"></path>
+						<path d="M12456.8 1446.3 L12451.5 1455.7 L12446.2 1446.3 L12451.5 1437.0 Z"></path>
 					</g>
-					<path d="M14597.4 1026.9 L7616.25 1174 L7616.25 1344 L7616.3 1344.0 " fill="none"></path>
-					<path d="M14597.5 1032.2 L14597.4 1026.9 L14597.3 1021.6 L14610.8 1026.6 Z"></path>
-					<path d="M4294.0 1097.7 L4294 1174 L4294 1194 L4294.0 1194.0 " fill="none"></path>
+					<path d="M17769.7 1027.5 L12451.5 1174 L12451.5 1344 L12451.5 1344.0 " fill="none"></path>
+					<path d="M17769.8 1032.8 L17769.7 1027.5 L17769.5 1022.1 L17783.0 1027.1 Z"></path>
+					<path d="M37727.0 1097.7 L37727 1174 L37727 1194 L37727.0 1194.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4299.3 1088.3 L4294.0 1097.7 L4288.7 1088.3 L4294.0 1079.0 Z"></path>
+						<path d="M37732.3 1088.3 L37727.0 1097.7 L37721.7 1088.3 L37727.0 1079.0 Z"></path>
 					</g>
-					<path d="M6299.1 556.9 L4294 876 L4294 971 L4294.0 971.0 " fill="none"></path>
-					<path d="M6299.9 562.1 L6299.1 556.9 L6298.2 551.6 L6312.3 554.8 Z"></path>
-					<path d="M38585.2 1070.4 L38216.25 1174 L38216.25 1306.5 L38216.3 1306.5 " fill="none"></path>
-					<path d="M38586.6 1075.6 L38585.2 1070.4 L38583.7 1065.3 L38598.0 1066.8 Z"></path>
-					<path d="M31098.9 2503.0 L30970 2985 L39165.25 3170.8084825091937 L39165.3 3170.8 " fill="none"></path>
+					<path d="M39279.4 557.7 L37727 876 L37727 971 L37727.0 971.0 " fill="none"></path>
+					<path d="M39280.4 562.9 L39279.4 557.7 L39278.3 552.5 L39292.4 555.0 Z"></path>
+					<path d="M35616.0 1116.5 L35531 1174 L35531 1306.5 L35531.0 1306.5 " fill="none"></path>
+					<path d="M35619.0 1120.9 L35616.0 1116.5 L35613.1 1112.1 L35627.1 1109.0 Z"></path>
+					<path d="M38305.0 2499.9 L37936.75 2985 L40709.25 3169.470656439529 L40709.3 3169.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31106.4 2495.4 L31098.9 2503.0 L31096.1 2492.6 L31103.7 2485.0 Z"></path>
+						<path d="M38314.9 2495.7 L38305.0 2499.9 L38306.4 2489.2 L38316.3 2485.0 Z"></path>
 					</g>
-					<path d="M31202.2 2503.2 L31313.75 2985 L33102.25 3166.8235213954754 L33102.3 3166.8 " fill="none"></path>
+					<path d="M38316.5 2500.3 L37976.75 2985 L34603.75 3168.99078677976 L34603.8 3169.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31205.3 2492.9 L31202.2 2503.2 L31194.9 2495.3 L31198.0 2485.0 Z"></path>
+						<path d="M38326.3 2495.7 L38316.5 2500.3 L38317.5 2489.6 L38327.3 2485.0 Z"></path>
 					</g>
-					<path d="M31256.9 2501.7 L31498 2985 L31498 3171.5 L31498 3171.5 L31498 3358 L31498 3358 L31498 3514.5 L31498 3514.5 L31498 3671 L31498 3671 L37236.5 3706.1994384449245 L37236.5 3706.2 " fill="none"></path>
+					<path d="M38459.8 2503.7 L38459.75 2985 L38459.75 3171.5 L38459.75 3171.5 L38459.75 3358 L38459.75 3358 L38459.75 3514.5 L38459.75 3514.5 L38459.75 3671 L38459.75 3671 L38775.25 3701.727709190672 L38775.3 3701.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31257.5 2491.0 L31256.9 2501.7 L31247.9 2495.7 L31248.5 2485.0 Z"></path>
+						<path d="M38465.1 2494.3 L38459.8 2503.7 L38454.4 2494.3 L38459.8 2485.0 Z"></path>
 					</g>
-					<path d="M31268.6 2501.3 L31538 2985 L31538 3171.5 L31538 3171.5 L31538 3358 L31538 3358 L39008.25 3511.6108957724273 L39008.3 3511.6 " fill="none"></path>
+					<path d="M38471.8 2503.6 L38499.75 2985 L38499.75 3171.5 L38499.75 3171.5 L38499.75 3358 L38499.75 3358 L39787.75 3499.1074553727685 L39787.8 3499.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31268.7 2490.6 L31268.6 2501.3 L31259.4 2495.7 L31259.5 2485.0 Z"></path>
+						<path d="M38476.6 2494.0 L38471.8 2503.6 L38465.9 2494.6 L38470.7 2485.0 Z"></path>
 					</g>
-					<path d="M31280.3 2500.9 L31578 2985 L34918.25 3168.614066760003 L34918.3 3168.6 " fill="none"></path>
+					<path d="M38753.8 2495.5 L39475.25 2985 L39475.25 3156 L39475.3 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31279.9 2490.2 L31280.3 2500.9 L31270.8 2495.7 L31270.5 2485.0 Z"></path>
+						<path d="M38749.0 2485.8 L38753.8 2495.5 L38743.0 2494.7 L38738.3 2485.0 Z"></path>
 					</g>
-					<path d="M43795.4 605.4 L45638.25 876 L45638.25 1025 L45638.25 1025 L45638.25 1174 L45638.25 1174 L45638.25 1390.5 L45638.25 1390.5 L45638.25 1607 L45638.25 1607 L31573.75 2276.044497376415 L31573.8 2276.0 " fill="none"></path>
-					<path d="M43796.2 600.2 L43795.4 605.4 L43794.7 610.7 L43782.3 603.5 Z"></path>
-					<path d="M3962.5 1594.0 L3941.25 1607 L30734.75 2285.3787711755413 L30734.8 2285.4 " fill="none"></path>
-					<path d="M3965.3 1598.5 L3962.5 1594.0 L3959.7 1589.4 L3973.8 1587.0 Z"></path>
+					<path d="M44664.1 632.8 L45834.25 876 L45834.25 1025 L45834.25 1025 L45834.25 1174 L45834.25 1174 L45834.25 1390.5 L45834.25 1390.5 L45834.25 1607 L45834.25 1607 L38879.25 2256.806088548376 L38879.3 2256.8 " fill="none"></path>
+					<path d="M44665.1 627.6 L44664.1 632.8 L44663.0 638.0 L44651.0 630.1 Z"></path>
+					<path d="M37426.4 1594.5 L37408 1607 L38171.24383164006 2107 L38171.2 2107.0 " fill="none"></path>
+					<path d="M37429.4 1598.9 L37426.4 1594.5 L37423.4 1590.1 L37437.5 1587.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M43429.2 1061.9 L43060.5 1174 L43060.5 1390.5 L43060.5 1390.5 L43060.5 1607 L43060.5 1607 L31573.75 2271.724052493438 L31573.8 2271.7 " fill="none"></path>
+						<path d="M43974.2 1048.1 L43310.75 1174 L43310.75 1390.5 L43310.75 1390.5 L43310.75 1607 L43310.75 1607 L38879.25 2236.417336631622 L38879.3 2236.4 " fill="none"></path>
 					</g>
-					<path d="M43430.8 1067.0 L43429.2 1061.9 L43427.7 1056.8 L43442.0 1058.0 Z"></path>
+					<path d="M43975.1 1053.3 L43974.2 1048.1 L43973.2 1042.8 L43987.3 1045.6 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M17438.1 1411.8 L17033 1607 L30734.75 2275.5318757192176 L30734.8 2275.5 " fill="none"></path>
+						<path d="M14559.7 1417.5 L14448.5 1607 L38040.25 2283.962496746317 L38040.3 2284.0 " fill="none"></path>
 					</g>
-					<path d="M17440.4 1416.6 L17438.1 1411.8 L17435.8 1407.0 L17450.1 1406.0 Z"></path>
+					<path d="M14564.3 1420.2 L14559.7 1417.5 L14555.1 1414.8 L14566.4 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M28475.1 1042.7 L27685.5 1174 L27685.5 1390.5 L27685.5 1390.5 L27685.5 1607 L27685.5 1607 L30734.75 2212.6744504504504 L30734.8 2212.7 " fill="none"></path>
+						<path d="M29747.4 1032.2 L27593 1174 L27593 1390.5 L27593 1390.5 L27593 1607 L27593 1607 L38040.25 2269.4018450778754 L38040.3 2269.4 " fill="none"></path>
 					</g>
-					<path d="M28476.0 1047.9 L28475.1 1042.7 L28474.3 1037.4 L28488.3 1040.5 Z"></path>
-					<path d="M28608.9 2449.2 L28338.5 2985 L27529.75 3159.3217278243283 L27529.8 3159.3 " fill="none"></path>
+					<path d="M29747.8 1037.5 L29747.4 1032.2 L29747.1 1026.9 L29760.8 1031.4 Z"></path>
+					<path d="M31425.5 2450.6 L31290.5 2985 L32934 3165.3016176470587 L32934.0 3165.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28617.9 2443.2 L28608.9 2449.2 L28608.4 2438.4 L28617.4 2432.5 Z"></path>
+						<path d="M31432.9 2442.9 L31425.5 2450.6 L31422.6 2440.2 L31430.0 2432.5 Z"></path>
 					</g>
-					<path d="M28735.2 2450.3 L28904.75 2985 L34918.25 3169.8858803165185 L34918.3 3169.9 " fill="none"></path>
+					<path d="M31513.4 2450.3 L31683 2985 L39422.75 3170.2434630562416 L39422.8 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28737.4 2439.8 L28735.2 2450.3 L28727.3 2443.0 L28729.5 2432.5 Z"></path>
+						<path d="M31515.7 2439.8 L31513.4 2450.3 L31505.5 2443.0 L31507.8 2432.5 Z"></path>
 					</g>
-					<path d="M42585.0 1433.6 L42505.75 1607 L29034.25 2278.649734071421 L29034.3 2278.6 " fill="none"></path>
-					<path d="M42589.9 1435.8 L42585.0 1433.6 L42580.2 1431.4 L42590.6 1421.5 Z"></path>
-					<path d="M26762.0 1549.9 L26685 1607 L28338.25 2176.188881948782 L28338.3 2176.2 " fill="none"></path>
-					<path d="M26765.1 1554.2 L26762.0 1549.9 L26758.8 1545.7 L26772.7 1542.0 Z"></path>
-					<path d="M4471.9 1601.3 L4476.75 1607 L4476.75 2296 L4476.75 2296 L4476.75 2985 L4476.75 2985 L14923.5 3170.2058152522636 L14923.5 3170.2 " fill="none"></path>
+					<path d="M42781.3 1430.4 L42583.25 1607 L31812.5 2274.4353456998315 L31812.5 2274.4 " fill="none"></path>
+					<path d="M42784.8 1434.4 L42781.3 1430.4 L42777.7 1426.4 L42791.2 1421.5 Z"></path>
+					<path d="M42180.8 1553.1 L42145 1607 L31812.5 2273.5504892093068 L31812.5 2273.6 " fill="none"></path>
+					<path d="M42185.2 1556.1 L42180.8 1553.1 L42176.3 1550.2 L42188.2 1542.0 Z"></path>
+					<path d="M37727.0 1605.7 L37727 1607 L37727 2296 L37727 2296 L37727 2985 L37727 2985 L28031.25 3170.1063211772234 L28031.3 3170.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4470.0 1590.7 L4471.9 1601.3 L4461.8 1597.6 L4459.9 1587.0 Z"></path>
+						<path d="M37732.3 1596.3 L37727.0 1605.7 L37721.7 1596.3 L37727.0 1587.0 Z"></path>
 					</g>
-					<path d="M4509.6 1600.0 L4516.75 1607 L4516.75 2296 L4516.75 2296 L4516.75 2985 L4516.75 2985 L27416.75 3171.04099056912 L27416.8 3171.0 " fill="none"></path>
+					<path d="M38124.5 1438.6 L39515.25 1607 L39515.25 2296 L39515.25 2296 L39515.25 2985 L39515.25 2985 L33047 3169.885033909345 L33047.0 3169.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4506.6 1589.7 L4509.6 1600.0 L4499.1 1597.3 L4496.2 1587.0 Z"></path>
+						<path d="M38115.9 1432.2 L38124.5 1438.6 L38114.6 1442.8 L38106.0 1436.4 Z"></path>
 					</g>
-					<path d="M35461.7 544.7 L29414 876 L29414 926 L29414.0 926.0 " fill="none"></path>
-					<path d="M35462.0 550.0 L35461.7 544.7 L35461.4 539.4 L35475.0 544.0 Z"></path>
-					<path d="M30106.8 2413.7 L30106.75 2985 L15069.5 3170.5989890968053 L15069.5 3170.6 " fill="none"></path>
+					<path d="M27289.2 540.7 L198.75 876 L198.75 926 L198.8 926.0 " fill="none"></path>
+					<path d="M27289.2 546.0 L27289.2 540.7 L27289.1 535.3 L27302.5 540.5 Z"></path>
+					<path d="M6685.8 2413.7 L6685.75 2985 L27885.25 3170.859995299095 L27885.3 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30112.1 2404.3 L30106.8 2413.7 L30101.4 2404.3 L30106.8 2395.0 Z"></path>
+						<path d="M6691.1 2404.3 L6685.8 2413.7 L6680.4 2404.3 L6685.8 2395.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M31038.0 1036.1 L29988.25 1174 L29988.25 1390.5 L29988.25 1390.5 L29988.25 1607 L29988.25 1607 L30089.723149492016 2197 L30089.7 2197.0 " fill="none"></path>
+						<path d="M9078.2 1027.6 L4293.25 1174 L4293.25 1390.5 L4293.25 1390.5 L4293.25 1607 L4293.25 1607 L6537.75 2253.378474399164 L6537.8 2253.4 " fill="none"></path>
 					</g>
-					<path d="M31038.7 1041.4 L31038.0 1036.1 L31037.3 1030.8 L31051.3 1034.4 Z"></path>
-					<path d="M18480.8 1440.2 L18480.75 1607 L28338.25 2272.5056097202487 L28338.3 2272.5 " fill="none"></path>
+					<path d="M9078.3 1032.9 L9078.2 1027.6 L9078.0 1022.3 L9091.5 1027.2 Z"></path>
+					<path d="M15334.0 1440.2 L15334 1607 L31116.5 2281.135488670531 L31116.5 2281.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18486.1 1430.8 L18480.8 1440.2 L18475.4 1430.8 L18480.8 1421.5 Z"></path>
+						<path d="M15339.3 1430.8 L15334.0 1440.2 L15328.7 1430.8 L15334.0 1421.5 Z"></path>
 					</g>
-					<path d="M30708.3 1478.2 L30708.25 1607 L30193.177431059506 2197 L30193.2 2197.0 " fill="none"></path>
+					<path d="M7725.3 1478.2 L7725.25 1607 L6833.75 2197.9028379028377 L6833.8 2197.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30713.6 1468.8 L30708.3 1478.2 L30702.9 1468.8 L30708.3 1459.5 Z"></path>
+						<path d="M7730.6 1468.8 L7725.3 1478.2 L7719.9 1468.8 L7725.3 1459.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M31038.7 1055.2 L30708.25 1174 L30708.25 1321.5 L30708.3 1321.5 " fill="none"></path>
+						<path d="M9078.2 1033.8 L7725.25 1174 L7725.25 1321.5 L7725.3 1321.5 " fill="none"></path>
 					</g>
-					<path d="M31040.5 1060.2 L31038.7 1055.2 L31036.9 1050.2 L31051.3 1050.7 Z"></path>
-					<path d="M27697.2 2545.3 L27391.25 2985 L39165.25 3171.0181286797406 L39165.3 3171.0 " fill="none"></path>
+					<path d="M9078.8 1039.1 L9078.2 1033.8 L9077.7 1028.5 L9091.5 1032.4 Z"></path>
+					<path d="M28328.5 2544.6 L27978.25 2985 L40709.25 3171.054264780786 L40709.3 3171.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27706.9 2540.7 L27697.2 2545.3 L27698.2 2534.6 L27707.9 2530.0 Z"></path>
+						<path d="M28338.5 2540.6 L28328.5 2544.6 L28330.2 2534.0 L28340.1 2530.0 Z"></path>
 					</g>
-					<path d="M27938.1 2548.0 L28054.75 2985 L27521.57841823056 3156 L27521.6 3156.0 " fill="none"></path>
+					<path d="M28342.6 2545.0 L28018.25 2985 L32934 3169.380788375484 L32934.0 3169.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27940.8 2537.6 L27938.1 2548.0 L27930.5 2540.4 L27933.2 2530.0 Z"></path>
+						<path d="M28352.5 2540.7 L28342.6 2545.0 L28343.9 2534.3 L28353.7 2530.0 Z"></path>
 					</g>
-					<path d="M27997.3 2546.7 L28218.5 2985 L28218.5 3171.5 L28218.5 3171.5 L28218.5 3358 L28218.5 3358 L28218.5 3514.5 L28218.5 3514.5 L28218.5 3671 L28218.5 3671 L37236.5 3706.3081504356455 L37236.5 3706.3 " fill="none"></path>
+					<path d="M28526.3 2548.7 L28526.25 2985 L28526.25 3171.5 L28526.25 3171.5 L28526.25 3358 L28526.25 3358 L28526.25 3514.5 L28526.25 3514.5 L28526.25 3671 L28526.25 3671 L38775.25 3706.3310837055737 L38775.3 3706.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27997.8 2535.9 L27997.3 2546.7 L27988.3 2540.7 L27988.9 2530.0 Z"></path>
+						<path d="M28531.6 2539.3 L28526.3 2548.7 L28520.9 2539.3 L28526.3 2530.0 Z"></path>
 					</g>
-					<path d="M28011.6 2546.3 L28258.5 2985 L28258.5 3171.5 L28258.5 3171.5 L28258.5 3358 L28258.5 3358 L39008.25 3512.4809233029546 L39008.3 3512.5 " fill="none"></path>
+					<path d="M28540.9 2548.6 L28566.25 2985 L28566.25 3171.5 L28566.25 3171.5 L28566.25 3358 L28566.25 3358 L39787.75 3512.564755324767 L39787.8 3512.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28011.7 2535.5 L28011.6 2546.3 L28002.4 2540.7 L28002.4 2530.0 Z"></path>
+						<path d="M28545.7 2539.0 L28540.9 2548.6 L28535.1 2539.6 L28539.8 2530.0 Z"></path>
 					</g>
-					<path d="M28025.9 2545.9 L28298.5 2985 L34918.25 3170.032541496497 L34918.3 3170.0 " fill="none"></path>
+					<path d="M28739.8 2544.1 L29119.25 2985 L39422.75 3170.554533603708 L39422.8 3170.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28025.5 2535.1 L28025.9 2545.9 L28016.4 2540.7 L28016.0 2530.0 Z"></path>
+						<path d="M28737.8 2533.6 L28739.8 2544.1 L28729.7 2540.6 L28727.6 2530.0 Z"></path>
 					</g>
-					<path d="M42592.8 1434.4 L42545.75 1607 L28298.25 2275.9286201022146 L28298.3 2275.9 " fill="none"></path>
-					<path d="M42597.9 1435.8 L42592.8 1434.4 L42587.7 1433.0 L42596.3 1421.5 Z"></path>
+					<path d="M42787.9 1431.2 L42623.25 1607 L28953.75 2275.105660778889 L28953.8 2275.1 " fill="none"></path>
+					<path d="M42791.7 1434.9 L42787.9 1431.2 L42784.0 1427.6 L42797.0 1421.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M43429.3 1065.1 L43100.5 1174 L43100.5 1390.5 L43100.5 1390.5 L43100.5 1607 L43100.5 1607 L28298.25 2276.659728491932 L28298.3 2276.7 " fill="none"></path>
+						<path d="M43974.2 1049.3 L43350.75 1174 L43350.75 1390.5 L43350.75 1390.5 L43350.75 1607 L43350.75 1607 L28953.75 2276.1310330871192 L28953.8 2276.1 " fill="none"></path>
 					</g>
-					<path d="M43431.0 1070.2 L43429.3 1065.1 L43427.7 1060.1 L43442.0 1060.9 Z"></path>
+					<path d="M43975.2 1054.5 L43974.2 1049.3 L43973.1 1044.1 L43987.3 1046.7 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M17441.2 1412.2 L17073 1607 L27443.25 2268.7214002917276 L27443.3 2268.7 " fill="none"></path>
+						<path d="M14564.3 1418.4 L14488.5 1607 L28098.75 2275.0174707485176 L28098.8 2275.0 " fill="none"></path>
 					</g>
-					<path d="M17443.7 1416.9 L17441.2 1412.2 L17438.7 1407.5 L17453.0 1406.0 Z"></path>
+					<path d="M14569.2 1420.4 L14564.3 1418.4 L14559.4 1416.4 L14569.3 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M28494.5 1043.2 L27870.75 1174 L27870.75 1390.5 L27870.75 1390.5 L27870.75 1607 L27870.75 1607 L27870.75 2062 L27870.8 2062.0 " fill="none"></path>
+						<path d="M29747.5 1037.3 L28526.25 1174 L28526.25 1390.5 L28526.25 1390.5 L28526.25 1607 L28526.25 1607 L28526.25 2062 L28526.3 2062.0 " fill="none"></path>
 					</g>
-					<path d="M28495.6 1048.5 L28494.5 1043.2 L28493.4 1038.0 L28507.6 1040.5 Z"></path>
-					<path d="M16818.8 2340.2 L16742.75 2985 L12241.5 3163.698978234261 L12241.5 3163.7 " fill="none"></path>
-					<path d="M16824.1 2340.9 L16818.8 2340.2 L16813.5 2339.6 L16820.3 2327.0 Z"></path>
-					<path d="M29802.0 1112.7 L29802 1174 L29802 1375 L29802.0 1375.0 " fill="none"></path>
+					<path d="M29748.1 1042.6 L29747.5 1037.3 L29746.9 1032.0 L29760.8 1035.8 Z"></path>
+					<path d="M22879.7 2338.9 L22554.5 2985 L15227.5 3166.6289625839036 L15227.5 3166.6 " fill="none"></path>
+					<path d="M22884.4 2341.3 L22879.7 2338.9 L22874.9 2336.5 L22885.6 2327.0 Z"></path>
+					<path d="M586.8 1112.7 L586.75 1174 L586.75 1375 L586.8 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29807.3 1103.3 L29802.0 1112.7 L29796.7 1103.3 L29802.0 1094.0 Z"></path>
+						<path d="M592.1 1103.3 L586.8 1112.7 L581.4 1103.3 L586.8 1094.0 Z"></path>
 					</g>
-					<path d="M35461.7 545.0 L29802 876 L29802 956 L29802.0 956.0 " fill="none"></path>
-					<path d="M35462.0 550.4 L35461.7 545.0 L35461.4 539.7 L35475.0 544.3 Z"></path>
-					<path d="M16290.2 2382.4 L16057.75 2985 L27416.75 3170.5769348692565 L27416.8 3170.6 " fill="none"></path>
+					<path d="M27289.2 540.7 L586.75 876 L586.75 956 L586.8 956.0 " fill="none"></path>
+					<path d="M27289.2 546.0 L27289.2 540.7 L27289.1 535.4 L27302.5 540.5 Z"></path>
+					<path d="M20060.3 2376.7 L19303 2985 L32934 3170.7301552511417 L32934.0 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16298.5 2375.6 L16290.2 2382.4 L16288.6 2371.8 L16296.9 2365.0 Z"></path>
+						<path d="M20070.9 2375.0 L20060.3 2376.7 L20064.2 2366.7 L20074.9 2365.0 Z"></path>
 					</g>
-					<path d="M16352.5 2382.7 L16553.75 2985 L11472.5 3167.8475471516085 L11472.5 3167.8 " fill="none"></path>
+					<path d="M20267.9 2376.2 L21081.25 2985 L13459.5 3169.0489916809634 L13459.5 3169.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16354.6 2372.2 L16352.5 2382.7 L16344.5 2375.5 L16346.6 2365.0 Z"></path>
+						<path d="M20263.6 2366.3 L20267.9 2376.2 L20257.2 2374.9 L20252.9 2365.0 Z"></path>
 					</g>
-					<path d="M19119.2 1505.6 L18924.5 1607 L21885.60286647315 2280.5 L21885.6 2280.5 " fill="none"></path>
+					<path d="M16477.5 1510.7 L16388.5 1607 L17624.30896226415 2280.5 L17624.3 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19129.9 1506.0 L19119.2 1505.6 L19125.0 1496.6 L19135.7 1497.0 Z"></path>
+						<path d="M16487.7 1507.5 L16477.5 1510.7 L16479.9 1500.2 L16490.1 1497.0 Z"></path>
 					</g>
-					<path d="M19464.3 1510.0 L19565 1607 L15535 2288.642322327237 L15535.0 2288.6 " fill="none"></path>
+					<path d="M16600.1 1515.6 L16608.5 1607 L16490.22206095791 2280.5 L16490.2 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19461.2 1499.6 L19464.3 1510.0 L19453.8 1507.3 L19450.8 1497.0 Z"></path>
+						<path d="M16604.5 1505.8 L16600.1 1515.6 L16593.9 1506.8 L16598.3 1497.0 Z"></path>
 					</g>
-					<path d="M19705.7 1510.0 L19605 1607 L22123.293722786646 2280.5 L22123.3 2280.5 " fill="none"></path>
+					<path d="M17690.4 1515.6 L17682 1607 L18515.077467343977 2280.5 L18515.1 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19716.2 1507.3 L19705.7 1510.0 L19708.8 1499.6 L19719.2 1497.0 Z"></path>
+						<path d="M17696.6 1506.8 L17690.4 1515.6 L17686.0 1505.8 L17692.2 1497.0 Z"></path>
 					</g>
-					<path d="M19893.8 1513.6 L19942.5 1607 L15535 2289.2663446416536 L15535.0 2289.3 " fill="none"></path>
+					<path d="M17813.4 1510.7 L17902.75 1607 L16519.337989840347 2280.5 L16519.3 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19894.3 1502.8 L19893.8 1513.6 L19884.8 1507.7 L19885.2 1497.0 Z"></path>
+						<path d="M17811.0 1500.2 L17813.4 1510.7 L17803.2 1507.5 L17800.8 1497.0 Z"></path>
 					</g>
-					<path d="M11197.6 3120.9 L11209.5 3118 L11217 3118 L11217 3118 L11224.5 3171.5 L11224.5 3171.5 L11217 3225 L11217 3225 L11209.5 3225 L11209.5 3225 L11179.5 3217.7539503386006 L11179.5 3217.8 " fill="none"></path>
+					<path d="M10334.4 3120.9 L10346.25 3118 L10353.75 3118 L10353.75 3118 L10361.25 3171.5 L10361.25 3171.5 L10353.75 3225 L10353.75 3225 L10346.25 3225 L10346.25 3225 L10316.25 3217.7539503386006 L10316.3 3217.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11187.3 3117.9 L11197.6 3120.9 L11189.8 3128.2 L11179.5 3125.2 Z"></path>
+						<path d="M10324.1 3117.9 L10334.4 3120.9 L10326.6 3128.2 L10316.3 3125.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3708.3 2324.8 L3738 2985 L10796.5 3166.573827586207 L10796.5 3166.6 " fill="none"></path>
+						<path d="M2998.9 2323.7 L2710.5 2985 L9933.25 3166.682958492093 L9933.3 3166.7 " fill="none"></path>
 					</g>
-					<path d="M3713.6 2324.6 L3708.3 2324.8 L3703.0 2325.1 L3707.7 2311.5 Z"></path>
-					<path d="M9560.8 1470.7 L9560.75 1607 L19704.25 2264.0340791576573 L19704.3 2264.0 " fill="none"></path>
+					<path d="M3003.8 2325.9 L2998.9 2323.7 L2994.0 2321.6 L3004.2 2311.5 Z"></path>
+					<path d="M13311.0 1470.7 L13311 1607 L21548.25 2257.054720384847 L21548.3 2257.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9566.1 1461.3 L9560.8 1470.7 L9555.4 1461.3 L9560.8 1452.0 Z"></path>
+						<path d="M13316.3 1461.3 L13311.0 1470.7 L13305.7 1461.3 L13311.0 1452.0 Z"></path>
 					</g>
-					<path d="M14597.4 1027.6 L9560.75 1174 L9560.75 1329 L9560.8 1329.0 " fill="none"></path>
-					<path d="M14597.6 1032.9 L14597.4 1027.6 L14597.3 1022.3 L14610.8 1027.2 Z"></path>
-					<path d="M47056.3 120.3 L47056.25 203 L47056.25 493 L47056.3 493.0 " fill="none"></path>
-					<path d="M47061.6 120.3 L47056.3 120.3 L47050.9 120.3 L47056.3 107.0 Z"></path>
-					<path d="M10079.8 1470.7 L10079.75 1607 L19704.25 2262.3943961257164 L19704.3 2262.4 " fill="none"></path>
+					<path d="M17769.7 1027.9 L13311 1174 L13311 1329 L13311.0 1329.0 " fill="none"></path>
+					<path d="M17769.8 1033.3 L17769.7 1027.9 L17769.5 1022.6 L17783.0 1027.5 Z"></path>
+					<path d="M48320.5 120.3 L48320.5 203 L48320.5 493 L48320.5 493.0 " fill="none"></path>
+					<path d="M48325.8 120.3 L48320.5 120.3 L48315.2 120.3 L48320.5 107.0 Z"></path>
+					<path d="M13830.0 1470.7 L13830 1607 L21548.25 2254.593296191433 L21548.3 2254.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10085.1 1461.3 L10079.8 1470.7 L10074.4 1461.3 L10079.8 1452.0 Z"></path>
+						<path d="M13835.3 1461.3 L13830.0 1470.7 L13824.7 1461.3 L13830.0 1452.0 Z"></path>
 					</g>
-					<path d="M14597.4 1027.9 L10079.75 1174 L10079.75 1329 L10079.8 1329.0 " fill="none"></path>
-					<path d="M14597.6 1033.2 L14597.4 1027.9 L14597.3 1022.6 L14610.8 1027.5 Z"></path>
-					<path d="M19831.6 2594.3 L19352 2985 L11179.5 3167.229943806791 L11179.5 3167.2 " fill="none"></path>
+					<path d="M17769.7 1028.3 L13830 1174 L13830 1329 L13830.0 1329.0 " fill="none"></path>
+					<path d="M17769.9 1033.6 L17769.7 1028.3 L17769.5 1023.0 L17783.0 1027.8 Z"></path>
+					<path d="M21644.0 2593.7 L21121.25 2985 L10316.25 3168.2521711453646 L10316.3 3168.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19842.2 2592.5 L19831.6 2594.3 L19835.5 2584.3 L19846.1 2582.5 Z"></path>
+						<path d="M21654.7 2592.4 L21644.0 2593.7 L21648.3 2583.8 L21659.0 2582.5 Z"></path>
 					</g>
-					<path d="M20708.7 2487.7 L22034.75 2985 L27416.75 3169.5624712696517 L27416.8 3169.6 " fill="none"></path>
+					<path d="M22060.8 2601.1 L22084.75 2985 L32934 3170.5337895147054 L32934.0 3170.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20701.9 2479.4 L20708.7 2487.7 L20698.1 2489.4 L20691.3 2481.1 Z"></path>
+						<path d="M22065.5 2591.5 L22060.8 2601.1 L22054.9 2592.1 L22059.6 2582.5 Z"></path>
 					</g>
-					<path d="M20708.8 2483.6 L22074.75 2985 L34918.25 3170.74075294665 L34918.3 3170.7 " fill="none"></path>
+					<path d="M22230.3 2598.3 L22471.5 2985 L39422.75 3170.9241711387194 L39422.8 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20701.8 2475.4 L20708.8 2483.6 L20698.2 2485.4 L20691.3 2477.2 Z"></path>
+						<path d="M22229.9 2587.6 L22230.3 2598.3 L22220.9 2593.2 L22220.4 2582.5 Z"></path>
 					</g>
-					<path d="M42600.9 1434.8 L42585.75 1607 L20691.25 2280.812332499553 L20691.3 2280.8 " fill="none"></path>
-					<path d="M42606.2 1435.2 L42600.9 1434.8 L42595.6 1434.3 L42602.0 1421.5 Z"></path>
-					<path d="M21724.5 1424.7 L20381 1607 L20273.9490203193 2009.5 L20273.9 2009.5 " fill="none"></path>
+					<path d="M42794.7 1432.2 L42663.25 1607 L22535.25 2279.5113110103534 L22535.3 2279.5 " fill="none"></path>
+					<path d="M42798.9 1435.4 L42794.7 1432.2 L42790.4 1429.0 L42802.7 1421.5 Z"></path>
+					<path d="M22371.2 1481.2 L22041.75 1607 L22041.75 2009.5 L22041.8 2009.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21734.5 1428.7 L21724.5 1424.7 L21733.0 1418.2 L21743.0 1422.2 Z"></path>
+						<path d="M22381.8 1482.8 L22371.2 1481.2 L22378.0 1472.8 L22388.6 1474.5 Z"></path>
 					</g>
-					<path d="M22228.6 1415.1 L24190.75 1607 L24190.75 2280.5 L24190.8 2280.5 " fill="none"></path>
+					<path d="M22845.8 1481.2 L23175.25 1607 L23175.25 2280.5 L23175.3 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22219.8 1408.9 L22228.6 1415.1 L22218.8 1419.5 L22210.0 1413.3 Z"></path>
+						<path d="M22839.0 1472.8 L22845.8 1481.2 L22835.2 1482.8 L22828.4 1474.5 Z"></path>
 					</g>
-					<path d="M43255.6 2487.8 L43100.5 2985 L39226.25 3170.043248607465 L39226.3 3170.0 " fill="none"></path>
+					<path d="M43489.4 2487.3 L43290.75 2985 L40770.25 3169.2701881615053 L40770.3 3169.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43263.5 2480.5 L43255.6 2487.8 L43253.3 2477.3 L43261.2 2470.0 Z"></path>
+						<path d="M43497.8 2480.6 L43489.4 2487.3 L43487.9 2476.7 L43496.3 2470.0 Z"></path>
 					</g>
-					<path d="M43293.1 2488.5 L43235.5 2985 L33194.25 3170.6495204342114 L33194.3 3170.6 " fill="none"></path>
+					<path d="M43500.4 2487.7 L43330.75 2985 L34603.75 3170.5221133021773 L34603.8 3170.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43299.5 2479.9 L43293.1 2488.5 L43288.9 2478.7 L43295.3 2470.0 Z"></path>
+						<path d="M43508.4 2480.6 L43500.4 2487.7 L43498.3 2477.1 L43506.4 2470.0 Z"></path>
 					</g>
-					<path d="M43304.3 2488.6 L43275.5 2985 L40109.25 3149.58940143544 L40109.3 3149.6 " fill="none"></path>
+					<path d="M43511.4 2488.0 L43370.75 2985 L39382.75 3153.672638621159 L39382.8 3153.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43310.2 2479.6 L43304.3 2488.6 L43299.5 2479.0 L43305.4 2470.0 Z"></path>
+						<path d="M43519.1 2480.4 L43511.4 2488.0 L43508.8 2477.5 L43516.5 2470.0 Z"></path>
 					</g>
-					<path d="M43358.7 2488.2 L43470.5 2985 L43470.5 3171.5 L43470.5 3171.5 L43470.5 3358 L43470.5 3358 L43470.5 3514.5 L43470.5 3514.5 L43470.5 3671 L43470.5 3671 L37334.5 3706.2187550525464 L37334.5 3706.2 " fill="none"></path>
+					<path d="M43565.8 2488.7 L43565.75 2985 L43565.75 3171.5 L43565.75 3171.5 L43565.75 3358 L43565.75 3358 L43565.75 3514.5 L43565.75 3514.5 L43565.75 3671 L43565.75 3671 L38873.25 3706.133132974797 L38873.3 3706.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43361.9 2477.9 L43358.7 2488.2 L43351.5 2480.3 L43354.6 2470.0 Z"></path>
+						<path d="M43571.1 2479.3 L43565.8 2488.7 L43560.4 2479.3 L43565.8 2470.0 Z"></path>
 					</g>
-					<path d="M43369.8 2488.0 L43510.5 2985 L43510.5 3171.5 L43510.5 3171.5 L43510.5 3358 L43510.5 3358 L39289.25 3509.458846793145 L39289.3 3509.5 " fill="none"></path>
+					<path d="M43620.1 2488.0 L43760.75 2985 L43760.75 3171.5 L43760.75 3171.5 L43760.75 3358 L43760.75 3358 L40068.75 3508.7626875407695 L40068.8 3508.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43372.4 2477.5 L43369.8 2488.0 L43362.2 2480.4 L43364.7 2470.0 Z"></path>
+						<path d="M43622.7 2477.5 L43620.1 2488.0 L43612.4 2480.4 L43615.0 2470.0 Z"></path>
 					</g>
-					<path d="M43380.9 2487.7 L43550.5 2985 L35023.25 3170.358795419447 L35023.3 3170.4 " fill="none"></path>
+					<path d="M43631.1 2487.7 L43800.75 2985 L39527.75 3169.2363888567797 L39527.8 3169.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43382.9 2477.1 L43380.9 2487.7 L43372.8 2480.6 L43374.8 2470.0 Z"></path>
+						<path d="M43633.2 2477.1 L43631.1 2487.7 L43623.1 2480.6 L43625.1 2470.0 Z"></path>
 					</g>
-					<path d="M43795.4 604.3 L45678.25 876 L45678.25 1025 L45678.25 1025 L45678.25 1174 L45678.25 1174 L45678.25 1390.5 L45678.25 1390.5 L45678.25 1607 L45678.25 1607 L43745.5 2170.607977991747 L43745.5 2170.6 " fill="none"></path>
-					<path d="M43796.2 599.0 L43795.4 604.3 L43794.7 609.6 L43782.3 602.4 Z"></path>
+					<path d="M44664.1 630.6 L45874.25 876 L45874.25 1025 L45874.25 1025 L45874.25 1174 L45874.25 1174 L45874.25 1390.5 L45874.25 1390.5 L45874.25 1607 L45874.25 1607 L43995.75 2167.66125189517 L43995.8 2167.7 " fill="none"></path>
+					<path d="M44665.1 625.3 L44664.1 630.6 L44663.0 635.8 L44651.0 627.9 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M43478.5 1070.6 L43315.5 1174 L43315.5 1390.5 L43315.5 1390.5 L43315.5 1607 L43315.5 1607 L43315.5 2122 L43315.5 2122.0 " fill="none"></path>
+						<path d="M43974.4 1059.1 L43565.75 1174 L43565.75 1390.5 L43565.75 1390.5 L43565.75 1607 L43565.75 1607 L43565.75 2122 L43565.8 2122.0 " fill="none"></path>
 					</g>
-					<path d="M43481.4 1075.1 L43478.5 1070.6 L43475.7 1066.1 L43489.8 1063.5 Z"></path>
+					<path d="M43975.9 1064.2 L43974.4 1059.1 L43973.0 1054.0 L43987.3 1055.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M28581.5 1053.8 L28581.5 1174 L28581.5 1390.5 L28581.5 1390.5 L28581.5 1607 L28581.5 1607 L42885.5 2275.8920863309354 L42885.5 2275.9 " fill="none"></path>
+						<path d="M29827.7 1048.9 L29672.75 1174 L29672.75 1390.5 L29672.75 1390.5 L29672.75 1607 L29672.75 1607 L43135.75 2274.6748722378175 L43135.8 2274.7 " fill="none"></path>
 					</g>
-					<path d="M28586.8 1053.8 L28581.5 1053.8 L28576.2 1053.8 L28581.5 1040.5 Z"></path>
-					<path d="M39687.8 3296.7 L39687.75 3358 L39289.25 3473.7054730983305 L39289.3 3473.7 " fill="none"></path>
+					<path d="M29831.0 1053.0 L29827.7 1048.9 L29824.3 1044.7 L29838.1 1040.5 Z"></path>
+					<path d="M38961.3 3296.7 L38961.25 3358 L39787.75 3491.761375387797 L39787.8 3491.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39693.1 3287.3 L39687.8 3296.7 L39682.4 3287.3 L39687.8 3278.0 Z"></path>
+						<path d="M38966.6 3287.3 L38961.3 3296.7 L38955.9 3287.3 L38961.3 3278.0 Z"></path>
 					</g>
-					<path d="M40127.9 3150.5 L43590.5 2985 L43384.94847605225 2470 L43384.9 2470.0 " fill="none"></path>
+					<path d="M39401.4 3154.7 L43840.75 2985 L43635.19847605225 2470 L43635.2 2470.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40118.3 3145.6 L40127.9 3150.5 L40118.8 3156.2 L40109.3 3151.4 Z"></path>
+						<path d="M39391.9 3149.7 L39401.4 3154.7 L39392.3 3160.4 L39382.8 3155.4 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M43622.5 1070.6 L43785.5 1174 L43785.5 1390.5 L43785.5 1390.5 L43785.5 1607 L43785.5 1607 L43785.5 2296 L43785.5 2296 L43785.5 2985 L43785.5 2985 L40109.25 3152.316362638033 L40109.3 3152.3 " fill="none"></path>
+						<path d="M44075.3 1075.9 L44035.75 1174 L44035.75 1390.5 L44035.75 1390.5 L44035.75 1607 L44035.75 1607 L44035.75 2296 L44035.75 2296 L44035.75 2985 L44035.75 2985 L39382.75 3156.0088678687557 L39382.8 3156.0 " fill="none"></path>
 					</g>
-					<path d="M43625.3 1066.1 L43622.5 1070.6 L43619.6 1075.1 L43611.2 1063.5 Z"></path>
+					<path d="M44080.2 1077.9 L44075.3 1075.9 L44070.3 1073.9 L44080.2 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M17444.3 1412.7 L17113 1607 L17113 2296 L17113 2296 L17113 2985 L17113 2985 L39266.25 3168.0178019690143 L39266.3 3168.0 " fill="none"></path>
+						<path d="M14572.1 1419.2 L14550.25 1607 L14550.25 2296 L14550.25 2296 L14550.25 2985 L14550.25 2985 L38539.75 3168.279740690672 L38539.8 3168.3 " fill="none"></path>
 					</g>
-					<path d="M17447.0 1417.3 L17444.3 1412.7 L17441.6 1408.1 L17455.8 1406.0 Z"></path>
+					<path d="M14577.4 1419.9 L14572.1 1419.2 L14566.9 1418.6 L14573.7 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M28668.5 1043.2 L29292.25 1174 L29292.25 1390.5 L29292.25 1390.5 L29292.25 1607 L29292.25 1607 L29292.25 2296 L29292.25 2296 L29292.25 2985 L29292.25 2985 L39266.25 3163.938098215574 L39266.3 3163.9 " fill="none"></path>
+						<path d="M29893.0 1047.6 L30092.5 1174 L30092.5 1390.5 L30092.5 1390.5 L30092.5 1607 L30092.5 1607 L30092.5 2296 L30092.5 2296 L30092.5 2985 L30092.5 2985 L38539.75 3162.6363213530653 L38539.8 3162.6 " fill="none"></path>
 					</g>
-					<path d="M28669.6 1038.0 L28668.5 1043.2 L28667.4 1048.5 L28655.4 1040.5 Z"></path>
-					<path d="M24488.4 1477.6 L24456.75 1607 L24456.75 2296 L24456.75 2296 L24456.75 2985 L24456.75 2985 L13286.5 3169.020636883599 L13286.5 3169.0 " fill="none"></path>
+					<path d="M29895.8 1043.1 L29893.0 1047.6 L29890.1 1052.1 L29881.7 1040.5 Z"></path>
+					<path d="M23404.8 1476.4 L23343.25 1607 L23343.25 2296 L23343.25 2296 L23343.25 2985 L23343.25 2985 L12794.5 3168.8766151833074 L12794.5 3168.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24495.8 1469.8 L24488.4 1477.6 L24485.5 1467.3 L24492.9 1459.5 Z"></path>
+						<path d="M23413.6 1470.2 L23404.8 1476.4 L23403.9 1465.7 L23412.7 1459.5 Z"></path>
 					</g>
-					<path d="M24565.5 1475.1 L24652.5 1607 L12319 2293.0518709885764 L12319.0 2293.1 " fill="none"></path>
+					<path d="M23499.0 1475.3 L23582.5 1607 L11565.25 2292.974627700338 L11565.3 2293.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24564.8 1464.4 L24565.5 1475.1 L24555.9 1470.2 L24555.2 1459.5 Z"></path>
+						<path d="M23498.5 1464.5 L23499.0 1475.3 L23489.5 1470.2 L23489.0 1459.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M31206.7 1057.6 L31506.25 1174 L31506.25 1329 L31506.3 1329.0 " fill="none"></path>
+						<path d="M9078.3 1037.2 L8131.25 1174 L8131.25 1329 L8131.3 1329.0 " fill="none"></path>
 					</g>
-					<path d="M31208.6 1052.6 L31206.7 1057.6 L31204.7 1062.6 L31194.3 1052.8 Z"></path>
-					<path d="M13304.4 3121.6 L13316.5 3118 L13324 3118 L13324 3118 L13331.5 3171.5 L13331.5 3171.5 L13324 3225 L13324 3225 L13316.5 3225 L13316.5 3225 L13286.5 3216.1080332409974 L13286.5 3216.1 " fill="none"></path>
+					<path d="M9079.1 1042.5 L9078.3 1037.2 L9077.5 1032.0 L9091.5 1035.3 Z"></path>
+					<path d="M12812.4 3121.6 L12824.5 3118 L12832 3118 L12832 3118 L12839.5 3171.5 L12839.5 3171.5 L12832 3225 L12832 3225 L12824.5 3225 L12824.5 3225 L12794.5 3216.1080332409974 L12794.5 3216.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13293.9 3119.1 L13304.4 3121.6 L13297.0 3129.4 L13286.5 3126.9 Z"></path>
+						<path d="M12801.9 3119.1 L12812.4 3121.6 L12805.0 3129.4 L12794.5 3126.9 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3715.7 2324.2 L3918.5 2985 L12985.5 3168.4548955790615 L12985.5 3168.5 " fill="none"></path>
+						<path d="M3011.0 2324.8 L3011 2985 L12493.5 3168.5862400083047 L12493.5 3168.6 " fill="none"></path>
 					</g>
-					<path d="M3720.8 2322.7 L3715.7 2324.2 L3710.6 2325.8 L3711.8 2311.5 Z"></path>
+					<path d="M3016.3 2324.8 L3011.0 2324.8 L3005.7 2324.8 L3011.0 2311.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M35461.7 546.7 L31122.75 876 L31122.75 994 L31122.8 994.0 " fill="none"></path>
+						<path d="M27289.2 541.3 L9163 876 L9163 994 L9163.0 994.0 " fill="none"></path>
 					</g>
-					<path d="M35462.1 552.0 L35461.7 546.7 L35461.3 541.4 L35475.0 545.7 Z"></path>
-					<path d="M45144.7 2555.6 L45036.25 2985 L39226.25 3170.5260679736325 L39226.3 3170.5 " fill="none"></path>
+					<path d="M27289.3 546.6 L27289.2 541.3 L27289.1 535.9 L27302.5 541.0 Z"></path>
+					<path d="M45333.2 2555.5 L45212.25 2985 L40770.25 3170.22817216322 L40770.3 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45152.1 2547.9 L45144.7 2555.6 L45141.8 2545.2 L45149.3 2537.5 Z"></path>
+						<path d="M45340.9 2547.9 L45333.2 2555.5 L45330.6 2545.0 L45338.3 2537.5 Z"></path>
 					</g>
-					<path d="M45268.3 2555.7 L45364.25 2985 L27529.75 3170.9110306858197 L27529.8 3170.9 " fill="none"></path>
+					<path d="M45406.3 2556.2 L45406.25 2985 L33047 3170.651299760385 L33047.0 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45271.5 2545.4 L45268.3 2555.7 L45261.1 2547.8 L45264.2 2537.5 Z"></path>
+						<path d="M45411.6 2546.8 L45406.3 2556.2 L45400.9 2546.8 L45406.3 2537.5 Z"></path>
 					</g>
-					<path d="M45283.3 2555.5 L45404.25 2985 L35023.25 3170.561556524656 L35023.3 3170.6 " fill="none"></path>
+					<path d="M45479.3 2555.5 L45600.25 2985 L39527.75 3169.9014285714284 L39527.8 3169.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45285.9 2545.0 L45283.3 2555.5 L45275.6 2547.9 L45278.2 2537.5 Z"></path>
+						<path d="M45481.9 2545.0 L45479.3 2555.5 L45471.6 2547.9 L45474.2 2537.5 Z"></path>
 					</g>
-					<path d="M43795.5 603.2 L45718.25 876 L45718.25 1025 L45718.25 1025 L45718.25 1174 L45718.25 1174 L45718.25 1390.5 L45718.25 1390.5 L45718.25 1607 L45718.25 1607 L45388.308055152396 2054.5 L45388.3 2054.5 " fill="none"></path>
-					<path d="M43796.2 597.9 L43795.5 603.2 L43794.7 608.5 L43782.3 601.4 Z"></path>
-					<path d="M16833.5 2340.0 L16973 2985 L12504.5 3166.9596615720525 L12504.5 3167.0 " fill="none"></path>
-					<path d="M16838.7 2338.9 L16833.5 2340.0 L16828.3 2341.2 L16830.7 2327.0 Z"></path>
-					<path d="M31922.3 1493.2 L31922.25 1607 L32424.227503628448 2182 L32424.2 2182.0 " fill="none"></path>
+					<path d="M44664.1 628.4 L45914.25 876 L45914.25 1025 L45914.25 1025 L45914.25 1174 L45914.25 1174 L45914.25 1390.5 L45914.25 1390.5 L45914.25 1607 L45914.25 1607 L45584.308055152396 2054.5 L45584.3 2054.5 " fill="none"></path>
+					<path d="M44665.1 623.2 L44664.1 628.4 L44663.0 633.7 L44651.0 625.8 Z"></path>
+					<path d="M22904.0 2340.3 L22944.25 2985 L15490.5 3168.75128052609 L15490.5 3168.8 " fill="none"></path>
+					<path d="M22909.3 2340.0 L22904.0 2340.3 L22898.7 2340.6 L22903.2 2327.0 Z"></path>
+					<path d="M10273.5 1493.2 L10273.5 1607 L10630.475689404935 2182 L10630.5 2182.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31927.6 1483.8 L31922.3 1493.2 L31916.9 1483.8 L31922.3 1474.5 Z"></path>
+						<path d="M10278.8 1483.8 L10273.5 1493.2 L10268.2 1483.8 L10273.5 1474.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M31207.4 1040.8 L31922.25 1174 L31922.25 1306.5 L31922.3 1306.5 " fill="none"></path>
+						<path d="M9247.7 1036.4 L10273.5 1174 L10273.5 1306.5 L10273.5 1306.5 " fill="none"></path>
 					</g>
-					<path d="M31208.3 1035.5 L31207.4 1040.8 L31206.4 1046.0 L31194.3 1038.3 Z"></path>
+					<path d="M9248.4 1031.1 L9247.7 1036.4 L9247.0 1041.7 L9234.5 1034.6 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M31207.5 1032.3 L32843.25 1174 L32843.25 1390.5 L32843.25 1390.5 L32843.25 1607 L32843.25 1607 L32576.613570391874 2182 L32576.6 2182.0 " fill="none"></path>
+						<path d="M9247.8 1034.3 L10520.5 1174 L10520.5 1390.5 L10520.5 1390.5 L10520.5 1607 L10520.5 1607 L10671.343613933237 2182 L10671.3 2182.0 " fill="none"></path>
 					</g>
-					<path d="M31208.0 1027.0 L31207.5 1032.3 L31207.1 1037.7 L31194.3 1031.2 Z"></path>
+					<path d="M9248.3 1029.0 L9247.8 1034.3 L9247.2 1039.6 L9234.5 1032.8 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3717.4 2324.0 L3962.5 2985 L2436 3150.51875 L2436.0 3150.5 " fill="none"></path>
+						<path d="M3045.8 2318.8 L4064 2985 L1932 3155.9817243603525 L1932.0 3156.0 " fill="none"></path>
 					</g>
-					<path d="M3722.4 2322.1 L3717.4 2324.0 L3712.4 2325.9 L3712.7 2311.5 Z"></path>
+					<path d="M3048.8 2314.3 L3045.8 2318.8 L3042.9 2323.3 L3034.7 2311.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M31207.6 1029.0 L34310.25 1174 L34310.25 1329 L34310.3 1329.0 " fill="none"></path>
+						<path d="M9247.8 1031.3 L11174.5 1174 L11174.5 1329 L11174.5 1329.0 " fill="none"></path>
 					</g>
-					<path d="M31207.8 1023.6 L31207.6 1029.0 L31207.3 1034.3 L31194.3 1028.3 Z"></path>
-					<path d="M25294.3 1440.2 L25294.25 1607 L31613.75 2260.0386951631044 L31613.8 2260.0 " fill="none"></path>
+					<path d="M9248.2 1026.0 L9247.8 1031.3 L9247.4 1036.6 L9234.5 1030.3 Z"></path>
+					<path d="M24823.8 1440.2 L24823.75 1607 L32925.25 2267.6229362684185 L32925.3 2267.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25299.6 1430.8 L25294.3 1440.2 L25288.9 1430.8 L25294.3 1421.5 Z"></path>
+						<path d="M24829.1 1430.8 L24823.8 1440.2 L24818.4 1430.8 L24823.8 1421.5 Z"></path>
 					</g>
-					<path d="M10898.3 1455.7 L10898.25 1607 L10898.25 2280.5 L10898.3 2280.5 " fill="none"></path>
+					<path d="M14281.5 1455.7 L14281.5 1607 L14281.5 2280.5 L14281.5 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10903.6 1446.3 L10898.3 1455.7 L10892.9 1446.3 L10898.3 1437.0 Z"></path>
+						<path d="M14286.8 1446.3 L14281.5 1455.7 L14276.2 1446.3 L14281.5 1437.0 Z"></path>
 					</g>
-					<path d="M14597.4 1028.5 L10898.25 1174 L10898.25 1344 L10898.3 1344.0 " fill="none"></path>
-					<path d="M14597.6 1033.8 L14597.4 1028.5 L14597.2 1023.2 L14610.8 1028.0 Z"></path>
-					<path d="M40193.3 1508.2 L40193.25 1607 L36776.25 2260.7942238267146 L36776.3 2260.8 " fill="none"></path>
+					<path d="M17769.7 1028.7 L14281.5 1174 L14281.5 1344 L14281.5 1344.0 " fill="none"></path>
+					<path d="M17769.9 1034.0 L17769.7 1028.7 L17769.5 1023.4 L17783.0 1028.2 Z"></path>
+					<path d="M35920.5 1508.2 L35920.5 1607 L25587.5 2283.945611866502 L25587.5 2283.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40198.6 1498.8 L40193.3 1508.2 L40187.9 1498.8 L40193.3 1489.5 Z"></path>
+						<path d="M35925.8 1498.8 L35920.5 1508.2 L35915.2 1498.8 L35920.5 1489.5 Z"></path>
 					</g>
-					<path d="M38909.3 1041.7 L40193.25 1174 L40193.25 1291.5 L40193.3 1291.5 " fill="none"></path>
-					<path d="M38909.8 1036.4 L38909.3 1041.7 L38908.7 1047.0 L38896.0 1040.4 Z"></path>
-					<path d="M31847.9 2524.2 L31618 2985 L39165.25 3170.749348421365 L39165.3 3170.7 " fill="none"></path>
+					<path d="M35856.7 1117.8 L35920.5 1174 L35920.5 1291.5 L35920.5 1291.5 " fill="none"></path>
+					<path d="M35860.2 1113.8 L35856.7 1117.8 L35853.1 1121.8 L35846.7 1109.0 Z"></path>
+					<path d="M33090.7 2522.0 L32716.75 2985 L40709.25 3170.7910071045744 L40709.3 3170.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31856.8 2518.2 L31847.9 2524.2 L31847.3 2513.5 L31856.2 2507.5 Z"></path>
+						<path d="M33100.7 2518.1 L33090.7 2522.0 L33092.4 2511.4 L33102.4 2507.5 Z"></path>
 					</g>
-					<path d="M32327.2 2435.7 L33764.25 2985 L27529.75 3169.825027817517 L27529.8 3169.8 " fill="none"></path>
+					<path d="M33273.3 2526.2 L33273.25 2985 L33013.99932975871 3156 L33014.0 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32320.4 2427.4 L32327.2 2435.7 L32316.6 2437.3 L32309.8 2429.0 Z"></path>
+						<path d="M33278.6 2516.8 L33273.3 2526.2 L33267.9 2516.8 L33273.3 2507.5 Z"></path>
 					</g>
-					<path d="M32327.2 2432.7 L33804.25 2985 L34918.25 3163.1063009001286 L34918.3 3163.1 " fill="none"></path>
+					<path d="M33364.3 2524.8 L33547.25 2985 L39422.75 3169.8483046558704 L39422.8 3169.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32320.4 2424.4 L32327.2 2432.7 L32316.6 2434.4 L32309.8 2426.1 Z"></path>
+						<path d="M33365.8 2514.2 L33364.3 2524.8 L33355.9 2518.1 L33357.4 2507.5 Z"></path>
 					</g>
-					<path d="M42616.9 1434.3 L42664.75 1607 L32309.75 2273.597682892647 L32309.8 2273.6 " fill="none"></path>
-					<path d="M42622.0 1432.9 L42616.9 1434.3 L42611.8 1435.8 L42613.3 1421.5 Z"></path>
-					<path d="M38461.8 1525.7 L38308.25 1607 L32309.75 2258.2198061923896 L32309.8 2258.2 " fill="none"></path>
-					<path d="M38464.3 1530.5 L38461.8 1525.7 L38459.3 1521.0 L38473.6 1519.5 Z"></path>
-					<path d="M26848.7 1552.5 L26805.5 1607 L31613.75 2249.4987636363635 L31613.8 2249.5 " fill="none"></path>
-					<path d="M26852.9 1555.8 L26848.7 1552.5 L26844.5 1549.1 L26857.0 1542.0 Z"></path>
+					<path d="M42838.0 1434.4 L42885 1607 L33621.25 2271.054282518792 L33621.3 2271.1 " fill="none"></path>
+					<path d="M42843.1 1433.0 L42838.0 1434.4 L42832.8 1435.8 L42834.4 1421.5 Z"></path>
+					<path d="M39575.9 1532.3 L39555.25 1607 L33621.25 2257.831900668577 L33621.3 2257.8 " fill="none"></path>
+					<path d="M39581.1 1533.8 L39575.9 1532.3 L39570.8 1530.9 L39579.5 1519.5 Z"></path>
+					<path d="M42210.4 1554.0 L42185 1607 L33621.25 2269.0948466911664 L33621.3 2269.1 " fill="none"></path>
+					<path d="M42215.2 1556.3 L42210.4 1554.0 L42205.6 1551.7 L42216.1 1542.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M43633.3 1069.9 L43825.5 1174 L43825.5 1390.5 L43825.5 1390.5 L43825.5 1607 L43825.5 1607 L32309.75 2275.7895269202404 L32309.8 2275.8 " fill="none"></path>
+						<path d="M44088.8 1076.7 L44075.75 1174 L44075.75 1390.5 L44075.75 1390.5 L44075.75 1607 L44075.75 1607 L33621.25 2273.8040268456375 L33621.3 2273.8 " fill="none"></path>
 					</g>
-					<path d="M43635.8 1065.2 L43633.3 1069.9 L43630.7 1074.5 L43621.6 1063.5 Z"></path>
+					<path d="M44094.1 1077.4 L44088.8 1076.7 L44083.5 1076.0 L44090.6 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M17474.1 1418.8 L17420 1607 L31613.75 2279.5114755789364 L31613.8 2279.5 " fill="none"></path>
+						<path d="M14577.5 1419.3 L14590.25 1607 L32925.25 2283.1663009152708 L32925.3 2283.2 " fill="none"></path>
 					</g>
-					<path d="M17479.2 1420.3 L17474.1 1418.8 L17469.0 1417.3 L17477.8 1406.0 Z"></path>
+					<path d="M14582.8 1418.9 L14577.5 1419.3 L14572.1 1419.7 L14576.6 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M28672.7 1043.1 L29332.25 1174 L29332.25 1390.5 L29332.25 1390.5 L29332.25 1607 L29332.25 1607 L31613.75 2204.814603536794 L31613.8 2204.8 " fill="none"></path>
+						<path d="M29897.6 1046.8 L30132.5 1174 L30132.5 1390.5 L30132.5 1390.5 L30132.5 1607 L30132.5 1607 L32925.25 2219.657725065669 L32925.3 2219.7 " fill="none"></path>
 					</g>
-					<path d="M28673.7 1037.9 L28672.7 1043.1 L28671.6 1048.3 L28659.6 1040.5 Z"></path>
-					<path d="M16836.0 2339.9 L17013 2985 L13686.5 3163.1968260807125 L13686.5 3163.2 " fill="none"></path>
-					<path d="M16841.2 2338.4 L16836.0 2339.9 L16830.9 2341.3 L16832.5 2327.0 Z"></path>
-					<path d="M39536.3 2492.9 L39195.75 2985 L39195.75 3156 L39195.8 3156.0 " fill="none"></path>
+					<path d="M29900.1 1042.2 L29897.6 1046.8 L29895.1 1051.5 L29885.9 1040.5 Z"></path>
+					<path d="M22914.0 2339.8 L23102.25 2985 L15840.5 3167.6024033437825 L15840.5 3167.6 " fill="none"></path>
+					<path d="M22919.1 2338.3 L22914.0 2339.8 L22908.9 2341.3 L22910.3 2327.0 Z"></path>
+					<path d="M40131.1 2494.5 L39908.25 2985 L40709.25 3164.6590499098015 L40709.3 3164.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39546.0 2488.2 L39536.3 2492.9 L39537.2 2482.1 L39546.9 2477.5 Z"></path>
+						<path d="M40139.8 2488.2 L40131.1 2494.5 L40130.1 2483.8 L40138.8 2477.5 Z"></path>
 					</g>
-					<path d="M39672.5 2496.2 L39672.5 2985 L33194.25 3170.185059585393 L33194.3 3170.2 " fill="none"></path>
+					<path d="M40142.5 2494.9 L39948.25 2985 L34603.75 3169.9084964289027 L34603.8 3169.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39677.8 2486.8 L39672.5 2496.2 L39667.2 2486.8 L39672.5 2477.5 Z"></path>
+						<path d="M40150.9 2488.1 L40142.5 2494.9 L40140.9 2484.2 L40149.3 2477.5 Z"></path>
 					</g>
-					<path d="M39808.7 2492.9 L40149.25 2985 L40149.25 3171.5 L40149.25 3171.5 L40149.25 3358 L40149.25 3358 L40149.25 3514.5 L40149.25 3514.5 L40149.25 3671 L40149.25 3671 L37334.5 3705.892579659537 L37334.5 3705.9 " fill="none"></path>
+					<path d="M40221.3 2496.2 L40221.25 2985 L40221.25 3171.5 L40221.25 3171.5 L40221.25 3358 L40221.25 3358 L40221.25 3514.5 L40221.25 3514.5 L40221.25 3671 L40221.25 3671 L38873.25 3705.2548317823907 L38873.3 3705.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39807.8 2482.1 L39808.7 2492.9 L39799.0 2488.2 L39798.1 2477.5 Z"></path>
+						<path d="M40226.6 2486.8 L40221.3 2496.2 L40215.9 2486.8 L40221.3 2477.5 Z"></path>
 					</g>
-					<path d="M39819.8 2492.4 L40189.25 2985 L40189.25 3171.5 L40189.25 3171.5 L40189.25 3358 L40189.25 3358 L39289.25 3493.367611725132 L39289.3 3493.4 " fill="none"></path>
+					<path d="M40346.8 2493.2 L40659.75 2985 L40659.75 3171.5 L40659.75 3171.5 L40659.75 3358 L40659.75 3358 L40068.75 3484.440874914559 L40068.8 3484.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39818.5 2481.8 L39819.8 2492.4 L39810.0 2488.2 L39808.6 2477.5 Z"></path>
+						<path d="M40346.3 2482.5 L40346.8 2493.2 L40337.3 2488.2 L40336.8 2477.5 Z"></path>
 					</g>
-					<path d="M39830.9 2492.0 L40229.25 2985 L35023.25 3169.638014642959 L35023.3 3169.6 " fill="none"></path>
+					<path d="M40357.9 2492.8 L40699.75 2985 L39527.75 3163.5038791343404 L39527.8 3163.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39829.2 2481.4 L39830.9 2492.0 L39820.9 2488.1 L39819.2 2477.5 Z"></path>
+						<path d="M40357.0 2482.1 L40357.9 2492.8 L40348.2 2488.2 L40347.3 2477.5 Z"></path>
 					</g>
-					<path d="M43795.5 602.2 L45758.25 876 L45758.25 1025 L45758.25 1025 L45758.25 1174 L45758.25 1174 L45758.25 1390.5 L45758.25 1390.5 L45758.25 1607 L45758.25 1607 L40218.5 2234.1844472743705 L40218.5 2234.2 " fill="none"></path>
-					<path d="M43796.2 596.9 L43795.5 602.2 L43794.7 607.5 L43782.3 600.3 Z"></path>
+					<path d="M44664.1 626.4 L45954.25 876 L45954.25 1025 L45954.25 1025 L45954.25 1174 L45954.25 1174 L45954.25 1390.5 L45954.25 1390.5 L45954.25 1607 L45954.25 1607 L40767.25 2230.3809523809523 L40767.3 2230.4 " fill="none"></path>
+					<path d="M44665.1 621.2 L44664.1 626.4 L44663.1 631.6 L44651.0 623.9 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M43643.9 1069.2 L43865.5 1174 L43865.5 1390.5 L43865.5 1390.5 L43865.5 1607 L43865.5 1607 L40218.5 2206.280467445743 L40218.5 2206.3 " fill="none"></path>
+						<path d="M44102.7 1076.7 L44115.75 1174 L44115.75 1390.5 L44115.75 1390.5 L44115.75 1607 L44115.75 1607 L40767.25 2199.403774553858 L40767.3 2199.4 " fill="none"></path>
 					</g>
-					<path d="M43646.2 1064.4 L43643.9 1069.2 L43641.7 1074.0 L43631.9 1063.5 Z"></path>
+					<path d="M44108.0 1076.0 L44102.7 1076.7 L44097.4 1077.4 L44100.9 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M17485.8 1419.2 L17509 1607 L39126.5 2279.0264173077358 L39126.5 2279.0 " fill="none"></path>
+						<path d="M14585.8 1418.5 L14655.5 1607 L39675.25 2281.28523512903 L39675.3 2281.3 " fill="none"></path>
 					</g>
-					<path d="M17491.1 1418.6 L17485.8 1419.2 L17480.5 1419.9 L17484.2 1406.0 Z"></path>
+					<path d="M14590.9 1416.7 L14585.8 1418.5 L14580.8 1420.4 L14581.2 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M28676.9 1043.0 L29372.25 1174 L29372.25 1390.5 L29372.25 1390.5 L29372.25 1607 L29372.25 1607 L39126.5 2259.4771971554087 L39126.5 2259.5 " fill="none"></path>
+						<path d="M29902.1 1046.2 L30172.5 1174 L30172.5 1390.5 L30172.5 1390.5 L30172.5 1607 L30172.5 1607 L39675.25 2258.5631048637892 L39675.3 2258.6 " fill="none"></path>
 					</g>
-					<path d="M28677.8 1037.7 L28676.9 1043.0 L28675.9 1048.2 L28663.8 1040.5 Z"></path>
-					<path d="M11301.4 1468.6 L11231.25 1607 L11231.25 2280.5 L11231.3 2280.5 " fill="none"></path>
+					<path d="M29904.4 1041.4 L29902.1 1046.2 L29899.8 1051.0 L29890.0 1040.5 Z"></path>
+					<path d="M14865.0 1469.6 L14815.5 1607 L16625.83671988389 2280.5 L16625.8 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11310.4 1462.7 L11301.4 1468.6 L11300.8 1457.9 L11309.8 1452.0 Z"></path>
+						<path d="M14873.2 1462.6 L14865.0 1469.6 L14863.2 1459.0 L14871.3 1452.0 Z"></path>
 					</g>
-					<path d="M11405.7 1466.2 L11526 1607 L11526 2280.5 L11526.0 2280.5 " fill="none"></path>
+					<path d="M14963.1 1465.7 L15093.75 1607 L16935.12246008708 2280.5 L16935.1 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11403.7 1455.6 L11405.7 1466.2 L11395.6 1462.6 L11393.6 1452.0 Z"></path>
+						<path d="M14960.6 1455.2 L14963.1 1465.7 L14952.8 1462.5 L14950.4 1452.0 Z"></path>
 					</g>
-					<path d="M14597.4 1029.0 L11341 1174 L11341 1329 L11341.0 1329.0 " fill="none"></path>
-					<path d="M14597.7 1034.3 L14597.4 1029.0 L14597.2 1023.6 L14610.8 1028.4 Z"></path>
-					<path d="M34603.3 2435.9 L33844.25 2985 L27529.75 3169.8460602731125 L27529.8 3169.8 " fill="none"></path>
+					<path d="M17769.7 1029.5 L14893.5 1174 L14893.5 1329 L14893.5 1329.0 " fill="none"></path>
+					<path d="M17770.0 1034.8 L17769.7 1029.5 L17769.4 1024.2 L17783.0 1028.8 Z"></path>
+					<path d="M34395.2 2442.5 L34195.25 2985 L33047 3162.7535795808258 L33047.0 3162.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34614.0 2434.8 L34603.3 2435.9 L34607.7 2426.1 L34618.4 2425.0 Z"></path>
+						<path d="M34403.5 2435.6 L34395.2 2442.5 L34393.5 2431.9 L34401.7 2425.0 Z"></path>
 					</g>
-					<path d="M34833.9 2443.1 L34970.75 2985 L34970.75 3156 L34970.8 3156.0 " fill="none"></path>
+					<path d="M34609.0 2437.4 L35227.75 2985 L39422.75 3169.1948204826367 L39422.8 3169.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34836.8 2432.7 L34833.9 2443.1 L34826.4 2435.4 L34829.3 2425.0 Z"></path>
+						<path d="M34605.5 2427.2 L34609.0 2437.4 L34598.5 2435.2 L34595.0 2425.0 Z"></path>
 					</g>
-					<path d="M42624.7 1433.6 L42704.75 1607 L35144.75 2265.679817905918 L35144.8 2265.7 " fill="none"></path>
-					<path d="M42629.5 1431.4 L42624.7 1433.6 L42619.8 1435.8 L42619.1 1421.5 Z"></path>
-					<path d="M16838.5 2339.7 L17053 2985 L14175.5 3158.0024983881367 L14175.5 3158.0 " fill="none"></path>
-					<path d="M16843.6 2338.0 L16838.5 2339.7 L16833.4 2341.3 L16834.3 2327.0 Z"></path>
-					<path d="M26306.8 2383.7 L26306.75 2985 L26329.16286863271 3005 L26329.2 3005.0 " fill="none"></path>
+					<path d="M42845.7 1433.6 L42925 1607 L34797.25 2267.710822051146 L34797.3 2267.7 " fill="none"></path>
+					<path d="M42850.6 1431.4 L42845.7 1433.6 L42840.9 1435.8 L42840.2 1421.5 Z"></path>
+					<path d="M22916.5 2339.6 L23142.25 2985 L16329.5 3165.5503392660485 L16329.5 3165.6 " fill="none"></path>
+					<path d="M22921.5 2337.8 L22916.5 2339.6 L22911.5 2341.3 L22912.1 2327.0 Z"></path>
+					<path d="M42001.3 2383.7 L42001.25 2985 L32200.5 3166.301844917797 L32200.5 3166.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26312.1 2374.3 L26306.8 2383.7 L26301.4 2374.3 L26306.8 2365.0 Z"></path>
+						<path d="M42006.6 2374.3 L42001.3 2383.7 L41995.9 2374.3 L42001.3 2365.0 Z"></path>
 					</g>
-					<path d="M6517.6 541.3 L26306.75 876 L26306.75 1025 L26306.75 1025 L26306.75 1174 L26306.75 1174 L26306.75 1390.5 L26306.75 1390.5 L26306.75 1607 L26306.75 1607 L26306.75 2227 L26306.8 2227.0 " fill="none"></path>
-					<path d="M6517.7 536.0 L6517.6 541.3 L6517.5 546.7 L6504.3 541.1 Z"></path>
-					<path d="M35463.2 589.0 L34922.25 876 L34922.25 941 L34922.3 941.0 " fill="none"></path>
-					<path d="M35465.7 593.7 L35463.2 589.0 L35460.7 584.3 L35475.0 582.7 Z"></path>
-					<path d="M27455.0 1440.2 L27455 1607 L34448.75 2263.341301460823 L34448.8 2263.3 " fill="none"></path>
+					<path d="M39477.2 553.5 L42001.25 876 L42001.25 1025 L42001.25 1025 L42001.25 1174 L42001.25 1174 L42001.25 1390.5 L42001.25 1390.5 L42001.25 1607 L42001.25 1607 L42001.25 2227 L42001.3 2227.0 " fill="none"></path>
+					<path d="M39477.9 548.2 L39477.2 553.5 L39476.5 558.7 L39464.0 551.8 Z"></path>
+					<path d="M27303.7 593.4 L26882.75 876 L26882.75 941 L26882.8 941.0 " fill="none"></path>
+					<path d="M27306.6 597.9 L27303.7 593.4 L27300.7 589.0 L27314.7 586.0 Z"></path>
+					<path d="M25904.3 1440.2 L25904.25 1607 L34101.25 2267.940081919251 L34101.3 2267.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27460.3 1430.8 L27455.0 1440.2 L27449.7 1430.8 L27455.0 1421.5 Z"></path>
+						<path d="M25909.6 1430.8 L25904.3 1440.2 L25898.9 1430.8 L25904.3 1421.5 Z"></path>
 					</g>
-					<path d="M34620.8 1482.2 L34343.75 1607 L13413 2294.128765589451 L13413.0 2294.1 " fill="none"></path>
+					<path d="M11492.2 1482.4 L11226.25 1607 L9916.395137880987 2280.5 L9916.4 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34631.5 1483.2 L34620.8 1482.2 L34627.1 1473.5 L34637.8 1474.5 Z"></path>
+						<path d="M11503.0 1483.3 L11492.2 1482.4 L11498.4 1473.6 L11509.2 1474.5 Z"></path>
 					</g>
-					<path d="M34877.0 1491.0 L34937.75 1607 L36426.55986937591 2227 L36426.6 2227.0 " fill="none"></path>
+					<path d="M11772.9 1488.7 L11874.75 1607 L25219.5 2286.6291416427975 L25219.5 2286.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34877.3 1480.3 L34877.0 1491.0 L34867.9 1485.2 L34868.3 1474.5 Z"></path>
+						<path d="M11770.9 1478.1 L11772.9 1488.7 L11762.8 1485.1 L11760.8 1474.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M31207.6 1028.4 L34824.25 1174 L34824.25 1306.5 L34824.3 1306.5 " fill="none"></path>
+						<path d="M9247.8 1030.0 L11688.5 1174 L11688.5 1306.5 L11688.5 1306.5 " fill="none"></path>
 					</g>
-					<path d="M31207.8 1023.1 L31207.6 1028.4 L31207.4 1033.7 L31194.3 1027.9 Z"></path>
-					<path d="M26515.8 3356.7 L26515.75 3358 L26515.75 3514.5 L26515.75 3514.5 L26515.75 3671 L26515.75 3671 L37236.5 3706.338482787437 L37236.5 3706.3 " fill="none"></path>
+					<path d="M9248.1 1024.7 L9247.8 1030.0 L9247.5 1035.3 L9234.5 1029.2 Z"></path>
+					<path d="M31919.5 3356.7 L31919.5 3358 L31919.5 3514.5 L31919.5 3514.5 L31919.5 3671 L31919.5 3671 L38775.25 3706.2480719794344 L38775.3 3706.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26521.1 3347.3 L26515.8 3356.7 L26510.4 3347.3 L26515.8 3338.0 Z"></path>
+						<path d="M31924.8 3347.3 L31919.5 3356.7 L31914.2 3347.3 L31919.5 3338.0 Z"></path>
 					</g>
-					<path d="M22997.8 2550.9 L22114.75 2985 L26234.75 3159.5921381504204 L26234.8 3159.6 " fill="none"></path>
-					<path d="M23000.1 2555.7 L22997.8 2550.9 L22995.4 2546.1 L23009.8 2545.0 Z"></path>
+					<path d="M25614.7 2452.2 L23843.5 2985 L31638.5 3165.0108345715703 L31638.5 3165.0 " fill="none"></path>
+					<path d="M25616.3 2457.3 L25614.7 2452.2 L25613.2 2447.1 L25627.5 2448.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M26891.5 2340.3 L26891.5 2985 L26796.75 3032.028276779774 L26796.8 3032.0 " fill="none"></path>
+						<path d="M29416.0 2340.3 L29416 2985 L31638.5 3150.566706610745 L31638.5 3150.6 " fill="none"></path>
 					</g>
-					<path d="M26896.8 2340.3 L26891.5 2340.3 L26886.2 2340.3 L26891.5 2327.0 Z"></path>
-					<path d="M40551.7 2560.5 L40269.25 2985 L39226.25 3166.201210992082 L39226.3 3166.2 " fill="none"></path>
+					<path d="M29421.3 2340.3 L29416.0 2340.3 L29410.7 2340.3 L29416.0 2327.0 Z"></path>
+					<path d="M41059.6 2559.9 L40739.75 2985 L40739.75 3156 L40739.8 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40561.3 2555.7 L40551.7 2560.5 L40552.4 2549.8 L40562.1 2545.0 Z"></path>
+						<path d="M41069.5 2555.7 L41059.6 2559.9 L41061.0 2549.3 L41070.9 2545.0 Z"></path>
 					</g>
-					<path d="M40681.0 2563.4 L40607.25 2985 L33194.25 3170.349845823837 L33194.3 3170.3 " fill="none"></path>
+					<path d="M41074.7 2560.3 L40779.75 2985 L34603.75 3170.121182899389 L34603.8 3170.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40687.8 2555.1 L40681.0 2563.4 L40677.3 2553.3 L40684.2 2545.0 Z"></path>
+						<path d="M41084.4 2555.7 L41074.7 2560.3 L41075.6 2549.6 L41085.3 2545.0 Z"></path>
 					</g>
-					<path d="M40696.5 2563.5 L40647.25 2985 L34034.25 3160.862612291459 L34034.3 3160.9 " fill="none"></path>
+					<path d="M41089.8 2560.7 L40819.75 2985 L35443.75 3158.584487534626 L35443.8 3158.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40702.9 2554.9 L40696.5 2563.5 L40692.3 2553.7 L40698.7 2545.0 Z"></path>
+						<path d="M41099.3 2555.7 L41089.8 2560.7 L41090.3 2550.0 L41099.8 2545.0 Z"></path>
 					</g>
-					<path d="M40712.0 2563.6 L40687.25 2985 L27529.75 3170.7025692447405 L27529.8 3170.7 " fill="none"></path>
+					<path d="M41104.9 2561.2 L40859.75 2985 L33047 3170.1609587953108 L33047.0 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40717.9 2554.6 L40712.0 2563.6 L40707.2 2554.0 L40713.1 2545.0 Z"></path>
+						<path d="M41114.2 2555.7 L41104.9 2561.2 L41104.9 2550.4 L41114.2 2545.0 Z"></path>
 					</g>
-					<path d="M40873.3 2561.4 L41105.75 2985 L41105.75 3171.5 L41105.75 3171.5 L41105.75 3358 L41105.75 3358 L41105.75 3514.5 L41105.75 3514.5 L41105.75 3671 L41105.75 3671 L37334.5 3706.0446633073752 L37334.5 3706.0 " fill="none"></path>
+					<path d="M41322.4 2563.2 L41423.75 2985 L41423.75 3171.5 L41423.75 3171.5 L41423.75 3358 L41423.75 3358 L41423.75 3514.5 L41423.75 3514.5 L41423.75 3671 L41423.75 3671 L38873.25 3705.8308328524718 L38873.3 3705.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40873.5 2550.6 L40873.3 2561.4 L40864.2 2555.7 L40864.4 2545.0 Z"></path>
+						<path d="M41325.4 2552.8 L41322.4 2563.2 L41315.1 2555.3 L41318.1 2545.0 Z"></path>
 					</g>
-					<path d="M40888.5 2561.0 L41145.75 2985 L41145.75 3171.5 L41145.75 3171.5 L41145.75 3358 L41145.75 3358 L39289.25 3503.4893590385577 L39289.3 3503.5 " fill="none"></path>
+					<path d="M41337.9 2562.9 L41463.75 2985 L41463.75 3171.5 L41463.75 3171.5 L41463.75 3358 L41463.75 3358 L40068.75 3500.180071637903 L40068.8 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40888.2 2550.2 L40888.5 2561.0 L40879.1 2555.7 L40878.8 2545.0 Z"></path>
+						<path d="M41340.3 2552.4 L41337.9 2562.9 L41330.1 2555.5 L41332.5 2545.0 Z"></path>
 					</g>
-					<path d="M40903.6 2560.5 L41185.75 2985 L35023.25 3169.9245776347548 L35023.3 3169.9 " fill="none"></path>
+					<path d="M41353.2 2562.6 L41503.75 2985 L39527.75 3166.673157505546 L39527.8 3166.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40902.9 2549.8 L40903.6 2560.5 L40894.0 2555.7 L40893.3 2545.0 Z"></path>
+						<path d="M41355.1 2552.0 L41353.2 2562.6 L41345.1 2555.6 L41347.0 2545.0 Z"></path>
 					</g>
-					<path d="M43795.5 601.1 L45798.25 876 L45798.25 1025 L45798.25 1025 L45798.25 1174 L45798.25 1174 L45798.25 1390.5 L45798.25 1390.5 L45798.25 1607 L45798.25 1607 L41178.75 2234.7163001676363 L41178.8 2234.7 " fill="none"></path>
-					<path d="M43796.2 595.9 L43795.5 601.1 L43794.7 606.4 L43782.3 599.3 Z"></path>
-					<path d="M38485.9 1526.2 L38348.25 1607 L40276.75 2165.4099600756463 L40276.8 2165.4 " fill="none"></path>
-					<path d="M38488.6 1530.8 L38485.9 1526.2 L38483.2 1521.6 L38497.4 1519.5 Z"></path>
+					<path d="M44664.1 624.4 L45994.25 876 L45994.25 1025 L45994.25 1025 L45994.25 1174 L45994.25 1174 L45994.25 1390.5 L45994.25 1390.5 L45994.25 1607 L45994.25 1607 L41709.25 2230.3878800675675 L41709.3 2230.4 " fill="none"></path>
+					<path d="M44665.1 619.2 L44664.1 624.4 L44663.1 629.7 L44651.0 622.0 Z"></path>
+					<path d="M39602.1 1532.8 L39595.25 1607 L40807.25 2109.1455201443173 L40807.3 2109.1 " fill="none"></path>
+					<path d="M39607.4 1533.3 L39602.1 1532.8 L39596.8 1532.3 L39603.3 1519.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M43654.5 1068.7 L43905.5 1174 L43905.5 1390.5 L43905.5 1390.5 L43905.5 1607 L43905.5 1607 L41178.75 2198.2141452285423 L41178.8 2198.2 " fill="none"></path>
+						<path d="M44116.2 1075.9 L44155.75 1174 L44155.75 1390.5 L44155.75 1390.5 L44155.75 1607 L44155.75 1607 L41709.25 2188.756169111303 L41709.3 2188.8 " fill="none"></path>
 					</g>
-					<path d="M43656.6 1063.7 L43654.5 1068.7 L43652.5 1073.6 L43642.2 1063.5 Z"></path>
+					<path d="M44121.2 1073.9 L44116.2 1075.9 L44111.3 1077.9 L44111.3 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M17491.0 1418.7 L17549 1607 L40276.75 2282.5937981987813 L40276.8 2282.6 " fill="none"></path>
+						<path d="M14590.6 1417.7 L14695.5 1607 L40807.25 2284.301700689876 L40807.3 2284.3 " fill="none"></path>
 					</g>
-					<path d="M17496.1 1417.2 L17491.0 1418.7 L17485.9 1420.3 L17487.0 1406.0 Z"></path>
+					<path d="M14595.2 1415.1 L14590.6 1417.7 L14585.9 1420.2 L14584.1 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M28681.0 1042.9 L29412.25 1174 L29412.25 1390.5 L29412.25 1390.5 L29412.25 1607 L29412.25 1607 L40276.75 2268.5386416861825 L40276.8 2268.5 " fill="none"></path>
+						<path d="M29948.1 1043.1 L30604.5 1174 L30604.5 1390.5 L30604.5 1390.5 L30604.5 1607 L30604.5 1607 L40807.25 2266.832899213892 L40807.3 2266.8 " fill="none"></path>
 					</g>
-					<path d="M28682.0 1037.6 L28681.0 1042.9 L28680.1 1048.1 L28667.9 1040.5 Z"></path>
-					<path d="M33634.3 3296.7 L33634.25 3358 L39008.25 3510.5126484722095 L39008.3 3510.5 " fill="none"></path>
+					<path d="M29949.1 1037.9 L29948.1 1043.1 L29947.0 1048.3 L29935.0 1040.5 Z"></path>
+					<path d="M35043.8 3296.7 L35043.75 3358 L39787.75 3509.9983621660353 L39787.8 3510.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33639.6 3287.3 L33634.3 3296.7 L33628.9 3287.3 L33634.3 3278.0 Z"></path>
+						<path d="M35049.1 3287.3 L35043.8 3296.7 L35038.4 3287.3 L35043.8 3278.0 Z"></path>
 					</g>
-					<path d="M34052.9 3161.2 L41225.75 2985 L40907.72387518142 2545 L40907.7 2545.0 " fill="none"></path>
+					<path d="M35462.4 3159.5 L41543.75 2985 L41361.42779390421 2545 L41361.4 2545.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34043.4 3156.1 L34052.9 3161.2 L34043.7 3166.8 L34034.3 3161.7 Z"></path>
+						<path d="M35452.9 3154.4 L35462.4 3159.5 L35453.2 3165.1 L35443.8 3160.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M43665.0 1068.2 L43945.5 1174 L43945.5 1390.5 L43945.5 1390.5 L43945.5 1607 L43945.5 1607 L43945.5 2296 L43945.5 2296 L43945.5 2985 L43945.5 2985 L34034.25 3164.265183658625 L34034.3 3164.3 " fill="none"></path>
+						<path d="M44129.0 1074.6 L44195.75 1174 L44195.75 1390.5 L44195.75 1390.5 L44195.75 1607 L44195.75 1607 L44195.75 2296 L44195.75 2296 L44195.75 2985 L44195.75 2985 L35443.75 3163.3487762237764 L35443.8 3163.3 " fill="none"></path>
 					</g>
-					<path d="M43666.9 1063.2 L43665.0 1068.2 L43663.2 1073.2 L43652.6 1063.5 Z"></path>
+					<path d="M44133.4 1071.6 L44129.0 1074.6 L44124.6 1077.5 L44121.6 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M17516.6 1413.4 L17807 1607 L17807 2296 L17807 2296 L17807 2985 L17807 2985 L33234.25 3166.7866101186246 L33234.3 3166.8 " fill="none"></path>
+						<path d="M14594.9 1416.7 L14735.5 1607 L14735.5 2296 L14735.5 2296 L14735.5 2985 L14735.5 2985 L34643.75 3167.826616030431 L34643.8 3167.8 " fill="none"></path>
 					</g>
-					<path d="M17519.6 1409.0 L17516.6 1413.4 L17513.6 1417.8 L17505.5 1406.0 Z"></path>
+					<path d="M14599.2 1413.6 L14594.9 1416.7 L14590.6 1419.9 L14587.0 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M28685.2 1042.7 L29452.25 1174 L29452.25 1390.5 L29452.25 1390.5 L29452.25 1607 L29452.25 1607 L29452.25 2296 L29452.25 2296 L29452.25 2985 L29452.25 2985 L33234.25 3153.661645145863 L33234.3 3153.7 " fill="none"></path>
+						<path d="M29952.2 1043.0 L30644.5 1174 L30644.5 1390.5 L30644.5 1390.5 L30644.5 1607 L30644.5 1607 L30644.5 2296 L30644.5 2296 L30644.5 2985 L30644.5 2985 L34643.75 3154.5425640734215 L34643.8 3154.5 " fill="none"></path>
 					</g>
-					<path d="M28686.1 1037.5 L28685.2 1042.7 L28684.3 1048.0 L28672.1 1040.5 Z"></path>
-					<path d="M44731.9 1583.6 L44702.25 1607 L44702.25 2296 L44702.25 2296 L44702.25 2985 L44702.25 2985 L39226.25 3170.4669935530737 L39226.3 3170.5 " fill="none"></path>
+					<path d="M29953.2 1037.7 L29952.2 1043.0 L29951.3 1048.2 L29939.1 1040.5 Z"></path>
+					<path d="M45061.0 1540.3 L44898.25 1607 L44898.25 2296 L44898.25 2296 L44898.25 2985 L44898.25 2985 L40770.25 3170.132138992425 L40770.3 3170.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44742.5 1582.0 L44731.9 1583.6 L44735.9 1573.6 L44746.5 1572.0 Z"></path>
+						<path d="M45071.6 1541.7 L45061.0 1540.3 L45067.6 1531.8 L45078.3 1533.2 Z"></path>
 					</g>
-					<path d="M44766.4 1584.7 L44742.25 1607 L44742.25 2296 L44742.25 2296 L44742.25 2985 L44742.25 2985 L31416.5 3170.449295774648 L31416.5 3170.4 " fill="none"></path>
+					<path d="M45061.2 1552.5 L44938.25 1607 L44938.25 2296 L44938.25 2296 L44938.25 2985 L44938.25 2985 L33467 3170.2805443090047 L33467.0 3170.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44776.9 1582.3 L44766.4 1584.7 L44769.6 1574.4 L44780.1 1572.0 Z"></path>
+						<path d="M45071.9 1553.5 L45061.2 1552.5 L45067.6 1543.8 L45078.3 1544.9 Z"></path>
 					</g>
-					<path d="M44801.2 1585.9 L44782.25 1607 L44782.25 2296 L44782.25 2296 L44782.25 2985 L44782.25 2985 L29258.75 3170.6508865305077 L29258.8 3170.7 " fill="none"></path>
+					<path d="M45061.4 1566.8 L44978.25 1607 L44978.25 2296 L44978.25 2296 L44978.25 2985 L44978.25 2985 L31367.5 3170.532177901219 L31367.5 3170.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44811.4 1582.5 L44801.2 1585.9 L44803.4 1575.4 L44813.6 1572.0 Z"></path>
+						<path d="M45072.2 1567.5 L45061.4 1566.8 L45067.5 1557.9 L45078.3 1558.7 Z"></path>
 					</g>
-					<path d="M44836.3 1587.2 L44822.25 1607 L44822.25 2296 L44822.25 2296 L44822.25 2985 L44822.25 2985 L33194.25 3170.7651190680144 L33194.3 3170.8 " fill="none"></path>
+					<path d="M45067.7 1580.7 L45018.25 1607 L45018.25 2296 L45018.25 2296 L45018.25 2985 L45018.25 2985 L34603.75 3170.6798671191627 L34603.8 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44846.1 1582.7 L44836.3 1587.2 L44837.4 1576.5 L44847.1 1572.0 Z"></path>
+						<path d="M45078.5 1581.1 L45067.7 1580.7 L45073.5 1571.7 L45084.2 1572.0 Z"></path>
 					</g>
-					<path d="M45186.1 1584.7 L45210.25 1607 L45210.25 2054.5 L45210.3 2054.5 " fill="none"></path>
+					<path d="M45407.8 1590.6 L45406.25 1607 L45406.25 2054.5 L45406.3 2054.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45182.9 1574.4 L45186.1 1584.7 L45175.6 1582.3 L45172.4 1572.0 Z"></path>
+						<path d="M45413.9 1581.8 L45407.8 1590.6 L45403.3 1580.8 L45409.5 1572.0 Z"></path>
 					</g>
-					<path d="M45300.8 1581.5 L45344.25 1607 L41178.75 2228.689483374851 L41178.8 2228.7 " fill="none"></path>
+					<path d="M45530.5 1588.5 L45540.25 1607 L41709.25 2223.431340495096 L41709.3 2223.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45295.5 1572.1 L45300.8 1581.5 L45290.1 1581.3 L45284.8 1572.0 Z"></path>
+						<path d="M45530.9 1577.8 L45530.5 1588.5 L45521.4 1582.7 L45521.8 1572.0 Z"></path>
 					</g>
-					<path d="M45334.8 1580.7 L45384.25 1607 L40218.5 2230.136823215302 L40218.5 2230.1 " fill="none"></path>
+					<path d="M45566.2 1587.2 L45580.25 1607 L40767.25 2225.8014554954284 L40767.3 2225.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45329.0 1571.7 L45334.8 1580.7 L45324.0 1581.1 L45318.3 1572.0 Z"></path>
+						<path d="M45565.1 1576.5 L45566.2 1587.2 L45556.4 1582.7 L45555.4 1572.0 Z"></path>
 					</g>
-					<path d="M45341.1 1566.8 L45424.25 1607 L43745.5 2155.5044457617073 L43745.5 2155.5 " fill="none"></path>
+					<path d="M45601.3 1585.9 L45620.25 1607 L43995.75 2151.7945972256025 L43995.8 2151.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45335.0 1557.9 L45341.1 1566.8 L45330.3 1567.5 L45324.3 1558.7 Z"></path>
+						<path d="M45599.1 1575.4 L45601.3 1585.9 L45591.1 1582.5 L45588.9 1572.0 Z"></path>
 					</g>
-					<path d="M45341.3 1552.5 L45464.25 1607 L31573.75 2275.801851851852 L31573.8 2275.8 " fill="none"></path>
+					<path d="M45636.1 1584.7 L45660.25 1607 L38879.25 2255.8589681272133 L38879.3 2255.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45334.9 1543.8 L45341.3 1552.5 L45330.6 1553.5 L45324.3 1544.9 Z"></path>
+						<path d="M45632.9 1574.4 L45636.1 1584.7 L45625.6 1582.3 L45622.4 1572.0 Z"></path>
 					</g>
-					<path d="M45341.9 1517.8 L45598.25 1607 L45598.25 2296 L45598.25 2296 L45598.25 2985 L45598.25 2985 L35023.25 3170.5786873676784 L35023.3 3170.6 " fill="none"></path>
+					<path d="M45750.8 1581.5 L45794.25 1607 L45794.25 2296 L45794.25 2296 L45794.25 2985 L45794.25 2985 L39527.75 3169.950506409242 L39527.8 3170.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45334.8 1509.7 L45341.9 1517.8 L45331.3 1519.7 L45324.3 1511.6 Z"></path>
+						<path d="M45745.5 1572.1 L45750.8 1581.5 L45740.1 1581.3 L45734.8 1572.0 Z"></path>
 					</g>
-					<path d="M43795.5 600.2 L45838.25 876 L45838.25 1025 L45838.25 1025 L45838.25 1174 L45838.25 1174 L45324.25 1303.0962877030163 L45324.3 1303.1 " fill="none"></path>
-					<path d="M43796.2 594.9 L43795.5 600.2 L43794.7 605.4 L43782.3 598.4 Z"></path>
+					<path d="M44664.1 622.6 L46034.25 876 L46034.25 1025 L46034.25 1025 L46034.25 1174 L46034.25 1174 L45774.25 1266.5822368421052 L45774.3 1266.6 " fill="none"></path>
+					<path d="M44665.1 617.3 L44664.1 622.6 L44663.1 627.8 L44651.0 620.1 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M43671.6 1066.5 L43985.5 1174 L44628.25 1314.4545798637396 L44628.3 1314.5 " fill="none"></path>
+						<path d="M44141.1 1073.2 L44235.75 1174 L45078.25 1327.2139857202856 L45078.3 1327.2 " fill="none"></path>
 					</g>
-					<path d="M43673.3 1061.4 L43671.6 1066.5 L43669.9 1071.5 L43659.0 1062.2 Z"></path>
-					<path d="M38744.5 1537.9 L38757.25 1607 L38757.25 2296 L38757.25 2296 L38757.25 2985 L38757.25 2985 L38757.25 3171.5 L38757.25 3171.5 L38757.25 3358 L38757.25 3358 L38757.25 3514.5 L38757.25 3514.5 L38757.25 3671 L38757.25 3671 L37334.5 3705.31807372176 L37334.5 3705.3 " fill="none"></path>
+					<path d="M44144.9 1069.6 L44141.1 1073.2 L44137.2 1076.9 L44131.9 1063.5 Z"></path>
+					<path d="M39628.9 1538.1 L39635.25 1607 L39635.25 2296 L39635.25 2296 L39635.25 2985 L39635.25 2985 L39635.25 3171.5 L39635.25 3171.5 L39635.25 3358 L39635.25 3358 L39635.25 3514.5 L39635.25 3514.5 L39635.25 3671 L39635.25 3671 L38873.25 3704.355117139334 L38873.3 3704.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38748.0 1527.7 L38744.5 1537.9 L38737.5 1529.6 L38741.1 1519.5 Z"></path>
+						<path d="M39633.3 1528.3 L39628.9 1538.1 L39622.7 1529.3 L39627.2 1519.5 Z"></path>
 					</g>
-					<path d="M38817.4 1534.8 L38867.5 1607 L38867.5 2296 L38867.5 2296 L38867.5 2985 L38867.5 2985 L38867.5 3171.5 L38867.5 3171.5 L38867.5 3358 L38867.5 3358 L39008.25 3436.319555555556 L39008.3 3436.3 " fill="none"></path>
+					<path d="M39949.8 1424.4 L41749.25 1607 L41749.25 2296 L41749.25 2296 L41749.25 2985 L41749.25 2985 L41749.25 3171.5 L41749.25 3171.5 L41749.25 3358 L41749.25 3358 L40068.75 3502.4251784733665 L40068.8 3502.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38816.5 1524.1 L38817.4 1534.8 L38807.7 1530.2 L38806.8 1519.5 Z"></path>
+						<path d="M39941.1 1418.2 L39949.8 1424.4 L39940.0 1428.8 L39931.3 1422.6 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M43671.7 1063.0 L44025.5 1174 L39033.25 1377.6117599962322 L39033.3 1377.6 " fill="none"></path>
+						<path d="M44152.5 1072.0 L44275.75 1174 L39931.25 1375.8204591781998 L39931.3 1375.8 " fill="none"></path>
 					</g>
-					<path d="M43673.3 1057.9 L43671.7 1063.0 L43670.1 1068.1 L43659.0 1059.0 Z"></path>
+					<path d="M44155.9 1067.9 L44152.5 1072.0 L44149.1 1076.1 L44142.3 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M28690.7 1042.6 L29504.25 1174 L38401.25 1383.0741886464778 L38401.3 1383.1 " fill="none"></path>
+						<path d="M29966.9 1041.3 L30860.5 1174 L39299.25 1382.68549930038 L39299.3 1382.7 " fill="none"></path>
 					</g>
-					<path d="M28691.5 1037.4 L28690.7 1042.6 L28689.8 1047.9 L28677.5 1040.5 Z"></path>
+					<path d="M29967.7 1036.0 L29966.9 1041.3 L29966.2 1046.6 L29953.8 1039.3 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M35481.4 593.8 L35091.25 876 L35091.25 1025 L35091.25 1025 L35091.25 1174 L35091.25 1174 L35091.25 1390.5 L35091.25 1390.5 L35091.25 1607 L35091.25 1607 L36441.932148040636 2227 L36441.9 2227.0 " fill="none"></path>
+						<path d="M27328.7 595.5 L27051.75 876 L27051.75 1025 L27051.75 1025 L27051.75 1174 L27051.75 1174 L27051.75 1390.5 L27051.75 1390.5 L27051.75 1607 L27051.75 1607 L25568.564223512338 2227 L25568.6 2227.0 " fill="none"></path>
 					</g>
-					<path d="M35484.5 598.1 L35481.4 593.8 L35478.3 589.5 L35492.2 586.0 Z"></path>
-					<path d="M35478.5 1158.9 L35423.25 1174 L35423.25 1390.5 L35423.25 1390.5 L35423.25 1607 L35423.25 1607 L35423.25 2296 L35423.25 2296 L35423.25 2985 L35423.25 2985 L19111 3169.447722622205 L19111.0 3169.4 " fill="none"></path>
+					<path d="M27332.5 599.2 L27328.7 595.5 L27324.9 591.7 L27338.1 586.0 Z"></path>
+					<path d="M32045.2 1082.1 L31076.5 1174 L31076.5 1390.5 L31076.5 1390.5 L31076.5 1607 L31076.5 1607 L31076.5 2296 L31076.5 2296 L31076.5 2985 L31076.5 2985 L14744.5 3169.4501771278046 L14744.5 3169.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35488.9 1161.6 L35478.5 1158.9 L35486.1 1151.3 L35496.5 1154.0 Z"></path>
+						<path d="M32055.0 1086.6 L32045.2 1082.1 L32054.0 1076.0 L32063.8 1080.4 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M35623.9 594.4 L35969.25 876 L35969.25 896 L35969.3 896.0 " fill="none"></path>
+						<path d="M27478.8 545.6 L32647.75 876 L32647.75 896 L32647.8 896.0 " fill="none"></path>
 					</g>
-					<path d="M35627.2 590.3 L35623.9 594.4 L35620.5 598.6 L35613.5 586.0 Z"></path>
-					<path d="M35667.9 1159.4 L35635.25 1174 L35635.25 1306.5 L35635.3 1306.5 " fill="none"></path>
-					<path d="M35670.1 1164.3 L35667.9 1159.4 L35665.7 1154.6 L35680.1 1154.0 Z"></path>
-					<path d="M36039.2 1165.9 L36043.25 1174 L36043.25 1321.5 L36043.3 1321.5 " fill="none"></path>
-					<path d="M36044.0 1163.6 L36039.2 1165.9 L36034.5 1168.3 L36033.3 1154.0 Z"></path>
-					<path d="M36454.8 1157.5 L36515.25 1174 L36515.25 1321.5 L36515.3 1321.5 " fill="none"></path>
-					<path d="M36456.2 1152.4 L36454.8 1157.5 L36453.4 1162.7 L36442.0 1154.0 Z"></path>
-					<path d="M36566.5 1109.1 L37027.25 1174 L37027.25 1314 L37027.3 1314.0 " fill="none"></path>
-					<path d="M36567.2 1103.8 L36566.5 1109.1 L36565.7 1114.4 L36553.3 1107.2 Z"></path>
-					<path d="M37475.3 1553.2 L37475.25 1607 L24416.75 2294.473276026743 L24416.8 2294.5 " fill="none"></path>
+					<path d="M27479.1 540.2 L27478.8 545.6 L27478.5 550.9 L27465.5 544.7 Z"></path>
+					<path d="M32921.4 1159.9 L32950 1174 L32950 1306.5 L32950.0 1306.5 " fill="none"></path>
+					<path d="M32923.7 1155.1 L32921.4 1159.9 L32919.0 1164.7 L32909.4 1154.0 Z"></path>
+					<path d="M33244.8 1150.3 L33358 1174 L33358 1321.5 L33358.0 1321.5 " fill="none"></path>
+					<path d="M33245.9 1145.0 L33244.8 1150.3 L33243.7 1155.5 L33231.8 1147.5 Z"></path>
+					<path d="M33245.0 1100.3 L33830 1174 L33830 1321.5 L33830.0 1321.5 " fill="none"></path>
+					<path d="M33245.6 1095.0 L33245.0 1100.3 L33244.3 1105.6 L33231.8 1098.6 Z"></path>
+					<path d="M33245.0 1077.5 L34342 1174 L34342 1314 L34342.0 1314.0 " fill="none"></path>
+					<path d="M33245.5 1072.2 L33245.0 1077.5 L33244.6 1082.8 L33231.8 1076.4 Z"></path>
+					<path d="M34790.0 1553.2 L34790 1607 L21293.25 2294.5227436556197 L21293.3 2294.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37480.6 1543.8 L37475.3 1553.2 L37469.9 1543.8 L37475.3 1534.5 Z"></path>
+						<path d="M34795.3 1543.8 L34790.0 1553.2 L34784.7 1543.8 L34790.0 1534.5 Z"></path>
 					</g>
-					<path d="M36566.5 1084.1 L37475.25 1174 L37475.25 1246.5 L37475.3 1246.5 " fill="none"></path>
-					<path d="M36567.0 1078.8 L36566.5 1084.1 L36566.0 1089.4 L36553.3 1082.8 Z"></path>
-					<path d="M37859.3 1493.2 L37859.25 1607 L37859.25 2280.5 L37859.3 2280.5 " fill="none"></path>
+					<path d="M33245.1 1066.5 L34790 1174 L34790 1246.5 L34790.0 1246.5 " fill="none"></path>
+					<path d="M33245.4 1061.2 L33245.1 1066.5 L33244.7 1071.9 L33231.8 1065.6 Z"></path>
+					<path d="M35174.0 1493.2 L35174 1607 L35174 2280.5 L35174.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37864.6 1483.8 L37859.3 1493.2 L37853.9 1483.8 L37859.3 1474.5 Z"></path>
+						<path d="M35179.3 1483.8 L35174.0 1493.2 L35168.7 1483.8 L35174.0 1474.5 Z"></path>
 					</g>
-					<path d="M36566.5 1072.1 L37859.25 1174 L37859.25 1306.5 L37859.3 1306.5 " fill="none"></path>
-					<path d="M36567.0 1066.8 L36566.5 1072.1 L36566.1 1077.4 L36553.3 1071.0 Z"></path>
-					<path d="M11751.0 1455.7 L11751 1607 L23009.75 2266.33819935828 L23009.8 2266.3 " fill="none"></path>
+					<path d="M33245.1 1060.2 L35174 1174 L35174 1306.5 L35174.0 1306.5 " fill="none"></path>
+					<path d="M33245.4 1054.9 L33245.1 1060.2 L33244.7 1065.6 L33231.8 1059.4 Z"></path>
+					<path d="M15756.5 1455.7 L15756.5 1607 L25627.5 2262.371621296073 L25627.5 2262.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11756.3 1446.3 L11751.0 1455.7 L11745.7 1446.3 L11751.0 1437.0 Z"></path>
+						<path d="M15761.8 1446.3 L15756.5 1455.7 L15751.2 1446.3 L15756.5 1437.0 Z"></path>
 					</g>
-					<path d="M14597.4 1029.5 L11751 1174 L11751 1344 L11751.0 1344.0 " fill="none"></path>
-					<path d="M14597.7 1034.9 L14597.4 1029.5 L14597.2 1024.2 L14610.8 1028.9 Z"></path>
-					<path d="M12143.0 1478.2 L12143 1607 L23009.75 2265.3158507902313 L23009.8 2265.3 " fill="none"></path>
+					<path d="M17769.7 1031.3 L15756.5 1174 L15756.5 1344 L15756.5 1344.0 " fill="none"></path>
+					<path d="M17770.1 1036.6 L17769.7 1031.3 L17769.3 1026.0 L17783.0 1030.4 Z"></path>
+					<path d="M16148.5 1478.2 L16148.5 1607 L25627.5 2261.0514746382255 L25627.5 2261.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12148.3 1468.8 L12143.0 1478.2 L12137.7 1468.8 L12143.0 1459.5 Z"></path>
+						<path d="M16153.8 1468.8 L16148.5 1478.2 L16143.2 1468.8 L16148.5 1459.5 Z"></path>
 					</g>
-					<path d="M14597.4 1030.2 L12143 1174 L12143 1321.5 L12143.0 1321.5 " fill="none"></path>
-					<path d="M14597.8 1035.6 L14597.4 1030.2 L14597.1 1024.9 L14610.8 1029.5 Z"></path>
-					<path d="M19129.7 3166.5 L22291.333333333332 3088 L23086.416666666668 3088 L23086.416666666668 3088 L23881.5 3171.5 L23881.5 3171.5 L23086.416666666668 3255 L23086.416666666668 3255 L22291.333333333332 3255 L22291.333333333332 3255 L19111 3176.0080313321105 L19111.0 3176.0 " fill="none"></path>
+					<path d="M17769.7 1032.8 L16148.5 1174 L16148.5 1321.5 L16148.5 1321.5 " fill="none"></path>
+					<path d="M17770.2 1038.1 L17769.7 1032.8 L17769.3 1027.5 L17783.0 1031.6 Z"></path>
+					<path d="M14761.9 3093.0 L14774.5 3088 L14782 3088 L14782 3088 L14789.5 3171.5 L14789.5 3171.5 L14782 3255 L14782 3255 L14774.5 3255 L14774.5 3255 L14744.5 3243.1560283687945 L14744.5 3243.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19120.2 3161.4 L19129.7 3166.5 L19120.5 3172.1 L19111.0 3167.0 Z"></path>
+						<path d="M14751.2 3091.5 L14761.9 3093.0 L14755.1 3101.4 L14744.5 3099.8 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3724.2 2322.7 L4149.5 2985 L18748 3169.2097598105547 L18748.0 3169.2 " fill="none"></path>
+						<path d="M3046.9 2318.6 L4104 2985 L14381.5 3168.2635768237883 L14381.5 3168.3 " fill="none"></path>
 					</g>
-					<path d="M3728.6 2319.8 L3724.2 2322.7 L3719.7 2325.6 L3717.0 2311.5 Z"></path>
-					<path d="M12950.0 1455.7 L12950 1607 L23009.75 2262.972341180646 L23009.8 2263.0 " fill="none"></path>
+					<path d="M3049.7 2314.1 L3046.9 2318.6 L3044.0 2323.1 L3035.6 2311.5 Z"></path>
+					<path d="M18143.5 1455.7 L18143.5 1607 L25627.5 2252.3258244164945 L25627.5 2252.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12955.3 1446.3 L12950.0 1455.7 L12944.7 1446.3 L12950.0 1437.0 Z"></path>
+						<path d="M18148.8 1446.3 L18143.5 1455.7 L18138.2 1446.3 L18143.5 1437.0 Z"></path>
 					</g>
-					<path d="M14597.5 1032.7 L12950 1174 L12950 1344 L12950.0 1344.0 " fill="none"></path>
-					<path d="M14597.9 1038.0 L14597.5 1032.7 L14597.0 1027.3 L14610.8 1031.5 Z"></path>
-					<path d="M31121.3 1440.2 L31121.25 1607 L24022.75 2250.111965811966 L24022.8 2250.1 " fill="none"></path>
+					<path d="M17900.4 1046.7 L18143.5 1174 L18143.5 1344 L18143.5 1344.0 " fill="none"></path>
+					<path d="M17902.9 1042.0 L17900.4 1046.7 L17897.9 1051.4 L17888.6 1040.5 Z"></path>
+					<path d="M30388.5 1440.2 L30388.5 1607 L26640.5 2213.97426254554 L26640.5 2214.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31126.6 1430.8 L31121.3 1440.2 L31115.9 1430.8 L31121.3 1421.5 Z"></path>
+						<path d="M30393.8 1430.8 L30388.5 1440.2 L30383.2 1430.8 L30388.5 1421.5 Z"></path>
 					</g>
-					<path d="M16864.0 1455.7 L16864 1607 L23009.75 2243.5397797737605 L23009.8 2243.5 " fill="none"></path>
+					<path d="M23759.8 1455.7 L23759.75 1607 L25627.5 2149.015267979362 L25627.5 2149.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16869.3 1446.3 L16864.0 1455.7 L16858.7 1446.3 L16864.0 1437.0 Z"></path>
+						<path d="M23765.1 1446.3 L23759.8 1455.7 L23754.4 1446.3 L23759.8 1437.0 Z"></path>
 					</g>
-					<path d="M14597.5 1037.5 L13626 1174 L16688 1378.7322421247684 L16688.0 1378.7 " fill="none"></path>
-					<path d="M14598.3 1042.8 L14597.5 1037.5 L14596.8 1032.2 L14610.8 1035.7 Z"></path>
-					<path d="M18058.3 1455.7 L18058.25 1607 L23009.75 2232.0611029681204 L23009.8 2232.1 " fill="none"></path>
+					<path d="M17948.3 1029.3 L20921.5 1174 L23583.75 1377.0748260371709 L23583.8 1377.1 " fill="none"></path>
+					<path d="M17948.6 1024.0 L17948.3 1029.3 L17948.1 1034.7 L17935.0 1028.7 Z"></path>
+					<path d="M24151.8 1455.7 L24151.75 1607 L25627.5 2119.948291083365 L25627.5 2119.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18063.6 1446.3 L18058.3 1455.7 L18052.9 1446.3 L18058.3 1437.0 Z"></path>
+						<path d="M24157.1 1446.3 L24151.8 1455.7 L24146.4 1446.3 L24151.8 1437.0 Z"></path>
 					</g>
-					<path d="M14775.9 1040.0 L15569.75 1174 L17882.25 1375.1879646373318 L17882.3 1375.2 " fill="none"></path>
-					<path d="M14776.8 1034.8 L14775.9 1040.0 L14775.0 1045.3 L14762.8 1037.8 Z"></path>
-					<path d="M23654.7 2983.3 L23655 2985 L19111 3164.3367897576977 L19111.0 3164.3 " fill="none"></path>
+					<path d="M17948.3 1029.1 L21137.5 1174 L23975.75 1377.8587127809571 L23975.8 1377.9 " fill="none"></path>
+					<path d="M17948.6 1023.7 L17948.3 1029.1 L17948.1 1034.4 L17935.0 1028.5 Z"></path>
+					<path d="M25610.9 2566.8 L24803 2985 L14744.5 3168.1943603515624 L14744.5 3168.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23658.0 2973.1 L23654.7 2983.3 L23647.6 2975.2 L23651.0 2965.0 Z"></path>
+						<path d="M25621.7 2567.2 L25610.9 2566.8 L25616.8 2557.7 L25627.5 2558.2 Z"></path>
 					</g>
-					<path d="M23789.7 2982.3 L23790.75 2985 L27416.75 3168.638560760353 L27416.8 3168.6 " fill="none"></path>
+					<path d="M25611.0 2575.1 L24843 2985 L32934 3170.2066891684567 L32934.0 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23791.2 2971.7 L23789.7 2982.3 L23781.3 2975.6 L23782.8 2965.0 Z"></path>
+						<path d="M25621.8 2575.4 L25611.0 2575.1 L25616.8 2566.0 L25627.5 2566.3 Z"></path>
 					</g>
-					<path d="M23924.1 2981.0 L23926.5 2985 L23926.5 3171.5 L23926.5 3171.5 L23926.5 3358 L23926.5 3358 L23926.5 3514.5 L23926.5 3514.5 L23926.5 3671 L23926.5 3671 L37236.5 3706.3697881577964 L37236.5 3706.4 " fill="none"></path>
+					<path d="M26657.8 2506.9 L27845.25 2985 L27845.25 3171.5 L27845.25 3171.5 L27845.25 3358 L27845.25 3358 L27845.25 3514.5 L27845.25 3514.5 L27845.25 3671 L27845.25 3671 L38775.25 3706.3415611622186 L38775.3 3706.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23923.9 2970.3 L23924.1 2981.0 L23914.8 2975.7 L23914.6 2965.0 Z"></path>
+						<path d="M26651.1 2498.5 L26657.8 2506.9 L26647.2 2508.4 L26640.5 2499.9 Z"></path>
 					</g>
-					<path d="M23963.6 2980.6 L23966.5 2985 L4035.75 3170.856566957087 L4035.8 3170.9 " fill="none"></path>
+					<path d="M26657.9 2500.6 L27898.25 2985 L10544.25 3170.761407335132 L10544.3 3170.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23963.0 2969.9 L23963.6 2980.6 L23954.1 2975.7 L23953.4 2965.0 Z"></path>
+						<path d="M26651.1 2492.2 L26657.9 2500.6 L26647.3 2502.2 L26640.5 2493.8 Z"></path>
 					</g>
-					<path d="M24003.1 2980.2 L24006.5 2985 L34918.25 3170.6069840618375 L34918.3 3170.6 " fill="none"></path>
+					<path d="M26657.9 2496.1 L27938.25 2985 L39422.75 3170.651317500217 L39422.8 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24002.0 2969.5 L24003.1 2980.2 L23993.3 2975.7 L23992.3 2965.0 Z"></path>
+						<path d="M26651.1 2487.8 L26657.9 2496.1 L26647.3 2497.7 L26640.5 2489.4 Z"></path>
 					</g>
-					<path d="M42632.0 1432.7 L42744.75 1607 L24022.75 2277.850976415217 L24022.8 2277.9 " fill="none"></path>
-					<path d="M42636.5 1429.8 L42632.0 1432.7 L42627.6 1435.6 L42624.8 1421.5 Z"></path>
+					<path d="M42853.1 1432.7 L42965 1607 L26640.5 2275.265729903155 L26640.5 2275.3 " fill="none"></path>
+					<path d="M42857.6 1429.8 L42853.1 1432.7 L42848.6 1435.6 L42845.9 1421.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M17523.2 1412.3 L17889.25 1607 L23009.75 2233.9814288253065 L23009.8 2234.0 " fill="none"></path>
+						<path d="M14598.9 1415.8 L14775.5 1607 L25627.5 2265.2760047541487 L25627.5 2265.3 " fill="none"></path>
 					</g>
-					<path d="M17525.7 1407.6 L17523.2 1412.3 L17520.7 1417.0 L17511.4 1406.0 Z"></path>
-					<path d="M32345.3 1447.7 L32345.25 1607 L24022.75 2256.473609695322 L24022.8 2256.5 " fill="none"></path>
+					<path d="M14602.8 1412.2 L14598.9 1415.8 L14594.9 1419.4 L14589.8 1406.0 Z"></path>
+					<path d="M30860.5 1447.7 L30860.5 1607 L26640.5 2222.1655559081773 L26640.5 2222.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32350.6 1438.3 L32345.3 1447.7 L32339.9 1438.3 L32345.3 1429.0 Z"></path>
+						<path d="M30865.8 1438.3 L30860.5 1447.7 L30855.2 1438.3 L30860.5 1429.0 Z"></path>
 					</g>
-					<path d="M38914.6 1039.1 L40517.75 1174 L40517.75 1375 L40517.8 1375.0 " fill="none"></path>
+					<path d="M35918.1 1075.4 L36245 1174 L36245 1375 L36245.0 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38905.7 1033.0 L38914.6 1039.1 L38904.9 1043.6 L38896.0 1037.5 Z"></path>
+						<path d="M35910.7 1067.6 L35918.1 1075.4 L35907.6 1077.8 L35900.3 1070.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M35651.3 549.5 L38747 876 L38747 941 L38747.0 941.0 " fill="none"></path>
+						<path d="M27478.8 543.3 L35751.25 876 L35751.25 941 L35751.3 941.0 " fill="none"></path>
 					</g>
-					<path d="M35651.8 544.2 L35651.3 549.5 L35650.7 554.8 L35638.0 548.1 Z"></path>
-					<path d="M26977.0 1097.7 L26977 1174 L26977 1239 L26977.0 1239.0 " fill="none"></path>
+					<path d="M27479.0 538.0 L27478.8 543.3 L27478.6 548.6 L27465.5 542.8 Z"></path>
+					<path d="M42288.8 1097.7 L42288.75 1174 L42288.75 1239 L42288.8 1239.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26982.3 1088.3 L26977.0 1097.7 L26971.7 1088.3 L26977.0 1079.0 Z"></path>
+						<path d="M42294.1 1088.3 L42288.8 1097.7 L42283.4 1088.3 L42288.8 1079.0 Z"></path>
 					</g>
-					<path d="M6517.6 541.3 L26977 876 L26977 971 L26977.0 971.0 " fill="none"></path>
-					<path d="M6517.7 536.0 L6517.6 541.3 L6517.5 546.6 L6504.3 541.1 Z"></path>
-					<path d="M27070.4 1558.3 L27097.5 1607 L27097.5 2296 L27097.5 2296 L27097.5 2985 L27097.5 2985 L27442.02144772118 3156 L27442.0 3156.0 " fill="none"></path>
+					<path d="M39477.2 552.1 L42288.75 876 L42288.75 971 L42288.8 971.0 " fill="none"></path>
+					<path d="M39477.9 546.8 L39477.2 552.1 L39476.6 557.4 L39464.0 550.6 Z"></path>
+					<path d="M42304.5 1560.6 L42308.75 1607 L42308.75 2296 L42308.75 2296 L42308.75 2985 L42308.75 2985 L33047 3170.369181445014 L33047.0 3170.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27070.5 1547.6 L27070.4 1558.3 L27061.2 1552.7 L27061.3 1542.0 Z"></path>
+						<path d="M42308.9 1550.8 L42304.5 1560.6 L42298.3 1551.8 L42302.7 1542.0 Z"></path>
 					</g>
-					<path d="M27100.4 1557.0 L27137.5 1607 L27137.5 2296 L27137.5 2296 L27137.5 2985 L27137.5 2985 L12714.5 3170.4073269920045 L12714.5 3170.4 " fill="none"></path>
+					<path d="M42335.7 1560.0 L42348.75 1607 L42348.75 2296 L42348.75 2296 L42348.75 2985 L42348.75 2985 L14005.5 3170.9423680669756 L14005.5 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27099.2 1546.3 L27100.4 1557.0 L27090.6 1552.7 L27089.3 1542.0 Z"></path>
+						<path d="M42338.4 1549.6 L42335.7 1560.0 L42328.1 1552.4 L42330.7 1542.0 Z"></path>
 					</g>
-					<path d="M13965.3 1397.5 L16824 1607 L16824 2265 L16824.0 2265.0 " fill="none"></path>
-					<path d="M13965.7 1392.2 L13965.3 1397.5 L13964.9 1402.8 L13952.0 1396.5 Z"></path>
-					<path d="M33001.8 1470.2 L33001.75 1607 L14469 2293.3335841653343 L14469.0 2293.3 " fill="none"></path>
+					<path d="M20337.7 1404.2 L21751.25 1607 L22849.508345428156 2265 L22849.5 2265.0 " fill="none"></path>
+					<path d="M20338.5 1398.9 L20337.7 1404.2 L20336.9 1409.4 L20324.5 1402.3 Z"></path>
+					<path d="M31465.8 1470.2 L31465.75 1607 L17519.75 2292.4611214153233 L17519.8 2292.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33007.1 1460.8 L33001.8 1470.2 L32996.4 1460.8 L33001.8 1451.5 Z"></path>
+						<path d="M31471.1 1460.8 L31465.8 1470.2 L31460.4 1460.8 L31465.8 1451.5 Z"></path>
 					</g>
-					<path d="M29163.3 2345.7 L29163.25 2985 L14694.5 3169.611618519849 L14694.5 3169.6 " fill="none"></path>
+					<path d="M31941.5 2345.7 L31941.5 2985 L13795.5 3169.991199300317 L13795.5 3170.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29168.6 2336.3 L29163.3 2345.7 L29157.9 2336.3 L29163.3 2327.0 Z"></path>
+						<path d="M31946.8 2336.3 L31941.5 2345.7 L31936.2 2336.3 L31941.5 2327.0 Z"></path>
 					</g>
-					<path d="M33331.8 1463.2 L33331.75 1607 L14109 2294.7299209429725 L14109.0 2294.7 " fill="none"></path>
+					<path d="M31795.8 1463.2 L31795.75 1607 L14665.75 2294.5750779179166 L14665.8 2294.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33337.1 1453.8 L33331.8 1463.2 L33326.4 1453.8 L33331.8 1444.5 Z"></path>
+						<path d="M31801.1 1453.8 L31795.8 1463.2 L31790.4 1453.8 L31795.8 1444.5 Z"></path>
 					</g>
-					<path d="M17413.8 2503.2 L17306.5 2985 L31265.5 3170.496704549503 L31265.5 3170.5 " fill="none"></path>
+					<path d="M17768.3 2419.5 L16282.75 2985 L33316 3170.676985460656 L33316.0 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17421.1 2495.3 L17413.8 2503.2 L17410.7 2493.0 L17417.9 2485.0 Z"></path>
+						<path d="M17778.9 2421.2 L17768.3 2419.5 L17775.1 2411.2 L17785.8 2412.9 Z"></path>
 					</g>
-					<path d="M17441.9 2503.6 L17400 2985 L29116.75 3170.3766728171195 L29116.8 3170.4 " fill="none"></path>
+					<path d="M17768.5 2432.4 L16454.75 2985 L31225.5 3170.6078208432295 L31225.5 3170.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17448.0 2494.8 L17441.9 2503.6 L17437.4 2493.8 L17443.5 2485.0 Z"></path>
+						<path d="M17779.2 2433.7 L17768.5 2432.4 L17775.1 2423.8 L17785.8 2425.1 Z"></path>
 					</g>
-					<path d="M17454.0 2503.7 L17440 2985 L14358.5 3167.2707738661593 L14358.5 3167.3 " fill="none"></path>
+					<path d="M17768.6 2435.8 L16494.75 2985 L13027.5 3167.7317908866125 L13027.5 3167.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17459.6 2494.5 L17454.0 2503.7 L17448.9 2494.2 L17454.5 2485.0 Z"></path>
+						<path d="M17779.3 2437.0 L17768.6 2435.8 L17775.1 2427.2 L17785.8 2428.4 Z"></path>
 					</g>
-					<path d="M17494.2 2503.4 L17573.5 2985 L33102.25 3170.9491725388853 L33102.3 3170.9 " fill="none"></path>
+					<path d="M18407.6 2495.0 L19183 2985 L34511.75 3170.9420071871086 L34511.8 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17497.9 2493.3 L17494.2 2503.4 L17487.4 2495.1 L17491.1 2485.0 Z"></path>
+						<path d="M18402.6 2485.5 L18407.6 2495.0 L18396.9 2494.5 L18391.8 2485.0 Z"></path>
 					</g>
-					<path d="M17506.2 2503.2 L17613.5 2985 L12714.5 3168.3193218298557 L12714.5 3168.3 " fill="none"></path>
+					<path d="M18415.7 2492.9 L19223 2985 L14005.5 3168.510372465818 L14005.5 3168.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17509.3 2493.0 L17506.2 2503.2 L17498.9 2495.3 L17502.1 2485.0 Z"></path>
+						<path d="M18410.5 2483.5 L18415.7 2492.9 L18404.9 2492.6 L18399.8 2483.1 Z"></path>
 					</g>
-					<path d="M17518.1 2503.0 L17653.5 2985 L14883.5 3166.615398136755 L14883.5 3166.6 " fill="none"></path>
+					<path d="M18415.8 2486.2 L19263 2985 L13216.5 3169.2300686162394 L13216.5 3169.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17520.7 2492.5 L17518.1 2503.0 L17510.5 2495.4 L17513.1 2485.0 Z"></path>
+						<path d="M18410.5 2476.9 L18415.8 2486.2 L18405.1 2486.1 L18399.8 2476.8 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M7003.2 1417.7 L7107 1607 L17153 2275.5689172220614 L17153.0 2275.6 " fill="none"></path>
+						<path d="M7414.0 1417.1 L7540.75 1607 L17785.75 2275.954226686884 L17785.8 2276.0 " fill="none"></path>
 					</g>
-					<path d="M7007.8 1415.1 L7003.2 1417.7 L6998.5 1420.3 L6996.8 1406.0 Z"></path>
+					<path d="M7418.4 1414.1 L7414.0 1417.1 L7409.6 1420.1 L7406.6 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3725.5 2322.4 L4189.5 2985 L14398.5 3168.834942550932 L14398.5 3168.8 " fill="none"></path>
+						<path d="M3053.6 2315.7 L4501.75 2985 L13499.5 3168.481986168439 L13499.5 3168.5 " fill="none"></path>
 					</g>
-					<path d="M3729.9 2319.4 L3725.5 2322.4 L3721.1 2325.5 L3717.9 2311.5 Z"></path>
-					<path d="M33633.5 1548.0 L33577.5 1607 L33577.5 2280.5 L33577.5 2280.5 " fill="none"></path>
+					<path d="M3055.8 2310.8 L3053.6 2315.7 L3051.4 2320.5 L3041.5 2310.1 Z"></path>
+					<path d="M32257.5 1544.6 L32160 1607 L32160 2280.5 L32160.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33643.8 1544.9 L33633.5 1548.0 L33636.1 1537.6 L33646.4 1534.5 Z"></path>
+						<path d="M32268.2 1544.0 L32257.5 1544.6 L32262.5 1535.0 L32273.2 1534.5 Z"></path>
 					</g>
-					<path d="M34039.8 1524.7 L34197 1607 L34197 2280.5 L34197.0 2280.5 " fill="none"></path>
+					<path d="M32483.0 1553.1 L32478 1607 L32478 2280.5 L32478.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34034.0 1515.7 L34039.8 1524.7 L34029.0 1525.1 L34023.3 1516.1 Z"></path>
+						<path d="M32489.1 1544.3 L32483.0 1553.1 L32478.5 1543.3 L32484.7 1534.5 Z"></path>
 					</g>
-					<path d="M34040.3 1506.3 L34263.75 1607 L14109 2294.7885489283194 L14109.0 2294.8 " fill="none"></path>
+					<path d="M32756.3 1441.1 L33604 1607 L14665.75 2294.710876869359 L14665.8 2294.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34034.0 1497.6 L34040.3 1506.3 L34029.6 1507.3 L34023.3 1498.6 Z"></path>
+						<path d="M32748.2 1434.0 L32756.3 1441.1 L32746.1 1444.5 L32738.0 1437.5 Z"></path>
 					</g>
-					<path d="M34040.5 1497.5 L34303.75 1607 L17767 2283.4420482374767 L17767.0 2283.4 " fill="none"></path>
+					<path d="M32756.3 1439.3 L33644 1607 L18399.75 2282.398328108673 L18399.8 2282.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34033.9 1489.0 L34040.5 1497.5 L34029.8 1498.8 L34023.3 1490.3 Z"></path>
+						<path d="M32748.2 1432.3 L32756.3 1439.3 L32746.2 1442.8 L32738.0 1435.8 Z"></path>
 					</g>
-					<path d="M2853.7 3072.2 L2867 3065.5 L2874.5 3065.5 L2874.5 3065.5 L2882 3171.5 L2882 3171.5 L2874.5 3277.5 L2874.5 3277.5 L2867 3277.5 L2867 3277.5 L2837 3262.393111638955 L2837.0 3262.4 " fill="none"></path>
+					<path d="M2349.7 3072.2 L2363 3065.5 L2370.5 3065.5 L2370.5 3065.5 L2378 3171.5 L2378 3171.5 L2370.5 3277.5 L2370.5 3277.5 L2363 3277.5 L2363 3277.5 L2333 3262.393111638955 L2333.0 3262.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2842.9 3071.6 L2853.7 3072.2 L2847.7 3081.2 L2837.0 3080.6 Z"></path>
+						<path d="M2338.9 3071.6 L2349.7 3072.2 L2343.7 3081.2 L2333.0 3080.6 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3731.4 2321.1 L4376.5 2985 L2837 3151.928343023256 L2837.0 3151.9 " fill="none"></path>
+						<path d="M3053.8 2313.6 L4688.75 2985 L2333 3158.227156234598 L2333.0 3158.2 " fill="none"></path>
 					</g>
-					<path d="M3735.2 2317.3 L3731.4 2321.1 L3727.5 2324.8 L3722.1 2311.5 Z"></path>
-					<path d="M30465.3 2412.6 L30320.75 2985 L39165.25 3170.8590704225353 L39165.3 3170.9 " fill="none"></path>
+					<path d="M3055.9 2308.7 L3053.8 2313.6 L3051.8 2318.5 L3041.5 2308.5 Z"></path>
+					<path d="M33815.2 2411.8 L33587.25 2985 L40709.25 3170.7047186298496 L40709.3 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30472.8 2404.9 L30465.3 2412.6 L30462.4 2402.2 L30469.9 2394.5 Z"></path>
+						<path d="M33823.6 2405.1 L33815.2 2411.8 L33813.7 2401.2 L33822.1 2394.5 Z"></path>
 					</g>
-					<path d="M30525.9 2412.5 L30679 2985 L30679 3156 L30679.0 3156.0 " fill="none"></path>
+					<path d="M33861.3 2413.2 L33861.25 2985 L32473.5 3157.0560910752865 L32473.5 3157.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30528.7 2402.1 L30525.9 2412.5 L30518.3 2404.9 L30521.1 2394.5 Z"></path>
+						<path d="M33866.6 2403.8 L33861.3 2413.2 L33855.9 2403.8 L33861.3 2394.5 Z"></path>
 					</g>
-					<path d="M30566.9 2410.3 L30930 2985 L30930 3156 L30930.0 3156.0 " fill="none"></path>
+					<path d="M33910.6 2411.7 L34155.25 2985 L33262.42828418231 3156 L33262.4 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30566.5 2399.5 L30566.9 2410.3 L30557.4 2405.2 L30557.0 2394.5 Z"></path>
+						<path d="M33911.8 2401.0 L33910.6 2411.7 L33902.0 2405.2 L33903.3 2394.5 Z"></path>
 					</g>
-					<path d="M14776.0 1035.3 L15972.75 1174 L18727.25 1383.1352796773629 L18727.3 1383.1 " fill="none"></path>
-					<path d="M14776.6 1030.0 L14776.0 1035.3 L14775.4 1040.6 L14762.8 1033.8 Z"></path>
+					<path d="M17948.3 1028.9 L21314 1174 L24367.75 1383.834761564707 L24367.8 1383.8 " fill="none"></path>
+					<path d="M17948.6 1023.5 L17948.3 1028.9 L17948.1 1034.2 L17935.0 1028.3 Z"></path>
 					<g data-name="IAppDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
-							<rect x="33546.5" y="60.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
-							<path d="M33546.5 91.5 L33743.5 91.5" fill="none" data-name="IAppDelegate"></path>
+							<rect x="25469.5" y="60.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
+							<path d="M25469.5 91.5 L25666.5 91.5" fill="none" data-name="IAppDelegate"></path>
 						</g>
-						<g transform="translate(33546.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
+						<g transform="translate(25469.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
 								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33546.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
+						<g transform="translate(25469.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
 								
@@ -3727,17 +3680,17 @@
 					</g>
 					<g data-name="AppController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
-							<rect x="33783.5" y="22.5" height="138.0" width="301.0" data-name="AppController"></rect>
-							<path d="M33783.5 53.5 L34084.5 53.5" fill="none" data-name="AppController"></path>
-							<path d="M33783.5 114.5 L34084.5 114.5" fill="none" data-name="AppController"></path>
+							<rect x="25706.5" y="22.5" height="138.0" width="301.0" data-name="AppController"></rect>
+							<path d="M25706.5 53.5 L26007.5 53.5" fill="none" data-name="AppController"></path>
+							<path d="M25706.5 114.5 L26007.5 114.5" fill="none" data-name="AppController"></path>
 						</g>
-						<g transform="translate(33783.5, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
+						<g transform="translate(25706.5, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
 								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33783.5, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+						<g transform="translate(25706.5, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
@@ -3745,7 +3698,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(33783.5, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+						<g transform="translate(25706.5, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
@@ -3753,84 +3706,18 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="ParticipantDetailsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsFormView">
-							<rect x="0.0" y="1344.0" height="93.0" width="419.0" data-name="ParticipantDetailsFormView"></rect>
-							<path d="M0.0 1375.0 L419.0 1375.0" fill="none" data-name="ParticipantDetailsFormView"></path>
-							<path d="M0.0 1406.0 L419.0 1406.0" fill="none" data-name="ParticipantDetailsFormView"></path>
-						</g>
-						<g transform="translate(0, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsFormView">
-								<text x="201.5" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsFormView">ParticipantDetailsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormView">+formViewModel: ParticipantDetailsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ParticipantDetailsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsFormViewModel">
-							<rect x="15575.0" y="2212.0" height="168.0" width="354.0" data-name="ParticipantDetailsFormViewModel"></rect>
-							<path d="M15575.0 2243.0 L15929.0 2243.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
-							<path d="M15575.0 2319.0 L15929.0 2319.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
-						</g>
-						<g transform="translate(15575, 2212)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsFormViewModel">
-								<text x="169.0" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsFormViewModel">ParticipantDetailsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15575, 2243)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+participantIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+rawDataControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15575, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+void initControls()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+StudyMonitorItem buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+void setControlsFrom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="6312.3" y="524.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
-						</g>
-						<g transform="translate(6312.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
 					<g data-name="StudyMonitorScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="12979.0" y="2242.5" height="107.0" width="280.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M12979.0 2273.5 L13259.0 2273.5" fill="none" data-name="StudyMonitorScreen"></path>
+							<rect x="18901.3" y="2242.5" height="107.0" width="280.0" data-name="StudyMonitorScreen"></rect>
+							<path d="M18901.3 2273.5 L19181.3 2273.5" fill="none" data-name="StudyMonitorScreen"></path>
 						</g>
-						<g transform="translate(12979, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
+						<g transform="translate(18901.25, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
 								<text x="132.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12979, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
+						<g transform="translate(18901.25, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorScreen">-Widget _monitorSectionHeader()</text>
@@ -3842,96 +3729,49 @@
 					</g>
 					<g data-name="StudyPageWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="13788.0" y="1344.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
-							<path d="M13788.0 1375.0 L13952.0 1375.0" fill="none" data-name="StudyPageWidget"></path>
-							<path d="M13788.0 1406.0 L13952.0 1406.0" fill="none" data-name="StudyPageWidget"></path>
+							<rect x="20160.5" y="1344.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
+							<path d="M20160.5 1375.0 L20324.5 1375.0" fill="none" data-name="StudyPageWidget"></path>
+							<path d="M20160.5 1406.0 L20324.5 1406.0" fill="none" data-name="StudyPageWidget"></path>
 						</g>
-						<g transform="translate(13788, 1344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
+						<g transform="translate(20160.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
 								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13788, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+						<g transform="translate(20160.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13788, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+						<g transform="translate(20160.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyMonitorItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorItem">
-							<rect x="34498.0" y="410.5" height="258.0" width="371.0" data-name="StudyMonitorItem"></rect>
-							<path d="M34498.0 441.5 L34869.0 441.5" fill="none" data-name="StudyMonitorItem"></path>
-							<path d="M34498.0 637.5 L34869.0 637.5" fill="none" data-name="StudyMonitorItem"></path>
-						</g>
-						<g transform="translate(34498, 410.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorItem">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorItem">StudyMonitorItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34498, 441.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">+participantId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorItem">+inviteCode: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorItem">+enrolledAt: DateTime</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorItem">+lastActivityAt: DateTime</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyMonitorItem">+currentDayOfStudy: int</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyMonitorItem">+studyDurationInDays: int</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyMonitorItem">+completedInterventions: int</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyMonitorItem">+missedInterventions: int</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyMonitorItem">+completedSurveys: int</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyMonitorItem">+missedSurveys: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyMonitorItem">+rawData: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyMonitorItem">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34498, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">&lt;static&gt;+List&lt;StudyMonitorItem&gt; fromStudy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="34956.0" y="76.0" height="31.0" width="96.0" data-name="Equatable"></rect>
-						</g>
-						<g transform="translate(34956, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
-								
-							</g>
-						</g>
-					</g>
 					<g data-name="StudyMonitorTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorTable">
-							<rect x="34124.5" y="15.0" height="153.0" width="395.0" data-name="StudyMonitorTable"></rect>
-							<path d="M34124.5 46.0 L34519.5 46.0" fill="none" data-name="StudyMonitorTable"></path>
-							<path d="M34124.5 92.0 L34519.5 92.0" fill="none" data-name="StudyMonitorTable"></path>
+							<rect x="26047.5" y="15.0" height="153.0" width="395.0" data-name="StudyMonitorTable"></rect>
+							<path d="M26047.5 46.0 L26442.5 46.0" fill="none" data-name="StudyMonitorTable"></path>
+							<path d="M26047.5 92.0 L26442.5 92.0" fill="none" data-name="StudyMonitorTable"></path>
 						</g>
-						<g transform="translate(34124.5, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorTable">
+						<g transform="translate(26047.5, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorTable">
 								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorTable">StudyMonitorTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34124.5, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
+						<g transform="translate(26047.5, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+studyMonitorItems: List&lt;StudyMonitorItem&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">+onSelectItem: void Function(StudyMonitorItem)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34124.5, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
+						<g transform="translate(26047.5, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">-List&lt;Widget&gt; _buildRow()</text>
@@ -3943,117 +3783,74 @@
 					</g>
 					<g data-name="void Function(StudyMonitorItem)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyMonitorItem)">
-							<rect x="34186.0" y="524.0" height="31.0" width="272.0" data-name="void Function(StudyMonitorItem)"></rect>
+							<rect x="26109.0" y="524.0" height="31.0" width="272.0" data-name="void Function(StudyMonitorItem)"></rect>
 						</g>
-						<g transform="translate(34186, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyMonitorItem)">
+						<g transform="translate(26109, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyMonitorItem)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyMonitorItem)">
 								<text x="128.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyMonitorItem)">void Function(StudyMonitorItem)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="27416.8" y="3156.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+					<g data-name="ParticipantDetailsView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsView">
+							<rect x="26482.5" y="15.0" height="153.0" width="282.0" data-name="ParticipantDetailsView"></rect>
+							<path d="M26482.5 46.0 L26764.5 46.0" fill="none" data-name="ParticipantDetailsView"></path>
+							<path d="M26482.5 107.0 L26764.5 107.0" fill="none" data-name="ParticipantDetailsView"></path>
 						</g>
-						<g transform="translate(27416.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+						<g transform="translate(26482.5, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsView">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsView">ParticipantDetailsView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="34918.3" y="3156.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(34918.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+						<g transform="translate(26482.5, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsView">+monitorItem: StudyMonitorItem</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsView">+interventions: List&lt;Intervention&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsView">+observations: List&lt;Observation&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="42910.3" y="223.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
-							<path d="M42910.3 254.0 L43782.3 254.0" fill="none" data-name="FormViewModel"></path>
-							<path d="M42910.3 570.0 L43782.3 570.0" fill="none" data-name="FormViewModel"></path>
-						</g>
-						<g transform="translate(42910.25, 223)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+						<g transform="translate(26482.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsView">-Widget _buildPerDayStatus()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsView">-String _getTooltipText()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42910.25, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								
-							</g>
+					</g>
+					<g data-name="StudyMonitorItem">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorItem">
+							<rect x="26546.5" y="524.0" height="31.0" width="154.0" data-name="StudyMonitorItem"></rect>
 						</g>
-						<g transform="translate(42910.25, 570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
+						<g transform="translate(26546.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorItem">
+								<text x="69.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorItem">StudyMonitorItem</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="LoginForm">
 						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
-							<rect x="778.8" y="2249.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
-							<path d="M778.8 2280.5 L985.8 2280.5" fill="none" data-name="LoginForm"></path>
-							<path d="M778.8 2311.5 L985.8 2311.5" fill="none" data-name="LoginForm"></path>
+							<rect x="0.0" y="2249.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
+							<path d="M0.0 2280.5 L207.0 2280.5" fill="none" data-name="LoginForm"></path>
+							<path d="M0.0 2311.5 L207.0 2311.5" fill="none" data-name="LoginForm"></path>
 						</g>
-						<g transform="translate(778.75, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
+						<g transform="translate(0, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
 								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(778.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+						<g transform="translate(0, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(778.75, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+						<g transform="translate(0, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
 								
@@ -4062,16 +3859,16 @@
 					</g>
 					<g data-name="AuthFormKey">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
-							<rect x="2927.0" y="3088.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
-							<path d="M2927.0 3119.0 L3282.0 3119.0" fill="none" data-name="AuthFormKey"></path>
+							<rect x="1100.0" y="3088.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
+							<path d="M1100.0 3119.0 L1455.0 3119.0" fill="none" data-name="AuthFormKey"></path>
 						</g>
-						<g transform="translate(2927, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
+						<g transform="translate(1100, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
 								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2927, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
+						<g transform="translate(1100, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
@@ -4087,9 +3884,9 @@
 					</g>
 					<g data-name="FormConsumerRefWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="1020.3" y="1375.0" height="31.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
+							<rect x="690.8" y="1375.0" height="31.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
 						</g>
-						<g transform="translate(1020.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
+						<g transform="translate(690.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
 								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
 								
@@ -4098,23 +3895,23 @@
 					</g>
 					<g data-name="PasswordRecoveryForm">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
-							<rect x="1025.8" y="2249.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
-							<path d="M1025.8 2280.5 L1233.8 2280.5" fill="none" data-name="PasswordRecoveryForm"></path>
-							<path d="M1025.8 2311.5 L1233.8 2311.5" fill="none" data-name="PasswordRecoveryForm"></path>
+							<rect x="572.5" y="2249.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
+							<path d="M572.5 2280.5 L780.5 2280.5" fill="none" data-name="PasswordRecoveryForm"></path>
+							<path d="M572.5 2311.5 L780.5 2311.5" fill="none" data-name="PasswordRecoveryForm"></path>
 						</g>
-						<g transform="translate(1025.75, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
+						<g transform="translate(572.5, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
 								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1025.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+						<g transform="translate(572.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1025.75, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+						<g transform="translate(572.5, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
 								
@@ -4123,23 +3920,23 @@
 					</g>
 					<g data-name="PasswordForgotForm">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
-							<rect x="1273.8" y="2249.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
-							<path d="M1273.8 2280.5 L1480.8 2280.5" fill="none" data-name="PasswordForgotForm"></path>
-							<path d="M1273.8 2311.5 L1480.8 2311.5" fill="none" data-name="PasswordForgotForm"></path>
+							<rect x="820.5" y="2249.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
+							<path d="M820.5 2280.5 L1027.5 2280.5" fill="none" data-name="PasswordForgotForm"></path>
+							<path d="M820.5 2311.5 L1027.5 2311.5" fill="none" data-name="PasswordForgotForm"></path>
 						</g>
-						<g transform="translate(1273.75, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
+						<g transform="translate(820.5, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
 								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1273.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+						<g transform="translate(820.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1273.75, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+						<g transform="translate(820.5, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
 								
@@ -4148,23 +3945,23 @@
 					</g>
 					<g data-name="SignupForm">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
-							<rect x="1520.8" y="2234.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
-							<path d="M1520.8 2265.5 L1798.8 2265.5" fill="none" data-name="SignupForm"></path>
-							<path d="M1520.8 2296.5 L1798.8 2296.5" fill="none" data-name="SignupForm"></path>
+							<rect x="1067.5" y="2234.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
+							<path d="M1067.5 2265.5 L1345.5 2265.5" fill="none" data-name="SignupForm"></path>
+							<path d="M1067.5 2296.5 L1345.5 2296.5" fill="none" data-name="SignupForm"></path>
 						</g>
-						<g transform="translate(1520.75, 2234.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
+						<g transform="translate(1067.5, 2234.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
 								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1520.75, 2265.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+						<g transform="translate(1067.5, 2265.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1520.75, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+						<g transform="translate(1067.5, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
@@ -4175,16 +3972,16 @@
 					</g>
 					<g data-name="AuthScaffold">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
-							<rect x="1639.8" y="1329.5" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
-							<path d="M1639.8 1360.5 L1898.8 1360.5" fill="none" data-name="AuthScaffold"></path>
+							<rect x="1256.0" y="1329.5" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
+							<path d="M1256.0 1360.5 L1515.0 1360.5" fill="none" data-name="AuthScaffold"></path>
 						</g>
-						<g transform="translate(1639.75, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
+						<g transform="translate(1256, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
 								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1639.75, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
+						<g transform="translate(1256, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
@@ -4197,9 +3994,9 @@
 					</g>
 					<g data-name="Widget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="14038.0" y="2280.5" height="31.0" width="71.0" data-name="Widget"></rect>
+							<rect x="14594.8" y="2280.5" height="31.0" width="71.0" data-name="Widget"></rect>
 						</g>
-						<g transform="translate(14038, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
+						<g transform="translate(14594.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
 								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
 								
@@ -4208,9 +4005,9 @@
 					</g>
 					<g data-name="EdgeInsets">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="3531.5" y="2280.5" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
+							<rect x="3931.8" y="2280.5" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
 						</g>
-						<g transform="translate(3531.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
+						<g transform="translate(3931.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
 								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
 								
@@ -4219,16 +4016,16 @@
 					</g>
 					<g data-name="EmailTextField">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
-							<rect x="2651.5" y="2242.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
-							<path d="M2651.5 2273.5 L2972.5 2273.5" fill="none" data-name="EmailTextField"></path>
+							<rect x="1689.5" y="2242.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
+							<path d="M1689.5 2273.5 L2010.5 2273.5" fill="none" data-name="EmailTextField"></path>
 						</g>
-						<g transform="translate(2651.5, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
+						<g transform="translate(1689.5, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
 								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2651.5, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
+						<g transform="translate(1689.5, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
 								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
@@ -4238,18 +4035,29 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="32934.0" y="3156.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+						</g>
+						<g transform="translate(32934, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="PasswordTextField">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
-							<rect x="3012.5" y="2235.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
-							<path d="M3012.5 2266.0 L3491.5 2266.0" fill="none" data-name="PasswordTextField"></path>
+							<rect x="2050.5" y="2235.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
+							<path d="M2050.5 2266.0 L2529.5 2266.0" fill="none" data-name="PasswordTextField"></path>
 						</g>
-						<g transform="translate(3012.5, 2235)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
+						<g transform="translate(2050.5, 2235)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3012.5, 2266)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
+						<g transform="translate(2050.5, 2266)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
@@ -4262,9 +4070,9 @@
 					</g>
 					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<rect x="1219.8" y="3156.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
+							<rect x="270.8" y="3156.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
 						</g>
-						<g transform="translate(1219.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+						<g transform="translate(270.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
 								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
 								
@@ -4273,16 +4081,16 @@
 					</g>
 					<g data-name="StudyUJobsToBeDone">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
-							<rect x="35092.0" y="60.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
-							<path d="M35092.0 91.5 L35286.0 91.5" fill="none" data-name="StudyUJobsToBeDone"></path>
+							<rect x="26846.5" y="60.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
+							<path d="M26846.5 91.5 L27040.5 91.5" fill="none" data-name="StudyUJobsToBeDone"></path>
 						</g>
-						<g transform="translate(35092, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
+						<g transform="translate(26846.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
 								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35092, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
+						<g transform="translate(26846.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
 								
@@ -4291,17 +4099,17 @@
 					</g>
 					<g data-name="AuthFormController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
-							<rect x="41218.8" y="2039.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
-							<path d="M41218.8 2070.5 L42068.8 2070.5" fill="none" data-name="AuthFormController"></path>
-							<path d="M41218.8 2326.5 L42068.8 2326.5" fill="none" data-name="AuthFormController"></path>
+							<rect x="35940.0" y="2039.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
+							<path d="M35940.0 2070.5 L36790.0 2070.5" fill="none" data-name="AuthFormController"></path>
+							<path d="M35940.0 2326.5 L36790.0 2326.5" fill="none" data-name="AuthFormController"></path>
 						</g>
-						<g transform="translate(41218.75, 2039.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
+						<g transform="translate(35940, 2039.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
 								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41218.75, 2070.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+						<g transform="translate(35940, 2070.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
@@ -4322,7 +4130,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(41218.75, 2326.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+						<g transform="translate(35940, 2326.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
@@ -4344,9 +4152,9 @@
 					</g>
 					<g data-name="IAuthRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="29116.8" y="3156.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
+							<rect x="31225.5" y="3156.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
 						</g>
-						<g transform="translate(29116.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
+						<g transform="translate(31225.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
 								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
 								
@@ -4355,9 +4163,9 @@
 					</g>
 					<g data-name="INotificationService">
 						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="27208.8" y="3156.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
+							<rect x="16369.5" y="3156.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
 						</g>
-						<g transform="translate(27208.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
+						<g transform="translate(16369.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
 								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
 								
@@ -4366,27 +4174,38 @@
 					</g>
 					<g data-name="GoRouter">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="33102.3" y="3156.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
+							<rect x="34511.8" y="3156.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
 						</g>
-						<g transform="translate(33102.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
+						<g transform="translate(34511.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
 								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
 								
 							</g>
 						</g>
 					</g>
+					<g data-name="FormGroup">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
+							<rect x="39422.8" y="3156.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
+						</g>
+						<g transform="translate(39422.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="IFormGroupController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="42647.5" y="60.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
-							<path d="M42647.5 91.5 L42834.5 91.5" fill="none" data-name="IFormGroupController"></path>
+							<rect x="38464.0" y="60.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
+							<path d="M38464.0 91.5 L38651.0 91.5" fill="none" data-name="IFormGroupController"></path>
 						</g>
-						<g transform="translate(42647.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
+						<g transform="translate(38464, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
 								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42647.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
+						<g transform="translate(38464, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
 								
@@ -4395,9 +4214,9 @@
 					</g>
 					<g data-name="Enum">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="3676.5" y="2280.5" height="31.0" width="61.0" data-name="Enum"></rect>
+							<rect x="2980.5" y="2280.5" height="31.0" width="61.0" data-name="Enum"></rect>
 						</g>
-						<g transform="translate(3676.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+						<g transform="translate(2980.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
 								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
@@ -4406,16 +4225,16 @@
 					</g>
 					<g data-name="AppStatus">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
-							<rect x="1680.0" y="3118.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
-							<path d="M1680.0 3149.0 L1959.0 3149.0" fill="none" data-name="AppStatus"></path>
+							<rect x="731.0" y="3118.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
+							<path d="M731.0 3149.0 L1010.0 3149.0" fill="none" data-name="AppStatus"></path>
 						</g>
-						<g transform="translate(1680, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
+						<g transform="translate(731, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
 								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1680, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
+						<g transform="translate(731, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
@@ -4427,17 +4246,17 @@
 					</g>
 					<g data-name="FormArrayTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
-							<rect x="2016.3" y="1194.0" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
-							<path d="M2016.3 1225.0 L2506.3 1225.0" fill="none" data-name="FormArrayTable"></path>
-							<path d="M2016.3 1526.0 L2506.3 1526.0" fill="none" data-name="FormArrayTable"></path>
+							<rect x="2601.5" y="1194.0" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
+							<path d="M2601.5 1225.0 L3091.5 1225.0" fill="none" data-name="FormArrayTable"></path>
+							<path d="M2601.5 1526.0 L3091.5 1526.0" fill="none" data-name="FormArrayTable"></path>
 						</g>
-						<g transform="translate(2016.25, 1194)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
+						<g transform="translate(2601.5, 1194)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
 								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2016.25, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+						<g transform="translate(2601.5, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
@@ -4461,7 +4280,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(2016.25, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+						<g transform="translate(2601.5, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
@@ -4472,9 +4291,9 @@
 					</g>
 					<g data-name="AbstractControl">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="3897.8" y="3156.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+							<rect x="10406.3" y="3156.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
 						</g>
-						<g transform="translate(3897.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+						<g transform="translate(10406.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
 								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
@@ -4483,9 +4302,9 @@
 					</g>
 					<g data-name="void Function(T)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="2056.5" y="2280.5" height="31.0" width="144.0" data-name="void Function(T)"></rect>
+							<rect x="1505.5" y="2280.5" height="31.0" width="144.0" data-name="void Function(T)"></rect>
 						</g>
-						<g transform="translate(2056.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
+						<g transform="translate(1505.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
 								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
 								
@@ -4494,9 +4313,9 @@
 					</g>
 					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<rect x="2240.5" y="2280.5" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
+							<rect x="2569.5" y="2280.5" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
 						</g>
-						<g transform="translate(2240.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+						<g transform="translate(2569.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
 								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
 								
@@ -4505,9 +4324,9 @@
 					</g>
 					<g data-name="void Function()?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="14325.0" y="2280.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
+							<rect x="17375.8" y="2280.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
 						</g>
-						<g transform="translate(14325, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
+						<g transform="translate(17375.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
 								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
 								
@@ -4516,9 +4335,9 @@
 					</g>
 					<g data-name="String Function(T)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
-							<rect x="3924.8" y="2280.5" height="31.0" width="157.0" data-name="String Function(T)"></rect>
+							<rect x="4076.8" y="2280.5" height="31.0" width="157.0" data-name="String Function(T)"></rect>
 						</g>
-						<g transform="translate(3924.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
+						<g transform="translate(4076.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
 								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
 								
@@ -4527,9 +4346,9 @@
 					</g>
 					<g data-name="IconData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="15448.0" y="2280.5" height="31.0" width="87.0" data-name="IconData"></rect>
+							<rect x="16444.0" y="2280.5" height="31.0" width="87.0" data-name="IconData"></rect>
 						</g>
-						<g transform="translate(15448, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
+						<g transform="translate(16444, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
 								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
 								
@@ -4538,9 +4357,9 @@
 					</g>
 					<g data-name="Widget Function(BuildContext, T, int)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
-							<rect x="4121.8" y="2280.5" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
+							<rect x="4273.8" y="2280.5" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
 						</g>
-						<g transform="translate(4121.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
+						<g transform="translate(4273.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
 								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
 								
@@ -4549,27 +4368,88 @@
 					</g>
 					<g data-name="ManagedFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="42406.8" y="1359.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
-							<path d="M42406.8 1390.5 L42802.8 1390.5" fill="none" data-name="ManagedFormViewModel"></path>
+							<rect x="42628.0" y="1359.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
+							<path d="M42628.0 1390.5 L43024.0 1390.5" fill="none" data-name="ManagedFormViewModel"></path>
 						</g>
-						<g transform="translate(42406.75, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+						<g transform="translate(42628, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
 								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42406.75, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
+						<g transform="translate(42628, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
+					<g data-name="FormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
+							<rect x="43779.0" y="223.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
+							<path d="M43779.0 254.0 L44651.0 254.0" fill="none" data-name="FormViewModel"></path>
+							<path d="M43779.0 570.0 L44651.0 570.0" fill="none" data-name="FormViewModel"></path>
+						</g>
+						<g transform="translate(43779, 223)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
+								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(43779, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(43779, 570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="FormViewModelNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
-							<rect x="35139.0" y="524.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
+							<rect x="26740.5" y="524.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
 						</g>
-						<g transform="translate(35139, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
+						<g transform="translate(26740.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
 								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
 								
@@ -4578,9 +4458,9 @@
 					</g>
 					<g data-name="Exception">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="35836.8" y="76.0" height="31.0" width="94.0" data-name="Exception"></rect>
+							<rect x="27122.5" y="76.0" height="31.0" width="94.0" data-name="Exception"></rect>
 						</g>
-						<g transform="translate(35836.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
+						<g transform="translate(27122.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
 								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
 								
@@ -4589,17 +4469,17 @@
 					</g>
 					<g data-name="FormViewModelCollection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="39008.3" y="3378.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
-							<path d="M39008.3 3409.0 L39289.3 3409.0" fill="none" data-name="FormViewModelCollection"></path>
-							<path d="M39008.3 3500.0 L39289.3 3500.0" fill="none" data-name="FormViewModelCollection"></path>
+							<rect x="39787.8" y="3378.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
+							<path d="M39787.8 3409.0 L40068.8 3409.0" fill="none" data-name="FormViewModelCollection"></path>
+							<path d="M39787.8 3500.0 L40068.8 3500.0" fill="none" data-name="FormViewModelCollection"></path>
 						</g>
-						<g transform="translate(39008.25, 3378)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
+						<g transform="translate(39787.75, 3378)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
 								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39008.25, 3409)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+						<g transform="translate(39787.75, 3409)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
@@ -4609,7 +4489,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(39008.25, 3500)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+						<g transform="translate(39787.75, 3500)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
@@ -4626,9 +4506,9 @@
 					</g>
 					<g data-name="FormArray">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="37236.5" y="3691.0" height="31.0" width="98.0" data-name="FormArray"></rect>
+							<rect x="38775.3" y="3691.0" height="31.0" width="98.0" data-name="FormArray"></rect>
 						</g>
-						<g transform="translate(37236.5, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+						<g transform="translate(38775.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
 								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
 								
@@ -4637,17 +4517,17 @@
 					</g>
 					<g data-name="CustomFormControl">
 						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
-							<rect x="27266.8" y="3430.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
-							<path d="M27266.8 3461.5 L27679.8 3461.5" fill="none" data-name="CustomFormControl"></path>
-							<path d="M27266.8 3567.5 L27679.8 3567.5" fill="none" data-name="CustomFormControl"></path>
+							<rect x="32784.0" y="3430.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
+							<path d="M32784.0 3461.5 L33197.0 3461.5" fill="none" data-name="CustomFormControl"></path>
+							<path d="M32784.0 3567.5 L33197.0 3567.5" fill="none" data-name="CustomFormControl"></path>
 						</g>
-						<g transform="translate(27266.75, 3430.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
+						<g transform="translate(32784, 3430.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
 								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27266.75, 3461.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+						<g transform="translate(32784, 3461.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
 								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
@@ -4658,7 +4538,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(27266.75, 3567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+						<g transform="translate(32784, 3567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
 								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
 								
@@ -4667,9 +4547,9 @@
 					</g>
 					<g data-name="Debouncer">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="41307.5" y="3691.0" height="31.0" width="103.0" data-name="Debouncer"></rect>
+							<rect x="41566.5" y="3691.0" height="31.0" width="103.0" data-name="Debouncer"></rect>
 						</g>
-						<g transform="translate(41307.5, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
+						<g transform="translate(41566.5, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
 								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
 								
@@ -4678,9 +4558,9 @@
 					</g>
 					<g data-name="void Function(T?)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
-							<rect x="27703.8" y="3691.0" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
+							<rect x="31666.3" y="3691.0" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
 						</g>
-						<g transform="translate(27703.75, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
+						<g transform="translate(31666.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
 								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
 								
@@ -4689,9 +4569,9 @@
 					</g>
 					<g data-name="void Function(ControlStatus)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
-							<rect x="27907.8" y="3691.0" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
+							<rect x="31870.3" y="3691.0" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
 						</g>
-						<g transform="translate(27907.75, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
+						<g transform="translate(31870.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
 								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
 								
@@ -4700,16 +4580,16 @@
 					</g>
 					<g data-name="UnsavedChangesDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
-							<rect x="43203.8" y="60.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
-							<path d="M43203.8 91.5 L43410.8 91.5" fill="none" data-name="UnsavedChangesDialog"></path>
+							<rect x="44285.0" y="60.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
+							<path d="M44285.0 91.5 L44492.0 91.5" fill="none" data-name="UnsavedChangesDialog"></path>
 						</g>
-						<g transform="translate(43203.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
+						<g transform="translate(44285, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
 								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43203.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
+						<g transform="translate(44285, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
 								
@@ -4718,9 +4598,9 @@
 					</g>
 					<g data-name="FormValidationSetEnum">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
-							<rect x="42883.8" y="1009.5" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
+							<rect x="43429.0" y="1009.5" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
 						</g>
-						<g transform="translate(42883.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
+						<g transform="translate(43429, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
 								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
 								
@@ -4729,17 +4609,17 @@
 					</g>
 					<g data-name="FormControlValidation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
-							<rect x="5209.8" y="2227.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
-							<path d="M5209.8 2258.0 L5694.8 2258.0" fill="none" data-name="FormControlValidation"></path>
-							<path d="M5209.8 2334.0 L5694.8 2334.0" fill="none" data-name="FormControlValidation"></path>
+							<rect x="5321.8" y="2227.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
+							<path d="M5321.8 2258.0 L5806.8 2258.0" fill="none" data-name="FormControlValidation"></path>
+							<path d="M5321.8 2334.0 L5806.8 2334.0" fill="none" data-name="FormControlValidation"></path>
 						</g>
-						<g transform="translate(5209.75, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
+						<g transform="translate(5321.75, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
 								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5209.75, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+						<g transform="translate(5321.75, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
@@ -4748,7 +4628,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(5209.75, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+						<g transform="translate(5321.75, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
 								
@@ -4757,23 +4637,23 @@
 					</g>
 					<g data-name="IFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="35475.0" y="493.0" height="93.0" width="163.0" data-name="IFormData"></rect>
-							<path d="M35475.0 524.0 L35638.0 524.0" fill="none" data-name="IFormData"></path>
-							<path d="M35475.0 555.0 L35638.0 555.0" fill="none" data-name="IFormData"></path>
+							<rect x="27302.5" y="493.0" height="93.0" width="163.0" data-name="IFormData"></rect>
+							<path d="M27302.5 524.0 L27465.5 524.0" fill="none" data-name="IFormData"></path>
+							<path d="M27302.5 555.0 L27465.5 555.0" fill="none" data-name="IFormData"></path>
 						</g>
-						<g transform="translate(35475, 493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
+						<g transform="translate(27302.5, 493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
 								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35475, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+						<g transform="translate(27302.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35475, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+						<g transform="translate(27302.5, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
 								
@@ -4782,9 +4662,9 @@
 					</g>
 					<g data-name="FormInvalidException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
-							<rect x="40101.0" y="524.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
+							<rect x="27076.5" y="524.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
 						</g>
-						<g transform="translate(40101, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
+						<g transform="translate(27076.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
 								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
 								
@@ -4793,16 +4673,16 @@
 					</g>
 					<g data-name="FormConfigException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
-							<rect x="40327.0" y="508.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
-							<path d="M40327.0 539.5 L40512.0 539.5" fill="none" data-name="FormConfigException"></path>
+							<rect x="35104.3" y="508.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
+							<path d="M35104.3 539.5 L35289.3 539.5" fill="none" data-name="FormConfigException"></path>
 						</g>
-						<g transform="translate(40327, 508.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
+						<g transform="translate(35104.25, 508.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
 								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40327, 539.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
+						<g transform="translate(35104.25, 539.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
 								
@@ -4811,16 +4691,16 @@
 					</g>
 					<g data-name="IFormViewModelDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="43442.0" y="986.5" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-							<path d="M43442.0 1017.5 L43659.0 1017.5" fill="none" data-name="IFormViewModelDelegate"></path>
+							<rect x="43987.3" y="986.5" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
+							<path d="M43987.3 1017.5 L44204.3 1017.5" fill="none" data-name="IFormViewModelDelegate"></path>
 						</g>
-						<g transform="translate(43442, 986.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
+						<g transform="translate(43987.25, 986.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
 								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43442, 1017.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
+						<g transform="translate(43987.25, 1017.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
@@ -4830,16 +4710,16 @@
 					</g>
 					<g data-name="FormControlOption">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
-							<rect x="34909.0" y="486.0" height="107.0" width="190.0" data-name="FormControlOption"></rect>
-							<path d="M34909.0 517.0 L35099.0 517.0" fill="none" data-name="FormControlOption"></path>
+							<rect x="44691.0" y="486.0" height="107.0" width="190.0" data-name="FormControlOption"></rect>
+							<path d="M44691.0 517.0 L44881.0 517.0" fill="none" data-name="FormControlOption"></path>
 						</g>
-						<g transform="translate(34909, 486)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
+						<g transform="translate(44691, 486)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
 								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34909, 517)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
+						<g transform="translate(44691, 517)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
@@ -4849,18 +4729,29 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="Equatable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
+							<rect x="44738.0" y="76.0" height="31.0" width="96.0" data-name="Equatable"></rect>
+						</g>
+						<g transform="translate(44738, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
+								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="FormMode">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
-							<rect x="26836.8" y="3110.5" height="122.0" width="282.0" data-name="FormMode"></rect>
-							<path d="M26836.8 3141.5 L27118.8 3141.5" fill="none" data-name="FormMode"></path>
+							<rect x="28606.3" y="3110.5" height="122.0" width="282.0" data-name="FormMode"></rect>
+							<path d="M28606.3 3141.5 L28888.3 3141.5" fill="none" data-name="FormMode"></path>
 						</g>
-						<g transform="translate(26836.75, 3110.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
+						<g transform="translate(28606.25, 3110.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
 								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26836.75, 3141.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
+						<g transform="translate(28606.25, 3141.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
@@ -4873,9 +4764,9 @@
 					</g>
 					<g data-name="CancelableOperation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="44105.5" y="1009.5" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
+							<rect x="44355.8" y="1009.5" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
 						</g>
-						<g transform="translate(44105.5, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
+						<g transform="translate(44355.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
 								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
 								
@@ -4884,23 +4775,23 @@
 					</g>
 					<g data-name="EnrolledBadge">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="43450.8" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M43450.8 76.0 L43616.8 76.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M43450.8 107.0 L43616.8 107.0" fill="none" data-name="EnrolledBadge"></path>
+							<rect x="44874.0" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
+							<path d="M44874.0 76.0 L45040.0 76.0" fill="none" data-name="EnrolledBadge"></path>
+							<path d="M44874.0 107.0 L45040.0 107.0" fill="none" data-name="EnrolledBadge"></path>
 						</g>
-						<g transform="translate(43450.75, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
+						<g transform="translate(44874, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
 								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43450.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+						<g transform="translate(44874, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43450.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+						<g transform="translate(44874, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
 								
@@ -4909,24 +4800,24 @@
 					</g>
 					<g data-name="StudyRecruitController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="5774.8" y="2204.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M5774.8 2235.5 L6425.8 2235.5" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M5774.8 2281.5 L6425.8 2281.5" fill="none" data-name="StudyRecruitController"></path>
+							<rect x="5846.8" y="2204.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
+							<path d="M5846.8 2235.5 L6497.8 2235.5" fill="none" data-name="StudyRecruitController"></path>
+							<path d="M5846.8 2281.5 L6497.8 2281.5" fill="none" data-name="StudyRecruitController"></path>
 						</g>
-						<g transform="translate(5774.75, 2204.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
+						<g transform="translate(5846.75, 2204.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
 								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5774.75, 2235.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+						<g transform="translate(5846.75, 2235.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5774.75, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+						<g transform="translate(5846.75, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
@@ -4940,9 +4831,9 @@
 					</g>
 					<g data-name="IInviteCodeRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="12754.5" y="3156.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
+							<rect x="31407.5" y="3156.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
 						</g>
-						<g transform="translate(12754.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
+						<g transform="translate(31407.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
 								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
 								
@@ -4951,9 +4842,9 @@
 					</g>
 					<g data-name="StreamSubscription">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="12544.5" y="3156.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+							<rect x="13835.5" y="3156.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
 						</g>
-						<g transform="translate(12544.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
+						<g transform="translate(13835.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
 								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
 								
@@ -4962,17 +4853,17 @@
 					</g>
 					<g data-name="StudyBaseController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="4996.0" y="1299.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
-							<path d="M4996.0 1330.0 L5542.0 1330.0" fill="none" data-name="StudyBaseController"></path>
-							<path d="M4996.0 1406.0 L5542.0 1406.0" fill="none" data-name="StudyBaseController"></path>
+							<rect x="5378.5" y="1299.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
+							<path d="M5378.5 1330.0 L5924.5 1330.0" fill="none" data-name="StudyBaseController"></path>
+							<path d="M5378.5 1406.0 L5924.5 1406.0" fill="none" data-name="StudyBaseController"></path>
 						</g>
-						<g transform="translate(4996, 1299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
+						<g transform="translate(5378.5, 1299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
 								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4996, 1330)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+						<g transform="translate(5378.5, 1330)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
@@ -4981,7 +4872,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(4996, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+						<g transform="translate(5378.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
@@ -4993,9 +4884,9 @@
 					</g>
 					<g data-name="IModelActionProvider">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="6896.3" y="1375.0" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
+							<rect x="7304.3" y="1375.0" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
 						</g>
-						<g transform="translate(6896.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
+						<g transform="translate(7304.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
 								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
 								
@@ -5004,16 +4895,16 @@
 					</g>
 					<g data-name="StudyRecruitScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="13453.0" y="2242.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M13453.0 2273.5 L13767.0 2273.5" fill="none" data-name="StudyRecruitScreen"></path>
+							<rect x="19221.3" y="2242.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
+							<path d="M19221.3 2273.5 L19535.3 2273.5" fill="none" data-name="StudyRecruitScreen"></path>
 						</g>
-						<g transform="translate(13453, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
+						<g transform="translate(19221.25, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
 								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13453, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
+						<g transform="translate(19221.25, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
@@ -5025,23 +4916,23 @@
 					</g>
 					<g data-name="InviteCodeFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
-							<rect x="459.0" y="1336.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
-							<path d="M459.0 1367.5 L897.0 1367.5" fill="none" data-name="InviteCodeFormView"></path>
-							<path d="M459.0 1398.5 L897.0 1398.5" fill="none" data-name="InviteCodeFormView"></path>
+							<rect x="36870.0" y="1336.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
+							<path d="M36870.0 1367.5 L37308.0 1367.5" fill="none" data-name="InviteCodeFormView"></path>
+							<path d="M36870.0 1398.5 L37308.0 1398.5" fill="none" data-name="InviteCodeFormView"></path>
 						</g>
-						<g transform="translate(459, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
+						<g transform="translate(36870, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
 								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(459, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+						<g transform="translate(36870, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(459, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+						<g transform="translate(36870, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
@@ -5051,17 +4942,17 @@
 					</g>
 					<g data-name="InviteCodeFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="18545.0" y="2107.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M18545.0 2138.0 L19212.0 2138.0" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M18545.0 2364.0 L19212.0 2364.0" fill="none" data-name="InviteCodeFormViewModel"></path>
+							<rect x="42388.8" y="2107.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
+							<path d="M42388.8 2138.0 L43055.8 2138.0" fill="none" data-name="InviteCodeFormViewModel"></path>
+							<path d="M42388.8 2364.0 L43055.8 2364.0" fill="none" data-name="InviteCodeFormViewModel"></path>
 						</g>
-						<g transform="translate(18545, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
+						<g transform="translate(42388.75, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
 								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18545, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+						<g transform="translate(42388.75, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
@@ -5080,7 +4971,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(18545, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+						<g transform="translate(42388.75, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
@@ -5093,19 +4984,30 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="FormConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
+							<rect x="39272.0" y="524.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
+						</g>
+						<g transform="translate(39272, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
+								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="StudyInvitesTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="44018.5" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M44018.5 31.0 L44584.5 31.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M44018.5 137.0 L44584.5 137.0" fill="none" data-name="StudyInvitesTable"></path>
+							<rect x="45282.8" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
+							<path d="M45282.8 31.0 L45848.8 31.0" fill="none" data-name="StudyInvitesTable"></path>
+							<path d="M45282.8 137.0 L45848.8 137.0" fill="none" data-name="StudyInvitesTable"></path>
 						</g>
-						<g transform="translate(44018.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
+						<g transform="translate(45282.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
 								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44018.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+						<g transform="translate(45282.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
@@ -5116,7 +5018,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(44018.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+						<g transform="translate(45282.75, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
@@ -5126,9 +5028,9 @@
 					</g>
 					<g data-name="void Function(StudyInvite)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="43822.3" y="524.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
+							<rect x="45086.5" y="524.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(43822.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
+						<g transform="translate(45086.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
 								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
 								
@@ -5137,9 +5039,9 @@
 					</g>
 					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="44084.3" y="524.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
+							<rect x="45348.5" y="524.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(44084.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+						<g transform="translate(45348.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
 								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
 								
@@ -5148,9 +5050,9 @@
 					</g>
 					<g data-name="Intervention? Function(String)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="44544.3" y="524.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
+							<rect x="45808.5" y="524.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
 						</g>
-						<g transform="translate(44544.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
+						<g transform="translate(45808.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
 								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
 								
@@ -5159,9 +5061,9 @@
 					</g>
 					<g data-name="int Function(StudyInvite)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="44835.3" y="524.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
+							<rect x="46099.5" y="524.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(44835.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
+						<g transform="translate(46099.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
 								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
 								
@@ -5170,9 +5072,9 @@
 					</g>
 					<g data-name="Study">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="39165.3" y="3156.0" height="31.0" width="61.0" data-name="Study"></rect>
+							<rect x="40709.3" y="3156.0" height="31.0" width="61.0" data-name="Study"></rect>
 						</g>
-						<g transform="translate(39165.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
+						<g transform="translate(40709.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
 								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
 								
@@ -5181,16 +5083,16 @@
 					</g>
 					<g data-name="PublishSuccessDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
-							<rect x="13807.0" y="2265.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
-							<path d="M13807.0 2296.0 L13998.0 2296.0" fill="none" data-name="PublishSuccessDialog"></path>
+							<rect x="19575.3" y="2265.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
+							<path d="M19575.3 2296.0 L19766.3 2296.0" fill="none" data-name="PublishSuccessDialog"></path>
 						</g>
-						<g transform="translate(13807, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
+						<g transform="translate(19575.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
 								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13807, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
+						<g transform="translate(19575.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
 								
@@ -5199,16 +5101,16 @@
 					</g>
 					<g data-name="PublishDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
-							<rect x="14149.0" y="2265.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
-							<path d="M14149.0 2296.0 L14285.0 2296.0" fill="none" data-name="PublishDialog"></path>
+							<rect x="20555.3" y="2265.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
+							<path d="M20555.3 2296.0 L20691.3 2296.0" fill="none" data-name="PublishDialog"></path>
 						</g>
-						<g transform="translate(14149, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
+						<g transform="translate(20555.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14149, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
+						<g transform="translate(20555.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
 								
@@ -5217,16 +5119,16 @@
 					</g>
 					<g data-name="PublishConfirmationDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
-							<rect x="14509.0" y="2265.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
-							<path d="M14509.0 2296.0 L14733.0 2296.0" fill="none" data-name="PublishConfirmationDialog"></path>
+							<rect x="20731.3" y="2265.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
+							<path d="M20731.3 2296.0 L20955.3 2296.0" fill="none" data-name="PublishConfirmationDialog"></path>
 						</g>
-						<g transform="translate(14509, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
+						<g transform="translate(20731.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
 								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14509, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
+						<g transform="translate(20731.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
 								
@@ -5235,17 +5137,17 @@
 					</g>
 					<g data-name="FrameControlsWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
-							<rect x="7120.3" y="1329.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
-							<path d="M7120.3 1360.0 L7411.3 1360.0" fill="none" data-name="FrameControlsWidget"></path>
-							<path d="M7120.3 1421.0 L7411.3 1421.0" fill="none" data-name="FrameControlsWidget"></path>
+							<rect x="11955.5" y="1329.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
+							<path d="M11955.5 1360.0 L12246.5 1360.0" fill="none" data-name="FrameControlsWidget"></path>
+							<path d="M11955.5 1421.0 L12246.5 1421.0" fill="none" data-name="FrameControlsWidget"></path>
 						</g>
-						<g transform="translate(7120.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
+						<g transform="translate(11955.5, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
 								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7120.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+						<g transform="translate(11955.5, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
@@ -5253,7 +5155,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(7120.25, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+						<g transform="translate(11955.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
 								
@@ -5262,9 +5164,9 @@
 					</g>
 					<g data-name="ConsumerWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="14610.8" y="1009.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+							<rect x="17783.0" y="1009.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
 						</g>
-						<g transform="translate(14610.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+						<g transform="translate(17783, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
 								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
@@ -5273,16 +5175,16 @@
 					</g>
 					<g data-name="IStudyStatusBadgeViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
-							<rect x="7821.3" y="1352.0" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
-							<path d="M7821.3 1383.0 L8106.3 1383.0" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
+							<rect x="8340.3" y="1352.0" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
+							<path d="M8340.3 1383.0 L8625.3 1383.0" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
 						</g>
-						<g transform="translate(7821.25, 1352)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
+						<g transform="translate(8340.25, 1352)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
 								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7821.25, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
+						<g transform="translate(8340.25, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
@@ -5292,9 +5194,9 @@
 					</g>
 					<g data-name="Participation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="13299.0" y="2280.5" height="31.0" width="114.0" data-name="Participation"></rect>
+							<rect x="9829.3" y="2280.5" height="31.0" width="114.0" data-name="Participation"></rect>
 						</g>
-						<g transform="translate(13299, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
+						<g transform="translate(9829.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
 								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
 								
@@ -5303,9 +5205,9 @@
 					</g>
 					<g data-name="StudyStatus">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
-							<rect x="8171.3" y="2280.5" height="31.0" width="111.0" data-name="StudyStatus"></rect>
+							<rect x="8641.0" y="2280.5" height="31.0" width="111.0" data-name="StudyStatus"></rect>
 						</g>
-						<g transform="translate(8171.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
+						<g transform="translate(8641, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
 								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
 								
@@ -5314,17 +5216,17 @@
 					</g>
 					<g data-name="StudyStatusBadge">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
-							<rect x="8146.3" y="1314.0" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
-							<path d="M8146.3 1345.0 L8387.3 1345.0" fill="none" data-name="StudyStatusBadge"></path>
-							<path d="M8146.3 1436.0 L8387.3 1436.0" fill="none" data-name="StudyStatusBadge"></path>
+							<rect x="8665.3" y="1314.0" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
+							<path d="M8665.3 1345.0 L8906.3 1345.0" fill="none" data-name="StudyStatusBadge"></path>
+							<path d="M8665.3 1436.0 L8906.3 1436.0" fill="none" data-name="StudyStatusBadge"></path>
 						</g>
-						<g transform="translate(8146.25, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
+						<g transform="translate(8665.25, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
 								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8146.25, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+						<g transform="translate(8665.25, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
@@ -5334,7 +5236,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(8146.25, 1436)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+						<g transform="translate(8665.25, 1436)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
 								
@@ -5343,9 +5245,9 @@
 					</g>
 					<g data-name="BadgeType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="12213.0" y="2280.5" height="31.0" width="106.0" data-name="BadgeType"></rect>
+							<rect x="11459.3" y="2280.5" height="31.0" width="106.0" data-name="BadgeType"></rect>
 						</g>
-						<g transform="translate(12213, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
+						<g transform="translate(11459.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
 								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
 								
@@ -5354,17 +5256,17 @@
 					</g>
 					<g data-name="RouteInformation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
-							<rect x="8432.3" y="2227.0" height="138.0" width="152.0" data-name="RouteInformation"></rect>
-							<path d="M8432.3 2258.0 L8584.3 2258.0" fill="none" data-name="RouteInformation"></path>
-							<path d="M8432.3 2334.0 L8584.3 2334.0" fill="none" data-name="RouteInformation"></path>
+							<rect x="8792.0" y="2227.0" height="138.0" width="152.0" data-name="RouteInformation"></rect>
+							<path d="M8792.0 2258.0 L8944.0 2258.0" fill="none" data-name="RouteInformation"></path>
+							<path d="M8792.0 2334.0 L8944.0 2334.0" fill="none" data-name="RouteInformation"></path>
 						</g>
-						<g transform="translate(8432.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
+						<g transform="translate(8792, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
 								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8432.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+						<g transform="translate(8792, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
 								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
@@ -5373,7 +5275,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(8432.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+						<g transform="translate(8792, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
 								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
 								
@@ -5382,17 +5284,17 @@
 					</g>
 					<g data-name="PlatformController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
-							<rect x="8427.3" y="1261.5" height="258.0" width="302.0" data-name="PlatformController"></rect>
-							<path d="M8427.3 1292.5 L8729.3 1292.5" fill="none" data-name="PlatformController"></path>
-							<path d="M8427.3 1383.5 L8729.3 1383.5" fill="none" data-name="PlatformController"></path>
+							<rect x="8946.3" y="1261.5" height="258.0" width="302.0" data-name="PlatformController"></rect>
+							<path d="M8946.3 1292.5 L9248.3 1292.5" fill="none" data-name="PlatformController"></path>
+							<path d="M8946.3 1383.5 L9248.3 1383.5" fill="none" data-name="PlatformController"></path>
 						</g>
-						<g transform="translate(8427.25, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
+						<g transform="translate(8946.25, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
 								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8427.25, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+						<g transform="translate(8946.25, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
 								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
@@ -5402,7 +5304,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(8427.25, 1383.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+						<g transform="translate(8946.25, 1383.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
 								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
@@ -5418,23 +5320,23 @@
 					</g>
 					<g data-name="WebController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
-							<rect x="9641.0" y="2197.0" height="198.0" width="273.0" data-name="WebController"></rect>
-							<path d="M9641.0 2228.0 L9914.0 2228.0" fill="none" data-name="WebController"></path>
-							<path d="M9641.0 2259.0 L9914.0 2259.0" fill="none" data-name="WebController"></path>
+							<rect x="9983.3" y="2197.0" height="198.0" width="273.0" data-name="WebController"></rect>
+							<path d="M9983.3 2228.0 L10256.3 2228.0" fill="none" data-name="WebController"></path>
+							<path d="M9983.3 2259.0 L10256.3 2259.0" fill="none" data-name="WebController"></path>
 						</g>
-						<g transform="translate(9641, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
+						<g transform="translate(9983.25, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
 								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9641, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+						<g transform="translate(9983.25, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9641, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+						<g transform="translate(9983.25, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
@@ -5450,9 +5352,9 @@
 					</g>
 					<g data-name="IFrameElement">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
-							<rect x="6345.3" y="3156.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
+							<rect x="11139.8" y="3156.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
 						</g>
-						<g transform="translate(6345.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
+						<g transform="translate(11139.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
 								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
 								
@@ -5461,16 +5363,16 @@
 					</g>
 					<g data-name="MobileController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
-							<rect x="9954.0" y="2212.5" height="167.0" width="191.0" data-name="MobileController"></rect>
-							<path d="M9954.0 2243.5 L10145.0 2243.5" fill="none" data-name="MobileController"></path>
+							<rect x="10296.3" y="2212.5" height="167.0" width="191.0" data-name="MobileController"></rect>
+							<path d="M10296.3 2243.5 L10487.3 2243.5" fill="none" data-name="MobileController"></path>
 						</g>
-						<g transform="translate(9954, 2212.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
+						<g transform="translate(10296.25, 2212.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
 								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9954, 2243.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
+						<g transform="translate(10296.25, 2243.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
 								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
@@ -5486,17 +5388,17 @@
 					</g>
 					<g data-name="StudyController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
-							<rect x="4556.8" y="2182.0" height="228.0" width="573.0" data-name="StudyController"></rect>
-							<path d="M4556.8 2213.0 L5129.8 2213.0" fill="none" data-name="StudyController"></path>
-							<path d="M4556.8 2274.0 L5129.8 2274.0" fill="none" data-name="StudyController"></path>
+							<rect x="4628.8" y="2182.0" height="228.0" width="573.0" data-name="StudyController"></rect>
+							<path d="M4628.8 2213.0 L5201.8 2213.0" fill="none" data-name="StudyController"></path>
+							<path d="M4628.8 2274.0 L5201.8 2274.0" fill="none" data-name="StudyController"></path>
 						</g>
-						<g transform="translate(4556.75, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
+						<g transform="translate(4628.75, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
 								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4556.75, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+						<g transform="translate(4628.75, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
@@ -5504,7 +5406,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(4556.75, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+						<g transform="translate(4628.75, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
@@ -5520,16 +5422,16 @@
 					</g>
 					<g data-name="IStudyNavViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
-							<rect x="8769.3" y="1322.0" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
-							<path d="M8769.3 1353.0 L9010.3 1353.0" fill="none" data-name="IStudyNavViewModel"></path>
+							<rect x="9288.3" y="1322.0" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
+							<path d="M9288.3 1353.0 L9529.3 1353.0" fill="none" data-name="IStudyNavViewModel"></path>
 						</g>
-						<g transform="translate(8769.25, 1322)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
+						<g transform="translate(9288.25, 1322)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
 								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8769.25, 1353)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
+						<g transform="translate(9288.25, 1353)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
@@ -5543,16 +5445,16 @@
 					</g>
 					<g data-name="StudyNav">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
-							<rect x="44710.8" y="23.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
-							<path d="M44710.8 54.0 L44943.8 54.0" fill="none" data-name="StudyNav"></path>
+							<rect x="45975.0" y="23.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
+							<path d="M45975.0 54.0 L46208.0 54.0" fill="none" data-name="StudyNav"></path>
 						</g>
-						<g transform="translate(44710.75, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
+						<g transform="translate(45975, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
 								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44710.75, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
+						<g transform="translate(45975, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
@@ -5566,16 +5468,16 @@
 					</g>
 					<g data-name="StudyDesignNav">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
-							<rect x="44983.8" y="23.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
-							<path d="M44983.8 54.0 L45271.8 54.0" fill="none" data-name="StudyDesignNav"></path>
+							<rect x="46248.0" y="23.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
+							<path d="M46248.0 54.0 L46536.0 54.0" fill="none" data-name="StudyDesignNav"></path>
 						</g>
-						<g transform="translate(44983.75, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
+						<g transform="translate(46248, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
 								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44983.75, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
+						<g transform="translate(46248, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
@@ -5589,9 +5491,9 @@
 					</g>
 					<g data-name="IWithBanner">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="16022.5" y="1009.5" height="31.0" width="113.0" data-name="IWithBanner"></rect>
+							<rect x="21363.8" y="1009.5" height="31.0" width="113.0" data-name="IWithBanner"></rect>
 						</g>
-						<g transform="translate(16022.5, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
+						<g transform="translate(21363.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
 								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
 								
@@ -5600,17 +5502,17 @@
 					</g>
 					<g data-name="StudyParticipationBadge">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
-							<rect x="9050.3" y="1321.5" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
-							<path d="M9050.3 1352.5 L9281.3 1352.5" fill="none" data-name="StudyParticipationBadge"></path>
-							<path d="M9050.3 1428.5 L9281.3 1428.5" fill="none" data-name="StudyParticipationBadge"></path>
+							<rect x="9569.3" y="1321.5" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
+							<path d="M9569.3 1352.5 L9800.3 1352.5" fill="none" data-name="StudyParticipationBadge"></path>
+							<path d="M9569.3 1428.5 L9800.3 1428.5" fill="none" data-name="StudyParticipationBadge"></path>
 						</g>
-						<g transform="translate(9050.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
+						<g transform="translate(9569.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
 								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9050.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+						<g transform="translate(9569.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
@@ -5619,7 +5521,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(9050.25, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+						<g transform="translate(9569.25, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
 								
@@ -5628,9 +5530,9 @@
 					</g>
 					<g data-name="IStudyRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="31265.5" y="3156.0" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
+							<rect x="33316.0" y="3156.0" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
 						</g>
-						<g transform="translate(31265.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
+						<g transform="translate(33316, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
 								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
 								
@@ -5639,16 +5541,16 @@
 					</g>
 					<g data-name="PreviewFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
-							<rect x="45311.8" y="45.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
-							<path d="M45311.8 76.5 L45602.8 76.5" fill="none" data-name="PreviewFrame"></path>
+							<rect x="46576.0" y="45.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
+							<path d="M46576.0 76.5 L46867.0 76.5" fill="none" data-name="PreviewFrame"></path>
 						</g>
-						<g transform="translate(45311.75, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
+						<g transform="translate(46576, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
 								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45311.75, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
+						<g transform="translate(46576, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
@@ -5659,9 +5561,9 @@
 					</g>
 					<g data-name="StudyFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="45365.3" y="524.0" height="31.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
+							<rect x="46629.5" y="524.0" height="31.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(45365.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
+						<g transform="translate(46629.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
 								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
 								
@@ -5670,16 +5572,16 @@
 					</g>
 					<g data-name="IStudyAppBarViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
-							<rect x="8768.3" y="2250.0" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
-							<path d="M8768.3 2281.0 L9011.3 2281.0" fill="none" data-name="IStudyAppBarViewModel"></path>
+							<rect x="9091.0" y="2250.0" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
+							<path d="M9091.0 2281.0 L9334.0 2281.0" fill="none" data-name="IStudyAppBarViewModel"></path>
 						</g>
-						<g transform="translate(8768.25, 2250)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
+						<g transform="translate(9091, 2250)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
 								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8768.25, 2281)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
+						<g transform="translate(9091, 2281)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
@@ -5690,16 +5592,16 @@
 					</g>
 					<g data-name="StudyScaffold">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
-							<rect x="19467.0" y="904.0" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
-							<path d="M19467.0 935.0 L19802.0 935.0" fill="none" data-name="StudyScaffold"></path>
+							<rect x="25015.5" y="904.0" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
+							<path d="M25015.5 935.0 L25350.5 935.0" fill="none" data-name="StudyScaffold"></path>
 						</g>
-						<g transform="translate(19467, 904)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
+						<g transform="translate(25015.5, 904)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
 								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19467, 935)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
+						<g transform="translate(25015.5, 935)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
@@ -5720,9 +5622,9 @@
 					</g>
 					<g data-name="NavbarTab">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="18973.3" y="1375.0" height="31.0" width="103.0" data-name="NavbarTab"></rect>
+							<rect x="25085.8" y="1375.0" height="31.0" width="103.0" data-name="NavbarTab"></rect>
 						</g>
-						<g transform="translate(18973.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
+						<g transform="translate(25085.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
 								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
 								
@@ -5731,9 +5633,9 @@
 					</g>
 					<g data-name="SingleColumnLayoutType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="20135.3" y="1375.0" height="31.0" width="218.0" data-name="SingleColumnLayoutType"></rect>
+							<rect x="25268.8" y="1375.0" height="31.0" width="218.0" data-name="SingleColumnLayoutType"></rect>
 						</g>
-						<g transform="translate(20135.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
+						<g transform="translate(25268.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
 								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
 								
@@ -5742,24 +5644,24 @@
 					</g>
 					<g data-name="WebFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
-							<rect x="45642.8" y="37.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
-							<path d="M45642.8 68.5 L45811.8 68.5" fill="none" data-name="WebFrame"></path>
-							<path d="M45642.8 114.5 L45811.8 114.5" fill="none" data-name="WebFrame"></path>
+							<rect x="46907.0" y="37.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
+							<path d="M46907.0 68.5 L47076.0 68.5" fill="none" data-name="WebFrame"></path>
+							<path d="M46907.0 114.5 L47076.0 114.5" fill="none" data-name="WebFrame"></path>
 						</g>
-						<g transform="translate(45642.75, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
+						<g transform="translate(46907, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
 								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45642.75, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+						<g transform="translate(46907, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45642.75, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+						<g transform="translate(46907, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
 								
@@ -5768,16 +5670,16 @@
 					</g>
 					<g data-name="DisabledFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
-							<rect x="45851.8" y="60.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
-							<path d="M45851.8 91.5 L45987.8 91.5" fill="none" data-name="DisabledFrame"></path>
+							<rect x="47116.0" y="60.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
+							<path d="M47116.0 91.5 L47252.0 91.5" fill="none" data-name="DisabledFrame"></path>
 						</g>
-						<g transform="translate(45851.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
+						<g transform="translate(47116, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45851.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
+						<g transform="translate(47116, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
 								
@@ -5786,17 +5688,17 @@
 					</g>
 					<g data-name="PhoneContainer">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
-							<rect x="10359.3" y="1284.0" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
-							<path d="M10359.3 1315.0 L10686.3 1315.0" fill="none" data-name="PhoneContainer"></path>
-							<path d="M10359.3 1466.0 L10686.3 1466.0" fill="none" data-name="PhoneContainer"></path>
+							<rect x="10560.5" y="1284.0" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
+							<path d="M10560.5 1315.0 L10887.5 1315.0" fill="none" data-name="PhoneContainer"></path>
+							<path d="M10560.5 1466.0 L10887.5 1466.0" fill="none" data-name="PhoneContainer"></path>
 						</g>
-						<g transform="translate(10359.25, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
+						<g transform="translate(10560.5, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
 								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10359.25, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+						<g transform="translate(10560.5, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
 								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
@@ -5810,7 +5712,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(10359.25, 1466)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+						<g transform="translate(10560.5, 1466)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
 								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
 								
@@ -5819,9 +5721,9 @@
 					</g>
 					<g data-name="Color">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="24358.8" y="2280.5" height="31.0" width="58.0" data-name="Color"></rect>
+							<rect x="21235.3" y="2280.5" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(24358.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+						<g transform="translate(21235.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
 								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
@@ -5830,16 +5732,16 @@
 					</g>
 					<g data-name="MobileFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
-							<rect x="46027.8" y="60.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
-							<path d="M46027.8 91.5 L46163.8 91.5" fill="none" data-name="MobileFrame"></path>
+							<rect x="47292.0" y="60.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
+							<path d="M47292.0 91.5 L47428.0 91.5" fill="none" data-name="MobileFrame"></path>
 						</g>
-						<g transform="translate(46027.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
+						<g transform="translate(47292, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46027.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
+						<g transform="translate(47292, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
 								
@@ -5848,16 +5750,16 @@
 					</g>
 					<g data-name="DesktopFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
-							<rect x="46203.8" y="60.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
-							<path d="M46203.8 91.5 L46339.8 91.5" fill="none" data-name="DesktopFrame"></path>
+							<rect x="47468.0" y="60.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
+							<path d="M47468.0 91.5 L47604.0 91.5" fill="none" data-name="DesktopFrame"></path>
 						</g>
-						<g transform="translate(46203.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
+						<g transform="translate(47468, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46203.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
+						<g transform="translate(47468, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
 								
@@ -5866,23 +5768,23 @@
 					</g>
 					<g data-name="StudyTestScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
-							<rect x="14773.0" y="2219.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
-							<path d="M14773.0 2250.5 L14973.0 2250.5" fill="none" data-name="StudyTestScreen"></path>
-							<path d="M14773.0 2281.5 L14973.0 2281.5" fill="none" data-name="StudyTestScreen"></path>
+							<rect x="20995.3" y="2219.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
+							<path d="M20995.3 2250.5 L21195.3 2250.5" fill="none" data-name="StudyTestScreen"></path>
+							<path d="M20995.3 2281.5 L21195.3 2281.5" fill="none" data-name="StudyTestScreen"></path>
 						</g>
-						<g transform="translate(14773, 2219.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
+						<g transform="translate(20995.25, 2219.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
 								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14773, 2250.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+						<g transform="translate(20995.25, 2250.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14773, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+						<g transform="translate(20995.25, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
@@ -5895,17 +5797,17 @@
 					</g>
 					<g data-name="StudySettingsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="44129.0" y="2167.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M44129.0 2198.0 L44608.0 2198.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M44129.0 2334.0 L44608.0 2334.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+							<rect x="44379.3" y="2167.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
+							<path d="M44379.3 2198.0 L44858.3 2198.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+							<path d="M44379.3 2334.0 L44858.3 2334.0" fill="none" data-name="StudySettingsFormViewModel"></path>
 						</g>
-						<g transform="translate(44129, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
+						<g transform="translate(44379.25, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44129, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+						<g transform="translate(44379.25, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
@@ -5918,7 +5820,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(44129, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+						<g transform="translate(44379.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
@@ -5931,9 +5833,9 @@
 					</g>
 					<g data-name="AsyncValue">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="44209.8" y="3156.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
+							<rect x="44440.0" y="3156.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
 						</g>
-						<g transform="translate(44209.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
+						<g transform="translate(44440, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
 								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
 								
@@ -5942,16 +5844,16 @@
 					</g>
 					<g data-name="StudySettingsDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="15013.0" y="2265.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M15013.0 2296.0 L15188.0 2296.0" fill="none" data-name="StudySettingsDialog"></path>
+							<rect x="21333.3" y="2265.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
+							<path d="M21333.3 2296.0 L21508.3 2296.0" fill="none" data-name="StudySettingsDialog"></path>
 						</g>
-						<g transform="translate(15013, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
+						<g transform="translate(21333.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
 								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15013, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
+						<g transform="translate(21333.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
 								
@@ -5960,16 +5862,16 @@
 					</g>
 					<g data-name="StudyTestController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
-							<rect x="6505.8" y="2257.5" height="77.0" width="282.0" data-name="StudyTestController"></rect>
-							<path d="M6505.8 2288.5 L6787.8 2288.5" fill="none" data-name="StudyTestController"></path>
+							<rect x="6913.8" y="2257.5" height="77.0" width="282.0" data-name="StudyTestController"></rect>
+							<path d="M6913.8 2288.5 L7195.8 2288.5" fill="none" data-name="StudyTestController"></path>
 						</g>
-						<g transform="translate(6505.75, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
+						<g transform="translate(6913.75, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
 								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6505.75, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
+						<g transform="translate(6913.75, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
@@ -5979,16 +5881,16 @@
 					</g>
 					<g data-name="TestAppRoutes">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
-							<rect x="46379.8" y="23.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
-							<path d="M46379.8 54.0 L46639.8 54.0" fill="none" data-name="TestAppRoutes"></path>
+							<rect x="47644.0" y="23.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
+							<path d="M47644.0 54.0 L47904.0 54.0" fill="none" data-name="TestAppRoutes"></path>
 						</g>
-						<g transform="translate(46379.75, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
+						<g transform="translate(47644, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
 								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46379.75, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
+						<g transform="translate(47644, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
 								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
@@ -6002,17 +5904,17 @@
 					</g>
 					<g data-name="DrawerEntry">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
-							<rect x="24615.3" y="926.0" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
-							<path d="M24615.3 957.0 L25060.3 957.0" fill="none" data-name="DrawerEntry"></path>
-							<path d="M24615.3 1093.0 L25060.3 1093.0" fill="none" data-name="DrawerEntry"></path>
+							<rect x="25704.3" y="926.0" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
+							<path d="M25704.3 957.0 L26149.3 957.0" fill="none" data-name="DrawerEntry"></path>
+							<path d="M25704.3 1093.0 L26149.3 1093.0" fill="none" data-name="DrawerEntry"></path>
 						</g>
-						<g transform="translate(24615.25, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
+						<g transform="translate(25704.25, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
 								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24615.25, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+						<g transform="translate(25704.25, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
@@ -6025,7 +5927,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(24615.25, 1093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+						<g transform="translate(25704.25, 1093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
 								
@@ -6034,9 +5936,9 @@
 					</g>
 					<g data-name="String Function()">
 						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
-							<rect x="24648.3" y="1375.0" height="31.0" width="147.0" data-name="String Function()"></rect>
+							<rect x="25526.8" y="1375.0" height="31.0" width="147.0" data-name="String Function()"></rect>
 						</g>
-						<g transform="translate(24648.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
+						<g transform="translate(25526.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
 								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
 								
@@ -6045,9 +5947,9 @@
 					</g>
 					<g data-name="String Function()?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
-							<rect x="24875.3" y="1375.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
+							<rect x="26174.8" y="1375.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
 						</g>
-						<g transform="translate(24875.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
+						<g transform="translate(26174.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
 								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
 								
@@ -6056,9 +5958,9 @@
 					</g>
 					<g data-name="void Function(BuildContext, WidgetRef)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
-							<rect x="25556.3" y="1375.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
+							<rect x="26371.8" y="1375.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
 						</g>
-						<g transform="translate(25556.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
+						<g transform="translate(26371.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
 								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
 								
@@ -6067,24 +5969,24 @@
 					</g>
 					<g data-name="GoRouterDrawerEntry">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
-							<rect x="25932.3" y="1336.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
-							<path d="M25932.3 1367.5 L26196.3 1367.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-							<path d="M25932.3 1413.5 L26196.3 1413.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+							<rect x="26747.8" y="1336.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
+							<path d="M26747.8 1367.5 L27011.8 1367.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+							<path d="M26747.8 1413.5 L27011.8 1413.5" fill="none" data-name="GoRouterDrawerEntry"></path>
 						</g>
-						<g transform="translate(25932.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
+						<g transform="translate(26747.75, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
 								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25932.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+						<g transform="translate(26747.75, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25932.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+						<g transform="translate(26747.75, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
 								
@@ -6093,9 +5995,9 @@
 					</g>
 					<g data-name="RoutingIntent">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="25638.3" y="2280.5" height="31.0" width="122.0" data-name="RoutingIntent"></rect>
+							<rect x="27936.8" y="2280.5" height="31.0" width="122.0" data-name="RoutingIntent"></rect>
 						</g>
-						<g transform="translate(25638.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
+						<g transform="translate(27936.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
 								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
 								
@@ -6104,16 +6006,16 @@
 					</g>
 					<g data-name="AppDrawer">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
-							<rect x="46679.8" y="8.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
-							<path d="M46679.8 39.0 L46948.8 39.0" fill="none" data-name="AppDrawer"></path>
+							<rect x="47944.0" y="8.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
+							<path d="M47944.0 39.0 L48213.0 39.0" fill="none" data-name="AppDrawer"></path>
 						</g>
-						<g transform="translate(46679.75, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
+						<g transform="translate(47944, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
 								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46679.75, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
+						<g transform="translate(47944, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
@@ -6129,16 +6031,16 @@
 					</g>
 					<g data-name="StudyAnalyzeScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
-							<rect x="15228.0" y="2257.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
-							<path d="M15228.0 2288.5 L15408.0 2288.5" fill="none" data-name="StudyAnalyzeScreen"></path>
+							<rect x="22575.3" y="2257.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
+							<path d="M22575.3 2288.5 L22755.3 2288.5" fill="none" data-name="StudyAnalyzeScreen"></path>
 						</g>
-						<g transform="translate(15228, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
+						<g transform="translate(22575.25, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
 								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15228, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
+						<g transform="translate(22575.25, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
@@ -6148,16 +6050,16 @@
 					</g>
 					<g data-name="StudyAnalyzeController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
-							<rect x="6827.8" y="2265.0" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
-							<path d="M6827.8 2296.0 L7028.8 2296.0" fill="none" data-name="StudyAnalyzeController"></path>
+							<rect x="7235.8" y="2265.0" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
+							<path d="M7235.8 2296.0 L7436.8 2296.0" fill="none" data-name="StudyAnalyzeController"></path>
 						</g>
-						<g transform="translate(6827.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
+						<g transform="translate(7235.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
 								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6827.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
+						<g transform="translate(7235.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
 								
@@ -6166,16 +6068,16 @@
 					</g>
 					<g data-name="StudyDesignInterventionsFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="11512.5" y="3140.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M11512.5 3171.5 L11808.5 3171.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
+							<rect x="14045.5" y="3140.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
+							<path d="M14045.5 3171.5 L14341.5 3171.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
 						</g>
-						<g transform="translate(11512.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
+						<g transform="translate(14045.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
 								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11512.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
+						<g transform="translate(14045.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
 								
@@ -6184,16 +6086,16 @@
 					</g>
 					<g data-name="StudyDesignPageWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="16718.0" y="2265.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M16718.0 2296.0 L16930.0 2296.0" fill="none" data-name="StudyDesignPageWidget"></path>
+							<rect x="22795.3" y="2265.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
+							<path d="M22795.3 2296.0 L23007.3 2296.0" fill="none" data-name="StudyDesignPageWidget"></path>
 						</g>
-						<g transform="translate(16718, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
+						<g transform="translate(22795.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
 								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16718, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
+						<g transform="translate(22795.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
 								
@@ -6202,16 +6104,16 @@
 					</g>
 					<g data-name="InterventionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="12359.0" y="1359.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M12359.0 1390.5 L12734.0 1390.5" fill="none" data-name="InterventionFormView"></path>
+							<rect x="12656.5" y="1359.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
+							<path d="M12656.5 1390.5 L13031.5 1390.5" fill="none" data-name="InterventionFormView"></path>
 						</g>
-						<g transform="translate(12359, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
+						<g transform="translate(12656.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
 								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12359, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
+						<g transform="translate(12656.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
 								
@@ -6220,17 +6122,17 @@
 					</g>
 					<g data-name="InterventionFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="27443.3" y="2062.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M27443.3 2093.0 L28298.3 2093.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M27443.3 2319.0 L28298.3 2319.0" fill="none" data-name="InterventionFormViewModel"></path>
+							<rect x="28098.8" y="2062.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
+							<path d="M28098.8 2093.0 L28953.8 2093.0" fill="none" data-name="InterventionFormViewModel"></path>
+							<path d="M28098.8 2319.0 L28953.8 2319.0" fill="none" data-name="InterventionFormViewModel"></path>
 						</g>
-						<g transform="translate(27443.25, 2062)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
+						<g transform="translate(28098.75, 2062)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
 								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27443.25, 2093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+						<g transform="translate(28098.75, 2093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
@@ -6249,7 +6151,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(27443.25, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+						<g transform="translate(28098.75, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
@@ -6270,23 +6172,23 @@
 					</g>
 					<g data-name="InterventionPreview">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="7451.3" y="1344.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M7451.3 1375.0 L7781.3 1375.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M7451.3 1406.0 L7781.3 1406.0" fill="none" data-name="InterventionPreview"></path>
+							<rect x="12286.5" y="1344.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
+							<path d="M12286.5 1375.0 L12616.5 1375.0" fill="none" data-name="InterventionPreview"></path>
+							<path d="M12286.5 1406.0 L12616.5 1406.0" fill="none" data-name="InterventionPreview"></path>
 						</g>
-						<g transform="translate(7451.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
+						<g transform="translate(12286.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
 								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7451.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+						<g transform="translate(12286.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7451.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+						<g transform="translate(12286.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
 								
@@ -6295,9 +6197,9 @@
 					</g>
 					<g data-name="InterventionFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="7499.8" y="2280.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
+							<rect x="11186.3" y="2280.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(7499.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
+						<g transform="translate(11186.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
 								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
 								
@@ -6306,23 +6208,23 @@
 					</g>
 					<g data-name="StudyScheduleFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="4114.5" y="971.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M4114.5 1002.0 L4473.5 1002.0" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M4114.5 1033.0 L4473.5 1033.0" fill="none" data-name="StudyScheduleFormView"></path>
+							<rect x="37547.5" y="971.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
+							<path d="M37547.5 1002.0 L37906.5 1002.0" fill="none" data-name="StudyScheduleFormView"></path>
+							<path d="M37547.5 1033.0 L37906.5 1033.0" fill="none" data-name="StudyScheduleFormView"></path>
 						</g>
-						<g transform="translate(4114.5, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
+						<g transform="translate(37547.5, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
 								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4114.5, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+						<g transform="translate(37547.5, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4114.5, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+						<g transform="translate(37547.5, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
@@ -6332,17 +6234,17 @@
 					</g>
 					<g data-name="StudyScheduleControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="3915.0" y="1194.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M3915.0 1225.0 L4673.0 1225.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M3915.0 1526.0 L4673.0 1526.0" fill="none" data-name="StudyScheduleControls"></path>
+							<rect x="37348.0" y="1194.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
+							<path d="M37348.0 1225.0 L38106.0 1225.0" fill="none" data-name="StudyScheduleControls"></path>
+							<path d="M37348.0 1526.0 L38106.0 1526.0" fill="none" data-name="StudyScheduleControls"></path>
 						</g>
-						<g transform="translate(3915, 1194)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
+						<g transform="translate(37348, 1194)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
 								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3915, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+						<g transform="translate(37348, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
@@ -6366,7 +6268,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(3915, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+						<g transform="translate(37348, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
@@ -6377,17 +6279,17 @@
 					</g>
 					<g data-name="InterventionTaskFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="38071.3" y="1306.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M38071.3 1337.5 L38361.3 1337.5" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M38071.3 1428.5 L38361.3 1428.5" fill="none" data-name="InterventionTaskFormData"></path>
+							<rect x="35386.0" y="1306.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
+							<path d="M35386.0 1337.5 L35676.0 1337.5" fill="none" data-name="InterventionTaskFormData"></path>
+							<path d="M35386.0 1428.5 L35676.0 1428.5" fill="none" data-name="InterventionTaskFormData"></path>
 						</g>
-						<g transform="translate(38071.25, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
+						<g transform="translate(35386, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
 								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38071.25, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+						<g transform="translate(35386, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
@@ -6397,7 +6299,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(38071.25, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+						<g transform="translate(35386, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
@@ -6407,17 +6309,17 @@
 					</g>
 					<g data-name="IFormDataWithSchedule">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="38598.0" y="941.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M38598.0 972.0 L38896.0 972.0" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M38598.0 1078.0 L38896.0 1078.0" fill="none" data-name="IFormDataWithSchedule"></path>
+							<rect x="35602.3" y="941.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
+							<path d="M35602.3 972.0 L35900.3 972.0" fill="none" data-name="IFormDataWithSchedule"></path>
+							<path d="M35602.3 1078.0 L35900.3 1078.0" fill="none" data-name="IFormDataWithSchedule"></path>
 						</g>
-						<g transform="translate(38598, 941)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
+						<g transform="translate(35602.25, 941)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
 								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38598, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+						<g transform="translate(35602.25, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
@@ -6428,7 +6330,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(38598, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+						<g transform="translate(35602.25, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
 								
@@ -6437,17 +6339,17 @@
 					</g>
 					<g data-name="InterventionsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="30734.8" y="2107.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M30734.8 2138.0 L31573.8 2138.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M30734.8 2289.0 L31573.8 2289.0" fill="none" data-name="InterventionsFormViewModel"></path>
+							<rect x="38040.3" y="2107.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
+							<path d="M38040.3 2138.0 L38879.3 2138.0" fill="none" data-name="InterventionsFormViewModel"></path>
+							<path d="M38040.3 2289.0 L38879.3 2289.0" fill="none" data-name="InterventionsFormViewModel"></path>
 						</g>
-						<g transform="translate(30734.75, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
+						<g transform="translate(38040.25, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
 								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30734.75, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+						<g transform="translate(38040.25, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
@@ -6461,7 +6363,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(30734.75, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+						<g transform="translate(38040.25, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
@@ -6481,9 +6383,9 @@
 					</g>
 					<g data-name="IListActionProvider">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="17400.3" y="1375.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
+							<rect x="14493.5" y="1375.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
 						</g>
-						<g transform="translate(17400.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+						<g transform="translate(14493.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
 								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
 								
@@ -6492,9 +6394,9 @@
 					</g>
 					<g data-name="IProviderArgsResolver">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="28485.0" y="1009.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
+							<rect x="29760.8" y="1009.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
 						</g>
-						<g transform="translate(28485, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
+						<g transform="translate(29760.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
 								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
 								
@@ -6503,17 +6405,17 @@
 					</g>
 					<g data-name="InterventionTaskFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="28338.3" y="2159.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M28338.3 2190.5 L29034.3 2190.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M28338.3 2371.5 L29034.3 2371.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<rect x="31116.5" y="2159.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
+							<path d="M31116.5 2190.5 L31812.5 2190.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<path d="M31116.5 2371.5 L31812.5 2371.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
 						</g>
-						<g transform="translate(28338.25, 2159.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
+						<g transform="translate(31116.5, 2159.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28338.25, 2190.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+						<g transform="translate(31116.5, 2190.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
@@ -6529,7 +6431,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(28338.25, 2371.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+						<g transform="translate(31116.5, 2371.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
@@ -6540,17 +6442,17 @@
 					</g>
 					<g data-name="WithScheduleControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="26729.5" y="1239.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M26729.5 1270.0 L27224.5 1270.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M26729.5 1496.0 L27224.5 1496.0" fill="none" data-name="WithScheduleControls"></path>
+							<rect x="42041.3" y="1239.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
+							<path d="M42041.3 1270.0 L42536.3 1270.0" fill="none" data-name="WithScheduleControls"></path>
+							<path d="M42041.3 1496.0 L42536.3 1496.0" fill="none" data-name="WithScheduleControls"></path>
 						</g>
-						<g transform="translate(26729.5, 1239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
+						<g transform="translate(42041.25, 1239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
 								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26729.5, 1270)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+						<g transform="translate(42041.25, 1270)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
@@ -6569,7 +6471,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(26729.5, 1496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+						<g transform="translate(42041.25, 1496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
@@ -6579,9 +6481,9 @@
 					</g>
 					<g data-name="PhaseSequence">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="14923.5" y="3156.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
+							<rect x="27885.3" y="3156.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
 						</g>
-						<g transform="translate(14923.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
+						<g transform="translate(27885.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
 								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
 								
@@ -6590,17 +6492,17 @@
 					</g>
 					<g data-name="InterventionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="29223.0" y="926.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M29223.0 957.0 L29605.0 957.0" fill="none" data-name="InterventionFormData"></path>
-							<path d="M29223.0 1078.0 L29605.0 1078.0" fill="none" data-name="InterventionFormData"></path>
+							<rect x="7.8" y="926.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
+							<path d="M7.8 957.0 L389.8 957.0" fill="none" data-name="InterventionFormData"></path>
+							<path d="M7.8 1078.0 L389.8 1078.0" fill="none" data-name="InterventionFormData"></path>
 						</g>
-						<g transform="translate(29223, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
+						<g transform="translate(7.75, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
 								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29223, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+						<g transform="translate(7.75, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
@@ -6612,7 +6514,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(29223, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+						<g transform="translate(7.75, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
@@ -6622,17 +6524,17 @@
 					</g>
 					<g data-name="StudyScheduleFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="29958.8" y="2197.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M29958.8 2228.0 L30254.8 2228.0" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M29958.8 2334.0 L30254.8 2334.0" fill="none" data-name="StudyScheduleFormData"></path>
+							<rect x="6537.8" y="2197.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
+							<path d="M6537.8 2228.0 L6833.8 2228.0" fill="none" data-name="StudyScheduleFormData"></path>
+							<path d="M6537.8 2334.0 L6833.8 2334.0" fill="none" data-name="StudyScheduleFormData"></path>
 						</g>
-						<g transform="translate(29958.75, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
+						<g transform="translate(6537.75, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
 								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29958.75, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+						<g transform="translate(6537.75, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
@@ -6643,7 +6545,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(29958.75, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+						<g transform="translate(6537.75, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
@@ -6654,16 +6556,16 @@
 					</g>
 					<g data-name="IStudyFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="31051.3" y="994.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M31051.3 1025.0 L31194.3 1025.0" fill="none" data-name="IStudyFormData"></path>
+							<rect x="9091.5" y="994.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
+							<path d="M9091.5 1025.0 L9234.5 1025.0" fill="none" data-name="IStudyFormData"></path>
 						</g>
-						<g transform="translate(31051.25, 994)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
+						<g transform="translate(9091.5, 994)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
 								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31051.25, 1025)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
+						<g transform="translate(9091.5, 1025)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
 								
@@ -6672,16 +6574,16 @@
 					</g>
 					<g data-name="InterventionTaskFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="18274.3" y="1359.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M18274.3 1390.5 L18687.3 1390.5" fill="none" data-name="InterventionTaskFormView"></path>
+							<rect x="15127.5" y="1359.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
+							<path d="M15127.5 1390.5 L15540.5 1390.5" fill="none" data-name="InterventionTaskFormView"></path>
 						</g>
-						<g transform="translate(18274.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
+						<g transform="translate(15127.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
 								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18274.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
+						<g transform="translate(15127.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
 								
@@ -6690,17 +6592,17 @@
 					</g>
 					<g data-name="InterventionsFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="30511.3" y="1321.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M30511.3 1352.5 L30905.3 1352.5" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M30511.3 1413.5 L30905.3 1413.5" fill="none" data-name="InterventionsFormData"></path>
+							<rect x="7528.3" y="1321.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
+							<path d="M7528.3 1352.5 L7922.3 1352.5" fill="none" data-name="InterventionsFormData"></path>
+							<path d="M7528.3 1413.5 L7922.3 1413.5" fill="none" data-name="InterventionsFormData"></path>
 						</g>
-						<g transform="translate(30511.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
+						<g transform="translate(7528.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
 								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30511.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+						<g transform="translate(7528.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
@@ -6708,7 +6610,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(30511.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+						<g transform="translate(7528.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
@@ -6718,16 +6620,16 @@
 					</g>
 					<g data-name="StudyDesignReportsFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="11848.5" y="3133.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M11848.5 3164.0 L12241.5 3164.0" fill="none" data-name="StudyDesignReportsFormView"></path>
+							<rect x="14834.5" y="3133.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
+							<path d="M14834.5 3164.0 L15227.5 3164.0" fill="none" data-name="StudyDesignReportsFormView"></path>
 						</g>
-						<g transform="translate(11848.5, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
+						<g transform="translate(14834.5, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
 								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11848.5, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
+						<g transform="translate(14834.5, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
@@ -6737,17 +6639,17 @@
 					</g>
 					<g data-name="ReportItemFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="29645.0" y="956.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M29645.0 987.0 L29959.0 987.0" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M29645.0 1048.0 L29959.0 1048.0" fill="none" data-name="ReportItemFormData"></path>
+							<rect x="429.8" y="956.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
+							<path d="M429.8 987.0 L743.8 987.0" fill="none" data-name="ReportItemFormData"></path>
+							<path d="M429.8 1048.0 L743.8 1048.0" fill="none" data-name="ReportItemFormData"></path>
 						</g>
-						<g transform="translate(29645, 956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
+						<g transform="translate(429.75, 956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
 								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29645, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+						<g transform="translate(429.75, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
@@ -6755,7 +6657,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(29645, 1048)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+						<g transform="translate(429.75, 1048)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
@@ -6765,9 +6667,9 @@
 					</g>
 					<g data-name="ReportSection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="29738.0" y="1375.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
+							<rect x="522.8" y="1375.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
 						</g>
-						<g transform="translate(29738, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
+						<g transform="translate(522.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
 								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
 								
@@ -6776,17 +6678,17 @@
 					</g>
 					<g data-name="DataReferenceEditor">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="15969.0" y="2227.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M15969.0 2258.0 L16678.0 2258.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M15969.0 2319.0 L16678.0 2319.0" fill="none" data-name="DataReferenceEditor"></path>
+							<rect x="19806.3" y="2227.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
+							<path d="M19806.3 2258.0 L20515.3 2258.0" fill="none" data-name="DataReferenceEditor"></path>
+							<path d="M19806.3 2319.0 L20515.3 2319.0" fill="none" data-name="DataReferenceEditor"></path>
 						</g>
-						<g transform="translate(15969, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
+						<g transform="translate(19806.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
 								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15969, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+						<g transform="translate(19806.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
 								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
@@ -6794,7 +6696,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(15969, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+						<g transform="translate(19806.25, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
 								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
@@ -6804,9 +6706,9 @@
 					</g>
 					<g data-name="ReactiveDropdownField">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="11269.5" y="3156.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
+							<rect x="13256.5" y="3156.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
 						</g>
-						<g transform="translate(11269.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
+						<g transform="translate(13256.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
 								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
 								
@@ -6815,17 +6717,17 @@
 					</g>
 					<g data-name="TemporalAggregationFormatted">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="19116.3" y="1284.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M19116.3 1315.0 L19564.3 1315.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M19116.3 1421.0 L19564.3 1421.0" fill="none" data-name="TemporalAggregationFormatted"></path>
+							<rect x="16364.5" y="1284.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
+							<path d="M16364.5 1315.0 L16812.5 1315.0" fill="none" data-name="TemporalAggregationFormatted"></path>
+							<path d="M16364.5 1421.0 L16812.5 1421.0" fill="none" data-name="TemporalAggregationFormatted"></path>
 						</g>
-						<g transform="translate(19116.25, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
+						<g transform="translate(16364.5, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
 								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19116.25, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+						<g transform="translate(16364.5, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
@@ -6836,7 +6738,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(19116.25, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+						<g transform="translate(16364.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
@@ -6848,9 +6750,9 @@
 					</g>
 					<g data-name="TemporalAggregation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="21860.8" y="2280.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
+							<rect x="17559.8" y="2280.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
 						</g>
-						<g transform="translate(21860.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
+						<g transform="translate(17559.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
 								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
 								
@@ -6859,17 +6761,17 @@
 					</g>
 					<g data-name="ImprovementDirectionFormatted">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="19604.3" y="1284.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M19604.3 1315.0 L20055.3 1315.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M19604.3 1421.0 L20055.3 1421.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
+							<rect x="17476.5" y="1284.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
+							<path d="M17476.5 1315.0 L17927.5 1315.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
+							<path d="M17476.5 1421.0 L17927.5 1421.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
 						</g>
-						<g transform="translate(19604.25, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
+						<g transform="translate(17476.5, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
 								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19604.25, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+						<g transform="translate(17476.5, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
@@ -6880,7 +6782,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(19604.25, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+						<g transform="translate(17476.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
@@ -6892,9 +6794,9 @@
 					</g>
 					<g data-name="ImprovementDirection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="22086.8" y="2280.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
+							<rect x="18439.8" y="2280.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
 						</g>
-						<g transform="translate(22086.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
+						<g transform="translate(18439.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
 								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
 								
@@ -6903,16 +6805,16 @@
 					</g>
 					<g data-name="ReportSectionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="10796.5" y="3118.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M10796.5 3149.0 L11179.5 3149.0" fill="none" data-name="ReportSectionType"></path>
+							<rect x="9933.3" y="3118.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
+							<path d="M9933.3 3149.0 L10316.3 3149.0" fill="none" data-name="ReportSectionType"></path>
 						</g>
-						<g transform="translate(10796.5, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
+						<g transform="translate(9933.25, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
 								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10796.5, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
+						<g transform="translate(9933.25, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
@@ -6924,17 +6826,17 @@
 					</g>
 					<g data-name="AverageSectionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="9321.3" y="1329.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M9321.3 1360.0 L9800.3 1360.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M9321.3 1421.0 L9800.3 1421.0" fill="none" data-name="AverageSectionFormView"></path>
+							<rect x="13071.5" y="1329.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
+							<path d="M13071.5 1360.0 L13550.5 1360.0" fill="none" data-name="AverageSectionFormView"></path>
+							<path d="M13071.5 1421.0 L13550.5 1421.0" fill="none" data-name="AverageSectionFormView"></path>
 						</g>
-						<g transform="translate(9321.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
+						<g transform="translate(13071.5, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9321.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+						<g transform="translate(13071.5, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
@@ -6942,7 +6844,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(9321.25, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+						<g transform="translate(13071.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
 								
@@ -6951,17 +6853,17 @@
 					</g>
 					<g data-name="ReportItemFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="19704.3" y="2009.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M19704.3 2040.5 L20691.3 2040.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M19704.3 2476.5 L20691.3 2476.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<rect x="21548.3" y="2009.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
+							<path d="M21548.3 2040.5 L22535.3 2040.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<path d="M21548.3 2476.5 L22535.3 2476.5" fill="none" data-name="ReportItemFormViewModel"></path>
 						</g>
-						<g transform="translate(19704.25, 2009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(21548.25, 2009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
 								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19704.25, 2040.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(21548.25, 2040.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
@@ -6994,7 +6896,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(19704.25, 2476.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(21548.25, 2476.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
@@ -7008,23 +6910,23 @@
 					</g>
 					<g data-name="DataReferenceIdentifier">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="46954.3" y="493.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M46954.3 524.0 L47158.3 524.0" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M46954.3 555.0 L47158.3 555.0" fill="none" data-name="DataReferenceIdentifier"></path>
+							<rect x="48218.5" y="493.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
+							<path d="M48218.5 524.0 L48422.5 524.0" fill="none" data-name="DataReferenceIdentifier"></path>
+							<path d="M48218.5 555.0 L48422.5 555.0" fill="none" data-name="DataReferenceIdentifier"></path>
 						</g>
-						<g transform="translate(46954.25, 493)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
+						<g transform="translate(48218.5, 493)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
 								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46954.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+						<g transform="translate(48218.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
 								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46954.25, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+						<g transform="translate(48218.5, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
 								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
 								
@@ -7033,9 +6935,9 @@
 					</g>
 					<g data-name="DataReference">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="46988.8" y="76.0" height="31.0" width="135.0" data-name="DataReference"></rect>
+							<rect x="48253.0" y="76.0" height="31.0" width="135.0" data-name="DataReference"></rect>
 						</g>
-						<g transform="translate(46988.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
+						<g transform="translate(48253, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
 								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
 								
@@ -7044,17 +6946,17 @@
 					</g>
 					<g data-name="LinearRegressionSectionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="9840.3" y="1329.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M9840.3 1360.0 L10319.3 1360.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M9840.3 1421.0 L10319.3 1421.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<rect x="13590.5" y="1329.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
+							<path d="M13590.5 1360.0 L14069.5 1360.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<path d="M13590.5 1421.0 L14069.5 1421.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
 						</g>
-						<g transform="translate(9840.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
+						<g transform="translate(13590.5, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9840.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+						<g transform="translate(13590.5, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
@@ -7062,7 +6964,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(9840.25, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+						<g transform="translate(13590.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
 								
@@ -7071,17 +6973,17 @@
 					</g>
 					<g data-name="ReportItemFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="21743.0" y="1306.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M21743.0 1337.5 L22210.0 1337.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M21743.0 1413.5 L22210.0 1413.5" fill="none" data-name="ReportItemFormView"></path>
+							<rect x="22375.0" y="1306.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
+							<path d="M22375.0 1337.5 L22842.0 1337.5" fill="none" data-name="ReportItemFormView"></path>
+							<path d="M22375.0 1413.5 L22842.0 1413.5" fill="none" data-name="ReportItemFormView"></path>
 						</g>
-						<g transform="translate(21743, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
+						<g transform="translate(22375, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
 								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21743, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+						<g transform="translate(22375, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
@@ -7090,7 +6992,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(21743, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+						<g transform="translate(22375, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
@@ -7101,9 +7003,9 @@
 					</g>
 					<g data-name="Widget Function(BuildContext)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="24062.8" y="2280.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
+							<rect x="23047.3" y="2280.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
 						</g>
-						<g transform="translate(24062.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
+						<g transform="translate(23047.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
 								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
 								
@@ -7112,17 +7014,17 @@
 					</g>
 					<g data-name="ReportsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="42885.5" y="2122.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M42885.5 2153.0 L43745.5 2153.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M42885.5 2319.0 L43745.5 2319.0" fill="none" data-name="ReportsFormViewModel"></path>
+							<rect x="43135.8" y="2122.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
+							<path d="M43135.8 2153.0 L43995.8 2153.0" fill="none" data-name="ReportsFormViewModel"></path>
+							<path d="M43135.8 2319.0 L43995.8 2319.0" fill="none" data-name="ReportsFormViewModel"></path>
 						</g>
-						<g transform="translate(42885.5, 2122)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
+						<g transform="translate(43135.75, 2122)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
 								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42885.5, 2153)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+						<g transform="translate(43135.75, 2153)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
@@ -7137,7 +7039,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(42885.5, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+						<g transform="translate(43135.75, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
@@ -7154,17 +7056,17 @@
 					</g>
 					<g data-name="ReportFormItemDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="39266.3" y="3065.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M39266.3 3096.0 L40109.3 3096.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M39266.3 3172.0 L40109.3 3172.0" fill="none" data-name="ReportFormItemDelegate"></path>
+							<rect x="38539.8" y="3065.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
+							<path d="M38539.8 3096.0 L39382.8 3096.0" fill="none" data-name="ReportFormItemDelegate"></path>
+							<path d="M38539.8 3172.0 L39382.8 3172.0" fill="none" data-name="ReportFormItemDelegate"></path>
 						</g>
-						<g transform="translate(39266.25, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
+						<g transform="translate(38539.75, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
 								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39266.25, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+						<g transform="translate(38539.75, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
@@ -7173,7 +7075,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(39266.25, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+						<g transform="translate(38539.75, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
@@ -7187,17 +7089,17 @@
 					</g>
 					<g data-name="ReportBadge">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="24411.3" y="1321.5" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M24411.3 1352.5 L24608.3 1352.5" fill="none" data-name="ReportBadge"></path>
-							<path d="M24411.3 1428.5 L24608.3 1428.5" fill="none" data-name="ReportBadge"></path>
+							<rect x="23346.8" y="1321.5" height="138.0" width="197.0" data-name="ReportBadge"></rect>
+							<path d="M23346.8 1352.5 L23543.8 1352.5" fill="none" data-name="ReportBadge"></path>
+							<path d="M23346.8 1428.5 L23543.8 1428.5" fill="none" data-name="ReportBadge"></path>
 						</g>
-						<g transform="translate(24411.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
+						<g transform="translate(23346.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
 								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24411.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+						<g transform="translate(23346.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
@@ -7206,7 +7108,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(24411.25, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+						<g transform="translate(23346.75, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
 								
@@ -7215,16 +7117,16 @@
 					</g>
 					<g data-name="ReportStatus">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="12985.5" y="3118.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M12985.5 3149.0 L13286.5 3149.0" fill="none" data-name="ReportStatus"></path>
+							<rect x="12493.5" y="3118.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
+							<path d="M12493.5 3149.0 L12794.5 3149.0" fill="none" data-name="ReportStatus"></path>
 						</g>
-						<g transform="translate(12985.5, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
+						<g transform="translate(12493.5, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
 								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12985.5, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
+						<g transform="translate(12493.5, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
@@ -7236,24 +7138,24 @@
 					</g>
 					<g data-name="ReportsFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="31337.3" y="1329.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M31337.3 1360.0 L31675.3 1360.0" fill="none" data-name="ReportsFormData"></path>
-							<path d="M31337.3 1406.0 L31675.3 1406.0" fill="none" data-name="ReportsFormData"></path>
+							<rect x="7962.3" y="1329.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
+							<path d="M7962.3 1360.0 L8300.3 1360.0" fill="none" data-name="ReportsFormData"></path>
+							<path d="M7962.3 1406.0 L8300.3 1406.0" fill="none" data-name="ReportsFormData"></path>
 						</g>
-						<g transform="translate(31337.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
+						<g transform="translate(7962.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
 								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31337.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+						<g transform="translate(7962.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31337.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+						<g transform="translate(7962.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
@@ -7263,17 +7165,17 @@
 					</g>
 					<g data-name="StudyInfoFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="44862.3" y="2054.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M44862.3 2085.5 L45558.3 2085.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M44862.3 2491.5 L45558.3 2491.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+							<rect x="45058.3" y="2054.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
+							<path d="M45058.3 2085.5 L45754.3 2085.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+							<path d="M45058.3 2491.5 L45754.3 2491.5" fill="none" data-name="StudyInfoFormViewModel"></path>
 						</g>
-						<g transform="translate(44862.25, 2054.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
+						<g transform="translate(45058.25, 2054.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44862.25, 2085.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+						<g transform="translate(45058.25, 2085.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
@@ -7304,7 +7206,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(44862.25, 2491.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+						<g transform="translate(45058.25, 2491.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
@@ -7314,16 +7216,16 @@
 					</g>
 					<g data-name="StudyDesignInfoFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="12281.5" y="3140.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M12281.5 3171.5 L12504.5 3171.5" fill="none" data-name="StudyDesignInfoFormView"></path>
+							<rect x="15267.5" y="3140.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
+							<path d="M15267.5 3171.5 L15490.5 3171.5" fill="none" data-name="StudyDesignInfoFormView"></path>
 						</g>
-						<g transform="translate(12281.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
+						<g transform="translate(15267.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
 								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12281.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
+						<g transform="translate(15267.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
 								
@@ -7332,17 +7234,17 @@
 					</g>
 					<g data-name="StudyInfoFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="31715.3" y="1306.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M31715.3 1337.5 L32129.3 1337.5" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M31715.3 1428.5 L32129.3 1428.5" fill="none" data-name="StudyInfoFormData"></path>
+							<rect x="10066.5" y="1306.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
+							<path d="M10066.5 1337.5 L10480.5 1337.5" fill="none" data-name="StudyInfoFormData"></path>
+							<path d="M10066.5 1428.5 L10480.5 1428.5" fill="none" data-name="StudyInfoFormData"></path>
 						</g>
-						<g transform="translate(31715.25, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
+						<g transform="translate(10066.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
 								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31715.25, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+						<g transform="translate(10066.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
@@ -7352,7 +7254,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(31715.25, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+						<g transform="translate(10066.5, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
@@ -7362,17 +7264,17 @@
 					</g>
 					<g data-name="StudyContactInfoFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="32349.8" y="2182.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M32349.8 2213.0 L32697.8 2213.0" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M32349.8 2364.0 L32697.8 2364.0" fill="none" data-name="StudyContactInfoFormData"></path>
+							<rect x="10527.3" y="2182.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
+							<path d="M10527.3 2213.0 L10875.3 2213.0" fill="none" data-name="StudyContactInfoFormData"></path>
+							<path d="M10527.3 2364.0 L10875.3 2364.0" fill="none" data-name="StudyContactInfoFormData"></path>
 						</g>
-						<g transform="translate(32349.75, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
+						<g transform="translate(10527.25, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
 								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32349.75, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+						<g transform="translate(10527.25, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
@@ -7386,7 +7288,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(32349.75, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+						<g transform="translate(10527.25, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
@@ -7396,16 +7298,16 @@
 					</g>
 					<g data-name="StudyFormValidationSet">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="2049.0" y="3133.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M2049.0 3164.0 L2436.0 3164.0" fill="none" data-name="StudyFormValidationSet"></path>
+							<rect x="1545.0" y="3133.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
+							<path d="M1545.0 3164.0 L1932.0 3164.0" fill="none" data-name="StudyFormValidationSet"></path>
 						</g>
-						<g transform="translate(2049, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
+						<g transform="translate(1545, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
 								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2049, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
+						<g transform="translate(1545, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
@@ -7415,24 +7317,24 @@
 					</g>
 					<g data-name="MeasurementsFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="34063.3" y="1329.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M34063.3 1360.0 L34557.3 1360.0" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M34063.3 1406.0 L34557.3 1406.0" fill="none" data-name="MeasurementsFormData"></path>
+							<rect x="10927.5" y="1329.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
+							<path d="M10927.5 1360.0 L11421.5 1360.0" fill="none" data-name="MeasurementsFormData"></path>
+							<path d="M10927.5 1406.0 L11421.5 1406.0" fill="none" data-name="MeasurementsFormData"></path>
 						</g>
-						<g transform="translate(34063.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
+						<g transform="translate(10927.5, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
 								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34063.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+						<g transform="translate(10927.5, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34063.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+						<g transform="translate(10927.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
@@ -7442,16 +7344,16 @@
 					</g>
 					<g data-name="MeasurementSurveyFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="25072.3" y="1359.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M25072.3 1390.5 L25516.3 1390.5" fill="none" data-name="MeasurementSurveyFormView"></path>
+							<rect x="24601.8" y="1359.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
+							<path d="M24601.8 1390.5 L25045.8 1390.5" fill="none" data-name="MeasurementSurveyFormView"></path>
 						</g>
-						<g transform="translate(25072.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
+						<g transform="translate(24601.75, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
 								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25072.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
+						<g transform="translate(24601.75, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
 								
@@ -7460,17 +7362,17 @@
 					</g>
 					<g data-name="MeasurementSurveyFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="31613.8" y="2084.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M31613.8 2115.5 L32309.8 2115.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M31613.8 2341.5 L32309.8 2341.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+							<rect x="32925.3" y="2084.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
+							<path d="M32925.3 2115.5 L33621.3 2115.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+							<path d="M32925.3 2341.5 L33621.3 2341.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
 						</g>
-						<g transform="translate(31613.75, 2084.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+						<g transform="translate(32925.25, 2084.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31613.75, 2115.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+						<g transform="translate(32925.25, 2115.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
@@ -7489,7 +7391,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(31613.75, 2341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+						<g transform="translate(32925.25, 2341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
@@ -7507,23 +7409,23 @@
 					</g>
 					<g data-name="SurveyPreview">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="10726.3" y="1344.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M10726.3 1375.0 L11070.3 1375.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M10726.3 1406.0 L11070.3 1406.0" fill="none" data-name="SurveyPreview"></path>
+							<rect x="14109.5" y="1344.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
+							<path d="M14109.5 1375.0 L14453.5 1375.0" fill="none" data-name="SurveyPreview"></path>
+							<path d="M14109.5 1406.0 L14453.5 1406.0" fill="none" data-name="SurveyPreview"></path>
 						</g>
-						<g transform="translate(10726.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
+						<g transform="translate(14109.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10726.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+						<g transform="translate(14109.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10726.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+						<g transform="translate(14109.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
 								
@@ -7532,9 +7434,9 @@
 					</g>
 					<g data-name="MeasurementFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="10774.8" y="2280.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
+							<rect x="14158.0" y="2280.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(10774.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
+						<g transform="translate(14158, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
 								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
 								
@@ -7543,17 +7445,17 @@
 					</g>
 					<g data-name="MeasurementSurveyFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="39988.8" y="1291.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M39988.8 1322.5 L40397.8 1322.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M39988.8 1443.5 L40397.8 1443.5" fill="none" data-name="MeasurementSurveyFormData"></path>
+							<rect x="35716.0" y="1291.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
+							<path d="M35716.0 1322.5 L36125.0 1322.5" fill="none" data-name="MeasurementSurveyFormData"></path>
+							<path d="M35716.0 1443.5 L36125.0 1443.5" fill="none" data-name="MeasurementSurveyFormData"></path>
 						</g>
-						<g transform="translate(39988.75, 1291.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
+						<g transform="translate(35716, 1291.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
 								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39988.75, 1322.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+						<g transform="translate(35716, 1322.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
@@ -7565,7 +7467,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(39988.75, 1443.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+						<g transform="translate(35716, 1443.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
@@ -7575,24 +7477,24 @@
 					</g>
 					<g data-name="QuestionnaireFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="36408.3" y="2227.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M36408.3 2258.0 L36776.3 2258.0" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M36408.3 2304.0 L36776.3 2304.0" fill="none" data-name="QuestionnaireFormData"></path>
+							<rect x="25219.5" y="2227.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
+							<path d="M25219.5 2258.0 L25587.5 2258.0" fill="none" data-name="QuestionnaireFormData"></path>
+							<path d="M25219.5 2304.0 L25587.5 2304.0" fill="none" data-name="QuestionnaireFormData"></path>
 						</g>
-						<g transform="translate(36408.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
+						<g transform="translate(25219.5, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
 								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36408.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+						<g transform="translate(25219.5, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36408.25, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+						<g transform="translate(25219.5, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
@@ -7603,17 +7505,17 @@
 					</g>
 					<g data-name="WithQuestionnaireControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="38401.3" y="1261.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M38401.3 1292.5 L39033.3 1292.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M38401.3 1398.5 L39033.3 1398.5" fill="none" data-name="WithQuestionnaireControls"></path>
+							<rect x="39299.3" y="1261.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
+							<path d="M39299.3 1292.5 L39931.3 1292.5" fill="none" data-name="WithQuestionnaireControls"></path>
+							<path d="M39299.3 1398.5 L39931.3 1398.5" fill="none" data-name="WithQuestionnaireControls"></path>
 						</g>
-						<g transform="translate(38401.25, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
+						<g transform="translate(39299.25, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
 								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38401.25, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+						<g transform="translate(39299.25, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
@@ -7624,7 +7526,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(38401.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+						<g transform="translate(39299.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
@@ -7639,16 +7541,16 @@
 					</g>
 					<g data-name="StudyDesignMeasurementsFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="13376.5" y="3140.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M13376.5 3171.5 L13686.5 3171.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
+							<rect x="15530.5" y="3140.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
+							<path d="M15530.5 3171.5 L15840.5 3171.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
 						</g>
-						<g transform="translate(13376.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+						<g transform="translate(15530.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
 								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13376.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+						<g transform="translate(15530.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
 								
@@ -7657,17 +7559,17 @@
 					</g>
 					<g data-name="MeasurementsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="39126.5" y="2114.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M39126.5 2145.5 L40218.5 2145.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M39126.5 2296.5 L40218.5 2296.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+							<rect x="39675.3" y="2114.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
+							<path d="M39675.3 2145.5 L40767.3 2145.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+							<path d="M39675.3 2296.5 L40767.3 2296.5" fill="none" data-name="MeasurementsFormViewModel"></path>
 						</g>
-						<g transform="translate(39126.5, 2114.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
+						<g transform="translate(39675.25, 2114.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
 								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39126.5, 2145.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+						<g transform="translate(39675.25, 2145.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
@@ -7681,7 +7583,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(39126.5, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+						<g transform="translate(39675.25, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
@@ -7700,17 +7602,17 @@
 					</g>
 					<g data-name="StudyFormScaffold">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="11147.0" y="1329.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M11147.0 1360.0 L11535.0 1360.0" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M11147.0 1421.0 L11535.0 1421.0" fill="none" data-name="StudyFormScaffold"></path>
+							<rect x="14699.5" y="1329.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
+							<path d="M14699.5 1360.0 L15087.5 1360.0" fill="none" data-name="StudyFormScaffold"></path>
+							<path d="M14699.5 1421.0 L15087.5 1421.0" fill="none" data-name="StudyFormScaffold"></path>
 						</g>
-						<g transform="translate(11147, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
+						<g transform="translate(14699.5, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
 								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11147, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+						<g transform="translate(14699.5, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
@@ -7718,7 +7620,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(11147, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+						<g transform="translate(14699.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
 								
@@ -7727,9 +7629,9 @@
 					</g>
 					<g data-name="T Function(WidgetRef)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="11134.8" y="2280.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
+							<rect x="16571.0" y="2280.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
 						</g>
-						<g transform="translate(11134.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
+						<g transform="translate(16571, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
 								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
 								
@@ -7738,9 +7640,9 @@
 					</g>
 					<g data-name="Widget Function(T)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="11443.0" y="2280.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
+							<rect x="16894.5" y="2280.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
 						</g>
-						<g transform="translate(11443, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
+						<g transform="translate(16894.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
 								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
 								
@@ -7749,17 +7651,17 @@
 					</g>
 					<g data-name="ConsentItemFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="34448.8" y="2167.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M34448.8 2198.0 L35144.8 2198.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M34448.8 2364.0 L35144.8 2364.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+							<rect x="34101.3" y="2167.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
+							<path d="M34101.3 2198.0 L34797.3 2198.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+							<path d="M34101.3 2364.0 L34797.3 2364.0" fill="none" data-name="ConsentItemFormViewModel"></path>
 						</g>
-						<g transform="translate(34448.75, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
+						<g transform="translate(34101.25, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34448.75, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+						<g transform="translate(34101.25, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
@@ -7774,7 +7676,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(34448.75, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+						<g transform="translate(34101.25, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
@@ -7785,16 +7687,16 @@
 					</g>
 					<g data-name="StudyDesignEnrollmentFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="13726.5" y="3125.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M13726.5 3156.5 L14175.5 3156.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
+							<rect x="15880.5" y="3125.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
+							<path d="M15880.5 3156.5 L16329.5 3156.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
 						</g>
-						<g transform="translate(13726.5, 3125.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+						<g transform="translate(15880.5, 3125.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
 								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13726.5, 3156.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+						<g transform="translate(15880.5, 3156.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
@@ -7805,16 +7707,16 @@
 					</g>
 					<g data-name="IScreenerQuestionLogicFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="26725.5" y="2265.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M26725.5 2296.0 L27057.5 2296.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
+							<rect x="29250.0" y="2265.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
+							<path d="M29250.0 2296.0 L29582.0 2296.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
 						</g>
-						<g transform="translate(26725.5, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
+						<g transform="translate(29250, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
 								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26725.5, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
+						<g transform="translate(29250, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
@@ -7823,23 +7725,23 @@
 					</g>
 					<g data-name="ScreenerQuestionLogicFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="26094.8" y="2227.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M26094.8 2258.0 L26518.8 2258.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M26094.8 2289.0 L26518.8 2289.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+							<rect x="41789.3" y="2227.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
+							<path d="M41789.3 2258.0 L42213.3 2258.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+							<path d="M41789.3 2289.0 L42213.3 2289.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
 						</g>
-						<g transform="translate(26094.75, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+						<g transform="translate(41789.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
 								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26094.75, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+						<g transform="translate(41789.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26094.75, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+						<g transform="translate(41789.25, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
@@ -7851,17 +7753,17 @@
 					</g>
 					<g data-name="ScreenerQuestionFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="26234.8" y="3005.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M26234.8 3036.0 L26796.8 3036.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M26234.8 3217.0 L26796.8 3217.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+							<rect x="31638.5" y="3005.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
+							<path d="M31638.5 3036.0 L32200.5 3036.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+							<path d="M31638.5 3217.0 L32200.5 3217.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(26234.75, 3005)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+						<g transform="translate(31638.5, 3005)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
 								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26234.75, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+						<g transform="translate(31638.5, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
@@ -7877,7 +7779,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(26234.75, 3217)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+						<g transform="translate(31638.5, 3217)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
@@ -7892,17 +7794,17 @@
 					</g>
 					<g data-name="ConsentItemFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="34793.3" y="941.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M34793.3 972.0 L35051.3 972.0" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M34793.3 1063.0 L35051.3 1063.0" fill="none" data-name="ConsentItemFormData"></path>
+							<rect x="26753.8" y="941.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
+							<path d="M26753.8 972.0 L27011.8 972.0" fill="none" data-name="ConsentItemFormData"></path>
+							<path d="M26753.8 1063.0 L27011.8 1063.0" fill="none" data-name="ConsentItemFormData"></path>
 						</g>
-						<g transform="translate(34793.25, 941)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
+						<g transform="translate(26753.75, 941)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
 								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34793.25, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+						<g transform="translate(26753.75, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
@@ -7912,7 +7814,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(34793.25, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+						<g transform="translate(26753.75, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
@@ -7922,16 +7824,16 @@
 					</g>
 					<g data-name="ConsentItemFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="27264.5" y="1359.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M27264.5 1390.5 L27645.5 1390.5" fill="none" data-name="ConsentItemFormView"></path>
+							<rect x="25713.8" y="1359.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
+							<path d="M25713.8 1390.5 L26094.8 1390.5" fill="none" data-name="ConsentItemFormView"></path>
 						</g>
-						<g transform="translate(27264.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
+						<g transform="translate(25713.75, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
 								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27264.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
+						<g transform="translate(25713.75, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
 								
@@ -7940,17 +7842,17 @@
 					</g>
 					<g data-name="EnrollmentFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="34597.3" y="1306.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M34597.3 1337.5 L35051.3 1337.5" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M34597.3 1428.5 L35051.3 1428.5" fill="none" data-name="EnrollmentFormData"></path>
+							<rect x="11461.5" y="1306.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
+							<path d="M11461.5 1337.5 L11915.5 1337.5" fill="none" data-name="EnrollmentFormData"></path>
+							<path d="M11461.5 1428.5 L11915.5 1428.5" fill="none" data-name="EnrollmentFormData"></path>
 						</g>
-						<g transform="translate(34597.25, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
+						<g transform="translate(11461.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
 								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34597.25, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+						<g transform="translate(11461.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
@@ -7960,7 +7862,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(34597.25, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+						<g transform="translate(11461.5, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
@@ -7970,17 +7872,17 @@
 					</g>
 					<g data-name="QuestionFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="23009.8" y="1627.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M23009.8 1658.0 L24022.8 1658.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M23009.8 2679.0 L24022.8 2679.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<rect x="25627.5" y="1627.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M25627.5 1658.0 L26640.5 1658.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M25627.5 2679.0 L26640.5 2679.0" fill="none" data-name="QuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(23009.75, 1627)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+						<g transform="translate(25627.5, 1627)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
 								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23009.75, 1658)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+						<g transform="translate(25627.5, 1658)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
@@ -8052,7 +7954,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(23009.75, 2679)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+						<g transform="translate(25627.5, 2679)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
@@ -8078,17 +7980,17 @@
 					</g>
 					<g data-name="EnrollmentFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="40276.8" y="2047.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M40276.8 2078.0 L41178.8 2078.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M40276.8 2304.0 L41178.8 2304.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+							<rect x="40807.3" y="2047.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
+							<path d="M40807.3 2078.0 L41709.3 2078.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+							<path d="M40807.3 2304.0 L41709.3 2304.0" fill="none" data-name="EnrollmentFormViewModel"></path>
 						</g>
-						<g transform="translate(40276.75, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
+						<g transform="translate(40807.25, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
 								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40276.75, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+						<g transform="translate(40807.25, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
@@ -8107,7 +8009,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(40276.75, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+						<g transform="translate(40807.25, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
@@ -8130,17 +8032,17 @@
 					</g>
 					<g data-name="EnrollmentFormConsentItemDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="33234.3" y="3065.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M33234.3 3096.0 L34034.3 3096.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M33234.3 3172.0 L34034.3 3172.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+							<rect x="34643.8" y="3065.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
+							<path d="M34643.8 3096.0 L35443.8 3096.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+							<path d="M34643.8 3172.0 L35443.8 3172.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
 						</g>
-						<g transform="translate(33234.25, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+						<g transform="translate(34643.75, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
 								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33234.25, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+						<g transform="translate(34643.75, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
@@ -8149,7 +8051,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(33234.25, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+						<g transform="translate(34643.75, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
@@ -8163,17 +8065,17 @@
 					</g>
 					<g data-name="StudyFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="44628.3" y="1209.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M44628.3 1240.0 L45324.3 1240.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M44628.3 1451.0 L45324.3 1451.0" fill="none" data-name="StudyFormViewModel"></path>
+							<rect x="45078.3" y="1209.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
+							<path d="M45078.3 1240.0 L45774.3 1240.0" fill="none" data-name="StudyFormViewModel"></path>
+							<path d="M45078.3 1451.0 L45774.3 1451.0" fill="none" data-name="StudyFormViewModel"></path>
 						</g>
-						<g transform="translate(44628.25, 1209)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(45078.25, 1209)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44628.25, 1240)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(45078.25, 1240)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
@@ -8191,7 +8093,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(44628.25, 1451)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(45078.25, 1451)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
@@ -8206,17 +8108,17 @@
 					</g>
 					<g data-name="QuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="35385.3" y="896.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M35385.3 927.0 L36553.3 927.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M35385.3 1063.0 L36553.3 1063.0" fill="none" data-name="QuestionFormData"></path>
+							<rect x="32063.8" y="896.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M32063.8 927.0 L33231.8 927.0" fill="none" data-name="QuestionFormData"></path>
+							<path d="M32063.8 1063.0 L33231.8 1063.0" fill="none" data-name="QuestionFormData"></path>
 						</g>
-						<g transform="translate(35385.25, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+						<g transform="translate(32063.75, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
 								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35385.25, 927)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+						<g transform="translate(32063.75, 927)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
@@ -8229,7 +8131,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(35385.25, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+						<g transform="translate(32063.75, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
@@ -8242,16 +8144,16 @@
 					</g>
 					<g data-name="SurveyQuestionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="18748.0" y="3088.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M18748.0 3119.0 L19111.0 3119.0" fill="none" data-name="SurveyQuestionType"></path>
+							<rect x="14381.5" y="3088.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M14381.5 3119.0 L14744.5 3119.0" fill="none" data-name="SurveyQuestionType"></path>
 						</g>
-						<g transform="translate(18748, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+						<g transform="translate(14381.5, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
 								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18748, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+						<g transform="translate(14381.5, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
@@ -8267,17 +8169,17 @@
 					</g>
 					<g data-name="ChoiceQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="35463.3" y="1306.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M35463.3 1337.5 L35807.3 1337.5" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M35463.3 1398.5 L35807.3 1398.5" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<rect x="32778.0" y="1306.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M32778.0 1337.5 L33122.0 1337.5" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M32778.0 1398.5 L33122.0 1398.5" fill="none" data-name="ChoiceQuestionFormData"></path>
 						</g>
-						<g transform="translate(35463.25, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(32778, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35463.25, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(32778, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
@@ -8285,7 +8187,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(35463.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(32778, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
@@ -8297,24 +8199,24 @@
 					</g>
 					<g data-name="BoolQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="35847.3" y="1321.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M35847.3 1352.5 L36239.3 1352.5" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M35847.3 1398.5 L36239.3 1398.5" fill="none" data-name="BoolQuestionFormData"></path>
+							<rect x="33162.0" y="1321.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M33162.0 1352.5 L33554.0 1352.5" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M33162.0 1398.5 L33554.0 1398.5" fill="none" data-name="BoolQuestionFormData"></path>
 						</g>
-						<g transform="translate(35847.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(33162, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
 								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35847.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(33162, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35847.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(33162, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
@@ -8325,24 +8227,24 @@
 					</g>
 					<g data-name="ImageQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="36279.3" y="1321.5" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M36279.3 1352.5 L36751.3 1352.5" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M36279.3 1398.5 L36751.3 1398.5" fill="none" data-name="ImageQuestionFormData"></path>
+							<rect x="33594.0" y="1321.5" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
+							<path d="M33594.0 1352.5 L34066.0 1352.5" fill="none" data-name="ImageQuestionFormData"></path>
+							<path d="M33594.0 1398.5 L34066.0 1398.5" fill="none" data-name="ImageQuestionFormData"></path>
 						</g>
-						<g transform="translate(36279.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(33594, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
 								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36279.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(33594, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36279.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(33594, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
@@ -8353,17 +8255,17 @@
 					</g>
 					<g data-name="AudioQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="36791.3" y="1314.0" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M36791.3 1345.0 L37263.3 1345.0" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M36791.3 1406.0 L37263.3 1406.0" fill="none" data-name="AudioQuestionFormData"></path>
+							<rect x="34106.0" y="1314.0" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
+							<path d="M34106.0 1345.0 L34578.0 1345.0" fill="none" data-name="AudioQuestionFormData"></path>
+							<path d="M34106.0 1406.0 L34578.0 1406.0" fill="none" data-name="AudioQuestionFormData"></path>
 						</g>
-						<g transform="translate(36791.25, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(34106, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
 								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36791.25, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(34106, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
@@ -8371,7 +8273,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(36791.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(34106, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
@@ -8382,17 +8284,17 @@
 					</g>
 					<g data-name="ScaleQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="37303.3" y="1246.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M37303.3 1277.5 L37647.3 1277.5" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M37303.3 1473.5 L37647.3 1473.5" fill="none" data-name="ScaleQuestionFormData"></path>
+							<rect x="34618.0" y="1246.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M34618.0 1277.5 L34962.0 1277.5" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M34618.0 1473.5 L34962.0 1473.5" fill="none" data-name="ScaleQuestionFormData"></path>
 						</g>
-						<g transform="translate(37303.25, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(34618, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37303.25, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(34618, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
@@ -8409,7 +8311,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(37303.25, 1473.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(34618, 1473.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
@@ -8420,17 +8322,17 @@
 					</g>
 					<g data-name="FreeTextQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="37687.3" y="1306.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M37687.3 1337.5 L38031.3 1337.5" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M37687.3 1413.5 L38031.3 1413.5" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<rect x="35002.0" y="1306.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M35002.0 1337.5 L35346.0 1337.5" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M35002.0 1413.5 L35346.0 1413.5" fill="none" data-name="FreeTextQuestionFormData"></path>
 						</g>
-						<g transform="translate(37687.25, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(35002, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37687.25, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(35002, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
@@ -8439,7 +8341,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(37687.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(35002, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
@@ -8450,9 +8352,9 @@
 					</g>
 					<g data-name="FreeTextQuestionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="37761.3" y="2280.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+							<rect x="35076.0" y="2280.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
 						</g>
-						<g transform="translate(37761.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+						<g transform="translate(35076, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
 								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
@@ -8461,23 +8363,23 @@
 					</g>
 					<g data-name="AudioRecordingQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="11575.0" y="1344.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M11575.0 1375.0 L11927.0 1375.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M11575.0 1406.0 L11927.0 1406.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<rect x="15580.5" y="1344.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
+							<path d="M15580.5 1375.0 L15932.5 1375.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<path d="M15580.5 1406.0 L15932.5 1406.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
 						</g>
-						<g transform="translate(11575, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
+						<g transform="translate(15580.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11575, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+						<g transform="translate(15580.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11575, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+						<g transform="translate(15580.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
 								
@@ -8486,24 +8388,24 @@
 					</g>
 					<g data-name="FreeTextQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="11967.0" y="1321.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M11967.0 1352.5 L12319.0 1352.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M11967.0 1398.5 L12319.0 1398.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<rect x="15972.5" y="1321.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M15972.5 1352.5 L16324.5 1352.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M15972.5 1398.5 L16324.5 1398.5" fill="none" data-name="FreeTextQuestionFormView"></path>
 						</g>
-						<g transform="translate(11967, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(15972.5, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11967, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(15972.5, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11967, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(15972.5, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
@@ -8514,23 +8416,23 @@
 					</g>
 					<g data-name="ImageCapturingQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="12774.0" y="1344.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M12774.0 1375.0 L13126.0 1375.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M12774.0 1406.0 L13126.0 1406.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<rect x="17967.5" y="1344.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
+							<path d="M17967.5 1375.0 L18319.5 1375.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<path d="M17967.5 1406.0 L18319.5 1406.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
 						</g>
-						<g transform="translate(12774, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
+						<g transform="translate(17967.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12774, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+						<g transform="translate(17967.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12774, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+						<g transform="translate(17967.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
 								
@@ -8539,16 +8441,16 @@
 					</g>
 					<g data-name="IScaleQuestionFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="47163.8" y="60.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M47163.8 91.5 L47472.8 91.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
+							<rect x="48428.0" y="60.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M48428.0 91.5 L48737.0 91.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(47163.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+						<g transform="translate(48428, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
 								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47163.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+						<g transform="translate(48428, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
@@ -8557,16 +8459,16 @@
 					</g>
 					<g data-name="ScaleQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="30945.3" y="1359.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M30945.3 1390.5 L31297.3 1390.5" fill="none" data-name="ScaleQuestionFormView"></path>
+							<rect x="30212.5" y="1359.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M30212.5 1390.5 L30564.5 1390.5" fill="none" data-name="ScaleQuestionFormView"></path>
 						</g>
-						<g transform="translate(30945.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+						<g transform="translate(30212.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30945.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+						<g transform="translate(30212.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
@@ -8575,23 +8477,23 @@
 					</g>
 					<g data-name="ChoiceQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="16688.0" y="1344.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M16688.0 1375.0 L17040.0 1375.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M16688.0 1406.0 L17040.0 1406.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<rect x="23583.8" y="1344.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M23583.8 1375.0 L23935.8 1375.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M23583.8 1406.0 L23935.8 1406.0" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(16688, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(23583.75, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16688, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(23583.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16688, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(23583.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
 								
@@ -8600,23 +8502,23 @@
 					</g>
 					<g data-name="BoolQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="17882.3" y="1344.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M17882.3 1375.0 L18234.3 1375.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M17882.3 1406.0 L18234.3 1406.0" fill="none" data-name="BoolQuestionFormView"></path>
+							<rect x="23975.8" y="1344.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M23975.8 1375.0 L24327.8 1375.0" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M23975.8 1406.0 L24327.8 1406.0" fill="none" data-name="BoolQuestionFormView"></path>
 						</g>
-						<g transform="translate(17882.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+						<g transform="translate(23975.75, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17882.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+						<g transform="translate(23975.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17882.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+						<g transform="translate(23975.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
 								
@@ -8625,16 +8527,16 @@
 					</g>
 					<g data-name="SurveyQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="32169.3" y="1352.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M32169.3 1383.0 L32521.3 1383.0" fill="none" data-name="SurveyQuestionFormView"></path>
+							<rect x="30684.5" y="1352.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M30684.5 1383.0 L31036.5 1383.0" fill="none" data-name="SurveyQuestionFormView"></path>
 						</g>
-						<g transform="translate(32169.25, 1352)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+						<g transform="translate(30684.5, 1352)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32169.25, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+						<g transform="translate(30684.5, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
@@ -8644,9 +8546,9 @@
 					</g>
 					<g data-name="StudyUTimeOfDay">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="40437.8" y="1375.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
+							<rect x="36165.0" y="1375.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
 						</g>
-						<g transform="translate(40437.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
+						<g transform="translate(36165, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
 								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
 								
@@ -8655,23 +8557,23 @@
 					</g>
 					<g data-name="ScheduleControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="26761.0" y="971.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M26761.0 1002.0 L27193.0 1002.0" fill="none" data-name="ScheduleControls"></path>
-							<path d="M26761.0 1033.0 L27193.0 1033.0" fill="none" data-name="ScheduleControls"></path>
+							<rect x="42072.8" y="971.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
+							<path d="M42072.8 1002.0 L42504.8 1002.0" fill="none" data-name="ScheduleControls"></path>
+							<path d="M42072.8 1033.0 L42504.8 1033.0" fill="none" data-name="ScheduleControls"></path>
 						</g>
-						<g transform="translate(26761, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
+						<g transform="translate(42072.75, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
 								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26761, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+						<g transform="translate(42072.75, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26761, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+						<g transform="translate(42072.75, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
@@ -8681,16 +8583,16 @@
 					</g>
 					<g data-name="StudiesTableColumnHeader">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
-							<rect x="32883.3" y="1329.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
-							<path d="M32883.3 1360.5 L33120.3 1360.5" fill="none" data-name="StudiesTableColumnHeader"></path>
+							<rect x="31347.3" y="1329.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
+							<path d="M31347.3 1360.5 L31584.3 1360.5" fill="none" data-name="StudiesTableColumnHeader"></path>
 						</g>
-						<g transform="translate(32883.25, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
+						<g transform="translate(31347.25, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
 								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32883.25, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
+						<g transform="translate(31347.25, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
@@ -8703,16 +8605,16 @@
 					</g>
 					<g data-name="DashboardScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="29074.3" y="2265.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
-							<path d="M29074.3 2296.0 L29252.3 2296.0" fill="none" data-name="DashboardScreen"></path>
+							<rect x="31852.5" y="2265.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
+							<path d="M31852.5 2296.0 L32030.5 2296.0" fill="none" data-name="DashboardScreen"></path>
 						</g>
-						<g transform="translate(29074.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
+						<g transform="translate(31852.5, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
 								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29074.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
+						<g transform="translate(31852.5, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
 								
@@ -8721,16 +8623,16 @@
 					</g>
 					<g data-name="StudiesFilter">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
-							<rect x="14398.5" y="3133.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
-							<path d="M14398.5 3164.0 L14694.5 3164.0" fill="none" data-name="StudiesFilter"></path>
+							<rect x="13499.5" y="3133.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
+							<path d="M13499.5 3164.0 L13795.5 3164.0" fill="none" data-name="StudiesFilter"></path>
 						</g>
-						<g transform="translate(14398.5, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
+						<g transform="translate(13499.5, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
 								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14398.5, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
+						<g transform="translate(13499.5, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
@@ -8740,24 +8642,24 @@
 					</g>
 					<g data-name="DashboardScaffold">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
-							<rect x="33160.3" y="1336.5" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
-							<path d="M33160.3 1367.5 L33503.3 1367.5" fill="none" data-name="DashboardScaffold"></path>
-							<path d="M33160.3 1413.5 L33503.3 1413.5" fill="none" data-name="DashboardScaffold"></path>
+							<rect x="31624.3" y="1336.5" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
+							<path d="M31624.3 1367.5 L31967.3 1367.5" fill="none" data-name="DashboardScaffold"></path>
+							<path d="M31624.3 1413.5 L31967.3 1413.5" fill="none" data-name="DashboardScaffold"></path>
 						</g>
-						<g transform="translate(33160.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
+						<g transform="translate(31624.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
 								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33160.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+						<g transform="translate(31624.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33160.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+						<g transform="translate(31624.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
 								
@@ -8766,17 +8668,17 @@
 					</g>
 					<g data-name="DashboardController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
-							<rect x="17153.0" y="2107.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
-							<path d="M17153.0 2138.0 L17767.0 2138.0" fill="none" data-name="DashboardController"></path>
-							<path d="M17153.0 2259.0 L17767.0 2259.0" fill="none" data-name="DashboardController"></path>
+							<rect x="17785.8" y="2107.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
+							<path d="M17785.8 2138.0 L18399.8 2138.0" fill="none" data-name="DashboardController"></path>
+							<path d="M17785.8 2259.0 L18399.8 2259.0" fill="none" data-name="DashboardController"></path>
 						</g>
-						<g transform="translate(17153, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
+						<g transform="translate(17785.75, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
 								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17153, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+						<g transform="translate(17785.75, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
@@ -8788,7 +8690,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(17153, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+						<g transform="translate(17785.75, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
@@ -8810,9 +8712,9 @@
 					</g>
 					<g data-name="IUserRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="14215.5" y="3156.0" height="31.0" width="143.0" data-name="IUserRepository"></rect>
+							<rect x="12884.5" y="3156.0" height="31.0" width="143.0" data-name="IUserRepository"></rect>
 						</g>
-						<g transform="translate(14215.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
+						<g transform="translate(12884.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
 								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
 								
@@ -8821,9 +8723,9 @@
 					</g>
 					<g data-name="SearchController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="14734.5" y="3156.0" height="31.0" width="149.0" data-name="SearchController"></rect>
+							<rect x="13067.5" y="3156.0" height="31.0" width="149.0" data-name="SearchController"></rect>
 						</g>
-						<g transform="translate(14734.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
+						<g transform="translate(13067.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
 								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
 								
@@ -8832,17 +8734,17 @@
 					</g>
 					<g data-name="StudiesTableColumnSize">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
-							<rect x="47512.8" y="30.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
-							<path d="M47512.8 61.0 L47737.8 61.0" fill="none" data-name="StudiesTableColumnSize"></path>
-							<path d="M47512.8 122.0 L47737.8 122.0" fill="none" data-name="StudiesTableColumnSize"></path>
+							<rect x="48777.0" y="30.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
+							<path d="M48777.0 61.0 L49002.0 61.0" fill="none" data-name="StudiesTableColumnSize"></path>
+							<path d="M48777.0 122.0 L49002.0 122.0" fill="none" data-name="StudiesTableColumnSize"></path>
 						</g>
-						<g transform="translate(47512.75, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
+						<g transform="translate(48777, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
 								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47512.75, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+						<g transform="translate(48777, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
@@ -8850,7 +8752,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(47512.75, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+						<g transform="translate(48777, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
 								
@@ -8859,17 +8761,17 @@
 					</g>
 					<g data-name="StudiesTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
-							<rect x="33543.3" y="1246.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
-							<path d="M33543.3 1277.5 L34023.3 1277.5" fill="none" data-name="StudiesTable"></path>
-							<path d="M33543.3 1488.5 L34023.3 1488.5" fill="none" data-name="StudiesTable"></path>
+							<rect x="32258.0" y="1246.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
+							<path d="M32258.0 1277.5 L32738.0 1277.5" fill="none" data-name="StudiesTable"></path>
+							<path d="M32258.0 1488.5 L32738.0 1488.5" fill="none" data-name="StudiesTable"></path>
 						</g>
-						<g transform="translate(33543.25, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
+						<g transform="translate(32258, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
 								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33543.25, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+						<g transform="translate(32258, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
@@ -8887,7 +8789,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(33543.25, 1488.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+						<g transform="translate(32258, 1488.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
@@ -8897,9 +8799,9 @@
 					</g>
 					<g data-name="void Function(Study)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
-							<rect x="33488.0" y="2280.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
+							<rect x="32070.5" y="2280.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
 						</g>
-						<g transform="translate(33488, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
+						<g transform="translate(32070.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
 								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
 								
@@ -8908,9 +8810,9 @@
 					</g>
 					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<rect x="34008.5" y="2280.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
+							<rect x="32289.5" y="2280.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
 						</g>
-						<g transform="translate(34008.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+						<g transform="translate(32289.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
 								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
 								
@@ -8919,16 +8821,16 @@
 					</g>
 					<g data-name="StudiesTableColumn">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
-							<rect x="2476.0" y="3065.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
-							<path d="M2476.0 3096.5 L2837.0 3096.5" fill="none" data-name="StudiesTableColumn"></path>
+							<rect x="1972.0" y="3065.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
+							<path d="M1972.0 3096.5 L2333.0 3096.5" fill="none" data-name="StudiesTableColumn"></path>
 						</g>
-						<g transform="translate(2476, 3065.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
+						<g transform="translate(1972, 3065.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
 								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2476, 3096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
+						<g transform="translate(1972, 3096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
@@ -8947,16 +8849,16 @@
 					</g>
 					<g data-name="StudiesTableItem">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
-							<rect x="30294.8" y="2197.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
-							<path d="M30294.8 2228.5 L30694.8 2228.5" fill="none" data-name="StudiesTableItem"></path>
+							<rect x="33661.3" y="2197.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
+							<path d="M33661.3 2228.5 L34061.3 2228.5" fill="none" data-name="StudiesTableItem"></path>
 						</g>
-						<g transform="translate(30294.75, 2197.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
+						<g transform="translate(33661.25, 2197.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
 								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30294.75, 2228.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
+						<g transform="translate(33661.25, 2228.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
@@ -8974,9 +8876,9 @@
 					</g>
 					<g data-name="void Function(Study, bool)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
-							<rect x="30562.5" y="3156.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
+							<rect x="32240.5" y="3156.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
 						</g>
-						<g transform="translate(30562.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
+						<g transform="translate(32240.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
 								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
 								
@@ -8985,9 +8887,9 @@
 					</g>
 					<g data-name="void Function(Study)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
-							<rect x="30835.5" y="3156.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
+							<rect x="33087.0" y="3156.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
 						</g>
-						<g transform="translate(30835.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
+						<g transform="translate(33087, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
 								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
 								
@@ -8996,9 +8898,9 @@
 					</g>
 					<g data-name="App">
 						<g fill="#eee8d5" stroke="#33322E" data-name="App">
-							<rect x="47777.8" y="76.0" height="31.0" width="47.0" data-name="App"></rect>
+							<rect x="49042.0" y="76.0" height="31.0" width="47.0" data-name="App"></rect>
 						</g>
-						<g transform="translate(47777.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
+						<g transform="translate(49042, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
 								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
 								
@@ -9007,9 +8909,9 @@
 					</g>
 					<g data-name="AppContent">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
-							<rect x="47864.8" y="76.0" height="31.0" width="109.0" data-name="AppContent"></rect>
+							<rect x="49129.0" y="76.0" height="31.0" width="109.0" data-name="AppContent"></rect>
 						</g>
-						<g transform="translate(47864.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
+						<g transform="translate(49129, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
 								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
 								
@@ -9018,16 +8920,16 @@
 					</g>
 					<g data-name="AccountSettingsDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
-							<rect x="18727.3" y="1359.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
-							<path d="M18727.3 1390.5 L18921.3 1390.5" fill="none" data-name="AccountSettingsDialog"></path>
+							<rect x="24367.8" y="1359.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
+							<path d="M24367.8 1390.5 L24561.8 1390.5" fill="none" data-name="AccountSettingsDialog"></path>
 						</g>
-						<g transform="translate(18727.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
+						<g transform="translate(24367.75, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
 								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18727.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
+						<g transform="translate(24367.75, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
 								
diff --git a/docs/uml/designer_v2/lib/uml.svg b/docs/uml/designer_v2/lib/uml.svg
index 22e73cd1e..45a13971a 100644
--- a/docs/uml/designer_v2/lib/uml.svg
+++ b/docs/uml/designer_v2/lib/uml.svg
@@ -1,4 +1,4 @@
-<svg version="1.1" baseProfile="full" width="83214.0" height="4748.0" viewbox="0 0 83214 4748" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+<svg version="1.1" baseProfile="full" width="84151.5" height="4748.0" viewbox="0 0 84151.5 4748" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
 	<desc >[Config
 	  |
 	  &lt;static&gt;+isDebugMode: bool;
@@ -10,6 +10,34 @@
 	  &lt;static&gt;+formAutosaveDebounce: int
 	]
 	
+	[StudyMonitorData
+	  |
+	  +activeParticipants: int;
+	  +dropoutParticipants: int;
+	  +completedParticipants: int;
+	  +items: List&lt;StudyMonitorItem&gt;
+	]
+	
+	[StudyMonitorItem
+	  |
+	  +participantId: String;
+	  +inviteCode: String?;
+	  +enrolledAt: DateTime;
+	  +lastActivityAt: DateTime;
+	  +currentDayOfStudy: int;
+	  +studyDurationInDays: int;
+	  +completedInterventions: int;
+	  +missedInterventions: int;
+	  +completedSurveys: int;
+	  +missedSurveys: int;
+	  +droppedOut: bool;
+	  +missedTasksPerDay: List&lt;Set&lt;String&gt;&gt;;
+	  +completedTasksPerDay: List&lt;Set&lt;String&gt;&gt;;
+	  +props: List&lt;Object?&gt;
+	]
+	
+	[&lt;abstract&gt;Equatable]&lt;:-[StudyMonitorItem]
+	
 	[&lt;abstract&gt;ResultTypes
 	]
 	
@@ -1513,16 +1541,6 @@
 	  -dynamic _callDelegates()
 	]
 	
-	[ParticipantDetailsFormView
-	  |
-	  +formViewModel: ParticipantDetailsFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ParticipantDetailsFormView]o-[ParticipantDetailsFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ParticipantDetailsFormView]
-	
 	[StudyMonitorScreen
 	  |
 	  +Widget build();
@@ -1533,26 +1551,6 @@
 	
 	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
 	
-	[StudyMonitorItem
-	  |
-	  +participantId: String;
-	  +inviteCode: String?;
-	  +enrolledAt: DateTime;
-	  +lastActivityAt: DateTime;
-	  +currentDayOfStudy: int;
-	  +studyDurationInDays: int;
-	  +completedInterventions: int;
-	  +missedInterventions: int;
-	  +completedSurveys: int;
-	  +missedSurveys: int;
-	  +rawData: String;
-	  +props: List&lt;Object?&gt;
-	  |
-	  &lt;static&gt;+List&lt;StudyMonitorItem&gt; fromStudy()
-	]
-	
-	[&lt;abstract&gt;Equatable]&lt;:-[StudyMonitorItem]
-	
 	[StudyMonitorTable
 	  |
 	  +studyMonitorItems: List&lt;StudyMonitorItem&gt;;
@@ -1566,21 +1564,18 @@
 	
 	[StudyMonitorTable]o-[void Function(StudyMonitorItem)]
 	
-	[ParticipantDetailsFormViewModel
+	[ParticipantDetailsView
 	  |
-	  +participantIdControl: FormControl&lt;String&gt;;
-	  +rawDataControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +monitorItem: StudyMonitorItem;
+	  +interventions: List&lt;Intervention&gt;;
+	  +observations: List&lt;Observation&gt;
 	  |
-	  +void initControls();
-	  +StudyMonitorItem buildFormData();
-	  +void setControlsFrom()
+	  +Widget build();
+	  -Widget _buildPerDayStatus();
+	  -String _getTooltipText()
 	]
 	
-	[ParticipantDetailsFormViewModel]o-[FormControl]
-	[ParticipantDetailsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[ParticipantDetailsFormViewModel]
+	[ParticipantDetailsView]o-[StudyMonitorItem]
 	
 	[LoginForm
 	  |
@@ -4396,2274 +4391,2262 @@
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="4748.0" width="83214.0" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="4748.0" width="84151.5" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
 				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M26842.5 158.2 L26584 293 L26584 591 L26584.0 591.0 " fill="none"></path>
-					<path d="M26844.9 162.9 L26842.5 158.2 L26840.0 153.4 L26854.3 152.0 Z"></path>
-					<path d="M26884.0 165.3 L26884 293 L26884 591 L26884.0 591.0 " fill="none"></path>
-					<path d="M26889.3 165.3 L26884.0 165.3 L26878.7 165.3 L26884.0 152.0 Z"></path>
-					<path d="M207.0 2704.7 L207 3314 L63638.5 3500.4103676215686 L63638.5 3500.4 " fill="none"></path>
+					<path d="M107.2 1726.1 L72 1936 L22360.25 2619.4345842744133 L22360.3 2619.4 " fill="none"></path>
+					<path d="M112.5 1727.0 L107.2 1726.1 L101.9 1725.3 L109.4 1713.0 Z"></path>
+					<path d="M26605.7 158.2 L26347.25 293 L26347.25 591 L26347.3 591.0 " fill="none"></path>
+					<path d="M26608.2 162.9 L26605.7 158.2 L26603.2 153.4 L26617.5 152.0 Z"></path>
+					<path d="M26647.3 165.3 L26647.25 293 L26647.25 591 L26647.3 591.0 " fill="none"></path>
+					<path d="M26652.6 165.3 L26647.3 165.3 L26641.9 165.3 L26647.3 152.0 Z"></path>
+					<path d="M631.0 2704.7 L631 3314 L64459 3500.4109241526185 L64459.0 3500.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M212.3 2695.3 L207.0 2704.7 L201.7 2695.3 L207.0 2686.0 Z"></path>
+						<path d="M636.3 2695.3 L631.0 2704.7 L625.7 2695.3 L631.0 2686.0 Z"></path>
 					</g>
-					<path d="M442.9 3408.2 L456 3402 L463.5 3402 L463.5 3402 L471 3500.5 L471 3500.5 L463.5 3599 L463.5 3599 L456 3599 L456 3599 L426 3584.8612440191387 L426.0 3584.9 " fill="none"></path>
+					<path d="M866.9 3408.2 L880 3402 L887.5 3402 L887.5 3402 L895 3500.5 L895 3500.5 L887.5 3599 L887.5 3599 L880 3599 L880 3599 L850 3584.8612440191387 L850.0 3584.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M432.2 3407.3 L442.9 3408.2 L436.7 3417.0 L426.0 3416.1 Z"></path>
+						<path d="M856.2 3407.3 L866.9 3408.2 L860.7 3417.0 L850.0 3416.1 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3061.8 2635.5 L247 3314 L247 3402 L247.0 3402.0 " fill="none"></path>
+						<path d="M3485.8 2635.5 L671 3314 L671 3402 L671.0 3402.0 " fill="none"></path>
 					</g>
-					<path d="M3063.0 2640.7 L3061.8 2635.5 L3060.5 2630.3 L3074.8 2632.4 Z"></path>
-					<path d="M3821.2 2726.9 L3721.5 3314 L3470.9490616621983 3469.5 L3470.9 3469.5 " fill="none"></path>
+					<path d="M3487.0 2640.7 L3485.8 2635.5 L3484.5 2630.3 L3498.8 2632.4 Z"></path>
+					<path d="M4245.2 2726.9 L4145.5 3314 L3894.9490616621983 3469.5 L3894.9 3469.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3828.0 2718.6 L3821.2 2726.9 L3817.5 2716.8 L3824.3 2708.5 Z"></path>
+						<path d="M4252.0 2718.6 L4245.2 2726.9 L4241.5 2716.8 L4248.3 2708.5 Z"></path>
 					</g>
-					<path d="M3864.1 2726.6 L4012.25 3314 L3725.0348525469167 3454.5 L3725.0 3454.5 " fill="none"></path>
+					<path d="M4288.1 2726.6 L4436.25 3314 L4149.034852546917 3454.5 L4149.0 3454.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3867.0 2716.2 L3864.1 2726.6 L3856.7 2718.9 L3859.6 2708.5 Z"></path>
+						<path d="M4291.0 2716.2 L4288.1 2726.6 L4280.7 2718.9 L4283.6 2708.5 Z"></path>
 					</g>
-					<path d="M1867.5 3550.2 L1867.5 3687 L1867.5 3797.5 L1867.5 3797.5 " fill="none"></path>
+					<path d="M2291.5 3550.2 L2291.5 3687 L2291.5 3797.5 L2291.5 3797.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1872.8 3540.8 L1867.5 3550.2 L1862.2 3540.8 L1867.5 3531.5 Z"></path>
+						<path d="M2296.8 3540.8 L2291.5 3550.2 L2286.2 3540.8 L2291.5 3531.5 Z"></path>
 					</g>
-					<path d="M60785.5 3931.2 L60785.5 4000 L61189.19589552239 4118.5 L61189.2 4118.5 " fill="none"></path>
+					<path d="M61821.5 3931.2 L61821.5 4000 L63516.75 4128.504313392731 L63516.8 4128.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60790.8 3921.8 L60785.5 3931.2 L60780.2 3921.8 L60785.5 3912.5 Z"></path>
+						<path d="M61826.8 3921.8 L61821.5 3931.2 L61816.2 3921.8 L61821.5 3912.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M60785.5 3567.3 L60785.5 3687 L60785.5 3774.5 L60785.5 3774.5 " fill="none"></path>
+						<path d="M61821.5 3567.3 L61821.5 3687 L61821.5 3774.5 L61821.5 3774.5 " fill="none"></path>
 					</g>
-					<path d="M60790.8 3567.3 L60785.5 3567.3 L60780.2 3567.3 L60785.5 3554.0 Z"></path>
-					<path d="M4202.1 2719.6 L4052.25 3314 L21865.75 3500.129068855398 L21865.8 3500.1 " fill="none"></path>
+					<path d="M61826.8 3567.3 L61821.5 3567.3 L61816.2 3567.3 L61821.5 3554.0 Z"></path>
+					<path d="M4626.1 2719.6 L4476.25 3314 L21189 3500.1046900422434 L21189.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4209.6 2711.9 L4202.1 2719.6 L4199.3 2709.2 L4206.7 2701.5 Z"></path>
+						<path d="M4633.6 2711.9 L4626.1 2719.6 L4623.3 2709.2 L4630.7 2701.5 Z"></path>
 					</g>
-					<path d="M4207.6 2719.8 L4092.25 3314 L27961.75 3500.1607389286164 L27961.8 3500.2 " fill="none"></path>
+					<path d="M4631.6 2719.8 L4516.25 3314 L25956.25 3500.122372983918 L25956.3 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4214.6 2711.7 L4207.6 2719.8 L4204.1 2709.6 L4211.1 2701.5 Z"></path>
+						<path d="M4638.6 2711.7 L4631.6 2719.8 L4628.1 2709.6 L4635.1 2701.5 Z"></path>
 					</g>
-					<path d="M4213.1 2720.0 L4132.25 3314 L1634 3489.1098844310814 L1634.0 3489.1 " fill="none"></path>
+					<path d="M4637.1 2720.0 L4556.25 3314 L2058 3489.1098844310814 L2058.0 3489.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4219.6 2711.5 L4213.1 2720.0 L4209.0 2710.0 L4215.6 2701.5 Z"></path>
+						<path d="M4643.6 2711.5 L4637.1 2720.0 L4633.0 2710.0 L4639.6 2701.5 Z"></path>
 					</g>
-					<path d="M1867.5 3908.2 L1867.5 4000 L8450 4132.321482148215 L8450.0 4132.3 " fill="none"></path>
+					<path d="M2291.5 3908.2 L2291.5 4000 L7295.25 4131.8005798810755 L7295.3 4131.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1872.8 3898.8 L1867.5 3908.2 L1862.2 3898.8 L1867.5 3889.5 Z"></path>
+						<path d="M2296.8 3898.8 L2291.5 3908.2 L2286.2 3898.8 L2291.5 3889.5 Z"></path>
 					</g>
-					<path d="M4336.6 2709.6 L5127 3314 L3489 3493.0662368112544 L3489.0 3493.1 " fill="none"></path>
-					<path d="M4339.9 2705.4 L4336.6 2709.6 L4333.4 2713.8 L4326.0 2701.5 Z"></path>
-					<path d="M4361.7 2708.5 L5345.75 3314 L3733 3489.406254556058 L3733.0 3489.4 " fill="none"></path>
-					<path d="M4364.5 2703.9 L4361.7 2708.5 L4358.9 2713.0 L4350.3 2701.5 Z"></path>
-					<path d="M1651.8 3443.4 L1664 3439.5 L1671.5 3439.5 L1671.5 3439.5 L1679 3500.5 L1679 3500.5 L1671.5 3561.5 L1671.5 3561.5 L1664 3561.5 L1664 3561.5 L1634 3551.9935064935066 L1634.0 3552.0 " fill="none"></path>
+					<path d="M4760.6 2709.6 L5551 3314 L3913 3493.0662368112544 L3913.0 3493.1 " fill="none"></path>
+					<path d="M4763.9 2705.4 L4760.6 2709.6 L4757.4 2713.8 L4750.0 2701.5 Z"></path>
+					<path d="M4785.7 2708.5 L5769.75 3314 L4157 3489.406254556058 L4157.0 3489.4 " fill="none"></path>
+					<path d="M4788.5 2703.9 L4785.7 2708.5 L4782.9 2713.0 L4774.3 2701.5 Z"></path>
+					<path d="M2075.8 3443.4 L2088 3439.5 L2095.5 3439.5 L2095.5 3439.5 L2103 3500.5 L2103 3500.5 L2095.5 3561.5 L2095.5 3561.5 L2088 3561.5 L2088 3561.5 L2058 3551.9935064935066 L2058.0 3552.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1641.3 3441.1 L1651.8 3443.4 L1644.5 3451.3 L1634.0 3449.0 Z"></path>
+						<path d="M2065.3 3441.1 L2075.8 3443.4 L2068.5 3451.3 L2058.0 3449.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3062.1 2639.2 L1016 3314 L1322.5160857908847 3439.5 L1322.5 3439.5 " fill="none"></path>
+						<path d="M3486.1 2639.2 L1440 3314 L1746.5160857908847 3439.5 L1746.5 3439.5 " fill="none"></path>
 					</g>
-					<path d="M3063.8 2644.3 L3062.1 2639.2 L3060.4 2634.2 L3074.8 2635.1 Z"></path>
+					<path d="M3487.8 2644.3 L3486.1 2639.2 L3484.4 2634.2 L3498.8 2635.1 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M27406.0 180.8 L27406 293 L27406 598.5 L27406.0 598.5 " fill="none"></path>
+						<path d="M27169.3 180.8 L27169.25 293 L27169.25 598.5 L27169.3 598.5 " fill="none"></path>
 					</g>
-					<path d="M27411.3 180.8 L27406.0 180.8 L27400.7 180.8 L27406.0 167.5 Z"></path>
-					<path d="M5521.4 2704.2 L5385.75 3314 L21865.75 3500.0991190094155 L21865.8 3500.1 " fill="none"></path>
+					<path d="M27174.6 180.8 L27169.3 180.8 L27163.9 180.8 L27169.3 167.5 Z"></path>
+					<path d="M5945.4 2704.2 L5809.75 3314 L21189 3500.070492547722 L21189.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5528.6 2696.3 L5521.4 2704.2 L5518.2 2694.0 L5525.4 2686.0 Z"></path>
+						<path d="M5952.6 2696.3 L5945.4 2704.2 L5942.2 2694.0 L5949.4 2686.0 Z"></path>
 					</g>
-					<path d="M5550.0 2704.5 L5634.25 3314 L3935 3492.01439404578 L3935.0 3492.0 " fill="none"></path>
+					<path d="M5974.0 2704.5 L6058.25 3314 L4359 3492.01439404578 L4359.0 3492.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5554.0 2694.5 L5550.0 2704.5 L5543.4 2696.0 L5547.4 2686.0 Z"></path>
+						<path d="M5978.0 2694.5 L5974.0 2704.5 L5967.4 2696.0 L5971.4 2686.0 Z"></path>
 					</g>
-					<path d="M5903.4 2742.1 L5756.25 3314 L35656.25 3500.160677026824 L35656.3 3500.2 " fill="none"></path>
+					<path d="M6327.4 2742.1 L6180.25 3314 L35359.5 3500.1523111130114 L35359.5 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5910.9 2734.4 L5903.4 2742.1 L5900.5 2731.7 L5908.0 2724.0 Z"></path>
+						<path d="M6334.9 2734.4 L6327.4 2742.1 L6324.5 2731.7 L6332.0 2724.0 Z"></path>
 					</g>
-					<path d="M5910.1 2742.3 L5796.25 3314 L30375.75 3499.8723466801825 L30375.8 3499.9 " fill="none"></path>
+					<path d="M6334.1 2742.3 L6220.25 3314 L29511.5 3499.8377541525397 L29511.5 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5917.2 2734.2 L5910.1 2742.3 L5906.7 2732.1 L5913.8 2724.0 Z"></path>
+						<path d="M6341.2 2734.2 L6334.1 2742.3 L6330.7 2732.1 L6337.8 2724.0 Z"></path>
 					</g>
-					<path d="M5916.9 2742.5 L5836.25 3314 L4279.141420911528 3485 L4279.1 3485.0 " fill="none"></path>
+					<path d="M6340.9 2742.5 L6260.25 3314 L4703.141420911528 3485 L4703.1 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5923.5 2734.0 L5916.9 2742.5 L5912.9 2732.5 L5919.5 2724.0 Z"></path>
+						<path d="M6347.5 2734.0 L6340.9 2742.5 L6336.9 2732.5 L6343.5 2724.0 Z"></path>
 					</g>
-					<path d="M5964.6 2742.0 L6116.5 3314 L4507 3491.3540620384047 L4507.0 3491.4 " fill="none"></path>
+					<path d="M6388.6 2742.0 L6540.5 3314 L4931 3491.3540620384047 L4931.0 3491.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5967.3 2731.7 L5964.6 2742.0 L5957.0 2734.4 L5959.8 2724.0 Z"></path>
+						<path d="M6391.3 2731.7 L6388.6 2742.0 L6381.0 2734.4 L6383.8 2724.0 Z"></path>
 					</g>
-					<path d="M6421.6 2719.4 L6246 3314 L25990.5 3499.8505185858126 L25990.5 3499.9 " fill="none"></path>
+					<path d="M6845.6 2719.4 L6670 3314 L24200.25 3499.768804068355 L24200.3 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6429.4 2712.0 L6421.6 2719.4 L6419.1 2708.9 L6426.9 2701.5 Z"></path>
+						<path d="M6853.4 2712.0 L6845.6 2719.4 L6843.1 2708.9 L6850.9 2701.5 Z"></path>
 					</g>
-					<path d="M6427.0 2719.7 L6286 3314 L11066 3498.7797699243447 L11066.0 3498.8 " fill="none"></path>
+					<path d="M6851.0 2719.7 L6710 3314 L10582 3498.3809523809523 L10582.0 3498.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6434.4 2711.8 L6427.0 2719.7 L6424.0 2709.3 L6431.3 2701.5 Z"></path>
+						<path d="M6858.4 2711.8 L6851.0 2719.7 L6848.0 2709.3 L6855.3 2701.5 Z"></path>
 					</g>
-					<path d="M6455.0 2720.1 L6489.5 3314 L4869.813672922252 3485 L4869.8 3485.0 " fill="none"></path>
+					<path d="M6879.0 2720.1 L6913.5 3314 L5293.813672922252 3485 L5293.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6459.8 2710.5 L6455.0 2720.1 L6449.2 2711.1 L6453.9 2701.5 Z"></path>
+						<path d="M6883.8 2710.5 L6879.0 2720.1 L6873.2 2711.1 L6877.9 2701.5 Z"></path>
 					</g>
-					<path d="M6950.0 2772.0 L6801.75 3314 L22088 3500.1468552586475 L22088.0 3500.1 " fill="none"></path>
+					<path d="M7374.0 2772.0 L7225.75 3314 L21300 3500.1165068335313 L21300.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6957.6 2764.4 L6950.0 2772.0 L6947.4 2761.6 L6955.0 2754.0 Z"></path>
+						<path d="M7381.6 2764.4 L7374.0 2772.0 L7371.4 2761.6 L7379.0 2754.0 Z"></path>
 					</g>
-					<path d="M6958.5 2772.2 L6841.75 3314 L5712.25 3496.5405112651647 L5712.3 3496.5 " fill="none"></path>
+					<path d="M7382.5 2772.2 L7265.75 3314 L6136.25 3496.5405112651647 L6136.3 3496.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6965.7 2764.2 L6958.5 2772.2 L6955.3 2762.0 L6962.4 2754.0 Z"></path>
+						<path d="M7389.7 2764.2 L7382.5 2772.2 L7379.3 2762.0 L7386.4 2754.0 Z"></path>
 					</g>
-					<path d="M7010.7 2772.5 L7086 3314 L5926.25 3487.485762983758 L5926.3 3487.5 " fill="none"></path>
+					<path d="M7434.7 2772.5 L7510 3314 L6350.25 3487.485762983758 L6350.3 3487.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7014.7 2762.5 L7010.7 2772.5 L7004.2 2764.0 L7008.2 2754.0 Z"></path>
+						<path d="M7438.7 2762.5 L7434.7 2772.5 L7428.2 2764.0 L7432.2 2754.0 Z"></path>
 					</g>
-					<path d="M7388.9 2697.0 L7319.5 3314 L6176.367292225201 3485 L6176.4 3485.0 " fill="none"></path>
+					<path d="M7812.9 2697.0 L7743.5 3314 L6600.367292225201 3485 L6600.4 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7395.2 2688.4 L7388.9 2697.0 L7384.6 2687.2 L7391.0 2678.5 Z"></path>
+						<path d="M7819.2 2688.4 L7812.9 2697.0 L7808.6 2687.2 L7815.0 2678.5 Z"></path>
 					</g>
-					<path d="M7412.2 2696.8 L7543.25 3314 L37488.25 3499.700023275919 L37488.3 3499.7 " fill="none"></path>
+					<path d="M7836.2 2696.8 L7967.25 3314 L40261.25 3499.7579804459797 L40261.3 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7415.5 2686.5 L7412.2 2696.8 L7405.1 2688.7 L7408.4 2678.5 Z"></path>
+						<path d="M7839.5 2686.5 L7836.2 2696.8 L7829.1 2688.7 L7832.4 2678.5 Z"></path>
 					</g>
-					<path d="M37617.3 3550.2 L37617.25 3687 L37617.25 3828 L37617.3 3828.0 " fill="none"></path>
+					<path d="M40390.3 3550.2 L40390.25 3687 L40390.25 3828 L40390.3 3828.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37622.6 3540.8 L37617.3 3550.2 L37611.9 3540.8 L37617.3 3531.5 Z"></path>
+						<path d="M40395.6 3540.8 L40390.3 3550.2 L40384.9 3540.8 L40390.3 3531.5 Z"></path>
 					</g>
-					<path d="M7729.5 2712.2 L7729.5 3314 L21865.75 3500.032820576146 L21865.8 3500.0 " fill="none"></path>
+					<path d="M8153.5 2712.2 L8153.5 3314 L21189 3499.993477928238 L21189.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7734.8 2702.8 L7729.5 2712.2 L7724.2 2702.8 L7729.5 2693.5 Z"></path>
+						<path d="M8158.8 2702.8 L8153.5 2712.2 L8148.2 2702.8 L8153.5 2693.5 Z"></path>
 					</g>
-					<path d="M7999.1 2734.9 L7894.25 3314 L21865.75 3500.027325622903 L21865.8 3500.0 " fill="none"></path>
+					<path d="M8423.1 2734.9 L8318.25 3314 L21189 3499.9870121065373 L21189.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8006.0 2726.6 L7999.1 2734.9 L7995.5 2724.7 L8002.4 2716.5 Z"></path>
+						<path d="M8430.0 2726.6 L8423.1 2734.9 L8419.5 2724.7 L8426.4 2716.5 Z"></path>
 					</g>
-					<path d="M8043.7 2734.7 L8174 3314 L12912 3497.861215147732 L12912.0 3497.9 " fill="none"></path>
+					<path d="M8467.7 2734.7 L8598 3314 L13267 3497.8227781296177 L13267.0 3497.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8046.8 2724.4 L8043.7 2734.7 L8036.4 2726.8 L8039.6 2716.5 Z"></path>
+						<path d="M8470.8 2724.4 L8467.7 2734.7 L8460.4 2726.8 L8463.6 2716.5 Z"></path>
 					</g>
-					<path d="M8339.4 2756.7 L8214 3314 L27961.75 3500.0900840017684 L27961.8 3500.1 " fill="none"></path>
+					<path d="M8763.4 2756.7 L8638 3314 L25956.25 3500.032722795801 L25956.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8346.6 2748.8 L8339.4 2756.7 L8336.2 2746.4 L8343.5 2738.5 Z"></path>
+						<path d="M8770.6 2748.8 L8763.4 2756.7 L8760.2 2746.4 L8767.5 2738.5 Z"></path>
 					</g>
-					<path d="M8350.6 2757.0 L8273 3314 L8273 3500.5 L8273 3500.5 L8273 3687 L8273 3687 L8273 3843.5 L8273 3843.5 L8273 4000 L8273 4000 L18277.25 4133.042500930405 L18277.3 4133.0 " fill="none"></path>
+					<path d="M8774.6 2757.0 L8697 3314 L8697 3500.5 L8697 3500.5 L8697 3687 L8697 3687 L8697 3843.5 L8697 3843.5 L8697 4000 L8697 4000 L18072.75 4132.978804477257 L18072.8 4133.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8357.2 2748.5 L8350.6 2757.0 L8346.6 2747.0 L8353.2 2738.5 Z"></path>
+						<path d="M8781.2 2748.5 L8774.6 2757.0 L8770.6 2747.0 L8777.2 2738.5 Z"></path>
 					</g>
-					<path d="M8358.3 2757.1 L8313 3314 L11584.5 3495.5877232142857 L11584.5 3495.6 " fill="none"></path>
+					<path d="M8782.3 2757.1 L8737 3314 L11864.75 3495.3681694520014 L11864.8 3495.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8364.3 2748.2 L8358.3 2757.1 L8353.7 2747.4 L8359.8 2738.5 Z"></path>
+						<path d="M8788.3 2748.2 L8782.3 2757.1 L8777.7 2747.4 L8783.8 2738.5 Z"></path>
 					</g>
-					<path d="M8365.9 2757.2 L8353 3314 L13098.75 3498.4594122857293 L13098.8 3498.5 " fill="none"></path>
+					<path d="M8789.9 2757.2 L8777 3314 L13453.5 3498.429530556143 L13453.5 3498.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8371.5 2748.0 L8365.9 2757.2 L8360.8 2747.7 L8366.4 2738.5 Z"></path>
+						<path d="M8795.5 2748.0 L8789.9 2757.2 L8784.8 2747.7 L8790.4 2738.5 Z"></path>
 					</g>
-					<path d="M8388.0 2757.0 L8468 3314 L8468 3485 L8468.0 3485.0 " fill="none"></path>
+					<path d="M8812.0 2757.0 L8892 3314 L8892 3485 L8892.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8391.9 2747.0 L8388.0 2757.0 L8381.4 2748.5 L8385.3 2738.5 Z"></path>
+						<path d="M8815.9 2747.0 L8812.0 2757.0 L8805.4 2748.5 L8809.3 2738.5 Z"></path>
 					</g>
-					<path d="M8751.4 2719.5 L8666 3314 L8666 3485 L8666.0 3485.0 " fill="none"></path>
+					<path d="M9175.4 2719.5 L9090 3314 L9090 3485 L9090.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8758.0 2711.0 L8751.4 2719.5 L8747.5 2709.5 L8754.1 2701.0 Z"></path>
+						<path d="M9182.0 2711.0 L9175.4 2719.5 L9171.5 2709.5 L9178.1 2701.0 Z"></path>
 					</g>
-					<path d="M8823.5 2716.7 L9204.5 3314 L11066 3496.1457240293807 L11066.0 3496.1 " fill="none"></path>
+					<path d="M9247.5 2716.7 L9628.5 3314 L10582 3492.184118236473 L10582.0 3492.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8823.0 2706.0 L8823.5 2716.7 L8814.0 2711.7 L8813.5 2701.0 Z"></path>
+						<path d="M9247.0 2706.0 L9247.5 2716.7 L9238.0 2711.7 L9237.5 2701.0 Z"></path>
 					</g>
-					<path d="M8828.6 2716.3 L9244.5 3314 L21865.75 3499.9768996780376 L21865.8 3500.0 " fill="none"></path>
+					<path d="M9252.6 2716.3 L9668.5 3314 L21189 3499.9270725164415 L21189.0 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8827.6 2705.6 L8828.6 2716.3 L8818.8 2711.7 L8817.9 2701.0 Z"></path>
+						<path d="M9251.6 2705.6 L9252.6 2716.3 L9242.8 2711.7 L9241.9 2701.0 Z"></path>
 					</g>
-					<path d="M8833.5 2715.9 L9284.5 3314 L25990.5 3499.7328763040236 L25990.5 3499.7 " fill="none"></path>
+					<path d="M9257.5 2715.9 L9708.5 3314 L24200.25 3499.6162199749324 L24200.3 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8832.2 2705.2 L8833.5 2715.9 L8823.7 2711.7 L8822.3 2701.0 Z"></path>
+						<path d="M9256.2 2705.2 L9257.5 2715.9 L9247.7 2711.7 L9246.3 2701.0 Z"></path>
 					</g>
-					<path d="M8840.8 2715.3 L9343.5 3314 L6811 3487.8035878564856 L6811.0 3487.8 " fill="none"></path>
+					<path d="M9264.8 2715.3 L9767.5 3314 L7235 3487.8035878564856 L7235.0 3487.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8838.9 2704.7 L8840.8 2715.3 L8830.7 2711.6 L8828.8 2701.0 Z"></path>
+						<path d="M9262.9 2704.7 L9264.8 2715.3 L9254.7 2711.6 L9252.8 2701.0 Z"></path>
 					</g>
-					<path d="M9547.0 2719.5 L9383.5 3314 L21865.75 3499.971091050708 L21865.8 3500.0 " fill="none"></path>
+					<path d="M9971.0 2719.5 L9807.5 3314 L21189 3499.920097223439 L21189.0 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9554.6 2711.9 L9547.0 2719.5 L9544.3 2709.1 L9552.0 2701.5 Z"></path>
+						<path d="M9978.6 2711.9 L9971.0 2719.5 L9968.3 2709.1 L9976.0 2701.5 Z"></path>
 					</g>
-					<path d="M9567.5 2720.1 L9533.25 3314 L6811 3488.6322555679767 L6811.0 3488.6 " fill="none"></path>
+					<path d="M9991.5 2720.1 L9957.25 3314 L7235 3488.6322555679767 L7235.0 3488.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9573.4 2711.1 L9567.5 2720.1 L9562.7 2710.5 L9568.6 2701.5 Z"></path>
+						<path d="M9997.4 2711.1 L9991.5 2720.1 L9986.7 2710.5 L9992.6 2701.5 Z"></path>
 					</g>
-					<path d="M9593.6 2719.7 L9722.75 3314 L11066 3494.5196361016033 L11066.0 3494.5 " fill="none"></path>
+					<path d="M10017.6 2719.7 L10146.75 3314 L10586.628016085791 3485 L10586.6 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9596.8 2709.5 L9593.6 2719.7 L9586.4 2711.8 L9589.6 2701.5 Z"></path>
+						<path d="M10020.8 2709.5 L10017.6 2719.7 L10010.4 2711.8 L10013.6 2701.5 Z"></path>
 					</g>
-					<path d="M9912.5 2720.2 L9912.5 3314 L11066 3493.572412353923 L11066.0 3493.6 " fill="none"></path>
+					<path d="M10336.5 2720.2 L10336.5 3314 L10602.398123324398 3485 L10602.4 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9917.8 2710.8 L9912.5 2720.2 L9907.2 2710.8 L9912.5 2701.5 Z"></path>
+						<path d="M10341.8 2710.8 L10336.5 2720.2 L10331.2 2710.8 L10336.5 2701.5 Z"></path>
 					</g>
-					<path d="M10361.5 2712.7 L10344 3314 L11066 3489.672537508154 L11066.0 3489.7 " fill="none"></path>
+					<path d="M10785.5 2712.7 L10768 3314 L10638.260053619302 3485 L10638.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10367.1 2703.5 L10361.5 2712.7 L10356.4 2703.2 L10362.0 2694.0 Z"></path>
+						<path d="M10791.1 2703.5 L10785.5 2712.7 L10780.4 2703.2 L10786.0 2694.0 Z"></path>
 					</g>
-					<path d="M10380.8 2712.3 L10496.25 3314 L6811 3491.585201214392 L6811.0 3491.6 " fill="none"></path>
+					<path d="M10804.8 2712.3 L10920.25 3314 L7235 3491.585201214392 L7235.0 3491.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10384.2 2702.2 L10380.8 2712.3 L10373.8 2704.2 L10377.2 2694.0 Z"></path>
+						<path d="M10808.2 2702.2 L10804.8 2712.3 L10797.8 2704.2 L10801.2 2694.0 Z"></path>
 					</g>
-					<path d="M6829.6 3490.1 L7672.1666666666715 3447 L7887.4583333333285 3447 L7887.4583333333285 3447 L8102.75 3500.5 L8102.75 3500.5 L7887.4583333333285 3554 L7887.4583333333285 3554 L7672.1666666666715 3554 L7672.1666666666715 3554 L6811 3509.9607296479207 L6811.0 3510.0 " fill="none"></path>
+					<path d="M7253.6 3490.1 L8096.1666666666715 3447 L8311.458333333328 3447 L8311.458333333328 3447 L8526.75 3500.5 L8526.75 3500.5 L8311.458333333328 3554 L8311.458333333328 3554 L8096.1666666666715 3554 L8096.1666666666715 3554 L7235 3509.9607296479207 L7235.0 3510.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6820.0 3485.2 L6829.6 3490.1 L6820.6 3495.9 L6811.0 3491.0 Z"></path>
+						<path d="M7244.0 3485.2 L7253.6 3490.1 L7244.6 3495.9 L7235.0 3491.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3062.1 2639.5 L1056 3314 L6441 3494.30565529623 L6441.0 3494.3 " fill="none"></path>
+						<path d="M3486.1 2639.5 L1480 3314 L6865 3494.30565529623 L6865.0 3494.3 " fill="none"></path>
 					</g>
-					<path d="M3063.8 2644.6 L3062.1 2639.5 L3060.4 2634.4 L3074.8 2635.3 Z"></path>
-					<path d="M15730.5 3916.2 L15730.5 4000 L18277.25 4130.315799522673 L18277.3 4130.3 " fill="none"></path>
+					<path d="M3487.8 2644.6 L3486.1 2639.5 L3484.4 2634.4 L3498.8 2635.3 Z"></path>
+					<path d="M15526.0 3916.2 L15526 4000 L18072.75 4130.315799522673 L18072.8 4130.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15735.8 3906.8 L15730.5 3916.2 L15725.2 3906.8 L15730.5 3897.5 Z"></path>
+						<path d="M15531.3 3906.8 L15526.0 3916.2 L15520.7 3906.8 L15526.0 3897.5 Z"></path>
 					</g>
-					<path d="M10640.2 2772.3 L10536.25 3314 L27961.75 3500.0355916194403 L27961.8 3500.0 " fill="none"></path>
+					<path d="M11064.2 2772.3 L10960.25 3314 L25956.25 3499.9605704976893 L25956.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10647.2 2764.2 L10640.2 2772.3 L10636.7 2762.2 L10643.7 2754.0 Z"></path>
+						<path d="M11071.2 2764.2 L11064.2 2772.3 L11060.7 2762.2 L11067.7 2754.0 Z"></path>
 					</g>
-					<path d="M10658.9 2772.6 L10623.75 3314 L22088 3500.029419441846 L22088.0 3500.0 " fill="none"></path>
+					<path d="M11082.9 2772.6 L11047.75 3314 L21300 3499.973945288754 L21300.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10664.8 2763.7 L10658.9 2772.6 L10654.2 2763.0 L10660.1 2754.0 Z"></path>
+						<path d="M11088.8 2763.7 L11082.9 2772.6 L11078.2 2763.0 L11084.1 2754.0 Z"></path>
 					</g>
-					<path d="M10667.5 2772.7 L10663.75 3314 L26691.75 3498.8393519663614 L26691.8 3498.8 " fill="none"></path>
+					<path d="M11091.5 2772.7 L11087.75 3314 L24378.25 3498.5009676578957 L24378.3 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10672.9 2763.4 L10667.5 2772.7 L10662.2 2763.3 L10667.6 2754.0 Z"></path>
+						<path d="M11096.9 2763.4 L11091.5 2772.7 L11086.2 2763.3 L11091.6 2754.0 Z"></path>
 					</g>
-					<path d="M10676.1 2772.6 L10703.75 3314 L13098.75 3496.49948927477 L13098.8 3496.5 " fill="none"></path>
+					<path d="M11100.1 2772.6 L11127.75 3314 L13453.5 3496.3830022075053 L13453.5 3496.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10680.9 2763.0 L10676.1 2772.6 L10670.3 2763.6 L10675.1 2754.0 Z"></path>
+						<path d="M11104.9 2763.0 L11100.1 2772.6 L11094.3 2763.6 L11099.1 2754.0 Z"></path>
 					</g>
-					<path d="M10695.8 2772.4 L10796 3314 L11084.361930294906 3485 L11084.4 3485.0 " fill="none"></path>
+					<path d="M11119.8 2772.4 L11220 3314 L10671 3486.5164279696714 L10671.0 3486.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10699.3 2762.2 L10695.8 2772.4 L10688.8 2764.1 L10692.4 2754.0 Z"></path>
+						<path d="M11123.3 2762.2 L11119.8 2772.4 L11112.8 2764.1 L11116.4 2754.0 Z"></path>
 					</g>
-					<path d="M26997.1 3437.0 L27009.75 3432 L27017.25 3432 L27017.25 3432 L27024.75 3500.5 L27024.75 3500.5 L27017.25 3569 L27017.25 3569 L27009.75 3569 L27009.75 3569 L26979.75 3557.189655172414 L26979.8 3557.2 " fill="none"></path>
+					<path d="M24683.6 3437.0 L24696.25 3432 L24703.75 3432 L24703.75 3432 L24711.25 3500.5 L24711.25 3500.5 L24703.75 3569 L24703.75 3569 L24696.25 3569 L24696.25 3569 L24666.25 3557.189655172414 L24666.3 3557.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26986.5 3435.4 L26997.1 3437.0 L26990.4 3445.4 L26979.8 3443.8 Z"></path>
+						<path d="M24673.0 3435.4 L24683.6 3437.0 L24676.9 3445.4 L24666.3 3443.8 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3062.1 2639.8 L1096 3314 L26691.75 3499.4566332229333 L26691.8 3499.5 " fill="none"></path>
+						<path d="M3486.1 2639.8 L1520 3314 L24378.25 3499.3324620417566 L24378.3 3499.3 " fill="none"></path>
 					</g>
-					<path d="M3063.9 2644.8 L3062.1 2639.8 L3060.4 2634.7 L3074.8 2635.5 Z"></path>
-					<path d="M10934.8 2779.9 L10836 3314 L21865.75 3499.901662863469 L21865.8 3499.9 " fill="none"></path>
+					<path d="M3487.9 2644.8 L3486.1 2639.8 L3484.4 2634.7 L3498.8 2635.5 Z"></path>
+					<path d="M11358.8 2779.9 L11260 3314 L21189 3499.835566260224 L21189.0 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10941.8 2771.6 L10934.8 2779.9 L10931.3 2769.7 L10938.2 2761.5 Z"></path>
+						<path d="M11365.8 2771.6 L11358.8 2779.9 L11355.3 2769.7 L11362.2 2761.5 Z"></path>
 					</g>
-					<path d="M10960.4 2780.2 L10949.75 3314 L22088 3500.015682016611 L22088.0 3500.0 " fill="none"></path>
+					<path d="M11384.4 2780.2 L11373.75 3314 L21300 3499.956718816705 L21300.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10965.9 2770.9 L10960.4 2780.2 L10955.3 2770.7 L10960.8 2761.5 Z"></path>
+						<path d="M11389.9 2770.9 L11384.4 2780.2 L11379.3 2770.7 L11384.8 2761.5 Z"></path>
 					</g>
-					<path d="M10989.1 2779.9 L11077.25 3314 L13098.75 3495.779050144648 L13098.8 3495.8 " fill="none"></path>
+					<path d="M11413.1 2779.9 L11501.25 3314 L13453.5 3495.615974560419 L13453.5 3495.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10992.8 2769.8 L10989.1 2779.9 L10982.3 2771.6 L10986.0 2761.5 Z"></path>
+						<path d="M11416.8 2769.8 L11413.1 2779.9 L11406.3 2771.6 L11410.0 2761.5 Z"></path>
 					</g>
-					<path d="M11231.0 2704.7 L11231 3314 L35656.25 3500.084789468847 L35656.3 3500.1 " fill="none"></path>
+					<path d="M11655.0 2704.7 L11655 3314 L35359.5 3500.072193695021 L35359.5 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11236.3 2695.3 L11231.0 2704.7 L11225.7 2695.3 L11231.0 2686.0 Z"></path>
+						<path d="M11660.3 2695.3 L11655.0 2704.7 L11649.7 2695.3 L11655.0 2686.0 Z"></path>
 					</g>
-					<path d="M11503.9 2734.4 L11397.5 3314 L21865.75 3499.869677496132 L21865.8 3499.9 " fill="none"></path>
+					<path d="M11927.9 2734.4 L11821.5 3314 L21189 3499.795889609699 L21189.0 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11510.9 2726.1 L11503.9 2734.4 L11500.4 2724.2 L11507.3 2716.0 Z"></path>
+						<path d="M11934.9 2726.1 L11927.9 2734.4 L11924.4 2724.2 L11931.3 2716.0 Z"></path>
 					</g>
-					<path d="M11520.8 2734.7 L11503.75 3314 L5233 3496.2281757625337 L5233.0 3496.2 " fill="none"></path>
+					<path d="M11954.8 2734.6 L11990.75 3314 L5657 3496.2697025807197 L5657.0 3496.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11526.4 2725.5 L11520.8 2734.7 L11515.7 2725.2 L11521.3 2716.0 Z"></path>
+						<path d="M11959.5 2725.0 L11954.8 2734.6 L11948.9 2725.6 L11953.6 2716.0 Z"></path>
 					</g>
-					<path d="M11527.1 2734.7 L11543.75 3314 L13098.75 3494.4090202177294 L13098.8 3494.4 " fill="none"></path>
+					<path d="M11961.2 2734.5 L12030.75 3314 L13453.5 3493.8629893238435 L13453.5 3493.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11532.2 2725.2 L11527.1 2734.7 L11521.5 2725.5 L11526.6 2716.0 Z"></path>
+						<path d="M11965.3 2724.6 L11961.2 2734.5 L11954.7 2725.9 L11958.9 2716.0 Z"></path>
 					</g>
-					<path d="M11544.0 2734.4 L11650.25 3314 L11671.109249329758 3485 L11671.1 3485.0 " fill="none"></path>
+					<path d="M11977.9 2734.0 L12137.25 3314 L11968.542225201072 3485 L11968.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11547.6 2724.2 L11544.0 2734.4 L11537.1 2726.1 L11540.7 2716.0 Z"></path>
+						<path d="M11980.6 2723.6 L11977.9 2734.0 L11970.3 2726.4 L11973.0 2716.0 Z"></path>
 					</g>
-					<path d="M5250.6 3443.8 L5263 3439.5 L5270.5 3439.5 L5270.5 3439.5 L5278 3500.5 L5278 3500.5 L5270.5 3561.5 L5270.5 3561.5 L5263 3561.5 L5263 3561.5 L5233 3551.1610169491523 L5233.0 3551.2 " fill="none"></path>
+					<path d="M5674.6 3443.8 L5687 3439.5 L5694.5 3439.5 L5694.5 3439.5 L5702 3500.5 L5702 3500.5 L5694.5 3561.5 L5694.5 3561.5 L5687 3561.5 L5687 3561.5 L5657 3551.1610169491523 L5657.0 3551.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5240.1 3441.8 L5250.6 3443.8 L5243.6 3451.8 L5233.0 3449.8 Z"></path>
+						<path d="M5664.1 3441.8 L5674.6 3443.8 L5667.6 3451.8 L5657.0 3449.8 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3096.2 2653.2 L2883.25 3314 L4939 3488.0539666326185 L4939.0 3488.1 " fill="none"></path>
+						<path d="M3520.2 2653.2 L3307.25 3314 L5363 3488.0539666326185 L5363.0 3488.1 " fill="none"></path>
 					</g>
-					<path d="M3101.2 2654.8 L3096.2 2653.2 L3091.1 2651.6 L3100.3 2640.5 Z"></path>
-					<path d="M28381.6 175.9 L27671.5 293 L27671.5 614 L27671.5 614.0 " fill="none"></path>
+					<path d="M3525.2 2654.8 L3520.2 2653.2 L3515.1 2651.6 L3524.3 2640.5 Z"></path>
+					<path d="M28144.8 175.9 L27434.75 293 L27434.75 614 L27434.8 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28391.7 179.6 L28381.6 175.9 L28389.9 169.1 L28400.0 172.9 Z"></path>
+						<path d="M28154.9 179.6 L28144.8 175.9 L28153.2 169.1 L28163.3 172.9 Z"></path>
 					</g>
-					<path d="M28620.5 208.7 L28620.5 293 L28620.5 614 L28620.5 614.0 " fill="none"></path>
+					<path d="M28383.8 208.7 L28383.75 293 L28383.75 614 L28383.8 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28625.8 199.3 L28620.5 208.7 L28615.2 199.3 L28620.5 190.0 Z"></path>
+						<path d="M28389.1 199.3 L28383.8 208.7 L28378.4 199.3 L28383.8 190.0 Z"></path>
 					</g>
-					<path d="M61386.0 1753.9 L61015.5 1936 L44484.75 2618.8656414407124 L44484.8 2618.9 " fill="none"></path>
+					<path d="M61639.5 1761.7 L61391.25 1936 L42151.75 2619.722689292346 L42151.8 2619.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M61396.7 1754.6 L61386.0 1753.9 L61392.0 1745.0 L61402.8 1745.7 Z"></path>
+						<path d="M61650.2 1760.7 L61639.5 1761.7 L61644.1 1752.0 L61654.8 1751.0 Z"></path>
 					</g>
-					<path d="M12149.5 2771.4 L11985.25 3314 L11877.286193029491 3485 L11877.3 3485.0 " fill="none"></path>
+					<path d="M12496.0 2771.4 L12331.75 3314 L12163.042225201072 3485 L12163.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12157.3 2764.0 L12149.5 2771.4 L12147.1 2760.9 L12154.9 2753.5 Z"></path>
+						<path d="M12503.8 2764.0 L12496.0 2771.4 L12493.6 2760.9 L12501.4 2753.5 Z"></path>
 					</g>
-					<path d="M12170.3 2771.9 L12084 3314 L22088 3499.9609289345162 L22088.0 3500.0 " fill="none"></path>
+					<path d="M12516.8 2771.9 L12430.5 3314 L21300 3499.8922009327416 L21300.0 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12177.1 2763.6 L12170.3 2771.9 L12166.5 2761.9 L12173.3 2753.5 Z"></path>
+						<path d="M12523.6 2763.6 L12516.8 2771.9 L12513.0 2761.9 L12519.8 2753.5 Z"></path>
 					</g>
-					<path d="M12191.4 2772.2 L12182.75 3314 L12074.786193029491 3485 L12074.8 3485.0 " fill="none"></path>
+					<path d="M12537.9 2772.2 L12529.25 3314 L12360.542225201072 3485 L12360.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12196.9 2762.9 L12191.4 2772.2 L12186.2 2762.7 L12191.7 2753.5 Z"></path>
+						<path d="M12543.4 2762.9 L12537.9 2772.2 L12532.7 2762.7 L12538.2 2753.5 Z"></path>
 					</g>
-					<path d="M12214.8 2772.0 L12292.5 3314 L13098.75 3489.098253275109 L13098.8 3489.1 " fill="none"></path>
+					<path d="M12561.3 2772.0 L12639 3314 L13453.5 3489.2067474048445 L13453.5 3489.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12218.8 2762.0 L12214.8 2772.0 L12208.2 2763.5 L12212.2 2753.5 Z"></path>
+						<path d="M12565.3 2762.0 L12561.3 2772.0 L12554.7 2763.5 L12558.7 2753.5 Z"></path>
 					</g>
-					<path d="M12238.0 2771.4 L12402.25 3314 L12294.286193029491 3485 L12294.3 3485.0 " fill="none"></path>
+					<path d="M12584.5 2771.4 L12748.75 3314 L12580.042225201072 3485 L12580.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12240.4 2760.9 L12238.0 2771.4 L12230.2 2764.0 L12232.6 2753.5 Z"></path>
+						<path d="M12586.9 2760.9 L12584.5 2771.4 L12576.7 2764.0 L12579.1 2753.5 Z"></path>
 					</g>
-					<path d="M61320.0 2674.7 L61320 3314 L49258.5 3498.5415931744533 L49258.5 3498.5 " fill="none"></path>
+					<path d="M61550.3 2674.7 L61550.25 3314 L49008.25 3498.615864246251 L49008.3 3498.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M61325.3 2665.3 L61320.0 2674.7 L61314.7 2665.3 L61320.0 2656.0 Z"></path>
+						<path d="M61555.6 2665.3 L61550.3 2674.7 L61544.9 2665.3 L61550.3 2656.0 Z"></path>
 					</g>
-					<path d="M61452.2 1761.6 L61320 1936 L61320 2594 L61320.0 2594.0 " fill="none"></path>
-					<path d="M61456.4 1764.8 L61452.2 1761.6 L61447.9 1758.4 L61460.2 1751.0 Z"></path>
-					<path d="M12861.0 2749.3 L12748.5 3314 L21865.75 3499.776638168856 L21865.8 3499.8 " fill="none"></path>
+					<path d="M61682.4 1761.6 L61550.25 1936 L61550.25 2594 L61550.3 2594.0 " fill="none"></path>
+					<path d="M61686.7 1764.8 L61682.4 1761.6 L61678.2 1758.4 L61690.5 1751.0 Z"></path>
+					<path d="M13206.8 2749.3 L13094.5 3314 L21189 3499.685639606396 L21189.0 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12868.0 2741.2 L12861.0 2749.3 L12857.6 2739.1 L12864.6 2731.0 Z"></path>
+						<path d="M13213.8 2741.2 L13206.8 2749.3 L13203.4 2739.1 L13210.4 2731.0 Z"></path>
 					</g>
-					<path d="M12885.7 2749.7 L12885.5 3314 L13129.163538873994 3485 L13129.2 3485.0 " fill="none"></path>
+					<path d="M13231.5 2749.7 L13231.75 3314 L13483.207104557641 3485 L13483.2 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12891.0 2740.3 L12885.7 2749.7 L12880.4 2740.3 L12885.7 2731.0 Z"></path>
+						<path d="M13236.9 2740.3 L13231.5 2749.7 L13226.2 2740.3 L13231.5 2731.0 Z"></path>
 					</g>
-					<path d="M12910.5 2749.3 L13022.75 3314 L19573.75 3497.4063649328227 L19573.8 3497.4 " fill="none"></path>
+					<path d="M13256.3 2749.3 L13368.75 3314 L18892.25 3496.842163649272 L18892.3 3496.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12913.9 2739.1 L12910.5 2749.3 L12903.4 2741.2 L12906.8 2731.0 Z"></path>
+						<path d="M13259.7 2739.1 L13256.3 2749.3 L13249.2 2741.2 L13252.6 2731.0 Z"></path>
 					</g>
-					<path d="M61681.5 2674.7 L61681.5 3314 L30541.75 3500.004223683052 L30541.8 3500.0 " fill="none"></path>
+					<path d="M61911.8 2674.7 L61911.75 3314 L29677.5 3500.0210143189784 L29677.5 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M61686.8 2665.3 L61681.5 2674.7 L61676.2 2665.3 L61681.5 2656.0 Z"></path>
+						<path d="M61917.1 2665.3 L61911.8 2674.7 L61906.4 2665.3 L61911.8 2656.0 Z"></path>
 					</g>
-					<path d="M61549.3 1761.6 L61681.5 1936 L61681.5 2594 L61681.5 2594.0 " fill="none"></path>
-					<path d="M61553.6 1758.4 L61549.3 1761.6 L61545.1 1764.8 L61541.3 1751.0 Z"></path>
-					<path d="M13767.1 2727.4 L13675.75 3314 L27961.75 3499.933842771904 L27961.8 3499.9 " fill="none"></path>
+					<path d="M61779.6 1761.6 L61911.75 1936 L61911.75 2594 L61911.8 2594.0 " fill="none"></path>
+					<path d="M61783.8 1758.4 L61779.6 1761.6 L61775.3 1764.8 L61771.5 1751.0 Z"></path>
+					<path d="M13785.0 2727.4 L13693.5 3314 L25956.25 3499.8407618080246 L25956.3 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13773.8 2719.0 L13767.1 2727.4 L13763.2 2717.4 L13769.9 2709.0 Z"></path>
+						<path d="M13791.7 2719.0 L13785.0 2727.4 L13781.2 2717.4 L13787.9 2709.0 Z"></path>
 					</g>
-					<path d="M13799.0 2727.4 L13890.5 3314 L21865.75 3499.6735168367504 L21865.8 3499.7 " fill="none"></path>
+					<path d="M13817.0 2727.4 L13908.5 3314 L21189 3499.5950314379443 L21189.0 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13802.8 2717.4 L13799.0 2727.4 L13792.3 2719.0 L13796.1 2709.0 Z"></path>
+						<path d="M13820.8 2717.4 L13817.0 2727.4 L13810.3 2719.0 L13814.1 2709.0 Z"></path>
 					</g>
-					<path d="M29204.0 717.2 L29204 966 L29204 1197 L29204.0 1197.0 " fill="none"></path>
+					<path d="M28967.3 717.2 L28967.25 966 L28967.25 1197 L28967.3 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29209.3 707.8 L29204.0 717.2 L29198.7 707.8 L29204.0 698.5 Z"></path>
+						<path d="M28972.6 707.8 L28967.3 717.2 L28961.9 707.8 L28967.3 698.5 Z"></path>
 					</g>
-					<path d="M29204.0 165.3 L29204 293 L29204 560.5 L29204.0 560.5 " fill="none"></path>
-					<path d="M29209.3 165.3 L29204.0 165.3 L29198.7 165.3 L29204.0 152.0 Z"></path>
-					<path d="M16003.2 3938.7 L15927.5 4000 L18277.25 4130.016104056984 L18277.3 4130.0 " fill="none"></path>
+					<path d="M28967.3 165.3 L28967.25 293 L28967.25 560.5 L28967.3 560.5 " fill="none"></path>
+					<path d="M28972.6 165.3 L28967.3 165.3 L28961.9 165.3 L28967.3 152.0 Z"></path>
+					<path d="M15798.7 3938.7 L15723 4000 L18072.75 4130.016104056984 L18072.8 4130.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16013.9 3937.0 L16003.2 3938.7 L16007.1 3928.7 L16017.8 3927.0 Z"></path>
+						<path d="M15809.4 3937.0 L15798.7 3938.7 L15802.6 3928.7 L15813.3 3927.0 Z"></path>
 					</g>
-					<path d="M16026.0 3940.3 L15967.5 4000 L7837.75 4131.635984653959 L7837.8 4131.6 " fill="none"></path>
+					<path d="M15821.5 3940.3 L15763 4000 L6683 4131.879471060048 L6683.0 4131.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16036.4 3937.4 L16026.0 3940.3 L16028.8 3929.9 L16039.1 3927.0 Z"></path>
+						<path d="M15831.9 3937.4 L15821.5 3940.3 L15824.3 3929.9 L15834.6 3927.0 Z"></path>
 					</g>
-					<path d="M16141.3 3945.3 L16152.25 4000 L8164.75 4131.635100233673 L8164.8 4131.6 " fill="none"></path>
+					<path d="M15936.8 3945.3 L15947.75 4000 L7010 4131.882560220234 L7010.0 4131.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16144.7 3935.1 L16141.3 3945.3 L16134.3 3937.2 L16137.7 3927.0 Z"></path>
+						<path d="M15940.2 3935.1 L15936.8 3945.3 L15929.8 3937.2 L15933.2 3927.0 Z"></path>
 					</g>
-					<path d="M16166.7 3944.0 L16192.25 4000 L15865.711753731342 4118.5 L15865.7 4118.5 " fill="none"></path>
+					<path d="M15962.2 3944.0 L15987.75 4000 L14407.5 4123.309652059979 L14407.5 4123.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16167.7 3933.3 L16166.7 3944.0 L16158.0 3937.7 L16159.0 3927.0 Z"></path>
+						<path d="M15963.2 3933.3 L15962.2 3944.0 L15953.5 3937.7 L15954.5 3927.0 Z"></path>
 					</g>
-					<path d="M16256.2 3937.7 L16345.75 4000 L16119.58302238806 4118.5 L16119.6 4118.5 " fill="none"></path>
+					<path d="M16051.7 3937.7 L16141.25 4000 L14627.5 4126.480124707717 L14627.5 4126.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16251.6 3928.0 L16256.2 3937.7 L16245.5 3936.7 L16240.9 3927.0 Z"></path>
+						<path d="M16047.1 3928.0 L16051.7 3937.7 L16041.0 3936.7 L16036.4 3927.0 Z"></path>
 					</g>
-					<path d="M35520.5 165.3 L35520.5 293 L35520.5 614 L35520.5 614.0 " fill="none"></path>
-					<path d="M35525.8 165.3 L35520.5 165.3 L35515.2 165.3 L35520.5 152.0 Z"></path>
-					<path d="M14038.0 2712.7 L14038 3314 L11155 3497.665072587532 L11155.0 3497.7 " fill="none"></path>
+					<path d="M36180.0 165.3 L36180 293 L36180 614 L36180.0 614.0 " fill="none"></path>
+					<path d="M36185.3 165.3 L36180.0 165.3 L36174.7 165.3 L36180.0 152.0 Z"></path>
+					<path d="M14056.0 2712.7 L14056 3314 L10671 3498.080040822277 L10671.0 3498.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14043.3 2703.3 L14038.0 2712.7 L14032.7 2703.3 L14038.0 2694.0 Z"></path>
+						<path d="M14061.3 2703.3 L14056.0 2712.7 L14050.7 2703.3 L14056.0 2694.0 Z"></path>
 					</g>
-					<path d="M35917.0 165.3 L35917 293 L35917 614 L35917.0 614.0 " fill="none"></path>
-					<path d="M35922.3 165.3 L35917.0 165.3 L35911.7 165.3 L35917.0 152.0 Z"></path>
-					<path d="M9187.0 3450.3 L9199 3447 L9206.5 3447 L9206.5 3447 L9214 3500.5 L9214 3500.5 L9206.5 3554 L9206.5 3554 L9199 3554 L9199 3554 L9169 3545.769230769231 L9169.0 3545.8 " fill="none"></path>
+					<path d="M36576.5 165.3 L36576.5 293 L36576.5 614 L36576.5 614.0 " fill="none"></path>
+					<path d="M36581.8 165.3 L36576.5 165.3 L36571.2 165.3 L36576.5 152.0 Z"></path>
+					<path d="M9611.0 3450.3 L9623 3447 L9630.5 3447 L9630.5 3447 L9638 3500.5 L9638 3500.5 L9630.5 3554 L9630.5 3554 L9623 3554 L9623 3554 L9593 3545.769230769231 L9593.0 3545.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9176.6 3447.6 L9187.0 3450.3 L9179.4 3457.9 L9169.0 3455.2 Z"></path>
+						<path d="M9600.6 3447.6 L9611.0 3450.3 L9603.4 3457.9 L9593.0 3455.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3097.8 2653.4 L2923.25 3314 L8839 3495.439357809481 L8839.0 3495.4 " fill="none"></path>
+						<path d="M3521.8 2653.4 L3347.25 3314 L9263 3495.439357809481 L9263.0 3495.4 " fill="none"></path>
 					</g>
-					<path d="M3102.9 2654.8 L3097.8 2653.4 L3092.6 2652.0 L3101.2 2640.5 Z"></path>
-					<path d="M14331.0 2697.7 L14331 3314 L11761.5 3494.2903498871333 L11761.5 3494.3 " fill="none"></path>
+					<path d="M3526.9 2654.8 L3521.8 2653.4 L3516.6 2652.0 L3525.2 2640.5 Z"></path>
+					<path d="M14349.0 2697.7 L14349 3314 L12041.75 3493.610612543045 L12041.8 3493.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14336.3 2688.3 L14331.0 2697.7 L14325.7 2688.3 L14331.0 2679.0 Z"></path>
+						<path d="M14354.3 2688.3 L14349.0 2697.7 L14343.7 2688.3 L14349.0 2679.0 Z"></path>
 					</g>
-					<path d="M30145.4 1213.8 L13364.5 1459 L13364.5 1651 L13364.5 1651.0 " fill="none"></path>
-					<path d="M30145.5 1219.1 L30145.4 1213.8 L30145.3 1208.5 L30158.8 1213.6 Z"></path>
-					<path d="M16534.0 3908.7 L16534 4000 L18277.25 4128.685029610247 L18277.3 4128.7 " fill="none"></path>
+					<path d="M30292.9 1213.9 L15172.75 1459 L15172.75 1651 L15172.8 1651.0 " fill="none"></path>
+					<path d="M30293.0 1219.3 L30292.9 1213.9 L30292.8 1208.6 L30306.3 1213.7 Z"></path>
+					<path d="M16329.5 3908.7 L16329.5 4000 L18072.75 4128.685029610247 L18072.8 4128.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16539.3 3899.3 L16534.0 3908.7 L16528.7 3899.3 L16534.0 3890.0 Z"></path>
+						<path d="M16334.8 3899.3 L16329.5 3908.7 L16324.2 3899.3 L16329.5 3890.0 Z"></path>
 					</g>
-					<path d="M14698.6 2742.1 L14550 3314 L13048 3492.4222929936304 L13048.0 3492.4 " fill="none"></path>
+					<path d="M14716.6 2742.1 L14568 3314 L13403 3490.2145174371453 L13403.0 3490.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14706.1 2734.4 L14698.6 2742.1 L14695.8 2731.7 L14703.3 2724.0 Z"></path>
+						<path d="M14724.1 2734.4 L14716.6 2742.1 L14713.8 2731.7 L14721.3 2724.0 Z"></path>
 					</g>
-					<path d="M14830.3 2737.9 L15347 3314 L21865.75 3499.4898539115843 L21865.8 3499.5 " fill="none"></path>
+					<path d="M14813.1 2740.2 L15142.5 3314 L21189 3499.411418941138 L21189.0 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14828.0 2727.4 L14830.3 2737.9 L14820.1 2734.5 L14817.8 2724.0 Z"></path>
+						<path d="M14813.1 2729.4 L14813.1 2740.2 L14803.8 2734.7 L14803.8 2724.0 Z"></path>
 					</g>
-					<path d="M14857.6 2736.2 L15526 3314 L13203.75 3496.3769344141488 L13203.8 3496.4 " fill="none"></path>
+					<path d="M14841.5 2738.3 L15321.5 3314 L13558.5 3495.106857614982 L13558.5 3495.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14854.1 2726.1 L14857.6 2736.2 L14847.1 2734.1 L14843.5 2724.0 Z"></path>
+						<path d="M14839.6 2727.8 L14841.5 2738.3 L14831.4 2734.6 L14829.5 2724.0 Z"></path>
 					</g>
-					<path d="M29586.2 3435.4 L29598.25 3432 L29605.75 3432 L29605.75 3432 L29613.25 3500.5 L29613.25 3500.5 L29605.75 3569 L29605.75 3569 L29598.25 3569 L29598.25 3569 L29568.25 3560.543209876543 L29568.3 3560.5 " fill="none"></path>
+					<path d="M29439.5 3435.4 L29451.5 3432 L29459 3432 L29459 3432 L29466.5 3500.5 L29466.5 3500.5 L29459 3569 L29459 3569 L29451.5 3569 L29451.5 3569 L29421.5 3560.543209876543 L29421.5 3560.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29575.8 3432.8 L29586.2 3435.4 L29578.7 3443.1 L29568.3 3440.5 Z"></path>
+						<path d="M29429.0 3432.8 L29439.5 3435.4 L29431.9 3443.1 L29421.5 3440.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3099.4 2653.6 L2963.25 3314 L29142.25 3498.994827978175 L29142.3 3499.0 " fill="none"></path>
+						<path d="M3523.4 2653.6 L3387.25 3314 L28995.5 3498.9615578254343 L28995.5 3499.0 " fill="none"></path>
 					</g>
-					<path d="M3104.6 2654.6 L3099.4 2653.6 L3094.1 2652.5 L3102.1 2640.5 Z"></path>
-					<path d="M15697.2 2749.2 L15566 3314 L15566 3500.5 L15566 3500.5 L15566 3687 L15566 3687 L15566 3843.5 L15566 3843.5 L15566 4000 L15566 4000 L18277.25 4130.53354890865 L18277.3 4130.5 " fill="none"></path>
+					<path d="M3528.6 2654.6 L3523.4 2653.6 L3518.1 2652.5 L3526.1 2640.5 Z"></path>
+					<path d="M15492.7 2749.2 L15361.5 3314 L15361.5 3500.5 L15361.5 3500.5 L15361.5 3687 L15361.5 3687 L15361.5 3843.5 L15361.5 3843.5 L15361.5 4000 L15361.5 4000 L18072.75 4130.53354890865 L18072.8 4130.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15704.5 2741.3 L15697.2 2749.2 L15694.1 2738.9 L15701.4 2731.0 Z"></path>
+						<path d="M15500.0 2741.3 L15492.7 2749.2 L15489.6 2738.9 L15496.9 2731.0 Z"></path>
 					</g>
-					<path d="M15853.9 2685.5 L17183 3314 L22088 3499.403830563437 L22088.0 3499.4 " fill="none"></path>
+					<path d="M15649.0 2691.8 L16837.25 3314 L21300 3499.2959036010466 L21300.0 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15847.7 2676.7 L15853.9 2685.5 L15843.2 2686.3 L15837.0 2677.5 Z"></path>
+						<path d="M15643.2 2682.7 L15649.0 2691.8 L15638.3 2692.2 L15632.5 2683.1 Z"></path>
 					</g>
-					<path d="M15854.0 2683.9 L17223 3314 L11155 3499.1422494887524 L11155.0 3499.1 " fill="none"></path>
+					<path d="M15649.1 2689.9 L16877.25 3314 L10671 3499.1722793264807 L10671.0 3499.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15847.7 2675.1 L15854.0 2683.9 L15843.2 2684.8 L15837.0 2676.1 Z"></path>
+						<path d="M15643.2 2680.9 L15649.1 2689.9 L15638.4 2690.4 L15632.5 2681.4 Z"></path>
 					</g>
-					<path d="M15854.2 2679.0 L17363 3314 L27961.75 3499.7376847001337 L27961.8 3499.7 " fill="none"></path>
+					<path d="M15649.5 2683.9 L17017.25 3314 L25956.25 3499.59682716393 L25956.3 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15847.7 2670.4 L15854.2 2679.0 L15843.5 2680.3 L15837.0 2671.7 Z"></path>
+						<path d="M15643.2 2675.2 L15649.5 2683.9 L15638.7 2684.9 L15632.5 2676.1 Z"></path>
 					</g>
-					<path d="M21716.1 2711.9 L21623.25 3314 L26271.5 3497.247608730117 L26271.5 3497.2 " fill="none"></path>
+					<path d="M21753.4 2711.8 L21633 3314 L24859.25 3495.849829996222 L24859.3 3495.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21722.8 2703.5 L21716.1 2711.9 L21712.2 2701.9 L21718.9 2693.5 Z"></path>
+						<path d="M21760.5 2703.7 L21753.4 2711.8 L21750.0 2701.6 L21757.1 2693.5 Z"></path>
 					</g>
-					<path d="M21738.6 2712.1 L21801.25 3314 L21892.939008042897 3485 L21892.9 3485.0 " fill="none"></path>
+					<path d="M21779.8 2712.1 L21842.5 3314 L21260 3489.7868122977347 L21260.0 3489.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21742.9 2702.2 L21738.6 2712.1 L21732.3 2703.3 L21736.6 2693.5 Z"></path>
+						<path d="M21784.2 2702.2 L21779.8 2712.1 L21773.5 2703.3 L21777.9 2693.5 Z"></path>
 					</g>
-					<path d="M19853.4 1762.6 L18888.25 1936 L18888.25 2625 L18888.25 2625 L18888.25 3314 L18888.25 3314 L27441.75 3498.943220682859 L27441.8 3498.9 " fill="none"></path>
+					<path d="M20517.2 1736.9 L18683.75 1936 L18683.75 2625 L18683.75 2625 L18683.75 3314 L18683.75 3314 L25436.25 3498.5323833247858 L25436.3 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19863.5 1766.2 L19853.4 1762.6 L19861.6 1755.7 L19871.8 1759.3 Z"></path>
+						<path d="M20527.0 1741.2 L20517.2 1736.9 L20525.9 1730.6 L20535.8 1734.9 Z"></path>
 					</g>
-					<path d="M19853.5 1776.3 L19118.75 1936 L19118.75 2609.5 L19118.8 2609.5 " fill="none"></path>
+					<path d="M20517.2 1741.5 L18914.25 1936 L18914.25 2609.5 L18914.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19863.8 1779.5 L19853.5 1776.3 L19861.5 1769.1 L19871.8 1772.3 Z"></path>
+						<path d="M20527.1 1745.7 L20517.2 1741.5 L20525.8 1735.1 L20535.8 1739.2 Z"></path>
 					</g>
-					<path d="M19853.8 1797.1 L19349.25 1936 L19349.25 2625 L19349.25 2625 L19349.25 3314 L19349.25 3314 L9169 3497.525446460936 L9169.0 3497.5 " fill="none"></path>
+					<path d="M20517.3 1747.3 L19144.75 1936 L19144.75 2625 L19144.75 2625 L19144.75 3314 L19144.75 3314 L9593 3497.333046028765 L9593.0 3497.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19864.2 1799.8 L19853.8 1797.1 L19861.3 1789.5 L19871.8 1792.2 Z"></path>
+						<path d="M20527.2 1751.3 L20517.3 1747.3 L20525.8 1740.8 L20535.8 1744.8 Z"></path>
 					</g>
-					<path d="M19854.0 1813.1 L19469.25 1936 L19469.25 2609.5 L19469.3 2609.5 " fill="none"></path>
+					<path d="M20517.3 1751.0 L19264.75 1936 L19264.75 2609.5 L19264.8 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19864.5 1815.3 L19854.0 1813.1 L19861.2 1805.2 L19871.8 1807.4 Z"></path>
+						<path d="M20527.3 1754.9 L20517.3 1751.0 L20525.7 1744.4 L20535.8 1748.3 Z"></path>
 					</g>
-					<path d="M19888.7 1911.2 L19850.75 1936 L19850.75 2609.5 L19850.8 2609.5 " fill="none"></path>
+					<path d="M20875.1 1919.7 L20874.75 1936 L20874.75 2609.5 L20874.8 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19899.4 1910.6 L19888.7 1911.2 L19893.6 1901.6 L19904.3 1901.0 Z"></path>
+						<path d="M20880.6 1910.4 L20875.1 1919.7 L20870.0 1910.2 L20875.5 1901.0 Z"></path>
 					</g>
-					<path d="M20578.2 1754.6 L21729.5 1936 L21729.5 2556.5 L21729.5 2556.5 " fill="none"></path>
+					<path d="M21241.8 1794.4 L21770.75 1936 L21770.75 2556.5 L21770.8 2556.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20569.8 1747.9 L20578.2 1754.6 L20568.1 1758.4 L20559.8 1751.7 Z"></path>
+						<path d="M21234.1 1786.8 L21241.8 1794.4 L21231.4 1797.1 L21223.8 1789.6 Z"></path>
 					</g>
-					<path d="M20578.2 1748.4 L21913 1936 L21913 2625 L21913 2625 L21913 3314 L21913 3314 L19794.75 3491.253449242849 L19794.8 3491.3 " fill="none"></path>
+					<path d="M21242.0 1777.9 L21954.25 1936 L21954.25 2625 L21954.25 2625 L21954.25 3314 L21954.25 3314 L19113.25 3493.517702862951 L19113.3 3493.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20569.7 1741.9 L20578.2 1748.4 L20568.3 1752.4 L20559.8 1745.8 Z"></path>
+						<path d="M21234.0 1770.7 L21242.0 1777.9 L21231.7 1781.1 L21223.8 1773.9 Z"></path>
 					</g>
-					<path d="M20578.2 1747.3 L21953 1936 L21953 2625 L21953 2625 L21953 3314 L21953 3314 L21905.5509383378 3485 L21905.6 3485.0 " fill="none"></path>
+					<path d="M21242.3 1743.4 L22763.25 1936 L22763.25 2625 L22763.25 2625 L22763.25 3314 L22763.25 3314 L21260 3496.19731925264 L21260.0 3496.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20569.7 1740.7 L20578.2 1747.3 L20568.3 1751.3 L20559.8 1744.7 Z"></path>
+						<path d="M21233.7 1736.9 L21242.3 1743.4 L21232.3 1747.5 L21223.8 1741.1 Z"></path>
 					</g>
-					<path d="M20578.3 1746.1 L21993 1936 L21993 2625 L21993 2625 L21993 3314 L21993 3314 L10068 3497.7799033177707 L10068.0 3497.8 " fill="none"></path>
+					<path d="M21242.3 1742.5 L22803.25 1936 L22803.25 2625 L22803.25 2625 L22803.25 3314 L22803.25 3314 L10492 3497.864036756021 L10492.0 3497.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20569.7 1739.6 L20578.3 1746.1 L20568.3 1750.2 L20559.8 1743.7 Z"></path>
+						<path d="M21233.7 1736.0 L21242.3 1742.5 L21232.4 1746.6 L21223.8 1740.2 Z"></path>
 					</g>
-					<path d="M10086.1 3450.1 L10098 3447 L10105.5 3447 L10105.5 3447 L10113 3500.5 L10113 3500.5 L10105.5 3554 L10105.5 3554 L10098 3554 L10098 3554 L10068 3546.227602905569 L10068.0 3546.2 " fill="none"></path>
+					<path d="M10510.1 3450.1 L10522 3447 L10529.5 3447 L10529.5 3447 L10537 3500.5 L10537 3500.5 L10529.5 3554 L10529.5 3554 L10522 3554 L10522 3554 L10492 3546.227602905569 L10492.0 3546.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10075.7 3447.3 L10086.1 3450.1 L10078.4 3457.6 L10068.0 3454.8 Z"></path>
+						<path d="M10499.7 3447.3 L10510.1 3450.1 L10502.4 3457.6 L10492.0 3454.8 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3101.0 2653.7 L3003.25 3314 L9715 3495.721246325264 L9715.0 3495.7 " fill="none"></path>
+						<path d="M3525.0 2653.7 L3427.25 3314 L10139 3495.721246325264 L10139.0 3495.7 " fill="none"></path>
 					</g>
-					<path d="M3106.3 2654.5 L3101.0 2653.7 L3095.7 2652.9 L3103.0 2640.5 Z"></path>
-					<path d="M23596.0 2720.2 L23596 3314 L27961.75 3498.660061234904 L27961.8 3498.7 " fill="none"></path>
+					<path d="M3530.3 2654.5 L3525.0 2653.7 L3519.7 2652.9 L3527.0 2640.5 Z"></path>
+					<path d="M21455.3 2720.2 L21455.25 3314 L25956.25 3498.7148201122236 L25956.3 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23601.3 2710.8 L23596.0 2720.2 L23590.7 2710.8 L23596.0 2701.5 Z"></path>
+						<path d="M21460.6 2710.8 L21455.3 2720.2 L21449.9 2710.8 L21455.3 2701.5 Z"></path>
 					</g>
-					<path d="M22865.4 1717.6 L22272 1936 L23464 2556.308157099698 L23464.0 2556.3 " fill="none"></path>
-					<path d="M22867.2 1722.6 L22865.4 1717.6 L22863.5 1712.6 L22877.9 1713.0 Z"></path>
-					<path d="M36150.5 165.3 L36150.5 293 L36150.5 614 L36150.5 614.0 " fill="none"></path>
-					<path d="M36155.8 165.3 L36150.5 165.3 L36145.2 165.3 L36150.5 152.0 Z"></path>
-					<path d="M23657.4 1805.9 L23596 1936 L23596 2548.5 L23596.0 2548.5 " fill="none"></path>
+					<path d="M112.0 1726.3 L112 1936 L21323.25 2620.7387932953043 L21323.3 2620.7 " fill="none"></path>
+					<path d="M117.3 1726.3 L112.0 1726.3 L106.7 1726.3 L112.0 1713.0 Z"></path>
+					<path d="M36810.0 165.3 L36810 293 L36810 614 L36810.0 614.0 " fill="none"></path>
+					<path d="M36815.3 165.3 L36810.0 165.3 L36804.7 165.3 L36810.0 152.0 Z"></path>
+					<path d="M22984.9 1801.8 L22843.25 1936 L21587.25 2559.4755043227665 L21587.3 2559.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23666.2 1799.7 L23657.4 1805.9 L23656.5 1795.2 L23665.3 1789.0 Z"></path>
+						<path d="M22995.3 1799.3 L22984.9 1801.8 L22988.0 1791.5 L22998.4 1789.0 Z"></path>
 					</g>
-					<path d="M23730.1 1807.3 L23755.5 1936 L24087.851233671987 2609.5 L24087.9 2609.5 " fill="none"></path>
+					<path d="M23052.9 1806.4 L23002.75 1936 L23506.408744557328 2609.5 L23506.4 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23733.6 1797.1 L23730.1 1807.3 L23723.1 1799.2 L23726.5 1789.0 Z"></path>
+						<path d="M23061.2 1799.6 L23052.9 1806.4 L23051.3 1795.8 L23059.6 1789.0 Z"></path>
 					</g>
-					<path d="M23780.1 1804.5 L23868 1936 L23868 2609.5 L23868.0 2609.5 " fill="none"></path>
+					<path d="M23166.6 1804.5 L23254.5 1936 L23254.5 2609.5 L23254.5 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23779.3 1793.8 L23780.1 1804.5 L23770.4 1799.7 L23769.7 1789.0 Z"></path>
+						<path d="M23165.8 1793.8 L23166.6 1804.5 L23156.9 1799.7 L23156.2 1789.0 Z"></path>
 					</g>
-					<path d="M23995.9 1804.5 L23908 1936 L23630.64150943396 2548.5 L23630.6 2548.5 " fill="none"></path>
+					<path d="M23382.4 1804.5 L23294.5 1936 L21587.25 2575.551583525894 L21587.3 2575.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24005.6 1799.7 L23995.9 1804.5 L23996.7 1793.8 L24006.3 1789.0 Z"></path>
+						<path d="M23392.1 1799.7 L23382.4 1804.5 L23383.2 1793.8 L23392.8 1789.0 Z"></path>
 					</g>
-					<path d="M24080.4 1807.5 L24095.5 1936 L24095.5 2609.5 L24095.5 2609.5 " fill="none"></path>
+					<path d="M23483.4 1807.0 L23518 1936 L23518 2609.5 L23518.0 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24084.6 1797.6 L24080.4 1807.5 L24074.0 1798.9 L24078.2 1789.0 Z"></path>
+						<path d="M23486.1 1796.6 L23483.4 1807.0 L23475.8 1799.4 L23478.6 1789.0 Z"></path>
 					</g>
-					<path d="M24139.1 1804.5 L24227 1936 L23876.07619738752 2609.5 L23876.1 2609.5 " fill="none"></path>
+					<path d="M23525.6 1804.5 L23613.5 1936 L23262.57619738752 2609.5 L23262.6 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24138.3 1793.8 L24139.1 1804.5 L24129.4 1799.7 L24128.7 1789.0 Z"></path>
+						<path d="M23524.8 1793.8 L23525.6 1804.5 L23515.9 1799.7 L23515.2 1789.0 Z"></path>
 					</g>
-					<path d="M24426.5 1777.7 L24426.5 1936 L24102.946298984036 2609.5 L24102.9 2609.5 " fill="none"></path>
+					<path d="M23813.0 1777.7 L23813 1936 L23524.636429608126 2609.5 L23524.6 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24431.8 1768.3 L24426.5 1777.7 L24421.2 1768.3 L24426.5 1759.0 Z"></path>
+						<path d="M23818.3 1768.3 L23813.0 1777.7 L23807.7 1768.3 L23813.0 1759.0 Z"></path>
 					</g>
-					<path d="M20222.2 2709.7 L19833 3314 L27961.75 3499.507280736639 L27961.8 3499.5 " fill="none"></path>
+					<path d="M19488.7 2712.2 L19347 3314 L25956.25 3499.2805418811768 L25956.3 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20231.7 2704.7 L20222.2 2709.7 L20222.8 2699.0 L20232.3 2694.0 Z"></path>
+						<path d="M19496.1 2704.3 L19488.7 2712.2 L19485.7 2701.9 L19493.0 2694.0 Z"></path>
 					</g>
-					<path d="M20292.2 2712.4 L20398.5 3314 L20398.5 3500.5 L20398.5 3500.5 L20398.5 3687 L20398.5 3687 L20398.5 3843.5 L20398.5 3843.5 L20398.5 4000 L20398.5 4000 L18421.25 4129.2919360741735 L18421.3 4129.3 " fill="none"></path>
+					<path d="M19524.7 2712.4 L19631 3314 L19631 3500.5 L19631 3500.5 L19631 3687 L19631 3687 L19631 3843.5 L19631 3843.5 L19631 4000 L19631 4000 L18216.75 4127.508494533221 L18216.8 4127.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20295.8 2702.3 L20292.2 2712.4 L20285.3 2704.1 L20288.9 2694.0 Z"></path>
+						<path d="M19528.3 2702.3 L19524.7 2712.4 L19517.8 2704.1 L19521.4 2694.0 Z"></path>
 					</g>
-					<path d="M20740.5 2800.4 L20503.5 3314 L20503.5 3485 L20503.5 3485.0 " fill="none"></path>
+					<path d="M19827.1 2801.9 L19736 3314 L19736 3485 L19736.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20749.3 2794.2 L20740.5 2800.4 L20739.6 2789.7 L20748.3 2783.5 Z"></path>
+						<path d="M19833.9 2793.6 L19827.1 2801.9 L19823.4 2791.8 L19830.3 2783.5 Z"></path>
 					</g>
-					<path d="M20811.2 2802.1 L20781.5 3314 L13203.75 3499.216785164313 L13203.8 3499.2 " fill="none"></path>
+					<path d="M19863.9 2802.2 L19879.5 3314 L13558.5 3498.963756177924 L13558.5 3499.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20817.1 2793.1 L20811.2 2802.1 L20806.4 2792.5 L20812.3 2783.5 Z"></path>
+						<path d="M19868.9 2792.7 L19863.9 2802.2 L19858.3 2793.0 L19863.3 2783.5 Z"></path>
 					</g>
-					<path d="M20821.5 2802.2 L20821.5 3314 L21865.75 3494.368256540866 L21865.8 3494.4 " fill="none"></path>
+					<path d="M19874.2 2802.1 L19919.5 3314 L21189 3495.4266283524903 L21189.0 3495.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20826.8 2792.8 L20821.5 2802.2 L20816.2 2792.8 L20821.5 2783.5 Z"></path>
+						<path d="M19878.7 2792.3 L19874.2 2802.1 L19868.0 2793.3 L19872.5 2783.5 Z"></path>
 					</g>
-					<path d="M20831.8 2802.1 L20861.5 3314 L13048 3498.890915434879 L13048.0 3498.9 " fill="none"></path>
+					<path d="M19884.4 2802.0 L19959.5 3314 L13403 3498.585591365386 L13403.0 3498.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20836.6 2792.5 L20831.8 2802.1 L20825.9 2793.1 L20830.7 2783.5 Z"></path>
+						<path d="M19888.4 2792.0 L19884.4 2802.0 L19877.8 2793.5 L19881.7 2783.5 Z"></path>
 					</g>
-					<path d="M20902.5 2800.4 L21139.5 3314 L22088 3494.9670076726343 L22088.0 3495.0 " fill="none"></path>
+					<path d="M19905.5 2801.5 L20042 3314 L21300 3496.297591297591 L21300.0 3496.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20903.4 2789.7 L20902.5 2800.4 L20893.7 2794.2 L20894.7 2783.5 Z"></path>
+						<path d="M19908.3 2791.1 L19905.5 2801.5 L19898.0 2793.9 L19900.7 2783.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M36934.9 173.6 L36700.75 293 L36700.75 598.5 L36700.8 598.5 " fill="none"></path>
+						<path d="M37594.4 173.6 L37360.25 293 L37360.25 598.5 L37360.3 598.5 " fill="none"></path>
 					</g>
-					<path d="M36937.3 178.3 L36934.9 173.6 L36932.4 168.8 L36946.7 167.5 Z"></path>
+					<path d="M37596.8 178.3 L37594.4 173.6 L37591.9 168.8 L37606.2 167.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M37051.5 176.5 L37179.75 293 L37179.75 598.5 L37179.8 598.5 " fill="none"></path>
+						<path d="M37711.0 176.5 L37839.25 293 L37839.25 598.5 L37839.3 598.5 " fill="none"></path>
 					</g>
-					<path d="M37055.1 172.5 L37051.5 176.5 L37047.9 180.4 L37041.6 167.5 Z"></path>
-					<path d="M21345.9 2689.0 L21179.5 3314 L9625 3497.592268370607 L9625.0 3497.6 " fill="none"></path>
+					<path d="M37714.6 172.5 L37711.0 176.5 L37707.4 180.4 L37701.1 167.5 Z"></path>
+					<path d="M20362.0 2688.0 L20082 3314 L10049 3497.1592110415036 L10049.0 3497.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21353.5 2681.4 L21345.9 2689.0 L21343.2 2678.6 L21350.7 2671.0 Z"></path>
+						<path d="M20370.7 2681.7 L20362.0 2688.0 L20361.0 2677.3 L20369.7 2671.0 Z"></path>
 					</g>
-					<path d="M21361.1 2689.7 L21342.75 3314 L22088 3493.514530190507 L22088.0 3493.5 " fill="none"></path>
+					<path d="M20402.5 2689.3 L20521 3314 L21300 3493.8063118811883 L21300.0 3493.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21366.7 2680.5 L21361.1 2689.7 L21356.0 2680.2 L21361.6 2671.0 Z"></path>
+						<path d="M20406.0 2679.2 L20402.5 2689.3 L20395.5 2681.2 L20399.0 2671.0 Z"></path>
 					</g>
-					<path d="M21378.2 2689.2 L21526.25 3314 L26168.5 3499.2430328964965 L26168.5 3499.2 " fill="none"></path>
+					<path d="M20429.6 2686.7 L20829.25 3314 L24756.25 3499.0159151193634 L24756.3 3499.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21381.2 2678.9 L21378.2 2689.2 L21370.9 2681.3 L21373.9 2671.0 Z"></path>
+						<path d="M20429.1 2676.0 L20429.6 2686.7 L20420.1 2681.7 L20419.6 2671.0 Z"></path>
 					</g>
-					<path d="M9643.1 3450.0 L9655 3447 L9662.5 3447 L9662.5 3447 L9670 3500.5 L9670 3500.5 L9662.5 3554 L9662.5 3554 L9655 3554 L9655 3554 L9625 3546.4647887323945 L9625.0 3546.5 " fill="none"></path>
+					<path d="M10067.1 3450.0 L10079 3447 L10086.5 3447 L10086.5 3447 L10094 3500.5 L10094 3500.5 L10086.5 3554 L10086.5 3554 L10079 3554 L10079 3554 L10049 3546.4647887323945 L10049.0 3546.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9632.8 3447.1 L9643.1 3450.0 L9635.4 3457.4 L9625.0 3454.5 Z"></path>
+						<path d="M10056.8 3447.1 L10067.1 3450.0 L10059.4 3457.4 L10049.0 3454.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3102.7 2653.8 L3043.25 3314 L9259 3495.16622387185 L9259.0 3495.2 " fill="none"></path>
+						<path d="M3526.7 2653.8 L3467.25 3314 L9683 3495.16622387185 L9683.0 3495.2 " fill="none"></path>
 					</g>
-					<path d="M3108.0 2654.3 L3102.7 2653.8 L3097.3 2653.3 L3103.9 2640.5 Z"></path>
-					<path d="M25005.1 1814.4 L24689.25 1936 L44187.75 2619.792258360055 L44187.8 2619.8 " fill="none"></path>
+					<path d="M3532.0 2654.3 L3526.7 2653.8 L3521.3 2653.3 L3527.9 2640.5 Z"></path>
+					<path d="M24545.4 1791.2 L24075.75 1936 L41854.75 2619.292762515688 L41854.8 2619.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25015.7 1816.0 L25005.1 1814.4 L25011.9 1806.0 L25022.5 1807.7 Z"></path>
+						<path d="M24555.9 1793.5 L24545.4 1791.2 L24552.8 1783.3 L24563.3 1785.7 Z"></path>
 					</g>
-					<path d="M25005.4 1832.5 L24773 1936 L24773 2609.5 L24773.0 2609.5 " fill="none"></path>
+					<path d="M24545.5 1796.3 L24115.75 1936 L24115.75 2609.5 L24115.8 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25016.1 1833.5 L25005.4 1832.5 L25011.8 1823.8 L25022.5 1824.9 Z"></path>
+						<path d="M24556.0 1798.5 L24545.5 1796.3 L24552.7 1788.3 L24563.3 1790.5 Z"></path>
 					</g>
-					<path d="M25099.5 1929.9 L25094 1936 L25094 2609.5 L25094.0 2609.5 " fill="none"></path>
+					<path d="M24832.8 1934.6 L24832.75 1936 L24832.75 2609.5 L24832.8 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25109.7 1926.5 L25099.5 1929.9 L25101.8 1919.4 L25112.0 1916.0 Z"></path>
+						<path d="M24838.8 1925.7 L24832.8 1934.6 L24828.2 1924.9 L24834.1 1916.0 Z"></path>
 					</g>
-					<path d="M25490.9 1930.7 L25495 1936 L25495 2609.5 L25495.0 2609.5 " fill="none"></path>
+					<path d="M25151.1 1884.7 L25233.75 1936 L25233.75 2609.5 L25233.8 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25489.3 1920.1 L25490.9 1930.7 L25480.9 1926.6 L25479.4 1916.0 Z"></path>
+						<path d="M25146.0 1875.3 L25151.1 1884.7 L25140.4 1884.4 L25135.3 1874.9 Z"></path>
 					</g>
-					<path d="M25611.7 1823.2 L25884 1936 L25884 2609.5 L25884.0 2609.5 " fill="none"></path>
+					<path d="M25153.1 1791.2 L25622.75 1936 L25622.75 2609.5 L25622.8 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25605.2 1814.7 L25611.7 1823.2 L25601.1 1824.5 L25594.5 1816.0 Z"></path>
+						<path d="M25145.7 1783.3 L25153.1 1791.2 L25142.6 1793.5 L25135.3 1785.7 Z"></path>
 					</g>
-					<path d="M44322.8 2750.1 L44262 3314 L44262 3485 L44262.0 3485.0 " fill="none"></path>
+					<path d="M41989.8 2750.1 L41929 3314 L41929 3485 L41929.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44329.1 2741.4 L44322.8 2750.1 L44318.5 2740.2 L44324.8 2731.5 Z"></path>
+						<path d="M41996.1 2741.4 L41989.8 2750.1 L41985.5 2740.2 L41991.8 2731.5 Z"></path>
 					</g>
-					<path d="M44375.3 2749.3 L44552.75 3314 L14544.5 3499.348069614751 L14544.5 3499.3 " fill="none"></path>
+					<path d="M42016.7 2750.1 L42077.5 3314 L14418 3499.2509067729657 L14418.0 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44377.6 2738.8 L44375.3 2749.3 L44367.4 2742.0 L44369.7 2731.5 Z"></path>
+						<path d="M42021.0 2740.2 L42016.7 2750.1 L42010.4 2741.4 L42014.7 2731.5 Z"></path>
 					</g>
-					<path d="M22868.1 1717.9 L22312 1936 L44187.75 2620.3543707504227 L44187.8 2620.4 " fill="none"></path>
-					<path d="M22870.0 1722.8 L22868.1 1717.9 L22866.1 1712.9 L22880.5 1713.0 Z"></path>
-					<path d="M14562.6 3449.9 L14574.5 3447 L14582 3447 L14582 3447 L14589.5 3500.5 L14589.5 3500.5 L14582 3554 L14582 3554 L14574.5 3554 L14574.5 3554 L14544.5 3546.5866050808313 L14544.5 3546.6 " fill="none"></path>
+					<path d="M116.8 1726.1 L152 1936 L41854.75 2622.555234311998 L41854.8 2622.6 " fill="none"></path>
+					<path d="M122.1 1725.3 L116.8 1726.1 L111.5 1727.0 L114.6 1713.0 Z"></path>
+					<path d="M14436.1 3449.9 L14448 3447 L14455.5 3447 L14455.5 3447 L14463 3500.5 L14463 3500.5 L14455.5 3554 L14455.5 3554 L14448 3554 L14448 3554 L14418 3546.5866050808313 L14418.0 3546.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14552.3 3447.0 L14562.6 3449.9 L14554.8 3457.4 L14544.5 3454.4 Z"></path>
+						<path d="M14425.8 3447.0 L14436.1 3449.9 L14428.3 3457.4 L14418.0 3454.4 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3104.3 2653.8 L3083.25 3314 L14171.5 3497.4150313754185 L14171.5 3497.4 " fill="none"></path>
+						<path d="M3528.3 2653.8 L3507.25 3314 L14045 3497.256672960813 L14045.0 3497.3 " fill="none"></path>
 					</g>
-					<path d="M3109.7 2654.0 L3104.3 2653.8 L3099.0 2653.7 L3104.8 2640.5 Z"></path>
-					<path d="M37557.0 193.7 L37557 293 L37557 614 L37557.0 614.0 " fill="none"></path>
+					<path d="M3533.7 2654.0 L3528.3 2653.8 L3523.0 2653.7 L3528.8 2640.5 Z"></path>
+					<path d="M38216.5 193.7 L38216.5 293 L38216.5 614 L38216.5 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37562.3 184.3 L37557.0 193.7 L37551.7 184.3 L37557.0 175.0 Z"></path>
+						<path d="M38221.8 184.3 L38216.5 193.7 L38211.2 184.3 L38216.5 175.0 Z"></path>
 					</g>
-					<path d="M22196.0 2712.7 L22196 3314 L63069 3500.290341894963 L63069.0 3500.3 " fill="none"></path>
+					<path d="M22157.3 2712.7 L22157.25 3314 L63549.25 3500.2929678073265 L63549.3 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22201.3 2703.3 L22196.0 2712.7 L22190.7 2703.3 L22196.0 2694.0 Z"></path>
+						<path d="M22162.6 2703.3 L22157.3 2712.7 L22151.9 2703.3 L22157.3 2694.0 Z"></path>
 					</g>
-					<path d="M59910.6 1716.0 L58663.75 1936 L58663.75 2594 L58663.8 2594.0 " fill="none"></path>
-					<path d="M59911.5 1721.3 L59910.6 1716.0 L59909.7 1710.8 L59923.8 1713.7 Z"></path>
-					<path d="M58660.4 2669.3 L58611.25 3314 L58611.25 3485 L58611.3 3485.0 " fill="none"></path>
-					<path d="M58665.7 2669.7 L58660.4 2669.3 L58655.1 2668.9 L58661.4 2656.0 Z"></path>
-					<path d="M59910.7 1720.5 L58928.25 1936 L58928.25 2594 L58928.3 2594.0 " fill="none"></path>
-					<path d="M59911.9 1725.7 L59910.7 1720.5 L59909.6 1715.3 L59923.8 1717.7 Z"></path>
-					<path d="M59974.3 1737.8 L59770.5 1936 L45635.75 2619.0321217540723 L45635.8 2619.0 " fill="none"></path>
-					<path d="M59978.0 1741.6 L59974.3 1737.8 L59970.6 1734.0 L59983.9 1728.5 Z"></path>
-					<path d="M45512.3 2669.3 L45512.25 3314 L50356.25 3495.534411735155 L50356.3 3495.5 " fill="none"></path>
-					<path d="M45517.6 2669.3 L45512.3 2669.3 L45506.9 2669.3 L45512.3 2656.0 Z"></path>
+					<path d="M61087.1 1714.0 L59668.25 1936 L59668.25 2594 L59668.3 2594.0 " fill="none"></path>
+					<path d="M61087.9 1719.2 L61087.1 1714.0 L61086.3 1708.7 L61100.3 1711.9 Z"></path>
+					<path d="M59667.0 2669.3 L59648.25 3314 L60377.86528150134 3485 L60377.9 3485.0 " fill="none"></path>
+					<path d="M59672.3 2669.5 L59667.0 2669.3 L59661.6 2669.2 L59667.4 2656.0 Z"></path>
+					<path d="M61087.1 1717.4 L59932.75 1936 L59932.75 2594 L59932.8 2594.0 " fill="none"></path>
+					<path d="M61088.1 1722.6 L61087.1 1717.4 L61086.2 1712.2 L61100.3 1714.9 Z"></path>
+					<path d="M61097.9 1733.2 L60562.5 1936 L45650 2619.34081537643 L45650.0 2619.3 " fill="none"></path>
+					<path d="M61099.8 1738.2 L61097.9 1733.2 L61096.0 1728.2 L61110.4 1728.5 Z"></path>
+					<path d="M45526.5 2669.3 L45526.5 3314 L50399 3495.562687312687 L50399.0 3495.6 " fill="none"></path>
+					<path d="M45531.8 2669.3 L45526.5 2669.3 L45521.2 2669.3 L45526.5 2656.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M58680.9 2668.4 L58935.75 3314 L50621.25 3497.574553095774 L50621.3 3497.6 " fill="none"></path>
+						<path d="M59684.3 2668.5 L59923 3314 L50664 3497.868764308151 L50664.0 3497.9 " fill="none"></path>
 					</g>
-					<path d="M58685.8 2666.4 L58680.9 2668.4 L58675.9 2670.4 L58676.0 2656.0 Z"></path>
-					<path d="M59980.4 1738.6 L59810.5 1936 L45225.25 2619.5402077983913 L45225.3 2619.5 " fill="none"></path>
-					<path d="M59984.4 1742.1 L59980.4 1738.6 L59976.3 1735.1 L59989.1 1728.5 Z"></path>
-					<path d="M45108.8 2669.3 L45108.75 3314 L45108.75 3469.5 L45108.8 3469.5 " fill="none"></path>
-					<path d="M45114.1 2669.3 L45108.8 2669.3 L45103.4 2669.3 L45108.8 2656.0 Z"></path>
-					<path d="M60118.7 1732.8 L60711 1936 L60711 2594 L60711.0 2594.0 " fill="none"></path>
-					<path d="M60120.5 1727.8 L60118.7 1732.8 L60117.0 1737.9 L60106.1 1728.5 Z"></path>
-					<path d="M38061.5 679.2 L38061.5 966 L38061.5 1197 L38061.5 1197.0 " fill="none"></path>
+					<path d="M59689.3 2666.7 L59684.3 2668.5 L59679.3 2670.4 L59679.7 2656.0 Z"></path>
+					<path d="M61103.2 1733.5 L60602.5 1936 L44863.5 2619.937498029075 L44863.5 2619.9 " fill="none"></path>
+					<path d="M61105.2 1738.4 L61103.2 1733.5 L61101.2 1728.6 L61115.6 1728.5 Z"></path>
+					<path d="M44747.0 2669.3 L44747 3314 L44747 3469.5 L44747.0 3469.5 " fill="none"></path>
+					<path d="M44752.3 2669.3 L44747.0 2669.3 L44741.7 2669.3 L44747.0 2656.0 Z"></path>
+					<path d="M61199.7 1741.6 L61232.25 1936 L61232.25 2594 L61232.3 2594.0 " fill="none"></path>
+					<path d="M61204.9 1740.8 L61199.7 1741.6 L61194.4 1742.5 L61197.4 1728.5 Z"></path>
+					<path d="M38721.0 679.2 L38721 966 L38721 1197 L38721.0 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38066.8 669.8 L38061.5 679.2 L38056.2 669.8 L38061.5 660.5 Z"></path>
+						<path d="M38726.3 669.8 L38721.0 679.2 L38715.7 669.8 L38721.0 660.5 Z"></path>
 					</g>
-					<path d="M38061.5 165.3 L38061.5 293 L38061.5 598.5 L38061.5 598.5 " fill="none"></path>
-					<path d="M38066.8 165.3 L38061.5 165.3 L38056.2 165.3 L38061.5 152.0 Z"></path>
-					<path d="M38603.6 161.6 L38477.25 293 L38477.25 598.5 L38477.3 598.5 " fill="none"></path>
-					<path d="M38607.4 165.3 L38603.6 161.6 L38599.8 157.9 L38612.8 152.0 Z"></path>
-					<path d="M38657.0 160.5 L38818.75 293 L38818.75 598.5 L38818.8 598.5 " fill="none"></path>
-					<path d="M38660.4 156.3 L38657.0 160.5 L38653.6 164.6 L38646.7 152.0 Z"></path>
-					<path d="M39057.5 1747.2 L39057.5 1936 L36986.5 2589.2016479743647 L36986.5 2589.2 " fill="none"></path>
+					<path d="M38721.0 165.3 L38721 293 L38721 598.5 L38721.0 598.5 " fill="none"></path>
+					<path d="M38726.3 165.3 L38721.0 165.3 L38715.7 165.3 L38721.0 152.0 Z"></path>
+					<path d="M39263.1 161.6 L39136.75 293 L39136.75 598.5 L39136.8 598.5 " fill="none"></path>
+					<path d="M39266.9 165.3 L39263.1 161.6 L39259.3 157.9 L39272.3 152.0 Z"></path>
+					<path d="M39316.5 160.5 L39478.25 293 L39478.25 598.5 L39478.3 598.5 " fill="none"></path>
+					<path d="M39319.9 156.3 L39316.5 160.5 L39313.1 164.6 L39306.2 152.0 Z"></path>
+					<path d="M39300.3 1747.2 L39300.25 1936 L39300.25 2586.5 L39300.3 2586.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39062.8 1737.8 L39057.5 1747.2 L39052.2 1737.8 L39057.5 1728.5 Z"></path>
+						<path d="M39305.6 1737.8 L39300.3 1747.2 L39294.9 1737.8 L39300.3 1728.5 Z"></path>
 					</g>
-					<path d="M39057.5 1241.3 L39057.5 1459 L39057.5 1666.5 L39057.5 1666.5 " fill="none"></path>
-					<path d="M39062.8 1241.3 L39057.5 1241.3 L39052.2 1241.3 L39057.5 1228.0 Z"></path>
-					<path d="M39239.1 916.8 L39208 966 L39208 1197 L39208.0 1197.0 " fill="none"></path>
+					<path d="M39300.3 1241.3 L39300.25 1459 L39300.25 1666.5 L39300.3 1666.5 " fill="none"></path>
+					<path d="M39305.6 1241.3 L39300.3 1241.3 L39294.9 1241.3 L39300.3 1228.0 Z"></path>
+					<path d="M39804.3 777.0 L39450.75 966 L39450.75 1197 L39450.8 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39248.6 911.7 L39239.1 916.8 L39239.6 906.0 L39249.1 901.0 Z"></path>
+						<path d="M39815.0 777.3 L39804.3 777.0 L39810.0 767.9 L39820.8 768.2 Z"></path>
 					</g>
-					<path d="M39695.7 814.7 L39920.25 966 L39920.25 1197 L39920.3 1197.0 " fill="none"></path>
+					<path d="M39805.6 826.2 L39610.25 966 L39610.25 1197 L39610.3 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39691.0 805.1 L39695.7 814.7 L39685.0 814.0 L39680.3 804.3 Z"></path>
+						<path d="M39816.3 825.1 L39805.6 826.2 L39810.1 816.4 L39820.8 815.3 Z"></path>
 					</g>
-					<path d="M39697.5 745.8 L40221.5 966 L40221.5 1197 L40221.5 1197.0 " fill="none"></path>
+					<path d="M40354.9 828.8 L40544 966 L40544 1197 L40544.0 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39690.9 737.2 L39697.5 745.8 L39686.8 747.1 L39680.3 738.5 Z"></path>
+						<path d="M40350.4 819.0 L40354.9 828.8 L40344.2 827.6 L40339.8 817.8 Z"></path>
 					</g>
-					<path d="M39697.9 722.8 L40420.5 966 L40420.5 1197 L40420.5 1197.0 " fill="none"></path>
+					<path d="M40357.3 729.4 L41013.5 966 L41013.5 1197 L41013.5 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39690.8 714.8 L39697.9 722.8 L39687.4 724.9 L39680.3 716.8 Z"></path>
+						<path d="M40350.3 721.2 L40357.3 729.4 L40346.7 731.3 L40339.8 723.1 Z"></path>
 					</g>
-					<path d="M39420.8 165.3 L39420.75 293 L39420.75 358 L39420.8 358.0 " fill="none"></path>
-					<path d="M39426.1 165.3 L39420.8 165.3 L39415.4 165.3 L39420.8 152.0 Z"></path>
-					<path d="M36854.3 2681.2 L36643.25 3314 L22146 3500.1276740383787 L22146.0 3500.1 " fill="none"></path>
+					<path d="M40080.3 165.3 L40080.25 293 L40080.25 358 L40080.3 358.0 " fill="none"></path>
+					<path d="M40085.6 165.3 L40080.3 165.3 L40074.9 165.3 L40080.3 152.0 Z"></path>
+					<path d="M39270.4 2679.9 L38925.75 3314 L21358 3500.192642107207 L21358.0 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36862.3 2674.0 L36854.3 2681.2 L36852.2 2670.7 L36860.2 2663.5 Z"></path>
+						<path d="M39279.6 2674.2 L39270.4 2679.9 L39270.2 2669.2 L39279.3 2663.5 Z"></path>
 					</g>
-					<path d="M36873.0 2682.2 L36873 3314 L37348.17828418231 3485 L37348.2 3485.0 " fill="none"></path>
+					<path d="M39395.3 2671.7 L40701 3314 L40701 3485 L40701.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36878.3 2672.8 L36873.0 2682.2 L36867.7 2672.8 L36873.0 2663.5 Z"></path>
+						<path d="M39389.3 2662.8 L39395.3 2671.7 L39384.5 2672.4 L39378.5 2663.5 Z"></path>
 					</g>
-					<path d="M24314.5 2705.2 L24314.5 3314 L22146 3498.0387940841865 L22146.0 3498.0 " fill="none"></path>
+					<path d="M24346.3 2705.2 L24346.25 3314 L21358 3498.707473692932 L21358.0 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24319.8 2695.8 L24314.5 2705.2 L24309.2 2695.8 L24314.5 2686.5 Z"></path>
+						<path d="M24351.6 2695.8 L24346.3 2705.2 L24340.9 2695.8 L24346.3 2686.5 Z"></path>
 					</g>
-					<path d="M16795.7 3926.0 L16724.5 4000 L61169.5 4133.7817712135675 L61169.5 4133.8 " fill="none"></path>
+					<path d="M16591.2 3926.0 L16520 4000 L63516.75 4133.793601980061 L63516.8 4133.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16806.0 3922.9 L16795.7 3926.0 L16798.3 3915.5 L16808.6 3912.5 Z"></path>
+						<path d="M16601.5 3922.9 L16591.2 3926.0 L16593.8 3915.5 L16604.1 3912.5 Z"></path>
 					</g>
-					<path d="M16974.5 3924.3 L17067.75 4000 L16593.086753731342 4118.5 L16593.1 4118.5 " fill="none"></path>
+					<path d="M16770.0 3924.3 L16863.25 4000 L15053 4128.703276296591 L15053.0 4128.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16970.6 3914.2 L16974.5 3924.3 L16963.9 3922.5 L16960.0 3912.5 Z"></path>
+						<path d="M16766.1 3914.2 L16770.0 3924.3 L16759.4 3922.5 L16755.5 3912.5 Z"></path>
 					</g>
-					<path d="M39866.8 165.3 L39866.75 293 L39866.75 583.5 L39866.8 583.5 " fill="none"></path>
-					<path d="M39872.1 165.3 L39866.8 165.3 L39861.4 165.3 L39866.8 152.0 Z"></path>
-					<path d="M40201.8 165.3 L40201.75 293 L40201.75 583.5 L40201.8 583.5 " fill="none"></path>
-					<path d="M40207.1 165.3 L40201.8 165.3 L40196.4 165.3 L40201.8 152.0 Z"></path>
-					<path d="M24512.5 2712.2 L24512.5 3314 L27961.75 3498.1772600386516 L27961.8 3498.2 " fill="none"></path>
+					<path d="M40526.3 165.3 L40526.25 293 L40526.25 583.5 L40526.3 583.5 " fill="none"></path>
+					<path d="M40531.6 165.3 L40526.3 165.3 L40520.9 165.3 L40526.3 152.0 Z"></path>
+					<path d="M40861.3 165.3 L40861.25 293 L40861.25 583.5 L40861.3 583.5 " fill="none"></path>
+					<path d="M40866.6 165.3 L40861.3 165.3 L40855.9 165.3 L40861.3 152.0 Z"></path>
+					<path d="M24544.3 2712.2 L24544.25 3314 L25956.25 3494.9261422191685 L25956.3 3494.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24517.8 2702.8 L24512.5 2712.2 L24507.2 2702.8 L24512.5 2693.5 Z"></path>
+						<path d="M24549.6 2702.8 L24544.3 2712.2 L24538.9 2702.8 L24544.3 2693.5 Z"></path>
 					</g>
-					<path d="M82508.8 171.4 L82116.75 293 L82116.75 629.5 L82116.75 629.5 L82116.75 966 L82116.75 966 L82116.75 1174 L82116.8 1174.0 " fill="none"></path>
-					<path d="M82510.4 176.5 L82508.8 171.4 L82507.2 166.4 L82521.5 167.5 Z"></path>
-					<path d="M867.2 3422.4 L880 3417 L887.5 3417 L887.5 3417 L895 3500.5 L895 3500.5 L887.5 3584 L887.5 3584 L880 3584 L880 3584 L850 3571.284263959391 L850.0 3571.3 " fill="none"></path>
+					<path d="M83446.3 171.4 L83054.25 293 L83054.25 629.5 L83054.25 629.5 L83054.25 966 L83054.25 966 L83054.25 1174 L83054.3 1174.0 " fill="none"></path>
+					<path d="M83447.9 176.5 L83446.3 171.4 L83444.7 166.4 L83459.0 167.5 Z"></path>
+					<path d="M1291.2 3422.4 L1304 3417 L1311.5 3417 L1311.5 3417 L1319 3500.5 L1319 3500.5 L1311.5 3584 L1311.5 3584 L1304 3584 L1304 3584 L1274 3571.284263959391 L1274.0 3571.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M856.5 3421.2 L867.2 3422.4 L860.7 3431.0 L850.0 3429.7 Z"></path>
+						<path d="M1280.5 3421.2 L1291.2 3422.4 L1284.7 3431.0 L1274.0 3429.7 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3106.0 2653.8 L3123.25 3314 L850 3487.7367585288393 L850.0 3487.7 " fill="none"></path>
+						<path d="M3530.0 2653.8 L3547.25 3314 L1274 3487.7367585288393 L1274.0 3487.7 " fill="none"></path>
 					</g>
-					<path d="M3111.3 2653.7 L3106.0 2653.8 L3100.7 2654.0 L3105.7 2640.5 Z"></path>
-					<path d="M17301.6 3941.9 L17178.5 4000 L16766.402985074626 4118.5 L16766.4 4118.5 " fill="none"></path>
+					<path d="M3535.3 2653.7 L3530.0 2653.8 L3524.7 2654.0 L3529.7 2640.5 Z"></path>
+					<path d="M17097.1 3941.9 L16974 4000 L15227 4129.050716648291 L15227.0 4129.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17312.3 3942.7 L17301.6 3941.9 L17307.8 3933.1 L17318.5 3933.9 Z"></path>
+						<path d="M17107.8 3942.7 L17097.1 3941.9 L17103.3 3933.1 L17114.0 3933.9 Z"></path>
 					</g>
-					<path d="M17302.1 3955.1 L17218.5 4000 L8617 4132.71168681635 L8617.0 4132.7 " fill="none"></path>
+					<path d="M17097.6 3955.1 L17014 4000 L7462.25 4132.838743156638 L7462.3 4132.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17312.8 3955.4 L17302.1 3955.1 L17307.8 3946.0 L17318.5 3946.3 Z"></path>
+						<path d="M17108.3 3955.4 L17097.6 3955.1 L17103.3 3946.0 L17114.0 3946.3 Z"></path>
 					</g>
-					<path d="M17719.5 3901.4 L18076.25 4000 L18317.671641791047 4118.5 L18317.7 4118.5 " fill="none"></path>
+					<path d="M17515.0 3901.4 L17871.75 4000 L18113.171641791047 4118.5 L18113.2 4118.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17711.9 3893.8 L17719.5 3901.4 L17709.1 3904.1 L17701.5 3896.4 Z"></path>
+						<path d="M17507.4 3893.8 L17515.0 3901.4 L17504.6 3904.1 L17497.0 3896.4 Z"></path>
 					</g>
-					<path d="M17719.6 3897.6 L18116.25 4000 L17103.9151119403 4118.5 L17103.9 4118.5 " fill="none"></path>
+					<path d="M17515.1 3897.6 L17911.75 4000 L15571 4125.829104402768 L15571.0 4125.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17711.9 3890.1 L17719.6 3897.6 L17709.2 3900.4 L17701.5 3892.9 Z"></path>
+						<path d="M17507.4 3890.1 L17515.1 3897.6 L17504.7 3900.4 L17497.0 3892.9 Z"></path>
 					</g>
-					<path d="M40536.0 193.7 L40471.25 293 L40471.25 598.5 L40471.3 598.5 " fill="none"></path>
-					<path d="M40540.5 196.6 L40536.0 193.7 L40531.5 190.8 L40543.3 182.5 Z"></path>
-					<path d="M40610.5 193.7 L40675.25 293 L40675.25 598.5 L40675.3 598.5 " fill="none"></path>
-					<path d="M40615.0 190.8 L40610.5 193.7 L40606.0 196.6 L40603.2 182.5 Z"></path>
-					<path d="M18329.5 3911.2 L18247.25 4000 L17223.5 4130.185053380783 L17223.5 4130.2 " fill="none"></path>
+					<path d="M41195.5 193.7 L41130.75 293 L41130.75 598.5 L41130.8 598.5 " fill="none"></path>
+					<path d="M41200.0 196.6 L41195.5 193.7 L41191.0 190.8 L41202.8 182.5 Z"></path>
+					<path d="M41270.0 193.7 L41334.75 293 L41334.75 598.5 L41334.8 598.5 " fill="none"></path>
+					<path d="M41274.5 190.8 L41270.0 193.7 L41265.5 196.6 L41262.7 182.5 Z"></path>
+					<path d="M18125.0 3911.2 L18042.75 4000 L15671 4132.326220464245 L15671.0 4132.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18339.8 3908.0 L18329.5 3911.2 L18332.0 3900.7 L18342.2 3897.5 Z"></path>
+						<path d="M18135.3 3908.0 L18125.0 3911.2 L18127.5 3900.7 L18137.7 3897.5 Z"></path>
 					</g>
-					<path d="M58808.5 4214.2 L58808.5 4268 L63871.25 4451.1891885337345 L63871.3 4451.2 " fill="none"></path>
+					<path d="M59481.3 4214.2 L59481.25 4268 L65807.25 4451.84090377873 L65807.3 4451.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58813.8 4204.8 L58808.5 4214.2 L58803.2 4204.8 L58808.5 4195.5 Z"></path>
+						<path d="M59486.6 4204.8 L59481.3 4214.2 L59475.9 4204.8 L59481.3 4195.5 Z"></path>
 					</g>
-					<path d="M18382.4 3910.7 L18369.25 4000 L58540.5 4133.111951878435 L58540.5 4133.1 " fill="none"></path>
-					<path d="M18387.7 3911.5 L18382.4 3910.7 L18377.1 3909.9 L18384.3 3897.5 Z"></path>
-					<path d="M18442.5 3908.0 L18514.25 4000 L39575 4133.5687392770515 L39575.0 4133.6 " fill="none"></path>
-					<path d="M18446.7 3904.7 L18442.5 3908.0 L18438.3 3911.3 L18434.3 3897.5 Z"></path>
-					<path d="M22117.0 3529.3 L22117 3687 L22117 3805 L22117.0 3805.0 " fill="none"></path>
-					<path d="M22122.3 3529.3 L22117.0 3529.3 L22111.7 3529.3 L22117.0 3516.0 Z"></path>
-					<path d="M41015.8 165.3 L41015.75 293 L41015.75 583 L41015.8 583.0 " fill="none"></path>
-					<path d="M41021.1 165.3 L41015.8 165.3 L41010.4 165.3 L41015.8 152.0 Z"></path>
-					<path d="M41464.8 724.7 L41464.75 966 L41464.75 1197 L41464.8 1197.0 " fill="none"></path>
+					<path d="M18177.9 3910.7 L18164.75 4000 L59213.25 4133.1308073045875 L59213.3 4133.1 " fill="none"></path>
+					<path d="M18183.2 3911.5 L18177.9 3910.7 L18172.6 3909.9 L18179.8 3897.5 Z"></path>
+					<path d="M18238.0 3908.0 L18309.75 4000 L40742 4133.595026721925 L40742.0 4133.6 " fill="none"></path>
+					<path d="M18242.2 3904.7 L18238.0 3908.0 L18233.8 3911.3 L18229.8 3897.5 Z"></path>
+					<path d="M21329.0 3529.3 L21329 3687 L21329 3805 L21329.0 3805.0 " fill="none"></path>
+					<path d="M21334.3 3529.3 L21329.0 3529.3 L21323.7 3529.3 L21329.0 3516.0 Z"></path>
+					<path d="M41675.3 165.3 L41675.25 293 L41675.25 583 L41675.3 583.0 " fill="none"></path>
+					<path d="M41680.6 165.3 L41675.3 165.3 L41669.9 165.3 L41675.3 152.0 Z"></path>
+					<path d="M42124.3 724.7 L42124.25 966 L42124.25 1197 L42124.3 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41470.1 715.3 L41464.8 724.7 L41459.4 715.3 L41464.8 706.0 Z"></path>
+						<path d="M42129.6 715.3 L42124.3 724.7 L42118.9 715.3 L42124.3 706.0 Z"></path>
 					</g>
-					<path d="M41464.8 165.3 L41464.75 293 L41464.75 553 L41464.8 553.0 " fill="none"></path>
-					<path d="M41470.1 165.3 L41464.8 165.3 L41459.4 165.3 L41464.8 152.0 Z"></path>
-					<path d="M42255.0 160.8 L42106 293 L42106 575.5 L42106.0 575.5 " fill="none"></path>
-					<path d="M42258.6 164.8 L42255.0 160.8 L42251.5 156.9 L42265.0 152.0 Z"></path>
-					<path d="M42310.0 160.8 L42459 293 L42459 598.5 L42459.0 598.5 " fill="none"></path>
-					<path d="M42313.5 156.9 L42310.0 160.8 L42306.4 164.8 L42300.0 152.0 Z"></path>
-					<path d="M22887.8 1720.8 L22591 1936 L22591 2541 L22591.0 2541.0 " fill="none"></path>
-					<path d="M22891.0 1725.1 L22887.8 1720.8 L22884.7 1716.5 L22898.6 1713.0 Z"></path>
-					<path d="M79756.5 1762.7 L79756.5 1936 L64689.25 2617.0000655985045 L64689.3 2617.0 " fill="none"></path>
+					<path d="M42124.3 165.3 L42124.25 293 L42124.25 553 L42124.3 553.0 " fill="none"></path>
+					<path d="M42129.6 165.3 L42124.3 165.3 L42118.9 165.3 L42124.3 152.0 Z"></path>
+					<path d="M43073.0 160.8 L42924 293 L42924 575.5 L42924.0 575.5 " fill="none"></path>
+					<path d="M43076.6 164.8 L43073.0 160.8 L43069.5 156.9 L43083.0 152.0 Z"></path>
+					<path d="M43128.0 160.8 L43277 293 L43277 598.5 L43277.0 598.5 " fill="none"></path>
+					<path d="M43131.5 156.9 L43128.0 160.8 L43124.4 164.8 L43118.0 152.0 Z"></path>
+					<path d="M121.4 1725.6 L192 1936 L192 2541 L192.0 2541.0 " fill="none"></path>
+					<path d="M126.5 1723.9 L121.4 1725.6 L116.4 1727.3 L117.2 1713.0 Z"></path>
+					<path d="M34012.9 1704.0 L30593.25 1936 L30593.25 2571.5 L30593.3 2571.5 " fill="none"></path>
+					<path d="M34013.3 1709.3 L34012.9 1704.0 L34012.6 1698.6 L34026.3 1703.1 Z"></path>
+					<path d="M43609.5 231.7 L43609.5 293 L43609.5 614 L43609.5 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M79761.8 1753.3 L79756.5 1762.7 L79751.2 1753.3 L79756.5 1744.0 Z"></path>
+						<path d="M43614.8 222.3 L43609.5 231.7 L43604.2 222.3 L43609.5 213.0 Z"></path>
 					</g>
-					<path d="M80996.5 149.2 L79756.5 293 L79756.5 629.5 L79756.5 629.5 L79756.5 966 L79756.5 966 L79756.5 1212.5 L79756.5 1212.5 L79756.5 1459 L79756.5 1459 L79756.5 1651 L79756.5 1651.0 " fill="none"></path>
-					<path d="M80997.1 154.5 L80996.5 149.2 L80995.9 143.9 L81009.8 147.6 Z"></path>
-					<path d="M34466.9 1702.6 L30138.75 1936 L29166.361211901305 2571.5 L29166.4 2571.5 " fill="none"></path>
-					<path d="M34467.2 1708.0 L34466.9 1702.6 L34466.6 1697.3 L34480.3 1701.9 Z"></path>
-					<path d="M22930.4 1725.5 L23008.5 1936 L23008.5 2496 L23008.5 2496.0 " fill="none"></path>
-					<path d="M22935.4 1723.6 L22930.4 1725.5 L22925.4 1727.4 L22925.8 1713.0 Z"></path>
-					<path d="M42791.5 231.7 L42791.5 293 L42791.5 614 L42791.5 614.0 " fill="none"></path>
+					<path d="M27272.3 1792.7 L27272.25 1936 L22723.25 2598.5644223655004 L22723.3 2598.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42796.8 222.3 L42791.5 231.7 L42786.2 222.3 L42791.5 213.0 Z"></path>
+						<path d="M27277.6 1783.3 L27272.3 1792.7 L27266.9 1783.3 L27272.3 1774.0 Z"></path>
 					</g>
-					<path d="M64499.1 2727.5 L64423.75 3314 L59344.75 3498.448154999513 L59344.8 3498.4 " fill="none"></path>
+					<path d="M12917.5 2690.2 L12917.5 3314 L16987 3492.705380268425 L16987.0 3492.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64505.6 2718.9 L64499.1 2727.5 L64495.0 2717.6 L64501.5 2709.0 Z"></path>
+						<path d="M12922.8 2680.8 L12917.5 2690.2 L12912.2 2680.8 L12917.5 2671.5 Z"></path>
 					</g>
-					<path d="M64549.7 2726.5 L64766.25 3314 L63029 3495.029263863668 L63029.0 3495.0 " fill="none"></path>
+					<path d="M15280.5 1709.3 L12917.5 1936 L12917.5 2578.5 L12917.5 2578.5 " fill="none"></path>
+					<path d="M15281.0 1714.6 L15280.5 1709.3 L15280.0 1704.0 L15293.8 1708.0 Z"></path>
+					<path d="M13546.0 2690.2 L13546 3314 L16987 3491.3515268757774 L16987.0 3491.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64551.4 2715.9 L64549.7 2726.5 L64541.4 2719.6 L64543.2 2709.0 Z"></path>
+						<path d="M13551.3 2680.8 L13546.0 2690.2 L13540.7 2680.8 L13546.0 2671.5 Z"></path>
 					</g>
-					<path d="M66787.2 643.1 L56131.25 966 L56131.25 1212.5 L56131.25 1212.5 L56131.25 1459 L56131.25 1459 L56131.25 1697.5 L56131.25 1697.5 L56131.25 1936 L56131.25 1936 L64335.25 2610.448872449588 L64335.3 2610.4 " fill="none"></path>
-					<path d="M66787.3 648.4 L66787.2 643.1 L66787.0 637.8 L66800.5 642.7 Z"></path>
-					<path d="M11816.5 2690.2 L11816.5 3314 L14634.5 3489.4488399265565 L14634.5 3489.4 " fill="none"></path>
+					<path d="M15280.5 1713.3 L13546 1936 L13546 2578.5 L13546.0 2578.5 " fill="none"></path>
+					<path d="M15281.2 1718.5 L15280.5 1713.3 L15279.8 1708.0 L15293.8 1711.6 Z"></path>
+					<path d="M17164.5 2690.2 L17164.5 3314 L17164.5 3417 L17164.5 3417.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11821.8 2680.8 L11816.5 2690.2 L11811.2 2680.8 L11816.5 2671.5 Z"></path>
+						<path d="M17169.8 2680.8 L17164.5 2690.2 L17159.2 2680.8 L17164.5 2671.5 Z"></path>
 					</g>
-					<path d="M13472.3 1714.0 L11816.5 1936 L11816.5 2578.5 L11816.5 2578.5 " fill="none"></path>
-					<path d="M13473.0 1719.2 L13472.3 1714.0 L13471.6 1708.7 L13485.5 1712.2 Z"></path>
-					<path d="M12571.3 2690.2 L12571.25 3314 L14634.5 3485.7264866674104 L14634.5 3485.7 " fill="none"></path>
+					<path d="M15526.0 1714.1 L17164.5 1936 L17164.5 2578.5 L17164.5 2578.5 " fill="none"></path>
+					<path d="M15526.7 1708.8 L15526.0 1714.1 L15525.2 1719.4 L15512.8 1712.3 Z"></path>
+					<path d="M18292.8 2705.2 L18292.75 3314 L17342 3471.1592067360957 L17342.0 3471.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12576.6 2680.8 L12571.3 2690.2 L12565.9 2680.8 L12571.3 2671.5 Z"></path>
+						<path d="M18298.1 2695.8 L18292.8 2705.2 L18287.4 2695.8 L18292.8 2686.5 Z"></path>
 					</g>
-					<path d="M13472.5 1726.0 L12571.25 1936 L12571.25 2578.5 L12571.3 2578.5 " fill="none"></path>
-					<path d="M13473.7 1731.2 L13472.5 1726.0 L13471.3 1720.8 L13485.5 1723.0 Z"></path>
-					<path d="M13528.5 2690.2 L13528.5 3314 L14634.5 3474.7082197117256 L14634.5 3474.7 " fill="none"></path>
+					<path d="M15526.0 1707.6 L18292.75 1936 L18292.75 2563.5 L18292.8 2563.5 " fill="none"></path>
+					<path d="M15526.5 1702.3 L15526.0 1707.6 L15525.6 1713.0 L15512.8 1706.5 Z"></path>
+					<path d="M30766.5 2694.5 L29551.5 3314 L21260 3499.7049057283534 L21260.0 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13533.8 2680.8 L13528.5 2690.2 L13523.2 2680.8 L13528.5 2671.5 Z"></path>
+						<path d="M30777.2 2695.0 L30766.5 2694.5 L30772.4 2685.5 L30783.1 2686.0 Z"></path>
 					</g>
-					<path d="M13582.8 1741.3 L13528.5 1936 L13528.5 2578.5 L13528.5 2578.5 " fill="none"></path>
-					<path d="M13587.9 1742.8 L13582.8 1741.3 L13577.6 1739.9 L13586.4 1728.5 Z"></path>
-					<path d="M18497.3 2705.2 L18497.25 3314 L14989.5 3491.5172308527235 L14989.5 3491.5 " fill="none"></path>
+					<path d="M30779.7 2695.3 L29696.5 3314 L17342 3497.8584623364186 L17342.0 3497.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18502.6 2695.8 L18497.3 2705.2 L18491.9 2695.8 L18497.3 2686.5 Z"></path>
+						<path d="M30790.5 2695.3 L30779.7 2695.3 L30785.2 2686.0 L30796.0 2686.0 Z"></path>
 					</g>
-					<path d="M13717.8 1703.5 L18497.25 1936 L18497.25 2563.5 L18497.3 2563.5 " fill="none"></path>
-					<path d="M13718.1 1698.1 L13717.8 1703.5 L13717.6 1708.8 L13704.5 1702.8 Z"></path>
-					<path d="M29832.4 2689.7 L28418 3314 L21936.75 3499.4840411247937 L21936.8 3499.5 " fill="none"></path>
+					<path d="M30919.4 2704.3 L31047.75 3314 L13558.5 3499.9418316302535 L13558.5 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29843.1 2690.8 L29832.4 2689.7 L29838.8 2681.0 L29849.5 2682.2 Z"></path>
+						<path d="M30922.7 2694.0 L30919.4 2704.3 L30912.3 2696.2 L30915.6 2686.0 Z"></path>
 					</g>
-					<path d="M29855.8 2695.2 L28770.75 3314 L14989.5 3498.1284588519748 L14989.5 3498.1 " fill="none"></path>
+					<path d="M31232.8 2697.2 L31232.75 3314 L59651 3500.129944073258 L59651.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29866.6 2695.3 L29855.8 2695.2 L29861.3 2686.0 L29872.0 2686.0 Z"></path>
+						<path d="M31238.1 2687.8 L31232.8 2697.2 L31227.4 2687.8 L31232.8 2678.5 Z"></path>
 					</g>
-					<path d="M29995.7 2704.3 L30124 3314 L13203.75 3499.923119411999 L13203.8 3499.9 " fill="none"></path>
+					<path d="M31649.8 2703.9 L31472.75 3314 L32308.953753351205 3485 L32309.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29999.0 2694.0 L29995.7 2704.3 L29988.5 2696.2 L29991.8 2686.0 Z"></path>
+						<path d="M31657.6 2696.5 L31649.8 2703.9 L31647.3 2693.5 L31655.0 2686.0 Z"></path>
 					</g>
-					<path d="M30309.0 2697.2 L30309 3314 L59231.75 3500.1363863799097 L59231.8 3500.1 " fill="none"></path>
+					<path d="M31719.6 2701.9 L32092 3314 L59651 3500.1184298672847 L59651.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30314.3 2687.8 L30309.0 2697.2 L30303.7 2687.8 L30309.0 2678.5 Z"></path>
+						<path d="M31719.3 2691.2 L31719.6 2701.9 L31710.2 2696.7 L31709.9 2686.0 Z"></path>
 					</g>
-					<path d="M30726.1 2703.9 L30549 3314 L31619.239946380698 3485 L31619.2 3485.0 " fill="none"></path>
+					<path d="M43352.9 2882.7 L42614.5 3314 L42614.5 3500.5 L42614.5 3500.5 L42614.5 3687 L42614.5 3687 L42614.5 3843.5 L42614.5 3843.5 L42614.5 4000 L42614.5 4000 L72021.75 4133.331241171047 L72021.8 4133.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30733.8 2696.5 L30726.1 2703.9 L30723.6 2693.5 L30731.3 2686.0 Z"></path>
+						<path d="M43363.6 2882.6 L43352.9 2882.7 L43358.3 2873.4 L43369.0 2873.3 Z"></path>
 					</g>
-					<path d="M30765.4 2704.3 L30891.75 3314 L59231.75 3500.128924339267 L59231.8 3500.1 " fill="none"></path>
+					<path d="M43353.8 2891.2 L42654.5 3314 L61624 3498.5782725517815 L61624.0 3498.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30768.8 2694.1 L30765.4 2704.3 L30758.3 2696.2 L30761.6 2686.0 Z"></path>
+						<path d="M43364.6 2890.9 L43353.8 2891.2 L43359.0 2881.8 L43369.8 2881.5 Z"></path>
 					</g>
-					<path d="M43287.0 2899.1 L43141.25 3314 L43141.25 3500.5 L43141.25 3500.5 L43141.25 3687 L43141.25 3687 L43141.25 3843.5 L43141.25 3843.5 L43141.25 4000 L43141.25 4000 L71281.25 4133.301281484754 L71281.3 4133.3 " fill="none"></path>
+					<path d="M43368.9 2891.4 L42694.5 3314 L63549.25 3500.0895362606607 L63549.3 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43295.1 2892.1 L43287.0 2899.1 L43285.0 2888.5 L43293.2 2881.5 Z"></path>
+						<path d="M43379.6 2891.0 L43368.9 2891.4 L43373.9 2881.9 L43384.7 2881.5 Z"></path>
 					</g>
-					<path d="M43347.5 2900.0 L43293.75 3314 L60588 3498.3942215615934 L60588.0 3498.4 " fill="none"></path>
+					<path d="M43499.3 2894.1 L43039.5 3314 L59651 3499.867815574754 L59651.0 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43354.0 2891.4 L43347.5 2900.0 L43343.4 2890.1 L43349.9 2881.5 Z"></path>
+						<path d="M43509.8 2891.7 L43499.3 2894.1 L43502.6 2883.9 L43513.1 2881.5 Z"></path>
 					</g>
-					<path d="M43363.5 2900.1 L43333.75 3314 L63069 3500.0663064770933 L63069.0 3500.1 " fill="none"></path>
+					<path d="M43514.6 2894.5 L43079.5 3314 L62924.25 3500.007909384463 L62924.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43369.5 2891.2 L43363.5 2900.1 L43358.8 2890.4 L43364.8 2881.5 Z"></path>
+						<path d="M43525.0 2891.8 L43514.6 2894.5 L43517.6 2884.1 L43528.0 2881.5 Z"></path>
 					</g>
-					<path d="M43452.0 2899.6 L43555.75 3314 L59231.75 3499.8302240584776 L59231.8 3499.8 " fill="none"></path>
+					<path d="M43878.6 2899.3 L44006.5 3314 L17342 3499.2667182028163 L17342.0 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43454.9 2889.3 L43452.0 2899.6 L43444.6 2891.8 L43447.5 2881.5 Z"></path>
-					</g>
-					<path d="M43467.9 2899.3 L43595.75 3314 L62924 3499.994795093069 L62924.0 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43470.2 2888.8 L43467.9 2899.3 L43460.0 2892.0 L43462.4 2881.5 Z"></path>
-					</g>
-					<path d="M43483.7 2899.0 L43635.75 3314 L14989.5 3499.3515113404746 L14989.5 3499.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43485.5 2888.4 L43483.7 2899.0 L43475.5 2892.1 L43477.3 2881.5 Z"></path>
+						<path d="M43881.0 2888.8 L43878.6 2899.3 L43870.8 2892.0 L43873.1 2881.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M45929.7 142.8 L43383.25 293 L43383.25 629.5 L43383.25 629.5 L43383.25 966 L43383.25 966 L43383.25 1212.5 L43383.25 1212.5 L43383.25 1459 L43383.25 1459 L43383.25 1697.5 L43383.25 1697.5 L43383.25 1936 L43383.25 1936 L43383.25 2368.5 L43383.3 2368.5 " fill="none"></path>
+						<path d="M45857.0 144.2 L43794 293 L43794 629.5 L43794 629.5 L43794 966 L43794 966 L43794 1212.5 L43794 1212.5 L43794 1459 L43794 1459 L43794 1697.5 L43794 1697.5 L43794 1936 L43794 1936 L43794 2368.5 L43794.0 2368.5 " fill="none"></path>
 					</g>
-					<path d="M45930.0 148.1 L45929.7 142.8 L45929.4 137.5 L45943.0 142.0 Z"></path>
-					<path d="M15006.8 3422.1 L15019.5 3417 L15027 3417 L15027 3417 L15034.5 3500.5 L15034.5 3500.5 L15027 3584 L15027 3584 L15019.5 3584 L15019.5 3584 L14989.5 3571.9277108433735 L14989.5 3571.9 " fill="none"></path>
+					<path d="M45857.3 149.5 L45857.0 144.2 L45856.6 138.9 L45870.3 143.2 Z"></path>
+					<path d="M17359.8 3440.6 L17436.66666666667 3417 L17460.33333333333 3417 L17460.33333333333 3417 L17484 3500.5 L17484 3500.5 L17460.33333333333 3584 L17460.33333333333 3584 L17436.66666666667 3584 L17436.66666666667 3584 L17342 3554.9565217391296 L17342.0 3555.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14996.2 3420.6 L15006.8 3422.1 L15000.1 3430.5 L14989.5 3429.1 Z"></path>
+						<path d="M17349.4 3438.2 L17359.8 3440.6 L17352.5 3448.4 L17342.0 3446.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3114.1 2653.2 L3321.5 3314 L14634.5 3497.6190331143116 L14634.5 3497.6 " fill="none"></path>
+						<path d="M3538.1 2653.2 L3745.5 3314 L16987 3498.0330687830688 L16987.0 3498.0 " fill="none"></path>
 					</g>
-					<path d="M3119.2 2651.6 L3114.1 2653.2 L3109.0 2654.8 L3110.1 2640.5 Z"></path>
-					<path d="M1236.8 3450.9 L1249 3447 L1256.5 3447 L1256.5 3447 L1264 3500.5 L1264 3500.5 L1256.5 3554 L1256.5 3554 L1249 3554 L1249 3554 L1219 3544.5309734513276 L1219.0 3544.5 " fill="none"></path>
+					<path d="M3543.2 2651.6 L3538.1 2653.2 L3533.0 2654.8 L3534.1 2640.5 Z"></path>
+					<path d="M1660.8 3450.9 L1673 3447 L1680.5 3447 L1680.5 3447 L1688 3500.5 L1688 3500.5 L1680.5 3554 L1680.5 3554 L1673 3554 L1673 3554 L1643 3544.5309734513276 L1643.0 3544.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1226.3 3448.6 L1236.8 3450.9 L1229.5 3458.7 L1219.0 3456.5 Z"></path>
+						<path d="M1650.3 3448.6 L1660.8 3450.9 L1653.5 3458.7 L1643.0 3456.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3115.7 2653.0 L3361.5 3314 L1219 3489.0991454864156 L1219.0 3489.1 " fill="none"></path>
+						<path d="M3539.7 2653.0 L3785.5 3314 L1643 3489.0991454864156 L1643.0 3489.1 " fill="none"></path>
 					</g>
-					<path d="M3120.7 2651.1 L3115.7 2653.0 L3110.7 2654.9 L3111.0 2640.5 Z"></path>
-					<path d="M32527.5 2722.3 L30931.75 3314 L26128.5 3497.8588177946535 L26128.5 3497.9 " fill="none"></path>
+					<path d="M3544.7 2651.1 L3539.7 2653.0 L3534.7 2654.9 L3535.0 2640.5 Z"></path>
+					<path d="M32422.0 2837.4 L32132 3314 L24338.25 3498.8633588757116 L24338.3 3498.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32538.1 2724.1 L32527.5 2722.3 L32534.4 2714.1 L32545.0 2715.8 Z"></path>
+						<path d="M32431.4 2832.2 L32422.0 2837.4 L32422.3 2826.7 L32431.7 2821.5 Z"></path>
 					</g>
-					<path d="M32527.7 2732.0 L31101.25 3314 L27585.75 3496.7570034843206 L27585.8 3496.8 " fill="none"></path>
+					<path d="M32619.7 2839.3 L32771.5 3314 L25580.25 3498.651240835714 L25580.3 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32538.4 2733.4 L32527.7 2732.0 L32534.3 2723.5 L32545.0 2725.0 Z"></path>
+						<path d="M32622.0 2828.8 L32619.7 2839.3 L32611.8 2832.0 L32614.1 2821.5 Z"></path>
 					</g>
-					<path d="M32603.4 2835.5 L32179 3314 L32179 3485 L32179.0 3485.0 " fill="none"></path>
+					<path d="M32662.8 2838.0 L32912 3314 L32912 3485 L32912.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32613.5 2832.0 L32603.4 2835.5 L32605.6 2824.9 L32615.7 2821.5 Z"></path>
+						<path d="M32663.2 2827.3 L32662.8 2838.0 L32653.7 2832.2 L32654.1 2821.5 Z"></path>
 					</g>
-					<path d="M32670.9 2837.8 L32404.5 3314 L32404.5 3500.5 L32404.5 3500.5 L32404.5 3687 L32404.5 3687 L32404.5 3843.5 L32404.5 3843.5 L32404.5 4000 L32404.5 4000 L18421.25 4133.313566105192 L18421.3 4133.3 " fill="none"></path>
+					<path d="M32730.5 2835.7 L33137.5 3314 L33137.5 3500.5 L33137.5 3500.5 L33137.5 3687 L33137.5 3687 L33137.5 3843.5 L33137.5 3843.5 L33137.5 4000 L33137.5 4000 L18216.75 4133.356488969669 L18216.8 4133.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32680.2 2832.2 L32670.9 2837.8 L32670.8 2827.0 L32680.1 2821.5 Z"></path>
+						<path d="M32728.6 2825.2 L32730.5 2835.7 L32720.4 2832.1 L32718.4 2821.5 Z"></path>
 					</g>
-					<path d="M32707.1 2838.9 L32523 3314 L32523 3485 L32523.0 3485.0 " fill="none"></path>
+					<path d="M32765.6 2834.5 L33256 3314 L33256 3485 L33256.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32715.5 2832.1 L32707.1 2838.9 L32705.5 2828.3 L32713.9 2821.5 Z"></path>
+						<path d="M32762.6 2824.2 L32765.6 2834.5 L32755.2 2831.8 L32752.2 2821.5 Z"></path>
 					</g>
-					<path d="M32719.4 2839.2 L32563 3314 L28048.75 3498.720009873293 L28048.8 3498.7 " fill="none"></path>
+					<path d="M32806.1 2833.3 L33394 3314 L26043.25 3499.4028299016127 L26043.3 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32727.4 2832.0 L32719.4 2839.2 L32717.3 2828.7 L32725.3 2821.5 Z"></path>
+						<path d="M32802.2 2823.3 L32806.1 2833.3 L32795.4 2831.5 L32791.6 2821.5 Z"></path>
 					</g>
-					<path d="M32932.2 2837.0 L33252 3314 L33252 3485 L33252.0 3485.0 " fill="none"></path>
+					<path d="M32811.5 2807.8 L33532 3314 L33532 3485 L33532.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32931.4 2826.3 L32932.2 2837.0 L32922.5 2832.2 L32921.8 2821.5 Z"></path>
+						<path d="M32807.0 2798.1 L32811.5 2807.8 L32800.8 2806.8 L32796.3 2797.1 Z"></path>
 					</g>
-					<path d="M32944.2 2836.6 L33292 3314 L21936.75 3499.9187608366437 L21936.8 3499.9 " fill="none"></path>
+					<path d="M32813.6 2729.2 L34285.75 3314 L21260 3499.9930998181644 L21260.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32943.0 2825.9 L32944.2 2836.6 L32934.4 2832.2 L32933.2 2821.5 Z"></path>
+						<path d="M32806.9 2720.8 L32813.6 2729.2 L32803.0 2730.7 L32796.3 2722.3 Z"></path>
 					</g>
-					<path d="M32956.1 2836.2 L33332 3314 L13203.75 3500.0148222935222 L13203.8 3500.0 " fill="none"></path>
+					<path d="M32813.7 2725.2 L34355 3314 L13558.5 3500.030373159384 L13558.5 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32954.5 2825.5 L32956.1 2836.2 L32946.2 2832.1 L32944.6 2821.5 Z"></path>
+						<path d="M32806.9 2716.9 L32813.7 2725.2 L32803.1 2726.9 L32796.3 2718.6 Z"></path>
 					</g>
-					<path d="M66787.2 645.5 L57789.25 966 L57789.25 1212.5 L57789.25 1212.5 L57789.25 1459 L57789.25 1459 L57789.25 1666.5 L57789.3 1666.5 " fill="none"></path>
-					<path d="M66787.4 650.8 L66787.2 645.5 L66787.0 640.2 L66800.5 645.0 Z"></path>
+					<path d="M68237.4 641.7 L56327.75 966 L56327.75 1212.5 L56327.75 1212.5 L56327.75 1459 L56327.75 1459 L56327.75 1666.5 L56327.8 1666.5 " fill="none"></path>
+					<path d="M68237.6 647.1 L68237.4 641.7 L68237.3 636.4 L68250.8 641.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M73904.2 140.2 L71424.5 293 L71424.5 614 L71424.5 614.0 " fill="none"></path>
+						<path d="M74699.9 140.6 L72472.5 293 L72472.5 614 L72472.5 614.0 " fill="none"></path>
 					</g>
-					<path d="M73904.5 145.5 L73904.2 140.2 L73903.9 134.9 L73917.5 139.4 Z"></path>
-					<path d="M64515.3 3998.7 L64515.25 4000 L60846 4132.234115511329 L60846.0 4132.2 " fill="none"></path>
+					<path d="M74700.3 145.9 L74699.9 140.6 L74699.6 135.3 L74713.3 139.7 Z"></path>
+					<path d="M65379.3 3998.7 L65379.25 4000 L63107.25 4131.171046962516 L63107.3 4131.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64520.6 3989.3 L64515.3 3998.7 L64509.9 3989.3 L64515.3 3980.0 Z"></path>
+						<path d="M65384.6 3989.3 L65379.3 3998.7 L65373.9 3989.3 L65379.3 3980.0 Z"></path>
 					</g>
-					<path d="M59063.3 3879.2 L58301.75 4000 L58575.924440298506 4072.5 L58575.9 4072.5 " fill="none"></path>
+					<path d="M59482.4 3858.4 L57348.5 4000 L59213.25 4117.161645762513 L59213.3 4117.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59073.4 3883.0 L59063.3 3879.2 L59071.7 3872.5 L59081.8 3876.3 Z"></path>
+						<path d="M59492.0 3863.1 L59482.4 3858.4 L59491.3 3852.5 L59501.0 3857.2 Z"></path>
 					</g>
-					<path d="M59288.3 3946.2 L59288.25 4000 L59271.44776119403 4118.5 L59271.4 4118.5 " fill="none"></path>
+					<path d="M59707.5 3946.2 L59707.5 4000 L59852.308768656716 4118.5 L59852.3 4118.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59293.6 3936.8 L59288.3 3946.2 L59282.9 3936.8 L59288.3 3927.5 Z"></path>
+						<path d="M59712.8 3936.8 L59707.5 3946.2 L59702.2 3936.8 L59707.5 3927.5 Z"></path>
 					</g>
-					<path d="M59399.4 3939.7 L59469 4000 L60081.17630597015 4118.5 L60081.2 4118.5 " fill="none"></path>
+					<path d="M59840.9 3938.3 L59927.75 4000 L61217.75 4122.1193924408335 L61217.8 4122.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59395.8 3929.6 L59399.4 3939.7 L59388.8 3937.6 L59385.3 3927.5 Z"></path>
+						<path d="M59836.4 3928.6 L59840.9 3938.3 L59830.2 3937.3 L59825.7 3927.5 Z"></path>
 					</g>
-					<path d="M59288.3 3529.3 L59288.25 3687 L59288.25 3759.5 L59288.3 3759.5 " fill="none"></path>
-					<path d="M59293.6 3529.3 L59288.3 3529.3 L59282.9 3529.3 L59288.3 3516.0 Z"></path>
-					<path d="M33615.8 2712.7 L33615.75 3314 L26128.5 3498.796972704715 L26128.5 3498.8 " fill="none"></path>
+					<path d="M59707.5 3529.3 L59707.5 3687 L59707.5 3759.5 L59707.5 3759.5 " fill="none"></path>
+					<path d="M59712.8 3529.3 L59707.5 3529.3 L59702.2 3529.3 L59707.5 3516.0 Z"></path>
+					<path d="M34638.8 2712.7 L34638.75 3314 L24338.25 3499.259004773615 L24338.3 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33621.1 2703.3 L33615.8 2712.7 L33610.4 2703.3 L33615.8 2694.0 Z"></path>
+						<path d="M34644.1 2703.3 L34638.8 2712.7 L34633.4 2703.3 L34638.8 2694.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M73904.4 147.0 L73070.5 293 L73070.5 614 L73070.5 614.0 " fill="none"></path>
+						<path d="M74706.3 156.7 L74341.25 293 L74341.25 614 L74341.3 614.0 " fill="none"></path>
 					</g>
-					<path d="M73905.3 152.3 L73904.4 147.0 L73903.4 141.8 L73917.5 144.7 Z"></path>
+					<path d="M74708.1 161.7 L74706.3 156.7 L74704.4 151.7 L74718.8 152.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M73904.5 150.5 L73296 293 L73296 598.5 L73296.0 598.5 " fill="none"></path>
+						<path d="M74730.7 160.4 L74566.75 293 L74566.75 598.5 L74566.8 598.5 " fill="none"></path>
 					</g>
-					<path d="M73905.7 155.7 L73904.5 150.5 L73903.3 145.3 L73917.5 147.5 Z"></path>
-					<path d="M45924.4 144.5 L43848.25 293 L43848.25 629.5 L43848.25 629.5 L43848.25 966 L43848.25 966 L43848.25 1212.5 L43848.25 1212.5 L43848.25 1459 L43848.25 1459 L43848.25 1697.5 L43848.25 1697.5 L43848.25 1936 L43848.25 1936 L43848.25 2625 L43848.25 2625 L43848.25 3314 L43848.25 3314 L62924 3499.988126200776 L62924.0 3500.0 " fill="none"></path>
+					<path d="M74734.1 164.5 L74730.7 160.4 L74727.4 156.2 L74741.1 152.0 Z"></path>
+					<path d="M45851.7 146.8 L44259 293 L44259 629.5 L44259 629.5 L44259 966 L44259 966 L44259 1212.5 L44259 1212.5 L44259 1459 L44259 1459 L44259 1697.5 L44259 1697.5 L44259 1936 L44259 1936 L44259 2625 L44259 2625 L44259 3314 L44259 3314 L62924.25 3499.9769002684616 L62924.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45934.1 149.2 L45924.4 144.5 L45933.3 138.5 L45943.0 143.2 Z"></path>
+						<path d="M45861.4 151.2 L45851.7 146.8 L45860.5 140.6 L45870.3 145.1 Z"></path>
 					</g>
-					<path d="M22958.1 1719.7 L23329 1936 L23329 2571.5 L23329.0 2571.5 " fill="none"></path>
-					<path d="M22960.8 1715.1 L22958.1 1719.7 L22955.4 1724.3 L22946.6 1713.0 Z"></path>
-					<path d="M66781.8 647.0 L58518.75 966 L58518.75 1212.5 L58518.75 1212.5 L58518.75 1459 L58518.75 1459 L58518.75 1697.5 L58518.75 1697.5 L58518.75 1936 L58518.75 1936 L58518.75 2625 L58518.75 2625 L58518.75 3314 L58518.75 3314 L27351.75 3499.660070908394 L27351.8 3499.7 " fill="none"></path>
+					<path d="M173.3 1698.7 L12232 1936 L12232 2571.5 L12232.0 2571.5 " fill="none"></path>
+					<path d="M173.4 1693.4 L173.3 1698.7 L173.2 1704.0 L160.0 1698.4 Z"></path>
+					<path d="M68232.1 644.6 L58538.75 966 L58538.75 1212.5 L58538.75 1212.5 L58538.75 1459 L58538.75 1459 L58538.75 1697.5 L58538.75 1697.5 L58538.75 1936 L58538.75 1936 L58538.75 2625 L58538.75 2625 L58538.75 3314 L58538.75 3314 L25346.25 3499.711108944455 L25346.3 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66791.4 652.0 L66781.8 647.0 L66791.0 641.4 L66800.5 646.3 Z"></path>
+						<path d="M68241.6 649.6 L68232.1 644.6 L68241.2 638.9 L68250.8 644.0 Z"></path>
 					</g>
-					<path d="M66782.0 681.5 L64297.25 966 L64297.25 1197 L64297.3 1197.0 " fill="none"></path>
+					<path d="M68232.1 646.7 L59802.75 966 L59802.75 1197 L59802.8 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66791.8 685.8 L66782.0 681.5 L66790.6 675.2 L66800.5 679.4 Z"></path>
+						<path d="M68241.6 651.7 L68232.1 646.7 L68241.2 641.0 L68250.8 646.0 Z"></path>
 					</g>
-					<path d="M66782.3 731.5 L65737.75 966 L65737.75 1174 L65737.8 1174.0 " fill="none"></path>
+					<path d="M68232.6 739.3 L67294.75 966 L67294.75 1174 L67294.8 1174.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66792.6 734.6 L66782.3 731.5 L66790.2 724.2 L66800.5 727.4 Z"></path>
+						<path d="M68242.9 742.3 L68232.6 739.3 L68240.4 731.9 L68250.8 734.9 Z"></path>
 					</g>
-					<path d="M67037.4 962.0 L67035 966 L67035 1212.5 L67035 1212.5 L67035 1459 L67035 1459 L67035 1697.5 L67035 1697.5 L67035 1936 L67035 1936 L67035 2625 L67035 2625 L67035 3314 L67035 3314 L67035 3500.5 L67035 3500.5 L67035 3687 L67035 3687 L67035 3843.5 L67035 3843.5 L67035 4000 L67035 4000 L59076.5 4129.634595514496 L59076.5 4129.6 " fill="none"></path>
+					<path d="M68233.2 791.1 L67742 966 L67742 1212.5 L67742 1212.5 L67742 1459 L67742 1459 L67742 1697.5 L67742 1697.5 L67742 1936 L67742 1936 L67742 2625 L67742 2625 L67742 3314 L67742 3314 L67742 3500.5 L67742 3500.5 L67742 3687 L67742 3687 L67742 3843.5 L67742 3843.5 L67742 4000 L67742 4000 L59749.25 4129.652694973217 L59749.3 4129.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67046.8 956.7 L67037.4 962.0 L67037.6 951.3 L67047.0 946.0 Z"></path>
+						<path d="M68243.7 792.9 L68233.2 791.1 L68240.2 782.9 L68250.8 784.8 Z"></path>
 					</g>
-					<path d="M67689.4 841.9 L67954 966 L67954 1212.5 L67954 1212.5 L67954 1459 L67954 1459 L67954 1697.5 L67954 1697.5 L67954 1936 L67954 1936 L67954 2625 L67954 2625 L67954 3314 L67954 3314 L67954 3500.5 L67954 3500.5 L67954 3687 L67954 3687 L67954 3843.5 L67954 3843.5 L67954 4000 L67954 4000 L67954 4134 L67954 4134 L67954 4268 L67954 4268 L64054.25 4450.2244597557155 L64054.3 4450.2 " fill="none"></path>
+					<path d="M68661.1 964.6 L68661 966 L68661 1212.5 L68661 1212.5 L68661 1459 L68661 1459 L68661 1697.5 L68661 1697.5 L68661 1936 L68661 1936 L68661 2625 L68661 2625 L68661 3314 L68661 3314 L68661 3500.5 L68661 3500.5 L68661 3687 L68661 3687 L68661 3843.5 L68661 3843.5 L68661 4000 L68661 4000 L68661 4134 L68661 4134 L68661 4268 L68661 4268 L65990.25 4448.322155851209 L65990.3 4448.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67683.2 833.1 L67689.4 841.9 L67678.7 842.8 L67672.5 834.0 Z"></path>
+						<path d="M68667.1 955.7 L68661.1 964.6 L68656.5 954.9 L68662.5 946.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M46143.3 137.3 L67236.5 293 L67236.5 313 L67236.5 313.0 " fill="none"></path>
+						<path d="M46070.6 137.2 L68686.75 293 L68686.75 313 L68686.8 313.0 " fill="none"></path>
 					</g>
-					<path d="M46143.4 132.0 L46143.3 137.3 L46143.3 142.6 L46130.0 137.2 Z"></path>
-					<path d="M27369.3 3443.9 L27381.75 3439.5 L27389.25 3439.5 L27389.25 3439.5 L27396.75 3500.5 L27396.75 3500.5 L27389.25 3561.5 L27389.25 3561.5 L27381.75 3561.5 L27381.75 3561.5 L27351.75 3550.7982456140353 L27351.8 3550.8 " fill="none"></path>
+					<path d="M46070.6 131.9 L46070.6 137.2 L46070.5 142.6 L46057.3 137.1 Z"></path>
+					<path d="M25363.8 3443.9 L25376.25 3439.5 L25383.75 3439.5 L25383.75 3439.5 L25391.25 3500.5 L25391.25 3500.5 L25383.75 3561.5 L25383.75 3561.5 L25376.25 3561.5 L25376.25 3561.5 L25346.25 3550.7982456140353 L25346.3 3550.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27358.7 3442.0 L27369.3 3443.9 L27362.3 3452.1 L27351.8 3450.2 Z"></path>
+						<path d="M25353.2 3442.0 L25363.8 3443.9 L25356.8 3452.1 L25346.3 3450.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3117.2 2652.7 L3401.5 3314 L27069.75 3499.3955342986446 L27069.8 3499.4 " fill="none"></path>
+						<path d="M3541.2 2652.7 L3825.5 3314 L25064.25 3499.27002771314 L25064.3 3499.3 " fill="none"></path>
 					</g>
-					<path d="M3122.1 2650.6 L3117.2 2652.7 L3112.3 2654.9 L3111.9 2640.5 Z"></path>
-					<path d="M74284.7 1283.9 L73442 1459 L80804 1693.2834078324104 L80804.0 1693.3 " fill="none"></path>
+					<path d="M3546.1 2650.6 L3541.2 2652.7 L3536.3 2654.9 L3535.9 2640.5 Z"></path>
+					<path d="M75222.4 1295.6 L74546.25 1459 L81706.25 1693.1666095303394 L81706.3 1693.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M74294.9 1287.2 L74284.7 1283.9 L74292.8 1276.8 L74303.0 1280.1 Z"></path>
+						<path d="M75232.7 1298.6 L75222.4 1295.6 L75230.2 1288.2 L75240.5 1291.2 Z"></path>
 					</g>
-					<path d="M74972.6 1244.0 L77318 1459 L77318 1697.5 L77318 1697.5 L77318 1936 L77318 1936 L77318 2625 L77318 2625 L77318 3314 L77318 3314 L71784.5 3497.678517397882 L71784.5 3497.7 " fill="none"></path>
+					<path d="M75910.1 1241.6 L78485 1459 L78485 1697.5 L78485 1697.5 L78485 1936 L78485 1936 L78485 2625 L78485 2625 L78485 3314 L78485 3314 L72204 3498.009817781967 L72204.0 3498.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M74963.8 1237.9 L74972.6 1244.0 L74962.8 1248.5 L74954.0 1242.3 Z"></path>
+						<path d="M75901.2 1235.5 L75910.1 1241.6 L75900.4 1246.1 L75891.5 1240.0 Z"></path>
 					</g>
-					<path d="M71892.3 725.5 L71227.75 966 L74303 1188.9064544585754 L74303.0 1188.9 " fill="none"></path>
-					<path d="M71894.1 730.6 L71892.3 725.5 L71890.5 720.5 L71904.9 721.0 Z"></path>
+					<path d="M72890.9 725.4 L72207.75 966 L75240.5 1188.607868681605 L75240.5 1188.6 " fill="none"></path>
+					<path d="M72892.6 730.5 L72890.9 725.4 L72889.1 720.4 L72903.4 721.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M82528.9 172.3 L82216.75 293 L82216.75 629.5 L82216.75 629.5 L82216.75 966 L82216.75 966 L74954 1201.9263170032616 L74954.0 1201.9 " fill="none"></path>
+						<path d="M83466.4 172.3 L83154.25 293 L83154.25 629.5 L83154.25 629.5 L83154.25 966 L83154.25 966 L75891.5 1201.9263170032616 L75891.5 1201.9 " fill="none"></path>
 					</g>
-					<path d="M82530.8 177.3 L82528.9 172.3 L82527.0 167.3 L82541.3 167.5 Z"></path>
-					<path d="M34466.9 1703.1 L30475.75 1936 L29503.361211901305 2571.5 L29503.4 2571.5 " fill="none"></path>
-					<path d="M34467.3 1708.4 L34466.9 1703.1 L34466.6 1697.7 L34480.3 1702.3 Z"></path>
-					<path d="M80070.8 702.2 L80070.75 966 L72549 1202.034674262436 L72549.0 1202.0 " fill="none"></path>
+					<path d="M83468.3 177.3 L83466.4 172.3 L83464.5 167.3 L83478.8 167.5 Z"></path>
+					<path d="M34013.0 1708.9 L32109.25 1936 L32109.25 2571.5 L32109.3 2571.5 " fill="none"></path>
+					<path d="M34013.6 1714.2 L34013.0 1708.9 L34012.4 1703.6 L34026.3 1707.3 Z"></path>
+					<path d="M80988.3 702.2 L80988.25 966 L73446.5 1202.0612520237453 L73446.5 1202.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M80076.1 692.8 L80070.8 702.2 L80065.4 692.8 L80070.8 683.5 Z"></path>
+						<path d="M80993.6 692.8 L80988.3 702.2 L80982.9 692.8 L80988.3 683.5 Z"></path>
 					</g>
-					<path d="M80996.6 153.0 L80070.75 293 L80070.75 575.5 L80070.8 575.5 " fill="none"></path>
-					<path d="M80997.4 158.3 L80996.6 153.0 L80995.8 147.7 L81009.8 151.0 Z"></path>
-					<path d="M77319.1 205.5 L76936.75 293 L76936.75 614 L76936.8 614.0 " fill="none"></path>
+					<path d="M81934.1 152.7 L80988.25 293 L80988.25 575.5 L80988.3 575.5 " fill="none"></path>
+					<path d="M81934.8 158.0 L81934.1 152.7 L81933.3 147.4 L81947.3 150.7 Z"></path>
+					<path d="M78256.6 205.5 L77874.25 293 L77874.25 614 L77874.3 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M77329.3 208.6 L77319.1 205.5 L77327.0 198.2 L77337.3 201.3 Z"></path>
+						<path d="M78266.8 208.6 L78256.6 205.5 L78264.5 198.2 L78274.8 201.3 Z"></path>
 					</g>
-					<path d="M77414.9 236.1 L77297.75 293 L77297.75 614 L77297.8 614.0 " fill="none"></path>
+					<path d="M78352.4 236.1 L78235.25 293 L78235.25 614 L78235.3 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M77425.6 236.9 L77414.9 236.1 L77421.0 227.3 L77431.7 228.0 Z"></path>
+						<path d="M78363.1 236.9 L78352.4 236.1 L78358.5 227.3 L78369.2 228.0 Z"></path>
 					</g>
-					<path d="M77657.2 245.7 L77673.25 293 L77673.25 614 L77673.3 614.0 " fill="none"></path>
+					<path d="M78594.7 245.7 L78610.75 293 L78610.75 614 L78610.8 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M77659.3 235.1 L77657.2 245.7 L77649.2 238.6 L77651.2 228.0 Z"></path>
+						<path d="M78596.8 235.1 L78594.7 245.7 L78586.7 238.6 L78588.7 228.0 Z"></path>
 					</g>
-					<path d="M77825.6 236.1 L77942.75 293 L77942.75 614 L77942.8 614.0 " fill="none"></path>
+					<path d="M78763.1 236.1 L78880.25 293 L78880.25 614 L78880.3 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M77819.5 227.3 L77825.6 236.1 L77814.9 236.9 L77808.8 228.0 Z"></path>
+						<path d="M78757.0 227.3 L78763.1 236.1 L78752.4 236.9 L78746.3 228.0 Z"></path>
 					</g>
-					<path d="M72061.0 1416.4 L72028.75 1459 L72028.75 1697.5 L72028.75 1697.5 L72028.75 1936 L72028.75 1936 L72028.75 2625 L72028.75 2625 L72028.75 3314 L72028.75 3314 L63699.5 3499.8195669726965 L63699.5 3499.8 " fill="none"></path>
+					<path d="M72958.5 1416.4 L72926.25 1459 L72926.25 1697.5 L72926.25 1697.5 L72926.25 1936 L72926.25 1936 L72926.25 2625 L72926.25 2625 L72926.25 3314 L72926.25 3314 L64520 3499.825777106113 L64520.0 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72070.9 1412.2 L72061.0 1416.4 L72062.4 1405.7 L72072.3 1401.5 Z"></path>
+						<path d="M72968.4 1412.2 L72958.5 1416.4 L72959.9 1405.7 L72969.8 1401.5 Z"></path>
 					</g>
-					<path d="M72093.4 1417.5 L72068.75 1459 L80804 1693.936384652251 L80804.0 1693.9 " fill="none"></path>
+					<path d="M72990.9 1417.5 L72966.25 1459 L81706.25 1693.938292476754 L81706.3 1693.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72102.8 1412.2 L72093.4 1417.5 L72093.6 1406.8 L72103.0 1401.5 Z"></path>
+						<path d="M73000.3 1412.2 L72990.9 1417.5 L72991.1 1406.8 L73000.5 1401.5 Z"></path>
 					</g>
-					<path d="M72567.2 1295.9 L73255.25 1459 L73255.25 1697.5 L73255.25 1697.5 L73255.25 1936 L73255.25 1936 L73255.25 2625 L73255.25 2625 L73255.25 3314 L73255.25 3314 L59344.75 3499.745560965132 L59344.8 3499.7 " fill="none"></path>
+					<path d="M73129.8 1420.1 L73133 1459 L73133 1697.5 L73133 1697.5 L73133 1936 L73133 1936 L73133 2625 L73133 2625 L73133 3314 L73133 3314 L59764 3499.7151316524523 L59764.0 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72559.3 1288.5 L72567.2 1295.9 L72556.9 1298.9 L72549.0 1291.6 Z"></path>
+						<path d="M73134.4 1410.4 L73129.8 1420.1 L73123.8 1411.2 L73128.3 1401.5 Z"></path>
 					</g>
-					<path d="M72567.3 1285.6 L73402 1459 L73402 1697.5 L73402 1697.5 L73402 1936 L73402 1936 L73402 2625 L73402 2625 L73402 3314 L73402 3314 L63029 3499.560836410724 L63029.0 3499.6 " fill="none"></path>
+					<path d="M73251.3 1417.0 L73279.75 1459 L73279.75 1697.5 L73279.75 1697.5 L73279.75 1936 L73279.75 1936 L73279.75 2625 L73279.75 2625 L73279.75 3314 L73279.75 3314 L63029.25 3499.5496699990294 L63029.3 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72559.2 1278.5 L72567.3 1285.6 L72557.1 1288.9 L72549.0 1281.8 Z"></path>
+						<path d="M73250.5 1406.2 L73251.3 1417.0 L73241.7 1412.2 L73240.9 1401.5 Z"></path>
 					</g>
-					<path d="M67684.9 805.5 L68093.75 966 L71882 1192.5551343482744 L71882.0 1192.6 " fill="none"></path>
-					<path d="M67686.9 800.6 L67684.9 805.5 L67683.0 810.5 L67672.5 800.6 Z"></path>
-					<path d="M34466.9 1703.5 L30768.25 1936 L29761.433599419448 2594 L29761.4 2594.0 " fill="none"></path>
-					<path d="M34467.3 1708.8 L34466.9 1703.5 L34466.6 1698.2 L34480.3 1702.7 Z"></path>
-					<path d="M34467.0 1706.9 L32150.75 1936 L31167.331277213354 2594 L31167.3 2594.0 " fill="none"></path>
-					<path d="M34467.5 1712.2 L34467.0 1706.9 L34466.5 1701.6 L34480.3 1705.6 Z"></path>
-					<path d="M34657.4 1714.4 L35907.25 1936 L34095.60123367199 2594 L34095.6 2594.0 " fill="none"></path>
-					<path d="M34658.3 1709.1 L34657.4 1714.4 L34656.4 1719.6 L34644.3 1712.0 Z"></path>
-					<path d="M18676.3 3923.7 L18676.25 4000 L18387.074626865673 4118.5 L18387.1 4118.5 " fill="none"></path>
+					<path d="M68798.3 958.6 L68800.75 966 L72779.5 1193.4362281871413 L72779.5 1193.4 " fill="none"></path>
+					<path d="M68803.3 956.9 L68798.3 958.6 L68793.2 960.3 L68794.0 946.0 Z"></path>
+					<path d="M34203.1 1722.4 L35016.75 1936 L35016.75 2594 L35016.8 2594.0 " fill="none"></path>
+					<path d="M34204.5 1717.3 L34203.1 1722.4 L34201.8 1727.6 L34190.3 1719.0 Z"></path>
+					<path d="M34203.3 1717.9 L35220.25 1936 L35220.25 2594 L35220.3 2594.0 " fill="none"></path>
+					<path d="M34204.4 1712.7 L34203.3 1717.9 L34202.2 1723.1 L34190.3 1715.1 Z"></path>
+					<path d="M34203.4 1714.5 L35440.25 1936 L35440.25 2594 L35440.3 2594.0 " fill="none"></path>
+					<path d="M34204.3 1709.3 L34203.4 1714.5 L34202.4 1719.8 L34190.3 1712.2 Z"></path>
+					<path d="M18471.8 3923.7 L18471.75 4000 L18182.574626865673 4118.5 L18182.6 4118.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18681.6 3914.3 L18676.3 3923.7 L18670.9 3914.3 L18676.3 3905.0 Z"></path>
+						<path d="M18477.1 3914.3 L18471.8 3923.7 L18466.4 3914.3 L18471.8 3905.0 Z"></path>
 					</g>
-					<path d="M30145.4 1214.4 L18676.25 1459 L18676.25 1697.5 L18676.25 1697.5 L18676.25 1936 L18676.25 1936 L18676.25 2625 L18676.25 2625 L18676.25 3314 L18676.25 3314 L18676.25 3500.5 L18676.25 3500.5 L18676.25 3687 L18676.25 3687 L18676.25 3782 L18676.3 3782.0 " fill="none"></path>
-					<path d="M30145.5 1219.7 L30145.4 1214.4 L30145.3 1209.1 L30158.8 1214.1 Z"></path>
-					<path d="M35861.1 2681.9 L35753.5 3314 L37786.25 3495.4130278741477 L37786.3 3495.4 " fill="none"></path>
+					<path d="M30292.9 1214.3 L18471.75 1459 L18471.75 1697.5 L18471.75 1697.5 L18471.75 1936 L18471.75 1936 L18471.75 2625 L18471.75 2625 L18471.75 3314 L18471.75 3314 L18471.75 3500.5 L18471.75 3500.5 L18471.75 3687 L18471.75 3687 L18471.75 3782 L18471.8 3782.0 " fill="none"></path>
+					<path d="M30293.0 1219.7 L30292.9 1214.3 L30292.8 1209.0 L30306.3 1214.1 Z"></path>
+					<path d="M36132.5 2675.9 L35414.25 3314 L37084.5 3494.3454190186712 L37084.5 3494.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35867.9 2673.6 L35861.1 2681.9 L35857.4 2671.8 L35864.2 2663.5 Z"></path>
+						<path d="M36143.0 2673.7 L36132.5 2675.9 L36135.9 2665.7 L36146.4 2663.5 Z"></path>
 					</g>
-					<path d="M35864.4 2682.1 L35793.5 3314 L35855.16085790885 3485 L35855.2 3485.0 " fill="none"></path>
+					<path d="M36135.0 2676.3 L35454.25 3314 L34313.5 3491.8473354231974 L34313.5 3491.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35870.7 2673.4 L35864.4 2682.1 L35860.1 2672.2 L35866.4 2663.5 Z"></path>
+						<path d="M36145.5 2673.8 L36135.0 2676.3 L36138.2 2666.0 L36148.7 2663.5 Z"></path>
 					</g>
-					<path d="M36182.4 2719.0 L35965 3314 L37786.25 3494.840210302143 L37786.3 3494.8 " fill="none"></path>
+					<path d="M36471.9 2719.7 L36341.25 3314 L37084.5 3487.216026241799 L37084.5 3487.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36190.6 2712.1 L36182.4 2719.0 L36180.6 2708.4 L36188.8 2701.5 Z"></path>
+						<path d="M36479.1 2711.8 L36471.9 2719.7 L36468.7 2709.5 L36475.9 2701.5 Z"></path>
 					</g>
-					<path d="M36206.1 2720.1 L36139.5 3314 L35883.91689008043 3485 L35883.9 3485.0 " fill="none"></path>
+					<path d="M36477.4 2719.9 L36381.25 3314 L34313.5 3495.625044154009 L34313.5 3495.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36212.4 2711.4 L36206.1 2720.1 L36201.8 2710.2 L36208.2 2701.5 Z"></path>
+						<path d="M36484.1 2711.6 L36477.4 2719.9 L36473.6 2709.9 L36480.4 2701.5 Z"></path>
 					</g>
-					<path d="M36224.8 2720.1 L36275.25 3314 L26979.75 3497.6549340537103 L26979.8 3497.7 " fill="none"></path>
+					<path d="M36508.7 2719.9 L36608.5 3314 L24666.25 3498.277970834626 L24666.3 3498.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36229.3 2710.3 L36224.8 2720.1 L36218.7 2711.3 L36223.2 2701.5 Z"></path>
+						<path d="M36512.4 2709.8 L36508.7 2719.9 L36501.9 2711.6 L36505.6 2701.5 Z"></path>
 					</g>
-					<path d="M36524.3 2771.9 L36361 3314 L36108.25 3457.3851711026614 L36108.3 3457.4 " fill="none"></path>
+					<path d="M36812.2 2771.9 L36648.5 3314 L34505.5 3494.112438035151 L34505.5 3494.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36532.1 2764.5 L36524.3 2771.9 L36521.9 2761.4 L36529.7 2754.0 Z"></path>
+						<path d="M36820.0 2764.5 L36812.2 2771.9 L36809.8 2761.4 L36817.6 2754.0 Z"></path>
 					</g>
-					<path d="M36532.7 2772.1 L36401 3314 L21936.75 3500.043388679115 L21936.8 3500.0 " fill="none"></path>
+					<path d="M36820.6 2772.1 L36688.5 3314 L21260 3500.0718604500776 L21260.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36540.1 2764.3 L36532.7 2772.1 L36529.8 2761.8 L36537.1 2754.0 Z"></path>
+						<path d="M36828.0 2764.3 L36820.6 2772.1 L36817.7 2761.8 L36825.0 2754.0 Z"></path>
 					</g>
-					<path d="M36870.8 3618.2 L36870.75 3687 L36870.75 3828 L36870.8 3828.0 " fill="none"></path>
+					<path d="M35645.0 3618.2 L35645 3687 L35645 3828 L35645.0 3828.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36876.1 3608.8 L36870.8 3618.2 L36865.4 3608.8 L36870.8 3599.5 Z"></path>
+						<path d="M35650.3 3608.8 L35645.0 3618.2 L35639.7 3608.8 L35645.0 3599.5 Z"></path>
 					</g>
-					<path d="M36567.4 2767.3 L36563.25 3314 L36734.25 3417.712195121951 L36734.3 3417.7 " fill="none"></path>
-					<path d="M36572.7 2767.4 L36567.4 2767.3 L36562.1 2767.3 L36567.5 2754.0 Z"></path>
-					<path d="M36575.7 2767.3 L36603.25 3314 L37047.25 3467.48656163114 L37047.3 3467.5 " fill="none"></path>
-					<path d="M36581.0 2767.0 L36575.7 2767.3 L36570.4 2767.6 L36575.0 2754.0 Z"></path>
-					<path d="M71208.1 2756.0 L70953.75 3314 L60983 3496.8775723452904 L60983.0 3496.9 " fill="none"></path>
+					<path d="M36875.0 2767.2 L36946.25 3314 L35781.5 3480.936311239193 L35781.5 3480.9 " fill="none"></path>
+					<path d="M36880.3 2766.5 L36875.0 2767.2 L36869.7 2767.9 L36873.3 2754.0 Z"></path>
+					<path d="M36907.0 2766.6 L37102.25 3314 L36012.5 3485.473001476482 L36012.5 3485.5 " fill="none"></path>
+					<path d="M36912.0 2764.8 L36907.0 2766.6 L36902.0 2768.4 L36902.5 2754.0 Z"></path>
+					<path d="M72188.1 2756.0 L71933.75 3314 L62019 3496.8575119286015 L62019.0 3496.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71216.8 2749.7 L71208.1 2756.0 L71207.1 2745.3 L71215.8 2739.0 Z"></path>
+						<path d="M72196.8 2749.7 L72188.1 2756.0 L72187.1 2745.3 L72195.8 2739.0 Z"></path>
 					</g>
-					<path d="M71295.3 2757.3 L71411 3314 L71675.52278820376 3485 L71675.5 3485.0 " fill="none"></path>
+					<path d="M72275.3 2757.3 L72391 3314 L72141.60589812332 3485 L72141.6 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71298.6 2747.1 L71295.3 2757.3 L71288.1 2749.2 L71291.5 2739.0 Z"></path>
+						<path d="M72278.6 2747.1 L72275.3 2757.3 L72268.1 2749.2 L72271.5 2739.0 Z"></path>
 					</g>
-					<path d="M71903.3 725.7 L71267.75 966 L71267.75 1212.5 L71267.75 1212.5 L71267.75 1459 L71267.75 1459 L71267.75 1697.5 L71267.75 1697.5 L71267.75 1936 L71267.75 1936 L71267.75 2511 L71267.8 2511.0 " fill="none"></path>
-					<path d="M71905.2 730.7 L71903.3 725.7 L71901.4 720.7 L71915.7 721.0 Z"></path>
-					<path d="M30145.4 1215.3 L22388.5 1459 L34480.25 1695.8935106273746 L34480.3 1695.9 " fill="none"></path>
-					<path d="M30145.6 1220.6 L30145.4 1215.3 L30145.3 1210.0 L30158.8 1214.9 Z"></path>
+					<path d="M72901.8 725.6 L72247.75 966 L72247.75 1212.5 L72247.75 1212.5 L72247.75 1459 L72247.75 1459 L72247.75 1697.5 L72247.75 1697.5 L72247.75 1936 L72247.75 1936 L72247.75 2511 L72247.8 2511.0 " fill="none"></path>
+					<path d="M72903.6 730.6 L72901.8 725.6 L72900.0 720.6 L72914.3 721.0 Z"></path>
+					<path d="M30458.4 1231.2 L31388 1459 L34026.25 1690.3105872622002 L34026.3 1690.3 " fill="none"></path>
+					<path d="M30459.7 1226.0 L30458.4 1231.2 L30457.2 1236.4 L30445.5 1228.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M13167.5 1256.8 L13167.5 1459 L34480.25 1696.5858972411456 L34480.3 1696.6 " fill="none"></path>
+						<path d="M15132.8 1256.8 L15132.75 1459 L34026.25 1696.4693552212063 L34026.3 1696.5 " fill="none"></path>
 					</g>
-					<path d="M13172.8 1256.8 L13167.5 1256.8 L13162.2 1256.8 L13167.5 1243.5 Z"></path>
-					<path d="M37903.5 2712.6 L37843.25 3314 L37843.25 3485 L37843.3 3485.0 " fill="none"></path>
+					<path d="M15138.1 1256.8 L15132.8 1256.8 L15127.4 1256.8 L15132.8 1243.5 Z"></path>
+					<path d="M37890.0 2712.7 L37872.5 3314 L37198.5 3485.9575923392613 L37198.5 3486.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37909.7 2703.8 L37903.5 2712.6 L37899.1 2702.8 L37905.3 2694.0 Z"></path>
+						<path d="M37895.6 2703.5 L37890.0 2712.7 L37884.9 2703.2 L37890.5 2694.0 Z"></path>
 					</g>
-					<path d="M37915.0 2712.7 L37934.25 3314 L26979.75 3498.0802135423705 L26979.8 3498.1 " fill="none"></path>
+					<path d="M37910.2 2712.3 L38032 3314 L24666.25 3498.51210237051 L24666.3 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37920.1 2703.2 L37915.0 2712.7 L37909.4 2703.5 L37914.5 2694.0 Z"></path>
+						<path d="M37913.5 2702.1 L37910.2 2712.3 L37903.1 2704.2 L37906.5 2694.0 Z"></path>
 					</g>
-					<path d="M71988.5 730.6 L71594.25 966 L71594.25 1212.5 L71594.25 1212.5 L71594.25 1459 L71594.25 1459 L71594.25 1697.5 L71594.25 1697.5 L71594.25 1936 L71594.25 1936 L71594.25 2625 L71594.25 2625 L71594.25 3314 L71594.25 3314 L71478.9845844504 3462 L71479.0 3462.0 " fill="none"></path>
+					<path d="M72986.9 730.3 L72574.25 966 L72574.25 1212.5 L72574.25 1212.5 L72574.25 1459 L72574.25 1459 L72574.25 1697.5 L72574.25 1697.5 L72574.25 1936 L72574.25 1936 L72574.25 2625 L72574.25 2625 L72574.25 3314 L72574.25 3314 L71994 3467.3356358483884 L71994.0 3467.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71999.2 730.4 L71988.5 730.6 L71993.8 721.2 L72004.5 721.0 Z"></path>
+						<path d="M72997.6 730.3 L72986.9 730.3 L72992.3 721.0 L73003.1 721.0 Z"></path>
 					</g>
-					<path d="M71999.7 731.1 L71634.25 966 L71634.25 1212.5 L71634.25 1212.5 L71634.25 1459 L71634.25 1459 L71634.25 1697.5 L71634.25 1697.5 L71634.25 1936 L71634.25 1936 L71634.25 2625 L71634.25 2625 L71634.25 3314 L71634.25 3314 L63161 3499.4929864718138 L63161.0 3499.5 " fill="none"></path>
+					<path d="M72998.1 730.8 L72614.25 966 L72614.25 1212.5 L72614.25 1212.5 L72614.25 1459 L72614.25 1459 L72614.25 1697.5 L72614.25 1697.5 L72614.25 1936 L72614.25 1936 L72614.25 2625 L72614.25 2625 L72614.25 3314 L72614.25 3314 L63641.25 3499.5487858964407 L63641.3 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72010.4 730.5 L71999.7 731.1 L72004.7 721.6 L72015.4 721.0 Z"></path>
+						<path d="M73008.8 730.4 L72998.1 730.8 L73003.2 721.3 L73014.0 721.0 Z"></path>
 					</g>
-					<path d="M72035.2 733.0 L71759.5 966 L71759.5 1212.5 L71759.5 1212.5 L71759.5 1459 L71759.5 1459 L71759.5 1697.5 L71759.5 1697.5 L71759.5 1936 L71759.5 1936 L71759.5 2625 L71759.5 2625 L71759.5 3314 L71759.5 3314 L71704.48659517427 3485 L71704.5 3485.0 " fill="none"></path>
+					<path d="M73033.4 732.6 L72739.5 966 L72739.5 1212.5 L72739.5 1212.5 L72739.5 1459 L72739.5 1459 L72739.5 1697.5 L72739.5 1697.5 L72739.5 1936 L72739.5 1936 L72739.5 2625 L72739.5 2625 L72739.5 3314 L72739.5 3314 L72170.56970509383 3485 L72170.6 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72045.8 731.1 L72035.2 733.0 L72038.9 722.9 L72049.5 721.0 Z"></path>
+						<path d="M73044.0 731.0 L73033.4 732.6 L73037.4 722.6 L73048.0 721.0 Z"></path>
 					</g>
-					<path d="M60015.8 1277.2 L60015.75 1459 L60015.75 1666.5 L60015.8 1666.5 " fill="none"></path>
+					<path d="M61192.3 1277.2 L61192.25 1459 L61192.25 1666.5 L61192.3 1666.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60021.1 1267.8 L60015.8 1277.2 L60010.4 1267.8 L60015.8 1258.5 Z"></path>
+						<path d="M61197.6 1267.8 L61192.3 1277.2 L61186.9 1267.8 L61192.3 1258.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M35874.8 2676.8 L35925 3314 L36388.75 3461.781930798804 L36388.8 3461.8 " fill="none"></path>
+						<path d="M36198.1 2676.7 L36301.25 3314 L35319.5 3479.960910944935 L35319.5 3480.0 " fill="none"></path>
 					</g>
-					<path d="M35880.1 2676.4 L35874.8 2676.8 L35869.5 2677.2 L35873.8 2663.5 Z"></path>
+					<path d="M36203.4 2675.8 L36198.1 2676.7 L36192.8 2677.5 L36196.0 2663.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M37147.0 2706.8 L37147 3314 L36631.75 3464.9134275618376 L36631.8 3464.9 " fill="none"></path>
+						<path d="M37388.0 2706.8 L37388 3314 L35319.5 3490.153082191781 L35319.5 3490.2 " fill="none"></path>
 					</g>
-					<path d="M37152.3 2706.8 L37147.0 2706.8 L37141.7 2706.8 L37147.0 2693.5 Z"></path>
-					<path d="M62140.9 1267.9 L61500.75 1459 L61500.75 1644 L61500.8 1644.0 " fill="none"></path>
+					<path d="M37393.3 2706.8 L37388.0 2706.8 L37382.7 2706.8 L37388.0 2693.5 Z"></path>
+					<path d="M62561.1 1257.6 L61731 1459 L61731 1644 L61731.0 1644.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62151.3 1270.3 L62140.9 1267.9 L62148.3 1260.1 L62158.8 1262.5 Z"></path>
+						<path d="M62571.4 1260.5 L62561.1 1257.6 L62568.9 1250.2 L62579.3 1253.1 Z"></path>
 					</g>
-					<path d="M62249.1 1349.8 L62187.75 1459 L34644.25 1696.7920671119075 L34644.3 1696.8 " fill="none"></path>
+					<path d="M62561.5 1274.5 L62010 1459 L34190.25 1696.7990762228176 L34190.3 1696.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62258.3 1344.2 L62249.1 1349.8 L62249.0 1339.0 L62258.3 1333.5 Z"></path>
+						<path d="M62572.1 1276.6 L62561.5 1274.5 L62568.7 1266.4 L62579.3 1268.5 Z"></path>
 					</g>
-					<path d="M62510.7 1299.0 L62852 1459 L62852 1697.5 L62852 1697.5 L62852 1936 L62852 1936 L62852 2625 L62852 2625 L62852 3314 L62852 3314 L21936.75 3500.3383240844187 L21936.8 3500.3 " fill="none"></path>
+					<path d="M62561.8 1283.9 L62108.25 1459 L62108.25 1697.5 L62108.25 1697.5 L62108.25 1936 L62108.25 1936 L62108.25 2625 L62108.25 2625 L62108.25 3314 L62108.25 3314 L21260 3500.338059131073 L21260.0 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62504.5 1290.2 L62510.7 1299.0 L62499.9 1299.8 L62493.8 1291.0 Z"></path>
+						<path d="M62572.5 1285.5 L62561.8 1283.9 L62568.6 1275.6 L62579.3 1277.2 Z"></path>
 					</g>
-					<path d="M62510.9 1292.9 L62892 1459 L62892 1697.5 L62892 1697.5 L62892 1936 L62892 1936 L62892 2625 L62892 2625 L62892 3314 L62892 3314 L29568.25 3499.315493451214 L29568.3 3499.3 " fill="none"></path>
+					<path d="M62931.1 1299.8 L63267.25 1459 L63267.25 1697.5 L63267.25 1697.5 L63267.25 1936 L63267.25 1936 L63267.25 2625 L63267.25 2625 L63267.25 3314 L63267.25 3314 L29421.5 3499.3336477410357 L29421.5 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62504.4 1284.3 L62510.9 1292.9 L62500.2 1294.1 L62493.8 1285.5 Z"></path>
+						<path d="M62925.0 1291.0 L62931.1 1299.8 L62920.4 1300.6 L62914.3 1291.8 Z"></path>
 					</g>
-					<path d="M38185.0 2749.0 L37974.25 3314 L22146 3500.1589257279793 L22146.0 3500.2 " fill="none"></path>
+					<path d="M38186.2 2749.8 L38072 3314 L21358 3500.1769694797827 L21358.0 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38193.3 2742.1 L38185.0 2749.0 L38183.3 2738.4 L38191.5 2731.5 Z"></path>
+						<path d="M38193.3 2741.7 L38186.2 2749.8 L38182.9 2739.6 L38189.9 2731.5 Z"></path>
 					</g>
-					<path d="M38265.8 2749.5 L38422.25 3314 L21936.75 3500.0992524665576 L21936.8 3500.1 " fill="none"></path>
+					<path d="M38228.7 2750.0 L38306.25 3314 L21260 3500.112407979276 L21260.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38268.4 2739.1 L38265.8 2749.5 L38258.1 2741.9 L38260.8 2731.5 Z"></path>
+						<path d="M38232.7 2740.0 L38228.7 2750.0 L38222.1 2741.5 L38226.1 2731.5 Z"></path>
 					</g>
-					<path d="M34657.4 1711.7 L36159.25 1936 L34362.25 2588.6794939377965 L34362.3 2588.7 " fill="none"></path>
-					<path d="M34658.2 1706.4 L34657.4 1711.7 L34656.6 1717.0 L34644.3 1709.7 Z"></path>
-					<path d="M68203.6 2772.3 L68093.75 3314 L35765.25 3500.1861238921656 L35765.3 3500.2 " fill="none"></path>
+					<path d="M34203.4 1711.8 L35692.25 1936 L35692.25 2548.5 L35692.3 2548.5 " fill="none"></path>
+					<path d="M34204.2 1706.6 L34203.4 1711.8 L34202.6 1717.1 L34190.3 1709.8 Z"></path>
+					<path d="M68910.6 2772.3 L68800.75 3314 L35468.5 3500.195560364516 L35468.5 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68210.7 2764.2 L68203.6 2772.3 L68200.3 2762.1 L68207.3 2754.0 Z"></path>
+						<path d="M68917.7 2764.2 L68910.6 2772.3 L68907.3 2762.1 L68914.3 2754.0 Z"></path>
 					</g>
-					<path d="M68212.1 2772.5 L68133.75 3314 L71323.5 3493.439974360908 L71323.5 3493.4 " fill="none"></path>
+					<path d="M68919.1 2772.5 L68840.75 3314 L71743 3492.7695896292626 L71743.0 3492.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68218.8 2764.0 L68212.1 2772.5 L68208.2 2762.5 L68214.8 2754.0 Z"></path>
+						<path d="M68925.8 2764.0 L68919.1 2772.5 L68915.2 2762.5 L68921.8 2754.0 Z"></path>
 					</g>
-					<path d="M68237.8 2772.7 L68253.5 3314 L59344.75 3499.324656311871 L59344.8 3499.3 " fill="none"></path>
+					<path d="M68944.8 2772.7 L68960.5 3314 L59764 3499.361207176051 L59764.0 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68242.8 2763.2 L68237.8 2772.7 L68232.2 2763.5 L68237.2 2754.0 Z"></path>
+						<path d="M68949.8 2763.2 L68944.8 2772.7 L68939.2 2763.5 L68944.2 2754.0 Z"></path>
 					</g>
-					<path d="M68259.1 2772.4 L68353.25 3314 L63029 3498.6789649881434 L63029.0 3498.7 " fill="none"></path>
+					<path d="M68966.1 2772.4 L69060.25 3314 L63029.25 3498.8905235473003 L63029.3 3498.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68262.8 2762.3 L68259.1 2772.4 L68252.3 2764.1 L68255.9 2754.0 Z"></path>
+						<path d="M68969.8 2762.3 L68966.1 2772.4 L68959.3 2764.1 L68962.9 2754.0 Z"></path>
 					</g>
-					<path d="M67685.1 780.9 L68233.5 966 L68233.5 1212.5 L68233.5 1212.5 L68233.5 1459 L68233.5 1459 L68233.5 1697.5 L68233.5 1697.5 L68233.5 1936 L68233.5 1936 L68233.5 2496 L68233.5 2496.0 " fill="none"></path>
-					<path d="M67686.8 775.9 L67685.1 780.9 L67683.4 786.0 L67672.5 776.7 Z"></path>
-					<path d="M34657.5 1709.9 L36386.75 1936 L34575.10123367199 2594 L34575.1 2594.0 " fill="none"></path>
-					<path d="M34658.2 1704.7 L34657.5 1709.9 L34656.8 1715.2 L34644.3 1708.2 Z"></path>
-					<path d="M70517.3 3900.7 L70517.25 4000 L71281.25 4112.315962698848 L71281.3 4112.3 " fill="none"></path>
+					<path d="M68933.4 956.6 L68940.5 966 L68940.5 1212.5 L68940.5 1212.5 L68940.5 1459 L68940.5 1459 L68940.5 1697.5 L68940.5 1697.5 L68940.5 1936 L68940.5 1936 L68940.5 2496 L68940.5 2496.0 " fill="none"></path>
+					<path d="M68937.7 953.4 L68933.4 956.6 L68929.2 959.9 L68925.4 946.0 Z"></path>
+					<path d="M34203.5 1710.0 L35919.75 1936 L35919.75 2594 L35919.8 2594.0 " fill="none"></path>
+					<path d="M34204.2 1704.7 L34203.5 1710.0 L34202.8 1715.3 L34190.3 1708.3 Z"></path>
+					<path d="M71457.3 3900.7 L71457.25 4000 L72021.75 4106.240168539326 L72021.8 4106.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70522.6 3891.3 L70517.3 3900.7 L70511.9 3891.3 L70517.3 3882.0 Z"></path>
+						<path d="M71462.6 3891.3 L71457.3 3900.7 L71451.9 3891.3 L71457.3 3882.0 Z"></path>
 					</g>
-					<path d="M72062.8 730.7 L71842 966 L71842 1212.5 L71842 1212.5 L71842 1459 L71842 1459 L71842 1697.5 L71842 1697.5 L71842 1936 L71842 1936 L71842 2625 L71842 2625 L71842 3314 L71842 3314 L71842 3500.5 L71842 3500.5 L71842 3687 L71842 3687 L70658.25 3826.8428948858277 L70658.3 3826.8 " fill="none"></path>
-					<path d="M72066.7 734.4 L72062.8 730.7 L72058.9 727.1 L72071.9 721.0 Z"></path>
-					<path d="M63449.9 1299.0 L63005.5 1459 L63005.5 1682 L63005.5 1682.0 " fill="none"></path>
+					<path d="M73260.4 730.6 L73486.5 966 L73486.5 1212.5 L73486.5 1212.5 L73486.5 1459 L73486.5 1459 L73486.5 1697.5 L73486.5 1697.5 L73486.5 1936 L73486.5 1936 L73486.5 2625 L73486.5 2625 L73486.5 3314 L73486.5 3314 L73486.5 3500.5 L73486.5 3500.5 L73486.5 3687 L73486.5 3687 L71598.25 3832.6257853886905 L71598.3 3832.6 " fill="none"></path>
+					<path d="M73264.2 726.9 L73260.4 730.6 L73256.5 734.3 L73251.1 721.0 Z"></path>
+					<path d="M63690.0 1319.2 L63380.75 1459 L63380.75 1682 L63380.8 1682.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63460.5 1300.8 L63449.9 1299.0 L63456.9 1290.8 L63467.5 1292.6 Z"></path>
+						<path d="M63700.7 1320.2 L63690.0 1319.2 L63696.3 1310.5 L63707.0 1311.5 Z"></path>
 					</g>
-					<path d="M63450.4 1316.0 L63119 1459 L63119 1697.5 L63119 1697.5 L63119 1936 L63119 1936 L63119 2625 L63119 2625 L63119 3314 L63119 3314 L28048.75 3500.268958029262 L28048.8 3500.3 " fill="none"></path>
+					<path d="M63736.4 1320.8 L63494.25 1459 L63494.25 1697.5 L63494.25 1697.5 L63494.25 1936 L63494.25 1936 L63494.25 2625 L63494.25 2625 L63494.25 3314 L63494.25 3314 L26043.25 3500.283628265479 L26043.3 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63461.0 1317.1 L63450.4 1316.0 L63456.8 1307.4 L63467.5 1308.6 Z"></path>
+						<path d="M63747.1 1320.8 L63736.4 1320.8 L63741.8 1311.5 L63752.6 1311.5 Z"></path>
 					</g>
-					<path d="M63509.0 1321.1 L63279.25 1459 L63279.25 1682 L63279.3 1682.0 " fill="none"></path>
+					<path d="M63785.5 1323.0 L63612.75 1459 L63612.75 1682 L63612.8 1682.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63519.8 1320.9 L63509.0 1321.1 L63514.3 1311.7 L63525.0 1311.5 Z"></path>
+						<path d="M63796.2 1321.5 L63785.5 1323.0 L63789.6 1313.1 L63800.2 1311.5 Z"></path>
 					</g>
-					<path d="M63631.7 1328.2 L63565.75 1459 L63565.75 1682 L63565.8 1682.0 " fill="none"></path>
+					<path d="M63913.2 1330.1 L63899.25 1459 L63899.25 1682 L63899.3 1682.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63640.7 1322.2 L63631.7 1328.2 L63631.1 1317.4 L63640.1 1311.5 Z"></path>
+						<path d="M63919.6 1321.4 L63913.2 1330.1 L63908.9 1320.2 L63915.3 1311.5 Z"></path>
 					</g>
-					<path d="M63884.9 1760.2 L63553.25 1936 L44484.75 2619.675729822553 L44484.8 2619.7 " fill="none"></path>
+					<path d="M64144.0 1762.0 L63886.75 1936 L42151.75 2620.3244910549042 L42151.8 2620.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63895.6 1760.6 L63884.9 1760.2 L63890.6 1751.2 L63901.4 1751.5 Z"></path>
+						<path d="M64154.7 1761.1 L64144.0 1762.0 L64148.7 1752.3 L64159.4 1751.5 Z"></path>
 					</g>
-					<path d="M64020.1 1769.7 L64059 1936 L64059 2625 L64059 2625 L64059 3314 L64059 3314 L64059 3500.5 L64059 3500.5 L64059 3687 L64059 3687 L64059 3843.5 L64059 3843.5 L64059 4000 L64059 4000 L18421.25 4133.788929057805 L18421.3 4133.8 " fill="none"></path>
+					<path d="M64245.3 1770.1 L64259.25 1936 L64259.25 2625 L64259.25 2625 L64259.25 3314 L64259.25 3314 L64259.25 3500.5 L64259.25 3500.5 L64259.25 3687 L64259.25 3687 L64259.25 3843.5 L64259.25 3843.5 L64259.25 4000 L64259.25 4000 L18216.75 4133.790781641349 L18216.8 4133.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64023.2 1759.4 L64020.1 1769.7 L64012.8 1761.8 L64015.9 1751.5 Z"></path>
+						<path d="M64249.9 1760.4 L64245.3 1770.1 L64239.2 1761.2 L64243.8 1751.5 Z"></path>
 					</g>
-					<path d="M63826.3 1319.7 L64003.25 1459 L64003.25 1643.5 L64003.3 1643.5 " fill="none"></path>
-					<path d="M63829.6 1315.6 L63826.3 1319.7 L63823.0 1323.9 L63815.8 1311.5 Z"></path>
-					<path d="M34657.5 1708.6 L36604.25 1936 L34797.25 2592.3115445440167 L34797.3 2592.3 " fill="none"></path>
-					<path d="M34658.1 1703.3 L34657.5 1708.6 L34656.9 1713.9 L34644.3 1707.1 Z"></path>
-					<path d="M72313.6 728.1 L72689.5 966 L72689.5 1181.5 L72689.5 1181.5 " fill="none"></path>
-					<path d="M72316.5 723.6 L72313.6 728.1 L72310.8 732.6 L72302.3 721.0 Z"></path>
-					<path d="M34959.4 2662.3 L33748.5 3314 L33748.5 3469.5 L33748.5 3469.5 " fill="none"></path>
-					<path d="M34961.9 2667.0 L34959.4 2662.3 L34956.9 2657.6 L34971.1 2656.0 Z"></path>
-					<path d="M29964.0 1747.2 L29964 1936 L57022.75 2614.283823730047 L57022.8 2614.3 " fill="none"></path>
+					<path d="M64062.3 1319.7 L64239.25 1459 L64239.25 1643.5 L64239.3 1643.5 " fill="none"></path>
+					<path d="M64065.6 1315.6 L64062.3 1319.7 L64059.0 1323.9 L64051.8 1311.5 Z"></path>
+					<path d="M34203.5 1705.0 L37137.5 1936 L37137.5 2586.5 L37137.5 2586.5 " fill="none"></path>
+					<path d="M34204.0 1699.7 L34203.5 1705.0 L34203.1 1710.3 L34190.3 1704.0 Z"></path>
+					<path d="M73300.1 728.8 L73627 966 L73627 1181.5 L73627.0 1181.5 " fill="none"></path>
+					<path d="M73303.3 724.5 L73300.1 728.8 L73297.0 733.1 L73289.4 721.0 Z"></path>
+					<path d="M38636.6 2668.2 L38346.25 3314 L36348.5 3487.636432482815 L36348.5 3487.6 " fill="none"></path>
+					<path d="M38641.5 2670.3 L38636.6 2668.2 L38631.7 2666.0 L38642.1 2656.0 Z"></path>
+					<path d="M30020.8 1747.2 L30020.75 1936 L56178.25 2613.9205378973106 L56178.3 2613.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29969.3 1737.8 L29964.0 1747.2 L29958.7 1737.8 L29964.0 1728.5 Z"></path>
+						<path d="M30026.1 1737.8 L30020.8 1747.2 L30015.4 1737.8 L30020.8 1728.5 Z"></path>
 					</g>
-					<path d="M26149.5 1762.7 L26149.5 1936 L44992.25 2620.7662618510753 L44992.3 2620.8 " fill="none"></path>
+					<path d="M25888.3 1762.7 L25888.25 1936 L44630.5 2620.7436998740636 L44630.5 2620.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26154.8 1753.3 L26149.5 1762.7 L26144.2 1753.3 L26149.5 1744.0 Z"></path>
+						<path d="M25893.6 1753.3 L25888.3 1762.7 L25882.9 1753.3 L25888.3 1744.0 Z"></path>
 					</g>
-					<path d="M30145.4 1217.9 L26149.5 1459 L26149.5 1651 L26149.5 1651.0 " fill="none"></path>
-					<path d="M30145.8 1223.2 L30145.4 1217.9 L30145.1 1212.6 L30158.8 1217.1 Z"></path>
-					<path d="M80385.0 1285.2 L80385 1459 L80385 1501 L80385.0 1501.0 " fill="none"></path>
+					<path d="M30471.3 1229.7 L31655.5 1459 L26053.25 1690.6765572846678 L26053.3 1690.7 " fill="none"></path>
+					<path d="M30472.4 1224.5 L30471.3 1229.7 L30470.3 1235.0 L30458.3 1227.2 Z"></path>
+					<path d="M81247.3 1285.2 L81247.25 1459 L81247.25 1501 L81247.3 1501.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M80390.3 1275.8 L80385.0 1285.2 L80379.7 1275.8 L80385.0 1266.5 Z"></path>
+						<path d="M81252.6 1275.8 L81247.3 1285.2 L81241.9 1275.8 L81247.3 1266.5 Z"></path>
 					</g>
-					<path d="M80996.7 160.2 L80385 293 L80385 629.5 L80385 629.5 L80385 966 L80385 966 L80385 1158.5 L80385.0 1158.5 " fill="none"></path>
-					<path d="M80997.9 165.4 L80996.7 160.2 L80995.6 155.0 L81009.8 157.3 Z"></path>
-					<path d="M55618.8 1778.0 L55302.75 1936 L55302.75 2541 L55302.8 2541.0 " fill="none"></path>
-					<path d="M55621.2 1782.7 L55618.8 1778.0 L55616.4 1773.2 L55630.8 1772.0 Z"></path>
-					<path d="M67419.6 2831.5 L67244.75 3314 L63699.5 3498.9092148500313 L63699.5 3498.9 " fill="none"></path>
+					<path d="M81934.2 157.9 L81247.25 293 L81247.25 629.5 L81247.25 629.5 L81247.25 966 L81247.25 966 L81247.25 1158.5 L81247.3 1158.5 " fill="none"></path>
+					<path d="M81935.2 163.2 L81934.2 157.9 L81933.1 152.7 L81947.3 155.4 Z"></path>
+					<path d="M55619.8 1785.4 L55344.25 1936 L55344.25 2541 L55344.3 2541.0 " fill="none"></path>
+					<path d="M55622.4 1790.0 L55619.8 1785.4 L55617.2 1780.7 L55631.5 1779.0 Z"></path>
+					<path d="M68126.6 2831.5 L67951.75 3314 L64520 3498.857065492093 L64520.0 3498.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67427.8 2824.6 L67419.6 2831.5 L67417.8 2821.0 L67426.0 2814.0 Z"></path>
+						<path d="M68134.8 2824.6 L68126.6 2831.5 L68124.8 2821.0 L68133.0 2814.0 Z"></path>
 					</g>
-					<path d="M67431.5 2831.9 L67284.75 3314 L63161 3498.442562503747 L63161.0 3498.4 " fill="none"></path>
+					<path d="M68138.5 2831.9 L67991.75 3314 L63641.25 3498.548675082452 L63641.3 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67439.3 2824.5 L67431.5 2831.9 L67429.1 2821.4 L67437.0 2814.0 Z"></path>
+						<path d="M68146.3 2824.5 L68138.5 2831.9 L68136.1 2821.4 L68144.0 2814.0 Z"></path>
 					</g>
-					<path d="M67443.5 2832.1 L67324.75 3314 L67324.75 3500.5 L67324.75 3500.5 L67324.75 3687 L67324.75 3687 L67324.75 3843.5 L67324.75 3843.5 L67324.75 4000 L67324.75 4000 L60846 4132.994140400598 L60846.0 4133.0 " fill="none"></path>
+					<path d="M68150.5 2832.1 L68031.75 3314 L68031.75 3500.5 L68031.75 3500.5 L68031.75 3687 L68031.75 3687 L68031.75 3843.5 L68031.75 3843.5 L68031.75 4000 L68031.75 4000 L63107.25 4132.679802955665 L63107.3 4132.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67450.9 2824.3 L67443.5 2832.1 L67440.5 2821.8 L67447.9 2814.0 Z"></path>
+						<path d="M68157.9 2824.3 L68150.5 2832.1 L68147.5 2821.8 L68154.9 2814.0 Z"></path>
 					</g>
-					<path d="M67506.6 2832.6 L67534.5 3314 L67534.5 3500.5 L67534.5 3500.5 L67534.5 3687 L67534.5 3687 L64655.75 3836.2173139024594 L64655.8 3836.2 " fill="none"></path>
+					<path d="M68213.6 2832.6 L68241.5 3314 L68241.5 3500.5 L68241.5 3500.5 L68241.5 3687 L68241.5 3687 L65519.75 3835.817844353219 L65519.8 3835.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67511.3 2823.0 L67506.6 2832.6 L67500.7 2823.6 L67505.5 2814.0 Z"></path>
+						<path d="M68218.3 2823.0 L68213.6 2832.6 L68207.7 2823.6 L68212.5 2814.0 Z"></path>
 					</g>
-					<path d="M67557.5 2831.9 L67704.25 3314 L63029 3498.428983131511 L63029.0 3498.4 " fill="none"></path>
+					<path d="M68264.5 2831.9 L68411.25 3314 L63029.25 3498.6983163124482 L63029.3 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67559.9 2821.4 L67557.5 2831.9 L67549.7 2824.5 L67552.0 2814.0 Z"></path>
+						<path d="M68266.9 2821.4 L68264.5 2831.9 L68256.7 2824.5 L68259.0 2814.0 Z"></path>
 					</g>
-					<path d="M67685.8 669.8 L70987.75 966 L70987.75 1212.5 L70987.75 1212.5 L70987.75 1459 L70987.75 1459 L70987.75 1697.5 L70987.75 1697.5 L70987.75 1936 L70987.75 1936 L67914 2542.2588563658483 L67914.0 2542.3 " fill="none"></path>
-					<path d="M67686.3 664.5 L67685.8 669.8 L67685.3 675.1 L67672.5 668.6 Z"></path>
-					<path d="M80115.5 1902.1 L80070.75 1936 L67914 2602.0173541397476 L67914.0 2602.0 " fill="none"></path>
-					<path d="M80118.7 1906.3 L80115.5 1902.1 L80112.2 1897.8 L80126.1 1894.0 Z"></path>
+					<path d="M69136.0 675.6 L71967.75 966 L71967.75 1212.5 L71967.75 1212.5 L71967.75 1459 L71967.75 1459 L71967.75 1697.5 L71967.75 1697.5 L71967.75 1936 L71967.75 1936 L68621 2548.2564221705943 L68621.0 2548.3 " fill="none"></path>
+					<path d="M69136.6 670.3 L69136.0 675.6 L69135.5 680.9 L69122.8 674.2 Z"></path>
+					<path d="M80855.0 1734.1 L78694.5 1936 L68621 2597.4544458210235 L68621.0 2597.5 " fill="none"></path>
+					<path d="M80855.5 1739.5 L80855.0 1734.1 L80854.5 1728.8 L80868.3 1732.9 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M65616.1 1231.7 L64175.25 1459 L64175.25 1697.5 L64175.25 1697.5 L64175.25 1936 L64175.25 1936 L67075 2537.921443097085 L67075.0 2537.9 " fill="none"></path>
+						<path d="M67173.0 1223.4 L64540.25 1459 L64540.25 1697.5 L64540.25 1697.5 L64540.25 1936 L64540.25 1936 L67782 2546.055513827245 L67782.0 2546.1 " fill="none"></path>
 					</g>
-					<path d="M65616.9 1237.0 L65616.1 1231.7 L65615.2 1226.4 L65629.3 1229.6 Z"></path>
+					<path d="M67173.4 1228.7 L67173.0 1223.4 L67172.5 1218.1 L67186.3 1222.2 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M82077.1 1261.4 L81916.75 1459 L81916.75 1697.5 L81916.75 1697.5 L81916.75 1936 L81916.75 1936 L67914 2604.959056319229 L67914.0 2605.0 " fill="none"></path>
+						<path d="M83014.6 1261.4 L82854.25 1459 L82854.25 1697.5 L82854.25 1697.5 L82854.25 1936 L82854.25 1936 L68621 2605.27431710771 L68621.0 2605.3 " fill="none"></path>
 					</g>
-					<path d="M82081.3 1264.7 L82077.1 1261.4 L82073.0 1258.0 L82085.5 1251.0 Z"></path>
+					<path d="M83018.8 1264.7 L83014.6 1261.4 L83010.5 1258.0 L83023.0 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41569.1 1232.6 L40335.75 1459 L40335.75 1697.5 L40335.75 1697.5 L40335.75 1936 L40335.75 1936 L67075 2614.3575551157546 L67075.0 2614.4 " fill="none"></path>
+						<path d="M42228.5 1226.1 L40351.75 1459 L40351.75 1697.5 L40351.75 1697.5 L40351.75 1936 L40351.75 1936 L67782 2614.621612402266 L67782.0 2614.6 " fill="none"></path>
 					</g>
-					<path d="M41570.1 1237.9 L41569.1 1232.6 L41568.2 1227.4 L41582.3 1230.2 Z"></path>
-					<path d="M60148.8 2778.8 L59936 3314 L59342.084450402144 3485 L59342.1 3485.0 " fill="none"></path>
+					<path d="M42229.2 1231.4 L42228.5 1226.1 L42227.9 1220.8 L42241.8 1224.5 Z"></path>
+					<path d="M60678.3 2779.2 L60494.5 3314 L59764 3487.1108640406605 L59764.0 3487.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60157.2 2772.1 L60148.8 2778.8 L60147.3 2768.2 L60155.7 2761.5 Z"></path>
+						<path d="M60686.4 2772.1 L60678.3 2779.2 L60676.3 2768.6 L60684.3 2761.5 Z"></path>
 					</g>
-					<path d="M60292.1 2777.9 L60579.75 3314 L62924 3496.414780431835 L62924.0 3496.4 " fill="none"></path>
+					<path d="M60817.6 2777.7 L61120.75 3314 L62924.25 3495.224542025862 L62924.3 3495.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60292.4 2767.2 L60292.1 2777.9 L60283.0 2772.2 L60283.3 2761.5 Z"></path>
+						<path d="M60817.7 2767.0 L60817.6 2777.7 L60808.4 2772.2 L60808.4 2761.5 Z"></path>
 					</g>
-					<path d="M57705.2 1733.8 L57236.5 1936 L59862 2544.363712796368 L59862.0 2544.4 " fill="none"></path>
-					<path d="M57707.3 1738.7 L57705.2 1733.8 L57703.0 1728.9 L57717.4 1728.5 Z"></path>
-					<path d="M81372.5 1856.4 L81252.75 1936 L60558 2613.605481697972 L60558.0 2613.6 " fill="none"></path>
-					<path d="M81375.5 1860.8 L81372.5 1856.4 L81369.6 1851.9 L81383.6 1849.0 Z"></path>
-					<path d="M80145.0 1906.2 L80110.75 1936 L80110.75 2625 L80110.75 2625 L80110.75 3314 L80110.75 3314 L80110.75 3500.5 L80110.75 3500.5 L80110.75 3687 L80110.75 3687 L65499.5 3842.7219895466233 L65499.5 3842.7 " fill="none"></path>
+					<path d="M56273.5 1736.3 L55994 1936 L60383.25 2574.3858251095044 L60383.3 2574.4 " fill="none"></path>
+					<path d="M56276.6 1740.6 L56273.5 1736.3 L56270.4 1731.9 L56284.4 1728.5 Z"></path>
+					<path d="M82289.5 1821.2 L82048.75 1936 L61079.25 2613.752339627067 L61079.3 2613.8 " fill="none"></path>
+					<path d="M82291.8 1826.1 L82289.5 1821.2 L82287.2 1816.4 L82301.5 1815.5 Z"></path>
+					<path d="M80850.3 1813.6 L80432 1936 L80432 2625 L80432 2625 L80432 3314 L80432 3314 L80432 3500.5 L80432 3500.5 L80432 3687 L80432 3687 L66206.5 3842.701000104906 L66206.5 3842.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M80155.5 1904.1 L80145.0 1906.2 L80148.5 1896.1 L80159.0 1894.0 Z"></path>
+						<path d="M80860.8 1816.1 L80850.3 1813.6 L80857.8 1805.9 L80868.3 1808.4 Z"></path>
 					</g>
-					<path d="M80592.6 1907.3 L80621 1936 L80621 2625 L80621 2625 L80621 3314 L80621 3314 L59344.75 3500.006052899884 L59344.8 3500.0 " fill="none"></path>
+					<path d="M81322.2 1911.6 L81330.75 1936 L81330.75 2625 L81330.75 2625 L81330.75 3314 L81330.75 3314 L59764 3500.012688888118 L59764.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M80589.8 1896.9 L80592.6 1907.3 L80582.2 1904.4 L80579.4 1894.0 Z"></path>
+						<path d="M81324.2 1901.0 L81322.2 1911.6 L81314.1 1904.6 L81316.0 1894.0 Z"></path>
 					</g>
-					<path d="M50507.2 1216.1 L44079.25 1459 L44079.25 1598.5 L44079.3 1598.5 " fill="none"></path>
-					<path d="M50507.4 1221.4 L50507.2 1216.1 L50507.0 1210.8 L50520.5 1215.6 Z"></path>
-					<path d="M45610.8 3618.2 L45610.75 3687 L65353.5 3842.923463658958 L65353.5 3842.9 " fill="none"></path>
+					<path d="M49552.4 1217.0 L44490 1459 L44490 1598.5 L44490.0 1598.5 " fill="none"></path>
+					<path d="M49552.7 1222.4 L49552.4 1217.0 L49552.2 1211.7 L49565.8 1216.4 Z"></path>
+					<path d="M47545.0 3618.2 L47545 3687 L66060.5 3842.885399575006 L66060.5 3842.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45616.1 3608.8 L45610.8 3618.2 L45605.4 3608.8 L45610.8 3599.5 Z"></path>
+						<path d="M47550.3 3608.8 L47545.0 3618.2 L47539.7 3608.8 L47545.0 3599.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M47795.2 1705.5 L45348.75 1936 L45348.75 2625 L45348.75 2625 L45348.75 3314 L45348.75 3314 L45471.67225201072 3401.5 L45471.7 3401.5 " fill="none"></path>
+						<path d="M49999.5 1705.1 L47426.5 1936 L47426.5 2625 L47426.5 2625 L47426.5 3314 L47426.5 3314 L47482.09651474531 3401.5 L47482.1 3401.5 " fill="none"></path>
 					</g>
-					<path d="M47795.7 1710.8 L47795.2 1705.5 L47794.7 1700.2 L47808.5 1704.2 Z"></path>
-					<path d="M40662.3 1747.2 L40662.25 1936 L59862 2612.734035886483 L59862.0 2612.7 " fill="none"></path>
+					<path d="M49999.9 1710.4 L49999.5 1705.1 L49999.0 1699.8 L50012.8 1703.9 Z"></path>
+					<path d="M40638.3 1747.2 L40638.25 1936 L60383.25 2613.0668889663066 L60383.3 2613.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40667.6 1737.8 L40662.3 1747.2 L40656.9 1737.8 L40662.3 1728.5 Z"></path>
+						<path d="M40643.6 1737.8 L40638.3 1747.2 L40632.9 1737.8 L40638.3 1728.5 Z"></path>
 					</g>
-					<path d="M45872.8 2712.7 L45872.75 3314 L45749.82774798928 3401.5 L45749.8 3401.5 " fill="none"></path>
+					<path d="M47663.5 2712.7 L47663.5 3314 L47607.90348525469 3401.5 L47607.9 3401.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45878.1 2703.3 L45872.8 2712.7 L45867.4 2703.3 L45872.8 2694.0 Z"></path>
+						<path d="M47668.8 2703.3 L47663.5 2712.7 L47658.2 2703.3 L47663.5 2694.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M47795.3 1707.6 L45872.75 1936 L45872.75 2556 L45872.8 2556.0 " fill="none"></path>
+						<path d="M49999.5 1705.9 L47663.5 1936 L47663.5 2556 L47663.5 2556.0 " fill="none"></path>
 					</g>
-					<path d="M47795.9 1712.9 L47795.3 1707.6 L47794.6 1702.3 L47808.5 1706.0 Z"></path>
-					<path d="M57357.6 2876.5 L57196.5 3314 L63638.5 3499.621166473542 L63638.5 3499.6 " fill="none"></path>
+					<path d="M50000.0 1711.2 L49999.5 1705.9 L49999.0 1700.5 L50012.8 1704.5 Z"></path>
+					<path d="M56440.6 2874.6 L56149.75 3314 L64459 3499.817935189904 L64459.0 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57365.8 2869.6 L57357.6 2876.5 L57355.8 2865.9 L57364.1 2859.0 Z"></path>
+						<path d="M56450.2 2869.7 L56440.6 2874.6 L56441.3 2863.8 L56450.9 2859.0 Z"></path>
 					</g>
-					<path d="M57372.1 2876.8 L57236.5 3314 L59231.75 3495.364262215182 L59231.8 3495.4 " fill="none"></path>
+					<path d="M56454.8 2875.0 L56189.75 3314 L59651 3497.504548361879 L59651.0 3497.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57380.0 2869.5 L57372.1 2876.8 L57369.8 2866.3 L57377.7 2859.0 Z"></path>
+						<path d="M56464.2 2869.7 L56454.8 2875.0 L56455.1 2864.2 L56464.5 2859.0 Z"></path>
 					</g>
-					<path d="M57386.7 2877.1 L57276.5 3314 L57276.5 3500.5 L57276.5 3500.5 L57276.5 3687 L57276.5 3687 L57276.5 3843.5 L57276.5 3843.5 L57276.5 4000 L57276.5 4000 L60748 4132.1349240164745 L60748.0 4132.1 " fill="none"></path>
+					<path d="M56469.1 2875.4 L56229.75 3314 L56229.75 3500.5 L56229.75 3500.5 L56229.75 3687 L56229.75 3687 L56229.75 3843.5 L56229.75 3843.5 L56229.75 4000 L56229.75 4000 L63009.25 4133.038441824705 L63009.3 4133.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57394.1 2869.4 L57386.7 2877.1 L57383.8 2866.7 L57391.2 2859.0 Z"></path>
+						<path d="M56478.3 2869.7 L56469.1 2875.4 L56468.9 2864.6 L56478.1 2859.0 Z"></path>
 					</g>
-					<path d="M57481.2 2877.5 L57534.75 3314 L57534.75 3500.5 L57534.75 3500.5 L57534.75 3687 L57534.75 3687 L64374.75 3840.3500465582692 L64374.8 3840.4 " fill="none"></path>
+					<path d="M56602.7 2877.7 L56597.5 3314 L56597.5 3500.5 L56597.5 3500.5 L56597.5 3687 L56597.5 3687 L65238.75 3840.9961425683946 L65238.8 3841.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57485.4 2867.6 L57481.2 2877.5 L57474.8 2868.9 L57478.9 2859.0 Z"></path>
+						<path d="M56608.2 2868.4 L56602.7 2877.7 L56597.5 2868.3 L56602.9 2859.0 Z"></path>
 					</g>
-					<path d="M57544.5 2876.5 L57708.5 3314 L62924 3498.6413724373574 L62924.0 3498.6 " fill="none"></path>
+					<path d="M56739.4 2875.5 L56973.5 3314 L62924.25 3498.8690084537543 L62924.3 3498.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57546.2 2865.9 L57544.5 2876.5 L57536.2 2869.6 L57538.0 2859.0 Z"></path>
+						<path d="M56739.7 2864.7 L56739.4 2875.5 L56730.3 2869.7 L56730.6 2859.0 Z"></path>
 					</g>
-					<path d="M57734.3 1736.2 L57450.25 1936 L57450.25 2391 L57450.3 2391.0 " fill="none"></path>
-					<path d="M57737.4 1740.5 L57734.3 1736.2 L57731.2 1731.8 L57745.2 1728.5 Z"></path>
+					<path d="M56316.7 1741.4 L56267.75 1936 L56490.95754716981 2391 L56491.0 2391.0 " fill="none"></path>
+					<path d="M56321.9 1742.7 L56316.7 1741.4 L56311.5 1740.1 L56320.0 1728.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M65616.1 1232.2 L64215.25 1459 L64215.25 1697.5 L64215.25 1697.5 L64215.25 1936 L64215.25 1936 L57877.75 2581.460088691796 L57877.8 2581.5 " fill="none"></path>
+						<path d="M67173.0 1223.6 L64580.25 1459 L64580.25 1697.5 L64580.25 1697.5 L64580.25 1936 L64580.25 1936 L57033.25 2588.0638284531947 L57033.3 2588.1 " fill="none"></path>
 					</g>
-					<path d="M65616.9 1237.5 L65616.1 1232.2 L65615.2 1226.9 L65629.3 1230.1 Z"></path>
+					<path d="M67173.5 1228.9 L67173.0 1223.6 L67172.5 1218.2 L67186.3 1222.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M82084.5 1262.2 L81956.75 1459 L81956.75 1697.5 L81956.75 1697.5 L81956.75 1936 L81956.75 1936 L57877.75 2612.980841817477 L57877.8 2613.0 " fill="none"></path>
+						<path d="M83022.0 1262.2 L82894.25 1459 L82894.25 1697.5 L82894.25 1697.5 L82894.25 1936 L82894.25 1936 L57033.25 2613.795576012325 L57033.3 2613.8 " fill="none"></path>
 					</g>
-					<path d="M82089.0 1265.1 L82084.5 1262.2 L82080.0 1259.3 L82091.8 1251.0 Z"></path>
+					<path d="M83026.5 1265.1 L83022.0 1262.2 L83017.5 1259.3 L83029.3 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41569.1 1233.2 L40375.75 1459 L40375.75 1697.5 L40375.75 1697.5 L40375.75 1936 L40375.75 1936 L57022.75 2607.7492752349995 L57022.8 2607.7 " fill="none"></path>
+						<path d="M42228.5 1226.4 L40391.75 1459 L40391.75 1697.5 L40391.75 1697.5 L40391.75 1936 L40391.75 1936 L56178.25 2606.83375477982 L56178.3 2606.8 " fill="none"></path>
 					</g>
-					<path d="M41570.1 1238.5 L41569.1 1233.2 L41568.2 1228.0 L41582.3 1230.8 Z"></path>
-					<path d="M34977.9 2664.1 L34133 3314 L34133 3462 L34133.0 3462.0 " fill="none"></path>
-					<path d="M34981.1 2668.4 L34977.9 2664.1 L34974.6 2659.9 L34988.4 2656.0 Z"></path>
-					<path d="M44888.3 1785.2 L44888.25 1936 L44888.25 2609.5 L44888.3 2609.5 " fill="none"></path>
+					<path d="M42229.2 1231.7 L42228.5 1226.4 L42227.9 1221.1 L42241.8 1224.7 Z"></path>
+					<path d="M38639.0 2668.4 L38386.25 3314 L36781.5 3480.1545454545453 L36781.5 3480.2 " fill="none"></path>
+					<path d="M38644.0 2670.4 L38639.0 2668.4 L38634.0 2666.5 L38643.9 2656.0 Z"></path>
+					<path d="M45299.0 1785.2 L45299 1936 L45299 2609.5 L45299.0 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44893.6 1775.8 L44888.3 1785.2 L44882.9 1775.8 L44888.3 1766.5 Z"></path>
+						<path d="M45304.3 1775.8 L45299.0 1785.2 L45293.7 1775.8 L45299.0 1766.5 Z"></path>
 					</g>
-					<path d="M50507.2 1216.6 L44888.25 1459 L44888.25 1628.5 L44888.3 1628.5 " fill="none"></path>
-					<path d="M50507.4 1221.9 L50507.2 1216.6 L50506.9 1211.3 L50520.5 1216.0 Z"></path>
-					<path d="M46429.7 2711.3 L46188.5 3314 L59231.75 3499.6956144201226 L59231.8 3499.7 " fill="none"></path>
+					<path d="M49552.4 1217.9 L45299 1459 L45299 1628.5 L45299.0 1628.5 " fill="none"></path>
+					<path d="M49552.7 1223.2 L49552.4 1217.9 L49552.1 1212.6 L49565.8 1217.1 Z"></path>
+					<path d="M46014.4 2711.6 L45805.5 3314 L59651 3499.742033520357 L59651.0 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M46438.1 2704.6 L46429.7 2711.3 L46428.2 2700.7 L46436.6 2694.0 Z"></path>
+						<path d="M46022.5 2704.6 L46014.4 2711.6 L46012.5 2701.1 L46020.6 2694.0 Z"></path>
 					</g>
-					<path d="M46488.5 2712.0 L46656.25 3314 L46656.25 3485 L46656.3 3485.0 " fill="none"></path>
+					<path d="M46068.7 2712.0 L46236.5 3314 L46236.5 3485 L46236.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M46491.1 2701.6 L46488.5 2712.0 L46480.8 2704.4 L46483.5 2694.0 Z"></path>
+						<path d="M46071.4 2701.6 L46068.7 2712.0 L46061.1 2704.4 L46063.7 2694.0 Z"></path>
 					</g>
-					<path d="M47048.1 2749.5 L46890.75 3314 L46890.75 3485 L46890.8 3485.0 " fill="none"></path>
+					<path d="M46628.3 2749.5 L46471 3314 L46471 3485 L46471.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47055.7 2741.9 L47048.1 2749.5 L47045.4 2739.1 L47053.1 2731.5 Z"></path>
+						<path d="M46636.0 2741.9 L46628.3 2749.5 L46625.7 2739.1 L46633.3 2731.5 Z"></path>
 					</g>
-					<path d="M47123.3 2749.2 L47307.5 3314 L28048.75 3500.0796992578585 L28048.8 3500.1 " fill="none"></path>
+					<path d="M46703.5 2749.2 L46887.75 3314 L26043.25 3500.1116071428573 L26043.3 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47125.5 2738.7 L47123.3 2749.2 L47115.3 2742.0 L47117.5 2731.5 Z"></path>
+						<path d="M46705.7 2738.7 L46703.5 2749.2 L46695.6 2742.0 L46697.7 2731.5 Z"></path>
 					</g>
-					<path d="M47531.7 2749.2 L47347.5 3314 L47347.5 3485 L47347.5 3485.0 " fill="none"></path>
+					<path d="M47112.0 2749.2 L46927.75 3314 L46927.75 3485 L46927.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47539.7 2742.0 L47531.7 2749.2 L47529.5 2738.7 L47537.5 2731.5 Z"></path>
+						<path d="M47119.9 2742.0 L47112.0 2749.2 L47109.8 2738.7 L47117.8 2731.5 Z"></path>
 					</g>
-					<path d="M47669.7 2746.0 L48127.25 3314 L28048.75 3500.0968218864923 L28048.8 3500.1 " fill="none"></path>
+					<path d="M47174.5 2749.9 L47273.75 3314 L26043.25 3500.1186542258156 L26043.3 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47668.0 2735.4 L47669.7 2746.0 L47659.7 2742.1 L47658.0 2731.5 Z"></path>
+						<path d="M47178.1 2739.8 L47174.5 2749.9 L47167.6 2741.6 L47171.2 2731.5 Z"></path>
 					</g>
-					<path d="M14099.6 3449.9 L14111.5 3447 L14119 3447 L14119 3447 L14126.5 3500.5 L14126.5 3500.5 L14119 3554 L14119 3554 L14111.5 3554 L14111.5 3554 L14081.5 3546.7539503386006 L14081.5 3546.8 " fill="none"></path>
+					<path d="M14909.1 3449.9 L14921 3447 L14928.5 3447 L14928.5 3447 L14936 3500.5 L14936 3500.5 L14928.5 3554 L14928.5 3554 L14921 3554 L14921 3554 L14891 3546.7539503386006 L14891.0 3546.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14089.3 3446.9 L14099.6 3449.9 L14091.8 3457.2 L14081.5 3454.2 Z"></path>
+						<path d="M14898.8 3446.9 L14909.1 3449.9 L14901.3 3457.2 L14891.0 3454.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3118.7 2652.5 L3441.5 3314 L13698.5 3497.0818299277407 L13698.5 3497.1 " fill="none"></path>
+						<path d="M3542.7 2652.5 L3865.5 3314 L14508 3497.2034567103565 L14508.0 3497.2 " fill="none"></path>
 					</g>
-					<path d="M3123.5 2650.1 L3118.7 2652.5 L3113.9 2654.8 L3112.8 2640.5 Z"></path>
-					<path d="M26594.0 1777.7 L26594 1936 L38606.5 2597.8113305613306 L38606.5 2597.8 " fill="none"></path>
+					<path d="M3547.5 2650.1 L3542.7 2652.5 L3537.9 2654.8 L3536.8 2640.5 Z"></path>
+					<path d="M26332.8 1777.7 L26332.75 1936 L40694.25 2602.1106361494444 L40694.3 2602.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26599.3 1768.3 L26594.0 1777.7 L26588.7 1768.3 L26594.0 1759.0 Z"></path>
+						<path d="M26338.1 1768.3 L26332.8 1777.7 L26327.4 1768.3 L26332.8 1759.0 Z"></path>
 					</g>
-					<path d="M30145.4 1218.5 L26594 1459 L26594 1636 L26594.0 1636.0 " fill="none"></path>
-					<path d="M30145.8 1223.9 L30145.4 1218.5 L30145.1 1213.2 L30158.8 1217.6 Z"></path>
-					<path d="M78261.0 165.3 L78261 293 L78261 583 L78261.0 583.0 " fill="none"></path>
-					<path d="M78266.3 165.3 L78261.0 165.3 L78255.7 165.3 L78261.0 152.0 Z"></path>
-					<path d="M27113.0 1777.7 L27113 1936 L38606.5 2596.634145324101 L38606.5 2596.6 " fill="none"></path>
+					<path d="M30471.4 1227.0 L31897.75 1459 L26572.25 1687.2357142857143 L26572.3 1687.2 " fill="none"></path>
+					<path d="M30472.3 1221.7 L30471.4 1227.0 L30470.6 1232.3 L30458.3 1224.9 Z"></path>
+					<path d="M79198.5 165.3 L79198.5 293 L79198.5 583 L79198.5 583.0 " fill="none"></path>
+					<path d="M79203.8 165.3 L79198.5 165.3 L79193.2 165.3 L79198.5 152.0 Z"></path>
+					<path d="M26851.8 1777.7 L26851.75 1936 L40694.25 2601.281982421875 L40694.3 2601.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27118.3 1768.3 L27113.0 1777.7 L27107.7 1768.3 L27113.0 1759.0 Z"></path>
+						<path d="M26857.1 1768.3 L26851.8 1777.7 L26846.4 1768.3 L26851.8 1759.0 Z"></path>
 					</g>
-					<path d="M30145.5 1219.6 L27113 1459 L27113 1636 L27113.0 1636.0 " fill="none"></path>
-					<path d="M30145.9 1224.9 L30145.5 1219.6 L30145.0 1214.2 L30158.8 1218.5 Z"></path>
-					<path d="M38822.1 2925.2 L38462.25 3314 L14081.5 3499.04654132202 L14081.5 3499.0 " fill="none"></path>
+					<path d="M30471.5 1224.8 L32177.25 1459 L27091.25 1686.774105717773 L27091.3 1686.8 " fill="none"></path>
+					<path d="M30472.2 1219.5 L30471.5 1224.8 L30470.7 1230.0 L30458.3 1222.9 Z"></path>
+					<path d="M40991.8 2927.2 L40741 3314 L14891 3499.1285448226868 L14891.0 3499.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38832.4 2922.0 L38822.1 2925.2 L38824.6 2914.7 L38834.8 2911.5 Z"></path>
+						<path d="M41001.4 2922.2 L40991.8 2927.2 L40992.4 2916.4 L41002.0 2911.5 Z"></path>
 					</g>
-					<path d="M39048.0 2929.9 L38982.5 3314 L59231.75 3499.9810706327025 L59231.8 3500.0 " fill="none"></path>
+					<path d="M41187.8 2930.2 L41187.75 3314 L59651 3499.931026336749 L59651.0 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39054.8 2921.6 L39048.0 2929.9 L39044.3 2919.8 L39051.1 2911.5 Z"></path>
+						<path d="M41193.1 2920.8 L41187.8 2930.2 L41182.4 2920.8 L41187.8 2911.5 Z"></path>
 					</g>
-					<path d="M39611.8 2730.7 L42435.75 3314 L62924 3500.0233255845087 L62924.0 3500.0 " fill="none"></path>
+					<path d="M41305.4 2928.9 L41454.5 3314 L62924.25 3500.0450638292928 L62924.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39603.7 2723.6 L39611.8 2730.7 L39601.6 2734.0 L39593.5 2726.9 Z"></path>
+						<path d="M41307.0 2918.3 L41305.4 2928.9 L41297.1 2922.1 L41298.7 2911.5 Z"></path>
 					</g>
-					<path d="M57806.8 1740.9 L57885.5 1936 L39593.5 2606.8997897314416 L39593.5 2606.9 " fill="none"></path>
-					<path d="M57811.7 1738.9 L57806.8 1740.9 L57801.8 1742.9 L57801.8 1728.5 Z"></path>
-					<path d="M42327.9 1793.9 L42169 1936 L39593.5 2514.2077223851416 L39593.5 2514.2 " fill="none"></path>
+					<path d="M56324.0 1741.8 L56307.75 1936 L41681.25 2602.5118055555554 L41681.3 2602.5 " fill="none"></path>
+					<path d="M56329.4 1742.2 L56324.0 1741.8 L56318.7 1741.3 L56325.2 1728.5 Z"></path>
+					<path d="M41346.6 1793.9 L41187.75 1936 L41187.75 2338.5 L41187.8 2338.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42338.4 1791.7 L42327.9 1793.9 L42331.3 1783.7 L42341.8 1781.5 Z"></path>
+						<path d="M41357.1 1791.7 L41346.6 1793.9 L41350.0 1783.7 L41360.6 1781.5 Z"></path>
 					</g>
-					<path d="M42543.6 1793.9 L42702.5 1936 L42702.5 2625 L42702.5 2625 L42702.5 3314 L42702.5 3314 L49002.5 3496.786247666459 L49002.5 3496.8 " fill="none"></path>
+					<path d="M41562.4 1793.9 L41721.25 1936 L41721.25 2625 L41721.25 2625 L41721.25 3314 L41721.25 3314 L48752.25 3497.165456069283 L48752.3 3497.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42540.2 1783.7 L42543.6 1793.9 L42533.1 1791.7 L42529.7 1781.5 Z"></path>
+						<path d="M41559.0 1783.7 L41562.4 1793.9 L41551.9 1791.7 L41548.4 1781.5 Z"></path>
 					</g>
-					<path d="M63511.8 2816.3 L63311 3314 L63639.24664879357 3485 L63639.2 3485.0 " fill="none"></path>
+					<path d="M64658.4 2816.5 L64474.25 3314 L64488.23257372654 3485 L64488.2 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63520.2 2809.7 L63511.8 2816.3 L63510.4 2805.7 L63518.8 2799.0 Z"></path>
+						<path d="M64666.6 2809.6 L64658.4 2816.5 L64656.6 2805.9 L64664.9 2799.0 Z"></path>
 					</g>
-					<path d="M63522.8 2816.6 L63351 3314 L63134.61394101877 3485 L63134.6 3485.0 " fill="none"></path>
+					<path d="M64669.4 2816.8 L64514.25 3314 L63641.25 3491.164853101197 L63641.3 3491.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63530.9 2809.6 L63522.8 2816.6 L63520.8 2806.1 L63528.9 2799.0 Z"></path>
+						<path d="M64677.3 2809.5 L64669.4 2816.8 L64667.1 2806.3 L64675.0 2799.0 Z"></path>
 					</g>
-					<path d="M64025.8 2443.8 L65250.25 1936 L65038.551886792455 1804 L65038.6 1804.0 " fill="none"></path>
+					<path d="M65057.2 2441.9 L65963.25 1936 L65846.60849056604 1804 L65846.6 1804.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64015.1 2442.5 L64025.8 2443.8 L64019.2 2452.4 L64008.5 2451.0 Z"></path>
+						<path d="M65046.4 2441.8 L65057.2 2441.9 L65051.6 2451.1 L65040.9 2451.0 Z"></path>
 					</g>
-					<path d="M63540.2 2817.1 L63414 3314 L63414 3500.5 L63414 3500.5 L63414 3687 L63414 3687 L63414 3843.5 L63414 3843.5 L63414 4000 L63414 4000 L60846 4131.491020252197 L60846.0 4131.5 " fill="none"></path>
+					<path d="M64683.4 2817.2 L64564.75 3314 L64564.75 3500.5 L64564.75 3500.5 L64564.75 3687 L64564.75 3687 L64564.75 3843.5 L64564.75 3843.5 L64564.75 4000 L64564.75 4000 L63107.25 4129.641553269167 L63107.3 4129.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63547.7 2809.4 L63540.2 2817.1 L63537.3 2806.7 L63544.8 2799.0 Z"></path>
+						<path d="M64690.7 2809.3 L64683.4 2817.2 L64680.4 2806.8 L64687.7 2799.0 Z"></path>
 					</g>
-					<path d="M63591.7 2817.7 L63598.5 3314 L63598.5 3500.5 L63598.5 3500.5 L63598.5 3687 L63598.5 3687 L64374.75 3819.5149986364877 L64374.8 3819.5 " fill="none"></path>
+					<path d="M64743.4 2817.6 L64779.75 3314 L64779.75 3500.5 L64779.75 3500.5 L64779.75 3687 L64779.75 3687 L65238.75 3806.8223519599665 L65238.8 3806.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63596.9 2808.3 L63591.7 2817.7 L63586.2 2808.4 L63591.4 2799.0 Z"></path>
+						<path d="M64748.0 2807.9 L64743.4 2817.6 L64737.4 2808.7 L64742.0 2799.0 Z"></path>
 					</g>
-					<path d="M63648.9 2816.8 L63804 3314 L63029 3488.667673716012 L63029.0 3488.7 " fill="none"></path>
+					<path d="M64789.1 2816.8 L64944.25 3314 L63029.25 3495.5235069885643 L63029.3 3495.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63651.2 2806.3 L63648.9 2816.8 L63641.0 2809.5 L63643.3 2799.0 Z"></path>
+						<path d="M64791.4 2806.3 L64789.1 2816.8 L64781.2 2809.5 L64783.5 2799.0 Z"></path>
 					</g>
-					<path d="M67685.8 669.4 L71027.75 966 L71027.75 1212.5 L71027.75 1212.5 L71027.75 1459 L71027.75 1459 L71027.75 1697.5 L71027.75 1697.5 L71027.75 1936 L71027.75 1936 L64019 2585.1720719206855 L64019.0 2585.2 " fill="none"></path>
-					<path d="M67686.3 664.1 L67685.8 669.4 L67685.3 674.7 L67672.5 668.2 Z"></path>
+					<path d="M69136.0 675.0 L72007.75 966 L72007.75 1212.5 L72007.75 1212.5 L72007.75 1459 L72007.75 1459 L72007.75 1697.5 L72007.75 1697.5 L72007.75 1936 L72007.75 1936 L65159.25 2584.295184447345 L65159.3 2584.3 " fill="none"></path>
+					<path d="M69136.6 669.7 L69136.0 675.0 L69135.5 680.3 L69122.8 673.7 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M65616.1 1232.7 L64255.25 1459 L64255.25 1697.5 L64255.25 1697.5 L64255.25 1936 L64255.25 1936 L63757.25471698113 2451 L63757.3 2451.0 " fill="none"></path>
+						<path d="M67173.0 1223.7 L64620.25 1459 L64620.25 1697.5 L64620.25 1697.5 L64620.25 1936 L64620.25 1936 L64701.72314949202 2451 L64701.7 2451.0 " fill="none"></path>
 					</g>
-					<path d="M65617.0 1238.0 L65616.1 1232.7 L65615.2 1227.5 L65629.3 1230.5 Z"></path>
+					<path d="M67173.5 1229.0 L67173.0 1223.7 L67172.5 1218.4 L67186.3 1222.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41569.2 1233.9 L40415.75 1459 L40415.75 1697.5 L40415.75 1697.5 L40415.75 1936 L40415.75 1936 L63159 2612.2150000539414 L63159.0 2612.2 " fill="none"></path>
+						<path d="M42228.6 1231.1 L40884.75 1459 L40884.75 1697.5 L40884.75 1697.5 L40884.75 1936 L40884.75 1936 L64299.25 2612.5749124536055 L64299.3 2612.6 " fill="none"></path>
 					</g>
-					<path d="M41570.2 1239.1 L41569.2 1233.9 L41568.1 1228.7 L41582.3 1231.3 Z"></path>
-					<path d="M64594.9 1811.2 L64295.25 1936 L64295.25 2625 L64295.25 2625 L64295.25 3314 L64295.25 3314 L64295.25 3500.5 L64295.25 3500.5 L64295.25 3687 L64295.25 3687 L64374.75 3743.553409090909 L64374.8 3743.6 " fill="none"></path>
+					<path d="M42229.5 1236.4 L42228.6 1231.1 L42227.7 1225.8 L42241.8 1228.9 Z"></path>
+					<path d="M65488.3 1811.4 L65199.25 1936 L65199.25 2625 L65199.25 2625 L65199.25 3314 L65199.25 3314 L65199.25 3500.5 L65199.25 3500.5 L65199.25 3687 L65199.25 3687 L65238.75 3721.3430555555556 L65238.8 3721.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64605.5 1812.5 L64594.9 1811.2 L64601.4 1802.7 L64612.1 1804.0 Z"></path>
+						<path d="M65499.0 1812.6 L65488.3 1811.4 L65494.8 1802.8 L65505.5 1804.0 Z"></path>
 					</g>
-					<path d="M64948.5 1819.6 L65025.5 1936 L63951.77358490566 2451 L63951.8 2451.0 " fill="none"></path>
+					<path d="M65742.0 1822.6 L65732.5 1936 L64982.61066763425 2451 L64982.6 2451.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64947.8 1808.8 L64948.5 1819.6 L64938.9 1814.7 L64938.2 1804.0 Z"></path>
+						<path d="M65748.1 1813.7 L65742.0 1822.6 L65737.5 1812.9 L65743.6 1804.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M65616.4 1246.9 L64867.75 1459 L64867.75 1591 L64867.8 1591.0 " fill="none"></path>
+						<path d="M67173.1 1231.9 L65752.5 1459 L65752.5 1591 L65752.5 1591.0 " fill="none"></path>
 					</g>
-					<path d="M65617.9 1252.0 L65616.4 1246.9 L65615.0 1241.7 L65629.3 1243.2 Z"></path>
+					<path d="M67173.9 1237.2 L67173.1 1231.9 L67172.2 1226.7 L67186.3 1229.8 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M82092.2 1263.0 L81996.75 1459 L65289.25 1691.6311372526125 L65289.3 1691.6 " fill="none"></path>
+						<path d="M83029.7 1263.0 L82934.25 1459 L66174 1691.649155353791 L66174.0 1691.6 " fill="none"></path>
 					</g>
-					<path d="M82097.0 1265.3 L82092.2 1263.0 L82087.4 1260.7 L82098.0 1251.0 Z"></path>
+					<path d="M83034.5 1265.3 L83029.7 1263.0 L83024.9 1260.7 L83035.5 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41569.3 1239.0 L40662.25 1459 L64446.25 1693.3469046291132 L64446.3 1693.3 " fill="none"></path>
+						<path d="M42228.6 1231.6 L40924.75 1459 L65331 1693.4509923372034 L65331.0 1693.5 " fill="none"></path>
 					</g>
-					<path d="M41570.5 1244.2 L41569.3 1239.0 L41568.0 1233.9 L41582.3 1235.9 Z"></path>
-					<path d="M49334.3 2711.4 L49104.75 3314 L20909.5 3499.5097898273993 L20909.5 3499.5 " fill="none"></path>
+					<path d="M42229.5 1236.9 L42228.6 1231.6 L42227.7 1226.4 L42241.8 1229.3 Z"></path>
+					<path d="M47980.3 2712.3 L47851.25 3314 L19454.25 3499.516787809791 L19454.3 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49342.6 2704.6 L49334.3 2711.4 L49332.7 2700.8 L49341.0 2694.0 Z"></path>
+						<path d="M47987.5 2704.2 L47980.3 2712.3 L47977.0 2702.0 L47984.2 2694.0 Z"></path>
 					</g>
-					<path d="M49386.6 2712.2 L49520 3314 L26979.75 3499.3160948675845 L26979.8 3499.3 " fill="none"></path>
+					<path d="M48054.4 2709.6 L48450.5 3314 L24666.25 3499.377644625077 L24666.3 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49389.8 2702.0 L49386.6 2712.2 L49379.4 2704.3 L49382.5 2694.0 Z"></path>
+						<path d="M48053.8 2698.9 L48054.4 2709.6 L48044.9 2704.7 L48044.2 2694.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M47902.7 1740.3 L48006.75 1936 L48006.75 2563.5 L48006.8 2563.5 " fill="none"></path>
+						<path d="M49999.5 1708.9 L48306.5 1936 L48306.5 2563.5 L48306.5 2563.5 " fill="none"></path>
 					</g>
-					<path d="M47907.4 1737.8 L47902.7 1740.3 L47898.0 1742.8 L47896.5 1728.5 Z"></path>
-					<path d="M20927.4 3450.6 L20939.5 3447 L20947 3447 L20947 3447 L20954.5 3500.5 L20954.5 3500.5 L20947 3554 L20947 3554 L20939.5 3554 L20939.5 3554 L20909.5 3545.1080332409974 L20909.5 3545.1 " fill="none"></path>
+					<path d="M50000.2 1714.2 L49999.5 1708.9 L49998.8 1703.6 L50012.8 1707.1 Z"></path>
+					<path d="M19472.1 3450.6 L19484.25 3447 L19491.75 3447 L19491.75 3447 L19499.25 3500.5 L19499.25 3500.5 L19491.75 3554 L19491.75 3554 L19484.25 3554 L19484.25 3554 L19454.25 3545.1080332409974 L19454.3 3545.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20916.9 3448.1 L20927.4 3450.6 L20920.0 3458.4 L20909.5 3455.9 Z"></path>
+						<path d="M19461.7 3448.1 L19472.1 3450.6 L19464.7 3458.4 L19454.3 3455.9 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3120.1 2652.2 L3481.5 3314 L20608.5 3498.8754449428448 L20608.5 3498.9 " fill="none"></path>
+						<path d="M3544.1 2652.2 L3905.5 3314 L19153.25 3498.677179224912 L19153.3 3498.7 " fill="none"></path>
 					</g>
-					<path d="M3124.8 2649.6 L3120.1 2652.2 L3115.4 2654.8 L3113.7 2640.5 Z"></path>
+					<path d="M3548.8 2649.6 L3544.1 2652.2 L3539.4 2654.8 L3537.7 2640.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M50507.2 1221.1 L47880 1459 L47880 1666.5 L47880.0 1666.5 " fill="none"></path>
+						<path d="M49740.4 1265.0 L50084.25 1459 L50084.25 1666.5 L50084.3 1666.5 " fill="none"></path>
 					</g>
-					<path d="M50507.7 1226.4 L50507.2 1221.1 L50506.7 1215.8 L50520.5 1219.9 Z"></path>
-					<path d="M70309.4 2884.5 L70188.5 3314 L63699.5 3499.6275021090573 L63699.5 3499.6 " fill="none"></path>
+					<path d="M49743.0 1260.4 L49740.4 1265.0 L49737.7 1269.7 L49728.8 1258.5 Z"></path>
+					<path d="M71232.3 2883.2 L71015 3314 L64520 3499.6283043444946 L64520.0 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70317.1 2876.9 L70309.4 2884.5 L70306.8 2874.0 L70314.5 2866.5 Z"></path>
+						<path d="M71241.3 2877.2 L71232.3 2883.2 L71231.7 2872.4 L71240.7 2866.5 Z"></path>
 					</g>
-					<path d="M70324.5 2884.7 L70228.5 3314 L59344.75 3499.536836452549 L59344.8 3499.5 " fill="none"></path>
+					<path d="M71247.1 2883.5 L71055 3314 L59764 3499.571403392818 L59764.0 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70331.7 2876.8 L70324.5 2884.7 L70321.3 2874.4 L70328.5 2866.5 Z"></path>
+						<path d="M71255.8 2877.2 L71247.1 2883.5 L71246.0 2872.8 L71254.7 2866.5 Z"></path>
 					</g>
-					<path d="M70448.1 2884.6 L70556.5 3314 L63029 3499.2082783641163 L63029.0 3499.2 " fill="none"></path>
+					<path d="M71428.1 2884.6 L71536.5 3314 L63029.25 3499.3561289757295 L63029.3 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70450.9 2874.2 L70448.1 2884.6 L70440.6 2876.9 L70443.5 2866.5 Z"></path>
+						<path d="M71430.9 2874.2 L71428.1 2884.6 L71420.6 2876.9 L71423.5 2866.5 Z"></path>
 					</g>
-					<path d="M67685.8 669.0 L71067.75 966 L71067.75 1212.5 L71067.75 1212.5 L71067.75 1459 L71067.75 1459 L71067.75 1697.5 L71067.75 1697.5 L71067.75 1936 L71067.75 1936 L70622.68559506531 2383.5 L70622.7 2383.5 " fill="none"></path>
-					<path d="M67686.2 663.6 L67685.8 669.0 L67685.3 674.3 L67672.5 667.8 Z"></path>
-					<path d="M35006.2 2667.8 L34665.75 3314 L34665.75 3469.5 L34665.8 3469.5 " fill="none"></path>
-					<path d="M35010.9 2670.3 L35006.2 2667.8 L35001.5 2665.3 L35012.4 2656.0 Z"></path>
-					<path d="M49712.8 2727.7 L49712.75 3314 L49760.75938337802 3386.5 L49760.8 3386.5 " fill="none"></path>
+					<path d="M69136.0 674.5 L72047.75 966 L72047.75 1212.5 L72047.75 1212.5 L72047.75 1459 L72047.75 1459 L72047.75 1697.5 L72047.75 1697.5 L72047.75 1936 L72047.75 1936 L71602.68559506531 2383.5 L71602.7 2383.5 " fill="none"></path>
+					<path d="M69136.5 669.2 L69136.0 674.5 L69135.5 679.8 L69122.8 673.2 Z"></path>
+					<path d="M38641.4 2668.6 L38426.25 3314 L37044.5 3486.5741670852167 L37044.5 3486.6 " fill="none"></path>
+					<path d="M38646.5 2670.3 L38641.4 2668.6 L38636.4 2667.0 L38645.7 2656.0 Z"></path>
+					<path d="M49775.5 2727.7 L49775.5 3314 L49823.50938337802 3386.5 L49823.5 3386.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49718.1 2718.3 L49712.8 2727.7 L49707.4 2718.3 L49712.8 2709.0 Z"></path>
+						<path d="M49780.8 2718.3 L49775.5 2727.7 L49770.2 2718.3 L49775.5 2709.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M47964.7 1708.5 L49712.75 1936 L49712.75 2541 L49712.8 2541.0 " fill="none"></path>
+						<path d="M50033.6 1736.7 L49775.5 1936 L49775.5 2541 L49775.5 2541.0 " fill="none"></path>
 					</g>
-					<path d="M47965.4 1703.2 L47964.7 1708.5 L47964.0 1713.8 L47951.5 1706.8 Z"></path>
+					<path d="M50036.8 1740.9 L50033.6 1736.7 L50030.3 1732.4 L50044.1 1728.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M47964.7 1707.2 L49959.75 1936 L49959.75 2625 L49959.75 2625 L49959.75 3314 L49959.75 3314 L49911.74061662198 3386.5 L49911.7 3386.5 " fill="none"></path>
+						<path d="M50072.9 1741.4 L50022.5 1936 L50022.5 2625 L50022.5 2625 L50022.5 3314 L50022.5 3314 L49974.49061662198 3386.5 L49974.5 3386.5 " fill="none"></path>
 					</g>
-					<path d="M47965.4 1701.9 L47964.7 1707.2 L47964.1 1712.5 L47951.5 1705.7 Z"></path>
+					<path d="M50078.0 1742.7 L50072.9 1741.4 L50067.7 1740.1 L50076.2 1728.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3121.5 2651.9 L3521.5 3314 L2438 3472.240211433046 L2438.0 3472.2 " fill="none"></path>
+						<path d="M3545.5 2651.9 L3945.5 3314 L2862 3472.240211433046 L2862.0 3472.2 " fill="none"></path>
 					</g>
-					<path d="M3126.1 2649.2 L3121.5 2651.9 L3116.9 2654.7 L3114.6 2640.5 Z"></path>
+					<path d="M3550.1 2649.2 L3545.5 2651.9 L3540.9 2654.7 L3538.6 2640.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M47964.8 1706.0 L50246.75 1936 L50246.75 2563.5 L50246.8 2563.5 " fill="none"></path>
+						<path d="M50122.7 1738.2 L50309.5 1936 L50309.5 2563.5 L50309.5 2563.5 " fill="none"></path>
 					</g>
-					<path d="M47965.3 1700.7 L47964.8 1706.0 L47964.2 1711.3 L47951.5 1704.7 Z"></path>
-					<path d="M43121.3 1747.2 L43121.25 1936 L61918 2612.475835411797 L61918.0 2612.5 " fill="none"></path>
+					<path d="M50126.6 1734.5 L50122.7 1738.2 L50118.8 1741.9 L50113.5 1728.5 Z"></path>
+					<path d="M42140.0 1747.2 L42140 1936 L62148.25 2613.2212097021797 L62148.3 2613.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43126.6 1737.8 L43121.3 1747.2 L43115.9 1737.8 L43121.3 1728.5 Z"></path>
+						<path d="M42145.3 1737.8 L42140.0 1747.2 L42134.7 1737.8 L42140.0 1728.5 Z"></path>
 					</g>
-					<path d="M27564.5 1762.7 L27564.5 1936 L45388.75 2620.2589321781284 L45388.8 2620.3 " fill="none"></path>
+					<path d="M27625.3 1762.7 L27625.25 1936 L45403 2620.2466168563647 L45403.0 2620.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27569.8 1753.3 L27564.5 1762.7 L27559.2 1753.3 L27564.5 1744.0 Z"></path>
+						<path d="M27630.6 1753.3 L27625.3 1762.7 L27619.9 1753.3 L27625.3 1744.0 Z"></path>
 					</g>
-					<path d="M30145.5 1220.7 L27564.5 1459 L27564.5 1651 L27564.5 1651.0 " fill="none"></path>
-					<path d="M30146.0 1226.1 L30145.5 1220.7 L30145.0 1215.4 L30158.8 1219.5 Z"></path>
-					<path d="M55692.3 2742.7 L55692.25 3314 L53377 3486.7694808442534 L53377.0 3486.8 " fill="none"></path>
+					<path d="M30471.5 1222.5 L32584 1459 L27797.25 1689.2273506428032 L27797.3 1689.2 " fill="none"></path>
+					<path d="M30472.1 1217.2 L30471.5 1222.5 L30470.9 1227.8 L30458.3 1221.0 Z"></path>
+					<path d="M55733.8 2742.7 L55733.75 3314 L53016.75 3488.6709755256807 L53016.8 3488.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55697.6 2733.3 L55692.3 2742.7 L55686.9 2733.3 L55692.3 2724.0 Z"></path>
+						<path d="M55739.1 2733.3 L55733.8 2742.7 L55728.4 2733.3 L55733.8 2724.0 Z"></path>
 					</g>
-					<path d="M55744.3 1794.0 L55692.25 1936 L55692.25 2526 L55692.3 2526.0 " fill="none"></path>
-					<path d="M55749.3 1795.9 L55744.3 1794.0 L55739.3 1792.2 L55748.9 1781.5 Z"></path>
-					<path d="M62201.4 2854.5 L62072 3314 L63638.5 3496.9381653099563 L63638.5 3496.9 " fill="none"></path>
+					<path d="M55761.5 1794.6 L55733.75 1936 L55733.75 2526 L55733.8 2526.0 " fill="none"></path>
+					<path d="M55766.7 1795.6 L55761.5 1794.6 L55756.2 1793.6 L55764.0 1781.5 Z"></path>
+					<path d="M62431.6 2854.5 L62302.25 3314 L64459 3497.899359926849 L64459.0 3497.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62209.1 2846.9 L62201.4 2854.5 L62198.8 2844.0 L62206.4 2836.5 Z"></path>
+						<path d="M62439.3 2846.9 L62431.6 2854.5 L62429.0 2844.0 L62436.7 2836.5 Z"></path>
 					</g>
-					<path d="M62214.7 2854.7 L62112 3314 L59344.75 3496.7683488269145 L59344.8 3496.8 " fill="none"></path>
+					<path d="M62444.9 2854.7 L62342.25 3314 L59764 3496.5006641996392 L59764.0 3496.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62221.9 2846.8 L62214.7 2854.7 L62211.5 2844.4 L62218.7 2836.5 Z"></path>
+						<path d="M62452.1 2846.8 L62444.9 2854.7 L62441.7 2844.4 L62449.0 2836.5 Z"></path>
 					</g>
-					<path d="M62324.0 2854.6 L62440 3314 L62931.911528150136 3485 L62931.9 3485.0 " fill="none"></path>
+					<path d="M62554.2 2854.6 L62670.25 3314 L62951.27680965148 3485 L62951.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62326.9 2844.2 L62324.0 2854.6 L62316.5 2846.9 L62319.4 2836.5 Z"></path>
+						<path d="M62557.1 2844.2 L62554.2 2854.6 L62546.8 2846.9 L62549.7 2836.5 Z"></path>
 					</g>
-					<path d="M57819.9 1739.2 L57964.5 1936 L61918 2569.258514471696 L61918.0 2569.3 " fill="none"></path>
-					<path d="M57824.2 1736.1 L57819.9 1739.2 L57815.6 1742.4 L57812.0 1728.5 Z"></path>
-					<path d="M61971.0 1832.4 L61759.75 1936 L62110.59814949202 2413.5 L62110.6 2413.5 " fill="none"></path>
-					<path d="M61973.4 1837.2 L61971.0 1832.4 L61968.7 1827.6 L61983.0 1826.5 Z"></path>
-					<path d="M81398.3 1857.0 L81292.75 1936 L62614 2612.39816311246 L62614.0 2612.4 " fill="none"></path>
-					<path d="M81401.5 1861.3 L81398.3 1857.0 L81395.2 1852.7 L81409.0 1849.0 Z"></path>
+					<path d="M56331.5 1741.8 L56347.75 1936 L62148.25 2586.003171505245 L62148.3 2586.0 " fill="none"></path>
+					<path d="M56336.8 1741.3 L56331.5 1741.8 L56326.1 1742.2 L56330.3 1728.5 Z"></path>
+					<path d="M62675.2 1833.1 L62496.25 1936 L62496.25 2413.5 L62496.3 2413.5 " fill="none"></path>
+					<path d="M62677.9 1837.8 L62675.2 1833.1 L62672.6 1828.5 L62686.8 1826.5 Z"></path>
+					<path d="M82289.7 1831.9 L82088.75 1936 L62844.25 2612.762051805538 L62844.3 2612.8 " fill="none"></path>
+					<path d="M82292.1 1836.6 L82289.7 1831.9 L82287.2 1827.2 L82301.5 1825.8 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M65691.5 1260.6 L65501 1459 L65501 1697.5 L65501 1697.5 L65501 1936 L65501 1936 L62614 2550.8819165378673 L62614.0 2550.9 " fill="none"></path>
+						<path d="M67173.3 1240.2 L66214 1459 L66214 1697.5 L66214 1697.5 L66214 1936 L66214 1936 L62844.25 2560.5061529150694 L62844.3 2560.5 " fill="none"></path>
 					</g>
-					<path d="M65695.4 1264.3 L65691.5 1260.6 L65687.7 1256.9 L65700.8 1251.0 Z"></path>
+					<path d="M67174.4 1245.4 L67173.3 1240.2 L67172.1 1235.0 L67186.3 1237.2 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M82100.1 1263.7 L82036.75 1459 L82036.75 1697.5 L82036.75 1697.5 L82036.75 1936 L82036.75 1936 L62614 2612.872387238724 L62614.0 2612.9 " fill="none"></path>
+						<path d="M83037.6 1263.7 L82974.25 1459 L82974.25 1697.5 L82974.25 1697.5 L82974.25 1936 L82974.25 1936 L62844.25 2613.2912393788456 L62844.3 2613.3 " fill="none"></path>
 					</g>
-					<path d="M82105.2 1265.3 L82100.1 1263.7 L82095.1 1262.0 L82104.3 1251.0 Z"></path>
+					<path d="M83042.7 1265.3 L83037.6 1263.7 L83032.6 1262.0 L83041.8 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41720.2 1252.8 L41932.25 1459 L41932.25 1697.5 L41932.25 1697.5 L41932.25 1936 L41932.25 1936 L61918 2613.208176061966 L61918.0 2613.2 " fill="none"></path>
+						<path d="M42228.6 1232.6 L40991 1459 L40991 1697.5 L40991 1697.5 L40991 1936 L40991 1936 L62148.25 2613.850536496902 L62148.3 2613.9 " fill="none"></path>
 					</g>
-					<path d="M41723.9 1249.0 L41720.2 1252.8 L41716.5 1256.6 L41710.6 1243.5 Z"></path>
-					<path d="M35025.1 2669.3 L34972.25 3314 L34972.25 3469.5 L34972.3 3469.5 " fill="none"></path>
-					<path d="M35030.4 2669.7 L35025.1 2669.3 L35019.8 2668.9 L35026.2 2656.0 Z"></path>
-					<path d="M66121.4 2821.2 L65736.25 3314 L63699.5 3497.7483976297012 L63699.5 3497.7 " fill="none"></path>
+					<path d="M42229.6 1237.8 L42228.6 1232.6 L42227.7 1227.3 L42241.8 1230.2 Z"></path>
+					<path d="M38643.9 2668.9 L38466.25 3314 L38466.25 3469.5 L38466.3 3469.5 " fill="none"></path>
+					<path d="M38649.1 2670.3 L38643.9 2668.9 L38638.8 2667.4 L38647.5 2656.0 Z"></path>
+					<path d="M66828.4 2821.2 L66443.25 3314 L64520 3497.5885476647472 L64520.0 3497.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66131.4 2817.1 L66121.4 2821.2 L66122.9 2810.6 L66132.9 2806.5 Z"></path>
+						<path d="M66838.4 2817.1 L66828.4 2821.2 L66829.9 2810.6 L66839.9 2806.5 Z"></path>
 					</g>
-					<path d="M66132.5 2821.6 L65776.25 3314 L63161 3497.276326914044 L63161.0 3497.3 " fill="none"></path>
+					<path d="M66839.5 2821.6 L66483.25 3314 L63641.25 3497.529432132964 L63641.3 3497.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66142.3 2817.2 L66132.5 2821.6 L66133.6 2810.9 L66143.4 2806.5 Z"></path>
+						<path d="M66849.3 2817.2 L66839.5 2821.6 L66840.6 2810.9 L66850.4 2806.5 Z"></path>
 					</g>
-					<path d="M66143.6 2822.0 L65816.25 3314 L65816.25 3500.5 L65816.25 3500.5 L65816.25 3687 L65816.25 3687 L65816.25 3843.5 L65816.25 3843.5 L65816.25 4000 L65816.25 4000 L60846 4132.691836429745 L60846.0 4132.7 " fill="none"></path>
+					<path d="M66873.8 2822.9 L66606 3314 L66606 3500.5 L66606 3500.5 L66606 3687 L66606 3687 L66606 3843.5 L66606 3843.5 L66606 4000 L66606 4000 L63107.25 4132.1492495243465 L63107.3 4132.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66153.2 2817.2 L66143.6 2822.0 L66144.4 2811.3 L66154.0 2806.5 Z"></path>
+						<path d="M66883.0 2817.2 L66873.8 2822.9 L66873.6 2812.1 L66882.8 2806.5 Z"></path>
 					</g>
-					<path d="M66221.0 2824.5 L66089.25 3314 L66089.25 3500.5 L66089.25 3500.5 L66089.25 3687 L66089.25 3687 L64655.75 3829.530336721728 L64655.8 3829.5 " fill="none"></path>
+					<path d="M66951.9 2825.0 L66879 3314 L66879 3500.5 L66879 3500.5 L66879 3687 L66879 3687 L65519.75 3828.83872312052 L65519.8 3828.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66228.6 2816.9 L66221.0 2824.5 L66218.3 2814.1 L66225.9 2806.5 Z"></path>
+						<path d="M66958.6 2816.5 L66951.9 2825.0 L66948.0 2814.9 L66954.7 2806.5 Z"></path>
 					</g>
-					<path d="M66353.5 2823.9 L66547.75 3314 L63029 3497.758312915646 L63029.0 3497.8 " fill="none"></path>
+					<path d="M67060.5 2823.9 L67254.75 3314 L63029.25 3498.211255259467 L63029.3 3498.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66355.1 2813.2 L66353.5 2823.9 L66345.1 2817.1 L66346.7 2806.5 Z"></path>
+						<path d="M67062.1 2813.2 L67060.5 2823.9 L67052.1 2817.1 L67053.7 2806.5 Z"></path>
 					</g>
-					<path d="M67685.8 668.6 L71107.75 966 L71107.75 1212.5 L71107.75 1212.5 L71107.75 1459 L71107.75 1459 L71107.75 1697.5 L71107.75 1697.5 L71107.75 1936 L71107.75 1936 L66820.75 2547.16139044072 L66820.8 2547.2 " fill="none"></path>
-					<path d="M67686.2 663.2 L67685.8 668.6 L67685.3 673.9 L67672.5 667.4 Z"></path>
+					<path d="M69136.0 674.0 L72087.75 966 L72087.75 1212.5 L72087.75 1212.5 L72087.75 1459 L72087.75 1459 L72087.75 1697.5 L72087.75 1697.5 L72087.75 1936 L72087.75 1936 L67527.75 2551.323149236193 L67527.8 2551.3 " fill="none"></path>
+					<path d="M69136.5 668.6 L69136.0 674.0 L69135.5 679.3 L69122.8 672.6 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M65698.7 1261.4 L65541 1459 L65541 1697.5 L65541 1697.5 L65541 1936 L65541 1936 L66081.4617198839 2443.5 L66081.5 2443.5 " fill="none"></path>
+						<path d="M67173.3 1241.3 L66254 1459 L66254 1697.5 L66254 1697.5 L66254 1936 L66254 1936 L66790.04227140783 2443.5 L66790.0 2443.5 " fill="none"></path>
 					</g>
-					<path d="M65702.9 1264.7 L65698.7 1261.4 L65694.5 1258.1 L65707.0 1251.0 Z"></path>
+					<path d="M67174.5 1246.5 L67173.3 1241.3 L67172.0 1236.1 L67186.3 1238.2 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M82108.4 1264.2 L82076.75 1459 L82076.75 1697.5 L82076.75 1697.5 L82076.75 1936 L82076.75 1936 L66820.75 2601.1932666751045 L66820.8 2601.2 " fill="none"></path>
+						<path d="M83045.9 1264.2 L83014.25 1459 L83014.25 1697.5 L83014.25 1697.5 L83014.25 1936 L83014.25 1936 L67527.75 2601.535537190083 L67527.8 2601.5 " fill="none"></path>
 					</g>
-					<path d="M82113.6 1265.0 L82108.4 1264.2 L82103.1 1263.3 L82110.5 1251.0 Z"></path>
+					<path d="M83051.1 1265.0 L83045.9 1264.2 L83040.6 1263.3 L83048.0 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41725.9 1252.1 L41972.25 1459 L41972.25 1697.5 L41972.25 1697.5 L41972.25 1936 L41972.25 1936 L65728.75 2609.520357987861 L65728.8 2609.5 " fill="none"></path>
+						<path d="M42228.6 1233.2 L41031 1459 L41031 1697.5 L41031 1697.5 L41031 1936 L41031 1936 L66435.75 2610.503540360105 L66435.8 2610.5 " fill="none"></path>
 					</g>
-					<path d="M41729.3 1248.0 L41725.9 1252.1 L41722.4 1256.2 L41715.7 1243.5 Z"></path>
-					<path d="M27605.2 2693.4 L26051.75 3314 L29658.25 3495.6398190656223 L29658.3 3495.6 " fill="none"></path>
+					<path d="M42229.6 1238.4 L42228.6 1233.2 L42227.7 1227.9 L42241.8 1230.7 Z"></path>
+					<path d="M27972.7 1773.8 L27848.25 1936 L27848.25 2609.5 L27848.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27615.9 2694.9 L27605.2 2693.4 L27611.9 2685.0 L27622.5 2686.5 Z"></path>
+						<path d="M27982.6 1769.7 L27972.7 1773.8 L27974.1 1763.2 L27984.1 1759.0 Z"></path>
 					</g>
-					<path d="M27842.5 2700.6 L28378 3314 L30375.75 3493.0606151628017 L30375.8 3493.1 " fill="none"></path>
+					<path d="M28090.4 1773.7 L28216.25 1936 L28216.25 2625 L28216.25 2625 L28216.25 3314 L28216.25 3314 L29511.5 3489.268728460004 L29511.5 3489.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27840.3 2690.0 L27842.5 2700.6 L27832.3 2697.0 L27830.2 2686.5 Z"></path>
+						<path d="M28088.9 1763.1 L28090.4 1773.7 L28080.5 1769.6 L28079.0 1759.0 Z"></path>
 					</g>
-					<path d="M30145.5 1221.5 L27776.5 1459 L27776.5 1697.5 L27776.5 1697.5 L27776.5 1936 L27776.5 1936 L27776.5 2563.5 L27776.5 2563.5 " fill="none"></path>
-					<path d="M30146.0 1226.8 L30145.5 1221.5 L30145.0 1216.1 L30158.8 1220.1 Z"></path>
-					<path d="M54192.5 2771.5 L53987.75 3314 L59231.75 3498.5120271672486 L59231.8 3498.5 " fill="none"></path>
+					<path d="M30471.5 1221.6 L32807 1459 L28225.25 1687.8116787939068 L28225.3 1687.8 " fill="none"></path>
+					<path d="M30472.1 1216.3 L30471.5 1221.6 L30471.0 1226.9 L30458.3 1220.2 Z"></path>
+					<path d="M52678.6 2769.4 L52304.75 3314 L59651 3499.0765762723313 L59651.0 3499.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54200.8 2764.6 L54192.5 2771.5 L54190.8 2760.8 L54199.1 2754.0 Z"></path>
+						<path d="M52688.3 2764.7 L52678.6 2769.4 L52679.5 2758.7 L52689.2 2754.0 Z"></path>
 					</g>
-					<path d="M54303.0 2771.5 L54507.75 3314 L62924 3499.3438376383765 L62924.0 3499.3 " fill="none"></path>
+					<path d="M52936.2 2766.4 L53549.75 3314 L62924.25 3499.4613609844064 L62924.3 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54304.7 2760.8 L54303.0 2771.5 L54294.7 2764.6 L54296.4 2754.0 Z"></path>
+						<path d="M52932.8 2756.2 L52936.2 2766.4 L52925.7 2764.2 L52922.3 2754.0 Z"></path>
 					</g>
-					<path d="M57826.2 1738.4 L58004.5 1936 L54595.75 2561.1756837692155 L54595.8 2561.2 " fill="none"></path>
-					<path d="M57830.1 1734.8 L57826.2 1738.4 L57822.2 1742.0 L57817.2 1728.5 Z"></path>
-					<path d="M35051.3 2667.8 L35391.75 3314 L35391.75 3454.5 L35391.8 3454.5 " fill="none"></path>
-					<path d="M35056.0 2665.3 L35051.3 2667.8 L35046.6 2670.3 L35045.1 2656.0 Z"></path>
-					<path d="M81109.0 2712.7 L81109 3314 L62547 3497.7187815103753 L62547.0 3497.7 " fill="none"></path>
+					<path d="M56338.8 1741.4 L56387.75 1936 L53125.75 2558.581163434903 L53125.8 2558.6 " fill="none"></path>
+					<path d="M56344.0 1740.1 L56338.8 1741.4 L56333.6 1742.7 L56335.5 1728.5 Z"></path>
+					<path d="M38670.6 2668.6 L38885.75 3314 L38885.75 3454.5 L38885.8 3454.5 " fill="none"></path>
+					<path d="M38675.6 2667.0 L38670.6 2668.6 L38665.5 2670.3 L38666.3 2656.0 Z"></path>
+					<path d="M81666.3 2712.7 L81666.25 3314 L62621 3497.788325464071 L62621.0 3497.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81114.3 2703.3 L81109.0 2712.7 L81103.7 2703.3 L81109.0 2694.0 Z"></path>
+						<path d="M81671.6 2703.3 L81666.3 2712.7 L81660.9 2703.3 L81666.3 2694.0 Z"></path>
 					</g>
-					<path d="M81106.7 180.8 L81109 293 L81109 629.5 L81109 629.5 L81109 966 L81109 966 L81109 1212.5 L81109 1212.5 L81109 1459 L81109 1459 L81109 1697.5 L81109 1697.5 L81109 1936 L81109 1936 L81109 2556 L81109.0 2556.0 " fill="none"></path>
-					<path d="M81112.0 180.7 L81106.7 180.8 L81101.3 180.9 L81106.4 167.5 Z"></path>
-					<path d="M50637.9 1270.3 L50755.25 1459 L50755.25 1613.5 L50755.3 1613.5 " fill="none"></path>
-					<path d="M50642.5 1267.5 L50637.9 1270.3 L50633.4 1273.1 L50630.9 1259.0 Z"></path>
-					<path d="M44500.8 1747.2 L44500.75 1936 L53899.75 2600.400430901816 L53899.8 2600.4 " fill="none"></path>
+					<path d="M81956.3 172.6 L81666.25 293 L81666.25 629.5 L81666.25 629.5 L81666.25 966 L81666.25 966 L81666.25 1212.5 L81666.25 1212.5 L81666.25 1459 L81666.25 1459 L81666.25 1697.5 L81666.25 1697.5 L81666.25 1936 L81666.25 1936 L81666.25 2556 L81666.3 2556.0 " fill="none"></path>
+					<path d="M81958.3 177.5 L81956.3 172.6 L81954.2 167.7 L81968.6 167.5 Z"></path>
+					<path d="M49741.9 1229.8 L50992.75 1459 L50992.75 1613.5 L50992.8 1613.5 " fill="none"></path>
+					<path d="M49742.8 1224.6 L49741.9 1229.8 L49740.9 1235.1 L49728.8 1227.4 Z"></path>
+					<path d="M44911.5 1747.2 L44911.5 1936 L52429.75 2594.5188940092166 L52429.8 2594.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44506.1 1737.8 L44500.8 1747.2 L44495.4 1737.8 L44500.8 1728.5 Z"></path>
+						<path d="M44916.8 1737.8 L44911.5 1747.2 L44906.2 1737.8 L44911.5 1728.5 Z"></path>
 					</g>
-					<path d="M50705.3 2725.3 L50380.25 3314 L37900.25 3499.6520698731756 L37900.3 3499.7 " fill="none"></path>
+					<path d="M50768.1 2725.3 L50443 3314 L37198.5 3499.700804420554 L37198.5 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M50714.5 2719.7 L50705.3 2725.3 L50705.2 2714.6 L50714.4 2709.0 Z"></path>
+						<path d="M50777.3 2719.7 L50768.1 2725.3 L50767.9 2714.6 L50777.1 2709.0 Z"></path>
 					</g>
-					<path d="M50777.6 2727.4 L50874.25 3314 L53009 3485.7006469002695 L53009.0 3485.7 " fill="none"></path>
+					<path d="M50840.4 2727.4 L50937 3314 L52648.75 3482.3984570750363 L52648.8 3482.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M50781.4 2717.3 L50777.6 2727.4 L50770.8 2719.1 L50774.6 2709.0 Z"></path>
+						<path d="M50844.1 2717.3 L50840.4 2727.4 L50833.6 2719.1 L50837.3 2709.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M47964.8 1704.5 L50760.75 1936 L50760.75 2541 L50760.8 2541.0 " fill="none"></path>
+						<path d="M50168.4 1724.7 L50823.5 1936 L50823.5 2541 L50823.5 2541.0 " fill="none"></path>
 					</g>
-					<path d="M47965.2 1699.2 L47964.8 1704.5 L47964.3 1709.8 L47951.5 1703.4 Z"></path>
-					<path d="M62266.0 3685.7 L62266 3687 L62266 3843.5 L62266 3843.5 L62266 4000 L62266 4000 L60846 4129.530292716134 L60846.0 4129.5 " fill="none"></path>
+					<path d="M50170.1 1719.6 L50168.4 1724.7 L50166.8 1729.7 L50155.8 1720.6 Z"></path>
+					<path d="M62340.0 3685.7 L62340 3687 L62340 3843.5 L62340 3843.5 L62340 4000 L62340 4000 L63009.25 4124.858336233902 L63009.3 4124.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62271.3 3676.3 L62266.0 3685.7 L62260.7 3676.3 L62266.0 3667.0 Z"></path>
+						<path d="M62345.3 3676.3 L62340.0 3685.7 L62334.7 3676.3 L62340.0 3667.0 Z"></path>
 					</g>
-					<path d="M48207.4 3264.2 L48167.25 3314 L61985 3496.7828974199842 L61985.0 3496.8 " fill="none"></path>
-					<path d="M48211.5 3267.5 L48207.4 3264.2 L48203.2 3260.8 L48215.8 3253.8 Z"></path>
+					<path d="M48507.4 3292.1 L48490.5 3314 L62059 3496.716000577638 L62059.0 3496.7 " fill="none"></path>
+					<path d="M48511.6 3295.4 L48507.4 3292.1 L48503.1 3288.9 L48515.5 3281.6 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M52797.8 2669.3 L52797.75 3314 L61985 3494.9650278562563 L61985.0 3495.0 " fill="none"></path>
+						<path d="M51791.8 2669.3 L51791.75 3314 L62059 3495.5317351219396 L62059.0 3495.5 " fill="none"></path>
 					</g>
-					<path d="M52803.1 2669.3 L52797.8 2669.3 L52792.4 2669.3 L52797.8 2656.0 Z"></path>
-					<path d="M65071.9 2889.8 L64806.25 3314 L63699.5 3495.4982413717303 L63699.5 3495.5 " fill="none"></path>
+					<path d="M51797.1 2669.3 L51791.8 2669.3 L51786.4 2669.3 L51791.8 2656.0 Z"></path>
+					<path d="M65738.1 2888.7 L65404.75 3314 L64520 3494.2850314121824 L64520.0 3494.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65081.4 2884.7 L65071.9 2889.8 L65072.3 2879.1 L65081.8 2874.0 Z"></path>
+						<path d="M65748.0 2884.6 L65738.1 2888.7 L65739.6 2878.1 L65749.6 2874.0 Z"></path>
 					</g>
-					<path d="M65087.0 2890.2 L64846.25 3314 L63161 3495.544620938628 L63161.0 3495.5 " fill="none"></path>
+					<path d="M65753.1 2889.1 L65444.75 3314 L63641.25 3495.861449040281 L63641.3 3495.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65096.3 2884.7 L65087.0 2890.2 L65087.0 2879.5 L65096.3 2874.0 Z"></path>
+						<path d="M65762.9 2884.7 L65753.1 2889.1 L65754.3 2878.4 L65764.1 2874.0 Z"></path>
 					</g>
-					<path d="M65102.2 2890.6 L64886.25 3314 L64908.34115281501 3394 L64908.3 3394.0 " fill="none"></path>
+					<path d="M65768.1 2889.5 L65484.75 3314 L65553.3827077748 3394 L65553.4 3394.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65111.2 2884.7 L65102.2 2890.6 L65101.7 2879.9 L65110.7 2874.0 Z"></path>
+						<path d="M65777.8 2884.7 L65768.1 2889.5 L65768.9 2878.8 L65778.5 2874.0 Z"></path>
 					</g>
-					<path d="M65117.5 2891.0 L64926.25 3314 L59344.75 3498.631030507272 L59344.8 3498.6 " fill="none"></path>
+					<path d="M65783.2 2889.9 L65524.75 3314 L59764 3498.6886200524305 L59764.0 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65126.2 2884.7 L65117.5 2891.0 L65116.5 2880.3 L65125.2 2874.0 Z"></path>
+						<path d="M65792.7 2884.7 L65783.2 2889.9 L65783.6 2879.2 L65793.0 2874.0 Z"></path>
 					</g>
-					<path d="M65368.3 2890.8 L65576.25 3314 L65576.25 3500.5 L65576.25 3500.5 L65576.25 3687 L65576.25 3687 L65576.25 3843.5 L65576.25 3843.5 L65576.25 4000 L65576.25 4000 L60846 4132.626144269499 L60846.0 4132.6 " fill="none"></path>
+					<path d="M66075.3 2890.8 L66283.25 3314 L66283.25 3500.5 L66283.25 3500.5 L66283.25 3687 L66283.25 3687 L66283.25 3843.5 L66283.25 3843.5 L66283.25 4000 L66283.25 4000 L63107.25 4131.964031007752 L63107.3 4132.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65369.0 2880.0 L65368.3 2890.8 L65359.4 2884.7 L65360.1 2874.0 Z"></path>
+						<path d="M66076.0 2880.0 L66075.3 2890.8 L66066.4 2884.7 L66067.1 2874.0 Z"></path>
 					</g>
-					<path d="M65383.5 2890.4 L65616.25 3314 L65616.25 3500.5 L65616.25 3500.5 L65616.25 3687 L65616.25 3687 L64655.75 3823.528837420527 L64655.8 3823.5 " fill="none"></path>
+					<path d="M66090.5 2890.4 L66323.25 3314 L66323.25 3500.5 L66323.25 3500.5 L66323.25 3687 L66323.25 3687 L65519.75 3820.2073622881358 L65519.8 3820.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65383.7 2879.6 L65383.5 2890.4 L65374.4 2884.7 L65374.5 2874.0 Z"></path>
+						<path d="M66090.7 2879.6 L66090.5 2890.4 L66081.4 2884.7 L66081.5 2874.0 Z"></path>
 					</g>
-					<path d="M65398.7 2890.0 L65656.25 3314 L63029 3496.846207668626 L63029.0 3496.8 " fill="none"></path>
+					<path d="M66105.7 2890.0 L66363.25 3314 L63029.25 3497.6087405876274 L63029.3 3497.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65398.4 2879.2 L65398.7 2890.0 L65389.3 2884.7 L65389.0 2874.0 Z"></path>
+						<path d="M66105.4 2879.2 L66105.7 2890.0 L66096.3 2884.7 L66096.0 2874.0 Z"></path>
 					</g>
-					<path d="M67685.8 668.2 L71147.75 966 L71147.75 1212.5 L71147.75 1212.5 L71147.75 1459 L71147.75 1459 L71147.75 1697.5 L71147.75 1697.5 L71147.75 1936 L71147.75 1936 L65688.75 2572.421489001692 L65688.8 2572.4 " fill="none"></path>
-					<path d="M67686.2 662.8 L67685.8 668.2 L67685.3 673.5 L67672.5 667.0 Z"></path>
-					<path d="M61992.9 1832.8 L61799.75 1936 L64786.75 2534.6163467132055 L64786.8 2534.6 " fill="none"></path>
-					<path d="M61995.4 1837.5 L61992.9 1832.8 L61990.4 1828.1 L62004.6 1826.5 Z"></path>
+					<path d="M69136.0 673.4 L72127.75 966 L72127.75 1212.5 L72127.75 1212.5 L72127.75 1459 L72127.75 1459 L72127.75 1697.5 L72127.75 1697.5 L72127.75 1936 L72127.75 1936 L66395.75 2574.7430050137473 L66395.8 2574.7 " fill="none"></path>
+					<path d="M69136.5 668.1 L69136.0 673.4 L69135.5 678.7 L69122.8 672.1 Z"></path>
+					<path d="M62757.2 1835.4 L62644.75 1936 L65493.75 2530.8366666666666 L65493.8 2530.8 " fill="none"></path>
+					<path d="M62760.7 1839.4 L62757.2 1835.4 L62753.6 1831.4 L62767.1 1826.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M65709.6 1262.6 L65599.5 1459 L65599.5 1697.5 L65599.5 1697.5 L65599.5 1936 L65599.5 1936 L65368.48403483309 2376 L65368.5 2376.0 " fill="none"></path>
+						<path d="M67195.3 1256.4 L66736.25 1459 L66736.25 1697.5 L66736.25 1697.5 L66736.25 1936 L66736.25 1936 L66230.7928156749 2376 L66230.8 2376.0 " fill="none"></path>
 					</g>
-					<path d="M65714.3 1265.2 L65709.6 1262.6 L65705.0 1260.0 L65716.2 1251.0 Z"></path>
+					<path d="M67197.5 1261.3 L67195.3 1256.4 L67193.2 1251.5 L67207.5 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M82116.8 1264.3 L82116.75 1459 L82116.75 1697.5 L82116.75 1697.5 L82116.75 1936 L82116.75 1936 L65688.75 2606.5902008412822 L65688.8 2606.6 " fill="none"></path>
+						<path d="M83054.3 1264.3 L83054.25 1459 L83054.25 1697.5 L83054.25 1697.5 L83054.25 1936 L83054.25 1936 L66395.75 2606.838218533563 L66395.8 2606.8 " fill="none"></path>
 					</g>
-					<path d="M82122.1 1264.3 L82116.8 1264.3 L82111.4 1264.3 L82116.8 1251.0 Z"></path>
+					<path d="M83059.6 1264.3 L83054.3 1264.3 L83048.9 1264.3 L83054.3 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41731.4 1251.4 L42012.25 1459 L42012.25 1697.5 L42012.25 1697.5 L42012.25 1936 L42012.25 1936 L64786.75 2611.620783190889 L64786.8 2611.6 " fill="none"></path>
+						<path d="M42268.6 1249.8 L41878 1459 L41878 1697.5 L41878 1697.5 L41878 1936 L41878 1936 L65493.75 2612.0884519097926 L65493.8 2612.1 " fill="none"></path>
 					</g>
-					<path d="M41734.6 1247.1 L41731.4 1251.4 L41728.2 1255.7 L41720.7 1243.5 Z"></path>
-					<path d="M64937.8 3625.7 L64937.75 3687 L64655.75 3791.456804733728 L64655.8 3791.5 " fill="none"></path>
+					<path d="M42271.1 1254.5 L42268.6 1249.8 L42266.1 1245.1 L42280.4 1243.5 Z"></path>
+					<path d="M65644.8 3625.7 L65644.75 3687 L65519.75 3760.6817325800375 L65519.8 3760.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64943.1 3616.3 L64937.8 3625.7 L64932.4 3616.3 L64937.8 3607.0 Z"></path>
+						<path d="M65650.1 3616.3 L65644.8 3625.7 L65639.4 3616.3 L65644.8 3607.0 Z"></path>
 					</g>
-					<path d="M65355.9 3397.7 L65696.25 3314 L65403.448838896955 2874 L65403.4 2874.0 " fill="none"></path>
+					<path d="M66062.9 3397.7 L66403.25 3314 L66110.44883889695 2874 L66110.4 2874.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65345.5 3394.7 L65355.9 3397.7 L65348.1 3405.1 L65337.8 3402.1 Z"></path>
+						<path d="M66052.5 3394.7 L66062.9 3397.7 L66055.1 3405.1 L66044.8 3402.1 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M65859.3 1239.2 L66860.75 1459 L66860.75 1697.5 L66860.75 1697.5 L66860.75 1936 L66860.75 1936 L66860.75 2625 L66860.75 2625 L66860.75 3314 L66860.75 3314 L65337.75 3461.7064482579303 L65337.8 3461.7 " fill="none"></path>
+						<path d="M67347.3 1259.9 L67567.75 1459 L67567.75 1697.5 L67567.75 1697.5 L67567.75 1936 L67567.75 1936 L67567.75 2625 L67567.75 2625 L67567.75 3314 L67567.75 3314 L66044.75 3461.7064482579303 L66044.8 3461.7 " fill="none"></path>
 					</g>
-					<path d="M65860.4 1234.0 L65859.3 1239.2 L65858.1 1244.4 L65846.3 1236.3 Z"></path>
+					<path d="M67350.9 1256.0 L67347.3 1259.9 L67343.7 1263.9 L67337.4 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M82125.1 1264.2 L82156.75 1459 L82156.75 1697.5 L82156.75 1697.5 L82156.75 1936 L82156.75 1936 L82156.75 2625 L82156.75 2625 L82156.75 3314 L82156.75 3314 L65337.75 3496.1675765143154 L65337.8 3496.2 " fill="none"></path>
+						<path d="M83062.6 1264.2 L83094.25 1459 L83094.25 1697.5 L83094.25 1697.5 L83094.25 1936 L83094.25 1936 L83094.25 2625 L83094.25 2625 L83094.25 3314 L83094.25 3314 L66044.75 3496.224805868363 L66044.8 3496.2 " fill="none"></path>
 					</g>
-					<path d="M82130.4 1263.3 L82125.1 1264.2 L82119.9 1265.0 L82123.0 1251.0 Z"></path>
+					<path d="M83067.9 1263.3 L83062.6 1264.2 L83057.4 1265.0 L83060.5 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41788.3 1235.4 L42859.25 1459 L42859.25 1697.5 L42859.25 1697.5 L42859.25 1936 L42859.25 1936 L42859.25 2625 L42859.25 2625 L42859.25 3314 L42859.25 3314 L64537.75 3497.1211472699683 L64537.8 3497.1 " fill="none"></path>
+						<path d="M42349.6 1256.4 L42402 1459 L42402 1697.5 L42402 1697.5 L42402 1936 L42402 1936 L42402 2625 L42402 2625 L42402 3314 L42402 3314 L65244.75 3497.2903970055177 L65244.8 3497.3 " fill="none"></path>
 					</g>
-					<path d="M41789.4 1230.2 L41788.3 1235.4 L41787.2 1240.6 L41775.3 1232.7 Z"></path>
-					<path d="M69651.8 1755.6 L68513 1936 L68513 2625 L68513 2625 L68513 3314 L68513 3314 L63699.5 3499.325712221305 L63699.5 3499.3 " fill="none"></path>
+					<path d="M42354.8 1255.1 L42349.6 1256.4 L42344.4 1257.7 L42346.3 1243.5 Z"></path>
+					<path d="M71189.9 1734.9 L69220 1936 L69220 2625 L69220 2625 L69220 3314 L69220 3314 L64520 3499.2975372582177 L64520.0 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69661.9 1759.4 L69651.8 1755.6 L69660.2 1748.8 L69670.3 1752.6 Z"></path>
+						<path d="M71199.8 1739.3 L71189.9 1734.9 L71198.7 1728.7 L71208.5 1733.0 Z"></path>
 					</g>
-					<path d="M69651.8 1757.1 L68553 1936 L68553 2625 L68553 2625 L68553 3314 L68553 3314 L71323.5 3492.417904005525 L71323.5 3492.4 " fill="none"></path>
+					<path d="M71189.9 1735.6 L69260 1936 L69260 2625 L69260 2625 L69260 3314 L69260 3314 L71743 3491.5271228675483 L71743.0 3491.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69661.9 1760.9 L69651.8 1757.1 L69660.2 1750.4 L69670.3 1754.1 Z"></path>
+						<path d="M71199.8 1739.9 L71189.9 1735.6 L71198.7 1729.3 L71208.5 1733.6 Z"></path>
 					</g>
-					<path d="M69964.9 1897.0 L69954.5 1936 L69954.5 2625 L69954.5 2625 L69954.5 3314 L69954.5 3314 L69954.5 3500.5 L69954.5 3500.5 L69954.5 3687 L69954.5 3687 L69954.5 3843.5 L69954.5 3843.5 L69954.5 4000 L69954.5 4000 L71281.25 4120.593182974394 L71281.3 4120.6 " fill="none"></path>
+					<path d="M71189.9 1736.2 L69300 1936 L69300 2625 L69300 2625 L69300 3314 L69300 3314 L69300 3500.5 L69300 3500.5 L69300 3687 L69300 3687 L69300 3843.5 L69300 3843.5 L69300 4000 L69300 4000 L72021.75 4127.111440271848 L72021.8 4127.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69972.5 1889.4 L69964.9 1897.0 L69962.2 1886.6 L69969.7 1879.0 Z"></path>
+						<path d="M71199.8 1740.6 L71189.9 1736.2 L71198.7 1730.0 L71208.5 1734.3 Z"></path>
 					</g>
-					<path d="M69998.3 1897.6 L69994.5 1936 L69994.5 2625 L69994.5 2625 L69994.5 3314 L69994.5 3314 L63161 3499.2529616977977 L63161.0 3499.3 " fill="none"></path>
+					<path d="M71189.9 1736.9 L69340 1936 L69340 2625 L69340 2625 L69340 3314 L69340 3314 L63641.25 3499.0066364941904 L63641.3 3499.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70004.6 1888.8 L69998.3 1897.6 L69993.9 1887.8 L70000.2 1879.0 Z"></path>
+						<path d="M71199.8 1741.2 L71189.9 1736.9 L71198.6 1730.6 L71208.5 1734.9 Z"></path>
 					</g>
-					<path d="M70311.1 1889.2 L70382.5 1936 L70382.5 2383.5 L70382.5 2383.5 " fill="none"></path>
+					<path d="M71397.1 1893.5 L71362.5 1936 L71362.5 2383.5 L71362.5 2383.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70306.2 1879.7 L70311.1 1889.2 L70300.3 1888.6 L70295.4 1879.0 Z"></path>
+						<path d="M71407.1 1889.6 L71397.1 1893.5 L71398.8 1882.9 L71408.9 1879.0 Z"></path>
 					</g>
-					<path d="M70383.1 1872.1 L70516.5 1936 L65688.75 2566.133980582524 L65688.8 2566.1 " fill="none"></path>
+					<path d="M71506.3 1897.1 L71496.5 1936 L66395.75 2569.0286396181386 L66395.8 2569.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70377.0 1863.3 L70383.1 1872.1 L70372.4 1872.9 L70366.3 1864.1 Z"></path>
+						<path d="M71513.7 1889.4 L71506.3 1897.1 L71503.4 1886.8 L71510.8 1879.0 Z"></path>
 					</g>
-					<path d="M70383.3 1859.3 L70556.5 1936 L66820.75 2537.1401296198983 L66820.8 2537.1 " fill="none"></path>
+					<path d="M71539.7 1897.6 L71536.5 1936 L67527.75 2542.406224271365 L67527.8 2542.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70376.9 1850.6 L70383.3 1859.3 L70372.6 1860.4 L70366.3 1851.7 Z"></path>
+						<path d="M71545.8 1888.7 L71539.7 1897.6 L71535.2 1887.9 L71541.3 1879.0 Z"></path>
 					</g>
-					<path d="M70383.5 1848.2 L70596.5 1936 L64019 2582.721013200143 L64019.0 2582.7 " fill="none"></path>
+					<path d="M71573.3 1897.6 L71576.5 1936 L65159.25 2581.731534557669 L65159.3 2581.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70376.9 1839.7 L70383.5 1848.2 L70372.8 1849.5 L70366.3 1841.0 Z"></path>
+						<path d="M71577.8 1887.9 L71573.3 1897.6 L71567.2 1888.7 L71571.7 1879.0 Z"></path>
 					</g>
-					<path d="M70383.7 1838.5 L70636.5 1936 L67914 2533.0090706556334 L67914.0 2533.0 " fill="none"></path>
+					<path d="M71606.7 1897.1 L71616.5 1936 L68621 2540.3629575402633 L68621.0 2540.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70376.9 1830.1 L70383.7 1838.5 L70373.0 1840.1 L70366.3 1831.7 Z"></path>
+						<path d="M71609.6 1886.8 L71606.7 1897.1 L71599.3 1889.4 L71602.2 1879.0 Z"></path>
 					</g>
-					<path d="M70384.0 1813.5 L70770.5 1936 L70770.5 2625 L70770.5 2625 L70770.5 3314 L70770.5 3314 L63029 3499.2437451886067 L63029.0 3499.2 " fill="none"></path>
+					<path d="M71715.9 1893.5 L71750.5 1936 L71750.5 2625 L71750.5 2625 L71750.5 3314 L71750.5 3314 L63029.25 3499.384029063969 L63029.3 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70376.8 1805.6 L70384.0 1813.5 L70373.5 1815.7 L70366.3 1807.8 Z"></path>
+						<path d="M71714.2 1882.9 L71715.9 1893.5 L71705.9 1889.6 L71704.1 1879.0 Z"></path>
 					</g>
-					<path d="M67685.8 667.8 L71187.75 966 L71187.75 1212.5 L71187.75 1212.5 L71187.75 1459 L71187.75 1459 L70366.25 1626.5312099187688 L70366.3 1626.5 " fill="none"></path>
-					<path d="M67686.2 662.4 L67685.8 667.8 L67685.3 673.1 L67672.5 666.6 Z"></path>
+					<path d="M69136.0 672.9 L72167.75 966 L72167.75 1212.5 L72167.75 1212.5 L72167.75 1459 L72167.75 1459 L71904.5 1561.7159509202454 L71904.5 1561.7 " fill="none"></path>
+					<path d="M69136.5 667.6 L69136.0 672.9 L69135.5 678.2 L69122.8 671.6 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M65859.3 1238.3 L66900.75 1459 L69670.25 1670.8767441860466 L69670.3 1670.9 " fill="none"></path>
+						<path d="M67354.1 1259.2 L67607.75 1459 L71208.5 1676.4811965811966 L71208.5 1676.5 " fill="none"></path>
 					</g>
-					<path d="M65860.4 1233.0 L65859.3 1238.3 L65858.2 1243.5 L65846.3 1235.5 Z"></path>
-					<path d="M62031.3 1836.7 L61878 1936 L61878 2625 L61878 2625 L61878 3314 L61878 3314 L61878 3500.5 L61878 3500.5 L61878 3687 L61878 3687 L61878 3843.5 L61878 3843.5 L61878 4000 L61878 4000 L60846 4127.925994449583 L60846.0 4127.9 " fill="none"></path>
+					<path d="M67357.4 1255.1 L67354.1 1259.2 L67350.8 1263.4 L67343.6 1251.0 Z"></path>
+					<path d="M62894.5 1845.0 L62884.25 1936 L62884.25 2625 L62884.25 2625 L62884.25 3314 L62884.25 3314 L62884.25 3500.5 L62884.25 3500.5 L62884.25 3687 L62884.25 3687 L62884.25 3843.5 L62884.25 3843.5 L62884.25 4000 L62884.25 4000 L63038.12313432836 4118.5 L63038.1 4118.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62042.0 1836.1 L62031.3 1836.7 L62036.2 1827.1 L62047.0 1826.5 Z"></path>
+						<path d="M62900.9 1836.4 L62894.5 1845.0 L62890.3 1835.2 L62896.6 1826.5 Z"></path>
 					</g>
-					<path d="M62482.8 1835.9 L62654 1936 L62654 2625 L62654 2625 L62654 3314 L62654 3314 L62654 3500.5 L62654 3500.5 L62654 3687 L62654 3687 L64374.75 3831.6862995298857 L64374.8 3831.7 " fill="none"></path>
+					<path d="M63007.0 1842.1 L63069.25 1936 L63069.25 2625 L63069.25 2625 L63069.25 3314 L63069.25 3314 L63069.25 3500.5 L63069.25 3500.5 L63069.25 3687 L63069.25 3687 L65238.75 3833.981277056277 L65238.8 3834.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62477.4 1826.6 L62482.8 1835.9 L62472.0 1835.8 L62466.7 1826.5 Z"></path>
+						<path d="M63006.3 1831.3 L63007.0 1842.1 L62997.4 1837.2 L62996.7 1826.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M65859.3 1237.4 L66940.75 1459 L62562 1681.4467490281697 L62562.0 1681.4 " fill="none"></path>
+						<path d="M67360.8 1258.6 L67647.75 1459 L63227.25 1681.5882508181146 L63227.3 1681.6 " fill="none"></path>
 					</g>
-					<path d="M65860.4 1232.2 L65859.3 1237.4 L65858.2 1242.6 L65846.3 1234.7 Z"></path>
+					<path d="M67363.9 1254.3 L67360.8 1258.6 L67357.8 1263.0 L67349.9 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41788.4 1231.2 L43121.25 1459 L61930 1693.5592426044784 L61930.0 1693.6 " fill="none"></path>
+						<path d="M42447.6 1241.9 L43256.25 1459 L62595.25 1693.665555838209 L62595.3 1693.7 " fill="none"></path>
 					</g>
-					<path d="M41789.3 1226.0 L41788.4 1231.2 L41787.5 1236.5 L41775.3 1229.0 Z"></path>
+					<path d="M42449.0 1236.7 L42447.6 1241.9 L42446.2 1247.0 L42434.8 1238.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M50693.9 1265.7 L51027.75 1459 L51027.75 1697.5 L51027.75 1697.5 L51027.75 1936 L51027.75 1936 L51027.75 2625 L51027.75 2625 L51027.75 3314 L51027.75 3314 L53009 3484.6514836623946 L53009.0 3484.7 " fill="none"></path>
+						<path d="M49741.9 1227.9 L51161.75 1459 L51161.75 1697.5 L51161.75 1697.5 L51161.75 1936 L51161.75 1936 L51161.75 2625 L51161.75 2625 L51161.75 3314 L51161.75 3314 L52648.75 3479.9637941352485 L52648.8 3480.0 " fill="none"></path>
 					</g>
-					<path d="M50696.5 1261.1 L50693.9 1265.7 L50691.2 1270.3 L50682.3 1259.0 Z"></path>
-					<path d="M52425.8 1778.9 L51263.75 1936 L51263.75 2625 L51263.75 2625 L51263.75 3314 L51263.75 3314 L33004.5 3498.664404918455 L33004.5 3498.7 " fill="none"></path>
+					<path d="M49742.8 1222.6 L49741.9 1227.9 L49741.1 1233.2 L49728.8 1225.8 Z"></path>
+					<path d="M53471.1 1747.5 L51201.75 1936 L51201.75 2625 L51201.75 2625 L51201.75 3314 L51201.75 3314 L34092.5 3498.5423203157757 L34092.5 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M52435.7 1783.0 L52425.8 1778.9 L52434.3 1772.4 L52444.3 1776.4 Z"></path>
+						<path d="M53480.9 1752.1 L53471.1 1747.5 L53480.0 1741.5 L53489.8 1746.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M50696.8 1222.1 L53028.25 1459 L53028.25 1568.5 L53028.3 1568.5 " fill="none"></path>
+						<path d="M49742.1 1217.8 L54073.75 1459 L54073.75 1568.5 L54073.8 1568.5 " fill="none"></path>
 					</g>
-					<path d="M50697.3 1216.8 L50696.8 1222.1 L50696.2 1227.4 L50683.5 1220.8 Z"></path>
-					<path d="M52431.1 1789.2 L51475.75 1936 L51475.75 2541 L51475.8 2541.0 " fill="none"></path>
-					<path d="M52431.9 1794.5 L52431.1 1789.2 L52430.3 1784.0 L52444.3 1787.2 Z"></path>
-					<path d="M52431.2 1821.9 L51883.75 1936 L51883.75 2556 L51883.8 2556.0 " fill="none"></path>
-					<path d="M52432.3 1827.1 L52431.2 1821.9 L52430.1 1816.7 L52444.3 1819.2 Z"></path>
-					<path d="M52651.9 1831.0 L52355.75 1936 L52355.75 2556 L52355.8 2556.0 " fill="none"></path>
-					<path d="M52653.7 1836.0 L52651.9 1831.0 L52650.2 1825.9 L52664.5 1826.5 Z"></path>
-					<path d="M53151.5 1836.5 L53239.75 1936 L53239.75 2548.5 L53239.8 2548.5 " fill="none"></path>
-					<path d="M53155.5 1832.9 L53151.5 1836.5 L53147.5 1840.0 L53142.6 1826.5 Z"></path>
-					<path d="M53687.8 2787.7 L53687.75 3314 L22146 3500.3286863631683 L22146.0 3500.3 " fill="none"></path>
+					<path d="M49742.4 1212.5 L49742.1 1217.8 L49741.8 1223.1 L49728.8 1217.0 Z"></path>
+					<path d="M53476.5 1751.1 L51413.75 1936 L51413.75 2541 L51413.8 2541.0 " fill="none"></path>
+					<path d="M53476.9 1756.4 L53476.5 1751.1 L53476.0 1745.7 L53489.8 1749.9 Z"></path>
+					<path d="M53476.5 1773.3 L52193.75 1936 L52193.75 2556 L52193.8 2556.0 " fill="none"></path>
+					<path d="M53477.2 1778.6 L53476.5 1773.3 L53475.9 1768.0 L53489.8 1771.6 Z"></path>
+					<path d="M53697.7 1831.0 L53401.75 1936 L53401.75 2556 L53401.8 2556.0 " fill="none"></path>
+					<path d="M53699.5 1836.0 L53697.7 1831.0 L53695.9 1825.9 L53710.3 1826.5 Z"></path>
+					<path d="M53979.8 1837.6 L53913.75 1936 L53913.75 2548.5 L53913.8 2548.5 " fill="none"></path>
+					<path d="M53984.2 1840.5 L53979.8 1837.6 L53975.4 1834.6 L53987.2 1826.5 Z"></path>
+					<path d="M54361.8 2787.7 L54361.75 3314 L21358 3500.3362685516645 L21358.0 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53693.1 2778.3 L53687.8 2787.7 L53682.4 2778.3 L53687.8 2769.0 Z"></path>
+						<path d="M54367.1 2778.3 L54361.8 2787.7 L54356.4 2778.3 L54361.8 2769.0 Z"></path>
 					</g>
-					<path d="M53397.5 1831.0 L53687.75 1936 L53687.75 2481 L53687.8 2481.0 " fill="none"></path>
-					<path d="M53399.3 1826.0 L53397.5 1831.0 L53395.7 1836.0 L53385.0 1826.5 Z"></path>
-					<path d="M54807.8 2727.7 L54807.75 3314 L55297.59852546917 3485 L55297.6 3485.0 " fill="none"></path>
+					<path d="M54239.8 1835.0 L54361.75 1936 L54361.75 2481 L54361.8 2481.0 " fill="none"></path>
+					<path d="M54243.2 1830.9 L54239.8 1835.0 L54236.4 1839.1 L54229.5 1826.5 Z"></path>
+					<path d="M54745.8 2727.7 L54745.75 3314 L54800.76340482574 3485 L54800.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54813.1 2718.3 L54807.8 2727.7 L54802.4 2718.3 L54807.8 2709.0 Z"></path>
+						<path d="M54751.1 2718.3 L54745.8 2727.7 L54740.4 2718.3 L54745.8 2709.0 Z"></path>
 					</g>
-					<path d="M53625.5 1777.5 L54807.75 1936 L54807.75 2541 L54807.8 2541.0 " fill="none"></path>
-					<path d="M53626.2 1772.3 L53625.5 1777.5 L53624.8 1782.8 L53612.3 1775.8 Z"></path>
-					<path d="M27992.5 1762.7 L27992.5 1936 L48215.75 2608.1653300208636 L48215.8 2608.2 " fill="none"></path>
+					<path d="M54449.8 1831.0 L54745.75 1936 L54745.75 2541 L54745.8 2541.0 " fill="none"></path>
+					<path d="M54451.6 1825.9 L54449.8 1831.0 L54448.0 1836.0 L54437.2 1826.5 Z"></path>
+					<path d="M28441.3 1762.7 L28441.25 1936 L48515.5 2608.0434507974687 L48515.5 2608.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27997.8 1753.3 L27992.5 1762.7 L27987.2 1753.3 L27992.5 1744.0 Z"></path>
+						<path d="M28446.6 1753.3 L28441.3 1762.7 L28435.9 1753.3 L28441.3 1744.0 Z"></path>
 					</g>
-					<path d="M30145.5 1222.3 L27992.5 1459 L27992.5 1651 L27992.5 1651.0 " fill="none"></path>
-					<path d="M30146.1 1227.6 L30145.5 1222.3 L30144.9 1217.0 L30158.8 1220.9 Z"></path>
-					<path d="M28384.5 1785.2 L28384.5 1936 L48215.75 2607.840850143207 L48215.8 2607.8 " fill="none"></path>
+					<path d="M30471.5 1220.8 L33032 1459 L28617.25 1688.3563960137233 L28617.3 1688.4 " fill="none"></path>
+					<path d="M30472.0 1215.5 L30471.5 1220.8 L30471.0 1226.1 L30458.3 1219.6 Z"></path>
+					<path d="M28833.3 1785.2 L28833.25 1936 L48515.5 2607.7142096464613 L48515.5 2607.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28389.8 1775.8 L28384.5 1785.2 L28379.2 1775.8 L28384.5 1766.5 Z"></path>
+						<path d="M28838.6 1775.8 L28833.3 1785.2 L28827.9 1775.8 L28833.3 1766.5 Z"></path>
 					</g>
-					<path d="M30145.5 1224.4 L28384.5 1459 L28384.5 1628.5 L28384.5 1628.5 " fill="none"></path>
-					<path d="M30146.2 1229.7 L30145.5 1224.4 L30144.8 1219.1 L30158.8 1222.6 Z"></path>
-					<path d="M33021.9 3422.0 L33034.5 3417 L33042 3417 L33042 3417 L33049.5 3500.5 L33049.5 3500.5 L33042 3584 L33042 3584 L33034.5 3584 L33034.5 3584 L33004.5 3572.1560283687945 L33004.5 3572.2 " fill="none"></path>
+					<path d="M30471.5 1220.2 L33248 1459 L29009.25 1687.9918738320403 L29009.3 1688.0 " fill="none"></path>
+					<path d="M30472.0 1214.9 L30471.5 1220.2 L30471.1 1225.5 L30458.3 1219.0 Z"></path>
+					<path d="M34109.9 3422.0 L34122.5 3417 L34130 3417 L34130 3417 L34137.5 3500.5 L34137.5 3500.5 L34130 3584 L34130 3584 L34122.5 3584 L34122.5 3584 L34092.5 3572.1560283687945 L34092.5 3572.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33011.2 3420.5 L33021.9 3422.0 L33015.1 3430.4 L33004.5 3428.8 Z"></path>
+						<path d="M34099.2 3420.5 L34109.9 3422.0 L34103.1 3430.4 L34092.5 3428.8 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3122.9 2651.6 L3561.5 3314 L32641.5 3499.343198400629 L32641.5 3499.3 " fill="none"></path>
+						<path d="M3546.9 2651.6 L3985.5 3314 L33729.5 3499.368866017276 L33729.5 3499.4 " fill="none"></path>
 					</g>
-					<path d="M3127.3 2648.7 L3122.9 2651.6 L3118.4 2654.6 L3115.5 2640.5 Z"></path>
-					<path d="M28776.5 1762.7 L28776.5 1936 L48215.75 2607.5036160585587 L48215.8 2607.5 " fill="none"></path>
+					<path d="M3551.3 2648.7 L3546.9 2651.6 L3542.4 2654.6 L3539.5 2640.5 Z"></path>
+					<path d="M29225.3 1762.7 L29225.25 1936 L48515.5 2607.3719297359416 L48515.5 2607.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28781.8 1753.3 L28776.5 1762.7 L28771.2 1753.3 L28776.5 1744.0 Z"></path>
+						<path d="M29230.6 1753.3 L29225.3 1762.7 L29219.9 1753.3 L29225.3 1744.0 Z"></path>
 					</g>
-					<path d="M30145.6 1227.6 L28776.5 1459 L28776.5 1651 L28776.5 1651.0 " fill="none"></path>
-					<path d="M30146.5 1232.8 L30145.6 1227.6 L30144.7 1222.3 L30158.8 1225.3 Z"></path>
-					<path d="M55220.3 1747.2 L55220.25 1936 L49228.75 2571.2944752231456 L49228.8 2571.3 " fill="none"></path>
+					<path d="M30471.5 1219.6 L33464 1459 L29401.25 1687.597080507225 L29401.3 1687.6 " fill="none"></path>
+					<path d="M30472.0 1214.3 L30471.5 1219.6 L30471.1 1225.0 L30458.3 1218.6 Z"></path>
+					<path d="M55221.0 1747.2 L55221 1936 L49528.5 2568.704065171802 L49528.5 2568.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55225.6 1737.8 L55220.3 1747.2 L55214.9 1737.8 L55220.3 1728.5 Z"></path>
+						<path d="M55226.3 1737.8 L55221.0 1747.2 L55215.7 1737.8 L55221.0 1728.5 Z"></path>
 					</g>
-					<path d="M29168.5 1762.7 L29168.5 1936 L48215.75 2607.1528607044684 L48215.8 2607.2 " fill="none"></path>
+					<path d="M29617.3 1762.7 L29617.25 1936 L48515.5 2607.0158208686016 L48515.5 2607.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29173.8 1753.3 L29168.5 1762.7 L29163.2 1753.3 L29168.5 1744.0 Z"></path>
+						<path d="M29622.6 1753.3 L29617.3 1762.7 L29611.9 1753.3 L29617.3 1744.0 Z"></path>
 					</g>
-					<path d="M30154.7 1231.0 L29168.5 1459 L29168.5 1651 L29168.5 1651.0 " fill="none"></path>
-					<path d="M30155.9 1236.2 L30154.7 1231.0 L30153.5 1225.8 L30167.7 1228.0 Z"></path>
-					<path d="M29560.5 1762.7 L29560.5 1936 L48215.75 2606.787754250003 L48215.8 2606.8 " fill="none"></path>
+					<path d="M30471.5 1219.2 L33680 1459 L29793.25 1687.1680819641867 L29793.3 1687.2 " fill="none"></path>
+					<path d="M30471.9 1213.9 L30471.5 1219.2 L30471.1 1224.5 L30458.3 1218.2 Z"></path>
+					<path d="M30424.3 1762.7 L30424.25 1936 L48515.5 2606.2354451479346 L48515.5 2606.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29565.8 1753.3 L29560.5 1762.7 L29555.2 1753.3 L29560.5 1744.0 Z"></path>
+						<path d="M30429.6 1753.3 L30424.3 1762.7 L30418.9 1753.3 L30424.3 1744.0 Z"></path>
 					</g>
-					<path d="M30179.8 1232.6 L29560.5 1459 L29560.5 1651 L29560.5 1651.0 " fill="none"></path>
-					<path d="M30181.7 1237.6 L30179.8 1232.6 L30178.0 1227.6 L30192.4 1228.0 Z"></path>
-					<path d="M48365.0 3310.6 L48363.25 3314 L33004.5 3498.3218014510708 L33004.5 3498.3 " fill="none"></path>
+					<path d="M30471.6 1218.4 L34103.5 1459 L30600.25 1686.0911530882652 L30600.3 1686.1 " fill="none"></path>
+					<path d="M30471.9 1213.1 L30471.6 1218.4 L30471.2 1223.7 L30458.3 1217.5 Z"></path>
+					<path d="M48533.9 3309.2 L48530.5 3314 L34092.5 3498.184616436951 L34092.5 3498.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48374.1 3304.7 L48365.0 3310.6 L48364.6 3299.8 L48373.7 3294.0 Z"></path>
+						<path d="M48543.7 3304.7 L48533.9 3309.2 L48535.0 3298.5 L48544.8 3294.0 Z"></path>
 					</g>
-					<path d="M48404.7 3310.9 L48403.25 3314 L59231.75 3499.5319476343593 L59231.8 3499.5 " fill="none"></path>
+					<path d="M48573.4 3309.6 L48570.5 3314 L59651 3499.5538520247824 L59651.0 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48413.4 3304.7 L48404.7 3310.9 L48403.7 3300.2 L48412.5 3294.0 Z"></path>
+						<path d="M48583.0 3304.7 L48573.4 3309.6 L48574.0 3298.9 L48583.6 3294.0 Z"></path>
 					</g>
-					<path d="M48961.7 3311.6 L48962.5 3314 L48962.5 3500.5 L48962.5 3500.5 L48962.5 3687 L48962.5 3687 L48962.5 3843.5 L48962.5 3843.5 L48962.5 4000 L48962.5 4000 L60748 4133.445181460983 L60748.0 4133.4 " fill="none"></path>
+					<path d="M48713.6 3311.0 L48712.25 3314 L48712.25 3500.5 L48712.25 3500.5 L48712.25 3687 L48712.25 3687 L48712.25 3843.5 L48712.25 3843.5 L48712.25 4000 L48712.25 4000 L63009.25 4133.542311445699 L63009.3 4133.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48963.6 3301.1 L48961.7 3311.6 L48953.6 3304.6 L48955.5 3294.0 Z"></path>
+						<path d="M48722.3 3304.7 L48713.6 3311.0 L48712.5 3300.3 L48721.2 3294.0 Z"></path>
 					</g>
-					<path d="M49023.5 3311.1 L49024.75 3314 L26128.5 3499.93965338936 L26128.5 3499.9 " fill="none"></path>
+					<path d="M48947.4 3312.6 L48947.25 3314 L24338.25 3499.9785436421103 L24338.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49024.6 3300.4 L49023.5 3311.1 L49014.8 3304.7 L49016.0 3294.0 Z"></path>
+						<path d="M48953.7 3303.9 L48947.4 3312.6 L48943.1 3302.7 L48949.4 3294.0 Z"></path>
 					</g>
-					<path d="M49063.1 3310.7 L49064.75 3314 L62924 3499.796188473772 L62924.0 3499.8 " fill="none"></path>
+					<path d="M49377.0 3310.6 L49378.75 3314 L62924.25 3499.7799492572435 L62924.3 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49063.7 3300.0 L49063.1 3310.7 L49054.2 3304.7 L49054.8 3294.0 Z"></path>
+						<path d="M49377.4 3299.8 L49377.0 3310.6 L49367.9 3304.7 L49368.4 3294.0 Z"></path>
 					</g>
-					<path d="M57832.2 1737.6 L58044.5 1936 L49228.75 2587.5649923569954 L49228.8 2587.6 " fill="none"></path>
-					<path d="M57835.8 1733.7 L57832.2 1737.6 L57828.5 1741.5 L57822.4 1728.5 Z"></path>
+					<path d="M56417.7 1733.5 L56924.25 1936 L49528.5 2580.8380840899745 L49528.5 2580.8 " fill="none"></path>
+					<path d="M56419.6 1728.5 L56417.7 1733.5 L56415.7 1738.4 L56405.3 1728.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M82133.4 1263.7 L82196.75 1459 L82196.75 1697.5 L82196.75 1697.5 L82196.75 1936 L82196.75 1936 L49228.75 2614.574795740041 L49228.8 2614.6 " fill="none"></path>
+						<path d="M83070.9 1263.7 L83134.25 1459 L83134.25 1697.5 L83134.25 1697.5 L83134.25 1936 L83134.25 1936 L49528.5 2614.769701500194 L49528.5 2614.8 " fill="none"></path>
 					</g>
-					<path d="M82138.4 1262.0 L82133.4 1263.7 L82128.3 1265.3 L82129.2 1251.0 Z"></path>
-					<path d="M56347.3 1754.7 L56347.25 1936 L49228.75 2579.2323278688523 L49228.8 2579.2 " fill="none"></path>
+					<path d="M83075.9 1262.0 L83070.9 1263.7 L83065.8 1265.3 L83066.7 1251.0 Z"></path>
+					<path d="M57151.3 1754.7 L57151.25 1936 L49528.5 2582.0712550358276 L49528.5 2582.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56352.6 1745.3 L56347.3 1754.7 L56341.9 1745.3 L56347.3 1736.0 Z"></path>
+						<path d="M57156.6 1745.3 L57151.3 1754.7 L57145.9 1745.3 L57151.3 1736.0 Z"></path>
 					</g>
-					<path d="M55876.4 1794.7 L56016.75 1936 L56016.75 2609.5 L56016.8 2609.5 " fill="none"></path>
+					<path d="M55852.6 1796.6 L55954 1936 L56055.904753265604 2609.5 L56055.9 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55873.6 1784.4 L55876.4 1794.7 L55866.0 1791.9 L55863.2 1781.5 Z"></path>
+						<path d="M55851.4 1785.9 L55852.6 1796.6 L55842.8 1792.2 L55841.6 1781.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M50696.8 1217.0 L55779.75 1459 L55779.75 1613.5 L55779.8 1613.5 " fill="none"></path>
+						<path d="M49742.1 1216.3 L55780.5 1459 L55780.5 1613.5 L55780.5 1613.5 " fill="none"></path>
 					</g>
-					<path d="M50697.1 1211.7 L50696.8 1217.0 L50696.6 1222.3 L50683.5 1216.4 Z"></path>
-					<path d="M81611.5 1285.2 L81611.5 1459 L81611.5 1546 L81611.5 1546.0 " fill="none"></path>
+					<path d="M49742.3 1211.0 L49742.1 1216.3 L49741.9 1221.6 L49728.8 1215.8 Z"></path>
+					<path d="M82549.0 1285.2 L82549 1459 L82549 1546 L82549.0 1546.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81616.8 1275.8 L81611.5 1285.2 L81606.2 1275.8 L81611.5 1266.5 Z"></path>
+						<path d="M82554.3 1275.8 L82549.0 1285.2 L82543.7 1275.8 L82549.0 1266.5 Z"></path>
 					</g>
-					<path d="M81214.5 170.1 L81611.5 293 L81611.5 629.5 L81611.5 629.5 L81611.5 966 L81611.5 966 L81611.5 1158.5 L81611.5 1158.5 " fill="none"></path>
-					<path d="M81216.1 165.1 L81214.5 170.1 L81212.9 175.2 L81201.8 166.2 Z"></path>
-					<path d="M81463.9 1862.9 L81398.75 1936 L81398.75 2625 L81398.75 2625 L81398.75 3314 L81398.75 3314 L59344.75 3500.02342778318 L59344.8 3500.0 " fill="none"></path>
+					<path d="M82152.0 170.1 L82549 293 L82549 629.5 L82549 629.5 L82549 966 L82549 966 L82549 1158.5 L82549.0 1158.5 " fill="none"></path>
+					<path d="M82153.6 165.1 L82152.0 170.1 L82150.4 175.2 L82139.3 166.2 Z"></path>
+					<path d="M82285.3 1847.2 L82128.75 1936 L82128.75 2625 L82128.75 2625 L82128.75 3314 L82128.75 3314 L59764 3500.030032892903 L59764.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81474.1 1859.5 L81463.9 1862.9 L81466.2 1852.4 L81476.4 1849.0 Z"></path>
+						<path d="M82296.0 1847.2 L82285.3 1847.2 L82290.8 1837.9 L82301.5 1838.0 Z"></path>
 					</g>
-					<path d="M81640.0 1867.4 L81651.5 1936 L81651.5 2625 L81651.5 2625 L81651.5 3314 L81651.5 3314 L71784.5 3498.9071040996782 L71784.5 3498.9 " fill="none"></path>
+					<path d="M82577.5 1867.4 L82589 1936 L82589 2625 L82589 2625 L82589 3314 L82589 3314 L72204 3498.985912129895 L72204.0 3499.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81643.7 1857.3 L81640.0 1867.4 L81633.2 1859.1 L81636.9 1849.0 Z"></path>
+						<path d="M82581.2 1857.3 L82577.5 1867.4 L82570.7 1859.1 L82574.4 1849.0 Z"></path>
 					</g>
-					<path d="M34657.5 1707.5 L36840.25 1936 L35110.25435413643 2594 L35110.3 2594.0 " fill="none"></path>
-					<path d="M34658.1 1702.2 L34657.5 1707.5 L34657.0 1712.8 L34644.3 1706.1 Z"></path>
-					<path d="M46092.8 3923.2 L46092.75 4000 L18421.25 4133.652242867699 L18421.3 4133.7 " fill="none"></path>
+					<path d="M34203.6 1702.5 L38656 1936 L38656 2594 L38656.0 2594.0 " fill="none"></path>
+					<path d="M34203.8 1697.2 L34203.6 1702.5 L34203.3 1707.8 L34190.3 1701.8 Z"></path>
+					<path d="M45394.5 3923.2 L45394.5 4000 L18216.75 4133.645941705887 L18216.8 4133.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M46098.1 3913.8 L46092.8 3923.2 L46087.4 3913.8 L46092.8 3904.5 Z"></path>
+						<path d="M45399.8 3913.8 L45394.5 3923.2 L45389.2 3913.8 L45394.5 3904.5 Z"></path>
 					</g>
-					<path d="M58006.8 2674.7 L58006.75 3314 L27921.75 3499.5870241127245 L27921.8 3499.6 " fill="none"></path>
+					<path d="M57409.8 2674.7 L57409.75 3314 L25916.25 3499.62766461767 L25916.3 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58012.1 2665.3 L58006.8 2674.7 L58001.4 2665.3 L58006.8 2656.0 Z"></path>
+						<path d="M57415.1 2665.3 L57409.8 2674.7 L57404.4 2665.3 L57409.8 2656.0 Z"></path>
 					</g>
-					<path d="M58307.3 2697.7 L58307.25 3314 L21936.75 3500.3181412404547 L21936.8 3500.3 " fill="none"></path>
+					<path d="M57710.3 2697.7 L57710.25 3314 L21260 3500.3185387445783 L21260.0 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58312.6 2688.3 L58307.3 2697.7 L58301.9 2688.3 L58307.3 2679.0 Z"></path>
+						<path d="M57715.6 2688.3 L57710.3 2697.7 L57704.9 2688.3 L57710.3 2679.0 Z"></path>
 					</g>
-					<path d="M69032.3 2827.9 L68596.25 3314 L71323.5 3492.295372885812 L71323.5 3492.3 " fill="none"></path>
+					<path d="M69832.2 2828.4 L69428.5 3314 L71743 3490.9074795081965 L71743.0 3490.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69042.5 2824.5 L69032.3 2827.9 L69034.5 2817.4 L69044.7 2814.0 Z"></path>
+						<path d="M69842.3 2824.6 L69832.2 2828.4 L69834.1 2817.8 L69844.1 2814.0 Z"></path>
 					</g>
-					<path d="M69043.7 2828.3 L68636.25 3314 L68636.25 3500.5 L68636.25 3500.5 L68636.25 3687 L68636.25 3687 L68636.25 3843.5 L68636.25 3843.5 L68636.25 4000 L68636.25 4000 L71281.25 4126.922112802149 L71281.3 4126.9 " fill="none"></path>
+					<path d="M69843.7 2828.8 L69468.5 3314 L69468.5 3500.5 L69468.5 3500.5 L69468.5 3687 L69468.5 3687 L69468.5 3843.5 L69468.5 3843.5 L69468.5 4000 L69468.5 4000 L72021.75 4126.681662501157 L72021.8 4126.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69053.8 2824.6 L69043.7 2828.3 L69045.6 2817.7 L69055.7 2814.0 Z"></path>
+						<path d="M69853.6 2824.6 L69843.7 2828.8 L69845.2 2818.1 L69855.1 2814.0 Z"></path>
 					</g>
-					<path d="M69196.2 2832.6 L69154.25 3314 L69154.25 3439 L69154.3 3439.0 " fill="none"></path>
+					<path d="M69983.2 2832.6 L69941.25 3314 L69941.25 3439 L69941.3 3439.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69202.3 2823.8 L69196.2 2832.6 L69191.7 2822.8 L69197.8 2814.0 Z"></path>
+						<path d="M69989.3 2823.8 L69983.2 2832.6 L69978.7 2822.8 L69984.8 2814.0 Z"></path>
 					</g>
-					<path d="M69352.8 2829.5 L69681 3314 L63161 3499.1934206518426 L63161.0 3499.2 " fill="none"></path>
+					<path d="M70261.2 2825.4 L70895 3314 L63641.25 3499.3247542724066 L63641.3 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69351.9 2818.7 L69352.8 2829.5 L69343.1 2824.7 L69342.3 2814.0 Z"></path>
+						<path d="M70257.1 2815.5 L70261.2 2825.4 L70250.6 2823.9 L70246.4 2814.0 Z"></path>
 					</g>
-					<path d="M69364.3 2829.0 L69721 3314 L71614.5 3492.487616881476 L71614.5 3492.5 " fill="none"></path>
+					<path d="M70272.4 2825.1 L70935 3314 L72034 3487.111064189189 L72034.0 3487.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69363.1 2818.4 L69364.3 2829.0 L69354.5 2824.7 L69353.3 2814.0 Z"></path>
+						<path d="M70268.1 2815.3 L70272.4 2825.1 L70261.7 2823.8 L70257.4 2814.0 Z"></path>
 					</g>
-					<path d="M69375.8 2828.6 L69761 3314 L37746.25 3499.751534124052 L37746.3 3499.8 " fill="none"></path>
+					<path d="M70283.6 2824.8 L70975 3314 L40519.25 3499.71338248637 L40519.3 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69374.2 2818.0 L69375.8 2828.6 L69365.9 2824.6 L69364.2 2814.0 Z"></path>
+						<path d="M70279.1 2815.0 L70283.6 2824.8 L70272.9 2823.7 L70268.4 2814.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M82542.0 173.1 L82281.5 293 L82281.5 629.5 L82281.5 629.5 L82281.5 966 L82281.5 966 L82281.5 1212.5 L82281.5 1212.5 L82281.5 1459 L82281.5 1459 L82281.5 1697.5 L82281.5 1697.5 L82281.5 1936 L82281.5 1936 L69521.25 2608.8127379517496 L69521.3 2608.8 " fill="none"></path>
+						<path d="M83479.5 173.1 L83219 293 L83219 629.5 L83219 629.5 L83219 966 L83219 966 L83219 1212.5 L83219 1212.5 L83219 1459 L83219 1459 L83219 1697.5 L83219 1697.5 L83219 1936 L83219 1936 L70308.25 2608.9970494221784 L70308.3 2609.0 " fill="none"></path>
 					</g>
-					<path d="M82544.3 177.9 L82542.0 173.1 L82539.8 168.2 L82554.2 167.5 Z"></path>
+					<path d="M83481.8 177.9 L83479.5 173.1 L83477.3 168.2 L83491.7 167.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3124.2 2651.3 L3601.5 3314 L27625.75 3499.3581120913445 L27625.8 3499.4 " fill="none"></path>
+						<path d="M3548.2 2651.3 L4025.5 3314 L25620.25 3499.230519368525 L25620.3 3499.2 " fill="none"></path>
 					</g>
-					<path d="M3128.5 2648.2 L3124.2 2651.3 L3119.9 2654.4 L3116.4 2640.5 Z"></path>
-					<path d="M56632.0 1832.8 L56436.25 1936 L56436.25 2609.5 L56436.3 2609.5 " fill="none"></path>
+					<path d="M3552.5 2648.2 L3548.2 2651.3 L3543.9 2654.4 L3540.4 2640.5 Z"></path>
+					<path d="M57986.3 1756.0 L57191.25 1936 L57191.25 2609.5 L57191.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56642.7 1833.1 L56632.0 1832.8 L56637.8 1823.7 L56648.5 1824.1 Z"></path>
+						<path d="M57996.6 1759.1 L57986.3 1756.0 L57994.2 1748.7 L58004.5 1751.8 Z"></path>
 					</g>
-					<path d="M56798.3 1857.8 L56754.25 1936 L56754.25 2609.5 L56754.3 2609.5 " fill="none"></path>
+					<path d="M58154.3 1857.8 L58110.25 1936 L58110.25 2609.5 L58110.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56807.5 1852.2 L56798.3 1857.8 L56798.2 1847.0 L56807.4 1841.5 Z"></path>
+						<path d="M58163.5 1852.2 L58154.3 1857.8 L58154.2 1847.0 L58163.4 1841.5 Z"></path>
 					</g>
-					<path d="M56952.3 1858.9 L56982.75 1936 L56982.75 2625 L56982.75 2625 L56982.75 3314 L56982.75 3314 L21936.75 3500.3112751735243 L21936.8 3500.3 " fill="none"></path>
+					<path d="M58308.3 1858.9 L58338.75 1936 L58338.75 2625 L58338.75 2625 L58338.75 3314 L58338.75 3314 L21260 3500.3216116451226 L21260.0 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56953.8 1848.2 L56952.3 1858.9 L56943.9 1852.1 L56945.4 1841.5 Z"></path>
+						<path d="M58309.8 1848.2 L58308.3 1858.9 L58299.9 1852.1 L58301.4 1841.5 Z"></path>
 					</g>
-					<path d="M57089.2 1852.9 L57196.5 1936 L68907.25 2607.399117971334 L68907.3 2607.4 " fill="none"></path>
+					<path d="M58334.7 1857.8 L58378.75 1936 L69694.25 2606.8005592600557 L69694.3 2606.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57085.1 1843.0 L57089.2 1852.9 L57078.6 1851.4 L57074.5 1841.5 Z"></path>
+						<path d="M58334.8 1847.0 L58334.7 1857.8 L58325.5 1852.2 L58325.6 1841.5 Z"></path>
 					</g>
-					<path d="M2855.7 3401.2 L2869 3394.5 L2876.5 3394.5 L2876.5 3394.5 L2884 3500.5 L2884 3500.5 L2876.5 3606.5 L2876.5 3606.5 L2869 3606.5 L2869 3606.5 L2839 3591.393111638955 L2839.0 3591.4 " fill="none"></path>
+					<path d="M3279.7 3401.2 L3293 3394.5 L3300.5 3394.5 L3300.5 3394.5 L3308 3500.5 L3308 3500.5 L3300.5 3606.5 L3300.5 3606.5 L3293 3606.5 L3293 3606.5 L3263 3591.393111638955 L3263.0 3591.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2844.9 3400.6 L2855.7 3401.2 L2849.7 3410.2 L2839.0 3409.6 Z"></path>
+						<path d="M3268.9 3400.6 L3279.7 3401.2 L3273.7 3410.2 L3263.0 3409.6 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3125.5 2651.0 L3641.5 3314 L2839 3466.254577822991 L2839.0 3466.3 " fill="none"></path>
+						<path d="M3549.5 2651.0 L4065.5 3314 L3263 3466.254577822991 L3263.0 3466.3 " fill="none"></path>
 					</g>
-					<path d="M3129.7 2647.7 L3125.5 2651.0 L3121.3 2654.3 L3117.3 2640.5 Z"></path>
-					<path d="M59400.3 2738.5 L58975.75 3314 L63638.5 3499.2879933947693 L63638.5 3499.3 " fill="none"></path>
+					<path d="M3553.7 2647.7 L3549.5 2651.0 L3545.3 2654.3 L3541.3 2640.5 Z"></path>
+					<path d="M58860.0 2741.1 L58658.75 3314 L64459 3499.524439394589 L64459.0 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59410.1 2734.2 L59400.3 2738.5 L59401.5 2727.8 L59411.3 2723.5 Z"></path>
+						<path d="M58868.1 2734.1 L58860.0 2741.1 L58858.0 2730.5 L58866.2 2723.5 Z"></path>
 					</g>
-					<path d="M59416.0 2739.6 L59075.25 3314 L59075.25 3485 L59075.3 3485.0 " fill="none"></path>
+					<path d="M58866.6 2741.4 L58698.75 3314 L58698.75 3485 L58698.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59425.4 2734.2 L59416.0 2739.6 L59416.2 2728.8 L59425.6 2723.5 Z"></path>
+						<path d="M58874.4 2734.0 L58866.6 2741.4 L58864.1 2731.0 L58871.9 2723.5 Z"></path>
 					</g>
-					<path d="M59552.5 2739.5 L59896 3314 L59898.979892761396 3485 L59899.0 3485.0 " fill="none"></path>
+					<path d="M58934.9 2741.4 L59102.75 3314 L59832.36528150134 3485 L59832.4 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59552.3 2728.8 L59552.5 2739.5 L59543.1 2734.2 L59542.9 2723.5 Z"></path>
+						<path d="M58937.4 2731.0 L58934.9 2741.4 L58927.1 2734.0 L58929.6 2723.5 Z"></path>
 					</g>
-					<path d="M30324.1 1215.3 L38039.25 1459 L38039.25 1666.5 L38039.3 1666.5 " fill="none"></path>
-					<path d="M30324.2 1210.0 L30324.1 1215.3 L30323.9 1220.7 L30310.8 1214.9 Z"></path>
+					<path d="M30471.6 1215.1 L39003.25 1459 L39003.25 1666.5 L39003.3 1666.5 " fill="none"></path>
+					<path d="M30471.7 1209.7 L30471.6 1215.1 L30471.4 1220.4 L30458.3 1214.7 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M82484.8 1434.5 L82447 1459 L81069 1676.578947368421 L81069.0 1676.6 " fill="none"></path>
+						<path d="M83422.3 1434.5 L83384.5 1459 L81971.25 1677.0560407569142 L81971.3 1677.1 " fill="none"></path>
 					</g>
-					<path d="M82487.7 1438.9 L82484.8 1434.5 L82481.9 1430.0 L82496.0 1427.2 Z"></path>
-					<path d="M81867.5 2749.8 L81752.25 3314 L81752.25 3500.5 L81752.25 3500.5 L81752.25 3687 L81752.25 3687 L81752.25 3843.5 L81752.25 3843.5 L81752.25 4000 L81752.25 4000 L82346.25 4122.738627602159 L82346.3 4122.7 " fill="none"></path>
+					<path d="M83425.2 1438.9 L83422.3 1434.5 L83419.4 1430.0 L83433.5 1427.2 Z"></path>
+					<path d="M82805.0 2749.8 L82689.75 3314 L82689.75 3500.5 L82689.75 3500.5 L82689.75 3687 L82689.75 3687 L82689.75 3843.5 L82689.75 3843.5 L82689.75 4000 L82689.75 4000 L83283.75 4122.738627602159 L83283.8 4122.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81874.6 2741.7 L81867.5 2749.8 L81864.2 2739.6 L81871.2 2731.5 Z"></path>
+						<path d="M82812.1 2741.7 L82805.0 2749.8 L82801.7 2739.6 L82808.7 2731.5 Z"></path>
 					</g>
-					<path d="M81874.7 2750.0 L81792.25 3314 L81792.25 3500.5 L81792.25 3500.5 L81792.25 3687 L81792.25 3687 L81792.25 3843.5 L81792.25 3843.5 L81792.25 4000 L81792.25 4000 L76403 4130.950541728999 L76403.0 4131.0 " fill="none"></path>
+					<path d="M82812.2 2750.0 L82729.75 3314 L82729.75 3500.5 L82729.75 3500.5 L82729.75 3687 L82729.75 3687 L82729.75 3843.5 L82729.75 3843.5 L82729.75 4000 L82729.75 4000 L77107.5 4131.074159453699 L77107.5 4131.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81881.4 2741.5 L81874.7 2750.0 L81870.8 2740.0 L81877.4 2731.5 Z"></path>
+						<path d="M82818.9 2741.5 L82812.2 2750.0 L82808.3 2740.0 L82814.9 2731.5 Z"></path>
 					</g>
-					<path d="M81882.0 2750.1 L81832.25 3314 L81832.25 3500.5 L81832.25 3500.5 L81832.25 3687 L81832.25 3687 L81832.25 3843.5 L81832.25 3843.5 L81832.25 4000 L81832.25 4000 L71576.25 4132.100158600471 L71576.3 4132.1 " fill="none"></path>
+					<path d="M82819.5 2750.1 L82769.75 3314 L82769.75 3500.5 L82769.75 3500.5 L82769.75 3687 L82769.75 3687 L82769.75 3843.5 L82769.75 3843.5 L82769.75 4000 L82769.75 4000 L72316.75 4132.13546530824 L72316.8 4132.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81888.1 2741.3 L81882.0 2750.1 L81877.5 2740.3 L81883.6 2731.5 Z"></path>
+						<path d="M82825.6 2741.3 L82819.5 2750.1 L82815.0 2740.3 L82821.1 2731.5 Z"></path>
 					</g>
-					<path d="M81900.3 2750.1 L81933 3314 L71574.5 3498.267479015643 L71574.5 3498.3 " fill="none"></path>
+					<path d="M82837.8 2750.1 L82870.5 3314 L71994 3498.372591347028 L71994.0 3498.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81905.0 2740.5 L81900.3 2750.1 L81894.4 2741.1 L81899.2 2731.5 Z"></path>
+						<path d="M82842.5 2740.5 L82837.8 2750.1 L82831.9 2741.1 L82836.7 2731.5 Z"></path>
 					</g>
-					<path d="M81911.3 2750.0 L81993.75 3314 L63699.5 3500.1895864882194 L63699.5 3500.2 " fill="none"></path>
+					<path d="M82848.8 2750.0 L82931.25 3314 L64520 3500.1915558447545 L64520.0 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81915.2 2740.0 L81911.3 2750.0 L81904.6 2741.5 L81908.6 2731.5 Z"></path>
+						<path d="M82852.7 2740.0 L82848.8 2750.0 L82842.1 2741.5 L82846.1 2731.5 Z"></path>
 					</g>
-					<path d="M82503.8 1446.8 L82487 1459 L82487 1697.5 L82487 1697.5 L82487 1936 L82487 1936 L81984.81567489114 2518.5 L81984.8 2518.5 " fill="none"></path>
-					<path d="M82506.9 1451.1 L82503.8 1446.8 L82500.7 1442.5 L82514.6 1439.0 Z"></path>
+					<path d="M83441.3 1446.8 L83424.5 1459 L83424.5 1697.5 L83424.5 1697.5 L83424.5 1936 L83424.5 1936 L82922.31567489114 2518.5 L82922.3 2518.5 " fill="none"></path>
+					<path d="M83444.4 1451.1 L83441.3 1446.8 L83438.2 1442.5 L83452.1 1439.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80936.5 1741.8 L80936.5 1936 L81745.15203193034 2518.5 L81745.2 2518.5 " fill="none"></path>
+						<path d="M81838.8 1741.8 L81838.75 1936 L82677.20337445573 2518.5 L82677.2 2518.5 " fill="none"></path>
 					</g>
-					<path d="M80941.8 1741.8 L80936.5 1741.8 L80931.2 1741.8 L80936.5 1728.5 Z"></path>
-					<path d="M82739.3 2750.0 L82661.75 3314 L63699.5 3500.2005041397374 L63699.5 3500.2 " fill="none"></path>
+					<path d="M81844.1 1741.8 L81838.8 1741.8 L81833.4 1741.8 L81838.8 1728.5 Z"></path>
+					<path d="M83676.8 2750.0 L83599.25 3314 L64520 3500.20233781185 L64520.0 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82745.9 2741.5 L82739.3 2750.0 L82735.3 2740.0 L82741.9 2731.5 Z"></path>
+						<path d="M83683.4 2741.5 L83676.8 2750.0 L83672.8 2740.0 L83679.4 2731.5 Z"></path>
 					</g>
-					<path d="M82746.6 2750.1 L82701.75 3314 L82701.75 3500.5 L82701.75 3500.5 L82701.75 3687 L82701.75 3687 L82701.75 3843.5 L82701.75 3843.5 L82701.75 4000 L82701.75 4000 L76403 4131.382262520917 L76403.0 4131.4 " fill="none"></path>
+					<path d="M83684.1 2750.1 L83639.25 3314 L83639.25 3500.5 L83639.25 3500.5 L83639.25 3687 L83639.25 3687 L83639.25 3843.5 L83639.25 3843.5 L83639.25 4000 L83639.25 4000 L77107.5 4131.4738818581245 L77107.5 4131.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82752.6 2741.2 L82746.6 2750.1 L82742.0 2740.4 L82748.0 2731.5 Z"></path>
+						<path d="M83690.1 2741.2 L83684.1 2750.1 L83679.5 2740.4 L83685.5 2731.5 Z"></path>
 					</g>
-					<path d="M82770.1 2750.1 L82831.25 3314 L71574.5 3498.4436622811836 L71574.5 3498.4 " fill="none"></path>
+					<path d="M83707.6 2750.1 L83768.75 3314 L71994 3498.533171572026 L71994.0 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82774.4 2740.2 L82770.1 2750.1 L82763.8 2741.4 L82768.1 2731.5 Z"></path>
+						<path d="M83711.9 2740.2 L83707.6 2750.1 L83701.3 2741.4 L83705.6 2731.5 Z"></path>
 					</g>
-					<path d="M82816.1 1785.9 L82756.5 1936 L82756.5 2518.5 L82756.5 2518.5 " fill="none"></path>
-					<path d="M82821.1 1787.9 L82816.1 1785.9 L82811.2 1783.9 L82821.1 1773.5 Z"></path>
+					<path d="M83753.6 1785.9 L83694 1936 L83694 2518.5 L83694.0 2518.5 " fill="none"></path>
+					<path d="M83758.6 1787.9 L83753.6 1785.9 L83748.7 1783.9 L83758.6 1773.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M82541.0 1447.5 L82527 1459 L82527 1697.5 L82527 1697.5 L82527 1936 L82527 1936 L82527 2625 L82527 2625 L82527 3314 L82527 3314 L71574.5 3498.3871863152194 L71574.5 3498.4 " fill="none"></path>
+						<path d="M83478.5 1447.5 L83464.5 1459 L83464.5 1697.5 L83464.5 1697.5 L83464.5 1936 L83464.5 1936 L83464.5 2625 L83464.5 2625 L83464.5 3314 L83464.5 3314 L71994 3498.4815669196273 L71994.0 3498.5 " fill="none"></path>
 					</g>
-					<path d="M82544.4 1451.6 L82541.0 1447.5 L82537.7 1443.3 L82551.3 1439.0 Z"></path>
-					<path d="M71229.2 3889.9 L70708.5 4000 L76152 4130.980247800323 L76152.0 4131.0 " fill="none"></path>
+					<path d="M83481.9 1451.6 L83478.5 1447.5 L83475.2 1443.3 L83488.8 1439.0 Z"></path>
+					<path d="M72006.2 3903.0 L71648.5 4000 L76856.5 4130.84691103403 L76856.5 4130.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71239.5 3893.2 L71229.2 3889.9 L71237.3 3882.8 L71247.5 3886.1 Z"></path>
+						<path d="M72016.6 3905.7 L72006.2 3903.0 L72013.8 3895.4 L72024.3 3898.1 Z"></path>
 					</g>
-					<path d="M71229.3 3892.6 L70748.5 4000 L71281.25 4104.944505696435 L71281.3 4104.9 " fill="none"></path>
+					<path d="M72006.3 3907.4 L71688.5 4000 L72021.75 4092.8871554862194 L72021.8 4092.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71239.6 3895.8 L71229.3 3892.6 L71237.2 3885.3 L71247.5 3888.5 Z"></path>
+						<path d="M72016.8 3909.9 L72006.3 3907.4 L72013.8 3899.7 L72024.3 3902.2 Z"></path>
 					</g>
-					<path d="M71669.2 3850.7 L76213.25 4000 L82346.25 4132.8197171717175 L82346.3 4132.8 " fill="none"></path>
+					<path d="M72445.9 3849.8 L77713.75 4000 L83283.75 4132.701573473198 L83283.8 4132.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71660.0 3845.1 L71669.2 3850.7 L71659.7 3855.8 L71650.5 3850.1 Z"></path>
+						<path d="M72436.7 3844.2 L72445.9 3849.8 L72436.4 3854.8 L72427.3 3849.2 Z"></path>
 					</g>
-					<path d="M71669.2 3850.0 L76782.5 4000 L18421.25 4133.834888526652 L18421.3 4133.8 " fill="none"></path>
+					<path d="M72445.9 3849.7 L77762.5 4000 L18216.75 4133.838169001681 L18216.8 4133.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71660.0 3844.4 L71669.2 3850.0 L71659.7 3855.0 L71650.5 3849.4 Z"></path>
+						<path d="M72436.7 3844.1 L72445.9 3849.7 L72436.4 3854.8 L72427.3 3849.2 Z"></path>
 					</g>
-					<path d="M82578.4 1448.2 L82567 1459 L82567 1697.5 L82567 1697.5 L82567 1936 L82567 1936 L82567 2625 L82567 2625 L82567 3314 L82567 3314 L82567 3500.5 L82567 3500.5 L82567 3687 L82567 3687 L71650.5 3840.6636310487497 L71650.5 3840.7 " fill="none"></path>
-					<path d="M82582.1 1452.0 L82578.4 1448.2 L82574.7 1444.3 L82588.1 1439.0 Z"></path>
+					<path d="M83515.9 1448.2 L83504.5 1459 L83504.5 1697.5 L83504.5 1697.5 L83504.5 1936 L83504.5 1936 L83504.5 2625 L83504.5 2625 L83504.5 3314 L83504.5 3314 L83504.5 3500.5 L83504.5 3500.5 L83504.5 3687 L83504.5 3687 L72427.25 3840.7040563005653 L72427.3 3840.7 " fill="none"></path>
+					<path d="M83519.6 1452.0 L83515.9 1448.2 L83512.2 1444.3 L83525.6 1439.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M71449.0 3552.3 L71449 3687 L71449 3752 L71449.0 3752.0 " fill="none"></path>
+						<path d="M71868.5 3552.3 L71868.5 3687 L72024.25 3755.2291812456265 L72024.3 3755.2 " fill="none"></path>
 					</g>
-					<path d="M71454.3 3552.3 L71449.0 3552.3 L71443.7 3552.3 L71449.0 3539.0 Z"></path>
-					<path d="M82852.2 3956.9 L82816.5 4000 L76403 4131.428200030586 L76403.0 4131.4 " fill="none"></path>
+					<path d="M71873.8 3552.3 L71868.5 3552.3 L71863.2 3552.3 L71868.5 3539.0 Z"></path>
+					<path d="M83789.7 3956.9 L83754 4000 L77107.5 4131.516686355581 L77107.5 4131.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82862.2 3953.1 L82852.2 3956.9 L82854.0 3946.3 L82864.1 3942.5 Z"></path>
+						<path d="M83799.7 3953.1 L83789.7 3956.9 L83791.5 3946.3 L83801.6 3942.5 Z"></path>
 					</g>
-					<path d="M82998.3 3959.5 L83016.5 4000 L71576.25 4132.294319432159 L71576.3 4132.3 " fill="none"></path>
+					<path d="M83935.8 3959.5 L83954 4000 L72316.75 4132.322832474172 L72316.8 4132.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82999.3 3948.8 L82998.3 3959.5 L82989.6 3953.2 L82990.6 3942.5 Z"></path>
+						<path d="M83936.8 3948.8 L83935.8 3959.5 L83927.1 3953.2 L83928.1 3942.5 Z"></path>
 					</g>
-					<path d="M82886.4 1785.9 L82946 1936 L82946 2625 L82946 2625 L82946 3314 L82946 3314 L82946 3500.5 L82946 3500.5 L82946 3687 L82946 3687 L82946 3744.5 L82946.0 3744.5 " fill="none"></path>
-					<path d="M82891.3 1783.9 L82886.4 1785.9 L82881.4 1787.9 L82881.4 1773.5 Z"></path>
+					<path d="M83823.9 1785.9 L83883.5 1936 L83883.5 2625 L83883.5 2625 L83883.5 3314 L83883.5 3314 L83883.5 3500.5 L83883.5 3500.5 L83883.5 3687 L83883.5 3687 L83883.5 3744.5 L83883.5 3744.5 " fill="none"></path>
+					<path d="M83828.8 1783.9 L83823.9 1785.9 L83818.9 1787.9 L83818.9 1773.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M74024.6 146.6 L74895.5 293 L74895.5 614 L74895.5 614.0 " fill="none"></path>
-					</g>
-					<path d="M74025.5 141.4 L74024.6 146.6 L74023.8 151.9 L74011.5 144.4 Z"></path>
-					<path d="M74821.9 642.2 L72938 966 L72938 1197 L72938.0 1197.0 " fill="none"></path>
-					<path d="M74822.8 647.4 L74821.9 642.2 L74821.0 636.9 L74835.0 639.9 Z"></path>
-					<path d="M74821.9 644.3 L73225.5 966 L73225.5 1197 L73225.5 1197.0 " fill="none"></path>
-					<path d="M74823.0 649.6 L74821.9 644.3 L74820.9 639.1 L74835.0 641.7 Z"></path>
-					<path d="M74822.1 647.5 L73526 966 L73526 1197 L73526.0 1197.0 " fill="none"></path>
-					<path d="M74823.3 652.7 L74822.1 647.5 L74820.8 642.4 L74835.0 644.4 Z"></path>
-					<path d="M74833.4 649.0 L73822.5 966 L73822.5 1197 L73822.5 1197.0 " fill="none"></path>
-					<path d="M74834.9 654.1 L74833.4 649.0 L74831.8 643.9 L74846.1 645.0 Z"></path>
-					<path d="M74848.1 650.4 L74130.5 966 L74130.5 1197 L74130.5 1197.0 " fill="none"></path>
-					<path d="M74850.2 655.3 L74848.1 650.4 L74845.9 645.5 L74860.3 645.0 Z"></path>
-					<path d="M74915.0 655.7 L75145.5 966 L75145.5 1197 L75145.5 1197.0 " fill="none"></path>
-					<path d="M74919.2 652.5 L74915.0 655.7 L74910.7 658.9 L74907.0 645.0 Z"></path>
-					<path d="M74932.4 651.9 L75449 966 L75449 1197 L75449.0 1197.0 " fill="none"></path>
-					<path d="M74935.2 647.4 L74932.4 651.9 L74929.6 656.5 L74921.0 645.0 Z"></path>
-					<path d="M74946.9 649.9 L75742.5 966 L75742.5 1197 L75742.5 1197.0 " fill="none"></path>
-					<path d="M74948.9 645.0 L74946.9 649.9 L74944.9 654.9 L74934.5 645.0 Z"></path>
-					<path d="M74961.6 648.7 L76053.5 966 L76053.5 1197 L76053.5 1197.0 " fill="none"></path>
-					<path d="M74963.1 643.6 L74961.6 648.7 L74960.2 653.8 L74948.8 645.0 Z"></path>
-					<path d="M74969.0 646.8 L76327 966 L76327 1197 L76327.0 1197.0 " fill="none"></path>
-					<path d="M74970.2 641.6 L74969.0 646.8 L74967.8 652.0 L74956.0 643.7 Z"></path>
-					<path d="M76099.5 4639.7 L76099.5 4641 L75916.5 4666.627218934911 L75916.5 4666.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M76104.8 4630.3 L76099.5 4639.7 L76094.2 4630.3 L76099.5 4621.0 Z"></path>
-					</g>
-					<path d="M75578.7 4174.7 L75491 4268 L75860 4381.095316351684 L75860.0 4381.1 " fill="none"></path>
-					<path d="M75582.6 4178.4 L75578.7 4174.7 L75574.8 4171.1 L75587.9 4165.0 Z"></path>
-					<path d="M75921.5 4215.8 L75921.5 4268 L75940.58847184987 4288 L75940.6 4288.0 " fill="none"></path>
-					<path d="M75926.8 4215.8 L75921.5 4215.8 L75916.2 4215.8 L75921.5 4202.5 Z"></path>
+						<path d="M74820.2 150.4 L75437 293 L75437 614 L75437.0 614.0 " fill="none"></path>
+					</g>
+					<path d="M74821.4 145.2 L74820.2 150.4 L74819.0 155.6 L74807.3 147.4 Z"></path>
+					<path d="M75363.5 645.3 L73875.5 966 L73875.5 1197 L73875.5 1197.0 " fill="none"></path>
+					<path d="M75364.6 650.6 L75363.5 645.3 L75362.3 640.1 L75376.5 642.5 Z"></path>
+					<path d="M75365.4 648.4 L74163 966 L74163 1197 L74163.0 1197.0 " fill="none"></path>
+					<path d="M75366.8 653.6 L75365.4 648.4 L75364.1 643.2 L75378.3 645.0 Z"></path>
+					<path d="M75379.6 649.4 L74463.5 966 L74463.5 1197 L74463.5 1197.0 " fill="none"></path>
+					<path d="M75381.3 654.4 L75379.6 649.4 L75377.8 644.3 L75392.2 645.0 Z"></path>
+					<path d="M75393.9 650.9 L74760 966 L74760 1197 L74760.0 1197.0 " fill="none"></path>
+					<path d="M75396.2 655.7 L75393.9 650.9 L75391.5 646.2 L75405.8 645.0 Z"></path>
+					<path d="M75410.2 654.0 L75068 966 L75068 1197 L75068.0 1197.0 " fill="none"></path>
+					<path d="M75413.7 657.9 L75410.2 654.0 L75406.6 650.0 L75420.0 645.0 Z"></path>
+					<path d="M75478.6 651.2 L76083 966 L76083 1197 L76083.0 1197.0 " fill="none"></path>
+					<path d="M75481.0 646.4 L75478.6 651.2 L75476.1 655.9 L75466.8 645.0 Z"></path>
+					<path d="M75493.3 649.5 L76386.5 966 L76386.5 1197 L76386.5 1197.0 " fill="none"></path>
+					<path d="M75495.1 644.4 L75493.3 649.5 L75491.5 654.5 L75480.7 645.0 Z"></path>
+					<path d="M75507.1 648.5 L76680 966 L76680 1197 L76680.0 1197.0 " fill="none"></path>
+					<path d="M75508.5 643.3 L75507.1 648.5 L75505.7 653.6 L75494.3 645.0 Z"></path>
+					<path d="M75510.5 645.4 L76991 966 L76991 1197 L76991.0 1197.0 " fill="none"></path>
+					<path d="M75511.7 640.2 L75510.5 645.4 L75509.4 650.6 L75497.5 642.6 Z"></path>
+					<path d="M75510.6 643.1 L77264.5 966 L77264.5 1197 L77264.5 1197.0 " fill="none"></path>
+					<path d="M75511.6 637.8 L75510.6 643.1 L75509.6 648.3 L75497.5 640.6 Z"></path>
+					<path d="M76804.0 4639.7 L76804 4641 L76621 4666.627218934911 L76621.0 4666.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M76809.3 4630.3 L76804.0 4639.7 L76798.7 4630.3 L76804.0 4621.0 Z"></path>
+					</g>
+					<path d="M76283.2 4174.7 L76195.5 4268 L76564.5 4381.095316351684 L76564.5 4381.1 " fill="none"></path>
+					<path d="M76287.1 4178.4 L76283.2 4174.7 L76279.3 4171.1 L76292.4 4165.0 Z"></path>
+					<path d="M76626.0 4215.8 L76626 4268 L76645.08847184987 4288 L76645.1 4288.0 " fill="none"></path>
+					<path d="M76631.3 4215.8 L76626.0 4215.8 L76620.7 4215.8 L76626.0 4202.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M76277.5 4253.3 L76277.5 4268 L76258.41152815013 4288 L76258.4 4288.0 " fill="none"></path>
+						<path d="M76982.0 4253.3 L76982 4268 L76962.91152815013 4288 L76962.9 4288.0 " fill="none"></path>
 					</g>
-					<path d="M76282.8 4253.3 L76277.5 4253.3 L76272.2 4253.3 L76277.5 4240.0 Z"></path>
-					<path d="M59649.8 3916.2 L59649.75 4000 L76152 4132.98861842402 L76152.0 4133.0 " fill="none"></path>
+					<path d="M76987.3 4253.3 L76982.0 4253.3 L76976.7 4253.3 L76982.0 4240.0 Z"></path>
+					<path d="M60148.0 3916.2 L60148 4000 L76856.5 4133.0010098609955 L76856.5 4133.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59655.1 3906.8 L59649.8 3916.2 L59644.4 3906.8 L59649.8 3897.5 Z"></path>
+						<path d="M60153.3 3906.8 L60148.0 3916.2 L60142.7 3906.8 L60148.0 3897.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M59649.8 3552.3 L59649.75 3687 L59649.75 3789.5 L59649.8 3789.5 " fill="none"></path>
+						<path d="M60148.0 3552.3 L60148 3687 L60148 3789.5 L60148.0 3789.5 " fill="none"></path>
 					</g>
-					<path d="M59655.1 3552.3 L59649.8 3552.3 L59644.4 3552.3 L59649.8 3539.0 Z"></path>
-					<path d="M69016.3 3570.4 L68786.5 3687 L68786.5 3843.5 L68786.5 3843.5 L68786.5 4000 L68786.5 4000 L75325 4132.882232501706 L75325.0 4132.9 " fill="none"></path>
+					<path d="M60153.3 3552.3 L60148.0 3552.3 L60142.7 3552.3 L60148.0 3539.0 Z"></path>
+					<path d="M69803.3 3570.4 L69573.5 3687 L69573.5 3843.5 L69573.5 3843.5 L69573.5 4000 L69573.5 4000 L72429 4131.467789039684 L72429.0 4131.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69027.1 3571.0 L69016.3 3570.4 L69022.2 3561.5 L69033.0 3562.0 Z"></path>
+						<path d="M69814.1 3571.0 L69803.3 3570.4 L69809.2 3561.5 L69820.0 3562.0 Z"></path>
 					</g>
-					<path d="M69472.3 3910.8 L69262.75 4000 L76152 4131.602623044299 L76152.0 4131.6 " fill="none"></path>
+					<path d="M70259.3 3910.8 L70049.75 4000 L76856.5 4131.574092105738 L76856.5 4131.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69483.0 3912.1 L69472.3 3910.8 L69478.8 3902.3 L69489.5 3903.5 Z"></path>
+						<path d="M70270.0 3912.1 L70259.3 3910.8 L70265.8 3902.3 L70276.5 3903.5 Z"></path>
 					</g>
-					<path d="M69472.7 3918.9 L69302.75 4000 L71281.25 4124.703198494826 L71281.3 4124.7 " fill="none"></path>
+					<path d="M70259.7 3918.9 L70089.75 4000 L72021.75 4124.495311372926 L72021.8 4124.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69483.4 3919.7 L69472.7 3918.9 L69478.8 3910.0 L69489.5 3910.8 Z"></path>
+						<path d="M70270.4 3919.7 L70259.7 3918.9 L70265.8 3910.0 L70276.5 3910.8 Z"></path>
 					</g>
-					<path d="M69650.4 3945.8 L69661 4000 L76069 4133.551909168676 L76069.0 4133.6 " fill="none"></path>
+					<path d="M70481.8 3943.2 L70518.5 4000 L76773.5 4133.540986218434 L76773.5 4133.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69653.9 3935.6 L69650.4 3945.8 L69643.4 3937.7 L69646.9 3927.5 Z"></path>
+						<path d="M70481.3 3932.5 L70481.8 3943.2 L70472.3 3938.2 L70471.7 3927.5 Z"></path>
 					</g>
-					<path d="M69676.0 3944.5 L69701 4000 L75325 4132.702236309209 L75325.0 4132.7 " fill="none"></path>
+					<path d="M70505.7 3941.4 L70558.5 4000 L72429 4130.172422747339 L72429.0 4130.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69677.0 3933.8 L69676.0 3944.5 L69667.3 3938.2 L69668.3 3927.5 Z"></path>
+						<path d="M70503.4 3930.9 L70505.7 3941.4 L70495.5 3938.0 L70493.2 3927.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M69296.7 3556.3 L69630.5 3687 L69630.5 3759.5 L69630.5 3759.5 " fill="none"></path>
+						<path d="M70083.7 3556.3 L70417.5 3687 L70417.5 3759.5 L70417.5 3759.5 " fill="none"></path>
 					</g>
-					<path d="M69298.6 3551.3 L69296.7 3556.3 L69294.7 3561.2 L69284.3 3551.4 Z"></path>
-					<path d="M3281.0 3450.3 L3293 3447 L3300.5 3447 L3300.5 3447 L3308 3500.5 L3308 3500.5 L3300.5 3554 L3300.5 3554 L3293 3554 L3293 3554 L3263 3545.8527918781724 L3263.0 3545.9 " fill="none"></path>
+					<path d="M70085.6 3551.3 L70083.7 3556.3 L70081.7 3561.2 L70071.3 3551.4 Z"></path>
+					<path d="M3705.0 3450.3 L3717 3447 L3724.5 3447 L3724.5 3447 L3732 3500.5 L3732 3500.5 L3724.5 3554 L3724.5 3554 L3717 3554 L3717 3554 L3687 3545.8527918781724 L3687.0 3545.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3270.6 3447.6 L3281.0 3450.3 L3273.4 3457.8 L3263.0 3455.1 Z"></path>
+						<path d="M3694.6 3447.6 L3705.0 3450.3 L3697.4 3457.8 L3687.0 3455.1 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3126.8 2650.7 L3681.5 3314 L3263 3447.3052946199828 L3263.0 3447.3 " fill="none"></path>
+						<path d="M3550.8 2650.7 L4105.5 3314 L3687 3447.3052946199828 L3687.0 3447.3 " fill="none"></path>
 					</g>
-					<path d="M3130.9 2647.3 L3126.8 2650.7 L3122.7 2654.1 L3118.2 2640.5 Z"></path>
-					<path d="M71262.6 4141.1 L68309.5 4268 L68309.5 4454.5 L68309.5 4454.5 L68309.5 4641 L68309.5 4641 L71349.25 4676.193192009784 L71349.3 4676.2 " fill="none"></path>
+					<path d="M3554.9 2647.3 L3550.8 2650.7 L3546.7 2654.1 L3542.2 2640.5 Z"></path>
+					<path d="M72003.1 4141.0 L68993.25 4268 L68993.25 4454.5 L68993.25 4454.5 L68993.25 4641 L68993.25 4641 L72089.75 4676.198767211015 L72089.8 4676.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71272.2 4146.1 L71262.6 4141.1 L71271.7 4135.4 L71281.3 4140.3 Z"></path>
+						<path d="M72012.6 4145.9 L72003.1 4141.0 L72012.2 4135.3 L72021.8 4140.2 Z"></path>
 					</g>
-					<path d="M71594.9 4140.0 L75128.5 4268 L75128.5 4454.5 L75128.5 4454.5 L75128.5 4641 L75128.5 4641 L75255.75 4668.090704647676 L75255.8 4668.1 " fill="none"></path>
+					<path d="M72335.4 4140.2 L75769.75 4268 L75769.75 4454.5 L75769.75 4454.5 L75769.75 4641 L75769.75 4641 L75897 4668.090704647676 L75897.0 4668.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71585.8 4134.4 L71594.9 4140.0 L71585.4 4145.0 L71576.3 4139.3 Z"></path>
+						<path d="M72326.3 4134.5 L72335.4 4140.2 L72325.9 4145.2 L72316.8 4139.5 Z"></path>
 					</g>
-					<path d="M19757.0 3887.8 L19757 4000 L71281.25 4133.617489247025 L71281.3 4133.6 " fill="none"></path>
-					<path d="M19762.3 3887.8 L19757.0 3887.8 L19751.7 3887.8 L19757.0 3874.5 Z"></path>
-					<path d="M75316.5 4615.2 L75303.5 4641 L75775.5 4671.8866359447 L75775.5 4671.9 " fill="none"></path>
+					<path d="M19271.0 3887.8 L19271 4000 L72021.75 4133.626358149844 L72021.8 4133.6 " fill="none"></path>
+					<path d="M19276.3 3887.8 L19271.0 3887.8 L19265.7 3887.8 L19271.0 3874.5 Z"></path>
+					<path d="M76021.0 4615.2 L76008 4641 L76480 4671.8866359447 L76480.0 4671.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75325.4 4609.2 L75316.5 4615.2 L75315.9 4604.4 L75324.9 4598.5 Z"></path>
+						<path d="M76029.9 4609.2 L76021.0 4615.2 L76020.4 4604.4 L76029.4 4598.5 Z"></path>
 					</g>
-					<path d="M75350.6 4616.4 L75343.5 4641 L75394.90845070423 4661 L75394.9 4661.0 " fill="none"></path>
+					<path d="M76055.1 4616.4 L76048 4641 L76099.40845070423 4661 L76099.4 4661.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75358.3 4608.9 L75350.6 4616.4 L75348.0 4606.0 L75355.7 4598.5 Z"></path>
+						<path d="M76062.8 4608.9 L76055.1 4616.4 L76052.5 4606.0 L76060.2 4598.5 Z"></path>
 					</g>
-					<path d="M75443.9 4616.4 L75451 4641 L75334.75 4667.496789727127 L75334.8 4667.5 " fill="none"></path>
+					<path d="M76148.4 4616.4 L76155.5 4641 L75976 4670.097031963471 L75976.0 4670.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75446.5 4606.0 L75443.9 4616.4 L75436.2 4608.9 L75438.8 4598.5 Z"></path>
+						<path d="M76151.0 4606.0 L76148.4 4616.4 L76140.7 4608.9 L76143.3 4598.5 Z"></path>
 					</g>
-					<path d="M75478.0 4615.2 L75491 4641 L71402.25 4676.271399064455 L71402.3 4676.3 " fill="none"></path>
+					<path d="M76182.5 4615.2 L76195.5 4641 L72142.75 4676.269381626525 L72142.8 4676.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75478.6 4604.4 L75478.0 4615.2 L75469.1 4609.2 L75469.6 4598.5 Z"></path>
+						<path d="M76183.1 4604.4 L76182.5 4615.2 L76173.6 4609.2 L76174.1 4598.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M71589.6 4139.4 L75397.25 4268 L75397.25 4310.5 L75397.3 4310.5 " fill="none"></path>
+						<path d="M72330.1 4139.5 L76101.75 4268 L76101.75 4310.5 L76101.8 4310.5 " fill="none"></path>
 					</g>
-					<path d="M71589.8 4134.1 L71589.6 4139.4 L71589.4 4144.8 L71576.3 4139.0 Z"></path>
-					<path d="M78865.3 168.9 L78540.5 293 L78540.5 614 L78540.5 614.0 " fill="none"></path>
-					<path d="M78867.2 173.9 L78865.3 168.9 L78863.4 164.0 L78877.8 164.2 Z"></path>
-					<path d="M75624.4 4183.5 L75637 4268 L75637 4454.5 L75637 4454.5 L75637 4641 L75637 4641 L75775.5 4664.525119617225 L75775.5 4664.5 " fill="none"></path>
+					<path d="M72330.3 4134.1 L72330.1 4139.5 L72329.9 4144.8 L72316.8 4139.0 Z"></path>
+					<path d="M79802.8 168.9 L79478 293 L79478 614 L79478.0 614.0 " fill="none"></path>
+					<path d="M79804.7 173.9 L79802.8 168.9 L79800.9 164.0 L79815.3 164.2 Z"></path>
+					<path d="M76328.9 4183.5 L76341.5 4268 L76341.5 4454.5 L76341.5 4454.5 L76341.5 4641 L76341.5 4641 L76480 4664.525119617225 L76480.0 4664.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75628.3 4173.4 L75624.4 4183.5 L75617.7 4175.0 L75621.6 4165.0 Z"></path>
+						<path d="M76332.8 4173.4 L76328.9 4183.5 L76322.2 4175.0 L76326.1 4165.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M74024.8 140.3 L76427.25 293 L76427.25 583.5 L76427.3 583.5 " fill="none"></path>
+						<path d="M74820.6 140.1 L77364.75 293 L77364.75 583.5 L77364.8 583.5 " fill="none"></path>
 					</g>
-					<path d="M74025.1 135.0 L74024.8 140.3 L74024.5 145.7 L74011.5 139.5 Z"></path>
-					<path d="M60989.5 2772.7 L60989.5 3314 L35765.25 3500.0979132670723 L35765.3 3500.1 " fill="none"></path>
+					<path d="M74820.9 134.8 L74820.6 140.1 L74820.2 145.4 L74807.3 139.3 Z"></path>
+					<path d="M60217.8 2772.7 L60217.75 3314 L35468.5 3500.0902131734115 L35468.5 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60994.8 2763.3 L60989.5 2772.7 L60984.2 2763.3 L60989.5 2754.0 Z"></path>
+						<path d="M60223.1 2763.3 L60217.8 2772.7 L60212.4 2763.3 L60217.8 2754.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M74024.8 140.0 L76672.25 293 L76672.25 614 L76672.3 614.0 " fill="none"></path>
+						<path d="M74820.6 139.8 L77609.75 293 L77609.75 614 L77609.8 614.0 " fill="none"></path>
 					</g>
-					<path d="M74025.1 134.7 L74024.8 140.0 L74024.5 145.3 L74011.5 139.2 Z"></path>
+					<path d="M74820.9 134.5 L74820.6 139.8 L74820.3 145.1 L74807.3 139.1 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M76672.3 658.3 L76672.25 966 L76672.25 1197 L76672.3 1197.0 " fill="none"></path>
+						<path d="M77609.8 658.3 L77609.75 966 L77609.75 1197 L77609.8 1197.0 " fill="none"></path>
 					</g>
-					<path d="M76677.6 658.3 L76672.3 658.3 L76666.9 658.3 L76672.3 645.0 Z"></path>
+					<path d="M77615.1 658.3 L77609.8 658.3 L77604.4 658.3 L77609.8 645.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M82672.8 175.6 L82827 293 L82827 501 L82827.0 501.0 " fill="none"></path>
+						<path d="M83610.3 175.6 L83764.5 293 L83764.5 501 L83764.5 501.0 " fill="none"></path>
 					</g>
-					<path d="M82676.0 171.3 L82672.8 175.6 L82669.6 179.8 L82662.2 167.5 Z"></path>
-					<path d="M82851.1 1457.6 L82851.25 1459 L82851.25 1621.5 L82851.3 1621.5 " fill="none"></path>
+					<path d="M83613.5 171.3 L83610.3 175.6 L83607.1 179.8 L83599.7 167.5 Z"></path>
+					<path d="M83788.6 1457.6 L83788.75 1459 L83788.75 1621.5 L83788.8 1621.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82855.5 1447.8 L82851.1 1457.6 L82844.9 1448.8 L82849.3 1439.0 Z"></path>
+						<path d="M83793.0 1447.8 L83788.6 1457.6 L83782.4 1448.8 L83786.8 1439.0 Z"></path>
 					</g>
-					<path d="M83117.1 1450.9 L83127 1459 L83127 1697.5 L83127 1697.5 L83127 1936 L83127 1936 L83127 2625 L83127 2625 L83127 3314 L83127 3314 L83127 3500.5 L83127 3500.5 L83127 3687 L83127 3687 L83127 3843.5 L83127 3843.5 L83127 4000 L83127 4000 L61314.5 4133.55608864519 L61314.5 4133.6 " fill="none"></path>
+					<path d="M84054.6 1450.9 L84064.5 1459 L84064.5 1697.5 L84064.5 1697.5 L84064.5 1936 L84064.5 1936 L84064.5 2625 L84064.5 2625 L84064.5 3314 L84064.5 3314 L84064.5 3500.5 L84064.5 3500.5 L84064.5 3687 L84064.5 3687 L84064.5 3843.5 L84064.5 3843.5 L84064.5 4000 L84064.5 4000 L63661.75 4133.525524718868 L63661.8 4133.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M83113.3 1440.8 L83117.1 1450.9 L83106.5 1449.0 L83102.7 1439.0 Z"></path>
+						<path d="M84050.8 1440.8 L84054.6 1450.9 L84044.0 1449.0 L84040.2 1439.0 Z"></path>
 					</g>
-					<path d="M82827.0 771.3 L82827 966 L82827 986 L82827.0 986.0 " fill="none"></path>
-					<path d="M82832.3 771.3 L82827.0 771.3 L82821.7 771.3 L82827.0 758.0 Z"></path>
-					<path d="M78876.7 182.0 L78697.5 293 L78697.5 614 L78697.5 614.0 " fill="none"></path>
-					<path d="M78879.5 186.6 L78876.7 182.0 L78873.9 177.5 L78888.1 175.0 Z"></path>
-					<path d="M78911.5 185.5 L78826.5 293 L78826.5 614 L78826.5 614.0 " fill="none"></path>
-					<path d="M78915.7 188.8 L78911.5 185.5 L78907.4 182.2 L78919.8 175.0 Z"></path>
-					<path d="M79035.6 159.0 L79545.5 293 L79545.5 614 L79545.5 614.0 " fill="none"></path>
-					<path d="M79037.0 153.8 L79035.6 159.0 L79034.3 164.1 L79022.8 155.6 Z"></path>
-					<path d="M79035.8 155.1 L79671 293 L79671 614 L79671.0 614.0 " fill="none"></path>
-					<path d="M79036.9 149.9 L79035.8 155.1 L79034.6 160.3 L79022.8 152.2 Z"></path>
+					<path d="M83764.5 771.3 L83764.5 966 L83764.5 986 L83764.5 986.0 " fill="none"></path>
+					<path d="M83769.8 771.3 L83764.5 771.3 L83759.2 771.3 L83764.5 758.0 Z"></path>
+					<path d="M79814.2 182.0 L79635 293 L79635 614 L79635.0 614.0 " fill="none"></path>
+					<path d="M79817.0 186.6 L79814.2 182.0 L79811.4 177.5 L79825.6 175.0 Z"></path>
+					<path d="M79849.0 185.5 L79764 293 L79764 614 L79764.0 614.0 " fill="none"></path>
+					<path d="M79853.2 188.8 L79849.0 185.5 L79844.9 182.2 L79857.3 175.0 Z"></path>
+					<path d="M79973.2 156.5 L80558.25 293 L80558.25 614 L80558.3 614.0 " fill="none"></path>
+					<path d="M79974.4 151.3 L79973.2 156.5 L79972.0 161.6 L79960.3 153.4 Z"></path>
+					<path d="M79973.3 153.3 L80683.75 293 L80683.75 614 L80683.8 614.0 " fill="none"></path>
+					<path d="M79974.4 148.1 L79973.3 153.3 L79972.3 158.6 L79960.3 150.8 Z"></path>
 					<g data-name="Config">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Config">
-							<rect x="26391.0" y="60.5" height="152.0" width="396.0" data-name="Config"></rect>
-							<path d="M26391.0 91.5 L26787.0 91.5" fill="none" data-name="Config"></path>
+							<rect x="25850.3" y="60.5" height="152.0" width="396.0" data-name="Config"></rect>
+							<path d="M25850.3 91.5 L26246.3 91.5" fill="none" data-name="Config"></path>
 						</g>
-						<g transform="translate(26391, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Config">
+						<g transform="translate(25850.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Config">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Config">
 								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="Config">Config</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26391, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Config">
+						<g transform="translate(25850.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Config">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Config">
 								<text x="0.0" y="13.5" stroke="none" data-name="Config">&lt;static&gt;+isDebugMode: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Config">&lt;static&gt;+defaultLocale: Set&lt;String&gt;</text>
@@ -6676,11 +6659,74 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="StudyMonitorData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorData">
+							<rect x="26286.3" y="83.0" height="107.0" width="264.0" data-name="StudyMonitorData"></rect>
+							<path d="M26286.3 114.0 L26550.3 114.0" fill="none" data-name="StudyMonitorData"></path>
+						</g>
+						<g transform="translate(26286.25, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorData">
+								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorData">StudyMonitorData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(26286.25, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorData">+activeParticipants: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorData">+dropoutParticipants: int</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorData">+completedParticipants: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorData">+items: List&lt;StudyMonitorItem&gt;</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StudyMonitorItem">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorItem">
+							<rect x="22360.3" y="2496.5" height="257.0" width="363.0" data-name="StudyMonitorItem"></rect>
+							<path d="M22360.3 2527.5 L22723.3 2527.5" fill="none" data-name="StudyMonitorItem"></path>
+						</g>
+						<g transform="translate(22360.25, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorItem">
+								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorItem">StudyMonitorItem</text>
+								
+							</g>
+						</g>
+						<g transform="translate(22360.25, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">+participantId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorItem">+inviteCode: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorItem">+enrolledAt: DateTime</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorItem">+lastActivityAt: DateTime</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyMonitorItem">+currentDayOfStudy: int</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyMonitorItem">+studyDurationInDays: int</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyMonitorItem">+completedInterventions: int</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyMonitorItem">+missedInterventions: int</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyMonitorItem">+completedSurveys: int</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyMonitorItem">+missedSurveys: int</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyMonitorItem">+droppedOut: bool</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyMonitorItem">+missedTasksPerDay: List&lt;Set&lt;String&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyMonitorItem">+completedTasksPerDay: List&lt;Set&lt;String&gt;&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyMonitorItem">+props: List&lt;Object?&gt;</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="Equatable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
+							<rect x="64.0" y="1682.0" height="31.0" width="96.0" data-name="Equatable"></rect>
+						</g>
+						<g transform="translate(64, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
+								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="ResultTypes">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ResultTypes">
-							<rect x="26827.0" y="121.0" height="31.0" width="114.0" data-name="ResultTypes"></rect>
+							<rect x="26590.3" y="121.0" height="31.0" width="114.0" data-name="ResultTypes"></rect>
 						</g>
-						<g transform="translate(26827, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ResultTypes">
+						<g transform="translate(26590.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ResultTypes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ResultTypes">
 								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ResultTypes">ResultTypes</text>
 								
@@ -6689,16 +6735,16 @@
 					</g>
 					<g data-name="MeasurementResultTypes">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementResultTypes">
-							<rect x="26458.0" y="591.0" height="77.0" width="252.0" data-name="MeasurementResultTypes"></rect>
-							<path d="M26458.0 622.0 L26710.0 622.0" fill="none" data-name="MeasurementResultTypes"></path>
+							<rect x="26221.3" y="591.0" height="77.0" width="252.0" data-name="MeasurementResultTypes"></rect>
+							<path d="M26221.3 622.0 L26473.3 622.0" fill="none" data-name="MeasurementResultTypes"></path>
 						</g>
-						<g transform="translate(26458, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementResultTypes">
+						<g transform="translate(26221.25, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementResultTypes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementResultTypes">
 								<text x="118.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementResultTypes">MeasurementResultTypes</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26458, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementResultTypes">
+						<g transform="translate(26221.25, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementResultTypes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementResultTypes">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+questionnaire: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
@@ -6708,16 +6754,16 @@
 					</g>
 					<g data-name="InterventionResultTypes">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionResultTypes">
-							<rect x="26750.0" y="591.0" height="77.0" width="268.0" data-name="InterventionResultTypes"></rect>
-							<path d="M26750.0 622.0 L27018.0 622.0" fill="none" data-name="InterventionResultTypes"></path>
+							<rect x="26513.3" y="591.0" height="77.0" width="268.0" data-name="InterventionResultTypes"></rect>
+							<path d="M26513.3 622.0 L26781.3 622.0" fill="none" data-name="InterventionResultTypes"></path>
 						</g>
-						<g transform="translate(26750, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResultTypes">
+						<g transform="translate(26513.25, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResultTypes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionResultTypes">
 								<text x="126.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionResultTypes">InterventionResultTypes</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26750, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResultTypes">
+						<g transform="translate(26513.25, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResultTypes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResultTypes">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+checkmarkTask: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
@@ -6727,16 +6773,16 @@
 					</g>
 					<g data-name="StudyExportData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyExportData">
-							<rect x="0.0" y="2564.0" height="122.0" width="414.0" data-name="StudyExportData"></rect>
-							<path d="M0.0 2595.0 L414.0 2595.0" fill="none" data-name="StudyExportData"></path>
+							<rect x="424.0" y="2564.0" height="122.0" width="414.0" data-name="StudyExportData"></rect>
+							<path d="M424.0 2595.0 L838.0 2595.0" fill="none" data-name="StudyExportData"></path>
 						</g>
-						<g transform="translate(0, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyExportData">
+						<g transform="translate(424, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyExportData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyExportData">
 								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyExportData">StudyExportData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyExportData">
+						<g transform="translate(424, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyExportData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyExportData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyExportData">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyExportData">+measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
@@ -6749,9 +6795,9 @@
 					</g>
 					<g data-name="Study">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="63638.5" y="3485.0" height="31.0" width="61.0" data-name="Study"></rect>
+							<rect x="64459.0" y="3485.0" height="31.0" width="61.0" data-name="Study"></rect>
 						</g>
-						<g transform="translate(63638.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
+						<g transform="translate(64459, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
 								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
 								
@@ -6760,23 +6806,23 @@
 					</g>
 					<g data-name="StudyTemplates">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTemplates">
-							<rect x="26981.0" y="90.0" height="93.0" width="307.0" data-name="StudyTemplates"></rect>
-							<path d="M26981.0 121.0 L27288.0 121.0" fill="none" data-name="StudyTemplates"></path>
-							<path d="M26981.0 152.0 L27288.0 152.0" fill="none" data-name="StudyTemplates"></path>
+							<rect x="26744.3" y="90.0" height="93.0" width="307.0" data-name="StudyTemplates"></rect>
+							<path d="M26744.3 121.0 L27051.3 121.0" fill="none" data-name="StudyTemplates"></path>
+							<path d="M26744.3 152.0 L27051.3 152.0" fill="none" data-name="StudyTemplates"></path>
 						</g>
-						<g transform="translate(26981, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTemplates">
+						<g transform="translate(26744.25, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTemplates">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTemplates">
 								<text x="145.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTemplates">StudyTemplates</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26981, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
+						<g transform="translate(26744.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+kUnnamedStudyTitle: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26981, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
+						<g transform="translate(26744.25, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+Study emptyDraft()</text>
 								
@@ -6785,16 +6831,16 @@
 					</g>
 					<g data-name="StudyActionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyActionType">
-							<rect x="68.0" y="3402.0" height="197.0" width="358.0" data-name="StudyActionType"></rect>
-							<path d="M68.0 3433.0 L426.0 3433.0" fill="none" data-name="StudyActionType"></path>
+							<rect x="492.0" y="3402.0" height="197.0" width="358.0" data-name="StudyActionType"></rect>
+							<path d="M492.0 3433.0 L850.0 3433.0" fill="none" data-name="StudyActionType"></path>
 						</g>
-						<g transform="translate(68, 3402)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyActionType">
+						<g transform="translate(492, 3402)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyActionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyActionType">
 								<text x="171.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyActionType">StudyActionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68, 3433)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyActionType">
+						<g transform="translate(492, 3433)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyActionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyActionType">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyActionType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+values: List&lt;StudyActionType&gt;</text>
@@ -6812,9 +6858,9 @@
 					</g>
 					<g data-name="Enum">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="3074.8" y="2609.5" height="31.0" width="61.0" data-name="Enum"></rect>
+							<rect x="3498.8" y="2609.5" height="31.0" width="61.0" data-name="Enum"></rect>
 						</g>
-						<g transform="translate(3074.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+						<g transform="translate(3498.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
 								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
@@ -6823,16 +6869,16 @@
 					</g>
 					<g data-name="Notifications">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Notifications">
-							<rect x="3635.0" y="2541.5" height="167.0" width="407.0" data-name="Notifications"></rect>
-							<path d="M3635.0 2572.5 L4042.0 2572.5" fill="none" data-name="Notifications"></path>
+							<rect x="4059.0" y="2541.5" height="167.0" width="407.0" data-name="Notifications"></rect>
+							<path d="M4059.0 2572.5 L4466.0 2572.5" fill="none" data-name="Notifications"></path>
 						</g>
-						<g transform="translate(3635, 2541.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Notifications">
+						<g transform="translate(4059, 2541.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Notifications">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notifications">
 								<text x="195.5" y="13.5" stroke="none" text-anchor="middle" data-name="Notifications">Notifications</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3635, 2572.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Notifications">
+						<g transform="translate(4059, 2572.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Notifications">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Notifications">
 								<text x="0.0" y="13.5" stroke="none" data-name="Notifications">&lt;static&gt;+credentialsInvalid: SnackbarIntent</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Notifications">&lt;static&gt;+userAlreadyRegistered: SnackbarIntent</text>
@@ -6848,16 +6894,16 @@
 					</g>
 					<g data-name="SnackbarIntent">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SnackbarIntent">
-							<rect x="3353.0" y="3469.5" height="62.0" width="136.0" data-name="SnackbarIntent"></rect>
-							<path d="M3353.0 3500.5 L3489.0 3500.5" fill="none" data-name="SnackbarIntent"></path>
+							<rect x="3777.0" y="3469.5" height="62.0" width="136.0" data-name="SnackbarIntent"></rect>
+							<path d="M3777.0 3500.5 L3913.0 3500.5" fill="none" data-name="SnackbarIntent"></path>
 						</g>
-						<g transform="translate(3353, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackbarIntent">
+						<g transform="translate(3777, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackbarIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackbarIntent">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackbarIntent">SnackbarIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3353, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SnackbarIntent">
+						<g transform="translate(3777, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SnackbarIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SnackbarIntent">
 								<text x="0.0" y="13.5" stroke="none" data-name="SnackbarIntent">+duration: int?</text>
 								
@@ -6866,16 +6912,16 @@
 					</g>
 					<g data-name="AlertIntent">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AlertIntent">
-							<rect x="3529.0" y="3454.5" height="92.0" width="204.0" data-name="AlertIntent"></rect>
-							<path d="M3529.0 3485.5 L3733.0 3485.5" fill="none" data-name="AlertIntent"></path>
+							<rect x="3953.0" y="3454.5" height="92.0" width="204.0" data-name="AlertIntent"></rect>
+							<path d="M3953.0 3485.5 L4157.0 3485.5" fill="none" data-name="AlertIntent"></path>
 						</g>
-						<g transform="translate(3529, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AlertIntent">
+						<g transform="translate(3953, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AlertIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AlertIntent">
 								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="AlertIntent">AlertIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3529, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AlertIntent">
+						<g transform="translate(3953, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AlertIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AlertIntent">
 								<text x="0.0" y="13.5" stroke="none" data-name="AlertIntent">+title: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AlertIntent">+dismissOnAction: bool</text>
@@ -6886,16 +6932,16 @@
 					</g>
 					<g data-name="NotificationDefaultActions">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDefaultActions">
-							<rect x="1724.0" y="3469.5" height="62.0" width="287.0" data-name="NotificationDefaultActions"></rect>
-							<path d="M1724.0 3500.5 L2011.0 3500.5" fill="none" data-name="NotificationDefaultActions"></path>
+							<rect x="2148.0" y="3469.5" height="62.0" width="287.0" data-name="NotificationDefaultActions"></rect>
+							<path d="M2148.0 3500.5 L2435.0 3500.5" fill="none" data-name="NotificationDefaultActions"></path>
 						</g>
-						<g transform="translate(1724, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDefaultActions">
+						<g transform="translate(2148, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDefaultActions">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDefaultActions">
 								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDefaultActions">NotificationDefaultActions</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1724, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDefaultActions">
+						<g transform="translate(2148, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDefaultActions">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDefaultActions">
 								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDefaultActions">&lt;static&gt;+cancel: NotificationAction</text>
 								
@@ -6904,16 +6950,16 @@
 					</g>
 					<g data-name="NotificationAction">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationAction">
-							<rect x="1739.5" y="3797.5" height="92.0" width="256.0" data-name="NotificationAction"></rect>
-							<path d="M1739.5 3828.5 L1995.5 3828.5" fill="none" data-name="NotificationAction"></path>
+							<rect x="2163.5" y="3797.5" height="92.0" width="256.0" data-name="NotificationAction"></rect>
+							<path d="M2163.5 3828.5 L2419.5 3828.5" fill="none" data-name="NotificationAction"></path>
 						</g>
-						<g transform="translate(1739.5, 3797.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationAction">
+						<g transform="translate(2163.5, 3797.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationAction">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationAction">
 								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationAction">NotificationAction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1739.5, 3828.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationAction">
+						<g transform="translate(2163.5, 3828.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationAction">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationAction">
 								<text x="0.0" y="13.5" stroke="none" data-name="NotificationAction">+label: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="NotificationAction">+onSelect: dynamic Function()</text>
@@ -6924,16 +6970,16 @@
 					</g>
 					<g data-name="INotificationService">
 						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="60588.0" y="3447.0" height="107.0" width="395.0" data-name="INotificationService"></rect>
-							<path d="M60588.0 3478.0 L60983.0 3478.0" fill="none" data-name="INotificationService"></path>
+							<rect x="61624.0" y="3447.0" height="107.0" width="395.0" data-name="INotificationService"></rect>
+							<path d="M61624.0 3478.0 L62019.0 3478.0" fill="none" data-name="INotificationService"></path>
 						</g>
-						<g transform="translate(60588, 3447)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
+						<g transform="translate(61624, 3447)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
 								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60588, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="INotificationService">
+						<g transform="translate(61624, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="INotificationService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="INotificationService">
 								<text x="0.0" y="13.5" stroke="none" data-name="INotificationService">+void showMessage()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="INotificationService">+void show()</text>
@@ -6945,23 +6991,23 @@
 					</g>
 					<g data-name="NotificationService">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationService">
-							<rect x="60558.0" y="3774.5" height="138.0" width="455.0" data-name="NotificationService"></rect>
-							<path d="M60558.0 3805.5 L61013.0 3805.5" fill="none" data-name="NotificationService"></path>
-							<path d="M60558.0 3836.5 L61013.0 3836.5" fill="none" data-name="NotificationService"></path>
+							<rect x="61594.0" y="3774.5" height="138.0" width="455.0" data-name="NotificationService"></rect>
+							<path d="M61594.0 3805.5 L62049.0 3805.5" fill="none" data-name="NotificationService"></path>
+							<path d="M61594.0 3836.5 L62049.0 3836.5" fill="none" data-name="NotificationService"></path>
 						</g>
-						<g transform="translate(60558, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationService">
+						<g transform="translate(61594, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationService">
 								<text x="219.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationService">NotificationService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60558, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
+						<g transform="translate(61594, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
 								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">-_streamController: BehaviorSubject&lt;NotificationIntent&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60558, 3836.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
+						<g transform="translate(61594, 3836.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
 								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="NotificationService">+void showMessage()</text>
@@ -6973,9 +7019,9 @@
 					</g>
 					<g data-name="BehaviorSubject">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BehaviorSubject">
-							<rect x="61169.5" y="4118.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
+							<rect x="63516.8" y="4118.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
 						</g>
-						<g transform="translate(61169.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
+						<g transform="translate(63516.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BehaviorSubject">
 								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="BehaviorSubject">BehaviorSubject</text>
 								
@@ -6984,17 +7030,17 @@
 					</g>
 					<g data-name="NotificationIntent">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationIntent">
-							<rect x="4082.0" y="2548.5" height="153.0" width="288.0" data-name="NotificationIntent"></rect>
-							<path d="M4082.0 2579.5 L4370.0 2579.5" fill="none" data-name="NotificationIntent"></path>
-							<path d="M4082.0 2670.5 L4370.0 2670.5" fill="none" data-name="NotificationIntent"></path>
+							<rect x="4506.0" y="2548.5" height="153.0" width="288.0" data-name="NotificationIntent"></rect>
+							<path d="M4506.0 2579.5 L4794.0 2579.5" fill="none" data-name="NotificationIntent"></path>
+							<path d="M4506.0 2670.5 L4794.0 2670.5" fill="none" data-name="NotificationIntent"></path>
 						</g>
-						<g transform="translate(4082, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="NotificationIntent">
+						<g transform="translate(4506, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="NotificationIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationIntent">
 								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationIntent">NotificationIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4082, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
+						<g transform="translate(4506, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
 								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+message: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="NotificationIntent">+customContent: Widget?</text>
@@ -7004,7 +7050,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(4082, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
+						<g transform="translate(4506, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
 								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+void register()</text>
 								
@@ -7013,9 +7059,9 @@
 					</g>
 					<g data-name="Widget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="21865.8" y="3485.0" height="31.0" width="71.0" data-name="Widget"></rect>
+							<rect x="21189.0" y="3485.0" height="31.0" width="71.0" data-name="Widget"></rect>
 						</g>
-						<g transform="translate(21865.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
+						<g transform="translate(21189, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
 								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
 								
@@ -7024,9 +7070,9 @@
 					</g>
 					<g data-name="IconData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="27961.8" y="3485.0" height="31.0" width="87.0" data-name="IconData"></rect>
+							<rect x="25956.3" y="3485.0" height="31.0" width="87.0" data-name="IconData"></rect>
 						</g>
-						<g transform="translate(27961.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
+						<g transform="translate(25956.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
 								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
 								
@@ -7035,16 +7081,16 @@
 					</g>
 					<g data-name="NotificationType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationType">
-							<rect x="1309.0" y="3439.5" height="122.0" width="325.0" data-name="NotificationType"></rect>
-							<path d="M1309.0 3470.5 L1634.0 3470.5" fill="none" data-name="NotificationType"></path>
+							<rect x="1733.0" y="3439.5" height="122.0" width="325.0" data-name="NotificationType"></rect>
+							<path d="M1733.0 3470.5 L2058.0 3470.5" fill="none" data-name="NotificationType"></path>
 						</g>
-						<g transform="translate(1309, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationType">
+						<g transform="translate(1733, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationType">
 								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationType">NotificationType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1309, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationType">
+						<g transform="translate(1733, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationType">
 								<text x="0.0" y="13.5" stroke="none" data-name="NotificationType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="NotificationType">&lt;static&gt;+values: List&lt;NotificationType&gt;</text>
@@ -7057,9 +7103,9 @@
 					</g>
 					<g data-name="dynamic Function()">
 						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="8450.0" y="4118.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
+							<rect x="7295.3" y="4118.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
 						</g>
-						<g transform="translate(8450, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
+						<g transform="translate(7295.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
 								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
 								
@@ -7068,16 +7114,16 @@
 					</g>
 					<g data-name="IClipboardService">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IClipboardService">
-							<rect x="27328.0" y="105.5" height="62.0" width="156.0" data-name="IClipboardService"></rect>
-							<path d="M27328.0 136.5 L27484.0 136.5" fill="none" data-name="IClipboardService"></path>
+							<rect x="27091.3" y="105.5" height="62.0" width="156.0" data-name="IClipboardService"></rect>
+							<path d="M27091.3 136.5 L27247.3 136.5" fill="none" data-name="IClipboardService"></path>
 						</g>
-						<g transform="translate(27328, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IClipboardService">
+						<g transform="translate(27091.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IClipboardService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IClipboardService">
 								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="IClipboardService">IClipboardService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27328, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IClipboardService">
+						<g transform="translate(27091.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IClipboardService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IClipboardService">
 								<text x="0.0" y="13.5" stroke="none" data-name="IClipboardService">+dynamic copy()</text>
 								
@@ -7086,16 +7132,16 @@
 					</g>
 					<g data-name="ClipboardService">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ClipboardService">
-							<rect x="27330.5" y="598.5" height="62.0" width="151.0" data-name="ClipboardService"></rect>
-							<path d="M27330.5 629.5 L27481.5 629.5" fill="none" data-name="ClipboardService"></path>
+							<rect x="27093.8" y="598.5" height="62.0" width="151.0" data-name="ClipboardService"></rect>
+							<path d="M27093.8 629.5 L27244.8 629.5" fill="none" data-name="ClipboardService"></path>
 						</g>
-						<g transform="translate(27330.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ClipboardService">
+						<g transform="translate(27093.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ClipboardService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ClipboardService">
 								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="ClipboardService">ClipboardService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27330.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ClipboardService">
+						<g transform="translate(27093.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ClipboardService">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ClipboardService">
 								<text x="0.0" y="13.5" stroke="none" data-name="ClipboardService">+dynamic copy()</text>
 								
@@ -7104,16 +7150,16 @@
 					</g>
 					<g data-name="NotificationDispatcher">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDispatcher">
-							<rect x="5376.5" y="2564.0" height="122.0" width="325.0" data-name="NotificationDispatcher"></rect>
-							<path d="M5376.5 2595.0 L5701.5 2595.0" fill="none" data-name="NotificationDispatcher"></path>
+							<rect x="5800.5" y="2564.0" height="122.0" width="325.0" data-name="NotificationDispatcher"></rect>
+							<path d="M5800.5 2595.0 L6125.5 2595.0" fill="none" data-name="NotificationDispatcher"></path>
 						</g>
-						<g transform="translate(5376.5, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDispatcher">
+						<g transform="translate(5800.5, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDispatcher">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDispatcher">
 								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDispatcher">NotificationDispatcher</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5376.5, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDispatcher">
+						<g transform="translate(5800.5, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDispatcher">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDispatcher">
 								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDispatcher">+child: Widget?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="NotificationDispatcher">+snackbarInnerPadding: double</text>
@@ -7126,9 +7172,9 @@
 					</g>
 					<g data-name="SnackBarBehavior">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SnackBarBehavior">
-							<rect x="3773.0" y="3485.0" height="31.0" width="162.0" data-name="SnackBarBehavior"></rect>
+							<rect x="4197.0" y="3485.0" height="31.0" width="162.0" data-name="SnackBarBehavior"></rect>
 						</g>
-						<g transform="translate(3773, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackBarBehavior">
+						<g transform="translate(4197, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackBarBehavior">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackBarBehavior">
 								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackBarBehavior">SnackBarBehavior</text>
 								
@@ -7137,16 +7183,16 @@
 					</g>
 					<g data-name="Assets">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Assets">
-							<rect x="27524.0" y="105.5" height="62.0" width="218.0" data-name="Assets"></rect>
-							<path d="M27524.0 136.5 L27742.0 136.5" fill="none" data-name="Assets"></path>
+							<rect x="27287.3" y="105.5" height="62.0" width="218.0" data-name="Assets"></rect>
+							<path d="M27287.3 136.5 L27505.3 136.5" fill="none" data-name="Assets"></path>
 						</g>
-						<g transform="translate(27524, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Assets">
+						<g transform="translate(27287.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Assets">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Assets">
 								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="Assets">Assets</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27524, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Assets">
+						<g transform="translate(27287.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Assets">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Assets">
 								<text x="0.0" y="13.5" stroke="none" data-name="Assets">&lt;static&gt;+logoWide: String</text>
 								
@@ -7155,17 +7201,17 @@
 					</g>
 					<g data-name="AsyncValueWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValueWidget">
-							<rect x="5741.5" y="2526.0" height="198.0" width="384.0" data-name="AsyncValueWidget"></rect>
-							<path d="M5741.5 2557.0 L6125.5 2557.0" fill="none" data-name="AsyncValueWidget"></path>
-							<path d="M5741.5 2648.0 L6125.5 2648.0" fill="none" data-name="AsyncValueWidget"></path>
+							<rect x="6165.5" y="2526.0" height="198.0" width="384.0" data-name="AsyncValueWidget"></rect>
+							<path d="M6165.5 2557.0 L6549.5 2557.0" fill="none" data-name="AsyncValueWidget"></path>
+							<path d="M6165.5 2648.0 L6549.5 2648.0" fill="none" data-name="AsyncValueWidget"></path>
 						</g>
-						<g transform="translate(5741.5, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AsyncValueWidget">
+						<g transform="translate(6165.5, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AsyncValueWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValueWidget">
 								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValueWidget">AsyncValueWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5741.5, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
+						<g transform="translate(6165.5, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+value: AsyncValue&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">+data: Widget Function(T)</text>
@@ -7175,7 +7221,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(5741.5, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
+						<g transform="translate(6165.5, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">-Widget _buildDataOrEmptyWidget()</text>
@@ -7187,9 +7233,9 @@
 					</g>
 					<g data-name="AsyncValue">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="35656.3" y="3485.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
+							<rect x="35359.5" y="3485.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
 						</g>
-						<g transform="translate(35656.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
+						<g transform="translate(35359.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
 								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
 								
@@ -7198,9 +7244,9 @@
 					</g>
 					<g data-name="Widget Function(T)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="30375.8" y="3485.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
+							<rect x="29511.5" y="3485.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
 						</g>
-						<g transform="translate(30375.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
+						<g transform="translate(29511.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
 								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
 								
@@ -7209,9 +7255,9 @@
 					</g>
 					<g data-name="Widget Function(Object, StackTrace?)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Object, StackTrace?)?">
-							<rect x="3975.0" y="3485.0" height="31.0" width="326.0" data-name="Widget Function(Object, StackTrace?)?"></rect>
+							<rect x="4399.0" y="3485.0" height="31.0" width="326.0" data-name="Widget Function(Object, StackTrace?)?"></rect>
 						</g>
-						<g transform="translate(3975, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Object, StackTrace?)?">
+						<g transform="translate(4399, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Object, StackTrace?)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Object, StackTrace?)?">
 								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Object, StackTrace?)?">Widget Function(Object, StackTrace?)?</text>
 								
@@ -7220,9 +7266,9 @@
 					</g>
 					<g data-name="Widget Function()?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function()?">
-							<rect x="4341.0" y="3485.0" height="31.0" width="166.0" data-name="Widget Function()?"></rect>
+							<rect x="4765.0" y="3485.0" height="31.0" width="166.0" data-name="Widget Function()?"></rect>
 						</g>
-						<g transform="translate(4341, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function()?">
+						<g transform="translate(4765, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function()?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function()?">
 								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function()?">Widget Function()?</text>
 								
@@ -7231,17 +7277,17 @@
 					</g>
 					<g data-name="FormControlLabel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlLabel">
-							<rect x="6234.5" y="2548.5" height="153.0" width="430.0" data-name="FormControlLabel"></rect>
-							<path d="M6234.5 2579.5 L6664.5 2579.5" fill="none" data-name="FormControlLabel"></path>
-							<path d="M6234.5 2670.5 L6664.5 2670.5" fill="none" data-name="FormControlLabel"></path>
+							<rect x="6658.5" y="2548.5" height="153.0" width="430.0" data-name="FormControlLabel"></rect>
+							<path d="M6658.5 2579.5 L7088.5 2579.5" fill="none" data-name="FormControlLabel"></path>
+							<path d="M6658.5 2670.5 L7088.5 2670.5" fill="none" data-name="FormControlLabel"></path>
 						</g>
-						<g transform="translate(6234.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlLabel">
+						<g transform="translate(6658.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlLabel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlLabel">
 								<text x="207.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlLabel">FormControlLabel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6234.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
+						<g transform="translate(6658.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+formControl: AbstractControl&lt;dynamic&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormControlLabel">+text: String</text>
@@ -7251,7 +7297,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(6234.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
+						<g transform="translate(6658.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+Widget build()</text>
 								
@@ -7260,9 +7306,9 @@
 					</g>
 					<g data-name="AbstractControl">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="25990.5" y="3485.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+							<rect x="24200.3" y="3485.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
 						</g>
-						<g transform="translate(25990.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+						<g transform="translate(24200.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
 								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
@@ -7271,9 +7317,9 @@
 					</g>
 					<g data-name="TextStyle">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
-							<rect x="11066.0" y="3485.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
+							<rect x="10582.0" y="3485.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
 						</g>
-						<g transform="translate(11066, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
+						<g transform="translate(10582, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
 								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
 								
@@ -7282,9 +7328,9 @@
 					</g>
 					<g data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<rect x="4547.0" y="3485.0" height="31.0" width="352.0" data-name="void Function(AbstractControl&lt;dynamic&gt;)?"></rect>
+							<rect x="4971.0" y="3485.0" height="31.0" width="352.0" data-name="void Function(AbstractControl&lt;dynamic&gt;)?"></rect>
 						</g>
-						<g transform="translate(4547, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+						<g transform="translate(4971, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">void Function(AbstractControl&lt;dynamic&gt;)?</text>
 								
@@ -7293,17 +7339,17 @@
 					</g>
 					<g data-name="ActionPopUpMenuButton">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ActionPopUpMenuButton">
-							<rect x="6828.3" y="2496.0" height="258.0" width="324.0" data-name="ActionPopUpMenuButton"></rect>
-							<path d="M6828.3 2527.0 L7152.3 2527.0" fill="none" data-name="ActionPopUpMenuButton"></path>
-							<path d="M6828.3 2708.0 L7152.3 2708.0" fill="none" data-name="ActionPopUpMenuButton"></path>
+							<rect x="7252.3" y="2496.0" height="258.0" width="324.0" data-name="ActionPopUpMenuButton"></rect>
+							<path d="M7252.3 2527.0 L7576.3 2527.0" fill="none" data-name="ActionPopUpMenuButton"></path>
+							<path d="M7252.3 2708.0 L7576.3 2708.0" fill="none" data-name="ActionPopUpMenuButton"></path>
 						</g>
-						<g transform="translate(6828.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionPopUpMenuButton">
+						<g transform="translate(7252.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionPopUpMenuButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionPopUpMenuButton">
 								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionPopUpMenuButton">ActionPopUpMenuButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6828.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
+						<g transform="translate(7252.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
 								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColor: Color?</text>
@@ -7319,7 +7365,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(6828.25, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
+						<g transform="translate(7252.25, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
 								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">-Widget _buildPopupMenu()</text>
@@ -7329,9 +7375,9 @@
 					</g>
 					<g data-name="Color">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="22088.0" y="3485.0" height="31.0" width="58.0" data-name="Color"></rect>
+							<rect x="21300.0" y="3485.0" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(22088, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+						<g transform="translate(21300, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
 								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
@@ -7340,9 +7386,9 @@
 					</g>
 					<g data-name="Axis">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Axis">
-							<rect x="5663.3" y="3485.0" height="31.0" width="49.0" data-name="Axis"></rect>
+							<rect x="6087.3" y="3485.0" height="31.0" width="49.0" data-name="Axis"></rect>
 						</g>
-						<g transform="translate(5663.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Axis">
+						<g transform="translate(6087.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Axis">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Axis">
 								<text x="16.5" y="13.5" stroke="none" text-anchor="middle" data-name="Axis">Axis</text>
 								
@@ -7351,9 +7397,9 @@
 					</g>
 					<g data-name="PopupMenuPosition">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PopupMenuPosition">
-							<rect x="5752.3" y="3485.0" height="31.0" width="174.0" data-name="PopupMenuPosition"></rect>
+							<rect x="6176.3" y="3485.0" height="31.0" width="174.0" data-name="PopupMenuPosition"></rect>
 						</g>
-						<g transform="translate(5752.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PopupMenuPosition">
+						<g transform="translate(6176.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PopupMenuPosition">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PopupMenuPosition">
 								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="PopupMenuPosition">PopupMenuPosition</text>
 								
@@ -7362,16 +7408,16 @@
 					</g>
 					<g data-name="Search">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Search">
-							<rect x="7210.5" y="2571.5" height="107.0" width="373.0" data-name="Search"></rect>
-							<path d="M7210.5 2602.5 L7583.5 2602.5" fill="none" data-name="Search"></path>
+							<rect x="7634.5" y="2571.5" height="107.0" width="373.0" data-name="Search"></rect>
+							<path d="M7634.5 2602.5 L8007.5 2602.5" fill="none" data-name="Search"></path>
 						</g>
-						<g transform="translate(7210.5, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Search">
+						<g transform="translate(7634.5, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Search">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Search">
 								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="Search">Search</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7210.5, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Search">
+						<g transform="translate(7634.5, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Search">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Search">
 								<text x="0.0" y="13.5" stroke="none" data-name="Search">+onQueryChanged: dynamic Function(String)</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Search">+searchController: SearchController?</text>
@@ -7383,9 +7429,9 @@
 					</g>
 					<g data-name="dynamic Function(String)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(String)">
-							<rect x="5966.3" y="3485.0" height="31.0" width="213.0" data-name="dynamic Function(String)"></rect>
+							<rect x="6390.3" y="3485.0" height="31.0" width="213.0" data-name="dynamic Function(String)"></rect>
 						</g>
-						<g transform="translate(5966.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(String)">
+						<g transform="translate(6390.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(String)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(String)">
 								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(String)">dynamic Function(String)</text>
 								
@@ -7394,16 +7440,16 @@
 					</g>
 					<g data-name="SearchController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="37488.3" y="3469.5" height="62.0" width="258.0" data-name="SearchController"></rect>
-							<path d="M37488.3 3500.5 L37746.3 3500.5" fill="none" data-name="SearchController"></path>
+							<rect x="40261.3" y="3469.5" height="62.0" width="258.0" data-name="SearchController"></rect>
+							<path d="M40261.3 3500.5 L40519.3 3500.5" fill="none" data-name="SearchController"></path>
 						</g>
-						<g transform="translate(37488.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
+						<g transform="translate(40261.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
 								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37488.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SearchController">
+						<g transform="translate(40261.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SearchController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SearchController">
 								<text x="0.0" y="13.5" stroke="none" data-name="SearchController">+setText: void Function(String)</text>
 								
@@ -7412,9 +7458,9 @@
 					</g>
 					<g data-name="void Function(String)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(String)">
-							<rect x="37527.3" y="3828.0" height="31.0" width="180.0" data-name="void Function(String)"></rect>
+							<rect x="40300.3" y="3828.0" height="31.0" width="180.0" data-name="void Function(String)"></rect>
 						</g>
-						<g transform="translate(37527.25, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(String)">
+						<g transform="translate(40300.25, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(String)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(String)">
 								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(String)">void Function(String)</text>
 								
@@ -7423,16 +7469,16 @@
 					</g>
 					<g data-name="FormScaffold">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormScaffold">
-							<rect x="7623.5" y="2556.5" height="137.0" width="212.0" data-name="FormScaffold"></rect>
-							<path d="M7623.5 2587.5 L7835.5 2587.5" fill="none" data-name="FormScaffold"></path>
+							<rect x="8047.5" y="2556.5" height="137.0" width="212.0" data-name="FormScaffold"></rect>
+							<path d="M8047.5 2587.5 L8259.5 2587.5" fill="none" data-name="FormScaffold"></path>
 						</g>
-						<g transform="translate(7623.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormScaffold">
+						<g transform="translate(8047.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormScaffold">
 								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormScaffold">FormScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7623.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormScaffold">
+						<g transform="translate(8047.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormScaffold">+formViewModel: T</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormScaffold">+actions: List&lt;Widget&gt;?</text>
@@ -7446,17 +7492,17 @@
 					</g>
 					<g data-name="ConstrainedWidthFlexible">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConstrainedWidthFlexible">
-							<rect x="7875.5" y="2533.5" height="183.0" width="287.0" data-name="ConstrainedWidthFlexible"></rect>
-							<path d="M7875.5 2564.5 L8162.5 2564.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
-							<path d="M7875.5 2670.5 L8162.5 2670.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
+							<rect x="8299.5" y="2533.5" height="183.0" width="287.0" data-name="ConstrainedWidthFlexible"></rect>
+							<path d="M8299.5 2564.5 L8586.5 2564.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
+							<path d="M8299.5 2670.5 L8586.5 2670.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
 						</g>
-						<g transform="translate(7875.5, 2533.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConstrainedWidthFlexible">
+						<g transform="translate(8299.5, 2533.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConstrainedWidthFlexible">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConstrainedWidthFlexible">
 								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConstrainedWidthFlexible">ConstrainedWidthFlexible</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7875.5, 2564.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
+						<g transform="translate(8299.5, 2564.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+minWidth: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">+maxWidth: double</text>
@@ -7467,7 +7513,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(7875.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
+						<g transform="translate(8299.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">-double _getWidth()</text>
@@ -7477,9 +7523,9 @@
 					</g>
 					<g data-name="BoxConstraints">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BoxConstraints">
-							<rect x="12912.0" y="3485.0" height="31.0" width="136.0" data-name="BoxConstraints"></rect>
+							<rect x="13267.0" y="3485.0" height="31.0" width="136.0" data-name="BoxConstraints"></rect>
 						</g>
-						<g transform="translate(12912, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxConstraints">
+						<g transform="translate(13267, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxConstraints">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxConstraints">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxConstraints">BoxConstraints</text>
 								
@@ -7488,16 +7534,16 @@
 					</g>
 					<g data-name="PrimaryButton">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PrimaryButton">
-							<rect x="8202.5" y="2511.5" height="227.0" width="333.0" data-name="PrimaryButton"></rect>
-							<path d="M8202.5 2542.5 L8535.5 2542.5" fill="none" data-name="PrimaryButton"></path>
+							<rect x="8626.5" y="2511.5" height="227.0" width="333.0" data-name="PrimaryButton"></rect>
+							<path d="M8626.5 2542.5 L8959.5 2542.5" fill="none" data-name="PrimaryButton"></path>
 						</g>
-						<g transform="translate(8202.5, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PrimaryButton">
+						<g transform="translate(8626.5, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PrimaryButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PrimaryButton">
 								<text x="158.5" y="13.5" stroke="none" text-anchor="middle" data-name="PrimaryButton">PrimaryButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8202.5, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PrimaryButton">
+						<g transform="translate(8626.5, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PrimaryButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PrimaryButton">
 								<text x="0.0" y="13.5" stroke="none" data-name="PrimaryButton">+text: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PrimaryButton">+icon: IconData?</text>
@@ -7517,9 +7563,9 @@
 					</g>
 					<g data-name="void Function()?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="18277.3" y="4118.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
+							<rect x="18072.8" y="4118.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
 						</g>
-						<g transform="translate(18277.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
+						<g transform="translate(18072.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
 								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
 								
@@ -7528,9 +7574,9 @@
 					</g>
 					<g data-name="dynamic Function()?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="11584.5" y="3485.0" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
+							<rect x="11864.8" y="3485.0" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
 						</g>
-						<g transform="translate(11584.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
+						<g transform="translate(11864.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
 								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
 								
@@ -7539,9 +7585,9 @@
 					</g>
 					<g data-name="EdgeInsets">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="13098.8" y="3485.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
+							<rect x="13453.5" y="3485.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
 						</g>
-						<g transform="translate(13098.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
+						<g transform="translate(13453.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
 								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
 								
@@ -7550,9 +7596,9 @@
 					</g>
 					<g data-name="Size">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Size">
-							<rect x="8443.0" y="3485.0" height="31.0" width="50.0" data-name="Size"></rect>
+							<rect x="8867.0" y="3485.0" height="31.0" width="50.0" data-name="Size"></rect>
 						</g>
-						<g transform="translate(8443, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Size">
+						<g transform="translate(8867, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Size">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Size">
 								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Size">Size</text>
 								
@@ -7561,16 +7607,16 @@
 					</g>
 					<g data-name="FormTableRow">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRow">
-							<rect x="8575.5" y="2549.0" height="152.0" width="379.0" data-name="FormTableRow"></rect>
-							<path d="M8575.5 2580.0 L8954.5 2580.0" fill="none" data-name="FormTableRow"></path>
+							<rect x="8999.5" y="2549.0" height="152.0" width="379.0" data-name="FormTableRow"></rect>
+							<path d="M8999.5 2580.0 L9378.5 2580.0" fill="none" data-name="FormTableRow"></path>
 						</g>
-						<g transform="translate(8575.5, 2549)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRow">
+						<g transform="translate(8999.5, 2549)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRow">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRow">
 								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRow">FormTableRow</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8575.5, 2580)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRow">
+						<g transform="translate(8999.5, 2580)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRow">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRow">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRow">+label: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRow">+labelBuilder: Widget Function(BuildContext)?</text>
@@ -7585,9 +7631,9 @@
 					</g>
 					<g data-name="Widget Function(BuildContext)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
-							<rect x="8533.0" y="3485.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
+							<rect x="8957.0" y="3485.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
 						</g>
-						<g transform="translate(8533, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
+						<g transform="translate(8957, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
 								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
 								
@@ -7596,16 +7642,16 @@
 					</g>
 					<g data-name="FormTableRowLayout">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRowLayout">
-							<rect x="6441.0" y="3447.0" height="107.0" width="370.0" data-name="FormTableRowLayout"></rect>
-							<path d="M6441.0 3478.0 L6811.0 3478.0" fill="none" data-name="FormTableRowLayout"></path>
+							<rect x="6865.0" y="3447.0" height="107.0" width="370.0" data-name="FormTableRowLayout"></rect>
+							<path d="M6865.0 3478.0 L7235.0 3478.0" fill="none" data-name="FormTableRowLayout"></path>
 						</g>
-						<g transform="translate(6441, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRowLayout">
+						<g transform="translate(6865, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRowLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRowLayout">
 								<text x="177.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRowLayout">FormTableRowLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6441, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRowLayout">
+						<g transform="translate(6865, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRowLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRowLayout">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRowLayout">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+values: List&lt;FormTableRowLayout&gt;</text>
@@ -7617,17 +7663,17 @@
 					</g>
 					<g data-name="FormTableLayout">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableLayout">
-							<rect x="9383.5" y="2548.5" height="153.0" width="379.0" data-name="FormTableLayout"></rect>
-							<path d="M9383.5 2579.5 L9762.5 2579.5" fill="none" data-name="FormTableLayout"></path>
-							<path d="M9383.5 2670.5 L9762.5 2670.5" fill="none" data-name="FormTableLayout"></path>
+							<rect x="9807.5" y="2548.5" height="153.0" width="379.0" data-name="FormTableLayout"></rect>
+							<path d="M9807.5 2579.5 L10186.5 2579.5" fill="none" data-name="FormTableLayout"></path>
+							<path d="M9807.5 2670.5 L10186.5 2670.5" fill="none" data-name="FormTableLayout"></path>
 						</g>
-						<g transform="translate(9383.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableLayout">
+						<g transform="translate(9807.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableLayout">
 								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableLayout">FormTableLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9383.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
+						<g transform="translate(9807.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+rows: List&lt;FormTableRow&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormTableLayout">+columnWidths: Map&lt;int, TableColumnWidth&gt;</text>
@@ -7637,7 +7683,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(9383.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
+						<g transform="translate(9807.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+Widget build()</text>
 								
@@ -7646,17 +7692,17 @@
 					</g>
 					<g data-name="FormSectionHeader">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormSectionHeader">
-							<rect x="9802.5" y="2548.5" height="153.0" width="220.0" data-name="FormSectionHeader"></rect>
-							<path d="M9802.5 2579.5 L10022.5 2579.5" fill="none" data-name="FormSectionHeader"></path>
-							<path d="M9802.5 2670.5 L10022.5 2670.5" fill="none" data-name="FormSectionHeader"></path>
+							<rect x="10226.5" y="2548.5" height="153.0" width="220.0" data-name="FormSectionHeader"></rect>
+							<path d="M10226.5 2579.5 L10446.5 2579.5" fill="none" data-name="FormSectionHeader"></path>
+							<path d="M10226.5 2670.5 L10446.5 2670.5" fill="none" data-name="FormSectionHeader"></path>
 						</g>
-						<g transform="translate(9802.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSectionHeader">
+						<g transform="translate(10226.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSectionHeader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSectionHeader">
 								<text x="102.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormSectionHeader">FormSectionHeader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9802.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
+						<g transform="translate(10226.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+title: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormSectionHeader">+titleTextStyle: TextStyle?</text>
@@ -7666,7 +7712,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(9802.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
+						<g transform="translate(10226.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+Widget build()</text>
 								
@@ -7675,17 +7721,17 @@
 					</g>
 					<g data-name="FormLabel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormLabel">
-							<rect x="10231.0" y="2556.0" height="138.0" width="266.0" data-name="FormLabel"></rect>
-							<path d="M10231.0 2587.0 L10497.0 2587.0" fill="none" data-name="FormLabel"></path>
-							<path d="M10231.0 2663.0 L10497.0 2663.0" fill="none" data-name="FormLabel"></path>
+							<rect x="10655.0" y="2556.0" height="138.0" width="266.0" data-name="FormLabel"></rect>
+							<path d="M10655.0 2587.0 L10921.0 2587.0" fill="none" data-name="FormLabel"></path>
+							<path d="M10655.0 2663.0 L10921.0 2663.0" fill="none" data-name="FormLabel"></path>
 						</g>
-						<g transform="translate(10231, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormLabel">
+						<g transform="translate(10655, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormLabel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormLabel">
 								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormLabel">FormLabel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10231, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
+						<g transform="translate(10655, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+labelText: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormLabel">+helpText: String?</text>
@@ -7694,7 +7740,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(10231, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
+						<g transform="translate(10655, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+Widget build()</text>
 								
@@ -7703,24 +7749,24 @@
 					</g>
 					<g data-name="DismissButton">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DismissButton">
-							<rect x="15606.0" y="3789.5" height="108.0" width="249.0" data-name="DismissButton"></rect>
-							<path d="M15606.0 3820.5 L15855.0 3820.5" fill="none" data-name="DismissButton"></path>
-							<path d="M15606.0 3866.5 L15855.0 3866.5" fill="none" data-name="DismissButton"></path>
+							<rect x="15401.5" y="3789.5" height="108.0" width="249.0" data-name="DismissButton"></rect>
+							<path d="M15401.5 3820.5 L15650.5 3820.5" fill="none" data-name="DismissButton"></path>
+							<path d="M15401.5 3866.5 L15650.5 3866.5" fill="none" data-name="DismissButton"></path>
 						</g>
-						<g transform="translate(15606, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DismissButton">
+						<g transform="translate(15401.5, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DismissButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DismissButton">
 								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="DismissButton">DismissButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15606, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
+						<g transform="translate(15401.5, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
 								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+onPressed: void Function()?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DismissButton">+text: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15606, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
+						<g transform="translate(15401.5, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
 								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+Widget build()</text>
 								
@@ -7729,17 +7775,17 @@
 					</g>
 					<g data-name="Badge">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Badge">
-							<rect x="10537.0" y="2496.0" height="258.0" width="263.0" data-name="Badge"></rect>
-							<path d="M10537.0 2527.0 L10800.0 2527.0" fill="none" data-name="Badge"></path>
-							<path d="M10537.0 2678.0 L10800.0 2678.0" fill="none" data-name="Badge"></path>
+							<rect x="10961.0" y="2496.0" height="258.0" width="263.0" data-name="Badge"></rect>
+							<path d="M10961.0 2527.0 L11224.0 2527.0" fill="none" data-name="Badge"></path>
+							<path d="M10961.0 2678.0 L11224.0 2678.0" fill="none" data-name="Badge"></path>
 						</g>
-						<g transform="translate(10537, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Badge">
+						<g transform="translate(10961, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Badge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Badge">
 								<text x="123.5" y="13.5" stroke="none" text-anchor="middle" data-name="Badge">Badge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10537, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
+						<g transform="translate(10961, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
 								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+icon: IconData?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Badge">+color: Color?</text>
@@ -7753,7 +7799,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(10537, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
+						<g transform="translate(10961, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
 								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Badge">-Color? _getBackgroundColor()</text>
@@ -7765,16 +7811,16 @@
 					</g>
 					<g data-name="BadgeType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="26691.8" y="3432.0" height="137.0" width="288.0" data-name="BadgeType"></rect>
-							<path d="M26691.8 3463.0 L26979.8 3463.0" fill="none" data-name="BadgeType"></path>
+							<rect x="24378.3" y="3432.0" height="137.0" width="288.0" data-name="BadgeType"></rect>
+							<path d="M24378.3 3463.0 L24666.3 3463.0" fill="none" data-name="BadgeType"></path>
 						</g>
-						<g transform="translate(26691.75, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
+						<g transform="translate(24378.25, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
 								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26691.75, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BadgeType">
+						<g transform="translate(24378.25, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BadgeType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BadgeType">
 								<text x="0.0" y="13.5" stroke="none" data-name="BadgeType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BadgeType">&lt;static&gt;+values: List&lt;BadgeType&gt;</text>
@@ -7788,17 +7834,17 @@
 					</g>
 					<g data-name="StandardDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StandardDialog">
-							<rect x="10840.0" y="2488.5" height="273.0" width="247.0" data-name="StandardDialog"></rect>
-							<path d="M10840.0 2519.5 L11087.0 2519.5" fill="none" data-name="StandardDialog"></path>
-							<path d="M10840.0 2730.5 L11087.0 2730.5" fill="none" data-name="StandardDialog"></path>
+							<rect x="11264.0" y="2488.5" height="273.0" width="247.0" data-name="StandardDialog"></rect>
+							<path d="M11264.0 2519.5 L11511.0 2519.5" fill="none" data-name="StandardDialog"></path>
+							<path d="M11264.0 2730.5 L11511.0 2730.5" fill="none" data-name="StandardDialog"></path>
 						</g>
-						<g transform="translate(10840, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardDialog">
+						<g transform="translate(11264, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardDialog">
 								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardDialog">StandardDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10840, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
+						<g transform="translate(11264, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+title: Widget?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StandardDialog">+titleText: String?</text>
@@ -7816,7 +7862,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(10840, 2730.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
+						<g transform="translate(11264, 2730.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+Widget build()</text>
 								
@@ -7825,16 +7871,16 @@
 					</g>
 					<g data-name="ISyncIndicatorViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ISyncIndicatorViewModel">
-							<rect x="27782.0" y="98.0" height="77.0" width="214.0" data-name="ISyncIndicatorViewModel"></rect>
-							<path d="M27782.0 129.0 L27996.0 129.0" fill="none" data-name="ISyncIndicatorViewModel"></path>
+							<rect x="27545.3" y="98.0" height="77.0" width="214.0" data-name="ISyncIndicatorViewModel"></rect>
+							<path d="M27545.3 129.0 L27759.3 129.0" fill="none" data-name="ISyncIndicatorViewModel"></path>
 						</g>
-						<g transform="translate(27782, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ISyncIndicatorViewModel">
+						<g transform="translate(27545.25, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ISyncIndicatorViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ISyncIndicatorViewModel">
 								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="ISyncIndicatorViewModel">ISyncIndicatorViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27782, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ISyncIndicatorViewModel">
+						<g transform="translate(27545.25, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ISyncIndicatorViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ISyncIndicatorViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ISyncIndicatorViewModel">+isDirty: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ISyncIndicatorViewModel">+lastSynced: DateTime?</text>
@@ -7844,16 +7890,16 @@
 					</g>
 					<g data-name="SyncIndicator">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SyncIndicator">
-							<rect x="11127.0" y="2564.0" height="122.0" width="208.0" data-name="SyncIndicator"></rect>
-							<path d="M11127.0 2595.0 L11335.0 2595.0" fill="none" data-name="SyncIndicator"></path>
+							<rect x="11551.0" y="2564.0" height="122.0" width="208.0" data-name="SyncIndicator"></rect>
+							<path d="M11551.0 2595.0 L11759.0 2595.0" fill="none" data-name="SyncIndicator"></path>
 						</g>
-						<g transform="translate(11127, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SyncIndicator">
+						<g transform="translate(11551, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SyncIndicator">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SyncIndicator">
 								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="SyncIndicator">SyncIndicator</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11127, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SyncIndicator">
+						<g transform="translate(11551, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SyncIndicator">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SyncIndicator">
 								<text x="0.0" y="13.5" stroke="none" data-name="SyncIndicator">+state: AsyncValue&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SyncIndicator">+lastSynced: DateTime?</text>
@@ -7866,16 +7912,16 @@
 					</g>
 					<g data-name="IWithBanner">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="13085.5" y="1181.5" height="62.0" width="164.0" data-name="IWithBanner"></rect>
-							<path d="M13085.5 1212.5 L13249.5 1212.5" fill="none" data-name="IWithBanner"></path>
+							<rect x="15050.8" y="1181.5" height="62.0" width="164.0" data-name="IWithBanner"></rect>
+							<path d="M15050.8 1212.5 L15214.8 1212.5" fill="none" data-name="IWithBanner"></path>
 						</g>
-						<g transform="translate(13085.5, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
+						<g transform="translate(15050.75, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
 								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13085.5, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IWithBanner">
+						<g transform="translate(15050.75, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IWithBanner">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IWithBanner">
 								<text x="0.0" y="13.5" stroke="none" data-name="IWithBanner">+Widget? banner()</text>
 								
@@ -7884,16 +7930,16 @@
 					</g>
 					<g data-name="BannerBox">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BannerBox">
-							<rect x="11375.0" y="2534.0" height="182.0" width="298.0" data-name="BannerBox"></rect>
-							<path d="M11375.0 2565.0 L11673.0 2565.0" fill="none" data-name="BannerBox"></path>
+							<rect x="11799.0" y="2534.0" height="182.0" width="298.0" data-name="BannerBox"></rect>
+							<path d="M11799.0 2565.0 L12097.0 2565.0" fill="none" data-name="BannerBox"></path>
 						</g>
-						<g transform="translate(11375, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerBox">
+						<g transform="translate(11799, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerBox">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerBox">
 								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerBox">BannerBox</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11375, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerBox">
+						<g transform="translate(11799, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerBox">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerBox">
 								<text x="0.0" y="13.5" stroke="none" data-name="BannerBox">+prefixIcon: Widget?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BannerBox">+body: Widget</text>
@@ -7910,16 +7956,16 @@
 					</g>
 					<g data-name="BannerStyle">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BannerStyle">
-							<rect x="4939.0" y="3439.5" height="122.0" width="294.0" data-name="BannerStyle"></rect>
-							<path d="M4939.0 3470.5 L5233.0 3470.5" fill="none" data-name="BannerStyle"></path>
+							<rect x="5363.0" y="3439.5" height="122.0" width="294.0" data-name="BannerStyle"></rect>
+							<path d="M5363.0 3470.5 L5657.0 3470.5" fill="none" data-name="BannerStyle"></path>
 						</g>
-						<g transform="translate(4939, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerStyle">
+						<g transform="translate(5363, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerStyle">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerStyle">
 								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerStyle">BannerStyle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4939, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerStyle">
+						<g transform="translate(5363, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerStyle">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerStyle">
 								<text x="0.0" y="13.5" stroke="none" data-name="BannerStyle">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+values: List&lt;BannerStyle&gt;</text>
@@ -7932,17 +7978,17 @@
 					</g>
 					<g data-name="ActionMenuInline">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuInline">
-							<rect x="28036.0" y="52.5" height="168.0" width="324.0" data-name="ActionMenuInline"></rect>
-							<path d="M28036.0 83.5 L28360.0 83.5" fill="none" data-name="ActionMenuInline"></path>
-							<path d="M28036.0 189.5 L28360.0 189.5" fill="none" data-name="ActionMenuInline"></path>
+							<rect x="27799.3" y="52.5" height="168.0" width="324.0" data-name="ActionMenuInline"></rect>
+							<path d="M27799.3 83.5 L28123.3 83.5" fill="none" data-name="ActionMenuInline"></path>
+							<path d="M27799.3 189.5 L28123.3 189.5" fill="none" data-name="ActionMenuInline"></path>
 						</g>
-						<g transform="translate(28036, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuInline">
+						<g transform="translate(27799.25, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuInline">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuInline">
 								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuInline">ActionMenuInline</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28036, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
+						<g transform="translate(27799.25, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
 								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuInline">+iconSize: double?</text>
@@ -7953,7 +7999,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(28036, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
+						<g transform="translate(27799.25, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
 								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+Widget build()</text>
 								
@@ -7962,16 +8008,16 @@
 					</g>
 					<g data-name="Collapsible">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Collapsible">
-							<rect x="28400.0" y="83.0" height="107.0" width="441.0" data-name="Collapsible"></rect>
-							<path d="M28400.0 114.0 L28841.0 114.0" fill="none" data-name="Collapsible"></path>
+							<rect x="28163.3" y="83.0" height="107.0" width="441.0" data-name="Collapsible"></rect>
+							<path d="M28163.3 114.0 L28604.3 114.0" fill="none" data-name="Collapsible"></path>
 						</g>
-						<g transform="translate(28400, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Collapsible">
+						<g transform="translate(28163.25, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Collapsible">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Collapsible">
 								<text x="212.5" y="13.5" stroke="none" text-anchor="middle" data-name="Collapsible">Collapsible</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28400, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Collapsible">
+						<g transform="translate(28163.25, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Collapsible">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Collapsible">
 								<text x="0.0" y="13.5" stroke="none" data-name="Collapsible">+contentBuilder: Widget Function(BuildContext, bool)</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Collapsible">+headerBuilder: Widget Function(BuildContext, bool)?</text>
@@ -7983,9 +8029,9 @@
 					</g>
 					<g data-name="Widget Function(BuildContext, bool)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)">
-							<rect x="27521.5" y="614.0" height="31.0" width="300.0" data-name="Widget Function(BuildContext, bool)"></rect>
+							<rect x="27284.8" y="614.0" height="31.0" width="300.0" data-name="Widget Function(BuildContext, bool)"></rect>
 						</g>
-						<g transform="translate(27521.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)">
+						<g transform="translate(27284.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)">
 								<text x="142.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)">Widget Function(BuildContext, bool)</text>
 								
@@ -7994,9 +8040,9 @@
 					</g>
 					<g data-name="Widget Function(BuildContext, bool)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)?">
-							<rect x="28465.5" y="614.0" height="31.0" width="310.0" data-name="Widget Function(BuildContext, bool)?"></rect>
+							<rect x="28228.8" y="614.0" height="31.0" width="310.0" data-name="Widget Function(BuildContext, bool)?"></rect>
 						</g>
-						<g transform="translate(28465.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)?">
+						<g transform="translate(28228.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)?">
 								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)?">Widget Function(BuildContext, bool)?</text>
 								
@@ -8005,16 +8051,16 @@
 					</g>
 					<g data-name="NavbarTab">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="61402.8" y="1644.0" height="107.0" width="196.0" data-name="NavbarTab"></rect>
-							<path d="M61402.8 1675.0 L61598.8 1675.0" fill="none" data-name="NavbarTab"></path>
+							<rect x="61633.0" y="1644.0" height="107.0" width="196.0" data-name="NavbarTab"></rect>
+							<path d="M61633.0 1675.0 L61829.0 1675.0" fill="none" data-name="NavbarTab"></path>
 						</g>
-						<g transform="translate(61402.75, 1644)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
+						<g transform="translate(61633, 1644)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
 								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61402.75, 1675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NavbarTab">
+						<g transform="translate(61633, 1675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NavbarTab">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NavbarTab">
 								<text x="0.0" y="13.5" stroke="none" data-name="NavbarTab">+title: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="NavbarTab">+intent: RoutingIntent?</text>
@@ -8026,17 +8072,17 @@
 					</g>
 					<g data-name="RoutingIntent">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="44187.8" y="2518.5" height="213.0" width="297.0" data-name="RoutingIntent"></rect>
-							<path d="M44187.8 2549.5 L44484.8 2549.5" fill="none" data-name="RoutingIntent"></path>
-							<path d="M44187.8 2685.5 L44484.8 2685.5" fill="none" data-name="RoutingIntent"></path>
+							<rect x="41854.8" y="2518.5" height="213.0" width="297.0" data-name="RoutingIntent"></rect>
+							<path d="M41854.8 2549.5 L42151.8 2549.5" fill="none" data-name="RoutingIntent"></path>
+							<path d="M41854.8 2685.5 L42151.8 2685.5" fill="none" data-name="RoutingIntent"></path>
 						</g>
-						<g transform="translate(44187.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
+						<g transform="translate(41854.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
 								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44187.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
+						<g transform="translate(41854.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
 								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">+route: GoRoute</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+params: Map&lt;String, String&gt;</text>
@@ -8049,7 +8095,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(44187.75, 2685.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
+						<g transform="translate(41854.75, 2685.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
 								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">-dynamic _validateRoute()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+bool matches()</text>
@@ -8059,16 +8105,16 @@
 					</g>
 					<g data-name="TabbedNavbar">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TabbedNavbar">
-							<rect x="12039.8" y="2496.5" height="257.0" width="308.0" data-name="TabbedNavbar"></rect>
-							<path d="M12039.8 2527.5 L12347.8 2527.5" fill="none" data-name="TabbedNavbar"></path>
+							<rect x="12386.3" y="2496.5" height="257.0" width="308.0" data-name="TabbedNavbar"></rect>
+							<path d="M12386.3 2527.5 L12694.3 2527.5" fill="none" data-name="TabbedNavbar"></path>
 						</g>
-						<g transform="translate(12039.75, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabbedNavbar">
+						<g transform="translate(12386.25, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabbedNavbar">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabbedNavbar">
 								<text x="146.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabbedNavbar">TabbedNavbar</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12039.75, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TabbedNavbar">
+						<g transform="translate(12386.25, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TabbedNavbar">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TabbedNavbar">
 								<text x="0.0" y="13.5" stroke="none" data-name="TabbedNavbar">+tabs: List&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TabbedNavbar">+selectedTab: T?</text>
@@ -8090,9 +8136,9 @@
 					</g>
 					<g data-name="BoxDecoration">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BoxDecoration">
-							<rect x="11801.5" y="3485.0" height="31.0" width="132.0" data-name="BoxDecoration"></rect>
+							<rect x="12081.8" y="3485.0" height="31.0" width="132.0" data-name="BoxDecoration"></rect>
 						</g>
-						<g transform="translate(11801.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxDecoration">
+						<g transform="translate(12081.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxDecoration">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxDecoration">
 								<text x="58.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxDecoration">BoxDecoration</text>
 								
@@ -8101,9 +8147,9 @@
 					</g>
 					<g data-name="void Function(int, T)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(int, T)?">
-							<rect x="11973.5" y="3485.0" height="31.0" width="183.0" data-name="void Function(int, T)?"></rect>
+							<rect x="12253.8" y="3485.0" height="31.0" width="183.0" data-name="void Function(int, T)?"></rect>
 						</g>
-						<g transform="translate(11973.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(int, T)?">
+						<g transform="translate(12253.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(int, T)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(int, T)?">
 								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(int, T)?">void Function(int, T)?</text>
 								
@@ -8112,9 +8158,9 @@
 					</g>
 					<g data-name="TabBarIndicatorSize">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TabBarIndicatorSize">
-							<rect x="12196.5" y="3485.0" height="31.0" width="176.0" data-name="TabBarIndicatorSize"></rect>
+							<rect x="12476.8" y="3485.0" height="31.0" width="176.0" data-name="TabBarIndicatorSize"></rect>
 						</g>
-						<g transform="translate(12196.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabBarIndicatorSize">
+						<g transform="translate(12476.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabBarIndicatorSize">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabBarIndicatorSize">
 								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabBarIndicatorSize">TabBarIndicatorSize</text>
 								
@@ -8123,16 +8169,16 @@
 					</g>
 					<g data-name="SidesheetTab">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SidesheetTab">
-							<rect x="61155.0" y="2594.0" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
-							<path d="M61155.0 2625.0 L61485.0 2625.0" fill="none" data-name="SidesheetTab"></path>
+							<rect x="61385.3" y="2594.0" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
+							<path d="M61385.3 2625.0 L61715.3 2625.0" fill="none" data-name="SidesheetTab"></path>
 						</g>
-						<g transform="translate(61155, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
+						<g transform="translate(61385.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SidesheetTab">
 								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="SidesheetTab">SidesheetTab</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61155, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
+						<g transform="translate(61385.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SidesheetTab">
 								<text x="0.0" y="13.5" stroke="none" data-name="SidesheetTab">+builder: Widget Function(BuildContext)</text>
 								
@@ -8141,9 +8187,9 @@
 					</g>
 					<g data-name="Widget Function(BuildContext)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="49002.5" y="3485.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
+							<rect x="48752.3" y="3485.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
 						</g>
-						<g transform="translate(49002.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
+						<g transform="translate(48752.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
 								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
 								
@@ -8152,16 +8198,16 @@
 					</g>
 					<g data-name="Sidesheet">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Sidesheet">
-							<rect x="12715.3" y="2519.0" height="212.0" width="341.0" data-name="Sidesheet"></rect>
-							<path d="M12715.3 2550.0 L13056.3 2550.0" fill="none" data-name="Sidesheet"></path>
+							<rect x="13061.0" y="2519.0" height="212.0" width="341.0" data-name="Sidesheet"></rect>
+							<path d="M13061.0 2550.0 L13402.0 2550.0" fill="none" data-name="Sidesheet"></path>
 						</g>
-						<g transform="translate(12715.25, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
+						<g transform="translate(13061, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Sidesheet">
 								<text x="162.5" y="13.5" stroke="none" text-anchor="middle" data-name="Sidesheet">Sidesheet</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12715.25, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
+						<g transform="translate(13061, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Sidesheet">
 								<text x="0.0" y="13.5" stroke="none" data-name="Sidesheet">&lt;static&gt;+kDefaultWidth: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Sidesheet">+titleText: String</text>
@@ -8180,9 +8226,9 @@
 					</g>
 					<g data-name="Widget Function(Widget)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Widget)?">
-							<rect x="19573.8" y="3485.0" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
+							<rect x="18892.3" y="3485.0" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
 						</g>
-						<g transform="translate(19573.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
+						<g transform="translate(18892.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Widget)?">
 								<text x="102.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Widget)?">Widget Function(Widget)?</text>
 								
@@ -8191,16 +8237,16 @@
 					</g>
 					<g data-name="FormSideSheetTab">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormSideSheetTab">
-							<rect x="61525.0" y="2594.0" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
-							<path d="M61525.0 2625.0 L61838.0 2625.0" fill="none" data-name="FormSideSheetTab"></path>
+							<rect x="61755.3" y="2594.0" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
+							<path d="M61755.3 2625.0 L62068.3 2625.0" fill="none" data-name="FormSideSheetTab"></path>
 						</g>
-						<g transform="translate(61525, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
+						<g transform="translate(61755.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSideSheetTab">
 								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormSideSheetTab">FormSideSheetTab</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61525, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
+						<g transform="translate(61755.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSideSheetTab">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormSideSheetTab">+formViewBuilder: Widget Function(T)</text>
 								
@@ -8209,23 +8255,23 @@
 					</g>
 					<g data-name="HelpIcon">
 						<g fill="#eee8d5" stroke="#33322E" data-name="HelpIcon">
-							<rect x="28881.0" y="90.0" height="93.0" width="174.0" data-name="HelpIcon"></rect>
-							<path d="M28881.0 121.0 L29055.0 121.0" fill="none" data-name="HelpIcon"></path>
-							<path d="M28881.0 152.0 L29055.0 152.0" fill="none" data-name="HelpIcon"></path>
+							<rect x="28644.3" y="90.0" height="93.0" width="174.0" data-name="HelpIcon"></rect>
+							<path d="M28644.3 121.0 L28818.3 121.0" fill="none" data-name="HelpIcon"></path>
+							<path d="M28644.3 152.0 L28818.3 152.0" fill="none" data-name="HelpIcon"></path>
 						</g>
-						<g transform="translate(28881, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HelpIcon">
+						<g transform="translate(28644.25, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HelpIcon">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HelpIcon">
 								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="HelpIcon">HelpIcon</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28881, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
+						<g transform="translate(28644.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
 								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+tooltipText: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28881, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
+						<g transform="translate(28644.25, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
 								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+Widget build()</text>
 								
@@ -8234,17 +8280,17 @@
 					</g>
 					<g data-name="EmptyBody">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EmptyBody">
-							<rect x="13672.0" y="2541.0" height="168.0" width="222.0" data-name="EmptyBody"></rect>
-							<path d="M13672.0 2572.0 L13894.0 2572.0" fill="none" data-name="EmptyBody"></path>
-							<path d="M13672.0 2678.0 L13894.0 2678.0" fill="none" data-name="EmptyBody"></path>
+							<rect x="13690.0" y="2541.0" height="168.0" width="222.0" data-name="EmptyBody"></rect>
+							<path d="M13690.0 2572.0 L13912.0 2572.0" fill="none" data-name="EmptyBody"></path>
+							<path d="M13690.0 2678.0 L13912.0 2678.0" fill="none" data-name="EmptyBody"></path>
 						</g>
-						<g transform="translate(13672, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmptyBody">
+						<g transform="translate(13690, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmptyBody">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmptyBody">
 								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="EmptyBody">EmptyBody</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13672, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
+						<g transform="translate(13690, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
 								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+icon: IconData?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EmptyBody">+leading: Widget?</text>
@@ -8255,7 +8301,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(13672, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
+						<g transform="translate(13690, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
 								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+Widget build()</text>
 								
@@ -8264,17 +8310,17 @@
 					</g>
 					<g data-name="IndicatorRangeSliderThumbShape">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IndicatorRangeSliderThumbShape">
-							<rect x="29060.5" y="560.5" height="138.0" width="287.0" data-name="IndicatorRangeSliderThumbShape"></rect>
-							<path d="M29060.5 591.5 L29347.5 591.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
-							<path d="M29060.5 652.5 L29347.5 652.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
+							<rect x="28823.8" y="560.5" height="138.0" width="287.0" data-name="IndicatorRangeSliderThumbShape"></rect>
+							<path d="M28823.8 591.5 L29110.8 591.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
+							<path d="M28823.8 652.5 L29110.8 652.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
 						</g>
-						<g transform="translate(29060.5, 560.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+						<g transform="translate(28823.75, 560.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IndicatorRangeSliderThumbShape">
 								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="IndicatorRangeSliderThumbShape">IndicatorRangeSliderThumbShape</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29060.5, 591.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+						<g transform="translate(28823.75, 591.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
 								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+buildContext: BuildContext</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+start: T</text>
@@ -8282,7 +8328,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(29060.5, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+						<g transform="translate(28823.75, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
 								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+Size getPreferredSize()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+void paint()</text>
@@ -8292,9 +8338,9 @@
 					</g>
 					<g data-name="BuildContext">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
-							<rect x="29146.0" y="1197.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
+							<rect x="28909.3" y="1197.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
 						</g>
-						<g transform="translate(29146, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
+						<g transform="translate(28909.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
 								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
 								
@@ -8303,9 +8349,9 @@
 					</g>
 					<g data-name="RangeSliderThumbShape">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RangeSliderThumbShape">
-							<rect x="29095.0" y="121.0" height="31.0" width="218.0" data-name="RangeSliderThumbShape"></rect>
+							<rect x="28858.3" y="121.0" height="31.0" width="218.0" data-name="RangeSliderThumbShape"></rect>
 						</g>
-						<g transform="translate(29095, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="RangeSliderThumbShape">
+						<g transform="translate(28858.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="RangeSliderThumbShape">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RangeSliderThumbShape">
 								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="RangeSliderThumbShape">RangeSliderThumbShape</text>
 								
@@ -8314,16 +8360,16 @@
 					</g>
 					<g data-name="MouseEventsRegion">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MouseEventsRegion">
-							<rect x="15931.5" y="3760.0" height="167.0" width="379.0" data-name="MouseEventsRegion"></rect>
-							<path d="M15931.5 3791.0 L16310.5 3791.0" fill="none" data-name="MouseEventsRegion"></path>
+							<rect x="15727.0" y="3760.0" height="167.0" width="379.0" data-name="MouseEventsRegion"></rect>
+							<path d="M15727.0 3791.0 L16106.0 3791.0" fill="none" data-name="MouseEventsRegion"></path>
 						</g>
-						<g transform="translate(15931.5, 3760)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MouseEventsRegion">
+						<g transform="translate(15727, 3760)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MouseEventsRegion">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MouseEventsRegion">
 								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="MouseEventsRegion">MouseEventsRegion</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15931.5, 3791)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MouseEventsRegion">
+						<g transform="translate(15727, 3791)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MouseEventsRegion">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MouseEventsRegion">
 								<text x="0.0" y="13.5" stroke="none" data-name="MouseEventsRegion">+onTap: void Function()?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MouseEventsRegion">+onHover: void Function(PointerHoverEvent)?</text>
@@ -8339,9 +8385,9 @@
 					</g>
 					<g data-name="void Function(PointerHoverEvent)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerHoverEvent)?">
-							<rect x="7545.8" y="4118.5" height="31.0" width="292.0" data-name="void Function(PointerHoverEvent)?"></rect>
+							<rect x="6391.0" y="4118.5" height="31.0" width="292.0" data-name="void Function(PointerHoverEvent)?"></rect>
 						</g>
-						<g transform="translate(7545.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerHoverEvent)?">
+						<g transform="translate(6391, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerHoverEvent)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerHoverEvent)?">
 								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerHoverEvent)?">void Function(PointerHoverEvent)?</text>
 								
@@ -8350,9 +8396,9 @@
 					</g>
 					<g data-name="void Function(PointerEnterEvent)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerEnterEvent)?">
-							<rect x="7877.8" y="4118.5" height="31.0" width="287.0" data-name="void Function(PointerEnterEvent)?"></rect>
+							<rect x="6723.0" y="4118.5" height="31.0" width="287.0" data-name="void Function(PointerEnterEvent)?"></rect>
 						</g>
-						<g transform="translate(7877.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerEnterEvent)?">
+						<g transform="translate(6723, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerEnterEvent)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerEnterEvent)?">
 								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerEnterEvent)?">void Function(PointerEnterEvent)?</text>
 								
@@ -8361,9 +8407,9 @@
 					</g>
 					<g data-name="void Function(PointerExitEvent)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerExitEvent)?">
-							<rect x="15686.0" y="4118.5" height="31.0" width="274.0" data-name="void Function(PointerExitEvent)?"></rect>
+							<rect x="14133.5" y="4118.5" height="31.0" width="274.0" data-name="void Function(PointerExitEvent)?"></rect>
 						</g>
-						<g transform="translate(15686, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerExitEvent)?">
+						<g transform="translate(14133.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerExitEvent)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerExitEvent)?">
 								<text x="129.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerExitEvent)?">void Function(PointerExitEvent)?</text>
 								
@@ -8372,9 +8418,9 @@
 					</g>
 					<g data-name="SystemMouseCursor">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SystemMouseCursor">
-							<rect x="16000.0" y="4118.5" height="31.0" width="180.0" data-name="SystemMouseCursor"></rect>
+							<rect x="14447.5" y="4118.5" height="31.0" width="180.0" data-name="SystemMouseCursor"></rect>
 						</g>
-						<g transform="translate(16000, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SystemMouseCursor">
+						<g transform="translate(14447.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SystemMouseCursor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SystemMouseCursor">
 								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="SystemMouseCursor">SystemMouseCursor</text>
 								
@@ -8383,9 +8429,9 @@
 					</g>
 					<g data-name="ReactiveCustomColorPicker">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveCustomColorPicker">
-							<rect x="35402.5" y="614.0" height="31.0" width="236.0" data-name="ReactiveCustomColorPicker"></rect>
+							<rect x="36062.0" y="614.0" height="31.0" width="236.0" data-name="ReactiveCustomColorPicker"></rect>
 						</g>
-						<g transform="translate(35402.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveCustomColorPicker">
+						<g transform="translate(36062, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveCustomColorPicker">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveCustomColorPicker">
 								<text x="110.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveCustomColorPicker">ReactiveCustomColorPicker</text>
 								
@@ -8394,9 +8440,9 @@
 					</g>
 					<g data-name="ReactiveFormField">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFormField">
-							<rect x="35439.0" y="121.0" height="31.0" width="163.0" data-name="ReactiveFormField"></rect>
+							<rect x="36098.5" y="121.0" height="31.0" width="163.0" data-name="ReactiveFormField"></rect>
 						</g>
-						<g transform="translate(35439, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFormField">
+						<g transform="translate(36098.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFormField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFormField">
 								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFormField">ReactiveFormField</text>
 								
@@ -8405,17 +8451,17 @@
 					</g>
 					<g data-name="TextParagraph">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TextParagraph">
-							<rect x="13934.0" y="2556.0" height="138.0" width="208.0" data-name="TextParagraph"></rect>
-							<path d="M13934.0 2587.0 L14142.0 2587.0" fill="none" data-name="TextParagraph"></path>
-							<path d="M13934.0 2663.0 L14142.0 2663.0" fill="none" data-name="TextParagraph"></path>
+							<rect x="13952.0" y="2556.0" height="138.0" width="208.0" data-name="TextParagraph"></rect>
+							<path d="M13952.0 2587.0 L14160.0 2587.0" fill="none" data-name="TextParagraph"></path>
+							<path d="M13952.0 2663.0 L14160.0 2663.0" fill="none" data-name="TextParagraph"></path>
 						</g>
-						<g transform="translate(13934, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextParagraph">
+						<g transform="translate(13952, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextParagraph">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextParagraph">
 								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextParagraph">TextParagraph</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13934, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
+						<g transform="translate(13952, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
 								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+text: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TextParagraph">+style: TextStyle?</text>
@@ -8424,7 +8470,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(13934, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
+						<g transform="translate(13952, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
 								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+Widget build()</text>
 								
@@ -8433,16 +8479,16 @@
 					</g>
 					<g data-name="UnderConstruction">
 						<g fill="#eee8d5" stroke="#33322E" data-name="UnderConstruction">
-							<rect x="35642.0" y="105.5" height="62.0" width="164.0" data-name="UnderConstruction"></rect>
-							<path d="M35642.0 136.5 L35806.0 136.5" fill="none" data-name="UnderConstruction"></path>
+							<rect x="36301.5" y="105.5" height="62.0" width="164.0" data-name="UnderConstruction"></rect>
+							<path d="M36301.5 136.5 L36465.5 136.5" fill="none" data-name="UnderConstruction"></path>
 						</g>
-						<g transform="translate(35642, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnderConstruction">
+						<g transform="translate(36301.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnderConstruction">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnderConstruction">
 								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="UnderConstruction">UnderConstruction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35642, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnderConstruction">
+						<g transform="translate(36301.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnderConstruction">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnderConstruction">
 								<text x="0.0" y="13.5" stroke="none" data-name="UnderConstruction">+Widget build()</text>
 								
@@ -8451,9 +8497,9 @@
 					</g>
 					<g data-name="NullHelperDecoration">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NullHelperDecoration">
-							<rect x="35825.0" y="614.0" height="31.0" width="184.0" data-name="NullHelperDecoration"></rect>
+							<rect x="36484.5" y="614.0" height="31.0" width="184.0" data-name="NullHelperDecoration"></rect>
 						</g>
-						<g transform="translate(35825, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NullHelperDecoration">
+						<g transform="translate(36484.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NullHelperDecoration">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NullHelperDecoration">
 								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="NullHelperDecoration">NullHelperDecoration</text>
 								
@@ -8462,9 +8508,9 @@
 					</g>
 					<g data-name="InputDecoration">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InputDecoration">
-							<rect x="35846.0" y="121.0" height="31.0" width="142.0" data-name="InputDecoration"></rect>
+							<rect x="36505.5" y="121.0" height="31.0" width="142.0" data-name="InputDecoration"></rect>
 						</g>
-						<g transform="translate(35846, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InputDecoration">
+						<g transform="translate(36505.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InputDecoration">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InputDecoration">
 								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="InputDecoration">InputDecoration</text>
 								
@@ -8473,16 +8519,16 @@
 					</g>
 					<g data-name="ActionMenuType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuType">
-							<rect x="8839.0" y="3447.0" height="107.0" width="330.0" data-name="ActionMenuType"></rect>
-							<path d="M8839.0 3478.0 L9169.0 3478.0" fill="none" data-name="ActionMenuType"></path>
+							<rect x="9263.0" y="3447.0" height="107.0" width="330.0" data-name="ActionMenuType"></rect>
+							<path d="M9263.0 3478.0 L9593.0 3478.0" fill="none" data-name="ActionMenuType"></path>
 						</g>
-						<g transform="translate(8839, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuType">
+						<g transform="translate(9263, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuType">
 								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuType">ActionMenuType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8839, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuType">
+						<g transform="translate(9263, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuType">
 								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+values: List&lt;ActionMenuType&gt;</text>
@@ -8494,24 +8540,24 @@
 					</g>
 					<g data-name="HtmlStylingBanner">
 						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlStylingBanner">
-							<rect x="14182.0" y="2571.0" height="108.0" width="298.0" data-name="HtmlStylingBanner"></rect>
-							<path d="M14182.0 2602.0 L14480.0 2602.0" fill="none" data-name="HtmlStylingBanner"></path>
-							<path d="M14182.0 2648.0 L14480.0 2648.0" fill="none" data-name="HtmlStylingBanner"></path>
+							<rect x="14200.0" y="2571.0" height="108.0" width="298.0" data-name="HtmlStylingBanner"></rect>
+							<path d="M14200.0 2602.0 L14498.0 2602.0" fill="none" data-name="HtmlStylingBanner"></path>
+							<path d="M14200.0 2648.0 L14498.0 2648.0" fill="none" data-name="HtmlStylingBanner"></path>
 						</g>
-						<g transform="translate(14182, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlStylingBanner">
+						<g transform="translate(14200, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlStylingBanner">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlStylingBanner">
 								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlStylingBanner">HtmlStylingBanner</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14182, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
+						<g transform="translate(14200, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
 								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+isDismissed: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="HtmlStylingBanner">+onDismissed: dynamic Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14182, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
+						<g transform="translate(14200, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
 								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+Widget build()</text>
 								
@@ -8520,16 +8566,16 @@
 					</g>
 					<g data-name="FormConsumerWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="81009.8" y="105.5" height="62.0" width="192.0" data-name="FormConsumerWidget"></rect>
-							<path d="M81009.8 136.5 L81201.8 136.5" fill="none" data-name="FormConsumerWidget"></path>
+							<rect x="81947.3" y="105.5" height="62.0" width="192.0" data-name="FormConsumerWidget"></rect>
+							<path d="M81947.3 136.5 L82139.3 136.5" fill="none" data-name="FormConsumerWidget"></path>
 						</g>
-						<g transform="translate(81009.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+						<g transform="translate(81947.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
 								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81009.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerWidget">
+						<g transform="translate(81947.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerWidget">+Widget build()</text>
 								
@@ -8538,16 +8584,16 @@
 					</g>
 					<g data-name="FormConsumerRefWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="13485.5" y="1666.5" height="62.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
-							<path d="M13485.5 1697.5 L13704.5 1697.5" fill="none" data-name="FormConsumerRefWidget"></path>
+							<rect x="15293.8" y="1666.5" height="62.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
+							<path d="M15293.8 1697.5 L15512.8 1697.5" fill="none" data-name="FormConsumerRefWidget"></path>
 						</g>
-						<g transform="translate(13485.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
+						<g transform="translate(15293.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
 								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13485.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerRefWidget">
+						<g transform="translate(15293.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerRefWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerRefWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerRefWidget">+Widget build()</text>
 								
@@ -8556,16 +8602,16 @@
 					</g>
 					<g data-name="SplashPage">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SplashPage">
-							<rect x="36313.0" y="105.5" height="62.0" width="136.0" data-name="SplashPage"></rect>
-							<path d="M36313.0 136.5 L36449.0 136.5" fill="none" data-name="SplashPage"></path>
+							<rect x="36972.5" y="105.5" height="62.0" width="136.0" data-name="SplashPage"></rect>
+							<path d="M36972.5 136.5 L37108.5 136.5" fill="none" data-name="SplashPage"></path>
 						</g>
-						<g transform="translate(36313, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
+						<g transform="translate(36972.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SplashPage">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SplashPage">SplashPage</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36313, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
+						<g transform="translate(36972.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SplashPage">
 								<text x="0.0" y="13.5" stroke="none" data-name="SplashPage">+Widget build()</text>
 								
@@ -8574,23 +8620,23 @@
 					</g>
 					<g data-name="ErrorPage">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ErrorPage">
-							<rect x="13283.5" y="1651.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
-							<path d="M13283.5 1682.0 L13445.5 1682.0" fill="none" data-name="ErrorPage"></path>
-							<path d="M13283.5 1713.0 L13445.5 1713.0" fill="none" data-name="ErrorPage"></path>
+							<rect x="15091.8" y="1651.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
+							<path d="M15091.8 1682.0 L15253.8 1682.0" fill="none" data-name="ErrorPage"></path>
+							<path d="M15091.8 1713.0 L15253.8 1713.0" fill="none" data-name="ErrorPage"></path>
 						</g>
-						<g transform="translate(13283.5, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
+						<g transform="translate(15091.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ErrorPage">
 								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="ErrorPage">ErrorPage</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13283.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
+						<g transform="translate(15091.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
 								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+error: Exception?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13283.5, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
+						<g transform="translate(15091.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
 								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+Widget build()</text>
 								
@@ -8599,9 +8645,9 @@
 					</g>
 					<g data-name="ConsumerWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="30158.8" y="1197.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+							<rect x="30306.3" y="1197.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
 						</g>
-						<g transform="translate(30158.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+						<g transform="translate(30306.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
 								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
@@ -8610,23 +8656,23 @@
 					</g>
 					<g data-name="StudyULogo">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyULogo">
-							<rect x="16427.0" y="3797.0" height="93.0" width="214.0" data-name="StudyULogo"></rect>
-							<path d="M16427.0 3828.0 L16641.0 3828.0" fill="none" data-name="StudyULogo"></path>
-							<path d="M16427.0 3859.0 L16641.0 3859.0" fill="none" data-name="StudyULogo"></path>
+							<rect x="16222.5" y="3797.0" height="93.0" width="214.0" data-name="StudyULogo"></rect>
+							<path d="M16222.5 3828.0 L16436.5 3828.0" fill="none" data-name="StudyULogo"></path>
+							<path d="M16222.5 3859.0 L16436.5 3859.0" fill="none" data-name="StudyULogo"></path>
 						</g>
-						<g transform="translate(16427, 3797)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyULogo">
+						<g transform="translate(16222.5, 3797)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyULogo">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyULogo">
 								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyULogo">StudyULogo</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16427, 3828)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
+						<g transform="translate(16222.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+onTap: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16427, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
+						<g transform="translate(16222.5, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+Widget build()</text>
 								
@@ -8635,17 +8681,17 @@
 					</g>
 					<g data-name="SingleColumnLayout">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayout">
-							<rect x="14520.0" y="2526.0" height="198.0" width="418.0" data-name="SingleColumnLayout"></rect>
-							<path d="M14520.0 2557.0 L14938.0 2557.0" fill="none" data-name="SingleColumnLayout"></path>
-							<path d="M14520.0 2693.0 L14938.0 2693.0" fill="none" data-name="SingleColumnLayout"></path>
+							<rect x="14538.0" y="2526.0" height="198.0" width="418.0" data-name="SingleColumnLayout"></rect>
+							<path d="M14538.0 2557.0 L14956.0 2557.0" fill="none" data-name="SingleColumnLayout"></path>
+							<path d="M14538.0 2693.0 L14956.0 2693.0" fill="none" data-name="SingleColumnLayout"></path>
 						</g>
-						<g transform="translate(14520, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayout">
+						<g transform="translate(14538, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayout">
 								<text x="201.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayout">SingleColumnLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14520, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
+						<g transform="translate(14538, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
 								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraints: BoxConstraints</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraintsNarrow: BoxConstraints</text>
@@ -8658,7 +8704,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(14520, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
+						<g transform="translate(14538, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
 								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+dynamic fromType()</text>
 								
@@ -8667,16 +8713,16 @@
 					</g>
 					<g data-name="SingleColumnLayoutType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="29142.3" y="3432.0" height="137.0" width="426.0" data-name="SingleColumnLayoutType"></rect>
-							<path d="M29142.3 3463.0 L29568.3 3463.0" fill="none" data-name="SingleColumnLayoutType"></path>
+							<rect x="28995.5" y="3432.0" height="137.0" width="426.0" data-name="SingleColumnLayoutType"></rect>
+							<path d="M28995.5 3463.0 L29421.5 3463.0" fill="none" data-name="SingleColumnLayoutType"></path>
 						</g>
-						<g transform="translate(29142.25, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
+						<g transform="translate(28995.5, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
 								<text x="205.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29142.25, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayoutType">
+						<g transform="translate(28995.5, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayoutType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayoutType">
 								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayoutType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;</text>
@@ -8690,16 +8736,16 @@
 					</g>
 					<g data-name="Hyperlink">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Hyperlink">
-							<rect x="15615.0" y="2519.0" height="212.0" width="222.0" data-name="Hyperlink"></rect>
-							<path d="M15615.0 2550.0 L15837.0 2550.0" fill="none" data-name="Hyperlink"></path>
+							<rect x="15410.5" y="2519.0" height="212.0" width="222.0" data-name="Hyperlink"></rect>
+							<path d="M15410.5 2550.0 L15632.5 2550.0" fill="none" data-name="Hyperlink"></path>
 						</g>
-						<g transform="translate(15615, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Hyperlink">
+						<g transform="translate(15410.5, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Hyperlink">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Hyperlink">
 								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="Hyperlink">Hyperlink</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15615, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Hyperlink">
+						<g transform="translate(15410.5, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Hyperlink">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Hyperlink">
 								<text x="0.0" y="13.5" stroke="none" data-name="Hyperlink">+text: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Hyperlink">+url: String?</text>
@@ -8718,16 +8764,16 @@
 					</g>
 					<g data-name="StandardTableColumn">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableColumn">
-							<rect x="21586.0" y="2556.5" height="137.0" width="287.0" data-name="StandardTableColumn"></rect>
-							<path d="M21586.0 2587.5 L21873.0 2587.5" fill="none" data-name="StandardTableColumn"></path>
+							<rect x="21627.3" y="2556.5" height="137.0" width="287.0" data-name="StandardTableColumn"></rect>
+							<path d="M21627.3 2587.5 L21914.3 2587.5" fill="none" data-name="StandardTableColumn"></path>
 						</g>
-						<g transform="translate(21586, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableColumn">
+						<g transform="translate(21627.25, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableColumn">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableColumn">
 								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableColumn">StandardTableColumn</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21586, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableColumn">
+						<g transform="translate(21627.25, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableColumn">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableColumn">
 								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableColumn">+label: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableColumn">+tooltip: String?</text>
@@ -8741,9 +8787,9 @@
 					</g>
 					<g data-name="TableColumnWidth">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TableColumnWidth">
-							<rect x="26271.5" y="3485.0" height="31.0" width="165.0" data-name="TableColumnWidth"></rect>
+							<rect x="24859.3" y="3485.0" height="31.0" width="165.0" data-name="TableColumnWidth"></rect>
 						</g>
-						<g transform="translate(26271.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TableColumnWidth">
+						<g transform="translate(24859.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TableColumnWidth">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableColumnWidth">
 								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableColumnWidth">TableColumnWidth</text>
 								
@@ -8752,16 +8798,16 @@
 					</g>
 					<g data-name="StandardTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTable">
-							<rect x="19871.8" y="1494.0" height="407.0" width="688.0" data-name="StandardTable"></rect>
-							<path d="M19871.8 1525.0 L20559.8 1525.0" fill="none" data-name="StandardTable"></path>
+							<rect x="20535.8" y="1494.0" height="407.0" width="688.0" data-name="StandardTable"></rect>
+							<path d="M20535.8 1525.0 L21223.8 1525.0" fill="none" data-name="StandardTable"></path>
 						</g>
-						<g transform="translate(19871.75, 1494)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTable">
+						<g transform="translate(20535.75, 1494)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTable">
 								<text x="336.0" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTable">StandardTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19871.75, 1525)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTable">
+						<g transform="translate(20535.75, 1525)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StandardTable">+items: List&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StandardTable">+inputColumns: List&lt;StandardTableColumn&gt;</text>
@@ -8793,9 +8839,9 @@
 					</g>
 					<g data-name="void Function(T)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="27441.8" y="3485.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
+							<rect x="25436.3" y="3485.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
 						</g>
-						<g transform="translate(27441.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
+						<g transform="translate(25436.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
 								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
 								
@@ -8804,9 +8850,9 @@
 					</g>
 					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-							<rect x="18928.3" y="2609.5" height="31.0" width="381.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?"></rect>
+							<rect x="18723.8" y="2609.5" height="31.0" width="381.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?"></rect>
 						</g>
-						<g transform="translate(18928.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
+						<g transform="translate(18723.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
 								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
 								
@@ -8815,9 +8861,9 @@
 					</g>
 					<g data-name="int Function(T, T)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(T, T)?">
-							<rect x="19389.3" y="2609.5" height="31.0" width="160.0" data-name="int Function(T, T)?"></rect>
+							<rect x="19184.8" y="2609.5" height="31.0" width="160.0" data-name="int Function(T, T)?"></rect>
 						</g>
-						<g transform="translate(19389.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(T, T)?">
+						<g transform="translate(19184.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(T, T)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(T, T)?">
 								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(T, T)?">int Function(T, T)?</text>
 								
@@ -8826,9 +8872,9 @@
 					</g>
 					<g data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<rect x="19589.3" y="2609.5" height="31.0" width="523.0" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?"></rect>
+							<rect x="20613.3" y="2609.5" height="31.0" width="523.0" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?"></rect>
 						</g>
-						<g transform="translate(19589.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+						<g transform="translate(20613.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
 								<text x="253.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
 								
@@ -8837,16 +8883,16 @@
 					</g>
 					<g data-name="StandardTableStyle">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableStyle">
-							<rect x="9715.0" y="3447.0" height="107.0" width="353.0" data-name="StandardTableStyle"></rect>
-							<path d="M9715.0 3478.0 L10068.0 3478.0" fill="none" data-name="StandardTableStyle"></path>
+							<rect x="10139.0" y="3447.0" height="107.0" width="353.0" data-name="StandardTableStyle"></rect>
+							<path d="M10139.0 3478.0 L10492.0 3478.0" fill="none" data-name="StandardTableStyle"></path>
 						</g>
-						<g transform="translate(9715, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableStyle">
+						<g transform="translate(10139, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableStyle">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableStyle">
 								<text x="168.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableStyle">StandardTableStyle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9715, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableStyle">
+						<g transform="translate(10139, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableStyle">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableStyle">
 								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableStyle">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+values: List&lt;StandardTableStyle&gt;</text>
@@ -8858,24 +8904,24 @@
 					</g>
 					<g data-name="IconPack">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IconPack">
-							<rect x="36489.0" y="82.5" height="108.0" width="359.0" data-name="IconPack"></rect>
-							<path d="M36489.0 113.5 L36848.0 113.5" fill="none" data-name="IconPack"></path>
-							<path d="M36489.0 159.5 L36848.0 159.5" fill="none" data-name="IconPack"></path>
+							<rect x="37148.5" y="82.5" height="108.0" width="359.0" data-name="IconPack"></rect>
+							<path d="M37148.5 113.5 L37507.5 113.5" fill="none" data-name="IconPack"></path>
+							<path d="M37148.5 159.5 L37507.5 159.5" fill="none" data-name="IconPack"></path>
 						</g>
-						<g transform="translate(36489, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPack">
+						<g transform="translate(37148.5, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPack">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPack">
 								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPack">IconPack</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36489, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
+						<g transform="translate(37148.5, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+defaultPack: List&lt;IconOption&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IconPack">&lt;static&gt;+material: List&lt;IconOption&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36489, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
+						<g transform="translate(37148.5, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+IconOption? resolveIconByName()</text>
 								
@@ -8884,17 +8930,17 @@
 					</g>
 					<g data-name="IconOption">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IconOption">
-							<rect x="23464.0" y="2548.5" height="153.0" width="264.0" data-name="IconOption"></rect>
-							<path d="M23464.0 2579.5 L23728.0 2579.5" fill="none" data-name="IconOption"></path>
-							<path d="M23464.0 2655.5 L23728.0 2655.5" fill="none" data-name="IconOption"></path>
+							<rect x="21323.3" y="2548.5" height="153.0" width="264.0" data-name="IconOption"></rect>
+							<path d="M21323.3 2579.5 L21587.3 2579.5" fill="none" data-name="IconOption"></path>
+							<path d="M21323.3 2655.5 L21587.3 2655.5" fill="none" data-name="IconOption"></path>
 						</g>
-						<g transform="translate(23464, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconOption">
+						<g transform="translate(21323.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconOption">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconOption">
 								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="IconOption">IconOption</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23464, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
+						<g transform="translate(21323.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+name: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">+icon: IconData?</text>
@@ -8903,7 +8949,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(23464, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
+						<g transform="translate(21323.25, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+String toJson()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">&lt;static&gt;+IconOption fromJson()</text>
@@ -8911,22 +8957,11 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="22872.0" y="1682.0" height="31.0" width="96.0" data-name="Equatable"></rect>
-						</g>
-						<g transform="translate(22872, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
-								
-							</g>
-						</g>
-					</g>
 					<g data-name="ReactiveIconPicker">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveIconPicker">
-							<rect x="36066.5" y="614.0" height="31.0" width="168.0" data-name="ReactiveIconPicker"></rect>
+							<rect x="36726.0" y="614.0" height="31.0" width="168.0" data-name="ReactiveIconPicker"></rect>
 						</g>
-						<g transform="translate(36066.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveIconPicker">
+						<g transform="translate(36726, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveIconPicker">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveIconPicker">
 								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveIconPicker">ReactiveIconPicker</text>
 								
@@ -8935,9 +8970,9 @@
 					</g>
 					<g data-name="ReactiveFocusableFormField">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFocusableFormField">
-							<rect x="36028.0" y="121.0" height="31.0" width="245.0" data-name="ReactiveFocusableFormField"></rect>
+							<rect x="36687.5" y="121.0" height="31.0" width="245.0" data-name="ReactiveFocusableFormField"></rect>
 						</g>
-						<g transform="translate(36028, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFocusableFormField">
+						<g transform="translate(36687.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFocusableFormField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFocusableFormField">
 								<text x="114.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFocusableFormField">ReactiveFocusableFormField</text>
 								
@@ -8946,17 +8981,17 @@
 					</g>
 					<g data-name="IconPicker">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IconPicker">
-							<rect x="23549.0" y="1606.0" height="183.0" width="319.0" data-name="IconPicker"></rect>
-							<path d="M23549.0 1637.0 L23868.0 1637.0" fill="none" data-name="IconPicker"></path>
-							<path d="M23549.0 1758.0 L23868.0 1758.0" fill="none" data-name="IconPicker"></path>
+							<rect x="22935.5" y="1606.0" height="183.0" width="319.0" data-name="IconPicker"></rect>
+							<path d="M22935.5 1637.0 L23254.5 1637.0" fill="none" data-name="IconPicker"></path>
+							<path d="M22935.5 1758.0 L23254.5 1758.0" fill="none" data-name="IconPicker"></path>
 						</g>
-						<g transform="translate(23549, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPicker">
+						<g transform="translate(22935.5, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPicker">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPicker">
 								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPicker">IconPicker</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23549, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
+						<g transform="translate(22935.5, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+iconOptions: List&lt;IconOption&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IconPicker">+selectedOption: IconOption?</text>
@@ -8968,7 +9003,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(23549, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
+						<g transform="translate(22935.5, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+Widget build()</text>
 								
@@ -8977,9 +9012,9 @@
 					</g>
 					<g data-name="void Function(IconOption)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(IconOption)?">
-							<rect x="23980.5" y="2609.5" height="31.0" width="230.0" data-name="void Function(IconOption)?"></rect>
+							<rect x="23403.0" y="2609.5" height="31.0" width="230.0" data-name="void Function(IconOption)?"></rect>
 						</g>
-						<g transform="translate(23980.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(IconOption)?">
+						<g transform="translate(23403, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(IconOption)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(IconOption)?">
 								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(IconOption)?">void Function(IconOption)?</text>
 								
@@ -8988,9 +9023,9 @@
 					</g>
 					<g data-name="FocusNode">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FocusNode">
-							<rect x="23815.0" y="2609.5" height="31.0" width="106.0" data-name="FocusNode"></rect>
+							<rect x="23201.5" y="2609.5" height="31.0" width="106.0" data-name="FocusNode"></rect>
 						</g>
-						<g transform="translate(23815, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FocusNode">
+						<g transform="translate(23201.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FocusNode">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FocusNode">
 								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="FocusNode">FocusNode</text>
 								
@@ -8999,17 +9034,17 @@
 					</g>
 					<g data-name="IconPickerField">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerField">
-							<rect x="23908.0" y="1606.0" height="183.0" width="319.0" data-name="IconPickerField"></rect>
-							<path d="M23908.0 1637.0 L24227.0 1637.0" fill="none" data-name="IconPickerField"></path>
-							<path d="M23908.0 1758.0 L24227.0 1758.0" fill="none" data-name="IconPickerField"></path>
+							<rect x="23294.5" y="1606.0" height="183.0" width="319.0" data-name="IconPickerField"></rect>
+							<path d="M23294.5 1637.0 L23613.5 1637.0" fill="none" data-name="IconPickerField"></path>
+							<path d="M23294.5 1758.0 L23613.5 1758.0" fill="none" data-name="IconPickerField"></path>
 						</g>
-						<g transform="translate(23908, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerField">
+						<g transform="translate(23294.5, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerField">
 								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerField">IconPickerField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23908, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
+						<g transform="translate(23294.5, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+iconOptions: List&lt;IconOption&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerField">+selectedOption: IconOption?</text>
@@ -9021,7 +9056,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(23908, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
+						<g transform="translate(23294.5, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+Widget build()</text>
 								
@@ -9030,17 +9065,17 @@
 					</g>
 					<g data-name="IconPickerGallery">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerGallery">
-							<rect x="24267.0" y="1636.0" height="123.0" width="319.0" data-name="IconPickerGallery"></rect>
-							<path d="M24267.0 1667.0 L24586.0 1667.0" fill="none" data-name="IconPickerGallery"></path>
-							<path d="M24267.0 1728.0 L24586.0 1728.0" fill="none" data-name="IconPickerGallery"></path>
+							<rect x="23653.5" y="1636.0" height="123.0" width="319.0" data-name="IconPickerGallery"></rect>
+							<path d="M23653.5 1667.0 L23972.5 1667.0" fill="none" data-name="IconPickerGallery"></path>
+							<path d="M23653.5 1728.0 L23972.5 1728.0" fill="none" data-name="IconPickerGallery"></path>
 						</g>
-						<g transform="translate(24267, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerGallery">
+						<g transform="translate(23653.5, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerGallery">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerGallery">
 								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerGallery">IconPickerGallery</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24267, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
+						<g transform="translate(23653.5, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+iconOptions: List&lt;IconOption&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerGallery">+onSelect: void Function(IconOption)?</text>
@@ -9048,7 +9083,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(24267, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
+						<g transform="translate(23653.5, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+Widget build()</text>
 								
@@ -9057,17 +9092,17 @@
 					</g>
 					<g data-name="SecondaryButton">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SecondaryButton">
-							<rect x="20152.3" y="2556.0" height="138.0" width="249.0" data-name="SecondaryButton"></rect>
-							<path d="M20152.3 2587.0 L20401.3 2587.0" fill="none" data-name="SecondaryButton"></path>
-							<path d="M20152.3 2663.0 L20401.3 2663.0" fill="none" data-name="SecondaryButton"></path>
+							<rect x="19384.8" y="2556.0" height="138.0" width="249.0" data-name="SecondaryButton"></rect>
+							<path d="M19384.8 2587.0 L19633.8 2587.0" fill="none" data-name="SecondaryButton"></path>
+							<path d="M19384.8 2663.0 L19633.8 2663.0" fill="none" data-name="SecondaryButton"></path>
 						</g>
-						<g transform="translate(20152.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecondaryButton">
+						<g transform="translate(19384.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecondaryButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecondaryButton">
 								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecondaryButton">SecondaryButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20152.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
+						<g transform="translate(19384.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
 								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+text: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SecondaryButton">+icon: IconData?</text>
@@ -9076,7 +9111,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(20152.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
+						<g transform="translate(19384.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
 								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+Widget build()</text>
 								
@@ -9085,16 +9120,16 @@
 					</g>
 					<g data-name="TwoColumnLayout">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TwoColumnLayout">
-							<rect x="20637.5" y="2466.5" height="317.0" width="368.0" data-name="TwoColumnLayout"></rect>
-							<path d="M20637.5 2497.5 L21005.5 2497.5" fill="none" data-name="TwoColumnLayout"></path>
+							<rect x="19674.5" y="2466.5" height="317.0" width="368.0" data-name="TwoColumnLayout"></rect>
+							<path d="M19674.5 2497.5 L20042.5 2497.5" fill="none" data-name="TwoColumnLayout"></path>
 						</g>
-						<g transform="translate(20637.5, 2466.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TwoColumnLayout">
+						<g transform="translate(19674.5, 2466.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TwoColumnLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TwoColumnLayout">
 								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="TwoColumnLayout">TwoColumnLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20637.5, 2497.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TwoColumnLayout">
+						<g transform="translate(19674.5, 2497.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TwoColumnLayout">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TwoColumnLayout">
 								<text x="0.0" y="13.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultDivider: VerticalDivider</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultContentPadding: EdgeInsets</text>
@@ -9120,9 +9155,9 @@
 					</g>
 					<g data-name="VerticalDivider">
 						<g fill="#eee8d5" stroke="#33322E" data-name="VerticalDivider">
-							<rect x="20438.5" y="3485.0" height="31.0" width="130.0" data-name="VerticalDivider"></rect>
+							<rect x="19671.0" y="3485.0" height="31.0" width="130.0" data-name="VerticalDivider"></rect>
 						</g>
-						<g transform="translate(20438.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VerticalDivider">
+						<g transform="translate(19671, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VerticalDivider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VerticalDivider">
 								<text x="57.0" y="13.5" stroke="none" text-anchor="middle" data-name="VerticalDivider">VerticalDivider</text>
 								
@@ -9131,16 +9166,16 @@
 					</g>
 					<g data-name="AppTranslation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppTranslation">
-							<rect x="37167.0" y="105.5" height="62.0" width="194.0" data-name="AppTranslation"></rect>
-							<path d="M37167.0 136.5 L37361.0 136.5" fill="none" data-name="AppTranslation"></path>
+							<rect x="37826.5" y="105.5" height="62.0" width="194.0" data-name="AppTranslation"></rect>
+							<path d="M37826.5 136.5 L38020.5 136.5" fill="none" data-name="AppTranslation"></path>
 						</g>
-						<g transform="translate(37167, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppTranslation">
+						<g transform="translate(37826.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppTranslation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppTranslation">
 								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppTranslation">AppTranslation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37167, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppTranslation">
+						<g transform="translate(37826.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppTranslation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppTranslation">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppTranslation">&lt;static&gt;+dynamic init()</text>
 								
@@ -9149,16 +9184,16 @@
 					</g>
 					<g data-name="PlatformLocale">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocale">
-							<rect x="36888.0" y="105.5" height="62.0" width="239.0" data-name="PlatformLocale"></rect>
-							<path d="M36888.0 136.5 L37127.0 136.5" fill="none" data-name="PlatformLocale"></path>
+							<rect x="37547.5" y="105.5" height="62.0" width="239.0" data-name="PlatformLocale"></rect>
+							<path d="M37547.5 136.5 L37786.5 136.5" fill="none" data-name="PlatformLocale"></path>
 						</g>
-						<g transform="translate(36888, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformLocale">
+						<g transform="translate(37547.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformLocale">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocale">
 								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocale">PlatformLocale</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36888, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocale">
+						<g transform="translate(37547.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocale">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocale">
 								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocale">+Locale getPlatformLocale()</text>
 								
@@ -9167,16 +9202,16 @@
 					</g>
 					<g data-name="PlatformLocaleWeb">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleWeb">
-							<rect x="36581.3" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleWeb"></rect>
-							<path d="M36581.3 629.5 L36820.3 629.5" fill="none" data-name="PlatformLocaleWeb"></path>
+							<rect x="37240.8" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleWeb"></rect>
+							<path d="M37240.8 629.5 L37479.8 629.5" fill="none" data-name="PlatformLocaleWeb"></path>
 						</g>
-						<g transform="translate(36581.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleWeb">
+						<g transform="translate(37240.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleWeb">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleWeb">
 								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleWeb">PlatformLocaleWeb</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36581.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleWeb">
+						<g transform="translate(37240.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleWeb">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleWeb">
 								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleWeb">+Locale getPlatformLocale()</text>
 								
@@ -9185,16 +9220,16 @@
 					</g>
 					<g data-name="PlatformLocaleMobile">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleMobile">
-							<rect x="37060.3" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleMobile"></rect>
-							<path d="M37060.3 629.5 L37299.3 629.5" fill="none" data-name="PlatformLocaleMobile"></path>
+							<rect x="37719.8" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleMobile"></rect>
+							<path d="M37719.8 629.5 L37958.8 629.5" fill="none" data-name="PlatformLocaleMobile"></path>
 						</g>
-						<g transform="translate(37060.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleMobile">
+						<g transform="translate(37719.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleMobile">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleMobile">
 								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleMobile">PlatformLocaleMobile</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37060.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleMobile">
+						<g transform="translate(37719.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleMobile">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleMobile">
 								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleMobile">+Locale getPlatformLocale()</text>
 								
@@ -9203,16 +9238,16 @@
 					</g>
 					<g data-name="LanguagePicker">
 						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePicker">
-							<rect x="21180.0" y="2579.0" height="92.0" width="366.0" data-name="LanguagePicker"></rect>
-							<path d="M21180.0 2610.0 L21546.0 2610.0" fill="none" data-name="LanguagePicker"></path>
+							<rect x="20207.3" y="2579.0" height="92.0" width="366.0" data-name="LanguagePicker"></rect>
+							<path d="M20207.3 2610.0 L20573.3 2610.0" fill="none" data-name="LanguagePicker"></path>
 						</g>
-						<g transform="translate(21180, 2579)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePicker">
+						<g transform="translate(20207.25, 2579)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePicker">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePicker">
 								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePicker">LanguagePicker</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21180, 2610)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePicker">
+						<g transform="translate(20207.25, 2610)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePicker">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePicker">
 								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePicker">+languagePickerType: LanguagePickerType</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePicker">+iconColor: Color?</text>
@@ -9223,16 +9258,16 @@
 					</g>
 					<g data-name="LanguagePickerType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePickerType">
-							<rect x="9259.0" y="3447.0" height="107.0" width="366.0" data-name="LanguagePickerType"></rect>
-							<path d="M9259.0 3478.0 L9625.0 3478.0" fill="none" data-name="LanguagePickerType"></path>
+							<rect x="9683.0" y="3447.0" height="107.0" width="366.0" data-name="LanguagePickerType"></rect>
+							<path d="M9683.0 3478.0 L10049.0 3478.0" fill="none" data-name="LanguagePickerType"></path>
 						</g>
-						<g transform="translate(9259, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePickerType">
+						<g transform="translate(9683, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePickerType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePickerType">
 								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePickerType">LanguagePickerType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9259, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePickerType">
+						<g transform="translate(9683, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePickerType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePickerType">
 								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePickerType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+values: List&lt;LanguagePickerType&gt;</text>
@@ -9244,9 +9279,9 @@
 					</g>
 					<g data-name="Offset">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Offset">
-							<rect x="26168.5" y="3485.0" height="31.0" width="63.0" data-name="Offset"></rect>
+							<rect x="24756.3" y="3485.0" height="31.0" width="63.0" data-name="Offset"></rect>
 						</g>
-						<g transform="translate(26168.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Offset">
+						<g transform="translate(24756.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Offset">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Offset">
 								<text x="23.5" y="13.5" stroke="none" text-anchor="middle" data-name="Offset">Offset</text>
 								
@@ -9255,16 +9290,16 @@
 					</g>
 					<g data-name="GoRouteParamEnum">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouteParamEnum">
-							<rect x="37753.0" y="98.0" height="77.0" width="202.0" data-name="GoRouteParamEnum"></rect>
-							<path d="M37753.0 129.0 L37955.0 129.0" fill="none" data-name="GoRouteParamEnum"></path>
+							<rect x="38412.5" y="98.0" height="77.0" width="202.0" data-name="GoRouteParamEnum"></rect>
+							<path d="M38412.5 129.0 L38614.5 129.0" fill="none" data-name="GoRouteParamEnum"></path>
 						</g>
-						<g transform="translate(37753, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GoRouteParamEnum">
+						<g transform="translate(38412.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GoRouteParamEnum">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouteParamEnum">
 								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouteParamEnum">GoRouteParamEnum</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37753, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouteParamEnum">
+						<g transform="translate(38412.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouteParamEnum">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouteParamEnum">
 								<text x="0.0" y="13.5" stroke="none" data-name="GoRouteParamEnum">+String toRouteParam()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="GoRouteParamEnum">+String toShortString()</text>
@@ -9274,16 +9309,16 @@
 					</g>
 					<g data-name="RoutingIntents">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntents">
-							<rect x="25022.5" y="1479.0" height="437.0" width="572.0" data-name="RoutingIntents"></rect>
-							<path d="M25022.5 1510.0 L25594.5 1510.0" fill="none" data-name="RoutingIntents"></path>
+							<rect x="24563.3" y="1479.0" height="437.0" width="572.0" data-name="RoutingIntents"></rect>
+							<path d="M24563.3 1510.0 L25135.3 1510.0" fill="none" data-name="RoutingIntents"></path>
 						</g>
-						<g transform="translate(25022.5, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntents">
+						<g transform="translate(24563.25, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntents">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntents">
 								<text x="278.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntents">RoutingIntents</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25022.5, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntents">
+						<g transform="translate(24563.25, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntents">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntents">
 								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+root: RoutingIntent</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studies: RoutingIntent</text>
@@ -9317,9 +9352,9 @@
 					</g>
 					<g data-name="RoutingIntent Function(String)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String)">
-							<rect x="24646.5" y="2609.5" height="31.0" width="253.0" data-name="RoutingIntent Function(String)"></rect>
+							<rect x="23989.3" y="2609.5" height="31.0" width="253.0" data-name="RoutingIntent Function(String)"></rect>
 						</g>
-						<g transform="translate(24646.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String)">
+						<g transform="translate(23989.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String)">
 								<text x="118.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String)">RoutingIntent Function(String)</text>
 								
@@ -9328,9 +9363,9 @@
 					</g>
 					<g data-name="RoutingIntent Function(String, String)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, String)">
-							<rect x="24939.5" y="2609.5" height="31.0" width="309.0" data-name="RoutingIntent Function(String, String)"></rect>
+							<rect x="24678.3" y="2609.5" height="31.0" width="309.0" data-name="RoutingIntent Function(String, String)"></rect>
 						</g>
-						<g transform="translate(24939.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, String)">
+						<g transform="translate(24678.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, String)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, String)">
 								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, String)">RoutingIntent Function(String, String)</text>
 								
@@ -9339,9 +9374,9 @@
 					</g>
 					<g data-name="RoutingIntent Function(String, {String? appRoute})">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, {String? appRoute})">
-							<rect x="25288.5" y="2609.5" height="31.0" width="413.0" data-name="RoutingIntent Function(String, {String? appRoute})"></rect>
+							<rect x="25027.3" y="2609.5" height="31.0" width="413.0" data-name="RoutingIntent Function(String, {String? appRoute})"></rect>
 						</g>
-						<g transform="translate(25288.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, {String? appRoute})">
+						<g transform="translate(25027.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, {String? appRoute})">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, {String? appRoute})">
 								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, {String? appRoute})">RoutingIntent Function(String, {String? appRoute})</text>
 								
@@ -9350,9 +9385,9 @@
 					</g>
 					<g data-name="RoutingIntent Function(Exception)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(Exception)">
-							<rect x="25741.5" y="2609.5" height="31.0" width="285.0" data-name="RoutingIntent Function(Exception)"></rect>
+							<rect x="25480.3" y="2609.5" height="31.0" width="285.0" data-name="RoutingIntent Function(Exception)"></rect>
 						</g>
-						<g transform="translate(25741.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(Exception)">
+						<g transform="translate(25480.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(Exception)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(Exception)">
 								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(Exception)">RoutingIntent Function(Exception)</text>
 								
@@ -9361,9 +9396,9 @@
 					</g>
 					<g data-name="GoRoute">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GoRoute">
-							<rect x="44219.0" y="3485.0" height="31.0" width="86.0" data-name="GoRoute"></rect>
+							<rect x="41886.0" y="3485.0" height="31.0" width="86.0" data-name="GoRoute"></rect>
 						</g>
-						<g transform="translate(44219, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRoute">
+						<g transform="translate(41886, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRoute">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRoute">
 								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRoute">GoRoute</text>
 								
@@ -9372,16 +9407,16 @@
 					</g>
 					<g data-name="RoutingIntentDispatch">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntentDispatch">
-							<rect x="14171.5" y="3447.0" height="107.0" width="373.0" data-name="RoutingIntentDispatch"></rect>
-							<path d="M14171.5 3478.0 L14544.5 3478.0" fill="none" data-name="RoutingIntentDispatch"></path>
+							<rect x="14045.0" y="3447.0" height="107.0" width="373.0" data-name="RoutingIntentDispatch"></rect>
+							<path d="M14045.0 3478.0 L14418.0 3478.0" fill="none" data-name="RoutingIntentDispatch"></path>
 						</g>
-						<g transform="translate(14171.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntentDispatch">
+						<g transform="translate(14045, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntentDispatch">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntentDispatch">
 								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntentDispatch">RoutingIntentDispatch</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14171.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntentDispatch">
+						<g transform="translate(14045, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntentDispatch">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntentDispatch">
 								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntentDispatch">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;</text>
@@ -9393,16 +9428,16 @@
 					</g>
 					<g data-name="RouterKeys">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RouterKeys">
-							<rect x="37401.0" y="98.0" height="77.0" width="312.0" data-name="RouterKeys"></rect>
-							<path d="M37401.0 129.0 L37713.0 129.0" fill="none" data-name="RouterKeys"></path>
+							<rect x="38060.5" y="98.0" height="77.0" width="312.0" data-name="RouterKeys"></rect>
+							<path d="M38060.5 129.0 L38372.5 129.0" fill="none" data-name="RouterKeys"></path>
 						</g>
-						<g transform="translate(37401, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterKeys">
+						<g transform="translate(38060.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterKeys">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterKeys">
 								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterKeys">RouterKeys</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37401, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterKeys">
+						<g transform="translate(38060.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterKeys">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterKeys">
 								<text x="0.0" y="13.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+studyKey: ValueKey&lt;String&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+authKey: ValueKey&lt;String&gt;</text>
@@ -9412,9 +9447,9 @@
 					</g>
 					<g data-name="ValueKey">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ValueKey">
-							<rect x="37511.5" y="614.0" height="31.0" width="91.0" data-name="ValueKey"></rect>
+							<rect x="38171.0" y="614.0" height="31.0" width="91.0" data-name="ValueKey"></rect>
 						</g>
-						<g transform="translate(37511.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueKey">
+						<g transform="translate(38171, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueKey">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueKey">
 								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueKey">ValueKey</text>
 								
@@ -9423,16 +9458,16 @@
 					</g>
 					<g data-name="RouteParams">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RouteParams">
-							<rect x="38168.0" y="75.5" height="122.0" width="267.0" data-name="RouteParams"></rect>
-							<path d="M38168.0 106.5 L38435.0 106.5" fill="none" data-name="RouteParams"></path>
+							<rect x="38827.5" y="75.5" height="122.0" width="267.0" data-name="RouteParams"></rect>
+							<path d="M38827.5 106.5 L39094.5 106.5" fill="none" data-name="RouteParams"></path>
 						</g>
-						<g transform="translate(38168, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteParams">
+						<g transform="translate(38827.5, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteParams">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteParams">
 								<text x="125.5" y="13.5" stroke="none" text-anchor="middle" data-name="RouteParams">RouteParams</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38168, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteParams">
+						<g transform="translate(38827.5, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteParams">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteParams">
 								<text x="0.0" y="13.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studiesFilter: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studyId: String</text>
@@ -9445,17 +9480,17 @@
 					</g>
 					<g data-name="RouterConf">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RouterConf">
-							<rect x="22033.0" y="2556.0" height="138.0" width="326.0" data-name="RouterConf"></rect>
-							<path d="M22033.0 2587.0 L22359.0 2587.0" fill="none" data-name="RouterConf"></path>
-							<path d="M22033.0 2663.0 L22359.0 2663.0" fill="none" data-name="RouterConf"></path>
+							<rect x="21994.3" y="2556.0" height="138.0" width="326.0" data-name="RouterConf"></rect>
+							<path d="M21994.3 2587.0 L22320.3 2587.0" fill="none" data-name="RouterConf"></path>
+							<path d="M21994.3 2663.0 L22320.3 2663.0" fill="none" data-name="RouterConf"></path>
 						</g>
-						<g transform="translate(22033, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterConf">
+						<g transform="translate(21994.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterConf">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterConf">
 								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterConf">RouterConf</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22033, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
+						<g transform="translate(21994.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
 								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+router: GoRouter</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="RouterConf">&lt;static&gt;+routes: List&lt;GoRoute&gt;</text>
@@ -9464,7 +9499,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(22033, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
+						<g transform="translate(21994.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
 								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+GoRoute route()</text>
 								
@@ -9473,9 +9508,9 @@
 					</g>
 					<g data-name="GoRouter">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="63069.0" y="3485.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
+							<rect x="63549.3" y="3485.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
 						</g>
-						<g transform="translate(63069, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
+						<g transform="translate(63549.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
 								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
 								
@@ -9484,16 +9519,16 @@
 					</g>
 					<g data-name="StudyFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="59923.8" y="1666.5" height="62.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
-							<path d="M59923.8 1697.5 L60107.8 1697.5" fill="none" data-name="StudyFormRouteArgs"></path>
+							<rect x="61100.3" y="1666.5" height="62.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
+							<path d="M61100.3 1697.5 L61284.3 1697.5" fill="none" data-name="StudyFormRouteArgs"></path>
 						</g>
-						<g transform="translate(59923.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
+						<g transform="translate(61100.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
 								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59923.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormRouteArgs">
+						<g transform="translate(61100.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormRouteArgs">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormRouteArgs">+studyId: String</text>
 								
@@ -9502,16 +9537,16 @@
 					</g>
 					<g data-name="QuestionFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormRouteArgs">
-							<rect x="58558.8" y="2594.0" height="62.0" width="210.0" data-name="QuestionFormRouteArgs"></rect>
-							<path d="M58558.8 2625.0 L58768.8 2625.0" fill="none" data-name="QuestionFormRouteArgs"></path>
+							<rect x="59563.3" y="2594.0" height="62.0" width="210.0" data-name="QuestionFormRouteArgs"></rect>
+							<path d="M59563.3 2625.0 L59773.3 2625.0" fill="none" data-name="QuestionFormRouteArgs"></path>
 						</g>
-						<g transform="translate(58558.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormRouteArgs">
+						<g transform="translate(59563.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormRouteArgs">
 								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormRouteArgs">QuestionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58558.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormRouteArgs">
+						<g transform="translate(59563.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormRouteArgs">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormRouteArgs">+questionId: String</text>
 								
@@ -9520,9 +9555,9 @@
 					</g>
 					<g data-name="ScreenerQuestionFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormRouteArgs">
-							<rect x="58470.3" y="3485.0" height="31.0" width="282.0" data-name="ScreenerQuestionFormRouteArgs"></rect>
+							<rect x="60303.0" y="3485.0" height="31.0" width="282.0" data-name="ScreenerQuestionFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(58470.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormRouteArgs">
+						<g transform="translate(60303, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormRouteArgs">
 								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormRouteArgs">ScreenerQuestionFormRouteArgs</text>
 								
@@ -9531,16 +9566,16 @@
 					</g>
 					<g data-name="ConsentItemFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormRouteArgs">
-							<rect x="58808.8" y="2594.0" height="62.0" width="239.0" data-name="ConsentItemFormRouteArgs"></rect>
-							<path d="M58808.8 2625.0 L59047.8 2625.0" fill="none" data-name="ConsentItemFormRouteArgs"></path>
+							<rect x="59813.3" y="2594.0" height="62.0" width="239.0" data-name="ConsentItemFormRouteArgs"></rect>
+							<path d="M59813.3 2625.0 L60052.3 2625.0" fill="none" data-name="ConsentItemFormRouteArgs"></path>
 						</g>
-						<g transform="translate(58808.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormRouteArgs">
+						<g transform="translate(59813.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormRouteArgs">
 								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormRouteArgs">ConsentItemFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58808.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormRouteArgs">
+						<g transform="translate(59813.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormRouteArgs">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormRouteArgs">+consentId: String</text>
 								
@@ -9549,16 +9584,16 @@
 					</g>
 					<g data-name="MeasurementFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="45388.8" y="2594.0" height="62.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
-							<path d="M45388.8 2625.0 L45635.8 2625.0" fill="none" data-name="MeasurementFormRouteArgs"></path>
+							<rect x="45403.0" y="2594.0" height="62.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
+							<path d="M45403.0 2625.0 L45650.0 2625.0" fill="none" data-name="MeasurementFormRouteArgs"></path>
 						</g>
-						<g transform="translate(45388.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
+						<g transform="translate(45403, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
 								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45388.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementFormRouteArgs">
+						<g transform="translate(45403, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementFormRouteArgs">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementFormRouteArgs">+measurementId: String</text>
 								
@@ -9567,16 +9602,16 @@
 					</g>
 					<g data-name="SurveyQuestionFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormRouteArgs">
-							<rect x="50356.3" y="3469.5" height="62.0" width="265.0" data-name="SurveyQuestionFormRouteArgs"></rect>
-							<path d="M50356.3 3500.5 L50621.3 3500.5" fill="none" data-name="SurveyQuestionFormRouteArgs"></path>
+							<rect x="50399.0" y="3469.5" height="62.0" width="265.0" data-name="SurveyQuestionFormRouteArgs"></rect>
+							<path d="M50399.0 3500.5 L50664.0 3500.5" fill="none" data-name="SurveyQuestionFormRouteArgs"></path>
 						</g>
-						<g transform="translate(50356.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
+						<g transform="translate(50399, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormRouteArgs">
 								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormRouteArgs">SurveyQuestionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50356.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
+						<g transform="translate(50399, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormRouteArgs">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormRouteArgs">+questionId: String</text>
 								
@@ -9585,16 +9620,16 @@
 					</g>
 					<g data-name="InterventionFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="44992.3" y="2594.0" height="62.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
-							<path d="M44992.3 2625.0 L45225.3 2625.0" fill="none" data-name="InterventionFormRouteArgs"></path>
+							<rect x="44630.5" y="2594.0" height="62.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
+							<path d="M44630.5 2625.0 L44863.5 2625.0" fill="none" data-name="InterventionFormRouteArgs"></path>
 						</g>
-						<g transform="translate(44992.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
+						<g transform="translate(44630.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
 								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44992.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormRouteArgs">
+						<g transform="translate(44630.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormRouteArgs">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormRouteArgs">+interventionId: String</text>
 								
@@ -9603,16 +9638,16 @@
 					</g>
 					<g data-name="InterventionTaskFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormRouteArgs">
-							<rect x="44973.3" y="3469.5" height="62.0" width="271.0" data-name="InterventionTaskFormRouteArgs"></rect>
-							<path d="M44973.3 3500.5 L45244.3 3500.5" fill="none" data-name="InterventionTaskFormRouteArgs"></path>
+							<rect x="44611.5" y="3469.5" height="62.0" width="271.0" data-name="InterventionTaskFormRouteArgs"></rect>
+							<path d="M44611.5 3500.5 L44882.5 3500.5" fill="none" data-name="InterventionTaskFormRouteArgs"></path>
 						</g>
-						<g transform="translate(44973.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormRouteArgs">
+						<g transform="translate(44611.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormRouteArgs">
 								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormRouteArgs">InterventionTaskFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44973.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormRouteArgs">
+						<g transform="translate(44611.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormRouteArgs">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormRouteArgs">+taskId: String</text>
 								
@@ -9621,16 +9656,16 @@
 					</g>
 					<g data-name="ReportItemFormRouteArgs">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormRouteArgs">
-							<rect x="60598.0" y="2594.0" height="62.0" width="226.0" data-name="ReportItemFormRouteArgs"></rect>
-							<path d="M60598.0 2625.0 L60824.0 2625.0" fill="none" data-name="ReportItemFormRouteArgs"></path>
+							<rect x="61119.3" y="2594.0" height="62.0" width="226.0" data-name="ReportItemFormRouteArgs"></rect>
+							<path d="M61119.3 2625.0 L61345.3 2625.0" fill="none" data-name="ReportItemFormRouteArgs"></path>
 						</g>
-						<g transform="translate(60598, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormRouteArgs">
+						<g transform="translate(61119.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormRouteArgs">
 								<text x="105.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormRouteArgs">ReportItemFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60598, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormRouteArgs">
+						<g transform="translate(61119.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormRouteArgs">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormRouteArgs">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormRouteArgs">+sectionId: String</text>
 								
@@ -9639,16 +9674,16 @@
 					</g>
 					<g data-name="DropdownMenuItemTheme">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DropdownMenuItemTheme">
-							<rect x="37932.5" y="598.5" height="62.0" width="258.0" data-name="DropdownMenuItemTheme"></rect>
-							<path d="M37932.5 629.5 L38190.5 629.5" fill="none" data-name="DropdownMenuItemTheme"></path>
+							<rect x="38592.0" y="598.5" height="62.0" width="258.0" data-name="DropdownMenuItemTheme"></rect>
+							<path d="M38592.0 629.5 L38850.0 629.5" fill="none" data-name="DropdownMenuItemTheme"></path>
 						</g>
-						<g transform="translate(37932.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DropdownMenuItemTheme">
+						<g transform="translate(38592, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DropdownMenuItemTheme">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DropdownMenuItemTheme">
 								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="DropdownMenuItemTheme">DropdownMenuItemTheme</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37932.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DropdownMenuItemTheme">
+						<g transform="translate(38592, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DropdownMenuItemTheme">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DropdownMenuItemTheme">
 								<text x="0.0" y="13.5" stroke="none" data-name="DropdownMenuItemTheme">+iconTheme: IconThemeData?</text>
 								
@@ -9657,9 +9692,9 @@
 					</g>
 					<g data-name="IconThemeData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IconThemeData">
-							<rect x="37991.0" y="1197.0" height="31.0" width="141.0" data-name="IconThemeData"></rect>
+							<rect x="38650.5" y="1197.0" height="31.0" width="141.0" data-name="IconThemeData"></rect>
 						</g>
-						<g transform="translate(37991, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconThemeData">
+						<g transform="translate(38650.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconThemeData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconThemeData">
 								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconThemeData">IconThemeData</text>
 								
@@ -9668,9 +9703,9 @@
 					</g>
 					<g data-name="Diagnosticable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Diagnosticable">
-							<rect x="37995.0" y="121.0" height="31.0" width="133.0" data-name="Diagnosticable"></rect>
+							<rect x="38654.5" y="121.0" height="31.0" width="133.0" data-name="Diagnosticable"></rect>
 						</g>
-						<g transform="translate(37995, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Diagnosticable">
+						<g transform="translate(38654.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Diagnosticable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Diagnosticable">
 								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="Diagnosticable">Diagnosticable</text>
 								
@@ -9679,17 +9714,17 @@
 					</g>
 					<g data-name="ThemeConfig">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeConfig">
-							<rect x="38767.3" y="0.0" height="273.0" width="543.0" data-name="ThemeConfig"></rect>
-							<path d="M38767.3 31.0 L39310.3 31.0" fill="none" data-name="ThemeConfig"></path>
-							<path d="M38767.3 107.0 L39310.3 107.0" fill="none" data-name="ThemeConfig"></path>
+							<rect x="39426.8" y="0.0" height="273.0" width="543.0" data-name="ThemeConfig"></rect>
+							<path d="M39426.8 31.0 L39969.8 31.0" fill="none" data-name="ThemeConfig"></path>
+							<path d="M39426.8 107.0 L39969.8 107.0" fill="none" data-name="ThemeConfig"></path>
 						</g>
-						<g transform="translate(38767.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeConfig">
+						<g transform="translate(39426.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeConfig">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeConfig">
 								<text x="263.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeConfig">ThemeConfig</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38767.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
+						<g transform="translate(39426.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
 								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMinContentWidth: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMaxContentWidth: double</text>
@@ -9698,7 +9733,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(38767.25, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
+						<g transform="translate(39426.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
 								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+dynamic bodyBackgroundColor()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color modalBarrierColor()</text>
@@ -9716,16 +9751,16 @@
 					</g>
 					<g data-name="NoAnimationPageTransitionsBuilder">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NoAnimationPageTransitionsBuilder">
-							<rect x="38327.8" y="598.5" height="62.0" width="299.0" data-name="NoAnimationPageTransitionsBuilder"></rect>
-							<path d="M38327.8 629.5 L38626.8 629.5" fill="none" data-name="NoAnimationPageTransitionsBuilder"></path>
+							<rect x="38987.3" y="598.5" height="62.0" width="299.0" data-name="NoAnimationPageTransitionsBuilder"></rect>
+							<path d="M38987.3 629.5 L39286.3 629.5" fill="none" data-name="NoAnimationPageTransitionsBuilder"></path>
 						</g>
-						<g transform="translate(38327.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
+						<g transform="translate(38987.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NoAnimationPageTransitionsBuilder">
 								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="NoAnimationPageTransitionsBuilder">NoAnimationPageTransitionsBuilder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38327.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
+						<g transform="translate(38987.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NoAnimationPageTransitionsBuilder">
 								<text x="0.0" y="13.5" stroke="none" data-name="NoAnimationPageTransitionsBuilder">+Widget buildTransitions()</text>
 								
@@ -9734,9 +9769,9 @@
 					</g>
 					<g data-name="PageTransitionsBuilder">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsBuilder">
-							<rect x="38528.3" y="121.0" height="31.0" width="199.0" data-name="PageTransitionsBuilder"></rect>
+							<rect x="39187.8" y="121.0" height="31.0" width="199.0" data-name="PageTransitionsBuilder"></rect>
 						</g>
-						<g transform="translate(38528.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PageTransitionsBuilder">
+						<g transform="translate(39187.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PageTransitionsBuilder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsBuilder">
 								<text x="91.5" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsBuilder">PageTransitionsBuilder</text>
 								
@@ -9745,16 +9780,16 @@
 					</g>
 					<g data-name="WebTransitionBuilder">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WebTransitionBuilder">
-							<rect x="38707.3" y="598.5" height="62.0" width="223.0" data-name="WebTransitionBuilder"></rect>
-							<path d="M38707.3 629.5 L38930.3 629.5" fill="none" data-name="WebTransitionBuilder"></path>
+							<rect x="39366.8" y="598.5" height="62.0" width="223.0" data-name="WebTransitionBuilder"></rect>
+							<path d="M39366.8 629.5 L39589.8 629.5" fill="none" data-name="WebTransitionBuilder"></path>
 						</g>
-						<g transform="translate(38707.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebTransitionBuilder">
+						<g transform="translate(39366.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebTransitionBuilder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebTransitionBuilder">
 								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebTransitionBuilder">WebTransitionBuilder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38707.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebTransitionBuilder">
+						<g transform="translate(39366.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebTransitionBuilder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebTransitionBuilder">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebTransitionBuilder">+Widget buildTransitions()</text>
 								
@@ -9763,16 +9798,16 @@
 					</g>
 					<g data-name="ThemeSettingChange">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettingChange">
-							<rect x="38949.5" y="1666.5" height="62.0" width="216.0" data-name="ThemeSettingChange"></rect>
-							<path d="M38949.5 1697.5 L39165.5 1697.5" fill="none" data-name="ThemeSettingChange"></path>
+							<rect x="39192.3" y="1666.5" height="62.0" width="216.0" data-name="ThemeSettingChange"></rect>
+							<path d="M39192.3 1697.5 L39408.3 1697.5" fill="none" data-name="ThemeSettingChange"></path>
 						</g>
-						<g transform="translate(38949.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettingChange">
+						<g transform="translate(39192.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettingChange">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettingChange">
 								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettingChange">ThemeSettingChange</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38949.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettingChange">
+						<g transform="translate(39192.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettingChange">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettingChange">
 								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettingChange">+settings: ThemeSettings</text>
 								
@@ -9781,16 +9816,16 @@
 					</g>
 					<g data-name="ThemeSettings">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettings">
-							<rect x="36759.5" y="2586.5" height="77.0" width="227.0" data-name="ThemeSettings"></rect>
-							<path d="M36759.5 2617.5 L36986.5 2617.5" fill="none" data-name="ThemeSettings"></path>
+							<rect x="39186.8" y="2586.5" height="77.0" width="227.0" data-name="ThemeSettings"></rect>
+							<path d="M39186.8 2617.5 L39413.8 2617.5" fill="none" data-name="ThemeSettings"></path>
 						</g>
-						<g transform="translate(36759.5, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettings">
+						<g transform="translate(39186.75, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettings">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettings">
 								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettings">ThemeSettings</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36759.5, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettings">
+						<g transform="translate(39186.75, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettings">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettings">
 								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettings">+sourceColor: Color</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ThemeSettings">+themeMode: ThemeMode</text>
@@ -9800,9 +9835,9 @@
 					</g>
 					<g data-name="Notification">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Notification">
-							<rect x="39005.5" y="1197.0" height="31.0" width="104.0" data-name="Notification"></rect>
+							<rect x="39248.3" y="1197.0" height="31.0" width="104.0" data-name="Notification"></rect>
 						</g>
-						<g transform="translate(39005.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Notification">
+						<g transform="translate(39248.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Notification">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notification">
 								<text x="44.0" y="13.5" stroke="none" text-anchor="middle" data-name="Notification">Notification</text>
 								
@@ -9811,17 +9846,17 @@
 					</g>
 					<g data-name="ThemeProvider">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeProvider">
-							<rect x="39161.3" y="358.0" height="543.0" width="519.0" data-name="ThemeProvider"></rect>
-							<path d="M39161.3 389.0 L39680.3 389.0" fill="none" data-name="ThemeProvider"></path>
-							<path d="M39161.3 480.0 L39680.3 480.0" fill="none" data-name="ThemeProvider"></path>
+							<rect x="39820.8" y="358.0" height="543.0" width="519.0" data-name="ThemeProvider"></rect>
+							<path d="M39820.8 389.0 L40339.8 389.0" fill="none" data-name="ThemeProvider"></path>
+							<path d="M39820.8 480.0 L40339.8 480.0" fill="none" data-name="ThemeProvider"></path>
 						</g>
-						<g transform="translate(39161.25, 358)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeProvider">
+						<g transform="translate(39820.75, 358)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeProvider">
 								<text x="251.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeProvider">ThemeProvider</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39161.25, 389)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
+						<g transform="translate(39820.75, 389)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
 								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+settings: ValueNotifier&lt;ThemeSettings&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+lightDynamic: ColorScheme?</text>
@@ -9831,7 +9866,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(39161.25, 480)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
+						<g transform="translate(39820.75, 480)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
 								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+Color custom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+Color blend()</text>
@@ -9866,9 +9901,9 @@
 					</g>
 					<g data-name="ValueNotifier">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ValueNotifier">
-							<rect x="39149.5" y="1197.0" height="31.0" width="117.0" data-name="ValueNotifier"></rect>
+							<rect x="39392.3" y="1197.0" height="31.0" width="117.0" data-name="ValueNotifier"></rect>
 						</g>
-						<g transform="translate(39149.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueNotifier">
+						<g transform="translate(39392.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueNotifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueNotifier">
 								<text x="50.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueNotifier">ValueNotifier</text>
 								
@@ -9877,9 +9912,9 @@
 					</g>
 					<g data-name="ColorScheme">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ColorScheme">
-							<rect x="39859.3" y="1197.0" height="31.0" width="122.0" data-name="ColorScheme"></rect>
+							<rect x="39549.3" y="1197.0" height="31.0" width="122.0" data-name="ColorScheme"></rect>
 						</g>
-						<g transform="translate(39859.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ColorScheme">
+						<g transform="translate(39549.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ColorScheme">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ColorScheme">
 								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="ColorScheme">ColorScheme</text>
 								
@@ -9888,9 +9923,9 @@
 					</g>
 					<g data-name="PageTransitionsTheme">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsTheme">
-							<rect x="40122.5" y="1197.0" height="31.0" width="198.0" data-name="PageTransitionsTheme"></rect>
+							<rect x="40445.0" y="1197.0" height="31.0" width="198.0" data-name="PageTransitionsTheme"></rect>
 						</g>
-						<g transform="translate(40122.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PageTransitionsTheme">
+						<g transform="translate(40445, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PageTransitionsTheme">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsTheme">
 								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsTheme">PageTransitionsTheme</text>
 								
@@ -9899,9 +9934,9 @@
 					</g>
 					<g data-name="ShapeBorder">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ShapeBorder">
-							<rect x="40360.5" y="1197.0" height="31.0" width="120.0" data-name="ShapeBorder"></rect>
+							<rect x="40953.5" y="1197.0" height="31.0" width="120.0" data-name="ShapeBorder"></rect>
 						</g>
-						<g transform="translate(40360.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ShapeBorder">
+						<g transform="translate(40953.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ShapeBorder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ShapeBorder">
 								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="ShapeBorder">ShapeBorder</text>
 								
@@ -9910,9 +9945,9 @@
 					</g>
 					<g data-name="InheritedWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InheritedWidget">
-							<rect x="39350.3" y="121.0" height="31.0" width="141.0" data-name="InheritedWidget"></rect>
+							<rect x="40009.8" y="121.0" height="31.0" width="141.0" data-name="InheritedWidget"></rect>
 						</g>
-						<g transform="translate(39350.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="InheritedWidget">
+						<g transform="translate(40009.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="InheritedWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InheritedWidget">
 								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="InheritedWidget">InheritedWidget</text>
 								
@@ -9921,9 +9956,9 @@
 					</g>
 					<g data-name="ThemeMode">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeMode">
-							<rect x="37334.3" y="3485.0" height="31.0" width="114.0" data-name="ThemeMode"></rect>
+							<rect x="40644.0" y="3485.0" height="31.0" width="114.0" data-name="ThemeMode"></rect>
 						</g>
-						<g transform="translate(37334.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeMode">
+						<g transform="translate(40644, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeMode">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeMode">
 								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeMode">ThemeMode</text>
 								
@@ -9932,17 +9967,17 @@
 					</g>
 					<g data-name="CustomColor">
 						<g fill="#eee8d5" stroke="#33322E" data-name="CustomColor">
-							<rect x="24250.5" y="2563.5" height="123.0" width="128.0" data-name="CustomColor"></rect>
-							<path d="M24250.5 2594.5 L24378.5 2594.5" fill="none" data-name="CustomColor"></path>
-							<path d="M24250.5 2655.5 L24378.5 2655.5" fill="none" data-name="CustomColor"></path>
+							<rect x="24282.3" y="2563.5" height="123.0" width="128.0" data-name="CustomColor"></rect>
+							<path d="M24282.3 2594.5 L24410.3 2594.5" fill="none" data-name="CustomColor"></path>
+							<path d="M24282.3 2655.5 L24410.3 2655.5" fill="none" data-name="CustomColor"></path>
 						</g>
-						<g transform="translate(24250.5, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomColor">
+						<g transform="translate(24282.25, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomColor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomColor">
 								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomColor">CustomColor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24250.5, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
+						<g transform="translate(24282.25, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
 								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+name: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="CustomColor">+color: Color</text>
@@ -9950,7 +9985,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(24250.5, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
+						<g transform="translate(24282.25, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
 								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+Color value()</text>
 								
@@ -9959,17 +9994,17 @@
 					</g>
 					<g data-name="SuppressedBehaviorSubject">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SuppressedBehaviorSubject">
-							<rect x="16681.0" y="3774.5" height="138.0" width="388.0" data-name="SuppressedBehaviorSubject"></rect>
-							<path d="M16681.0 3805.5 L17069.0 3805.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
-							<path d="M16681.0 3866.5 L17069.0 3866.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
+							<rect x="16476.5" y="3774.5" height="138.0" width="388.0" data-name="SuppressedBehaviorSubject"></rect>
+							<path d="M16476.5 3805.5 L16864.5 3805.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
+							<path d="M16476.5 3866.5 L16864.5 3866.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
 						</g>
-						<g transform="translate(16681, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SuppressedBehaviorSubject">
+						<g transform="translate(16476.5, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SuppressedBehaviorSubject">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SuppressedBehaviorSubject">
 								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="SuppressedBehaviorSubject">SuppressedBehaviorSubject</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16681, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
+						<g transform="translate(16476.5, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
 								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">+subject: BehaviorSubject&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+didSuppressInitialEvent: bool</text>
@@ -9977,7 +10012,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(16681, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
+						<g transform="translate(16476.5, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
 								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">-StreamController&lt;T&gt; _buildDerivedController()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+dynamic close()</text>
@@ -9987,9 +10022,9 @@
 					</g>
 					<g data-name="StreamController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
-							<rect x="16456.5" y="4118.5" height="31.0" width="149.0" data-name="StreamController"></rect>
+							<rect x="14904.0" y="4118.5" height="31.0" width="149.0" data-name="StreamController"></rect>
 						</g>
-						<g transform="translate(16456.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
+						<g transform="translate(14904, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
 								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
 								
@@ -9998,16 +10033,16 @@
 					</g>
 					<g data-name="Time">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Time">
-							<rect x="39720.3" y="583.5" height="92.0" width="293.0" data-name="Time"></rect>
-							<path d="M39720.3 614.5 L40013.3 614.5" fill="none" data-name="Time"></path>
+							<rect x="40379.8" y="583.5" height="92.0" width="293.0" data-name="Time"></rect>
+							<path d="M40379.8 614.5 L40672.8 614.5" fill="none" data-name="Time"></path>
 						</g>
-						<g transform="translate(39720.25, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Time">
+						<g transform="translate(40379.75, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Time">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Time">
 								<text x="138.5" y="13.5" stroke="none" text-anchor="middle" data-name="Time">Time</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39720.25, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Time">
+						<g transform="translate(40379.75, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Time">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Time">
 								<text x="0.0" y="13.5" stroke="none" data-name="Time">&lt;static&gt;+dynamic fromTimeOfDay()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Time">+Map&lt;String, dynamic&gt; toJson()</text>
@@ -10018,9 +10053,9 @@
 					</g>
 					<g data-name="TimeOfDay">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TimeOfDay">
-							<rect x="39815.3" y="121.0" height="31.0" width="103.0" data-name="TimeOfDay"></rect>
+							<rect x="40474.8" y="121.0" height="31.0" width="103.0" data-name="TimeOfDay"></rect>
 						</g>
-						<g transform="translate(39815.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeOfDay">
+						<g transform="translate(40474.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeOfDay">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeOfDay">
 								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeOfDay">TimeOfDay</text>
 								
@@ -10029,16 +10064,16 @@
 					</g>
 					<g data-name="TimeValueAccessor">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TimeValueAccessor">
-							<rect x="40053.3" y="583.5" height="92.0" width="297.0" data-name="TimeValueAccessor"></rect>
-							<path d="M40053.3 614.5 L40350.3 614.5" fill="none" data-name="TimeValueAccessor"></path>
+							<rect x="40712.8" y="583.5" height="92.0" width="297.0" data-name="TimeValueAccessor"></rect>
+							<path d="M40712.8 614.5 L41009.8 614.5" fill="none" data-name="TimeValueAccessor"></path>
 						</g>
-						<g transform="translate(40053.25, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeValueAccessor">
+						<g transform="translate(40712.75, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeValueAccessor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeValueAccessor">
 								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeValueAccessor">TimeValueAccessor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40053.25, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimeValueAccessor">
+						<g transform="translate(40712.75, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimeValueAccessor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimeValueAccessor">
 								<text x="0.0" y="13.5" stroke="none" data-name="TimeValueAccessor">+String modelToViewValue()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TimeValueAccessor">+Time? viewToModelValue()</text>
@@ -10049,9 +10084,9 @@
 					</g>
 					<g data-name="ControlValueAccessor">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ControlValueAccessor">
-							<rect x="40106.3" y="121.0" height="31.0" width="191.0" data-name="ControlValueAccessor"></rect>
+							<rect x="40765.8" y="121.0" height="31.0" width="191.0" data-name="ControlValueAccessor"></rect>
 						</g>
-						<g transform="translate(40106.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ControlValueAccessor">
+						<g transform="translate(40765.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ControlValueAccessor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ControlValueAccessor">
 								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="ControlValueAccessor">ControlValueAccessor</text>
 								
@@ -10060,16 +10095,16 @@
 					</g>
 					<g data-name="ModelAction">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ModelAction">
-							<rect x="24418.5" y="2556.5" height="137.0" width="188.0" data-name="ModelAction"></rect>
-							<path d="M24418.5 2587.5 L24606.5 2587.5" fill="none" data-name="ModelAction"></path>
+							<rect x="24450.3" y="2556.5" height="137.0" width="188.0" data-name="ModelAction"></rect>
+							<path d="M24450.3 2587.5 L24638.3 2587.5" fill="none" data-name="ModelAction"></path>
 						</g>
-						<g transform="translate(24418.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelAction">
+						<g transform="translate(24450.25, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelAction">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelAction">
 								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelAction">ModelAction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24418.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelAction">
+						<g transform="translate(24450.25, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelAction">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelAction">
 								<text x="0.0" y="13.5" stroke="none" data-name="ModelAction">+type: T</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ModelAction">+label: String</text>
@@ -10083,16 +10118,16 @@
 					</g>
 					<g data-name="IModelActionProvider">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="82420.0" y="105.5" height="62.0" width="403.0" data-name="IModelActionProvider"></rect>
-							<path d="M82420.0 136.5 L82823.0 136.5" fill="none" data-name="IModelActionProvider"></path>
+							<rect x="83357.5" y="105.5" height="62.0" width="403.0" data-name="IModelActionProvider"></rect>
+							<path d="M83357.5 136.5 L83760.5 136.5" fill="none" data-name="IModelActionProvider"></path>
 						</g>
-						<g transform="translate(82420, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
+						<g transform="translate(83357.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
 								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82420, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelActionProvider">
+						<g transform="translate(83357.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelActionProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelActionProvider">
 								<text x="0.0" y="13.5" stroke="none" data-name="IModelActionProvider">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
 								
@@ -10101,16 +10136,16 @@
 					</g>
 					<g data-name="IListActionProvider">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="82027.3" y="1174.0" height="77.0" width="179.0" data-name="IListActionProvider"></rect>
-							<path d="M82027.3 1205.0 L82206.3 1205.0" fill="none" data-name="IListActionProvider"></path>
+							<rect x="82964.8" y="1174.0" height="77.0" width="179.0" data-name="IListActionProvider"></rect>
+							<path d="M82964.8 1205.0 L83143.8 1205.0" fill="none" data-name="IListActionProvider"></path>
 						</g>
-						<g transform="translate(82027.25, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+						<g transform="translate(82964.75, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
 								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82027.25, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IListActionProvider">
+						<g transform="translate(82964.75, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IListActionProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IListActionProvider">
 								<text x="0.0" y="13.5" stroke="none" data-name="IListActionProvider">+void onSelectItem()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IListActionProvider">+void onNewItem()</text>
@@ -10120,16 +10155,16 @@
 					</g>
 					<g data-name="ModelActionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ModelActionType">
-							<rect x="516.0" y="3417.0" height="167.0" width="334.0" data-name="ModelActionType"></rect>
-							<path d="M516.0 3448.0 L850.0 3448.0" fill="none" data-name="ModelActionType"></path>
+							<rect x="940.0" y="3417.0" height="167.0" width="334.0" data-name="ModelActionType"></rect>
+							<path d="M940.0 3448.0 L1274.0 3448.0" fill="none" data-name="ModelActionType"></path>
 						</g>
-						<g transform="translate(516, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelActionType">
+						<g transform="translate(940, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelActionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelActionType">
 								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelActionType">ModelActionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(516, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelActionType">
+						<g transform="translate(940, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelActionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelActionType">
 								<text x="0.0" y="13.5" stroke="none" data-name="ModelActionType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+values: List&lt;ModelActionType&gt;</text>
@@ -10145,17 +10180,17 @@
 					</g>
 					<g data-name="OptimisticUpdate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="OptimisticUpdate">
-							<rect x="17318.5" y="3737.0" height="213.0" width="383.0" data-name="OptimisticUpdate"></rect>
-							<path d="M17318.5 3768.0 L17701.5 3768.0" fill="none" data-name="OptimisticUpdate"></path>
-							<path d="M17318.5 3904.0 L17701.5 3904.0" fill="none" data-name="OptimisticUpdate"></path>
+							<rect x="17114.0" y="3737.0" height="213.0" width="383.0" data-name="OptimisticUpdate"></rect>
+							<path d="M17114.0 3768.0 L17497.0 3768.0" fill="none" data-name="OptimisticUpdate"></path>
+							<path d="M17114.0 3904.0 L17497.0 3904.0" fill="none" data-name="OptimisticUpdate"></path>
 						</g>
-						<g transform="translate(17318.5, 3737)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptimisticUpdate">
+						<g transform="translate(17114, 3737)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptimisticUpdate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptimisticUpdate">
 								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptimisticUpdate">OptimisticUpdate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17318.5, 3768)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
+						<g transform="translate(17114, 3768)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
 								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+applyOptimistic: void Function()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">+apply: dynamic Function()</text>
@@ -10168,7 +10203,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(17318.5, 3904)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
+						<g transform="translate(17114, 3904)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
 								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+dynamic execute()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">-void _runUpdateHandlerIfAny()</text>
@@ -10178,9 +10213,9 @@
 					</g>
 					<g data-name="void Function()">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()">
-							<rect x="16645.5" y="4118.5" height="31.0" width="134.0" data-name="void Function()"></rect>
+							<rect x="15093.0" y="4118.5" height="31.0" width="134.0" data-name="void Function()"></rect>
 						</g>
-						<g transform="translate(16645.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()">
+						<g transform="translate(15093, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()">
 								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()">void Function()</text>
 								
@@ -10189,9 +10224,9 @@
 					</g>
 					<g data-name="void Function(Object, StackTrace?)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Object, StackTrace?)?">
-							<rect x="16819.5" y="4118.5" height="31.0" width="304.0" data-name="void Function(Object, StackTrace?)?"></rect>
+							<rect x="15267.0" y="4118.5" height="31.0" width="304.0" data-name="void Function(Object, StackTrace?)?"></rect>
 						</g>
-						<g transform="translate(16819.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Object, StackTrace?)?">
+						<g transform="translate(15267, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Object, StackTrace?)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Object, StackTrace?)?">
 								<text x="144.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Object, StackTrace?)?">void Function(Object, StackTrace?)?</text>
 								
@@ -10200,16 +10235,16 @@
 					</g>
 					<g data-name="FileFormatEncoder">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FileFormatEncoder">
-							<rect x="40465.3" y="90.5" height="92.0" width="216.0" data-name="FileFormatEncoder"></rect>
-							<path d="M40465.3 121.5 L40681.3 121.5" fill="none" data-name="FileFormatEncoder"></path>
+							<rect x="41124.8" y="90.5" height="92.0" width="216.0" data-name="FileFormatEncoder"></rect>
+							<path d="M41124.8 121.5 L41340.8 121.5" fill="none" data-name="FileFormatEncoder"></path>
 						</g>
-						<g transform="translate(40465.25, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FileFormatEncoder">
+						<g transform="translate(41124.75, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FileFormatEncoder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FileFormatEncoder">
 								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="FileFormatEncoder">FileFormatEncoder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40465.25, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FileFormatEncoder">
+						<g transform="translate(41124.75, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FileFormatEncoder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FileFormatEncoder">
 								<text x="0.0" y="13.5" stroke="none" data-name="FileFormatEncoder">+dynamic encodeAsync()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FileFormatEncoder">+String encode()</text>
@@ -10220,16 +10255,16 @@
 					</g>
 					<g data-name="CSVStringEncoder">
 						<g fill="#eee8d5" stroke="#33322E" data-name="CSVStringEncoder">
-							<rect x="40390.3" y="598.5" height="62.0" width="162.0" data-name="CSVStringEncoder"></rect>
-							<path d="M40390.3 629.5 L40552.3 629.5" fill="none" data-name="CSVStringEncoder"></path>
+							<rect x="41049.8" y="598.5" height="62.0" width="162.0" data-name="CSVStringEncoder"></rect>
+							<path d="M41049.8 629.5 L41211.8 629.5" fill="none" data-name="CSVStringEncoder"></path>
 						</g>
-						<g transform="translate(40390.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CSVStringEncoder">
+						<g transform="translate(41049.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CSVStringEncoder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CSVStringEncoder">
 								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="CSVStringEncoder">CSVStringEncoder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40390.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CSVStringEncoder">
+						<g transform="translate(41049.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CSVStringEncoder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CSVStringEncoder">
 								<text x="0.0" y="13.5" stroke="none" data-name="CSVStringEncoder">+String encode()</text>
 								
@@ -10238,16 +10273,16 @@
 					</g>
 					<g data-name="JsonStringEncoder">
 						<g fill="#eee8d5" stroke="#33322E" data-name="JsonStringEncoder">
-							<rect x="40592.3" y="598.5" height="62.0" width="166.0" data-name="JsonStringEncoder"></rect>
-							<path d="M40592.3 629.5 L40758.3 629.5" fill="none" data-name="JsonStringEncoder"></path>
+							<rect x="41251.8" y="598.5" height="62.0" width="166.0" data-name="JsonStringEncoder"></rect>
+							<path d="M41251.8 629.5 L41417.8 629.5" fill="none" data-name="JsonStringEncoder"></path>
 						</g>
-						<g transform="translate(40592.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JsonStringEncoder">
+						<g transform="translate(41251.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JsonStringEncoder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonStringEncoder">
 								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="JsonStringEncoder">JsonStringEncoder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40592.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonStringEncoder">
+						<g transform="translate(41251.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonStringEncoder">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonStringEncoder">
 								<text x="0.0" y="13.5" stroke="none" data-name="JsonStringEncoder">+String encode()</text>
 								
@@ -10256,24 +10291,24 @@
 					</g>
 					<g data-name="ExecutionLimiter">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ExecutionLimiter">
-							<rect x="18293.8" y="3789.5" height="108.0" width="197.0" data-name="ExecutionLimiter"></rect>
-							<path d="M18293.8 3820.5 L18490.8 3820.5" fill="none" data-name="ExecutionLimiter"></path>
-							<path d="M18293.8 3866.5 L18490.8 3866.5" fill="none" data-name="ExecutionLimiter"></path>
+							<rect x="18089.3" y="3789.5" height="108.0" width="197.0" data-name="ExecutionLimiter"></rect>
+							<path d="M18089.3 3820.5 L18286.3 3820.5" fill="none" data-name="ExecutionLimiter"></path>
+							<path d="M18089.3 3866.5 L18286.3 3866.5" fill="none" data-name="ExecutionLimiter"></path>
 						</g>
-						<g transform="translate(18293.75, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ExecutionLimiter">
+						<g transform="translate(18089.25, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ExecutionLimiter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ExecutionLimiter">
 								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ExecutionLimiter">ExecutionLimiter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18293.75, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
+						<g transform="translate(18089.25, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
 								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+milliseconds: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ExecutionLimiter">&lt;static&gt;-_timer: Timer?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18293.75, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
+						<g transform="translate(18089.25, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
 								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+void dispose()</text>
 								
@@ -10282,9 +10317,9 @@
 					</g>
 					<g data-name="Timer">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Timer">
-							<rect x="17163.5" y="4118.5" height="31.0" width="60.0" data-name="Timer"></rect>
+							<rect x="15611.0" y="4118.5" height="31.0" width="60.0" data-name="Timer"></rect>
 						</g>
-						<g transform="translate(17163.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timer">
+						<g transform="translate(15611, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timer">
 								<text x="22.0" y="13.5" stroke="none" text-anchor="middle" data-name="Timer">Timer</text>
 								
@@ -10293,17 +10328,17 @@
 					</g>
 					<g data-name="Debouncer">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="58540.5" y="4072.5" height="123.0" width="536.0" data-name="Debouncer"></rect>
-							<path d="M58540.5 4103.5 L59076.5 4103.5" fill="none" data-name="Debouncer"></path>
-							<path d="M58540.5 4164.5 L59076.5 4164.5" fill="none" data-name="Debouncer"></path>
+							<rect x="59213.3" y="4072.5" height="123.0" width="536.0" data-name="Debouncer"></rect>
+							<path d="M59213.3 4103.5 L59749.3 4103.5" fill="none" data-name="Debouncer"></path>
+							<path d="M59213.3 4164.5 L59749.3 4164.5" fill="none" data-name="Debouncer"></path>
 						</g>
-						<g transform="translate(58540.5, 4072.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
+						<g transform="translate(59213.25, 4072.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
 								<text x="260.0" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58540.5, 4103.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
+						<g transform="translate(59213.25, 4103.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
 								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+leading: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Debouncer">+cancelUncompleted: bool</text>
@@ -10311,7 +10346,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(58540.5, 4164.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
+						<g transform="translate(59213.25, 4164.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
 								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+dynamic call()</text>
 								
@@ -10320,9 +10355,9 @@
 					</g>
 					<g data-name="CancelableOperation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="63871.3" y="4439.0" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
+							<rect x="65807.3" y="4439.0" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
 						</g>
-						<g transform="translate(63871.25, 4439)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
+						<g transform="translate(65807.25, 4439)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
 								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
 								
@@ -10331,16 +10366,16 @@
 					</g>
 					<g data-name="Throttler">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Throttler">
-							<rect x="39575.0" y="4103.0" height="62.0" width="136.0" data-name="Throttler"></rect>
-							<path d="M39575.0 4134.0 L39711.0 4134.0" fill="none" data-name="Throttler"></path>
+							<rect x="40742.0" y="4103.0" height="62.0" width="136.0" data-name="Throttler"></rect>
+							<path d="M40742.0 4134.0 L40878.0 4134.0" fill="none" data-name="Throttler"></path>
 						</g>
-						<g transform="translate(39575, 4103)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Throttler">
+						<g transform="translate(40742, 4103)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Throttler">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Throttler">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="Throttler">Throttler</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39575, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Throttler">
+						<g transform="translate(40742, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Throttler">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Throttler">
 								<text x="0.0" y="13.5" stroke="none" data-name="Throttler">+dynamic call()</text>
 								
@@ -10349,16 +10384,16 @@
 					</g>
 					<g data-name="SerializableColor">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SerializableColor">
-							<rect x="21961.0" y="3805.0" height="77.0" width="312.0" data-name="SerializableColor"></rect>
-							<path d="M21961.0 3836.0 L22273.0 3836.0" fill="none" data-name="SerializableColor"></path>
+							<rect x="21173.0" y="3805.0" height="77.0" width="312.0" data-name="SerializableColor"></rect>
+							<path d="M21173.0 3836.0 L21485.0 3836.0" fill="none" data-name="SerializableColor"></path>
 						</g>
-						<g transform="translate(21961, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SerializableColor">
+						<g transform="translate(21173, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SerializableColor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SerializableColor">
 								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="SerializableColor">SerializableColor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21961, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SerializableColor">
+						<g transform="translate(21173, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SerializableColor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SerializableColor">
 								<text x="0.0" y="13.5" stroke="none" data-name="SerializableColor">+Map&lt;String, dynamic&gt; toJson()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SerializableColor">&lt;static&gt;+SerializableColor fromJson()</text>
@@ -10368,16 +10403,16 @@
 					</g>
 					<g data-name="IProviderArgsResolver">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="41582.3" y="1181.5" height="62.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-							<path d="M41582.3 1212.5 L41775.3 1212.5" fill="none" data-name="IProviderArgsResolver"></path>
+							<rect x="42241.8" y="1181.5" height="62.0" width="193.0" data-name="IProviderArgsResolver"></rect>
+							<path d="M42241.8 1212.5 L42434.8 1212.5" fill="none" data-name="IProviderArgsResolver"></path>
 						</g>
-						<g transform="translate(41582.25, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
+						<g transform="translate(42241.75, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
 								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41582.25, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IProviderArgsResolver">
+						<g transform="translate(42241.75, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IProviderArgsResolver">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IProviderArgsResolver">
 								<text x="0.0" y="13.5" stroke="none" data-name="IProviderArgsResolver">+R provide()</text>
 								
@@ -10386,23 +10421,23 @@
 					</g>
 					<g data-name="CombinedStreamNotifier">
 						<g fill="#eee8d5" stroke="#33322E" data-name="CombinedStreamNotifier">
-							<rect x="40798.3" y="583.0" height="93.0" width="435.0" data-name="CombinedStreamNotifier"></rect>
-							<path d="M40798.3 614.0 L41233.3 614.0" fill="none" data-name="CombinedStreamNotifier"></path>
-							<path d="M40798.3 645.0 L41233.3 645.0" fill="none" data-name="CombinedStreamNotifier"></path>
+							<rect x="41457.8" y="583.0" height="93.0" width="435.0" data-name="CombinedStreamNotifier"></rect>
+							<path d="M41457.8 614.0 L41892.8 614.0" fill="none" data-name="CombinedStreamNotifier"></path>
+							<path d="M41457.8 645.0 L41892.8 645.0" fill="none" data-name="CombinedStreamNotifier"></path>
 						</g>
-						<g transform="translate(40798.25, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CombinedStreamNotifier">
+						<g transform="translate(41457.75, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CombinedStreamNotifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CombinedStreamNotifier">
 								<text x="209.5" y="13.5" stroke="none" text-anchor="middle" data-name="CombinedStreamNotifier">CombinedStreamNotifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40798.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
+						<g transform="translate(41457.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
 								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">-_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40798.25, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
+						<g transform="translate(41457.75, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
 								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">+void dispose()</text>
 								
@@ -10411,9 +10446,9 @@
 					</g>
 					<g data-name="ChangeNotifier">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
-							<rect x="40948.8" y="121.0" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
+							<rect x="41608.3" y="121.0" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
 						</g>
-						<g transform="translate(40948.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
+						<g transform="translate(41608.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
 								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
 								
@@ -10422,17 +10457,17 @@
 					</g>
 					<g data-name="CountWhereValidator">
 						<g fill="#eee8d5" stroke="#33322E" data-name="CountWhereValidator">
-							<rect x="41273.3" y="553.0" height="153.0" width="383.0" data-name="CountWhereValidator"></rect>
-							<path d="M41273.3 584.0 L41656.3 584.0" fill="none" data-name="CountWhereValidator"></path>
-							<path d="M41273.3 675.0 L41656.3 675.0" fill="none" data-name="CountWhereValidator"></path>
+							<rect x="41932.8" y="553.0" height="153.0" width="383.0" data-name="CountWhereValidator"></rect>
+							<path d="M41932.8 584.0 L42315.8 584.0" fill="none" data-name="CountWhereValidator"></path>
+							<path d="M41932.8 675.0 L42315.8 675.0" fill="none" data-name="CountWhereValidator"></path>
 						</g>
-						<g transform="translate(41273.25, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CountWhereValidator">
+						<g transform="translate(41932.75, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CountWhereValidator">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CountWhereValidator">
 								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="CountWhereValidator">CountWhereValidator</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41273.25, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
+						<g transform="translate(41932.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
 								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+predicate: bool Function(T?)</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="CountWhereValidator">+minCount: int?</text>
@@ -10442,7 +10477,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(41273.25, 675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
+						<g transform="translate(41932.75, 675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
 								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+Map&lt;String, dynamic&gt;? validate()</text>
 								
@@ -10451,9 +10486,9 @@
 					</g>
 					<g data-name="bool Function(T?)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="bool Function(T?)">
-							<rect x="41387.3" y="1197.0" height="31.0" width="155.0" data-name="bool Function(T?)"></rect>
+							<rect x="42046.8" y="1197.0" height="31.0" width="155.0" data-name="bool Function(T?)"></rect>
 						</g>
-						<g transform="translate(41387.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="bool Function(T?)">
+						<g transform="translate(42046.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="bool Function(T?)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="bool Function(T?)">
 								<text x="69.5" y="13.5" stroke="none" text-anchor="middle" data-name="bool Function(T?)">bool Function(T?)</text>
 								
@@ -10462,9 +10497,9 @@
 					</g>
 					<g data-name="Validator">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Validator">
-							<rect x="41421.8" y="121.0" height="31.0" width="86.0" data-name="Validator"></rect>
+							<rect x="42081.3" y="121.0" height="31.0" width="86.0" data-name="Validator"></rect>
 						</g>
-						<g transform="translate(41421.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Validator">
+						<g transform="translate(42081.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Validator">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Validator">
 								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="Validator">Validator</text>
 								
@@ -10473,16 +10508,16 @@
 					</g>
 					<g data-name="Patterns">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Patterns">
-							<rect x="43029.0" y="90.5" height="92.0" width="287.0" data-name="Patterns"></rect>
-							<path d="M43029.0 121.5 L43316.0 121.5" fill="none" data-name="Patterns"></path>
+							<rect x="43847.0" y="90.5" height="92.0" width="287.0" data-name="Patterns"></rect>
+							<path d="M43847.0 121.5 L44134.0 121.5" fill="none" data-name="Patterns"></path>
 						</g>
-						<g transform="translate(43029, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Patterns">
+						<g transform="translate(43847, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Patterns">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Patterns">
 								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="Patterns">Patterns</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43029, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Patterns">
+						<g transform="translate(43847, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Patterns">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Patterns">
 								<text x="0.0" y="13.5" stroke="none" data-name="Patterns">&lt;static&gt;+timeFormatString: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Patterns">&lt;static&gt;+emailFormatString: String</text>
@@ -10493,24 +10528,24 @@
 					</g>
 					<g data-name="NumericalRangeFormatter">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NumericalRangeFormatter">
-							<rect x="41949.5" y="575.5" height="108.0" width="313.0" data-name="NumericalRangeFormatter"></rect>
-							<path d="M41949.5 606.5 L42262.5 606.5" fill="none" data-name="NumericalRangeFormatter"></path>
-							<path d="M41949.5 652.5 L42262.5 652.5" fill="none" data-name="NumericalRangeFormatter"></path>
+							<rect x="42767.5" y="575.5" height="108.0" width="313.0" data-name="NumericalRangeFormatter"></rect>
+							<path d="M42767.5 606.5 L43080.5 606.5" fill="none" data-name="NumericalRangeFormatter"></path>
+							<path d="M42767.5 652.5 L43080.5 652.5" fill="none" data-name="NumericalRangeFormatter"></path>
 						</g>
-						<g transform="translate(41949.5, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericalRangeFormatter">
+						<g transform="translate(42767.5, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericalRangeFormatter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NumericalRangeFormatter">
 								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="NumericalRangeFormatter">NumericalRangeFormatter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41949.5, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
+						<g transform="translate(42767.5, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
 								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+min: int?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="NumericalRangeFormatter">+max: int?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41949.5, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
+						<g transform="translate(42767.5, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
 								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+TextEditingValue formatEditUpdate()</text>
 								
@@ -10519,9 +10554,9 @@
 					</g>
 					<g data-name="TextInputFormatter">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TextInputFormatter">
-							<rect x="42199.5" y="121.0" height="31.0" width="166.0" data-name="TextInputFormatter"></rect>
+							<rect x="43017.5" y="121.0" height="31.0" width="166.0" data-name="TextInputFormatter"></rect>
 						</g>
-						<g transform="translate(42199.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TextInputFormatter">
+						<g transform="translate(43017.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TextInputFormatter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextInputFormatter">
 								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextInputFormatter">TextInputFormatter</text>
 								
@@ -10530,16 +10565,16 @@
 					</g>
 					<g data-name="StudySequenceFormatter">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudySequenceFormatter">
-							<rect x="42302.5" y="598.5" height="62.0" width="313.0" data-name="StudySequenceFormatter"></rect>
-							<path d="M42302.5 629.5 L42615.5 629.5" fill="none" data-name="StudySequenceFormatter"></path>
+							<rect x="43120.5" y="598.5" height="62.0" width="313.0" data-name="StudySequenceFormatter"></rect>
+							<path d="M43120.5 629.5 L43433.5 629.5" fill="none" data-name="StudySequenceFormatter"></path>
 						</g>
-						<g transform="translate(42302.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySequenceFormatter">
+						<g transform="translate(43120.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySequenceFormatter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySequenceFormatter">
 								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySequenceFormatter">StudySequenceFormatter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42302.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySequenceFormatter">
+						<g transform="translate(43120.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySequenceFormatter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySequenceFormatter">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudySequenceFormatter">+TextEditingValue formatEditUpdate()</text>
 								
@@ -10548,17 +10583,17 @@
 					</g>
 					<g data-name="Tuple">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Tuple">
-							<rect x="22399.0" y="2541.0" height="168.0" width="384.0" data-name="Tuple"></rect>
-							<path d="M22399.0 2572.0 L22783.0 2572.0" fill="none" data-name="Tuple"></path>
-							<path d="M22399.0 2633.0 L22783.0 2633.0" fill="none" data-name="Tuple"></path>
+							<rect x="0.0" y="2541.0" height="168.0" width="384.0" data-name="Tuple"></rect>
+							<path d="M0.0 2572.0 L384.0 2572.0" fill="none" data-name="Tuple"></path>
+							<path d="M0.0 2633.0 L384.0 2633.0" fill="none" data-name="Tuple"></path>
 						</g>
-						<g transform="translate(22399, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Tuple">
+						<g transform="translate(0, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Tuple">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Tuple">
 								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="Tuple">Tuple</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22399, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
+						<g transform="translate(0, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
 								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+first: T1</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">+second: T2</text>
@@ -10566,7 +10601,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(22399, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
+						<g transform="translate(0, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
 								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+Map&lt;String, dynamic&gt; toJson()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">&lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson()</text>
@@ -10578,23 +10613,23 @@
 					</g>
 					<g data-name="JsonFileLoader">
 						<g fill="#eee8d5" stroke="#33322E" data-name="JsonFileLoader">
-							<rect x="70805.8" y="75.0" height="123.0" width="319.0" data-name="JsonFileLoader"></rect>
-							<path d="M70805.8 106.0 L71124.8 106.0" fill="none" data-name="JsonFileLoader"></path>
-							<path d="M70805.8 137.0 L71124.8 137.0" fill="none" data-name="JsonFileLoader"></path>
+							<rect x="72296.0" y="75.0" height="123.0" width="319.0" data-name="JsonFileLoader"></rect>
+							<path d="M72296.0 106.0 L72615.0 106.0" fill="none" data-name="JsonFileLoader"></path>
+							<path d="M72296.0 137.0 L72615.0 137.0" fill="none" data-name="JsonFileLoader"></path>
 						</g>
-						<g transform="translate(70805.75, 75)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="JsonFileLoader">
+						<g transform="translate(72296, 75)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="JsonFileLoader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonFileLoader">
 								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="JsonFileLoader">JsonFileLoader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(70805.75, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
+						<g transform="translate(72296, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
 								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+jsonAssetsPath: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(70805.75, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
+						<g transform="translate(72296, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
 								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+dynamic loadJson()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonMapFromAssets()</text>
@@ -10605,16 +10640,16 @@
 					</g>
 					<g data-name="IAppDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
-							<rect x="19658.5" y="3812.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
-							<path d="M19658.5 3843.5 L19855.5 3843.5" fill="none" data-name="IAppDelegate"></path>
+							<rect x="19172.5" y="3812.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
+							<path d="M19172.5 3843.5 L19369.5 3843.5" fill="none" data-name="IAppDelegate"></path>
 						</g>
-						<g transform="translate(19658.5, 3812.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
+						<g transform="translate(19172.5, 3812.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
 								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19658.5, 3843.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
+						<g transform="translate(19172.5, 3843.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
 								
@@ -10623,17 +10658,17 @@
 					</g>
 					<g data-name="AppController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
-							<rect x="71164.8" y="67.5" height="138.0" width="301.0" data-name="AppController"></rect>
-							<path d="M71164.8 98.5 L71465.8 98.5" fill="none" data-name="AppController"></path>
-							<path d="M71164.8 159.5 L71465.8 159.5" fill="none" data-name="AppController"></path>
+							<rect x="72655.0" y="67.5" height="138.0" width="301.0" data-name="AppController"></rect>
+							<path d="M72655.0 98.5 L72956.0 98.5" fill="none" data-name="AppController"></path>
+							<path d="M72655.0 159.5 L72956.0 159.5" fill="none" data-name="AppController"></path>
 						</g>
-						<g transform="translate(71164.75, 67.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
+						<g transform="translate(72655, 67.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
 								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(71164.75, 98.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+						<g transform="translate(72655, 98.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
@@ -10641,7 +10676,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(71164.75, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+						<g transform="translate(72655, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
@@ -10649,73 +10684,18 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="ParticipantDetailsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsFormView">
-							<rect x="79547.0" y="1651.0" height="93.0" width="419.0" data-name="ParticipantDetailsFormView"></rect>
-							<path d="M79547.0 1682.0 L79966.0 1682.0" fill="none" data-name="ParticipantDetailsFormView"></path>
-							<path d="M79547.0 1713.0 L79966.0 1713.0" fill="none" data-name="ParticipantDetailsFormView"></path>
-						</g>
-						<g transform="translate(79547, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsFormView">
-								<text x="201.5" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsFormView">ParticipantDetailsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(79547, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormView">+formViewModel: ParticipantDetailsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(79547, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ParticipantDetailsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsFormViewModel">
-							<rect x="64335.3" y="2541.0" height="168.0" width="354.0" data-name="ParticipantDetailsFormViewModel"></rect>
-							<path d="M64335.3 2572.0 L64689.3 2572.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
-							<path d="M64335.3 2648.0 L64689.3 2648.0" fill="none" data-name="ParticipantDetailsFormViewModel"></path>
-						</g>
-						<g transform="translate(64335.25, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsFormViewModel">
-								<text x="169.0" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsFormViewModel">ParticipantDetailsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(64335.25, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+participantIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+rawDataControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(64335.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+void initControls()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+StudyMonitorItem buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsFormViewModel">+void setControlsFrom()</text>
-								
-							</g>
-						</g>
-					</g>
 					<g data-name="StudyMonitorScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="28944.5" y="2571.5" height="107.0" width="280.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M28944.5 2602.5 L29224.5 2602.5" fill="none" data-name="StudyMonitorScreen"></path>
+							<rect x="30453.3" y="2571.5" height="107.0" width="280.0" data-name="StudyMonitorScreen"></rect>
+							<path d="M30453.3 2602.5 L30733.3 2602.5" fill="none" data-name="StudyMonitorScreen"></path>
 						</g>
-						<g transform="translate(28944.5, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
+						<g transform="translate(30453.25, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
 								<text x="132.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28944.5, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
+						<g transform="translate(30453.25, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorScreen">-Widget _monitorSectionHeader()</text>
@@ -10727,85 +10707,49 @@
 					</g>
 					<g data-name="StudyPageWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="34480.3" y="1651.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
-							<path d="M34480.3 1682.0 L34644.3 1682.0" fill="none" data-name="StudyPageWidget"></path>
-							<path d="M34480.3 1713.0 L34644.3 1713.0" fill="none" data-name="StudyPageWidget"></path>
+							<rect x="34026.3" y="1651.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
+							<path d="M34026.3 1682.0 L34190.3 1682.0" fill="none" data-name="StudyPageWidget"></path>
+							<path d="M34026.3 1713.0 L34190.3 1713.0" fill="none" data-name="StudyPageWidget"></path>
 						</g>
-						<g transform="translate(34480.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
+						<g transform="translate(34026.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
 								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34480.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+						<g transform="translate(34026.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34480.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+						<g transform="translate(34026.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyMonitorItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorItem">
-							<rect x="22823.0" y="2496.0" height="258.0" width="371.0" data-name="StudyMonitorItem"></rect>
-							<path d="M22823.0 2527.0 L23194.0 2527.0" fill="none" data-name="StudyMonitorItem"></path>
-							<path d="M22823.0 2723.0 L23194.0 2723.0" fill="none" data-name="StudyMonitorItem"></path>
-						</g>
-						<g transform="translate(22823, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorItem">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorItem">StudyMonitorItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22823, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">+participantId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorItem">+inviteCode: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorItem">+enrolledAt: DateTime</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorItem">+lastActivityAt: DateTime</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyMonitorItem">+currentDayOfStudy: int</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyMonitorItem">+studyDurationInDays: int</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyMonitorItem">+completedInterventions: int</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyMonitorItem">+missedInterventions: int</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyMonitorItem">+completedSurveys: int</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyMonitorItem">+missedSurveys: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyMonitorItem">+rawData: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyMonitorItem">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22823, 2723)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">&lt;static&gt;+List&lt;StudyMonitorItem&gt; fromStudy()</text>
-								
-							</g>
-						</g>
-					</g>
 					<g data-name="StudyMonitorTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorTable">
-							<rect x="42594.0" y="60.0" height="153.0" width="395.0" data-name="StudyMonitorTable"></rect>
-							<path d="M42594.0 91.0 L42989.0 91.0" fill="none" data-name="StudyMonitorTable"></path>
-							<path d="M42594.0 137.0 L42989.0 137.0" fill="none" data-name="StudyMonitorTable"></path>
+							<rect x="43412.0" y="60.0" height="153.0" width="395.0" data-name="StudyMonitorTable"></rect>
+							<path d="M43412.0 91.0 L43807.0 91.0" fill="none" data-name="StudyMonitorTable"></path>
+							<path d="M43412.0 137.0 L43807.0 137.0" fill="none" data-name="StudyMonitorTable"></path>
 						</g>
-						<g transform="translate(42594, 60)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorTable">
+						<g transform="translate(43412, 60)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorTable">
 								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorTable">StudyMonitorTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42594, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
+						<g transform="translate(43412, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+studyMonitorItems: List&lt;StudyMonitorItem&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">+onSelectItem: void Function(StudyMonitorItem)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42594, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
+						<g transform="translate(43412, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">-List&lt;Widget&gt; _buildRow()</text>
@@ -10817,117 +10761,63 @@
 					</g>
 					<g data-name="void Function(StudyMonitorItem)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyMonitorItem)">
-							<rect x="42655.5" y="614.0" height="31.0" width="272.0" data-name="void Function(StudyMonitorItem)"></rect>
+							<rect x="43473.5" y="614.0" height="31.0" width="272.0" data-name="void Function(StudyMonitorItem)"></rect>
 						</g>
-						<g transform="translate(42655.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyMonitorItem)">
+						<g transform="translate(43473.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyMonitorItem)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyMonitorItem)">
 								<text x="128.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyMonitorItem)">void Function(StudyMonitorItem)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="59231.8" y="3485.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+					<g data-name="ParticipantDetailsView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsView">
+							<rect x="27131.3" y="1621.0" height="153.0" width="282.0" data-name="ParticipantDetailsView"></rect>
+							<path d="M27131.3 1652.0 L27413.3 1652.0" fill="none" data-name="ParticipantDetailsView"></path>
+							<path d="M27131.3 1713.0 L27413.3 1713.0" fill="none" data-name="ParticipantDetailsView"></path>
 						</g>
-						<g transform="translate(59231.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+						<g transform="translate(27131.25, 1621)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsView">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsView">ParticipantDetailsView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="62924.0" y="3485.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(62924, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+						<g transform="translate(27131.25, 1652)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsView">+monitorItem: StudyMonitorItem</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsView">+interventions: List&lt;Intervention&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsView">+observations: List&lt;Observation&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="66800.5" y="313.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
-							<path d="M66800.5 344.0 L67672.5 344.0" fill="none" data-name="FormViewModel"></path>
-							<path d="M66800.5 660.0 L67672.5 660.0" fill="none" data-name="FormViewModel"></path>
-						</g>
-						<g transform="translate(66800.5, 313)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(66800.5, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(66800.5, 660)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
+						<g transform="translate(27131.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsView">-Widget _buildPerDayStatus()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsView">-String _getTooltipText()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="LoginForm">
 						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
-							<rect x="11713.0" y="2578.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
-							<path d="M11713.0 2609.5 L11920.0 2609.5" fill="none" data-name="LoginForm"></path>
-							<path d="M11713.0 2640.5 L11920.0 2640.5" fill="none" data-name="LoginForm"></path>
+							<rect x="12814.0" y="2578.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
+							<path d="M12814.0 2609.5 L13021.0 2609.5" fill="none" data-name="LoginForm"></path>
+							<path d="M12814.0 2640.5 L13021.0 2640.5" fill="none" data-name="LoginForm"></path>
 						</g>
-						<g transform="translate(11713, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
+						<g transform="translate(12814, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
 								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11713, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+						<g transform="translate(12814, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11713, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+						<g transform="translate(12814, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
 								
@@ -10936,16 +10826,16 @@
 					</g>
 					<g data-name="AuthFormKey">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
-							<rect x="14634.5" y="3417.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
-							<path d="M14634.5 3448.0 L14989.5 3448.0" fill="none" data-name="AuthFormKey"></path>
+							<rect x="16987.0" y="3417.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
+							<path d="M16987.0 3448.0 L17342.0 3448.0" fill="none" data-name="AuthFormKey"></path>
 						</g>
-						<g transform="translate(14634.5, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
+						<g transform="translate(16987, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
 								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14634.5, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
+						<g transform="translate(16987, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
@@ -10961,23 +10851,23 @@
 					</g>
 					<g data-name="PasswordRecoveryForm">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
-							<rect x="12467.3" y="2578.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
-							<path d="M12467.3 2609.5 L12675.3 2609.5" fill="none" data-name="PasswordRecoveryForm"></path>
-							<path d="M12467.3 2640.5 L12675.3 2640.5" fill="none" data-name="PasswordRecoveryForm"></path>
+							<rect x="13442.0" y="2578.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
+							<path d="M13442.0 2609.5 L13650.0 2609.5" fill="none" data-name="PasswordRecoveryForm"></path>
+							<path d="M13442.0 2640.5 L13650.0 2640.5" fill="none" data-name="PasswordRecoveryForm"></path>
 						</g>
-						<g transform="translate(12467.25, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
+						<g transform="translate(13442, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
 								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12467.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+						<g transform="translate(13442, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12467.25, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+						<g transform="translate(13442, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
 								
@@ -10986,23 +10876,23 @@
 					</g>
 					<g data-name="PasswordForgotForm">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
-							<rect x="13425.0" y="2578.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
-							<path d="M13425.0 2609.5 L13632.0 2609.5" fill="none" data-name="PasswordForgotForm"></path>
-							<path d="M13425.0 2640.5 L13632.0 2640.5" fill="none" data-name="PasswordForgotForm"></path>
+							<rect x="17061.0" y="2578.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
+							<path d="M17061.0 2609.5 L17268.0 2609.5" fill="none" data-name="PasswordForgotForm"></path>
+							<path d="M17061.0 2640.5 L17268.0 2640.5" fill="none" data-name="PasswordForgotForm"></path>
 						</g>
-						<g transform="translate(13425, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
+						<g transform="translate(17061, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
 								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13425, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+						<g transform="translate(17061, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13425, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+						<g transform="translate(17061, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
 								
@@ -11011,23 +10901,23 @@
 					</g>
 					<g data-name="SignupForm">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
-							<rect x="18358.3" y="2563.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
-							<path d="M18358.3 2594.5 L18636.3 2594.5" fill="none" data-name="SignupForm"></path>
-							<path d="M18358.3 2625.5 L18636.3 2625.5" fill="none" data-name="SignupForm"></path>
+							<rect x="18153.8" y="2563.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
+							<path d="M18153.8 2594.5 L18431.8 2594.5" fill="none" data-name="SignupForm"></path>
+							<path d="M18153.8 2625.5 L18431.8 2625.5" fill="none" data-name="SignupForm"></path>
 						</g>
-						<g transform="translate(18358.25, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
+						<g transform="translate(18153.75, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
 								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18358.25, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+						<g transform="translate(18153.75, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18358.25, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+						<g transform="translate(18153.75, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
 								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
@@ -11038,16 +10928,16 @@
 					</g>
 					<g data-name="AuthScaffold">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
-							<rect x="29849.5" y="2564.0" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
-							<path d="M29849.5 2595.0 L30108.5 2595.0" fill="none" data-name="AuthScaffold"></path>
+							<rect x="30773.3" y="2564.0" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
+							<path d="M30773.3 2595.0 L31032.3 2595.0" fill="none" data-name="AuthScaffold"></path>
 						</g>
-						<g transform="translate(29849.5, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
+						<g transform="translate(30773.25, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
 								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29849.5, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
+						<g transform="translate(30773.25, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
@@ -11060,16 +10950,16 @@
 					</g>
 					<g data-name="EmailTextField">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
-							<rect x="30148.5" y="2571.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
-							<path d="M30148.5 2602.5 L30469.5 2602.5" fill="none" data-name="EmailTextField"></path>
+							<rect x="31072.3" y="2571.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
+							<path d="M31072.3 2602.5 L31393.3 2602.5" fill="none" data-name="EmailTextField"></path>
 						</g>
-						<g transform="translate(30148.5, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
+						<g transform="translate(31072.25, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
 								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30148.5, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
+						<g transform="translate(31072.25, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
 								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
@@ -11079,18 +10969,29 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="59651.0" y="3485.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+						</g>
+						<g transform="translate(59651, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="PasswordTextField">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
-							<rect x="30509.5" y="2564.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
-							<path d="M30509.5 2595.0 L30988.5 2595.0" fill="none" data-name="PasswordTextField"></path>
+							<rect x="31433.3" y="2564.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
+							<path d="M31433.3 2595.0 L31912.3 2595.0" fill="none" data-name="PasswordTextField"></path>
 						</g>
-						<g transform="translate(30509.5, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
+						<g transform="translate(31433.25, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30509.5, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
+						<g transform="translate(31433.25, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
 								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
@@ -11103,9 +11004,9 @@
 					</g>
 					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<rect x="31536.3" y="3485.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
+							<rect x="32204.8" y="3485.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
 						</g>
-						<g transform="translate(31536.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+						<g transform="translate(32204.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
 								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
 								
@@ -11114,16 +11015,16 @@
 					</g>
 					<g data-name="StudyUJobsToBeDone">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
-							<rect x="76770.0" y="105.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
-							<path d="M76770.0 136.5 L76964.0 136.5" fill="none" data-name="StudyUJobsToBeDone"></path>
+							<rect x="77707.5" y="105.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
+							<path d="M77707.5 136.5 L77901.5 136.5" fill="none" data-name="StudyUJobsToBeDone"></path>
 						</g>
-						<g transform="translate(76770, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
+						<g transform="translate(77707.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
 								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76770, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
+						<g transform="translate(77707.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
 								
@@ -11132,17 +11033,17 @@
 					</g>
 					<g data-name="AuthFormController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
-							<rect x="42958.3" y="2368.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
-							<path d="M42958.3 2399.5 L43808.3 2399.5" fill="none" data-name="AuthFormController"></path>
-							<path d="M42958.3 2655.5 L43808.3 2655.5" fill="none" data-name="AuthFormController"></path>
+							<rect x="43369.0" y="2368.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
+							<path d="M43369.0 2399.5 L44219.0 2399.5" fill="none" data-name="AuthFormController"></path>
+							<path d="M43369.0 2655.5 L44219.0 2655.5" fill="none" data-name="AuthFormController"></path>
 						</g>
-						<g transform="translate(42958.25, 2368.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
+						<g transform="translate(43369, 2368.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
 								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42958.25, 2399.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+						<g transform="translate(43369, 2399.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
@@ -11163,7 +11064,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(42958.25, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+						<g transform="translate(43369, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
@@ -11185,17 +11086,17 @@
 					</g>
 					<g data-name="IAuthRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="71281.3" y="4020.0" height="228.0" width="295.0" data-name="IAuthRepository"></rect>
-							<path d="M71281.3 4051.0 L71576.3 4051.0" fill="none" data-name="IAuthRepository"></path>
-							<path d="M71281.3 4142.0 L71576.3 4142.0" fill="none" data-name="IAuthRepository"></path>
+							<rect x="72021.8" y="4020.0" height="228.0" width="295.0" data-name="IAuthRepository"></rect>
+							<path d="M72021.8 4051.0 L72316.8 4051.0" fill="none" data-name="IAuthRepository"></path>
+							<path d="M72021.8 4142.0 L72316.8 4142.0" fill="none" data-name="IAuthRepository"></path>
 						</g>
-						<g transform="translate(71281.25, 4020)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
+						<g transform="translate(72021.75, 4020)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
 								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(71281.25, 4051)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
+						<g transform="translate(72021.75, 4051)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+allowPasswordReset: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+currentUser: User?</text>
@@ -11205,7 +11106,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(71281.25, 4142)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
+						<g transform="translate(72021.75, 4142)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+dynamic signUp()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+dynamic signInWith()</text>
@@ -11217,18 +11118,29 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="FormGroup">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
+							<rect x="62924.3" y="3485.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
+						</g>
+						<g transform="translate(62924.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="IFormGroupController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="45943.0" y="105.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
-							<path d="M45943.0 136.5 L46130.0 136.5" fill="none" data-name="IFormGroupController"></path>
+							<rect x="45870.3" y="105.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
+							<path d="M45870.3 136.5 L46057.3 136.5" fill="none" data-name="IFormGroupController"></path>
 						</g>
-						<g transform="translate(45943, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
+						<g transform="translate(45870.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
 								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45943, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
+						<g transform="translate(45870.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
 								
@@ -11237,16 +11149,16 @@
 					</g>
 					<g data-name="AppStatus">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
-							<rect x="940.0" y="3447.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
-							<path d="M940.0 3478.0 L1219.0 3478.0" fill="none" data-name="AppStatus"></path>
+							<rect x="1364.0" y="3447.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
+							<path d="M1364.0 3478.0 L1643.0 3478.0" fill="none" data-name="AppStatus"></path>
 						</g>
-						<g transform="translate(940, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
+						<g transform="translate(1364, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
 								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(940, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
+						<g transform="translate(1364, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
@@ -11258,17 +11170,17 @@
 					</g>
 					<g data-name="FormArrayTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
-							<rect x="32545.0" y="2428.5" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
-							<path d="M32545.0 2459.5 L33035.0 2459.5" fill="none" data-name="FormArrayTable"></path>
-							<path d="M32545.0 2760.5 L33035.0 2760.5" fill="none" data-name="FormArrayTable"></path>
+							<rect x="32306.3" y="2428.5" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
+							<path d="M32306.3 2459.5 L32796.3 2459.5" fill="none" data-name="FormArrayTable"></path>
+							<path d="M32306.3 2760.5 L32796.3 2760.5" fill="none" data-name="FormArrayTable"></path>
 						</g>
-						<g transform="translate(32545, 2428.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
+						<g transform="translate(32306.25, 2428.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
 								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32545, 2459.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+						<g transform="translate(32306.25, 2459.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
@@ -11292,7 +11204,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(32545, 2760.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+						<g transform="translate(32306.25, 2760.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
@@ -11303,9 +11215,9 @@
 					</g>
 					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<rect x="31993.5" y="3485.0" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
+							<rect x="32726.5" y="3485.0" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
 						</g>
-						<g transform="translate(31993.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+						<g transform="translate(32726.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
 								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
 								
@@ -11314,9 +11226,9 @@
 					</g>
 					<g data-name="String Function(T)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
-							<rect x="32444.5" y="3485.0" height="31.0" width="157.0" data-name="String Function(T)"></rect>
+							<rect x="33177.5" y="3485.0" height="31.0" width="157.0" data-name="String Function(T)"></rect>
 						</g>
-						<g transform="translate(32444.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
+						<g transform="translate(33177.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
 								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
 								
@@ -11325,9 +11237,9 @@
 					</g>
 					<g data-name="Widget Function(BuildContext, T, int)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
-							<rect x="33094.5" y="3485.0" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
+							<rect x="33374.5" y="3485.0" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
 						</g>
-						<g transform="translate(33094.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
+						<g transform="translate(33374.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
 								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
 								
@@ -11336,27 +11248,88 @@
 					</g>
 					<g data-name="ManagedFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="57591.3" y="1666.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
-							<path d="M57591.3 1697.5 L57987.3 1697.5" fill="none" data-name="ManagedFormViewModel"></path>
+							<rect x="56129.8" y="1666.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
+							<path d="M56129.8 1697.5 L56525.8 1697.5" fill="none" data-name="ManagedFormViewModel"></path>
 						</g>
-						<g transform="translate(57591.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+						<g transform="translate(56129.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
 								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57591.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
+						<g transform="translate(56129.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
+					<g data-name="FormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
+							<rect x="68250.8" y="313.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
+							<path d="M68250.8 344.0 L69122.8 344.0" fill="none" data-name="FormViewModel"></path>
+							<path d="M68250.8 660.0 L69122.8 660.0" fill="none" data-name="FormViewModel"></path>
+						</g>
+						<g transform="translate(68250.75, 313)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
+								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(68250.75, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(68250.75, 660)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="FormViewModelNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
-							<rect x="71276.5" y="614.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
+							<rect x="72324.5" y="614.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
 						</g>
-						<g transform="translate(71276.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
+						<g transform="translate(72324.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
 								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
 								
@@ -11365,9 +11338,9 @@
 					</g>
 					<g data-name="Exception">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="73917.5" y="121.0" height="31.0" width="94.0" data-name="Exception"></rect>
+							<rect x="74713.3" y="121.0" height="31.0" width="94.0" data-name="Exception"></rect>
 						</g>
-						<g transform="translate(73917.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
+						<g transform="translate(74713.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
 								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
 								
@@ -11376,17 +11349,17 @@
 					</g>
 					<g data-name="FormViewModelCollection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="64374.8" y="3707.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
-							<path d="M64374.8 3738.0 L64655.8 3738.0" fill="none" data-name="FormViewModelCollection"></path>
-							<path d="M64374.8 3829.0 L64655.8 3829.0" fill="none" data-name="FormViewModelCollection"></path>
+							<rect x="65238.8" y="3707.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
+							<path d="M65238.8 3738.0 L65519.8 3738.0" fill="none" data-name="FormViewModelCollection"></path>
+							<path d="M65238.8 3829.0 L65519.8 3829.0" fill="none" data-name="FormViewModelCollection"></path>
 						</g>
-						<g transform="translate(64374.75, 3707)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
+						<g transform="translate(65238.75, 3707)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
 								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64374.75, 3738)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+						<g transform="translate(65238.75, 3738)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
@@ -11396,7 +11369,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(64374.75, 3829)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+						<g transform="translate(65238.75, 3829)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
@@ -11413,9 +11386,9 @@
 					</g>
 					<g data-name="FormArray">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="60748.0" y="4118.5" height="31.0" width="98.0" data-name="FormArray"></rect>
+							<rect x="63009.3" y="4118.5" height="31.0" width="98.0" data-name="FormArray"></rect>
 						</g>
-						<g transform="translate(60748, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+						<g transform="translate(63009.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
 								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
 								
@@ -11424,17 +11397,17 @@
 					</g>
 					<g data-name="CustomFormControl">
 						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
-							<rect x="59081.8" y="3759.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
-							<path d="M59081.8 3790.5 L59494.8 3790.5" fill="none" data-name="CustomFormControl"></path>
-							<path d="M59081.8 3896.5 L59494.8 3896.5" fill="none" data-name="CustomFormControl"></path>
+							<rect x="59501.0" y="3759.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
+							<path d="M59501.0 3790.5 L59914.0 3790.5" fill="none" data-name="CustomFormControl"></path>
+							<path d="M59501.0 3896.5 L59914.0 3896.5" fill="none" data-name="CustomFormControl"></path>
 						</g>
-						<g transform="translate(59081.75, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
+						<g transform="translate(59501, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
 								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59081.75, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+						<g transform="translate(59501, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
 								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
@@ -11445,7 +11418,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(59081.75, 3896.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+						<g transform="translate(59501, 3896.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
 								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
 								
@@ -11454,9 +11427,9 @@
 					</g>
 					<g data-name="void Function(T?)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
-							<rect x="59187.3" y="4118.5" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
+							<rect x="59789.3" y="4118.5" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
 						</g>
-						<g transform="translate(59187.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
+						<g transform="translate(59789.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
 								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
 								
@@ -11465,9 +11438,9 @@
 					</g>
 					<g data-name="void Function(ControlStatus)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
-							<rect x="60035.8" y="4118.5" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
+							<rect x="61217.8" y="4118.5" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
 						</g>
-						<g transform="translate(60035.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
+						<g transform="translate(61217.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
 								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
 								
@@ -11476,16 +11449,16 @@
 					</g>
 					<g data-name="UnsavedChangesDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
-							<rect x="78368.5" y="105.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
-							<path d="M78368.5 136.5 L78575.5 136.5" fill="none" data-name="UnsavedChangesDialog"></path>
+							<rect x="79306.0" y="105.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
+							<path d="M79306.0 136.5 L79513.0 136.5" fill="none" data-name="UnsavedChangesDialog"></path>
 						</g>
-						<g transform="translate(78368.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
+						<g transform="translate(79306, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
 								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78368.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
+						<g transform="translate(79306, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
 								
@@ -11494,9 +11467,9 @@
 					</g>
 					<g data-name="FormValidationSetEnum">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
-							<rect x="64194.8" y="1197.0" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
+							<rect x="59700.3" y="1197.0" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
 						</g>
-						<g transform="translate(64194.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
+						<g transform="translate(59700.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
 								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
 								
@@ -11505,17 +11478,17 @@
 					</g>
 					<g data-name="FormControlValidation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
-							<rect x="33373.3" y="2556.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
-							<path d="M33373.3 2587.0 L33858.3 2587.0" fill="none" data-name="FormControlValidation"></path>
-							<path d="M33373.3 2663.0 L33858.3 2663.0" fill="none" data-name="FormControlValidation"></path>
+							<rect x="34396.3" y="2556.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
+							<path d="M34396.3 2587.0 L34881.3 2587.0" fill="none" data-name="FormControlValidation"></path>
+							<path d="M34396.3 2663.0 L34881.3 2663.0" fill="none" data-name="FormControlValidation"></path>
 						</g>
-						<g transform="translate(33373.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
+						<g transform="translate(34396.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
 								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33373.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+						<g transform="translate(34396.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
@@ -11524,7 +11497,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(33373.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+						<g transform="translate(34396.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
 								
@@ -11533,23 +11506,23 @@
 					</g>
 					<g data-name="IFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="50520.5" y="1166.0" height="93.0" width="163.0" data-name="IFormData"></rect>
-							<path d="M50520.5 1197.0 L50683.5 1197.0" fill="none" data-name="IFormData"></path>
-							<path d="M50520.5 1228.0 L50683.5 1228.0" fill="none" data-name="IFormData"></path>
+							<rect x="49565.8" y="1166.0" height="93.0" width="163.0" data-name="IFormData"></rect>
+							<path d="M49565.8 1197.0 L49728.8 1197.0" fill="none" data-name="IFormData"></path>
+							<path d="M49565.8 1228.0 L49728.8 1228.0" fill="none" data-name="IFormData"></path>
 						</g>
-						<g transform="translate(50520.5, 1166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
+						<g transform="translate(49565.75, 1166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
 								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50520.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+						<g transform="translate(49565.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50520.5, 1228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+						<g transform="translate(49565.75, 1228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
 								
@@ -11558,9 +11531,9 @@
 					</g>
 					<g data-name="FormInvalidException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
-							<rect x="72977.5" y="614.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
+							<rect x="74248.3" y="614.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
 						</g>
-						<g transform="translate(72977.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
+						<g transform="translate(74248.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
 								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
 								
@@ -11569,16 +11542,16 @@
 					</g>
 					<g data-name="FormConfigException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
-							<rect x="73203.5" y="598.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
-							<path d="M73203.5 629.5 L73388.5 629.5" fill="none" data-name="FormConfigException"></path>
+							<rect x="74474.3" y="598.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
+							<path d="M74474.3 629.5 L74659.3 629.5" fill="none" data-name="FormConfigException"></path>
 						</g>
-						<g transform="translate(73203.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
+						<g transform="translate(74474.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
 								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73203.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
+						<g transform="translate(74474.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
 								
@@ -11587,16 +11560,16 @@
 					</g>
 					<g data-name="IFormViewModelDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="65629.3" y="1174.0" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-							<path d="M65629.3 1205.0 L65846.3 1205.0" fill="none" data-name="IFormViewModelDelegate"></path>
+							<rect x="67186.3" y="1174.0" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
+							<path d="M67186.3 1205.0 L67403.3 1205.0" fill="none" data-name="IFormViewModelDelegate"></path>
 						</g>
-						<g transform="translate(65629.25, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
+						<g transform="translate(67186.25, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
 								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65629.25, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
+						<g transform="translate(67186.25, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
@@ -11606,16 +11579,16 @@
 					</g>
 					<g data-name="FormControlOption">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
-							<rect x="23234.0" y="2571.5" height="107.0" width="190.0" data-name="FormControlOption"></rect>
-							<path d="M23234.0 2602.5 L23424.0 2602.5" fill="none" data-name="FormControlOption"></path>
+							<rect x="12137.0" y="2571.5" height="107.0" width="190.0" data-name="FormControlOption"></rect>
+							<path d="M12137.0 2602.5 L12327.0 2602.5" fill="none" data-name="FormControlOption"></path>
 						</g>
-						<g transform="translate(23234, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
+						<g transform="translate(12137, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
 								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23234, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
+						<g transform="translate(12137, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
@@ -11627,16 +11600,16 @@
 					</g>
 					<g data-name="FormMode">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
-							<rect x="27069.8" y="3439.5" height="122.0" width="282.0" data-name="FormMode"></rect>
-							<path d="M27069.8 3470.5 L27351.8 3470.5" fill="none" data-name="FormMode"></path>
+							<rect x="25064.3" y="3439.5" height="122.0" width="282.0" data-name="FormMode"></rect>
+							<path d="M25064.3 3470.5 L25346.3 3470.5" fill="none" data-name="FormMode"></path>
 						</g>
-						<g transform="translate(27069.75, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
+						<g transform="translate(25064.25, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
 								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27069.75, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
+						<g transform="translate(25064.25, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
 								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
@@ -11649,23 +11622,23 @@
 					</g>
 					<g data-name="EnrolledBadge">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="78615.5" y="90.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M78615.5 121.0 L78781.5 121.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M78615.5 152.0 L78781.5 152.0" fill="none" data-name="EnrolledBadge"></path>
+							<rect x="79553.0" y="90.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
+							<path d="M79553.0 121.0 L79719.0 121.0" fill="none" data-name="EnrolledBadge"></path>
+							<path d="M79553.0 152.0 L79719.0 152.0" fill="none" data-name="EnrolledBadge"></path>
 						</g>
-						<g transform="translate(78615.5, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
+						<g transform="translate(79553, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
 								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78615.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+						<g transform="translate(79553, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78615.5, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+						<g transform="translate(79553, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
 								
@@ -11674,24 +11647,24 @@
 					</g>
 					<g data-name="StudyRecruitController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="74303.0" y="1121.0" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M74303.0 1152.0 L74954.0 1152.0" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M74303.0 1198.0 L74954.0 1198.0" fill="none" data-name="StudyRecruitController"></path>
+							<rect x="75240.5" y="1121.0" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
+							<path d="M75240.5 1152.0 L75891.5 1152.0" fill="none" data-name="StudyRecruitController"></path>
+							<path d="M75240.5 1198.0 L75891.5 1198.0" fill="none" data-name="StudyRecruitController"></path>
 						</g>
-						<g transform="translate(74303, 1121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
+						<g transform="translate(75240.5, 1121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
 								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74303, 1152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+						<g transform="translate(75240.5, 1152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74303, 1198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+						<g transform="translate(75240.5, 1198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
@@ -11705,16 +11678,16 @@
 					</g>
 					<g data-name="IInviteCodeRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="80804.0" y="1666.5" height="62.0" width="265.0" data-name="IInviteCodeRepository"></rect>
-							<path d="M80804.0 1697.5 L81069.0 1697.5" fill="none" data-name="IInviteCodeRepository"></path>
+							<rect x="81706.3" y="1666.5" height="62.0" width="265.0" data-name="IInviteCodeRepository"></rect>
+							<path d="M81706.3 1697.5 L81971.3 1697.5" fill="none" data-name="IInviteCodeRepository"></path>
 						</g>
-						<g transform="translate(80804, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
+						<g transform="translate(81706.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
 								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80804, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IInviteCodeRepository">
+						<g transform="translate(81706.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IInviteCodeRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IInviteCodeRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IInviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
 								
@@ -11723,9 +11696,9 @@
 					</g>
 					<g data-name="StreamSubscription">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="71614.5" y="3485.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+							<rect x="72034.0" y="3485.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
 						</g>
-						<g transform="translate(71614.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
+						<g transform="translate(72034, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
 								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
 								
@@ -11734,17 +11707,17 @@
 					</g>
 					<g data-name="StudyBaseController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="71884.8" y="538.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
-							<path d="M71884.8 569.0 L72430.8 569.0" fill="none" data-name="StudyBaseController"></path>
-							<path d="M71884.8 645.0 L72430.8 645.0" fill="none" data-name="StudyBaseController"></path>
+							<rect x="72890.3" y="538.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
+							<path d="M72890.3 569.0 L73436.3 569.0" fill="none" data-name="StudyBaseController"></path>
+							<path d="M72890.3 645.0 L73436.3 645.0" fill="none" data-name="StudyBaseController"></path>
 						</g>
-						<g transform="translate(71884.75, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
+						<g transform="translate(72890.25, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
 								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(71884.75, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+						<g transform="translate(72890.25, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
@@ -11753,7 +11726,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(71884.75, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+						<g transform="translate(72890.25, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
@@ -11765,16 +11738,16 @@
 					</g>
 					<g data-name="StudyRecruitScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="29264.5" y="2571.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M29264.5 2602.5 L29578.5 2602.5" fill="none" data-name="StudyRecruitScreen"></path>
+							<rect x="31952.3" y="2571.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
+							<path d="M31952.3 2602.5 L32266.3 2602.5" fill="none" data-name="StudyRecruitScreen"></path>
 						</g>
-						<g transform="translate(29264.5, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
+						<g transform="translate(31952.25, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
 								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29264.5, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
+						<g transform="translate(31952.25, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
@@ -11786,23 +11759,23 @@
 					</g>
 					<g data-name="InviteCodeFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
-							<rect x="79851.8" y="575.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
-							<path d="M79851.8 606.5 L80289.8 606.5" fill="none" data-name="InviteCodeFormView"></path>
-							<path d="M79851.8 637.5 L80289.8 637.5" fill="none" data-name="InviteCodeFormView"></path>
+							<rect x="80769.3" y="575.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
+							<path d="M80769.3 606.5 L81207.3 606.5" fill="none" data-name="InviteCodeFormView"></path>
+							<path d="M80769.3 637.5 L81207.3 637.5" fill="none" data-name="InviteCodeFormView"></path>
 						</g>
-						<g transform="translate(79851.75, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
+						<g transform="translate(80769.25, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
 								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79851.75, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+						<g transform="translate(80769.25, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79851.75, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+						<g transform="translate(80769.25, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
@@ -11812,17 +11785,17 @@
 					</g>
 					<g data-name="InviteCodeFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="71882.0" y="1023.5" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M71882.0 1054.5 L72549.0 1054.5" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M71882.0 1280.5 L72549.0 1280.5" fill="none" data-name="InviteCodeFormViewModel"></path>
+							<rect x="72779.5" y="1023.5" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
+							<path d="M72779.5 1054.5 L73446.5 1054.5" fill="none" data-name="InviteCodeFormViewModel"></path>
+							<path d="M72779.5 1280.5 L73446.5 1280.5" fill="none" data-name="InviteCodeFormViewModel"></path>
 						</g>
-						<g transform="translate(71882, 1023.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
+						<g transform="translate(72779.5, 1023.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
 								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(71882, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+						<g transform="translate(72779.5, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
@@ -11841,7 +11814,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(71882, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+						<g transform="translate(72779.5, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
@@ -11856,17 +11829,17 @@
 					</g>
 					<g data-name="StudyInvitesTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="77337.3" y="45.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M77337.3 76.0 L77903.3 76.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M77337.3 182.0 L77903.3 182.0" fill="none" data-name="StudyInvitesTable"></path>
+							<rect x="78274.8" y="45.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
+							<path d="M78274.8 76.0 L78840.8 76.0" fill="none" data-name="StudyInvitesTable"></path>
+							<path d="M78274.8 182.0 L78840.8 182.0" fill="none" data-name="StudyInvitesTable"></path>
 						</g>
-						<g transform="translate(77337.25, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
+						<g transform="translate(78274.75, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
 								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77337.25, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+						<g transform="translate(78274.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
@@ -11877,7 +11850,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(77337.25, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+						<g transform="translate(78274.75, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
@@ -11887,9 +11860,9 @@
 					</g>
 					<g data-name="void Function(StudyInvite)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="76825.8" y="614.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
+							<rect x="77763.3" y="614.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(76825.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
+						<g transform="translate(77763.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
 								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
 								
@@ -11898,9 +11871,9 @@
 					</g>
 					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="77087.8" y="614.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
+							<rect x="78025.3" y="614.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(77087.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+						<g transform="translate(78025.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
 								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
 								
@@ -11909,9 +11882,9 @@
 					</g>
 					<g data-name="Intervention? Function(String)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="77547.8" y="614.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
+							<rect x="78485.3" y="614.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
 						</g>
-						<g transform="translate(77547.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
+						<g transform="translate(78485.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
 								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
 								
@@ -11920,9 +11893,9 @@
 					</g>
 					<g data-name="int Function(StudyInvite)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="77838.8" y="614.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
+							<rect x="78776.3" y="614.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(77838.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
+						<g transform="translate(78776.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
 								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
 								
@@ -11931,16 +11904,16 @@
 					</g>
 					<g data-name="PublishSuccessDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
-							<rect x="29618.5" y="2594.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
-							<path d="M29618.5 2625.0 L29809.5 2625.0" fill="none" data-name="PublishSuccessDialog"></path>
+							<rect x="34921.3" y="2594.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
+							<path d="M34921.3 2625.0 L35112.3 2625.0" fill="none" data-name="PublishSuccessDialog"></path>
 						</g>
-						<g transform="translate(29618.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
+						<g transform="translate(34921.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
 								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29618.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
+						<g transform="translate(34921.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
 								
@@ -11949,16 +11922,16 @@
 					</g>
 					<g data-name="PublishDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
-							<rect x="31053.0" y="2594.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
-							<path d="M31053.0 2625.0 L31189.0 2625.0" fill="none" data-name="PublishDialog"></path>
+							<rect x="35152.3" y="2594.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
+							<path d="M35152.3 2625.0 L35288.3 2625.0" fill="none" data-name="PublishDialog"></path>
 						</g>
-						<g transform="translate(31053, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
+						<g transform="translate(35152.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31053, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
+						<g transform="translate(35152.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
 								
@@ -11967,16 +11940,16 @@
 					</g>
 					<g data-name="PublishConfirmationDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
-							<rect x="33898.3" y="2594.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
-							<path d="M33898.3 2625.0 L34122.3 2625.0" fill="none" data-name="PublishConfirmationDialog"></path>
+							<rect x="35328.3" y="2594.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
+							<path d="M35328.3 2625.0 L35552.3 2625.0" fill="none" data-name="PublishConfirmationDialog"></path>
 						</g>
-						<g transform="translate(33898.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
+						<g transform="translate(35328.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
 								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33898.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
+						<g transform="translate(35328.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
 								
@@ -11985,17 +11958,17 @@
 					</g>
 					<g data-name="FrameControlsWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
-							<rect x="18530.8" y="3782.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
-							<path d="M18530.8 3813.0 L18821.8 3813.0" fill="none" data-name="FrameControlsWidget"></path>
-							<path d="M18530.8 3874.0 L18821.8 3874.0" fill="none" data-name="FrameControlsWidget"></path>
+							<rect x="18326.3" y="3782.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
+							<path d="M18326.3 3813.0 L18617.3 3813.0" fill="none" data-name="FrameControlsWidget"></path>
+							<path d="M18326.3 3874.0 L18617.3 3874.0" fill="none" data-name="FrameControlsWidget"></path>
 						</g>
-						<g transform="translate(18530.75, 3782)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
+						<g transform="translate(18326.25, 3782)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
 								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18530.75, 3813)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+						<g transform="translate(18326.25, 3813)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
@@ -12003,7 +11976,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(18530.75, 3874)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+						<g transform="translate(18326.25, 3874)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
 								
@@ -12012,16 +11985,16 @@
 					</g>
 					<g data-name="IStudyStatusBadgeViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
-							<rect x="35728.3" y="2586.5" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
-							<path d="M35728.3 2617.5 L36013.3 2617.5" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
+							<rect x="36047.3" y="2586.5" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
+							<path d="M36047.3 2617.5 L36332.3 2617.5" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
 						</g>
-						<g transform="translate(35728.25, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
+						<g transform="translate(36047.25, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
 								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35728.25, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
+						<g transform="translate(36047.25, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
@@ -12031,9 +12004,9 @@
 					</g>
 					<g data-name="Participation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="37786.3" y="3485.0" height="31.0" width="114.0" data-name="Participation"></rect>
+							<rect x="37084.5" y="3485.0" height="31.0" width="114.0" data-name="Participation"></rect>
 						</g>
-						<g transform="translate(37786.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
+						<g transform="translate(37084.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
 								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
 								
@@ -12042,9 +12015,9 @@
 					</g>
 					<g data-name="StudyStatus">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
-							<rect x="35805.3" y="3485.0" height="31.0" width="111.0" data-name="StudyStatus"></rect>
+							<rect x="34202.5" y="3485.0" height="31.0" width="111.0" data-name="StudyStatus"></rect>
 						</g>
-						<g transform="translate(35805.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
+						<g transform="translate(34202.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
 								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
 								
@@ -12053,17 +12026,17 @@
 					</g>
 					<g data-name="StudyStatusBadge">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
-							<rect x="36096.3" y="2548.5" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
-							<path d="M36096.3 2579.5 L36337.3 2579.5" fill="none" data-name="StudyStatusBadge"></path>
-							<path d="M36096.3 2670.5 L36337.3 2670.5" fill="none" data-name="StudyStatusBadge"></path>
+							<rect x="36372.3" y="2548.5" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
+							<path d="M36372.3 2579.5 L36613.3 2579.5" fill="none" data-name="StudyStatusBadge"></path>
+							<path d="M36372.3 2670.5 L36613.3 2670.5" fill="none" data-name="StudyStatusBadge"></path>
 						</g>
-						<g transform="translate(36096.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
+						<g transform="translate(36372.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
 								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36096.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+						<g transform="translate(36372.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
@@ -12073,7 +12046,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(36096.25, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+						<g transform="translate(36372.25, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
 								
@@ -12082,17 +12055,17 @@
 					</g>
 					<g data-name="RouteInformation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
-							<rect x="35956.3" y="3431.5" height="138.0" width="152.0" data-name="RouteInformation"></rect>
-							<path d="M35956.3 3462.5 L36108.3 3462.5" fill="none" data-name="RouteInformation"></path>
-							<path d="M35956.3 3538.5 L36108.3 3538.5" fill="none" data-name="RouteInformation"></path>
+							<rect x="34353.5" y="3431.5" height="138.0" width="152.0" data-name="RouteInformation"></rect>
+							<path d="M34353.5 3462.5 L34505.5 3462.5" fill="none" data-name="RouteInformation"></path>
+							<path d="M34353.5 3538.5 L34505.5 3538.5" fill="none" data-name="RouteInformation"></path>
 						</g>
-						<g transform="translate(35956.25, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
+						<g transform="translate(34353.5, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
 								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35956.25, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+						<g transform="translate(34353.5, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
 								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
@@ -12101,7 +12074,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(35956.25, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+						<g transform="translate(34353.5, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
 								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
 								
@@ -12110,17 +12083,17 @@
 					</g>
 					<g data-name="PlatformController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
-							<rect x="36417.5" y="2496.0" height="258.0" width="302.0" data-name="PlatformController"></rect>
-							<path d="M36417.5 2527.0 L36719.5 2527.0" fill="none" data-name="PlatformController"></path>
-							<path d="M36417.5 2618.0 L36719.5 2618.0" fill="none" data-name="PlatformController"></path>
+							<rect x="36705.5" y="2496.0" height="258.0" width="302.0" data-name="PlatformController"></rect>
+							<path d="M36705.5 2527.0 L37007.5 2527.0" fill="none" data-name="PlatformController"></path>
+							<path d="M36705.5 2618.0 L37007.5 2618.0" fill="none" data-name="PlatformController"></path>
 						</g>
-						<g transform="translate(36417.5, 2496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
+						<g transform="translate(36705.5, 2496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
 								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36417.5, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+						<g transform="translate(36705.5, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
 								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
@@ -12130,7 +12103,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(36417.5, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+						<g transform="translate(36705.5, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
 								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
@@ -12146,23 +12119,23 @@
 					</g>
 					<g data-name="WebController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
-							<rect x="36734.3" y="3401.5" height="198.0" width="273.0" data-name="WebController"></rect>
-							<path d="M36734.3 3432.5 L37007.3 3432.5" fill="none" data-name="WebController"></path>
-							<path d="M36734.3 3463.5 L37007.3 3463.5" fill="none" data-name="WebController"></path>
+							<rect x="35508.5" y="3401.5" height="198.0" width="273.0" data-name="WebController"></rect>
+							<path d="M35508.5 3432.5 L35781.5 3432.5" fill="none" data-name="WebController"></path>
+							<path d="M35508.5 3463.5 L35781.5 3463.5" fill="none" data-name="WebController"></path>
 						</g>
-						<g transform="translate(36734.25, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
+						<g transform="translate(35508.5, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
 								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36734.25, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+						<g transform="translate(35508.5, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36734.25, 3463.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+						<g transform="translate(35508.5, 3463.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
@@ -12178,9 +12151,9 @@
 					</g>
 					<g data-name="IFrameElement">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
-							<rect x="36803.3" y="3828.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
+							<rect x="35577.5" y="3828.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
 						</g>
-						<g transform="translate(36803.25, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
+						<g transform="translate(35577.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
 								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
 								
@@ -12189,16 +12162,16 @@
 					</g>
 					<g data-name="MobileController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
-							<rect x="37047.3" y="3417.0" height="167.0" width="191.0" data-name="MobileController"></rect>
-							<path d="M37047.3 3448.0 L37238.3 3448.0" fill="none" data-name="MobileController"></path>
+							<rect x="35821.5" y="3417.0" height="167.0" width="191.0" data-name="MobileController"></rect>
+							<path d="M35821.5 3448.0 L36012.5 3448.0" fill="none" data-name="MobileController"></path>
 						</g>
-						<g transform="translate(37047.25, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
+						<g transform="translate(35821.5, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
 								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37047.25, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
+						<g transform="translate(35821.5, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
 								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
@@ -12214,17 +12187,17 @@
 					</g>
 					<g data-name="StudyController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
-							<rect x="70981.3" y="2511.0" height="228.0" width="573.0" data-name="StudyController"></rect>
-							<path d="M70981.3 2542.0 L71554.3 2542.0" fill="none" data-name="StudyController"></path>
-							<path d="M70981.3 2603.0 L71554.3 2603.0" fill="none" data-name="StudyController"></path>
+							<rect x="71961.3" y="2511.0" height="228.0" width="573.0" data-name="StudyController"></rect>
+							<path d="M71961.3 2542.0 L72534.3 2542.0" fill="none" data-name="StudyController"></path>
+							<path d="M71961.3 2603.0 L72534.3 2603.0" fill="none" data-name="StudyController"></path>
 						</g>
-						<g transform="translate(70981.25, 2511)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
+						<g transform="translate(71961.25, 2511)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
 								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(70981.25, 2542)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+						<g transform="translate(71961.25, 2542)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
@@ -12232,7 +12205,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(70981.25, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+						<g transform="translate(71961.25, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
@@ -12248,16 +12221,16 @@
 					</g>
 					<g data-name="IStudyNavViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
-							<rect x="37026.5" y="2556.5" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
-							<path d="M37026.5 2587.5 L37267.5 2587.5" fill="none" data-name="IStudyNavViewModel"></path>
+							<rect x="37267.5" y="2556.5" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
+							<path d="M37267.5 2587.5 L37508.5 2587.5" fill="none" data-name="IStudyNavViewModel"></path>
 						</g>
-						<g transform="translate(37026.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
+						<g transform="translate(37267.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
 								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37026.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
+						<g transform="translate(37267.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
@@ -12271,16 +12244,16 @@
 					</g>
 					<g data-name="StudyNav">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
-							<rect x="79062.8" y="68.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
-							<path d="M79062.8 99.0 L79295.8 99.0" fill="none" data-name="StudyNav"></path>
+							<rect x="80000.3" y="68.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
+							<path d="M80000.3 99.0 L80233.3 99.0" fill="none" data-name="StudyNav"></path>
 						</g>
-						<g transform="translate(79062.75, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
+						<g transform="translate(80000.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
 								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79062.75, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
+						<g transform="translate(80000.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
@@ -12294,16 +12267,16 @@
 					</g>
 					<g data-name="StudyDesignNav">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
-							<rect x="79335.8" y="68.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
-							<path d="M79335.8 99.0 L79623.8 99.0" fill="none" data-name="StudyDesignNav"></path>
+							<rect x="80273.3" y="68.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
+							<path d="M80273.3 99.0 L80561.3 99.0" fill="none" data-name="StudyDesignNav"></path>
 						</g>
-						<g transform="translate(79335.75, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
+						<g transform="translate(80273.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
 								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79335.75, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
+						<g transform="translate(80273.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
@@ -12317,17 +12290,17 @@
 					</g>
 					<g data-name="StudyParticipationBadge">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
-							<rect x="37796.8" y="2556.0" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
-							<path d="M37796.8 2587.0 L38027.8 2587.0" fill="none" data-name="StudyParticipationBadge"></path>
-							<path d="M37796.8 2663.0 L38027.8 2663.0" fill="none" data-name="StudyParticipationBadge"></path>
+							<rect x="37777.0" y="2556.0" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
+							<path d="M37777.0 2587.0 L38008.0 2587.0" fill="none" data-name="StudyParticipationBadge"></path>
+							<path d="M37777.0 2663.0 L38008.0 2663.0" fill="none" data-name="StudyParticipationBadge"></path>
 						</g>
-						<g transform="translate(37796.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
+						<g transform="translate(37777, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
 								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37796.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+						<g transform="translate(37777, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
@@ -12336,7 +12309,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(37796.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+						<g transform="translate(37777, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
 								
@@ -12345,16 +12318,16 @@
 					</g>
 					<g data-name="IStudyRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="71323.5" y="3462.0" height="77.0" width="251.0" data-name="IStudyRepository"></rect>
-							<path d="M71323.5 3493.0 L71574.5 3493.0" fill="none" data-name="IStudyRepository"></path>
+							<rect x="71743.0" y="3462.0" height="77.0" width="251.0" data-name="IStudyRepository"></rect>
+							<path d="M71743.0 3493.0 L71994.0 3493.0" fill="none" data-name="IStudyRepository"></path>
 						</g>
-						<g transform="translate(71323.5, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
+						<g transform="translate(71743, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
 								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(71323.5, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyRepository">
+						<g transform="translate(71743, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyRepository">+dynamic launch()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IStudyRepository">+dynamic deleteParticipants()</text>
@@ -12364,16 +12337,16 @@
 					</g>
 					<g data-name="PreviewFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
-							<rect x="59870.3" y="1166.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
-							<path d="M59870.3 1197.5 L60161.3 1197.5" fill="none" data-name="PreviewFrame"></path>
+							<rect x="61046.8" y="1166.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
+							<path d="M61046.8 1197.5 L61337.8 1197.5" fill="none" data-name="PreviewFrame"></path>
 						</g>
-						<g transform="translate(59870.25, 1166.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
+						<g transform="translate(61046.75, 1166.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
 								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59870.25, 1197.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
+						<g transform="translate(61046.75, 1197.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
@@ -12384,16 +12357,16 @@
 					</g>
 					<g data-name="IStudyAppBarViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
-							<rect x="36388.8" y="3454.5" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
-							<path d="M36388.8 3485.5 L36631.8 3485.5" fill="none" data-name="IStudyAppBarViewModel"></path>
+							<rect x="35076.5" y="3454.5" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
+							<path d="M35076.5 3485.5 L35319.5 3485.5" fill="none" data-name="IStudyAppBarViewModel"></path>
 						</g>
-						<g transform="translate(36388.75, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
+						<g transform="translate(35076.5, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
 								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36388.75, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
+						<g transform="translate(35076.5, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
@@ -12404,16 +12377,16 @@
 					</g>
 					<g data-name="StudyScaffold">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
-							<rect x="62158.8" y="1091.5" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
-							<path d="M62158.8 1122.5 L62493.8 1122.5" fill="none" data-name="StudyScaffold"></path>
+							<rect x="62579.3" y="1091.5" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
+							<path d="M62579.3 1122.5 L62914.3 1122.5" fill="none" data-name="StudyScaffold"></path>
 						</g>
-						<g transform="translate(62158.75, 1091.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
+						<g transform="translate(62579.25, 1091.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
 								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62158.75, 1122.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
+						<g transform="translate(62579.25, 1122.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
@@ -12434,24 +12407,24 @@
 					</g>
 					<g data-name="WebFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
-							<rect x="79663.8" y="82.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
-							<path d="M79663.8 113.5 L79832.8 113.5" fill="none" data-name="WebFrame"></path>
-							<path d="M79663.8 159.5 L79832.8 159.5" fill="none" data-name="WebFrame"></path>
+							<rect x="80601.3" y="82.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
+							<path d="M80601.3 113.5 L80770.3 113.5" fill="none" data-name="WebFrame"></path>
+							<path d="M80601.3 159.5 L80770.3 159.5" fill="none" data-name="WebFrame"></path>
 						</g>
-						<g transform="translate(79663.75, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
+						<g transform="translate(80601.25, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
 								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79663.75, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+						<g transform="translate(80601.25, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79663.75, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+						<g transform="translate(80601.25, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
 								
@@ -12460,16 +12433,16 @@
 					</g>
 					<g data-name="DisabledFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
-							<rect x="79872.8" y="105.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
-							<path d="M79872.8 136.5 L80008.8 136.5" fill="none" data-name="DisabledFrame"></path>
+							<rect x="80810.3" y="105.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
+							<path d="M80810.3 136.5 L80946.3 136.5" fill="none" data-name="DisabledFrame"></path>
 						</g>
-						<g transform="translate(79872.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
+						<g transform="translate(80810.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79872.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
+						<g transform="translate(80810.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
 								
@@ -12478,17 +12451,17 @@
 					</g>
 					<g data-name="PhoneContainer">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
-							<rect x="38067.8" y="2518.5" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
-							<path d="M38067.8 2549.5 L38394.8 2549.5" fill="none" data-name="PhoneContainer"></path>
-							<path d="M38067.8 2700.5 L38394.8 2700.5" fill="none" data-name="PhoneContainer"></path>
+							<rect x="38048.0" y="2518.5" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
+							<path d="M38048.0 2549.5 L38375.0 2549.5" fill="none" data-name="PhoneContainer"></path>
+							<path d="M38048.0 2700.5 L38375.0 2700.5" fill="none" data-name="PhoneContainer"></path>
 						</g>
-						<g transform="translate(38067.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
+						<g transform="translate(38048, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
 								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38067.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+						<g transform="translate(38048, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
 								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
@@ -12502,7 +12475,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(38067.75, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+						<g transform="translate(38048, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
 								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
 								
@@ -12511,16 +12484,16 @@
 					</g>
 					<g data-name="MobileFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
-							<rect x="80048.8" y="105.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
-							<path d="M80048.8 136.5 L80184.8 136.5" fill="none" data-name="MobileFrame"></path>
+							<rect x="80986.3" y="105.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
+							<path d="M80986.3 136.5 L81122.3 136.5" fill="none" data-name="MobileFrame"></path>
 						</g>
-						<g transform="translate(80048.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
+						<g transform="translate(80986.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80048.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
+						<g transform="translate(80986.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
 								
@@ -12529,16 +12502,16 @@
 					</g>
 					<g data-name="DesktopFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
-							<rect x="80224.8" y="105.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
-							<path d="M80224.8 136.5 L80360.8 136.5" fill="none" data-name="DesktopFrame"></path>
+							<rect x="81162.3" y="105.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
+							<path d="M81162.3 136.5 L81298.3 136.5" fill="none" data-name="DesktopFrame"></path>
 						</g>
-						<g transform="translate(80224.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
+						<g transform="translate(81162.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80224.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
+						<g transform="translate(81162.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
 								
@@ -12547,23 +12520,23 @@
 					</g>
 					<g data-name="StudyTestScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
-							<rect x="34162.3" y="2548.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
-							<path d="M34162.3 2579.5 L34362.3 2579.5" fill="none" data-name="StudyTestScreen"></path>
-							<path d="M34162.3 2610.5 L34362.3 2610.5" fill="none" data-name="StudyTestScreen"></path>
+							<rect x="35592.3" y="2548.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
+							<path d="M35592.3 2579.5 L35792.3 2579.5" fill="none" data-name="StudyTestScreen"></path>
+							<path d="M35592.3 2610.5 L35792.3 2610.5" fill="none" data-name="StudyTestScreen"></path>
 						</g>
-						<g transform="translate(34162.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
+						<g transform="translate(35592.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
 								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34162.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+						<g transform="translate(35592.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34162.25, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+						<g transform="translate(35592.25, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
@@ -12576,17 +12549,17 @@
 					</g>
 					<g data-name="StudySettingsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="67994.0" y="2496.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M67994.0 2527.0 L68473.0 2527.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M67994.0 2663.0 L68473.0 2663.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+							<rect x="68701.0" y="2496.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
+							<path d="M68701.0 2527.0 L69180.0 2527.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+							<path d="M68701.0 2663.0 L69180.0 2663.0" fill="none" data-name="StudySettingsFormViewModel"></path>
 						</g>
-						<g transform="translate(67994, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
+						<g transform="translate(68701, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67994, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+						<g transform="translate(68701, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
@@ -12599,7 +12572,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(67994, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+						<g transform="translate(68701, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
@@ -12612,16 +12585,16 @@
 					</g>
 					<g data-name="StudySettingsDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="34402.3" y="2594.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M34402.3 2625.0 L34577.3 2625.0" fill="none" data-name="StudySettingsDialog"></path>
+							<rect x="35832.3" y="2594.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
+							<path d="M35832.3 2625.0 L36007.3 2625.0" fill="none" data-name="StudySettingsDialog"></path>
 						</g>
-						<g transform="translate(34402.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
+						<g transform="translate(35832.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
 								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34402.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
+						<g transform="translate(35832.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
 								
@@ -12630,16 +12603,16 @@
 					</g>
 					<g data-name="StudyTestController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
-							<rect x="70376.3" y="3805.0" height="77.0" width="282.0" data-name="StudyTestController"></rect>
-							<path d="M70376.3 3836.0 L70658.3 3836.0" fill="none" data-name="StudyTestController"></path>
+							<rect x="71316.3" y="3805.0" height="77.0" width="282.0" data-name="StudyTestController"></rect>
+							<path d="M71316.3 3836.0 L71598.3 3836.0" fill="none" data-name="StudyTestController"></path>
 						</g>
-						<g transform="translate(70376.25, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
+						<g transform="translate(71316.25, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
 								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(70376.25, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
+						<g transform="translate(71316.25, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
@@ -12649,16 +12622,16 @@
 					</g>
 					<g data-name="TestAppRoutes">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
-							<rect x="80400.8" y="68.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
-							<path d="M80400.8 99.0 L80660.8 99.0" fill="none" data-name="TestAppRoutes"></path>
+							<rect x="81338.3" y="68.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
+							<path d="M81338.3 99.0 L81598.3 99.0" fill="none" data-name="TestAppRoutes"></path>
 						</g>
-						<g transform="translate(80400.75, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
+						<g transform="translate(81338.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
 								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80400.75, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
+						<g transform="translate(81338.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
 								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
@@ -12672,17 +12645,17 @@
 					</g>
 					<g data-name="DrawerEntry">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
-							<rect x="63467.5" y="1113.5" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
-							<path d="M63467.5 1144.5 L63912.5 1144.5" fill="none" data-name="DrawerEntry"></path>
-							<path d="M63467.5 1280.5 L63912.5 1280.5" fill="none" data-name="DrawerEntry"></path>
+							<rect x="63703.5" y="1113.5" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
+							<path d="M63703.5 1144.5 L64148.5 1144.5" fill="none" data-name="DrawerEntry"></path>
+							<path d="M63703.5 1280.5 L64148.5 1280.5" fill="none" data-name="DrawerEntry"></path>
 						</g>
-						<g transform="translate(63467.5, 1113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
+						<g transform="translate(63703.5, 1113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
 								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63467.5, 1144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+						<g transform="translate(63703.5, 1144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
@@ -12695,7 +12668,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(63467.5, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+						<g transform="translate(63703.5, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
 								
@@ -12704,9 +12677,9 @@
 					</g>
 					<g data-name="String Function()">
 						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
-							<rect x="62932.0" y="1682.0" height="31.0" width="147.0" data-name="String Function()"></rect>
+							<rect x="63307.3" y="1682.0" height="31.0" width="147.0" data-name="String Function()"></rect>
 						</g>
-						<g transform="translate(62932, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
+						<g transform="translate(63307.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
 								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
 								
@@ -12715,9 +12688,9 @@
 					</g>
 					<g data-name="String Function()?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
-							<rect x="63200.8" y="1682.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
+							<rect x="63534.3" y="1682.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
 						</g>
-						<g transform="translate(63200.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
+						<g transform="translate(63534.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
 								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
 								
@@ -12726,9 +12699,9 @@
 					</g>
 					<g data-name="void Function(BuildContext, WidgetRef)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
-							<rect x="63397.8" y="1682.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
+							<rect x="63731.3" y="1682.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
 						</g>
-						<g transform="translate(63397.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
+						<g transform="translate(63731.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
 								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
 								
@@ -12737,24 +12710,24 @@
 					</g>
 					<g data-name="GoRouterDrawerEntry">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
-							<rect x="63871.3" y="1643.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
-							<path d="M63871.3 1674.5 L64135.3 1674.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-							<path d="M63871.3 1720.5 L64135.3 1720.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+							<rect x="64107.3" y="1643.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
+							<path d="M64107.3 1674.5 L64371.3 1674.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+							<path d="M64107.3 1720.5 L64371.3 1720.5" fill="none" data-name="GoRouterDrawerEntry"></path>
 						</g>
-						<g transform="translate(63871.25, 1643.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
+						<g transform="translate(64107.25, 1643.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
 								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63871.25, 1674.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+						<g transform="translate(64107.25, 1674.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63871.25, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+						<g transform="translate(64107.25, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
 								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
 								
@@ -12763,16 +12736,16 @@
 					</g>
 					<g data-name="AppDrawer">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
-							<rect x="80700.8" y="53.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
-							<path d="M80700.8 84.0 L80969.8 84.0" fill="none" data-name="AppDrawer"></path>
+							<rect x="81638.3" y="53.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
+							<path d="M81638.3 84.0 L81907.3 84.0" fill="none" data-name="AppDrawer"></path>
 						</g>
-						<g transform="translate(80700.75, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
+						<g transform="translate(81638.25, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
 								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80700.75, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
+						<g transform="translate(81638.25, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
@@ -12788,16 +12761,16 @@
 					</g>
 					<g data-name="StudyAnalyzeScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
-							<rect x="34617.3" y="2586.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
-							<path d="M34617.3 2617.5 L34797.3 2617.5" fill="none" data-name="StudyAnalyzeScreen"></path>
+							<rect x="37047.5" y="2586.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
+							<path d="M37047.5 2617.5 L37227.5 2617.5" fill="none" data-name="StudyAnalyzeScreen"></path>
 						</g>
-						<g transform="translate(34617.25, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
+						<g transform="translate(37047.5, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
 								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34617.25, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
+						<g transform="translate(37047.5, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
@@ -12807,16 +12780,16 @@
 					</g>
 					<g data-name="StudyAnalyzeController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
-							<rect x="72589.0" y="1181.5" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
-							<path d="M72589.0 1212.5 L72790.0 1212.5" fill="none" data-name="StudyAnalyzeController"></path>
+							<rect x="73526.5" y="1181.5" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
+							<path d="M73526.5 1212.5 L73727.5 1212.5" fill="none" data-name="StudyAnalyzeController"></path>
 						</g>
-						<g transform="translate(72589, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
+						<g transform="translate(73526.5, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
 								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72589, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
+						<g transform="translate(73526.5, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
 								
@@ -12825,16 +12798,16 @@
 					</g>
 					<g data-name="StudyDesignInterventionsFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="33600.5" y="3469.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M33600.5 3500.5 L33896.5 3500.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
+							<rect x="36052.5" y="3469.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
+							<path d="M36052.5 3500.5 L36348.5 3500.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
 						</g>
-						<g transform="translate(33600.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
+						<g transform="translate(36052.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
 								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33600.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
+						<g transform="translate(36052.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
 								
@@ -12843,16 +12816,16 @@
 					</g>
 					<g data-name="StudyDesignPageWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="34922.8" y="2594.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M34922.8 2625.0 L35134.8 2625.0" fill="none" data-name="StudyDesignPageWidget"></path>
+							<rect x="38550.0" y="2594.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
+							<path d="M38550.0 2625.0 L38762.0 2625.0" fill="none" data-name="StudyDesignPageWidget"></path>
 						</g>
-						<g transform="translate(34922.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
+						<g transform="translate(38550, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
 								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34922.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
+						<g transform="translate(38550, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
 								
@@ -12861,16 +12834,16 @@
 					</g>
 					<g data-name="InterventionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="29776.5" y="1666.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M29776.5 1697.5 L30151.5 1697.5" fill="none" data-name="InterventionFormView"></path>
+							<rect x="29833.3" y="1666.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
+							<path d="M29833.3 1697.5 L30208.3 1697.5" fill="none" data-name="InterventionFormView"></path>
 						</g>
-						<g transform="translate(29776.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
+						<g transform="translate(29833.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
 								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29776.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
+						<g transform="translate(29833.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
 								
@@ -12879,17 +12852,17 @@
 					</g>
 					<g data-name="InterventionFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="57022.8" y="2391.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M57022.8 2422.0 L57877.8 2422.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M57022.8 2648.0 L57877.8 2648.0" fill="none" data-name="InterventionFormViewModel"></path>
+							<rect x="56178.3" y="2391.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
+							<path d="M56178.3 2422.0 L57033.3 2422.0" fill="none" data-name="InterventionFormViewModel"></path>
+							<path d="M56178.3 2648.0 L57033.3 2648.0" fill="none" data-name="InterventionFormViewModel"></path>
 						</g>
-						<g transform="translate(57022.75, 2391)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
+						<g transform="translate(56178.25, 2391)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
 								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57022.75, 2422)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+						<g transform="translate(56178.25, 2422)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
@@ -12908,7 +12881,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(57022.75, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+						<g transform="translate(56178.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
@@ -12929,23 +12902,23 @@
 					</g>
 					<g data-name="InterventionPreview">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="25984.5" y="1651.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M25984.5 1682.0 L26314.5 1682.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M25984.5 1713.0 L26314.5 1713.0" fill="none" data-name="InterventionPreview"></path>
+							<rect x="25723.3" y="1651.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
+							<path d="M25723.3 1682.0 L26053.3 1682.0" fill="none" data-name="InterventionPreview"></path>
+							<path d="M25723.3 1713.0 L26053.3 1713.0" fill="none" data-name="InterventionPreview"></path>
 						</g>
-						<g transform="translate(25984.5, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
+						<g transform="translate(25723.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
 								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25984.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+						<g transform="translate(25723.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25984.5, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+						<g transform="translate(25723.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
 								
@@ -12954,23 +12927,23 @@
 					</g>
 					<g data-name="StudyScheduleFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="80205.5" y="1158.5" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M80205.5 1189.5 L80564.5 1189.5" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M80205.5 1220.5 L80564.5 1220.5" fill="none" data-name="StudyScheduleFormView"></path>
+							<rect x="81067.8" y="1158.5" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
+							<path d="M81067.8 1189.5 L81426.8 1189.5" fill="none" data-name="StudyScheduleFormView"></path>
+							<path d="M81067.8 1220.5 L81426.8 1220.5" fill="none" data-name="StudyScheduleFormView"></path>
 						</g>
-						<g transform="translate(80205.5, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
+						<g transform="translate(81067.75, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
 								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80205.5, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+						<g transform="translate(81067.75, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80205.5, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+						<g transform="translate(81067.75, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
@@ -12980,17 +12953,17 @@
 					</g>
 					<g data-name="StudyScheduleControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="80006.0" y="1501.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M80006.0 1532.0 L80764.0 1532.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M80006.0 1833.0 L80764.0 1833.0" fill="none" data-name="StudyScheduleControls"></path>
+							<rect x="80868.3" y="1501.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
+							<path d="M80868.3 1532.0 L81626.3 1532.0" fill="none" data-name="StudyScheduleControls"></path>
+							<path d="M80868.3 1833.0 L81626.3 1833.0" fill="none" data-name="StudyScheduleControls"></path>
 						</g>
-						<g transform="translate(80006, 1501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
+						<g transform="translate(80868.25, 1501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
 								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80006, 1532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+						<g transform="translate(80868.25, 1532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
@@ -13014,7 +12987,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(80006, 1833)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+						<g transform="translate(80868.25, 1833)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
@@ -13025,17 +12998,17 @@
 					</g>
 					<g data-name="InterventionTaskFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="55157.8" y="2541.0" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M55157.8 2572.0 L55447.8 2572.0" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M55157.8 2663.0 L55447.8 2663.0" fill="none" data-name="InterventionTaskFormData"></path>
+							<rect x="55199.3" y="2541.0" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
+							<path d="M55199.3 2572.0 L55489.3 2572.0" fill="none" data-name="InterventionTaskFormData"></path>
+							<path d="M55199.3 2663.0 L55489.3 2663.0" fill="none" data-name="InterventionTaskFormData"></path>
 						</g>
-						<g transform="translate(55157.75, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
+						<g transform="translate(55199.25, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
 								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55157.75, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+						<g transform="translate(55199.25, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
@@ -13045,7 +13018,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(55157.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+						<g transform="translate(55199.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
@@ -13055,17 +13028,17 @@
 					</g>
 					<g data-name="IFormDataWithSchedule">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="55630.8" y="1613.5" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M55630.8 1644.5 L55928.8 1644.5" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M55630.8 1750.5 L55928.8 1750.5" fill="none" data-name="IFormDataWithSchedule"></path>
+							<rect x="55631.5" y="1613.5" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
+							<path d="M55631.5 1644.5 L55929.5 1644.5" fill="none" data-name="IFormDataWithSchedule"></path>
+							<path d="M55631.5 1750.5 L55929.5 1750.5" fill="none" data-name="IFormDataWithSchedule"></path>
 						</g>
-						<g transform="translate(55630.75, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
+						<g transform="translate(55631.5, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
 								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55630.75, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+						<g transform="translate(55631.5, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
@@ -13076,7 +13049,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(55630.75, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+						<g transform="translate(55631.5, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
 								
@@ -13085,17 +13058,17 @@
 					</g>
 					<g data-name="InterventionsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="67075.0" y="2436.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M67075.0 2467.0 L67914.0 2467.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M67075.0 2618.0 L67914.0 2618.0" fill="none" data-name="InterventionsFormViewModel"></path>
+							<rect x="67782.0" y="2436.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
+							<path d="M67782.0 2467.0 L68621.0 2467.0" fill="none" data-name="InterventionsFormViewModel"></path>
+							<path d="M67782.0 2618.0 L68621.0 2618.0" fill="none" data-name="InterventionsFormViewModel"></path>
 						</g>
-						<g transform="translate(67075, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
+						<g transform="translate(67782, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
 								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67075, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+						<g transform="translate(67782, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
@@ -13109,7 +13082,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(67075, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+						<g transform="translate(67782, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
@@ -13129,17 +13102,17 @@
 					</g>
 					<g data-name="InterventionTaskFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="59862.0" y="2488.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M59862.0 2519.5 L60558.0 2519.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M59862.0 2700.5 L60558.0 2700.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<rect x="60383.3" y="2488.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
+							<path d="M60383.3 2519.5 L61079.3 2519.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<path d="M60383.3 2700.5 L61079.3 2700.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
 						</g>
-						<g transform="translate(59862, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
+						<g transform="translate(60383.25, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59862, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+						<g transform="translate(60383.25, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
@@ -13155,7 +13128,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(59862, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+						<g transform="translate(60383.25, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
@@ -13166,17 +13139,17 @@
 					</g>
 					<g data-name="WithScheduleControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="81364.0" y="1546.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M81364.0 1577.0 L81859.0 1577.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M81364.0 1803.0 L81859.0 1803.0" fill="none" data-name="WithScheduleControls"></path>
+							<rect x="82301.5" y="1546.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
+							<path d="M82301.5 1577.0 L82796.5 1577.0" fill="none" data-name="WithScheduleControls"></path>
+							<path d="M82301.5 1803.0 L82796.5 1803.0" fill="none" data-name="WithScheduleControls"></path>
 						</g>
-						<g transform="translate(81364, 1546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
+						<g transform="translate(82301.5, 1546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
 								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81364, 1577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+						<g transform="translate(82301.5, 1577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
@@ -13195,7 +13168,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(81364, 1803)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+						<g transform="translate(82301.5, 1803)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
@@ -13205,9 +13178,9 @@
 					</g>
 					<g data-name="PhaseSequence">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="65353.5" y="3828.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
+							<rect x="66060.5" y="3828.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
 						</g>
-						<g transform="translate(65353.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
+						<g transform="translate(66060.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
 								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
 								
@@ -13216,17 +13189,17 @@
 					</g>
 					<g data-name="InterventionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="43888.3" y="1598.5" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M43888.3 1629.5 L44270.3 1629.5" fill="none" data-name="InterventionFormData"></path>
-							<path d="M43888.3 1750.5 L44270.3 1750.5" fill="none" data-name="InterventionFormData"></path>
+							<rect x="44299.0" y="1598.5" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
+							<path d="M44299.0 1629.5 L44681.0 1629.5" fill="none" data-name="InterventionFormData"></path>
+							<path d="M44299.0 1750.5 L44681.0 1750.5" fill="none" data-name="InterventionFormData"></path>
 						</g>
-						<g transform="translate(43888.25, 1598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
+						<g transform="translate(44299, 1598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
 								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43888.25, 1629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+						<g transform="translate(44299, 1629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
@@ -13238,7 +13211,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(43888.25, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+						<g transform="translate(44299, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
@@ -13248,17 +13221,17 @@
 					</g>
 					<g data-name="StudyScheduleFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="45462.8" y="3401.5" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M45462.8 3432.5 L45758.8 3432.5" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M45462.8 3538.5 L45758.8 3538.5" fill="none" data-name="StudyScheduleFormData"></path>
+							<rect x="47397.0" y="3401.5" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
+							<path d="M47397.0 3432.5 L47693.0 3432.5" fill="none" data-name="StudyScheduleFormData"></path>
+							<path d="M47397.0 3538.5 L47693.0 3538.5" fill="none" data-name="StudyScheduleFormData"></path>
 						</g>
-						<g transform="translate(45462.75, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
+						<g transform="translate(47397, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
 								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45462.75, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+						<g transform="translate(47397, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
@@ -13269,7 +13242,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(45462.75, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+						<g transform="translate(47397, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
@@ -13280,16 +13253,16 @@
 					</g>
 					<g data-name="IStudyFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="47808.5" y="1666.5" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M47808.5 1697.5 L47951.5 1697.5" fill="none" data-name="IStudyFormData"></path>
+							<rect x="50012.8" y="1666.5" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
+							<path d="M50012.8 1697.5 L50155.8 1697.5" fill="none" data-name="IStudyFormData"></path>
 						</g>
-						<g transform="translate(47808.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
+						<g transform="translate(50012.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
 								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47808.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
+						<g transform="translate(50012.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
 								
@@ -13298,16 +13271,16 @@
 					</g>
 					<g data-name="InterventionTaskFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="40455.8" y="1666.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M40455.8 1697.5 L40868.8 1697.5" fill="none" data-name="InterventionTaskFormView"></path>
+							<rect x="40431.8" y="1666.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
+							<path d="M40431.8 1697.5 L40844.8 1697.5" fill="none" data-name="InterventionTaskFormView"></path>
 						</g>
-						<g transform="translate(40455.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
+						<g transform="translate(40431.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
 								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40455.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
+						<g transform="translate(40431.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
 								
@@ -13316,17 +13289,17 @@
 					</g>
 					<g data-name="InterventionsFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="45675.8" y="2556.0" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M45675.8 2587.0 L46069.8 2587.0" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M45675.8 2648.0 L46069.8 2648.0" fill="none" data-name="InterventionsFormData"></path>
+							<rect x="47466.5" y="2556.0" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
+							<path d="M47466.5 2587.0 L47860.5 2587.0" fill="none" data-name="InterventionsFormData"></path>
+							<path d="M47466.5 2648.0 L47860.5 2648.0" fill="none" data-name="InterventionsFormData"></path>
 						</g>
-						<g transform="translate(45675.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
+						<g transform="translate(47466.5, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
 								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45675.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+						<g transform="translate(47466.5, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
@@ -13334,7 +13307,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(45675.75, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+						<g transform="translate(47466.5, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
@@ -13344,16 +13317,16 @@
 					</g>
 					<g data-name="StudyDesignReportsFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="33936.5" y="3462.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M33936.5 3493.0 L34329.5 3493.0" fill="none" data-name="StudyDesignReportsFormView"></path>
+							<rect x="36388.5" y="3462.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
+							<path d="M36388.5 3493.0 L36781.5 3493.0" fill="none" data-name="StudyDesignReportsFormView"></path>
 						</g>
-						<g transform="translate(33936.5, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
+						<g transform="translate(36388.5, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
 								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33936.5, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
+						<g transform="translate(36388.5, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
@@ -13363,17 +13336,17 @@
 					</g>
 					<g data-name="ReportItemFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="44731.3" y="1628.5" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M44731.3 1659.5 L45045.3 1659.5" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M44731.3 1720.5 L45045.3 1720.5" fill="none" data-name="ReportItemFormData"></path>
+							<rect x="45142.0" y="1628.5" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
+							<path d="M45142.0 1659.5 L45456.0 1659.5" fill="none" data-name="ReportItemFormData"></path>
+							<path d="M45142.0 1720.5 L45456.0 1720.5" fill="none" data-name="ReportItemFormData"></path>
 						</g>
-						<g transform="translate(44731.25, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
+						<g transform="translate(45142, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
 								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44731.25, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+						<g transform="translate(45142, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
@@ -13381,7 +13354,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(44731.25, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+						<g transform="translate(45142, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
@@ -13391,9 +13364,9 @@
 					</g>
 					<g data-name="ReportSection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="44824.3" y="2609.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
+							<rect x="45235.0" y="2609.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
 						</g>
-						<g transform="translate(44824.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
+						<g transform="translate(45235, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
 								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
 								
@@ -13402,17 +13375,17 @@
 					</g>
 					<g data-name="DataReferenceEditor">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="46109.8" y="2556.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M46109.8 2587.0 L46818.8 2587.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M46109.8 2648.0 L46818.8 2648.0" fill="none" data-name="DataReferenceEditor"></path>
+							<rect x="45690.0" y="2556.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
+							<path d="M45690.0 2587.0 L46399.0 2587.0" fill="none" data-name="DataReferenceEditor"></path>
+							<path d="M45690.0 2648.0 L46399.0 2648.0" fill="none" data-name="DataReferenceEditor"></path>
 						</g>
-						<g transform="translate(46109.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
+						<g transform="translate(45690, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
 								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46109.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+						<g transform="translate(45690, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
 								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
@@ -13420,7 +13393,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(46109.75, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+						<g transform="translate(45690, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
 								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
@@ -13430,9 +13403,9 @@
 					</g>
 					<g data-name="ReactiveDropdownField">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="46554.8" y="3485.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
+							<rect x="46135.0" y="3485.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
 						</g>
-						<g transform="translate(46554.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
+						<g transform="translate(46135, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
 								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
 								
@@ -13441,17 +13414,17 @@
 					</g>
 					<g data-name="TemporalAggregationFormatted">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="46858.8" y="2518.5" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M46858.8 2549.5 L47306.8 2549.5" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M46858.8 2655.5 L47306.8 2655.5" fill="none" data-name="TemporalAggregationFormatted"></path>
+							<rect x="46439.0" y="2518.5" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
+							<path d="M46439.0 2549.5 L46887.0 2549.5" fill="none" data-name="TemporalAggregationFormatted"></path>
+							<path d="M46439.0 2655.5 L46887.0 2655.5" fill="none" data-name="TemporalAggregationFormatted"></path>
 						</g>
-						<g transform="translate(46858.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
+						<g transform="translate(46439, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
 								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46858.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+						<g transform="translate(46439, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
@@ -13462,7 +13435,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(46858.75, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+						<g transform="translate(46439, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
@@ -13474,9 +13447,9 @@
 					</g>
 					<g data-name="TemporalAggregation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="46797.8" y="3485.0" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
+							<rect x="46378.0" y="3485.0" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
 						</g>
-						<g transform="translate(46797.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
+						<g transform="translate(46378, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
 								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
 								
@@ -13485,17 +13458,17 @@
 					</g>
 					<g data-name="ImprovementDirectionFormatted">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="47346.8" y="2518.5" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M47346.8 2549.5 L47797.8 2549.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M47346.8 2655.5 L47797.8 2655.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
+							<rect x="46927.0" y="2518.5" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
+							<path d="M46927.0 2549.5 L47378.0 2549.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
+							<path d="M46927.0 2655.5 L47378.0 2655.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
 						</g>
-						<g transform="translate(47346.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
+						<g transform="translate(46927, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
 								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47346.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+						<g transform="translate(46927, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
@@ -13506,7 +13479,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(47346.75, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+						<g transform="translate(46927, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
@@ -13518,9 +13491,9 @@
 					</g>
 					<g data-name="ImprovementDirection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="47253.0" y="3485.0" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
+							<rect x="46833.3" y="3485.0" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
 						</g>
-						<g transform="translate(47253, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
+						<g transform="translate(46833.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
 								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
 								
@@ -13529,16 +13502,16 @@
 					</g>
 					<g data-name="ReportSectionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="13698.5" y="3447.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M13698.5 3478.0 L14081.5 3478.0" fill="none" data-name="ReportSectionType"></path>
+							<rect x="14508.0" y="3447.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
+							<path d="M14508.0 3478.0 L14891.0 3478.0" fill="none" data-name="ReportSectionType"></path>
 						</g>
-						<g transform="translate(13698.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
+						<g transform="translate(14508, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
 								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13698.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
+						<g transform="translate(14508, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
@@ -13550,17 +13523,17 @@
 					</g>
 					<g data-name="AverageSectionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="26354.5" y="1636.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M26354.5 1667.0 L26833.5 1667.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M26354.5 1728.0 L26833.5 1728.0" fill="none" data-name="AverageSectionFormView"></path>
+							<rect x="26093.3" y="1636.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
+							<path d="M26093.3 1667.0 L26572.3 1667.0" fill="none" data-name="AverageSectionFormView"></path>
+							<path d="M26093.3 1728.0 L26572.3 1728.0" fill="none" data-name="AverageSectionFormView"></path>
 						</g>
-						<g transform="translate(26354.5, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
+						<g transform="translate(26093.25, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26354.5, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+						<g transform="translate(26093.25, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
@@ -13568,7 +13541,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(26354.5, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+						<g transform="translate(26093.25, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
 								
@@ -13577,17 +13550,17 @@
 					</g>
 					<g data-name="ReportItemFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="38606.5" y="2338.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M38606.5 2369.5 L39593.5 2369.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M38606.5 2805.5 L39593.5 2805.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<rect x="40694.3" y="2338.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
+							<path d="M40694.3 2369.5 L41681.3 2369.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<path d="M40694.3 2805.5 L41681.3 2805.5" fill="none" data-name="ReportItemFormViewModel"></path>
 						</g>
-						<g transform="translate(38606.5, 2338.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(40694.25, 2338.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
 								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38606.5, 2369.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(40694.25, 2369.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
@@ -13620,7 +13593,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(38606.5, 2805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(40694.25, 2805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
@@ -13634,23 +13607,23 @@
 					</g>
 					<g data-name="DataReferenceIdentifier">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="78159.0" y="583.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M78159.0 614.0 L78363.0 614.0" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M78159.0 645.0 L78363.0 645.0" fill="none" data-name="DataReferenceIdentifier"></path>
+							<rect x="79096.5" y="583.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
+							<path d="M79096.5 614.0 L79300.5 614.0" fill="none" data-name="DataReferenceIdentifier"></path>
+							<path d="M79096.5 645.0 L79300.5 645.0" fill="none" data-name="DataReferenceIdentifier"></path>
 						</g>
-						<g transform="translate(78159, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
+						<g transform="translate(79096.5, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
 								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78159, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+						<g transform="translate(79096.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
 								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78159, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+						<g transform="translate(79096.5, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
 								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
 								
@@ -13659,9 +13632,9 @@
 					</g>
 					<g data-name="DataReference">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="78193.5" y="121.0" height="31.0" width="135.0" data-name="DataReference"></rect>
+							<rect x="79131.0" y="121.0" height="31.0" width="135.0" data-name="DataReference"></rect>
 						</g>
-						<g transform="translate(78193.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
+						<g transform="translate(79131, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
 								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
 								
@@ -13670,17 +13643,17 @@
 					</g>
 					<g data-name="LinearRegressionSectionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="26873.5" y="1636.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M26873.5 1667.0 L27352.5 1667.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M26873.5 1728.0 L27352.5 1728.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<rect x="26612.3" y="1636.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
+							<path d="M26612.3 1667.0 L27091.3 1667.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<path d="M26612.3 1728.0 L27091.3 1728.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
 						</g>
-						<g transform="translate(26873.5, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
+						<g transform="translate(26612.25, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26873.5, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+						<g transform="translate(26612.25, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
@@ -13688,7 +13661,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(26873.5, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+						<g transform="translate(26612.25, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
 								
@@ -13697,17 +13670,17 @@
 					</g>
 					<g data-name="ReportItemFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="42202.3" y="1613.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M42202.3 1644.5 L42669.3 1644.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M42202.3 1720.5 L42669.3 1720.5" fill="none" data-name="ReportItemFormView"></path>
+							<rect x="41221.0" y="1613.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
+							<path d="M41221.0 1644.5 L41688.0 1644.5" fill="none" data-name="ReportItemFormView"></path>
+							<path d="M41221.0 1720.5 L41688.0 1720.5" fill="none" data-name="ReportItemFormView"></path>
 						</g>
-						<g transform="translate(42202.25, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
+						<g transform="translate(41221, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
 								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42202.25, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+						<g transform="translate(41221, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
@@ -13716,7 +13689,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(42202.25, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+						<g transform="translate(41221, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
@@ -13727,17 +13700,17 @@
 					</g>
 					<g data-name="ReportsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="63159.0" y="2451.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M63159.0 2482.0 L64019.0 2482.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M63159.0 2648.0 L64019.0 2648.0" fill="none" data-name="ReportsFormViewModel"></path>
+							<rect x="64299.3" y="2451.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
+							<path d="M64299.3 2482.0 L65159.3 2482.0" fill="none" data-name="ReportsFormViewModel"></path>
+							<path d="M64299.3 2648.0 L65159.3 2648.0" fill="none" data-name="ReportsFormViewModel"></path>
 						</g>
-						<g transform="translate(63159, 2451)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
+						<g transform="translate(64299.25, 2451)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
 								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63159, 2482)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+						<g transform="translate(64299.25, 2482)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
@@ -13752,7 +13725,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(63159, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+						<g transform="translate(64299.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
@@ -13769,17 +13742,17 @@
 					</g>
 					<g data-name="ReportFormItemDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="64446.3" y="1591.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M64446.3 1622.0 L65289.3 1622.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M64446.3 1698.0 L65289.3 1698.0" fill="none" data-name="ReportFormItemDelegate"></path>
+							<rect x="65331.0" y="1591.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
+							<path d="M65331.0 1622.0 L66174.0 1622.0" fill="none" data-name="ReportFormItemDelegate"></path>
+							<path d="M65331.0 1698.0 L66174.0 1698.0" fill="none" data-name="ReportFormItemDelegate"></path>
 						</g>
-						<g transform="translate(64446.25, 1591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
+						<g transform="translate(65331, 1591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
 								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64446.25, 1622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+						<g transform="translate(65331, 1622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
@@ -13788,7 +13761,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(64446.25, 1698)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+						<g transform="translate(65331, 1698)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
@@ -13802,17 +13775,17 @@
 					</g>
 					<g data-name="ReportBadge">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="49268.8" y="2556.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M49268.8 2587.0 L49465.8 2587.0" fill="none" data-name="ReportBadge"></path>
-							<path d="M49268.8 2663.0 L49465.8 2663.0" fill="none" data-name="ReportBadge"></path>
+							<rect x="47900.5" y="2556.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
+							<path d="M47900.5 2587.0 L48097.5 2587.0" fill="none" data-name="ReportBadge"></path>
+							<path d="M47900.5 2663.0 L48097.5 2663.0" fill="none" data-name="ReportBadge"></path>
 						</g>
-						<g transform="translate(49268.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
+						<g transform="translate(47900.5, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
 								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49268.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+						<g transform="translate(47900.5, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
@@ -13821,7 +13794,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(49268.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+						<g transform="translate(47900.5, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
 								
@@ -13830,16 +13803,16 @@
 					</g>
 					<g data-name="ReportStatus">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="20608.5" y="3447.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M20608.5 3478.0 L20909.5 3478.0" fill="none" data-name="ReportStatus"></path>
+							<rect x="19153.3" y="3447.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
+							<path d="M19153.3 3478.0 L19454.3 3478.0" fill="none" data-name="ReportStatus"></path>
 						</g>
-						<g transform="translate(20608.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
+						<g transform="translate(19153.25, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
 								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20608.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
+						<g transform="translate(19153.25, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
@@ -13851,24 +13824,24 @@
 					</g>
 					<g data-name="ReportsFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="47837.8" y="2563.5" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M47837.8 2594.5 L48175.8 2594.5" fill="none" data-name="ReportsFormData"></path>
-							<path d="M47837.8 2640.5 L48175.8 2640.5" fill="none" data-name="ReportsFormData"></path>
+							<rect x="48137.5" y="2563.5" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
+							<path d="M48137.5 2594.5 L48475.5 2594.5" fill="none" data-name="ReportsFormData"></path>
+							<path d="M48137.5 2640.5 L48475.5 2640.5" fill="none" data-name="ReportsFormData"></path>
 						</g>
-						<g transform="translate(47837.75, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
+						<g transform="translate(48137.5, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
 								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47837.75, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+						<g transform="translate(48137.5, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47837.75, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+						<g transform="translate(48137.5, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
@@ -13878,17 +13851,17 @@
 					</g>
 					<g data-name="StudyInfoFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="70034.5" y="2383.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M70034.5 2414.5 L70730.5 2414.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M70034.5 2820.5 L70730.5 2820.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+							<rect x="71014.5" y="2383.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
+							<path d="M71014.5 2414.5 L71710.5 2414.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+							<path d="M71014.5 2820.5 L71710.5 2820.5" fill="none" data-name="StudyInfoFormViewModel"></path>
 						</g>
-						<g transform="translate(70034.5, 2383.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
+						<g transform="translate(71014.5, 2383.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(70034.5, 2414.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+						<g transform="translate(71014.5, 2414.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
@@ -13919,7 +13892,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(70034.5, 2820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+						<g transform="translate(71014.5, 2820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
@@ -13929,16 +13902,16 @@
 					</g>
 					<g data-name="StudyDesignInfoFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="34554.3" y="3469.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M34554.3 3500.5 L34777.3 3500.5" fill="none" data-name="StudyDesignInfoFormView"></path>
+							<rect x="36821.5" y="3469.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
+							<path d="M36821.5 3500.5 L37044.5 3500.5" fill="none" data-name="StudyDesignInfoFormView"></path>
 						</g>
-						<g transform="translate(34554.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
+						<g transform="translate(36821.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
 								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34554.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
+						<g transform="translate(36821.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
 								
@@ -13947,17 +13920,17 @@
 					</g>
 					<g data-name="StudyInfoFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="49505.8" y="2541.0" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M49505.8 2572.0 L49919.8 2572.0" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M49505.8 2663.0 L49919.8 2663.0" fill="none" data-name="StudyInfoFormData"></path>
+							<rect x="49568.5" y="2541.0" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
+							<path d="M49568.5 2572.0 L49982.5 2572.0" fill="none" data-name="StudyInfoFormData"></path>
+							<path d="M49568.5 2663.0 L49982.5 2663.0" fill="none" data-name="StudyInfoFormData"></path>
 						</g>
-						<g transform="translate(49505.75, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
+						<g transform="translate(49568.5, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
 								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49505.75, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+						<g transform="translate(49568.5, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
@@ -13967,7 +13940,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(49505.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+						<g transform="translate(49568.5, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
@@ -13977,17 +13950,17 @@
 					</g>
 					<g data-name="StudyContactInfoFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="49662.3" y="3386.5" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M49662.3 3417.5 L50010.3 3417.5" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M49662.3 3568.5 L50010.3 3568.5" fill="none" data-name="StudyContactInfoFormData"></path>
+							<rect x="49725.0" y="3386.5" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
+							<path d="M49725.0 3417.5 L50073.0 3417.5" fill="none" data-name="StudyContactInfoFormData"></path>
+							<path d="M49725.0 3568.5 L50073.0 3568.5" fill="none" data-name="StudyContactInfoFormData"></path>
 						</g>
-						<g transform="translate(49662.25, 3386.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
+						<g transform="translate(49725, 3386.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
 								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49662.25, 3417.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+						<g transform="translate(49725, 3417.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
@@ -14001,7 +13974,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(49662.25, 3568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+						<g transform="translate(49725, 3568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
@@ -14011,16 +13984,16 @@
 					</g>
 					<g data-name="StudyFormValidationSet">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="2051.0" y="3462.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M2051.0 3493.0 L2438.0 3493.0" fill="none" data-name="StudyFormValidationSet"></path>
+							<rect x="2475.0" y="3462.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
+							<path d="M2475.0 3493.0 L2862.0 3493.0" fill="none" data-name="StudyFormValidationSet"></path>
 						</g>
-						<g transform="translate(2051, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
+						<g transform="translate(2475, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
 								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2051, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
+						<g transform="translate(2475, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
@@ -14030,24 +14003,24 @@
 					</g>
 					<g data-name="MeasurementsFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="49999.8" y="2563.5" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M49999.8 2594.5 L50493.8 2594.5" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M49999.8 2640.5 L50493.8 2640.5" fill="none" data-name="MeasurementsFormData"></path>
+							<rect x="50062.5" y="2563.5" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
+							<path d="M50062.5 2594.5 L50556.5 2594.5" fill="none" data-name="MeasurementsFormData"></path>
+							<path d="M50062.5 2640.5 L50556.5 2640.5" fill="none" data-name="MeasurementsFormData"></path>
 						</g>
-						<g transform="translate(49999.75, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
+						<g transform="translate(50062.5, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
 								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49999.75, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+						<g transform="translate(50062.5, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49999.75, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+						<g transform="translate(50062.5, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
@@ -14057,16 +14030,16 @@
 					</g>
 					<g data-name="MeasurementSurveyFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="42899.3" y="1666.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M42899.3 1697.5 L43343.3 1697.5" fill="none" data-name="MeasurementSurveyFormView"></path>
+							<rect x="41918.0" y="1666.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
+							<path d="M41918.0 1697.5 L42362.0 1697.5" fill="none" data-name="MeasurementSurveyFormView"></path>
 						</g>
-						<g transform="translate(42899.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
+						<g transform="translate(41918, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
 								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42899.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
+						<g transform="translate(41918, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
 								
@@ -14075,17 +14048,17 @@
 					</g>
 					<g data-name="MeasurementSurveyFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="61918.0" y="2413.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M61918.0 2444.5 L62614.0 2444.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M61918.0 2670.5 L62614.0 2670.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+							<rect x="62148.3" y="2413.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
+							<path d="M62148.3 2444.5 L62844.3 2444.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+							<path d="M62148.3 2670.5 L62844.3 2670.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
 						</g>
-						<g transform="translate(61918, 2413.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+						<g transform="translate(62148.25, 2413.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61918, 2444.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+						<g transform="translate(62148.25, 2444.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
@@ -14104,7 +14077,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(61918, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+						<g transform="translate(62148.25, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
@@ -14122,23 +14095,23 @@
 					</g>
 					<g data-name="SurveyPreview">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="27392.5" y="1651.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M27392.5 1682.0 L27736.5 1682.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M27392.5 1713.0 L27736.5 1713.0" fill="none" data-name="SurveyPreview"></path>
+							<rect x="27453.3" y="1651.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
+							<path d="M27453.3 1682.0 L27797.3 1682.0" fill="none" data-name="SurveyPreview"></path>
+							<path d="M27453.3 1713.0 L27797.3 1713.0" fill="none" data-name="SurveyPreview"></path>
 						</g>
-						<g transform="translate(27392.5, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
+						<g transform="translate(27453.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27392.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+						<g transform="translate(27453.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27392.5, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+						<g transform="translate(27453.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
 								
@@ -14147,17 +14120,17 @@
 					</g>
 					<g data-name="MeasurementSurveyFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="55487.8" y="2526.0" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M55487.8 2557.0 L55896.8 2557.0" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M55487.8 2678.0 L55896.8 2678.0" fill="none" data-name="MeasurementSurveyFormData"></path>
+							<rect x="55529.3" y="2526.0" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
+							<path d="M55529.3 2557.0 L55938.3 2557.0" fill="none" data-name="MeasurementSurveyFormData"></path>
+							<path d="M55529.3 2678.0 L55938.3 2678.0" fill="none" data-name="MeasurementSurveyFormData"></path>
 						</g>
-						<g transform="translate(55487.75, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
+						<g transform="translate(55529.25, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
 								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55487.75, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+						<g transform="translate(55529.25, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
@@ -14169,7 +14142,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(55487.75, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+						<g transform="translate(55529.25, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
@@ -14179,24 +14152,24 @@
 					</g>
 					<g data-name="QuestionnaireFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="53009.0" y="3431.5" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M53009.0 3462.5 L53377.0 3462.5" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M53009.0 3508.5 L53377.0 3508.5" fill="none" data-name="QuestionnaireFormData"></path>
+							<rect x="52648.8" y="3431.5" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
+							<path d="M52648.8 3462.5 L53016.8 3462.5" fill="none" data-name="QuestionnaireFormData"></path>
+							<path d="M52648.8 3508.5 L53016.8 3508.5" fill="none" data-name="QuestionnaireFormData"></path>
 						</g>
-						<g transform="translate(53009, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
+						<g transform="translate(52648.75, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
 								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53009, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+						<g transform="translate(52648.75, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53009, 3508.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+						<g transform="translate(52648.75, 3508.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
@@ -14207,17 +14180,17 @@
 					</g>
 					<g data-name="WithQuestionnaireControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="61930.0" y="1568.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M61930.0 1599.5 L62562.0 1599.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M61930.0 1705.5 L62562.0 1705.5" fill="none" data-name="WithQuestionnaireControls"></path>
+							<rect x="62595.3" y="1568.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
+							<path d="M62595.3 1599.5 L63227.3 1599.5" fill="none" data-name="WithQuestionnaireControls"></path>
+							<path d="M62595.3 1705.5 L63227.3 1705.5" fill="none" data-name="WithQuestionnaireControls"></path>
 						</g>
-						<g transform="translate(61930, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
+						<g transform="translate(62595.25, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
 								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61930, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+						<g transform="translate(62595.25, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
@@ -14228,7 +14201,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(61930, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+						<g transform="translate(62595.25, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
@@ -14243,16 +14216,16 @@
 					</g>
 					<g data-name="StudyDesignMeasurementsFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="34817.3" y="3469.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M34817.3 3500.5 L35127.3 3500.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
+							<rect x="38311.3" y="3469.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
+							<path d="M38311.3 3500.5 L38621.3 3500.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
 						</g>
-						<g transform="translate(34817.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+						<g transform="translate(38311.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
 								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34817.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+						<g transform="translate(38311.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
 								
@@ -14261,17 +14234,17 @@
 					</g>
 					<g data-name="MeasurementsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="65728.8" y="2443.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M65728.8 2474.5 L66820.8 2474.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M65728.8 2625.5 L66820.8 2625.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+							<rect x="66435.8" y="2443.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
+							<path d="M66435.8 2474.5 L67527.8 2474.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+							<path d="M66435.8 2625.5 L67527.8 2625.5" fill="none" data-name="MeasurementsFormViewModel"></path>
 						</g>
-						<g transform="translate(65728.75, 2443.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
+						<g transform="translate(66435.75, 2443.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
 								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65728.75, 2474.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+						<g transform="translate(66435.75, 2474.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
@@ -14285,7 +14258,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(65728.75, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+						<g transform="translate(66435.75, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
@@ -14304,17 +14277,17 @@
 					</g>
 					<g data-name="StudyFormScaffold">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="27582.5" y="2563.5" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M27582.5 2594.5 L27970.5 2594.5" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M27582.5 2655.5 L27970.5 2655.5" fill="none" data-name="StudyFormScaffold"></path>
+							<rect x="27837.3" y="1636.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
+							<path d="M27837.3 1667.0 L28225.3 1667.0" fill="none" data-name="StudyFormScaffold"></path>
+							<path d="M27837.3 1728.0 L28225.3 1728.0" fill="none" data-name="StudyFormScaffold"></path>
 						</g>
-						<g transform="translate(27582.5, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
+						<g transform="translate(27837.25, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
 								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27582.5, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+						<g transform="translate(27837.25, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
@@ -14322,7 +14295,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(27582.5, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+						<g transform="translate(27837.25, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
 								
@@ -14331,9 +14304,9 @@
 					</g>
 					<g data-name="T Function(WidgetRef)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="29658.3" y="3485.0" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
+							<rect x="27751.8" y="2609.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
 						</g>
-						<g transform="translate(29658.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
+						<g transform="translate(27751.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
 								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
 								
@@ -14342,17 +14315,17 @@
 					</g>
 					<g data-name="ConsentItemFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="53899.8" y="2496.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M53899.8 2527.0 L54595.8 2527.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M53899.8 2693.0 L54595.8 2693.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+							<rect x="52429.8" y="2496.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
+							<path d="M52429.8 2527.0 L53125.8 2527.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+							<path d="M52429.8 2693.0 L53125.8 2693.0" fill="none" data-name="ConsentItemFormViewModel"></path>
 						</g>
-						<g transform="translate(53899.75, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
+						<g transform="translate(52429.75, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53899.75, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+						<g transform="translate(52429.75, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
@@ -14367,7 +14340,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(53899.75, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+						<g transform="translate(52429.75, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
@@ -14378,16 +14351,16 @@
 					</g>
 					<g data-name="StudyDesignEnrollmentFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="35167.3" y="3454.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M35167.3 3485.5 L35616.3 3485.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
+							<rect x="38661.3" y="3454.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
+							<path d="M38661.3 3485.5 L39110.3 3485.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
 						</g>
-						<g transform="translate(35167.25, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+						<g transform="translate(38661.25, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
 								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35167.25, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+						<g transform="translate(38661.25, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
@@ -14398,16 +14371,16 @@
 					</g>
 					<g data-name="IScreenerQuestionLogicFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="52631.8" y="2594.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M52631.8 2625.0 L52963.8 2625.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
+							<rect x="51625.8" y="2594.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
+							<path d="M51625.8 2625.0 L51957.8 2625.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
 						</g>
-						<g transform="translate(52631.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
+						<g transform="translate(51625.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
 								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52631.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
+						<g transform="translate(51625.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
@@ -14416,23 +14389,23 @@
 					</g>
 					<g data-name="ScreenerQuestionLogicFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="80897.0" y="2556.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M80897.0 2587.0 L81321.0 2587.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M80897.0 2618.0 L81321.0 2618.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+							<rect x="81454.3" y="2556.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
+							<path d="M81454.3 2587.0 L81878.3 2587.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+							<path d="M81454.3 2618.0 L81878.3 2618.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
 						</g>
-						<g transform="translate(80897, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+						<g transform="translate(81454.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
 								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80897, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+						<g transform="translate(81454.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80897, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+						<g transform="translate(81454.25, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
@@ -14444,17 +14417,17 @@
 					</g>
 					<g data-name="ScreenerQuestionFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="61985.0" y="3334.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M61985.0 3365.0 L62547.0 3365.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M61985.0 3546.0 L62547.0 3546.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+							<rect x="62059.0" y="3334.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
+							<path d="M62059.0 3365.0 L62621.0 3365.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+							<path d="M62059.0 3546.0 L62621.0 3546.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(61985, 3334)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+						<g transform="translate(62059, 3334)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
 								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61985, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+						<g transform="translate(62059, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
@@ -14470,7 +14443,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(61985, 3546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+						<g transform="translate(62059, 3546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
@@ -14485,17 +14458,17 @@
 					</g>
 					<g data-name="ConsentItemFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="50626.3" y="1613.5" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M50626.3 1644.5 L50884.3 1644.5" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M50626.3 1735.5 L50884.3 1735.5" fill="none" data-name="ConsentItemFormData"></path>
+							<rect x="50863.8" y="1613.5" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
+							<path d="M50863.8 1644.5 L51121.8 1644.5" fill="none" data-name="ConsentItemFormData"></path>
+							<path d="M50863.8 1735.5 L51121.8 1735.5" fill="none" data-name="ConsentItemFormData"></path>
 						</g>
-						<g transform="translate(50626.25, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
+						<g transform="translate(50863.75, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
 								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50626.25, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+						<g transform="translate(50863.75, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
@@ -14505,7 +14478,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(50626.25, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+						<g transform="translate(50863.75, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
@@ -14515,16 +14488,16 @@
 					</g>
 					<g data-name="ConsentItemFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="44310.3" y="1666.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M44310.3 1697.5 L44691.3 1697.5" fill="none" data-name="ConsentItemFormView"></path>
+							<rect x="44721.0" y="1666.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
+							<path d="M44721.0 1697.5 L45102.0 1697.5" fill="none" data-name="ConsentItemFormView"></path>
 						</g>
-						<g transform="translate(44310.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
+						<g transform="translate(44721, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
 								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44310.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
+						<g transform="translate(44721, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
 								
@@ -14533,17 +14506,17 @@
 					</g>
 					<g data-name="EnrollmentFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="50533.8" y="2541.0" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M50533.8 2572.0 L50987.8 2572.0" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M50533.8 2663.0 L50987.8 2663.0" fill="none" data-name="EnrollmentFormData"></path>
+							<rect x="50596.5" y="2541.0" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
+							<path d="M50596.5 2572.0 L51050.5 2572.0" fill="none" data-name="EnrollmentFormData"></path>
+							<path d="M50596.5 2663.0 L51050.5 2663.0" fill="none" data-name="EnrollmentFormData"></path>
 						</g>
-						<g transform="translate(50533.75, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
+						<g transform="translate(50596.5, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
 								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50533.75, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+						<g transform="translate(50596.5, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
@@ -14553,7 +14526,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(50533.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+						<g transform="translate(50596.5, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
@@ -14563,17 +14536,17 @@
 					</g>
 					<g data-name="QuestionFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="48215.8" y="1956.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M48215.8 1987.0 L49228.8 1987.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M48215.8 3008.0 L49228.8 3008.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<rect x="48515.5" y="1956.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M48515.5 1987.0 L49528.5 1987.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M48515.5 3008.0 L49528.5 3008.0" fill="none" data-name="QuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(48215.75, 1956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+						<g transform="translate(48515.5, 1956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
 								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(48215.75, 1987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+						<g transform="translate(48515.5, 1987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
@@ -14645,7 +14618,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(48215.75, 3008)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+						<g transform="translate(48515.5, 3008)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
@@ -14671,17 +14644,17 @@
 					</g>
 					<g data-name="EnrollmentFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="64786.8" y="2376.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M64786.8 2407.0 L65688.8 2407.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M64786.8 2633.0 L65688.8 2633.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+							<rect x="65493.8" y="2376.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
+							<path d="M65493.8 2407.0 L66395.8 2407.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+							<path d="M65493.8 2633.0 L66395.8 2633.0" fill="none" data-name="EnrollmentFormViewModel"></path>
 						</g>
-						<g transform="translate(64786.75, 2376)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
+						<g transform="translate(65493.75, 2376)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
 								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64786.75, 2407)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+						<g transform="translate(65493.75, 2407)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
@@ -14700,7 +14673,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(64786.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+						<g transform="translate(65493.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
@@ -14723,17 +14696,17 @@
 					</g>
 					<g data-name="EnrollmentFormConsentItemDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="64537.8" y="3394.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M64537.8 3425.0 L65337.8 3425.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M64537.8 3501.0 L65337.8 3501.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+							<rect x="65244.8" y="3394.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
+							<path d="M65244.8 3425.0 L66044.8 3425.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+							<path d="M65244.8 3501.0 L66044.8 3501.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
 						</g>
-						<g transform="translate(64537.75, 3394)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+						<g transform="translate(65244.75, 3394)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
 								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64537.75, 3425)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+						<g transform="translate(65244.75, 3425)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
@@ -14742,7 +14715,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(64537.75, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+						<g transform="translate(65244.75, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
@@ -14756,17 +14729,17 @@
 					</g>
 					<g data-name="StudyFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="69670.3" y="1516.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M69670.3 1547.0 L70366.3 1547.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M69670.3 1758.0 L70366.3 1758.0" fill="none" data-name="StudyFormViewModel"></path>
+							<rect x="71208.5" y="1516.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
+							<path d="M71208.5 1547.0 L71904.5 1547.0" fill="none" data-name="StudyFormViewModel"></path>
+							<path d="M71208.5 1758.0 L71904.5 1758.0" fill="none" data-name="StudyFormViewModel"></path>
 						</g>
-						<g transform="translate(69670.25, 1516)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(71208.5, 1516)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(69670.25, 1547)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(71208.5, 1547)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
@@ -14784,7 +14757,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(69670.25, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(71208.5, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
@@ -14799,17 +14772,17 @@
 					</g>
 					<g data-name="QuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="52444.3" y="1568.5" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M52444.3 1599.5 L53612.3 1599.5" fill="none" data-name="QuestionFormData"></path>
-							<path d="M52444.3 1735.5 L53612.3 1735.5" fill="none" data-name="QuestionFormData"></path>
+							<rect x="53489.8" y="1568.5" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M53489.8 1599.5 L54657.8 1599.5" fill="none" data-name="QuestionFormData"></path>
+							<path d="M53489.8 1735.5 L54657.8 1735.5" fill="none" data-name="QuestionFormData"></path>
 						</g>
-						<g transform="translate(52444.25, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+						<g transform="translate(53489.75, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
 								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52444.25, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+						<g transform="translate(53489.75, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
@@ -14822,7 +14795,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(52444.25, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+						<g transform="translate(53489.75, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
@@ -14835,16 +14808,16 @@
 					</g>
 					<g data-name="SurveyQuestionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="32641.5" y="3417.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M32641.5 3448.0 L33004.5 3448.0" fill="none" data-name="SurveyQuestionType"></path>
+							<rect x="33729.5" y="3417.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M33729.5 3448.0 L34092.5 3448.0" fill="none" data-name="SurveyQuestionType"></path>
 						</g>
-						<g transform="translate(32641.5, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+						<g transform="translate(33729.5, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
 								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32641.5, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+						<g transform="translate(33729.5, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
@@ -14860,17 +14833,17 @@
 					</g>
 					<g data-name="ChoiceQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="51303.8" y="2541.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M51303.8 2572.0 L51647.8 2572.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M51303.8 2633.0 L51647.8 2633.0" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<rect x="51241.8" y="2541.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M51241.8 2572.0 L51585.8 2572.0" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M51241.8 2633.0 L51585.8 2633.0" fill="none" data-name="ChoiceQuestionFormData"></path>
 						</g>
-						<g transform="translate(51303.75, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(51241.75, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51303.75, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(51241.75, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
@@ -14878,7 +14851,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(51303.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(51241.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
@@ -14890,24 +14863,24 @@
 					</g>
 					<g data-name="BoolQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="51687.8" y="2556.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M51687.8 2587.0 L52079.8 2587.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M51687.8 2633.0 L52079.8 2633.0" fill="none" data-name="BoolQuestionFormData"></path>
+							<rect x="51997.8" y="2556.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M51997.8 2587.0 L52389.8 2587.0" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M51997.8 2633.0 L52389.8 2633.0" fill="none" data-name="BoolQuestionFormData"></path>
 						</g>
-						<g transform="translate(51687.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(51997.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
 								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51687.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(51997.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51687.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(51997.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
@@ -14918,24 +14891,24 @@
 					</g>
 					<g data-name="ImageQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="52119.8" y="2556.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M52119.8 2587.0 L52591.8 2587.0" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M52119.8 2633.0 L52591.8 2633.0" fill="none" data-name="ImageQuestionFormData"></path>
+							<rect x="53165.8" y="2556.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
+							<path d="M53165.8 2587.0 L53637.8 2587.0" fill="none" data-name="ImageQuestionFormData"></path>
+							<path d="M53165.8 2633.0 L53637.8 2633.0" fill="none" data-name="ImageQuestionFormData"></path>
 						</g>
-						<g transform="translate(52119.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(53165.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
 								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52119.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(53165.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52119.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(53165.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
@@ -14946,17 +14919,17 @@
 					</g>
 					<g data-name="AudioQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="53003.8" y="2548.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M53003.8 2579.5 L53475.8 2579.5" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M53003.8 2640.5 L53475.8 2640.5" fill="none" data-name="AudioQuestionFormData"></path>
+							<rect x="53677.8" y="2548.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
+							<path d="M53677.8 2579.5 L54149.8 2579.5" fill="none" data-name="AudioQuestionFormData"></path>
+							<path d="M53677.8 2640.5 L54149.8 2640.5" fill="none" data-name="AudioQuestionFormData"></path>
 						</g>
-						<g transform="translate(53003.75, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(53677.75, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
 								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53003.75, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(53677.75, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
@@ -14964,7 +14937,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(53003.75, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(53677.75, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
@@ -14975,17 +14948,17 @@
 					</g>
 					<g data-name="ScaleQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="53515.8" y="2481.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M53515.8 2512.0 L53859.8 2512.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M53515.8 2708.0 L53859.8 2708.0" fill="none" data-name="ScaleQuestionFormData"></path>
+							<rect x="54189.8" y="2481.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M54189.8 2512.0 L54533.8 2512.0" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M54189.8 2708.0 L54533.8 2708.0" fill="none" data-name="ScaleQuestionFormData"></path>
 						</g>
-						<g transform="translate(53515.75, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(54189.75, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53515.75, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(54189.75, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
@@ -15002,7 +14975,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(53515.75, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(54189.75, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
@@ -15013,17 +14986,17 @@
 					</g>
 					<g data-name="FreeTextQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="54635.8" y="2541.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M54635.8 2572.0 L54979.8 2572.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M54635.8 2648.0 L54979.8 2648.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<rect x="54573.8" y="2541.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M54573.8 2572.0 L54917.8 2572.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M54573.8 2648.0 L54917.8 2648.0" fill="none" data-name="FreeTextQuestionFormData"></path>
 						</g>
-						<g transform="translate(54635.75, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(54573.75, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54635.75, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(54573.75, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
@@ -15032,7 +15005,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(54635.75, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(54573.75, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
@@ -15043,9 +15016,9 @@
 					</g>
 					<g data-name="FreeTextQuestionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="55244.0" y="3485.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+							<rect x="54707.8" y="3485.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
 						</g>
-						<g transform="translate(55244, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+						<g transform="translate(54707.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
 								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
@@ -15054,23 +15027,23 @@
 					</g>
 					<g data-name="AudioRecordingQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="27816.5" y="1651.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M27816.5 1682.0 L28168.5 1682.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M27816.5 1713.0 L28168.5 1713.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<rect x="28265.3" y="1651.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
+							<path d="M28265.3 1682.0 L28617.3 1682.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<path d="M28265.3 1713.0 L28617.3 1713.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
 						</g>
-						<g transform="translate(27816.5, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
+						<g transform="translate(28265.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27816.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+						<g transform="translate(28265.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27816.5, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+						<g transform="translate(28265.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
 								
@@ -15079,24 +15052,24 @@
 					</g>
 					<g data-name="FreeTextQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="28208.5" y="1628.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M28208.5 1659.5 L28560.5 1659.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M28208.5 1705.5 L28560.5 1705.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<rect x="28657.3" y="1628.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M28657.3 1659.5 L29009.3 1659.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M28657.3 1705.5 L29009.3 1705.5" fill="none" data-name="FreeTextQuestionFormView"></path>
 						</g>
-						<g transform="translate(28208.5, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(28657.25, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28208.5, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(28657.25, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28208.5, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(28657.25, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
@@ -15107,23 +15080,23 @@
 					</g>
 					<g data-name="ImageCapturingQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="28600.5" y="1651.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M28600.5 1682.0 L28952.5 1682.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M28600.5 1713.0 L28952.5 1713.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<rect x="29049.3" y="1651.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
+							<path d="M29049.3 1682.0 L29401.3 1682.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<path d="M29049.3 1713.0 L29401.3 1713.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
 						</g>
-						<g transform="translate(28600.5, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
+						<g transform="translate(29049.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28600.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+						<g transform="translate(29049.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28600.5, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+						<g transform="translate(29049.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
 								
@@ -15132,16 +15105,16 @@
 					</g>
 					<g data-name="IScaleQuestionFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="81455.3" y="105.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M81455.3 136.5 L81764.3 136.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
+							<rect x="82392.8" y="105.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M82392.8 136.5 L82701.8 136.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(81455.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+						<g transform="translate(82392.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
 								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81455.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+						<g transform="translate(82392.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
@@ -15150,16 +15123,16 @@
 					</g>
 					<g data-name="ScaleQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="55044.3" y="1666.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M55044.3 1697.5 L55396.3 1697.5" fill="none" data-name="ScaleQuestionFormView"></path>
+							<rect x="55045.0" y="1666.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M55045.0 1697.5 L55397.0 1697.5" fill="none" data-name="ScaleQuestionFormView"></path>
 						</g>
-						<g transform="translate(55044.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+						<g transform="translate(55045, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55044.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+						<g transform="translate(55045, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
@@ -15168,23 +15141,23 @@
 					</g>
 					<g data-name="ChoiceQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="28992.5" y="1651.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M28992.5 1682.0 L29344.5 1682.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M28992.5 1713.0 L29344.5 1713.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<rect x="29441.3" y="1651.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M29441.3 1682.0 L29793.3 1682.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M29441.3 1713.0 L29793.3 1713.0" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(28992.5, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(29441.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28992.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(29441.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28992.5, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(29441.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
 								
@@ -15193,23 +15166,23 @@
 					</g>
 					<g data-name="BoolQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="29384.5" y="1651.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M29384.5 1682.0 L29736.5 1682.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M29384.5 1713.0 L29736.5 1713.0" fill="none" data-name="BoolQuestionFormView"></path>
+							<rect x="30248.3" y="1651.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M30248.3 1682.0 L30600.3 1682.0" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M30248.3 1713.0 L30600.3 1713.0" fill="none" data-name="BoolQuestionFormView"></path>
 						</g>
-						<g transform="translate(29384.5, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+						<g transform="translate(30248.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29384.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+						<g transform="translate(30248.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29384.5, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+						<g transform="translate(30248.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
 								
@@ -15218,16 +15191,16 @@
 					</g>
 					<g data-name="SurveyQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="56171.3" y="1659.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M56171.3 1690.0 L56523.3 1690.0" fill="none" data-name="SurveyQuestionFormView"></path>
+							<rect x="56975.3" y="1659.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M56975.3 1690.0 L57327.3 1690.0" fill="none" data-name="SurveyQuestionFormView"></path>
 						</g>
-						<g transform="translate(56171.25, 1659)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+						<g transform="translate(56975.25, 1659)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56171.25, 1690)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+						<g transform="translate(56975.25, 1690)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
@@ -15237,9 +15210,9 @@
 					</g>
 					<g data-name="StudyUTimeOfDay">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="55936.8" y="2609.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
+							<rect x="55978.3" y="2609.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
 						</g>
-						<g transform="translate(55936.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
+						<g transform="translate(55978.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
 								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
 								
@@ -15248,23 +15221,23 @@
 					</g>
 					<g data-name="ScheduleControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="81395.5" y="1158.5" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M81395.5 1189.5 L81827.5 1189.5" fill="none" data-name="ScheduleControls"></path>
-							<path d="M81395.5 1220.5 L81827.5 1220.5" fill="none" data-name="ScheduleControls"></path>
+							<rect x="82333.0" y="1158.5" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
+							<path d="M82333.0 1189.5 L82765.0 1189.5" fill="none" data-name="ScheduleControls"></path>
+							<path d="M82333.0 1220.5 L82765.0 1220.5" fill="none" data-name="ScheduleControls"></path>
 						</g>
-						<g transform="translate(81395.5, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
+						<g transform="translate(82333, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
 								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81395.5, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+						<g transform="translate(82333, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81395.5, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+						<g transform="translate(82333, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
@@ -15274,16 +15247,16 @@
 					</g>
 					<g data-name="StudiesTableColumnHeader">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
-							<rect x="45974.3" y="3782.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
-							<path d="M45974.3 3813.5 L46211.3 3813.5" fill="none" data-name="StudiesTableColumnHeader"></path>
+							<rect x="45276.0" y="3782.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
+							<path d="M45276.0 3813.5 L45513.0 3813.5" fill="none" data-name="StudiesTableColumnHeader"></path>
 						</g>
-						<g transform="translate(45974.25, 3782.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
+						<g transform="translate(45276, 3782.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
 								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45974.25, 3813.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
+						<g transform="translate(45276, 3813.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
@@ -15296,16 +15269,16 @@
 					</g>
 					<g data-name="DashboardScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="57917.8" y="2594.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
-							<path d="M57917.8 2625.0 L58095.8 2625.0" fill="none" data-name="DashboardScreen"></path>
+							<rect x="57320.8" y="2594.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
+							<path d="M57320.8 2625.0 L57498.8 2625.0" fill="none" data-name="DashboardScreen"></path>
 						</g>
-						<g transform="translate(57917.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
+						<g transform="translate(57320.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
 								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57917.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
+						<g transform="translate(57320.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
 								
@@ -15314,16 +15287,16 @@
 					</g>
 					<g data-name="StudiesFilter">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
-							<rect x="27625.8" y="3462.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
-							<path d="M27625.8 3493.0 L27921.8 3493.0" fill="none" data-name="StudiesFilter"></path>
+							<rect x="25620.3" y="3462.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
+							<path d="M25620.3 3493.0 L25916.3 3493.0" fill="none" data-name="StudiesFilter"></path>
 						</g>
-						<g transform="translate(27625.75, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
+						<g transform="translate(25620.25, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
 								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27625.75, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
+						<g transform="translate(25620.25, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
@@ -15333,24 +15306,24 @@
 					</g>
 					<g data-name="DashboardScaffold">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
-							<rect x="58135.8" y="2571.0" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
-							<path d="M58135.8 2602.0 L58478.8 2602.0" fill="none" data-name="DashboardScaffold"></path>
-							<path d="M58135.8 2648.0 L58478.8 2648.0" fill="none" data-name="DashboardScaffold"></path>
+							<rect x="57538.8" y="2571.0" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
+							<path d="M57538.8 2602.0 L57881.8 2602.0" fill="none" data-name="DashboardScaffold"></path>
+							<path d="M57538.8 2648.0 L57881.8 2648.0" fill="none" data-name="DashboardScaffold"></path>
 						</g>
-						<g transform="translate(58135.75, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
+						<g transform="translate(57538.75, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
 								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58135.75, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+						<g transform="translate(57538.75, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58135.75, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+						<g transform="translate(57538.75, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
 								
@@ -15359,17 +15332,17 @@
 					</g>
 					<g data-name="DashboardController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
-							<rect x="68907.3" y="2436.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
-							<path d="M68907.3 2467.0 L69521.3 2467.0" fill="none" data-name="DashboardController"></path>
-							<path d="M68907.3 2588.0 L69521.3 2588.0" fill="none" data-name="DashboardController"></path>
+							<rect x="69694.3" y="2436.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
+							<path d="M69694.3 2467.0 L70308.3 2467.0" fill="none" data-name="DashboardController"></path>
+							<path d="M69694.3 2588.0 L70308.3 2588.0" fill="none" data-name="DashboardController"></path>
 						</g>
-						<g transform="translate(68907.25, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
+						<g transform="translate(69694.25, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
 								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68907.25, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+						<g transform="translate(69694.25, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
@@ -15381,7 +15354,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(68907.25, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+						<g transform="translate(69694.25, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
 								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
@@ -15403,23 +15376,23 @@
 					</g>
 					<g data-name="IUserRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="69024.3" y="3439.0" height="123.0" width="260.0" data-name="IUserRepository"></rect>
-							<path d="M69024.3 3470.0 L69284.3 3470.0" fill="none" data-name="IUserRepository"></path>
-							<path d="M69024.3 3501.0 L69284.3 3501.0" fill="none" data-name="IUserRepository"></path>
+							<rect x="69811.3" y="3439.0" height="123.0" width="260.0" data-name="IUserRepository"></rect>
+							<path d="M69811.3 3470.0 L70071.3 3470.0" fill="none" data-name="IUserRepository"></path>
+							<path d="M69811.3 3501.0 L70071.3 3501.0" fill="none" data-name="IUserRepository"></path>
 						</g>
-						<g transform="translate(69024.25, 3439)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
+						<g transform="translate(69811.25, 3439)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
 								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(69024.25, 3470)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
+						<g transform="translate(69811.25, 3470)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+user: StudyUUser</text>
 								
 							</g>
 						</g>
-						<g transform="translate(69024.25, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
+						<g transform="translate(69811.25, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+dynamic fetchUser()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IUserRepository">+dynamic saveUser()</text>
@@ -15430,17 +15403,17 @@
 					</g>
 					<g data-name="StudiesTableColumnSize">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
-							<rect x="81804.3" y="75.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
-							<path d="M81804.3 106.0 L82029.3 106.0" fill="none" data-name="StudiesTableColumnSize"></path>
-							<path d="M81804.3 167.0 L82029.3 167.0" fill="none" data-name="StudiesTableColumnSize"></path>
+							<rect x="82741.8" y="75.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
+							<path d="M82741.8 106.0 L82966.8 106.0" fill="none" data-name="StudiesTableColumnSize"></path>
+							<path d="M82741.8 167.0 L82966.8 167.0" fill="none" data-name="StudiesTableColumnSize"></path>
 						</g>
-						<g transform="translate(81804.25, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
+						<g transform="translate(82741.75, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
 								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81804.25, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+						<g transform="translate(82741.75, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
@@ -15448,7 +15421,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(81804.25, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+						<g transform="translate(82741.75, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
 								
@@ -15457,17 +15430,17 @@
 					</g>
 					<g data-name="StudiesTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
-							<rect x="56648.5" y="1553.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
-							<path d="M56648.5 1584.5 L57128.5 1584.5" fill="none" data-name="StudiesTable"></path>
-							<path d="M56648.5 1795.5 L57128.5 1795.5" fill="none" data-name="StudiesTable"></path>
+							<rect x="58004.5" y="1553.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
+							<path d="M58004.5 1584.5 L58484.5 1584.5" fill="none" data-name="StudiesTable"></path>
+							<path d="M58004.5 1795.5 L58484.5 1795.5" fill="none" data-name="StudiesTable"></path>
 						</g>
-						<g transform="translate(56648.5, 1553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
+						<g transform="translate(58004.5, 1553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
 								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56648.5, 1584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+						<g transform="translate(58004.5, 1584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
@@ -15485,7 +15458,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(56648.5, 1795.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+						<g transform="translate(58004.5, 1795.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
@@ -15495,9 +15468,9 @@
 					</g>
 					<g data-name="void Function(Study)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
-							<rect x="56346.8" y="2609.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
+							<rect x="57101.8" y="2609.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
 						</g>
-						<g transform="translate(56346.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
+						<g transform="translate(57101.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
 								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
 								
@@ -15506,9 +15479,9 @@
 					</g>
 					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<rect x="56565.8" y="2609.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
+							<rect x="57921.8" y="2609.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
 						</g>
-						<g transform="translate(56565.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+						<g transform="translate(57921.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
 								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
 								
@@ -15517,16 +15490,16 @@
 					</g>
 					<g data-name="StudiesTableColumn">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
-							<rect x="2478.0" y="3394.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
-							<path d="M2478.0 3425.5 L2839.0 3425.5" fill="none" data-name="StudiesTableColumn"></path>
+							<rect x="2902.0" y="3394.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
+							<path d="M2902.0 3425.5 L3263.0 3425.5" fill="none" data-name="StudiesTableColumn"></path>
 						</g>
-						<g transform="translate(2478, 3394.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
+						<g transform="translate(2902, 3394.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
 								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2478, 3425.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
+						<g transform="translate(2902, 3425.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
@@ -15545,16 +15518,16 @@
 					</g>
 					<g data-name="StudiesTableItem">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
-							<rect x="59284.0" y="2526.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
-							<path d="M59284.0 2557.5 L59684.0 2557.5" fill="none" data-name="StudiesTableItem"></path>
+							<rect x="58700.8" y="2526.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
+							<path d="M58700.8 2557.5 L59100.8 2557.5" fill="none" data-name="StudiesTableItem"></path>
 						</g>
-						<g transform="translate(59284, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
+						<g transform="translate(58700.75, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
 								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59284, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
+						<g transform="translate(58700.75, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
@@ -15572,9 +15545,9 @@
 					</g>
 					<g data-name="void Function(Study, bool)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
-							<rect x="58958.8" y="3485.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
+							<rect x="58582.3" y="3485.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
 						</g>
-						<g transform="translate(58958.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
+						<g transform="translate(58582.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
 								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
 								
@@ -15583,9 +15556,9 @@
 					</g>
 					<g data-name="void Function(Study)?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
-							<rect x="59804.8" y="3485.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
+							<rect x="59804.0" y="3485.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
 						</g>
-						<g transform="translate(59804.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
+						<g transform="translate(59804, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
 								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
 								
@@ -15594,9 +15567,9 @@
 					</g>
 					<g data-name="App">
 						<g fill="#eee8d5" stroke="#33322E" data-name="App">
-							<rect x="82069.3" y="121.0" height="31.0" width="47.0" data-name="App"></rect>
+							<rect x="83006.8" y="121.0" height="31.0" width="47.0" data-name="App"></rect>
 						</g>
-						<g transform="translate(82069.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
+						<g transform="translate(83006.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
 								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
 								
@@ -15605,9 +15578,9 @@
 					</g>
 					<g data-name="AppContent">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
-							<rect x="82156.3" y="121.0" height="31.0" width="109.0" data-name="AppContent"></rect>
+							<rect x="83093.8" y="121.0" height="31.0" width="109.0" data-name="AppContent"></rect>
 						</g>
-						<g transform="translate(82156.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
+						<g transform="translate(83093.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
 								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
 								
@@ -15616,16 +15589,16 @@
 					</g>
 					<g data-name="AccountSettingsDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
-							<rect x="37942.3" y="1666.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
-							<path d="M37942.3 1697.5 L38136.3 1697.5" fill="none" data-name="AccountSettingsDialog"></path>
+							<rect x="38906.3" y="1666.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
+							<path d="M38906.3 1697.5 L39100.3 1697.5" fill="none" data-name="AccountSettingsDialog"></path>
 						</g>
-						<g transform="translate(37942.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
+						<g transform="translate(38906.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
 								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37942.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
+						<g transform="translate(38906.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
 								
@@ -15634,17 +15607,17 @@
 					</g>
 					<g data-name="ModelRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepository">
-							<rect x="82496.0" y="986.0" height="453.0" width="662.0" data-name="ModelRepository"></rect>
-							<path d="M82496.0 1017.0 L83158.0 1017.0" fill="none" data-name="ModelRepository"></path>
-							<path d="M82496.0 1123.0 L83158.0 1123.0" fill="none" data-name="ModelRepository"></path>
+							<rect x="83433.5" y="986.0" height="453.0" width="662.0" data-name="ModelRepository"></rect>
+							<path d="M83433.5 1017.0 L84095.5 1017.0" fill="none" data-name="ModelRepository"></path>
+							<path d="M83433.5 1123.0 L84095.5 1123.0" fill="none" data-name="ModelRepository"></path>
 						</g>
-						<g transform="translate(82496, 986)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelRepository">
+						<g transform="translate(83433.5, 986)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepository">
 								<text x="323.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepository">ModelRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82496, 1017)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
+						<g transform="translate(83433.5, 1017)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+delegate: IModelRepositoryDelegate&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">-_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
@@ -15655,7 +15628,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(82496, 1123)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
+						<g transform="translate(83433.5, 1123)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt;? get()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">+dynamic fetchAll()</text>
@@ -15683,17 +15656,17 @@
 					</g>
 					<g data-name="InviteCodeRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepository">
-							<rect x="81691.5" y="2518.5" height="213.0" width="403.0" data-name="InviteCodeRepository"></rect>
-							<path d="M81691.5 2549.5 L82094.5 2549.5" fill="none" data-name="InviteCodeRepository"></path>
-							<path d="M81691.5 2655.5 L82094.5 2655.5" fill="none" data-name="InviteCodeRepository"></path>
+							<rect x="82629.0" y="2518.5" height="213.0" width="403.0" data-name="InviteCodeRepository"></rect>
+							<path d="M82629.0 2549.5 L83032.0 2549.5" fill="none" data-name="InviteCodeRepository"></path>
+							<path d="M82629.0 2655.5 L83032.0 2655.5" fill="none" data-name="InviteCodeRepository"></path>
 						</g>
-						<g transform="translate(81691.5, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepository">
+						<g transform="translate(82629, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepository">
 								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepository">InviteCodeRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81691.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
+						<g transform="translate(82629, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
@@ -15704,7 +15677,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(81691.5, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
+						<g transform="translate(82629, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+String getKey()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
@@ -15716,9 +15689,9 @@
 					</g>
 					<g data-name="ProviderRef">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ProviderRef">
-							<rect x="82346.3" y="4118.5" height="31.0" width="109.0" data-name="ProviderRef"></rect>
+							<rect x="83283.8" y="4118.5" height="31.0" width="109.0" data-name="ProviderRef"></rect>
 						</g>
-						<g transform="translate(82346.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ProviderRef">
+						<g transform="translate(83283.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ProviderRef">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProviderRef">
 								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProviderRef">ProviderRef</text>
 								
@@ -15727,16 +15700,16 @@
 					</g>
 					<g data-name="StudyUApi">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApi">
-							<rect x="76152.0" y="4028.0" height="212.0" width="251.0" data-name="StudyUApi"></rect>
-							<path d="M76152.0 4059.0 L76403.0 4059.0" fill="none" data-name="StudyUApi"></path>
+							<rect x="76856.5" y="4028.0" height="212.0" width="251.0" data-name="StudyUApi"></rect>
+							<path d="M76856.5 4059.0 L77107.5 4059.0" fill="none" data-name="StudyUApi"></path>
 						</g>
-						<g transform="translate(76152, 4028)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyUApi">
+						<g transform="translate(76856.5, 4028)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyUApi">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApi">
 								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApi">StudyUApi</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76152, 4059)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApi">
+						<g transform="translate(76856.5, 4059)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApi">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApi">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApi">+dynamic saveStudy()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudy()</text>
@@ -15755,17 +15728,17 @@
 					</g>
 					<g data-name="InviteCodeRepositoryDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepositoryDelegate">
-							<rect x="82607.0" y="2518.5" height="213.0" width="299.0" data-name="InviteCodeRepositoryDelegate"></rect>
-							<path d="M82607.0 2549.5 L82906.0 2549.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
-							<path d="M82607.0 2610.5 L82906.0 2610.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
+							<rect x="83544.5" y="2518.5" height="213.0" width="299.0" data-name="InviteCodeRepositoryDelegate"></rect>
+							<path d="M83544.5 2549.5 L83843.5 2549.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
+							<path d="M83544.5 2610.5 L83843.5 2610.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(82607, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+						<g transform="translate(83544.5, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepositoryDelegate">
 								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepositoryDelegate">InviteCodeRepositoryDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82607, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+						<g transform="translate(83544.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+apiClient: StudyUApi</text>
@@ -15773,7 +15746,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(82607, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+						<g transform="translate(83544.5, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetch()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetchAll()</text>
@@ -15788,16 +15761,16 @@
 					</g>
 					<g data-name="IModelRepositoryDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepositoryDelegate">
-							<rect x="82738.8" y="1621.5" height="152.0" width="225.0" data-name="IModelRepositoryDelegate"></rect>
-							<path d="M82738.8 1652.5 L82963.8 1652.5" fill="none" data-name="IModelRepositoryDelegate"></path>
+							<rect x="83676.3" y="1621.5" height="152.0" width="225.0" data-name="IModelRepositoryDelegate"></rect>
+							<path d="M83676.3 1652.5 L83901.3 1652.5" fill="none" data-name="IModelRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(82738.75, 1621.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepositoryDelegate">
+						<g transform="translate(83676.25, 1621.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepositoryDelegate">
 								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepositoryDelegate">IModelRepositoryDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82738.75, 1652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepositoryDelegate">
+						<g transform="translate(83676.25, 1652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepositoryDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetchAll()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetch()</text>
@@ -15812,17 +15785,17 @@
 					</g>
 					<g data-name="StudyRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepository">
-							<rect x="71247.5" y="3752.0" height="183.0" width="403.0" data-name="StudyRepository"></rect>
-							<path d="M71247.5 3783.0 L71650.5 3783.0" fill="none" data-name="StudyRepository"></path>
-							<path d="M71247.5 3859.0 L71650.5 3859.0" fill="none" data-name="StudyRepository"></path>
+							<rect x="72024.3" y="3752.0" height="183.0" width="403.0" data-name="StudyRepository"></rect>
+							<path d="M72024.3 3783.0 L72427.3 3783.0" fill="none" data-name="StudyRepository"></path>
+							<path d="M72024.3 3859.0 L72427.3 3859.0" fill="none" data-name="StudyRepository"></path>
 						</g>
-						<g transform="translate(71247.5, 3752)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepository">
+						<g transform="translate(72024.25, 3752)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepository">
 								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepository">StudyRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(71247.5, 3783)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
+						<g transform="translate(72024.25, 3783)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+apiClient: StudyUApi</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+authRepository: IAuthRepository</text>
@@ -15831,7 +15804,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(71247.5, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
+						<g transform="translate(72024.25, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+String getKey()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+dynamic deleteParticipants()</text>
@@ -15843,24 +15816,24 @@
 					</g>
 					<g data-name="StudyRepositoryDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepositoryDelegate">
-							<rect x="82805.0" y="3744.5" height="198.0" width="282.0" data-name="StudyRepositoryDelegate"></rect>
-							<path d="M82805.0 3775.5 L83087.0 3775.5" fill="none" data-name="StudyRepositoryDelegate"></path>
-							<path d="M82805.0 3821.5 L83087.0 3821.5" fill="none" data-name="StudyRepositoryDelegate"></path>
+							<rect x="83742.5" y="3744.5" height="198.0" width="282.0" data-name="StudyRepositoryDelegate"></rect>
+							<path d="M83742.5 3775.5 L84024.5 3775.5" fill="none" data-name="StudyRepositoryDelegate"></path>
+							<path d="M83742.5 3821.5 L84024.5 3821.5" fill="none" data-name="StudyRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(82805, 3744.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepositoryDelegate">
+						<g transform="translate(83742.5, 3744.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepositoryDelegate">
 								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepositoryDelegate">StudyRepositoryDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82805, 3775.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
+						<g transform="translate(83742.5, 3775.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+apiClient: StudyUApi</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+authRepository: IAuthRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82805, 3821.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
+						<g transform="translate(83742.5, 3821.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetchAll()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetch()</text>
@@ -15875,9 +15848,9 @@
 					</g>
 					<g data-name="APIException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="APIException">
-							<rect x="74835.0" y="614.0" height="31.0" width="121.0" data-name="APIException"></rect>
+							<rect x="75376.5" y="614.0" height="31.0" width="121.0" data-name="APIException"></rect>
 						</g>
-						<g transform="translate(74835, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="APIException">
+						<g transform="translate(75376.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="APIException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="APIException">
 								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="APIException">APIException</text>
 								
@@ -15886,9 +15859,9 @@
 					</g>
 					<g data-name="StudyNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotFoundException">
-							<rect x="72830.0" y="1197.0" height="31.0" width="216.0" data-name="StudyNotFoundException"></rect>
+							<rect x="73767.5" y="1197.0" height="31.0" width="216.0" data-name="StudyNotFoundException"></rect>
 						</g>
-						<g transform="translate(72830, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotFoundException">
+						<g transform="translate(73767.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotFoundException">
 								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotFoundException">StudyNotFoundException</text>
 								
@@ -15897,9 +15870,9 @@
 					</g>
 					<g data-name="MeasurementNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementNotFoundException">
-							<rect x="73086.0" y="1197.0" height="31.0" width="279.0" data-name="MeasurementNotFoundException"></rect>
+							<rect x="74023.5" y="1197.0" height="31.0" width="279.0" data-name="MeasurementNotFoundException"></rect>
 						</g>
-						<g transform="translate(73086, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementNotFoundException">
+						<g transform="translate(74023.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementNotFoundException">
 								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementNotFoundException">MeasurementNotFoundException</text>
 								
@@ -15908,9 +15881,9 @@
 					</g>
 					<g data-name="QuestionNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionNotFoundException">
-							<rect x="73405.0" y="1197.0" height="31.0" width="242.0" data-name="QuestionNotFoundException"></rect>
+							<rect x="74342.5" y="1197.0" height="31.0" width="242.0" data-name="QuestionNotFoundException"></rect>
 						</g>
-						<g transform="translate(73405, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionNotFoundException">
+						<g transform="translate(74342.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionNotFoundException">
 								<text x="113.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionNotFoundException">QuestionNotFoundException</text>
 								
@@ -15919,9 +15892,9 @@
 					</g>
 					<g data-name="ConsentItemNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemNotFoundException">
-							<rect x="73687.0" y="1197.0" height="31.0" width="271.0" data-name="ConsentItemNotFoundException"></rect>
+							<rect x="74624.5" y="1197.0" height="31.0" width="271.0" data-name="ConsentItemNotFoundException"></rect>
 						</g>
-						<g transform="translate(73687, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemNotFoundException">
+						<g transform="translate(74624.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemNotFoundException">
 								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemNotFoundException">ConsentItemNotFoundException</text>
 								
@@ -15930,9 +15903,9 @@
 					</g>
 					<g data-name="InterventionNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionNotFoundException">
-							<rect x="73998.0" y="1197.0" height="31.0" width="265.0" data-name="InterventionNotFoundException"></rect>
+							<rect x="74935.5" y="1197.0" height="31.0" width="265.0" data-name="InterventionNotFoundException"></rect>
 						</g>
-						<g transform="translate(73998, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionNotFoundException">
+						<g transform="translate(74935.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionNotFoundException">
 								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionNotFoundException">InterventionNotFoundException</text>
 								
@@ -15941,9 +15914,9 @@
 					</g>
 					<g data-name="InterventionTaskNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskNotFoundException">
-							<rect x="74994.0" y="1197.0" height="31.0" width="303.0" data-name="InterventionTaskNotFoundException"></rect>
+							<rect x="75931.5" y="1197.0" height="31.0" width="303.0" data-name="InterventionTaskNotFoundException"></rect>
 						</g>
-						<g transform="translate(74994, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskNotFoundException">
+						<g transform="translate(75931.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskNotFoundException">
 								<text x="143.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskNotFoundException">InterventionTaskNotFoundException</text>
 								
@@ -15952,9 +15925,9 @@
 					</g>
 					<g data-name="ReportNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportNotFoundException">
-							<rect x="75337.0" y="1197.0" height="31.0" width="224.0" data-name="ReportNotFoundException"></rect>
+							<rect x="76274.5" y="1197.0" height="31.0" width="224.0" data-name="ReportNotFoundException"></rect>
 						</g>
-						<g transform="translate(75337, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportNotFoundException">
+						<g transform="translate(76274.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportNotFoundException">
 								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportNotFoundException">ReportNotFoundException</text>
 								
@@ -15963,9 +15936,9 @@
 					</g>
 					<g data-name="ReportSectionNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionNotFoundException">
-							<rect x="75601.0" y="1197.0" height="31.0" width="283.0" data-name="ReportSectionNotFoundException"></rect>
+							<rect x="76538.5" y="1197.0" height="31.0" width="283.0" data-name="ReportSectionNotFoundException"></rect>
 						</g>
-						<g transform="translate(75601, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionNotFoundException">
+						<g transform="translate(76538.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionNotFoundException">
 								<text x="133.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionNotFoundException">ReportSectionNotFoundException</text>
 								
@@ -15974,9 +15947,9 @@
 					</g>
 					<g data-name="StudyInviteNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInviteNotFoundException">
-							<rect x="75924.0" y="1197.0" height="31.0" width="259.0" data-name="StudyInviteNotFoundException"></rect>
+							<rect x="76861.5" y="1197.0" height="31.0" width="259.0" data-name="StudyInviteNotFoundException"></rect>
 						</g>
-						<g transform="translate(75924, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInviteNotFoundException">
+						<g transform="translate(76861.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInviteNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInviteNotFoundException">
 								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInviteNotFoundException">StudyInviteNotFoundException</text>
 								
@@ -15985,9 +15958,9 @@
 					</g>
 					<g data-name="UserNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="UserNotFoundException">
-							<rect x="76223.0" y="1197.0" height="31.0" width="208.0" data-name="UserNotFoundException"></rect>
+							<rect x="77160.5" y="1197.0" height="31.0" width="208.0" data-name="UserNotFoundException"></rect>
 						</g>
-						<g transform="translate(76223, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserNotFoundException">
+						<g transform="translate(77160.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserNotFoundException">
 								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserNotFoundException">UserNotFoundException</text>
 								
@@ -15996,17 +15969,17 @@
 					</g>
 					<g data-name="StudyUApiClient">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApiClient">
-							<rect x="75860.0" y="4288.0" height="333.0" width="479.0" data-name="StudyUApiClient"></rect>
-							<path d="M75860.0 4319.0 L76339.0 4319.0" fill="none" data-name="StudyUApiClient"></path>
-							<path d="M75860.0 4395.0 L76339.0 4395.0" fill="none" data-name="StudyUApiClient"></path>
+							<rect x="76564.5" y="4288.0" height="333.0" width="479.0" data-name="StudyUApiClient"></rect>
+							<path d="M76564.5 4319.0 L77043.5 4319.0" fill="none" data-name="StudyUApiClient"></path>
+							<path d="M76564.5 4395.0 L77043.5 4395.0" fill="none" data-name="StudyUApiClient"></path>
 						</g>
-						<g transform="translate(75860, 4288)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUApiClient">
+						<g transform="translate(76564.5, 4288)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUApiClient">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApiClient">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApiClient">StudyUApiClient</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75860, 4319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
+						<g transform="translate(76564.5, 4319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+supabaseClient: SupabaseClient</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyColumns: List&lt;String&gt;</text>
@@ -16015,7 +15988,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(75860, 4395)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
+						<g transform="translate(76564.5, 4395)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteParticipants()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">+dynamic getUserStudies()</text>
@@ -16037,9 +16010,9 @@
 					</g>
 					<g data-name="SupabaseClient">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClient">
-							<rect x="75775.5" y="4661.0" height="31.0" width="141.0" data-name="SupabaseClient"></rect>
+							<rect x="76480.0" y="4661.0" height="31.0" width="141.0" data-name="SupabaseClient"></rect>
 						</g>
-						<g transform="translate(75775.5, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseClient">
+						<g transform="translate(76480, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseClient">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClient">
 								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClient">SupabaseClient</text>
 								
@@ -16048,16 +16021,16 @@
 					</g>
 					<g data-name="SupabaseClientDependant">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClientDependant">
-							<rect x="75475.0" y="4103.0" height="62.0" width="284.0" data-name="SupabaseClientDependant"></rect>
-							<path d="M75475.0 4134.0 L75759.0 4134.0" fill="none" data-name="SupabaseClientDependant"></path>
+							<rect x="76179.5" y="4103.0" height="62.0" width="284.0" data-name="SupabaseClientDependant"></rect>
+							<path d="M76179.5 4134.0 L76463.5 4134.0" fill="none" data-name="SupabaseClientDependant"></path>
 						</g>
-						<g transform="translate(75475, 4103)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseClientDependant">
+						<g transform="translate(76179.5, 4103)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseClientDependant">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClientDependant">
 								<text x="134.0" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClientDependant">SupabaseClientDependant</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75475, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseClientDependant">
+						<g transform="translate(76179.5, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseClientDependant">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseClientDependant">
 								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseClientDependant">+supabaseClient: SupabaseClient</text>
 								
@@ -16066,16 +16039,16 @@
 					</g>
 					<g data-name="SupabaseQueryMixin">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryMixin">
-							<rect x="75814.0" y="4065.5" height="137.0" width="215.0" data-name="SupabaseQueryMixin"></rect>
-							<path d="M75814.0 4096.5 L76029.0 4096.5" fill="none" data-name="SupabaseQueryMixin"></path>
+							<rect x="76518.5" y="4065.5" height="137.0" width="215.0" data-name="SupabaseQueryMixin"></rect>
+							<path d="M76518.5 4096.5 L76733.5 4096.5" fill="none" data-name="SupabaseQueryMixin"></path>
 						</g>
-						<g transform="translate(75814, 4065.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseQueryMixin">
+						<g transform="translate(76518.5, 4065.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseQueryMixin">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryMixin">
 								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryMixin">SupabaseQueryMixin</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75814, 4096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryMixin">
+						<g transform="translate(76518.5, 4096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryMixin">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryMixin">
 								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic deleteAll()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getAll()</text>
@@ -16089,16 +16062,16 @@
 					</g>
 					<g data-name="IAppRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IAppRepository">
-							<rect x="59534.8" y="3462.0" height="77.0" width="230.0" data-name="IAppRepository"></rect>
-							<path d="M59534.8 3493.0 L59764.8 3493.0" fill="none" data-name="IAppRepository"></path>
+							<rect x="60033.0" y="3462.0" height="77.0" width="230.0" data-name="IAppRepository"></rect>
+							<path d="M60033.0 3493.0 L60263.0 3493.0" fill="none" data-name="IAppRepository"></path>
 						</g>
-						<g transform="translate(59534.75, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppRepository">
+						<g transform="translate(60033, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppRepository">
 								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAppRepository">IAppRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59534.75, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppRepository">
+						<g transform="translate(60033, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IAppRepository">+dynamic fetchAppConfig()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IAppRepository">+void dispose()</text>
@@ -16108,23 +16081,23 @@
 					</g>
 					<g data-name="AppRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppRepository">
-							<rect x="59534.8" y="3789.5" height="108.0" width="230.0" data-name="AppRepository"></rect>
-							<path d="M59534.8 3820.5 L59764.8 3820.5" fill="none" data-name="AppRepository"></path>
-							<path d="M59534.8 3851.5 L59764.8 3851.5" fill="none" data-name="AppRepository"></path>
+							<rect x="60033.0" y="3789.5" height="108.0" width="230.0" data-name="AppRepository"></rect>
+							<path d="M60033.0 3820.5 L60263.0 3820.5" fill="none" data-name="AppRepository"></path>
+							<path d="M60033.0 3851.5 L60263.0 3851.5" fill="none" data-name="AppRepository"></path>
 						</g>
-						<g transform="translate(59534.75, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppRepository">
+						<g transform="translate(60033, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppRepository">
 								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppRepository">AppRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59534.75, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
+						<g transform="translate(60033, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+apiClient: StudyUApi</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59534.75, 3851.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
+						<g transform="translate(60033, 3851.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+dynamic fetchAppConfig()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AppRepository">+void dispose()</text>
@@ -16134,9 +16107,9 @@
 					</g>
 					<g data-name="StudyUUser">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUUser">
-							<rect x="75325.0" y="4118.5" height="31.0" width="110.0" data-name="StudyUUser"></rect>
+							<rect x="72429.0" y="4118.5" height="31.0" width="110.0" data-name="StudyUUser"></rect>
 						</g>
-						<g transform="translate(75325, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUUser">
+						<g transform="translate(72429, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUUser">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUUser">
 								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUUser">StudyUUser</text>
 								
@@ -16145,17 +16118,17 @@
 					</g>
 					<g data-name="UserRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="UserRepository">
-							<rect x="69489.5" y="3759.5" height="168.0" width="282.0" data-name="UserRepository"></rect>
-							<path d="M69489.5 3790.5 L69771.5 3790.5" fill="none" data-name="UserRepository"></path>
-							<path d="M69489.5 3866.5 L69771.5 3866.5" fill="none" data-name="UserRepository"></path>
+							<rect x="70276.5" y="3759.5" height="168.0" width="282.0" data-name="UserRepository"></rect>
+							<path d="M70276.5 3790.5 L70558.5 3790.5" fill="none" data-name="UserRepository"></path>
+							<path d="M70276.5 3866.5 L70558.5 3866.5" fill="none" data-name="UserRepository"></path>
 						</g>
-						<g transform="translate(69489.5, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserRepository">
+						<g transform="translate(70276.5, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserRepository">
 								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserRepository">UserRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(69489.5, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
+						<g transform="translate(70276.5, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+apiClient: StudyUApi</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+authRepository: IAuthRepository</text>
@@ -16164,7 +16137,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(69489.5, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
+						<g transform="translate(70276.5, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+dynamic fetchUser()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+dynamic saveUser()</text>
@@ -16175,9 +16148,9 @@
 					</g>
 					<g data-name="Ref">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Ref">
-							<rect x="76069.0" y="4118.5" height="31.0" width="43.0" data-name="Ref"></rect>
+							<rect x="76773.5" y="4118.5" height="31.0" width="43.0" data-name="Ref"></rect>
 						</g>
-						<g transform="translate(76069, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Ref">
+						<g transform="translate(76773.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Ref">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Ref">
 								<text x="13.5" y="13.5" stroke="none" text-anchor="middle" data-name="Ref">Ref</text>
 								
@@ -16186,16 +16159,16 @@
 					</g>
 					<g data-name="PreferenceAction">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PreferenceAction">
-							<rect x="2929.0" y="3447.0" height="107.0" width="334.0" data-name="PreferenceAction"></rect>
-							<path d="M2929.0 3478.0 L3263.0 3478.0" fill="none" data-name="PreferenceAction"></path>
+							<rect x="3353.0" y="3447.0" height="107.0" width="334.0" data-name="PreferenceAction"></rect>
+							<path d="M3353.0 3478.0 L3687.0 3478.0" fill="none" data-name="PreferenceAction"></path>
 						</g>
-						<g transform="translate(2929, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreferenceAction">
+						<g transform="translate(3353, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreferenceAction">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreferenceAction">
 								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="PreferenceAction">PreferenceAction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2929, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreferenceAction">
+						<g transform="translate(3353, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreferenceAction">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreferenceAction">
 								<text x="0.0" y="13.5" stroke="none" data-name="PreferenceAction">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+values: List&lt;PreferenceAction&gt;</text>
@@ -16207,9 +16180,9 @@
 					</g>
 					<g data-name="User">
 						<g fill="#eee8d5" stroke="#33322E" data-name="User">
-							<rect x="71349.3" y="4661.0" height="31.0" width="53.0" data-name="User"></rect>
+							<rect x="72089.8" y="4661.0" height="31.0" width="53.0" data-name="User"></rect>
 						</g>
-						<g transform="translate(71349.25, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="User">
+						<g transform="translate(72089.75, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="User">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="User">
 								<text x="18.5" y="13.5" stroke="none" text-anchor="middle" data-name="User">User</text>
 								
@@ -16218,9 +16191,9 @@
 					</g>
 					<g data-name="Session">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Session">
-							<rect x="75255.8" y="4661.0" height="31.0" width="79.0" data-name="Session"></rect>
+							<rect x="75897.0" y="4661.0" height="31.0" width="79.0" data-name="Session"></rect>
 						</g>
-						<g transform="translate(75255.75, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Session">
+						<g transform="translate(75897, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Session">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Session">
 								<text x="31.5" y="13.5" stroke="none" text-anchor="middle" data-name="Session">Session</text>
 								
@@ -16229,17 +16202,17 @@
 					</g>
 					<g data-name="AuthRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AuthRepository">
-							<rect x="75249.8" y="4310.5" height="288.0" width="295.0" data-name="AuthRepository"></rect>
-							<path d="M75249.8 4341.5 L75544.8 4341.5" fill="none" data-name="AuthRepository"></path>
-							<path d="M75249.8 4462.5 L75544.8 4462.5" fill="none" data-name="AuthRepository"></path>
+							<rect x="75954.3" y="4310.5" height="288.0" width="295.0" data-name="AuthRepository"></rect>
+							<path d="M75954.3 4341.5 L76249.3 4341.5" fill="none" data-name="AuthRepository"></path>
+							<path d="M75954.3 4462.5 L76249.3 4462.5" fill="none" data-name="AuthRepository"></path>
 						</g>
-						<g transform="translate(75249.75, 4310.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthRepository">
+						<g transform="translate(75954.25, 4310.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthRepository">
 								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthRepository">AuthRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75249.75, 4341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
+						<g transform="translate(75954.25, 4341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">+supabaseClient: SupabaseClient</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+allowPasswordReset: bool</text>
@@ -16251,7 +16224,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(75249.75, 4462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
+						<g transform="translate(75954.25, 4462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">-void _registerAuthListener()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+dynamic signUp()</text>
@@ -16267,9 +16240,9 @@
 					</g>
 					<g data-name="GoTrueClient">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GoTrueClient">
-							<rect x="75374.8" y="4661.0" height="31.0" width="120.0" data-name="GoTrueClient"></rect>
+							<rect x="76079.3" y="4661.0" height="31.0" width="120.0" data-name="GoTrueClient"></rect>
 						</g>
-						<g transform="translate(75374.75, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoTrueClient">
+						<g transform="translate(76079.25, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoTrueClient">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoTrueClient">
 								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoTrueClient">GoTrueClient</text>
 								
@@ -16278,9 +16251,9 @@
 					</g>
 					<g data-name="StudyLaunched">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyLaunched">
-							<rect x="78470.5" y="614.0" height="31.0" width="140.0" data-name="StudyLaunched"></rect>
+							<rect x="79408.0" y="614.0" height="31.0" width="140.0" data-name="StudyLaunched"></rect>
 						</g>
-						<g transform="translate(78470.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyLaunched">
+						<g transform="translate(79408, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyLaunched">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyLaunched">
 								<text x="62.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyLaunched">StudyLaunched</text>
 								
@@ -16289,16 +16262,16 @@
 					</g>
 					<g data-name="ModelEvent">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ModelEvent">
-							<rect x="78877.8" y="98.0" height="77.0" width="145.0" data-name="ModelEvent"></rect>
-							<path d="M78877.8 129.0 L79022.8 129.0" fill="none" data-name="ModelEvent"></path>
+							<rect x="79815.3" y="98.0" height="77.0" width="145.0" data-name="ModelEvent"></rect>
+							<path d="M79815.3 129.0 L79960.3 129.0" fill="none" data-name="ModelEvent"></path>
 						</g>
-						<g transform="translate(78877.75, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelEvent">
+						<g transform="translate(79815.25, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelEvent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelEvent">
 								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelEvent">ModelEvent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78877.75, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelEvent">
+						<g transform="translate(79815.25, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelEvent">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelEvent">
 								<text x="0.0" y="13.5" stroke="none" data-name="ModelEvent">+modelId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ModelEvent">+model: T</text>
@@ -16308,16 +16281,16 @@
 					</g>
 					<g data-name="SupabaseQueryError">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryError">
-							<rect x="76335.8" y="583.5" height="92.0" width="183.0" data-name="SupabaseQueryError"></rect>
-							<path d="M76335.8 614.5 L76518.8 614.5" fill="none" data-name="SupabaseQueryError"></path>
+							<rect x="77273.3" y="583.5" height="92.0" width="183.0" data-name="SupabaseQueryError"></rect>
+							<path d="M77273.3 614.5 L77456.3 614.5" fill="none" data-name="SupabaseQueryError"></path>
 						</g>
-						<g transform="translate(76335.75, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseQueryError">
+						<g transform="translate(77273.25, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseQueryError">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryError">
 								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryError">SupabaseQueryError</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76335.75, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryError">
+						<g transform="translate(77273.25, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryError">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryError">
 								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryError">+statusCode: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryError">+message: String</text>
@@ -16328,17 +16301,17 @@
 					</g>
 					<g data-name="WrappedModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WrappedModel">
-							<rect x="60864.0" y="2496.0" height="258.0" width="251.0" data-name="WrappedModel"></rect>
-							<path d="M60864.0 2527.0 L61115.0 2527.0" fill="none" data-name="WrappedModel"></path>
-							<path d="M60864.0 2678.0 L61115.0 2678.0" fill="none" data-name="WrappedModel"></path>
+							<rect x="60092.3" y="2496.0" height="258.0" width="251.0" data-name="WrappedModel"></rect>
+							<path d="M60092.3 2527.0 L60343.3 2527.0" fill="none" data-name="WrappedModel"></path>
+							<path d="M60092.3 2678.0 L60343.3 2678.0" fill="none" data-name="WrappedModel"></path>
 						</g>
-						<g transform="translate(60864, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WrappedModel">
+						<g transform="translate(60092.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WrappedModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WrappedModel">
 								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="WrappedModel">WrappedModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60864, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
+						<g transform="translate(60092.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">-_model: T</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+asyncValue: AsyncValue&lt;T&gt;</text>
@@ -16352,7 +16325,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(60864, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
+						<g transform="translate(60092.25, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">+dynamic markWithError()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+dynamic markAsLoading()</text>
@@ -16364,9 +16337,9 @@
 					</g>
 					<g data-name="ModelRepositoryException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepositoryException">
-							<rect x="76558.8" y="614.0" height="31.0" width="227.0" data-name="ModelRepositoryException"></rect>
+							<rect x="77496.3" y="614.0" height="31.0" width="227.0" data-name="ModelRepositoryException"></rect>
 						</g>
-						<g transform="translate(76558.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelRepositoryException">
+						<g transform="translate(77496.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelRepositoryException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepositoryException">
 								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepositoryException">ModelRepositoryException</text>
 								
@@ -16375,9 +16348,9 @@
 					</g>
 					<g data-name="ModelNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ModelNotFoundException">
-							<rect x="76562.8" y="1197.0" height="31.0" width="219.0" data-name="ModelNotFoundException"></rect>
+							<rect x="77500.3" y="1197.0" height="31.0" width="219.0" data-name="ModelNotFoundException"></rect>
 						</g>
-						<g transform="translate(76562.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelNotFoundException">
+						<g transform="translate(77500.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelNotFoundException">
 								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelNotFoundException">ModelNotFoundException</text>
 								
@@ -16386,16 +16359,16 @@
 					</g>
 					<g data-name="IModelRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepository">
-							<rect x="82636.0" y="501.0" height="257.0" width="382.0" data-name="IModelRepository"></rect>
-							<path d="M82636.0 532.0 L83018.0 532.0" fill="none" data-name="IModelRepository"></path>
+							<rect x="83573.5" y="501.0" height="257.0" width="382.0" data-name="IModelRepository"></rect>
+							<path d="M83573.5 532.0 L83955.5 532.0" fill="none" data-name="IModelRepository"></path>
 						</g>
-						<g transform="translate(82636, 501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepository">
+						<g transform="translate(83573.5, 501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepository">
 								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepository">IModelRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82636, 532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepository">
+						<g transform="translate(83573.5, 532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepository">+String getKey()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepository">+WrappedModel&lt;T&gt;? get()</text>
@@ -16417,9 +16390,9 @@
 					</g>
 					<g data-name="IsFetched">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IsFetched">
-							<rect x="78650.5" y="614.0" height="31.0" width="94.0" data-name="IsFetched"></rect>
+							<rect x="79588.0" y="614.0" height="31.0" width="94.0" data-name="IsFetched"></rect>
 						</g>
-						<g transform="translate(78650.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsFetched">
+						<g transform="translate(79588, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsFetched">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsFetched">
 								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsFetched">IsFetched</text>
 								
@@ -16428,9 +16401,9 @@
 					</g>
 					<g data-name="IsSaving">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaving">
-							<rect x="78784.5" y="614.0" height="31.0" width="84.0" data-name="IsSaving"></rect>
+							<rect x="79722.0" y="614.0" height="31.0" width="84.0" data-name="IsSaving"></rect>
 						</g>
-						<g transform="translate(78784.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaving">
+						<g transform="translate(79722, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaving">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaving">
 								<text x="34.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaving">IsSaving</text>
 								
@@ -16439,9 +16412,9 @@
 					</g>
 					<g data-name="IsSaved">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaved">
-							<rect x="79505.5" y="614.0" height="31.0" width="80.0" data-name="IsSaved"></rect>
+							<rect x="80518.3" y="614.0" height="31.0" width="80.0" data-name="IsSaved"></rect>
 						</g>
-						<g transform="translate(79505.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaved">
+						<g transform="translate(80518.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaved">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaved">
 								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaved">IsSaved</text>
 								
@@ -16450,9 +16423,9 @@
 					</g>
 					<g data-name="IsDeleted">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IsDeleted">
-							<rect x="79625.5" y="614.0" height="31.0" width="91.0" data-name="IsDeleted"></rect>
+							<rect x="80638.3" y="614.0" height="31.0" width="91.0" data-name="IsDeleted"></rect>
 						</g>
-						<g transform="translate(79625.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsDeleted">
+						<g transform="translate(80638.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsDeleted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsDeleted">
 								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="IsDeleted">IsDeleted</text>
 								

From cf8c9ba20b1f401fcfb3725139319f6958807bc6 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 25 Apr 2024 15:03:43 +0200
Subject: [PATCH 011/314] chore: upgrade deps

---
 app/pubspec.lock            | 28 ++++++++++++++--------------
 app/pubspec.yaml            | 10 +++++-----
 core/pubspec.lock           | 12 ++++++------
 core/pubspec.yaml           |  6 +++---
 designer_v2/pubspec.lock    | 12 ++++++------
 designer_v2/pubspec.yaml    |  6 +++---
 flutter_common/pubspec.lock |  8 ++++----
 flutter_common/pubspec.yaml |  2 +-
 pubspec.lock                |  4 ++--
 pubspec.yaml                |  2 +-
 10 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index 9a97219fb..7d2100ae0 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -338,10 +338,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: a701df4866f9a38bb8e4450a54c143bbeeb0ce2381e7df5a36e1006f3b43bb28
+      sha256: "8cdc719114ab1c86c64bb7a86d3a679674c3637edd229e3a994797d4a1504ce4"
       url: "https://pub.dev"
     source: hosted
-    version: "17.0.1"
+    version: "17.1.0"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
@@ -354,10 +354,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_local_notifications_platform_interface
-      sha256: "7cf643d6d5022f3baed0be777b0662cce5919c0a7b86e700299f22dc4ae660ef"
+      sha256: "340abf67df238f7f0ef58f4a26d2a83e1ab74c77ab03cd2b2d5018ac64db30b7"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0+1"
+    version: "7.1.0"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -593,10 +593,10 @@ packages:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.9.0"
   just_audio:
     dependency: transitive
     description:
@@ -1033,26 +1033,26 @@ packages:
     dependency: transitive
     description:
       name: sentry
-      sha256: "19a267774906ca3a3c4677fc7e9582ea9da79ae9a28f84bbe4885dac2c269b70"
+      sha256: "961630a4dba41cebd692612421fd3805a991ebd8ef4a8d84a6c179e6b89eaf22"
       url: "https://pub.dev"
     source: hosted
-    version: "7.20.0"
+    version: "8.0.0"
   sentry_flutter:
     dependency: "direct main"
     description:
       name: sentry_flutter
-      sha256: "2d2917f7d795167e33a790db9bc5e1104d2035569ecf83e09a3f491bc6978cfe"
+      sha256: "705da7adfcd1fb23fc8720b6e222f5e03d53f1d020cd635586c319ee323366b4"
       url: "https://pub.dev"
     source: hosted
-    version: "7.20.0"
+    version: "8.0.0"
   sentry_logging:
     dependency: "direct main"
     description:
       name: sentry_logging
-      sha256: "73002a2d4baec71f34e6e775223780279c005644fcd3422127d8802aaed8f86d"
+      sha256: "136751f7d0428b89267fb0c5d20308cb6237148930ce3a5ff9f82c069a9ea793"
       url: "https://pub.dev"
     source: hosted
-    version: "7.20.0"
+    version: "8.0.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -1252,10 +1252,10 @@ packages:
     dependency: "direct main"
     description:
       name: timezone
-      sha256: "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0"
+      sha256: a6ccda4a69a442098b602c44e61a1e2b4bf6f5516e875bbf0f427d5df14745d5
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.2"
+    version: "0.9.3"
   typed_data:
     dependency: transitive
     description:
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 677d3458c..12133a149 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -16,7 +16,7 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_file_dialog: ^3.0.2
-  flutter_local_notifications: ^17.0.1
+  flutter_local_notifications: ^17.1.0
   flutter_localizations:
     sdk: flutter
   flutter_timezone: ^1.0.8
@@ -26,7 +26,7 @@ dependencies:
   intersperse: ^2.0.0
   intl: ^0.18.1 # flutter_localizations
   material_design_icons_flutter: ^7.0.7296
-  package_info_plus: ^7.0.0
+  package_info_plus: ^7.0.0 # wakelock_plus <= 1.2.4
   path: ^1.9.0
   path_provider: ^2.1.3
   pdf: ^3.10.8
@@ -35,15 +35,15 @@ dependencies:
   quiver: ^3.2.1
   rainbow_color: ^2.0.1
   record: ^5.0.5
-  sentry_flutter: ^7.20.0
-  sentry_logging: ^7.20.0
+  sentry_flutter: ^8.0.0
+  sentry_logging: ^8.0.0
   shared_preferences: ^2.2.3
   studyu_core: ^4.4.1
   studyu_flutter_common: ^1.8.2
   supabase: ^2.1.1
   supabase_flutter: ^2.5.1
   timeline_tile: ^2.0.0
-  timezone: ^0.9.2
+  timezone: ^0.9.3
   universal_html: ^2.2.4
   url_launcher: ^6.2.6
   uuid: ^4.4.0
diff --git a/core/pubspec.lock b/core/pubspec.lock
index 358397574..f07c31977 100644
--- a/core/pubspec.lock
+++ b/core/pubspec.lock
@@ -269,18 +269,18 @@ packages:
     dependency: "direct main"
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.9.0"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
-      sha256: aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969
+      sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b
       url: "https://pub.dev"
     source: hosted
-    version: "6.7.1"
+    version: "6.8.0"
   jwt_decode:
     dependency: transitive
     description:
@@ -429,10 +429,10 @@ packages:
     dependency: "direct main"
     description:
       name: sentry
-      sha256: "19a267774906ca3a3c4677fc7e9582ea9da79ae9a28f84bbe4885dac2c269b70"
+      sha256: "961630a4dba41cebd692612421fd3805a991ebd8ef4a8d84a6c179e6b89eaf22"
       url: "https://pub.dev"
     source: hosted
-    version: "7.20.0"
+    version: "8.0.0"
   shelf:
     dependency: transitive
     description:
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index ca55b430d..e3019f053 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -10,15 +10,15 @@ environment:
 dependencies:
   collection: ^1.18.0
   csv: ^6.0.0
-  json_annotation: ^4.8.1
+  json_annotation: ^4.9.0
   logger: ^2.2.0
   quiver: ^3.2.1
-  sentry: ^7.20.0
+  sentry: ^8.0.0
   supabase: ^2.1.1
   uuid: ^4.4.0
 
 dev_dependencies:
   build_runner: ^2.4.9
-  json_serializable: ^6.7.1
+  json_serializable: ^6.8.0
   lint: ^2.3.0
   test: ^1.25.4
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 961564d98..dedbea596 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -387,10 +387,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: "771c8feb40ad0ef639973d7ecf1b43d55ffcedb2207fd43fab030f5639e40446"
+      sha256: "28ef8a8320ab3bf5752424e6bca6961ce25108afc344f3127b5155caf7a792c8"
       url: "https://pub.dev"
     source: hosted
-    version: "13.2.4"
+    version: "14.0.0"
   gotrue:
     dependency: transitive
     description:
@@ -480,10 +480,10 @@ packages:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.9.0"
   jwt_decode:
     dependency: transitive
     description:
@@ -864,10 +864,10 @@ packages:
     dependency: transitive
     description:
       name: sentry
-      sha256: "19a267774906ca3a3c4677fc7e9582ea9da79ae9a28f84bbe4885dac2c269b70"
+      sha256: "961630a4dba41cebd692612421fd3805a991ebd8ef4a8d84a6c179e6b89eaf22"
       url: "https://pub.dev"
     source: hosted
-    version: "7.20.0"
+    version: "8.0.0"
   shared_preferences:
     dependency: transitive
     description:
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 8731ccf78..e4b28a826 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -23,14 +23,14 @@ dependencies:
   flutter_riverpod: ^2.5.1
   flutter_web_plugins:
     sdk: flutter
-  go_router: ^13.2.4
+  go_router: ^14.0.0
   material_color_utilities:
   material_design_icons_flutter: ^7.0.7296
   pointer_interceptor: ^0.10.1
   reactive_color_picker: ^2.0.0
-  reactive_forms: ^16.1.1
+  reactive_forms: ^16.1.1 # reactive_range_slider <= 2.0.0
   reactive_multi_select_flutter: ^2.0.0
-  reactive_range_slider: ^2.0.0 # reactive_forms <= 16.1.1
+  reactive_range_slider: ^2.0.0
   rxdart: ^0.27.7
   studyu_core: ^4.4.1
   studyu_flutter_common: ^1.8.2
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index 1da42973a..b663c054c 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -228,10 +228,10 @@ packages:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.9.0"
   jwt_decode:
     dependency: transitive
     description:
@@ -428,10 +428,10 @@ packages:
     dependency: transitive
     description:
       name: sentry
-      sha256: "19a267774906ca3a3c4677fc7e9582ea9da79ae9a28f84bbe4885dac2c269b70"
+      sha256: "961630a4dba41cebd692612421fd3805a991ebd8ef4a8d84a6c179e6b89eaf22"
       url: "https://pub.dev"
     source: hosted
-    version: "7.20.0"
+    version: "8.0.0"
   shared_preferences:
     dependency: "direct main"
     description:
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index bf12523c3..0522ef65c 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -12,7 +12,7 @@ dependencies:
     sdk: flutter
   flutter_dotenv: ^5.1.0
   flutter_secure_storage: ^9.0.0
-  shared_preferences: ^2.2.2 # Can be removed after migrating phase
+  shared_preferences: ^2.2.3 # Can be removed after migrating phase
   studyu_core: ^4.4.1
   supabase_flutter: ^2.5.1
   synchronized: ^3.1.0+1
diff --git a/pubspec.lock b/pubspec.lock
index 206912c52..1d4a296ac 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -165,10 +165,10 @@ packages:
     dependency: "direct dev"
     description:
       name: melos
-      sha256: a0cb264096a315e4acdb66ae75ee594a76c97fe15ce9ae469f6c58c6c4b2be87
+      sha256: f9a6fc4f4842b7edfca2e00ab3b5b06928584f24bdc3d776ab0b30be7d599450
       url: "https://pub.dev"
     source: hosted
-    version: "5.3.0"
+    version: "6.0.0"
   meta:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 839421ca3..bfc6f81d4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -9,4 +9,4 @@ environment:
 dev_dependencies:
   flutter_lints: ^3.0.2
   lint: ^2.3.0
-  melos: ^5.3.0
+  melos: ^6.0.0

From c9ed4e6206d7e39a1dc245ace3b0b77906a32b1b Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 25 Apr 2024 20:24:03 +0200
Subject: [PATCH 012/314] chore: regenerate files

---
 .../questionnaire/questions/annotated_scale_question.g.dart  | 2 +-
 .../questionnaire/questions/audio_recording_question.g.dart  | 3 ++-
 .../models/questionnaire/questions/free_text_question.g.dart | 5 +++--
 .../src/models/questionnaire/questions/scale_question.g.dart | 4 ++--
 .../questionnaire/questions/visual_analogue_question.g.dart  | 4 ++--
 core/lib/src/models/study_schedule/study_schedule.g.dart     | 4 ++--
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/core/lib/src/models/questionnaire/questions/annotated_scale_question.g.dart b/core/lib/src/models/questionnaire/questions/annotated_scale_question.g.dart
index 88f580b18..1de91484b 100644
--- a/core/lib/src/models/questionnaire/questions/annotated_scale_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/annotated_scale_question.g.dart
@@ -50,7 +50,7 @@ Map<String, dynamic> _$AnnotatedScaleQuestionToJson(
 }
 
 Annotation _$AnnotationFromJson(Map<String, dynamic> json) => Annotation()
-  ..value = json['value'] as int
+  ..value = (json['value'] as num).toInt()
   ..annotation = json['annotation'] as String;
 
 Map<String, dynamic> _$AnnotationToJson(Annotation instance) =>
diff --git a/core/lib/src/models/questionnaire/questions/audio_recording_question.g.dart b/core/lib/src/models/questionnaire/questions/audio_recording_question.g.dart
index 15d48dc67..c09581df9 100644
--- a/core/lib/src/models/questionnaire/questions/audio_recording_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/audio_recording_question.g.dart
@@ -9,7 +9,8 @@ part of 'audio_recording_question.dart';
 AudioRecordingQuestion _$AudioRecordingQuestionFromJson(
         Map<String, dynamic> json) =>
     AudioRecordingQuestion(
-      maxRecordingDurationSeconds: json['maxRecordingDurationSeconds'] as int,
+      maxRecordingDurationSeconds:
+          (json['maxRecordingDurationSeconds'] as num).toInt(),
     )
       ..type = json['type'] as String
       ..id = json['id'] as String
diff --git a/core/lib/src/models/questionnaire/questions/free_text_question.g.dart b/core/lib/src/models/questionnaire/questions/free_text_question.g.dart
index c15443724..4a6865334 100644
--- a/core/lib/src/models/questionnaire/questions/free_text_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/free_text_question.g.dart
@@ -9,8 +9,9 @@ part of 'free_text_question.dart';
 FreeTextQuestion _$FreeTextQuestionFromJson(Map<String, dynamic> json) =>
     FreeTextQuestion(
       textType: $enumDecode(_$FreeTextQuestionTypeEnumMap, json['textType']),
-      lengthRange:
-          (json['lengthRange'] as List<dynamic>).map((e) => e as int).toList(),
+      lengthRange: (json['lengthRange'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList(),
       customTypeExpression: json['customTypeExpression'] as String?,
     )
       ..type = json['type'] as String
diff --git a/core/lib/src/models/questionnaire/questions/scale_question.g.dart b/core/lib/src/models/questionnaire/questions/scale_question.g.dart
index d05ec400c..e69c71d08 100644
--- a/core/lib/src/models/questionnaire/questions/scale_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/scale_question.g.dart
@@ -22,8 +22,8 @@ ScaleQuestion _$ScaleQuestionFromJson(Map<String, dynamic> json) =>
       ..annotations = (json['annotations'] as List<dynamic>)
           .map((e) => Annotation.fromJson(e as Map<String, dynamic>))
           .toList()
-      ..minColor = json['min_color'] as int?
-      ..maxColor = json['max_color'] as int?
+      ..minColor = (json['min_color'] as num?)?.toInt()
+      ..maxColor = (json['max_color'] as num?)?.toInt()
       ..step = (json['step'] as num).toDouble();
 
 Map<String, dynamic> _$ScaleQuestionToJson(ScaleQuestion instance) {
diff --git a/core/lib/src/models/questionnaire/questions/visual_analogue_question.g.dart b/core/lib/src/models/questionnaire/questions/visual_analogue_question.g.dart
index 2511e9751..2c2a2b505 100644
--- a/core/lib/src/models/questionnaire/questions/visual_analogue_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/visual_analogue_question.g.dart
@@ -21,8 +21,8 @@ VisualAnalogueQuestion _$VisualAnalogueQuestionFromJson(
       ..maximum = (json['maximum'] as num).toDouble()
       ..step = (json['step'] as num).toDouble()
       ..initial = (json['initial'] as num).toDouble()
-      ..minimumColor = json['minimumColor'] as int
-      ..maximumColor = json['maximumColor'] as int
+      ..minimumColor = (json['minimumColor'] as num).toInt()
+      ..maximumColor = (json['maximumColor'] as num).toInt()
       ..minimumAnnotation = json['minimumAnnotation'] as String
       ..maximumAnnotation = json['maximumAnnotation'] as String;
 
diff --git a/core/lib/src/models/study_schedule/study_schedule.g.dart b/core/lib/src/models/study_schedule/study_schedule.g.dart
index 22f3cd80f..ae103a19d 100644
--- a/core/lib/src/models/study_schedule/study_schedule.g.dart
+++ b/core/lib/src/models/study_schedule/study_schedule.g.dart
@@ -10,8 +10,8 @@ StudySchedule _$StudyScheduleFromJson(Map<String, dynamic> json) =>
     StudySchedule(
       sequenceCustom: json['sequenceCustom'] as String? ?? 'ABAB',
     )
-      ..numberOfCycles = json['numberOfCycles'] as int
-      ..phaseDuration = json['phaseDuration'] as int
+      ..numberOfCycles = (json['numberOfCycles'] as num).toInt()
+      ..phaseDuration = (json['phaseDuration'] as num).toInt()
       ..includeBaseline = json['includeBaseline'] as bool
       ..sequence = $enumDecode(_$PhaseSequenceEnumMap, json['sequence']);
 

From ad50defaf1fee2c92a741298879cc341331de3ce Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 26 Apr 2024 10:40:21 +0200
Subject: [PATCH 013/314] chore: add reset melos command

---
 melos.yaml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/melos.yaml b/melos.yaml
index 16c3c92b1..3f11616a5 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -8,16 +8,6 @@ packages:
   - core
   - flutter_common
 
-command:
-  clean:
-    hooks:
-      # Clean things very deeply, can be used to establish "pristine checkout" status
-      pre: >
-        git clean -x -d -f -q || true
-      # Additional cleanup lifecycle script, executed when `melos clean` is ran.
-      post: >
-        melos exec --flutter --concurrency=3 -- "flutter clean"
-
 scripts:
   analyze:
     run: |
@@ -76,6 +66,14 @@ scripts:
     packageFilters:
       scope: studyu_core
 
+  reset:
+    run: |
+      git clean -x -d -f -q || true
+      melos clean
+      melos exec --flutter --concurrency=1 -- "flutter clean"
+      melos bootstrap
+    description: Reset the workspace to a "pristine checkout" status.
+
   dev:designer:
     run: |
       melos exec -c 1 -- \

From eeab500f572b85903657dfcad29e4ace5a2e3f1d Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 19 Apr 2024 16:00:15 +0200
Subject: [PATCH 014/314] feat: sort invite codes alphabetically

---
 designer_v2/lib/features/recruit/study_recruit_controller.dart | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/designer_v2/lib/features/recruit/study_recruit_controller.dart b/designer_v2/lib/features/recruit/study_recruit_controller.dart
index 5b2797126..909024b0a 100644
--- a/designer_v2/lib/features/recruit/study_recruit_controller.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_controller.dart
@@ -36,6 +36,8 @@ class StudyRecruitController extends StudyBaseController<StudyRecruitControllerS
       print("StudyRecruitController.listenUpdate");
       // Update the controller's state when new invites are available in the repository
       final invites = wrappedModels.map((invite) => invite.model).toList();
+      // Sort invites alphabetically by code
+      invites.sort((a, b) => a.code.compareTo(b.code));
       state = state.copyWith(
         invites: AsyncValue.data(invites),
       );

From de4cbd59b7f5a61300b53191b3a4351ef91a7fe7 Mon Sep 17 00:00:00 2001
From: StudyU Documenter <studyu-documenter>
Date: Fri, 19 Apr 2024 14:05:53 +0000
Subject: [PATCH 015/314] docs: update UML documentation

---
 .../designer_v2/lib/features/recruit/uml.svg  |   450 +-
 docs/uml/designer_v2/lib/features/uml.svg     | 11136 ++++----
 docs/uml/designer_v2/lib/uml.svg              | 21652 ++++++++--------
 3 files changed, 16619 insertions(+), 16619 deletions(-)

diff --git a/docs/uml/designer_v2/lib/features/recruit/uml.svg b/docs/uml/designer_v2/lib/features/recruit/uml.svg
index b113e1780..cb4d698e7 100644
--- a/docs/uml/designer_v2/lib/features/recruit/uml.svg
+++ b/docs/uml/designer_v2/lib/features/recruit/uml.svg
@@ -1,36 +1,11 @@
-<svg version="1.1" baseProfile="full" width="2761.5" height="876.0" viewbox="0 0 2761.5 876" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[InviteCodeFormViewModel
+<svg version="1.1" baseProfile="full" width="2855.0" height="876.0" viewbox="0 0 2855 876" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[EnrolledBadge
 	  |
-	  +study: Study;
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  +codeControl: FormControl&lt;String&gt;;
-	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
-	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +interventionAControl: FormControl&lt;String&gt;;
-	  +interventionBControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
-	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +isPreconfiguredSchedule: bool;
-	  +preconfiguredSchedule: List&lt;String&gt;?
+	  +enrolledCount: int
 	  |
-	  +void initControls();
-	  -dynamic _uniqueInviteCode();
-	  +void regenerateCode();
-	  -String _generateCode();
-	  +StudyInvite buildFormData();
-	  +void setControlsFrom();
-	  +dynamic save()
+	  +Widget build()
 	]
 	
-	[InviteCodeFormViewModel]o-[Study]
-	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[InviteCodeFormViewModel]o-[FormControl]
-	[InviteCodeFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
-	
 	[StudyRecruitController
 	  |
 	  +inviteCodeRepository: IInviteCodeRepository;
@@ -49,13 +24,6 @@
 	[StudyBaseController]&lt;:-[StudyRecruitController]
 	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
 	
-	[EnrolledBadge
-	  |
-	  +enrolledCount: int
-	  |
-	  +Widget build()
-	]
-	
 	[StudyRecruitScreen
 	  |
 	  +Widget build();
@@ -95,189 +63,147 @@
 	[StudyInvitesTable]o-[Intervention? Function(String)]
 	[StudyInvitesTable]o-[int Function(StudyInvite)]
 	
+	[InviteCodeFormViewModel
+	  |
+	  +study: Study;
+	  +inviteCodeRepository: IInviteCodeRepository;
+	  +codeControl: FormControl&lt;String&gt;;
+	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
+	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
+	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
+	  +interventionAControl: FormControl&lt;String&gt;;
+	  +interventionBControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
+	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
+	  +isPreconfiguredSchedule: bool;
+	  +preconfiguredSchedule: List&lt;String&gt;?
+	  |
+	  +void initControls();
+	  -dynamic _uniqueInviteCode();
+	  +void regenerateCode();
+	  -String _generateCode();
+	  +StudyInvite buildFormData();
+	  +void setControlsFrom();
+	  +dynamic save()
+	]
+	
+	[InviteCodeFormViewModel]o-[Study]
+	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
+	[InviteCodeFormViewModel]o-[FormControl]
+	[InviteCodeFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
+	
 	</desc>
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="876.0" width="2761.5" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="876.0" width="2855.0" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M82.0 760.6 L71.5 769 L71.5 789 L71.5 789.0 " fill="none"></path>
+				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
+					<path d="M523.3 659.9 L739.25 769 L703.7570422535211 789 L703.8 789.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M92.6 759.0 L82.0 760.6 L85.9 750.7 L96.6 749.0 Z"></path>
+						<path d="M517.4 650.9 L523.3 659.9 L512.6 660.5 L506.6 651.5 Z"></path>
 					</g>
-					<path d="M178.4 763.9 L174.5 769 L209.99295774647888 789 L210.0 789.0 " fill="none"></path>
+					<path d="M268.5 668.0 L215.25 769 L215.25 789 L215.3 789.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M188.3 759.7 L178.4 763.9 L179.8 753.2 L189.7 749.0 Z"></path>
+						<path d="M277.6 662.2 L268.5 668.0 L268.2 657.3 L277.2 651.5 Z"></path>
 					</g>
-					<path d="M607.7 760.0 L620 769 L620 789 L620.0 789.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M603.3 750.2 L607.7 760.0 L597.0 758.8 L592.6 749.0 Z"></path>
+					<path d="M436.0 305.8 L436 351 L373.8767942583732 468.5 L373.9 468.5 " fill="none"></path>
+					<path d="M441.3 305.8 L436.0 305.8 L430.7 305.8 L436.0 292.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M215.0 305.8 L215 351 L277.1232057416268 468.5 L277.1 468.5 " fill="none"></path>
 					</g>
-					<path d="M683.8 728.1 L769 769 L769 789 L769.0 789.0 " fill="none"></path>
+					<path d="M220.3 305.8 L215.0 305.8 L209.7 305.8 L215.0 292.5 Z"></path>
+					<path d="M722.0 120.3 L722 203 L722 223.5 L722.0 223.5 " fill="none"></path>
+					<path d="M727.3 120.3 L722.0 120.3 L716.7 120.3 L722.0 107.0 Z"></path>
+					<path d="M2580.0 349.7 L2580 351 L2118.25 472.3527192706696 L2118.3 472.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M677.7 719.3 L683.8 728.1 L673.1 728.9 L667.0 720.0 Z"></path>
+						<path d="M2585.3 340.3 L2580.0 349.7 L2574.7 340.3 L2580.0 331.0 Z"></path>
 					</g>
-					<path d="M100.0 305.8 L100 351 L122.34449760765551 371 L122.3 371.0 " fill="none"></path>
-					<path d="M105.3 305.8 L100.0 305.8 L94.7 305.8 L100.0 292.5 Z"></path>
-					<path d="M846.3 657.3 L504 769 L333 791.7786116322702 L333.0 791.8 " fill="none"></path>
+					<path d="M2580.0 120.3 L2580 203 L2580 223 L2580.0 223.0 " fill="none"></path>
+					<path d="M2585.3 120.3 L2580.0 120.3 L2574.7 120.3 L2580.0 107.0 Z"></path>
+					<path d="M1458.5 152.7 L1211 203 L1211 261.5 L1211.0 261.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M856.9 659.5 L846.3 657.3 L853.6 649.3 L864.1 651.5 Z"></path>
+						<path d="M1468.7 156.1 L1458.5 152.7 L1466.5 145.6 L1476.8 149.0 Z"></path>
 					</g>
-					<path d="M1237.0 665.5 L1327.75 769 L1327.75 789 L1327.8 789.0 " fill="none"></path>
+					<path d="M1589.6 192.5 L1572 203 L1572 261.5 L1572.0 261.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1234.9 655.0 L1237.0 665.5 L1226.9 662.0 L1224.7 651.5 Z"></path>
-					</g>
-					<path d="M777.5 305.8 L777.5 351 L983.8277511961722 468.5 L983.8 468.5 " fill="none"></path>
-					<path d="M782.8 305.8 L777.5 305.8 L772.2 305.8 L777.5 292.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1352.5 305.8 L1352.5 351 L1235.5622009569379 468.5 L1235.6 468.5 " fill="none"></path>
+						<path d="M1600.4 192.4 L1589.6 192.5 L1594.9 183.2 L1605.7 183.0 Z"></path>
 					</g>
-					<path d="M1357.8 305.8 L1352.5 305.8 L1347.2 305.8 L1352.5 292.5 Z"></path>
-					<path d="M1063.5 120.3 L1063.5 203 L1063.5 223.5 L1063.5 223.5 " fill="none"></path>
-					<path d="M1068.8 120.3 L1063.5 120.3 L1058.2 120.3 L1063.5 107.0 Z"></path>
-					<path d="M429.5 349.7 L429.5 351 L420.31339712918657 371 L420.3 371.0 " fill="none"></path>
+					<path d="M1929.9 192.5 L1947.5 203 L1947.5 261.5 L1947.5 261.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M434.8 340.3 L429.5 349.7 L424.2 340.3 L429.5 331.0 Z"></path>
+						<path d="M1924.6 183.2 L1929.9 192.5 L1919.1 192.4 L1913.8 183.0 Z"></path>
 					</g>
-					<path d="M429.5 120.3 L429.5 203 L429.5 223 L429.5 223.0 " fill="none"></path>
-					<path d="M434.8 120.3 L429.5 120.3 L424.2 120.3 L429.5 107.0 Z"></path>
-					<path d="M1922.4 145.0 L1595.5 203 L1595.5 261.5 L1595.5 261.5 " fill="none"></path>
+					<path d="M2060.9 164.9 L2217 203 L2217 261.5 L2217.0 261.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1932.5 148.6 L1922.4 145.0 L1930.6 138.1 L1940.8 141.7 Z"></path>
+						<path d="M2053.1 157.5 L2060.9 164.9 L2050.6 167.9 L2042.8 160.5 Z"></path>
 					</g>
-					<path d="M1987.2 190.2 L1956.5 203 L1956.5 261.5 L1956.5 261.5 " fill="none"></path>
+					<path d="M1433.0 638.0 L842.25 769 L842.25 789 L842.3 789.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1997.9 191.5 L1987.2 190.2 L1993.8 181.7 L2004.4 183.0 Z"></path>
+						<path d="M1443.3 641.2 L1433.0 638.0 L1441.0 630.8 L1451.3 634.0 Z"></path>
 					</g>
-					<path d="M2325.6 196.4 L2332 203 L2332 261.5 L2332.0 261.5 " fill="none"></path>
+					<path d="M1432.9 621.4 L586 769 L636.8450704225352 789 L636.8 789.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2322.9 186.0 L2325.6 196.4 L2315.3 193.4 L2312.6 183.0 Z"></path>
+						<path d="M1443.0 625.0 L1432.9 621.4 L1441.1 614.5 L1451.3 618.1 Z"></path>
 					</g>
-					<path d="M2524.7 180.3 L2601.5 203 L2601.5 261.5 L2601.5 261.5 " fill="none"></path>
+					<path d="M1433.7 685.4 L1199.5 769 L1199.5 789 L1199.5 789.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2517.2 172.6 L2524.7 180.3 L2514.2 182.8 L2506.8 175.0 Z"></path>
+						<path d="M1444.3 687.3 L1433.7 685.4 L1440.7 677.2 L1451.3 679.1 Z"></path>
 					</g>
-					<g data-name="InviteCodeFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="0.0" y="371.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M0.0 402.0 L667.0 402.0" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M0.0 628.0 L667.0 628.0" fill="none" data-name="InviteCodeFormViewModel"></path>
-						</g>
-						<g transform="translate(0, 371)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
-								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 402)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 628)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="41.0" y="789.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(41, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IInviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="142.0" y="789.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
-						</g>
-						<g transform="translate(142, 789)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
-								
-							</g>
-						</g>
+					<path d="M2067.2 759.8 L2080.25 769 L2080.25 789 L2080.3 789.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M2062.7 750.0 L2067.2 759.8 L2056.5 758.7 L2052.0 749.0 Z"></path>
 					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="563.5" y="789.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+					<path d="M989.5 305.8 L989.5 351 L1451.25 472.3527192706696 L1451.3 472.4 " fill="none"></path>
+					<path d="M994.8 305.8 L989.5 305.8 L984.2 305.8 L989.5 292.5 Z"></path>
+					<g data-name="EnrolledBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
+							<rect x="437.5" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
+							<path d="M437.5 76.0 L603.5 76.0" fill="none" data-name="EnrolledBadge"></path>
+							<path d="M437.5 107.0 L603.5 107.0" fill="none" data-name="EnrolledBadge"></path>
 						</g>
-						<g transform="translate(563.5, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+						<g transform="translate(437.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="716.5" y="789.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(716.5, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+						<g transform="translate(437.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="29.5" y="261.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(29.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+						<g transform="translate(437.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="StudyRecruitController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="819.0" y="468.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M819.0 499.5 L1470.0 499.5" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M819.0 545.5 L1470.0 545.5" fill="none" data-name="StudyRecruitController"></path>
+							<rect x="0.0" y="468.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
+							<path d="M0.0 499.5 L651.0 499.5" fill="none" data-name="StudyRecruitController"></path>
+							<path d="M0.0 545.5 L651.0 545.5" fill="none" data-name="StudyRecruitController"></path>
 						</g>
-						<g transform="translate(819, 468.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
+						<g transform="translate(0, 468.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
 								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(819, 499.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+						<g transform="translate(0, 499.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(819, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+						<g transform="translate(0, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
@@ -289,11 +215,22 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="IInviteCodeRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
+							<rect x="580.8" y="789.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
+						</g>
+						<g transform="translate(580.75, 789)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="StreamSubscription">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="1242.8" y="789.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+							<rect x="130.3" y="789.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
 						</g>
-						<g transform="translate(1242.75, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
+						<g transform="translate(130.25, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
 								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
 								
@@ -302,9 +239,9 @@
 					</g>
 					<g data-name="StudyBaseController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="688.5" y="261.5" height="31.0" width="178.0" data-name="StudyBaseController"></rect>
+							<rect x="347.0" y="261.5" height="31.0" width="178.0" data-name="StudyBaseController"></rect>
 						</g>
-						<g transform="translate(688.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
+						<g transform="translate(347, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
 								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
 								
@@ -313,52 +250,27 @@
 					</g>
 					<g data-name="IModelActionProvider">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="1260.5" y="261.5" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
+							<rect x="123.0" y="261.5" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
 						</g>
-						<g transform="translate(1260.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
+						<g transform="translate(123, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
 								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrolledBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="127.5" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M127.5 76.0 L293.5 76.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M127.5 107.0 L293.5 107.0" fill="none" data-name="EnrolledBadge"></path>
-						</g>
-						<g transform="translate(127.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(127.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(127.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
 					<g data-name="StudyRecruitScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="906.5" y="223.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M906.5 254.5 L1220.5 254.5" fill="none" data-name="StudyRecruitScreen"></path>
+							<rect x="565.0" y="223.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
+							<path d="M565.0 254.5 L879.0 254.5" fill="none" data-name="StudyRecruitScreen"></path>
 						</g>
-						<g transform="translate(906.5, 223.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
+						<g transform="translate(565, 223.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
 								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(906.5, 254.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
+						<g transform="translate(565, 254.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
@@ -370,9 +282,9 @@
 					</g>
 					<g data-name="StudyPageWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="985.0" y="76.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
+							<rect x="643.5" y="76.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
 						</g>
-						<g transform="translate(985, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
+						<g transform="translate(643.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
 								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
 								
@@ -381,23 +293,23 @@
 					</g>
 					<g data-name="InviteCodeFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
-							<rect x="210.5" y="223.0" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
-							<path d="M210.5 254.0 L648.5 254.0" fill="none" data-name="InviteCodeFormView"></path>
-							<path d="M210.5 285.0 L648.5 285.0" fill="none" data-name="InviteCodeFormView"></path>
+							<rect x="2361.0" y="223.0" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
+							<path d="M2361.0 254.0 L2799.0 254.0" fill="none" data-name="InviteCodeFormView"></path>
+							<path d="M2361.0 285.0 L2799.0 285.0" fill="none" data-name="InviteCodeFormView"></path>
 						</g>
-						<g transform="translate(210.5, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
+						<g transform="translate(2361, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
 								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(210.5, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+						<g transform="translate(2361, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(210.5, 285)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+						<g transform="translate(2361, 285)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
@@ -405,11 +317,55 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="InviteCodeFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
+							<rect x="1451.3" y="371.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
+							<path d="M1451.3 402.0 L2118.3 402.0" fill="none" data-name="InviteCodeFormViewModel"></path>
+							<path d="M1451.3 628.0 L2118.3 628.0" fill="none" data-name="InviteCodeFormViewModel"></path>
+						</g>
+						<g transform="translate(1451.25, 371)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
+								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1451.25, 402)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1451.25, 628)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="FormConsumerWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="333.5" y="76.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
+							<rect x="2484.0" y="76.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
 						</g>
-						<g transform="translate(333.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+						<g transform="translate(2484, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
 								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
 								
@@ -418,17 +374,17 @@
 					</g>
 					<g data-name="StudyInvitesTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="1940.8" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M1940.8 31.0 L2506.8 31.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M1940.8 137.0 L2506.8 137.0" fill="none" data-name="StudyInvitesTable"></path>
+							<rect x="1476.8" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
+							<path d="M1476.8 31.0 L2042.8 31.0" fill="none" data-name="StudyInvitesTable"></path>
+							<path d="M1476.8 137.0 L2042.8 137.0" fill="none" data-name="StudyInvitesTable"></path>
 						</g>
-						<g transform="translate(1940.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
+						<g transform="translate(1476.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
 								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1940.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+						<g transform="translate(1476.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
@@ -439,7 +395,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(1940.75, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+						<g transform="translate(1476.75, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
@@ -449,9 +405,9 @@
 					</g>
 					<g data-name="void Function(StudyInvite)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="1484.5" y="261.5" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
+							<rect x="1100.0" y="261.5" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(1484.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
+						<g transform="translate(1100, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
 								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
 								
@@ -460,9 +416,9 @@
 					</g>
 					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="1746.5" y="261.5" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
+							<rect x="1362.0" y="261.5" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(1746.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+						<g transform="translate(1362, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
 								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
 								
@@ -471,9 +427,9 @@
 					</g>
 					<g data-name="Intervention? Function(String)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="2206.5" y="261.5" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
+							<rect x="1822.0" y="261.5" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
 						</g>
-						<g transform="translate(2206.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
+						<g transform="translate(1822, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
 								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
 								
@@ -482,15 +438,59 @@
 					</g>
 					<g data-name="int Function(StudyInvite)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="2497.5" y="261.5" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
+							<rect x="2113.0" y="261.5" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(2497.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
+						<g transform="translate(2113, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
 								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
 								
 							</g>
 						</g>
 					</g>
+					<g data-name="Study">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
+							<rect x="811.8" y="789.0" height="31.0" width="61.0" data-name="Study"></rect>
+						</g>
+						<g transform="translate(811.75, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="1143.0" y="789.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+						</g>
+						<g transform="translate(1143, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormGroup">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
+							<rect x="2027.8" y="789.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
+						</g>
+						<g transform="translate(2027.75, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
+							<rect x="919.0" y="261.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
+						</g>
+						<g transform="translate(919, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
+								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+								
+							</g>
+						</g>
+					</g>
 				</g>
 			</g>
 		</g>
diff --git a/docs/uml/designer_v2/lib/features/uml.svg b/docs/uml/designer_v2/lib/features/uml.svg
index bb00ae648..d85f16001 100644
--- a/docs/uml/designer_v2/lib/features/uml.svg
+++ b/docs/uml/designer_v2/lib/features/uml.svg
@@ -1,921 +1,895 @@
-<svg version="1.1" baseProfile="full" width="44967.0" height="3778.0" viewbox="0 0 44967 3778" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[WebFrame
+<svg version="1.1" baseProfile="full" width="48837.5" height="3778.0" viewbox="0 0 48837.5 3778" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[&lt;abstract&gt;IAppDelegate
 	  |
-	  +previewSrc: String;
-	  +studyId: String
+	  +dynamic onAppStart()
+	]
+	
+	[AppController
 	  |
-	  +Widget build()
+	  +appDelegates: List&lt;IAppDelegate&gt;;
+	  -_delayedFuture: dynamic;
+	  +isInitialized: dynamic
+	  |
+	  +dynamic onAppStart();
+	  -dynamic _callDelegates()
 	]
 	
-	[DisabledFrame
+	[StudyMonitorScreen
 	  |
 	  +Widget build()
 	]
 	
-	[PhoneContainer
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
+	
+	[LoginForm
 	  |
-	  &lt;static&gt;+defaultWidth: double;
-	  &lt;static&gt;+defaultHeight: double;
-	  +width: double;
-	  +height: double;
-	  +borderColor: Color;
-	  +borderWidth: double;
-	  +borderRadius: double;
-	  +innerContent: Widget;
-	  +innerContentBackgroundColor: Color?
+	  +formKey: AuthFormKey
 	  |
 	  +Widget build()
 	]
 	
-	[PhoneContainer]o-[Color]
-	[PhoneContainer]o-[&lt;abstract&gt;Widget]
+	[LoginForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
 	
-	[MobileFrame
+	[PasswordRecoveryForm
+	  |
+	  +formKey: AuthFormKey
 	  |
 	  +Widget build()
 	]
 	
-	[DesktopFrame
+	[PasswordRecoveryForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
+	
+	[PasswordForgotForm
+	  |
+	  +formKey: AuthFormKey
 	  |
 	  +Widget build()
 	]
 	
-	[StudyController
+	[PasswordForgotForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
+	
+	[SignupForm
 	  |
-	  +notificationService: INotificationService;
-	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
-	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
+	  +formKey: AuthFormKey
 	  |
-	  +dynamic syncStudyStatus();
-	  +dynamic onStudySubscriptionUpdate();
-	  -dynamic _redirectNewToActualStudyID();
-	  +dynamic publishStudy();
-	  +void onChangeStudyParticipation();
-	  +void onAddParticipants();
-	  +void onSettingsPressed();
-	  +void dispose()
+	  +Widget build();
+	  -dynamic _onClickTermsOfUse();
+	  -dynamic _onClickPrivacyPolicy()
 	]
 	
-	[StudyController]o-[&lt;abstract&gt;INotificationService]
-	[StudyController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyController]
+	[SignupForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
 	
-	[&lt;abstract&gt;IStudyAppBarViewModel
+	[AuthScaffold
 	  |
-	  +isSyncIndicatorVisible: bool;
-	  +isStatusBadgeVisible: bool;
-	  +isPublishVisible: bool
+	  +body: Widget;
+	  +formKey: AuthFormKey;
+	  +leftContentMinWidth: double;
+	  +leftPanelMinWidth: double;
+	  +leftPanelPadding: EdgeInsets
 	]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
+	[AuthScaffold]o-[&lt;abstract&gt;Widget]
+	[AuthScaffold]o-[AuthFormKey]
+	[AuthScaffold]o-[EdgeInsets]
 	
-	[StudyScaffold
+	[EmailTextField
 	  |
-	  +studyId: String;
-	  +tabs: List&lt;NavbarTab&gt;?;
-	  +tabsSubnav: List&lt;NavbarTab&gt;?;
-	  +selectedTab: NavbarTab?;
-	  +selectedTabSubnav: NavbarTab?;
-	  +body: StudyPageWidget;
-	  +drawer: Widget?;
-	  +disableActions: bool;
-	  +actionsSpacing: double;
-	  +actionsPadding: double;
-	  +layoutType: SingleColumnLayoutType?;
-	  +appbarHeight: double;
-	  +appbarSubnavHeight: double
+	  +labelText: String;
+	  +hintText: String?;
+	  +formControlName: String?;
+	  +formControl: FormControl&lt;dynamic&gt;?
 	]
 	
-	[StudyScaffold]o-[NavbarTab]
-	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
-	[StudyScaffold]o-[&lt;abstract&gt;Widget]
-	[StudyScaffold]o-[SingleColumnLayoutType]
+	[EmailTextField]o-[FormControl]
 	
-	[PreviewFrame
+	[PasswordTextField
 	  |
-	  +studyId: String;
-	  +routeArgs: StudyFormRouteArgs?;
-	  +route: String?
+	  +labelText: String;
+	  +hintText: String?;
+	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
+	  +formControlName: String?;
+	  +formControl: FormControl&lt;dynamic&gt;?
 	]
 	
-	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
+	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
+	[PasswordTextField]o-[FormControl]
 	
-	[RouteInformation
-	  |
-	  +route: String?;
-	  +extra: String?;
-	  +cmd: String?;
-	  +data: String?
+	[StudyUJobsToBeDone
 	  |
-	  +String toString()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;PlatformController
+	[AuthFormController
 	  |
-	  +studyId: String;
-	  +baseSrc: String;
-	  +previewSrc: String;
-	  +routeInformation: RouteInformation;
-	  +frameWidget: Widget
+	  +authRepository: IAuthRepository;
+	  +notificationService: INotificationService;
+	  +router: GoRouter;
+	  +emailControl: FormControl&lt;String&gt;;
+	  +passwordControl: FormControl&lt;String&gt;;
+	  +passwordConfirmationControl: FormControl&lt;String&gt;;
+	  +termsOfServiceControl: FormControl&lt;bool&gt;;
+	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
+	  +loginForm: FormGroup;
+	  +signupForm: FormGroup;
+	  +passwordForgotForm: FormGroup;
+	  +passwordRecoveryForm: FormGroup;
+	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
+	  -_formKey: AuthFormKey;
+	  +formKey: AuthFormKey;
+	  +form: FormGroup
 	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void listen();
-	  +void send();
-	  +void openNewPage()
+	  -dynamic _getFormFor();
+	  -dynamic _onChangeFormKey();
+	  +dynamic resetControlsFor();
+	  -dynamic _forceValidationMessages();
+	  +dynamic signUp();
+	  -dynamic _signUp();
+	  +dynamic signIn();
+	  -dynamic _signInWith();
+	  +dynamic signOut();
+	  +dynamic resetPasswordForEmail();
+	  +dynamic sendPasswordResetLink();
+	  +dynamic recoverPassword();
+	  +dynamic updateUser();
+	  -dynamic _readDebugUser()
 	]
 	
-	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
-	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
+	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
+	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
+	[AuthFormController]o-[GoRouter]
+	[AuthFormController]o-[FormControl]
+	[AuthFormController]o-[FormGroup]
+	[AuthFormController]o-[AuthFormKey]
+	[&lt;abstract&gt;IFormGroupController]&lt;:--[AuthFormController]
 	
-	[WebController
-	  |
-	  +iFrameElement: IFrameElement
+	[AuthFormKey
 	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void openNewPage();
-	  +void listen();
-	  +void send()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;AuthFormKey&gt;;
+	  &lt;static&gt;+login: AuthFormKey;
+	  &lt;static&gt;+signup: AuthFormKey;
+	  &lt;static&gt;+passwordForgot: AuthFormKey;
+	  &lt;static&gt;+passwordRecovery: AuthFormKey;
+	  &lt;static&gt;-_loginSubmit: AuthFormKey;
+	  &lt;static&gt;-_signupSubmit: AuthFormKey
 	]
 	
-	[WebController]o-[IFrameElement]
-	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
+	[AuthFormKey]o-[AuthFormKey]
+	[Enum]&lt;:--[AuthFormKey]
 	
-	[MobileController
+	[AppStatus
 	  |
-	  +void openNewPage();
-	  +void refresh();
-	  +void registerViews();
-	  +void listen();
-	  +void send();
-	  +void navigate();
-	  +void activate();
-	  +void generateUrl()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
+	  &lt;static&gt;+initializing: AppStatus;
+	  &lt;static&gt;+initialized: AppStatus
 	]
 	
-	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
+	[AppStatus]o-[AppStatus]
+	[Enum]&lt;:--[AppStatus]
 	
-	[StudyParticipationBadge
+	[FormArrayTable
 	  |
-	  +participation: Participation;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +center: bool
+	  +control: AbstractControl&lt;dynamic&gt;;
+	  +items: List&lt;T&gt;;
+	  +onSelectItem: void Function(T);
+	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
+	  +onNewItem: void Function()?;
+	  +rowTitle: String Function(T);
+	  +onNewItemLabel: String;
+	  +sectionTitle: String?;
+	  +sectionDescription: String?;
+	  +emptyIcon: IconData?;
+	  +emptyTitle: String?;
+	  +emptyDescription: String?;
+	  +sectionTitleDivider: bool?;
+	  +rowPrefix: Widget Function(BuildContext, T, int)?;
+	  +rowSuffix: Widget Function(BuildContext, T, int)?;
+	  +leadingWidget: Widget?;
+	  +itemsSectionPadding: EdgeInsets?;
+	  +hideLeadingTrailingWhenEmpty: bool;
+	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
 	  |
-	  +Widget build()
+	  +Widget build();
+	  -List&lt;Widget&gt; _buildRow();
+	  -Widget _newItemButton()
 	]
 	
-	[StudyParticipationBadge]o-[Participation]
-	[StudyParticipationBadge]o-[BadgeType]
+	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
+	[FormArrayTable]o-[void Function(T)]
+	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
+	[FormArrayTable]o-[void Function()?]
+	[FormArrayTable]o-[String Function(T)]
+	[FormArrayTable]o-[IconData]
+	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
+	[FormArrayTable]o-[&lt;abstract&gt;Widget]
+	[FormArrayTable]o-[EdgeInsets]
 	
-	[StudyTestScreen
-	  |
-	  +previewRoute: String?
+	[&lt;abstract&gt;ManagedFormViewModel
 	  |
-	  +Widget build();
-	  +Widget? banner();
-	  +dynamic load();
-	  +dynamic save();
-	  +dynamic showHelp()
+	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
 	
-	[TestAppRoutes
-	  |
-	  &lt;static&gt;+studyOverview: String;
-	  &lt;static&gt;+eligibility: String;
-	  &lt;static&gt;+intervention: String;
-	  &lt;static&gt;+consent: String;
-	  &lt;static&gt;+journey: String;
-	  &lt;static&gt;+dashboard: String
+	[FormViewModelNotFoundException
 	]
 	
-	[&lt;abstract&gt;IStudyNavViewModel
-	  |
-	  +isEditTabEnabled: bool;
-	  +isTestTabEnabled: bool;
-	  +isRecruitTabEnabled: bool;
-	  +isMonitorTabEnabled: bool;
-	  +isAnalyzeTabEnabled: bool;
-	  +isSettingsEnabled: bool
-	]
+	[Exception]&lt;:--[FormViewModelNotFoundException]
 	
-	[StudyNav
+	[FormViewModelCollection
 	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic edit();
-	  &lt;static&gt;+dynamic test();
-	  &lt;static&gt;+dynamic recruit();
-	  &lt;static&gt;+dynamic monitor();
-	  &lt;static&gt;+dynamic analyze()
-	]
-	
-	[StudyDesignNav
+	  +formViewModels: List&lt;T&gt;;
+	  +formArray: FormArray&lt;dynamic&gt;;
+	  +stagedViewModels: List&lt;T&gt;;
+	  +retrievableViewModels: List&lt;T&gt;;
+	  +formData: List&lt;D&gt;
 	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic info();
-	  &lt;static&gt;+dynamic enrollment();
-	  &lt;static&gt;+dynamic interventions();
-	  &lt;static&gt;+dynamic measurements();
-	  &lt;static&gt;+dynamic reports()
+	  +void add();
+	  +T remove();
+	  +T? findWhere();
+	  +T? removeWhere();
+	  +bool contains();
+	  +void stage();
+	  +T commit();
+	  +void reset();
+	  +void read()
 	]
 	
-	[StudyTestController
+	[FormViewModelCollection]o-[FormArray]
+	
+	[CustomFormControl
 	  |
-	  +authRepository: IAuthRepository;
-	  +languageCode: String
+	  -_onValueChangedDebouncer: Debouncer?;
+	  -_onStatusChangedDebouncer: Debouncer?;
+	  +onValueChanged: void Function(T?)?;
+	  +onStatusChanged: void Function(ControlStatus)?;
+	  +onStatusChangedDebounceTime: int?;
+	  +onValueChangedDebounceTime: int?
+	  |
+	  +void dispose()
 	]
 	
-	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyBaseController]&lt;:-[StudyTestController]
+	[CustomFormControl]o-[Debouncer]
+	[CustomFormControl]o-[void Function(T?)?]
+	[CustomFormControl]o-[void Function(ControlStatus)?]
+	[FormControl]&lt;:-[CustomFormControl]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel
+	[UnsavedChangesDialog
 	  |
-	  +studyParticipation: Participation?;
-	  +studyStatus: StudyStatus?
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
+	[&lt;abstract&gt;FormValidationSetEnum
+	]
 	
-	[StudyStatusBadge
+	[FormControlValidation
 	  |
-	  +participation: Participation?;
-	  +status: StudyStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
+	  +control: AbstractControl&lt;dynamic&gt;;
+	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
+	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
+	  +validationMessages: Map&lt;String, String Function(Object)&gt;
 	  |
-	  +Widget build()
+	  +FormControlValidation merge()
 	]
 	
-	[StudyStatusBadge]o-[Participation]
-	[StudyStatusBadge]o-[StudyStatus]
-	[StudyStatusBadge]o-[BadgeType]
+	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
 	
-	[FrameControlsWidget
+	[&lt;abstract&gt;IFormData
 	  |
-	  +onRefresh: void Function()?;
-	  +onOpenNewTab: void Function()?;
-	  +enabled: bool
+	  +id: String
 	  |
-	  +Widget build()
+	  +IFormData copy()
 	]
 	
-	[FrameControlsWidget]o-[void Function()?]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
+	[FormInvalidException
+	]
 	
-	[StudySettingsDialog
+	[Exception]&lt;:--[FormInvalidException]
+	
+	[FormConfigException
 	  |
-	  +Widget build()
+	  +message: String?
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
+	[Exception]&lt;:--[FormConfigException]
 	
-	[StudySettingsFormViewModel
+	[&lt;abstract&gt;IFormViewModelDelegate
 	  |
-	  +study: AsyncValue&lt;Study&gt;;
-	  +studyRepository: IStudyRepository;
-	  &lt;static&gt;+defaultPublishedToRegistry: bool;
-	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
-	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
-	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +dynamic onSave();
+	  +void onCancel()
+	]
+	
+	[&lt;abstract&gt;IFormGroupController
 	  |
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +dynamic keepControlsSynced();
-	  +dynamic save();
-	  +dynamic setLaunchDefaults()
+	  +form: FormGroup
 	]
 	
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudySettingsFormViewModel]o-[FormControl]
-	[StudySettingsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
+	[&lt;abstract&gt;IFormGroupController]o-[FormGroup]
 	
-	[StudyBaseController
-	  |
-	  +studyId: String;
-	  +studyRepository: IStudyRepository;
-	  +router: GoRouter;
-	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
+	[FormControlOption
 	  |
-	  +dynamic subscribeStudy();
-	  +dynamic onStudySubscriptionUpdate();
-	  +dynamic onStudySubscriptionError();
-	  +void dispose()
+	  +value: T;
+	  +label: String;
+	  +description: String?;
+	  +props: List&lt;Object?&gt;
 	]
 	
-	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyBaseController]o-[GoRouter]
-	[StudyBaseController]o-[StreamSubscription]
+	[&lt;abstract&gt;Equatable]&lt;:-[FormControlOption]
 	
-	[&lt;abstract&gt;StudyPageWidget
+	[&lt;abstract&gt;FormViewModel
 	  |
-	  +studyId: String
+	  -_formData: T?;
+	  -_formMode: FormMode;
+	  -_validationSet: FormValidationSetEnum?;
+	  +delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?;
+	  +autosave: bool;
+	  -_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;;
+	  -_immediateFormChildrenListenerDebouncer: Debouncer?;
+	  -_autosaveOperation: CancelableOperation&lt;dynamic&gt;?;
+	  -_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;;
+	  +prevFormValue: Map&lt;String, dynamic&gt;?;
+	  &lt;static&gt;-_formKey: String;
+	  +formData: T?;
+	  +formMode: FormMode;
+	  +isReadonly: bool;
+	  +validationSet: FormValidationSetEnum?;
+	  +isDirty: bool;
+	  +title: String;
+	  +isValid: bool;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;
 	  |
-	  +Widget? banner()
+	  -dynamic _setFormData();
+	  -dynamic _rememberDefaultControlValidators();
+	  -Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators();
+	  -dynamic _disableAllControls();
+	  -dynamic _formModeUpdated();
+	  -dynamic _restoreControlsFromFormData();
+	  +void revalidate();
+	  -void _applyValidationSet();
+	  +void read();
+	  +dynamic save();
+	  +dynamic cancel();
+	  +void enableAutosave();
+	  +void listenToImmediateFormChildren();
+	  +dynamic markFormGroupChanged();
+	  +void dispose();
+	  +void setControlsFrom();
+	  +T buildFormData();
+	  +void initControls()
 	]
 	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
-	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
+	[&lt;abstract&gt;FormViewModel]o-[FormMode]
+	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;FormValidationSetEnum]
+	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;IFormViewModelDelegate]
+	[&lt;abstract&gt;FormViewModel]o-[Debouncer]
+	[&lt;abstract&gt;FormViewModel]o-[CancelableOperation]
+	[&lt;abstract&gt;IFormGroupController]&lt;:--[&lt;abstract&gt;FormViewModel]
 	
-	[AppStatus
+	[FormMode
 	  |
 	  +index: int;
-	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
-	  &lt;static&gt;+initializing: AppStatus;
-	  &lt;static&gt;+initialized: AppStatus
+	  &lt;static&gt;+values: List&lt;FormMode&gt;;
+	  &lt;static&gt;+create: FormMode;
+	  &lt;static&gt;+readonly: FormMode;
+	  &lt;static&gt;+edit: FormMode
 	]
 	
-	[AppStatus]o-[AppStatus]
-	[Enum]&lt;:--[AppStatus]
+	[FormMode]o-[FormMode]
+	[Enum]&lt;:--[FormMode]
 	
-	[&lt;abstract&gt;IAppDelegate
+	[EnrolledBadge
 	  |
-	  +dynamic onAppStart()
+	  +enrolledCount: int
+	  |
+	  +Widget build()
 	]
 	
-	[AppController
+	[StudyRecruitController
 	  |
-	  +appDelegates: List&lt;IAppDelegate&gt;;
-	  -_delayedFuture: dynamic;
-	  +isInitialized: dynamic
+	  +inviteCodeRepository: IInviteCodeRepository;
+	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
 	  |
-	  +dynamic onAppStart();
-	  -dynamic _callDelegates()
+	  -dynamic _subscribeInvites();
+	  +Intervention? getIntervention();
+	  +int getParticipantCountForInvite();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void dispose()
 	]
 	
-	[App
-	]
+	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
+	[StudyRecruitController]o-[StreamSubscription]
+	[StudyBaseController]&lt;:-[StudyRecruitController]
+	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
 	
-	[AppContent
+	[StudyRecruitScreen
+	  |
+	  +Widget build();
+	  -Widget _inviteCodesSectionHeader();
+	  -Widget _newInviteCodeButton();
+	  -dynamic _onSelectInvite()
 	]
 	
-	[AuthFormController
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
+	
+	[InviteCodeFormView
 	  |
-	  +authRepository: IAuthRepository;
-	  +notificationService: INotificationService;
-	  +router: GoRouter;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +passwordControl: FormControl&lt;String&gt;;
-	  +passwordConfirmationControl: FormControl&lt;String&gt;;
-	  +termsOfServiceControl: FormControl&lt;bool&gt;;
-	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +loginForm: FormGroup;
-	  +signupForm: FormGroup;
-	  +passwordForgotForm: FormGroup;
-	  +passwordRecoveryForm: FormGroup;
-	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  -_formKey: AuthFormKey;
-	  +formKey: AuthFormKey;
-	  +form: FormGroup
+	  +formViewModel: InviteCodeFormViewModel
 	  |
-	  -dynamic _getFormFor();
-	  -dynamic _onChangeFormKey();
-	  +dynamic resetControlsFor();
-	  -dynamic _forceValidationMessages();
-	  +dynamic signUp();
-	  -dynamic _signUp();
-	  +dynamic signIn();
-	  -dynamic _signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic sendPasswordResetLink();
-	  +dynamic recoverPassword();
-	  +dynamic updateUser();
-	  -dynamic _readDebugUser()
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
 	]
 	
-	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
-	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
-	[AuthFormController]o-[GoRouter]
-	[AuthFormController]o-[FormControl]
-	[AuthFormController]o-[FormGroup]
-	[AuthFormController]o-[AuthFormKey]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[AuthFormController]
+	[InviteCodeFormView]o-[InviteCodeFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
 	
-	[AuthFormKey
+	[StudyInvitesTable
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AuthFormKey&gt;;
-	  &lt;static&gt;+login: AuthFormKey;
-	  &lt;static&gt;+signup: AuthFormKey;
-	  &lt;static&gt;+passwordForgot: AuthFormKey;
-	  &lt;static&gt;+passwordRecovery: AuthFormKey;
-	  &lt;static&gt;-_loginSubmit: AuthFormKey;
-	  &lt;static&gt;-_signupSubmit: AuthFormKey
+	  +invites: List&lt;StudyInvite&gt;;
+	  +onSelect: void Function(StudyInvite);
+	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
+	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
+	  +getIntervention: Intervention? Function(String);
+	  +getParticipantCountForInvite: int Function(StudyInvite)
+	  |
+	  +Widget build();
+	  -List&lt;Widget&gt; _buildRow()
 	]
 	
-	[AuthFormKey]o-[AuthFormKey]
-	[Enum]&lt;:--[AuthFormKey]
+	[StudyInvitesTable]o-[void Function(StudyInvite)]
+	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
+	[StudyInvitesTable]o-[Intervention? Function(String)]
+	[StudyInvitesTable]o-[int Function(StudyInvite)]
 	
-	[PasswordRecoveryForm
+	[InviteCodeFormViewModel
 	  |
-	  +formKey: AuthFormKey
+	  +study: Study;
+	  +inviteCodeRepository: IInviteCodeRepository;
+	  +codeControl: FormControl&lt;String&gt;;
+	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
+	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
+	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
+	  +interventionAControl: FormControl&lt;String&gt;;
+	  +interventionBControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
+	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
+	  +isPreconfiguredSchedule: bool;
+	  +preconfiguredSchedule: List&lt;String&gt;?
 	  |
-	  +Widget build()
+	  +void initControls();
+	  -dynamic _uniqueInviteCode();
+	  +void regenerateCode();
+	  -String _generateCode();
+	  +StudyInvite buildFormData();
+	  +void setControlsFrom();
+	  +dynamic save()
 	]
 	
-	[PasswordRecoveryForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
+	[InviteCodeFormViewModel]o-[Study]
+	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
+	[InviteCodeFormViewModel]o-[FormControl]
+	[InviteCodeFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
 	
-	[PasswordForgotForm
-	  |
-	  +formKey: AuthFormKey
+	[PublishSuccessDialog
 	  |
 	  +Widget build()
 	]
 	
-	[PasswordForgotForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
 	
-	[LoginForm
-	  |
-	  +formKey: AuthFormKey
+	[PublishDialog
 	  |
 	  +Widget build()
 	]
 	
-	[LoginForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
 	
-	[EmailTextField
+	[PublishConfirmationDialog
 	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
+	  +Widget build()
 	]
 	
-	[EmailTextField]o-[FormControl]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
 	
-	[PasswordTextField
+	[FrameControlsWidget
 	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
+	  +onRefresh: void Function()?;
+	  +onOpenNewTab: void Function()?;
+	  +enabled: bool
+	  |
+	  +Widget build()
 	]
 	
-	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
-	[PasswordTextField]o-[FormControl]
+	[FrameControlsWidget]o-[void Function()?]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
 	
-	[SignupForm
-	  |
-	  +formKey: AuthFormKey
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel
 	  |
-	  +Widget build();
-	  -dynamic _onClickTermsOfUse();
-	  -dynamic _onClickPrivacyPolicy()
+	  +studyParticipation: Participation?;
+	  +studyStatus: StudyStatus?
 	]
 	
-	[SignupForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
 	
-	[StudyUJobsToBeDone
+	[StudyStatusBadge
+	  |
+	  +participation: Participation?;
+	  +status: StudyStatus?;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +showTooltip: bool
 	  |
 	  +Widget build()
 	]
 	
-	[AuthScaffold
+	[StudyStatusBadge]o-[Participation]
+	[StudyStatusBadge]o-[StudyStatus]
+	[StudyStatusBadge]o-[BadgeType]
+	
+	[RouteInformation
 	  |
-	  +body: Widget;
-	  +formKey: AuthFormKey;
-	  +leftContentMinWidth: double;
-	  +leftPanelMinWidth: double;
-	  +leftPanelPadding: EdgeInsets
+	  +route: String?;
+	  +extra: String?;
+	  +cmd: String?;
+	  +data: String?
+	  |
+	  +String toString()
 	]
 	
-	[AuthScaffold]o-[&lt;abstract&gt;Widget]
-	[AuthScaffold]o-[AuthFormKey]
-	[AuthScaffold]o-[EdgeInsets]
-	
-	[PublishDialog
+	[&lt;abstract&gt;PlatformController
 	  |
-	  +Widget build()
+	  +studyId: String;
+	  +baseSrc: String;
+	  +previewSrc: String;
+	  +routeInformation: RouteInformation;
+	  +frameWidget: Widget
+	  |
+	  +void activate();
+	  +void registerViews();
+	  +void generateUrl();
+	  +void navigate();
+	  +void refresh();
+	  +void listen();
+	  +void send();
+	  +void openNewPage()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
+	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
+	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
 	
-	[PublishSuccessDialog
+	[WebController
 	  |
-	  +Widget build()
+	  +iFrameElement: IFrameElement
+	  |
+	  +void activate();
+	  +void registerViews();
+	  +void generateUrl();
+	  +void navigate();
+	  +void refresh();
+	  +void openNewPage();
+	  +void listen();
+	  +void send()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
+	[WebController]o-[IFrameElement]
+	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
 	
-	[PublishConfirmationDialog
+	[MobileController
 	  |
-	  +Widget build()
+	  +void openNewPage();
+	  +void refresh();
+	  +void registerViews();
+	  +void listen();
+	  +void send();
+	  +void navigate();
+	  +void activate();
+	  +void generateUrl()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
+	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
 	
-	[FormArrayTable
+	[StudyController
 	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +items: List&lt;T&gt;;
-	  +onSelectItem: void Function(T);
-	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
-	  +onNewItem: void Function()?;
-	  +rowTitle: String Function(T);
-	  +onNewItemLabel: String;
-	  +sectionTitle: String?;
-	  +sectionDescription: String?;
-	  +emptyIcon: IconData?;
-	  +emptyTitle: String?;
-	  +emptyDescription: String?;
-	  +sectionTitleDivider: bool?;
-	  +rowPrefix: Widget Function(BuildContext, T, int)?;
-	  +rowSuffix: Widget Function(BuildContext, T, int)?;
-	  +leadingWidget: Widget?;
-	  +itemsSectionPadding: EdgeInsets?;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
+	  +notificationService: INotificationService;
+	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
+	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
 	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow();
-	  -Widget _newItemButton()
+	  +dynamic syncStudyStatus();
+	  +dynamic onStudySubscriptionUpdate();
+	  -dynamic _redirectNewToActualStudyID();
+	  +dynamic publishStudy();
+	  +void onChangeStudyParticipation();
+	  +void onAddParticipants();
+	  +void onSettingsPressed();
+	  +void dispose()
 	]
 	
-	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
-	[FormArrayTable]o-[void Function(T)]
-	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
-	[FormArrayTable]o-[void Function()?]
-	[FormArrayTable]o-[String Function(T)]
-	[FormArrayTable]o-[IconData]
-	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
-	[FormArrayTable]o-[&lt;abstract&gt;Widget]
-	[FormArrayTable]o-[EdgeInsets]
+	[StudyController]o-[&lt;abstract&gt;INotificationService]
+	[StudyController]o-[StreamSubscription]
+	[StudyBaseController]&lt;:-[StudyController]
 	
-	[&lt;abstract&gt;IFormData
-	  |
-	  +id: String
+	[&lt;abstract&gt;IStudyNavViewModel
 	  |
-	  +IFormData copy()
+	  +isEditTabEnabled: bool;
+	  +isTestTabEnabled: bool;
+	  +isRecruitTabEnabled: bool;
+	  +isMonitorTabEnabled: bool;
+	  +isAnalyzeTabEnabled: bool;
+	  +isSettingsEnabled: bool
 	]
 	
-	[&lt;abstract&gt;ManagedFormViewModel
+	[StudyNav
 	  |
-	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
+	  &lt;static&gt;+dynamic tabs();
+	  &lt;static&gt;+dynamic edit();
+	  &lt;static&gt;+dynamic test();
+	  &lt;static&gt;+dynamic recruit();
+	  &lt;static&gt;+dynamic monitor();
+	  &lt;static&gt;+dynamic analyze()
 	]
 	
-	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
-	
-	[FormViewModelNotFoundException
+	[StudyDesignNav
+	  |
+	  &lt;static&gt;+dynamic tabs();
+	  &lt;static&gt;+dynamic info();
+	  &lt;static&gt;+dynamic enrollment();
+	  &lt;static&gt;+dynamic interventions();
+	  &lt;static&gt;+dynamic measurements();
+	  &lt;static&gt;+dynamic reports()
 	]
 	
-	[Exception]&lt;:--[FormViewModelNotFoundException]
-	
-	[FormViewModelCollection
+	[&lt;abstract&gt;StudyPageWidget
 	  |
-	  +formViewModels: List&lt;T&gt;;
-	  +formArray: FormArray&lt;dynamic&gt;;
-	  +stagedViewModels: List&lt;T&gt;;
-	  +retrievableViewModels: List&lt;T&gt;;
-	  +formData: List&lt;D&gt;
+	  +studyId: String
 	  |
-	  +void add();
-	  +T remove();
-	  +T? findWhere();
-	  +T? removeWhere();
-	  +bool contains();
-	  +void stage();
-	  +T commit();
-	  +void reset();
-	  +void read()
-	]
-	
-	[FormViewModelCollection]o-[FormArray]
-	
-	[FormInvalidException
+	  +Widget? banner()
 	]
 	
-	[Exception]&lt;:--[FormInvalidException]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
+	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
 	
-	[FormConfigException
+	[StudyParticipationBadge
 	  |
-	  +message: String?
+	  +participation: Participation;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +center: bool
+	  |
+	  +Widget build()
 	]
 	
-	[Exception]&lt;:--[FormConfigException]
+	[StudyParticipationBadge]o-[Participation]
+	[StudyParticipationBadge]o-[BadgeType]
 	
-	[&lt;abstract&gt;IFormViewModelDelegate
+	[StudyBaseController
 	  |
-	  +dynamic onSave();
-	  +void onCancel()
-	]
-	
-	[&lt;abstract&gt;IFormGroupController
+	  +studyId: String;
+	  +studyRepository: IStudyRepository;
+	  +router: GoRouter;
+	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
 	  |
-	  +form: FormGroup
+	  +dynamic subscribeStudy();
+	  +dynamic onStudySubscriptionUpdate();
+	  +dynamic onStudySubscriptionError();
+	  +void dispose()
 	]
 	
-	[&lt;abstract&gt;IFormGroupController]o-[FormGroup]
+	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
+	[StudyBaseController]o-[GoRouter]
+	[StudyBaseController]o-[StreamSubscription]
 	
-	[FormControlOption
+	[PreviewFrame
 	  |
-	  +value: T;
-	  +label: String;
-	  +description: String?;
-	  +props: List&lt;Object?&gt;
+	  +studyId: String;
+	  +routeArgs: StudyFormRouteArgs?;
+	  +route: String?
 	]
 	
-	[&lt;abstract&gt;Equatable]&lt;:-[FormControlOption]
+	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
 	
-	[&lt;abstract&gt;FormViewModel
-	  |
-	  -_formData: T?;
-	  -_formMode: FormMode;
-	  -_validationSet: FormValidationSetEnum?;
-	  +delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?;
-	  +autosave: bool;
-	  -_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;;
-	  -_immediateFormChildrenListenerDebouncer: Debouncer?;
-	  -_autosaveOperation: CancelableOperation&lt;dynamic&gt;?;
-	  -_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  +prevFormValue: Map&lt;String, dynamic&gt;?;
-	  &lt;static&gt;-_formKey: String;
-	  +formData: T?;
-	  +formMode: FormMode;
-	  +isReadonly: bool;
-	  +validationSet: FormValidationSetEnum?;
-	  +isDirty: bool;
-	  +title: String;
-	  +isValid: bool;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;
+	[&lt;abstract&gt;IStudyAppBarViewModel
 	  |
-	  -dynamic _setFormData();
-	  -dynamic _rememberDefaultControlValidators();
-	  -Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators();
-	  -dynamic _disableAllControls();
-	  -dynamic _formModeUpdated();
-	  -dynamic _restoreControlsFromFormData();
-	  +void revalidate();
-	  -void _applyValidationSet();
-	  +void read();
-	  +dynamic save();
-	  +dynamic cancel();
-	  +void enableAutosave();
-	  +void listenToImmediateFormChildren();
-	  +dynamic markFormGroupChanged();
-	  +void dispose();
-	  +void setControlsFrom();
-	  +T buildFormData();
-	  +void initControls()
+	  +isSyncIndicatorVisible: bool;
+	  +isStatusBadgeVisible: bool;
+	  +isPublishVisible: bool
 	]
 	
-	[&lt;abstract&gt;FormViewModel]o-[FormMode]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;FormValidationSetEnum]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;IFormViewModelDelegate]
-	[&lt;abstract&gt;FormViewModel]o-[Debouncer]
-	[&lt;abstract&gt;FormViewModel]o-[CancelableOperation]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[&lt;abstract&gt;FormViewModel]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
+	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
 	
-	[FormMode
+	[StudyScaffold
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;FormMode&gt;;
-	  &lt;static&gt;+create: FormMode;
-	  &lt;static&gt;+readonly: FormMode;
-	  &lt;static&gt;+edit: FormMode
+	  +studyId: String;
+	  +tabs: List&lt;NavbarTab&gt;?;
+	  +tabsSubnav: List&lt;NavbarTab&gt;?;
+	  +selectedTab: NavbarTab?;
+	  +selectedTabSubnav: NavbarTab?;
+	  +body: StudyPageWidget;
+	  +drawer: Widget?;
+	  +disableActions: bool;
+	  +actionsSpacing: double;
+	  +actionsPadding: double;
+	  +layoutType: SingleColumnLayoutType?;
+	  +appbarHeight: double;
+	  +appbarSubnavHeight: double
 	]
 	
-	[FormMode]o-[FormMode]
-	[Enum]&lt;:--[FormMode]
+	[StudyScaffold]o-[NavbarTab]
+	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
+	[StudyScaffold]o-[&lt;abstract&gt;Widget]
+	[StudyScaffold]o-[SingleColumnLayoutType]
 	
-	[CustomFormControl
+	[WebFrame
 	  |
-	  -_onValueChangedDebouncer: Debouncer?;
-	  -_onStatusChangedDebouncer: Debouncer?;
-	  +onValueChanged: void Function(T?)?;
-	  +onStatusChanged: void Function(ControlStatus)?;
-	  +onStatusChangedDebounceTime: int?;
-	  +onValueChangedDebounceTime: int?
+	  +previewSrc: String;
+	  +studyId: String
 	  |
-	  +void dispose()
+	  +Widget build()
 	]
 	
-	[CustomFormControl]o-[Debouncer]
-	[CustomFormControl]o-[void Function(T?)?]
-	[CustomFormControl]o-[void Function(ControlStatus)?]
-	[FormControl]&lt;:-[CustomFormControl]
-	
-	[UnsavedChangesDialog
+	[DisabledFrame
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;FormValidationSetEnum
-	]
-	
-	[FormControlValidation
-	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
-	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
-	  +validationMessages: Map&lt;String, String Function(Object)&gt;
+	[PhoneContainer
 	  |
-	  +FormControlValidation merge()
-	]
-	
-	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
-	
-	[ScreenerQuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultResponseOptionValidity: bool;
-	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
-	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
-	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
-	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionValues: List&lt;dynamic&gt;;
-	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isDirtyOptionsBannerVisible: bool
+	  &lt;static&gt;+defaultWidth: double;
+	  &lt;static&gt;+defaultHeight: double;
+	  +width: double;
+	  +height: double;
+	  +borderColor: Color;
+	  +borderWidth: double;
+	  +borderRadius: double;
+	  +innerContent: Widget;
+	  +innerContentBackgroundColor: Color?
 	  |
-	  +dynamic onResponseOptionsChanged();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
-	  +ScreenerQuestionFormViewModel createDuplicate()
+	  +Widget build()
 	]
 	
-	[ScreenerQuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
+	[PhoneContainer]o-[Color]
+	[PhoneContainer]o-[&lt;abstract&gt;Widget]
 	
-	[StudyDesignEnrollmentFormView
+	[MobileFrame
 	  |
-	  +Widget build();
-	  -dynamic _showScreenerQuestionSidesheetWithArgs();
-	  -dynamic _showConsentItemSidesheetWithArgs()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
-	
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
+	[DesktopFrame
 	  |
-	  +isDirtyOptionsBannerVisible: bool
+	  +Widget build()
 	]
 	
-	[ScreenerQuestionLogicFormView
+	[StudyTestScreen
 	  |
-	  +formViewModel: ScreenerQuestionFormViewModel
+	  +previewRoute: String?
 	  |
 	  +Widget build();
-	  -dynamic _buildInfoBanner();
-	  -dynamic _buildAnswerOptionsLogicControls();
-	  -List&lt;Widget&gt; _buildOptionLogicRow()
+	  +Widget? banner();
+	  +dynamic load();
+	  +dynamic save();
+	  +dynamic showHelp()
 	]
 	
-	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
 	
-	[ConsentItemFormData
+	[StudySettingsFormViewModel
 	  |
-	  +consentId: String;
-	  +title: String;
-	  +description: String;
-	  +iconName: String?;
-	  +id: String
+	  +study: AsyncValue&lt;Study&gt;;
+	  +studyRepository: IStudyRepository;
+	  &lt;static&gt;+defaultPublishedToRegistry: bool;
+	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
+	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
+	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +ConsentItem toConsentItem();
-	  +ConsentItemFormData copy()
+	  +void setControlsFrom();
+	  +Study buildFormData();
+	  +dynamic keepControlsSynced();
+	  +dynamic save();
+	  +dynamic setLaunchDefaults()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
+	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
+	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
+	[StudySettingsFormViewModel]o-[FormControl]
+	[StudySettingsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
 	
-	[EnrollmentFormViewModel
+	[StudySettingsDialog
 	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
-	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
-	  +consentItemArray: FormArray&lt;dynamic&gt;;
-	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +form: FormGroup;
-	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
-	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestScreener: bool;
-	  +canTestConsent: bool;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  +Widget build()
+	]
+	
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
+	
+	[StudyTestController
 	  |
-	  +void setControlsFrom();
-	  +EnrollmentFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
-	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
-	  +dynamic testScreener();
-	  +dynamic testConsent();
-	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
+	  +authRepository: IAuthRepository;
+	  +languageCode: String
 	]
 	
-	[EnrollmentFormViewModel]o-[Study]
-	[EnrollmentFormViewModel]o-[GoRouter]
-	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
-	[EnrollmentFormViewModel]o-[FormControl]
-	[EnrollmentFormViewModel]o-[FormArray]
-	[EnrollmentFormViewModel]o-[FormViewModelCollection]
-	[EnrollmentFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
+	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyBaseController]&lt;:-[StudyTestController]
 	
-	[EnrollmentFormConsentItemDelegate
+	[TestAppRoutes
 	  |
-	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +owner: EnrollmentFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
+	  &lt;static&gt;+studyOverview: String;
+	  &lt;static&gt;+eligibility: String;
+	  &lt;static&gt;+intervention: String;
+	  &lt;static&gt;+consent: String;
+	  &lt;static&gt;+journey: String;
+	  &lt;static&gt;+dashboard: String
+	]
+	
+	[DrawerEntry
 	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ConsentItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
+	  +localizedTitle: String Function();
+	  +icon: IconData?;
+	  +localizedHelpText: String Function()?;
+	  +enabled: bool;
+	  +onSelected: void Function(BuildContext, WidgetRef)?;
+	  +autoCloseDrawer: bool;
+	  +title: String;
+	  +helpText: String?
+	  |
+	  +void onClick()
 	]
 	
-	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
-	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[DrawerEntry]o-[String Function()]
+	[DrawerEntry]o-[IconData]
+	[DrawerEntry]o-[String Function()?]
+	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
 	
-	[ConsentItemFormViewModel
+	[GoRouterDrawerEntry
 	  |
-	  +consentIdControl: FormControl&lt;String&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +form: FormGroup;
-	  +consentId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +intent: RoutingIntent;
+	  +onNavigated: void Function()?
 	  |
-	  +void setControlsFrom();
-	  +ConsentItemFormData buildFormData();
-	  +ConsentItemFormViewModel createDuplicate()
+	  +void onClick()
 	]
 	
-	[ConsentItemFormViewModel]o-[FormControl]
-	[ConsentItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
+	[GoRouterDrawerEntry]o-[RoutingIntent]
+	[GoRouterDrawerEntry]o-[void Function()?]
+	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
 	
-	[ConsentItemFormView
+	[AppDrawer
 	  |
-	  +formViewModel: ConsentItemFormViewModel
+	  +width: int;
+	  +autoCloseDrawer: bool;
+	  +leftPaddingEntries: double;
+	  +logoPaddingVertical: double;
+	  +logoPaddingHorizontal: double;
+	  +logoMaxHeight: double;
+	  +logoSectionMinHeight: double;
+	  +logoSectionMaxHeight: double
 	]
 	
-	[ConsentItemFormView]o-[ConsentItemFormViewModel]
-	
-	[EnrollmentFormData
+	[StudyAnalyzeScreen
 	  |
-	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
-	  +enrollmentType: Participation;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
-	  +id: String
+	  +Widget? banner();
+	  +Widget build()
+	]
+	
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
+	
+	[StudyAnalyzeController
 	  |
-	  +Study apply();
-	  +EnrollmentFormData copy()
+	  +dynamic onExport()
 	]
 	
-	[EnrollmentFormData]o-[Participation]
-	[EnrollmentFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
+	[StudyBaseController]&lt;:-[StudyAnalyzeController]
 	
 	[StudyDesignInterventionsFormView
 	  |
@@ -924,84 +898,33 @@
 	
 	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
 	
-	[InterventionsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +interventionsArray: FormArray&lt;dynamic&gt;;
-	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
-	  +form: FormGroup;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +interventionsRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestStudySchedule: bool
+	[InterventionFormView
 	  |
-	  +void setControlsFrom();
-	  +InterventionsFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +InterventionFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +dynamic testStudySchedule()
+	  +formViewModel: InterventionFormViewModel
 	]
 	
-	[InterventionsFormViewModel]o-[Study]
-	[InterventionsFormViewModel]o-[GoRouter]
-	[InterventionsFormViewModel]o-[FormArray]
-	[InterventionsFormViewModel]o-[FormViewModelCollection]
-	[InterventionsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
+	[InterventionFormView]o-[InterventionFormViewModel]
 	
-	[InterventionFormViewModel
+	[InterventionPreview
 	  |
-	  +study: Study;
-	  +interventionIdControl: FormControl&lt;String&gt;;
-	  +interventionTitleControl: FormControl&lt;String&gt;;
-	  +interventionIconControl: FormControl&lt;IconOption&gt;;
-	  +interventionDescriptionControl: FormControl&lt;String&gt;;
-	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
-	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
-	  +form: FormGroup;
-	  +interventionId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneTask: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +routeArgs: InterventionFormRouteArgs
 	  |
-	  +void setControlsFrom();
-	  +InterventionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +InterventionTaskFormViewModel provide();
-	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
-	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
-	  +InterventionFormViewModel createDuplicate()
+	  +Widget build()
 	]
 	
-	[InterventionFormViewModel]o-[Study]
-	[InterventionFormViewModel]o-[FormControl]
-	[InterventionFormViewModel]o-[FormArray]
-	[InterventionFormViewModel]o-[FormViewModelCollection]
-	[InterventionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
+	[InterventionPreview]o-[InterventionFormRouteArgs]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
+	
+	[StudyScheduleFormView
+	  |
+	  +formViewModel: StudyScheduleControls
+	  |
+	  -FormTableRow _renderCustomSequence();
+	  +Widget build()
+	]
+	
+	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
 	
 	[InterventionTaskFormData
 	  |
@@ -1017,32 +940,42 @@
 	
 	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
 	
-	[StudyScheduleFormData
-	  |
-	  +sequenceType: PhaseSequence;
-	  +sequenceTypeCustom: String;
-	  +numCycles: int;
-	  +phaseDuration: int;
-	  +includeBaseline: bool;
-	  +id: String
-	  |
-	  +StudySchedule toStudySchedule();
-	  +Study apply();
-	  +StudyScheduleFormData copy()
-	]
-	
-	[StudyScheduleFormData]o-[PhaseSequence]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
-	
-	[InterventionPreview
+	[InterventionsFormViewModel
 	  |
-	  +routeArgs: InterventionFormRouteArgs
+	  +study: Study;
+	  +router: GoRouter;
+	  +interventionsArray: FormArray&lt;dynamic&gt;;
+	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
+	  +form: FormGroup;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +interventionsRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestStudySchedule: bool
 	  |
-	  +Widget build()
+	  +void setControlsFrom();
+	  +InterventionsFormData buildFormData();
+	  +void read();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +InterventionFormViewModel provide();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +dynamic testStudySchedule()
 	]
 	
-	[InterventionPreview]o-[InterventionFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
+	[InterventionsFormViewModel]o-[Study]
+	[InterventionsFormViewModel]o-[GoRouter]
+	[InterventionsFormViewModel]o-[FormArray]
+	[InterventionsFormViewModel]o-[FormViewModelCollection]
+	[InterventionsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
+	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
 	
 	[InterventionTaskFormViewModel
 	  |
@@ -1068,26 +1001,6 @@
 	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
 	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
 	
-	[InterventionsFormData
-	  |
-	  +interventionsData: List&lt;InterventionFormData&gt;;
-	  +studyScheduleData: StudyScheduleFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +InterventionsFormData copy()
-	]
-	
-	[InterventionsFormData]o-[StudyScheduleFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
-	
-	[InterventionFormView
-	  |
-	  +formViewModel: InterventionFormViewModel
-	]
-	
-	[InterventionFormView]o-[InterventionFormViewModel]
-	
 	[&lt;abstract&gt;StudyScheduleControls
 	  |
 	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
@@ -1118,13 +1031,6 @@
 	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
 	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
 	
-	[InterventionTaskFormView
-	  |
-	  +formViewModel: InterventionTaskFormViewModel
-	]
-	
-	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
-	
 	[InterventionFormData
 	  |
 	  +interventionId: String;
@@ -1141,235 +1047,257 @@
 	
 	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
 	
-	[StudyScheduleFormView
+	[StudyScheduleFormData
 	  |
-	  +formViewModel: StudyScheduleControls
+	  +sequenceType: PhaseSequence;
+	  +sequenceTypeCustom: String;
+	  +numCycles: int;
+	  +phaseDuration: int;
+	  +includeBaseline: bool;
+	  +id: String
 	  |
-	  -FormTableRow _renderCustomSequence();
-	  +Widget build()
+	  +StudySchedule toStudySchedule();
+	  +Study apply();
+	  +StudyScheduleFormData copy()
 	]
 	
-	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
+	[StudyScheduleFormData]o-[PhaseSequence]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
 	
-	[&lt;abstract&gt;IStudyFormData
+	[InterventionTaskFormView
 	  |
-	  +Study apply()
+	  +formViewModel: InterventionTaskFormViewModel
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
+	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
 	
-	[StudyInfoFormData
+	[InterventionsFormData
 	  |
-	  +title: String;
-	  +description: String?;
-	  +iconName: String;
-	  +contactInfoFormData: StudyContactInfoFormData;
+	  +interventionsData: List&lt;InterventionFormData&gt;;
+	  +studyScheduleData: StudyScheduleFormData;
 	  +id: String
 	  |
 	  +Study apply();
-	  +StudyInfoFormData copy()
+	  +InterventionsFormData copy()
 	]
 	
-	[StudyInfoFormData]o-[StudyContactInfoFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
+	[InterventionsFormData]o-[StudyScheduleFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
 	
-	[StudyContactInfoFormData
+	[InterventionFormViewModel
 	  |
-	  +organization: String?;
-	  +institutionalReviewBoard: String?;
-	  +institutionalReviewBoardNumber: String?;
-	  +researchers: String?;
-	  +email: String?;
-	  +website: String?;
-	  +phone: String?;
-	  +additionalInfo: String?;
-	  +id: String
+	  +study: Study;
+	  +interventionIdControl: FormControl&lt;String&gt;;
+	  +interventionTitleControl: FormControl&lt;String&gt;;
+	  +interventionIconControl: FormControl&lt;IconOption&gt;;
+	  +interventionDescriptionControl: FormControl&lt;String&gt;;
+	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
+	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
+	  +form: FormGroup;
+	  +interventionId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +atLeastOneTask: dynamic;
+	  +breadcrumbsTitle: String;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
+	  +void setControlsFrom();
+	  +InterventionFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +InterventionTaskFormViewModel provide();
+	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
+	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
+	  +InterventionFormViewModel createDuplicate()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
+	[InterventionFormViewModel]o-[Study]
+	[InterventionFormViewModel]o-[FormControl]
+	[InterventionFormViewModel]o-[FormArray]
+	[InterventionFormViewModel]o-[FormViewModelCollection]
+	[InterventionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
 	
-	[StudyDesignInfoFormView
+	[StudyDesignReportsFormView
 	  |
-	  +Widget build()
+	  +Widget build();
+	  -dynamic _showReportItemSidesheetWithArgs()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
 	
-	[StudyInfoFormViewModel
+	[ReportItemFormData
 	  |
-	  +study: Study;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +organizationControl: FormControl&lt;String&gt;;
-	  +reviewBoardControl: FormControl&lt;String&gt;;
-	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
-	  +researchersControl: FormControl&lt;String&gt;;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +websiteControl: FormControl&lt;String&gt;;
-	  +phoneControl: FormControl&lt;String&gt;;
-	  +additionalInfoControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +iconRequired: dynamic;
-	  +organizationRequired: dynamic;
-	  +reviewBoardRequired: dynamic;
-	  +reviewBoardNumberRequired: dynamic;
-	  +researchersRequired: dynamic;
-	  +emailRequired: dynamic;
-	  +phoneRequired: dynamic;
-	  +emailFormat: dynamic;
-	  +websiteFormat: dynamic
+	  +isPrimary: bool;
+	  +section: ReportSection;
+	  +id: String
 	  |
-	  +void setControlsFrom();
-	  +StudyInfoFormData buildFormData()
+	  &lt;static&gt;+dynamic fromDomainModel();
+	  +ReportItemFormData copy()
 	]
 	
-	[StudyInfoFormViewModel]o-[Study]
-	[StudyInfoFormViewModel]o-[FormControl]
-	[StudyInfoFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
+	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
+	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
 	
-	[MeasurementSurveyFormData
+	[DataReferenceEditor
 	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
+	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
+	  +availableTasks: List&lt;Task&gt;;
+	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
 	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
+	  +FormTableRow buildFormTableRow();
+	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
 	]
 	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
+	[DataReferenceEditor]o-[FormControl]
+	[DataReferenceEditor]o-[ReactiveDropdownField]
 	
-	[MeasurementSurveyFormView
+	[TemporalAggregationFormatted
 	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
+	  -_value: TemporalAggregation;
+	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
+	  +value: TemporalAggregation;
+	  +string: String;
+	  +icon: IconData?;
+	  +hashCode: int
+	  |
+	  +bool ==();
+	  +String toString();
+	  +String toJson();
+	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
 	]
 	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
+	[TemporalAggregationFormatted]o-[TemporalAggregation]
+	[TemporalAggregationFormatted]o-[IconData]
 	
-	[MeasurementSurveyFormViewModel
+	[ImprovementDirectionFormatted
 	  |
-	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
+	  -_value: ImprovementDirection;
+	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
+	  +value: ImprovementDirection;
+	  +string: String;
+	  +icon: IconData?;
+	  +hashCode: int
 	  |
-	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
+	  +bool ==();
+	  +String toString();
+	  +String toJson();
+	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
 	]
 	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
+	[ImprovementDirectionFormatted]o-[ImprovementDirection]
+	[ImprovementDirectionFormatted]o-[IconData]
 	
-	[SurveyPreview
+	[ReportSectionType
 	  |
-	  +routeArgs: MeasurementFormRouteArgs
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
+	  &lt;static&gt;+average: ReportSectionType;
+	  &lt;static&gt;+linearRegression: ReportSectionType
+	]
+	
+	[ReportSectionType]o-[ReportSectionType]
+	[Enum]&lt;:--[ReportSectionType]
+	
+	[AverageSectionFormView
+	  |
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
 	  |
 	  +Widget build()
 	]
 	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
+	[AverageSectionFormView]o-[ReportItemFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
 	
-	[StudyDesignMeasurementsFormView
+	[DataReferenceIdentifier
 	  |
-	  +Widget build()
+	  +hashCode: int
+	  |
+	  +bool ==()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
+	[DataReference]&lt;:-[DataReferenceIdentifier]
 	
-	[MeasurementsFormData
+	[LinearRegressionSectionFormView
 	  |
-	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
-	  +id: String
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
 	  |
-	  +Study apply();
-	  +MeasurementsFormData copy()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
+	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
 	
-	[MeasurementsFormViewModel
+	[ReportItemFormViewModel
 	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +measurementsArray: FormArray&lt;dynamic&gt;;
-	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
+	  &lt;static&gt;+defaultSectionType: ReportSectionType;
+	  +sectionIdControl: FormControl&lt;String&gt;;
+	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +sectionControl: FormControl&lt;ReportSection&gt;;
+	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
+	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
+	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
+	  +alphaControl: FormControl&lt;double&gt;;
+	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
 	  +form: FormGroup;
-	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
+	  +sectionId: String;
+	  +sectionType: ReportSectionType;
+	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
+	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
+	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;;
 	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +measurementRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +dataReferenceRequired: dynamic;
+	  +aggregationRequired: dynamic;
+	  +improvementDirectionRequired: dynamic;
+	  +alphaConfidenceRequired: dynamic
 	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +MeasurementsFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +MeasurementSurveyFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave()
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +ReportItemFormData buildFormData();
+	  +ReportItemFormViewModel createDuplicate();
+	  +dynamic onSectionTypeChanged();
+	  -void _updateFormControls();
+	  +void setControlsFrom()
 	]
 	
-	[MeasurementsFormViewModel]o-[Study]
-	[MeasurementsFormViewModel]o-[GoRouter]
-	[MeasurementsFormViewModel]o-[FormArray]
-	[MeasurementsFormViewModel]o-[FormViewModelCollection]
-	[MeasurementsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
+	[ReportItemFormViewModel]o-[ReportSectionType]
+	[ReportItemFormViewModel]o-[FormControl]
+	[ReportItemFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
 	
-	[StudyFormValidationSet
+	[ReportItemFormView
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: dynamic;
+	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
+	  |
+	  +Widget build();
+	  -dynamic _buildSectionText();
+	  -dynamic _buildSectionTypeHeader()
 	]
 	
-	[Enum]&lt;:--[StudyFormValidationSet]
+	[ReportItemFormView]o-[ReportItemFormViewModel]
+	[ReportItemFormView]o-[Widget Function(BuildContext)]
 	
 	[ReportsFormViewModel
 	  |
@@ -1426,332 +1354,526 @@
 	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
 	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
 	
-	[ReportItemFormData
+	[ReportBadge
 	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
-	  +id: String
+	  +status: ReportStatus?;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +showTooltip: bool
 	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
+	  +Widget build()
 	]
 	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
+	[ReportBadge]o-[ReportStatus]
+	[ReportBadge]o-[BadgeType]
 	
-	[ReportItemFormView
+	[ReportsFormData
 	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
+	  +reportItems: List&lt;ReportItemFormData&gt;;
+	  +id: String
 	  |
-	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
+	  +Study apply();
+	  +ReportsFormData copy()
 	]
 	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
 	
-	[ReportItemFormViewModel
-	  |
-	  &lt;static&gt;+defaultSectionType: ReportSectionType;
-	  +sectionIdControl: FormControl&lt;String&gt;;
-	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +sectionControl: FormControl&lt;ReportSection&gt;;
-	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
-	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
-	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
-	  +alphaControl: FormControl&lt;double&gt;;
-	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +form: FormGroup;
-	  +sectionId: String;
-	  +sectionType: ReportSectionType;
-	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
-	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
-	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +dataReferenceRequired: dynamic;
-	  +aggregationRequired: dynamic;
-	  +improvementDirectionRequired: dynamic;
-	  +alphaConfidenceRequired: dynamic
+	[ReportStatus
 	  |
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +ReportItemFormData buildFormData();
-	  +ReportItemFormViewModel createDuplicate();
-	  +dynamic onSectionTypeChanged();
-	  -void _updateFormControls();
-	  +void setControlsFrom()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
+	  &lt;static&gt;+primary: ReportStatus;
+	  &lt;static&gt;+secondary: ReportStatus
 	]
 	
-	[ReportItemFormViewModel]o-[ReportSectionType]
-	[ReportItemFormViewModel]o-[FormControl]
-	[ReportItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
+	[ReportStatus]o-[ReportStatus]
+	[Enum]&lt;:--[ReportStatus]
 	
-	[TemporalAggregationFormatted
-	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
+	[&lt;abstract&gt;IStudyFormData
 	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
+	  +Study apply()
 	]
 	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
 	
-	[ImprovementDirectionFormatted
-	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
+	[StudyInfoFormViewModel
 	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
-	]
-	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
-	
-	[ReportSectionType
+	  +study: Study;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +iconControl: FormControl&lt;IconOption&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +organizationControl: FormControl&lt;String&gt;;
+	  +reviewBoardControl: FormControl&lt;String&gt;;
+	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
+	  +researchersControl: FormControl&lt;String&gt;;
+	  +emailControl: FormControl&lt;String&gt;;
+	  +websiteControl: FormControl&lt;String&gt;;
+	  +phoneControl: FormControl&lt;String&gt;;
+	  +additionalInfoControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +iconRequired: dynamic;
+	  +organizationRequired: dynamic;
+	  +reviewBoardRequired: dynamic;
+	  +reviewBoardNumberRequired: dynamic;
+	  +researchersRequired: dynamic;
+	  +emailRequired: dynamic;
+	  +phoneRequired: dynamic;
+	  +emailFormat: dynamic;
+	  +websiteFormat: dynamic
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
+	  +void setControlsFrom();
+	  +StudyInfoFormData buildFormData()
 	]
 	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
+	[StudyInfoFormViewModel]o-[Study]
+	[StudyInfoFormViewModel]o-[FormControl]
+	[StudyInfoFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
 	
-	[AverageSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
+	[StudyDesignInfoFormView
 	  |
 	  +Widget build()
 	]
 	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
 	
-	[LinearRegressionSectionFormView
+	[StudyInfoFormData
 	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
+	  +title: String;
+	  +description: String?;
+	  +iconName: String;
+	  +contactInfoFormData: StudyContactInfoFormData;
+	  +id: String
 	  |
-	  +Widget build()
+	  +Study apply();
+	  +StudyInfoFormData copy()
 	]
 	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
+	[StudyInfoFormData]o-[StudyContactInfoFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
 	
-	[DataReferenceIdentifier
+	[StudyContactInfoFormData
 	  |
-	  +hashCode: int
+	  +organization: String?;
+	  +institutionalReviewBoard: String?;
+	  +institutionalReviewBoardNumber: String?;
+	  +researchers: String?;
+	  +email: String?;
+	  +website: String?;
+	  +phone: String?;
+	  +additionalInfo: String?;
+	  +id: String
 	  |
-	  +bool ==()
+	  +Study apply();
+	  +StudyInfoFormData copy()
 	]
 	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
 	
-	[DataReferenceEditor
-	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
+	[StudyFormValidationSet
 	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
 	]
 	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
+	[Enum]&lt;:--[StudyFormValidationSet]
 	
-	[ReportsFormData
+	[MeasurementsFormData
 	  |
-	  +reportItems: List&lt;ReportItemFormData&gt;;
+	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
 	  +id: String
 	  |
 	  +Study apply();
-	  +ReportsFormData copy()
+	  +MeasurementsFormData copy()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
 	
-	[ReportStatus
+	[MeasurementSurveyFormView
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
-	  &lt;static&gt;+primary: ReportStatus;
-	  &lt;static&gt;+secondary: ReportStatus
+	  +formViewModel: MeasurementSurveyFormViewModel
 	]
 	
-	[ReportStatus]o-[ReportStatus]
-	[Enum]&lt;:--[ReportStatus]
+	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
 	
-	[ReportBadge
+	[SurveyPreview
 	  |
-	  +status: ReportStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
+	  +routeArgs: MeasurementFormRouteArgs
 	  |
 	  +Widget build()
 	]
 	
-	[ReportBadge]o-[ReportStatus]
-	[ReportBadge]o-[BadgeType]
-	
-	[StudyDesignReportsFormView
-	  |
-	  +Widget build();
-	  -dynamic _showReportItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
+	[SurveyPreview]o-[MeasurementFormRouteArgs]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
 	
-	[StudyFormScaffold
+	[MeasurementSurveyFormData
 	  |
-	  +studyId: String;
-	  +formViewModelBuilder: T Function(WidgetRef);
-	  +formViewBuilder: Widget Function(T)
+	  +measurementId: String;
+	  +title: String;
+	  +introText: String?;
+	  +outroText: String?;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  &lt;static&gt;+kDefaultTitle: String;
+	  +id: String
 	  |
-	  +Widget build()
+	  +QuestionnaireTask toQuestionnaireTask();
+	  +MeasurementSurveyFormData copy()
 	]
 	
-	[StudyFormScaffold]o-[T Function(WidgetRef)]
-	[StudyFormScaffold]o-[Widget Function(T)]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
+	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
 	
-	[SurveyQuestionFormView
+	[MeasurementSurveyFormViewModel
 	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
+	  +study: Study;
+	  +measurementIdControl: FormControl&lt;String&gt;;
+	  +instanceIdControl: FormControl&lt;String&gt;;
+	  +surveyTitleControl: FormControl&lt;String&gt;;
+	  +surveyIntroTextControl: FormControl&lt;String&gt;;
+	  +surveyOutroTextControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +measurementId: String;
+	  +instanceId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +atLeastOneQuestion: dynamic;
+	  +breadcrumbsTitle: String;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void setControlsFrom();
+	  +MeasurementSurveyFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
+	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
+	  +MeasurementSurveyFormViewModel createDuplicate()
 	]
 	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
+	[MeasurementSurveyFormViewModel]o-[Study]
+	[MeasurementSurveyFormViewModel]o-[FormControl]
+	[MeasurementSurveyFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
 	
-	[QuestionFormViewModel
+	[StudyDesignMeasurementsFormView
 	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +Widget build()
+	]
+	
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
+	
+	[MeasurementsFormViewModel
+	  |
+	  +study: Study;
+	  +router: GoRouter;
+	  +measurementsArray: FormArray&lt;dynamic&gt;;
+	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
 	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
+	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
 	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
+	  +measurementRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void read();
+	  +void setControlsFrom();
+	  +MeasurementsFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +MeasurementSurveyFormViewModel provide();
+	  +void onCancel();
+	  +dynamic onSave()
+	]
+	
+	[MeasurementsFormViewModel]o-[Study]
+	[MeasurementsFormViewModel]o-[GoRouter]
+	[MeasurementsFormViewModel]o-[FormArray]
+	[MeasurementsFormViewModel]o-[FormViewModelCollection]
+	[MeasurementsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
+	
+	[StudyFormScaffold
+	  |
+	  +studyId: String;
+	  +formViewModelBuilder: T Function(WidgetRef);
+	  +formViewBuilder: Widget Function(T)
+	  |
+	  +Widget build()
+	]
+	
+	[StudyFormScaffold]o-[T Function(WidgetRef)]
+	[StudyFormScaffold]o-[Widget Function(T)]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
+	
+	[ConsentItemFormViewModel
+	  |
+	  +consentIdControl: FormControl&lt;String&gt;;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +iconControl: FormControl&lt;IconOption&gt;;
+	  +form: FormGroup;
+	  +consentId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void setControlsFrom();
+	  +ConsentItemFormData buildFormData();
+	  +ConsentItemFormViewModel createDuplicate()
+	]
+	
+	[ConsentItemFormViewModel]o-[FormControl]
+	[ConsentItemFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
+	
+	[StudyDesignEnrollmentFormView
+	  |
+	  +Widget build();
+	  -dynamic _showScreenerQuestionSidesheetWithArgs();
+	  -dynamic _showConsentItemSidesheetWithArgs()
+	]
+	
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
+	
+	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
+	  |
+	  +isDirtyOptionsBannerVisible: bool
+	]
+	
+	[ScreenerQuestionLogicFormView
+	  |
+	  +formViewModel: ScreenerQuestionFormViewModel
+	  |
+	  +Widget build();
+	  -dynamic _buildInfoBanner();
+	  -dynamic _buildAnswerOptionsLogicControls();
+	  -List&lt;Widget&gt; _buildOptionLogicRow()
+	]
+	
+	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
+	
+	[ConsentItemFormData
+	  |
+	  +consentId: String;
+	  +title: String;
+	  +description: String;
+	  +iconName: String?;
+	  +id: String
+	  |
+	  +ConsentItem toConsentItem();
+	  +ConsentItemFormData copy()
+	]
+	
+	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
+	
+	[ConsentItemFormView
+	  |
+	  +formViewModel: ConsentItemFormViewModel
+	]
+	
+	[ConsentItemFormView]o-[ConsentItemFormViewModel]
+	
+	[EnrollmentFormData
+	  |
+	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
+	  +enrollmentType: Participation;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
+	  +id: String
+	  |
+	  +Study apply();
+	  +EnrollmentFormData copy()
+	]
+	
+	[EnrollmentFormData]o-[Participation]
+	[EnrollmentFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
+	
+	[ScreenerQuestionFormViewModel
+	  |
+	  &lt;static&gt;+defaultResponseOptionValidity: bool;
+	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
+	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
+	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
+	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +prevResponseOptionValues: List&lt;dynamic&gt;;
+	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isDirtyOptionsBannerVisible: bool
 	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
 	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
 	  +void setControlsFrom();
 	  +QuestionFormData buildFormData();
+	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
+	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
+	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
+	  +ScreenerQuestionFormViewModel createDuplicate()
+	]
+	
+	[ScreenerQuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
+	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
+	
+	[EnrollmentFormViewModel
+	  |
+	  +study: Study;
+	  +router: GoRouter;
+	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
+	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
+	  +consentItemArray: FormArray&lt;dynamic&gt;;
+	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
+	  +form: FormGroup;
+	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
+	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestScreener: bool;
+	  +canTestConsent: bool;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  |
+	  +void setControlsFrom();
+	  +EnrollmentFormData buildFormData();
+	  +void read();
 	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
 	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
+	  +void onNewItem();
+	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
+	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
+	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
+	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
+	  +dynamic testScreener();
+	  +dynamic testConsent();
+	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
+	]
+	
+	[EnrollmentFormViewModel]o-[Study]
+	[EnrollmentFormViewModel]o-[GoRouter]
+	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
+	[EnrollmentFormViewModel]o-[FormControl]
+	[EnrollmentFormViewModel]o-[FormArray]
+	[EnrollmentFormViewModel]o-[FormViewModelCollection]
+	[EnrollmentFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
+	
+	[EnrollmentFormConsentItemDelegate
+	  |
+	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
+	  +owner: EnrollmentFormViewModel;
+	  +propagateOnSave: bool;
+	  +validationSet: dynamic
+	  |
+	  +void onCancel();
+	  +dynamic onSave();
+	  +ConsentItemFormViewModel provide();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem()
+	]
+	
+	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
+	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
+	
+	[StudyFormViewModel
+	  |
+	  +studyDirtyCopy: Study?;
+	  +studyRepository: IStudyRepository;
+	  +authRepository: IAuthRepository;
+	  +router: GoRouter;
+	  +studyInfoFormViewModel: StudyInfoFormViewModel;
+	  +enrollmentFormViewModel: EnrollmentFormViewModel;
+	  +measurementsFormViewModel: MeasurementsFormViewModel;
+	  +reportsFormViewModel: ReportsFormViewModel;
+	  +interventionsFormViewModel: InterventionsFormViewModel;
+	  +form: FormGroup;
+	  +isStudyReadonly: bool;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void read();
+	  +void setControlsFrom();
+	  +Study buildFormData();
+	  +void dispose();
+	  +void onCancel();
+	  +dynamic onSave();
+	  -dynamic _applyAndSaveSubform()
+	]
+	
+	[StudyFormViewModel]o-[Study]
+	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
+	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyFormViewModel]o-[GoRouter]
+	[StudyFormViewModel]o-[StudyInfoFormViewModel]
+	[StudyFormViewModel]o-[EnrollmentFormViewModel]
+	[StudyFormViewModel]o-[MeasurementsFormViewModel]
+	[StudyFormViewModel]o-[ReportsFormViewModel]
+	[StudyFormViewModel]o-[InterventionsFormViewModel]
+	[StudyFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
+	
+	[&lt;abstract&gt;WithQuestionnaireControls
+	  |
+	  +questionsArray: FormArray&lt;dynamic&gt;;
+	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
+	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
+	  +propagateOnSave: bool;
+	  +questionModels: List&lt;Q&gt;;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  |
+	  +void setQuestionnaireControlsFrom();
+	  +QuestionnaireFormData buildQuestionnaireFormData();
+	  +void read();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +Q provide();
+	  +Q provideQuestionFormViewModel()
+	]
+	
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	
+	[QuestionnaireFormData
+	  |
+	  +questionsData: List&lt;QuestionFormData&gt;?;
+	  +id: String
+	  |
+	  +StudyUQuestionnaire toQuestionnaire();
+	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
+	  +QuestionnaireFormData copy()
 	]
 	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
+	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
 	
 	[&lt;abstract&gt;QuestionFormData
 	  |
@@ -1863,17 +1985,15 @@
 	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
 	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
 	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
+	[AudioRecordingQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
 	]
 	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
+	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
 	
 	[FreeTextQuestionFormView
 	  |
@@ -1888,16 +2008,6 @@
 	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
 	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
 	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
 	[SurveyQuestionType
 	  |
 	  +index: int;
@@ -1913,81 +2023,153 @@
 	[SurveyQuestionType]o-[SurveyQuestionType]
 	[Enum]&lt;:--[SurveyQuestionType]
 	
-	[AudioRecordingQuestionFormView
+	[ImageCapturingQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel
 	  |
 	  +Widget build()
 	]
 	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
+	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
 	
-	[ChoiceQuestionFormView
+	[&lt;abstract&gt;IScaleQuestionFormViewModel
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  +isMidValuesClearedInfoVisible: bool
+	]
+	
+	[ScaleQuestionFormView
 	  |
-	  +Widget build()
+	  +formViewModel: QuestionFormViewModel
 	]
 	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
+	[ScaleQuestionFormView]o-[QuestionFormViewModel]
 	
-	[ImageCapturingQuestionFormView
+	[ChoiceQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel
 	  |
 	  +Widget build()
 	]
 	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
+	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
 	
-	[&lt;abstract&gt;WithQuestionnaireControls
+	[BoolQuestionFormView
 	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  +formViewModel: QuestionFormViewModel
 	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
-	  +void read();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[BoolQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
 	
-	[QuestionnaireFormData
+	[QuestionFormViewModel
 	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
+	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
+	  -_titles: Map&lt;FormMode, String Function()&gt;?;
+	  +questionIdControl: FormControl&lt;String&gt;;
+	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
+	  +questionTextControl: FormControl&lt;String&gt;;
+	  +questionInfoTextControl: FormControl&lt;String&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
+	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +customOptionsMin: int;
+	  +customOptionsMax: int;
+	  +customOptionsInitial: int;
+	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
+	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
+	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
+	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
+	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
+	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
+	  &lt;static&gt;+kDefaultScaleMinValue: int;
+	  &lt;static&gt;+kDefaultScaleMaxValue: int;
+	  &lt;static&gt;+kNumMidValueControls: int;
+	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
+	  +scaleMinValueControl: FormControl&lt;int&gt;;
+	  +scaleMaxValueControl: FormControl&lt;int&gt;;
+	  -_scaleRangeControl: FormControl&lt;int&gt;;
+	  +scaleMinLabelControl: FormControl&lt;String&gt;;
+	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
+	  +scaleMidValueControls: FormArray&lt;int&gt;;
+	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
+	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
+	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
+	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
+	  +prevMidValues: List&lt;int?&gt;?;
+	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
+	  +customRegexControl: FormControl&lt;String&gt;;
+	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
+	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
+	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
+	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
+	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
+	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
+	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +form: FormGroup;
+	  +questionId: String;
+	  +questionType: SurveyQuestionType;
+	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
+	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
+	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +validAnswerOptions: List&lt;String&gt;;
+	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +scaleMinValue: int;
+	  +scaleMaxValue: int;
+	  +scaleRange: int;
+	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +questionTextRequired: dynamic;
+	  +numValidChoiceOptions: dynamic;
+	  +scaleRangeValid: dynamic;
+	  +maxRecordingDurationValid: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +isAddOptionButtonVisible: bool;
+	  +isMidValuesClearedInfoVisible: bool
 	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
+	  +String? scaleMidLabelAt();
+	  -dynamic _onScaleRangeChanged();
+	  -dynamic _applyInputFormatters();
+	  -dynamic _updateScaleMidValueControls();
+	  -Map&lt;String, dynamic&gt;? _validateFreeText();
+	  -dynamic _onFreeTextLengthChanged();
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +dynamic onQuestionTypeChanged();
+	  +dynamic onResponseOptionsChanged();
+	  -void _updateFormControls();
+	  +void initControls();
+	  +void setControlsFrom();
+	  +QuestionFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem();
+	  +dynamic save();
+	  +QuestionFormViewModel createDuplicate()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
+	[QuestionFormViewModel]o-[SurveyQuestionType]
+	[QuestionFormViewModel]o-[FormControl]
+	[QuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
+	[QuestionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
 	
-	[ScheduleControls
-	  |
-	  +formViewModel: WithScheduleControls
+	[SurveyQuestionFormView
 	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
+	  +formViewModel: QuestionFormViewModel;
+	  +isHtmlStyleable: bool
 	]
 	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
+	[SurveyQuestionFormView]o-[QuestionFormViewModel]
 	
 	[&lt;abstract&gt;IFormDataWithSchedule
 	  |
@@ -2004,6 +2186,17 @@
 	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
 	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
 	
+	[ScheduleControls
+	  |
+	  +formViewModel: WithScheduleControls
+	  |
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
+	]
+	
+	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
+	
 	[&lt;abstract&gt;WithScheduleControls
 	  |
 	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
@@ -2020,51 +2213,13 @@
 	  +hasReminder: bool;
 	  +isTimeRestricted: bool;
 	  +timeRestriction: List&lt;Time&gt;?
-	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
-	]
-	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
-	
-	[StudyFormViewModel
-	  |
-	  +studyDirtyCopy: Study?;
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +router: GoRouter;
-	  +studyInfoFormViewModel: StudyInfoFormViewModel;
-	  +enrollmentFormViewModel: EnrollmentFormViewModel;
-	  +measurementsFormViewModel: MeasurementsFormViewModel;
-	  +reportsFormViewModel: ReportsFormViewModel;
-	  +interventionsFormViewModel: InterventionsFormViewModel;
-	  +form: FormGroup;
-	  +isStudyReadonly: bool;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +void dispose();
-	  +void onCancel();
-	  +dynamic onSave();
-	  -dynamic _applyAndSaveSubform()
-	]
-	
-	[StudyFormViewModel]o-[Study]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyFormViewModel]o-[GoRouter]
-	[StudyFormViewModel]o-[StudyInfoFormViewModel]
-	[StudyFormViewModel]o-[EnrollmentFormViewModel]
-	[StudyFormViewModel]o-[MeasurementsFormViewModel]
-	[StudyFormViewModel]o-[ReportsFormViewModel]
-	[StudyFormViewModel]o-[InterventionsFormViewModel]
-	[StudyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
+	  |
+	  +void setScheduleControlsFrom();
+	  -dynamic _initReminderControl()
+	]
+	
+	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
+	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
 	
 	[&lt;abstract&gt;StudyDesignPageWidget
 	  |
@@ -2073,45 +2228,33 @@
 	
 	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
 	
-	[StudyAnalyzeScreen
+	[StudiesTableColumnHeader
 	  |
-	  +Widget? banner();
-	  +Widget build()
+	  +title: String;
+	  +sortable: bool;
+	  +sortAscending: bool;
+	  +sortingActive: bool;
+	  +onSort: void Function()?
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
+	[StudiesTableColumnHeader]o-[void Function()?]
 	
-	[StudyAnalyzeController
+	[DashboardScreen
 	  |
-	  +dynamic onExport()
+	  +filter: StudiesFilter?
 	]
 	
-	[StudyBaseController]&lt;:-[StudyAnalyzeController]
+	[DashboardScreen]o-[StudiesFilter]
 	
-	[StudyMonitorScreen
+	[DashboardScaffold
 	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
-	
-	[StudiesTableItem
+	  &lt;static&gt;+compactWidthThreshold: double;
+	  +body: Widget
 	  |
-	  +study: Study;
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
-	  +isPinned: bool;
-	  +onPinnedChanged: void Function(Study, bool)?;
-	  +onTap: void Function(Study)?
+	  +Widget build()
 	]
 	
-	[StudiesTableItem]o-[Study]
-	[StudiesTableItem]o-[void Function(Study, bool)?]
-	[StudiesTableItem]o-[void Function(Study)?]
+	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
 	
 	[DashboardController
 	  |
@@ -2147,6 +2290,14 @@
 	[DashboardController]o-[SearchController]
 	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
 	
+	[StudiesFilter
+	  |
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
+	]
+	
+	[Enum]&lt;:--[StudiesFilter]
+	
 	[StudiesTableColumnSize
 	  |
 	  +collapsed: bool;
@@ -2199,42 +2350,30 @@
 	[StudiesTableColumn]o-[StudiesTableColumn]
 	[Enum]&lt;:--[StudiesTableColumn]
 	
-	[DashboardScreen
-	  |
-	  +filter: StudiesFilter?
-	]
-	
-	[DashboardScreen]o-[StudiesFilter]
-	
-	[DashboardScaffold
-	  |
-	  &lt;static&gt;+compactWidthThreshold: double;
-	  +body: Widget
+	[StudiesTableItem
 	  |
-	  +Widget build()
+	  +study: Study;
+	  +itemHeight: double;
+	  +itemPadding: double;
+	  +rowSpacing: double;
+	  +columnSpacing: double;
+	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
+	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
+	  +isPinned: bool;
+	  +onPinnedChanged: void Function(Study, bool)?;
+	  +onTap: void Function(Study)?
 	]
 	
-	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
+	[StudiesTableItem]o-[Study]
+	[StudiesTableItem]o-[void Function(Study, bool)?]
+	[StudiesTableItem]o-[void Function(Study)?]
 	
-	[StudiesFilter
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
+	[App
 	]
 	
-	[Enum]&lt;:--[StudiesFilter]
-	
-	[StudiesTableColumnHeader
-	  |
-	  +title: String;
-	  +sortable: bool;
-	  +sortAscending: bool;
-	  +sortingActive: bool;
-	  +onSort: void Function()?
+	[AppContent
 	]
 	
-	[StudiesTableColumnHeader]o-[void Function()?]
-	
 	[AccountSettingsDialog
 	  |
 	  +Widget build()
@@ -2242,3917 +2381,3750 @@
 	
 	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AccountSettingsDialog]
 	
-	[StudyInvitesTable
-	  |
-	  +invites: List&lt;StudyInvite&gt;;
-	  +onSelect: void Function(StudyInvite);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getIntervention: Intervention? Function(String);
-	  +getParticipantCountForInvite: int Function(StudyInvite)
-	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow()
-	]
-	
-	[StudyInvitesTable]o-[void Function(StudyInvite)]
-	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
-	[StudyInvitesTable]o-[Intervention? Function(String)]
-	[StudyInvitesTable]o-[int Function(StudyInvite)]
-	
-	[StudyRecruitController
-	  |
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
-	  |
-	  -dynamic _subscribeInvites();
-	  +Intervention? getIntervention();
-	  +int getParticipantCountForInvite();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void dispose()
-	]
-	
-	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[StudyRecruitController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyRecruitController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
-	
-	[InviteCodeFormViewModel
-	  |
-	  +study: Study;
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  +codeControl: FormControl&lt;String&gt;;
-	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
-	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +interventionAControl: FormControl&lt;String&gt;;
-	  +interventionBControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
-	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +isPreconfiguredSchedule: bool;
-	  +preconfiguredSchedule: List&lt;String&gt;?
-	  |
-	  +void initControls();
-	  -dynamic _uniqueInviteCode();
-	  +void regenerateCode();
-	  -String _generateCode();
-	  +StudyInvite buildFormData();
-	  +void setControlsFrom();
-	  +dynamic save()
-	]
-	
-	[InviteCodeFormViewModel]o-[Study]
-	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[InviteCodeFormViewModel]o-[FormControl]
-	[InviteCodeFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
-	
-	[EnrolledBadge
-	  |
-	  +enrolledCount: int
-	  |
-	  +Widget build()
-	]
-	
-	[InviteCodeFormView
-	  |
-	  +formViewModel: InviteCodeFormViewModel
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
-	]
-	
-	[InviteCodeFormView]o-[InviteCodeFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
-	
-	[StudyRecruitScreen
-	  |
-	  +Widget build();
-	  -Widget _inviteCodesSectionHeader();
-	  -Widget _newInviteCodeButton();
-	  -dynamic _onSelectInvite()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
-	
-	[DrawerEntry
-	  |
-	  +localizedTitle: String Function();
-	  +icon: IconData?;
-	  +localizedHelpText: String Function()?;
-	  +enabled: bool;
-	  +onSelected: void Function(BuildContext, WidgetRef)?;
-	  +autoCloseDrawer: bool;
-	  +title: String;
-	  +helpText: String?
-	  |
-	  +void onClick()
-	]
-	
-	[DrawerEntry]o-[String Function()]
-	[DrawerEntry]o-[IconData]
-	[DrawerEntry]o-[String Function()?]
-	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
-	
-	[GoRouterDrawerEntry
-	  |
-	  +intent: RoutingIntent;
-	  +onNavigated: void Function()?
-	  |
-	  +void onClick()
-	]
-	
-	[GoRouterDrawerEntry]o-[RoutingIntent]
-	[GoRouterDrawerEntry]o-[void Function()?]
-	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
-	
-	[AppDrawer
-	  |
-	  +width: int;
-	  +autoCloseDrawer: bool;
-	  +leftPaddingEntries: double;
-	  +logoPaddingVertical: double;
-	  +logoPaddingHorizontal: double;
-	  +logoMaxHeight: double;
-	  +logoSectionMinHeight: double;
-	  +logoSectionMaxHeight: double
-	]
-	
 	</desc>
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="3778.0" width="44967.0" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="3778.0" width="48837.5" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
 				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M151.9 1515.6 L143.5 1607 L10640.75 2294.101793136207 L10640.8 2294.1 " fill="none"></path>
+					<path d="M19716.9 1408.0 L18636.75 1607 L18636.75 2265 L18636.8 2265.0 " fill="none"></path>
+					<path d="M19717.9 1413.3 L19716.9 1408.0 L19715.9 1402.8 L19730.0 1405.6 Z"></path>
+					<path d="M103.5 2361.2 L103.5 2985 L1100 3143.302597955707 L1100.0 3143.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M158.1 1506.8 L151.9 1515.6 L147.5 1505.8 L153.7 1497.0 Z"></path>
+						<path d="M108.8 2351.8 L103.5 2361.2 L98.2 2351.8 L103.5 2342.5 Z"></path>
 					</g>
-					<path d="M284.1 1510.1 L381.75 1607 L8937.75 2293.1530582552523 L8937.8 2293.2 " fill="none"></path>
+					<path d="M737.6 1410.0 L103.5 1607 L103.5 2249.5 L103.5 2249.5 " fill="none"></path>
+					<path d="M739.2 1415.0 L737.6 1410.0 L736.1 1404.9 L750.4 1406.0 Z"></path>
+					<path d="M676.5 2361.2 L676.5 2985 L1100 3116.4188851913477 L1100.0 3116.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M281.2 1499.8 L284.1 1510.1 L273.7 1507.4 L270.9 1497.0 Z"></path>
+						<path d="M681.8 2351.8 L676.5 2361.2 L671.2 2351.8 L676.5 2342.5 Z"></path>
 					</g>
-					<path d="M417.9 2428.7 L401.75 2985 L9191.5 3169.734568249049 L9191.5 3169.7 " fill="none"></path>
+					<path d="M784.8 1417.6 L676.5 1607 L676.5 2249.5 L676.5 2249.5 " fill="none"></path>
+					<path d="M789.4 1420.2 L784.8 1417.6 L780.1 1414.9 L791.4 1406.0 Z"></path>
+					<path d="M924.0 2361.2 L924 2985 L1119.230563002681 3088 L1119.2 3088.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M423.5 2419.5 L417.9 2428.7 L412.8 2419.2 L418.4 2410.0 Z"></path>
+						<path d="M929.3 2351.8 L924.0 2361.2 L918.7 2351.8 L924.0 2342.5 Z"></path>
 					</g>
-					<path d="M462.6 2427.8 L635.5 2985 L21394.25 3170.739460269865 L21394.3 3170.7 " fill="none"></path>
+					<path d="M815.7 1417.6 L924 1607 L924 2249.5 L924.0 2249.5 " fill="none"></path>
+					<path d="M820.4 1414.9 L815.7 1417.6 L811.1 1420.2 L809.1 1406.0 Z"></path>
+					<path d="M1206.5 2376.2 L1206.5 2985 L1245.7117962466489 3088 L1245.7 3088.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M465.0 2417.3 L462.6 2427.8 L454.8 2420.5 L457.1 2410.0 Z"></path>
+						<path d="M1211.8 2366.8 L1206.5 2376.2 L1201.2 2366.8 L1206.5 2357.5 Z"></path>
 					</g>
-					<path d="M609.2 1489.1 L421.75 1607 L421.75 2182 L421.8 2182.0 " fill="none"></path>
-					<path d="M612.1 1493.6 L609.2 1489.1 L606.4 1484.6 L620.5 1482.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1536.4 1441.2 L1461.75 1607 L1694.125907111756 2250 L1694.1 2250.0 " fill="none"></path>
+					<path d="M841.1 1412.3 L1206.5 1607 L1206.5 2234.5 L1206.5 2234.5 " fill="none"></path>
+					<path d="M843.6 1407.6 L841.1 1412.3 L838.6 1417.0 L829.3 1406.0 Z"></path>
+					<path d="M1353.2 1468.8 L1296 1607 L14216.25 2294.11207378963 L14216.3 2294.1 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1361.6 1462.2 L1353.2 1468.8 L1351.8 1458.1 L1360.3 1451.5 Z"></path>
 					</g>
-					<path d="M1541.3 1443.3 L1536.4 1441.2 L1531.6 1439.0 L1541.9 1429.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1862.3 1472.3 L1862.25 1607 L1720.8646589259797 2250 L1720.9 2250.0 " fill="none"></path>
+					<path d="M1385.5 1470.2 L1385.5 1607 L1385.5 2296 L1385.5 2296 L1385.5 2985 L1385.5 2985 L1325.8538873994637 3088 L1325.9 3088.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1390.8 1460.8 L1385.5 1470.2 L1380.2 1460.8 L1385.5 1451.5 Z"></path>
+					</g>
+					<path d="M1400.2 1469.9 L1425.5 1607 L3556.7022859216254 2280.5 L3556.7 2280.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1403.7 1459.7 L1400.2 1469.9 L1393.2 1461.6 L1396.8 1451.5 Z"></path>
+					</g>
+					<path d="M1850.0 2368.2 L1850 2985 L32856 3171.1607726358147 L32856.0 3171.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1855.3 2358.8 L1850.0 2368.2 L1844.7 2358.8 L1850.0 2349.5 Z"></path>
 					</g>
-					<path d="M1867.6 1472.3 L1862.3 1472.3 L1856.9 1472.3 L1862.3 1459.0 Z"></path>
-					<path d="M2077.4 1163.8 L2074.25 1174 L2074.25 1375 L2074.3 1375.0 " fill="none"></path>
+					<path d="M2267.1 2374.9 L2090 2985 L586.9879356568365 3156 L587.0 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2085.2 1156.5 L2077.4 1163.8 L2075.0 1153.4 L2082.8 1146.0 Z"></path>
+						<path d="M2274.8 2367.5 L2267.1 2374.9 L2264.6 2364.5 L2272.3 2357.0 Z"></path>
 					</g>
-					<path d="M2120.0 1164.7 L2120 1174 L11159.75 1388.5537725765341 L11159.8 1388.6 " fill="none"></path>
+					<path d="M2319.7 2374.5 L2550.5 2985 L32856 3171.1529461168566 L32856.0 3171.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2125.3 1155.3 L2120.0 1164.7 L2114.7 1155.3 L2120.0 1146.0 Z"></path>
+						<path d="M2321.4 2363.8 L2319.7 2374.5 L2311.4 2367.6 L2313.1 2357.0 Z"></path>
 					</g>
-					<path d="M2162.6 1163.8 L2165.75 1174 L2165.75 1390.5 L2165.75 1390.5 L2165.75 1607 L2165.75 1607 L8937.75 2292.406977598237 L8937.8 2292.4 " fill="none"></path>
+					<path d="M35524.8 2562.7 L34876.75 2985 L31289.5 3167.8803731292282 L31289.5 3167.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2165.0 1153.4 L2162.6 1163.8 L2154.8 1156.5 L2157.2 1146.0 Z"></path>
+						<path d="M35535.5 2562.1 L35524.8 2562.7 L35529.7 2553.1 L35540.4 2552.5 Z"></path>
 					</g>
-					<path d="M2293.0 1157.3 L2314.75 1174 L2314.75 1375 L2314.8 1375.0 " fill="none"></path>
+					<path d="M35582.3 2563.8 L35029.25 2985 L16485.5 3170.6589966582114 L16485.5 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2288.8 1147.4 L2293.0 1157.3 L2282.3 1155.9 L2278.2 1146.0 Z"></path>
+						<path d="M35593.0 2562.4 L35582.3 2563.8 L35586.5 2553.9 L35597.2 2552.5 Z"></path>
 					</g>
-					<path d="M26078.8 156.2 L26078.75 203 L26078.75 524 L26078.8 524.0 " fill="none"></path>
+					<path d="M35597.5 2564.1 L35069.25 2985 L34499.75 3157.5617384240454 L34499.8 3157.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26084.1 146.8 L26078.8 156.2 L26073.4 146.8 L26078.8 137.5 Z"></path>
+						<path d="M35608.1 2562.5 L35597.5 2564.1 L35601.4 2554.1 L35612.1 2552.5 Z"></path>
 					</g>
-					<path d="M2480.1 1533.1 L2410.25 1607 L2410.25 2227 L2410.3 2227.0 " fill="none"></path>
+					<path d="M36002.8 2570.6 L36106.5 2985 L32969 3168.200923606763 L32969.0 3168.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2490.4 1529.9 L2480.1 1533.1 L2482.6 1522.6 L2492.9 1519.5 Z"></path>
+						<path d="M36005.7 2560.3 L36002.8 2570.6 L35995.3 2562.8 L35998.2 2552.5 Z"></path>
 					</g>
-					<path d="M2561.8 1537.1 L2536.5 1607 L8937.75 2292.200023303686 L8937.8 2292.2 " fill="none"></path>
+					<path d="M36018.6 2570.3 L36146.5 2985 L39344.75 3168.4880027685917 L39344.8 3168.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2570.0 1530.1 L2561.8 1537.1 L2559.9 1526.5 L2568.1 1519.5 Z"></path>
+						<path d="M36021.0 2559.8 L36018.6 2570.3 L36010.8 2563.0 L36013.1 2552.5 Z"></path>
+					</g>
+					<path d="M36034.4 2570.0 L36186.5 2985 L1455 3170.5517130252942 L1455.0 3170.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M36036.2 2559.4 L36034.4 2570.0 L36026.2 2563.1 L36028.0 2552.5 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M38020.2 96.9 L35934 203 L35934 539.5 L35934 539.5 L35934 876 L35934 876 L35934 1025 L35934 1025 L35934 1174 L35934 1174 L35934 1390.5 L35934 1390.5 L35934 1607 L35934 1607 L35934 2039.5 L35934.0 2039.5 " fill="none"></path>
+					</g>
+					<path d="M38020.5 102.3 L38020.2 96.9 L38019.9 91.6 L38033.5 96.3 Z"></path>
+					<path d="M1472.3 3093.1 L1485 3088 L1492.5 3088 L1492.5 3088 L1500 3171.5 L1500 3171.5 L1492.5 3255 L1492.5 3255 L1485 3255 L1485 3255 L1455 3242.9277108433735 L1455.0 3242.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1461.7 3091.6 L1472.3 3093.1 L1465.6 3101.5 L1455.0 3100.1 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M2994.6 2322.9 L2590.5 2985 L1455 3146.2876999238383 L1455.0 3146.3 " fill="none"></path>
 					</g>
-					<path d="M2741.0 2413.7 L2741 2985 L1350.75 3162.8642599897103 L1350.8 3162.9 " fill="none"></path>
+					<path d="M2999.1 2325.7 L2994.6 2322.9 L2990.0 2320.1 L3001.5 2311.5 Z"></path>
+					<path d="M1027.8 3121.9 L1040 3118 L1047.5 3118 L1047.5 3118 L1055 3171.5 L1055 3171.5 L1047.5 3225 L1047.5 3225 L1040 3225 L1040 3225 L1010 3215.5309734513276 L1010.0 3215.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2746.3 2404.3 L2741.0 2413.7 L2735.7 2404.3 L2741.0 2395.0 Z"></path>
+						<path d="M1017.3 3119.6 L1027.8 3121.9 L1020.5 3129.7 L1010.0 3127.5 Z"></path>
 					</g>
-					<path d="M2696.7 1531.0 L2741 1607 L2741 2197 L2741.0 2197.0 " fill="none"></path>
-					<path d="M2701.3 1528.3 L2696.7 1531.0 L2692.1 1533.7 L2690.0 1519.5 Z"></path>
-					<path d="M2721.9 1530.1 L2781 1607 L3401.0003628447025 2212.5 L3401.0 2212.5 " fill="none"></path>
-					<path d="M2726.2 1526.8 L2721.9 1530.1 L2717.7 1533.3 L2713.8 1519.5 Z"></path>
-					<path d="M2889.5 1476.0 L2821 1607 L5768.75 2282.929694650137 L5768.8 2282.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2898.6 1470.2 L2889.5 1476.0 L2889.1 1465.3 L2898.2 1459.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M2996.0 2323.2 L2630.5 2985 L1010 3156.7177556818183 L1010.0 3156.7 " fill="none"></path>
 					</g>
-					<path d="M2980.8 1475.9 L3052.25 1607 L8791.75 2289.6958135520067 L8791.8 2289.7 " fill="none"></path>
+					<path d="M3000.7 2325.8 L2996.0 2323.2 L2991.3 2320.6 L3002.4 2311.5 Z"></path>
+					<path d="M2204.8 1447.4 L1465.5 1607 L1465.5 2296 L1465.5 2296 L1465.5 2985 L1465.5 2985 L10354.25 3170.0634227345035 L10354.3 3170.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2981.0 1465.1 L2980.8 1475.9 L2971.6 1470.2 L2971.9 1459.5 Z"></path>
+						<path d="M2215.0 1450.6 L2204.8 1447.4 L2212.8 1440.2 L2223.0 1443.4 Z"></path>
 					</g>
-					<path d="M11146.6 1406.0 L9913.75 1607 L9913.75 2219.5 L9913.8 2219.5 " fill="none"></path>
-					<path d="M11147.4 1411.3 L11146.6 1406.0 L11145.7 1400.7 L11159.8 1403.9 Z"></path>
-					<path d="M889.3 2353.2 L889.25 2985 L32133 3171.077148149035 L32133.0 3171.1 " fill="none"></path>
+					<path d="M2204.9 1454.5 L1577.5 1607 L1577.5 2280.5 L1577.5 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M894.6 2343.8 L889.3 2353.2 L883.9 2343.8 L889.3 2334.5 Z"></path>
+						<path d="M2215.2 1457.5 L2204.9 1454.5 L2212.7 1447.1 L2223.0 1450.1 Z"></path>
 					</g>
-					<path d="M824.7 1493.6 L889.25 1607 L889.25 2257.5 L889.3 2257.5 " fill="none"></path>
-					<path d="M829.3 1490.9 L824.7 1493.6 L820.1 1496.2 L818.1 1482.0 Z"></path>
-					<path d="M1587.6 1445.6 L1670.75 1607 L5768.75 2286.5480144404332 L5768.8 2286.5 " fill="none"></path>
+					<path d="M2727.9 1586.6 L2755 1607 L2755 2280.5 L2755.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1588.1 1434.9 L1587.6 1445.6 L1578.6 1439.7 L1579.1 1429.0 Z"></path>
+						<path d="M2723.7 1576.7 L2727.9 1586.6 L2717.2 1585.2 L2713.0 1575.3 Z"></path>
 					</g>
-					<path d="M1596.9 1444.3 L1710.75 1607 L3259.8488751814225 2280.5 L3259.8 2280.5 " fill="none"></path>
+					<path d="M2731.1 1456.1 L3336.25 1607 L16997.25 2292.3876793126046 L16997.3 2292.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1595.9 1433.6 L1596.9 1444.3 L1587.2 1439.7 L1586.2 1429.0 Z"></path>
+						<path d="M2723.3 1448.7 L2731.1 1456.1 L2720.8 1459.0 L2713.0 1451.6 Z"></path>
 					</g>
-					<path d="M3159.6 1483.4 L3092.25 1607 L5768.75 2281.632705322846 L5768.8 2281.6 " fill="none"></path>
+					<path d="M2731.2 1453.2 L3376.25 1607 L3767.7402031930333 2280.5 L3767.7 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3168.8 1477.7 L3159.6 1483.4 L3159.4 1472.6 L3168.6 1467.0 Z"></path>
+						<path d="M2723.3 1445.9 L2731.2 1453.2 L2720.8 1456.3 L2713.0 1448.9 Z"></path>
 					</g>
-					<path d="M3247.2 1484.4 L3295.5 1607 L3295.5 2280.5 L3295.5 2280.5 " fill="none"></path>
+					<path d="M2731.2 1450.6 L3416.25 1607 L16431.25 2293.7048282727724 L16431.3 2293.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3248.8 1473.7 L3247.2 1484.4 L3238.8 1477.6 L3240.4 1467.0 Z"></path>
+						<path d="M2723.3 1443.3 L2731.2 1450.6 L2720.9 1453.7 L2713.0 1446.4 Z"></path>
 					</g>
-					<path d="M3275.1 1482.2 L3363.25 1607 L8791.75 2289.3381373711577 L8791.8 2289.3 " fill="none"></path>
+					<path d="M2731.2 1448.2 L3456.25 1607 L4039.33091436865 2280.5 L4039.3 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3274.1 1471.5 L3275.1 1482.2 L3265.3 1477.7 L3264.3 1467.0 Z"></path>
+						<path d="M2723.3 1441.0 L2731.2 1448.2 L2721.0 1451.4 L2713.0 1444.2 Z"></path>
 					</g>
-					<path d="M3516.3 1470.7 L3516.25 1607 L16273.25 2292.133135864058 L16273.3 2292.1 " fill="none"></path>
+					<path d="M2731.3 1445.9 L3496.25 1607 L14216.25 2293.7258611872994 L14216.3 2293.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3521.6 1461.3 L3516.3 1470.7 L3510.9 1461.3 L3516.3 1452.0 Z"></path>
+						<path d="M2723.2 1438.8 L2731.3 1445.9 L2721.0 1449.2 L2713.0 1442.1 Z"></path>
 					</g>
-					<path d="M12050.7 1026.5 L3516.25 1174 L3516.25 1329 L3516.3 1329.0 " fill="none"></path>
-					<path d="M12050.8 1031.9 L12050.7 1026.5 L12050.6 1021.2 L12064.0 1026.3 Z"></path>
-					<path d="M11147.0 1418.7 L10513.25 1607 L10513.25 2265 L10513.3 2265.0 " fill="none"></path>
-					<path d="M11148.5 1423.8 L11147.0 1418.7 L11145.4 1413.6 L11159.8 1414.9 Z"></path>
-					<path d="M40317.8 2441.7 L40047.5 2985 L40047.5 3156 L40047.5 3156.0 " fill="none"></path>
+					<path d="M2731.3 1440.6 L3605.75 1607 L3605.75 2280.5 L3605.8 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40326.7 2435.7 L40317.8 2441.7 L40317.1 2431.0 L40326.1 2425.0 Z"></path>
+						<path d="M2723.2 1433.6 L2731.3 1440.6 L2721.2 1444.1 L2713.0 1437.1 Z"></path>
 					</g>
-					<path d="M40359.5 2443.3 L40246.5 2985 L34618.25 3169.0313171159323 L34618.3 3169.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40366.7 2435.2 L40359.5 2443.3 L40356.2 2433.0 L40363.3 2425.0 Z"></path>
+					<path d="M43309.8 688.9 L42748 876 L42748 1025 L42748 1025 L42748 1174 L42748 1174 L42748 1359.5 L42748.0 1359.5 " fill="none"></path>
+					<path d="M43311.5 694.0 L43309.8 688.9 L43308.2 683.8 L43322.5 684.7 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M27040.0 111.9 L26810.5 203 L26810.5 524 L26810.5 524.0 " fill="none"></path>
 					</g>
-					<path d="M40432.7 2442.9 L40589.25 2985 L33587.25 3170.007154494581 L33587.3 3170.0 " fill="none"></path>
+					<path d="M27042.0 116.9 L27040.0 111.9 L27038.1 107.0 L27052.4 107.0 Z"></path>
+					<path d="M39850.3 3669.7 L39850.25 3671 L38651.25 3705.106169871795 L38651.3 3705.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40435.2 2432.5 L40432.7 2442.9 L40425.0 2435.4 L40427.5 2425.0 Z"></path>
+						<path d="M39855.6 3660.3 L39850.3 3669.7 L39844.9 3660.3 L39850.3 3651.0 Z"></path>
 					</g>
-					<path d="M40441.1 2442.6 L40629.25 2985 L36049.25 3169.3864004317325 L36049.3 3169.4 " fill="none"></path>
+					<path d="M32687.7 3561.7 L32166.75 3671 L41462.5 3706.3044077134987 L41462.5 3706.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40443.1 2432.1 L40441.1 2442.6 L40433.0 2435.6 L40435.0 2425.0 Z"></path>
+						<path d="M32698.0 3565.0 L32687.7 3561.7 L32695.8 3554.5 L32706.0 3557.8 Z"></path>
 					</g>
-					<path d="M41558.7 632.9 L40390.25 876 L40390.25 1025 L40390.25 1025 L40390.25 1174 L40390.25 1174 L40390.25 1390.5 L40390.25 1390.5 L40390.25 1607 L40390.25 1607 L40390.25 2167 L40390.3 2167.0 " fill="none"></path>
-					<path d="M41559.8 638.1 L41558.7 632.9 L41557.6 627.7 L41571.8 630.2 Z"></path>
-					<path d="M909.8 1492.8 L1070.25 1607 L1070.25 2296 L1070.25 2296 L1070.25 2985 L1070.25 2985 L34467.25 3171.0793337814625 L34467.3 3171.1 " fill="none"></path>
+					<path d="M32912.5 3617.2 L32912.5 3671 L31752.25 3704.156671362447 L31752.3 3704.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M905.3 1483.1 L909.8 1492.8 L899.1 1491.8 L894.6 1482.0 Z"></path>
+						<path d="M32917.8 3607.8 L32912.5 3617.2 L32907.2 3607.8 L32912.5 3598.5 Z"></path>
 					</g>
-					<path d="M927.3 1491.9 L1110.25 1607 L1110.25 2296 L1110.25 2296 L1110.25 2985 L1110.25 2985 L34889.25 3171.2463710273464 L34889.3 3171.2 " fill="none"></path>
+					<path d="M33137.7 3522.5 L37301.5 3671 L32043.25 3705.672463431623 L32043.3 3705.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M922.2 1482.5 L927.3 1491.9 L916.6 1491.5 L911.5 1482.0 Z"></path>
+						<path d="M33128.5 3516.9 L33137.7 3522.5 L33128.1 3527.5 L33119.0 3521.9 Z"></path>
 					</g>
-					<path d="M944.7 1491.2 L1150.25 1607 L1150.25 2296 L1150.25 2296 L1150.25 2985 L1150.25 2985 L21394.25 3170.720202666142 L21394.3 3170.7 " fill="none"></path>
+					<path d="M32912.5 3200.3 L32912.5 3358 L32912.5 3430.5 L32912.5 3430.5 " fill="none"></path>
+					<path d="M32917.8 3200.3 L32912.5 3200.3 L32907.2 3200.3 L32912.5 3187.0 Z"></path>
+					<path d="M5185.8 2383.7 L5185.75 2985 L10354.25 3169.0430071599044 L10354.3 3169.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M939.1 1481.9 L944.7 1491.2 L933.9 1491.2 L928.4 1482.0 Z"></path>
+						<path d="M5191.1 2374.3 L5185.8 2383.7 L5180.4 2374.3 L5185.8 2365.0 Z"></path>
 					</g>
-					<path d="M12050.7 1030.2 L9563.75 1174 L11159.75 1379.9201430274136 L11159.8 1379.9 " fill="none"></path>
-					<path d="M12051.0 1035.5 L12050.7 1030.2 L12050.4 1024.8 L12064.0 1029.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M16873.5 1053.8 L16873.5 1174 L11323.75 1387.347693878457 L11323.8 1387.3 " fill="none"></path>
-					</g>
-					<path d="M16878.8 1053.8 L16873.5 1053.8 L16868.2 1053.8 L16873.5 1040.5 Z"></path>
-					<path d="M2479.1 3121.9 L2491.25 3118 L2498.75 3118 L2498.75 3118 L2506.25 3171.5 L2506.25 3171.5 L2498.75 3225 L2498.75 3225 L2491.25 3225 L2491.25 3225 L2461.25 3215.5309734513276 L2461.3 3215.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2468.5 3119.6 L2479.1 3121.9 L2471.8 3129.7 L2461.3 3127.5 Z"></path>
+						<path d="M27091.5 120.3 L27091.5 203 L27091.5 524 L27091.5 524.0 " fill="none"></path>
 					</g>
+					<path d="M27096.8 120.3 L27091.5 120.3 L27086.2 120.3 L27091.5 107.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M4849.8 2324.1 L4627.75 2985 L2461.25 3160.217801387684 L2461.3 3160.2 " fill="none"></path>
+						<path d="M27151.8 92.4 L34765.75 203 L34765.75 508.5 L34765.8 508.5 " fill="none"></path>
 					</g>
-					<path d="M4854.9 2325.8 L4849.8 2324.1 L4844.7 2322.4 L4854.0 2311.5 Z"></path>
-					<path d="M32437.5 2568.8 L32204 2985 L32204 3156 L32204.0 3156.0 " fill="none"></path>
+					<path d="M27151.9 87.0 L27151.8 92.4 L27151.8 97.7 L27138.5 92.2 Z"></path>
+					<path d="M38014.9 98.7 L36399 203 L36399 539.5 L36399 539.5 L36399 876 L36399 876 L36399 1025 L36399 1025 L36399 1174 L36399 1174 L36399 1390.5 L36399 1390.5 L36399 1607 L36399 1607 L36399 2296 L36399 2296 L36399 2985 L36399 2985 L39344.75 3168.2343450346034 L39344.8 3168.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32446.7 2563.2 L32437.5 2568.8 L32437.4 2558.0 L32446.6 2552.5 Z"></path>
+						<path d="M38024.5 103.5 L38014.9 98.7 L38023.8 92.8 L38033.5 97.5 Z"></path>
 					</g>
-					<path d="M32497.4 2570.2 L32356.5 2985 L9359.5 3170.821259910749 L9359.5 3170.8 " fill="none"></path>
+					<path d="M44329.5 120.3 L44329.5 203 L44329.5 486 L44329.5 486.0 " fill="none"></path>
+					<path d="M44334.8 120.3 L44329.5 120.3 L44324.2 120.3 L44329.5 107.0 Z"></path>
+					<path d="M43305.5 745.3 L43017.75 876 L43017.75 1025 L43017.75 1025 L43017.75 1174 L43017.75 1174 L43017.75 1390.5 L43017.75 1390.5 L43017.75 1607 L43017.75 1607 L43017.75 2296 L43017.75 2296 L43017.75 2985 L43017.75 2985 L28810.25 3169.6672997177407 L28810.3 3169.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32505.4 2563.1 L32497.4 2570.2 L32495.3 2559.6 L32503.4 2552.5 Z"></path>
+						<path d="M43316.2 746.3 L43305.5 745.3 L43311.8 736.6 L43322.5 737.6 Z"></path>
 					</g>
-					<path d="M32513.2 2570.5 L32396.5 2985 L34889.25 3168.1207779419005 L34889.3 3168.1 " fill="none"></path>
+					<path d="M43341.0 867.5 L43330.25 876 L43330.25 1009.5 L43330.3 1009.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32520.9 2562.9 L32513.2 2570.5 L32510.6 2560.0 L32518.3 2552.5 Z"></path>
+						<path d="M43351.7 866.0 L43341.0 867.5 L43345.1 857.6 L43355.7 856.0 Z"></path>
 					</g>
-					<path d="M32659.3 2570.6 L32763 2985 L33474.25 3157.775154672745 L33474.3 3157.8 " fill="none"></path>
+					<path d="M43893.4 873.3 L43894.5 876 L43894.5 986.5 L43894.5 986.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32662.2 2560.3 L32659.3 2570.6 L32651.8 2562.8 L32654.7 2552.5 Z"></path>
+						<path d="M43894.9 862.7 L43893.4 873.3 L43885.0 866.7 L43886.4 856.0 Z"></path>
 					</g>
-					<path d="M32675.1 2570.3 L32803 2985 L35944.25 3168.4342465753425 L35944.3 3168.4 " fill="none"></path>
+					<path d="M44209.8 856.4 L44237.75 876 L44237.75 1025 L44237.75 1025 L44237.75 1174 L44237.75 1174 L44237.75 1390.5 L44237.75 1390.5 L44237.75 1607 L44237.75 1607 L44237.75 2296 L44237.75 2296 L44237.75 2985 L44237.75 2985 L44237.75 3171.5 L44237.75 3171.5 L44237.75 3358 L44237.75 3358 L44237.75 3514.5 L44237.75 3514.5 L44237.75 3671 L44237.75 3671 L41565.5 3705.8287746672786 L41565.5 3705.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32677.5 2559.8 L32675.1 2570.3 L32667.3 2563.0 L32669.6 2552.5 Z"></path>
+						<path d="M44205.2 846.6 L44209.8 856.4 L44199.1 855.4 L44194.5 845.6 Z"></path>
 					</g>
-					<path d="M32690.9 2570.0 L32843 2985 L3784.25 3170.3677155928 L3784.3 3170.4 " fill="none"></path>
+					<path d="M44210.8 788.7 L44369.25 876 L44369.25 1009.5 L44369.3 1009.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32692.7 2559.4 L32690.9 2570.0 L32682.7 2563.1 L32684.5 2552.5 Z"></path>
+						<path d="M44205.2 779.6 L44210.8 788.7 L44200.1 788.9 L44194.5 779.7 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M36916.2 94.2 L32590.5 203 L32590.5 539.5 L32590.5 539.5 L32590.5 876 L32590.5 876 L32590.5 1025 L32590.5 1025 L32590.5 1174 L32590.5 1174 L32590.5 1390.5 L32590.5 1390.5 L32590.5 1607 L32590.5 1607 L32590.5 2039.5 L32590.5 2039.5 " fill="none"></path>
+						<path d="M38233.8 93.6 L43758.5 203 L43758.5 223 L43758.5 223.0 " fill="none"></path>
 					</g>
-					<path d="M36916.3 99.5 L36916.2 94.2 L36916.0 88.9 L36929.5 93.9 Z"></path>
-					<path d="M3801.6 3093.1 L3814.25 3088 L3821.75 3088 L3821.75 3088 L3829.25 3171.5 L3829.25 3171.5 L3821.75 3255 L3821.75 3255 L3814.25 3255 L3814.25 3255 L3784.25 3242.9277108433735 L3784.3 3242.9 " fill="none"></path>
+					<path d="M38233.9 88.3 L38233.8 93.6 L38233.7 98.9 L38220.5 93.4 Z"></path>
+					<path d="M28827.8 3114.9 L28840.25 3110.5 L28847.75 3110.5 L28847.75 3110.5 L28855.25 3171.5 L28855.25 3171.5 L28847.75 3232.5 L28847.75 3232.5 L28840.25 3232.5 L28840.25 3232.5 L28810.25 3221.7982456140353 L28810.3 3221.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3790.9 3091.6 L3801.6 3093.1 L3794.9 3101.5 L3784.3 3100.1 Z"></path>
+						<path d="M28817.2 3113.0 L28827.8 3114.9 L28820.8 3123.1 L28810.3 3121.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M4857.6 2324.8 L4819.25 2985 L3784.25 3144.19793814433 L3784.3 3144.2 " fill="none"></path>
+						<path d="M2997.4 2323.5 L2670.5 2985 L28528.25 3170.4885475263236 L28528.3 3170.5 " fill="none"></path>
 					</g>
-					<path d="M4862.9 2325.1 L4857.6 2324.8 L4852.3 2324.5 L4858.4 2311.5 Z"></path>
-					<path d="M3726.0 2361.2 L3726 2985 L3660.1407506702412 3088 L3660.1 3088.0 " fill="none"></path>
+					<path d="M3002.2 2325.8 L2997.4 2323.5 L2992.7 2321.1 L3003.3 2311.5 Z"></path>
+					<path d="M5748.9 2404.8 L5509.75 2985 L31329.5 3170.8127309209826 L31329.5 3170.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3731.3 2351.8 L3726.0 2361.2 L3720.7 2351.8 L3726.0 2342.5 Z"></path>
+						<path d="M5757.4 2398.2 L5748.9 2404.8 L5747.5 2394.1 L5756.0 2387.5 Z"></path>
 					</g>
-					<path d="M3945.5 1414.8 L3726 1607 L3726 2249.5 L3726.0 2249.5 " fill="none"></path>
-					<path d="M3949.0 1418.8 L3945.5 1414.8 L3942.0 1410.8 L3955.5 1406.0 Z"></path>
-					<path d="M3973.5 2361.2 L3973.5 2985 L3770.951742627346 3088 L3771.0 3088.0 " fill="none"></path>
+					<path d="M5831.3 2405.2 L6030.5 2985 L13783.5 3169.477481500383 L13783.5 3169.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3978.8 2351.8 L3973.5 2361.2 L3968.2 2351.8 L3973.5 2342.5 Z"></path>
+						<path d="M5833.3 2394.6 L5831.3 2405.2 L5823.2 2398.1 L5825.2 2387.5 Z"></path>
+					</g>
+					<path d="M4960.9 1444.1 L4091.25 1607 L5567.656023222061 2204.5 L5567.7 2204.5 " fill="none"></path>
+					<path d="M4961.9 1449.3 L4960.9 1444.1 L4959.9 1438.9 L4974.0 1441.6 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M7015.1 1419.3 L6997.75 1607 L5953.64259796807 2204.5 L5953.6 2204.5 " fill="none"></path>
 					</g>
-					<path d="M3973.3 1419.3 L3973.5 1607 L3973.5 2249.5 L3973.5 2249.5 " fill="none"></path>
-					<path d="M3978.6 1419.3 L3973.3 1419.3 L3967.9 1419.3 L3973.3 1406.0 Z"></path>
-					<path d="M4220.5 2361.2 L4220.5 2985 L3784.25 3117.563136456212 L3784.3 3117.6 " fill="none"></path>
+					<path d="M7020.4 1419.8 L7015.1 1419.3 L7009.8 1418.8 L7016.3 1406.0 Z"></path>
+					<path d="M19717.0 1413.6 L18921.75 1607 L18921.75 2242.5 L18921.8 2242.5 " fill="none"></path>
+					<path d="M19718.3 1418.8 L19717.0 1413.6 L19715.8 1408.4 L19730.0 1410.4 Z"></path>
+					<path d="M36658.0 1463.2 L36658 1607 L42310.75 2257.615117978701 L42310.8 2257.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4225.8 2351.8 L4220.5 2361.2 L4215.2 2351.8 L4220.5 2342.5 Z"></path>
+						<path d="M36663.3 1453.8 L36658.0 1463.2 L36652.7 1453.8 L36658.0 1444.5 Z"></path>
 					</g>
-					<path d="M4001.0 1414.8 L4220.5 1607 L4220.5 2249.5 L4220.5 2249.5 " fill="none"></path>
-					<path d="M4004.5 1410.8 L4001.0 1414.8 L3997.5 1418.8 L3991.0 1406.0 Z"></path>
-					<path d="M6307.3 2368.2 L6307.25 2985 L33474.25 3171.1129355152716 L33474.3 3171.1 " fill="none"></path>
+					<path d="M38906.6 555.1 L36658 876 L36658 1025 L36658 1025 L36658 1174 L36658 1174 L36658 1336.5 L36658.0 1336.5 " fill="none"></path>
+					<path d="M38907.3 560.4 L38906.6 555.1 L38905.8 549.8 L38919.8 553.2 Z"></path>
+					<path d="M44808.4 182.6 L44741 203 L44741 524 L44741.0 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6312.6 2358.8 L6307.3 2368.2 L6301.9 2358.8 L6307.3 2349.5 Z"></path>
+						<path d="M44818.9 185.0 L44808.4 182.6 L44815.8 174.8 L44826.3 177.2 Z"></path>
 					</g>
-					<path d="M6724.3 2374.9 L6547.25 2985 L4319.75 3157.5560747663553 L4319.8 3157.6 " fill="none"></path>
+					<path d="M45102.1 201.6 L45102 203 L45102 524 L45102.0 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6732.1 2367.5 L6724.3 2374.9 L6721.8 2364.5 L6729.5 2357.0 Z"></path>
+						<path d="M45108.0 192.7 L45102.1 201.6 L45097.4 192.0 L45103.3 183.0 Z"></path>
 					</g>
-					<path d="M6863.3 2366.7 L7878 2985 L33474.25 3171.0892350722634 L33474.3 3171.1 " fill="none"></path>
+					<path d="M45410.1 182.6 L45477.5 203 L45477.5 524 L45477.5 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6858.1 2357.3 L6863.3 2366.7 L6852.6 2366.4 L6847.4 2357.0 Z"></path>
+						<path d="M45402.7 174.8 L45410.1 182.6 L45399.6 185.0 L45392.3 177.2 Z"></path>
 					</g>
-					<path d="M4503.0 2376.2 L4503 2985 L3784.25 3134.5641562064156 L3784.3 3134.6 " fill="none"></path>
+					<path d="M45410.6 144.2 L45747 203 L45747 524 L45747.0 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4508.3 2366.8 L4503.0 2376.2 L4497.7 2366.8 L4503.0 2357.5 Z"></path>
+						<path d="M45402.4 137.3 L45410.6 144.2 L45400.5 147.8 L45392.3 141.0 Z"></path>
 					</g>
-					<path d="M4023.5 1411.0 L4503 1607 L4503 2234.5 L4503.0 2234.5 " fill="none"></path>
-					<path d="M4025.5 1406.1 L4023.5 1411.0 L4021.5 1416.0 L4011.2 1406.0 Z"></path>
-					<path d="M5471.3 1440.1 L4976 1607 L8937.75 2289.8809181312154 L8937.8 2289.9 " fill="none"></path>
+					<path d="M42588.1 2503.0 L42457.5 2985 L40692.25 3168.3323820130863 L40692.3 3168.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5481.9 1442.2 L5471.3 1440.1 L5478.5 1432.1 L5489.0 1434.1 Z"></path>
+						<path d="M42595.7 2495.4 L42588.1 2503.0 L42585.4 2492.6 L42593.0 2485.0 Z"></path>
 					</g>
-					<path d="M5658.0 1468.1 L5728.75 1607 L5728.75 2296 L5728.75 2296 L5728.75 2985 L5728.75 2985 L3784.25 3155.899740810556 L3784.3 3155.9 " fill="none"></path>
+					<path d="M42600.1 2503.3 L42497.5 2985 L31520.5 3169.8914427636037 L31520.5 3169.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5658.6 1457.4 L5658.0 1468.1 L5649.0 1462.2 L5649.6 1451.5 Z"></path>
+						<path d="M42607.3 2495.2 L42600.1 2503.3 L42596.8 2493.0 L42604.0 2485.0 Z"></path>
 					</g>
-					<path d="M5689.8 1465.0 L5825.75 1607 L7452.804789550072 2280.5 L7452.8 2280.5 " fill="none"></path>
+					<path d="M42688.4 2503.3 L42791 2985 L32969 3170.43331477451 L32969.0 3170.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5687.2 1454.6 L5689.8 1465.0 L5679.5 1461.9 L5676.9 1451.5 Z"></path>
+						<path d="M42691.7 2493.0 L42688.4 2503.3 L42681.2 2495.2 L42684.5 2485.0 Z"></path>
 					</g>
-					<path d="M11147.8 1437.3 L10806.75 1607 L10806.75 2265 L10806.8 2265.0 " fill="none"></path>
-					<path d="M11150.2 1442.0 L11147.8 1437.3 L11145.4 1432.5 L11159.8 1431.3 Z"></path>
-					<path d="M11335.8 1434.8 L11701.25 1607 L11701.25 2265 L11701.3 2265.0 " fill="none"></path>
-					<path d="M11338.1 1430.0 L11335.8 1434.8 L11333.5 1439.6 L11323.8 1429.1 Z"></path>
-					<path d="M11336.5 1419.5 L11948.75 1607 L11948.75 2265 L11948.8 2265.0 " fill="none"></path>
-					<path d="M11338.1 1414.4 L11336.5 1419.5 L11334.9 1424.6 L11323.8 1415.6 Z"></path>
-					<path d="M6344.7 1473.6 L5922.75 1607 L5922.75 2296 L5922.75 2296 L5922.75 2985 L5922.75 2985 L6096.959115281501 3156 L6097.0 3156.0 " fill="none"></path>
+					<path d="M42700.4 2503.0 L42831 2985 L39449.75 3168.648525664361 L39449.8 3168.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6355.2 1475.9 L6344.7 1473.6 L6352.0 1465.7 L6362.5 1468.0 Z"></path>
+						<path d="M42703.1 2492.6 L42700.4 2503.0 L42692.8 2495.4 L42695.5 2485.0 Z"></path>
 					</g>
-					<path d="M6345.0 1489.7 L6034.75 1607 L6034.75 2280.5 L6034.8 2280.5 " fill="none"></path>
+					<path d="M44206.6 742.7 L44500.75 876 L44500.75 1025 L44500.75 1025 L44500.75 1174 L44500.75 1174 L44500.75 1390.5 L44500.75 1390.5 L44500.75 1607 L44500.75 1607 L42977.75 2172.228656073256 L42977.8 2172.2 " fill="none"></path>
+					<path d="M44208.8 737.8 L44206.6 742.7 L44204.4 747.5 L44194.5 737.2 Z"></path>
+					<path d="M19717.5 1424.7 L19214.25 1607 L19214.25 2265 L19214.3 2265.0 " fill="none"></path>
+					<path d="M19719.3 1429.8 L19717.5 1424.7 L19715.6 1419.7 L19730.0 1420.2 Z"></path>
+					<path d="M19899.6 1443.9 L20166.75 1607 L20166.75 2265 L20166.8 2265.0 " fill="none"></path>
+					<path d="M19902.4 1439.4 L19899.6 1443.9 L19896.8 1448.5 L19888.2 1437.0 Z"></path>
+					<path d="M19906.5 1426.1 L20386.75 1607 L20386.75 2265 L20386.8 2265.0 " fill="none"></path>
+					<path d="M19908.4 1421.1 L19906.5 1426.1 L19904.6 1431.1 L19894.0 1421.4 Z"></path>
+					<path d="M11722.5 1470.7 L11722.5 1607 L16997.25 2286.721840370318 L16997.3 2286.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6355.7 1491.4 L6345.0 1489.7 L6351.9 1481.4 L6362.5 1483.1 Z"></path>
+						<path d="M11727.8 1461.3 L11722.5 1470.7 L11717.2 1461.3 L11722.5 1452.0 Z"></path>
 					</g>
-					<path d="M6870.1 1484.5 L7212.25 1607 L7212.25 2280.5 L7212.3 2280.5 " fill="none"></path>
+					<path d="M17400.9 1027.3 L11722.5 1174 L11722.5 1329 L11722.5 1329.0 " fill="none"></path>
+					<path d="M17401.1 1032.6 L17400.9 1027.3 L17400.8 1022.0 L17414.3 1027.0 Z"></path>
+					<path d="M8024.5 1438.6 L7745.5 1607 L9688.044085631349 2280.5 L9688.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6863.1 1476.3 L6870.1 1484.5 L6859.5 1486.4 L6852.5 1478.2 Z"></path>
+						<path d="M8035.2 1438.4 L8024.5 1438.6 L8029.7 1429.3 L8040.5 1429.0 Z"></path>
 					</g>
-					<path d="M6870.2 1476.2 L7271.25 1607 L16273.25 2290.532951289398 L16273.3 2290.5 " fill="none"></path>
+					<path d="M8132.6 1445.6 L8215.75 1607 L8363.841799709724 2280.5 L8363.8 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6863.0 1468.2 L6870.2 1476.2 L6859.7 1478.4 L6852.5 1470.4 Z"></path>
+						<path d="M8133.1 1434.9 L8132.6 1445.6 L8123.6 1439.7 L8124.1 1429.0 Z"></path>
 					</g>
-					<path d="M6870.3 1471.4 L7311.25 1607 L7653.376269956459 2280.5 L7653.4 2280.5 " fill="none"></path>
+					<path d="M8359.3 1483.6 L8295.75 1607 L9700.422714078375 2280.5 L9700.4 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6863.0 1463.5 L6870.3 1471.4 L6859.9 1473.7 L6852.5 1465.9 Z"></path>
+						<path d="M8368.3 1477.7 L8359.3 1483.6 L8358.8 1472.9 L8367.9 1467.0 Z"></path>
 					</g>
-					<path d="M6870.4 1467.0 L7351.25 1607 L20068.5 2293.651274415689 L20068.5 2293.7 " fill="none"></path>
+					<path d="M8457.0 1483.5 L8523 1607 L8370.753809869377 2280.5 L8370.8 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6863.0 1459.3 L6870.4 1467.0 L6860.0 1469.5 L6852.5 1461.8 Z"></path>
+						<path d="M8457.3 1472.7 L8457.0 1483.5 L8447.8 1477.7 L8448.2 1467.0 Z"></path>
 					</g>
-					<path d="M6870.5 1463.1 L7391.25 1607 L7924.9669811320755 2280.5 L7925.0 2280.5 " fill="none"></path>
+					<path d="M8473.2 1482.2 L8563 1607 L11459.25 2283.618208018988 L11459.3 2283.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6862.9 1455.5 L6870.5 1463.1 L6860.1 1465.8 L6852.5 1458.2 Z"></path>
+						<path d="M8472.1 1471.5 L8473.2 1482.2 L8463.4 1477.7 L8462.3 1467.0 Z"></path>
 					</g>
-					<path d="M6870.6 1459.6 L7431.25 1607 L8938.560595065312 2280.5 L8938.6 2280.5 " fill="none"></path>
+					<path d="M8671.3 1537.3 L8648.75 1607 L8648.75 2227 L8648.8 2227.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6862.9 1452.1 L6870.6 1459.6 L6860.2 1462.4 L6852.5 1454.9 Z"></path>
+						<path d="M8679.2 1530.0 L8671.3 1537.3 L8669.1 1526.7 L8677.0 1519.5 Z"></path>
 					</g>
-					<path d="M6870.6 1455.0 L7490.25 1607 L7490.25 2280.5 L7490.3 2280.5 " fill="none"></path>
+					<path d="M8749.9 1537.8 L8764.5 1607 L14216.25 2291.542484851246 L14216.3 2291.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6862.8 1447.6 L6870.6 1455.0 L6860.3 1458.0 L6852.5 1450.6 Z"></path>
+						<path d="M8753.2 1527.5 L8749.9 1537.8 L8742.7 1529.7 L8746.0 1519.5 Z"></path>
 					</g>
-					<path d="M41558.8 649.0 L40628.25 876 L40628.25 1025 L40628.25 1025 L40628.25 1174 L40628.25 1174 L40628.25 1359.5 L40628.3 1359.5 " fill="none"></path>
-					<path d="M41560.1 654.2 L41558.8 649.0 L41557.5 643.8 L41571.8 645.9 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M27965.9 95.5 L26358.75 203 L26358.75 524 L26358.8 524.0 " fill="none"></path>
+					<path d="M9966.3 2413.7 L9966.25 2985 L11087.75 3160.912321278385 L11087.8 3160.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M9971.6 2404.3 L9966.3 2413.7 L9960.9 2404.3 L9966.3 2395.0 Z"></path>
 					</g>
-					<path d="M27966.3 100.9 L27965.9 95.5 L27965.6 90.2 L27979.3 94.6 Z"></path>
-					<path d="M36948.8 3669.7 L36948.75 3671 L35569.75 3705.281862745098 L35569.8 3705.3 " fill="none"></path>
+					<path d="M8794.0 1531.3 L8834.5 1607 L9829.75 2212.899933730948 L9829.8 2212.9 " fill="none"></path>
+					<path d="M8798.7 1528.7 L8794.0 1531.3 L8789.3 1533.8 L8787.7 1519.5 Z"></path>
+					<path d="M8819.3 1530.3 L8874.5 1607 L10142.75 2247.7510540788267 L10142.8 2247.8 " fill="none"></path>
+					<path d="M8823.7 1527.2 L8819.3 1530.3 L8815.0 1533.4 L8811.6 1519.5 Z"></path>
+					<path d="M4501.0 2428.0 L4350.25 2985 L16317.5 3170.20005186184 L16317.5 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36954.1 3660.3 L36948.8 3669.7 L36943.4 3660.3 L36948.8 3651.0 Z"></path>
+						<path d="M4508.6 2420.4 L4501.0 2428.0 L4498.3 2417.6 L4505.9 2410.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M28086.6 93.4 L31654.5 203 L31654.5 524 L31654.5 524.0 " fill="none"></path>
+					<path d="M4564.3 2428.3 L4680 2985 L13783.5 3169.7747456059205 L13783.5 3169.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M4567.6 2418.1 L4564.3 2428.3 L4557.1 2420.2 L4560.5 2410.0 Z"></path>
 					</g>
-					<path d="M28086.7 88.0 L28086.6 93.4 L28086.4 98.7 L28073.3 92.9 Z"></path>
+					<path d="M4961.2 1477.6 L4536.75 1607 L4536.75 2182 L4536.8 2182.0 " fill="none"></path>
+					<path d="M4962.8 1482.7 L4961.2 1477.6 L4959.7 1472.5 L4974.0 1473.7 Z"></path>
+					<path d="M17400.9 1027.4 L11897.75 1174 L19730 1388.256831032631 L19730.0 1388.3 " fill="none"></path>
+					<path d="M17401.1 1032.7 L17400.9 1027.4 L17400.8 1022.0 L17414.3 1027.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M28086.6 93.2 L31880 203 L31880 508.5 L31880.0 508.5 " fill="none"></path>
+						<path d="M20989.8 1053.8 L20989.75 1174 L19894 1375.42634260242 L19894.0 1375.4 " fill="none"></path>
 					</g>
-					<path d="M28086.7 87.9 L28086.6 93.2 L28086.4 98.6 L28073.3 92.9 Z"></path>
-					<path d="M36910.8 94.7 L33055.5 203 L33055.5 539.5 L33055.5 539.5 L33055.5 876 L33055.5 876 L33055.5 1025 L33055.5 1025 L33055.5 1174 L33055.5 1174 L33055.5 1390.5 L33055.5 1390.5 L33055.5 1607 L33055.5 1607 L33055.5 2296 L33055.5 2296 L33055.5 2985 L33055.5 2985 L35944.25 3168.1710582235446 L35944.3 3168.2 " fill="none"></path>
+					<path d="M20995.1 1053.8 L20989.8 1053.8 L20984.4 1053.8 L20989.8 1040.5 Z"></path>
+					<path d="M9259.7 1475.9 L9188.25 1607 L9720.500725689404 2280.5 L9720.5 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36920.3 99.7 L36910.8 94.7 L36920.0 89.1 L36929.5 94.1 Z"></path>
+						<path d="M9268.9 1470.2 L9259.7 1475.9 L9259.5 1465.1 L9268.6 1459.5 Z"></path>
 					</g>
-					<path d="M42578.8 120.3 L42578.75 203 L42578.75 486 L42578.8 486.0 " fill="none"></path>
-					<path d="M42584.1 120.3 L42578.8 120.3 L42573.4 120.3 L42578.8 107.0 Z"></path>
-					<path d="M41553.8 673.4 L40867.25 876 L40867.25 1025 L40867.25 1025 L40867.25 1174 L40867.25 1174 L40867.25 1390.5 L40867.25 1390.5 L40867.25 1607 L40867.25 1607 L40867.25 2296 L40867.25 2296 L40867.25 2985 L40867.25 2985 L28977.5 3169.3142260457576 L28977.5 3169.3 " fill="none"></path>
+					<path d="M9438.0 1464.1 L9693.75 1607 L11471.340348330914 2280.5 L11471.3 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41564.3 675.9 L41553.8 673.4 L41561.3 665.7 L41571.8 668.1 Z"></path>
+						<path d="M9432.5 1454.9 L9438.0 1464.1 L9427.3 1464.2 L9421.8 1455.0 Z"></path>
 					</g>
-					<path d="M41554.1 692.5 L41009.75 876 L41009.75 1009.5 L41009.8 1009.5 " fill="none"></path>
+					<path d="M5068.6 1491.2 L4863.25 1607 L4863.25 2296 L4863.25 2296 L4863.25 2985 L4863.25 2985 L33238 3171.00507464785 L33238.0 3171.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41564.6 694.5 L41554.1 692.5 L41561.2 684.4 L41571.8 686.5 Z"></path>
+						<path d="M5079.3 1491.2 L5068.6 1491.2 L5074.1 1481.9 L5084.8 1482.0 Z"></path>
 					</g>
-					<path d="M41554.7 743.6 L41260.75 876 L41260.75 986.5 L41260.8 986.5 " fill="none"></path>
+					<path d="M5085.9 1491.9 L4903.25 1607 L4903.25 2296 L4903.25 2296 L4903.25 2985 L4903.25 2985 L34407.75 3171.2096834232925 L34407.8 3171.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41565.4 744.6 L41554.7 743.6 L41561.0 734.9 L41571.8 735.9 Z"></path>
+						<path d="M5096.7 1491.5 L5085.9 1491.9 L5091.0 1482.5 L5101.7 1482.0 Z"></path>
 					</g>
-					<path d="M42461.0 729.4 L42811 876 L42811 1025 L42811 1025 L42811 1174 L42811 1174 L42811 1390.5 L42811 1390.5 L42811 1607 L42811 1607 L42811 2296 L42811 2296 L42811 2985 L42811 2985 L42811 3171.5 L42811 3171.5 L42811 3358 L42811 3358 L42811 3514.5 L42811 3514.5 L42811 3671 L42811 3671 L41034.25 3705.5 L41034.3 3705.5 " fill="none"></path>
+					<path d="M5538.4 1441.0 L6495.25 1607 L6495.25 2296 L6495.25 2296 L6495.25 2985 L6495.25 2985 L13783.5 3169.3499983046827 L13783.5 3169.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42454.4 720.8 L42461.0 729.4 L42450.3 730.7 L42443.8 722.2 Z"></path>
+						<path d="M5530.1 1434.2 L5538.4 1441.0 L5528.3 1444.7 L5520.0 1437.8 Z"></path>
 					</g>
-					<path d="M42461.3 702.8 L42942.5 876 L42942.5 1009.5 L42942.5 1009.5 " fill="none"></path>
+					<path d="M46265.0 156.2 L46265 203 L46265 524 L46265.0 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42454.3 694.6 L42461.3 702.8 L42450.7 704.6 L42443.8 696.5 Z"></path>
+						<path d="M46270.3 146.8 L46265.0 156.2 L46259.7 146.8 L46265.0 137.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M37129.8 93.9 L42007.75 203 L42007.75 223 L42007.8 223.0 " fill="none"></path>
-					</g>
-					<path d="M37129.9 88.6 L37129.8 93.9 L37129.7 99.2 L37116.5 93.6 Z"></path>
-					<path d="M28995.1 3114.9 L29007.5 3110.5 L29015 3110.5 L29015 3110.5 L29022.5 3171.5 L29022.5 3171.5 L29015 3232.5 L29015 3232.5 L29007.5 3232.5 L29007.5 3232.5 L28977.5 3221.7982456140353 L28977.5 3221.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28984.5 3113.0 L28995.1 3114.9 L28988.1 3123.1 L28977.5 3121.2 Z"></path>
+						<path d="M8138.8 1439.9 L8255.75 1607 L8978.541727140784 2250 L8978.5 2250.0 " fill="none"></path>
 					</g>
+					<path d="M8143.2 1436.9 L8138.8 1439.9 L8134.5 1443.0 L8131.2 1429.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M4859.3 2324.8 L4859.25 2985 L28695.5 3170.4032728940974 L28695.5 3170.4 " fill="none"></path>
+						<path d="M9030.3 1472.3 L9030.25 1607 L9030.25 2250 L9030.3 2250.0 " fill="none"></path>
 					</g>
-					<path d="M4864.6 2324.8 L4859.3 2324.8 L4853.9 2324.8 L4859.3 2311.5 Z"></path>
-					<path d="M33305.6 3524.1 L29865 3671 L40931.25 3706.335555755436 L40931.3 3706.3 " fill="none"></path>
+					<path d="M9035.6 1472.3 L9030.3 1472.3 L9024.9 1472.3 L9030.3 1459.0 Z"></path>
+					<path d="M24541.1 1078.6 L24210.75 1174 L24647.10103926097 1375 L24647.1 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33315.2 3529.0 L33305.6 3524.1 L33314.7 3518.4 L33324.3 3523.3 Z"></path>
+						<path d="M24551.5 1081.1 L24541.1 1078.6 L24548.6 1070.9 L24559.0 1073.4 Z"></path>
 					</g>
-					<path d="M33570.3 3615.9 L33591.75 3671 L27039 3706.0612494818947 L27039.0 3706.1 " fill="none"></path>
+					<path d="M24541.2 1083.7 L24256.5 1174 L19894 1386.5056249296883 L19894.0 1386.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33571.8 3605.3 L33570.3 3615.9 L33561.9 3609.1 L33563.5 3598.5 Z"></path>
+						<path d="M24551.7 1086.0 L24541.2 1083.7 L24548.5 1075.8 L24559.0 1078.1 Z"></path>
 					</g>
-					<path d="M33755.6 3555.9 L34379.75 3671 L28564.75 3705.750021042 L28564.8 3705.8 " fill="none"></path>
+					<path d="M24769.1 1163.8 L24772.25 1174 L24772.25 1390.5 L24772.25 1390.5 L24772.25 1607 L24772.25 1607 L14287.25 2293.6750629722924 L14287.3 2293.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33747.4 3549.0 L33755.6 3555.9 L33745.5 3559.5 L33737.3 3552.6 Z"></path>
+						<path d="M24771.5 1153.4 L24769.1 1163.8 L24761.3 1156.5 L24763.7 1146.0 Z"></path>
 					</g>
-					<path d="M33530.8 3200.3 L33530.75 3358 L33530.75 3430.5 L33530.8 3430.5 " fill="none"></path>
-					<path d="M33536.1 3200.3 L33530.8 3200.3 L33525.4 3200.3 L33530.8 3187.0 Z"></path>
-					<path d="M9531.3 2383.7 L9531.25 2985 L6181.75 3167.7356296621324 L6181.8 3167.7 " fill="none"></path>
+					<path d="M24899.5 1157.3 L24921.25 1174 L24921.25 1375 L24921.3 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9536.6 2374.3 L9531.3 2383.7 L9525.9 2374.3 L9531.3 2365.0 Z"></path>
+						<path d="M24895.3 1147.4 L24899.5 1157.3 L24888.8 1155.9 L24884.7 1146.0 Z"></path>
 					</g>
-					<path d="M24517.0 3356.7 L24517 3358 L24517 3514.5 L24517 3514.5 L24517 3671 L24517 3671 L35471.75 3706.3419175281156 L35471.8 3706.3 " fill="none"></path>
+					<path d="M10298.7 1514.5 L10263.75 1607 L20778.75 2294.10498861912 L20778.8 2294.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24522.3 3347.3 L24517.0 3356.7 L24511.7 3347.3 L24517.0 3338.0 Z"></path>
-					</g>
-					<path d="M19002.5 2405.8 L16261.25 2985 L24236 3165.1521212488265 L24236.0 3165.2 " fill="none"></path>
-					<path d="M19003.6 2411.0 L19002.5 2405.8 L19001.4 2400.6 L19015.5 2403.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M10219.8 2340.3 L10219.75 2985 L24236 3167.8345048873034 L24236.0 3167.8 " fill="none"></path>
+						<path d="M10307.0 1507.6 L10298.7 1514.5 L10297.0 1503.8 L10305.3 1497.0 Z"></path>
 					</g>
-					<path d="M10225.1 2340.3 L10219.8 2340.3 L10214.4 2340.3 L10219.8 2327.0 Z"></path>
-					<path d="M12261.9 2337.4 L11743.5 2985 L7378.5 3162.3771652685477 L7378.5 3162.4 " fill="none"></path>
-					<path d="M12266.0 2340.7 L12261.9 2337.4 L12257.7 2334.1 L12270.2 2327.0 Z"></path>
-					<path d="M33307.5 2383.7 L33307.5 2985 L24798 3165.5382799613217 L24798.0 3165.5 " fill="none"></path>
+					<path d="M10525.9 1475.0 L10807.75 1607 L14216.25 2288.8979384436702 L14216.3 2288.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33312.8 2374.3 L33307.5 2383.7 L33302.2 2374.3 L33307.5 2365.0 Z"></path>
+						<path d="M10519.7 1466.2 L10525.9 1475.0 L10515.2 1475.9 L10509.0 1467.1 Z"></path>
 					</g>
-					<path d="M38117.2 547.0 L33307.5 876 L33307.5 1025 L33307.5 1025 L33307.5 1174 L33307.5 1174 L33307.5 1390.5 L33307.5 1390.5 L33307.5 1607 L33307.5 1607 L33307.5 2227 L33307.5 2227.0 " fill="none"></path>
-					<path d="M38117.6 552.3 L38117.2 547.0 L38116.8 541.7 L38130.5 546.1 Z"></path>
-					<path d="M27012.4 542.7 L17099 876 L17099 941 L17099.0 941.0 " fill="none"></path>
-					<path d="M27012.6 548.0 L27012.4 542.7 L27012.2 537.4 L27025.8 542.2 Z"></path>
-					<path d="M34179.1 2557.1 L33679 2985 L36828 3169.7109608429 L36828.0 3169.7 " fill="none"></path>
+					<path d="M19906.9 1415.4 L20638.75 1607 L20638.75 2219.5 L20638.8 2219.5 " fill="none"></path>
+					<path d="M19908.2 1410.2 L19906.9 1415.4 L19905.5 1420.5 L19894.0 1412.0 Z"></path>
+					<path d="M44514.2 2443.4 L44416.5 2985 L44416.5 3156 L44416.5 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34189.6 2555.1 L34179.1 2557.1 L34182.7 2547.0 L34193.2 2545.0 Z"></path>
+						<path d="M44521.1 2435.1 L44514.2 2443.4 L44510.6 2433.2 L44517.5 2425.0 Z"></path>
 					</g>
-					<path d="M34193.8 2557.5 L33719 2985 L34889.25 3164.4463514902363 L34889.3 3164.4 " fill="none"></path>
+					<path d="M44522.7 2443.5 L44456.5 2985 L33389 3170.2363591492417 L33389.0 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34204.3 2555.2 L34193.8 2557.5 L34197.2 2547.3 L34207.7 2545.0 Z"></path>
+						<path d="M44529.1 2434.9 L44522.7 2443.5 L44518.5 2433.6 L44525.0 2425.0 Z"></path>
 					</g>
-					<path d="M34208.6 2557.9 L33759 2985 L33874.067024128686 3065 L33874.1 3065.0 " fill="none"></path>
+					<path d="M44562.1 2443.5 L44640.5 2985 L32969 3170.6015305252386 L32969.0 3170.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34219.1 2555.3 L34208.6 2557.9 L34211.7 2547.6 L34222.1 2545.0 Z"></path>
+						<path d="M44566.0 2433.5 L44562.1 2443.5 L44555.5 2435.0 L44559.4 2425.0 Z"></path>
 					</g>
-					<path d="M34395.9 2562.7 L34256 2985 L33587.25 3156.9708721130646 L33587.3 3157.0 " fill="none"></path>
+					<path d="M44570.6 2443.3 L44680.5 2985 L39449.75 3169.6467373302416 L39449.8 3169.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34403.9 2555.5 L34395.9 2562.7 L34393.8 2552.2 L34401.8 2545.0 Z"></path>
+						<path d="M44574.0 2433.1 L44570.6 2443.3 L44563.5 2435.2 L44566.9 2425.0 Z"></path>
 					</g>
-					<path d="M34689.8 2559.7 L35021.25 2985 L35021.25 3171.5 L35021.25 3171.5 L35021.25 3358 L35021.25 3358 L35021.25 3514.5 L35021.25 3514.5 L35021.25 3671 L35021.25 3671 L35471.75 3703.0175175175177 L35471.8 3703.0 " fill="none"></path>
+					<path d="M44206.7 732.3 L44540.75 876 L44540.75 1025 L44540.75 1025 L44540.75 1174 L44540.75 1174 L44540.75 1390.5 L44540.75 1390.5 L44540.75 1607 L44540.75 1607 L44540.75 2167 L44540.8 2167.0 " fill="none"></path>
+					<path d="M44208.9 727.4 L44206.7 732.3 L44204.6 737.2 L44194.5 727.1 Z"></path>
+					<path d="M19907.1 1408.4 L20964.25 1607 L20964.25 2265 L20964.3 2265.0 " fill="none"></path>
+					<path d="M19908.1 1403.1 L19907.1 1408.4 L19906.1 1413.6 L19894.0 1405.9 Z"></path>
+					<path d="M6676.3 2353.2 L6676.25 2985 L31147.5 3170.960461041673 L31147.5 3171.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34688.3 2549.1 L34689.8 2559.7 L34679.8 2555.6 L34678.3 2545.0 Z"></path>
+						<path d="M6681.6 2343.8 L6676.3 2353.2 L6670.9 2343.8 L6676.3 2334.5 Z"></path>
 					</g>
-					<path d="M34952.4 2497.0 L36089.25 2985 L36089.25 3171.5 L36089.25 3171.5 L36089.25 3358 L36089.25 3358 L36808.25 3488.9173938336244 L36808.3 3488.9 " fill="none"></path>
+					<path d="M5533.2 1433.9 L6676.25 1607 L6676.25 2257.5 L6676.3 2257.5 " fill="none"></path>
+					<path d="M5534.0 1428.6 L5533.2 1433.9 L5532.4 1439.1 L5520.0 1431.9 Z"></path>
+					<path d="M25236.3 1131.7 L25143.75 1174 L25143.75 1375 L25143.8 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34945.9 2488.4 L34952.4 2497.0 L34941.7 2498.2 L34935.3 2489.6 Z"></path>
+						<path d="M25247.0 1132.7 L25236.3 1131.7 L25242.6 1123.0 L25253.3 1124.0 Z"></path>
 					</g>
-					<path d="M34952.5 2492.1 L36129.25 2985 L36007.762064343166 3156 L36007.8 3156.0 " fill="none"></path>
+					<path d="M25623.6 1134.9 L25678.25 1174 L25678.25 1390.5 L25678.25 1390.5 L25678.25 1607 L25678.25 1607 L16518.25 2292.7434671592328 L16518.3 2292.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34945.9 2483.6 L34952.5 2492.1 L34941.8 2493.4 L34935.3 2484.9 Z"></path>
+						<path d="M25619.1 1125.1 L25623.6 1134.9 L25612.9 1133.8 L25608.5 1124.0 Z"></path>
 					</g>
-					<path d="M42456.5 681.1 L43074 876 L43074 1025 L43074 1025 L43074 1174 L43074 1174 L43074 1390.5 L43074 1390.5 L43074 1607 L43074 1607 L34935.25 2259.824441922058 L34935.3 2259.8 " fill="none"></path>
-					<path d="M42458.1 676.0 L42456.5 681.1 L42454.9 686.2 L42443.8 677.1 Z"></path>
-					<path d="M37182.0 1532.6 L37168.25 1607 L34935.25 2180.2254098360654 L34935.3 2180.2 " fill="none"></path>
-					<path d="M37187.2 1533.6 L37182.0 1532.6 L37176.7 1531.6 L37184.4 1519.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M41204.9 1072.1 L41084 1174 L41084 1390.5 L41084 1390.5 L41084 1607 L41084 1607 L34935.25 2248.9165498693133 L34935.3 2248.9 " fill="none"></path>
-					</g>
-					<path d="M41208.3 1076.2 L41204.9 1072.1 L41201.4 1068.0 L41215.1 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M9060.8 1414.7 L8838.5 1607 L34033.25 2283.8834114814345 L34033.3 2283.9 " fill="none"></path>
-					</g>
-					<path d="M9064.2 1418.8 L9060.8 1414.7 L9057.3 1410.7 L9070.8 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M25293.0 1043.5 L24731 1174 L24731 1390.5 L24731 1390.5 L24731 1607 L24731 1607 L34033.25 2264.139953348884 L34033.3 2264.1 " fill="none"></path>
-					</g>
-					<path d="M25294.2 1048.7 L25293.0 1043.5 L25291.8 1038.3 L25306.0 1040.5 Z"></path>
-					<path d="M34027.3 3296.7 L34027.25 3358 L36808.25 3506.9736436761937 L36808.3 3507.0 " fill="none"></path>
+					<path d="M25704.2 1131.7 L25796.75 1174 L25796.75 1375 L25796.8 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34032.6 3287.3 L34027.3 3296.7 L34021.9 3287.3 L34027.3 3278.0 Z"></path>
+						<path d="M25697.9 1123.0 L25704.2 1131.7 L25693.5 1132.7 L25687.2 1124.0 Z"></path>
 					</g>
-					<path d="M34445.8 3135.1 L36169.25 2985 L34935.25 2480.414836795252 L34935.3 2480.4 " fill="none"></path>
+					<path d="M25710.9 1083.5 L26083.25 1174 L26083.25 1375 L26083.3 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34436.1 3130.5 L34445.8 3135.1 L34437.0 3141.2 L34427.3 3136.7 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M41216.4 1073.3 L41124 1174 L41124 1390.5 L41124 1390.5 L41124 1607 L41124 1607 L41124 2296 L41124 2296 L41124 2985 L41124 2985 L34427.25 3160.988145982316 L34427.3 3161.0 " fill="none"></path>
+						<path d="M25703.1 1076.1 L25710.9 1083.5 L25700.6 1086.5 L25692.8 1079.1 Z"></path>
 					</g>
-					<path d="M41220.3 1076.9 L41216.4 1073.3 L41212.5 1069.7 L41225.4 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M9083.5 1419.1 L9048.75 1607 L9048.75 2296 L9048.75 2296 L9048.75 2985 L9048.75 2985 L33627.25 3168.513431551134 L33627.3 3168.5 " fill="none"></path>
-					</g>
-					<path d="M9088.7 1420.1 L9083.5 1419.1 L9078.2 1418.1 L9085.9 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M25297.2 1043.7 L24771 1174 L24771 1390.5 L24771 1390.5 L24771 1607 L24771 1607 L24771 2296 L24771 2296 L24771 2985 L24771 2985 L33627.25 3163.440580688724 L33627.3 3163.4 " fill="none"></path>
-					</g>
-					<path d="M25298.5 1048.9 L25297.2 1043.7 L25295.9 1038.5 L25310.2 1040.5 Z"></path>
-					<path d="M25121.9 2443.1 L24985 2985 L33474.25 3170.266960184887 L33474.3 3170.3 " fill="none"></path>
+					<path d="M26319.4 1454.3 L26070.75 1607 L27878.15420899855 2280.5 L27878.2 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25129.3 2435.4 L25121.9 2443.1 L25119.0 2432.7 L25126.4 2425.0 Z"></path>
+						<path d="M26330.2 1453.9 L26319.4 1454.3 L26324.6 1444.8 L26335.3 1444.5 Z"></path>
 					</g>
-					<path d="M25240.8 2441.3 L25546.75 2985 L35944.25 3170.563038277512 L35944.3 3170.6 " fill="none"></path>
+					<path d="M26445.2 1462.4 L26489.25 1607 L17141.25 2290.7337579617833 L17141.3 2290.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25240.8 2430.5 L25240.8 2441.3 L25231.5 2435.7 L25231.6 2425.0 Z"></path>
+						<path d="M26447.5 1451.9 L26445.2 1462.4 L26437.3 1455.0 L26439.7 1444.5 Z"></path>
 					</g>
-					<path d="M40608.5 1433.6 L40529.25 1607 L25507 2280.400253736927 L25507.0 2280.4 " fill="none"></path>
-					<path d="M40613.4 1435.8 L40608.5 1433.6 L40603.7 1431.4 L40614.1 1421.5 Z"></path>
-					<path d="M9541.3 1440.2 L9541.25 1607 L24811 2280.6474684253494 L24811.0 2280.6 " fill="none"></path>
+					<path d="M25705.9 1061.8 L26423.25 1174 L26423.25 1336.5 L26423.3 1336.5 " fill="none"></path>
+					<path d="M25706.7 1056.6 L25705.9 1061.8 L25705.1 1067.1 L25692.8 1059.8 Z"></path>
+					<path d="M19907.2 1404.8 L21254.75 1607 L22155.44230769231 2257.5 L22155.4 2257.5 " fill="none"></path>
+					<path d="M19908.0 1399.5 L19907.2 1404.8 L19906.4 1410.1 L19894.0 1402.8 Z"></path>
+					<path d="M5533.2 1426.7 L6957.75 1607 L6957.75 2265 L6957.8 2265.0 " fill="none"></path>
+					<path d="M5533.9 1421.4 L5533.2 1426.7 L5532.6 1432.0 L5520.0 1425.0 Z"></path>
+					<path d="M22420.6 2338.6 L22055 2985 L14289.5 3168.012036393505 L14289.5 3168.0 " fill="none"></path>
+					<path d="M22425.3 2341.2 L22420.6 2338.6 L22416.0 2336.0 L22427.2 2327.0 Z"></path>
+					<path d="M12465.5 1440.2 L12465.5 1607 L28020.75 2277.5709123899205 L28020.8 2277.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9546.6 1430.8 L9541.3 1440.2 L9535.9 1430.8 L9541.3 1421.5 Z"></path>
+						<path d="M12470.8 1430.8 L12465.5 1440.2 L12460.2 1430.8 L12465.5 1421.5 Z"></path>
 					</g>
-					<path d="M18216.5 1485.0 L18037 1607 L5882.75 2292.783867335449 L5882.8 2292.8 " fill="none"></path>
+					<path d="M12073.0 1455.7 L12073 1607 L11320.077830188678 2280.5 L11320.1 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18227.2 1484.2 L18216.5 1485.0 L18221.2 1475.3 L18231.9 1474.5 Z"></path>
+						<path d="M12078.3 1446.3 L12073.0 1455.7 L12067.7 1446.3 L12073.0 1437.0 Z"></path>
 					</g>
-					<path d="M18458.4 1487.3 L18585.75 1607 L26922 2281.120624394824 L26922.0 2281.1 " fill="none"></path>
+					<path d="M17400.9 1027.5 L12073 1174 L12073 1344 L12073.0 1344.0 " fill="none"></path>
+					<path d="M17401.1 1032.8 L17400.9 1027.5 L17400.8 1022.1 L17414.3 1027.1 Z"></path>
+					<path d="M37296.0 1097.7 L37296 1174 L37296 1194 L37296.0 1194.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18455.3 1477.0 L18458.4 1487.3 L18448.0 1484.8 L18444.8 1474.5 Z"></path>
+						<path d="M37301.3 1088.3 L37296.0 1097.7 L37290.7 1088.3 L37296.0 1079.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M20439.2 1030.8 L18355.5 1174 L18355.5 1306.5 L18355.5 1306.5 " fill="none"></path>
-					</g>
-					<path d="M20439.6 1036.1 L20439.2 1030.8 L20438.8 1025.5 L20452.5 1029.9 Z"></path>
-					<path d="M12396.6 2331.4 L14273.25 2985 L7714.5 3167.3844447757856 L7714.5 3167.4 " fill="none"></path>
-					<path d="M12398.4 2326.3 L12396.6 2331.4 L12394.8 2336.4 L12384.0 2327.0 Z"></path>
-					<path d="M36605.8 2502.9 L36459 2985 L36828 3157.261576971214 L36828.0 3157.3 " fill="none"></path>
+					<path d="M38923.4 557.6 L37296 876 L37296 971 L37296.0 971.0 " fill="none"></path>
+					<path d="M38924.5 562.8 L38923.4 557.6 L38922.4 552.3 L38936.5 555.0 Z"></path>
+					<path d="M35174.4 1117.1 L35100 1174 L35100 1306.5 L35100.0 1306.5 " fill="none"></path>
+					<path d="M35177.6 1121.3 L35174.4 1117.1 L35171.1 1112.9 L35185.0 1109.0 Z"></path>
+					<path d="M37905.5 2500.3 L37565.75 2985 L40631.25 3169.6627099483203 L40631.3 3169.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36613.6 2495.5 L36605.8 2502.9 L36603.4 2492.4 L36611.2 2485.0 Z"></path>
+						<path d="M37915.3 2495.7 L37905.5 2500.3 L37906.5 2489.6 L37916.3 2485.0 Z"></path>
 					</g>
-					<path d="M36635.6 2503.4 L36558.5 2985 L34981.25 3166.2149237640538 L34981.3 3166.2 " fill="none"></path>
+					<path d="M37917.1 2500.7 L37605.75 2985 L34499.75 3168.778236040609 L34499.8 3168.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36642.3 2495.1 L36635.6 2503.4 L36631.8 2493.4 L36638.5 2485.0 Z"></path>
+						<path d="M37926.7 2495.7 L37917.1 2500.7 L37917.7 2490.0 L37927.2 2485.0 Z"></path>
 					</g>
-					<path d="M36698.7 2503.5 L36768.25 2985 L36768.25 3171.5 L36768.25 3171.5 L36768.25 3358 L36768.25 3358 L36768.25 3514.5 L36768.25 3514.5 L36768.25 3671 L36768.25 3671 L35569.75 3705.105611222445 L35569.8 3705.1 " fill="none"></path>
+					<path d="M38148.2 2501.8 L38381.75 2985 L38381.75 3171.5 L38381.75 3171.5 L38381.75 3358 L38381.75 3358 L38381.75 3514.5 L38381.75 3514.5 L38381.75 3671 L38381.75 3671 L38553.25 3698.6111111111113 L38553.3 3698.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36702.7 2493.5 L36698.7 2503.5 L36692.1 2495.0 L36696.0 2485.0 Z"></path>
+						<path d="M38149.0 2491.1 L38148.2 2501.8 L38139.4 2495.7 L38140.1 2485.0 Z"></path>
 					</g>
-					<path d="M36752.6 2502.3 L36948.75 2985 L36948.75 3171.5 L36948.75 3171.5 L36948.75 3358 L36948.75 3358 L36948.75 3378 L36948.8 3378.0 " fill="none"></path>
+					<path d="M38160.0 2501.4 L38421.75 2985 L38421.75 3171.5 L38421.75 3171.5 L38421.75 3358 L38421.75 3358 L39709.75 3499.1074553727685 L39709.8 3499.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36754.0 2491.6 L36752.6 2502.3 L36744.1 2495.7 L36745.6 2485.0 Z"></path>
+						<path d="M38160.2 2490.7 L38160.0 2501.4 L38150.8 2495.7 L38151.1 2485.0 Z"></path>
 					</g>
-					<path d="M36764.4 2501.9 L36988.75 2985 L36049.25 3161.6297883064517 L36049.3 3161.6 " fill="none"></path>
+					<path d="M38435.3 2493.5 L39397.25 2985 L39397.25 3156 L39397.3 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36765.3 2491.2 L36764.4 2501.9 L36755.6 2495.7 L36756.5 2485.0 Z"></path>
+						<path d="M38429.4 2484.5 L38435.3 2493.5 L38424.5 2494.0 L38418.7 2485.0 Z"></path>
 					</g>
-					<path d="M42456.5 676.0 L43114 876 L43114 1025 L43114 1025 L43114 1174 L43114 1174 L43114 1390.5 L43114 1390.5 L43114 1607 L43114 1607 L37088.25 2251.1552693844305 L37088.3 2251.2 " fill="none"></path>
-					<path d="M42458.1 670.9 L42456.5 676.0 L42455.0 681.1 L42443.8 672.1 Z"></path>
-					<path d="M35797.1 1451.2 L34790 1607 L36249.25 2142.1554224883566 L36249.3 2142.2 " fill="none"></path>
-					<path d="M35797.9 1456.5 L35797.1 1451.2 L35796.3 1445.9 L35810.3 1449.1 Z"></path>
+					<path d="M44207.6 615.2 L45756.25 876 L45756.25 1025 L45756.25 1025 L45756.25 1174 L45756.25 1174 L45756.25 1390.5 L45756.25 1390.5 L45756.25 1607 L45756.25 1607 L38468.25 2258.4994485890365 L38468.3 2258.5 " fill="none"></path>
+					<path d="M44208.5 609.9 L44207.6 615.2 L44206.8 620.4 L44194.5 612.9 Z"></path>
+					<path d="M37013.8 1594.8 L36997 1607 L37760.24383164006 2107 L37760.2 2107.0 " fill="none"></path>
+					<path d="M37016.9 1599.1 L37013.8 1594.8 L37010.7 1590.5 L37024.6 1587.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41273.9 1076.4 L41299 1174 L41299 1390.5 L41299 1390.5 L41299 1607 L41299 1607 L37088.25 2233.576696722639 L37088.3 2233.6 " fill="none"></path>
+						<path d="M43773.0 1052.4 L43232.75 1174 L43232.75 1390.5 L43232.75 1390.5 L43232.75 1607 L43232.75 1607 L38468.25 2240.2446952160494 L38468.3 2240.2 " fill="none"></path>
 					</g>
-					<path d="M41279.1 1075.1 L41273.9 1076.4 L41268.8 1077.7 L41270.6 1063.5 Z"></path>
+					<path d="M43774.2 1057.6 L43773.0 1052.4 L43771.8 1047.2 L43786.0 1049.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M9088.8 1419.3 L9088.75 1607 L36249.25 2285.5201051486583 L36249.3 2285.5 " fill="none"></path>
+						<path d="M14181.2 1417.5 L14070 1607 L37629.25 2283.946181514883 L37629.3 2283.9 " fill="none"></path>
 					</g>
-					<path d="M9094.1 1419.3 L9088.8 1419.3 L9083.4 1419.3 L9088.8 1406.0 Z"></path>
+					<path d="M14185.8 1420.2 L14181.2 1417.5 L14176.6 1414.8 L14187.9 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M25341.7 1048.6 L25176.75 1174 L25176.75 1390.5 L25176.75 1390.5 L25176.75 1607 L25176.75 1607 L36249.25 2270.8489819004526 L36249.3 2270.8 " fill="none"></path>
+						<path d="M29291.0 1033.7 L27515 1174 L27515 1390.5 L27515 1390.5 L27515 1607 L27515 1607 L37629.25 2268.5610062893084 L37629.3 2268.6 " fill="none"></path>
 					</g>
-					<path d="M25345.0 1052.8 L25341.7 1048.6 L25338.5 1044.3 L25352.4 1040.5 Z"></path>
-					<path d="M25833.7 2546.3 L25586.75 2985 L36828 3170.9953534278175 L36828.0 3171.0 " fill="none"></path>
+					<path d="M29291.4 1039.0 L29291.0 1033.7 L29290.5 1028.4 L29304.3 1032.6 Z"></path>
+					<path d="M31153.5 2450.6 L31018.5 2985 L32856 3165.936510031679 L32856.0 3165.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25842.9 2540.7 L25833.7 2546.3 L25833.6 2535.5 L25842.8 2530.0 Z"></path>
+						<path d="M31160.9 2442.9 L31153.5 2450.6 L31150.6 2440.2 L31158.0 2432.5 Z"></path>
 					</g>
-					<path d="M25896.3 2547.8 L25760.5 2985 L33474.25 3170.1438982014733 L33474.3 3170.1 " fill="none"></path>
+					<path d="M31241.4 2450.3 L31411 2985 L39344.75 3170.2739865393646 L39344.8 3170.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25904.1 2540.5 L25896.3 2547.8 L25894.0 2537.3 L25901.8 2530.0 Z"></path>
+						<path d="M31243.7 2439.8 L31241.4 2450.3 L31233.5 2443.0 L31235.8 2432.5 Z"></path>
 					</g>
-					<path d="M26038.1 2548.1 L26148.25 2985 L26148.25 3171.5 L26148.25 3171.5 L26148.25 3358 L26148.25 3358 L26148.25 3514.5 L26148.25 3514.5 L26148.25 3671 L26148.25 3671 L35471.75 3706.314403841024 L35471.8 3706.3 " fill="none"></path>
+					<path d="M42703.3 1430.4 L42505.25 1607 L31540.5 2274.8051534772712 L31540.5 2274.8 " fill="none"></path>
+					<path d="M42706.8 1434.4 L42703.3 1430.4 L42699.7 1426.4 L42713.2 1421.5 Z"></path>
+					<path d="M42102.8 1553.1 L42067 1607 L31540.5 2273.9509862522414 L31540.5 2274.0 " fill="none"></path>
+					<path d="M42107.2 1556.1 L42102.8 1553.1 L42098.3 1550.2 L42110.2 1542.0 Z"></path>
+					<path d="M37315.9 1605.6 L37316 1607 L37316 2296 L37316 2296 L37316 2985 L37316 2985 L27953.25 3170.057136422648 L27953.3 3170.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26041.0 2537.7 L26038.1 2548.1 L26030.6 2540.4 L26033.5 2530.0 Z"></path>
+						<path d="M37320.3 1595.8 L37315.9 1605.6 L37309.7 1596.8 L37314.2 1587.0 Z"></path>
 					</g>
-					<path d="M26052.6 2547.8 L26188.25 2985 L26188.25 3171.5 L26188.25 3171.5 L26188.25 3358 L26188.25 3358 L36808.25 3512.456577296594 L36808.3 3512.5 " fill="none"></path>
+					<path d="M37693.6 1430.7 L39437.25 1607 L39437.25 2296 L39437.25 2296 L39437.25 2985 L39437.25 2985 L32969 3169.885033909345 L32969.0 3169.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26055.0 2537.3 L26052.6 2547.8 L26044.8 2540.5 L26047.1 2530.0 Z"></path>
+						<path d="M37684.8 1424.5 L37693.6 1430.7 L37683.7 1435.1 L37675.0 1428.8 Z"></path>
 					</g>
-					<path d="M26067.1 2547.5 L26228.25 2985 L35944.25 3170.497671085632 L35944.3 3170.5 " fill="none"></path>
+					<path d="M27211.2 540.7 L198.75 876 L198.75 926 L198.8 926.0 " fill="none"></path>
+					<path d="M27211.2 546.0 L27211.2 540.7 L27211.1 535.3 L27224.5 540.5 Z"></path>
+					<path d="M6307.3 2413.7 L6307.25 2985 L27807.25 3170.8689102118387 L27807.3 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26068.9 2536.9 L26067.1 2547.5 L26058.9 2540.6 L26060.7 2530.0 Z"></path>
-					</g>
-					<path d="M40616.3 1434.4 L40569.25 1607 L26402 2275.818256564861 L26402.0 2275.8 " fill="none"></path>
-					<path d="M40621.4 1435.8 L40616.3 1434.4 L40611.2 1433.0 L40619.8 1421.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M41287.2 1075.3 L41339 1174 L41339 1390.5 L41339 1390.5 L41339 1607 L41339 1607 L26402 2276.829346871034 L26402.0 2276.8 " fill="none"></path>
+						<path d="M6312.6 2404.3 L6307.3 2413.7 L6301.9 2404.3 L6307.3 2395.0 Z"></path>
 					</g>
-					<path d="M41291.9 1072.8 L41287.2 1075.3 L41282.4 1077.8 L41281.0 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M9094.0 1419.1 L9128.75 1607 L25547 2278.515026045145 L25547.0 2278.5 " fill="none"></path>
+						<path d="M9052.2 1027.4 L3914.75 1174 L3914.75 1390.5 L3914.75 1390.5 L3914.75 1607 L3914.75 1607 L6159.25 2253.378474399164 L6159.3 2253.4 " fill="none"></path>
 					</g>
-					<path d="M9099.3 1418.1 L9094.0 1419.1 L9088.8 1420.1 L9091.6 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M25448.3 1043.7 L25974.5 1174 L25974.5 1390.5 L25974.5 1390.5 L25974.5 1607 L25974.5 1607 L25974.5 2062 L25974.5 2062.0 " fill="none"></path>
+					<path d="M9052.3 1032.8 L9052.2 1027.4 L9052.0 1022.1 L9065.5 1027.0 Z"></path>
+					<path d="M14955.5 1440.2 L14955.5 1607 L30844.5 2281.2329863891114 L30844.5 2281.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M14960.8 1430.8 L14955.5 1440.2 L14950.2 1430.8 L14955.5 1421.5 Z"></path>
 					</g>
-					<path d="M25449.6 1038.5 L25448.3 1043.7 L25447.0 1048.9 L25435.3 1040.5 Z"></path>
-					<path d="M31796.9 1117.1 L31722.5 1174 L31722.5 1306.5 L31722.5 1306.5 " fill="none"></path>
-					<path d="M31800.1 1121.3 L31796.9 1117.1 L31793.6 1112.9 L31807.5 1109.0 Z"></path>
-					<path d="M20593.5 2413.7 L20593.5 2985 L30395.5 3170.121316455696 L30395.5 3170.1 " fill="none"></path>
+					<path d="M7346.8 1478.2 L7346.75 1607 L6455.25 2197.9028379028377 L6455.3 2197.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20598.8 2404.3 L20593.5 2413.7 L20588.2 2404.3 L20593.5 2395.0 Z"></path>
+						<path d="M7352.1 1468.8 L7346.8 1478.2 L7341.4 1468.8 L7346.8 1459.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M20599.2 1061.9 L20827.75 1174 L20827.75 1390.5 L20827.75 1390.5 L20827.75 1607 L20827.75 1607 L20627.158563134977 2197 L20627.2 2197.0 " fill="none"></path>
+						<path d="M9052.2 1032.1 L7346.75 1174 L7346.75 1321.5 L7346.8 1321.5 " fill="none"></path>
+					</g>
+					<path d="M9052.7 1037.4 L9052.2 1032.1 L9051.8 1026.7 L9065.5 1031.0 Z"></path>
+					<path d="M28250.5 2544.6 L27900.25 2985 L40631.25 3171.054264780786 L40631.3 3171.1 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M28260.5 2540.6 L28250.5 2544.6 L28252.2 2534.0 L28262.1 2530.0 Z"></path>
 					</g>
-					<path d="M20601.5 1057.1 L20599.2 1061.9 L20596.8 1066.7 L20587.2 1056.0 Z"></path>
-					<path d="M8251.3 1455.7 L8251.25 1607 L8251.25 2280.5 L8251.3 2280.5 " fill="none"></path>
+					<path d="M28264.6 2545.0 L27940.25 2985 L32856 3169.380788375484 L32856.0 3169.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8256.6 1446.3 L8251.3 1455.7 L8245.9 1446.3 L8251.3 1437.0 Z"></path>
+						<path d="M28274.5 2540.7 L28264.6 2545.0 L28265.9 2534.3 L28275.7 2530.0 Z"></path>
 					</g>
-					<path d="M12050.7 1030.2 L9603.75 1174 L8416.25 1364.0878003696857 L8416.3 1364.1 " fill="none"></path>
-					<path d="M12051.0 1035.6 L12050.7 1030.2 L12050.4 1024.9 L12064.0 1029.5 Z"></path>
-					<path d="M31571.8 2443.4 L30815.75 2985 L33474.25 3167.6188766114183 L33474.3 3167.6 " fill="none"></path>
+					<path d="M28448.3 2548.7 L28448.25 2985 L28448.25 3171.5 L28448.25 3171.5 L28448.25 3358 L28448.25 3358 L28448.25 3514.5 L28448.25 3514.5 L28448.25 3671 L28448.25 3671 L38553.25 3706.3286882016937 L38553.3 3706.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31582.5 2442.3 L31571.8 2443.4 L31576.3 2433.6 L31587.0 2432.5 Z"></path>
+						<path d="M28453.6 2539.3 L28448.3 2548.7 L28442.9 2539.3 L28448.3 2530.0 Z"></path>
 					</g>
-					<path d="M31863.2 2448.8 L32164 2985 L35944.25 3168.9453721218447 L35944.3 3168.9 " fill="none"></path>
+					<path d="M28462.9 2548.6 L28488.25 2985 L28488.25 3171.5 L28488.25 3171.5 L28488.25 3358 L28488.25 3358 L39709.75 3512.564755324767 L39709.8 3512.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31863.3 2438.0 L31863.2 2448.8 L31854.0 2443.2 L31854.1 2432.5 Z"></path>
+						<path d="M28467.7 2539.0 L28462.9 2548.6 L28457.1 2539.6 L28461.8 2530.0 Z"></path>
 					</g>
-					<path d="M40624.4 1434.8 L40609.25 1607 L32125.5 2268.8511336937754 L32125.5 2268.9 " fill="none"></path>
-					<path d="M40629.7 1435.2 L40624.4 1434.8 L40619.1 1434.3 L40625.5 1421.5 Z"></path>
-					<path d="M39483.2 1552.0 L39435 1607 L32125.5 2264.687952987267 L32125.5 2264.7 " fill="none"></path>
-					<path d="M39487.2 1555.5 L39483.2 1552.0 L39479.2 1548.5 L39492.0 1542.0 Z"></path>
-					<path d="M21533.5 1478.2 L21533.5 1607 L20728.565312046445 2197 L20728.6 2197.0 " fill="none"></path>
+					<path d="M28661.8 2544.1 L29041.25 2985 L39344.75 3170.554533603708 L39344.8 3170.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21538.8 1468.8 L21533.5 1478.2 L21528.2 1468.8 L21533.5 1459.5 Z"></path>
+						<path d="M28659.8 2533.6 L28661.8 2544.1 L28651.7 2540.6 L28649.6 2530.0 Z"></path>
+					</g>
+					<path d="M42709.9 1431.2 L42545.25 1607 L28875.75 2275.105660778889 L28875.8 2275.1 " fill="none"></path>
+					<path d="M42713.7 1434.9 L42709.9 1431.2 L42706.0 1427.6 L42719.0 1421.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M43773.0 1054.1 L43272.75 1174 L43272.75 1390.5 L43272.75 1390.5 L43272.75 1607 L43272.75 1607 L28875.75 2276.1310330871192 L28875.8 2276.1 " fill="none"></path>
+					</g>
+					<path d="M43774.3 1059.3 L43773.0 1054.1 L43771.8 1048.9 L43786.0 1051.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M14185.8 1418.4 L14110 1607 L28020.75 2275.457221069517 L28020.8 2275.5 " fill="none"></path>
 					</g>
+					<path d="M14190.7 1420.4 L14185.8 1418.4 L14180.9 1416.4 L14190.8 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M20608.7 1037.5 L21533.5 1174 L21533.5 1321.5 L21533.5 1321.5 " fill="none"></path>
+						<path d="M29291.1 1042.2 L28448.25 1174 L28448.25 1390.5 L28448.25 1390.5 L28448.25 1607 L28448.25 1607 L28448.25 2062 L28448.3 2062.0 " fill="none"></path>
 					</g>
-					<path d="M20609.5 1032.2 L20608.7 1037.5 L20607.9 1042.8 L20595.5 1035.6 Z"></path>
-					<path d="M15272.0 1440.2 L15272 1607 L25547 2268.478626489138 L25547.0 2268.5 " fill="none"></path>
+					<path d="M29291.9 1047.4 L29291.1 1042.2 L29290.3 1036.9 L29304.3 1040.1 Z"></path>
+					<path d="M22430.3 2339.7 L22216 2985 L15175.5 3166.4361268481416 L15175.5 3166.4 " fill="none"></path>
+					<path d="M22435.3 2341.3 L22430.3 2339.7 L22425.2 2338.0 L22434.5 2327.0 Z"></path>
+					<path d="M586.8 1112.7 L586.75 1174 L586.75 1375 L586.8 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15277.3 1430.8 L15272.0 1440.2 L15266.7 1430.8 L15272.0 1421.5 Z"></path>
+						<path d="M592.1 1103.3 L586.8 1112.7 L581.4 1103.3 L586.8 1094.0 Z"></path>
 					</g>
-					<path d="M36209.1 1605.6 L36209.25 1607 L36209.25 2296 L36209.25 2296 L36209.25 2985 L36209.25 2985 L30541.5 3169.128445760571 L30541.5 3169.1 " fill="none"></path>
+					<path d="M27211.2 540.7 L586.75 876 L586.75 956 L586.8 956.0 " fill="none"></path>
+					<path d="M27211.2 546.0 L27211.2 540.7 L27211.1 535.4 L27224.5 540.5 Z"></path>
+					<path d="M19609.4 2377.1 L18898.5 2985 L32856 3170.74809119452 L32856.0 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36213.6 1595.8 L36209.1 1605.6 L36203.0 1596.8 L36207.4 1587.0 Z"></path>
+						<path d="M19619.9 2375.1 L19609.4 2377.1 L19613.0 2367.0 L19623.6 2365.0 Z"></path>
 					</g>
-					<path d="M36586.4 1482.1 L37128.25 1607 L37128.25 2296 L37128.25 2296 L37128.25 2985 L37128.25 2985 L33587.25 3168.5709520500345 L33587.3 3168.6 " fill="none"></path>
+					<path d="M19811.4 2376.2 L20624.75 2985 L13407.5 3168.9135269000853 L13407.5 3168.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36578.5 1474.8 L36586.4 1482.1 L36576.1 1485.2 L36568.3 1477.9 Z"></path>
+						<path d="M19807.1 2366.3 L19811.4 2376.2 L19800.7 2374.9 L19796.4 2365.0 Z"></path>
 					</g>
-					<path d="M15706.0 1440.2 L15706 1607 L31429.5 2281.080919640357 L31429.5 2281.1 " fill="none"></path>
+					<path d="M16099.0 1510.7 L16010 1607 L17245.80896226415 2280.5 L17245.8 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15711.3 1430.8 L15706.0 1440.2 L15700.7 1430.8 L15706.0 1421.5 Z"></path>
+						<path d="M16109.2 1507.5 L16099.0 1510.7 L16101.4 1500.2 L16111.6 1497.0 Z"></path>
 					</g>
-					<path d="M27012.4 542.8 L17459 876 L17459 926 L17459.0 926.0 " fill="none"></path>
-					<path d="M27012.6 548.1 L27012.4 542.8 L27012.2 537.5 L27025.8 542.3 Z"></path>
-					<path d="M36189.3 1097.7 L36189.25 1174 L36189.25 1194 L36189.3 1194.0 " fill="none"></path>
+					<path d="M16221.6 1515.6 L16230 1607 L16469.24401306241 2280.5 L16469.2 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36194.6 1088.3 L36189.3 1097.7 L36183.9 1088.3 L36189.3 1079.0 Z"></path>
+						<path d="M16226.0 1505.8 L16221.6 1515.6 L16215.4 1506.8 L16219.8 1497.0 Z"></path>
 					</g>
-					<path d="M38119.5 557.2 L36189.25 876 L36189.25 971 L36189.3 971.0 " fill="none"></path>
-					<path d="M38120.4 562.4 L38119.5 557.2 L38118.6 551.9 L38132.7 555.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M27012.4 544.3 L20524 876 L20524 994 L20524.0 994.0 " fill="none"></path>
+					<path d="M17293.5 1515.4 L17277.5 1607 L18135.9925616836 2280.5 L18136.0 2280.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M17300.3 1507.1 L17293.5 1515.4 L17289.8 1505.3 L17296.7 1497.0 Z"></path>
 					</g>
-					<path d="M27012.7 549.7 L27012.4 544.3 L27012.2 539.0 L27025.8 543.7 Z"></path>
-					<path d="M21977.5 1493.2 L21977.5 1607 L22950.25 2191.4558534990188 L22950.3 2191.5 " fill="none"></path>
+					<path d="M17426.7 1510.7 L17516 1607 L16498.174346879536 2280.5 L16498.2 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21982.8 1483.8 L21977.5 1493.2 L21972.2 1483.8 L21977.5 1474.5 Z"></path>
+						<path d="M17424.3 1500.2 L17426.7 1510.7 L17416.4 1507.5 L17414.0 1497.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M20608.8 1033.7 L21977.5 1174 L21977.5 1306.5 L21977.5 1306.5 " fill="none"></path>
+					<path d="M10282.4 3120.9 L10294.25 3118 L10301.75 3118 L10301.75 3118 L10309.25 3171.5 L10309.25 3171.5 L10301.75 3225 L10301.75 3225 L10294.25 3225 L10294.25 3225 L10264.25 3217.7539503386006 L10264.3 3217.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M10272.1 3117.9 L10282.4 3120.9 L10274.6 3128.2 L10264.3 3125.2 Z"></path>
 					</g>
-					<path d="M20609.3 1028.4 L20608.8 1033.7 L20608.2 1039.0 L20595.5 1032.3 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M20608.8 1029.9 L23124.25 1174 L23124.25 1390.5 L23124.25 1390.5 L23124.25 1607 L23124.25 1607 L23124.25 2182 L23124.3 2182.0 " fill="none"></path>
+						<path d="M2998.9 2323.7 L2710.5 2985 L9881.25 3166.648935447723 L9881.3 3166.6 " fill="none"></path>
 					</g>
-					<path d="M20609.1 1024.5 L20608.8 1029.9 L20608.5 1035.2 L20595.5 1029.1 Z"></path>
-					<path d="M12413.2 2330.8 L14638.5 2985 L8368.5 3168.2414009245476 L8368.5 3168.2 " fill="none"></path>
-					<path d="M12414.7 2325.6 L12413.2 2330.8 L12411.7 2335.9 L12400.4 2327.0 Z"></path>
-					<path d="M43770.4 2555.6 L43662 2985 L36889 3170.663922980819 L36889.0 3170.7 " fill="none"></path>
+					<path d="M3003.8 2325.9 L2998.9 2323.7 L2994.0 2321.6 L3004.2 2311.5 Z"></path>
+					<path d="M12932.5 1470.7 L12932.5 1607 L21091.75 2256.7036491288895 L21091.8 2256.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43777.9 2547.9 L43770.4 2555.6 L43767.6 2545.2 L43775.0 2537.5 Z"></path>
+						<path d="M12937.8 1461.3 L12932.5 1470.7 L12927.2 1461.3 L12932.5 1452.0 Z"></path>
 					</g>
-					<path d="M43894.0 2555.7 L43990 2985 L33587.25 3170.492542486316 L33587.3 3170.5 " fill="none"></path>
+					<path d="M17400.9 1027.9 L12932.5 1174 L12932.5 1329 L12932.5 1329.0 " fill="none"></path>
+					<path d="M17401.1 1033.3 L17400.9 1027.9 L17400.7 1022.6 L17414.3 1027.5 Z"></path>
+					<path d="M47864.0 120.3 L47864 203 L47864 493 L47864.0 493.0 " fill="none"></path>
+					<path d="M47869.3 120.3 L47864.0 120.3 L47858.7 120.3 L47864.0 107.0 Z"></path>
+					<path d="M13451.5 1470.7 L13451.5 1607 L21091.75 2254.1962194559705 L21091.8 2254.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43897.2 2545.4 L43894.0 2555.7 L43886.8 2547.8 L43890.0 2537.5 Z"></path>
+						<path d="M13456.8 1461.3 L13451.5 1470.7 L13446.2 1461.3 L13451.5 1452.0 Z"></path>
 					</g>
-					<path d="M43909.1 2555.5 L44030 2985 L36049.25 3170.2811595555972 L36049.3 3170.3 " fill="none"></path>
+					<path d="M17400.9 1028.3 L13451.5 1174 L13451.5 1329 L13451.5 1329.0 " fill="none"></path>
+					<path d="M17401.1 1033.6 L17400.9 1028.3 L17400.7 1023.0 L17414.3 1027.8 Z"></path>
+					<path d="M21187.5 2593.7 L20664.75 2985 L10264.25 3168.128139161631 L10264.3 3168.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43911.7 2545.0 L43909.1 2555.5 L43901.4 2547.9 L43904.0 2537.5 Z"></path>
+						<path d="M21198.2 2592.4 L21187.5 2593.7 L21191.8 2583.8 L21202.5 2582.5 Z"></path>
 					</g>
-					<path d="M42456.9 606.5 L44264 876 L44264 1025 L44264 1025 L44264 1174 L44264 1174 L44264 1390.5 L44264 1390.5 L44264 1607 L44264 1607 L43986.01741654572 2054.5 L43986.0 2054.5 " fill="none"></path>
-					<path d="M42457.7 601.2 L42456.9 606.5 L42456.2 611.8 L42443.8 604.5 Z"></path>
-					<path d="M32112.0 1508.2 L32112 1607 L27290 2270.6751897722734 L27290.0 2270.7 " fill="none"></path>
+					<path d="M21756.5 2598.7 L21975 2985 L32856 3170.5365942857143 L32856.0 3170.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32117.3 1498.8 L32112.0 1508.2 L32106.7 1498.8 L32112.0 1489.5 Z"></path>
+						<path d="M21756.6 2588.0 L21756.5 2598.7 L21747.3 2593.2 L21747.3 2582.5 Z"></path>
 					</g>
-					<path d="M32037.6 1117.1 L32112 1174 L32112 1291.5 L32112.0 1291.5 " fill="none"></path>
-					<path d="M32040.9 1112.9 L32037.6 1117.1 L32034.4 1121.3 L32027.0 1109.0 Z"></path>
-					<path d="M16958.5 1440.2 L16958.5 1607 L29941.75 2278.0142897327705 L29941.8 2278.0 " fill="none"></path>
+					<path d="M21773.8 2598.3 L22015 2985 L39344.75 3170.936709862072 L39344.8 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16963.8 1430.8 L16958.5 1440.2 L16953.2 1430.8 L16958.5 1421.5 Z"></path>
+						<path d="M21773.4 2587.6 L21773.8 2598.3 L21764.4 2593.2 L21763.9 2582.5 Z"></path>
 					</g>
-					<path d="M30126.6 2522.6 L29793.75 2985 L36828 3170.6948405817616 L36828.0 3170.7 " fill="none"></path>
+					<path d="M42716.7 1432.2 L42585.25 1607 L22078.75 2279.8085 L22078.8 2279.8 " fill="none"></path>
+					<path d="M42720.9 1435.4 L42716.7 1432.2 L42712.4 1429.0 L42724.7 1421.5 Z"></path>
+					<path d="M21914.7 1481.2 L21585.25 1607 L21585.25 2009.5 L21585.3 2009.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30136.4 2518.2 L30126.6 2522.6 L30127.7 2512.0 L30137.5 2507.5 Z"></path>
+						<path d="M21925.3 1482.8 L21914.7 1481.2 L21921.5 1472.8 L21932.1 1474.5 Z"></path>
 					</g>
-					<path d="M30436.8 2523.2 L30735.75 2985 L33474.25 3167.7299642218245 L33474.3 3167.7 " fill="none"></path>
+					<path d="M22389.3 1481.2 L22718.75 1607 L22718.75 2280.5 L22718.8 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30436.2 2512.4 L30436.8 2523.2 L30427.3 2518.2 L30426.7 2507.5 Z"></path>
-					</g>
-					<path d="M30449.7 2522.8 L30775.75 2985 L35944.25 3169.624640873396 L35944.3 3169.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M30448.7 2512.1 L30449.7 2522.8 L30440.0 2518.2 L30438.9 2507.5 Z"></path>
-					</g>
-					<path d="M40640.4 1434.3 L40688.25 1607 L30637.75 2272.9416742799444 L30637.8 2272.9 " fill="none"></path>
-					<path d="M40645.5 1432.9 L40640.4 1434.3 L40635.3 1435.8 L40636.8 1421.5 Z"></path>
-					<path d="M37208.3 1532.8 L37208.25 1607 L30637.75 2261.3433547734335 L30637.8 2261.3 " fill="none"></path>
-					<path d="M37213.6 1532.8 L37208.3 1532.8 L37202.9 1532.8 L37208.3 1519.5 Z"></path>
-					<path d="M39642.6 1555.3 L39648.25 1607 L30637.75 2270.379227440295 L30637.8 2270.4 " fill="none"></path>
-					<path d="M39647.9 1554.7 L39642.6 1555.3 L39637.3 1555.8 L39641.2 1542.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M41299.6 1073.9 L41379 1174 L41379 1390.5 L41379 1390.5 L41379 1607 L41379 1607 L30637.75 2274.3779786730393 L30637.8 2274.4 " fill="none"></path>
+						<path d="M22382.5 1472.8 L22389.3 1481.2 L22378.7 1482.8 L22371.9 1474.5 Z"></path>
 					</g>
-					<path d="M41303.8 1070.6 L41299.6 1073.9 L41295.4 1077.3 L41291.3 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M9099.1 1418.5 L9168.75 1607 L29941.75 2284.647696605274 L29941.8 2284.6 " fill="none"></path>
-					</g>
-					<path d="M9104.1 1416.7 L9099.1 1418.5 L9094.1 1420.4 L9094.5 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M25468.6 1043.0 L26168.25 1174 L26168.25 1390.5 L26168.25 1390.5 L26168.25 1607 L26168.25 1607 L29941.75 2237.8240931699625 L29941.8 2237.8 " fill="none"></path>
-					</g>
-					<path d="M25469.6 1037.7 L25468.6 1043.0 L25467.6 1048.2 L25455.5 1040.5 Z"></path>
-					<path d="M8628.3 1455.7 L8628.25 1607 L8628.25 2280.5 L8628.3 2280.5 " fill="none"></path>
+					<path d="M43411.4 2487.3 L43212.75 2985 L40692.25 3169.2701881615053 L40692.3 3169.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8633.6 1446.3 L8628.3 1455.7 L8622.9 1446.3 L8628.3 1437.0 Z"></path>
+						<path d="M43419.8 2480.6 L43411.4 2487.3 L43409.9 2476.7 L43418.3 2470.0 Z"></path>
 					</g>
-					<path d="M12050.7 1030.7 L9812.25 1174 L8800.25 1359.0489864864865 L8800.3 1359.0 " fill="none"></path>
-					<path d="M12051.0 1036.0 L12050.7 1030.7 L12050.4 1025.4 L12064.0 1029.9 Z"></path>
-					<path d="M12414.1 2318.1 L16005.5 2985 L8718.5 3167.615627519484 L8718.5 3167.6 " fill="none"></path>
-					<path d="M12415.1 2312.9 L12414.1 2318.1 L12413.1 2323.4 L12401.0 2315.7 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M20608.8 1028.9 L23803.25 1174 L23803.25 1329 L23803.3 1329.0 " fill="none"></path>
-					</g>
-					<path d="M20609.1 1023.5 L20608.8 1028.9 L20608.6 1034.2 L20595.5 1028.2 Z"></path>
-					<path d="M37755.5 2494.9 L37561.25 2985 L36889 3163.4057274991105 L36889.0 3163.4 " fill="none"></path>
+					<path d="M43422.4 2487.7 L43252.75 2985 L34499.75 3170.525002841232 L34499.8 3170.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37763.9 2488.1 L37755.5 2494.9 L37753.9 2484.2 L37762.3 2477.5 Z"></path>
+						<path d="M43430.4 2480.6 L43422.4 2487.7 L43420.3 2477.1 L43428.4 2470.0 Z"></path>
 					</g>
-					<path d="M37822.6 2496.1 L37794.25 2985 L34981.25 3168.4993004547046 L34981.3 3168.5 " fill="none"></path>
+					<path d="M43433.4 2488.0 L43292.75 2985 L39304.75 3153.672638621159 L39304.8 3153.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37828.5 2487.1 L37822.6 2496.1 L37817.8 2486.5 L37823.7 2477.5 Z"></path>
+						<path d="M43441.1 2480.4 L43433.4 2488.0 L43430.8 2477.5 L43438.5 2470.0 Z"></path>
 					</g>
-					<path d="M37901.6 2495.2 L38067.25 2985 L38067.25 3171.5 L38067.25 3171.5 L38067.25 3358 L38067.25 3358 L38067.25 3514.5 L38067.25 3514.5 L38067.25 3671 L38067.25 3671 L35569.75 3705.8169055566464 L35569.8 3705.8 " fill="none"></path>
+					<path d="M43487.8 2488.7 L43487.75 2985 L43487.75 3171.5 L43487.75 3171.5 L43487.75 3358 L43487.75 3358 L43487.75 3514.5 L43487.75 3514.5 L43487.75 3671 L43487.75 3671 L38651.25 3706.143946371917 L38651.3 3706.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37903.7 2484.6 L37901.6 2495.2 L37893.6 2488.0 L37895.6 2477.5 Z"></path>
+						<path d="M43493.1 2479.3 L43487.8 2488.7 L43482.4 2479.3 L43487.8 2470.0 Z"></path>
 					</g>
-					<path d="M37913.0 2494.9 L38107.25 2985 L38107.25 3171.5 L38107.25 3171.5 L38107.25 3358 L38107.25 3358 L37089.25 3495.520069054812 L37089.3 3495.5 " fill="none"></path>
+					<path d="M43542.1 2488.0 L43682.75 2985 L43682.75 3171.5 L43682.75 3171.5 L43682.75 3358 L43682.75 3358 L39990.75 3508.7626875407695 L39990.8 3508.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37914.6 2484.2 L37913.0 2494.9 L37904.6 2488.1 L37906.2 2477.5 Z"></path>
+						<path d="M43544.7 2477.5 L43542.1 2488.0 L43534.4 2480.4 L43537.0 2470.0 Z"></path>
 					</g>
-					<path d="M37924.4 2494.5 L38147.25 2985 L36049.25 3166.946989072309 L36049.3 3166.9 " fill="none"></path>
+					<path d="M43553.1 2487.7 L43722.75 2985 L39449.75 3169.2363888567797 L39449.8 3169.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37925.4 2483.8 L37924.4 2494.5 L37915.7 2488.2 L37916.7 2477.5 Z"></path>
+						<path d="M43555.2 2477.1 L43553.1 2487.7 L43545.1 2480.6 L43547.1 2470.0 Z"></path>
 					</g>
-					<path d="M42456.9 605.3 L44304 876 L44304 1025 L44304 1025 L44304 1174 L44304 1174 L44304 1390.5 L44304 1390.5 L44304 1607 L44304 1607 L38380.25 2237.8533946443063 L38380.3 2237.9 " fill="none"></path>
-					<path d="M42457.7 600.0 L42456.9 605.3 L42456.2 610.6 L42443.8 603.4 Z"></path>
+					<path d="M44207.7 613.7 L45796.25 876 L45796.25 1025 L45796.25 1025 L45796.25 1174 L45796.25 1174 L45796.25 1390.5 L45796.25 1390.5 L45796.25 1607 L45796.25 1607 L43917.75 2167.66125189517 L43917.8 2167.7 " fill="none"></path>
+					<path d="M44208.5 608.4 L44207.7 613.7 L44206.8 618.9 L44194.5 611.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41332.7 1070.6 L41495.75 1174 L41495.75 1390.5 L41495.75 1390.5 L41495.75 1607 L41495.75 1607 L38380.25 2193.256861941827 L38380.3 2193.3 " fill="none"></path>
+						<path d="M43776.9 1068.1 L43487.75 1174 L43487.75 1390.5 L43487.75 1390.5 L43487.75 1607 L43487.75 1607 L43487.75 2122 L43487.8 2122.0 " fill="none"></path>
 					</g>
-					<path d="M41335.6 1066.1 L41332.7 1070.6 L41329.9 1075.1 L41321.5 1063.5 Z"></path>
+					<path d="M43778.7 1073.1 L43776.9 1068.1 L43775.0 1063.1 L43789.4 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M9103.8 1417.7 L9208.75 1607 L37288.25 2282.8580810815533 L37288.3 2282.9 " fill="none"></path>
+						<path d="M29400.8 1053.8 L29400.75 1174 L29400.75 1390.5 L29400.75 1390.5 L29400.75 1607 L29400.75 1607 L43057.75 2274.9685525661957 L43057.8 2275.0 " fill="none"></path>
 					</g>
-					<path d="M9108.5 1415.1 L9103.8 1417.7 L9099.1 1420.2 L9097.3 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M25472.8 1042.8 L26208.25 1174 L26208.25 1390.5 L26208.25 1390.5 L26208.25 1607 L26208.25 1607 L37288.25 2263.6420092895237 L37288.3 2263.6 " fill="none"></path>
+					<path d="M29406.1 1053.8 L29400.8 1053.8 L29395.4 1053.8 L29400.8 1040.5 Z"></path>
+					<path d="M38883.3 3296.7 L38883.25 3358 L39709.75 3491.761375387797 L39709.8 3491.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M38888.6 3287.3 L38883.3 3296.7 L38877.9 3287.3 L38883.3 3278.0 Z"></path>
+					</g>
+					<path d="M39323.4 3154.7 L43762.75 2985 L43557.19847605225 2470 L43557.2 2470.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M39313.9 3149.7 L39323.4 3154.7 L39314.3 3160.4 L39304.8 3155.4 Z"></path>
 					</g>
-					<path d="M25473.7 1037.6 L25472.8 1042.8 L25471.9 1048.1 L25459.7 1040.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M4867.1 2324.3 L5050.75 2985 L2938.25 3155.850498699046 L2938.3 3155.9 " fill="none"></path>
+						<path d="M43916.1 1075.8 L43957.75 1174 L43957.75 1390.5 L43957.75 1390.5 L43957.75 1607 L43957.75 1607 L43957.75 2296 L43957.75 2296 L43957.75 2985 L43957.75 2985 L39304.75 3156.0088678687557 L39304.8 3156.0 " fill="none"></path>
 					</g>
-					<path d="M4872.3 2322.9 L4867.1 2324.3 L4862.0 2325.8 L4863.6 2311.5 Z"></path>
-					<path d="M41534.1 2487.8 L41379 2985 L36889 3170.2416768056632 L36889.0 3170.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41542.0 2480.5 L41534.1 2487.8 L41531.8 2477.3 L41539.7 2470.0 Z"></path>
+					<path d="M43921.0 1073.7 L43916.1 1075.8 L43911.1 1077.9 L43910.8 1063.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M14193.6 1419.2 L14171.75 1607 L14171.75 2296 L14171.75 2296 L14171.75 2985 L14171.75 2985 L38461.75 3168.3189001072374 L38461.8 3168.3 " fill="none"></path>
 					</g>
-					<path d="M41571.6 2488.5 L41514 2985 L34981.25 3170.1959528785865 L34981.3 3170.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41578.0 2479.9 L41571.6 2488.5 L41567.4 2478.7 L41573.8 2470.0 Z"></path>
+					<path d="M14198.9 1419.9 L14193.6 1419.2 L14188.4 1418.6 L14195.2 1406.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M29457.0 1045.0 L29820.5 1174 L29820.5 1390.5 L29820.5 1390.5 L29820.5 1607 L29820.5 1607 L29820.5 2296 L29820.5 2296 L29820.5 2985 L29820.5 2985 L38461.75 3162.8260599707596 L38461.8 3162.8 " fill="none"></path>
 					</g>
-					<path d="M41582.8 2488.6 L41554 2985 L35904.25 3158.552130945028 L35904.3 3158.6 " fill="none"></path>
+					<path d="M29458.8 1039.9 L29457.0 1045.0 L29455.2 1050.0 L29444.4 1040.5 Z"></path>
+					<path d="M22948.3 1476.4 L22886.75 1607 L22886.75 2296 L22886.75 2296 L22886.75 2985 L22886.75 2985 L12742.5 3168.7735374826975 L12742.5 3168.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41588.7 2479.6 L41582.8 2488.6 L41578.0 2479.0 L41583.9 2470.0 Z"></path>
+						<path d="M22957.1 1470.2 L22948.3 1476.4 L22947.4 1465.7 L22956.2 1459.5 Z"></path>
 					</g>
-					<path d="M41637.2 2488.2 L41749 2985 L41749 3171.5 L41749 3171.5 L41749 3358 L41749 3358 L41749 3514.5 L41749 3514.5 L41749 3671 L41749 3671 L35569.75 3706.220708064063 L35569.8 3706.2 " fill="none"></path>
+					<path d="M23042.5 1475.3 L23126 1607 L11565.25 2292.8557098267142 L11565.3 2292.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41640.4 2477.9 L41637.2 2488.2 L41630.0 2480.3 L41633.1 2470.0 Z"></path>
+						<path d="M23042.0 1464.5 L23042.5 1475.3 L23033.0 1470.2 L23032.5 1459.5 Z"></path>
 					</g>
-					<path d="M41648.3 2488.0 L41789 2985 L41789 3171.5 L41789 3171.5 L41789 3358 L41789 3358 L37089.25 3509.957207788854 L37089.3 3510.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41650.9 2477.5 L41648.3 2488.0 L41640.7 2480.4 L41643.2 2470.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M9052.2 1034.1 L7752.75 1174 L7752.75 1329 L7752.8 1329.0 " fill="none"></path>
 					</g>
-					<path d="M41659.4 2487.7 L41829 2985 L36049.25 3169.8211882206697 L36049.3 3169.8 " fill="none"></path>
+					<path d="M9052.8 1039.4 L9052.2 1034.1 L9051.7 1028.8 L9065.5 1032.7 Z"></path>
+					<path d="M12760.4 3121.6 L12772.5 3118 L12780 3118 L12780 3118 L12787.5 3171.5 L12787.5 3171.5 L12780 3225 L12780 3225 L12772.5 3225 L12772.5 3225 L12742.5 3216.1080332409974 L12742.5 3216.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41661.4 2477.1 L41659.4 2487.7 L41651.3 2480.6 L41653.3 2470.0 Z"></path>
+						<path d="M12749.9 3119.1 L12760.4 3121.6 L12753.0 3129.4 L12742.5 3126.9 Z"></path>
 					</g>
-					<path d="M42456.9 604.2 L44344 876 L44344 1025 L44344 1025 L44344 1174 L44344 1174 L44344 1390.5 L44344 1390.5 L44344 1607 L44344 1607 L42024 2188.2654545454548 L42024.0 2188.3 " fill="none"></path>
-					<path d="M42457.7 598.9 L42456.9 604.2 L42456.2 609.5 L42443.8 602.3 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41359.0 1068.9 L41594 1174 L41594 1390.5 L41594 1390.5 L41594 1607 L41594 1607 L41594 2122 L41594.0 2122.0 " fill="none"></path>
+						<path d="M3011.0 2324.8 L3011 2985 L12441.5 3168.570425842814 L12441.5 3168.6 " fill="none"></path>
 					</g>
-					<path d="M41361.2 1064.1 L41359.0 1068.9 L41356.9 1073.8 L41346.9 1063.5 Z"></path>
+					<path d="M3016.3 2324.8 L3011.0 2324.8 L3005.7 2324.8 L3011.0 2311.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M25477.0 1042.7 L26248.25 1174 L26248.25 1390.5 L26248.25 1390.5 L26248.25 1607 L26248.25 1607 L41164 2276.693677402538 L41164.0 2276.7 " fill="none"></path>
+						<path d="M27211.2 541.3 L9137 876 L9137 994 L9137.0 994.0 " fill="none"></path>
 					</g>
-					<path d="M25477.9 1037.5 L25477.0 1042.7 L25476.1 1048.0 L25463.8 1040.5 Z"></path>
-					<path d="M35482.8 3296.7 L35482.75 3358 L36808.25 3499.5011937244203 L36808.3 3499.5 " fill="none"></path>
+					<path d="M27211.3 546.6 L27211.2 541.3 L27211.1 535.9 L27224.5 541.0 Z"></path>
+					<path d="M45255.2 2555.5 L45134.25 2985 L40692.25 3170.22817216322 L40692.3 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35488.1 3287.3 L35482.8 3296.7 L35477.4 3287.3 L35482.8 3278.0 Z"></path>
+						<path d="M45262.9 2547.9 L45255.2 2555.5 L45252.6 2545.0 L45260.3 2537.5 Z"></path>
 					</g>
-					<path d="M35922.9 3158.6 L41869 2985 L41663.44847605225 2470 L41663.4 2470.0 " fill="none"></path>
+					<path d="M45328.3 2556.2 L45328.25 2985 L32969 3170.651299760385 L32969.0 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35913.4 3153.6 L35922.9 3158.6 L35913.7 3164.2 L35904.3 3159.2 Z"></path>
+						<path d="M45333.6 2546.8 L45328.3 2556.2 L45322.9 2546.8 L45328.3 2537.5 Z"></path>
+					</g>
+					<path d="M45401.3 2555.5 L45522.25 2985 L39449.75 3169.9014285714284 L39449.8 3169.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M45403.9 2545.0 L45401.3 2555.5 L45393.6 2547.9 L45396.2 2537.5 Z"></path>
+					</g>
+					<path d="M44207.7 612.2 L45836.25 876 L45836.25 1025 L45836.25 1025 L45836.25 1174 L45836.25 1174 L45836.25 1390.5 L45836.25 1390.5 L45836.25 1607 L45836.25 1607 L45506.308055152396 2054.5 L45506.3 2054.5 " fill="none"></path>
+					<path d="M44208.5 607.0 L44207.7 612.2 L44206.8 617.5 L44194.5 610.1 Z"></path>
+					<path d="M22455.0 2340.0 L22605.75 2985 L15438.5 3168.6430877554526 L15438.5 3168.6 " fill="none"></path>
+					<path d="M22460.2 2338.8 L22455.0 2340.0 L22449.8 2341.2 L22452.0 2327.0 Z"></path>
+					<path d="M9895.0 1493.2 L9895 1607 L10439.747822931786 2182 L10439.7 2182.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M9900.3 1483.8 L9895.0 1493.2 L9889.7 1483.8 L9895.0 1474.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M41382.4 1047.6 L42064 1174 L42064 1390.5 L42064 1390.5 L42064 1607 L42064 1607 L42064 2296 L42064 2296 L42064 2985 L42064 2985 L35904.25 3159.5554985754984 L35904.3 3159.6 " fill="none"></path>
+						<path d="M9221.6 1041.6 L9895 1174 L9895 1306.5 L9895.0 1306.5 " fill="none"></path>
 					</g>
-					<path d="M41383.3 1042.3 L41382.4 1047.6 L41381.4 1052.8 L41369.3 1045.1 Z"></path>
+					<path d="M9222.6 1036.4 L9221.6 1041.6 L9220.6 1046.9 L9208.5 1039.1 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M9108.1 1416.7 L9248.75 1607 L9248.75 2296 L9248.75 2296 L9248.75 2985 L9248.75 2985 L35061.25 3168.5035164290616 L35061.3 3168.5 " fill="none"></path>
+						<path d="M9221.7 1037.6 L10142 1174 L10142 1390.5 L10142 1390.5 L10142 1607 L10142 1607 L10480.615747460088 2182 L10480.6 2182.0 " fill="none"></path>
 					</g>
-					<path d="M9112.4 1413.6 L9108.1 1416.7 L9103.8 1419.9 L9100.2 1406.0 Z"></path>
+					<path d="M9222.5 1032.3 L9221.7 1037.6 L9220.9 1042.8 L9208.5 1035.6 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M25482.5 1040.3 L26442 1174 L26442 1390.5 L26442 1390.5 L26442 1607 L26442 1607 L26442 2296 L26442 2296 L26442 2985 L26442 2985 L35061.25 3162.804952575837 L35061.3 3162.8 " fill="none"></path>
+						<path d="M3041.4 2319.7 L3896.25 2985 L1932 3154.7752867570384 L1932.0 3154.8 " fill="none"></path>
 					</g>
-					<path d="M25483.2 1035.0 L25482.5 1040.3 L25481.7 1045.6 L25469.3 1038.4 Z"></path>
-					<path d="M24532.3 1112.7 L24532.25 1174 L24532.25 1375 L24532.3 1375.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24537.6 1103.3 L24532.3 1112.7 L24526.9 1103.3 L24532.3 1094.0 Z"></path>
+					<path d="M3044.7 2315.5 L3041.4 2319.7 L3038.2 2323.9 L3030.9 2311.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M9221.8 1032.6 L10796 1174 L10796 1329 L10796.0 1329.0 " fill="none"></path>
 					</g>
-					<path d="M27012.5 551.9 L24532.25 876 L24532.25 956 L24532.3 956.0 " fill="none"></path>
-					<path d="M27013.2 557.2 L27012.5 551.9 L27011.8 546.6 L27025.8 550.2 Z"></path>
-					<path d="M18753.1 1487.3 L18625.75 1607 L20781.5 2167.653675568557 L20781.5 2167.7 " fill="none"></path>
+					<path d="M9222.3 1027.3 L9221.8 1032.6 L9221.3 1037.9 L9208.5 1031.4 Z"></path>
+					<path d="M24367.3 1440.2 L24367.25 1607 L32494.25 2267.7083185840706 L32494.3 2267.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18763.5 1484.8 L18753.1 1487.3 L18756.2 1477.0 L18766.7 1474.5 Z"></path>
+						<path d="M24372.6 1430.8 L24367.3 1440.2 L24361.9 1430.8 L24367.3 1421.5 Z"></path>
 					</g>
-					<path d="M18910.8 1490.9 L18974.25 1607 L18629.43559506531 2280.5 L18629.4 2280.5 " fill="none"></path>
+					<path d="M13903.0 1455.7 L13903 1607 L13903 2280.5 L13903.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18911.0 1480.1 L18910.8 1490.9 L18901.7 1485.2 L18901.9 1474.5 Z"></path>
+						<path d="M13908.3 1446.3 L13903.0 1455.7 L13897.7 1446.3 L13903.0 1437.0 Z"></path>
 					</g>
-					<path d="M21125.0 2599.2 L20934.25 2985 L4742.75 3169.3200115973877 L4742.8 3169.3 " fill="none"></path>
+					<path d="M17400.9 1028.7 L13903 1174 L13903 1344 L13903.0 1344.0 " fill="none"></path>
+					<path d="M17401.1 1034.0 L17400.9 1028.7 L17400.7 1023.4 L17414.3 1028.2 Z"></path>
+					<path d="M35489.5 1508.2 L35489.5 1607 L25509.5 2283.526957890594 L25509.5 2283.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21134.0 2593.2 L21125.0 2599.2 L21124.4 2588.5 L21133.3 2582.5 Z"></path>
+						<path d="M35494.8 1498.8 L35489.5 1508.2 L35484.2 1498.8 L35489.5 1489.5 Z"></path>
 					</g>
-					<path d="M21275.0 2601.2 L21275 2985 L33474.25 3170.640219896783 L33474.3 3170.6 " fill="none"></path>
+					<path d="M35415.1 1117.1 L35489.5 1174 L35489.5 1291.5 L35489.5 1291.5 " fill="none"></path>
+					<path d="M35418.4 1112.9 L35415.1 1117.1 L35411.9 1121.3 L35404.5 1109.0 Z"></path>
+					<path d="M32666.1 2522.2 L32305.75 2985 L40631.25 3170.819261608425 L40631.3 3170.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21280.3 2591.8 L21275.0 2601.2 L21269.7 2591.8 L21275.0 2582.5 Z"></path>
+						<path d="M32676.0 2518.1 L32666.1 2522.2 L32667.6 2511.6 L32677.6 2507.5 Z"></path>
 					</g>
-					<path d="M21620.4 2594.7 L22071.75 2985 L35944.25 3170.7968581687614 L35944.3 3170.8 " fill="none"></path>
+					<path d="M32926.7 2525.0 L33096.25 2985 L32927.77144772118 3156 L32927.8 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21616.9 2584.6 L21620.4 2594.7 L21609.9 2592.6 L21606.3 2582.5 Z"></path>
+						<path d="M32928.5 2514.4 L32926.7 2525.0 L32918.4 2518.1 L32920.2 2507.5 Z"></path>
 					</g>
-					<path d="M40648.2 1433.6 L40728.25 1607 L21768.5 2278.521095446776 L21768.5 2278.5 " fill="none"></path>
-					<path d="M40653.0 1431.4 L40648.2 1433.6 L40643.3 1435.8 L40642.6 1421.5 Z"></path>
-					<path d="M19286.4 1513.4 L19235.25 1607 L18890.43559506531 2280.5 L18890.4 2280.5 " fill="none"></path>
+					<path d="M32939.8 2524.7 L33136.25 2985 L39344.75 3169.9361523718258 L39344.8 3169.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19295.5 1507.7 L19286.4 1513.4 L19286.2 1502.6 L19295.3 1497.0 Z"></path>
+						<path d="M32941.1 2514.0 L32939.8 2524.7 L32931.3 2518.2 L32932.5 2507.5 Z"></path>
 					</g>
-					<path d="M19595.1 1475.6 L19968.25 1607 L20108.76614658926 2280.5 L20108.8 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19588.1 1467.5 L19595.1 1475.6 L19584.5 1477.5 L19577.5 1469.4 Z"></path>
+					<path d="M42760.0 1434.4 L42807 1607 L33190.25 2271.93798138438 L33190.3 2271.9 " fill="none"></path>
+					<path d="M42765.1 1433.0 L42760.0 1434.4 L42754.8 1435.8 L42756.4 1421.5 Z"></path>
+					<path d="M39497.9 1532.3 L39477.25 1607 L33190.25 2259.862547098719 L33190.3 2259.9 " fill="none"></path>
+					<path d="M39503.1 1533.8 L39497.9 1532.3 L39492.8 1530.9 L39501.5 1519.5 Z"></path>
+					<path d="M42132.4 1554.0 L42107 1607 L33190.25 2270.1199708572817 L33190.3 2270.1 " fill="none"></path>
+					<path d="M42137.2 1556.3 L42132.4 1554.0 L42127.6 1551.7 L42138.1 1542.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M43928.8 1074.5 L43997.75 1174 L43997.75 1390.5 L43997.75 1390.5 L43997.75 1607 L43997.75 1607 L33190.25 2274.5063869839987 L33190.3 2274.5 " fill="none"></path>
 					</g>
-					<path d="M20311.3 1500.7 L20077.25 1607 L20285.213896952104 2280.5 L20285.2 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20322.0 1501.7 L20311.3 1500.7 L20317.5 1492.0 L20328.3 1493.0 Z"></path>
+					<path d="M43933.2 1071.4 L43928.8 1074.5 L43924.4 1077.5 L43921.2 1063.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M14199.0 1419.3 L14211.75 1607 L32494.25 2283.1301360672014 L32494.3 2283.1 " fill="none"></path>
 					</g>
-					<path d="M20622.5 1513.3 L20675 1607 L20124.665457184325 2280.5 L20124.7 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20622.6 1502.5 L20622.5 1513.3 L20613.3 1507.7 L20613.4 1497.0 Z"></path>
+					<path d="M14204.3 1418.9 L14199.0 1419.3 L14193.6 1419.7 L14198.1 1406.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M29461.3 1044.6 L29860.5 1174 L29860.5 1390.5 L29860.5 1390.5 L29860.5 1607 L29860.5 1607 L32494.25 2215.5868198205753 L32494.3 2215.6 " fill="none"></path>
 					</g>
-					<path d="M4760.9 3120.9 L4772.75 3118 L4780.25 3118 L4780.25 3118 L4787.75 3171.5 L4787.75 3171.5 L4780.25 3225 L4780.25 3225 L4772.75 3225 L4772.75 3225 L4742.75 3217.7539503386006 L4742.8 3217.8 " fill="none"></path>
+					<path d="M29462.9 1039.5 L29461.3 1044.6 L29459.6 1049.7 L29448.6 1040.5 Z"></path>
+					<path d="M22457.5 2339.8 L22645.75 2985 L15788.5 3167.3775713929194 L15788.5 3167.4 " fill="none"></path>
+					<path d="M22462.6 2338.3 L22457.5 2339.8 L22452.4 2341.3 L22453.8 2327.0 Z"></path>
+					<path d="M40053.1 2494.5 L39830.25 2985 L40631.25 3164.6590499098015 L40631.3 3164.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4750.6 3117.9 L4760.9 3120.9 L4753.1 3128.2 L4742.8 3125.2 Z"></path>
+						<path d="M40061.8 2488.2 L40053.1 2494.5 L40052.1 2483.8 L40060.8 2477.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M4873.5 2323.3 L5217.75 2985 L4742.44436997319 3118 L4742.4 3118.0 " fill="none"></path>
-					</g>
-					<path d="M4878.2 2320.9 L4873.5 2323.3 L4868.7 2325.8 L4867.3 2311.5 Z"></path>
-					<path d="M13074.0 1470.7 L13074 1607 L20781.5 2254.539019631752 L20781.5 2254.5 " fill="none"></path>
+					<path d="M40064.5 2494.9 L39870.25 2985 L34499.75 3169.916135881104 L34499.8 3169.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13079.3 1461.3 L13074.0 1470.7 L13068.7 1461.3 L13074.0 1452.0 Z"></path>
+						<path d="M40072.9 2488.1 L40064.5 2494.9 L40062.9 2484.2 L40071.3 2477.5 Z"></path>
 					</g>
-					<path d="M12138.4 1053.8 L12131.75 1174 L12834.5 1335.4702838949324 L12834.5 1335.5 " fill="none"></path>
-					<path d="M12143.7 1054.1 L12138.4 1053.8 L12133.1 1053.5 L12139.1 1040.5 Z"></path>
-					<path d="M13593.0 1470.7 L13593 1607 L20781.5 2251.737893777662 L20781.5 2251.7 " fill="none"></path>
+					<path d="M40143.3 2496.2 L40143.25 2985 L40143.25 3171.5 L40143.25 3171.5 L40143.25 3358 L40143.25 3358 L40143.25 3514.5 L40143.25 3514.5 L40143.25 3671 L40143.25 3671 L38651.25 3705.371187540558 L38651.3 3705.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13598.3 1461.3 L13593.0 1470.7 L13587.7 1461.3 L13593.0 1452.0 Z"></path>
+						<path d="M40148.6 2486.8 L40143.3 2496.2 L40137.9 2486.8 L40143.3 2477.5 Z"></path>
 					</g>
-					<path d="M12205.9 1044.2 L12650.75 1174 L13353.5 1335.4702838949324 L13353.5 1335.5 " fill="none"></path>
-					<path d="M12207.4 1039.1 L12205.9 1044.2 L12204.4 1049.4 L12193.1 1040.5 Z"></path>
-					<path d="M42981.3 120.3 L42981.25 203 L42981.25 493 L42981.3 493.0 " fill="none"></path>
-					<path d="M42986.6 120.3 L42981.3 120.3 L42975.9 120.3 L42981.3 107.0 Z"></path>
-					<path d="M22465.8 2381.1 L22111.75 2985 L33474.25 3170.5772177949034 L33474.3 3170.6 " fill="none"></path>
+					<path d="M40268.8 2493.2 L40581.75 2985 L40581.75 3171.5 L40581.75 3171.5 L40581.75 3358 L40581.75 3358 L39990.75 3484.440874914559 L39990.8 3484.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22475.2 2375.7 L22465.8 2381.1 L22466.0 2370.4 L22475.3 2365.0 Z"></path>
+						<path d="M40268.3 2482.5 L40268.8 2493.2 L40259.3 2488.2 L40258.8 2477.5 Z"></path>
 					</g>
-					<path d="M22538.2 2383.1 L22693 2985 L22693 3156 L22693.0 3156.0 " fill="none"></path>
+					<path d="M40279.9 2492.8 L40621.75 2985 L39449.75 3163.5038791343404 L39449.8 3163.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22541.0 2372.7 L22538.2 2383.1 L22530.7 2375.4 L22533.5 2365.0 Z"></path>
+						<path d="M40279.0 2482.1 L40279.9 2492.8 L40270.2 2488.2 L40269.3 2477.5 Z"></path>
 					</g>
+					<path d="M44207.7 610.9 L45876.25 876 L45876.25 1025 L45876.25 1025 L45876.25 1174 L45876.25 1174 L45876.25 1390.5 L45876.25 1390.5 L45876.25 1607 L45876.25 1607 L40689.25 2230.3809523809523 L40689.3 2230.4 " fill="none"></path>
+					<path d="M44208.5 605.6 L44207.7 610.9 L44206.8 616.1 L44194.5 608.8 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M20608.8 1028.4 L24259.25 1174 L24259.25 1329 L24259.3 1329.0 " fill="none"></path>
+						<path d="M43940.8 1073.1 L44037.75 1174 L44037.75 1390.5 L44037.75 1390.5 L44037.75 1607 L44037.75 1607 L40689.25 2199.403774553858 L40689.3 2199.4 " fill="none"></path>
 					</g>
-					<path d="M20609.0 1023.1 L20608.8 1028.4 L20608.6 1033.7 L20595.5 1027.9 Z"></path>
-					<path d="M8073.4 3121.6 L8085.5 3118 L8093 3118 L8093 3118 L8100.5 3171.5 L8100.5 3171.5 L8093 3225 L8093 3225 L8085.5 3225 L8085.5 3225 L8055.5 3216.1080332409974 L8055.5 3216.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8062.9 3119.1 L8073.4 3121.6 L8066.0 3129.4 L8055.5 3126.9 Z"></path>
+					<path d="M43944.6 1069.4 L43940.8 1073.1 L43936.9 1076.8 L43931.5 1063.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M14207.3 1418.5 L14277 1607 L39597.25 2281.4561832503746 L39597.3 2281.5 " fill="none"></path>
 					</g>
+					<path d="M14212.4 1416.7 L14207.3 1418.5 L14202.3 1420.4 L14202.7 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M4874.9 2323.0 L5257.75 2985 L7754.5 3160.897204646331 L7754.5 3160.9 " fill="none"></path>
+						<path d="M29465.5 1044.3 L29900.5 1174 L29900.5 1390.5 L29900.5 1390.5 L29900.5 1607 L29900.5 1607 L39597.25 2259.272168118913 L39597.3 2259.3 " fill="none"></path>
 					</g>
-					<path d="M4879.5 2320.4 L4874.9 2323.0 L4870.3 2325.7 L4868.2 2311.5 Z"></path>
-					<path d="M22922.2 1478.1 L22910.25 1607 L22910.25 2296 L22910.25 2296 L22910.25 2985 L22910.25 2985 L8055.5 3169.629438030023 L8055.5 3169.6 " fill="none"></path>
+					<path d="M29467.0 1039.2 L29465.5 1044.3 L29464.0 1049.4 L29452.7 1040.5 Z"></path>
+					<path d="M14486.5 1469.6 L14437 1607 L16604.85867198839 2280.5 L16604.9 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22928.3 1469.3 L22922.2 1478.1 L22917.7 1468.3 L22923.9 1459.5 Z"></path>
+						<path d="M14494.7 1462.6 L14486.5 1469.6 L14484.7 1459.0 L14492.8 1452.0 Z"></path>
 					</g>
-					<path d="M22964.9 1476.8 L23017.25 1607 L8897.75 2293.423390368672 L8897.8 2293.4 " fill="none"></path>
+					<path d="M14584.6 1465.7 L14715.25 1607 L16825.680333817127 2280.5 L16825.7 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22966.4 1466.2 L22964.9 1476.8 L22956.5 1470.1 L22958.0 1459.5 Z"></path>
+						<path d="M14582.1 1455.2 L14584.6 1465.7 L14574.3 1462.5 L14571.9 1452.0 Z"></path>
 					</g>
-					<path d="M12414.1 2316.9 L16221.25 2985 L9151.5 3166.456511267848 L9151.5 3166.5 " fill="none"></path>
-					<path d="M12415.1 2311.7 L12414.1 2316.9 L12413.2 2322.2 L12401.0 2314.6 Z"></path>
-					<path d="M13991.7 1465.2 L13849.75 1607 L13849.75 2280.5 L13849.8 2280.5 " fill="none"></path>
+					<path d="M17400.9 1029.5 L14515 1174 L14515 1329 L14515.0 1329.0 " fill="none"></path>
+					<path d="M17401.2 1034.8 L17400.9 1029.5 L17400.7 1024.1 L17414.3 1028.8 Z"></path>
+					<path d="M33964.2 2442.5 L33764.25 2985 L32969 3159.128705606105 L32969.0 3159.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14002.1 1462.4 L13991.7 1465.2 L13994.6 1454.8 L14004.9 1452.0 Z"></path>
+						<path d="M33972.5 2435.6 L33964.2 2442.5 L33962.5 2431.9 L33970.7 2425.0 Z"></path>
 					</g>
-					<path d="M14131.2 1466.2 L14251.5 1607 L14251.5 2280.5 L14251.5 2280.5 " fill="none"></path>
+					<path d="M34185.8 2437.0 L34836.75 2985 L39344.75 3169.353031465848 L39344.8 3169.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14129.2 1455.6 L14131.2 1466.2 L14121.1 1462.6 L14119.1 1452.0 Z"></path>
+						<path d="M34182.1 2426.9 L34185.8 2437.0 L34175.2 2435.1 L34171.5 2425.0 Z"></path>
 					</g>
-					<path d="M12229.2 1038.5 L13124.25 1174 L13872.5 1345.9247811090474 L13872.5 1345.9 " fill="none"></path>
-					<path d="M12230.0 1033.2 L12229.2 1038.5 L12228.4 1043.8 L12216.0 1036.5 Z"></path>
-					<path d="M23340.3 1447.7 L23340.25 1607 L20028.5 2204.6025011458128 L20028.5 2204.6 " fill="none"></path>
+					<path d="M42767.7 1433.6 L42847 1607 L34366.25 2268.8419085374485 L34366.3 2268.8 " fill="none"></path>
+					<path d="M42772.6 1431.4 L42767.7 1433.6 L42762.9 1435.8 L42762.2 1421.5 Z"></path>
+					<path d="M22460.0 2339.6 L22685.75 2985 L16277.5 3165.187497644265 L16277.5 3165.2 " fill="none"></path>
+					<path d="M22465.0 2337.8 L22460.0 2339.6 L22455.0 2341.3 L22455.6 2327.0 Z"></path>
+					<path d="M41923.3 2383.7 L41923.25 2985 L32122.5 3166.301844917797 L32122.5 3166.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23345.6 1438.3 L23340.3 1447.7 L23334.9 1438.3 L23340.3 1429.0 Z"></path>
+						<path d="M41928.6 2374.3 L41923.3 2383.7 L41917.9 2374.3 L41923.3 2365.0 Z"></path>
 					</g>
-					<path d="M18997.3 2418.6 L16574.25 2985 L11973 3164.422534106947 L11973.0 3164.4 " fill="none"></path>
+					<path d="M39125.0 552.1 L41923.25 876 L41923.25 1025 L41923.25 1025 L41923.25 1174 L41923.25 1174 L41923.25 1390.5 L41923.25 1390.5 L41923.25 1607 L41923.25 1607 L41923.25 2227 L41923.3 2227.0 " fill="none"></path>
+					<path d="M39125.6 546.8 L39125.0 552.1 L39124.4 557.4 L39111.8 550.6 Z"></path>
+					<path d="M27212.0 575.4 L26426.25 876 L26426.25 941 L26426.3 941.0 " fill="none"></path>
+					<path d="M27214.0 580.4 L27212.0 575.4 L27210.1 570.5 L27224.5 570.7 Z"></path>
+					<path d="M25447.8 1440.2 L25447.75 1607 L33670.25 2268.023569219999 L33670.3 2268.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19007.6 2421.7 L18997.3 2418.6 L19005.2 2411.3 L19015.5 2414.4 Z"></path>
+						<path d="M25453.1 1430.8 L25447.8 1440.2 L25442.4 1430.8 L25447.8 1421.5 Z"></path>
 					</g>
-					<path d="M18997.3 2420.3 L16614.25 2985 L33474.25 3170.8771022374603 L33474.3 3170.9 " fill="none"></path>
+					<path d="M11113.7 1482.4 L10847.75 1607 L9757.833454281568 2280.5 L9757.8 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19007.6 2423.4 L18997.3 2420.3 L19005.2 2413.0 L19015.5 2416.0 Z"></path>
+						<path d="M11124.5 1483.3 L11113.7 1482.4 L11119.9 1473.6 L11130.7 1474.5 Z"></path>
 					</g>
-					<path d="M19984.2 2980.5 L19987.25 2985 L19987.25 3171.5 L19987.25 3171.5 L19987.25 3358 L19987.25 3358 L19987.25 3514.5 L19987.25 3514.5 L19987.25 3671 L19987.25 3671 L35471.75 3706.388016223002 L35471.8 3706.4 " fill="none"></path>
+					<path d="M11394.4 1488.7 L11496.25 1607 L25141.5 2286.8327638881356 L25141.5 2286.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19983.4 2969.8 L19984.2 2980.5 L19974.5 2975.7 L19973.7 2965.0 Z"></path>
+						<path d="M11392.4 1478.1 L11394.4 1488.7 L11384.3 1485.1 L11382.3 1474.5 Z"></path>
 					</g>
-					<path d="M20023.6 2980.1 L20027.25 2985 L6181.75 3170.5751733802867 L6181.8 3170.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20022.4 2969.4 L20023.6 2980.1 L20013.8 2975.7 L20012.6 2965.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M9221.8 1030.8 L11310 1174 L11310 1306.5 L11310.0 1306.5 " fill="none"></path>
 					</g>
-					<path d="M20040.1 2950.7 L20067.25 2985 L35944.25 3170.8853385228663 L35944.3 3170.9 " fill="none"></path>
+					<path d="M9222.2 1025.5 L9221.8 1030.8 L9221.4 1036.1 L9208.5 1029.9 Z"></path>
+					<path d="M31841.5 3356.7 L31841.5 3358 L31841.5 3514.5 L31841.5 3514.5 L31841.5 3671 L31841.5 3671 L38553.25 3706.2427060607183 L38553.3 3706.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20038.5 2940.0 L20040.1 2950.7 L20030.1 2946.7 L20028.5 2936.0 Z"></path>
+						<path d="M31846.8 3347.3 L31841.5 3356.7 L31836.2 3347.3 L31841.5 3338.0 Z"></path>
 					</g>
-					<path d="M40655.5 1432.7 L40768.25 1607 L20028.5 2279.5745837500735 L20028.5 2279.6 " fill="none"></path>
-					<path d="M40660.0 1429.8 L40655.5 1432.7 L40651.1 1435.6 L40648.3 1421.5 Z"></path>
+					<path d="M25536.7 2452.2 L23765.5 2985 L31560.5 3165.0108345715703 L31560.5 3165.0 " fill="none"></path>
+					<path d="M25538.3 2457.3 L25536.7 2452.2 L25535.2 2447.1 L25549.5 2448.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M9124.0 1413.2 L9425 1607 L19015.5 2261.4374071506386 L19015.5 2261.4 " fill="none"></path>
+						<path d="M29338.0 2340.3 L29338 2985 L31560.5 3150.566706610745 L31560.5 3150.6 " fill="none"></path>
 					</g>
-					<path d="M9126.9 1408.7 L9124.0 1413.2 L9121.1 1417.7 L9112.8 1406.0 Z"></path>
-					<path d="M28342.7 1080.6 L27330 1174 L27330 1390.5 L27330 1390.5 L27330 1607 L27330 1607 L27330 2296 L27330 2296 L27330 2985 L27330 2985 L11973 3169.321556134762 L11973.0 3169.3 " fill="none"></path>
+					<path d="M29343.3 2340.3 L29338.0 2340.3 L29332.7 2340.3 L29338.0 2327.0 Z"></path>
+					<path d="M40981.6 2559.9 L40661.75 2985 L40661.75 3156 L40661.8 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28352.4 1085.0 L28342.7 1080.6 L28351.5 1074.4 L28361.3 1078.9 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M27201.9 556.8 L28945.25 876 L28945.25 896 L28945.3 896.0 " fill="none"></path>
+						<path d="M40991.5 2555.7 L40981.6 2559.9 L40983.0 2549.3 L40992.9 2545.0 Z"></path>
 					</g>
-					<path d="M27202.8 551.6 L27201.9 556.8 L27200.9 562.1 L27188.8 554.4 Z"></path>
-					<path d="M28348.0 1088.4 L27542 1174 L27542 1306.5 L27542.0 1306.5 " fill="none"></path>
-					<path d="M28348.6 1093.7 L28348.0 1088.4 L28347.4 1083.1 L28361.3 1087.0 Z"></path>
-					<path d="M29417.2 1157.6 L29475.5 1174 L29475.5 1321.5 L29475.5 1321.5 " fill="none"></path>
-					<path d="M29418.6 1152.5 L29417.2 1157.6 L29415.7 1162.7 L29404.3 1154.0 Z"></path>
-					<path d="M29542.4 1113.8 L29947.5 1174 L29947.5 1321.5 L29947.5 1321.5 " fill="none"></path>
-					<path d="M29543.2 1108.5 L29542.4 1113.8 L29541.7 1119.1 L29529.3 1111.8 Z"></path>
-					<path d="M29542.5 1083.8 L30459.5 1174 L30459.5 1314 L30459.5 1314.0 " fill="none"></path>
-					<path d="M29543.0 1078.5 L29542.5 1083.8 L29542.0 1089.1 L29529.3 1082.5 Z"></path>
-					<path d="M30907.5 1553.2 L30907.5 1607 L10698.75 2295.012686687008 L10698.8 2295.0 " fill="none"></path>
+					<path d="M40996.7 2560.3 L40701.75 2985 L34499.75 3170.1269206145967 L34499.8 3170.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30912.8 1543.8 L30907.5 1553.2 L30902.2 1543.8 L30907.5 1534.5 Z"></path>
+						<path d="M41006.4 2555.7 L40996.7 2560.3 L40997.6 2549.6 L41007.3 2545.0 Z"></path>
 					</g>
-					<path d="M29542.5 1070.4 L30907.5 1174 L30907.5 1246.5 L30907.5 1246.5 " fill="none"></path>
-					<path d="M29542.9 1065.0 L29542.5 1070.4 L29542.1 1075.7 L29529.3 1069.3 Z"></path>
-					<path d="M31291.5 1493.2 L31291.5 1607 L31291.5 2280.5 L31291.5 2280.5 " fill="none"></path>
+					<path d="M41011.8 2560.7 L40741.75 2985 L35339.75 3158.642364701827 L35339.8 3158.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31296.8 1483.8 L31291.5 1493.2 L31286.2 1483.8 L31291.5 1474.5 Z"></path>
+						<path d="M41021.3 2555.7 L41011.8 2560.7 L41012.3 2550.0 L41021.8 2545.0 Z"></path>
 					</g>
-					<path d="M29542.6 1062.9 L31291.5 1174 L31291.5 1306.5 L31291.5 1306.5 " fill="none"></path>
-					<path d="M29542.9 1057.6 L29542.6 1062.9 L29542.2 1068.3 L29529.3 1062.1 Z"></path>
-					<path d="M25392.8 1440.2 L25392.75 1607 L20028.5 2236.556402503939 L20028.5 2236.6 " fill="none"></path>
+					<path d="M41026.9 2561.2 L40781.75 2985 L32969 3170.1609587953108 L32969.0 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25398.1 1430.8 L25392.8 1440.2 L25387.4 1430.8 L25392.8 1421.5 Z"></path>
+						<path d="M41036.2 2555.7 L41026.9 2561.2 L41026.9 2550.4 L41036.2 2545.0 Z"></path>
 					</g>
-					<path d="M14476.5 1478.2 L14476.5 1607 L19015.5 2226.833713209791 L19015.5 2226.8 " fill="none"></path>
+					<path d="M41244.4 2563.2 L41345.75 2985 L41345.75 3171.5 L41345.75 3171.5 L41345.75 3358 L41345.75 3358 L41345.75 3514.5 L41345.75 3514.5 L41345.75 3671 L41345.75 3671 L38651.25 3705.865955895754 L38651.3 3705.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14481.8 1468.8 L14476.5 1478.2 L14471.2 1468.8 L14476.5 1459.5 Z"></path>
+						<path d="M41247.4 2552.8 L41244.4 2563.2 L41237.1 2555.3 L41240.1 2545.0 Z"></path>
 					</g>
-					<path d="M12229.3 1034.5 L13534.25 1174 L14300.5 1350.0606261607854 L14300.5 1350.1 " fill="none"></path>
-					<path d="M12229.8 1029.2 L12229.3 1034.5 L12228.7 1039.8 L12216.0 1033.1 Z"></path>
-					<path d="M14868.5 1455.7 L14868.5 1607 L19015.5 2221.00730632857 L19015.5 2221.0 " fill="none"></path>
+					<path d="M41259.9 2562.9 L41385.75 2985 L41385.75 3171.5 L41385.75 3171.5 L41385.75 3358 L41385.75 3358 L39990.75 3500.180071637903 L39990.8 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14873.8 1446.3 L14868.5 1455.7 L14863.2 1446.3 L14868.5 1437.0 Z"></path>
+						<path d="M41262.3 2552.4 L41259.9 2562.9 L41252.1 2555.5 L41254.5 2545.0 Z"></path>
 					</g>
-					<path d="M12229.3 1032.4 L13926.25 1174 L14692.5 1350.0606261607854 L14692.5 1350.1 " fill="none"></path>
-					<path d="M12229.7 1027.1 L12229.3 1032.4 L12228.8 1037.8 L12216.0 1031.3 Z"></path>
-					<path d="M11991.7 3166.9 L15424.5 3088 L16287.375 3088 L16287.375 3088 L17150.25 3171.5 L17150.25 3171.5 L16287.375 3255 L16287.375 3255 L15424.5 3255 L15424.5 3255 L11973 3175.6715524360034 L11973.0 3175.7 " fill="none"></path>
+					<path d="M41275.2 2562.6 L41425.75 2985 L39449.75 3166.673157505546 L39449.8 3166.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11982.2 3161.8 L11991.7 3166.9 L11982.5 3172.4 L11973.0 3167.3 Z"></path>
+						<path d="M41277.1 2552.0 L41275.2 2562.6 L41267.1 2555.6 L41269.0 2545.0 Z"></path>
 					</g>
+					<path d="M44207.7 609.5 L45916.25 876 L45916.25 1025 L45916.25 1025 L45916.25 1174 L45916.25 1174 L45916.25 1390.5 L45916.25 1390.5 L45916.25 1607 L45916.25 1607 L41631.25 2230.3878800675675 L41631.3 2230.4 " fill="none"></path>
+					<path d="M44208.5 604.3 L44207.7 609.5 L44206.9 614.8 L44194.5 607.5 Z"></path>
+					<path d="M39524.1 1532.8 L39517.25 1607 L40729.25 2109.1455201443173 L40729.3 2109.1 " fill="none"></path>
+					<path d="M39529.4 1533.3 L39524.1 1532.8 L39518.8 1532.3 L39525.3 1519.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M4876.3 2322.7 L5297.75 2985 L11610 3166.287333974976 L11610.0 3166.3 " fill="none"></path>
+						<path d="M43952.2 1071.9 L44077.75 1174 L44077.75 1390.5 L44077.75 1390.5 L44077.75 1607 L44077.75 1607 L41631.25 2188.756169111303 L41631.3 2188.8 " fill="none"></path>
 					</g>
-					<path d="M4880.8 2319.9 L4876.3 2322.7 L4871.8 2325.6 L4869.1 2311.5 Z"></path>
-					<path d="M16128.5 1455.7 L16128.5 1607 L19015.5 2193.1626639163105 L19015.5 2193.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16133.8 1446.3 L16128.5 1455.7 L16123.2 1446.3 L16128.5 1437.0 Z"></path>
-					</g>
-					<path d="M12229.3 1029.4 L15186.25 1174 L15952.5 1350.0606261607854 L15952.5 1350.1 " fill="none"></path>
-					<path d="M12229.6 1024.0 L12229.3 1029.4 L12229.1 1034.7 L12216.0 1028.7 Z"></path>
-					<path d="M16520.5 1455.7 L16520.5 1607 L19015.5 2179.7319673496586 L19015.5 2179.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16525.8 1446.3 L16520.5 1455.7 L16515.2 1446.3 L16520.5 1437.0 Z"></path>
+					<path d="M43955.6 1067.8 L43952.2 1071.9 L43948.8 1076.0 L43941.8 1063.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M14212.1 1417.7 L14317 1607 L40729.25 2284.432561212809 L40729.3 2284.4 " fill="none"></path>
 					</g>
-					<path d="M12229.3 1028.9 L15578.25 1174 L16344.5 1350.0606261607854 L16344.5 1350.1 " fill="none"></path>
-					<path d="M12229.6 1023.5 L12229.3 1028.9 L12229.1 1034.2 L12216.0 1028.3 Z"></path>
-					<path d="M17396.5 1455.7 L17396.5 1607 L19015.5 2131.8134556574923 L19015.5 2131.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17401.8 1446.3 L17396.5 1455.7 L17391.2 1446.3 L17396.5 1437.0 Z"></path>
+					<path d="M14216.7 1415.1 L14212.1 1417.7 L14207.4 1420.2 L14205.6 1406.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M29510.4 1042.5 L30332.5 1174 L30332.5 1390.5 L30332.5 1390.5 L30332.5 1607 L30332.5 1607 L40729.25 2267.354520522689 L40729.3 2267.4 " fill="none"></path>
 					</g>
-					<path d="M12229.3 1028.1 L16454.25 1174 L17220.5 1350.0606261607854 L17220.5 1350.1 " fill="none"></path>
-					<path d="M12229.5 1022.8 L12229.3 1028.1 L12229.1 1033.4 L12216.0 1027.6 Z"></path>
-					<path d="M37235.5 1537.9 L37248.25 1607 L37248.25 2296 L37248.25 2296 L37248.25 2985 L37248.25 2985 L37248.25 3171.5 L37248.25 3171.5 L37248.25 3358 L37248.25 3358 L37248.25 3514.5 L37248.25 3514.5 L37248.25 3671 L37248.25 3671 L35569.75 3705.493053545586 L35569.8 3705.5 " fill="none"></path>
+					<path d="M29511.3 1037.3 L29510.4 1042.5 L29509.6 1047.8 L29497.3 1040.4 Z"></path>
+					<path d="M34939.8 3296.7 L34939.75 3358 L39709.75 3510.0221973322473 L39709.8 3510.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37239.0 1527.7 L37235.5 1537.9 L37228.5 1529.6 L37232.1 1519.5 Z"></path>
+						<path d="M34945.1 3287.3 L34939.8 3296.7 L34934.4 3287.3 L34939.8 3278.0 Z"></path>
 					</g>
-					<path d="M37542.6 1450.2 L38420.25 1607 L38420.25 2296 L38420.25 2296 L38420.25 2985 L38420.25 2985 L38420.25 3171.5 L38420.25 3171.5 L38420.25 3358 L38420.25 3358 L37089.25 3499.5572545022087 L37089.3 3499.6 " fill="none"></path>
+					<path d="M35358.4 3159.5 L41465.75 2985 L41283.42779390421 2545 L41283.4 2545.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37534.4 1443.3 L37542.6 1450.2 L37532.5 1453.8 L37524.3 1446.9 Z"></path>
+						<path d="M35348.9 3154.5 L35358.4 3159.5 L35349.2 3165.1 L35339.8 3160.1 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M41382.5 1040.7 L42417.5 1174 L37524.25 1377.3668234390748 L37524.3 1377.4 " fill="none"></path>
+						<path d="M43963.3 1070.9 L44117.75 1174 L44117.75 1390.5 L44117.75 1390.5 L44117.75 1607 L44117.75 1607 L44117.75 2296 L44117.75 2296 L44117.75 2985 L44117.75 2985 L35339.75 3163.3718675092614 L35339.8 3163.4 " fill="none"></path>
 					</g>
-					<path d="M41383.2 1035.4 L41382.5 1040.7 L41381.8 1046.0 L41369.3 1039.0 Z"></path>
+					<path d="M43966.2 1066.5 L43963.3 1070.9 L43960.3 1075.3 L43952.2 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M25482.5 1035.8 L26886 1174 L36892.25 1383.872181452687 L36892.3 1383.9 " fill="none"></path>
+						<path d="M14216.4 1416.7 L14357 1607 L14357 2296 L14357 2296 L14357 2985 L14357 2985 L34539.75 3167.875605786399 L34539.8 3167.9 " fill="none"></path>
 					</g>
-					<path d="M25483.0 1030.5 L25482.5 1035.8 L25482.0 1041.1 L25469.3 1034.5 Z"></path>
+					<path d="M14220.7 1413.6 L14216.4 1416.7 L14212.1 1419.9 L14208.5 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M27202.0 546.7 L31535.5 876 L31535.5 1025 L31535.5 1025 L31535.5 1174 L31535.5 1174 L31535.5 1390.5 L31535.5 1390.5 L31535.5 1607 L31535.5 1607 L27290 2267.379162433683 L27290.0 2267.4 " fill="none"></path>
+						<path d="M29510.4 1041.8 L30372.5 1174 L30372.5 1390.5 L30372.5 1390.5 L30372.5 1607 L30372.5 1607 L30372.5 2296 L30372.5 2296 L30372.5 2985 L30372.5 2985 L34539.75 3155.166319995621 L34539.8 3155.2 " fill="none"></path>
 					</g>
-					<path d="M27202.4 541.4 L27202.0 546.7 L27201.6 552.0 L27188.8 545.7 Z"></path>
-					<path d="M39624.8 1097.7 L39624.75 1174 L39624.75 1239 L39624.8 1239.0 " fill="none"></path>
+					<path d="M29511.2 1036.5 L29510.4 1041.8 L29509.6 1047.1 L29497.3 1039.8 Z"></path>
+					<path d="M44955.1 1548.6 L44820.25 1607 L44820.25 2296 L44820.25 2296 L44820.25 2985 L44820.25 2985 L40692.25 3170.132138992425 L40692.3 3170.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39630.1 1088.3 L39624.8 1097.7 L39619.4 1088.3 L39624.8 1079.0 Z"></path>
+						<path d="M44965.8 1549.8 L44955.1 1548.6 L44961.6 1540.0 L44972.3 1541.2 Z"></path>
 					</g>
-					<path d="M38303.9 558.1 L39624.75 876 L39624.75 971 L39624.8 971.0 " fill="none"></path>
-					<path d="M38305.1 552.9 L38303.9 558.1 L38302.6 563.3 L38290.9 555.0 Z"></path>
-					<path d="M32084.2 1072.9 L32436.5 1174 L32436.5 1375 L32436.5 1375.0 " fill="none"></path>
+					<path d="M44955.4 1562.2 L44860.25 1607 L44860.25 2296 L44860.25 2296 L44860.25 2985 L44860.25 2985 L33389 3170.2805443090047 L33389.0 3170.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32076.7 1065.2 L32084.2 1072.9 L32073.8 1075.5 L32066.3 1067.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M27202.1 546.1 L31917.25 876 L31917.25 941 L31917.3 941.0 " fill="none"></path>
+						<path d="M44966.1 1563.1 L44955.4 1562.2 L44961.5 1553.4 L44972.3 1554.3 Z"></path>
 					</g>
-					<path d="M27202.4 540.8 L27202.1 546.1 L27201.7 551.5 L27188.8 545.2 Z"></path>
-					<path d="M39787.1 1555.3 L39838 1607 L39838 2296 L39838 2296 L39838 2985 L39838 2985 L33587.25 3169.82934321614 L33587.3 3169.8 " fill="none"></path>
+					<path d="M44955.7 1578.4 L44900.25 1607 L44900.25 2296 L44900.25 2296 L44900.25 2985 L44900.25 2985 L31289.5 3170.532177901219 L31289.5 3170.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39784.3 1544.9 L39787.1 1555.3 L39776.7 1552.4 L39774.0 1542.0 Z"></path>
+						<path d="M44966.4 1578.9 L44955.7 1578.4 L44961.5 1569.4 L44972.3 1569.9 Z"></path>
 					</g>
-					<path d="M39816.2 1554.1 L39878 1607 L39878 2296 L39878 2296 L39878 2985 L39878 2985 L21564.25 3170.638392553842 L21564.3 3170.6 " fill="none"></path>
+					<path d="M44985.5 1581.2 L44940.25 1607 L44940.25 2296 L44940.25 2296 L44940.25 2985 L44940.25 2985 L34499.75 3170.681900538788 L34499.8 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39812.5 1544.0 L39816.2 1554.1 L39805.6 1552.1 L39802.0 1542.0 Z"></path>
+						<path d="M44996.2 1581.3 L44985.5 1581.2 L44990.9 1572.0 L45001.7 1572.0 Z"></path>
 					</g>
-					<path d="M43357.6 1583.6 L43328 1607 L43328 2296 L43328 2296 L43328 2985 L43328 2985 L36889 3170.6207589458227 L36889.0 3170.6 " fill="none"></path>
+					<path d="M45327.6 1590.7 L45328.25 1607 L45328.25 2054.5 L45328.3 2054.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43368.3 1582.0 L43357.6 1583.6 L43361.7 1573.6 L43372.3 1572.0 Z"></path>
+						<path d="M45332.6 1581.1 L45327.6 1590.7 L45322.0 1581.5 L45327.0 1572.0 Z"></path>
 					</g>
-					<path d="M43392.1 1584.7 L43368 1607 L43368 2296 L43368 2296 L43368 2985 L43368 2985 L34618.25 3169.9044927905725 L34618.3 3169.9 " fill="none"></path>
+					<path d="M45449.5 1587.6 L45462.25 1607 L41631.25 2223.431340495096 L41631.3 2223.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43402.6 1582.3 L43392.1 1584.7 L43395.4 1574.4 L43405.8 1572.0 Z"></path>
+						<path d="M45448.9 1576.9 L45449.5 1587.6 L45440.0 1582.7 L45439.3 1572.0 Z"></path>
 					</g>
-					<path d="M43426.9 1585.9 L43408 1607 L43408 2296 L43408 2296 L43408 2985 L43408 2985 L32275 3170.318145305248 L32275.0 3170.3 " fill="none"></path>
+					<path d="M45484.8 1586.3 L45502.25 1607 L40689.25 2225.8014554954284 L40689.3 2225.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43437.1 1582.5 L43426.9 1585.9 L43429.2 1575.4 L43439.4 1572.0 Z"></path>
+						<path d="M45482.9 1575.7 L45484.8 1586.3 L45474.8 1582.6 L45472.8 1572.0 Z"></path>
 					</g>
-					<path d="M43462.1 1587.2 L43448 1607 L43448 2296 L43448 2296 L43448 2985 L43448 2985 L34981.25 3170.492217556019 L34981.3 3170.5 " fill="none"></path>
+					<path d="M45519.7 1585.0 L45542.25 1607 L43917.75 2151.7945972256025 L43917.8 2151.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43471.8 1582.7 L43462.1 1587.2 L43463.1 1576.5 L43472.9 1572.0 Z"></path>
+						<path d="M45516.8 1574.7 L45519.7 1585.0 L45509.3 1582.3 L45506.4 1572.0 Z"></path>
 					</g>
-					<path d="M43811.9 1584.7 L43836 1607 L43836 2054.5 L43836.0 2054.5 " fill="none"></path>
+					<path d="M45554.3 1583.9 L45582.25 1607 L38468.25 2257.6333045729075 L38468.3 2257.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43808.6 1574.4 L43811.9 1584.7 L43801.4 1582.3 L43798.2 1572.0 Z"></path>
+						<path d="M45550.5 1573.8 L45554.3 1583.9 L45543.7 1582.1 L45539.9 1572.0 Z"></path>
 					</g>
-					<path d="M43926.6 1581.5 L43970 1607 L34935.25 2263.241493819677 L34935.3 2263.2 " fill="none"></path>
+					<path d="M45668.6 1581.0 L45716.25 1607 L45716.25 2296 L45716.25 2296 L45716.25 2985 L45716.25 2985 L39449.75 3169.950506409242 L39449.8 3170.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43921.3 1572.1 L43926.6 1581.5 L43915.8 1581.3 L43910.5 1572.0 Z"></path>
+						<path d="M45663.0 1571.8 L45668.6 1581.0 L45657.9 1581.2 L45652.2 1572.0 Z"></path>
 					</g>
-					<path d="M43960.5 1580.7 L44010 1607 L38380.25 2235.0852932842163 L38380.3 2235.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43954.8 1571.7 L43960.5 1580.7 L43949.8 1581.1 L43944.0 1572.0 Z"></path>
+					<path d="M44207.7 608.3 L45956.25 876 L45956.25 1025 L45956.25 1025 L45956.25 1174 L45956.25 1174 L45668.25 1272.0377358490566 L45668.3 1272.0 " fill="none"></path>
+					<path d="M44208.5 603.0 L44207.7 608.3 L44206.9 613.5 L44194.5 606.3 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M43974.1 1070.1 L44157.75 1174 L44972.25 1325.689677419355 L44972.3 1325.7 " fill="none"></path>
 					</g>
-					<path d="M43966.8 1566.8 L44050 1607 L42024 2175.3688925081433 L42024.0 2175.4 " fill="none"></path>
+					<path d="M43976.8 1065.4 L43974.1 1070.1 L43971.5 1074.7 L43962.5 1063.5 Z"></path>
+					<path d="M39550.9 1538.1 L39557.25 1607 L39557.25 2296 L39557.25 2296 L39557.25 2985 L39557.25 2985 L39557.25 3171.5 L39557.25 3171.5 L39557.25 3358 L39557.25 3358 L39557.25 3514.5 L39557.25 3514.5 L39557.25 3671 L39557.25 3671 L38651.25 3704.6785340314136 L38651.3 3704.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43960.7 1557.9 L43966.8 1566.8 L43956.1 1567.5 L43950.0 1558.7 Z"></path>
+						<path d="M39555.3 1528.3 L39550.9 1538.1 L39544.7 1529.3 L39549.2 1519.5 Z"></path>
 					</g>
-					<path d="M43967.1 1552.5 L44090 1607 L37088.25 2257.0529897254505 L37088.3 2257.1 " fill="none"></path>
+					<path d="M39871.8 1424.4 L41671.25 1607 L41671.25 2296 L41671.25 2296 L41671.25 2985 L41671.25 2985 L41671.25 3171.5 L41671.25 3171.5 L41671.25 3358 L41671.25 3358 L39990.75 3502.4251784733665 L39990.8 3502.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43960.7 1543.8 L43967.1 1552.5 L43956.4 1553.5 L43950.0 1544.9 Z"></path>
+						<path d="M39863.1 1418.2 L39871.8 1424.4 L39862.0 1428.8 L39853.3 1422.6 Z"></path>
 					</g>
-					<path d="M43967.6 1517.8 L44224 1607 L44224 2296 L44224 2296 L44224 2985 L44224 2985 L36049.25 3170.3099000273482 L36049.3 3170.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43960.6 1509.7 L43967.6 1517.8 L43957.1 1519.7 L43950.0 1511.6 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M43984.8 1069.4 L44197.75 1174 L39853.25 1375.8204591781998 L39853.3 1375.8 " fill="none"></path>
 					</g>
-					<path d="M42457.0 603.1 L44384 876 L44384 1025 L44384 1025 L44384 1174 L44384 1174 L43950 1294.1547314578006 L43950.0 1294.2 " fill="none"></path>
-					<path d="M42457.7 597.8 L42457.0 603.1 L42456.2 608.4 L42443.8 601.2 Z"></path>
+					<path d="M43987.2 1064.6 L43984.8 1069.4 L43982.5 1074.2 L43972.9 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41382.5 1040.2 L42457.5 1174 L43254 1324.670380078637 L43254.0 1324.7 " fill="none"></path>
+						<path d="M29510.5 1038.8 L30588.5 1174 L39221.25 1382.854909903618 L39221.3 1382.9 " fill="none"></path>
 					</g>
-					<path d="M41383.1 1034.9 L41382.5 1040.2 L41381.8 1045.4 L41369.3 1038.5 Z"></path>
-					<path d="M11336.8 1410.0 L12295 1607 L12295 2265 L12295.0 2265.0 " fill="none"></path>
-					<path d="M11337.9 1404.8 L11336.8 1410.0 L11335.7 1415.3 L11323.8 1407.4 Z"></path>
-					<path d="M11336.9 1406.5 L12531 1607 L12531 2257.5 L12531.0 2257.5 " fill="none"></path>
-					<path d="M11337.8 1401.2 L11336.9 1406.5 L11336.0 1411.7 L11323.8 1404.3 Z"></path>
-					<path d="M1000.1 1487.1 L1290.75 1607 L1290.75 2265 L1290.8 2265.0 " fill="none"></path>
-					<path d="M1002.1 1482.2 L1000.1 1487.1 L998.1 1492.0 L987.8 1482.0 Z"></path>
-					<path d="M11336.9 1404.2 L12749 1607 L12749 2265 L12749.0 2265.0 " fill="none"></path>
-					<path d="M11337.7 1398.9 L11336.9 1404.2 L11336.2 1409.5 L11323.8 1402.3 Z"></path>
-					<path d="M26665.0 2413.0 L26582 2985 L36828 3170.946479832628 L36828.0 3170.9 " fill="none"></path>
+					<path d="M29511.1 1033.5 L29510.5 1038.8 L29509.8 1044.1 L29497.3 1037.1 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M27212.4 583.8 L26595.25 876 L26595.25 1025 L26595.25 1025 L26595.25 1174 L26595.25 1174 L26595.25 1390.5 L26595.25 1390.5 L26595.25 1607 L26595.25 1607 L25452.659288824383 2227 L25452.7 2227.0 " fill="none"></path>
+					</g>
+					<path d="M27214.7 588.6 L27212.4 583.8 L27210.2 579.0 L27224.5 578.1 Z"></path>
+					<path d="M31588.7 1089.7 L30804.5 1174 L30804.5 1390.5 L30804.5 1390.5 L30804.5 1607 L30804.5 1607 L30804.5 2296 L30804.5 2296 L30804.5 2985 L30804.5 2985 L14692.5 3169.422499769847 L14692.5 3169.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26671.6 2404.5 L26665.0 2413.0 L26661.1 2403.0 L26667.7 2394.5 Z"></path>
+						<path d="M31598.5 1094.0 L31588.7 1089.7 L31597.4 1083.4 L31607.3 1087.7 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M27400.8 546.0 L32191.25 876 L32191.25 896 L32191.3 896.0 " fill="none"></path>
 					</g>
-					<path d="M26712.2 2412.6 L26860.5 2985 L26860.5 3156 L26860.5 3156.0 " fill="none"></path>
+					<path d="M27401.2 540.7 L27400.8 546.0 L27400.4 551.4 L27387.5 545.1 Z"></path>
+					<path d="M32487.1 1159.5 L32519 1174 L32519 1306.5 L32519.0 1306.5 " fill="none"></path>
+					<path d="M32489.4 1154.7 L32487.1 1159.5 L32484.9 1164.4 L32475.0 1154.0 Z"></path>
+					<path d="M32788.3 1145.9 L32927 1174 L32927 1321.5 L32927.0 1321.5 " fill="none"></path>
+					<path d="M32789.4 1140.7 L32788.3 1145.9 L32787.3 1151.1 L32775.3 1143.3 Z"></path>
+					<path d="M32788.5 1098.7 L33399 1174 L33399 1321.5 L33399.0 1321.5 " fill="none"></path>
+					<path d="M32789.1 1093.4 L32788.5 1098.7 L32787.8 1104.0 L32775.3 1097.0 Z"></path>
+					<path d="M32788.5 1076.7 L33911 1174 L33911 1314 L33911.0 1314.0 " fill="none"></path>
+					<path d="M32789.0 1071.4 L32788.5 1076.7 L32788.1 1082.1 L32775.3 1075.6 Z"></path>
+					<path d="M34359.0 1553.2 L34359 1607 L20836.75 2294.525523475694 L20836.8 2294.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26715.0 2402.2 L26712.2 2412.6 L26704.7 2404.9 L26707.5 2394.5 Z"></path>
+						<path d="M34364.3 1543.8 L34359.0 1553.2 L34353.7 1543.8 L34359.0 1534.5 Z"></path>
 					</g>
-					<path d="M26753.3 2410.3 L27111.5 2985 L27111.5 3156 L27111.5 3156.0 " fill="none"></path>
+					<path d="M32788.6 1066.1 L34359 1174 L34359 1246.5 L34359.0 1246.5 " fill="none"></path>
+					<path d="M32788.9 1060.7 L32788.6 1066.1 L32788.2 1071.4 L32775.3 1065.1 Z"></path>
+					<path d="M34743.0 1493.2 L34743 1607 L34743 2280.5 L34743.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26752.9 2399.6 L26753.3 2410.3 L26743.8 2405.2 L26743.4 2394.5 Z"></path>
+						<path d="M34748.3 1483.8 L34743.0 1493.2 L34737.7 1483.8 L34743.0 1474.5 Z"></path>
 					</g>
-					<path d="M28647.0 2502.9 L28508.5 2985 L34467.25 3169.166528566102 L34467.3 3169.2 " fill="none"></path>
+					<path d="M32788.6 1059.9 L34743 1174 L34743 1306.5 L34743.0 1306.5 " fill="none"></path>
+					<path d="M32788.9 1054.6 L32788.6 1059.9 L32788.2 1065.2 L32775.3 1059.1 Z"></path>
+					<path d="M15378.0 1455.7 L15378 1607 L25549.5 2263.3179902603483 L25549.5 2263.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28654.7 2495.4 L28647.0 2502.9 L28644.5 2492.5 L28652.2 2485.0 Z"></path>
+						<path d="M15383.3 1446.3 L15378.0 1455.7 L15372.7 1446.3 L15378.0 1437.0 Z"></path>
 					</g>
-					<path d="M28925.8 2497.6 L29455.75 2985 L32133 3166.6818429909945 L32133.0 3166.7 " fill="none"></path>
+					<path d="M17400.9 1031.3 L15378 1174 L15378 1344 L15378.0 1344.0 " fill="none"></path>
+					<path d="M17401.3 1036.6 L17400.9 1031.3 L17400.6 1026.0 L17414.3 1030.4 Z"></path>
+					<path d="M15770.0 1478.2 L15770 1607 L25549.5 2262.0724771534124 L25549.5 2262.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28922.5 2487.4 L28925.8 2497.6 L28915.3 2495.2 L28912.0 2485.0 Z"></path>
+						<path d="M15775.3 1468.8 L15770.0 1478.2 L15764.7 1468.8 L15770.0 1459.5 Z"></path>
 					</g>
-					<path d="M28937.1 2497.3 L29495.75 2985 L29495.75 3156 L29495.8 3156.0 " fill="none"></path>
+					<path d="M17401.0 1032.7 L15770 1174 L15770 1321.5 L15770.0 1321.5 " fill="none"></path>
+					<path d="M17401.4 1038.0 L17401.0 1032.7 L17400.5 1027.4 L17414.3 1031.6 Z"></path>
+					<path d="M14709.9 3093.0 L14722.5 3088 L14730 3088 L14730 3088 L14737.5 3171.5 L14737.5 3171.5 L14730 3255 L14730 3255 L14722.5 3255 L14722.5 3255 L14692.5 3243.1560283687945 L14692.5 3243.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28933.5 2487.1 L28937.1 2497.3 L28926.5 2495.2 L28923.0 2485.0 Z"></path>
+						<path d="M14699.2 3091.5 L14709.9 3093.0 L14703.1 3101.4 L14692.5 3099.8 Z"></path>
 					</g>
-					<path d="M28987.0 2495.8 L29673.75 2985 L34889.25 3169.8694763850613 L34889.3 3169.9 " fill="none"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3046.3 2318.7 L4083.25 2985 L14329.5 3168.253877873942 L14329.5 3168.3 " fill="none"></path>
+					</g>
+					<path d="M3049.2 2314.2 L3046.3 2318.7 L3043.5 2323.2 L3035.1 2311.5 Z"></path>
+					<path d="M17756.8 1455.7 L17756.75 1607 L25549.5 2253.9505979455976 L25549.5 2254.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28982.5 2486.1 L28987.0 2495.8 L28976.3 2494.8 L28971.8 2485.0 Z"></path>
+						<path d="M17762.1 1446.3 L17756.8 1455.7 L17751.4 1446.3 L17756.8 1437.0 Z"></path>
 					</g>
-					<path d="M28998.2 2495.5 L29713.75 2985 L21564.25 3169.5748679336934 L21564.3 3169.6 " fill="none"></path>
+					<path d="M17529.6 1047.0 L17756.75 1174 L17756.75 1344 L17756.8 1344.0 " fill="none"></path>
+					<path d="M17532.2 1042.4 L17529.6 1047.0 L17527.0 1051.7 L17518.0 1040.5 Z"></path>
+					<path d="M30116.5 1440.2 L30116.5 1607 L26562.5 2210.0552887575423 L26562.5 2210.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28993.5 2485.9 L28998.2 2495.5 L28987.5 2494.7 L28982.8 2485.0 Z"></path>
+						<path d="M30121.8 1430.8 L30116.5 1440.2 L30111.2 1430.8 L30116.5 1421.5 Z"></path>
 					</g>
-					<path d="M29009.4 2495.3 L29753.75 2985 L32638.5 3166.804806961223 L32638.5 3166.8 " fill="none"></path>
+					<path d="M23303.3 1455.7 L23303.25 1607 L25549.5 2169.2255017709563 L25549.5 2169.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29004.5 2485.7 L29009.4 2495.3 L28998.6 2494.6 L28993.8 2485.0 Z"></path>
+						<path d="M23308.6 1446.3 L23303.3 1455.7 L23297.9 1446.3 L23303.3 1437.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M27819.1 1415.0 L27608 1607 L28405.169811320753 2107 L28405.2 2107.0 " fill="none"></path>
+					<path d="M17579.6 1029.4 L20491 1174 L23127.25 1376.9507067294871 L23127.3 1377.0 " fill="none"></path>
+					<path d="M17579.8 1024.1 L17579.6 1029.4 L17579.3 1034.8 L17566.3 1028.8 Z"></path>
+					<path d="M23695.3 1455.7 L23695.25 1607 L25549.5 2148.174732606163 L25549.5 2148.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M23700.6 1446.3 L23695.3 1455.7 L23689.9 1446.3 L23695.3 1437.0 Z"></path>
 					</g>
-					<path d="M27822.7 1418.9 L27819.1 1415.0 L27815.5 1411.0 L27829.0 1406.0 Z"></path>
-					<path d="M28096.2 1549.3 L28052 1607 L28052 2280.5 L28052.0 2280.5 " fill="none"></path>
+					<path d="M17579.6 1029.1 L20707 1174 L23519.25 1377.7487241696645 L23519.3 1377.7 " fill="none"></path>
+					<path d="M17579.8 1023.8 L17579.6 1029.1 L17579.3 1034.5 L17566.3 1028.5 Z"></path>
+					<path d="M25532.9 2566.8 L24725 2985 L14692.5 3168.1859457607206 L14692.5 3168.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28106.1 1545.2 L28096.2 1549.3 L28097.7 1538.7 L28107.6 1534.5 Z"></path>
+						<path d="M25543.7 2567.2 L25532.9 2566.8 L25538.8 2557.7 L25549.5 2558.2 Z"></path>
 					</g>
-					<path d="M28322.1 1550.1 L28359.25 1607 L29682.789912917273 2280.5 L29682.8 2280.5 " fill="none"></path>
+					<path d="M25533.0 2575.1 L24765 2985 L32856 3170.2066891684567 L32856.0 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28321.5 1539.4 L28322.1 1550.1 L28312.6 1545.2 L28311.9 1534.5 Z"></path>
+						<path d="M25543.8 2575.4 L25533.0 2575.1 L25538.8 2566.0 L25549.5 2566.3 Z"></path>
 					</g>
-					<path d="M28437.6 1545.3 L28525.25 1607 L9008.75 2294.7490026595747 L9008.8 2294.7 " fill="none"></path>
+					<path d="M26579.8 2506.9 L27767.25 2985 L27767.25 3171.5 L27767.25 3171.5 L27767.25 3358 L27767.25 3358 L27767.25 3514.5 L27767.25 3514.5 L27767.25 3671 L27767.25 3671 L38553.25 3706.3394554683896 L38553.3 3706.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28433.1 1535.5 L28437.6 1545.3 L28426.9 1544.2 L28422.4 1534.5 Z"></path>
+						<path d="M26573.1 2498.5 L26579.8 2506.9 L26569.2 2508.4 L26562.5 2499.9 Z"></path>
 					</g>
-					<path d="M28475.1 1504.4 L28706.5 1607 L28706.5 2107 L28706.5 2107.0 " fill="none"></path>
+					<path d="M26579.9 2500.6 L27820.25 2985 L10492.25 3170.7603035006036 L10492.3 3170.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28468.7 1495.8 L28475.1 1504.4 L28464.4 1505.5 L28458.0 1496.9 Z"></path>
+						<path d="M26573.1 2492.2 L26579.9 2500.6 L26569.3 2502.2 L26562.5 2493.8 Z"></path>
 					</g>
-					<path d="M3355.9 3072.2 L3369.25 3065.5 L3376.75 3065.5 L3376.75 3065.5 L3384.25 3171.5 L3384.25 3171.5 L3376.75 3277.5 L3376.75 3277.5 L3369.25 3277.5 L3369.25 3277.5 L3339.25 3262.393111638955 L3339.3 3262.4 " fill="none"></path>
+					<path d="M26579.9 2496.1 L27860.25 2985 L39344.75 3170.651317500217 L39344.8 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3345.2 3071.6 L3355.9 3072.2 L3350.0 3081.2 L3339.3 3080.6 Z"></path>
+						<path d="M26573.1 2487.8 L26579.9 2496.1 L26569.3 2497.7 L26562.5 2489.4 Z"></path>
 					</g>
+					<path d="M42775.1 1432.7 L42887 1607 L26562.5 2275.265729903155 L26562.5 2275.3 " fill="none"></path>
+					<path d="M42779.6 1429.8 L42775.1 1432.7 L42770.6 1435.6 L42767.9 1421.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M4881.7 2321.5 L5464.75 2985 L3339.25 3156.9018863833476 L3339.3 3156.9 " fill="none"></path>
+						<path d="M14220.4 1415.8 L14397 1607 L25549.5 2266.0678874689083 L25549.5 2266.1 " fill="none"></path>
 					</g>
-					<path d="M4885.7 2318.0 L4881.7 2321.5 L4877.7 2325.0 L4872.9 2311.5 Z"></path>
-					<path d="M28270.5 2345.7 L28270.5 2985 L21354.25 3167.5927203878687 L21354.3 3167.6 " fill="none"></path>
+					<path d="M14224.3 1412.2 L14220.4 1415.8 L14216.4 1419.4 L14211.3 1406.0 Z"></path>
+					<path d="M30588.5 1447.7 L30588.5 1607 L26562.5 2219.0052950910094 L26562.5 2219.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28275.8 2336.3 L28270.5 2345.7 L28265.2 2336.3 L28270.5 2327.0 Z"></path>
+						<path d="M30593.8 1438.3 L30588.5 1447.7 L30583.2 1438.3 L30588.5 1429.0 Z"></path>
 					</g>
-					<path d="M28791.0 1463.2 L28791 1607 L9008.75 2294.765778153423 L9008.8 2294.8 " fill="none"></path>
+					<path d="M35461.7 1072.9 L35814 1174 L35814 1375 L35814.0 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28796.3 1453.8 L28791.0 1463.2 L28785.7 1453.8 L28791.0 1444.5 Z"></path>
+						<path d="M35454.2 1065.2 L35461.7 1072.9 L35451.3 1075.5 L35443.8 1067.8 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M4882.9 2321.2 L5504.75 2985 L21058.25 3169.742078782282 L21058.3 3169.7 " fill="none"></path>
+						<path d="M27400.8 543.5 L35294.75 876 L35294.75 941 L35294.8 941.0 " fill="none"></path>
 					</g>
-					<path d="M4886.8 2317.6 L4882.9 2321.2 L4879.0 2324.9 L4873.8 2311.5 Z"></path>
-					<path d="M29121.0 1470.2 L29121 1607 L16417.25 2292.117018570338 L16417.3 2292.1 " fill="none"></path>
+					<path d="M27401.0 538.2 L27400.8 543.5 L27400.6 548.8 L27387.5 542.9 Z"></path>
+					<path d="M42210.8 1097.7 L42210.75 1174 L42210.75 1239 L42210.8 1239.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29126.3 1460.8 L29121.0 1470.2 L29115.7 1460.8 L29121.0 1451.5 Z"></path>
+						<path d="M42216.1 1088.3 L42210.8 1097.7 L42205.4 1088.3 L42210.8 1079.0 Z"></path>
 					</g>
-					<path d="M12229.3 1027.9 L16767.25 1174 L17612.5 1368.2123905545238 L17612.5 1368.2 " fill="none"></path>
-					<path d="M12229.5 1022.5 L12229.3 1027.9 L12229.2 1033.2 L12216.0 1027.4 Z"></path>
-					<path d="M43811.5 130.3 L43245.5 203 L43245.5 524 L43245.5 524.0 " fill="none"></path>
+					<path d="M39125.0 551.0 L42210.75 876 L42210.75 971 L42210.8 971.0 " fill="none"></path>
+					<path d="M39125.6 545.7 L39125.0 551.0 L39124.5 556.3 L39111.8 549.6 Z"></path>
+					<path d="M42226.5 1560.6 L42230.75 1607 L42230.75 2296 L42230.75 2296 L42230.75 2985 L42230.75 2985 L32969 3170.369181445014 L32969.0 3170.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43821.4 134.4 L43811.5 130.3 L43820.1 123.8 L43830.0 127.9 Z"></path>
+						<path d="M42230.9 1550.8 L42226.5 1560.6 L42220.3 1551.8 L42224.7 1542.0 Z"></path>
 					</g>
-					<path d="M43811.8 157.8 L43606.5 203 L43606.5 524 L43606.5 524.0 " fill="none"></path>
+					<path d="M42257.7 1560.0 L42270.75 1607 L42270.75 2296 L42270.75 2296 L42270.75 2985 L42270.75 2985 L13953.5 3170.94185759931 L13953.5 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43822.0 161.0 L43811.8 157.8 L43819.7 150.6 L43830.0 153.8 Z"></path>
+						<path d="M42260.4 1549.6 L42257.7 1560.0 L42250.1 1552.4 L42252.7 1542.0 Z"></path>
 					</g>
-					<path d="M43997.8 195.5 L43989.5 203 L43989.5 524 L43989.5 524.0 " fill="none"></path>
+					<path d="M19907.2 1404.4 L21294.75 1607 L22393.008345428156 2265 L22393.0 2265.0 " fill="none"></path>
+					<path d="M19908.0 1399.1 L19907.2 1404.4 L19906.4 1409.7 L19894.0 1402.5 Z"></path>
+					<path d="M31034.8 1470.2 L31034.75 1607 L17141.25 2292.447817836812 L17141.3 2292.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44008.3 193.2 L43997.8 195.5 L44001.2 185.3 L44011.7 183.0 Z"></path>
+						<path d="M31040.1 1460.8 L31034.8 1470.2 L31029.4 1460.8 L31034.8 1451.5 Z"></path>
 					</g>
-					<path d="M44247.6 194.3 L44259 203 L44259 524 L44259.0 524.0 " fill="none"></path>
+					<path d="M31669.5 2345.7 L31669.5 2985 L13743.5 3169.972833905057 L13743.5 3170.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44243.5 184.4 L44247.6 194.3 L44237.0 192.9 L44232.8 183.0 Z"></path>
+						<path d="M31674.8 2336.3 L31669.5 2345.7 L31664.2 2336.3 L31669.5 2327.0 Z"></path>
 					</g>
-					<path d="M11164.3 2402.7 L10750 2985 L34658.25 3170.758001353955 L34658.3 3170.8 " fill="none"></path>
+					<path d="M31364.8 1463.2 L31364.75 1607 L14287.25 2294.5707064804533 L14287.3 2294.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11174.1 2398.2 L11164.3 2402.7 L11165.4 2392.0 L11175.1 2387.5 Z"></path>
+						<path d="M31370.1 1453.8 L31364.8 1463.2 L31359.4 1453.8 L31364.8 1444.5 Z"></path>
 					</g>
-					<path d="M11312.2 2403.0 L11703.5 2985 L21394.25 3169.878385290131 L21394.3 3169.9 " fill="none"></path>
+					<path d="M17389.8 2419.5 L15904.25 2985 L33238 3170.691191464308 L33238.0 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11311.4 2392.3 L11312.2 2403.0 L11302.6 2398.2 L11301.8 2387.5 Z"></path>
+						<path d="M17400.4 2421.2 L17389.8 2419.5 L17396.6 2411.2 L17407.3 2412.9 Z"></path>
 					</g>
-					<path d="M1051.7 1484.8 L1421.75 1607 L10914.75 2273.158476345674 L10914.8 2273.2 " fill="none"></path>
-					<path d="M1053.3 1479.7 L1051.7 1484.8 L1050.0 1489.9 L1039.0 1480.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M27866.0 1416.6 L28012 1607 L11565.75 2282.6281395799483 L11565.8 2282.6 " fill="none"></path>
+					<path d="M17390.9 2472.9 L16454.75 2985 L31147.5 3170.603107272881 L31147.5 3170.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M17401.6 2473.1 L17390.9 2472.9 L17396.5 2463.7 L17407.3 2463.9 Z"></path>
+					</g>
+					<path d="M17391.0 2478.6 L16494.75 2985 L12975.5 3167.7863607881363 L12975.5 3167.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M17401.7 2478.7 L17391.0 2478.6 L17396.5 2469.4 L17407.3 2469.5 Z"></path>
 					</g>
-					<path d="M27870.2 1413.3 L27866.0 1416.6 L27861.8 1419.8 L27857.9 1406.0 Z"></path>
-					<path d="M42387.4 2503.1 L42270.75 2985 L36889 3170.4490045729594 L36889.0 3170.4 " fill="none"></path>
+					<path d="M18021.9 2495.1 L18778.5 2985 L34407.75 3170.9527041036026 L34407.8 3171.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42394.7 2495.3 L42387.4 2503.1 L42384.4 2492.8 L42391.8 2485.0 Z"></path>
+						<path d="M18016.9 2485.6 L18021.9 2495.1 L18011.1 2494.5 L18006.2 2485.0 Z"></path>
 					</g>
-					<path d="M42431.5 2503.7 L42417.5 2985 L34849.25 3169.1759745555373 L34849.3 3169.2 " fill="none"></path>
+					<path d="M18033.0 2494.9 L18818.5 2985 L13953.5 3168.2974747474746 L13953.5 3168.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42437.1 2494.5 L42431.5 2503.7 L42426.4 2494.2 L42432.0 2485.0 Z"></path>
+						<path d="M18027.9 2485.4 L18033.0 2494.9 L18022.3 2494.5 L18017.2 2485.0 Z"></path>
 					</g>
-					<path d="M42481.6 2503.3 L42584.25 2985 L33587.25 3170.336113105429 L33587.3 3170.3 " fill="none"></path>
+					<path d="M18037.2 2490.5 L18858.5 2985 L13164.5 3169.09135823871 L13164.5 3169.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42484.9 2493.0 L42481.6 2503.3 L42474.5 2495.2 L42477.8 2485.0 Z"></path>
+						<path d="M18032.0 2481.1 L18037.2 2490.5 L18026.5 2490.2 L18021.3 2480.9 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M7035.5 1417.1 L7162.25 1607 L17407.25 2275.954226686884 L17407.3 2276.0 " fill="none"></path>
+					</g>
+					<path d="M7039.9 1414.1 L7035.5 1417.1 L7031.1 1420.1 L7028.1 1406.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3047.4 2318.5 L4123.25 2985 L13447.5 3168.586014410515 L13447.5 3168.6 " fill="none"></path>
 					</g>
-					<path d="M42493.6 2503.0 L42624.25 2985 L36049.25 3170.022632968691 L36049.3 3170.0 " fill="none"></path>
+					<path d="M3050.2 2314.0 L3047.4 2318.5 L3044.5 2323.1 L3036.0 2311.5 Z"></path>
+					<path d="M31936.0 1548.9 L31888 1607 L31888 2280.5 L31888.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42496.3 2492.6 L42493.6 2503.0 L42486.0 2495.4 L42488.7 2485.0 Z"></path>
+						<path d="M31946.1 1545.1 L31936.0 1548.9 L31937.9 1538.3 L31947.9 1534.5 Z"></path>
 					</g>
-					<path d="M42457.0 602.1 L44424 876 L44424 1025 L44424 1025 L44424 1174 L44424 1174 L44424 1390.5 L44424 1390.5 L44424 1607 L44424 1607 L42771 2180.3284671532847 L42771.0 2180.3 " fill="none"></path>
-					<path d="M42457.7 596.8 L42457.0 602.1 L42456.2 607.3 L42443.8 600.2 Z"></path>
-					<path d="M40131.3 1463.2 L40131.25 1607 L42104 2196.3657452574525 L42104.0 2196.4 " fill="none"></path>
+					<path d="M32211.8 1548.3 L32265.75 1607 L32265.75 2280.5 L32265.8 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40136.6 1453.8 L40131.3 1463.2 L40125.9 1453.8 L40131.3 1444.5 Z"></path>
+						<path d="M32209.4 1537.8 L32211.8 1548.3 L32201.6 1545.0 L32199.2 1534.5 Z"></path>
 					</g>
-					<path d="M38327.4 557.3 L40131.25 876 L40131.25 1025 L40131.25 1025 L40131.25 1174 L40131.25 1174 L40131.25 1336.5 L40131.3 1336.5 " fill="none"></path>
-					<path d="M38328.3 552.1 L38327.4 557.3 L38326.4 562.6 L38314.2 555.0 Z"></path>
-					<path d="M11337.0 1402.0 L13034 1607 L13034 2242.5 L13034.0 2242.5 " fill="none"></path>
-					<path d="M11337.6 1396.7 L11337.0 1402.0 L11336.3 1407.3 L11323.8 1400.4 Z"></path>
-					<path d="M37417.8 1063.3 L36720.25 1174 L36720.25 1375 L36720.3 1375.0 " fill="none"></path>
+					<path d="M32325.3 1441.1 L33173 1607 L14287.25 2294.7072999933935 L14287.3 2294.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37427.9 1067.1 L37417.8 1063.3 L37426.2 1056.5 L37436.3 1060.3 Z"></path>
+						<path d="M32317.2 1434.0 L32325.3 1441.1 L32315.1 1444.5 L32307.0 1437.5 Z"></path>
 					</g>
-					<path d="M37899.6 1069.8 L38460.25 1174 L38460.25 1390.5 L38460.25 1390.5 L38460.25 1607 L38460.25 1607 L20155.5 2294.3665199678444 L20155.5 2294.4 " fill="none"></path>
+					<path d="M32325.3 1439.3 L33213 1607 L18021.25 2282.3522542140495 L18021.3 2282.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37891.4 1062.8 L37899.6 1069.8 L37889.5 1073.3 L37881.3 1066.4 Z"></path>
+						<path d="M32317.2 1432.3 L32325.3 1439.3 L32315.2 1442.8 L32307.0 1435.8 Z"></path>
 					</g>
-					<path d="M37899.7 1064.0 L38578.75 1174 L38578.75 1375 L38578.8 1375.0 " fill="none"></path>
+					<path d="M2349.7 3072.2 L2363 3065.5 L2370.5 3065.5 L2370.5 3065.5 L2378 3171.5 L2378 3171.5 L2370.5 3277.5 L2370.5 3277.5 L2363 3277.5 L2363 3277.5 L2333 3262.393111638955 L2333.0 3262.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37891.3 1057.3 L37899.7 1064.0 L37889.6 1067.8 L37881.3 1061.0 Z"></path>
+						<path d="M2338.9 3071.6 L2349.7 3072.2 L2343.7 3081.2 L2333.0 3080.6 Z"></path>
 					</g>
-					<path d="M37899.8 1054.8 L38865.25 1174 L38865.25 1375 L38865.3 1375.0 " fill="none"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3052.0 2317.7 L4310.25 2985 L2333 3155.8989109025606 L2333.0 3155.9 " fill="none"></path>
+					</g>
+					<path d="M3054.5 2313.0 L3052.0 2317.7 L3049.5 2322.5 L3040.2 2311.5 Z"></path>
+					<path d="M33387.5 2412.0 L33176.25 2985 L40631.25 3170.7400975218757 L40631.3 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37891.2 1048.3 L37899.8 1054.8 L37889.9 1058.9 L37881.3 1052.5 Z"></path>
+						<path d="M33395.7 2405.1 L33387.5 2412.0 L33385.7 2401.4 L33393.9 2394.5 Z"></path>
 					</g>
-					<path d="M39104.2 1454.5 L38863.25 1607 L38863.25 2280.5 L38863.3 2280.5 " fill="none"></path>
+					<path d="M33473.0 2412.0 L33684.25 2985 L32395.5 3156.0385162782422 L32395.5 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39114.9 1454.0 L39104.2 1454.5 L39109.2 1445.0 L39119.9 1444.5 Z"></path>
+						<path d="M33474.8 2401.4 L33473.0 2412.0 L33464.8 2405.1 L33466.6 2394.5 Z"></path>
 					</g>
-					<path d="M39264.9 1458.5 L39395 1607 L16417.25 2293.8477857677417 L16417.3 2293.8 " fill="none"></path>
+					<path d="M33479.6 2411.7 L33724.25 2985 L33155.09048257372 3156 L33155.1 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39262.7 1448.0 L39264.9 1458.5 L39254.7 1455.0 L39252.6 1444.5 Z"></path>
+						<path d="M33480.8 2401.0 L33479.6 2411.7 L33471.0 2405.2 L33472.3 2394.5 Z"></path>
 					</g>
-					<path d="M37894.5 1047.7 L39205.25 1174 L39205.25 1336.5 L39205.3 1336.5 " fill="none"></path>
-					<path d="M37895.0 1042.4 L37894.5 1047.7 L37894.0 1053.0 L37881.3 1046.4 Z"></path>
-					<g data-name="WebFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
-							<rect x="25196.3" y="37.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
-							<path d="M25196.3 68.5 L25365.3 68.5" fill="none" data-name="WebFrame"></path>
-							<path d="M25196.3 114.5 L25365.3 114.5" fill="none" data-name="WebFrame"></path>
+					<path d="M17579.6 1028.9 L20883.5 1174 L23911.25 1383.7793023441875 L23911.3 1383.8 " fill="none"></path>
+					<path d="M17579.8 1023.6 L17579.6 1028.9 L17579.3 1034.3 L17566.3 1028.3 Z"></path>
+					<g data-name="IAppDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
+							<rect x="26232.5" y="60.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
+							<path d="M26232.5 91.5 L26429.5 91.5" fill="none" data-name="IAppDelegate"></path>
 						</g>
-						<g transform="translate(25196.25, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
+						<g transform="translate(26232.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25196.25, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
+						<g transform="translate(26232.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25196.25, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
+					</g>
+					<g data-name="AppController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
+							<rect x="26469.5" y="22.5" height="138.0" width="301.0" data-name="AppController"></rect>
+							<path d="M26469.5 53.5 L26770.5 53.5" fill="none" data-name="AppController"></path>
+							<path d="M26469.5 114.5 L26770.5 114.5" fill="none" data-name="AppController"></path>
+						</g>
+						<g transform="translate(26469.5, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
+								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="DisabledFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
-							<rect x="25405.3" y="60.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
-							<path d="M25405.3 91.5 L25541.3 91.5" fill="none" data-name="DisabledFrame"></path>
-						</g>
-						<g transform="translate(25405.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
+						<g transform="translate(26469.5, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25405.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
+						<g transform="translate(26469.5, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PhoneContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
-							<rect x="0.0" y="1284.0" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
-							<path d="M0.0 1315.0 L327.0 1315.0" fill="none" data-name="PhoneContainer"></path>
-							<path d="M0.0 1466.0 L327.0 1466.0" fill="none" data-name="PhoneContainer"></path>
+					<g data-name="StudyMonitorScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
+							<rect x="18548.8" y="2265.0" height="62.0" width="176.0" data-name="StudyMonitorScreen"></rect>
+							<path d="M18548.8 2296.0 L18724.8 2296.0" fill="none" data-name="StudyMonitorScreen"></path>
 						</g>
-						<g transform="translate(0, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
-								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
+						<g transform="translate(18548.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
+								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
+						<g transform="translate(18548.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 1466)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
+					</g>
+					<g data-name="StudyPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
+							<rect x="19730.0" y="1344.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
+							<path d="M19730.0 1375.0 L19894.0 1375.0" fill="none" data-name="StudyPageWidget"></path>
+							<path d="M19730.0 1406.0 L19894.0 1406.0" fill="none" data-name="StudyPageWidget"></path>
+						</g>
+						<g transform="translate(19730, 1344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="10640.8" y="2280.5" height="31.0" width="58.0" data-name="Color"></rect>
+						<g transform="translate(19730, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
+								
+							</g>
 						</g>
-						<g transform="translate(10640.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
+						<g transform="translate(19730, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="8937.8" y="2280.5" height="31.0" width="71.0" data-name="Widget"></rect>
+					<g data-name="LoginForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
+							<rect x="0.0" y="2249.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
+							<path d="M0.0 2280.5 L207.0 2280.5" fill="none" data-name="LoginForm"></path>
+							<path d="M0.0 2311.5 L207.0 2311.5" fill="none" data-name="LoginForm"></path>
 						</g>
-						<g transform="translate(8937.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
+						<g transform="translate(0, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="MobileFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
-							<rect x="25581.3" y="60.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
-							<path d="M25581.3 91.5 L25717.3 91.5" fill="none" data-name="MobileFrame"></path>
-						</g>
-						<g transform="translate(25581.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
+						<g transform="translate(0, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25581.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
+						<g transform="translate(0, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DesktopFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
-							<rect x="25757.3" y="60.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
-							<path d="M25757.3 91.5 L25893.3 91.5" fill="none" data-name="DesktopFrame"></path>
+					<g data-name="AuthFormKey">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
+							<rect x="1100.0" y="3088.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
+							<path d="M1100.0 3119.0 L1455.0 3119.0" fill="none" data-name="AuthFormKey"></path>
 						</g>
-						<g transform="translate(25757.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
+						<g transform="translate(1100, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
+								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25757.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
+						<g transform="translate(1100, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
-							<rect x="135.3" y="2182.0" height="228.0" width="573.0" data-name="StudyController"></rect>
-							<path d="M135.3 2213.0 L708.3 2213.0" fill="none" data-name="StudyController"></path>
-							<path d="M135.3 2274.0 L708.3 2274.0" fill="none" data-name="StudyController"></path>
+					<g data-name="FormConsumerRefWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
+							<rect x="690.8" y="1375.0" height="31.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
 						</g>
-						<g transform="translate(135.25, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
-								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
+						<g transform="translate(690.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
+								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(135.25, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+					</g>
+					<g data-name="PasswordRecoveryForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
+							<rect x="572.5" y="2249.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
+							<path d="M572.5 2280.5 L780.5 2280.5" fill="none" data-name="PasswordRecoveryForm"></path>
+							<path d="M572.5 2311.5 L780.5 2311.5" fill="none" data-name="PasswordRecoveryForm"></path>
+						</g>
+						<g transform="translate(572.5, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(135.25, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
+						<g transform="translate(572.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
+								
+							</g>
+						</g>
+						<g transform="translate(572.5, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="INotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="9191.5" y="3156.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
+					<g data-name="PasswordForgotForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
+							<rect x="820.5" y="2249.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
+							<path d="M820.5 2280.5 L1027.5 2280.5" fill="none" data-name="PasswordForgotForm"></path>
+							<path d="M820.5 2311.5 L1027.5 2311.5" fill="none" data-name="PasswordForgotForm"></path>
 						</g>
-						<g transform="translate(9191.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
+						<g transform="translate(820.5, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="21394.3" y="3156.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+						<g transform="translate(820.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
+								
+							</g>
 						</g>
-						<g transform="translate(21394.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
+						<g transform="translate(820.5, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyBaseController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="493.0" y="1299.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
-							<path d="M493.0 1330.0 L1039.0 1330.0" fill="none" data-name="StudyBaseController"></path>
-							<path d="M493.0 1406.0 L1039.0 1406.0" fill="none" data-name="StudyBaseController"></path>
+					<g data-name="SignupForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
+							<rect x="1067.5" y="2234.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
+							<path d="M1067.5 2265.5 L1345.5 2265.5" fill="none" data-name="SignupForm"></path>
+							<path d="M1067.5 2296.5 L1345.5 2296.5" fill="none" data-name="SignupForm"></path>
 						</g>
-						<g transform="translate(493, 1299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
-								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
+						<g transform="translate(1067.5, 2234.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
+								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(493, 1330)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
+						<g transform="translate(1067.5, 2265.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(493, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
+						<g transform="translate(1067.5, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyAppBarViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
-							<rect x="1589.3" y="2250.0" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
-							<path d="M1589.3 2281.0 L1832.3 2281.0" fill="none" data-name="IStudyAppBarViewModel"></path>
+					<g data-name="AuthScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
+							<rect x="1256.0" y="1329.5" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
+							<path d="M1256.0 1360.5 L1515.0 1360.5" fill="none" data-name="AuthScaffold"></path>
 						</g>
-						<g transform="translate(1589.25, 2250)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
+						<g transform="translate(1256, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
+								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1589.25, 2281)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
+						<g transform="translate(1256, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyStatusBadgeViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
-							<rect x="1416.8" y="1352.0" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
-							<path d="M1416.8 1383.0 L1701.8 1383.0" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
+					<g data-name="Widget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
+							<rect x="14216.3" y="2280.5" height="31.0" width="71.0" data-name="Widget"></rect>
 						</g>
-						<g transform="translate(1416.75, 1352)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
+						<g transform="translate(14216.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
+								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1416.75, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
+					</g>
+					<g data-name="EdgeInsets">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
+							<rect x="3553.3" y="2280.5" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
+						</g>
+						<g transform="translate(3553.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyNavViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
-							<rect x="1741.8" y="1322.0" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
-							<path d="M1741.8 1353.0 L1982.8 1353.0" fill="none" data-name="IStudyNavViewModel"></path>
+					<g data-name="EmailTextField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
+							<rect x="1689.5" y="2242.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
+							<path d="M1689.5 2273.5 L2010.5 2273.5" fill="none" data-name="EmailTextField"></path>
 						</g>
-						<g transform="translate(1741.75, 1322)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
+						<g transform="translate(1689.5, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
+								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1741.75, 1353)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
+						<g transform="translate(1689.5, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
+								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
-							<rect x="1952.5" y="904.0" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
-							<path d="M1952.5 935.0 L2287.5 935.0" fill="none" data-name="StudyScaffold"></path>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="32856.0" y="3156.0" height="31.0" width="113.0" data-name="FormControl"></rect>
 						</g>
-						<g transform="translate(1952.5, 904)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
-								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
+						<g transform="translate(32856, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1952.5, 935)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
+					</g>
+					<g data-name="PasswordTextField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
+							<rect x="2050.5" y="2235.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
+							<path d="M2050.5 2266.0 L2529.5 2266.0" fill="none" data-name="PasswordTextField"></path>
+						</g>
+						<g transform="translate(2050.5, 2235)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2050.5, 2266)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NavbarTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="2022.8" y="1375.0" height="31.0" width="103.0" data-name="NavbarTab"></rect>
+					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+							<rect x="270.8" y="3156.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
 						</g>
-						<g transform="translate(2022.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
+						<g transform="translate(270.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="11159.8" y="1344.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
-							<path d="M11159.8 1375.0 L11323.8 1375.0" fill="none" data-name="StudyPageWidget"></path>
-							<path d="M11159.8 1406.0 L11323.8 1406.0" fill="none" data-name="StudyPageWidget"></path>
+					<g data-name="StudyUJobsToBeDone">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
+							<rect x="26810.5" y="60.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
+							<path d="M26810.5 91.5 L27004.5 91.5" fill="none" data-name="StudyUJobsToBeDone"></path>
 						</g>
-						<g transform="translate(11159.75, 1344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
+						<g transform="translate(26810.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
+								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11159.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
+						<g transform="translate(26810.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11159.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
+					</g>
+					<g data-name="AuthFormController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
+							<rect x="35509.0" y="2039.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
+							<path d="M35509.0 2070.5 L36359.0 2070.5" fill="none" data-name="AuthFormController"></path>
+							<path d="M35509.0 2326.5 L36359.0 2326.5" fill="none" data-name="AuthFormController"></path>
+						</g>
+						<g transform="translate(35509, 2039.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
+								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SingleColumnLayoutType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="2205.8" y="1375.0" height="31.0" width="218.0" data-name="SingleColumnLayoutType"></rect>
+						<g transform="translate(35509, 2070.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
+								
+							</g>
 						</g>
-						<g transform="translate(2205.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
+						<g transform="translate(35509, 2326.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PreviewFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
-							<rect x="25933.3" y="45.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
-							<path d="M25933.3 76.5 L26224.3 76.5" fill="none" data-name="PreviewFrame"></path>
+					<g data-name="IAuthRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
+							<rect x="31147.5" y="3156.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
 						</g>
-						<g transform="translate(25933.25, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
+						<g transform="translate(31147.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
+								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25933.25, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
+					</g>
+					<g data-name="INotificationService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
+							<rect x="16317.5" y="3156.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
+						</g>
+						<g transform="translate(16317.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
+								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="25986.8" y="524.0" height="31.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
+					<g data-name="GoRouter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
+							<rect x="34407.8" y="3156.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
 						</g>
-						<g transform="translate(25986.75, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
+						<g transform="translate(34407.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
+								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RouteInformation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
-							<rect x="2334.3" y="2227.0" height="138.0" width="152.0" data-name="RouteInformation"></rect>
-							<path d="M2334.3 2258.0 L2486.3 2258.0" fill="none" data-name="RouteInformation"></path>
-							<path d="M2334.3 2334.0 L2486.3 2334.0" fill="none" data-name="RouteInformation"></path>
+					<g data-name="FormGroup">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
+							<rect x="39344.8" y="3156.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
 						</g>
-						<g transform="translate(2334.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
+						<g transform="translate(39344.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2334.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
+					</g>
+					<g data-name="IFormGroupController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
+							<rect x="38033.5" y="60.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
+							<path d="M38033.5 91.5 L38220.5 91.5" fill="none" data-name="IFormGroupController"></path>
+						</g>
+						<g transform="translate(38033.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
+								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2334.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
+						<g transform="translate(38033.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
-							<rect x="2463.8" y="1261.5" height="258.0" width="302.0" data-name="PlatformController"></rect>
-							<path d="M2463.8 1292.5 L2765.8 1292.5" fill="none" data-name="PlatformController"></path>
-							<path d="M2463.8 1383.5 L2765.8 1383.5" fill="none" data-name="PlatformController"></path>
+					<g data-name="Enum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
+							<rect x="2980.5" y="2280.5" height="31.0" width="61.0" data-name="Enum"></rect>
 						</g>
-						<g transform="translate(2463.75, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
-								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
+						<g transform="translate(2980.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2463.75, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
+					</g>
+					<g data-name="AppStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
+							<rect x="731.0" y="3118.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
+							<path d="M731.0 3149.0 L1010.0 3149.0" fill="none" data-name="AppStatus"></path>
+						</g>
+						<g transform="translate(731, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
+								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2463.75, 1383.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
+						<g transform="translate(731, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WebController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
-							<rect x="2604.5" y="2197.0" height="198.0" width="273.0" data-name="WebController"></rect>
-							<path d="M2604.5 2228.0 L2877.5 2228.0" fill="none" data-name="WebController"></path>
-							<path d="M2604.5 2259.0 L2877.5 2259.0" fill="none" data-name="WebController"></path>
+					<g data-name="FormArrayTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
+							<rect x="2223.0" y="1194.0" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
+							<path d="M2223.0 1225.0 L2713.0 1225.0" fill="none" data-name="FormArrayTable"></path>
+							<path d="M2223.0 1526.0 L2713.0 1526.0" fill="none" data-name="FormArrayTable"></path>
 						</g>
-						<g transform="translate(2604.5, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
-								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
+						<g transform="translate(2223, 1194)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
+								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2604.5, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
+						<g transform="translate(2223, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2604.5, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
+						<g transform="translate(2223, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFrameElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
-							<rect x="1215.8" y="3156.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
+					<g data-name="AbstractControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
+							<rect x="10354.3" y="3156.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
 						</g>
-						<g transform="translate(1215.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
+						<g transform="translate(10354.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
+								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MobileController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
-							<rect x="3391.0" y="2212.5" height="167.0" width="191.0" data-name="MobileController"></rect>
-							<path d="M3391.0 2243.5 L3582.0 2243.5" fill="none" data-name="MobileController"></path>
-						</g>
-						<g transform="translate(3391, 2212.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
-								
-							</g>
+					<g data-name="void Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
+							<rect x="1505.5" y="2280.5" height="31.0" width="144.0" data-name="void Function(T)"></rect>
 						</g>
-						<g transform="translate(3391, 2243.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
+						<g transform="translate(1505.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
+								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyParticipationBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
-							<rect x="2818.8" y="1321.5" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
-							<path d="M2818.8 1352.5 L3049.8 1352.5" fill="none" data-name="StudyParticipationBadge"></path>
-							<path d="M2818.8 1428.5 L3049.8 1428.5" fill="none" data-name="StudyParticipationBadge"></path>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+							<rect x="2569.5" y="2280.5" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
 						</g>
-						<g transform="translate(2818.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
+						<g transform="translate(2569.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2818.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
-								
-							</g>
+					</g>
+					<g data-name="void Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
+							<rect x="16997.3" y="2280.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
 						</g>
-						<g transform="translate(2818.75, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
+						<g transform="translate(16997.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
+								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="5768.8" y="2280.5" height="31.0" width="114.0" data-name="Participation"></rect>
+					<g data-name="String Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
+							<rect x="3698.3" y="2280.5" height="31.0" width="157.0" data-name="String Function(T)"></rect>
 						</g>
-						<g transform="translate(5768.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
+						<g transform="translate(3698.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
+								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="8791.8" y="2280.5" height="31.0" width="106.0" data-name="BadgeType"></rect>
+					<g data-name="IconData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
+							<rect x="16431.3" y="2280.5" height="31.0" width="87.0" data-name="IconData"></rect>
 						</g>
-						<g transform="translate(8791.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
+						<g transform="translate(16431.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
+								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTestScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
-							<rect x="9813.8" y="2219.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
-							<path d="M9813.8 2250.5 L10013.8 2250.5" fill="none" data-name="StudyTestScreen"></path>
-							<path d="M9813.8 2281.5 L10013.8 2281.5" fill="none" data-name="StudyTestScreen"></path>
+					<g data-name="Widget Function(BuildContext, T, int)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
+							<rect x="3895.3" y="2280.5" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
 						</g>
-						<g transform="translate(9813.75, 2219.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
-								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
+						<g transform="translate(3895.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
+								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9813.75, 2250.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
+					</g>
+					<g data-name="ManagedFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
+							<rect x="42550.0" y="1359.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
+							<path d="M42550.0 1390.5 L42946.0 1390.5" fill="none" data-name="ManagedFormViewModel"></path>
+						</g>
+						<g transform="translate(42550, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
+								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9813.75, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
+						<g transform="translate(42550, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TestAppRoutes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
-							<rect x="26264.3" y="23.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
-							<path d="M26264.3 54.0 L26524.3 54.0" fill="none" data-name="TestAppRoutes"></path>
-						</g>
-						<g transform="translate(26264.25, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
-								
-							</g>
+					<g data-name="FormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
+							<rect x="43322.5" y="223.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
+							<path d="M43322.5 254.0 L44194.5 254.0" fill="none" data-name="FormViewModel"></path>
+							<path d="M43322.5 570.0 L44194.5 570.0" fill="none" data-name="FormViewModel"></path>
 						</g>
-						<g transform="translate(26264.25, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
-								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
+						<g transform="translate(43322.5, 223)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
+								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
-							<rect x="26564.3" y="23.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
-							<path d="M26564.3 54.0 L26797.3 54.0" fill="none" data-name="StudyNav"></path>
-						</g>
-						<g transform="translate(26564.25, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
+						<g transform="translate(43322.5, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26564.25, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
+						<g transform="translate(43322.5, 570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
-							<rect x="26837.3" y="23.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
-							<path d="M26837.3 54.0 L27125.3 54.0" fill="none" data-name="StudyDesignNav"></path>
+					<g data-name="FormViewModelNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
+							<rect x="26662.5" y="524.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
 						</g>
-						<g transform="translate(26837.25, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
+						<g transform="translate(26662.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26837.25, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
+					</g>
+					<g data-name="Exception">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
+							<rect x="27044.5" y="76.0" height="31.0" width="94.0" data-name="Exception"></rect>
+						</g>
+						<g transform="translate(27044.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
+								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTestController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
-							<rect x="748.3" y="2257.5" height="77.0" width="282.0" data-name="StudyTestController"></rect>
-							<path d="M748.3 2288.5 L1030.3 2288.5" fill="none" data-name="StudyTestController"></path>
+					<g data-name="FormViewModelCollection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
+							<rect x="39709.8" y="3378.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
+							<path d="M39709.8 3409.0 L39990.8 3409.0" fill="none" data-name="FormViewModelCollection"></path>
+							<path d="M39709.8 3500.0 L39990.8 3500.0" fill="none" data-name="FormViewModelCollection"></path>
 						</g>
-						<g transform="translate(748.25, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
+						<g transform="translate(39709.75, 3378)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
+								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(748.25, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
+						<g transform="translate(39709.75, 3409)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="32133.0" y="3156.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
-						</g>
-						<g transform="translate(32133, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
+						<g transform="translate(39709.75, 3500)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
-							<rect x="3240.0" y="2280.5" height="31.0" width="111.0" data-name="StudyStatus"></rect>
+					<g data-name="FormArray">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
+							<rect x="38553.3" y="3691.0" height="31.0" width="98.0" data-name="FormArray"></rect>
 						</g>
-						<g transform="translate(3240, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
-								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
+						<g transform="translate(38553.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyStatusBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
-							<rect x="3089.8" y="1314.0" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
-							<path d="M3089.8 1345.0 L3330.8 1345.0" fill="none" data-name="StudyStatusBadge"></path>
-							<path d="M3089.8 1436.0 L3330.8 1436.0" fill="none" data-name="StudyStatusBadge"></path>
+					<g data-name="CustomFormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
+							<rect x="32706.0" y="3430.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
+							<path d="M32706.0 3461.5 L33119.0 3461.5" fill="none" data-name="CustomFormControl"></path>
+							<path d="M32706.0 3567.5 L33119.0 3567.5" fill="none" data-name="CustomFormControl"></path>
 						</g>
-						<g transform="translate(3089.75, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
+						<g transform="translate(32706, 3430.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3089.75, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
+						<g transform="translate(32706, 3461.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3089.75, 1436)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
+						<g transform="translate(32706, 3567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FrameControlsWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
-							<rect x="3370.8" y="1329.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
-							<path d="M3370.8 1360.0 L3661.8 1360.0" fill="none" data-name="FrameControlsWidget"></path>
-							<path d="M3370.8 1421.0 L3661.8 1421.0" fill="none" data-name="FrameControlsWidget"></path>
+					<g data-name="Debouncer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
+							<rect x="41462.5" y="3691.0" height="31.0" width="103.0" data-name="Debouncer"></rect>
 						</g>
-						<g transform="translate(3370.75, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
+						<g transform="translate(41462.5, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
+								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3370.75, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
+					</g>
+					<g data-name="void Function(T?)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
+							<rect x="31588.3" y="3691.0" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
+						</g>
+						<g transform="translate(31588.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3370.75, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
+					</g>
+					<g data-name="void Function(ControlStatus)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
+							<rect x="31792.3" y="3691.0" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
+						</g>
+						<g transform="translate(31792.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="16273.3" y="2280.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
+					<g data-name="UnsavedChangesDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
+							<rect x="43828.5" y="60.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
+							<path d="M43828.5 91.5 L44035.5 91.5" fill="none" data-name="UnsavedChangesDialog"></path>
 						</g>
-						<g transform="translate(16273.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
+						<g transform="translate(43828.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
+								
+							</g>
+						</g>
+						<g transform="translate(43828.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="12064.0" y="1009.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+					<g data-name="FormValidationSetEnum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
+							<rect x="43227.8" y="1009.5" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
 						</g>
-						<g transform="translate(12064, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
+						<g transform="translate(43227.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
+								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudySettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="10425.8" y="2265.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M10425.8 2296.0 L10600.8 2296.0" fill="none" data-name="StudySettingsDialog"></path>
+					<g data-name="FormControlValidation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
+							<rect x="4943.3" y="2227.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
+							<path d="M4943.3 2258.0 L5428.3 2258.0" fill="none" data-name="FormControlValidation"></path>
+							<path d="M4943.3 2334.0 L5428.3 2334.0" fill="none" data-name="FormControlValidation"></path>
 						</g>
-						<g transform="translate(10425.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
-								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
+						<g transform="translate(4943.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
+								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10425.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
+						<g transform="translate(4943.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4943.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudySettingsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="40150.8" y="2167.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M40150.8 2198.0 L40629.8 2198.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M40150.8 2334.0 L40629.8 2334.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+					<g data-name="IFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
+							<rect x="27224.5" y="493.0" height="93.0" width="163.0" data-name="IFormData"></rect>
+							<path d="M27224.5 524.0 L27387.5 524.0" fill="none" data-name="IFormData"></path>
+							<path d="M27224.5 555.0 L27387.5 555.0" fill="none" data-name="IFormData"></path>
 						</g>
-						<g transform="translate(40150.75, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
+						<g transform="translate(27224.5, 493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
+								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40150.75, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(27224.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40150.75, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
+						<g transform="translate(27224.5, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="39993.0" y="3156.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
+					<g data-name="FormInvalidException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
+							<rect x="26998.5" y="524.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
 						</g>
-						<g transform="translate(39993, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
+						<g transform="translate(26998.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
+								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="34467.3" y="3156.0" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
+					<g data-name="FormConfigException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
+							<rect x="34673.3" y="508.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
+							<path d="M34673.3 539.5 L34858.3 539.5" fill="none" data-name="FormConfigException"></path>
 						</g>
-						<g transform="translate(34467.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
+						<g transform="translate(34673.25, 508.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
+								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="33474.3" y="3156.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(33474.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+						<g transform="translate(34673.25, 539.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="35944.3" y="3156.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
+					<g data-name="IFormViewModelDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
+							<rect x="43786.0" y="986.5" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
+							<path d="M43786.0 1017.5 L44003.0 1017.5" fill="none" data-name="IFormViewModelDelegate"></path>
 						</g>
-						<g transform="translate(35944.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+						<g transform="translate(43786, 986.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
+								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
+								
+							</g>
+						</g>
+						<g transform="translate(43786, 1017.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="41571.8" y="223.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
-							<path d="M41571.8 254.0 L42443.8 254.0" fill="none" data-name="FormViewModel"></path>
-							<path d="M41571.8 570.0 L42443.8 570.0" fill="none" data-name="FormViewModel"></path>
+					<g data-name="FormControlOption">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
+							<rect x="44234.5" y="486.0" height="107.0" width="190.0" data-name="FormControlOption"></rect>
+							<path d="M44234.5 517.0 L44424.5 517.0" fill="none" data-name="FormControlOption"></path>
 						</g>
-						<g transform="translate(41571.75, 223)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+						<g transform="translate(44234.5, 486)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
+								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41571.75, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+						<g transform="translate(44234.5, 517)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41571.75, 570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
+					</g>
+					<g data-name="Equatable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
+							<rect x="44281.5" y="76.0" height="31.0" width="96.0" data-name="Equatable"></rect>
+						</g>
+						<g transform="translate(44281.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
+								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="34889.3" y="3156.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
+					<g data-name="FormMode">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
+							<rect x="28528.3" y="3110.5" height="122.0" width="282.0" data-name="FormMode"></rect>
+							<path d="M28528.3 3141.5 L28810.3 3141.5" fill="none" data-name="FormMode"></path>
 						</g>
-						<g transform="translate(34889.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
+						<g transform="translate(28528.25, 3110.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
+								
+							</g>
+						</g>
+						<g transform="translate(28528.25, 3141.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IWithBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="16817.0" y="1009.5" height="31.0" width="113.0" data-name="IWithBanner"></rect>
+					<g data-name="CancelableOperation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
+							<rect x="44277.8" y="1009.5" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
 						</g>
-						<g transform="translate(16817, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
+						<g transform="translate(44277.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
+								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
-							<rect x="2182.3" y="3118.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
-							<path d="M2182.3 3149.0 L2461.3 3149.0" fill="none" data-name="AppStatus"></path>
+					<g data-name="EnrolledBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
+							<rect x="44417.5" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
+							<path d="M44417.5 76.0 L44583.5 76.0" fill="none" data-name="EnrolledBadge"></path>
+							<path d="M44417.5 107.0 L44583.5 107.0" fill="none" data-name="EnrolledBadge"></path>
 						</g>
-						<g transform="translate(2182.25, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
+						<g transform="translate(44417.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2182.25, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
+						<g transform="translate(44417.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
+								
+							</g>
+						</g>
+						<g transform="translate(44417.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="4828.8" y="2280.5" height="31.0" width="61.0" data-name="Enum"></rect>
+					<g data-name="StudyRecruitController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
+							<rect x="5468.3" y="2204.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
+							<path d="M5468.3 2235.5 L6119.3 2235.5" fill="none" data-name="StudyRecruitController"></path>
+							<path d="M5468.3 2281.5 L6119.3 2281.5" fill="none" data-name="StudyRecruitController"></path>
 						</g>
-						<g transform="translate(4828.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
+						<g transform="translate(5468.25, 2204.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
+								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5468.25, 2235.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5468.25, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IAppDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
-							<rect x="27165.3" y="60.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
-							<path d="M27165.3 91.5 L27362.3 91.5" fill="none" data-name="IAppDelegate"></path>
+					<g data-name="IInviteCodeRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
+							<rect x="31329.5" y="3156.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
 						</g>
-						<g transform="translate(27165.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
+						<g transform="translate(31329.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27165.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
+					</g>
+					<g data-name="StreamSubscription">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
+							<rect x="13783.5" y="3156.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+						</g>
+						<g transform="translate(13783.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
+								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
-							<rect x="27402.3" y="22.5" height="138.0" width="301.0" data-name="AppController"></rect>
-							<path d="M27402.3 53.5 L27703.3 53.5" fill="none" data-name="AppController"></path>
-							<path d="M27402.3 114.5 L27703.3 114.5" fill="none" data-name="AppController"></path>
+					<g data-name="StudyBaseController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
+							<rect x="4974.0" y="1299.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
+							<path d="M4974.0 1330.0 L5520.0 1330.0" fill="none" data-name="StudyBaseController"></path>
+							<path d="M4974.0 1406.0 L5520.0 1406.0" fill="none" data-name="StudyBaseController"></path>
 						</g>
-						<g transform="translate(27402.25, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
+						<g transform="translate(4974, 1299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
+								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27402.25, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
+						<g transform="translate(4974, 1330)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27402.25, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
+						<g transform="translate(4974, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="App">
-						<g fill="#eee8d5" stroke="#33322E" data-name="App">
-							<rect x="27743.3" y="76.0" height="31.0" width="47.0" data-name="App"></rect>
+					<g data-name="IModelActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
+							<rect x="6925.8" y="1375.0" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
 						</g>
-						<g transform="translate(27743.25, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
-								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
+						<g transform="translate(6925.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
+								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppContent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
-							<rect x="27830.3" y="76.0" height="31.0" width="109.0" data-name="AppContent"></rect>
+					<g data-name="StudyRecruitScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
+							<rect x="18764.8" y="2242.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
+							<path d="M18764.8 2273.5 L19078.8 2273.5" fill="none" data-name="StudyRecruitScreen"></path>
 						</g>
-						<g transform="translate(27830.25, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
+						<g transform="translate(18764.75, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
+								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
+								
+							</g>
+						</g>
+						<g transform="translate(18764.75, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthFormController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
-							<rect x="32165.5" y="2039.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
-							<path d="M32165.5 2070.5 L33015.5 2070.5" fill="none" data-name="AuthFormController"></path>
-							<path d="M32165.5 2326.5 L33015.5 2326.5" fill="none" data-name="AuthFormController"></path>
+					<g data-name="InviteCodeFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
+							<rect x="36439.0" y="1336.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
+							<path d="M36439.0 1367.5 L36877.0 1367.5" fill="none" data-name="InviteCodeFormView"></path>
+							<path d="M36439.0 1398.5 L36877.0 1398.5" fill="none" data-name="InviteCodeFormView"></path>
 						</g>
-						<g transform="translate(32165.5, 2039.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
-								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
+						<g transform="translate(36439, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
+								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32165.5, 2070.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
+						<g transform="translate(36439, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32165.5, 2326.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
+						<g transform="translate(36439, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthFormKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
-							<rect x="3429.3" y="3088.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
-							<path d="M3429.3 3119.0 L3784.3 3119.0" fill="none" data-name="AuthFormKey"></path>
+					<g data-name="InviteCodeFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
+							<rect x="42310.8" y="2107.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
+							<path d="M42310.8 2138.0 L42977.8 2138.0" fill="none" data-name="InviteCodeFormViewModel"></path>
+							<path d="M42310.8 2364.0 L42977.8 2364.0" fill="none" data-name="InviteCodeFormViewModel"></path>
 						</g>
-						<g transform="translate(3429.25, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
-								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
+						<g transform="translate(42310.75, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
+								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3429.25, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
+						<g transform="translate(42310.75, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IFormGroupController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="36929.5" y="60.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
-							<path d="M36929.5 91.5 L37116.5 91.5" fill="none" data-name="IFormGroupController"></path>
-						</g>
-						<g transform="translate(36929.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
-								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
+						<g transform="translate(42310.75, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36929.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
+					</g>
+					<g data-name="FormConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
+							<rect x="38919.8" y="524.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
+						</g>
+						<g transform="translate(38919.75, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
+								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PasswordRecoveryForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
-							<rect x="3622.0" y="2249.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
-							<path d="M3622.0 2280.5 L3830.0 2280.5" fill="none" data-name="PasswordRecoveryForm"></path>
-							<path d="M3622.0 2311.5 L3830.0 2311.5" fill="none" data-name="PasswordRecoveryForm"></path>
+					<g data-name="StudyInvitesTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
+							<rect x="44826.3" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
+							<path d="M44826.3 31.0 L45392.3 31.0" fill="none" data-name="StudyInvitesTable"></path>
+							<path d="M44826.3 137.0 L45392.3 137.0" fill="none" data-name="StudyInvitesTable"></path>
 						</g>
-						<g transform="translate(3622, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
+						<g transform="translate(44826.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
+								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
+								
+							</g>
+						</g>
+						<g transform="translate(44826.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3622, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
+						<g transform="translate(44826.25, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3622, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
+					</g>
+					<g data-name="void Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
+							<rect x="44630.0" y="524.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
+						</g>
+						<g transform="translate(44630, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
+								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConsumerRefWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="3863.8" y="1375.0" height="31.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+							<rect x="44892.0" y="524.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(3863.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
+						<g transform="translate(44892, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PasswordForgotForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
-							<rect x="3870.0" y="2249.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
-							<path d="M3870.0 2280.5 L4077.0 2280.5" fill="none" data-name="PasswordForgotForm"></path>
-							<path d="M3870.0 2311.5 L4077.0 2311.5" fill="none" data-name="PasswordForgotForm"></path>
+					<g data-name="Intervention? Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
+							<rect x="45352.0" y="524.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
 						</g>
-						<g transform="translate(3870, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
+						<g transform="translate(45352, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3870, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
-								
-							</g>
+					</g>
+					<g data-name="int Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
+							<rect x="45643.0" y="524.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(3870, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
+						<g transform="translate(45643, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LoginForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
-							<rect x="4117.0" y="2249.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
-							<path d="M4117.0 2280.5 L4324.0 2280.5" fill="none" data-name="LoginForm"></path>
-							<path d="M4117.0 2311.5 L4324.0 2311.5" fill="none" data-name="LoginForm"></path>
+					<g data-name="Study">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
+							<rect x="40631.3" y="3156.0" height="31.0" width="61.0" data-name="Study"></rect>
 						</g>
-						<g transform="translate(4117, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
+						<g transform="translate(40631.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4117, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
+					</g>
+					<g data-name="PublishSuccessDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
+							<rect x="19118.8" y="2265.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
+							<path d="M19118.8 2296.0 L19309.8 2296.0" fill="none" data-name="PublishSuccessDialog"></path>
+						</g>
+						<g transform="translate(19118.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4117, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
+						<g transform="translate(19118.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EmailTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
-							<rect x="6146.8" y="2242.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
-							<path d="M6146.8 2273.5 L6467.8 2273.5" fill="none" data-name="EmailTextField"></path>
+					<g data-name="PublishDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
+							<rect x="20098.8" y="2265.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
+							<path d="M20098.8 2296.0 L20234.8 2296.0" fill="none" data-name="PublishDialog"></path>
 						</g>
-						<g transform="translate(6146.75, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
+						<g transform="translate(20098.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6146.75, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
+						<g transform="translate(20098.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PasswordTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
-							<rect x="6507.8" y="2235.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
-							<path d="M6507.8 2266.0 L6986.8 2266.0" fill="none" data-name="PasswordTextField"></path>
+					<g data-name="PublishConfirmationDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
+							<rect x="20274.8" y="2265.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
+							<path d="M20274.8 2296.0 L20498.8 2296.0" fill="none" data-name="PublishConfirmationDialog"></path>
 						</g>
-						<g transform="translate(6507.75, 2235)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
+						<g transform="translate(20274.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
+								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6507.75, 2266)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
+						<g transform="translate(20274.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<rect x="3959.8" y="3156.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
+					<g data-name="FrameControlsWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
+							<rect x="11577.0" y="1329.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
+							<path d="M11577.0 1360.0 L11868.0 1360.0" fill="none" data-name="FrameControlsWidget"></path>
+							<path d="M11577.0 1421.0 L11868.0 1421.0" fill="none" data-name="FrameControlsWidget"></path>
 						</g>
-						<g transform="translate(3959.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
+						<g transform="translate(11577, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
+								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SignupForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
-							<rect x="4364.0" y="2234.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
-							<path d="M4364.0 2265.5 L4642.0 2265.5" fill="none" data-name="SignupForm"></path>
-							<path d="M4364.0 2296.5 L4642.0 2296.5" fill="none" data-name="SignupForm"></path>
-						</g>
-						<g transform="translate(4364, 2234.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
-								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
+						<g transform="translate(11577, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4364, 2265.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
+						<g transform="translate(11577, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4364, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
+					</g>
+					<g data-name="ConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
+							<rect x="17414.3" y="1009.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+						</g>
+						<g transform="translate(17414.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyUJobsToBeDone">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
-							<rect x="31826.0" y="60.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
-							<path d="M31826.0 91.5 L32020.0 91.5" fill="none" data-name="StudyUJobsToBeDone"></path>
+					<g data-name="IStudyStatusBadgeViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
+							<rect x="7961.8" y="1352.0" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
+							<path d="M7961.8 1383.0 L8246.8 1383.0" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
 						</g>
-						<g transform="translate(31826, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
+						<g transform="translate(7961.75, 1352)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
+								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31826, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
+						<g transform="translate(7961.75, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
-							<rect x="5489.0" y="1329.5" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
-							<path d="M5489.0 1360.5 L5748.0 1360.5" fill="none" data-name="AuthScaffold"></path>
+					<g data-name="Participation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
+							<rect x="9675.8" y="2280.5" height="31.0" width="114.0" data-name="Participation"></rect>
 						</g>
-						<g transform="translate(5489, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
+						<g transform="translate(9675.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
+								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5489, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
+					</g>
+					<g data-name="StudyStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
+							<rect x="8311.8" y="2280.5" height="31.0" width="111.0" data-name="StudyStatus"></rect>
+						</g>
+						<g transform="translate(8311.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
+								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EdgeInsets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="7437.8" y="2280.5" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
+					<g data-name="StudyStatusBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
+							<rect x="8286.8" y="1314.0" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
+							<path d="M8286.8 1345.0 L8527.8 1345.0" fill="none" data-name="StudyStatusBadge"></path>
+							<path d="M8286.8 1436.0 L8527.8 1436.0" fill="none" data-name="StudyStatusBadge"></path>
 						</g>
-						<g transform="translate(7437.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
+						<g transform="translate(8286.75, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
+								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PublishDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
-							<rect x="10738.8" y="2265.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
-							<path d="M10738.8 2296.0 L10874.8 2296.0" fill="none" data-name="PublishDialog"></path>
-						</g>
-						<g transform="translate(10738.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
+						<g transform="translate(8286.75, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10738.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
+						<g transform="translate(8286.75, 1436)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PublishSuccessDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
-							<rect x="11605.8" y="2265.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
-							<path d="M11605.8 2296.0 L11796.8 2296.0" fill="none" data-name="PublishSuccessDialog"></path>
+					<g data-name="BadgeType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
+							<rect x="11459.3" y="2280.5" height="31.0" width="106.0" data-name="BadgeType"></rect>
 						</g>
-						<g transform="translate(11605.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
+						<g transform="translate(11459.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
+								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11605.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
+					</g>
+					<g data-name="RouteInformation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
+							<rect x="8572.8" y="2227.0" height="138.0" width="152.0" data-name="RouteInformation"></rect>
+							<path d="M8572.8 2258.0 L8724.8 2258.0" fill="none" data-name="RouteInformation"></path>
+							<path d="M8572.8 2334.0 L8724.8 2334.0" fill="none" data-name="RouteInformation"></path>
+						</g>
+						<g transform="translate(8572.75, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PublishConfirmationDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
-							<rect x="11836.8" y="2265.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
-							<path d="M11836.8 2296.0 L12060.8 2296.0" fill="none" data-name="PublishConfirmationDialog"></path>
-						</g>
-						<g transform="translate(11836.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
+						<g transform="translate(8572.75, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11836.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
+						<g transform="translate(8572.75, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormArrayTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
-							<rect x="6362.5" y="1194.0" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
-							<path d="M6362.5 1225.0 L6852.5 1225.0" fill="none" data-name="FormArrayTable"></path>
-							<path d="M6362.5 1526.0 L6852.5 1526.0" fill="none" data-name="FormArrayTable"></path>
+					<g data-name="PlatformController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
+							<rect x="8567.8" y="1261.5" height="258.0" width="302.0" data-name="PlatformController"></rect>
+							<path d="M8567.8 1292.5 L8869.8 1292.5" fill="none" data-name="PlatformController"></path>
+							<path d="M8567.8 1383.5 L8869.8 1383.5" fill="none" data-name="PlatformController"></path>
 						</g>
-						<g transform="translate(6362.5, 1194)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
-								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
+						<g transform="translate(8567.75, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
+								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6362.5, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
+						<g transform="translate(8567.75, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6362.5, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
+						<g transform="translate(8567.75, 1383.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="6043.8" y="3156.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+					<g data-name="WebController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
+							<rect x="9829.8" y="2197.0" height="198.0" width="273.0" data-name="WebController"></rect>
+							<path d="M9829.8 2228.0 L10102.8 2228.0" fill="none" data-name="WebController"></path>
+							<path d="M9829.8 2259.0 L10102.8 2259.0" fill="none" data-name="WebController"></path>
 						</g>
-						<g transform="translate(6043.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
+						<g transform="translate(9829.75, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
+								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="5962.8" y="2280.5" height="31.0" width="144.0" data-name="void Function(T)"></rect>
-						</g>
-						<g transform="translate(5962.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
+						<g transform="translate(9829.75, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<rect x="7026.8" y="2280.5" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
-						</g>
-						<g transform="translate(7026.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
+						<g transform="translate(9829.75, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="String Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
-							<rect x="7582.8" y="2280.5" height="31.0" width="157.0" data-name="String Function(T)"></rect>
+					<g data-name="IFrameElement">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
+							<rect x="11087.8" y="3156.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
 						</g>
-						<g transform="translate(7582.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
+						<g transform="translate(11087.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
+								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="20068.5" y="2280.5" height="31.0" width="87.0" data-name="IconData"></rect>
+					<g data-name="MobileController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
+							<rect x="10142.8" y="2212.5" height="167.0" width="191.0" data-name="MobileController"></rect>
+							<path d="M10142.8 2243.5 L10333.8 2243.5" fill="none" data-name="MobileController"></path>
 						</g>
-						<g transform="translate(20068.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
+						<g transform="translate(10142.75, 2212.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
-							<rect x="7779.8" y="2280.5" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
-						</g>
-						<g transform="translate(7779.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
-								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
+						<g transform="translate(10142.75, 2243.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
+								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="27025.8" y="493.0" height="93.0" width="163.0" data-name="IFormData"></rect>
-							<path d="M27025.8 524.0 L27188.8 524.0" fill="none" data-name="IFormData"></path>
-							<path d="M27025.8 555.0 L27188.8 555.0" fill="none" data-name="IFormData"></path>
+					<g data-name="StudyController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
+							<rect x="4250.3" y="2182.0" height="228.0" width="573.0" data-name="StudyController"></rect>
+							<path d="M4250.3 2213.0 L4823.3 2213.0" fill="none" data-name="StudyController"></path>
+							<path d="M4250.3 2274.0 L4823.3 2274.0" fill="none" data-name="StudyController"></path>
 						</g>
-						<g transform="translate(27025.75, 493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
+						<g transform="translate(4250.25, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
+								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27025.75, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
+						<g transform="translate(4250.25, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27025.75, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
+						<g transform="translate(4250.25, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="40430.3" y="1359.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
-							<path d="M40430.3 1390.5 L40826.3 1390.5" fill="none" data-name="ManagedFormViewModel"></path>
+					<g data-name="IStudyNavViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
+							<rect x="8909.8" y="1322.0" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
+							<path d="M8909.8 1353.0 L9150.8 1353.0" fill="none" data-name="IStudyNavViewModel"></path>
 						</g>
-						<g transform="translate(40430.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
+						<g transform="translate(8909.75, 1322)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
+								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40430.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
+						<g transform="translate(8909.75, 1353)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
-							<rect x="26210.8" y="524.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
+					<g data-name="StudyNav">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
+							<rect x="45518.5" y="23.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
+							<path d="M45518.5 54.0 L45751.5 54.0" fill="none" data-name="StudyNav"></path>
 						</g>
-						<g transform="translate(26210.75, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
+						<g transform="translate(45518.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Exception">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="27979.3" y="76.0" height="31.0" width="94.0" data-name="Exception"></rect>
-						</g>
-						<g transform="translate(27979.25, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
+						<g transform="translate(45518.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="36808.3" y="3378.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
-							<path d="M36808.3 3409.0 L37089.3 3409.0" fill="none" data-name="FormViewModelCollection"></path>
-							<path d="M36808.3 3500.0 L37089.3 3500.0" fill="none" data-name="FormViewModelCollection"></path>
-						</g>
-						<g transform="translate(36808.25, 3378)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
+					<g data-name="StudyDesignNav">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
+							<rect x="45791.5" y="23.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
+							<path d="M45791.5 54.0 L46079.5 54.0" fill="none" data-name="StudyDesignNav"></path>
 						</g>
-						<g transform="translate(36808.25, 3409)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
+						<g transform="translate(45791.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
+								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36808.25, 3500)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
+						<g transform="translate(45791.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="35471.8" y="3691.0" height="31.0" width="98.0" data-name="FormArray"></rect>
+					<g data-name="IWithBanner">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
+							<rect x="20933.3" y="1009.5" height="31.0" width="113.0" data-name="IWithBanner"></rect>
 						</g>
-						<g transform="translate(35471.75, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
+						<g transform="translate(20933.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormInvalidException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
-							<rect x="31561.5" y="524.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
+					<g data-name="StudyParticipationBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
+							<rect x="9190.8" y="1321.5" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
+							<path d="M9190.8 1352.5 L9421.8 1352.5" fill="none" data-name="StudyParticipationBadge"></path>
+							<path d="M9190.8 1428.5 L9421.8 1428.5" fill="none" data-name="StudyParticipationBadge"></path>
 						</g>
-						<g transform="translate(31561.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
+						<g transform="translate(9190.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
+								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormConfigException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
-							<rect x="31787.5" y="508.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
-							<path d="M31787.5 539.5 L31972.5 539.5" fill="none" data-name="FormConfigException"></path>
-						</g>
-						<g transform="translate(31787.5, 508.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
-								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
+						<g transform="translate(9190.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31787.5, 539.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
+						<g transform="translate(9190.75, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="41152.3" y="986.5" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-							<path d="M41152.3 1017.5 L41369.3 1017.5" fill="none" data-name="IFormViewModelDelegate"></path>
-						</g>
-						<g transform="translate(41152.25, 986.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
+					<g data-name="IStudyRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
+							<rect x="33238.0" y="3156.0" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
 						</g>
-						<g transform="translate(41152.25, 1017.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
+						<g transform="translate(33238, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
+								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControlOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
-							<rect x="42483.8" y="486.0" height="107.0" width="190.0" data-name="FormControlOption"></rect>
-							<path d="M42483.8 517.0 L42673.8 517.0" fill="none" data-name="FormControlOption"></path>
+					<g data-name="PreviewFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
+							<rect x="46119.5" y="45.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
+							<path d="M46119.5 76.5 L46410.5 76.5" fill="none" data-name="PreviewFrame"></path>
 						</g>
-						<g transform="translate(42483.75, 486)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
+						<g transform="translate(46119.5, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
+								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42483.75, 517)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
+						<g transform="translate(46119.5, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="42530.8" y="76.0" height="31.0" width="96.0" data-name="Equatable"></rect>
+					<g data-name="StudyFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
+							<rect x="46173.0" y="524.0" height="31.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(42530.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
+						<g transform="translate(46173, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
+								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
-							<rect x="28695.5" y="3110.5" height="122.0" width="282.0" data-name="FormMode"></rect>
-							<path d="M28695.5 3141.5 L28977.5 3141.5" fill="none" data-name="FormMode"></path>
+					<g data-name="IStudyAppBarViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
+							<rect x="8908.8" y="2250.0" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
+							<path d="M8908.8 2281.0 L9151.8 2281.0" fill="none" data-name="IStudyAppBarViewModel"></path>
 						</g>
-						<g transform="translate(28695.5, 3110.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
+						<g transform="translate(8908.75, 2250)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
+								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28695.5, 3141.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
+						<g transform="translate(8908.75, 2281)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormValidationSetEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
-							<rect x="40907.3" y="1009.5" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
+					<g data-name="StudyScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
+							<rect x="24559.0" y="904.0" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
+							<path d="M24559.0 935.0 L24894.0 935.0" fill="none" data-name="StudyScaffold"></path>
+						</g>
+						<g transform="translate(24559, 904)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
+								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
+								
+							</g>
 						</g>
-						<g transform="translate(40907.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
-								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
+						<g transform="translate(24559, 935)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Debouncer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="40931.3" y="3691.0" height="31.0" width="103.0" data-name="Debouncer"></rect>
+					<g data-name="NavbarTab">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
+							<rect x="24629.3" y="1375.0" height="31.0" width="103.0" data-name="NavbarTab"></rect>
 						</g>
-						<g transform="translate(40931.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
+						<g transform="translate(24629.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
+								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CancelableOperation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="42851.0" y="1009.5" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
+					<g data-name="SingleColumnLayoutType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
+							<rect x="24812.3" y="1375.0" height="31.0" width="218.0" data-name="SingleColumnLayoutType"></rect>
 						</g>
-						<g transform="translate(42851, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
+						<g transform="translate(24812.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
+								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CustomFormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
-							<rect x="33324.3" y="3430.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
-							<path d="M33324.3 3461.5 L33737.3 3461.5" fill="none" data-name="CustomFormControl"></path>
-							<path d="M33324.3 3567.5 L33737.3 3567.5" fill="none" data-name="CustomFormControl"></path>
+					<g data-name="WebFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
+							<rect x="46450.5" y="37.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
+							<path d="M46450.5 68.5 L46619.5 68.5" fill="none" data-name="WebFrame"></path>
+							<path d="M46450.5 114.5 L46619.5 114.5" fill="none" data-name="WebFrame"></path>
 						</g>
-						<g transform="translate(33324.25, 3430.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
+						<g transform="translate(46450.5, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
+								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33324.25, 3461.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
+						<g transform="translate(46450.5, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33324.25, 3567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
+						<g transform="translate(46450.5, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(T?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
-							<rect x="26875.0" y="3691.0" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
+					<g data-name="DisabledFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
+							<rect x="46659.5" y="60.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
+							<path d="M46659.5 91.5 L46795.5 91.5" fill="none" data-name="DisabledFrame"></path>
 						</g>
-						<g transform="translate(26875, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
+						<g transform="translate(46659.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(ControlStatus)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
-							<rect x="28313.8" y="3691.0" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
-						</g>
-						<g transform="translate(28313.75, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
+						<g transform="translate(46659.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="UnsavedChangesDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
-							<rect x="42666.8" y="60.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
-							<path d="M42666.8 91.5 L42873.8 91.5" fill="none" data-name="UnsavedChangesDialog"></path>
+					<g data-name="PhoneContainer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
+							<rect x="10182.0" y="1284.0" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
+							<path d="M10182.0 1315.0 L10509.0 1315.0" fill="none" data-name="PhoneContainer"></path>
+							<path d="M10182.0 1466.0 L10509.0 1466.0" fill="none" data-name="PhoneContainer"></path>
 						</g>
-						<g transform="translate(42666.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
+						<g transform="translate(10182, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
+								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42666.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
+						<g transform="translate(10182, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
+								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(10182, 1466)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
+								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControlValidation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
-							<rect x="9288.8" y="2227.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
-							<path d="M9288.8 2258.0 L9773.8 2258.0" fill="none" data-name="FormControlValidation"></path>
-							<path d="M9288.8 2334.0 L9773.8 2334.0" fill="none" data-name="FormControlValidation"></path>
+					<g data-name="Color">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
+							<rect x="20778.8" y="2280.5" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(9288.75, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
-								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
+						<g transform="translate(20778.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
+								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9288.75, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
+					</g>
+					<g data-name="MobileFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
+							<rect x="46835.5" y="60.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
+							<path d="M46835.5 91.5 L46971.5 91.5" fill="none" data-name="MobileFrame"></path>
+						</g>
+						<g transform="translate(46835.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9288.75, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
+						<g transform="translate(46835.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="24236.0" y="3005.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M24236.0 3036.0 L24798.0 3036.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M24236.0 3217.0 L24798.0 3217.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(24236, 3005)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
-								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
-								
-							</g>
+					<g data-name="DesktopFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
+							<rect x="47011.5" y="60.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
+							<path d="M47011.5 91.5 L47147.5 91.5" fill="none" data-name="DesktopFrame"></path>
 						</g>
-						<g transform="translate(24236, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+						<g transform="translate(47011.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24236, 3217)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
+						<g transform="translate(47011.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="19015.5" y="1627.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M19015.5 1658.0 L20028.5 1658.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M19015.5 2679.0 L20028.5 2679.0" fill="none" data-name="QuestionFormViewModel"></path>
+					<g data-name="StudyTestScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
+							<rect x="20538.8" y="2219.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
+							<path d="M20538.8 2250.5 L20738.8 2250.5" fill="none" data-name="StudyTestScreen"></path>
+							<path d="M20538.8 2281.5 L20738.8 2281.5" fill="none" data-name="StudyTestScreen"></path>
 						</g>
-						<g transform="translate(19015.5, 1627)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
+						<g transform="translate(20538.75, 2219.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
+								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19015.5, 1658)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(20538.75, 2250.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19015.5, 2679)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
+						<g transform="translate(20538.75, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IScreenerQuestionLogicFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="10053.8" y="2265.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M10053.8 2296.0 L10385.8 2296.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
+					<g data-name="StudySettingsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
+							<rect x="44301.3" y="2167.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
+							<path d="M44301.3 2198.0 L44780.3 2198.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+							<path d="M44301.3 2334.0 L44780.3 2334.0" fill="none" data-name="StudySettingsFormViewModel"></path>
 						</g>
-						<g transform="translate(10053.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
+						<g transform="translate(44301.25, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10053.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+						<g transform="translate(44301.25, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyDesignEnrollmentFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="6929.5" y="3125.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M6929.5 3156.5 L7378.5 3156.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
-						</g>
-						<g transform="translate(6929.5, 3125.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
+						<g transform="translate(44301.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6929.5, 3156.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
+					</g>
+					<g data-name="AsyncValue">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
+							<rect x="44362.0" y="3156.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
+						</g>
+						<g transform="translate(44362, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="12189.0" y="2265.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M12189.0 2296.0 L12401.0 2296.0" fill="none" data-name="StudyDesignPageWidget"></path>
+					<g data-name="StudySettingsDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
+							<rect x="20876.8" y="2265.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
+							<path d="M20876.8 2296.0 L21051.8 2296.0" fill="none" data-name="StudySettingsDialog"></path>
 						</g>
-						<g transform="translate(12189, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
+						<g transform="translate(20876.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
+								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12189, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
+						<g transform="translate(20876.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionLogicFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="33095.5" y="2227.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M33095.5 2258.0 L33519.5 2258.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M33095.5 2289.0 L33519.5 2289.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+					<g data-name="StudyTestController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
+							<rect x="6535.3" y="2257.5" height="77.0" width="282.0" data-name="StudyTestController"></rect>
+							<path d="M6535.3 2288.5 L6817.3 2288.5" fill="none" data-name="StudyTestController"></path>
 						</g>
-						<g transform="translate(33095.5, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
-								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
+						<g transform="translate(6535.25, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33095.5, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
+						<g transform="translate(6535.25, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33095.5, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
+					</g>
+					<g data-name="TestAppRoutes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
+							<rect x="47187.5" y="23.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
+							<path d="M47187.5 54.0 L47447.5 54.0" fill="none" data-name="TestAppRoutes"></path>
+						</g>
+						<g transform="translate(47187.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
+								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="38130.5" y="524.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
-						</g>
-						<g transform="translate(38130.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
+						<g transform="translate(47187.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
+								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="16970.0" y="941.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M16970.0 972.0 L17228.0 972.0" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M16970.0 1063.0 L17228.0 1063.0" fill="none" data-name="ConsentItemFormData"></path>
+					<g data-name="DrawerEntry">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
+							<rect x="25247.8" y="926.0" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
+							<path d="M25247.8 957.0 L25692.8 957.0" fill="none" data-name="DrawerEntry"></path>
+							<path d="M25247.8 1093.0 L25692.8 1093.0" fill="none" data-name="DrawerEntry"></path>
 						</g>
-						<g transform="translate(16970, 941)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
+						<g transform="translate(25247.75, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
+								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16970, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
+						<g transform="translate(25247.75, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DrawerEntry">+localizedHelpText: String Function()?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DrawerEntry">+enabled: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DrawerEntry">+onSelected: void Function(BuildContext, WidgetRef)?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DrawerEntry">+autoCloseDrawer: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DrawerEntry">+title: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="DrawerEntry">+helpText: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16970, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
+						<g transform="translate(25247.75, 1093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="34033.3" y="2047.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M34033.3 2078.0 L34935.3 2078.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M34033.3 2304.0 L34935.3 2304.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+					<g data-name="String Function()">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
+							<rect x="25070.3" y="1375.0" height="31.0" width="147.0" data-name="String Function()"></rect>
 						</g>
-						<g transform="translate(34033.25, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
-								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
+						<g transform="translate(25070.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
+								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34033.25, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
+					</g>
+					<g data-name="String Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
+							<rect x="25718.3" y="1375.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
 						</g>
-						<g transform="translate(34033.25, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
+						<g transform="translate(25718.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
+								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="36828.0" y="3156.0" height="31.0" width="61.0" data-name="Study"></rect>
+					<g data-name="void Function(BuildContext, WidgetRef)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
+							<rect x="25915.3" y="1375.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
 						</g>
-						<g transform="translate(36828, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
+						<g transform="translate(25915.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
+								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormConsentItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="33627.3" y="3065.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M33627.3 3096.0 L34427.3 3096.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M33627.3 3172.0 L34427.3 3172.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+					<g data-name="GoRouterDrawerEntry">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
+							<rect x="26291.3" y="1336.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
+							<path d="M26291.3 1367.5 L26555.3 1367.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+							<path d="M26291.3 1413.5 L26555.3 1413.5" fill="none" data-name="GoRouterDrawerEntry"></path>
 						</g>
-						<g transform="translate(33627.25, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
+						<g transform="translate(26291.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
+								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33627.25, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
+						<g transform="translate(26291.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33627.25, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
+						<g transform="translate(26291.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="36892.3" y="1261.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M36892.3 1292.5 L37524.3 1292.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M36892.3 1398.5 L37524.3 1398.5" fill="none" data-name="WithQuestionnaireControls"></path>
+					<g data-name="RoutingIntent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
+							<rect x="27858.8" y="2280.5" height="31.0" width="122.0" data-name="RoutingIntent"></rect>
 						</g>
-						<g transform="translate(36892.25, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
+						<g transform="translate(27858.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
+								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36892.25, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
+					</g>
+					<g data-name="AppDrawer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
+							<rect x="47487.5" y="8.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
+							<path d="M47487.5 39.0 L47756.5 39.0" fill="none" data-name="AppDrawer"></path>
 						</g>
-						<g transform="translate(36892.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
+						<g transform="translate(47487.5, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
+								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="9006.8" y="1375.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(9006.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
+						<g transform="translate(47487.5, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppDrawer">+leftPaddingEntries: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AppDrawer">+logoPaddingVertical: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AppDrawer">+logoPaddingHorizontal: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AppDrawer">+logoMaxHeight: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AppDrawer">+logoSectionMinHeight: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AppDrawer">+logoSectionMaxHeight: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="25276.3" y="1009.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
+					<g data-name="StudyAnalyzeScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
+							<rect x="22118.8" y="2257.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
+							<path d="M22118.8 2288.5 L22298.8 2288.5" fill="none" data-name="StudyAnalyzeScreen"></path>
 						</g>
-						<g transform="translate(25276.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
+						<g transform="translate(22118.75, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
+								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ConsentItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="24811.0" y="2167.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M24811.0 2198.0 L25507.0 2198.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M24811.0 2364.0 L25507.0 2364.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-						</g>
-						<g transform="translate(24811, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
+						<g transform="translate(22118.75, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24811, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+					</g>
+					<g data-name="StudyAnalyzeController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
+							<rect x="6857.3" y="2265.0" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
+							<path d="M6857.3 2296.0 L7058.3 2296.0" fill="none" data-name="StudyAnalyzeController"></path>
+						</g>
+						<g transform="translate(6857.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
+								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24811, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
+						<g transform="translate(6857.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="9350.8" y="1359.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M9350.8 1390.5 L9731.8 1390.5" fill="none" data-name="ConsentItemFormView"></path>
+					<g data-name="StudyDesignInterventionsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
+							<rect x="13993.5" y="3140.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
+							<path d="M13993.5 3171.5 L14289.5 3171.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
 						</g>
-						<g transform="translate(9350.75, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
+						<g transform="translate(13993.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9350.75, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
+						<g transform="translate(13993.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="18128.5" y="1306.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M18128.5 1337.5 L18582.5 1337.5" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M18128.5 1428.5 L18582.5 1428.5" fill="none" data-name="EnrollmentFormData"></path>
+					<g data-name="StudyDesignPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
+							<rect x="22338.8" y="2265.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
+							<path d="M22338.8 2296.0 L22550.8 2296.0" fill="none" data-name="StudyDesignPageWidget"></path>
 						</g>
-						<g transform="translate(18128.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
-								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
+						<g transform="translate(22338.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
+								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18128.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
+						<g transform="translate(22338.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18128.5, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
+					</g>
+					<g data-name="InterventionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
+							<rect x="12278.0" y="1359.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
+							<path d="M12278.0 1390.5 L12653.0 1390.5" fill="none" data-name="InterventionFormView"></path>
+						</g>
+						<g transform="translate(12278, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
+								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(12278, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="26922.0" y="2227.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M26922.0 2258.0 L27290.0 2258.0" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M26922.0 2304.0 L27290.0 2304.0" fill="none" data-name="QuestionnaireFormData"></path>
+					<g data-name="InterventionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
+							<rect x="28020.8" y="2062.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
+							<path d="M28020.8 2093.0 L28875.8 2093.0" fill="none" data-name="InterventionFormViewModel"></path>
+							<path d="M28020.8 2319.0 L28875.8 2319.0" fill="none" data-name="InterventionFormViewModel"></path>
 						</g>
-						<g transform="translate(26922, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
+						<g transform="translate(28020.75, 2062)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
+								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26922, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
+						<g transform="translate(28020.75, 2093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26922, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
+						<g transform="translate(28020.75, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="20452.5" y="994.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M20452.5 1025.0 L20595.5 1025.0" fill="none" data-name="IStudyFormData"></path>
+					<g data-name="InterventionPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
+							<rect x="11908.0" y="1344.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
+							<path d="M11908.0 1375.0 L12238.0 1375.0" fill="none" data-name="InterventionPreview"></path>
+							<path d="M11908.0 1406.0 L12238.0 1406.0" fill="none" data-name="InterventionPreview"></path>
 						</g>
-						<g transform="translate(20452.5, 994)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
+						<g transform="translate(11908, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20452.5, 1025)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
+						<g transform="translate(11908, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyDesignInterventionsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="7418.5" y="3140.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M7418.5 3171.5 L7714.5 3171.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
-						</g>
-						<g transform="translate(7418.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
+						<g transform="translate(11908, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7418.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
+					</g>
+					<g data-name="InterventionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
+							<rect x="11186.3" y="2280.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
+						</g>
+						<g transform="translate(11186.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="36249.3" y="2107.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M36249.3 2138.0 L37088.3 2138.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M36249.3 2289.0 L37088.3 2289.0" fill="none" data-name="InterventionsFormViewModel"></path>
+					<g data-name="StudyScheduleFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
+							<rect x="37116.5" y="971.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
+							<path d="M37116.5 1002.0 L37475.5 1002.0" fill="none" data-name="StudyScheduleFormView"></path>
+							<path d="M37116.5 1033.0 L37475.5 1033.0" fill="none" data-name="StudyScheduleFormView"></path>
 						</g>
-						<g transform="translate(36249.25, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
-								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
+						<g transform="translate(37116.5, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
+								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36249.25, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
+						<g transform="translate(37116.5, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36249.25, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
+						<g transform="translate(37116.5, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="StudyScheduleControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="35810.3" y="1194.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M35810.3 1225.0 L36568.3 1225.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M35810.3 1526.0 L36568.3 1526.0" fill="none" data-name="StudyScheduleControls"></path>
+							<rect x="36917.0" y="1194.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
+							<path d="M36917.0 1225.0 L37675.0 1225.0" fill="none" data-name="StudyScheduleControls"></path>
+							<path d="M36917.0 1526.0 L37675.0 1526.0" fill="none" data-name="StudyScheduleControls"></path>
 						</g>
-						<g transform="translate(35810.25, 1194)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
+						<g transform="translate(36917, 1194)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
 								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35810.25, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+						<g transform="translate(36917, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
@@ -6176,7 +6148,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(35810.25, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+						<g transform="translate(36917, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
@@ -6185,69 +6157,19 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="25547.0" y="2062.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M25547.0 2093.0 L26402.0 2093.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M25547.0 2319.0 L26402.0 2319.0" fill="none" data-name="InterventionFormViewModel"></path>
-						</g>
-						<g transform="translate(25547, 2062)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
-								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25547, 2093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25547, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
 					<g data-name="InterventionTaskFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="31577.5" y="1306.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M31577.5 1337.5 L31867.5 1337.5" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M31577.5 1428.5 L31867.5 1428.5" fill="none" data-name="InterventionTaskFormData"></path>
+							<rect x="34955.0" y="1306.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
+							<path d="M34955.0 1337.5 L35245.0 1337.5" fill="none" data-name="InterventionTaskFormData"></path>
+							<path d="M34955.0 1428.5 L35245.0 1428.5" fill="none" data-name="InterventionTaskFormData"></path>
 						</g>
-						<g transform="translate(31577.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
+						<g transform="translate(34955, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
 								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31577.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+						<g transform="translate(34955, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
@@ -6257,7 +6179,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(31577.5, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+						<g transform="translate(34955, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
@@ -6267,17 +6189,17 @@
 					</g>
 					<g data-name="IFormDataWithSchedule">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="31768.3" y="941.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M31768.3 972.0 L32066.3 972.0" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M31768.3 1078.0 L32066.3 1078.0" fill="none" data-name="IFormDataWithSchedule"></path>
+							<rect x="35145.8" y="941.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
+							<path d="M35145.8 972.0 L35443.8 972.0" fill="none" data-name="IFormDataWithSchedule"></path>
+							<path d="M35145.8 1078.0 L35443.8 1078.0" fill="none" data-name="IFormDataWithSchedule"></path>
 						</g>
-						<g transform="translate(31768.25, 941)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
+						<g transform="translate(35145.75, 941)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
 								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31768.25, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+						<g transform="translate(35145.75, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
@@ -6288,105 +6210,92 @@
 								
 							</g>
 						</g>
-						<g transform="translate(31768.25, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+						<g transform="translate(35145.75, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="20445.5" y="2197.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M20445.5 2228.0 L20741.5 2228.0" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M20445.5 2334.0 L20741.5 2334.0" fill="none" data-name="StudyScheduleFormData"></path>
-						</g>
-						<g transform="translate(20445.5, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20445.5, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20445.5, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PhaseSequence">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="30395.5" y="3156.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
-						</g>
-						<g transform="translate(30395.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
-								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="8086.3" y="1344.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M8086.3 1375.0 L8416.3 1375.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M8086.3 1406.0 L8416.3 1406.0" fill="none" data-name="InterventionPreview"></path>
+					<g data-name="InterventionsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
+							<rect x="37629.3" y="2107.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
+							<path d="M37629.3 2138.0 L38468.3 2138.0" fill="none" data-name="InterventionsFormViewModel"></path>
+							<path d="M37629.3 2289.0 L38468.3 2289.0" fill="none" data-name="InterventionsFormViewModel"></path>
 						</g>
-						<g transform="translate(8086.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
+						<g transform="translate(37629.25, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
+								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8086.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
+						<g transform="translate(37629.25, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8086.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
+						<g transform="translate(37629.25, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="8134.8" y="2280.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
+					<g data-name="IListActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
+							<rect x="14115.0" y="1375.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
 						</g>
-						<g transform="translate(8134.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
+						<g transform="translate(14115, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="IProviderArgsResolver">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
+							<rect x="29304.3" y="1009.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
+						</g>
+						<g transform="translate(29304.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="InterventionTaskFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="31429.5" y="2159.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M31429.5 2190.5 L32125.5 2190.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M31429.5 2371.5 L32125.5 2371.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<rect x="30844.5" y="2159.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
+							<path d="M30844.5 2190.5 L31540.5 2190.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<path d="M30844.5 2371.5 L31540.5 2371.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
 						</g>
-						<g transform="translate(31429.5, 2159.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
+						<g transform="translate(30844.5, 2159.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31429.5, 2190.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+						<g transform="translate(30844.5, 2190.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
@@ -6402,7 +6311,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(31429.5, 2371.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+						<g transform="translate(30844.5, 2371.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
@@ -6413,17 +6322,17 @@
 					</g>
 					<g data-name="WithScheduleControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="39377.3" y="1239.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M39377.3 1270.0 L39872.3 1270.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M39377.3 1496.0 L39872.3 1496.0" fill="none" data-name="WithScheduleControls"></path>
+							<rect x="41963.3" y="1239.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
+							<path d="M41963.3 1270.0 L42458.3 1270.0" fill="none" data-name="WithScheduleControls"></path>
+							<path d="M41963.3 1496.0 L42458.3 1496.0" fill="none" data-name="WithScheduleControls"></path>
 						</g>
-						<g transform="translate(39377.25, 1239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
+						<g transform="translate(41963.25, 1239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
 								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39377.25, 1270)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+						<g transform="translate(41963.25, 1270)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
@@ -6442,7 +6351,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(39377.25, 1496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+						<g transform="translate(41963.25, 1496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
@@ -6450,83 +6359,30 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="21336.5" y="1321.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M21336.5 1352.5 L21730.5 1352.5" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M21336.5 1413.5 L21730.5 1413.5" fill="none" data-name="InterventionsFormData"></path>
-						</g>
-						<g transform="translate(21336.5, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21336.5, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21336.5, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="15084.5" y="1359.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M15084.5 1390.5 L15459.5 1390.5" fill="none" data-name="InterventionFormView"></path>
-						</g>
-						<g transform="translate(15084.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
-								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15084.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="15499.5" y="1359.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M15499.5 1390.5 L15912.5 1390.5" fill="none" data-name="InterventionTaskFormView"></path>
-						</g>
-						<g transform="translate(15499.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
-								
-							</g>
+					<g data-name="PhaseSequence">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
+							<rect x="27807.3" y="3156.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
 						</g>
-						<g transform="translate(15499.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
+						<g transform="translate(27807.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
+								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="InterventionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="17268.0" y="926.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M17268.0 957.0 L17650.0 957.0" fill="none" data-name="InterventionFormData"></path>
-							<path d="M17268.0 1078.0 L17650.0 1078.0" fill="none" data-name="InterventionFormData"></path>
+							<rect x="7.8" y="926.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
+							<path d="M7.8 957.0 L389.8 957.0" fill="none" data-name="InterventionFormData"></path>
+							<path d="M7.8 1078.0 L389.8 1078.0" fill="none" data-name="InterventionFormData"></path>
 						</g>
-						<g transform="translate(17268, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
+						<g transform="translate(7.75, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
 								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17268, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+						<g transform="translate(7.75, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
@@ -6538,7 +6394,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(17268, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+						<g transform="translate(7.75, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
@@ -6546,562 +6402,348 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="36009.8" y="971.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M36009.8 1002.0 L36368.8 1002.0" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M36009.8 1033.0 L36368.8 1033.0" fill="none" data-name="StudyScheduleFormView"></path>
-						</g>
-						<g transform="translate(36009.75, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36009.75, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36009.75, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="21770.5" y="1306.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M21770.5 1337.5 L22184.5 1337.5" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M21770.5 1428.5 L22184.5 1428.5" fill="none" data-name="StudyInfoFormData"></path>
-						</g>
-						<g transform="translate(21770.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21770.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21770.5, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyContactInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="22950.3" y="2182.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M22950.3 2213.0 L23298.3 2213.0" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M22950.3 2364.0 L23298.3 2364.0" fill="none" data-name="StudyContactInfoFormData"></path>
-						</g>
-						<g transform="translate(22950.25, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
-								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22950.25, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22950.25, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignInfoFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="8145.5" y="3140.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M8145.5 3171.5 L8368.5 3171.5" fill="none" data-name="StudyDesignInfoFormView"></path>
-						</g>
-						<g transform="translate(8145.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8145.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="43488.0" y="2054.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M43488.0 2085.5 L44184.0 2085.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M43488.0 2491.5 L44184.0 2491.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-						</g>
-						<g transform="translate(43488, 2054.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43488, 2085.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43488, 2491.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="31907.5" y="1291.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M31907.5 1322.5 L32316.5 1322.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M31907.5 1443.5 L32316.5 1443.5" fill="none" data-name="MeasurementSurveyFormData"></path>
+					<g data-name="StudyScheduleFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
+							<rect x="6159.3" y="2197.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
+							<path d="M6159.3 2228.0 L6455.3 2228.0" fill="none" data-name="StudyScheduleFormData"></path>
+							<path d="M6159.3 2334.0 L6455.3 2334.0" fill="none" data-name="StudyScheduleFormData"></path>
 						</g>
-						<g transform="translate(31907.5, 1291.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
+						<g transform="translate(6159.25, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31907.5, 1322.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
+						<g transform="translate(6159.25, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31907.5, 1443.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
+						<g transform="translate(6159.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="16736.5" y="1359.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M16736.5 1390.5 L17180.5 1390.5" fill="none" data-name="MeasurementSurveyFormView"></path>
+					<g data-name="IStudyFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
+							<rect x="9065.5" y="994.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
+							<path d="M9065.5 1025.0 L9208.5 1025.0" fill="none" data-name="IStudyFormData"></path>
 						</g>
-						<g transform="translate(16736.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
+						<g transform="translate(9065.5, 994)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
+								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16736.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
+						<g transform="translate(9065.5, 1025)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="29941.8" y="2084.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M29941.8 2115.5 L30637.8 2115.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M29941.8 2341.5 L30637.8 2341.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-						</g>
-						<g transform="translate(29941.75, 2084.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
-								
-							</g>
+					<g data-name="InterventionTaskFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
+							<rect x="14749.0" y="1359.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
+							<path d="M14749.0 1390.5 L15162.0 1390.5" fill="none" data-name="InterventionTaskFormView"></path>
 						</g>
-						<g transform="translate(29941.75, 2115.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(14749, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29941.75, 2341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
+						<g transform="translate(14749, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="8456.3" y="1344.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M8456.3 1375.0 L8800.3 1375.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M8456.3 1406.0 L8800.3 1406.0" fill="none" data-name="SurveyPreview"></path>
+					<g data-name="InterventionsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
+							<rect x="7149.8" y="1321.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
+							<path d="M7149.8 1352.5 L7543.8 1352.5" fill="none" data-name="InterventionsFormData"></path>
+							<path d="M7149.8 1413.5 L7543.8 1413.5" fill="none" data-name="InterventionsFormData"></path>
 						</g>
-						<g transform="translate(8456.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
+						<g transform="translate(7149.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
+								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8456.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
+						<g transform="translate(7149.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8456.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
+						<g transform="translate(7149.75, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="8504.8" y="2280.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
+					<g data-name="StudyDesignReportsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
+							<rect x="14782.5" y="3133.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
+							<path d="M14782.5 3164.0 L15175.5 3164.0" fill="none" data-name="StudyDesignReportsFormView"></path>
 						</g>
-						<g transform="translate(8504.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
+						<g transform="translate(14782.5, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
+								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyDesignMeasurementsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="8408.5" y="3140.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M8408.5 3171.5 L8718.5 3171.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
-						</g>
-						<g transform="translate(8408.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
+						<g transform="translate(14782.5, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8408.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
+					</g>
+					<g data-name="ReportItemFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
+							<rect x="429.8" y="956.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
+							<path d="M429.8 987.0 L743.8 987.0" fill="none" data-name="ReportItemFormData"></path>
+							<path d="M429.8 1048.0 L743.8 1048.0" fill="none" data-name="ReportItemFormData"></path>
+						</g>
+						<g transform="translate(429.75, 956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
+								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="MeasurementsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="23556.3" y="1329.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M23556.3 1360.0 L24050.3 1360.0" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M23556.3 1406.0 L24050.3 1406.0" fill="none" data-name="MeasurementsFormData"></path>
-						</g>
-						<g transform="translate(23556.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
-								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
+						<g transform="translate(429.75, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23556.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
+						<g transform="translate(429.75, 1048)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23556.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
+					</g>
+					<g data-name="ReportSection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
+							<rect x="522.8" y="1375.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
+						</g>
+						<g transform="translate(522.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
+								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="37288.3" y="2114.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M37288.3 2145.5 L38380.3 2145.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M37288.3 2296.5 L38380.3 2296.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+					<g data-name="DataReferenceEditor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
+							<rect x="19349.8" y="2227.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
+							<path d="M19349.8 2258.0 L20058.8 2258.0" fill="none" data-name="DataReferenceEditor"></path>
+							<path d="M19349.8 2319.0 L20058.8 2319.0" fill="none" data-name="DataReferenceEditor"></path>
 						</g>
-						<g transform="translate(37288.25, 2114.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
-								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
+						<g transform="translate(19349.75, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
+								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37288.25, 2145.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(19349.75, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37288.25, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
+						<g transform="translate(19349.75, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormValidationSet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="2551.3" y="3133.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M2551.3 3164.0 L2938.3 3164.0" fill="none" data-name="StudyFormValidationSet"></path>
+					<g data-name="ReactiveDropdownField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
+							<rect x="13204.5" y="3156.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
 						</g>
-						<g transform="translate(2551.25, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
-								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
+						<g transform="translate(13204.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
+								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2551.25, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
+					</g>
+					<g data-name="TemporalAggregationFormatted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
+							<rect x="15986.0" y="1284.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
+							<path d="M15986.0 1315.0 L16434.0 1315.0" fill="none" data-name="TemporalAggregationFormatted"></path>
+							<path d="M15986.0 1421.0 L16434.0 1421.0" fill="none" data-name="TemporalAggregationFormatted"></path>
+						</g>
+						<g transform="translate(15986, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
+								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReportsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="41164.0" y="2122.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M41164.0 2153.0 L42024.0 2153.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M41164.0 2319.0 L42024.0 2319.0" fill="none" data-name="ReportsFormViewModel"></path>
-						</g>
-						<g transform="translate(41164, 2122)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
-								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
+						<g transform="translate(15986, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41164, 2153)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
+						<g transform="translate(15986, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41164, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
+					</g>
+					<g data-name="TemporalAggregation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
+							<rect x="17181.3" y="2280.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
+						</g>
+						<g transform="translate(17181.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
+								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportFormItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="35061.3" y="3065.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M35061.3 3096.0 L35904.3 3096.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M35061.3 3172.0 L35904.3 3172.0" fill="none" data-name="ReportFormItemDelegate"></path>
+					<g data-name="ImprovementDirectionFormatted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
+							<rect x="17089.8" y="1284.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
+							<path d="M17089.8 1315.0 L17540.8 1315.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
+							<path d="M17089.8 1421.0 L17540.8 1421.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
 						</g>
-						<g transform="translate(35061.25, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
-								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
+						<g transform="translate(17089.75, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
+								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35061.25, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
+						<g transform="translate(17089.75, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35061.25, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
+						<g transform="translate(17089.75, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="24375.3" y="956.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M24375.3 987.0 L24689.3 987.0" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M24375.3 1048.0 L24689.3 1048.0" fill="none" data-name="ReportItemFormData"></path>
+					<g data-name="ImprovementDirection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
+							<rect x="18061.3" y="2280.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
 						</g>
-						<g transform="translate(24375.25, 956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
+						<g transform="translate(18061.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
+								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24375.25, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
-								
-							</g>
+					</g>
+					<g data-name="ReportSectionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
+							<rect x="9881.3" y="3118.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
+							<path d="M9881.3 3149.0 L10264.3 3149.0" fill="none" data-name="ReportSectionType"></path>
 						</g>
-						<g transform="translate(24375.25, 1048)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
+						<g transform="translate(9881.25, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
+								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="24468.3" y="1375.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(24468.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
+						<g transform="translate(9881.25, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="18622.5" y="1306.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M18622.5 1337.5 L19089.5 1337.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M18622.5 1413.5 L19089.5 1413.5" fill="none" data-name="ReportItemFormView"></path>
+					<g data-name="AverageSectionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
+							<rect x="12693.0" y="1329.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
+							<path d="M12693.0 1360.0 L13172.0 1360.0" fill="none" data-name="AverageSectionFormView"></path>
+							<path d="M12693.0 1421.0 L13172.0 1421.0" fill="none" data-name="AverageSectionFormView"></path>
 						</g>
-						<g transform="translate(18622.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
-								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
+						<g transform="translate(12693, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18622.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
+						<g transform="translate(12693, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18622.5, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
+						<g transform="translate(12693, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ReportItemFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="20781.5" y="2009.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M20781.5 2040.5 L21768.5 2040.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M20781.5 2476.5 L21768.5 2476.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<rect x="21091.8" y="2009.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
+							<path d="M21091.8 2040.5 L22078.8 2040.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<path d="M21091.8 2476.5 L22078.8 2476.5" fill="none" data-name="ReportItemFormViewModel"></path>
 						</g>
-						<g transform="translate(20781.5, 2009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(21091.75, 2009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
 								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20781.5, 2040.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(21091.75, 2040.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
@@ -7134,7 +6776,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(20781.5, 2476.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(21091.75, 2476.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
@@ -7146,887 +6788,1174 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="18493.5" y="2280.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
+					<g data-name="DataReferenceIdentifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
+							<rect x="47762.0" y="493.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
+							<path d="M47762.0 524.0 L47966.0 524.0" fill="none" data-name="DataReferenceIdentifier"></path>
+							<path d="M47762.0 555.0 L47966.0 555.0" fill="none" data-name="DataReferenceIdentifier"></path>
 						</g>
-						<g transform="translate(18493.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
+						<g transform="translate(47762, 493)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
+								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
+								
+							</g>
+						</g>
+						<g transform="translate(47762, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
+								
+							</g>
+						</g>
+						<g transform="translate(47762, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="4359.8" y="3118.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M4359.8 3149.0 L4742.8 3149.0" fill="none" data-name="ReportSectionType"></path>
+					<g data-name="DataReference">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
+							<rect x="47796.5" y="76.0" height="31.0" width="135.0" data-name="DataReference"></rect>
 						</g>
-						<g transform="translate(4359.75, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
+						<g transform="translate(47796.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
+								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4359.75, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
+					</g>
+					<g data-name="LinearRegressionSectionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
+							<rect x="13212.0" y="1329.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
+							<path d="M13212.0 1360.0 L13691.0 1360.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<path d="M13212.0 1421.0 L13691.0 1421.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+						</g>
+						<g transform="translate(13212, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(13212, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(13212, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="19129.5" y="1284.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M19129.5 1315.0 L19577.5 1315.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M19129.5 1421.0 L19577.5 1421.0" fill="none" data-name="TemporalAggregationFormatted"></path>
+					<g data-name="ReportItemFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
+							<rect x="21918.5" y="1306.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
+							<path d="M21918.5 1337.5 L22385.5 1337.5" fill="none" data-name="ReportItemFormView"></path>
+							<path d="M21918.5 1413.5 L22385.5 1413.5" fill="none" data-name="ReportItemFormView"></path>
 						</g>
-						<g transform="translate(19129.5, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
+						<g transform="translate(21918.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
+								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19129.5, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
+						<g transform="translate(21918.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19129.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
+						<g transform="translate(21918.5, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="18789.5" y="2280.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
+					<g data-name="Widget Function(BuildContext)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
+							<rect x="22590.8" y="2280.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
 						</g>
-						<g transform="translate(18789.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
+						<g transform="translate(22590.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
+								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="20328.3" y="1284.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M20328.3 1315.0 L20779.3 1315.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M20328.3 1421.0 L20779.3 1421.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
+					<g data-name="ReportsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
+							<rect x="43057.8" y="2122.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
+							<path d="M43057.8 2153.0 L43917.8 2153.0" fill="none" data-name="ReportsFormViewModel"></path>
+							<path d="M43057.8 2319.0 L43917.8 2319.0" fill="none" data-name="ReportsFormViewModel"></path>
 						</g>
-						<g transform="translate(20328.25, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
+						<g transform="translate(43057.75, 2122)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
+								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20328.25, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
+						<g transform="translate(43057.75, 2153)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20328.25, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
+						<g transform="translate(43057.75, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="20195.5" y="2280.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
+					<g data-name="ReportFormItemDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
+							<rect x="38461.8" y="3065.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
+							<path d="M38461.8 3096.0 L39304.8 3096.0" fill="none" data-name="ReportFormItemDelegate"></path>
+							<path d="M38461.8 3172.0 L39304.8 3172.0" fill="none" data-name="ReportFormItemDelegate"></path>
 						</g>
-						<g transform="translate(20195.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
+						<g transform="translate(38461.75, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
+								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
+								
+							</g>
+						</g>
+						<g transform="translate(38461.75, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
+								
+							</g>
+						</g>
+						<g transform="translate(38461.75, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="12834.5" y="1329.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M12834.5 1360.0 L13313.5 1360.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M12834.5 1421.0 L13313.5 1421.0" fill="none" data-name="AverageSectionFormView"></path>
+					<g data-name="ReportBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
+							<rect x="22890.3" y="1321.5" height="138.0" width="197.0" data-name="ReportBadge"></rect>
+							<path d="M22890.3 1352.5 L23087.3 1352.5" fill="none" data-name="ReportBadge"></path>
+							<path d="M22890.3 1428.5 L23087.3 1428.5" fill="none" data-name="ReportBadge"></path>
 						</g>
-						<g transform="translate(12834.5, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
+						<g transform="translate(22890.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12834.5, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+						<g transform="translate(22890.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12834.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
+						<g transform="translate(22890.25, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="13353.5" y="1329.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M13353.5 1360.0 L13832.5 1360.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M13353.5 1421.0 L13832.5 1421.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+					<g data-name="ReportStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
+							<rect x="12441.5" y="3118.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
+							<path d="M12441.5 3149.0 L12742.5 3149.0" fill="none" data-name="ReportStatus"></path>
 						</g>
-						<g transform="translate(13353.5, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
+						<g transform="translate(12441.5, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
+								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
+								
+							</g>
+						</g>
+						<g transform="translate(12441.5, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ReportsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
+							<rect x="7583.8" y="1329.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
+							<path d="M7583.8 1360.0 L7921.8 1360.0" fill="none" data-name="ReportsFormData"></path>
+							<path d="M7583.8 1406.0 L7921.8 1406.0" fill="none" data-name="ReportsFormData"></path>
+						</g>
+						<g transform="translate(7583.75, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
+								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13353.5, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+						<g transform="translate(7583.75, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13353.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
+						<g transform="translate(7583.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="42879.3" y="493.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M42879.3 524.0 L43083.3 524.0" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M42879.3 555.0 L43083.3 555.0" fill="none" data-name="DataReferenceIdentifier"></path>
+					<g data-name="StudyInfoFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
+							<rect x="44980.3" y="2054.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
+							<path d="M44980.3 2085.5 L45676.3 2085.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+							<path d="M44980.3 2491.5 L45676.3 2491.5" fill="none" data-name="StudyInfoFormViewModel"></path>
 						</g>
-						<g transform="translate(42879.25, 493)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
+						<g transform="translate(44980.25, 2054.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42879.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
+						<g transform="translate(44980.25, 2085.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42879.25, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
+						<g transform="translate(44980.25, 2491.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="42913.8" y="76.0" height="31.0" width="135.0" data-name="DataReference"></rect>
+					<g data-name="StudyDesignInfoFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
+							<rect x="15215.5" y="3140.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
+							<path d="M15215.5 3171.5 L15438.5 3171.5" fill="none" data-name="StudyDesignInfoFormView"></path>
 						</g>
-						<g transform="translate(42913.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
+						<g transform="translate(15215.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
+								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="22161.3" y="2227.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M22161.3 2258.0 L22870.3 2258.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M22161.3 2319.0 L22870.3 2319.0" fill="none" data-name="DataReferenceEditor"></path>
-						</g>
-						<g transform="translate(22161.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
+						<g transform="translate(15215.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22161.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
+					</g>
+					<g data-name="StudyInfoFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
+							<rect x="9688.0" y="1306.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
+							<path d="M9688.0 1337.5 L10102.0 1337.5" fill="none" data-name="StudyInfoFormData"></path>
+							<path d="M9688.0 1428.5 L10102.0 1428.5" fill="none" data-name="StudyInfoFormData"></path>
+						</g>
+						<g transform="translate(9688, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
+								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22161.25, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
+						<g transform="translate(9688, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="22591.5" y="3156.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
-						</g>
-						<g transform="translate(22591.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
+						<g transform="translate(9688, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="24090.3" y="1329.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M24090.3 1360.0 L24428.3 1360.0" fill="none" data-name="ReportsFormData"></path>
-							<path d="M24090.3 1406.0 L24428.3 1406.0" fill="none" data-name="ReportsFormData"></path>
+					<g data-name="StudyContactInfoFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
+							<rect x="10373.8" y="2182.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
+							<path d="M10373.8 2213.0 L10721.8 2213.0" fill="none" data-name="StudyContactInfoFormData"></path>
+							<path d="M10373.8 2364.0 L10721.8 2364.0" fill="none" data-name="StudyContactInfoFormData"></path>
 						</g>
-						<g transform="translate(24090.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
+						<g transform="translate(10373.75, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
+								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24090.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
+						<g transform="translate(10373.75, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24090.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
+						<g transform="translate(10373.75, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="7754.5" y="3118.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M7754.5 3149.0 L8055.5 3149.0" fill="none" data-name="ReportStatus"></path>
+					<g data-name="StudyFormValidationSet">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
+							<rect x="1545.0" y="3133.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
+							<path d="M1545.0 3164.0 L1932.0 3164.0" fill="none" data-name="StudyFormValidationSet"></path>
 						</g>
-						<g transform="translate(7754.5, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
+						<g transform="translate(1545, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
+								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7754.5, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
+						<g transform="translate(1545, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="22831.8" y="1321.5" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M22831.8 1352.5 L23028.8 1352.5" fill="none" data-name="ReportBadge"></path>
-							<path d="M22831.8 1428.5 L23028.8 1428.5" fill="none" data-name="ReportBadge"></path>
+					<g data-name="MeasurementsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
+							<rect x="10549.0" y="1329.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
+							<path d="M10549.0 1360.0 L11043.0 1360.0" fill="none" data-name="MeasurementsFormData"></path>
+							<path d="M10549.0 1406.0 L11043.0 1406.0" fill="none" data-name="MeasurementsFormData"></path>
 						</g>
-						<g transform="translate(22831.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
+						<g transform="translate(10549, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
+								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22831.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
+						<g transform="translate(10549, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22831.75, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
+						<g transform="translate(10549, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignReportsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="8758.5" y="3133.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M8758.5 3164.0 L9151.5 3164.0" fill="none" data-name="StudyDesignReportsFormView"></path>
+					<g data-name="MeasurementSurveyFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
+							<rect x="24145.3" y="1359.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
+							<path d="M24145.3 1390.5 L24589.3 1390.5" fill="none" data-name="MeasurementSurveyFormView"></path>
 						</g>
-						<g transform="translate(8758.5, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
+						<g transform="translate(24145.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
+								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8758.5, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
+						<g transform="translate(24145.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="13872.5" y="1329.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M13872.5 1360.0 L14260.5 1360.0" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M13872.5 1421.0 L14260.5 1421.0" fill="none" data-name="StudyFormScaffold"></path>
+					<g data-name="MeasurementSurveyFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
+							<rect x="32494.3" y="2084.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
+							<path d="M32494.3 2115.5 L33190.3 2115.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+							<path d="M32494.3 2341.5 L33190.3 2341.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
 						</g>
-						<g transform="translate(13872.5, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
+						<g transform="translate(32494.25, 2084.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13872.5, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
+						<g transform="translate(32494.25, 2115.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13872.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
+						<g transform="translate(32494.25, 2341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="T Function(WidgetRef)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="13753.3" y="2280.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
+					<g data-name="SurveyPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
+							<rect x="13731.0" y="1344.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
+							<path d="M13731.0 1375.0 L14075.0 1375.0" fill="none" data-name="SurveyPreview"></path>
+							<path d="M13731.0 1406.0 L14075.0 1406.0" fill="none" data-name="SurveyPreview"></path>
 						</g>
-						<g transform="translate(13753.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
+						<g transform="translate(13731, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="14168.5" y="2280.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
-						</g>
-						<g transform="translate(14168.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
+						<g transform="translate(13731, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="23164.3" y="1352.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M23164.3 1383.0 L23516.3 1383.0" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(23164.25, 1352)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
+						<g transform="translate(13731, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23164.25, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
+					</g>
+					<g data-name="MeasurementFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
+							<rect x="13779.5" y="2280.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
+						</g>
+						<g transform="translate(13779.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
+								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="11610.0" y="3088.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M11610.0 3119.0 L11973.0 3119.0" fill="none" data-name="SurveyQuestionType"></path>
+					<g data-name="MeasurementSurveyFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
+							<rect x="35285.0" y="1291.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
+							<path d="M35285.0 1322.5 L35694.0 1322.5" fill="none" data-name="MeasurementSurveyFormData"></path>
+							<path d="M35285.0 1443.5 L35694.0 1443.5" fill="none" data-name="MeasurementSurveyFormData"></path>
+						</g>
+						<g transform="translate(35285, 1291.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
+								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
+								
+							</g>
 						</g>
-						<g transform="translate(11610, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
+						<g transform="translate(35285, 1322.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11610, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
+						<g transform="translate(35285, 1443.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="28361.3" y="896.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M28361.3 927.0 L29529.3 927.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M28361.3 1063.0 L29529.3 1063.0" fill="none" data-name="QuestionFormData"></path>
+					<g data-name="QuestionnaireFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
+							<rect x="25141.5" y="2227.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
+							<path d="M25141.5 2258.0 L25509.5 2258.0" fill="none" data-name="QuestionnaireFormData"></path>
+							<path d="M25141.5 2304.0 L25509.5 2304.0" fill="none" data-name="QuestionnaireFormData"></path>
 						</g>
-						<g transform="translate(28361.25, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
+						<g transform="translate(25141.5, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
+								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28361.25, 927)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
+						<g transform="translate(25141.5, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28361.25, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
+						<g transform="translate(25141.5, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="27370.0" y="1306.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M27370.0 1337.5 L27714.0 1337.5" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M27370.0 1398.5 L27714.0 1398.5" fill="none" data-name="ChoiceQuestionFormData"></path>
+					<g data-name="WithQuestionnaireControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
+							<rect x="39221.3" y="1261.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
+							<path d="M39221.3 1292.5 L39853.3 1292.5" fill="none" data-name="WithQuestionnaireControls"></path>
+							<path d="M39221.3 1398.5 L39853.3 1398.5" fill="none" data-name="WithQuestionnaireControls"></path>
 						</g>
-						<g transform="translate(27370, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
+						<g transform="translate(39221.25, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
+								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27370, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(39221.25, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27370, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(39221.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="29279.5" y="1321.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M29279.5 1352.5 L29671.5 1352.5" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M29279.5 1398.5 L29671.5 1398.5" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(29279.5, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
+					<g data-name="StudyDesignMeasurementsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
+							<rect x="15478.5" y="3140.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
+							<path d="M15478.5 3171.5 L15788.5 3171.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
 						</g>
-						<g transform="translate(29279.5, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(15478.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
+								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29279.5, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(15478.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="29711.5" y="1321.5" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M29711.5 1352.5 L30183.5 1352.5" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M29711.5 1398.5 L30183.5 1398.5" fill="none" data-name="ImageQuestionFormData"></path>
+					<g data-name="MeasurementsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
+							<rect x="39597.3" y="2114.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
+							<path d="M39597.3 2145.5 L40689.3 2145.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+							<path d="M39597.3 2296.5 L40689.3 2296.5" fill="none" data-name="MeasurementsFormViewModel"></path>
 						</g>
-						<g transform="translate(29711.5, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
+						<g transform="translate(39597.25, 2114.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
+								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29711.5, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(39597.25, 2145.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29711.5, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(39597.25, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="30223.5" y="1314.0" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M30223.5 1345.0 L30695.5 1345.0" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M30223.5 1406.0 L30695.5 1406.0" fill="none" data-name="AudioQuestionFormData"></path>
+					<g data-name="StudyFormScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
+							<rect x="14321.0" y="1329.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
+							<path d="M14321.0 1360.0 L14709.0 1360.0" fill="none" data-name="StudyFormScaffold"></path>
+							<path d="M14321.0 1421.0 L14709.0 1421.0" fill="none" data-name="StudyFormScaffold"></path>
 						</g>
-						<g transform="translate(30223.5, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
+						<g transform="translate(14321, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
+								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30223.5, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(14321, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30223.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(14321, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="30735.5" y="1246.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M30735.5 1277.5 L31079.5 1277.5" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M30735.5 1473.5 L31079.5 1473.5" fill="none" data-name="ScaleQuestionFormData"></path>
+					<g data-name="T Function(WidgetRef)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
+							<rect x="16558.3" y="2280.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
 						</g>
-						<g transform="translate(30735.5, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
+						<g transform="translate(16558.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30735.5, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
-								
-							</g>
+					</g>
+					<g data-name="Widget Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
+							<rect x="16791.3" y="2280.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
 						</g>
-						<g transform="translate(30735.5, 1473.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(16791.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="31119.5" y="1306.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M31119.5 1337.5 L31463.5 1337.5" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M31119.5 1413.5 L31463.5 1413.5" fill="none" data-name="FreeTextQuestionFormData"></path>
+					<g data-name="ConsentItemFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
+							<rect x="33670.3" y="2167.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
+							<path d="M33670.3 2198.0 L34366.3 2198.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+							<path d="M33670.3 2364.0 L34366.3 2364.0" fill="none" data-name="ConsentItemFormViewModel"></path>
 						</g>
-						<g transform="translate(31119.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
+						<g transform="translate(33670.25, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31119.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(33670.25, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31119.5, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(33670.25, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="31193.5" y="2280.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+					<g data-name="StudyDesignEnrollmentFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
+							<rect x="15828.5" y="3125.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
+							<path d="M15828.5 3156.5 L16277.5 3156.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
 						</g>
-						<g transform="translate(31193.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
+						<g transform="translate(15828.5, 3125.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
+								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(15828.5, 3156.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="43088.8" y="60.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M43088.8 91.5 L43397.8 91.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
+					<g data-name="IScreenerQuestionLogicFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
+							<rect x="29172.0" y="2265.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
+							<path d="M29172.0 2296.0 L29504.0 2296.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
 						</g>
-						<g transform="translate(43088.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
+						<g transform="translate(29172, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
+								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43088.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(29172, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="25216.8" y="1359.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M25216.8 1390.5 L25568.8 1390.5" fill="none" data-name="ScaleQuestionFormView"></path>
+					<g data-name="ScreenerQuestionLogicFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
+							<rect x="41711.3" y="2227.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
+							<path d="M41711.3 2258.0 L42135.3 2258.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+							<path d="M41711.3 2289.0 L42135.3 2289.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
 						</g>
-						<g transform="translate(25216.75, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
+						<g transform="translate(41711.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
+								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25216.75, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(41711.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(41711.25, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="14300.5" y="1321.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M14300.5 1352.5 L14652.5 1352.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M14300.5 1398.5 L14652.5 1398.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+					<g data-name="ScreenerQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
+							<rect x="31560.5" y="3005.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
+							<path d="M31560.5 3036.0 L32122.5 3036.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+							<path d="M31560.5 3217.0 L32122.5 3217.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(14300.5, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
+						<g transform="translate(31560.5, 3005)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
+								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14300.5, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
+						<g transform="translate(31560.5, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14300.5, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
+						<g transform="translate(31560.5, 3217)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="14692.5" y="1344.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M14692.5 1375.0 L15044.5 1375.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M14692.5 1406.0 L15044.5 1406.0" fill="none" data-name="BoolQuestionFormView"></path>
+					<g data-name="ConsentItemFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
+							<rect x="26297.3" y="941.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
+							<path d="M26297.3 972.0 L26555.3 972.0" fill="none" data-name="ConsentItemFormData"></path>
+							<path d="M26297.3 1063.0 L26555.3 1063.0" fill="none" data-name="ConsentItemFormData"></path>
 						</g>
-						<g transform="translate(14692.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
+						<g transform="translate(26297.25, 941)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
+								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14692.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(26297.25, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14692.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+						<g transform="translate(26297.25, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="15952.5" y="1344.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M15952.5 1375.0 L16304.5 1375.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M15952.5 1406.0 L16304.5 1406.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(15952.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
-								
-							</g>
+					<g data-name="ConsentItemFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
+							<rect x="25257.3" y="1359.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
+							<path d="M25257.3 1390.5 L25638.3 1390.5" fill="none" data-name="ConsentItemFormView"></path>
 						</g>
-						<g transform="translate(15952.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(25257.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
+								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15952.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
+						<g transform="translate(25257.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="16344.5" y="1344.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M16344.5 1375.0 L16696.5 1375.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M16344.5 1406.0 L16696.5 1406.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+					<g data-name="EnrollmentFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
+							<rect x="11083.0" y="1306.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
+							<path d="M11083.0 1337.5 L11537.0 1337.5" fill="none" data-name="EnrollmentFormData"></path>
+							<path d="M11083.0 1428.5 L11537.0 1428.5" fill="none" data-name="EnrollmentFormData"></path>
 						</g>
-						<g transform="translate(16344.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
+						<g transform="translate(11083, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
+								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16344.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(11083, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16344.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
+						<g transform="translate(11083, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="17220.5" y="1344.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M17220.5 1375.0 L17572.5 1375.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M17220.5 1406.0 L17572.5 1406.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+					<g data-name="QuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
+							<rect x="25549.5" y="1627.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M25549.5 1658.0 L26562.5 1658.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M25549.5 2679.0 L26562.5 2679.0" fill="none" data-name="QuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(17220.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
+						<g transform="translate(25549.5, 1627)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
+								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17220.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(25549.5, 1658)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
+								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
+								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
+								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
+								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
+								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
+								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
+								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
+								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
+								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
+								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
+								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
+								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
+								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
+								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
+								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
+								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
+								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
+								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17220.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
+						<g transform="translate(25549.5, 2679)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="39408.8" y="971.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M39408.8 1002.0 L39840.8 1002.0" fill="none" data-name="ScheduleControls"></path>
-							<path d="M39408.8 1033.0 L39840.8 1033.0" fill="none" data-name="ScheduleControls"></path>
+					<g data-name="EnrollmentFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
+							<rect x="40729.3" y="2047.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
+							<path d="M40729.3 2078.0 L41631.3 2078.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+							<path d="M40729.3 2304.0 L41631.3 2304.0" fill="none" data-name="EnrollmentFormViewModel"></path>
 						</g>
-						<g transform="translate(39408.75, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
+						<g transform="translate(40729.25, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
+								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(40729.25, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(40729.25, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39408.75, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
+					</g>
+					<g data-name="EnrollmentFormConsentItemDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
+							<rect x="34539.8" y="3065.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
+							<path d="M34539.8 3096.0 L35339.8 3096.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+							<path d="M34539.8 3172.0 L35339.8 3172.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+						</g>
+						<g transform="translate(34539.75, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39408.75, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
+						<g transform="translate(34539.75, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="32356.5" y="1375.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
-						</g>
-						<g transform="translate(32356.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
+						<g transform="translate(34539.75, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="StudyFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="43254.0" y="1209.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M43254.0 1240.0 L43950.0 1240.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M43254.0 1451.0 L43950.0 1451.0" fill="none" data-name="StudyFormViewModel"></path>
+							<rect x="44972.3" y="1209.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
+							<path d="M44972.3 1240.0 L45668.3 1240.0" fill="none" data-name="StudyFormViewModel"></path>
+							<path d="M44972.3 1451.0 L45668.3 1451.0" fill="none" data-name="StudyFormViewModel"></path>
 						</g>
-						<g transform="translate(43254, 1209)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(44972.25, 1209)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43254, 1240)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(44972.25, 1240)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
@@ -8044,7 +7973,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(43254, 1451)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(44972.25, 1451)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
@@ -8057,761 +7986,832 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyAnalyzeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
-							<rect x="12441.0" y="2257.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
-							<path d="M12441.0 2288.5 L12621.0 2288.5" fill="none" data-name="StudyAnalyzeScreen"></path>
+					<g data-name="QuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
+							<rect x="31607.3" y="896.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M31607.3 927.0 L32775.3 927.0" fill="none" data-name="QuestionFormData"></path>
+							<path d="M31607.3 1063.0 L32775.3 1063.0" fill="none" data-name="QuestionFormData"></path>
 						</g>
-						<g transform="translate(12441, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
+						<g transform="translate(31607.25, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
+								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12441, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
+						<g transform="translate(31607.25, 927)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(31607.25, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyAnalyzeController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
-							<rect x="1190.3" y="2265.0" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
-							<path d="M1190.3 2296.0 L1391.3 2296.0" fill="none" data-name="StudyAnalyzeController"></path>
+					<g data-name="SurveyQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
+							<rect x="14329.5" y="3088.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M14329.5 3119.0 L14692.5 3119.0" fill="none" data-name="SurveyQuestionType"></path>
 						</g>
-						<g transform="translate(1190.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
-								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
+						<g transform="translate(14329.5, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
+								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1190.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
+						<g transform="translate(14329.5, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyMonitorScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="12661.0" y="2265.0" height="62.0" width="176.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M12661.0 2296.0 L12837.0 2296.0" fill="none" data-name="StudyMonitorScreen"></path>
+					<g data-name="ChoiceQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
+							<rect x="32347.0" y="1306.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M32347.0 1337.5 L32691.0 1337.5" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M32347.0 1398.5 L32691.0 1398.5" fill="none" data-name="ChoiceQuestionFormData"></path>
 						</g>
-						<g transform="translate(12661, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
+						<g transform="translate(32347, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12661, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
+						<g transform="translate(32347, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(32347, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
-							<rect x="26482.0" y="2197.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
-							<path d="M26482.0 2228.5 L26882.0 2228.5" fill="none" data-name="StudiesTableItem"></path>
+					<g data-name="BoolQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
+							<rect x="32731.0" y="1321.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M32731.0 1352.5 L33123.0 1352.5" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M32731.0 1398.5 L33123.0 1398.5" fill="none" data-name="BoolQuestionFormData"></path>
 						</g>
-						<g transform="translate(26482, 2197.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
-								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
+						<g transform="translate(32731, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
+								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26482, 2228.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
+						<g transform="translate(32731, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(32731, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(Study, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
-							<rect x="26744.0" y="3156.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
+					<g data-name="ImageQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
+							<rect x="33163.0" y="1321.5" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
+							<path d="M33163.0 1352.5 L33635.0 1352.5" fill="none" data-name="ImageQuestionFormData"></path>
+							<path d="M33163.0 1398.5 L33635.0 1398.5" fill="none" data-name="ImageQuestionFormData"></path>
 						</g>
-						<g transform="translate(26744, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
+						<g transform="translate(33163, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(Study)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
-							<rect x="27017.0" y="3156.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
+						<g transform="translate(33163, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(27017, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
+						<g transform="translate(33163, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
-							<rect x="28399.5" y="2107.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
-							<path d="M28399.5 2138.0 L29013.5 2138.0" fill="none" data-name="DashboardController"></path>
-							<path d="M28399.5 2259.0 L29013.5 2259.0" fill="none" data-name="DashboardController"></path>
+					<g data-name="AudioQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
+							<rect x="33675.0" y="1314.0" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
+							<path d="M33675.0 1345.0 L34147.0 1345.0" fill="none" data-name="AudioQuestionFormData"></path>
+							<path d="M33675.0 1406.0 L34147.0 1406.0" fill="none" data-name="AudioQuestionFormData"></path>
 						</g>
-						<g transform="translate(28399.5, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
-								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
+						<g transform="translate(33675, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28399.5, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
+						<g transform="translate(33675, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28399.5, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
+						<g transform="translate(33675, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IUserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="29424.3" y="3156.0" height="31.0" width="143.0" data-name="IUserRepository"></rect>
+					<g data-name="ScaleQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
+							<rect x="34187.0" y="1246.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M34187.0 1277.5 L34531.0 1277.5" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M34187.0 1473.5 L34531.0 1473.5" fill="none" data-name="ScaleQuestionFormData"></path>
 						</g>
-						<g transform="translate(29424.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
+						<g transform="translate(34187, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(34187, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(34187, 1473.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SearchController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="32638.5" y="3156.0" height="31.0" width="149.0" data-name="SearchController"></rect>
+					<g data-name="FreeTextQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
+							<rect x="34571.0" y="1306.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M34571.0 1337.5 L34915.0 1337.5" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M34571.0 1413.5 L34915.0 1413.5" fill="none" data-name="FreeTextQuestionFormData"></path>
 						</g>
-						<g transform="translate(32638.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
+						<g transform="translate(34571, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(34571, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(34571, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="27754.0" y="1375.0" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
+					<g data-name="FreeTextQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
+							<rect x="34645.0" y="2280.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
 						</g>
-						<g transform="translate(27754, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
+						<g transform="translate(34645, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
+								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumnSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
-							<rect x="43437.8" y="30.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
-							<path d="M43437.8 61.0 L43662.8 61.0" fill="none" data-name="StudiesTableColumnSize"></path>
-							<path d="M43437.8 122.0 L43662.8 122.0" fill="none" data-name="StudiesTableColumnSize"></path>
+					<g data-name="AudioRecordingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
+							<rect x="15202.0" y="1344.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
+							<path d="M15202.0 1375.0 L15554.0 1375.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<path d="M15202.0 1406.0 L15554.0 1406.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
 						</g>
-						<g transform="translate(43437.75, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
+						<g transform="translate(15202, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43437.75, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
+						<g transform="translate(15202, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43437.75, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
+						<g transform="translate(15202, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
-							<rect x="27978.0" y="1246.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
-							<path d="M27978.0 1277.5 L28458.0 1277.5" fill="none" data-name="StudiesTable"></path>
-							<path d="M27978.0 1488.5 L28458.0 1488.5" fill="none" data-name="StudiesTable"></path>
+					<g data-name="FreeTextQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
+							<rect x="15594.0" y="1321.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M15594.0 1352.5 L15946.0 1352.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M15594.0 1398.5 L15946.0 1398.5" fill="none" data-name="FreeTextQuestionFormView"></path>
 						</g>
-						<g transform="translate(27978, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
-								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
+						<g transform="translate(15594, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27978, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
+						<g transform="translate(15594, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27978, 1488.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
+						<g transform="translate(15594, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
-							<rect x="27962.5" y="2280.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
+					<g data-name="ImageCapturingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
+							<rect x="17580.8" y="1344.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
+							<path d="M17580.8 1375.0 L17932.8 1375.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<path d="M17580.8 1406.0 L17932.8 1406.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
 						</g>
-						<g transform="translate(27962.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
+						<g transform="translate(17580.75, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<rect x="29524.8" y="2280.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
+						<g transform="translate(17580.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
 						</g>
-						<g transform="translate(29524.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
+						<g transform="translate(17580.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
-							<rect x="2978.3" y="3065.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
-							<path d="M2978.3 3096.5 L3339.3 3096.5" fill="none" data-name="StudiesTableColumn"></path>
+					<g data-name="IScaleQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
+							<rect x="47971.5" y="60.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M47971.5 91.5 L48280.5 91.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(2978.25, 3065.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
-								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
+						<g transform="translate(47971.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
+								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2978.25, 3096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
+						<g transform="translate(47971.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="28181.5" y="2265.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
-							<path d="M28181.5 2296.0 L28359.5 2296.0" fill="none" data-name="DashboardScreen"></path>
+					<g data-name="ScaleQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
+							<rect x="29940.5" y="1359.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M29940.5 1390.5 L30292.5 1390.5" fill="none" data-name="ScaleQuestionFormView"></path>
 						</g>
-						<g transform="translate(28181.5, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
+						<g transform="translate(29940.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28181.5, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
+						<g transform="translate(29940.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesFilter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
-							<rect x="21058.3" y="3133.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
-							<path d="M21058.3 3164.0 L21354.3 3164.0" fill="none" data-name="StudiesFilter"></path>
+					<g data-name="ChoiceQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
+							<rect x="23127.3" y="1344.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M23127.3 1375.0 L23479.3 1375.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M23127.3 1406.0 L23479.3 1406.0" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(21058.25, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
+						<g transform="translate(23127.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21058.25, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
+						<g transform="translate(23127.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(23127.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
-							<rect x="28619.5" y="1336.5" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
-							<path d="M28619.5 1367.5 L28962.5 1367.5" fill="none" data-name="DashboardScaffold"></path>
-							<path d="M28619.5 1413.5 L28962.5 1413.5" fill="none" data-name="DashboardScaffold"></path>
+					<g data-name="BoolQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
+							<rect x="23519.3" y="1344.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M23519.3 1375.0 L23871.3 1375.0" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M23519.3 1406.0 L23871.3 1406.0" fill="none" data-name="BoolQuestionFormView"></path>
 						</g>
-						<g transform="translate(28619.5, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
-								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
+						<g transform="translate(23519.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28619.5, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
+						<g transform="translate(23519.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28619.5, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
+						<g transform="translate(23519.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumnHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
-							<rect x="29002.5" y="1329.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
-							<path d="M29002.5 1360.5 L29239.5 1360.5" fill="none" data-name="StudiesTableColumnHeader"></path>
+					<g data-name="SurveyQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
+							<rect x="30412.5" y="1352.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M30412.5 1383.0 L30764.5 1383.0" fill="none" data-name="SurveyQuestionFormView"></path>
 						</g>
-						<g transform="translate(29002.5, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
-								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
+						<g transform="translate(30412.5, 1352)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29002.5, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
+						<g transform="translate(30412.5, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AccountSettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
-							<rect x="17612.5" y="1359.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
-							<path d="M17612.5 1390.5 L17806.5 1390.5" fill="none" data-name="AccountSettingsDialog"></path>
-						</g>
-						<g transform="translate(17612.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
-								
-							</g>
+					<g data-name="StudyUTimeOfDay">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
+							<rect x="35734.0" y="1375.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
 						</g>
-						<g transform="translate(17612.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
+						<g transform="translate(35734, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
+								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInvitesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="43830.0" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M43830.0 31.0 L44396.0 31.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M43830.0 137.0 L44396.0 137.0" fill="none" data-name="StudyInvitesTable"></path>
+					<g data-name="ScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
+							<rect x="41994.8" y="971.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
+							<path d="M41994.8 1002.0 L42426.8 1002.0" fill="none" data-name="ScheduleControls"></path>
+							<path d="M41994.8 1033.0 L42426.8 1033.0" fill="none" data-name="ScheduleControls"></path>
 						</g>
-						<g transform="translate(43830, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
-								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
+						<g transform="translate(41994.75, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
+								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43830, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
+						<g transform="translate(41994.75, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43830, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
+						<g transform="translate(41994.75, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="43134.5" y="524.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
+					<g data-name="StudiesTableColumnHeader">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
+							<rect x="30916.3" y="1329.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
+							<path d="M30916.3 1360.5 L31153.3 1360.5" fill="none" data-name="StudiesTableColumnHeader"></path>
 						</g>
-						<g transform="translate(43134.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
+						<g transform="translate(30916.25, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
+								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="43396.5" y="524.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(43396.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+						<g transform="translate(30916.25, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Intervention? Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="43864.0" y="524.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
+					<g data-name="DashboardScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
+							<rect x="31580.5" y="2265.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
+							<path d="M31580.5 2296.0 L31758.5 2296.0" fill="none" data-name="DashboardScreen"></path>
 						</g>
-						<g transform="translate(43864, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
+						<g transform="translate(31580.5, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
+								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
+								
+							</g>
+						</g>
+						<g transform="translate(31580.5, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="int Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="44155.0" y="524.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
+					<g data-name="StudiesFilter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
+							<rect x="13447.5" y="3133.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
+							<path d="M13447.5 3164.0 L13743.5 3164.0" fill="none" data-name="StudiesFilter"></path>
 						</g>
-						<g transform="translate(44155, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
+						<g transform="translate(13447.5, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
+								
+							</g>
+						</g>
+						<g transform="translate(13447.5, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRecruitController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="10914.8" y="2204.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M10914.8 2235.5 L11565.8 2235.5" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M10914.8 2281.5 L11565.8 2281.5" fill="none" data-name="StudyRecruitController"></path>
+					<g data-name="DashboardScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
+							<rect x="31193.3" y="1336.5" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
+							<path d="M31193.3 1367.5 L31536.3 1367.5" fill="none" data-name="DashboardScaffold"></path>
+							<path d="M31193.3 1413.5 L31536.3 1413.5" fill="none" data-name="DashboardScaffold"></path>
 						</g>
-						<g transform="translate(10914.75, 2204.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
-								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
+						<g transform="translate(31193.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
+								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10914.75, 2235.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
+						<g transform="translate(31193.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10914.75, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
+						<g transform="translate(31193.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IInviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="34658.3" y="3156.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
+					<g data-name="DashboardController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
+							<rect x="17407.3" y="2107.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
+							<path d="M17407.3 2138.0 L18021.3 2138.0" fill="none" data-name="DashboardController"></path>
+							<path d="M17407.3 2259.0 L18021.3 2259.0" fill="none" data-name="DashboardController"></path>
 						</g>
-						<g transform="translate(34658.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
+						<g transform="translate(17407.25, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
+								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InviteCodeFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="42104.0" y="2107.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M42104.0 2138.0 L42771.0 2138.0" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M42104.0 2364.0 L42771.0 2364.0" fill="none" data-name="InviteCodeFormViewModel"></path>
+						<g transform="translate(17407.25, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
+								
+							</g>
 						</g>
-						<g transform="translate(42104, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
-								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
+						<g transform="translate(17407.25, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42104, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
+					</g>
+					<g data-name="IUserRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
+							<rect x="12832.5" y="3156.0" height="31.0" width="143.0" data-name="IUserRepository"></rect>
+						</g>
+						<g transform="translate(12832.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
+								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42104, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
+					</g>
+					<g data-name="SearchController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
+							<rect x="13015.5" y="3156.0" height="31.0" width="149.0" data-name="SearchController"></rect>
+						</g>
+						<g transform="translate(13015.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
+								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrolledBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="44436.0" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M44436.0 76.0 L44602.0 76.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M44436.0 107.0 L44602.0 107.0" fill="none" data-name="EnrolledBadge"></path>
+					<g data-name="StudiesTableColumnSize">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
+							<rect x="48320.5" y="30.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
+							<path d="M48320.5 61.0 L48545.5 61.0" fill="none" data-name="StudiesTableColumnSize"></path>
+							<path d="M48320.5 122.0 L48545.5 122.0" fill="none" data-name="StudiesTableColumnSize"></path>
 						</g>
-						<g transform="translate(44436, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
+						<g transform="translate(48320.5, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
+								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44436, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
+						<g transform="translate(48320.5, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44436, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
+						<g transform="translate(48320.5, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
-							<rect x="39912.3" y="1336.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
-							<path d="M39912.3 1367.5 L40350.3 1367.5" fill="none" data-name="InviteCodeFormView"></path>
-							<path d="M39912.3 1398.5 L40350.3 1398.5" fill="none" data-name="InviteCodeFormView"></path>
+					<g data-name="StudiesTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
+							<rect x="31827.0" y="1246.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
+							<path d="M31827.0 1277.5 L32307.0 1277.5" fill="none" data-name="StudiesTable"></path>
+							<path d="M31827.0 1488.5 L32307.0 1488.5" fill="none" data-name="StudiesTable"></path>
 						</g>
-						<g transform="translate(39912.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
-								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
+						<g transform="translate(31827, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
+								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39912.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
+						<g transform="translate(31827, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39912.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
+						<g transform="translate(31827, 1488.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRecruitScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="12877.0" y="2242.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M12877.0 2273.5 L13191.0 2273.5" fill="none" data-name="StudyRecruitScreen"></path>
-						</g>
-						<g transform="translate(12877, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
-								
-							</g>
+					<g data-name="void Function(Study)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
+							<rect x="31798.5" y="2280.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
 						</g>
-						<g transform="translate(12877, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
+						<g transform="translate(31798.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
+								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
-							<rect x="37436.3" y="926.0" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
-							<path d="M37436.3 957.0 L37881.3 957.0" fill="none" data-name="DrawerEntry"></path>
-							<path d="M37436.3 1093.0 L37881.3 1093.0" fill="none" data-name="DrawerEntry"></path>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+							<rect x="32077.3" y="2280.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
 						</g>
-						<g transform="translate(37436.25, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
-								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
+						<g transform="translate(32077.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37436.25, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DrawerEntry">+localizedHelpText: String Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DrawerEntry">+enabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DrawerEntry">+onSelected: void Function(BuildContext, WidgetRef)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DrawerEntry">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DrawerEntry">+title: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DrawerEntry">+helpText: String?</text>
+					</g>
+					<g data-name="StudiesTableColumn">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
+							<rect x="1972.0" y="3065.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
+							<path d="M1972.0 3096.5 L2333.0 3096.5" fill="none" data-name="StudiesTableColumn"></path>
+						</g>
+						<g transform="translate(1972, 3065.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
+								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37436.25, 1093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
+						<g transform="translate(1972, 3096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="String Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
-							<rect x="36646.8" y="1375.0" height="31.0" width="147.0" data-name="String Function()"></rect>
+					<g data-name="StudiesTableItem">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
+							<rect x="33230.3" y="2197.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
+							<path d="M33230.3 2228.5 L33630.3 2228.5" fill="none" data-name="StudiesTableItem"></path>
 						</g>
-						<g transform="translate(36646.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
-								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
+						<g transform="translate(33230.25, 2197.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
+								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="String Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
-							<rect x="38500.3" y="1375.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
-						</g>
-						<g transform="translate(38500.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
+						<g transform="translate(33230.25, 2228.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(BuildContext, WidgetRef)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
-							<rect x="38697.3" y="1375.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
+					<g data-name="void Function(Study, bool)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
+							<rect x="32162.5" y="3156.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
 						</g>
-						<g transform="translate(38697.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
-								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
+						<g transform="translate(32162.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="GoRouterDrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
-							<rect x="39073.3" y="1336.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
-							<path d="M39073.3 1367.5 L39337.3 1367.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-							<path d="M39073.3 1413.5 L39337.3 1413.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+					<g data-name="void Function(Study)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
+							<rect x="33009.0" y="3156.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
 						</g>
-						<g transform="translate(39073.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
+						<g transform="translate(33009, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
+								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39073.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
-								
-							</g>
+					</g>
+					<g data-name="App">
+						<g fill="#eee8d5" stroke="#33322E" data-name="App">
+							<rect x="48585.5" y="76.0" height="31.0" width="47.0" data-name="App"></rect>
 						</g>
-						<g transform="translate(39073.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
+						<g transform="translate(48585.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
+								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RoutingIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="38802.3" y="2280.5" height="31.0" width="122.0" data-name="RoutingIntent"></rect>
+					<g data-name="AppContent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
+							<rect x="48672.5" y="76.0" height="31.0" width="109.0" data-name="AppContent"></rect>
 						</g>
-						<g transform="translate(38802.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
+						<g transform="translate(48672.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppDrawer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
-							<rect x="44642.0" y="8.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
-							<path d="M44642.0 39.0 L44911.0 39.0" fill="none" data-name="AppDrawer"></path>
+					<g data-name="AccountSettingsDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
+							<rect x="23911.3" y="1359.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
+							<path d="M23911.3 1390.5 L24105.3 1390.5" fill="none" data-name="AccountSettingsDialog"></path>
 						</g>
-						<g transform="translate(44642, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
-								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
+						<g transform="translate(23911.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
+								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44642, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppDrawer">+leftPaddingEntries: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppDrawer">+logoPaddingVertical: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppDrawer">+logoPaddingHorizontal: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AppDrawer">+logoMaxHeight: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AppDrawer">+logoSectionMinHeight: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AppDrawer">+logoSectionMaxHeight: double</text>
+						<g transform="translate(23911.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
 								
 							</g>
 						</g>
diff --git a/docs/uml/designer_v2/lib/uml.svg b/docs/uml/designer_v2/lib/uml.svg
index 135fe44da..880ed2de2 100644
--- a/docs/uml/designer_v2/lib/uml.svg
+++ b/docs/uml/designer_v2/lib/uml.svg
@@ -1,16240 +1,16240 @@
-<svg version="1.1" baseProfile="full" width="84324.8" height="4748.0" viewbox="0 0 84324.75 4748" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;GoRouteParamEnum
+<svg version="1.1" baseProfile="full" width="84279.3" height="4748.0" viewbox="0 0 84279.25 4748" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[Config
 	  |
-	  +String toRouteParam();
-	  +String toShortString()
+	  &lt;static&gt;+isDebugMode: bool;
+	  &lt;static&gt;+defaultLocale: Set&lt;String&gt;;
+	  &lt;static&gt;+supportedLocales: Map&lt;String, String&gt;;
+	  &lt;static&gt;+newStudyId: String;
+	  &lt;static&gt;+newModelId: String;
+	  &lt;static&gt;+minSplashTime: int;
+	  &lt;static&gt;+formAutosaveDebounce: int
 	]
 	
-	[RoutingIntents
-	  |
-	  &lt;static&gt;+root: RoutingIntent;
-	  &lt;static&gt;+studies: RoutingIntent;
-	  &lt;static&gt;+studiesShared: RoutingIntent;
-	  &lt;static&gt;+publicRegistry: RoutingIntent;
-	  &lt;static&gt;+study: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEdit: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditInfo: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditInterventions: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String);
-	  &lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditReports: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String);
-	  &lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute});
-	  &lt;static&gt;+studyRecruit: RoutingIntent Function(String);
-	  &lt;static&gt;+studyMonitor: RoutingIntent Function(String);
-	  &lt;static&gt;+studyAnalyze: RoutingIntent Function(String);
-	  &lt;static&gt;+studySettings: RoutingIntent Function(String);
-	  &lt;static&gt;+accountSettings: RoutingIntent;
-	  &lt;static&gt;+studyNew: RoutingIntent;
-	  &lt;static&gt;+login: RoutingIntent;
-	  &lt;static&gt;+signup: RoutingIntent;
-	  &lt;static&gt;+passwordForgot: RoutingIntent;
-	  &lt;static&gt;+passwordForgot2: RoutingIntent Function(String);
-	  &lt;static&gt;+passwordRecovery: RoutingIntent;
-	  &lt;static&gt;+error: RoutingIntent Function(Exception)
+	[&lt;abstract&gt;ResultTypes
 	]
 	
-	[RoutingIntents]o-[RoutingIntent]
-	[RoutingIntents]o-[RoutingIntent Function(String)]
-	[RoutingIntents]o-[RoutingIntent Function(String, String)]
-	[RoutingIntents]o-[RoutingIntent Function(String, {String? appRoute})]
-	[RoutingIntents]o-[RoutingIntent Function(Exception)]
-	
-	[RoutingIntent
-	  |
-	  +route: GoRoute;
-	  +params: Map&lt;String, String&gt;;
-	  +queryParams: Map&lt;String, String&gt;;
-	  +dispatch: RoutingIntentDispatch?;
-	  +extra: Object?;
-	  +routeName: String;
-	  +arguments: Map&lt;String, String&gt;;
-	  +props: List&lt;Object?&gt;
+	[MeasurementResultTypes
 	  |
-	  -dynamic _validateRoute();
-	  +bool matches()
+	  &lt;static&gt;+questionnaire: String;
+	  &lt;static&gt;+values: List&lt;String&gt;
 	]
 	
-	[RoutingIntent]o-[GoRoute]
-	[RoutingIntent]o-[RoutingIntentDispatch]
-	[&lt;abstract&gt;Equatable]&lt;:-[RoutingIntent]
+	[&lt;abstract&gt;ResultTypes]&lt;:-[MeasurementResultTypes]
 	
-	[RoutingIntentDispatch
+	[InterventionResultTypes
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;;
-	  &lt;static&gt;+go: RoutingIntentDispatch;
-	  &lt;static&gt;+push: RoutingIntentDispatch
+	  &lt;static&gt;+checkmarkTask: String;
+	  &lt;static&gt;+values: List&lt;String&gt;
 	]
 	
-	[RoutingIntentDispatch]o-[RoutingIntentDispatch]
-	[Enum]&lt;:--[RoutingIntentDispatch]
+	[&lt;abstract&gt;ResultTypes]&lt;:-[InterventionResultTypes]
 	
-	[RouterKeys
+	[StudyExportData
 	  |
-	  &lt;static&gt;+studyKey: ValueKey&lt;String&gt;;
-	  &lt;static&gt;+authKey: ValueKey&lt;String&gt;
+	  +study: Study;
+	  +measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
+	  +interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
+	  +mediaData: List&lt;String&gt;;
+	  +isEmpty: bool
 	]
 	
-	[RouterKeys]o-[ValueKey]
-	
-	[RouteParams
-	  |
-	  &lt;static&gt;+studiesFilter: String;
-	  &lt;static&gt;+studyId: String;
-	  &lt;static&gt;+measurementId: String;
-	  &lt;static&gt;+interventionId: String;
-	  &lt;static&gt;+testAppRoute: String
-	]
+	[StudyExportData]o-[Study]
 	
-	[RouterConf
-	  |
-	  &lt;static&gt;+router: GoRouter;
-	  &lt;static&gt;+routes: List&lt;GoRoute&gt;;
-	  &lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;;
-	  &lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;
+	[StudyTemplates
 	  |
-	  &lt;static&gt;+GoRoute route()
-	]
-	
-	[RouterConf]o-[GoRouter]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs
+	  &lt;static&gt;+kUnnamedStudyTitle: String
 	  |
-	  +studyId: String
+	  &lt;static&gt;+Study emptyDraft()
 	]
 	
-	[&lt;abstract&gt;QuestionFormRouteArgs
+	[StudyActionType
 	  |
-	  +questionId: String
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudyActionType&gt;;
+	  &lt;static&gt;+pin: StudyActionType;
+	  &lt;static&gt;+pinoff: StudyActionType;
+	  &lt;static&gt;+edit: StudyActionType;
+	  &lt;static&gt;+duplicate: StudyActionType;
+	  &lt;static&gt;+duplicateDraft: StudyActionType;
+	  &lt;static&gt;+addCollaborator: StudyActionType;
+	  &lt;static&gt;+export: StudyActionType;
+	  &lt;static&gt;+delete: StudyActionType
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[&lt;abstract&gt;QuestionFormRouteArgs]
+	[StudyActionType]o-[StudyActionType]
+	[Enum]&lt;:--[StudyActionType]
 	
-	[ScreenerQuestionFormRouteArgs
+	[Notifications
+	  |
+	  &lt;static&gt;+credentialsInvalid: SnackbarIntent;
+	  &lt;static&gt;+userAlreadyRegistered: SnackbarIntent;
+	  &lt;static&gt;+passwordReset: SnackbarIntent;
+	  &lt;static&gt;+passwordResetSuccess: SnackbarIntent;
+	  &lt;static&gt;+studyDeleted: SnackbarIntent;
+	  &lt;static&gt;+inviteCodeDeleted: SnackbarIntent;
+	  &lt;static&gt;+inviteCodeClipped: SnackbarIntent;
+	  &lt;static&gt;+studyDeleteConfirmation: AlertIntent
 	]
 	
-	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:-[ScreenerQuestionFormRouteArgs]
+	[Notifications]o-[SnackbarIntent]
+	[Notifications]o-[AlertIntent]
 	
-	[ConsentItemFormRouteArgs
+	[NotificationDefaultActions
 	  |
-	  +consentId: String
+	  &lt;static&gt;+cancel: NotificationAction
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ConsentItemFormRouteArgs]
+	[NotificationDefaultActions]o-[NotificationAction]
 	
-	[MeasurementFormRouteArgs
+	[&lt;abstract&gt;INotificationService
 	  |
-	  +measurementId: String
+	  +void showMessage();
+	  +void show();
+	  +Stream&lt;NotificationIntent&gt; watchNotifications();
+	  +void dispose()
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[MeasurementFormRouteArgs]
-	
-	[SurveyQuestionFormRouteArgs
+	[NotificationService
 	  |
-	  +questionId: String
+	  -_streamController: BehaviorSubject&lt;NotificationIntent&gt;
+	  |
+	  +Stream&lt;NotificationIntent&gt; watchNotifications();
+	  +void showMessage();
+	  +void show();
+	  +void dispose()
 	]
 	
-	[MeasurementFormRouteArgs]&lt;:-[SurveyQuestionFormRouteArgs]
-	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:--[SurveyQuestionFormRouteArgs]
+	[NotificationService]o-[BehaviorSubject]
+	[&lt;abstract&gt;INotificationService]&lt;:--[NotificationService]
 	
-	[InterventionFormRouteArgs
+	[&lt;abstract&gt;NotificationIntent
 	  |
-	  +interventionId: String
+	  +message: String?;
+	  +customContent: Widget?;
+	  +icon: IconData?;
+	  +actions: List&lt;NotificationAction&gt;?;
+	  +type: NotificationType
+	  |
+	  +void register()
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[InterventionFormRouteArgs]
+	[&lt;abstract&gt;NotificationIntent]o-[&lt;abstract&gt;Widget]
+	[&lt;abstract&gt;NotificationIntent]o-[IconData]
+	[&lt;abstract&gt;NotificationIntent]o-[NotificationType]
 	
-	[InterventionTaskFormRouteArgs
+	[NotificationAction
 	  |
-	  +taskId: String
+	  +label: String;
+	  +onSelect: dynamic Function();
+	  +isDestructive: bool
 	]
 	
-	[InterventionFormRouteArgs]&lt;:-[InterventionTaskFormRouteArgs]
+	[NotificationAction]o-[dynamic Function()]
 	
-	[ReportItemFormRouteArgs
+	[SnackbarIntent
 	  |
-	  +sectionId: String
+	  +duration: int?
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ReportItemFormRouteArgs]
+	[&lt;abstract&gt;NotificationIntent]&lt;:-[SnackbarIntent]
 	
-	[&lt;abstract&gt;JsonFileLoader
-	  |
-	  +jsonAssetsPath: String
+	[AlertIntent
 	  |
-	  +dynamic loadJson();
-	  +dynamic parseJsonMapFromAssets();
-	  +dynamic parseJsonListFromAssets()
+	  +title: String;
+	  +dismissOnAction: bool;
+	  +isDestructive: dynamic
 	]
 	
-	[CombinedStreamNotifier
-	  |
-	  -_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;
+	[&lt;abstract&gt;NotificationIntent]&lt;:-[AlertIntent]
+	
+	[NotificationType
 	  |
-	  +void dispose()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;NotificationType&gt;;
+	  &lt;static&gt;+snackbar: NotificationType;
+	  &lt;static&gt;+alert: NotificationType;
+	  &lt;static&gt;+custom: NotificationType
 	]
 	
-	[ChangeNotifier]&lt;:-[CombinedStreamNotifier]
+	[NotificationType]o-[NotificationType]
+	[Enum]&lt;:--[NotificationType]
 	
-	[&lt;abstract&gt;IProviderArgsResolver
+	[&lt;abstract&gt;IClipboardService
 	  |
-	  +R provide()
+	  +dynamic copy()
 	]
 	
-	[SuppressedBehaviorSubject
-	  |
-	  +subject: BehaviorSubject&lt;T&gt;;
-	  +didSuppressInitialEvent: bool;
-	  -_controller: StreamController&lt;T&gt;
+	[ClipboardService
 	  |
-	  -StreamController&lt;T&gt; _buildDerivedController();
-	  +dynamic close()
+	  +dynamic copy()
 	]
 	
-	[SuppressedBehaviorSubject]o-[BehaviorSubject]
-	[SuppressedBehaviorSubject]o-[StreamController]
+	[&lt;abstract&gt;IClipboardService]&lt;:--[ClipboardService]
 	
-	[Time
+	[NotificationDispatcher
 	  |
-	  &lt;static&gt;+dynamic fromTimeOfDay();
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+Time fromJson()
+	  +child: Widget?;
+	  +snackbarInnerPadding: double;
+	  +snackbarWidth: double?;
+	  +snackbarBehavior: SnackBarBehavior;
+	  +snackbarDefaultDuration: int
 	]
 	
-	[TimeOfDay]&lt;:-[Time]
+	[NotificationDispatcher]o-[&lt;abstract&gt;Widget]
+	[NotificationDispatcher]o-[SnackBarBehavior]
 	
-	[TimeValueAccessor
+	[Assets
 	  |
-	  +String modelToViewValue();
-	  +Time? viewToModelValue();
-	  -String _addLeadingZeroIfNeeded()
+	  &lt;static&gt;+logoWide: String
 	]
 	
-	[&lt;abstract&gt;ControlValueAccessor]&lt;:-[TimeValueAccessor]
-	
-	[Tuple
+	[AsyncValueWidget
 	  |
-	  +first: T1;
-	  +second: T2;
-	  +props: List&lt;Object?&gt;
+	  +value: AsyncValue&lt;T&gt;;
+	  +data: Widget Function(T);
+	  +error: Widget Function(Object, StackTrace?)?;
+	  +loading: Widget Function()?;
+	  +empty: Widget Function()?
 	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson();
-	  +Tuple&lt;T1, T2&gt; copy();
-	  +Tuple&lt;T1, T2&gt; copyWith()
+	  +Widget build();
+	  -Widget _buildDataOrEmptyWidget();
+	  -Widget _defaultError();
+	  -Widget _defaultLoad()
 	]
 	
-	[&lt;abstract&gt;Equatable]&lt;:-[Tuple]
+	[AsyncValueWidget]o-[&lt;abstract&gt;AsyncValue]
+	[AsyncValueWidget]o-[Widget Function(T)]
+	[AsyncValueWidget]o-[Widget Function(Object, StackTrace?)?]
+	[AsyncValueWidget]o-[Widget Function()?]
 	
-	[OptimisticUpdate
+	[FormControlLabel
 	  |
-	  +applyOptimistic: void Function();
-	  +apply: dynamic Function();
-	  +rollback: void Function();
-	  +onUpdate: void Function()?;
-	  +onError: void Function(Object, StackTrace?)?;
-	  +rethrowErrors: bool;
-	  +runOptimistically: bool;
-	  +completeFutureOptimistically: bool
+	  +formControl: AbstractControl&lt;dynamic&gt;;
+	  +text: String;
+	  +isClickable: bool;
+	  +textStyle: TextStyle?;
+	  +onClick: void Function(AbstractControl&lt;dynamic&gt;)?
 	  |
-	  +dynamic execute();
-	  -void _runUpdateHandlerIfAny()
+	  +Widget build()
 	]
 	
-	[OptimisticUpdate]o-[void Function()]
-	[OptimisticUpdate]o-[dynamic Function()]
-	[OptimisticUpdate]o-[void Function()?]
-	[OptimisticUpdate]o-[void Function(Object, StackTrace?)?]
+	[FormControlLabel]o-[&lt;abstract&gt;AbstractControl]
+	[FormControlLabel]o-[TextStyle]
+	[FormControlLabel]o-[void Function(AbstractControl&lt;dynamic&gt;)?]
 	
-	[SerializableColor
+	[ActionPopUpMenuButton
 	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+SerializableColor fromJson()
+	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
+	  +triggerIconColor: Color?;
+	  +triggerIconColorHover: Color?;
+	  +triggerIconSize: double;
+	  +disableSplashEffect: bool;
+	  +hideOnEmpty: bool;
+	  +orientation: Axis;
+	  +elevation: double?;
+	  +splashRadius: double?;
+	  +enabled: bool;
+	  +position: PopupMenuPosition
+	  |
+	  +Widget build();
+	  -Widget _buildPopupMenu()
 	]
 	
-	[Color]&lt;:-[SerializableColor]
+	[ActionPopUpMenuButton]o-[Color]
+	[ActionPopUpMenuButton]o-[Axis]
+	[ActionPopUpMenuButton]o-[PopupMenuPosition]
 	
-	[&lt;abstract&gt;FileFormatEncoder
+	[Search
 	  |
-	  +dynamic encodeAsync();
-	  +String encode();
-	  +dynamic call()
+	  +onQueryChanged: dynamic Function(String);
+	  +searchController: SearchController?;
+	  +hintText: String?;
+	  +initialText: String?
 	]
 	
-	[CSVStringEncoder
+	[Search]o-[dynamic Function(String)]
+	[Search]o-[SearchController]
+	
+	[SearchController
 	  |
-	  +String encode()
+	  +setText: void Function(String)
 	]
 	
-	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[CSVStringEncoder]
+	[SearchController]o-[void Function(String)]
 	
-	[JsonStringEncoder
+	[FormScaffold
 	  |
-	  +String encode()
+	  +formViewModel: T;
+	  +actions: List&lt;Widget&gt;?;
+	  +body: Widget;
+	  +drawer: Widget?;
+	  +actionsSpacing: double;
+	  +actionsPadding: double
 	]
 	
-	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[JsonStringEncoder]
+	[FormScaffold]o-[&lt;abstract&gt;Widget]
 	
-	[NumericalRangeFormatter
+	[ConstrainedWidthFlexible
 	  |
-	  +min: int?;
-	  +max: int?
+	  +minWidth: double;
+	  +maxWidth: double;
+	  +flex: int;
+	  +flexSum: int;
+	  +child: Widget;
+	  +outerConstraints: BoxConstraints
 	  |
-	  +TextEditingValue formatEditUpdate()
+	  +Widget build();
+	  -double _getWidth()
 	]
 	
-	[&lt;abstract&gt;TextInputFormatter]&lt;:-[NumericalRangeFormatter]
+	[ConstrainedWidthFlexible]o-[&lt;abstract&gt;Widget]
+	[ConstrainedWidthFlexible]o-[BoxConstraints]
 	
-	[StudySequenceFormatter
+	[PrimaryButton
 	  |
-	  +TextEditingValue formatEditUpdate()
+	  +text: String;
+	  +icon: IconData?;
+	  +isLoading: bool;
+	  +showLoadingEarliestAfterMs: int;
+	  +onPressed: void Function()?;
+	  +tooltip: String;
+	  +tooltipDisabled: String;
+	  +enabled: bool;
+	  +onPressedFuture: dynamic Function()?;
+	  +innerPadding: EdgeInsets;
+	  +minimumSize: Size?;
+	  +isDisabled: bool
 	]
 	
-	[&lt;abstract&gt;TextInputFormatter]&lt;:-[StudySequenceFormatter]
+	[PrimaryButton]o-[IconData]
+	[PrimaryButton]o-[void Function()?]
+	[PrimaryButton]o-[dynamic Function()?]
+	[PrimaryButton]o-[EdgeInsets]
+	[PrimaryButton]o-[Size]
 	
-	[CountWhereValidator
-	  |
-	  +predicate: bool Function(T?);
-	  +minCount: int?;
-	  +maxCount: int?;
-	  &lt;static&gt;+kValidationMessageMinCount: String;
-	  &lt;static&gt;+kValidationMessageMaxCount: String
+	[FormTableRow
 	  |
-	  +Map&lt;String, dynamic&gt;? validate()
+	  +label: String?;
+	  +labelBuilder: Widget Function(BuildContext)?;
+	  +labelStyle: TextStyle?;
+	  +labelHelpText: String?;
+	  +input: Widget;
+	  +control: AbstractControl&lt;dynamic&gt;?;
+	  +layout: FormTableRowLayout?
 	]
 	
-	[CountWhereValidator]o-[bool Function(T?)]
-	[&lt;abstract&gt;Validator]&lt;:-[CountWhereValidator]
+	[FormTableRow]o-[Widget Function(BuildContext)?]
+	[FormTableRow]o-[TextStyle]
+	[FormTableRow]o-[&lt;abstract&gt;Widget]
+	[FormTableRow]o-[&lt;abstract&gt;AbstractControl]
+	[FormTableRow]o-[FormTableRowLayout]
 	
-	[Patterns
+	[FormTableLayout
 	  |
-	  &lt;static&gt;+timeFormatString: String;
-	  &lt;static&gt;+emailFormatString: String;
-	  &lt;static&gt;+url: String
+	  +rows: List&lt;FormTableRow&gt;;
+	  +columnWidths: Map&lt;int, TableColumnWidth&gt;;
+	  +rowDivider: Widget?;
+	  +rowLayout: FormTableRowLayout?;
+	  +rowLabelStyle: TextStyle?
+	  |
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;ExecutionLimiter
+	[FormTableLayout]o-[&lt;abstract&gt;Widget]
+	[FormTableLayout]o-[FormTableRowLayout]
+	[FormTableLayout]o-[TextStyle]
+	
+	[FormSectionHeader
 	  |
-	  +milliseconds: int;
-	  &lt;static&gt;-_timer: Timer?
+	  +title: String;
+	  +titleTextStyle: TextStyle?;
+	  +helpText: String?;
+	  +divider: bool;
+	  +helpTextDisabled: bool
 	  |
-	  +void dispose()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;ExecutionLimiter]o-[Timer]
+	[FormSectionHeader]o-[TextStyle]
 	
-	[Debouncer
+	[FormLabel
 	  |
-	  +leading: bool;
-	  +cancelUncompleted: bool;
-	  -_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?
+	  +labelText: String?;
+	  +helpText: String?;
+	  +labelTextStyle: TextStyle?;
+	  +layout: FormTableRowLayout?
 	  |
-	  +dynamic call()
+	  +Widget build()
 	]
 	
-	[Debouncer]o-[CancelableOperation]
-	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Debouncer]
+	[FormLabel]o-[TextStyle]
+	[FormLabel]o-[FormTableRowLayout]
 	
-	[Throttler
+	[FormTableRowLayout
 	  |
-	  +dynamic call()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;FormTableRowLayout&gt;;
+	  &lt;static&gt;+vertical: FormTableRowLayout;
+	  &lt;static&gt;+horizontal: FormTableRowLayout
 	]
 	
-	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Throttler]
+	[FormTableRowLayout]o-[FormTableRowLayout]
+	[Enum]&lt;:--[FormTableRowLayout]
 	
-	[ModelAction
+	[DismissButton
 	  |
-	  +type: T;
-	  +label: String;
-	  +icon: IconData?;
-	  +onExecute: Function;
-	  +isAvailable: bool;
-	  +isDestructive: bool
+	  +onPressed: void Function()?;
+	  +text: String?
+	  |
+	  +Widget build()
 	]
 	
-	[ModelAction]o-[IconData]
+	[DismissButton]o-[void Function()?]
 	
-	[&lt;abstract&gt;IModelActionProvider
+	[Badge
 	  |
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
-	]
-	
-	[&lt;abstract&gt;IListActionProvider
+	  +icon: IconData?;
+	  +color: Color?;
+	  +borderRadius: double;
+	  +label: String;
+	  +type: BadgeType;
+	  +padding: EdgeInsets;
+	  +iconSize: double?;
+	  +labelStyle: TextStyle?;
+	  +center: bool
 	  |
-	  +void onSelectItem();
-	  +void onNewItem()
+	  +Widget build();
+	  -Color? _getBackgroundColor();
+	  -Color _getBorderColor();
+	  -Color? _getLabelColor()
 	]
 	
-	[&lt;abstract&gt;IModelActionProvider]&lt;:-[&lt;abstract&gt;IListActionProvider]
+	[Badge]o-[IconData]
+	[Badge]o-[Color]
+	[Badge]o-[BadgeType]
+	[Badge]o-[EdgeInsets]
+	[Badge]o-[TextStyle]
 	
-	[ModelActionType
+	[BadgeType
 	  |
 	  +index: int;
-	  &lt;static&gt;+values: List&lt;ModelActionType&gt;;
-	  &lt;static&gt;+edit: ModelActionType;
-	  &lt;static&gt;+delete: ModelActionType;
-	  &lt;static&gt;+remove: ModelActionType;
-	  &lt;static&gt;+duplicate: ModelActionType;
-	  &lt;static&gt;+clipboard: ModelActionType;
-	  &lt;static&gt;+primary: ModelActionType
+	  &lt;static&gt;+values: List&lt;BadgeType&gt;;
+	  &lt;static&gt;+filled: BadgeType;
+	  &lt;static&gt;+outlined: BadgeType;
+	  &lt;static&gt;+outlineFill: BadgeType;
+	  &lt;static&gt;+plain: BadgeType
 	]
 	
-	[ModelActionType]o-[ModelActionType]
-	[Enum]&lt;:--[ModelActionType]
-	
-	[Config
-	  |
-	  &lt;static&gt;+isDebugMode: bool;
-	  &lt;static&gt;+defaultLocale: Set&lt;String&gt;;
-	  &lt;static&gt;+supportedLocales: Map&lt;String, String&gt;;
-	  &lt;static&gt;+newStudyId: String;
-	  &lt;static&gt;+newModelId: String;
-	  &lt;static&gt;+minSplashTime: int;
-	  &lt;static&gt;+formAutosaveDebounce: int
-	]
+	[BadgeType]o-[BadgeType]
+	[Enum]&lt;:--[BadgeType]
 	
-	[&lt;abstract&gt;IAuthRepository
+	[StandardDialog
 	  |
-	  +allowPasswordReset: bool;
-	  +currentUser: User?;
-	  +isLoggedIn: bool;
-	  +session: Session?;
-	  +serializedSession: String?
+	  +title: Widget?;
+	  +titleText: String?;
+	  +body: Widget;
+	  +actionButtons: List&lt;Widget&gt;;
+	  +backgroundColor: Color?;
+	  +borderRadius: double?;
+	  +width: double?;
+	  +height: double?;
+	  +minWidth: double;
+	  +minHeight: double;
+	  +maxWidth: double?;
+	  +maxHeight: double?;
+	  +padding: EdgeInsets
 	  |
-	  +dynamic signUp();
-	  +dynamic signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic updateUser();
-	  +void dispose()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IAuthRepository]o-[User]
-	[&lt;abstract&gt;IAuthRepository]o-[Session]
-	[&lt;abstract&gt;IAppDelegate]&lt;:-[&lt;abstract&gt;IAuthRepository]
+	[StandardDialog]o-[&lt;abstract&gt;Widget]
+	[StandardDialog]o-[Color]
+	[StandardDialog]o-[EdgeInsets]
 	
-	[AuthRepository
-	  |
-	  +supabaseClient: SupabaseClient;
-	  +allowPasswordReset: bool;
-	  +authClient: GoTrueClient;
-	  +session: Session?;
-	  +serializedSession: String?;
-	  +currentUser: User?;
-	  +isLoggedIn: bool
+	[&lt;abstract&gt;ISyncIndicatorViewModel
 	  |
-	  -void _registerAuthListener();
-	  +dynamic signUp();
-	  +dynamic signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic updateUser();
-	  +void dispose();
-	  +dynamic onAppStart()
+	  +isDirty: bool;
+	  +lastSynced: DateTime?
 	]
 	
-	[AuthRepository]o-[SupabaseClient]
-	[AuthRepository]o-[GoTrueClient]
-	[AuthRepository]o-[Session]
-	[AuthRepository]o-[User]
-	[&lt;abstract&gt;IAuthRepository]&lt;:--[AuthRepository]
-	
-	[&lt;abstract&gt;IInviteCodeRepository
+	[SyncIndicator
 	  |
-	  +dynamic isCodeAlreadyUsed()
+	  +state: AsyncValue&lt;T&gt;;
+	  +lastSynced: DateTime?;
+	  +isDirty: bool;
+	  +animationDuration: int;
+	  +iconSize: double
 	]
 	
-	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IInviteCodeRepository]
+	[SyncIndicator]o-[&lt;abstract&gt;AsyncValue]
 	
-	[InviteCodeRepository
-	  |
-	  +studyId: String;
-	  +ref: ProviderRef&lt;dynamic&gt;;
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +studyRepository: IStudyRepository;
-	  +study: Study
+	[&lt;abstract&gt;IWithBanner
 	  |
-	  +String getKey();
-	  +dynamic isCodeAlreadyUsed();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +dynamic emitUpdate()
+	  +Widget? banner()
 	]
 	
-	[InviteCodeRepository]o-[&lt;abstract&gt;ProviderRef]
-	[InviteCodeRepository]o-[&lt;abstract&gt;StudyUApi]
-	[InviteCodeRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[InviteCodeRepository]o-[&lt;abstract&gt;IStudyRepository]
-	[InviteCodeRepository]o-[Study]
-	[&lt;abstract&gt;ModelRepository]&lt;:-[InviteCodeRepository]
-	[&lt;abstract&gt;IInviteCodeRepository]&lt;:--[InviteCodeRepository]
-	
-	[InviteCodeRepositoryDelegate
-	  |
-	  +study: Study;
-	  +apiClient: StudyUApi;
-	  +studyRepository: IStudyRepository
+	[BannerBox
 	  |
-	  +dynamic fetch();
-	  +dynamic fetchAll();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic onError();
-	  +StudyInvite createDuplicate();
-	  +StudyInvite createNewInstance()
+	  +prefixIcon: Widget?;
+	  +body: Widget;
+	  +style: BannerStyle;
+	  +padding: EdgeInsets?;
+	  +noPrefix: bool;
+	  +dismissable: bool;
+	  +isDismissed: bool?;
+	  +onDismissed: dynamic Function()?;
+	  +dismissIconSize: double
 	]
 	
-	[InviteCodeRepositoryDelegate]o-[Study]
-	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
-	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;IStudyRepository]
-	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[InviteCodeRepositoryDelegate]
+	[BannerBox]o-[&lt;abstract&gt;Widget]
+	[BannerBox]o-[BannerStyle]
+	[BannerBox]o-[EdgeInsets]
+	[BannerBox]o-[dynamic Function()?]
 	
-	[StudyLaunched
+	[BannerStyle
+	  |
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;BannerStyle&gt;;
+	  &lt;static&gt;+warning: BannerStyle;
+	  &lt;static&gt;+info: BannerStyle;
+	  &lt;static&gt;+error: BannerStyle
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[StudyLaunched]
+	[BannerStyle]o-[BannerStyle]
+	[Enum]&lt;:--[BannerStyle]
 	
-	[WrappedModel
+	[ActionMenuInline
 	  |
-	  -_model: T;
-	  +asyncValue: AsyncValue&lt;T&gt;;
-	  +isLocalOnly: bool;
-	  +isDirty: bool;
-	  +isDeleted: bool;
-	  +lastSaved: DateTime?;
-	  +lastFetched: DateTime?;
-	  +lastUpdated: DateTime?;
-	  +model: T
+	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
+	  +iconSize: double?;
+	  +visible: bool;
+	  +splashRadius: double?;
+	  +paddingVertical: double?;
+	  +paddingHorizontal: double?
 	  |
-	  +dynamic markWithError();
-	  +dynamic markAsLoading();
-	  +dynamic markAsFetched();
-	  +dynamic markAsSaved()
+	  +Widget build()
 	]
 	
-	[WrappedModel]o-[&lt;abstract&gt;AsyncValue]
-	
-	[ModelRepositoryException
+	[Collapsible
+	  |
+	  +contentBuilder: Widget Function(BuildContext, bool);
+	  +headerBuilder: Widget Function(BuildContext, bool)?;
+	  +title: String?;
+	  +isCollapsed: bool
 	]
 	
-	[Exception]&lt;:--[ModelRepositoryException]
+	[Collapsible]o-[Widget Function(BuildContext, bool)]
+	[Collapsible]o-[Widget Function(BuildContext, bool)?]
 	
-	[ModelNotFoundException
+	[NavbarTab
+	  |
+	  +title: String;
+	  +intent: RoutingIntent?;
+	  +index: int;
+	  +enabled: bool
 	]
 	
-	[ModelRepositoryException]&lt;:--[ModelNotFoundException]
+	[NavbarTab]o-[RoutingIntent]
 	
-	[&lt;abstract&gt;IModelRepository
+	[TabbedNavbar
 	  |
-	  +String getKey();
-	  +WrappedModel&lt;T&gt;? get();
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic duplicateAndSave();
-	  +dynamic duplicateAndSaveFromRemote();
-	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
-	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
-	  +dynamic ensurePersisted();
-	  +void dispose()
+	  +tabs: List&lt;T&gt;;
+	  +selectedTab: T?;
+	  +indicator: BoxDecoration?;
+	  +height: double?;
+	  +disabledBackgroundColor: Color?;
+	  +disabledTooltipText: String?;
+	  +onSelect: void Function(int, T)?;
+	  +labelPadding: EdgeInsets?;
+	  +labelSpacing: double?;
+	  +indicatorSize: TabBarIndicatorSize?;
+	  +isScrollable: bool;
+	  +backgroundColor: Color?;
+	  +labelColorHover: Color?;
+	  +unselectedLabelColorHover: Color?
 	]
 	
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[&lt;abstract&gt;IModelRepository]
+	[TabbedNavbar]o-[BoxDecoration]
+	[TabbedNavbar]o-[Color]
+	[TabbedNavbar]o-[void Function(int, T)?]
+	[TabbedNavbar]o-[EdgeInsets]
+	[TabbedNavbar]o-[TabBarIndicatorSize]
 	
-	[&lt;abstract&gt;IModelRepositoryDelegate
+	[SidesheetTab
 	  |
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +T createNewInstance();
-	  +T createDuplicate();
-	  +dynamic onError()
+	  +builder: Widget Function(BuildContext)
 	]
 	
-	[&lt;abstract&gt;ModelRepository
+	[SidesheetTab]o-[Widget Function(BuildContext)]
+	[NavbarTab]&lt;:-[SidesheetTab]
+	
+	[Sidesheet
 	  |
-	  +delegate: IModelRepositoryDelegate&lt;T&gt;;
-	  -_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;;
-	  -_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;;
-	  +modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;;
-	  +modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;;
-	  -_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;
-	  |
-	  +WrappedModel&lt;T&gt;? get();
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic duplicateAndSave();
-	  +dynamic duplicateAndSaveFromRemote();
-	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
-	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
-	  -dynamic _buildModelSpecificController();
-	  +dynamic ensurePersisted();
-	  +WrappedModel&lt;T&gt; upsertLocally();
-	  +List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally();
-	  +dynamic emitUpdate();
-	  +dynamic emitModelEvent();
-	  +dynamic emitError();
-	  +void dispose();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
+	  &lt;static&gt;+kDefaultWidth: double;
+	  +titleText: String;
+	  +body: Widget?;
+	  +tabs: List&lt;SidesheetTab&gt;?;
+	  +actionButtons: List&lt;Widget&gt;?;
+	  +width: double?;
+	  +withCloseButton: bool;
+	  +ignoreAppBar: bool;
+	  +collapseSingleTab: bool;
+	  +bodyPadding: EdgeInsets?;
+	  +wrapContent: Widget Function(Widget)?
 	]
 	
-	[&lt;abstract&gt;ModelRepository]o-[&lt;abstract&gt;IModelRepositoryDelegate]
-	[&lt;abstract&gt;ModelRepository]o-[BehaviorSubject]
-	[&lt;abstract&gt;IModelRepository]&lt;:-[&lt;abstract&gt;ModelRepository]
+	[Sidesheet]o-[&lt;abstract&gt;Widget]
+	[Sidesheet]o-[EdgeInsets]
+	[Sidesheet]o-[Widget Function(Widget)?]
 	
-	[&lt;abstract&gt;StudyUApi
+	[FormSideSheetTab
 	  |
-	  +dynamic saveStudy();
-	  +dynamic fetchStudy();
-	  +dynamic getUserStudies();
-	  +dynamic deleteStudy();
-	  +dynamic saveStudyInvite();
-	  +dynamic fetchStudyInvite();
-	  +dynamic deleteStudyInvite();
-	  +dynamic deleteParticipants();
-	  +dynamic fetchAppConfig();
-	  +dynamic fetchUser();
-	  +dynamic saveUser()
-	]
-	
-	[APIException
-	]
-	
-	[Exception]&lt;:--[APIException]
-	
-	[StudyNotFoundException
+	  +formViewBuilder: Widget Function(T)
 	]
 	
-	[APIException]&lt;:-[StudyNotFoundException]
+	[FormSideSheetTab]o-[Widget Function(T)]
+	[NavbarTab]&lt;:-[FormSideSheetTab]
 	
-	[MeasurementNotFoundException
+	[HelpIcon
+	  |
+	  +tooltipText: String?
+	  |
+	  +Widget build()
 	]
 	
-	[APIException]&lt;:-[MeasurementNotFoundException]
-	
-	[QuestionNotFoundException
+	[EmptyBody
+	  |
+	  +icon: IconData?;
+	  +leading: Widget?;
+	  +leadingSpacing: double?;
+	  +title: String?;
+	  +description: String?;
+	  +button: Widget?
+	  |
+	  +Widget build()
 	]
 	
-	[APIException]&lt;:-[QuestionNotFoundException]
+	[EmptyBody]o-[IconData]
+	[EmptyBody]o-[&lt;abstract&gt;Widget]
 	
-	[ConsentItemNotFoundException
+	[IndicatorRangeSliderThumbShape
+	  |
+	  +buildContext: BuildContext;
+	  +start: T;
+	  +end: T
+	  |
+	  +Size getPreferredSize();
+	  +void paint()
 	]
 	
-	[APIException]&lt;:-[ConsentItemNotFoundException]
+	[IndicatorRangeSliderThumbShape]o-[&lt;abstract&gt;BuildContext]
+	[&lt;abstract&gt;RangeSliderThumbShape]&lt;:-[IndicatorRangeSliderThumbShape]
 	
-	[InterventionNotFoundException
+	[MouseEventsRegion
+	  |
+	  +onTap: void Function()?;
+	  +onHover: void Function(PointerHoverEvent)?;
+	  +onEnter: void Function(PointerEnterEvent)?;
+	  +onExit: void Function(PointerExitEvent)?;
+	  +autoselectCursor: bool;
+	  +cursor: SystemMouseCursor;
+	  &lt;static&gt;+defaultCursor: SystemMouseCursor;
+	  +autoCursor: SystemMouseCursor
 	]
 	
-	[APIException]&lt;:-[InterventionNotFoundException]
+	[MouseEventsRegion]o-[void Function()?]
+	[MouseEventsRegion]o-[void Function(PointerHoverEvent)?]
+	[MouseEventsRegion]o-[void Function(PointerEnterEvent)?]
+	[MouseEventsRegion]o-[void Function(PointerExitEvent)?]
+	[MouseEventsRegion]o-[SystemMouseCursor]
 	
-	[InterventionTaskNotFoundException
+	[ReactiveCustomColorPicker
 	]
 	
-	[APIException]&lt;:-[InterventionTaskNotFoundException]
+	[ReactiveFormField]&lt;:-[ReactiveCustomColorPicker]
 	
-	[ReportNotFoundException
+	[TextParagraph
+	  |
+	  +text: String?;
+	  +style: TextStyle?;
+	  +selectable: bool;
+	  +span: List&lt;TextSpan&gt;?
+	  |
+	  +Widget build()
 	]
 	
-	[APIException]&lt;:-[ReportNotFoundException]
+	[TextParagraph]o-[TextStyle]
 	
-	[ReportSectionNotFoundException
+	[UnderConstruction
+	  |
+	  +Widget build()
 	]
 	
-	[APIException]&lt;:-[ReportSectionNotFoundException]
-	
-	[StudyInviteNotFoundException
+	[NullHelperDecoration
 	]
 	
-	[APIException]&lt;:-[StudyInviteNotFoundException]
+	[InputDecoration]&lt;:-[NullHelperDecoration]
 	
-	[UserNotFoundException
+	[ActionMenuType
+	  |
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ActionMenuType&gt;;
+	  &lt;static&gt;+inline: ActionMenuType;
+	  &lt;static&gt;+popup: ActionMenuType
 	]
 	
-	[APIException]&lt;:-[UserNotFoundException]
+	[ActionMenuType]o-[ActionMenuType]
+	[Enum]&lt;:--[ActionMenuType]
 	
-	[StudyUApiClient
+	[HtmlStylingBanner
 	  |
-	  +supabaseClient: SupabaseClient;
-	  &lt;static&gt;+studyColumns: List&lt;String&gt;;
-	  &lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;;
-	  +testDelayMilliseconds: int
+	  +isDismissed: bool;
+	  +onDismissed: dynamic Function()?
 	  |
-	  +dynamic deleteParticipants();
-	  +dynamic getUserStudies();
-	  +dynamic fetchStudy();
-	  +dynamic deleteStudy();
-	  +dynamic saveStudy();
-	  +dynamic fetchStudyInvite();
-	  +dynamic saveStudyInvite();
-	  +dynamic deleteStudyInvite();
-	  +dynamic fetchAppConfig();
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  -dynamic _awaitGuarded();
-	  -dynamic _apiException();
-	  -dynamic _testDelay()
+	  +Widget build()
 	]
 	
-	[StudyUApiClient]o-[SupabaseClient]
-	[&lt;abstract&gt;SupabaseClientDependant]&lt;:-[StudyUApiClient]
-	[&lt;abstract&gt;SupabaseQueryMixin]&lt;:-[StudyUApiClient]
-	[&lt;abstract&gt;StudyUApi]&lt;:--[StudyUApiClient]
+	[HtmlStylingBanner]o-[dynamic Function()?]
 	
-	[&lt;abstract&gt;ModelEvent
+	[&lt;abstract&gt;FormConsumerWidget
 	  |
-	  +modelId: String;
-	  +model: T
+	  +Widget build()
 	]
 	
-	[IsFetched
+	[&lt;abstract&gt;FormConsumerRefWidget
+	  |
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsFetched]
-	
-	[IsSaving
+	[SplashPage
+	  |
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaving]
-	
-	[IsSaved
+	[ErrorPage
+	  |
+	  +error: Exception?
+	  |
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaved]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ErrorPage]
 	
-	[IsDeleted
+	[StudyULogo
+	  |
+	  +onTap: void Function()?
+	  |
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsDeleted]
+	[StudyULogo]o-[void Function()?]
 	
-	[&lt;abstract&gt;SupabaseClientDependant
+	[SingleColumnLayout
 	  |
-	  +supabaseClient: SupabaseClient
+	  &lt;static&gt;+defaultConstraints: BoxConstraints;
+	  &lt;static&gt;+defaultConstraintsNarrow: BoxConstraints;
+	  +body: Widget;
+	  +header: Widget?;
+	  +stickyHeader: bool;
+	  +constraints: BoxConstraints?;
+	  +scroll: bool;
+	  +padding: EdgeInsets?
+	  |
+	  &lt;static&gt;+dynamic fromType()
 	]
 	
-	[&lt;abstract&gt;SupabaseClientDependant]o-[SupabaseClient]
+	[SingleColumnLayout]o-[BoxConstraints]
+	[SingleColumnLayout]o-[&lt;abstract&gt;Widget]
+	[SingleColumnLayout]o-[EdgeInsets]
 	
-	[SupabaseQueryError
+	[SingleColumnLayoutType
 	  |
-	  +statusCode: String?;
-	  +message: String;
-	  +details: dynamic
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;;
+	  &lt;static&gt;+boundedWide: SingleColumnLayoutType;
+	  &lt;static&gt;+boundedNarrow: SingleColumnLayoutType;
+	  &lt;static&gt;+stretched: SingleColumnLayoutType;
+	  &lt;static&gt;+split: SingleColumnLayoutType
 	]
 	
-	[Exception]&lt;:--[SupabaseQueryError]
+	[SingleColumnLayoutType]o-[SingleColumnLayoutType]
+	[Enum]&lt;:--[SingleColumnLayoutType]
 	
-	[&lt;abstract&gt;SupabaseQueryMixin
+	[Hyperlink
 	  |
-	  +dynamic deleteAll();
-	  +dynamic getAll();
-	  +dynamic getById();
-	  +dynamic getByColumn();
-	  +List&lt;T&gt; deserializeList();
-	  +T deserializeObject()
-	]
-	
-	[&lt;abstract&gt;IStudyRepository
-	  |
-	  +dynamic launch();
-	  +dynamic deleteParticipants()
+	  +text: String;
+	  +url: String?;
+	  +onClick: void Function()?;
+	  +linkColor: Color;
+	  +hoverColor: Color?;
+	  +visitedColor: Color?;
+	  +style: TextStyle?;
+	  +hoverStyle: TextStyle?;
+	  +visitedStyle: TextStyle?;
+	  +icon: IconData?;
+	  +iconSize: double?
 	]
 	
-	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IStudyRepository]
+	[Hyperlink]o-[void Function()?]
+	[Hyperlink]o-[Color]
+	[Hyperlink]o-[TextStyle]
+	[Hyperlink]o-[IconData]
 	
-	[StudyRepository
-	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +ref: ProviderRef&lt;dynamic&gt;;
-	  +sortCallback: void Function()?
+	[StandardTableColumn
 	  |
-	  +String getKey();
-	  +dynamic deleteParticipants();
-	  +dynamic launch();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
+	  +label: String;
+	  +tooltip: String?;
+	  +columnWidth: TableColumnWidth;
+	  +sortable: bool;
+	  +sortAscending: bool?;
+	  +sortableIcon: Widget?
 	]
 	
-	[StudyRepository]o-[&lt;abstract&gt;StudyUApi]
-	[StudyRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyRepository]o-[&lt;abstract&gt;ProviderRef]
-	[StudyRepository]o-[void Function()?]
-	[&lt;abstract&gt;ModelRepository]&lt;:-[StudyRepository]
-	[&lt;abstract&gt;IStudyRepository]&lt;:--[StudyRepository]
+	[StandardTableColumn]o-[&lt;abstract&gt;TableColumnWidth]
+	[StandardTableColumn]o-[&lt;abstract&gt;Widget]
 	
-	[StudyRepositoryDelegate
-	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository
+	[StandardTable
 	  |
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic onError();
-	  +Study createNewInstance();
-	  +Study createDuplicate()
+	  +items: List&lt;T&gt;;
+	  +inputColumns: List&lt;StandardTableColumn&gt;;
+	  +onSelectItem: void Function(T);
+	  +trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?;
+	  +trailingActionsMenuType: ActionMenuType?;
+	  +sortColumnPredicates: List&lt;int Function(T, T)?&gt;?;
+	  +pinnedPredicates: int Function(T, T)?;
+	  +headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
+	  +dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
+	  +inputTrailingActionsColumn: StandardTableColumn;
+	  +tableWrapper: Widget Function(Widget)?;
+	  +cellSpacing: double;
+	  +rowSpacing: double;
+	  +minRowHeight: double?;
+	  +showTableHeader: bool;
+	  +hideLeadingTrailingWhenEmpty: bool;
+	  +leadingWidget: Widget?;
+	  +trailingWidget: Widget?;
+	  +leadingWidgetSpacing: double?;
+	  +trailingWidgetSpacing: double?;
+	  +emptyWidget: Widget?;
+	  +rowStyle: StandardTableStyle;
+	  +disableRowInteractions: bool
 	]
 	
-	[StudyRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
-	[StudyRepositoryDelegate]o-[&lt;abstract&gt;IAuthRepository]
-	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[StudyRepositoryDelegate]
+	[StandardTable]o-[void Function(T)]
+	[StandardTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?]
+	[StandardTable]o-[ActionMenuType]
+	[StandardTable]o-[int Function(T, T)?]
+	[StandardTable]o-[TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?]
+	[StandardTable]o-[StandardTableColumn]
+	[StandardTable]o-[Widget Function(Widget)?]
+	[StandardTable]o-[&lt;abstract&gt;Widget]
+	[StandardTable]o-[StandardTableStyle]
 	
-	[&lt;abstract&gt;IUserRepository
-	  |
-	  +user: StudyUUser
+	[StandardTableStyle
 	  |
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  +dynamic updatePreferences()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StandardTableStyle&gt;;
+	  &lt;static&gt;+plain: StandardTableStyle;
+	  &lt;static&gt;+material: StandardTableStyle
 	]
 	
-	[&lt;abstract&gt;IUserRepository]o-[StudyUUser]
+	[StandardTableStyle]o-[StandardTableStyle]
+	[Enum]&lt;:--[StandardTableStyle]
 	
-	[UserRepository
+	[IconPack
 	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +ref: Ref&lt;Object?&gt;;
-	  +user: StudyUUser
+	  &lt;static&gt;+defaultPack: List&lt;IconOption&gt;;
+	  &lt;static&gt;+material: List&lt;IconOption&gt;
 	  |
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  +dynamic updatePreferences()
+	  &lt;static&gt;+IconOption? resolveIconByName()
 	]
 	
-	[UserRepository]o-[&lt;abstract&gt;StudyUApi]
-	[UserRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[UserRepository]o-[&lt;abstract&gt;Ref]
-	[UserRepository]o-[StudyUUser]
-	[&lt;abstract&gt;IUserRepository]&lt;:--[UserRepository]
-	
-	[PreferenceAction
+	[IconOption
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;PreferenceAction&gt;;
-	  &lt;static&gt;+pin: PreferenceAction;
-	  &lt;static&gt;+pinOff: PreferenceAction
+	  +name: String;
+	  +icon: IconData?;
+	  +isEmpty: bool;
+	  +props: List&lt;Object?&gt;
+	  |
+	  +String toJson();
+	  &lt;static&gt;+IconOption fromJson()
 	]
 	
-	[PreferenceAction]o-[PreferenceAction]
-	[Enum]&lt;:--[PreferenceAction]
+	[IconOption]o-[IconData]
+	[&lt;abstract&gt;Equatable]&lt;:-[IconOption]
 	
-	[&lt;abstract&gt;IAppRepository
-	  |
-	  +dynamic fetchAppConfig();
-	  +void dispose()
+	[ReactiveIconPicker
 	]
 	
-	[AppRepository
+	[ReactiveFocusableFormField]&lt;:-[ReactiveIconPicker]
+	
+	[IconPicker
 	  |
-	  +apiClient: StudyUApi
+	  +iconOptions: List&lt;IconOption&gt;;
+	  +selectedOption: IconOption?;
+	  +onSelect: void Function(IconOption)?;
+	  +galleryIconSize: double?;
+	  +selectedIconSize: double?;
+	  +focusNode: FocusNode?;
+	  +isDisabled: bool
 	  |
-	  +dynamic fetchAppConfig();
-	  +void dispose()
+	  +Widget build()
 	]
 	
-	[AppRepository]o-[&lt;abstract&gt;StudyUApi]
-	[&lt;abstract&gt;IAppRepository]&lt;:--[AppRepository]
+	[IconPicker]o-[IconOption]
+	[IconPicker]o-[void Function(IconOption)?]
+	[IconPicker]o-[FocusNode]
 	
-	[WebFrame
+	[IconPickerField
 	  |
-	  +previewSrc: String;
-	  +studyId: String
+	  +iconOptions: List&lt;IconOption&gt;;
+	  +selectedOption: IconOption?;
+	  +selectedIconSize: double?;
+	  +galleryIconSize: double?;
+	  +onSelect: void Function(IconOption)?;
+	  +focusNode: FocusNode?;
+	  +isDisabled: bool
 	  |
 	  +Widget build()
 	]
 	
-	[DisabledFrame
+	[IconPickerField]o-[IconOption]
+	[IconPickerField]o-[void Function(IconOption)?]
+	[IconPickerField]o-[FocusNode]
+	
+	[IconPickerGallery
+	  |
+	  +iconOptions: List&lt;IconOption&gt;;
+	  +onSelect: void Function(IconOption)?;
+	  +iconSize: double
 	  |
 	  +Widget build()
 	]
 	
-	[PhoneContainer
+	[IconPickerGallery]o-[void Function(IconOption)?]
+	
+	[SecondaryButton
 	  |
-	  &lt;static&gt;+defaultWidth: double;
-	  &lt;static&gt;+defaultHeight: double;
-	  +width: double;
-	  +height: double;
-	  +borderColor: Color;
-	  +borderWidth: double;
-	  +borderRadius: double;
-	  +innerContent: Widget;
-	  +innerContentBackgroundColor: Color?
+	  +text: String;
+	  +icon: IconData?;
+	  +isLoading: bool;
+	  +onPressed: void Function()?
 	  |
 	  +Widget build()
 	]
 	
-	[PhoneContainer]o-[Color]
-	[PhoneContainer]o-[&lt;abstract&gt;Widget]
+	[SecondaryButton]o-[IconData]
+	[SecondaryButton]o-[void Function()?]
 	
-	[MobileFrame
+	[TwoColumnLayout
 	  |
-	  +Widget build()
+	  &lt;static&gt;+defaultDivider: VerticalDivider;
+	  &lt;static&gt;+defaultContentPadding: EdgeInsets;
+	  &lt;static&gt;+slimContentPadding: EdgeInsets;
+	  +leftWidget: Widget;
+	  +rightWidget: Widget;
+	  +dividerWidget: Widget?;
+	  +headerWidget: Widget?;
+	  +flexLeft: int?;
+	  +flexRight: int?;
+	  +constraintsLeft: BoxConstraints?;
+	  +constraintsRight: BoxConstraints?;
+	  +scrollLeft: bool;
+	  +scrollRight: bool;
+	  +paddingLeft: EdgeInsets?;
+	  +paddingRight: EdgeInsets?;
+	  +backgroundColorLeft: Color?;
+	  +backgroundColorRight: Color?;
+	  +stretchHeight: bool
 	]
 	
-	[DesktopFrame
+	[TwoColumnLayout]o-[VerticalDivider]
+	[TwoColumnLayout]o-[EdgeInsets]
+	[TwoColumnLayout]o-[&lt;abstract&gt;Widget]
+	[TwoColumnLayout]o-[BoxConstraints]
+	[TwoColumnLayout]o-[Color]
+	
+	[AppTranslation
 	  |
-	  +Widget build()
+	  &lt;static&gt;+dynamic init()
 	]
 	
-	[StudyController
+	[&lt;abstract&gt;PlatformLocale
 	  |
-	  +notificationService: INotificationService;
-	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
-	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
+	  +Locale getPlatformLocale()
+	]
+	
+	[PlatformLocaleWeb
 	  |
-	  +dynamic syncStudyStatus();
-	  +dynamic onStudySubscriptionUpdate();
-	  -dynamic _redirectNewToActualStudyID();
-	  +dynamic publishStudy();
-	  +void onChangeStudyParticipation();
-	  +void onAddParticipants();
-	  +void onSettingsPressed();
-	  +void dispose()
+	  +Locale getPlatformLocale()
 	]
 	
-	[StudyController]o-[&lt;abstract&gt;INotificationService]
-	[StudyController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyController]
+	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleWeb]
 	
-	[&lt;abstract&gt;IStudyAppBarViewModel
+	[PlatformLocaleMobile
 	  |
-	  +isSyncIndicatorVisible: bool;
-	  +isStatusBadgeVisible: bool;
-	  +isPublishVisible: bool
+	  +Locale getPlatformLocale()
 	]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
+	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleMobile]
 	
-	[StudyScaffold
+	[LanguagePicker
 	  |
-	  +studyId: String;
-	  +tabs: List&lt;NavbarTab&gt;?;
-	  +tabsSubnav: List&lt;NavbarTab&gt;?;
-	  +selectedTab: NavbarTab?;
-	  +selectedTabSubnav: NavbarTab?;
-	  +body: StudyPageWidget;
-	  +drawer: Widget?;
-	  +disableActions: bool;
-	  +actionsSpacing: double;
-	  +actionsPadding: double;
-	  +layoutType: SingleColumnLayoutType?;
-	  +appbarHeight: double;
-	  +appbarSubnavHeight: double
+	  +languagePickerType: LanguagePickerType;
+	  +iconColor: Color?;
+	  +offset: Offset?
 	]
 	
-	[StudyScaffold]o-[NavbarTab]
-	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
-	[StudyScaffold]o-[&lt;abstract&gt;Widget]
-	[StudyScaffold]o-[SingleColumnLayoutType]
+	[LanguagePicker]o-[LanguagePickerType]
+	[LanguagePicker]o-[Color]
+	[LanguagePicker]o-[Offset]
 	
-	[PreviewFrame
+	[LanguagePickerType
 	  |
-	  +studyId: String;
-	  +routeArgs: StudyFormRouteArgs?;
-	  +route: String?
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;LanguagePickerType&gt;;
+	  &lt;static&gt;+field: LanguagePickerType;
+	  &lt;static&gt;+icon: LanguagePickerType
 	]
 	
-	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
+	[LanguagePickerType]o-[LanguagePickerType]
+	[Enum]&lt;:--[LanguagePickerType]
 	
-	[RouteInformation
-	  |
-	  +route: String?;
-	  +extra: String?;
-	  +cmd: String?;
-	  +data: String?
+	[&lt;abstract&gt;GoRouteParamEnum
 	  |
-	  +String toString()
+	  +String toRouteParam();
+	  +String toShortString()
 	]
 	
-	[&lt;abstract&gt;PlatformController
-	  |
-	  +studyId: String;
-	  +baseSrc: String;
-	  +previewSrc: String;
-	  +routeInformation: RouteInformation;
-	  +frameWidget: Widget
+	[RoutingIntents
 	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void listen();
-	  +void send();
-	  +void openNewPage()
+	  &lt;static&gt;+root: RoutingIntent;
+	  &lt;static&gt;+studies: RoutingIntent;
+	  &lt;static&gt;+studiesShared: RoutingIntent;
+	  &lt;static&gt;+publicRegistry: RoutingIntent;
+	  &lt;static&gt;+study: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEdit: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditInfo: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditInterventions: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String);
+	  &lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditReports: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String);
+	  &lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute});
+	  &lt;static&gt;+studyRecruit: RoutingIntent Function(String);
+	  &lt;static&gt;+studyMonitor: RoutingIntent Function(String);
+	  &lt;static&gt;+studyAnalyze: RoutingIntent Function(String);
+	  &lt;static&gt;+studySettings: RoutingIntent Function(String);
+	  &lt;static&gt;+accountSettings: RoutingIntent;
+	  &lt;static&gt;+studyNew: RoutingIntent;
+	  &lt;static&gt;+login: RoutingIntent;
+	  &lt;static&gt;+signup: RoutingIntent;
+	  &lt;static&gt;+passwordForgot: RoutingIntent;
+	  &lt;static&gt;+passwordForgot2: RoutingIntent Function(String);
+	  &lt;static&gt;+passwordRecovery: RoutingIntent;
+	  &lt;static&gt;+error: RoutingIntent Function(Exception)
 	]
 	
-	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
-	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
+	[RoutingIntents]o-[RoutingIntent]
+	[RoutingIntents]o-[RoutingIntent Function(String)]
+	[RoutingIntents]o-[RoutingIntent Function(String, String)]
+	[RoutingIntents]o-[RoutingIntent Function(String, {String? appRoute})]
+	[RoutingIntents]o-[RoutingIntent Function(Exception)]
 	
-	[WebController
+	[RoutingIntent
 	  |
-	  +iFrameElement: IFrameElement
+	  +route: GoRoute;
+	  +params: Map&lt;String, String&gt;;
+	  +queryParams: Map&lt;String, String&gt;;
+	  +dispatch: RoutingIntentDispatch?;
+	  +extra: Object?;
+	  +routeName: String;
+	  +arguments: Map&lt;String, String&gt;;
+	  +props: List&lt;Object?&gt;
 	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void openNewPage();
-	  +void listen();
-	  +void send()
+	  -dynamic _validateRoute();
+	  +bool matches()
 	]
 	
-	[WebController]o-[IFrameElement]
-	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
+	[RoutingIntent]o-[GoRoute]
+	[RoutingIntent]o-[RoutingIntentDispatch]
+	[&lt;abstract&gt;Equatable]&lt;:-[RoutingIntent]
 	
-	[MobileController
+	[RoutingIntentDispatch
 	  |
-	  +void openNewPage();
-	  +void refresh();
-	  +void registerViews();
-	  +void listen();
-	  +void send();
-	  +void navigate();
-	  +void activate();
-	  +void generateUrl()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;;
+	  &lt;static&gt;+go: RoutingIntentDispatch;
+	  &lt;static&gt;+push: RoutingIntentDispatch
 	]
 	
-	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
+	[RoutingIntentDispatch]o-[RoutingIntentDispatch]
+	[Enum]&lt;:--[RoutingIntentDispatch]
 	
-	[StudyParticipationBadge
-	  |
-	  +participation: Participation;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +center: bool
+	[RouterKeys
 	  |
-	  +Widget build()
+	  &lt;static&gt;+studyKey: ValueKey&lt;String&gt;;
+	  &lt;static&gt;+authKey: ValueKey&lt;String&gt;
 	]
 	
-	[StudyParticipationBadge]o-[Participation]
-	[StudyParticipationBadge]o-[BadgeType]
+	[RouterKeys]o-[ValueKey]
 	
-	[StudyTestScreen
+	[RouteParams
 	  |
-	  +previewRoute: String?
+	  &lt;static&gt;+studiesFilter: String;
+	  &lt;static&gt;+studyId: String;
+	  &lt;static&gt;+measurementId: String;
+	  &lt;static&gt;+interventionId: String;
+	  &lt;static&gt;+testAppRoute: String
+	]
+	
+	[RouterConf
 	  |
-	  +Widget build();
-	  +Widget? banner();
-	  +dynamic load();
-	  +dynamic save();
-	  +dynamic showHelp()
+	  &lt;static&gt;+router: GoRouter;
+	  &lt;static&gt;+routes: List&lt;GoRoute&gt;;
+	  &lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;;
+	  &lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;
+	  |
+	  &lt;static&gt;+GoRoute route()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
+	[RouterConf]o-[GoRouter]
 	
-	[TestAppRoutes
+	[&lt;abstract&gt;StudyFormRouteArgs
 	  |
-	  &lt;static&gt;+studyOverview: String;
-	  &lt;static&gt;+eligibility: String;
-	  &lt;static&gt;+intervention: String;
-	  &lt;static&gt;+consent: String;
-	  &lt;static&gt;+journey: String;
-	  &lt;static&gt;+dashboard: String
+	  +studyId: String
 	]
 	
-	[&lt;abstract&gt;IStudyNavViewModel
+	[&lt;abstract&gt;QuestionFormRouteArgs
 	  |
-	  +isEditTabEnabled: bool;
-	  +isTestTabEnabled: bool;
-	  +isRecruitTabEnabled: bool;
-	  +isMonitorTabEnabled: bool;
-	  +isAnalyzeTabEnabled: bool;
-	  +isSettingsEnabled: bool
+	  +questionId: String
 	]
 	
-	[StudyNav
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[&lt;abstract&gt;QuestionFormRouteArgs]
+	
+	[ScreenerQuestionFormRouteArgs
+	]
+	
+	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:-[ScreenerQuestionFormRouteArgs]
+	
+	[ConsentItemFormRouteArgs
 	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic edit();
-	  &lt;static&gt;+dynamic test();
-	  &lt;static&gt;+dynamic recruit();
-	  &lt;static&gt;+dynamic monitor();
-	  &lt;static&gt;+dynamic analyze()
+	  +consentId: String
 	]
 	
-	[StudyDesignNav
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ConsentItemFormRouteArgs]
+	
+	[MeasurementFormRouteArgs
 	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic info();
-	  &lt;static&gt;+dynamic enrollment();
-	  &lt;static&gt;+dynamic interventions();
-	  &lt;static&gt;+dynamic measurements();
-	  &lt;static&gt;+dynamic reports()
+	  +measurementId: String
 	]
 	
-	[StudyTestController
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[MeasurementFormRouteArgs]
+	
+	[SurveyQuestionFormRouteArgs
 	  |
-	  +authRepository: IAuthRepository;
-	  +languageCode: String
+	  +questionId: String
 	]
 	
-	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyBaseController]&lt;:-[StudyTestController]
+	[MeasurementFormRouteArgs]&lt;:-[SurveyQuestionFormRouteArgs]
+	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:--[SurveyQuestionFormRouteArgs]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel
+	[InterventionFormRouteArgs
 	  |
-	  +studyParticipation: Participation?;
-	  +studyStatus: StudyStatus?
+	  +interventionId: String
 	]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[InterventionFormRouteArgs]
 	
-	[StudyStatusBadge
+	[InterventionTaskFormRouteArgs
 	  |
-	  +participation: Participation?;
-	  +status: StudyStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
-	  |
-	  +Widget build()
+	  +taskId: String
 	]
 	
-	[StudyStatusBadge]o-[Participation]
-	[StudyStatusBadge]o-[StudyStatus]
-	[StudyStatusBadge]o-[BadgeType]
+	[InterventionFormRouteArgs]&lt;:-[InterventionTaskFormRouteArgs]
 	
-	[FrameControlsWidget
-	  |
-	  +onRefresh: void Function()?;
-	  +onOpenNewTab: void Function()?;
-	  +enabled: bool
+	[ReportItemFormRouteArgs
 	  |
-	  +Widget build()
+	  +sectionId: String
 	]
 	
-	[FrameControlsWidget]o-[void Function()?]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ReportItemFormRouteArgs]
 	
-	[StudySettingsDialog
+	[DropdownMenuItemTheme
 	  |
-	  +Widget build()
+	  +iconTheme: IconThemeData?
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
+	[DropdownMenuItemTheme]o-[IconThemeData]
+	[&lt;abstract&gt;Diagnosticable]&lt;:-[DropdownMenuItemTheme]
 	
-	[StudySettingsFormViewModel
+	[ThemeConfig
 	  |
-	  +study: AsyncValue&lt;Study&gt;;
-	  +studyRepository: IStudyRepository;
-	  &lt;static&gt;+defaultPublishedToRegistry: bool;
-	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
-	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
-	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
+	  &lt;static&gt;+kMinContentWidth: double;
+	  &lt;static&gt;+kMaxContentWidth: double;
+	  &lt;static&gt;+kHoverFadeFactor: double;
+	  &lt;static&gt;+kMuteFadeFactor: double
 	  |
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +dynamic keepControlsSynced();
-	  +dynamic save();
-	  +dynamic setLaunchDefaults()
+	  &lt;static&gt;+dynamic bodyBackgroundColor();
+	  &lt;static&gt;+Color modalBarrierColor();
+	  &lt;static&gt;+Color containerColor();
+	  &lt;static&gt;+Color colorPickerInitialColor();
+	  &lt;static&gt;+TextStyle bodyTextMuted();
+	  &lt;static&gt;+TextStyle bodyTextBackground();
+	  &lt;static&gt;+double iconSplashRadius();
+	  &lt;static&gt;+Color sidesheetBackgroundColor();
+	  &lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme();
+	  &lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()
 	]
 	
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudySettingsFormViewModel]o-[FormControl]
-	[StudySettingsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
-	
-	[StudyBaseController
-	  |
-	  +studyId: String;
-	  +studyRepository: IStudyRepository;
-	  +router: GoRouter;
-	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
+	[NoAnimationPageTransitionsBuilder
 	  |
-	  +dynamic subscribeStudy();
-	  +dynamic onStudySubscriptionUpdate();
-	  +dynamic onStudySubscriptionError();
-	  +void dispose()
+	  +Widget buildTransitions()
 	]
 	
-	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyBaseController]o-[GoRouter]
-	[StudyBaseController]o-[StreamSubscription]
+	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[NoAnimationPageTransitionsBuilder]
 	
-	[&lt;abstract&gt;StudyPageWidget
-	  |
-	  +studyId: String
+	[WebTransitionBuilder
 	  |
-	  +Widget? banner()
+	  +Widget buildTransitions()
 	]
 	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
-	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
+	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[WebTransitionBuilder]
 	
-	[AppStatus
+	[ThemeSettingChange
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
-	  &lt;static&gt;+initializing: AppStatus;
-	  &lt;static&gt;+initialized: AppStatus
+	  +settings: ThemeSettings
 	]
 	
-	[AppStatus]o-[AppStatus]
-	[Enum]&lt;:--[AppStatus]
-	
-	[&lt;abstract&gt;IAppDelegate
-	  |
-	  +dynamic onAppStart()
-	]
+	[ThemeSettingChange]o-[ThemeSettings]
+	[&lt;abstract&gt;Notification]&lt;:-[ThemeSettingChange]
 	
-	[AppController
+	[ThemeProvider
 	  |
-	  +appDelegates: List&lt;IAppDelegate&gt;;
-	  -_delayedFuture: dynamic;
-	  +isInitialized: dynamic
+	  +settings: ValueNotifier&lt;ThemeSettings&gt;;
+	  +lightDynamic: ColorScheme?;
+	  +darkDynamic: ColorScheme?;
+	  +pageTransitionsTheme: PageTransitionsTheme;
+	  +shapeMedium: ShapeBorder
 	  |
-	  +dynamic onAppStart();
-	  -dynamic _callDelegates()
-	]
-	
-	[App
+	  +Color custom();
+	  +Color blend();
+	  +Color source();
+	  +ColorScheme colors();
+	  +CardTheme cardTheme();
+	  +ListTileThemeData listTileTheme();
+	  +AppBarTheme appBarTheme();
+	  +SnackBarThemeData snackBarThemeData();
+	  +TabBarTheme tabBarTheme();
+	  +BottomAppBarTheme bottomAppBarTheme();
+	  +BottomNavigationBarThemeData bottomNavigationBarTheme();
+	  +SwitchThemeData switchTheme();
+	  +InputDecorationTheme inputDecorationTheme();
+	  +TextTheme textTheme();
+	  +DividerThemeData dividerTheme();
+	  +NavigationRailThemeData navigationRailTheme();
+	  +DrawerThemeData drawerTheme();
+	  +IconThemeData iconTheme();
+	  +CheckboxThemeData checkboxTheme();
+	  +RadioThemeData radioTheme();
+	  +TooltipThemeData tooltipTheme();
+	  +ThemeData light();
+	  +ThemeData dark();
+	  +ThemeMode themeMode();
+	  +ThemeData theme();
+	  &lt;static&gt;+ThemeProvider of();
+	  +bool updateShouldNotify()
 	]
 	
-	[AppContent
-	]
+	[ThemeProvider]o-[ValueNotifier]
+	[ThemeProvider]o-[ColorScheme]
+	[ThemeProvider]o-[PageTransitionsTheme]
+	[ThemeProvider]o-[&lt;abstract&gt;ShapeBorder]
+	[&lt;abstract&gt;InheritedWidget]&lt;:-[ThemeProvider]
 	
-	[AuthFormController
-	  |
-	  +authRepository: IAuthRepository;
-	  +notificationService: INotificationService;
-	  +router: GoRouter;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +passwordControl: FormControl&lt;String&gt;;
-	  +passwordConfirmationControl: FormControl&lt;String&gt;;
-	  +termsOfServiceControl: FormControl&lt;bool&gt;;
-	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +loginForm: FormGroup;
-	  +signupForm: FormGroup;
-	  +passwordForgotForm: FormGroup;
-	  +passwordRecoveryForm: FormGroup;
-	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  -_formKey: AuthFormKey;
-	  +formKey: AuthFormKey;
-	  +form: FormGroup
+	[ThemeSettings
 	  |
-	  -dynamic _getFormFor();
-	  -dynamic _onChangeFormKey();
-	  +dynamic resetControlsFor();
-	  -dynamic _forceValidationMessages();
-	  +dynamic signUp();
-	  -dynamic _signUp();
-	  +dynamic signIn();
-	  -dynamic _signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic sendPasswordResetLink();
-	  +dynamic recoverPassword();
-	  +dynamic updateUser();
-	  -dynamic _readDebugUser()
+	  +sourceColor: Color;
+	  +themeMode: ThemeMode
 	]
 	
-	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
-	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
-	[AuthFormController]o-[GoRouter]
-	[AuthFormController]o-[FormControl]
-	[AuthFormController]o-[FormGroup]
-	[AuthFormController]o-[AuthFormKey]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[AuthFormController]
+	[ThemeSettings]o-[Color]
+	[ThemeSettings]o-[ThemeMode]
 	
-	[AuthFormKey
+	[CustomColor
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AuthFormKey&gt;;
-	  &lt;static&gt;+login: AuthFormKey;
-	  &lt;static&gt;+signup: AuthFormKey;
-	  &lt;static&gt;+passwordForgot: AuthFormKey;
-	  &lt;static&gt;+passwordRecovery: AuthFormKey;
-	  &lt;static&gt;-_loginSubmit: AuthFormKey;
-	  &lt;static&gt;-_signupSubmit: AuthFormKey
+	  +name: String;
+	  +color: Color;
+	  +blend: bool
+	  |
+	  +Color value()
 	]
 	
-	[AuthFormKey]o-[AuthFormKey]
-	[Enum]&lt;:--[AuthFormKey]
+	[CustomColor]o-[Color]
 	
-	[PasswordRecoveryForm
+	[SuppressedBehaviorSubject
 	  |
-	  +formKey: AuthFormKey
+	  +subject: BehaviorSubject&lt;T&gt;;
+	  +didSuppressInitialEvent: bool;
+	  -_controller: StreamController&lt;T&gt;
 	  |
-	  +Widget build()
+	  -StreamController&lt;T&gt; _buildDerivedController();
+	  +dynamic close()
 	]
 	
-	[PasswordRecoveryForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
+	[SuppressedBehaviorSubject]o-[BehaviorSubject]
+	[SuppressedBehaviorSubject]o-[StreamController]
 	
-	[PasswordForgotForm
-	  |
-	  +formKey: AuthFormKey
+	[Time
 	  |
-	  +Widget build()
+	  &lt;static&gt;+dynamic fromTimeOfDay();
+	  +Map&lt;String, dynamic&gt; toJson();
+	  &lt;static&gt;+Time fromJson()
 	]
 	
-	[PasswordForgotForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
+	[TimeOfDay]&lt;:-[Time]
 	
-	[LoginForm
-	  |
-	  +formKey: AuthFormKey
+	[TimeValueAccessor
 	  |
-	  +Widget build()
+	  +String modelToViewValue();
+	  +Time? viewToModelValue();
+	  -String _addLeadingZeroIfNeeded()
 	]
 	
-	[LoginForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
+	[&lt;abstract&gt;ControlValueAccessor]&lt;:-[TimeValueAccessor]
 	
-	[EmailTextField
+	[ModelAction
 	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
+	  +type: T;
+	  +label: String;
+	  +icon: IconData?;
+	  +onExecute: Function;
+	  +isAvailable: bool;
+	  +isDestructive: bool
 	]
 	
-	[EmailTextField]o-[FormControl]
+	[ModelAction]o-[IconData]
 	
-	[PasswordTextField
+	[&lt;abstract&gt;IModelActionProvider
 	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
 	]
 	
-	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
-	[PasswordTextField]o-[FormControl]
+	[&lt;abstract&gt;IListActionProvider
+	  |
+	  +void onSelectItem();
+	  +void onNewItem()
+	]
 	
-	[SignupForm
+	[&lt;abstract&gt;IModelActionProvider]&lt;:-[&lt;abstract&gt;IListActionProvider]
+	
+	[ModelActionType
 	  |
-	  +formKey: AuthFormKey
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ModelActionType&gt;;
+	  &lt;static&gt;+edit: ModelActionType;
+	  &lt;static&gt;+delete: ModelActionType;
+	  &lt;static&gt;+remove: ModelActionType;
+	  &lt;static&gt;+duplicate: ModelActionType;
+	  &lt;static&gt;+clipboard: ModelActionType;
+	  &lt;static&gt;+primary: ModelActionType
+	]
+	
+	[ModelActionType]o-[ModelActionType]
+	[Enum]&lt;:--[ModelActionType]
+	
+	[OptimisticUpdate
 	  |
-	  +Widget build();
-	  -dynamic _onClickTermsOfUse();
-	  -dynamic _onClickPrivacyPolicy()
+	  +applyOptimistic: void Function();
+	  +apply: dynamic Function();
+	  +rollback: void Function();
+	  +onUpdate: void Function()?;
+	  +onError: void Function(Object, StackTrace?)?;
+	  +rethrowErrors: bool;
+	  +runOptimistically: bool;
+	  +completeFutureOptimistically: bool
+	  |
+	  +dynamic execute();
+	  -void _runUpdateHandlerIfAny()
 	]
 	
-	[SignupForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
+	[OptimisticUpdate]o-[void Function()]
+	[OptimisticUpdate]o-[dynamic Function()]
+	[OptimisticUpdate]o-[void Function()?]
+	[OptimisticUpdate]o-[void Function(Object, StackTrace?)?]
 	
-	[StudyUJobsToBeDone
+	[&lt;abstract&gt;FileFormatEncoder
 	  |
-	  +Widget build()
+	  +dynamic encodeAsync();
+	  +String encode();
+	  +dynamic call()
 	]
 	
-	[AuthScaffold
+	[CSVStringEncoder
 	  |
-	  +body: Widget;
-	  +formKey: AuthFormKey;
-	  +leftContentMinWidth: double;
-	  +leftPanelMinWidth: double;
-	  +leftPanelPadding: EdgeInsets
+	  +String encode()
 	]
 	
-	[AuthScaffold]o-[&lt;abstract&gt;Widget]
-	[AuthScaffold]o-[AuthFormKey]
-	[AuthScaffold]o-[EdgeInsets]
+	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[CSVStringEncoder]
 	
-	[PublishDialog
+	[JsonStringEncoder
 	  |
-	  +Widget build()
+	  +String encode()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
+	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[JsonStringEncoder]
 	
-	[PublishSuccessDialog
+	[&lt;abstract&gt;ExecutionLimiter
 	  |
-	  +Widget build()
+	  +milliseconds: int;
+	  &lt;static&gt;-_timer: Timer?
+	  |
+	  +void dispose()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
+	[&lt;abstract&gt;ExecutionLimiter]o-[Timer]
 	
-	[PublishConfirmationDialog
+	[Debouncer
 	  |
-	  +Widget build()
+	  +leading: bool;
+	  +cancelUncompleted: bool;
+	  -_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?
+	  |
+	  +dynamic call()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
+	[Debouncer]o-[CancelableOperation]
+	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Debouncer]
 	
-	[FormArrayTable
-	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +items: List&lt;T&gt;;
-	  +onSelectItem: void Function(T);
-	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
-	  +onNewItem: void Function()?;
-	  +rowTitle: String Function(T);
-	  +onNewItemLabel: String;
-	  +sectionTitle: String?;
-	  +sectionDescription: String?;
-	  +emptyIcon: IconData?;
-	  +emptyTitle: String?;
-	  +emptyDescription: String?;
-	  +sectionTitleDivider: bool?;
-	  +rowPrefix: Widget Function(BuildContext, T, int)?;
-	  +rowSuffix: Widget Function(BuildContext, T, int)?;
-	  +leadingWidget: Widget?;
-	  +itemsSectionPadding: EdgeInsets?;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
+	[Throttler
 	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow();
-	  -Widget _newItemButton()
+	  +dynamic call()
 	]
 	
-	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
-	[FormArrayTable]o-[void Function(T)]
-	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
-	[FormArrayTable]o-[void Function()?]
-	[FormArrayTable]o-[String Function(T)]
-	[FormArrayTable]o-[IconData]
-	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
-	[FormArrayTable]o-[&lt;abstract&gt;Widget]
-	[FormArrayTable]o-[EdgeInsets]
+	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Throttler]
 	
-	[&lt;abstract&gt;IFormData
+	[SerializableColor
 	  |
-	  +id: String
+	  +Map&lt;String, dynamic&gt; toJson();
+	  &lt;static&gt;+SerializableColor fromJson()
+	]
+	
+	[Color]&lt;:-[SerializableColor]
+	
+	[&lt;abstract&gt;IProviderArgsResolver
 	  |
-	  +IFormData copy()
+	  +R provide()
 	]
 	
-	[&lt;abstract&gt;ManagedFormViewModel
+	[CombinedStreamNotifier
 	  |
-	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
+	  -_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;
+	  |
+	  +void dispose()
 	]
 	
-	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
+	[ChangeNotifier]&lt;:-[CombinedStreamNotifier]
 	
-	[FormViewModelNotFoundException
+	[CountWhereValidator
+	  |
+	  +predicate: bool Function(T?);
+	  +minCount: int?;
+	  +maxCount: int?;
+	  &lt;static&gt;+kValidationMessageMinCount: String;
+	  &lt;static&gt;+kValidationMessageMaxCount: String
+	  |
+	  +Map&lt;String, dynamic&gt;? validate()
 	]
 	
-	[Exception]&lt;:--[FormViewModelNotFoundException]
+	[CountWhereValidator]o-[bool Function(T?)]
+	[&lt;abstract&gt;Validator]&lt;:-[CountWhereValidator]
 	
-	[FormViewModelCollection
+	[Patterns
 	  |
-	  +formViewModels: List&lt;T&gt;;
-	  +formArray: FormArray&lt;dynamic&gt;;
-	  +stagedViewModels: List&lt;T&gt;;
-	  +retrievableViewModels: List&lt;T&gt;;
-	  +formData: List&lt;D&gt;
+	  &lt;static&gt;+timeFormatString: String;
+	  &lt;static&gt;+emailFormatString: String;
+	  &lt;static&gt;+url: String
+	]
+	
+	[NumericalRangeFormatter
 	  |
-	  +void add();
-	  +T remove();
-	  +T? findWhere();
-	  +T? removeWhere();
-	  +bool contains();
-	  +void stage();
-	  +T commit();
-	  +void reset();
-	  +void read()
+	  +min: int?;
+	  +max: int?
+	  |
+	  +TextEditingValue formatEditUpdate()
 	]
 	
-	[FormViewModelCollection]o-[FormArray]
+	[&lt;abstract&gt;TextInputFormatter]&lt;:-[NumericalRangeFormatter]
 	
-	[FormInvalidException
+	[StudySequenceFormatter
+	  |
+	  +TextEditingValue formatEditUpdate()
 	]
 	
-	[Exception]&lt;:--[FormInvalidException]
+	[&lt;abstract&gt;TextInputFormatter]&lt;:-[StudySequenceFormatter]
 	
-	[FormConfigException
+	[Tuple
 	  |
-	  +message: String?
+	  +first: T1;
+	  +second: T2;
+	  +props: List&lt;Object?&gt;
+	  |
+	  +Map&lt;String, dynamic&gt; toJson();
+	  &lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson();
+	  +Tuple&lt;T1, T2&gt; copy();
+	  +Tuple&lt;T1, T2&gt; copyWith()
 	]
 	
-	[Exception]&lt;:--[FormConfigException]
+	[&lt;abstract&gt;Equatable]&lt;:-[Tuple]
 	
-	[&lt;abstract&gt;IFormViewModelDelegate
+	[&lt;abstract&gt;JsonFileLoader
 	  |
-	  +dynamic onSave();
-	  +void onCancel()
+	  +jsonAssetsPath: String
+	  |
+	  +dynamic loadJson();
+	  +dynamic parseJsonMapFromAssets();
+	  +dynamic parseJsonListFromAssets()
 	]
 	
-	[&lt;abstract&gt;IFormGroupController
+	[&lt;abstract&gt;IAppDelegate
 	  |
-	  +form: FormGroup
+	  +dynamic onAppStart()
 	]
 	
-	[&lt;abstract&gt;IFormGroupController]o-[FormGroup]
+	[AppController
+	  |
+	  +appDelegates: List&lt;IAppDelegate&gt;;
+	  -_delayedFuture: dynamic;
+	  +isInitialized: dynamic
+	  |
+	  +dynamic onAppStart();
+	  -dynamic _callDelegates()
+	]
 	
-	[FormControlOption
+	[StudyMonitorScreen
 	  |
-	  +value: T;
-	  +label: String;
-	  +description: String?;
-	  +props: List&lt;Object?&gt;
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;Equatable]&lt;:-[FormControlOption]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
 	
-	[&lt;abstract&gt;FormViewModel
+	[LoginForm
 	  |
-	  -_formData: T?;
-	  -_formMode: FormMode;
-	  -_validationSet: FormValidationSetEnum?;
-	  +delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?;
-	  +autosave: bool;
-	  -_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;;
-	  -_immediateFormChildrenListenerDebouncer: Debouncer?;
-	  -_autosaveOperation: CancelableOperation&lt;dynamic&gt;?;
-	  -_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  +prevFormValue: Map&lt;String, dynamic&gt;?;
-	  &lt;static&gt;-_formKey: String;
-	  +formData: T?;
-	  +formMode: FormMode;
-	  +isReadonly: bool;
-	  +validationSet: FormValidationSetEnum?;
-	  +isDirty: bool;
-	  +title: String;
-	  +isValid: bool;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;
+	  +formKey: AuthFormKey
 	  |
-	  -dynamic _setFormData();
-	  -dynamic _rememberDefaultControlValidators();
-	  -Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators();
-	  -dynamic _disableAllControls();
-	  -dynamic _formModeUpdated();
-	  -dynamic _restoreControlsFromFormData();
-	  +void revalidate();
-	  -void _applyValidationSet();
-	  +void read();
-	  +dynamic save();
-	  +dynamic cancel();
-	  +void enableAutosave();
-	  +void listenToImmediateFormChildren();
-	  +dynamic markFormGroupChanged();
-	  +void dispose();
-	  +void setControlsFrom();
-	  +T buildFormData();
-	  +void initControls()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;FormViewModel]o-[FormMode]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;FormValidationSetEnum]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;IFormViewModelDelegate]
-	[&lt;abstract&gt;FormViewModel]o-[Debouncer]
-	[&lt;abstract&gt;FormViewModel]o-[CancelableOperation]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[&lt;abstract&gt;FormViewModel]
+	[LoginForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
 	
-	[FormMode
+	[PasswordRecoveryForm
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;FormMode&gt;;
-	  &lt;static&gt;+create: FormMode;
-	  &lt;static&gt;+readonly: FormMode;
-	  &lt;static&gt;+edit: FormMode
+	  +formKey: AuthFormKey
+	  |
+	  +Widget build()
 	]
 	
-	[FormMode]o-[FormMode]
-	[Enum]&lt;:--[FormMode]
+	[PasswordRecoveryForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
 	
-	[CustomFormControl
+	[PasswordForgotForm
 	  |
-	  -_onValueChangedDebouncer: Debouncer?;
-	  -_onStatusChangedDebouncer: Debouncer?;
-	  +onValueChanged: void Function(T?)?;
-	  +onStatusChanged: void Function(ControlStatus)?;
-	  +onStatusChangedDebounceTime: int?;
-	  +onValueChangedDebounceTime: int?
+	  +formKey: AuthFormKey
 	  |
-	  +void dispose()
+	  +Widget build()
 	]
 	
-	[CustomFormControl]o-[Debouncer]
-	[CustomFormControl]o-[void Function(T?)?]
-	[CustomFormControl]o-[void Function(ControlStatus)?]
-	[FormControl]&lt;:-[CustomFormControl]
+	[PasswordForgotForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
 	
-	[UnsavedChangesDialog
+	[SignupForm
 	  |
-	  +Widget build()
+	  +formKey: AuthFormKey
+	  |
+	  +Widget build();
+	  -dynamic _onClickTermsOfUse();
+	  -dynamic _onClickPrivacyPolicy()
 	]
 	
-	[&lt;abstract&gt;FormValidationSetEnum
-	]
+	[SignupForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
 	
-	[FormControlValidation
-	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
-	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
-	  +validationMessages: Map&lt;String, String Function(Object)&gt;
+	[AuthScaffold
 	  |
-	  +FormControlValidation merge()
+	  +body: Widget;
+	  +formKey: AuthFormKey;
+	  +leftContentMinWidth: double;
+	  +leftPanelMinWidth: double;
+	  +leftPanelPadding: EdgeInsets
 	]
 	
-	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
+	[AuthScaffold]o-[&lt;abstract&gt;Widget]
+	[AuthScaffold]o-[AuthFormKey]
+	[AuthScaffold]o-[EdgeInsets]
 	
-	[ScreenerQuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultResponseOptionValidity: bool;
-	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
-	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
-	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
-	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionValues: List&lt;dynamic&gt;;
-	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isDirtyOptionsBannerVisible: bool
+	[EmailTextField
 	  |
-	  +dynamic onResponseOptionsChanged();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
-	  +ScreenerQuestionFormViewModel createDuplicate()
+	  +labelText: String;
+	  +hintText: String?;
+	  +formControlName: String?;
+	  +formControl: FormControl&lt;dynamic&gt;?
 	]
 	
-	[ScreenerQuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
+	[EmailTextField]o-[FormControl]
 	
-	[StudyDesignEnrollmentFormView
+	[PasswordTextField
 	  |
-	  +Widget build();
-	  -dynamic _showScreenerQuestionSidesheetWithArgs();
-	  -dynamic _showConsentItemSidesheetWithArgs()
+	  +labelText: String;
+	  +hintText: String?;
+	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
+	  +formControlName: String?;
+	  +formControl: FormControl&lt;dynamic&gt;?
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
+	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
+	[PasswordTextField]o-[FormControl]
 	
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
+	[StudyUJobsToBeDone
 	  |
-	  +isDirtyOptionsBannerVisible: bool
+	  +Widget build()
 	]
 	
-	[ScreenerQuestionLogicFormView
+	[AuthFormController
 	  |
-	  +formViewModel: ScreenerQuestionFormViewModel
+	  +authRepository: IAuthRepository;
+	  +notificationService: INotificationService;
+	  +router: GoRouter;
+	  +emailControl: FormControl&lt;String&gt;;
+	  +passwordControl: FormControl&lt;String&gt;;
+	  +passwordConfirmationControl: FormControl&lt;String&gt;;
+	  +termsOfServiceControl: FormControl&lt;bool&gt;;
+	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
+	  +loginForm: FormGroup;
+	  +signupForm: FormGroup;
+	  +passwordForgotForm: FormGroup;
+	  +passwordRecoveryForm: FormGroup;
+	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
+	  -_formKey: AuthFormKey;
+	  +formKey: AuthFormKey;
+	  +form: FormGroup
 	  |
-	  +Widget build();
-	  -dynamic _buildInfoBanner();
-	  -dynamic _buildAnswerOptionsLogicControls();
-	  -List&lt;Widget&gt; _buildOptionLogicRow()
+	  -dynamic _getFormFor();
+	  -dynamic _onChangeFormKey();
+	  +dynamic resetControlsFor();
+	  -dynamic _forceValidationMessages();
+	  +dynamic signUp();
+	  -dynamic _signUp();
+	  +dynamic signIn();
+	  -dynamic _signInWith();
+	  +dynamic signOut();
+	  +dynamic resetPasswordForEmail();
+	  +dynamic sendPasswordResetLink();
+	  +dynamic recoverPassword();
+	  +dynamic updateUser();
+	  -dynamic _readDebugUser()
 	]
 	
-	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
+	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
+	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
+	[AuthFormController]o-[GoRouter]
+	[AuthFormController]o-[FormControl]
+	[AuthFormController]o-[FormGroup]
+	[AuthFormController]o-[AuthFormKey]
+	[&lt;abstract&gt;IFormGroupController]&lt;:--[AuthFormController]
 	
-	[ConsentItemFormData
-	  |
-	  +consentId: String;
-	  +title: String;
-	  +description: String;
-	  +iconName: String?;
-	  +id: String
+	[AuthFormKey
 	  |
-	  +ConsentItem toConsentItem();
-	  +ConsentItemFormData copy()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;AuthFormKey&gt;;
+	  &lt;static&gt;+login: AuthFormKey;
+	  &lt;static&gt;+signup: AuthFormKey;
+	  &lt;static&gt;+passwordForgot: AuthFormKey;
+	  &lt;static&gt;+passwordRecovery: AuthFormKey;
+	  &lt;static&gt;-_loginSubmit: AuthFormKey;
+	  &lt;static&gt;-_signupSubmit: AuthFormKey
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
+	[AuthFormKey]o-[AuthFormKey]
+	[Enum]&lt;:--[AuthFormKey]
 	
-	[EnrollmentFormViewModel
+	[AppStatus
 	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
-	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
-	  +consentItemArray: FormArray&lt;dynamic&gt;;
-	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +form: FormGroup;
-	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
-	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestScreener: bool;
-	  +canTestConsent: bool;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
+	  &lt;static&gt;+initializing: AppStatus;
+	  &lt;static&gt;+initialized: AppStatus
+	]
+	
+	[AppStatus]o-[AppStatus]
+	[Enum]&lt;:--[AppStatus]
+	
+	[FormArrayTable
 	  |
-	  +void setControlsFrom();
-	  +EnrollmentFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
-	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
-	  +dynamic testScreener();
-	  +dynamic testConsent();
-	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
+	  +control: AbstractControl&lt;dynamic&gt;;
+	  +items: List&lt;T&gt;;
+	  +onSelectItem: void Function(T);
+	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
+	  +onNewItem: void Function()?;
+	  +rowTitle: String Function(T);
+	  +onNewItemLabel: String;
+	  +sectionTitle: String?;
+	  +sectionDescription: String?;
+	  +emptyIcon: IconData?;
+	  +emptyTitle: String?;
+	  +emptyDescription: String?;
+	  +sectionTitleDivider: bool?;
+	  +rowPrefix: Widget Function(BuildContext, T, int)?;
+	  +rowSuffix: Widget Function(BuildContext, T, int)?;
+	  +leadingWidget: Widget?;
+	  +itemsSectionPadding: EdgeInsets?;
+	  +hideLeadingTrailingWhenEmpty: bool;
+	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
+	  |
+	  +Widget build();
+	  -List&lt;Widget&gt; _buildRow();
+	  -Widget _newItemButton()
 	]
 	
-	[EnrollmentFormViewModel]o-[Study]
-	[EnrollmentFormViewModel]o-[GoRouter]
-	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
-	[EnrollmentFormViewModel]o-[FormControl]
-	[EnrollmentFormViewModel]o-[FormArray]
-	[EnrollmentFormViewModel]o-[FormViewModelCollection]
-	[EnrollmentFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
+	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
+	[FormArrayTable]o-[void Function(T)]
+	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
+	[FormArrayTable]o-[void Function()?]
+	[FormArrayTable]o-[String Function(T)]
+	[FormArrayTable]o-[IconData]
+	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
+	[FormArrayTable]o-[&lt;abstract&gt;Widget]
+	[FormArrayTable]o-[EdgeInsets]
 	
-	[EnrollmentFormConsentItemDelegate
-	  |
-	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +owner: EnrollmentFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
+	[&lt;abstract&gt;ManagedFormViewModel
 	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ConsentItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
+	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
 	]
 	
-	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
-	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
 	
-	[ConsentItemFormViewModel
-	  |
-	  +consentIdControl: FormControl&lt;String&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +form: FormGroup;
-	  +consentId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +ConsentItemFormData buildFormData();
-	  +ConsentItemFormViewModel createDuplicate()
+	[FormViewModelNotFoundException
 	]
 	
-	[ConsentItemFormViewModel]o-[FormControl]
-	[ConsentItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
+	[Exception]&lt;:--[FormViewModelNotFoundException]
 	
-	[ConsentItemFormView
+	[FormViewModelCollection
 	  |
-	  +formViewModel: ConsentItemFormViewModel
+	  +formViewModels: List&lt;T&gt;;
+	  +formArray: FormArray&lt;dynamic&gt;;
+	  +stagedViewModels: List&lt;T&gt;;
+	  +retrievableViewModels: List&lt;T&gt;;
+	  +formData: List&lt;D&gt;
+	  |
+	  +void add();
+	  +T remove();
+	  +T? findWhere();
+	  +T? removeWhere();
+	  +bool contains();
+	  +void stage();
+	  +T commit();
+	  +void reset();
+	  +void read()
 	]
 	
-	[ConsentItemFormView]o-[ConsentItemFormViewModel]
+	[FormViewModelCollection]o-[FormArray]
 	
-	[EnrollmentFormData
+	[CustomFormControl
 	  |
-	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
-	  +enrollmentType: Participation;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
-	  +id: String
+	  -_onValueChangedDebouncer: Debouncer?;
+	  -_onStatusChangedDebouncer: Debouncer?;
+	  +onValueChanged: void Function(T?)?;
+	  +onStatusChanged: void Function(ControlStatus)?;
+	  +onStatusChangedDebounceTime: int?;
+	  +onValueChangedDebounceTime: int?
 	  |
-	  +Study apply();
-	  +EnrollmentFormData copy()
+	  +void dispose()
 	]
 	
-	[EnrollmentFormData]o-[Participation]
-	[EnrollmentFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
+	[CustomFormControl]o-[Debouncer]
+	[CustomFormControl]o-[void Function(T?)?]
+	[CustomFormControl]o-[void Function(ControlStatus)?]
+	[FormControl]&lt;:-[CustomFormControl]
 	
-	[StudyDesignInterventionsFormView
+	[UnsavedChangesDialog
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
-	
-	[InterventionsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +interventionsArray: FormArray&lt;dynamic&gt;;
-	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
-	  +form: FormGroup;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +interventionsRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestStudySchedule: bool
-	  |
-	  +void setControlsFrom();
-	  +InterventionsFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +InterventionFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +dynamic testStudySchedule()
+	[&lt;abstract&gt;FormValidationSetEnum
 	]
 	
-	[InterventionsFormViewModel]o-[Study]
-	[InterventionsFormViewModel]o-[GoRouter]
-	[InterventionsFormViewModel]o-[FormArray]
-	[InterventionsFormViewModel]o-[FormViewModelCollection]
-	[InterventionsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
-	
-	[InterventionFormViewModel
+	[FormControlValidation
 	  |
-	  +study: Study;
-	  +interventionIdControl: FormControl&lt;String&gt;;
-	  +interventionTitleControl: FormControl&lt;String&gt;;
-	  +interventionIconControl: FormControl&lt;IconOption&gt;;
-	  +interventionDescriptionControl: FormControl&lt;String&gt;;
-	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
-	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
-	  +form: FormGroup;
-	  +interventionId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneTask: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +control: AbstractControl&lt;dynamic&gt;;
+	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
+	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
+	  +validationMessages: Map&lt;String, String Function(Object)&gt;
 	  |
-	  +void setControlsFrom();
-	  +InterventionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +InterventionTaskFormViewModel provide();
-	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
-	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
-	  +InterventionFormViewModel createDuplicate()
+	  +FormControlValidation merge()
 	]
 	
-	[InterventionFormViewModel]o-[Study]
-	[InterventionFormViewModel]o-[FormControl]
-	[InterventionFormViewModel]o-[FormArray]
-	[InterventionFormViewModel]o-[FormViewModelCollection]
-	[InterventionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
+	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
 	
-	[InterventionTaskFormData
+	[&lt;abstract&gt;IFormData
 	  |
-	  +taskId: String;
-	  +taskTitle: String;
-	  +taskDescription: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
 	  +id: String
 	  |
-	  +CheckmarkTask toTask();
-	  +InterventionTaskFormData copy()
+	  +IFormData copy()
 	]
 	
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
-	
-	[StudyScheduleFormData
-	  |
-	  +sequenceType: PhaseSequence;
-	  +sequenceTypeCustom: String;
-	  +numCycles: int;
-	  +phaseDuration: int;
-	  +includeBaseline: bool;
-	  +id: String
-	  |
-	  +StudySchedule toStudySchedule();
-	  +Study apply();
-	  +StudyScheduleFormData copy()
+	[FormInvalidException
 	]
 	
-	[StudyScheduleFormData]o-[PhaseSequence]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
+	[Exception]&lt;:--[FormInvalidException]
 	
-	[InterventionPreview
-	  |
-	  +routeArgs: InterventionFormRouteArgs
+	[FormConfigException
 	  |
-	  +Widget build()
+	  +message: String?
 	]
 	
-	[InterventionPreview]o-[InterventionFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
+	[Exception]&lt;:--[FormConfigException]
 	
-	[InterventionTaskFormViewModel
+	[&lt;abstract&gt;IFormViewModelDelegate
 	  |
-	  +taskIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +taskTitleControl: FormControl&lt;String&gt;;
-	  +taskDescriptionControl: FormControl&lt;String&gt;;
-	  +markAsCompletedControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +taskId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +dynamic onSave();
+	  +void onCancel()
+	]
+	
+	[&lt;abstract&gt;IFormGroupController
 	  |
-	  +void setControlsFrom();
-	  +InterventionTaskFormData buildFormData();
-	  +InterventionTaskFormViewModel createDuplicate()
+	  +form: FormGroup
 	]
 	
-	[InterventionTaskFormViewModel]o-[FormControl]
-	[InterventionTaskFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
+	[&lt;abstract&gt;IFormGroupController]o-[FormGroup]
 	
-	[InterventionsFormData
+	[FormControlOption
 	  |
-	  +interventionsData: List&lt;InterventionFormData&gt;;
-	  +studyScheduleData: StudyScheduleFormData;
-	  +id: String
+	  +value: T;
+	  +label: String;
+	  +description: String?;
+	  +props: List&lt;Object?&gt;
+	]
+	
+	[&lt;abstract&gt;Equatable]&lt;:-[FormControlOption]
+	
+	[&lt;abstract&gt;FormViewModel
 	  |
-	  +Study apply();
-	  +InterventionsFormData copy()
+	  -_formData: T?;
+	  -_formMode: FormMode;
+	  -_validationSet: FormValidationSetEnum?;
+	  +delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?;
+	  +autosave: bool;
+	  -_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;;
+	  -_immediateFormChildrenListenerDebouncer: Debouncer?;
+	  -_autosaveOperation: CancelableOperation&lt;dynamic&gt;?;
+	  -_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;;
+	  +prevFormValue: Map&lt;String, dynamic&gt;?;
+	  &lt;static&gt;-_formKey: String;
+	  +formData: T?;
+	  +formMode: FormMode;
+	  +isReadonly: bool;
+	  +validationSet: FormValidationSetEnum?;
+	  +isDirty: bool;
+	  +title: String;
+	  +isValid: bool;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;
+	  |
+	  -dynamic _setFormData();
+	  -dynamic _rememberDefaultControlValidators();
+	  -Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators();
+	  -dynamic _disableAllControls();
+	  -dynamic _formModeUpdated();
+	  -dynamic _restoreControlsFromFormData();
+	  +void revalidate();
+	  -void _applyValidationSet();
+	  +void read();
+	  +dynamic save();
+	  +dynamic cancel();
+	  +void enableAutosave();
+	  +void listenToImmediateFormChildren();
+	  +dynamic markFormGroupChanged();
+	  +void dispose();
+	  +void setControlsFrom();
+	  +T buildFormData();
+	  +void initControls()
 	]
 	
-	[InterventionsFormData]o-[StudyScheduleFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
+	[&lt;abstract&gt;FormViewModel]o-[FormMode]
+	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;FormValidationSetEnum]
+	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;IFormViewModelDelegate]
+	[&lt;abstract&gt;FormViewModel]o-[Debouncer]
+	[&lt;abstract&gt;FormViewModel]o-[CancelableOperation]
+	[&lt;abstract&gt;IFormGroupController]&lt;:--[&lt;abstract&gt;FormViewModel]
 	
-	[InterventionFormView
+	[FormMode
 	  |
-	  +formViewModel: InterventionFormViewModel
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;FormMode&gt;;
+	  &lt;static&gt;+create: FormMode;
+	  &lt;static&gt;+readonly: FormMode;
+	  &lt;static&gt;+edit: FormMode
 	]
 	
-	[InterventionFormView]o-[InterventionFormViewModel]
+	[FormMode]o-[FormMode]
+	[Enum]&lt;:--[FormMode]
 	
-	[&lt;abstract&gt;StudyScheduleControls
+	[EnrolledBadge
 	  |
-	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
-	  &lt;static&gt;+defaultScheduleTypeSequence: String;
-	  &lt;static&gt;+defaultNumCycles: int;
-	  &lt;static&gt;+defaultPeriodLength: int;
-	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
-	  +phaseDurationControl: FormControl&lt;int&gt;;
-	  +numCyclesControl: FormControl&lt;int&gt;;
-	  +includeBaselineControl: FormControl&lt;bool&gt;;
-	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  &lt;static&gt;+kNumCyclesMin: int;
-	  &lt;static&gt;+kNumCyclesMax: int;
-	  &lt;static&gt;+kPhaseDurationMin: int;
-	  &lt;static&gt;+kPhaseDurationMax: int;
-	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +numCyclesRange: dynamic;
-	  +phaseDurationRange: dynamic;
-	  +customSequenceRequired: dynamic
+	  +enrolledCount: int
 	  |
-	  +void setStudyScheduleControlsFrom();
-	  +StudyScheduleFormData buildStudyScheduleFormData();
-	  +bool isSequencingCustom()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
-	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
-	
-	[InterventionTaskFormView
+	[StudyRecruitController
 	  |
-	  +formViewModel: InterventionTaskFormViewModel
+	  +inviteCodeRepository: IInviteCodeRepository;
+	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
+	  |
+	  -dynamic _subscribeInvites();
+	  +Intervention? getIntervention();
+	  +int getParticipantCountForInvite();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void dispose()
 	]
 	
-	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
+	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
+	[StudyRecruitController]o-[StreamSubscription]
+	[StudyBaseController]&lt;:-[StudyRecruitController]
+	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
 	
-	[InterventionFormData
-	  |
-	  +interventionId: String;
-	  +title: String;
-	  +description: String?;
-	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
-	  +iconName: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
+	[StudyRecruitScreen
 	  |
-	  +Intervention toIntervention();
-	  +InterventionFormData copy()
+	  +Widget build();
+	  -Widget _inviteCodesSectionHeader();
+	  -Widget _newInviteCodeButton();
+	  -dynamic _onSelectInvite()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
 	
-	[StudyScheduleFormView
+	[InviteCodeFormView
 	  |
-	  +formViewModel: StudyScheduleControls
+	  +formViewModel: InviteCodeFormViewModel
 	  |
-	  -FormTableRow _renderCustomSequence();
-	  +Widget build()
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
 	]
 	
-	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
+	[InviteCodeFormView]o-[InviteCodeFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
 	
-	[&lt;abstract&gt;IStudyFormData
+	[StudyInvitesTable
 	  |
-	  +Study apply()
+	  +invites: List&lt;StudyInvite&gt;;
+	  +onSelect: void Function(StudyInvite);
+	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
+	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
+	  +getIntervention: Intervention? Function(String);
+	  +getParticipantCountForInvite: int Function(StudyInvite)
+	  |
+	  +Widget build();
+	  -List&lt;Widget&gt; _buildRow()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
+	[StudyInvitesTable]o-[void Function(StudyInvite)]
+	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
+	[StudyInvitesTable]o-[Intervention? Function(String)]
+	[StudyInvitesTable]o-[int Function(StudyInvite)]
 	
-	[StudyInfoFormData
+	[InviteCodeFormViewModel
 	  |
-	  +title: String;
-	  +description: String?;
-	  +iconName: String;
-	  +contactInfoFormData: StudyContactInfoFormData;
-	  +id: String
+	  +study: Study;
+	  +inviteCodeRepository: IInviteCodeRepository;
+	  +codeControl: FormControl&lt;String&gt;;
+	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
+	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
+	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
+	  +interventionAControl: FormControl&lt;String&gt;;
+	  +interventionBControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
+	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
+	  +isPreconfiguredSchedule: bool;
+	  +preconfiguredSchedule: List&lt;String&gt;?
 	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
+	  +void initControls();
+	  -dynamic _uniqueInviteCode();
+	  +void regenerateCode();
+	  -String _generateCode();
+	  +StudyInvite buildFormData();
+	  +void setControlsFrom();
+	  +dynamic save()
 	]
 	
-	[StudyInfoFormData]o-[StudyContactInfoFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
+	[InviteCodeFormViewModel]o-[Study]
+	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
+	[InviteCodeFormViewModel]o-[FormControl]
+	[InviteCodeFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
 	
-	[StudyContactInfoFormData
-	  |
-	  +organization: String?;
-	  +institutionalReviewBoard: String?;
-	  +institutionalReviewBoardNumber: String?;
-	  +researchers: String?;
-	  +email: String?;
-	  +website: String?;
-	  +phone: String?;
-	  +additionalInfo: String?;
-	  +id: String
+	[PublishSuccessDialog
 	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
 	
-	[StudyDesignInfoFormView
+	[PublishDialog
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
 	
-	[StudyInfoFormViewModel
+	[PublishConfirmationDialog
 	  |
-	  +study: Study;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +organizationControl: FormControl&lt;String&gt;;
-	  +reviewBoardControl: FormControl&lt;String&gt;;
-	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
-	  +researchersControl: FormControl&lt;String&gt;;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +websiteControl: FormControl&lt;String&gt;;
-	  +phoneControl: FormControl&lt;String&gt;;
-	  +additionalInfoControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +iconRequired: dynamic;
-	  +organizationRequired: dynamic;
-	  +reviewBoardRequired: dynamic;
-	  +reviewBoardNumberRequired: dynamic;
-	  +researchersRequired: dynamic;
-	  +emailRequired: dynamic;
-	  +phoneRequired: dynamic;
-	  +emailFormat: dynamic;
-	  +websiteFormat: dynamic
-	  |
-	  +void setControlsFrom();
-	  +StudyInfoFormData buildFormData()
+	  +Widget build()
 	]
 	
-	[StudyInfoFormViewModel]o-[Study]
-	[StudyInfoFormViewModel]o-[FormControl]
-	[StudyInfoFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
 	
-	[MeasurementSurveyFormData
+	[FrameControlsWidget
 	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
+	  +onRefresh: void Function()?;
+	  +onOpenNewTab: void Function()?;
+	  +enabled: bool
 	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
+	  +Widget build()
 	]
 	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
+	[FrameControlsWidget]o-[void Function()?]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
 	
-	[MeasurementSurveyFormView
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel
 	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
+	  +studyParticipation: Participation?;
+	  +studyStatus: StudyStatus?
 	]
 	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
 	
-	[MeasurementSurveyFormViewModel
+	[StudyStatusBadge
 	  |
-	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +participation: Participation?;
+	  +status: StudyStatus?;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +showTooltip: bool
 	  |
-	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
+	  +Widget build()
 	]
 	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
+	[StudyStatusBadge]o-[Participation]
+	[StudyStatusBadge]o-[StudyStatus]
+	[StudyStatusBadge]o-[BadgeType]
 	
-	[SurveyPreview
+	[RouteInformation
 	  |
-	  +routeArgs: MeasurementFormRouteArgs
+	  +route: String?;
+	  +extra: String?;
+	  +cmd: String?;
+	  +data: String?
 	  |
-	  +Widget build()
+	  +String toString()
 	]
 	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
-	
-	[StudyDesignMeasurementsFormView
+	[&lt;abstract&gt;PlatformController
 	  |
-	  +Widget build()
+	  +studyId: String;
+	  +baseSrc: String;
+	  +previewSrc: String;
+	  +routeInformation: RouteInformation;
+	  +frameWidget: Widget
+	  |
+	  +void activate();
+	  +void registerViews();
+	  +void generateUrl();
+	  +void navigate();
+	  +void refresh();
+	  +void listen();
+	  +void send();
+	  +void openNewPage()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
+	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
+	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
 	
-	[MeasurementsFormData
+	[WebController
 	  |
-	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
-	  +id: String
+	  +iFrameElement: IFrameElement
 	  |
-	  +Study apply();
-	  +MeasurementsFormData copy()
+	  +void activate();
+	  +void registerViews();
+	  +void generateUrl();
+	  +void navigate();
+	  +void refresh();
+	  +void openNewPage();
+	  +void listen();
+	  +void send()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
+	[WebController]o-[IFrameElement]
+	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
 	
-	[MeasurementsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +measurementsArray: FormArray&lt;dynamic&gt;;
-	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
-	  +form: FormGroup;
-	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +measurementRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
+	[MobileController
 	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +MeasurementsFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +MeasurementSurveyFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave()
+	  +void openNewPage();
+	  +void refresh();
+	  +void registerViews();
+	  +void listen();
+	  +void send();
+	  +void navigate();
+	  +void activate();
+	  +void generateUrl()
 	]
 	
-	[MeasurementsFormViewModel]o-[Study]
-	[MeasurementsFormViewModel]o-[GoRouter]
-	[MeasurementsFormViewModel]o-[FormArray]
-	[MeasurementsFormViewModel]o-[FormViewModelCollection]
-	[MeasurementsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
 	
-	[StudyFormValidationSet
+	[StudyController
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
+	  +notificationService: INotificationService;
+	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
+	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
+	  |
+	  +dynamic syncStudyStatus();
+	  +dynamic onStudySubscriptionUpdate();
+	  -dynamic _redirectNewToActualStudyID();
+	  +dynamic publishStudy();
+	  +void onChangeStudyParticipation();
+	  +void onAddParticipants();
+	  +void onSettingsPressed();
+	  +void dispose()
 	]
 	
-	[Enum]&lt;:--[StudyFormValidationSet]
+	[StudyController]o-[&lt;abstract&gt;INotificationService]
+	[StudyController]o-[StreamSubscription]
+	[StudyBaseController]&lt;:-[StudyController]
 	
-	[ReportsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +reportItemDelegate: ReportFormItemDelegate;
-	  +reportItemArray: FormArray&lt;dynamic&gt;;
-	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +form: FormGroup;
-	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestConsent: bool
+	[&lt;abstract&gt;IStudyNavViewModel
 	  |
-	  +void setControlsFrom();
-	  +ReportsFormData buildFormData();
-	  +void read();
-	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
-	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
-	  +dynamic testReport();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide()
+	  +isEditTabEnabled: bool;
+	  +isTestTabEnabled: bool;
+	  +isRecruitTabEnabled: bool;
+	  +isMonitorTabEnabled: bool;
+	  +isAnalyzeTabEnabled: bool;
+	  +isSettingsEnabled: bool
 	]
 	
-	[ReportsFormViewModel]o-[Study]
-	[ReportsFormViewModel]o-[GoRouter]
-	[ReportsFormViewModel]o-[ReportFormItemDelegate]
-	[ReportsFormViewModel]o-[FormArray]
-	[ReportsFormViewModel]o-[FormViewModelCollection]
-	[ReportsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
-	
-	[ReportFormItemDelegate
+	[StudyNav
 	  |
-	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +owner: ReportsFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
-	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
+	  &lt;static&gt;+dynamic tabs();
+	  &lt;static&gt;+dynamic edit();
+	  &lt;static&gt;+dynamic test();
+	  &lt;static&gt;+dynamic recruit();
+	  &lt;static&gt;+dynamic monitor();
+	  &lt;static&gt;+dynamic analyze()
 	]
 	
-	[ReportFormItemDelegate]o-[FormViewModelCollection]
-	[ReportFormItemDelegate]o-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
-	
-	[ReportItemFormData
-	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
-	  +id: String
+	[StudyDesignNav
 	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
+	  &lt;static&gt;+dynamic tabs();
+	  &lt;static&gt;+dynamic info();
+	  &lt;static&gt;+dynamic enrollment();
+	  &lt;static&gt;+dynamic interventions();
+	  &lt;static&gt;+dynamic measurements();
+	  &lt;static&gt;+dynamic reports()
 	]
 	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
-	
-	[ReportItemFormView
+	[&lt;abstract&gt;StudyPageWidget
 	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
+	  +studyId: String
 	  |
-	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
+	  +Widget? banner()
 	]
 	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
+	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
 	
-	[ReportItemFormViewModel
+	[StudyParticipationBadge
 	  |
-	  &lt;static&gt;+defaultSectionType: ReportSectionType;
-	  +sectionIdControl: FormControl&lt;String&gt;;
-	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +sectionControl: FormControl&lt;ReportSection&gt;;
-	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
-	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
-	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
-	  +alphaControl: FormControl&lt;double&gt;;
-	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +form: FormGroup;
-	  +sectionId: String;
-	  +sectionType: ReportSectionType;
-	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
-	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
-	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +dataReferenceRequired: dynamic;
-	  +aggregationRequired: dynamic;
-	  +improvementDirectionRequired: dynamic;
-	  +alphaConfidenceRequired: dynamic
+	  +participation: Participation;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +center: bool
 	  |
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +ReportItemFormData buildFormData();
-	  +ReportItemFormViewModel createDuplicate();
-	  +dynamic onSectionTypeChanged();
-	  -void _updateFormControls();
-	  +void setControlsFrom()
+	  +Widget build()
 	]
 	
-	[ReportItemFormViewModel]o-[ReportSectionType]
-	[ReportItemFormViewModel]o-[FormControl]
-	[ReportItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
+	[StudyParticipationBadge]o-[Participation]
+	[StudyParticipationBadge]o-[BadgeType]
 	
-	[TemporalAggregationFormatted
+	[StudyBaseController
 	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
+	  +studyId: String;
+	  +studyRepository: IStudyRepository;
+	  +router: GoRouter;
+	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
 	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
+	  +dynamic subscribeStudy();
+	  +dynamic onStudySubscriptionUpdate();
+	  +dynamic onStudySubscriptionError();
+	  +void dispose()
 	]
 	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
+	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
+	[StudyBaseController]o-[GoRouter]
+	[StudyBaseController]o-[StreamSubscription]
 	
-	[ImprovementDirectionFormatted
-	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
+	[PreviewFrame
 	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
+	  +studyId: String;
+	  +routeArgs: StudyFormRouteArgs?;
+	  +route: String?
 	]
 	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
+	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
 	
-	[ReportSectionType
+	[&lt;abstract&gt;IStudyAppBarViewModel
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
+	  +isSyncIndicatorVisible: bool;
+	  +isStatusBadgeVisible: bool;
+	  +isPublishVisible: bool
 	]
 	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
+	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
 	
-	[AverageSectionFormView
+	[StudyScaffold
 	  |
-	  +formViewModel: ReportItemFormViewModel;
 	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
+	  +tabs: List&lt;NavbarTab&gt;?;
+	  +tabsSubnav: List&lt;NavbarTab&gt;?;
+	  +selectedTab: NavbarTab?;
+	  +selectedTabSubnav: NavbarTab?;
+	  +body: StudyPageWidget;
+	  +drawer: Widget?;
+	  +disableActions: bool;
+	  +actionsSpacing: double;
+	  +actionsPadding: double;
+	  +layoutType: SingleColumnLayoutType?;
+	  +appbarHeight: double;
+	  +appbarSubnavHeight: double
 	]
 	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
+	[StudyScaffold]o-[NavbarTab]
+	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
+	[StudyScaffold]o-[&lt;abstract&gt;Widget]
+	[StudyScaffold]o-[SingleColumnLayoutType]
 	
-	[LinearRegressionSectionFormView
+	[WebFrame
 	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
+	  +previewSrc: String;
+	  +studyId: String
 	  |
 	  +Widget build()
 	]
 	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
-	
-	[DataReferenceIdentifier
-	  |
-	  +hashCode: int
+	[DisabledFrame
 	  |
-	  +bool ==()
+	  +Widget build()
 	]
 	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
-	
-	[DataReferenceEditor
+	[PhoneContainer
 	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
+	  &lt;static&gt;+defaultWidth: double;
+	  &lt;static&gt;+defaultHeight: double;
+	  +width: double;
+	  +height: double;
+	  +borderColor: Color;
+	  +borderWidth: double;
+	  +borderRadius: double;
+	  +innerContent: Widget;
+	  +innerContentBackgroundColor: Color?
 	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
+	  +Widget build()
 	]
 	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
+	[PhoneContainer]o-[Color]
+	[PhoneContainer]o-[&lt;abstract&gt;Widget]
 	
-	[ReportsFormData
-	  |
-	  +reportItems: List&lt;ReportItemFormData&gt;;
-	  +id: String
+	[MobileFrame
 	  |
-	  +Study apply();
-	  +ReportsFormData copy()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
-	
-	[ReportStatus
+	[DesktopFrame
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
-	  &lt;static&gt;+primary: ReportStatus;
-	  &lt;static&gt;+secondary: ReportStatus
+	  +Widget build()
 	]
 	
-	[ReportStatus]o-[ReportStatus]
-	[Enum]&lt;:--[ReportStatus]
-	
-	[ReportBadge
+	[StudyTestScreen
 	  |
-	  +status: ReportStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
+	  +previewRoute: String?
 	  |
-	  +Widget build()
+	  +Widget build();
+	  +Widget? banner();
+	  +dynamic load();
+	  +dynamic save();
+	  +dynamic showHelp()
 	]
 	
-	[ReportBadge]o-[ReportStatus]
-	[ReportBadge]o-[BadgeType]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
 	
-	[StudyDesignReportsFormView
+	[StudySettingsFormViewModel
 	  |
-	  +Widget build();
-	  -dynamic _showReportItemSidesheetWithArgs()
+	  +study: AsyncValue&lt;Study&gt;;
+	  +studyRepository: IStudyRepository;
+	  &lt;static&gt;+defaultPublishedToRegistry: bool;
+	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
+	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
+	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void setControlsFrom();
+	  +Study buildFormData();
+	  +dynamic keepControlsSynced();
+	  +dynamic save();
+	  +dynamic setLaunchDefaults()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
+	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
+	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
+	[StudySettingsFormViewModel]o-[FormControl]
+	[StudySettingsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
 	
-	[StudyFormScaffold
+	[StudySettingsDialog
 	  |
-	  +studyId: String;
-	  +formViewModelBuilder: T Function(WidgetRef);
-	  +formViewBuilder: Widget Function(T)
+	  +Widget build()
+	]
+	
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
+	
+	[StudyTestController
 	  |
+	  +authRepository: IAuthRepository;
+	  +languageCode: String
+	]
+	
+	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyBaseController]&lt;:-[StudyTestController]
+	
+	[TestAppRoutes
+	  |
+	  &lt;static&gt;+studyOverview: String;
+	  &lt;static&gt;+eligibility: String;
+	  &lt;static&gt;+intervention: String;
+	  &lt;static&gt;+consent: String;
+	  &lt;static&gt;+journey: String;
+	  &lt;static&gt;+dashboard: String
+	]
+	
+	[DrawerEntry
+	  |
+	  +localizedTitle: String Function();
+	  +icon: IconData?;
+	  +localizedHelpText: String Function()?;
+	  +enabled: bool;
+	  +onSelected: void Function(BuildContext, WidgetRef)?;
+	  +autoCloseDrawer: bool;
+	  +title: String;
+	  +helpText: String?
+	  |
+	  +void onClick()
+	]
+	
+	[DrawerEntry]o-[String Function()]
+	[DrawerEntry]o-[IconData]
+	[DrawerEntry]o-[String Function()?]
+	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
+	
+	[GoRouterDrawerEntry
+	  |
+	  +intent: RoutingIntent;
+	  +onNavigated: void Function()?
+	  |
+	  +void onClick()
+	]
+	
+	[GoRouterDrawerEntry]o-[RoutingIntent]
+	[GoRouterDrawerEntry]o-[void Function()?]
+	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
+	
+	[AppDrawer
+	  |
+	  +width: int;
+	  +autoCloseDrawer: bool;
+	  +leftPaddingEntries: double;
+	  +logoPaddingVertical: double;
+	  +logoPaddingHorizontal: double;
+	  +logoMaxHeight: double;
+	  +logoSectionMinHeight: double;
+	  +logoSectionMaxHeight: double
+	]
+	
+	[StudyAnalyzeScreen
+	  |
+	  +Widget? banner();
 	  +Widget build()
 	]
 	
-	[StudyFormScaffold]o-[T Function(WidgetRef)]
-	[StudyFormScaffold]o-[Widget Function(T)]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
 	
-	[SurveyQuestionFormView
+	[StudyAnalyzeController
 	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
+	  +dynamic onExport()
 	]
 	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
+	[StudyBaseController]&lt;:-[StudyAnalyzeController]
 	
-	[QuestionFormViewModel
+	[StudyDesignInterventionsFormView
 	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
+	  +Widget build()
+	]
+	
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
+	
+	[InterventionFormView
 	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
+	  +formViewModel: InterventionFormViewModel
 	]
 	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
+	[InterventionFormView]o-[InterventionFormViewModel]
 	
-	[&lt;abstract&gt;QuestionFormData
+	[InterventionPreview
 	  |
-	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
-	  +questionId: String;
-	  +questionText: String;
-	  +questionInfoText: String?;
-	  +questionType: SurveyQuestionType;
-	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
-	  +responseOptions: List&lt;dynamic&gt;;
+	  +routeArgs: InterventionFormRouteArgs
+	  |
+	  +Widget build()
+	]
+	
+	[InterventionPreview]o-[InterventionFormRouteArgs]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
+	
+	[StudyScheduleFormView
+	  |
+	  +formViewModel: StudyScheduleControls
+	  |
+	  -FormTableRow _renderCustomSequence();
+	  +Widget build()
+	]
+	
+	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
+	
+	[InterventionTaskFormData
+	  |
+	  +taskId: String;
+	  +taskTitle: String;
+	  +taskDescription: String?;
+	  &lt;static&gt;+kDefaultTitle: String;
 	  +id: String
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +EligibilityCriterion toEligibilityCriterion();
-	  +Answer&lt;dynamic&gt; constructAnswerFor();
-	  +dynamic setResponseOptionsValidityFrom();
-	  +QuestionFormData copy()
+	  +CheckmarkTask toTask();
+	  +InterventionTaskFormData copy()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
+	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
 	
-	[ChoiceQuestionFormData
+	[InterventionsFormViewModel
 	  |
-	  +isMultipleChoice: bool;
-	  +answerOptions: List&lt;String&gt;;
-	  +responseOptions: List&lt;String&gt;
+	  +study: Study;
+	  +router: GoRouter;
+	  +interventionsArray: FormArray&lt;dynamic&gt;;
+	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
+	  +form: FormGroup;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +interventionsRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestStudySchedule: bool
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +QuestionFormData copy();
-	  -Choice _buildChoiceForValue();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +void setControlsFrom();
+	  +InterventionsFormData buildFormData();
+	  +void read();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +InterventionFormViewModel provide();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +dynamic testStudySchedule()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
+	[InterventionsFormViewModel]o-[Study]
+	[InterventionsFormViewModel]o-[GoRouter]
+	[InterventionsFormViewModel]o-[FormArray]
+	[InterventionsFormViewModel]o-[FormViewModelCollection]
+	[InterventionsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
+	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
 	
-	[BoolQuestionFormData
+	[InterventionTaskFormViewModel
 	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
-	  +responseOptions: List&lt;String&gt;
+	  +taskIdControl: FormControl&lt;String&gt;;
+	  +instanceIdControl: FormControl&lt;String&gt;;
+	  +taskTitleControl: FormControl&lt;String&gt;;
+	  +taskDescriptionControl: FormControl&lt;String&gt;;
+	  +markAsCompletedControl: FormControl&lt;bool&gt;;
+	  +form: FormGroup;
+	  +taskId: String;
+	  +instanceId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +BoolQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +void setControlsFrom();
+	  +InterventionTaskFormData buildFormData();
+	  +InterventionTaskFormViewModel createDuplicate()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
+	[InterventionTaskFormViewModel]o-[FormControl]
+	[InterventionTaskFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
+	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
 	
-	[ImageQuestionFormData
+	[&lt;abstract&gt;StudyScheduleControls
 	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
+	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
+	  &lt;static&gt;+defaultScheduleTypeSequence: String;
+	  &lt;static&gt;+defaultNumCycles: int;
+	  &lt;static&gt;+defaultPeriodLength: int;
+	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
+	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
+	  +phaseDurationControl: FormControl&lt;int&gt;;
+	  +numCyclesControl: FormControl&lt;int&gt;;
+	  +includeBaselineControl: FormControl&lt;bool&gt;;
+	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
+	  &lt;static&gt;+kNumCyclesMin: int;
+	  &lt;static&gt;+kNumCyclesMax: int;
+	  &lt;static&gt;+kPhaseDurationMin: int;
+	  &lt;static&gt;+kPhaseDurationMax: int;
+	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
+	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +numCyclesRange: dynamic;
+	  +phaseDurationRange: dynamic;
+	  +customSequenceRequired: dynamic
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +ImageQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +void setStudyScheduleControlsFrom();
+	  +StudyScheduleFormData buildStudyScheduleFormData();
+	  +bool isSequencingCustom()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
+	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
+	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
 	
-	[AudioQuestionFormData
+	[InterventionFormData
 	  |
-	  +maxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
+	  +interventionId: String;
+	  +title: String;
+	  +description: String?;
+	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
+	  +iconName: String?;
+	  &lt;static&gt;+kDefaultTitle: String;
+	  +id: String
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +AudioQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +Intervention toIntervention();
+	  +InterventionFormData copy()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
+	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
 	
-	[ScaleQuestionFormData
+	[StudyScheduleFormData
 	  |
-	  +minValue: double;
-	  +maxValue: double;
-	  +minLabel: String?;
-	  +maxLabel: String?;
-	  +midValues: List&lt;double?&gt;;
-	  +midLabels: List&lt;String?&gt;;
-	  +stepSize: double;
-	  +initialValue: double?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +responseOptions: List&lt;double&gt;;
-	  +midAnnotations: List&lt;Annotation&gt;
+	  +sequenceType: PhaseSequence;
+	  +sequenceTypeCustom: String;
+	  +numCycles: int;
+	  +phaseDuration: int;
+	  +includeBaseline: bool;
+	  +id: String
 	  |
-	  +ScaleQuestion toQuestion();
-	  +QuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +StudySchedule toStudySchedule();
+	  +Study apply();
+	  +StudyScheduleFormData copy()
+	]
+	
+	[StudyScheduleFormData]o-[PhaseSequence]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
+	
+	[InterventionTaskFormView
+	  |
+	  +formViewModel: InterventionTaskFormViewModel
 	]
 	
-	[ScaleQuestionFormData]o-[Color]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
+	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
 	
-	[FreeTextQuestionFormData
+	[InterventionsFormData
 	  |
-	  +textLengthRange: List&lt;int&gt;;
-	  +textType: FreeTextQuestionType;
-	  +textTypeExpression: String?;
-	  +responseOptions: List&lt;String&gt;
+	  +interventionsData: List&lt;InterventionFormData&gt;;
+	  +studyScheduleData: StudyScheduleFormData;
+	  +id: String
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +FreeTextQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +Study apply();
+	  +InterventionsFormData copy()
 	]
 	
-	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
+	[InterventionsFormData]o-[StudyScheduleFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
 	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
+	[InterventionFormViewModel
 	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
+	  +study: Study;
+	  +interventionIdControl: FormControl&lt;String&gt;;
+	  +interventionTitleControl: FormControl&lt;String&gt;;
+	  +interventionIconControl: FormControl&lt;IconOption&gt;;
+	  +interventionDescriptionControl: FormControl&lt;String&gt;;
+	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
+	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
+	  +form: FormGroup;
+	  +interventionId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +atLeastOneTask: dynamic;
+	  +breadcrumbsTitle: String;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  +void setControlsFrom();
+	  +InterventionFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +InterventionTaskFormViewModel provide();
+	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
+	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
+	  +InterventionFormViewModel createDuplicate()
 	]
 	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
+	[InterventionFormViewModel]o-[Study]
+	[InterventionFormViewModel]o-[FormControl]
+	[InterventionFormViewModel]o-[FormArray]
+	[InterventionFormViewModel]o-[FormViewModelCollection]
+	[InterventionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
 	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
+	[StudyDesignReportsFormView
 	  |
 	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
+	  -dynamic _showReportItemSidesheetWithArgs()
 	]
 	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
 	
-	[BoolQuestionFormView
+	[ReportItemFormData
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  +isPrimary: bool;
+	  +section: ReportSection;
+	  +id: String
 	  |
-	  +Widget build()
+	  &lt;static&gt;+dynamic fromDomainModel();
+	  +ReportItemFormData copy()
 	]
 	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
+	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
+	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
 	
-	[SurveyQuestionType
+	[DataReferenceEditor
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
+	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
+	  +availableTasks: List&lt;Task&gt;;
+	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
+	  |
+	  +FormTableRow buildFormTableRow();
+	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
 	]
 	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
+	[DataReferenceEditor]o-[FormControl]
+	[DataReferenceEditor]o-[ReactiveDropdownField]
 	
-	[AudioRecordingQuestionFormView
+	[TemporalAggregationFormatted
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  -_value: TemporalAggregation;
+	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
+	  +value: TemporalAggregation;
+	  +string: String;
+	  +icon: IconData?;
+	  +hashCode: int
 	  |
-	  +Widget build()
+	  +bool ==();
+	  +String toString();
+	  +String toJson();
+	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
 	]
 	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
+	[TemporalAggregationFormatted]o-[TemporalAggregation]
+	[TemporalAggregationFormatted]o-[IconData]
 	
-	[ChoiceQuestionFormView
+	[ImprovementDirectionFormatted
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  -_value: ImprovementDirection;
+	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
+	  +value: ImprovementDirection;
+	  +string: String;
+	  +icon: IconData?;
+	  +hashCode: int
 	  |
-	  +Widget build()
+	  +bool ==();
+	  +String toString();
+	  +String toJson();
+	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
 	]
 	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
+	[ImprovementDirectionFormatted]o-[ImprovementDirection]
+	[ImprovementDirectionFormatted]o-[IconData]
 	
-	[ImageCapturingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
+	[ReportSectionType
 	  |
-	  +Widget build()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
+	  &lt;static&gt;+average: ReportSectionType;
+	  &lt;static&gt;+linearRegression: ReportSectionType
 	]
 	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
+	[ReportSectionType]o-[ReportSectionType]
+	[Enum]&lt;:--[ReportSectionType]
 	
-	[&lt;abstract&gt;WithQuestionnaireControls
+	[AverageSectionFormView
 	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
 	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
-	  +void read();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[AverageSectionFormView]o-[ReportItemFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
 	
-	[QuestionnaireFormData
+	[DataReferenceIdentifier
 	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
+	  +hashCode: int
 	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
+	  +bool ==()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
+	[DataReference]&lt;:-[DataReferenceIdentifier]
 	
-	[ScheduleControls
+	[LinearRegressionSectionFormView
 	  |
-	  +formViewModel: WithScheduleControls
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
 	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
+	  +Widget build()
 	]
 	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
+	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
 	
-	[&lt;abstract&gt;IFormDataWithSchedule
+	[ReportItemFormViewModel
 	  |
-	  +instanceId: String;
-	  +isTimeLocked: bool;
-	  +timeLockStart: StudyUTimeOfDay?;
-	  +timeLockEnd: StudyUTimeOfDay?;
-	  +hasReminder: bool;
-	  +reminderTime: StudyUTimeOfDay?
+	  &lt;static&gt;+defaultSectionType: ReportSectionType;
+	  +sectionIdControl: FormControl&lt;String&gt;;
+	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +sectionControl: FormControl&lt;ReportSection&gt;;
+	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
+	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
+	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
+	  +alphaControl: FormControl&lt;double&gt;;
+	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +form: FormGroup;
+	  +sectionId: String;
+	  +sectionType: ReportSectionType;
+	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
+	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
+	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +dataReferenceRequired: dynamic;
+	  +aggregationRequired: dynamic;
+	  +improvementDirectionRequired: dynamic;
+	  +alphaConfidenceRequired: dynamic
 	  |
-	  +Schedule toSchedule()
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +ReportItemFormData buildFormData();
+	  +ReportItemFormViewModel createDuplicate();
+	  +dynamic onSectionTypeChanged();
+	  -void _updateFormControls();
+	  +void setControlsFrom()
 	]
 	
-	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
+	[ReportItemFormViewModel]o-[ReportSectionType]
+	[ReportItemFormViewModel]o-[FormControl]
+	[ReportItemFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
 	
-	[&lt;abstract&gt;WithScheduleControls
+	[ReportItemFormView
 	  |
-	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
-	  +instanceID: FormControl&lt;String&gt;;
-	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +hasReminderControl: FormControl&lt;bool&gt;;
-	  +reminderTimeControl: FormControl&lt;Time&gt;;
-	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
-	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
-	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  +hasReminder: bool;
-	  +isTimeRestricted: bool;
-	  +timeRestriction: List&lt;Time&gt;?
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: dynamic;
+	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
 	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
+	  +Widget build();
+	  -dynamic _buildSectionText();
+	  -dynamic _buildSectionTypeHeader()
 	]
 	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
+	[ReportItemFormView]o-[ReportItemFormViewModel]
+	[ReportItemFormView]o-[Widget Function(BuildContext)]
 	
-	[StudyFormViewModel
+	[ReportsFormViewModel
 	  |
-	  +studyDirtyCopy: Study?;
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
+	  +study: Study;
 	  +router: GoRouter;
-	  +studyInfoFormViewModel: StudyInfoFormViewModel;
-	  +enrollmentFormViewModel: EnrollmentFormViewModel;
-	  +measurementsFormViewModel: MeasurementsFormViewModel;
-	  +reportsFormViewModel: ReportsFormViewModel;
-	  +interventionsFormViewModel: InterventionsFormViewModel;
+	  +reportItemDelegate: ReportFormItemDelegate;
+	  +reportItemArray: FormArray&lt;dynamic&gt;;
+	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
 	  +form: FormGroup;
-	  +isStudyReadonly: bool;
+	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
 	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestConsent: bool
 	  |
-	  +void read();
 	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +void dispose();
+	  +ReportsFormData buildFormData();
+	  +void read();
+	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
+	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
+	  +dynamic testReport();
 	  +void onCancel();
 	  +dynamic onSave();
-	  -dynamic _applyAndSaveSubform()
+	  +ReportItemFormViewModel provide()
 	]
 	
-	[StudyFormViewModel]o-[Study]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyFormViewModel]o-[GoRouter]
-	[StudyFormViewModel]o-[StudyInfoFormViewModel]
-	[StudyFormViewModel]o-[EnrollmentFormViewModel]
-	[StudyFormViewModel]o-[MeasurementsFormViewModel]
-	[StudyFormViewModel]o-[ReportsFormViewModel]
-	[StudyFormViewModel]o-[InterventionsFormViewModel]
-	[StudyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
+	[ReportsFormViewModel]o-[Study]
+	[ReportsFormViewModel]o-[GoRouter]
+	[ReportsFormViewModel]o-[ReportFormItemDelegate]
+	[ReportsFormViewModel]o-[FormArray]
+	[ReportsFormViewModel]o-[FormViewModelCollection]
+	[ReportsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget
+	[ReportFormItemDelegate
 	  |
-	  +Widget? banner()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
-	
-	[StudyAnalyzeScreen
+	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
+	  +owner: ReportsFormViewModel;
+	  +propagateOnSave: bool;
+	  +validationSet: dynamic
 	  |
-	  +Widget? banner();
-	  +Widget build()
+	  +void onCancel();
+	  +dynamic onSave();
+	  +ReportItemFormViewModel provide();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
+	[ReportFormItemDelegate]o-[FormViewModelCollection]
+	[ReportFormItemDelegate]o-[ReportsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
 	
-	[StudyAnalyzeController
+	[ReportBadge
 	  |
-	  +dynamic onExport()
-	]
-	
-	[StudyBaseController]&lt;:-[StudyAnalyzeController]
-	
-	[StudyMonitorScreen
+	  +status: ReportStatus?;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +showTooltip: bool
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
+	[ReportBadge]o-[ReportStatus]
+	[ReportBadge]o-[BadgeType]
 	
-	[StudiesTableItem
+	[ReportsFormData
 	  |
-	  +study: Study;
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
-	  +isPinned: bool;
-	  +onPinnedChanged: void Function(Study, bool)?;
-	  +onTap: void Function(Study)?
+	  +reportItems: List&lt;ReportItemFormData&gt;;
+	  +id: String
+	  |
+	  +Study apply();
+	  +ReportsFormData copy()
 	]
 	
-	[StudiesTableItem]o-[Study]
-	[StudiesTableItem]o-[void Function(Study, bool)?]
-	[StudiesTableItem]o-[void Function(Study)?]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
 	
-	[DashboardController
-	  |
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +userRepository: IUserRepository;
-	  +router: GoRouter;
-	  -_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?;
-	  +searchController: SearchController;
-	  +isSortAscending: bool
+	[ReportStatus
 	  |
-	  -dynamic _subscribeStudies();
-	  +dynamic setSearchText();
-	  +dynamic setStudiesFilter();
-	  +dynamic onSelectStudy();
-	  +dynamic onClickNewStudy();
-	  +dynamic pinStudy();
-	  +dynamic pinOffStudy();
-	  +void setSorting();
-	  +void filterStudies();
-	  +void sortStudies();
-	  +bool isSortingActiveForColumn();
-	  +bool isPinned();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void dispose()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
+	  &lt;static&gt;+primary: ReportStatus;
+	  &lt;static&gt;+secondary: ReportStatus
 	]
 	
-	[DashboardController]o-[&lt;abstract&gt;IStudyRepository]
-	[DashboardController]o-[&lt;abstract&gt;IAuthRepository]
-	[DashboardController]o-[&lt;abstract&gt;IUserRepository]
-	[DashboardController]o-[GoRouter]
-	[DashboardController]o-[StreamSubscription]
-	[DashboardController]o-[SearchController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
+	[ReportStatus]o-[ReportStatus]
+	[Enum]&lt;:--[ReportStatus]
 	
-	[StudiesTableColumnSize
-	  |
-	  +collapsed: bool;
-	  +flex: int?;
-	  +width: double?
+	[&lt;abstract&gt;IStudyFormData
 	  |
-	  +Widget createContainer()
+	  +Study apply()
 	]
 	
-	[StudiesTable
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
+	
+	[StudyInfoFormViewModel
 	  |
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +compactWidthThreshold: double;
-	  +superCompactWidthThreshold: double;
-	  +compactStatTitleThreshold: double;
-	  +studies: List&lt;Study&gt;;
-	  +onSelect: void Function(Study);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study);
-	  +emptyWidget: Widget;
-	  +pinnedStudies: Iterable&lt;String&gt;;
-	  +dashboardController: DashboardController
+	  +study: Study;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +iconControl: FormControl&lt;IconOption&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +organizationControl: FormControl&lt;String&gt;;
+	  +reviewBoardControl: FormControl&lt;String&gt;;
+	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
+	  +researchersControl: FormControl&lt;String&gt;;
+	  +emailControl: FormControl&lt;String&gt;;
+	  +websiteControl: FormControl&lt;String&gt;;
+	  +phoneControl: FormControl&lt;String&gt;;
+	  +additionalInfoControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +iconRequired: dynamic;
+	  +organizationRequired: dynamic;
+	  +reviewBoardRequired: dynamic;
+	  +reviewBoardNumberRequired: dynamic;
+	  +researchersRequired: dynamic;
+	  +emailRequired: dynamic;
+	  +phoneRequired: dynamic;
+	  +emailFormat: dynamic;
+	  +websiteFormat: dynamic
 	  |
-	  +Widget build();
-	  -Widget _buildColumnHeader()
+	  +void setControlsFrom();
+	  +StudyInfoFormData buildFormData()
 	]
 	
-	[StudiesTable]o-[void Function(Study)]
-	[StudiesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)]
-	[StudiesTable]o-[&lt;abstract&gt;Widget]
-	[StudiesTable]o-[DashboardController]
+	[StudyInfoFormViewModel]o-[Study]
+	[StudyInfoFormViewModel]o-[FormControl]
+	[StudyInfoFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
 	
-	[StudiesTableColumn
+	[StudyDesignInfoFormView
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesTableColumn&gt;;
-	  &lt;static&gt;+pin: StudiesTableColumn;
-	  &lt;static&gt;+title: StudiesTableColumn;
-	  &lt;static&gt;+status: StudiesTableColumn;
-	  &lt;static&gt;+participation: StudiesTableColumn;
-	  &lt;static&gt;+createdAt: StudiesTableColumn;
-	  &lt;static&gt;+enrolled: StudiesTableColumn;
-	  &lt;static&gt;+active: StudiesTableColumn;
-	  &lt;static&gt;+completed: StudiesTableColumn;
-	  &lt;static&gt;+action: StudiesTableColumn
+	  +Widget build()
 	]
 	
-	[StudiesTableColumn]o-[StudiesTableColumn]
-	[Enum]&lt;:--[StudiesTableColumn]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
 	
-	[DashboardScreen
+	[StudyInfoFormData
 	  |
-	  +filter: StudiesFilter?
+	  +title: String;
+	  +description: String?;
+	  +iconName: String;
+	  +contactInfoFormData: StudyContactInfoFormData;
+	  +id: String
+	  |
+	  +Study apply();
+	  +StudyInfoFormData copy()
 	]
 	
-	[DashboardScreen]o-[StudiesFilter]
+	[StudyInfoFormData]o-[StudyContactInfoFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
 	
-	[DashboardScaffold
+	[StudyContactInfoFormData
 	  |
-	  &lt;static&gt;+compactWidthThreshold: double;
-	  +body: Widget
+	  +organization: String?;
+	  +institutionalReviewBoard: String?;
+	  +institutionalReviewBoardNumber: String?;
+	  +researchers: String?;
+	  +email: String?;
+	  +website: String?;
+	  +phone: String?;
+	  +additionalInfo: String?;
+	  +id: String
 	  |
-	  +Widget build()
+	  +Study apply();
+	  +StudyInfoFormData copy()
 	]
 	
-	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
 	
-	[StudiesFilter
+	[StudyFormValidationSet
 	  |
 	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
+	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
 	]
 	
-	[Enum]&lt;:--[StudiesFilter]
+	[Enum]&lt;:--[StudyFormValidationSet]
 	
-	[StudiesTableColumnHeader
+	[MeasurementsFormData
 	  |
-	  +title: String;
-	  +sortable: bool;
-	  +sortAscending: bool;
-	  +sortingActive: bool;
-	  +onSort: void Function()?
+	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
+	  +id: String
+	  |
+	  +Study apply();
+	  +MeasurementsFormData copy()
 	]
 	
-	[StudiesTableColumnHeader]o-[void Function()?]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
 	
-	[AccountSettingsDialog
+	[MeasurementSurveyFormView
 	  |
-	  +Widget build()
+	  +formViewModel: MeasurementSurveyFormViewModel
 	]
 	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AccountSettingsDialog]
+	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
 	
-	[StudyInvitesTable
+	[SurveyPreview
 	  |
-	  +invites: List&lt;StudyInvite&gt;;
-	  +onSelect: void Function(StudyInvite);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getIntervention: Intervention? Function(String);
-	  +getParticipantCountForInvite: int Function(StudyInvite)
+	  +routeArgs: MeasurementFormRouteArgs
 	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow()
+	  +Widget build()
 	]
 	
-	[StudyInvitesTable]o-[void Function(StudyInvite)]
-	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
-	[StudyInvitesTable]o-[Intervention? Function(String)]
-	[StudyInvitesTable]o-[int Function(StudyInvite)]
+	[SurveyPreview]o-[MeasurementFormRouteArgs]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
 	
-	[StudyRecruitController
+	[MeasurementSurveyFormData
 	  |
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
+	  +measurementId: String;
+	  +title: String;
+	  +introText: String?;
+	  +outroText: String?;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  &lt;static&gt;+kDefaultTitle: String;
+	  +id: String
 	  |
-	  -dynamic _subscribeInvites();
-	  +Intervention? getIntervention();
-	  +int getParticipantCountForInvite();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void dispose()
+	  +QuestionnaireTask toQuestionnaireTask();
+	  +MeasurementSurveyFormData copy()
 	]
 	
-	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[StudyRecruitController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyRecruitController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
+	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
 	
-	[InviteCodeFormViewModel
+	[MeasurementSurveyFormViewModel
 	  |
 	  +study: Study;
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  +codeControl: FormControl&lt;String&gt;;
-	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
-	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +interventionAControl: FormControl&lt;String&gt;;
-	  +interventionBControl: FormControl&lt;String&gt;;
+	  +measurementIdControl: FormControl&lt;String&gt;;
+	  +instanceIdControl: FormControl&lt;String&gt;;
+	  +surveyTitleControl: FormControl&lt;String&gt;;
+	  +surveyIntroTextControl: FormControl&lt;String&gt;;
+	  +surveyOutroTextControl: FormControl&lt;String&gt;;
 	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
-	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +isPreconfiguredSchedule: bool;
-	  +preconfiguredSchedule: List&lt;String&gt;?
+	  +measurementId: String;
+	  +instanceId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +atLeastOneQuestion: dynamic;
+	  +breadcrumbsTitle: String;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +void initControls();
-	  -dynamic _uniqueInviteCode();
-	  +void regenerateCode();
-	  -String _generateCode();
-	  +StudyInvite buildFormData();
 	  +void setControlsFrom();
-	  +dynamic save()
+	  +MeasurementSurveyFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
+	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
+	  +MeasurementSurveyFormViewModel createDuplicate()
 	]
 	
-	[InviteCodeFormViewModel]o-[Study]
-	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[InviteCodeFormViewModel]o-[FormControl]
-	[InviteCodeFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
+	[MeasurementSurveyFormViewModel]o-[Study]
+	[MeasurementSurveyFormViewModel]o-[FormControl]
+	[MeasurementSurveyFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
 	
-	[EnrolledBadge
-	  |
-	  +enrolledCount: int
+	[StudyDesignMeasurementsFormView
 	  |
 	  +Widget build()
 	]
 	
-	[InviteCodeFormView
-	  |
-	  +formViewModel: InviteCodeFormViewModel
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
-	]
-	
-	[InviteCodeFormView]o-[InviteCodeFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
-	
-	[StudyRecruitScreen
-	  |
-	  +Widget build();
-	  -Widget _inviteCodesSectionHeader();
-	  -Widget _newInviteCodeButton();
-	  -dynamic _onSelectInvite()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
 	
-	[DrawerEntry
+	[MeasurementsFormViewModel
 	  |
-	  +localizedTitle: String Function();
-	  +icon: IconData?;
-	  +localizedHelpText: String Function()?;
-	  +enabled: bool;
-	  +onSelected: void Function(BuildContext, WidgetRef)?;
-	  +autoCloseDrawer: bool;
-	  +title: String;
-	  +helpText: String?
+	  +study: Study;
+	  +router: GoRouter;
+	  +measurementsArray: FormArray&lt;dynamic&gt;;
+	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
+	  +form: FormGroup;
+	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +measurementRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +void onClick()
+	  +void read();
+	  +void setControlsFrom();
+	  +MeasurementsFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +MeasurementSurveyFormViewModel provide();
+	  +void onCancel();
+	  +dynamic onSave()
 	]
 	
-	[DrawerEntry]o-[String Function()]
-	[DrawerEntry]o-[IconData]
-	[DrawerEntry]o-[String Function()?]
-	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
+	[MeasurementsFormViewModel]o-[Study]
+	[MeasurementsFormViewModel]o-[GoRouter]
+	[MeasurementsFormViewModel]o-[FormArray]
+	[MeasurementsFormViewModel]o-[FormViewModelCollection]
+	[MeasurementsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
 	
-	[GoRouterDrawerEntry
+	[StudyFormScaffold
 	  |
-	  +intent: RoutingIntent;
-	  +onNavigated: void Function()?
+	  +studyId: String;
+	  +formViewModelBuilder: T Function(WidgetRef);
+	  +formViewBuilder: Widget Function(T)
 	  |
-	  +void onClick()
+	  +Widget build()
 	]
 	
-	[GoRouterDrawerEntry]o-[RoutingIntent]
-	[GoRouterDrawerEntry]o-[void Function()?]
-	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
+	[StudyFormScaffold]o-[T Function(WidgetRef)]
+	[StudyFormScaffold]o-[Widget Function(T)]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
 	
-	[AppDrawer
+	[ConsentItemFormViewModel
+	  |
+	  +consentIdControl: FormControl&lt;String&gt;;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +iconControl: FormControl&lt;IconOption&gt;;
+	  +form: FormGroup;
+	  +consentId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +width: int;
-	  +autoCloseDrawer: bool;
-	  +leftPaddingEntries: double;
-	  +logoPaddingVertical: double;
-	  +logoPaddingHorizontal: double;
-	  +logoMaxHeight: double;
-	  +logoSectionMinHeight: double;
-	  +logoSectionMaxHeight: double
+	  +void setControlsFrom();
+	  +ConsentItemFormData buildFormData();
+	  +ConsentItemFormViewModel createDuplicate()
 	]
 	
-	[NotificationDispatcher
+	[ConsentItemFormViewModel]o-[FormControl]
+	[ConsentItemFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
+	
+	[StudyDesignEnrollmentFormView
 	  |
-	  +child: Widget?;
-	  +snackbarInnerPadding: double;
-	  +snackbarWidth: double?;
-	  +snackbarBehavior: SnackBarBehavior;
-	  +snackbarDefaultDuration: int
+	  +Widget build();
+	  -dynamic _showScreenerQuestionSidesheetWithArgs();
+	  -dynamic _showConsentItemSidesheetWithArgs()
 	]
 	
-	[NotificationDispatcher]o-[&lt;abstract&gt;Widget]
-	[NotificationDispatcher]o-[SnackBarBehavior]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
 	
-	[Notifications
+	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
 	  |
-	  &lt;static&gt;+credentialsInvalid: SnackbarIntent;
-	  &lt;static&gt;+userAlreadyRegistered: SnackbarIntent;
-	  &lt;static&gt;+passwordReset: SnackbarIntent;
-	  &lt;static&gt;+passwordResetSuccess: SnackbarIntent;
-	  &lt;static&gt;+studyDeleted: SnackbarIntent;
-	  &lt;static&gt;+inviteCodeDeleted: SnackbarIntent;
-	  &lt;static&gt;+inviteCodeClipped: SnackbarIntent;
-	  &lt;static&gt;+studyDeleteConfirmation: AlertIntent
+	  +isDirtyOptionsBannerVisible: bool
 	]
 	
-	[Notifications]o-[SnackbarIntent]
-	[Notifications]o-[AlertIntent]
-	
-	[NotificationDefaultActions
+	[ScreenerQuestionLogicFormView
 	  |
-	  &lt;static&gt;+cancel: NotificationAction
+	  +formViewModel: ScreenerQuestionFormViewModel
+	  |
+	  +Widget build();
+	  -dynamic _buildInfoBanner();
+	  -dynamic _buildAnswerOptionsLogicControls();
+	  -List&lt;Widget&gt; _buildOptionLogicRow()
 	]
 	
-	[NotificationDefaultActions]o-[NotificationAction]
+	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
 	
-	[&lt;abstract&gt;NotificationIntent
+	[ConsentItemFormData
 	  |
-	  +message: String?;
-	  +customContent: Widget?;
-	  +icon: IconData?;
-	  +actions: List&lt;NotificationAction&gt;?;
-	  +type: NotificationType
+	  +consentId: String;
+	  +title: String;
+	  +description: String;
+	  +iconName: String?;
+	  +id: String
 	  |
-	  +void register()
+	  +ConsentItem toConsentItem();
+	  +ConsentItemFormData copy()
 	]
 	
-	[&lt;abstract&gt;NotificationIntent]o-[&lt;abstract&gt;Widget]
-	[&lt;abstract&gt;NotificationIntent]o-[IconData]
-	[&lt;abstract&gt;NotificationIntent]o-[NotificationType]
+	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
 	
-	[NotificationAction
+	[ConsentItemFormView
 	  |
-	  +label: String;
-	  +onSelect: dynamic Function();
-	  +isDestructive: bool
+	  +formViewModel: ConsentItemFormViewModel
 	]
 	
-	[NotificationAction]o-[dynamic Function()]
+	[ConsentItemFormView]o-[ConsentItemFormViewModel]
 	
-	[SnackbarIntent
+	[EnrollmentFormData
 	  |
-	  +duration: int?
+	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
+	  +enrollmentType: Participation;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
+	  +id: String
+	  |
+	  +Study apply();
+	  +EnrollmentFormData copy()
 	]
 	
-	[&lt;abstract&gt;NotificationIntent]&lt;:-[SnackbarIntent]
+	[EnrollmentFormData]o-[Participation]
+	[EnrollmentFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
 	
-	[AlertIntent
+	[ScreenerQuestionFormViewModel
 	  |
-	  +title: String;
-	  +dismissOnAction: bool;
-	  +isDestructive: dynamic
+	  &lt;static&gt;+defaultResponseOptionValidity: bool;
+	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
+	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
+	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
+	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +prevResponseOptionValues: List&lt;dynamic&gt;;
+	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isDirtyOptionsBannerVisible: bool
+	  |
+	  +dynamic onResponseOptionsChanged();
+	  +void setControlsFrom();
+	  +QuestionFormData buildFormData();
+	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
+	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
+	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
+	  +ScreenerQuestionFormViewModel createDuplicate()
 	]
 	
-	[&lt;abstract&gt;NotificationIntent]&lt;:-[AlertIntent]
+	[ScreenerQuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
+	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
 	
-	[NotificationType
+	[EnrollmentFormViewModel
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;NotificationType&gt;;
-	  &lt;static&gt;+snackbar: NotificationType;
-	  &lt;static&gt;+alert: NotificationType;
-	  &lt;static&gt;+custom: NotificationType
+	  +study: Study;
+	  +router: GoRouter;
+	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
+	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
+	  +consentItemArray: FormArray&lt;dynamic&gt;;
+	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
+	  +form: FormGroup;
+	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
+	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestScreener: bool;
+	  +canTestConsent: bool;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  |
+	  +void setControlsFrom();
+	  +EnrollmentFormData buildFormData();
+	  +void read();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
+	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
+	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
+	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
+	  +dynamic testScreener();
+	  +dynamic testConsent();
+	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
 	]
 	
-	[NotificationType]o-[NotificationType]
-	[Enum]&lt;:--[NotificationType]
+	[EnrollmentFormViewModel]o-[Study]
+	[EnrollmentFormViewModel]o-[GoRouter]
+	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
+	[EnrollmentFormViewModel]o-[FormControl]
+	[EnrollmentFormViewModel]o-[FormArray]
+	[EnrollmentFormViewModel]o-[FormViewModelCollection]
+	[EnrollmentFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
 	
-	[&lt;abstract&gt;IClipboardService
+	[EnrollmentFormConsentItemDelegate
 	  |
-	  +dynamic copy()
-	]
-	
-	[ClipboardService
+	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
+	  +owner: EnrollmentFormViewModel;
+	  +propagateOnSave: bool;
+	  +validationSet: dynamic
 	  |
-	  +dynamic copy()
+	  +void onCancel();
+	  +dynamic onSave();
+	  +ConsentItemFormViewModel provide();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem()
 	]
 	
-	[&lt;abstract&gt;IClipboardService]&lt;:--[ClipboardService]
+	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
+	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
 	
-	[&lt;abstract&gt;INotificationService
+	[StudyFormViewModel
 	  |
-	  +void showMessage();
-	  +void show();
-	  +Stream&lt;NotificationIntent&gt; watchNotifications();
-	  +void dispose()
+	  +studyDirtyCopy: Study?;
+	  +studyRepository: IStudyRepository;
+	  +authRepository: IAuthRepository;
+	  +router: GoRouter;
+	  +studyInfoFormViewModel: StudyInfoFormViewModel;
+	  +enrollmentFormViewModel: EnrollmentFormViewModel;
+	  +measurementsFormViewModel: MeasurementsFormViewModel;
+	  +reportsFormViewModel: ReportsFormViewModel;
+	  +interventionsFormViewModel: InterventionsFormViewModel;
+	  +form: FormGroup;
+	  +isStudyReadonly: bool;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void read();
+	  +void setControlsFrom();
+	  +Study buildFormData();
+	  +void dispose();
+	  +void onCancel();
+	  +dynamic onSave();
+	  -dynamic _applyAndSaveSubform()
 	]
 	
-	[NotificationService
+	[StudyFormViewModel]o-[Study]
+	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
+	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyFormViewModel]o-[GoRouter]
+	[StudyFormViewModel]o-[StudyInfoFormViewModel]
+	[StudyFormViewModel]o-[EnrollmentFormViewModel]
+	[StudyFormViewModel]o-[MeasurementsFormViewModel]
+	[StudyFormViewModel]o-[ReportsFormViewModel]
+	[StudyFormViewModel]o-[InterventionsFormViewModel]
+	[StudyFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
+	
+	[&lt;abstract&gt;WithQuestionnaireControls
 	  |
-	  -_streamController: BehaviorSubject&lt;NotificationIntent&gt;
+	  +questionsArray: FormArray&lt;dynamic&gt;;
+	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
+	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
+	  +propagateOnSave: bool;
+	  +questionModels: List&lt;Q&gt;;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
 	  |
-	  +Stream&lt;NotificationIntent&gt; watchNotifications();
-	  +void showMessage();
-	  +void show();
-	  +void dispose()
+	  +void setQuestionnaireControlsFrom();
+	  +QuestionnaireFormData buildQuestionnaireFormData();
+	  +void read();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +Q provide();
+	  +Q provideQuestionFormViewModel()
 	]
 	
-	[NotificationService]o-[BehaviorSubject]
-	[&lt;abstract&gt;INotificationService]&lt;:--[NotificationService]
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
 	
-	[Assets
+	[QuestionnaireFormData
 	  |
-	  &lt;static&gt;+logoWide: String
-	]
-	
-	[Hyperlink
+	  +questionsData: List&lt;QuestionFormData&gt;?;
+	  +id: String
 	  |
-	  +text: String;
-	  +url: String?;
-	  +onClick: void Function()?;
-	  +linkColor: Color;
-	  +hoverColor: Color?;
-	  +visitedColor: Color?;
-	  +style: TextStyle?;
-	  +hoverStyle: TextStyle?;
-	  +visitedStyle: TextStyle?;
-	  +icon: IconData?;
-	  +iconSize: double?
+	  +StudyUQuestionnaire toQuestionnaire();
+	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
+	  +QuestionnaireFormData copy()
 	]
 	
-	[Hyperlink]o-[void Function()?]
-	[Hyperlink]o-[Color]
-	[Hyperlink]o-[TextStyle]
-	[Hyperlink]o-[IconData]
+	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
 	
-	[StandardTableColumn
+	[&lt;abstract&gt;QuestionFormData
 	  |
-	  +label: String;
-	  +tooltip: String?;
-	  +columnWidth: TableColumnWidth;
-	  +sortable: bool;
-	  +sortAscending: bool?;
-	  +sortableIcon: Widget?
-	]
-	
-	[StandardTableColumn]o-[&lt;abstract&gt;TableColumnWidth]
-	[StandardTableColumn]o-[&lt;abstract&gt;Widget]
-	
-	[StandardTable
+	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
+	  +questionId: String;
+	  +questionText: String;
+	  +questionInfoText: String?;
+	  +questionType: SurveyQuestionType;
+	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
+	  +responseOptions: List&lt;dynamic&gt;;
+	  +id: String
 	  |
-	  +items: List&lt;T&gt;;
-	  +inputColumns: List&lt;StandardTableColumn&gt;;
-	  +onSelectItem: void Function(T);
-	  +trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?;
-	  +trailingActionsMenuType: ActionMenuType?;
-	  +sortColumnPredicates: List&lt;int Function(T, T)?&gt;?;
-	  +pinnedPredicates: int Function(T, T)?;
-	  +headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
-	  +dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
-	  +inputTrailingActionsColumn: StandardTableColumn;
-	  +tableWrapper: Widget Function(Widget)?;
-	  +cellSpacing: double;
-	  +rowSpacing: double;
-	  +minRowHeight: double?;
-	  +showTableHeader: bool;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  +leadingWidget: Widget?;
-	  +trailingWidget: Widget?;
-	  +leadingWidgetSpacing: double?;
-	  +trailingWidgetSpacing: double?;
-	  +emptyWidget: Widget?;
-	  +rowStyle: StandardTableStyle;
-	  +disableRowInteractions: bool
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +EligibilityCriterion toEligibilityCriterion();
+	  +Answer&lt;dynamic&gt; constructAnswerFor();
+	  +dynamic setResponseOptionsValidityFrom();
+	  +QuestionFormData copy()
 	]
 	
-	[StandardTable]o-[void Function(T)]
-	[StandardTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?]
-	[StandardTable]o-[ActionMenuType]
-	[StandardTable]o-[int Function(T, T)?]
-	[StandardTable]o-[TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?]
-	[StandardTable]o-[StandardTableColumn]
-	[StandardTable]o-[Widget Function(Widget)?]
-	[StandardTable]o-[&lt;abstract&gt;Widget]
-	[StandardTable]o-[StandardTableStyle]
+	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
 	
-	[StandardTableStyle
+	[ChoiceQuestionFormData
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StandardTableStyle&gt;;
-	  &lt;static&gt;+plain: StandardTableStyle;
-	  &lt;static&gt;+material: StandardTableStyle
+	  +isMultipleChoice: bool;
+	  +answerOptions: List&lt;String&gt;;
+	  +responseOptions: List&lt;String&gt;
+	  |
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +QuestionFormData copy();
+	  -Choice _buildChoiceForValue();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[StandardTableStyle]o-[StandardTableStyle]
-	[Enum]&lt;:--[StandardTableStyle]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
 	
-	[HelpIcon
+	[BoolQuestionFormData
 	  |
-	  +tooltipText: String?
+	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
+	  +responseOptions: List&lt;String&gt;
 	  |
-	  +Widget build()
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +BoolQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[ErrorPage
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
+	
+	[ImageQuestionFormData
 	  |
-	  +error: Exception?
+	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
+	  +responseOptions: List&lt;String&gt;
 	  |
-	  +Widget build()
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +ImageQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ErrorPage]
-	
-	[SplashPage
-	  |
-	  +Widget build()
-	]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
 	
-	[IconPack
+	[AudioQuestionFormData
 	  |
-	  &lt;static&gt;+defaultPack: List&lt;IconOption&gt;;
-	  &lt;static&gt;+material: List&lt;IconOption&gt;
+	  +maxRecordingDurationSeconds: int;
+	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
+	  +responseOptions: List&lt;String&gt;
 	  |
-	  &lt;static&gt;+IconOption? resolveIconByName()
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +AudioQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[IconOption
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
+	
+	[ScaleQuestionFormData
 	  |
-	  +name: String;
-	  +icon: IconData?;
-	  +isEmpty: bool;
-	  +props: List&lt;Object?&gt;
+	  +minValue: double;
+	  +maxValue: double;
+	  +minLabel: String?;
+	  +maxLabel: String?;
+	  +midValues: List&lt;double?&gt;;
+	  +midLabels: List&lt;String?&gt;;
+	  +stepSize: double;
+	  +initialValue: double?;
+	  +minColor: Color?;
+	  +maxColor: Color?;
+	  +responseOptions: List&lt;double&gt;;
+	  +midAnnotations: List&lt;Annotation&gt;
 	  |
-	  +String toJson();
-	  &lt;static&gt;+IconOption fromJson()
+	  +ScaleQuestion toQuestion();
+	  +QuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[IconOption]o-[IconData]
-	[&lt;abstract&gt;Equatable]&lt;:-[IconOption]
+	[ScaleQuestionFormData]o-[Color]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
 	
-	[ReactiveIconPicker
+	[FreeTextQuestionFormData
+	  |
+	  +textLengthRange: List&lt;int&gt;;
+	  +textType: FreeTextQuestionType;
+	  +textTypeExpression: String?;
+	  +responseOptions: List&lt;String&gt;
+	  |
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +FreeTextQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[ReactiveFocusableFormField]&lt;:-[ReactiveIconPicker]
+	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
 	
-	[IconPicker
+	[AudioRecordingQuestionFormView
 	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +selectedOption: IconOption?;
-	  +onSelect: void Function(IconOption)?;
-	  +galleryIconSize: double?;
-	  +selectedIconSize: double?;
-	  +focusNode: FocusNode?;
-	  +isDisabled: bool
+	  +formViewModel: QuestionFormViewModel
 	  |
 	  +Widget build()
 	]
 	
-	[IconPicker]o-[IconOption]
-	[IconPicker]o-[void Function(IconOption)?]
-	[IconPicker]o-[FocusNode]
+	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
 	
-	[IconPickerField
+	[FreeTextQuestionFormView
 	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +selectedOption: IconOption?;
-	  +selectedIconSize: double?;
-	  +galleryIconSize: double?;
-	  +onSelect: void Function(IconOption)?;
-	  +focusNode: FocusNode?;
-	  +isDisabled: bool
+	  +formViewModel: QuestionFormViewModel;
+	  +generateLabelHelpTextMap: dynamic
 	  |
-	  +Widget build()
+	  +Widget build();
+	  +Widget disableOnReadonly();
+	  +Widget generateRow()
 	]
 	
-	[IconPickerField]o-[IconOption]
-	[IconPickerField]o-[void Function(IconOption)?]
-	[IconPickerField]o-[FocusNode]
+	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
 	
-	[IconPickerGallery
-	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +onSelect: void Function(IconOption)?;
-	  +iconSize: double
+	[SurveyQuestionType
 	  |
-	  +Widget build()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
+	  &lt;static&gt;+choice: SurveyQuestionType;
+	  &lt;static&gt;+bool: SurveyQuestionType;
+	  &lt;static&gt;+scale: SurveyQuestionType;
+	  &lt;static&gt;+image: SurveyQuestionType;
+	  &lt;static&gt;+audio: SurveyQuestionType;
+	  &lt;static&gt;+freeText: SurveyQuestionType
 	]
 	
-	[IconPickerGallery]o-[void Function(IconOption)?]
+	[SurveyQuestionType]o-[SurveyQuestionType]
+	[Enum]&lt;:--[SurveyQuestionType]
 	
-	[FormSideSheetTab
+	[ImageCapturingQuestionFormView
 	  |
-	  +formViewBuilder: Widget Function(T)
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
 	]
 	
-	[FormSideSheetTab]o-[Widget Function(T)]
-	[NavbarTab]&lt;:-[FormSideSheetTab]
+	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
 	
-	[SidesheetTab
+	[&lt;abstract&gt;IScaleQuestionFormViewModel
 	  |
-	  +builder: Widget Function(BuildContext)
+	  +isMidValuesClearedInfoVisible: bool
 	]
 	
-	[SidesheetTab]o-[Widget Function(BuildContext)]
-	[NavbarTab]&lt;:-[SidesheetTab]
-	
-	[Sidesheet
+	[ScaleQuestionFormView
 	  |
-	  &lt;static&gt;+kDefaultWidth: double;
-	  +titleText: String;
-	  +body: Widget?;
-	  +tabs: List&lt;SidesheetTab&gt;?;
-	  +actionButtons: List&lt;Widget&gt;?;
-	  +width: double?;
-	  +withCloseButton: bool;
-	  +ignoreAppBar: bool;
-	  +collapseSingleTab: bool;
-	  +bodyPadding: EdgeInsets?;
-	  +wrapContent: Widget Function(Widget)?
+	  +formViewModel: QuestionFormViewModel
 	]
 	
-	[Sidesheet]o-[&lt;abstract&gt;Widget]
-	[Sidesheet]o-[EdgeInsets]
-	[Sidesheet]o-[Widget Function(Widget)?]
+	[ScaleQuestionFormView]o-[QuestionFormViewModel]
 	
-	[ReactiveCustomColorPicker
+	[ChoiceQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
 	]
 	
-	[ReactiveFormField]&lt;:-[ReactiveCustomColorPicker]
+	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
 	
-	[TextParagraph
+	[BoolQuestionFormView
 	  |
-	  +text: String?;
-	  +style: TextStyle?;
-	  +selectable: bool;
-	  +span: List&lt;TextSpan&gt;?
+	  +formViewModel: QuestionFormViewModel
 	  |
 	  +Widget build()
 	]
 	
-	[TextParagraph]o-[TextStyle]
+	[BoolQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
 	
-	[ConstrainedWidthFlexible
+	[QuestionFormViewModel
 	  |
-	  +minWidth: double;
-	  +maxWidth: double;
-	  +flex: int;
-	  +flexSum: int;
-	  +child: Widget;
-	  +outerConstraints: BoxConstraints
+	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
+	  -_titles: Map&lt;FormMode, String Function()&gt;?;
+	  +questionIdControl: FormControl&lt;String&gt;;
+	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
+	  +questionTextControl: FormControl&lt;String&gt;;
+	  +questionInfoTextControl: FormControl&lt;String&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
+	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +customOptionsMin: int;
+	  +customOptionsMax: int;
+	  +customOptionsInitial: int;
+	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
+	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
+	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
+	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
+	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
+	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
+	  &lt;static&gt;+kDefaultScaleMinValue: int;
+	  &lt;static&gt;+kDefaultScaleMaxValue: int;
+	  &lt;static&gt;+kNumMidValueControls: int;
+	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
+	  +scaleMinValueControl: FormControl&lt;int&gt;;
+	  +scaleMaxValueControl: FormControl&lt;int&gt;;
+	  -_scaleRangeControl: FormControl&lt;int&gt;;
+	  +scaleMinLabelControl: FormControl&lt;String&gt;;
+	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
+	  +scaleMidValueControls: FormArray&lt;int&gt;;
+	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
+	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
+	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
+	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
+	  +prevMidValues: List&lt;int?&gt;?;
+	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
+	  +customRegexControl: FormControl&lt;String&gt;;
+	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
+	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
+	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
+	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
+	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
+	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
+	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +form: FormGroup;
+	  +questionId: String;
+	  +questionType: SurveyQuestionType;
+	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
+	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
+	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +validAnswerOptions: List&lt;String&gt;;
+	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +scaleMinValue: int;
+	  +scaleMaxValue: int;
+	  +scaleRange: int;
+	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +questionTextRequired: dynamic;
+	  +numValidChoiceOptions: dynamic;
+	  +scaleRangeValid: dynamic;
+	  +maxRecordingDurationValid: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +isAddOptionButtonVisible: bool;
+	  +isMidValuesClearedInfoVisible: bool
 	  |
-	  +Widget build();
-	  -double _getWidth()
+	  +String? scaleMidLabelAt();
+	  -dynamic _onScaleRangeChanged();
+	  -dynamic _applyInputFormatters();
+	  -dynamic _updateScaleMidValueControls();
+	  -Map&lt;String, dynamic&gt;? _validateFreeText();
+	  -dynamic _onFreeTextLengthChanged();
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +dynamic onQuestionTypeChanged();
+	  +dynamic onResponseOptionsChanged();
+	  -void _updateFormControls();
+	  +void initControls();
+	  +void setControlsFrom();
+	  +QuestionFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem();
+	  +dynamic save();
+	  +QuestionFormViewModel createDuplicate()
 	]
 	
-	[ConstrainedWidthFlexible]o-[&lt;abstract&gt;Widget]
-	[ConstrainedWidthFlexible]o-[BoxConstraints]
+	[QuestionFormViewModel]o-[SurveyQuestionType]
+	[QuestionFormViewModel]o-[FormControl]
+	[QuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
+	[QuestionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
 	
-	[PrimaryButton
+	[SurveyQuestionFormView
 	  |
-	  +text: String;
-	  +icon: IconData?;
-	  +isLoading: bool;
-	  +showLoadingEarliestAfterMs: int;
-	  +onPressed: void Function()?;
-	  +tooltip: String;
-	  +tooltipDisabled: String;
-	  +enabled: bool;
-	  +onPressedFuture: dynamic Function()?;
-	  +innerPadding: EdgeInsets;
-	  +minimumSize: Size?;
-	  +isDisabled: bool
+	  +formViewModel: QuestionFormViewModel;
+	  +isHtmlStyleable: bool
 	]
 	
-	[PrimaryButton]o-[IconData]
-	[PrimaryButton]o-[void Function()?]
-	[PrimaryButton]o-[dynamic Function()?]
-	[PrimaryButton]o-[EdgeInsets]
-	[PrimaryButton]o-[Size]
+	[SurveyQuestionFormView]o-[QuestionFormViewModel]
 	
-	[EmptyBody
+	[&lt;abstract&gt;IFormDataWithSchedule
 	  |
-	  +icon: IconData?;
-	  +leading: Widget?;
-	  +leadingSpacing: double?;
-	  +title: String?;
-	  +description: String?;
-	  +button: Widget?
+	  +instanceId: String;
+	  +isTimeLocked: bool;
+	  +timeLockStart: StudyUTimeOfDay?;
+	  +timeLockEnd: StudyUTimeOfDay?;
+	  +hasReminder: bool;
+	  +reminderTime: StudyUTimeOfDay?
 	  |
-	  +Widget build()
+	  +Schedule toSchedule()
 	]
 	
-	[EmptyBody]o-[IconData]
-	[EmptyBody]o-[&lt;abstract&gt;Widget]
+	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
 	
-	[&lt;abstract&gt;FormConsumerWidget
+	[ScheduleControls
 	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;FormConsumerRefWidget
+	  +formViewModel: WithScheduleControls
 	  |
-	  +Widget build()
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
 	]
 	
-	[Badge
+	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
+	
+	[&lt;abstract&gt;WithScheduleControls
 	  |
-	  +icon: IconData?;
-	  +color: Color?;
-	  +borderRadius: double;
-	  +label: String;
-	  +type: BadgeType;
-	  +padding: EdgeInsets;
-	  +iconSize: double?;
-	  +labelStyle: TextStyle?;
-	  +center: bool
+	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
+	  +instanceID: FormControl&lt;String&gt;;
+	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
+	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
+	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
+	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
+	  +hasReminderControl: FormControl&lt;bool&gt;;
+	  +reminderTimeControl: FormControl&lt;Time&gt;;
+	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
+	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
+	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
+	  +hasReminder: bool;
+	  +isTimeRestricted: bool;
+	  +timeRestriction: List&lt;Time&gt;?
 	  |
-	  +Widget build();
-	  -Color? _getBackgroundColor();
-	  -Color _getBorderColor();
-	  -Color? _getLabelColor()
+	  +void setScheduleControlsFrom();
+	  -dynamic _initReminderControl()
 	]
 	
-	[Badge]o-[IconData]
-	[Badge]o-[Color]
-	[Badge]o-[BadgeType]
-	[Badge]o-[EdgeInsets]
-	[Badge]o-[TextStyle]
+	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
+	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
 	
-	[BadgeType
+	[&lt;abstract&gt;StudyDesignPageWidget
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;BadgeType&gt;;
-	  &lt;static&gt;+filled: BadgeType;
-	  &lt;static&gt;+outlined: BadgeType;
-	  &lt;static&gt;+outlineFill: BadgeType;
-	  &lt;static&gt;+plain: BadgeType
+	  +Widget? banner()
 	]
 	
-	[BadgeType]o-[BadgeType]
-	[Enum]&lt;:--[BadgeType]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
 	
-	[NullHelperDecoration
+	[StudiesTableColumnHeader
+	  |
+	  +title: String;
+	  +sortable: bool;
+	  +sortAscending: bool;
+	  +sortingActive: bool;
+	  +onSort: void Function()?
 	]
 	
-	[InputDecoration]&lt;:-[NullHelperDecoration]
+	[StudiesTableColumnHeader]o-[void Function()?]
 	
-	[Collapsible
+	[DashboardScreen
 	  |
-	  +contentBuilder: Widget Function(BuildContext, bool);
-	  +headerBuilder: Widget Function(BuildContext, bool)?;
-	  +title: String?;
-	  +isCollapsed: bool
+	  +filter: StudiesFilter?
 	]
 	
-	[Collapsible]o-[Widget Function(BuildContext, bool)]
-	[Collapsible]o-[Widget Function(BuildContext, bool)?]
+	[DashboardScreen]o-[StudiesFilter]
 	
-	[ActionMenuInline
+	[DashboardScaffold
 	  |
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +iconSize: double?;
-	  +visible: bool;
-	  +splashRadius: double?;
-	  +paddingVertical: double?;
-	  +paddingHorizontal: double?
+	  &lt;static&gt;+compactWidthThreshold: double;
+	  +body: Widget
 	  |
 	  +Widget build()
 	]
 	
-	[StudyULogo
+	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
+	
+	[DashboardController
 	  |
-	  +onTap: void Function()?
+	  +studyRepository: IStudyRepository;
+	  +authRepository: IAuthRepository;
+	  +userRepository: IUserRepository;
+	  +router: GoRouter;
+	  -_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?;
+	  +searchController: SearchController;
+	  +isSortAscending: bool
 	  |
-	  +Widget build()
+	  -dynamic _subscribeStudies();
+	  +dynamic setSearchText();
+	  +dynamic setStudiesFilter();
+	  +dynamic onSelectStudy();
+	  +dynamic onClickNewStudy();
+	  +dynamic pinStudy();
+	  +dynamic pinOffStudy();
+	  +void setSorting();
+	  +void filterStudies();
+	  +void sortStudies();
+	  +bool isSortingActiveForColumn();
+	  +bool isPinned();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void dispose()
 	]
 	
-	[StudyULogo]o-[void Function()?]
+	[DashboardController]o-[&lt;abstract&gt;IStudyRepository]
+	[DashboardController]o-[&lt;abstract&gt;IAuthRepository]
+	[DashboardController]o-[&lt;abstract&gt;IUserRepository]
+	[DashboardController]o-[GoRouter]
+	[DashboardController]o-[StreamSubscription]
+	[DashboardController]o-[SearchController]
+	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
 	
-	[NavbarTab
+	[StudiesFilter
 	  |
-	  +title: String;
-	  +intent: RoutingIntent?;
 	  +index: int;
-	  +enabled: bool
+	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
 	]
 	
-	[NavbarTab]o-[RoutingIntent]
+	[Enum]&lt;:--[StudiesFilter]
 	
-	[TabbedNavbar
+	[StudiesTableColumnSize
 	  |
-	  +tabs: List&lt;T&gt;;
-	  +selectedTab: T?;
-	  +indicator: BoxDecoration?;
-	  +height: double?;
-	  +disabledBackgroundColor: Color?;
-	  +disabledTooltipText: String?;
-	  +onSelect: void Function(int, T)?;
-	  +labelPadding: EdgeInsets?;
-	  +labelSpacing: double?;
-	  +indicatorSize: TabBarIndicatorSize?;
-	  +isScrollable: bool;
-	  +backgroundColor: Color?;
-	  +labelColorHover: Color?;
-	  +unselectedLabelColorHover: Color?
+	  +collapsed: bool;
+	  +flex: int?;
+	  +width: double?
+	  |
+	  +Widget createContainer()
 	]
 	
-	[TabbedNavbar]o-[BoxDecoration]
-	[TabbedNavbar]o-[Color]
-	[TabbedNavbar]o-[void Function(int, T)?]
-	[TabbedNavbar]o-[EdgeInsets]
-	[TabbedNavbar]o-[TabBarIndicatorSize]
-	
-	[HtmlStylingBanner
+	[StudiesTable
 	  |
-	  +isDismissed: bool;
-	  +onDismissed: dynamic Function()?
+	  +itemHeight: double;
+	  +itemPadding: double;
+	  +rowSpacing: double;
+	  +columnSpacing: double;
+	  +compactWidthThreshold: double;
+	  +superCompactWidthThreshold: double;
+	  +compactStatTitleThreshold: double;
+	  +studies: List&lt;Study&gt;;
+	  +onSelect: void Function(Study);
+	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study);
+	  +emptyWidget: Widget;
+	  +pinnedStudies: Iterable&lt;String&gt;;
+	  +dashboardController: DashboardController
 	  |
-	  +Widget build()
+	  +Widget build();
+	  -Widget _buildColumnHeader()
 	]
 	
-	[HtmlStylingBanner]o-[dynamic Function()?]
+	[StudiesTable]o-[void Function(Study)]
+	[StudiesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)]
+	[StudiesTable]o-[&lt;abstract&gt;Widget]
+	[StudiesTable]o-[DashboardController]
 	
-	[&lt;abstract&gt;ISyncIndicatorViewModel
+	[StudiesTableColumn
 	  |
-	  +isDirty: bool;
-	  +lastSynced: DateTime?
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudiesTableColumn&gt;;
+	  &lt;static&gt;+pin: StudiesTableColumn;
+	  &lt;static&gt;+title: StudiesTableColumn;
+	  &lt;static&gt;+status: StudiesTableColumn;
+	  &lt;static&gt;+participation: StudiesTableColumn;
+	  &lt;static&gt;+createdAt: StudiesTableColumn;
+	  &lt;static&gt;+enrolled: StudiesTableColumn;
+	  &lt;static&gt;+active: StudiesTableColumn;
+	  &lt;static&gt;+completed: StudiesTableColumn;
+	  &lt;static&gt;+action: StudiesTableColumn
 	]
 	
-	[SyncIndicator
+	[StudiesTableColumn]o-[StudiesTableColumn]
+	[Enum]&lt;:--[StudiesTableColumn]
+	
+	[StudiesTableItem
 	  |
-	  +state: AsyncValue&lt;T&gt;;
-	  +lastSynced: DateTime?;
-	  +isDirty: bool;
-	  +animationDuration: int;
-	  +iconSize: double
+	  +study: Study;
+	  +itemHeight: double;
+	  +itemPadding: double;
+	  +rowSpacing: double;
+	  +columnSpacing: double;
+	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
+	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
+	  +isPinned: bool;
+	  +onPinnedChanged: void Function(Study, bool)?;
+	  +onTap: void Function(Study)?
 	]
 	
-	[SyncIndicator]o-[&lt;abstract&gt;AsyncValue]
+	[StudiesTableItem]o-[Study]
+	[StudiesTableItem]o-[void Function(Study, bool)?]
+	[StudiesTableItem]o-[void Function(Study)?]
 	
-	[Search
-	  |
-	  +onQueryChanged: dynamic Function(String);
-	  +searchController: SearchController?;
-	  +hintText: String?;
-	  +initialText: String?
+	[App
 	]
 	
-	[Search]o-[dynamic Function(String)]
-	[Search]o-[SearchController]
+	[AppContent
+	]
 	
-	[SearchController
+	[AccountSettingsDialog
 	  |
-	  +setText: void Function(String)
+	  +Widget build()
 	]
 	
-	[SearchController]o-[void Function(String)]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AccountSettingsDialog]
 	
-	[ActionMenuType
+	[&lt;abstract&gt;IInviteCodeRepository
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ActionMenuType&gt;;
-	  &lt;static&gt;+inline: ActionMenuType;
-	  &lt;static&gt;+popup: ActionMenuType
+	  +dynamic isCodeAlreadyUsed()
 	]
 	
-	[ActionMenuType]o-[ActionMenuType]
-	[Enum]&lt;:--[ActionMenuType]
+	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IInviteCodeRepository]
 	
-	[SecondaryButton
+	[InviteCodeRepository
 	  |
-	  +text: String;
-	  +icon: IconData?;
-	  +isLoading: bool;
-	  +onPressed: void Function()?
+	  +studyId: String;
+	  +ref: ProviderRef&lt;dynamic&gt;;
+	  +apiClient: StudyUApi;
+	  +authRepository: IAuthRepository;
+	  +studyRepository: IStudyRepository;
+	  +study: Study
 	  |
-	  +Widget build()
+	  +String getKey();
+	  +dynamic isCodeAlreadyUsed();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +dynamic emitUpdate()
 	]
 	
-	[SecondaryButton]o-[IconData]
-	[SecondaryButton]o-[void Function()?]
+	[InviteCodeRepository]o-[&lt;abstract&gt;ProviderRef]
+	[InviteCodeRepository]o-[&lt;abstract&gt;StudyUApi]
+	[InviteCodeRepository]o-[&lt;abstract&gt;IAuthRepository]
+	[InviteCodeRepository]o-[&lt;abstract&gt;IStudyRepository]
+	[InviteCodeRepository]o-[Study]
+	[&lt;abstract&gt;ModelRepository]&lt;:-[InviteCodeRepository]
+	[&lt;abstract&gt;IInviteCodeRepository]&lt;:--[InviteCodeRepository]
 	
-	[FormTableRow
+	[InviteCodeRepositoryDelegate
 	  |
-	  +label: String?;
-	  +labelBuilder: Widget Function(BuildContext)?;
-	  +labelStyle: TextStyle?;
-	  +labelHelpText: String?;
-	  +input: Widget;
-	  +control: AbstractControl&lt;dynamic&gt;?;
-	  +layout: FormTableRowLayout?
+	  +study: Study;
+	  +apiClient: StudyUApi;
+	  +studyRepository: IStudyRepository
+	  |
+	  +dynamic fetch();
+	  +dynamic fetchAll();
+	  +dynamic save();
+	  +dynamic delete();
+	  +dynamic onError();
+	  +StudyInvite createDuplicate();
+	  +StudyInvite createNewInstance()
 	]
 	
-	[FormTableRow]o-[Widget Function(BuildContext)?]
-	[FormTableRow]o-[TextStyle]
-	[FormTableRow]o-[&lt;abstract&gt;Widget]
-	[FormTableRow]o-[&lt;abstract&gt;AbstractControl]
-	[FormTableRow]o-[FormTableRowLayout]
+	[InviteCodeRepositoryDelegate]o-[Study]
+	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
+	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;IStudyRepository]
+	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[InviteCodeRepositoryDelegate]
 	
-	[FormTableLayout
-	  |
-	  +rows: List&lt;FormTableRow&gt;;
-	  +columnWidths: Map&lt;int, TableColumnWidth&gt;;
-	  +rowDivider: Widget?;
-	  +rowLayout: FormTableRowLayout?;
-	  +rowLabelStyle: TextStyle?
+	[&lt;abstract&gt;IStudyRepository
 	  |
-	  +Widget build()
+	  +dynamic launch();
+	  +dynamic deleteParticipants()
 	]
 	
-	[FormTableLayout]o-[&lt;abstract&gt;Widget]
-	[FormTableLayout]o-[FormTableRowLayout]
-	[FormTableLayout]o-[TextStyle]
+	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IStudyRepository]
 	
-	[FormSectionHeader
+	[StudyRepository
 	  |
-	  +title: String;
-	  +titleTextStyle: TextStyle?;
-	  +helpText: String?;
-	  +divider: bool;
-	  +helpTextDisabled: bool
+	  +apiClient: StudyUApi;
+	  +authRepository: IAuthRepository;
+	  +ref: ProviderRef&lt;dynamic&gt;;
+	  +sortCallback: void Function()?
 	  |
-	  +Widget build()
+	  +String getKey();
+	  +dynamic deleteParticipants();
+	  +dynamic launch();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
 	]
 	
-	[FormSectionHeader]o-[TextStyle]
+	[StudyRepository]o-[&lt;abstract&gt;StudyUApi]
+	[StudyRepository]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyRepository]o-[&lt;abstract&gt;ProviderRef]
+	[StudyRepository]o-[void Function()?]
+	[&lt;abstract&gt;ModelRepository]&lt;:-[StudyRepository]
+	[&lt;abstract&gt;IStudyRepository]&lt;:--[StudyRepository]
 	
-	[FormLabel
+	[StudyRepositoryDelegate
 	  |
-	  +labelText: String?;
-	  +helpText: String?;
-	  +labelTextStyle: TextStyle?;
-	  +layout: FormTableRowLayout?
+	  +apiClient: StudyUApi;
+	  +authRepository: IAuthRepository
 	  |
-	  +Widget build()
+	  +dynamic fetchAll();
+	  +dynamic fetch();
+	  +dynamic save();
+	  +dynamic delete();
+	  +dynamic onError();
+	  +Study createNewInstance();
+	  +Study createDuplicate()
 	]
 	
-	[FormLabel]o-[TextStyle]
-	[FormLabel]o-[FormTableRowLayout]
+	[StudyRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
+	[StudyRepositoryDelegate]o-[&lt;abstract&gt;IAuthRepository]
+	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[StudyRepositoryDelegate]
 	
-	[FormTableRowLayout
+	[&lt;abstract&gt;StudyUApi
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;FormTableRowLayout&gt;;
-	  &lt;static&gt;+vertical: FormTableRowLayout;
-	  &lt;static&gt;+horizontal: FormTableRowLayout
+	  +dynamic saveStudy();
+	  +dynamic fetchStudy();
+	  +dynamic getUserStudies();
+	  +dynamic deleteStudy();
+	  +dynamic saveStudyInvite();
+	  +dynamic fetchStudyInvite();
+	  +dynamic deleteStudyInvite();
+	  +dynamic deleteParticipants();
+	  +dynamic fetchAppConfig();
+	  +dynamic fetchUser();
+	  +dynamic saveUser()
 	]
 	
-	[FormTableRowLayout]o-[FormTableRowLayout]
-	[Enum]&lt;:--[FormTableRowLayout]
-	
-	[MouseEventsRegion
-	  |
-	  +onTap: void Function()?;
-	  +onHover: void Function(PointerHoverEvent)?;
-	  +onEnter: void Function(PointerEnterEvent)?;
-	  +onExit: void Function(PointerExitEvent)?;
-	  +autoselectCursor: bool;
-	  +cursor: SystemMouseCursor;
-	  &lt;static&gt;+defaultCursor: SystemMouseCursor;
-	  +autoCursor: SystemMouseCursor
+	[APIException
 	]
 	
-	[MouseEventsRegion]o-[void Function()?]
-	[MouseEventsRegion]o-[void Function(PointerHoverEvent)?]
-	[MouseEventsRegion]o-[void Function(PointerEnterEvent)?]
-	[MouseEventsRegion]o-[void Function(PointerExitEvent)?]
-	[MouseEventsRegion]o-[SystemMouseCursor]
+	[Exception]&lt;:--[APIException]
 	
-	[FormControlLabel
-	  |
-	  +formControl: AbstractControl&lt;dynamic&gt;;
-	  +text: String;
-	  +isClickable: bool;
-	  +textStyle: TextStyle?;
-	  +onClick: void Function(AbstractControl&lt;dynamic&gt;)?
-	  |
-	  +Widget build()
+	[StudyNotFoundException
 	]
 	
-	[FormControlLabel]o-[&lt;abstract&gt;AbstractControl]
-	[FormControlLabel]o-[TextStyle]
-	[FormControlLabel]o-[void Function(AbstractControl&lt;dynamic&gt;)?]
+	[APIException]&lt;:-[StudyNotFoundException]
 	
-	[SingleColumnLayout
-	  |
-	  &lt;static&gt;+defaultConstraints: BoxConstraints;
-	  &lt;static&gt;+defaultConstraintsNarrow: BoxConstraints;
-	  +body: Widget;
-	  +header: Widget?;
-	  +stickyHeader: bool;
-	  +constraints: BoxConstraints?;
-	  +scroll: bool;
-	  +padding: EdgeInsets?
-	  |
-	  &lt;static&gt;+dynamic fromType()
+	[MeasurementNotFoundException
 	]
 	
-	[SingleColumnLayout]o-[BoxConstraints]
-	[SingleColumnLayout]o-[&lt;abstract&gt;Widget]
-	[SingleColumnLayout]o-[EdgeInsets]
+	[APIException]&lt;:-[MeasurementNotFoundException]
 	
-	[SingleColumnLayoutType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;;
-	  &lt;static&gt;+boundedWide: SingleColumnLayoutType;
-	  &lt;static&gt;+boundedNarrow: SingleColumnLayoutType;
-	  &lt;static&gt;+stretched: SingleColumnLayoutType;
-	  &lt;static&gt;+split: SingleColumnLayoutType
+	[QuestionNotFoundException
 	]
 	
-	[SingleColumnLayoutType]o-[SingleColumnLayoutType]
-	[Enum]&lt;:--[SingleColumnLayoutType]
+	[APIException]&lt;:-[QuestionNotFoundException]
 	
-	[TwoColumnLayout
-	  |
-	  &lt;static&gt;+defaultDivider: VerticalDivider;
-	  &lt;static&gt;+defaultContentPadding: EdgeInsets;
-	  &lt;static&gt;+slimContentPadding: EdgeInsets;
-	  +leftWidget: Widget;
-	  +rightWidget: Widget;
-	  +dividerWidget: Widget?;
-	  +headerWidget: Widget?;
-	  +flexLeft: int?;
-	  +flexRight: int?;
-	  +constraintsLeft: BoxConstraints?;
-	  +constraintsRight: BoxConstraints?;
-	  +scrollLeft: bool;
-	  +scrollRight: bool;
-	  +paddingLeft: EdgeInsets?;
-	  +paddingRight: EdgeInsets?;
-	  +backgroundColorLeft: Color?;
-	  +backgroundColorRight: Color?;
-	  +stretchHeight: bool
+	[ConsentItemNotFoundException
 	]
 	
-	[TwoColumnLayout]o-[VerticalDivider]
-	[TwoColumnLayout]o-[EdgeInsets]
-	[TwoColumnLayout]o-[&lt;abstract&gt;Widget]
-	[TwoColumnLayout]o-[BoxConstraints]
-	[TwoColumnLayout]o-[Color]
+	[APIException]&lt;:-[ConsentItemNotFoundException]
 	
-	[UnderConstruction
-	  |
-	  +Widget build()
+	[InterventionNotFoundException
 	]
 	
-	[StandardDialog
-	  |
-	  +title: Widget?;
-	  +titleText: String?;
-	  +body: Widget;
-	  +actionButtons: List&lt;Widget&gt;;
-	  +backgroundColor: Color?;
-	  +borderRadius: double?;
-	  +width: double?;
-	  +height: double?;
-	  +minWidth: double;
-	  +minHeight: double;
-	  +maxWidth: double?;
-	  +maxHeight: double?;
-	  +padding: EdgeInsets
-	  |
-	  +Widget build()
+	[APIException]&lt;:-[InterventionNotFoundException]
+	
+	[InterventionTaskNotFoundException
 	]
 	
-	[StandardDialog]o-[&lt;abstract&gt;Widget]
-	[StandardDialog]o-[Color]
-	[StandardDialog]o-[EdgeInsets]
+	[APIException]&lt;:-[InterventionTaskNotFoundException]
 	
-	[IndicatorRangeSliderThumbShape
-	  |
-	  +buildContext: BuildContext;
-	  +start: T;
-	  +end: T
-	  |
-	  +Size getPreferredSize();
-	  +void paint()
+	[ReportNotFoundException
 	]
 	
-	[IndicatorRangeSliderThumbShape]o-[&lt;abstract&gt;BuildContext]
-	[&lt;abstract&gt;RangeSliderThumbShape]&lt;:-[IndicatorRangeSliderThumbShape]
+	[APIException]&lt;:-[ReportNotFoundException]
 	
-	[&lt;abstract&gt;IWithBanner
-	  |
-	  +Widget? banner()
+	[ReportSectionNotFoundException
 	]
 	
-	[BannerBox
-	  |
-	  +prefixIcon: Widget?;
-	  +body: Widget;
-	  +style: BannerStyle;
-	  +padding: EdgeInsets?;
-	  +noPrefix: bool;
-	  +dismissable: bool;
-	  +isDismissed: bool?;
-	  +onDismissed: dynamic Function()?;
-	  +dismissIconSize: double
+	[APIException]&lt;:-[ReportSectionNotFoundException]
+	
+	[StudyInviteNotFoundException
 	]
 	
-	[BannerBox]o-[&lt;abstract&gt;Widget]
-	[BannerBox]o-[BannerStyle]
-	[BannerBox]o-[EdgeInsets]
-	[BannerBox]o-[dynamic Function()?]
+	[APIException]&lt;:-[StudyInviteNotFoundException]
 	
-	[BannerStyle
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;BannerStyle&gt;;
-	  &lt;static&gt;+warning: BannerStyle;
-	  &lt;static&gt;+info: BannerStyle;
-	  &lt;static&gt;+error: BannerStyle
+	[UserNotFoundException
 	]
 	
-	[BannerStyle]o-[BannerStyle]
-	[Enum]&lt;:--[BannerStyle]
+	[APIException]&lt;:-[UserNotFoundException]
 	
-	[ActionPopUpMenuButton
+	[StudyUApiClient
 	  |
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +triggerIconColor: Color?;
-	  +triggerIconColorHover: Color?;
-	  +triggerIconSize: double;
-	  +disableSplashEffect: bool;
-	  +hideOnEmpty: bool;
-	  +orientation: Axis;
-	  +elevation: double?;
-	  +splashRadius: double?;
-	  +enabled: bool;
-	  +position: PopupMenuPosition
+	  +supabaseClient: SupabaseClient;
+	  &lt;static&gt;+studyColumns: List&lt;String&gt;;
+	  &lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;;
+	  +testDelayMilliseconds: int
 	  |
-	  +Widget build();
-	  -Widget _buildPopupMenu()
+	  +dynamic deleteParticipants();
+	  +dynamic getUserStudies();
+	  +dynamic fetchStudy();
+	  +dynamic deleteStudy();
+	  +dynamic saveStudy();
+	  +dynamic fetchStudyInvite();
+	  +dynamic saveStudyInvite();
+	  +dynamic deleteStudyInvite();
+	  +dynamic fetchAppConfig();
+	  +dynamic fetchUser();
+	  +dynamic saveUser();
+	  -dynamic _awaitGuarded();
+	  -dynamic _apiException();
+	  -dynamic _testDelay()
 	]
 	
-	[ActionPopUpMenuButton]o-[Color]
-	[ActionPopUpMenuButton]o-[Axis]
-	[ActionPopUpMenuButton]o-[PopupMenuPosition]
+	[StudyUApiClient]o-[SupabaseClient]
+	[&lt;abstract&gt;SupabaseClientDependant]&lt;:-[StudyUApiClient]
+	[&lt;abstract&gt;SupabaseQueryMixin]&lt;:-[StudyUApiClient]
+	[&lt;abstract&gt;StudyUApi]&lt;:--[StudyUApiClient]
 	
-	[DismissButton
-	  |
-	  +onPressed: void Function()?;
-	  +text: String?
+	[&lt;abstract&gt;IAppRepository
 	  |
-	  +Widget build()
+	  +dynamic fetchAppConfig();
+	  +void dispose()
 	]
 	
-	[DismissButton]o-[void Function()?]
-	
-	[FormScaffold
+	[AppRepository
 	  |
-	  +formViewModel: T;
-	  +actions: List&lt;Widget&gt;?;
-	  +body: Widget;
-	  +drawer: Widget?;
-	  +actionsSpacing: double;
-	  +actionsPadding: double
+	  +apiClient: StudyUApi
+	  |
+	  +dynamic fetchAppConfig();
+	  +void dispose()
 	]
 	
-	[FormScaffold]o-[&lt;abstract&gt;Widget]
+	[AppRepository]o-[&lt;abstract&gt;StudyUApi]
+	[&lt;abstract&gt;IAppRepository]&lt;:--[AppRepository]
 	
-	[AsyncValueWidget
+	[&lt;abstract&gt;IUserRepository
 	  |
-	  +value: AsyncValue&lt;T&gt;;
-	  +data: Widget Function(T);
-	  +error: Widget Function(Object, StackTrace?)?;
-	  +loading: Widget Function()?;
-	  +empty: Widget Function()?
+	  +user: StudyUUser
 	  |
-	  +Widget build();
-	  -Widget _buildDataOrEmptyWidget();
-	  -Widget _defaultError();
-	  -Widget _defaultLoad()
+	  +dynamic fetchUser();
+	  +dynamic saveUser();
+	  +dynamic updatePreferences()
 	]
 	
-	[AsyncValueWidget]o-[&lt;abstract&gt;AsyncValue]
-	[AsyncValueWidget]o-[Widget Function(T)]
-	[AsyncValueWidget]o-[Widget Function(Object, StackTrace?)?]
-	[AsyncValueWidget]o-[Widget Function()?]
-	
-	[&lt;abstract&gt;ResultTypes
-	]
+	[&lt;abstract&gt;IUserRepository]o-[StudyUUser]
 	
-	[MeasurementResultTypes
+	[UserRepository
 	  |
-	  &lt;static&gt;+questionnaire: String;
-	  &lt;static&gt;+values: List&lt;String&gt;
+	  +apiClient: StudyUApi;
+	  +authRepository: IAuthRepository;
+	  +ref: Ref&lt;Object?&gt;;
+	  +user: StudyUUser
+	  |
+	  +dynamic fetchUser();
+	  +dynamic saveUser();
+	  +dynamic updatePreferences()
 	]
 	
-	[&lt;abstract&gt;ResultTypes]&lt;:-[MeasurementResultTypes]
+	[UserRepository]o-[&lt;abstract&gt;StudyUApi]
+	[UserRepository]o-[&lt;abstract&gt;IAuthRepository]
+	[UserRepository]o-[&lt;abstract&gt;Ref]
+	[UserRepository]o-[StudyUUser]
+	[&lt;abstract&gt;IUserRepository]&lt;:--[UserRepository]
 	
-	[InterventionResultTypes
+	[PreferenceAction
 	  |
-	  &lt;static&gt;+checkmarkTask: String;
-	  &lt;static&gt;+values: List&lt;String&gt;
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;PreferenceAction&gt;;
+	  &lt;static&gt;+pin: PreferenceAction;
+	  &lt;static&gt;+pinOff: PreferenceAction
 	]
 	
-	[&lt;abstract&gt;ResultTypes]&lt;:-[InterventionResultTypes]
+	[PreferenceAction]o-[PreferenceAction]
+	[Enum]&lt;:--[PreferenceAction]
 	
-	[StudyExportData
+	[&lt;abstract&gt;IAuthRepository
 	  |
-	  +study: Study;
-	  +measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
-	  +interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
-	  +mediaData: List&lt;String&gt;;
-	  +isEmpty: bool
+	  +allowPasswordReset: bool;
+	  +currentUser: User?;
+	  +isLoggedIn: bool;
+	  +session: Session?;
+	  +serializedSession: String?
+	  |
+	  +dynamic signUp();
+	  +dynamic signInWith();
+	  +dynamic signOut();
+	  +dynamic resetPasswordForEmail();
+	  +dynamic updateUser();
+	  +void dispose()
 	]
 	
-	[StudyExportData]o-[Study]
+	[&lt;abstract&gt;IAuthRepository]o-[User]
+	[&lt;abstract&gt;IAuthRepository]o-[Session]
+	[&lt;abstract&gt;IAppDelegate]&lt;:-[&lt;abstract&gt;IAuthRepository]
 	
-	[StudyTemplates
+	[AuthRepository
 	  |
-	  &lt;static&gt;+kUnnamedStudyTitle: String
+	  +supabaseClient: SupabaseClient;
+	  +allowPasswordReset: bool;
+	  +authClient: GoTrueClient;
+	  +session: Session?;
+	  +serializedSession: String?;
+	  +currentUser: User?;
+	  +isLoggedIn: bool
 	  |
-	  &lt;static&gt;+Study emptyDraft()
+	  -void _registerAuthListener();
+	  +dynamic signUp();
+	  +dynamic signInWith();
+	  +dynamic signOut();
+	  +dynamic resetPasswordForEmail();
+	  +dynamic updateUser();
+	  +void dispose();
+	  +dynamic onAppStart()
 	]
 	
-	[StudyActionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyActionType&gt;;
-	  &lt;static&gt;+pin: StudyActionType;
-	  &lt;static&gt;+pinoff: StudyActionType;
-	  &lt;static&gt;+edit: StudyActionType;
-	  &lt;static&gt;+duplicate: StudyActionType;
-	  &lt;static&gt;+duplicateDraft: StudyActionType;
-	  &lt;static&gt;+addCollaborator: StudyActionType;
-	  &lt;static&gt;+export: StudyActionType;
-	  &lt;static&gt;+delete: StudyActionType
+	[AuthRepository]o-[SupabaseClient]
+	[AuthRepository]o-[GoTrueClient]
+	[AuthRepository]o-[Session]
+	[AuthRepository]o-[User]
+	[&lt;abstract&gt;IAuthRepository]&lt;:--[AuthRepository]
+	
+	[StudyLaunched
 	]
 	
-	[StudyActionType]o-[StudyActionType]
-	[Enum]&lt;:--[StudyActionType]
+	[&lt;abstract&gt;ModelEvent]&lt;:-[StudyLaunched]
 	
-	[DropdownMenuItemTheme
+	[&lt;abstract&gt;SupabaseClientDependant
 	  |
-	  +iconTheme: IconThemeData?
+	  +supabaseClient: SupabaseClient
 	]
 	
-	[DropdownMenuItemTheme]o-[IconThemeData]
-	[&lt;abstract&gt;Diagnosticable]&lt;:-[DropdownMenuItemTheme]
+	[&lt;abstract&gt;SupabaseClientDependant]o-[SupabaseClient]
 	
-	[ThemeConfig
-	  |
-	  &lt;static&gt;+kMinContentWidth: double;
-	  &lt;static&gt;+kMaxContentWidth: double;
-	  &lt;static&gt;+kHoverFadeFactor: double;
-	  &lt;static&gt;+kMuteFadeFactor: double
+	[SupabaseQueryError
 	  |
-	  &lt;static&gt;+dynamic bodyBackgroundColor();
-	  &lt;static&gt;+Color modalBarrierColor();
-	  &lt;static&gt;+Color containerColor();
-	  &lt;static&gt;+Color colorPickerInitialColor();
-	  &lt;static&gt;+TextStyle bodyTextMuted();
-	  &lt;static&gt;+TextStyle bodyTextBackground();
-	  &lt;static&gt;+double iconSplashRadius();
-	  &lt;static&gt;+Color sidesheetBackgroundColor();
-	  &lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme();
-	  &lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()
+	  +statusCode: String?;
+	  +message: String;
+	  +details: dynamic
 	]
 	
-	[NoAnimationPageTransitionsBuilder
+	[Exception]&lt;:--[SupabaseQueryError]
+	
+	[&lt;abstract&gt;SupabaseQueryMixin
 	  |
-	  +Widget buildTransitions()
+	  +dynamic deleteAll();
+	  +dynamic getAll();
+	  +dynamic getById();
+	  +dynamic getByColumn();
+	  +List&lt;T&gt; deserializeList();
+	  +T deserializeObject()
 	]
 	
-	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[NoAnimationPageTransitionsBuilder]
-	
-	[WebTransitionBuilder
+	[WrappedModel
 	  |
-	  +Widget buildTransitions()
+	  -_model: T;
+	  +asyncValue: AsyncValue&lt;T&gt;;
+	  +isLocalOnly: bool;
+	  +isDirty: bool;
+	  +isDeleted: bool;
+	  +lastSaved: DateTime?;
+	  +lastFetched: DateTime?;
+	  +lastUpdated: DateTime?;
+	  +model: T
+	  |
+	  +dynamic markWithError();
+	  +dynamic markAsLoading();
+	  +dynamic markAsFetched();
+	  +dynamic markAsSaved()
 	]
 	
-	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[WebTransitionBuilder]
+	[WrappedModel]o-[&lt;abstract&gt;AsyncValue]
 	
-	[ThemeSettingChange
-	  |
-	  +settings: ThemeSettings
+	[ModelRepositoryException
 	]
 	
-	[ThemeSettingChange]o-[ThemeSettings]
-	[&lt;abstract&gt;Notification]&lt;:-[ThemeSettingChange]
+	[Exception]&lt;:--[ModelRepositoryException]
 	
-	[ThemeProvider
-	  |
-	  +settings: ValueNotifier&lt;ThemeSettings&gt;;
-	  +lightDynamic: ColorScheme?;
-	  +darkDynamic: ColorScheme?;
-	  +pageTransitionsTheme: PageTransitionsTheme;
-	  +shapeMedium: ShapeBorder
-	  |
-	  +Color custom();
-	  +Color blend();
-	  +Color source();
-	  +ColorScheme colors();
-	  +CardTheme cardTheme();
-	  +ListTileThemeData listTileTheme();
-	  +AppBarTheme appBarTheme();
-	  +SnackBarThemeData snackBarThemeData();
-	  +TabBarTheme tabBarTheme();
-	  +BottomAppBarTheme bottomAppBarTheme();
-	  +BottomNavigationBarThemeData bottomNavigationBarTheme();
-	  +SwitchThemeData switchTheme();
-	  +InputDecorationTheme inputDecorationTheme();
-	  +TextTheme textTheme();
-	  +DividerThemeData dividerTheme();
-	  +NavigationRailThemeData navigationRailTheme();
-	  +DrawerThemeData drawerTheme();
-	  +IconThemeData iconTheme();
-	  +CheckboxThemeData checkboxTheme();
-	  +RadioThemeData radioTheme();
-	  +TooltipThemeData tooltipTheme();
-	  +ThemeData light();
-	  +ThemeData dark();
-	  +ThemeMode themeMode();
-	  +ThemeData theme();
-	  &lt;static&gt;+ThemeProvider of();
-	  +bool updateShouldNotify()
+	[ModelNotFoundException
 	]
 	
-	[ThemeProvider]o-[ValueNotifier]
-	[ThemeProvider]o-[ColorScheme]
-	[ThemeProvider]o-[PageTransitionsTheme]
-	[ThemeProvider]o-[&lt;abstract&gt;ShapeBorder]
-	[&lt;abstract&gt;InheritedWidget]&lt;:-[ThemeProvider]
+	[ModelRepositoryException]&lt;:--[ModelNotFoundException]
 	
-	[ThemeSettings
+	[&lt;abstract&gt;IModelRepository
 	  |
-	  +sourceColor: Color;
-	  +themeMode: ThemeMode
+	  +String getKey();
+	  +WrappedModel&lt;T&gt;? get();
+	  +dynamic fetchAll();
+	  +dynamic fetch();
+	  +dynamic save();
+	  +dynamic delete();
+	  +dynamic duplicateAndSave();
+	  +dynamic duplicateAndSaveFromRemote();
+	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
+	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
+	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
+	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
+	  +dynamic ensurePersisted();
+	  +void dispose()
 	]
 	
-	[ThemeSettings]o-[Color]
-	[ThemeSettings]o-[ThemeMode]
+	[&lt;abstract&gt;IModelActionProvider]&lt;:--[&lt;abstract&gt;IModelRepository]
 	
-	[CustomColor
-	  |
-	  +name: String;
-	  +color: Color;
-	  +blend: bool
+	[&lt;abstract&gt;IModelRepositoryDelegate
 	  |
-	  +Color value()
+	  +dynamic fetchAll();
+	  +dynamic fetch();
+	  +dynamic save();
+	  +dynamic delete();
+	  +T createNewInstance();
+	  +T createDuplicate();
+	  +dynamic onError()
 	]
 	
-	[CustomColor]o-[Color]
-	
-	[LanguagePicker
+	[&lt;abstract&gt;ModelRepository
 	  |
-	  +languagePickerType: LanguagePickerType;
-	  +iconColor: Color?;
-	  +offset: Offset?
+	  +delegate: IModelRepositoryDelegate&lt;T&gt;;
+	  -_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;;
+	  -_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;;
+	  +modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;;
+	  +modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;;
+	  -_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;
+	  |
+	  +WrappedModel&lt;T&gt;? get();
+	  +dynamic fetchAll();
+	  +dynamic fetch();
+	  +dynamic save();
+	  +dynamic delete();
+	  +dynamic duplicateAndSave();
+	  +dynamic duplicateAndSaveFromRemote();
+	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
+	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
+	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
+	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
+	  -dynamic _buildModelSpecificController();
+	  +dynamic ensurePersisted();
+	  +WrappedModel&lt;T&gt; upsertLocally();
+	  +List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally();
+	  +dynamic emitUpdate();
+	  +dynamic emitModelEvent();
+	  +dynamic emitError();
+	  +void dispose();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
 	]
 	
-	[LanguagePicker]o-[LanguagePickerType]
-	[LanguagePicker]o-[Color]
-	[LanguagePicker]o-[Offset]
+	[&lt;abstract&gt;ModelRepository]o-[&lt;abstract&gt;IModelRepositoryDelegate]
+	[&lt;abstract&gt;ModelRepository]o-[BehaviorSubject]
+	[&lt;abstract&gt;IModelRepository]&lt;:-[&lt;abstract&gt;ModelRepository]
 	
-	[LanguagePickerType
+	[&lt;abstract&gt;ModelEvent
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;LanguagePickerType&gt;;
-	  &lt;static&gt;+field: LanguagePickerType;
-	  &lt;static&gt;+icon: LanguagePickerType
+	  +modelId: String;
+	  +model: T
 	]
 	
-	[LanguagePickerType]o-[LanguagePickerType]
-	[Enum]&lt;:--[LanguagePickerType]
-	
-	[PlatformLocaleMobile
-	  |
-	  +Locale getPlatformLocale()
+	[IsFetched
 	]
 	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleMobile]
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsFetched]
 	
-	[&lt;abstract&gt;PlatformLocale
-	  |
-	  +Locale getPlatformLocale()
+	[IsSaving
 	]
 	
-	[PlatformLocaleWeb
-	  |
-	  +Locale getPlatformLocale()
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaving]
+	
+	[IsSaved
 	]
 	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleWeb]
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaved]
 	
-	[AppTranslation
-	  |
-	  &lt;static&gt;+dynamic init()
+	[IsDeleted
 	]
 	
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsDeleted]
+	
 	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
+	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="4748.0" width="84324.8" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="4748.0" width="84279.3" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
 				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M2163.5 1823.2 L1891.25 1936 L17708.25 2618.5914002066957 L17708.3 2618.6 " fill="none"></path>
+					<path d="M25639.0 158.2 L25380.5 293 L25380.5 591 L25380.5 591.0 " fill="none"></path>
+					<path d="M25641.4 162.9 L25639.0 158.2 L25636.5 153.4 L25650.8 152.0 Z"></path>
+					<path d="M25680.5 165.3 L25680.5 293 L25680.5 591 L25680.5 591.0 " fill="none"></path>
+					<path d="M25685.8 165.3 L25680.5 165.3 L25675.2 165.3 L25680.5 152.0 Z"></path>
+					<path d="M207.0 2704.7 L207 3314 L64938 3500.41216617898 L64938.0 3500.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2174.2 1824.5 L2163.5 1823.2 L2170.1 1814.7 L2180.8 1816.0 Z"></path>
+						<path d="M212.3 2695.3 L207.0 2704.7 L201.7 2695.3 L207.0 2686.0 Z"></path>
 					</g>
-					<path d="M2163.7 1832.5 L1931.25 1936 L1931.25 2609.5 L1931.3 2609.5 " fill="none"></path>
+					<path d="M442.9 3408.2 L456 3402 L463.5 3402 L463.5 3402 L471 3500.5 L471 3500.5 L463.5 3599 L463.5 3599 L456 3599 L456 3599 L426 3584.8612440191387 L426.0 3584.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2174.4 1833.5 L2163.7 1832.5 L2170.1 1823.8 L2180.8 1824.9 Z"></path>
+						<path d="M432.2 3407.3 L442.9 3408.2 L436.7 3417.0 L426.0 3416.1 Z"></path>
 					</g>
-					<path d="M2257.8 1929.9 L2252.25 1936 L2252.25 2609.5 L2252.3 2609.5 " fill="none"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3061.8 2635.5 L247 3314 L247 3402 L247.0 3402.0 " fill="none"></path>
+					</g>
+					<path d="M3063.0 2640.7 L3061.8 2635.5 L3060.5 2630.3 L3074.8 2632.4 Z"></path>
+					<path d="M3821.2 2726.9 L3721.5 3314 L3470.9490616621983 3469.5 L3470.9 3469.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2268.0 1926.5 L2257.8 1929.9 L2260.0 1919.4 L2270.2 1916.0 Z"></path>
+						<path d="M3828.0 2718.6 L3821.2 2726.9 L3817.5 2716.8 L3824.3 2708.5 Z"></path>
 					</g>
-					<path d="M2649.1 1930.7 L2653.25 1936 L2653.25 2609.5 L2653.3 2609.5 " fill="none"></path>
+					<path d="M3864.1 2726.6 L4012.25 3314 L3725.0348525469167 3454.5 L3725.0 3454.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2647.6 1920.1 L2649.1 1930.7 L2639.2 1926.6 L2637.6 1916.0 Z"></path>
+						<path d="M3867.0 2716.2 L3864.1 2726.6 L3856.7 2718.9 L3859.6 2708.5 Z"></path>
 					</g>
-					<path d="M2770.0 1823.2 L3042.25 1936 L3042.25 2609.5 L3042.3 2609.5 " fill="none"></path>
+					<path d="M1867.5 3550.2 L1867.5 3687 L1867.5 3797.5 L1867.5 3797.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2763.4 1814.7 L2770.0 1823.2 L2759.3 1824.5 L2752.8 1816.0 Z"></path>
+						<path d="M1872.8 3540.8 L1867.5 3550.2 L1862.2 3540.8 L1867.5 3531.5 Z"></path>
 					</g>
-					<path d="M17832.1 2749.8 L17720.75 3314 L17720.75 3485 L17720.8 3485.0 " fill="none"></path>
+					<path d="M60380.8 3931.2 L60380.75 4000 L62172 4128.787391012743 L62172.0 4128.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17839.2 2741.7 L17832.1 2749.8 L17828.7 2739.6 L17835.7 2731.5 Z"></path>
+						<path d="M60386.1 3921.8 L60380.8 3931.2 L60375.4 3921.8 L60380.8 3912.5 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M60380.8 3567.3 L60380.75 3687 L60380.75 3774.5 L60380.8 3774.5 " fill="none"></path>
 					</g>
-					<path d="M17933.5 2747.3 L18289 3314 L2916 3498.264565056718 L2916.0 3498.3 " fill="none"></path>
+					<path d="M60386.1 3567.3 L60380.8 3567.3 L60375.4 3567.3 L60380.8 3554.0 Z"></path>
+					<path d="M4202.1 2719.6 L4052.25 3314 L21428.75 3500.11975936136 L21428.8 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17933.0 2736.6 L17933.5 2747.3 L17924.0 2742.2 L17923.6 2731.5 Z"></path>
+						<path d="M4209.6 2711.9 L4202.1 2719.6 L4199.3 2709.2 L4206.7 2701.5 Z"></path>
 					</g>
-					<path d="M3763.4 1718.0 L3229.5 1936 L17708.25 2618.005076142132 L17708.3 2618.0 " fill="none"></path>
-					<path d="M3765.5 1723.0 L3763.4 1718.0 L3761.4 1713.1 L3775.8 1713.0 Z"></path>
-					<path d="M2934.1 3449.9 L2946 3447 L2953.5 3447 L2953.5 3447 L2961 3500.5 L2961 3500.5 L2953.5 3554 L2953.5 3554 L2946 3554 L2946 3554 L2916 3546.5866050808313 L2916.0 3546.6 " fill="none"></path>
+					<path d="M4207.6 2719.8 L4092.25 3314 L25696 3500.1252295326194 L25696.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2923.8 3447.0 L2934.1 3449.9 L2926.3 3457.4 L2916.0 3454.4 Z"></path>
+						<path d="M4214.6 2711.7 L4207.6 2719.8 L4204.1 2709.6 L4211.1 2701.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3637.3 2646.6 L2342.25 3314 L2618.412198391421 3447 L2618.4 3447.0 " fill="none"></path>
+					<path d="M4213.1 2720.0 L4132.25 3314 L1634 3489.1098844310814 L1634.0 3489.1 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M4219.6 2711.5 L4213.1 2720.0 L4209.0 2710.0 L4215.6 2701.5 Z"></path>
 					</g>
-					<path d="M3639.8 2651.3 L3637.3 2646.6 L3634.9 2641.9 L3649.2 2640.5 Z"></path>
-					<path d="M3095.5 193.7 L3095.5 293 L3095.5 614 L3095.5 614.0 " fill="none"></path>
+					<path d="M1867.5 3908.2 L1867.5 4000 L6731 4131.738225186982 L6731.0 4131.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3100.8 184.3 L3095.5 193.7 L3090.2 184.3 L3095.5 175.0 Z"></path>
+						<path d="M1872.8 3898.8 L1867.5 3908.2 L1862.2 3898.8 L1867.5 3889.5 Z"></path>
 					</g>
-					<path d="M4909.5 2712.7 L4909.5 3314 L59360 3500.3425770462322 L59360.0 3500.3 " fill="none"></path>
+					<path d="M4336.6 2709.6 L5127 3314 L3489 3493.0662368112544 L3489.0 3493.1 " fill="none"></path>
+					<path d="M4339.9 2705.4 L4336.6 2709.6 L4333.4 2713.8 L4326.0 2701.5 Z"></path>
+					<path d="M4361.7 2708.5 L5345.75 3314 L3733 3489.406254556058 L3733.0 3489.4 " fill="none"></path>
+					<path d="M4364.5 2703.9 L4361.7 2708.5 L4358.9 2713.0 L4350.3 2701.5 Z"></path>
+					<path d="M1651.8 3443.4 L1664 3439.5 L1671.5 3439.5 L1671.5 3439.5 L1679 3500.5 L1679 3500.5 L1671.5 3561.5 L1671.5 3561.5 L1664 3561.5 L1664 3561.5 L1634 3551.9935064935066 L1634.0 3552.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4914.8 2703.3 L4909.5 2712.7 L4904.2 2703.3 L4909.5 2694.0 Z"></path>
+						<path d="M1641.3 3441.1 L1651.8 3443.4 L1644.5 3451.3 L1634.0 3449.0 Z"></path>
 					</g>
-					<path d="M14922.1 1734.3 L14501.75 1936 L14501.75 2594 L14501.8 2594.0 " fill="none"></path>
-					<path d="M14924.4 1739.1 L14922.1 1734.3 L14919.8 1729.5 L14934.2 1728.5 Z"></path>
-					<path d="M14498.4 2669.3 L14449.25 3314 L11511.25 3491.9594024033777 L11511.3 3492.0 " fill="none"></path>
-					<path d="M14503.7 2669.7 L14498.4 2669.3 L14493.1 2668.9 L14499.4 2656.0 Z"></path>
-					<path d="M14959.2 1738.0 L14766.25 1936 L14766.25 2594 L14766.3 2594.0 " fill="none"></path>
-					<path d="M14963.0 1741.8 L14959.2 1738.0 L14955.4 1734.3 L14968.5 1728.5 Z"></path>
-					<path d="M14977.8 1740.5 L14882.5 1936 L17424.96806966618 2594 L17425.0 2594.0 " fill="none"></path>
-					<path d="M14982.6 1742.8 L14977.8 1740.5 L14973.0 1738.1 L14983.6 1728.5 Z"></path>
-					<path d="M17544.8 2669.3 L17544.75 3314 L16508.25 3479.36120615911 L16508.3 3479.4 " fill="none"></path>
-					<path d="M17550.1 2669.3 L17544.8 2669.3 L17539.4 2669.3 L17544.8 2656.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M14522.1 2668.1 L14826.75 3314 L16243.25 3484.546965784377 L16243.3 3484.5 " fill="none"></path>
+						<path d="M3062.1 2639.2 L1016 3314 L1322.5160857908847 3439.5 L1322.5 3439.5 " fill="none"></path>
 					</g>
-					<path d="M14526.9 2665.8 L14522.1 2668.1 L14517.2 2670.3 L14516.4 2656.0 Z"></path>
-					<path d="M14984.8 1741.2 L14922.5 1936 L16604.506531204643 2594 L16604.5 2594.0 " fill="none"></path>
-					<path d="M14989.9 1742.8 L14984.8 1741.2 L14979.7 1739.6 L14988.8 1728.5 Z"></path>
-					<path d="M16683.8 2669.3 L16683.75 3314 L16683.75 3469.5 L16683.8 3469.5 " fill="none"></path>
-					<path d="M16689.1 2669.3 L16683.8 2669.3 L16678.4 2669.3 L16683.8 2656.0 Z"></path>
-					<path d="M15006.2 1741.6 L15038.75 1936 L15038.75 2594 L15038.8 2594.0 " fill="none"></path>
-					<path d="M15011.4 1740.8 L15006.2 1741.6 L15000.9 1742.5 L15003.9 1728.5 Z"></path>
-					<path d="M4024.5 165.3 L4024.5 293 L4024.5 583 L4024.5 583.0 " fill="none"></path>
-					<path d="M4029.8 165.3 L4024.5 165.3 L4019.2 165.3 L4024.5 152.0 Z"></path>
-					<path d="M5975.6 3931.0 L5966.75 4000 L50246.75 4133.780959359676 L50246.8 4133.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5982.0 3922.4 L5975.6 3931.0 L5971.5 3921.1 L5977.9 3912.5 Z"></path>
+					<path d="M3063.8 2644.3 L3062.1 2639.2 L3060.4 2634.2 L3074.8 2635.1 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M26202.5 180.8 L26202.5 293 L26202.5 598.5 L26202.5 598.5 " fill="none"></path>
 					</g>
-					<path d="M6173.5 3919.5 L6371 4000 L5375.25 4124.67227283345 L5375.3 4124.7 " fill="none"></path>
+					<path d="M26207.8 180.8 L26202.5 180.8 L26197.2 180.8 L26202.5 167.5 Z"></path>
+					<path d="M5521.4 2704.2 L5385.75 3314 L21428.75 3500.0882234039245 L21428.8 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6166.8 3911.1 L6173.5 3919.5 L6162.8 3921.0 L6156.2 3912.5 Z"></path>
+						<path d="M5528.6 2696.3 L5521.4 2704.2 L5518.2 2694.0 L5525.4 2686.0 Z"></path>
 					</g>
-					<path d="M4428.5 165.3 L4428.5 293 L4428.5 583.5 L4428.5 583.5 " fill="none"></path>
-					<path d="M4433.8 165.3 L4428.5 165.3 L4423.2 165.3 L4428.5 152.0 Z"></path>
-					<path d="M4763.5 165.3 L4763.5 293 L4763.5 583.5 L4763.5 583.5 " fill="none"></path>
-					<path d="M4768.8 165.3 L4763.5 165.3 L4758.2 165.3 L4763.5 152.0 Z"></path>
-					<path d="M3776.5 1719.9 L3416.75 1936 L3416.75 2541 L3416.8 2541.0 " fill="none"></path>
-					<path d="M3779.3 1724.4 L3776.5 1719.9 L3773.8 1715.3 L3787.9 1713.0 Z"></path>
-					<path d="M6514.6 3963.8 L6481.75 4000 L5549.25 4125.017508754378 L5549.3 4125.0 " fill="none"></path>
+					<path d="M5550.0 2704.5 L5634.25 3314 L3935 3492.01439404578 L3935.0 3492.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6524.8 3960.5 L6514.6 3963.8 L6516.9 3953.3 L6527.1 3950.0 Z"></path>
+						<path d="M5554.0 2694.5 L5550.0 2704.5 L5543.4 2696.0 L5547.4 2686.0 Z"></path>
 					</g>
-					<path d="M6544.1 3965.6 L6521.75 4000 L22095 4133.285356156291 L22095.0 4133.3 " fill="none"></path>
+					<path d="M5903.4 2742.1 L5756.25 3314 L32617.5 3500.1223679444192 L32617.5 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6553.7 3960.7 L6544.1 3965.6 L6544.8 3954.9 L6554.3 3950.0 Z"></path>
+						<path d="M5910.9 2734.4 L5903.4 2742.1 L5900.5 2731.7 L5908.0 2724.0 Z"></path>
 					</g>
-					<path d="M6769.2 3961.8 L6816.25 4000 L29878.5 4133.582956006787 L29878.5 4133.6 " fill="none"></path>
+					<path d="M5910.1 2742.3 L5796.25 3314 L28098.25 3499.8084878266695 L28098.3 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6765.4 3951.7 L6769.2 3961.8 L6758.6 3960.0 L6754.7 3950.0 Z"></path>
+						<path d="M5917.2 2734.2 L5910.1 2742.3 L5906.7 2732.1 L5913.8 2724.0 Z"></path>
 					</g>
-					<path d="M6797.5 3960.4 L6856.25 4000 L5881.2779850746265 4118.5 L5881.3 4118.5 " fill="none"></path>
+					<path d="M5916.9 2742.5 L5836.25 3314 L4279.141420911528 3485 L4279.1 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6792.7 3950.8 L6797.5 3960.4 L6786.7 3959.6 L6782.0 3950.0 Z"></path>
+						<path d="M5923.5 2734.0 L5916.9 2742.5 L5912.9 2732.5 L5919.5 2724.0 Z"></path>
 					</g>
-					<path d="M51924.8 3529.3 L51924.75 3687 L51924.75 3805 L51924.8 3805.0 " fill="none"></path>
-					<path d="M51930.1 3529.3 L51924.8 3529.3 L51919.4 3529.3 L51924.8 3516.0 Z"></path>
-					<path d="M5097.7 193.7 L5033 293 L5033 598.5 L5033.0 598.5 " fill="none"></path>
-					<path d="M5102.2 196.6 L5097.7 193.7 L5093.3 190.8 L5105.0 182.5 Z"></path>
-					<path d="M5172.3 193.7 L5237 293 L5237 598.5 L5237.0 598.5 " fill="none"></path>
-					<path d="M5176.7 190.8 L5172.3 193.7 L5167.8 196.6 L5165.0 182.5 Z"></path>
-					<path d="M5665.5 160.8 L5516.5 293 L5516.5 575.5 L5516.5 575.5 " fill="none"></path>
-					<path d="M5669.1 164.8 L5665.5 160.8 L5662.0 156.9 L5675.5 152.0 Z"></path>
-					<path d="M5720.5 160.8 L5869.5 293 L5869.5 598.5 L5869.5 598.5 " fill="none"></path>
-					<path d="M5724.0 156.9 L5720.5 160.8 L5716.9 164.8 L5710.5 152.0 Z"></path>
-					<path d="M6257.5 724.7 L6257.5 966 L6257.5 1197 L6257.5 1197.0 " fill="none"></path>
+					<path d="M5964.6 2742.0 L6116.5 3314 L4507 3491.3540620384047 L4507.0 3491.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6262.8 715.3 L6257.5 724.7 L6252.2 715.3 L6257.5 706.0 Z"></path>
+						<path d="M5967.3 2731.7 L5964.6 2742.0 L5957.0 2734.4 L5959.8 2724.0 Z"></path>
 					</g>
-					<path d="M6257.5 165.3 L6257.5 293 L6257.5 553 L6257.5 553.0 " fill="none"></path>
-					<path d="M6262.8 165.3 L6257.5 165.3 L6252.2 165.3 L6257.5 152.0 Z"></path>
-					<path d="M7067.4 3911.3 L6987.25 4000 L6005.75 4130.025704399407 L6005.8 4130.0 " fill="none"></path>
+					<path d="M6421.6 2719.4 L6246 3314 L23930.25 3499.7751468041065 L23930.3 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7077.6 3908.0 L7067.4 3911.3 L7069.7 3900.8 L7079.9 3897.5 Z"></path>
+						<path d="M6429.4 2712.0 L6421.6 2719.4 L6419.1 2708.9 L6426.9 2701.5 Z"></path>
 					</g>
-					<path d="M56074.0 4214.2 L56074 4268 L60064 4450.319000367512 L60064.0 4450.3 " fill="none"></path>
+					<path d="M6427.0 2719.7 L6286 3314 L10158 3498.3809523809523 L10158.0 3498.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56079.3 4204.8 L56074.0 4214.2 L56068.7 4204.8 L56074.0 4195.5 Z"></path>
+						<path d="M6434.4 2711.8 L6427.0 2719.7 L6424.0 2709.3 L6431.3 2701.5 Z"></path>
 					</g>
-					<path d="M7128.8 3910.8 L7128.75 4000 L55806 4133.266282223505 L55806.0 4133.3 " fill="none"></path>
-					<path d="M7134.1 3910.8 L7128.8 3910.8 L7123.4 3910.8 L7128.8 3897.5 Z"></path>
-					<path d="M7240.4 3861.7 L8087.5 4000 L6254.25 4129.207363576595 L6254.3 4129.2 " fill="none"></path>
-					<path d="M7241.3 3856.5 L7240.4 3861.7 L7239.5 3867.0 L7227.3 3859.6 Z"></path>
-					<path d="M7990.5 2712.2 L7990.5 3314 L39589.25 3500.2436102047104 L39589.3 3500.2 " fill="none"></path>
+					<path d="M6455.0 2720.1 L6489.5 3314 L4869.813672922252 3485 L4869.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7995.8 2702.8 L7990.5 2712.2 L7985.2 2702.8 L7990.5 2693.5 Z"></path>
+						<path d="M6459.8 2710.5 L6455.0 2720.1 L6449.2 2711.1 L6453.9 2701.5 Z"></path>
 					</g>
-					<path d="M82314.0 152.3 L80401 293 L80401 629.5 L80401 629.5 L80401 966 L80401 966 L80401 1212.5 L80401 1212.5 L80401 1459 L80401 1459 L80401 1659 L80401.0 1659.0 " fill="none"></path>
-					<path d="M82314.3 157.6 L82314.0 152.3 L82313.6 147.0 L82327.3 151.3 Z"></path>
-					<path d="M351.2 3422.4 L364 3417 L371.5 3417 L371.5 3417 L379 3500.5 L379 3500.5 L371.5 3584 L371.5 3584 L364 3584 L364 3584 L334 3571.284263959391 L334.0 3571.3 " fill="none"></path>
+					<path d="M6950.0 2772.0 L6801.75 3314 L21539.75 3500.133744159274 L21539.8 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M340.5 3421.2 L351.2 3422.4 L344.7 3431.0 L334.0 3429.7 Z"></path>
+						<path d="M6957.6 2764.4 L6950.0 2772.0 L6947.4 2761.6 L6955.0 2754.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3638.3 2646.8 L2382.25 3314 L334 3486.4404130459316 L334.0 3486.4 " fill="none"></path>
-					</g>
-					<path d="M3640.8 2651.5 L3638.3 2646.8 L3635.8 2642.0 L3650.1 2640.5 Z"></path>
-					<path d="M60830.4 4165.3 L60287 4268 L60287 4454.5 L60287 4454.5 L60287 4641 L60287 4641 L60697 4674.344788087056 L60697.0 4674.3 " fill="none"></path>
+					<path d="M6958.5 2772.2 L6841.75 3314 L5712.25 3496.5405112651647 L5712.3 3496.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60840.6 4168.8 L60830.4 4165.3 L60838.6 4158.4 L60848.8 4161.9 Z"></path>
+						<path d="M6965.7 2764.2 L6958.5 2772.2 L6955.3 2762.0 L6962.4 2754.0 Z"></path>
 					</g>
-					<path d="M60831.4 4200.2 L60662.75 4268 L60662.75 4454.5 L60662.75 4454.5 L60662.75 4641 L60662.75 4641 L60790 4668.090704647676 L60790.0 4668.1 " fill="none"></path>
+					<path d="M7010.7 2772.5 L7086 3314 L5926.25 3487.485762983758 L5926.3 3487.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60842.1 4201.7 L60831.4 4200.2 L60838.1 4191.8 L60848.8 4193.3 Z"></path>
+						<path d="M7014.7 2762.5 L7010.7 2772.5 L7004.2 2764.0 L7008.2 2754.0 Z"></path>
 					</g>
-					<path d="M8206.0 3887.8 L8206 4000 L60848.75 4133.625593741269 L60848.8 4133.6 " fill="none"></path>
-					<path d="M8211.3 3887.8 L8206.0 3887.8 L8200.7 3887.8 L8206.0 3874.5 Z"></path>
-					<path d="M60925.7 4533.6 L60702.75 4641 L58470 4675.413383262781 L58470.0 4675.4 " fill="none"></path>
+					<path d="M7388.9 2697.0 L7319.5 3314 L6176.367292225201 3485 L6176.4 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60936.4 4534.4 L60925.7 4533.6 L60931.8 4524.8 L60942.5 4525.5 Z"></path>
+						<path d="M7395.2 2688.4 L7388.9 2697.0 L7384.6 2687.2 L7391.0 2678.5 Z"></path>
 					</g>
-					<path d="M60926.4 4550.6 L60772.5 4641 L60909 4665.660305343511 L60909.0 4665.7 " fill="none"></path>
+					<path d="M7412.2 2696.8 L7543.25 3314 L36070.5 3499.6604449291167 L36070.5 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60937.2 4550.5 L60926.4 4550.6 L60931.8 4541.3 L60942.5 4541.1 Z"></path>
+						<path d="M7415.5 2686.5 L7412.2 2696.8 L7405.1 2688.7 L7408.4 2678.5 Z"></path>
 					</g>
-					<path d="M60927.7 4578.7 L60846.25 4641 L60836.81338028169 4661 L60836.8 4661.0 " fill="none"></path>
+					<path d="M36199.5 3550.2 L36199.5 3687 L36199.5 3828 L36199.5 3828.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60938.3 4577.3 L60927.7 4578.7 L60931.8 4568.8 L60942.5 4567.4 Z"></path>
+						<path d="M36204.8 3540.8 L36199.5 3550.2 L36194.2 3540.8 L36199.5 3531.5 Z"></path>
 					</g>
-					<path d="M61107.4 4617.1 L61110 4641 L60750 4674.0659767141005 L60750.0 4674.1 " fill="none"></path>
+					<path d="M7729.5 2712.2 L7729.5 3314 L21428.75 3500.017956278782 L21428.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M61111.7 4607.2 L61107.4 4617.1 L61101.1 4608.3 L61105.4 4598.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M61083.7 4258.9 L61090 4268 L61090 4310.5 L61090.0 4310.5 " fill="none"></path>
+						<path d="M7734.8 2702.8 L7729.5 2712.2 L7724.2 2702.8 L7729.5 2693.5 Z"></path>
 					</g>
-					<path d="M61088.0 4255.9 L61083.7 4258.9 L61079.3 4262.0 L61076.0 4248.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M81795.3 1414.6 L81720 1459 L80795.5 1667.6028855250709 L80795.5 1667.6 " fill="none"></path>
-					</g>
-					<path d="M81798.0 1419.2 L81795.3 1414.6 L81792.6 1410.0 L81806.8 1407.8 Z"></path>
-					<path d="M81306.4 2746.4 L80875.5 3314 L80875.5 3500.5 L80875.5 3500.5 L80875.5 3687 L80875.5 3687 L80875.5 3843.5 L80875.5 3843.5 L80875.5 4000 L80875.5 4000 L80982.28264925373 4118.5 L80982.3 4118.5 " fill="none"></path>
+					<path d="M7999.1 2734.9 L7894.25 3314 L21428.75 3500.0121039056744 L21428.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81316.3 2742.2 L81306.4 2746.4 L81307.8 2735.7 L81317.7 2731.5 Z"></path>
+						<path d="M8006.0 2726.6 L7999.1 2734.9 L7995.5 2724.7 L8002.4 2716.5 Z"></path>
 					</g>
-					<path d="M81391.2 2750.1 L81358.5 3314 L81358.5 3500.5 L81358.5 3500.5 L81358.5 3687 L81358.5 3687 L81358.5 3843.5 L81358.5 3843.5 L81358.5 4000 L81358.5 4000 L68820.75 4132.671983890392 L68820.8 4132.7 " fill="none"></path>
+					<path d="M8043.7 2734.7 L8174 3314 L12912 3497.861215147732 L12912.0 3497.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81397.1 2741.1 L81391.2 2750.1 L81386.5 2740.5 L81392.3 2731.5 Z"></path>
+						<path d="M8046.8 2724.4 L8043.7 2734.7 L8036.4 2726.8 L8039.6 2716.5 Z"></path>
 					</g>
-					<path d="M81398.5 2750.2 L81398.5 3314 L81398.5 3500.5 L81398.5 3500.5 L81398.5 3687 L81398.5 3687 L81398.5 3843.5 L81398.5 3843.5 L81398.5 4000 L81398.5 4000 L61143.75 4133.031234300139 L61143.8 4133.0 " fill="none"></path>
+					<path d="M8339.4 2756.7 L8214 3314 L25696 3500.0370888134435 L25696.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81403.8 2740.8 L81398.5 2750.2 L81393.2 2740.8 L81398.5 2731.5 Z"></path>
+						<path d="M8346.6 2748.8 L8339.4 2756.7 L8336.2 2746.4 L8343.5 2738.5 Z"></path>
 					</g>
-					<path d="M81416.8 2750.0 L81499.25 3314 L69940.25 3498.4968548076513 L69940.3 3498.5 " fill="none"></path>
+					<path d="M8350.6 2757.0 L8273 3314 L8273 3500.5 L8273 3500.5 L8273 3687 L8273 3687 L8273 3843.5 L8273 3843.5 L8273 4000 L8273 4000 L18277.25 4133.042500930405 L18277.3 4133.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81420.7 2740.0 L81416.8 2750.0 L81410.1 2741.5 L81414.1 2731.5 Z"></path>
+						<path d="M8357.2 2748.5 L8350.6 2757.0 L8346.6 2747.0 L8353.2 2738.5 Z"></path>
 					</g>
-					<path d="M81424.0 2749.8 L81539.25 3314 L64748 3500.1618514720526 L64748.0 3500.2 " fill="none"></path>
+					<path d="M8358.3 2757.1 L8313 3314 L11377.75 3495.2656386268136 L11377.8 3495.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81427.3 2739.6 L81424.0 2749.8 L81416.9 2741.7 L81420.3 2731.5 Z"></path>
-					</g>
-					<path d="M81795.6 1435.8 L81760 1459 L81760 1697.5 L81760 1697.5 L81760 1936 L81760 1936 L81454.37772133527 2518.5 L81454.4 2518.5 " fill="none"></path>
-					<path d="M81798.5 1440.2 L81795.6 1435.8 L81792.7 1431.3 L81806.8 1428.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M80663.0 1741.8 L80663 1936 L81284.81240928882 2518.5 L81284.8 2518.5 " fill="none"></path>
+						<path d="M8364.3 2748.2 L8358.3 2757.1 L8353.7 2747.4 L8359.8 2738.5 Z"></path>
 					</g>
-					<path d="M80668.3 1741.8 L80663.0 1741.8 L80657.7 1741.8 L80663.0 1728.5 Z"></path>
-					<path d="M81873.8 2750.0 L81796.25 3314 L64748 3500.1669399107077 L64748.0 3500.2 " fill="none"></path>
+					<path d="M8365.9 2757.2 L8353 3314 L13098.75 3498.4594122857293 L13098.8 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81880.4 2741.5 L81873.8 2750.0 L81869.8 2740.0 L81876.4 2731.5 Z"></path>
+						<path d="M8371.5 2748.0 L8365.9 2757.2 L8360.8 2747.7 L8366.4 2738.5 Z"></path>
 					</g>
-					<path d="M81891.0 2750.2 L81891 3314 L81891 3500.5 L81891 3500.5 L81891 3687 L81891 3687 L81891 3843.5 L81891 3843.5 L81891 4000 L81891 4000 L68820.75 4132.7255745221 L68820.8 4132.7 " fill="none"></path>
+					<path d="M8388.0 2757.0 L8468 3314 L8468 3485 L8468.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81896.3 2740.8 L81891.0 2750.2 L81885.7 2740.8 L81891.0 2731.5 Z"></path>
+						<path d="M8391.9 2747.0 L8388.0 2757.0 L8381.4 2748.5 L8385.3 2738.5 Z"></path>
 					</g>
-					<path d="M81908.2 2750.0 L81985.75 3314 L69940.25 3498.5769246569716 L69940.3 3498.6 " fill="none"></path>
+					<path d="M8751.4 2719.5 L8666 3314 L8666 3485 L8666.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81912.2 2740.0 L81908.2 2750.0 L81901.6 2741.5 L81905.6 2731.5 Z"></path>
+						<path d="M8758.0 2711.0 L8751.4 2719.5 L8747.5 2709.5 L8754.1 2701.0 Z"></path>
 					</g>
-					<path d="M81950.6 1785.9 L81891 1936 L81891 2518.5 L81891.0 2518.5 " fill="none"></path>
-					<path d="M81955.6 1787.9 L81950.6 1785.9 L81945.7 1783.9 L81955.6 1773.5 Z"></path>
-					<path d="M6839.1 181.7 L6649.5 293 L6649.5 614 L6649.5 614.0 " fill="none"></path>
-					<path d="M6841.8 186.3 L6839.1 181.7 L6836.4 177.1 L6850.6 175.0 Z"></path>
-					<path d="M10933.5 2772.7 L10933.5 3314 L47948 3500.225801882975 L47948.0 3500.2 " fill="none"></path>
+					<path d="M8823.5 2716.7 L9204.5 3314 L10158 3492.184118236473 L10158.0 3492.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10938.8 2763.3 L10933.5 2772.7 L10928.2 2763.3 L10933.5 2754.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M34049.7 136.9 L7382 293 L7382 614 L7382.0 614.0 " fill="none"></path>
-					</g>
-					<path d="M34049.7 142.2 L34049.7 136.9 L34049.6 131.5 L34063.0 136.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M7382.0 658.3 L7382 966 L7382 1197 L7382.0 1197.0 " fill="none"></path>
+						<path d="M8823.0 2706.0 L8823.5 2716.7 L8814.0 2711.7 L8813.5 2701.0 Z"></path>
 					</g>
-					<path d="M7387.3 658.3 L7382.0 658.3 L7376.7 658.3 L7382.0 645.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M82438.9 172.5 L82137.75 293 L82137.75 501 L82137.8 501.0 " fill="none"></path>
-					</g>
-					<path d="M82440.9 177.4 L82438.9 172.5 L82436.9 167.5 L82451.3 167.5 Z"></path>
-					<path d="M81988.3 1454.9 L81985.75 1459 L81985.75 1621.5 L81985.8 1621.5 " fill="none"></path>
+					<path d="M8828.6 2716.3 L9244.5 3314 L21428.75 3499.958192679883 L21428.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81997.7 1449.7 L81988.3 1454.9 L81988.6 1444.1 L81998.1 1439.0 Z"></path>
+						<path d="M8827.6 2705.6 L8828.6 2716.3 L8818.8 2711.7 L8817.9 2701.0 Z"></path>
 					</g>
-					<path d="M82310.3 1454.2 L82313.75 1459 L82313.75 1697.5 L82313.75 1697.5 L82313.75 1936 L82313.75 1936 L82313.75 2625 L82313.75 2625 L82313.75 3314 L82313.75 3314 L82313.75 3500.5 L82313.75 3500.5 L82313.75 3687 L82313.75 3687 L82313.75 3843.5 L82313.75 3843.5 L82313.75 4000 L82313.75 4000 L50391.75 4133.696354060854 L50391.8 4133.7 " fill="none"></path>
+					<path d="M8833.5 2715.9 L9284.5 3314 L23930.25 3499.625469341987 L23930.3 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82309.2 1443.5 L82310.3 1454.2 L82300.6 1449.7 L82299.5 1439.0 Z"></path>
+						<path d="M8832.2 2705.2 L8833.5 2715.9 L8823.7 2711.7 L8822.3 2701.0 Z"></path>
 					</g>
-					<path d="M82137.8 771.3 L82137.75 966 L82137.75 986 L82137.8 986.0 " fill="none"></path>
-					<path d="M82143.1 771.3 L82137.8 771.3 L82132.4 771.3 L82137.8 758.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M34049.7 136.9 L8988.5 293 L8988.5 614 L8988.5 614.0 " fill="none"></path>
-					</g>
-					<path d="M34049.7 142.2 L34049.7 136.9 L34049.6 131.5 L34063.0 136.8 Z"></path>
-					<path d="M8915.1 647.8 L7639.5 966 L7639.5 1197 L7639.5 1197.0 " fill="none"></path>
-					<path d="M8916.4 653.0 L8915.1 647.8 L8913.8 642.6 L8928.0 644.6 Z"></path>
-					<path d="M8926.9 649.0 L7927 966 L7927 1197 L7927.0 1197.0 " fill="none"></path>
-					<path d="M8928.5 654.1 L8926.9 649.0 L8925.3 643.9 L8939.6 645.0 Z"></path>
-					<path d="M8941.3 650.4 L8227.5 966 L8227.5 1197 L8227.5 1197.0 " fill="none"></path>
-					<path d="M8943.4 655.3 L8941.3 650.4 L8939.1 645.5 L8953.4 645.0 Z"></path>
-					<path d="M8956.3 652.8 L8524 966 L8524 1197 L8524.0 1197.0 " fill="none"></path>
-					<path d="M8959.4 657.1 L8956.3 652.8 L8953.2 648.5 L8967.1 645.0 Z"></path>
-					<path d="M8975.7 657.1 L8832 966 L8832 1197 L8832.0 1197.0 " fill="none"></path>
-					<path d="M8980.5 659.3 L8975.7 657.1 L8970.8 654.8 L8981.3 645.0 Z"></path>
-					<path d="M9002.2 656.9 L9156 966 L9156 1197 L9156.0 1197.0 " fill="none"></path>
-					<path d="M9006.9 654.6 L9002.2 656.9 L8997.4 659.3 L8996.2 645.0 Z"></path>
-					<path d="M9021.0 652.8 L9459.5 966 L9459.5 1197 L9459.5 1197.0 " fill="none"></path>
-					<path d="M9024.1 648.4 L9021.0 652.8 L9017.9 657.1 L9010.2 645.0 Z"></path>
-					<path d="M9035.9 650.4 L9753 966 L9753 1197 L9753.0 1197.0 " fill="none"></path>
-					<path d="M9038.1 645.5 L9035.9 650.4 L9033.8 655.3 L9023.7 645.0 Z"></path>
-					<path d="M9050.8 649.0 L10064 966 L10064 1197 L10064.0 1197.0 " fill="none"></path>
-					<path d="M9052.4 643.9 L9050.8 649.0 L9049.2 654.1 L9038.0 645.0 Z"></path>
-					<path d="M9061.9 647.8 L10337.5 966 L10337.5 1197 L10337.5 1197.0 " fill="none"></path>
-					<path d="M9063.2 642.6 L9061.9 647.8 L9060.6 653.0 L9049.0 644.6 Z"></path>
-					<path d="M58399.5 4639.7 L58399.5 4641 L58399.5 4661 L58399.5 4661.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M58404.8 4630.3 L58399.5 4639.7 L58394.2 4630.3 L58399.5 4621.0 Z"></path>
-					</g>
-					<path d="M58036.4 4172.3 L57890 4268 L58160 4366.8321884200195 L58160.0 4366.8 " fill="none"></path>
-					<path d="M58039.3 4176.8 L58036.4 4172.3 L58033.5 4167.8 L58047.6 4165.0 Z"></path>
-					<path d="M58399.5 4215.8 L58399.5 4268 L58399.5 4288 L58399.5 4288.0 " fill="none"></path>
-					<path d="M58404.8 4215.8 L58399.5 4215.8 L58394.2 4215.8 L58399.5 4202.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M68695.3 4253.3 L68695.25 4268 L58639 4450.16163222689 L58639.0 4450.2 " fill="none"></path>
+					<path d="M8840.8 2715.3 L9343.5 3314 L6811 3487.8035878564856 L6811.0 3487.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M8838.9 2704.7 L8840.8 2715.3 L8830.7 2711.6 L8828.8 2701.0 Z"></path>
 					</g>
-					<path d="M68700.6 4253.3 L68695.3 4253.3 L68689.9 4253.3 L68695.3 4240.0 Z"></path>
-					<path d="M6881.6 185.9 L6806.5 293 L6806.5 614 L6806.5 614.0 " fill="none"></path>
-					<path d="M6886.0 189.0 L6881.6 185.9 L6877.2 182.9 L6889.3 175.0 Z"></path>
-					<path d="M6922.6 188.2 L6935.5 293 L6935.5 614 L6935.5 614.0 " fill="none"></path>
-					<path d="M6927.9 187.6 L6922.6 188.2 L6917.3 188.9 L6921.0 175.0 Z"></path>
-					<path d="M6959.9 184.9 L7057.5 293 L7057.5 614 L7057.5 614.0 " fill="none"></path>
-					<path d="M6963.9 181.3 L6959.9 184.9 L6956.0 188.5 L6951.0 175.0 Z"></path>
-					<path d="M6993.4 181.7 L7183 293 L7183 614 L7183.0 614.0 " fill="none"></path>
-					<path d="M6996.1 177.1 L6993.4 181.7 L6990.7 186.3 L6981.9 175.0 Z"></path>
-					<path d="M58102.4 4183.5 L58115 4268 L58115 4454.5 L58115 4454.5 L58115 4641 L58115 4641 L58329 4667.702987697715 L58329.0 4667.7 " fill="none"></path>
+					<path d="M9547.0 2719.5 L9383.5 3314 L21428.75 3499.9519586946176 L21428.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58106.3 4173.4 L58102.4 4183.5 L58095.7 4175.0 L58099.6 4165.0 Z"></path>
+						<path d="M9554.6 2711.9 L9547.0 2719.5 L9544.3 2709.1 L9552.0 2701.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M34049.7 136.9 L10135.25 293 L10135.25 583.5 L10135.3 583.5 " fill="none"></path>
+					<path d="M9567.5 2720.1 L9533.25 3314 L6811 3488.6322555679767 L6811.0 3488.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M9573.4 2711.1 L9567.5 2720.1 L9562.7 2710.5 L9568.6 2701.5 Z"></path>
 					</g>
-					<path d="M34049.7 142.2 L34049.7 136.9 L34049.6 131.6 L34063.0 136.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M82345.0 1449.0 L82353.75 1459 L82353.75 1697.5 L82353.75 1697.5 L82353.75 1936 L82353.75 1936 L82353.75 2625 L82353.75 2625 L82353.75 3314 L82353.75 3314 L69940.25 3498.6333639046175 L69940.3 3498.6 " fill="none"></path>
+					<path d="M9593.6 2719.7 L9722.75 3314 L10162.628016085791 3485 L10162.6 3485.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M9596.8 2709.5 L9593.6 2719.7 L9586.4 2711.8 L9589.6 2701.5 Z"></path>
 					</g>
-					<path d="M82349.0 1445.5 L82345.0 1449.0 L82341.0 1452.5 L82336.2 1439.0 Z"></path>
-					<path d="M81035.0 3949.8 L80996.25 4000 L68820.75 4132.632875375985 L68820.8 4132.6 " fill="none"></path>
+					<path d="M9912.5 2720.2 L9912.5 3314 L10178.398123324398 3485 L10178.4 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81044.9 3945.6 L81035.0 3949.8 L81036.5 3939.1 L81046.4 3935.0 Z"></path>
+						<path d="M9917.8 2710.8 L9912.5 2720.2 L9907.2 2710.8 L9912.5 2701.5 Z"></path>
 					</g>
-					<path d="M81061.2 3951.6 L81036.25 4000 L61143.75 4133.013722554891 L61143.8 4133.0 " fill="none"></path>
+					<path d="M10361.5 2712.7 L10344 3314 L10214.260053619302 3485 L10214.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81070.2 3945.7 L81061.2 3951.6 L81060.8 3940.8 L81069.8 3935.0 Z"></path>
+						<path d="M10367.1 2703.5 L10361.5 2712.7 L10356.4 2703.2 L10362.0 2694.0 Z"></path>
 					</g>
-					<path d="M81172.8 3951.6 L81197.75 4000 L81019.5578358209 4118.5 L81019.6 4118.5 " fill="none"></path>
+					<path d="M10380.8 2712.3 L10496.25 3314 L6811 3491.585201214392 L6811.0 3491.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81173.2 3940.8 L81172.8 3951.6 L81163.8 3945.7 L81164.2 3935.0 Z"></path>
+						<path d="M10384.2 2702.2 L10380.8 2712.3 L10373.8 2704.2 L10377.2 2694.0 Z"></path>
 					</g>
-					<path d="M81199.0 3949.8 L81237.75 4000 L30022.5 4133.811883070353 L30022.5 4133.8 " fill="none"></path>
+					<path d="M6829.6 3490.1 L7672.1666666666715 3447 L7887.4583333333285 3447 L7887.4583333333285 3447 L8102.75 3500.5 L8102.75 3500.5 L7887.4583333333285 3554 L7887.4583333333285 3554 L7672.1666666666715 3554 L7672.1666666666715 3554 L6811 3509.9607296479207 L6811.0 3510.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81197.5 3939.1 L81199.0 3949.8 L81189.1 3945.6 L81187.6 3935.0 Z"></path>
+						<path d="M6820.0 3485.2 L6829.6 3490.1 L6820.6 3495.9 L6811.0 3491.0 Z"></path>
 					</g>
-					<path d="M82382.6 1448.2 L82393.75 1459 L82393.75 1697.5 L82393.75 1697.5 L82393.75 1936 L82393.75 1936 L82393.75 2625 L82393.75 2625 L82393.75 3314 L82393.75 3314 L82393.75 3500.5 L82393.75 3500.5 L82393.75 3687 L82393.75 3687 L81318.5 3818.8007636577245 L81318.5 3818.8 " fill="none"></path>
-					<path d="M82386.3 1444.4 L82382.6 1448.2 L82378.9 1452.1 L82373.0 1439.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M69814.8 3552.3 L69814.75 3687 L80915.5 3840.709869716207 L80915.5 3840.7 " fill="none"></path>
+						<path d="M3062.1 2639.5 L1056 3314 L6441 3494.30565529623 L6441.0 3494.3 " fill="none"></path>
 					</g>
-					<path d="M69820.1 3552.3 L69814.8 3552.3 L69809.4 3552.3 L69814.8 3539.0 Z"></path>
-					<path d="M82025.2 3959.3 L82005.75 4000 L68820.75 4132.736561361331 L68820.8 4132.7 " fill="none"></path>
+					<path d="M3063.8 2644.6 L3062.1 2639.5 L3060.4 2634.4 L3074.8 2635.3 Z"></path>
+					<path d="M15730.5 3916.2 L15730.5 4000 L18277.25 4130.315799522673 L18277.3 4130.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82034.0 3953.2 L82025.2 3959.3 L82024.4 3948.6 L82033.2 3942.5 Z"></path>
+						<path d="M15735.8 3906.8 L15730.5 3916.2 L15725.2 3906.8 L15730.5 3897.5 Z"></path>
 					</g>
-					<path d="M82132.8 3959.5 L82151 4000 L61143.75 4133.065694465782 L61143.8 4133.1 " fill="none"></path>
+					<path d="M10640.2 2772.3 L10536.25 3314 L25696 3499.966380543634 L25696.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82133.8 3948.8 L82132.8 3959.5 L82124.1 3953.2 L82125.1 3942.5 Z"></path>
+						<path d="M10647.2 2764.2 L10640.2 2772.3 L10636.7 2762.2 L10643.7 2754.0 Z"></path>
 					</g>
-					<path d="M82020.9 1785.9 L82080.5 1936 L82080.5 2625 L82080.5 2625 L82080.5 3314 L82080.5 3314 L82080.5 3500.5 L82080.5 3500.5 L82080.5 3687 L82080.5 3687 L82080.5 3744.5 L82080.5 3744.5 " fill="none"></path>
-					<path d="M82025.8 1783.9 L82020.9 1785.9 L82015.9 1787.9 L82015.9 1773.5 Z"></path>
-					<path d="M67577.3 3578.8 L67524.75 3687 L67524.75 3843.5 L67524.75 3843.5 L67524.75 4000 L67524.75 4000 L68335 4125.4822305692 L68335.0 4125.5 " fill="none"></path>
+					<path d="M10658.9 2772.6 L10623.75 3314 L21539.75 3500.0058474189127 L21539.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67586.1 3572.7 L67577.3 3578.8 L67576.5 3568.1 L67585.4 3562.0 Z"></path>
+						<path d="M10664.8 2763.7 L10658.9 2772.6 L10654.2 2763.0 L10660.1 2754.0 Z"></path>
 					</g>
-					<path d="M67913.3 3943.7 L67880.75 4000 L68569.75 4113.352977286679 L68569.8 4113.4 " fill="none"></path>
+					<path d="M10667.5 2772.7 L10663.75 3314 L24426 3498.568782022472 L24426.0 3498.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67922.6 3938.2 L67913.3 3943.7 L67913.4 3932.9 L67922.7 3927.5 Z"></path>
+						<path d="M10672.9 2763.4 L10667.5 2772.7 L10662.2 2763.3 L10667.6 2754.0 Z"></path>
 					</g>
-					<path d="M67938.4 3945.3 L67920.75 4000 L61143.75 4131.145642284641 L61143.8 4131.1 " fill="none"></path>
+					<path d="M10676.1 2772.6 L10703.75 3314 L13098.75 3496.49948927477 L13098.8 3496.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67946.4 3938.0 L67938.4 3945.3 L67936.2 3934.7 L67944.1 3927.5 Z"></path>
+						<path d="M10680.9 2763.0 L10676.1 2772.6 L10670.3 2763.6 L10675.1 2754.0 Z"></path>
 					</g>
-					<path d="M68004.1 3945.3 L68021.75 4000 L68486.75 4128.078108941419 L68486.8 4128.1 " fill="none"></path>
+					<path d="M10695.8 2772.4 L10796 3314 L10247 3486.5164279696714 L10247.0 3486.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68006.3 3934.7 L68004.1 3945.3 L67996.1 3938.0 L67998.4 3927.5 Z"></path>
+						<path d="M10699.3 2762.2 L10695.8 2772.4 L10688.8 2764.1 L10692.4 2754.0 Z"></path>
 					</g>
-					<path d="M68029.2 3943.7 L68061.75 4000 L68352.03078358209 4118.5 L68352.0 4118.5 " fill="none"></path>
+					<path d="M24731.4 3437.0 L24744 3432 L24751.5 3432 L24751.5 3432 L24759 3500.5 L24759 3500.5 L24751.5 3569 L24751.5 3569 L24744 3569 L24744 3569 L24714 3557.189655172414 L24714.0 3557.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68029.1 3932.9 L68029.2 3943.7 L68019.9 3938.2 L68019.8 3927.5 Z"></path>
+						<path d="M24720.7 3435.4 L24731.4 3437.0 L24724.6 3445.4 L24714.0 3443.8 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M67744.5 3568.2 L67971.25 3687 L67971.25 3759.5 L67971.3 3759.5 " fill="none"></path>
+						<path d="M3062.1 2639.8 L1096 3314 L24426 3499.355925705035 L24426.0 3499.4 " fill="none"></path>
 					</g>
-					<path d="M67746.9 3563.5 L67744.5 3568.2 L67742.0 3572.9 L67732.6 3562.0 Z"></path>
-					<path d="M776.0 3450.3 L788 3447 L795.5 3447 L795.5 3447 L803 3500.5 L803 3500.5 L795.5 3554 L795.5 3554 L788 3554 L788 3554 L758 3545.8527918781724 L758.0 3545.9 " fill="none"></path>
+					<path d="M3063.9 2644.8 L3062.1 2639.8 L3060.4 2634.7 L3074.8 2635.5 Z"></path>
+					<path d="M10934.8 2779.9 L10836 3314 L21428.75 3499.877061134241 L21428.8 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M765.6 3447.6 L776.0 3450.3 L768.4 3457.8 L758.0 3455.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3644.1 2647.7 L2614.25 3314 L758 3485.1062028913875 L758.0 3485.1 " fill="none"></path>
+						<path d="M10941.8 2771.6 L10934.8 2779.9 L10931.3 2769.7 L10938.2 2761.5 Z"></path>
 					</g>
-					<path d="M3647.0 2652.2 L3644.1 2647.7 L3641.2 2643.3 L3655.3 2640.5 Z"></path>
-					<path d="M11074.3 3916.2 L11074.25 4000 L68569.75 4133.708144600059 L68569.8 4133.7 " fill="none"></path>
+					<path d="M10960.4 2780.2 L10949.75 3314 L21539.75 3499.990677088238 L21539.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11079.6 3906.8 L11074.3 3916.2 L11068.9 3906.8 L11074.3 3897.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M11074.3 3552.3 L11074.25 3687 L11074.25 3789.5 L11074.3 3789.5 " fill="none"></path>
+						<path d="M10965.9 2770.9 L10960.4 2780.2 L10955.3 2770.7 L10960.8 2761.5 Z"></path>
 					</g>
-					<path d="M11079.6 3552.3 L11074.3 3552.3 L11068.9 3552.3 L11074.3 3539.0 Z"></path>
-					<path d="M11236.3 2749.8 L11118 3314 L51895.75 3500.3674606529557 L51895.8 3500.4 " fill="none"></path>
+					<path d="M10989.1 2779.9 L11077.25 3314 L13098.75 3495.779050144648 L13098.8 3495.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11243.5 2741.7 L11236.3 2749.8 L11233.0 2739.5 L11240.2 2731.5 Z"></path>
+						<path d="M10992.8 2769.8 L10989.1 2779.9 L10982.3 2771.6 L10986.0 2761.5 Z"></path>
 					</g>
-					<path d="M11291.5 2749.7 L11422.5 3314 L39892.25 3500.2677357679727 L39892.3 3500.3 " fill="none"></path>
+					<path d="M11231.0 2704.7 L11231 3314 L32617.5 3500.025943286227 L32617.5 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11294.5 2739.4 L11291.5 2749.7 L11284.1 2741.8 L11287.2 2731.5 Z"></path>
+						<path d="M11236.3 2695.3 L11231.0 2704.7 L11225.7 2695.3 L11231.0 2686.0 Z"></path>
 					</g>
-					<path d="M10177.2 2721.5 L8307.75 3314 L40720.75 3499.3704941659894 L40720.8 3499.4 " fill="none"></path>
+					<path d="M11503.9 2734.4 L11397.5 3314 L21428.75 3499.8423150470608 L21428.8 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10187.7 2723.7 L10177.2 2721.5 L10184.5 2713.5 L10195.0 2715.8 Z"></path>
+						<path d="M11510.9 2726.1 L11503.9 2734.4 L11500.4 2724.2 L11507.3 2716.0 Z"></path>
 					</g>
-					<path d="M10520.9 2756.9 L10687.5 3314 L59150 3500.1734641330654 L59150.0 3500.2 " fill="none"></path>
+					<path d="M11520.8 2734.7 L11503.75 3314 L5233 3496.2281757625337 L5233.0 3496.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10523.4 2746.4 L10520.9 2756.9 L10513.1 2749.5 L10515.6 2739.0 Z"></path>
-					</g>
-					<path d="M58144.2 631.5 L10481.5 966 L10481.5 1212.5 L10481.5 1212.5 L10481.5 1459 L10481.5 1459 L10481.5 1697.5 L10481.5 1697.5 L10481.5 1936 L10481.5 1936 L10481.5 2511 L10481.5 2511.0 " fill="none"></path>
-					<path d="M58144.2 636.8 L58144.2 631.5 L58144.1 626.2 L58157.5 631.4 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M11950.3 2676.5 L11812 3314 L6554.25 3496.2875633220247 L6554.3 3496.3 " fill="none"></path>
-					</g>
-					<path d="M11955.5 2677.7 L11950.3 2676.5 L11945.1 2675.4 L11953.1 2663.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M12264.5 2706.8 L12264.5 3314 L6554.25 3496.6144167702664 L6554.3 3496.6 " fill="none"></path>
+						<path d="M11526.4 2725.5 L11520.8 2734.7 L11515.7 2725.2 L11521.3 2716.0 Z"></path>
 					</g>
-					<path d="M12269.8 2706.8 L12264.5 2706.8 L12259.2 2706.8 L12264.5 2693.5 Z"></path>
-					<path d="M12543.4 1346.8 L12432.75 1459 L12432.75 1644 L12432.8 1644.0 " fill="none"></path>
+					<path d="M11527.1 2734.7 L11543.75 3314 L13098.75 3494.4090202177294 L13098.8 3494.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12553.7 1343.9 L12543.4 1346.8 L12546.1 1336.4 L12556.5 1333.5 Z"></path>
+						<path d="M11532.2 2725.2 L11527.1 2734.7 L11521.5 2725.5 L11526.6 2716.0 Z"></path>
 					</g>
-					<path d="M12861.1 1270.3 L13466 1459 L21406.75 1695.0623071889315 L21406.8 1695.1 " fill="none"></path>
+					<path d="M11544.0 2734.4 L11650.25 3314 L11481.542225201072 3485 L11481.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12853.7 1262.4 L12861.1 1270.3 L12850.6 1272.6 L12843.3 1264.7 Z"></path>
+						<path d="M11547.6 2724.2 L11544.0 2734.4 L11537.1 2726.1 L11540.7 2716.0 Z"></path>
 					</g>
-					<path d="M12861.4 1257.7 L13689 1459 L13689 1697.5 L13689 1697.5 L13689 1936 L13689 1936 L13689 2625 L13689 2625 L13689 3314 L13689 3314 L39892.25 3500.247672812158 L39892.3 3500.2 " fill="none"></path>
+					<path d="M5250.6 3443.8 L5263 3439.5 L5270.5 3439.5 L5270.5 3439.5 L5278 3500.5 L5278 3500.5 L5270.5 3561.5 L5270.5 3561.5 L5263 3561.5 L5263 3561.5 L5233 3551.1610169491523 L5233.0 3551.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12853.6 1250.3 L12861.4 1257.7 L12851.1 1260.6 L12843.3 1253.2 Z"></path>
+						<path d="M5240.1 3441.8 L5250.6 3443.8 L5243.6 3451.8 L5233.0 3449.8 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M3096.2 2653.2 L2883.25 3314 L4939 3488.0539666326185 L4939.0 3488.1 " fill="none"></path>
 					</g>
-					<path d="M12861.4 1256.0 L13729 1459 L13729 1697.5 L13729 1697.5 L13729 1936 L13729 1936 L13729 2625 L13729 2625 L13729 3314 L13729 3314 L6221.25 3495.35483923194 L6221.3 3495.4 " fill="none"></path>
+					<path d="M3101.2 2654.8 L3096.2 2653.2 L3091.1 2651.6 L3100.3 2640.5 Z"></path>
+					<path d="M27178.1 175.9 L26468 293 L26468 614 L26468.0 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12853.6 1248.6 L12861.4 1256.0 L12851.1 1259.0 L12843.3 1251.7 Z"></path>
+						<path d="M27188.2 179.6 L27178.1 175.9 L27186.4 169.1 L27196.5 172.9 Z"></path>
 					</g>
-					<path d="M14998.8 1277.2 L14998.75 1459 L14998.75 1666.5 L14998.8 1666.5 " fill="none"></path>
+					<path d="M27417.0 208.7 L27417 293 L27417 614 L27417.0 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15004.1 1267.8 L14998.8 1277.2 L14993.4 1267.8 L14998.8 1258.5 Z"></path>
+						<path d="M27422.3 199.3 L27417.0 208.7 L27411.7 199.3 L27417.0 190.0 Z"></path>
 					</g>
-					<path d="M12547.0 2772.3 L12440.25 3314 L6746.25 3498.0435008665513 L6746.3 3498.0 " fill="none"></path>
+					<path d="M62263.5 1761.7 L62015.25 1936 L44706.5 2619.1390253333143 L44706.5 2619.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12554.0 2764.2 L12547.0 2772.3 L12543.5 2762.1 L12550.6 2754.0 Z"></path>
+						<path d="M62274.2 1760.7 L62263.5 1761.7 L62268.1 1752.0 L62278.8 1751.0 Z"></path>
 					</g>
-					<path d="M12571.2 2772.7 L12553.5 3314 L39892.25 3500.2581394924064 L39892.3 3500.3 " fill="none"></path>
+					<path d="M12149.5 2771.4 L11985.25 3314 L11753.276809651474 3485 L11753.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12576.8 2763.5 L12571.2 2772.7 L12566.2 2763.2 L12571.8 2754.0 Z"></path>
+						<path d="M12157.3 2764.0 L12149.5 2771.4 L12147.1 2760.9 L12154.9 2753.5 Z"></path>
 					</g>
-					<path d="M6922.8 3618.2 L6922.75 3687 L6922.75 3828 L6922.8 3828.0 " fill="none"></path>
+					<path d="M12170.3 2771.9 L12084 3314 L21539.75 3499.9297688394527 L21539.8 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6928.1 3608.8 L6922.8 3618.2 L6917.4 3608.8 L6922.8 3599.5 Z"></path>
+						<path d="M12177.1 2763.6 L12170.3 2771.9 L12166.5 2761.9 L12173.3 2753.5 Z"></path>
 					</g>
-					<path d="M12579.6 2767.3 L12593.5 3314 L7059.25 3496.0107789974873 L7059.3 3496.0 " fill="none"></path>
-					<path d="M12584.9 2767.2 L12579.6 2767.3 L12574.3 2767.5 L12579.3 2754.0 Z"></path>
-					<path d="M12603.5 2767.1 L12709.25 3314 L7290.25 3497.270196754012 L7290.3 3497.3 " fill="none"></path>
-					<path d="M12608.7 2766.1 L12603.5 2767.1 L12598.2 2768.1 L12600.9 2754.0 Z"></path>
-					<path d="M12865.6 2712.3 L12749.25 3314 L13190.04490616622 3485 L13190.0 3485.0 " fill="none"></path>
+					<path d="M12191.4 2772.2 L12182.75 3314 L11950.776809651474 3485 L11950.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12872.6 2704.2 L12865.6 2712.3 L12862.1 2702.2 L12869.2 2694.0 Z"></path>
+						<path d="M12196.9 2762.9 L12191.4 2772.2 L12186.2 2762.7 L12191.7 2753.5 Z"></path>
 					</g>
-					<path d="M12900.3 2712.3 L13022.75 3314 L24215 3498.130962619914 L24215.0 3498.1 " fill="none"></path>
+					<path d="M12214.8 2772.0 L12292.5 3314 L13098.75 3489.098253275109 L13098.8 3489.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12903.6 2702.1 L12900.3 2712.3 L12893.2 2704.2 L12896.5 2694.0 Z"></path>
+						<path d="M12218.8 2762.0 L12214.8 2772.0 L12208.2 2763.5 L12212.2 2753.5 Z"></path>
 					</g>
-					<path d="M21393.5 1705.8 L18759.25 1936 L18759.25 2548.5 L18759.3 2548.5 " fill="none"></path>
-					<path d="M21393.9 1711.1 L21393.5 1705.8 L21393.0 1700.5 L21406.8 1704.7 Z"></path>
-					<path d="M56927.3 3900.7 L56927.25 4000 L60848.75 4129.142541164905 L60848.8 4129.1 " fill="none"></path>
+					<path d="M12238.0 2771.4 L12402.25 3314 L12170.276809651474 3485 L12170.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56932.6 3891.3 L56927.3 3900.7 L56921.9 3891.3 L56927.3 3882.0 Z"></path>
+						<path d="M12240.4 2760.9 L12238.0 2771.4 L12230.2 2764.0 L12232.6 2753.5 Z"></path>
 					</g>
-					<path d="M58605.8 727.5 L59032.5 966 L59032.5 1212.5 L59032.5 1212.5 L59032.5 1459 L59032.5 1459 L59032.5 1697.5 L59032.5 1697.5 L59032.5 1936 L59032.5 1936 L59032.5 2625 L59032.5 2625 L59032.5 3314 L59032.5 3314 L59032.5 3500.5 L59032.5 3500.5 L59032.5 3687 L59032.5 3687 L57068.25 3833.0183469896688 L57068.3 3833.0 " fill="none"></path>
-					<path d="M58608.4 722.9 L58605.8 727.5 L58603.2 732.2 L58594.2 721.0 Z"></path>
-					<path d="M11960.0 2682.2 L11943.5 3314 L13173 3492.236883015935 L13173.0 3492.2 " fill="none"></path>
+					<path d="M62174.3 2674.7 L62174.25 3314 L48870 3498.722784715889 L48870.0 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11965.6 2673.0 L11960.0 2682.2 L11954.9 2672.7 L11960.5 2663.5 Z"></path>
+						<path d="M62179.6 2665.3 L62174.3 2674.7 L62168.9 2665.3 L62174.3 2656.0 Z"></path>
 					</g>
-					<path d="M11972.3 2681.8 L12093 3314 L7441.25 3498.3011046789525 L7441.3 3498.3 " fill="none"></path>
+					<path d="M62306.4 1761.6 L62174.25 1936 L62174.25 2594 L62174.3 2594.0 " fill="none"></path>
+					<path d="M62310.7 1764.8 L62306.4 1761.6 L62302.2 1758.4 L62314.5 1751.0 Z"></path>
+					<path d="M12861.0 2749.3 L12748.5 3314 L21428.75 3499.7403694461177 L21428.8 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11975.8 2671.7 L11972.3 2681.8 L11965.4 2673.7 L11968.8 2663.5 Z"></path>
+						<path d="M12868.0 2741.2 L12861.0 2749.3 L12857.6 2739.1 L12864.6 2731.0 Z"></path>
 					</g>
-					<path d="M13508.9 2719.8 L13385.75 3314 L13242.944369973191 3485 L13242.9 3485.0 " fill="none"></path>
+					<path d="M12885.7 2749.7 L12885.5 3314 L13129.163538873994 3485 L13129.2 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13516.0 2711.7 L13508.9 2719.8 L13505.5 2709.6 L13512.7 2701.5 Z"></path>
+						<path d="M12891.0 2740.3 L12885.7 2749.7 L12880.4 2740.3 L12885.7 2731.0 Z"></path>
 					</g>
-					<path d="M13517.1 2720.0 L13446 3314 L7441.25 3498.792025906522 L7441.3 3498.8 " fill="none"></path>
+					<path d="M12910.5 2749.3 L13022.75 3314 L19573.75 3497.4063649328227 L19573.8 3497.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13523.5 2711.4 L13517.1 2720.0 L13512.9 2710.1 L13519.3 2701.5 Z"></path>
+						<path d="M12913.9 2739.1 L12910.5 2749.3 L12903.4 2741.2 L12906.8 2731.0 Z"></path>
 					</g>
-					<path d="M13536.8 2720.1 L13588.75 3314 L24215 3498.006464566746 L24215.0 3498.0 " fill="none"></path>
+					<path d="M62535.8 2674.7 L62535.75 3314 L28264.25 3500.0494185623425 L28264.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13541.3 2710.3 L13536.8 2720.1 L13530.7 2711.3 L13535.2 2701.5 Z"></path>
+						<path d="M62541.1 2665.3 L62535.8 2674.7 L62530.4 2665.3 L62535.8 2656.0 Z"></path>
 					</g>
-					<path d="M15191.8 3923.7 L15191.75 4000 L29878.5 4133.346286101465 L29878.5 4133.3 " fill="none"></path>
+					<path d="M62403.6 1761.6 L62535.75 1936 L62535.75 2594 L62535.8 2594.0 " fill="none"></path>
+					<path d="M62407.8 1758.4 L62403.6 1761.6 L62399.3 1764.8 L62395.5 1751.0 Z"></path>
+					<path d="M13767.1 2727.4 L13675.75 3314 L25696 3499.82751010258 L25696.0 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15197.1 3914.3 L15191.8 3923.7 L15186.4 3914.3 L15191.8 3905.0 Z"></path>
+						<path d="M13773.8 2719.0 L13767.1 2727.4 L13763.2 2717.4 L13769.9 2709.0 Z"></path>
 					</g>
-					<path d="M22964.9 1215.3 L15191.75 1459 L15191.75 1697.5 L15191.75 1697.5 L15191.75 1936 L15191.75 1936 L15191.75 2625 L15191.75 2625 L15191.75 3314 L15191.75 3314 L15191.75 3500.5 L15191.75 3500.5 L15191.75 3687 L15191.75 3687 L15191.75 3782 L15191.8 3782.0 " fill="none"></path>
-					<path d="M22965.1 1220.6 L22964.9 1215.3 L22964.8 1210.0 L22978.3 1214.9 Z"></path>
-					<path d="M21393.7 1718.2 L20393.25 1936 L20393.25 2594 L20393.3 2594.0 " fill="none"></path>
-					<path d="M21394.9 1723.4 L21393.7 1718.2 L21392.6 1713.0 L21406.8 1715.4 Z"></path>
-					<path d="M66803.1 2772.3 L66693.25 3314 L48057 3499.9561882214466 L48057.0 3500.0 " fill="none"></path>
+					<path d="M13799.0 2727.4 L13890.5 3314 L21428.75 3499.6258293447763 L21428.8 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66810.2 2764.2 L66803.1 2772.3 L66799.8 2762.1 L66806.8 2754.0 Z"></path>
+						<path d="M13802.8 2717.4 L13799.0 2727.4 L13792.3 2719.0 L13796.1 2709.0 Z"></path>
 					</g>
-					<path d="M66811.6 2772.5 L66733.25 3314 L69689.25 3492.9044296608795 L69689.3 3492.9 " fill="none"></path>
+					<path d="M28000.5 717.2 L28000.5 966 L28000.5 1197 L28000.5 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66818.3 2764.0 L66811.6 2772.5 L66807.7 2762.5 L66814.3 2754.0 Z"></path>
+						<path d="M28005.8 707.8 L28000.5 717.2 L27995.2 707.8 L28000.5 698.5 Z"></path>
 					</g>
-					<path d="M66866.4 2772.2 L66989.5 3314 L54355.75 3499.6696578081596 L54355.8 3499.7 " fill="none"></path>
+					<path d="M28000.5 165.3 L28000.5 293 L28000.5 560.5 L28000.5 560.5 " fill="none"></path>
+					<path d="M28005.8 165.3 L28000.5 165.3 L27995.2 165.3 L28000.5 152.0 Z"></path>
+					<path d="M16003.2 3938.7 L15927.5 4000 L18277.25 4130.016104056984 L18277.3 4130.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66869.6 2761.9 L66866.4 2772.2 L66859.2 2764.3 L66862.3 2754.0 Z"></path>
+						<path d="M16013.9 3937.0 L16003.2 3938.7 L16007.1 3928.7 L16017.8 3927.0 Z"></path>
 					</g>
-					<path d="M66874.9 2772.0 L67029.5 3314 L58796.5 3499.318266851729 L58796.5 3499.3 " fill="none"></path>
+					<path d="M16026.0 3940.3 L15967.5 4000 L6118.75 4132.042572350484 L6118.8 4132.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66877.5 2761.5 L66874.9 2772.0 L66867.2 2764.4 L66869.8 2754.0 Z"></path>
+						<path d="M16036.4 3937.4 L16026.0 3940.3 L16028.8 3929.9 L16039.1 3927.0 Z"></path>
 					</g>
-					<path d="M71334.7 660.0 L66833 966 L66833 1212.5 L66833 1212.5 L66833 1459 L66833 1459 L66833 1697.5 L66833 1697.5 L66833 1936 L66833 1936 L66833 2496 L66833.0 2496.0 " fill="none"></path>
-					<path d="M71335.1 665.4 L71334.7 660.0 L71334.3 654.7 L71348.0 659.1 Z"></path>
-					<path d="M58621.6 729.7 L59072.5 966 L59072.5 1212.5 L59072.5 1212.5 L59072.5 1459 L59072.5 1459 L59072.5 1697.5 L59072.5 1697.5 L59072.5 1936 L59072.5 1936 L59072.5 2625 L59072.5 2625 L59072.5 3314 L59072.5 3314 L69689.25 3498.32115013149 L69689.3 3498.3 " fill="none"></path>
+					<path d="M16141.3 3945.3 L16152.25 4000 L6445.75 4132.047817258884 L6445.8 4132.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58615.8 720.6 L58621.6 729.7 L58610.9 730.1 L58605.1 721.0 Z"></path>
+						<path d="M16144.7 3935.1 L16141.3 3945.3 L16134.3 3937.2 L16137.7 3927.0 Z"></path>
 					</g>
-					<path d="M58721.8 689.9 L60054.5 966 L60054.5 1212.5 L60054.5 1212.5 L60054.5 1459 L60054.5 1459 L60054.5 1697.5 L60054.5 1697.5 L60054.5 1936 L60054.5 1936 L60054.5 2625 L60054.5 2625 L60054.5 3314 L60054.5 3314 L59452 3487.27101002313 L59452.0 3487.3 " fill="none"></path>
+					<path d="M16166.7 3944.0 L16192.25 4000 L14241 4125.208906979528 L14241.0 4125.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58713.7 682.7 L58721.8 689.9 L58711.6 693.2 L58703.5 686.1 Z"></path>
+						<path d="M16167.7 3933.3 L16166.7 3944.0 L16158.0 3937.7 L16159.0 3927.0 Z"></path>
 					</g>
-					<path d="M58721.9 680.4 L60358.75 966 L60358.75 1212.5 L60358.75 1212.5 L60358.75 1459 L60358.75 1459 L60358.75 1697.5 L60358.75 1697.5 L60358.75 1936 L60358.75 1936 L60358.75 2625 L60358.75 2625 L60358.75 3314 L60358.75 3314 L59320 3486.393214682981 L59320.0 3486.4 " fill="none"></path>
+					<path d="M16256.2 3937.7 L16345.75 4000 L14461 4127.892897835169 L14461.0 4127.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58713.6 673.5 L58721.9 680.4 L58711.8 684.0 L58703.5 677.1 Z"></path>
+						<path d="M16251.6 3928.0 L16256.2 3937.7 L16245.5 3936.7 L16240.9 3927.0 Z"></path>
 					</g>
-					<path d="M22965.0 1220.5 L20292.75 1459 L21406.75 1681.1479933110368 L21406.8 1681.1 " fill="none"></path>
-					<path d="M22965.4 1225.8 L22965.0 1220.5 L22964.5 1215.2 L22978.3 1219.3 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29343.3 1256.8 L29343.25 1459 L21570.75 1695.010089757464 L21570.8 1695.0 " fill="none"></path>
+					<path d="M36524.0 165.3 L36524 293 L36524 614 L36524.0 614.0 " fill="none"></path>
+					<path d="M36529.3 165.3 L36524.0 165.3 L36518.7 165.3 L36524.0 152.0 Z"></path>
+					<path d="M14038.0 2712.7 L14038 3314 L10247 3498.3362012775387 L10247.0 3498.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M14043.3 2703.3 L14038.0 2712.7 L14032.7 2703.3 L14038.0 2694.0 Z"></path>
 					</g>
-					<path d="M29348.6 1256.8 L29343.3 1256.8 L29337.9 1256.8 L29343.3 1243.5 Z"></path>
-					<path d="M1144.8 3450.9 L1157 3447 L1164.5 3447 L1164.5 3447 L1172 3500.5 L1172 3500.5 L1164.5 3554 L1164.5 3554 L1157 3554 L1157 3554 L1127 3544.5309734513276 L1127.0 3544.5 " fill="none"></path>
+					<path d="M36920.5 165.3 L36920.5 293 L36920.5 614 L36920.5 614.0 " fill="none"></path>
+					<path d="M36925.8 165.3 L36920.5 165.3 L36915.2 165.3 L36920.5 152.0 Z"></path>
+					<path d="M9187.0 3450.3 L9199 3447 L9206.5 3447 L9206.5 3447 L9214 3500.5 L9214 3500.5 L9206.5 3554 L9206.5 3554 L9199 3554 L9199 3554 L9169 3545.769230769231 L9169.0 3545.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1134.3 3448.6 L1144.8 3450.9 L1137.5 3458.7 L1127.0 3456.5 Z"></path>
+						<path d="M9176.6 3447.6 L9187.0 3450.3 L9179.4 3457.9 L9169.0 3455.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3649.9 2648.9 L2832.5 3314 L1127 3486.3987804878047 L1127.0 3486.4 " fill="none"></path>
+						<path d="M3097.8 2653.4 L2923.25 3314 L8839 3495.439357809481 L8839.0 3495.4 " fill="none"></path>
 					</g>
-					<path d="M3653.2 2653.1 L3649.9 2648.9 L3646.5 2644.8 L3660.2 2640.5 Z"></path>
-					<path d="M63093.1 2800.1 L61795 3314 L61795 3500.5 L61795 3500.5 L61795 3687 L61795 3687 L61795 3843.5 L61795 3843.5 L61795 4000 L61795 4000 L61143.75 4109.2550860719875 L61143.8 4109.3 " fill="none"></path>
+					<path d="M3102.9 2654.8 L3097.8 2653.4 L3092.6 2652.0 L3101.2 2640.5 Z"></path>
+					<path d="M14331.0 2697.7 L14331 3314 L11554.75 3494.7385024871282 L11554.8 3494.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63103.8 2801.6 L63093.1 2800.1 L63099.9 2791.7 L63110.5 2793.2 Z"></path>
+						<path d="M14336.3 2688.3 L14331.0 2697.7 L14325.7 2688.3 L14331.0 2679.0 Z"></path>
 					</g>
-					<path d="M63093.2 2804.2 L61835 3314 L41115.75 3498.7390309201955 L41115.8 3498.7 " fill="none"></path>
+					<path d="M29232.9 1213.9 L13364.5 1459 L13364.5 1651 L13364.5 1651.0 " fill="none"></path>
+					<path d="M29233.0 1219.2 L29232.9 1213.9 L29232.8 1208.5 L29246.3 1213.7 Z"></path>
+					<path d="M16534.0 3908.7 L16534 4000 L18277.25 4128.685029610247 L18277.3 4128.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63103.9 2805.6 L63093.2 2804.2 L63099.8 2795.8 L63110.5 2797.2 Z"></path>
+						<path d="M16539.3 3899.3 L16534.0 3908.7 L16528.7 3899.3 L16534.0 3890.0 Z"></path>
 					</g>
-					<path d="M63093.3 2808.5 L61875 3314 L59452 3497.025313892264 L59452.0 3497.0 " fill="none"></path>
+					<path d="M14698.6 2742.1 L14550 3314 L13048 3492.4222929936304 L13048.0 3492.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63103.9 2809.9 L63093.3 2808.5 L63099.8 2800.0 L63110.5 2801.3 Z"></path>
+						<path d="M14706.1 2734.4 L14698.6 2742.1 L14695.8 2731.7 L14703.3 2724.0 Z"></path>
 					</g>
-					<path d="M63672.9 2898.2 L63882 3314 L54355.75 3499.4003939370223 L54355.8 3499.4 " fill="none"></path>
+					<path d="M14830.3 2737.9 L15347 3314 L21428.75 3499.4176917732643 L21428.8 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63673.5 2887.4 L63672.9 2898.2 L63663.9 2892.2 L63664.5 2881.5 Z"></path>
+						<path d="M14828.0 2727.4 L14830.3 2737.9 L14820.1 2734.5 L14817.8 2724.0 Z"></path>
 					</g>
-					<path d="M63688.5 2897.8 L63922 3314 L58796.5 3498.609067207416 L58796.5 3498.6 " fill="none"></path>
+					<path d="M14857.6 2736.2 L15526 3314 L13203.75 3496.3769344141488 L13203.8 3496.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63688.6 2887.0 L63688.5 2897.8 L63679.3 2892.2 L63679.4 2881.5 Z"></path>
+						<path d="M14854.1 2726.1 L14857.6 2736.2 L14847.1 2734.1 L14843.5 2724.0 Z"></path>
 					</g>
-					<path d="M63704.1 2897.4 L63962 3314 L17321.75 3499.7929230900672 L17321.8 3499.8 " fill="none"></path>
+					<path d="M27476.2 3435.4 L27488.25 3432 L27495.75 3432 L27495.75 3432 L27503.25 3500.5 L27503.25 3500.5 L27495.75 3569 L27495.75 3569 L27488.25 3569 L27488.25 3569 L27458.25 3560.543209876543 L27458.3 3560.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63703.7 2886.6 L63704.1 2897.4 L63694.7 2892.2 L63694.3 2881.5 Z"></path>
+						<path d="M27465.8 3432.8 L27476.2 3435.4 L27468.7 3443.1 L27458.3 3440.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M69400.4 139.3 L63535.5 293 L63535.5 629.5 L63535.5 629.5 L63535.5 966 L63535.5 966 L63535.5 1212.5 L63535.5 1212.5 L63535.5 1459 L63535.5 1459 L63535.5 1697.5 L63535.5 1697.5 L63535.5 1936 L63535.5 1936 L63535.5 2368.5 L63535.5 2368.5 " fill="none"></path>
+						<path d="M3099.4 2653.6 L2963.25 3314 L27032.25 3498.8640350877195 L27032.3 3498.9 " fill="none"></path>
 					</g>
-					<path d="M69400.6 144.6 L69400.4 139.3 L69400.3 134.0 L69413.8 139.0 Z"></path>
-					<path d="M17339.8 3447.1 L17449.916666666664 3417 L17481.958333333336 3417 L17481.958333333336 3417 L17514 3500.5 L17514 3500.5 L17481.958333333336 3584 L17481.958333333336 3584 L17449.916666666664 3584 L17449.916666666664 3584 L17321.75 3548.9882769901856 L17321.8 3549.0 " fill="none"></path>
+					<path d="M3104.6 2654.6 L3099.4 2653.6 L3094.1 2652.5 L3102.1 2640.5 Z"></path>
+					<path d="M15697.2 2749.2 L15566 3314 L15566 3500.5 L15566 3500.5 L15566 3687 L15566 3687 L15566 3843.5 L15566 3843.5 L15566 4000 L15566 4000 L18277.25 4130.53354890865 L18277.3 4130.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17329.3 3444.4 L17339.8 3447.1 L17332.2 3454.7 L17321.8 3452.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3655.3 2650.2 L3024 3314 L16966.75 3498.155583293497 L16966.8 3498.2 " fill="none"></path>
+						<path d="M15704.5 2741.3 L15697.2 2749.2 L15694.1 2738.9 L15701.4 2731.0 Z"></path>
 					</g>
-					<path d="M3659.2 2653.8 L3655.3 2650.2 L3651.5 2646.5 L3664.5 2640.5 Z"></path>
-					<path d="M6940.5 2690.2 L6940.5 3314 L16966.75 3497.2557270611296 L16966.8 3497.3 " fill="none"></path>
+					<path d="M15853.9 2685.5 L17183 3314 L21539.75 3499.266801573277 L21539.8 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6945.8 2680.8 L6940.5 2690.2 L6935.2 2680.8 L6940.5 2671.5 Z"></path>
+						<path d="M15847.7 2676.7 L15853.9 2685.5 L15843.2 2686.3 L15837.0 2677.5 Z"></path>
 					</g>
-					<path d="M7267.1 1735.5 L6940.5 1936 L6940.5 2578.5 L6940.5 2578.5 " fill="none"></path>
-					<path d="M7269.9 1740.0 L7267.1 1735.5 L7264.3 1730.9 L7278.5 1728.5 Z"></path>
-					<path d="M7188.0 2690.2 L7188 3314 L16966.75 3497.175078468299 L16966.8 3497.2 " fill="none"></path>
+					<path d="M15854.0 2683.9 L17223 3314 L10247 3499.317854853643 L10247.0 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7193.3 2680.8 L7188.0 2690.2 L7182.7 2680.8 L7188.0 2671.5 Z"></path>
+						<path d="M15847.7 2675.1 L15854.0 2683.9 L15843.2 2684.8 L15837.0 2676.1 Z"></path>
 					</g>
-					<path d="M7303.9 1740.0 L7188 1936 L7188 2578.5 L7188.0 2578.5 " fill="none"></path>
-					<path d="M7308.5 1742.7 L7303.9 1740.0 L7299.3 1737.3 L7310.7 1728.5 Z"></path>
-					<path d="M7435.0 2690.2 L7435 3314 L16966.75 3497.0904936014626 L16966.8 3497.1 " fill="none"></path>
+					<path d="M15854.2 2679.0 L17363 3314 L25696 3499.531486897869 L25696.0 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7440.3 2680.8 L7435.0 2690.2 L7429.7 2680.8 L7435.0 2671.5 Z"></path>
+						<path d="M15847.7 2670.4 L15854.2 2679.0 L15843.5 2680.3 L15837.0 2671.7 Z"></path>
 					</g>
-					<path d="M7348.2 1740.7 L7435 1936 L7435 2578.5 L7435.0 2578.5 " fill="none"></path>
-					<path d="M7353.1 1738.5 L7348.2 1740.7 L7343.3 1742.9 L7342.8 1728.5 Z"></path>
-					<path d="M15392.3 2697.2 L15392.25 3314 L54242.75 3500.2291682730615 L54242.8 3500.2 " fill="none"></path>
+					<path d="M21716.1 2711.9 L21623.25 3314 L24211.25 3494.738438494664 L24211.3 3494.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15397.6 2687.8 L15392.3 2697.2 L15386.9 2687.8 L15392.3 2678.5 Z"></path>
+						<path d="M21722.8 2703.5 L21716.1 2711.9 L21712.2 2701.9 L21718.9 2693.5 Z"></path>
 					</g>
-					<path d="M15809.3 2703.9 L15632.25 3314 L15632.25 3485 L15632.3 3485.0 " fill="none"></path>
+					<path d="M21738.6 2712.1 L21801.25 3314 L21492.258042895442 3485 L21492.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15817.1 2696.5 L15809.3 2703.9 L15806.8 2693.5 L15814.5 2686.0 Z"></path>
+						<path d="M21742.9 2702.2 L21738.6 2712.1 L21732.3 2703.3 L21736.6 2693.5 Z"></path>
 					</g>
-					<path d="M15888.1 2701.0 L16338 3314 L54242.75 3500.2224208897233 L54242.8 3500.2 " fill="none"></path>
+					<path d="M19853.4 1762.6 L18888.25 1936 L18888.25 2625 L18888.25 2625 L18888.25 3314 L18888.25 3314 L25512 3498.494548780943 L25512.0 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15886.8 2690.4 L15888.1 2701.0 L15878.2 2696.7 L15877.0 2686.0 Z"></path>
+						<path d="M19863.5 1766.2 L19853.4 1762.6 L19861.6 1755.7 L19871.8 1759.3 Z"></path>
 					</g>
-					<path d="M7717.5 2705.2 L7717.5 3314 L16966.75 3496.9883178189725 L16966.8 3497.0 " fill="none"></path>
+					<path d="M19853.5 1776.3 L19118.75 1936 L19118.75 2609.5 L19118.8 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7722.8 2695.8 L7717.5 2705.2 L7712.2 2695.8 L7717.5 2686.5 Z"></path>
+						<path d="M19863.8 1779.5 L19853.5 1776.3 L19861.5 1769.1 L19871.8 1772.3 Z"></path>
 					</g>
-					<path d="M7390.9 1735.5 L7717.5 1936 L7717.5 2563.5 L7717.5 2563.5 " fill="none"></path>
-					<path d="M7393.7 1730.9 L7390.9 1735.5 L7388.1 1740.0 L7379.5 1728.5 Z"></path>
-					<path d="M17094.3 2704.3 L16967.75 3314 L39892.25 3500.211639808362 L39892.3 3500.2 " fill="none"></path>
+					<path d="M19853.8 1797.1 L19349.25 1936 L19349.25 2625 L19349.25 2625 L19349.25 3314 L19349.25 3314 L9169 3497.525446460936 L9169.0 3497.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17101.4 2696.2 L17094.3 2704.3 L17091.0 2694.1 L17098.1 2686.0 Z"></path>
+						<path d="M19864.2 1799.8 L19853.8 1797.1 L19861.3 1789.5 L19871.8 1792.2 Z"></path>
 					</g>
-					<path d="M17098.9 2704.5 L17007.75 3314 L17083.136058981232 3417 L17083.1 3417.0 " fill="none"></path>
+					<path d="M19854.0 1813.1 L19469.25 1936 L19469.25 2609.5 L19469.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17105.5 2696.0 L17098.9 2704.5 L17095.0 2694.4 L17101.6 2686.0 Z"></path>
+						<path d="M19864.5 1815.3 L19854.0 1813.1 L19861.2 1805.2 L19871.8 1807.4 Z"></path>
 					</g>
-					<path d="M17125.3 2704.4 L17237.25 3314 L46909 3500.1705972396276 L46909.0 3500.2 " fill="none"></path>
+					<path d="M19900.2 1903.7 L19850.75 1936 L19850.75 2609.5 L19850.8 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17128.9 2694.2 L17125.3 2704.4 L17118.4 2696.1 L17121.9 2686.0 Z"></path>
+						<path d="M19910.9 1903.1 L19900.2 1903.7 L19905.1 1894.1 L19915.8 1893.5 Z"></path>
 					</g>
-					<path d="M21404.4 1751.2 L21113.75 1936 L21113.75 2594 L21113.8 2594.0 " fill="none"></path>
-					<path d="M21407.2 1755.7 L21404.4 1751.2 L21401.5 1746.7 L21415.6 1744.0 Z"></path>
-					<path d="M21536.4 1754.2 L21689.25 1936 L21689.25 2594 L21689.3 2594.0 " fill="none"></path>
-					<path d="M21540.5 1750.8 L21536.4 1754.2 L21532.3 1757.6 L21527.8 1744.0 Z"></path>
-					<path d="M21582.5 1747.4 L21936.75 1936 L21936.75 2594 L21936.8 2594.0 " fill="none"></path>
-					<path d="M21585.0 1742.7 L21582.5 1747.4 L21580.0 1752.1 L21570.8 1741.2 Z"></path>
-					<path d="M19641.1 2739.7 L18329 3314 L38917 3499.877039260299 L38917.0 3499.9 " fill="none"></path>
+					<path d="M20578.2 1754.6 L21729.5 1936 L21729.5 2556.5 L21729.5 2556.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19651.8 2740.9 L19641.1 2739.7 L19647.6 2731.1 L19658.3 2732.2 Z"></path>
+						<path d="M20569.8 1747.9 L20578.2 1754.6 L20568.1 1758.4 L20559.8 1751.7 Z"></path>
 					</g>
-					<path d="M19641.2 2742.7 L18369 3314 L28574.5 3499.1934565799074 L28574.5 3499.2 " fill="none"></path>
+					<path d="M20578.2 1748.4 L21913 1936 L21913 2625 L21913 2625 L21913 3314 L21913 3314 L19794.75 3491.253449242849 L19794.8 3491.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19651.9 2743.7 L19641.2 2742.7 L19647.6 2734.0 L19658.3 2735.0 Z"></path>
+						<path d="M20569.7 1741.9 L20578.2 1748.4 L20568.3 1752.4 L20559.8 1745.8 Z"></path>
 					</g>
-					<path d="M19642.1 2775.2 L18705.25 3314 L18705.25 3485 L18705.3 3485.0 " fill="none"></path>
+					<path d="M20578.2 1747.3 L21953 1936 L21953 2625 L21953 2625 L21953 3314 L21953 3314 L21499.75 3486.9537084398976 L21499.8 3487.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19652.8 2775.2 L19642.1 2775.2 L19647.5 2765.9 L19658.3 2765.9 Z"></path>
+						<path d="M20569.7 1740.7 L20578.2 1747.3 L20568.3 1751.3 L20559.8 1744.7 Z"></path>
 					</g>
-					<path d="M19843.0 2839.5 L19709.75 3314 L19709.75 3500.5 L19709.75 3500.5 L19709.75 3687 L19709.75 3687 L19709.75 3843.5 L19709.75 3843.5 L19709.75 4000 L19709.75 4000 L29878.5 4133.057881502819 L29878.5 4133.1 " fill="none"></path>
+					<path d="M20578.3 1746.1 L21993 1936 L21993 2625 L21993 2625 L21993 3314 L21993 3314 L10068 3497.7799033177707 L10068.0 3497.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19850.7 2831.9 L19843.0 2839.5 L19840.4 2829.0 L19848.1 2821.5 Z"></path>
+						<path d="M20569.7 1739.6 L20578.3 1746.1 L20568.3 1750.2 L20559.8 1743.7 Z"></path>
 					</g>
-					<path d="M19879.8 2840.1 L19828.25 3314 L19828.25 3485 L19828.3 3485.0 " fill="none"></path>
+					<path d="M10086.1 3450.1 L10098 3447 L10105.5 3447 L10105.5 3447 L10113 3500.5 L10113 3500.5 L10105.5 3554 L10105.5 3554 L10098 3554 L10098 3554 L10068 3546.227602905569 L10068.0 3546.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19886.2 2831.4 L19879.8 2840.1 L19875.5 2830.2 L19881.9 2821.5 Z"></path>
+						<path d="M10075.7 3447.3 L10086.1 3450.1 L10078.4 3457.6 L10068.0 3454.8 Z"></path>
 					</g>
-					<path d="M19922.9 2840.1 L19966.25 3314 L39589.25 3500.0874837922356 L39589.3 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19927.4 2830.3 L19922.9 2840.1 L19916.8 2831.3 L19921.2 2821.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3101.0 2653.7 L3003.25 3314 L9715 3495.721246325264 L9715.0 3495.7 " fill="none"></path>
 					</g>
-					<path d="M19965.8 2839.4 L20104.25 3314 L20104.25 3485 L20104.3 3485.0 " fill="none"></path>
+					<path d="M3106.3 2654.5 L3101.0 2653.7 L3095.7 2652.9 L3103.0 2640.5 Z"></path>
+					<path d="M23185.0 2720.2 L23185 3314 L25696 3497.324133881386 L25696.0 3497.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19968.3 2829.0 L19965.8 2839.4 L19958.1 2832.0 L19960.6 2821.5 Z"></path>
+						<path d="M23190.3 2710.8 L23185.0 2720.2 L23179.7 2710.8 L23185.0 2701.5 Z"></path>
 					</g>
-					<path d="M20035.4 2837.3 L20332 3314 L39892.25 3500.1621333707562 L39892.3 3500.2 " fill="none"></path>
+					<path d="M22674.0 1719.3 L22272 1936 L23083.629172714078 2548.5 L23083.6 2548.5 " fill="none"></path>
+					<path d="M22676.5 1724.0 L22674.0 1719.3 L22671.5 1714.6 L22685.7 1713.0 Z"></path>
+					<path d="M37154.0 165.3 L37154 293 L37154 614 L37154.0 614.0 " fill="none"></path>
+					<path d="M37159.3 165.3 L37154.0 165.3 L37148.7 165.3 L37154.0 152.0 Z"></path>
+					<path d="M23246.4 1805.9 L23185 1936 L23185 2548.5 L23185.0 2548.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20035.0 2826.6 L20035.4 2837.3 L20025.9 2832.2 L20025.5 2821.5 Z"></path>
+						<path d="M23255.2 1799.7 L23246.4 1805.9 L23245.5 1795.2 L23254.3 1789.0 Z"></path>
 					</g>
-					<path d="M20047.4 2836.9 L20372 3314 L46909 3500.1317625378438 L46909.0 3500.1 " fill="none"></path>
+					<path d="M23319.1 1807.3 L23344.5 1936 L23712.04136429608 2609.5 L23712.0 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20046.6 2826.2 L20047.4 2836.9 L20037.8 2832.2 L20036.9 2821.5 Z"></path>
+						<path d="M23322.6 1797.1 L23319.1 1807.3 L23312.1 1799.2 L23315.5 1789.0 Z"></path>
 					</g>
-					<path d="M71334.7 672.3 L68249.75 966 L68249.75 1212.5 L68249.75 1212.5 L68249.75 1459 L68249.75 1459 L68249.75 1666.5 L68249.8 1666.5 " fill="none"></path>
-					<path d="M71335.2 677.6 L71334.7 672.3 L71334.2 667.0 L71348.0 671.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M34049.7 136.9 L10414.75 293 L10414.75 614 L10414.8 614.0 " fill="none"></path>
+					<path d="M23369.1 1804.5 L23457 1936 L23457 2609.5 L23457.0 2609.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M23368.3 1793.8 L23369.1 1804.5 L23359.4 1799.7 L23358.7 1789.0 Z"></path>
 					</g>
-					<path d="M34049.7 142.2 L34049.7 136.9 L34049.6 131.6 L34063.0 136.8 Z"></path>
-					<path d="M57248.8 3998.7 L57248.75 4000 L58767 4129.810496091881 L58767.0 4129.8 " fill="none"></path>
+					<path d="M23584.9 1804.5 L23497 1936 L23219.64150943396 2548.5 L23219.6 2548.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57254.1 3989.3 L57248.8 3998.7 L57243.4 3989.3 L57248.8 3980.0 Z"></path>
+						<path d="M23594.6 1799.7 L23584.9 1804.5 L23585.7 1793.8 L23595.3 1789.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M34170.3 136.9 L60460.5 293 L60460.5 614 L60460.5 614.0 " fill="none"></path>
+					<path d="M23685.9 1807.0 L23720.5 1936 L23720.5 2609.5 L23720.5 2609.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M23688.6 1796.6 L23685.9 1807.0 L23678.3 1799.4 L23681.1 1789.0 Z"></path>
 					</g>
-					<path d="M34170.4 131.5 L34170.3 136.9 L34170.3 142.2 L34157.0 136.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M34170.3 136.9 L60686 293 L60686 598.5 L60686.0 598.5 " fill="none"></path>
+					<path d="M23728.1 1804.5 L23816 1936 L23465.07619738752 2609.5 L23465.1 2609.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M23727.3 1793.8 L23728.1 1804.5 L23718.4 1799.7 L23717.7 1789.0 Z"></path>
 					</g>
-					<path d="M34170.4 131.5 L34170.3 136.9 L34170.3 142.2 L34157.0 136.8 Z"></path>
-					<path d="M69395.1 142.4 L66553.5 293 L66553.5 629.5 L66553.5 629.5 L66553.5 966 L66553.5 966 L66553.5 1212.5 L66553.5 1212.5 L66553.5 1459 L66553.5 1459 L66553.5 1697.5 L66553.5 1697.5 L66553.5 1936 L66553.5 1936 L66553.5 2625 L66553.5 2625 L66553.5 3314 L66553.5 3314 L58796.5 3499.2462385556055 L58796.5 3499.2 " fill="none"></path>
+					<path d="M24015.5 1777.7 L24015.5 1936 L23727.136429608126 2609.5 L23727.1 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69404.7 147.3 L69395.1 142.4 L69404.1 136.6 L69413.8 141.5 Z"></path>
+						<path d="M24020.8 1768.3 L24015.5 1777.7 L24010.2 1768.3 L24015.5 1759.0 Z"></path>
 					</g>
-					<path d="M3874.9 1708.0 L5207.5 1936 L5207.5 2571.5 L5207.5 2571.5 " fill="none"></path>
-					<path d="M3875.8 1702.7 L3874.9 1708.0 L3874.0 1713.2 L3861.8 1705.7 Z"></path>
-					<path d="M71329.5 687.9 L69165.5 966 L69165.5 1212.5 L69165.5 1212.5 L69165.5 1459 L69165.5 1459 L69165.5 1697.5 L69165.5 1697.5 L69165.5 1936 L69165.5 1936 L69165.5 2625 L69165.5 2625 L69165.5 3314 L69165.5 3314 L41507.75 3499.554040199649 L41507.8 3499.6 " fill="none"></path>
+					<path d="M20222.2 2709.7 L19833 3314 L25696 3499.126470837213 L25696.0 3499.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71339.4 692.0 L71329.5 687.9 L71338.1 681.4 L71348.0 685.5 Z"></path>
+						<path d="M20231.7 2704.7 L20222.2 2709.7 L20222.8 2699.0 L20232.3 2694.0 Z"></path>
 					</g>
-					<path d="M71329.6 700.5 L69630.75 966 L69630.75 1197 L69630.8 1197.0 " fill="none"></path>
+					<path d="M20292.2 2712.4 L20398.5 3314 L20398.5 3500.5 L20398.5 3500.5 L20398.5 3687 L20398.5 3687 L20398.5 3843.5 L20398.5 3843.5 L20398.5 4000 L20398.5 4000 L18421.25 4129.2919360741735 L18421.3 4129.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71339.6 704.3 L71329.6 700.5 L71338.0 693.8 L71348.0 697.6 Z"></path>
+						<path d="M20295.8 2702.3 L20292.2 2712.4 L20285.3 2704.1 L20288.9 2694.0 Z"></path>
 					</g>
-					<path d="M71329.8 730.7 L70273.75 966 L70273.75 1174 L70273.8 1174.0 " fill="none"></path>
+					<path d="M20740.5 2800.4 L20503.5 3314 L20503.5 3485 L20503.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71340.0 733.9 L71329.8 730.7 L71337.7 723.5 L71348.0 726.6 Z"></path>
+						<path d="M20749.3 2794.2 L20740.5 2800.4 L20739.6 2789.7 L20748.3 2783.5 Z"></path>
 					</g>
-					<path d="M71329.9 745.6 L70468 966 L70468 1212.5 L70468 1212.5 L70468 1459 L70468 1459 L70468 1697.5 L70468 1697.5 L70468 1936 L70468 1936 L70468 2625 L70468 2625 L70468 3314 L70468 3314 L70468 3500.5 L70468 3500.5 L70468 3687 L70468 3687 L70468 3843.5 L70468 3843.5 L70468 4000 L70468 4000 L56342 4131.5050715575935 L56342.0 4131.5 " fill="none"></path>
+					<path d="M20811.2 2802.1 L20781.5 3314 L13203.75 3499.216785164313 L13203.8 3499.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71340.3 748.5 L71329.9 745.6 L71337.6 738.1 L71348.0 741.0 Z"></path>
+						<path d="M20817.1 2793.1 L20811.2 2802.1 L20806.4 2792.5 L20812.3 2783.5 Z"></path>
 					</g>
-					<path d="M71764.1 964.6 L71764 966 L71764 1212.5 L71764 1212.5 L71764 1459 L71764 1459 L71764 1697.5 L71764 1697.5 L71764 1936 L71764 1936 L71764 2625 L71764 2625 L71764 3314 L71764 3314 L71764 3500.5 L71764 3500.5 L71764 3687 L71764 3687 L71764 3843.5 L71764 3843.5 L71764 4000 L71764 4000 L71764 4134 L71764 4134 L71764 4268 L71764 4268 L60247 4453.029978033338 L60247.0 4453.0 " fill="none"></path>
+					<path d="M20821.5 2802.2 L20821.5 3314 L21428.75 3490.199338778685 L21428.8 3490.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71770.0 955.6 L71764.1 964.6 L71759.3 955.0 L71765.2 946.0 Z"></path>
+						<path d="M20826.8 2792.8 L20821.5 2802.2 L20816.2 2792.8 L20821.5 2783.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M69614.1 143.8 L71784 293 L71784 313 L71784.0 313.0 " fill="none"></path>
+					<path d="M20831.8 2802.1 L20861.5 3314 L13048 3498.890915434879 L13048.0 3498.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M20836.6 2792.5 L20831.8 2802.1 L20825.9 2793.1 L20830.7 2783.5 Z"></path>
 					</g>
-					<path d="M69614.4 138.5 L69614.1 143.8 L69613.7 149.2 L69600.8 142.9 Z"></path>
-					<path d="M41525.3 3443.9 L41537.75 3439.5 L41545.25 3439.5 L41545.25 3439.5 L41552.75 3500.5 L41552.75 3500.5 L41545.25 3561.5 L41545.25 3561.5 L41537.75 3561.5 L41537.75 3561.5 L41507.75 3550.7982456140353 L41507.8 3550.8 " fill="none"></path>
+					<path d="M20902.5 2800.4 L21139.5 3314 L21539.75 3487.9001164822366 L21539.8 3487.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41514.7 3442.0 L41525.3 3443.9 L41518.3 3452.1 L41507.8 3450.2 Z"></path>
+						<path d="M20903.4 2789.7 L20902.5 2800.4 L20893.7 2794.2 L20894.7 2783.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3656.5 2650.4 L3064 3314 L41225.75 3499.813456605596 L41225.8 3499.8 " fill="none"></path>
+						<path d="M37938.4 173.6 L37704.25 293 L37704.25 598.5 L37704.3 598.5 " fill="none"></path>
 					</g>
-					<path d="M3660.5 2654.0 L3656.5 2650.4 L3652.6 2646.9 L3665.4 2640.5 Z"></path>
-					<path d="M54074.4 3886.3 L53478 4000 L55806 4120.1664098613255 L55806.0 4120.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M54084.6 3889.8 L54074.4 3886.3 L54082.6 3879.4 L54092.8 3882.9 Z"></path>
+					<path d="M37940.8 178.3 L37938.4 173.6 L37935.9 168.8 L37950.2 167.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M38055.0 176.5 L38183.25 293 L38183.25 598.5 L38183.3 598.5 " fill="none"></path>
 					</g>
-					<path d="M54299.3 3946.2 L54299.25 4000 L60332 4132.203033648146 L60332.0 4132.2 " fill="none"></path>
+					<path d="M38058.6 172.5 L38055.0 176.5 L38051.4 180.4 L38045.1 167.5 Z"></path>
+					<path d="M21345.9 2689.0 L21179.5 3314 L9625 3497.592268370607 L9625.0 3497.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54304.6 3936.8 L54299.3 3946.2 L54293.9 3936.8 L54299.3 3927.5 Z"></path>
+						<path d="M21353.5 2681.4 L21345.9 2689.0 L21343.2 2678.6 L21350.7 2671.0 Z"></path>
 					</g>
-					<path d="M54524.1 3887.2 L55104 4000 L60557.75 4130.985795581843 L60557.8 4131.0 " fill="none"></path>
+					<path d="M21361.1 2689.7 L21342.75 3314 L21549.967158176943 3485 L21550.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54515.9 3880.2 L54524.1 3887.2 L54513.9 3890.7 L54505.8 3883.7 Z"></path>
+						<path d="M21366.7 2680.5 L21361.1 2689.7 L21356.0 2680.2 L21361.6 2671.0 Z"></path>
 					</g>
-					<path d="M54299.3 3529.3 L54299.25 3687 L54299.25 3759.5 L54299.3 3759.5 " fill="none"></path>
-					<path d="M54304.6 3529.3 L54299.3 3529.3 L54293.9 3529.3 L54299.3 3516.0 Z"></path>
-					<path d="M20763.3 2712.7 L20763.25 3314 L38917 3499.7938222825865 L38917.0 3499.8 " fill="none"></path>
+					<path d="M21378.2 2689.2 L21526.25 3314 L24108.25 3498.252152286206 L24108.3 3498.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20768.6 2703.3 L20763.3 2712.7 L20757.9 2703.3 L20763.3 2694.0 Z"></path>
+						<path d="M21381.2 2678.9 L21378.2 2689.2 L21370.9 2681.3 L21373.9 2671.0 Z"></path>
 					</g>
-					<path d="M47455.0 3685.7 L47455 3687 L47455 3843.5 L47455 3843.5 L47455 4000 L47455 4000 L58767 4133.422057917437 L58767.0 4133.4 " fill="none"></path>
+					<path d="M9643.1 3450.0 L9655 3447 L9662.5 3447 L9662.5 3447 L9670 3500.5 L9670 3500.5 L9662.5 3554 L9662.5 3554 L9655 3554 L9655 3554 L9625 3546.4647887323945 L9625.0 3546.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47460.3 3676.3 L47455.0 3685.7 L47449.7 3676.3 L47455.0 3667.0 Z"></path>
+						<path d="M9632.8 3447.1 L9643.1 3450.0 L9635.4 3457.4 L9625.0 3454.5 Z"></path>
 					</g>
-					<path d="M35325.0 3304.8 L35318.25 3314 L47174 3496.181998887676 L47174.0 3496.2 " fill="none"></path>
-					<path d="M35329.3 3307.9 L35325.0 3304.8 L35320.7 3301.6 L35332.9 3294.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M21387.8 2669.3 L21387.75 3314 L47174 3498.489565450901 L47174.0 3498.5 " fill="none"></path>
+						<path d="M3102.7 2653.8 L3043.25 3314 L9259 3495.16622387185 L9259.0 3495.2 " fill="none"></path>
 					</g>
-					<path d="M21393.1 2669.3 L21387.8 2669.3 L21382.4 2669.3 L21387.8 2656.0 Z"></path>
-					<path d="M22457.3 2663.3 L21455.25 3314 L24593 3488.0472525838354 L24593.0 3488.0 " fill="none"></path>
-					<path d="M22460.2 2667.7 L22457.3 2663.3 L22454.4 2658.8 L22468.5 2656.0 Z"></path>
-					<path d="M82705.3 2712.7 L82705.25 3314 L47736 3499.0133013241043 L47736.0 3499.0 " fill="none"></path>
+					<path d="M3108.0 2654.3 L3102.7 2653.8 L3097.3 2653.3 L3103.9 2640.5 Z"></path>
+					<path d="M24747.9 1791.2 L24278.25 1936 L44409.5 2619.954745497356 L44409.5 2620.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82710.6 2703.3 L82705.3 2712.7 L82699.9 2703.3 L82705.3 2694.0 Z"></path>
+						<path d="M24758.4 1793.5 L24747.9 1791.2 L24755.3 1783.3 L24765.8 1785.7 Z"></path>
 					</g>
-					<path d="M83694.5 152.1 L82705.25 293 L82705.25 629.5 L82705.25 629.5 L82705.25 966 L82705.25 966 L82705.25 1212.5 L82705.25 1212.5 L82705.25 1459 L82705.25 1459 L82705.25 1697.5 L82705.25 1697.5 L82705.25 1936 L82705.25 1936 L82705.25 2556 L82705.3 2556.0 " fill="none"></path>
-					<path d="M83695.3 157.3 L83694.5 152.1 L83693.8 146.8 L83707.8 150.2 Z"></path>
-					<path d="M34048.9 1217.5 L29471 1459 L29471 1613.5 L29471.0 1613.5 " fill="none"></path>
-					<path d="M34049.2 1222.8 L34048.9 1217.5 L34048.7 1212.2 L34062.3 1216.8 Z"></path>
-					<path d="M59453.2 2891.2 L59278 3314 L64687 3499.4542696939056 L64687.0 3499.5 " fill="none"></path>
+					<path d="M24748.0 1796.3 L24318.25 1936 L24318.25 2609.5 L24318.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59461.7 2884.7 L59453.2 2891.2 L59451.8 2880.6 L59460.3 2874.0 Z"></path>
+						<path d="M24758.5 1798.5 L24748.0 1796.3 L24755.2 1788.3 L24765.8 1790.5 Z"></path>
 					</g>
-					<path d="M59502.4 2892.2 L59406 3314 L59406 3485 L59406.0 3485.0 " fill="none"></path>
+					<path d="M25035.3 1934.6 L25035.25 1936 L25035.25 2609.5 L25035.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59509.7 2884.3 L59502.4 2892.2 L59499.3 2881.9 L59506.6 2874.0 Z"></path>
+						<path d="M25041.3 1925.7 L25035.3 1934.6 L25030.7 1924.9 L25036.6 1916.0 Z"></path>
 					</g>
-					<path d="M59517.9 2892.4 L59446 3314 L56149.5 3480.318747463817 L56149.5 3480.3 " fill="none"></path>
+					<path d="M25353.6 1884.7 L25436.25 1936 L25436.25 2609.5 L25436.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59524.7 2884.1 L59517.9 2892.4 L59514.2 2882.3 L59521.0 2874.0 Z"></path>
+						<path d="M25348.5 1875.3 L25353.6 1884.7 L25342.9 1884.4 L25337.8 1874.9 Z"></path>
 					</g>
-					<path d="M59533.4 2892.5 L59486 3314 L54355.75 3498.4684291704825 L54355.8 3498.5 " fill="none"></path>
+					<path d="M25355.6 1791.2 L25825.25 1936 L25825.25 2609.5 L25825.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59539.7 2883.9 L59533.4 2892.5 L59529.1 2882.7 L59535.5 2874.0 Z"></path>
+						<path d="M25348.2 1783.3 L25355.6 1791.2 L25345.1 1793.5 L25337.8 1785.7 Z"></path>
 					</g>
-					<path d="M59627.7 2892.2 L59729 3314 L59729 3500.5 L59729 3500.5 L59729 3687 L59729 3687 L59729 3843.5 L59729 3843.5 L59729 4000 L59729 4000 L58865 4126.808324205915 L58865.0 4126.8 " fill="none"></path>
+					<path d="M44544.5 2750.1 L44483.75 3314 L44483.75 3485 L44483.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59630.7 2881.8 L59627.7 2892.2 L59620.3 2884.3 L59623.3 2874.0 Z"></path>
+						<path d="M44550.8 2741.4 L44544.5 2750.1 L44540.2 2740.2 L44546.5 2731.5 Z"></path>
 					</g>
-					<path d="M59643.1 2891.9 L59769 3314 L59769 3500.5 L59769 3500.5 L59769 3687 L59769 3687 L57389.25 3834.7753695069932 L57389.3 3834.8 " fill="none"></path>
+					<path d="M44582.0 2749.8 L44690.5 3314 L14544.5 3499.3533009148605 L14544.5 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59645.5 2881.4 L59643.1 2891.9 L59635.3 2884.5 L59637.8 2874.0 Z"></path>
+						<path d="M44585.5 2739.7 L44582.0 2749.8 L44575.0 2741.7 L44578.5 2731.5 Z"></path>
 					</g>
-					<path d="M59658.5 2891.6 L59809 3314 L58796.5 3491.306338028169 L58796.5 3491.3 " fill="none"></path>
+					<path d="M22676.9 1719.8 L22312 1936 L44409.5 2620.400678773712 L44409.5 2620.4 " fill="none"></path>
+					<path d="M22679.6 1724.4 L22676.9 1719.8 L22674.2 1715.2 L22688.3 1713.0 Z"></path>
+					<path d="M14562.6 3449.9 L14574.5 3447 L14582 3447 L14582 3447 L14589.5 3500.5 L14589.5 3500.5 L14582 3554 L14582 3554 L14574.5 3554 L14574.5 3554 L14544.5 3546.5866050808313 L14544.5 3546.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59660.4 2881.0 L59658.5 2891.6 L59650.3 2884.6 L59652.2 2874.0 Z"></path>
-					</g>
-					<path d="M72106.1 955.5 L72116.5 966 L72116.5 1212.5 L72116.5 1212.5 L72116.5 1459 L72116.5 1459 L72116.5 1697.5 L72116.5 1697.5 L72116.5 1936 L72116.5 1936 L60014.5 2600.245837648371 L60014.5 2600.2 " fill="none"></path>
-					<path d="M72109.9 951.7 L72106.1 955.5 L72102.3 959.2 L72096.7 946.0 Z"></path>
-					<path d="M38748.9 1833.6 L38585.5 1936 L59112.5 2610.187386786157 L59112.5 2610.2 " fill="none"></path>
-					<path d="M38751.7 1838.1 L38748.9 1833.6 L38746.1 1829.1 L38760.2 1826.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M70160.0 1255.7 L69625 1459 L69625 1697.5 L69625 1697.5 L69625 1936 L69625 1936 L60014.5 2594.116036376286 L60014.5 2594.1 " fill="none"></path>
-					</g>
-					<path d="M70161.9 1260.7 L70160.0 1255.7 L70158.1 1250.8 L70172.4 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M80298.2 1704.1 L76712 1936 L60014.5 2606.879522990349 L60014.5 2606.9 " fill="none"></path>
+						<path d="M14552.3 3447.0 L14562.6 3449.9 L14554.8 3457.4 L14544.5 3454.4 Z"></path>
 					</g>
-					<path d="M80298.5 1709.5 L80298.2 1704.1 L80297.9 1698.8 L80311.5 1703.3 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M5938.8 1247.8 L5311.5 1459 L5311.5 1697.5 L5311.5 1697.5 L5311.5 1936 L5311.5 1936 L59112.5 2619.272303325223 L59112.5 2619.3 " fill="none"></path>
+						<path d="M3104.3 2653.8 L3083.25 3314 L14171.5 3497.4150313754185 L14171.5 3497.4 " fill="none"></path>
 					</g>
-					<path d="M5940.5 1252.8 L5938.8 1247.8 L5937.1 1242.7 L5951.4 1243.5 Z"></path>
-					<path d="M55749.5 3625.7 L55749.5 3687 L57108.25 3828.8338335834583 L57108.3 3828.8 " fill="none"></path>
+					<path d="M3109.7 2654.0 L3104.3 2653.8 L3099.0 2653.7 L3104.8 2640.5 Z"></path>
+					<path d="M38560.5 193.7 L38560.5 293 L38560.5 614 L38560.5 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55754.8 3616.3 L55749.5 3625.7 L55744.2 3616.3 L55749.5 3607.0 Z"></path>
+						<path d="M38565.8 184.3 L38560.5 193.7 L38555.2 184.3 L38560.5 175.0 Z"></path>
 					</g>
-					<path d="M56168.1 3481.5 L59849 3314 L59666.67779390421 2874 L59666.7 2874.0 " fill="none"></path>
+					<path d="M22196.0 2712.7 L22196 3314 L64028.25 3500.295144257461 L64028.3 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56158.6 3476.6 L56168.1 3481.5 L56159.1 3487.2 L56149.5 3482.3 Z"></path>
+						<path d="M22201.3 2703.3 L22196.0 2712.7 L22190.7 2703.3 L22196.0 2694.0 Z"></path>
 					</g>
+					<path d="M61576.0 1709.5 L59591.5 1936 L59591.5 2594 L59591.5 2594.0 " fill="none"></path>
+					<path d="M61576.6 1714.8 L61576.0 1709.5 L61575.4 1704.2 L61589.3 1708.0 Z"></path>
+					<path d="M59588.1 2669.3 L59539 3314 L58447.671581769435 3485 L58447.7 3485.0 " fill="none"></path>
+					<path d="M59593.4 2669.7 L59588.1 2669.3 L59582.8 2668.9 L59589.1 2656.0 Z"></path>
+					<path d="M61576.2 1719.8 L60556.75 1936 L60556.75 2594 L60556.8 2594.0 " fill="none"></path>
+					<path d="M61577.3 1725.0 L61576.2 1719.8 L61575.1 1714.6 L61589.3 1717.0 Z"></path>
+					<path d="M61604.9 1734.3 L61186.5 1936 L45688 2619.553098194853 L45688.0 2619.6 " fill="none"></path>
+					<path d="M61607.2 1739.1 L61604.9 1734.3 L61602.6 1729.5 L61616.9 1728.5 Z"></path>
+					<path d="M45564.5 2669.3 L45564.5 3314 L50428.5 3495.554288001601 L50428.5 3495.6 " fill="none"></path>
+					<path d="M45569.8 2669.3 L45564.5 2669.3 L45559.2 2669.3 L45564.5 2656.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M70236.1 1261.6 L70084.5 1459 L70084.5 1697.5 L70084.5 1697.5 L70084.5 1936 L70084.5 1936 L70084.5 2625 L70084.5 2625 L70084.5 3314 L70084.5 3314 L56149.5 3495.295953958842 L56149.5 3495.3 " fill="none"></path>
+						<path d="M59600.0 2669.1 L59724 3314 L50693.5 3497.8031485321403 L50693.5 3497.8 " fill="none"></path>
 					</g>
-					<path d="M70240.3 1264.8 L70236.1 1261.6 L70231.8 1258.3 L70244.2 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M80298.2 1704.2 L76752 1936 L76752 2625 L76752 2625 L76752 3314 L76752 3314 L56149.5 3496.9480418997737 L56149.5 3496.9 " fill="none"></path>
+					<path d="M59605.2 2668.1 L59600.0 2669.1 L59594.7 2670.1 L59597.5 2656.0 Z"></path>
+					<path d="M61610.3 1734.7 L61226.5 1936 L44979.5 2620.09466189996 L44979.5 2620.1 " fill="none"></path>
+					<path d="M61612.8 1739.4 L61610.3 1734.7 L61607.9 1730.0 L61622.1 1728.5 Z"></path>
+					<path d="M44863.0 2669.3 L44863 3314 L44863 3469.5 L44863.0 3469.5 " fill="none"></path>
+					<path d="M44868.3 2669.3 L44863.0 2669.3 L44857.7 2669.3 L44863.0 2656.0 Z"></path>
+					<path d="M61711.9 1739.2 L61856.25 1936 L61856.25 2594 L61856.3 2594.0 " fill="none"></path>
+					<path d="M61716.2 1736.1 L61711.9 1739.2 L61707.6 1742.4 L61704.0 1728.5 Z"></path>
+					<path d="M39065.0 679.2 L39065 966 L39065 1197 L39065.0 1197.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M39070.3 669.8 L39065.0 679.2 L39059.7 669.8 L39065.0 660.5 Z"></path>
 					</g>
-					<path d="M80298.5 1709.5 L80298.2 1704.2 L80297.8 1698.9 L80311.5 1703.3 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M6033.9 1256.5 L5989.75 1459 L5989.75 1697.5 L5989.75 1697.5 L5989.75 1936 L5989.75 1936 L5989.75 2625 L5989.75 2625 L5989.75 3314 L5989.75 3314 L55349.5 3499.000796326348 L55349.5 3499.0 " fill="none"></path>
+					<path d="M39065.0 165.3 L39065 293 L39065 598.5 L39065.0 598.5 " fill="none"></path>
+					<path d="M39070.3 165.3 L39065.0 165.3 L39059.7 165.3 L39065.0 152.0 Z"></path>
+					<path d="M39607.1 161.6 L39480.75 293 L39480.75 598.5 L39480.8 598.5 " fill="none"></path>
+					<path d="M39610.9 165.3 L39607.1 161.6 L39603.3 157.9 L39616.3 152.0 Z"></path>
+					<path d="M39660.5 160.5 L39822.25 293 L39822.25 598.5 L39822.3 598.5 " fill="none"></path>
+					<path d="M39663.9 156.3 L39660.5 160.5 L39657.1 164.6 L39650.2 152.0 Z"></path>
+					<path d="M39914.8 1747.2 L39914.75 1936 L37633 2592.3514246947084 L37633.0 2592.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M39920.1 1737.8 L39914.8 1747.2 L39909.4 1737.8 L39914.8 1728.5 Z"></path>
 					</g>
-					<path d="M6039.1 1257.7 L6033.9 1256.5 L6028.7 1255.4 L6036.7 1243.5 Z"></path>
-					<path d="M31322.6 2771.3 L31104 3314 L54242.75 3500.045715178754 L54242.8 3500.0 " fill="none"></path>
+					<path d="M39914.8 1241.3 L39914.75 1459 L39914.75 1666.5 L39914.8 1666.5 " fill="none"></path>
+					<path d="M39920.1 1241.3 L39914.8 1241.3 L39909.4 1241.3 L39914.8 1228.0 Z"></path>
+					<path d="M40151.1 885.5 L40065.25 966 L40065.25 1197 L40065.3 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31331.0 2764.7 L31322.6 2771.3 L31321.1 2760.7 L31329.5 2754.0 Z"></path>
+						<path d="M40161.6 883.0 L40151.1 885.5 L40154.3 875.2 L40164.8 872.7 Z"></path>
 					</g>
-					<path d="M31418.6 2772.1 L31555.5 3314 L58691.5 3500.139875314931 L58691.5 3500.1 " fill="none"></path>
+					<path d="M40253.8 917.1 L40224.75 966 L40224.75 1197 L40224.8 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31421.5 2761.7 L31418.6 2772.1 L31411.2 2764.4 L31414.1 2754.0 Z"></path>
+						<path d="M40263.1 911.7 L40253.8 917.1 L40253.9 906.3 L40263.3 901.0 Z"></path>
 					</g>
-					<path d="M68216.3 1738.9 L68056.75 1936 L31729.5 2618.462294053892 L31729.5 2618.5 " fill="none"></path>
-					<path d="M68220.4 1742.2 L68216.3 1738.9 L68212.1 1735.5 L68224.7 1728.5 Z"></path>
-					<path d="M11003.0 1747.2 L11003 1936 L31033.5 2613.2340702210663 L31033.5 2613.2 " fill="none"></path>
+					<path d="M40700.7 756.2 L41158.5 966 L41158.5 1197 L41158.5 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11008.3 1737.8 L11003.0 1747.2 L10997.7 1737.8 L11003.0 1728.5 Z"></path>
+						<path d="M40694.5 747.5 L40700.7 756.2 L40690.0 757.2 L40683.8 748.4 Z"></path>
 					</g>
-					<path d="M28794.6 2727.4 L28698 3314 L13287 3499.812742435997 L13287.0 3499.8 " fill="none"></path>
+					<path d="M40701.3 729.4 L41357.5 966 L41357.5 1197 L41357.5 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28801.4 2719.1 L28794.6 2727.4 L28790.9 2717.3 L28797.7 2709.0 Z"></path>
+						<path d="M40694.3 721.2 L40701.3 729.4 L40690.7 731.3 L40683.8 723.1 Z"></path>
 					</g>
-					<path d="M28828.4 2727.4 L28925 3314 L53266.75 3499.1008175081292 L53266.8 3499.1 " fill="none"></path>
+					<path d="M40424.3 165.3 L40424.25 293 L40424.25 358 L40424.3 358.0 " fill="none"></path>
+					<path d="M40429.6 165.3 L40424.3 165.3 L40418.9 165.3 L40424.3 152.0 Z"></path>
+					<path d="M37508.1 2681.8 L37381 3314 L21597.75 3500.1579550664833 L21597.8 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28832.1 2717.3 L28828.4 2727.4 L28821.6 2719.1 L28825.3 2709.0 Z"></path>
+						<path d="M37515.2 2673.7 L37508.1 2681.8 L37504.7 2671.6 L37511.8 2663.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M32358.4 1703.1 L28811.5 1936 L28811.5 2541 L28811.5 2541.0 " fill="none"></path>
+					<path d="M37542.4 2680.8 L37803 3314 L37803 3485 L37803.0 3485.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M37543.8 2670.1 L37542.4 2680.8 L37534.0 2674.2 L37535.3 2663.5 Z"></path>
 					</g>
-					<path d="M32358.8 1708.4 L32358.4 1703.1 L32358.1 1697.7 L32371.8 1702.2 Z"></path>
-					<path d="M22477.9 2665.7 L21867.75 3314 L25082 3492.2906164027067 L25082.0 3492.3 " fill="none"></path>
-					<path d="M22481.8 2669.4 L22477.9 2665.7 L22474.1 2662.1 L22487.1 2656.0 Z"></path>
-					<path d="M69550.1 2831.5 L69375.25 3314 L64748 3499.278755837046 L64748.0 3499.3 " fill="none"></path>
+					<path d="M24548.8 2705.2 L24548.75 3314 L21597.75 3498.685067114094 L21597.8 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69558.3 2824.6 L69550.1 2831.5 L69548.3 2821.0 L69556.5 2814.0 Z"></path>
+						<path d="M24554.1 2695.8 L24548.8 2705.2 L24543.4 2695.8 L24548.8 2686.5 Z"></path>
 					</g>
-					<path d="M69562.0 2831.9 L69415.25 3314 L59452 3499.6428928241376 L59452.0 3499.6 " fill="none"></path>
+					<path d="M16795.7 3926.0 L16724.5 4000 L62172 4133.786577328647 L62172.0 4133.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69569.8 2824.5 L69562.0 2831.9 L69559.6 2821.4 L69567.5 2814.0 Z"></path>
+						<path d="M16806.0 3922.9 L16795.7 3926.0 L16798.3 3915.5 L16808.6 3912.5 Z"></path>
 					</g>
-					<path d="M69625.0 2832.7 L69625 3314 L69625 3500.5 L69625 3500.5 L69625 3687 L69625 3687 L69625 3843.5 L69625 3843.5 L69625 4000 L69625 4000 L58865 4133.392543250994 L58865.0 4133.4 " fill="none"></path>
+					<path d="M16974.5 3924.3 L17067.75 4000 L14886.5 4129.574420924305 L14886.5 4129.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69630.3 2823.3 L69625.0 2832.7 L69619.7 2823.3 L69625.0 2814.0 Z"></path>
+						<path d="M16970.6 3914.2 L16974.5 3924.3 L16963.9 3922.5 L16960.0 3912.5 Z"></path>
 					</g>
-					<path d="M69731.0 2830.6 L69980.25 3314 L69980.25 3500.5 L69980.25 3500.5 L69980.25 3687 L69980.25 3687 L57389.25 3841.7729254211995 L57389.3 3841.8 " fill="none"></path>
+					<path d="M40870.3 165.3 L40870.25 293 L40870.25 583.5 L40870.3 583.5 " fill="none"></path>
+					<path d="M40875.6 165.3 L40870.3 165.3 L40864.9 165.3 L40870.3 152.0 Z"></path>
+					<path d="M41205.3 165.3 L41205.25 293 L41205.25 583.5 L41205.3 583.5 " fill="none"></path>
+					<path d="M41210.6 165.3 L41205.3 165.3 L41199.9 165.3 L41205.3 152.0 Z"></path>
+					<path d="M24746.8 2712.2 L24746.75 3314 L25696 3492.328003021909 L25696.0 3492.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69731.5 2819.9 L69731.0 2830.6 L69722.0 2824.7 L69722.4 2814.0 Z"></path>
+						<path d="M24752.1 2702.8 L24746.8 2712.2 L24741.4 2702.8 L24746.8 2693.5 Z"></path>
 					</g>
-					<path d="M69742.7 2830.2 L70020.25 3314 L58796.5 3499.6316927169937 L58796.5 3499.6 " fill="none"></path>
+					<path d="M83574.0 171.4 L83182 293 L83182 629.5 L83182 629.5 L83182 966 L83182 966 L83182 1174 L83182.0 1174.0 " fill="none"></path>
+					<path d="M83575.6 176.5 L83574.0 171.4 L83572.5 166.4 L83586.8 167.5 Z"></path>
+					<path d="M867.2 3422.4 L880 3417 L887.5 3417 L887.5 3417 L895 3500.5 L895 3500.5 L887.5 3584 L887.5 3584 L880 3584 L880 3584 L850 3571.284263959391 L850.0 3571.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69742.7 2819.4 L69742.7 2830.2 L69733.4 2824.7 L69733.4 2814.0 Z"></path>
+						<path d="M856.5 3421.2 L867.2 3422.4 L860.7 3431.0 L850.0 3429.7 Z"></path>
 					</g>
-					<path d="M72144.3 954.9 L72156.5 966 L72156.5 1212.5 L72156.5 1212.5 L72156.5 1459 L72156.5 1459 L72156.5 1697.5 L72156.5 1697.5 L72156.5 1936 L72156.5 1936 L70044.5 2510.8244124037133 L70044.5 2510.8 " fill="none"></path>
-					<path d="M72147.8 951.0 L72144.3 954.9 L72140.7 958.9 L72134.4 946.0 Z"></path>
-					<path d="M82942.8 1904.0 L82914.75 1936 L70044.5 2603.2512462612162 L70044.5 2603.3 " fill="none"></path>
-					<path d="M82946.9 1907.5 L82942.8 1904.0 L82938.8 1900.5 L82951.6 1894.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M70243.5 1262.4 L70124.5 1459 L70124.5 1697.5 L70124.5 1697.5 L70124.5 1936 L70124.5 1936 L69762.01814223512 2436 L69762.0 2436.0 " fill="none"></path>
+						<path d="M3106.0 2653.8 L3123.25 3314 L850 3487.7367585288393 L850.0 3487.7 " fill="none"></path>
 					</g>
-					<path d="M70248.1 1265.2 L70243.5 1262.4 L70239.0 1259.6 L70250.4 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M80298.2 1704.3 L76792 1936 L70044.5 2584.6713408678665 L70044.5 2584.7 " fill="none"></path>
+					<path d="M3111.3 2653.7 L3106.0 2653.8 L3100.7 2654.0 L3105.7 2640.5 Z"></path>
+					<path d="M17301.6 3941.9 L17178.5 4000 L15060.5 4129.8910755148745 L15060.5 4129.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M17312.3 3942.7 L17301.6 3941.9 L17307.8 3933.1 L17318.5 3933.9 Z"></path>
 					</g>
-					<path d="M80298.5 1709.6 L80298.2 1704.3 L80297.8 1699.0 L80311.5 1703.4 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M6041.0 1256.8 L6029.75 1459 L6029.75 1697.5 L6029.75 1697.5 L6029.75 1936 L6029.75 1936 L69205.5 2620.45507722668 L69205.5 2620.5 " fill="none"></path>
+					<path d="M17302.1 3955.1 L17218.5 4000 L6898 4132.924548250673 L6898.0 4132.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M17312.8 3955.4 L17302.1 3955.1 L17307.8 3946.0 L17318.5 3946.3 Z"></path>
 					</g>
-					<path d="M6046.4 1257.1 L6041.0 1256.8 L6035.7 1256.5 L6041.8 1243.5 Z"></path>
-					<path d="M42045.4 2873.1 L41661.75 3314 L64687 3500.253282803639 L64687.0 3500.3 " fill="none"></path>
+					<path d="M17719.5 3901.4 L18076.25 4000 L18317.671641791047 4118.5 L18317.7 4118.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42055.5 2869.5 L42045.4 2873.1 L42047.5 2862.5 L42057.6 2859.0 Z"></path>
+						<path d="M17711.9 3893.8 L17719.5 3901.4 L17709.1 3904.1 L17701.5 3896.4 Z"></path>
 					</g>
-					<path d="M42059.5 2873.5 L41701.75 3314 L54242.75 3499.6635443540385 L54242.8 3499.7 " fill="none"></path>
+					<path d="M17719.6 3897.6 L18116.25 4000 L15404.5 4126.887647315582 L15404.5 4126.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42069.5 2869.6 L42059.5 2873.5 L42061.2 2862.9 L42071.2 2859.0 Z"></path>
+						<path d="M17711.9 3890.1 L17719.6 3897.6 L17709.2 3900.4 L17701.5 3892.9 Z"></path>
 					</g>
-					<path d="M42186.8 2876.9 L42057.75 3314 L42057.75 3500.5 L42057.75 3500.5 L42057.75 3687 L42057.75 3687 L42057.75 3843.5 L42057.75 3843.5 L42057.75 4000 L42057.75 4000 L58767 4133.608192979577 L58767.0 4133.6 " fill="none"></path>
+					<path d="M41539.5 193.7 L41474.75 293 L41474.75 598.5 L41474.8 598.5 " fill="none"></path>
+					<path d="M41544.0 196.6 L41539.5 193.7 L41535.0 190.8 L41546.8 182.5 Z"></path>
+					<path d="M41614.0 193.7 L41678.75 293 L41678.75 598.5 L41678.8 598.5 " fill="none"></path>
+					<path d="M41618.5 190.8 L41614.0 193.7 L41609.5 196.6 L41606.7 182.5 Z"></path>
+					<path d="M18329.5 3911.2 L18247.25 4000 L15504.5 4132.550175818231 L15504.5 4132.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42194.6 2869.5 L42186.8 2876.9 L42184.4 2866.4 L42192.1 2859.0 Z"></path>
+						<path d="M18339.8 3908.0 L18329.5 3911.2 L18332.0 3900.7 L18342.2 3897.5 Z"></path>
 					</g>
-					<path d="M42506.4 2872.3 L42944.5 3314 L42944.5 3500.5 L42944.5 3500.5 L42944.5 3687 L42944.5 3687 L57108.25 3841.962816994949 L57108.3 3842.0 " fill="none"></path>
+					<path d="M60478.8 4214.2 L60478.75 4268 L65854.25 4451.378589720139 L65854.3 4451.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42503.7 2861.9 L42506.4 2872.3 L42496.1 2869.4 L42493.3 2859.0 Z"></path>
+						<path d="M60484.1 4204.8 L60478.8 4214.2 L60473.4 4204.8 L60478.8 4195.5 Z"></path>
 					</g>
-					<path d="M42520.4 2871.9 L42984.5 3314 L58691.5 3499.87870808084 L58691.5 3499.9 " fill="none"></path>
+					<path d="M18382.4 3910.7 L18369.25 4000 L60210.75 4133.147175815434 L60210.8 4133.1 " fill="none"></path>
+					<path d="M18387.7 3911.5 L18382.4 3910.7 L18377.1 3909.9 L18384.3 3897.5 Z"></path>
+					<path d="M18442.5 3908.0 L18514.25 4000 L40095 4133.579098100352 L40095.0 4133.6 " fill="none"></path>
+					<path d="M18446.7 3904.7 L18442.5 3908.0 L18438.3 3911.3 L18434.3 3897.5 Z"></path>
+					<path d="M21568.8 3529.3 L21568.75 3687 L21568.75 3805 L21568.8 3805.0 " fill="none"></path>
+					<path d="M21574.1 3529.3 L21568.8 3529.3 L21563.4 3529.3 L21568.8 3516.0 Z"></path>
+					<path d="M42019.3 165.3 L42019.25 293 L42019.25 583 L42019.3 583.0 " fill="none"></path>
+					<path d="M42024.6 165.3 L42019.3 165.3 L42013.9 165.3 L42019.3 152.0 Z"></path>
+					<path d="M42468.3 724.7 L42468.25 966 L42468.25 1197 L42468.3 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42517.3 2861.6 L42520.4 2871.9 L42510.0 2869.3 L42506.9 2859.0 Z"></path>
+						<path d="M42473.6 715.3 L42468.3 724.7 L42462.9 715.3 L42468.3 706.0 Z"></path>
 					</g>
-					<path d="M68222.7 1739.7 L68096.75 1936 L42688.75 2613.5991174933715 L42688.8 2613.6 " fill="none"></path>
-					<path d="M68227.2 1742.6 L68222.7 1739.7 L68218.2 1736.8 L68229.9 1728.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M70251.3 1263.2 L70164.5 1459 L70164.5 1697.5 L70164.5 1697.5 L70164.5 1936 L70164.5 1936 L42688.75 2614.4439715803715 L42688.8 2614.4 " fill="none"></path>
+					<path d="M42468.3 165.3 L42468.25 293 L42468.25 553 L42468.3 553.0 " fill="none"></path>
+					<path d="M42473.6 165.3 L42468.3 165.3 L42462.9 165.3 L42468.3 152.0 Z"></path>
+					<path d="M43431.5 160.8 L43282.5 293 L43282.5 575.5 L43282.5 575.5 " fill="none"></path>
+					<path d="M43435.1 164.8 L43431.5 160.8 L43428.0 156.9 L43441.5 152.0 Z"></path>
+					<path d="M43486.5 160.8 L43635.5 293 L43635.5 598.5 L43635.5 598.5 " fill="none"></path>
+					<path d="M43490.0 156.9 L43486.5 160.8 L43482.9 164.8 L43476.5 152.0 Z"></path>
+					<path d="M22700.3 1724.8 L22591 1936 L22591 2541 L22591.0 2541.0 " fill="none"></path>
+					<path d="M22705.1 1727.3 L22700.3 1724.8 L22695.6 1722.4 L22706.5 1713.0 Z"></path>
+					<path d="M33529.7 1703.9 L30085.75 1936 L29013.75435413643 2594 L29013.8 2594.0 " fill="none"></path>
+					<path d="M33530.1 1709.2 L33529.7 1703.9 L33529.3 1698.6 L33543.0 1703.0 Z"></path>
+					<path d="M11816.5 2690.2 L11816.5 3314 L14634.5 3489.4488399265565 L14634.5 3489.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M11821.8 2680.8 L11816.5 2690.2 L11811.2 2680.8 L11816.5 2671.5 Z"></path>
 					</g>
-					<path d="M70256.2 1265.4 L70251.3 1263.2 L70246.4 1261.0 L70256.7 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M80298.2 1704.4 L76832 1936 L42688.75 2616.4798637576564 L42688.8 2616.5 " fill="none"></path>
+					<path d="M13472.3 1714.0 L11816.5 1936 L11816.5 2578.5 L11816.5 2578.5 " fill="none"></path>
+					<path d="M13473.0 1719.2 L13472.3 1714.0 L13471.6 1708.7 L13485.5 1712.2 Z"></path>
+					<path d="M12571.3 2690.2 L12571.25 3314 L14634.5 3485.7264866674104 L14634.5 3485.7 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M12576.6 2680.8 L12571.3 2690.2 L12565.9 2680.8 L12571.3 2671.5 Z"></path>
 					</g>
-					<path d="M80298.6 1709.7 L80298.2 1704.4 L80297.8 1699.0 L80311.5 1703.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M6048.2 1256.8 L6069.75 1459 L6069.75 1697.5 L6069.75 1697.5 L6069.75 1936 L6069.75 1936 L41833.75 2616.8614177362088 L41833.8 2616.9 " fill="none"></path>
+					<path d="M13472.5 1726.0 L12571.25 1936 L12571.25 2578.5 L12571.3 2578.5 " fill="none"></path>
+					<path d="M13473.7 1731.2 L13472.5 1726.0 L13471.3 1720.8 L13485.5 1723.0 Z"></path>
+					<path d="M13528.5 2690.2 L13528.5 3314 L14634.5 3474.7082197117256 L14634.5 3474.7 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M13533.8 2680.8 L13528.5 2690.2 L13523.2 2680.8 L13528.5 2671.5 Z"></path>
 					</g>
-					<path d="M6053.5 1256.2 L6048.2 1256.8 L6042.9 1257.3 L6046.8 1243.5 Z"></path>
-					<path d="M58352.5 1767.2 L57962 1936 L57962 2541 L57962.0 2541.0 " fill="none"></path>
-					<path d="M58354.6 1772.1 L58352.5 1767.2 L58350.4 1762.3 L58364.8 1761.9 Z"></path>
-					<path d="M29359.5 3618.2 L29359.5 3687 L62577.5 3843.1568291730496 L62577.5 3843.2 " fill="none"></path>
+					<path d="M13582.8 1741.3 L13528.5 1936 L13528.5 2578.5 L13528.5 2578.5 " fill="none"></path>
+					<path d="M13587.9 1742.8 L13582.8 1741.3 L13577.6 1739.9 L13586.4 1728.5 Z"></path>
+					<path d="M18497.3 2705.2 L18497.25 3314 L14989.5 3491.5172308527235 L14989.5 3491.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29364.8 3608.8 L29359.5 3618.2 L29354.2 3608.8 L29359.5 3599.5 Z"></path>
+						<path d="M18502.6 2695.8 L18497.3 2705.2 L18491.9 2695.8 L18497.3 2686.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M32358.5 1703.5 L29078.5 1936 L29078.5 2625 L29078.5 2625 L29078.5 3314 L29078.5 3314 L29211.5 3402.2722419928828 L29211.5 3402.3 " fill="none"></path>
+					<path d="M13717.8 1703.5 L18497.25 1936 L18497.25 2563.5 L18497.3 2563.5 " fill="none"></path>
+					<path d="M13718.1 1698.1 L13717.8 1703.5 L13717.6 1708.8 L13704.5 1702.8 Z"></path>
+					<path d="M29431.8 2694.1 L28149.5 3314 L21499.75 3499.509648105905 L21499.8 3499.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M29442.5 2694.9 L29431.8 2694.1 L29437.8 2685.3 L29448.6 2686.0 Z"></path>
 					</g>
-					<path d="M32358.8 1708.8 L32358.5 1703.5 L32358.1 1698.2 L32371.8 1702.6 Z"></path>
-					<path d="M16683.8 1762.7 L16683.75 1936 L16683.75 2594 L16683.8 2594.0 " fill="none"></path>
+					<path d="M29435.4 2694.3 L28189.5 3314 L14989.5 3498.025415810129 L14989.5 3498.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16689.1 1753.3 L16683.8 1762.7 L16678.4 1753.3 L16683.8 1744.0 Z"></path>
+						<path d="M29446.1 2694.9 L29435.4 2694.3 L29441.4 2685.4 L29452.1 2686.0 Z"></path>
 					</g>
-					<path d="M22965.0 1220.6 L20332.75 1459 L16848.75 1686.7155385036997 L16848.8 1686.7 " fill="none"></path>
-					<path d="M22965.5 1225.9 L22965.0 1220.6 L22964.5 1215.3 L22978.3 1219.4 Z"></path>
-					<path d="M64271.5 2778.2 L64002 3314 L54355.75 3499.4139934554637 L54355.8 3499.4 " fill="none"></path>
+					<path d="M29591.4 2704.3 L29719.75 3314 L13203.75 3499.9090442707547 L13203.8 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64280.4 2772.2 L64271.5 2778.2 L64270.9 2767.4 L64279.9 2761.5 Z"></path>
+						<path d="M29594.7 2694.0 L29591.4 2704.3 L29584.3 2696.2 L29587.6 2686.0 Z"></path>
 					</g>
-					<path d="M64421.7 2778.3 L64677.5 3314 L58796.5 3498.849835678773 L58796.5 3498.8 " fill="none"></path>
+					<path d="M29904.8 2697.2 L29904.75 3314 L59258.25 3500.14171200272 L59258.3 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64422.5 2767.6 L64421.7 2778.3 L64412.9 2772.2 L64413.7 2761.5 Z"></path>
+						<path d="M29910.1 2687.8 L29904.8 2697.2 L29899.4 2687.8 L29904.8 2678.5 Z"></path>
 					</g>
-					<path d="M68229.4 1740.5 L68136.75 1936 L64696.5 2561.7063947733122 L64696.5 2561.7 " fill="none"></path>
-					<path d="M68234.2 1742.8 L68229.4 1740.5 L68224.5 1738.3 L68235.1 1728.5 Z"></path>
-					<path d="M83581.2 1857.1 L83477.5 1936 L64696.5 2612.4655235506298 L64696.5 2612.5 " fill="none"></path>
-					<path d="M83584.4 1861.3 L83581.2 1857.1 L83577.9 1852.8 L83591.8 1849.0 Z"></path>
-					<path d="M29315.5 2712.7 L29315.5 3314 L29336.143431635388 3401.5 L29336.1 3401.5 " fill="none"></path>
+					<path d="M30321.8 2703.9 L30144.75 3314 L30144.75 3485 L30144.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29320.8 2703.3 L29315.5 2712.7 L29310.2 2703.3 L29315.5 2694.0 Z"></path>
+						<path d="M30329.6 2696.5 L30321.8 2703.9 L30319.3 2693.5 L30327.0 2686.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M32358.5 1704.0 L29315.5 1936 L29315.5 2556 L29315.5 2556.0 " fill="none"></path>
+					<path d="M30361.5 2704.3 L30490.5 3314 L59258.25 3500.1344310779987 L59258.3 3500.1 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M30364.8 2694.0 L30361.5 2704.3 L30354.4 2696.2 L30357.7 2686.0 Z"></path>
+					</g>
+					<path d="M43527.9 2893.9 L43052.75 3314 L43052.75 3500.5 L43052.75 3500.5 L43052.75 3687 L43052.75 3687 L43052.75 3843.5 L43052.75 3843.5 L43052.75 4000 L43052.75 4000 L72971.75 4133.342623850464 L72971.8 4133.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M43538.4 2891.7 L43527.9 2893.9 L43531.4 2883.7 L43541.9 2881.5 Z"></path>
 					</g>
-					<path d="M32358.9 1709.3 L32358.5 1704.0 L32358.0 1698.6 L32371.8 1703.0 Z"></path>
-					<path d="M15728.8 1747.2 L15728.75 1936 L41833.75 2613.898614906247 L41833.8 2613.9 " fill="none"></path>
+					<path d="M43543.1 2894.2 L43092.75 3314 L60183.25 3498.3694036325774 L60183.3 3498.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15734.1 1737.8 L15728.8 1747.2 L15723.4 1737.8 L15728.8 1728.5 Z"></path>
+						<path d="M43553.6 2891.8 L43543.1 2894.2 L43546.3 2884.0 L43556.8 2881.5 Z"></path>
 					</g>
-					<path d="M83124.3 1912.7 L83124.25 1936 L83124.25 2625 L83124.25 2625 L83124.25 3314 L83124.25 3314 L83124.25 3500.5 L83124.25 3500.5 L83124.25 3687 L83124.25 3687 L62723.5 3842.941992795653 L62723.5 3842.9 " fill="none"></path>
+					<path d="M43558.4 2894.6 L43132.75 3314 L64028.25 3500.09033498078 L64028.3 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M83129.6 1903.3 L83124.3 1912.7 L83118.9 1903.3 L83124.3 1894.0 Z"></path>
+						<path d="M43568.8 2891.8 L43558.4 2894.6 L43561.3 2884.3 L43571.7 2881.5 Z"></path>
 					</g>
-					<path d="M83397.2 1905.3 L83437.5 1936 L83437.5 2625 L83437.5 2625 L83437.5 3314 L83437.5 3314 L54355.75 3500.138370526713 L54355.8 3500.1 " fill="none"></path>
+					<path d="M43635.8 2896.6 L43334.25 3314 L59258.25 3499.8406182534964 L59258.3 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M83393.0 1895.4 L83397.2 1905.3 L83386.5 1903.9 L83382.3 1894.0 Z"></path>
+						<path d="M43645.6 2892.2 L43635.8 2896.6 L43636.9 2885.9 L43646.7 2881.5 Z"></path>
 					</g>
-					<path d="M16162.8 1747.2 L16162.75 1936 L64000.5 2620.024006059883 L64000.5 2620.0 " fill="none"></path>
+					<path d="M43651.3 2897.0 L43374.25 3314 L61341.25 3499.9566303171564 L61341.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16168.1 1737.8 L16162.8 1747.2 L16157.4 1737.8 L16162.8 1728.5 Z"></path>
+						<path d="M43660.9 2892.2 L43651.3 2897.0 L43652.0 2886.3 L43661.6 2881.5 Z"></path>
 					</g>
-					<path d="M34048.9 1217.9 L29831 1459 L29831 1598.5 L29831.0 1598.5 " fill="none"></path>
-					<path d="M34049.2 1223.2 L34048.9 1217.9 L34048.6 1212.6 L34062.3 1217.2 Z"></path>
-					<path d="M83124.3 1285.2 L83124.25 1459 L83124.25 1501 L83124.3 1501.0 " fill="none"></path>
+					<path d="M43916.6 2899.3 L44044.5 3314 L14989.5 3499.36757034123 L14989.5 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M83129.6 1275.8 L83124.3 1285.2 L83118.9 1275.8 L83124.3 1266.5 Z"></path>
+						<path d="M43919.0 2888.8 L43916.6 2899.3 L43908.8 2892.0 L43911.1 2881.5 Z"></path>
 					</g>
-					<path d="M83694.8 161.6 L83124.25 293 L83124.25 629.5 L83124.25 629.5 L83124.25 966 L83124.25 966 L83124.25 1158.5 L83124.3 1158.5 " fill="none"></path>
-					<path d="M83696.0 166.8 L83694.8 161.6 L83693.6 156.4 L83707.8 158.6 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M34049.1 1226.2 L32443.25 1459 L32443.25 1666.5 L32443.3 1666.5 " fill="none"></path>
+						<path d="M47006.2 141.6 L43832 293 L43832 629.5 L43832 629.5 L43832 966 L43832 966 L43832 1212.5 L43832 1212.5 L43832 1459 L43832 1459 L43832 1697.5 L43832 1697.5 L43832 1936 L43832 1936 L43832 2368.5 L43832.0 2368.5 " fill="none"></path>
 					</g>
-					<path d="M34049.8 1231.5 L34049.1 1226.2 L34048.3 1220.9 L34062.3 1224.3 Z"></path>
-					<path d="M30786.5 2727.7 L30786.5 3314 L29895.5 3470.029577464789 L29895.5 3470.0 " fill="none"></path>
+					<path d="M47006.4 146.9 L47006.2 141.6 L47005.9 136.3 L47019.5 141.0 Z"></path>
+					<path d="M15006.8 3422.1 L15019.5 3417 L15027 3417 L15027 3417 L15034.5 3500.5 L15034.5 3500.5 L15027 3584 L15027 3584 L15019.5 3584 L15019.5 3584 L14989.5 3571.9277108433735 L14989.5 3571.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30791.8 2718.3 L30786.5 2727.7 L30781.2 2718.3 L30786.5 2709.0 Z"></path>
+						<path d="M14996.2 3420.6 L15006.8 3422.1 L15000.1 3430.5 L14989.5 3429.1 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M32358.6 1709.7 L30786.5 1936 L30786.5 2541 L30786.5 2541.0 " fill="none"></path>
+						<path d="M3114.1 2653.2 L3321.5 3314 L14634.5 3497.6190331143116 L14634.5 3497.6 " fill="none"></path>
+					</g>
+					<path d="M3119.2 2651.6 L3114.1 2653.2 L3109.0 2654.8 L3110.1 2640.5 Z"></path>
+					<path d="M1236.8 3450.9 L1249 3447 L1256.5 3447 L1256.5 3447 L1264 3500.5 L1264 3500.5 L1256.5 3554 L1256.5 3554 L1249 3554 L1249 3554 L1219 3544.5309734513276 L1219.0 3544.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1226.3 3448.6 L1236.8 3450.9 L1229.5 3458.7 L1219.0 3456.5 Z"></path>
 					</g>
-					<path d="M32359.3 1715.0 L32358.6 1709.7 L32357.8 1704.4 L32371.8 1707.8 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M32359.2 1727.3 L31769.5 1936 L31769.5 2625 L31769.5 2625 L31769.5 3314 L31769.5 3314 L29895.5 3484.65478515625 L29895.5 3484.7 " fill="none"></path>
+						<path d="M3115.7 2653.0 L3361.5 3314 L1219 3489.0991454864156 L1219.0 3489.1 " fill="none"></path>
 					</g>
-					<path d="M32361.0 1732.3 L32359.2 1727.3 L32357.4 1722.2 L32371.8 1722.8 Z"></path>
-					<path d="M22494.5 2667.9 L22167.25 3314 L25418 3494.315227897985 L25418.0 3494.3 " fill="none"></path>
-					<path d="M22499.3 2670.3 L22494.5 2667.9 L22489.8 2665.5 L22500.5 2656.0 Z"></path>
-					<path d="M72631.4 2884.5 L72510.5 3314 L64748 3499.770082124984 L64748.0 3499.8 " fill="none"></path>
+					<path d="M3120.7 2651.1 L3115.7 2653.0 L3110.7 2654.9 L3111.0 2640.5 Z"></path>
+					<path d="M31074.8 2833.8 L30530.5 3314 L24068.25 3498.5297033492825 L24068.3 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72639.1 2876.9 L72631.4 2884.5 L72628.8 2874.0 L72636.5 2866.5 Z"></path>
+						<path d="M31085.3 2831.7 L31074.8 2833.8 L31078.2 2823.7 L31088.8 2821.5 Z"></path>
 					</g>
-					<path d="M72704.5 2885.2 L72704.5 3314 L54355.75 3499.9274867225386 L54355.8 3499.9 " fill="none"></path>
+					<path d="M31086.5 2834.2 L30570.5 3314 L25656 3497.807129248972 L25656.0 3497.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72709.8 2875.8 L72704.5 2885.2 L72699.2 2875.8 L72704.5 2866.5 Z"></path>
+						<path d="M31097.0 2831.8 L31086.5 2834.2 L31089.7 2823.9 L31100.2 2821.5 Z"></path>
 					</g>
-					<path d="M72777.6 2884.5 L72898.5 3314 L58796.5 3499.808258857607 L58796.5 3499.8 " fill="none"></path>
+					<path d="M31098.3 2834.6 L30610.5 3314 L30610.5 3485 L30610.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72780.2 2874.0 L72777.6 2884.5 L72769.9 2876.9 L72772.5 2866.5 Z"></path>
+						<path d="M31108.7 2831.8 L31098.3 2834.6 L31101.2 2824.2 L31111.6 2821.5 Z"></path>
 					</g>
-					<path d="M72233.0 726.9 L73335.25 966 L73335.25 1212.5 L73335.25 1212.5 L73335.25 1459 L73335.25 1459 L73335.25 1697.5 L73335.25 1697.5 L73335.25 1936 L73335.25 1936 L72925.58291001452 2383.5 L72925.6 2383.5 " fill="none"></path>
-					<path d="M72234.2 721.7 L72233.0 726.9 L72231.9 732.1 L72220.0 724.1 Z"></path>
-					<path d="M58351.5 2742.7 L58351.5 3314 L53634.75 3493.497806458195 L53634.8 3493.5 " fill="none"></path>
+					<path d="M31165.3 2836.9 L30836 3314 L30836 3500.5 L30836 3500.5 L30836 3687 L30836 3687 L30836 3843.5 L30836 3843.5 L30836 4000 L30836 4000 L18421.25 4133.227340981441 L18421.3 4133.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58356.8 2733.3 L58351.5 2742.7 L58346.2 2733.3 L58351.5 2724.0 Z"></path>
+						<path d="M31175.0 2832.2 L31165.3 2836.9 L31166.2 2826.2 L31175.9 2821.5 Z"></path>
 					</g>
-					<path d="M58449.1 1792.5 L58351.5 1936 L58351.5 2526 L58351.5 2526.0 " fill="none"></path>
-					<path d="M58453.5 1795.5 L58449.1 1792.5 L58444.7 1789.5 L58456.6 1781.5 Z"></path>
-					<path d="M17110.8 1747.2 L17110.75 1936 L57081 2619.0530156938853 L57081.0 2619.1 " fill="none"></path>
+					<path d="M31201.1 2838.1 L30954.5 3314 L30954.5 3485 L30954.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17116.1 1737.8 L17110.8 1747.2 L17105.4 1737.8 L17110.8 1728.5 Z"></path>
+						<path d="M31210.1 2832.2 L31201.1 2838.1 L31200.7 2827.3 L31209.7 2821.5 Z"></path>
 					</g>
-					<path d="M57364.4 2854.5 L57235 3314 L64687 3499.739792849983 L64687.0 3499.7 " fill="none"></path>
+					<path d="M31313.8 2840.2 L31319 3314 L25783 3499.045971861278 L25783.0 3499.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57372.1 2846.9 L57364.4 2854.5 L57361.8 2844.0 L57369.4 2836.5 Z"></path>
+						<path d="M31319.1 2830.8 L31313.8 2840.2 L31308.4 2830.9 L31313.6 2821.5 Z"></path>
 					</g>
-					<path d="M57377.7 2854.7 L57275 3314 L54355.75 3496.958959926069 L54355.8 3497.0 " fill="none"></path>
+					<path d="M31426.5 2837.9 L31683.5 3314 L31683.5 3485 L31683.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57384.9 2846.8 L57377.7 2854.7 L57374.5 2844.4 L57381.7 2836.5 Z"></path>
+						<path d="M31426.7 2827.2 L31426.5 2837.9 L31417.3 2832.2 L31417.6 2821.5 Z"></path>
 					</g>
-					<path d="M57574.5 2852.2 L57870.25 3314 L58691.5 3489.293991416309 L58691.5 3489.3 " fill="none"></path>
+					<path d="M31573.4 2747.5 L32784.75 3314 L21499.75 3499.9151539242966 L21499.8 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57574.0 2841.5 L57574.5 2852.2 L57565.0 2847.2 L57564.4 2836.5 Z"></path>
+						<path d="M31567.2 2738.7 L31573.4 2747.5 L31562.7 2748.4 L31556.5 2739.6 Z"></path>
 					</g>
-					<path d="M68260.6 1741.4 L68308.75 1936 L57777 2602.9616259564787 L57777.0 2603.0 " fill="none"></path>
-					<path d="M68265.8 1740.2 L68260.6 1741.4 L68255.4 1742.7 L68257.4 1728.5 Z"></path>
-					<path d="M38770.9 1834.1 L38625.5 1936 L57081 2612.248544154014 L57081.0 2612.2 " fill="none"></path>
-					<path d="M38774.0 1838.5 L38770.9 1834.1 L38767.8 1829.8 L38781.8 1826.5 Z"></path>
-					<path d="M83607.1 1857.8 L83517.5 1936 L57777 2615.8092837840427 L57777.0 2615.8 " fill="none"></path>
-					<path d="M83610.6 1861.8 L83607.1 1857.8 L83603.6 1853.7 L83617.2 1849.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M70259.3 1263.8 L70204.5 1459 L70204.5 1697.5 L70204.5 1697.5 L70204.5 1936 L70204.5 1936 L57777 2606.2318891628506 L57777.0 2606.2 " fill="none"></path>
+					<path d="M31573.5 2744.3 L32824.75 3314 L13203.75 3500.0023127557374 L13203.8 3500.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M31567.2 2735.6 L31573.5 2744.3 L31562.8 2745.3 L31556.5 2736.6 Z"></path>
 					</g>
-					<path d="M70264.5 1265.3 L70259.3 1263.8 L70254.2 1262.4 L70262.9 1251.0 Z"></path>
+					<path d="M68285.7 645.3 L59173.75 966 L59173.75 1212.5 L59173.75 1212.5 L59173.75 1459 L59173.75 1459 L59173.75 1666.5 L59173.8 1666.5 " fill="none"></path>
+					<path d="M68285.9 650.6 L68285.7 645.3 L68285.5 640.0 L68299.0 644.8 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80412.0 1749.0 L80452 1936 L57777 2614.585544889893 L57777.0 2614.6 " fill="none"></path>
+						<path d="M75443.2 139.8 L72668.75 293 L72668.75 614 L72668.8 614.0 " fill="none"></path>
 					</g>
-					<path d="M80417.2 1747.9 L80412.0 1749.0 L80406.8 1750.2 L80409.2 1736.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M6055.3 1256.4 L6109.75 1459 L6109.75 1697.5 L6109.75 1697.5 L6109.75 1936 L6109.75 1936 L57081 2620.327835071635 L57081.0 2620.3 " fill="none"></path>
+					<path d="M75443.5 145.2 L75443.2 139.8 L75442.9 134.5 L75456.5 139.1 Z"></path>
+					<path d="M65858.3 3998.7 L65858.25 4000 L61787 4132.406407378193 L61787.0 4132.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M65863.6 3989.3 L65858.3 3998.7 L65852.9 3989.3 L65858.3 3980.0 Z"></path>
+					</g>
+					<path d="M59089.7 3869.4 L57954.25 4000 L60210.75 4119.7746088334325 L60210.8 4119.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M59099.6 3873.6 L59089.7 3869.4 L59098.4 3863.0 L59108.3 3867.3 Z"></path>
+					</g>
+					<path d="M59314.8 3946.2 L59314.75 4000 L60887 4127.357714976575 L60887.0 4127.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M59320.1 3936.8 L59314.8 3946.2 L59309.4 3936.8 L59314.8 3927.5 Z"></path>
+					</g>
+					<path d="M59460.5 3937.6 L59557 4000 L61384.25 4125.388042504161 L61384.3 4125.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M59455.5 3928.1 L59460.5 3937.6 L59449.7 3937.0 L59444.8 3927.5 Z"></path>
 					</g>
-					<path d="M6060.4 1255.0 L6055.3 1256.4 L6050.1 1257.8 L6051.8 1243.5 Z"></path>
-					<path d="M17544.8 1762.7 L17544.75 1936 L17544.75 2594 L17544.8 2594.0 " fill="none"></path>
+					<path d="M59314.8 3529.3 L59314.75 3687 L59314.75 3759.5 L59314.8 3759.5 " fill="none"></path>
+					<path d="M59320.1 3529.3 L59314.8 3529.3 L59309.4 3529.3 L59314.8 3516.0 Z"></path>
+					<path d="M33108.5 2712.7 L33108.5 3314 L24068.25 3499.0873150918023 L24068.3 3499.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17550.1 1753.3 L17544.8 1762.7 L17539.4 1753.3 L17544.8 1744.0 Z"></path>
+						<path d="M33113.8 2703.3 L33108.5 2712.7 L33103.2 2703.3 L33108.5 2694.0 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M75443.3 145.5 L74452.25 293 L74452.25 614 L74452.3 614.0 " fill="none"></path>
 					</g>
-					<path d="M22965.0 1222.2 L20783.25 1459 L17716.75 1684.8330245484021 L17716.8 1684.8 " fill="none"></path>
-					<path d="M22965.6 1227.5 L22965.0 1222.2 L22964.4 1216.9 L22978.3 1220.7 Z"></path>
-					<path d="M22529.9 2668.7 L22730.75 3314 L25938 3491.902334746078 L25938.0 3491.9 " fill="none"></path>
-					<path d="M22535.0 2667.1 L22529.9 2668.7 L22524.8 2670.3 L22525.9 2656.0 Z"></path>
+					<path d="M75444.1 150.7 L75443.3 145.5 L75442.5 140.2 L75456.5 143.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M32527.9 1712.5 L33784.5 1936 L33784.5 2563.5 L33784.5 2563.5 " fill="none"></path>
+						<path d="M75443.4 147.9 L74677.75 293 L74677.75 598.5 L74677.8 598.5 " fill="none"></path>
 					</g>
-					<path d="M32528.8 1707.3 L32527.9 1712.5 L32526.9 1717.8 L32514.8 1710.2 Z"></path>
-					<path d="M68457.3 2822.4 L68153 3314 L64748 3498.844273031582 L64748.0 3498.8 " fill="none"></path>
+					<path d="M75444.4 153.1 L75443.4 147.9 L75442.4 142.7 L75456.5 145.4 Z"></path>
+					<path d="M47000.9 142.7 L44297 293 L44297 629.5 L44297 629.5 L44297 966 L44297 966 L44297 1212.5 L44297 1212.5 L44297 1459 L44297 1459 L44297 1697.5 L44297 1697.5 L44297 1936 L44297 1936 L44297 2625 L44297 2625 L44297 3314 L44297 3314 L61341.25 3499.9273034348635 L61341.3 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68466.8 2817.2 L68457.3 2822.4 L68457.7 2811.6 L68467.1 2806.5 Z"></path>
+						<path d="M47010.5 147.5 L47000.9 142.7 L47009.9 136.9 L47019.5 141.7 Z"></path>
 					</g>
-					<path d="M68468.6 2822.8 L68193 3314 L59452 3499.5236713326503 L59452.0 3499.5 " fill="none"></path>
+					<path d="M22736.4 1723.1 L22918 1936 L22918 2571.5 L22918.0 2571.5 " fill="none"></path>
+					<path d="M22740.4 1719.7 L22736.4 1723.1 L22732.3 1726.6 L22727.7 1713.0 Z"></path>
+					<path d="M68280.3 646.0 L59446.5 966 L59446.5 1212.5 L59446.5 1212.5 L59446.5 1459 L59446.5 1459 L59446.5 1697.5 L59446.5 1697.5 L59446.5 1936 L59446.5 1936 L59446.5 2625 L59446.5 2625 L59446.5 3314 L59446.5 3314 L25422 3499.7303200597094 L25422.0 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68477.8 2817.2 L68468.6 2822.8 L68468.5 2812.0 L68477.7 2806.5 Z"></path>
+						<path d="M68289.9 651.0 L68280.3 646.0 L68289.5 640.3 L68299.0 645.3 Z"></path>
 					</g>
-					<path d="M68579.5 2825.2 L68579.5 3314 L68579.5 3500.5 L68579.5 3500.5 L68579.5 3687 L68579.5 3687 L68579.5 3843.5 L68579.5 3843.5 L68579.5 4000 L68579.5 4000 L58865 4133.327495262969 L58865.0 4133.3 " fill="none"></path>
+					<path d="M68280.3 647.6 L60273.25 966 L60273.25 1197 L60273.3 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68584.8 2815.8 L68579.5 2825.2 L68574.2 2815.8 L68579.5 2806.5 Z"></path>
+						<path d="M68289.9 652.5 L68280.3 647.6 L68289.5 641.9 L68299.0 646.8 Z"></path>
 					</g>
-					<path d="M68658.3 2823.9 L68852.5 3314 L68852.5 3500.5 L68852.5 3500.5 L68852.5 3687 L68852.5 3687 L57389.25 3841.6050737908004 L57389.3 3841.6 " fill="none"></path>
+					<path d="M68281.1 762.4 L67586 966 L67586 1174 L67586.0 1174.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68659.8 2813.2 L68658.3 2823.9 L68649.9 2817.1 L68651.4 2806.5 Z"></path>
+						<path d="M68291.5 764.9 L68281.1 762.4 L68288.5 754.7 L68299.0 757.2 Z"></path>
 					</g>
-					<path d="M68669.7 2823.5 L68892.5 3314 L58796.5 3499.5352022466373 L58796.5 3499.5 " fill="none"></path>
+					<path d="M68283.4 925.2 L68221 966 L68221 1212.5 L68221 1212.5 L68221 1459 L68221 1459 L68221 1697.5 L68221 1697.5 L68221 1936 L68221 1936 L68221 2625 L68221 2625 L68221 3314 L68221 3314 L68221 3500.5 L68221 3500.5 L68221 3687 L68221 3687 L68221 3843.5 L68221 3843.5 L68221 4000 L68221 4000 L60746.75 4129.361555103491 L60746.8 4129.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68670.7 2812.8 L68669.7 2823.5 L68661.0 2817.2 L68662.0 2806.5 Z"></path>
+						<path d="M68294.1 924.5 L68283.4 925.2 L68288.3 915.6 L68299.0 914.9 Z"></path>
 					</g>
-					<path d="M72233.0 724.5 L73375.25 966 L73375.25 1212.5 L73375.25 1212.5 L73375.25 1459 L73375.25 1459 L73375.25 1697.5 L73375.25 1697.5 L73375.25 1936 L73375.25 1936 L69125.5 2546.5567950789764 L69125.5 2546.6 " fill="none"></path>
-					<path d="M72234.1 719.2 L72233.0 724.5 L72231.9 729.7 L72220.0 721.7 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M70267.6 1264.2 L70244.5 1459 L70244.5 1697.5 L70244.5 1697.5 L70244.5 1936 L70244.5 1936 L69018.1030478955 2443.5 L69018.1 2443.5 " fill="none"></path>
+					<path d="M69130.3 957.9 L69140 966 L69140 1212.5 L69140 1212.5 L69140 1459 L69140 1459 L69140 1697.5 L69140 1697.5 L69140 1936 L69140 1936 L69140 2625 L69140 2625 L69140 3314 L69140 3314 L69140 3500.5 L69140 3500.5 L69140 3687 L69140 3687 L69140 3843.5 L69140 3843.5 L69140 4000 L69140 4000 L69140 4134 L69140 4134 L69140 4268 L69140 4268 L66037.25 4449.157666118807 L66037.3 4449.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M69126.5 947.9 L69130.3 957.9 L69119.7 956.1 L69115.9 946.0 Z"></path>
 					</g>
-					<path d="M70272.9 1264.9 L70267.6 1264.2 L70262.3 1263.6 L70269.2 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80420.4 1748.5 L80492 1936 L69125.5 2593.4202308499475 L69125.5 2593.4 " fill="none"></path>
+						<path d="M47219.8 137.3 L68735 293 L68735 313 L68735.0 313.0 " fill="none"></path>
 					</g>
-					<path d="M80425.4 1746.6 L80420.4 1748.5 L80415.5 1750.4 L80415.7 1736.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M6152.7 1246.1 L6845.75 1459 L6845.75 1697.5 L6845.75 1697.5 L6845.75 1936 L6845.75 1936 L68033.5 2618.9061858383784 L68033.5 2618.9 " fill="none"></path>
+					<path d="M47219.9 131.9 L47219.8 137.3 L47219.8 142.6 L47206.5 137.2 Z"></path>
+					<path d="M25439.6 3443.9 L25452 3439.5 L25459.5 3439.5 L25459.5 3439.5 L25467 3500.5 L25467 3500.5 L25459.5 3561.5 L25459.5 3561.5 L25452 3561.5 L25452 3561.5 L25422 3550.7982456140353 L25422.0 3550.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M25429.0 3442.0 L25439.6 3443.9 L25432.6 3452.1 L25422.0 3450.2 Z"></path>
 					</g>
-					<path d="M6154.3 1241.0 L6152.7 1246.1 L6151.2 1251.2 L6140.0 1242.2 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3657.8 2650.7 L3104 3314 L1604 3479.1904340124 L1604.0 3479.2 " fill="none"></path>
+						<path d="M3117.2 2652.7 L3401.5 3314 L25140 3499.2981215292853 L25140.0 3499.3 " fill="none"></path>
 					</g>
-					<path d="M3661.9 2654.2 L3657.8 2650.7 L3653.7 2647.3 L3666.3 2640.5 Z"></path>
-					<path d="M65042.9 2814.6 L64717.5 3314 L64717.5 3485 L64717.5 3485.0 " fill="none"></path>
+					<path d="M3122.1 2650.6 L3117.2 2652.7 L3112.3 2654.9 L3111.9 2640.5 Z"></path>
+					<path d="M75333.4 1295.6 L74657.25 1459 L81834 1693.176540000684 L81834.0 1693.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65052.5 2809.7 L65042.9 2814.6 L65043.5 2803.9 L65053.1 2799.0 Z"></path>
+						<path d="M75343.7 1298.6 L75333.4 1295.6 L75341.2 1288.2 L75351.5 1291.2 Z"></path>
 					</g>
-					<path d="M65053.7 2815.1 L64757.5 3314 L59452 3498.896898065963 L59452.0 3498.9 " fill="none"></path>
+					<path d="M76021.1 1241.6 L78596 1459 L78596 1697.5 L78596 1697.5 L78596 1936 L78596 1936 L78596 2625 L78596 2625 L78596 3314 L78596 3314 L72068.25 3498.102737136592 L72068.3 3498.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65063.0 2809.7 L65053.7 2815.1 L65053.9 2804.3 L65063.2 2799.0 Z"></path>
+						<path d="M76012.2 1235.5 L76021.1 1241.6 L76011.4 1246.1 L76002.5 1240.0 Z"></path>
 					</g>
-					<path d="M65064.5 2815.5 L64797.5 3314 L58651.5 3488.5304910544346 L58651.5 3488.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65073.6 2809.7 L65064.5 2815.5 L65064.2 2804.7 L65073.3 2799.0 Z"></path>
+					<path d="M73025.2 725.8 L72404 966 L75351.5 1187.9855637030248 L75351.5 1188.0 " fill="none"></path>
+					<path d="M73027.1 730.8 L73025.2 725.8 L73023.3 720.8 L73037.6 721.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M83594.1 172.3 L83282 293 L83282 629.5 L83282 629.5 L83282 966 L83282 966 L76002.5 1201.9496055226825 L76002.5 1201.9 " fill="none"></path>
 					</g>
-					<path d="M65166.5 2817.7 L65166.5 3314 L65166.5 3500.5 L65166.5 3500.5 L65166.5 3687 L65166.5 3687 L65166.5 3843.5 L65166.5 3843.5 L65166.5 4000 L65166.5 4000 L58865 4132.966065664121 L58865.0 4133.0 " fill="none"></path>
+					<path d="M83596.1 177.3 L83594.1 172.3 L83592.2 167.3 L83606.6 167.5 Z"></path>
+					<path d="M33529.7 1704.5 L30370.75 1936 L29335.41074020319 2571.5 L29335.4 2571.5 " fill="none"></path>
+					<path d="M33530.1 1709.8 L33529.7 1704.5 L33529.3 1699.2 L33543.0 1703.5 Z"></path>
+					<path d="M81116.0 702.2 L81116 966 L73557.5 1202.083407247846 L73557.5 1202.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65171.8 2808.3 L65166.5 2817.7 L65161.2 2808.3 L65166.5 2799.0 Z"></path>
+						<path d="M81121.3 692.8 L81116.0 702.2 L81110.7 692.8 L81116.0 683.5 Z"></path>
 					</g>
-					<path d="M65220.8 2817.0 L65361.5 3314 L65361.5 3500.5 L65361.5 3500.5 L65361.5 3687 L65361.5 3687 L57389.25 3840.7896674986905 L57389.3 3840.8 " fill="none"></path>
+					<path d="M82061.8 152.7 L81116 293 L81116 575.5 L81116.0 575.5 " fill="none"></path>
+					<path d="M82062.6 158.0 L82061.8 152.7 L82061.0 147.4 L82075.0 150.7 Z"></path>
+					<path d="M78384.3 203.8 L77985.25 293 L77985.25 614 L77985.3 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65223.4 2806.5 L65220.8 2817.0 L65213.2 2809.4 L65215.7 2799.0 Z"></path>
+						<path d="M78394.6 207.0 L78384.3 203.8 L78392.2 196.6 L78402.5 199.7 Z"></path>
 					</g>
-					<path d="M65231.9 2816.7 L65401.5 3314 L58796.5 3499.029290274127 L58796.5 3499.0 " fill="none"></path>
+					<path d="M78470.2 235.8 L78346.25 293 L78346.25 614 L78346.3 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65233.9 2806.1 L65231.9 2816.7 L65223.8 2809.6 L65225.8 2799.0 Z"></path>
-					</g>
-					<path d="M72233.1 722.1 L73415.25 966 L73415.25 1212.5 L73415.25 1212.5 L73415.25 1459 L73415.25 1459 L73415.25 1697.5 L73415.25 1697.5 L73415.25 1936 L73415.25 1936 L65596.5 2589.0830428852855 L65596.5 2589.1 " fill="none"></path>
-					<path d="M72234.1 716.9 L72233.1 722.1 L72232.0 727.4 L72220.0 719.4 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M70276.0 1264.3 L70284.5 1459 L70284.5 1697.5 L70284.5 1697.5 L70284.5 1936 L70284.5 1936 L65596.5 2567.112153184838 L65596.5 2567.1 " fill="none"></path>
+						<path d="M78480.9 236.8 L78470.2 235.8 L78476.4 227.1 L78487.2 228.0 Z"></path>
 					</g>
-					<path d="M70281.3 1264.1 L70276.0 1264.3 L70270.7 1264.6 L70275.4 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M6153.2 1226.5 L7975.75 1459 L7975.75 1697.5 L7975.75 1697.5 L7975.75 1936 L7975.75 1936 L64736.5 2619.8196168086624 L64736.5 2619.8 " fill="none"></path>
+					<path d="M78710.9 246.2 L78721.75 293 L78721.75 614 L78721.8 614.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M78714.0 235.9 L78710.9 246.2 L78703.6 238.3 L78706.7 228.0 Z"></path>
 					</g>
-					<path d="M6153.9 1221.2 L6153.2 1226.5 L6152.6 1231.8 L6140.0 1224.8 Z"></path>
-					<path d="M58230.0 3625.7 L58230 3687 L57389.25 3821.091592356688 L57389.3 3821.1 " fill="none"></path>
+					<path d="M78890.8 236.1 L79008 293 L79008 614 L79008.0 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58235.3 3616.3 L58230.0 3625.7 L58224.7 3616.3 L58230.0 3607.0 Z"></path>
+						<path d="M78884.8 227.3 L78890.8 236.1 L78880.1 236.9 L78874.1 228.0 Z"></path>
 					</g>
-					<path d="M58670.2 3489.1 L65441.5 3314 L65235.94847605225 2799 L65235.9 2799.0 " fill="none"></path>
+					<path d="M73069.5 1416.4 L73037.25 1459 L73037.25 1697.5 L73037.25 1697.5 L73037.25 1936 L73037.25 1936 L73037.25 2625 L73037.25 2625 L73037.25 3314 L73037.25 3314 L64999 3499.795027110767 L64999.0 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58660.7 3484.0 L58670.2 3489.1 L58661.0 3494.7 L58651.5 3489.6 Z"></path>
+						<path d="M73079.4 1412.2 L73069.5 1416.4 L73070.9 1405.7 L73080.8 1401.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M70284.4 1264.1 L70324.5 1459 L70324.5 1697.5 L70324.5 1697.5 L70324.5 1936 L70324.5 1936 L70324.5 2625 L70324.5 2625 L70324.5 3314 L70324.5 3314 L58651.5 3494.000372069949 L58651.5 3494.0 " fill="none"></path>
+					<path d="M73101.9 1417.5 L73077.25 1459 L81834 1693.9450037967208 L81834.0 1693.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M73111.3 1412.2 L73101.9 1417.5 L73102.1 1406.8 L73111.5 1401.5 Z"></path>
 					</g>
-					<path d="M70289.6 1263.0 L70284.4 1264.1 L70279.1 1265.1 L70281.7 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M80428.6 1747.7 L80532 1936 L80532 2625 L80532 2625 L80532 3314 L80532 3314 L58651.5 3496.975215227334 L58651.5 3497.0 " fill="none"></path>
+					<path d="M73240.8 1420.1 L73244 1459 L73244 1697.5 L73244 1697.5 L73244 1936 L73244 1936 L73244 2625 L73244 2625 L73244 3314 L73244 3314 L59371.25 3499.7435163415116 L59371.3 3499.7 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M73245.4 1410.4 L73240.8 1420.1 L73234.8 1411.2 L73239.3 1401.5 Z"></path>
 					</g>
-					<path d="M80433.2 1745.1 L80428.6 1747.7 L80423.9 1750.3 L80422.1 1736.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M6153.2 1225.5 L8124.5 1459 L8124.5 1697.5 L8124.5 1697.5 L8124.5 1936 L8124.5 1936 L8124.5 2625 L8124.5 2625 L8124.5 3314 L8124.5 3314 L57808.5 3498.9311153466188 L57808.5 3498.9 " fill="none"></path>
+					<path d="M73362.3 1417.0 L73390.75 1459 L73390.75 1697.5 L73390.75 1697.5 L73390.75 1936 L73390.75 1936 L73390.75 2625 L73390.75 2625 L73390.75 3314 L73390.75 3314 L61446.25 3499.683858464616 L61446.3 3499.7 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M73361.5 1406.2 L73362.3 1417.0 L73352.7 1412.2 L73351.9 1401.5 Z"></path>
 					</g>
-					<path d="M6153.9 1220.2 L6153.2 1225.5 L6152.6 1230.8 L6140.0 1223.9 Z"></path>
-					<path d="M34750.5 1785.2 L34750.5 1936 L34750.5 2609.5 L34750.5 2609.5 " fill="none"></path>
+					<path d="M69182.3 905.8 L69279.75 966 L72890.5 1191.6575711478736 L72890.5 1191.7 " fill="none"></path>
+					<path d="M69185.1 901.3 L69182.3 905.8 L69179.5 910.4 L69171.0 898.8 Z"></path>
+					<path d="M33529.8 1710.2 L31842.25 1936 L30770.25435413643 2594 L30770.3 2594.0 " fill="none"></path>
+					<path d="M33530.5 1715.5 L33529.8 1710.2 L33529.1 1705.0 L33543.0 1708.5 Z"></path>
+					<path d="M33720.2 1710.5 L35369.5 1936 L33527 2600.476576812353 L33527.0 2600.5 " fill="none"></path>
+					<path d="M33720.9 1705.2 L33720.2 1710.5 L33719.5 1715.8 L33707.0 1708.7 Z"></path>
+					<path d="M33720.2 1709.1 L35589.5 1936 L33764.958635703915 2594 L33765.0 2594.0 " fill="none"></path>
+					<path d="M33720.9 1703.8 L33720.2 1709.1 L33719.6 1714.4 L33707.0 1707.5 Z"></path>
+					<path d="M18676.3 3923.7 L18676.25 4000 L18387.074626865673 4118.5 L18387.1 4118.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34755.8 1775.8 L34750.5 1785.2 L34745.2 1775.8 L34750.5 1766.5 Z"></path>
+						<path d="M18681.6 3914.3 L18676.3 3923.7 L18670.9 3914.3 L18676.3 3905.0 Z"></path>
 					</g>
-					<path d="M34237.6 1250.6 L34750.5 1459 L34750.5 1628.5 L34750.5 1628.5 " fill="none"></path>
-					<path d="M34239.6 1245.7 L34237.6 1250.6 L34235.6 1255.6 L34225.3 1245.6 Z"></path>
-					<path d="M23387.1 1797.1 L23295.25 1936 L29552.5 2574.632040884346 L29552.5 2574.6 " fill="none"></path>
+					<path d="M29232.9 1214.6 L18676.25 1459 L18676.25 1697.5 L18676.25 1697.5 L18676.25 1936 L18676.25 1936 L18676.25 2625 L18676.25 2625 L18676.25 3314 L18676.25 3314 L18676.25 3500.5 L18676.25 3500.5 L18676.25 3687 L18676.25 3687 L18676.25 3782 L18676.3 3782.0 " fill="none"></path>
+					<path d="M29233.0 1219.9 L29232.9 1214.6 L29232.8 1209.2 L29246.3 1214.3 Z"></path>
+					<path d="M34591.6 2675.9 L33878.5 3314 L36368.5 3496.326266195524 L36368.5 3496.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23396.7 1792.2 L23387.1 1797.1 L23387.8 1786.3 L23397.4 1781.5 Z"></path>
+						<path d="M34602.1 2673.7 L34591.6 2675.9 L34595.0 2665.7 L34605.5 2663.5 Z"></path>
 					</g>
-					<path d="M23549.4 1794.8 L23689.5 1936 L23689.5 2625 L23689.5 2625 L23689.5 3314 L23689.5 3314 L18059.75 3496.353935999305 L18059.8 3496.4 " fill="none"></path>
+					<path d="M34594.1 2676.3 L33918.5 3314 L32385.5 3493.9839471199243 L32385.5 3494.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23546.7 1784.4 L23549.4 1794.8 L23539.1 1791.9 L23536.3 1781.5 Z"></path>
+						<path d="M34604.6 2673.8 L34594.1 2676.3 L34597.3 2666.0 L34607.7 2663.5 Z"></path>
 					</g>
-					<path d="M29885.4 2928.0 L29680.75 3314 L7864.25 3498.8771923845875 L7864.3 3498.9 " fill="none"></path>
+					<path d="M34930.7 2719.7 L34800 3314 L36368.5 3493.9601661027377 L36368.5 3494.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29894.5 2922.2 L29885.4 2928.0 L29885.0 2917.2 L29894.1 2911.5 Z"></path>
+						<path d="M34937.9 2711.8 L34930.7 2719.7 L34927.5 2709.5 L34934.7 2701.5 Z"></path>
 					</g>
-					<path d="M29902.8 2928.4 L29720.75 3314 L54242.75 3500.0712818113393 L54242.8 3500.1 " fill="none"></path>
+					<path d="M34936.1 2719.9 L34840 3314 L32385.5 3496.3761952191235 L32385.5 3496.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29911.6 2922.2 L29902.8 2928.4 L29901.9 2917.7 L29910.8 2911.5 Z"></path>
+						<path d="M34942.9 2711.6 L34936.1 2719.9 L34932.4 2709.9 L34939.1 2701.5 Z"></path>
 					</g>
-					<path d="M30200.1 2928.1 L30396.25 3314 L58691.5 3500.1546022171074 L58691.5 3500.2 " fill="none"></path>
+					<path d="M34967.4 2719.9 L35067.25 3314 L24714 3497.9416156612447 L24714.0 3497.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30200.6 2917.4 L30200.1 2928.1 L30191.1 2922.2 L30191.6 2911.5 Z"></path>
+						<path d="M34971.2 2709.8 L34967.4 2719.9 L34960.6 2711.6 L34964.4 2701.5 Z"></path>
 					</g>
-					<path d="M68267.7 1740.8 L68348.75 1936 L30539.5 2616.1227914444785 L30539.5 2616.1 " fill="none"></path>
-					<path d="M68272.7 1738.8 L68267.7 1740.8 L68262.8 1742.9 L68262.6 1728.5 Z"></path>
-					<path d="M32013.2 2749.9 L31921.5 3314 L30121.5 3491.337559429477 L30121.5 3491.3 " fill="none"></path>
+					<path d="M35229.7 2772.2 L35107.25 3314 L32577.5 3495.0604912213375 L32577.5 3495.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32020.0 2741.6 L32013.2 2749.9 L32009.4 2739.9 L32016.2 2731.5 Z"></path>
+						<path d="M35237.0 2764.3 L35229.7 2772.2 L35226.6 2761.9 L35233.8 2754.0 Z"></path>
 					</g>
-					<path d="M32074.0 2749.2 L32258.25 3314 L39589.25 3499.399891518069 L39589.3 3499.4 " fill="none"></path>
+					<path d="M35238.2 2772.4 L35147.25 3314 L21499.75 3500.0161331579334 L21499.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32076.2 2738.7 L32074.0 2749.2 L32066.1 2742.0 L32068.2 2731.5 Z"></path>
+						<path d="M35245.0 2764.1 L35238.2 2772.4 L35234.5 2762.3 L35241.3 2754.0 Z"></path>
 					</g>
-					<path d="M32482.5 2749.2 L32298.25 3314 L30350.5 3491.870179948586 L30350.5 3491.9 " fill="none"></path>
+					<path d="M32903.0 3618.2 L32903 3687 L32903 3828 L32903.0 3828.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32490.4 2742.0 L32482.5 2749.2 L32480.3 2738.7 L32488.3 2731.5 Z"></path>
+						<path d="M32908.3 3608.8 L32903.0 3618.2 L32897.7 3608.8 L32903.0 3599.5 Z"></path>
 					</g>
-					<path d="M32575.1 2748.7 L32813 3314 L39589.25 3499.3104036071704 L39589.3 3499.3 " fill="none"></path>
+					<path d="M35257.4 2767.3 L35235.75 3314 L33039.5 3489.587021755439 L33039.5 3489.6 " fill="none"></path>
+					<path d="M35262.7 2767.5 L35257.4 2767.3 L35252.0 2767.1 L35257.9 2754.0 Z"></path>
+					<path d="M35281.3 2767.2 L35351.5 3314 L34159.5 3486.6664077669902 L34159.5 3486.7 " fill="none"></path>
+					<path d="M35286.6 2766.5 L35281.3 2767.2 L35276.0 2767.9 L35279.6 2754.0 Z"></path>
+					<path d="M72384.3 2756.0 L72130 3314 L60578.25 3497.3650126603825 L60578.3 3497.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32576.4 2738.0 L32575.1 2748.7 L32566.5 2742.2 L32567.8 2731.5 Z"></path>
+						<path d="M72393.0 2749.7 L72384.3 2756.0 L72383.3 2745.3 L72392.0 2739.0 Z"></path>
 					</g>
-					<path d="M7882.9 3495.4 L9897.583333333332 3447 L10405.916666666666 3447 L10405.916666666666 3447 L10914.25 3500.5 L10914.25 3500.5 L10405.916666666666 3554 L10405.916666666666 3554 L9897.583333333332 3554 L9897.583333333332 3554 L7864.25 3505.104951681774 L7864.3 3505.1 " fill="none"></path>
+					<path d="M72451.3 2757.6 L72482 3314 L72024.70107238606 3485 L72024.7 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7873.5 3490.3 L7882.9 3495.4 L7873.7 3501.0 L7864.3 3495.9 Z"></path>
+						<path d="M72456.1 2748.0 L72451.3 2757.6 L72445.5 2748.6 L72450.3 2739.0 Z"></path>
 					</g>
+					<path d="M73036.1 726.0 L72444 966 L72444 1212.5 L72444 1212.5 L72444 1459 L72444 1459 L72444 1697.5 L72444 1697.5 L72444 1936 L72444 1936 L72444 2511 L72444.0 2511.0 " fill="none"></path>
+					<path d="M73038.1 731.0 L73036.1 726.0 L73034.1 721.1 L73048.5 721.0 Z"></path>
+					<path d="M29232.9 1215.7 L22381 1459 L33543 1695.7606723585911 L33543.0 1695.8 " fill="none"></path>
+					<path d="M29233.1 1221.0 L29232.9 1215.7 L29232.7 1210.3 L29246.3 1215.2 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3699.3 2651.1 L4208 3314 L7481.25 3490.191969117541 L7481.3 3490.2 " fill="none"></path>
+						<path d="M13167.5 1256.8 L13167.5 1459 L33543 1696.5440180862765 L33543.0 1696.5 " fill="none"></path>
 					</g>
-					<path d="M3703.5 2647.8 L3699.3 2651.1 L3695.0 2654.3 L3691.1 2640.5 Z"></path>
-					<path d="M23966.0 1777.7 L23966 1936 L29552.5 2569.0754111842107 L29552.5 2569.1 " fill="none"></path>
+					<path d="M13172.8 1256.8 L13167.5 1256.8 L13162.2 1256.8 L13167.5 1243.5 Z"></path>
+					<path d="M36881.0 2712.7 L36863.5 3314 L36461.90214477212 3485 L36461.9 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23971.3 1768.3 L23966.0 1777.7 L23960.7 1768.3 L23966.0 1759.0 Z"></path>
+						<path d="M36886.6 2703.5 L36881.0 2712.7 L36875.9 2703.2 L36881.5 2694.0 Z"></path>
 					</g>
-					<path d="M23124.5 1231.5 L23966 1459 L23966 1636 L23966.0 1636.0 " fill="none"></path>
-					<path d="M23125.8 1226.3 L23124.5 1231.5 L23123.1 1236.6 L23111.6 1228.0 Z"></path>
-					<path d="M24485.0 1777.7 L24485 1936 L29552.5 2563.8560510699513 L29552.5 2563.9 " fill="none"></path>
+					<path d="M36901.2 2712.3 L37023 3314 L24714 3498.3434112262107 L24714.0 3498.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24490.3 1768.3 L24485.0 1777.7 L24479.7 1768.3 L24485.0 1759.0 Z"></path>
+						<path d="M36904.5 2702.1 L36901.2 2712.3 L36894.1 2704.2 L36897.5 2694.0 Z"></path>
 					</g>
-					<path d="M23143.4 1227.9 L24485 1459 L24485 1636 L24485.0 1636.0 " fill="none"></path>
-					<path d="M23144.3 1222.6 L23143.4 1227.9 L23142.5 1233.1 L23130.3 1225.6 Z"></path>
-					<path d="M63393.5 165.3 L63393.5 293 L63393.5 583 L63393.5 583.0 " fill="none"></path>
-					<path d="M63398.8 165.3 L63393.5 165.3 L63388.2 165.3 L63393.5 152.0 Z"></path>
-					<path d="M33106.7 2711.2 L32853 3314 L54242.75 3500.0086670163782 L54242.8 3500.0 " fill="none"></path>
+					<path d="M73121.7 731.4 L72770.5 966 L72770.5 1212.5 L72770.5 1212.5 L72770.5 1459 L72770.5 1459 L72770.5 1697.5 L72770.5 1697.5 L72770.5 1936 L72770.5 1936 L72770.5 2625 L72770.5 2625 L72770.5 3314 L72770.5 3314 L72770.5 3462 L72770.5 3462.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33115.3 2704.7 L33106.7 2711.2 L33105.4 2700.5 L33114.0 2694.0 Z"></path>
+						<path d="M73132.5 730.6 L73121.7 731.4 L73126.5 721.7 L73137.3 721.0 Z"></path>
 					</g>
-					<path d="M33203.3 2709.2 L33636.5 3314 L30593.5 3494.4800445221817 L30593.5 3494.5 " fill="none"></path>
+					<path d="M73133.0 732.0 L72810.5 966 L72810.5 1212.5 L72810.5 1212.5 L72810.5 1459 L72810.5 1459 L72810.5 1697.5 L72810.5 1697.5 L72810.5 1936 L72810.5 1936 L72810.5 2625 L72810.5 2625 L72810.5 3314 L72810.5 3314 L64120.25 3499.517999713836 L64120.3 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33202.2 2698.5 L33203.3 2709.2 L33193.5 2704.7 L33192.4 2694.0 Z"></path>
+						<path d="M73143.7 730.8 L73133.0 732.0 L73137.5 722.2 L73148.1 721.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M32528.0 1707.4 L34477.5 1936 L34477.5 2563.5 L34477.5 2563.5 " fill="none"></path>
+					<path d="M73144.4 732.6 L72850.5 966 L72850.5 1212.5 L72850.5 1212.5 L72850.5 1459 L72850.5 1459 L72850.5 1697.5 L72850.5 1697.5 L72850.5 1936 L72850.5 1936 L72850.5 2625 L72850.5 2625 L72850.5 3314 L72850.5 3314 L72055.32707774799 3485 L72055.3 3485.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M73155.0 731.0 L73144.4 732.6 L73148.4 722.6 L73159.0 721.0 Z"></path>
 					</g>
-					<path d="M32528.6 1702.1 L32528.0 1707.4 L32527.4 1712.7 L32514.8 1705.9 Z"></path>
-					<path d="M16171.1 3450.6 L16183.25 3447 L16190.75 3447 L16190.75 3447 L16198.25 3500.5 L16198.25 3500.5 L16190.75 3554 L16190.75 3554 L16183.25 3554 L16183.25 3554 L16153.25 3545.1080332409974 L16153.3 3545.1 " fill="none"></path>
+					<path d="M61681.3 1277.2 L61681.25 1459 L61681.25 1666.5 L61681.3 1666.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16160.7 3448.1 L16171.1 3450.6 L16163.7 3458.4 L16153.3 3455.9 Z"></path>
+						<path d="M61686.6 1267.8 L61681.3 1277.2 L61675.9 1267.8 L61681.3 1258.5 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M34656.9 2676.7 L34760 3314 L33749.75 3480.478131212724 L33749.8 3480.5 " fill="none"></path>
 					</g>
+					<path d="M34662.1 2675.8 L34656.9 2676.7 L34651.6 2677.5 L34654.7 2663.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3700.5 2650.8 L4248 3314 L15852.25 3498.1121780556796 L15852.3 3498.1 " fill="none"></path>
+						<path d="M36549.0 2706.8 L36549 3314 L33749.75 3492.7418043310795 L33749.8 3492.7 " fill="none"></path>
 					</g>
-					<path d="M3704.6 2647.4 L3700.5 2650.8 L3696.4 2654.2 L3692.0 2640.5 Z"></path>
-					<path d="M34109.7 2709.2 L33676.5 3314 L16153.25 3498.91186788316 L16153.3 3498.9 " fill="none"></path>
+					<path d="M36554.3 2706.8 L36549.0 2706.8 L36543.7 2706.8 L36549.0 2693.5 Z"></path>
+					<path d="M63112.7 1261.0 L62355 1459 L62355 1644 L62355.0 1644.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34119.5 2704.7 L34109.7 2709.2 L34110.8 2698.5 L34120.6 2694.0 Z"></path>
+						<path d="M63123.1 1263.8 L63112.7 1261.0 L63120.4 1253.5 L63130.8 1256.3 Z"></path>
 					</g>
-					<path d="M34210.2 2710.9 L34492.25 3314 L24503 3497.849715046999 L24503.0 3497.8 " fill="none"></path>
+					<path d="M63113.2 1281.2 L62634 1459 L33707 1696.825829914854 L33707.0 1696.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34211.1 2700.2 L34210.2 2710.9 L34201.4 2704.7 L34202.3 2694.0 Z"></path>
+						<path d="M63123.9 1282.9 L63113.2 1281.2 L63120.1 1272.9 L63130.8 1274.7 Z"></path>
 					</g>
-					<path d="M22552.3 2666.0 L23122.25 3314 L26288 3489.60037921035 L26288.0 3489.6 " fill="none"></path>
-					<path d="M22556.3 2662.5 L22552.3 2666.0 L22548.3 2669.5 L22543.5 2656.0 Z"></path>
-					<path d="M25346.3 2696.2 L24324.75 3314 L27658.5 3495.2533707455723 L27658.5 3495.3 " fill="none"></path>
+					<path d="M63113.6 1292.9 L62732.25 1459 L62732.25 1697.5 L62732.25 1697.5 L62732.25 1936 L62732.25 1936 L62732.25 2625 L62732.25 2625 L62732.25 3314 L62732.25 3314 L21499.75 3500.3395669768342 L21499.8 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25357.1 2695.9 L25346.3 2696.2 L25351.6 2686.8 L25362.3 2686.5 Z"></path>
+						<path d="M63124.3 1294.1 L63113.6 1292.9 L63120.1 1284.3 L63130.8 1285.4 Z"></path>
 					</g>
-					<path d="M25590.3 2695.6 L26696.75 3314 L30633.5 3496.649138628024 L30633.5 3496.6 " fill="none"></path>
+					<path d="M63482.1 1313.7 L63746.25 1459 L63746.25 1697.5 L63746.25 1697.5 L63746.25 1936 L63746.25 1936 L63746.25 2625 L63746.25 2625 L63746.25 3314 L63746.25 3314 L27458.25 3499.4116873510316 L27458.3 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25584.8 2686.4 L25590.3 2695.6 L25579.6 2695.7 L25574.0 2686.5 Z"></path>
+						<path d="M63476.5 1304.5 L63482.1 1313.7 L63471.4 1313.8 L63465.8 1304.7 Z"></path>
 					</g>
-					<path d="M23143.5 1221.6 L25464 1459 L25464 1697.5 L25464 1697.5 L25464 1936 L25464 1936 L25464 2563.5 L25464.0 2563.5 " fill="none"></path>
-					<path d="M23144.1 1216.3 L23143.5 1221.6 L23143.0 1226.9 L23130.3 1220.3 Z"></path>
-					<path d="M24940.5 1754.7 L24940.5 1936 L35315.5 2592.929191747461 L35315.5 2592.9 " fill="none"></path>
+					<path d="M37177.2 2749.8 L37063 3314 L21597.75 3500.150935024283 L21597.8 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24945.8 1745.3 L24940.5 1754.7 L24935.2 1745.3 L24940.5 1736.0 Z"></path>
+						<path d="M37184.3 2741.7 L37177.2 2749.8 L37173.9 2739.6 L37180.9 2731.5 Z"></path>
 					</g>
-					<path d="M35361.3 3309.5 L35358.25 3314 L29121.5 3495.226015658474 L29121.5 3495.2 " fill="none"></path>
+					<path d="M37227.6 2749.8 L37341 3314 L21499.75 3500.0829908514024 L21499.8 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35370.9 3304.7 L35361.3 3309.5 L35362.1 3298.8 L35371.7 3294.0 Z"></path>
+						<path d="M37231.0 2739.6 L37227.6 2749.8 L37220.5 2741.7 L37223.9 2731.5 Z"></path>
 					</g>
-					<path d="M35400.8 3309.9 L35398.25 3314 L54242.75 3499.942503042167 L54242.8 3499.9 " fill="none"></path>
+					<path d="M33720.3 1707.7 L35841.5 1936 L34031 2588.936142371107 L34031.0 2588.9 " fill="none"></path>
+					<path d="M33720.8 1702.4 L33720.3 1707.7 L33719.7 1713.1 L33707.0 1706.3 Z"></path>
+					<path d="M69389.6 2772.3 L69279.75 3314 L32726.5 3500.2223470440003 L32726.5 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35410.2 3304.7 L35400.8 3309.9 L35401.1 3299.2 L35410.6 3294.0 Z"></path>
+						<path d="M69396.7 2764.2 L69389.6 2772.3 L69386.3 2762.1 L69393.3 2754.0 Z"></path>
 					</g>
-					<path d="M35632.1 3312.0 L35631.5 3314 L35631.5 3500.5 L35631.5 3500.5 L35631.5 3687 L35631.5 3687 L35631.5 3843.5 L35631.5 3843.5 L35631.5 4000 L35631.5 4000 L58767 4133.7167935474135 L58767.0 4133.7 " fill="none"></path>
+					<path d="M69398.1 2772.5 L69319.75 3314 L72645 3493.717199159603 L72645.0 3493.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35639.7 3304.4 L35632.1 3312.0 L35629.4 3301.6 L35637.0 3294.0 Z"></path>
+						<path d="M69404.8 2764.0 L69398.1 2772.5 L69394.2 2762.5 L69400.8 2754.0 Z"></path>
 					</g>
-					<path d="M35671.9 3312.2 L35671.5 3314 L38917 3496.617513953839 L38917.0 3496.6 " fill="none"></path>
+					<path d="M69423.8 2772.7 L69439.5 3314 L59371.25 3499.45925825329 L59371.3 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35679.1 3304.3 L35671.9 3312.2 L35668.7 3302.0 L35675.9 3294.0 Z"></path>
+						<path d="M69428.8 2763.2 L69423.8 2772.7 L69418.2 2763.5 L69423.2 2754.0 Z"></path>
 					</g>
-					<path d="M36074.3 3311.5 L36075.25 3314 L58691.5 3500.068072787428 L58691.5 3500.1 " fill="none"></path>
+					<path d="M69445.1 2772.4 L69539.25 3314 L61446.25 3499.297955926585 L61446.3 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36076.1 3300.9 L36074.3 3311.5 L36066.1 3304.6 L36067.9 3294.0 Z"></path>
+						<path d="M69448.8 2762.3 L69445.1 2772.4 L69438.3 2764.1 L69441.9 2754.0 Z"></path>
 					</g>
-					<path d="M68274.5 1740.0 L68388.75 1936 L36328.5 2614.2842085869793 L36328.5 2614.3 " fill="none"></path>
-					<path d="M68279.1 1737.3 L68274.5 1740.0 L68269.9 1742.7 L68267.8 1728.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M80436.4 1746.8 L80572 1936 L36328.5 2617.201597765363 L36328.5 2617.2 " fill="none"></path>
+					<path d="M69183.0 849.7 L69419.5 966 L69419.5 1212.5 L69419.5 1212.5 L69419.5 1459 L69419.5 1459 L69419.5 1697.5 L69419.5 1697.5 L69419.5 1936 L69419.5 1936 L69419.5 2496 L69419.5 2496.0 " fill="none"></path>
+					<path d="M69185.3 844.9 L69183.0 849.7 L69180.6 854.5 L69171.0 843.8 Z"></path>
+					<path d="M33720.3 1706.8 L36069 1936 L34244.458635703915 2594 L34244.5 2594.0 " fill="none"></path>
+					<path d="M33720.8 1701.5 L33720.3 1706.8 L33719.8 1712.1 L33707.0 1705.5 Z"></path>
+					<path d="M72290.8 3900.7 L72290.75 4000 L72971.75 4110.143633071816 L72971.8 4110.1 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M72296.1 3891.3 L72290.8 3900.7 L72285.4 3891.3 L72290.8 3882.0 Z"></path>
 					</g>
-					<path d="M80440.7 1743.7 L80436.4 1746.8 L80432.0 1749.9 L80428.6 1736.0 Z"></path>
-					<path d="M47374.4 1730.7 L43643.75 1936 L43643.75 2625 L43643.75 2625 L43643.75 3314 L43643.75 3314 L29121.5 3498.197883193063 L29121.5 3498.2 " fill="none"></path>
+					<path d="M73371.4 730.6 L73597.5 966 L73597.5 1212.5 L73597.5 1212.5 L73597.5 1459 L73597.5 1459 L73597.5 1697.5 L73597.5 1697.5 L73597.5 1936 L73597.5 1936 L73597.5 2625 L73597.5 2625 L73597.5 3314 L73597.5 3314 L73597.5 3500.5 L73597.5 3500.5 L73597.5 3687 L73597.5 3687 L72431.75 3826.61344939736 L72431.8 3826.6 " fill="none"></path>
+					<path d="M73375.2 726.9 L73371.4 730.6 L73367.5 734.3 L73362.1 721.0 Z"></path>
+					<path d="M64169.0 1319.2 L63859.75 1459 L63859.75 1682 L63859.8 1682.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47384.0 1735.5 L47374.4 1730.7 L47383.4 1724.8 L47393.0 1729.6 Z"></path>
+						<path d="M64179.7 1320.2 L64169.0 1319.2 L64175.3 1310.5 L64186.0 1311.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M34238.6 1214.2 L47977 1459 L47977 1568.5 L47977.0 1568.5 " fill="none"></path>
+					<path d="M64215.4 1320.8 L63973.25 1459 L63973.25 1697.5 L63973.25 1697.5 L63973.25 1936 L63973.25 1936 L63973.25 2625 L63973.25 2625 L63973.25 3314 L63973.25 3314 L25783 3500.287811815477 L25783.0 3500.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M64226.1 1320.8 L64215.4 1320.8 L64220.8 1311.5 L64231.6 1311.5 Z"></path>
 					</g>
-					<path d="M34238.7 1208.9 L34238.6 1214.2 L34238.5 1219.5 L34225.3 1214.0 Z"></path>
-					<path d="M47379.7 1732.1 L43855.75 1936 L43855.75 2541 L43855.8 2541.0 " fill="none"></path>
-					<path d="M47380.0 1737.4 L47379.7 1732.1 L47379.4 1726.7 L47393.0 1731.3 Z"></path>
-					<path d="M47379.7 1735.9 L44263.75 1936 L44263.75 2556 L44263.8 2556.0 " fill="none"></path>
-					<path d="M47380.0 1741.2 L47379.7 1735.9 L47379.4 1730.5 L47393.0 1735.0 Z"></path>
-					<path d="M47379.7 1741.5 L44735.75 1936 L44735.75 2556 L44735.8 2556.0 " fill="none"></path>
-					<path d="M47380.1 1746.8 L47379.7 1741.5 L47379.3 1736.1 L47393.0 1740.5 Z"></path>
-					<path d="M47379.7 1749.7 L45247.75 1936 L45247.75 2548.5 L45247.8 2548.5 " fill="none"></path>
-					<path d="M47380.2 1755.0 L47379.7 1749.7 L47379.3 1744.4 L47393.0 1748.5 Z"></path>
-					<path d="M45695.8 2787.7 L45695.75 3314 L51895.75 3499.631722587895 L51895.8 3499.6 " fill="none"></path>
+					<path d="M64264.5 1323.0 L64091.75 1459 L64091.75 1682 L64091.8 1682.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45701.1 2778.3 L45695.8 2787.7 L45690.4 2778.3 L45695.8 2769.0 Z"></path>
+						<path d="M64275.2 1321.5 L64264.5 1323.0 L64268.6 1313.1 L64279.2 1311.5 Z"></path>
 					</g>
-					<path d="M47379.7 1759.9 L45695.75 1936 L45695.75 2481 L45695.8 2481.0 " fill="none"></path>
-					<path d="M47380.3 1765.2 L47379.7 1759.9 L47379.2 1754.6 L47393.0 1758.6 Z"></path>
-					<path d="M56255.0 2727.7 L56255 3314 L56918.36997319035 3485 L56918.4 3485.0 " fill="none"></path>
+					<path d="M64392.2 1330.1 L64378.25 1459 L64378.25 1682 L64378.3 1682.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56260.3 2718.3 L56255.0 2727.7 L56249.7 2718.3 L56255.0 2709.0 Z"></path>
+						<path d="M64398.6 1321.4 L64392.2 1330.1 L64387.9 1320.2 L64394.3 1311.5 Z"></path>
 					</g>
-					<path d="M48574.3 1714.7 L56255 1936 L56255 2541 L56255.0 2541.0 " fill="none"></path>
-					<path d="M48574.5 1709.4 L48574.3 1714.7 L48574.2 1720.0 L48561.0 1714.3 Z"></path>
-					<path d="M25680.0 1747.2 L25680 1936 L35315.5 2590.5907611910866 L35315.5 2590.6 " fill="none"></path>
+					<path d="M64623.0 1762.0 L64365.75 1936 L44706.5 2619.8345218411987 L44706.5 2619.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25685.3 1737.8 L25680.0 1747.2 L25674.7 1737.8 L25680.0 1728.5 Z"></path>
+						<path d="M64633.7 1761.1 L64623.0 1762.0 L64627.7 1752.3 L64638.4 1751.5 Z"></path>
 					</g>
-					<path d="M26072.0 1785.2 L26072 1936 L35315.5 2589.2073333333333 L35315.5 2589.2 " fill="none"></path>
+					<path d="M64724.3 1770.1 L64738.25 1936 L64738.25 2625 L64738.25 2625 L64738.25 3314 L64738.25 3314 L64738.25 3500.5 L64738.25 3500.5 L64738.25 3687 L64738.25 3687 L64738.25 3843.5 L64738.25 3843.5 L64738.25 4000 L64738.25 4000 L18421.25 4133.792019659833 L18421.3 4133.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26077.3 1775.8 L26072.0 1785.2 L26066.7 1775.8 L26072.0 1766.5 Z"></path>
+						<path d="M64728.9 1760.4 L64724.3 1770.1 L64718.2 1761.2 L64722.8 1751.5 Z"></path>
 					</g>
-					<path d="M23143.5 1219.8 L26072 1459 L26072 1628.5 L26072.0 1628.5 " fill="none"></path>
-					<path d="M23144.0 1214.5 L23143.5 1219.8 L23143.1 1225.1 L23130.3 1218.7 Z"></path>
-					<path d="M26464.0 1762.7 L26464 1936 L35315.5 2587.7080038469758 L35315.5 2587.7 " fill="none"></path>
+					<path d="M64541.3 1319.7 L64718.25 1459 L64718.25 1643.5 L64718.3 1643.5 " fill="none"></path>
+					<path d="M64544.6 1315.6 L64541.3 1319.7 L64538.0 1323.9 L64530.8 1311.5 Z"></path>
+					<path d="M33720.3 1706.0 L36286.5 1936 L34466 2592.5425281339963 L34466.0 2592.5 " fill="none"></path>
+					<path d="M33720.8 1700.7 L33720.3 1706.0 L33719.8 1711.4 L33707.0 1704.8 Z"></path>
+					<path d="M73411.1 728.8 L73738 966 L73738 1181.5 L73738.0 1181.5 " fill="none"></path>
+					<path d="M73414.3 724.5 L73411.1 728.8 L73408.0 733.1 L73400.4 721.0 Z"></path>
+					<path d="M36238.0 2664.9 L35513.25 3314 L34495.5 3476.822539137894 L34495.5 3476.8 " fill="none"></path>
+					<path d="M36241.5 2668.9 L36238.0 2664.9 L36234.4 2660.9 L36247.9 2656.0 Z"></path>
+					<path d="M29513.3 1747.2 L29513.25 1936 L57557 2614.6545638143743 L57557.0 2614.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26469.3 1753.3 L26464.0 1762.7 L26458.7 1753.3 L26464.0 1744.0 Z"></path>
+						<path d="M29518.6 1737.8 L29513.3 1747.2 L29507.9 1737.8 L29513.3 1728.5 Z"></path>
 					</g>
-					<path d="M23143.5 1219.0 L26464 1459 L26464 1651 L26464.0 1651.0 " fill="none"></path>
-					<path d="M23143.9 1213.6 L23143.5 1219.0 L23143.2 1224.3 L23130.3 1218.0 Z"></path>
-					<path d="M29138.9 3422.0 L29151.5 3417 L29159 3417 L29159 3417 L29166.5 3500.5 L29166.5 3500.5 L29159 3584 L29159 3584 L29151.5 3584 L29151.5 3584 L29121.5 3572.1560283687945 L29121.5 3572.2 " fill="none"></path>
+					<path d="M26090.8 1762.7 L26090.75 1936 L44746.5 2620.7240874162662 L44746.5 2620.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29128.2 3420.5 L29138.9 3422.0 L29132.1 3430.4 L29121.5 3428.8 Z"></path>
+						<path d="M26096.1 1753.3 L26090.8 1762.7 L26085.4 1753.3 L26090.8 1744.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3701.8 2650.5 L4288 3314 L28758.5 3499.126896397858 L28758.5 3499.1 " fill="none"></path>
+					<path d="M29233.0 1219.3 L26090.75 1459 L26090.75 1651 L26090.8 1651.0 " fill="none"></path>
+					<path d="M29233.4 1224.6 L29233.0 1219.3 L29232.5 1214.0 L29246.3 1218.3 Z"></path>
+					<path d="M81375.0 1285.2 L81375 1459 L81375 1501 L81375.0 1501.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M81380.3 1275.8 L81375.0 1285.2 L81369.7 1275.8 L81375.0 1266.5 Z"></path>
 					</g>
-					<path d="M3705.8 2647.0 L3701.8 2650.5 L3697.8 2654.0 L3692.9 2640.5 Z"></path>
-					<path d="M26856.0 1762.7 L26856 1936 L35315.5 2586.0775708231095 L35315.5 2586.1 " fill="none"></path>
+					<path d="M82061.9 157.9 L81375 293 L81375 629.5 L81375 629.5 L81375 966 L81375 966 L81375 1158.5 L81375.0 1158.5 " fill="none"></path>
+					<path d="M82062.9 163.2 L82061.9 157.9 L82060.9 152.7 L82075.0 155.4 Z"></path>
+					<path d="M55738.8 1767.2 L55348.25 1936 L55348.25 2541 L55348.3 2541.0 " fill="none"></path>
+					<path d="M55740.9 1772.1 L55738.8 1767.2 L55736.6 1762.3 L55751.0 1761.9 Z"></path>
+					<path d="M68605.6 2831.5 L68430.75 3314 L64999 3498.857065492093 L64999.0 3498.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26861.3 1753.3 L26856.0 1762.7 L26850.7 1753.3 L26856.0 1744.0 Z"></path>
+						<path d="M68613.8 2824.6 L68605.6 2831.5 L68603.8 2821.0 L68612.0 2814.0 Z"></path>
 					</g>
-					<path d="M23143.6 1218.3 L26856 1459 L26856 1651 L26856.0 1651.0 " fill="none"></path>
-					<path d="M23143.9 1213.0 L23143.6 1218.3 L23143.2 1223.6 L23130.3 1217.4 Z"></path>
-					<path d="M27248.0 1762.7 L27248 1936 L35315.5 2584.2980522509915 L35315.5 2584.3 " fill="none"></path>
+					<path d="M68617.5 2831.9 L68470.75 3314 L64120.25 3498.548675082452 L64120.3 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27253.3 1753.3 L27248.0 1762.7 L27242.7 1753.3 L27248.0 1744.0 Z"></path>
+						<path d="M68625.3 2824.5 L68617.5 2831.9 L68615.1 2821.4 L68623.0 2814.0 Z"></path>
 					</g>
-					<path d="M23143.6 1217.7 L27248 1459 L27248 1651 L27248.0 1651.0 " fill="none"></path>
-					<path d="M23143.9 1212.4 L23143.6 1217.7 L23143.2 1223.1 L23130.3 1217.0 Z"></path>
-					<path d="M27640.0 1762.7 L27640 1936 L35315.5 2582.348020043999 L35315.5 2582.3 " fill="none"></path>
+					<path d="M68629.5 2832.1 L68510.75 3314 L68510.75 3500.5 L68510.75 3500.5 L68510.75 3687 L68510.75 3687 L68510.75 3843.5 L68510.75 3843.5 L68510.75 4000 L68510.75 4000 L61787 4133.030526743199 L61787.0 4133.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27645.3 1753.3 L27640.0 1762.7 L27634.7 1753.3 L27640.0 1744.0 Z"></path>
+						<path d="M68636.9 2824.3 L68629.5 2832.1 L68626.5 2821.8 L68633.9 2814.0 Z"></path>
 					</g>
-					<path d="M23143.6 1217.3 L27640 1459 L27640 1651 L27640.0 1651.0 " fill="none"></path>
-					<path d="M23143.9 1212.0 L23143.6 1217.3 L23143.3 1222.6 L23130.3 1216.6 Z"></path>
-					<path d="M38788.8 1838.1 L38665.5 1936 L38665.5 2625 L38665.5 2625 L38665.5 3314 L38665.5 3314 L38665.5 3500.5 L38665.5 3500.5 L38665.5 3687 L38665.5 3687 L38665.5 3843.5 L38665.5 3843.5 L38665.5 4000 L38665.5 4000 L58767 4133.674152006154 L58767.0 4133.7 " fill="none"></path>
+					<path d="M68692.6 2832.6 L68720.5 3314 L68720.5 3500.5 L68720.5 3500.5 L68720.5 3687 L68720.5 3687 L65998.75 3835.817844353219 L65998.8 3835.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38799.5 1836.5 L38788.8 1838.1 L38792.8 1828.1 L38803.5 1826.5 Z"></path>
+						<path d="M68697.3 2823.0 L68692.6 2832.6 L68686.7 2823.6 L68691.5 2814.0 Z"></path>
 					</g>
-					<path d="M39165.5 1837.2 L39306.5 1936 L39306.5 2625 L39306.5 2625 L39306.5 3314 L39306.5 3314 L39306.5 3500.5 L39306.5 3500.5 L39306.5 3687 L39306.5 3687 L57108.25 3842.2744987390097 L57108.3 3842.3 " fill="none"></path>
+					<path d="M68743.5 2831.9 L68890.25 3314 L61446.25 3499.193890482225 L61446.3 3499.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39160.9 1827.5 L39165.5 1837.2 L39154.8 1836.2 L39150.2 1826.5 Z"></path>
+						<path d="M68745.9 2821.4 L68743.5 2831.9 L68735.7 2824.5 L68738.0 2814.0 Z"></path>
 					</g>
+					<path d="M69184.3 673.6 L72164 966 L72164 1212.5 L72164 1212.5 L72164 1459 L72164 1459 L72164 1697.5 L72164 1697.5 L72164 1936 L72164 1936 L69100 2542.02727142242 L69100.0 2542.0 " fill="none"></path>
+					<path d="M69184.8 668.3 L69184.3 673.6 L69183.7 678.9 L69171.0 672.3 Z"></path>
+					<path d="M80982.7 1733.9 L78805.5 1936 L69100 2596.4532839506173 L69100.0 2596.5 " fill="none"></path>
+					<path d="M80983.2 1739.2 L80982.7 1733.9 L80982.2 1728.6 L80996.0 1732.7 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M70292.5 1263.5 L70364.5 1459 L39282 1695.0996942529102 L39282.0 1695.1 " fill="none"></path>
+						<path d="M67464.2 1224.2 L65019.25 1459 L65019.25 1697.5 L65019.25 1697.5 L65019.25 1936 L65019.25 1936 L68261 2546.055513827245 L68261.0 2546.1 " fill="none"></path>
 					</g>
-					<path d="M70297.5 1261.7 L70292.5 1263.5 L70287.5 1265.4 L70287.9 1251.0 Z"></path>
+					<path d="M67464.7 1229.5 L67464.2 1224.2 L67463.7 1218.9 L67477.5 1222.9 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M6153.3 1224.6 L8287.75 1459 L38650 1695.0433409663199 L38650.0 1695.0 " fill="none"></path>
+						<path d="M83142.4 1261.4 L82982 1459 L82982 1697.5 L82982 1697.5 L82982 1936 L82982 1936 L69100 2604.789847218823 L69100.0 2604.8 " fill="none"></path>
 					</g>
-					<path d="M6153.8 1219.3 L6153.3 1224.6 L6152.7 1229.9 L6140.0 1223.1 Z"></path>
+					<path d="M83146.5 1264.7 L83142.4 1261.4 L83138.2 1258.0 L83150.8 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M34238.6 1213.5 L57041 1459 L57041 1697.5 L57041 1697.5 L57041 1936 L57041 1936 L57041 2625 L57041 2625 L57041 3314 L57041 3314 L53634.75 3490.941891233201 L53634.8 3490.9 " fill="none"></path>
+						<path d="M42572.6 1228.3 L40966.25 1459 L40966.25 1697.5 L40966.25 1697.5 L40966.25 1936 L40966.25 1936 L68261 2614.570870581019 L68261.0 2614.6 " fill="none"></path>
 					</g>
-					<path d="M34238.6 1208.2 L34238.6 1213.5 L34238.5 1218.9 L34225.3 1213.4 Z"></path>
-					<path d="M83790.8 1285.2 L83790.75 1459 L83790.75 1546 L83790.8 1546.0 " fill="none"></path>
+					<path d="M42573.3 1233.5 L42572.6 1228.3 L42571.8 1223.0 L42585.8 1226.4 Z"></path>
+					<path d="M60972.7 2777.5 L60650.75 3314 L59371.25 3492.612836826347 L59371.3 3492.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M83796.1 1275.8 L83790.8 1285.2 L83785.4 1275.8 L83790.8 1266.5 Z"></path>
+						<path d="M60982.1 2772.2 L60972.7 2777.5 L60973.0 2766.8 L60982.3 2761.5 Z"></path>
 					</g>
-					<path d="M83800.1 180.8 L83790.75 293 L83790.75 629.5 L83790.75 629.5 L83790.75 966 L83790.75 966 L83790.75 1158.5 L83790.8 1158.5 " fill="none"></path>
-					<path d="M83805.4 181.2 L83800.1 180.8 L83794.8 180.3 L83801.2 167.5 Z"></path>
-					<path d="M58581.4 1796.9 L58676 1936 L58676 2609.5 L58676.0 2609.5 " fill="none"></path>
+					<path d="M61117.2 2779.2 L61301 3314 L61386.04155495978 3485 L61386.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58580.6 1786.2 L58581.4 1796.9 L58571.7 1792.2 L58570.9 1781.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M34238.6 1213.5 L58513.75 1459 L58513.75 1613.5 L58513.8 1613.5 " fill="none"></path>
+						<path d="M61119.2 2768.6 L61117.2 2779.2 L61109.1 2772.1 L61111.2 2761.5 Z"></path>
 					</g>
-					<path d="M34238.6 1208.1 L34238.6 1213.5 L34238.5 1218.8 L34225.3 1213.3 Z"></path>
-					<path d="M83805.0 1867.6 L83810.75 1936 L83810.75 2625 L83810.75 2625 L83810.75 3314 L83810.75 3314 L54355.75 3500.1429442759604 L54355.8 3500.1 " fill="none"></path>
+					<path d="M58962.5 1727.1 L57470.25 1936 L60716.25 2558.285475792988 L60716.3 2558.3 " fill="none"></path>
+					<path d="M58963.3 1732.4 L58962.5 1727.1 L58961.8 1721.8 L58975.8 1725.2 Z"></path>
+					<path d="M82417.2 1821.2 L82176.5 1936 L61412.25 2613.642991628083 L61412.3 2613.6 " fill="none"></path>
+					<path d="M82419.5 1826.1 L82417.2 1821.2 L82414.9 1816.4 L82429.3 1815.5 Z"></path>
+					<path d="M80978.1 1813.6 L80559.75 1936 L80559.75 2625 L80559.75 2625 L80559.75 3314 L80559.75 3314 L80559.75 3500.5 L80559.75 3500.5 L80559.75 3687 L80559.75 3687 L66685.5 3842.6808779508506 L66685.5 3842.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M83809.5 1857.9 L83805.0 1867.6 L83798.9 1858.7 L83803.5 1849.0 Z"></path>
+						<path d="M80988.5 1816.1 L80978.1 1813.6 L80985.5 1805.9 L80996.0 1808.4 Z"></path>
 					</g>
-					<path d="M83833.4 1867.1 L83850.75 1936 L83850.75 2625 L83850.75 2625 L83850.75 3314 L83850.75 3314 L59320 3499.856001746849 L59320.0 3499.9 " fill="none"></path>
+					<path d="M81450.0 1911.6 L81458.5 1936 L81458.5 2625 L81458.5 2625 L81458.5 3314 L81458.5 3314 L59371.25 3500.0241433813153 L59371.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M83836.3 1856.8 L83833.4 1867.1 L83826.0 1859.4 L83828.9 1849.0 Z"></path>
+						<path d="M81451.9 1901.0 L81450.0 1911.6 L81441.8 1904.6 L81443.8 1894.0 Z"></path>
 					</g>
-					<path d="M72359.5 1862.4 L72196.5 1936 L72196.5 2625 L72196.5 2625 L72196.5 3314 L72196.5 3314 L64748 3499.73943709052 L64748.0 3499.7 " fill="none"></path>
+					<path d="M50903.7 1216.4 L44949 1459 L44949 1598.5 L44949.0 1598.5 " fill="none"></path>
+					<path d="M50903.9 1221.7 L50903.7 1216.4 L50903.5 1211.0 L50917.0 1215.8 Z"></path>
+					<path d="M46040.3 3618.2 L46040.25 3687 L66539.5 3842.944664535965 L66539.5 3842.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72370.2 1863.4 L72359.5 1862.4 L72365.8 1853.7 L72376.5 1854.7 Z"></path>
+						<path d="M46045.6 3608.8 L46040.3 3618.2 L46034.9 3608.8 L46040.3 3599.5 Z"></path>
 					</g>
-					<path d="M72359.7 1875.8 L72236.5 1936 L72236.5 2625 L72236.5 2625 L72236.5 3314 L72236.5 3314 L69940.25 3490.8351914937543 L69940.3 3490.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72370.5 1876.5 L72359.7 1875.8 L72365.8 1866.9 L72376.5 1867.6 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M49361.2 1702.9 L45728 1936 L45728 2625 L45728 2625 L45728 3314 L45728 3314 L45892.25 3412.1028823058446 L45892.3 3412.1 " fill="none"></path>
 					</g>
-					<path d="M72367.1 1887.8 L72276.5 1936 L72276.5 2625 L72276.5 2625 L72276.5 3314 L72276.5 3314 L72276.5 3500.5 L72276.5 3500.5 L72276.5 3687 L72276.5 3687 L72276.5 3843.5 L72276.5 3843.5 L72276.5 4000 L72276.5 4000 L61143.75 4132.247822521664 L61143.8 4132.2 " fill="none"></path>
+					<path d="M49361.5 1708.3 L49361.2 1702.9 L49360.9 1697.6 L49374.5 1702.1 Z"></path>
+					<path d="M41252.8 1747.2 L41252.75 1936 L60716.25 2612.897332357469 L60716.3 2612.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72377.8 1888.1 L72367.1 1887.8 L72372.8 1878.7 L72383.6 1879.0 Z"></path>
+						<path d="M41258.1 1737.8 L41252.8 1747.2 L41247.4 1737.8 L41252.8 1728.5 Z"></path>
 					</g>
-					<path d="M72397.9 1888.4 L72316.5 1936 L72316.5 2625 L72316.5 2625 L72316.5 3314 L72316.5 3314 L59452 3499.835502110685 L59452.0 3499.8 " fill="none"></path>
+					<path d="M47693.0 2712.7 L47693 3314 L46188.25 3483.7993495689 L46188.3 3483.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72408.6 1888.3 L72397.9 1888.4 L72403.3 1879.1 L72414.0 1879.0 Z"></path>
+						<path d="M47698.3 2703.3 L47693.0 2712.7 L47687.7 2703.3 L47693.0 2694.0 Z"></path>
 					</g>
-					<path d="M72707.7 1897.6 L72704.5 1936 L72704.5 2383.5 L72704.5 2383.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72713.8 1888.7 L72707.7 1897.6 L72703.2 1887.9 L72709.3 1879.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M49361.3 1709.0 L47693 1936 L47693 2556 L47693.0 2556.0 " fill="none"></path>
 					</g>
-					<path d="M72819.3 1895.8 L72838.5 1936 L60014.5 2601.592165725047 L60014.5 2601.6 " fill="none"></path>
+					<path d="M49362.0 1714.3 L49361.3 1709.0 L49360.6 1703.7 L49374.5 1707.2 Z"></path>
+					<path d="M57860.9 2875.7 L57645 3314 L64938 3499.7232880453334 L64938.0 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72820.1 1885.1 L72819.3 1895.8 L72810.5 1889.7 L72811.3 1879.0 Z"></path>
+						<path d="M57869.9 2869.7 L57860.9 2875.7 L57860.3 2865.0 L57869.2 2859.0 Z"></path>
 					</g>
-					<path d="M72851.8 1894.7 L72878.5 1936 L69125.5 2537.492672714585 L69125.5 2537.5 " fill="none"></path>
+					<path d="M57875.3 2876.1 L57685 3314 L59258.25 3494.0344377972083 L59258.3 3494.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72851.2 1883.9 L72851.8 1894.7 L72842.3 1889.7 L72841.7 1879.0 Z"></path>
+						<path d="M57884.0 2869.7 L57875.3 2876.1 L57874.2 2865.4 L57882.8 2859.0 Z"></path>
 					</g>
-					<path d="M72883.9 1893.5 L72918.5 1936 L65596.5 2586.781475748194 L65596.5 2586.8 " fill="none"></path>
+					<path d="M57889.8 2876.5 L57725 3314 L57725 3500.5 L57725 3500.5 L57725 3687 L57725 3687 L57725 3843.5 L57725 3843.5 L57725 4000 L57725 4000 L61689 4132.363817592824 L61689.0 4132.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72882.2 1882.9 L72883.9 1893.5 L72873.9 1889.6 L72872.1 1879.0 Z"></path>
+						<path d="M57898.1 2869.6 L57889.8 2876.5 L57888.1 2865.9 L57896.4 2859.0 Z"></path>
 					</g>
-					<path d="M72915.6 1892.3 L72958.5 1936 L70044.5 2538.2936853157344 L70044.5 2538.3 " fill="none"></path>
+					<path d="M57904.3 2876.8 L57765 3314 L57765 3500.5 L57765 3500.5 L57765 3687 L57765 3687 L65717.75 3840.78313718222 L65717.8 3840.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72912.9 1881.9 L72915.6 1892.3 L72905.3 1889.4 L72902.6 1879.0 Z"></path>
+						<path d="M57912.2 2869.5 L57904.3 2876.8 L57902.0 2866.3 L57910.0 2859.0 Z"></path>
 					</g>
-					<path d="M73020.2 1889.2 L73092.5 1936 L73092.5 2625 L73092.5 2625 L73092.5 3314 L73092.5 3314 L58796.5 3499.817611597031 L58796.5 3499.8 " fill="none"></path>
+					<path d="M58411.1 2868.2 L59192.75 3314 L61341.25 3496.051453884598 L61341.3 3496.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73015.3 1879.6 L73020.2 1889.2 L73009.5 1888.6 L73004.6 1879.0 Z"></path>
+						<path d="M58405.6 2859.0 L58411.1 2868.2 L58400.3 2868.3 L58394.8 2859.0 Z"></path>
 					</g>
-					<path d="M72233.1 719.9 L73455.25 966 L73455.25 1212.5 L73455.25 1212.5 L73455.25 1459 L73455.25 1459 L73072.5 1583.920800547383 L73072.5 1583.9 " fill="none"></path>
-					<path d="M72234.1 714.7 L72233.1 719.9 L72232.0 725.1 L72220.0 717.3 Z"></path>
+					<path d="M59006.1 1731.1 L57984.5 1936 L57984.5 2391 L57984.5 2391.0 " fill="none"></path>
+					<path d="M59007.1 1736.4 L59006.1 1731.1 L59005.1 1725.9 L59019.2 1728.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M70300.4 1262.8 L70404.5 1459 L72376.5 1661.725 L72376.5 1661.7 " fill="none"></path>
+						<path d="M67464.2 1224.4 L65059.25 1459 L65059.25 1697.5 L65059.25 1697.5 L65059.25 1936 L65059.25 1936 L58412 2583.3663733700837 L58412.0 2583.4 " fill="none"></path>
 					</g>
-					<path d="M70305.1 1260.3 L70300.4 1262.8 L70295.7 1265.3 L70294.2 1251.0 Z"></path>
-					<path d="M21583.7 1719.5 L22516.25 1936 L22516.25 2594 L22516.3 2594.0 " fill="none"></path>
-					<path d="M21584.9 1714.4 L21583.7 1719.5 L21582.5 1724.7 L21570.8 1716.5 Z"></path>
-					<path d="M21583.9 1715.5 L22752.25 1936 L22752.25 2586.5 L22752.3 2586.5 " fill="none"></path>
-					<path d="M21584.8 1710.2 L21583.9 1715.5 L21582.9 1720.7 L21570.8 1713.0 Z"></path>
-					<path d="M58716.7 676.0 L60499.25 966 L60499.25 1181.5 L60499.3 1181.5 " fill="none"></path>
-					<path d="M58717.5 670.8 L58716.7 676.0 L58715.8 681.3 L58703.5 673.9 Z"></path>
-					<path d="M21583.9 1712.8 L22970.25 1936 L22970.25 2594 L22970.3 2594.0 " fill="none"></path>
-					<path d="M21584.8 1707.6 L21583.9 1712.8 L21583.1 1718.1 L21570.8 1710.7 Z"></path>
-					<path d="M37946.5 2739.7 L37618.5 3314 L64687 3500.290093730396 L64687.0 3500.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37955.7 2734.2 L37946.5 2739.7 L37946.5 2729.0 L37955.7 2723.5 Z"></path>
+					<path d="M67464.7 1229.7 L67464.2 1224.4 L67463.7 1219.1 L67477.5 1223.1 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M83149.8 1262.2 L83022 1459 L83022 1697.5 L83022 1697.5 L83022 1936 L83022 1936 L58412 2613.235746380429 L58412.0 2613.2 " fill="none"></path>
+					</g>
+					<path d="M83154.2 1265.1 L83149.8 1262.2 L83145.3 1259.3 L83157.0 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M42572.6 1228.6 L41006.25 1459 L41006.25 1697.5 L41006.25 1697.5 L41006.25 1936 L41006.25 1936 L57557 2607.65148057073 L57557.0 2607.7 " fill="none"></path>
 					</g>
-					<path d="M37952.9 2740.1 L37658.5 3314 L37658.5 3485 L37658.5 3485.0 " fill="none"></path>
+					<path d="M42573.3 1233.9 L42572.6 1228.6 L42571.8 1223.4 L42585.8 1226.7 Z"></path>
+					<path d="M36249.1 2666.4 L35725.5 3314 L34928.5 3463.612984398591 L34928.5 3463.6 " fill="none"></path>
+					<path d="M36253.2 2669.7 L36249.1 2666.4 L36244.9 2663.0 L36257.4 2656.0 Z"></path>
+					<path d="M45337.0 1785.2 L45337 1936 L45337 2609.5 L45337.0 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37961.9 2734.2 L37952.9 2740.1 L37952.5 2729.4 L37961.5 2723.5 Z"></path>
+						<path d="M45342.3 1775.8 L45337.0 1785.2 L45331.7 1775.8 L45337.0 1766.5 Z"></path>
 					</g>
-					<path d="M38071.1 2740.1 L38365.5 3314 L38365.5 3485 L38365.5 3485.0 " fill="none"></path>
+					<path d="M50903.7 1216.6 L45337 1459 L45337 1628.5 L45337.0 1628.5 " fill="none"></path>
+					<path d="M50903.9 1222.0 L50903.7 1216.6 L50903.4 1211.3 L50917.0 1216.0 Z"></path>
+					<path d="M46100.1 2712.1 L45945.25 3314 L59258.25 3499.7118441228167 L59258.3 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38071.5 2729.4 L38071.1 2740.1 L38062.1 2734.2 L38062.5 2723.5 Z"></path>
+						<path d="M46107.6 2704.4 L46100.1 2712.1 L46097.3 2701.7 L46104.7 2694.0 Z"></path>
 					</g>
-					<path d="M67592.3 2831.0 L67371.25 3314 L69689.25 3490.9212195621035 L69689.3 3490.9 " fill="none"></path>
+					<path d="M46158.7 2711.2 L46411.75 3314 L45241.5 3485.615195596619 L45241.5 3485.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67601.0 2824.7 L67592.3 2831.0 L67591.3 2820.3 L67600.0 2814.0 Z"></path>
+						<path d="M46160.0 2700.5 L46158.7 2711.2 L46150.2 2704.7 L46151.5 2694.0 Z"></path>
 					</g>
-					<path d="M67606.6 2831.4 L67419.75 3314 L67419.75 3500.5 L67419.75 3500.5 L67419.75 3687 L67419.75 3687 L67419.75 3843.5 L67419.75 3843.5 L67419.75 4000 L67419.75 4000 L61143.75 4130.923017046782 L61143.8 4130.9 " fill="none"></path>
+					<path d="M46689.1 2748.7 L46451.75 3314 L45464.03016085791 3485 L45464.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67614.9 2824.6 L67606.6 2831.4 L67605.0 2820.8 L67613.3 2814.0 Z"></path>
+						<path d="M46697.6 2742.2 L46689.1 2748.7 L46687.8 2738.0 L46696.3 2731.5 Z"></path>
 					</g>
-					<path d="M67665.0 2832.6 L67615.25 3314 L67615.25 3439 L67615.3 3439.0 " fill="none"></path>
+					<path d="M46781.5 2749.2 L46965.75 3314 L25783 3500.1177963606383 L25783.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67671.3 2823.8 L67665.0 2832.6 L67660.7 2822.7 L67667.0 2814.0 Z"></path>
+						<path d="M46783.7 2738.7 L46781.5 2749.2 L46773.6 2742.0 L46775.7 2731.5 Z"></path>
 					</g>
-					<path d="M67789.9 2830.7 L68033 3314 L59452 3499.5055639272055 L59452.0 3499.5 " fill="none"></path>
+					<path d="M47190.0 2749.2 L47005.75 3314 L47005.75 3485 L47005.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67790.5 2819.9 L67789.9 2830.7 L67781.0 2824.7 L67781.5 2814.0 Z"></path>
+						<path d="M47197.9 2742.0 L47190.0 2749.2 L47187.8 2738.7 L47195.8 2731.5 Z"></path>
 					</g>
-					<path d="M67801.7 2830.3 L68073 3314 L59320 3498.7063249603984 L59320.0 3498.7 " fill="none"></path>
+					<path d="M47268.6 2749.3 L47441.75 3314 L25783 3500.126179313205 L25783.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67801.7 2819.5 L67801.7 2830.3 L67792.4 2824.7 L67792.5 2814.0 Z"></path>
+						<path d="M47271.0 2738.9 L47268.6 2749.3 L47260.8 2742.0 L47263.2 2731.5 Z"></path>
 					</g>
-					<path d="M67813.3 2829.9 L68113 3314 L57768.5 3498.202916885473 L57768.5 3498.2 " fill="none"></path>
+					<path d="M14099.6 3449.9 L14111.5 3447 L14119 3447 L14119 3447 L14126.5 3500.5 L14126.5 3500.5 L14119 3554 L14119 3554 L14111.5 3554 L14111.5 3554 L14081.5 3546.7539503386006 L14081.5 3546.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67812.9 2819.1 L67813.3 2829.9 L67803.9 2824.7 L67803.5 2814.0 Z"></path>
+						<path d="M14089.3 3446.9 L14099.6 3449.9 L14091.8 3457.2 L14081.5 3454.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M82554.9 178.8 L82625.25 293 L82625.25 629.5 L82625.25 629.5 L82625.25 966 L82625.25 966 L82625.25 1212.5 L82625.25 1212.5 L82625.25 1459 L82625.25 1459 L82625.25 1697.5 L82625.25 1697.5 L82625.25 1936 L82625.25 1936 L67993.5 2610.8406493180487 L67993.5 2610.8 " fill="none"></path>
+						<path d="M3118.7 2652.5 L3441.5 3314 L13698.5 3497.0818299277407 L13698.5 3497.1 " fill="none"></path>
 					</g>
-					<path d="M82559.4 176.0 L82554.9 178.8 L82550.3 181.6 L82547.9 167.5 Z"></path>
-					<path d="M28192.4 1778.8 L27694 1936 L27694 2609.5 L27694.0 2609.5 " fill="none"></path>
+					<path d="M3123.5 2650.1 L3118.7 2652.5 L3113.9 2654.8 L3112.8 2640.5 Z"></path>
+					<path d="M26535.3 1777.7 L26535.25 1936 L38452.5 2597.6026630139195 L38452.5 2597.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28203.0 1781.1 L28192.4 1778.8 L28199.7 1770.9 L28210.3 1773.2 Z"></path>
+						<path d="M26540.6 1768.3 L26535.3 1777.7 L26529.9 1768.3 L26535.3 1759.0 Z"></path>
 					</g>
-					<path d="M28360.0 1857.8 L28316 1936 L28316 2609.5 L28316.0 2609.5 " fill="none"></path>
+					<path d="M29233.0 1220.4 L26535.25 1459 L26535.25 1636 L26535.3 1636.0 " fill="none"></path>
+					<path d="M29233.4 1225.7 L29233.0 1220.4 L29232.5 1215.1 L29246.3 1219.2 Z"></path>
+					<path d="M79326.3 165.3 L79326.25 293 L79326.25 583 L79326.3 583.0 " fill="none"></path>
+					<path d="M79331.6 165.3 L79326.3 165.3 L79320.9 165.3 L79326.3 152.0 Z"></path>
+					<path d="M27054.3 1777.7 L27054.25 1936 L38452.5 2596.4069417873734 L38452.5 2596.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28369.3 1852.2 L28360.0 1857.8 L28360.0 1847.0 L28369.2 1841.5 Z"></path>
+						<path d="M27059.6 1768.3 L27054.3 1777.7 L27048.9 1768.3 L27054.3 1759.0 Z"></path>
 					</g>
-					<path d="M28514.0 1858.9 L28544.5 1936 L28544.5 2625 L28544.5 2625 L28544.5 3314 L28544.5 3314 L39892.25 3499.9183778797797 L39892.3 3499.9 " fill="none"></path>
+					<path d="M29233.0 1222.2 L27054.25 1459 L27054.25 1636 L27054.3 1636.0 " fill="none"></path>
+					<path d="M29233.6 1227.5 L29233.0 1222.2 L29232.4 1216.9 L29246.3 1220.8 Z"></path>
+					<path d="M38471.5 2921.4 L37843 3314 L14081.5 3499.008965474053 L14081.5 3499.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28515.5 1848.2 L28514.0 1858.9 L28505.6 1852.1 L28507.2 1841.5 Z"></path>
+						<path d="M38482.3 2921.0 L38471.5 2921.4 L38476.6 2911.9 L38487.4 2911.5 Z"></path>
 					</g>
-					<path d="M28600.7 1855.0 L28678 1936 L67379.5 2619.577515156953 L67379.5 2619.6 " fill="none"></path>
+					<path d="M38778.8 2927.8 L38565.5 3314 L59258.25 3499.9921623673144 L59258.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28598.1 1844.6 L28600.7 1855.0 L28590.3 1851.9 L28587.8 1841.5 Z"></path>
+						<path d="M38787.9 2922.2 L38778.8 2927.8 L38778.6 2917.1 L38787.8 2911.5 Z"></path>
 					</g>
-					<path d="M2021.7 3401.2 L2035 3394.5 L2042.5 3394.5 L2042.5 3394.5 L2050 3500.5 L2050 3500.5 L2042.5 3606.5 L2042.5 3606.5 L2035 3606.5 L2035 3606.5 L2005 3591.393111638955 L2005.0 3591.4 " fill="none"></path>
+					<path d="M39457.7 2745.5 L41872.75 3314 L61341.25 3499.998424773321 L61341.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2010.9 3400.6 L2021.7 3401.2 L2015.7 3410.2 L2005.0 3409.6 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3703.0 2650.2 L4328 3314 L2005 3487.053525064909 L2005.0 3487.1 " fill="none"></path>
+						<path d="M39449.8 2738.1 L39457.7 2745.5 L39447.4 2748.5 L39439.5 2741.2 Z"></path>
 					</g>
-					<path d="M3706.9 2646.6 L3703.0 2650.2 L3699.1 2653.9 L3693.8 2640.5 Z"></path>
-					<path d="M38794.5 2674.7 L38794.5 3314 L19226.75 3499.1000025360436 L19226.8 3499.1 " fill="none"></path>
+					<path d="M59162.7 1741.4 L59113.75 1936 L39439.5 2608.140335436526 L39439.5 2608.1 " fill="none"></path>
+					<path d="M59167.9 1742.7 L59162.7 1741.4 L59157.5 1740.1 L59166.0 1728.5 Z"></path>
+					<path d="M41934.9 1793.9 L41776 1936 L39439.5 2504.8510600706713 L39439.5 2504.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38799.8 2665.3 L38794.5 2674.7 L38789.2 2665.3 L38794.5 2656.0 Z"></path>
+						<path d="M41945.4 1791.7 L41934.9 1793.9 L41938.3 1783.7 L41948.8 1781.5 Z"></path>
 					</g>
-					<path d="M39095.0 2697.7 L39095 3314 L39892.25 3492.549534674272 L39892.3 3492.5 " fill="none"></path>
+					<path d="M42092.1 1798.3 L42159.5 1936 L42159.5 2625 L42159.5 2625 L42159.5 3314 L42159.5 3314 L48614 3496.873414356248 L48614.0 3496.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39100.3 2688.3 L39095.0 2697.7 L39089.7 2688.3 L39095.0 2679.0 Z"></path>
+						<path d="M42092.8 1787.5 L42092.1 1798.3 L42083.2 1792.2 L42083.9 1781.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3705.5 2649.6 L4412.75 3314 L18930.75 3498.6179599072684 L18930.8 3498.6 " fill="none"></path>
+					<path d="M65137.4 2816.5 L64953.25 3314 L64967.23257372654 3485 L64967.2 3485.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M65145.6 2809.6 L65137.4 2816.5 L65135.6 2805.9 L65143.9 2799.0 Z"></path>
 					</g>
-					<path d="M3709.1 2645.7 L3705.5 2649.6 L3701.8 2653.5 L3695.8 2640.5 Z"></path>
-					<path d="M47147.0 3923.2 L47147 4000 L30022.5 4133.43895560143 L30022.5 4133.4 " fill="none"></path>
+					<path d="M65148.4 2816.8 L64993.25 3314 L64120.25 3491.164853101197 L64120.3 3491.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47152.3 3913.8 L47147.0 3923.2 L47141.7 3913.8 L47147.0 3904.5 Z"></path>
+						<path d="M65156.3 2809.5 L65148.4 2816.8 L65146.1 2806.3 L65154.0 2799.0 Z"></path>
 					</g>
-					<path d="M23143.6 1217.0 L27953 1459 L27953 1666.5 L27953.0 1666.5 " fill="none"></path>
-					<path d="M23143.8 1211.7 L23143.6 1217.0 L23143.3 1222.3 L23130.3 1216.3 Z"></path>
-					<path d="M72618.8 222.3 L72371 293 L72371 614 L72371.0 614.0 " fill="none"></path>
+					<path d="M65536.2 2441.9 L66442.25 1936 L66325.60849056604 1804 L66325.6 1804.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72629.2 224.9 L72618.8 222.3 L72626.3 214.6 L72636.8 217.2 Z"></path>
+						<path d="M65525.4 2441.8 L65536.2 2441.9 L65530.6 2451.1 L65519.9 2451.0 Z"></path>
 					</g>
-					<path d="M72795.6 240.0 L72732 293 L72732 614 L72732.0 614.0 " fill="none"></path>
+					<path d="M65162.4 2817.2 L65043.75 3314 L65043.75 3500.5 L65043.75 3500.5 L65043.75 3687 L65043.75 3687 L65043.75 3843.5 L65043.75 3843.5 L65043.75 4000 L65043.75 4000 L61787 4132.0137638962415 L61787.0 4132.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72806.2 238.1 L72795.6 240.0 L72799.4 229.9 L72810.0 228.0 Z"></path>
+						<path d="M65169.7 2809.3 L65162.4 2817.2 L65159.4 2806.8 L65166.7 2799.0 Z"></path>
 					</g>
-					<path d="M73070.0 238.5 L73150.25 293 L73150.25 614 L73150.3 614.0 " fill="none"></path>
+					<path d="M65222.4 2817.6 L65258.75 3314 L65258.75 3500.5 L65258.75 3500.5 L65258.75 3687 L65258.75 3687 L65717.75 3806.8223519599665 L65717.8 3806.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73065.2 228.8 L73070.0 238.5 L73059.2 237.7 L73054.5 228.0 Z"></path>
+						<path d="M65227.0 2807.9 L65222.4 2817.6 L65216.4 2808.7 L65221.0 2799.0 Z"></path>
 					</g>
-					<path d="M73220.6 230.7 L73419.75 293 L73419.75 614 L73419.8 614.0 " fill="none"></path>
+					<path d="M65268.1 2816.8 L65423.25 3314 L61446.25 3498.0701079538403 L61446.3 3498.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73213.3 222.8 L73220.6 230.7 L73210.1 233.0 L73202.8 225.1 Z"></path>
+						<path d="M65270.4 2806.3 L65268.1 2816.8 L65260.2 2809.5 L65262.5 2799.0 Z"></path>
+					</g>
+					<path d="M69184.3 673.1 L72204 966 L72204 1212.5 L72204 1212.5 L72204 1459 L72204 1459 L72204 1697.5 L72204 1697.5 L72204 1936 L72204 1936 L65638.25 2582.6500017867993 L65638.3 2582.7 " fill="none"></path>
+					<path d="M69184.8 667.8 L69184.3 673.1 L69183.8 678.4 L69171.0 671.8 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M67464.2 1224.6 L65099.25 1459 L65099.25 1697.5 L65099.25 1697.5 L65099.25 1936 L65099.25 1936 L65180.72314949202 2451 L65180.7 2451.0 " fill="none"></path>
+					</g>
+					<path d="M67464.8 1229.9 L67464.2 1224.6 L67463.7 1219.3 L67477.5 1223.3 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M42572.7 1235.3 L41499.25 1459 L41499.25 1697.5 L41499.25 1697.5 L41499.25 1936 L41499.25 1936 L64778.25 2612.503901472015 L64778.3 2612.5 " fill="none"></path>
 					</g>
-					<path d="M72779.5 1312.7 L72501.75 1459 L80530.5 1693.6278909480777 L80530.5 1693.6 " fill="none"></path>
+					<path d="M42573.8 1240.5 L42572.7 1235.3 L42571.6 1230.1 L42585.8 1232.6 Z"></path>
+					<path d="M65967.3 1811.4 L65678.25 1936 L65678.25 2625 L65678.25 2625 L65678.25 3314 L65678.25 3314 L65678.25 3500.5 L65678.25 3500.5 L65678.25 3687 L65678.25 3687 L65717.75 3721.3430555555556 L65717.8 3721.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72790.3 1313.1 L72779.5 1312.7 L72785.3 1303.6 L72796.0 1304.0 Z"></path>
+						<path d="M65978.0 1812.6 L65967.3 1811.4 L65973.8 1802.8 L65984.5 1804.0 Z"></path>
 					</g>
-					<path d="M73040.4 1319.6 L73132.5 1459 L73132.5 1697.5 L73132.5 1697.5 L73132.5 1936 L73132.5 1936 L73132.5 2625 L73132.5 2625 L73132.5 3314 L73132.5 3314 L59320 3499.359327217125 L59320.0 3499.4 " fill="none"></path>
+					<path d="M66221.0 1822.6 L66211.5 1936 L65461.61066763425 2451 L65461.6 2451.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73039.8 1308.9 L73040.4 1319.6 L73030.9 1314.7 L73030.2 1304.0 Z"></path>
+						<path d="M66227.1 1813.7 L66221.0 1822.6 L66216.5 1812.9 L66222.6 1804.0 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M67464.4 1234.6 L66231.5 1459 L66231.5 1591 L66231.5 1591.0 " fill="none"></path>
 					</g>
-					<path d="M58716.7 673.9 L60598.5 966 L72644.25 1206.0143376780843 L72644.3 1206.0 " fill="none"></path>
-					<path d="M58717.5 668.6 L58716.7 673.9 L58715.9 679.2 L58703.5 671.9 Z"></path>
+					<path d="M67465.3 1239.9 L67464.4 1234.6 L67463.4 1229.4 L67477.5 1232.2 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M82564.6 177.5 L82665.25 293 L82665.25 629.5 L82665.25 629.5 L82665.25 966 L82665.25 966 L73295.25 1204.2244340157806 L73295.3 1204.2 " fill="none"></path>
+						<path d="M83157.4 1263.0 L83062 1459 L66653 1691.5270491072754 L66653.0 1691.5 " fill="none"></path>
 					</g>
-					<path d="M82568.6 174.0 L82564.6 177.5 L82560.5 181.1 L82555.8 167.5 Z"></path>
-					<path d="M81082.5 1357.1 L80835.5 1459 L80835.5 1697.5 L80835.5 1697.5 L80835.5 1936 L80835.5 1936 L80835.5 2625 L80835.5 2625 L80835.5 3314 L80835.5 3314 L64748 3500.1470871075817 L64748.0 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M81093.2 1358.5 L81082.5 1357.1 L81089.1 1348.7 L81099.8 1350.0 Z"></path>
+					<path d="M83162.2 1265.3 L83157.4 1263.0 L83152.6 1260.7 L83163.3 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M42572.7 1236.1 L41539.25 1459 L65810 1693.4287731980683 L65810.0 1693.4 " fill="none"></path>
 					</g>
-					<path d="M81117.3 1411.4 L81041.75 1459 L80712.22955974843 1666.5 L80712.2 1666.5 " fill="none"></path>
+					<path d="M42573.8 1241.3 L42572.7 1236.1 L42571.6 1230.9 L42585.8 1233.3 Z"></path>
+					<path d="M49043.7 2711.1 L48779 3314 L20909.5 3499.498278015703 L20909.5 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81128.0 1411.0 L81117.3 1411.4 L81122.3 1402.0 L81133.1 1401.5 Z"></path>
+						<path d="M49052.3 2704.7 L49043.7 2711.1 L49042.6 2700.4 L49051.2 2694.0 Z"></path>
 					</g>
-					<path d="M81603.8 1415.8 L81640 1459 L81640 1697.5 L81640 1697.5 L81640 1936 L81640 1936 L81640 2625 L81640 2625 L81640 3314 L81640 3314 L54355.75 3500.1145954298986 L54355.8 3500.1 " fill="none"></path>
+					<path d="M49124.0 2710.7 L49423.25 3314 L24714 3499.419416977659 L24714.0 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81601.9 1405.2 L81603.8 1415.8 L81593.7 1412.1 L81591.8 1401.5 Z"></path>
+						<path d="M49124.6 2700.0 L49124.0 2710.7 L49115.1 2704.7 L49115.7 2694.0 Z"></path>
 					</g>
-					<path d="M81635.6 1414.7 L81680 1459 L81680 1697.5 L81680 1697.5 L81680 1936 L81680 1936 L81680 2625 L81680 2625 L81680 3314 L81680 3314 L58796.5 3500.0731055981864 L58796.5 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M81632.8 1404.3 L81635.6 1414.7 L81625.3 1411.9 L81622.4 1401.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M49435.5 1741.5 L49389 1936 L49389 2563.5 L49389.0 2563.5 " fill="none"></path>
 					</g>
-					<path d="M72233.1 717.0 L73510.5 966 L81099.75 1202.1238364204348 L81099.8 1202.1 " fill="none"></path>
-					<path d="M72234.1 711.8 L72233.1 717.0 L72232.1 722.3 L72220.0 714.5 Z"></path>
-					<path d="M84049.8 702.2 L84049.75 966 L81766.75 1181.0810242690618 L81766.8 1181.1 " fill="none"></path>
+					<path d="M49440.7 1742.7 L49435.5 1741.5 L49430.3 1740.2 L49438.6 1728.5 Z"></path>
+					<path d="M20927.4 3450.6 L20939.5 3447 L20947 3447 L20947 3447 L20954.5 3500.5 L20954.5 3500.5 L20947 3554 L20947 3554 L20939.5 3554 L20939.5 3554 L20909.5 3545.1080332409974 L20909.5 3545.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M84055.1 692.8 L84049.8 702.2 L84044.4 692.8 L84049.8 683.5 Z"></path>
+						<path d="M20916.9 3448.1 L20927.4 3450.6 L20920.0 3458.4 L20909.5 3455.9 Z"></path>
 					</g>
-					<path d="M83863.7 174.7 L84049.75 293 L84049.75 575.5 L84049.8 575.5 " fill="none"></path>
-					<path d="M83866.6 170.2 L83863.7 174.7 L83860.9 179.2 L83852.5 167.5 Z"></path>
-					<path d="M21584.0 1710.4 L23255.25 1936 L23255.25 2571.5 L23255.3 2571.5 " fill="none"></path>
-					<path d="M21584.7 1705.1 L21584.0 1710.4 L21583.2 1715.6 L21570.8 1708.6 Z"></path>
-					<path d="M65735.6 1255.2 L64586 1459 L64586 1682 L64586.0 1682.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65745.7 1258.8 L65735.6 1255.2 L65743.9 1248.3 L65754.0 1251.9 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3120.1 2652.2 L3481.5 3314 L20608.5 3498.8754449428448 L20608.5 3498.9 " fill="none"></path>
 					</g>
-					<path d="M65824.8 1322.5 L65636.5 1459 L65636.5 1697.5 L65636.5 1697.5 L65636.5 1936 L65636.5 1936 L65636.5 2625 L65636.5 2625 L65636.5 3314 L65636.5 3314 L39676.25 3500.1880161515164 L39676.3 3500.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65835.5 1321.3 L65824.8 1322.5 L65829.3 1312.7 L65839.9 1311.5 Z"></path>
+					<path d="M3124.8 2649.6 L3120.1 2652.2 L3115.4 2654.8 L3113.7 2640.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M50903.8 1227.5 L49446 1459 L49446 1666.5 L49446.0 1666.5 " fill="none"></path>
 					</g>
-					<path d="M65875.1 1325.4 L65755 1459 L65755 1682 L65755.0 1682.0 " fill="none"></path>
+					<path d="M50904.7 1232.8 L50903.8 1227.5 L50903.0 1222.3 L50917.0 1225.4 Z"></path>
+					<path d="M71485.7 2884.5 L71364.75 3314 L64999 3499.6106898573385 L64999.0 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65885.3 1322.0 L65875.1 1325.4 L65877.3 1314.9 L65887.5 1311.5 Z"></path>
+						<path d="M71493.4 2876.9 L71485.7 2884.5 L71483.1 2874.0 L71490.8 2866.5 Z"></path>
 					</g>
-					<path d="M66007.4 1329.5 L66041.5 1459 L66041.5 1682 L66041.5 1682.0 " fill="none"></path>
+					<path d="M71500.7 2884.7 L71404.75 3314 L59371.25 3499.6284325889164 L59371.3 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66010.1 1319.2 L66007.4 1329.5 L65999.8 1321.9 L66002.6 1311.5 Z"></path>
+						<path d="M71507.9 2876.8 L71500.7 2884.7 L71497.5 2874.4 L71504.8 2866.5 Z"></path>
 					</g>
-					<path d="M66286.2 1762.0 L66029 1936 L18005.25 2622.8760282112626 L18005.3 2622.9 " fill="none"></path>
+					<path d="M71624.3 2884.6 L71732.75 3314 L61446.25 3499.5529790115097 L61446.3 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66296.9 1761.1 L66286.2 1762.0 L66291.0 1752.3 L66301.7 1751.5 Z"></path>
+						<path d="M71627.2 2874.2 L71624.3 2884.6 L71616.9 2876.9 L71619.7 2866.5 Z"></path>
 					</g>
-					<path d="M66401.4 1769.5 L66447.5 1936 L66447.5 2625 L66447.5 2625 L66447.5 3314 L66447.5 3314 L66447.5 3500.5 L66447.5 3500.5 L66447.5 3687 L66447.5 3687 L66447.5 3843.5 L66447.5 3843.5 L66447.5 4000 L66447.5 4000 L30022.5 4133.735649505439 L30022.5 4133.7 " fill="none"></path>
+					<path d="M69184.3 672.6 L72244 966 L72244 1212.5 L72244 1212.5 L72244 1459 L72244 1459 L72244 1697.5 L72244 1697.5 L72244 1936 L72244 1936 L71798.93559506531 2383.5 L71798.9 2383.5 " fill="none"></path>
+					<path d="M69184.8 667.3 L69184.3 672.6 L69183.8 677.9 L69171.0 671.3 Z"></path>
+					<path d="M36260.0 2667.8 L35919.5 3314 L35191.5 3475.729600952948 L35191.5 3475.7 " fill="none"></path>
+					<path d="M36264.7 2670.3 L36260.0 2667.8 L36255.2 2665.3 L36266.2 2656.0 Z"></path>
+					<path d="M49805.0 2727.7 L49805 3314 L49853.00938337802 3386.5 L49853.0 3386.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66404.1 1759.1 L66401.4 1769.5 L66393.8 1761.9 L66396.4 1751.5 Z"></path>
+						<path d="M49810.3 2718.3 L49805.0 2727.7 L49799.7 2718.3 L49805.0 2709.0 Z"></path>
 					</g>
-					<path d="M66150.5 1318.4 L66381.5 1459 L66381.5 1643.5 L66381.5 1643.5 " fill="none"></path>
-					<path d="M66153.3 1313.9 L66150.5 1318.4 L66147.8 1323.0 L66139.2 1311.5 Z"></path>
-					<path d="M39688.6 2704.5 L39616.75 3314 L39901.9028150134 3485 L39901.9 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39695.0 2695.9 L39688.6 2704.5 L39684.4 2694.6 L39690.8 2686.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M49503.8 1735.9 L49805 1936 L49805 2541 L49805.0 2541.0 " fill="none"></path>
 					</g>
-					<path d="M39719.0 2704.0 L39881 3314 L39502.55361930295 3485 L39502.6 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39721.8 2693.7 L39719.0 2704.0 L39711.4 2696.4 L39714.2 2686.0 Z"></path>
+					<path d="M49506.7 1731.4 L49503.8 1735.9 L49500.8 1740.3 L49492.7 1728.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M49529.9 1730.5 L50052 1936 L50052 2625 L50052 2625 L50052 3314 L50052 3314 L50003.99061662198 3386.5 L50004.0 3386.5 " fill="none"></path>
 					</g>
-					<path d="M40097.3 2727.1 L40059 3314 L39829.91890080429 3469.5 L39829.9 3469.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40103.3 2718.2 L40097.3 2727.1 L40092.6 2717.5 L40098.5 2708.5 Z"></path>
+					<path d="M49531.9 1725.6 L49529.9 1730.5 L49528.0 1735.5 L49517.5 1725.6 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3121.5 2651.9 L3521.5 3314 L2438 3472.240211433046 L2438.0 3472.2 " fill="none"></path>
 					</g>
-					<path d="M40107.0 2727.2 L40124 3314 L40269.96179624665 3454.5 L40270.0 3454.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40112.0 2717.7 L40107.0 2727.2 L40101.4 2718.0 L40106.4 2708.5 Z"></path>
+					<path d="M3126.1 2649.2 L3121.5 2651.9 L3116.9 2654.7 L3114.6 2640.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M49530.4 1720.0 L50339 1936 L50339 2563.5 L50339.0 2563.5 " fill="none"></path>
 					</g>
-					<path d="M42761.0 3550.2 L42761 3687 L42761 3797.5 L42761.0 3797.5 " fill="none"></path>
+					<path d="M49531.8 1714.9 L49530.4 1720.0 L49529.0 1725.2 L49517.5 1716.6 Z"></path>
+					<path d="M42578.3 1747.2 L42578.25 1936 L62772.25 2613.3277188199786 L62772.3 2613.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42766.3 3540.8 L42761.0 3550.2 L42755.7 3540.8 L42761.0 3531.5 Z"></path>
+						<path d="M42583.6 1737.8 L42578.3 1747.2 L42572.9 1737.8 L42578.3 1728.5 Z"></path>
 					</g>
-					<path d="M40663.4 2719.4 L40484.75 3314 L39963.25 3488.61355475763 L39963.3 3488.6 " fill="none"></path>
+					<path d="M27505.8 1762.7 L27505.75 1936 L45441 2620.2880736485085 L45441.0 2620.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40671.2 2712.0 L40663.4 2719.4 L40661.0 2708.9 L40668.8 2701.5 Z"></path>
+						<path d="M27511.1 1753.3 L27505.8 1762.7 L27500.4 1753.3 L27505.8 1744.0 Z"></path>
 					</g>
-					<path d="M40668.8 2719.6 L40524.75 3314 L39676.25 3491.4049887892374 L39676.3 3491.4 " fill="none"></path>
+					<path d="M29233.0 1224.6 L27505.75 1459 L27505.75 1651 L27505.8 1651.0 " fill="none"></path>
+					<path d="M29233.8 1229.9 L29233.0 1224.6 L29232.3 1219.3 L29246.3 1222.8 Z"></path>
+					<path d="M55737.8 2742.7 L55737.75 3314 L52887 3489.1923140291624 L52887.0 3489.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40676.2 2711.8 L40668.8 2719.6 L40665.8 2709.3 L40673.2 2701.5 Z"></path>
+						<path d="M55743.1 2733.3 L55737.8 2742.7 L55732.4 2733.3 L55737.8 2724.0 Z"></path>
 					</g>
-					<path d="M40674.3 2719.9 L40564.75 3314 L20626.75 3498.992263874033 L20626.8 3499.0 " fill="none"></path>
+					<path d="M55835.4 1792.5 L55737.75 1936 L55737.75 2526 L55737.8 2526.0 " fill="none"></path>
+					<path d="M55839.8 1795.5 L55835.4 1792.5 L55830.9 1789.5 L55842.9 1781.5 Z"></path>
+					<path d="M63055.6 2854.5 L62926.25 3314 L64938 3497.7147141633004 L64938.0 3497.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40681.2 2711.6 L40674.3 2719.9 L40670.7 2709.7 L40677.6 2701.5 Z"></path>
+						<path d="M63063.3 2846.9 L63055.6 2854.5 L63053.0 2844.0 L63060.7 2836.5 Z"></path>
 					</g>
-					<path d="M42761.0 3908.2 L42761 4000 L22262 4133.456382849508 L22262.0 4133.5 " fill="none"></path>
+					<path d="M63068.9 2854.7 L62966.25 3314 L59371.25 3497.6142681089964 L59371.3 3497.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42766.3 3898.8 L42761.0 3908.2 L42755.7 3898.8 L42761.0 3889.5 Z"></path>
+						<path d="M63076.1 2846.8 L63068.9 2854.7 L63065.7 2844.4 L63073.0 2836.5 Z"></path>
 					</g>
-					<path d="M40680.4 2714.7 L40604.75 3314 L39852.25 3485.0435709932967 L39852.3 3485.0 " fill="none"></path>
-					<path d="M40685.7 2715.4 L40680.4 2714.7 L40675.1 2714.1 L40682.1 2701.5 Z"></path>
-					<path d="M40697.0 2714.8 L40731.75 3314 L40419.75 3454.550724637681 L40419.8 3454.6 " fill="none"></path>
-					<path d="M40702.3 2714.5 L40697.0 2714.8 L40691.6 2715.1 L40696.2 2701.5 Z"></path>
-					<path d="M20644.5 3443.4 L20656.75 3439.5 L20664.25 3439.5 L20664.25 3439.5 L20671.75 3500.5 L20671.75 3500.5 L20664.25 3561.5 L20664.25 3561.5 L20656.75 3561.5 L20656.75 3561.5 L20626.75 3551.9935064935066 L20626.8 3552.0 " fill="none"></path>
+					<path d="M63178.2 2854.6 L63294.25 3314 L61446.25 3495.3480662983425 L61446.3 3495.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20634.0 3441.1 L20644.5 3443.4 L20637.3 3451.3 L20626.8 3449.0 Z"></path>
+						<path d="M63181.1 2844.2 L63178.2 2854.6 L63170.8 2846.9 L63173.7 2836.5 Z"></path>
 					</g>
+					<path d="M59177.3 1741.8 L59192.75 1936 L62772.25 2563.9504774029283 L62772.3 2564.0 " fill="none"></path>
+					<path d="M59182.6 1741.4 L59177.3 1741.8 L59172.0 1742.2 L59176.2 1728.5 Z"></path>
+					<path d="M63234.2 1835.3 L63120.25 1936 L63120.25 2413.5 L63120.3 2413.5 " fill="none"></path>
+					<path d="M63237.8 1839.3 L63234.2 1835.3 L63230.7 1831.3 L63244.2 1826.5 Z"></path>
+					<path d="M82417.4 1831.9 L82216.5 1936 L63468.25 2612.4440269686456 L63468.3 2612.4 " fill="none"></path>
+					<path d="M82419.9 1836.6 L82417.4 1831.9 L82415.0 1827.2 L82429.3 1825.8 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3706.6 2649.4 L4452.75 3314 L20301.75 3498.607219810761 L20301.8 3498.6 " fill="none"></path>
+						<path d="M67464.6 1246.0 L66693 1459 L66693 1697.5 L66693 1697.5 L66693 1936 L66693 1936 L63468.25 2557.888671191659 L63468.3 2557.9 " fill="none"></path>
 					</g>
-					<path d="M3710.2 2645.4 L3706.6 2649.4 L3703.1 2653.4 L3696.7 2640.5 Z"></path>
+					<path d="M67466.1 1251.1 L67464.6 1246.0 L67463.2 1240.9 L67477.5 1242.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M74622.8 180.8 L74622.75 293 L74622.75 598.5 L74622.8 598.5 " fill="none"></path>
-					</g>
-					<path d="M74628.1 180.8 L74622.8 180.8 L74617.4 180.8 L74622.8 167.5 Z"></path>
-					<path d="M40918.3 3931.2 L40918.25 4000 L50246.75 4132.966599297947 L50246.8 4133.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40923.6 3921.8 L40918.3 3931.2 L40912.9 3921.8 L40918.3 3912.5 Z"></path>
+						<path d="M83165.4 1263.7 L83102 1459 L83102 1697.5 L83102 1697.5 L83102 1936 L83102 1936 L63468.25 2613.000450411 L63468.3 2613.0 " fill="none"></path>
 					</g>
+					<path d="M83170.5 1265.3 L83165.4 1263.7 L83160.3 1262.0 L83169.5 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M40918.3 3567.3 L40918.25 3687 L40918.25 3774.5 L40918.3 3774.5 " fill="none"></path>
+						<path d="M42572.7 1237.0 L41579.25 1459 L41579.25 1697.5 L41579.25 1697.5 L41579.25 1936 L41579.25 1936 L62772.25 2613.8690404345202 L62772.3 2613.9 " fill="none"></path>
 					</g>
-					<path d="M40923.6 3567.3 L40918.3 3567.3 L40912.9 3567.3 L40918.3 3554.0 Z"></path>
-					<path d="M41355.3 2748.9 L41185.75 3314 L41185.75 3500.5 L41185.75 3500.5 L41185.75 3687 L41185.75 3687 L41185.75 3843.5 L41185.75 3843.5 L41185.75 4000 L41185.75 4000 L30022.5 4133.141274114951 L30022.5 4133.1 " fill="none"></path>
+					<path d="M42573.9 1242.2 L42572.7 1237.0 L42571.6 1231.8 L42585.8 1234.1 Z"></path>
+					<path d="M36275.0 2669.1 L36166 3314 L35516.06836461126 3469.5 L35516.1 3469.5 " fill="none"></path>
+					<path d="M36280.3 2670.0 L36275.0 2669.1 L36269.8 2668.3 L36277.3 2656.0 Z"></path>
+					<path d="M67307.4 2821.2 L66922.25 3314 L64999 3497.5885476647472 L64999.0 3497.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41363.1 2741.5 L41355.3 2748.9 L41352.9 2738.4 L41360.7 2731.0 Z"></path>
+						<path d="M67317.4 2817.1 L67307.4 2821.2 L67308.9 2810.6 L67318.9 2806.5 Z"></path>
 					</g>
-					<path d="M41385.3 2749.6 L41352.5 3314 L51895.75 3499.9884248859044 L51895.8 3500.0 " fill="none"></path>
+					<path d="M67318.5 2821.6 L66962.25 3314 L64120.25 3497.529432132964 L64120.3 3497.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41391.1 2740.6 L41385.3 2749.6 L41380.5 2740.0 L41386.3 2731.0 Z"></path>
+						<path d="M67328.3 2817.2 L67318.5 2821.6 L67319.6 2810.9 L67329.4 2806.5 Z"></path>
 					</g>
-					<path d="M41426.6 2749.0 L41581.75 3314 L48536 3499.3141811037685 L48536.0 3499.3 " fill="none"></path>
+					<path d="M67360.5 2823.2 L67112 3314 L67112 3500.5 L67112 3500.5 L67112 3687 L67112 3687 L67112 3843.5 L67112 3843.5 L67112 4000 L67112 4000 L61787 4132.778191291403 L61787.0 4132.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41429.2 2738.6 L41426.6 2749.0 L41418.9 2741.4 L41421.6 2731.0 Z"></path>
+						<path d="M67369.4 2817.2 L67360.5 2823.2 L67359.9 2812.4 L67368.9 2806.5 Z"></path>
 					</g>
-					<path d="M41433.7 2748.7 L41621.75 3314 L39676.25 3496.4211915535443 L39676.3 3496.4 " fill="none"></path>
+					<path d="M67438.8 2825.1 L67385 3314 L67385 3500.5 L67385 3500.5 L67385 3687 L67385 3687 L65998.75 3829.0980022924514 L65998.8 3829.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41435.8 2738.2 L41433.7 2748.7 L41425.7 2741.5 L41427.8 2731.0 Z"></path>
+						<path d="M67445.1 2816.4 L67438.8 2825.1 L67434.5 2815.2 L67440.8 2806.5 Z"></path>
 					</g>
-					<path d="M37259.7 2709.1 L36861.75 3314 L36861.75 3485 L36861.8 3485.0 " fill="none"></path>
+					<path d="M67539.5 2823.9 L67733.75 3314 L61446.25 3498.955638801262 L61446.3 3499.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37269.3 2704.2 L37259.7 2709.1 L37260.4 2698.4 L37269.9 2693.5 Z"></path>
+						<path d="M67541.1 2813.2 L67539.5 2823.9 L67531.1 2817.1 L67532.7 2806.5 Z"></path>
 					</g>
-					<path d="M37324.1 2712.1 L37386.75 3314 L39892.25 3497.8944313262496 L39892.3 3497.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37328.4 2702.2 L37324.1 2712.1 L37317.8 2703.3 L37322.1 2693.5 Z"></path>
+					<path d="M69184.3 672.1 L72284 966 L72284 1212.5 L72284 1212.5 L72284 1459 L72284 1459 L72284 1697.5 L72284 1697.5 L72284 1936 L72284 1936 L68006.75 2547.0040429171204 L68006.8 2547.0 " fill="none"></path>
+					<path d="M69184.8 666.8 L69184.3 672.1 L69183.8 677.4 L69171.0 670.8 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M67464.7 1247.6 L66733 1459 L66733 1697.5 L66733 1697.5 L66733 1936 L66733 1936 L67269.04227140783 2443.5 L67269.0 2443.5 " fill="none"></path>
 					</g>
-					<path d="M37355.1 1727.7 L34854.5 1936 L34854.5 2625 L34854.5 2625 L34854.5 3314 L34854.5 3314 L28718.5 3498.3369845360826 L28718.5 3498.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37364.9 1732.2 L37355.1 1727.7 L37364.0 1721.6 L37373.8 1726.2 Z"></path>
+					<path d="M67466.2 1252.7 L67464.7 1247.6 L67463.2 1242.4 L67477.5 1243.9 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M83173.6 1264.2 L83142 1459 L83142 1697.5 L83142 1697.5 L83142 1936 L83142 1936 L68006.75 2601.0099481865286 L68006.8 2601.0 " fill="none"></path>
 					</g>
-					<path d="M37355.2 1730.3 L35085 1936 L35085 2609.5 L35085.0 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37364.9 1734.8 L37355.2 1730.3 L37364.0 1724.2 L37373.8 1728.7 Z"></path>
+					<path d="M83178.9 1265.0 L83173.6 1264.2 L83168.4 1263.3 L83175.8 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M42572.8 1237.9 L41619.25 1459 L41619.25 1697.5 L41619.25 1697.5 L41619.25 1936 L41619.25 1936 L66914.75 2610.4422537391406 L66914.8 2610.4 " fill="none"></path>
 					</g>
-					<path d="M37355.4 1761.6 L36368.5 1936 L36368.5 2625 L36368.5 2625 L36368.5 3314 L36368.5 3314 L18429.75 3498.8002140440517 L18429.8 3498.8 " fill="none"></path>
+					<path d="M42574.0 1243.1 L42572.8 1237.9 L42571.6 1232.7 L42585.8 1234.9 Z"></path>
+					<path d="M27524.8 2694.0 L26104.5 3314 L27548.25 3488.8153708813506 L27548.3 3488.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37365.5 1765.2 L37355.4 1761.6 L37363.6 1754.7 L37373.8 1758.3 Z"></path>
+						<path d="M27535.5 2695.1 L27524.8 2694.0 L27531.2 2685.3 L27541.9 2686.5 Z"></path>
 					</g>
-					<path d="M37355.4 1767.8 L36488.5 1936 L36488.5 2609.5 L36488.5 2609.5 " fill="none"></path>
+					<path d="M27730.7 2702.4 L28109.5 3314 L28175.286863270776 3485 L28175.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37365.6 1771.3 L37355.4 1767.8 L37363.6 1760.8 L37373.8 1764.2 Z"></path>
+						<path d="M27730.3 2691.6 L27730.7 2702.4 L27721.2 2697.2 L27720.8 2686.5 Z"></path>
 					</g>
-					<path d="M37355.8 1799.3 L36870 1936 L36870 2609.5 L36870.0 2609.5 " fill="none"></path>
+					<path d="M29233.1 1226.2 L27717.75 1459 L27717.75 1697.5 L27717.75 1697.5 L27717.75 1936 L27717.75 1936 L27685.874092888243 2563.5 L27685.9 2563.5 " fill="none"></path>
+					<path d="M29233.9 1231.5 L29233.1 1226.2 L29232.3 1220.9 L29246.3 1224.2 Z"></path>
+					<path d="M53428.1 2769.0 L53022.25 3314 L59258.25 3498.825427095749 L59258.3 3498.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37366.2 1801.9 L37355.8 1799.3 L37363.3 1791.7 L37373.8 1794.3 Z"></path>
+						<path d="M53437.9 2764.7 L53428.1 2769.0 L53429.4 2758.3 L53439.2 2754.0 Z"></path>
 					</g>
-					<path d="M37370.7 1903.0 L37315 1936 L37315 2556.5 L37315.0 2556.5 " fill="none"></path>
+					<path d="M53643.0 2768.9 L54051.25 3314 L61341.25 3499.1664964249235 L61341.3 3499.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37381.5 1902.8 L37370.7 1903.0 L37376.0 1893.7 L37386.8 1893.5 Z"></path>
+						<path d="M53641.7 2758.3 L53643.0 2768.9 L53633.2 2764.7 L53631.9 2754.0 Z"></path>
 					</g>
-					<path d="M37524.9 1907.2 L37498.5 1936 L37498.5 2625 L37498.5 2625 L37498.5 3314 L37498.5 3314 L40459.75 3493.7910393098396 L40459.8 3493.8 " fill="none"></path>
+					<path d="M59184.6 1741.4 L59232.75 1936 L53883.25 2582.9162790697674 L53883.3 2582.9 " fill="none"></path>
+					<path d="M59189.8 1740.2 L59184.6 1741.4 L59179.4 1742.7 L59181.4 1728.5 Z"></path>
+					<path d="M36289.8 2669.2 L36395.75 3314 L35951.461126005364 3454.5 L35951.5 3454.5 " fill="none"></path>
+					<path d="M36295.0 2668.3 L36289.8 2669.2 L36284.5 2670.0 L36287.6 2656.0 Z"></path>
+					<path d="M81794.0 2712.7 L81794 3314 L61180.25 3497.991881932064 L61180.3 3498.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37535.2 1904.0 L37524.9 1907.2 L37527.3 1896.8 L37537.6 1893.5 Z"></path>
+						<path d="M81799.3 2703.3 L81794.0 2712.7 L81788.7 2703.3 L81794.0 2694.0 Z"></path>
 					</g>
-					<path d="M38079.6 1807.1 L38505.5 1936 L38505.5 2625 L38505.5 2625 L38505.5 3314 L38505.5 3314 L39892.25 3495.844876076639 L39892.3 3495.8 " fill="none"></path>
+					<path d="M82084.0 172.6 L81794 293 L81794 629.5 L81794 629.5 L81794 966 L81794 966 L81794 1212.5 L81794 1212.5 L81794 1459 L81794 1459 L81794 1697.5 L81794 1697.5 L81794 1936 L81794 1936 L81794 2556 L81794.0 2556.0 " fill="none"></path>
+					<path d="M82086.1 177.5 L82084.0 172.6 L82082.0 167.7 L82096.3 167.5 Z"></path>
+					<path d="M51004.3 1272.3 L51022.25 1459 L51022.25 1613.5 L51022.3 1613.5 " fill="none"></path>
+					<path d="M51009.6 1271.8 L51004.3 1272.3 L50999.0 1272.8 L51003.0 1259.0 Z"></path>
+					<path d="M44527.5 1747.2 L44527.5 1936 L53187.25 2598.381588076934 L53187.3 2598.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38072.2 1799.2 L38079.6 1807.1 L38069.1 1809.5 L38061.8 1801.6 Z"></path>
+						<path d="M44532.8 1737.8 L44527.5 1747.2 L44522.2 1737.8 L44527.5 1728.5 Z"></path>
 					</g>
-					<path d="M38079.7 1801.8 L38545.5 1936 L38545.5 2625 L38545.5 2625 L38545.5 3314 L38545.5 3314 L19619.75 3498.776786765957 L19619.8 3498.8 " fill="none"></path>
+					<path d="M50797.6 2725.3 L50472.5 3314 L36482.5 3499.74321919271 L36482.5 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38072.2 1794.1 L38079.7 1801.8 L38069.2 1804.3 L38061.8 1796.6 Z"></path>
+						<path d="M50806.8 2719.7 L50797.6 2725.3 L50797.4 2714.6 L50806.6 2709.0 Z"></path>
 					</g>
-					<path d="M19637.8 3450.1 L19649.75 3447 L19657.25 3447 L19657.25 3447 L19664.75 3500.5 L19664.75 3500.5 L19657.25 3554 L19657.25 3554 L19649.75 3554 L19649.75 3554 L19619.75 3546.227602905569 L19619.8 3546.2 " fill="none"></path>
+					<path d="M50869.9 2727.4 L50966.5 3314 L52519 3480.7384105960264 L52519.0 3480.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19627.4 3447.3 L19637.8 3450.1 L19630.1 3457.6 L19619.8 3454.8 Z"></path>
+						<path d="M50873.6 2717.3 L50869.9 2727.4 L50863.1 2719.1 L50866.8 2709.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3707.7 2649.1 L4492.75 3314 L19266.75 3498.298250894619 L19266.8 3498.3 " fill="none"></path>
+						<path d="M49530.6 1711.8 L50853 1936 L50853 2541 L50853.0 2541.0 " fill="none"></path>
 					</g>
-					<path d="M3711.2 2645.0 L3707.7 2649.1 L3704.3 2653.2 L3697.6 2640.5 Z"></path>
-					<path d="M23143.6 1216.1 L29221 1459 L29221 1651 L29221.0 1651.0 " fill="none"></path>
-					<path d="M23143.8 1210.7 L23143.6 1216.1 L23143.4 1221.4 L23130.3 1215.5 Z"></path>
-					<path d="M27955.5 2720.2 L27955.5 3314 L39589.25 3499.8052516645616 L39589.3 3499.8 " fill="none"></path>
+					<path d="M49531.5 1706.6 L49530.6 1711.8 L49529.8 1717.1 L49517.5 1709.6 Z"></path>
+					<path d="M60899.3 3685.7 L60899.25 3687 L60899.25 3843.5 L60899.25 3843.5 L60899.25 4000 L60899.25 4000 L61689 4126.171684053651 L61689.0 4126.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27960.8 2710.8 L27955.5 2720.2 L27950.2 2710.8 L27955.5 2701.5 Z"></path>
+						<path d="M60904.6 3676.3 L60899.3 3685.7 L60893.9 3676.3 L60899.3 3667.0 Z"></path>
 					</g>
-					<path d="M3874.9 1707.7 L5247.5 1936 L27823.5 2620.9948916681346 L27823.5 2621.0 " fill="none"></path>
-					<path d="M3875.8 1702.4 L3874.9 1707.7 L3874.0 1712.9 L3861.8 1705.5 Z"></path>
-					<path d="M75910.3 165.3 L75910.25 293 L75910.25 614 L75910.3 614.0 " fill="none"></path>
-					<path d="M75915.6 165.3 L75910.3 165.3 L75904.9 165.3 L75910.3 152.0 Z"></path>
-					<path d="M42707.7 1720.7 L41054 1936 L28087.5 2618.056609535443 L28087.5 2618.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42717.7 1724.8 L42707.7 1720.7 L42716.3 1714.2 L42726.3 1718.3 Z"></path>
+					<path d="M48049.5 3305.6 L48044.75 3314 L60618.25 3496.423100859621 L60618.3 3496.4 " fill="none"></path>
+					<path d="M48054.2 3308.2 L48049.5 3305.6 L48044.9 3303.0 L48056.1 3294.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M52469.3 2669.3 L52469.25 3314 L60618.25 3494.2833333333333 L60618.3 3494.3 " fill="none"></path>
 					</g>
-					<path d="M42707.7 1721.2 L41094 1936 L42947.10250362845 2609.5 L42947.1 2609.5 " fill="none"></path>
+					<path d="M52474.6 2669.3 L52469.3 2669.3 L52463.9 2669.3 L52469.3 2656.0 Z"></path>
+					<path d="M66217.1 2888.7 L65883.75 3314 L64999 3494.2850314121824 L64999.0 3494.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42717.7 1725.2 L42707.7 1721.2 L42716.3 1714.7 L42726.3 1718.7 Z"></path>
+						<path d="M66227.0 2884.6 L66217.1 2888.7 L66218.6 2878.1 L66228.6 2874.0 Z"></path>
 					</g>
-					<path d="M42948.7 1805.1 L43025.25 1936 L42787.22786647315 2609.5 L42787.2 2609.5 " fill="none"></path>
+					<path d="M66232.1 2889.1 L65923.75 3314 L64120.25 3495.861449040281 L64120.3 3495.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42948.6 1794.4 L42948.7 1805.1 L42939.4 1799.7 L42939.3 1789.0 Z"></path>
+						<path d="M66241.9 2884.7 L66232.1 2889.1 L66233.3 2878.4 L66243.1 2874.0 Z"></path>
 					</g>
-					<path d="M43164.7 1803.9 L43065.25 1936 L28087.5 2618.9808401859727 L28087.5 2619.0 " fill="none"></path>
+					<path d="M66247.1 2889.5 L65963.75 3314 L66032.3827077748 3394 L66032.4 3394.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43174.5 1799.7 L43164.7 1803.9 L43166.0 1793.3 L43175.9 1789.0 Z"></path>
+						<path d="M66256.8 2884.7 L66247.1 2889.5 L66247.9 2878.8 L66257.5 2874.0 Z"></path>
 					</g>
-					<path d="M43210.2 1806.8 L43169.25 1936 L42993.78809869376 2609.5 L42993.8 2609.5 " fill="none"></path>
+					<path d="M66262.2 2889.9 L66003.75 3314 L59371.25 3498.9246897892062 L59371.3 3498.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43218.1 1799.5 L43210.2 1806.8 L43207.9 1796.3 L43215.8 1789.0 Z"></path>
+						<path d="M66271.7 2884.7 L66262.2 2889.9 L66262.6 2879.2 L66272.0 2874.0 Z"></path>
 					</g>
-					<path d="M43316.3 1804.5 L43404.25 1936 L42795.75399129173 2609.5 L42795.8 2609.5 " fill="none"></path>
+					<path d="M66554.3 2890.8 L66762.25 3314 L66762.25 3500.5 L66762.25 3500.5 L66762.25 3687 L66762.25 3687 L66762.25 3843.5 L66762.25 3843.5 L66762.25 4000 L66762.25 4000 L61787 4132.6931382793455 L61787.0 4132.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43315.6 1793.8 L43316.3 1804.5 L43306.7 1799.7 L43305.9 1789.0 Z"></path>
+						<path d="M66555.0 2880.0 L66554.3 2890.8 L66545.4 2884.7 L66546.1 2874.0 Z"></path>
 					</g>
-					<path d="M43603.8 1777.7 L43603.75 1936 L43003.562772133526 2609.5 L43003.6 2609.5 " fill="none"></path>
+					<path d="M66569.5 2890.4 L66802.25 3314 L66802.25 3500.5 L66802.25 3500.5 L66802.25 3687 L66802.25 3687 L65998.75 3820.2073622881358 L65998.8 3820.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43609.1 1768.3 L43603.8 1777.7 L43598.4 1768.3 L43603.8 1759.0 Z"></path>
+						<path d="M66569.7 2879.6 L66569.5 2890.4 L66560.4 2884.7 L66560.5 2874.0 Z"></path>
 					</g>
-					<path d="M11622.5 2674.7 L11622.5 3314 L30633.5 3499.6893003037603 L30633.5 3499.7 " fill="none"></path>
+					<path d="M66584.7 2890.0 L66842.25 3314 L61446.25 3498.7029457648896 L61446.3 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11627.8 2665.3 L11622.5 2674.7 L11617.2 2665.3 L11622.5 2656.0 Z"></path>
+						<path d="M66584.4 2879.2 L66584.7 2890.0 L66575.3 2884.7 L66575.0 2874.0 Z"></path>
 					</g>
-					<path d="M12322.0 1730.1 L11622.5 1936 L11622.5 2594 L11622.5 2594.0 " fill="none"></path>
-					<path d="M12323.5 1735.2 L12322.0 1730.1 L12320.5 1725.0 L12334.8 1726.3 Z"></path>
-					<path d="M13203.0 2674.7 L13203 3314 L17803.75 3495.451731430082 L17803.8 3495.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13208.3 2665.3 L13203.0 2674.7 L13197.7 2665.3 L13203.0 2656.0 Z"></path>
+					<path d="M69184.3 671.6 L72324 966 L72324 1212.5 L72324 1212.5 L72324 1459 L72324 1459 L72324 1697.5 L72324 1697.5 L72324 1936 L72324 1936 L66874.75 2572.3346044659124 L66874.8 2572.3 " fill="none"></path>
+					<path d="M69184.8 666.3 L69184.3 671.6 L69183.8 676.9 L69171.0 670.4 Z"></path>
+					<path d="M63276.9 1836.8 L63196.25 1936 L65972.75 2528.7214562354766 L65972.8 2528.7 " fill="none"></path>
+					<path d="M63281.0 1840.2 L63276.9 1836.8 L63272.8 1833.5 L63285.3 1826.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M67517.0 1258.4 L67215.25 1459 L67215.25 1697.5 L67215.25 1697.5 L67215.25 1936 L67215.25 1936 L66709.7928156749 2376 L66709.8 2376.0 " fill="none"></path>
 					</g>
-					<path d="M12543.5 1731.8 L13203 1936 L13203 2594 L13203.0 2594.0 " fill="none"></path>
-					<path d="M12545.1 1726.7 L12543.5 1731.8 L12541.9 1736.9 L12530.8 1727.8 Z"></path>
-					<path d="M46043.8 2749.0 L45887 3314 L39963.25 3499.3889960985025 L39963.3 3499.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46051.5 2741.4 L46043.8 2749.0 L46041.2 2738.6 L46048.8 2731.0 Z"></path>
+					<path d="M67519.9 1262.8 L67517.0 1258.4 L67514.0 1253.9 L67528.1 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M83182.0 1264.3 L83182 1459 L83182 1697.5 L83182 1697.5 L83182 1936 L83182 1936 L66874.75 2606.4575507585814 L66874.8 2606.5 " fill="none"></path>
 					</g>
-					<path d="M46051.0 2749.2 L45927 3314 L46909 3491.0352827452875 L46909.0 3491.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46058.2 2741.3 L46051.0 2749.2 L46047.8 2739.0 L46055.0 2731.0 Z"></path>
+					<path d="M83187.3 1264.3 L83182.0 1264.3 L83176.7 1264.3 L83182.0 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M42625.2 1250.9 L42316.25 1459 L42316.25 1697.5 L42316.25 1697.5 L42316.25 1936 L42316.25 1936 L65972.75 2612.110276884787 L65972.8 2612.1 " fill="none"></path>
 					</g>
-					<path d="M46103.0 2749.3 L46215.5 3314 L40680.75 3496.849453080023 L40680.8 3496.8 " fill="none"></path>
+					<path d="M42628.1 1255.4 L42625.2 1250.9 L42622.2 1246.5 L42636.2 1243.5 Z"></path>
+					<path d="M66123.8 3625.7 L66123.75 3687 L65998.75 3760.6817325800375 L65998.8 3760.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M46106.4 2739.1 L46103.0 2749.3 L46096.0 2741.2 L46099.4 2731.0 Z"></path>
+						<path d="M66129.1 3616.3 L66123.8 3625.7 L66118.4 3616.3 L66123.8 3607.0 Z"></path>
 					</g>
-					<path d="M76154.3 165.3 L76154.25 293 L76154.25 614 L76154.3 614.0 " fill="none"></path>
-					<path d="M76159.6 165.3 L76154.3 165.3 L76148.9 165.3 L76154.3 152.0 Z"></path>
-					<path d="M46392.8 2712.7 L46392.75 3314 L48536 3496.7064906867786 L48536.0 3496.7 " fill="none"></path>
+					<path d="M66541.9 3397.7 L66882.25 3314 L66589.44883889695 2874 L66589.4 2874.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M46398.1 2703.3 L46392.8 2712.7 L46387.4 2703.3 L46392.8 2694.0 Z"></path>
+						<path d="M66531.5 3394.7 L66541.9 3397.7 L66534.1 3405.1 L66523.8 3402.1 Z"></path>
 					</g>
-					<path d="M46660.5 2734.9 L46556.5 3314 L39963.25 3499.5012068640394 L39963.3 3499.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46667.4 2726.6 L46660.5 2734.9 L46656.9 2724.7 L46663.8 2716.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M67669.7 1257.3 L68046.75 1459 L68046.75 1697.5 L68046.75 1697.5 L68046.75 1936 L68046.75 1936 L68046.75 2625 L68046.75 2625 L68046.75 3314 L68046.75 3314 L66523.75 3461.7064482579303 L66523.8 3461.7 " fill="none"></path>
 					</g>
-					<path d="M46697.6 2734.9 L46789 3314 L53674.75 3498.676235843969 L53674.8 3498.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46701.4 2724.9 L46697.6 2734.9 L46690.9 2726.6 L46694.7 2716.5 Z"></path>
+					<path d="M67672.2 1252.6 L67669.7 1257.3 L67667.2 1262.0 L67658.0 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M83190.4 1264.2 L83222 1459 L83222 1697.5 L83222 1697.5 L83222 1936 L83222 1936 L83222 2625 L83222 2625 L83222 3314 L83222 3314 L66523.75 3496.13698039273 L66523.8 3496.1 " fill="none"></path>
 					</g>
-					<path d="M46991.9 2756.4 L46829 3314 L39676.25 3499.372642001042 L39676.3 3499.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46999.6 2749.0 L46991.9 2756.4 L46989.4 2746.0 L46997.1 2738.5 Z"></path>
+					<path d="M83195.6 1263.3 L83190.4 1264.2 L83185.1 1265.0 L83188.2 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M42709.3 1254.7 L42840.25 1459 L42840.25 1697.5 L42840.25 1697.5 L42840.25 1936 L42840.25 1936 L42840.25 2625 L42840.25 2625 L42840.25 3314 L42840.25 3314 L65723.75 3497.2960143449222 L65723.8 3497.3 " fill="none"></path>
 					</g>
-					<path d="M46999.4 2756.7 L46869 3314 L46869 3500.5 L46869 3500.5 L46869 3687 L46869 3687 L46869 3843.5 L46869 3843.5 L46869 4000 L46869 4000 L30022.5 4133.429736678783 L30022.5 4133.4 " fill="none"></path>
+					<path d="M42713.8 1251.8 L42709.3 1254.7 L42704.8 1257.6 L42702.1 1243.5 Z"></path>
+					<path d="M71338.5 1741.1 L69699 1936 L69699 2625 L69699 2625 L69699 3314 L69699 3314 L64999 3499.2975372582177 L64999.0 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47006.8 2748.8 L46999.4 2756.7 L46996.4 2746.4 L47003.7 2738.5 Z"></path>
+						<path d="M71348.4 1745.3 L71338.5 1741.1 L71347.1 1734.7 L71357.0 1738.9 Z"></path>
 					</g>
-					<path d="M47008.2 2756.9 L46915.25 3314 L52671 3497.6758138341106 L52671.0 3497.7 " fill="none"></path>
+					<path d="M71339.6 1839.4 L71090.75 1936 L71090.75 2625 L71090.75 2625 L71090.75 3314 L71090.75 3314 L72645 3486.565932430421 L72645.0 3486.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47015.0 2748.6 L47008.2 2756.9 L47004.5 2746.8 L47011.3 2738.5 Z"></path>
+						<path d="M71350.2 1841.0 L71339.6 1839.4 L71346.4 1831.0 L71357.0 1832.6 Z"></path>
 					</g>
-					<path d="M47015.9 2757.1 L46955.25 3314 L46960.98056300268 3485 L46961.0 3485.0 " fill="none"></path>
+					<path d="M71339.8 1849.2 L71130.75 1936 L71130.75 2625 L71130.75 2625 L71130.75 3314 L71130.75 3314 L71130.75 3500.5 L71130.75 3500.5 L71130.75 3687 L71130.75 3687 L71130.75 3843.5 L71130.75 3843.5 L71130.75 4000 L71130.75 4000 L72971.75 4124.060346995223 L72971.8 4124.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47022.2 2748.4 L47015.9 2757.1 L47011.6 2747.2 L47017.9 2738.5 Z"></path>
+						<path d="M71350.4 1850.5 L71339.8 1849.2 L71346.3 1840.7 L71357.0 1842.0 Z"></path>
 					</g>
-					<path d="M47045.3 2757.0 L47109 3314 L47109 3485 L47109.0 3485.0 " fill="none"></path>
+					<path d="M71340.0 1860.5 L71170.75 1936 L71170.75 2625 L71170.75 2625 L71170.75 3314 L71170.75 3314 L64120.25 3499.291094201367 L64120.3 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47049.6 2747.2 L47045.3 2757.0 L47039.0 2748.4 L47043.2 2738.5 Z"></path>
+						<path d="M71350.7 1861.5 L71340.0 1860.5 L71346.3 1851.8 L71357.0 1852.9 Z"></path>
 					</g>
-					<path d="M47738.9 2727.3 L47620.75 3314 L39676.25 3499.4843828242365 L39676.3 3499.5 " fill="none"></path>
+					<path d="M71583.9 1894.9 L71558.75 1936 L71558.75 2383.5 L71558.8 2383.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47746.0 2719.2 L47738.9 2727.3 L47735.5 2717.1 L47742.6 2709.0 Z"></path>
+						<path d="M71593.4 1889.7 L71583.9 1894.9 L71584.3 1884.2 L71593.7 1879.0 Z"></path>
 					</g>
-					<path d="M47771.6 2727.5 L47840.75 3314 L39963.25 3499.663307215974 L39963.3 3499.7 " fill="none"></path>
+					<path d="M71694.7 1897.6 L71692.75 1936 L66874.75 2566.0250521920666 L66874.8 2566.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47775.8 2717.6 L47771.6 2727.5 L47765.2 2718.9 L47769.4 2709.0 Z"></path>
+						<path d="M71700.5 1888.6 L71694.7 1897.6 L71689.9 1888.0 L71695.7 1879.0 Z"></path>
 					</g>
-					<path d="M48007.6 2772.2 L47880.75 3314 L39676.25 3499.516397914646 L39676.3 3499.5 " fill="none"></path>
+					<path d="M71728.3 1897.5 L71732.75 1936 L68006.75 2536.9396067415732 L68006.8 2536.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48014.9 2764.3 L48007.6 2772.2 L48004.5 2761.9 L48011.8 2754.0 Z"></path>
+						<path d="M71732.5 1887.7 L71728.3 1897.5 L71721.9 1888.9 L71726.1 1879.0 Z"></path>
 					</g>
-					<path d="M48016.1 2772.4 L47920.75 3314 L51895.75 3499.1492257742257 L51895.8 3499.1 " fill="none"></path>
+					<path d="M71761.7 1897.0 L71772.75 1936 L65638.25 2579.867849798157 L65638.3 2579.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48022.9 2764.1 L48016.1 2772.4 L48012.4 2762.3 L48019.3 2754.0 Z"></path>
+						<path d="M71764.2 1886.5 L71761.7 1897.0 L71754.0 1889.4 L71756.6 1879.0 Z"></path>
 					</g>
-					<path d="M48024.6 2772.5 L47960.75 3314 L24503 3499.362118275128 L24503.0 3499.4 " fill="none"></path>
+					<path d="M71794.7 1896.0 L71812.75 1936 L69100 2532.722723281986 L69100.0 2532.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48031.0 2763.9 L48024.6 2772.5 L48020.4 2762.6 L48026.8 2754.0 Z"></path>
+						<path d="M71795.7 1885.3 L71794.7 1896.0 L71786.0 1889.7 L71787.0 1879.0 Z"></path>
 					</g>
-					<path d="M48046.6 2772.7 L48063.5 3314 L47014 3491.61501814882 L47014.0 3491.6 " fill="none"></path>
+					<path d="M71902.3 1892.1 L71946.75 1936 L71946.75 2625 L71946.75 2625 L71946.75 3314 L71946.75 3314 L61446.25 3499.572183265422 L61446.3 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48051.6 2763.2 L48046.6 2772.7 L48041.0 2763.5 L48046.0 2754.0 Z"></path>
+						<path d="M71899.4 1881.8 L71902.3 1892.1 L71891.9 1889.4 L71889.0 1879.0 Z"></path>
+					</g>
+					<path d="M69184.3 671.2 L72364 966 L72364 1212.5 L72364 1212.5 L72364 1459 L72364 1459 L72053 1571.5546282245828 L72053.0 1571.6 " fill="none"></path>
+					<path d="M69184.8 665.8 L69184.3 671.2 L69183.8 676.5 L69171.0 669.9 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M67676.2 1256.9 L68086.75 1459 L71357 1674.5612865335452 L71357.0 1674.6 " fill="none"></path>
 					</g>
-					<path d="M48064.0 2772.5 L48144.75 3314 L48544.284852546916 3485 L48544.3 3485.0 " fill="none"></path>
+					<path d="M67678.5 1252.1 L67676.2 1256.9 L67673.8 1261.7 L67664.2 1251.0 Z"></path>
+					<path d="M63462.4 1843.2 L63508.25 1936 L63508.25 2625 L63508.25 2625 L63508.25 3314 L63508.25 3314 L63508.25 3500.5 L63508.25 3500.5 L63508.25 3687 L63508.25 3687 L63508.25 3843.5 L63508.25 3843.5 L63508.25 4000 L63508.25 4000 L61787 4130.290919361672 L61787.0 4130.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48067.9 2762.4 L48064.0 2772.5 L48057.3 2764.0 L48061.2 2754.0 Z"></path>
+						<path d="M63463.0 1832.5 L63462.4 1843.2 L63453.4 1837.2 L63454.1 1826.5 Z"></path>
 					</g>
-					<path d="M24520.4 3437.0 L24533 3432 L24540.5 3432 L24540.5 3432 L24548 3500.5 L24548 3500.5 L24540.5 3569 L24540.5 3569 L24533 3569 L24533 3569 L24503 3557.189655172414 L24503.0 3557.2 " fill="none"></path>
+					<path d="M63486.0 1842.1 L63548.25 1936 L63548.25 2625 L63548.25 2625 L63548.25 3314 L63548.25 3314 L63548.25 3500.5 L63548.25 3500.5 L63548.25 3687 L63548.25 3687 L65717.75 3833.981277056277 L65717.8 3834.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24509.7 3435.4 L24520.4 3437.0 L24513.6 3445.4 L24503.0 3443.8 Z"></path>
+						<path d="M63485.3 1831.3 L63486.0 1842.1 L63476.4 1837.2 L63475.7 1826.5 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M67682.6 1256.5 L68126.75 1459 L63706.25 1681.5882508181146 L63706.3 1681.6 " fill="none"></path>
+					</g>
+					<path d="M67684.8 1251.7 L67682.6 1256.5 L67680.4 1261.4 L67670.5 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M42791.4 1247.5 L43450.25 1459 L63074.25 1693.7203610832498 L63074.3 1693.7 " fill="none"></path>
 					</g>
+					<path d="M42793.1 1242.5 L42791.4 1247.5 L42789.8 1252.6 L42778.8 1243.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3708.8 2648.9 L4532.75 3314 L24215 3499.1454321921697 L24215.0 3499.1 " fill="none"></path>
+						<path d="M51043.1 1269.5 L51191.25 1459 L51191.25 1697.5 L51191.25 1697.5 L51191.25 1936 L51191.25 1936 L51191.25 2625 L51191.25 2625 L51191.25 3314 L51191.25 3314 L52519 3477.8004795766496 L52519.0 3477.8 " fill="none"></path>
 					</g>
-					<path d="M3712.2 2644.7 L3708.8 2648.9 L3705.5 2653.0 L3698.5 2640.5 Z"></path>
-					<path d="M76404.3 165.3 L76404.25 293 L76404.25 614 L76404.3 614.0 " fill="none"></path>
-					<path d="M76409.6 165.3 L76404.3 165.3 L76398.9 165.3 L76404.3 152.0 Z"></path>
-					<path d="M76810.7 202.5 L76711 293 L76711 614 L76711.0 614.0 " fill="none"></path>
+					<path d="M51047.3 1266.2 L51043.1 1269.5 L51038.9 1272.8 L51034.9 1259.0 Z"></path>
+					<path d="M53348.7 1754.9 L51447.25 1936 L51447.25 2625 L51447.25 2625 L51447.25 3314 L51447.25 3314 L31436 3498.8236681482217 L31436.0 3498.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M76821.2 200.2 L76810.7 202.5 L76814.0 192.3 L76824.5 190.0 Z"></path>
+						<path d="M53358.5 1759.3 L53348.7 1754.9 L53357.5 1748.7 L53367.3 1753.1 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M51093.3 1220.4 L53951.25 1459 L53951.25 1568.5 L53951.3 1568.5 " fill="none"></path>
 					</g>
-					<path d="M77040.8 196.7 L77292.75 293 L77292.75 614 L77292.8 614.0 " fill="none"></path>
+					<path d="M51093.7 1215.1 L51093.3 1220.4 L51092.8 1225.7 L51080.0 1219.3 Z"></path>
+					<path d="M53354.0 1759.6 L51659.25 1936 L51659.25 2541 L51659.3 2541.0 " fill="none"></path>
+					<path d="M53354.5 1765.0 L53354.0 1759.6 L53353.4 1754.3 L53367.3 1758.3 Z"></path>
+					<path d="M53354.0 1773.1 L52067.25 1936 L52067.25 2556 L52067.3 2556.0 " fill="none"></path>
+					<path d="M53354.7 1778.4 L53354.0 1773.1 L53353.4 1767.8 L53367.3 1771.4 Z"></path>
+					<path d="M53375.7 1829.5 L52911.25 1936 L52911.25 2556 L52911.3 2556.0 " fill="none"></path>
+					<path d="M53376.9 1834.7 L53375.7 1829.5 L53374.5 1824.3 L53388.7 1826.5 Z"></path>
+					<path d="M54072.5 1836.5 L54159.25 1936 L54159.25 2548.5 L54159.3 2548.5 " fill="none"></path>
+					<path d="M54076.5 1833.0 L54072.5 1836.5 L54068.5 1840.1 L54063.8 1826.5 Z"></path>
+					<path d="M54607.3 2787.7 L54607.25 3314 L21597.75 3500.336297047384 L21597.8 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M77034.0 188.4 L77040.8 196.7 L77030.2 198.3 L77023.4 190.0 Z"></path>
+						<path d="M54612.6 2778.3 L54607.3 2787.7 L54601.9 2778.3 L54607.3 2769.0 Z"></path>
 					</g>
-					<path d="M50038.8 3908.7 L50038.75 4000 L30022.5 4133.519719238859 L30022.5 4133.5 " fill="none"></path>
+					<path d="M54318.6 1831.1 L54607.25 1936 L54607.25 2481 L54607.3 2481.0 " fill="none"></path>
+					<path d="M54320.4 1826.0 L54318.6 1831.1 L54316.8 1836.1 L54306.1 1826.5 Z"></path>
+					<path d="M54991.3 2727.7 L54991.25 3314 L54991.25 3485 L54991.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M50044.1 3899.3 L50038.8 3908.7 L50033.4 3899.3 L50038.8 3890.0 Z"></path>
+						<path d="M54996.6 2718.3 L54991.3 2727.7 L54985.9 2718.3 L54991.3 2709.0 Z"></path>
 					</g>
-					<path d="M12548.9 1724.8 L13446 1936 L17708.25 2601.8029246726746 L17708.3 2601.8 " fill="none"></path>
+					<path d="M54526.8 1829.5 L54991.25 1936 L54991.25 2541 L54991.3 2541.0 " fill="none"></path>
+					<path d="M54528.0 1824.3 L54526.8 1829.5 L54525.6 1834.7 L54513.8 1826.5 Z"></path>
+					<path d="M27933.8 1762.7 L27933.75 1936 L47930 2607.978941849264 L47930.0 2608.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12541.1 1717.5 L12548.9 1724.8 L12538.6 1727.9 L12530.8 1720.6 Z"></path>
+						<path d="M27939.1 1753.3 L27933.8 1762.7 L27928.4 1753.3 L27933.8 1744.0 Z"></path>
 					</g>
-					<path d="M48486.1 2770.4 L48231.25 3314 L47874.35053619303 3485 L47874.4 3485.0 " fill="none"></path>
+					<path d="M29233.1 1228.3 L27933.75 1459 L27933.75 1651 L27933.8 1651.0 " fill="none"></path>
+					<path d="M29234.1 1233.6 L29233.1 1228.3 L29232.2 1223.1 L29246.3 1226.0 Z"></path>
+					<path d="M28325.8 1785.2 L28325.75 1936 L47930 2607.647166316522 L47930.0 2607.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48494.9 2764.2 L48486.1 2770.4 L48485.2 2759.7 L48494.0 2753.5 Z"></path>
+						<path d="M28331.1 1775.8 L28325.8 1785.2 L28320.4 1775.8 L28325.8 1766.5 Z"></path>
 					</g>
-					<path d="M48494.4 2770.8 L48271.25 3314 L51895.75 3499.019638702614 L51895.8 3499.0 " fill="none"></path>
+					<path d="M29246.6 1231.2 L28325.75 1459 L28325.75 1628.5 L28325.8 1628.5 " fill="none"></path>
+					<path d="M29247.9 1236.4 L29246.6 1231.2 L29245.4 1226.0 L29259.6 1228.0 Z"></path>
+					<path d="M31453.4 3422.0 L31466 3417 L31473.5 3417 L31473.5 3417 L31481 3500.5 L31481 3500.5 L31473.5 3584 L31473.5 3584 L31466 3584 L31466 3584 L31436 3572.1560283687945 L31436.0 3572.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48502.9 2764.2 L48494.4 2770.8 L48493.0 2760.1 L48501.5 2753.5 Z"></path>
+						<path d="M31442.7 3420.5 L31453.4 3422.0 L31446.6 3430.4 L31436.0 3428.8 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M3122.9 2651.6 L3561.5 3314 L31073 3499.2776784747048 L31073.0 3499.3 " fill="none"></path>
 					</g>
-					<path d="M48530.8 2771.9 L48444.5 3314 L48209.77613941019 3485 L48209.8 3485.0 " fill="none"></path>
+					<path d="M3127.3 2648.7 L3122.9 2651.6 L3118.4 2654.6 L3115.5 2640.5 Z"></path>
+					<path d="M28717.8 1762.7 L28717.75 1936 L47930 2607.302199683043 L47930.0 2607.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48537.6 2763.6 L48530.8 2771.9 L48527.0 2761.9 L48533.8 2753.5 Z"></path>
+						<path d="M28723.1 1753.3 L28717.8 1762.7 L28712.4 1753.3 L28717.8 1744.0 Z"></path>
 					</g>
-					<path d="M48563.2 2772.1 L48596 3314 L47014 3494.5096359743043 L47014.0 3494.5 " fill="none"></path>
+					<path d="M29271.9 1233.0 L28717.75 1459 L28717.75 1651 L28717.8 1651.0 " fill="none"></path>
+					<path d="M29273.9 1238.0 L29271.9 1233.0 L29269.9 1228.1 L29284.2 1228.0 Z"></path>
+					<path d="M51407.3 1747.2 L51407.25 1936 L48943 2507.5284860725405 L48943.0 2507.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48567.9 2762.5 L48563.2 2772.1 L48557.3 2763.1 L48562.0 2753.5 Z"></path>
+						<path d="M51412.6 1737.8 L51407.3 1747.2 L51401.9 1737.8 L51407.3 1728.5 Z"></path>
 					</g>
-					<path d="M48586.5 2771.7 L48705.75 3314 L48432.74597855228 3485 L48432.7 3485.0 " fill="none"></path>
+					<path d="M29109.8 1762.7 L29109.75 1936 L47930 2606.94323929269 L47930.0 2606.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48589.7 2761.5 L48586.5 2771.7 L48579.3 2763.8 L48582.5 2753.5 Z"></path>
+						<path d="M29115.1 1753.3 L29109.8 1762.7 L29104.4 1753.3 L29109.8 1744.0 Z"></path>
 					</g>
-					<path d="M48897.3 2697.7 L48897.25 3314 L52671 3496.226519515826 L52671.0 3496.2 " fill="none"></path>
+					<path d="M29300.2 1238.1 L29109.75 1459 L29109.75 1651 L29109.8 1651.0 " fill="none"></path>
+					<path d="M29304.2 1241.6 L29300.2 1238.1 L29296.1 1234.6 L29308.9 1228.0 Z"></path>
+					<path d="M29916.8 1762.7 L29916.75 1936 L47930 2606.1564140984624 L47930.0 2606.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48902.6 2688.3 L48897.3 2697.7 L48891.9 2688.3 L48897.3 2679.0 Z"></path>
+						<path d="M29922.1 1753.3 L29916.8 1762.7 L29911.4 1753.3 L29916.8 1744.0 Z"></path>
 					</g>
-					<path d="M49190.3 2704.7 L49190.25 3314 L48057 3491.942433171964 L48057.0 3491.9 " fill="none"></path>
+					<path d="M29371.9 1233.1 L29916.75 1459 L29916.75 1651 L29916.8 1651.0 " fill="none"></path>
+					<path d="M29374.0 1228.2 L29371.9 1233.1 L29369.9 1238.0 L29359.6 1228.0 Z"></path>
+					<path d="M48086.5 3310.6 L48084.75 3314 L31436 3498.488755366082 L31436.0 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49195.6 2695.3 L49190.3 2704.7 L49184.9 2695.3 L49190.3 2686.0 Z"></path>
+						<path d="M48095.5 3304.7 L48086.5 3310.6 L48086.0 3299.9 L48095.0 3294.0 Z"></path>
 					</g>
-					<path d="M49505.6 2696.8 L49375.5 3314 L49375.5 3485 L49375.5 3485.0 " fill="none"></path>
+					<path d="M48126.1 3311.0 L48124.75 3314 L59258.25 3499.5583333333334 L59258.3 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49512.8 2688.7 L49505.6 2696.8 L49502.3 2686.5 L49509.5 2678.5 Z"></path>
+						<path d="M48134.8 3304.7 L48126.1 3311.0 L48125.1 3300.3 L48133.8 3294.0 Z"></path>
 					</g>
-					<path d="M49536.9 2696.7 L49676.25 3314 L57510.5 3497.4788089034 L57510.5 3497.5 " fill="none"></path>
+					<path d="M48407.3 3312.6 L48407.25 3314 L48407.25 3500.5 L48407.25 3500.5 L48407.25 3687 L48407.25 3687 L48407.25 3843.5 L48407.25 3843.5 L48407.25 4000 L48407.25 4000 L61689 4133.507454569322 L61689.0 4133.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49540.1 2686.4 L49536.9 2696.7 L49529.7 2688.8 L49532.8 2678.5 Z"></path>
+						<path d="M48413.0 3303.6 L48407.3 3312.6 L48402.4 3303.1 L48408.1 3294.0 Z"></path>
 					</g>
-					<path d="M57639.5 3550.2 L57639.5 3687 L56283.25 3833.7610198789976 L56283.3 3833.8 " fill="none"></path>
+					<path d="M48447.2 3312.7 L48447.25 3314 L24068.25 3499.9736379253927 L24068.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57644.8 3540.8 L57639.5 3550.2 L57634.2 3540.8 L57639.5 3531.5 Z"></path>
+						<path d="M48452.4 3303.2 L48447.2 3312.7 L48441.8 3303.4 L48446.9 3294.0 Z"></path>
 					</g>
-					<path d="M18447.8 3450.3 L18459.75 3447 L18467.25 3447 L18467.25 3447 L18474.75 3500.5 L18474.75 3500.5 L18467.25 3554 L18467.25 3554 L18459.75 3554 L18459.75 3554 L18429.75 3545.769230769231 L18429.8 3545.8 " fill="none"></path>
+					<path d="M48737.7 3311.1 L48739 3314 L61341.25 3499.7262786700644 L61341.3 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18437.3 3447.6 L18447.8 3450.3 L18440.2 3457.9 L18429.8 3455.2 Z"></path>
+						<path d="M48738.9 3300.4 L48737.7 3311.1 L48729.1 3304.7 L48730.2 3294.0 Z"></path>
 					</g>
+					<path d="M59191.7 1740.8 L59272.75 1936 L48943 2592.7952705040952 L48943.0 2592.8 " fill="none"></path>
+					<path d="M59196.7 1738.8 L59191.7 1740.8 L59186.8 1742.9 L59186.6 1728.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3709.9 2648.6 L4572.75 3314 L18099.75 3498.252519719544 L18099.8 3498.3 " fill="none"></path>
+						<path d="M83198.6 1263.7 L83262 1459 L83262 1697.5 L83262 1697.5 L83262 1936 L83262 1936 L48943 2614.97922499318 L48943.0 2615.0 " fill="none"></path>
 					</g>
-					<path d="M3713.2 2644.4 L3709.9 2648.6 L3706.7 2652.9 L3699.4 2640.5 Z"></path>
-					<path d="M49852.1 2712.2 L49716.25 3314 L39676.25 3499.695443050528 L39676.3 3499.7 " fill="none"></path>
+					<path d="M83203.7 1262.0 L83198.6 1263.7 L83193.5 1265.3 L83194.5 1251.0 Z"></path>
+					<path d="M56280.5 1754.7 L56280.5 1936 L48943 2580.510135135135 L48943.0 2580.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49859.3 2704.3 L49852.1 2712.2 L49848.9 2701.9 L49856.2 2694.0 Z"></path>
+						<path d="M56285.8 1745.3 L56280.5 1754.7 L56275.2 1745.3 L56280.5 1736.0 Z"></path>
 					</g>
-					<path d="M49874.3 2712.7 L49891.75 3314 L49891.75 3500.5 L49891.75 3500.5 L49891.75 3687 L49891.75 3687 L49891.75 3843.5 L49891.75 3843.5 L49891.75 4000 L49891.75 4000 L30022.5 4133.516178775152 L30022.5 4133.5 " fill="none"></path>
+					<path d="M55967.6 1796.9 L56062.25 1936 L56062.25 2609.5 L56062.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49879.4 2703.2 L49874.3 2712.7 L49868.7 2703.5 L49873.8 2694.0 Z"></path>
+						<path d="M55966.8 1786.2 L55967.6 1796.9 L55958.0 1792.2 L55957.1 1781.5 Z"></path>
 					</g>
-					<path d="M50647.3 2719.4 L50543.75 3314 L51995.18699731903 3485 L51995.2 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M50654.2 2711.1 L50647.3 2719.4 L50643.7 2709.3 L50650.5 2701.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M51093.3 1217.3 L55900 1459 L55900 1613.5 L55900.0 1613.5 " fill="none"></path>
 					</g>
-					<path d="M50652.8 2719.5 L50583.75 3314 L48625 3496.3571072007985 L48625.0 3496.4 " fill="none"></path>
+					<path d="M51093.6 1211.9 L51093.3 1217.3 L51093.0 1222.6 L51080.0 1216.6 Z"></path>
+					<path d="M82676.8 1285.2 L82676.75 1459 L82676.75 1546 L82676.8 1546.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M50659.1 2710.9 L50652.8 2719.5 L50648.6 2709.7 L50654.9 2701.0 Z"></path>
+						<path d="M82682.1 1275.8 L82676.8 1285.2 L82671.4 1275.8 L82676.8 1266.5 Z"></path>
 					</g>
-					<path d="M50658.3 2719.6 L50623.75 3314 L39963.25 3499.881006918474 L39963.3 3499.9 " fill="none"></path>
+					<path d="M82279.7 170.1 L82676.75 293 L82676.75 629.5 L82676.75 629.5 L82676.75 966 L82676.75 966 L82676.75 1158.5 L82676.8 1158.5 " fill="none"></path>
+					<path d="M82281.3 165.1 L82279.7 170.1 L82278.2 175.2 L82267.0 166.2 Z"></path>
+					<path d="M82413.0 1847.2 L82256.5 1936 L82256.5 2625 L82256.5 2625 L82256.5 3314 L82256.5 3314 L59371.25 3500.0406954569726 L59371.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M50664.1 2710.6 L50658.3 2719.6 L50653.5 2710.0 L50659.3 2701.0 Z"></path>
+						<path d="M82423.8 1847.2 L82413.0 1847.2 L82418.5 1837.9 L82429.3 1838.0 Z"></path>
 					</g>
-					<path d="M50681.5 2719.3 L50793.25 3314 L39055 3499.410118782951 L39055.0 3499.4 " fill="none"></path>
+					<path d="M82705.2 1867.4 L82716.75 1936 L82716.75 2625 L82716.75 2625 L82716.75 3314 L82716.75 3314 L72068.25 3499.0230819397216 L72068.3 3499.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M50685.0 2709.2 L50681.5 2719.3 L50674.5 2711.2 L50678.0 2701.0 Z"></path>
+						<path d="M82709.0 1857.3 L82705.2 1867.4 L82698.4 1859.1 L82702.2 1849.0 Z"></path>
 					</g>
-					<path d="M50686.9 2719.1 L50833.25 3314 L41967.75 3496.6877796806807 L41967.8 3496.7 " fill="none"></path>
+					<path d="M33720.3 1702.4 L38285.25 1936 L36372.60921625544 2594 L36372.6 2594.0 " fill="none"></path>
+					<path d="M33720.6 1697.1 L33720.3 1702.4 L33720.0 1707.7 L33707.0 1701.7 Z"></path>
+					<path d="M45657.5 3923.2 L45657.5 4000 L18421.25 4133.646700173024 L18421.3 4133.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M50689.9 2708.8 L50686.9 2719.1 L50679.5 2711.3 L50682.4 2701.0 Z"></path>
+						<path d="M45662.8 3913.8 L45657.5 3923.2 L45652.2 3913.8 L45657.5 3904.5 Z"></path>
 					</g>
-					<path d="M51054.1 2719.4 L50873.25 3314 L39963.25 3499.8951167146315 L39963.3 3499.9 " fill="none"></path>
+					<path d="M57045.0 2674.7 L57045 3314 L25100 3499.639937057925 L25100.0 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51061.9 2712.0 L51054.1 2719.4 L51051.7 2708.9 L51059.5 2701.5 Z"></path>
+						<path d="M57050.3 2665.3 L57045.0 2674.7 L57039.7 2665.3 L57045.0 2656.0 Z"></path>
 					</g>
-					<path d="M51059.5 2719.6 L50913.25 3314 L41967.75 3496.7211817534635 L41967.8 3496.7 " fill="none"></path>
+					<path d="M57345.5 2697.7 L57345.5 3314 L21499.75 3500.3154816234105 L21499.8 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51066.9 2711.8 L51059.5 2719.6 L51056.5 2709.3 L51063.9 2701.5 Z"></path>
+						<path d="M57350.8 2688.3 L57345.5 2697.7 L57340.2 2688.3 L57345.5 2679.0 Z"></path>
 					</g>
-					<path d="M51103.3 2719.7 L51232.5 3314 L48625 3497.3705693815987 L48625.0 3497.4 " fill="none"></path>
+					<path d="M70185.6 2827.8 L69742.25 3314 L72645 3492.770866011723 L72645.0 3492.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51106.6 2709.5 L51103.3 2719.7 L51096.1 2711.8 L51099.4 2701.5 Z"></path>
+						<path d="M70195.8 2824.5 L70185.6 2827.8 L70187.9 2817.3 L70198.2 2814.0 Z"></path>
 					</g>
-					<path d="M51422.3 2720.2 L51422.25 3314 L48625 3497.579528459576 L48625.0 3497.6 " fill="none"></path>
+					<path d="M70197.0 2828.2 L69782.25 3314 L69782.25 3500.5 L69782.25 3500.5 L69782.25 3687 L69782.25 3687 L69782.25 3843.5 L69782.25 3843.5 L69782.25 4000 L69782.25 4000 L72971.75 4128.077015283188 L72971.8 4128.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51427.6 2710.8 L51422.3 2720.2 L51416.9 2710.8 L51422.3 2701.5 Z"></path>
+						<path d="M70207.1 2824.6 L70197.0 2828.2 L70199.0 2817.6 L70209.1 2814.0 Z"></path>
 					</g>
-					<path d="M51689.8 2712.4 L51583.75 3314 L48625 3497.736577041538 L48625.0 3497.7 " fill="none"></path>
+					<path d="M70352.4 2832.6 L70310.5 3314 L70310.5 3439 L70310.5 3439.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51696.7 2704.1 L51689.8 2712.4 L51686.2 2702.3 L51693.1 2694.0 Z"></path>
+						<path d="M70358.5 2823.8 L70352.4 2832.6 L70347.9 2822.8 L70354.0 2814.0 Z"></path>
 					</g>
-					<path d="M51724.7 2712.2 L51859.25 3314 L41967.75 3497.0759440281845 L41967.8 3497.1 " fill="none"></path>
+					<path d="M70503.2 2829.7 L70817.25 3314 L64120.25 3499.227717633101 L64120.3 3499.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51727.9 2701.9 L51724.7 2712.2 L51717.5 2704.3 L51720.7 2694.0 Z"></path>
+						<path d="M70502.6 2818.9 L70503.2 2829.7 L70493.7 2824.7 L70493.0 2814.0 Z"></path>
 					</g>
-					<path d="M41985.9 3450.0 L41997.75 3447 L42005.25 3447 L42005.25 3447 L42012.75 3500.5 L42012.75 3500.5 L42005.25 3554 L42005.25 3554 L41997.75 3554 L41997.75 3554 L41967.75 3546.5348837209303 L41967.8 3546.5 " fill="none"></path>
+					<path d="M70514.8 2829.2 L70857.25 3314 L71898.25 3486.4214031971583 L71898.3 3486.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41975.5 3447.0 L41985.9 3450.0 L41978.1 3457.4 L41967.8 3454.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3711.0 2648.4 L4612.75 3314 L41597.75 3499.5717648641375 L41597.8 3499.6 " fill="none"></path>
+						<path d="M70513.8 2818.5 L70514.8 2829.2 L70505.1 2824.7 L70504.0 2814.0 Z"></path>
 					</g>
-					<path d="M3714.1 2644.1 L3711.0 2648.4 L3707.8 2652.7 L3700.3 2640.5 Z"></path>
-					<path d="M52730.4 3860.2 L50991.25 4000 L30022.5 4133.541461212171 L30022.5 4133.5 " fill="none"></path>
+					<path d="M70526.3 2828.8 L70897.25 3314 L36328.5 3499.8066265103644 L36328.5 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M52740.1 3864.8 L52730.4 3860.2 L52739.3 3854.2 L52749.0 3858.7 Z"></path>
+						<path d="M70524.9 2818.2 L70526.3 2828.8 L70516.4 2824.7 L70515.0 2814.0 Z"></path>
 					</g>
-					<path d="M52730.4 3860.6 L51031.25 4000 L54830 4129.040496862919 L54830.0 4129.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M52740.1 3865.1 L52730.4 3860.6 L52739.3 3854.5 L52749.0 3859.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M83607.3 173.1 L83346.75 293 L83346.75 629.5 L83346.75 629.5 L83346.75 966 L83346.75 966 L83346.75 1212.5 L83346.75 1212.5 L83346.75 1459 L83346.75 1459 L83346.75 1697.5 L83346.75 1697.5 L83346.75 1936 L83346.75 1936 L70677.5 2608.69921972835 L70677.5 2608.7 " fill="none"></path>
 					</g>
-					<path d="M52938.5 3945.7 L52938.5 4000 L55162 4125.87621461766 L55162.0 4125.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M52943.8 3936.3 L52938.5 3945.7 L52933.2 3936.3 L52938.5 3927.0 Z"></path>
+					<path d="M83609.5 177.9 L83607.3 173.1 L83605.1 168.2 L83619.4 167.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3124.2 2651.3 L3601.5 3314 L24804 3499.207196552774 L24804.0 3499.2 " fill="none"></path>
 					</g>
-					<path d="M53035.5 3940.2 L53095.5 4000 L55489 4126.745307251531 L55489.0 4126.7 " fill="none"></path>
+					<path d="M3128.5 2648.2 L3124.2 2651.3 L3119.9 2654.4 L3116.4 2640.5 Z"></path>
+					<path d="M56565.2 1832.8 L56369.5 1936 L56369.5 2609.5 L56369.5 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53032.6 3929.8 L53035.5 3940.2 L53025.1 3937.4 L53022.3 3927.0 Z"></path>
+						<path d="M56576.0 1833.1 L56565.2 1832.8 L56571.0 1823.7 L56581.8 1824.1 Z"></path>
 					</g>
-					<path d="M53058.2 3938.6 L53135.5 4000 L58547 4131.807870580751 L58547.0 4131.8 " fill="none"></path>
+					<path d="M56731.5 1857.8 L56687.5 1936 L56687.5 2609.5 L56687.5 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53054.2 3928.6 L53058.2 3938.6 L53047.6 3937.0 L53043.6 3927.0 Z"></path>
+						<path d="M56740.8 1852.2 L56731.5 1857.8 L56731.5 1847.0 L56740.7 1841.5 Z"></path>
 					</g>
-					<path d="M52066.7 2719.5 L51899.25 3314 L39055 3499.503465432792 L39055.0 3499.5 " fill="none"></path>
+					<path d="M56885.5 1858.9 L56916 1936 L56916 2625 L56916 2625 L56916 3314 L56916 3314 L21499.75 3500.313246172615 L21499.8 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M52074.3 2711.9 L52066.7 2719.5 L52064.0 2709.0 L52071.7 2701.5 Z"></path>
+						<path d="M56887.0 1848.2 L56885.5 1858.9 L56877.1 1852.1 L56878.7 1841.5 Z"></path>
 					</g>
-					<path d="M52072.1 2719.7 L51939.25 3314 L48625 3498.0290658727204 L48625.0 3498.0 " fill="none"></path>
+					<path d="M57079.1 1798.4 L57430.25 1936 L70063.5 2608.6538706748324 L70063.5 2608.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M52079.3 2711.8 L52072.1 2719.7 L52068.9 2709.4 L52076.2 2701.5 Z"></path>
+						<path d="M57072.4 1790.0 L57079.1 1798.4 L57068.5 1799.9 L57061.8 1791.6 Z"></path>
 					</g>
-					<path d="M52119.5 2719.5 L52284.75 3314 L53881.972520107236 3485 L53882.0 3485.0 " fill="none"></path>
+					<path d="M2855.7 3401.2 L2869 3394.5 L2876.5 3394.5 L2876.5 3394.5 L2884 3500.5 L2884 3500.5 L2876.5 3606.5 L2876.5 3606.5 L2869 3606.5 L2869 3606.5 L2839 3591.393111638955 L2839.0 3591.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M52122.2 2709.1 L52119.5 2719.5 L52111.9 2711.9 L52114.5 2701.5 Z"></path>
+						<path d="M2844.9 3400.6 L2855.7 3401.2 L2849.7 3410.2 L2839.0 3409.6 Z"></path>
 					</g>
-					<path d="M52518.0 2741.7 L52325.25 3314 L53674.75 3491.553262786596 L53674.8 3491.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M52526.0 2734.5 L52518.0 2741.7 L52515.9 2731.1 L52523.9 2724.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3125.5 2651.0 L3641.5 3314 L2839 3466.254577822991 L2839.0 3466.3 " fill="none"></path>
 					</g>
-					<path d="M52524.7 2742.0 L52365.25 3314 L39963.25 3499.96767839196 L39963.3 3500.0 " fill="none"></path>
+					<path d="M3129.7 2647.7 L3125.5 2651.0 L3121.3 2654.3 L3117.3 2640.5 Z"></path>
+					<path d="M60125.4 2739.3 L59764 3314 L64938 3499.4070515899703 L64938.0 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M52532.3 2734.4 L52524.7 2742.0 L52522.0 2731.6 L52529.7 2724.0 Z"></path>
+						<path d="M60134.9 2734.2 L60125.4 2739.3 L60125.8 2728.6 L60135.3 2723.5 Z"></path>
 					</g>
-					<path d="M52583.9 2742.2 L52713.75 3314 L47014 3498.7978399756616 L47014.0 3498.8 " fill="none"></path>
+					<path d="M60153.4 2741.0 L59936.75 3314 L59561.74195710456 3485 L59561.7 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M52587.0 2731.9 L52583.9 2742.2 L52576.6 2734.3 L52579.7 2724.0 Z"></path>
+						<path d="M60161.7 2734.1 L60153.4 2741.0 L60151.7 2730.3 L60160.0 2723.5 Z"></path>
 					</g>
-					<path d="M6239.2 3435.4 L6251.25 3432 L6258.75 3432 L6258.75 3432 L6266.25 3500.5 L6266.25 3500.5 L6258.75 3569 L6258.75 3569 L6251.25 3569 L6251.25 3569 L6221.25 3560.543209876543 L6221.3 3560.5 " fill="none"></path>
+					<path d="M60266.0 2739.5 L60610.75 3314 L60095.457774798924 3485 L60095.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6228.8 3432.8 L6239.2 3435.4 L6231.7 3443.1 L6221.3 3440.5 Z"></path>
+						<path d="M60265.7 2728.8 L60266.0 2739.5 L60256.6 2734.2 L60256.4 2723.5 Z"></path>
 					</g>
+					<path d="M29411.6 1214.7 L39254 1459 L39254 1666.5 L39254.0 1666.5 " fill="none"></path>
+					<path d="M29411.7 1209.4 L29411.6 1214.7 L29411.4 1220.0 L29398.3 1214.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3712.0 2648.2 L4652.75 3314 L5795.25 3471.193839911472 L5795.3 3471.2 " fill="none"></path>
+						<path d="M83550.1 1434.5 L83512.25 1459 L82099 1677.0560407569142 L82099.0 1677.1 " fill="none"></path>
 					</g>
-					<path d="M3715.1 2643.8 L3712.0 2648.2 L3709.0 2652.6 L3701.2 2640.5 Z"></path>
-					<path d="M53062.9 2801.9 L52973.75 3314 L54395.75 3492.3476798924007 L54395.8 3492.3 " fill="none"></path>
+					<path d="M83553.0 1438.9 L83550.1 1434.5 L83547.2 1430.0 L83561.3 1427.2 Z"></path>
+					<path d="M82932.8 2749.8 L82817.5 3314 L82817.5 3500.5 L82817.5 3500.5 L82817.5 3687 L82817.5 3687 L82817.5 3843.5 L82817.5 3843.5 L82817.5 4000 L82817.5 4000 L83411.5 4122.738627602159 L83411.5 4122.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53069.8 2793.6 L53062.9 2801.9 L53059.3 2791.8 L53066.1 2783.5 Z"></path>
+						<path d="M82939.9 2741.7 L82932.8 2749.8 L82929.4 2739.6 L82936.5 2731.5 Z"></path>
 					</g>
-					<path d="M53073.2 2802.0 L53013.75 3314 L47014 3498.882213226486 L47014.0 3498.9 " fill="none"></path>
+					<path d="M82940.0 2750.0 L82857.5 3314 L82857.5 3500.5 L82857.5 3500.5 L82857.5 3687 L82857.5 3687 L82857.5 3843.5 L82857.5 3843.5 L82857.5 4000 L82857.5 4000 L77468.25 4130.950541728999 L77468.3 4131.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53079.6 2793.4 L53073.2 2802.0 L53069.0 2792.2 L53075.3 2783.5 Z"></path>
+						<path d="M82946.6 2741.5 L82940.0 2750.0 L82936.0 2740.0 L82942.7 2731.5 Z"></path>
 					</g>
-					<path d="M53083.5 2802.1 L53053.75 3314 L39963.25 3499.9956003352127 L39963.3 3500.0 " fill="none"></path>
+					<path d="M82947.2 2750.1 L82897.5 3314 L82897.5 3500.5 L82897.5 3500.5 L82897.5 3687 L82897.5 3687 L82897.5 3843.5 L82897.5 3843.5 L82897.5 4000 L82897.5 4000 L73266.75 4131.978677166159 L73266.8 4132.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53089.3 2793.1 L53083.5 2802.1 L53078.7 2792.5 L53084.5 2783.5 Z"></path>
+						<path d="M82953.4 2741.3 L82947.2 2750.1 L82942.7 2740.3 L82948.9 2731.5 Z"></path>
 					</g>
-					<path d="M53117.8 2802.0 L53187.5 3314 L53696.603217158176 3485 L53696.6 3485.0 " fill="none"></path>
+					<path d="M82965.5 2750.1 L82998.25 3314 L72896 3498.2115445723643 L72896.0 3498.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53121.9 2792.0 L53117.8 2802.0 L53111.3 2793.5 L53115.3 2783.5 Z"></path>
+						<path d="M82970.3 2740.5 L82965.5 2750.1 L82959.6 2741.1 L82964.4 2731.5 Z"></path>
 					</g>
-					<path d="M53128.1 2801.8 L53227.5 3314 L51953.75 3496.3483976204184 L51953.8 3496.3 " fill="none"></path>
+					<path d="M82976.5 2750.0 L83059 3314 L64999 3500.185567010309 L64999.0 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53131.5 2791.6 L53128.1 2801.8 L53121.1 2793.7 L53124.5 2783.5 Z"></path>
+						<path d="M82980.5 2740.0 L82976.5 2750.0 L82969.9 2741.5 L82973.8 2731.5 Z"></path>
 					</g>
-					<path d="M53402.3 2779.6 L53267.5 3314 L39963.25 3500.0036826027476 L39963.3 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M53409.7 2771.9 L53402.3 2779.6 L53399.4 2769.2 L53406.8 2761.5 Z"></path>
+					<path d="M83569.0 1446.8 L83552.25 1459 L83552.25 1697.5 L83552.25 1697.5 L83552.25 1936 L83552.25 1936 L83050.06567489114 2518.5 L83050.1 2518.5 " fill="none"></path>
+					<path d="M83572.2 1451.1 L83569.0 1446.8 L83565.9 1442.5 L83579.8 1439.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M81966.5 1741.8 L81966.5 1936 L82804.95337445573 2518.5 L82805.0 2518.5 " fill="none"></path>
 					</g>
-					<path d="M53411.2 2779.8 L53307.5 3314 L51953.75 3496.5885915747604 L51953.8 3496.6 " fill="none"></path>
+					<path d="M81971.8 1741.8 L81966.5 1741.8 L81961.2 1741.8 L81966.5 1728.5 Z"></path>
+					<path d="M83804.6 2750.0 L83727 3314 L64999 3500.1967641335928 L64999.0 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53418.2 2771.7 L53411.2 2779.8 L53407.7 2769.6 L53414.8 2761.5 Z"></path>
+						<path d="M83811.1 2741.5 L83804.6 2750.0 L83800.5 2740.0 L83807.1 2731.5 Z"></path>
 					</g>
-					<path d="M53467.4 2779.9 L53557.5 3314 L47014 3499.0155776228016 L47014.0 3499.0 " fill="none"></path>
+					<path d="M83811.8 2750.1 L83767 3314 L83767 3500.5 L83767 3500.5 L83767 3687 L83767 3687 L83767 3843.5 L83767 3843.5 L83767 4000 L83767 4000 L77468.25 4131.382262520917 L77468.3 4131.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53471.1 2769.8 L53467.4 2779.9 L53460.6 2771.6 L53464.3 2761.5 Z"></path>
+						<path d="M83817.9 2741.2 L83811.8 2750.1 L83807.2 2740.4 L83813.3 2731.5 Z"></path>
 					</g>
-					<path d="M60962.0 717.2 L60962 966 L60962 1197 L60962.0 1197.0 " fill="none"></path>
+					<path d="M83835.3 2750.1 L83896.5 3314 L72896 3498.396301456049 L72896.0 3498.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60967.3 707.8 L60962.0 717.2 L60956.7 707.8 L60962.0 698.5 Z"></path>
+						<path d="M83839.6 2740.2 L83835.3 2750.1 L83829.0 2741.4 L83833.3 2731.5 Z"></path>
 					</g>
-					<path d="M60962.0 165.3 L60962 293 L60962 560.5 L60962.0 560.5 " fill="none"></path>
-					<path d="M60967.3 165.3 L60962.0 165.3 L60956.7 165.3 L60962.0 152.0 Z"></path>
-					<path d="M53729.0 2734.2 L53597.5 3314 L39963.25 3500.015664148942 L39963.3 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M53736.3 2726.3 L53729.0 2734.2 L53725.8 2723.9 L53733.1 2716.0 Z"></path>
+					<path d="M83881.4 1785.9 L83821.75 1936 L83821.75 2518.5 L83821.8 2518.5 " fill="none"></path>
+					<path d="M83886.3 1787.9 L83881.4 1785.9 L83876.4 1783.9 L83886.3 1773.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M83606.3 1447.5 L83592.25 1459 L83592.25 1697.5 L83592.25 1697.5 L83592.25 1936 L83592.25 1936 L83592.25 2625 L83592.25 2625 L83592.25 3314 L83592.25 3314 L72896 3498.3371566521128 L72896.0 3498.3 " fill="none"></path>
 					</g>
-					<path d="M53735.3 2734.4 L53637.5 3314 L36245.5 3498.9368835167343 L36245.5 3498.9 " fill="none"></path>
+					<path d="M83609.7 1451.6 L83606.3 1447.5 L83602.9 1443.3 L83616.6 1439.0 Z"></path>
+					<path d="M72585.4 3943.9 L72482 4000 L77217.25 4130.540245846834 L77217.3 4130.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53742.1 2726.1 L53735.3 2734.4 L53731.6 2724.3 L53738.4 2716.0 Z"></path>
+						<path d="M72596.2 3944.1 L72585.4 3943.9 L72591.1 3934.8 L72601.8 3935.0 Z"></path>
 					</g>
-					<path d="M53756.8 2734.7 L53773 3314 L47014 3499.0625412904647 L47014.0 3499.1 " fill="none"></path>
+					<path d="M72609.4 3944.9 L72522 4000 L72971.75 4100.9066555043955 L72971.8 4100.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53761.9 2725.2 L53756.8 2734.7 L53751.2 2725.5 L53756.3 2716.0 Z"></path>
+						<path d="M72620.2 3944.5 L72609.4 3944.9 L72614.5 3935.5 L72625.2 3935.0 Z"></path>
 					</g>
-					<path d="M53775.2 2734.3 L53889.25 3314 L52848 3485.890351847754 L52848.0 3485.9 " fill="none"></path>
+					<path d="M72990.7 3850.3 L77841.5 4000 L83411.5 4132.701573473198 L83411.5 4132.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53778.7 2724.1 L53775.2 2734.3 L53768.2 2726.2 L53771.6 2716.0 Z"></path>
+						<path d="M72981.5 3844.7 L72990.7 3850.3 L72981.2 3855.3 L72972.0 3849.7 Z"></path>
 					</g>
-					<path d="M36263.1 3443.8 L36275.5 3439.5 L36283 3439.5 L36283 3439.5 L36290.5 3500.5 L36290.5 3500.5 L36283 3561.5 L36283 3561.5 L36275.5 3561.5 L36275.5 3561.5 L36245.5 3551.1610169491523 L36245.5 3551.2 " fill="none"></path>
+					<path d="M72990.7 3850.1 L77958.75 4000 L18421.25 4133.838146604148 L18421.3 4133.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36252.6 3441.8 L36263.1 3443.8 L36256.1 3451.8 L36245.5 3449.8 Z"></path>
+						<path d="M72981.5 3844.5 L72990.7 3850.1 L72981.2 3855.2 L72972.0 3849.6 Z"></path>
 					</g>
+					<path d="M83643.7 1448.2 L83632.25 1459 L83632.25 1697.5 L83632.25 1697.5 L83632.25 1936 L83632.25 1936 L83632.25 2625 L83632.25 2625 L83632.25 3314 L83632.25 3314 L83632.25 3500.5 L83632.25 3500.5 L83632.25 3687 L83632.25 3687 L72972 3840.5967155384724 L72972.0 3840.6 " fill="none"></path>
+					<path d="M83647.3 1452.0 L83643.7 1448.2 L83640.0 1444.3 L83653.3 1439.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3713.1 2648.0 L4692.75 3314 L35951.5 3499.6270547590807 L35951.5 3499.6 " fill="none"></path>
-					</g>
-					<path d="M3716.1 2643.6 L3713.1 2648.0 L3710.1 2652.4 L3702.1 2640.5 Z"></path>
-					<path d="M54067.3 2772.1 L53929.25 3314 L51953.75 3497.8018209029683 L51953.8 3497.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M54074.8 2764.4 L54067.3 2772.1 L54064.4 2761.7 L54071.9 2754.0 Z"></path>
+						<path d="M72770.5 3552.3 L72770.5 3687 L72770.5 3752 L72770.5 3752.0 " fill="none"></path>
 					</g>
-					<path d="M54075.8 2772.3 L53969.25 3314 L55046.5 3496.3527342863626 L55046.5 3496.4 " fill="none"></path>
+					<path d="M72775.8 3552.3 L72770.5 3552.3 L72765.2 3552.3 L72770.5 3539.0 Z"></path>
+					<path d="M83917.4 3956.9 L83881.75 4000 L77468.25 4131.428200030586 L77468.3 4131.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54082.8 2764.2 L54075.8 2772.3 L54072.3 2762.1 L54079.4 2754.0 Z"></path>
+						<path d="M83927.5 3953.1 L83917.4 3956.9 L83919.3 3946.3 L83929.3 3942.5 Z"></path>
 					</g>
-					<path d="M54121.0 2772.6 L54180.5 3314 L55135.89946380697 3485 L55135.9 3485.0 " fill="none"></path>
+					<path d="M84063.5 3959.5 L84081.75 4000 L73266.75 4132.197035347776 L73266.8 4132.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54125.3 2762.7 L54121.0 2772.6 L54114.7 2763.9 L54118.9 2754.0 Z"></path>
+						<path d="M84064.5 3948.8 L84063.5 3959.5 L84054.8 3953.2 L84055.8 3942.5 Z"></path>
 					</g>
-					<path d="M53292.5 3916.2 L53292.5 4000 L30022.5 4133.5866678091 L30022.5 4133.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M53297.8 3906.8 L53292.5 3916.2 L53287.2 3906.8 L53292.5 3897.5 Z"></path>
+					<path d="M83951.6 1785.9 L84011.25 1936 L84011.25 2625 L84011.25 2625 L84011.25 3314 L84011.25 3314 L84011.25 3500.5 L84011.25 3500.5 L84011.25 3687 L84011.25 3687 L84011.25 3744.5 L84011.3 3744.5 " fill="none"></path>
+					<path d="M83956.6 1783.9 L83951.6 1785.9 L83946.7 1787.9 L83946.7 1773.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M75563.6 148.6 L76277.25 293 L76277.25 614 L76277.3 614.0 " fill="none"></path>
+					</g>
+					<path d="M75564.6 143.4 L75563.6 148.6 L75562.5 153.9 L75550.5 146.0 Z"></path>
+					<path d="M76203.6 640.3 L73986.5 966 L73986.5 1197 L73986.5 1197.0 " fill="none"></path>
+					<path d="M76204.3 645.6 L76203.6 640.3 L76202.8 635.0 L76216.8 638.4 Z"></path>
+					<path d="M76203.6 641.9 L74274 966 L74274 1197 L74274.0 1197.0 " fill="none"></path>
+					<path d="M76204.5 647.1 L76203.6 641.9 L76202.7 636.6 L76216.8 639.7 Z"></path>
+					<path d="M76203.7 644.0 L74574.5 966 L74574.5 1197 L74574.5 1197.0 " fill="none"></path>
+					<path d="M76204.7 649.3 L76203.7 644.0 L76202.6 638.8 L76216.8 641.5 Z"></path>
+					<path d="M76203.8 647.1 L74871 966 L74871 1197 L74871.0 1197.0 " fill="none"></path>
+					<path d="M76205.0 652.3 L76203.8 647.1 L76202.5 641.9 L76216.8 644.0 Z"></path>
+					<path d="M76213.9 648.9 L75179 966 L75179 1197 L75179.0 1197.0 " fill="none"></path>
+					<path d="M76215.5 654.0 L76213.9 648.9 L76212.4 643.8 L76226.7 645.0 Z"></path>
+					<path d="M76270.2 657.9 L76194 966 L76194 1197 L76194.0 1197.0 " fill="none"></path>
+					<path d="M76275.4 659.2 L76270.2 657.9 L76265.0 656.7 L76273.4 645.0 Z"></path>
+					<path d="M76294.7 656.2 L76497.5 966 L76497.5 1197 L76497.5 1197.0 " fill="none"></path>
+					<path d="M76299.2 653.2 L76294.7 656.2 L76290.2 659.1 L76287.4 645.0 Z"></path>
+					<path d="M76312.1 652.3 L76791 966 L76791 1197 L76791.0 1197.0 " fill="none"></path>
+					<path d="M76315.0 647.8 L76312.1 652.3 L76309.1 656.8 L76300.9 645.0 Z"></path>
+					<path d="M76327.6 650.0 L77102 966 L77102 1197 L77102.0 1197.0 " fill="none"></path>
+					<path d="M76329.6 645.1 L76327.6 650.0 L76325.6 655.0 L76315.2 645.0 Z"></path>
+					<path d="M76340.6 648.9 L77375.5 966 L77375.5 1197 L77375.5 1197.0 " fill="none"></path>
+					<path d="M76342.1 643.8 L76340.6 648.9 L76339.0 654.0 L76327.8 645.0 Z"></path>
+					<path d="M77164.8 4639.7 L77164.75 4641 L76981.75 4666.627218934911 L76981.8 4666.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M77170.1 4630.3 L77164.8 4639.7 L77159.4 4630.3 L77164.8 4621.0 Z"></path>
+					</g>
+					<path d="M76644.0 4174.7 L76556.25 4268 L76925.25 4381.095316351684 L76925.3 4381.1 " fill="none"></path>
+					<path d="M76647.9 4178.4 L76644.0 4174.7 L76640.1 4171.1 L76653.1 4165.0 Z"></path>
+					<path d="M76986.8 4215.8 L76986.75 4268 L77005.83847184987 4288 L77005.8 4288.0 " fill="none"></path>
+					<path d="M76992.1 4215.8 L76986.8 4215.8 L76981.4 4215.8 L76986.8 4202.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M77342.8 4253.3 L77342.75 4268 L77323.66152815013 4288 L77323.7 4288.0 " fill="none"></path>
 					</g>
-					<path d="M54674.0 2712.2 L54674 3314 L39963.25 3500.0510214461306 L39963.3 3500.1 " fill="none"></path>
+					<path d="M77348.1 4253.3 L77342.8 4253.3 L77337.4 4253.3 L77342.8 4240.0 Z"></path>
+					<path d="M59799.3 3916.2 L59799.25 4000 L77217.25 4133.041411348932 L77217.3 4133.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54679.3 2702.8 L54674.0 2712.2 L54668.7 2702.8 L54674.0 2693.5 Z"></path>
+						<path d="M59804.6 3906.8 L59799.3 3916.2 L59793.9 3906.8 L59799.3 3897.5 Z"></path>
 					</g>
-					<path d="M55305.7 2738.5 L54843 3314 L48057 3499.0141071559096 L48057.0 3499.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M55315.7 2734.6 L55305.7 2738.5 L55307.4 2727.9 L55317.4 2724.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M59799.3 3552.3 L59799.25 3687 L59799.25 3789.5 L59799.3 3789.5 " fill="none"></path>
 					</g>
-					<path d="M55312.0 2739.0 L54883 3314 L30799.5 3499.859464548031 L30799.5 3499.9 " fill="none"></path>
+					<path d="M59804.6 3552.3 L59799.3 3552.3 L59793.9 3552.3 L59799.3 3539.0 Z"></path>
+					<path d="M70172.6 3570.4 L69942.75 3687 L69942.75 3843.5 L69942.75 3843.5 L69942.75 4000 L69942.75 4000 L76390.25 4132.866589773164 L76390.3 4132.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55321.8 2734.7 L55312.0 2739.0 L55313.3 2728.3 L55323.1 2724.0 Z"></path>
+						<path d="M70183.3 3571.0 L70172.6 3570.4 L70178.5 3561.5 L70189.2 3562.0 Z"></path>
 					</g>
-					<path d="M55382.2 2742.5 L55310.5 3314 L56265.89946380697 3485 L56265.9 3485.0 " fill="none"></path>
+					<path d="M70628.6 3910.8 L70419 4000 L77217.25 4131.57111391948 L77217.3 4131.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55388.7 2733.9 L55382.2 2742.5 L55378.1 2732.6 L55384.6 2724.0 Z"></path>
+						<path d="M70639.3 3912.1 L70628.6 3910.8 L70635.1 3902.3 L70645.8 3903.5 Z"></path>
 					</g>
-					<path d="M55430.9 2741.9 L55596.5 3314 L56555.5 3485.64443378119 L56555.5 3485.6 " fill="none"></path>
+					<path d="M70628.9 3918.9 L70459 4000 L72971.75 4126.570247157222 L72971.8 4126.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55433.4 2731.5 L55430.9 2741.9 L55423.1 2734.4 L55425.7 2724.0 Z"></path>
+						<path d="M70639.6 3919.7 L70628.9 3918.9 L70635.0 3910.0 L70645.8 3910.8 Z"></path>
 					</g>
-					<path d="M77970.0 156.8 L77613.75 293 L77613.75 591 L77613.8 591.0 " fill="none"></path>
-					<path d="M77971.9 161.7 L77970.0 156.8 L77968.1 151.8 L77982.5 152.0 Z"></path>
-					<path d="M78047.1 161.6 L78173 293 L78173 591 L78173.0 591.0 " fill="none"></path>
-					<path d="M78050.9 157.9 L78047.1 161.6 L78043.2 165.3 L78037.9 152.0 Z"></path>
-					<path d="M55836.0 2704.7 L55836 3314 L64687 3499.859539492203 L64687.0 3499.9 " fill="none"></path>
+					<path d="M70806.7 3945.8 L70817.25 4000 L77134.25 4133.545476059005 L77134.3 4133.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55841.3 2695.3 L55836.0 2704.7 L55830.7 2695.3 L55836.0 2686.0 Z"></path>
+						<path d="M70810.1 3935.6 L70806.7 3945.8 L70799.7 3937.7 L70803.1 3927.5 Z"></path>
 					</g>
-					<path d="M2469.9 3408.2 L2483 3402 L2490.5 3402 L2490.5 3402 L2498 3500.5 L2498 3500.5 L2490.5 3599 L2490.5 3599 L2483 3599 L2483 3599 L2453 3584.8612440191387 L2453.0 3584.9 " fill="none"></path>
+					<path d="M70832.3 3944.5 L70857.25 4000 L76390.25 4132.681102362205 L76390.3 4132.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2459.2 3407.3 L2469.9 3408.2 L2463.7 3417.0 L2453.0 3416.1 Z"></path>
+						<path d="M70833.3 3933.8 L70832.3 3944.5 L70823.6 3938.2 L70824.6 3927.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3714.1 2647.8 L4732.75 3314 L2453 3486.922572445348 L2453.0 3486.9 " fill="none"></path>
-					</g>
-					<path d="M3717.0 2643.3 L3714.1 2647.8 L3711.2 2652.3 L3702.9 2640.5 Z"></path>
-					<path d="M73923.3 679.2 L73923.25 966 L73923.25 1197 L73923.3 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73928.6 669.8 L73923.3 679.2 L73917.9 669.8 L73923.3 660.5 Z"></path>
+						<path d="M70452.9 3556.3 L70786.75 3687 L70786.75 3759.5 L70786.8 3759.5 " fill="none"></path>
 					</g>
-					<path d="M73923.3 165.3 L73923.25 293 L73923.25 598.5 L73923.3 598.5 " fill="none"></path>
-					<path d="M73928.6 165.3 L73923.3 165.3 L73917.9 165.3 L73923.3 152.0 Z"></path>
-					<path d="M79235.9 161.6 L79109.5 293 L79109.5 598.5 L79109.5 598.5 " fill="none"></path>
-					<path d="M79239.7 165.3 L79235.9 161.6 L79232.0 157.9 L79245.1 152.0 Z"></path>
-					<path d="M79300.0 158.4 L79545.5 293 L79545.5 598.5 L79545.5 598.5 " fill="none"></path>
-					<path d="M79302.5 153.7 L79300.0 158.4 L79297.4 163.1 L79288.3 152.0 Z"></path>
-					<path d="M67226.0 1747.2 L67226 1936 L67226 2586.5 L67226.0 2586.5 " fill="none"></path>
+					<path d="M70454.9 3551.3 L70452.9 3556.3 L70451.0 3561.2 L70440.5 3551.4 Z"></path>
+					<path d="M3281.0 3450.3 L3293 3447 L3300.5 3447 L3300.5 3447 L3308 3500.5 L3308 3500.5 L3300.5 3554 L3300.5 3554 L3293 3554 L3293 3554 L3263 3545.8527918781724 L3263.0 3545.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67231.3 1737.8 L67226.0 1747.2 L67220.7 1737.8 L67226.0 1728.5 Z"></path>
+						<path d="M3270.6 3447.6 L3281.0 3450.3 L3273.4 3457.8 L3263.0 3455.1 Z"></path>
 					</g>
-					<path d="M67226.0 1241.3 L67226 1459 L67226 1666.5 L67226.0 1666.5 " fill="none"></path>
-					<path d="M67231.3 1241.3 L67226.0 1241.3 L67220.7 1241.3 L67226.0 1228.0 Z"></path>
-					<path d="M78328.5 669.5 L76270.75 966 L76270.75 1197 L76270.8 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M78338.5 673.5 L78328.5 669.5 L78337.0 662.9 L78347.0 666.9 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3126.8 2650.7 L3681.5 3314 L3263 3447.3052946199828 L3263.0 3447.3 " fill="none"></path>
 					</g>
-					<path d="M78328.6 672.5 L76430.25 966 L76430.25 1197 L76430.3 1197.0 " fill="none"></path>
+					<path d="M3130.9 2647.3 L3126.8 2650.7 L3122.7 2654.1 L3118.2 2640.5 Z"></path>
+					<path d="M72953.1 4140.1 L69475.5 4268 L69475.5 4454.5 L69475.5 4454.5 L69475.5 4641 L69475.5 4641 L73039.75 4676.238007380074 L73039.8 4676.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M78338.6 676.3 L78328.6 672.5 L78337.0 665.8 L78347.0 669.6 Z"></path>
+						<path d="M72962.6 4145.1 L72953.1 4140.1 L72962.2 4134.4 L72971.8 4139.4 Z"></path>
 					</g>
-					<path d="M78883.1 750.5 L79375.75 966 L79375.75 1197 L79375.8 1197.0 " fill="none"></path>
+					<path d="M73285.4 4141.2 L76193.75 4268 L76193.75 4454.5 L76193.75 4454.5 L76193.75 4641 L76193.75 4641 L76321 4668.090704647676 L76321.0 4668.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M78876.7 741.9 L78883.1 750.5 L78872.4 751.6 L78866.0 743.0 Z"></path>
+						<path d="M73276.3 4135.5 L73285.4 4141.2 L73275.8 4146.2 L73266.8 4140.4 Z"></path>
 					</g>
-					<path d="M78883.6 725.8 L79574.75 966 L79574.75 1197 L79574.8 1197.0 " fill="none"></path>
+					<path d="M19757.0 3887.8 L19757 4000 L72971.75 4133.629607072416 L72971.8 4133.6 " fill="none"></path>
+					<path d="M19762.3 3887.8 L19757.0 3887.8 L19751.7 3887.8 L19757.0 3874.5 Z"></path>
+					<path d="M76381.7 4615.2 L76368.75 4641 L76840.75 4671.8866359447 L76840.8 4671.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M78876.6 717.7 L78883.6 725.8 L78873.1 727.8 L78866.0 719.7 Z"></path>
+						<path d="M76390.7 4609.2 L76381.7 4615.2 L76381.2 4604.4 L76390.1 4598.5 Z"></path>
 					</g>
-					<path d="M78606.5 165.3 L78606.5 293 L78606.5 358 L78606.5 358.0 " fill="none"></path>
-					<path d="M78611.8 165.3 L78606.5 165.3 L78601.2 165.3 L78606.5 152.0 Z"></path>
-					<path d="M67213.1 2681.7 L67069.5 3314 L51953.75 3500.1428795457173 L51953.8 3500.1 " fill="none"></path>
+					<path d="M76415.8 4616.4 L76408.75 4641 L76460.15845070423 4661 L76460.2 4661.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67220.4 2673.8 L67213.1 2681.7 L67210.0 2671.4 L67217.3 2663.5 Z"></path>
+						<path d="M76423.5 4608.9 L76415.8 4616.4 L76413.3 4606.0 L76421.0 4598.5 Z"></path>
 					</g>
-					<path d="M67234.0 2682.0 L67322.75 3314 L67322.75 3485 L67322.8 3485.0 " fill="none"></path>
+					<path d="M76509.2 4616.4 L76516.25 4641 L76400 4667.496789727127 L76400.0 4667.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67238.0 2672.0 L67234.0 2682.0 L67227.4 2673.5 L67231.4 2663.5 Z"></path>
+						<path d="M76511.7 4606.0 L76509.2 4616.4 L76501.5 4608.9 L76504.0 4598.5 Z"></path>
 					</g>
-					<path d="M56531.0 2705.2 L56531 3314 L51953.75 3499.3258344640435 L51953.8 3499.3 " fill="none"></path>
+					<path d="M76543.3 4615.2 L76556.25 4641 L73092.75 4676.230444126075 L73092.8 4676.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56536.3 2695.8 L56531.0 2705.2 L56525.7 2695.8 L56531.0 2686.5 Z"></path>
+						<path d="M76543.8 4604.4 L76543.3 4615.2 L76534.3 4609.2 L76534.9 4598.5 Z"></path>
 					</g>
-					<path d="M56804.6 2689.3 L56674.5 3314 L38181 3498.672596578588 L38181.0 3498.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M56811.7 2681.2 L56804.6 2689.3 L56801.3 2679.0 L56808.4 2671.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M73280.1 4140.4 L76462.5 4268 L76462.5 4310.5 L76462.5 4310.5 " fill="none"></path>
 					</g>
-					<path d="M56808.3 2689.5 L56714.5 3314 L51953.75 3499.3708178923744 L51953.8 3499.4 " fill="none"></path>
+					<path d="M73280.3 4135.1 L73280.1 4140.4 L73279.9 4145.8 L73266.8 4139.9 Z"></path>
+					<path d="M79930.5 168.9 L79605.75 293 L79605.75 614 L79605.8 614.0 " fill="none"></path>
+					<path d="M79932.4 173.9 L79930.5 168.9 L79928.6 164.0 L79943.0 164.2 Z"></path>
+					<path d="M76689.6 4183.5 L76702.25 4268 L76702.25 4454.5 L76702.25 4454.5 L76702.25 4641 L76702.25 4641 L76840.75 4664.525119617225 L76840.8 4664.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56815.0 2681.0 L56808.3 2689.5 L56804.4 2679.4 L56811.1 2671.0 Z"></path>
+						<path d="M76693.5 4173.4 L76689.6 4183.5 L76683.0 4175.0 L76686.9 4165.0 Z"></path>
 					</g>
-					<path d="M56826.6 2689.5 L56909.5 3314 L57404.75 3489.3471760797343 L57404.8 3489.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M56830.6 2679.5 L56826.6 2689.5 L56820.1 2681.0 L56824.1 2671.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M75563.8 141.3 L77475.75 293 L77475.75 583.5 L77475.8 583.5 " fill="none"></path>
 					</g>
-					<path d="M38199.1 3450.0 L38211 3447 L38218.5 3447 L38218.5 3447 L38226 3500.5 L38226 3500.5 L38218.5 3554 L38218.5 3554 L38211 3554 L38211 3554 L38181 3546.4647887323945 L38181.0 3546.5 " fill="none"></path>
+					<path d="M75564.2 136.0 L75563.8 141.3 L75563.4 146.6 L75550.5 140.2 Z"></path>
+					<path d="M61577.8 2772.7 L61577.75 3314 L32726.5 3500.148365809571 L32726.5 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38188.8 3447.1 L38199.1 3450.0 L38191.4 3457.4 L38181.0 3454.5 Z"></path>
+						<path d="M61583.1 2763.3 L61577.8 2772.7 L61572.4 2763.3 L61577.8 2754.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3715.1 2647.6 L4772.75 3314 L37815 3499.47278425294 L37815.0 3499.5 " fill="none"></path>
+						<path d="M75563.8 140.8 L77720.75 293 L77720.75 614 L77720.8 614.0 " fill="none"></path>
 					</g>
-					<path d="M3718.0 2643.1 L3715.1 2647.6 L3712.3 2652.1 L3703.8 2640.5 Z"></path>
+					<path d="M75564.2 135.4 L75563.8 140.8 L75563.4 146.1 L75550.5 139.8 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80033.8 173.9 L79816.5 293 L79816.5 598.5 L79816.5 598.5 " fill="none"></path>
+						<path d="M77720.8 658.3 L77720.75 966 L77720.75 1197 L77720.8 1197.0 " fill="none"></path>
 					</g>
-					<path d="M80036.3 178.6 L80033.8 173.9 L80031.2 169.2 L80045.4 167.5 Z"></path>
+					<path d="M77726.1 658.3 L77720.8 658.3 L77715.4 658.3 L77720.8 645.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80138.5 177.5 L80241.5 293 L80241.5 598.5 L80241.5 598.5 " fill="none"></path>
-					</g>
-					<path d="M80142.5 173.9 L80138.5 177.5 L80134.5 181.0 L80129.6 167.5 Z"></path>
-					<g data-name="GoRouteParamEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouteParamEnum">
-							<rect x="2697.5" y="98.0" height="77.0" width="202.0" data-name="GoRouteParamEnum"></rect>
-							<path d="M2697.5 129.0 L2899.5 129.0" fill="none" data-name="GoRouteParamEnum"></path>
-						</g>
-						<g transform="translate(2697.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GoRouteParamEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouteParamEnum">
-								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouteParamEnum">GoRouteParamEnum</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2697.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouteParamEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouteParamEnum">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouteParamEnum">+String toRouteParam()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GoRouteParamEnum">+String toShortString()</text>
-								
-							</g>
-						</g>
+						<path d="M83738.1 175.6 L83892.25 293 L83892.25 501 L83892.3 501.0 " fill="none"></path>
 					</g>
-					<g data-name="RoutingIntents">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntents">
-							<rect x="2180.8" y="1479.0" height="437.0" width="572.0" data-name="RoutingIntents"></rect>
-							<path d="M2180.8 1510.0 L2752.8 1510.0" fill="none" data-name="RoutingIntents"></path>
-						</g>
-						<g transform="translate(2180.75, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntents">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntents">
-								<text x="278.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntents">RoutingIntents</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2180.75, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntents">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntents">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+root: RoutingIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studies: RoutingIntent</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studiesShared: RoutingIntent</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+publicRegistry: RoutingIntent</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+study: RoutingIntent Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEdit: RoutingIntent Function(String)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInfo: RoutingIntent Function(String)</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String)</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInterventions: RoutingIntent Function(String)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String)</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditReports: RoutingIntent Function(String)</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String)</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute})</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyRecruit: RoutingIntent Function(String)</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyMonitor: RoutingIntent Function(String)</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyAnalyze: RoutingIntent Function(String)</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studySettings: RoutingIntent Function(String)</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+accountSettings: RoutingIntent</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyNew: RoutingIntent</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+login: RoutingIntent</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+signup: RoutingIntent</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot: RoutingIntent</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot2: RoutingIntent Function(String)</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordRecovery: RoutingIntent</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+error: RoutingIntent Function(Exception)</text>
-								
-							</g>
-						</g>
+					<path d="M83741.3 171.3 L83738.1 175.6 L83734.8 179.8 L83727.5 167.5 Z"></path>
+					<path d="M83916.4 1457.6 L83916.5 1459 L83916.5 1621.5 L83916.5 1621.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M83920.8 1447.8 L83916.4 1457.6 L83910.1 1448.8 L83914.5 1439.0 Z"></path>
 					</g>
-					<g data-name="RoutingIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="17708.3" y="2518.5" height="213.0" width="297.0" data-name="RoutingIntent"></rect>
-							<path d="M17708.3 2549.5 L18005.3 2549.5" fill="none" data-name="RoutingIntent"></path>
-							<path d="M17708.3 2685.5 L18005.3 2685.5" fill="none" data-name="RoutingIntent"></path>
-						</g>
-						<g transform="translate(17708.25, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17708.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">+route: GoRoute</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+params: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntent">+queryParams: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntent">+dispatch: RoutingIntentDispatch?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntent">+extra: Object?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntent">+routeName: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntent">+arguments: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntent">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17708.25, 2685.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">-dynamic _validateRoute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+bool matches()</text>
-								
-							</g>
-						</g>
+					<path d="M84182.3 1450.9 L84192.25 1459 L84192.25 1697.5 L84192.25 1697.5 L84192.25 1936 L84192.25 1936 L84192.25 2625 L84192.25 2625 L84192.25 3314 L84192.25 3314 L84192.25 3500.5 L84192.25 3500.5 L84192.25 3687 L84192.25 3687 L84192.25 3843.5 L84192.25 3843.5 L84192.25 4000 L84192.25 4000 L62317 4133.557357815722 L62317.0 4133.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M84178.5 1440.8 L84182.3 1450.9 L84171.7 1449.0 L84167.9 1439.0 Z"></path>
 					</g>
-					<g data-name="RoutingIntent Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String)">
-							<rect x="1804.8" y="2609.5" height="31.0" width="253.0" data-name="RoutingIntent Function(String)"></rect>
+					<path d="M83892.3 771.3 L83892.25 966 L83892.25 986 L83892.3 986.0 " fill="none"></path>
+					<path d="M83897.6 771.3 L83892.3 771.3 L83886.9 771.3 L83892.3 758.0 Z"></path>
+					<path d="M79942.0 182.0 L79762.75 293 L79762.75 614 L79762.8 614.0 " fill="none"></path>
+					<path d="M79944.8 186.6 L79942.0 182.0 L79939.2 177.5 L79953.3 175.0 Z"></path>
+					<path d="M79976.8 185.5 L79891.75 293 L79891.75 614 L79891.8 614.0 " fill="none"></path>
+					<path d="M79981.0 188.8 L79976.8 185.5 L79972.6 182.2 L79985.1 175.0 Z"></path>
+					<path d="M80101.0 156.5 L80686 293 L80686 614 L80686.0 614.0 " fill="none"></path>
+					<path d="M80102.2 151.3 L80101.0 156.5 L80099.8 161.6 L80088.0 153.4 Z"></path>
+					<path d="M80101.1 153.3 L80811.5 293 L80811.5 614 L80811.5 614.0 " fill="none"></path>
+					<path d="M80102.1 148.1 L80101.1 153.3 L80100.1 158.6 L80088.0 150.8 Z"></path>
+					<g data-name="Config">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Config">
+							<rect x="25187.5" y="60.5" height="152.0" width="396.0" data-name="Config"></rect>
+							<path d="M25187.5 91.5 L25583.5 91.5" fill="none" data-name="Config"></path>
 						</g>
-						<g transform="translate(1804.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String)">
-								<text x="118.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String)">RoutingIntent Function(String)</text>
+						<g transform="translate(25187.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Config">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Config">
+								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="Config">Config</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="RoutingIntent Function(String, String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, String)">
-							<rect x="2097.8" y="2609.5" height="31.0" width="309.0" data-name="RoutingIntent Function(String, String)"></rect>
-						</g>
-						<g transform="translate(2097.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, String)">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, String)">RoutingIntent Function(String, String)</text>
+						<g transform="translate(25187.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Config">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Config">
+								<text x="0.0" y="13.5" stroke="none" data-name="Config">&lt;static&gt;+isDebugMode: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Config">&lt;static&gt;+defaultLocale: Set&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Config">&lt;static&gt;+supportedLocales: Map&lt;String, String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Config">&lt;static&gt;+newStudyId: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Config">&lt;static&gt;+newModelId: String</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Config">&lt;static&gt;+minSplashTime: int</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Config">&lt;static&gt;+formAutosaveDebounce: int</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RoutingIntent Function(String, {String? appRoute})">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, {String? appRoute})">
-							<rect x="2446.8" y="2609.5" height="31.0" width="413.0" data-name="RoutingIntent Function(String, {String? appRoute})"></rect>
+					<g data-name="ResultTypes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ResultTypes">
+							<rect x="25623.5" y="121.0" height="31.0" width="114.0" data-name="ResultTypes"></rect>
 						</g>
-						<g transform="translate(2446.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, {String? appRoute})">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, {String? appRoute})">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, {String? appRoute})">RoutingIntent Function(String, {String? appRoute})</text>
+						<g transform="translate(25623.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ResultTypes">
+								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ResultTypes">ResultTypes</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RoutingIntent Function(Exception)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(Exception)">
-							<rect x="2899.8" y="2609.5" height="31.0" width="285.0" data-name="RoutingIntent Function(Exception)"></rect>
+					<g data-name="MeasurementResultTypes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementResultTypes">
+							<rect x="25254.5" y="591.0" height="77.0" width="252.0" data-name="MeasurementResultTypes"></rect>
+							<path d="M25254.5 622.0 L25506.5 622.0" fill="none" data-name="MeasurementResultTypes"></path>
 						</g>
-						<g transform="translate(2899.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(Exception)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(Exception)">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(Exception)">RoutingIntent Function(Exception)</text>
+						<g transform="translate(25254.5, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementResultTypes">
+								<text x="118.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementResultTypes">MeasurementResultTypes</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="GoRoute">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRoute">
-							<rect x="17677.8" y="3485.0" height="31.0" width="86.0" data-name="GoRoute"></rect>
-						</g>
-						<g transform="translate(17677.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRoute">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRoute">
-								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRoute">GoRoute</text>
+						<g transform="translate(25254.5, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementResultTypes">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+questionnaire: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RoutingIntentDispatch">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntentDispatch">
-							<rect x="2543.0" y="3447.0" height="107.0" width="373.0" data-name="RoutingIntentDispatch"></rect>
-							<path d="M2543.0 3478.0 L2916.0 3478.0" fill="none" data-name="RoutingIntentDispatch"></path>
+					<g data-name="InterventionResultTypes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionResultTypes">
+							<rect x="25546.5" y="591.0" height="77.0" width="268.0" data-name="InterventionResultTypes"></rect>
+							<path d="M25546.5 622.0 L25814.5 622.0" fill="none" data-name="InterventionResultTypes"></path>
 						</g>
-						<g transform="translate(2543, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntentDispatch">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntentDispatch">
-								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntentDispatch">RoutingIntentDispatch</text>
+						<g transform="translate(25546.5, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionResultTypes">
+								<text x="126.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionResultTypes">InterventionResultTypes</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2543, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntentDispatch">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntentDispatch">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntentDispatch">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+go: RoutingIntentDispatch</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+push: RoutingIntentDispatch</text>
+						<g transform="translate(25546.5, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResultTypes">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+checkmarkTask: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="3765.8" y="1682.0" height="31.0" width="96.0" data-name="Equatable"></rect>
+					<g data-name="StudyExportData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyExportData">
+							<rect x="0.0" y="2564.0" height="122.0" width="414.0" data-name="StudyExportData"></rect>
+							<path d="M0.0 2595.0 L414.0 2595.0" fill="none" data-name="StudyExportData"></path>
 						</g>
-						<g transform="translate(3765.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
+						<g transform="translate(0, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyExportData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyExportData">
+								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyExportData">StudyExportData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="3648.8" y="2609.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(3648.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
+						<g transform="translate(0, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyExportData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyExportData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyExportData">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyExportData">+measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyExportData">+interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyExportData">+mediaData: List&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyExportData">+isEmpty: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RouterKeys">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouterKeys">
-							<rect x="2939.5" y="98.0" height="77.0" width="312.0" data-name="RouterKeys"></rect>
-							<path d="M2939.5 129.0 L3251.5 129.0" fill="none" data-name="RouterKeys"></path>
-						</g>
-						<g transform="translate(2939.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterKeys">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterKeys">
-								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterKeys">RouterKeys</text>
-								
-							</g>
+					<g data-name="Study">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
+							<rect x="64938.0" y="3485.0" height="31.0" width="61.0" data-name="Study"></rect>
 						</g>
-						<g transform="translate(2939.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterKeys">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterKeys">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+studyKey: ValueKey&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+authKey: ValueKey&lt;String&gt;</text>
+						<g transform="translate(64938, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ValueKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ValueKey">
-							<rect x="3050.0" y="614.0" height="31.0" width="91.0" data-name="ValueKey"></rect>
+					<g data-name="StudyTemplates">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTemplates">
+							<rect x="25777.5" y="90.0" height="93.0" width="307.0" data-name="StudyTemplates"></rect>
+							<path d="M25777.5 121.0 L26084.5 121.0" fill="none" data-name="StudyTemplates"></path>
+							<path d="M25777.5 152.0 L26084.5 152.0" fill="none" data-name="StudyTemplates"></path>
 						</g>
-						<g transform="translate(3050, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueKey">
-								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueKey">ValueKey</text>
+						<g transform="translate(25777.5, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTemplates">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTemplates">
+								<text x="145.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTemplates">StudyTemplates</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="RouteParams">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteParams">
-							<rect x="3291.5" y="75.5" height="122.0" width="267.0" data-name="RouteParams"></rect>
-							<path d="M3291.5 106.5 L3558.5 106.5" fill="none" data-name="RouteParams"></path>
-						</g>
-						<g transform="translate(3291.5, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteParams">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteParams">
-								<text x="125.5" y="13.5" stroke="none" text-anchor="middle" data-name="RouteParams">RouteParams</text>
+						<g transform="translate(25777.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+kUnnamedStudyTitle: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3291.5, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteParams">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteParams">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studiesFilter: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteParams">&lt;static&gt;+measurementId: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteParams">&lt;static&gt;+interventionId: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RouteParams">&lt;static&gt;+testAppRoute: String</text>
+						<g transform="translate(25777.5, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+Study emptyDraft()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RouterConf">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouterConf">
-							<rect x="4746.5" y="2556.0" height="138.0" width="326.0" data-name="RouterConf"></rect>
-							<path d="M4746.5 2587.0 L5072.5 2587.0" fill="none" data-name="RouterConf"></path>
-							<path d="M4746.5 2663.0 L5072.5 2663.0" fill="none" data-name="RouterConf"></path>
-						</g>
-						<g transform="translate(4746.5, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterConf">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterConf">RouterConf</text>
-								
-							</g>
+					<g data-name="StudyActionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyActionType">
+							<rect x="68.0" y="3402.0" height="197.0" width="358.0" data-name="StudyActionType"></rect>
+							<path d="M68.0 3433.0 L426.0 3433.0" fill="none" data-name="StudyActionType"></path>
 						</g>
-						<g transform="translate(4746.5, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+router: GoRouter</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouterConf">&lt;static&gt;+routes: List&lt;GoRoute&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouterConf">&lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouterConf">&lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;</text>
+						<g transform="translate(68, 3402)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyActionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyActionType">
+								<text x="171.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyActionType">StudyActionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4746.5, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+GoRoute route()</text>
+						<g transform="translate(68, 3433)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyActionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyActionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyActionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+values: List&lt;StudyActionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pin: StudyActionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pinoff: StudyActionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+edit: StudyActionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicate: StudyActionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicateDraft: StudyActionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+addCollaborator: StudyActionType</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+export: StudyActionType</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+delete: StudyActionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="59360.0" y="3485.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
+					<g data-name="Enum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
+							<rect x="3074.8" y="2609.5" height="31.0" width="61.0" data-name="Enum"></rect>
 						</g>
-						<g transform="translate(59360, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
+						<g transform="translate(3074.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="14906.8" y="1666.5" height="62.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
-							<path d="M14906.8 1697.5 L15090.8 1697.5" fill="none" data-name="StudyFormRouteArgs"></path>
+					<g data-name="Notifications">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Notifications">
+							<rect x="3635.0" y="2541.5" height="167.0" width="407.0" data-name="Notifications"></rect>
+							<path d="M3635.0 2572.5 L4042.0 2572.5" fill="none" data-name="Notifications"></path>
 						</g>
-						<g transform="translate(14906.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
+						<g transform="translate(3635, 2541.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Notifications">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notifications">
+								<text x="195.5" y="13.5" stroke="none" text-anchor="middle" data-name="Notifications">Notifications</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14906.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormRouteArgs">+studyId: String</text>
+						<g transform="translate(3635, 2572.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Notifications">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Notifications">
+								<text x="0.0" y="13.5" stroke="none" data-name="Notifications">&lt;static&gt;+credentialsInvalid: SnackbarIntent</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Notifications">&lt;static&gt;+userAlreadyRegistered: SnackbarIntent</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordReset: SnackbarIntent</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordResetSuccess: SnackbarIntent</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleted: SnackbarIntent</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeDeleted: SnackbarIntent</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeClipped: SnackbarIntent</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleteConfirmation: AlertIntent</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormRouteArgs">
-							<rect x="14396.8" y="2594.0" height="62.0" width="210.0" data-name="QuestionFormRouteArgs"></rect>
-							<path d="M14396.8 2625.0 L14606.8 2625.0" fill="none" data-name="QuestionFormRouteArgs"></path>
+					<g data-name="SnackbarIntent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SnackbarIntent">
+							<rect x="3353.0" y="3469.5" height="62.0" width="136.0" data-name="SnackbarIntent"></rect>
+							<path d="M3353.0 3500.5 L3489.0 3500.5" fill="none" data-name="SnackbarIntent"></path>
 						</g>
-						<g transform="translate(14396.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormRouteArgs">
-								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormRouteArgs">QuestionFormRouteArgs</text>
+						<g transform="translate(3353, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackbarIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackbarIntent">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackbarIntent">SnackbarIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14396.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormRouteArgs">+questionId: String</text>
+						<g transform="translate(3353, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SnackbarIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SnackbarIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="SnackbarIntent">+duration: int?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormRouteArgs">
-							<rect x="11229.3" y="3485.0" height="31.0" width="282.0" data-name="ScreenerQuestionFormRouteArgs"></rect>
+					<g data-name="AlertIntent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AlertIntent">
+							<rect x="3529.0" y="3454.5" height="92.0" width="204.0" data-name="AlertIntent"></rect>
+							<path d="M3529.0 3485.5 L3733.0 3485.5" fill="none" data-name="AlertIntent"></path>
 						</g>
-						<g transform="translate(11229.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormRouteArgs">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormRouteArgs">ScreenerQuestionFormRouteArgs</text>
+						<g transform="translate(3529, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AlertIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AlertIntent">
+								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="AlertIntent">AlertIntent</text>
+								
+							</g>
+						</g>
+						<g transform="translate(3529, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AlertIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AlertIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="AlertIntent">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AlertIntent">+dismissOnAction: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AlertIntent">+isDestructive: dynamic</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormRouteArgs">
-							<rect x="14646.8" y="2594.0" height="62.0" width="239.0" data-name="ConsentItemFormRouteArgs"></rect>
-							<path d="M14646.8 2625.0 L14885.8 2625.0" fill="none" data-name="ConsentItemFormRouteArgs"></path>
+					<g data-name="NotificationDefaultActions">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDefaultActions">
+							<rect x="1724.0" y="3469.5" height="62.0" width="287.0" data-name="NotificationDefaultActions"></rect>
+							<path d="M1724.0 3500.5 L2011.0 3500.5" fill="none" data-name="NotificationDefaultActions"></path>
 						</g>
-						<g transform="translate(14646.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormRouteArgs">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormRouteArgs">ConsentItemFormRouteArgs</text>
+						<g transform="translate(1724, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDefaultActions">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDefaultActions">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDefaultActions">NotificationDefaultActions</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14646.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormRouteArgs">+consentId: String</text>
+						<g transform="translate(1724, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDefaultActions">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDefaultActions">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDefaultActions">&lt;static&gt;+cancel: NotificationAction</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="17421.3" y="2594.0" height="62.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
-							<path d="M17421.3 2625.0 L17668.3 2625.0" fill="none" data-name="MeasurementFormRouteArgs"></path>
+					<g data-name="NotificationAction">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationAction">
+							<rect x="1739.5" y="3797.5" height="92.0" width="256.0" data-name="NotificationAction"></rect>
+							<path d="M1739.5 3828.5 L1995.5 3828.5" fill="none" data-name="NotificationAction"></path>
 						</g>
-						<g transform="translate(17421.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
+						<g transform="translate(1739.5, 3797.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationAction">
+								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationAction">NotificationAction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17421.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementFormRouteArgs">+measurementId: String</text>
+						<g transform="translate(1739.5, 3828.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationAction">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationAction">+label: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationAction">+onSelect: dynamic Function()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationAction">+isDestructive: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormRouteArgs">
-							<rect x="16243.3" y="3469.5" height="62.0" width="265.0" data-name="SurveyQuestionFormRouteArgs"></rect>
-							<path d="M16243.3 3500.5 L16508.3 3500.5" fill="none" data-name="SurveyQuestionFormRouteArgs"></path>
+					<g data-name="INotificationService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
+							<rect x="60183.3" y="3447.0" height="107.0" width="395.0" data-name="INotificationService"></rect>
+							<path d="M60183.3 3478.0 L60578.3 3478.0" fill="none" data-name="INotificationService"></path>
 						</g>
-						<g transform="translate(16243.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormRouteArgs">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormRouteArgs">SurveyQuestionFormRouteArgs</text>
+						<g transform="translate(60183.25, 3447)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
+								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16243.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormRouteArgs">+questionId: String</text>
+						<g transform="translate(60183.25, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="INotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="INotificationService">
+								<text x="0.0" y="13.5" stroke="none" data-name="INotificationService">+void showMessage()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="INotificationService">+void show()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="INotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="INotificationService">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="16567.3" y="2594.0" height="62.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
-							<path d="M16567.3 2625.0 L16800.3 2625.0" fill="none" data-name="InterventionFormRouteArgs"></path>
+					<g data-name="NotificationService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationService">
+							<rect x="60153.3" y="3774.5" height="138.0" width="455.0" data-name="NotificationService"></rect>
+							<path d="M60153.3 3805.5 L60608.3 3805.5" fill="none" data-name="NotificationService"></path>
+							<path d="M60153.3 3836.5 L60608.3 3836.5" fill="none" data-name="NotificationService"></path>
 						</g>
-						<g transform="translate(16567.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
+						<g transform="translate(60153.25, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationService">
+								<text x="219.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationService">NotificationService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16567.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormRouteArgs">+interventionId: String</text>
+						<g transform="translate(60153.25, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">-_streamController: BehaviorSubject&lt;NotificationIntent&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InterventionTaskFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormRouteArgs">
-							<rect x="16548.3" y="3469.5" height="62.0" width="271.0" data-name="InterventionTaskFormRouteArgs"></rect>
-							<path d="M16548.3 3500.5 L16819.3 3500.5" fill="none" data-name="InterventionTaskFormRouteArgs"></path>
-						</g>
-						<g transform="translate(16548.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormRouteArgs">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormRouteArgs">InterventionTaskFormRouteArgs</text>
+						<g transform="translate(60153.25, 3836.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationService">+void showMessage()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationService">+void show()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NotificationService">+void dispose()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16548.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormRouteArgs">+taskId: String</text>
+					</g>
+					<g data-name="BehaviorSubject">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BehaviorSubject">
+							<rect x="62172.0" y="4118.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
+						</g>
+						<g transform="translate(62172, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BehaviorSubject">
+								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="BehaviorSubject">BehaviorSubject</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormRouteArgs">
-							<rect x="14925.8" y="2594.0" height="62.0" width="226.0" data-name="ReportItemFormRouteArgs"></rect>
-							<path d="M14925.8 2625.0 L15151.8 2625.0" fill="none" data-name="ReportItemFormRouteArgs"></path>
+					<g data-name="NotificationIntent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationIntent">
+							<rect x="4082.0" y="2548.5" height="153.0" width="288.0" data-name="NotificationIntent"></rect>
+							<path d="M4082.0 2579.5 L4370.0 2579.5" fill="none" data-name="NotificationIntent"></path>
+							<path d="M4082.0 2670.5 L4370.0 2670.5" fill="none" data-name="NotificationIntent"></path>
 						</g>
-						<g transform="translate(14925.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormRouteArgs">
-								<text x="105.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormRouteArgs">ReportItemFormRouteArgs</text>
+						<g transform="translate(4082, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="NotificationIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationIntent">
+								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationIntent">NotificationIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14925.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormRouteArgs">+sectionId: String</text>
+						<g transform="translate(4082, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+message: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationIntent">+customContent: Widget?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationIntent">+icon: IconData?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NotificationIntent">+actions: List&lt;NotificationAction&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="NotificationIntent">+type: NotificationType</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="JsonFileLoader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JsonFileLoader">
-							<rect x="3598.5" y="75.0" height="123.0" width="319.0" data-name="JsonFileLoader"></rect>
-							<path d="M3598.5 106.0 L3917.5 106.0" fill="none" data-name="JsonFileLoader"></path>
-							<path d="M3598.5 137.0 L3917.5 137.0" fill="none" data-name="JsonFileLoader"></path>
-						</g>
-						<g transform="translate(3598.5, 75)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonFileLoader">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="JsonFileLoader">JsonFileLoader</text>
+						<g transform="translate(4082, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+void register()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3598.5, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+jsonAssetsPath: String</text>
-								
-							</g>
+					</g>
+					<g data-name="Widget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
+							<rect x="21428.8" y="3485.0" height="31.0" width="71.0" data-name="Widget"></rect>
 						</g>
-						<g transform="translate(3598.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+dynamic loadJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonMapFromAssets()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonListFromAssets()</text>
+						<g transform="translate(21428.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
+								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CombinedStreamNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CombinedStreamNotifier">
-							<rect x="3807.0" y="583.0" height="93.0" width="435.0" data-name="CombinedStreamNotifier"></rect>
-							<path d="M3807.0 614.0 L4242.0 614.0" fill="none" data-name="CombinedStreamNotifier"></path>
-							<path d="M3807.0 645.0 L4242.0 645.0" fill="none" data-name="CombinedStreamNotifier"></path>
+					<g data-name="IconData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
+							<rect x="25696.0" y="3485.0" height="31.0" width="87.0" data-name="IconData"></rect>
 						</g>
-						<g transform="translate(3807, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CombinedStreamNotifier">
-								<text x="209.5" y="13.5" stroke="none" text-anchor="middle" data-name="CombinedStreamNotifier">CombinedStreamNotifier</text>
+						<g transform="translate(25696, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
+								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3807, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">-_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
+					</g>
+					<g data-name="NotificationType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationType">
+							<rect x="1309.0" y="3439.5" height="122.0" width="325.0" data-name="NotificationType"></rect>
+							<path d="M1309.0 3470.5 L1634.0 3470.5" fill="none" data-name="NotificationType"></path>
+						</g>
+						<g transform="translate(1309, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationType">
+								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationType">NotificationType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3807, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">+void dispose()</text>
+						<g transform="translate(1309, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationType">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationType">&lt;static&gt;+values: List&lt;NotificationType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationType">&lt;static&gt;+snackbar: NotificationType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NotificationType">&lt;static&gt;+alert: NotificationType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="NotificationType">&lt;static&gt;+custom: NotificationType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChangeNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
-							<rect x="3957.5" y="121.0" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
+					<g data-name="dynamic Function()">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
+							<rect x="6731.0" y="4118.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
 						</g>
-						<g transform="translate(3957.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
+						<g transform="translate(6731, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
+								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="5947.0" y="1181.5" height="62.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-							<path d="M5947.0 1212.5 L6140.0 1212.5" fill="none" data-name="IProviderArgsResolver"></path>
+					<g data-name="IClipboardService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IClipboardService">
+							<rect x="26124.5" y="105.5" height="62.0" width="156.0" data-name="IClipboardService"></rect>
+							<path d="M26124.5 136.5 L26280.5 136.5" fill="none" data-name="IClipboardService"></path>
 						</g>
-						<g transform="translate(5947, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
+						<g transform="translate(26124.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IClipboardService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IClipboardService">
+								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="IClipboardService">IClipboardService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5947, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IProviderArgsResolver">
-								<text x="0.0" y="13.5" stroke="none" data-name="IProviderArgsResolver">+R provide()</text>
+						<g transform="translate(26124.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IClipboardService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IClipboardService">
+								<text x="0.0" y="13.5" stroke="none" data-name="IClipboardService">+dynamic copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SuppressedBehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SuppressedBehaviorSubject">
-							<rect x="5792.8" y="3774.5" height="138.0" width="388.0" data-name="SuppressedBehaviorSubject"></rect>
-							<path d="M5792.8 3805.5 L6180.8 3805.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
-							<path d="M5792.8 3866.5 L6180.8 3866.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
+					<g data-name="ClipboardService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ClipboardService">
+							<rect x="26127.0" y="598.5" height="62.0" width="151.0" data-name="ClipboardService"></rect>
+							<path d="M26127.0 629.5 L26278.0 629.5" fill="none" data-name="ClipboardService"></path>
 						</g>
-						<g transform="translate(5792.75, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SuppressedBehaviorSubject">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="SuppressedBehaviorSubject">SuppressedBehaviorSubject</text>
+						<g transform="translate(26127, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ClipboardService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ClipboardService">
+								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="ClipboardService">ClipboardService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5792.75, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
-								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">+subject: BehaviorSubject&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+didSuppressInitialEvent: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SuppressedBehaviorSubject">-_controller: StreamController&lt;T&gt;</text>
+						<g transform="translate(26127, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ClipboardService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ClipboardService">
+								<text x="0.0" y="13.5" stroke="none" data-name="ClipboardService">+dynamic copy()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5792.75, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
-								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">-StreamController&lt;T&gt; _buildDerivedController()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+dynamic close()</text>
+					</g>
+					<g data-name="NotificationDispatcher">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDispatcher">
+							<rect x="5376.5" y="2564.0" height="122.0" width="325.0" data-name="NotificationDispatcher"></rect>
+							<path d="M5376.5 2595.0 L5701.5 2595.0" fill="none" data-name="NotificationDispatcher"></path>
+						</g>
+						<g transform="translate(5376.5, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDispatcher">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDispatcher">
+								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDispatcher">NotificationDispatcher</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="BehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BehaviorSubject">
-							<rect x="50246.8" y="4118.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
-						</g>
-						<g transform="translate(50246.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BehaviorSubject">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="BehaviorSubject">BehaviorSubject</text>
+						<g transform="translate(5376.5, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDispatcher">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDispatcher">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDispatcher">+child: Widget?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationDispatcher">+snackbarInnerPadding: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationDispatcher">+snackbarWidth: double?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NotificationDispatcher">+snackbarBehavior: SnackBarBehavior</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="NotificationDispatcher">+snackbarDefaultDuration: int</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StreamController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
-							<rect x="5226.3" y="4118.5" height="31.0" width="149.0" data-name="StreamController"></rect>
+					<g data-name="SnackBarBehavior">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SnackBarBehavior">
+							<rect x="3773.0" y="3485.0" height="31.0" width="162.0" data-name="SnackBarBehavior"></rect>
 						</g>
-						<g transform="translate(5226.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
+						<g transform="translate(3773, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackBarBehavior">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackBarBehavior">
+								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackBarBehavior">SnackBarBehavior</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Time">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Time">
-							<rect x="4282.0" y="583.5" height="92.0" width="293.0" data-name="Time"></rect>
-							<path d="M4282.0 614.5 L4575.0 614.5" fill="none" data-name="Time"></path>
+					<g data-name="Assets">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Assets">
+							<rect x="26320.5" y="105.5" height="62.0" width="218.0" data-name="Assets"></rect>
+							<path d="M26320.5 136.5 L26538.5 136.5" fill="none" data-name="Assets"></path>
 						</g>
-						<g transform="translate(4282, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Time">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Time">
-								<text x="138.5" y="13.5" stroke="none" text-anchor="middle" data-name="Time">Time</text>
+						<g transform="translate(26320.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Assets">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Assets">
+								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="Assets">Assets</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4282, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Time">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Time">
-								<text x="0.0" y="13.5" stroke="none" data-name="Time">&lt;static&gt;+dynamic fromTimeOfDay()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Time">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Time">&lt;static&gt;+Time fromJson()</text>
+						<g transform="translate(26320.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Assets">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Assets">
+								<text x="0.0" y="13.5" stroke="none" data-name="Assets">&lt;static&gt;+logoWide: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimeOfDay">
-							<rect x="4377.0" y="121.0" height="31.0" width="103.0" data-name="TimeOfDay"></rect>
+					<g data-name="AsyncValueWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValueWidget">
+							<rect x="5741.5" y="2526.0" height="198.0" width="384.0" data-name="AsyncValueWidget"></rect>
+							<path d="M5741.5 2557.0 L6125.5 2557.0" fill="none" data-name="AsyncValueWidget"></path>
+							<path d="M5741.5 2648.0 L6125.5 2648.0" fill="none" data-name="AsyncValueWidget"></path>
 						</g>
-						<g transform="translate(4377, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeOfDay">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeOfDay">TimeOfDay</text>
+						<g transform="translate(5741.5, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AsyncValueWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValueWidget">
+								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValueWidget">AsyncValueWidget</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="TimeValueAccessor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimeValueAccessor">
-							<rect x="4615.0" y="583.5" height="92.0" width="297.0" data-name="TimeValueAccessor"></rect>
-							<path d="M4615.0 614.5 L4912.0 614.5" fill="none" data-name="TimeValueAccessor"></path>
-						</g>
-						<g transform="translate(4615, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeValueAccessor">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeValueAccessor">TimeValueAccessor</text>
+						<g transform="translate(5741.5, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+value: AsyncValue&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">+data: Widget Function(T)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">+error: Widget Function(Object, StackTrace?)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">+loading: Widget Function()?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AsyncValueWidget">+empty: Widget Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4615, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimeValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimeValueAccessor">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimeValueAccessor">+String modelToViewValue()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TimeValueAccessor">+Time? viewToModelValue()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TimeValueAccessor">-String _addLeadingZeroIfNeeded()</text>
+						<g transform="translate(5741.5, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">-Widget _buildDataOrEmptyWidget()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultError()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultLoad()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ControlValueAccessor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ControlValueAccessor">
-							<rect x="4668.0" y="121.0" height="31.0" width="191.0" data-name="ControlValueAccessor"></rect>
+					<g data-name="AsyncValue">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
+							<rect x="32617.5" y="3485.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
 						</g>
-						<g transform="translate(4668, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ControlValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ControlValueAccessor">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="ControlValueAccessor">ControlValueAccessor</text>
+						<g transform="translate(32617.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Tuple">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Tuple">
-							<rect x="3224.8" y="2541.0" height="168.0" width="384.0" data-name="Tuple"></rect>
-							<path d="M3224.8 2572.0 L3608.8 2572.0" fill="none" data-name="Tuple"></path>
-							<path d="M3224.8 2633.0 L3608.8 2633.0" fill="none" data-name="Tuple"></path>
+					<g data-name="Widget Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
+							<rect x="28098.3" y="3485.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
 						</g>
-						<g transform="translate(3224.75, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Tuple">
-								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="Tuple">Tuple</text>
+						<g transform="translate(28098.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3224.75, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
-								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+first: T1</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">+second: T2</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+props: List&lt;Object?&gt;</text>
+					</g>
+					<g data-name="Widget Function(Object, StackTrace?)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Object, StackTrace?)?">
+							<rect x="3975.0" y="3485.0" height="31.0" width="326.0" data-name="Widget Function(Object, StackTrace?)?"></rect>
+						</g>
+						<g transform="translate(3975, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Object, StackTrace?)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Object, StackTrace?)?">
+								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Object, StackTrace?)?">Widget Function(Object, StackTrace?)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3224.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
-								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">&lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copy()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copyWith()</text>
+					</g>
+					<g data-name="Widget Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function()?">
+							<rect x="4341.0" y="3485.0" height="31.0" width="166.0" data-name="Widget Function()?"></rect>
+						</g>
+						<g transform="translate(4341, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function()?">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function()?">Widget Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="OptimisticUpdate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OptimisticUpdate">
-							<rect x="6432.3" y="3737.0" height="213.0" width="383.0" data-name="OptimisticUpdate"></rect>
-							<path d="M6432.3 3768.0 L6815.3 3768.0" fill="none" data-name="OptimisticUpdate"></path>
-							<path d="M6432.3 3904.0 L6815.3 3904.0" fill="none" data-name="OptimisticUpdate"></path>
+					<g data-name="FormControlLabel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlLabel">
+							<rect x="6234.5" y="2548.5" height="153.0" width="430.0" data-name="FormControlLabel"></rect>
+							<path d="M6234.5 2579.5 L6664.5 2579.5" fill="none" data-name="FormControlLabel"></path>
+							<path d="M6234.5 2670.5 L6664.5 2670.5" fill="none" data-name="FormControlLabel"></path>
 						</g>
-						<g transform="translate(6432.25, 3737)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptimisticUpdate">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptimisticUpdate">OptimisticUpdate</text>
+						<g transform="translate(6234.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlLabel">
+								<text x="207.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlLabel">FormControlLabel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6432.25, 3768)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+applyOptimistic: void Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">+apply: dynamic Function()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="OptimisticUpdate">+rollback: void Function()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="OptimisticUpdate">+onUpdate: void Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="OptimisticUpdate">+onError: void Function(Object, StackTrace?)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="OptimisticUpdate">+rethrowErrors: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="OptimisticUpdate">+runOptimistically: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="OptimisticUpdate">+completeFutureOptimistically: bool</text>
+						<g transform="translate(6234.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+formControl: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlLabel">+text: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlLabel">+isClickable: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlLabel">+textStyle: TextStyle?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormControlLabel">+onClick: void Function(AbstractControl&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6432.25, 3904)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+dynamic execute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">-void _runUpdateHandlerIfAny()</text>
+						<g transform="translate(6234.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()">
-							<rect x="5415.3" y="4118.5" height="31.0" width="134.0" data-name="void Function()"></rect>
+					<g data-name="AbstractControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
+							<rect x="23930.3" y="3485.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
 						</g>
-						<g transform="translate(5415.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()">void Function()</text>
+						<g transform="translate(23930.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
+								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="22095.0" y="4118.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
+					<g data-name="TextStyle">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
+							<rect x="10158.0" y="3485.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
 						</g>
-						<g transform="translate(22095, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
+						<g transform="translate(10158, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
+								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="29878.5" y="4118.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
+					<g data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+							<rect x="4547.0" y="3485.0" height="31.0" width="352.0" data-name="void Function(AbstractControl&lt;dynamic&gt;)?"></rect>
 						</g>
-						<g transform="translate(29878.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
+						<g transform="translate(4547, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">void Function(AbstractControl&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(Object, StackTrace?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Object, StackTrace?)?">
-							<rect x="5601.8" y="4118.5" height="31.0" width="304.0" data-name="void Function(Object, StackTrace?)?"></rect>
+					<g data-name="ActionPopUpMenuButton">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ActionPopUpMenuButton">
+							<rect x="6828.3" y="2496.0" height="258.0" width="324.0" data-name="ActionPopUpMenuButton"></rect>
+							<path d="M6828.3 2527.0 L7152.3 2527.0" fill="none" data-name="ActionPopUpMenuButton"></path>
+							<path d="M6828.3 2708.0 L7152.3 2708.0" fill="none" data-name="ActionPopUpMenuButton"></path>
 						</g>
-						<g transform="translate(5601.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Object, StackTrace?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Object, StackTrace?)?">
-								<text x="144.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Object, StackTrace?)?">void Function(Object, StackTrace?)?</text>
+						<g transform="translate(6828.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionPopUpMenuButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionPopUpMenuButton">
+								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionPopUpMenuButton">ActionPopUpMenuButton</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SerializableColor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SerializableColor">
-							<rect x="51768.8" y="3805.0" height="77.0" width="312.0" data-name="SerializableColor"></rect>
-							<path d="M51768.8 3836.0 L52080.8 3836.0" fill="none" data-name="SerializableColor"></path>
-						</g>
-						<g transform="translate(51768.75, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SerializableColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SerializableColor">
-								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="SerializableColor">SerializableColor</text>
+						<g transform="translate(6828.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColor: Color?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColorHover: Color?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconSize: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ActionPopUpMenuButton">+disableSplashEffect: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ActionPopUpMenuButton">+hideOnEmpty: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ActionPopUpMenuButton">+orientation: Axis</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ActionPopUpMenuButton">+elevation: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ActionPopUpMenuButton">+splashRadius: double?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ActionPopUpMenuButton">+enabled: bool</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ActionPopUpMenuButton">+position: PopupMenuPosition</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51768.75, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SerializableColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SerializableColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="SerializableColor">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SerializableColor">&lt;static&gt;+SerializableColor fromJson()</text>
+						<g transform="translate(6828.25, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">-Widget _buildPopupMenu()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="Color">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="51895.8" y="3485.0" height="31.0" width="58.0" data-name="Color"></rect>
+							<rect x="21539.8" y="3485.0" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(51895.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+						<g transform="translate(21539.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
 								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FileFormatEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FileFormatEncoder">
-							<rect x="5027.0" y="90.5" height="92.0" width="216.0" data-name="FileFormatEncoder"></rect>
-							<path d="M5027.0 121.5 L5243.0 121.5" fill="none" data-name="FileFormatEncoder"></path>
+					<g data-name="Axis">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Axis">
+							<rect x="5663.3" y="3485.0" height="31.0" width="49.0" data-name="Axis"></rect>
 						</g>
-						<g transform="translate(5027, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FileFormatEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FileFormatEncoder">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="FileFormatEncoder">FileFormatEncoder</text>
+						<g transform="translate(5663.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Axis">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Axis">
+								<text x="16.5" y="13.5" stroke="none" text-anchor="middle" data-name="Axis">Axis</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5027, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FileFormatEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FileFormatEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="FileFormatEncoder">+dynamic encodeAsync()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FileFormatEncoder">+String encode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FileFormatEncoder">+dynamic call()</text>
+					</g>
+					<g data-name="PopupMenuPosition">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PopupMenuPosition">
+							<rect x="5752.3" y="3485.0" height="31.0" width="174.0" data-name="PopupMenuPosition"></rect>
+						</g>
+						<g transform="translate(5752.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PopupMenuPosition">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PopupMenuPosition">
+								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="PopupMenuPosition">PopupMenuPosition</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CSVStringEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CSVStringEncoder">
-							<rect x="4952.0" y="598.5" height="62.0" width="162.0" data-name="CSVStringEncoder"></rect>
-							<path d="M4952.0 629.5 L5114.0 629.5" fill="none" data-name="CSVStringEncoder"></path>
+					<g data-name="Search">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Search">
+							<rect x="7210.5" y="2571.5" height="107.0" width="373.0" data-name="Search"></rect>
+							<path d="M7210.5 2602.5 L7583.5 2602.5" fill="none" data-name="Search"></path>
 						</g>
-						<g transform="translate(4952, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CSVStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CSVStringEncoder">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="CSVStringEncoder">CSVStringEncoder</text>
+						<g transform="translate(7210.5, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Search">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Search">
+								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="Search">Search</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4952, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CSVStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CSVStringEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="CSVStringEncoder">+String encode()</text>
+						<g transform="translate(7210.5, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Search">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Search">
+								<text x="0.0" y="13.5" stroke="none" data-name="Search">+onQueryChanged: dynamic Function(String)</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Search">+searchController: SearchController?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Search">+hintText: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Search">+initialText: String?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="JsonStringEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JsonStringEncoder">
-							<rect x="5154.0" y="598.5" height="62.0" width="166.0" data-name="JsonStringEncoder"></rect>
-							<path d="M5154.0 629.5 L5320.0 629.5" fill="none" data-name="JsonStringEncoder"></path>
-						</g>
-						<g transform="translate(5154, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JsonStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonStringEncoder">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="JsonStringEncoder">JsonStringEncoder</text>
-								
-							</g>
+					<g data-name="dynamic Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(String)">
+							<rect x="5966.3" y="3485.0" height="31.0" width="213.0" data-name="dynamic Function(String)"></rect>
 						</g>
-						<g transform="translate(5154, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonStringEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonStringEncoder">+String encode()</text>
+						<g transform="translate(5966.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(String)">
+								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(String)">dynamic Function(String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NumericalRangeFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NumericalRangeFormatter">
-							<rect x="5360.0" y="575.5" height="108.0" width="313.0" data-name="NumericalRangeFormatter"></rect>
-							<path d="M5360.0 606.5 L5673.0 606.5" fill="none" data-name="NumericalRangeFormatter"></path>
-							<path d="M5360.0 652.5 L5673.0 652.5" fill="none" data-name="NumericalRangeFormatter"></path>
-						</g>
-						<g transform="translate(5360, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NumericalRangeFormatter">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="NumericalRangeFormatter">NumericalRangeFormatter</text>
-								
-							</g>
+					<g data-name="SearchController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
+							<rect x="36070.5" y="3469.5" height="62.0" width="258.0" data-name="SearchController"></rect>
+							<path d="M36070.5 3500.5 L36328.5 3500.5" fill="none" data-name="SearchController"></path>
 						</g>
-						<g transform="translate(5360, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+min: int?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NumericalRangeFormatter">+max: int?</text>
+						<g transform="translate(36070.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
+								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5360, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+TextEditingValue formatEditUpdate()</text>
+						<g transform="translate(36070.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SearchController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SearchController">
+								<text x="0.0" y="13.5" stroke="none" data-name="SearchController">+setText: void Function(String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TextInputFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextInputFormatter">
-							<rect x="5610.0" y="121.0" height="31.0" width="166.0" data-name="TextInputFormatter"></rect>
+					<g data-name="void Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(String)">
+							<rect x="36109.5" y="3828.0" height="31.0" width="180.0" data-name="void Function(String)"></rect>
 						</g>
-						<g transform="translate(5610, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TextInputFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextInputFormatter">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextInputFormatter">TextInputFormatter</text>
+						<g transform="translate(36109.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(String)">
+								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(String)">void Function(String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudySequenceFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySequenceFormatter">
-							<rect x="5713.0" y="598.5" height="62.0" width="313.0" data-name="StudySequenceFormatter"></rect>
-							<path d="M5713.0 629.5 L6026.0 629.5" fill="none" data-name="StudySequenceFormatter"></path>
+					<g data-name="FormScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormScaffold">
+							<rect x="7623.5" y="2556.5" height="137.0" width="212.0" data-name="FormScaffold"></rect>
+							<path d="M7623.5 2587.5 L7835.5 2587.5" fill="none" data-name="FormScaffold"></path>
 						</g>
-						<g transform="translate(5713, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySequenceFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySequenceFormatter">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySequenceFormatter">StudySequenceFormatter</text>
+						<g transform="translate(7623.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormScaffold">
+								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormScaffold">FormScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5713, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySequenceFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySequenceFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySequenceFormatter">+TextEditingValue formatEditUpdate()</text>
+						<g transform="translate(7623.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormScaffold">+formViewModel: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormScaffold">+actions: List&lt;Widget&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormScaffold">+body: Widget</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormScaffold">+drawer: Widget?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormScaffold">+actionsSpacing: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormScaffold">+actionsPadding: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CountWhereValidator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CountWhereValidator">
-							<rect x="6066.0" y="553.0" height="153.0" width="383.0" data-name="CountWhereValidator"></rect>
-							<path d="M6066.0 584.0 L6449.0 584.0" fill="none" data-name="CountWhereValidator"></path>
-							<path d="M6066.0 675.0 L6449.0 675.0" fill="none" data-name="CountWhereValidator"></path>
-						</g>
-						<g transform="translate(6066, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CountWhereValidator">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="CountWhereValidator">CountWhereValidator</text>
-								
-							</g>
+					<g data-name="ConstrainedWidthFlexible">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConstrainedWidthFlexible">
+							<rect x="7875.5" y="2533.5" height="183.0" width="287.0" data-name="ConstrainedWidthFlexible"></rect>
+							<path d="M7875.5 2564.5 L8162.5 2564.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
+							<path d="M7875.5 2670.5 L8162.5 2670.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
 						</g>
-						<g transform="translate(6066, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
-								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+predicate: bool Function(T?)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CountWhereValidator">+minCount: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CountWhereValidator">+maxCount: int?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMinCount: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMaxCount: String</text>
+						<g transform="translate(7875.5, 2533.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConstrainedWidthFlexible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConstrainedWidthFlexible">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConstrainedWidthFlexible">ConstrainedWidthFlexible</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6066, 675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
-								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+Map&lt;String, dynamic&gt;? validate()</text>
+						<g transform="translate(7875.5, 2564.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+minWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">+maxWidth: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConstrainedWidthFlexible">+flex: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConstrainedWidthFlexible">+flexSum: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConstrainedWidthFlexible">+child: Widget</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ConstrainedWidthFlexible">+outerConstraints: BoxConstraints</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="bool Function(T?)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="bool Function(T?)">
-							<rect x="6180.0" y="1197.0" height="31.0" width="155.0" data-name="bool Function(T?)"></rect>
-						</g>
-						<g transform="translate(6180, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="bool Function(T?)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="bool Function(T?)">
-								<text x="69.5" y="13.5" stroke="none" text-anchor="middle" data-name="bool Function(T?)">bool Function(T?)</text>
+						<g transform="translate(7875.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">-double _getWidth()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Validator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Validator">
-							<rect x="6214.5" y="121.0" height="31.0" width="86.0" data-name="Validator"></rect>
+					<g data-name="BoxConstraints">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoxConstraints">
+							<rect x="12912.0" y="3485.0" height="31.0" width="136.0" data-name="BoxConstraints"></rect>
 						</g>
-						<g transform="translate(6214.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Validator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Validator">
-								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="Validator">Validator</text>
+						<g transform="translate(12912, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxConstraints">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxConstraints">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxConstraints">BoxConstraints</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Patterns">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Patterns">
-							<rect x="6340.5" y="90.5" height="92.0" width="287.0" data-name="Patterns"></rect>
-							<path d="M6340.5 121.5 L6627.5 121.5" fill="none" data-name="Patterns"></path>
+					<g data-name="PrimaryButton">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PrimaryButton">
+							<rect x="8202.5" y="2511.5" height="227.0" width="333.0" data-name="PrimaryButton"></rect>
+							<path d="M8202.5 2542.5 L8535.5 2542.5" fill="none" data-name="PrimaryButton"></path>
 						</g>
-						<g transform="translate(6340.5, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Patterns">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Patterns">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="Patterns">Patterns</text>
+						<g transform="translate(8202.5, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PrimaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PrimaryButton">
+								<text x="158.5" y="13.5" stroke="none" text-anchor="middle" data-name="PrimaryButton">PrimaryButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6340.5, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Patterns">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Patterns">
-								<text x="0.0" y="13.5" stroke="none" data-name="Patterns">&lt;static&gt;+timeFormatString: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Patterns">&lt;static&gt;+emailFormatString: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Patterns">&lt;static&gt;+url: String</text>
+						<g transform="translate(8202.5, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PrimaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PrimaryButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="PrimaryButton">+text: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PrimaryButton">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PrimaryButton">+isLoading: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PrimaryButton">+showLoadingEarliestAfterMs: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PrimaryButton">+onPressed: void Function()?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PrimaryButton">+tooltip: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PrimaryButton">+tooltipDisabled: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PrimaryButton">+enabled: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="PrimaryButton">+onPressedFuture: dynamic Function()?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="PrimaryButton">+innerPadding: EdgeInsets</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="PrimaryButton">+minimumSize: Size?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="PrimaryButton">+isDisabled: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ExecutionLimiter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ExecutionLimiter">
-							<rect x="7030.3" y="3789.5" height="108.0" width="197.0" data-name="ExecutionLimiter"></rect>
-							<path d="M7030.3 3820.5 L7227.3 3820.5" fill="none" data-name="ExecutionLimiter"></path>
-							<path d="M7030.3 3866.5 L7227.3 3866.5" fill="none" data-name="ExecutionLimiter"></path>
+					<g data-name="void Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
+							<rect x="18277.3" y="4118.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
 						</g>
-						<g transform="translate(7030.25, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ExecutionLimiter">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ExecutionLimiter">ExecutionLimiter</text>
+						<g transform="translate(18277.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
+								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7030.25, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
-								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+milliseconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ExecutionLimiter">&lt;static&gt;-_timer: Timer?</text>
-								
-							</g>
+					</g>
+					<g data-name="dynamic Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
+							<rect x="11377.8" y="3485.0" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
 						</g>
-						<g transform="translate(7030.25, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
-								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+void dispose()</text>
+						<g transform="translate(11377.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
+								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Timer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Timer">
-							<rect x="5945.8" y="4118.5" height="31.0" width="60.0" data-name="Timer"></rect>
+					<g data-name="EdgeInsets">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
+							<rect x="13098.8" y="3485.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
 						</g>
-						<g transform="translate(5945.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timer">
-								<text x="22.0" y="13.5" stroke="none" text-anchor="middle" data-name="Timer">Timer</text>
+						<g transform="translate(13098.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Debouncer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="55806.0" y="4072.5" height="123.0" width="536.0" data-name="Debouncer"></rect>
-							<path d="M55806.0 4103.5 L56342.0 4103.5" fill="none" data-name="Debouncer"></path>
-							<path d="M55806.0 4164.5 L56342.0 4164.5" fill="none" data-name="Debouncer"></path>
+					<g data-name="Size">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Size">
+							<rect x="8443.0" y="3485.0" height="31.0" width="50.0" data-name="Size"></rect>
 						</g>
-						<g transform="translate(55806, 4072.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
-								<text x="260.0" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
+						<g transform="translate(8443, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Size">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Size">
+								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Size">Size</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55806, 4103.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
-								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+leading: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Debouncer">+cancelUncompleted: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Debouncer">-_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?</text>
+					</g>
+					<g data-name="FormTableRow">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRow">
+							<rect x="8575.5" y="2549.0" height="152.0" width="379.0" data-name="FormTableRow"></rect>
+							<path d="M8575.5 2580.0 L8954.5 2580.0" fill="none" data-name="FormTableRow"></path>
+						</g>
+						<g transform="translate(8575.5, 2549)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRow">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRow">
+								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRow">FormTableRow</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55806, 4164.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
-								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+dynamic call()</text>
+						<g transform="translate(8575.5, 2580)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRow">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRow">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRow">+label: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRow">+labelBuilder: Widget Function(BuildContext)?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRow">+labelStyle: TextStyle?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRow">+labelHelpText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormTableRow">+input: Widget</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormTableRow">+control: AbstractControl&lt;dynamic&gt;?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormTableRow">+layout: FormTableRowLayout?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CancelableOperation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="60064.0" y="4439.0" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
+					<g data-name="Widget Function(BuildContext)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
+							<rect x="8533.0" y="3485.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
 						</g>
-						<g transform="translate(60064, 4439)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
+						<g transform="translate(8533, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
+								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Throttler">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Throttler">
-							<rect x="6118.3" y="4103.0" height="62.0" width="136.0" data-name="Throttler"></rect>
-							<path d="M6118.3 4134.0 L6254.3 4134.0" fill="none" data-name="Throttler"></path>
+					<g data-name="FormTableRowLayout">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRowLayout">
+							<rect x="6441.0" y="3447.0" height="107.0" width="370.0" data-name="FormTableRowLayout"></rect>
+							<path d="M6441.0 3478.0 L6811.0 3478.0" fill="none" data-name="FormTableRowLayout"></path>
 						</g>
-						<g transform="translate(6118.25, 4103)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Throttler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Throttler">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="Throttler">Throttler</text>
+						<g transform="translate(6441, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRowLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRowLayout">
+								<text x="177.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRowLayout">FormTableRowLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6118.25, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Throttler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Throttler">
-								<text x="0.0" y="13.5" stroke="none" data-name="Throttler">+dynamic call()</text>
+						<g transform="translate(6441, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRowLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRowLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRowLayout">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+values: List&lt;FormTableRowLayout&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+vertical: FormTableRowLayout</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+horizontal: FormTableRowLayout</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ModelAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelAction">
-							<rect x="7896.5" y="2556.5" height="137.0" width="188.0" data-name="ModelAction"></rect>
-							<path d="M7896.5 2587.5 L8084.5 2587.5" fill="none" data-name="ModelAction"></path>
+					<g data-name="FormTableLayout">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableLayout">
+							<rect x="9383.5" y="2548.5" height="153.0" width="379.0" data-name="FormTableLayout"></rect>
+							<path d="M9383.5 2579.5 L9762.5 2579.5" fill="none" data-name="FormTableLayout"></path>
+							<path d="M9383.5 2670.5 L9762.5 2670.5" fill="none" data-name="FormTableLayout"></path>
 						</g>
-						<g transform="translate(7896.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelAction">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelAction">ModelAction</text>
+						<g transform="translate(9383.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableLayout">
+								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableLayout">FormTableLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7896.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelAction">+type: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelAction">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelAction">+icon: IconData?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelAction">+onExecute: Function</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelAction">+isAvailable: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelAction">+isDestructive: bool</text>
+						<g transform="translate(9383.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+rows: List&lt;FormTableRow&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormTableLayout">+columnWidths: Map&lt;int, TableColumnWidth&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormTableLayout">+rowDivider: Widget?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormTableLayout">+rowLayout: FormTableRowLayout?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormTableLayout">+rowLabelStyle: TextStyle?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="39589.3" y="3485.0" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(39589.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
+						<g transform="translate(9383.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="82327.3" y="105.5" height="62.0" width="403.0" data-name="IModelActionProvider"></rect>
-							<path d="M82327.3 136.5 L82730.3 136.5" fill="none" data-name="IModelActionProvider"></path>
+					<g data-name="FormSectionHeader">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormSectionHeader">
+							<rect x="9802.5" y="2548.5" height="153.0" width="220.0" data-name="FormSectionHeader"></rect>
+							<path d="M9802.5 2579.5 L10022.5 2579.5" fill="none" data-name="FormSectionHeader"></path>
+							<path d="M9802.5 2670.5 L10022.5 2670.5" fill="none" data-name="FormSectionHeader"></path>
 						</g>
-						<g transform="translate(82327.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
+						<g transform="translate(9802.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSectionHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSectionHeader">
+								<text x="102.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormSectionHeader">FormSectionHeader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82327.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelActionProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelActionProvider">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+						<g transform="translate(9802.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormSectionHeader">+titleTextStyle: TextStyle?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormSectionHeader">+helpText: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormSectionHeader">+divider: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormSectionHeader">+helpTextDisabled: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(9802.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="80311.5" y="1659.0" height="77.0" width="179.0" data-name="IListActionProvider"></rect>
-							<path d="M80311.5 1690.0 L80490.5 1690.0" fill="none" data-name="IListActionProvider"></path>
+					<g data-name="FormLabel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormLabel">
+							<rect x="10231.0" y="2556.0" height="138.0" width="266.0" data-name="FormLabel"></rect>
+							<path d="M10231.0 2587.0 L10497.0 2587.0" fill="none" data-name="FormLabel"></path>
+							<path d="M10231.0 2663.0 L10497.0 2663.0" fill="none" data-name="FormLabel"></path>
 						</g>
-						<g transform="translate(80311.5, 1659)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
+						<g transform="translate(10231, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormLabel">
+								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormLabel">FormLabel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(10231, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+labelText: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormLabel">+helpText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormLabel">+labelTextStyle: TextStyle?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormLabel">+layout: FormTableRowLayout?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80311.5, 1690)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IListActionProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="IListActionProvider">+void onSelectItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IListActionProvider">+void onNewItem()</text>
+						<g transform="translate(10231, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ModelActionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelActionType">
-							<rect x="0.0" y="3417.0" height="167.0" width="334.0" data-name="ModelActionType"></rect>
-							<path d="M0.0 3448.0 L334.0 3448.0" fill="none" data-name="ModelActionType"></path>
+					<g data-name="DismissButton">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DismissButton">
+							<rect x="15606.0" y="3789.5" height="108.0" width="249.0" data-name="DismissButton"></rect>
+							<path d="M15606.0 3820.5 L15855.0 3820.5" fill="none" data-name="DismissButton"></path>
+							<path d="M15606.0 3866.5 L15855.0 3866.5" fill="none" data-name="DismissButton"></path>
 						</g>
-						<g transform="translate(0, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelActionType">
-								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelActionType">ModelActionType</text>
+						<g transform="translate(15606, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DismissButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DismissButton">
+								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="DismissButton">DismissButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelActionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelActionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+values: List&lt;ModelActionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+edit: ModelActionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+delete: ModelActionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+remove: ModelActionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+duplicate: ModelActionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+clipboard: ModelActionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+primary: ModelActionType</text>
+						<g transform="translate(15606, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+onPressed: void Function()?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DismissButton">+text: String?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(15606, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Config">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Config">
-							<rect x="7097.3" y="60.5" height="152.0" width="396.0" data-name="Config"></rect>
-							<path d="M7097.3 91.5 L7493.3 91.5" fill="none" data-name="Config"></path>
+					<g data-name="Badge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Badge">
+							<rect x="10537.0" y="2496.0" height="258.0" width="263.0" data-name="Badge"></rect>
+							<path d="M10537.0 2527.0 L10800.0 2527.0" fill="none" data-name="Badge"></path>
+							<path d="M10537.0 2678.0 L10800.0 2678.0" fill="none" data-name="Badge"></path>
 						</g>
-						<g transform="translate(7097.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Config">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Config">
-								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="Config">Config</text>
+						<g transform="translate(10537, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Badge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Badge">
+								<text x="123.5" y="13.5" stroke="none" text-anchor="middle" data-name="Badge">Badge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7097.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Config">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Config">
-								<text x="0.0" y="13.5" stroke="none" data-name="Config">&lt;static&gt;+isDebugMode: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Config">&lt;static&gt;+defaultLocale: Set&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Config">&lt;static&gt;+supportedLocales: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Config">&lt;static&gt;+newStudyId: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Config">&lt;static&gt;+newModelId: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Config">&lt;static&gt;+minSplashTime: int</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Config">&lt;static&gt;+formAutosaveDebounce: int</text>
+						<g transform="translate(10537, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
+								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+icon: IconData?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Badge">+color: Color?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Badge">+borderRadius: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Badge">+label: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Badge">+type: BadgeType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Badge">+padding: EdgeInsets</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Badge">+iconSize: double?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Badge">+labelStyle: TextStyle?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="Badge">+center: bool</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="60848.8" y="4020.0" height="228.0" width="295.0" data-name="IAuthRepository"></rect>
-							<path d="M60848.8 4051.0 L61143.8 4051.0" fill="none" data-name="IAuthRepository"></path>
-							<path d="M60848.8 4142.0 L61143.8 4142.0" fill="none" data-name="IAuthRepository"></path>
-						</g>
-						<g transform="translate(60848.75, 4020)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
+						<g transform="translate(10537, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
+								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Badge">-Color? _getBackgroundColor()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Badge">-Color _getBorderColor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Badge">-Color? _getLabelColor()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60848.75, 4051)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+allowPasswordReset: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+currentUser: User?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+isLoggedIn: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+session: Session?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+serializedSession: String?</text>
+					</g>
+					<g data-name="BadgeType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
+							<rect x="24426.0" y="3432.0" height="137.0" width="288.0" data-name="BadgeType"></rect>
+							<path d="M24426.0 3463.0 L24714.0 3463.0" fill="none" data-name="BadgeType"></path>
+						</g>
+						<g transform="translate(24426, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
+								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60848.75, 4142)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+dynamic signUp()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+dynamic signInWith()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+dynamic signOut()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+dynamic updateUser()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IAuthRepository">+void dispose()</text>
+						<g transform="translate(24426, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BadgeType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BadgeType">
+								<text x="0.0" y="13.5" stroke="none" data-name="BadgeType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BadgeType">&lt;static&gt;+values: List&lt;BadgeType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BadgeType">&lt;static&gt;+filled: BadgeType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlined: BadgeType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlineFill: BadgeType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="BadgeType">&lt;static&gt;+plain: BadgeType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="User">
-						<g fill="#eee8d5" stroke="#33322E" data-name="User">
-							<rect x="60697.0" y="4661.0" height="31.0" width="53.0" data-name="User"></rect>
+					<g data-name="StandardDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StandardDialog">
+							<rect x="10840.0" y="2488.5" height="273.0" width="247.0" data-name="StandardDialog"></rect>
+							<path d="M10840.0 2519.5 L11087.0 2519.5" fill="none" data-name="StandardDialog"></path>
+							<path d="M10840.0 2730.5 L11087.0 2730.5" fill="none" data-name="StandardDialog"></path>
 						</g>
-						<g transform="translate(60697, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="User">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="User">
-								<text x="18.5" y="13.5" stroke="none" text-anchor="middle" data-name="User">User</text>
+						<g transform="translate(10840, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardDialog">
+								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardDialog">StandardDialog</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Session">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Session">
-							<rect x="60790.0" y="4661.0" height="31.0" width="79.0" data-name="Session"></rect>
+						<g transform="translate(10840, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+title: Widget?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StandardDialog">+titleText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StandardDialog">+body: Widget</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StandardDialog">+actionButtons: List&lt;Widget&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StandardDialog">+backgroundColor: Color?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StandardDialog">+borderRadius: double?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StandardDialog">+width: double?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StandardDialog">+height: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StandardDialog">+minWidth: double</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StandardDialog">+minHeight: double</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StandardDialog">+maxWidth: double?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StandardDialog">+maxHeight: double?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StandardDialog">+padding: EdgeInsets</text>
+								
+							</g>
 						</g>
-						<g transform="translate(60790, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Session">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Session">
-								<text x="31.5" y="13.5" stroke="none" text-anchor="middle" data-name="Session">Session</text>
+						<g transform="translate(10840, 2730.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IAppDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
-							<rect x="8107.5" y="3812.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
-							<path d="M8107.5 3843.5 L8304.5 3843.5" fill="none" data-name="IAppDelegate"></path>
+					<g data-name="ISyncIndicatorViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ISyncIndicatorViewModel">
+							<rect x="26578.5" y="98.0" height="77.0" width="214.0" data-name="ISyncIndicatorViewModel"></rect>
+							<path d="M26578.5 129.0 L26792.5 129.0" fill="none" data-name="ISyncIndicatorViewModel"></path>
 						</g>
-						<g transform="translate(8107.5, 3812.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
+						<g transform="translate(26578.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ISyncIndicatorViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ISyncIndicatorViewModel">
+								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="ISyncIndicatorViewModel">ISyncIndicatorViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8107.5, 3843.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
+						<g transform="translate(26578.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ISyncIndicatorViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ISyncIndicatorViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ISyncIndicatorViewModel">+isDirty: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ISyncIndicatorViewModel">+lastSynced: DateTime?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthRepository">
-							<rect x="60942.5" y="4310.5" height="288.0" width="295.0" data-name="AuthRepository"></rect>
-							<path d="M60942.5 4341.5 L61237.5 4341.5" fill="none" data-name="AuthRepository"></path>
-							<path d="M60942.5 4462.5 L61237.5 4462.5" fill="none" data-name="AuthRepository"></path>
-						</g>
-						<g transform="translate(60942.5, 4310.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthRepository">
-								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthRepository">AuthRepository</text>
-								
-							</g>
+					<g data-name="SyncIndicator">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SyncIndicator">
+							<rect x="11127.0" y="2564.0" height="122.0" width="208.0" data-name="SyncIndicator"></rect>
+							<path d="M11127.0 2595.0 L11335.0 2595.0" fill="none" data-name="SyncIndicator"></path>
 						</g>
-						<g transform="translate(60942.5, 4341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">+supabaseClient: SupabaseClient</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+allowPasswordReset: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+authClient: GoTrueClient</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+session: Session?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+serializedSession: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+currentUser: User?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+isLoggedIn: bool</text>
+						<g transform="translate(11127, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SyncIndicator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SyncIndicator">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="SyncIndicator">SyncIndicator</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60942.5, 4462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">-void _registerAuthListener()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+dynamic signUp()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+dynamic signInWith()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+dynamic signOut()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+dynamic updateUser()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+void dispose()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthRepository">+dynamic onAppStart()</text>
+						<g transform="translate(11127, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SyncIndicator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SyncIndicator">
+								<text x="0.0" y="13.5" stroke="none" data-name="SyncIndicator">+state: AsyncValue&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SyncIndicator">+lastSynced: DateTime?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SyncIndicator">+isDirty: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SyncIndicator">+animationDuration: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SyncIndicator">+iconSize: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SupabaseClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClient">
-							<rect x="58329.0" y="4661.0" height="31.0" width="141.0" data-name="SupabaseClient"></rect>
+					<g data-name="IWithBanner">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
+							<rect x="13085.5" y="1181.5" height="62.0" width="164.0" data-name="IWithBanner"></rect>
+							<path d="M13085.5 1212.5 L13249.5 1212.5" fill="none" data-name="IWithBanner"></path>
 						</g>
-						<g transform="translate(58329, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClient">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClient">SupabaseClient</text>
+						<g transform="translate(13085.5, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="GoTrueClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoTrueClient">
-							<rect x="60909.0" y="4661.0" height="31.0" width="120.0" data-name="GoTrueClient"></rect>
-						</g>
-						<g transform="translate(60909, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoTrueClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoTrueClient">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoTrueClient">GoTrueClient</text>
+						<g transform="translate(13085.5, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IWithBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IWithBanner">
+								<text x="0.0" y="13.5" stroke="none" data-name="IWithBanner">+Widget? banner()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IInviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="80530.5" y="1666.5" height="62.0" width="265.0" data-name="IInviteCodeRepository"></rect>
-							<path d="M80530.5 1697.5 L80795.5 1697.5" fill="none" data-name="IInviteCodeRepository"></path>
+					<g data-name="BannerBox">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BannerBox">
+							<rect x="11375.0" y="2534.0" height="182.0" width="298.0" data-name="BannerBox"></rect>
+							<path d="M11375.0 2565.0 L11673.0 2565.0" fill="none" data-name="BannerBox"></path>
 						</g>
-						<g transform="translate(80530.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
+						<g transform="translate(11375, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerBox">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerBox">
+								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerBox">BannerBox</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80530.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IInviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IInviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
+						<g transform="translate(11375, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerBox">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerBox">
+								<text x="0.0" y="13.5" stroke="none" data-name="BannerBox">+prefixIcon: Widget?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BannerBox">+body: Widget</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BannerBox">+style: BannerStyle</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="BannerBox">+padding: EdgeInsets?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="BannerBox">+noPrefix: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="BannerBox">+dismissable: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="BannerBox">+isDismissed: bool?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="BannerBox">+onDismissed: dynamic Function()?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="BannerBox">+dismissIconSize: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ModelRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepository">
-							<rect x="81806.8" y="986.0" height="453.0" width="662.0" data-name="ModelRepository"></rect>
-							<path d="M81806.8 1017.0 L82468.8 1017.0" fill="none" data-name="ModelRepository"></path>
-							<path d="M81806.8 1123.0 L82468.8 1123.0" fill="none" data-name="ModelRepository"></path>
+					<g data-name="BannerStyle">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BannerStyle">
+							<rect x="4939.0" y="3439.5" height="122.0" width="294.0" data-name="BannerStyle"></rect>
+							<path d="M4939.0 3470.5 L5233.0 3470.5" fill="none" data-name="BannerStyle"></path>
 						</g>
-						<g transform="translate(81806.75, 986)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepository">
-								<text x="323.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepository">ModelRepository</text>
+						<g transform="translate(4939, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerStyle">
+								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerStyle">BannerStyle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81806.75, 1017)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+delegate: IModelRepositoryDelegate&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">-_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">-_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">-_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;</text>
+						<g transform="translate(4939, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerStyle">
+								<text x="0.0" y="13.5" stroke="none" data-name="BannerStyle">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+values: List&lt;BannerStyle&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+warning: BannerStyle</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+info: BannerStyle</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+error: BannerStyle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81806.75, 1123)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt;? get()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">+dynamic fetchAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">+dynamic fetch()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ModelRepository">-dynamic _buildModelSpecificController()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ModelRepository">+dynamic ensurePersisted()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt; upsertLocally()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ModelRepository">+List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ModelRepository">+dynamic emitUpdate()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ModelRepository">+dynamic emitModelEvent()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ModelRepository">+dynamic emitError()</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ModelRepository">+void dispose()</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ModelRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+					</g>
+					<g data-name="ActionMenuInline">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuInline">
+							<rect x="26832.5" y="52.5" height="168.0" width="324.0" data-name="ActionMenuInline"></rect>
+							<path d="M26832.5 83.5 L27156.5 83.5" fill="none" data-name="ActionMenuInline"></path>
+							<path d="M26832.5 189.5 L27156.5 189.5" fill="none" data-name="ActionMenuInline"></path>
+						</g>
+						<g transform="translate(26832.5, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuInline">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuInline">
+								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuInline">ActionMenuInline</text>
+								
+							</g>
+						</g>
+						<g transform="translate(26832.5, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuInline">+iconSize: double?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuInline">+visible: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuInline">+splashRadius: double?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ActionMenuInline">+paddingVertical: double?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ActionMenuInline">+paddingHorizontal: double?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(26832.5, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepository">
-							<rect x="81197.0" y="2518.5" height="213.0" width="403.0" data-name="InviteCodeRepository"></rect>
-							<path d="M81197.0 2549.5 L81600.0 2549.5" fill="none" data-name="InviteCodeRepository"></path>
-							<path d="M81197.0 2655.5 L81600.0 2655.5" fill="none" data-name="InviteCodeRepository"></path>
+					<g data-name="Collapsible">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Collapsible">
+							<rect x="27196.5" y="83.0" height="107.0" width="441.0" data-name="Collapsible"></rect>
+							<path d="M27196.5 114.0 L27637.5 114.0" fill="none" data-name="Collapsible"></path>
 						</g>
-						<g transform="translate(81197, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepository">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepository">InviteCodeRepository</text>
+						<g transform="translate(27196.5, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Collapsible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Collapsible">
+								<text x="212.5" y="13.5" stroke="none" text-anchor="middle" data-name="Collapsible">Collapsible</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81197, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepository">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepository">+study: Study</text>
+						<g transform="translate(27196.5, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Collapsible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Collapsible">
+								<text x="0.0" y="13.5" stroke="none" data-name="Collapsible">+contentBuilder: Widget Function(BuildContext, bool)</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Collapsible">+headerBuilder: Widget Function(BuildContext, bool)?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Collapsible">+title: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Collapsible">+isCollapsed: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81197, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+dynamic emitUpdate()</text>
+					</g>
+					<g data-name="Widget Function(BuildContext, bool)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)">
+							<rect x="26318.0" y="614.0" height="31.0" width="300.0" data-name="Widget Function(BuildContext, bool)"></rect>
+						</g>
+						<g transform="translate(26318, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)">
+								<text x="142.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)">Widget Function(BuildContext, bool)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ProviderRef">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ProviderRef">
-							<rect x="80941.8" y="4118.5" height="31.0" width="109.0" data-name="ProviderRef"></rect>
+					<g data-name="Widget Function(BuildContext, bool)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)?">
+							<rect x="27262.0" y="614.0" height="31.0" width="310.0" data-name="Widget Function(BuildContext, bool)?"></rect>
 						</g>
-						<g transform="translate(80941.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ProviderRef">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProviderRef">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProviderRef">ProviderRef</text>
+						<g transform="translate(27262, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)?">
+								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)?">Widget Function(BuildContext, bool)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyUApi">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApi">
-							<rect x="68569.8" y="4028.0" height="212.0" width="251.0" data-name="StudyUApi"></rect>
-							<path d="M68569.8 4059.0 L68820.8 4059.0" fill="none" data-name="StudyUApi"></path>
+					<g data-name="NavbarTab">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
+							<rect x="62257.0" y="1644.0" height="107.0" width="196.0" data-name="NavbarTab"></rect>
+							<path d="M62257.0 1675.0 L62453.0 1675.0" fill="none" data-name="NavbarTab"></path>
 						</g>
-						<g transform="translate(68569.75, 4028)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyUApi">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApi">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApi">StudyUApi</text>
+						<g transform="translate(62257, 1644)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
+								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68569.75, 4059)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApi">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApi">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApi">+dynamic saveStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApi">+dynamic getUserStudies()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApi">+dynamic saveStudyInvite()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudyInvite()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudyInvite()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApi">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApi">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApi">+dynamic fetchUser()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApi">+dynamic saveUser()</text>
+						<g transform="translate(62257, 1675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NavbarTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NavbarTab">
+								<text x="0.0" y="13.5" stroke="none" data-name="NavbarTab">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NavbarTab">+intent: RoutingIntent?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NavbarTab">+index: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NavbarTab">+enabled: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="69689.3" y="3462.0" height="77.0" width="251.0" data-name="IStudyRepository"></rect>
-							<path d="M69689.3 3493.0 L69940.3 3493.0" fill="none" data-name="IStudyRepository"></path>
+					<g data-name="RoutingIntent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
+							<rect x="44409.5" y="2518.5" height="213.0" width="297.0" data-name="RoutingIntent"></rect>
+							<path d="M44409.5 2549.5 L44706.5 2549.5" fill="none" data-name="RoutingIntent"></path>
+							<path d="M44409.5 2685.5 L44706.5 2685.5" fill="none" data-name="RoutingIntent"></path>
 						</g>
-						<g transform="translate(69689.25, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
+						<g transform="translate(44409.5, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
+								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(69689.25, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyRepository">+dynamic launch()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyRepository">+dynamic deleteParticipants()</text>
+						<g transform="translate(44409.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">+route: GoRoute</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+params: Map&lt;String, String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntent">+queryParams: Map&lt;String, String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntent">+dispatch: RoutingIntentDispatch?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntent">+extra: Object?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntent">+routeName: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntent">+arguments: Map&lt;String, String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntent">+props: List&lt;Object?&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(44409.5, 2685.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">-dynamic _validateRoute()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+bool matches()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="64687.0" y="3485.0" height="31.0" width="61.0" data-name="Study"></rect>
+					<g data-name="TabbedNavbar">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TabbedNavbar">
+							<rect x="12039.8" y="2496.5" height="257.0" width="308.0" data-name="TabbedNavbar"></rect>
+							<path d="M12039.8 2527.5 L12347.8 2527.5" fill="none" data-name="TabbedNavbar"></path>
 						</g>
-						<g transform="translate(64687, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
+						<g transform="translate(12039.75, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabbedNavbar">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabbedNavbar">
+								<text x="146.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabbedNavbar">TabbedNavbar</text>
+								
+							</g>
+						</g>
+						<g transform="translate(12039.75, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TabbedNavbar">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TabbedNavbar">
+								<text x="0.0" y="13.5" stroke="none" data-name="TabbedNavbar">+tabs: List&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TabbedNavbar">+selectedTab: T?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TabbedNavbar">+indicator: BoxDecoration?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TabbedNavbar">+height: double?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TabbedNavbar">+disabledBackgroundColor: Color?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TabbedNavbar">+disabledTooltipText: String?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="TabbedNavbar">+onSelect: void Function(int, T)?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="TabbedNavbar">+labelPadding: EdgeInsets?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="TabbedNavbar">+labelSpacing: double?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="TabbedNavbar">+indicatorSize: TabBarIndicatorSize?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="TabbedNavbar">+isScrollable: bool</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="TabbedNavbar">+backgroundColor: Color?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="TabbedNavbar">+labelColorHover: Color?</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="TabbedNavbar">+unselectedLabelColorHover: Color?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepositoryDelegate">
-							<rect x="81741.5" y="2518.5" height="213.0" width="299.0" data-name="InviteCodeRepositoryDelegate"></rect>
-							<path d="M81741.5 2549.5 L82040.5 2549.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
-							<path d="M81741.5 2610.5 L82040.5 2610.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
+					<g data-name="BoxDecoration">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoxDecoration">
+							<rect x="11666.3" y="3485.0" height="31.0" width="132.0" data-name="BoxDecoration"></rect>
 						</g>
-						<g transform="translate(81741.5, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepositoryDelegate">
-								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepositoryDelegate">InviteCodeRepositoryDelegate</text>
+						<g transform="translate(11666.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxDecoration">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxDecoration">
+								<text x="58.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxDecoration">BoxDecoration</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81741.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+apiClient: StudyUApi</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+studyRepository: IStudyRepository</text>
+					</g>
+					<g data-name="void Function(int, T)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(int, T)?">
+							<rect x="11838.3" y="3485.0" height="31.0" width="183.0" data-name="void Function(int, T)?"></rect>
+						</g>
+						<g transform="translate(11838.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(int, T)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(int, T)?">
+								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(int, T)?">void Function(int, T)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81741.5, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic onError()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createDuplicate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createNewInstance()</text>
+					</g>
+					<g data-name="TabBarIndicatorSize">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TabBarIndicatorSize">
+							<rect x="12061.3" y="3485.0" height="31.0" width="176.0" data-name="TabBarIndicatorSize"></rect>
+						</g>
+						<g transform="translate(12061.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabBarIndicatorSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabBarIndicatorSize">
+								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabBarIndicatorSize">TabBarIndicatorSize</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IModelRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepositoryDelegate">
-							<rect x="81873.3" y="1621.5" height="152.0" width="225.0" data-name="IModelRepositoryDelegate"></rect>
-							<path d="M81873.3 1652.5 L82098.3 1652.5" fill="none" data-name="IModelRepositoryDelegate"></path>
+					<g data-name="SidesheetTab">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SidesheetTab">
+							<rect x="62009.3" y="2594.0" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
+							<path d="M62009.3 2625.0 L62339.3 2625.0" fill="none" data-name="SidesheetTab"></path>
 						</g>
-						<g transform="translate(81873.25, 1621.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepositoryDelegate">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepositoryDelegate">IModelRepositoryDelegate</text>
+						<g transform="translate(62009.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SidesheetTab">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="SidesheetTab">SidesheetTab</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81873.25, 1652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepositoryDelegate">+T createNewInstance()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepositoryDelegate">+T createDuplicate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic onError()</text>
+						<g transform="translate(62009.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SidesheetTab">
+								<text x="0.0" y="13.5" stroke="none" data-name="SidesheetTab">+builder: Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyLaunched">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyLaunched">
-							<rect x="6579.5" y="614.0" height="31.0" width="140.0" data-name="StudyLaunched"></rect>
+					<g data-name="Widget Function(BuildContext)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
+							<rect x="48614.0" y="3485.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
 						</g>
-						<g transform="translate(6579.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyLaunched">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyLaunched">
-								<text x="62.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyLaunched">StudyLaunched</text>
+						<g transform="translate(48614, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
+								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ModelEvent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelEvent">
-							<rect x="6843.8" y="98.0" height="77.0" width="145.0" data-name="ModelEvent"></rect>
-							<path d="M6843.8 129.0 L6988.8 129.0" fill="none" data-name="ModelEvent"></path>
+					<g data-name="Sidesheet">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Sidesheet">
+							<rect x="12715.3" y="2519.0" height="212.0" width="341.0" data-name="Sidesheet"></rect>
+							<path d="M12715.3 2550.0 L13056.3 2550.0" fill="none" data-name="Sidesheet"></path>
 						</g>
-						<g transform="translate(6843.75, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelEvent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelEvent">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelEvent">ModelEvent</text>
+						<g transform="translate(12715.25, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Sidesheet">
+								<text x="162.5" y="13.5" stroke="none" text-anchor="middle" data-name="Sidesheet">Sidesheet</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6843.75, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelEvent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelEvent">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelEvent">+modelId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelEvent">+model: T</text>
+						<g transform="translate(12715.25, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Sidesheet">
+								<text x="0.0" y="13.5" stroke="none" data-name="Sidesheet">&lt;static&gt;+kDefaultWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Sidesheet">+titleText: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Sidesheet">+body: Widget?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Sidesheet">+tabs: List&lt;SidesheetTab&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Sidesheet">+actionButtons: List&lt;Widget&gt;?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Sidesheet">+width: double?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Sidesheet">+withCloseButton: bool</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Sidesheet">+ignoreAppBar: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="Sidesheet">+collapseSingleTab: bool</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="Sidesheet">+bodyPadding: EdgeInsets?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="Sidesheet">+wrapContent: Widget Function(Widget)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WrappedModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WrappedModel">
-							<rect x="10808.0" y="2496.0" height="258.0" width="251.0" data-name="WrappedModel"></rect>
-							<path d="M10808.0 2527.0 L11059.0 2527.0" fill="none" data-name="WrappedModel"></path>
-							<path d="M10808.0 2678.0 L11059.0 2678.0" fill="none" data-name="WrappedModel"></path>
+					<g data-name="Widget Function(Widget)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Widget)?">
+							<rect x="19573.8" y="3485.0" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
 						</g>
-						<g transform="translate(10808, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WrappedModel">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="WrappedModel">WrappedModel</text>
+						<g transform="translate(19573.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Widget)?">
+								<text x="102.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Widget)?">Widget Function(Widget)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10808, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">-_model: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+asyncValue: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+isLocalOnly: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+isDirty: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WrappedModel">+isDeleted: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WrappedModel">+lastSaved: DateTime?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WrappedModel">+lastFetched: DateTime?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WrappedModel">+lastUpdated: DateTime?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WrappedModel">+model: T</text>
+					</g>
+					<g data-name="FormSideSheetTab">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormSideSheetTab">
+							<rect x="62379.3" y="2594.0" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
+							<path d="M62379.3 2625.0 L62692.3 2625.0" fill="none" data-name="FormSideSheetTab"></path>
+						</g>
+						<g transform="translate(62379.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSideSheetTab">
+								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormSideSheetTab">FormSideSheetTab</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10808, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">+dynamic markWithError()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+dynamic markAsLoading()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+dynamic markAsFetched()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+dynamic markAsSaved()</text>
+						<g transform="translate(62379.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSideSheetTab">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormSideSheetTab">+formViewBuilder: Widget Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="47948.0" y="3485.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
+					<g data-name="HelpIcon">
+						<g fill="#eee8d5" stroke="#33322E" data-name="HelpIcon">
+							<rect x="27677.5" y="90.0" height="93.0" width="174.0" data-name="HelpIcon"></rect>
+							<path d="M27677.5 121.0 L27851.5 121.0" fill="none" data-name="HelpIcon"></path>
+							<path d="M27677.5 152.0 L27851.5 152.0" fill="none" data-name="HelpIcon"></path>
 						</g>
-						<g transform="translate(47948, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
+						<g transform="translate(27677.5, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HelpIcon">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HelpIcon">
+								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="HelpIcon">HelpIcon</text>
+								
+							</g>
+						</g>
+						<g transform="translate(27677.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
+								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+tooltipText: String?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ModelRepositoryException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepositoryException">
-							<rect x="7268.5" y="614.0" height="31.0" width="227.0" data-name="ModelRepositoryException"></rect>
-						</g>
-						<g transform="translate(7268.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelRepositoryException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepositoryException">
-								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepositoryException">ModelRepositoryException</text>
+						<g transform="translate(27677.5, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
+								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Exception">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="34063.0" y="121.0" height="31.0" width="94.0" data-name="Exception"></rect>
+					<g data-name="EmptyBody">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EmptyBody">
+							<rect x="13672.0" y="2541.0" height="168.0" width="222.0" data-name="EmptyBody"></rect>
+							<path d="M13672.0 2572.0 L13894.0 2572.0" fill="none" data-name="EmptyBody"></path>
+							<path d="M13672.0 2678.0 L13894.0 2678.0" fill="none" data-name="EmptyBody"></path>
 						</g>
-						<g transform="translate(34063, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
+						<g transform="translate(13672, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmptyBody">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmptyBody">
+								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="EmptyBody">EmptyBody</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelNotFoundException">
-							<rect x="7272.5" y="1197.0" height="31.0" width="219.0" data-name="ModelNotFoundException"></rect>
+						<g transform="translate(13672, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
+								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+icon: IconData?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EmptyBody">+leading: Widget?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EmptyBody">+leadingSpacing: double?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EmptyBody">+title: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EmptyBody">+description: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EmptyBody">+button: Widget?</text>
+								
+							</g>
 						</g>
-						<g transform="translate(7272.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelNotFoundException">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelNotFoundException">ModelNotFoundException</text>
+						<g transform="translate(13672, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
+								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IModelRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepository">
-							<rect x="81946.8" y="501.0" height="257.0" width="382.0" data-name="IModelRepository"></rect>
-							<path d="M81946.8 532.0 L82328.8 532.0" fill="none" data-name="IModelRepository"></path>
+					<g data-name="IndicatorRangeSliderThumbShape">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IndicatorRangeSliderThumbShape">
+							<rect x="27857.0" y="560.5" height="138.0" width="287.0" data-name="IndicatorRangeSliderThumbShape"></rect>
+							<path d="M27857.0 591.5 L28144.0 591.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
+							<path d="M27857.0 652.5 L28144.0 652.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
 						</g>
-						<g transform="translate(81946.75, 501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepository">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepository">IModelRepository</text>
+						<g transform="translate(27857, 560.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IndicatorRangeSliderThumbShape">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="IndicatorRangeSliderThumbShape">IndicatorRangeSliderThumbShape</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81946.75, 532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepository">+WrappedModel&lt;T&gt;? get()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepository">+dynamic fetchAll()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepository">+dynamic fetch()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepository">+dynamic save()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepository">+dynamic delete()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSave()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="IModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="IModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="IModelRepository">+dynamic ensurePersisted()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="IModelRepository">+void dispose()</text>
+						<g transform="translate(27857, 591.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
+								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+buildContext: BuildContext</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+start: T</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+end: T</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="APIException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="APIException">
-							<rect x="8928.0" y="614.0" height="31.0" width="121.0" data-name="APIException"></rect>
-						</g>
-						<g transform="translate(8928, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="APIException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="APIException">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="APIException">APIException</text>
+						<g transform="translate(27857, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
+								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+Size getPreferredSize()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+void paint()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotFoundException">
-							<rect x="7531.5" y="1197.0" height="31.0" width="216.0" data-name="StudyNotFoundException"></rect>
+					<g data-name="BuildContext">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
+							<rect x="27942.5" y="1197.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
 						</g>
-						<g transform="translate(7531.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotFoundException">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotFoundException">StudyNotFoundException</text>
+						<g transform="translate(27942.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
+								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementNotFoundException">
-							<rect x="7787.5" y="1197.0" height="31.0" width="279.0" data-name="MeasurementNotFoundException"></rect>
+					<g data-name="RangeSliderThumbShape">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RangeSliderThumbShape">
+							<rect x="27891.5" y="121.0" height="31.0" width="218.0" data-name="RangeSliderThumbShape"></rect>
 						</g>
-						<g transform="translate(7787.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementNotFoundException">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementNotFoundException">MeasurementNotFoundException</text>
+						<g transform="translate(27891.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="RangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RangeSliderThumbShape">
+								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="RangeSliderThumbShape">RangeSliderThumbShape</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionNotFoundException">
-							<rect x="8106.5" y="1197.0" height="31.0" width="242.0" data-name="QuestionNotFoundException"></rect>
+					<g data-name="MouseEventsRegion">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MouseEventsRegion">
+							<rect x="15931.5" y="3760.0" height="167.0" width="379.0" data-name="MouseEventsRegion"></rect>
+							<path d="M15931.5 3791.0 L16310.5 3791.0" fill="none" data-name="MouseEventsRegion"></path>
 						</g>
-						<g transform="translate(8106.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionNotFoundException">
-								<text x="113.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionNotFoundException">QuestionNotFoundException</text>
+						<g transform="translate(15931.5, 3760)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MouseEventsRegion">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MouseEventsRegion">
+								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="MouseEventsRegion">MouseEventsRegion</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ConsentItemNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemNotFoundException">
-							<rect x="8388.5" y="1197.0" height="31.0" width="271.0" data-name="ConsentItemNotFoundException"></rect>
-						</g>
-						<g transform="translate(8388.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemNotFoundException">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemNotFoundException">ConsentItemNotFoundException</text>
+						<g transform="translate(15931.5, 3791)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MouseEventsRegion">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MouseEventsRegion">
+								<text x="0.0" y="13.5" stroke="none" data-name="MouseEventsRegion">+onTap: void Function()?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MouseEventsRegion">+onHover: void Function(PointerHoverEvent)?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MouseEventsRegion">+onEnter: void Function(PointerEnterEvent)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MouseEventsRegion">+onExit: void Function(PointerExitEvent)?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MouseEventsRegion">+autoselectCursor: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MouseEventsRegion">+cursor: SystemMouseCursor</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MouseEventsRegion">&lt;static&gt;+defaultCursor: SystemMouseCursor</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MouseEventsRegion">+autoCursor: SystemMouseCursor</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionNotFoundException">
-							<rect x="8699.5" y="1197.0" height="31.0" width="265.0" data-name="InterventionNotFoundException"></rect>
+					<g data-name="void Function(PointerHoverEvent)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerHoverEvent)?">
+							<rect x="5826.8" y="4118.5" height="31.0" width="292.0" data-name="void Function(PointerHoverEvent)?"></rect>
 						</g>
-						<g transform="translate(8699.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionNotFoundException">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionNotFoundException">InterventionNotFoundException</text>
+						<g transform="translate(5826.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerHoverEvent)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerHoverEvent)?">
+								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerHoverEvent)?">void Function(PointerHoverEvent)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskNotFoundException">
-							<rect x="9004.5" y="1197.0" height="31.0" width="303.0" data-name="InterventionTaskNotFoundException"></rect>
+					<g data-name="void Function(PointerEnterEvent)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerEnterEvent)?">
+							<rect x="6158.8" y="4118.5" height="31.0" width="287.0" data-name="void Function(PointerEnterEvent)?"></rect>
 						</g>
-						<g transform="translate(9004.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskNotFoundException">
-								<text x="143.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskNotFoundException">InterventionTaskNotFoundException</text>
+						<g transform="translate(6158.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerEnterEvent)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerEnterEvent)?">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerEnterEvent)?">void Function(PointerEnterEvent)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportNotFoundException">
-							<rect x="9347.5" y="1197.0" height="31.0" width="224.0" data-name="ReportNotFoundException"></rect>
+					<g data-name="void Function(PointerExitEvent)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerExitEvent)?">
+							<rect x="13967.0" y="4118.5" height="31.0" width="274.0" data-name="void Function(PointerExitEvent)?"></rect>
 						</g>
-						<g transform="translate(9347.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportNotFoundException">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportNotFoundException">ReportNotFoundException</text>
+						<g transform="translate(13967, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerExitEvent)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerExitEvent)?">
+								<text x="129.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerExitEvent)?">void Function(PointerExitEvent)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportSectionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionNotFoundException">
-							<rect x="9611.5" y="1197.0" height="31.0" width="283.0" data-name="ReportSectionNotFoundException"></rect>
+					<g data-name="SystemMouseCursor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SystemMouseCursor">
+							<rect x="14281.0" y="4118.5" height="31.0" width="180.0" data-name="SystemMouseCursor"></rect>
 						</g>
-						<g transform="translate(9611.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionNotFoundException">
-								<text x="133.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionNotFoundException">ReportSectionNotFoundException</text>
+						<g transform="translate(14281, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SystemMouseCursor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SystemMouseCursor">
+								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="SystemMouseCursor">SystemMouseCursor</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInviteNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInviteNotFoundException">
-							<rect x="9934.5" y="1197.0" height="31.0" width="259.0" data-name="StudyInviteNotFoundException"></rect>
+					<g data-name="ReactiveCustomColorPicker">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveCustomColorPicker">
+							<rect x="36406.0" y="614.0" height="31.0" width="236.0" data-name="ReactiveCustomColorPicker"></rect>
 						</g>
-						<g transform="translate(9934.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInviteNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInviteNotFoundException">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInviteNotFoundException">StudyInviteNotFoundException</text>
+						<g transform="translate(36406, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveCustomColorPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveCustomColorPicker">
+								<text x="110.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveCustomColorPicker">ReactiveCustomColorPicker</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="UserNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UserNotFoundException">
-							<rect x="10233.5" y="1197.0" height="31.0" width="208.0" data-name="UserNotFoundException"></rect>
+					<g data-name="ReactiveFormField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFormField">
+							<rect x="36442.5" y="121.0" height="31.0" width="163.0" data-name="ReactiveFormField"></rect>
 						</g>
-						<g transform="translate(10233.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserNotFoundException">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserNotFoundException">UserNotFoundException</text>
+						<g transform="translate(36442.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFormField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFormField">
+								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFormField">ReactiveFormField</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyUApiClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApiClient">
-							<rect x="58160.0" y="4288.0" height="333.0" width="479.0" data-name="StudyUApiClient"></rect>
-							<path d="M58160.0 4319.0 L58639.0 4319.0" fill="none" data-name="StudyUApiClient"></path>
-							<path d="M58160.0 4395.0 L58639.0 4395.0" fill="none" data-name="StudyUApiClient"></path>
+					<g data-name="TextParagraph">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TextParagraph">
+							<rect x="13934.0" y="2556.0" height="138.0" width="208.0" data-name="TextParagraph"></rect>
+							<path d="M13934.0 2587.0 L14142.0 2587.0" fill="none" data-name="TextParagraph"></path>
+							<path d="M13934.0 2663.0 L14142.0 2663.0" fill="none" data-name="TextParagraph"></path>
 						</g>
-						<g transform="translate(58160, 4288)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApiClient">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApiClient">StudyUApiClient</text>
+						<g transform="translate(13934, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextParagraph">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextParagraph">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextParagraph">TextParagraph</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58160, 4319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+supabaseClient: SupabaseClient</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyColumns: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+testDelayMilliseconds: int</text>
+						<g transform="translate(13934, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
+								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+text: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TextParagraph">+style: TextStyle?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TextParagraph">+selectable: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TextParagraph">+span: List&lt;TextSpan&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58160, 4395)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">+dynamic getUserStudies()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudy()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudyInvite()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudyInvite()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudyInvite()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchUser()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApiClient">+dynamic saveUser()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyUApiClient">-dynamic _awaitGuarded()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyUApiClient">-dynamic _apiException()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyUApiClient">-dynamic _testDelay()</text>
+						<g transform="translate(13934, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
+								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SupabaseClientDependant">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClientDependant">
-							<rect x="57953.0" y="4103.0" height="62.0" width="284.0" data-name="SupabaseClientDependant"></rect>
-							<path d="M57953.0 4134.0 L58237.0 4134.0" fill="none" data-name="SupabaseClientDependant"></path>
+					<g data-name="UnderConstruction">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UnderConstruction">
+							<rect x="36645.5" y="105.5" height="62.0" width="164.0" data-name="UnderConstruction"></rect>
+							<path d="M36645.5 136.5 L36809.5 136.5" fill="none" data-name="UnderConstruction"></path>
 						</g>
-						<g transform="translate(57953, 4103)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseClientDependant">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClientDependant">
-								<text x="134.0" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClientDependant">SupabaseClientDependant</text>
+						<g transform="translate(36645.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnderConstruction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnderConstruction">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="UnderConstruction">UnderConstruction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57953, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseClientDependant">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseClientDependant">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseClientDependant">+supabaseClient: SupabaseClient</text>
+						<g transform="translate(36645.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnderConstruction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnderConstruction">
+								<text x="0.0" y="13.5" stroke="none" data-name="UnderConstruction">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SupabaseQueryMixin">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryMixin">
-							<rect x="58292.0" y="4065.5" height="137.0" width="215.0" data-name="SupabaseQueryMixin"></rect>
-							<path d="M58292.0 4096.5 L58507.0 4096.5" fill="none" data-name="SupabaseQueryMixin"></path>
+					<g data-name="NullHelperDecoration">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NullHelperDecoration">
+							<rect x="36828.5" y="614.0" height="31.0" width="184.0" data-name="NullHelperDecoration"></rect>
 						</g>
-						<g transform="translate(58292, 4065.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseQueryMixin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryMixin">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryMixin">SupabaseQueryMixin</text>
+						<g transform="translate(36828.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NullHelperDecoration">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NullHelperDecoration">
+								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="NullHelperDecoration">NullHelperDecoration</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58292, 4096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryMixin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryMixin">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic deleteAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getById()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getByColumn()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseQueryMixin">+List&lt;T&gt; deserializeList()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SupabaseQueryMixin">+T deserializeObject()</text>
+					</g>
+					<g data-name="InputDecoration">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InputDecoration">
+							<rect x="36849.5" y="121.0" height="31.0" width="142.0" data-name="InputDecoration"></rect>
+						</g>
+						<g transform="translate(36849.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InputDecoration">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InputDecoration">
+								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="InputDecoration">InputDecoration</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IsFetched">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsFetched">
-							<rect x="6759.5" y="614.0" height="31.0" width="94.0" data-name="IsFetched"></rect>
+					<g data-name="ActionMenuType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuType">
+							<rect x="8839.0" y="3447.0" height="107.0" width="330.0" data-name="ActionMenuType"></rect>
+							<path d="M8839.0 3478.0 L9169.0 3478.0" fill="none" data-name="ActionMenuType"></path>
 						</g>
-						<g transform="translate(6759.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsFetched">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsFetched">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsFetched">IsFetched</text>
+						<g transform="translate(8839, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuType">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuType">ActionMenuType</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IsSaving">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaving">
-							<rect x="6893.5" y="614.0" height="31.0" width="84.0" data-name="IsSaving"></rect>
-						</g>
-						<g transform="translate(6893.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaving">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaving">
-								<text x="34.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaving">IsSaving</text>
+						<g transform="translate(8839, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuType">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+values: List&lt;ActionMenuType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+inline: ActionMenuType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+popup: ActionMenuType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IsSaved">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaved">
-							<rect x="7017.5" y="614.0" height="31.0" width="80.0" data-name="IsSaved"></rect>
+					<g data-name="HtmlStylingBanner">
+						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlStylingBanner">
+							<rect x="14182.0" y="2571.0" height="108.0" width="298.0" data-name="HtmlStylingBanner"></rect>
+							<path d="M14182.0 2602.0 L14480.0 2602.0" fill="none" data-name="HtmlStylingBanner"></path>
+							<path d="M14182.0 2648.0 L14480.0 2648.0" fill="none" data-name="HtmlStylingBanner"></path>
 						</g>
-						<g transform="translate(7017.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaved">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaved">
-								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaved">IsSaved</text>
+						<g transform="translate(14182, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlStylingBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlStylingBanner">
+								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlStylingBanner">HtmlStylingBanner</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IsDeleted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsDeleted">
-							<rect x="7137.5" y="614.0" height="31.0" width="91.0" data-name="IsDeleted"></rect>
+						<g transform="translate(14182, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
+								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+isDismissed: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="HtmlStylingBanner">+onDismissed: dynamic Function()?</text>
+								
+							</g>
 						</g>
-						<g transform="translate(7137.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsDeleted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsDeleted">
-								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="IsDeleted">IsDeleted</text>
+						<g transform="translate(14182, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
+								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SupabaseQueryError">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryError">
-							<rect x="10043.8" y="583.5" height="92.0" width="183.0" data-name="SupabaseQueryError"></rect>
-							<path d="M10043.8 614.5 L10226.8 614.5" fill="none" data-name="SupabaseQueryError"></path>
+					<g data-name="FormConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
+							<rect x="82075.0" y="105.5" height="62.0" width="192.0" data-name="FormConsumerWidget"></rect>
+							<path d="M82075.0 136.5 L82267.0 136.5" fill="none" data-name="FormConsumerWidget"></path>
 						</g>
-						<g transform="translate(10043.75, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseQueryError">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryError">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryError">SupabaseQueryError</text>
+						<g transform="translate(82075, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
+								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10043.75, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryError">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryError">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryError">+statusCode: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryError">+message: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryError">+details: dynamic</text>
+						<g transform="translate(82075, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerWidget">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepository">
-							<rect x="80915.5" y="3752.0" height="183.0" width="403.0" data-name="StudyRepository"></rect>
-							<path d="M80915.5 3783.0 L81318.5 3783.0" fill="none" data-name="StudyRepository"></path>
-							<path d="M80915.5 3859.0 L81318.5 3859.0" fill="none" data-name="StudyRepository"></path>
-						</g>
-						<g transform="translate(80915.5, 3752)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepository">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepository">StudyRepository</text>
-								
-							</g>
+					<g data-name="FormConsumerRefWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
+							<rect x="13485.5" y="1666.5" height="62.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
+							<path d="M13485.5 1697.5 L13704.5 1697.5" fill="none" data-name="FormConsumerRefWidget"></path>
 						</g>
-						<g transform="translate(80915.5, 3783)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+sortCallback: void Function()?</text>
+						<g transform="translate(13485.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
+								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80915.5, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+dynamic launch()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+						<g transform="translate(13485.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerRefWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerRefWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerRefWidget">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepositoryDelegate">
-							<rect x="81939.5" y="3744.5" height="198.0" width="282.0" data-name="StudyRepositoryDelegate"></rect>
-							<path d="M81939.5 3775.5 L82221.5 3775.5" fill="none" data-name="StudyRepositoryDelegate"></path>
-							<path d="M81939.5 3821.5 L82221.5 3821.5" fill="none" data-name="StudyRepositoryDelegate"></path>
-						</g>
-						<g transform="translate(81939.5, 3744.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepositoryDelegate">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepositoryDelegate">StudyRepositoryDelegate</text>
-								
-							</g>
+					<g data-name="SplashPage">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SplashPage">
+							<rect x="37316.5" y="105.5" height="62.0" width="136.0" data-name="SplashPage"></rect>
+							<path d="M37316.5 136.5 L37452.5 136.5" fill="none" data-name="SplashPage"></path>
 						</g>
-						<g transform="translate(81939.5, 3775.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+authRepository: IAuthRepository</text>
+						<g transform="translate(37316.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SplashPage">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SplashPage">SplashPage</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81939.5, 3821.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic onError()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createNewInstance()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createDuplicate()</text>
+						<g transform="translate(37316.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SplashPage">
+								<text x="0.0" y="13.5" stroke="none" data-name="SplashPage">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IUserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="67485.3" y="3439.0" height="123.0" width="260.0" data-name="IUserRepository"></rect>
-							<path d="M67485.3 3470.0 L67745.3 3470.0" fill="none" data-name="IUserRepository"></path>
-							<path d="M67485.3 3501.0 L67745.3 3501.0" fill="none" data-name="IUserRepository"></path>
+					<g data-name="ErrorPage">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ErrorPage">
+							<rect x="13283.5" y="1651.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
+							<path d="M13283.5 1682.0 L13445.5 1682.0" fill="none" data-name="ErrorPage"></path>
+							<path d="M13283.5 1713.0 L13445.5 1713.0" fill="none" data-name="ErrorPage"></path>
 						</g>
-						<g transform="translate(67485.25, 3439)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
+						<g transform="translate(13283.5, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ErrorPage">
+								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="ErrorPage">ErrorPage</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67485.25, 3470)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+user: StudyUUser</text>
+						<g transform="translate(13283.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
+								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+error: Exception?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67485.25, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+dynamic fetchUser()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IUserRepository">+dynamic saveUser()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IUserRepository">+dynamic updatePreferences()</text>
+						<g transform="translate(13283.5, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
+								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyUUser">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUUser">
-							<rect x="68335.0" y="4118.5" height="31.0" width="110.0" data-name="StudyUUser"></rect>
+					<g data-name="ConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
+							<rect x="29246.3" y="1197.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
 						</g>
-						<g transform="translate(68335, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUUser">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUUser">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUUser">StudyUUser</text>
+						<g transform="translate(29246.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="UserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UserRepository">
-							<rect x="67830.3" y="3759.5" height="168.0" width="282.0" data-name="UserRepository"></rect>
-							<path d="M67830.3 3790.5 L68112.3 3790.5" fill="none" data-name="UserRepository"></path>
-							<path d="M67830.3 3866.5 L68112.3 3866.5" fill="none" data-name="UserRepository"></path>
+					<g data-name="StudyULogo">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyULogo">
+							<rect x="16427.0" y="3797.0" height="93.0" width="214.0" data-name="StudyULogo"></rect>
+							<path d="M16427.0 3828.0 L16641.0 3828.0" fill="none" data-name="StudyULogo"></path>
+							<path d="M16427.0 3859.0 L16641.0 3859.0" fill="none" data-name="StudyULogo"></path>
 						</g>
-						<g transform="translate(67830.25, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserRepository">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserRepository">UserRepository</text>
+						<g transform="translate(16427, 3797)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyULogo">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyULogo">
+								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyULogo">StudyULogo</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67830.25, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+ref: Ref&lt;Object?&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="UserRepository">+user: StudyUUser</text>
+						<g transform="translate(16427, 3828)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+onTap: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67830.25, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+dynamic fetchUser()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+dynamic saveUser()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+dynamic updatePreferences()</text>
+						<g transform="translate(16427, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Ref">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Ref">
-							<rect x="68486.8" y="4118.5" height="31.0" width="43.0" data-name="Ref"></rect>
+					<g data-name="SingleColumnLayout">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayout">
+							<rect x="14520.0" y="2526.0" height="198.0" width="418.0" data-name="SingleColumnLayout"></rect>
+							<path d="M14520.0 2557.0 L14938.0 2557.0" fill="none" data-name="SingleColumnLayout"></path>
+							<path d="M14520.0 2693.0 L14938.0 2693.0" fill="none" data-name="SingleColumnLayout"></path>
 						</g>
-						<g transform="translate(68486.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Ref">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Ref">
-								<text x="13.5" y="13.5" stroke="none" text-anchor="middle" data-name="Ref">Ref</text>
+						<g transform="translate(14520, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayout">
+								<text x="201.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayout">SingleColumnLayout</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PreferenceAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreferenceAction">
-							<rect x="424.0" y="3447.0" height="107.0" width="334.0" data-name="PreferenceAction"></rect>
-							<path d="M424.0 3478.0 L758.0 3478.0" fill="none" data-name="PreferenceAction"></path>
-						</g>
-						<g transform="translate(424, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreferenceAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreferenceAction">
-								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="PreferenceAction">PreferenceAction</text>
+						<g transform="translate(14520, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraints: BoxConstraints</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraintsNarrow: BoxConstraints</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayout">+body: Widget</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayout">+header: Widget?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayout">+stickyHeader: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayout">+constraints: BoxConstraints?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="SingleColumnLayout">+scroll: bool</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="SingleColumnLayout">+padding: EdgeInsets?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(424, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreferenceAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreferenceAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreferenceAction">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+values: List&lt;PreferenceAction&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pin: PreferenceAction</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pinOff: PreferenceAction</text>
+						<g transform="translate(14520, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+dynamic fromType()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IAppRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppRepository">
-							<rect x="10959.3" y="3462.0" height="77.0" width="230.0" data-name="IAppRepository"></rect>
-							<path d="M10959.3 3493.0 L11189.3 3493.0" fill="none" data-name="IAppRepository"></path>
+					<g data-name="SingleColumnLayoutType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
+							<rect x="27032.3" y="3432.0" height="137.0" width="426.0" data-name="SingleColumnLayoutType"></rect>
+							<path d="M27032.3 3463.0 L27458.3 3463.0" fill="none" data-name="SingleColumnLayoutType"></path>
 						</g>
-						<g transform="translate(10959.25, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppRepository">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAppRepository">IAppRepository</text>
+						<g transform="translate(27032.25, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
+								<text x="205.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10959.25, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppRepository">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAppRepository">+void dispose()</text>
+						<g transform="translate(27032.25, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayoutType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayoutType">
+								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayoutType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedWide: SingleColumnLayoutType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedNarrow: SingleColumnLayoutType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+stretched: SingleColumnLayoutType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+split: SingleColumnLayoutType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppRepository">
-							<rect x="10959.3" y="3789.5" height="108.0" width="230.0" data-name="AppRepository"></rect>
-							<path d="M10959.3 3820.5 L11189.3 3820.5" fill="none" data-name="AppRepository"></path>
-							<path d="M10959.3 3851.5 L11189.3 3851.5" fill="none" data-name="AppRepository"></path>
-						</g>
-						<g transform="translate(10959.25, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppRepository">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppRepository">AppRepository</text>
-								
-							</g>
+					<g data-name="Hyperlink">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Hyperlink">
+							<rect x="15615.0" y="2519.0" height="212.0" width="222.0" data-name="Hyperlink"></rect>
+							<path d="M15615.0 2550.0 L15837.0 2550.0" fill="none" data-name="Hyperlink"></path>
 						</g>
-						<g transform="translate(10959.25, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+apiClient: StudyUApi</text>
+						<g transform="translate(15615, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Hyperlink">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Hyperlink">
+								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="Hyperlink">Hyperlink</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10959.25, 3851.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppRepository">+void dispose()</text>
+						<g transform="translate(15615, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Hyperlink">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Hyperlink">
+								<text x="0.0" y="13.5" stroke="none" data-name="Hyperlink">+text: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Hyperlink">+url: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Hyperlink">+onClick: void Function()?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Hyperlink">+linkColor: Color</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Hyperlink">+hoverColor: Color?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Hyperlink">+visitedColor: Color?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Hyperlink">+style: TextStyle?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Hyperlink">+hoverStyle: TextStyle?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="Hyperlink">+visitedStyle: TextStyle?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="Hyperlink">+icon: IconData?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="Hyperlink">+iconSize: double?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WebFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
-							<rect x="61111.0" y="82.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
-							<path d="M61111.0 113.5 L61280.0 113.5" fill="none" data-name="WebFrame"></path>
-							<path d="M61111.0 159.5 L61280.0 159.5" fill="none" data-name="WebFrame"></path>
+					<g data-name="StandardTableColumn">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableColumn">
+							<rect x="21586.0" y="2556.5" height="137.0" width="287.0" data-name="StandardTableColumn"></rect>
+							<path d="M21586.0 2587.5 L21873.0 2587.5" fill="none" data-name="StandardTableColumn"></path>
 						</g>
-						<g transform="translate(61111, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
+						<g transform="translate(21586, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableColumn">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableColumn">StandardTableColumn</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61111, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
+						<g transform="translate(21586, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableColumn">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableColumn">+label: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableColumn">+tooltip: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableColumn">+columnWidth: TableColumnWidth</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableColumn">+sortable: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StandardTableColumn">+sortAscending: bool?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StandardTableColumn">+sortableIcon: Widget?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61111, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
+					</g>
+					<g data-name="TableColumnWidth">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TableColumnWidth">
+							<rect x="24211.3" y="3485.0" height="31.0" width="165.0" data-name="TableColumnWidth"></rect>
+						</g>
+						<g transform="translate(24211.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TableColumnWidth">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableColumnWidth">
+								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableColumnWidth">TableColumnWidth</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DisabledFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
-							<rect x="61320.0" y="105.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
-							<path d="M61320.0 136.5 L61456.0 136.5" fill="none" data-name="DisabledFrame"></path>
+					<g data-name="StandardTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTable">
+							<rect x="19871.8" y="1501.5" height="392.0" width="688.0" data-name="StandardTable"></rect>
+							<path d="M19871.8 1532.5 L20559.8 1532.5" fill="none" data-name="StandardTable"></path>
 						</g>
-						<g transform="translate(61320, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
+						<g transform="translate(19871.75, 1501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTable">
+								<text x="336.0" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTable">StandardTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61320, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
+						<g transform="translate(19871.75, 1532.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardTable">+items: List&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StandardTable">+inputColumns: List&lt;StandardTableColumn&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StandardTable">+onSelectItem: void Function(T)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StandardTable">+trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StandardTable">+trailingActionsMenuType: ActionMenuType?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StandardTable">+sortColumnPredicates: List&lt;int Function(T, T)?&gt;?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StandardTable">+pinnedPredicates: int Function(T, T)?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StandardTable">+headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StandardTable">+dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StandardTable">+inputTrailingActionsColumn: StandardTableColumn</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StandardTable">+tableWrapper: Widget Function(Widget)?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StandardTable">+cellSpacing: double</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StandardTable">+rowSpacing: double</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StandardTable">+minRowHeight: double?</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StandardTable">+showTableHeader: bool</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StandardTable">+hideLeadingTrailingWhenEmpty: bool</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StandardTable">+leadingWidget: Widget?</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StandardTable">+trailingWidget: Widget?</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StandardTable">+leadingWidgetSpacing: double?</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="StandardTable">+trailingWidgetSpacing: double?</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="StandardTable">+emptyWidget: Widget?</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="StandardTable">+rowStyle: StandardTableStyle</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="StandardTable">+disableRowInteractions: bool</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="void Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
+							<rect x="25512.0" y="3485.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
+						</g>
+						<g transform="translate(25512, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
+								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PhoneContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
-							<rect x="11099.0" y="2518.5" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
-							<path d="M11099.0 2549.5 L11426.0 2549.5" fill="none" data-name="PhoneContainer"></path>
-							<path d="M11099.0 2700.5 L11426.0 2700.5" fill="none" data-name="PhoneContainer"></path>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
+							<rect x="18928.3" y="2609.5" height="31.0" width="381.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?"></rect>
 						</g>
-						<g transform="translate(11099, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
-								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
+						<g transform="translate(18928.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
+								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11099, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
-								
-							</g>
+					</g>
+					<g data-name="int Function(T, T)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(T, T)?">
+							<rect x="19389.3" y="2609.5" height="31.0" width="160.0" data-name="int Function(T, T)?"></rect>
 						</g>
-						<g transform="translate(11099, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
+						<g transform="translate(19389.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(T, T)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(T, T)?">
+								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(T, T)?">int Function(T, T)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="39892.3" y="3485.0" height="31.0" width="71.0" data-name="Widget"></rect>
+					<g data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+							<rect x="19589.3" y="2609.5" height="31.0" width="523.0" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?"></rect>
 						</g>
-						<g transform="translate(39892.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
+						<g transform="translate(19589.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+								<text x="253.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MobileFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
-							<rect x="61496.0" y="105.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
-							<path d="M61496.0 136.5 L61632.0 136.5" fill="none" data-name="MobileFrame"></path>
+					<g data-name="StandardTableStyle">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableStyle">
+							<rect x="9715.0" y="3447.0" height="107.0" width="353.0" data-name="StandardTableStyle"></rect>
+							<path d="M9715.0 3478.0 L10068.0 3478.0" fill="none" data-name="StandardTableStyle"></path>
 						</g>
-						<g transform="translate(61496, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
+						<g transform="translate(9715, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableStyle">
+								<text x="168.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableStyle">StandardTableStyle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61496, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
+						<g transform="translate(9715, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableStyle">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableStyle">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+values: List&lt;StandardTableStyle&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+plain: StandardTableStyle</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+material: StandardTableStyle</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DesktopFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
-							<rect x="61672.0" y="105.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
-							<path d="M61672.0 136.5 L61808.0 136.5" fill="none" data-name="DesktopFrame"></path>
+					<g data-name="IconPack">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPack">
+							<rect x="37492.5" y="82.5" height="108.0" width="359.0" data-name="IconPack"></rect>
+							<path d="M37492.5 113.5 L37851.5 113.5" fill="none" data-name="IconPack"></path>
+							<path d="M37492.5 159.5 L37851.5 159.5" fill="none" data-name="IconPack"></path>
 						</g>
-						<g transform="translate(61672, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
+						<g transform="translate(37492.5, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPack">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPack">
+								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPack">IconPack</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61672, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
+						<g transform="translate(37492.5, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+defaultPack: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPack">&lt;static&gt;+material: List&lt;IconOption&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(37492.5, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+IconOption? resolveIconByName()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
-							<rect x="10195.0" y="2511.0" height="228.0" width="573.0" data-name="StudyController"></rect>
-							<path d="M10195.0 2542.0 L10768.0 2542.0" fill="none" data-name="StudyController"></path>
-							<path d="M10195.0 2603.0 L10768.0 2603.0" fill="none" data-name="StudyController"></path>
+					<g data-name="IconOption">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconOption">
+							<rect x="23053.0" y="2548.5" height="153.0" width="264.0" data-name="IconOption"></rect>
+							<path d="M23053.0 2579.5 L23317.0 2579.5" fill="none" data-name="IconOption"></path>
+							<path d="M23053.0 2655.5 L23317.0 2655.5" fill="none" data-name="IconOption"></path>
 						</g>
-						<g transform="translate(10195, 2511)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
-								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
+						<g transform="translate(23053, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconOption">
+								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="IconOption">IconOption</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10195, 2542)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+						<g transform="translate(23053, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+name: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconOption">+isEmpty: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IconOption">+props: List&lt;Object?&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10195, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
+						<g transform="translate(23053, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+String toJson()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">&lt;static&gt;+IconOption fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="INotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="40720.8" y="3447.0" height="107.0" width="395.0" data-name="INotificationService"></rect>
-							<path d="M40720.8 3478.0 L41115.8 3478.0" fill="none" data-name="INotificationService"></path>
+					<g data-name="Equatable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
+							<rect x="22666.5" y="1682.0" height="31.0" width="96.0" data-name="Equatable"></rect>
 						</g>
-						<g transform="translate(40720.75, 3447)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
-								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
+						<g transform="translate(22666.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
+								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40720.75, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="INotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="INotificationService">+void showMessage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="INotificationService">+void show()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="INotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="INotificationService">+void dispose()</text>
+					</g>
+					<g data-name="ReactiveIconPicker">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveIconPicker">
+							<rect x="37070.0" y="614.0" height="31.0" width="168.0" data-name="ReactiveIconPicker"></rect>
+						</g>
+						<g transform="translate(37070, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveIconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveIconPicker">
+								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveIconPicker">ReactiveIconPicker</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="59150.0" y="3485.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+					<g data-name="ReactiveFocusableFormField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFocusableFormField">
+							<rect x="37031.5" y="121.0" height="31.0" width="245.0" data-name="ReactiveFocusableFormField"></rect>
 						</g>
-						<g transform="translate(59150, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
+						<g transform="translate(37031.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFocusableFormField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFocusableFormField">
+								<text x="114.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFocusableFormField">ReactiveFocusableFormField</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyBaseController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="58157.5" y="538.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
-							<path d="M58157.5 569.0 L58703.5 569.0" fill="none" data-name="StudyBaseController"></path>
-							<path d="M58157.5 645.0 L58703.5 645.0" fill="none" data-name="StudyBaseController"></path>
+					<g data-name="IconPicker">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPicker">
+							<rect x="23138.0" y="1606.0" height="183.0" width="319.0" data-name="IconPicker"></rect>
+							<path d="M23138.0 1637.0 L23457.0 1637.0" fill="none" data-name="IconPicker"></path>
+							<path d="M23138.0 1758.0 L23457.0 1758.0" fill="none" data-name="IconPicker"></path>
 						</g>
-						<g transform="translate(58157.5, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
-								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
+						<g transform="translate(23138, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPicker">
+								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPicker">IconPicker</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58157.5, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
+						<g transform="translate(23138, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+iconOptions: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPicker">+selectedOption: IconOption?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconPicker">+onSelect: void Function(IconOption)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IconPicker">+galleryIconSize: double?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IconPicker">+selectedIconSize: double?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IconPicker">+focusNode: FocusNode?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="IconPicker">+isDisabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58157.5, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
+						<g transform="translate(23138, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyAppBarViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
-							<rect x="6311.3" y="3454.5" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
-							<path d="M6311.3 3485.5 L6554.3 3485.5" fill="none" data-name="IStudyAppBarViewModel"></path>
+					<g data-name="void Function(IconOption)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(IconOption)?">
+							<rect x="23605.5" y="2609.5" height="31.0" width="230.0" data-name="void Function(IconOption)?"></rect>
 						</g>
-						<g transform="translate(6311.25, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
+						<g transform="translate(23605.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(IconOption)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(IconOption)?">
+								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(IconOption)?">void Function(IconOption)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6311.25, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
+					</g>
+					<g data-name="FocusNode">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FocusNode">
+							<rect x="23404.0" y="2609.5" height="31.0" width="106.0" data-name="FocusNode"></rect>
+						</g>
+						<g transform="translate(23404, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FocusNode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FocusNode">
+								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="FocusNode">FocusNode</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyStatusBadgeViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
-							<rect x="11819.0" y="2586.5" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
-							<path d="M11819.0 2617.5 L12104.0 2617.5" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
+					<g data-name="IconPickerField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerField">
+							<rect x="23497.0" y="1606.0" height="183.0" width="319.0" data-name="IconPickerField"></rect>
+							<path d="M23497.0 1637.0 L23816.0 1637.0" fill="none" data-name="IconPickerField"></path>
+							<path d="M23497.0 1758.0 L23816.0 1758.0" fill="none" data-name="IconPickerField"></path>
 						</g>
-						<g transform="translate(11819, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
+						<g transform="translate(23497, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerField">
+								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerField">IconPickerField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11819, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
+						<g transform="translate(23497, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+iconOptions: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerField">+selectedOption: IconOption?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerField">+selectedIconSize: double?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IconPickerField">+galleryIconSize: double?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IconPickerField">+onSelect: void Function(IconOption)?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IconPickerField">+focusNode: FocusNode?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="IconPickerField">+isDisabled: bool</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IStudyNavViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
-							<rect x="12144.0" y="2556.5" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
-							<path d="M12144.0 2587.5 L12385.0 2587.5" fill="none" data-name="IStudyNavViewModel"></path>
-						</g>
-						<g transform="translate(12144, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
+						<g transform="translate(23497, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12144, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
+					</g>
+					<g data-name="IconPickerGallery">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerGallery">
+							<rect x="23856.0" y="1636.0" height="123.0" width="319.0" data-name="IconPickerGallery"></rect>
+							<path d="M23856.0 1667.0 L24175.0 1667.0" fill="none" data-name="IconPickerGallery"></path>
+							<path d="M23856.0 1728.0 L24175.0 1728.0" fill="none" data-name="IconPickerGallery"></path>
+						</g>
+						<g transform="translate(23856, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerGallery">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerGallery">
+								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerGallery">IconPickerGallery</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
-							<rect x="12508.3" y="1091.5" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
-							<path d="M12508.3 1122.5 L12843.3 1122.5" fill="none" data-name="StudyScaffold"></path>
-						</g>
-						<g transform="translate(12508.25, 1091.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
-								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
+						<g transform="translate(23856, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+iconOptions: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerGallery">+onSelect: void Function(IconOption)?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerGallery">+iconSize: double</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12508.25, 1122.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
+						<g transform="translate(23856, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NavbarTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="12334.8" y="1644.0" height="107.0" width="196.0" data-name="NavbarTab"></rect>
-							<path d="M12334.8 1675.0 L12530.8 1675.0" fill="none" data-name="NavbarTab"></path>
+					<g data-name="SecondaryButton">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SecondaryButton">
+							<rect x="20152.3" y="2556.0" height="138.0" width="249.0" data-name="SecondaryButton"></rect>
+							<path d="M20152.3 2587.0 L20401.3 2587.0" fill="none" data-name="SecondaryButton"></path>
+							<path d="M20152.3 2663.0 L20401.3 2663.0" fill="none" data-name="SecondaryButton"></path>
 						</g>
-						<g transform="translate(12334.75, 1644)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
+						<g transform="translate(20152.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecondaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecondaryButton">
+								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecondaryButton">SecondaryButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12334.75, 1675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NavbarTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="NavbarTab">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NavbarTab">+intent: RoutingIntent?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NavbarTab">+index: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NavbarTab">+enabled: bool</text>
+						<g transform="translate(20152.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+text: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SecondaryButton">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SecondaryButton">+isLoading: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SecondaryButton">+onPressed: void Function()?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(20152.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="21406.8" y="1651.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
-							<path d="M21406.8 1682.0 L21570.8 1682.0" fill="none" data-name="StudyPageWidget"></path>
-							<path d="M21406.8 1713.0 L21570.8 1713.0" fill="none" data-name="StudyPageWidget"></path>
+					<g data-name="TwoColumnLayout">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TwoColumnLayout">
+							<rect x="20637.5" y="2466.5" height="317.0" width="368.0" data-name="TwoColumnLayout"></rect>
+							<path d="M20637.5 2497.5 L21005.5 2497.5" fill="none" data-name="TwoColumnLayout"></path>
 						</g>
-						<g transform="translate(21406.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
+						<g transform="translate(20637.5, 2466.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TwoColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TwoColumnLayout">
+								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="TwoColumnLayout">TwoColumnLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21406.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
+						<g transform="translate(20637.5, 2497.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TwoColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TwoColumnLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultDivider: VerticalDivider</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultContentPadding: EdgeInsets</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+slimContentPadding: EdgeInsets</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TwoColumnLayout">+leftWidget: Widget</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TwoColumnLayout">+rightWidget: Widget</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TwoColumnLayout">+dividerWidget: Widget?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="TwoColumnLayout">+headerWidget: Widget?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="TwoColumnLayout">+flexLeft: int?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="TwoColumnLayout">+flexRight: int?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="TwoColumnLayout">+constraintsLeft: BoxConstraints?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="TwoColumnLayout">+constraintsRight: BoxConstraints?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="TwoColumnLayout">+scrollLeft: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="TwoColumnLayout">+scrollRight: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="TwoColumnLayout">+paddingLeft: EdgeInsets?</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="TwoColumnLayout">+paddingRight: EdgeInsets?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorLeft: Color?</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorRight: Color?</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="TwoColumnLayout">+stretchHeight: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21406.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
+					</g>
+					<g data-name="VerticalDivider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="VerticalDivider">
+							<rect x="20438.5" y="3485.0" height="31.0" width="130.0" data-name="VerticalDivider"></rect>
+						</g>
+						<g transform="translate(20438.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VerticalDivider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VerticalDivider">
+								<text x="57.0" y="13.5" stroke="none" text-anchor="middle" data-name="VerticalDivider">VerticalDivider</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SingleColumnLayoutType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="5795.3" y="3432.0" height="137.0" width="426.0" data-name="SingleColumnLayoutType"></rect>
-							<path d="M5795.3 3463.0 L6221.3 3463.0" fill="none" data-name="SingleColumnLayoutType"></path>
+					<g data-name="AppTranslation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppTranslation">
+							<rect x="38170.5" y="105.5" height="62.0" width="194.0" data-name="AppTranslation"></rect>
+							<path d="M38170.5 136.5 L38364.5 136.5" fill="none" data-name="AppTranslation"></path>
 						</g>
-						<g transform="translate(5795.25, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
-								<text x="205.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
+						<g transform="translate(38170.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppTranslation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppTranslation">
+								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppTranslation">AppTranslation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5795.25, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayoutType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayoutType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedWide: SingleColumnLayoutType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedNarrow: SingleColumnLayoutType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+stretched: SingleColumnLayoutType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+split: SingleColumnLayoutType</text>
+						<g transform="translate(38170.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppTranslation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppTranslation">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppTranslation">&lt;static&gt;+dynamic init()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PreviewFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
-							<rect x="14853.3" y="1166.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
-							<path d="M14853.3 1197.5 L15144.3 1197.5" fill="none" data-name="PreviewFrame"></path>
+					<g data-name="PlatformLocale">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocale">
+							<rect x="37891.5" y="105.5" height="62.0" width="239.0" data-name="PlatformLocale"></rect>
+							<path d="M37891.5 136.5 L38130.5 136.5" fill="none" data-name="PlatformLocale"></path>
 						</g>
-						<g transform="translate(14853.25, 1166.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
+						<g transform="translate(37891.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformLocale">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocale">
+								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocale">PlatformLocale</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14853.25, 1197.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
+						<g transform="translate(37891.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocale">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocale">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocale">+Locale getPlatformLocale()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RouteInformation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
-							<rect x="6594.3" y="3431.5" height="138.0" width="152.0" data-name="RouteInformation"></rect>
-							<path d="M6594.3 3462.5 L6746.3 3462.5" fill="none" data-name="RouteInformation"></path>
-							<path d="M6594.3 3538.5 L6746.3 3538.5" fill="none" data-name="RouteInformation"></path>
-						</g>
-						<g transform="translate(6594.25, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
-								
-							</g>
+					<g data-name="PlatformLocaleWeb">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleWeb">
+							<rect x="37584.8" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleWeb"></rect>
+							<path d="M37584.8 629.5 L37823.8 629.5" fill="none" data-name="PlatformLocaleWeb"></path>
 						</g>
-						<g transform="translate(6594.25, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
+						<g transform="translate(37584.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleWeb">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleWeb">
+								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleWeb">PlatformLocaleWeb</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6594.25, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
+						<g transform="translate(37584.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleWeb">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleWeb">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleWeb">+Locale getPlatformLocale()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
-							<rect x="12425.0" y="2496.0" height="258.0" width="302.0" data-name="PlatformController"></rect>
-							<path d="M12425.0 2527.0 L12727.0 2527.0" fill="none" data-name="PlatformController"></path>
-							<path d="M12425.0 2618.0 L12727.0 2618.0" fill="none" data-name="PlatformController"></path>
+					<g data-name="PlatformLocaleMobile">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleMobile">
+							<rect x="38063.8" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleMobile"></rect>
+							<path d="M38063.8 629.5 L38302.8 629.5" fill="none" data-name="PlatformLocaleMobile"></path>
 						</g>
-						<g transform="translate(12425, 2496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
-								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
+						<g transform="translate(38063.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleMobile">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleMobile">
+								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleMobile">PlatformLocaleMobile</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12425, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
+						<g transform="translate(38063.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleMobile">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleMobile">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleMobile">+Locale getPlatformLocale()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12425, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
+					</g>
+					<g data-name="LanguagePicker">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePicker">
+							<rect x="21180.0" y="2579.0" height="92.0" width="366.0" data-name="LanguagePicker"></rect>
+							<path d="M21180.0 2610.0 L21546.0 2610.0" fill="none" data-name="LanguagePicker"></path>
+						</g>
+						<g transform="translate(21180, 2579)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePicker">
+								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePicker">LanguagePicker</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="WebController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
-							<rect x="6786.3" y="3401.5" height="198.0" width="273.0" data-name="WebController"></rect>
-							<path d="M6786.3 3432.5 L7059.3 3432.5" fill="none" data-name="WebController"></path>
-							<path d="M6786.3 3463.5 L7059.3 3463.5" fill="none" data-name="WebController"></path>
-						</g>
-						<g transform="translate(6786.25, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
-								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
+						<g transform="translate(21180, 2610)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePicker">
+								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePicker">+languagePickerType: LanguagePickerType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePicker">+iconColor: Color?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePicker">+offset: Offset?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6786.25, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
+					</g>
+					<g data-name="LanguagePickerType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePickerType">
+							<rect x="9259.0" y="3447.0" height="107.0" width="366.0" data-name="LanguagePickerType"></rect>
+							<path d="M9259.0 3478.0 L9625.0 3478.0" fill="none" data-name="LanguagePickerType"></path>
+						</g>
+						<g transform="translate(9259, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePickerType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePickerType">
+								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePickerType">LanguagePickerType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6786.25, 3463.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
+						<g transform="translate(9259, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePickerType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePickerType">
+								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePickerType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+values: List&lt;LanguagePickerType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+field: LanguagePickerType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+icon: LanguagePickerType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFrameElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
-							<rect x="6855.3" y="3828.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
+					<g data-name="Offset">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Offset">
+							<rect x="24108.3" y="3485.0" height="31.0" width="63.0" data-name="Offset"></rect>
 						</g>
-						<g transform="translate(6855.25, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
+						<g transform="translate(24108.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Offset">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Offset">
+								<text x="23.5" y="13.5" stroke="none" text-anchor="middle" data-name="Offset">Offset</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MobileController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
-							<rect x="7099.3" y="3417.0" height="167.0" width="191.0" data-name="MobileController"></rect>
-							<path d="M7099.3 3448.0 L7290.3 3448.0" fill="none" data-name="MobileController"></path>
+					<g data-name="GoRouteParamEnum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouteParamEnum">
+							<rect x="38756.5" y="98.0" height="77.0" width="202.0" data-name="GoRouteParamEnum"></rect>
+							<path d="M38756.5 129.0 L38958.5 129.0" fill="none" data-name="GoRouteParamEnum"></path>
 						</g>
-						<g transform="translate(7099.25, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
+						<g transform="translate(38756.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GoRouteParamEnum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouteParamEnum">
+								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouteParamEnum">GoRouteParamEnum</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7099.25, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
+						<g transform="translate(38756.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouteParamEnum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouteParamEnum">
+								<text x="0.0" y="13.5" stroke="none" data-name="GoRouteParamEnum">+String toRouteParam()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="GoRouteParamEnum">+String toShortString()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyParticipationBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
-							<rect x="12767.0" y="2556.0" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
-							<path d="M12767.0 2587.0 L12998.0 2587.0" fill="none" data-name="StudyParticipationBadge"></path>
-							<path d="M12767.0 2663.0 L12998.0 2663.0" fill="none" data-name="StudyParticipationBadge"></path>
-						</g>
-						<g transform="translate(12767, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
-								
-							</g>
+					<g data-name="RoutingIntents">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntents">
+							<rect x="24765.8" y="1479.0" height="437.0" width="572.0" data-name="RoutingIntents"></rect>
+							<path d="M24765.8 1510.0 L25337.8 1510.0" fill="none" data-name="RoutingIntents"></path>
 						</g>
-						<g transform="translate(12767, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
+						<g transform="translate(24765.75, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntents">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntents">
+								<text x="278.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntents">RoutingIntents</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12767, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
+						<g transform="translate(24765.75, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntents">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntents">
+								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+root: RoutingIntent</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studies: RoutingIntent</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studiesShared: RoutingIntent</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+publicRegistry: RoutingIntent</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+study: RoutingIntent Function(String)</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEdit: RoutingIntent Function(String)</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInfo: RoutingIntent Function(String)</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String)</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInterventions: RoutingIntent Function(String)</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String)</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String)</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditReports: RoutingIntent Function(String)</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String)</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute})</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyRecruit: RoutingIntent Function(String)</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyMonitor: RoutingIntent Function(String)</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyAnalyze: RoutingIntent Function(String)</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studySettings: RoutingIntent Function(String)</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+accountSettings: RoutingIntent</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyNew: RoutingIntent</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+login: RoutingIntent</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+signup: RoutingIntent</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot: RoutingIntent</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot2: RoutingIntent Function(String)</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordRecovery: RoutingIntent</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+error: RoutingIntent Function(Exception)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="13173.0" y="3485.0" height="31.0" width="114.0" data-name="Participation"></rect>
+					<g data-name="RoutingIntent Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String)">
+							<rect x="24191.8" y="2609.5" height="31.0" width="253.0" data-name="RoutingIntent Function(String)"></rect>
 						</g>
-						<g transform="translate(13173, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
+						<g transform="translate(24191.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String)">
+								<text x="118.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String)">RoutingIntent Function(String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="24215.0" y="3432.0" height="137.0" width="288.0" data-name="BadgeType"></rect>
-							<path d="M24215.0 3463.0 L24503.0 3463.0" fill="none" data-name="BadgeType"></path>
-						</g>
-						<g transform="translate(24215, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
-								
-							</g>
+					<g data-name="RoutingIntent Function(String, String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, String)">
+							<rect x="24880.8" y="2609.5" height="31.0" width="309.0" data-name="RoutingIntent Function(String, String)"></rect>
 						</g>
-						<g transform="translate(24215, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BadgeType">
-								<text x="0.0" y="13.5" stroke="none" data-name="BadgeType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BadgeType">&lt;static&gt;+values: List&lt;BadgeType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BadgeType">&lt;static&gt;+filled: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlined: BadgeType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlineFill: BadgeType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BadgeType">&lt;static&gt;+plain: BadgeType</text>
+						<g transform="translate(24880.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, String)">
+								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, String)">RoutingIntent Function(String, String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTestScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
-							<rect x="18659.3" y="2548.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
-							<path d="M18659.3 2579.5 L18859.3 2579.5" fill="none" data-name="StudyTestScreen"></path>
-							<path d="M18659.3 2610.5 L18859.3 2610.5" fill="none" data-name="StudyTestScreen"></path>
+					<g data-name="RoutingIntent Function(String, {String? appRoute})">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, {String? appRoute})">
+							<rect x="25229.8" y="2609.5" height="31.0" width="413.0" data-name="RoutingIntent Function(String, {String? appRoute})"></rect>
 						</g>
-						<g transform="translate(18659.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
-								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
+						<g transform="translate(25229.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, {String? appRoute})">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, {String? appRoute})">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, {String? appRoute})">RoutingIntent Function(String, {String? appRoute})</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18659.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
+					</g>
+					<g data-name="RoutingIntent Function(Exception)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(Exception)">
+							<rect x="25682.8" y="2609.5" height="31.0" width="285.0" data-name="RoutingIntent Function(Exception)"></rect>
+						</g>
+						<g transform="translate(25682.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(Exception)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(Exception)">
+								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(Exception)">RoutingIntent Function(Exception)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18659.25, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
+					</g>
+					<g data-name="GoRoute">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRoute">
+							<rect x="44440.8" y="3485.0" height="31.0" width="86.0" data-name="GoRoute"></rect>
+						</g>
+						<g transform="translate(44440.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRoute">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRoute">
+								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRoute">GoRoute</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TestAppRoutes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
-							<rect x="61848.0" y="68.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
-							<path d="M61848.0 99.0 L62108.0 99.0" fill="none" data-name="TestAppRoutes"></path>
+					<g data-name="RoutingIntentDispatch">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntentDispatch">
+							<rect x="14171.5" y="3447.0" height="107.0" width="373.0" data-name="RoutingIntentDispatch"></rect>
+							<path d="M14171.5 3478.0 L14544.5 3478.0" fill="none" data-name="RoutingIntentDispatch"></path>
 						</g>
-						<g transform="translate(61848, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
+						<g transform="translate(14171.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntentDispatch">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntentDispatch">
+								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntentDispatch">RoutingIntentDispatch</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61848, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
-								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
+						<g transform="translate(14171.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntentDispatch">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntentDispatch">
+								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntentDispatch">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+go: RoutingIntentDispatch</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+push: RoutingIntentDispatch</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
-							<rect x="62148.0" y="68.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
-							<path d="M62148.0 99.0 L62381.0 99.0" fill="none" data-name="StudyNav"></path>
+					<g data-name="RouterKeys">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouterKeys">
+							<rect x="38404.5" y="98.0" height="77.0" width="312.0" data-name="RouterKeys"></rect>
+							<path d="M38404.5 129.0 L38716.5 129.0" fill="none" data-name="RouterKeys"></path>
 						</g>
-						<g transform="translate(62148, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
+						<g transform="translate(38404.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterKeys">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterKeys">
+								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterKeys">RouterKeys</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62148, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
+						<g transform="translate(38404.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterKeys">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterKeys">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+studyKey: ValueKey&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+authKey: ValueKey&lt;String&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
-							<rect x="62421.0" y="68.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
-							<path d="M62421.0 99.0 L62709.0 99.0" fill="none" data-name="StudyDesignNav"></path>
-						</g>
-						<g transform="translate(62421, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
-								
-							</g>
+					<g data-name="ValueKey">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ValueKey">
+							<rect x="38515.0" y="614.0" height="31.0" width="91.0" data-name="ValueKey"></rect>
 						</g>
-						<g transform="translate(62421, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
+						<g transform="translate(38515, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueKey">
+								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueKey">ValueKey</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTestController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
-							<rect x="56786.3" y="3805.0" height="77.0" width="282.0" data-name="StudyTestController"></rect>
-							<path d="M56786.3 3836.0 L57068.3 3836.0" fill="none" data-name="StudyTestController"></path>
+					<g data-name="RouteParams">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouteParams">
+							<rect x="39171.5" y="75.5" height="122.0" width="267.0" data-name="RouteParams"></rect>
+							<path d="M39171.5 106.5 L39438.5 106.5" fill="none" data-name="RouteParams"></path>
 						</g>
-						<g transform="translate(56786.25, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
+						<g transform="translate(39171.5, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteParams">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteParams">
+								<text x="125.5" y="13.5" stroke="none" text-anchor="middle" data-name="RouteParams">RouteParams</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56786.25, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
+						<g transform="translate(39171.5, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteParams">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteParams">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studiesFilter: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RouteParams">&lt;static&gt;+measurementId: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RouteParams">&lt;static&gt;+interventionId: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="RouteParams">&lt;static&gt;+testAppRoute: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
-							<rect x="7330.3" y="3485.0" height="31.0" width="111.0" data-name="StudyStatus"></rect>
+					<g data-name="RouterConf">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouterConf">
+							<rect x="22033.0" y="2556.0" height="138.0" width="326.0" data-name="RouterConf"></rect>
+							<path d="M22033.0 2587.0 L22359.0 2587.0" fill="none" data-name="RouterConf"></path>
+							<path d="M22033.0 2663.0 L22359.0 2663.0" fill="none" data-name="RouterConf"></path>
 						</g>
-						<g transform="translate(7330.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
-								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
+						<g transform="translate(22033, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterConf">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterConf">
+								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterConf">RouterConf</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyStatusBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
-							<rect x="13408.0" y="2548.5" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
-							<path d="M13408.0 2579.5 L13649.0 2579.5" fill="none" data-name="StudyStatusBadge"></path>
-							<path d="M13408.0 2670.5 L13649.0 2670.5" fill="none" data-name="StudyStatusBadge"></path>
-						</g>
-						<g transform="translate(13408, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
+						<g transform="translate(22033, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+router: GoRouter</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouterConf">&lt;static&gt;+routes: List&lt;GoRoute&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RouterConf">&lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RouterConf">&lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13408, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
+						<g transform="translate(22033, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+GoRoute route()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13408, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
+					</g>
+					<g data-name="GoRouter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
+							<rect x="64028.3" y="3485.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
+						</g>
+						<g transform="translate(64028.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
+								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FrameControlsWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
-							<rect x="15046.3" y="3782.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
-							<path d="M15046.3 3813.0 L15337.3 3813.0" fill="none" data-name="FrameControlsWidget"></path>
-							<path d="M15046.3 3874.0 L15337.3 3874.0" fill="none" data-name="FrameControlsWidget"></path>
+					<g data-name="StudyFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
+							<rect x="61589.3" y="1666.5" height="62.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
+							<path d="M61589.3 1697.5 L61773.3 1697.5" fill="none" data-name="StudyFormRouteArgs"></path>
 						</g>
-						<g transform="translate(15046.25, 3782)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
+						<g transform="translate(61589.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
+								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15046.25, 3813)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
+						<g transform="translate(61589.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormRouteArgs">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15046.25, 3874)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
+					</g>
+					<g data-name="QuestionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormRouteArgs">
+							<rect x="59486.5" y="2594.0" height="62.0" width="210.0" data-name="QuestionFormRouteArgs"></rect>
+							<path d="M59486.5 2625.0 L59696.5 2625.0" fill="none" data-name="QuestionFormRouteArgs"></path>
+						</g>
+						<g transform="translate(59486.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormRouteArgs">
+								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormRouteArgs">QuestionFormRouteArgs</text>
+								
+							</g>
+						</g>
+						<g transform="translate(59486.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormRouteArgs">+questionId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="22978.3" y="1197.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+					<g data-name="ScreenerQuestionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormRouteArgs">
+							<rect x="58207.8" y="3485.0" height="31.0" width="282.0" data-name="ScreenerQuestionFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(22978.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
+						<g transform="translate(58207.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormRouteArgs">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormRouteArgs">ScreenerQuestionFormRouteArgs</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudySettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="20305.8" y="2594.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M20305.8 2625.0 L20480.8 2625.0" fill="none" data-name="StudySettingsDialog"></path>
+					<g data-name="ConsentItemFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormRouteArgs">
+							<rect x="60437.3" y="2594.0" height="62.0" width="239.0" data-name="ConsentItemFormRouteArgs"></rect>
+							<path d="M60437.3 2625.0 L60676.3 2625.0" fill="none" data-name="ConsentItemFormRouteArgs"></path>
 						</g>
-						<g transform="translate(20305.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
-								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
+						<g transform="translate(60437.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormRouteArgs">
+								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormRouteArgs">ConsentItemFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20305.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
+						<g transform="translate(60437.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormRouteArgs">+consentId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudySettingsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="66593.5" y="2496.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M66593.5 2527.0 L67072.5 2527.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M66593.5 2663.0 L67072.5 2663.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-						</g>
-						<g transform="translate(66593.5, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
-								
-							</g>
+					<g data-name="MeasurementFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
+							<rect x="45441.0" y="2594.0" height="62.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
+							<path d="M45441.0 2625.0 L45688.0 2625.0" fill="none" data-name="MeasurementFormRouteArgs"></path>
 						</g>
-						<g transform="translate(66593.5, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(45441, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
+								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(66593.5, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
+						<g transform="translate(45441, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementFormRouteArgs">+measurementId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="54242.8" y="3485.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+					<g data-name="SurveyQuestionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormRouteArgs">
+							<rect x="50428.5" y="3469.5" height="62.0" width="265.0" data-name="SurveyQuestionFormRouteArgs"></rect>
+							<path d="M50428.5 3500.5 L50693.5 3500.5" fill="none" data-name="SurveyQuestionFormRouteArgs"></path>
 						</g>
-						<g transform="translate(54242.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+						<g transform="translate(50428.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormRouteArgs">
+								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormRouteArgs">SurveyQuestionFormRouteArgs</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="58691.5" y="3485.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(58691.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+						<g transform="translate(50428.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormRouteArgs">+questionId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="71348.0" y="313.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
-							<path d="M71348.0 344.0 L72220.0 344.0" fill="none" data-name="FormViewModel"></path>
-							<path d="M71348.0 660.0 L72220.0 660.0" fill="none" data-name="FormViewModel"></path>
+					<g data-name="InterventionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
+							<rect x="44746.5" y="2594.0" height="62.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
+							<path d="M44746.5 2625.0 L44979.5 2625.0" fill="none" data-name="InterventionFormRouteArgs"></path>
 						</g>
-						<g transform="translate(71348, 313)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+						<g transform="translate(44746.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(71348, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+						<g transform="translate(44746.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormRouteArgs">+interventionId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(71348, 660)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
+					</g>
+					<g data-name="InterventionTaskFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormRouteArgs">
+							<rect x="44727.5" y="3469.5" height="62.0" width="271.0" data-name="InterventionTaskFormRouteArgs"></rect>
+							<path d="M44727.5 3500.5 L44998.5 3500.5" fill="none" data-name="InterventionTaskFormRouteArgs"></path>
+						</g>
+						<g transform="translate(44727.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormRouteArgs">
+								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormRouteArgs">InterventionTaskFormRouteArgs</text>
+								
+							</g>
+						</g>
+						<g transform="translate(44727.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormRouteArgs">+taskId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IWithBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="29261.3" y="1181.5" height="62.0" width="164.0" data-name="IWithBanner"></rect>
-							<path d="M29261.3 1212.5 L29425.3 1212.5" fill="none" data-name="IWithBanner"></path>
+					<g data-name="ReportItemFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormRouteArgs">
+							<rect x="61743.3" y="2594.0" height="62.0" width="226.0" data-name="ReportItemFormRouteArgs"></rect>
+							<path d="M61743.3 2625.0 L61969.3 2625.0" fill="none" data-name="ReportItemFormRouteArgs"></path>
 						</g>
-						<g transform="translate(29261.25, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
+						<g transform="translate(61743.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormRouteArgs">
+								<text x="105.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormRouteArgs">ReportItemFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29261.25, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IWithBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="IWithBanner">+Widget? banner()</text>
+						<g transform="translate(61743.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormRouteArgs">+sectionId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
-							<rect x="848.0" y="3447.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
-							<path d="M848.0 3478.0 L1127.0 3478.0" fill="none" data-name="AppStatus"></path>
+					<g data-name="DropdownMenuItemTheme">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DropdownMenuItemTheme">
+							<rect x="38936.0" y="598.5" height="62.0" width="258.0" data-name="DropdownMenuItemTheme"></rect>
+							<path d="M38936.0 629.5 L39194.0 629.5" fill="none" data-name="DropdownMenuItemTheme"></path>
 						</g>
-						<g transform="translate(848, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
+						<g transform="translate(38936, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DropdownMenuItemTheme">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DropdownMenuItemTheme">
+								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="DropdownMenuItemTheme">DropdownMenuItemTheme</text>
 								
 							</g>
 						</g>
-						<g transform="translate(848, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
+						<g transform="translate(38936, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DropdownMenuItemTheme">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DropdownMenuItemTheme">
+								<text x="0.0" y="13.5" stroke="none" data-name="DropdownMenuItemTheme">+iconTheme: IconThemeData?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
-							<rect x="62749.0" y="67.5" height="138.0" width="301.0" data-name="AppController"></rect>
-							<path d="M62749.0 98.5 L63050.0 98.5" fill="none" data-name="AppController"></path>
-							<path d="M62749.0 159.5 L63050.0 159.5" fill="none" data-name="AppController"></path>
+					<g data-name="IconThemeData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconThemeData">
+							<rect x="38994.5" y="1197.0" height="31.0" width="141.0" data-name="IconThemeData"></rect>
 						</g>
-						<g transform="translate(62749, 67.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
+						<g transform="translate(38994.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconThemeData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconThemeData">
+								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconThemeData">IconThemeData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62749, 98.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
+					</g>
+					<g data-name="Diagnosticable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Diagnosticable">
+							<rect x="38998.5" y="121.0" height="31.0" width="133.0" data-name="Diagnosticable"></rect>
+						</g>
+						<g transform="translate(38998.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Diagnosticable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Diagnosticable">
+								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="Diagnosticable">Diagnosticable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62749, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
+					</g>
+					<g data-name="ThemeConfig">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeConfig">
+							<rect x="39770.8" y="0.0" height="273.0" width="543.0" data-name="ThemeConfig"></rect>
+							<path d="M39770.8 31.0 L40313.8 31.0" fill="none" data-name="ThemeConfig"></path>
+							<path d="M39770.8 107.0 L40313.8 107.0" fill="none" data-name="ThemeConfig"></path>
+						</g>
+						<g transform="translate(39770.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeConfig">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeConfig">
+								<text x="263.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeConfig">ThemeConfig</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="App">
-						<g fill="#eee8d5" stroke="#33322E" data-name="App">
-							<rect x="63090.0" y="121.0" height="31.0" width="47.0" data-name="App"></rect>
+						<g transform="translate(39770.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMinContentWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMaxContentWidth: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kHoverFadeFactor: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMuteFadeFactor: double</text>
+								
+							</g>
 						</g>
-						<g transform="translate(63090, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
-								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
+						<g transform="translate(39770.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+dynamic bodyBackgroundColor()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color modalBarrierColor()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color containerColor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color colorPickerInitialColor()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextMuted()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextBackground()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+double iconSplashRadius()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color sidesheetBackgroundColor()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppContent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
-							<rect x="63177.0" y="121.0" height="31.0" width="109.0" data-name="AppContent"></rect>
+					<g data-name="NoAnimationPageTransitionsBuilder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NoAnimationPageTransitionsBuilder">
+							<rect x="39331.3" y="598.5" height="62.0" width="299.0" data-name="NoAnimationPageTransitionsBuilder"></rect>
+							<path d="M39331.3 629.5 L39630.3 629.5" fill="none" data-name="NoAnimationPageTransitionsBuilder"></path>
 						</g>
-						<g transform="translate(63177, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
+						<g transform="translate(39331.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NoAnimationPageTransitionsBuilder">
+								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="NoAnimationPageTransitionsBuilder">NoAnimationPageTransitionsBuilder</text>
+								
+							</g>
+						</g>
+						<g transform="translate(39331.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NoAnimationPageTransitionsBuilder">
+								<text x="0.0" y="13.5" stroke="none" data-name="NoAnimationPageTransitionsBuilder">+Widget buildTransitions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthFormController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
-							<rect x="63110.5" y="2368.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
-							<path d="M63110.5 2399.5 L63960.5 2399.5" fill="none" data-name="AuthFormController"></path>
-							<path d="M63110.5 2655.5 L63960.5 2655.5" fill="none" data-name="AuthFormController"></path>
+					<g data-name="PageTransitionsBuilder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsBuilder">
+							<rect x="39531.8" y="121.0" height="31.0" width="199.0" data-name="PageTransitionsBuilder"></rect>
 						</g>
-						<g transform="translate(63110.5, 2368.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
-								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
+						<g transform="translate(39531.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PageTransitionsBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsBuilder">
+								<text x="91.5" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsBuilder">PageTransitionsBuilder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63110.5, 2399.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
+					</g>
+					<g data-name="WebTransitionBuilder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebTransitionBuilder">
+							<rect x="39710.8" y="598.5" height="62.0" width="223.0" data-name="WebTransitionBuilder"></rect>
+							<path d="M39710.8 629.5 L39933.8 629.5" fill="none" data-name="WebTransitionBuilder"></path>
+						</g>
+						<g transform="translate(39710.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebTransitionBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebTransitionBuilder">
+								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebTransitionBuilder">WebTransitionBuilder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63110.5, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
+						<g transform="translate(39710.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebTransitionBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebTransitionBuilder">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebTransitionBuilder">+Widget buildTransitions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthFormKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
-							<rect x="16966.8" y="3417.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
-							<path d="M16966.8 3448.0 L17321.8 3448.0" fill="none" data-name="AuthFormKey"></path>
+					<g data-name="ThemeSettingChange">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettingChange">
+							<rect x="39806.8" y="1666.5" height="62.0" width="216.0" data-name="ThemeSettingChange"></rect>
+							<path d="M39806.8 1697.5 L40022.8 1697.5" fill="none" data-name="ThemeSettingChange"></path>
 						</g>
-						<g transform="translate(16966.75, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
-								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
+						<g transform="translate(39806.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettingChange">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettingChange">
+								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettingChange">ThemeSettingChange</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16966.75, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
+						<g transform="translate(39806.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettingChange">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettingChange">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettingChange">+settings: ThemeSettings</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormGroupController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="69413.8" y="105.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
-							<path d="M69413.8 136.5 L69600.8 136.5" fill="none" data-name="IFormGroupController"></path>
+					<g data-name="ThemeSettings">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettings">
+							<rect x="37406.0" y="2586.5" height="77.0" width="227.0" data-name="ThemeSettings"></rect>
+							<path d="M37406.0 2617.5 L37633.0 2617.5" fill="none" data-name="ThemeSettings"></path>
 						</g>
-						<g transform="translate(69413.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
-								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
+						<g transform="translate(37406, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettings">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettings">
+								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettings">ThemeSettings</text>
 								
 							</g>
 						</g>
-						<g transform="translate(69413.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
+						<g transform="translate(37406, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettings">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettings">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettings">+sourceColor: Color</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeSettings">+themeMode: ThemeMode</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PasswordRecoveryForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
-							<rect x="6836.5" y="2578.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
-							<path d="M6836.5 2609.5 L7044.5 2609.5" fill="none" data-name="PasswordRecoveryForm"></path>
-							<path d="M6836.5 2640.5 L7044.5 2640.5" fill="none" data-name="PasswordRecoveryForm"></path>
+					<g data-name="Notification">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Notification">
+							<rect x="39862.8" y="1197.0" height="31.0" width="104.0" data-name="Notification"></rect>
 						</g>
-						<g transform="translate(6836.5, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
+						<g transform="translate(39862.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Notification">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notification">
+								<text x="44.0" y="13.5" stroke="none" text-anchor="middle" data-name="Notification">Notification</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6836.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
+					</g>
+					<g data-name="ThemeProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeProvider">
+							<rect x="40164.8" y="358.0" height="543.0" width="519.0" data-name="ThemeProvider"></rect>
+							<path d="M40164.8 389.0 L40683.8 389.0" fill="none" data-name="ThemeProvider"></path>
+							<path d="M40164.8 480.0 L40683.8 480.0" fill="none" data-name="ThemeProvider"></path>
+						</g>
+						<g transform="translate(40164.75, 358)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeProvider">
+								<text x="251.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeProvider">ThemeProvider</text>
+								
+							</g>
+						</g>
+						<g transform="translate(40164.75, 389)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+settings: ValueNotifier&lt;ThemeSettings&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+lightDynamic: ColorScheme?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+darkDynamic: ColorScheme?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+pageTransitionsTheme: PageTransitionsTheme</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+shapeMedium: ShapeBorder</text>
+								
+							</g>
+						</g>
+						<g transform="translate(40164.75, 480)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+Color custom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+Color blend()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+Color source()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+ColorScheme colors()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+CardTheme cardTheme()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ThemeProvider">+ListTileThemeData listTileTheme()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ThemeProvider">+AppBarTheme appBarTheme()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ThemeProvider">+SnackBarThemeData snackBarThemeData()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ThemeProvider">+TabBarTheme tabBarTheme()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ThemeProvider">+BottomAppBarTheme bottomAppBarTheme()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ThemeProvider">+BottomNavigationBarThemeData bottomNavigationBarTheme()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ThemeProvider">+SwitchThemeData switchTheme()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="ThemeProvider">+InputDecorationTheme inputDecorationTheme()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="ThemeProvider">+TextTheme textTheme()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="ThemeProvider">+DividerThemeData dividerTheme()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="ThemeProvider">+NavigationRailThemeData navigationRailTheme()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="ThemeProvider">+DrawerThemeData drawerTheme()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="ThemeProvider">+IconThemeData iconTheme()</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="ThemeProvider">+CheckboxThemeData checkboxTheme()</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="ThemeProvider">+RadioThemeData radioTheme()</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="ThemeProvider">+TooltipThemeData tooltipTheme()</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="ThemeProvider">+ThemeData light()</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="ThemeProvider">+ThemeData dark()</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="ThemeProvider">+ThemeMode themeMode()</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="ThemeProvider">+ThemeData theme()</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="ThemeProvider">&lt;static&gt;+ThemeProvider of()</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="ThemeProvider">+bool updateShouldNotify()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6836.5, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
+					</g>
+					<g data-name="ValueNotifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ValueNotifier">
+							<rect x="40006.8" y="1197.0" height="31.0" width="117.0" data-name="ValueNotifier"></rect>
+						</g>
+						<g transform="translate(40006.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueNotifier">
+								<text x="50.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueNotifier">ValueNotifier</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConsumerRefWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="7219.5" y="1666.5" height="62.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
-							<path d="M7219.5 1697.5 L7438.5 1697.5" fill="none" data-name="FormConsumerRefWidget"></path>
+					<g data-name="ColorScheme">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ColorScheme">
+							<rect x="40163.8" y="1197.0" height="31.0" width="122.0" data-name="ColorScheme"></rect>
 						</g>
-						<g transform="translate(7219.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
+						<g transform="translate(40163.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ColorScheme">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ColorScheme">
+								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="ColorScheme">ColorScheme</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7219.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerRefWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerRefWidget">+Widget build()</text>
+					</g>
+					<g data-name="PageTransitionsTheme">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsTheme">
+							<rect x="41059.5" y="1197.0" height="31.0" width="198.0" data-name="PageTransitionsTheme"></rect>
+						</g>
+						<g transform="translate(41059.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PageTransitionsTheme">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsTheme">
+								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsTheme">PageTransitionsTheme</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PasswordForgotForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
-							<rect x="7084.5" y="2578.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
-							<path d="M7084.5 2609.5 L7291.5 2609.5" fill="none" data-name="PasswordForgotForm"></path>
-							<path d="M7084.5 2640.5 L7291.5 2640.5" fill="none" data-name="PasswordForgotForm"></path>
+					<g data-name="ShapeBorder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ShapeBorder">
+							<rect x="41297.5" y="1197.0" height="31.0" width="120.0" data-name="ShapeBorder"></rect>
 						</g>
-						<g transform="translate(7084.5, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
+						<g transform="translate(41297.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ShapeBorder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ShapeBorder">
+								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="ShapeBorder">ShapeBorder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7084.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
+					</g>
+					<g data-name="InheritedWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InheritedWidget">
+							<rect x="40353.8" y="121.0" height="31.0" width="141.0" data-name="InheritedWidget"></rect>
+						</g>
+						<g transform="translate(40353.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="InheritedWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InheritedWidget">
+								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="InheritedWidget">InheritedWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7084.5, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
+					</g>
+					<g data-name="ThemeMode">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeMode">
+							<rect x="37746.0" y="3485.0" height="31.0" width="114.0" data-name="ThemeMode"></rect>
+						</g>
+						<g transform="translate(37746, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeMode">
+								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeMode">ThemeMode</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LoginForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
-							<rect x="7331.5" y="2578.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
-							<path d="M7331.5 2609.5 L7538.5 2609.5" fill="none" data-name="LoginForm"></path>
-							<path d="M7331.5 2640.5 L7538.5 2640.5" fill="none" data-name="LoginForm"></path>
+					<g data-name="CustomColor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CustomColor">
+							<rect x="24484.8" y="2563.5" height="123.0" width="128.0" data-name="CustomColor"></rect>
+							<path d="M24484.8 2594.5 L24612.8 2594.5" fill="none" data-name="CustomColor"></path>
+							<path d="M24484.8 2655.5 L24612.8 2655.5" fill="none" data-name="CustomColor"></path>
 						</g>
-						<g transform="translate(7331.5, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
+						<g transform="translate(24484.75, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomColor">
+								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomColor">CustomColor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7331.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
+						<g transform="translate(24484.75, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+name: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="CustomColor">+color: Color</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="CustomColor">+blend: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7331.5, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
+						<g transform="translate(24484.75, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+Color value()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EmailTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
-							<rect x="15231.8" y="2571.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
-							<path d="M15231.8 2602.5 L15552.8 2602.5" fill="none" data-name="EmailTextField"></path>
-						</g>
-						<g transform="translate(15231.75, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
-								
-							</g>
+					<g data-name="SuppressedBehaviorSubject">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SuppressedBehaviorSubject">
+							<rect x="16681.0" y="3774.5" height="138.0" width="388.0" data-name="SuppressedBehaviorSubject"></rect>
+							<path d="M16681.0 3805.5 L17069.0 3805.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
+							<path d="M16681.0 3866.5 L17069.0 3866.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
 						</g>
-						<g transform="translate(15231.75, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
+						<g transform="translate(16681, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SuppressedBehaviorSubject">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SuppressedBehaviorSubject">
+								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="SuppressedBehaviorSubject">SuppressedBehaviorSubject</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PasswordTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
-							<rect x="15592.8" y="2564.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
-							<path d="M15592.8 2595.0 L16071.8 2595.0" fill="none" data-name="PasswordTextField"></path>
-						</g>
-						<g transform="translate(15592.75, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
+						<g transform="translate(16681, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
+								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">+subject: BehaviorSubject&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+didSuppressInitialEvent: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SuppressedBehaviorSubject">-_controller: StreamController&lt;T&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15592.75, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
+						<g transform="translate(16681, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
+								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">-StreamController&lt;T&gt; _buildDerivedController()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+dynamic close()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<rect x="15452.3" y="3485.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
+					<g data-name="StreamController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
+							<rect x="14737.5" y="4118.5" height="31.0" width="149.0" data-name="StreamController"></rect>
 						</g>
-						<g transform="translate(15452.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
+						<g transform="translate(14737.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
+								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SignupForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
-							<rect x="7578.5" y="2563.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
-							<path d="M7578.5 2594.5 L7856.5 2594.5" fill="none" data-name="SignupForm"></path>
-							<path d="M7578.5 2625.5 L7856.5 2625.5" fill="none" data-name="SignupForm"></path>
+					<g data-name="Time">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Time">
+							<rect x="40723.8" y="583.5" height="92.0" width="293.0" data-name="Time"></rect>
+							<path d="M40723.8 614.5 L41016.8 614.5" fill="none" data-name="Time"></path>
 						</g>
-						<g transform="translate(7578.5, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
-								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
+						<g transform="translate(40723.75, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Time">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Time">
+								<text x="138.5" y="13.5" stroke="none" text-anchor="middle" data-name="Time">Time</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7578.5, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
+						<g transform="translate(40723.75, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Time">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Time">
+								<text x="0.0" y="13.5" stroke="none" data-name="Time">&lt;static&gt;+dynamic fromTimeOfDay()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Time">+Map&lt;String, dynamic&gt; toJson()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Time">&lt;static&gt;+Time fromJson()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7578.5, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
+					</g>
+					<g data-name="TimeOfDay">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TimeOfDay">
+							<rect x="40818.8" y="121.0" height="31.0" width="103.0" data-name="TimeOfDay"></rect>
+						</g>
+						<g transform="translate(40818.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeOfDay">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeOfDay">
+								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeOfDay">TimeOfDay</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyUJobsToBeDone">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
-							<rect x="64740.0" y="105.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
-							<path d="M64740.0 136.5 L64934.0 136.5" fill="none" data-name="StudyUJobsToBeDone"></path>
+					<g data-name="TimeValueAccessor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TimeValueAccessor">
+							<rect x="41056.8" y="583.5" height="92.0" width="297.0" data-name="TimeValueAccessor"></rect>
+							<path d="M41056.8 614.5 L41353.8 614.5" fill="none" data-name="TimeValueAccessor"></path>
 						</g>
-						<g transform="translate(64740, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
+						<g transform="translate(41056.75, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeValueAccessor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeValueAccessor">
+								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeValueAccessor">TimeValueAccessor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64740, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
+						<g transform="translate(41056.75, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimeValueAccessor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimeValueAccessor">
+								<text x="0.0" y="13.5" stroke="none" data-name="TimeValueAccessor">+String modelToViewValue()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TimeValueAccessor">+Time? viewToModelValue()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TimeValueAccessor">-String _addLeadingZeroIfNeeded()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
-							<rect x="16981.3" y="2564.0" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
-							<path d="M16981.3 2595.0 L17240.3 2595.0" fill="none" data-name="AuthScaffold"></path>
+					<g data-name="ControlValueAccessor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ControlValueAccessor">
+							<rect x="41109.8" y="121.0" height="31.0" width="191.0" data-name="ControlValueAccessor"></rect>
 						</g>
-						<g transform="translate(16981.25, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
+						<g transform="translate(41109.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ControlValueAccessor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ControlValueAccessor">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="ControlValueAccessor">ControlValueAccessor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16981.25, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
+					</g>
+					<g data-name="ModelAction">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelAction">
+							<rect x="24652.8" y="2556.5" height="137.0" width="188.0" data-name="ModelAction"></rect>
+							<path d="M24652.8 2587.5 L24840.8 2587.5" fill="none" data-name="ModelAction"></path>
+						</g>
+						<g transform="translate(24652.75, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelAction">
+								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelAction">ModelAction</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="EdgeInsets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="46909.0" y="3485.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
-						</g>
-						<g transform="translate(46909, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
+						<g transform="translate(24652.75, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelAction">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelAction">+type: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelAction">+label: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ModelAction">+icon: IconData?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ModelAction">+onExecute: Function</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ModelAction">+isAvailable: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ModelAction">+isDestructive: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PublishDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
-							<rect x="21045.8" y="2594.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
-							<path d="M21045.8 2625.0 L21181.8 2625.0" fill="none" data-name="PublishDialog"></path>
+					<g data-name="IModelActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
+							<rect x="83485.3" y="105.5" height="62.0" width="403.0" data-name="IModelActionProvider"></rect>
+							<path d="M83485.3 136.5 L83888.3 136.5" fill="none" data-name="IModelActionProvider"></path>
 						</g>
-						<g transform="translate(21045.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
+						<g transform="translate(83485.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
+								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21045.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
+						<g transform="translate(83485.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelActionProvider">
+								<text x="0.0" y="13.5" stroke="none" data-name="IModelActionProvider">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PublishSuccessDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
-							<rect x="21593.8" y="2594.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
-							<path d="M21593.8 2625.0 L21784.8 2625.0" fill="none" data-name="PublishSuccessDialog"></path>
+					<g data-name="IListActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
+							<rect x="83092.5" y="1174.0" height="77.0" width="179.0" data-name="IListActionProvider"></rect>
+							<path d="M83092.5 1205.0 L83271.5 1205.0" fill="none" data-name="IListActionProvider"></path>
 						</g>
-						<g transform="translate(21593.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
+						<g transform="translate(83092.5, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
+								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21593.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
+						<g transform="translate(83092.5, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IListActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IListActionProvider">
+								<text x="0.0" y="13.5" stroke="none" data-name="IListActionProvider">+void onSelectItem()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IListActionProvider">+void onNewItem()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PublishConfirmationDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
-							<rect x="21824.8" y="2594.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
-							<path d="M21824.8 2625.0 L22048.8 2625.0" fill="none" data-name="PublishConfirmationDialog"></path>
+					<g data-name="ModelActionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelActionType">
+							<rect x="516.0" y="3417.0" height="167.0" width="334.0" data-name="ModelActionType"></rect>
+							<path d="M516.0 3448.0 L850.0 3448.0" fill="none" data-name="ModelActionType"></path>
 						</g>
-						<g transform="translate(21824.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
+						<g transform="translate(516, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelActionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelActionType">
+								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelActionType">ModelActionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21824.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
+						<g transform="translate(516, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelActionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelActionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelActionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+values: List&lt;ModelActionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+edit: ModelActionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+delete: ModelActionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+remove: ModelActionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+duplicate: ModelActionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+clipboard: ModelActionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+primary: ModelActionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormArrayTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
-							<rect x="19658.3" y="2428.5" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
-							<path d="M19658.3 2459.5 L20148.3 2459.5" fill="none" data-name="FormArrayTable"></path>
-							<path d="M19658.3 2760.5 L20148.3 2760.5" fill="none" data-name="FormArrayTable"></path>
-						</g>
-						<g transform="translate(19658.25, 2428.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
-								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
-								
-							</g>
+					<g data-name="OptimisticUpdate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="OptimisticUpdate">
+							<rect x="17318.5" y="3737.0" height="213.0" width="383.0" data-name="OptimisticUpdate"></rect>
+							<path d="M17318.5 3768.0 L17701.5 3768.0" fill="none" data-name="OptimisticUpdate"></path>
+							<path d="M17318.5 3904.0 L17701.5 3904.0" fill="none" data-name="OptimisticUpdate"></path>
 						</g>
-						<g transform="translate(19658.25, 2459.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
+						<g transform="translate(17318.5, 3737)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptimisticUpdate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptimisticUpdate">
+								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptimisticUpdate">OptimisticUpdate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19658.25, 2760.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
+						<g transform="translate(17318.5, 3768)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
+								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+applyOptimistic: void Function()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">+apply: dynamic Function()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="OptimisticUpdate">+rollback: void Function()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="OptimisticUpdate">+onUpdate: void Function()?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="OptimisticUpdate">+onError: void Function(Object, StackTrace?)?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="OptimisticUpdate">+rethrowErrors: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="OptimisticUpdate">+runOptimistically: bool</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="OptimisticUpdate">+completeFutureOptimistically: bool</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="38917.0" y="3485.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(38917, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
+						<g transform="translate(17318.5, 3904)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
+								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+dynamic execute()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">-void _runUpdateHandlerIfAny()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="28574.5" y="3485.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
+					<g data-name="void Function()">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()">
+							<rect x="14926.5" y="4118.5" height="31.0" width="134.0" data-name="void Function()"></rect>
 						</g>
-						<g transform="translate(28574.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
+						<g transform="translate(14926.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()">
+								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()">void Function()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<rect x="18519.8" y="3485.0" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
+					<g data-name="void Function(Object, StackTrace?)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Object, StackTrace?)?">
+							<rect x="15100.5" y="4118.5" height="31.0" width="304.0" data-name="void Function(Object, StackTrace?)?"></rect>
 						</g>
-						<g transform="translate(18519.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
+						<g transform="translate(15100.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Object, StackTrace?)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Object, StackTrace?)?">
+								<text x="144.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Object, StackTrace?)?">void Function(Object, StackTrace?)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="String Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
-							<rect x="19749.8" y="3485.0" height="31.0" width="157.0" data-name="String Function(T)"></rect>
+					<g data-name="FileFormatEncoder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FileFormatEncoder">
+							<rect x="41468.8" y="90.5" height="92.0" width="216.0" data-name="FileFormatEncoder"></rect>
+							<path d="M41468.8 121.5 L41684.8 121.5" fill="none" data-name="FileFormatEncoder"></path>
 						</g>
-						<g transform="translate(19749.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
+						<g transform="translate(41468.75, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FileFormatEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FileFormatEncoder">
+								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="FileFormatEncoder">FileFormatEncoder</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
-							<rect x="19946.8" y="3485.0" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
-						</g>
-						<g transform="translate(19946.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
-								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
+						<g transform="translate(41468.75, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FileFormatEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FileFormatEncoder">
+								<text x="0.0" y="13.5" stroke="none" data-name="FileFormatEncoder">+dynamic encodeAsync()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FileFormatEncoder">+String encode()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FileFormatEncoder">+dynamic call()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="34062.3" y="1166.0" height="93.0" width="163.0" data-name="IFormData"></rect>
-							<path d="M34062.3 1197.0 L34225.3 1197.0" fill="none" data-name="IFormData"></path>
-							<path d="M34062.3 1228.0 L34225.3 1228.0" fill="none" data-name="IFormData"></path>
+					<g data-name="CSVStringEncoder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CSVStringEncoder">
+							<rect x="41393.8" y="598.5" height="62.0" width="162.0" data-name="CSVStringEncoder"></rect>
+							<path d="M41393.8 629.5 L41555.8 629.5" fill="none" data-name="CSVStringEncoder"></path>
 						</g>
-						<g transform="translate(34062.25, 1166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
+						<g transform="translate(41393.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CSVStringEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CSVStringEncoder">
+								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="CSVStringEncoder">CSVStringEncoder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34062.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
+						<g transform="translate(41393.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CSVStringEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CSVStringEncoder">
+								<text x="0.0" y="13.5" stroke="none" data-name="CSVStringEncoder">+String encode()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34062.25, 1228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
+					</g>
+					<g data-name="JsonStringEncoder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="JsonStringEncoder">
+							<rect x="41595.8" y="598.5" height="62.0" width="166.0" data-name="JsonStringEncoder"></rect>
+							<path d="M41595.8 629.5 L41761.8 629.5" fill="none" data-name="JsonStringEncoder"></path>
+						</g>
+						<g transform="translate(41595.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JsonStringEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonStringEncoder">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="JsonStringEncoder">JsonStringEncoder</text>
+								
+							</g>
+						</g>
+						<g transform="translate(41595.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonStringEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonStringEncoder">
+								<text x="0.0" y="13.5" stroke="none" data-name="JsonStringEncoder">+String encode()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="68051.8" y="1666.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
-							<path d="M68051.8 1697.5 L68447.8 1697.5" fill="none" data-name="ManagedFormViewModel"></path>
+					<g data-name="ExecutionLimiter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ExecutionLimiter">
+							<rect x="18293.8" y="3789.5" height="108.0" width="197.0" data-name="ExecutionLimiter"></rect>
+							<path d="M18293.8 3820.5 L18490.8 3820.5" fill="none" data-name="ExecutionLimiter"></path>
+							<path d="M18293.8 3866.5 L18490.8 3866.5" fill="none" data-name="ExecutionLimiter"></path>
 						</g>
-						<g transform="translate(68051.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
+						<g transform="translate(18293.75, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ExecutionLimiter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ExecutionLimiter">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ExecutionLimiter">ExecutionLimiter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68051.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
+						<g transform="translate(18293.75, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
+								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+milliseconds: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ExecutionLimiter">&lt;static&gt;-_timer: Timer?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(18293.75, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
+								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
-							<rect x="10266.8" y="614.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
+					<g data-name="Timer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Timer">
+							<rect x="15444.5" y="4118.5" height="31.0" width="60.0" data-name="Timer"></rect>
 						</g>
-						<g transform="translate(10266.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
+						<g transform="translate(15444.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timer">
+								<text x="22.0" y="13.5" stroke="none" text-anchor="middle" data-name="Timer">Timer</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="57108.3" y="3707.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
-							<path d="M57108.3 3738.0 L57389.3 3738.0" fill="none" data-name="FormViewModelCollection"></path>
-							<path d="M57108.3 3829.0 L57389.3 3829.0" fill="none" data-name="FormViewModelCollection"></path>
+					<g data-name="Debouncer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
+							<rect x="60210.8" y="4072.5" height="123.0" width="536.0" data-name="Debouncer"></rect>
+							<path d="M60210.8 4103.5 L60746.8 4103.5" fill="none" data-name="Debouncer"></path>
+							<path d="M60210.8 4164.5 L60746.8 4164.5" fill="none" data-name="Debouncer"></path>
 						</g>
-						<g transform="translate(57108.25, 3707)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
+						<g transform="translate(60210.75, 4072.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
+								<text x="260.0" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57108.25, 3738)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
+						<g transform="translate(60210.75, 4103.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
+								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+leading: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Debouncer">+cancelUncompleted: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Debouncer">-_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57108.25, 3829)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
+						<g transform="translate(60210.75, 4164.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
+								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+dynamic call()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="58767.0" y="4118.5" height="31.0" width="98.0" data-name="FormArray"></rect>
+					<g data-name="CancelableOperation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
+							<rect x="65854.3" y="4439.0" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
 						</g>
-						<g transform="translate(58767, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
+						<g transform="translate(65854.25, 4439)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
+								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormInvalidException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
-							<rect x="60367.5" y="614.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
+					<g data-name="Throttler">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Throttler">
+							<rect x="40095.0" y="4103.0" height="62.0" width="136.0" data-name="Throttler"></rect>
+							<path d="M40095.0 4134.0 L40231.0 4134.0" fill="none" data-name="Throttler"></path>
 						</g>
-						<g transform="translate(60367.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
+						<g transform="translate(40095, 4103)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Throttler">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Throttler">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="Throttler">Throttler</text>
+								
+							</g>
+						</g>
+						<g transform="translate(40095, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Throttler">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Throttler">
+								<text x="0.0" y="13.5" stroke="none" data-name="Throttler">+dynamic call()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConfigException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
-							<rect x="60593.5" y="598.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
-							<path d="M60593.5 629.5 L60778.5 629.5" fill="none" data-name="FormConfigException"></path>
+					<g data-name="SerializableColor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SerializableColor">
+							<rect x="21412.8" y="3805.0" height="77.0" width="312.0" data-name="SerializableColor"></rect>
+							<path d="M21412.8 3836.0 L21724.8 3836.0" fill="none" data-name="SerializableColor"></path>
 						</g>
-						<g transform="translate(60593.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
-								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
+						<g transform="translate(21412.75, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SerializableColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SerializableColor">
+								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="SerializableColor">SerializableColor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60593.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
+						<g transform="translate(21412.75, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SerializableColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SerializableColor">
+								<text x="0.0" y="13.5" stroke="none" data-name="SerializableColor">+Map&lt;String, dynamic&gt; toJson()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SerializableColor">&lt;static&gt;+SerializableColor fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="70165.3" y="1174.0" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-							<path d="M70165.3 1205.0 L70382.3 1205.0" fill="none" data-name="IFormViewModelDelegate"></path>
+					<g data-name="IProviderArgsResolver">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
+							<rect x="42585.8" y="1181.5" height="62.0" width="193.0" data-name="IProviderArgsResolver"></rect>
+							<path d="M42585.8 1212.5 L42778.8 1212.5" fill="none" data-name="IProviderArgsResolver"></path>
 						</g>
-						<g transform="translate(70165.25, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
+						<g transform="translate(42585.75, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
 								
 							</g>
 						</g>
-						<g transform="translate(70165.25, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
+						<g transform="translate(42585.75, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IProviderArgsResolver">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IProviderArgsResolver">
+								<text x="0.0" y="13.5" stroke="none" data-name="IProviderArgsResolver">+R provide()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControlOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
-							<rect x="5112.5" y="2571.5" height="107.0" width="190.0" data-name="FormControlOption"></rect>
-							<path d="M5112.5 2602.5 L5302.5 2602.5" fill="none" data-name="FormControlOption"></path>
+					<g data-name="CombinedStreamNotifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CombinedStreamNotifier">
+							<rect x="41801.8" y="583.0" height="93.0" width="435.0" data-name="CombinedStreamNotifier"></rect>
+							<path d="M41801.8 614.0 L42236.8 614.0" fill="none" data-name="CombinedStreamNotifier"></path>
+							<path d="M41801.8 645.0 L42236.8 645.0" fill="none" data-name="CombinedStreamNotifier"></path>
 						</g>
-						<g transform="translate(5112.5, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
+						<g transform="translate(41801.75, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CombinedStreamNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CombinedStreamNotifier">
+								<text x="209.5" y="13.5" stroke="none" text-anchor="middle" data-name="CombinedStreamNotifier">CombinedStreamNotifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5112.5, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
+						<g transform="translate(41801.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">-_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(41801.75, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
-							<rect x="41225.8" y="3439.5" height="122.0" width="282.0" data-name="FormMode"></rect>
-							<path d="M41225.8 3470.5 L41507.8 3470.5" fill="none" data-name="FormMode"></path>
+					<g data-name="ChangeNotifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
+							<rect x="41952.3" y="121.0" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
 						</g>
-						<g transform="translate(41225.75, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
+						<g transform="translate(41952.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
+								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41225.75, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
+					</g>
+					<g data-name="CountWhereValidator">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CountWhereValidator">
+							<rect x="42276.8" y="553.0" height="153.0" width="383.0" data-name="CountWhereValidator"></rect>
+							<path d="M42276.8 584.0 L42659.8 584.0" fill="none" data-name="CountWhereValidator"></path>
+							<path d="M42276.8 675.0 L42659.8 675.0" fill="none" data-name="CountWhereValidator"></path>
+						</g>
+						<g transform="translate(42276.75, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CountWhereValidator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CountWhereValidator">
+								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="CountWhereValidator">CountWhereValidator</text>
+								
+							</g>
+						</g>
+						<g transform="translate(42276.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
+								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+predicate: bool Function(T?)</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="CountWhereValidator">+minCount: int?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="CountWhereValidator">+maxCount: int?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMinCount: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMaxCount: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(42276.75, 675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
+								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+Map&lt;String, dynamic&gt;? validate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormValidationSetEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
-							<rect x="69528.3" y="1197.0" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
+					<g data-name="bool Function(T?)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="bool Function(T?)">
+							<rect x="42390.8" y="1197.0" height="31.0" width="155.0" data-name="bool Function(T?)"></rect>
 						</g>
-						<g transform="translate(69528.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
-								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
+						<g transform="translate(42390.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="bool Function(T?)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="bool Function(T?)">
+								<text x="69.5" y="13.5" stroke="none" text-anchor="middle" data-name="bool Function(T?)">bool Function(T?)</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="Validator">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Validator">
+							<rect x="42425.3" y="121.0" height="31.0" width="86.0" data-name="Validator"></rect>
+						</g>
+						<g transform="translate(42425.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Validator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Validator">
+								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="Validator">Validator</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CustomFormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
-							<rect x="54092.8" y="3759.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
-							<path d="M54092.8 3790.5 L54505.8 3790.5" fill="none" data-name="CustomFormControl"></path>
-							<path d="M54092.8 3896.5 L54505.8 3896.5" fill="none" data-name="CustomFormControl"></path>
+					<g data-name="Patterns">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Patterns">
+							<rect x="72659.0" y="90.5" height="92.0" width="287.0" data-name="Patterns"></rect>
+							<path d="M72659.0 121.5 L72946.0 121.5" fill="none" data-name="Patterns"></path>
 						</g>
-						<g transform="translate(54092.75, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
+						<g transform="translate(72659, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Patterns">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Patterns">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="Patterns">Patterns</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54092.75, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
+						<g transform="translate(72659, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Patterns">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Patterns">
+								<text x="0.0" y="13.5" stroke="none" data-name="Patterns">&lt;static&gt;+timeFormatString: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Patterns">&lt;static&gt;+emailFormatString: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Patterns">&lt;static&gt;+url: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54092.75, 3896.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
+					</g>
+					<g data-name="NumericalRangeFormatter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NumericalRangeFormatter">
+							<rect x="43126.0" y="575.5" height="108.0" width="313.0" data-name="NumericalRangeFormatter"></rect>
+							<path d="M43126.0 606.5 L43439.0 606.5" fill="none" data-name="NumericalRangeFormatter"></path>
+							<path d="M43126.0 652.5 L43439.0 652.5" fill="none" data-name="NumericalRangeFormatter"></path>
+						</g>
+						<g transform="translate(43126, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericalRangeFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NumericalRangeFormatter">
+								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="NumericalRangeFormatter">NumericalRangeFormatter</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(T?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
-							<rect x="60332.0" y="4118.5" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
+						<g transform="translate(43126, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
+								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+min: int?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NumericalRangeFormatter">+max: int?</text>
+								
+							</g>
 						</g>
-						<g transform="translate(60332, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
+						<g transform="translate(43126, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
+								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+TextEditingValue formatEditUpdate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(ControlStatus)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
-							<rect x="60557.8" y="4118.5" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
+					<g data-name="TextInputFormatter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TextInputFormatter">
+							<rect x="43376.0" y="121.0" height="31.0" width="166.0" data-name="TextInputFormatter"></rect>
 						</g>
-						<g transform="translate(60557.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
+						<g transform="translate(43376, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TextInputFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextInputFormatter">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextInputFormatter">TextInputFormatter</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="UnsavedChangesDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
-							<rect x="64974.0" y="105.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
-							<path d="M64974.0 136.5 L65181.0 136.5" fill="none" data-name="UnsavedChangesDialog"></path>
+					<g data-name="StudySequenceFormatter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySequenceFormatter">
+							<rect x="43479.0" y="598.5" height="62.0" width="313.0" data-name="StudySequenceFormatter"></rect>
+							<path d="M43479.0 629.5 L43792.0 629.5" fill="none" data-name="StudySequenceFormatter"></path>
 						</g>
-						<g transform="translate(64974, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
+						<g transform="translate(43479, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySequenceFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySequenceFormatter">
+								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySequenceFormatter">StudySequenceFormatter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64974, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
+						<g transform="translate(43479, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySequenceFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySequenceFormatter">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySequenceFormatter">+TextEditingValue formatEditUpdate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControlValidation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
-							<rect x="20520.8" y="2556.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
-							<path d="M20520.8 2587.0 L21005.8 2587.0" fill="none" data-name="FormControlValidation"></path>
-							<path d="M20520.8 2663.0 L21005.8 2663.0" fill="none" data-name="FormControlValidation"></path>
+					<g data-name="Tuple">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Tuple">
+							<rect x="22399.0" y="2541.0" height="168.0" width="384.0" data-name="Tuple"></rect>
+							<path d="M22399.0 2572.0 L22783.0 2572.0" fill="none" data-name="Tuple"></path>
+							<path d="M22399.0 2633.0 L22783.0 2633.0" fill="none" data-name="Tuple"></path>
 						</g>
-						<g transform="translate(20520.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
-								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
+						<g transform="translate(22399, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Tuple">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Tuple">
+								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="Tuple">Tuple</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20520.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
+						<g transform="translate(22399, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
+								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+first: T1</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">+second: T2</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+props: List&lt;Object?&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20520.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
+						<g transform="translate(22399, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
+								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+Map&lt;String, dynamic&gt; toJson()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">&lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copy()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copyWith()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="47174.0" y="3334.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M47174.0 3365.0 L47736.0 3365.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M47174.0 3546.0 L47736.0 3546.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+					<g data-name="JsonFileLoader">
+						<g fill="#eee8d5" stroke="#33322E" data-name="JsonFileLoader">
+							<rect x="77468.5" y="75.0" height="123.0" width="319.0" data-name="JsonFileLoader"></rect>
+							<path d="M77468.5 106.0 L77787.5 106.0" fill="none" data-name="JsonFileLoader"></path>
+							<path d="M77468.5 137.0 L77787.5 137.0" fill="none" data-name="JsonFileLoader"></path>
 						</g>
-						<g transform="translate(47174, 3334)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
-								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
+						<g transform="translate(77468.5, 75)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="JsonFileLoader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonFileLoader">
+								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="JsonFileLoader">JsonFileLoader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47174, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+						<g transform="translate(77468.5, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
+								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+jsonAssetsPath: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47174, 3546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
+						<g transform="translate(77468.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
+								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+dynamic loadJson()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonMapFromAssets()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonListFromAssets()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="35315.5" y="1956.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M35315.5 1987.0 L36328.5 1987.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M35315.5 3008.0 L36328.5 3008.0" fill="none" data-name="QuestionFormViewModel"></path>
+					<g data-name="IAppDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
+							<rect x="19658.5" y="3812.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
+							<path d="M19658.5 3843.5 L19855.5 3843.5" fill="none" data-name="IAppDelegate"></path>
 						</g>
-						<g transform="translate(35315.5, 1956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
+						<g transform="translate(19658.5, 3812.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35315.5, 1987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(19658.5, 3843.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35315.5, 3008)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
+					</g>
+					<g data-name="AppController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
+							<rect x="77827.5" y="67.5" height="138.0" width="301.0" data-name="AppController"></rect>
+							<path d="M77827.5 98.5 L78128.5 98.5" fill="none" data-name="AppController"></path>
+							<path d="M77827.5 159.5 L78128.5 159.5" fill="none" data-name="AppController"></path>
+						</g>
+						<g transform="translate(77827.5, 67.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
+								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IScreenerQuestionLogicFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="21221.8" y="2594.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M21221.8 2625.0 L21553.8 2625.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
-						</g>
-						<g transform="translate(21221.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
+						<g transform="translate(77827.5, 98.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21221.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+						<g transform="translate(77827.5, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignEnrollmentFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="24593.0" y="3454.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M24593.0 3485.5 L25042.0 3485.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
+					<g data-name="StudyMonitorScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
+							<rect x="28875.3" y="2594.0" height="62.0" width="176.0" data-name="StudyMonitorScreen"></rect>
+							<path d="M28875.3 2625.0 L29051.3 2625.0" fill="none" data-name="StudyMonitorScreen"></path>
 						</g>
-						<g transform="translate(24593, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
+						<g transform="translate(28875.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
+								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24593, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
+						<g transform="translate(28875.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StudyPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
+							<rect x="33543.0" y="1651.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
+							<path d="M33543.0 1682.0 L33707.0 1682.0" fill="none" data-name="StudyPageWidget"></path>
+							<path d="M33543.0 1713.0 L33707.0 1713.0" fill="none" data-name="StudyPageWidget"></path>
+						</g>
+						<g transform="translate(33543, 1651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="22410.3" y="2594.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M22410.3 2625.0 L22622.3 2625.0" fill="none" data-name="StudyDesignPageWidget"></path>
-						</g>
-						<g transform="translate(22410.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
+						<g transform="translate(33543, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22410.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
+						<g transform="translate(33543, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionLogicFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="82493.3" y="2556.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M82493.3 2587.0 L82917.3 2587.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M82493.3 2618.0 L82917.3 2618.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+					<g data-name="LoginForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
+							<rect x="11713.0" y="2578.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
+							<path d="M11713.0 2609.5 L11920.0 2609.5" fill="none" data-name="LoginForm"></path>
+							<path d="M11713.0 2640.5 L11920.0 2640.5" fill="none" data-name="LoginForm"></path>
 						</g>
-						<g transform="translate(82493.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
-								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
+						<g transform="translate(11713, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82493.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
+						<g transform="translate(11713, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82493.25, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
+						<g transform="translate(11713, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="83707.8" y="105.5" height="62.0" width="192.0" data-name="FormConsumerWidget"></rect>
-							<path d="M83707.8 136.5 L83899.8 136.5" fill="none" data-name="FormConsumerWidget"></path>
+					<g data-name="AuthFormKey">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
+							<rect x="14634.5" y="3417.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
+							<path d="M14634.5 3448.0 L14989.5 3448.0" fill="none" data-name="AuthFormKey"></path>
 						</g>
-						<g transform="translate(83707.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
+						<g transform="translate(14634.5, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
+								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83707.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerWidget">+Widget build()</text>
+						<g transform="translate(14634.5, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="29342.0" y="1613.5" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M29342.0 1644.5 L29600.0 1644.5" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M29342.0 1735.5 L29600.0 1735.5" fill="none" data-name="ConsentItemFormData"></path>
+					<g data-name="PasswordRecoveryForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
+							<rect x="12467.3" y="2578.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
+							<path d="M12467.3 2609.5 L12675.3 2609.5" fill="none" data-name="PasswordRecoveryForm"></path>
+							<path d="M12467.3 2640.5 L12675.3 2640.5" fill="none" data-name="PasswordRecoveryForm"></path>
 						</g>
-						<g transform="translate(29342, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
+						<g transform="translate(12467.25, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29342, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
+						<g transform="translate(12467.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29342, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
+						<g transform="translate(12467.25, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="59112.5" y="2376.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M59112.5 2407.0 L60014.5 2407.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M59112.5 2633.0 L60014.5 2633.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+					<g data-name="PasswordForgotForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
+							<rect x="13425.0" y="2578.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
+							<path d="M13425.0 2609.5 L13632.0 2609.5" fill="none" data-name="PasswordForgotForm"></path>
+							<path d="M13425.0 2640.5 L13632.0 2640.5" fill="none" data-name="PasswordForgotForm"></path>
 						</g>
-						<g transform="translate(59112.5, 2376)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
-								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
+						<g transform="translate(13425, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59112.5, 2407)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
+						<g transform="translate(13425, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59112.5, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
+						<g transform="translate(13425, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormConsentItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="55349.5" y="3394.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M55349.5 3425.0 L56149.5 3425.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M55349.5 3501.0 L56149.5 3501.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+					<g data-name="SignupForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
+							<rect x="18358.3" y="2563.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
+							<path d="M18358.3 2594.5 L18636.3 2594.5" fill="none" data-name="SignupForm"></path>
+							<path d="M18358.3 2625.5 L18636.3 2625.5" fill="none" data-name="SignupForm"></path>
 						</g>
-						<g transform="translate(55349.5, 3394)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
+						<g transform="translate(18358.25, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
+								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55349.5, 3425)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
+						<g transform="translate(18358.25, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55349.5, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
+						<g transform="translate(18358.25, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="38650.0" y="1568.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M38650.0 1599.5 L39282.0 1599.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M38650.0 1705.5 L39282.0 1705.5" fill="none" data-name="WithQuestionnaireControls"></path>
-						</g>
-						<g transform="translate(38650, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
+					<g data-name="AuthScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
+							<rect x="29445.3" y="2564.0" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
+							<path d="M29445.3 2595.0 L29704.3 2595.0" fill="none" data-name="AuthScaffold"></path>
 						</g>
-						<g transform="translate(38650, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
+						<g transform="translate(29445.25, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
+								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38650, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
+						<g transform="translate(29445.25, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="31033.5" y="2496.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M31033.5 2527.0 L31729.5 2527.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M31033.5 2693.0 L31729.5 2693.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+					<g data-name="EmailTextField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
+							<rect x="29744.3" y="2571.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
+							<path d="M29744.3 2602.5 L30065.3 2602.5" fill="none" data-name="EmailTextField"></path>
 						</g>
-						<g transform="translate(31033.5, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
+						<g transform="translate(29744.25, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
+								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31033.5, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(29744.25, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
+								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31033.5, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
+					</g>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="59258.3" y="3485.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+						</g>
+						<g transform="translate(59258.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="10812.5" y="1666.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M10812.5 1697.5 L11193.5 1697.5" fill="none" data-name="ConsentItemFormView"></path>
+					<g data-name="PasswordTextField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
+							<rect x="30105.3" y="2564.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
+							<path d="M30105.3 2595.0 L30584.3 2595.0" fill="none" data-name="PasswordTextField"></path>
 						</g>
-						<g transform="translate(10812.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
+						<g transform="translate(30105.25, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10812.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
+						<g transform="translate(30105.25, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="28584.5" y="2541.0" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M28584.5 2572.0 L29038.5 2572.0" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M28584.5 2663.0 L29038.5 2663.0" fill="none" data-name="EnrollmentFormData"></path>
+					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+							<rect x="29964.8" y="3485.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
 						</g>
-						<g transform="translate(28584.5, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
-								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
+						<g transform="translate(29964.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28584.5, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
+					</g>
+					<g data-name="StudyUJobsToBeDone">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
+							<rect x="78168.5" y="105.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
+							<path d="M78168.5 136.5 L78362.5 136.5" fill="none" data-name="StudyUJobsToBeDone"></path>
+						</g>
+						<g transform="translate(78168.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
+								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28584.5, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
+						<g transform="translate(78168.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="53266.8" y="3431.5" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M53266.8 3462.5 L53634.8 3462.5" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M53266.8 3508.5 L53634.8 3508.5" fill="none" data-name="QuestionnaireFormData"></path>
+					<g data-name="AuthFormController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
+							<rect x="43407.0" y="2368.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
+							<path d="M43407.0 2399.5 L44257.0 2399.5" fill="none" data-name="AuthFormController"></path>
+							<path d="M43407.0 2655.5 L44257.0 2655.5" fill="none" data-name="AuthFormController"></path>
 						</g>
-						<g transform="translate(53266.75, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
+						<g transform="translate(43407, 2368.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
+								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53266.75, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
+						<g transform="translate(43407, 2399.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53266.75, 3508.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
+						<g transform="translate(43407, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="32371.8" y="1666.5" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M32371.8 1697.5 L32514.8 1697.5" fill="none" data-name="IStudyFormData"></path>
-						</g>
-						<g transform="translate(32371.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
-								
-							</g>
+					<g data-name="IAuthRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
+							<rect x="72971.8" y="4020.0" height="228.0" width="295.0" data-name="IAuthRepository"></rect>
+							<path d="M72971.8 4051.0 L73266.8 4051.0" fill="none" data-name="IAuthRepository"></path>
+							<path d="M72971.8 4142.0 L73266.8 4142.0" fill="none" data-name="IAuthRepository"></path>
 						</g>
-						<g transform="translate(32371.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
+						<g transform="translate(72971.75, 4020)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
+								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyDesignInterventionsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="25082.0" y="3469.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M25082.0 3500.5 L25378.0 3500.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
-						</g>
-						<g transform="translate(25082, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
+						<g transform="translate(72971.75, 4051)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+allowPasswordReset: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+currentUser: User?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+isLoggedIn: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+session: Session?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+serializedSession: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25082, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
+						<g transform="translate(72971.75, 4142)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+dynamic signUp()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+dynamic signInWith()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+dynamic signOut()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+dynamic resetPasswordForEmail()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+dynamic updateUser()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IAuthRepository">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="69205.5" y="2436.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M69205.5 2467.0 L70044.5 2467.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M69205.5 2618.0 L70044.5 2618.0" fill="none" data-name="InterventionsFormViewModel"></path>
+					<g data-name="FormGroup">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
+							<rect x="61341.3" y="3485.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
 						</g>
-						<g transform="translate(69205.5, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
-								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
+						<g transform="translate(61341.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
 								
 							</g>
 						</g>
-						<g transform="translate(69205.5, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
+					</g>
+					<g data-name="IFormGroupController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
+							<rect x="47019.5" y="105.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
+							<path d="M47019.5 136.5 L47206.5 136.5" fill="none" data-name="IFormGroupController"></path>
+						</g>
+						<g transform="translate(47019.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
+								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(69205.5, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
+						<g transform="translate(47019.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="82745.3" y="1501.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M82745.3 1532.0 L83503.3 1532.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M82745.3 1833.0 L83503.3 1833.0" fill="none" data-name="StudyScheduleControls"></path>
-						</g>
-						<g transform="translate(82745.25, 1501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
-								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
-								
-							</g>
+					<g data-name="AppStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
+							<rect x="940.0" y="3447.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
+							<path d="M940.0 3478.0 L1219.0 3478.0" fill="none" data-name="AppStatus"></path>
 						</g>
-						<g transform="translate(82745.25, 1532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
+						<g transform="translate(940, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
+								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82745.25, 1833)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
+						<g transform="translate(940, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="41833.8" y="2391.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M41833.8 2422.0 L42688.8 2422.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M41833.8 2648.0 L42688.8 2648.0" fill="none" data-name="InterventionFormViewModel"></path>
+					<g data-name="FormArrayTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
+							<rect x="31066.5" y="2428.5" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
+							<path d="M31066.5 2459.5 L31556.5 2459.5" fill="none" data-name="FormArrayTable"></path>
+							<path d="M31066.5 2760.5 L31556.5 2760.5" fill="none" data-name="FormArrayTable"></path>
 						</g>
-						<g transform="translate(41833.75, 2391)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
-								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
+						<g transform="translate(31066.5, 2428.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
+								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41833.75, 2422)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(31066.5, 2459.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41833.75, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
+						<g transform="translate(31066.5, 2760.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="57817.0" y="2541.0" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M57817.0 2572.0 L58107.0 2572.0" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M57817.0 2663.0 L58107.0 2663.0" fill="none" data-name="InterventionTaskFormData"></path>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+							<rect x="30425.0" y="3485.0" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
 						</g>
-						<g transform="translate(57817, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
+						<g transform="translate(30425, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57817, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
-								
-							</g>
+					</g>
+					<g data-name="String Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
+							<rect x="30876.0" y="3485.0" height="31.0" width="157.0" data-name="String Function(T)"></rect>
 						</g>
-						<g transform="translate(57817, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
+						<g transform="translate(30876, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
+								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="58364.8" y="1613.5" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M58364.8 1644.5 L58662.8 1644.5" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M58364.8 1750.5 L58662.8 1750.5" fill="none" data-name="IFormDataWithSchedule"></path>
+					<g data-name="Widget Function(BuildContext, T, int)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
+							<rect x="31526.0" y="3485.0" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
 						</g>
-						<g transform="translate(58364.75, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
+						<g transform="translate(31526, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
+								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58364.75, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
+					</g>
+					<g data-name="ManagedFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
+							<rect x="58975.8" y="1666.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
+							<path d="M58975.8 1697.5 L59371.8 1697.5" fill="none" data-name="ManagedFormViewModel"></path>
+						</g>
+						<g transform="translate(58975.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
+								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58364.75, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
+						<g transform="translate(58975.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="29211.5" y="3401.5" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M29211.5 3432.5 L29507.5 3432.5" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M29211.5 3538.5 L29507.5 3538.5" fill="none" data-name="StudyScheduleFormData"></path>
+					<g data-name="FormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
+							<rect x="68299.0" y="313.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
+							<path d="M68299.0 344.0 L69171.0 344.0" fill="none" data-name="FormViewModel"></path>
+							<path d="M68299.0 660.0 L69171.0 660.0" fill="none" data-name="FormViewModel"></path>
 						</g>
-						<g transform="translate(29211.5, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
+						<g transform="translate(68299, 313)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
+								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29211.5, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
+						<g transform="translate(68299, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29211.5, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
+						<g transform="translate(68299, 660)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PhaseSequence">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="62577.5" y="3828.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
+					<g data-name="FormViewModelNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
+							<rect x="72520.8" y="614.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
 						</g>
-						<g transform="translate(62577.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
-								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
+						<g transform="translate(72520.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="16518.8" y="1651.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M16518.8 1682.0 L16848.8 1682.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M16518.8 1713.0 L16848.8 1713.0" fill="none" data-name="InterventionPreview"></path>
+					<g data-name="Exception">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
+							<rect x="75456.5" y="121.0" height="31.0" width="94.0" data-name="Exception"></rect>
 						</g>
-						<g transform="translate(16518.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
+						<g transform="translate(75456.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
+								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16518.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
-								
-							</g>
+					</g>
+					<g data-name="FormViewModelCollection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
+							<rect x="65717.8" y="3707.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
+							<path d="M65717.8 3738.0 L65998.8 3738.0" fill="none" data-name="FormViewModelCollection"></path>
+							<path d="M65717.8 3829.0 L65998.8 3829.0" fill="none" data-name="FormViewModelCollection"></path>
 						</g>
-						<g transform="translate(16518.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
+						<g transform="translate(65717.75, 3707)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
+								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InterventionTaskFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="64000.5" y="2488.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M64000.5 2519.5 L64696.5 2519.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M64000.5 2700.5 L64696.5 2700.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-						</g>
-						<g transform="translate(64000.5, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
+						<g transform="translate(65717.75, 3738)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64000.5, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(65717.75, 3829)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64000.5, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
+					</g>
+					<g data-name="FormArray">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
+							<rect x="61689.0" y="4118.5" height="31.0" width="98.0" data-name="FormArray"></rect>
+						</g>
+						<g transform="translate(61689, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="83543.3" y="1546.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M83543.3 1577.0 L84038.3 1577.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M83543.3 1803.0 L84038.3 1803.0" fill="none" data-name="WithScheduleControls"></path>
+					<g data-name="CustomFormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
+							<rect x="59108.3" y="3759.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
+							<path d="M59108.3 3790.5 L59521.3 3790.5" fill="none" data-name="CustomFormControl"></path>
+							<path d="M59108.3 3896.5 L59521.3 3896.5" fill="none" data-name="CustomFormControl"></path>
 						</g>
-						<g transform="translate(83543.25, 1546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
+						<g transform="translate(59108.25, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83543.25, 1577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
+						<g transform="translate(59108.25, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83543.25, 1803)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
+						<g transform="translate(59108.25, 3896.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="29118.5" y="2556.0" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M29118.5 2587.0 L29512.5 2587.0" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M29118.5 2648.0 L29512.5 2648.0" fill="none" data-name="InterventionsFormData"></path>
+					<g data-name="void Function(T?)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
+							<rect x="60887.0" y="4118.5" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
 						</g>
-						<g transform="translate(29118.5, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
+						<g transform="translate(60887, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29118.5, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
-								
-							</g>
+					</g>
+					<g data-name="void Function(ControlStatus)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
+							<rect x="61384.3" y="4118.5" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
 						</g>
-						<g transform="translate(29118.5, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
+						<g transform="translate(61384.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="15541.3" y="1666.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M15541.3 1697.5 L15916.3 1697.5" fill="none" data-name="InterventionFormView"></path>
+					<g data-name="UnsavedChangesDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
+							<rect x="79433.8" y="105.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
+							<path d="M79433.8 136.5 L79640.8 136.5" fill="none" data-name="UnsavedChangesDialog"></path>
 						</g>
-						<g transform="translate(15541.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
-								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
+						<g transform="translate(79433.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15541.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
+						<g transform="translate(79433.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="15956.3" y="1666.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M15956.3 1697.5 L16369.3 1697.5" fill="none" data-name="InterventionTaskFormView"></path>
-						</g>
-						<g transform="translate(15956.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
-								
-							</g>
+					<g data-name="FormValidationSetEnum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
+							<rect x="60170.8" y="1197.0" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
 						</g>
-						<g transform="translate(15956.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
+						<g transform="translate(60170.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
+								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="29640.0" y="1598.5" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M29640.0 1629.5 L30022.0 1629.5" fill="none" data-name="InterventionFormData"></path>
-							<path d="M29640.0 1750.5 L30022.0 1750.5" fill="none" data-name="InterventionFormData"></path>
+					<g data-name="FormControlValidation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
+							<rect x="32866.0" y="2556.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
+							<path d="M32866.0 2587.0 L33351.0 2587.0" fill="none" data-name="FormControlValidation"></path>
+							<path d="M32866.0 2663.0 L33351.0 2663.0" fill="none" data-name="FormControlValidation"></path>
 						</g>
-						<g transform="translate(29640, 1598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
+						<g transform="translate(32866, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
+								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29640, 1629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
+						<g transform="translate(32866, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29640, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
+						<g transform="translate(32866, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="82944.8" y="1158.5" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M82944.8 1189.5 L83303.8 1189.5" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M82944.8 1220.5 L83303.8 1220.5" fill="none" data-name="StudyScheduleFormView"></path>
+					<g data-name="IFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
+							<rect x="50917.0" y="1166.0" height="93.0" width="163.0" data-name="IFormData"></rect>
+							<path d="M50917.0 1197.0 L51080.0 1197.0" fill="none" data-name="IFormData"></path>
+							<path d="M50917.0 1228.0 L51080.0 1228.0" fill="none" data-name="IFormData"></path>
 						</g>
-						<g transform="translate(82944.75, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
+						<g transform="translate(50917, 1166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
+								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82944.75, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
+						<g transform="translate(50917, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82944.75, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
+						<g transform="translate(50917, 1228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="30579.5" y="2541.0" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M30579.5 2572.0 L30993.5 2572.0" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M30579.5 2663.0 L30993.5 2663.0" fill="none" data-name="StudyInfoFormData"></path>
+					<g data-name="FormInvalidException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
+							<rect x="74359.3" y="614.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
 						</g>
-						<g transform="translate(30579.5, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
+						<g transform="translate(74359.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
+								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30579.5, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
+					</g>
+					<g data-name="FormConfigException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
+							<rect x="74585.3" y="598.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
+							<path d="M74585.3 629.5 L74770.3 629.5" fill="none" data-name="FormConfigException"></path>
+						</g>
+						<g transform="translate(74585.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
+								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30579.5, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
+						<g transform="translate(74585.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyContactInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="29547.5" y="3386.5" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M29547.5 3417.5 L29895.5 3417.5" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M29547.5 3568.5 L29895.5 3568.5" fill="none" data-name="StudyContactInfoFormData"></path>
-						</g>
-						<g transform="translate(29547.5, 3386.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
-								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
-								
-							</g>
+					<g data-name="IFormViewModelDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
+							<rect x="67477.5" y="1174.0" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
+							<path d="M67477.5 1205.0 L67694.5 1205.0" fill="none" data-name="IFormViewModelDelegate"></path>
 						</g>
-						<g transform="translate(29547.5, 3417.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
+						<g transform="translate(67477.5, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
+								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29547.5, 3568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
+						<g transform="translate(67477.5, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignInfoFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="25418.0" y="3469.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M25418.0 3500.5 L25641.0 3500.5" fill="none" data-name="StudyDesignInfoFormView"></path>
+					<g data-name="FormControlOption">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
+							<rect x="22823.0" y="2571.5" height="107.0" width="190.0" data-name="FormControlOption"></rect>
+							<path d="M22823.0 2602.5 L23013.0 2602.5" fill="none" data-name="FormControlOption"></path>
 						</g>
-						<g transform="translate(25418, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
+						<g transform="translate(22823, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
+								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25418, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
+						<g transform="translate(22823, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInfoFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="72356.5" y="2383.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M72356.5 2414.5 L73052.5 2414.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M72356.5 2820.5 L73052.5 2820.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-						</g>
-						<g transform="translate(72356.5, 2383.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
-								
-							</g>
+					<g data-name="FormMode">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
+							<rect x="25140.0" y="3439.5" height="122.0" width="282.0" data-name="FormMode"></rect>
+							<path d="M25140.0 3470.5 L25422.0 3470.5" fill="none" data-name="FormMode"></path>
 						</g>
-						<g transform="translate(72356.5, 2414.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
+						<g transform="translate(25140, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72356.5, 2820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
+						<g transform="translate(25140, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="58147.0" y="2526.0" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M58147.0 2557.0 L58556.0 2557.0" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M58147.0 2678.0 L58556.0 2678.0" fill="none" data-name="MeasurementSurveyFormData"></path>
+					<g data-name="EnrolledBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
+							<rect x="79680.8" y="90.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
+							<path d="M79680.8 121.0 L79846.8 121.0" fill="none" data-name="EnrolledBadge"></path>
+							<path d="M79680.8 152.0 L79846.8 152.0" fill="none" data-name="EnrolledBadge"></path>
 						</g>
-						<g transform="translate(58147, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
+						<g transform="translate(79680.75, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58147, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
+						<g transform="translate(79680.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58147, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
+						<g transform="translate(79680.75, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="16888.8" y="1666.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M16888.8 1697.5 L17332.8 1697.5" fill="none" data-name="MeasurementSurveyFormView"></path>
+					<g data-name="StudyRecruitController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
+							<rect x="75351.5" y="1121.0" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
+							<path d="M75351.5 1152.0 L76002.5 1152.0" fill="none" data-name="StudyRecruitController"></path>
+							<path d="M75351.5 1198.0 L76002.5 1198.0" fill="none" data-name="StudyRecruitController"></path>
 						</g>
-						<g transform="translate(16888.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
+						<g transform="translate(75351.5, 1121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
+								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16888.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
+						<g transform="translate(75351.5, 1152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(75351.5, 1198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="57081.0" y="2413.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M57081.0 2444.5 L57777.0 2444.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M57081.0 2670.5 L57777.0 2670.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+					<g data-name="IInviteCodeRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
+							<rect x="81834.0" y="1666.5" height="62.0" width="265.0" data-name="IInviteCodeRepository"></rect>
+							<path d="M81834.0 1697.5 L82099.0 1697.5" fill="none" data-name="IInviteCodeRepository"></path>
 						</g>
-						<g transform="translate(57081, 2413.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
+						<g transform="translate(81834, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
+								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57081, 2444.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(81834, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IInviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IInviteCodeRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IInviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57081, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
+					</g>
+					<g data-name="StreamSubscription">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
+							<rect x="71898.3" y="3485.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+						</g>
+						<g transform="translate(71898.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
+								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="17372.8" y="1651.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M17372.8 1682.0 L17716.8 1682.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M17372.8 1713.0 L17716.8 1713.0" fill="none" data-name="SurveyPreview"></path>
+					<g data-name="StudyBaseController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
+							<rect x="73001.3" y="538.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
+							<path d="M73001.3 569.0 L73547.3 569.0" fill="none" data-name="StudyBaseController"></path>
+							<path d="M73001.3 645.0 L73547.3 645.0" fill="none" data-name="StudyBaseController"></path>
 						</g>
-						<g transform="translate(17372.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
+						<g transform="translate(73001.25, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
+								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17372.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
+						<g transform="translate(73001.25, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17372.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
+						<g transform="translate(73001.25, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignMeasurementsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="25938.0" y="3469.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M25938.0 3500.5 L26248.0 3500.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
+					<g data-name="StudyRecruitScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
+							<rect x="29091.3" y="2571.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
+							<path d="M29091.3 2602.5 L29405.3 2602.5" fill="none" data-name="StudyRecruitScreen"></path>
 						</g>
-						<g transform="translate(25938, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
+						<g transform="translate(29091.25, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
+								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25938, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
+						<g transform="translate(29091.25, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="33537.5" y="2563.5" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M33537.5 2594.5 L34031.5 2594.5" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M33537.5 2640.5 L34031.5 2640.5" fill="none" data-name="MeasurementsFormData"></path>
+					<g data-name="InviteCodeFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
+							<rect x="80897.0" y="575.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
+							<path d="M80897.0 606.5 L81335.0 606.5" fill="none" data-name="InviteCodeFormView"></path>
+							<path d="M80897.0 637.5 L81335.0 637.5" fill="none" data-name="InviteCodeFormView"></path>
 						</g>
-						<g transform="translate(33537.5, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
-								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
+						<g transform="translate(80897, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
+								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33537.5, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
+						<g transform="translate(80897, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33537.5, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
+						<g transform="translate(80897, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="68033.5" y="2443.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M68033.5 2474.5 L69125.5 2474.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M68033.5 2625.5 L69125.5 2625.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+					<g data-name="InviteCodeFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
+							<rect x="72890.5" y="1023.5" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
+							<path d="M72890.5 1054.5 L73557.5 1054.5" fill="none" data-name="InviteCodeFormViewModel"></path>
+							<path d="M72890.5 1280.5 L73557.5 1280.5" fill="none" data-name="InviteCodeFormViewModel"></path>
 						</g>
-						<g transform="translate(68033.5, 2443.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
-								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
+						<g transform="translate(72890.5, 1023.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
+								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68033.5, 2474.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(72890.5, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68033.5, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
+						<g transform="translate(72890.5, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormValidationSet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="1217.0" y="3462.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M1217.0 3493.0 L1604.0 3493.0" fill="none" data-name="StudyFormValidationSet"></path>
+					<g data-name="StudyInvitesTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
+							<rect x="78402.5" y="45.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
+							<path d="M78402.5 76.0 L78968.5 76.0" fill="none" data-name="StudyInvitesTable"></path>
+							<path d="M78402.5 182.0 L78968.5 182.0" fill="none" data-name="StudyInvitesTable"></path>
 						</g>
-						<g transform="translate(1217, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
-								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
+						<g transform="translate(78402.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
+								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1217, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
+						<g transform="translate(78402.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
+								
+							</g>
+						</g>
+						<g transform="translate(78402.5, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="64736.5" y="2451.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M64736.5 2482.0 L65596.5 2482.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M64736.5 2648.0 L65596.5 2648.0" fill="none" data-name="ReportsFormViewModel"></path>
+					<g data-name="void Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
+							<rect x="77874.3" y="614.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(64736.5, 2451)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
-								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
+						<g transform="translate(77874.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
+								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64736.5, 2482)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
+					</g>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+							<rect x="78136.3" y="614.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
+						</g>
+						<g transform="translate(78136.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64736.5, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
+					</g>
+					<g data-name="Intervention? Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
+							<rect x="78596.3" y="614.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
+						</g>
+						<g transform="translate(78596.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportFormItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="57808.5" y="3394.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M57808.5 3425.0 L58651.5 3425.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M57808.5 3501.0 L58651.5 3501.0" fill="none" data-name="ReportFormItemDelegate"></path>
+					<g data-name="int Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
+							<rect x="78904.0" y="614.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(57808.5, 3394)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
-								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
+						<g transform="translate(78904, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57808.5, 3425)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
+					</g>
+					<g data-name="PublishSuccessDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
+							<rect x="30624.3" y="2594.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
+							<path d="M30624.3 2625.0 L30815.3 2625.0" fill="none" data-name="PublishSuccessDialog"></path>
+						</g>
+						<g transform="translate(30624.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57808.5, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
+						<g transform="translate(30624.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="34593.5" y="1628.5" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M34593.5 1659.5 L34907.5 1659.5" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M34593.5 1720.5 L34907.5 1720.5" fill="none" data-name="ReportItemFormData"></path>
+					<g data-name="PublishDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
+							<rect x="33391.0" y="2594.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
+							<path d="M33391.0 2625.0 L33527.0 2625.0" fill="none" data-name="PublishDialog"></path>
 						</g>
-						<g transform="translate(34593.5, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
+						<g transform="translate(33391, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34593.5, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
+						<g transform="translate(33391, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34593.5, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
+					</g>
+					<g data-name="PublishConfirmationDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
+							<rect x="33567.0" y="2594.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
+							<path d="M33567.0 2625.0 L33791.0 2625.0" fill="none" data-name="PublishConfirmationDialog"></path>
+						</g>
+						<g transform="translate(33567, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
+								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="34686.5" y="2609.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(34686.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
+						<g transform="translate(33567, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="23219.5" y="1613.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M23219.5 1644.5 L23686.5 1644.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M23219.5 1720.5 L23686.5 1720.5" fill="none" data-name="ReportItemFormView"></path>
+					<g data-name="FrameControlsWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
+							<rect x="18530.8" y="3782.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
+							<path d="M18530.8 3813.0 L18821.8 3813.0" fill="none" data-name="FrameControlsWidget"></path>
+							<path d="M18530.8 3874.0 L18821.8 3874.0" fill="none" data-name="FrameControlsWidget"></path>
 						</g>
-						<g transform="translate(23219.5, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
-								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
+						<g transform="translate(18530.75, 3782)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
+								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23219.5, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
+						<g transform="translate(18530.75, 3813)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23219.5, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
+						<g transform="translate(18530.75, 3874)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="29552.5" y="2338.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M29552.5 2369.5 L30539.5 2369.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M29552.5 2805.5 L30539.5 2805.5" fill="none" data-name="ReportItemFormViewModel"></path>
+					<g data-name="IStudyStatusBadgeViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
+							<rect x="34506.0" y="2586.5" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
+							<path d="M34506.0 2617.5 L34791.0 2617.5" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
 						</g>
-						<g transform="translate(29552.5, 2338.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
-								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
+						<g transform="translate(34506, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
+								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29552.5, 2369.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
+						<g transform="translate(34506, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29552.5, 2805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
+					</g>
+					<g data-name="Participation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
+							<rect x="36368.5" y="3485.0" height="31.0" width="114.0" data-name="Participation"></rect>
+						</g>
+						<g transform="translate(36368.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
+								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="17803.8" y="3485.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
+					<g data-name="StudyStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
+							<rect x="32274.5" y="3485.0" height="31.0" width="111.0" data-name="StudyStatus"></rect>
 						</g>
-						<g transform="translate(17803.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
+						<g transform="translate(32274.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
+								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="7481.3" y="3447.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M7481.3 3478.0 L7864.3 3478.0" fill="none" data-name="ReportSectionType"></path>
+					<g data-name="StudyStatusBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
+							<rect x="34831.0" y="2548.5" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
+							<path d="M34831.0 2579.5 L35072.0 2579.5" fill="none" data-name="StudyStatusBadge"></path>
+							<path d="M34831.0 2670.5 L35072.0 2670.5" fill="none" data-name="StudyStatusBadge"></path>
 						</g>
-						<g transform="translate(7481.25, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
+						<g transform="translate(34831, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
+								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7481.25, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
+						<g transform="translate(34831, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(34831, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="31809.5" y="2518.5" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M31809.5 2549.5 L32257.5 2549.5" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M31809.5 2655.5 L32257.5 2655.5" fill="none" data-name="TemporalAggregationFormatted"></path>
+					<g data-name="RouteInformation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
+							<rect x="32425.5" y="3431.5" height="138.0" width="152.0" data-name="RouteInformation"></rect>
+							<path d="M32425.5 3462.5 L32577.5 3462.5" fill="none" data-name="RouteInformation"></path>
+							<path d="M32425.5 3538.5 L32577.5 3538.5" fill="none" data-name="RouteInformation"></path>
 						</g>
-						<g transform="translate(31809.5, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
+						<g transform="translate(32425.5, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31809.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
+						<g transform="translate(32425.5, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31809.5, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
+						<g transform="translate(32425.5, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="29935.5" y="3485.0" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
+					<g data-name="PlatformController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
+							<rect x="35112.0" y="2496.0" height="258.0" width="302.0" data-name="PlatformController"></rect>
+							<path d="M35112.0 2527.0 L35414.0 2527.0" fill="none" data-name="PlatformController"></path>
+							<path d="M35112.0 2618.0 L35414.0 2618.0" fill="none" data-name="PlatformController"></path>
 						</g>
-						<g transform="translate(29935.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
+						<g transform="translate(35112, 2496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
+								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="32297.5" y="2518.5" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M32297.5 2549.5 L32748.5 2549.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M32297.5 2655.5 L32748.5 2655.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
-						</g>
-						<g transform="translate(32297.5, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
+						<g transform="translate(35112, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32297.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
+						<g transform="translate(35112, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32297.5, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
+					</g>
+					<g data-name="WebController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
+							<rect x="32766.5" y="3401.5" height="198.0" width="273.0" data-name="WebController"></rect>
+							<path d="M32766.5 3432.5 L33039.5 3432.5" fill="none" data-name="WebController"></path>
+							<path d="M32766.5 3463.5 L33039.5 3463.5" fill="none" data-name="WebController"></path>
+						</g>
+						<g transform="translate(32766.5, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
+								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="30161.5" y="3485.0" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
+						<g transform="translate(32766.5, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
+								
+							</g>
 						</g>
-						<g transform="translate(30161.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
+						<g transform="translate(32766.5, 3463.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="23726.5" y="1636.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M23726.5 1667.0 L24205.5 1667.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M23726.5 1728.0 L24205.5 1728.0" fill="none" data-name="AverageSectionFormView"></path>
+					<g data-name="IFrameElement">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
+							<rect x="32835.5" y="3828.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
 						</g>
-						<g transform="translate(23726.5, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
+						<g transform="translate(32835.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
+								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23726.5, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+					</g>
+					<g data-name="MobileController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
+							<rect x="33968.5" y="3417.0" height="167.0" width="191.0" data-name="MobileController"></rect>
+							<path d="M33968.5 3448.0 L34159.5 3448.0" fill="none" data-name="MobileController"></path>
+						</g>
+						<g transform="translate(33968.5, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23726.5, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
+						<g transform="translate(33968.5, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
+								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="24245.5" y="1636.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M24245.5 1667.0 L24724.5 1667.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M24245.5 1728.0 L24724.5 1728.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+					<g data-name="StudyController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
+							<rect x="72157.5" y="2511.0" height="228.0" width="573.0" data-name="StudyController"></rect>
+							<path d="M72157.5 2542.0 L72730.5 2542.0" fill="none" data-name="StudyController"></path>
+							<path d="M72157.5 2603.0 L72730.5 2603.0" fill="none" data-name="StudyController"></path>
 						</g>
-						<g transform="translate(24245.5, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
+						<g transform="translate(72157.5, 2511)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
+								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24245.5, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+						<g transform="translate(72157.5, 2542)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24245.5, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
+						<g transform="translate(72157.5, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="63291.5" y="583.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M63291.5 614.0 L63495.5 614.0" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M63291.5 645.0 L63495.5 645.0" fill="none" data-name="DataReferenceIdentifier"></path>
+					<g data-name="IStudyNavViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
+							<rect x="36428.5" y="2556.5" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
+							<path d="M36428.5 2587.5 L36669.5 2587.5" fill="none" data-name="IStudyNavViewModel"></path>
 						</g>
-						<g transform="translate(63291.5, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
+						<g transform="translate(36428.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
+								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63291.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
+						<g transform="translate(36428.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63291.5, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
+					</g>
+					<g data-name="StudyNav">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
+							<rect x="80128.0" y="68.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
+							<path d="M80128.0 99.0 L80361.0 99.0" fill="none" data-name="StudyNav"></path>
+						</g>
+						<g transform="translate(80128, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
+								
+							</g>
+						</g>
+						<g transform="translate(80128, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="63326.0" y="121.0" height="31.0" width="135.0" data-name="DataReference"></rect>
+					<g data-name="StudyDesignNav">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
+							<rect x="80401.0" y="68.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
+							<path d="M80401.0 99.0 L80689.0 99.0" fill="none" data-name="StudyDesignNav"></path>
 						</g>
-						<g transform="translate(63326, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
+						<g transform="translate(80401, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
+								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
+								
+							</g>
+						</g>
+						<g transform="translate(80401, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="32788.5" y="2556.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M32788.5 2587.0 L33497.5 2587.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M32788.5 2648.0 L33497.5 2648.0" fill="none" data-name="DataReferenceEditor"></path>
+					<g data-name="StudyParticipationBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
+							<rect x="36768.0" y="2556.0" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
+							<path d="M36768.0 2587.0 L36999.0 2587.0" fill="none" data-name="StudyParticipationBadge"></path>
+							<path d="M36768.0 2663.0 L36999.0 2663.0" fill="none" data-name="StudyParticipationBadge"></path>
 						</g>
-						<g transform="translate(32788.5, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
+						<g transform="translate(36768, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
+								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
+								
+							</g>
+						</g>
+						<g transform="translate(36768, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(36768, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32788.5, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
+					</g>
+					<g data-name="IStudyRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
+							<rect x="72645.0" y="3462.0" height="77.0" width="251.0" data-name="IStudyRepository"></rect>
+							<path d="M72645.0 3493.0 L72896.0 3493.0" fill="none" data-name="IStudyRepository"></path>
+						</g>
+						<g transform="translate(72645, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32788.5, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
+						<g transform="translate(72645, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyRepository">+dynamic launch()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyRepository">+dynamic deleteParticipants()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="30390.5" y="3485.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
+					<g data-name="PreviewFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
+							<rect x="61535.8" y="1166.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
+							<path d="M61535.8 1197.5 L61826.8 1197.5" fill="none" data-name="PreviewFrame"></path>
 						</g>
-						<g transform="translate(30390.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
+						<g transform="translate(61535.75, 1166.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
+								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReportsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="34308.5" y="2563.5" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M34308.5 2594.5 L34646.5 2594.5" fill="none" data-name="ReportsFormData"></path>
-							<path d="M34308.5 2640.5 L34646.5 2640.5" fill="none" data-name="ReportsFormData"></path>
-						</g>
-						<g transform="translate(34308.5, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
+						<g transform="translate(61535.75, 1197.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34308.5, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
+					</g>
+					<g data-name="IStudyAppBarViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
+							<rect x="33506.8" y="3454.5" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
+							<path d="M33506.8 3485.5 L33749.8 3485.5" fill="none" data-name="IStudyAppBarViewModel"></path>
+						</g>
+						<g transform="translate(33506.75, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
+								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34308.5, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
+						<g transform="translate(33506.75, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="15852.3" y="3447.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M15852.3 3478.0 L16153.3 3478.0" fill="none" data-name="ReportStatus"></path>
+					<g data-name="StudyScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
+							<rect x="63130.8" y="1091.5" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
+							<path d="M63130.8 1122.5 L63465.8 1122.5" fill="none" data-name="StudyScaffold"></path>
 						</g>
-						<g transform="translate(15852.25, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
+						<g transform="translate(63130.75, 1091.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
+								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15852.25, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
+						<g transform="translate(63130.75, 1122.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="34071.5" y="2556.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M34071.5 2587.0 L34268.5 2587.0" fill="none" data-name="ReportBadge"></path>
-							<path d="M34071.5 2663.0 L34268.5 2663.0" fill="none" data-name="ReportBadge"></path>
+					<g data-name="WebFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
+							<rect x="80729.0" y="82.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
+							<path d="M80729.0 113.5 L80898.0 113.5" fill="none" data-name="WebFrame"></path>
+							<path d="M80729.0 159.5 L80898.0 159.5" fill="none" data-name="WebFrame"></path>
 						</g>
-						<g transform="translate(34071.5, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
+						<g transform="translate(80729, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
+								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34071.5, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
+						<g transform="translate(80729, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34071.5, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
+						<g transform="translate(80729, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignReportsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="26288.0" y="3462.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M26288.0 3493.0 L26681.0 3493.0" fill="none" data-name="StudyDesignReportsFormView"></path>
+					<g data-name="DisabledFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
+							<rect x="80938.0" y="105.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
+							<path d="M80938.0 136.5 L81074.0 136.5" fill="none" data-name="DisabledFrame"></path>
 						</g>
-						<g transform="translate(26288, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
+						<g transform="translate(80938, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26288, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
+						<g transform="translate(80938, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="25270.0" y="2563.5" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M25270.0 2594.5 L25658.0 2594.5" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M25270.0 2655.5 L25658.0 2655.5" fill="none" data-name="StudyFormScaffold"></path>
+					<g data-name="PhoneContainer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
+							<rect x="37039.0" y="2518.5" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
+							<path d="M37039.0 2549.5 L37366.0 2549.5" fill="none" data-name="PhoneContainer"></path>
+							<path d="M37039.0 2700.5 L37366.0 2700.5" fill="none" data-name="PhoneContainer"></path>
 						</g>
-						<g transform="translate(25270, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
+						<g transform="translate(37039, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
+								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25270, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
+						<g transform="translate(37039, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
+								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25270, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
+						<g transform="translate(37039, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
+								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="T Function(WidgetRef)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="27658.5" y="3485.0" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
+					<g data-name="MobileFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
+							<rect x="81114.0" y="105.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
+							<path d="M81114.0 136.5 L81250.0 136.5" fill="none" data-name="MobileFrame"></path>
 						</g>
-						<g transform="translate(27658.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
+						<g transform="translate(81114, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="30633.5" y="3485.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
-						</g>
-						<g transform="translate(30633.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
+						<g transform="translate(81114, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="24764.5" y="1659.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M24764.5 1690.0 L25116.5 1690.0" fill="none" data-name="SurveyQuestionFormView"></path>
+					<g data-name="DesktopFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
+							<rect x="81290.0" y="105.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
+							<path d="M81290.0 136.5 L81426.0 136.5" fill="none" data-name="DesktopFrame"></path>
 						</g>
-						<g transform="translate(24764.5, 1659)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
+						<g transform="translate(81290, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24764.5, 1690)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
+						<g transform="translate(81290, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="28758.5" y="3417.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M28758.5 3448.0 L29121.5 3448.0" fill="none" data-name="SurveyQuestionType"></path>
+					<g data-name="StudyTestScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
+							<rect x="33831.0" y="2548.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
+							<path d="M33831.0 2579.5 L34031.0 2579.5" fill="none" data-name="StudyTestScreen"></path>
+							<path d="M33831.0 2610.5 L34031.0 2610.5" fill="none" data-name="StudyTestScreen"></path>
 						</g>
-						<g transform="translate(28758.5, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
+						<g transform="translate(33831, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
+								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28758.5, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
+						<g transform="translate(33831, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(33831, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="47393.0" y="1568.5" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M47393.0 1599.5 L48561.0 1599.5" fill="none" data-name="QuestionFormData"></path>
-							<path d="M47393.0 1735.5 L48561.0 1735.5" fill="none" data-name="QuestionFormData"></path>
+					<g data-name="StudySettingsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
+							<rect x="69180.0" y="2496.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
+							<path d="M69180.0 2527.0 L69659.0 2527.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+							<path d="M69180.0 2663.0 L69659.0 2663.0" fill="none" data-name="StudySettingsFormViewModel"></path>
 						</g>
-						<g transform="translate(47393, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
+						<g transform="translate(69180, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47393, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
+						<g transform="translate(69180, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47393, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
+						<g transform="translate(69180, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="43683.8" y="2541.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M43683.8 2572.0 L44027.8 2572.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M43683.8 2633.0 L44027.8 2633.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-						</g>
-						<g transform="translate(43683.75, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
-								
-							</g>
+					<g data-name="StudySettingsDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
+							<rect x="34071.0" y="2594.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
+							<path d="M34071.0 2625.0 L34246.0 2625.0" fill="none" data-name="StudySettingsDialog"></path>
 						</g>
-						<g transform="translate(43683.75, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(34071, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
+								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43683.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(34071, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="44067.8" y="2556.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M44067.8 2587.0 L44459.8 2587.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M44067.8 2633.0 L44459.8 2633.0" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(44067.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
+					<g data-name="StudyTestController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
+							<rect x="72149.8" y="3805.0" height="77.0" width="282.0" data-name="StudyTestController"></rect>
+							<path d="M72149.8 3836.0 L72431.8 3836.0" fill="none" data-name="StudyTestController"></path>
 						</g>
-						<g transform="translate(44067.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(72149.75, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44067.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(72149.75, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="44499.8" y="2556.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M44499.8 2587.0 L44971.8 2587.0" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M44499.8 2633.0 L44971.8 2633.0" fill="none" data-name="ImageQuestionFormData"></path>
-						</g>
-						<g transform="translate(44499.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
-								
-							</g>
+					<g data-name="TestAppRoutes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
+							<rect x="81466.0" y="68.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
+							<path d="M81466.0 99.0 L81726.0 99.0" fill="none" data-name="TestAppRoutes"></path>
 						</g>
-						<g transform="translate(44499.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(81466, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
+								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44499.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(81466, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
+								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="45011.8" y="2548.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M45011.8 2579.5 L45483.8 2579.5" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M45011.8 2640.5 L45483.8 2640.5" fill="none" data-name="AudioQuestionFormData"></path>
+					<g data-name="DrawerEntry">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
+							<rect x="64182.5" y="1113.5" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
+							<path d="M64182.5 1144.5 L64627.5 1144.5" fill="none" data-name="DrawerEntry"></path>
+							<path d="M64182.5 1280.5 L64627.5 1280.5" fill="none" data-name="DrawerEntry"></path>
 						</g>
-						<g transform="translate(45011.75, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
+						<g transform="translate(64182.5, 1113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
+								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45011.75, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(64182.5, 1144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DrawerEntry">+localizedHelpText: String Function()?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DrawerEntry">+enabled: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DrawerEntry">+onSelected: void Function(BuildContext, WidgetRef)?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DrawerEntry">+autoCloseDrawer: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DrawerEntry">+title: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="DrawerEntry">+helpText: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45011.75, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(64182.5, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="45523.8" y="2481.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M45523.8 2512.0 L45867.8 2512.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M45523.8 2708.0 L45867.8 2708.0" fill="none" data-name="ScaleQuestionFormData"></path>
+					<g data-name="String Function()">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
+							<rect x="63786.3" y="1682.0" height="31.0" width="147.0" data-name="String Function()"></rect>
 						</g>
-						<g transform="translate(45523.75, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
+						<g transform="translate(63786.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
+								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45523.75, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
+					</g>
+					<g data-name="String Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
+							<rect x="64013.3" y="1682.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
+						</g>
+						<g transform="translate(64013.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
+								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45523.75, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+					</g>
+					<g data-name="void Function(BuildContext, WidgetRef)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
+							<rect x="64210.3" y="1682.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
+						</g>
+						<g transform="translate(64210.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
+								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="56083.0" y="2541.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M56083.0 2572.0 L56427.0 2572.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M56083.0 2648.0 L56427.0 2648.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+					<g data-name="GoRouterDrawerEntry">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
+							<rect x="64586.3" y="1643.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
+							<path d="M64586.3 1674.5 L64850.3 1674.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+							<path d="M64586.3 1720.5 L64850.3 1720.5" fill="none" data-name="GoRouterDrawerEntry"></path>
 						</g>
-						<g transform="translate(56083, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
+						<g transform="translate(64586.25, 1643.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
+								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56083, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(64586.25, 1674.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56083, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(64586.25, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="56880.5" y="3485.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+					<g data-name="AppDrawer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
+							<rect x="81766.0" y="53.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
+							<path d="M81766.0 84.0 L82035.0 84.0" fill="none" data-name="AppDrawer"></path>
 						</g>
-						<g transform="translate(56880.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
+						<g transform="translate(81766, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
+								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
+								
+							</g>
+						</g>
+						<g transform="translate(81766, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppDrawer">+leftPaddingEntries: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AppDrawer">+logoPaddingVertical: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AppDrawer">+logoPaddingHorizontal: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AppDrawer">+logoMaxHeight: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AppDrawer">+logoSectionMinHeight: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AppDrawer">+logoSectionMaxHeight: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="73242.8" y="105.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M73242.8 136.5 L73551.8 136.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
+					<g data-name="StudyAnalyzeScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
+							<rect x="34286.0" y="2586.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
+							<path d="M34286.0 2617.5 L34466.0 2617.5" fill="none" data-name="StudyAnalyzeScreen"></path>
 						</g>
-						<g transform="translate(73242.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
+						<g transform="translate(34286, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
+								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73242.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(34286, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="25504.0" y="1666.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M25504.0 1697.5 L25856.0 1697.5" fill="none" data-name="ScaleQuestionFormView"></path>
+					<g data-name="StudyAnalyzeController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
+							<rect x="73637.5" y="1181.5" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
+							<path d="M73637.5 1212.5 L73838.5 1212.5" fill="none" data-name="StudyAnalyzeController"></path>
 						</g>
-						<g transform="translate(25504, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
+						<g transform="translate(73637.5, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
+								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25504, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(73637.5, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="25896.0" y="1628.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M25896.0 1659.5 L26248.0 1659.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M25896.0 1705.5 L26248.0 1705.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+					<g data-name="StudyDesignInterventionsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
+							<rect x="34199.5" y="3469.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
+							<path d="M34199.5 3500.5 L34495.5 3500.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
 						</g>
-						<g transform="translate(25896, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
+						<g transform="translate(34199.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25896, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
+						<g transform="translate(34199.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25896, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
+					</g>
+					<g data-name="StudyDesignPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
+							<rect x="36176.5" y="2594.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
+							<path d="M36176.5 2625.0 L36388.5 2625.0" fill="none" data-name="StudyDesignPageWidget"></path>
+						</g>
+						<g transform="translate(36176.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
+								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="26288.0" y="1651.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M26288.0 1682.0 L26640.0 1682.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M26288.0 1713.0 L26640.0 1713.0" fill="none" data-name="BoolQuestionFormView"></path>
-						</g>
-						<g transform="translate(26288, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
+						<g transform="translate(36176.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26288, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+					</g>
+					<g data-name="InterventionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
+							<rect x="29325.8" y="1666.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
+							<path d="M29325.8 1697.5 L29700.8 1697.5" fill="none" data-name="InterventionFormView"></path>
+						</g>
+						<g transform="translate(29325.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
+								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26288, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+						<g transform="translate(29325.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="26680.0" y="1651.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M26680.0 1682.0 L27032.0 1682.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M26680.0 1713.0 L27032.0 1713.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+					<g data-name="InterventionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
+							<rect x="57557.0" y="2391.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
+							<path d="M57557.0 2422.0 L58412.0 2422.0" fill="none" data-name="InterventionFormViewModel"></path>
+							<path d="M57557.0 2648.0 L58412.0 2648.0" fill="none" data-name="InterventionFormViewModel"></path>
 						</g>
-						<g transform="translate(26680, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
+						<g transform="translate(57557, 2391)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
+								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26680, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(57557, 2422)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26680, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
+						<g transform="translate(57557, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="27072.0" y="1651.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M27072.0 1682.0 L27424.0 1682.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M27072.0 1713.0 L27424.0 1713.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+					<g data-name="InterventionPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
+							<rect x="25925.8" y="1651.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
+							<path d="M25925.8 1682.0 L26255.8 1682.0" fill="none" data-name="InterventionPreview"></path>
+							<path d="M25925.8 1713.0 L26255.8 1713.0" fill="none" data-name="InterventionPreview"></path>
 						</g>
-						<g transform="translate(27072, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
+						<g transform="translate(25925.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27072, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(25925.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27072, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
+						<g transform="translate(25925.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="27464.0" y="1651.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M27464.0 1682.0 L27816.0 1682.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M27464.0 1713.0 L27816.0 1713.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+					<g data-name="StudyScheduleFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
+							<rect x="81195.5" y="1158.5" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
+							<path d="M81195.5 1189.5 L81554.5 1189.5" fill="none" data-name="StudyScheduleFormView"></path>
+							<path d="M81195.5 1220.5 L81554.5 1220.5" fill="none" data-name="StudyScheduleFormView"></path>
 						</g>
-						<g transform="translate(27464, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
+						<g transform="translate(81195.5, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
+								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27464, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(81195.5, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27464, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
+						<g transform="translate(81195.5, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="83574.8" y="1158.5" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M83574.8 1189.5 L84006.8 1189.5" fill="none" data-name="ScheduleControls"></path>
-							<path d="M83574.8 1220.5 L84006.8 1220.5" fill="none" data-name="ScheduleControls"></path>
-						</g>
-						<g transform="translate(83574.75, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
-								
-							</g>
+					<g data-name="StudyScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
+							<rect x="80996.0" y="1501.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
+							<path d="M80996.0 1532.0 L81754.0 1532.0" fill="none" data-name="StudyScheduleControls"></path>
+							<path d="M80996.0 1833.0 L81754.0 1833.0" fill="none" data-name="StudyScheduleControls"></path>
 						</g>
-						<g transform="translate(83574.75, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
+						<g transform="translate(80996, 1501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
+								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83574.75, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
+						<g transform="translate(80996, 1532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="58596.0" y="2609.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
-						</g>
-						<g transform="translate(58596, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
+						<g transform="translate(80996, 1833)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="72376.5" y="1516.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M72376.5 1547.0 L73072.5 1547.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M72376.5 1758.0 L73072.5 1758.0" fill="none" data-name="StudyFormViewModel"></path>
+					<g data-name="InterventionTaskFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
+							<rect x="55203.3" y="2541.0" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
+							<path d="M55203.3 2572.0 L55493.3 2572.0" fill="none" data-name="InterventionTaskFormData"></path>
+							<path d="M55203.3 2663.0 L55493.3 2663.0" fill="none" data-name="InterventionTaskFormData"></path>
 						</g>
-						<g transform="translate(72376.5, 1516)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
+						<g transform="translate(55203.25, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
+								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72376.5, 1547)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(55203.25, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72376.5, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
+						<g transform="translate(55203.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyAnalyzeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
-							<rect x="22662.3" y="2586.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
-							<path d="M22662.3 2617.5 L22842.3 2617.5" fill="none" data-name="StudyAnalyzeScreen"></path>
-						</g>
-						<g transform="translate(22662.25, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
-								
-							</g>
+					<g data-name="IFormDataWithSchedule">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
+							<rect x="55751.0" y="1613.5" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
+							<path d="M55751.0 1644.5 L56049.0 1644.5" fill="none" data-name="IFormDataWithSchedule"></path>
+							<path d="M55751.0 1750.5 L56049.0 1750.5" fill="none" data-name="IFormDataWithSchedule"></path>
 						</g>
-						<g transform="translate(22662.25, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
+						<g transform="translate(55751, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
+								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyAnalyzeController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
-							<rect x="60398.8" y="1181.5" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
-							<path d="M60398.8 1212.5 L60599.8 1212.5" fill="none" data-name="StudyAnalyzeController"></path>
-						</g>
-						<g transform="translate(60398.75, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
-								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
+						<g transform="translate(55751, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60398.75, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
+						<g transform="translate(55751, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyMonitorScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="22882.3" y="2594.0" height="62.0" width="176.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M22882.3 2625.0 L23058.3 2625.0" fill="none" data-name="StudyMonitorScreen"></path>
-						</g>
-						<g transform="translate(22882.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
-								
-							</g>
+					<g data-name="InterventionsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
+							<rect x="68261.0" y="2436.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
+							<path d="M68261.0 2467.0 L69100.0 2467.0" fill="none" data-name="InterventionsFormViewModel"></path>
+							<path d="M68261.0 2618.0 L69100.0 2618.0" fill="none" data-name="InterventionsFormViewModel"></path>
 						</g>
-						<g transform="translate(22882.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
+						<g transform="translate(68261, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
+								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudiesTableItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
-							<rect x="37812.0" y="2526.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
-							<path d="M37812.0 2557.5 L38212.0 2557.5" fill="none" data-name="StudiesTableItem"></path>
-						</g>
-						<g transform="translate(37812, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
-								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
+						<g transform="translate(68261, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37812, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
+						<g transform="translate(68261, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(Study, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
-							<rect x="37542.0" y="3485.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
+					<g data-name="InterventionTaskFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
+							<rect x="60716.3" y="2488.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
+							<path d="M60716.3 2519.5 L61412.3 2519.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<path d="M60716.3 2700.5 L61412.3 2700.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
 						</g>
-						<g transform="translate(37542, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
+						<g transform="translate(60716.25, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(Study)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
-							<rect x="38271.0" y="3485.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
-						</g>
-						<g transform="translate(38271, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
+						<g transform="translate(60716.25, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="DashboardController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
-							<rect x="67379.5" y="2436.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
-							<path d="M67379.5 2467.0 L67993.5 2467.0" fill="none" data-name="DashboardController"></path>
-							<path d="M67379.5 2588.0 L67993.5 2588.0" fill="none" data-name="DashboardController"></path>
-						</g>
-						<g transform="translate(67379.5, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
-								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
+						<g transform="translate(60716.25, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67379.5, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
+					</g>
+					<g data-name="WithScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
+							<rect x="82429.3" y="1546.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
+							<path d="M82429.3 1577.0 L82924.3 1577.0" fill="none" data-name="WithScheduleControls"></path>
+							<path d="M82429.3 1803.0 L82924.3 1803.0" fill="none" data-name="WithScheduleControls"></path>
+						</g>
+						<g transform="translate(82429.25, 1546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
+								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67379.5, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
+						<g transform="translate(82429.25, 1577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SearchController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="57510.5" y="3469.5" height="62.0" width="258.0" data-name="SearchController"></rect>
-							<path d="M57510.5 3500.5 L57768.5 3500.5" fill="none" data-name="SearchController"></path>
-						</g>
-						<g transform="translate(57510.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
+						<g transform="translate(82429.25, 1803)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57510.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SearchController">
-								<text x="0.0" y="13.5" stroke="none" data-name="SearchController">+setText: void Function(String)</text>
+					</g>
+					<g data-name="PhaseSequence">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
+							<rect x="66539.5" y="3828.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
+						</g>
+						<g transform="translate(66539.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
+								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumnSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
-							<rect x="73591.8" y="75.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
-							<path d="M73591.8 106.0 L73816.8 106.0" fill="none" data-name="StudiesTableColumnSize"></path>
-							<path d="M73591.8 167.0 L73816.8 167.0" fill="none" data-name="StudiesTableColumnSize"></path>
+					<g data-name="InterventionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
+							<rect x="44758.0" y="1598.5" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
+							<path d="M44758.0 1629.5 L45140.0 1629.5" fill="none" data-name="InterventionFormData"></path>
+							<path d="M44758.0 1750.5 L45140.0 1750.5" fill="none" data-name="InterventionFormData"></path>
 						</g>
-						<g transform="translate(73591.75, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
+						<g transform="translate(44758, 1598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
+								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73591.75, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
+						<g transform="translate(44758, 1629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73591.75, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
+						<g transform="translate(44758, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
-							<rect x="28210.3" y="1553.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
-							<path d="M28210.3 1584.5 L28690.3 1584.5" fill="none" data-name="StudiesTable"></path>
-							<path d="M28210.3 1795.5 L28690.3 1795.5" fill="none" data-name="StudiesTable"></path>
+					<g data-name="StudyScheduleFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
+							<rect x="45892.3" y="3401.5" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
+							<path d="M45892.3 3432.5 L46188.3 3432.5" fill="none" data-name="StudyScheduleFormData"></path>
+							<path d="M45892.3 3538.5 L46188.3 3538.5" fill="none" data-name="StudyScheduleFormData"></path>
 						</g>
-						<g transform="translate(28210.25, 1553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
-								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
+						<g transform="translate(45892.25, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28210.25, 1584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
+						<g transform="translate(45892.25, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28210.25, 1795.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
+						<g transform="translate(45892.25, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
-							<rect x="27604.5" y="2609.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
+					<g data-name="IStudyFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
+							<rect x="49374.5" y="1666.5" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
+							<path d="M49374.5 1697.5 L49517.5 1697.5" fill="none" data-name="IStudyFormData"></path>
 						</g>
-						<g transform="translate(27604.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
+						<g transform="translate(49374.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
+								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<rect x="28127.5" y="2609.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
-						</g>
-						<g transform="translate(28127.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
+						<g transform="translate(49374.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
-							<rect x="1644.0" y="3394.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
-							<path d="M1644.0 3425.5 L2005.0 3425.5" fill="none" data-name="StudiesTableColumn"></path>
+					<g data-name="InterventionTaskFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
+							<rect x="41046.3" y="1666.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
+							<path d="M41046.3 1697.5 L41459.3 1697.5" fill="none" data-name="InterventionTaskFormView"></path>
 						</g>
-						<g transform="translate(1644, 3394.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
-								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
+						<g transform="translate(41046.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1644, 3425.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
+						<g transform="translate(41046.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="38705.5" y="2594.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
-							<path d="M38705.5 2625.0 L38883.5 2625.0" fill="none" data-name="DashboardScreen"></path>
+					<g data-name="InterventionsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
+							<rect x="47496.0" y="2556.0" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
+							<path d="M47496.0 2587.0 L47890.0 2587.0" fill="none" data-name="InterventionsFormData"></path>
+							<path d="M47496.0 2648.0 L47890.0 2648.0" fill="none" data-name="InterventionsFormData"></path>
 						</g>
-						<g transform="translate(38705.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
+						<g transform="translate(47496, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
+								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38705.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
+						<g transform="translate(47496, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(47496, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesFilter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
-							<rect x="18930.8" y="3462.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
-							<path d="M18930.8 3493.0 L19226.8 3493.0" fill="none" data-name="StudiesFilter"></path>
+					<g data-name="StudyDesignReportsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
+							<rect x="34535.5" y="3462.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
+							<path d="M34535.5 3493.0 L34928.5 3493.0" fill="none" data-name="StudyDesignReportsFormView"></path>
 						</g>
-						<g transform="translate(18930.75, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
+						<g transform="translate(34535.5, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
+								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18930.75, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
+						<g transform="translate(34535.5, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
-							<rect x="38923.5" y="2571.0" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
-							<path d="M38923.5 2602.0 L39266.5 2602.0" fill="none" data-name="DashboardScaffold"></path>
-							<path d="M38923.5 2648.0 L39266.5 2648.0" fill="none" data-name="DashboardScaffold"></path>
+					<g data-name="ReportItemFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
+							<rect x="45180.0" y="1628.5" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
+							<path d="M45180.0 1659.5 L45494.0 1659.5" fill="none" data-name="ReportItemFormData"></path>
+							<path d="M45180.0 1720.5 L45494.0 1720.5" fill="none" data-name="ReportItemFormData"></path>
 						</g>
-						<g transform="translate(38923.5, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
-								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
+						<g transform="translate(45180, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
+								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38923.5, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
+						<g transform="translate(45180, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38923.5, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
+						<g transform="translate(45180, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumnHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
-							<rect x="47028.5" y="3782.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
-							<path d="M47028.5 3813.5 L47265.5 3813.5" fill="none" data-name="StudiesTableColumnHeader"></path>
+					<g data-name="ReportSection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
+							<rect x="45273.0" y="2609.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
 						</g>
-						<g transform="translate(47028.5, 3782.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
-								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
+						<g transform="translate(45273, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
+								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47028.5, 3813.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
+					</g>
+					<g data-name="DataReferenceEditor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
+							<rect x="45768.0" y="2556.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
+							<path d="M45768.0 2587.0 L46477.0 2587.0" fill="none" data-name="DataReferenceEditor"></path>
+							<path d="M45768.0 2648.0 L46477.0 2648.0" fill="none" data-name="DataReferenceEditor"></path>
+						</g>
+						<g transform="translate(45768, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
+								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AccountSettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
-							<rect x="27856.0" y="1666.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
-							<path d="M27856.0 1697.5 L28050.0 1697.5" fill="none" data-name="AccountSettingsDialog"></path>
-						</g>
-						<g transform="translate(27856, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
+						<g transform="translate(45768, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27856, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
+						<g transform="translate(45768, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInvitesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="72636.8" y="45.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M72636.8 76.0 L73202.8 76.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M72636.8 182.0 L73202.8 182.0" fill="none" data-name="StudyInvitesTable"></path>
+					<g data-name="ReactiveDropdownField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
+							<rect x="45038.5" y="3485.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
 						</g>
-						<g transform="translate(72636.75, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
-								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
+						<g transform="translate(45038.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
+								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72636.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
+					</g>
+					<g data-name="TemporalAggregationFormatted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
+							<rect x="46517.0" y="2518.5" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
+							<path d="M46517.0 2549.5 L46965.0 2549.5" fill="none" data-name="TemporalAggregationFormatted"></path>
+							<path d="M46517.0 2655.5 L46965.0 2655.5" fill="none" data-name="TemporalAggregationFormatted"></path>
+						</g>
+						<g transform="translate(46517, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
+								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72636.75, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
+						<g transform="translate(46517, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="72260.0" y="614.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(72260, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
+						<g transform="translate(46517, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="72522.0" y="614.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
+					<g data-name="TemporalAggregation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
+							<rect x="45281.5" y="3485.0" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
 						</g>
-						<g transform="translate(72522, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+						<g transform="translate(45281.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
+								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Intervention? Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="73024.8" y="614.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
+					<g data-name="ImprovementDirectionFormatted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
+							<rect x="47005.0" y="2518.5" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
+							<path d="M47005.0 2549.5 L47456.0 2549.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
+							<path d="M47005.0 2655.5 L47456.0 2655.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
 						</g>
-						<g transform="translate(73024.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
+						<g transform="translate(47005, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
+								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="int Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="73315.8" y="614.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
+						<g transform="translate(47005, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
+								
+							</g>
 						</g>
-						<g transform="translate(73315.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
+						<g transform="translate(47005, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRecruitController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="72644.3" y="1121.0" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M72644.3 1152.0 L73295.3 1152.0" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M72644.3 1198.0 L73295.3 1198.0" fill="none" data-name="StudyRecruitController"></path>
+					<g data-name="ImprovementDirection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
+							<rect x="46911.3" y="3485.0" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
 						</g>
-						<g transform="translate(72644.25, 1121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
-								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
+						<g transform="translate(46911.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
+								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72644.25, 1152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
+					</g>
+					<g data-name="ReportSectionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
+							<rect x="13698.5" y="3447.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
+							<path d="M13698.5 3478.0 L14081.5 3478.0" fill="none" data-name="ReportSectionType"></path>
+						</g>
+						<g transform="translate(13698.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
+								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72644.25, 1198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
+						<g transform="translate(13698.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="81099.8" y="1023.5" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M81099.8 1054.5 L81766.8 1054.5" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M81099.8 1280.5 L81766.8 1280.5" fill="none" data-name="InviteCodeFormViewModel"></path>
+					<g data-name="AverageSectionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
+							<rect x="26295.8" y="1636.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
+							<path d="M26295.8 1667.0 L26774.8 1667.0" fill="none" data-name="AverageSectionFormView"></path>
+							<path d="M26295.8 1728.0 L26774.8 1728.0" fill="none" data-name="AverageSectionFormView"></path>
 						</g>
-						<g transform="translate(81099.75, 1023.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
-								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
+						<g transform="translate(26295.75, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81099.75, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
+						<g transform="translate(26295.75, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81099.75, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
+						<g transform="translate(26295.75, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrolledBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="74029.8" y="90.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M74029.8 121.0 L74195.8 121.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M74029.8 152.0 L74195.8 152.0" fill="none" data-name="EnrolledBadge"></path>
+					<g data-name="ReportItemFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
+							<rect x="38452.5" y="2338.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
+							<path d="M38452.5 2369.5 L39439.5 2369.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<path d="M38452.5 2805.5 L39439.5 2805.5" fill="none" data-name="ReportItemFormViewModel"></path>
 						</g>
-						<g transform="translate(74029.75, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
+						<g transform="translate(38452.5, 2338.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
+								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74029.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
+						<g transform="translate(38452.5, 2369.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74029.75, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
+						<g transform="translate(38452.5, 2805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
-							<rect x="83830.8" y="575.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
-							<path d="M83830.8 606.5 L84268.8 606.5" fill="none" data-name="InviteCodeFormView"></path>
-							<path d="M83830.8 637.5 L84268.8 637.5" fill="none" data-name="InviteCodeFormView"></path>
+					<g data-name="DataReferenceIdentifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
+							<rect x="79224.3" y="583.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
+							<path d="M79224.3 614.0 L79428.3 614.0" fill="none" data-name="DataReferenceIdentifier"></path>
+							<path d="M79224.3 645.0 L79428.3 645.0" fill="none" data-name="DataReferenceIdentifier"></path>
 						</g>
-						<g transform="translate(83830.75, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
-								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
+						<g transform="translate(79224.25, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
+								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83830.75, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
+						<g transform="translate(79224.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83830.75, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
+						<g transform="translate(79224.25, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRecruitScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="23098.3" y="2571.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M23098.3 2602.5 L23412.3 2602.5" fill="none" data-name="StudyRecruitScreen"></path>
-						</g>
-						<g transform="translate(23098.25, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
-								
-							</g>
+					<g data-name="DataReference">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
+							<rect x="79258.8" y="121.0" height="31.0" width="135.0" data-name="DataReference"></rect>
 						</g>
-						<g transform="translate(23098.25, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
+						<g transform="translate(79258.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
+								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
-							<rect x="65754.0" y="1113.5" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
-							<path d="M65754.0 1144.5 L66199.0 1144.5" fill="none" data-name="DrawerEntry"></path>
-							<path d="M65754.0 1280.5 L66199.0 1280.5" fill="none" data-name="DrawerEntry"></path>
+					<g data-name="LinearRegressionSectionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
+							<rect x="26814.8" y="1636.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
+							<path d="M26814.8 1667.0 L27293.8 1667.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<path d="M26814.8 1728.0 L27293.8 1728.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
 						</g>
-						<g transform="translate(65754, 1113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
-								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
+						<g transform="translate(26814.75, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65754, 1144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DrawerEntry">+localizedHelpText: String Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DrawerEntry">+enabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DrawerEntry">+onSelected: void Function(BuildContext, WidgetRef)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DrawerEntry">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DrawerEntry">+title: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DrawerEntry">+helpText: String?</text>
+						<g transform="translate(26814.75, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65754, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
+						<g transform="translate(26814.75, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="String Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
-							<rect x="64512.5" y="1682.0" height="31.0" width="147.0" data-name="String Function()"></rect>
+					<g data-name="ReportItemFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
+							<rect x="41809.3" y="1613.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
+							<path d="M41809.3 1644.5 L42276.3 1644.5" fill="none" data-name="ReportItemFormView"></path>
+							<path d="M41809.3 1720.5 L42276.3 1720.5" fill="none" data-name="ReportItemFormView"></path>
 						</g>
-						<g transform="translate(64512.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
-								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
+						<g transform="translate(41809.25, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
+								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="String Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
-							<rect x="65676.5" y="1682.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
-						</g>
-						<g transform="translate(65676.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
+						<g transform="translate(41809.25, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(BuildContext, WidgetRef)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
-							<rect x="65873.5" y="1682.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
-						</g>
-						<g transform="translate(65873.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
-								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
+						<g transform="translate(41809.25, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="GoRouterDrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
-							<rect x="66249.5" y="1643.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
-							<path d="M66249.5 1674.5 L66513.5 1674.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-							<path d="M66249.5 1720.5 L66513.5 1720.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+					<g data-name="ReportsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
+							<rect x="64778.3" y="2451.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
+							<path d="M64778.3 2482.0 L65638.3 2482.0" fill="none" data-name="ReportsFormViewModel"></path>
+							<path d="M64778.3 2648.0 L65638.3 2648.0" fill="none" data-name="ReportsFormViewModel"></path>
 						</g>
-						<g transform="translate(66249.5, 1643.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
+						<g transform="translate(64778.25, 2451)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
+								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(66249.5, 1674.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
+						<g transform="translate(64778.25, 2482)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(66249.5, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
+						<g transform="translate(64778.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppDrawer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
-							<rect x="74235.8" y="53.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
-							<path d="M74235.8 84.0 L74504.8 84.0" fill="none" data-name="AppDrawer"></path>
+					<g data-name="ReportFormItemDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
+							<rect x="65810.0" y="1591.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
+							<path d="M65810.0 1622.0 L66653.0 1622.0" fill="none" data-name="ReportFormItemDelegate"></path>
+							<path d="M65810.0 1698.0 L66653.0 1698.0" fill="none" data-name="ReportFormItemDelegate"></path>
 						</g>
-						<g transform="translate(74235.75, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
-								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
+						<g transform="translate(65810, 1591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
+								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74235.75, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppDrawer">+leftPaddingEntries: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppDrawer">+logoPaddingVertical: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppDrawer">+logoPaddingHorizontal: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AppDrawer">+logoMaxHeight: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AppDrawer">+logoSectionMinHeight: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AppDrawer">+logoSectionMaxHeight: double</text>
+						<g transform="translate(65810, 1622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
+								
+							</g>
+						</g>
+						<g transform="translate(65810, 1698)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationDispatcher">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDispatcher">
-							<rect x="39535.5" y="2564.0" height="122.0" width="325.0" data-name="NotificationDispatcher"></rect>
-							<path d="M39535.5 2595.0 L39860.5 2595.0" fill="none" data-name="NotificationDispatcher"></path>
+					<g data-name="ReportBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
+							<rect x="48983.0" y="2556.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
+							<path d="M48983.0 2587.0 L49180.0 2587.0" fill="none" data-name="ReportBadge"></path>
+							<path d="M48983.0 2663.0 L49180.0 2663.0" fill="none" data-name="ReportBadge"></path>
 						</g>
-						<g transform="translate(39535.5, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDispatcher">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDispatcher">
-								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDispatcher">NotificationDispatcher</text>
+						<g transform="translate(48983, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39535.5, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDispatcher">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDispatcher">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDispatcher">+child: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationDispatcher">+snackbarInnerPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationDispatcher">+snackbarWidth: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationDispatcher">+snackbarBehavior: SnackBarBehavior</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationDispatcher">+snackbarDefaultDuration: int</text>
+						<g transform="translate(48983, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SnackBarBehavior">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SnackBarBehavior">
-							<rect x="39387.3" y="3485.0" height="31.0" width="162.0" data-name="SnackBarBehavior"></rect>
-						</g>
-						<g transform="translate(39387.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackBarBehavior">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackBarBehavior">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackBarBehavior">SnackBarBehavior</text>
+						<g transform="translate(48983, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Notifications">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Notifications">
-							<rect x="39900.5" y="2541.5" height="167.0" width="407.0" data-name="Notifications"></rect>
-							<path d="M39900.5 2572.5 L40307.5 2572.5" fill="none" data-name="Notifications"></path>
+					<g data-name="ReportStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
+							<rect x="20608.5" y="3447.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
+							<path d="M20608.5 3478.0 L20909.5 3478.0" fill="none" data-name="ReportStatus"></path>
 						</g>
-						<g transform="translate(39900.5, 2541.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Notifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notifications">
-								<text x="195.5" y="13.5" stroke="none" text-anchor="middle" data-name="Notifications">Notifications</text>
+						<g transform="translate(20608.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
+								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39900.5, 2572.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Notifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Notifications">
-								<text x="0.0" y="13.5" stroke="none" data-name="Notifications">&lt;static&gt;+credentialsInvalid: SnackbarIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Notifications">&lt;static&gt;+userAlreadyRegistered: SnackbarIntent</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordReset: SnackbarIntent</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordResetSuccess: SnackbarIntent</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleted: SnackbarIntent</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeDeleted: SnackbarIntent</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeClipped: SnackbarIntent</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleteConfirmation: AlertIntent</text>
+						<g transform="translate(20608.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SnackbarIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SnackbarIntent">
-							<rect x="39716.3" y="3469.5" height="62.0" width="136.0" data-name="SnackbarIntent"></rect>
-							<path d="M39716.3 3500.5 L39852.3 3500.5" fill="none" data-name="SnackbarIntent"></path>
+					<g data-name="ReportsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
+							<rect x="49220.0" y="2563.5" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
+							<path d="M49220.0 2594.5 L49558.0 2594.5" fill="none" data-name="ReportsFormData"></path>
+							<path d="M49220.0 2640.5 L49558.0 2640.5" fill="none" data-name="ReportsFormData"></path>
 						</g>
-						<g transform="translate(39716.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackbarIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackbarIntent">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackbarIntent">SnackbarIntent</text>
+						<g transform="translate(49220, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
+								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39716.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SnackbarIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SnackbarIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="SnackbarIntent">+duration: int?</text>
+						<g transform="translate(49220, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AlertIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AlertIntent">
-							<rect x="40215.8" y="3454.5" height="92.0" width="204.0" data-name="AlertIntent"></rect>
-							<path d="M40215.8 3485.5 L40419.8 3485.5" fill="none" data-name="AlertIntent"></path>
-						</g>
-						<g transform="translate(40215.75, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AlertIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AlertIntent">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="AlertIntent">AlertIntent</text>
+						<g transform="translate(49220, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40215.75, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AlertIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AlertIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="AlertIntent">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AlertIntent">+dismissOnAction: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AlertIntent">+isDestructive: dynamic</text>
+					</g>
+					<g data-name="StudyInfoFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
+							<rect x="71210.8" y="2383.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
+							<path d="M71210.8 2414.5 L71906.8 2414.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+							<path d="M71210.8 2820.5 L71906.8 2820.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+						</g>
+						<g transform="translate(71210.75, 2383.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="NotificationDefaultActions">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDefaultActions">
-							<rect x="42617.5" y="3469.5" height="62.0" width="287.0" data-name="NotificationDefaultActions"></rect>
-							<path d="M42617.5 3500.5 L42904.5 3500.5" fill="none" data-name="NotificationDefaultActions"></path>
-						</g>
-						<g transform="translate(42617.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDefaultActions">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDefaultActions">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDefaultActions">NotificationDefaultActions</text>
+						<g transform="translate(71210.75, 2414.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42617.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDefaultActions">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDefaultActions">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDefaultActions">&lt;static&gt;+cancel: NotificationAction</text>
+						<g transform="translate(71210.75, 2820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationAction">
-							<rect x="42633.0" y="3797.5" height="92.0" width="256.0" data-name="NotificationAction"></rect>
-							<path d="M42633.0 3828.5 L42889.0 3828.5" fill="none" data-name="NotificationAction"></path>
+					<g data-name="StudyDesignInfoFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
+							<rect x="34968.5" y="3469.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
+							<path d="M34968.5 3500.5 L35191.5 3500.5" fill="none" data-name="StudyDesignInfoFormView"></path>
 						</g>
-						<g transform="translate(42633, 3797.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationAction">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationAction">NotificationAction</text>
+						<g transform="translate(34968.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
+								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42633, 3828.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationAction">+label: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationAction">+onSelect: dynamic Function()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationAction">+isDestructive: bool</text>
+						<g transform="translate(34968.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationIntent">
-							<rect x="40547.8" y="2548.5" height="153.0" width="288.0" data-name="NotificationIntent"></rect>
-							<path d="M40547.8 2579.5 L40835.8 2579.5" fill="none" data-name="NotificationIntent"></path>
-							<path d="M40547.8 2670.5 L40835.8 2670.5" fill="none" data-name="NotificationIntent"></path>
+					<g data-name="StudyInfoFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
+							<rect x="49598.0" y="2541.0" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
+							<path d="M49598.0 2572.0 L50012.0 2572.0" fill="none" data-name="StudyInfoFormData"></path>
+							<path d="M49598.0 2663.0 L50012.0 2663.0" fill="none" data-name="StudyInfoFormData"></path>
 						</g>
-						<g transform="translate(40547.75, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationIntent">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationIntent">NotificationIntent</text>
+						<g transform="translate(49598, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
+								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40547.75, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+message: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationIntent">+customContent: Widget?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationIntent">+icon: IconData?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationIntent">+actions: List&lt;NotificationAction&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationIntent">+type: NotificationType</text>
+						<g transform="translate(49598, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40547.75, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+void register()</text>
+						<g transform="translate(49598, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationType">
-							<rect x="20301.8" y="3439.5" height="122.0" width="325.0" data-name="NotificationType"></rect>
-							<path d="M20301.8 3470.5 L20626.8 3470.5" fill="none" data-name="NotificationType"></path>
-						</g>
-						<g transform="translate(20301.75, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationType">
-								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationType">NotificationType</text>
-								
-							</g>
+					<g data-name="StudyContactInfoFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
+							<rect x="49754.5" y="3386.5" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
+							<path d="M49754.5 3417.5 L50102.5 3417.5" fill="none" data-name="StudyContactInfoFormData"></path>
+							<path d="M49754.5 3568.5 L50102.5 3568.5" fill="none" data-name="StudyContactInfoFormData"></path>
 						</g>
-						<g transform="translate(20301.75, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationType">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationType">&lt;static&gt;+values: List&lt;NotificationType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationType">&lt;static&gt;+snackbar: NotificationType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationType">&lt;static&gt;+alert: NotificationType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationType">&lt;static&gt;+custom: NotificationType</text>
+						<g transform="translate(49754.5, 3386.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
+								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IClipboardService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IClipboardService">
-							<rect x="74544.8" y="105.5" height="62.0" width="156.0" data-name="IClipboardService"></rect>
-							<path d="M74544.8 136.5 L74700.8 136.5" fill="none" data-name="IClipboardService"></path>
-						</g>
-						<g transform="translate(74544.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IClipboardService">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="IClipboardService">IClipboardService</text>
+						<g transform="translate(49754.5, 3417.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74544.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IClipboardService">
-								<text x="0.0" y="13.5" stroke="none" data-name="IClipboardService">+dynamic copy()</text>
+						<g transform="translate(49754.5, 3568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ClipboardService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ClipboardService">
-							<rect x="74547.3" y="598.5" height="62.0" width="151.0" data-name="ClipboardService"></rect>
-							<path d="M74547.3 629.5 L74698.3 629.5" fill="none" data-name="ClipboardService"></path>
+					<g data-name="StudyFormValidationSet">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
+							<rect x="2051.0" y="3462.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
+							<path d="M2051.0 3493.0 L2438.0 3493.0" fill="none" data-name="StudyFormValidationSet"></path>
 						</g>
-						<g transform="translate(74547.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ClipboardService">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="ClipboardService">ClipboardService</text>
+						<g transform="translate(2051, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
+								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74547.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ClipboardService">
-								<text x="0.0" y="13.5" stroke="none" data-name="ClipboardService">+dynamic copy()</text>
+						<g transform="translate(2051, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationService">
-							<rect x="40690.8" y="3774.5" height="138.0" width="455.0" data-name="NotificationService"></rect>
-							<path d="M40690.8 3805.5 L41145.8 3805.5" fill="none" data-name="NotificationService"></path>
-							<path d="M40690.8 3836.5 L41145.8 3836.5" fill="none" data-name="NotificationService"></path>
+					<g data-name="MeasurementsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
+							<rect x="50092.0" y="2563.5" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
+							<path d="M50092.0 2594.5 L50586.0 2594.5" fill="none" data-name="MeasurementsFormData"></path>
+							<path d="M50092.0 2640.5 L50586.0 2640.5" fill="none" data-name="MeasurementsFormData"></path>
 						</g>
-						<g transform="translate(40690.75, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationService">
-								<text x="219.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationService">NotificationService</text>
+						<g transform="translate(50092, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
+								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40690.75, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">-_streamController: BehaviorSubject&lt;NotificationIntent&gt;</text>
+						<g transform="translate(50092, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40690.75, 3836.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationService">+void showMessage()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationService">+void show()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationService">+void dispose()</text>
+						<g transform="translate(50092, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Assets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Assets">
-							<rect x="74740.8" y="105.5" height="62.0" width="218.0" data-name="Assets"></rect>
-							<path d="M74740.8 136.5 L74958.8 136.5" fill="none" data-name="Assets"></path>
+					<g data-name="MeasurementSurveyFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
+							<rect x="42356.3" y="1666.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
+							<path d="M42356.3 1697.5 L42800.3 1697.5" fill="none" data-name="MeasurementSurveyFormView"></path>
 						</g>
-						<g transform="translate(74740.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Assets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Assets">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="Assets">Assets</text>
+						<g transform="translate(42356.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
+								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74740.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Assets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Assets">
-								<text x="0.0" y="13.5" stroke="none" data-name="Assets">&lt;static&gt;+logoWide: String</text>
+						<g transform="translate(42356.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Hyperlink">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Hyperlink">
-							<rect x="41281.5" y="2519.0" height="212.0" width="222.0" data-name="Hyperlink"></rect>
-							<path d="M41281.5 2550.0 L41503.5 2550.0" fill="none" data-name="Hyperlink"></path>
+					<g data-name="MeasurementSurveyFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
+							<rect x="62772.3" y="2413.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
+							<path d="M62772.3 2444.5 L63468.3 2444.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+							<path d="M62772.3 2670.5 L63468.3 2670.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
 						</g>
-						<g transform="translate(41281.5, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Hyperlink">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Hyperlink">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="Hyperlink">Hyperlink</text>
+						<g transform="translate(62772.25, 2413.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41281.5, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Hyperlink">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Hyperlink">
-								<text x="0.0" y="13.5" stroke="none" data-name="Hyperlink">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Hyperlink">+url: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Hyperlink">+onClick: void Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Hyperlink">+linkColor: Color</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Hyperlink">+hoverColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Hyperlink">+visitedColor: Color?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Hyperlink">+style: TextStyle?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Hyperlink">+hoverStyle: TextStyle?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Hyperlink">+visitedStyle: TextStyle?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Hyperlink">+icon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Hyperlink">+iconSize: double?</text>
+						<g transform="translate(62772.25, 2444.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="TextStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
-							<rect x="48536.0" y="3485.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
-						</g>
-						<g transform="translate(48536, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
-								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
+						<g transform="translate(62772.25, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StandardTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableColumn">
-							<rect x="37171.5" y="2556.5" height="137.0" width="287.0" data-name="StandardTableColumn"></rect>
-							<path d="M37171.5 2587.5 L37458.5 2587.5" fill="none" data-name="StandardTableColumn"></path>
+					<g data-name="SurveyPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
+							<rect x="27333.8" y="1651.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
+							<path d="M27333.8 1682.0 L27677.8 1682.0" fill="none" data-name="SurveyPreview"></path>
+							<path d="M27333.8 1713.0 L27677.8 1713.0" fill="none" data-name="SurveyPreview"></path>
 						</g>
-						<g transform="translate(37171.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableColumn">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableColumn">StandardTableColumn</text>
+						<g transform="translate(27333.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37171.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableColumn">+label: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableColumn">+tooltip: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableColumn">+columnWidth: TableColumnWidth</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableColumn">+sortable: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardTableColumn">+sortAscending: bool?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardTableColumn">+sortableIcon: Widget?</text>
+						<g transform="translate(27333.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="TableColumnWidth">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TableColumnWidth">
-							<rect x="36779.3" y="3485.0" height="31.0" width="165.0" data-name="TableColumnWidth"></rect>
-						</g>
-						<g transform="translate(36779.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TableColumnWidth">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableColumnWidth">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableColumnWidth">TableColumnWidth</text>
+						<g transform="translate(27333.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StandardTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTable">
-							<rect x="37373.8" y="1501.5" height="392.0" width="688.0" data-name="StandardTable"></rect>
-							<path d="M37373.8 1532.5 L38061.8 1532.5" fill="none" data-name="StandardTable"></path>
+					<g data-name="MeasurementSurveyFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
+							<rect x="55533.3" y="2526.0" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
+							<path d="M55533.3 2557.0 L55942.3 2557.0" fill="none" data-name="MeasurementSurveyFormData"></path>
+							<path d="M55533.3 2678.0 L55942.3 2678.0" fill="none" data-name="MeasurementSurveyFormData"></path>
 						</g>
-						<g transform="translate(37373.75, 1501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTable">
-								<text x="336.0" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTable">StandardTable</text>
+						<g transform="translate(55533.25, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
+								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37373.75, 1532.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTable">+inputColumns: List&lt;StandardTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTable">+trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardTable">+trailingActionsMenuType: ActionMenuType?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardTable">+sortColumnPredicates: List&lt;int Function(T, T)?&gt;?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StandardTable">+pinnedPredicates: int Function(T, T)?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StandardTable">+headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StandardTable">+dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StandardTable">+inputTrailingActionsColumn: StandardTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StandardTable">+tableWrapper: Widget Function(Widget)?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StandardTable">+cellSpacing: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StandardTable">+rowSpacing: double</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StandardTable">+minRowHeight: double?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StandardTable">+showTableHeader: bool</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StandardTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StandardTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StandardTable">+trailingWidget: Widget?</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StandardTable">+leadingWidgetSpacing: double?</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StandardTable">+trailingWidgetSpacing: double?</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StandardTable">+emptyWidget: Widget?</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StandardTable">+rowStyle: StandardTableStyle</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StandardTable">+disableRowInteractions: bool</text>
+						<g transform="translate(55533.25, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-							<rect x="34894.5" y="2609.5" height="31.0" width="381.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?"></rect>
-						</g>
-						<g transform="translate(34894.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
+						<g transform="translate(55533.25, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ActionMenuType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuType">
-							<rect x="18099.8" y="3447.0" height="107.0" width="330.0" data-name="ActionMenuType"></rect>
-							<path d="M18099.8 3478.0 L18429.8 3478.0" fill="none" data-name="ActionMenuType"></path>
-						</g>
-						<g transform="translate(18099.75, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuType">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuType">ActionMenuType</text>
-								
-							</g>
+					<g data-name="QuestionnaireFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
+							<rect x="52519.0" y="3431.5" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
+							<path d="M52519.0 3462.5 L52887.0 3462.5" fill="none" data-name="QuestionnaireFormData"></path>
+							<path d="M52519.0 3508.5 L52887.0 3508.5" fill="none" data-name="QuestionnaireFormData"></path>
 						</g>
-						<g transform="translate(18099.75, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+values: List&lt;ActionMenuType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+inline: ActionMenuType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+popup: ActionMenuType</text>
+						<g transform="translate(52519, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
+								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="int Function(T, T)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(T, T)?">
-							<rect x="36408.5" y="2609.5" height="31.0" width="160.0" data-name="int Function(T, T)?"></rect>
-						</g>
-						<g transform="translate(36408.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(T, T)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(T, T)?">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(T, T)?">int Function(T, T)?</text>
+						<g transform="translate(52519, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<rect x="36608.5" y="2609.5" height="31.0" width="523.0" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?"></rect>
-						</g>
-						<g transform="translate(36608.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-								<text x="253.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
+						<g transform="translate(52519, 3508.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(Widget)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Widget)?">
-							<rect x="40459.8" y="3485.0" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
+					<g data-name="WithQuestionnaireControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
+							<rect x="63074.3" y="1568.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
+							<path d="M63074.3 1599.5 L63706.3 1599.5" fill="none" data-name="WithQuestionnaireControls"></path>
+							<path d="M63074.3 1705.5 L63706.3 1705.5" fill="none" data-name="WithQuestionnaireControls"></path>
 						</g>
-						<g transform="translate(40459.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Widget)?">
-								<text x="102.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Widget)?">Widget Function(Widget)?</text>
+						<g transform="translate(63074.25, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
+								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StandardTableStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableStyle">
-							<rect x="19266.8" y="3447.0" height="107.0" width="353.0" data-name="StandardTableStyle"></rect>
-							<path d="M19266.8 3478.0 L19619.8 3478.0" fill="none" data-name="StandardTableStyle"></path>
-						</g>
-						<g transform="translate(19266.75, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableStyle">
-								<text x="168.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableStyle">StandardTableStyle</text>
+						<g transform="translate(63074.25, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19266.75, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableStyle">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableStyle">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+values: List&lt;StandardTableStyle&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+plain: StandardTableStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+material: StandardTableStyle</text>
+						<g transform="translate(63074.25, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="HelpIcon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HelpIcon">
-							<rect x="74998.8" y="90.0" height="93.0" width="174.0" data-name="HelpIcon"></rect>
-							<path d="M74998.8 121.0 L75172.8 121.0" fill="none" data-name="HelpIcon"></path>
-							<path d="M74998.8 152.0 L75172.8 152.0" fill="none" data-name="HelpIcon"></path>
-						</g>
-						<g transform="translate(74998.75, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HelpIcon">
-								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="HelpIcon">HelpIcon</text>
-								
-							</g>
+					<g data-name="StudyDesignMeasurementsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
+							<rect x="35231.5" y="3469.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
+							<path d="M35231.5 3500.5 L35541.5 3500.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
 						</g>
-						<g transform="translate(74998.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
-								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+tooltipText: String?</text>
+						<g transform="translate(35231.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
+								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74998.75, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
-								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+Widget build()</text>
+						<g transform="translate(35231.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ErrorPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ErrorPage">
-							<rect x="29140.0" y="1651.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
-							<path d="M29140.0 1682.0 L29302.0 1682.0" fill="none" data-name="ErrorPage"></path>
-							<path d="M29140.0 1713.0 L29302.0 1713.0" fill="none" data-name="ErrorPage"></path>
+					<g data-name="MeasurementsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
+							<rect x="66914.8" y="2443.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
+							<path d="M66914.8 2474.5 L68006.8 2474.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+							<path d="M66914.8 2625.5 L68006.8 2625.5" fill="none" data-name="MeasurementsFormViewModel"></path>
 						</g>
-						<g transform="translate(29140, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ErrorPage">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="ErrorPage">ErrorPage</text>
+						<g transform="translate(66914.75, 2443.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
+								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29140, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+error: Exception?</text>
+						<g transform="translate(66914.75, 2474.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29140, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+Widget build()</text>
+						<g transform="translate(66914.75, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SplashPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SplashPage">
-							<rect x="75212.8" y="105.5" height="62.0" width="136.0" data-name="SplashPage"></rect>
-							<path d="M75212.8 136.5 L75348.8 136.5" fill="none" data-name="SplashPage"></path>
+					<g data-name="StudyFormScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
+							<rect x="27488.8" y="2563.5" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
+							<path d="M27488.8 2594.5 L27876.8 2594.5" fill="none" data-name="StudyFormScaffold"></path>
+							<path d="M27488.8 2655.5 L27876.8 2655.5" fill="none" data-name="StudyFormScaffold"></path>
 						</g>
-						<g transform="translate(75212.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SplashPage">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SplashPage">SplashPage</text>
+						<g transform="translate(27488.75, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
+								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75212.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SplashPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SplashPage">+Widget build()</text>
+						<g transform="translate(27488.75, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IconPack">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPack">
-							<rect x="75388.8" y="82.5" height="108.0" width="359.0" data-name="IconPack"></rect>
-							<path d="M75388.8 113.5 L75747.8 113.5" fill="none" data-name="IconPack"></path>
-							<path d="M75388.8 159.5 L75747.8 159.5" fill="none" data-name="IconPack"></path>
-						</g>
-						<g transform="translate(75388.75, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPack">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPack">IconPack</text>
+						<g transform="translate(27488.75, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75388.75, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+defaultPack: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPack">&lt;static&gt;+material: List&lt;IconOption&gt;</text>
-								
-							</g>
+					</g>
+					<g data-name="T Function(WidgetRef)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
+							<rect x="27548.3" y="3485.0" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
 						</g>
-						<g transform="translate(75388.75, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+IconOption? resolveIconByName()</text>
+						<g transform="translate(27548.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconOption">
-							<rect x="27823.5" y="2548.5" height="153.0" width="264.0" data-name="IconOption"></rect>
-							<path d="M27823.5 2579.5 L28087.5 2579.5" fill="none" data-name="IconOption"></path>
-							<path d="M27823.5 2655.5 L28087.5 2655.5" fill="none" data-name="IconOption"></path>
+					<g data-name="ConsentItemFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
+							<rect x="53187.3" y="2496.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
+							<path d="M53187.3 2527.0 L53883.3 2527.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+							<path d="M53187.3 2693.0 L53883.3 2693.0" fill="none" data-name="ConsentItemFormViewModel"></path>
 						</g>
-						<g transform="translate(27823.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconOption">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="IconOption">IconOption</text>
+						<g transform="translate(53187.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27823.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconOption">+isEmpty: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconOption">+props: List&lt;Object?&gt;</text>
+						<g transform="translate(53187.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27823.5, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+String toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">&lt;static&gt;+IconOption fromJson()</text>
+						<g transform="translate(53187.25, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReactiveIconPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveIconPicker">
-							<rect x="75826.3" y="614.0" height="31.0" width="168.0" data-name="ReactiveIconPicker"></rect>
+					<g data-name="StudyDesignEnrollmentFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
+							<rect x="35581.5" y="3454.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
+							<path d="M35581.5 3485.5 L36030.5 3485.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
 						</g>
-						<g transform="translate(75826.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveIconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveIconPicker">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveIconPicker">ReactiveIconPicker</text>
+						<g transform="translate(35581.5, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
+								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReactiveFocusableFormField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFocusableFormField">
-							<rect x="75787.8" y="121.0" height="31.0" width="245.0" data-name="ReactiveFocusableFormField"></rect>
-						</g>
-						<g transform="translate(75787.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFocusableFormField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFocusableFormField">
-								<text x="114.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFocusableFormField">ReactiveFocusableFormField</text>
+						<g transform="translate(35581.5, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPicker">
-							<rect x="42726.3" y="1606.0" height="183.0" width="319.0" data-name="IconPicker"></rect>
-							<path d="M42726.3 1637.0 L43045.3 1637.0" fill="none" data-name="IconPicker"></path>
-							<path d="M42726.3 1758.0 L43045.3 1758.0" fill="none" data-name="IconPicker"></path>
-						</g>
-						<g transform="translate(42726.25, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPicker">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPicker">IconPicker</text>
-								
-							</g>
+					<g data-name="IScreenerQuestionLogicFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
+							<rect x="52303.3" y="2594.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
+							<path d="M52303.3 2625.0 L52635.3 2625.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
 						</g>
-						<g transform="translate(42726.25, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPicker">+selectedOption: IconOption?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPicker">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconPicker">+galleryIconSize: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IconPicker">+selectedIconSize: double?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IconPicker">+focusNode: FocusNode?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IconPicker">+isDisabled: bool</text>
+						<g transform="translate(52303.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
+								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42726.25, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+Widget build()</text>
+						<g transform="translate(52303.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(IconOption)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(IconOption)?">
-							<rect x="42874.8" y="2609.5" height="31.0" width="230.0" data-name="void Function(IconOption)?"></rect>
+					<g data-name="ScreenerQuestionLogicFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
+							<rect x="81582.0" y="2556.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
+							<path d="M81582.0 2587.0 L82006.0 2587.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+							<path d="M81582.0 2618.0 L82006.0 2618.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
 						</g>
-						<g transform="translate(42874.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(IconOption)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(IconOption)?">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(IconOption)?">void Function(IconOption)?</text>
+						<g transform="translate(81582, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
+								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FocusNode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FocusNode">
-							<rect x="42728.8" y="2609.5" height="31.0" width="106.0" data-name="FocusNode"></rect>
+						<g transform="translate(81582, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
+								
+							</g>
 						</g>
-						<g transform="translate(42728.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FocusNode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FocusNode">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="FocusNode">FocusNode</text>
+						<g transform="translate(81582, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconPickerField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerField">
-							<rect x="43085.3" y="1606.0" height="183.0" width="319.0" data-name="IconPickerField"></rect>
-							<path d="M43085.3 1637.0 L43404.3 1637.0" fill="none" data-name="IconPickerField"></path>
-							<path d="M43085.3 1758.0 L43404.3 1758.0" fill="none" data-name="IconPickerField"></path>
+					<g data-name="ScreenerQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
+							<rect x="60618.3" y="3334.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
+							<path d="M60618.3 3365.0 L61180.3 3365.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+							<path d="M60618.3 3546.0 L61180.3 3546.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(43085.25, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerField">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerField">IconPickerField</text>
+						<g transform="translate(60618.25, 3334)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
+								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43085.25, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerField">+selectedOption: IconOption?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerField">+selectedIconSize: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconPickerField">+galleryIconSize: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IconPickerField">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IconPickerField">+focusNode: FocusNode?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IconPickerField">+isDisabled: bool</text>
+						<g transform="translate(60618.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43085.25, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+Widget build()</text>
+						<g transform="translate(60618.25, 3546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconPickerGallery">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerGallery">
-							<rect x="43444.3" y="1636.0" height="123.0" width="319.0" data-name="IconPickerGallery"></rect>
-							<path d="M43444.3 1667.0 L43763.3 1667.0" fill="none" data-name="IconPickerGallery"></path>
-							<path d="M43444.3 1728.0 L43763.3 1728.0" fill="none" data-name="IconPickerGallery"></path>
+					<g data-name="ConsentItemFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
+							<rect x="50893.3" y="1613.5" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
+							<path d="M50893.3 1644.5 L51151.3 1644.5" fill="none" data-name="ConsentItemFormData"></path>
+							<path d="M50893.3 1735.5 L51151.3 1735.5" fill="none" data-name="ConsentItemFormData"></path>
 						</g>
-						<g transform="translate(43444.25, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerGallery">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerGallery">IconPickerGallery</text>
+						<g transform="translate(50893.25, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
+								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43444.25, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerGallery">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerGallery">+iconSize: double</text>
+						<g transform="translate(50893.25, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43444.25, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+Widget build()</text>
+						<g transform="translate(50893.25, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormSideSheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSideSheetTab">
-							<rect x="11466.0" y="2594.0" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
-							<path d="M11466.0 2625.0 L11779.0 2625.0" fill="none" data-name="FormSideSheetTab"></path>
+					<g data-name="ConsentItemFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
+							<rect x="44337.0" y="1666.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
+							<path d="M44337.0 1697.5 L44718.0 1697.5" fill="none" data-name="ConsentItemFormView"></path>
 						</g>
-						<g transform="translate(11466, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSideSheetTab">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormSideSheetTab">FormSideSheetTab</text>
+						<g transform="translate(44337, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
+								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11466, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSideSheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSideSheetTab">+formViewBuilder: Widget Function(T)</text>
+						<g transform="translate(44337, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SidesheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SidesheetTab">
-							<rect x="13038.0" y="2594.0" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
-							<path d="M13038.0 2625.0 L13368.0 2625.0" fill="none" data-name="SidesheetTab"></path>
-						</g>
-						<g transform="translate(13038, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SidesheetTab">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="SidesheetTab">SidesheetTab</text>
-								
-							</g>
+					<g data-name="EnrollmentFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
+							<rect x="50626.0" y="2541.0" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
+							<path d="M50626.0 2572.0 L51080.0 2572.0" fill="none" data-name="EnrollmentFormData"></path>
+							<path d="M50626.0 2663.0 L51080.0 2663.0" fill="none" data-name="EnrollmentFormData"></path>
 						</g>
-						<g transform="translate(13038, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SidesheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="SidesheetTab">+builder: Widget Function(BuildContext)</text>
+						<g transform="translate(50626, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
+								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Sidesheet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Sidesheet">
-							<rect x="45907.8" y="2519.0" height="212.0" width="341.0" data-name="Sidesheet"></rect>
-							<path d="M45907.8 2550.0 L46248.8 2550.0" fill="none" data-name="Sidesheet"></path>
-						</g>
-						<g transform="translate(45907.75, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Sidesheet">
-								<text x="162.5" y="13.5" stroke="none" text-anchor="middle" data-name="Sidesheet">Sidesheet</text>
+						<g transform="translate(50626, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45907.75, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Sidesheet">
-								<text x="0.0" y="13.5" stroke="none" data-name="Sidesheet">&lt;static&gt;+kDefaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Sidesheet">+titleText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Sidesheet">+body: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Sidesheet">+tabs: List&lt;SidesheetTab&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Sidesheet">+actionButtons: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Sidesheet">+width: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Sidesheet">+withCloseButton: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Sidesheet">+ignoreAppBar: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Sidesheet">+collapseSingleTab: bool</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Sidesheet">+bodyPadding: EdgeInsets?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Sidesheet">+wrapContent: Widget Function(Widget)?</text>
+						<g transform="translate(50626, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReactiveCustomColorPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveCustomColorPicker">
-							<rect x="76036.3" y="614.0" height="31.0" width="236.0" data-name="ReactiveCustomColorPicker"></rect>
+					<g data-name="QuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
+							<rect x="47930.0" y="1956.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M47930.0 1987.0 L48943.0 1987.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M47930.0 3008.0 L48943.0 3008.0" fill="none" data-name="QuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(76036.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveCustomColorPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveCustomColorPicker">
-								<text x="110.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveCustomColorPicker">ReactiveCustomColorPicker</text>
+						<g transform="translate(47930, 1956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
+								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReactiveFormField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFormField">
-							<rect x="76072.8" y="121.0" height="31.0" width="163.0" data-name="ReactiveFormField"></rect>
+						<g transform="translate(47930, 1987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
+								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
+								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
+								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
+								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
+								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
+								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
+								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
+								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
+								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
+								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
+								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
+								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
+								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
+								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
+								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
+								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
+								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
+								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+								
+							</g>
 						</g>
-						<g transform="translate(76072.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFormField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFormField">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFormField">ReactiveFormField</text>
+						<g transform="translate(47930, 3008)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TextParagraph">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextParagraph">
-							<rect x="46288.8" y="2556.0" height="138.0" width="208.0" data-name="TextParagraph"></rect>
-							<path d="M46288.8 2587.0 L46496.8 2587.0" fill="none" data-name="TextParagraph"></path>
-							<path d="M46288.8 2663.0 L46496.8 2663.0" fill="none" data-name="TextParagraph"></path>
+					<g data-name="EnrollmentFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
+							<rect x="65972.8" y="2376.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
+							<path d="M65972.8 2407.0 L66874.8 2407.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+							<path d="M65972.8 2633.0 L66874.8 2633.0" fill="none" data-name="EnrollmentFormViewModel"></path>
 						</g>
-						<g transform="translate(46288.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextParagraph">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextParagraph">TextParagraph</text>
+						<g transform="translate(65972.75, 2376)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
+								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46288.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
-								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+text: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TextParagraph">+style: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TextParagraph">+selectable: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TextParagraph">+span: List&lt;TextSpan&gt;?</text>
+						<g transform="translate(65972.75, 2407)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46288.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
-								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+Widget build()</text>
+						<g transform="translate(65972.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConstrainedWidthFlexible">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConstrainedWidthFlexible">
-							<rect x="46536.8" y="2533.5" height="183.0" width="287.0" data-name="ConstrainedWidthFlexible"></rect>
-							<path d="M46536.8 2564.5 L46823.8 2564.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
-							<path d="M46536.8 2670.5 L46823.8 2670.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
+					<g data-name="EnrollmentFormConsentItemDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
+							<rect x="65723.8" y="3394.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
+							<path d="M65723.8 3425.0 L66523.8 3425.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+							<path d="M65723.8 3501.0 L66523.8 3501.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
 						</g>
-						<g transform="translate(46536.75, 2533.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConstrainedWidthFlexible">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConstrainedWidthFlexible">ConstrainedWidthFlexible</text>
+						<g transform="translate(65723.75, 3394)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46536.75, 2564.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+minWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">+maxWidth: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConstrainedWidthFlexible">+flex: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConstrainedWidthFlexible">+flexSum: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConstrainedWidthFlexible">+child: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConstrainedWidthFlexible">+outerConstraints: BoxConstraints</text>
+						<g transform="translate(65723.75, 3425)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46536.75, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">-double _getWidth()</text>
+						<g transform="translate(65723.75, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoxConstraints">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoxConstraints">
-							<rect x="53674.8" y="3485.0" height="31.0" width="136.0" data-name="BoxConstraints"></rect>
+					<g data-name="StudyFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
+							<rect x="71357.0" y="1516.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
+							<path d="M71357.0 1547.0 L72053.0 1547.0" fill="none" data-name="StudyFormViewModel"></path>
+							<path d="M71357.0 1758.0 L72053.0 1758.0" fill="none" data-name="StudyFormViewModel"></path>
 						</g>
-						<g transform="translate(53674.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxConstraints">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxConstraints">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxConstraints">BoxConstraints</text>
+						<g transform="translate(71357, 1516)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PrimaryButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PrimaryButton">
-							<rect x="46863.8" y="2511.5" height="227.0" width="333.0" data-name="PrimaryButton"></rect>
-							<path d="M46863.8 2542.5 L47196.8 2542.5" fill="none" data-name="PrimaryButton"></path>
-						</g>
-						<g transform="translate(46863.75, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PrimaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PrimaryButton">
-								<text x="158.5" y="13.5" stroke="none" text-anchor="middle" data-name="PrimaryButton">PrimaryButton</text>
+						<g transform="translate(71357, 1547)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46863.75, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PrimaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PrimaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="PrimaryButton">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PrimaryButton">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PrimaryButton">+isLoading: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PrimaryButton">+showLoadingEarliestAfterMs: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PrimaryButton">+onPressed: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PrimaryButton">+tooltip: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PrimaryButton">+tooltipDisabled: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PrimaryButton">+enabled: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PrimaryButton">+onPressedFuture: dynamic Function()?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="PrimaryButton">+innerPadding: EdgeInsets</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="PrimaryButton">+minimumSize: Size?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="PrimaryButton">+isDisabled: bool</text>
+						<g transform="translate(71357, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="52671.0" y="3485.0" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
+					<g data-name="QuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
+							<rect x="53367.3" y="1568.5" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M53367.3 1599.5 L54535.3 1599.5" fill="none" data-name="QuestionFormData"></path>
+							<path d="M53367.3 1735.5 L54535.3 1735.5" fill="none" data-name="QuestionFormData"></path>
 						</g>
-						<g transform="translate(52671, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
-								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
+						<g transform="translate(53367.25, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
+								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Size">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Size">
-							<rect x="47084.0" y="3485.0" height="31.0" width="50.0" data-name="Size"></rect>
-						</g>
-						<g transform="translate(47084, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Size">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Size">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Size">Size</text>
+						<g transform="translate(53367.25, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="EmptyBody">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmptyBody">
-							<rect x="47648.5" y="2541.0" height="168.0" width="222.0" data-name="EmptyBody"></rect>
-							<path d="M47648.5 2572.0 L47870.5 2572.0" fill="none" data-name="EmptyBody"></path>
-							<path d="M47648.5 2678.0 L47870.5 2678.0" fill="none" data-name="EmptyBody"></path>
-						</g>
-						<g transform="translate(47648.5, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmptyBody">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="EmptyBody">EmptyBody</text>
+						<g transform="translate(53367.25, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47648.5, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+icon: IconData?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmptyBody">+leading: Widget?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmptyBody">+leadingSpacing: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmptyBody">+title: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EmptyBody">+description: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EmptyBody">+button: Widget?</text>
+					</g>
+					<g data-name="SurveyQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
+							<rect x="31073.0" y="3417.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M31073.0 3448.0 L31436.0 3448.0" fill="none" data-name="SurveyQuestionType"></path>
+						</g>
+						<g transform="translate(31073, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
+								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47648.5, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+Widget build()</text>
+						<g transform="translate(31073, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Badge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Badge">
-							<rect x="47910.5" y="2496.0" height="258.0" width="263.0" data-name="Badge"></rect>
-							<path d="M47910.5 2527.0 L48173.5 2527.0" fill="none" data-name="Badge"></path>
-							<path d="M47910.5 2678.0 L48173.5 2678.0" fill="none" data-name="Badge"></path>
+					<g data-name="ChoiceQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
+							<rect x="51487.3" y="2541.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M51487.3 2572.0 L51831.3 2572.0" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M51487.3 2633.0 L51831.3 2633.0" fill="none" data-name="ChoiceQuestionFormData"></path>
 						</g>
-						<g transform="translate(47910.5, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Badge">
-								<text x="123.5" y="13.5" stroke="none" text-anchor="middle" data-name="Badge">Badge</text>
+						<g transform="translate(51487.25, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47910.5, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
-								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+icon: IconData?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Badge">+color: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Badge">+borderRadius: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Badge">+label: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Badge">+type: BadgeType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Badge">+padding: EdgeInsets</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Badge">+iconSize: double?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Badge">+labelStyle: TextStyle?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Badge">+center: bool</text>
+						<g transform="translate(51487.25, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47910.5, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
-								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Badge">-Color? _getBackgroundColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Badge">-Color _getBorderColor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Badge">-Color? _getLabelColor()</text>
+						<g transform="translate(51487.25, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NullHelperDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NullHelperDecoration">
-							<rect x="76312.3" y="614.0" height="31.0" width="184.0" data-name="NullHelperDecoration"></rect>
+					<g data-name="BoolQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
+							<rect x="51871.3" y="2556.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M51871.3 2587.0 L52263.3 2587.0" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M51871.3 2633.0 L52263.3 2633.0" fill="none" data-name="BoolQuestionFormData"></path>
 						</g>
-						<g transform="translate(76312.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NullHelperDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NullHelperDecoration">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="NullHelperDecoration">NullHelperDecoration</text>
+						<g transform="translate(51871.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
+								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InputDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InputDecoration">
-							<rect x="76333.3" y="121.0" height="31.0" width="142.0" data-name="InputDecoration"></rect>
+						<g transform="translate(51871.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(76333.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InputDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InputDecoration">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="InputDecoration">InputDecoration</text>
+						<g transform="translate(51871.25, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Collapsible">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Collapsible">
-							<rect x="76663.0" y="83.0" height="107.0" width="441.0" data-name="Collapsible"></rect>
-							<path d="M76663.0 114.0 L77104.0 114.0" fill="none" data-name="Collapsible"></path>
+					<g data-name="ImageQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
+							<rect x="52675.3" y="2556.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
+							<path d="M52675.3 2587.0 L53147.3 2587.0" fill="none" data-name="ImageQuestionFormData"></path>
+							<path d="M52675.3 2633.0 L53147.3 2633.0" fill="none" data-name="ImageQuestionFormData"></path>
 						</g>
-						<g transform="translate(76663, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Collapsible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Collapsible">
-								<text x="212.5" y="13.5" stroke="none" text-anchor="middle" data-name="Collapsible">Collapsible</text>
+						<g transform="translate(52675.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76663, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Collapsible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Collapsible">
-								<text x="0.0" y="13.5" stroke="none" data-name="Collapsible">+contentBuilder: Widget Function(BuildContext, bool)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Collapsible">+headerBuilder: Widget Function(BuildContext, bool)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Collapsible">+title: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Collapsible">+isCollapsed: bool</text>
+						<g transform="translate(52675.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(52675.25, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext, bool)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)">
-							<rect x="76561.0" y="614.0" height="31.0" width="300.0" data-name="Widget Function(BuildContext, bool)"></rect>
+					<g data-name="AudioQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
+							<rect x="53923.3" y="2548.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
+							<path d="M53923.3 2579.5 L54395.3 2579.5" fill="none" data-name="AudioQuestionFormData"></path>
+							<path d="M53923.3 2640.5 L54395.3 2640.5" fill="none" data-name="AudioQuestionFormData"></path>
 						</g>
-						<g transform="translate(76561, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)">
-								<text x="142.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)">Widget Function(BuildContext, bool)</text>
+						<g transform="translate(53923.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)?">
-							<rect x="77137.8" y="614.0" height="31.0" width="310.0" data-name="Widget Function(BuildContext, bool)?"></rect>
+						<g transform="translate(53923.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(77137.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)?">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)?">Widget Function(BuildContext, bool)?</text>
+						<g transform="translate(53923.25, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ActionMenuInline">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuInline">
-							<rect x="77144.0" y="52.5" height="168.0" width="324.0" data-name="ActionMenuInline"></rect>
-							<path d="M77144.0 83.5 L77468.0 83.5" fill="none" data-name="ActionMenuInline"></path>
-							<path d="M77144.0 189.5 L77468.0 189.5" fill="none" data-name="ActionMenuInline"></path>
+					<g data-name="ScaleQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
+							<rect x="54435.3" y="2481.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M54435.3 2512.0 L54779.3 2512.0" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M54435.3 2708.0 L54779.3 2708.0" fill="none" data-name="ScaleQuestionFormData"></path>
 						</g>
-						<g transform="translate(77144, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuInline">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuInline">ActionMenuInline</text>
+						<g transform="translate(54435.25, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77144, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuInline">+iconSize: double?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuInline">+visible: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuInline">+splashRadius: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ActionMenuInline">+paddingVertical: double?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ActionMenuInline">+paddingHorizontal: double?</text>
+						<g transform="translate(54435.25, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77144, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+Widget build()</text>
+						<g transform="translate(54435.25, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyULogo">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyULogo">
-							<rect x="49931.8" y="3797.0" height="93.0" width="214.0" data-name="StudyULogo"></rect>
-							<path d="M49931.8 3828.0 L50145.8 3828.0" fill="none" data-name="StudyULogo"></path>
-							<path d="M49931.8 3859.0 L50145.8 3859.0" fill="none" data-name="StudyULogo"></path>
+					<g data-name="FreeTextQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
+							<rect x="54819.3" y="2541.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M54819.3 2572.0 L55163.3 2572.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M54819.3 2648.0 L55163.3 2648.0" fill="none" data-name="FreeTextQuestionFormData"></path>
 						</g>
-						<g transform="translate(49931.75, 3797)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyULogo">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyULogo">StudyULogo</text>
+						<g transform="translate(54819.25, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49931.75, 3828)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+onTap: void Function()?</text>
+						<g transform="translate(54819.25, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49931.75, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+Widget build()</text>
+						<g transform="translate(54819.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TabbedNavbar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TabbedNavbar">
-							<rect x="48400.3" y="2496.5" height="257.0" width="308.0" data-name="TabbedNavbar"></rect>
-							<path d="M48400.3 2527.5 L48708.3 2527.5" fill="none" data-name="TabbedNavbar"></path>
-						</g>
-						<g transform="translate(48400.25, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabbedNavbar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabbedNavbar">
-								<text x="146.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabbedNavbar">TabbedNavbar</text>
-								
-							</g>
+					<g data-name="FreeTextQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
+							<rect x="54893.3" y="3485.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
 						</g>
-						<g transform="translate(48400.25, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TabbedNavbar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TabbedNavbar">
-								<text x="0.0" y="13.5" stroke="none" data-name="TabbedNavbar">+tabs: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TabbedNavbar">+selectedTab: T?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TabbedNavbar">+indicator: BoxDecoration?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TabbedNavbar">+height: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TabbedNavbar">+disabledBackgroundColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TabbedNavbar">+disabledTooltipText: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TabbedNavbar">+onSelect: void Function(int, T)?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TabbedNavbar">+labelPadding: EdgeInsets?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="TabbedNavbar">+labelSpacing: double?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="TabbedNavbar">+indicatorSize: TabBarIndicatorSize?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="TabbedNavbar">+isScrollable: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="TabbedNavbar">+backgroundColor: Color?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="TabbedNavbar">+labelColorHover: Color?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="TabbedNavbar">+unselectedLabelColorHover: Color?</text>
+						<g transform="translate(54893.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
+								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoxDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoxDecoration">
-							<rect x="47776.0" y="3485.0" height="31.0" width="132.0" data-name="BoxDecoration"></rect>
+					<g data-name="AudioRecordingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
+							<rect x="27757.8" y="1651.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
+							<path d="M27757.8 1682.0 L28109.8 1682.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<path d="M27757.8 1713.0 L28109.8 1713.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
 						</g>
-						<g transform="translate(47776, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxDecoration">
-								<text x="58.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxDecoration">BoxDecoration</text>
+						<g transform="translate(27757.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(int, T)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(int, T)?">
-							<rect x="48097.0" y="3485.0" height="31.0" width="183.0" data-name="void Function(int, T)?"></rect>
-						</g>
-						<g transform="translate(48097, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(int, T)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(int, T)?">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(int, T)?">void Function(int, T)?</text>
+						<g transform="translate(27757.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="TabBarIndicatorSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TabBarIndicatorSize">
-							<rect x="48320.0" y="3485.0" height="31.0" width="176.0" data-name="TabBarIndicatorSize"></rect>
-						</g>
-						<g transform="translate(48320, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabBarIndicatorSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabBarIndicatorSize">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabBarIndicatorSize">TabBarIndicatorSize</text>
+						<g transform="translate(27757.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="HtmlStylingBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlStylingBanner">
-							<rect x="48748.3" y="2571.0" height="108.0" width="298.0" data-name="HtmlStylingBanner"></rect>
-							<path d="M48748.3 2602.0 L49046.3 2602.0" fill="none" data-name="HtmlStylingBanner"></path>
-							<path d="M48748.3 2648.0 L49046.3 2648.0" fill="none" data-name="HtmlStylingBanner"></path>
+					<g data-name="FreeTextQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
+							<rect x="28149.8" y="1628.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M28149.8 1659.5 L28501.8 1659.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M28149.8 1705.5 L28501.8 1705.5" fill="none" data-name="FreeTextQuestionFormView"></path>
 						</g>
-						<g transform="translate(48748.25, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlStylingBanner">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlStylingBanner">HtmlStylingBanner</text>
+						<g transform="translate(28149.75, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(48748.25, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+isDismissed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="HtmlStylingBanner">+onDismissed: dynamic Function()?</text>
+						<g transform="translate(28149.75, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(48748.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+Widget build()</text>
+						<g transform="translate(28149.75, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ISyncIndicatorViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ISyncIndicatorViewModel">
-							<rect x="77508.0" y="98.0" height="77.0" width="214.0" data-name="ISyncIndicatorViewModel"></rect>
-							<path d="M77508.0 129.0 L77722.0 129.0" fill="none" data-name="ISyncIndicatorViewModel"></path>
-						</g>
-						<g transform="translate(77508, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ISyncIndicatorViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ISyncIndicatorViewModel">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="ISyncIndicatorViewModel">ISyncIndicatorViewModel</text>
-								
-							</g>
+					<g data-name="ImageCapturingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
+							<rect x="28541.8" y="1651.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
+							<path d="M28541.8 1682.0 L28893.8 1682.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<path d="M28541.8 1713.0 L28893.8 1713.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
 						</g>
-						<g transform="translate(77508, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ISyncIndicatorViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ISyncIndicatorViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ISyncIndicatorViewModel">+isDirty: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ISyncIndicatorViewModel">+lastSynced: DateTime?</text>
+						<g transform="translate(28541.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SyncIndicator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SyncIndicator">
-							<rect x="49086.3" y="2564.0" height="122.0" width="208.0" data-name="SyncIndicator"></rect>
-							<path d="M49086.3 2595.0 L49294.3 2595.0" fill="none" data-name="SyncIndicator"></path>
-						</g>
-						<g transform="translate(49086.25, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SyncIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SyncIndicator">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="SyncIndicator">SyncIndicator</text>
+						<g transform="translate(28541.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49086.25, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SyncIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SyncIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="SyncIndicator">+state: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SyncIndicator">+lastSynced: DateTime?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SyncIndicator">+isDirty: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SyncIndicator">+animationDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SyncIndicator">+iconSize: double</text>
+						<g transform="translate(28541.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Search">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Search">
-							<rect x="49334.3" y="2571.5" height="107.0" width="373.0" data-name="Search"></rect>
-							<path d="M49334.3 2602.5 L49707.3 2602.5" fill="none" data-name="Search"></path>
+					<g data-name="IScaleQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
+							<rect x="82520.5" y="105.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M82520.5 136.5 L82829.5 136.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(49334.25, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Search">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Search">
-								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="Search">Search</text>
+						<g transform="translate(82520.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
+								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49334.25, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Search">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Search">
-								<text x="0.0" y="13.5" stroke="none" data-name="Search">+onQueryChanged: dynamic Function(String)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Search">+searchController: SearchController?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Search">+hintText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Search">+initialText: String?</text>
+						<g transform="translate(82520.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(String)">
-							<rect x="49269.0" y="3485.0" height="31.0" width="213.0" data-name="dynamic Function(String)"></rect>
+					<g data-name="ScaleQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
+							<rect x="51231.3" y="1666.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M51231.3 1697.5 L51583.3 1697.5" fill="none" data-name="ScaleQuestionFormView"></path>
 						</g>
-						<g transform="translate(49269, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(String)">
-								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(String)">dynamic Function(String)</text>
+						<g transform="translate(51231.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(String)">
-							<rect x="56103.3" y="3828.0" height="31.0" width="180.0" data-name="void Function(String)"></rect>
-						</g>
-						<g transform="translate(56103.25, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(String)">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(String)">void Function(String)</text>
+						<g transform="translate(51231.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SecondaryButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SecondaryButton">
-							<rect x="49747.3" y="2556.0" height="138.0" width="249.0" data-name="SecondaryButton"></rect>
-							<path d="M49747.3 2587.0 L49996.3 2587.0" fill="none" data-name="SecondaryButton"></path>
-							<path d="M49747.3 2663.0 L49996.3 2663.0" fill="none" data-name="SecondaryButton"></path>
+					<g data-name="ChoiceQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
+							<rect x="28933.8" y="1651.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M28933.8 1682.0 L29285.8 1682.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M28933.8 1713.0 L29285.8 1713.0" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(49747.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecondaryButton">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecondaryButton">SecondaryButton</text>
+						<g transform="translate(28933.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49747.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SecondaryButton">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SecondaryButton">+isLoading: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SecondaryButton">+onPressed: void Function()?</text>
+						<g transform="translate(28933.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49747.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+Widget build()</text>
+						<g transform="translate(28933.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormTableRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRow">
-							<rect x="50474.3" y="2549.0" height="152.0" width="379.0" data-name="FormTableRow"></rect>
-							<path d="M50474.3 2580.0 L50853.3 2580.0" fill="none" data-name="FormTableRow"></path>
+					<g data-name="BoolQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
+							<rect x="29740.8" y="1651.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M29740.8 1682.0 L30092.8 1682.0" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M29740.8 1713.0 L30092.8 1713.0" fill="none" data-name="BoolQuestionFormView"></path>
 						</g>
-						<g transform="translate(50474.25, 2549)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRow">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRow">FormTableRow</text>
+						<g transform="translate(29740.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50474.25, 2580)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRow">+label: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRow">+labelBuilder: Widget Function(BuildContext)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRow">+labelStyle: TextStyle?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRow">+labelHelpText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormTableRow">+input: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormTableRow">+control: AbstractControl&lt;dynamic&gt;?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormTableRow">+layout: FormTableRowLayout?</text>
+						<g transform="translate(29740.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
-							<rect x="51993.8" y="3485.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
-						</g>
-						<g transform="translate(51993.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
+						<g transform="translate(29740.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormTableRowLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRowLayout">
-							<rect x="41597.8" y="3447.0" height="107.0" width="370.0" data-name="FormTableRowLayout"></rect>
-							<path d="M41597.8 3478.0 L41967.8 3478.0" fill="none" data-name="FormTableRowLayout"></path>
+					<g data-name="SurveyQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
+							<rect x="56104.5" y="1659.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M56104.5 1690.0 L56456.5 1690.0" fill="none" data-name="SurveyQuestionFormView"></path>
 						</g>
-						<g transform="translate(41597.75, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRowLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRowLayout">
-								<text x="177.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRowLayout">FormTableRowLayout</text>
+						<g transform="translate(56104.5, 1659)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41597.75, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRowLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRowLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRowLayout">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+values: List&lt;FormTableRowLayout&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+vertical: FormTableRowLayout</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+horizontal: FormTableRowLayout</text>
+						<g transform="translate(56104.5, 1690)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormTableLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableLayout">
-							<rect x="50893.3" y="2548.5" height="153.0" width="379.0" data-name="FormTableLayout"></rect>
-							<path d="M50893.3 2579.5 L51272.3 2579.5" fill="none" data-name="FormTableLayout"></path>
-							<path d="M50893.3 2670.5 L51272.3 2670.5" fill="none" data-name="FormTableLayout"></path>
+					<g data-name="StudyUTimeOfDay">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
+							<rect x="55982.3" y="2609.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
 						</g>
-						<g transform="translate(50893.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableLayout">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableLayout">FormTableLayout</text>
+						<g transform="translate(55982.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
+								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50893.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+rows: List&lt;FormTableRow&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableLayout">+columnWidths: Map&lt;int, TableColumnWidth&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableLayout">+rowDivider: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableLayout">+rowLayout: FormTableRowLayout?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormTableLayout">+rowLabelStyle: TextStyle?</text>
+					</g>
+					<g data-name="ScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
+							<rect x="82460.8" y="1158.5" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
+							<path d="M82460.8 1189.5 L82892.8 1189.5" fill="none" data-name="ScheduleControls"></path>
+							<path d="M82460.8 1220.5 L82892.8 1220.5" fill="none" data-name="ScheduleControls"></path>
+						</g>
+						<g transform="translate(82460.75, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
+								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50893.25, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+Widget build()</text>
+						<g transform="translate(82460.75, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormSectionHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSectionHeader">
-							<rect x="51312.3" y="2548.5" height="153.0" width="220.0" data-name="FormSectionHeader"></rect>
-							<path d="M51312.3 2579.5 L51532.3 2579.5" fill="none" data-name="FormSectionHeader"></path>
-							<path d="M51312.3 2670.5 L51532.3 2670.5" fill="none" data-name="FormSectionHeader"></path>
-						</g>
-						<g transform="translate(51312.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSectionHeader">
-								<text x="102.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormSectionHeader">FormSectionHeader</text>
+						<g transform="translate(82460.75, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51312.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormSectionHeader">+titleTextStyle: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormSectionHeader">+helpText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormSectionHeader">+divider: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormSectionHeader">+helpTextDisabled: bool</text>
+					</g>
+					<g data-name="StudiesTableColumnHeader">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
+							<rect x="45539.0" y="3782.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
+							<path d="M45539.0 3813.5 L45776.0 3813.5" fill="none" data-name="StudiesTableColumnHeader"></path>
+						</g>
+						<g transform="translate(45539, 3782.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
+								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51312.25, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+Widget build()</text>
+						<g transform="translate(45539, 3813.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormLabel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormLabel">
-							<rect x="51572.3" y="2556.0" height="138.0" width="266.0" data-name="FormLabel"></rect>
-							<path d="M51572.3 2587.0 L51838.3 2587.0" fill="none" data-name="FormLabel"></path>
-							<path d="M51572.3 2663.0 L51838.3 2663.0" fill="none" data-name="FormLabel"></path>
-						</g>
-						<g transform="translate(51572.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormLabel">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormLabel">FormLabel</text>
-								
-							</g>
+					<g data-name="DashboardScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
+							<rect x="56956.0" y="2594.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
+							<path d="M56956.0 2625.0 L57134.0 2625.0" fill="none" data-name="DashboardScreen"></path>
 						</g>
-						<g transform="translate(51572.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+labelText: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormLabel">+helpText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormLabel">+labelTextStyle: TextStyle?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormLabel">+layout: FormTableRowLayout?</text>
+						<g transform="translate(56956, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
+								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51572.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+Widget build()</text>
+						<g transform="translate(56956, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MouseEventsRegion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MouseEventsRegion">
-							<rect x="52749.0" y="3760.0" height="167.0" width="379.0" data-name="MouseEventsRegion"></rect>
-							<path d="M52749.0 3791.0 L53128.0 3791.0" fill="none" data-name="MouseEventsRegion"></path>
+					<g data-name="StudiesFilter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
+							<rect x="24804.0" y="3462.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
+							<path d="M24804.0 3493.0 L25100.0 3493.0" fill="none" data-name="StudiesFilter"></path>
 						</g>
-						<g transform="translate(52749, 3760)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MouseEventsRegion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MouseEventsRegion">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="MouseEventsRegion">MouseEventsRegion</text>
+						<g transform="translate(24804, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52749, 3791)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MouseEventsRegion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MouseEventsRegion">
-								<text x="0.0" y="13.5" stroke="none" data-name="MouseEventsRegion">+onTap: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MouseEventsRegion">+onHover: void Function(PointerHoverEvent)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MouseEventsRegion">+onEnter: void Function(PointerEnterEvent)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MouseEventsRegion">+onExit: void Function(PointerExitEvent)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MouseEventsRegion">+autoselectCursor: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MouseEventsRegion">+cursor: SystemMouseCursor</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MouseEventsRegion">&lt;static&gt;+defaultCursor: SystemMouseCursor</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MouseEventsRegion">+autoCursor: SystemMouseCursor</text>
+						<g transform="translate(24804, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(PointerHoverEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerHoverEvent)?">
-							<rect x="54830.0" y="4118.5" height="31.0" width="292.0" data-name="void Function(PointerHoverEvent)?"></rect>
+					<g data-name="DashboardScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
+							<rect x="57174.0" y="2571.0" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
+							<path d="M57174.0 2602.0 L57517.0 2602.0" fill="none" data-name="DashboardScaffold"></path>
+							<path d="M57174.0 2648.0 L57517.0 2648.0" fill="none" data-name="DashboardScaffold"></path>
 						</g>
-						<g transform="translate(54830, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerHoverEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerHoverEvent)?">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerHoverEvent)?">void Function(PointerHoverEvent)?</text>
+						<g transform="translate(57174, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
+								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
+								
+							</g>
+						</g>
+						<g transform="translate(57174, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(PointerEnterEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerEnterEvent)?">
-							<rect x="55162.0" y="4118.5" height="31.0" width="287.0" data-name="void Function(PointerEnterEvent)?"></rect>
-						</g>
-						<g transform="translate(55162, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerEnterEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerEnterEvent)?">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerEnterEvent)?">void Function(PointerEnterEvent)?</text>
+						<g transform="translate(57174, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(PointerExitEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerExitEvent)?">
-							<rect x="55489.0" y="4118.5" height="31.0" width="274.0" data-name="void Function(PointerExitEvent)?"></rect>
+					<g data-name="DashboardController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
+							<rect x="70063.5" y="2436.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
+							<path d="M70063.5 2467.0 L70677.5 2467.0" fill="none" data-name="DashboardController"></path>
+							<path d="M70063.5 2588.0 L70677.5 2588.0" fill="none" data-name="DashboardController"></path>
 						</g>
-						<g transform="translate(55489, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerExitEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerExitEvent)?">
-								<text x="129.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerExitEvent)?">void Function(PointerExitEvent)?</text>
+						<g transform="translate(70063.5, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
+								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SystemMouseCursor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SystemMouseCursor">
-							<rect x="58547.0" y="4118.5" height="31.0" width="180.0" data-name="SystemMouseCursor"></rect>
+						<g transform="translate(70063.5, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
+								
+							</g>
 						</g>
-						<g transform="translate(58547, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SystemMouseCursor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SystemMouseCursor">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="SystemMouseCursor">SystemMouseCursor</text>
+						<g transform="translate(70063.5, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControlLabel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlLabel">
-							<rect x="51878.3" y="2548.5" height="153.0" width="430.0" data-name="FormControlLabel"></rect>
-							<path d="M51878.3 2579.5 L52308.3 2579.5" fill="none" data-name="FormControlLabel"></path>
-							<path d="M51878.3 2670.5 L52308.3 2670.5" fill="none" data-name="FormControlLabel"></path>
+					<g data-name="IUserRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
+							<rect x="70180.5" y="3439.0" height="123.0" width="260.0" data-name="IUserRepository"></rect>
+							<path d="M70180.5 3470.0 L70440.5 3470.0" fill="none" data-name="IUserRepository"></path>
+							<path d="M70180.5 3501.0 L70440.5 3501.0" fill="none" data-name="IUserRepository"></path>
 						</g>
-						<g transform="translate(51878.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlLabel">
-								<text x="207.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlLabel">FormControlLabel</text>
+						<g transform="translate(70180.5, 3439)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
+								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51878.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+formControl: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlLabel">+text: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlLabel">+isClickable: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlLabel">+textStyle: TextStyle?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormControlLabel">+onClick: void Function(AbstractControl&lt;dynamic&gt;)?</text>
+						<g transform="translate(70180.5, 3470)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+user: StudyUUser</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51878.25, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+Widget build()</text>
+						<g transform="translate(70180.5, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+dynamic fetchUser()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IUserRepository">+dynamic saveUser()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IUserRepository">+dynamic updatePreferences()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<rect x="53850.8" y="3485.0" height="31.0" width="352.0" data-name="void Function(AbstractControl&lt;dynamic&gt;)?"></rect>
+					<g data-name="StudiesTableColumnSize">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
+							<rect x="82869.5" y="75.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
+							<path d="M82869.5 106.0 L83094.5 106.0" fill="none" data-name="StudiesTableColumnSize"></path>
+							<path d="M82869.5 167.0 L83094.5 167.0" fill="none" data-name="StudiesTableColumnSize"></path>
 						</g>
-						<g transform="translate(53850.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">void Function(AbstractControl&lt;dynamic&gt;)?</text>
+						<g transform="translate(82869.5, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
+								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SingleColumnLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayout">
-							<rect x="52348.3" y="2526.0" height="198.0" width="418.0" data-name="SingleColumnLayout"></rect>
-							<path d="M52348.3 2557.0 L52766.3 2557.0" fill="none" data-name="SingleColumnLayout"></path>
-							<path d="M52348.3 2693.0 L52766.3 2693.0" fill="none" data-name="SingleColumnLayout"></path>
-						</g>
-						<g transform="translate(52348.25, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayout">
-								<text x="201.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayout">SingleColumnLayout</text>
+						<g transform="translate(82869.5, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52348.25, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraints: BoxConstraints</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraintsNarrow: BoxConstraints</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayout">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayout">+header: Widget?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayout">+stickyHeader: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayout">+constraints: BoxConstraints?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SingleColumnLayout">+scroll: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SingleColumnLayout">+padding: EdgeInsets?</text>
+						<g transform="translate(82869.5, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52348.25, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+dynamic fromType()</text>
+					</g>
+					<g data-name="StudiesTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
+							<rect x="56581.8" y="1553.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
+							<path d="M56581.8 1584.5 L57061.8 1584.5" fill="none" data-name="StudiesTable"></path>
+							<path d="M56581.8 1795.5 L57061.8 1795.5" fill="none" data-name="StudiesTable"></path>
+						</g>
+						<g transform="translate(56581.75, 1553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
+								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="TwoColumnLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TwoColumnLayout">
-							<rect x="52909.8" y="2466.5" height="317.0" width="368.0" data-name="TwoColumnLayout"></rect>
-							<path d="M52909.8 2497.5 L53277.8 2497.5" fill="none" data-name="TwoColumnLayout"></path>
-						</g>
-						<g transform="translate(52909.75, 2466.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TwoColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TwoColumnLayout">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="TwoColumnLayout">TwoColumnLayout</text>
+						<g transform="translate(56581.75, 1584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52909.75, 2497.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TwoColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TwoColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultDivider: VerticalDivider</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultContentPadding: EdgeInsets</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+slimContentPadding: EdgeInsets</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TwoColumnLayout">+leftWidget: Widget</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TwoColumnLayout">+rightWidget: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TwoColumnLayout">+dividerWidget: Widget?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TwoColumnLayout">+headerWidget: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TwoColumnLayout">+flexLeft: int?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="TwoColumnLayout">+flexRight: int?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="TwoColumnLayout">+constraintsLeft: BoxConstraints?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="TwoColumnLayout">+constraintsRight: BoxConstraints?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="TwoColumnLayout">+scrollLeft: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="TwoColumnLayout">+scrollRight: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="TwoColumnLayout">+paddingLeft: EdgeInsets?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="TwoColumnLayout">+paddingRight: EdgeInsets?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorLeft: Color?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorRight: Color?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="TwoColumnLayout">+stretchHeight: bool</text>
+						<g transform="translate(56581.75, 1795.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="VerticalDivider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VerticalDivider">
-							<rect x="54395.8" y="3485.0" height="31.0" width="130.0" data-name="VerticalDivider"></rect>
+					<g data-name="void Function(Study)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
+							<rect x="56280.0" y="2609.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
 						</g>
-						<g transform="translate(54395.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VerticalDivider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VerticalDivider">
-								<text x="57.0" y="13.5" stroke="none" text-anchor="middle" data-name="VerticalDivider">VerticalDivider</text>
+						<g transform="translate(56280, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
+								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="UnderConstruction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnderConstruction">
-							<rect x="77762.0" y="105.5" height="62.0" width="164.0" data-name="UnderConstruction"></rect>
-							<path d="M77762.0 136.5 L77926.0 136.5" fill="none" data-name="UnderConstruction"></path>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+							<rect x="56499.0" y="2609.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
 						</g>
-						<g transform="translate(77762, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnderConstruction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnderConstruction">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="UnderConstruction">UnderConstruction</text>
+						<g transform="translate(56499, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77762, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnderConstruction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnderConstruction">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnderConstruction">+Widget build()</text>
+					</g>
+					<g data-name="StudiesTableColumn">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
+							<rect x="2478.0" y="3394.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
+							<path d="M2478.0 3425.5 L2839.0 3425.5" fill="none" data-name="StudiesTableColumn"></path>
+						</g>
+						<g transform="translate(2478, 3394.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
+								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StandardDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardDialog">
-							<rect x="53317.8" y="2488.5" height="273.0" width="247.0" data-name="StandardDialog"></rect>
-							<path d="M53317.8 2519.5 L53564.8 2519.5" fill="none" data-name="StandardDialog"></path>
-							<path d="M53317.8 2730.5 L53564.8 2730.5" fill="none" data-name="StandardDialog"></path>
-						</g>
-						<g transform="translate(53317.75, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardDialog">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardDialog">StandardDialog</text>
+						<g transform="translate(2478, 3425.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53317.75, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+title: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardDialog">+titleText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardDialog">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardDialog">+actionButtons: List&lt;Widget&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardDialog">+backgroundColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardDialog">+borderRadius: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StandardDialog">+width: double?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StandardDialog">+height: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StandardDialog">+minWidth: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StandardDialog">+minHeight: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StandardDialog">+maxWidth: double?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StandardDialog">+maxHeight: double?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StandardDialog">+padding: EdgeInsets</text>
+					</g>
+					<g data-name="StudiesTableItem">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
+							<rect x="59997.3" y="2526.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
+							<path d="M59997.3 2557.5 L60397.3 2557.5" fill="none" data-name="StudiesTableItem"></path>
+						</g>
+						<g transform="translate(59997.25, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
+								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53317.75, 2730.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+Widget build()</text>
+						<g transform="translate(59997.25, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IndicatorRangeSliderThumbShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IndicatorRangeSliderThumbShape">
-							<rect x="60818.5" y="560.5" height="138.0" width="287.0" data-name="IndicatorRangeSliderThumbShape"></rect>
-							<path d="M60818.5 591.5 L61105.5 591.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
-							<path d="M60818.5 652.5 L61105.5 652.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
+					<g data-name="void Function(Study, bool)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
+							<rect x="59411.3" y="3485.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
 						</g>
-						<g transform="translate(60818.5, 560.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IndicatorRangeSliderThumbShape">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="IndicatorRangeSliderThumbShape">IndicatorRangeSliderThumbShape</text>
+						<g transform="translate(59411.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60818.5, 591.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+buildContext: BuildContext</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+start: T</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+end: T</text>
-								
-							</g>
+					</g>
+					<g data-name="void Function(Study)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
+							<rect x="59954.3" y="3485.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
 						</g>
-						<g transform="translate(60818.5, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+Size getPreferredSize()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+void paint()</text>
+						<g transform="translate(59954.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
+								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BuildContext">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
-							<rect x="60904.0" y="1197.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
+					<g data-name="App">
+						<g fill="#eee8d5" stroke="#33322E" data-name="App">
+							<rect x="83134.5" y="121.0" height="31.0" width="47.0" data-name="App"></rect>
 						</g>
-						<g transform="translate(60904, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
+						<g transform="translate(83134.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
+								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="RangeSliderThumbShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RangeSliderThumbShape">
-							<rect x="60853.0" y="121.0" height="31.0" width="218.0" data-name="RangeSliderThumbShape"></rect>
+					</g>
+					<g data-name="AppContent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
+							<rect x="83221.5" y="121.0" height="31.0" width="109.0" data-name="AppContent"></rect>
 						</g>
-						<g transform="translate(60853, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="RangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RangeSliderThumbShape">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="RangeSliderThumbShape">RangeSliderThumbShape</text>
+						<g transform="translate(83221.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BannerBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BannerBox">
-							<rect x="53604.8" y="2534.0" height="182.0" width="298.0" data-name="BannerBox"></rect>
-							<path d="M53604.8 2565.0 L53902.8 2565.0" fill="none" data-name="BannerBox"></path>
+					<g data-name="AccountSettingsDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
+							<rect x="39157.0" y="1666.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
+							<path d="M39157.0 1697.5 L39351.0 1697.5" fill="none" data-name="AccountSettingsDialog"></path>
 						</g>
-						<g transform="translate(53604.75, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerBox">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerBox">BannerBox</text>
+						<g transform="translate(39157, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
+								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53604.75, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="BannerBox">+prefixIcon: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BannerBox">+body: Widget</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BannerBox">+style: BannerStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BannerBox">+padding: EdgeInsets?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BannerBox">+noPrefix: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BannerBox">+dismissable: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="BannerBox">+isDismissed: bool?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="BannerBox">+onDismissed: dynamic Function()?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="BannerBox">+dismissIconSize: double</text>
+						<g transform="translate(39157, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BannerStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BannerStyle">
-							<rect x="35951.5" y="3439.5" height="122.0" width="294.0" data-name="BannerStyle"></rect>
-							<path d="M35951.5 3470.5 L36245.5 3470.5" fill="none" data-name="BannerStyle"></path>
+					<g data-name="ModelRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepository">
+							<rect x="83561.3" y="986.0" height="453.0" width="662.0" data-name="ModelRepository"></rect>
+							<path d="M83561.3 1017.0 L84223.3 1017.0" fill="none" data-name="ModelRepository"></path>
+							<path d="M83561.3 1123.0 L84223.3 1123.0" fill="none" data-name="ModelRepository"></path>
 						</g>
-						<g transform="translate(35951.5, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerStyle">
-								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerStyle">BannerStyle</text>
+						<g transform="translate(83561.25, 986)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepository">
+								<text x="323.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepository">ModelRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35951.5, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerStyle">
-								<text x="0.0" y="13.5" stroke="none" data-name="BannerStyle">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+values: List&lt;BannerStyle&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+warning: BannerStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+info: BannerStyle</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+error: BannerStyle</text>
+						<g transform="translate(83561.25, 1017)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+delegate: IModelRepositoryDelegate&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">-_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">-_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">-_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(83561.25, 1123)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt;? get()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">+dynamic fetchAll()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">+dynamic fetch()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+dynamic delete()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSave()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ModelRepository">-dynamic _buildModelSpecificController()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="ModelRepository">+dynamic ensurePersisted()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt; upsertLocally()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="ModelRepository">+List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="ModelRepository">+dynamic emitUpdate()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="ModelRepository">+dynamic emitModelEvent()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="ModelRepository">+dynamic emitError()</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="ModelRepository">+void dispose()</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="ModelRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ActionPopUpMenuButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionPopUpMenuButton">
-							<rect x="53942.8" y="2496.0" height="258.0" width="324.0" data-name="ActionPopUpMenuButton"></rect>
-							<path d="M53942.8 2527.0 L54266.8 2527.0" fill="none" data-name="ActionPopUpMenuButton"></path>
-							<path d="M53942.8 2708.0 L54266.8 2708.0" fill="none" data-name="ActionPopUpMenuButton"></path>
+					<g data-name="InviteCodeRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepository">
+							<rect x="82756.8" y="2518.5" height="213.0" width="403.0" data-name="InviteCodeRepository"></rect>
+							<path d="M82756.8 2549.5 L83159.8 2549.5" fill="none" data-name="InviteCodeRepository"></path>
+							<path d="M82756.8 2655.5 L83159.8 2655.5" fill="none" data-name="InviteCodeRepository"></path>
 						</g>
-						<g transform="translate(53942.75, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionPopUpMenuButton">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionPopUpMenuButton">ActionPopUpMenuButton</text>
+						<g transform="translate(82756.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepository">
+								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepository">InviteCodeRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53942.75, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColor: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColorHover: Color?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconSize: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ActionPopUpMenuButton">+disableSplashEffect: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ActionPopUpMenuButton">+hideOnEmpty: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ActionPopUpMenuButton">+orientation: Axis</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ActionPopUpMenuButton">+elevation: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ActionPopUpMenuButton">+splashRadius: double?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ActionPopUpMenuButton">+enabled: bool</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ActionPopUpMenuButton">+position: PopupMenuPosition</text>
+						<g transform="translate(82756.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+apiClient: StudyUApi</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepository">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepository">+study: Study</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53942.75, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">-Widget _buildPopupMenu()</text>
+						<g transform="translate(82756.75, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+String getKey()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+dynamic emitUpdate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Axis">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Axis">
-							<rect x="55046.5" y="3485.0" height="31.0" width="49.0" data-name="Axis"></rect>
+					<g data-name="ProviderRef">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ProviderRef">
+							<rect x="83411.5" y="4118.5" height="31.0" width="109.0" data-name="ProviderRef"></rect>
 						</g>
-						<g transform="translate(55046.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Axis">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Axis">
-								<text x="16.5" y="13.5" stroke="none" text-anchor="middle" data-name="Axis">Axis</text>
+						<g transform="translate(83411.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ProviderRef">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProviderRef">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProviderRef">ProviderRef</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PopupMenuPosition">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PopupMenuPosition">
-							<rect x="55135.5" y="3485.0" height="31.0" width="174.0" data-name="PopupMenuPosition"></rect>
+					<g data-name="StudyUApi">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApi">
+							<rect x="77217.3" y="4028.0" height="212.0" width="251.0" data-name="StudyUApi"></rect>
+							<path d="M77217.3 4059.0 L77468.3 4059.0" fill="none" data-name="StudyUApi"></path>
 						</g>
-						<g transform="translate(55135.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PopupMenuPosition">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PopupMenuPosition">
-								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="PopupMenuPosition">PopupMenuPosition</text>
+						<g transform="translate(77217.25, 4028)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyUApi">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApi">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApi">StudyUApi</text>
+								
+							</g>
+						</g>
+						<g transform="translate(77217.25, 4059)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApi">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApi">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApi">+dynamic saveStudy()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApi">+dynamic getUserStudies()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApi">+dynamic saveStudyInvite()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudyInvite()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudyInvite()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApi">+dynamic deleteParticipants()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApi">+dynamic fetchAppConfig()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApi">+dynamic fetchUser()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApi">+dynamic saveUser()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DismissButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DismissButton">
-							<rect x="53168.0" y="3789.5" height="108.0" width="249.0" data-name="DismissButton"></rect>
-							<path d="M53168.0 3820.5 L53417.0 3820.5" fill="none" data-name="DismissButton"></path>
-							<path d="M53168.0 3866.5 L53417.0 3866.5" fill="none" data-name="DismissButton"></path>
+					<g data-name="InviteCodeRepositoryDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepositoryDelegate">
+							<rect x="83672.3" y="2518.5" height="213.0" width="299.0" data-name="InviteCodeRepositoryDelegate"></rect>
+							<path d="M83672.3 2549.5 L83971.3 2549.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
+							<path d="M83672.3 2610.5 L83971.3 2610.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(53168, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DismissButton">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="DismissButton">DismissButton</text>
+						<g transform="translate(83672.25, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepositoryDelegate">
+								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepositoryDelegate">InviteCodeRepositoryDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53168, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+onPressed: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DismissButton">+text: String?</text>
+						<g transform="translate(83672.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+apiClient: StudyUApi</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+studyRepository: IStudyRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53168, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+Widget build()</text>
+						<g transform="translate(83672.25, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetch()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetchAll()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic save()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic delete()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic onError()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createDuplicate()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createNewInstance()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormScaffold">
-							<rect x="54568.0" y="2556.5" height="137.0" width="212.0" data-name="FormScaffold"></rect>
-							<path d="M54568.0 2587.5 L54780.0 2587.5" fill="none" data-name="FormScaffold"></path>
+					<g data-name="IModelRepositoryDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepositoryDelegate">
+							<rect x="83804.0" y="1621.5" height="152.0" width="225.0" data-name="IModelRepositoryDelegate"></rect>
+							<path d="M83804.0 1652.5 L84029.0 1652.5" fill="none" data-name="IModelRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(54568, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormScaffold">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormScaffold">FormScaffold</text>
+						<g transform="translate(83804, 1621.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepositoryDelegate">
+								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepositoryDelegate">IModelRepositoryDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54568, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormScaffold">+formViewModel: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormScaffold">+actions: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormScaffold">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormScaffold">+actionsPadding: double</text>
+						<g transform="translate(83804, 1652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetchAll()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetch()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic save()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic delete()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepositoryDelegate">+T createNewInstance()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepositoryDelegate">+T createDuplicate()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic onError()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AsyncValueWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValueWidget">
-							<rect x="55205.0" y="2526.0" height="198.0" width="384.0" data-name="AsyncValueWidget"></rect>
-							<path d="M55205.0 2557.0 L55589.0 2557.0" fill="none" data-name="AsyncValueWidget"></path>
-							<path d="M55205.0 2648.0 L55589.0 2648.0" fill="none" data-name="AsyncValueWidget"></path>
+					<g data-name="StudyRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepository">
+							<rect x="72569.0" y="3752.0" height="183.0" width="403.0" data-name="StudyRepository"></rect>
+							<path d="M72569.0 3783.0 L72972.0 3783.0" fill="none" data-name="StudyRepository"></path>
+							<path d="M72569.0 3859.0 L72972.0 3859.0" fill="none" data-name="StudyRepository"></path>
 						</g>
-						<g transform="translate(55205, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValueWidget">
-								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValueWidget">AsyncValueWidget</text>
+						<g transform="translate(72569, 3752)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepository">
+								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepository">StudyRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55205, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+value: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">+data: Widget Function(T)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">+error: Widget Function(Object, StackTrace?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">+loading: Widget Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AsyncValueWidget">+empty: Widget Function()?</text>
+						<g transform="translate(72569, 3783)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+apiClient: StudyUApi</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+sortCallback: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55205, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">-Widget _buildDataOrEmptyWidget()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultLoad()</text>
+						<g transform="translate(72569, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+String getKey()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+dynamic deleteParticipants()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+dynamic launch()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(Object, StackTrace?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Object, StackTrace?)?">
-							<rect x="56189.5" y="3485.0" height="31.0" width="326.0" data-name="Widget Function(Object, StackTrace?)?"></rect>
+					<g data-name="StudyRepositoryDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepositoryDelegate">
+							<rect x="83870.3" y="3744.5" height="198.0" width="282.0" data-name="StudyRepositoryDelegate"></rect>
+							<path d="M83870.3 3775.5 L84152.3 3775.5" fill="none" data-name="StudyRepositoryDelegate"></path>
+							<path d="M83870.3 3821.5 L84152.3 3821.5" fill="none" data-name="StudyRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(56189.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Object, StackTrace?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Object, StackTrace?)?">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Object, StackTrace?)?">Widget Function(Object, StackTrace?)?</text>
+						<g transform="translate(83870.25, 3744.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepositoryDelegate">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepositoryDelegate">StudyRepositoryDelegate</text>
+								
+							</g>
+						</g>
+						<g transform="translate(83870.25, 3775.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+apiClient: StudyUApi</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+authRepository: IAuthRepository</text>
+								
+							</g>
+						</g>
+						<g transform="translate(83870.25, 3821.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetchAll()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetch()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic save()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic delete()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic onError()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createNewInstance()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function()?">
-							<rect x="56555.5" y="3485.0" height="31.0" width="166.0" data-name="Widget Function()?"></rect>
+					<g data-name="APIException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="APIException">
+							<rect x="76216.8" y="614.0" height="31.0" width="121.0" data-name="APIException"></rect>
 						</g>
-						<g transform="translate(56555.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function()?">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function()?">Widget Function()?</text>
+						<g transform="translate(76216.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="APIException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="APIException">
+								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="APIException">APIException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ResultTypes">
-							<rect x="77966.0" y="121.0" height="31.0" width="114.0" data-name="ResultTypes"></rect>
+					<g data-name="StudyNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotFoundException">
+							<rect x="73878.5" y="1197.0" height="31.0" width="216.0" data-name="StudyNotFoundException"></rect>
 						</g>
-						<g transform="translate(77966, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ResultTypes">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ResultTypes">ResultTypes</text>
+						<g transform="translate(73878.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotFoundException">
+								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotFoundException">StudyNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementResultTypes">
-							<rect x="77487.8" y="591.0" height="77.0" width="252.0" data-name="MeasurementResultTypes"></rect>
-							<path d="M77487.8 622.0 L77739.8 622.0" fill="none" data-name="MeasurementResultTypes"></path>
+					<g data-name="MeasurementNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementNotFoundException">
+							<rect x="74134.5" y="1197.0" height="31.0" width="279.0" data-name="MeasurementNotFoundException"></rect>
 						</g>
-						<g transform="translate(77487.75, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementResultTypes">
-								<text x="118.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementResultTypes">MeasurementResultTypes</text>
+						<g transform="translate(74134.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementNotFoundException">
+								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementNotFoundException">MeasurementNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77487.75, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementResultTypes">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+questionnaire: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
+					</g>
+					<g data-name="QuestionNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionNotFoundException">
+							<rect x="74453.5" y="1197.0" height="31.0" width="242.0" data-name="QuestionNotFoundException"></rect>
+						</g>
+						<g transform="translate(74453.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionNotFoundException">
+								<text x="113.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionNotFoundException">QuestionNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionResultTypes">
-							<rect x="78039.0" y="591.0" height="77.0" width="268.0" data-name="InterventionResultTypes"></rect>
-							<path d="M78039.0 622.0 L78307.0 622.0" fill="none" data-name="InterventionResultTypes"></path>
+					<g data-name="ConsentItemNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemNotFoundException">
+							<rect x="74735.5" y="1197.0" height="31.0" width="271.0" data-name="ConsentItemNotFoundException"></rect>
 						</g>
-						<g transform="translate(78039, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionResultTypes">
-								<text x="126.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionResultTypes">InterventionResultTypes</text>
+						<g transform="translate(74735.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemNotFoundException">
+								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemNotFoundException">ConsentItemNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78039, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResultTypes">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+checkmarkTask: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
+					</g>
+					<g data-name="InterventionNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionNotFoundException">
+							<rect x="75046.5" y="1197.0" height="31.0" width="265.0" data-name="InterventionNotFoundException"></rect>
+						</g>
+						<g transform="translate(75046.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionNotFoundException">
+								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionNotFoundException">InterventionNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyExportData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyExportData">
-							<rect x="55629.0" y="2564.0" height="122.0" width="414.0" data-name="StudyExportData"></rect>
-							<path d="M55629.0 2595.0 L56043.0 2595.0" fill="none" data-name="StudyExportData"></path>
+					<g data-name="InterventionTaskNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskNotFoundException">
+							<rect x="76042.5" y="1197.0" height="31.0" width="303.0" data-name="InterventionTaskNotFoundException"></rect>
 						</g>
-						<g transform="translate(55629, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyExportData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyExportData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyExportData">StudyExportData</text>
+						<g transform="translate(76042.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskNotFoundException">
+								<text x="143.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskNotFoundException">InterventionTaskNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55629, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyExportData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyExportData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyExportData">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyExportData">+measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyExportData">+interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyExportData">+mediaData: List&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyExportData">+isEmpty: bool</text>
+					</g>
+					<g data-name="ReportNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportNotFoundException">
+							<rect x="76385.5" y="1197.0" height="31.0" width="224.0" data-name="ReportNotFoundException"></rect>
+						</g>
+						<g transform="translate(76385.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportNotFoundException">
+								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportNotFoundException">ReportNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTemplates">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTemplates">
-							<rect x="78717.0" y="90.0" height="93.0" width="307.0" data-name="StudyTemplates"></rect>
-							<path d="M78717.0 121.0 L79024.0 121.0" fill="none" data-name="StudyTemplates"></path>
-							<path d="M78717.0 152.0 L79024.0 152.0" fill="none" data-name="StudyTemplates"></path>
+					<g data-name="ReportSectionNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionNotFoundException">
+							<rect x="76649.5" y="1197.0" height="31.0" width="283.0" data-name="ReportSectionNotFoundException"></rect>
 						</g>
-						<g transform="translate(78717, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTemplates">
-								<text x="145.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTemplates">StudyTemplates</text>
+						<g transform="translate(76649.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionNotFoundException">
+								<text x="133.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionNotFoundException">ReportSectionNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78717, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+kUnnamedStudyTitle: String</text>
-								
-							</g>
+					</g>
+					<g data-name="StudyInviteNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInviteNotFoundException">
+							<rect x="76972.5" y="1197.0" height="31.0" width="259.0" data-name="StudyInviteNotFoundException"></rect>
 						</g>
-						<g transform="translate(78717, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+Study emptyDraft()</text>
+						<g transform="translate(76972.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInviteNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInviteNotFoundException">
+								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInviteNotFoundException">StudyInviteNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyActionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyActionType">
-							<rect x="2095.0" y="3402.0" height="197.0" width="358.0" data-name="StudyActionType"></rect>
-							<path d="M2095.0 3433.0 L2453.0 3433.0" fill="none" data-name="StudyActionType"></path>
+					<g data-name="UserNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UserNotFoundException">
+							<rect x="77271.5" y="1197.0" height="31.0" width="208.0" data-name="UserNotFoundException"></rect>
 						</g>
-						<g transform="translate(2095, 3402)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyActionType">
-								<text x="171.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyActionType">StudyActionType</text>
+						<g transform="translate(77271.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserNotFoundException">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserNotFoundException">UserNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2095, 3433)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyActionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyActionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+values: List&lt;StudyActionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pin: StudyActionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pinoff: StudyActionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+edit: StudyActionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicate: StudyActionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicateDraft: StudyActionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+addCollaborator: StudyActionType</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+export: StudyActionType</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+delete: StudyActionType</text>
+					</g>
+					<g data-name="StudyUApiClient">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApiClient">
+							<rect x="76925.3" y="4288.0" height="333.0" width="479.0" data-name="StudyUApiClient"></rect>
+							<path d="M76925.3 4319.0 L77404.3 4319.0" fill="none" data-name="StudyUApiClient"></path>
+							<path d="M76925.3 4395.0 L77404.3 4395.0" fill="none" data-name="StudyUApiClient"></path>
+						</g>
+						<g transform="translate(76925.25, 4288)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUApiClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApiClient">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApiClient">StudyUApiClient</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="DropdownMenuItemTheme">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DropdownMenuItemTheme">
-							<rect x="73794.3" y="598.5" height="62.0" width="258.0" data-name="DropdownMenuItemTheme"></rect>
-							<path d="M73794.3 629.5 L74052.3 629.5" fill="none" data-name="DropdownMenuItemTheme"></path>
-						</g>
-						<g transform="translate(73794.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DropdownMenuItemTheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DropdownMenuItemTheme">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="DropdownMenuItemTheme">DropdownMenuItemTheme</text>
+						<g transform="translate(76925.25, 4319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+supabaseClient: SupabaseClient</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyColumns: List&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+testDelayMilliseconds: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73794.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DropdownMenuItemTheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DropdownMenuItemTheme">
-								<text x="0.0" y="13.5" stroke="none" data-name="DropdownMenuItemTheme">+iconTheme: IconThemeData?</text>
+						<g transform="translate(76925.25, 4395)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteParticipants()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">+dynamic getUserStudies()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudy()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudy()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudyInvite()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudyInvite()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudyInvite()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchAppConfig()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchUser()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApiClient">+dynamic saveUser()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyUApiClient">-dynamic _awaitGuarded()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyUApiClient">-dynamic _apiException()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyUApiClient">-dynamic _testDelay()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconThemeData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconThemeData">
-							<rect x="73852.8" y="1197.0" height="31.0" width="141.0" data-name="IconThemeData"></rect>
+					<g data-name="SupabaseClient">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClient">
+							<rect x="76840.8" y="4661.0" height="31.0" width="141.0" data-name="SupabaseClient"></rect>
 						</g>
-						<g transform="translate(73852.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconThemeData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconThemeData">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconThemeData">IconThemeData</text>
+						<g transform="translate(76840.75, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClient">
+								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClient">SupabaseClient</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Diagnosticable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Diagnosticable">
-							<rect x="73856.8" y="121.0" height="31.0" width="133.0" data-name="Diagnosticable"></rect>
+					<g data-name="SupabaseClientDependant">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClientDependant">
+							<rect x="76540.3" y="4103.0" height="62.0" width="284.0" data-name="SupabaseClientDependant"></rect>
+							<path d="M76540.3 4134.0 L76824.3 4134.0" fill="none" data-name="SupabaseClientDependant"></path>
 						</g>
-						<g transform="translate(73856.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Diagnosticable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Diagnosticable">
-								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="Diagnosticable">Diagnosticable</text>
+						<g transform="translate(76540.25, 4103)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseClientDependant">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClientDependant">
+								<text x="134.0" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClientDependant">SupabaseClientDependant</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ThemeConfig">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeConfig">
-							<rect x="79399.5" y="0.0" height="273.0" width="543.0" data-name="ThemeConfig"></rect>
-							<path d="M79399.5 31.0 L79942.5 31.0" fill="none" data-name="ThemeConfig"></path>
-							<path d="M79399.5 107.0 L79942.5 107.0" fill="none" data-name="ThemeConfig"></path>
-						</g>
-						<g transform="translate(79399.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeConfig">
-								<text x="263.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeConfig">ThemeConfig</text>
+						<g transform="translate(76540.25, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseClientDependant">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseClientDependant">
+								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseClientDependant">+supabaseClient: SupabaseClient</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79399.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMinContentWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMaxContentWidth: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kHoverFadeFactor: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMuteFadeFactor: double</text>
+					</g>
+					<g data-name="SupabaseQueryMixin">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryMixin">
+							<rect x="76879.3" y="4065.5" height="137.0" width="215.0" data-name="SupabaseQueryMixin"></rect>
+							<path d="M76879.3 4096.5 L77094.3 4096.5" fill="none" data-name="SupabaseQueryMixin"></path>
+						</g>
+						<g transform="translate(76879.25, 4065.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseQueryMixin">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryMixin">
+								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryMixin">SupabaseQueryMixin</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79399.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+dynamic bodyBackgroundColor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color modalBarrierColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color containerColor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color colorPickerInitialColor()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextMuted()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextBackground()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+double iconSplashRadius()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color sidesheetBackgroundColor()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()</text>
+						<g transform="translate(76879.25, 4096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryMixin">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryMixin">
+								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic deleteAll()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getAll()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getById()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getByColumn()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseQueryMixin">+List&lt;T&gt; deserializeList()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SupabaseQueryMixin">+T deserializeObject()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NoAnimationPageTransitionsBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NoAnimationPageTransitionsBuilder">
-							<rect x="78960.0" y="598.5" height="62.0" width="299.0" data-name="NoAnimationPageTransitionsBuilder"></rect>
-							<path d="M78960.0 629.5 L79259.0 629.5" fill="none" data-name="NoAnimationPageTransitionsBuilder"></path>
+					<g data-name="IAppRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAppRepository">
+							<rect x="59684.3" y="3462.0" height="77.0" width="230.0" data-name="IAppRepository"></rect>
+							<path d="M59684.3 3493.0 L59914.3 3493.0" fill="none" data-name="IAppRepository"></path>
 						</g>
-						<g transform="translate(78960, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NoAnimationPageTransitionsBuilder">
-								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="NoAnimationPageTransitionsBuilder">NoAnimationPageTransitionsBuilder</text>
+						<g transform="translate(59684.25, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppRepository">
+								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAppRepository">IAppRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78960, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NoAnimationPageTransitionsBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="NoAnimationPageTransitionsBuilder">+Widget buildTransitions()</text>
+						<g transform="translate(59684.25, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAppRepository">+dynamic fetchAppConfig()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IAppRepository">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PageTransitionsBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsBuilder">
-							<rect x="79160.5" y="121.0" height="31.0" width="199.0" data-name="PageTransitionsBuilder"></rect>
+					<g data-name="AppRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppRepository">
+							<rect x="59684.3" y="3789.5" height="108.0" width="230.0" data-name="AppRepository"></rect>
+							<path d="M59684.3 3820.5 L59914.3 3820.5" fill="none" data-name="AppRepository"></path>
+							<path d="M59684.3 3851.5 L59914.3 3851.5" fill="none" data-name="AppRepository"></path>
 						</g>
-						<g transform="translate(79160.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PageTransitionsBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsBuilder">
-								<text x="91.5" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsBuilder">PageTransitionsBuilder</text>
+						<g transform="translate(59684.25, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppRepository">
+								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppRepository">AppRepository</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="WebTransitionBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebTransitionBuilder">
-							<rect x="79434.0" y="598.5" height="62.0" width="223.0" data-name="WebTransitionBuilder"></rect>
-							<path d="M79434.0 629.5 L79657.0 629.5" fill="none" data-name="WebTransitionBuilder"></path>
-						</g>
-						<g transform="translate(79434, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebTransitionBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebTransitionBuilder">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebTransitionBuilder">WebTransitionBuilder</text>
+						<g transform="translate(59684.25, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+apiClient: StudyUApi</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79434, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebTransitionBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebTransitionBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebTransitionBuilder">+Widget buildTransitions()</text>
+						<g transform="translate(59684.25, 3851.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+dynamic fetchAppConfig()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppRepository">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ThemeSettingChange">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettingChange">
-							<rect x="67118.0" y="1666.5" height="62.0" width="216.0" data-name="ThemeSettingChange"></rect>
-							<path d="M67118.0 1697.5 L67334.0 1697.5" fill="none" data-name="ThemeSettingChange"></path>
-						</g>
-						<g transform="translate(67118, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettingChange">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettingChange">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettingChange">ThemeSettingChange</text>
-								
-							</g>
+					<g data-name="StudyUUser">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUUser">
+							<rect x="76390.3" y="4118.5" height="31.0" width="110.0" data-name="StudyUUser"></rect>
 						</g>
-						<g transform="translate(67118, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettingChange">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettingChange">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettingChange">+settings: ThemeSettings</text>
+						<g transform="translate(76390.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUUser">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUUser">
+								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUUser">StudyUUser</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ThemeSettings">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettings">
-							<rect x="67112.5" y="2586.5" height="77.0" width="227.0" data-name="ThemeSettings"></rect>
-							<path d="M67112.5 2617.5 L67339.5 2617.5" fill="none" data-name="ThemeSettings"></path>
+					<g data-name="UserRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UserRepository">
+							<rect x="70645.8" y="3759.5" height="168.0" width="282.0" data-name="UserRepository"></rect>
+							<path d="M70645.8 3790.5 L70927.8 3790.5" fill="none" data-name="UserRepository"></path>
+							<path d="M70645.8 3866.5 L70927.8 3866.5" fill="none" data-name="UserRepository"></path>
 						</g>
-						<g transform="translate(67112.5, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettings">
-								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettings">ThemeSettings</text>
+						<g transform="translate(70645.75, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserRepository">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserRepository">UserRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67112.5, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettings">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettings">+sourceColor: Color</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeSettings">+themeMode: ThemeMode</text>
+						<g transform="translate(70645.75, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+apiClient: StudyUApi</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+ref: Ref&lt;Object?&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="UserRepository">+user: StudyUUser</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Notification">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Notification">
-							<rect x="67174.0" y="1197.0" height="31.0" width="104.0" data-name="Notification"></rect>
-						</g>
-						<g transform="translate(67174, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Notification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notification">
-								<text x="44.0" y="13.5" stroke="none" text-anchor="middle" data-name="Notification">Notification</text>
+						<g transform="translate(70645.75, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+dynamic fetchUser()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+dynamic saveUser()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+dynamic updatePreferences()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ThemeProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeProvider">
-							<rect x="78347.0" y="358.0" height="543.0" width="519.0" data-name="ThemeProvider"></rect>
-							<path d="M78347.0 389.0 L78866.0 389.0" fill="none" data-name="ThemeProvider"></path>
-							<path d="M78347.0 480.0 L78866.0 480.0" fill="none" data-name="ThemeProvider"></path>
+					<g data-name="Ref">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Ref">
+							<rect x="77134.3" y="4118.5" height="31.0" width="43.0" data-name="Ref"></rect>
 						</g>
-						<g transform="translate(78347, 358)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeProvider">
-								<text x="251.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeProvider">ThemeProvider</text>
+						<g transform="translate(77134.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Ref">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Ref">
+								<text x="13.5" y="13.5" stroke="none" text-anchor="middle" data-name="Ref">Ref</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78347, 389)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+settings: ValueNotifier&lt;ThemeSettings&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+lightDynamic: ColorScheme?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+darkDynamic: ColorScheme?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+pageTransitionsTheme: PageTransitionsTheme</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+shapeMedium: ShapeBorder</text>
+					</g>
+					<g data-name="PreferenceAction">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PreferenceAction">
+							<rect x="2929.0" y="3447.0" height="107.0" width="334.0" data-name="PreferenceAction"></rect>
+							<path d="M2929.0 3478.0 L3263.0 3478.0" fill="none" data-name="PreferenceAction"></path>
+						</g>
+						<g transform="translate(2929, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreferenceAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreferenceAction">
+								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="PreferenceAction">PreferenceAction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78347, 480)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+Color custom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+Color blend()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+Color source()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+ColorScheme colors()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+CardTheme cardTheme()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ThemeProvider">+ListTileThemeData listTileTheme()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ThemeProvider">+AppBarTheme appBarTheme()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ThemeProvider">+SnackBarThemeData snackBarThemeData()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ThemeProvider">+TabBarTheme tabBarTheme()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ThemeProvider">+BottomAppBarTheme bottomAppBarTheme()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ThemeProvider">+BottomNavigationBarThemeData bottomNavigationBarTheme()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ThemeProvider">+SwitchThemeData switchTheme()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ThemeProvider">+InputDecorationTheme inputDecorationTheme()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ThemeProvider">+TextTheme textTheme()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ThemeProvider">+DividerThemeData dividerTheme()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ThemeProvider">+NavigationRailThemeData navigationRailTheme()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ThemeProvider">+DrawerThemeData drawerTheme()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ThemeProvider">+IconThemeData iconTheme()</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ThemeProvider">+CheckboxThemeData checkboxTheme()</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ThemeProvider">+RadioThemeData radioTheme()</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ThemeProvider">+TooltipThemeData tooltipTheme()</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ThemeProvider">+ThemeData light()</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ThemeProvider">+ThemeData dark()</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ThemeProvider">+ThemeMode themeMode()</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ThemeProvider">+ThemeData theme()</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ThemeProvider">&lt;static&gt;+ThemeProvider of()</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ThemeProvider">+bool updateShouldNotify()</text>
+						<g transform="translate(2929, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreferenceAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreferenceAction">
+								<text x="0.0" y="13.5" stroke="none" data-name="PreferenceAction">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+values: List&lt;PreferenceAction&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pin: PreferenceAction</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pinOff: PreferenceAction</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ValueNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ValueNotifier">
-							<rect x="76212.3" y="1197.0" height="31.0" width="117.0" data-name="ValueNotifier"></rect>
+					<g data-name="User">
+						<g fill="#eee8d5" stroke="#33322E" data-name="User">
+							<rect x="73039.8" y="4661.0" height="31.0" width="53.0" data-name="User"></rect>
 						</g>
-						<g transform="translate(76212.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueNotifier">
-								<text x="50.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueNotifier">ValueNotifier</text>
+						<g transform="translate(73039.75, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="User">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="User">
+								<text x="18.5" y="13.5" stroke="none" text-anchor="middle" data-name="User">User</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ColorScheme">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ColorScheme">
-							<rect x="76369.3" y="1197.0" height="31.0" width="122.0" data-name="ColorScheme"></rect>
+					<g data-name="Session">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Session">
+							<rect x="76321.0" y="4661.0" height="31.0" width="79.0" data-name="Session"></rect>
 						</g>
-						<g transform="translate(76369.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ColorScheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ColorScheme">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="ColorScheme">ColorScheme</text>
+						<g transform="translate(76321, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Session">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Session">
+								<text x="31.5" y="13.5" stroke="none" text-anchor="middle" data-name="Session">Session</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PageTransitionsTheme">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsTheme">
-							<rect x="79276.8" y="1197.0" height="31.0" width="198.0" data-name="PageTransitionsTheme"></rect>
+					<g data-name="AuthRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthRepository">
+							<rect x="76315.0" y="4310.5" height="288.0" width="295.0" data-name="AuthRepository"></rect>
+							<path d="M76315.0 4341.5 L76610.0 4341.5" fill="none" data-name="AuthRepository"></path>
+							<path d="M76315.0 4462.5 L76610.0 4462.5" fill="none" data-name="AuthRepository"></path>
 						</g>
-						<g transform="translate(79276.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PageTransitionsTheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsTheme">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsTheme">PageTransitionsTheme</text>
+						<g transform="translate(76315, 4310.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthRepository">
+								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthRepository">AuthRepository</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ShapeBorder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ShapeBorder">
-							<rect x="79514.8" y="1197.0" height="31.0" width="120.0" data-name="ShapeBorder"></rect>
-						</g>
-						<g transform="translate(79514.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ShapeBorder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ShapeBorder">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="ShapeBorder">ShapeBorder</text>
+						<g transform="translate(76315, 4341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">+supabaseClient: SupabaseClient</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+allowPasswordReset: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+authClient: GoTrueClient</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+session: Session?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+serializedSession: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+currentUser: User?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+isLoggedIn: bool</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InheritedWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InheritedWidget">
-							<rect x="78536.0" y="121.0" height="31.0" width="141.0" data-name="InheritedWidget"></rect>
-						</g>
-						<g transform="translate(78536, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="InheritedWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InheritedWidget">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="InheritedWidget">InheritedWidget</text>
+						<g transform="translate(76315, 4462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">-void _registerAuthListener()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+dynamic signUp()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+dynamic signInWith()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+dynamic signOut()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+dynamic resetPasswordForEmail()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+dynamic updateUser()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+void dispose()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthRepository">+dynamic onAppStart()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ThemeMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeMode">
-							<rect x="67265.8" y="3485.0" height="31.0" width="114.0" data-name="ThemeMode"></rect>
+					<g data-name="GoTrueClient">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoTrueClient">
+							<rect x="76440.0" y="4661.0" height="31.0" width="120.0" data-name="GoTrueClient"></rect>
 						</g>
-						<g transform="translate(67265.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeMode">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeMode">ThemeMode</text>
+						<g transform="translate(76440, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoTrueClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoTrueClient">
+								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoTrueClient">GoTrueClient</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CustomColor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomColor">
-							<rect x="56467.0" y="2563.5" height="123.0" width="128.0" data-name="CustomColor"></rect>
-							<path d="M56467.0 2594.5 L56595.0 2594.5" fill="none" data-name="CustomColor"></path>
-							<path d="M56467.0 2655.5 L56595.0 2655.5" fill="none" data-name="CustomColor"></path>
+					<g data-name="StudyLaunched">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyLaunched">
+							<rect x="79535.8" y="614.0" height="31.0" width="140.0" data-name="StudyLaunched"></rect>
 						</g>
-						<g transform="translate(56467, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomColor">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomColor">CustomColor</text>
+						<g transform="translate(79535.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyLaunched">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyLaunched">
+								<text x="62.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyLaunched">StudyLaunched</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56467, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomColor">+color: Color</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomColor">+blend: bool</text>
+					</g>
+					<g data-name="ModelEvent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelEvent">
+							<rect x="79943.0" y="98.0" height="77.0" width="145.0" data-name="ModelEvent"></rect>
+							<path d="M79943.0 129.0 L80088.0 129.0" fill="none" data-name="ModelEvent"></path>
+						</g>
+						<g transform="translate(79943, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelEvent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelEvent">
+								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelEvent">ModelEvent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56467, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+Color value()</text>
+						<g transform="translate(79943, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelEvent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelEvent">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelEvent">+modelId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelEvent">+model: T</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LanguagePicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePicker">
-							<rect x="56635.0" y="2579.0" height="92.0" width="366.0" data-name="LanguagePicker"></rect>
-							<path d="M56635.0 2610.0 L57001.0 2610.0" fill="none" data-name="LanguagePicker"></path>
+					<g data-name="SupabaseQueryError">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryError">
+							<rect x="77384.3" y="583.5" height="92.0" width="183.0" data-name="SupabaseQueryError"></rect>
+							<path d="M77384.3 614.5 L77567.3 614.5" fill="none" data-name="SupabaseQueryError"></path>
 						</g>
-						<g transform="translate(56635, 2579)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePicker">
-								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePicker">LanguagePicker</text>
+						<g transform="translate(77384.25, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseQueryError">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryError">
+								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryError">SupabaseQueryError</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56635, 2610)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePicker">+languagePickerType: LanguagePickerType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePicker">+iconColor: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePicker">+offset: Offset?</text>
+						<g transform="translate(77384.25, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryError">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryError">
+								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryError">+statusCode: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryError">+message: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryError">+details: dynamic</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LanguagePickerType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePickerType">
-							<rect x="37815.0" y="3447.0" height="107.0" width="366.0" data-name="LanguagePickerType"></rect>
-							<path d="M37815.0 3478.0 L38181.0 3478.0" fill="none" data-name="LanguagePickerType"></path>
+					<g data-name="WrappedModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WrappedModel">
+							<rect x="61452.3" y="2496.0" height="258.0" width="251.0" data-name="WrappedModel"></rect>
+							<path d="M61452.3 2527.0 L61703.3 2527.0" fill="none" data-name="WrappedModel"></path>
+							<path d="M61452.3 2678.0 L61703.3 2678.0" fill="none" data-name="WrappedModel"></path>
 						</g>
-						<g transform="translate(37815, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePickerType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePickerType">
-								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePickerType">LanguagePickerType</text>
+						<g transform="translate(61452.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WrappedModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WrappedModel">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="WrappedModel">WrappedModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37815, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePickerType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePickerType">
-								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePickerType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+values: List&lt;LanguagePickerType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+field: LanguagePickerType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+icon: LanguagePickerType</text>
+						<g transform="translate(61452.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">-_model: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+asyncValue: AsyncValue&lt;T&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+isLocalOnly: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+isDirty: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WrappedModel">+isDeleted: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WrappedModel">+lastSaved: DateTime?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WrappedModel">+lastFetched: DateTime?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WrappedModel">+lastUpdated: DateTime?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="WrappedModel">+model: T</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Offset">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Offset">
-							<rect x="57404.8" y="3485.0" height="31.0" width="63.0" data-name="Offset"></rect>
-						</g>
-						<g transform="translate(57404.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Offset">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Offset">
-								<text x="23.5" y="13.5" stroke="none" text-anchor="middle" data-name="Offset">Offset</text>
+						<g transform="translate(61452.25, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">+dynamic markWithError()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+dynamic markAsLoading()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+dynamic markAsFetched()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+dynamic markAsSaved()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformLocaleMobile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleMobile">
-							<rect x="79697.0" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleMobile"></rect>
-							<path d="M79697.0 629.5 L79936.0 629.5" fill="none" data-name="PlatformLocaleMobile"></path>
+					<g data-name="ModelRepositoryException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepositoryException">
+							<rect x="77607.3" y="614.0" height="31.0" width="227.0" data-name="ModelRepositoryException"></rect>
 						</g>
-						<g transform="translate(79697, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleMobile">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleMobile">PlatformLocaleMobile</text>
+						<g transform="translate(77607.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelRepositoryException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepositoryException">
+								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepositoryException">ModelRepositoryException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79697, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleMobile">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleMobile">+Locale getPlatformLocale()</text>
+					</g>
+					<g data-name="ModelNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelNotFoundException">
+							<rect x="77611.3" y="1197.0" height="31.0" width="219.0" data-name="ModelNotFoundException"></rect>
+						</g>
+						<g transform="translate(77611.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelNotFoundException">
+								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelNotFoundException">ModelNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformLocale">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocale">
-							<rect x="79982.5" y="105.5" height="62.0" width="239.0" data-name="PlatformLocale"></rect>
-							<path d="M79982.5 136.5 L80221.5 136.5" fill="none" data-name="PlatformLocale"></path>
+					<g data-name="IModelRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepository">
+							<rect x="83701.3" y="501.0" height="257.0" width="382.0" data-name="IModelRepository"></rect>
+							<path d="M83701.3 532.0 L84083.3 532.0" fill="none" data-name="IModelRepository"></path>
 						</g>
-						<g transform="translate(79982.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocale">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocale">PlatformLocale</text>
+						<g transform="translate(83701.25, 501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepository">
+								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepository">IModelRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79982.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocale">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocale">+Locale getPlatformLocale()</text>
+						<g transform="translate(83701.25, 532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepository">+String getKey()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepository">+WrappedModel&lt;T&gt;? get()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepository">+dynamic fetchAll()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepository">+dynamic fetch()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepository">+dynamic save()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepository">+dynamic delete()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSave()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="IModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="IModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="IModelRepository">+dynamic ensurePersisted()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="IModelRepository">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformLocaleWeb">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleWeb">
-							<rect x="80122.0" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleWeb"></rect>
-							<path d="M80122.0 629.5 L80361.0 629.5" fill="none" data-name="PlatformLocaleWeb"></path>
+					<g data-name="IsFetched">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsFetched">
+							<rect x="79715.8" y="614.0" height="31.0" width="94.0" data-name="IsFetched"></rect>
 						</g>
-						<g transform="translate(80122, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleWeb">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleWeb">PlatformLocaleWeb</text>
+						<g transform="translate(79715.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsFetched">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsFetched">
+								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsFetched">IsFetched</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80122, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleWeb">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleWeb">+Locale getPlatformLocale()</text>
+					</g>
+					<g data-name="IsSaving">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaving">
+							<rect x="79849.8" y="614.0" height="31.0" width="84.0" data-name="IsSaving"></rect>
+						</g>
+						<g transform="translate(79849.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaving">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaving">
+								<text x="34.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaving">IsSaving</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppTranslation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppTranslation">
-							<rect x="83939.8" y="105.5" height="62.0" width="194.0" data-name="AppTranslation"></rect>
-							<path d="M83939.8 136.5 L84133.8 136.5" fill="none" data-name="AppTranslation"></path>
+					<g data-name="IsSaved">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaved">
+							<rect x="80646.0" y="614.0" height="31.0" width="80.0" data-name="IsSaved"></rect>
 						</g>
-						<g transform="translate(83939.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppTranslation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppTranslation">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppTranslation">AppTranslation</text>
+						<g transform="translate(80646, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaved">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaved">
+								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaved">IsSaved</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83939.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppTranslation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppTranslation">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppTranslation">&lt;static&gt;+dynamic init()</text>
+					</g>
+					<g data-name="IsDeleted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsDeleted">
+							<rect x="80766.0" y="614.0" height="31.0" width="91.0" data-name="IsDeleted"></rect>
+						</g>
+						<g transform="translate(80766, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsDeleted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsDeleted">
+								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="IsDeleted">IsDeleted</text>
 								
 							</g>
 						</g>

From 43671cb53100d3602304d6fb94288fa4f2c3755f Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 26 Apr 2024 10:40:10 +0200
Subject: [PATCH 016/314] chore: upgrade deps

---
 app/pubspec.lock            | 16 ++++++++--------
 designer_v2/pubspec.lock    | 12 ++++++------
 designer_v2/pubspec.yaml    |  2 +-
 flutter_common/pubspec.lock |  4 ++--
 pubspec.lock                |  4 ++--
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index 7d2100ae0..cbad20ab3 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -109,10 +109,10 @@ packages:
     dependency: transitive
     description:
       name: camera_avfoundation
-      sha256: "9375082d2da45754277b5ae6ff2560cfecb799a4991aa9a3a2ee8e56d2bb0561"
+      sha256: "7d021e8cd30d9b71b8b92b4ad669e80af432d722d18d6aac338572754a786c15"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.15+1"
+    version: "0.9.16"
   camera_platform_interface:
     dependency: transitive
     description:
@@ -298,10 +298,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_cache_manager
-      sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba"
+      sha256: "395d6b7831f21f3b989ebedbb785545932adb9afe2622c1ffacf7f4b53a7e544"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.1"
+    version: "3.3.2"
   flutter_dotenv:
     dependency: transitive
     description:
@@ -897,10 +897,10 @@ packages:
     dependency: transitive
     description:
       name: pointycastle
-      sha256: "70fe966348fe08c34bf929582f1d8247d9d9408130723206472b4687227e4333"
+      sha256: "79fbafed02cfdbe85ef3fd06c7f4bc2cbcba0177e61b765264853d4253b21744"
       url: "https://pub.dev"
     source: hosted
-    version: "3.8.0"
+    version: "3.9.0"
   postgrest:
     dependency: transitive
     description:
@@ -1500,10 +1500,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "0a989dc7ca2bb51eac91e8fd00851297cfffd641aa7538b165c62637ca0eaa4a"
+      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "5.5.0"
   xdg_directories:
     dependency: transitive
     description:
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index dedbea596..bb00fcb1a 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -387,10 +387,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: "28ef8a8320ab3bf5752424e6bca6961ce25108afc344f3127b5155caf7a792c8"
+      sha256: "466425a64508ca00983882f523400d9169365cb9b464e2e2419f3b6545ff9c51"
       url: "https://pub.dev"
     source: hosted
-    version: "14.0.0"
+    version: "14.0.1"
   gotrue:
     dependency: transitive
     description:
@@ -728,10 +728,10 @@ packages:
     dependency: transitive
     description:
       name: pointycastle
-      sha256: "70fe966348fe08c34bf929582f1d8247d9d9408130723206472b4687227e4333"
+      sha256: "79fbafed02cfdbe85ef3fd06c7f4bc2cbcba0177e61b765264853d4253b21744"
       url: "https://pub.dev"
     source: hosted
-    version: "3.8.0"
+    version: "3.9.0"
   pool:
     dependency: transitive
     description:
@@ -1259,10 +1259,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "0a989dc7ca2bb51eac91e8fd00851297cfffd641aa7538b165c62637ca0eaa4a"
+      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "5.5.0"
   xdg_directories:
     dependency: transitive
     description:
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index e4b28a826..378fa75a5 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -23,7 +23,7 @@ dependencies:
   flutter_riverpod: ^2.5.1
   flutter_web_plugins:
     sdk: flutter
-  go_router: ^14.0.0
+  go_router: ^14.0.1
   material_color_utilities:
   material_design_icons_flutter: ^7.0.7296
   pointer_interceptor: ^0.10.1
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index b663c054c..5521f4aa5 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -704,10 +704,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "0a989dc7ca2bb51eac91e8fd00851297cfffd641aa7538b165c62637ca0eaa4a"
+      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "5.5.0"
   xdg_directories:
     dependency: transitive
     description:
diff --git a/pubspec.lock b/pubspec.lock
index 1d4a296ac..7435a66c5 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -133,10 +133,10 @@ packages:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.9.0"
   lint:
     dependency: "direct dev"
     description:

From 1c9f062c5ea8ae08221c5e15da423c69cbbd46f0 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 19 Apr 2024 16:00:15 +0200
Subject: [PATCH 017/314] feat: sort invite codes alphabetically

---
 designer_v2/lib/features/recruit/study_recruit_controller.dart | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/designer_v2/lib/features/recruit/study_recruit_controller.dart b/designer_v2/lib/features/recruit/study_recruit_controller.dart
index 5b2797126..909024b0a 100644
--- a/designer_v2/lib/features/recruit/study_recruit_controller.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_controller.dart
@@ -36,6 +36,8 @@ class StudyRecruitController extends StudyBaseController<StudyRecruitControllerS
       print("StudyRecruitController.listenUpdate");
       // Update the controller's state when new invites are available in the repository
       final invites = wrappedModels.map((invite) => invite.model).toList();
+      // Sort invites alphabetically by code
+      invites.sort((a, b) => a.code.compareTo(b.code));
       state = state.copyWith(
         invites: AsyncValue.data(invites),
       );

From ffd36d31cb0f6af6415d617f56362556006163ee Mon Sep 17 00:00:00 2001
From: StudyU Documenter <studyu-documenter>
Date: Fri, 19 Apr 2024 14:05:53 +0000
Subject: [PATCH 018/314] docs: update UML documentation

---
 .../designer_v2/lib/features/recruit/uml.svg  |   450 +-
 docs/uml/designer_v2/lib/features/uml.svg     | 11136 ++++----
 docs/uml/designer_v2/lib/uml.svg              | 21652 ++++++++--------
 3 files changed, 16619 insertions(+), 16619 deletions(-)

diff --git a/docs/uml/designer_v2/lib/features/recruit/uml.svg b/docs/uml/designer_v2/lib/features/recruit/uml.svg
index b113e1780..cb4d698e7 100644
--- a/docs/uml/designer_v2/lib/features/recruit/uml.svg
+++ b/docs/uml/designer_v2/lib/features/recruit/uml.svg
@@ -1,36 +1,11 @@
-<svg version="1.1" baseProfile="full" width="2761.5" height="876.0" viewbox="0 0 2761.5 876" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[InviteCodeFormViewModel
+<svg version="1.1" baseProfile="full" width="2855.0" height="876.0" viewbox="0 0 2855 876" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[EnrolledBadge
 	  |
-	  +study: Study;
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  +codeControl: FormControl&lt;String&gt;;
-	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
-	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +interventionAControl: FormControl&lt;String&gt;;
-	  +interventionBControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
-	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +isPreconfiguredSchedule: bool;
-	  +preconfiguredSchedule: List&lt;String&gt;?
+	  +enrolledCount: int
 	  |
-	  +void initControls();
-	  -dynamic _uniqueInviteCode();
-	  +void regenerateCode();
-	  -String _generateCode();
-	  +StudyInvite buildFormData();
-	  +void setControlsFrom();
-	  +dynamic save()
+	  +Widget build()
 	]
 	
-	[InviteCodeFormViewModel]o-[Study]
-	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[InviteCodeFormViewModel]o-[FormControl]
-	[InviteCodeFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
-	
 	[StudyRecruitController
 	  |
 	  +inviteCodeRepository: IInviteCodeRepository;
@@ -49,13 +24,6 @@
 	[StudyBaseController]&lt;:-[StudyRecruitController]
 	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
 	
-	[EnrolledBadge
-	  |
-	  +enrolledCount: int
-	  |
-	  +Widget build()
-	]
-	
 	[StudyRecruitScreen
 	  |
 	  +Widget build();
@@ -95,189 +63,147 @@
 	[StudyInvitesTable]o-[Intervention? Function(String)]
 	[StudyInvitesTable]o-[int Function(StudyInvite)]
 	
+	[InviteCodeFormViewModel
+	  |
+	  +study: Study;
+	  +inviteCodeRepository: IInviteCodeRepository;
+	  +codeControl: FormControl&lt;String&gt;;
+	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
+	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
+	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
+	  +interventionAControl: FormControl&lt;String&gt;;
+	  +interventionBControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
+	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
+	  +isPreconfiguredSchedule: bool;
+	  +preconfiguredSchedule: List&lt;String&gt;?
+	  |
+	  +void initControls();
+	  -dynamic _uniqueInviteCode();
+	  +void regenerateCode();
+	  -String _generateCode();
+	  +StudyInvite buildFormData();
+	  +void setControlsFrom();
+	  +dynamic save()
+	]
+	
+	[InviteCodeFormViewModel]o-[Study]
+	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
+	[InviteCodeFormViewModel]o-[FormControl]
+	[InviteCodeFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
+	
 	</desc>
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="876.0" width="2761.5" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="876.0" width="2855.0" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M82.0 760.6 L71.5 769 L71.5 789 L71.5 789.0 " fill="none"></path>
+				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
+					<path d="M523.3 659.9 L739.25 769 L703.7570422535211 789 L703.8 789.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M92.6 759.0 L82.0 760.6 L85.9 750.7 L96.6 749.0 Z"></path>
+						<path d="M517.4 650.9 L523.3 659.9 L512.6 660.5 L506.6 651.5 Z"></path>
 					</g>
-					<path d="M178.4 763.9 L174.5 769 L209.99295774647888 789 L210.0 789.0 " fill="none"></path>
+					<path d="M268.5 668.0 L215.25 769 L215.25 789 L215.3 789.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M188.3 759.7 L178.4 763.9 L179.8 753.2 L189.7 749.0 Z"></path>
+						<path d="M277.6 662.2 L268.5 668.0 L268.2 657.3 L277.2 651.5 Z"></path>
 					</g>
-					<path d="M607.7 760.0 L620 769 L620 789 L620.0 789.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M603.3 750.2 L607.7 760.0 L597.0 758.8 L592.6 749.0 Z"></path>
+					<path d="M436.0 305.8 L436 351 L373.8767942583732 468.5 L373.9 468.5 " fill="none"></path>
+					<path d="M441.3 305.8 L436.0 305.8 L430.7 305.8 L436.0 292.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M215.0 305.8 L215 351 L277.1232057416268 468.5 L277.1 468.5 " fill="none"></path>
 					</g>
-					<path d="M683.8 728.1 L769 769 L769 789 L769.0 789.0 " fill="none"></path>
+					<path d="M220.3 305.8 L215.0 305.8 L209.7 305.8 L215.0 292.5 Z"></path>
+					<path d="M722.0 120.3 L722 203 L722 223.5 L722.0 223.5 " fill="none"></path>
+					<path d="M727.3 120.3 L722.0 120.3 L716.7 120.3 L722.0 107.0 Z"></path>
+					<path d="M2580.0 349.7 L2580 351 L2118.25 472.3527192706696 L2118.3 472.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M677.7 719.3 L683.8 728.1 L673.1 728.9 L667.0 720.0 Z"></path>
+						<path d="M2585.3 340.3 L2580.0 349.7 L2574.7 340.3 L2580.0 331.0 Z"></path>
 					</g>
-					<path d="M100.0 305.8 L100 351 L122.34449760765551 371 L122.3 371.0 " fill="none"></path>
-					<path d="M105.3 305.8 L100.0 305.8 L94.7 305.8 L100.0 292.5 Z"></path>
-					<path d="M846.3 657.3 L504 769 L333 791.7786116322702 L333.0 791.8 " fill="none"></path>
+					<path d="M2580.0 120.3 L2580 203 L2580 223 L2580.0 223.0 " fill="none"></path>
+					<path d="M2585.3 120.3 L2580.0 120.3 L2574.7 120.3 L2580.0 107.0 Z"></path>
+					<path d="M1458.5 152.7 L1211 203 L1211 261.5 L1211.0 261.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M856.9 659.5 L846.3 657.3 L853.6 649.3 L864.1 651.5 Z"></path>
+						<path d="M1468.7 156.1 L1458.5 152.7 L1466.5 145.6 L1476.8 149.0 Z"></path>
 					</g>
-					<path d="M1237.0 665.5 L1327.75 769 L1327.75 789 L1327.8 789.0 " fill="none"></path>
+					<path d="M1589.6 192.5 L1572 203 L1572 261.5 L1572.0 261.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1234.9 655.0 L1237.0 665.5 L1226.9 662.0 L1224.7 651.5 Z"></path>
-					</g>
-					<path d="M777.5 305.8 L777.5 351 L983.8277511961722 468.5 L983.8 468.5 " fill="none"></path>
-					<path d="M782.8 305.8 L777.5 305.8 L772.2 305.8 L777.5 292.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1352.5 305.8 L1352.5 351 L1235.5622009569379 468.5 L1235.6 468.5 " fill="none"></path>
+						<path d="M1600.4 192.4 L1589.6 192.5 L1594.9 183.2 L1605.7 183.0 Z"></path>
 					</g>
-					<path d="M1357.8 305.8 L1352.5 305.8 L1347.2 305.8 L1352.5 292.5 Z"></path>
-					<path d="M1063.5 120.3 L1063.5 203 L1063.5 223.5 L1063.5 223.5 " fill="none"></path>
-					<path d="M1068.8 120.3 L1063.5 120.3 L1058.2 120.3 L1063.5 107.0 Z"></path>
-					<path d="M429.5 349.7 L429.5 351 L420.31339712918657 371 L420.3 371.0 " fill="none"></path>
+					<path d="M1929.9 192.5 L1947.5 203 L1947.5 261.5 L1947.5 261.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M434.8 340.3 L429.5 349.7 L424.2 340.3 L429.5 331.0 Z"></path>
+						<path d="M1924.6 183.2 L1929.9 192.5 L1919.1 192.4 L1913.8 183.0 Z"></path>
 					</g>
-					<path d="M429.5 120.3 L429.5 203 L429.5 223 L429.5 223.0 " fill="none"></path>
-					<path d="M434.8 120.3 L429.5 120.3 L424.2 120.3 L429.5 107.0 Z"></path>
-					<path d="M1922.4 145.0 L1595.5 203 L1595.5 261.5 L1595.5 261.5 " fill="none"></path>
+					<path d="M2060.9 164.9 L2217 203 L2217 261.5 L2217.0 261.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1932.5 148.6 L1922.4 145.0 L1930.6 138.1 L1940.8 141.7 Z"></path>
+						<path d="M2053.1 157.5 L2060.9 164.9 L2050.6 167.9 L2042.8 160.5 Z"></path>
 					</g>
-					<path d="M1987.2 190.2 L1956.5 203 L1956.5 261.5 L1956.5 261.5 " fill="none"></path>
+					<path d="M1433.0 638.0 L842.25 769 L842.25 789 L842.3 789.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1997.9 191.5 L1987.2 190.2 L1993.8 181.7 L2004.4 183.0 Z"></path>
+						<path d="M1443.3 641.2 L1433.0 638.0 L1441.0 630.8 L1451.3 634.0 Z"></path>
 					</g>
-					<path d="M2325.6 196.4 L2332 203 L2332 261.5 L2332.0 261.5 " fill="none"></path>
+					<path d="M1432.9 621.4 L586 769 L636.8450704225352 789 L636.8 789.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2322.9 186.0 L2325.6 196.4 L2315.3 193.4 L2312.6 183.0 Z"></path>
+						<path d="M1443.0 625.0 L1432.9 621.4 L1441.1 614.5 L1451.3 618.1 Z"></path>
 					</g>
-					<path d="M2524.7 180.3 L2601.5 203 L2601.5 261.5 L2601.5 261.5 " fill="none"></path>
+					<path d="M1433.7 685.4 L1199.5 769 L1199.5 789 L1199.5 789.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2517.2 172.6 L2524.7 180.3 L2514.2 182.8 L2506.8 175.0 Z"></path>
+						<path d="M1444.3 687.3 L1433.7 685.4 L1440.7 677.2 L1451.3 679.1 Z"></path>
 					</g>
-					<g data-name="InviteCodeFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="0.0" y="371.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M0.0 402.0 L667.0 402.0" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M0.0 628.0 L667.0 628.0" fill="none" data-name="InviteCodeFormViewModel"></path>
-						</g>
-						<g transform="translate(0, 371)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
-								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 402)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 628)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="41.0" y="789.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(41, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IInviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="142.0" y="789.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
-						</g>
-						<g transform="translate(142, 789)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
-								
-							</g>
-						</g>
+					<path d="M2067.2 759.8 L2080.25 769 L2080.25 789 L2080.3 789.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M2062.7 750.0 L2067.2 759.8 L2056.5 758.7 L2052.0 749.0 Z"></path>
 					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="563.5" y="789.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+					<path d="M989.5 305.8 L989.5 351 L1451.25 472.3527192706696 L1451.3 472.4 " fill="none"></path>
+					<path d="M994.8 305.8 L989.5 305.8 L984.2 305.8 L989.5 292.5 Z"></path>
+					<g data-name="EnrolledBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
+							<rect x="437.5" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
+							<path d="M437.5 76.0 L603.5 76.0" fill="none" data-name="EnrolledBadge"></path>
+							<path d="M437.5 107.0 L603.5 107.0" fill="none" data-name="EnrolledBadge"></path>
 						</g>
-						<g transform="translate(563.5, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+						<g transform="translate(437.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="716.5" y="789.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(716.5, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+						<g transform="translate(437.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="29.5" y="261.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(29.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+						<g transform="translate(437.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="StudyRecruitController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="819.0" y="468.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M819.0 499.5 L1470.0 499.5" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M819.0 545.5 L1470.0 545.5" fill="none" data-name="StudyRecruitController"></path>
+							<rect x="0.0" y="468.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
+							<path d="M0.0 499.5 L651.0 499.5" fill="none" data-name="StudyRecruitController"></path>
+							<path d="M0.0 545.5 L651.0 545.5" fill="none" data-name="StudyRecruitController"></path>
 						</g>
-						<g transform="translate(819, 468.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
+						<g transform="translate(0, 468.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
 								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(819, 499.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+						<g transform="translate(0, 499.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(819, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+						<g transform="translate(0, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
@@ -289,11 +215,22 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="IInviteCodeRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
+							<rect x="580.8" y="789.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
+						</g>
+						<g transform="translate(580.75, 789)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="StreamSubscription">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="1242.8" y="789.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+							<rect x="130.3" y="789.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
 						</g>
-						<g transform="translate(1242.75, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
+						<g transform="translate(130.25, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
 								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
 								
@@ -302,9 +239,9 @@
 					</g>
 					<g data-name="StudyBaseController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="688.5" y="261.5" height="31.0" width="178.0" data-name="StudyBaseController"></rect>
+							<rect x="347.0" y="261.5" height="31.0" width="178.0" data-name="StudyBaseController"></rect>
 						</g>
-						<g transform="translate(688.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
+						<g transform="translate(347, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
 								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
 								
@@ -313,52 +250,27 @@
 					</g>
 					<g data-name="IModelActionProvider">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="1260.5" y="261.5" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
+							<rect x="123.0" y="261.5" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
 						</g>
-						<g transform="translate(1260.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
+						<g transform="translate(123, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
 								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrolledBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="127.5" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M127.5 76.0 L293.5 76.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M127.5 107.0 L293.5 107.0" fill="none" data-name="EnrolledBadge"></path>
-						</g>
-						<g transform="translate(127.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(127.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(127.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
 					<g data-name="StudyRecruitScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="906.5" y="223.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M906.5 254.5 L1220.5 254.5" fill="none" data-name="StudyRecruitScreen"></path>
+							<rect x="565.0" y="223.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
+							<path d="M565.0 254.5 L879.0 254.5" fill="none" data-name="StudyRecruitScreen"></path>
 						</g>
-						<g transform="translate(906.5, 223.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
+						<g transform="translate(565, 223.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
 								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(906.5, 254.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
+						<g transform="translate(565, 254.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
@@ -370,9 +282,9 @@
 					</g>
 					<g data-name="StudyPageWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="985.0" y="76.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
+							<rect x="643.5" y="76.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
 						</g>
-						<g transform="translate(985, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
+						<g transform="translate(643.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
 								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
 								
@@ -381,23 +293,23 @@
 					</g>
 					<g data-name="InviteCodeFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
-							<rect x="210.5" y="223.0" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
-							<path d="M210.5 254.0 L648.5 254.0" fill="none" data-name="InviteCodeFormView"></path>
-							<path d="M210.5 285.0 L648.5 285.0" fill="none" data-name="InviteCodeFormView"></path>
+							<rect x="2361.0" y="223.0" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
+							<path d="M2361.0 254.0 L2799.0 254.0" fill="none" data-name="InviteCodeFormView"></path>
+							<path d="M2361.0 285.0 L2799.0 285.0" fill="none" data-name="InviteCodeFormView"></path>
 						</g>
-						<g transform="translate(210.5, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
+						<g transform="translate(2361, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
 								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(210.5, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+						<g transform="translate(2361, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(210.5, 285)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+						<g transform="translate(2361, 285)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
@@ -405,11 +317,55 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="InviteCodeFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
+							<rect x="1451.3" y="371.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
+							<path d="M1451.3 402.0 L2118.3 402.0" fill="none" data-name="InviteCodeFormViewModel"></path>
+							<path d="M1451.3 628.0 L2118.3 628.0" fill="none" data-name="InviteCodeFormViewModel"></path>
+						</g>
+						<g transform="translate(1451.25, 371)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
+								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1451.25, 402)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1451.25, 628)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="FormConsumerWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="333.5" y="76.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
+							<rect x="2484.0" y="76.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
 						</g>
-						<g transform="translate(333.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+						<g transform="translate(2484, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
 								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
 								
@@ -418,17 +374,17 @@
 					</g>
 					<g data-name="StudyInvitesTable">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="1940.8" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M1940.8 31.0 L2506.8 31.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M1940.8 137.0 L2506.8 137.0" fill="none" data-name="StudyInvitesTable"></path>
+							<rect x="1476.8" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
+							<path d="M1476.8 31.0 L2042.8 31.0" fill="none" data-name="StudyInvitesTable"></path>
+							<path d="M1476.8 137.0 L2042.8 137.0" fill="none" data-name="StudyInvitesTable"></path>
 						</g>
-						<g transform="translate(1940.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
+						<g transform="translate(1476.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
 								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1940.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+						<g transform="translate(1476.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
@@ -439,7 +395,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(1940.75, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+						<g transform="translate(1476.75, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
@@ -449,9 +405,9 @@
 					</g>
 					<g data-name="void Function(StudyInvite)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="1484.5" y="261.5" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
+							<rect x="1100.0" y="261.5" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(1484.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
+						<g transform="translate(1100, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
 								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
 								
@@ -460,9 +416,9 @@
 					</g>
 					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="1746.5" y="261.5" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
+							<rect x="1362.0" y="261.5" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(1746.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+						<g transform="translate(1362, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
 								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
 								
@@ -471,9 +427,9 @@
 					</g>
 					<g data-name="Intervention? Function(String)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="2206.5" y="261.5" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
+							<rect x="1822.0" y="261.5" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
 						</g>
-						<g transform="translate(2206.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
+						<g transform="translate(1822, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
 								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
 								
@@ -482,15 +438,59 @@
 					</g>
 					<g data-name="int Function(StudyInvite)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="2497.5" y="261.5" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
+							<rect x="2113.0" y="261.5" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(2497.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
+						<g transform="translate(2113, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
 								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
 								
 							</g>
 						</g>
 					</g>
+					<g data-name="Study">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
+							<rect x="811.8" y="789.0" height="31.0" width="61.0" data-name="Study"></rect>
+						</g>
+						<g transform="translate(811.75, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="1143.0" y="789.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+						</g>
+						<g transform="translate(1143, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormGroup">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
+							<rect x="2027.8" y="789.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
+						</g>
+						<g transform="translate(2027.75, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
+							<rect x="919.0" y="261.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
+						</g>
+						<g transform="translate(919, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
+								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+								
+							</g>
+						</g>
+					</g>
 				</g>
 			</g>
 		</g>
diff --git a/docs/uml/designer_v2/lib/features/uml.svg b/docs/uml/designer_v2/lib/features/uml.svg
index bb00ae648..d85f16001 100644
--- a/docs/uml/designer_v2/lib/features/uml.svg
+++ b/docs/uml/designer_v2/lib/features/uml.svg
@@ -1,921 +1,895 @@
-<svg version="1.1" baseProfile="full" width="44967.0" height="3778.0" viewbox="0 0 44967 3778" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[WebFrame
+<svg version="1.1" baseProfile="full" width="48837.5" height="3778.0" viewbox="0 0 48837.5 3778" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[&lt;abstract&gt;IAppDelegate
 	  |
-	  +previewSrc: String;
-	  +studyId: String
+	  +dynamic onAppStart()
+	]
+	
+	[AppController
 	  |
-	  +Widget build()
+	  +appDelegates: List&lt;IAppDelegate&gt;;
+	  -_delayedFuture: dynamic;
+	  +isInitialized: dynamic
+	  |
+	  +dynamic onAppStart();
+	  -dynamic _callDelegates()
 	]
 	
-	[DisabledFrame
+	[StudyMonitorScreen
 	  |
 	  +Widget build()
 	]
 	
-	[PhoneContainer
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
+	
+	[LoginForm
 	  |
-	  &lt;static&gt;+defaultWidth: double;
-	  &lt;static&gt;+defaultHeight: double;
-	  +width: double;
-	  +height: double;
-	  +borderColor: Color;
-	  +borderWidth: double;
-	  +borderRadius: double;
-	  +innerContent: Widget;
-	  +innerContentBackgroundColor: Color?
+	  +formKey: AuthFormKey
 	  |
 	  +Widget build()
 	]
 	
-	[PhoneContainer]o-[Color]
-	[PhoneContainer]o-[&lt;abstract&gt;Widget]
+	[LoginForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
 	
-	[MobileFrame
+	[PasswordRecoveryForm
+	  |
+	  +formKey: AuthFormKey
 	  |
 	  +Widget build()
 	]
 	
-	[DesktopFrame
+	[PasswordRecoveryForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
+	
+	[PasswordForgotForm
+	  |
+	  +formKey: AuthFormKey
 	  |
 	  +Widget build()
 	]
 	
-	[StudyController
+	[PasswordForgotForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
+	
+	[SignupForm
 	  |
-	  +notificationService: INotificationService;
-	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
-	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
+	  +formKey: AuthFormKey
 	  |
-	  +dynamic syncStudyStatus();
-	  +dynamic onStudySubscriptionUpdate();
-	  -dynamic _redirectNewToActualStudyID();
-	  +dynamic publishStudy();
-	  +void onChangeStudyParticipation();
-	  +void onAddParticipants();
-	  +void onSettingsPressed();
-	  +void dispose()
+	  +Widget build();
+	  -dynamic _onClickTermsOfUse();
+	  -dynamic _onClickPrivacyPolicy()
 	]
 	
-	[StudyController]o-[&lt;abstract&gt;INotificationService]
-	[StudyController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyController]
+	[SignupForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
 	
-	[&lt;abstract&gt;IStudyAppBarViewModel
+	[AuthScaffold
 	  |
-	  +isSyncIndicatorVisible: bool;
-	  +isStatusBadgeVisible: bool;
-	  +isPublishVisible: bool
+	  +body: Widget;
+	  +formKey: AuthFormKey;
+	  +leftContentMinWidth: double;
+	  +leftPanelMinWidth: double;
+	  +leftPanelPadding: EdgeInsets
 	]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
+	[AuthScaffold]o-[&lt;abstract&gt;Widget]
+	[AuthScaffold]o-[AuthFormKey]
+	[AuthScaffold]o-[EdgeInsets]
 	
-	[StudyScaffold
+	[EmailTextField
 	  |
-	  +studyId: String;
-	  +tabs: List&lt;NavbarTab&gt;?;
-	  +tabsSubnav: List&lt;NavbarTab&gt;?;
-	  +selectedTab: NavbarTab?;
-	  +selectedTabSubnav: NavbarTab?;
-	  +body: StudyPageWidget;
-	  +drawer: Widget?;
-	  +disableActions: bool;
-	  +actionsSpacing: double;
-	  +actionsPadding: double;
-	  +layoutType: SingleColumnLayoutType?;
-	  +appbarHeight: double;
-	  +appbarSubnavHeight: double
+	  +labelText: String;
+	  +hintText: String?;
+	  +formControlName: String?;
+	  +formControl: FormControl&lt;dynamic&gt;?
 	]
 	
-	[StudyScaffold]o-[NavbarTab]
-	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
-	[StudyScaffold]o-[&lt;abstract&gt;Widget]
-	[StudyScaffold]o-[SingleColumnLayoutType]
+	[EmailTextField]o-[FormControl]
 	
-	[PreviewFrame
+	[PasswordTextField
 	  |
-	  +studyId: String;
-	  +routeArgs: StudyFormRouteArgs?;
-	  +route: String?
+	  +labelText: String;
+	  +hintText: String?;
+	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
+	  +formControlName: String?;
+	  +formControl: FormControl&lt;dynamic&gt;?
 	]
 	
-	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
+	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
+	[PasswordTextField]o-[FormControl]
 	
-	[RouteInformation
-	  |
-	  +route: String?;
-	  +extra: String?;
-	  +cmd: String?;
-	  +data: String?
+	[StudyUJobsToBeDone
 	  |
-	  +String toString()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;PlatformController
+	[AuthFormController
 	  |
-	  +studyId: String;
-	  +baseSrc: String;
-	  +previewSrc: String;
-	  +routeInformation: RouteInformation;
-	  +frameWidget: Widget
+	  +authRepository: IAuthRepository;
+	  +notificationService: INotificationService;
+	  +router: GoRouter;
+	  +emailControl: FormControl&lt;String&gt;;
+	  +passwordControl: FormControl&lt;String&gt;;
+	  +passwordConfirmationControl: FormControl&lt;String&gt;;
+	  +termsOfServiceControl: FormControl&lt;bool&gt;;
+	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
+	  +loginForm: FormGroup;
+	  +signupForm: FormGroup;
+	  +passwordForgotForm: FormGroup;
+	  +passwordRecoveryForm: FormGroup;
+	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
+	  -_formKey: AuthFormKey;
+	  +formKey: AuthFormKey;
+	  +form: FormGroup
 	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void listen();
-	  +void send();
-	  +void openNewPage()
+	  -dynamic _getFormFor();
+	  -dynamic _onChangeFormKey();
+	  +dynamic resetControlsFor();
+	  -dynamic _forceValidationMessages();
+	  +dynamic signUp();
+	  -dynamic _signUp();
+	  +dynamic signIn();
+	  -dynamic _signInWith();
+	  +dynamic signOut();
+	  +dynamic resetPasswordForEmail();
+	  +dynamic sendPasswordResetLink();
+	  +dynamic recoverPassword();
+	  +dynamic updateUser();
+	  -dynamic _readDebugUser()
 	]
 	
-	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
-	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
+	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
+	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
+	[AuthFormController]o-[GoRouter]
+	[AuthFormController]o-[FormControl]
+	[AuthFormController]o-[FormGroup]
+	[AuthFormController]o-[AuthFormKey]
+	[&lt;abstract&gt;IFormGroupController]&lt;:--[AuthFormController]
 	
-	[WebController
-	  |
-	  +iFrameElement: IFrameElement
+	[AuthFormKey
 	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void openNewPage();
-	  +void listen();
-	  +void send()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;AuthFormKey&gt;;
+	  &lt;static&gt;+login: AuthFormKey;
+	  &lt;static&gt;+signup: AuthFormKey;
+	  &lt;static&gt;+passwordForgot: AuthFormKey;
+	  &lt;static&gt;+passwordRecovery: AuthFormKey;
+	  &lt;static&gt;-_loginSubmit: AuthFormKey;
+	  &lt;static&gt;-_signupSubmit: AuthFormKey
 	]
 	
-	[WebController]o-[IFrameElement]
-	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
+	[AuthFormKey]o-[AuthFormKey]
+	[Enum]&lt;:--[AuthFormKey]
 	
-	[MobileController
+	[AppStatus
 	  |
-	  +void openNewPage();
-	  +void refresh();
-	  +void registerViews();
-	  +void listen();
-	  +void send();
-	  +void navigate();
-	  +void activate();
-	  +void generateUrl()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
+	  &lt;static&gt;+initializing: AppStatus;
+	  &lt;static&gt;+initialized: AppStatus
 	]
 	
-	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
+	[AppStatus]o-[AppStatus]
+	[Enum]&lt;:--[AppStatus]
 	
-	[StudyParticipationBadge
+	[FormArrayTable
 	  |
-	  +participation: Participation;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +center: bool
+	  +control: AbstractControl&lt;dynamic&gt;;
+	  +items: List&lt;T&gt;;
+	  +onSelectItem: void Function(T);
+	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
+	  +onNewItem: void Function()?;
+	  +rowTitle: String Function(T);
+	  +onNewItemLabel: String;
+	  +sectionTitle: String?;
+	  +sectionDescription: String?;
+	  +emptyIcon: IconData?;
+	  +emptyTitle: String?;
+	  +emptyDescription: String?;
+	  +sectionTitleDivider: bool?;
+	  +rowPrefix: Widget Function(BuildContext, T, int)?;
+	  +rowSuffix: Widget Function(BuildContext, T, int)?;
+	  +leadingWidget: Widget?;
+	  +itemsSectionPadding: EdgeInsets?;
+	  +hideLeadingTrailingWhenEmpty: bool;
+	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
 	  |
-	  +Widget build()
+	  +Widget build();
+	  -List&lt;Widget&gt; _buildRow();
+	  -Widget _newItemButton()
 	]
 	
-	[StudyParticipationBadge]o-[Participation]
-	[StudyParticipationBadge]o-[BadgeType]
+	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
+	[FormArrayTable]o-[void Function(T)]
+	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
+	[FormArrayTable]o-[void Function()?]
+	[FormArrayTable]o-[String Function(T)]
+	[FormArrayTable]o-[IconData]
+	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
+	[FormArrayTable]o-[&lt;abstract&gt;Widget]
+	[FormArrayTable]o-[EdgeInsets]
 	
-	[StudyTestScreen
-	  |
-	  +previewRoute: String?
+	[&lt;abstract&gt;ManagedFormViewModel
 	  |
-	  +Widget build();
-	  +Widget? banner();
-	  +dynamic load();
-	  +dynamic save();
-	  +dynamic showHelp()
+	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
 	
-	[TestAppRoutes
-	  |
-	  &lt;static&gt;+studyOverview: String;
-	  &lt;static&gt;+eligibility: String;
-	  &lt;static&gt;+intervention: String;
-	  &lt;static&gt;+consent: String;
-	  &lt;static&gt;+journey: String;
-	  &lt;static&gt;+dashboard: String
+	[FormViewModelNotFoundException
 	]
 	
-	[&lt;abstract&gt;IStudyNavViewModel
-	  |
-	  +isEditTabEnabled: bool;
-	  +isTestTabEnabled: bool;
-	  +isRecruitTabEnabled: bool;
-	  +isMonitorTabEnabled: bool;
-	  +isAnalyzeTabEnabled: bool;
-	  +isSettingsEnabled: bool
-	]
+	[Exception]&lt;:--[FormViewModelNotFoundException]
 	
-	[StudyNav
+	[FormViewModelCollection
 	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic edit();
-	  &lt;static&gt;+dynamic test();
-	  &lt;static&gt;+dynamic recruit();
-	  &lt;static&gt;+dynamic monitor();
-	  &lt;static&gt;+dynamic analyze()
-	]
-	
-	[StudyDesignNav
+	  +formViewModels: List&lt;T&gt;;
+	  +formArray: FormArray&lt;dynamic&gt;;
+	  +stagedViewModels: List&lt;T&gt;;
+	  +retrievableViewModels: List&lt;T&gt;;
+	  +formData: List&lt;D&gt;
 	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic info();
-	  &lt;static&gt;+dynamic enrollment();
-	  &lt;static&gt;+dynamic interventions();
-	  &lt;static&gt;+dynamic measurements();
-	  &lt;static&gt;+dynamic reports()
+	  +void add();
+	  +T remove();
+	  +T? findWhere();
+	  +T? removeWhere();
+	  +bool contains();
+	  +void stage();
+	  +T commit();
+	  +void reset();
+	  +void read()
 	]
 	
-	[StudyTestController
+	[FormViewModelCollection]o-[FormArray]
+	
+	[CustomFormControl
 	  |
-	  +authRepository: IAuthRepository;
-	  +languageCode: String
+	  -_onValueChangedDebouncer: Debouncer?;
+	  -_onStatusChangedDebouncer: Debouncer?;
+	  +onValueChanged: void Function(T?)?;
+	  +onStatusChanged: void Function(ControlStatus)?;
+	  +onStatusChangedDebounceTime: int?;
+	  +onValueChangedDebounceTime: int?
+	  |
+	  +void dispose()
 	]
 	
-	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyBaseController]&lt;:-[StudyTestController]
+	[CustomFormControl]o-[Debouncer]
+	[CustomFormControl]o-[void Function(T?)?]
+	[CustomFormControl]o-[void Function(ControlStatus)?]
+	[FormControl]&lt;:-[CustomFormControl]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel
+	[UnsavedChangesDialog
 	  |
-	  +studyParticipation: Participation?;
-	  +studyStatus: StudyStatus?
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
+	[&lt;abstract&gt;FormValidationSetEnum
+	]
 	
-	[StudyStatusBadge
+	[FormControlValidation
 	  |
-	  +participation: Participation?;
-	  +status: StudyStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
+	  +control: AbstractControl&lt;dynamic&gt;;
+	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
+	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
+	  +validationMessages: Map&lt;String, String Function(Object)&gt;
 	  |
-	  +Widget build()
+	  +FormControlValidation merge()
 	]
 	
-	[StudyStatusBadge]o-[Participation]
-	[StudyStatusBadge]o-[StudyStatus]
-	[StudyStatusBadge]o-[BadgeType]
+	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
 	
-	[FrameControlsWidget
+	[&lt;abstract&gt;IFormData
 	  |
-	  +onRefresh: void Function()?;
-	  +onOpenNewTab: void Function()?;
-	  +enabled: bool
+	  +id: String
 	  |
-	  +Widget build()
+	  +IFormData copy()
 	]
 	
-	[FrameControlsWidget]o-[void Function()?]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
+	[FormInvalidException
+	]
 	
-	[StudySettingsDialog
+	[Exception]&lt;:--[FormInvalidException]
+	
+	[FormConfigException
 	  |
-	  +Widget build()
+	  +message: String?
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
+	[Exception]&lt;:--[FormConfigException]
 	
-	[StudySettingsFormViewModel
+	[&lt;abstract&gt;IFormViewModelDelegate
 	  |
-	  +study: AsyncValue&lt;Study&gt;;
-	  +studyRepository: IStudyRepository;
-	  &lt;static&gt;+defaultPublishedToRegistry: bool;
-	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
-	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
-	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +dynamic onSave();
+	  +void onCancel()
+	]
+	
+	[&lt;abstract&gt;IFormGroupController
 	  |
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +dynamic keepControlsSynced();
-	  +dynamic save();
-	  +dynamic setLaunchDefaults()
+	  +form: FormGroup
 	]
 	
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudySettingsFormViewModel]o-[FormControl]
-	[StudySettingsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
+	[&lt;abstract&gt;IFormGroupController]o-[FormGroup]
 	
-	[StudyBaseController
-	  |
-	  +studyId: String;
-	  +studyRepository: IStudyRepository;
-	  +router: GoRouter;
-	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
+	[FormControlOption
 	  |
-	  +dynamic subscribeStudy();
-	  +dynamic onStudySubscriptionUpdate();
-	  +dynamic onStudySubscriptionError();
-	  +void dispose()
+	  +value: T;
+	  +label: String;
+	  +description: String?;
+	  +props: List&lt;Object?&gt;
 	]
 	
-	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyBaseController]o-[GoRouter]
-	[StudyBaseController]o-[StreamSubscription]
+	[&lt;abstract&gt;Equatable]&lt;:-[FormControlOption]
 	
-	[&lt;abstract&gt;StudyPageWidget
+	[&lt;abstract&gt;FormViewModel
 	  |
-	  +studyId: String
+	  -_formData: T?;
+	  -_formMode: FormMode;
+	  -_validationSet: FormValidationSetEnum?;
+	  +delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?;
+	  +autosave: bool;
+	  -_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;;
+	  -_immediateFormChildrenListenerDebouncer: Debouncer?;
+	  -_autosaveOperation: CancelableOperation&lt;dynamic&gt;?;
+	  -_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;;
+	  +prevFormValue: Map&lt;String, dynamic&gt;?;
+	  &lt;static&gt;-_formKey: String;
+	  +formData: T?;
+	  +formMode: FormMode;
+	  +isReadonly: bool;
+	  +validationSet: FormValidationSetEnum?;
+	  +isDirty: bool;
+	  +title: String;
+	  +isValid: bool;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;
 	  |
-	  +Widget? banner()
+	  -dynamic _setFormData();
+	  -dynamic _rememberDefaultControlValidators();
+	  -Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators();
+	  -dynamic _disableAllControls();
+	  -dynamic _formModeUpdated();
+	  -dynamic _restoreControlsFromFormData();
+	  +void revalidate();
+	  -void _applyValidationSet();
+	  +void read();
+	  +dynamic save();
+	  +dynamic cancel();
+	  +void enableAutosave();
+	  +void listenToImmediateFormChildren();
+	  +dynamic markFormGroupChanged();
+	  +void dispose();
+	  +void setControlsFrom();
+	  +T buildFormData();
+	  +void initControls()
 	]
 	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
-	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
+	[&lt;abstract&gt;FormViewModel]o-[FormMode]
+	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;FormValidationSetEnum]
+	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;IFormViewModelDelegate]
+	[&lt;abstract&gt;FormViewModel]o-[Debouncer]
+	[&lt;abstract&gt;FormViewModel]o-[CancelableOperation]
+	[&lt;abstract&gt;IFormGroupController]&lt;:--[&lt;abstract&gt;FormViewModel]
 	
-	[AppStatus
+	[FormMode
 	  |
 	  +index: int;
-	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
-	  &lt;static&gt;+initializing: AppStatus;
-	  &lt;static&gt;+initialized: AppStatus
+	  &lt;static&gt;+values: List&lt;FormMode&gt;;
+	  &lt;static&gt;+create: FormMode;
+	  &lt;static&gt;+readonly: FormMode;
+	  &lt;static&gt;+edit: FormMode
 	]
 	
-	[AppStatus]o-[AppStatus]
-	[Enum]&lt;:--[AppStatus]
+	[FormMode]o-[FormMode]
+	[Enum]&lt;:--[FormMode]
 	
-	[&lt;abstract&gt;IAppDelegate
+	[EnrolledBadge
 	  |
-	  +dynamic onAppStart()
+	  +enrolledCount: int
+	  |
+	  +Widget build()
 	]
 	
-	[AppController
+	[StudyRecruitController
 	  |
-	  +appDelegates: List&lt;IAppDelegate&gt;;
-	  -_delayedFuture: dynamic;
-	  +isInitialized: dynamic
+	  +inviteCodeRepository: IInviteCodeRepository;
+	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
 	  |
-	  +dynamic onAppStart();
-	  -dynamic _callDelegates()
+	  -dynamic _subscribeInvites();
+	  +Intervention? getIntervention();
+	  +int getParticipantCountForInvite();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void dispose()
 	]
 	
-	[App
-	]
+	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
+	[StudyRecruitController]o-[StreamSubscription]
+	[StudyBaseController]&lt;:-[StudyRecruitController]
+	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
 	
-	[AppContent
+	[StudyRecruitScreen
+	  |
+	  +Widget build();
+	  -Widget _inviteCodesSectionHeader();
+	  -Widget _newInviteCodeButton();
+	  -dynamic _onSelectInvite()
 	]
 	
-	[AuthFormController
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
+	
+	[InviteCodeFormView
 	  |
-	  +authRepository: IAuthRepository;
-	  +notificationService: INotificationService;
-	  +router: GoRouter;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +passwordControl: FormControl&lt;String&gt;;
-	  +passwordConfirmationControl: FormControl&lt;String&gt;;
-	  +termsOfServiceControl: FormControl&lt;bool&gt;;
-	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +loginForm: FormGroup;
-	  +signupForm: FormGroup;
-	  +passwordForgotForm: FormGroup;
-	  +passwordRecoveryForm: FormGroup;
-	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  -_formKey: AuthFormKey;
-	  +formKey: AuthFormKey;
-	  +form: FormGroup
+	  +formViewModel: InviteCodeFormViewModel
 	  |
-	  -dynamic _getFormFor();
-	  -dynamic _onChangeFormKey();
-	  +dynamic resetControlsFor();
-	  -dynamic _forceValidationMessages();
-	  +dynamic signUp();
-	  -dynamic _signUp();
-	  +dynamic signIn();
-	  -dynamic _signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic sendPasswordResetLink();
-	  +dynamic recoverPassword();
-	  +dynamic updateUser();
-	  -dynamic _readDebugUser()
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
 	]
 	
-	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
-	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
-	[AuthFormController]o-[GoRouter]
-	[AuthFormController]o-[FormControl]
-	[AuthFormController]o-[FormGroup]
-	[AuthFormController]o-[AuthFormKey]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[AuthFormController]
+	[InviteCodeFormView]o-[InviteCodeFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
 	
-	[AuthFormKey
+	[StudyInvitesTable
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AuthFormKey&gt;;
-	  &lt;static&gt;+login: AuthFormKey;
-	  &lt;static&gt;+signup: AuthFormKey;
-	  &lt;static&gt;+passwordForgot: AuthFormKey;
-	  &lt;static&gt;+passwordRecovery: AuthFormKey;
-	  &lt;static&gt;-_loginSubmit: AuthFormKey;
-	  &lt;static&gt;-_signupSubmit: AuthFormKey
+	  +invites: List&lt;StudyInvite&gt;;
+	  +onSelect: void Function(StudyInvite);
+	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
+	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
+	  +getIntervention: Intervention? Function(String);
+	  +getParticipantCountForInvite: int Function(StudyInvite)
+	  |
+	  +Widget build();
+	  -List&lt;Widget&gt; _buildRow()
 	]
 	
-	[AuthFormKey]o-[AuthFormKey]
-	[Enum]&lt;:--[AuthFormKey]
+	[StudyInvitesTable]o-[void Function(StudyInvite)]
+	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
+	[StudyInvitesTable]o-[Intervention? Function(String)]
+	[StudyInvitesTable]o-[int Function(StudyInvite)]
 	
-	[PasswordRecoveryForm
+	[InviteCodeFormViewModel
 	  |
-	  +formKey: AuthFormKey
+	  +study: Study;
+	  +inviteCodeRepository: IInviteCodeRepository;
+	  +codeControl: FormControl&lt;String&gt;;
+	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
+	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
+	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
+	  +interventionAControl: FormControl&lt;String&gt;;
+	  +interventionBControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
+	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
+	  +isPreconfiguredSchedule: bool;
+	  +preconfiguredSchedule: List&lt;String&gt;?
 	  |
-	  +Widget build()
+	  +void initControls();
+	  -dynamic _uniqueInviteCode();
+	  +void regenerateCode();
+	  -String _generateCode();
+	  +StudyInvite buildFormData();
+	  +void setControlsFrom();
+	  +dynamic save()
 	]
 	
-	[PasswordRecoveryForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
+	[InviteCodeFormViewModel]o-[Study]
+	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
+	[InviteCodeFormViewModel]o-[FormControl]
+	[InviteCodeFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
 	
-	[PasswordForgotForm
-	  |
-	  +formKey: AuthFormKey
+	[PublishSuccessDialog
 	  |
 	  +Widget build()
 	]
 	
-	[PasswordForgotForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
 	
-	[LoginForm
-	  |
-	  +formKey: AuthFormKey
+	[PublishDialog
 	  |
 	  +Widget build()
 	]
 	
-	[LoginForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
 	
-	[EmailTextField
+	[PublishConfirmationDialog
 	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
+	  +Widget build()
 	]
 	
-	[EmailTextField]o-[FormControl]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
 	
-	[PasswordTextField
+	[FrameControlsWidget
 	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
+	  +onRefresh: void Function()?;
+	  +onOpenNewTab: void Function()?;
+	  +enabled: bool
+	  |
+	  +Widget build()
 	]
 	
-	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
-	[PasswordTextField]o-[FormControl]
+	[FrameControlsWidget]o-[void Function()?]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
 	
-	[SignupForm
-	  |
-	  +formKey: AuthFormKey
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel
 	  |
-	  +Widget build();
-	  -dynamic _onClickTermsOfUse();
-	  -dynamic _onClickPrivacyPolicy()
+	  +studyParticipation: Participation?;
+	  +studyStatus: StudyStatus?
 	]
 	
-	[SignupForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
 	
-	[StudyUJobsToBeDone
+	[StudyStatusBadge
+	  |
+	  +participation: Participation?;
+	  +status: StudyStatus?;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +showTooltip: bool
 	  |
 	  +Widget build()
 	]
 	
-	[AuthScaffold
+	[StudyStatusBadge]o-[Participation]
+	[StudyStatusBadge]o-[StudyStatus]
+	[StudyStatusBadge]o-[BadgeType]
+	
+	[RouteInformation
 	  |
-	  +body: Widget;
-	  +formKey: AuthFormKey;
-	  +leftContentMinWidth: double;
-	  +leftPanelMinWidth: double;
-	  +leftPanelPadding: EdgeInsets
+	  +route: String?;
+	  +extra: String?;
+	  +cmd: String?;
+	  +data: String?
+	  |
+	  +String toString()
 	]
 	
-	[AuthScaffold]o-[&lt;abstract&gt;Widget]
-	[AuthScaffold]o-[AuthFormKey]
-	[AuthScaffold]o-[EdgeInsets]
-	
-	[PublishDialog
+	[&lt;abstract&gt;PlatformController
 	  |
-	  +Widget build()
+	  +studyId: String;
+	  +baseSrc: String;
+	  +previewSrc: String;
+	  +routeInformation: RouteInformation;
+	  +frameWidget: Widget
+	  |
+	  +void activate();
+	  +void registerViews();
+	  +void generateUrl();
+	  +void navigate();
+	  +void refresh();
+	  +void listen();
+	  +void send();
+	  +void openNewPage()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
+	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
+	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
 	
-	[PublishSuccessDialog
+	[WebController
 	  |
-	  +Widget build()
+	  +iFrameElement: IFrameElement
+	  |
+	  +void activate();
+	  +void registerViews();
+	  +void generateUrl();
+	  +void navigate();
+	  +void refresh();
+	  +void openNewPage();
+	  +void listen();
+	  +void send()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
+	[WebController]o-[IFrameElement]
+	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
 	
-	[PublishConfirmationDialog
+	[MobileController
 	  |
-	  +Widget build()
+	  +void openNewPage();
+	  +void refresh();
+	  +void registerViews();
+	  +void listen();
+	  +void send();
+	  +void navigate();
+	  +void activate();
+	  +void generateUrl()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
+	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
 	
-	[FormArrayTable
+	[StudyController
 	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +items: List&lt;T&gt;;
-	  +onSelectItem: void Function(T);
-	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
-	  +onNewItem: void Function()?;
-	  +rowTitle: String Function(T);
-	  +onNewItemLabel: String;
-	  +sectionTitle: String?;
-	  +sectionDescription: String?;
-	  +emptyIcon: IconData?;
-	  +emptyTitle: String?;
-	  +emptyDescription: String?;
-	  +sectionTitleDivider: bool?;
-	  +rowPrefix: Widget Function(BuildContext, T, int)?;
-	  +rowSuffix: Widget Function(BuildContext, T, int)?;
-	  +leadingWidget: Widget?;
-	  +itemsSectionPadding: EdgeInsets?;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
+	  +notificationService: INotificationService;
+	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
+	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
 	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow();
-	  -Widget _newItemButton()
+	  +dynamic syncStudyStatus();
+	  +dynamic onStudySubscriptionUpdate();
+	  -dynamic _redirectNewToActualStudyID();
+	  +dynamic publishStudy();
+	  +void onChangeStudyParticipation();
+	  +void onAddParticipants();
+	  +void onSettingsPressed();
+	  +void dispose()
 	]
 	
-	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
-	[FormArrayTable]o-[void Function(T)]
-	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
-	[FormArrayTable]o-[void Function()?]
-	[FormArrayTable]o-[String Function(T)]
-	[FormArrayTable]o-[IconData]
-	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
-	[FormArrayTable]o-[&lt;abstract&gt;Widget]
-	[FormArrayTable]o-[EdgeInsets]
+	[StudyController]o-[&lt;abstract&gt;INotificationService]
+	[StudyController]o-[StreamSubscription]
+	[StudyBaseController]&lt;:-[StudyController]
 	
-	[&lt;abstract&gt;IFormData
-	  |
-	  +id: String
+	[&lt;abstract&gt;IStudyNavViewModel
 	  |
-	  +IFormData copy()
+	  +isEditTabEnabled: bool;
+	  +isTestTabEnabled: bool;
+	  +isRecruitTabEnabled: bool;
+	  +isMonitorTabEnabled: bool;
+	  +isAnalyzeTabEnabled: bool;
+	  +isSettingsEnabled: bool
 	]
 	
-	[&lt;abstract&gt;ManagedFormViewModel
+	[StudyNav
 	  |
-	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
+	  &lt;static&gt;+dynamic tabs();
+	  &lt;static&gt;+dynamic edit();
+	  &lt;static&gt;+dynamic test();
+	  &lt;static&gt;+dynamic recruit();
+	  &lt;static&gt;+dynamic monitor();
+	  &lt;static&gt;+dynamic analyze()
 	]
 	
-	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
-	
-	[FormViewModelNotFoundException
+	[StudyDesignNav
+	  |
+	  &lt;static&gt;+dynamic tabs();
+	  &lt;static&gt;+dynamic info();
+	  &lt;static&gt;+dynamic enrollment();
+	  &lt;static&gt;+dynamic interventions();
+	  &lt;static&gt;+dynamic measurements();
+	  &lt;static&gt;+dynamic reports()
 	]
 	
-	[Exception]&lt;:--[FormViewModelNotFoundException]
-	
-	[FormViewModelCollection
+	[&lt;abstract&gt;StudyPageWidget
 	  |
-	  +formViewModels: List&lt;T&gt;;
-	  +formArray: FormArray&lt;dynamic&gt;;
-	  +stagedViewModels: List&lt;T&gt;;
-	  +retrievableViewModels: List&lt;T&gt;;
-	  +formData: List&lt;D&gt;
+	  +studyId: String
 	  |
-	  +void add();
-	  +T remove();
-	  +T? findWhere();
-	  +T? removeWhere();
-	  +bool contains();
-	  +void stage();
-	  +T commit();
-	  +void reset();
-	  +void read()
-	]
-	
-	[FormViewModelCollection]o-[FormArray]
-	
-	[FormInvalidException
+	  +Widget? banner()
 	]
 	
-	[Exception]&lt;:--[FormInvalidException]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
+	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
 	
-	[FormConfigException
+	[StudyParticipationBadge
 	  |
-	  +message: String?
+	  +participation: Participation;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +center: bool
+	  |
+	  +Widget build()
 	]
 	
-	[Exception]&lt;:--[FormConfigException]
+	[StudyParticipationBadge]o-[Participation]
+	[StudyParticipationBadge]o-[BadgeType]
 	
-	[&lt;abstract&gt;IFormViewModelDelegate
+	[StudyBaseController
 	  |
-	  +dynamic onSave();
-	  +void onCancel()
-	]
-	
-	[&lt;abstract&gt;IFormGroupController
+	  +studyId: String;
+	  +studyRepository: IStudyRepository;
+	  +router: GoRouter;
+	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
 	  |
-	  +form: FormGroup
+	  +dynamic subscribeStudy();
+	  +dynamic onStudySubscriptionUpdate();
+	  +dynamic onStudySubscriptionError();
+	  +void dispose()
 	]
 	
-	[&lt;abstract&gt;IFormGroupController]o-[FormGroup]
+	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
+	[StudyBaseController]o-[GoRouter]
+	[StudyBaseController]o-[StreamSubscription]
 	
-	[FormControlOption
+	[PreviewFrame
 	  |
-	  +value: T;
-	  +label: String;
-	  +description: String?;
-	  +props: List&lt;Object?&gt;
+	  +studyId: String;
+	  +routeArgs: StudyFormRouteArgs?;
+	  +route: String?
 	]
 	
-	[&lt;abstract&gt;Equatable]&lt;:-[FormControlOption]
+	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
 	
-	[&lt;abstract&gt;FormViewModel
-	  |
-	  -_formData: T?;
-	  -_formMode: FormMode;
-	  -_validationSet: FormValidationSetEnum?;
-	  +delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?;
-	  +autosave: bool;
-	  -_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;;
-	  -_immediateFormChildrenListenerDebouncer: Debouncer?;
-	  -_autosaveOperation: CancelableOperation&lt;dynamic&gt;?;
-	  -_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  +prevFormValue: Map&lt;String, dynamic&gt;?;
-	  &lt;static&gt;-_formKey: String;
-	  +formData: T?;
-	  +formMode: FormMode;
-	  +isReadonly: bool;
-	  +validationSet: FormValidationSetEnum?;
-	  +isDirty: bool;
-	  +title: String;
-	  +isValid: bool;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;
+	[&lt;abstract&gt;IStudyAppBarViewModel
 	  |
-	  -dynamic _setFormData();
-	  -dynamic _rememberDefaultControlValidators();
-	  -Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators();
-	  -dynamic _disableAllControls();
-	  -dynamic _formModeUpdated();
-	  -dynamic _restoreControlsFromFormData();
-	  +void revalidate();
-	  -void _applyValidationSet();
-	  +void read();
-	  +dynamic save();
-	  +dynamic cancel();
-	  +void enableAutosave();
-	  +void listenToImmediateFormChildren();
-	  +dynamic markFormGroupChanged();
-	  +void dispose();
-	  +void setControlsFrom();
-	  +T buildFormData();
-	  +void initControls()
+	  +isSyncIndicatorVisible: bool;
+	  +isStatusBadgeVisible: bool;
+	  +isPublishVisible: bool
 	]
 	
-	[&lt;abstract&gt;FormViewModel]o-[FormMode]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;FormValidationSetEnum]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;IFormViewModelDelegate]
-	[&lt;abstract&gt;FormViewModel]o-[Debouncer]
-	[&lt;abstract&gt;FormViewModel]o-[CancelableOperation]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[&lt;abstract&gt;FormViewModel]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
+	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
 	
-	[FormMode
+	[StudyScaffold
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;FormMode&gt;;
-	  &lt;static&gt;+create: FormMode;
-	  &lt;static&gt;+readonly: FormMode;
-	  &lt;static&gt;+edit: FormMode
+	  +studyId: String;
+	  +tabs: List&lt;NavbarTab&gt;?;
+	  +tabsSubnav: List&lt;NavbarTab&gt;?;
+	  +selectedTab: NavbarTab?;
+	  +selectedTabSubnav: NavbarTab?;
+	  +body: StudyPageWidget;
+	  +drawer: Widget?;
+	  +disableActions: bool;
+	  +actionsSpacing: double;
+	  +actionsPadding: double;
+	  +layoutType: SingleColumnLayoutType?;
+	  +appbarHeight: double;
+	  +appbarSubnavHeight: double
 	]
 	
-	[FormMode]o-[FormMode]
-	[Enum]&lt;:--[FormMode]
+	[StudyScaffold]o-[NavbarTab]
+	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
+	[StudyScaffold]o-[&lt;abstract&gt;Widget]
+	[StudyScaffold]o-[SingleColumnLayoutType]
 	
-	[CustomFormControl
+	[WebFrame
 	  |
-	  -_onValueChangedDebouncer: Debouncer?;
-	  -_onStatusChangedDebouncer: Debouncer?;
-	  +onValueChanged: void Function(T?)?;
-	  +onStatusChanged: void Function(ControlStatus)?;
-	  +onStatusChangedDebounceTime: int?;
-	  +onValueChangedDebounceTime: int?
+	  +previewSrc: String;
+	  +studyId: String
 	  |
-	  +void dispose()
+	  +Widget build()
 	]
 	
-	[CustomFormControl]o-[Debouncer]
-	[CustomFormControl]o-[void Function(T?)?]
-	[CustomFormControl]o-[void Function(ControlStatus)?]
-	[FormControl]&lt;:-[CustomFormControl]
-	
-	[UnsavedChangesDialog
+	[DisabledFrame
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;FormValidationSetEnum
-	]
-	
-	[FormControlValidation
-	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
-	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
-	  +validationMessages: Map&lt;String, String Function(Object)&gt;
+	[PhoneContainer
 	  |
-	  +FormControlValidation merge()
-	]
-	
-	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
-	
-	[ScreenerQuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultResponseOptionValidity: bool;
-	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
-	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
-	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
-	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionValues: List&lt;dynamic&gt;;
-	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isDirtyOptionsBannerVisible: bool
+	  &lt;static&gt;+defaultWidth: double;
+	  &lt;static&gt;+defaultHeight: double;
+	  +width: double;
+	  +height: double;
+	  +borderColor: Color;
+	  +borderWidth: double;
+	  +borderRadius: double;
+	  +innerContent: Widget;
+	  +innerContentBackgroundColor: Color?
 	  |
-	  +dynamic onResponseOptionsChanged();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
-	  +ScreenerQuestionFormViewModel createDuplicate()
+	  +Widget build()
 	]
 	
-	[ScreenerQuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
+	[PhoneContainer]o-[Color]
+	[PhoneContainer]o-[&lt;abstract&gt;Widget]
 	
-	[StudyDesignEnrollmentFormView
+	[MobileFrame
 	  |
-	  +Widget build();
-	  -dynamic _showScreenerQuestionSidesheetWithArgs();
-	  -dynamic _showConsentItemSidesheetWithArgs()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
-	
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
+	[DesktopFrame
 	  |
-	  +isDirtyOptionsBannerVisible: bool
+	  +Widget build()
 	]
 	
-	[ScreenerQuestionLogicFormView
+	[StudyTestScreen
 	  |
-	  +formViewModel: ScreenerQuestionFormViewModel
+	  +previewRoute: String?
 	  |
 	  +Widget build();
-	  -dynamic _buildInfoBanner();
-	  -dynamic _buildAnswerOptionsLogicControls();
-	  -List&lt;Widget&gt; _buildOptionLogicRow()
+	  +Widget? banner();
+	  +dynamic load();
+	  +dynamic save();
+	  +dynamic showHelp()
 	]
 	
-	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
 	
-	[ConsentItemFormData
+	[StudySettingsFormViewModel
 	  |
-	  +consentId: String;
-	  +title: String;
-	  +description: String;
-	  +iconName: String?;
-	  +id: String
+	  +study: AsyncValue&lt;Study&gt;;
+	  +studyRepository: IStudyRepository;
+	  &lt;static&gt;+defaultPublishedToRegistry: bool;
+	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
+	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
+	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +ConsentItem toConsentItem();
-	  +ConsentItemFormData copy()
+	  +void setControlsFrom();
+	  +Study buildFormData();
+	  +dynamic keepControlsSynced();
+	  +dynamic save();
+	  +dynamic setLaunchDefaults()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
+	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
+	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
+	[StudySettingsFormViewModel]o-[FormControl]
+	[StudySettingsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
 	
-	[EnrollmentFormViewModel
+	[StudySettingsDialog
 	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
-	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
-	  +consentItemArray: FormArray&lt;dynamic&gt;;
-	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +form: FormGroup;
-	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
-	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestScreener: bool;
-	  +canTestConsent: bool;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  +Widget build()
+	]
+	
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
+	
+	[StudyTestController
 	  |
-	  +void setControlsFrom();
-	  +EnrollmentFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
-	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
-	  +dynamic testScreener();
-	  +dynamic testConsent();
-	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
+	  +authRepository: IAuthRepository;
+	  +languageCode: String
 	]
 	
-	[EnrollmentFormViewModel]o-[Study]
-	[EnrollmentFormViewModel]o-[GoRouter]
-	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
-	[EnrollmentFormViewModel]o-[FormControl]
-	[EnrollmentFormViewModel]o-[FormArray]
-	[EnrollmentFormViewModel]o-[FormViewModelCollection]
-	[EnrollmentFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
+	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyBaseController]&lt;:-[StudyTestController]
 	
-	[EnrollmentFormConsentItemDelegate
+	[TestAppRoutes
 	  |
-	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +owner: EnrollmentFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
+	  &lt;static&gt;+studyOverview: String;
+	  &lt;static&gt;+eligibility: String;
+	  &lt;static&gt;+intervention: String;
+	  &lt;static&gt;+consent: String;
+	  &lt;static&gt;+journey: String;
+	  &lt;static&gt;+dashboard: String
+	]
+	
+	[DrawerEntry
 	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ConsentItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
+	  +localizedTitle: String Function();
+	  +icon: IconData?;
+	  +localizedHelpText: String Function()?;
+	  +enabled: bool;
+	  +onSelected: void Function(BuildContext, WidgetRef)?;
+	  +autoCloseDrawer: bool;
+	  +title: String;
+	  +helpText: String?
+	  |
+	  +void onClick()
 	]
 	
-	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
-	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[DrawerEntry]o-[String Function()]
+	[DrawerEntry]o-[IconData]
+	[DrawerEntry]o-[String Function()?]
+	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
 	
-	[ConsentItemFormViewModel
+	[GoRouterDrawerEntry
 	  |
-	  +consentIdControl: FormControl&lt;String&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +form: FormGroup;
-	  +consentId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +intent: RoutingIntent;
+	  +onNavigated: void Function()?
 	  |
-	  +void setControlsFrom();
-	  +ConsentItemFormData buildFormData();
-	  +ConsentItemFormViewModel createDuplicate()
+	  +void onClick()
 	]
 	
-	[ConsentItemFormViewModel]o-[FormControl]
-	[ConsentItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
+	[GoRouterDrawerEntry]o-[RoutingIntent]
+	[GoRouterDrawerEntry]o-[void Function()?]
+	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
 	
-	[ConsentItemFormView
+	[AppDrawer
 	  |
-	  +formViewModel: ConsentItemFormViewModel
+	  +width: int;
+	  +autoCloseDrawer: bool;
+	  +leftPaddingEntries: double;
+	  +logoPaddingVertical: double;
+	  +logoPaddingHorizontal: double;
+	  +logoMaxHeight: double;
+	  +logoSectionMinHeight: double;
+	  +logoSectionMaxHeight: double
 	]
 	
-	[ConsentItemFormView]o-[ConsentItemFormViewModel]
-	
-	[EnrollmentFormData
+	[StudyAnalyzeScreen
 	  |
-	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
-	  +enrollmentType: Participation;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
-	  +id: String
+	  +Widget? banner();
+	  +Widget build()
+	]
+	
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
+	
+	[StudyAnalyzeController
 	  |
-	  +Study apply();
-	  +EnrollmentFormData copy()
+	  +dynamic onExport()
 	]
 	
-	[EnrollmentFormData]o-[Participation]
-	[EnrollmentFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
+	[StudyBaseController]&lt;:-[StudyAnalyzeController]
 	
 	[StudyDesignInterventionsFormView
 	  |
@@ -924,84 +898,33 @@
 	
 	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
 	
-	[InterventionsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +interventionsArray: FormArray&lt;dynamic&gt;;
-	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
-	  +form: FormGroup;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +interventionsRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestStudySchedule: bool
+	[InterventionFormView
 	  |
-	  +void setControlsFrom();
-	  +InterventionsFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +InterventionFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +dynamic testStudySchedule()
+	  +formViewModel: InterventionFormViewModel
 	]
 	
-	[InterventionsFormViewModel]o-[Study]
-	[InterventionsFormViewModel]o-[GoRouter]
-	[InterventionsFormViewModel]o-[FormArray]
-	[InterventionsFormViewModel]o-[FormViewModelCollection]
-	[InterventionsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
+	[InterventionFormView]o-[InterventionFormViewModel]
 	
-	[InterventionFormViewModel
+	[InterventionPreview
 	  |
-	  +study: Study;
-	  +interventionIdControl: FormControl&lt;String&gt;;
-	  +interventionTitleControl: FormControl&lt;String&gt;;
-	  +interventionIconControl: FormControl&lt;IconOption&gt;;
-	  +interventionDescriptionControl: FormControl&lt;String&gt;;
-	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
-	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
-	  +form: FormGroup;
-	  +interventionId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneTask: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +routeArgs: InterventionFormRouteArgs
 	  |
-	  +void setControlsFrom();
-	  +InterventionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +InterventionTaskFormViewModel provide();
-	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
-	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
-	  +InterventionFormViewModel createDuplicate()
+	  +Widget build()
 	]
 	
-	[InterventionFormViewModel]o-[Study]
-	[InterventionFormViewModel]o-[FormControl]
-	[InterventionFormViewModel]o-[FormArray]
-	[InterventionFormViewModel]o-[FormViewModelCollection]
-	[InterventionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
+	[InterventionPreview]o-[InterventionFormRouteArgs]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
+	
+	[StudyScheduleFormView
+	  |
+	  +formViewModel: StudyScheduleControls
+	  |
+	  -FormTableRow _renderCustomSequence();
+	  +Widget build()
+	]
+	
+	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
 	
 	[InterventionTaskFormData
 	  |
@@ -1017,32 +940,42 @@
 	
 	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
 	
-	[StudyScheduleFormData
-	  |
-	  +sequenceType: PhaseSequence;
-	  +sequenceTypeCustom: String;
-	  +numCycles: int;
-	  +phaseDuration: int;
-	  +includeBaseline: bool;
-	  +id: String
-	  |
-	  +StudySchedule toStudySchedule();
-	  +Study apply();
-	  +StudyScheduleFormData copy()
-	]
-	
-	[StudyScheduleFormData]o-[PhaseSequence]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
-	
-	[InterventionPreview
+	[InterventionsFormViewModel
 	  |
-	  +routeArgs: InterventionFormRouteArgs
+	  +study: Study;
+	  +router: GoRouter;
+	  +interventionsArray: FormArray&lt;dynamic&gt;;
+	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
+	  +form: FormGroup;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +interventionsRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestStudySchedule: bool
 	  |
-	  +Widget build()
+	  +void setControlsFrom();
+	  +InterventionsFormData buildFormData();
+	  +void read();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +InterventionFormViewModel provide();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +dynamic testStudySchedule()
 	]
 	
-	[InterventionPreview]o-[InterventionFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
+	[InterventionsFormViewModel]o-[Study]
+	[InterventionsFormViewModel]o-[GoRouter]
+	[InterventionsFormViewModel]o-[FormArray]
+	[InterventionsFormViewModel]o-[FormViewModelCollection]
+	[InterventionsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
+	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
 	
 	[InterventionTaskFormViewModel
 	  |
@@ -1068,26 +1001,6 @@
 	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
 	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
 	
-	[InterventionsFormData
-	  |
-	  +interventionsData: List&lt;InterventionFormData&gt;;
-	  +studyScheduleData: StudyScheduleFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +InterventionsFormData copy()
-	]
-	
-	[InterventionsFormData]o-[StudyScheduleFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
-	
-	[InterventionFormView
-	  |
-	  +formViewModel: InterventionFormViewModel
-	]
-	
-	[InterventionFormView]o-[InterventionFormViewModel]
-	
 	[&lt;abstract&gt;StudyScheduleControls
 	  |
 	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
@@ -1118,13 +1031,6 @@
 	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
 	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
 	
-	[InterventionTaskFormView
-	  |
-	  +formViewModel: InterventionTaskFormViewModel
-	]
-	
-	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
-	
 	[InterventionFormData
 	  |
 	  +interventionId: String;
@@ -1141,235 +1047,257 @@
 	
 	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
 	
-	[StudyScheduleFormView
+	[StudyScheduleFormData
 	  |
-	  +formViewModel: StudyScheduleControls
+	  +sequenceType: PhaseSequence;
+	  +sequenceTypeCustom: String;
+	  +numCycles: int;
+	  +phaseDuration: int;
+	  +includeBaseline: bool;
+	  +id: String
 	  |
-	  -FormTableRow _renderCustomSequence();
-	  +Widget build()
+	  +StudySchedule toStudySchedule();
+	  +Study apply();
+	  +StudyScheduleFormData copy()
 	]
 	
-	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
+	[StudyScheduleFormData]o-[PhaseSequence]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
 	
-	[&lt;abstract&gt;IStudyFormData
+	[InterventionTaskFormView
 	  |
-	  +Study apply()
+	  +formViewModel: InterventionTaskFormViewModel
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
+	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
 	
-	[StudyInfoFormData
+	[InterventionsFormData
 	  |
-	  +title: String;
-	  +description: String?;
-	  +iconName: String;
-	  +contactInfoFormData: StudyContactInfoFormData;
+	  +interventionsData: List&lt;InterventionFormData&gt;;
+	  +studyScheduleData: StudyScheduleFormData;
 	  +id: String
 	  |
 	  +Study apply();
-	  +StudyInfoFormData copy()
+	  +InterventionsFormData copy()
 	]
 	
-	[StudyInfoFormData]o-[StudyContactInfoFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
+	[InterventionsFormData]o-[StudyScheduleFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
 	
-	[StudyContactInfoFormData
+	[InterventionFormViewModel
 	  |
-	  +organization: String?;
-	  +institutionalReviewBoard: String?;
-	  +institutionalReviewBoardNumber: String?;
-	  +researchers: String?;
-	  +email: String?;
-	  +website: String?;
-	  +phone: String?;
-	  +additionalInfo: String?;
-	  +id: String
+	  +study: Study;
+	  +interventionIdControl: FormControl&lt;String&gt;;
+	  +interventionTitleControl: FormControl&lt;String&gt;;
+	  +interventionIconControl: FormControl&lt;IconOption&gt;;
+	  +interventionDescriptionControl: FormControl&lt;String&gt;;
+	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
+	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
+	  +form: FormGroup;
+	  +interventionId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +atLeastOneTask: dynamic;
+	  +breadcrumbsTitle: String;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
+	  +void setControlsFrom();
+	  +InterventionFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +InterventionTaskFormViewModel provide();
+	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
+	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
+	  +InterventionFormViewModel createDuplicate()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
+	[InterventionFormViewModel]o-[Study]
+	[InterventionFormViewModel]o-[FormControl]
+	[InterventionFormViewModel]o-[FormArray]
+	[InterventionFormViewModel]o-[FormViewModelCollection]
+	[InterventionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
 	
-	[StudyDesignInfoFormView
+	[StudyDesignReportsFormView
 	  |
-	  +Widget build()
+	  +Widget build();
+	  -dynamic _showReportItemSidesheetWithArgs()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
 	
-	[StudyInfoFormViewModel
+	[ReportItemFormData
 	  |
-	  +study: Study;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +organizationControl: FormControl&lt;String&gt;;
-	  +reviewBoardControl: FormControl&lt;String&gt;;
-	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
-	  +researchersControl: FormControl&lt;String&gt;;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +websiteControl: FormControl&lt;String&gt;;
-	  +phoneControl: FormControl&lt;String&gt;;
-	  +additionalInfoControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +iconRequired: dynamic;
-	  +organizationRequired: dynamic;
-	  +reviewBoardRequired: dynamic;
-	  +reviewBoardNumberRequired: dynamic;
-	  +researchersRequired: dynamic;
-	  +emailRequired: dynamic;
-	  +phoneRequired: dynamic;
-	  +emailFormat: dynamic;
-	  +websiteFormat: dynamic
+	  +isPrimary: bool;
+	  +section: ReportSection;
+	  +id: String
 	  |
-	  +void setControlsFrom();
-	  +StudyInfoFormData buildFormData()
+	  &lt;static&gt;+dynamic fromDomainModel();
+	  +ReportItemFormData copy()
 	]
 	
-	[StudyInfoFormViewModel]o-[Study]
-	[StudyInfoFormViewModel]o-[FormControl]
-	[StudyInfoFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
+	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
+	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
 	
-	[MeasurementSurveyFormData
+	[DataReferenceEditor
 	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
+	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
+	  +availableTasks: List&lt;Task&gt;;
+	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
 	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
+	  +FormTableRow buildFormTableRow();
+	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
 	]
 	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
+	[DataReferenceEditor]o-[FormControl]
+	[DataReferenceEditor]o-[ReactiveDropdownField]
 	
-	[MeasurementSurveyFormView
+	[TemporalAggregationFormatted
 	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
+	  -_value: TemporalAggregation;
+	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
+	  +value: TemporalAggregation;
+	  +string: String;
+	  +icon: IconData?;
+	  +hashCode: int
+	  |
+	  +bool ==();
+	  +String toString();
+	  +String toJson();
+	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
 	]
 	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
+	[TemporalAggregationFormatted]o-[TemporalAggregation]
+	[TemporalAggregationFormatted]o-[IconData]
 	
-	[MeasurementSurveyFormViewModel
+	[ImprovementDirectionFormatted
 	  |
-	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
+	  -_value: ImprovementDirection;
+	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
+	  +value: ImprovementDirection;
+	  +string: String;
+	  +icon: IconData?;
+	  +hashCode: int
 	  |
-	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
+	  +bool ==();
+	  +String toString();
+	  +String toJson();
+	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
 	]
 	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
+	[ImprovementDirectionFormatted]o-[ImprovementDirection]
+	[ImprovementDirectionFormatted]o-[IconData]
 	
-	[SurveyPreview
+	[ReportSectionType
 	  |
-	  +routeArgs: MeasurementFormRouteArgs
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
+	  &lt;static&gt;+average: ReportSectionType;
+	  &lt;static&gt;+linearRegression: ReportSectionType
+	]
+	
+	[ReportSectionType]o-[ReportSectionType]
+	[Enum]&lt;:--[ReportSectionType]
+	
+	[AverageSectionFormView
+	  |
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
 	  |
 	  +Widget build()
 	]
 	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
+	[AverageSectionFormView]o-[ReportItemFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
 	
-	[StudyDesignMeasurementsFormView
+	[DataReferenceIdentifier
 	  |
-	  +Widget build()
+	  +hashCode: int
+	  |
+	  +bool ==()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
+	[DataReference]&lt;:-[DataReferenceIdentifier]
 	
-	[MeasurementsFormData
+	[LinearRegressionSectionFormView
 	  |
-	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
-	  +id: String
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
 	  |
-	  +Study apply();
-	  +MeasurementsFormData copy()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
+	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
 	
-	[MeasurementsFormViewModel
+	[ReportItemFormViewModel
 	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +measurementsArray: FormArray&lt;dynamic&gt;;
-	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
+	  &lt;static&gt;+defaultSectionType: ReportSectionType;
+	  +sectionIdControl: FormControl&lt;String&gt;;
+	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +sectionControl: FormControl&lt;ReportSection&gt;;
+	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
+	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
+	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
+	  +alphaControl: FormControl&lt;double&gt;;
+	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
 	  +form: FormGroup;
-	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
+	  +sectionId: String;
+	  +sectionType: ReportSectionType;
+	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
+	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
+	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;;
 	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +measurementRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +dataReferenceRequired: dynamic;
+	  +aggregationRequired: dynamic;
+	  +improvementDirectionRequired: dynamic;
+	  +alphaConfidenceRequired: dynamic
 	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +MeasurementsFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +MeasurementSurveyFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave()
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +ReportItemFormData buildFormData();
+	  +ReportItemFormViewModel createDuplicate();
+	  +dynamic onSectionTypeChanged();
+	  -void _updateFormControls();
+	  +void setControlsFrom()
 	]
 	
-	[MeasurementsFormViewModel]o-[Study]
-	[MeasurementsFormViewModel]o-[GoRouter]
-	[MeasurementsFormViewModel]o-[FormArray]
-	[MeasurementsFormViewModel]o-[FormViewModelCollection]
-	[MeasurementsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
+	[ReportItemFormViewModel]o-[ReportSectionType]
+	[ReportItemFormViewModel]o-[FormControl]
+	[ReportItemFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
 	
-	[StudyFormValidationSet
+	[ReportItemFormView
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: dynamic;
+	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
+	  |
+	  +Widget build();
+	  -dynamic _buildSectionText();
+	  -dynamic _buildSectionTypeHeader()
 	]
 	
-	[Enum]&lt;:--[StudyFormValidationSet]
+	[ReportItemFormView]o-[ReportItemFormViewModel]
+	[ReportItemFormView]o-[Widget Function(BuildContext)]
 	
 	[ReportsFormViewModel
 	  |
@@ -1426,332 +1354,526 @@
 	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
 	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
 	
-	[ReportItemFormData
+	[ReportBadge
 	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
-	  +id: String
+	  +status: ReportStatus?;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +showTooltip: bool
 	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
+	  +Widget build()
 	]
 	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
+	[ReportBadge]o-[ReportStatus]
+	[ReportBadge]o-[BadgeType]
 	
-	[ReportItemFormView
+	[ReportsFormData
 	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
+	  +reportItems: List&lt;ReportItemFormData&gt;;
+	  +id: String
 	  |
-	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
+	  +Study apply();
+	  +ReportsFormData copy()
 	]
 	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
 	
-	[ReportItemFormViewModel
-	  |
-	  &lt;static&gt;+defaultSectionType: ReportSectionType;
-	  +sectionIdControl: FormControl&lt;String&gt;;
-	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +sectionControl: FormControl&lt;ReportSection&gt;;
-	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
-	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
-	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
-	  +alphaControl: FormControl&lt;double&gt;;
-	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +form: FormGroup;
-	  +sectionId: String;
-	  +sectionType: ReportSectionType;
-	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
-	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
-	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +dataReferenceRequired: dynamic;
-	  +aggregationRequired: dynamic;
-	  +improvementDirectionRequired: dynamic;
-	  +alphaConfidenceRequired: dynamic
+	[ReportStatus
 	  |
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +ReportItemFormData buildFormData();
-	  +ReportItemFormViewModel createDuplicate();
-	  +dynamic onSectionTypeChanged();
-	  -void _updateFormControls();
-	  +void setControlsFrom()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
+	  &lt;static&gt;+primary: ReportStatus;
+	  &lt;static&gt;+secondary: ReportStatus
 	]
 	
-	[ReportItemFormViewModel]o-[ReportSectionType]
-	[ReportItemFormViewModel]o-[FormControl]
-	[ReportItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
+	[ReportStatus]o-[ReportStatus]
+	[Enum]&lt;:--[ReportStatus]
 	
-	[TemporalAggregationFormatted
-	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
+	[&lt;abstract&gt;IStudyFormData
 	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
+	  +Study apply()
 	]
 	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
 	
-	[ImprovementDirectionFormatted
-	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
+	[StudyInfoFormViewModel
 	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
-	]
-	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
-	
-	[ReportSectionType
+	  +study: Study;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +iconControl: FormControl&lt;IconOption&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +organizationControl: FormControl&lt;String&gt;;
+	  +reviewBoardControl: FormControl&lt;String&gt;;
+	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
+	  +researchersControl: FormControl&lt;String&gt;;
+	  +emailControl: FormControl&lt;String&gt;;
+	  +websiteControl: FormControl&lt;String&gt;;
+	  +phoneControl: FormControl&lt;String&gt;;
+	  +additionalInfoControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +iconRequired: dynamic;
+	  +organizationRequired: dynamic;
+	  +reviewBoardRequired: dynamic;
+	  +reviewBoardNumberRequired: dynamic;
+	  +researchersRequired: dynamic;
+	  +emailRequired: dynamic;
+	  +phoneRequired: dynamic;
+	  +emailFormat: dynamic;
+	  +websiteFormat: dynamic
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
+	  +void setControlsFrom();
+	  +StudyInfoFormData buildFormData()
 	]
 	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
+	[StudyInfoFormViewModel]o-[Study]
+	[StudyInfoFormViewModel]o-[FormControl]
+	[StudyInfoFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
 	
-	[AverageSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
+	[StudyDesignInfoFormView
 	  |
 	  +Widget build()
 	]
 	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
 	
-	[LinearRegressionSectionFormView
+	[StudyInfoFormData
 	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
+	  +title: String;
+	  +description: String?;
+	  +iconName: String;
+	  +contactInfoFormData: StudyContactInfoFormData;
+	  +id: String
 	  |
-	  +Widget build()
+	  +Study apply();
+	  +StudyInfoFormData copy()
 	]
 	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
+	[StudyInfoFormData]o-[StudyContactInfoFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
 	
-	[DataReferenceIdentifier
+	[StudyContactInfoFormData
 	  |
-	  +hashCode: int
+	  +organization: String?;
+	  +institutionalReviewBoard: String?;
+	  +institutionalReviewBoardNumber: String?;
+	  +researchers: String?;
+	  +email: String?;
+	  +website: String?;
+	  +phone: String?;
+	  +additionalInfo: String?;
+	  +id: String
 	  |
-	  +bool ==()
+	  +Study apply();
+	  +StudyInfoFormData copy()
 	]
 	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
 	
-	[DataReferenceEditor
-	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
+	[StudyFormValidationSet
 	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
 	]
 	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
+	[Enum]&lt;:--[StudyFormValidationSet]
 	
-	[ReportsFormData
+	[MeasurementsFormData
 	  |
-	  +reportItems: List&lt;ReportItemFormData&gt;;
+	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
 	  +id: String
 	  |
 	  +Study apply();
-	  +ReportsFormData copy()
+	  +MeasurementsFormData copy()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
 	
-	[ReportStatus
+	[MeasurementSurveyFormView
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
-	  &lt;static&gt;+primary: ReportStatus;
-	  &lt;static&gt;+secondary: ReportStatus
+	  +formViewModel: MeasurementSurveyFormViewModel
 	]
 	
-	[ReportStatus]o-[ReportStatus]
-	[Enum]&lt;:--[ReportStatus]
+	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
 	
-	[ReportBadge
+	[SurveyPreview
 	  |
-	  +status: ReportStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
+	  +routeArgs: MeasurementFormRouteArgs
 	  |
 	  +Widget build()
 	]
 	
-	[ReportBadge]o-[ReportStatus]
-	[ReportBadge]o-[BadgeType]
-	
-	[StudyDesignReportsFormView
-	  |
-	  +Widget build();
-	  -dynamic _showReportItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
+	[SurveyPreview]o-[MeasurementFormRouteArgs]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
 	
-	[StudyFormScaffold
+	[MeasurementSurveyFormData
 	  |
-	  +studyId: String;
-	  +formViewModelBuilder: T Function(WidgetRef);
-	  +formViewBuilder: Widget Function(T)
+	  +measurementId: String;
+	  +title: String;
+	  +introText: String?;
+	  +outroText: String?;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  &lt;static&gt;+kDefaultTitle: String;
+	  +id: String
 	  |
-	  +Widget build()
+	  +QuestionnaireTask toQuestionnaireTask();
+	  +MeasurementSurveyFormData copy()
 	]
 	
-	[StudyFormScaffold]o-[T Function(WidgetRef)]
-	[StudyFormScaffold]o-[Widget Function(T)]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
+	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
 	
-	[SurveyQuestionFormView
+	[MeasurementSurveyFormViewModel
 	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
+	  +study: Study;
+	  +measurementIdControl: FormControl&lt;String&gt;;
+	  +instanceIdControl: FormControl&lt;String&gt;;
+	  +surveyTitleControl: FormControl&lt;String&gt;;
+	  +surveyIntroTextControl: FormControl&lt;String&gt;;
+	  +surveyOutroTextControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +measurementId: String;
+	  +instanceId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +atLeastOneQuestion: dynamic;
+	  +breadcrumbsTitle: String;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void setControlsFrom();
+	  +MeasurementSurveyFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
+	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
+	  +MeasurementSurveyFormViewModel createDuplicate()
 	]
 	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
+	[MeasurementSurveyFormViewModel]o-[Study]
+	[MeasurementSurveyFormViewModel]o-[FormControl]
+	[MeasurementSurveyFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
 	
-	[QuestionFormViewModel
+	[StudyDesignMeasurementsFormView
 	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +Widget build()
+	]
+	
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
+	
+	[MeasurementsFormViewModel
+	  |
+	  +study: Study;
+	  +router: GoRouter;
+	  +measurementsArray: FormArray&lt;dynamic&gt;;
+	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
 	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
+	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
 	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
+	  +measurementRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void read();
+	  +void setControlsFrom();
+	  +MeasurementsFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +MeasurementSurveyFormViewModel provide();
+	  +void onCancel();
+	  +dynamic onSave()
+	]
+	
+	[MeasurementsFormViewModel]o-[Study]
+	[MeasurementsFormViewModel]o-[GoRouter]
+	[MeasurementsFormViewModel]o-[FormArray]
+	[MeasurementsFormViewModel]o-[FormViewModelCollection]
+	[MeasurementsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
+	
+	[StudyFormScaffold
+	  |
+	  +studyId: String;
+	  +formViewModelBuilder: T Function(WidgetRef);
+	  +formViewBuilder: Widget Function(T)
+	  |
+	  +Widget build()
+	]
+	
+	[StudyFormScaffold]o-[T Function(WidgetRef)]
+	[StudyFormScaffold]o-[Widget Function(T)]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
+	
+	[ConsentItemFormViewModel
+	  |
+	  +consentIdControl: FormControl&lt;String&gt;;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +iconControl: FormControl&lt;IconOption&gt;;
+	  +form: FormGroup;
+	  +consentId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void setControlsFrom();
+	  +ConsentItemFormData buildFormData();
+	  +ConsentItemFormViewModel createDuplicate()
+	]
+	
+	[ConsentItemFormViewModel]o-[FormControl]
+	[ConsentItemFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
+	
+	[StudyDesignEnrollmentFormView
+	  |
+	  +Widget build();
+	  -dynamic _showScreenerQuestionSidesheetWithArgs();
+	  -dynamic _showConsentItemSidesheetWithArgs()
+	]
+	
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
+	
+	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
+	  |
+	  +isDirtyOptionsBannerVisible: bool
+	]
+	
+	[ScreenerQuestionLogicFormView
+	  |
+	  +formViewModel: ScreenerQuestionFormViewModel
+	  |
+	  +Widget build();
+	  -dynamic _buildInfoBanner();
+	  -dynamic _buildAnswerOptionsLogicControls();
+	  -List&lt;Widget&gt; _buildOptionLogicRow()
+	]
+	
+	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
+	
+	[ConsentItemFormData
+	  |
+	  +consentId: String;
+	  +title: String;
+	  +description: String;
+	  +iconName: String?;
+	  +id: String
+	  |
+	  +ConsentItem toConsentItem();
+	  +ConsentItemFormData copy()
+	]
+	
+	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
+	
+	[ConsentItemFormView
+	  |
+	  +formViewModel: ConsentItemFormViewModel
+	]
+	
+	[ConsentItemFormView]o-[ConsentItemFormViewModel]
+	
+	[EnrollmentFormData
+	  |
+	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
+	  +enrollmentType: Participation;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
+	  +id: String
+	  |
+	  +Study apply();
+	  +EnrollmentFormData copy()
+	]
+	
+	[EnrollmentFormData]o-[Participation]
+	[EnrollmentFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
+	
+	[ScreenerQuestionFormViewModel
+	  |
+	  &lt;static&gt;+defaultResponseOptionValidity: bool;
+	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
+	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
+	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
+	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +prevResponseOptionValues: List&lt;dynamic&gt;;
+	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isDirtyOptionsBannerVisible: bool
 	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
 	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
 	  +void setControlsFrom();
 	  +QuestionFormData buildFormData();
+	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
+	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
+	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
+	  +ScreenerQuestionFormViewModel createDuplicate()
+	]
+	
+	[ScreenerQuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
+	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
+	
+	[EnrollmentFormViewModel
+	  |
+	  +study: Study;
+	  +router: GoRouter;
+	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
+	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
+	  +consentItemArray: FormArray&lt;dynamic&gt;;
+	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
+	  +form: FormGroup;
+	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
+	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestScreener: bool;
+	  +canTestConsent: bool;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  |
+	  +void setControlsFrom();
+	  +EnrollmentFormData buildFormData();
+	  +void read();
 	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
 	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
+	  +void onNewItem();
+	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
+	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
+	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
+	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
+	  +dynamic testScreener();
+	  +dynamic testConsent();
+	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
+	]
+	
+	[EnrollmentFormViewModel]o-[Study]
+	[EnrollmentFormViewModel]o-[GoRouter]
+	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
+	[EnrollmentFormViewModel]o-[FormControl]
+	[EnrollmentFormViewModel]o-[FormArray]
+	[EnrollmentFormViewModel]o-[FormViewModelCollection]
+	[EnrollmentFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
+	
+	[EnrollmentFormConsentItemDelegate
+	  |
+	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
+	  +owner: EnrollmentFormViewModel;
+	  +propagateOnSave: bool;
+	  +validationSet: dynamic
+	  |
+	  +void onCancel();
+	  +dynamic onSave();
+	  +ConsentItemFormViewModel provide();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem()
+	]
+	
+	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
+	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
+	
+	[StudyFormViewModel
+	  |
+	  +studyDirtyCopy: Study?;
+	  +studyRepository: IStudyRepository;
+	  +authRepository: IAuthRepository;
+	  +router: GoRouter;
+	  +studyInfoFormViewModel: StudyInfoFormViewModel;
+	  +enrollmentFormViewModel: EnrollmentFormViewModel;
+	  +measurementsFormViewModel: MeasurementsFormViewModel;
+	  +reportsFormViewModel: ReportsFormViewModel;
+	  +interventionsFormViewModel: InterventionsFormViewModel;
+	  +form: FormGroup;
+	  +isStudyReadonly: bool;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void read();
+	  +void setControlsFrom();
+	  +Study buildFormData();
+	  +void dispose();
+	  +void onCancel();
+	  +dynamic onSave();
+	  -dynamic _applyAndSaveSubform()
+	]
+	
+	[StudyFormViewModel]o-[Study]
+	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
+	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyFormViewModel]o-[GoRouter]
+	[StudyFormViewModel]o-[StudyInfoFormViewModel]
+	[StudyFormViewModel]o-[EnrollmentFormViewModel]
+	[StudyFormViewModel]o-[MeasurementsFormViewModel]
+	[StudyFormViewModel]o-[ReportsFormViewModel]
+	[StudyFormViewModel]o-[InterventionsFormViewModel]
+	[StudyFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
+	
+	[&lt;abstract&gt;WithQuestionnaireControls
+	  |
+	  +questionsArray: FormArray&lt;dynamic&gt;;
+	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
+	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
+	  +propagateOnSave: bool;
+	  +questionModels: List&lt;Q&gt;;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  |
+	  +void setQuestionnaireControlsFrom();
+	  +QuestionnaireFormData buildQuestionnaireFormData();
+	  +void read();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +Q provide();
+	  +Q provideQuestionFormViewModel()
+	]
+	
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	
+	[QuestionnaireFormData
+	  |
+	  +questionsData: List&lt;QuestionFormData&gt;?;
+	  +id: String
+	  |
+	  +StudyUQuestionnaire toQuestionnaire();
+	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
+	  +QuestionnaireFormData copy()
 	]
 	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
+	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
 	
 	[&lt;abstract&gt;QuestionFormData
 	  |
@@ -1863,17 +1985,15 @@
 	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
 	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
 	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
+	[AudioRecordingQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
 	]
 	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
+	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
 	
 	[FreeTextQuestionFormView
 	  |
@@ -1888,16 +2008,6 @@
 	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
 	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
 	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
 	[SurveyQuestionType
 	  |
 	  +index: int;
@@ -1913,81 +2023,153 @@
 	[SurveyQuestionType]o-[SurveyQuestionType]
 	[Enum]&lt;:--[SurveyQuestionType]
 	
-	[AudioRecordingQuestionFormView
+	[ImageCapturingQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel
 	  |
 	  +Widget build()
 	]
 	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
+	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
 	
-	[ChoiceQuestionFormView
+	[&lt;abstract&gt;IScaleQuestionFormViewModel
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  +isMidValuesClearedInfoVisible: bool
+	]
+	
+	[ScaleQuestionFormView
 	  |
-	  +Widget build()
+	  +formViewModel: QuestionFormViewModel
 	]
 	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
+	[ScaleQuestionFormView]o-[QuestionFormViewModel]
 	
-	[ImageCapturingQuestionFormView
+	[ChoiceQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel
 	  |
 	  +Widget build()
 	]
 	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
+	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
 	
-	[&lt;abstract&gt;WithQuestionnaireControls
+	[BoolQuestionFormView
 	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  +formViewModel: QuestionFormViewModel
 	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
-	  +void read();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[BoolQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
 	
-	[QuestionnaireFormData
+	[QuestionFormViewModel
 	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
+	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
+	  -_titles: Map&lt;FormMode, String Function()&gt;?;
+	  +questionIdControl: FormControl&lt;String&gt;;
+	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
+	  +questionTextControl: FormControl&lt;String&gt;;
+	  +questionInfoTextControl: FormControl&lt;String&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
+	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +customOptionsMin: int;
+	  +customOptionsMax: int;
+	  +customOptionsInitial: int;
+	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
+	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
+	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
+	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
+	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
+	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
+	  &lt;static&gt;+kDefaultScaleMinValue: int;
+	  &lt;static&gt;+kDefaultScaleMaxValue: int;
+	  &lt;static&gt;+kNumMidValueControls: int;
+	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
+	  +scaleMinValueControl: FormControl&lt;int&gt;;
+	  +scaleMaxValueControl: FormControl&lt;int&gt;;
+	  -_scaleRangeControl: FormControl&lt;int&gt;;
+	  +scaleMinLabelControl: FormControl&lt;String&gt;;
+	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
+	  +scaleMidValueControls: FormArray&lt;int&gt;;
+	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
+	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
+	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
+	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
+	  +prevMidValues: List&lt;int?&gt;?;
+	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
+	  +customRegexControl: FormControl&lt;String&gt;;
+	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
+	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
+	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
+	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
+	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
+	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
+	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +form: FormGroup;
+	  +questionId: String;
+	  +questionType: SurveyQuestionType;
+	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
+	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
+	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +validAnswerOptions: List&lt;String&gt;;
+	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +scaleMinValue: int;
+	  +scaleMaxValue: int;
+	  +scaleRange: int;
+	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +questionTextRequired: dynamic;
+	  +numValidChoiceOptions: dynamic;
+	  +scaleRangeValid: dynamic;
+	  +maxRecordingDurationValid: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +isAddOptionButtonVisible: bool;
+	  +isMidValuesClearedInfoVisible: bool
 	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
+	  +String? scaleMidLabelAt();
+	  -dynamic _onScaleRangeChanged();
+	  -dynamic _applyInputFormatters();
+	  -dynamic _updateScaleMidValueControls();
+	  -Map&lt;String, dynamic&gt;? _validateFreeText();
+	  -dynamic _onFreeTextLengthChanged();
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +dynamic onQuestionTypeChanged();
+	  +dynamic onResponseOptionsChanged();
+	  -void _updateFormControls();
+	  +void initControls();
+	  +void setControlsFrom();
+	  +QuestionFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem();
+	  +dynamic save();
+	  +QuestionFormViewModel createDuplicate()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
+	[QuestionFormViewModel]o-[SurveyQuestionType]
+	[QuestionFormViewModel]o-[FormControl]
+	[QuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
+	[QuestionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
 	
-	[ScheduleControls
-	  |
-	  +formViewModel: WithScheduleControls
+	[SurveyQuestionFormView
 	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
+	  +formViewModel: QuestionFormViewModel;
+	  +isHtmlStyleable: bool
 	]
 	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
+	[SurveyQuestionFormView]o-[QuestionFormViewModel]
 	
 	[&lt;abstract&gt;IFormDataWithSchedule
 	  |
@@ -2004,6 +2186,17 @@
 	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
 	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
 	
+	[ScheduleControls
+	  |
+	  +formViewModel: WithScheduleControls
+	  |
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
+	]
+	
+	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
+	
 	[&lt;abstract&gt;WithScheduleControls
 	  |
 	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
@@ -2020,51 +2213,13 @@
 	  +hasReminder: bool;
 	  +isTimeRestricted: bool;
 	  +timeRestriction: List&lt;Time&gt;?
-	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
-	]
-	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
-	
-	[StudyFormViewModel
-	  |
-	  +studyDirtyCopy: Study?;
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +router: GoRouter;
-	  +studyInfoFormViewModel: StudyInfoFormViewModel;
-	  +enrollmentFormViewModel: EnrollmentFormViewModel;
-	  +measurementsFormViewModel: MeasurementsFormViewModel;
-	  +reportsFormViewModel: ReportsFormViewModel;
-	  +interventionsFormViewModel: InterventionsFormViewModel;
-	  +form: FormGroup;
-	  +isStudyReadonly: bool;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +void dispose();
-	  +void onCancel();
-	  +dynamic onSave();
-	  -dynamic _applyAndSaveSubform()
-	]
-	
-	[StudyFormViewModel]o-[Study]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyFormViewModel]o-[GoRouter]
-	[StudyFormViewModel]o-[StudyInfoFormViewModel]
-	[StudyFormViewModel]o-[EnrollmentFormViewModel]
-	[StudyFormViewModel]o-[MeasurementsFormViewModel]
-	[StudyFormViewModel]o-[ReportsFormViewModel]
-	[StudyFormViewModel]o-[InterventionsFormViewModel]
-	[StudyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
+	  |
+	  +void setScheduleControlsFrom();
+	  -dynamic _initReminderControl()
+	]
+	
+	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
+	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
 	
 	[&lt;abstract&gt;StudyDesignPageWidget
 	  |
@@ -2073,45 +2228,33 @@
 	
 	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
 	
-	[StudyAnalyzeScreen
+	[StudiesTableColumnHeader
 	  |
-	  +Widget? banner();
-	  +Widget build()
+	  +title: String;
+	  +sortable: bool;
+	  +sortAscending: bool;
+	  +sortingActive: bool;
+	  +onSort: void Function()?
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
+	[StudiesTableColumnHeader]o-[void Function()?]
 	
-	[StudyAnalyzeController
+	[DashboardScreen
 	  |
-	  +dynamic onExport()
+	  +filter: StudiesFilter?
 	]
 	
-	[StudyBaseController]&lt;:-[StudyAnalyzeController]
+	[DashboardScreen]o-[StudiesFilter]
 	
-	[StudyMonitorScreen
+	[DashboardScaffold
 	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
-	
-	[StudiesTableItem
+	  &lt;static&gt;+compactWidthThreshold: double;
+	  +body: Widget
 	  |
-	  +study: Study;
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
-	  +isPinned: bool;
-	  +onPinnedChanged: void Function(Study, bool)?;
-	  +onTap: void Function(Study)?
+	  +Widget build()
 	]
 	
-	[StudiesTableItem]o-[Study]
-	[StudiesTableItem]o-[void Function(Study, bool)?]
-	[StudiesTableItem]o-[void Function(Study)?]
+	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
 	
 	[DashboardController
 	  |
@@ -2147,6 +2290,14 @@
 	[DashboardController]o-[SearchController]
 	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
 	
+	[StudiesFilter
+	  |
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
+	]
+	
+	[Enum]&lt;:--[StudiesFilter]
+	
 	[StudiesTableColumnSize
 	  |
 	  +collapsed: bool;
@@ -2199,42 +2350,30 @@
 	[StudiesTableColumn]o-[StudiesTableColumn]
 	[Enum]&lt;:--[StudiesTableColumn]
 	
-	[DashboardScreen
-	  |
-	  +filter: StudiesFilter?
-	]
-	
-	[DashboardScreen]o-[StudiesFilter]
-	
-	[DashboardScaffold
-	  |
-	  &lt;static&gt;+compactWidthThreshold: double;
-	  +body: Widget
+	[StudiesTableItem
 	  |
-	  +Widget build()
+	  +study: Study;
+	  +itemHeight: double;
+	  +itemPadding: double;
+	  +rowSpacing: double;
+	  +columnSpacing: double;
+	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
+	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
+	  +isPinned: bool;
+	  +onPinnedChanged: void Function(Study, bool)?;
+	  +onTap: void Function(Study)?
 	]
 	
-	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
+	[StudiesTableItem]o-[Study]
+	[StudiesTableItem]o-[void Function(Study, bool)?]
+	[StudiesTableItem]o-[void Function(Study)?]
 	
-	[StudiesFilter
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
+	[App
 	]
 	
-	[Enum]&lt;:--[StudiesFilter]
-	
-	[StudiesTableColumnHeader
-	  |
-	  +title: String;
-	  +sortable: bool;
-	  +sortAscending: bool;
-	  +sortingActive: bool;
-	  +onSort: void Function()?
+	[AppContent
 	]
 	
-	[StudiesTableColumnHeader]o-[void Function()?]
-	
 	[AccountSettingsDialog
 	  |
 	  +Widget build()
@@ -2242,3917 +2381,3750 @@
 	
 	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AccountSettingsDialog]
 	
-	[StudyInvitesTable
-	  |
-	  +invites: List&lt;StudyInvite&gt;;
-	  +onSelect: void Function(StudyInvite);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getIntervention: Intervention? Function(String);
-	  +getParticipantCountForInvite: int Function(StudyInvite)
-	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow()
-	]
-	
-	[StudyInvitesTable]o-[void Function(StudyInvite)]
-	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
-	[StudyInvitesTable]o-[Intervention? Function(String)]
-	[StudyInvitesTable]o-[int Function(StudyInvite)]
-	
-	[StudyRecruitController
-	  |
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
-	  |
-	  -dynamic _subscribeInvites();
-	  +Intervention? getIntervention();
-	  +int getParticipantCountForInvite();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void dispose()
-	]
-	
-	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[StudyRecruitController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyRecruitController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
-	
-	[InviteCodeFormViewModel
-	  |
-	  +study: Study;
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  +codeControl: FormControl&lt;String&gt;;
-	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
-	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +interventionAControl: FormControl&lt;String&gt;;
-	  +interventionBControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
-	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +isPreconfiguredSchedule: bool;
-	  +preconfiguredSchedule: List&lt;String&gt;?
-	  |
-	  +void initControls();
-	  -dynamic _uniqueInviteCode();
-	  +void regenerateCode();
-	  -String _generateCode();
-	  +StudyInvite buildFormData();
-	  +void setControlsFrom();
-	  +dynamic save()
-	]
-	
-	[InviteCodeFormViewModel]o-[Study]
-	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[InviteCodeFormViewModel]o-[FormControl]
-	[InviteCodeFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
-	
-	[EnrolledBadge
-	  |
-	  +enrolledCount: int
-	  |
-	  +Widget build()
-	]
-	
-	[InviteCodeFormView
-	  |
-	  +formViewModel: InviteCodeFormViewModel
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
-	]
-	
-	[InviteCodeFormView]o-[InviteCodeFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
-	
-	[StudyRecruitScreen
-	  |
-	  +Widget build();
-	  -Widget _inviteCodesSectionHeader();
-	  -Widget _newInviteCodeButton();
-	  -dynamic _onSelectInvite()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
-	
-	[DrawerEntry
-	  |
-	  +localizedTitle: String Function();
-	  +icon: IconData?;
-	  +localizedHelpText: String Function()?;
-	  +enabled: bool;
-	  +onSelected: void Function(BuildContext, WidgetRef)?;
-	  +autoCloseDrawer: bool;
-	  +title: String;
-	  +helpText: String?
-	  |
-	  +void onClick()
-	]
-	
-	[DrawerEntry]o-[String Function()]
-	[DrawerEntry]o-[IconData]
-	[DrawerEntry]o-[String Function()?]
-	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
-	
-	[GoRouterDrawerEntry
-	  |
-	  +intent: RoutingIntent;
-	  +onNavigated: void Function()?
-	  |
-	  +void onClick()
-	]
-	
-	[GoRouterDrawerEntry]o-[RoutingIntent]
-	[GoRouterDrawerEntry]o-[void Function()?]
-	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
-	
-	[AppDrawer
-	  |
-	  +width: int;
-	  +autoCloseDrawer: bool;
-	  +leftPaddingEntries: double;
-	  +logoPaddingVertical: double;
-	  +logoPaddingHorizontal: double;
-	  +logoMaxHeight: double;
-	  +logoSectionMinHeight: double;
-	  +logoSectionMaxHeight: double
-	]
-	
 	</desc>
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="3778.0" width="44967.0" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="3778.0" width="48837.5" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
 				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M151.9 1515.6 L143.5 1607 L10640.75 2294.101793136207 L10640.8 2294.1 " fill="none"></path>
+					<path d="M19716.9 1408.0 L18636.75 1607 L18636.75 2265 L18636.8 2265.0 " fill="none"></path>
+					<path d="M19717.9 1413.3 L19716.9 1408.0 L19715.9 1402.8 L19730.0 1405.6 Z"></path>
+					<path d="M103.5 2361.2 L103.5 2985 L1100 3143.302597955707 L1100.0 3143.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M158.1 1506.8 L151.9 1515.6 L147.5 1505.8 L153.7 1497.0 Z"></path>
+						<path d="M108.8 2351.8 L103.5 2361.2 L98.2 2351.8 L103.5 2342.5 Z"></path>
 					</g>
-					<path d="M284.1 1510.1 L381.75 1607 L8937.75 2293.1530582552523 L8937.8 2293.2 " fill="none"></path>
+					<path d="M737.6 1410.0 L103.5 1607 L103.5 2249.5 L103.5 2249.5 " fill="none"></path>
+					<path d="M739.2 1415.0 L737.6 1410.0 L736.1 1404.9 L750.4 1406.0 Z"></path>
+					<path d="M676.5 2361.2 L676.5 2985 L1100 3116.4188851913477 L1100.0 3116.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M281.2 1499.8 L284.1 1510.1 L273.7 1507.4 L270.9 1497.0 Z"></path>
+						<path d="M681.8 2351.8 L676.5 2361.2 L671.2 2351.8 L676.5 2342.5 Z"></path>
 					</g>
-					<path d="M417.9 2428.7 L401.75 2985 L9191.5 3169.734568249049 L9191.5 3169.7 " fill="none"></path>
+					<path d="M784.8 1417.6 L676.5 1607 L676.5 2249.5 L676.5 2249.5 " fill="none"></path>
+					<path d="M789.4 1420.2 L784.8 1417.6 L780.1 1414.9 L791.4 1406.0 Z"></path>
+					<path d="M924.0 2361.2 L924 2985 L1119.230563002681 3088 L1119.2 3088.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M423.5 2419.5 L417.9 2428.7 L412.8 2419.2 L418.4 2410.0 Z"></path>
+						<path d="M929.3 2351.8 L924.0 2361.2 L918.7 2351.8 L924.0 2342.5 Z"></path>
 					</g>
-					<path d="M462.6 2427.8 L635.5 2985 L21394.25 3170.739460269865 L21394.3 3170.7 " fill="none"></path>
+					<path d="M815.7 1417.6 L924 1607 L924 2249.5 L924.0 2249.5 " fill="none"></path>
+					<path d="M820.4 1414.9 L815.7 1417.6 L811.1 1420.2 L809.1 1406.0 Z"></path>
+					<path d="M1206.5 2376.2 L1206.5 2985 L1245.7117962466489 3088 L1245.7 3088.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M465.0 2417.3 L462.6 2427.8 L454.8 2420.5 L457.1 2410.0 Z"></path>
+						<path d="M1211.8 2366.8 L1206.5 2376.2 L1201.2 2366.8 L1206.5 2357.5 Z"></path>
 					</g>
-					<path d="M609.2 1489.1 L421.75 1607 L421.75 2182 L421.8 2182.0 " fill="none"></path>
-					<path d="M612.1 1493.6 L609.2 1489.1 L606.4 1484.6 L620.5 1482.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1536.4 1441.2 L1461.75 1607 L1694.125907111756 2250 L1694.1 2250.0 " fill="none"></path>
+					<path d="M841.1 1412.3 L1206.5 1607 L1206.5 2234.5 L1206.5 2234.5 " fill="none"></path>
+					<path d="M843.6 1407.6 L841.1 1412.3 L838.6 1417.0 L829.3 1406.0 Z"></path>
+					<path d="M1353.2 1468.8 L1296 1607 L14216.25 2294.11207378963 L14216.3 2294.1 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1361.6 1462.2 L1353.2 1468.8 L1351.8 1458.1 L1360.3 1451.5 Z"></path>
 					</g>
-					<path d="M1541.3 1443.3 L1536.4 1441.2 L1531.6 1439.0 L1541.9 1429.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1862.3 1472.3 L1862.25 1607 L1720.8646589259797 2250 L1720.9 2250.0 " fill="none"></path>
+					<path d="M1385.5 1470.2 L1385.5 1607 L1385.5 2296 L1385.5 2296 L1385.5 2985 L1385.5 2985 L1325.8538873994637 3088 L1325.9 3088.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1390.8 1460.8 L1385.5 1470.2 L1380.2 1460.8 L1385.5 1451.5 Z"></path>
+					</g>
+					<path d="M1400.2 1469.9 L1425.5 1607 L3556.7022859216254 2280.5 L3556.7 2280.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1403.7 1459.7 L1400.2 1469.9 L1393.2 1461.6 L1396.8 1451.5 Z"></path>
+					</g>
+					<path d="M1850.0 2368.2 L1850 2985 L32856 3171.1607726358147 L32856.0 3171.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1855.3 2358.8 L1850.0 2368.2 L1844.7 2358.8 L1850.0 2349.5 Z"></path>
 					</g>
-					<path d="M1867.6 1472.3 L1862.3 1472.3 L1856.9 1472.3 L1862.3 1459.0 Z"></path>
-					<path d="M2077.4 1163.8 L2074.25 1174 L2074.25 1375 L2074.3 1375.0 " fill="none"></path>
+					<path d="M2267.1 2374.9 L2090 2985 L586.9879356568365 3156 L587.0 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2085.2 1156.5 L2077.4 1163.8 L2075.0 1153.4 L2082.8 1146.0 Z"></path>
+						<path d="M2274.8 2367.5 L2267.1 2374.9 L2264.6 2364.5 L2272.3 2357.0 Z"></path>
 					</g>
-					<path d="M2120.0 1164.7 L2120 1174 L11159.75 1388.5537725765341 L11159.8 1388.6 " fill="none"></path>
+					<path d="M2319.7 2374.5 L2550.5 2985 L32856 3171.1529461168566 L32856.0 3171.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2125.3 1155.3 L2120.0 1164.7 L2114.7 1155.3 L2120.0 1146.0 Z"></path>
+						<path d="M2321.4 2363.8 L2319.7 2374.5 L2311.4 2367.6 L2313.1 2357.0 Z"></path>
 					</g>
-					<path d="M2162.6 1163.8 L2165.75 1174 L2165.75 1390.5 L2165.75 1390.5 L2165.75 1607 L2165.75 1607 L8937.75 2292.406977598237 L8937.8 2292.4 " fill="none"></path>
+					<path d="M35524.8 2562.7 L34876.75 2985 L31289.5 3167.8803731292282 L31289.5 3167.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2165.0 1153.4 L2162.6 1163.8 L2154.8 1156.5 L2157.2 1146.0 Z"></path>
+						<path d="M35535.5 2562.1 L35524.8 2562.7 L35529.7 2553.1 L35540.4 2552.5 Z"></path>
 					</g>
-					<path d="M2293.0 1157.3 L2314.75 1174 L2314.75 1375 L2314.8 1375.0 " fill="none"></path>
+					<path d="M35582.3 2563.8 L35029.25 2985 L16485.5 3170.6589966582114 L16485.5 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2288.8 1147.4 L2293.0 1157.3 L2282.3 1155.9 L2278.2 1146.0 Z"></path>
+						<path d="M35593.0 2562.4 L35582.3 2563.8 L35586.5 2553.9 L35597.2 2552.5 Z"></path>
 					</g>
-					<path d="M26078.8 156.2 L26078.75 203 L26078.75 524 L26078.8 524.0 " fill="none"></path>
+					<path d="M35597.5 2564.1 L35069.25 2985 L34499.75 3157.5617384240454 L34499.8 3157.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26084.1 146.8 L26078.8 156.2 L26073.4 146.8 L26078.8 137.5 Z"></path>
+						<path d="M35608.1 2562.5 L35597.5 2564.1 L35601.4 2554.1 L35612.1 2552.5 Z"></path>
 					</g>
-					<path d="M2480.1 1533.1 L2410.25 1607 L2410.25 2227 L2410.3 2227.0 " fill="none"></path>
+					<path d="M36002.8 2570.6 L36106.5 2985 L32969 3168.200923606763 L32969.0 3168.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2490.4 1529.9 L2480.1 1533.1 L2482.6 1522.6 L2492.9 1519.5 Z"></path>
+						<path d="M36005.7 2560.3 L36002.8 2570.6 L35995.3 2562.8 L35998.2 2552.5 Z"></path>
 					</g>
-					<path d="M2561.8 1537.1 L2536.5 1607 L8937.75 2292.200023303686 L8937.8 2292.2 " fill="none"></path>
+					<path d="M36018.6 2570.3 L36146.5 2985 L39344.75 3168.4880027685917 L39344.8 3168.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2570.0 1530.1 L2561.8 1537.1 L2559.9 1526.5 L2568.1 1519.5 Z"></path>
+						<path d="M36021.0 2559.8 L36018.6 2570.3 L36010.8 2563.0 L36013.1 2552.5 Z"></path>
+					</g>
+					<path d="M36034.4 2570.0 L36186.5 2985 L1455 3170.5517130252942 L1455.0 3170.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M36036.2 2559.4 L36034.4 2570.0 L36026.2 2563.1 L36028.0 2552.5 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M38020.2 96.9 L35934 203 L35934 539.5 L35934 539.5 L35934 876 L35934 876 L35934 1025 L35934 1025 L35934 1174 L35934 1174 L35934 1390.5 L35934 1390.5 L35934 1607 L35934 1607 L35934 2039.5 L35934.0 2039.5 " fill="none"></path>
+					</g>
+					<path d="M38020.5 102.3 L38020.2 96.9 L38019.9 91.6 L38033.5 96.3 Z"></path>
+					<path d="M1472.3 3093.1 L1485 3088 L1492.5 3088 L1492.5 3088 L1500 3171.5 L1500 3171.5 L1492.5 3255 L1492.5 3255 L1485 3255 L1485 3255 L1455 3242.9277108433735 L1455.0 3242.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1461.7 3091.6 L1472.3 3093.1 L1465.6 3101.5 L1455.0 3100.1 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M2994.6 2322.9 L2590.5 2985 L1455 3146.2876999238383 L1455.0 3146.3 " fill="none"></path>
 					</g>
-					<path d="M2741.0 2413.7 L2741 2985 L1350.75 3162.8642599897103 L1350.8 3162.9 " fill="none"></path>
+					<path d="M2999.1 2325.7 L2994.6 2322.9 L2990.0 2320.1 L3001.5 2311.5 Z"></path>
+					<path d="M1027.8 3121.9 L1040 3118 L1047.5 3118 L1047.5 3118 L1055 3171.5 L1055 3171.5 L1047.5 3225 L1047.5 3225 L1040 3225 L1040 3225 L1010 3215.5309734513276 L1010.0 3215.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2746.3 2404.3 L2741.0 2413.7 L2735.7 2404.3 L2741.0 2395.0 Z"></path>
+						<path d="M1017.3 3119.6 L1027.8 3121.9 L1020.5 3129.7 L1010.0 3127.5 Z"></path>
 					</g>
-					<path d="M2696.7 1531.0 L2741 1607 L2741 2197 L2741.0 2197.0 " fill="none"></path>
-					<path d="M2701.3 1528.3 L2696.7 1531.0 L2692.1 1533.7 L2690.0 1519.5 Z"></path>
-					<path d="M2721.9 1530.1 L2781 1607 L3401.0003628447025 2212.5 L3401.0 2212.5 " fill="none"></path>
-					<path d="M2726.2 1526.8 L2721.9 1530.1 L2717.7 1533.3 L2713.8 1519.5 Z"></path>
-					<path d="M2889.5 1476.0 L2821 1607 L5768.75 2282.929694650137 L5768.8 2282.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2898.6 1470.2 L2889.5 1476.0 L2889.1 1465.3 L2898.2 1459.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M2996.0 2323.2 L2630.5 2985 L1010 3156.7177556818183 L1010.0 3156.7 " fill="none"></path>
 					</g>
-					<path d="M2980.8 1475.9 L3052.25 1607 L8791.75 2289.6958135520067 L8791.8 2289.7 " fill="none"></path>
+					<path d="M3000.7 2325.8 L2996.0 2323.2 L2991.3 2320.6 L3002.4 2311.5 Z"></path>
+					<path d="M2204.8 1447.4 L1465.5 1607 L1465.5 2296 L1465.5 2296 L1465.5 2985 L1465.5 2985 L10354.25 3170.0634227345035 L10354.3 3170.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2981.0 1465.1 L2980.8 1475.9 L2971.6 1470.2 L2971.9 1459.5 Z"></path>
+						<path d="M2215.0 1450.6 L2204.8 1447.4 L2212.8 1440.2 L2223.0 1443.4 Z"></path>
 					</g>
-					<path d="M11146.6 1406.0 L9913.75 1607 L9913.75 2219.5 L9913.8 2219.5 " fill="none"></path>
-					<path d="M11147.4 1411.3 L11146.6 1406.0 L11145.7 1400.7 L11159.8 1403.9 Z"></path>
-					<path d="M889.3 2353.2 L889.25 2985 L32133 3171.077148149035 L32133.0 3171.1 " fill="none"></path>
+					<path d="M2204.9 1454.5 L1577.5 1607 L1577.5 2280.5 L1577.5 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M894.6 2343.8 L889.3 2353.2 L883.9 2343.8 L889.3 2334.5 Z"></path>
+						<path d="M2215.2 1457.5 L2204.9 1454.5 L2212.7 1447.1 L2223.0 1450.1 Z"></path>
 					</g>
-					<path d="M824.7 1493.6 L889.25 1607 L889.25 2257.5 L889.3 2257.5 " fill="none"></path>
-					<path d="M829.3 1490.9 L824.7 1493.6 L820.1 1496.2 L818.1 1482.0 Z"></path>
-					<path d="M1587.6 1445.6 L1670.75 1607 L5768.75 2286.5480144404332 L5768.8 2286.5 " fill="none"></path>
+					<path d="M2727.9 1586.6 L2755 1607 L2755 2280.5 L2755.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1588.1 1434.9 L1587.6 1445.6 L1578.6 1439.7 L1579.1 1429.0 Z"></path>
+						<path d="M2723.7 1576.7 L2727.9 1586.6 L2717.2 1585.2 L2713.0 1575.3 Z"></path>
 					</g>
-					<path d="M1596.9 1444.3 L1710.75 1607 L3259.8488751814225 2280.5 L3259.8 2280.5 " fill="none"></path>
+					<path d="M2731.1 1456.1 L3336.25 1607 L16997.25 2292.3876793126046 L16997.3 2292.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1595.9 1433.6 L1596.9 1444.3 L1587.2 1439.7 L1586.2 1429.0 Z"></path>
+						<path d="M2723.3 1448.7 L2731.1 1456.1 L2720.8 1459.0 L2713.0 1451.6 Z"></path>
 					</g>
-					<path d="M3159.6 1483.4 L3092.25 1607 L5768.75 2281.632705322846 L5768.8 2281.6 " fill="none"></path>
+					<path d="M2731.2 1453.2 L3376.25 1607 L3767.7402031930333 2280.5 L3767.7 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3168.8 1477.7 L3159.6 1483.4 L3159.4 1472.6 L3168.6 1467.0 Z"></path>
+						<path d="M2723.3 1445.9 L2731.2 1453.2 L2720.8 1456.3 L2713.0 1448.9 Z"></path>
 					</g>
-					<path d="M3247.2 1484.4 L3295.5 1607 L3295.5 2280.5 L3295.5 2280.5 " fill="none"></path>
+					<path d="M2731.2 1450.6 L3416.25 1607 L16431.25 2293.7048282727724 L16431.3 2293.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3248.8 1473.7 L3247.2 1484.4 L3238.8 1477.6 L3240.4 1467.0 Z"></path>
+						<path d="M2723.3 1443.3 L2731.2 1450.6 L2720.9 1453.7 L2713.0 1446.4 Z"></path>
 					</g>
-					<path d="M3275.1 1482.2 L3363.25 1607 L8791.75 2289.3381373711577 L8791.8 2289.3 " fill="none"></path>
+					<path d="M2731.2 1448.2 L3456.25 1607 L4039.33091436865 2280.5 L4039.3 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3274.1 1471.5 L3275.1 1482.2 L3265.3 1477.7 L3264.3 1467.0 Z"></path>
+						<path d="M2723.3 1441.0 L2731.2 1448.2 L2721.0 1451.4 L2713.0 1444.2 Z"></path>
 					</g>
-					<path d="M3516.3 1470.7 L3516.25 1607 L16273.25 2292.133135864058 L16273.3 2292.1 " fill="none"></path>
+					<path d="M2731.3 1445.9 L3496.25 1607 L14216.25 2293.7258611872994 L14216.3 2293.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3521.6 1461.3 L3516.3 1470.7 L3510.9 1461.3 L3516.3 1452.0 Z"></path>
+						<path d="M2723.2 1438.8 L2731.3 1445.9 L2721.0 1449.2 L2713.0 1442.1 Z"></path>
 					</g>
-					<path d="M12050.7 1026.5 L3516.25 1174 L3516.25 1329 L3516.3 1329.0 " fill="none"></path>
-					<path d="M12050.8 1031.9 L12050.7 1026.5 L12050.6 1021.2 L12064.0 1026.3 Z"></path>
-					<path d="M11147.0 1418.7 L10513.25 1607 L10513.25 2265 L10513.3 2265.0 " fill="none"></path>
-					<path d="M11148.5 1423.8 L11147.0 1418.7 L11145.4 1413.6 L11159.8 1414.9 Z"></path>
-					<path d="M40317.8 2441.7 L40047.5 2985 L40047.5 3156 L40047.5 3156.0 " fill="none"></path>
+					<path d="M2731.3 1440.6 L3605.75 1607 L3605.75 2280.5 L3605.8 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40326.7 2435.7 L40317.8 2441.7 L40317.1 2431.0 L40326.1 2425.0 Z"></path>
+						<path d="M2723.2 1433.6 L2731.3 1440.6 L2721.2 1444.1 L2713.0 1437.1 Z"></path>
 					</g>
-					<path d="M40359.5 2443.3 L40246.5 2985 L34618.25 3169.0313171159323 L34618.3 3169.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40366.7 2435.2 L40359.5 2443.3 L40356.2 2433.0 L40363.3 2425.0 Z"></path>
+					<path d="M43309.8 688.9 L42748 876 L42748 1025 L42748 1025 L42748 1174 L42748 1174 L42748 1359.5 L42748.0 1359.5 " fill="none"></path>
+					<path d="M43311.5 694.0 L43309.8 688.9 L43308.2 683.8 L43322.5 684.7 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M27040.0 111.9 L26810.5 203 L26810.5 524 L26810.5 524.0 " fill="none"></path>
 					</g>
-					<path d="M40432.7 2442.9 L40589.25 2985 L33587.25 3170.007154494581 L33587.3 3170.0 " fill="none"></path>
+					<path d="M27042.0 116.9 L27040.0 111.9 L27038.1 107.0 L27052.4 107.0 Z"></path>
+					<path d="M39850.3 3669.7 L39850.25 3671 L38651.25 3705.106169871795 L38651.3 3705.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40435.2 2432.5 L40432.7 2442.9 L40425.0 2435.4 L40427.5 2425.0 Z"></path>
+						<path d="M39855.6 3660.3 L39850.3 3669.7 L39844.9 3660.3 L39850.3 3651.0 Z"></path>
 					</g>
-					<path d="M40441.1 2442.6 L40629.25 2985 L36049.25 3169.3864004317325 L36049.3 3169.4 " fill="none"></path>
+					<path d="M32687.7 3561.7 L32166.75 3671 L41462.5 3706.3044077134987 L41462.5 3706.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40443.1 2432.1 L40441.1 2442.6 L40433.0 2435.6 L40435.0 2425.0 Z"></path>
+						<path d="M32698.0 3565.0 L32687.7 3561.7 L32695.8 3554.5 L32706.0 3557.8 Z"></path>
 					</g>
-					<path d="M41558.7 632.9 L40390.25 876 L40390.25 1025 L40390.25 1025 L40390.25 1174 L40390.25 1174 L40390.25 1390.5 L40390.25 1390.5 L40390.25 1607 L40390.25 1607 L40390.25 2167 L40390.3 2167.0 " fill="none"></path>
-					<path d="M41559.8 638.1 L41558.7 632.9 L41557.6 627.7 L41571.8 630.2 Z"></path>
-					<path d="M909.8 1492.8 L1070.25 1607 L1070.25 2296 L1070.25 2296 L1070.25 2985 L1070.25 2985 L34467.25 3171.0793337814625 L34467.3 3171.1 " fill="none"></path>
+					<path d="M32912.5 3617.2 L32912.5 3671 L31752.25 3704.156671362447 L31752.3 3704.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M905.3 1483.1 L909.8 1492.8 L899.1 1491.8 L894.6 1482.0 Z"></path>
+						<path d="M32917.8 3607.8 L32912.5 3617.2 L32907.2 3607.8 L32912.5 3598.5 Z"></path>
 					</g>
-					<path d="M927.3 1491.9 L1110.25 1607 L1110.25 2296 L1110.25 2296 L1110.25 2985 L1110.25 2985 L34889.25 3171.2463710273464 L34889.3 3171.2 " fill="none"></path>
+					<path d="M33137.7 3522.5 L37301.5 3671 L32043.25 3705.672463431623 L32043.3 3705.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M922.2 1482.5 L927.3 1491.9 L916.6 1491.5 L911.5 1482.0 Z"></path>
+						<path d="M33128.5 3516.9 L33137.7 3522.5 L33128.1 3527.5 L33119.0 3521.9 Z"></path>
 					</g>
-					<path d="M944.7 1491.2 L1150.25 1607 L1150.25 2296 L1150.25 2296 L1150.25 2985 L1150.25 2985 L21394.25 3170.720202666142 L21394.3 3170.7 " fill="none"></path>
+					<path d="M32912.5 3200.3 L32912.5 3358 L32912.5 3430.5 L32912.5 3430.5 " fill="none"></path>
+					<path d="M32917.8 3200.3 L32912.5 3200.3 L32907.2 3200.3 L32912.5 3187.0 Z"></path>
+					<path d="M5185.8 2383.7 L5185.75 2985 L10354.25 3169.0430071599044 L10354.3 3169.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M939.1 1481.9 L944.7 1491.2 L933.9 1491.2 L928.4 1482.0 Z"></path>
+						<path d="M5191.1 2374.3 L5185.8 2383.7 L5180.4 2374.3 L5185.8 2365.0 Z"></path>
 					</g>
-					<path d="M12050.7 1030.2 L9563.75 1174 L11159.75 1379.9201430274136 L11159.8 1379.9 " fill="none"></path>
-					<path d="M12051.0 1035.5 L12050.7 1030.2 L12050.4 1024.8 L12064.0 1029.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M16873.5 1053.8 L16873.5 1174 L11323.75 1387.347693878457 L11323.8 1387.3 " fill="none"></path>
-					</g>
-					<path d="M16878.8 1053.8 L16873.5 1053.8 L16868.2 1053.8 L16873.5 1040.5 Z"></path>
-					<path d="M2479.1 3121.9 L2491.25 3118 L2498.75 3118 L2498.75 3118 L2506.25 3171.5 L2506.25 3171.5 L2498.75 3225 L2498.75 3225 L2491.25 3225 L2491.25 3225 L2461.25 3215.5309734513276 L2461.3 3215.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2468.5 3119.6 L2479.1 3121.9 L2471.8 3129.7 L2461.3 3127.5 Z"></path>
+						<path d="M27091.5 120.3 L27091.5 203 L27091.5 524 L27091.5 524.0 " fill="none"></path>
 					</g>
+					<path d="M27096.8 120.3 L27091.5 120.3 L27086.2 120.3 L27091.5 107.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M4849.8 2324.1 L4627.75 2985 L2461.25 3160.217801387684 L2461.3 3160.2 " fill="none"></path>
+						<path d="M27151.8 92.4 L34765.75 203 L34765.75 508.5 L34765.8 508.5 " fill="none"></path>
 					</g>
-					<path d="M4854.9 2325.8 L4849.8 2324.1 L4844.7 2322.4 L4854.0 2311.5 Z"></path>
-					<path d="M32437.5 2568.8 L32204 2985 L32204 3156 L32204.0 3156.0 " fill="none"></path>
+					<path d="M27151.9 87.0 L27151.8 92.4 L27151.8 97.7 L27138.5 92.2 Z"></path>
+					<path d="M38014.9 98.7 L36399 203 L36399 539.5 L36399 539.5 L36399 876 L36399 876 L36399 1025 L36399 1025 L36399 1174 L36399 1174 L36399 1390.5 L36399 1390.5 L36399 1607 L36399 1607 L36399 2296 L36399 2296 L36399 2985 L36399 2985 L39344.75 3168.2343450346034 L39344.8 3168.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32446.7 2563.2 L32437.5 2568.8 L32437.4 2558.0 L32446.6 2552.5 Z"></path>
+						<path d="M38024.5 103.5 L38014.9 98.7 L38023.8 92.8 L38033.5 97.5 Z"></path>
 					</g>
-					<path d="M32497.4 2570.2 L32356.5 2985 L9359.5 3170.821259910749 L9359.5 3170.8 " fill="none"></path>
+					<path d="M44329.5 120.3 L44329.5 203 L44329.5 486 L44329.5 486.0 " fill="none"></path>
+					<path d="M44334.8 120.3 L44329.5 120.3 L44324.2 120.3 L44329.5 107.0 Z"></path>
+					<path d="M43305.5 745.3 L43017.75 876 L43017.75 1025 L43017.75 1025 L43017.75 1174 L43017.75 1174 L43017.75 1390.5 L43017.75 1390.5 L43017.75 1607 L43017.75 1607 L43017.75 2296 L43017.75 2296 L43017.75 2985 L43017.75 2985 L28810.25 3169.6672997177407 L28810.3 3169.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32505.4 2563.1 L32497.4 2570.2 L32495.3 2559.6 L32503.4 2552.5 Z"></path>
+						<path d="M43316.2 746.3 L43305.5 745.3 L43311.8 736.6 L43322.5 737.6 Z"></path>
 					</g>
-					<path d="M32513.2 2570.5 L32396.5 2985 L34889.25 3168.1207779419005 L34889.3 3168.1 " fill="none"></path>
+					<path d="M43341.0 867.5 L43330.25 876 L43330.25 1009.5 L43330.3 1009.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32520.9 2562.9 L32513.2 2570.5 L32510.6 2560.0 L32518.3 2552.5 Z"></path>
+						<path d="M43351.7 866.0 L43341.0 867.5 L43345.1 857.6 L43355.7 856.0 Z"></path>
 					</g>
-					<path d="M32659.3 2570.6 L32763 2985 L33474.25 3157.775154672745 L33474.3 3157.8 " fill="none"></path>
+					<path d="M43893.4 873.3 L43894.5 876 L43894.5 986.5 L43894.5 986.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32662.2 2560.3 L32659.3 2570.6 L32651.8 2562.8 L32654.7 2552.5 Z"></path>
+						<path d="M43894.9 862.7 L43893.4 873.3 L43885.0 866.7 L43886.4 856.0 Z"></path>
 					</g>
-					<path d="M32675.1 2570.3 L32803 2985 L35944.25 3168.4342465753425 L35944.3 3168.4 " fill="none"></path>
+					<path d="M44209.8 856.4 L44237.75 876 L44237.75 1025 L44237.75 1025 L44237.75 1174 L44237.75 1174 L44237.75 1390.5 L44237.75 1390.5 L44237.75 1607 L44237.75 1607 L44237.75 2296 L44237.75 2296 L44237.75 2985 L44237.75 2985 L44237.75 3171.5 L44237.75 3171.5 L44237.75 3358 L44237.75 3358 L44237.75 3514.5 L44237.75 3514.5 L44237.75 3671 L44237.75 3671 L41565.5 3705.8287746672786 L41565.5 3705.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32677.5 2559.8 L32675.1 2570.3 L32667.3 2563.0 L32669.6 2552.5 Z"></path>
+						<path d="M44205.2 846.6 L44209.8 856.4 L44199.1 855.4 L44194.5 845.6 Z"></path>
 					</g>
-					<path d="M32690.9 2570.0 L32843 2985 L3784.25 3170.3677155928 L3784.3 3170.4 " fill="none"></path>
+					<path d="M44210.8 788.7 L44369.25 876 L44369.25 1009.5 L44369.3 1009.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32692.7 2559.4 L32690.9 2570.0 L32682.7 2563.1 L32684.5 2552.5 Z"></path>
+						<path d="M44205.2 779.6 L44210.8 788.7 L44200.1 788.9 L44194.5 779.7 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M36916.2 94.2 L32590.5 203 L32590.5 539.5 L32590.5 539.5 L32590.5 876 L32590.5 876 L32590.5 1025 L32590.5 1025 L32590.5 1174 L32590.5 1174 L32590.5 1390.5 L32590.5 1390.5 L32590.5 1607 L32590.5 1607 L32590.5 2039.5 L32590.5 2039.5 " fill="none"></path>
+						<path d="M38233.8 93.6 L43758.5 203 L43758.5 223 L43758.5 223.0 " fill="none"></path>
 					</g>
-					<path d="M36916.3 99.5 L36916.2 94.2 L36916.0 88.9 L36929.5 93.9 Z"></path>
-					<path d="M3801.6 3093.1 L3814.25 3088 L3821.75 3088 L3821.75 3088 L3829.25 3171.5 L3829.25 3171.5 L3821.75 3255 L3821.75 3255 L3814.25 3255 L3814.25 3255 L3784.25 3242.9277108433735 L3784.3 3242.9 " fill="none"></path>
+					<path d="M38233.9 88.3 L38233.8 93.6 L38233.7 98.9 L38220.5 93.4 Z"></path>
+					<path d="M28827.8 3114.9 L28840.25 3110.5 L28847.75 3110.5 L28847.75 3110.5 L28855.25 3171.5 L28855.25 3171.5 L28847.75 3232.5 L28847.75 3232.5 L28840.25 3232.5 L28840.25 3232.5 L28810.25 3221.7982456140353 L28810.3 3221.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3790.9 3091.6 L3801.6 3093.1 L3794.9 3101.5 L3784.3 3100.1 Z"></path>
+						<path d="M28817.2 3113.0 L28827.8 3114.9 L28820.8 3123.1 L28810.3 3121.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M4857.6 2324.8 L4819.25 2985 L3784.25 3144.19793814433 L3784.3 3144.2 " fill="none"></path>
+						<path d="M2997.4 2323.5 L2670.5 2985 L28528.25 3170.4885475263236 L28528.3 3170.5 " fill="none"></path>
 					</g>
-					<path d="M4862.9 2325.1 L4857.6 2324.8 L4852.3 2324.5 L4858.4 2311.5 Z"></path>
-					<path d="M3726.0 2361.2 L3726 2985 L3660.1407506702412 3088 L3660.1 3088.0 " fill="none"></path>
+					<path d="M3002.2 2325.8 L2997.4 2323.5 L2992.7 2321.1 L3003.3 2311.5 Z"></path>
+					<path d="M5748.9 2404.8 L5509.75 2985 L31329.5 3170.8127309209826 L31329.5 3170.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3731.3 2351.8 L3726.0 2361.2 L3720.7 2351.8 L3726.0 2342.5 Z"></path>
+						<path d="M5757.4 2398.2 L5748.9 2404.8 L5747.5 2394.1 L5756.0 2387.5 Z"></path>
 					</g>
-					<path d="M3945.5 1414.8 L3726 1607 L3726 2249.5 L3726.0 2249.5 " fill="none"></path>
-					<path d="M3949.0 1418.8 L3945.5 1414.8 L3942.0 1410.8 L3955.5 1406.0 Z"></path>
-					<path d="M3973.5 2361.2 L3973.5 2985 L3770.951742627346 3088 L3771.0 3088.0 " fill="none"></path>
+					<path d="M5831.3 2405.2 L6030.5 2985 L13783.5 3169.477481500383 L13783.5 3169.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3978.8 2351.8 L3973.5 2361.2 L3968.2 2351.8 L3973.5 2342.5 Z"></path>
+						<path d="M5833.3 2394.6 L5831.3 2405.2 L5823.2 2398.1 L5825.2 2387.5 Z"></path>
+					</g>
+					<path d="M4960.9 1444.1 L4091.25 1607 L5567.656023222061 2204.5 L5567.7 2204.5 " fill="none"></path>
+					<path d="M4961.9 1449.3 L4960.9 1444.1 L4959.9 1438.9 L4974.0 1441.6 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M7015.1 1419.3 L6997.75 1607 L5953.64259796807 2204.5 L5953.6 2204.5 " fill="none"></path>
 					</g>
-					<path d="M3973.3 1419.3 L3973.5 1607 L3973.5 2249.5 L3973.5 2249.5 " fill="none"></path>
-					<path d="M3978.6 1419.3 L3973.3 1419.3 L3967.9 1419.3 L3973.3 1406.0 Z"></path>
-					<path d="M4220.5 2361.2 L4220.5 2985 L3784.25 3117.563136456212 L3784.3 3117.6 " fill="none"></path>
+					<path d="M7020.4 1419.8 L7015.1 1419.3 L7009.8 1418.8 L7016.3 1406.0 Z"></path>
+					<path d="M19717.0 1413.6 L18921.75 1607 L18921.75 2242.5 L18921.8 2242.5 " fill="none"></path>
+					<path d="M19718.3 1418.8 L19717.0 1413.6 L19715.8 1408.4 L19730.0 1410.4 Z"></path>
+					<path d="M36658.0 1463.2 L36658 1607 L42310.75 2257.615117978701 L42310.8 2257.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4225.8 2351.8 L4220.5 2361.2 L4215.2 2351.8 L4220.5 2342.5 Z"></path>
+						<path d="M36663.3 1453.8 L36658.0 1463.2 L36652.7 1453.8 L36658.0 1444.5 Z"></path>
 					</g>
-					<path d="M4001.0 1414.8 L4220.5 1607 L4220.5 2249.5 L4220.5 2249.5 " fill="none"></path>
-					<path d="M4004.5 1410.8 L4001.0 1414.8 L3997.5 1418.8 L3991.0 1406.0 Z"></path>
-					<path d="M6307.3 2368.2 L6307.25 2985 L33474.25 3171.1129355152716 L33474.3 3171.1 " fill="none"></path>
+					<path d="M38906.6 555.1 L36658 876 L36658 1025 L36658 1025 L36658 1174 L36658 1174 L36658 1336.5 L36658.0 1336.5 " fill="none"></path>
+					<path d="M38907.3 560.4 L38906.6 555.1 L38905.8 549.8 L38919.8 553.2 Z"></path>
+					<path d="M44808.4 182.6 L44741 203 L44741 524 L44741.0 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6312.6 2358.8 L6307.3 2368.2 L6301.9 2358.8 L6307.3 2349.5 Z"></path>
+						<path d="M44818.9 185.0 L44808.4 182.6 L44815.8 174.8 L44826.3 177.2 Z"></path>
 					</g>
-					<path d="M6724.3 2374.9 L6547.25 2985 L4319.75 3157.5560747663553 L4319.8 3157.6 " fill="none"></path>
+					<path d="M45102.1 201.6 L45102 203 L45102 524 L45102.0 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6732.1 2367.5 L6724.3 2374.9 L6721.8 2364.5 L6729.5 2357.0 Z"></path>
+						<path d="M45108.0 192.7 L45102.1 201.6 L45097.4 192.0 L45103.3 183.0 Z"></path>
 					</g>
-					<path d="M6863.3 2366.7 L7878 2985 L33474.25 3171.0892350722634 L33474.3 3171.1 " fill="none"></path>
+					<path d="M45410.1 182.6 L45477.5 203 L45477.5 524 L45477.5 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6858.1 2357.3 L6863.3 2366.7 L6852.6 2366.4 L6847.4 2357.0 Z"></path>
+						<path d="M45402.7 174.8 L45410.1 182.6 L45399.6 185.0 L45392.3 177.2 Z"></path>
 					</g>
-					<path d="M4503.0 2376.2 L4503 2985 L3784.25 3134.5641562064156 L3784.3 3134.6 " fill="none"></path>
+					<path d="M45410.6 144.2 L45747 203 L45747 524 L45747.0 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4508.3 2366.8 L4503.0 2376.2 L4497.7 2366.8 L4503.0 2357.5 Z"></path>
+						<path d="M45402.4 137.3 L45410.6 144.2 L45400.5 147.8 L45392.3 141.0 Z"></path>
 					</g>
-					<path d="M4023.5 1411.0 L4503 1607 L4503 2234.5 L4503.0 2234.5 " fill="none"></path>
-					<path d="M4025.5 1406.1 L4023.5 1411.0 L4021.5 1416.0 L4011.2 1406.0 Z"></path>
-					<path d="M5471.3 1440.1 L4976 1607 L8937.75 2289.8809181312154 L8937.8 2289.9 " fill="none"></path>
+					<path d="M42588.1 2503.0 L42457.5 2985 L40692.25 3168.3323820130863 L40692.3 3168.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5481.9 1442.2 L5471.3 1440.1 L5478.5 1432.1 L5489.0 1434.1 Z"></path>
+						<path d="M42595.7 2495.4 L42588.1 2503.0 L42585.4 2492.6 L42593.0 2485.0 Z"></path>
 					</g>
-					<path d="M5658.0 1468.1 L5728.75 1607 L5728.75 2296 L5728.75 2296 L5728.75 2985 L5728.75 2985 L3784.25 3155.899740810556 L3784.3 3155.9 " fill="none"></path>
+					<path d="M42600.1 2503.3 L42497.5 2985 L31520.5 3169.8914427636037 L31520.5 3169.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5658.6 1457.4 L5658.0 1468.1 L5649.0 1462.2 L5649.6 1451.5 Z"></path>
+						<path d="M42607.3 2495.2 L42600.1 2503.3 L42596.8 2493.0 L42604.0 2485.0 Z"></path>
 					</g>
-					<path d="M5689.8 1465.0 L5825.75 1607 L7452.804789550072 2280.5 L7452.8 2280.5 " fill="none"></path>
+					<path d="M42688.4 2503.3 L42791 2985 L32969 3170.43331477451 L32969.0 3170.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5687.2 1454.6 L5689.8 1465.0 L5679.5 1461.9 L5676.9 1451.5 Z"></path>
+						<path d="M42691.7 2493.0 L42688.4 2503.3 L42681.2 2495.2 L42684.5 2485.0 Z"></path>
 					</g>
-					<path d="M11147.8 1437.3 L10806.75 1607 L10806.75 2265 L10806.8 2265.0 " fill="none"></path>
-					<path d="M11150.2 1442.0 L11147.8 1437.3 L11145.4 1432.5 L11159.8 1431.3 Z"></path>
-					<path d="M11335.8 1434.8 L11701.25 1607 L11701.25 2265 L11701.3 2265.0 " fill="none"></path>
-					<path d="M11338.1 1430.0 L11335.8 1434.8 L11333.5 1439.6 L11323.8 1429.1 Z"></path>
-					<path d="M11336.5 1419.5 L11948.75 1607 L11948.75 2265 L11948.8 2265.0 " fill="none"></path>
-					<path d="M11338.1 1414.4 L11336.5 1419.5 L11334.9 1424.6 L11323.8 1415.6 Z"></path>
-					<path d="M6344.7 1473.6 L5922.75 1607 L5922.75 2296 L5922.75 2296 L5922.75 2985 L5922.75 2985 L6096.959115281501 3156 L6097.0 3156.0 " fill="none"></path>
+					<path d="M42700.4 2503.0 L42831 2985 L39449.75 3168.648525664361 L39449.8 3168.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6355.2 1475.9 L6344.7 1473.6 L6352.0 1465.7 L6362.5 1468.0 Z"></path>
+						<path d="M42703.1 2492.6 L42700.4 2503.0 L42692.8 2495.4 L42695.5 2485.0 Z"></path>
 					</g>
-					<path d="M6345.0 1489.7 L6034.75 1607 L6034.75 2280.5 L6034.8 2280.5 " fill="none"></path>
+					<path d="M44206.6 742.7 L44500.75 876 L44500.75 1025 L44500.75 1025 L44500.75 1174 L44500.75 1174 L44500.75 1390.5 L44500.75 1390.5 L44500.75 1607 L44500.75 1607 L42977.75 2172.228656073256 L42977.8 2172.2 " fill="none"></path>
+					<path d="M44208.8 737.8 L44206.6 742.7 L44204.4 747.5 L44194.5 737.2 Z"></path>
+					<path d="M19717.5 1424.7 L19214.25 1607 L19214.25 2265 L19214.3 2265.0 " fill="none"></path>
+					<path d="M19719.3 1429.8 L19717.5 1424.7 L19715.6 1419.7 L19730.0 1420.2 Z"></path>
+					<path d="M19899.6 1443.9 L20166.75 1607 L20166.75 2265 L20166.8 2265.0 " fill="none"></path>
+					<path d="M19902.4 1439.4 L19899.6 1443.9 L19896.8 1448.5 L19888.2 1437.0 Z"></path>
+					<path d="M19906.5 1426.1 L20386.75 1607 L20386.75 2265 L20386.8 2265.0 " fill="none"></path>
+					<path d="M19908.4 1421.1 L19906.5 1426.1 L19904.6 1431.1 L19894.0 1421.4 Z"></path>
+					<path d="M11722.5 1470.7 L11722.5 1607 L16997.25 2286.721840370318 L16997.3 2286.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6355.7 1491.4 L6345.0 1489.7 L6351.9 1481.4 L6362.5 1483.1 Z"></path>
+						<path d="M11727.8 1461.3 L11722.5 1470.7 L11717.2 1461.3 L11722.5 1452.0 Z"></path>
 					</g>
-					<path d="M6870.1 1484.5 L7212.25 1607 L7212.25 2280.5 L7212.3 2280.5 " fill="none"></path>
+					<path d="M17400.9 1027.3 L11722.5 1174 L11722.5 1329 L11722.5 1329.0 " fill="none"></path>
+					<path d="M17401.1 1032.6 L17400.9 1027.3 L17400.8 1022.0 L17414.3 1027.0 Z"></path>
+					<path d="M8024.5 1438.6 L7745.5 1607 L9688.044085631349 2280.5 L9688.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6863.1 1476.3 L6870.1 1484.5 L6859.5 1486.4 L6852.5 1478.2 Z"></path>
+						<path d="M8035.2 1438.4 L8024.5 1438.6 L8029.7 1429.3 L8040.5 1429.0 Z"></path>
 					</g>
-					<path d="M6870.2 1476.2 L7271.25 1607 L16273.25 2290.532951289398 L16273.3 2290.5 " fill="none"></path>
+					<path d="M8132.6 1445.6 L8215.75 1607 L8363.841799709724 2280.5 L8363.8 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6863.0 1468.2 L6870.2 1476.2 L6859.7 1478.4 L6852.5 1470.4 Z"></path>
+						<path d="M8133.1 1434.9 L8132.6 1445.6 L8123.6 1439.7 L8124.1 1429.0 Z"></path>
 					</g>
-					<path d="M6870.3 1471.4 L7311.25 1607 L7653.376269956459 2280.5 L7653.4 2280.5 " fill="none"></path>
+					<path d="M8359.3 1483.6 L8295.75 1607 L9700.422714078375 2280.5 L9700.4 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6863.0 1463.5 L6870.3 1471.4 L6859.9 1473.7 L6852.5 1465.9 Z"></path>
+						<path d="M8368.3 1477.7 L8359.3 1483.6 L8358.8 1472.9 L8367.9 1467.0 Z"></path>
 					</g>
-					<path d="M6870.4 1467.0 L7351.25 1607 L20068.5 2293.651274415689 L20068.5 2293.7 " fill="none"></path>
+					<path d="M8457.0 1483.5 L8523 1607 L8370.753809869377 2280.5 L8370.8 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6863.0 1459.3 L6870.4 1467.0 L6860.0 1469.5 L6852.5 1461.8 Z"></path>
+						<path d="M8457.3 1472.7 L8457.0 1483.5 L8447.8 1477.7 L8448.2 1467.0 Z"></path>
 					</g>
-					<path d="M6870.5 1463.1 L7391.25 1607 L7924.9669811320755 2280.5 L7925.0 2280.5 " fill="none"></path>
+					<path d="M8473.2 1482.2 L8563 1607 L11459.25 2283.618208018988 L11459.3 2283.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6862.9 1455.5 L6870.5 1463.1 L6860.1 1465.8 L6852.5 1458.2 Z"></path>
+						<path d="M8472.1 1471.5 L8473.2 1482.2 L8463.4 1477.7 L8462.3 1467.0 Z"></path>
 					</g>
-					<path d="M6870.6 1459.6 L7431.25 1607 L8938.560595065312 2280.5 L8938.6 2280.5 " fill="none"></path>
+					<path d="M8671.3 1537.3 L8648.75 1607 L8648.75 2227 L8648.8 2227.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6862.9 1452.1 L6870.6 1459.6 L6860.2 1462.4 L6852.5 1454.9 Z"></path>
+						<path d="M8679.2 1530.0 L8671.3 1537.3 L8669.1 1526.7 L8677.0 1519.5 Z"></path>
 					</g>
-					<path d="M6870.6 1455.0 L7490.25 1607 L7490.25 2280.5 L7490.3 2280.5 " fill="none"></path>
+					<path d="M8749.9 1537.8 L8764.5 1607 L14216.25 2291.542484851246 L14216.3 2291.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6862.8 1447.6 L6870.6 1455.0 L6860.3 1458.0 L6852.5 1450.6 Z"></path>
+						<path d="M8753.2 1527.5 L8749.9 1537.8 L8742.7 1529.7 L8746.0 1519.5 Z"></path>
 					</g>
-					<path d="M41558.8 649.0 L40628.25 876 L40628.25 1025 L40628.25 1025 L40628.25 1174 L40628.25 1174 L40628.25 1359.5 L40628.3 1359.5 " fill="none"></path>
-					<path d="M41560.1 654.2 L41558.8 649.0 L41557.5 643.8 L41571.8 645.9 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M27965.9 95.5 L26358.75 203 L26358.75 524 L26358.8 524.0 " fill="none"></path>
+					<path d="M9966.3 2413.7 L9966.25 2985 L11087.75 3160.912321278385 L11087.8 3160.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M9971.6 2404.3 L9966.3 2413.7 L9960.9 2404.3 L9966.3 2395.0 Z"></path>
 					</g>
-					<path d="M27966.3 100.9 L27965.9 95.5 L27965.6 90.2 L27979.3 94.6 Z"></path>
-					<path d="M36948.8 3669.7 L36948.75 3671 L35569.75 3705.281862745098 L35569.8 3705.3 " fill="none"></path>
+					<path d="M8794.0 1531.3 L8834.5 1607 L9829.75 2212.899933730948 L9829.8 2212.9 " fill="none"></path>
+					<path d="M8798.7 1528.7 L8794.0 1531.3 L8789.3 1533.8 L8787.7 1519.5 Z"></path>
+					<path d="M8819.3 1530.3 L8874.5 1607 L10142.75 2247.7510540788267 L10142.8 2247.8 " fill="none"></path>
+					<path d="M8823.7 1527.2 L8819.3 1530.3 L8815.0 1533.4 L8811.6 1519.5 Z"></path>
+					<path d="M4501.0 2428.0 L4350.25 2985 L16317.5 3170.20005186184 L16317.5 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36954.1 3660.3 L36948.8 3669.7 L36943.4 3660.3 L36948.8 3651.0 Z"></path>
+						<path d="M4508.6 2420.4 L4501.0 2428.0 L4498.3 2417.6 L4505.9 2410.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M28086.6 93.4 L31654.5 203 L31654.5 524 L31654.5 524.0 " fill="none"></path>
+					<path d="M4564.3 2428.3 L4680 2985 L13783.5 3169.7747456059205 L13783.5 3169.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M4567.6 2418.1 L4564.3 2428.3 L4557.1 2420.2 L4560.5 2410.0 Z"></path>
 					</g>
-					<path d="M28086.7 88.0 L28086.6 93.4 L28086.4 98.7 L28073.3 92.9 Z"></path>
+					<path d="M4961.2 1477.6 L4536.75 1607 L4536.75 2182 L4536.8 2182.0 " fill="none"></path>
+					<path d="M4962.8 1482.7 L4961.2 1477.6 L4959.7 1472.5 L4974.0 1473.7 Z"></path>
+					<path d="M17400.9 1027.4 L11897.75 1174 L19730 1388.256831032631 L19730.0 1388.3 " fill="none"></path>
+					<path d="M17401.1 1032.7 L17400.9 1027.4 L17400.8 1022.0 L17414.3 1027.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M28086.6 93.2 L31880 203 L31880 508.5 L31880.0 508.5 " fill="none"></path>
+						<path d="M20989.8 1053.8 L20989.75 1174 L19894 1375.42634260242 L19894.0 1375.4 " fill="none"></path>
 					</g>
-					<path d="M28086.7 87.9 L28086.6 93.2 L28086.4 98.6 L28073.3 92.9 Z"></path>
-					<path d="M36910.8 94.7 L33055.5 203 L33055.5 539.5 L33055.5 539.5 L33055.5 876 L33055.5 876 L33055.5 1025 L33055.5 1025 L33055.5 1174 L33055.5 1174 L33055.5 1390.5 L33055.5 1390.5 L33055.5 1607 L33055.5 1607 L33055.5 2296 L33055.5 2296 L33055.5 2985 L33055.5 2985 L35944.25 3168.1710582235446 L35944.3 3168.2 " fill="none"></path>
+					<path d="M20995.1 1053.8 L20989.8 1053.8 L20984.4 1053.8 L20989.8 1040.5 Z"></path>
+					<path d="M9259.7 1475.9 L9188.25 1607 L9720.500725689404 2280.5 L9720.5 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36920.3 99.7 L36910.8 94.7 L36920.0 89.1 L36929.5 94.1 Z"></path>
+						<path d="M9268.9 1470.2 L9259.7 1475.9 L9259.5 1465.1 L9268.6 1459.5 Z"></path>
 					</g>
-					<path d="M42578.8 120.3 L42578.75 203 L42578.75 486 L42578.8 486.0 " fill="none"></path>
-					<path d="M42584.1 120.3 L42578.8 120.3 L42573.4 120.3 L42578.8 107.0 Z"></path>
-					<path d="M41553.8 673.4 L40867.25 876 L40867.25 1025 L40867.25 1025 L40867.25 1174 L40867.25 1174 L40867.25 1390.5 L40867.25 1390.5 L40867.25 1607 L40867.25 1607 L40867.25 2296 L40867.25 2296 L40867.25 2985 L40867.25 2985 L28977.5 3169.3142260457576 L28977.5 3169.3 " fill="none"></path>
+					<path d="M9438.0 1464.1 L9693.75 1607 L11471.340348330914 2280.5 L11471.3 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41564.3 675.9 L41553.8 673.4 L41561.3 665.7 L41571.8 668.1 Z"></path>
+						<path d="M9432.5 1454.9 L9438.0 1464.1 L9427.3 1464.2 L9421.8 1455.0 Z"></path>
 					</g>
-					<path d="M41554.1 692.5 L41009.75 876 L41009.75 1009.5 L41009.8 1009.5 " fill="none"></path>
+					<path d="M5068.6 1491.2 L4863.25 1607 L4863.25 2296 L4863.25 2296 L4863.25 2985 L4863.25 2985 L33238 3171.00507464785 L33238.0 3171.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41564.6 694.5 L41554.1 692.5 L41561.2 684.4 L41571.8 686.5 Z"></path>
+						<path d="M5079.3 1491.2 L5068.6 1491.2 L5074.1 1481.9 L5084.8 1482.0 Z"></path>
 					</g>
-					<path d="M41554.7 743.6 L41260.75 876 L41260.75 986.5 L41260.8 986.5 " fill="none"></path>
+					<path d="M5085.9 1491.9 L4903.25 1607 L4903.25 2296 L4903.25 2296 L4903.25 2985 L4903.25 2985 L34407.75 3171.2096834232925 L34407.8 3171.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41565.4 744.6 L41554.7 743.6 L41561.0 734.9 L41571.8 735.9 Z"></path>
+						<path d="M5096.7 1491.5 L5085.9 1491.9 L5091.0 1482.5 L5101.7 1482.0 Z"></path>
 					</g>
-					<path d="M42461.0 729.4 L42811 876 L42811 1025 L42811 1025 L42811 1174 L42811 1174 L42811 1390.5 L42811 1390.5 L42811 1607 L42811 1607 L42811 2296 L42811 2296 L42811 2985 L42811 2985 L42811 3171.5 L42811 3171.5 L42811 3358 L42811 3358 L42811 3514.5 L42811 3514.5 L42811 3671 L42811 3671 L41034.25 3705.5 L41034.3 3705.5 " fill="none"></path>
+					<path d="M5538.4 1441.0 L6495.25 1607 L6495.25 2296 L6495.25 2296 L6495.25 2985 L6495.25 2985 L13783.5 3169.3499983046827 L13783.5 3169.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42454.4 720.8 L42461.0 729.4 L42450.3 730.7 L42443.8 722.2 Z"></path>
+						<path d="M5530.1 1434.2 L5538.4 1441.0 L5528.3 1444.7 L5520.0 1437.8 Z"></path>
 					</g>
-					<path d="M42461.3 702.8 L42942.5 876 L42942.5 1009.5 L42942.5 1009.5 " fill="none"></path>
+					<path d="M46265.0 156.2 L46265 203 L46265 524 L46265.0 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42454.3 694.6 L42461.3 702.8 L42450.7 704.6 L42443.8 696.5 Z"></path>
+						<path d="M46270.3 146.8 L46265.0 156.2 L46259.7 146.8 L46265.0 137.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M37129.8 93.9 L42007.75 203 L42007.75 223 L42007.8 223.0 " fill="none"></path>
-					</g>
-					<path d="M37129.9 88.6 L37129.8 93.9 L37129.7 99.2 L37116.5 93.6 Z"></path>
-					<path d="M28995.1 3114.9 L29007.5 3110.5 L29015 3110.5 L29015 3110.5 L29022.5 3171.5 L29022.5 3171.5 L29015 3232.5 L29015 3232.5 L29007.5 3232.5 L29007.5 3232.5 L28977.5 3221.7982456140353 L28977.5 3221.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28984.5 3113.0 L28995.1 3114.9 L28988.1 3123.1 L28977.5 3121.2 Z"></path>
+						<path d="M8138.8 1439.9 L8255.75 1607 L8978.541727140784 2250 L8978.5 2250.0 " fill="none"></path>
 					</g>
+					<path d="M8143.2 1436.9 L8138.8 1439.9 L8134.5 1443.0 L8131.2 1429.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M4859.3 2324.8 L4859.25 2985 L28695.5 3170.4032728940974 L28695.5 3170.4 " fill="none"></path>
+						<path d="M9030.3 1472.3 L9030.25 1607 L9030.25 2250 L9030.3 2250.0 " fill="none"></path>
 					</g>
-					<path d="M4864.6 2324.8 L4859.3 2324.8 L4853.9 2324.8 L4859.3 2311.5 Z"></path>
-					<path d="M33305.6 3524.1 L29865 3671 L40931.25 3706.335555755436 L40931.3 3706.3 " fill="none"></path>
+					<path d="M9035.6 1472.3 L9030.3 1472.3 L9024.9 1472.3 L9030.3 1459.0 Z"></path>
+					<path d="M24541.1 1078.6 L24210.75 1174 L24647.10103926097 1375 L24647.1 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33315.2 3529.0 L33305.6 3524.1 L33314.7 3518.4 L33324.3 3523.3 Z"></path>
+						<path d="M24551.5 1081.1 L24541.1 1078.6 L24548.6 1070.9 L24559.0 1073.4 Z"></path>
 					</g>
-					<path d="M33570.3 3615.9 L33591.75 3671 L27039 3706.0612494818947 L27039.0 3706.1 " fill="none"></path>
+					<path d="M24541.2 1083.7 L24256.5 1174 L19894 1386.5056249296883 L19894.0 1386.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33571.8 3605.3 L33570.3 3615.9 L33561.9 3609.1 L33563.5 3598.5 Z"></path>
+						<path d="M24551.7 1086.0 L24541.2 1083.7 L24548.5 1075.8 L24559.0 1078.1 Z"></path>
 					</g>
-					<path d="M33755.6 3555.9 L34379.75 3671 L28564.75 3705.750021042 L28564.8 3705.8 " fill="none"></path>
+					<path d="M24769.1 1163.8 L24772.25 1174 L24772.25 1390.5 L24772.25 1390.5 L24772.25 1607 L24772.25 1607 L14287.25 2293.6750629722924 L14287.3 2293.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33747.4 3549.0 L33755.6 3555.9 L33745.5 3559.5 L33737.3 3552.6 Z"></path>
+						<path d="M24771.5 1153.4 L24769.1 1163.8 L24761.3 1156.5 L24763.7 1146.0 Z"></path>
 					</g>
-					<path d="M33530.8 3200.3 L33530.75 3358 L33530.75 3430.5 L33530.8 3430.5 " fill="none"></path>
-					<path d="M33536.1 3200.3 L33530.8 3200.3 L33525.4 3200.3 L33530.8 3187.0 Z"></path>
-					<path d="M9531.3 2383.7 L9531.25 2985 L6181.75 3167.7356296621324 L6181.8 3167.7 " fill="none"></path>
+					<path d="M24899.5 1157.3 L24921.25 1174 L24921.25 1375 L24921.3 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9536.6 2374.3 L9531.3 2383.7 L9525.9 2374.3 L9531.3 2365.0 Z"></path>
+						<path d="M24895.3 1147.4 L24899.5 1157.3 L24888.8 1155.9 L24884.7 1146.0 Z"></path>
 					</g>
-					<path d="M24517.0 3356.7 L24517 3358 L24517 3514.5 L24517 3514.5 L24517 3671 L24517 3671 L35471.75 3706.3419175281156 L35471.8 3706.3 " fill="none"></path>
+					<path d="M10298.7 1514.5 L10263.75 1607 L20778.75 2294.10498861912 L20778.8 2294.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24522.3 3347.3 L24517.0 3356.7 L24511.7 3347.3 L24517.0 3338.0 Z"></path>
-					</g>
-					<path d="M19002.5 2405.8 L16261.25 2985 L24236 3165.1521212488265 L24236.0 3165.2 " fill="none"></path>
-					<path d="M19003.6 2411.0 L19002.5 2405.8 L19001.4 2400.6 L19015.5 2403.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M10219.8 2340.3 L10219.75 2985 L24236 3167.8345048873034 L24236.0 3167.8 " fill="none"></path>
+						<path d="M10307.0 1507.6 L10298.7 1514.5 L10297.0 1503.8 L10305.3 1497.0 Z"></path>
 					</g>
-					<path d="M10225.1 2340.3 L10219.8 2340.3 L10214.4 2340.3 L10219.8 2327.0 Z"></path>
-					<path d="M12261.9 2337.4 L11743.5 2985 L7378.5 3162.3771652685477 L7378.5 3162.4 " fill="none"></path>
-					<path d="M12266.0 2340.7 L12261.9 2337.4 L12257.7 2334.1 L12270.2 2327.0 Z"></path>
-					<path d="M33307.5 2383.7 L33307.5 2985 L24798 3165.5382799613217 L24798.0 3165.5 " fill="none"></path>
+					<path d="M10525.9 1475.0 L10807.75 1607 L14216.25 2288.8979384436702 L14216.3 2288.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33312.8 2374.3 L33307.5 2383.7 L33302.2 2374.3 L33307.5 2365.0 Z"></path>
+						<path d="M10519.7 1466.2 L10525.9 1475.0 L10515.2 1475.9 L10509.0 1467.1 Z"></path>
 					</g>
-					<path d="M38117.2 547.0 L33307.5 876 L33307.5 1025 L33307.5 1025 L33307.5 1174 L33307.5 1174 L33307.5 1390.5 L33307.5 1390.5 L33307.5 1607 L33307.5 1607 L33307.5 2227 L33307.5 2227.0 " fill="none"></path>
-					<path d="M38117.6 552.3 L38117.2 547.0 L38116.8 541.7 L38130.5 546.1 Z"></path>
-					<path d="M27012.4 542.7 L17099 876 L17099 941 L17099.0 941.0 " fill="none"></path>
-					<path d="M27012.6 548.0 L27012.4 542.7 L27012.2 537.4 L27025.8 542.2 Z"></path>
-					<path d="M34179.1 2557.1 L33679 2985 L36828 3169.7109608429 L36828.0 3169.7 " fill="none"></path>
+					<path d="M19906.9 1415.4 L20638.75 1607 L20638.75 2219.5 L20638.8 2219.5 " fill="none"></path>
+					<path d="M19908.2 1410.2 L19906.9 1415.4 L19905.5 1420.5 L19894.0 1412.0 Z"></path>
+					<path d="M44514.2 2443.4 L44416.5 2985 L44416.5 3156 L44416.5 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34189.6 2555.1 L34179.1 2557.1 L34182.7 2547.0 L34193.2 2545.0 Z"></path>
+						<path d="M44521.1 2435.1 L44514.2 2443.4 L44510.6 2433.2 L44517.5 2425.0 Z"></path>
 					</g>
-					<path d="M34193.8 2557.5 L33719 2985 L34889.25 3164.4463514902363 L34889.3 3164.4 " fill="none"></path>
+					<path d="M44522.7 2443.5 L44456.5 2985 L33389 3170.2363591492417 L33389.0 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34204.3 2555.2 L34193.8 2557.5 L34197.2 2547.3 L34207.7 2545.0 Z"></path>
+						<path d="M44529.1 2434.9 L44522.7 2443.5 L44518.5 2433.6 L44525.0 2425.0 Z"></path>
 					</g>
-					<path d="M34208.6 2557.9 L33759 2985 L33874.067024128686 3065 L33874.1 3065.0 " fill="none"></path>
+					<path d="M44562.1 2443.5 L44640.5 2985 L32969 3170.6015305252386 L32969.0 3170.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34219.1 2555.3 L34208.6 2557.9 L34211.7 2547.6 L34222.1 2545.0 Z"></path>
+						<path d="M44566.0 2433.5 L44562.1 2443.5 L44555.5 2435.0 L44559.4 2425.0 Z"></path>
 					</g>
-					<path d="M34395.9 2562.7 L34256 2985 L33587.25 3156.9708721130646 L33587.3 3157.0 " fill="none"></path>
+					<path d="M44570.6 2443.3 L44680.5 2985 L39449.75 3169.6467373302416 L39449.8 3169.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34403.9 2555.5 L34395.9 2562.7 L34393.8 2552.2 L34401.8 2545.0 Z"></path>
+						<path d="M44574.0 2433.1 L44570.6 2443.3 L44563.5 2435.2 L44566.9 2425.0 Z"></path>
 					</g>
-					<path d="M34689.8 2559.7 L35021.25 2985 L35021.25 3171.5 L35021.25 3171.5 L35021.25 3358 L35021.25 3358 L35021.25 3514.5 L35021.25 3514.5 L35021.25 3671 L35021.25 3671 L35471.75 3703.0175175175177 L35471.8 3703.0 " fill="none"></path>
+					<path d="M44206.7 732.3 L44540.75 876 L44540.75 1025 L44540.75 1025 L44540.75 1174 L44540.75 1174 L44540.75 1390.5 L44540.75 1390.5 L44540.75 1607 L44540.75 1607 L44540.75 2167 L44540.8 2167.0 " fill="none"></path>
+					<path d="M44208.9 727.4 L44206.7 732.3 L44204.6 737.2 L44194.5 727.1 Z"></path>
+					<path d="M19907.1 1408.4 L20964.25 1607 L20964.25 2265 L20964.3 2265.0 " fill="none"></path>
+					<path d="M19908.1 1403.1 L19907.1 1408.4 L19906.1 1413.6 L19894.0 1405.9 Z"></path>
+					<path d="M6676.3 2353.2 L6676.25 2985 L31147.5 3170.960461041673 L31147.5 3171.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34688.3 2549.1 L34689.8 2559.7 L34679.8 2555.6 L34678.3 2545.0 Z"></path>
+						<path d="M6681.6 2343.8 L6676.3 2353.2 L6670.9 2343.8 L6676.3 2334.5 Z"></path>
 					</g>
-					<path d="M34952.4 2497.0 L36089.25 2985 L36089.25 3171.5 L36089.25 3171.5 L36089.25 3358 L36089.25 3358 L36808.25 3488.9173938336244 L36808.3 3488.9 " fill="none"></path>
+					<path d="M5533.2 1433.9 L6676.25 1607 L6676.25 2257.5 L6676.3 2257.5 " fill="none"></path>
+					<path d="M5534.0 1428.6 L5533.2 1433.9 L5532.4 1439.1 L5520.0 1431.9 Z"></path>
+					<path d="M25236.3 1131.7 L25143.75 1174 L25143.75 1375 L25143.8 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34945.9 2488.4 L34952.4 2497.0 L34941.7 2498.2 L34935.3 2489.6 Z"></path>
+						<path d="M25247.0 1132.7 L25236.3 1131.7 L25242.6 1123.0 L25253.3 1124.0 Z"></path>
 					</g>
-					<path d="M34952.5 2492.1 L36129.25 2985 L36007.762064343166 3156 L36007.8 3156.0 " fill="none"></path>
+					<path d="M25623.6 1134.9 L25678.25 1174 L25678.25 1390.5 L25678.25 1390.5 L25678.25 1607 L25678.25 1607 L16518.25 2292.7434671592328 L16518.3 2292.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34945.9 2483.6 L34952.5 2492.1 L34941.8 2493.4 L34935.3 2484.9 Z"></path>
+						<path d="M25619.1 1125.1 L25623.6 1134.9 L25612.9 1133.8 L25608.5 1124.0 Z"></path>
 					</g>
-					<path d="M42456.5 681.1 L43074 876 L43074 1025 L43074 1025 L43074 1174 L43074 1174 L43074 1390.5 L43074 1390.5 L43074 1607 L43074 1607 L34935.25 2259.824441922058 L34935.3 2259.8 " fill="none"></path>
-					<path d="M42458.1 676.0 L42456.5 681.1 L42454.9 686.2 L42443.8 677.1 Z"></path>
-					<path d="M37182.0 1532.6 L37168.25 1607 L34935.25 2180.2254098360654 L34935.3 2180.2 " fill="none"></path>
-					<path d="M37187.2 1533.6 L37182.0 1532.6 L37176.7 1531.6 L37184.4 1519.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M41204.9 1072.1 L41084 1174 L41084 1390.5 L41084 1390.5 L41084 1607 L41084 1607 L34935.25 2248.9165498693133 L34935.3 2248.9 " fill="none"></path>
-					</g>
-					<path d="M41208.3 1076.2 L41204.9 1072.1 L41201.4 1068.0 L41215.1 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M9060.8 1414.7 L8838.5 1607 L34033.25 2283.8834114814345 L34033.3 2283.9 " fill="none"></path>
-					</g>
-					<path d="M9064.2 1418.8 L9060.8 1414.7 L9057.3 1410.7 L9070.8 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M25293.0 1043.5 L24731 1174 L24731 1390.5 L24731 1390.5 L24731 1607 L24731 1607 L34033.25 2264.139953348884 L34033.3 2264.1 " fill="none"></path>
-					</g>
-					<path d="M25294.2 1048.7 L25293.0 1043.5 L25291.8 1038.3 L25306.0 1040.5 Z"></path>
-					<path d="M34027.3 3296.7 L34027.25 3358 L36808.25 3506.9736436761937 L36808.3 3507.0 " fill="none"></path>
+					<path d="M25704.2 1131.7 L25796.75 1174 L25796.75 1375 L25796.8 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34032.6 3287.3 L34027.3 3296.7 L34021.9 3287.3 L34027.3 3278.0 Z"></path>
+						<path d="M25697.9 1123.0 L25704.2 1131.7 L25693.5 1132.7 L25687.2 1124.0 Z"></path>
 					</g>
-					<path d="M34445.8 3135.1 L36169.25 2985 L34935.25 2480.414836795252 L34935.3 2480.4 " fill="none"></path>
+					<path d="M25710.9 1083.5 L26083.25 1174 L26083.25 1375 L26083.3 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34436.1 3130.5 L34445.8 3135.1 L34437.0 3141.2 L34427.3 3136.7 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M41216.4 1073.3 L41124 1174 L41124 1390.5 L41124 1390.5 L41124 1607 L41124 1607 L41124 2296 L41124 2296 L41124 2985 L41124 2985 L34427.25 3160.988145982316 L34427.3 3161.0 " fill="none"></path>
+						<path d="M25703.1 1076.1 L25710.9 1083.5 L25700.6 1086.5 L25692.8 1079.1 Z"></path>
 					</g>
-					<path d="M41220.3 1076.9 L41216.4 1073.3 L41212.5 1069.7 L41225.4 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M9083.5 1419.1 L9048.75 1607 L9048.75 2296 L9048.75 2296 L9048.75 2985 L9048.75 2985 L33627.25 3168.513431551134 L33627.3 3168.5 " fill="none"></path>
-					</g>
-					<path d="M9088.7 1420.1 L9083.5 1419.1 L9078.2 1418.1 L9085.9 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M25297.2 1043.7 L24771 1174 L24771 1390.5 L24771 1390.5 L24771 1607 L24771 1607 L24771 2296 L24771 2296 L24771 2985 L24771 2985 L33627.25 3163.440580688724 L33627.3 3163.4 " fill="none"></path>
-					</g>
-					<path d="M25298.5 1048.9 L25297.2 1043.7 L25295.9 1038.5 L25310.2 1040.5 Z"></path>
-					<path d="M25121.9 2443.1 L24985 2985 L33474.25 3170.266960184887 L33474.3 3170.3 " fill="none"></path>
+					<path d="M26319.4 1454.3 L26070.75 1607 L27878.15420899855 2280.5 L27878.2 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25129.3 2435.4 L25121.9 2443.1 L25119.0 2432.7 L25126.4 2425.0 Z"></path>
+						<path d="M26330.2 1453.9 L26319.4 1454.3 L26324.6 1444.8 L26335.3 1444.5 Z"></path>
 					</g>
-					<path d="M25240.8 2441.3 L25546.75 2985 L35944.25 3170.563038277512 L35944.3 3170.6 " fill="none"></path>
+					<path d="M26445.2 1462.4 L26489.25 1607 L17141.25 2290.7337579617833 L17141.3 2290.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25240.8 2430.5 L25240.8 2441.3 L25231.5 2435.7 L25231.6 2425.0 Z"></path>
+						<path d="M26447.5 1451.9 L26445.2 1462.4 L26437.3 1455.0 L26439.7 1444.5 Z"></path>
 					</g>
-					<path d="M40608.5 1433.6 L40529.25 1607 L25507 2280.400253736927 L25507.0 2280.4 " fill="none"></path>
-					<path d="M40613.4 1435.8 L40608.5 1433.6 L40603.7 1431.4 L40614.1 1421.5 Z"></path>
-					<path d="M9541.3 1440.2 L9541.25 1607 L24811 2280.6474684253494 L24811.0 2280.6 " fill="none"></path>
+					<path d="M25705.9 1061.8 L26423.25 1174 L26423.25 1336.5 L26423.3 1336.5 " fill="none"></path>
+					<path d="M25706.7 1056.6 L25705.9 1061.8 L25705.1 1067.1 L25692.8 1059.8 Z"></path>
+					<path d="M19907.2 1404.8 L21254.75 1607 L22155.44230769231 2257.5 L22155.4 2257.5 " fill="none"></path>
+					<path d="M19908.0 1399.5 L19907.2 1404.8 L19906.4 1410.1 L19894.0 1402.8 Z"></path>
+					<path d="M5533.2 1426.7 L6957.75 1607 L6957.75 2265 L6957.8 2265.0 " fill="none"></path>
+					<path d="M5533.9 1421.4 L5533.2 1426.7 L5532.6 1432.0 L5520.0 1425.0 Z"></path>
+					<path d="M22420.6 2338.6 L22055 2985 L14289.5 3168.012036393505 L14289.5 3168.0 " fill="none"></path>
+					<path d="M22425.3 2341.2 L22420.6 2338.6 L22416.0 2336.0 L22427.2 2327.0 Z"></path>
+					<path d="M12465.5 1440.2 L12465.5 1607 L28020.75 2277.5709123899205 L28020.8 2277.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9546.6 1430.8 L9541.3 1440.2 L9535.9 1430.8 L9541.3 1421.5 Z"></path>
+						<path d="M12470.8 1430.8 L12465.5 1440.2 L12460.2 1430.8 L12465.5 1421.5 Z"></path>
 					</g>
-					<path d="M18216.5 1485.0 L18037 1607 L5882.75 2292.783867335449 L5882.8 2292.8 " fill="none"></path>
+					<path d="M12073.0 1455.7 L12073 1607 L11320.077830188678 2280.5 L11320.1 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18227.2 1484.2 L18216.5 1485.0 L18221.2 1475.3 L18231.9 1474.5 Z"></path>
+						<path d="M12078.3 1446.3 L12073.0 1455.7 L12067.7 1446.3 L12073.0 1437.0 Z"></path>
 					</g>
-					<path d="M18458.4 1487.3 L18585.75 1607 L26922 2281.120624394824 L26922.0 2281.1 " fill="none"></path>
+					<path d="M17400.9 1027.5 L12073 1174 L12073 1344 L12073.0 1344.0 " fill="none"></path>
+					<path d="M17401.1 1032.8 L17400.9 1027.5 L17400.8 1022.1 L17414.3 1027.1 Z"></path>
+					<path d="M37296.0 1097.7 L37296 1174 L37296 1194 L37296.0 1194.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18455.3 1477.0 L18458.4 1487.3 L18448.0 1484.8 L18444.8 1474.5 Z"></path>
+						<path d="M37301.3 1088.3 L37296.0 1097.7 L37290.7 1088.3 L37296.0 1079.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M20439.2 1030.8 L18355.5 1174 L18355.5 1306.5 L18355.5 1306.5 " fill="none"></path>
-					</g>
-					<path d="M20439.6 1036.1 L20439.2 1030.8 L20438.8 1025.5 L20452.5 1029.9 Z"></path>
-					<path d="M12396.6 2331.4 L14273.25 2985 L7714.5 3167.3844447757856 L7714.5 3167.4 " fill="none"></path>
-					<path d="M12398.4 2326.3 L12396.6 2331.4 L12394.8 2336.4 L12384.0 2327.0 Z"></path>
-					<path d="M36605.8 2502.9 L36459 2985 L36828 3157.261576971214 L36828.0 3157.3 " fill="none"></path>
+					<path d="M38923.4 557.6 L37296 876 L37296 971 L37296.0 971.0 " fill="none"></path>
+					<path d="M38924.5 562.8 L38923.4 557.6 L38922.4 552.3 L38936.5 555.0 Z"></path>
+					<path d="M35174.4 1117.1 L35100 1174 L35100 1306.5 L35100.0 1306.5 " fill="none"></path>
+					<path d="M35177.6 1121.3 L35174.4 1117.1 L35171.1 1112.9 L35185.0 1109.0 Z"></path>
+					<path d="M37905.5 2500.3 L37565.75 2985 L40631.25 3169.6627099483203 L40631.3 3169.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36613.6 2495.5 L36605.8 2502.9 L36603.4 2492.4 L36611.2 2485.0 Z"></path>
+						<path d="M37915.3 2495.7 L37905.5 2500.3 L37906.5 2489.6 L37916.3 2485.0 Z"></path>
 					</g>
-					<path d="M36635.6 2503.4 L36558.5 2985 L34981.25 3166.2149237640538 L34981.3 3166.2 " fill="none"></path>
+					<path d="M37917.1 2500.7 L37605.75 2985 L34499.75 3168.778236040609 L34499.8 3168.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36642.3 2495.1 L36635.6 2503.4 L36631.8 2493.4 L36638.5 2485.0 Z"></path>
+						<path d="M37926.7 2495.7 L37917.1 2500.7 L37917.7 2490.0 L37927.2 2485.0 Z"></path>
 					</g>
-					<path d="M36698.7 2503.5 L36768.25 2985 L36768.25 3171.5 L36768.25 3171.5 L36768.25 3358 L36768.25 3358 L36768.25 3514.5 L36768.25 3514.5 L36768.25 3671 L36768.25 3671 L35569.75 3705.105611222445 L35569.8 3705.1 " fill="none"></path>
+					<path d="M38148.2 2501.8 L38381.75 2985 L38381.75 3171.5 L38381.75 3171.5 L38381.75 3358 L38381.75 3358 L38381.75 3514.5 L38381.75 3514.5 L38381.75 3671 L38381.75 3671 L38553.25 3698.6111111111113 L38553.3 3698.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36702.7 2493.5 L36698.7 2503.5 L36692.1 2495.0 L36696.0 2485.0 Z"></path>
+						<path d="M38149.0 2491.1 L38148.2 2501.8 L38139.4 2495.7 L38140.1 2485.0 Z"></path>
 					</g>
-					<path d="M36752.6 2502.3 L36948.75 2985 L36948.75 3171.5 L36948.75 3171.5 L36948.75 3358 L36948.75 3358 L36948.75 3378 L36948.8 3378.0 " fill="none"></path>
+					<path d="M38160.0 2501.4 L38421.75 2985 L38421.75 3171.5 L38421.75 3171.5 L38421.75 3358 L38421.75 3358 L39709.75 3499.1074553727685 L39709.8 3499.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36754.0 2491.6 L36752.6 2502.3 L36744.1 2495.7 L36745.6 2485.0 Z"></path>
+						<path d="M38160.2 2490.7 L38160.0 2501.4 L38150.8 2495.7 L38151.1 2485.0 Z"></path>
 					</g>
-					<path d="M36764.4 2501.9 L36988.75 2985 L36049.25 3161.6297883064517 L36049.3 3161.6 " fill="none"></path>
+					<path d="M38435.3 2493.5 L39397.25 2985 L39397.25 3156 L39397.3 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36765.3 2491.2 L36764.4 2501.9 L36755.6 2495.7 L36756.5 2485.0 Z"></path>
+						<path d="M38429.4 2484.5 L38435.3 2493.5 L38424.5 2494.0 L38418.7 2485.0 Z"></path>
 					</g>
-					<path d="M42456.5 676.0 L43114 876 L43114 1025 L43114 1025 L43114 1174 L43114 1174 L43114 1390.5 L43114 1390.5 L43114 1607 L43114 1607 L37088.25 2251.1552693844305 L37088.3 2251.2 " fill="none"></path>
-					<path d="M42458.1 670.9 L42456.5 676.0 L42455.0 681.1 L42443.8 672.1 Z"></path>
-					<path d="M35797.1 1451.2 L34790 1607 L36249.25 2142.1554224883566 L36249.3 2142.2 " fill="none"></path>
-					<path d="M35797.9 1456.5 L35797.1 1451.2 L35796.3 1445.9 L35810.3 1449.1 Z"></path>
+					<path d="M44207.6 615.2 L45756.25 876 L45756.25 1025 L45756.25 1025 L45756.25 1174 L45756.25 1174 L45756.25 1390.5 L45756.25 1390.5 L45756.25 1607 L45756.25 1607 L38468.25 2258.4994485890365 L38468.3 2258.5 " fill="none"></path>
+					<path d="M44208.5 609.9 L44207.6 615.2 L44206.8 620.4 L44194.5 612.9 Z"></path>
+					<path d="M37013.8 1594.8 L36997 1607 L37760.24383164006 2107 L37760.2 2107.0 " fill="none"></path>
+					<path d="M37016.9 1599.1 L37013.8 1594.8 L37010.7 1590.5 L37024.6 1587.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41273.9 1076.4 L41299 1174 L41299 1390.5 L41299 1390.5 L41299 1607 L41299 1607 L37088.25 2233.576696722639 L37088.3 2233.6 " fill="none"></path>
+						<path d="M43773.0 1052.4 L43232.75 1174 L43232.75 1390.5 L43232.75 1390.5 L43232.75 1607 L43232.75 1607 L38468.25 2240.2446952160494 L38468.3 2240.2 " fill="none"></path>
 					</g>
-					<path d="M41279.1 1075.1 L41273.9 1076.4 L41268.8 1077.7 L41270.6 1063.5 Z"></path>
+					<path d="M43774.2 1057.6 L43773.0 1052.4 L43771.8 1047.2 L43786.0 1049.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M9088.8 1419.3 L9088.75 1607 L36249.25 2285.5201051486583 L36249.3 2285.5 " fill="none"></path>
+						<path d="M14181.2 1417.5 L14070 1607 L37629.25 2283.946181514883 L37629.3 2283.9 " fill="none"></path>
 					</g>
-					<path d="M9094.1 1419.3 L9088.8 1419.3 L9083.4 1419.3 L9088.8 1406.0 Z"></path>
+					<path d="M14185.8 1420.2 L14181.2 1417.5 L14176.6 1414.8 L14187.9 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M25341.7 1048.6 L25176.75 1174 L25176.75 1390.5 L25176.75 1390.5 L25176.75 1607 L25176.75 1607 L36249.25 2270.8489819004526 L36249.3 2270.8 " fill="none"></path>
+						<path d="M29291.0 1033.7 L27515 1174 L27515 1390.5 L27515 1390.5 L27515 1607 L27515 1607 L37629.25 2268.5610062893084 L37629.3 2268.6 " fill="none"></path>
 					</g>
-					<path d="M25345.0 1052.8 L25341.7 1048.6 L25338.5 1044.3 L25352.4 1040.5 Z"></path>
-					<path d="M25833.7 2546.3 L25586.75 2985 L36828 3170.9953534278175 L36828.0 3171.0 " fill="none"></path>
+					<path d="M29291.4 1039.0 L29291.0 1033.7 L29290.5 1028.4 L29304.3 1032.6 Z"></path>
+					<path d="M31153.5 2450.6 L31018.5 2985 L32856 3165.936510031679 L32856.0 3165.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25842.9 2540.7 L25833.7 2546.3 L25833.6 2535.5 L25842.8 2530.0 Z"></path>
+						<path d="M31160.9 2442.9 L31153.5 2450.6 L31150.6 2440.2 L31158.0 2432.5 Z"></path>
 					</g>
-					<path d="M25896.3 2547.8 L25760.5 2985 L33474.25 3170.1438982014733 L33474.3 3170.1 " fill="none"></path>
+					<path d="M31241.4 2450.3 L31411 2985 L39344.75 3170.2739865393646 L39344.8 3170.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25904.1 2540.5 L25896.3 2547.8 L25894.0 2537.3 L25901.8 2530.0 Z"></path>
+						<path d="M31243.7 2439.8 L31241.4 2450.3 L31233.5 2443.0 L31235.8 2432.5 Z"></path>
 					</g>
-					<path d="M26038.1 2548.1 L26148.25 2985 L26148.25 3171.5 L26148.25 3171.5 L26148.25 3358 L26148.25 3358 L26148.25 3514.5 L26148.25 3514.5 L26148.25 3671 L26148.25 3671 L35471.75 3706.314403841024 L35471.8 3706.3 " fill="none"></path>
+					<path d="M42703.3 1430.4 L42505.25 1607 L31540.5 2274.8051534772712 L31540.5 2274.8 " fill="none"></path>
+					<path d="M42706.8 1434.4 L42703.3 1430.4 L42699.7 1426.4 L42713.2 1421.5 Z"></path>
+					<path d="M42102.8 1553.1 L42067 1607 L31540.5 2273.9509862522414 L31540.5 2274.0 " fill="none"></path>
+					<path d="M42107.2 1556.1 L42102.8 1553.1 L42098.3 1550.2 L42110.2 1542.0 Z"></path>
+					<path d="M37315.9 1605.6 L37316 1607 L37316 2296 L37316 2296 L37316 2985 L37316 2985 L27953.25 3170.057136422648 L27953.3 3170.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26041.0 2537.7 L26038.1 2548.1 L26030.6 2540.4 L26033.5 2530.0 Z"></path>
+						<path d="M37320.3 1595.8 L37315.9 1605.6 L37309.7 1596.8 L37314.2 1587.0 Z"></path>
 					</g>
-					<path d="M26052.6 2547.8 L26188.25 2985 L26188.25 3171.5 L26188.25 3171.5 L26188.25 3358 L26188.25 3358 L36808.25 3512.456577296594 L36808.3 3512.5 " fill="none"></path>
+					<path d="M37693.6 1430.7 L39437.25 1607 L39437.25 2296 L39437.25 2296 L39437.25 2985 L39437.25 2985 L32969 3169.885033909345 L32969.0 3169.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26055.0 2537.3 L26052.6 2547.8 L26044.8 2540.5 L26047.1 2530.0 Z"></path>
+						<path d="M37684.8 1424.5 L37693.6 1430.7 L37683.7 1435.1 L37675.0 1428.8 Z"></path>
 					</g>
-					<path d="M26067.1 2547.5 L26228.25 2985 L35944.25 3170.497671085632 L35944.3 3170.5 " fill="none"></path>
+					<path d="M27211.2 540.7 L198.75 876 L198.75 926 L198.8 926.0 " fill="none"></path>
+					<path d="M27211.2 546.0 L27211.2 540.7 L27211.1 535.3 L27224.5 540.5 Z"></path>
+					<path d="M6307.3 2413.7 L6307.25 2985 L27807.25 3170.8689102118387 L27807.3 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26068.9 2536.9 L26067.1 2547.5 L26058.9 2540.6 L26060.7 2530.0 Z"></path>
-					</g>
-					<path d="M40616.3 1434.4 L40569.25 1607 L26402 2275.818256564861 L26402.0 2275.8 " fill="none"></path>
-					<path d="M40621.4 1435.8 L40616.3 1434.4 L40611.2 1433.0 L40619.8 1421.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M41287.2 1075.3 L41339 1174 L41339 1390.5 L41339 1390.5 L41339 1607 L41339 1607 L26402 2276.829346871034 L26402.0 2276.8 " fill="none"></path>
+						<path d="M6312.6 2404.3 L6307.3 2413.7 L6301.9 2404.3 L6307.3 2395.0 Z"></path>
 					</g>
-					<path d="M41291.9 1072.8 L41287.2 1075.3 L41282.4 1077.8 L41281.0 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M9094.0 1419.1 L9128.75 1607 L25547 2278.515026045145 L25547.0 2278.5 " fill="none"></path>
+						<path d="M9052.2 1027.4 L3914.75 1174 L3914.75 1390.5 L3914.75 1390.5 L3914.75 1607 L3914.75 1607 L6159.25 2253.378474399164 L6159.3 2253.4 " fill="none"></path>
 					</g>
-					<path d="M9099.3 1418.1 L9094.0 1419.1 L9088.8 1420.1 L9091.6 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M25448.3 1043.7 L25974.5 1174 L25974.5 1390.5 L25974.5 1390.5 L25974.5 1607 L25974.5 1607 L25974.5 2062 L25974.5 2062.0 " fill="none"></path>
+					<path d="M9052.3 1032.8 L9052.2 1027.4 L9052.0 1022.1 L9065.5 1027.0 Z"></path>
+					<path d="M14955.5 1440.2 L14955.5 1607 L30844.5 2281.2329863891114 L30844.5 2281.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M14960.8 1430.8 L14955.5 1440.2 L14950.2 1430.8 L14955.5 1421.5 Z"></path>
 					</g>
-					<path d="M25449.6 1038.5 L25448.3 1043.7 L25447.0 1048.9 L25435.3 1040.5 Z"></path>
-					<path d="M31796.9 1117.1 L31722.5 1174 L31722.5 1306.5 L31722.5 1306.5 " fill="none"></path>
-					<path d="M31800.1 1121.3 L31796.9 1117.1 L31793.6 1112.9 L31807.5 1109.0 Z"></path>
-					<path d="M20593.5 2413.7 L20593.5 2985 L30395.5 3170.121316455696 L30395.5 3170.1 " fill="none"></path>
+					<path d="M7346.8 1478.2 L7346.75 1607 L6455.25 2197.9028379028377 L6455.3 2197.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20598.8 2404.3 L20593.5 2413.7 L20588.2 2404.3 L20593.5 2395.0 Z"></path>
+						<path d="M7352.1 1468.8 L7346.8 1478.2 L7341.4 1468.8 L7346.8 1459.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M20599.2 1061.9 L20827.75 1174 L20827.75 1390.5 L20827.75 1390.5 L20827.75 1607 L20827.75 1607 L20627.158563134977 2197 L20627.2 2197.0 " fill="none"></path>
+						<path d="M9052.2 1032.1 L7346.75 1174 L7346.75 1321.5 L7346.8 1321.5 " fill="none"></path>
+					</g>
+					<path d="M9052.7 1037.4 L9052.2 1032.1 L9051.8 1026.7 L9065.5 1031.0 Z"></path>
+					<path d="M28250.5 2544.6 L27900.25 2985 L40631.25 3171.054264780786 L40631.3 3171.1 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M28260.5 2540.6 L28250.5 2544.6 L28252.2 2534.0 L28262.1 2530.0 Z"></path>
 					</g>
-					<path d="M20601.5 1057.1 L20599.2 1061.9 L20596.8 1066.7 L20587.2 1056.0 Z"></path>
-					<path d="M8251.3 1455.7 L8251.25 1607 L8251.25 2280.5 L8251.3 2280.5 " fill="none"></path>
+					<path d="M28264.6 2545.0 L27940.25 2985 L32856 3169.380788375484 L32856.0 3169.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8256.6 1446.3 L8251.3 1455.7 L8245.9 1446.3 L8251.3 1437.0 Z"></path>
+						<path d="M28274.5 2540.7 L28264.6 2545.0 L28265.9 2534.3 L28275.7 2530.0 Z"></path>
 					</g>
-					<path d="M12050.7 1030.2 L9603.75 1174 L8416.25 1364.0878003696857 L8416.3 1364.1 " fill="none"></path>
-					<path d="M12051.0 1035.6 L12050.7 1030.2 L12050.4 1024.9 L12064.0 1029.5 Z"></path>
-					<path d="M31571.8 2443.4 L30815.75 2985 L33474.25 3167.6188766114183 L33474.3 3167.6 " fill="none"></path>
+					<path d="M28448.3 2548.7 L28448.25 2985 L28448.25 3171.5 L28448.25 3171.5 L28448.25 3358 L28448.25 3358 L28448.25 3514.5 L28448.25 3514.5 L28448.25 3671 L28448.25 3671 L38553.25 3706.3286882016937 L38553.3 3706.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31582.5 2442.3 L31571.8 2443.4 L31576.3 2433.6 L31587.0 2432.5 Z"></path>
+						<path d="M28453.6 2539.3 L28448.3 2548.7 L28442.9 2539.3 L28448.3 2530.0 Z"></path>
 					</g>
-					<path d="M31863.2 2448.8 L32164 2985 L35944.25 3168.9453721218447 L35944.3 3168.9 " fill="none"></path>
+					<path d="M28462.9 2548.6 L28488.25 2985 L28488.25 3171.5 L28488.25 3171.5 L28488.25 3358 L28488.25 3358 L39709.75 3512.564755324767 L39709.8 3512.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31863.3 2438.0 L31863.2 2448.8 L31854.0 2443.2 L31854.1 2432.5 Z"></path>
+						<path d="M28467.7 2539.0 L28462.9 2548.6 L28457.1 2539.6 L28461.8 2530.0 Z"></path>
 					</g>
-					<path d="M40624.4 1434.8 L40609.25 1607 L32125.5 2268.8511336937754 L32125.5 2268.9 " fill="none"></path>
-					<path d="M40629.7 1435.2 L40624.4 1434.8 L40619.1 1434.3 L40625.5 1421.5 Z"></path>
-					<path d="M39483.2 1552.0 L39435 1607 L32125.5 2264.687952987267 L32125.5 2264.7 " fill="none"></path>
-					<path d="M39487.2 1555.5 L39483.2 1552.0 L39479.2 1548.5 L39492.0 1542.0 Z"></path>
-					<path d="M21533.5 1478.2 L21533.5 1607 L20728.565312046445 2197 L20728.6 2197.0 " fill="none"></path>
+					<path d="M28661.8 2544.1 L29041.25 2985 L39344.75 3170.554533603708 L39344.8 3170.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21538.8 1468.8 L21533.5 1478.2 L21528.2 1468.8 L21533.5 1459.5 Z"></path>
+						<path d="M28659.8 2533.6 L28661.8 2544.1 L28651.7 2540.6 L28649.6 2530.0 Z"></path>
+					</g>
+					<path d="M42709.9 1431.2 L42545.25 1607 L28875.75 2275.105660778889 L28875.8 2275.1 " fill="none"></path>
+					<path d="M42713.7 1434.9 L42709.9 1431.2 L42706.0 1427.6 L42719.0 1421.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M43773.0 1054.1 L43272.75 1174 L43272.75 1390.5 L43272.75 1390.5 L43272.75 1607 L43272.75 1607 L28875.75 2276.1310330871192 L28875.8 2276.1 " fill="none"></path>
+					</g>
+					<path d="M43774.3 1059.3 L43773.0 1054.1 L43771.8 1048.9 L43786.0 1051.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M14185.8 1418.4 L14110 1607 L28020.75 2275.457221069517 L28020.8 2275.5 " fill="none"></path>
 					</g>
+					<path d="M14190.7 1420.4 L14185.8 1418.4 L14180.9 1416.4 L14190.8 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M20608.7 1037.5 L21533.5 1174 L21533.5 1321.5 L21533.5 1321.5 " fill="none"></path>
+						<path d="M29291.1 1042.2 L28448.25 1174 L28448.25 1390.5 L28448.25 1390.5 L28448.25 1607 L28448.25 1607 L28448.25 2062 L28448.3 2062.0 " fill="none"></path>
 					</g>
-					<path d="M20609.5 1032.2 L20608.7 1037.5 L20607.9 1042.8 L20595.5 1035.6 Z"></path>
-					<path d="M15272.0 1440.2 L15272 1607 L25547 2268.478626489138 L25547.0 2268.5 " fill="none"></path>
+					<path d="M29291.9 1047.4 L29291.1 1042.2 L29290.3 1036.9 L29304.3 1040.1 Z"></path>
+					<path d="M22430.3 2339.7 L22216 2985 L15175.5 3166.4361268481416 L15175.5 3166.4 " fill="none"></path>
+					<path d="M22435.3 2341.3 L22430.3 2339.7 L22425.2 2338.0 L22434.5 2327.0 Z"></path>
+					<path d="M586.8 1112.7 L586.75 1174 L586.75 1375 L586.8 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15277.3 1430.8 L15272.0 1440.2 L15266.7 1430.8 L15272.0 1421.5 Z"></path>
+						<path d="M592.1 1103.3 L586.8 1112.7 L581.4 1103.3 L586.8 1094.0 Z"></path>
 					</g>
-					<path d="M36209.1 1605.6 L36209.25 1607 L36209.25 2296 L36209.25 2296 L36209.25 2985 L36209.25 2985 L30541.5 3169.128445760571 L30541.5 3169.1 " fill="none"></path>
+					<path d="M27211.2 540.7 L586.75 876 L586.75 956 L586.8 956.0 " fill="none"></path>
+					<path d="M27211.2 546.0 L27211.2 540.7 L27211.1 535.4 L27224.5 540.5 Z"></path>
+					<path d="M19609.4 2377.1 L18898.5 2985 L32856 3170.74809119452 L32856.0 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36213.6 1595.8 L36209.1 1605.6 L36203.0 1596.8 L36207.4 1587.0 Z"></path>
+						<path d="M19619.9 2375.1 L19609.4 2377.1 L19613.0 2367.0 L19623.6 2365.0 Z"></path>
 					</g>
-					<path d="M36586.4 1482.1 L37128.25 1607 L37128.25 2296 L37128.25 2296 L37128.25 2985 L37128.25 2985 L33587.25 3168.5709520500345 L33587.3 3168.6 " fill="none"></path>
+					<path d="M19811.4 2376.2 L20624.75 2985 L13407.5 3168.9135269000853 L13407.5 3168.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36578.5 1474.8 L36586.4 1482.1 L36576.1 1485.2 L36568.3 1477.9 Z"></path>
+						<path d="M19807.1 2366.3 L19811.4 2376.2 L19800.7 2374.9 L19796.4 2365.0 Z"></path>
 					</g>
-					<path d="M15706.0 1440.2 L15706 1607 L31429.5 2281.080919640357 L31429.5 2281.1 " fill="none"></path>
+					<path d="M16099.0 1510.7 L16010 1607 L17245.80896226415 2280.5 L17245.8 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15711.3 1430.8 L15706.0 1440.2 L15700.7 1430.8 L15706.0 1421.5 Z"></path>
+						<path d="M16109.2 1507.5 L16099.0 1510.7 L16101.4 1500.2 L16111.6 1497.0 Z"></path>
 					</g>
-					<path d="M27012.4 542.8 L17459 876 L17459 926 L17459.0 926.0 " fill="none"></path>
-					<path d="M27012.6 548.1 L27012.4 542.8 L27012.2 537.5 L27025.8 542.3 Z"></path>
-					<path d="M36189.3 1097.7 L36189.25 1174 L36189.25 1194 L36189.3 1194.0 " fill="none"></path>
+					<path d="M16221.6 1515.6 L16230 1607 L16469.24401306241 2280.5 L16469.2 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36194.6 1088.3 L36189.3 1097.7 L36183.9 1088.3 L36189.3 1079.0 Z"></path>
+						<path d="M16226.0 1505.8 L16221.6 1515.6 L16215.4 1506.8 L16219.8 1497.0 Z"></path>
 					</g>
-					<path d="M38119.5 557.2 L36189.25 876 L36189.25 971 L36189.3 971.0 " fill="none"></path>
-					<path d="M38120.4 562.4 L38119.5 557.2 L38118.6 551.9 L38132.7 555.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M27012.4 544.3 L20524 876 L20524 994 L20524.0 994.0 " fill="none"></path>
+					<path d="M17293.5 1515.4 L17277.5 1607 L18135.9925616836 2280.5 L18136.0 2280.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M17300.3 1507.1 L17293.5 1515.4 L17289.8 1505.3 L17296.7 1497.0 Z"></path>
 					</g>
-					<path d="M27012.7 549.7 L27012.4 544.3 L27012.2 539.0 L27025.8 543.7 Z"></path>
-					<path d="M21977.5 1493.2 L21977.5 1607 L22950.25 2191.4558534990188 L22950.3 2191.5 " fill="none"></path>
+					<path d="M17426.7 1510.7 L17516 1607 L16498.174346879536 2280.5 L16498.2 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21982.8 1483.8 L21977.5 1493.2 L21972.2 1483.8 L21977.5 1474.5 Z"></path>
+						<path d="M17424.3 1500.2 L17426.7 1510.7 L17416.4 1507.5 L17414.0 1497.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M20608.8 1033.7 L21977.5 1174 L21977.5 1306.5 L21977.5 1306.5 " fill="none"></path>
+					<path d="M10282.4 3120.9 L10294.25 3118 L10301.75 3118 L10301.75 3118 L10309.25 3171.5 L10309.25 3171.5 L10301.75 3225 L10301.75 3225 L10294.25 3225 L10294.25 3225 L10264.25 3217.7539503386006 L10264.3 3217.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M10272.1 3117.9 L10282.4 3120.9 L10274.6 3128.2 L10264.3 3125.2 Z"></path>
 					</g>
-					<path d="M20609.3 1028.4 L20608.8 1033.7 L20608.2 1039.0 L20595.5 1032.3 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M20608.8 1029.9 L23124.25 1174 L23124.25 1390.5 L23124.25 1390.5 L23124.25 1607 L23124.25 1607 L23124.25 2182 L23124.3 2182.0 " fill="none"></path>
+						<path d="M2998.9 2323.7 L2710.5 2985 L9881.25 3166.648935447723 L9881.3 3166.6 " fill="none"></path>
 					</g>
-					<path d="M20609.1 1024.5 L20608.8 1029.9 L20608.5 1035.2 L20595.5 1029.1 Z"></path>
-					<path d="M12413.2 2330.8 L14638.5 2985 L8368.5 3168.2414009245476 L8368.5 3168.2 " fill="none"></path>
-					<path d="M12414.7 2325.6 L12413.2 2330.8 L12411.7 2335.9 L12400.4 2327.0 Z"></path>
-					<path d="M43770.4 2555.6 L43662 2985 L36889 3170.663922980819 L36889.0 3170.7 " fill="none"></path>
+					<path d="M3003.8 2325.9 L2998.9 2323.7 L2994.0 2321.6 L3004.2 2311.5 Z"></path>
+					<path d="M12932.5 1470.7 L12932.5 1607 L21091.75 2256.7036491288895 L21091.8 2256.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43777.9 2547.9 L43770.4 2555.6 L43767.6 2545.2 L43775.0 2537.5 Z"></path>
+						<path d="M12937.8 1461.3 L12932.5 1470.7 L12927.2 1461.3 L12932.5 1452.0 Z"></path>
 					</g>
-					<path d="M43894.0 2555.7 L43990 2985 L33587.25 3170.492542486316 L33587.3 3170.5 " fill="none"></path>
+					<path d="M17400.9 1027.9 L12932.5 1174 L12932.5 1329 L12932.5 1329.0 " fill="none"></path>
+					<path d="M17401.1 1033.3 L17400.9 1027.9 L17400.7 1022.6 L17414.3 1027.5 Z"></path>
+					<path d="M47864.0 120.3 L47864 203 L47864 493 L47864.0 493.0 " fill="none"></path>
+					<path d="M47869.3 120.3 L47864.0 120.3 L47858.7 120.3 L47864.0 107.0 Z"></path>
+					<path d="M13451.5 1470.7 L13451.5 1607 L21091.75 2254.1962194559705 L21091.8 2254.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43897.2 2545.4 L43894.0 2555.7 L43886.8 2547.8 L43890.0 2537.5 Z"></path>
+						<path d="M13456.8 1461.3 L13451.5 1470.7 L13446.2 1461.3 L13451.5 1452.0 Z"></path>
 					</g>
-					<path d="M43909.1 2555.5 L44030 2985 L36049.25 3170.2811595555972 L36049.3 3170.3 " fill="none"></path>
+					<path d="M17400.9 1028.3 L13451.5 1174 L13451.5 1329 L13451.5 1329.0 " fill="none"></path>
+					<path d="M17401.1 1033.6 L17400.9 1028.3 L17400.7 1023.0 L17414.3 1027.8 Z"></path>
+					<path d="M21187.5 2593.7 L20664.75 2985 L10264.25 3168.128139161631 L10264.3 3168.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43911.7 2545.0 L43909.1 2555.5 L43901.4 2547.9 L43904.0 2537.5 Z"></path>
+						<path d="M21198.2 2592.4 L21187.5 2593.7 L21191.8 2583.8 L21202.5 2582.5 Z"></path>
 					</g>
-					<path d="M42456.9 606.5 L44264 876 L44264 1025 L44264 1025 L44264 1174 L44264 1174 L44264 1390.5 L44264 1390.5 L44264 1607 L44264 1607 L43986.01741654572 2054.5 L43986.0 2054.5 " fill="none"></path>
-					<path d="M42457.7 601.2 L42456.9 606.5 L42456.2 611.8 L42443.8 604.5 Z"></path>
-					<path d="M32112.0 1508.2 L32112 1607 L27290 2270.6751897722734 L27290.0 2270.7 " fill="none"></path>
+					<path d="M21756.5 2598.7 L21975 2985 L32856 3170.5365942857143 L32856.0 3170.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32117.3 1498.8 L32112.0 1508.2 L32106.7 1498.8 L32112.0 1489.5 Z"></path>
+						<path d="M21756.6 2588.0 L21756.5 2598.7 L21747.3 2593.2 L21747.3 2582.5 Z"></path>
 					</g>
-					<path d="M32037.6 1117.1 L32112 1174 L32112 1291.5 L32112.0 1291.5 " fill="none"></path>
-					<path d="M32040.9 1112.9 L32037.6 1117.1 L32034.4 1121.3 L32027.0 1109.0 Z"></path>
-					<path d="M16958.5 1440.2 L16958.5 1607 L29941.75 2278.0142897327705 L29941.8 2278.0 " fill="none"></path>
+					<path d="M21773.8 2598.3 L22015 2985 L39344.75 3170.936709862072 L39344.8 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16963.8 1430.8 L16958.5 1440.2 L16953.2 1430.8 L16958.5 1421.5 Z"></path>
+						<path d="M21773.4 2587.6 L21773.8 2598.3 L21764.4 2593.2 L21763.9 2582.5 Z"></path>
 					</g>
-					<path d="M30126.6 2522.6 L29793.75 2985 L36828 3170.6948405817616 L36828.0 3170.7 " fill="none"></path>
+					<path d="M42716.7 1432.2 L42585.25 1607 L22078.75 2279.8085 L22078.8 2279.8 " fill="none"></path>
+					<path d="M42720.9 1435.4 L42716.7 1432.2 L42712.4 1429.0 L42724.7 1421.5 Z"></path>
+					<path d="M21914.7 1481.2 L21585.25 1607 L21585.25 2009.5 L21585.3 2009.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30136.4 2518.2 L30126.6 2522.6 L30127.7 2512.0 L30137.5 2507.5 Z"></path>
+						<path d="M21925.3 1482.8 L21914.7 1481.2 L21921.5 1472.8 L21932.1 1474.5 Z"></path>
 					</g>
-					<path d="M30436.8 2523.2 L30735.75 2985 L33474.25 3167.7299642218245 L33474.3 3167.7 " fill="none"></path>
+					<path d="M22389.3 1481.2 L22718.75 1607 L22718.75 2280.5 L22718.8 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30436.2 2512.4 L30436.8 2523.2 L30427.3 2518.2 L30426.7 2507.5 Z"></path>
-					</g>
-					<path d="M30449.7 2522.8 L30775.75 2985 L35944.25 3169.624640873396 L35944.3 3169.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M30448.7 2512.1 L30449.7 2522.8 L30440.0 2518.2 L30438.9 2507.5 Z"></path>
-					</g>
-					<path d="M40640.4 1434.3 L40688.25 1607 L30637.75 2272.9416742799444 L30637.8 2272.9 " fill="none"></path>
-					<path d="M40645.5 1432.9 L40640.4 1434.3 L40635.3 1435.8 L40636.8 1421.5 Z"></path>
-					<path d="M37208.3 1532.8 L37208.25 1607 L30637.75 2261.3433547734335 L30637.8 2261.3 " fill="none"></path>
-					<path d="M37213.6 1532.8 L37208.3 1532.8 L37202.9 1532.8 L37208.3 1519.5 Z"></path>
-					<path d="M39642.6 1555.3 L39648.25 1607 L30637.75 2270.379227440295 L30637.8 2270.4 " fill="none"></path>
-					<path d="M39647.9 1554.7 L39642.6 1555.3 L39637.3 1555.8 L39641.2 1542.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M41299.6 1073.9 L41379 1174 L41379 1390.5 L41379 1390.5 L41379 1607 L41379 1607 L30637.75 2274.3779786730393 L30637.8 2274.4 " fill="none"></path>
+						<path d="M22382.5 1472.8 L22389.3 1481.2 L22378.7 1482.8 L22371.9 1474.5 Z"></path>
 					</g>
-					<path d="M41303.8 1070.6 L41299.6 1073.9 L41295.4 1077.3 L41291.3 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M9099.1 1418.5 L9168.75 1607 L29941.75 2284.647696605274 L29941.8 2284.6 " fill="none"></path>
-					</g>
-					<path d="M9104.1 1416.7 L9099.1 1418.5 L9094.1 1420.4 L9094.5 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M25468.6 1043.0 L26168.25 1174 L26168.25 1390.5 L26168.25 1390.5 L26168.25 1607 L26168.25 1607 L29941.75 2237.8240931699625 L29941.8 2237.8 " fill="none"></path>
-					</g>
-					<path d="M25469.6 1037.7 L25468.6 1043.0 L25467.6 1048.2 L25455.5 1040.5 Z"></path>
-					<path d="M8628.3 1455.7 L8628.25 1607 L8628.25 2280.5 L8628.3 2280.5 " fill="none"></path>
+					<path d="M43411.4 2487.3 L43212.75 2985 L40692.25 3169.2701881615053 L40692.3 3169.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8633.6 1446.3 L8628.3 1455.7 L8622.9 1446.3 L8628.3 1437.0 Z"></path>
+						<path d="M43419.8 2480.6 L43411.4 2487.3 L43409.9 2476.7 L43418.3 2470.0 Z"></path>
 					</g>
-					<path d="M12050.7 1030.7 L9812.25 1174 L8800.25 1359.0489864864865 L8800.3 1359.0 " fill="none"></path>
-					<path d="M12051.0 1036.0 L12050.7 1030.7 L12050.4 1025.4 L12064.0 1029.9 Z"></path>
-					<path d="M12414.1 2318.1 L16005.5 2985 L8718.5 3167.615627519484 L8718.5 3167.6 " fill="none"></path>
-					<path d="M12415.1 2312.9 L12414.1 2318.1 L12413.1 2323.4 L12401.0 2315.7 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M20608.8 1028.9 L23803.25 1174 L23803.25 1329 L23803.3 1329.0 " fill="none"></path>
-					</g>
-					<path d="M20609.1 1023.5 L20608.8 1028.9 L20608.6 1034.2 L20595.5 1028.2 Z"></path>
-					<path d="M37755.5 2494.9 L37561.25 2985 L36889 3163.4057274991105 L36889.0 3163.4 " fill="none"></path>
+					<path d="M43422.4 2487.7 L43252.75 2985 L34499.75 3170.525002841232 L34499.8 3170.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37763.9 2488.1 L37755.5 2494.9 L37753.9 2484.2 L37762.3 2477.5 Z"></path>
+						<path d="M43430.4 2480.6 L43422.4 2487.7 L43420.3 2477.1 L43428.4 2470.0 Z"></path>
 					</g>
-					<path d="M37822.6 2496.1 L37794.25 2985 L34981.25 3168.4993004547046 L34981.3 3168.5 " fill="none"></path>
+					<path d="M43433.4 2488.0 L43292.75 2985 L39304.75 3153.672638621159 L39304.8 3153.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37828.5 2487.1 L37822.6 2496.1 L37817.8 2486.5 L37823.7 2477.5 Z"></path>
+						<path d="M43441.1 2480.4 L43433.4 2488.0 L43430.8 2477.5 L43438.5 2470.0 Z"></path>
 					</g>
-					<path d="M37901.6 2495.2 L38067.25 2985 L38067.25 3171.5 L38067.25 3171.5 L38067.25 3358 L38067.25 3358 L38067.25 3514.5 L38067.25 3514.5 L38067.25 3671 L38067.25 3671 L35569.75 3705.8169055566464 L35569.8 3705.8 " fill="none"></path>
+					<path d="M43487.8 2488.7 L43487.75 2985 L43487.75 3171.5 L43487.75 3171.5 L43487.75 3358 L43487.75 3358 L43487.75 3514.5 L43487.75 3514.5 L43487.75 3671 L43487.75 3671 L38651.25 3706.143946371917 L38651.3 3706.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37903.7 2484.6 L37901.6 2495.2 L37893.6 2488.0 L37895.6 2477.5 Z"></path>
+						<path d="M43493.1 2479.3 L43487.8 2488.7 L43482.4 2479.3 L43487.8 2470.0 Z"></path>
 					</g>
-					<path d="M37913.0 2494.9 L38107.25 2985 L38107.25 3171.5 L38107.25 3171.5 L38107.25 3358 L38107.25 3358 L37089.25 3495.520069054812 L37089.3 3495.5 " fill="none"></path>
+					<path d="M43542.1 2488.0 L43682.75 2985 L43682.75 3171.5 L43682.75 3171.5 L43682.75 3358 L43682.75 3358 L39990.75 3508.7626875407695 L39990.8 3508.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37914.6 2484.2 L37913.0 2494.9 L37904.6 2488.1 L37906.2 2477.5 Z"></path>
+						<path d="M43544.7 2477.5 L43542.1 2488.0 L43534.4 2480.4 L43537.0 2470.0 Z"></path>
 					</g>
-					<path d="M37924.4 2494.5 L38147.25 2985 L36049.25 3166.946989072309 L36049.3 3166.9 " fill="none"></path>
+					<path d="M43553.1 2487.7 L43722.75 2985 L39449.75 3169.2363888567797 L39449.8 3169.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37925.4 2483.8 L37924.4 2494.5 L37915.7 2488.2 L37916.7 2477.5 Z"></path>
+						<path d="M43555.2 2477.1 L43553.1 2487.7 L43545.1 2480.6 L43547.1 2470.0 Z"></path>
 					</g>
-					<path d="M42456.9 605.3 L44304 876 L44304 1025 L44304 1025 L44304 1174 L44304 1174 L44304 1390.5 L44304 1390.5 L44304 1607 L44304 1607 L38380.25 2237.8533946443063 L38380.3 2237.9 " fill="none"></path>
-					<path d="M42457.7 600.0 L42456.9 605.3 L42456.2 610.6 L42443.8 603.4 Z"></path>
+					<path d="M44207.7 613.7 L45796.25 876 L45796.25 1025 L45796.25 1025 L45796.25 1174 L45796.25 1174 L45796.25 1390.5 L45796.25 1390.5 L45796.25 1607 L45796.25 1607 L43917.75 2167.66125189517 L43917.8 2167.7 " fill="none"></path>
+					<path d="M44208.5 608.4 L44207.7 613.7 L44206.8 618.9 L44194.5 611.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41332.7 1070.6 L41495.75 1174 L41495.75 1390.5 L41495.75 1390.5 L41495.75 1607 L41495.75 1607 L38380.25 2193.256861941827 L38380.3 2193.3 " fill="none"></path>
+						<path d="M43776.9 1068.1 L43487.75 1174 L43487.75 1390.5 L43487.75 1390.5 L43487.75 1607 L43487.75 1607 L43487.75 2122 L43487.8 2122.0 " fill="none"></path>
 					</g>
-					<path d="M41335.6 1066.1 L41332.7 1070.6 L41329.9 1075.1 L41321.5 1063.5 Z"></path>
+					<path d="M43778.7 1073.1 L43776.9 1068.1 L43775.0 1063.1 L43789.4 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M9103.8 1417.7 L9208.75 1607 L37288.25 2282.8580810815533 L37288.3 2282.9 " fill="none"></path>
+						<path d="M29400.8 1053.8 L29400.75 1174 L29400.75 1390.5 L29400.75 1390.5 L29400.75 1607 L29400.75 1607 L43057.75 2274.9685525661957 L43057.8 2275.0 " fill="none"></path>
 					</g>
-					<path d="M9108.5 1415.1 L9103.8 1417.7 L9099.1 1420.2 L9097.3 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M25472.8 1042.8 L26208.25 1174 L26208.25 1390.5 L26208.25 1390.5 L26208.25 1607 L26208.25 1607 L37288.25 2263.6420092895237 L37288.3 2263.6 " fill="none"></path>
+					<path d="M29406.1 1053.8 L29400.8 1053.8 L29395.4 1053.8 L29400.8 1040.5 Z"></path>
+					<path d="M38883.3 3296.7 L38883.25 3358 L39709.75 3491.761375387797 L39709.8 3491.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M38888.6 3287.3 L38883.3 3296.7 L38877.9 3287.3 L38883.3 3278.0 Z"></path>
+					</g>
+					<path d="M39323.4 3154.7 L43762.75 2985 L43557.19847605225 2470 L43557.2 2470.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M39313.9 3149.7 L39323.4 3154.7 L39314.3 3160.4 L39304.8 3155.4 Z"></path>
 					</g>
-					<path d="M25473.7 1037.6 L25472.8 1042.8 L25471.9 1048.1 L25459.7 1040.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M4867.1 2324.3 L5050.75 2985 L2938.25 3155.850498699046 L2938.3 3155.9 " fill="none"></path>
+						<path d="M43916.1 1075.8 L43957.75 1174 L43957.75 1390.5 L43957.75 1390.5 L43957.75 1607 L43957.75 1607 L43957.75 2296 L43957.75 2296 L43957.75 2985 L43957.75 2985 L39304.75 3156.0088678687557 L39304.8 3156.0 " fill="none"></path>
 					</g>
-					<path d="M4872.3 2322.9 L4867.1 2324.3 L4862.0 2325.8 L4863.6 2311.5 Z"></path>
-					<path d="M41534.1 2487.8 L41379 2985 L36889 3170.2416768056632 L36889.0 3170.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41542.0 2480.5 L41534.1 2487.8 L41531.8 2477.3 L41539.7 2470.0 Z"></path>
+					<path d="M43921.0 1073.7 L43916.1 1075.8 L43911.1 1077.9 L43910.8 1063.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M14193.6 1419.2 L14171.75 1607 L14171.75 2296 L14171.75 2296 L14171.75 2985 L14171.75 2985 L38461.75 3168.3189001072374 L38461.8 3168.3 " fill="none"></path>
 					</g>
-					<path d="M41571.6 2488.5 L41514 2985 L34981.25 3170.1959528785865 L34981.3 3170.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41578.0 2479.9 L41571.6 2488.5 L41567.4 2478.7 L41573.8 2470.0 Z"></path>
+					<path d="M14198.9 1419.9 L14193.6 1419.2 L14188.4 1418.6 L14195.2 1406.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M29457.0 1045.0 L29820.5 1174 L29820.5 1390.5 L29820.5 1390.5 L29820.5 1607 L29820.5 1607 L29820.5 2296 L29820.5 2296 L29820.5 2985 L29820.5 2985 L38461.75 3162.8260599707596 L38461.8 3162.8 " fill="none"></path>
 					</g>
-					<path d="M41582.8 2488.6 L41554 2985 L35904.25 3158.552130945028 L35904.3 3158.6 " fill="none"></path>
+					<path d="M29458.8 1039.9 L29457.0 1045.0 L29455.2 1050.0 L29444.4 1040.5 Z"></path>
+					<path d="M22948.3 1476.4 L22886.75 1607 L22886.75 2296 L22886.75 2296 L22886.75 2985 L22886.75 2985 L12742.5 3168.7735374826975 L12742.5 3168.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41588.7 2479.6 L41582.8 2488.6 L41578.0 2479.0 L41583.9 2470.0 Z"></path>
+						<path d="M22957.1 1470.2 L22948.3 1476.4 L22947.4 1465.7 L22956.2 1459.5 Z"></path>
 					</g>
-					<path d="M41637.2 2488.2 L41749 2985 L41749 3171.5 L41749 3171.5 L41749 3358 L41749 3358 L41749 3514.5 L41749 3514.5 L41749 3671 L41749 3671 L35569.75 3706.220708064063 L35569.8 3706.2 " fill="none"></path>
+					<path d="M23042.5 1475.3 L23126 1607 L11565.25 2292.8557098267142 L11565.3 2292.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41640.4 2477.9 L41637.2 2488.2 L41630.0 2480.3 L41633.1 2470.0 Z"></path>
+						<path d="M23042.0 1464.5 L23042.5 1475.3 L23033.0 1470.2 L23032.5 1459.5 Z"></path>
 					</g>
-					<path d="M41648.3 2488.0 L41789 2985 L41789 3171.5 L41789 3171.5 L41789 3358 L41789 3358 L37089.25 3509.957207788854 L37089.3 3510.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41650.9 2477.5 L41648.3 2488.0 L41640.7 2480.4 L41643.2 2470.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M9052.2 1034.1 L7752.75 1174 L7752.75 1329 L7752.8 1329.0 " fill="none"></path>
 					</g>
-					<path d="M41659.4 2487.7 L41829 2985 L36049.25 3169.8211882206697 L36049.3 3169.8 " fill="none"></path>
+					<path d="M9052.8 1039.4 L9052.2 1034.1 L9051.7 1028.8 L9065.5 1032.7 Z"></path>
+					<path d="M12760.4 3121.6 L12772.5 3118 L12780 3118 L12780 3118 L12787.5 3171.5 L12787.5 3171.5 L12780 3225 L12780 3225 L12772.5 3225 L12772.5 3225 L12742.5 3216.1080332409974 L12742.5 3216.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41661.4 2477.1 L41659.4 2487.7 L41651.3 2480.6 L41653.3 2470.0 Z"></path>
+						<path d="M12749.9 3119.1 L12760.4 3121.6 L12753.0 3129.4 L12742.5 3126.9 Z"></path>
 					</g>
-					<path d="M42456.9 604.2 L44344 876 L44344 1025 L44344 1025 L44344 1174 L44344 1174 L44344 1390.5 L44344 1390.5 L44344 1607 L44344 1607 L42024 2188.2654545454548 L42024.0 2188.3 " fill="none"></path>
-					<path d="M42457.7 598.9 L42456.9 604.2 L42456.2 609.5 L42443.8 602.3 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41359.0 1068.9 L41594 1174 L41594 1390.5 L41594 1390.5 L41594 1607 L41594 1607 L41594 2122 L41594.0 2122.0 " fill="none"></path>
+						<path d="M3011.0 2324.8 L3011 2985 L12441.5 3168.570425842814 L12441.5 3168.6 " fill="none"></path>
 					</g>
-					<path d="M41361.2 1064.1 L41359.0 1068.9 L41356.9 1073.8 L41346.9 1063.5 Z"></path>
+					<path d="M3016.3 2324.8 L3011.0 2324.8 L3005.7 2324.8 L3011.0 2311.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M25477.0 1042.7 L26248.25 1174 L26248.25 1390.5 L26248.25 1390.5 L26248.25 1607 L26248.25 1607 L41164 2276.693677402538 L41164.0 2276.7 " fill="none"></path>
+						<path d="M27211.2 541.3 L9137 876 L9137 994 L9137.0 994.0 " fill="none"></path>
 					</g>
-					<path d="M25477.9 1037.5 L25477.0 1042.7 L25476.1 1048.0 L25463.8 1040.5 Z"></path>
-					<path d="M35482.8 3296.7 L35482.75 3358 L36808.25 3499.5011937244203 L36808.3 3499.5 " fill="none"></path>
+					<path d="M27211.3 546.6 L27211.2 541.3 L27211.1 535.9 L27224.5 541.0 Z"></path>
+					<path d="M45255.2 2555.5 L45134.25 2985 L40692.25 3170.22817216322 L40692.3 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35488.1 3287.3 L35482.8 3296.7 L35477.4 3287.3 L35482.8 3278.0 Z"></path>
+						<path d="M45262.9 2547.9 L45255.2 2555.5 L45252.6 2545.0 L45260.3 2537.5 Z"></path>
 					</g>
-					<path d="M35922.9 3158.6 L41869 2985 L41663.44847605225 2470 L41663.4 2470.0 " fill="none"></path>
+					<path d="M45328.3 2556.2 L45328.25 2985 L32969 3170.651299760385 L32969.0 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35913.4 3153.6 L35922.9 3158.6 L35913.7 3164.2 L35904.3 3159.2 Z"></path>
+						<path d="M45333.6 2546.8 L45328.3 2556.2 L45322.9 2546.8 L45328.3 2537.5 Z"></path>
+					</g>
+					<path d="M45401.3 2555.5 L45522.25 2985 L39449.75 3169.9014285714284 L39449.8 3169.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M45403.9 2545.0 L45401.3 2555.5 L45393.6 2547.9 L45396.2 2537.5 Z"></path>
+					</g>
+					<path d="M44207.7 612.2 L45836.25 876 L45836.25 1025 L45836.25 1025 L45836.25 1174 L45836.25 1174 L45836.25 1390.5 L45836.25 1390.5 L45836.25 1607 L45836.25 1607 L45506.308055152396 2054.5 L45506.3 2054.5 " fill="none"></path>
+					<path d="M44208.5 607.0 L44207.7 612.2 L44206.8 617.5 L44194.5 610.1 Z"></path>
+					<path d="M22455.0 2340.0 L22605.75 2985 L15438.5 3168.6430877554526 L15438.5 3168.6 " fill="none"></path>
+					<path d="M22460.2 2338.8 L22455.0 2340.0 L22449.8 2341.2 L22452.0 2327.0 Z"></path>
+					<path d="M9895.0 1493.2 L9895 1607 L10439.747822931786 2182 L10439.7 2182.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M9900.3 1483.8 L9895.0 1493.2 L9889.7 1483.8 L9895.0 1474.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M41382.4 1047.6 L42064 1174 L42064 1390.5 L42064 1390.5 L42064 1607 L42064 1607 L42064 2296 L42064 2296 L42064 2985 L42064 2985 L35904.25 3159.5554985754984 L35904.3 3159.6 " fill="none"></path>
+						<path d="M9221.6 1041.6 L9895 1174 L9895 1306.5 L9895.0 1306.5 " fill="none"></path>
 					</g>
-					<path d="M41383.3 1042.3 L41382.4 1047.6 L41381.4 1052.8 L41369.3 1045.1 Z"></path>
+					<path d="M9222.6 1036.4 L9221.6 1041.6 L9220.6 1046.9 L9208.5 1039.1 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M9108.1 1416.7 L9248.75 1607 L9248.75 2296 L9248.75 2296 L9248.75 2985 L9248.75 2985 L35061.25 3168.5035164290616 L35061.3 3168.5 " fill="none"></path>
+						<path d="M9221.7 1037.6 L10142 1174 L10142 1390.5 L10142 1390.5 L10142 1607 L10142 1607 L10480.615747460088 2182 L10480.6 2182.0 " fill="none"></path>
 					</g>
-					<path d="M9112.4 1413.6 L9108.1 1416.7 L9103.8 1419.9 L9100.2 1406.0 Z"></path>
+					<path d="M9222.5 1032.3 L9221.7 1037.6 L9220.9 1042.8 L9208.5 1035.6 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M25482.5 1040.3 L26442 1174 L26442 1390.5 L26442 1390.5 L26442 1607 L26442 1607 L26442 2296 L26442 2296 L26442 2985 L26442 2985 L35061.25 3162.804952575837 L35061.3 3162.8 " fill="none"></path>
+						<path d="M3041.4 2319.7 L3896.25 2985 L1932 3154.7752867570384 L1932.0 3154.8 " fill="none"></path>
 					</g>
-					<path d="M25483.2 1035.0 L25482.5 1040.3 L25481.7 1045.6 L25469.3 1038.4 Z"></path>
-					<path d="M24532.3 1112.7 L24532.25 1174 L24532.25 1375 L24532.3 1375.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24537.6 1103.3 L24532.3 1112.7 L24526.9 1103.3 L24532.3 1094.0 Z"></path>
+					<path d="M3044.7 2315.5 L3041.4 2319.7 L3038.2 2323.9 L3030.9 2311.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M9221.8 1032.6 L10796 1174 L10796 1329 L10796.0 1329.0 " fill="none"></path>
 					</g>
-					<path d="M27012.5 551.9 L24532.25 876 L24532.25 956 L24532.3 956.0 " fill="none"></path>
-					<path d="M27013.2 557.2 L27012.5 551.9 L27011.8 546.6 L27025.8 550.2 Z"></path>
-					<path d="M18753.1 1487.3 L18625.75 1607 L20781.5 2167.653675568557 L20781.5 2167.7 " fill="none"></path>
+					<path d="M9222.3 1027.3 L9221.8 1032.6 L9221.3 1037.9 L9208.5 1031.4 Z"></path>
+					<path d="M24367.3 1440.2 L24367.25 1607 L32494.25 2267.7083185840706 L32494.3 2267.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18763.5 1484.8 L18753.1 1487.3 L18756.2 1477.0 L18766.7 1474.5 Z"></path>
+						<path d="M24372.6 1430.8 L24367.3 1440.2 L24361.9 1430.8 L24367.3 1421.5 Z"></path>
 					</g>
-					<path d="M18910.8 1490.9 L18974.25 1607 L18629.43559506531 2280.5 L18629.4 2280.5 " fill="none"></path>
+					<path d="M13903.0 1455.7 L13903 1607 L13903 2280.5 L13903.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18911.0 1480.1 L18910.8 1490.9 L18901.7 1485.2 L18901.9 1474.5 Z"></path>
+						<path d="M13908.3 1446.3 L13903.0 1455.7 L13897.7 1446.3 L13903.0 1437.0 Z"></path>
 					</g>
-					<path d="M21125.0 2599.2 L20934.25 2985 L4742.75 3169.3200115973877 L4742.8 3169.3 " fill="none"></path>
+					<path d="M17400.9 1028.7 L13903 1174 L13903 1344 L13903.0 1344.0 " fill="none"></path>
+					<path d="M17401.1 1034.0 L17400.9 1028.7 L17400.7 1023.4 L17414.3 1028.2 Z"></path>
+					<path d="M35489.5 1508.2 L35489.5 1607 L25509.5 2283.526957890594 L25509.5 2283.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21134.0 2593.2 L21125.0 2599.2 L21124.4 2588.5 L21133.3 2582.5 Z"></path>
+						<path d="M35494.8 1498.8 L35489.5 1508.2 L35484.2 1498.8 L35489.5 1489.5 Z"></path>
 					</g>
-					<path d="M21275.0 2601.2 L21275 2985 L33474.25 3170.640219896783 L33474.3 3170.6 " fill="none"></path>
+					<path d="M35415.1 1117.1 L35489.5 1174 L35489.5 1291.5 L35489.5 1291.5 " fill="none"></path>
+					<path d="M35418.4 1112.9 L35415.1 1117.1 L35411.9 1121.3 L35404.5 1109.0 Z"></path>
+					<path d="M32666.1 2522.2 L32305.75 2985 L40631.25 3170.819261608425 L40631.3 3170.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21280.3 2591.8 L21275.0 2601.2 L21269.7 2591.8 L21275.0 2582.5 Z"></path>
+						<path d="M32676.0 2518.1 L32666.1 2522.2 L32667.6 2511.6 L32677.6 2507.5 Z"></path>
 					</g>
-					<path d="M21620.4 2594.7 L22071.75 2985 L35944.25 3170.7968581687614 L35944.3 3170.8 " fill="none"></path>
+					<path d="M32926.7 2525.0 L33096.25 2985 L32927.77144772118 3156 L32927.8 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21616.9 2584.6 L21620.4 2594.7 L21609.9 2592.6 L21606.3 2582.5 Z"></path>
+						<path d="M32928.5 2514.4 L32926.7 2525.0 L32918.4 2518.1 L32920.2 2507.5 Z"></path>
 					</g>
-					<path d="M40648.2 1433.6 L40728.25 1607 L21768.5 2278.521095446776 L21768.5 2278.5 " fill="none"></path>
-					<path d="M40653.0 1431.4 L40648.2 1433.6 L40643.3 1435.8 L40642.6 1421.5 Z"></path>
-					<path d="M19286.4 1513.4 L19235.25 1607 L18890.43559506531 2280.5 L18890.4 2280.5 " fill="none"></path>
+					<path d="M32939.8 2524.7 L33136.25 2985 L39344.75 3169.9361523718258 L39344.8 3169.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19295.5 1507.7 L19286.4 1513.4 L19286.2 1502.6 L19295.3 1497.0 Z"></path>
+						<path d="M32941.1 2514.0 L32939.8 2524.7 L32931.3 2518.2 L32932.5 2507.5 Z"></path>
 					</g>
-					<path d="M19595.1 1475.6 L19968.25 1607 L20108.76614658926 2280.5 L20108.8 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19588.1 1467.5 L19595.1 1475.6 L19584.5 1477.5 L19577.5 1469.4 Z"></path>
+					<path d="M42760.0 1434.4 L42807 1607 L33190.25 2271.93798138438 L33190.3 2271.9 " fill="none"></path>
+					<path d="M42765.1 1433.0 L42760.0 1434.4 L42754.8 1435.8 L42756.4 1421.5 Z"></path>
+					<path d="M39497.9 1532.3 L39477.25 1607 L33190.25 2259.862547098719 L33190.3 2259.9 " fill="none"></path>
+					<path d="M39503.1 1533.8 L39497.9 1532.3 L39492.8 1530.9 L39501.5 1519.5 Z"></path>
+					<path d="M42132.4 1554.0 L42107 1607 L33190.25 2270.1199708572817 L33190.3 2270.1 " fill="none"></path>
+					<path d="M42137.2 1556.3 L42132.4 1554.0 L42127.6 1551.7 L42138.1 1542.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M43928.8 1074.5 L43997.75 1174 L43997.75 1390.5 L43997.75 1390.5 L43997.75 1607 L43997.75 1607 L33190.25 2274.5063869839987 L33190.3 2274.5 " fill="none"></path>
 					</g>
-					<path d="M20311.3 1500.7 L20077.25 1607 L20285.213896952104 2280.5 L20285.2 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20322.0 1501.7 L20311.3 1500.7 L20317.5 1492.0 L20328.3 1493.0 Z"></path>
+					<path d="M43933.2 1071.4 L43928.8 1074.5 L43924.4 1077.5 L43921.2 1063.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M14199.0 1419.3 L14211.75 1607 L32494.25 2283.1301360672014 L32494.3 2283.1 " fill="none"></path>
 					</g>
-					<path d="M20622.5 1513.3 L20675 1607 L20124.665457184325 2280.5 L20124.7 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20622.6 1502.5 L20622.5 1513.3 L20613.3 1507.7 L20613.4 1497.0 Z"></path>
+					<path d="M14204.3 1418.9 L14199.0 1419.3 L14193.6 1419.7 L14198.1 1406.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M29461.3 1044.6 L29860.5 1174 L29860.5 1390.5 L29860.5 1390.5 L29860.5 1607 L29860.5 1607 L32494.25 2215.5868198205753 L32494.3 2215.6 " fill="none"></path>
 					</g>
-					<path d="M4760.9 3120.9 L4772.75 3118 L4780.25 3118 L4780.25 3118 L4787.75 3171.5 L4787.75 3171.5 L4780.25 3225 L4780.25 3225 L4772.75 3225 L4772.75 3225 L4742.75 3217.7539503386006 L4742.8 3217.8 " fill="none"></path>
+					<path d="M29462.9 1039.5 L29461.3 1044.6 L29459.6 1049.7 L29448.6 1040.5 Z"></path>
+					<path d="M22457.5 2339.8 L22645.75 2985 L15788.5 3167.3775713929194 L15788.5 3167.4 " fill="none"></path>
+					<path d="M22462.6 2338.3 L22457.5 2339.8 L22452.4 2341.3 L22453.8 2327.0 Z"></path>
+					<path d="M40053.1 2494.5 L39830.25 2985 L40631.25 3164.6590499098015 L40631.3 3164.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4750.6 3117.9 L4760.9 3120.9 L4753.1 3128.2 L4742.8 3125.2 Z"></path>
+						<path d="M40061.8 2488.2 L40053.1 2494.5 L40052.1 2483.8 L40060.8 2477.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M4873.5 2323.3 L5217.75 2985 L4742.44436997319 3118 L4742.4 3118.0 " fill="none"></path>
-					</g>
-					<path d="M4878.2 2320.9 L4873.5 2323.3 L4868.7 2325.8 L4867.3 2311.5 Z"></path>
-					<path d="M13074.0 1470.7 L13074 1607 L20781.5 2254.539019631752 L20781.5 2254.5 " fill="none"></path>
+					<path d="M40064.5 2494.9 L39870.25 2985 L34499.75 3169.916135881104 L34499.8 3169.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13079.3 1461.3 L13074.0 1470.7 L13068.7 1461.3 L13074.0 1452.0 Z"></path>
+						<path d="M40072.9 2488.1 L40064.5 2494.9 L40062.9 2484.2 L40071.3 2477.5 Z"></path>
 					</g>
-					<path d="M12138.4 1053.8 L12131.75 1174 L12834.5 1335.4702838949324 L12834.5 1335.5 " fill="none"></path>
-					<path d="M12143.7 1054.1 L12138.4 1053.8 L12133.1 1053.5 L12139.1 1040.5 Z"></path>
-					<path d="M13593.0 1470.7 L13593 1607 L20781.5 2251.737893777662 L20781.5 2251.7 " fill="none"></path>
+					<path d="M40143.3 2496.2 L40143.25 2985 L40143.25 3171.5 L40143.25 3171.5 L40143.25 3358 L40143.25 3358 L40143.25 3514.5 L40143.25 3514.5 L40143.25 3671 L40143.25 3671 L38651.25 3705.371187540558 L38651.3 3705.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13598.3 1461.3 L13593.0 1470.7 L13587.7 1461.3 L13593.0 1452.0 Z"></path>
+						<path d="M40148.6 2486.8 L40143.3 2496.2 L40137.9 2486.8 L40143.3 2477.5 Z"></path>
 					</g>
-					<path d="M12205.9 1044.2 L12650.75 1174 L13353.5 1335.4702838949324 L13353.5 1335.5 " fill="none"></path>
-					<path d="M12207.4 1039.1 L12205.9 1044.2 L12204.4 1049.4 L12193.1 1040.5 Z"></path>
-					<path d="M42981.3 120.3 L42981.25 203 L42981.25 493 L42981.3 493.0 " fill="none"></path>
-					<path d="M42986.6 120.3 L42981.3 120.3 L42975.9 120.3 L42981.3 107.0 Z"></path>
-					<path d="M22465.8 2381.1 L22111.75 2985 L33474.25 3170.5772177949034 L33474.3 3170.6 " fill="none"></path>
+					<path d="M40268.8 2493.2 L40581.75 2985 L40581.75 3171.5 L40581.75 3171.5 L40581.75 3358 L40581.75 3358 L39990.75 3484.440874914559 L39990.8 3484.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22475.2 2375.7 L22465.8 2381.1 L22466.0 2370.4 L22475.3 2365.0 Z"></path>
+						<path d="M40268.3 2482.5 L40268.8 2493.2 L40259.3 2488.2 L40258.8 2477.5 Z"></path>
 					</g>
-					<path d="M22538.2 2383.1 L22693 2985 L22693 3156 L22693.0 3156.0 " fill="none"></path>
+					<path d="M40279.9 2492.8 L40621.75 2985 L39449.75 3163.5038791343404 L39449.8 3163.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22541.0 2372.7 L22538.2 2383.1 L22530.7 2375.4 L22533.5 2365.0 Z"></path>
+						<path d="M40279.0 2482.1 L40279.9 2492.8 L40270.2 2488.2 L40269.3 2477.5 Z"></path>
 					</g>
+					<path d="M44207.7 610.9 L45876.25 876 L45876.25 1025 L45876.25 1025 L45876.25 1174 L45876.25 1174 L45876.25 1390.5 L45876.25 1390.5 L45876.25 1607 L45876.25 1607 L40689.25 2230.3809523809523 L40689.3 2230.4 " fill="none"></path>
+					<path d="M44208.5 605.6 L44207.7 610.9 L44206.8 616.1 L44194.5 608.8 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M20608.8 1028.4 L24259.25 1174 L24259.25 1329 L24259.3 1329.0 " fill="none"></path>
+						<path d="M43940.8 1073.1 L44037.75 1174 L44037.75 1390.5 L44037.75 1390.5 L44037.75 1607 L44037.75 1607 L40689.25 2199.403774553858 L40689.3 2199.4 " fill="none"></path>
 					</g>
-					<path d="M20609.0 1023.1 L20608.8 1028.4 L20608.6 1033.7 L20595.5 1027.9 Z"></path>
-					<path d="M8073.4 3121.6 L8085.5 3118 L8093 3118 L8093 3118 L8100.5 3171.5 L8100.5 3171.5 L8093 3225 L8093 3225 L8085.5 3225 L8085.5 3225 L8055.5 3216.1080332409974 L8055.5 3216.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8062.9 3119.1 L8073.4 3121.6 L8066.0 3129.4 L8055.5 3126.9 Z"></path>
+					<path d="M43944.6 1069.4 L43940.8 1073.1 L43936.9 1076.8 L43931.5 1063.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M14207.3 1418.5 L14277 1607 L39597.25 2281.4561832503746 L39597.3 2281.5 " fill="none"></path>
 					</g>
+					<path d="M14212.4 1416.7 L14207.3 1418.5 L14202.3 1420.4 L14202.7 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M4874.9 2323.0 L5257.75 2985 L7754.5 3160.897204646331 L7754.5 3160.9 " fill="none"></path>
+						<path d="M29465.5 1044.3 L29900.5 1174 L29900.5 1390.5 L29900.5 1390.5 L29900.5 1607 L29900.5 1607 L39597.25 2259.272168118913 L39597.3 2259.3 " fill="none"></path>
 					</g>
-					<path d="M4879.5 2320.4 L4874.9 2323.0 L4870.3 2325.7 L4868.2 2311.5 Z"></path>
-					<path d="M22922.2 1478.1 L22910.25 1607 L22910.25 2296 L22910.25 2296 L22910.25 2985 L22910.25 2985 L8055.5 3169.629438030023 L8055.5 3169.6 " fill="none"></path>
+					<path d="M29467.0 1039.2 L29465.5 1044.3 L29464.0 1049.4 L29452.7 1040.5 Z"></path>
+					<path d="M14486.5 1469.6 L14437 1607 L16604.85867198839 2280.5 L16604.9 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22928.3 1469.3 L22922.2 1478.1 L22917.7 1468.3 L22923.9 1459.5 Z"></path>
+						<path d="M14494.7 1462.6 L14486.5 1469.6 L14484.7 1459.0 L14492.8 1452.0 Z"></path>
 					</g>
-					<path d="M22964.9 1476.8 L23017.25 1607 L8897.75 2293.423390368672 L8897.8 2293.4 " fill="none"></path>
+					<path d="M14584.6 1465.7 L14715.25 1607 L16825.680333817127 2280.5 L16825.7 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22966.4 1466.2 L22964.9 1476.8 L22956.5 1470.1 L22958.0 1459.5 Z"></path>
+						<path d="M14582.1 1455.2 L14584.6 1465.7 L14574.3 1462.5 L14571.9 1452.0 Z"></path>
 					</g>
-					<path d="M12414.1 2316.9 L16221.25 2985 L9151.5 3166.456511267848 L9151.5 3166.5 " fill="none"></path>
-					<path d="M12415.1 2311.7 L12414.1 2316.9 L12413.2 2322.2 L12401.0 2314.6 Z"></path>
-					<path d="M13991.7 1465.2 L13849.75 1607 L13849.75 2280.5 L13849.8 2280.5 " fill="none"></path>
+					<path d="M17400.9 1029.5 L14515 1174 L14515 1329 L14515.0 1329.0 " fill="none"></path>
+					<path d="M17401.2 1034.8 L17400.9 1029.5 L17400.7 1024.1 L17414.3 1028.8 Z"></path>
+					<path d="M33964.2 2442.5 L33764.25 2985 L32969 3159.128705606105 L32969.0 3159.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14002.1 1462.4 L13991.7 1465.2 L13994.6 1454.8 L14004.9 1452.0 Z"></path>
+						<path d="M33972.5 2435.6 L33964.2 2442.5 L33962.5 2431.9 L33970.7 2425.0 Z"></path>
 					</g>
-					<path d="M14131.2 1466.2 L14251.5 1607 L14251.5 2280.5 L14251.5 2280.5 " fill="none"></path>
+					<path d="M34185.8 2437.0 L34836.75 2985 L39344.75 3169.353031465848 L39344.8 3169.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14129.2 1455.6 L14131.2 1466.2 L14121.1 1462.6 L14119.1 1452.0 Z"></path>
+						<path d="M34182.1 2426.9 L34185.8 2437.0 L34175.2 2435.1 L34171.5 2425.0 Z"></path>
 					</g>
-					<path d="M12229.2 1038.5 L13124.25 1174 L13872.5 1345.9247811090474 L13872.5 1345.9 " fill="none"></path>
-					<path d="M12230.0 1033.2 L12229.2 1038.5 L12228.4 1043.8 L12216.0 1036.5 Z"></path>
-					<path d="M23340.3 1447.7 L23340.25 1607 L20028.5 2204.6025011458128 L20028.5 2204.6 " fill="none"></path>
+					<path d="M42767.7 1433.6 L42847 1607 L34366.25 2268.8419085374485 L34366.3 2268.8 " fill="none"></path>
+					<path d="M42772.6 1431.4 L42767.7 1433.6 L42762.9 1435.8 L42762.2 1421.5 Z"></path>
+					<path d="M22460.0 2339.6 L22685.75 2985 L16277.5 3165.187497644265 L16277.5 3165.2 " fill="none"></path>
+					<path d="M22465.0 2337.8 L22460.0 2339.6 L22455.0 2341.3 L22455.6 2327.0 Z"></path>
+					<path d="M41923.3 2383.7 L41923.25 2985 L32122.5 3166.301844917797 L32122.5 3166.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23345.6 1438.3 L23340.3 1447.7 L23334.9 1438.3 L23340.3 1429.0 Z"></path>
+						<path d="M41928.6 2374.3 L41923.3 2383.7 L41917.9 2374.3 L41923.3 2365.0 Z"></path>
 					</g>
-					<path d="M18997.3 2418.6 L16574.25 2985 L11973 3164.422534106947 L11973.0 3164.4 " fill="none"></path>
+					<path d="M39125.0 552.1 L41923.25 876 L41923.25 1025 L41923.25 1025 L41923.25 1174 L41923.25 1174 L41923.25 1390.5 L41923.25 1390.5 L41923.25 1607 L41923.25 1607 L41923.25 2227 L41923.3 2227.0 " fill="none"></path>
+					<path d="M39125.6 546.8 L39125.0 552.1 L39124.4 557.4 L39111.8 550.6 Z"></path>
+					<path d="M27212.0 575.4 L26426.25 876 L26426.25 941 L26426.3 941.0 " fill="none"></path>
+					<path d="M27214.0 580.4 L27212.0 575.4 L27210.1 570.5 L27224.5 570.7 Z"></path>
+					<path d="M25447.8 1440.2 L25447.75 1607 L33670.25 2268.023569219999 L33670.3 2268.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19007.6 2421.7 L18997.3 2418.6 L19005.2 2411.3 L19015.5 2414.4 Z"></path>
+						<path d="M25453.1 1430.8 L25447.8 1440.2 L25442.4 1430.8 L25447.8 1421.5 Z"></path>
 					</g>
-					<path d="M18997.3 2420.3 L16614.25 2985 L33474.25 3170.8771022374603 L33474.3 3170.9 " fill="none"></path>
+					<path d="M11113.7 1482.4 L10847.75 1607 L9757.833454281568 2280.5 L9757.8 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19007.6 2423.4 L18997.3 2420.3 L19005.2 2413.0 L19015.5 2416.0 Z"></path>
+						<path d="M11124.5 1483.3 L11113.7 1482.4 L11119.9 1473.6 L11130.7 1474.5 Z"></path>
 					</g>
-					<path d="M19984.2 2980.5 L19987.25 2985 L19987.25 3171.5 L19987.25 3171.5 L19987.25 3358 L19987.25 3358 L19987.25 3514.5 L19987.25 3514.5 L19987.25 3671 L19987.25 3671 L35471.75 3706.388016223002 L35471.8 3706.4 " fill="none"></path>
+					<path d="M11394.4 1488.7 L11496.25 1607 L25141.5 2286.8327638881356 L25141.5 2286.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19983.4 2969.8 L19984.2 2980.5 L19974.5 2975.7 L19973.7 2965.0 Z"></path>
+						<path d="M11392.4 1478.1 L11394.4 1488.7 L11384.3 1485.1 L11382.3 1474.5 Z"></path>
 					</g>
-					<path d="M20023.6 2980.1 L20027.25 2985 L6181.75 3170.5751733802867 L6181.8 3170.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20022.4 2969.4 L20023.6 2980.1 L20013.8 2975.7 L20012.6 2965.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M9221.8 1030.8 L11310 1174 L11310 1306.5 L11310.0 1306.5 " fill="none"></path>
 					</g>
-					<path d="M20040.1 2950.7 L20067.25 2985 L35944.25 3170.8853385228663 L35944.3 3170.9 " fill="none"></path>
+					<path d="M9222.2 1025.5 L9221.8 1030.8 L9221.4 1036.1 L9208.5 1029.9 Z"></path>
+					<path d="M31841.5 3356.7 L31841.5 3358 L31841.5 3514.5 L31841.5 3514.5 L31841.5 3671 L31841.5 3671 L38553.25 3706.2427060607183 L38553.3 3706.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20038.5 2940.0 L20040.1 2950.7 L20030.1 2946.7 L20028.5 2936.0 Z"></path>
+						<path d="M31846.8 3347.3 L31841.5 3356.7 L31836.2 3347.3 L31841.5 3338.0 Z"></path>
 					</g>
-					<path d="M40655.5 1432.7 L40768.25 1607 L20028.5 2279.5745837500735 L20028.5 2279.6 " fill="none"></path>
-					<path d="M40660.0 1429.8 L40655.5 1432.7 L40651.1 1435.6 L40648.3 1421.5 Z"></path>
+					<path d="M25536.7 2452.2 L23765.5 2985 L31560.5 3165.0108345715703 L31560.5 3165.0 " fill="none"></path>
+					<path d="M25538.3 2457.3 L25536.7 2452.2 L25535.2 2447.1 L25549.5 2448.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M9124.0 1413.2 L9425 1607 L19015.5 2261.4374071506386 L19015.5 2261.4 " fill="none"></path>
+						<path d="M29338.0 2340.3 L29338 2985 L31560.5 3150.566706610745 L31560.5 3150.6 " fill="none"></path>
 					</g>
-					<path d="M9126.9 1408.7 L9124.0 1413.2 L9121.1 1417.7 L9112.8 1406.0 Z"></path>
-					<path d="M28342.7 1080.6 L27330 1174 L27330 1390.5 L27330 1390.5 L27330 1607 L27330 1607 L27330 2296 L27330 2296 L27330 2985 L27330 2985 L11973 3169.321556134762 L11973.0 3169.3 " fill="none"></path>
+					<path d="M29343.3 2340.3 L29338.0 2340.3 L29332.7 2340.3 L29338.0 2327.0 Z"></path>
+					<path d="M40981.6 2559.9 L40661.75 2985 L40661.75 3156 L40661.8 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28352.4 1085.0 L28342.7 1080.6 L28351.5 1074.4 L28361.3 1078.9 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M27201.9 556.8 L28945.25 876 L28945.25 896 L28945.3 896.0 " fill="none"></path>
+						<path d="M40991.5 2555.7 L40981.6 2559.9 L40983.0 2549.3 L40992.9 2545.0 Z"></path>
 					</g>
-					<path d="M27202.8 551.6 L27201.9 556.8 L27200.9 562.1 L27188.8 554.4 Z"></path>
-					<path d="M28348.0 1088.4 L27542 1174 L27542 1306.5 L27542.0 1306.5 " fill="none"></path>
-					<path d="M28348.6 1093.7 L28348.0 1088.4 L28347.4 1083.1 L28361.3 1087.0 Z"></path>
-					<path d="M29417.2 1157.6 L29475.5 1174 L29475.5 1321.5 L29475.5 1321.5 " fill="none"></path>
-					<path d="M29418.6 1152.5 L29417.2 1157.6 L29415.7 1162.7 L29404.3 1154.0 Z"></path>
-					<path d="M29542.4 1113.8 L29947.5 1174 L29947.5 1321.5 L29947.5 1321.5 " fill="none"></path>
-					<path d="M29543.2 1108.5 L29542.4 1113.8 L29541.7 1119.1 L29529.3 1111.8 Z"></path>
-					<path d="M29542.5 1083.8 L30459.5 1174 L30459.5 1314 L30459.5 1314.0 " fill="none"></path>
-					<path d="M29543.0 1078.5 L29542.5 1083.8 L29542.0 1089.1 L29529.3 1082.5 Z"></path>
-					<path d="M30907.5 1553.2 L30907.5 1607 L10698.75 2295.012686687008 L10698.8 2295.0 " fill="none"></path>
+					<path d="M40996.7 2560.3 L40701.75 2985 L34499.75 3170.1269206145967 L34499.8 3170.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30912.8 1543.8 L30907.5 1553.2 L30902.2 1543.8 L30907.5 1534.5 Z"></path>
+						<path d="M41006.4 2555.7 L40996.7 2560.3 L40997.6 2549.6 L41007.3 2545.0 Z"></path>
 					</g>
-					<path d="M29542.5 1070.4 L30907.5 1174 L30907.5 1246.5 L30907.5 1246.5 " fill="none"></path>
-					<path d="M29542.9 1065.0 L29542.5 1070.4 L29542.1 1075.7 L29529.3 1069.3 Z"></path>
-					<path d="M31291.5 1493.2 L31291.5 1607 L31291.5 2280.5 L31291.5 2280.5 " fill="none"></path>
+					<path d="M41011.8 2560.7 L40741.75 2985 L35339.75 3158.642364701827 L35339.8 3158.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31296.8 1483.8 L31291.5 1493.2 L31286.2 1483.8 L31291.5 1474.5 Z"></path>
+						<path d="M41021.3 2555.7 L41011.8 2560.7 L41012.3 2550.0 L41021.8 2545.0 Z"></path>
 					</g>
-					<path d="M29542.6 1062.9 L31291.5 1174 L31291.5 1306.5 L31291.5 1306.5 " fill="none"></path>
-					<path d="M29542.9 1057.6 L29542.6 1062.9 L29542.2 1068.3 L29529.3 1062.1 Z"></path>
-					<path d="M25392.8 1440.2 L25392.75 1607 L20028.5 2236.556402503939 L20028.5 2236.6 " fill="none"></path>
+					<path d="M41026.9 2561.2 L40781.75 2985 L32969 3170.1609587953108 L32969.0 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25398.1 1430.8 L25392.8 1440.2 L25387.4 1430.8 L25392.8 1421.5 Z"></path>
+						<path d="M41036.2 2555.7 L41026.9 2561.2 L41026.9 2550.4 L41036.2 2545.0 Z"></path>
 					</g>
-					<path d="M14476.5 1478.2 L14476.5 1607 L19015.5 2226.833713209791 L19015.5 2226.8 " fill="none"></path>
+					<path d="M41244.4 2563.2 L41345.75 2985 L41345.75 3171.5 L41345.75 3171.5 L41345.75 3358 L41345.75 3358 L41345.75 3514.5 L41345.75 3514.5 L41345.75 3671 L41345.75 3671 L38651.25 3705.865955895754 L38651.3 3705.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14481.8 1468.8 L14476.5 1478.2 L14471.2 1468.8 L14476.5 1459.5 Z"></path>
+						<path d="M41247.4 2552.8 L41244.4 2563.2 L41237.1 2555.3 L41240.1 2545.0 Z"></path>
 					</g>
-					<path d="M12229.3 1034.5 L13534.25 1174 L14300.5 1350.0606261607854 L14300.5 1350.1 " fill="none"></path>
-					<path d="M12229.8 1029.2 L12229.3 1034.5 L12228.7 1039.8 L12216.0 1033.1 Z"></path>
-					<path d="M14868.5 1455.7 L14868.5 1607 L19015.5 2221.00730632857 L19015.5 2221.0 " fill="none"></path>
+					<path d="M41259.9 2562.9 L41385.75 2985 L41385.75 3171.5 L41385.75 3171.5 L41385.75 3358 L41385.75 3358 L39990.75 3500.180071637903 L39990.8 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14873.8 1446.3 L14868.5 1455.7 L14863.2 1446.3 L14868.5 1437.0 Z"></path>
+						<path d="M41262.3 2552.4 L41259.9 2562.9 L41252.1 2555.5 L41254.5 2545.0 Z"></path>
 					</g>
-					<path d="M12229.3 1032.4 L13926.25 1174 L14692.5 1350.0606261607854 L14692.5 1350.1 " fill="none"></path>
-					<path d="M12229.7 1027.1 L12229.3 1032.4 L12228.8 1037.8 L12216.0 1031.3 Z"></path>
-					<path d="M11991.7 3166.9 L15424.5 3088 L16287.375 3088 L16287.375 3088 L17150.25 3171.5 L17150.25 3171.5 L16287.375 3255 L16287.375 3255 L15424.5 3255 L15424.5 3255 L11973 3175.6715524360034 L11973.0 3175.7 " fill="none"></path>
+					<path d="M41275.2 2562.6 L41425.75 2985 L39449.75 3166.673157505546 L39449.8 3166.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11982.2 3161.8 L11991.7 3166.9 L11982.5 3172.4 L11973.0 3167.3 Z"></path>
+						<path d="M41277.1 2552.0 L41275.2 2562.6 L41267.1 2555.6 L41269.0 2545.0 Z"></path>
 					</g>
+					<path d="M44207.7 609.5 L45916.25 876 L45916.25 1025 L45916.25 1025 L45916.25 1174 L45916.25 1174 L45916.25 1390.5 L45916.25 1390.5 L45916.25 1607 L45916.25 1607 L41631.25 2230.3878800675675 L41631.3 2230.4 " fill="none"></path>
+					<path d="M44208.5 604.3 L44207.7 609.5 L44206.9 614.8 L44194.5 607.5 Z"></path>
+					<path d="M39524.1 1532.8 L39517.25 1607 L40729.25 2109.1455201443173 L40729.3 2109.1 " fill="none"></path>
+					<path d="M39529.4 1533.3 L39524.1 1532.8 L39518.8 1532.3 L39525.3 1519.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M4876.3 2322.7 L5297.75 2985 L11610 3166.287333974976 L11610.0 3166.3 " fill="none"></path>
+						<path d="M43952.2 1071.9 L44077.75 1174 L44077.75 1390.5 L44077.75 1390.5 L44077.75 1607 L44077.75 1607 L41631.25 2188.756169111303 L41631.3 2188.8 " fill="none"></path>
 					</g>
-					<path d="M4880.8 2319.9 L4876.3 2322.7 L4871.8 2325.6 L4869.1 2311.5 Z"></path>
-					<path d="M16128.5 1455.7 L16128.5 1607 L19015.5 2193.1626639163105 L19015.5 2193.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16133.8 1446.3 L16128.5 1455.7 L16123.2 1446.3 L16128.5 1437.0 Z"></path>
-					</g>
-					<path d="M12229.3 1029.4 L15186.25 1174 L15952.5 1350.0606261607854 L15952.5 1350.1 " fill="none"></path>
-					<path d="M12229.6 1024.0 L12229.3 1029.4 L12229.1 1034.7 L12216.0 1028.7 Z"></path>
-					<path d="M16520.5 1455.7 L16520.5 1607 L19015.5 2179.7319673496586 L19015.5 2179.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16525.8 1446.3 L16520.5 1455.7 L16515.2 1446.3 L16520.5 1437.0 Z"></path>
+					<path d="M43955.6 1067.8 L43952.2 1071.9 L43948.8 1076.0 L43941.8 1063.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M14212.1 1417.7 L14317 1607 L40729.25 2284.432561212809 L40729.3 2284.4 " fill="none"></path>
 					</g>
-					<path d="M12229.3 1028.9 L15578.25 1174 L16344.5 1350.0606261607854 L16344.5 1350.1 " fill="none"></path>
-					<path d="M12229.6 1023.5 L12229.3 1028.9 L12229.1 1034.2 L12216.0 1028.3 Z"></path>
-					<path d="M17396.5 1455.7 L17396.5 1607 L19015.5 2131.8134556574923 L19015.5 2131.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17401.8 1446.3 L17396.5 1455.7 L17391.2 1446.3 L17396.5 1437.0 Z"></path>
+					<path d="M14216.7 1415.1 L14212.1 1417.7 L14207.4 1420.2 L14205.6 1406.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M29510.4 1042.5 L30332.5 1174 L30332.5 1390.5 L30332.5 1390.5 L30332.5 1607 L30332.5 1607 L40729.25 2267.354520522689 L40729.3 2267.4 " fill="none"></path>
 					</g>
-					<path d="M12229.3 1028.1 L16454.25 1174 L17220.5 1350.0606261607854 L17220.5 1350.1 " fill="none"></path>
-					<path d="M12229.5 1022.8 L12229.3 1028.1 L12229.1 1033.4 L12216.0 1027.6 Z"></path>
-					<path d="M37235.5 1537.9 L37248.25 1607 L37248.25 2296 L37248.25 2296 L37248.25 2985 L37248.25 2985 L37248.25 3171.5 L37248.25 3171.5 L37248.25 3358 L37248.25 3358 L37248.25 3514.5 L37248.25 3514.5 L37248.25 3671 L37248.25 3671 L35569.75 3705.493053545586 L35569.8 3705.5 " fill="none"></path>
+					<path d="M29511.3 1037.3 L29510.4 1042.5 L29509.6 1047.8 L29497.3 1040.4 Z"></path>
+					<path d="M34939.8 3296.7 L34939.75 3358 L39709.75 3510.0221973322473 L39709.8 3510.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37239.0 1527.7 L37235.5 1537.9 L37228.5 1529.6 L37232.1 1519.5 Z"></path>
+						<path d="M34945.1 3287.3 L34939.8 3296.7 L34934.4 3287.3 L34939.8 3278.0 Z"></path>
 					</g>
-					<path d="M37542.6 1450.2 L38420.25 1607 L38420.25 2296 L38420.25 2296 L38420.25 2985 L38420.25 2985 L38420.25 3171.5 L38420.25 3171.5 L38420.25 3358 L38420.25 3358 L37089.25 3499.5572545022087 L37089.3 3499.6 " fill="none"></path>
+					<path d="M35358.4 3159.5 L41465.75 2985 L41283.42779390421 2545 L41283.4 2545.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37534.4 1443.3 L37542.6 1450.2 L37532.5 1453.8 L37524.3 1446.9 Z"></path>
+						<path d="M35348.9 3154.5 L35358.4 3159.5 L35349.2 3165.1 L35339.8 3160.1 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M41382.5 1040.7 L42417.5 1174 L37524.25 1377.3668234390748 L37524.3 1377.4 " fill="none"></path>
+						<path d="M43963.3 1070.9 L44117.75 1174 L44117.75 1390.5 L44117.75 1390.5 L44117.75 1607 L44117.75 1607 L44117.75 2296 L44117.75 2296 L44117.75 2985 L44117.75 2985 L35339.75 3163.3718675092614 L35339.8 3163.4 " fill="none"></path>
 					</g>
-					<path d="M41383.2 1035.4 L41382.5 1040.7 L41381.8 1046.0 L41369.3 1039.0 Z"></path>
+					<path d="M43966.2 1066.5 L43963.3 1070.9 L43960.3 1075.3 L43952.2 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M25482.5 1035.8 L26886 1174 L36892.25 1383.872181452687 L36892.3 1383.9 " fill="none"></path>
+						<path d="M14216.4 1416.7 L14357 1607 L14357 2296 L14357 2296 L14357 2985 L14357 2985 L34539.75 3167.875605786399 L34539.8 3167.9 " fill="none"></path>
 					</g>
-					<path d="M25483.0 1030.5 L25482.5 1035.8 L25482.0 1041.1 L25469.3 1034.5 Z"></path>
+					<path d="M14220.7 1413.6 L14216.4 1416.7 L14212.1 1419.9 L14208.5 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M27202.0 546.7 L31535.5 876 L31535.5 1025 L31535.5 1025 L31535.5 1174 L31535.5 1174 L31535.5 1390.5 L31535.5 1390.5 L31535.5 1607 L31535.5 1607 L27290 2267.379162433683 L27290.0 2267.4 " fill="none"></path>
+						<path d="M29510.4 1041.8 L30372.5 1174 L30372.5 1390.5 L30372.5 1390.5 L30372.5 1607 L30372.5 1607 L30372.5 2296 L30372.5 2296 L30372.5 2985 L30372.5 2985 L34539.75 3155.166319995621 L34539.8 3155.2 " fill="none"></path>
 					</g>
-					<path d="M27202.4 541.4 L27202.0 546.7 L27201.6 552.0 L27188.8 545.7 Z"></path>
-					<path d="M39624.8 1097.7 L39624.75 1174 L39624.75 1239 L39624.8 1239.0 " fill="none"></path>
+					<path d="M29511.2 1036.5 L29510.4 1041.8 L29509.6 1047.1 L29497.3 1039.8 Z"></path>
+					<path d="M44955.1 1548.6 L44820.25 1607 L44820.25 2296 L44820.25 2296 L44820.25 2985 L44820.25 2985 L40692.25 3170.132138992425 L40692.3 3170.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39630.1 1088.3 L39624.8 1097.7 L39619.4 1088.3 L39624.8 1079.0 Z"></path>
+						<path d="M44965.8 1549.8 L44955.1 1548.6 L44961.6 1540.0 L44972.3 1541.2 Z"></path>
 					</g>
-					<path d="M38303.9 558.1 L39624.75 876 L39624.75 971 L39624.8 971.0 " fill="none"></path>
-					<path d="M38305.1 552.9 L38303.9 558.1 L38302.6 563.3 L38290.9 555.0 Z"></path>
-					<path d="M32084.2 1072.9 L32436.5 1174 L32436.5 1375 L32436.5 1375.0 " fill="none"></path>
+					<path d="M44955.4 1562.2 L44860.25 1607 L44860.25 2296 L44860.25 2296 L44860.25 2985 L44860.25 2985 L33389 3170.2805443090047 L33389.0 3170.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32076.7 1065.2 L32084.2 1072.9 L32073.8 1075.5 L32066.3 1067.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M27202.1 546.1 L31917.25 876 L31917.25 941 L31917.3 941.0 " fill="none"></path>
+						<path d="M44966.1 1563.1 L44955.4 1562.2 L44961.5 1553.4 L44972.3 1554.3 Z"></path>
 					</g>
-					<path d="M27202.4 540.8 L27202.1 546.1 L27201.7 551.5 L27188.8 545.2 Z"></path>
-					<path d="M39787.1 1555.3 L39838 1607 L39838 2296 L39838 2296 L39838 2985 L39838 2985 L33587.25 3169.82934321614 L33587.3 3169.8 " fill="none"></path>
+					<path d="M44955.7 1578.4 L44900.25 1607 L44900.25 2296 L44900.25 2296 L44900.25 2985 L44900.25 2985 L31289.5 3170.532177901219 L31289.5 3170.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39784.3 1544.9 L39787.1 1555.3 L39776.7 1552.4 L39774.0 1542.0 Z"></path>
+						<path d="M44966.4 1578.9 L44955.7 1578.4 L44961.5 1569.4 L44972.3 1569.9 Z"></path>
 					</g>
-					<path d="M39816.2 1554.1 L39878 1607 L39878 2296 L39878 2296 L39878 2985 L39878 2985 L21564.25 3170.638392553842 L21564.3 3170.6 " fill="none"></path>
+					<path d="M44985.5 1581.2 L44940.25 1607 L44940.25 2296 L44940.25 2296 L44940.25 2985 L44940.25 2985 L34499.75 3170.681900538788 L34499.8 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39812.5 1544.0 L39816.2 1554.1 L39805.6 1552.1 L39802.0 1542.0 Z"></path>
+						<path d="M44996.2 1581.3 L44985.5 1581.2 L44990.9 1572.0 L45001.7 1572.0 Z"></path>
 					</g>
-					<path d="M43357.6 1583.6 L43328 1607 L43328 2296 L43328 2296 L43328 2985 L43328 2985 L36889 3170.6207589458227 L36889.0 3170.6 " fill="none"></path>
+					<path d="M45327.6 1590.7 L45328.25 1607 L45328.25 2054.5 L45328.3 2054.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43368.3 1582.0 L43357.6 1583.6 L43361.7 1573.6 L43372.3 1572.0 Z"></path>
+						<path d="M45332.6 1581.1 L45327.6 1590.7 L45322.0 1581.5 L45327.0 1572.0 Z"></path>
 					</g>
-					<path d="M43392.1 1584.7 L43368 1607 L43368 2296 L43368 2296 L43368 2985 L43368 2985 L34618.25 3169.9044927905725 L34618.3 3169.9 " fill="none"></path>
+					<path d="M45449.5 1587.6 L45462.25 1607 L41631.25 2223.431340495096 L41631.3 2223.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43402.6 1582.3 L43392.1 1584.7 L43395.4 1574.4 L43405.8 1572.0 Z"></path>
+						<path d="M45448.9 1576.9 L45449.5 1587.6 L45440.0 1582.7 L45439.3 1572.0 Z"></path>
 					</g>
-					<path d="M43426.9 1585.9 L43408 1607 L43408 2296 L43408 2296 L43408 2985 L43408 2985 L32275 3170.318145305248 L32275.0 3170.3 " fill="none"></path>
+					<path d="M45484.8 1586.3 L45502.25 1607 L40689.25 2225.8014554954284 L40689.3 2225.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43437.1 1582.5 L43426.9 1585.9 L43429.2 1575.4 L43439.4 1572.0 Z"></path>
+						<path d="M45482.9 1575.7 L45484.8 1586.3 L45474.8 1582.6 L45472.8 1572.0 Z"></path>
 					</g>
-					<path d="M43462.1 1587.2 L43448 1607 L43448 2296 L43448 2296 L43448 2985 L43448 2985 L34981.25 3170.492217556019 L34981.3 3170.5 " fill="none"></path>
+					<path d="M45519.7 1585.0 L45542.25 1607 L43917.75 2151.7945972256025 L43917.8 2151.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43471.8 1582.7 L43462.1 1587.2 L43463.1 1576.5 L43472.9 1572.0 Z"></path>
+						<path d="M45516.8 1574.7 L45519.7 1585.0 L45509.3 1582.3 L45506.4 1572.0 Z"></path>
 					</g>
-					<path d="M43811.9 1584.7 L43836 1607 L43836 2054.5 L43836.0 2054.5 " fill="none"></path>
+					<path d="M45554.3 1583.9 L45582.25 1607 L38468.25 2257.6333045729075 L38468.3 2257.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43808.6 1574.4 L43811.9 1584.7 L43801.4 1582.3 L43798.2 1572.0 Z"></path>
+						<path d="M45550.5 1573.8 L45554.3 1583.9 L45543.7 1582.1 L45539.9 1572.0 Z"></path>
 					</g>
-					<path d="M43926.6 1581.5 L43970 1607 L34935.25 2263.241493819677 L34935.3 2263.2 " fill="none"></path>
+					<path d="M45668.6 1581.0 L45716.25 1607 L45716.25 2296 L45716.25 2296 L45716.25 2985 L45716.25 2985 L39449.75 3169.950506409242 L39449.8 3170.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43921.3 1572.1 L43926.6 1581.5 L43915.8 1581.3 L43910.5 1572.0 Z"></path>
+						<path d="M45663.0 1571.8 L45668.6 1581.0 L45657.9 1581.2 L45652.2 1572.0 Z"></path>
 					</g>
-					<path d="M43960.5 1580.7 L44010 1607 L38380.25 2235.0852932842163 L38380.3 2235.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43954.8 1571.7 L43960.5 1580.7 L43949.8 1581.1 L43944.0 1572.0 Z"></path>
+					<path d="M44207.7 608.3 L45956.25 876 L45956.25 1025 L45956.25 1025 L45956.25 1174 L45956.25 1174 L45668.25 1272.0377358490566 L45668.3 1272.0 " fill="none"></path>
+					<path d="M44208.5 603.0 L44207.7 608.3 L44206.9 613.5 L44194.5 606.3 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M43974.1 1070.1 L44157.75 1174 L44972.25 1325.689677419355 L44972.3 1325.7 " fill="none"></path>
 					</g>
-					<path d="M43966.8 1566.8 L44050 1607 L42024 2175.3688925081433 L42024.0 2175.4 " fill="none"></path>
+					<path d="M43976.8 1065.4 L43974.1 1070.1 L43971.5 1074.7 L43962.5 1063.5 Z"></path>
+					<path d="M39550.9 1538.1 L39557.25 1607 L39557.25 2296 L39557.25 2296 L39557.25 2985 L39557.25 2985 L39557.25 3171.5 L39557.25 3171.5 L39557.25 3358 L39557.25 3358 L39557.25 3514.5 L39557.25 3514.5 L39557.25 3671 L39557.25 3671 L38651.25 3704.6785340314136 L38651.3 3704.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43960.7 1557.9 L43966.8 1566.8 L43956.1 1567.5 L43950.0 1558.7 Z"></path>
+						<path d="M39555.3 1528.3 L39550.9 1538.1 L39544.7 1529.3 L39549.2 1519.5 Z"></path>
 					</g>
-					<path d="M43967.1 1552.5 L44090 1607 L37088.25 2257.0529897254505 L37088.3 2257.1 " fill="none"></path>
+					<path d="M39871.8 1424.4 L41671.25 1607 L41671.25 2296 L41671.25 2296 L41671.25 2985 L41671.25 2985 L41671.25 3171.5 L41671.25 3171.5 L41671.25 3358 L41671.25 3358 L39990.75 3502.4251784733665 L39990.8 3502.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43960.7 1543.8 L43967.1 1552.5 L43956.4 1553.5 L43950.0 1544.9 Z"></path>
+						<path d="M39863.1 1418.2 L39871.8 1424.4 L39862.0 1428.8 L39853.3 1422.6 Z"></path>
 					</g>
-					<path d="M43967.6 1517.8 L44224 1607 L44224 2296 L44224 2296 L44224 2985 L44224 2985 L36049.25 3170.3099000273482 L36049.3 3170.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43960.6 1509.7 L43967.6 1517.8 L43957.1 1519.7 L43950.0 1511.6 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M43984.8 1069.4 L44197.75 1174 L39853.25 1375.8204591781998 L39853.3 1375.8 " fill="none"></path>
 					</g>
-					<path d="M42457.0 603.1 L44384 876 L44384 1025 L44384 1025 L44384 1174 L44384 1174 L43950 1294.1547314578006 L43950.0 1294.2 " fill="none"></path>
-					<path d="M42457.7 597.8 L42457.0 603.1 L42456.2 608.4 L42443.8 601.2 Z"></path>
+					<path d="M43987.2 1064.6 L43984.8 1069.4 L43982.5 1074.2 L43972.9 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M41382.5 1040.2 L42457.5 1174 L43254 1324.670380078637 L43254.0 1324.7 " fill="none"></path>
+						<path d="M29510.5 1038.8 L30588.5 1174 L39221.25 1382.854909903618 L39221.3 1382.9 " fill="none"></path>
 					</g>
-					<path d="M41383.1 1034.9 L41382.5 1040.2 L41381.8 1045.4 L41369.3 1038.5 Z"></path>
-					<path d="M11336.8 1410.0 L12295 1607 L12295 2265 L12295.0 2265.0 " fill="none"></path>
-					<path d="M11337.9 1404.8 L11336.8 1410.0 L11335.7 1415.3 L11323.8 1407.4 Z"></path>
-					<path d="M11336.9 1406.5 L12531 1607 L12531 2257.5 L12531.0 2257.5 " fill="none"></path>
-					<path d="M11337.8 1401.2 L11336.9 1406.5 L11336.0 1411.7 L11323.8 1404.3 Z"></path>
-					<path d="M1000.1 1487.1 L1290.75 1607 L1290.75 2265 L1290.8 2265.0 " fill="none"></path>
-					<path d="M1002.1 1482.2 L1000.1 1487.1 L998.1 1492.0 L987.8 1482.0 Z"></path>
-					<path d="M11336.9 1404.2 L12749 1607 L12749 2265 L12749.0 2265.0 " fill="none"></path>
-					<path d="M11337.7 1398.9 L11336.9 1404.2 L11336.2 1409.5 L11323.8 1402.3 Z"></path>
-					<path d="M26665.0 2413.0 L26582 2985 L36828 3170.946479832628 L36828.0 3170.9 " fill="none"></path>
+					<path d="M29511.1 1033.5 L29510.5 1038.8 L29509.8 1044.1 L29497.3 1037.1 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M27212.4 583.8 L26595.25 876 L26595.25 1025 L26595.25 1025 L26595.25 1174 L26595.25 1174 L26595.25 1390.5 L26595.25 1390.5 L26595.25 1607 L26595.25 1607 L25452.659288824383 2227 L25452.7 2227.0 " fill="none"></path>
+					</g>
+					<path d="M27214.7 588.6 L27212.4 583.8 L27210.2 579.0 L27224.5 578.1 Z"></path>
+					<path d="M31588.7 1089.7 L30804.5 1174 L30804.5 1390.5 L30804.5 1390.5 L30804.5 1607 L30804.5 1607 L30804.5 2296 L30804.5 2296 L30804.5 2985 L30804.5 2985 L14692.5 3169.422499769847 L14692.5 3169.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26671.6 2404.5 L26665.0 2413.0 L26661.1 2403.0 L26667.7 2394.5 Z"></path>
+						<path d="M31598.5 1094.0 L31588.7 1089.7 L31597.4 1083.4 L31607.3 1087.7 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M27400.8 546.0 L32191.25 876 L32191.25 896 L32191.3 896.0 " fill="none"></path>
 					</g>
-					<path d="M26712.2 2412.6 L26860.5 2985 L26860.5 3156 L26860.5 3156.0 " fill="none"></path>
+					<path d="M27401.2 540.7 L27400.8 546.0 L27400.4 551.4 L27387.5 545.1 Z"></path>
+					<path d="M32487.1 1159.5 L32519 1174 L32519 1306.5 L32519.0 1306.5 " fill="none"></path>
+					<path d="M32489.4 1154.7 L32487.1 1159.5 L32484.9 1164.4 L32475.0 1154.0 Z"></path>
+					<path d="M32788.3 1145.9 L32927 1174 L32927 1321.5 L32927.0 1321.5 " fill="none"></path>
+					<path d="M32789.4 1140.7 L32788.3 1145.9 L32787.3 1151.1 L32775.3 1143.3 Z"></path>
+					<path d="M32788.5 1098.7 L33399 1174 L33399 1321.5 L33399.0 1321.5 " fill="none"></path>
+					<path d="M32789.1 1093.4 L32788.5 1098.7 L32787.8 1104.0 L32775.3 1097.0 Z"></path>
+					<path d="M32788.5 1076.7 L33911 1174 L33911 1314 L33911.0 1314.0 " fill="none"></path>
+					<path d="M32789.0 1071.4 L32788.5 1076.7 L32788.1 1082.1 L32775.3 1075.6 Z"></path>
+					<path d="M34359.0 1553.2 L34359 1607 L20836.75 2294.525523475694 L20836.8 2294.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26715.0 2402.2 L26712.2 2412.6 L26704.7 2404.9 L26707.5 2394.5 Z"></path>
+						<path d="M34364.3 1543.8 L34359.0 1553.2 L34353.7 1543.8 L34359.0 1534.5 Z"></path>
 					</g>
-					<path d="M26753.3 2410.3 L27111.5 2985 L27111.5 3156 L27111.5 3156.0 " fill="none"></path>
+					<path d="M32788.6 1066.1 L34359 1174 L34359 1246.5 L34359.0 1246.5 " fill="none"></path>
+					<path d="M32788.9 1060.7 L32788.6 1066.1 L32788.2 1071.4 L32775.3 1065.1 Z"></path>
+					<path d="M34743.0 1493.2 L34743 1607 L34743 2280.5 L34743.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26752.9 2399.6 L26753.3 2410.3 L26743.8 2405.2 L26743.4 2394.5 Z"></path>
+						<path d="M34748.3 1483.8 L34743.0 1493.2 L34737.7 1483.8 L34743.0 1474.5 Z"></path>
 					</g>
-					<path d="M28647.0 2502.9 L28508.5 2985 L34467.25 3169.166528566102 L34467.3 3169.2 " fill="none"></path>
+					<path d="M32788.6 1059.9 L34743 1174 L34743 1306.5 L34743.0 1306.5 " fill="none"></path>
+					<path d="M32788.9 1054.6 L32788.6 1059.9 L32788.2 1065.2 L32775.3 1059.1 Z"></path>
+					<path d="M15378.0 1455.7 L15378 1607 L25549.5 2263.3179902603483 L25549.5 2263.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28654.7 2495.4 L28647.0 2502.9 L28644.5 2492.5 L28652.2 2485.0 Z"></path>
+						<path d="M15383.3 1446.3 L15378.0 1455.7 L15372.7 1446.3 L15378.0 1437.0 Z"></path>
 					</g>
-					<path d="M28925.8 2497.6 L29455.75 2985 L32133 3166.6818429909945 L32133.0 3166.7 " fill="none"></path>
+					<path d="M17400.9 1031.3 L15378 1174 L15378 1344 L15378.0 1344.0 " fill="none"></path>
+					<path d="M17401.3 1036.6 L17400.9 1031.3 L17400.6 1026.0 L17414.3 1030.4 Z"></path>
+					<path d="M15770.0 1478.2 L15770 1607 L25549.5 2262.0724771534124 L25549.5 2262.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28922.5 2487.4 L28925.8 2497.6 L28915.3 2495.2 L28912.0 2485.0 Z"></path>
+						<path d="M15775.3 1468.8 L15770.0 1478.2 L15764.7 1468.8 L15770.0 1459.5 Z"></path>
 					</g>
-					<path d="M28937.1 2497.3 L29495.75 2985 L29495.75 3156 L29495.8 3156.0 " fill="none"></path>
+					<path d="M17401.0 1032.7 L15770 1174 L15770 1321.5 L15770.0 1321.5 " fill="none"></path>
+					<path d="M17401.4 1038.0 L17401.0 1032.7 L17400.5 1027.4 L17414.3 1031.6 Z"></path>
+					<path d="M14709.9 3093.0 L14722.5 3088 L14730 3088 L14730 3088 L14737.5 3171.5 L14737.5 3171.5 L14730 3255 L14730 3255 L14722.5 3255 L14722.5 3255 L14692.5 3243.1560283687945 L14692.5 3243.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28933.5 2487.1 L28937.1 2497.3 L28926.5 2495.2 L28923.0 2485.0 Z"></path>
+						<path d="M14699.2 3091.5 L14709.9 3093.0 L14703.1 3101.4 L14692.5 3099.8 Z"></path>
 					</g>
-					<path d="M28987.0 2495.8 L29673.75 2985 L34889.25 3169.8694763850613 L34889.3 3169.9 " fill="none"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3046.3 2318.7 L4083.25 2985 L14329.5 3168.253877873942 L14329.5 3168.3 " fill="none"></path>
+					</g>
+					<path d="M3049.2 2314.2 L3046.3 2318.7 L3043.5 2323.2 L3035.1 2311.5 Z"></path>
+					<path d="M17756.8 1455.7 L17756.75 1607 L25549.5 2253.9505979455976 L25549.5 2254.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28982.5 2486.1 L28987.0 2495.8 L28976.3 2494.8 L28971.8 2485.0 Z"></path>
+						<path d="M17762.1 1446.3 L17756.8 1455.7 L17751.4 1446.3 L17756.8 1437.0 Z"></path>
 					</g>
-					<path d="M28998.2 2495.5 L29713.75 2985 L21564.25 3169.5748679336934 L21564.3 3169.6 " fill="none"></path>
+					<path d="M17529.6 1047.0 L17756.75 1174 L17756.75 1344 L17756.8 1344.0 " fill="none"></path>
+					<path d="M17532.2 1042.4 L17529.6 1047.0 L17527.0 1051.7 L17518.0 1040.5 Z"></path>
+					<path d="M30116.5 1440.2 L30116.5 1607 L26562.5 2210.0552887575423 L26562.5 2210.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28993.5 2485.9 L28998.2 2495.5 L28987.5 2494.7 L28982.8 2485.0 Z"></path>
+						<path d="M30121.8 1430.8 L30116.5 1440.2 L30111.2 1430.8 L30116.5 1421.5 Z"></path>
 					</g>
-					<path d="M29009.4 2495.3 L29753.75 2985 L32638.5 3166.804806961223 L32638.5 3166.8 " fill="none"></path>
+					<path d="M23303.3 1455.7 L23303.25 1607 L25549.5 2169.2255017709563 L25549.5 2169.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29004.5 2485.7 L29009.4 2495.3 L28998.6 2494.6 L28993.8 2485.0 Z"></path>
+						<path d="M23308.6 1446.3 L23303.3 1455.7 L23297.9 1446.3 L23303.3 1437.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M27819.1 1415.0 L27608 1607 L28405.169811320753 2107 L28405.2 2107.0 " fill="none"></path>
+					<path d="M17579.6 1029.4 L20491 1174 L23127.25 1376.9507067294871 L23127.3 1377.0 " fill="none"></path>
+					<path d="M17579.8 1024.1 L17579.6 1029.4 L17579.3 1034.8 L17566.3 1028.8 Z"></path>
+					<path d="M23695.3 1455.7 L23695.25 1607 L25549.5 2148.174732606163 L25549.5 2148.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M23700.6 1446.3 L23695.3 1455.7 L23689.9 1446.3 L23695.3 1437.0 Z"></path>
 					</g>
-					<path d="M27822.7 1418.9 L27819.1 1415.0 L27815.5 1411.0 L27829.0 1406.0 Z"></path>
-					<path d="M28096.2 1549.3 L28052 1607 L28052 2280.5 L28052.0 2280.5 " fill="none"></path>
+					<path d="M17579.6 1029.1 L20707 1174 L23519.25 1377.7487241696645 L23519.3 1377.7 " fill="none"></path>
+					<path d="M17579.8 1023.8 L17579.6 1029.1 L17579.3 1034.5 L17566.3 1028.5 Z"></path>
+					<path d="M25532.9 2566.8 L24725 2985 L14692.5 3168.1859457607206 L14692.5 3168.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28106.1 1545.2 L28096.2 1549.3 L28097.7 1538.7 L28107.6 1534.5 Z"></path>
+						<path d="M25543.7 2567.2 L25532.9 2566.8 L25538.8 2557.7 L25549.5 2558.2 Z"></path>
 					</g>
-					<path d="M28322.1 1550.1 L28359.25 1607 L29682.789912917273 2280.5 L29682.8 2280.5 " fill="none"></path>
+					<path d="M25533.0 2575.1 L24765 2985 L32856 3170.2066891684567 L32856.0 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28321.5 1539.4 L28322.1 1550.1 L28312.6 1545.2 L28311.9 1534.5 Z"></path>
+						<path d="M25543.8 2575.4 L25533.0 2575.1 L25538.8 2566.0 L25549.5 2566.3 Z"></path>
 					</g>
-					<path d="M28437.6 1545.3 L28525.25 1607 L9008.75 2294.7490026595747 L9008.8 2294.7 " fill="none"></path>
+					<path d="M26579.8 2506.9 L27767.25 2985 L27767.25 3171.5 L27767.25 3171.5 L27767.25 3358 L27767.25 3358 L27767.25 3514.5 L27767.25 3514.5 L27767.25 3671 L27767.25 3671 L38553.25 3706.3394554683896 L38553.3 3706.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28433.1 1535.5 L28437.6 1545.3 L28426.9 1544.2 L28422.4 1534.5 Z"></path>
+						<path d="M26573.1 2498.5 L26579.8 2506.9 L26569.2 2508.4 L26562.5 2499.9 Z"></path>
 					</g>
-					<path d="M28475.1 1504.4 L28706.5 1607 L28706.5 2107 L28706.5 2107.0 " fill="none"></path>
+					<path d="M26579.9 2500.6 L27820.25 2985 L10492.25 3170.7603035006036 L10492.3 3170.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28468.7 1495.8 L28475.1 1504.4 L28464.4 1505.5 L28458.0 1496.9 Z"></path>
+						<path d="M26573.1 2492.2 L26579.9 2500.6 L26569.3 2502.2 L26562.5 2493.8 Z"></path>
 					</g>
-					<path d="M3355.9 3072.2 L3369.25 3065.5 L3376.75 3065.5 L3376.75 3065.5 L3384.25 3171.5 L3384.25 3171.5 L3376.75 3277.5 L3376.75 3277.5 L3369.25 3277.5 L3369.25 3277.5 L3339.25 3262.393111638955 L3339.3 3262.4 " fill="none"></path>
+					<path d="M26579.9 2496.1 L27860.25 2985 L39344.75 3170.651317500217 L39344.8 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3345.2 3071.6 L3355.9 3072.2 L3350.0 3081.2 L3339.3 3080.6 Z"></path>
+						<path d="M26573.1 2487.8 L26579.9 2496.1 L26569.3 2497.7 L26562.5 2489.4 Z"></path>
 					</g>
+					<path d="M42775.1 1432.7 L42887 1607 L26562.5 2275.265729903155 L26562.5 2275.3 " fill="none"></path>
+					<path d="M42779.6 1429.8 L42775.1 1432.7 L42770.6 1435.6 L42767.9 1421.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M4881.7 2321.5 L5464.75 2985 L3339.25 3156.9018863833476 L3339.3 3156.9 " fill="none"></path>
+						<path d="M14220.4 1415.8 L14397 1607 L25549.5 2266.0678874689083 L25549.5 2266.1 " fill="none"></path>
 					</g>
-					<path d="M4885.7 2318.0 L4881.7 2321.5 L4877.7 2325.0 L4872.9 2311.5 Z"></path>
-					<path d="M28270.5 2345.7 L28270.5 2985 L21354.25 3167.5927203878687 L21354.3 3167.6 " fill="none"></path>
+					<path d="M14224.3 1412.2 L14220.4 1415.8 L14216.4 1419.4 L14211.3 1406.0 Z"></path>
+					<path d="M30588.5 1447.7 L30588.5 1607 L26562.5 2219.0052950910094 L26562.5 2219.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28275.8 2336.3 L28270.5 2345.7 L28265.2 2336.3 L28270.5 2327.0 Z"></path>
+						<path d="M30593.8 1438.3 L30588.5 1447.7 L30583.2 1438.3 L30588.5 1429.0 Z"></path>
 					</g>
-					<path d="M28791.0 1463.2 L28791 1607 L9008.75 2294.765778153423 L9008.8 2294.8 " fill="none"></path>
+					<path d="M35461.7 1072.9 L35814 1174 L35814 1375 L35814.0 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28796.3 1453.8 L28791.0 1463.2 L28785.7 1453.8 L28791.0 1444.5 Z"></path>
+						<path d="M35454.2 1065.2 L35461.7 1072.9 L35451.3 1075.5 L35443.8 1067.8 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M4882.9 2321.2 L5504.75 2985 L21058.25 3169.742078782282 L21058.3 3169.7 " fill="none"></path>
+						<path d="M27400.8 543.5 L35294.75 876 L35294.75 941 L35294.8 941.0 " fill="none"></path>
 					</g>
-					<path d="M4886.8 2317.6 L4882.9 2321.2 L4879.0 2324.9 L4873.8 2311.5 Z"></path>
-					<path d="M29121.0 1470.2 L29121 1607 L16417.25 2292.117018570338 L16417.3 2292.1 " fill="none"></path>
+					<path d="M27401.0 538.2 L27400.8 543.5 L27400.6 548.8 L27387.5 542.9 Z"></path>
+					<path d="M42210.8 1097.7 L42210.75 1174 L42210.75 1239 L42210.8 1239.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29126.3 1460.8 L29121.0 1470.2 L29115.7 1460.8 L29121.0 1451.5 Z"></path>
+						<path d="M42216.1 1088.3 L42210.8 1097.7 L42205.4 1088.3 L42210.8 1079.0 Z"></path>
 					</g>
-					<path d="M12229.3 1027.9 L16767.25 1174 L17612.5 1368.2123905545238 L17612.5 1368.2 " fill="none"></path>
-					<path d="M12229.5 1022.5 L12229.3 1027.9 L12229.2 1033.2 L12216.0 1027.4 Z"></path>
-					<path d="M43811.5 130.3 L43245.5 203 L43245.5 524 L43245.5 524.0 " fill="none"></path>
+					<path d="M39125.0 551.0 L42210.75 876 L42210.75 971 L42210.8 971.0 " fill="none"></path>
+					<path d="M39125.6 545.7 L39125.0 551.0 L39124.5 556.3 L39111.8 549.6 Z"></path>
+					<path d="M42226.5 1560.6 L42230.75 1607 L42230.75 2296 L42230.75 2296 L42230.75 2985 L42230.75 2985 L32969 3170.369181445014 L32969.0 3170.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43821.4 134.4 L43811.5 130.3 L43820.1 123.8 L43830.0 127.9 Z"></path>
+						<path d="M42230.9 1550.8 L42226.5 1560.6 L42220.3 1551.8 L42224.7 1542.0 Z"></path>
 					</g>
-					<path d="M43811.8 157.8 L43606.5 203 L43606.5 524 L43606.5 524.0 " fill="none"></path>
+					<path d="M42257.7 1560.0 L42270.75 1607 L42270.75 2296 L42270.75 2296 L42270.75 2985 L42270.75 2985 L13953.5 3170.94185759931 L13953.5 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43822.0 161.0 L43811.8 157.8 L43819.7 150.6 L43830.0 153.8 Z"></path>
+						<path d="M42260.4 1549.6 L42257.7 1560.0 L42250.1 1552.4 L42252.7 1542.0 Z"></path>
 					</g>
-					<path d="M43997.8 195.5 L43989.5 203 L43989.5 524 L43989.5 524.0 " fill="none"></path>
+					<path d="M19907.2 1404.4 L21294.75 1607 L22393.008345428156 2265 L22393.0 2265.0 " fill="none"></path>
+					<path d="M19908.0 1399.1 L19907.2 1404.4 L19906.4 1409.7 L19894.0 1402.5 Z"></path>
+					<path d="M31034.8 1470.2 L31034.75 1607 L17141.25 2292.447817836812 L17141.3 2292.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44008.3 193.2 L43997.8 195.5 L44001.2 185.3 L44011.7 183.0 Z"></path>
+						<path d="M31040.1 1460.8 L31034.8 1470.2 L31029.4 1460.8 L31034.8 1451.5 Z"></path>
 					</g>
-					<path d="M44247.6 194.3 L44259 203 L44259 524 L44259.0 524.0 " fill="none"></path>
+					<path d="M31669.5 2345.7 L31669.5 2985 L13743.5 3169.972833905057 L13743.5 3170.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44243.5 184.4 L44247.6 194.3 L44237.0 192.9 L44232.8 183.0 Z"></path>
+						<path d="M31674.8 2336.3 L31669.5 2345.7 L31664.2 2336.3 L31669.5 2327.0 Z"></path>
 					</g>
-					<path d="M11164.3 2402.7 L10750 2985 L34658.25 3170.758001353955 L34658.3 3170.8 " fill="none"></path>
+					<path d="M31364.8 1463.2 L31364.75 1607 L14287.25 2294.5707064804533 L14287.3 2294.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11174.1 2398.2 L11164.3 2402.7 L11165.4 2392.0 L11175.1 2387.5 Z"></path>
+						<path d="M31370.1 1453.8 L31364.8 1463.2 L31359.4 1453.8 L31364.8 1444.5 Z"></path>
 					</g>
-					<path d="M11312.2 2403.0 L11703.5 2985 L21394.25 3169.878385290131 L21394.3 3169.9 " fill="none"></path>
+					<path d="M17389.8 2419.5 L15904.25 2985 L33238 3170.691191464308 L33238.0 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11311.4 2392.3 L11312.2 2403.0 L11302.6 2398.2 L11301.8 2387.5 Z"></path>
+						<path d="M17400.4 2421.2 L17389.8 2419.5 L17396.6 2411.2 L17407.3 2412.9 Z"></path>
 					</g>
-					<path d="M1051.7 1484.8 L1421.75 1607 L10914.75 2273.158476345674 L10914.8 2273.2 " fill="none"></path>
-					<path d="M1053.3 1479.7 L1051.7 1484.8 L1050.0 1489.9 L1039.0 1480.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M27866.0 1416.6 L28012 1607 L11565.75 2282.6281395799483 L11565.8 2282.6 " fill="none"></path>
+					<path d="M17390.9 2472.9 L16454.75 2985 L31147.5 3170.603107272881 L31147.5 3170.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M17401.6 2473.1 L17390.9 2472.9 L17396.5 2463.7 L17407.3 2463.9 Z"></path>
+					</g>
+					<path d="M17391.0 2478.6 L16494.75 2985 L12975.5 3167.7863607881363 L12975.5 3167.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M17401.7 2478.7 L17391.0 2478.6 L17396.5 2469.4 L17407.3 2469.5 Z"></path>
 					</g>
-					<path d="M27870.2 1413.3 L27866.0 1416.6 L27861.8 1419.8 L27857.9 1406.0 Z"></path>
-					<path d="M42387.4 2503.1 L42270.75 2985 L36889 3170.4490045729594 L36889.0 3170.4 " fill="none"></path>
+					<path d="M18021.9 2495.1 L18778.5 2985 L34407.75 3170.9527041036026 L34407.8 3171.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42394.7 2495.3 L42387.4 2503.1 L42384.4 2492.8 L42391.8 2485.0 Z"></path>
+						<path d="M18016.9 2485.6 L18021.9 2495.1 L18011.1 2494.5 L18006.2 2485.0 Z"></path>
 					</g>
-					<path d="M42431.5 2503.7 L42417.5 2985 L34849.25 3169.1759745555373 L34849.3 3169.2 " fill="none"></path>
+					<path d="M18033.0 2494.9 L18818.5 2985 L13953.5 3168.2974747474746 L13953.5 3168.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42437.1 2494.5 L42431.5 2503.7 L42426.4 2494.2 L42432.0 2485.0 Z"></path>
+						<path d="M18027.9 2485.4 L18033.0 2494.9 L18022.3 2494.5 L18017.2 2485.0 Z"></path>
 					</g>
-					<path d="M42481.6 2503.3 L42584.25 2985 L33587.25 3170.336113105429 L33587.3 3170.3 " fill="none"></path>
+					<path d="M18037.2 2490.5 L18858.5 2985 L13164.5 3169.09135823871 L13164.5 3169.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42484.9 2493.0 L42481.6 2503.3 L42474.5 2495.2 L42477.8 2485.0 Z"></path>
+						<path d="M18032.0 2481.1 L18037.2 2490.5 L18026.5 2490.2 L18021.3 2480.9 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M7035.5 1417.1 L7162.25 1607 L17407.25 2275.954226686884 L17407.3 2276.0 " fill="none"></path>
+					</g>
+					<path d="M7039.9 1414.1 L7035.5 1417.1 L7031.1 1420.1 L7028.1 1406.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3047.4 2318.5 L4123.25 2985 L13447.5 3168.586014410515 L13447.5 3168.6 " fill="none"></path>
 					</g>
-					<path d="M42493.6 2503.0 L42624.25 2985 L36049.25 3170.022632968691 L36049.3 3170.0 " fill="none"></path>
+					<path d="M3050.2 2314.0 L3047.4 2318.5 L3044.5 2323.1 L3036.0 2311.5 Z"></path>
+					<path d="M31936.0 1548.9 L31888 1607 L31888 2280.5 L31888.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42496.3 2492.6 L42493.6 2503.0 L42486.0 2495.4 L42488.7 2485.0 Z"></path>
+						<path d="M31946.1 1545.1 L31936.0 1548.9 L31937.9 1538.3 L31947.9 1534.5 Z"></path>
 					</g>
-					<path d="M42457.0 602.1 L44424 876 L44424 1025 L44424 1025 L44424 1174 L44424 1174 L44424 1390.5 L44424 1390.5 L44424 1607 L44424 1607 L42771 2180.3284671532847 L42771.0 2180.3 " fill="none"></path>
-					<path d="M42457.7 596.8 L42457.0 602.1 L42456.2 607.3 L42443.8 600.2 Z"></path>
-					<path d="M40131.3 1463.2 L40131.25 1607 L42104 2196.3657452574525 L42104.0 2196.4 " fill="none"></path>
+					<path d="M32211.8 1548.3 L32265.75 1607 L32265.75 2280.5 L32265.8 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40136.6 1453.8 L40131.3 1463.2 L40125.9 1453.8 L40131.3 1444.5 Z"></path>
+						<path d="M32209.4 1537.8 L32211.8 1548.3 L32201.6 1545.0 L32199.2 1534.5 Z"></path>
 					</g>
-					<path d="M38327.4 557.3 L40131.25 876 L40131.25 1025 L40131.25 1025 L40131.25 1174 L40131.25 1174 L40131.25 1336.5 L40131.3 1336.5 " fill="none"></path>
-					<path d="M38328.3 552.1 L38327.4 557.3 L38326.4 562.6 L38314.2 555.0 Z"></path>
-					<path d="M11337.0 1402.0 L13034 1607 L13034 2242.5 L13034.0 2242.5 " fill="none"></path>
-					<path d="M11337.6 1396.7 L11337.0 1402.0 L11336.3 1407.3 L11323.8 1400.4 Z"></path>
-					<path d="M37417.8 1063.3 L36720.25 1174 L36720.25 1375 L36720.3 1375.0 " fill="none"></path>
+					<path d="M32325.3 1441.1 L33173 1607 L14287.25 2294.7072999933935 L14287.3 2294.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37427.9 1067.1 L37417.8 1063.3 L37426.2 1056.5 L37436.3 1060.3 Z"></path>
+						<path d="M32317.2 1434.0 L32325.3 1441.1 L32315.1 1444.5 L32307.0 1437.5 Z"></path>
 					</g>
-					<path d="M37899.6 1069.8 L38460.25 1174 L38460.25 1390.5 L38460.25 1390.5 L38460.25 1607 L38460.25 1607 L20155.5 2294.3665199678444 L20155.5 2294.4 " fill="none"></path>
+					<path d="M32325.3 1439.3 L33213 1607 L18021.25 2282.3522542140495 L18021.3 2282.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37891.4 1062.8 L37899.6 1069.8 L37889.5 1073.3 L37881.3 1066.4 Z"></path>
+						<path d="M32317.2 1432.3 L32325.3 1439.3 L32315.2 1442.8 L32307.0 1435.8 Z"></path>
 					</g>
-					<path d="M37899.7 1064.0 L38578.75 1174 L38578.75 1375 L38578.8 1375.0 " fill="none"></path>
+					<path d="M2349.7 3072.2 L2363 3065.5 L2370.5 3065.5 L2370.5 3065.5 L2378 3171.5 L2378 3171.5 L2370.5 3277.5 L2370.5 3277.5 L2363 3277.5 L2363 3277.5 L2333 3262.393111638955 L2333.0 3262.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37891.3 1057.3 L37899.7 1064.0 L37889.6 1067.8 L37881.3 1061.0 Z"></path>
+						<path d="M2338.9 3071.6 L2349.7 3072.2 L2343.7 3081.2 L2333.0 3080.6 Z"></path>
 					</g>
-					<path d="M37899.8 1054.8 L38865.25 1174 L38865.25 1375 L38865.3 1375.0 " fill="none"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3052.0 2317.7 L4310.25 2985 L2333 3155.8989109025606 L2333.0 3155.9 " fill="none"></path>
+					</g>
+					<path d="M3054.5 2313.0 L3052.0 2317.7 L3049.5 2322.5 L3040.2 2311.5 Z"></path>
+					<path d="M33387.5 2412.0 L33176.25 2985 L40631.25 3170.7400975218757 L40631.3 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37891.2 1048.3 L37899.8 1054.8 L37889.9 1058.9 L37881.3 1052.5 Z"></path>
+						<path d="M33395.7 2405.1 L33387.5 2412.0 L33385.7 2401.4 L33393.9 2394.5 Z"></path>
 					</g>
-					<path d="M39104.2 1454.5 L38863.25 1607 L38863.25 2280.5 L38863.3 2280.5 " fill="none"></path>
+					<path d="M33473.0 2412.0 L33684.25 2985 L32395.5 3156.0385162782422 L32395.5 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39114.9 1454.0 L39104.2 1454.5 L39109.2 1445.0 L39119.9 1444.5 Z"></path>
+						<path d="M33474.8 2401.4 L33473.0 2412.0 L33464.8 2405.1 L33466.6 2394.5 Z"></path>
 					</g>
-					<path d="M39264.9 1458.5 L39395 1607 L16417.25 2293.8477857677417 L16417.3 2293.8 " fill="none"></path>
+					<path d="M33479.6 2411.7 L33724.25 2985 L33155.09048257372 3156 L33155.1 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39262.7 1448.0 L39264.9 1458.5 L39254.7 1455.0 L39252.6 1444.5 Z"></path>
+						<path d="M33480.8 2401.0 L33479.6 2411.7 L33471.0 2405.2 L33472.3 2394.5 Z"></path>
 					</g>
-					<path d="M37894.5 1047.7 L39205.25 1174 L39205.25 1336.5 L39205.3 1336.5 " fill="none"></path>
-					<path d="M37895.0 1042.4 L37894.5 1047.7 L37894.0 1053.0 L37881.3 1046.4 Z"></path>
-					<g data-name="WebFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
-							<rect x="25196.3" y="37.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
-							<path d="M25196.3 68.5 L25365.3 68.5" fill="none" data-name="WebFrame"></path>
-							<path d="M25196.3 114.5 L25365.3 114.5" fill="none" data-name="WebFrame"></path>
+					<path d="M17579.6 1028.9 L20883.5 1174 L23911.25 1383.7793023441875 L23911.3 1383.8 " fill="none"></path>
+					<path d="M17579.8 1023.6 L17579.6 1028.9 L17579.3 1034.3 L17566.3 1028.3 Z"></path>
+					<g data-name="IAppDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
+							<rect x="26232.5" y="60.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
+							<path d="M26232.5 91.5 L26429.5 91.5" fill="none" data-name="IAppDelegate"></path>
 						</g>
-						<g transform="translate(25196.25, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
+						<g transform="translate(26232.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25196.25, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
+						<g transform="translate(26232.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25196.25, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
+					</g>
+					<g data-name="AppController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
+							<rect x="26469.5" y="22.5" height="138.0" width="301.0" data-name="AppController"></rect>
+							<path d="M26469.5 53.5 L26770.5 53.5" fill="none" data-name="AppController"></path>
+							<path d="M26469.5 114.5 L26770.5 114.5" fill="none" data-name="AppController"></path>
+						</g>
+						<g transform="translate(26469.5, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
+								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="DisabledFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
-							<rect x="25405.3" y="60.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
-							<path d="M25405.3 91.5 L25541.3 91.5" fill="none" data-name="DisabledFrame"></path>
-						</g>
-						<g transform="translate(25405.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
+						<g transform="translate(26469.5, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25405.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
+						<g transform="translate(26469.5, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PhoneContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
-							<rect x="0.0" y="1284.0" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
-							<path d="M0.0 1315.0 L327.0 1315.0" fill="none" data-name="PhoneContainer"></path>
-							<path d="M0.0 1466.0 L327.0 1466.0" fill="none" data-name="PhoneContainer"></path>
+					<g data-name="StudyMonitorScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
+							<rect x="18548.8" y="2265.0" height="62.0" width="176.0" data-name="StudyMonitorScreen"></rect>
+							<path d="M18548.8 2296.0 L18724.8 2296.0" fill="none" data-name="StudyMonitorScreen"></path>
 						</g>
-						<g transform="translate(0, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
-								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
+						<g transform="translate(18548.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
+								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
+						<g transform="translate(18548.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 1466)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
+					</g>
+					<g data-name="StudyPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
+							<rect x="19730.0" y="1344.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
+							<path d="M19730.0 1375.0 L19894.0 1375.0" fill="none" data-name="StudyPageWidget"></path>
+							<path d="M19730.0 1406.0 L19894.0 1406.0" fill="none" data-name="StudyPageWidget"></path>
+						</g>
+						<g transform="translate(19730, 1344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="10640.8" y="2280.5" height="31.0" width="58.0" data-name="Color"></rect>
+						<g transform="translate(19730, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
+								
+							</g>
 						</g>
-						<g transform="translate(10640.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
+						<g transform="translate(19730, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="8937.8" y="2280.5" height="31.0" width="71.0" data-name="Widget"></rect>
+					<g data-name="LoginForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
+							<rect x="0.0" y="2249.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
+							<path d="M0.0 2280.5 L207.0 2280.5" fill="none" data-name="LoginForm"></path>
+							<path d="M0.0 2311.5 L207.0 2311.5" fill="none" data-name="LoginForm"></path>
 						</g>
-						<g transform="translate(8937.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
+						<g transform="translate(0, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="MobileFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
-							<rect x="25581.3" y="60.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
-							<path d="M25581.3 91.5 L25717.3 91.5" fill="none" data-name="MobileFrame"></path>
-						</g>
-						<g transform="translate(25581.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
+						<g transform="translate(0, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25581.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
+						<g transform="translate(0, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DesktopFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
-							<rect x="25757.3" y="60.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
-							<path d="M25757.3 91.5 L25893.3 91.5" fill="none" data-name="DesktopFrame"></path>
+					<g data-name="AuthFormKey">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
+							<rect x="1100.0" y="3088.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
+							<path d="M1100.0 3119.0 L1455.0 3119.0" fill="none" data-name="AuthFormKey"></path>
 						</g>
-						<g transform="translate(25757.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
+						<g transform="translate(1100, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
+								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25757.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
+						<g transform="translate(1100, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
-							<rect x="135.3" y="2182.0" height="228.0" width="573.0" data-name="StudyController"></rect>
-							<path d="M135.3 2213.0 L708.3 2213.0" fill="none" data-name="StudyController"></path>
-							<path d="M135.3 2274.0 L708.3 2274.0" fill="none" data-name="StudyController"></path>
+					<g data-name="FormConsumerRefWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
+							<rect x="690.8" y="1375.0" height="31.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
 						</g>
-						<g transform="translate(135.25, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
-								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
+						<g transform="translate(690.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
+								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(135.25, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+					</g>
+					<g data-name="PasswordRecoveryForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
+							<rect x="572.5" y="2249.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
+							<path d="M572.5 2280.5 L780.5 2280.5" fill="none" data-name="PasswordRecoveryForm"></path>
+							<path d="M572.5 2311.5 L780.5 2311.5" fill="none" data-name="PasswordRecoveryForm"></path>
+						</g>
+						<g transform="translate(572.5, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(135.25, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
+						<g transform="translate(572.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
+								
+							</g>
+						</g>
+						<g transform="translate(572.5, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="INotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="9191.5" y="3156.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
+					<g data-name="PasswordForgotForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
+							<rect x="820.5" y="2249.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
+							<path d="M820.5 2280.5 L1027.5 2280.5" fill="none" data-name="PasswordForgotForm"></path>
+							<path d="M820.5 2311.5 L1027.5 2311.5" fill="none" data-name="PasswordForgotForm"></path>
 						</g>
-						<g transform="translate(9191.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
+						<g transform="translate(820.5, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="21394.3" y="3156.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+						<g transform="translate(820.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
+								
+							</g>
 						</g>
-						<g transform="translate(21394.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
+						<g transform="translate(820.5, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyBaseController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="493.0" y="1299.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
-							<path d="M493.0 1330.0 L1039.0 1330.0" fill="none" data-name="StudyBaseController"></path>
-							<path d="M493.0 1406.0 L1039.0 1406.0" fill="none" data-name="StudyBaseController"></path>
+					<g data-name="SignupForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
+							<rect x="1067.5" y="2234.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
+							<path d="M1067.5 2265.5 L1345.5 2265.5" fill="none" data-name="SignupForm"></path>
+							<path d="M1067.5 2296.5 L1345.5 2296.5" fill="none" data-name="SignupForm"></path>
 						</g>
-						<g transform="translate(493, 1299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
-								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
+						<g transform="translate(1067.5, 2234.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
+								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(493, 1330)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
+						<g transform="translate(1067.5, 2265.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(493, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
+						<g transform="translate(1067.5, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyAppBarViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
-							<rect x="1589.3" y="2250.0" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
-							<path d="M1589.3 2281.0 L1832.3 2281.0" fill="none" data-name="IStudyAppBarViewModel"></path>
+					<g data-name="AuthScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
+							<rect x="1256.0" y="1329.5" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
+							<path d="M1256.0 1360.5 L1515.0 1360.5" fill="none" data-name="AuthScaffold"></path>
 						</g>
-						<g transform="translate(1589.25, 2250)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
+						<g transform="translate(1256, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
+								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1589.25, 2281)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
+						<g transform="translate(1256, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyStatusBadgeViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
-							<rect x="1416.8" y="1352.0" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
-							<path d="M1416.8 1383.0 L1701.8 1383.0" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
+					<g data-name="Widget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
+							<rect x="14216.3" y="2280.5" height="31.0" width="71.0" data-name="Widget"></rect>
 						</g>
-						<g transform="translate(1416.75, 1352)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
+						<g transform="translate(14216.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
+								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1416.75, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
+					</g>
+					<g data-name="EdgeInsets">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
+							<rect x="3553.3" y="2280.5" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
+						</g>
+						<g transform="translate(3553.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyNavViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
-							<rect x="1741.8" y="1322.0" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
-							<path d="M1741.8 1353.0 L1982.8 1353.0" fill="none" data-name="IStudyNavViewModel"></path>
+					<g data-name="EmailTextField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
+							<rect x="1689.5" y="2242.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
+							<path d="M1689.5 2273.5 L2010.5 2273.5" fill="none" data-name="EmailTextField"></path>
 						</g>
-						<g transform="translate(1741.75, 1322)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
+						<g transform="translate(1689.5, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
+								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1741.75, 1353)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
+						<g transform="translate(1689.5, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
+								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
-							<rect x="1952.5" y="904.0" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
-							<path d="M1952.5 935.0 L2287.5 935.0" fill="none" data-name="StudyScaffold"></path>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="32856.0" y="3156.0" height="31.0" width="113.0" data-name="FormControl"></rect>
 						</g>
-						<g transform="translate(1952.5, 904)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
-								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
+						<g transform="translate(32856, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1952.5, 935)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
+					</g>
+					<g data-name="PasswordTextField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
+							<rect x="2050.5" y="2235.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
+							<path d="M2050.5 2266.0 L2529.5 2266.0" fill="none" data-name="PasswordTextField"></path>
+						</g>
+						<g transform="translate(2050.5, 2235)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2050.5, 2266)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NavbarTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="2022.8" y="1375.0" height="31.0" width="103.0" data-name="NavbarTab"></rect>
+					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+							<rect x="270.8" y="3156.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
 						</g>
-						<g transform="translate(2022.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
+						<g transform="translate(270.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="11159.8" y="1344.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
-							<path d="M11159.8 1375.0 L11323.8 1375.0" fill="none" data-name="StudyPageWidget"></path>
-							<path d="M11159.8 1406.0 L11323.8 1406.0" fill="none" data-name="StudyPageWidget"></path>
+					<g data-name="StudyUJobsToBeDone">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
+							<rect x="26810.5" y="60.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
+							<path d="M26810.5 91.5 L27004.5 91.5" fill="none" data-name="StudyUJobsToBeDone"></path>
 						</g>
-						<g transform="translate(11159.75, 1344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
+						<g transform="translate(26810.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
+								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11159.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
+						<g transform="translate(26810.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11159.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
+					</g>
+					<g data-name="AuthFormController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
+							<rect x="35509.0" y="2039.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
+							<path d="M35509.0 2070.5 L36359.0 2070.5" fill="none" data-name="AuthFormController"></path>
+							<path d="M35509.0 2326.5 L36359.0 2326.5" fill="none" data-name="AuthFormController"></path>
+						</g>
+						<g transform="translate(35509, 2039.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
+								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SingleColumnLayoutType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="2205.8" y="1375.0" height="31.0" width="218.0" data-name="SingleColumnLayoutType"></rect>
+						<g transform="translate(35509, 2070.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
+								
+							</g>
 						</g>
-						<g transform="translate(2205.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
+						<g transform="translate(35509, 2326.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PreviewFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
-							<rect x="25933.3" y="45.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
-							<path d="M25933.3 76.5 L26224.3 76.5" fill="none" data-name="PreviewFrame"></path>
+					<g data-name="IAuthRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
+							<rect x="31147.5" y="3156.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
 						</g>
-						<g transform="translate(25933.25, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
+						<g transform="translate(31147.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
+								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25933.25, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
+					</g>
+					<g data-name="INotificationService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
+							<rect x="16317.5" y="3156.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
+						</g>
+						<g transform="translate(16317.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
+								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="25986.8" y="524.0" height="31.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
+					<g data-name="GoRouter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
+							<rect x="34407.8" y="3156.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
 						</g>
-						<g transform="translate(25986.75, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
+						<g transform="translate(34407.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
+								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RouteInformation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
-							<rect x="2334.3" y="2227.0" height="138.0" width="152.0" data-name="RouteInformation"></rect>
-							<path d="M2334.3 2258.0 L2486.3 2258.0" fill="none" data-name="RouteInformation"></path>
-							<path d="M2334.3 2334.0 L2486.3 2334.0" fill="none" data-name="RouteInformation"></path>
+					<g data-name="FormGroup">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
+							<rect x="39344.8" y="3156.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
 						</g>
-						<g transform="translate(2334.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
+						<g transform="translate(39344.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2334.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
+					</g>
+					<g data-name="IFormGroupController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
+							<rect x="38033.5" y="60.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
+							<path d="M38033.5 91.5 L38220.5 91.5" fill="none" data-name="IFormGroupController"></path>
+						</g>
+						<g transform="translate(38033.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
+								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2334.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
+						<g transform="translate(38033.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
-							<rect x="2463.8" y="1261.5" height="258.0" width="302.0" data-name="PlatformController"></rect>
-							<path d="M2463.8 1292.5 L2765.8 1292.5" fill="none" data-name="PlatformController"></path>
-							<path d="M2463.8 1383.5 L2765.8 1383.5" fill="none" data-name="PlatformController"></path>
+					<g data-name="Enum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
+							<rect x="2980.5" y="2280.5" height="31.0" width="61.0" data-name="Enum"></rect>
 						</g>
-						<g transform="translate(2463.75, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
-								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
+						<g transform="translate(2980.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2463.75, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
+					</g>
+					<g data-name="AppStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
+							<rect x="731.0" y="3118.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
+							<path d="M731.0 3149.0 L1010.0 3149.0" fill="none" data-name="AppStatus"></path>
+						</g>
+						<g transform="translate(731, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
+								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2463.75, 1383.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
+						<g transform="translate(731, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WebController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
-							<rect x="2604.5" y="2197.0" height="198.0" width="273.0" data-name="WebController"></rect>
-							<path d="M2604.5 2228.0 L2877.5 2228.0" fill="none" data-name="WebController"></path>
-							<path d="M2604.5 2259.0 L2877.5 2259.0" fill="none" data-name="WebController"></path>
+					<g data-name="FormArrayTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
+							<rect x="2223.0" y="1194.0" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
+							<path d="M2223.0 1225.0 L2713.0 1225.0" fill="none" data-name="FormArrayTable"></path>
+							<path d="M2223.0 1526.0 L2713.0 1526.0" fill="none" data-name="FormArrayTable"></path>
 						</g>
-						<g transform="translate(2604.5, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
-								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
+						<g transform="translate(2223, 1194)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
+								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2604.5, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
+						<g transform="translate(2223, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2604.5, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
+						<g transform="translate(2223, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFrameElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
-							<rect x="1215.8" y="3156.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
+					<g data-name="AbstractControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
+							<rect x="10354.3" y="3156.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
 						</g>
-						<g transform="translate(1215.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
+						<g transform="translate(10354.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
+								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MobileController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
-							<rect x="3391.0" y="2212.5" height="167.0" width="191.0" data-name="MobileController"></rect>
-							<path d="M3391.0 2243.5 L3582.0 2243.5" fill="none" data-name="MobileController"></path>
-						</g>
-						<g transform="translate(3391, 2212.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
-								
-							</g>
+					<g data-name="void Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
+							<rect x="1505.5" y="2280.5" height="31.0" width="144.0" data-name="void Function(T)"></rect>
 						</g>
-						<g transform="translate(3391, 2243.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
+						<g transform="translate(1505.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
+								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyParticipationBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
-							<rect x="2818.8" y="1321.5" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
-							<path d="M2818.8 1352.5 L3049.8 1352.5" fill="none" data-name="StudyParticipationBadge"></path>
-							<path d="M2818.8 1428.5 L3049.8 1428.5" fill="none" data-name="StudyParticipationBadge"></path>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+							<rect x="2569.5" y="2280.5" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
 						</g>
-						<g transform="translate(2818.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
+						<g transform="translate(2569.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2818.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
-								
-							</g>
+					</g>
+					<g data-name="void Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
+							<rect x="16997.3" y="2280.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
 						</g>
-						<g transform="translate(2818.75, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
+						<g transform="translate(16997.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
+								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="5768.8" y="2280.5" height="31.0" width="114.0" data-name="Participation"></rect>
+					<g data-name="String Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
+							<rect x="3698.3" y="2280.5" height="31.0" width="157.0" data-name="String Function(T)"></rect>
 						</g>
-						<g transform="translate(5768.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
+						<g transform="translate(3698.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
+								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="8791.8" y="2280.5" height="31.0" width="106.0" data-name="BadgeType"></rect>
+					<g data-name="IconData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
+							<rect x="16431.3" y="2280.5" height="31.0" width="87.0" data-name="IconData"></rect>
 						</g>
-						<g transform="translate(8791.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
+						<g transform="translate(16431.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
+								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTestScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
-							<rect x="9813.8" y="2219.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
-							<path d="M9813.8 2250.5 L10013.8 2250.5" fill="none" data-name="StudyTestScreen"></path>
-							<path d="M9813.8 2281.5 L10013.8 2281.5" fill="none" data-name="StudyTestScreen"></path>
+					<g data-name="Widget Function(BuildContext, T, int)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
+							<rect x="3895.3" y="2280.5" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
 						</g>
-						<g transform="translate(9813.75, 2219.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
-								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
+						<g transform="translate(3895.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
+								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9813.75, 2250.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
+					</g>
+					<g data-name="ManagedFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
+							<rect x="42550.0" y="1359.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
+							<path d="M42550.0 1390.5 L42946.0 1390.5" fill="none" data-name="ManagedFormViewModel"></path>
+						</g>
+						<g transform="translate(42550, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
+								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9813.75, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
+						<g transform="translate(42550, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TestAppRoutes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
-							<rect x="26264.3" y="23.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
-							<path d="M26264.3 54.0 L26524.3 54.0" fill="none" data-name="TestAppRoutes"></path>
-						</g>
-						<g transform="translate(26264.25, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
-								
-							</g>
+					<g data-name="FormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
+							<rect x="43322.5" y="223.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
+							<path d="M43322.5 254.0 L44194.5 254.0" fill="none" data-name="FormViewModel"></path>
+							<path d="M43322.5 570.0 L44194.5 570.0" fill="none" data-name="FormViewModel"></path>
 						</g>
-						<g transform="translate(26264.25, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
-								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
+						<g transform="translate(43322.5, 223)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
+								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
-							<rect x="26564.3" y="23.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
-							<path d="M26564.3 54.0 L26797.3 54.0" fill="none" data-name="StudyNav"></path>
-						</g>
-						<g transform="translate(26564.25, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
+						<g transform="translate(43322.5, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26564.25, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
+						<g transform="translate(43322.5, 570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
-							<rect x="26837.3" y="23.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
-							<path d="M26837.3 54.0 L27125.3 54.0" fill="none" data-name="StudyDesignNav"></path>
+					<g data-name="FormViewModelNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
+							<rect x="26662.5" y="524.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
 						</g>
-						<g transform="translate(26837.25, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
+						<g transform="translate(26662.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26837.25, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
+					</g>
+					<g data-name="Exception">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
+							<rect x="27044.5" y="76.0" height="31.0" width="94.0" data-name="Exception"></rect>
+						</g>
+						<g transform="translate(27044.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
+								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTestController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
-							<rect x="748.3" y="2257.5" height="77.0" width="282.0" data-name="StudyTestController"></rect>
-							<path d="M748.3 2288.5 L1030.3 2288.5" fill="none" data-name="StudyTestController"></path>
+					<g data-name="FormViewModelCollection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
+							<rect x="39709.8" y="3378.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
+							<path d="M39709.8 3409.0 L39990.8 3409.0" fill="none" data-name="FormViewModelCollection"></path>
+							<path d="M39709.8 3500.0 L39990.8 3500.0" fill="none" data-name="FormViewModelCollection"></path>
 						</g>
-						<g transform="translate(748.25, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
+						<g transform="translate(39709.75, 3378)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
+								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(748.25, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
+						<g transform="translate(39709.75, 3409)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="32133.0" y="3156.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
-						</g>
-						<g transform="translate(32133, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
+						<g transform="translate(39709.75, 3500)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
-							<rect x="3240.0" y="2280.5" height="31.0" width="111.0" data-name="StudyStatus"></rect>
+					<g data-name="FormArray">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
+							<rect x="38553.3" y="3691.0" height="31.0" width="98.0" data-name="FormArray"></rect>
 						</g>
-						<g transform="translate(3240, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
-								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
+						<g transform="translate(38553.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyStatusBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
-							<rect x="3089.8" y="1314.0" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
-							<path d="M3089.8 1345.0 L3330.8 1345.0" fill="none" data-name="StudyStatusBadge"></path>
-							<path d="M3089.8 1436.0 L3330.8 1436.0" fill="none" data-name="StudyStatusBadge"></path>
+					<g data-name="CustomFormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
+							<rect x="32706.0" y="3430.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
+							<path d="M32706.0 3461.5 L33119.0 3461.5" fill="none" data-name="CustomFormControl"></path>
+							<path d="M32706.0 3567.5 L33119.0 3567.5" fill="none" data-name="CustomFormControl"></path>
 						</g>
-						<g transform="translate(3089.75, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
+						<g transform="translate(32706, 3430.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3089.75, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
+						<g transform="translate(32706, 3461.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3089.75, 1436)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
+						<g transform="translate(32706, 3567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FrameControlsWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
-							<rect x="3370.8" y="1329.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
-							<path d="M3370.8 1360.0 L3661.8 1360.0" fill="none" data-name="FrameControlsWidget"></path>
-							<path d="M3370.8 1421.0 L3661.8 1421.0" fill="none" data-name="FrameControlsWidget"></path>
+					<g data-name="Debouncer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
+							<rect x="41462.5" y="3691.0" height="31.0" width="103.0" data-name="Debouncer"></rect>
 						</g>
-						<g transform="translate(3370.75, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
+						<g transform="translate(41462.5, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
+								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3370.75, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
+					</g>
+					<g data-name="void Function(T?)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
+							<rect x="31588.3" y="3691.0" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
+						</g>
+						<g transform="translate(31588.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3370.75, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
+					</g>
+					<g data-name="void Function(ControlStatus)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
+							<rect x="31792.3" y="3691.0" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
+						</g>
+						<g transform="translate(31792.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="16273.3" y="2280.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
+					<g data-name="UnsavedChangesDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
+							<rect x="43828.5" y="60.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
+							<path d="M43828.5 91.5 L44035.5 91.5" fill="none" data-name="UnsavedChangesDialog"></path>
 						</g>
-						<g transform="translate(16273.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
+						<g transform="translate(43828.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
+								
+							</g>
+						</g>
+						<g transform="translate(43828.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="12064.0" y="1009.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+					<g data-name="FormValidationSetEnum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
+							<rect x="43227.8" y="1009.5" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
 						</g>
-						<g transform="translate(12064, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
+						<g transform="translate(43227.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
+								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudySettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="10425.8" y="2265.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M10425.8 2296.0 L10600.8 2296.0" fill="none" data-name="StudySettingsDialog"></path>
+					<g data-name="FormControlValidation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
+							<rect x="4943.3" y="2227.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
+							<path d="M4943.3 2258.0 L5428.3 2258.0" fill="none" data-name="FormControlValidation"></path>
+							<path d="M4943.3 2334.0 L5428.3 2334.0" fill="none" data-name="FormControlValidation"></path>
 						</g>
-						<g transform="translate(10425.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
-								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
+						<g transform="translate(4943.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
+								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10425.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
+						<g transform="translate(4943.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4943.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudySettingsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="40150.8" y="2167.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M40150.8 2198.0 L40629.8 2198.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M40150.8 2334.0 L40629.8 2334.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+					<g data-name="IFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
+							<rect x="27224.5" y="493.0" height="93.0" width="163.0" data-name="IFormData"></rect>
+							<path d="M27224.5 524.0 L27387.5 524.0" fill="none" data-name="IFormData"></path>
+							<path d="M27224.5 555.0 L27387.5 555.0" fill="none" data-name="IFormData"></path>
 						</g>
-						<g transform="translate(40150.75, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
+						<g transform="translate(27224.5, 493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
+								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40150.75, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(27224.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40150.75, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
+						<g transform="translate(27224.5, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="39993.0" y="3156.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
+					<g data-name="FormInvalidException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
+							<rect x="26998.5" y="524.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
 						</g>
-						<g transform="translate(39993, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
+						<g transform="translate(26998.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
+								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="34467.3" y="3156.0" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
+					<g data-name="FormConfigException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
+							<rect x="34673.3" y="508.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
+							<path d="M34673.3 539.5 L34858.3 539.5" fill="none" data-name="FormConfigException"></path>
 						</g>
-						<g transform="translate(34467.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
+						<g transform="translate(34673.25, 508.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
+								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="33474.3" y="3156.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(33474.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+						<g transform="translate(34673.25, 539.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="35944.3" y="3156.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
+					<g data-name="IFormViewModelDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
+							<rect x="43786.0" y="986.5" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
+							<path d="M43786.0 1017.5 L44003.0 1017.5" fill="none" data-name="IFormViewModelDelegate"></path>
 						</g>
-						<g transform="translate(35944.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+						<g transform="translate(43786, 986.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
+								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
+								
+							</g>
+						</g>
+						<g transform="translate(43786, 1017.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="41571.8" y="223.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
-							<path d="M41571.8 254.0 L42443.8 254.0" fill="none" data-name="FormViewModel"></path>
-							<path d="M41571.8 570.0 L42443.8 570.0" fill="none" data-name="FormViewModel"></path>
+					<g data-name="FormControlOption">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
+							<rect x="44234.5" y="486.0" height="107.0" width="190.0" data-name="FormControlOption"></rect>
+							<path d="M44234.5 517.0 L44424.5 517.0" fill="none" data-name="FormControlOption"></path>
 						</g>
-						<g transform="translate(41571.75, 223)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+						<g transform="translate(44234.5, 486)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
+								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41571.75, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+						<g transform="translate(44234.5, 517)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41571.75, 570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
+					</g>
+					<g data-name="Equatable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
+							<rect x="44281.5" y="76.0" height="31.0" width="96.0" data-name="Equatable"></rect>
+						</g>
+						<g transform="translate(44281.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
+								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="34889.3" y="3156.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
+					<g data-name="FormMode">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
+							<rect x="28528.3" y="3110.5" height="122.0" width="282.0" data-name="FormMode"></rect>
+							<path d="M28528.3 3141.5 L28810.3 3141.5" fill="none" data-name="FormMode"></path>
 						</g>
-						<g transform="translate(34889.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
+						<g transform="translate(28528.25, 3110.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
+								
+							</g>
+						</g>
+						<g transform="translate(28528.25, 3141.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IWithBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="16817.0" y="1009.5" height="31.0" width="113.0" data-name="IWithBanner"></rect>
+					<g data-name="CancelableOperation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
+							<rect x="44277.8" y="1009.5" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
 						</g>
-						<g transform="translate(16817, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
+						<g transform="translate(44277.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
+								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
-							<rect x="2182.3" y="3118.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
-							<path d="M2182.3 3149.0 L2461.3 3149.0" fill="none" data-name="AppStatus"></path>
+					<g data-name="EnrolledBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
+							<rect x="44417.5" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
+							<path d="M44417.5 76.0 L44583.5 76.0" fill="none" data-name="EnrolledBadge"></path>
+							<path d="M44417.5 107.0 L44583.5 107.0" fill="none" data-name="EnrolledBadge"></path>
 						</g>
-						<g transform="translate(2182.25, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
+						<g transform="translate(44417.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2182.25, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
+						<g transform="translate(44417.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
+								
+							</g>
+						</g>
+						<g transform="translate(44417.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="4828.8" y="2280.5" height="31.0" width="61.0" data-name="Enum"></rect>
+					<g data-name="StudyRecruitController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
+							<rect x="5468.3" y="2204.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
+							<path d="M5468.3 2235.5 L6119.3 2235.5" fill="none" data-name="StudyRecruitController"></path>
+							<path d="M5468.3 2281.5 L6119.3 2281.5" fill="none" data-name="StudyRecruitController"></path>
 						</g>
-						<g transform="translate(4828.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
+						<g transform="translate(5468.25, 2204.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
+								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5468.25, 2235.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5468.25, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IAppDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
-							<rect x="27165.3" y="60.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
-							<path d="M27165.3 91.5 L27362.3 91.5" fill="none" data-name="IAppDelegate"></path>
+					<g data-name="IInviteCodeRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
+							<rect x="31329.5" y="3156.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
 						</g>
-						<g transform="translate(27165.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
+						<g transform="translate(31329.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27165.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
+					</g>
+					<g data-name="StreamSubscription">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
+							<rect x="13783.5" y="3156.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+						</g>
+						<g transform="translate(13783.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
+								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
-							<rect x="27402.3" y="22.5" height="138.0" width="301.0" data-name="AppController"></rect>
-							<path d="M27402.3 53.5 L27703.3 53.5" fill="none" data-name="AppController"></path>
-							<path d="M27402.3 114.5 L27703.3 114.5" fill="none" data-name="AppController"></path>
+					<g data-name="StudyBaseController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
+							<rect x="4974.0" y="1299.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
+							<path d="M4974.0 1330.0 L5520.0 1330.0" fill="none" data-name="StudyBaseController"></path>
+							<path d="M4974.0 1406.0 L5520.0 1406.0" fill="none" data-name="StudyBaseController"></path>
 						</g>
-						<g transform="translate(27402.25, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
+						<g transform="translate(4974, 1299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
+								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27402.25, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
+						<g transform="translate(4974, 1330)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27402.25, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
+						<g transform="translate(4974, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="App">
-						<g fill="#eee8d5" stroke="#33322E" data-name="App">
-							<rect x="27743.3" y="76.0" height="31.0" width="47.0" data-name="App"></rect>
+					<g data-name="IModelActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
+							<rect x="6925.8" y="1375.0" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
 						</g>
-						<g transform="translate(27743.25, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
-								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
+						<g transform="translate(6925.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
+								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppContent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
-							<rect x="27830.3" y="76.0" height="31.0" width="109.0" data-name="AppContent"></rect>
+					<g data-name="StudyRecruitScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
+							<rect x="18764.8" y="2242.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
+							<path d="M18764.8 2273.5 L19078.8 2273.5" fill="none" data-name="StudyRecruitScreen"></path>
 						</g>
-						<g transform="translate(27830.25, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
+						<g transform="translate(18764.75, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
+								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
+								
+							</g>
+						</g>
+						<g transform="translate(18764.75, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthFormController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
-							<rect x="32165.5" y="2039.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
-							<path d="M32165.5 2070.5 L33015.5 2070.5" fill="none" data-name="AuthFormController"></path>
-							<path d="M32165.5 2326.5 L33015.5 2326.5" fill="none" data-name="AuthFormController"></path>
+					<g data-name="InviteCodeFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
+							<rect x="36439.0" y="1336.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
+							<path d="M36439.0 1367.5 L36877.0 1367.5" fill="none" data-name="InviteCodeFormView"></path>
+							<path d="M36439.0 1398.5 L36877.0 1398.5" fill="none" data-name="InviteCodeFormView"></path>
 						</g>
-						<g transform="translate(32165.5, 2039.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
-								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
+						<g transform="translate(36439, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
+								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32165.5, 2070.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
+						<g transform="translate(36439, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32165.5, 2326.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
+						<g transform="translate(36439, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthFormKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
-							<rect x="3429.3" y="3088.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
-							<path d="M3429.3 3119.0 L3784.3 3119.0" fill="none" data-name="AuthFormKey"></path>
+					<g data-name="InviteCodeFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
+							<rect x="42310.8" y="2107.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
+							<path d="M42310.8 2138.0 L42977.8 2138.0" fill="none" data-name="InviteCodeFormViewModel"></path>
+							<path d="M42310.8 2364.0 L42977.8 2364.0" fill="none" data-name="InviteCodeFormViewModel"></path>
 						</g>
-						<g transform="translate(3429.25, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
-								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
+						<g transform="translate(42310.75, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
+								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3429.25, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
+						<g transform="translate(42310.75, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IFormGroupController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="36929.5" y="60.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
-							<path d="M36929.5 91.5 L37116.5 91.5" fill="none" data-name="IFormGroupController"></path>
-						</g>
-						<g transform="translate(36929.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
-								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
+						<g transform="translate(42310.75, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36929.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
+					</g>
+					<g data-name="FormConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
+							<rect x="38919.8" y="524.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
+						</g>
+						<g transform="translate(38919.75, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
+								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PasswordRecoveryForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
-							<rect x="3622.0" y="2249.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
-							<path d="M3622.0 2280.5 L3830.0 2280.5" fill="none" data-name="PasswordRecoveryForm"></path>
-							<path d="M3622.0 2311.5 L3830.0 2311.5" fill="none" data-name="PasswordRecoveryForm"></path>
+					<g data-name="StudyInvitesTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
+							<rect x="44826.3" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
+							<path d="M44826.3 31.0 L45392.3 31.0" fill="none" data-name="StudyInvitesTable"></path>
+							<path d="M44826.3 137.0 L45392.3 137.0" fill="none" data-name="StudyInvitesTable"></path>
 						</g>
-						<g transform="translate(3622, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
+						<g transform="translate(44826.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
+								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
+								
+							</g>
+						</g>
+						<g transform="translate(44826.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3622, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
+						<g transform="translate(44826.25, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3622, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
+					</g>
+					<g data-name="void Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
+							<rect x="44630.0" y="524.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
+						</g>
+						<g transform="translate(44630, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
+								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConsumerRefWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="3863.8" y="1375.0" height="31.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+							<rect x="44892.0" y="524.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(3863.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
+						<g transform="translate(44892, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PasswordForgotForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
-							<rect x="3870.0" y="2249.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
-							<path d="M3870.0 2280.5 L4077.0 2280.5" fill="none" data-name="PasswordForgotForm"></path>
-							<path d="M3870.0 2311.5 L4077.0 2311.5" fill="none" data-name="PasswordForgotForm"></path>
+					<g data-name="Intervention? Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
+							<rect x="45352.0" y="524.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
 						</g>
-						<g transform="translate(3870, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
+						<g transform="translate(45352, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3870, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
-								
-							</g>
+					</g>
+					<g data-name="int Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
+							<rect x="45643.0" y="524.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(3870, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
+						<g transform="translate(45643, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LoginForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
-							<rect x="4117.0" y="2249.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
-							<path d="M4117.0 2280.5 L4324.0 2280.5" fill="none" data-name="LoginForm"></path>
-							<path d="M4117.0 2311.5 L4324.0 2311.5" fill="none" data-name="LoginForm"></path>
+					<g data-name="Study">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
+							<rect x="40631.3" y="3156.0" height="31.0" width="61.0" data-name="Study"></rect>
 						</g>
-						<g transform="translate(4117, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
+						<g transform="translate(40631.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4117, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
+					</g>
+					<g data-name="PublishSuccessDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
+							<rect x="19118.8" y="2265.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
+							<path d="M19118.8 2296.0 L19309.8 2296.0" fill="none" data-name="PublishSuccessDialog"></path>
+						</g>
+						<g transform="translate(19118.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4117, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
+						<g transform="translate(19118.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EmailTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
-							<rect x="6146.8" y="2242.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
-							<path d="M6146.8 2273.5 L6467.8 2273.5" fill="none" data-name="EmailTextField"></path>
+					<g data-name="PublishDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
+							<rect x="20098.8" y="2265.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
+							<path d="M20098.8 2296.0 L20234.8 2296.0" fill="none" data-name="PublishDialog"></path>
 						</g>
-						<g transform="translate(6146.75, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
+						<g transform="translate(20098.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6146.75, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
+						<g transform="translate(20098.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PasswordTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
-							<rect x="6507.8" y="2235.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
-							<path d="M6507.8 2266.0 L6986.8 2266.0" fill="none" data-name="PasswordTextField"></path>
+					<g data-name="PublishConfirmationDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
+							<rect x="20274.8" y="2265.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
+							<path d="M20274.8 2296.0 L20498.8 2296.0" fill="none" data-name="PublishConfirmationDialog"></path>
 						</g>
-						<g transform="translate(6507.75, 2235)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
+						<g transform="translate(20274.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
+								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6507.75, 2266)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
+						<g transform="translate(20274.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<rect x="3959.8" y="3156.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
+					<g data-name="FrameControlsWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
+							<rect x="11577.0" y="1329.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
+							<path d="M11577.0 1360.0 L11868.0 1360.0" fill="none" data-name="FrameControlsWidget"></path>
+							<path d="M11577.0 1421.0 L11868.0 1421.0" fill="none" data-name="FrameControlsWidget"></path>
 						</g>
-						<g transform="translate(3959.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
+						<g transform="translate(11577, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
+								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SignupForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
-							<rect x="4364.0" y="2234.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
-							<path d="M4364.0 2265.5 L4642.0 2265.5" fill="none" data-name="SignupForm"></path>
-							<path d="M4364.0 2296.5 L4642.0 2296.5" fill="none" data-name="SignupForm"></path>
-						</g>
-						<g transform="translate(4364, 2234.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
-								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
+						<g transform="translate(11577, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4364, 2265.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
+						<g transform="translate(11577, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4364, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
+					</g>
+					<g data-name="ConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
+							<rect x="17414.3" y="1009.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+						</g>
+						<g transform="translate(17414.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyUJobsToBeDone">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
-							<rect x="31826.0" y="60.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
-							<path d="M31826.0 91.5 L32020.0 91.5" fill="none" data-name="StudyUJobsToBeDone"></path>
+					<g data-name="IStudyStatusBadgeViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
+							<rect x="7961.8" y="1352.0" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
+							<path d="M7961.8 1383.0 L8246.8 1383.0" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
 						</g>
-						<g transform="translate(31826, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
+						<g transform="translate(7961.75, 1352)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
+								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31826, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
+						<g transform="translate(7961.75, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
-							<rect x="5489.0" y="1329.5" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
-							<path d="M5489.0 1360.5 L5748.0 1360.5" fill="none" data-name="AuthScaffold"></path>
+					<g data-name="Participation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
+							<rect x="9675.8" y="2280.5" height="31.0" width="114.0" data-name="Participation"></rect>
 						</g>
-						<g transform="translate(5489, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
+						<g transform="translate(9675.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
+								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5489, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
+					</g>
+					<g data-name="StudyStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
+							<rect x="8311.8" y="2280.5" height="31.0" width="111.0" data-name="StudyStatus"></rect>
+						</g>
+						<g transform="translate(8311.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
+								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EdgeInsets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="7437.8" y="2280.5" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
+					<g data-name="StudyStatusBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
+							<rect x="8286.8" y="1314.0" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
+							<path d="M8286.8 1345.0 L8527.8 1345.0" fill="none" data-name="StudyStatusBadge"></path>
+							<path d="M8286.8 1436.0 L8527.8 1436.0" fill="none" data-name="StudyStatusBadge"></path>
 						</g>
-						<g transform="translate(7437.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
+						<g transform="translate(8286.75, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
+								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PublishDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
-							<rect x="10738.8" y="2265.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
-							<path d="M10738.8 2296.0 L10874.8 2296.0" fill="none" data-name="PublishDialog"></path>
-						</g>
-						<g transform="translate(10738.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
+						<g transform="translate(8286.75, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10738.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
+						<g transform="translate(8286.75, 1436)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PublishSuccessDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
-							<rect x="11605.8" y="2265.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
-							<path d="M11605.8 2296.0 L11796.8 2296.0" fill="none" data-name="PublishSuccessDialog"></path>
+					<g data-name="BadgeType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
+							<rect x="11459.3" y="2280.5" height="31.0" width="106.0" data-name="BadgeType"></rect>
 						</g>
-						<g transform="translate(11605.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
+						<g transform="translate(11459.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
+								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11605.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
+					</g>
+					<g data-name="RouteInformation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
+							<rect x="8572.8" y="2227.0" height="138.0" width="152.0" data-name="RouteInformation"></rect>
+							<path d="M8572.8 2258.0 L8724.8 2258.0" fill="none" data-name="RouteInformation"></path>
+							<path d="M8572.8 2334.0 L8724.8 2334.0" fill="none" data-name="RouteInformation"></path>
+						</g>
+						<g transform="translate(8572.75, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PublishConfirmationDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
-							<rect x="11836.8" y="2265.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
-							<path d="M11836.8 2296.0 L12060.8 2296.0" fill="none" data-name="PublishConfirmationDialog"></path>
-						</g>
-						<g transform="translate(11836.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
+						<g transform="translate(8572.75, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11836.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
+						<g transform="translate(8572.75, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormArrayTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
-							<rect x="6362.5" y="1194.0" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
-							<path d="M6362.5 1225.0 L6852.5 1225.0" fill="none" data-name="FormArrayTable"></path>
-							<path d="M6362.5 1526.0 L6852.5 1526.0" fill="none" data-name="FormArrayTable"></path>
+					<g data-name="PlatformController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
+							<rect x="8567.8" y="1261.5" height="258.0" width="302.0" data-name="PlatformController"></rect>
+							<path d="M8567.8 1292.5 L8869.8 1292.5" fill="none" data-name="PlatformController"></path>
+							<path d="M8567.8 1383.5 L8869.8 1383.5" fill="none" data-name="PlatformController"></path>
 						</g>
-						<g transform="translate(6362.5, 1194)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
-								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
+						<g transform="translate(8567.75, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
+								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6362.5, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
+						<g transform="translate(8567.75, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6362.5, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
+						<g transform="translate(8567.75, 1383.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="6043.8" y="3156.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+					<g data-name="WebController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
+							<rect x="9829.8" y="2197.0" height="198.0" width="273.0" data-name="WebController"></rect>
+							<path d="M9829.8 2228.0 L10102.8 2228.0" fill="none" data-name="WebController"></path>
+							<path d="M9829.8 2259.0 L10102.8 2259.0" fill="none" data-name="WebController"></path>
 						</g>
-						<g transform="translate(6043.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
+						<g transform="translate(9829.75, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
+								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="5962.8" y="2280.5" height="31.0" width="144.0" data-name="void Function(T)"></rect>
-						</g>
-						<g transform="translate(5962.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
+						<g transform="translate(9829.75, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<rect x="7026.8" y="2280.5" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
-						</g>
-						<g transform="translate(7026.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
+						<g transform="translate(9829.75, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="String Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
-							<rect x="7582.8" y="2280.5" height="31.0" width="157.0" data-name="String Function(T)"></rect>
+					<g data-name="IFrameElement">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
+							<rect x="11087.8" y="3156.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
 						</g>
-						<g transform="translate(7582.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
+						<g transform="translate(11087.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
+								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="20068.5" y="2280.5" height="31.0" width="87.0" data-name="IconData"></rect>
+					<g data-name="MobileController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
+							<rect x="10142.8" y="2212.5" height="167.0" width="191.0" data-name="MobileController"></rect>
+							<path d="M10142.8 2243.5 L10333.8 2243.5" fill="none" data-name="MobileController"></path>
 						</g>
-						<g transform="translate(20068.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
+						<g transform="translate(10142.75, 2212.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
-							<rect x="7779.8" y="2280.5" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
-						</g>
-						<g transform="translate(7779.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
-								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
+						<g transform="translate(10142.75, 2243.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
+								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="27025.8" y="493.0" height="93.0" width="163.0" data-name="IFormData"></rect>
-							<path d="M27025.8 524.0 L27188.8 524.0" fill="none" data-name="IFormData"></path>
-							<path d="M27025.8 555.0 L27188.8 555.0" fill="none" data-name="IFormData"></path>
+					<g data-name="StudyController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
+							<rect x="4250.3" y="2182.0" height="228.0" width="573.0" data-name="StudyController"></rect>
+							<path d="M4250.3 2213.0 L4823.3 2213.0" fill="none" data-name="StudyController"></path>
+							<path d="M4250.3 2274.0 L4823.3 2274.0" fill="none" data-name="StudyController"></path>
 						</g>
-						<g transform="translate(27025.75, 493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
+						<g transform="translate(4250.25, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
+								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27025.75, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
+						<g transform="translate(4250.25, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27025.75, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
+						<g transform="translate(4250.25, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="40430.3" y="1359.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
-							<path d="M40430.3 1390.5 L40826.3 1390.5" fill="none" data-name="ManagedFormViewModel"></path>
+					<g data-name="IStudyNavViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
+							<rect x="8909.8" y="1322.0" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
+							<path d="M8909.8 1353.0 L9150.8 1353.0" fill="none" data-name="IStudyNavViewModel"></path>
 						</g>
-						<g transform="translate(40430.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
+						<g transform="translate(8909.75, 1322)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
+								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40430.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
+						<g transform="translate(8909.75, 1353)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
-							<rect x="26210.8" y="524.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
+					<g data-name="StudyNav">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
+							<rect x="45518.5" y="23.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
+							<path d="M45518.5 54.0 L45751.5 54.0" fill="none" data-name="StudyNav"></path>
 						</g>
-						<g transform="translate(26210.75, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
+						<g transform="translate(45518.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Exception">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="27979.3" y="76.0" height="31.0" width="94.0" data-name="Exception"></rect>
-						</g>
-						<g transform="translate(27979.25, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
+						<g transform="translate(45518.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="36808.3" y="3378.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
-							<path d="M36808.3 3409.0 L37089.3 3409.0" fill="none" data-name="FormViewModelCollection"></path>
-							<path d="M36808.3 3500.0 L37089.3 3500.0" fill="none" data-name="FormViewModelCollection"></path>
-						</g>
-						<g transform="translate(36808.25, 3378)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
+					<g data-name="StudyDesignNav">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
+							<rect x="45791.5" y="23.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
+							<path d="M45791.5 54.0 L46079.5 54.0" fill="none" data-name="StudyDesignNav"></path>
 						</g>
-						<g transform="translate(36808.25, 3409)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
+						<g transform="translate(45791.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
+								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36808.25, 3500)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
+						<g transform="translate(45791.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="35471.8" y="3691.0" height="31.0" width="98.0" data-name="FormArray"></rect>
+					<g data-name="IWithBanner">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
+							<rect x="20933.3" y="1009.5" height="31.0" width="113.0" data-name="IWithBanner"></rect>
 						</g>
-						<g transform="translate(35471.75, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
+						<g transform="translate(20933.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormInvalidException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
-							<rect x="31561.5" y="524.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
+					<g data-name="StudyParticipationBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
+							<rect x="9190.8" y="1321.5" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
+							<path d="M9190.8 1352.5 L9421.8 1352.5" fill="none" data-name="StudyParticipationBadge"></path>
+							<path d="M9190.8 1428.5 L9421.8 1428.5" fill="none" data-name="StudyParticipationBadge"></path>
 						</g>
-						<g transform="translate(31561.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
+						<g transform="translate(9190.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
+								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormConfigException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
-							<rect x="31787.5" y="508.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
-							<path d="M31787.5 539.5 L31972.5 539.5" fill="none" data-name="FormConfigException"></path>
-						</g>
-						<g transform="translate(31787.5, 508.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
-								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
+						<g transform="translate(9190.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31787.5, 539.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
+						<g transform="translate(9190.75, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="41152.3" y="986.5" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-							<path d="M41152.3 1017.5 L41369.3 1017.5" fill="none" data-name="IFormViewModelDelegate"></path>
-						</g>
-						<g transform="translate(41152.25, 986.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
+					<g data-name="IStudyRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
+							<rect x="33238.0" y="3156.0" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
 						</g>
-						<g transform="translate(41152.25, 1017.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
+						<g transform="translate(33238, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
+								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControlOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
-							<rect x="42483.8" y="486.0" height="107.0" width="190.0" data-name="FormControlOption"></rect>
-							<path d="M42483.8 517.0 L42673.8 517.0" fill="none" data-name="FormControlOption"></path>
+					<g data-name="PreviewFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
+							<rect x="46119.5" y="45.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
+							<path d="M46119.5 76.5 L46410.5 76.5" fill="none" data-name="PreviewFrame"></path>
 						</g>
-						<g transform="translate(42483.75, 486)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
+						<g transform="translate(46119.5, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
+								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42483.75, 517)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
+						<g transform="translate(46119.5, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="42530.8" y="76.0" height="31.0" width="96.0" data-name="Equatable"></rect>
+					<g data-name="StudyFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
+							<rect x="46173.0" y="524.0" height="31.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(42530.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
+						<g transform="translate(46173, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
+								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
-							<rect x="28695.5" y="3110.5" height="122.0" width="282.0" data-name="FormMode"></rect>
-							<path d="M28695.5 3141.5 L28977.5 3141.5" fill="none" data-name="FormMode"></path>
+					<g data-name="IStudyAppBarViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
+							<rect x="8908.8" y="2250.0" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
+							<path d="M8908.8 2281.0 L9151.8 2281.0" fill="none" data-name="IStudyAppBarViewModel"></path>
 						</g>
-						<g transform="translate(28695.5, 3110.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
+						<g transform="translate(8908.75, 2250)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
+								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28695.5, 3141.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
+						<g transform="translate(8908.75, 2281)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormValidationSetEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
-							<rect x="40907.3" y="1009.5" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
+					<g data-name="StudyScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
+							<rect x="24559.0" y="904.0" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
+							<path d="M24559.0 935.0 L24894.0 935.0" fill="none" data-name="StudyScaffold"></path>
+						</g>
+						<g transform="translate(24559, 904)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
+								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
+								
+							</g>
 						</g>
-						<g transform="translate(40907.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
-								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
+						<g transform="translate(24559, 935)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Debouncer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="40931.3" y="3691.0" height="31.0" width="103.0" data-name="Debouncer"></rect>
+					<g data-name="NavbarTab">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
+							<rect x="24629.3" y="1375.0" height="31.0" width="103.0" data-name="NavbarTab"></rect>
 						</g>
-						<g transform="translate(40931.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
+						<g transform="translate(24629.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
+								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CancelableOperation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="42851.0" y="1009.5" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
+					<g data-name="SingleColumnLayoutType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
+							<rect x="24812.3" y="1375.0" height="31.0" width="218.0" data-name="SingleColumnLayoutType"></rect>
 						</g>
-						<g transform="translate(42851, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
+						<g transform="translate(24812.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
+								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CustomFormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
-							<rect x="33324.3" y="3430.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
-							<path d="M33324.3 3461.5 L33737.3 3461.5" fill="none" data-name="CustomFormControl"></path>
-							<path d="M33324.3 3567.5 L33737.3 3567.5" fill="none" data-name="CustomFormControl"></path>
+					<g data-name="WebFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
+							<rect x="46450.5" y="37.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
+							<path d="M46450.5 68.5 L46619.5 68.5" fill="none" data-name="WebFrame"></path>
+							<path d="M46450.5 114.5 L46619.5 114.5" fill="none" data-name="WebFrame"></path>
 						</g>
-						<g transform="translate(33324.25, 3430.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
+						<g transform="translate(46450.5, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
+								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33324.25, 3461.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
+						<g transform="translate(46450.5, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33324.25, 3567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
+						<g transform="translate(46450.5, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(T?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
-							<rect x="26875.0" y="3691.0" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
+					<g data-name="DisabledFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
+							<rect x="46659.5" y="60.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
+							<path d="M46659.5 91.5 L46795.5 91.5" fill="none" data-name="DisabledFrame"></path>
 						</g>
-						<g transform="translate(26875, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
+						<g transform="translate(46659.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(ControlStatus)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
-							<rect x="28313.8" y="3691.0" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
-						</g>
-						<g transform="translate(28313.75, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
+						<g transform="translate(46659.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="UnsavedChangesDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
-							<rect x="42666.8" y="60.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
-							<path d="M42666.8 91.5 L42873.8 91.5" fill="none" data-name="UnsavedChangesDialog"></path>
+					<g data-name="PhoneContainer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
+							<rect x="10182.0" y="1284.0" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
+							<path d="M10182.0 1315.0 L10509.0 1315.0" fill="none" data-name="PhoneContainer"></path>
+							<path d="M10182.0 1466.0 L10509.0 1466.0" fill="none" data-name="PhoneContainer"></path>
 						</g>
-						<g transform="translate(42666.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
+						<g transform="translate(10182, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
+								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42666.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
+						<g transform="translate(10182, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
+								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(10182, 1466)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
+								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControlValidation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
-							<rect x="9288.8" y="2227.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
-							<path d="M9288.8 2258.0 L9773.8 2258.0" fill="none" data-name="FormControlValidation"></path>
-							<path d="M9288.8 2334.0 L9773.8 2334.0" fill="none" data-name="FormControlValidation"></path>
+					<g data-name="Color">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
+							<rect x="20778.8" y="2280.5" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(9288.75, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
-								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
+						<g transform="translate(20778.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
+								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9288.75, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
+					</g>
+					<g data-name="MobileFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
+							<rect x="46835.5" y="60.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
+							<path d="M46835.5 91.5 L46971.5 91.5" fill="none" data-name="MobileFrame"></path>
+						</g>
+						<g transform="translate(46835.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9288.75, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
+						<g transform="translate(46835.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="24236.0" y="3005.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M24236.0 3036.0 L24798.0 3036.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M24236.0 3217.0 L24798.0 3217.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(24236, 3005)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
-								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
-								
-							</g>
+					<g data-name="DesktopFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
+							<rect x="47011.5" y="60.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
+							<path d="M47011.5 91.5 L47147.5 91.5" fill="none" data-name="DesktopFrame"></path>
 						</g>
-						<g transform="translate(24236, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+						<g transform="translate(47011.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24236, 3217)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
+						<g transform="translate(47011.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="19015.5" y="1627.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M19015.5 1658.0 L20028.5 1658.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M19015.5 2679.0 L20028.5 2679.0" fill="none" data-name="QuestionFormViewModel"></path>
+					<g data-name="StudyTestScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
+							<rect x="20538.8" y="2219.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
+							<path d="M20538.8 2250.5 L20738.8 2250.5" fill="none" data-name="StudyTestScreen"></path>
+							<path d="M20538.8 2281.5 L20738.8 2281.5" fill="none" data-name="StudyTestScreen"></path>
 						</g>
-						<g transform="translate(19015.5, 1627)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
+						<g transform="translate(20538.75, 2219.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
+								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19015.5, 1658)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(20538.75, 2250.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19015.5, 2679)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
+						<g transform="translate(20538.75, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IScreenerQuestionLogicFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="10053.8" y="2265.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M10053.8 2296.0 L10385.8 2296.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
+					<g data-name="StudySettingsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
+							<rect x="44301.3" y="2167.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
+							<path d="M44301.3 2198.0 L44780.3 2198.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+							<path d="M44301.3 2334.0 L44780.3 2334.0" fill="none" data-name="StudySettingsFormViewModel"></path>
 						</g>
-						<g transform="translate(10053.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
+						<g transform="translate(44301.25, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10053.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+						<g transform="translate(44301.25, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyDesignEnrollmentFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="6929.5" y="3125.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M6929.5 3156.5 L7378.5 3156.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
-						</g>
-						<g transform="translate(6929.5, 3125.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
+						<g transform="translate(44301.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6929.5, 3156.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
+					</g>
+					<g data-name="AsyncValue">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
+							<rect x="44362.0" y="3156.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
+						</g>
+						<g transform="translate(44362, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="12189.0" y="2265.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M12189.0 2296.0 L12401.0 2296.0" fill="none" data-name="StudyDesignPageWidget"></path>
+					<g data-name="StudySettingsDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
+							<rect x="20876.8" y="2265.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
+							<path d="M20876.8 2296.0 L21051.8 2296.0" fill="none" data-name="StudySettingsDialog"></path>
 						</g>
-						<g transform="translate(12189, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
+						<g transform="translate(20876.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
+								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12189, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
+						<g transform="translate(20876.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionLogicFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="33095.5" y="2227.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M33095.5 2258.0 L33519.5 2258.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M33095.5 2289.0 L33519.5 2289.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+					<g data-name="StudyTestController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
+							<rect x="6535.3" y="2257.5" height="77.0" width="282.0" data-name="StudyTestController"></rect>
+							<path d="M6535.3 2288.5 L6817.3 2288.5" fill="none" data-name="StudyTestController"></path>
 						</g>
-						<g transform="translate(33095.5, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
-								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
+						<g transform="translate(6535.25, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33095.5, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
+						<g transform="translate(6535.25, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33095.5, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
+					</g>
+					<g data-name="TestAppRoutes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
+							<rect x="47187.5" y="23.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
+							<path d="M47187.5 54.0 L47447.5 54.0" fill="none" data-name="TestAppRoutes"></path>
+						</g>
+						<g transform="translate(47187.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
+								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="38130.5" y="524.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
-						</g>
-						<g transform="translate(38130.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
+						<g transform="translate(47187.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
+								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="16970.0" y="941.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M16970.0 972.0 L17228.0 972.0" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M16970.0 1063.0 L17228.0 1063.0" fill="none" data-name="ConsentItemFormData"></path>
+					<g data-name="DrawerEntry">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
+							<rect x="25247.8" y="926.0" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
+							<path d="M25247.8 957.0 L25692.8 957.0" fill="none" data-name="DrawerEntry"></path>
+							<path d="M25247.8 1093.0 L25692.8 1093.0" fill="none" data-name="DrawerEntry"></path>
 						</g>
-						<g transform="translate(16970, 941)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
+						<g transform="translate(25247.75, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
+								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16970, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
+						<g transform="translate(25247.75, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DrawerEntry">+localizedHelpText: String Function()?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DrawerEntry">+enabled: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DrawerEntry">+onSelected: void Function(BuildContext, WidgetRef)?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DrawerEntry">+autoCloseDrawer: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DrawerEntry">+title: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="DrawerEntry">+helpText: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16970, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
+						<g transform="translate(25247.75, 1093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="34033.3" y="2047.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M34033.3 2078.0 L34935.3 2078.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M34033.3 2304.0 L34935.3 2304.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+					<g data-name="String Function()">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
+							<rect x="25070.3" y="1375.0" height="31.0" width="147.0" data-name="String Function()"></rect>
 						</g>
-						<g transform="translate(34033.25, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
-								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
+						<g transform="translate(25070.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
+								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34033.25, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
+					</g>
+					<g data-name="String Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
+							<rect x="25718.3" y="1375.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
 						</g>
-						<g transform="translate(34033.25, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
+						<g transform="translate(25718.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
+								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="36828.0" y="3156.0" height="31.0" width="61.0" data-name="Study"></rect>
+					<g data-name="void Function(BuildContext, WidgetRef)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
+							<rect x="25915.3" y="1375.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
 						</g>
-						<g transform="translate(36828, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
+						<g transform="translate(25915.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
+								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormConsentItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="33627.3" y="3065.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M33627.3 3096.0 L34427.3 3096.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M33627.3 3172.0 L34427.3 3172.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+					<g data-name="GoRouterDrawerEntry">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
+							<rect x="26291.3" y="1336.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
+							<path d="M26291.3 1367.5 L26555.3 1367.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+							<path d="M26291.3 1413.5 L26555.3 1413.5" fill="none" data-name="GoRouterDrawerEntry"></path>
 						</g>
-						<g transform="translate(33627.25, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
+						<g transform="translate(26291.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
+								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33627.25, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
+						<g transform="translate(26291.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33627.25, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
+						<g transform="translate(26291.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="36892.3" y="1261.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M36892.3 1292.5 L37524.3 1292.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M36892.3 1398.5 L37524.3 1398.5" fill="none" data-name="WithQuestionnaireControls"></path>
+					<g data-name="RoutingIntent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
+							<rect x="27858.8" y="2280.5" height="31.0" width="122.0" data-name="RoutingIntent"></rect>
 						</g>
-						<g transform="translate(36892.25, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
+						<g transform="translate(27858.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
+								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36892.25, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
+					</g>
+					<g data-name="AppDrawer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
+							<rect x="47487.5" y="8.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
+							<path d="M47487.5 39.0 L47756.5 39.0" fill="none" data-name="AppDrawer"></path>
 						</g>
-						<g transform="translate(36892.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
+						<g transform="translate(47487.5, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
+								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="9006.8" y="1375.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(9006.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
+						<g transform="translate(47487.5, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppDrawer">+leftPaddingEntries: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AppDrawer">+logoPaddingVertical: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AppDrawer">+logoPaddingHorizontal: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AppDrawer">+logoMaxHeight: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AppDrawer">+logoSectionMinHeight: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AppDrawer">+logoSectionMaxHeight: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="25276.3" y="1009.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
+					<g data-name="StudyAnalyzeScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
+							<rect x="22118.8" y="2257.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
+							<path d="M22118.8 2288.5 L22298.8 2288.5" fill="none" data-name="StudyAnalyzeScreen"></path>
 						</g>
-						<g transform="translate(25276.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
+						<g transform="translate(22118.75, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
+								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ConsentItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="24811.0" y="2167.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M24811.0 2198.0 L25507.0 2198.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M24811.0 2364.0 L25507.0 2364.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-						</g>
-						<g transform="translate(24811, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
+						<g transform="translate(22118.75, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24811, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+					</g>
+					<g data-name="StudyAnalyzeController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
+							<rect x="6857.3" y="2265.0" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
+							<path d="M6857.3 2296.0 L7058.3 2296.0" fill="none" data-name="StudyAnalyzeController"></path>
+						</g>
+						<g transform="translate(6857.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
+								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24811, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
+						<g transform="translate(6857.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="9350.8" y="1359.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M9350.8 1390.5 L9731.8 1390.5" fill="none" data-name="ConsentItemFormView"></path>
+					<g data-name="StudyDesignInterventionsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
+							<rect x="13993.5" y="3140.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
+							<path d="M13993.5 3171.5 L14289.5 3171.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
 						</g>
-						<g transform="translate(9350.75, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
+						<g transform="translate(13993.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9350.75, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
+						<g transform="translate(13993.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="18128.5" y="1306.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M18128.5 1337.5 L18582.5 1337.5" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M18128.5 1428.5 L18582.5 1428.5" fill="none" data-name="EnrollmentFormData"></path>
+					<g data-name="StudyDesignPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
+							<rect x="22338.8" y="2265.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
+							<path d="M22338.8 2296.0 L22550.8 2296.0" fill="none" data-name="StudyDesignPageWidget"></path>
 						</g>
-						<g transform="translate(18128.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
-								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
+						<g transform="translate(22338.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
+								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18128.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
+						<g transform="translate(22338.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18128.5, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
+					</g>
+					<g data-name="InterventionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
+							<rect x="12278.0" y="1359.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
+							<path d="M12278.0 1390.5 L12653.0 1390.5" fill="none" data-name="InterventionFormView"></path>
+						</g>
+						<g transform="translate(12278, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
+								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(12278, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="26922.0" y="2227.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M26922.0 2258.0 L27290.0 2258.0" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M26922.0 2304.0 L27290.0 2304.0" fill="none" data-name="QuestionnaireFormData"></path>
+					<g data-name="InterventionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
+							<rect x="28020.8" y="2062.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
+							<path d="M28020.8 2093.0 L28875.8 2093.0" fill="none" data-name="InterventionFormViewModel"></path>
+							<path d="M28020.8 2319.0 L28875.8 2319.0" fill="none" data-name="InterventionFormViewModel"></path>
 						</g>
-						<g transform="translate(26922, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
+						<g transform="translate(28020.75, 2062)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
+								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26922, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
+						<g transform="translate(28020.75, 2093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26922, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
+						<g transform="translate(28020.75, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="20452.5" y="994.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M20452.5 1025.0 L20595.5 1025.0" fill="none" data-name="IStudyFormData"></path>
+					<g data-name="InterventionPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
+							<rect x="11908.0" y="1344.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
+							<path d="M11908.0 1375.0 L12238.0 1375.0" fill="none" data-name="InterventionPreview"></path>
+							<path d="M11908.0 1406.0 L12238.0 1406.0" fill="none" data-name="InterventionPreview"></path>
 						</g>
-						<g transform="translate(20452.5, 994)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
+						<g transform="translate(11908, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20452.5, 1025)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
+						<g transform="translate(11908, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyDesignInterventionsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="7418.5" y="3140.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M7418.5 3171.5 L7714.5 3171.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
-						</g>
-						<g transform="translate(7418.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
+						<g transform="translate(11908, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7418.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
+					</g>
+					<g data-name="InterventionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
+							<rect x="11186.3" y="2280.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
+						</g>
+						<g transform="translate(11186.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="36249.3" y="2107.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M36249.3 2138.0 L37088.3 2138.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M36249.3 2289.0 L37088.3 2289.0" fill="none" data-name="InterventionsFormViewModel"></path>
+					<g data-name="StudyScheduleFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
+							<rect x="37116.5" y="971.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
+							<path d="M37116.5 1002.0 L37475.5 1002.0" fill="none" data-name="StudyScheduleFormView"></path>
+							<path d="M37116.5 1033.0 L37475.5 1033.0" fill="none" data-name="StudyScheduleFormView"></path>
 						</g>
-						<g transform="translate(36249.25, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
-								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
+						<g transform="translate(37116.5, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
+								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36249.25, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
+						<g transform="translate(37116.5, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36249.25, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
+						<g transform="translate(37116.5, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="StudyScheduleControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="35810.3" y="1194.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M35810.3 1225.0 L36568.3 1225.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M35810.3 1526.0 L36568.3 1526.0" fill="none" data-name="StudyScheduleControls"></path>
+							<rect x="36917.0" y="1194.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
+							<path d="M36917.0 1225.0 L37675.0 1225.0" fill="none" data-name="StudyScheduleControls"></path>
+							<path d="M36917.0 1526.0 L37675.0 1526.0" fill="none" data-name="StudyScheduleControls"></path>
 						</g>
-						<g transform="translate(35810.25, 1194)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
+						<g transform="translate(36917, 1194)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
 								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35810.25, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+						<g transform="translate(36917, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
@@ -6176,7 +6148,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(35810.25, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+						<g transform="translate(36917, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
@@ -6185,69 +6157,19 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="25547.0" y="2062.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M25547.0 2093.0 L26402.0 2093.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M25547.0 2319.0 L26402.0 2319.0" fill="none" data-name="InterventionFormViewModel"></path>
-						</g>
-						<g transform="translate(25547, 2062)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
-								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25547, 2093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25547, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
 					<g data-name="InterventionTaskFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="31577.5" y="1306.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M31577.5 1337.5 L31867.5 1337.5" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M31577.5 1428.5 L31867.5 1428.5" fill="none" data-name="InterventionTaskFormData"></path>
+							<rect x="34955.0" y="1306.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
+							<path d="M34955.0 1337.5 L35245.0 1337.5" fill="none" data-name="InterventionTaskFormData"></path>
+							<path d="M34955.0 1428.5 L35245.0 1428.5" fill="none" data-name="InterventionTaskFormData"></path>
 						</g>
-						<g transform="translate(31577.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
+						<g transform="translate(34955, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
 								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31577.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+						<g transform="translate(34955, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
@@ -6257,7 +6179,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(31577.5, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+						<g transform="translate(34955, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
@@ -6267,17 +6189,17 @@
 					</g>
 					<g data-name="IFormDataWithSchedule">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="31768.3" y="941.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M31768.3 972.0 L32066.3 972.0" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M31768.3 1078.0 L32066.3 1078.0" fill="none" data-name="IFormDataWithSchedule"></path>
+							<rect x="35145.8" y="941.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
+							<path d="M35145.8 972.0 L35443.8 972.0" fill="none" data-name="IFormDataWithSchedule"></path>
+							<path d="M35145.8 1078.0 L35443.8 1078.0" fill="none" data-name="IFormDataWithSchedule"></path>
 						</g>
-						<g transform="translate(31768.25, 941)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
+						<g transform="translate(35145.75, 941)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
 								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31768.25, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+						<g transform="translate(35145.75, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
 								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
@@ -6288,105 +6210,92 @@
 								
 							</g>
 						</g>
-						<g transform="translate(31768.25, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+						<g transform="translate(35145.75, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="20445.5" y="2197.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M20445.5 2228.0 L20741.5 2228.0" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M20445.5 2334.0 L20741.5 2334.0" fill="none" data-name="StudyScheduleFormData"></path>
-						</g>
-						<g transform="translate(20445.5, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20445.5, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20445.5, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PhaseSequence">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="30395.5" y="3156.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
-						</g>
-						<g transform="translate(30395.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
-								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="8086.3" y="1344.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M8086.3 1375.0 L8416.3 1375.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M8086.3 1406.0 L8416.3 1406.0" fill="none" data-name="InterventionPreview"></path>
+					<g data-name="InterventionsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
+							<rect x="37629.3" y="2107.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
+							<path d="M37629.3 2138.0 L38468.3 2138.0" fill="none" data-name="InterventionsFormViewModel"></path>
+							<path d="M37629.3 2289.0 L38468.3 2289.0" fill="none" data-name="InterventionsFormViewModel"></path>
 						</g>
-						<g transform="translate(8086.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
+						<g transform="translate(37629.25, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
+								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8086.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
+						<g transform="translate(37629.25, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8086.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
+						<g transform="translate(37629.25, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="8134.8" y="2280.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
+					<g data-name="IListActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
+							<rect x="14115.0" y="1375.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
 						</g>
-						<g transform="translate(8134.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
+						<g transform="translate(14115, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="IProviderArgsResolver">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
+							<rect x="29304.3" y="1009.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
+						</g>
+						<g transform="translate(29304.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="InterventionTaskFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="31429.5" y="2159.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M31429.5 2190.5 L32125.5 2190.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M31429.5 2371.5 L32125.5 2371.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<rect x="30844.5" y="2159.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
+							<path d="M30844.5 2190.5 L31540.5 2190.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<path d="M30844.5 2371.5 L31540.5 2371.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
 						</g>
-						<g transform="translate(31429.5, 2159.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
+						<g transform="translate(30844.5, 2159.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31429.5, 2190.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+						<g transform="translate(30844.5, 2190.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
@@ -6402,7 +6311,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(31429.5, 2371.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+						<g transform="translate(30844.5, 2371.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
@@ -6413,17 +6322,17 @@
 					</g>
 					<g data-name="WithScheduleControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="39377.3" y="1239.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M39377.3 1270.0 L39872.3 1270.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M39377.3 1496.0 L39872.3 1496.0" fill="none" data-name="WithScheduleControls"></path>
+							<rect x="41963.3" y="1239.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
+							<path d="M41963.3 1270.0 L42458.3 1270.0" fill="none" data-name="WithScheduleControls"></path>
+							<path d="M41963.3 1496.0 L42458.3 1496.0" fill="none" data-name="WithScheduleControls"></path>
 						</g>
-						<g transform="translate(39377.25, 1239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
+						<g transform="translate(41963.25, 1239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
 								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39377.25, 1270)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+						<g transform="translate(41963.25, 1270)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
@@ -6442,7 +6351,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(39377.25, 1496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+						<g transform="translate(41963.25, 1496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
@@ -6450,83 +6359,30 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="21336.5" y="1321.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M21336.5 1352.5 L21730.5 1352.5" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M21336.5 1413.5 L21730.5 1413.5" fill="none" data-name="InterventionsFormData"></path>
-						</g>
-						<g transform="translate(21336.5, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21336.5, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21336.5, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="15084.5" y="1359.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M15084.5 1390.5 L15459.5 1390.5" fill="none" data-name="InterventionFormView"></path>
-						</g>
-						<g transform="translate(15084.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
-								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15084.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="15499.5" y="1359.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M15499.5 1390.5 L15912.5 1390.5" fill="none" data-name="InterventionTaskFormView"></path>
-						</g>
-						<g transform="translate(15499.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
-								
-							</g>
+					<g data-name="PhaseSequence">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
+							<rect x="27807.3" y="3156.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
 						</g>
-						<g transform="translate(15499.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
+						<g transform="translate(27807.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
+								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="InterventionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="17268.0" y="926.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M17268.0 957.0 L17650.0 957.0" fill="none" data-name="InterventionFormData"></path>
-							<path d="M17268.0 1078.0 L17650.0 1078.0" fill="none" data-name="InterventionFormData"></path>
+							<rect x="7.8" y="926.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
+							<path d="M7.8 957.0 L389.8 957.0" fill="none" data-name="InterventionFormData"></path>
+							<path d="M7.8 1078.0 L389.8 1078.0" fill="none" data-name="InterventionFormData"></path>
 						</g>
-						<g transform="translate(17268, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
+						<g transform="translate(7.75, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
 								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17268, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+						<g transform="translate(7.75, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
@@ -6538,7 +6394,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(17268, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+						<g transform="translate(7.75, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
@@ -6546,562 +6402,348 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="36009.8" y="971.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M36009.8 1002.0 L36368.8 1002.0" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M36009.8 1033.0 L36368.8 1033.0" fill="none" data-name="StudyScheduleFormView"></path>
-						</g>
-						<g transform="translate(36009.75, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36009.75, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36009.75, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="21770.5" y="1306.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M21770.5 1337.5 L22184.5 1337.5" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M21770.5 1428.5 L22184.5 1428.5" fill="none" data-name="StudyInfoFormData"></path>
-						</g>
-						<g transform="translate(21770.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21770.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21770.5, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyContactInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="22950.3" y="2182.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M22950.3 2213.0 L23298.3 2213.0" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M22950.3 2364.0 L23298.3 2364.0" fill="none" data-name="StudyContactInfoFormData"></path>
-						</g>
-						<g transform="translate(22950.25, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
-								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22950.25, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22950.25, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignInfoFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="8145.5" y="3140.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M8145.5 3171.5 L8368.5 3171.5" fill="none" data-name="StudyDesignInfoFormView"></path>
-						</g>
-						<g transform="translate(8145.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8145.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="43488.0" y="2054.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M43488.0 2085.5 L44184.0 2085.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M43488.0 2491.5 L44184.0 2491.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-						</g>
-						<g transform="translate(43488, 2054.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43488, 2085.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43488, 2491.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="31907.5" y="1291.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M31907.5 1322.5 L32316.5 1322.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M31907.5 1443.5 L32316.5 1443.5" fill="none" data-name="MeasurementSurveyFormData"></path>
+					<g data-name="StudyScheduleFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
+							<rect x="6159.3" y="2197.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
+							<path d="M6159.3 2228.0 L6455.3 2228.0" fill="none" data-name="StudyScheduleFormData"></path>
+							<path d="M6159.3 2334.0 L6455.3 2334.0" fill="none" data-name="StudyScheduleFormData"></path>
 						</g>
-						<g transform="translate(31907.5, 1291.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
+						<g transform="translate(6159.25, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31907.5, 1322.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
+						<g transform="translate(6159.25, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31907.5, 1443.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
+						<g transform="translate(6159.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="16736.5" y="1359.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M16736.5 1390.5 L17180.5 1390.5" fill="none" data-name="MeasurementSurveyFormView"></path>
+					<g data-name="IStudyFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
+							<rect x="9065.5" y="994.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
+							<path d="M9065.5 1025.0 L9208.5 1025.0" fill="none" data-name="IStudyFormData"></path>
 						</g>
-						<g transform="translate(16736.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
+						<g transform="translate(9065.5, 994)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
+								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16736.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
+						<g transform="translate(9065.5, 1025)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="29941.8" y="2084.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M29941.8 2115.5 L30637.8 2115.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M29941.8 2341.5 L30637.8 2341.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-						</g>
-						<g transform="translate(29941.75, 2084.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
-								
-							</g>
+					<g data-name="InterventionTaskFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
+							<rect x="14749.0" y="1359.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
+							<path d="M14749.0 1390.5 L15162.0 1390.5" fill="none" data-name="InterventionTaskFormView"></path>
 						</g>
-						<g transform="translate(29941.75, 2115.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(14749, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29941.75, 2341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
+						<g transform="translate(14749, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="8456.3" y="1344.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M8456.3 1375.0 L8800.3 1375.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M8456.3 1406.0 L8800.3 1406.0" fill="none" data-name="SurveyPreview"></path>
+					<g data-name="InterventionsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
+							<rect x="7149.8" y="1321.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
+							<path d="M7149.8 1352.5 L7543.8 1352.5" fill="none" data-name="InterventionsFormData"></path>
+							<path d="M7149.8 1413.5 L7543.8 1413.5" fill="none" data-name="InterventionsFormData"></path>
 						</g>
-						<g transform="translate(8456.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
+						<g transform="translate(7149.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
+								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8456.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
+						<g transform="translate(7149.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8456.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
+						<g transform="translate(7149.75, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="8504.8" y="2280.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
+					<g data-name="StudyDesignReportsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
+							<rect x="14782.5" y="3133.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
+							<path d="M14782.5 3164.0 L15175.5 3164.0" fill="none" data-name="StudyDesignReportsFormView"></path>
 						</g>
-						<g transform="translate(8504.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
+						<g transform="translate(14782.5, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
+								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyDesignMeasurementsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="8408.5" y="3140.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M8408.5 3171.5 L8718.5 3171.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
-						</g>
-						<g transform="translate(8408.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
+						<g transform="translate(14782.5, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8408.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
+					</g>
+					<g data-name="ReportItemFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
+							<rect x="429.8" y="956.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
+							<path d="M429.8 987.0 L743.8 987.0" fill="none" data-name="ReportItemFormData"></path>
+							<path d="M429.8 1048.0 L743.8 1048.0" fill="none" data-name="ReportItemFormData"></path>
+						</g>
+						<g transform="translate(429.75, 956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
+								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="MeasurementsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="23556.3" y="1329.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M23556.3 1360.0 L24050.3 1360.0" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M23556.3 1406.0 L24050.3 1406.0" fill="none" data-name="MeasurementsFormData"></path>
-						</g>
-						<g transform="translate(23556.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
-								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
+						<g transform="translate(429.75, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23556.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
+						<g transform="translate(429.75, 1048)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23556.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
+					</g>
+					<g data-name="ReportSection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
+							<rect x="522.8" y="1375.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
+						</g>
+						<g transform="translate(522.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
+								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="37288.3" y="2114.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M37288.3 2145.5 L38380.3 2145.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M37288.3 2296.5 L38380.3 2296.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+					<g data-name="DataReferenceEditor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
+							<rect x="19349.8" y="2227.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
+							<path d="M19349.8 2258.0 L20058.8 2258.0" fill="none" data-name="DataReferenceEditor"></path>
+							<path d="M19349.8 2319.0 L20058.8 2319.0" fill="none" data-name="DataReferenceEditor"></path>
 						</g>
-						<g transform="translate(37288.25, 2114.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
-								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
+						<g transform="translate(19349.75, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
+								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37288.25, 2145.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(19349.75, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37288.25, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
+						<g transform="translate(19349.75, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormValidationSet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="2551.3" y="3133.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M2551.3 3164.0 L2938.3 3164.0" fill="none" data-name="StudyFormValidationSet"></path>
+					<g data-name="ReactiveDropdownField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
+							<rect x="13204.5" y="3156.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
 						</g>
-						<g transform="translate(2551.25, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
-								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
+						<g transform="translate(13204.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
+								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2551.25, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
+					</g>
+					<g data-name="TemporalAggregationFormatted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
+							<rect x="15986.0" y="1284.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
+							<path d="M15986.0 1315.0 L16434.0 1315.0" fill="none" data-name="TemporalAggregationFormatted"></path>
+							<path d="M15986.0 1421.0 L16434.0 1421.0" fill="none" data-name="TemporalAggregationFormatted"></path>
+						</g>
+						<g transform="translate(15986, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
+								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReportsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="41164.0" y="2122.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M41164.0 2153.0 L42024.0 2153.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M41164.0 2319.0 L42024.0 2319.0" fill="none" data-name="ReportsFormViewModel"></path>
-						</g>
-						<g transform="translate(41164, 2122)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
-								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
+						<g transform="translate(15986, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41164, 2153)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
+						<g transform="translate(15986, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41164, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
+					</g>
+					<g data-name="TemporalAggregation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
+							<rect x="17181.3" y="2280.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
+						</g>
+						<g transform="translate(17181.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
+								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportFormItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="35061.3" y="3065.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M35061.3 3096.0 L35904.3 3096.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M35061.3 3172.0 L35904.3 3172.0" fill="none" data-name="ReportFormItemDelegate"></path>
+					<g data-name="ImprovementDirectionFormatted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
+							<rect x="17089.8" y="1284.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
+							<path d="M17089.8 1315.0 L17540.8 1315.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
+							<path d="M17089.8 1421.0 L17540.8 1421.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
 						</g>
-						<g transform="translate(35061.25, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
-								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
+						<g transform="translate(17089.75, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
+								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35061.25, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
+						<g transform="translate(17089.75, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35061.25, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
+						<g transform="translate(17089.75, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="24375.3" y="956.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M24375.3 987.0 L24689.3 987.0" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M24375.3 1048.0 L24689.3 1048.0" fill="none" data-name="ReportItemFormData"></path>
+					<g data-name="ImprovementDirection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
+							<rect x="18061.3" y="2280.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
 						</g>
-						<g transform="translate(24375.25, 956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
+						<g transform="translate(18061.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
+								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24375.25, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
-								
-							</g>
+					</g>
+					<g data-name="ReportSectionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
+							<rect x="9881.3" y="3118.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
+							<path d="M9881.3 3149.0 L10264.3 3149.0" fill="none" data-name="ReportSectionType"></path>
 						</g>
-						<g transform="translate(24375.25, 1048)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
+						<g transform="translate(9881.25, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
+								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="24468.3" y="1375.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(24468.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
+						<g transform="translate(9881.25, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="18622.5" y="1306.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M18622.5 1337.5 L19089.5 1337.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M18622.5 1413.5 L19089.5 1413.5" fill="none" data-name="ReportItemFormView"></path>
+					<g data-name="AverageSectionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
+							<rect x="12693.0" y="1329.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
+							<path d="M12693.0 1360.0 L13172.0 1360.0" fill="none" data-name="AverageSectionFormView"></path>
+							<path d="M12693.0 1421.0 L13172.0 1421.0" fill="none" data-name="AverageSectionFormView"></path>
 						</g>
-						<g transform="translate(18622.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
-								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
+						<g transform="translate(12693, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18622.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
+						<g transform="translate(12693, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18622.5, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
+						<g transform="translate(12693, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ReportItemFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="20781.5" y="2009.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M20781.5 2040.5 L21768.5 2040.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M20781.5 2476.5 L21768.5 2476.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<rect x="21091.8" y="2009.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
+							<path d="M21091.8 2040.5 L22078.8 2040.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<path d="M21091.8 2476.5 L22078.8 2476.5" fill="none" data-name="ReportItemFormViewModel"></path>
 						</g>
-						<g transform="translate(20781.5, 2009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(21091.75, 2009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
 								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20781.5, 2040.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(21091.75, 2040.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
@@ -7134,7 +6776,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(20781.5, 2476.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+						<g transform="translate(21091.75, 2476.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
@@ -7146,887 +6788,1174 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="18493.5" y="2280.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
+					<g data-name="DataReferenceIdentifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
+							<rect x="47762.0" y="493.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
+							<path d="M47762.0 524.0 L47966.0 524.0" fill="none" data-name="DataReferenceIdentifier"></path>
+							<path d="M47762.0 555.0 L47966.0 555.0" fill="none" data-name="DataReferenceIdentifier"></path>
 						</g>
-						<g transform="translate(18493.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
+						<g transform="translate(47762, 493)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
+								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
+								
+							</g>
+						</g>
+						<g transform="translate(47762, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
+								
+							</g>
+						</g>
+						<g transform="translate(47762, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="4359.8" y="3118.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M4359.8 3149.0 L4742.8 3149.0" fill="none" data-name="ReportSectionType"></path>
+					<g data-name="DataReference">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
+							<rect x="47796.5" y="76.0" height="31.0" width="135.0" data-name="DataReference"></rect>
 						</g>
-						<g transform="translate(4359.75, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
+						<g transform="translate(47796.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
+								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4359.75, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
+					</g>
+					<g data-name="LinearRegressionSectionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
+							<rect x="13212.0" y="1329.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
+							<path d="M13212.0 1360.0 L13691.0 1360.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<path d="M13212.0 1421.0 L13691.0 1421.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+						</g>
+						<g transform="translate(13212, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(13212, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(13212, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="19129.5" y="1284.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M19129.5 1315.0 L19577.5 1315.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M19129.5 1421.0 L19577.5 1421.0" fill="none" data-name="TemporalAggregationFormatted"></path>
+					<g data-name="ReportItemFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
+							<rect x="21918.5" y="1306.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
+							<path d="M21918.5 1337.5 L22385.5 1337.5" fill="none" data-name="ReportItemFormView"></path>
+							<path d="M21918.5 1413.5 L22385.5 1413.5" fill="none" data-name="ReportItemFormView"></path>
 						</g>
-						<g transform="translate(19129.5, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
+						<g transform="translate(21918.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
+								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19129.5, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
+						<g transform="translate(21918.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19129.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
+						<g transform="translate(21918.5, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="18789.5" y="2280.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
+					<g data-name="Widget Function(BuildContext)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
+							<rect x="22590.8" y="2280.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
 						</g>
-						<g transform="translate(18789.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
+						<g transform="translate(22590.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
+								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="20328.3" y="1284.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M20328.3 1315.0 L20779.3 1315.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M20328.3 1421.0 L20779.3 1421.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
+					<g data-name="ReportsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
+							<rect x="43057.8" y="2122.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
+							<path d="M43057.8 2153.0 L43917.8 2153.0" fill="none" data-name="ReportsFormViewModel"></path>
+							<path d="M43057.8 2319.0 L43917.8 2319.0" fill="none" data-name="ReportsFormViewModel"></path>
 						</g>
-						<g transform="translate(20328.25, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
+						<g transform="translate(43057.75, 2122)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
+								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20328.25, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
+						<g transform="translate(43057.75, 2153)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20328.25, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
+						<g transform="translate(43057.75, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="20195.5" y="2280.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
+					<g data-name="ReportFormItemDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
+							<rect x="38461.8" y="3065.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
+							<path d="M38461.8 3096.0 L39304.8 3096.0" fill="none" data-name="ReportFormItemDelegate"></path>
+							<path d="M38461.8 3172.0 L39304.8 3172.0" fill="none" data-name="ReportFormItemDelegate"></path>
 						</g>
-						<g transform="translate(20195.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
+						<g transform="translate(38461.75, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
+								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
+								
+							</g>
+						</g>
+						<g transform="translate(38461.75, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
+								
+							</g>
+						</g>
+						<g transform="translate(38461.75, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="12834.5" y="1329.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M12834.5 1360.0 L13313.5 1360.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M12834.5 1421.0 L13313.5 1421.0" fill="none" data-name="AverageSectionFormView"></path>
+					<g data-name="ReportBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
+							<rect x="22890.3" y="1321.5" height="138.0" width="197.0" data-name="ReportBadge"></rect>
+							<path d="M22890.3 1352.5 L23087.3 1352.5" fill="none" data-name="ReportBadge"></path>
+							<path d="M22890.3 1428.5 L23087.3 1428.5" fill="none" data-name="ReportBadge"></path>
 						</g>
-						<g transform="translate(12834.5, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
+						<g transform="translate(22890.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12834.5, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+						<g transform="translate(22890.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12834.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
+						<g transform="translate(22890.25, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="13353.5" y="1329.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M13353.5 1360.0 L13832.5 1360.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M13353.5 1421.0 L13832.5 1421.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+					<g data-name="ReportStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
+							<rect x="12441.5" y="3118.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
+							<path d="M12441.5 3149.0 L12742.5 3149.0" fill="none" data-name="ReportStatus"></path>
 						</g>
-						<g transform="translate(13353.5, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
+						<g transform="translate(12441.5, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
+								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
+								
+							</g>
+						</g>
+						<g transform="translate(12441.5, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ReportsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
+							<rect x="7583.8" y="1329.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
+							<path d="M7583.8 1360.0 L7921.8 1360.0" fill="none" data-name="ReportsFormData"></path>
+							<path d="M7583.8 1406.0 L7921.8 1406.0" fill="none" data-name="ReportsFormData"></path>
+						</g>
+						<g transform="translate(7583.75, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
+								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13353.5, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+						<g transform="translate(7583.75, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13353.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
+						<g transform="translate(7583.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="42879.3" y="493.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M42879.3 524.0 L43083.3 524.0" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M42879.3 555.0 L43083.3 555.0" fill="none" data-name="DataReferenceIdentifier"></path>
+					<g data-name="StudyInfoFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
+							<rect x="44980.3" y="2054.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
+							<path d="M44980.3 2085.5 L45676.3 2085.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+							<path d="M44980.3 2491.5 L45676.3 2491.5" fill="none" data-name="StudyInfoFormViewModel"></path>
 						</g>
-						<g transform="translate(42879.25, 493)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
+						<g transform="translate(44980.25, 2054.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42879.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
+						<g transform="translate(44980.25, 2085.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42879.25, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
+						<g transform="translate(44980.25, 2491.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="42913.8" y="76.0" height="31.0" width="135.0" data-name="DataReference"></rect>
+					<g data-name="StudyDesignInfoFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
+							<rect x="15215.5" y="3140.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
+							<path d="M15215.5 3171.5 L15438.5 3171.5" fill="none" data-name="StudyDesignInfoFormView"></path>
 						</g>
-						<g transform="translate(42913.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
+						<g transform="translate(15215.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
+								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="22161.3" y="2227.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M22161.3 2258.0 L22870.3 2258.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M22161.3 2319.0 L22870.3 2319.0" fill="none" data-name="DataReferenceEditor"></path>
-						</g>
-						<g transform="translate(22161.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
+						<g transform="translate(15215.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22161.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
+					</g>
+					<g data-name="StudyInfoFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
+							<rect x="9688.0" y="1306.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
+							<path d="M9688.0 1337.5 L10102.0 1337.5" fill="none" data-name="StudyInfoFormData"></path>
+							<path d="M9688.0 1428.5 L10102.0 1428.5" fill="none" data-name="StudyInfoFormData"></path>
+						</g>
+						<g transform="translate(9688, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
+								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22161.25, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
+						<g transform="translate(9688, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="22591.5" y="3156.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
-						</g>
-						<g transform="translate(22591.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
+						<g transform="translate(9688, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="24090.3" y="1329.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M24090.3 1360.0 L24428.3 1360.0" fill="none" data-name="ReportsFormData"></path>
-							<path d="M24090.3 1406.0 L24428.3 1406.0" fill="none" data-name="ReportsFormData"></path>
+					<g data-name="StudyContactInfoFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
+							<rect x="10373.8" y="2182.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
+							<path d="M10373.8 2213.0 L10721.8 2213.0" fill="none" data-name="StudyContactInfoFormData"></path>
+							<path d="M10373.8 2364.0 L10721.8 2364.0" fill="none" data-name="StudyContactInfoFormData"></path>
 						</g>
-						<g transform="translate(24090.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
+						<g transform="translate(10373.75, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
+								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24090.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
+						<g transform="translate(10373.75, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24090.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
+						<g transform="translate(10373.75, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="7754.5" y="3118.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M7754.5 3149.0 L8055.5 3149.0" fill="none" data-name="ReportStatus"></path>
+					<g data-name="StudyFormValidationSet">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
+							<rect x="1545.0" y="3133.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
+							<path d="M1545.0 3164.0 L1932.0 3164.0" fill="none" data-name="StudyFormValidationSet"></path>
 						</g>
-						<g transform="translate(7754.5, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
+						<g transform="translate(1545, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
+								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7754.5, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
+						<g transform="translate(1545, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="22831.8" y="1321.5" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M22831.8 1352.5 L23028.8 1352.5" fill="none" data-name="ReportBadge"></path>
-							<path d="M22831.8 1428.5 L23028.8 1428.5" fill="none" data-name="ReportBadge"></path>
+					<g data-name="MeasurementsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
+							<rect x="10549.0" y="1329.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
+							<path d="M10549.0 1360.0 L11043.0 1360.0" fill="none" data-name="MeasurementsFormData"></path>
+							<path d="M10549.0 1406.0 L11043.0 1406.0" fill="none" data-name="MeasurementsFormData"></path>
 						</g>
-						<g transform="translate(22831.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
+						<g transform="translate(10549, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
+								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22831.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
+						<g transform="translate(10549, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22831.75, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
+						<g transform="translate(10549, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignReportsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="8758.5" y="3133.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M8758.5 3164.0 L9151.5 3164.0" fill="none" data-name="StudyDesignReportsFormView"></path>
+					<g data-name="MeasurementSurveyFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
+							<rect x="24145.3" y="1359.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
+							<path d="M24145.3 1390.5 L24589.3 1390.5" fill="none" data-name="MeasurementSurveyFormView"></path>
 						</g>
-						<g transform="translate(8758.5, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
+						<g transform="translate(24145.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
+								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8758.5, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
+						<g transform="translate(24145.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="13872.5" y="1329.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M13872.5 1360.0 L14260.5 1360.0" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M13872.5 1421.0 L14260.5 1421.0" fill="none" data-name="StudyFormScaffold"></path>
+					<g data-name="MeasurementSurveyFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
+							<rect x="32494.3" y="2084.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
+							<path d="M32494.3 2115.5 L33190.3 2115.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+							<path d="M32494.3 2341.5 L33190.3 2341.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
 						</g>
-						<g transform="translate(13872.5, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
+						<g transform="translate(32494.25, 2084.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13872.5, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
+						<g transform="translate(32494.25, 2115.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13872.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
+						<g transform="translate(32494.25, 2341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="T Function(WidgetRef)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="13753.3" y="2280.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
+					<g data-name="SurveyPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
+							<rect x="13731.0" y="1344.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
+							<path d="M13731.0 1375.0 L14075.0 1375.0" fill="none" data-name="SurveyPreview"></path>
+							<path d="M13731.0 1406.0 L14075.0 1406.0" fill="none" data-name="SurveyPreview"></path>
 						</g>
-						<g transform="translate(13753.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
+						<g transform="translate(13731, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="14168.5" y="2280.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
-						</g>
-						<g transform="translate(14168.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
+						<g transform="translate(13731, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="23164.3" y="1352.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M23164.3 1383.0 L23516.3 1383.0" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(23164.25, 1352)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
+						<g transform="translate(13731, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23164.25, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
+					</g>
+					<g data-name="MeasurementFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
+							<rect x="13779.5" y="2280.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
+						</g>
+						<g transform="translate(13779.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
+								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="11610.0" y="3088.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M11610.0 3119.0 L11973.0 3119.0" fill="none" data-name="SurveyQuestionType"></path>
+					<g data-name="MeasurementSurveyFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
+							<rect x="35285.0" y="1291.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
+							<path d="M35285.0 1322.5 L35694.0 1322.5" fill="none" data-name="MeasurementSurveyFormData"></path>
+							<path d="M35285.0 1443.5 L35694.0 1443.5" fill="none" data-name="MeasurementSurveyFormData"></path>
+						</g>
+						<g transform="translate(35285, 1291.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
+								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
+								
+							</g>
 						</g>
-						<g transform="translate(11610, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
+						<g transform="translate(35285, 1322.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11610, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
+						<g transform="translate(35285, 1443.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="28361.3" y="896.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M28361.3 927.0 L29529.3 927.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M28361.3 1063.0 L29529.3 1063.0" fill="none" data-name="QuestionFormData"></path>
+					<g data-name="QuestionnaireFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
+							<rect x="25141.5" y="2227.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
+							<path d="M25141.5 2258.0 L25509.5 2258.0" fill="none" data-name="QuestionnaireFormData"></path>
+							<path d="M25141.5 2304.0 L25509.5 2304.0" fill="none" data-name="QuestionnaireFormData"></path>
 						</g>
-						<g transform="translate(28361.25, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
+						<g transform="translate(25141.5, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
+								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28361.25, 927)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
+						<g transform="translate(25141.5, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28361.25, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
+						<g transform="translate(25141.5, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="27370.0" y="1306.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M27370.0 1337.5 L27714.0 1337.5" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M27370.0 1398.5 L27714.0 1398.5" fill="none" data-name="ChoiceQuestionFormData"></path>
+					<g data-name="WithQuestionnaireControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
+							<rect x="39221.3" y="1261.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
+							<path d="M39221.3 1292.5 L39853.3 1292.5" fill="none" data-name="WithQuestionnaireControls"></path>
+							<path d="M39221.3 1398.5 L39853.3 1398.5" fill="none" data-name="WithQuestionnaireControls"></path>
 						</g>
-						<g transform="translate(27370, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
+						<g transform="translate(39221.25, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
+								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27370, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(39221.25, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27370, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(39221.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="29279.5" y="1321.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M29279.5 1352.5 L29671.5 1352.5" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M29279.5 1398.5 L29671.5 1398.5" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(29279.5, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
+					<g data-name="StudyDesignMeasurementsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
+							<rect x="15478.5" y="3140.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
+							<path d="M15478.5 3171.5 L15788.5 3171.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
 						</g>
-						<g transform="translate(29279.5, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(15478.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
+								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29279.5, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(15478.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="29711.5" y="1321.5" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M29711.5 1352.5 L30183.5 1352.5" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M29711.5 1398.5 L30183.5 1398.5" fill="none" data-name="ImageQuestionFormData"></path>
+					<g data-name="MeasurementsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
+							<rect x="39597.3" y="2114.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
+							<path d="M39597.3 2145.5 L40689.3 2145.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+							<path d="M39597.3 2296.5 L40689.3 2296.5" fill="none" data-name="MeasurementsFormViewModel"></path>
 						</g>
-						<g transform="translate(29711.5, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
+						<g transform="translate(39597.25, 2114.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
+								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29711.5, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(39597.25, 2145.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29711.5, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(39597.25, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="30223.5" y="1314.0" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M30223.5 1345.0 L30695.5 1345.0" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M30223.5 1406.0 L30695.5 1406.0" fill="none" data-name="AudioQuestionFormData"></path>
+					<g data-name="StudyFormScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
+							<rect x="14321.0" y="1329.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
+							<path d="M14321.0 1360.0 L14709.0 1360.0" fill="none" data-name="StudyFormScaffold"></path>
+							<path d="M14321.0 1421.0 L14709.0 1421.0" fill="none" data-name="StudyFormScaffold"></path>
 						</g>
-						<g transform="translate(30223.5, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
+						<g transform="translate(14321, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
+								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30223.5, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(14321, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30223.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(14321, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="30735.5" y="1246.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M30735.5 1277.5 L31079.5 1277.5" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M30735.5 1473.5 L31079.5 1473.5" fill="none" data-name="ScaleQuestionFormData"></path>
+					<g data-name="T Function(WidgetRef)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
+							<rect x="16558.3" y="2280.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
 						</g>
-						<g transform="translate(30735.5, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
+						<g transform="translate(16558.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30735.5, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
-								
-							</g>
+					</g>
+					<g data-name="Widget Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
+							<rect x="16791.3" y="2280.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
 						</g>
-						<g transform="translate(30735.5, 1473.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(16791.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="31119.5" y="1306.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M31119.5 1337.5 L31463.5 1337.5" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M31119.5 1413.5 L31463.5 1413.5" fill="none" data-name="FreeTextQuestionFormData"></path>
+					<g data-name="ConsentItemFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
+							<rect x="33670.3" y="2167.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
+							<path d="M33670.3 2198.0 L34366.3 2198.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+							<path d="M33670.3 2364.0 L34366.3 2364.0" fill="none" data-name="ConsentItemFormViewModel"></path>
 						</g>
-						<g transform="translate(31119.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
+						<g transform="translate(33670.25, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31119.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(33670.25, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31119.5, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(33670.25, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="31193.5" y="2280.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+					<g data-name="StudyDesignEnrollmentFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
+							<rect x="15828.5" y="3125.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
+							<path d="M15828.5 3156.5 L16277.5 3156.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
 						</g>
-						<g transform="translate(31193.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
+						<g transform="translate(15828.5, 3125.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
+								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(15828.5, 3156.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="43088.8" y="60.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M43088.8 91.5 L43397.8 91.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
+					<g data-name="IScreenerQuestionLogicFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
+							<rect x="29172.0" y="2265.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
+							<path d="M29172.0 2296.0 L29504.0 2296.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
 						</g>
-						<g transform="translate(43088.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
+						<g transform="translate(29172, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
+								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43088.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(29172, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="25216.8" y="1359.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M25216.8 1390.5 L25568.8 1390.5" fill="none" data-name="ScaleQuestionFormView"></path>
+					<g data-name="ScreenerQuestionLogicFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
+							<rect x="41711.3" y="2227.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
+							<path d="M41711.3 2258.0 L42135.3 2258.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+							<path d="M41711.3 2289.0 L42135.3 2289.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
 						</g>
-						<g transform="translate(25216.75, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
+						<g transform="translate(41711.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
+								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25216.75, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(41711.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(41711.25, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="14300.5" y="1321.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M14300.5 1352.5 L14652.5 1352.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M14300.5 1398.5 L14652.5 1398.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+					<g data-name="ScreenerQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
+							<rect x="31560.5" y="3005.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
+							<path d="M31560.5 3036.0 L32122.5 3036.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+							<path d="M31560.5 3217.0 L32122.5 3217.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(14300.5, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
+						<g transform="translate(31560.5, 3005)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
+								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14300.5, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
+						<g transform="translate(31560.5, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14300.5, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
+						<g transform="translate(31560.5, 3217)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="14692.5" y="1344.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M14692.5 1375.0 L15044.5 1375.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M14692.5 1406.0 L15044.5 1406.0" fill="none" data-name="BoolQuestionFormView"></path>
+					<g data-name="ConsentItemFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
+							<rect x="26297.3" y="941.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
+							<path d="M26297.3 972.0 L26555.3 972.0" fill="none" data-name="ConsentItemFormData"></path>
+							<path d="M26297.3 1063.0 L26555.3 1063.0" fill="none" data-name="ConsentItemFormData"></path>
 						</g>
-						<g transform="translate(14692.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
+						<g transform="translate(26297.25, 941)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
+								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14692.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(26297.25, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14692.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+						<g transform="translate(26297.25, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="15952.5" y="1344.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M15952.5 1375.0 L16304.5 1375.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M15952.5 1406.0 L16304.5 1406.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(15952.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
-								
-							</g>
+					<g data-name="ConsentItemFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
+							<rect x="25257.3" y="1359.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
+							<path d="M25257.3 1390.5 L25638.3 1390.5" fill="none" data-name="ConsentItemFormView"></path>
 						</g>
-						<g transform="translate(15952.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(25257.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
+								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15952.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
+						<g transform="translate(25257.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="16344.5" y="1344.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M16344.5 1375.0 L16696.5 1375.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M16344.5 1406.0 L16696.5 1406.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+					<g data-name="EnrollmentFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
+							<rect x="11083.0" y="1306.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
+							<path d="M11083.0 1337.5 L11537.0 1337.5" fill="none" data-name="EnrollmentFormData"></path>
+							<path d="M11083.0 1428.5 L11537.0 1428.5" fill="none" data-name="EnrollmentFormData"></path>
 						</g>
-						<g transform="translate(16344.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
+						<g transform="translate(11083, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
+								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16344.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(11083, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16344.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
+						<g transform="translate(11083, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="17220.5" y="1344.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M17220.5 1375.0 L17572.5 1375.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M17220.5 1406.0 L17572.5 1406.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+					<g data-name="QuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
+							<rect x="25549.5" y="1627.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M25549.5 1658.0 L26562.5 1658.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M25549.5 2679.0 L26562.5 2679.0" fill="none" data-name="QuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(17220.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
+						<g transform="translate(25549.5, 1627)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
+								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17220.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(25549.5, 1658)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
+								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
+								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
+								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
+								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
+								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
+								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
+								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
+								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
+								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
+								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
+								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
+								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
+								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
+								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
+								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
+								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
+								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
+								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17220.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
+						<g transform="translate(25549.5, 2679)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="39408.8" y="971.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M39408.8 1002.0 L39840.8 1002.0" fill="none" data-name="ScheduleControls"></path>
-							<path d="M39408.8 1033.0 L39840.8 1033.0" fill="none" data-name="ScheduleControls"></path>
+					<g data-name="EnrollmentFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
+							<rect x="40729.3" y="2047.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
+							<path d="M40729.3 2078.0 L41631.3 2078.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+							<path d="M40729.3 2304.0 L41631.3 2304.0" fill="none" data-name="EnrollmentFormViewModel"></path>
 						</g>
-						<g transform="translate(39408.75, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
+						<g transform="translate(40729.25, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
+								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(40729.25, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(40729.25, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39408.75, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
+					</g>
+					<g data-name="EnrollmentFormConsentItemDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
+							<rect x="34539.8" y="3065.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
+							<path d="M34539.8 3096.0 L35339.8 3096.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+							<path d="M34539.8 3172.0 L35339.8 3172.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+						</g>
+						<g transform="translate(34539.75, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39408.75, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
+						<g transform="translate(34539.75, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="32356.5" y="1375.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
-						</g>
-						<g transform="translate(32356.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
+						<g transform="translate(34539.75, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="StudyFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="43254.0" y="1209.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M43254.0 1240.0 L43950.0 1240.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M43254.0 1451.0 L43950.0 1451.0" fill="none" data-name="StudyFormViewModel"></path>
+							<rect x="44972.3" y="1209.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
+							<path d="M44972.3 1240.0 L45668.3 1240.0" fill="none" data-name="StudyFormViewModel"></path>
+							<path d="M44972.3 1451.0 L45668.3 1451.0" fill="none" data-name="StudyFormViewModel"></path>
 						</g>
-						<g transform="translate(43254, 1209)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(44972.25, 1209)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43254, 1240)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(44972.25, 1240)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
@@ -8044,7 +7973,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(43254, 1451)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(44972.25, 1451)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
@@ -8057,761 +7986,832 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyAnalyzeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
-							<rect x="12441.0" y="2257.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
-							<path d="M12441.0 2288.5 L12621.0 2288.5" fill="none" data-name="StudyAnalyzeScreen"></path>
+					<g data-name="QuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
+							<rect x="31607.3" y="896.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M31607.3 927.0 L32775.3 927.0" fill="none" data-name="QuestionFormData"></path>
+							<path d="M31607.3 1063.0 L32775.3 1063.0" fill="none" data-name="QuestionFormData"></path>
 						</g>
-						<g transform="translate(12441, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
+						<g transform="translate(31607.25, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
+								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12441, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
+						<g transform="translate(31607.25, 927)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(31607.25, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyAnalyzeController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
-							<rect x="1190.3" y="2265.0" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
-							<path d="M1190.3 2296.0 L1391.3 2296.0" fill="none" data-name="StudyAnalyzeController"></path>
+					<g data-name="SurveyQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
+							<rect x="14329.5" y="3088.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M14329.5 3119.0 L14692.5 3119.0" fill="none" data-name="SurveyQuestionType"></path>
 						</g>
-						<g transform="translate(1190.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
-								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
+						<g transform="translate(14329.5, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
+								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1190.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
+						<g transform="translate(14329.5, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyMonitorScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="12661.0" y="2265.0" height="62.0" width="176.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M12661.0 2296.0 L12837.0 2296.0" fill="none" data-name="StudyMonitorScreen"></path>
+					<g data-name="ChoiceQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
+							<rect x="32347.0" y="1306.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M32347.0 1337.5 L32691.0 1337.5" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M32347.0 1398.5 L32691.0 1398.5" fill="none" data-name="ChoiceQuestionFormData"></path>
 						</g>
-						<g transform="translate(12661, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
+						<g transform="translate(32347, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12661, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
+						<g transform="translate(32347, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(32347, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
-							<rect x="26482.0" y="2197.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
-							<path d="M26482.0 2228.5 L26882.0 2228.5" fill="none" data-name="StudiesTableItem"></path>
+					<g data-name="BoolQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
+							<rect x="32731.0" y="1321.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M32731.0 1352.5 L33123.0 1352.5" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M32731.0 1398.5 L33123.0 1398.5" fill="none" data-name="BoolQuestionFormData"></path>
 						</g>
-						<g transform="translate(26482, 2197.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
-								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
+						<g transform="translate(32731, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
+								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26482, 2228.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
+						<g transform="translate(32731, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(32731, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(Study, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
-							<rect x="26744.0" y="3156.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
+					<g data-name="ImageQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
+							<rect x="33163.0" y="1321.5" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
+							<path d="M33163.0 1352.5 L33635.0 1352.5" fill="none" data-name="ImageQuestionFormData"></path>
+							<path d="M33163.0 1398.5 L33635.0 1398.5" fill="none" data-name="ImageQuestionFormData"></path>
 						</g>
-						<g transform="translate(26744, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
+						<g transform="translate(33163, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(Study)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
-							<rect x="27017.0" y="3156.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
+						<g transform="translate(33163, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(27017, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
+						<g transform="translate(33163, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
-							<rect x="28399.5" y="2107.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
-							<path d="M28399.5 2138.0 L29013.5 2138.0" fill="none" data-name="DashboardController"></path>
-							<path d="M28399.5 2259.0 L29013.5 2259.0" fill="none" data-name="DashboardController"></path>
+					<g data-name="AudioQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
+							<rect x="33675.0" y="1314.0" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
+							<path d="M33675.0 1345.0 L34147.0 1345.0" fill="none" data-name="AudioQuestionFormData"></path>
+							<path d="M33675.0 1406.0 L34147.0 1406.0" fill="none" data-name="AudioQuestionFormData"></path>
 						</g>
-						<g transform="translate(28399.5, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
-								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
+						<g transform="translate(33675, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28399.5, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
+						<g transform="translate(33675, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28399.5, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
+						<g transform="translate(33675, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IUserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="29424.3" y="3156.0" height="31.0" width="143.0" data-name="IUserRepository"></rect>
+					<g data-name="ScaleQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
+							<rect x="34187.0" y="1246.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M34187.0 1277.5 L34531.0 1277.5" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M34187.0 1473.5 L34531.0 1473.5" fill="none" data-name="ScaleQuestionFormData"></path>
 						</g>
-						<g transform="translate(29424.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
+						<g transform="translate(34187, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(34187, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(34187, 1473.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SearchController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="32638.5" y="3156.0" height="31.0" width="149.0" data-name="SearchController"></rect>
+					<g data-name="FreeTextQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
+							<rect x="34571.0" y="1306.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M34571.0 1337.5 L34915.0 1337.5" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M34571.0 1413.5 L34915.0 1413.5" fill="none" data-name="FreeTextQuestionFormData"></path>
 						</g>
-						<g transform="translate(32638.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
+						<g transform="translate(34571, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(34571, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(34571, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="27754.0" y="1375.0" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
+					<g data-name="FreeTextQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
+							<rect x="34645.0" y="2280.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
 						</g>
-						<g transform="translate(27754, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
+						<g transform="translate(34645, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
+								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumnSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
-							<rect x="43437.8" y="30.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
-							<path d="M43437.8 61.0 L43662.8 61.0" fill="none" data-name="StudiesTableColumnSize"></path>
-							<path d="M43437.8 122.0 L43662.8 122.0" fill="none" data-name="StudiesTableColumnSize"></path>
+					<g data-name="AudioRecordingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
+							<rect x="15202.0" y="1344.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
+							<path d="M15202.0 1375.0 L15554.0 1375.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<path d="M15202.0 1406.0 L15554.0 1406.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
 						</g>
-						<g transform="translate(43437.75, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
+						<g transform="translate(15202, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43437.75, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
+						<g transform="translate(15202, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43437.75, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
+						<g transform="translate(15202, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
-							<rect x="27978.0" y="1246.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
-							<path d="M27978.0 1277.5 L28458.0 1277.5" fill="none" data-name="StudiesTable"></path>
-							<path d="M27978.0 1488.5 L28458.0 1488.5" fill="none" data-name="StudiesTable"></path>
+					<g data-name="FreeTextQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
+							<rect x="15594.0" y="1321.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M15594.0 1352.5 L15946.0 1352.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M15594.0 1398.5 L15946.0 1398.5" fill="none" data-name="FreeTextQuestionFormView"></path>
 						</g>
-						<g transform="translate(27978, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
-								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
+						<g transform="translate(15594, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27978, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
+						<g transform="translate(15594, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27978, 1488.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
+						<g transform="translate(15594, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
-							<rect x="27962.5" y="2280.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
+					<g data-name="ImageCapturingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
+							<rect x="17580.8" y="1344.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
+							<path d="M17580.8 1375.0 L17932.8 1375.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<path d="M17580.8 1406.0 L17932.8 1406.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
 						</g>
-						<g transform="translate(27962.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
+						<g transform="translate(17580.75, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<rect x="29524.8" y="2280.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
+						<g transform="translate(17580.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
 						</g>
-						<g transform="translate(29524.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
+						<g transform="translate(17580.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
-							<rect x="2978.3" y="3065.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
-							<path d="M2978.3 3096.5 L3339.3 3096.5" fill="none" data-name="StudiesTableColumn"></path>
+					<g data-name="IScaleQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
+							<rect x="47971.5" y="60.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M47971.5 91.5 L48280.5 91.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(2978.25, 3065.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
-								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
+						<g transform="translate(47971.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
+								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2978.25, 3096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
+						<g transform="translate(47971.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="28181.5" y="2265.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
-							<path d="M28181.5 2296.0 L28359.5 2296.0" fill="none" data-name="DashboardScreen"></path>
+					<g data-name="ScaleQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
+							<rect x="29940.5" y="1359.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M29940.5 1390.5 L30292.5 1390.5" fill="none" data-name="ScaleQuestionFormView"></path>
 						</g>
-						<g transform="translate(28181.5, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
+						<g transform="translate(29940.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28181.5, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
+						<g transform="translate(29940.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesFilter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
-							<rect x="21058.3" y="3133.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
-							<path d="M21058.3 3164.0 L21354.3 3164.0" fill="none" data-name="StudiesFilter"></path>
+					<g data-name="ChoiceQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
+							<rect x="23127.3" y="1344.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M23127.3 1375.0 L23479.3 1375.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M23127.3 1406.0 L23479.3 1406.0" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(21058.25, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
+						<g transform="translate(23127.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21058.25, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
+						<g transform="translate(23127.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(23127.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
-							<rect x="28619.5" y="1336.5" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
-							<path d="M28619.5 1367.5 L28962.5 1367.5" fill="none" data-name="DashboardScaffold"></path>
-							<path d="M28619.5 1413.5 L28962.5 1413.5" fill="none" data-name="DashboardScaffold"></path>
+					<g data-name="BoolQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
+							<rect x="23519.3" y="1344.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M23519.3 1375.0 L23871.3 1375.0" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M23519.3 1406.0 L23871.3 1406.0" fill="none" data-name="BoolQuestionFormView"></path>
 						</g>
-						<g transform="translate(28619.5, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
-								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
+						<g transform="translate(23519.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28619.5, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
+						<g transform="translate(23519.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28619.5, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
+						<g transform="translate(23519.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumnHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
-							<rect x="29002.5" y="1329.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
-							<path d="M29002.5 1360.5 L29239.5 1360.5" fill="none" data-name="StudiesTableColumnHeader"></path>
+					<g data-name="SurveyQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
+							<rect x="30412.5" y="1352.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M30412.5 1383.0 L30764.5 1383.0" fill="none" data-name="SurveyQuestionFormView"></path>
 						</g>
-						<g transform="translate(29002.5, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
-								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
+						<g transform="translate(30412.5, 1352)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29002.5, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
+						<g transform="translate(30412.5, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AccountSettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
-							<rect x="17612.5" y="1359.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
-							<path d="M17612.5 1390.5 L17806.5 1390.5" fill="none" data-name="AccountSettingsDialog"></path>
-						</g>
-						<g transform="translate(17612.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
-								
-							</g>
+					<g data-name="StudyUTimeOfDay">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
+							<rect x="35734.0" y="1375.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
 						</g>
-						<g transform="translate(17612.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
+						<g transform="translate(35734, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
+								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInvitesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="43830.0" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M43830.0 31.0 L44396.0 31.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M43830.0 137.0 L44396.0 137.0" fill="none" data-name="StudyInvitesTable"></path>
+					<g data-name="ScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
+							<rect x="41994.8" y="971.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
+							<path d="M41994.8 1002.0 L42426.8 1002.0" fill="none" data-name="ScheduleControls"></path>
+							<path d="M41994.8 1033.0 L42426.8 1033.0" fill="none" data-name="ScheduleControls"></path>
 						</g>
-						<g transform="translate(43830, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
-								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
+						<g transform="translate(41994.75, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
+								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43830, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
+						<g transform="translate(41994.75, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43830, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
+						<g transform="translate(41994.75, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="43134.5" y="524.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
+					<g data-name="StudiesTableColumnHeader">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
+							<rect x="30916.3" y="1329.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
+							<path d="M30916.3 1360.5 L31153.3 1360.5" fill="none" data-name="StudiesTableColumnHeader"></path>
 						</g>
-						<g transform="translate(43134.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
+						<g transform="translate(30916.25, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
+								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="43396.5" y="524.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(43396.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+						<g transform="translate(30916.25, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Intervention? Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="43864.0" y="524.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
+					<g data-name="DashboardScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
+							<rect x="31580.5" y="2265.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
+							<path d="M31580.5 2296.0 L31758.5 2296.0" fill="none" data-name="DashboardScreen"></path>
 						</g>
-						<g transform="translate(43864, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
+						<g transform="translate(31580.5, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
+								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
+								
+							</g>
+						</g>
+						<g transform="translate(31580.5, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="int Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="44155.0" y="524.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
+					<g data-name="StudiesFilter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
+							<rect x="13447.5" y="3133.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
+							<path d="M13447.5 3164.0 L13743.5 3164.0" fill="none" data-name="StudiesFilter"></path>
 						</g>
-						<g transform="translate(44155, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
+						<g transform="translate(13447.5, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
+								
+							</g>
+						</g>
+						<g transform="translate(13447.5, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRecruitController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="10914.8" y="2204.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M10914.8 2235.5 L11565.8 2235.5" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M10914.8 2281.5 L11565.8 2281.5" fill="none" data-name="StudyRecruitController"></path>
+					<g data-name="DashboardScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
+							<rect x="31193.3" y="1336.5" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
+							<path d="M31193.3 1367.5 L31536.3 1367.5" fill="none" data-name="DashboardScaffold"></path>
+							<path d="M31193.3 1413.5 L31536.3 1413.5" fill="none" data-name="DashboardScaffold"></path>
 						</g>
-						<g transform="translate(10914.75, 2204.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
-								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
+						<g transform="translate(31193.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
+								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10914.75, 2235.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
+						<g transform="translate(31193.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10914.75, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
+						<g transform="translate(31193.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IInviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="34658.3" y="3156.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
+					<g data-name="DashboardController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
+							<rect x="17407.3" y="2107.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
+							<path d="M17407.3 2138.0 L18021.3 2138.0" fill="none" data-name="DashboardController"></path>
+							<path d="M17407.3 2259.0 L18021.3 2259.0" fill="none" data-name="DashboardController"></path>
 						</g>
-						<g transform="translate(34658.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
+						<g transform="translate(17407.25, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
+								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InviteCodeFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="42104.0" y="2107.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M42104.0 2138.0 L42771.0 2138.0" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M42104.0 2364.0 L42771.0 2364.0" fill="none" data-name="InviteCodeFormViewModel"></path>
+						<g transform="translate(17407.25, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
+								
+							</g>
 						</g>
-						<g transform="translate(42104, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
-								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
+						<g transform="translate(17407.25, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42104, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
+					</g>
+					<g data-name="IUserRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
+							<rect x="12832.5" y="3156.0" height="31.0" width="143.0" data-name="IUserRepository"></rect>
+						</g>
+						<g transform="translate(12832.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
+								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42104, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
+					</g>
+					<g data-name="SearchController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
+							<rect x="13015.5" y="3156.0" height="31.0" width="149.0" data-name="SearchController"></rect>
+						</g>
+						<g transform="translate(13015.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
+								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrolledBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="44436.0" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M44436.0 76.0 L44602.0 76.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M44436.0 107.0 L44602.0 107.0" fill="none" data-name="EnrolledBadge"></path>
+					<g data-name="StudiesTableColumnSize">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
+							<rect x="48320.5" y="30.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
+							<path d="M48320.5 61.0 L48545.5 61.0" fill="none" data-name="StudiesTableColumnSize"></path>
+							<path d="M48320.5 122.0 L48545.5 122.0" fill="none" data-name="StudiesTableColumnSize"></path>
 						</g>
-						<g transform="translate(44436, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
+						<g transform="translate(48320.5, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
+								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44436, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
+						<g transform="translate(48320.5, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44436, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
+						<g transform="translate(48320.5, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
-							<rect x="39912.3" y="1336.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
-							<path d="M39912.3 1367.5 L40350.3 1367.5" fill="none" data-name="InviteCodeFormView"></path>
-							<path d="M39912.3 1398.5 L40350.3 1398.5" fill="none" data-name="InviteCodeFormView"></path>
+					<g data-name="StudiesTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
+							<rect x="31827.0" y="1246.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
+							<path d="M31827.0 1277.5 L32307.0 1277.5" fill="none" data-name="StudiesTable"></path>
+							<path d="M31827.0 1488.5 L32307.0 1488.5" fill="none" data-name="StudiesTable"></path>
 						</g>
-						<g transform="translate(39912.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
-								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
+						<g transform="translate(31827, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
+								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39912.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
+						<g transform="translate(31827, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39912.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
+						<g transform="translate(31827, 1488.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRecruitScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="12877.0" y="2242.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M12877.0 2273.5 L13191.0 2273.5" fill="none" data-name="StudyRecruitScreen"></path>
-						</g>
-						<g transform="translate(12877, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
-								
-							</g>
+					<g data-name="void Function(Study)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
+							<rect x="31798.5" y="2280.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
 						</g>
-						<g transform="translate(12877, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
+						<g transform="translate(31798.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
+								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
-							<rect x="37436.3" y="926.0" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
-							<path d="M37436.3 957.0 L37881.3 957.0" fill="none" data-name="DrawerEntry"></path>
-							<path d="M37436.3 1093.0 L37881.3 1093.0" fill="none" data-name="DrawerEntry"></path>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+							<rect x="32077.3" y="2280.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
 						</g>
-						<g transform="translate(37436.25, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
-								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
+						<g transform="translate(32077.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37436.25, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DrawerEntry">+localizedHelpText: String Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DrawerEntry">+enabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DrawerEntry">+onSelected: void Function(BuildContext, WidgetRef)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DrawerEntry">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DrawerEntry">+title: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DrawerEntry">+helpText: String?</text>
+					</g>
+					<g data-name="StudiesTableColumn">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
+							<rect x="1972.0" y="3065.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
+							<path d="M1972.0 3096.5 L2333.0 3096.5" fill="none" data-name="StudiesTableColumn"></path>
+						</g>
+						<g transform="translate(1972, 3065.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
+								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37436.25, 1093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
+						<g transform="translate(1972, 3096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="String Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
-							<rect x="36646.8" y="1375.0" height="31.0" width="147.0" data-name="String Function()"></rect>
+					<g data-name="StudiesTableItem">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
+							<rect x="33230.3" y="2197.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
+							<path d="M33230.3 2228.5 L33630.3 2228.5" fill="none" data-name="StudiesTableItem"></path>
 						</g>
-						<g transform="translate(36646.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
-								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
+						<g transform="translate(33230.25, 2197.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
+								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="String Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
-							<rect x="38500.3" y="1375.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
-						</g>
-						<g transform="translate(38500.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
+						<g transform="translate(33230.25, 2228.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(BuildContext, WidgetRef)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
-							<rect x="38697.3" y="1375.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
+					<g data-name="void Function(Study, bool)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
+							<rect x="32162.5" y="3156.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
 						</g>
-						<g transform="translate(38697.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
-								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
+						<g transform="translate(32162.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="GoRouterDrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
-							<rect x="39073.3" y="1336.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
-							<path d="M39073.3 1367.5 L39337.3 1367.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-							<path d="M39073.3 1413.5 L39337.3 1413.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+					<g data-name="void Function(Study)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
+							<rect x="33009.0" y="3156.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
 						</g>
-						<g transform="translate(39073.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
+						<g transform="translate(33009, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
+								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39073.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
-								
-							</g>
+					</g>
+					<g data-name="App">
+						<g fill="#eee8d5" stroke="#33322E" data-name="App">
+							<rect x="48585.5" y="76.0" height="31.0" width="47.0" data-name="App"></rect>
 						</g>
-						<g transform="translate(39073.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
+						<g transform="translate(48585.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
+								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RoutingIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="38802.3" y="2280.5" height="31.0" width="122.0" data-name="RoutingIntent"></rect>
+					<g data-name="AppContent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
+							<rect x="48672.5" y="76.0" height="31.0" width="109.0" data-name="AppContent"></rect>
 						</g>
-						<g transform="translate(38802.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
+						<g transform="translate(48672.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppDrawer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
-							<rect x="44642.0" y="8.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
-							<path d="M44642.0 39.0 L44911.0 39.0" fill="none" data-name="AppDrawer"></path>
+					<g data-name="AccountSettingsDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
+							<rect x="23911.3" y="1359.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
+							<path d="M23911.3 1390.5 L24105.3 1390.5" fill="none" data-name="AccountSettingsDialog"></path>
 						</g>
-						<g transform="translate(44642, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
-								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
+						<g transform="translate(23911.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
+								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44642, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppDrawer">+leftPaddingEntries: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppDrawer">+logoPaddingVertical: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppDrawer">+logoPaddingHorizontal: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AppDrawer">+logoMaxHeight: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AppDrawer">+logoSectionMinHeight: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AppDrawer">+logoSectionMaxHeight: double</text>
+						<g transform="translate(23911.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
 								
 							</g>
 						</g>
diff --git a/docs/uml/designer_v2/lib/uml.svg b/docs/uml/designer_v2/lib/uml.svg
index 135fe44da..880ed2de2 100644
--- a/docs/uml/designer_v2/lib/uml.svg
+++ b/docs/uml/designer_v2/lib/uml.svg
@@ -1,16240 +1,16240 @@
-<svg version="1.1" baseProfile="full" width="84324.8" height="4748.0" viewbox="0 0 84324.75 4748" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;GoRouteParamEnum
+<svg version="1.1" baseProfile="full" width="84279.3" height="4748.0" viewbox="0 0 84279.25 4748" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[Config
 	  |
-	  +String toRouteParam();
-	  +String toShortString()
+	  &lt;static&gt;+isDebugMode: bool;
+	  &lt;static&gt;+defaultLocale: Set&lt;String&gt;;
+	  &lt;static&gt;+supportedLocales: Map&lt;String, String&gt;;
+	  &lt;static&gt;+newStudyId: String;
+	  &lt;static&gt;+newModelId: String;
+	  &lt;static&gt;+minSplashTime: int;
+	  &lt;static&gt;+formAutosaveDebounce: int
 	]
 	
-	[RoutingIntents
-	  |
-	  &lt;static&gt;+root: RoutingIntent;
-	  &lt;static&gt;+studies: RoutingIntent;
-	  &lt;static&gt;+studiesShared: RoutingIntent;
-	  &lt;static&gt;+publicRegistry: RoutingIntent;
-	  &lt;static&gt;+study: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEdit: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditInfo: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditInterventions: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String);
-	  &lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditReports: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String);
-	  &lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute});
-	  &lt;static&gt;+studyRecruit: RoutingIntent Function(String);
-	  &lt;static&gt;+studyMonitor: RoutingIntent Function(String);
-	  &lt;static&gt;+studyAnalyze: RoutingIntent Function(String);
-	  &lt;static&gt;+studySettings: RoutingIntent Function(String);
-	  &lt;static&gt;+accountSettings: RoutingIntent;
-	  &lt;static&gt;+studyNew: RoutingIntent;
-	  &lt;static&gt;+login: RoutingIntent;
-	  &lt;static&gt;+signup: RoutingIntent;
-	  &lt;static&gt;+passwordForgot: RoutingIntent;
-	  &lt;static&gt;+passwordForgot2: RoutingIntent Function(String);
-	  &lt;static&gt;+passwordRecovery: RoutingIntent;
-	  &lt;static&gt;+error: RoutingIntent Function(Exception)
+	[&lt;abstract&gt;ResultTypes
 	]
 	
-	[RoutingIntents]o-[RoutingIntent]
-	[RoutingIntents]o-[RoutingIntent Function(String)]
-	[RoutingIntents]o-[RoutingIntent Function(String, String)]
-	[RoutingIntents]o-[RoutingIntent Function(String, {String? appRoute})]
-	[RoutingIntents]o-[RoutingIntent Function(Exception)]
-	
-	[RoutingIntent
-	  |
-	  +route: GoRoute;
-	  +params: Map&lt;String, String&gt;;
-	  +queryParams: Map&lt;String, String&gt;;
-	  +dispatch: RoutingIntentDispatch?;
-	  +extra: Object?;
-	  +routeName: String;
-	  +arguments: Map&lt;String, String&gt;;
-	  +props: List&lt;Object?&gt;
+	[MeasurementResultTypes
 	  |
-	  -dynamic _validateRoute();
-	  +bool matches()
+	  &lt;static&gt;+questionnaire: String;
+	  &lt;static&gt;+values: List&lt;String&gt;
 	]
 	
-	[RoutingIntent]o-[GoRoute]
-	[RoutingIntent]o-[RoutingIntentDispatch]
-	[&lt;abstract&gt;Equatable]&lt;:-[RoutingIntent]
+	[&lt;abstract&gt;ResultTypes]&lt;:-[MeasurementResultTypes]
 	
-	[RoutingIntentDispatch
+	[InterventionResultTypes
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;;
-	  &lt;static&gt;+go: RoutingIntentDispatch;
-	  &lt;static&gt;+push: RoutingIntentDispatch
+	  &lt;static&gt;+checkmarkTask: String;
+	  &lt;static&gt;+values: List&lt;String&gt;
 	]
 	
-	[RoutingIntentDispatch]o-[RoutingIntentDispatch]
-	[Enum]&lt;:--[RoutingIntentDispatch]
+	[&lt;abstract&gt;ResultTypes]&lt;:-[InterventionResultTypes]
 	
-	[RouterKeys
+	[StudyExportData
 	  |
-	  &lt;static&gt;+studyKey: ValueKey&lt;String&gt;;
-	  &lt;static&gt;+authKey: ValueKey&lt;String&gt;
+	  +study: Study;
+	  +measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
+	  +interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
+	  +mediaData: List&lt;String&gt;;
+	  +isEmpty: bool
 	]
 	
-	[RouterKeys]o-[ValueKey]
-	
-	[RouteParams
-	  |
-	  &lt;static&gt;+studiesFilter: String;
-	  &lt;static&gt;+studyId: String;
-	  &lt;static&gt;+measurementId: String;
-	  &lt;static&gt;+interventionId: String;
-	  &lt;static&gt;+testAppRoute: String
-	]
+	[StudyExportData]o-[Study]
 	
-	[RouterConf
-	  |
-	  &lt;static&gt;+router: GoRouter;
-	  &lt;static&gt;+routes: List&lt;GoRoute&gt;;
-	  &lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;;
-	  &lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;
+	[StudyTemplates
 	  |
-	  &lt;static&gt;+GoRoute route()
-	]
-	
-	[RouterConf]o-[GoRouter]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs
+	  &lt;static&gt;+kUnnamedStudyTitle: String
 	  |
-	  +studyId: String
+	  &lt;static&gt;+Study emptyDraft()
 	]
 	
-	[&lt;abstract&gt;QuestionFormRouteArgs
+	[StudyActionType
 	  |
-	  +questionId: String
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudyActionType&gt;;
+	  &lt;static&gt;+pin: StudyActionType;
+	  &lt;static&gt;+pinoff: StudyActionType;
+	  &lt;static&gt;+edit: StudyActionType;
+	  &lt;static&gt;+duplicate: StudyActionType;
+	  &lt;static&gt;+duplicateDraft: StudyActionType;
+	  &lt;static&gt;+addCollaborator: StudyActionType;
+	  &lt;static&gt;+export: StudyActionType;
+	  &lt;static&gt;+delete: StudyActionType
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[&lt;abstract&gt;QuestionFormRouteArgs]
+	[StudyActionType]o-[StudyActionType]
+	[Enum]&lt;:--[StudyActionType]
 	
-	[ScreenerQuestionFormRouteArgs
+	[Notifications
+	  |
+	  &lt;static&gt;+credentialsInvalid: SnackbarIntent;
+	  &lt;static&gt;+userAlreadyRegistered: SnackbarIntent;
+	  &lt;static&gt;+passwordReset: SnackbarIntent;
+	  &lt;static&gt;+passwordResetSuccess: SnackbarIntent;
+	  &lt;static&gt;+studyDeleted: SnackbarIntent;
+	  &lt;static&gt;+inviteCodeDeleted: SnackbarIntent;
+	  &lt;static&gt;+inviteCodeClipped: SnackbarIntent;
+	  &lt;static&gt;+studyDeleteConfirmation: AlertIntent
 	]
 	
-	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:-[ScreenerQuestionFormRouteArgs]
+	[Notifications]o-[SnackbarIntent]
+	[Notifications]o-[AlertIntent]
 	
-	[ConsentItemFormRouteArgs
+	[NotificationDefaultActions
 	  |
-	  +consentId: String
+	  &lt;static&gt;+cancel: NotificationAction
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ConsentItemFormRouteArgs]
+	[NotificationDefaultActions]o-[NotificationAction]
 	
-	[MeasurementFormRouteArgs
+	[&lt;abstract&gt;INotificationService
 	  |
-	  +measurementId: String
+	  +void showMessage();
+	  +void show();
+	  +Stream&lt;NotificationIntent&gt; watchNotifications();
+	  +void dispose()
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[MeasurementFormRouteArgs]
-	
-	[SurveyQuestionFormRouteArgs
+	[NotificationService
 	  |
-	  +questionId: String
+	  -_streamController: BehaviorSubject&lt;NotificationIntent&gt;
+	  |
+	  +Stream&lt;NotificationIntent&gt; watchNotifications();
+	  +void showMessage();
+	  +void show();
+	  +void dispose()
 	]
 	
-	[MeasurementFormRouteArgs]&lt;:-[SurveyQuestionFormRouteArgs]
-	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:--[SurveyQuestionFormRouteArgs]
+	[NotificationService]o-[BehaviorSubject]
+	[&lt;abstract&gt;INotificationService]&lt;:--[NotificationService]
 	
-	[InterventionFormRouteArgs
+	[&lt;abstract&gt;NotificationIntent
 	  |
-	  +interventionId: String
+	  +message: String?;
+	  +customContent: Widget?;
+	  +icon: IconData?;
+	  +actions: List&lt;NotificationAction&gt;?;
+	  +type: NotificationType
+	  |
+	  +void register()
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[InterventionFormRouteArgs]
+	[&lt;abstract&gt;NotificationIntent]o-[&lt;abstract&gt;Widget]
+	[&lt;abstract&gt;NotificationIntent]o-[IconData]
+	[&lt;abstract&gt;NotificationIntent]o-[NotificationType]
 	
-	[InterventionTaskFormRouteArgs
+	[NotificationAction
 	  |
-	  +taskId: String
+	  +label: String;
+	  +onSelect: dynamic Function();
+	  +isDestructive: bool
 	]
 	
-	[InterventionFormRouteArgs]&lt;:-[InterventionTaskFormRouteArgs]
+	[NotificationAction]o-[dynamic Function()]
 	
-	[ReportItemFormRouteArgs
+	[SnackbarIntent
 	  |
-	  +sectionId: String
+	  +duration: int?
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ReportItemFormRouteArgs]
+	[&lt;abstract&gt;NotificationIntent]&lt;:-[SnackbarIntent]
 	
-	[&lt;abstract&gt;JsonFileLoader
-	  |
-	  +jsonAssetsPath: String
+	[AlertIntent
 	  |
-	  +dynamic loadJson();
-	  +dynamic parseJsonMapFromAssets();
-	  +dynamic parseJsonListFromAssets()
+	  +title: String;
+	  +dismissOnAction: bool;
+	  +isDestructive: dynamic
 	]
 	
-	[CombinedStreamNotifier
-	  |
-	  -_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;
+	[&lt;abstract&gt;NotificationIntent]&lt;:-[AlertIntent]
+	
+	[NotificationType
 	  |
-	  +void dispose()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;NotificationType&gt;;
+	  &lt;static&gt;+snackbar: NotificationType;
+	  &lt;static&gt;+alert: NotificationType;
+	  &lt;static&gt;+custom: NotificationType
 	]
 	
-	[ChangeNotifier]&lt;:-[CombinedStreamNotifier]
+	[NotificationType]o-[NotificationType]
+	[Enum]&lt;:--[NotificationType]
 	
-	[&lt;abstract&gt;IProviderArgsResolver
+	[&lt;abstract&gt;IClipboardService
 	  |
-	  +R provide()
+	  +dynamic copy()
 	]
 	
-	[SuppressedBehaviorSubject
-	  |
-	  +subject: BehaviorSubject&lt;T&gt;;
-	  +didSuppressInitialEvent: bool;
-	  -_controller: StreamController&lt;T&gt;
+	[ClipboardService
 	  |
-	  -StreamController&lt;T&gt; _buildDerivedController();
-	  +dynamic close()
+	  +dynamic copy()
 	]
 	
-	[SuppressedBehaviorSubject]o-[BehaviorSubject]
-	[SuppressedBehaviorSubject]o-[StreamController]
+	[&lt;abstract&gt;IClipboardService]&lt;:--[ClipboardService]
 	
-	[Time
+	[NotificationDispatcher
 	  |
-	  &lt;static&gt;+dynamic fromTimeOfDay();
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+Time fromJson()
+	  +child: Widget?;
+	  +snackbarInnerPadding: double;
+	  +snackbarWidth: double?;
+	  +snackbarBehavior: SnackBarBehavior;
+	  +snackbarDefaultDuration: int
 	]
 	
-	[TimeOfDay]&lt;:-[Time]
+	[NotificationDispatcher]o-[&lt;abstract&gt;Widget]
+	[NotificationDispatcher]o-[SnackBarBehavior]
 	
-	[TimeValueAccessor
+	[Assets
 	  |
-	  +String modelToViewValue();
-	  +Time? viewToModelValue();
-	  -String _addLeadingZeroIfNeeded()
+	  &lt;static&gt;+logoWide: String
 	]
 	
-	[&lt;abstract&gt;ControlValueAccessor]&lt;:-[TimeValueAccessor]
-	
-	[Tuple
+	[AsyncValueWidget
 	  |
-	  +first: T1;
-	  +second: T2;
-	  +props: List&lt;Object?&gt;
+	  +value: AsyncValue&lt;T&gt;;
+	  +data: Widget Function(T);
+	  +error: Widget Function(Object, StackTrace?)?;
+	  +loading: Widget Function()?;
+	  +empty: Widget Function()?
 	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson();
-	  +Tuple&lt;T1, T2&gt; copy();
-	  +Tuple&lt;T1, T2&gt; copyWith()
+	  +Widget build();
+	  -Widget _buildDataOrEmptyWidget();
+	  -Widget _defaultError();
+	  -Widget _defaultLoad()
 	]
 	
-	[&lt;abstract&gt;Equatable]&lt;:-[Tuple]
+	[AsyncValueWidget]o-[&lt;abstract&gt;AsyncValue]
+	[AsyncValueWidget]o-[Widget Function(T)]
+	[AsyncValueWidget]o-[Widget Function(Object, StackTrace?)?]
+	[AsyncValueWidget]o-[Widget Function()?]
 	
-	[OptimisticUpdate
+	[FormControlLabel
 	  |
-	  +applyOptimistic: void Function();
-	  +apply: dynamic Function();
-	  +rollback: void Function();
-	  +onUpdate: void Function()?;
-	  +onError: void Function(Object, StackTrace?)?;
-	  +rethrowErrors: bool;
-	  +runOptimistically: bool;
-	  +completeFutureOptimistically: bool
+	  +formControl: AbstractControl&lt;dynamic&gt;;
+	  +text: String;
+	  +isClickable: bool;
+	  +textStyle: TextStyle?;
+	  +onClick: void Function(AbstractControl&lt;dynamic&gt;)?
 	  |
-	  +dynamic execute();
-	  -void _runUpdateHandlerIfAny()
+	  +Widget build()
 	]
 	
-	[OptimisticUpdate]o-[void Function()]
-	[OptimisticUpdate]o-[dynamic Function()]
-	[OptimisticUpdate]o-[void Function()?]
-	[OptimisticUpdate]o-[void Function(Object, StackTrace?)?]
+	[FormControlLabel]o-[&lt;abstract&gt;AbstractControl]
+	[FormControlLabel]o-[TextStyle]
+	[FormControlLabel]o-[void Function(AbstractControl&lt;dynamic&gt;)?]
 	
-	[SerializableColor
+	[ActionPopUpMenuButton
 	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+SerializableColor fromJson()
+	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
+	  +triggerIconColor: Color?;
+	  +triggerIconColorHover: Color?;
+	  +triggerIconSize: double;
+	  +disableSplashEffect: bool;
+	  +hideOnEmpty: bool;
+	  +orientation: Axis;
+	  +elevation: double?;
+	  +splashRadius: double?;
+	  +enabled: bool;
+	  +position: PopupMenuPosition
+	  |
+	  +Widget build();
+	  -Widget _buildPopupMenu()
 	]
 	
-	[Color]&lt;:-[SerializableColor]
+	[ActionPopUpMenuButton]o-[Color]
+	[ActionPopUpMenuButton]o-[Axis]
+	[ActionPopUpMenuButton]o-[PopupMenuPosition]
 	
-	[&lt;abstract&gt;FileFormatEncoder
+	[Search
 	  |
-	  +dynamic encodeAsync();
-	  +String encode();
-	  +dynamic call()
+	  +onQueryChanged: dynamic Function(String);
+	  +searchController: SearchController?;
+	  +hintText: String?;
+	  +initialText: String?
 	]
 	
-	[CSVStringEncoder
+	[Search]o-[dynamic Function(String)]
+	[Search]o-[SearchController]
+	
+	[SearchController
 	  |
-	  +String encode()
+	  +setText: void Function(String)
 	]
 	
-	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[CSVStringEncoder]
+	[SearchController]o-[void Function(String)]
 	
-	[JsonStringEncoder
+	[FormScaffold
 	  |
-	  +String encode()
+	  +formViewModel: T;
+	  +actions: List&lt;Widget&gt;?;
+	  +body: Widget;
+	  +drawer: Widget?;
+	  +actionsSpacing: double;
+	  +actionsPadding: double
 	]
 	
-	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[JsonStringEncoder]
+	[FormScaffold]o-[&lt;abstract&gt;Widget]
 	
-	[NumericalRangeFormatter
+	[ConstrainedWidthFlexible
 	  |
-	  +min: int?;
-	  +max: int?
+	  +minWidth: double;
+	  +maxWidth: double;
+	  +flex: int;
+	  +flexSum: int;
+	  +child: Widget;
+	  +outerConstraints: BoxConstraints
 	  |
-	  +TextEditingValue formatEditUpdate()
+	  +Widget build();
+	  -double _getWidth()
 	]
 	
-	[&lt;abstract&gt;TextInputFormatter]&lt;:-[NumericalRangeFormatter]
+	[ConstrainedWidthFlexible]o-[&lt;abstract&gt;Widget]
+	[ConstrainedWidthFlexible]o-[BoxConstraints]
 	
-	[StudySequenceFormatter
+	[PrimaryButton
 	  |
-	  +TextEditingValue formatEditUpdate()
+	  +text: String;
+	  +icon: IconData?;
+	  +isLoading: bool;
+	  +showLoadingEarliestAfterMs: int;
+	  +onPressed: void Function()?;
+	  +tooltip: String;
+	  +tooltipDisabled: String;
+	  +enabled: bool;
+	  +onPressedFuture: dynamic Function()?;
+	  +innerPadding: EdgeInsets;
+	  +minimumSize: Size?;
+	  +isDisabled: bool
 	]
 	
-	[&lt;abstract&gt;TextInputFormatter]&lt;:-[StudySequenceFormatter]
+	[PrimaryButton]o-[IconData]
+	[PrimaryButton]o-[void Function()?]
+	[PrimaryButton]o-[dynamic Function()?]
+	[PrimaryButton]o-[EdgeInsets]
+	[PrimaryButton]o-[Size]
 	
-	[CountWhereValidator
-	  |
-	  +predicate: bool Function(T?);
-	  +minCount: int?;
-	  +maxCount: int?;
-	  &lt;static&gt;+kValidationMessageMinCount: String;
-	  &lt;static&gt;+kValidationMessageMaxCount: String
+	[FormTableRow
 	  |
-	  +Map&lt;String, dynamic&gt;? validate()
+	  +label: String?;
+	  +labelBuilder: Widget Function(BuildContext)?;
+	  +labelStyle: TextStyle?;
+	  +labelHelpText: String?;
+	  +input: Widget;
+	  +control: AbstractControl&lt;dynamic&gt;?;
+	  +layout: FormTableRowLayout?
 	]
 	
-	[CountWhereValidator]o-[bool Function(T?)]
-	[&lt;abstract&gt;Validator]&lt;:-[CountWhereValidator]
+	[FormTableRow]o-[Widget Function(BuildContext)?]
+	[FormTableRow]o-[TextStyle]
+	[FormTableRow]o-[&lt;abstract&gt;Widget]
+	[FormTableRow]o-[&lt;abstract&gt;AbstractControl]
+	[FormTableRow]o-[FormTableRowLayout]
 	
-	[Patterns
+	[FormTableLayout
 	  |
-	  &lt;static&gt;+timeFormatString: String;
-	  &lt;static&gt;+emailFormatString: String;
-	  &lt;static&gt;+url: String
+	  +rows: List&lt;FormTableRow&gt;;
+	  +columnWidths: Map&lt;int, TableColumnWidth&gt;;
+	  +rowDivider: Widget?;
+	  +rowLayout: FormTableRowLayout?;
+	  +rowLabelStyle: TextStyle?
+	  |
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;ExecutionLimiter
+	[FormTableLayout]o-[&lt;abstract&gt;Widget]
+	[FormTableLayout]o-[FormTableRowLayout]
+	[FormTableLayout]o-[TextStyle]
+	
+	[FormSectionHeader
 	  |
-	  +milliseconds: int;
-	  &lt;static&gt;-_timer: Timer?
+	  +title: String;
+	  +titleTextStyle: TextStyle?;
+	  +helpText: String?;
+	  +divider: bool;
+	  +helpTextDisabled: bool
 	  |
-	  +void dispose()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;ExecutionLimiter]o-[Timer]
+	[FormSectionHeader]o-[TextStyle]
 	
-	[Debouncer
+	[FormLabel
 	  |
-	  +leading: bool;
-	  +cancelUncompleted: bool;
-	  -_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?
+	  +labelText: String?;
+	  +helpText: String?;
+	  +labelTextStyle: TextStyle?;
+	  +layout: FormTableRowLayout?
 	  |
-	  +dynamic call()
+	  +Widget build()
 	]
 	
-	[Debouncer]o-[CancelableOperation]
-	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Debouncer]
+	[FormLabel]o-[TextStyle]
+	[FormLabel]o-[FormTableRowLayout]
 	
-	[Throttler
+	[FormTableRowLayout
 	  |
-	  +dynamic call()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;FormTableRowLayout&gt;;
+	  &lt;static&gt;+vertical: FormTableRowLayout;
+	  &lt;static&gt;+horizontal: FormTableRowLayout
 	]
 	
-	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Throttler]
+	[FormTableRowLayout]o-[FormTableRowLayout]
+	[Enum]&lt;:--[FormTableRowLayout]
 	
-	[ModelAction
+	[DismissButton
 	  |
-	  +type: T;
-	  +label: String;
-	  +icon: IconData?;
-	  +onExecute: Function;
-	  +isAvailable: bool;
-	  +isDestructive: bool
+	  +onPressed: void Function()?;
+	  +text: String?
+	  |
+	  +Widget build()
 	]
 	
-	[ModelAction]o-[IconData]
+	[DismissButton]o-[void Function()?]
 	
-	[&lt;abstract&gt;IModelActionProvider
+	[Badge
 	  |
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
-	]
-	
-	[&lt;abstract&gt;IListActionProvider
+	  +icon: IconData?;
+	  +color: Color?;
+	  +borderRadius: double;
+	  +label: String;
+	  +type: BadgeType;
+	  +padding: EdgeInsets;
+	  +iconSize: double?;
+	  +labelStyle: TextStyle?;
+	  +center: bool
 	  |
-	  +void onSelectItem();
-	  +void onNewItem()
+	  +Widget build();
+	  -Color? _getBackgroundColor();
+	  -Color _getBorderColor();
+	  -Color? _getLabelColor()
 	]
 	
-	[&lt;abstract&gt;IModelActionProvider]&lt;:-[&lt;abstract&gt;IListActionProvider]
+	[Badge]o-[IconData]
+	[Badge]o-[Color]
+	[Badge]o-[BadgeType]
+	[Badge]o-[EdgeInsets]
+	[Badge]o-[TextStyle]
 	
-	[ModelActionType
+	[BadgeType
 	  |
 	  +index: int;
-	  &lt;static&gt;+values: List&lt;ModelActionType&gt;;
-	  &lt;static&gt;+edit: ModelActionType;
-	  &lt;static&gt;+delete: ModelActionType;
-	  &lt;static&gt;+remove: ModelActionType;
-	  &lt;static&gt;+duplicate: ModelActionType;
-	  &lt;static&gt;+clipboard: ModelActionType;
-	  &lt;static&gt;+primary: ModelActionType
+	  &lt;static&gt;+values: List&lt;BadgeType&gt;;
+	  &lt;static&gt;+filled: BadgeType;
+	  &lt;static&gt;+outlined: BadgeType;
+	  &lt;static&gt;+outlineFill: BadgeType;
+	  &lt;static&gt;+plain: BadgeType
 	]
 	
-	[ModelActionType]o-[ModelActionType]
-	[Enum]&lt;:--[ModelActionType]
-	
-	[Config
-	  |
-	  &lt;static&gt;+isDebugMode: bool;
-	  &lt;static&gt;+defaultLocale: Set&lt;String&gt;;
-	  &lt;static&gt;+supportedLocales: Map&lt;String, String&gt;;
-	  &lt;static&gt;+newStudyId: String;
-	  &lt;static&gt;+newModelId: String;
-	  &lt;static&gt;+minSplashTime: int;
-	  &lt;static&gt;+formAutosaveDebounce: int
-	]
+	[BadgeType]o-[BadgeType]
+	[Enum]&lt;:--[BadgeType]
 	
-	[&lt;abstract&gt;IAuthRepository
+	[StandardDialog
 	  |
-	  +allowPasswordReset: bool;
-	  +currentUser: User?;
-	  +isLoggedIn: bool;
-	  +session: Session?;
-	  +serializedSession: String?
+	  +title: Widget?;
+	  +titleText: String?;
+	  +body: Widget;
+	  +actionButtons: List&lt;Widget&gt;;
+	  +backgroundColor: Color?;
+	  +borderRadius: double?;
+	  +width: double?;
+	  +height: double?;
+	  +minWidth: double;
+	  +minHeight: double;
+	  +maxWidth: double?;
+	  +maxHeight: double?;
+	  +padding: EdgeInsets
 	  |
-	  +dynamic signUp();
-	  +dynamic signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic updateUser();
-	  +void dispose()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IAuthRepository]o-[User]
-	[&lt;abstract&gt;IAuthRepository]o-[Session]
-	[&lt;abstract&gt;IAppDelegate]&lt;:-[&lt;abstract&gt;IAuthRepository]
+	[StandardDialog]o-[&lt;abstract&gt;Widget]
+	[StandardDialog]o-[Color]
+	[StandardDialog]o-[EdgeInsets]
 	
-	[AuthRepository
-	  |
-	  +supabaseClient: SupabaseClient;
-	  +allowPasswordReset: bool;
-	  +authClient: GoTrueClient;
-	  +session: Session?;
-	  +serializedSession: String?;
-	  +currentUser: User?;
-	  +isLoggedIn: bool
+	[&lt;abstract&gt;ISyncIndicatorViewModel
 	  |
-	  -void _registerAuthListener();
-	  +dynamic signUp();
-	  +dynamic signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic updateUser();
-	  +void dispose();
-	  +dynamic onAppStart()
+	  +isDirty: bool;
+	  +lastSynced: DateTime?
 	]
 	
-	[AuthRepository]o-[SupabaseClient]
-	[AuthRepository]o-[GoTrueClient]
-	[AuthRepository]o-[Session]
-	[AuthRepository]o-[User]
-	[&lt;abstract&gt;IAuthRepository]&lt;:--[AuthRepository]
-	
-	[&lt;abstract&gt;IInviteCodeRepository
+	[SyncIndicator
 	  |
-	  +dynamic isCodeAlreadyUsed()
+	  +state: AsyncValue&lt;T&gt;;
+	  +lastSynced: DateTime?;
+	  +isDirty: bool;
+	  +animationDuration: int;
+	  +iconSize: double
 	]
 	
-	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IInviteCodeRepository]
+	[SyncIndicator]o-[&lt;abstract&gt;AsyncValue]
 	
-	[InviteCodeRepository
-	  |
-	  +studyId: String;
-	  +ref: ProviderRef&lt;dynamic&gt;;
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +studyRepository: IStudyRepository;
-	  +study: Study
+	[&lt;abstract&gt;IWithBanner
 	  |
-	  +String getKey();
-	  +dynamic isCodeAlreadyUsed();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +dynamic emitUpdate()
+	  +Widget? banner()
 	]
 	
-	[InviteCodeRepository]o-[&lt;abstract&gt;ProviderRef]
-	[InviteCodeRepository]o-[&lt;abstract&gt;StudyUApi]
-	[InviteCodeRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[InviteCodeRepository]o-[&lt;abstract&gt;IStudyRepository]
-	[InviteCodeRepository]o-[Study]
-	[&lt;abstract&gt;ModelRepository]&lt;:-[InviteCodeRepository]
-	[&lt;abstract&gt;IInviteCodeRepository]&lt;:--[InviteCodeRepository]
-	
-	[InviteCodeRepositoryDelegate
-	  |
-	  +study: Study;
-	  +apiClient: StudyUApi;
-	  +studyRepository: IStudyRepository
+	[BannerBox
 	  |
-	  +dynamic fetch();
-	  +dynamic fetchAll();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic onError();
-	  +StudyInvite createDuplicate();
-	  +StudyInvite createNewInstance()
+	  +prefixIcon: Widget?;
+	  +body: Widget;
+	  +style: BannerStyle;
+	  +padding: EdgeInsets?;
+	  +noPrefix: bool;
+	  +dismissable: bool;
+	  +isDismissed: bool?;
+	  +onDismissed: dynamic Function()?;
+	  +dismissIconSize: double
 	]
 	
-	[InviteCodeRepositoryDelegate]o-[Study]
-	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
-	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;IStudyRepository]
-	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[InviteCodeRepositoryDelegate]
+	[BannerBox]o-[&lt;abstract&gt;Widget]
+	[BannerBox]o-[BannerStyle]
+	[BannerBox]o-[EdgeInsets]
+	[BannerBox]o-[dynamic Function()?]
 	
-	[StudyLaunched
+	[BannerStyle
+	  |
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;BannerStyle&gt;;
+	  &lt;static&gt;+warning: BannerStyle;
+	  &lt;static&gt;+info: BannerStyle;
+	  &lt;static&gt;+error: BannerStyle
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[StudyLaunched]
+	[BannerStyle]o-[BannerStyle]
+	[Enum]&lt;:--[BannerStyle]
 	
-	[WrappedModel
+	[ActionMenuInline
 	  |
-	  -_model: T;
-	  +asyncValue: AsyncValue&lt;T&gt;;
-	  +isLocalOnly: bool;
-	  +isDirty: bool;
-	  +isDeleted: bool;
-	  +lastSaved: DateTime?;
-	  +lastFetched: DateTime?;
-	  +lastUpdated: DateTime?;
-	  +model: T
+	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
+	  +iconSize: double?;
+	  +visible: bool;
+	  +splashRadius: double?;
+	  +paddingVertical: double?;
+	  +paddingHorizontal: double?
 	  |
-	  +dynamic markWithError();
-	  +dynamic markAsLoading();
-	  +dynamic markAsFetched();
-	  +dynamic markAsSaved()
+	  +Widget build()
 	]
 	
-	[WrappedModel]o-[&lt;abstract&gt;AsyncValue]
-	
-	[ModelRepositoryException
+	[Collapsible
+	  |
+	  +contentBuilder: Widget Function(BuildContext, bool);
+	  +headerBuilder: Widget Function(BuildContext, bool)?;
+	  +title: String?;
+	  +isCollapsed: bool
 	]
 	
-	[Exception]&lt;:--[ModelRepositoryException]
+	[Collapsible]o-[Widget Function(BuildContext, bool)]
+	[Collapsible]o-[Widget Function(BuildContext, bool)?]
 	
-	[ModelNotFoundException
+	[NavbarTab
+	  |
+	  +title: String;
+	  +intent: RoutingIntent?;
+	  +index: int;
+	  +enabled: bool
 	]
 	
-	[ModelRepositoryException]&lt;:--[ModelNotFoundException]
+	[NavbarTab]o-[RoutingIntent]
 	
-	[&lt;abstract&gt;IModelRepository
+	[TabbedNavbar
 	  |
-	  +String getKey();
-	  +WrappedModel&lt;T&gt;? get();
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic duplicateAndSave();
-	  +dynamic duplicateAndSaveFromRemote();
-	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
-	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
-	  +dynamic ensurePersisted();
-	  +void dispose()
+	  +tabs: List&lt;T&gt;;
+	  +selectedTab: T?;
+	  +indicator: BoxDecoration?;
+	  +height: double?;
+	  +disabledBackgroundColor: Color?;
+	  +disabledTooltipText: String?;
+	  +onSelect: void Function(int, T)?;
+	  +labelPadding: EdgeInsets?;
+	  +labelSpacing: double?;
+	  +indicatorSize: TabBarIndicatorSize?;
+	  +isScrollable: bool;
+	  +backgroundColor: Color?;
+	  +labelColorHover: Color?;
+	  +unselectedLabelColorHover: Color?
 	]
 	
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[&lt;abstract&gt;IModelRepository]
+	[TabbedNavbar]o-[BoxDecoration]
+	[TabbedNavbar]o-[Color]
+	[TabbedNavbar]o-[void Function(int, T)?]
+	[TabbedNavbar]o-[EdgeInsets]
+	[TabbedNavbar]o-[TabBarIndicatorSize]
 	
-	[&lt;abstract&gt;IModelRepositoryDelegate
+	[SidesheetTab
 	  |
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +T createNewInstance();
-	  +T createDuplicate();
-	  +dynamic onError()
+	  +builder: Widget Function(BuildContext)
 	]
 	
-	[&lt;abstract&gt;ModelRepository
+	[SidesheetTab]o-[Widget Function(BuildContext)]
+	[NavbarTab]&lt;:-[SidesheetTab]
+	
+	[Sidesheet
 	  |
-	  +delegate: IModelRepositoryDelegate&lt;T&gt;;
-	  -_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;;
-	  -_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;;
-	  +modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;;
-	  +modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;;
-	  -_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;
-	  |
-	  +WrappedModel&lt;T&gt;? get();
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic duplicateAndSave();
-	  +dynamic duplicateAndSaveFromRemote();
-	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
-	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
-	  -dynamic _buildModelSpecificController();
-	  +dynamic ensurePersisted();
-	  +WrappedModel&lt;T&gt; upsertLocally();
-	  +List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally();
-	  +dynamic emitUpdate();
-	  +dynamic emitModelEvent();
-	  +dynamic emitError();
-	  +void dispose();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
+	  &lt;static&gt;+kDefaultWidth: double;
+	  +titleText: String;
+	  +body: Widget?;
+	  +tabs: List&lt;SidesheetTab&gt;?;
+	  +actionButtons: List&lt;Widget&gt;?;
+	  +width: double?;
+	  +withCloseButton: bool;
+	  +ignoreAppBar: bool;
+	  +collapseSingleTab: bool;
+	  +bodyPadding: EdgeInsets?;
+	  +wrapContent: Widget Function(Widget)?
 	]
 	
-	[&lt;abstract&gt;ModelRepository]o-[&lt;abstract&gt;IModelRepositoryDelegate]
-	[&lt;abstract&gt;ModelRepository]o-[BehaviorSubject]
-	[&lt;abstract&gt;IModelRepository]&lt;:-[&lt;abstract&gt;ModelRepository]
+	[Sidesheet]o-[&lt;abstract&gt;Widget]
+	[Sidesheet]o-[EdgeInsets]
+	[Sidesheet]o-[Widget Function(Widget)?]
 	
-	[&lt;abstract&gt;StudyUApi
+	[FormSideSheetTab
 	  |
-	  +dynamic saveStudy();
-	  +dynamic fetchStudy();
-	  +dynamic getUserStudies();
-	  +dynamic deleteStudy();
-	  +dynamic saveStudyInvite();
-	  +dynamic fetchStudyInvite();
-	  +dynamic deleteStudyInvite();
-	  +dynamic deleteParticipants();
-	  +dynamic fetchAppConfig();
-	  +dynamic fetchUser();
-	  +dynamic saveUser()
-	]
-	
-	[APIException
-	]
-	
-	[Exception]&lt;:--[APIException]
-	
-	[StudyNotFoundException
+	  +formViewBuilder: Widget Function(T)
 	]
 	
-	[APIException]&lt;:-[StudyNotFoundException]
+	[FormSideSheetTab]o-[Widget Function(T)]
+	[NavbarTab]&lt;:-[FormSideSheetTab]
 	
-	[MeasurementNotFoundException
+	[HelpIcon
+	  |
+	  +tooltipText: String?
+	  |
+	  +Widget build()
 	]
 	
-	[APIException]&lt;:-[MeasurementNotFoundException]
-	
-	[QuestionNotFoundException
+	[EmptyBody
+	  |
+	  +icon: IconData?;
+	  +leading: Widget?;
+	  +leadingSpacing: double?;
+	  +title: String?;
+	  +description: String?;
+	  +button: Widget?
+	  |
+	  +Widget build()
 	]
 	
-	[APIException]&lt;:-[QuestionNotFoundException]
+	[EmptyBody]o-[IconData]
+	[EmptyBody]o-[&lt;abstract&gt;Widget]
 	
-	[ConsentItemNotFoundException
+	[IndicatorRangeSliderThumbShape
+	  |
+	  +buildContext: BuildContext;
+	  +start: T;
+	  +end: T
+	  |
+	  +Size getPreferredSize();
+	  +void paint()
 	]
 	
-	[APIException]&lt;:-[ConsentItemNotFoundException]
+	[IndicatorRangeSliderThumbShape]o-[&lt;abstract&gt;BuildContext]
+	[&lt;abstract&gt;RangeSliderThumbShape]&lt;:-[IndicatorRangeSliderThumbShape]
 	
-	[InterventionNotFoundException
+	[MouseEventsRegion
+	  |
+	  +onTap: void Function()?;
+	  +onHover: void Function(PointerHoverEvent)?;
+	  +onEnter: void Function(PointerEnterEvent)?;
+	  +onExit: void Function(PointerExitEvent)?;
+	  +autoselectCursor: bool;
+	  +cursor: SystemMouseCursor;
+	  &lt;static&gt;+defaultCursor: SystemMouseCursor;
+	  +autoCursor: SystemMouseCursor
 	]
 	
-	[APIException]&lt;:-[InterventionNotFoundException]
+	[MouseEventsRegion]o-[void Function()?]
+	[MouseEventsRegion]o-[void Function(PointerHoverEvent)?]
+	[MouseEventsRegion]o-[void Function(PointerEnterEvent)?]
+	[MouseEventsRegion]o-[void Function(PointerExitEvent)?]
+	[MouseEventsRegion]o-[SystemMouseCursor]
 	
-	[InterventionTaskNotFoundException
+	[ReactiveCustomColorPicker
 	]
 	
-	[APIException]&lt;:-[InterventionTaskNotFoundException]
+	[ReactiveFormField]&lt;:-[ReactiveCustomColorPicker]
 	
-	[ReportNotFoundException
+	[TextParagraph
+	  |
+	  +text: String?;
+	  +style: TextStyle?;
+	  +selectable: bool;
+	  +span: List&lt;TextSpan&gt;?
+	  |
+	  +Widget build()
 	]
 	
-	[APIException]&lt;:-[ReportNotFoundException]
+	[TextParagraph]o-[TextStyle]
 	
-	[ReportSectionNotFoundException
+	[UnderConstruction
+	  |
+	  +Widget build()
 	]
 	
-	[APIException]&lt;:-[ReportSectionNotFoundException]
-	
-	[StudyInviteNotFoundException
+	[NullHelperDecoration
 	]
 	
-	[APIException]&lt;:-[StudyInviteNotFoundException]
+	[InputDecoration]&lt;:-[NullHelperDecoration]
 	
-	[UserNotFoundException
+	[ActionMenuType
+	  |
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ActionMenuType&gt;;
+	  &lt;static&gt;+inline: ActionMenuType;
+	  &lt;static&gt;+popup: ActionMenuType
 	]
 	
-	[APIException]&lt;:-[UserNotFoundException]
+	[ActionMenuType]o-[ActionMenuType]
+	[Enum]&lt;:--[ActionMenuType]
 	
-	[StudyUApiClient
+	[HtmlStylingBanner
 	  |
-	  +supabaseClient: SupabaseClient;
-	  &lt;static&gt;+studyColumns: List&lt;String&gt;;
-	  &lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;;
-	  +testDelayMilliseconds: int
+	  +isDismissed: bool;
+	  +onDismissed: dynamic Function()?
 	  |
-	  +dynamic deleteParticipants();
-	  +dynamic getUserStudies();
-	  +dynamic fetchStudy();
-	  +dynamic deleteStudy();
-	  +dynamic saveStudy();
-	  +dynamic fetchStudyInvite();
-	  +dynamic saveStudyInvite();
-	  +dynamic deleteStudyInvite();
-	  +dynamic fetchAppConfig();
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  -dynamic _awaitGuarded();
-	  -dynamic _apiException();
-	  -dynamic _testDelay()
+	  +Widget build()
 	]
 	
-	[StudyUApiClient]o-[SupabaseClient]
-	[&lt;abstract&gt;SupabaseClientDependant]&lt;:-[StudyUApiClient]
-	[&lt;abstract&gt;SupabaseQueryMixin]&lt;:-[StudyUApiClient]
-	[&lt;abstract&gt;StudyUApi]&lt;:--[StudyUApiClient]
+	[HtmlStylingBanner]o-[dynamic Function()?]
 	
-	[&lt;abstract&gt;ModelEvent
+	[&lt;abstract&gt;FormConsumerWidget
 	  |
-	  +modelId: String;
-	  +model: T
+	  +Widget build()
 	]
 	
-	[IsFetched
+	[&lt;abstract&gt;FormConsumerRefWidget
+	  |
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsFetched]
-	
-	[IsSaving
+	[SplashPage
+	  |
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaving]
-	
-	[IsSaved
+	[ErrorPage
+	  |
+	  +error: Exception?
+	  |
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaved]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ErrorPage]
 	
-	[IsDeleted
+	[StudyULogo
+	  |
+	  +onTap: void Function()?
+	  |
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsDeleted]
+	[StudyULogo]o-[void Function()?]
 	
-	[&lt;abstract&gt;SupabaseClientDependant
+	[SingleColumnLayout
 	  |
-	  +supabaseClient: SupabaseClient
+	  &lt;static&gt;+defaultConstraints: BoxConstraints;
+	  &lt;static&gt;+defaultConstraintsNarrow: BoxConstraints;
+	  +body: Widget;
+	  +header: Widget?;
+	  +stickyHeader: bool;
+	  +constraints: BoxConstraints?;
+	  +scroll: bool;
+	  +padding: EdgeInsets?
+	  |
+	  &lt;static&gt;+dynamic fromType()
 	]
 	
-	[&lt;abstract&gt;SupabaseClientDependant]o-[SupabaseClient]
+	[SingleColumnLayout]o-[BoxConstraints]
+	[SingleColumnLayout]o-[&lt;abstract&gt;Widget]
+	[SingleColumnLayout]o-[EdgeInsets]
 	
-	[SupabaseQueryError
+	[SingleColumnLayoutType
 	  |
-	  +statusCode: String?;
-	  +message: String;
-	  +details: dynamic
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;;
+	  &lt;static&gt;+boundedWide: SingleColumnLayoutType;
+	  &lt;static&gt;+boundedNarrow: SingleColumnLayoutType;
+	  &lt;static&gt;+stretched: SingleColumnLayoutType;
+	  &lt;static&gt;+split: SingleColumnLayoutType
 	]
 	
-	[Exception]&lt;:--[SupabaseQueryError]
+	[SingleColumnLayoutType]o-[SingleColumnLayoutType]
+	[Enum]&lt;:--[SingleColumnLayoutType]
 	
-	[&lt;abstract&gt;SupabaseQueryMixin
+	[Hyperlink
 	  |
-	  +dynamic deleteAll();
-	  +dynamic getAll();
-	  +dynamic getById();
-	  +dynamic getByColumn();
-	  +List&lt;T&gt; deserializeList();
-	  +T deserializeObject()
-	]
-	
-	[&lt;abstract&gt;IStudyRepository
-	  |
-	  +dynamic launch();
-	  +dynamic deleteParticipants()
+	  +text: String;
+	  +url: String?;
+	  +onClick: void Function()?;
+	  +linkColor: Color;
+	  +hoverColor: Color?;
+	  +visitedColor: Color?;
+	  +style: TextStyle?;
+	  +hoverStyle: TextStyle?;
+	  +visitedStyle: TextStyle?;
+	  +icon: IconData?;
+	  +iconSize: double?
 	]
 	
-	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IStudyRepository]
+	[Hyperlink]o-[void Function()?]
+	[Hyperlink]o-[Color]
+	[Hyperlink]o-[TextStyle]
+	[Hyperlink]o-[IconData]
 	
-	[StudyRepository
-	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +ref: ProviderRef&lt;dynamic&gt;;
-	  +sortCallback: void Function()?
+	[StandardTableColumn
 	  |
-	  +String getKey();
-	  +dynamic deleteParticipants();
-	  +dynamic launch();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
+	  +label: String;
+	  +tooltip: String?;
+	  +columnWidth: TableColumnWidth;
+	  +sortable: bool;
+	  +sortAscending: bool?;
+	  +sortableIcon: Widget?
 	]
 	
-	[StudyRepository]o-[&lt;abstract&gt;StudyUApi]
-	[StudyRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyRepository]o-[&lt;abstract&gt;ProviderRef]
-	[StudyRepository]o-[void Function()?]
-	[&lt;abstract&gt;ModelRepository]&lt;:-[StudyRepository]
-	[&lt;abstract&gt;IStudyRepository]&lt;:--[StudyRepository]
+	[StandardTableColumn]o-[&lt;abstract&gt;TableColumnWidth]
+	[StandardTableColumn]o-[&lt;abstract&gt;Widget]
 	
-	[StudyRepositoryDelegate
-	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository
+	[StandardTable
 	  |
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic onError();
-	  +Study createNewInstance();
-	  +Study createDuplicate()
+	  +items: List&lt;T&gt;;
+	  +inputColumns: List&lt;StandardTableColumn&gt;;
+	  +onSelectItem: void Function(T);
+	  +trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?;
+	  +trailingActionsMenuType: ActionMenuType?;
+	  +sortColumnPredicates: List&lt;int Function(T, T)?&gt;?;
+	  +pinnedPredicates: int Function(T, T)?;
+	  +headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
+	  +dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
+	  +inputTrailingActionsColumn: StandardTableColumn;
+	  +tableWrapper: Widget Function(Widget)?;
+	  +cellSpacing: double;
+	  +rowSpacing: double;
+	  +minRowHeight: double?;
+	  +showTableHeader: bool;
+	  +hideLeadingTrailingWhenEmpty: bool;
+	  +leadingWidget: Widget?;
+	  +trailingWidget: Widget?;
+	  +leadingWidgetSpacing: double?;
+	  +trailingWidgetSpacing: double?;
+	  +emptyWidget: Widget?;
+	  +rowStyle: StandardTableStyle;
+	  +disableRowInteractions: bool
 	]
 	
-	[StudyRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
-	[StudyRepositoryDelegate]o-[&lt;abstract&gt;IAuthRepository]
-	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[StudyRepositoryDelegate]
+	[StandardTable]o-[void Function(T)]
+	[StandardTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?]
+	[StandardTable]o-[ActionMenuType]
+	[StandardTable]o-[int Function(T, T)?]
+	[StandardTable]o-[TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?]
+	[StandardTable]o-[StandardTableColumn]
+	[StandardTable]o-[Widget Function(Widget)?]
+	[StandardTable]o-[&lt;abstract&gt;Widget]
+	[StandardTable]o-[StandardTableStyle]
 	
-	[&lt;abstract&gt;IUserRepository
-	  |
-	  +user: StudyUUser
+	[StandardTableStyle
 	  |
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  +dynamic updatePreferences()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StandardTableStyle&gt;;
+	  &lt;static&gt;+plain: StandardTableStyle;
+	  &lt;static&gt;+material: StandardTableStyle
 	]
 	
-	[&lt;abstract&gt;IUserRepository]o-[StudyUUser]
+	[StandardTableStyle]o-[StandardTableStyle]
+	[Enum]&lt;:--[StandardTableStyle]
 	
-	[UserRepository
+	[IconPack
 	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +ref: Ref&lt;Object?&gt;;
-	  +user: StudyUUser
+	  &lt;static&gt;+defaultPack: List&lt;IconOption&gt;;
+	  &lt;static&gt;+material: List&lt;IconOption&gt;
 	  |
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  +dynamic updatePreferences()
+	  &lt;static&gt;+IconOption? resolveIconByName()
 	]
 	
-	[UserRepository]o-[&lt;abstract&gt;StudyUApi]
-	[UserRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[UserRepository]o-[&lt;abstract&gt;Ref]
-	[UserRepository]o-[StudyUUser]
-	[&lt;abstract&gt;IUserRepository]&lt;:--[UserRepository]
-	
-	[PreferenceAction
+	[IconOption
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;PreferenceAction&gt;;
-	  &lt;static&gt;+pin: PreferenceAction;
-	  &lt;static&gt;+pinOff: PreferenceAction
+	  +name: String;
+	  +icon: IconData?;
+	  +isEmpty: bool;
+	  +props: List&lt;Object?&gt;
+	  |
+	  +String toJson();
+	  &lt;static&gt;+IconOption fromJson()
 	]
 	
-	[PreferenceAction]o-[PreferenceAction]
-	[Enum]&lt;:--[PreferenceAction]
+	[IconOption]o-[IconData]
+	[&lt;abstract&gt;Equatable]&lt;:-[IconOption]
 	
-	[&lt;abstract&gt;IAppRepository
-	  |
-	  +dynamic fetchAppConfig();
-	  +void dispose()
+	[ReactiveIconPicker
 	]
 	
-	[AppRepository
+	[ReactiveFocusableFormField]&lt;:-[ReactiveIconPicker]
+	
+	[IconPicker
 	  |
-	  +apiClient: StudyUApi
+	  +iconOptions: List&lt;IconOption&gt;;
+	  +selectedOption: IconOption?;
+	  +onSelect: void Function(IconOption)?;
+	  +galleryIconSize: double?;
+	  +selectedIconSize: double?;
+	  +focusNode: FocusNode?;
+	  +isDisabled: bool
 	  |
-	  +dynamic fetchAppConfig();
-	  +void dispose()
+	  +Widget build()
 	]
 	
-	[AppRepository]o-[&lt;abstract&gt;StudyUApi]
-	[&lt;abstract&gt;IAppRepository]&lt;:--[AppRepository]
+	[IconPicker]o-[IconOption]
+	[IconPicker]o-[void Function(IconOption)?]
+	[IconPicker]o-[FocusNode]
 	
-	[WebFrame
+	[IconPickerField
 	  |
-	  +previewSrc: String;
-	  +studyId: String
+	  +iconOptions: List&lt;IconOption&gt;;
+	  +selectedOption: IconOption?;
+	  +selectedIconSize: double?;
+	  +galleryIconSize: double?;
+	  +onSelect: void Function(IconOption)?;
+	  +focusNode: FocusNode?;
+	  +isDisabled: bool
 	  |
 	  +Widget build()
 	]
 	
-	[DisabledFrame
+	[IconPickerField]o-[IconOption]
+	[IconPickerField]o-[void Function(IconOption)?]
+	[IconPickerField]o-[FocusNode]
+	
+	[IconPickerGallery
+	  |
+	  +iconOptions: List&lt;IconOption&gt;;
+	  +onSelect: void Function(IconOption)?;
+	  +iconSize: double
 	  |
 	  +Widget build()
 	]
 	
-	[PhoneContainer
+	[IconPickerGallery]o-[void Function(IconOption)?]
+	
+	[SecondaryButton
 	  |
-	  &lt;static&gt;+defaultWidth: double;
-	  &lt;static&gt;+defaultHeight: double;
-	  +width: double;
-	  +height: double;
-	  +borderColor: Color;
-	  +borderWidth: double;
-	  +borderRadius: double;
-	  +innerContent: Widget;
-	  +innerContentBackgroundColor: Color?
+	  +text: String;
+	  +icon: IconData?;
+	  +isLoading: bool;
+	  +onPressed: void Function()?
 	  |
 	  +Widget build()
 	]
 	
-	[PhoneContainer]o-[Color]
-	[PhoneContainer]o-[&lt;abstract&gt;Widget]
+	[SecondaryButton]o-[IconData]
+	[SecondaryButton]o-[void Function()?]
 	
-	[MobileFrame
+	[TwoColumnLayout
 	  |
-	  +Widget build()
+	  &lt;static&gt;+defaultDivider: VerticalDivider;
+	  &lt;static&gt;+defaultContentPadding: EdgeInsets;
+	  &lt;static&gt;+slimContentPadding: EdgeInsets;
+	  +leftWidget: Widget;
+	  +rightWidget: Widget;
+	  +dividerWidget: Widget?;
+	  +headerWidget: Widget?;
+	  +flexLeft: int?;
+	  +flexRight: int?;
+	  +constraintsLeft: BoxConstraints?;
+	  +constraintsRight: BoxConstraints?;
+	  +scrollLeft: bool;
+	  +scrollRight: bool;
+	  +paddingLeft: EdgeInsets?;
+	  +paddingRight: EdgeInsets?;
+	  +backgroundColorLeft: Color?;
+	  +backgroundColorRight: Color?;
+	  +stretchHeight: bool
 	]
 	
-	[DesktopFrame
+	[TwoColumnLayout]o-[VerticalDivider]
+	[TwoColumnLayout]o-[EdgeInsets]
+	[TwoColumnLayout]o-[&lt;abstract&gt;Widget]
+	[TwoColumnLayout]o-[BoxConstraints]
+	[TwoColumnLayout]o-[Color]
+	
+	[AppTranslation
 	  |
-	  +Widget build()
+	  &lt;static&gt;+dynamic init()
 	]
 	
-	[StudyController
+	[&lt;abstract&gt;PlatformLocale
 	  |
-	  +notificationService: INotificationService;
-	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
-	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
+	  +Locale getPlatformLocale()
+	]
+	
+	[PlatformLocaleWeb
 	  |
-	  +dynamic syncStudyStatus();
-	  +dynamic onStudySubscriptionUpdate();
-	  -dynamic _redirectNewToActualStudyID();
-	  +dynamic publishStudy();
-	  +void onChangeStudyParticipation();
-	  +void onAddParticipants();
-	  +void onSettingsPressed();
-	  +void dispose()
+	  +Locale getPlatformLocale()
 	]
 	
-	[StudyController]o-[&lt;abstract&gt;INotificationService]
-	[StudyController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyController]
+	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleWeb]
 	
-	[&lt;abstract&gt;IStudyAppBarViewModel
+	[PlatformLocaleMobile
 	  |
-	  +isSyncIndicatorVisible: bool;
-	  +isStatusBadgeVisible: bool;
-	  +isPublishVisible: bool
+	  +Locale getPlatformLocale()
 	]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
+	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleMobile]
 	
-	[StudyScaffold
+	[LanguagePicker
 	  |
-	  +studyId: String;
-	  +tabs: List&lt;NavbarTab&gt;?;
-	  +tabsSubnav: List&lt;NavbarTab&gt;?;
-	  +selectedTab: NavbarTab?;
-	  +selectedTabSubnav: NavbarTab?;
-	  +body: StudyPageWidget;
-	  +drawer: Widget?;
-	  +disableActions: bool;
-	  +actionsSpacing: double;
-	  +actionsPadding: double;
-	  +layoutType: SingleColumnLayoutType?;
-	  +appbarHeight: double;
-	  +appbarSubnavHeight: double
+	  +languagePickerType: LanguagePickerType;
+	  +iconColor: Color?;
+	  +offset: Offset?
 	]
 	
-	[StudyScaffold]o-[NavbarTab]
-	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
-	[StudyScaffold]o-[&lt;abstract&gt;Widget]
-	[StudyScaffold]o-[SingleColumnLayoutType]
+	[LanguagePicker]o-[LanguagePickerType]
+	[LanguagePicker]o-[Color]
+	[LanguagePicker]o-[Offset]
 	
-	[PreviewFrame
+	[LanguagePickerType
 	  |
-	  +studyId: String;
-	  +routeArgs: StudyFormRouteArgs?;
-	  +route: String?
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;LanguagePickerType&gt;;
+	  &lt;static&gt;+field: LanguagePickerType;
+	  &lt;static&gt;+icon: LanguagePickerType
 	]
 	
-	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
+	[LanguagePickerType]o-[LanguagePickerType]
+	[Enum]&lt;:--[LanguagePickerType]
 	
-	[RouteInformation
-	  |
-	  +route: String?;
-	  +extra: String?;
-	  +cmd: String?;
-	  +data: String?
+	[&lt;abstract&gt;GoRouteParamEnum
 	  |
-	  +String toString()
+	  +String toRouteParam();
+	  +String toShortString()
 	]
 	
-	[&lt;abstract&gt;PlatformController
-	  |
-	  +studyId: String;
-	  +baseSrc: String;
-	  +previewSrc: String;
-	  +routeInformation: RouteInformation;
-	  +frameWidget: Widget
+	[RoutingIntents
 	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void listen();
-	  +void send();
-	  +void openNewPage()
+	  &lt;static&gt;+root: RoutingIntent;
+	  &lt;static&gt;+studies: RoutingIntent;
+	  &lt;static&gt;+studiesShared: RoutingIntent;
+	  &lt;static&gt;+publicRegistry: RoutingIntent;
+	  &lt;static&gt;+study: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEdit: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditInfo: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditInterventions: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String);
+	  &lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditReports: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String);
+	  &lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute});
+	  &lt;static&gt;+studyRecruit: RoutingIntent Function(String);
+	  &lt;static&gt;+studyMonitor: RoutingIntent Function(String);
+	  &lt;static&gt;+studyAnalyze: RoutingIntent Function(String);
+	  &lt;static&gt;+studySettings: RoutingIntent Function(String);
+	  &lt;static&gt;+accountSettings: RoutingIntent;
+	  &lt;static&gt;+studyNew: RoutingIntent;
+	  &lt;static&gt;+login: RoutingIntent;
+	  &lt;static&gt;+signup: RoutingIntent;
+	  &lt;static&gt;+passwordForgot: RoutingIntent;
+	  &lt;static&gt;+passwordForgot2: RoutingIntent Function(String);
+	  &lt;static&gt;+passwordRecovery: RoutingIntent;
+	  &lt;static&gt;+error: RoutingIntent Function(Exception)
 	]
 	
-	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
-	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
+	[RoutingIntents]o-[RoutingIntent]
+	[RoutingIntents]o-[RoutingIntent Function(String)]
+	[RoutingIntents]o-[RoutingIntent Function(String, String)]
+	[RoutingIntents]o-[RoutingIntent Function(String, {String? appRoute})]
+	[RoutingIntents]o-[RoutingIntent Function(Exception)]
 	
-	[WebController
+	[RoutingIntent
 	  |
-	  +iFrameElement: IFrameElement
+	  +route: GoRoute;
+	  +params: Map&lt;String, String&gt;;
+	  +queryParams: Map&lt;String, String&gt;;
+	  +dispatch: RoutingIntentDispatch?;
+	  +extra: Object?;
+	  +routeName: String;
+	  +arguments: Map&lt;String, String&gt;;
+	  +props: List&lt;Object?&gt;
 	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void openNewPage();
-	  +void listen();
-	  +void send()
+	  -dynamic _validateRoute();
+	  +bool matches()
 	]
 	
-	[WebController]o-[IFrameElement]
-	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
+	[RoutingIntent]o-[GoRoute]
+	[RoutingIntent]o-[RoutingIntentDispatch]
+	[&lt;abstract&gt;Equatable]&lt;:-[RoutingIntent]
 	
-	[MobileController
+	[RoutingIntentDispatch
 	  |
-	  +void openNewPage();
-	  +void refresh();
-	  +void registerViews();
-	  +void listen();
-	  +void send();
-	  +void navigate();
-	  +void activate();
-	  +void generateUrl()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;;
+	  &lt;static&gt;+go: RoutingIntentDispatch;
+	  &lt;static&gt;+push: RoutingIntentDispatch
 	]
 	
-	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
+	[RoutingIntentDispatch]o-[RoutingIntentDispatch]
+	[Enum]&lt;:--[RoutingIntentDispatch]
 	
-	[StudyParticipationBadge
-	  |
-	  +participation: Participation;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +center: bool
+	[RouterKeys
 	  |
-	  +Widget build()
+	  &lt;static&gt;+studyKey: ValueKey&lt;String&gt;;
+	  &lt;static&gt;+authKey: ValueKey&lt;String&gt;
 	]
 	
-	[StudyParticipationBadge]o-[Participation]
-	[StudyParticipationBadge]o-[BadgeType]
+	[RouterKeys]o-[ValueKey]
 	
-	[StudyTestScreen
+	[RouteParams
 	  |
-	  +previewRoute: String?
+	  &lt;static&gt;+studiesFilter: String;
+	  &lt;static&gt;+studyId: String;
+	  &lt;static&gt;+measurementId: String;
+	  &lt;static&gt;+interventionId: String;
+	  &lt;static&gt;+testAppRoute: String
+	]
+	
+	[RouterConf
 	  |
-	  +Widget build();
-	  +Widget? banner();
-	  +dynamic load();
-	  +dynamic save();
-	  +dynamic showHelp()
+	  &lt;static&gt;+router: GoRouter;
+	  &lt;static&gt;+routes: List&lt;GoRoute&gt;;
+	  &lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;;
+	  &lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;
+	  |
+	  &lt;static&gt;+GoRoute route()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
+	[RouterConf]o-[GoRouter]
 	
-	[TestAppRoutes
+	[&lt;abstract&gt;StudyFormRouteArgs
 	  |
-	  &lt;static&gt;+studyOverview: String;
-	  &lt;static&gt;+eligibility: String;
-	  &lt;static&gt;+intervention: String;
-	  &lt;static&gt;+consent: String;
-	  &lt;static&gt;+journey: String;
-	  &lt;static&gt;+dashboard: String
+	  +studyId: String
 	]
 	
-	[&lt;abstract&gt;IStudyNavViewModel
+	[&lt;abstract&gt;QuestionFormRouteArgs
 	  |
-	  +isEditTabEnabled: bool;
-	  +isTestTabEnabled: bool;
-	  +isRecruitTabEnabled: bool;
-	  +isMonitorTabEnabled: bool;
-	  +isAnalyzeTabEnabled: bool;
-	  +isSettingsEnabled: bool
+	  +questionId: String
 	]
 	
-	[StudyNav
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[&lt;abstract&gt;QuestionFormRouteArgs]
+	
+	[ScreenerQuestionFormRouteArgs
+	]
+	
+	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:-[ScreenerQuestionFormRouteArgs]
+	
+	[ConsentItemFormRouteArgs
 	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic edit();
-	  &lt;static&gt;+dynamic test();
-	  &lt;static&gt;+dynamic recruit();
-	  &lt;static&gt;+dynamic monitor();
-	  &lt;static&gt;+dynamic analyze()
+	  +consentId: String
 	]
 	
-	[StudyDesignNav
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ConsentItemFormRouteArgs]
+	
+	[MeasurementFormRouteArgs
 	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic info();
-	  &lt;static&gt;+dynamic enrollment();
-	  &lt;static&gt;+dynamic interventions();
-	  &lt;static&gt;+dynamic measurements();
-	  &lt;static&gt;+dynamic reports()
+	  +measurementId: String
 	]
 	
-	[StudyTestController
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[MeasurementFormRouteArgs]
+	
+	[SurveyQuestionFormRouteArgs
 	  |
-	  +authRepository: IAuthRepository;
-	  +languageCode: String
+	  +questionId: String
 	]
 	
-	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyBaseController]&lt;:-[StudyTestController]
+	[MeasurementFormRouteArgs]&lt;:-[SurveyQuestionFormRouteArgs]
+	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:--[SurveyQuestionFormRouteArgs]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel
+	[InterventionFormRouteArgs
 	  |
-	  +studyParticipation: Participation?;
-	  +studyStatus: StudyStatus?
+	  +interventionId: String
 	]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[InterventionFormRouteArgs]
 	
-	[StudyStatusBadge
+	[InterventionTaskFormRouteArgs
 	  |
-	  +participation: Participation?;
-	  +status: StudyStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
-	  |
-	  +Widget build()
+	  +taskId: String
 	]
 	
-	[StudyStatusBadge]o-[Participation]
-	[StudyStatusBadge]o-[StudyStatus]
-	[StudyStatusBadge]o-[BadgeType]
+	[InterventionFormRouteArgs]&lt;:-[InterventionTaskFormRouteArgs]
 	
-	[FrameControlsWidget
-	  |
-	  +onRefresh: void Function()?;
-	  +onOpenNewTab: void Function()?;
-	  +enabled: bool
+	[ReportItemFormRouteArgs
 	  |
-	  +Widget build()
+	  +sectionId: String
 	]
 	
-	[FrameControlsWidget]o-[void Function()?]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ReportItemFormRouteArgs]
 	
-	[StudySettingsDialog
+	[DropdownMenuItemTheme
 	  |
-	  +Widget build()
+	  +iconTheme: IconThemeData?
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
+	[DropdownMenuItemTheme]o-[IconThemeData]
+	[&lt;abstract&gt;Diagnosticable]&lt;:-[DropdownMenuItemTheme]
 	
-	[StudySettingsFormViewModel
+	[ThemeConfig
 	  |
-	  +study: AsyncValue&lt;Study&gt;;
-	  +studyRepository: IStudyRepository;
-	  &lt;static&gt;+defaultPublishedToRegistry: bool;
-	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
-	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
-	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
+	  &lt;static&gt;+kMinContentWidth: double;
+	  &lt;static&gt;+kMaxContentWidth: double;
+	  &lt;static&gt;+kHoverFadeFactor: double;
+	  &lt;static&gt;+kMuteFadeFactor: double
 	  |
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +dynamic keepControlsSynced();
-	  +dynamic save();
-	  +dynamic setLaunchDefaults()
+	  &lt;static&gt;+dynamic bodyBackgroundColor();
+	  &lt;static&gt;+Color modalBarrierColor();
+	  &lt;static&gt;+Color containerColor();
+	  &lt;static&gt;+Color colorPickerInitialColor();
+	  &lt;static&gt;+TextStyle bodyTextMuted();
+	  &lt;static&gt;+TextStyle bodyTextBackground();
+	  &lt;static&gt;+double iconSplashRadius();
+	  &lt;static&gt;+Color sidesheetBackgroundColor();
+	  &lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme();
+	  &lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()
 	]
 	
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudySettingsFormViewModel]o-[FormControl]
-	[StudySettingsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
-	
-	[StudyBaseController
-	  |
-	  +studyId: String;
-	  +studyRepository: IStudyRepository;
-	  +router: GoRouter;
-	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
+	[NoAnimationPageTransitionsBuilder
 	  |
-	  +dynamic subscribeStudy();
-	  +dynamic onStudySubscriptionUpdate();
-	  +dynamic onStudySubscriptionError();
-	  +void dispose()
+	  +Widget buildTransitions()
 	]
 	
-	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyBaseController]o-[GoRouter]
-	[StudyBaseController]o-[StreamSubscription]
+	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[NoAnimationPageTransitionsBuilder]
 	
-	[&lt;abstract&gt;StudyPageWidget
-	  |
-	  +studyId: String
+	[WebTransitionBuilder
 	  |
-	  +Widget? banner()
+	  +Widget buildTransitions()
 	]
 	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
-	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
+	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[WebTransitionBuilder]
 	
-	[AppStatus
+	[ThemeSettingChange
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
-	  &lt;static&gt;+initializing: AppStatus;
-	  &lt;static&gt;+initialized: AppStatus
+	  +settings: ThemeSettings
 	]
 	
-	[AppStatus]o-[AppStatus]
-	[Enum]&lt;:--[AppStatus]
-	
-	[&lt;abstract&gt;IAppDelegate
-	  |
-	  +dynamic onAppStart()
-	]
+	[ThemeSettingChange]o-[ThemeSettings]
+	[&lt;abstract&gt;Notification]&lt;:-[ThemeSettingChange]
 	
-	[AppController
+	[ThemeProvider
 	  |
-	  +appDelegates: List&lt;IAppDelegate&gt;;
-	  -_delayedFuture: dynamic;
-	  +isInitialized: dynamic
+	  +settings: ValueNotifier&lt;ThemeSettings&gt;;
+	  +lightDynamic: ColorScheme?;
+	  +darkDynamic: ColorScheme?;
+	  +pageTransitionsTheme: PageTransitionsTheme;
+	  +shapeMedium: ShapeBorder
 	  |
-	  +dynamic onAppStart();
-	  -dynamic _callDelegates()
-	]
-	
-	[App
+	  +Color custom();
+	  +Color blend();
+	  +Color source();
+	  +ColorScheme colors();
+	  +CardTheme cardTheme();
+	  +ListTileThemeData listTileTheme();
+	  +AppBarTheme appBarTheme();
+	  +SnackBarThemeData snackBarThemeData();
+	  +TabBarTheme tabBarTheme();
+	  +BottomAppBarTheme bottomAppBarTheme();
+	  +BottomNavigationBarThemeData bottomNavigationBarTheme();
+	  +SwitchThemeData switchTheme();
+	  +InputDecorationTheme inputDecorationTheme();
+	  +TextTheme textTheme();
+	  +DividerThemeData dividerTheme();
+	  +NavigationRailThemeData navigationRailTheme();
+	  +DrawerThemeData drawerTheme();
+	  +IconThemeData iconTheme();
+	  +CheckboxThemeData checkboxTheme();
+	  +RadioThemeData radioTheme();
+	  +TooltipThemeData tooltipTheme();
+	  +ThemeData light();
+	  +ThemeData dark();
+	  +ThemeMode themeMode();
+	  +ThemeData theme();
+	  &lt;static&gt;+ThemeProvider of();
+	  +bool updateShouldNotify()
 	]
 	
-	[AppContent
-	]
+	[ThemeProvider]o-[ValueNotifier]
+	[ThemeProvider]o-[ColorScheme]
+	[ThemeProvider]o-[PageTransitionsTheme]
+	[ThemeProvider]o-[&lt;abstract&gt;ShapeBorder]
+	[&lt;abstract&gt;InheritedWidget]&lt;:-[ThemeProvider]
 	
-	[AuthFormController
-	  |
-	  +authRepository: IAuthRepository;
-	  +notificationService: INotificationService;
-	  +router: GoRouter;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +passwordControl: FormControl&lt;String&gt;;
-	  +passwordConfirmationControl: FormControl&lt;String&gt;;
-	  +termsOfServiceControl: FormControl&lt;bool&gt;;
-	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +loginForm: FormGroup;
-	  +signupForm: FormGroup;
-	  +passwordForgotForm: FormGroup;
-	  +passwordRecoveryForm: FormGroup;
-	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  -_formKey: AuthFormKey;
-	  +formKey: AuthFormKey;
-	  +form: FormGroup
+	[ThemeSettings
 	  |
-	  -dynamic _getFormFor();
-	  -dynamic _onChangeFormKey();
-	  +dynamic resetControlsFor();
-	  -dynamic _forceValidationMessages();
-	  +dynamic signUp();
-	  -dynamic _signUp();
-	  +dynamic signIn();
-	  -dynamic _signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic sendPasswordResetLink();
-	  +dynamic recoverPassword();
-	  +dynamic updateUser();
-	  -dynamic _readDebugUser()
+	  +sourceColor: Color;
+	  +themeMode: ThemeMode
 	]
 	
-	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
-	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
-	[AuthFormController]o-[GoRouter]
-	[AuthFormController]o-[FormControl]
-	[AuthFormController]o-[FormGroup]
-	[AuthFormController]o-[AuthFormKey]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[AuthFormController]
+	[ThemeSettings]o-[Color]
+	[ThemeSettings]o-[ThemeMode]
 	
-	[AuthFormKey
+	[CustomColor
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AuthFormKey&gt;;
-	  &lt;static&gt;+login: AuthFormKey;
-	  &lt;static&gt;+signup: AuthFormKey;
-	  &lt;static&gt;+passwordForgot: AuthFormKey;
-	  &lt;static&gt;+passwordRecovery: AuthFormKey;
-	  &lt;static&gt;-_loginSubmit: AuthFormKey;
-	  &lt;static&gt;-_signupSubmit: AuthFormKey
+	  +name: String;
+	  +color: Color;
+	  +blend: bool
+	  |
+	  +Color value()
 	]
 	
-	[AuthFormKey]o-[AuthFormKey]
-	[Enum]&lt;:--[AuthFormKey]
+	[CustomColor]o-[Color]
 	
-	[PasswordRecoveryForm
+	[SuppressedBehaviorSubject
 	  |
-	  +formKey: AuthFormKey
+	  +subject: BehaviorSubject&lt;T&gt;;
+	  +didSuppressInitialEvent: bool;
+	  -_controller: StreamController&lt;T&gt;
 	  |
-	  +Widget build()
+	  -StreamController&lt;T&gt; _buildDerivedController();
+	  +dynamic close()
 	]
 	
-	[PasswordRecoveryForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
+	[SuppressedBehaviorSubject]o-[BehaviorSubject]
+	[SuppressedBehaviorSubject]o-[StreamController]
 	
-	[PasswordForgotForm
-	  |
-	  +formKey: AuthFormKey
+	[Time
 	  |
-	  +Widget build()
+	  &lt;static&gt;+dynamic fromTimeOfDay();
+	  +Map&lt;String, dynamic&gt; toJson();
+	  &lt;static&gt;+Time fromJson()
 	]
 	
-	[PasswordForgotForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
+	[TimeOfDay]&lt;:-[Time]
 	
-	[LoginForm
-	  |
-	  +formKey: AuthFormKey
+	[TimeValueAccessor
 	  |
-	  +Widget build()
+	  +String modelToViewValue();
+	  +Time? viewToModelValue();
+	  -String _addLeadingZeroIfNeeded()
 	]
 	
-	[LoginForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
+	[&lt;abstract&gt;ControlValueAccessor]&lt;:-[TimeValueAccessor]
 	
-	[EmailTextField
+	[ModelAction
 	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
+	  +type: T;
+	  +label: String;
+	  +icon: IconData?;
+	  +onExecute: Function;
+	  +isAvailable: bool;
+	  +isDestructive: bool
 	]
 	
-	[EmailTextField]o-[FormControl]
+	[ModelAction]o-[IconData]
 	
-	[PasswordTextField
+	[&lt;abstract&gt;IModelActionProvider
 	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
 	]
 	
-	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
-	[PasswordTextField]o-[FormControl]
+	[&lt;abstract&gt;IListActionProvider
+	  |
+	  +void onSelectItem();
+	  +void onNewItem()
+	]
 	
-	[SignupForm
+	[&lt;abstract&gt;IModelActionProvider]&lt;:-[&lt;abstract&gt;IListActionProvider]
+	
+	[ModelActionType
 	  |
-	  +formKey: AuthFormKey
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ModelActionType&gt;;
+	  &lt;static&gt;+edit: ModelActionType;
+	  &lt;static&gt;+delete: ModelActionType;
+	  &lt;static&gt;+remove: ModelActionType;
+	  &lt;static&gt;+duplicate: ModelActionType;
+	  &lt;static&gt;+clipboard: ModelActionType;
+	  &lt;static&gt;+primary: ModelActionType
+	]
+	
+	[ModelActionType]o-[ModelActionType]
+	[Enum]&lt;:--[ModelActionType]
+	
+	[OptimisticUpdate
 	  |
-	  +Widget build();
-	  -dynamic _onClickTermsOfUse();
-	  -dynamic _onClickPrivacyPolicy()
+	  +applyOptimistic: void Function();
+	  +apply: dynamic Function();
+	  +rollback: void Function();
+	  +onUpdate: void Function()?;
+	  +onError: void Function(Object, StackTrace?)?;
+	  +rethrowErrors: bool;
+	  +runOptimistically: bool;
+	  +completeFutureOptimistically: bool
+	  |
+	  +dynamic execute();
+	  -void _runUpdateHandlerIfAny()
 	]
 	
-	[SignupForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
+	[OptimisticUpdate]o-[void Function()]
+	[OptimisticUpdate]o-[dynamic Function()]
+	[OptimisticUpdate]o-[void Function()?]
+	[OptimisticUpdate]o-[void Function(Object, StackTrace?)?]
 	
-	[StudyUJobsToBeDone
+	[&lt;abstract&gt;FileFormatEncoder
 	  |
-	  +Widget build()
+	  +dynamic encodeAsync();
+	  +String encode();
+	  +dynamic call()
 	]
 	
-	[AuthScaffold
+	[CSVStringEncoder
 	  |
-	  +body: Widget;
-	  +formKey: AuthFormKey;
-	  +leftContentMinWidth: double;
-	  +leftPanelMinWidth: double;
-	  +leftPanelPadding: EdgeInsets
+	  +String encode()
 	]
 	
-	[AuthScaffold]o-[&lt;abstract&gt;Widget]
-	[AuthScaffold]o-[AuthFormKey]
-	[AuthScaffold]o-[EdgeInsets]
+	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[CSVStringEncoder]
 	
-	[PublishDialog
+	[JsonStringEncoder
 	  |
-	  +Widget build()
+	  +String encode()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
+	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[JsonStringEncoder]
 	
-	[PublishSuccessDialog
+	[&lt;abstract&gt;ExecutionLimiter
 	  |
-	  +Widget build()
+	  +milliseconds: int;
+	  &lt;static&gt;-_timer: Timer?
+	  |
+	  +void dispose()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
+	[&lt;abstract&gt;ExecutionLimiter]o-[Timer]
 	
-	[PublishConfirmationDialog
+	[Debouncer
 	  |
-	  +Widget build()
+	  +leading: bool;
+	  +cancelUncompleted: bool;
+	  -_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?
+	  |
+	  +dynamic call()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
+	[Debouncer]o-[CancelableOperation]
+	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Debouncer]
 	
-	[FormArrayTable
-	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +items: List&lt;T&gt;;
-	  +onSelectItem: void Function(T);
-	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
-	  +onNewItem: void Function()?;
-	  +rowTitle: String Function(T);
-	  +onNewItemLabel: String;
-	  +sectionTitle: String?;
-	  +sectionDescription: String?;
-	  +emptyIcon: IconData?;
-	  +emptyTitle: String?;
-	  +emptyDescription: String?;
-	  +sectionTitleDivider: bool?;
-	  +rowPrefix: Widget Function(BuildContext, T, int)?;
-	  +rowSuffix: Widget Function(BuildContext, T, int)?;
-	  +leadingWidget: Widget?;
-	  +itemsSectionPadding: EdgeInsets?;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
+	[Throttler
 	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow();
-	  -Widget _newItemButton()
+	  +dynamic call()
 	]
 	
-	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
-	[FormArrayTable]o-[void Function(T)]
-	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
-	[FormArrayTable]o-[void Function()?]
-	[FormArrayTable]o-[String Function(T)]
-	[FormArrayTable]o-[IconData]
-	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
-	[FormArrayTable]o-[&lt;abstract&gt;Widget]
-	[FormArrayTable]o-[EdgeInsets]
+	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Throttler]
 	
-	[&lt;abstract&gt;IFormData
+	[SerializableColor
 	  |
-	  +id: String
+	  +Map&lt;String, dynamic&gt; toJson();
+	  &lt;static&gt;+SerializableColor fromJson()
+	]
+	
+	[Color]&lt;:-[SerializableColor]
+	
+	[&lt;abstract&gt;IProviderArgsResolver
 	  |
-	  +IFormData copy()
+	  +R provide()
 	]
 	
-	[&lt;abstract&gt;ManagedFormViewModel
+	[CombinedStreamNotifier
 	  |
-	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
+	  -_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;
+	  |
+	  +void dispose()
 	]
 	
-	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
+	[ChangeNotifier]&lt;:-[CombinedStreamNotifier]
 	
-	[FormViewModelNotFoundException
+	[CountWhereValidator
+	  |
+	  +predicate: bool Function(T?);
+	  +minCount: int?;
+	  +maxCount: int?;
+	  &lt;static&gt;+kValidationMessageMinCount: String;
+	  &lt;static&gt;+kValidationMessageMaxCount: String
+	  |
+	  +Map&lt;String, dynamic&gt;? validate()
 	]
 	
-	[Exception]&lt;:--[FormViewModelNotFoundException]
+	[CountWhereValidator]o-[bool Function(T?)]
+	[&lt;abstract&gt;Validator]&lt;:-[CountWhereValidator]
 	
-	[FormViewModelCollection
+	[Patterns
 	  |
-	  +formViewModels: List&lt;T&gt;;
-	  +formArray: FormArray&lt;dynamic&gt;;
-	  +stagedViewModels: List&lt;T&gt;;
-	  +retrievableViewModels: List&lt;T&gt;;
-	  +formData: List&lt;D&gt;
+	  &lt;static&gt;+timeFormatString: String;
+	  &lt;static&gt;+emailFormatString: String;
+	  &lt;static&gt;+url: String
+	]
+	
+	[NumericalRangeFormatter
 	  |
-	  +void add();
-	  +T remove();
-	  +T? findWhere();
-	  +T? removeWhere();
-	  +bool contains();
-	  +void stage();
-	  +T commit();
-	  +void reset();
-	  +void read()
+	  +min: int?;
+	  +max: int?
+	  |
+	  +TextEditingValue formatEditUpdate()
 	]
 	
-	[FormViewModelCollection]o-[FormArray]
+	[&lt;abstract&gt;TextInputFormatter]&lt;:-[NumericalRangeFormatter]
 	
-	[FormInvalidException
+	[StudySequenceFormatter
+	  |
+	  +TextEditingValue formatEditUpdate()
 	]
 	
-	[Exception]&lt;:--[FormInvalidException]
+	[&lt;abstract&gt;TextInputFormatter]&lt;:-[StudySequenceFormatter]
 	
-	[FormConfigException
+	[Tuple
 	  |
-	  +message: String?
+	  +first: T1;
+	  +second: T2;
+	  +props: List&lt;Object?&gt;
+	  |
+	  +Map&lt;String, dynamic&gt; toJson();
+	  &lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson();
+	  +Tuple&lt;T1, T2&gt; copy();
+	  +Tuple&lt;T1, T2&gt; copyWith()
 	]
 	
-	[Exception]&lt;:--[FormConfigException]
+	[&lt;abstract&gt;Equatable]&lt;:-[Tuple]
 	
-	[&lt;abstract&gt;IFormViewModelDelegate
+	[&lt;abstract&gt;JsonFileLoader
 	  |
-	  +dynamic onSave();
-	  +void onCancel()
+	  +jsonAssetsPath: String
+	  |
+	  +dynamic loadJson();
+	  +dynamic parseJsonMapFromAssets();
+	  +dynamic parseJsonListFromAssets()
 	]
 	
-	[&lt;abstract&gt;IFormGroupController
+	[&lt;abstract&gt;IAppDelegate
 	  |
-	  +form: FormGroup
+	  +dynamic onAppStart()
 	]
 	
-	[&lt;abstract&gt;IFormGroupController]o-[FormGroup]
+	[AppController
+	  |
+	  +appDelegates: List&lt;IAppDelegate&gt;;
+	  -_delayedFuture: dynamic;
+	  +isInitialized: dynamic
+	  |
+	  +dynamic onAppStart();
+	  -dynamic _callDelegates()
+	]
 	
-	[FormControlOption
+	[StudyMonitorScreen
 	  |
-	  +value: T;
-	  +label: String;
-	  +description: String?;
-	  +props: List&lt;Object?&gt;
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;Equatable]&lt;:-[FormControlOption]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
 	
-	[&lt;abstract&gt;FormViewModel
+	[LoginForm
 	  |
-	  -_formData: T?;
-	  -_formMode: FormMode;
-	  -_validationSet: FormValidationSetEnum?;
-	  +delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?;
-	  +autosave: bool;
-	  -_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;;
-	  -_immediateFormChildrenListenerDebouncer: Debouncer?;
-	  -_autosaveOperation: CancelableOperation&lt;dynamic&gt;?;
-	  -_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  +prevFormValue: Map&lt;String, dynamic&gt;?;
-	  &lt;static&gt;-_formKey: String;
-	  +formData: T?;
-	  +formMode: FormMode;
-	  +isReadonly: bool;
-	  +validationSet: FormValidationSetEnum?;
-	  +isDirty: bool;
-	  +title: String;
-	  +isValid: bool;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;
+	  +formKey: AuthFormKey
 	  |
-	  -dynamic _setFormData();
-	  -dynamic _rememberDefaultControlValidators();
-	  -Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators();
-	  -dynamic _disableAllControls();
-	  -dynamic _formModeUpdated();
-	  -dynamic _restoreControlsFromFormData();
-	  +void revalidate();
-	  -void _applyValidationSet();
-	  +void read();
-	  +dynamic save();
-	  +dynamic cancel();
-	  +void enableAutosave();
-	  +void listenToImmediateFormChildren();
-	  +dynamic markFormGroupChanged();
-	  +void dispose();
-	  +void setControlsFrom();
-	  +T buildFormData();
-	  +void initControls()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;FormViewModel]o-[FormMode]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;FormValidationSetEnum]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;IFormViewModelDelegate]
-	[&lt;abstract&gt;FormViewModel]o-[Debouncer]
-	[&lt;abstract&gt;FormViewModel]o-[CancelableOperation]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[&lt;abstract&gt;FormViewModel]
+	[LoginForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
 	
-	[FormMode
+	[PasswordRecoveryForm
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;FormMode&gt;;
-	  &lt;static&gt;+create: FormMode;
-	  &lt;static&gt;+readonly: FormMode;
-	  &lt;static&gt;+edit: FormMode
+	  +formKey: AuthFormKey
+	  |
+	  +Widget build()
 	]
 	
-	[FormMode]o-[FormMode]
-	[Enum]&lt;:--[FormMode]
+	[PasswordRecoveryForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
 	
-	[CustomFormControl
+	[PasswordForgotForm
 	  |
-	  -_onValueChangedDebouncer: Debouncer?;
-	  -_onStatusChangedDebouncer: Debouncer?;
-	  +onValueChanged: void Function(T?)?;
-	  +onStatusChanged: void Function(ControlStatus)?;
-	  +onStatusChangedDebounceTime: int?;
-	  +onValueChangedDebounceTime: int?
+	  +formKey: AuthFormKey
 	  |
-	  +void dispose()
+	  +Widget build()
 	]
 	
-	[CustomFormControl]o-[Debouncer]
-	[CustomFormControl]o-[void Function(T?)?]
-	[CustomFormControl]o-[void Function(ControlStatus)?]
-	[FormControl]&lt;:-[CustomFormControl]
+	[PasswordForgotForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
 	
-	[UnsavedChangesDialog
+	[SignupForm
 	  |
-	  +Widget build()
+	  +formKey: AuthFormKey
+	  |
+	  +Widget build();
+	  -dynamic _onClickTermsOfUse();
+	  -dynamic _onClickPrivacyPolicy()
 	]
 	
-	[&lt;abstract&gt;FormValidationSetEnum
-	]
+	[SignupForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
 	
-	[FormControlValidation
-	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
-	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
-	  +validationMessages: Map&lt;String, String Function(Object)&gt;
+	[AuthScaffold
 	  |
-	  +FormControlValidation merge()
+	  +body: Widget;
+	  +formKey: AuthFormKey;
+	  +leftContentMinWidth: double;
+	  +leftPanelMinWidth: double;
+	  +leftPanelPadding: EdgeInsets
 	]
 	
-	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
+	[AuthScaffold]o-[&lt;abstract&gt;Widget]
+	[AuthScaffold]o-[AuthFormKey]
+	[AuthScaffold]o-[EdgeInsets]
 	
-	[ScreenerQuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultResponseOptionValidity: bool;
-	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
-	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
-	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
-	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionValues: List&lt;dynamic&gt;;
-	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isDirtyOptionsBannerVisible: bool
+	[EmailTextField
 	  |
-	  +dynamic onResponseOptionsChanged();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
-	  +ScreenerQuestionFormViewModel createDuplicate()
+	  +labelText: String;
+	  +hintText: String?;
+	  +formControlName: String?;
+	  +formControl: FormControl&lt;dynamic&gt;?
 	]
 	
-	[ScreenerQuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
+	[EmailTextField]o-[FormControl]
 	
-	[StudyDesignEnrollmentFormView
+	[PasswordTextField
 	  |
-	  +Widget build();
-	  -dynamic _showScreenerQuestionSidesheetWithArgs();
-	  -dynamic _showConsentItemSidesheetWithArgs()
+	  +labelText: String;
+	  +hintText: String?;
+	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
+	  +formControlName: String?;
+	  +formControl: FormControl&lt;dynamic&gt;?
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
+	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
+	[PasswordTextField]o-[FormControl]
 	
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
+	[StudyUJobsToBeDone
 	  |
-	  +isDirtyOptionsBannerVisible: bool
+	  +Widget build()
 	]
 	
-	[ScreenerQuestionLogicFormView
+	[AuthFormController
 	  |
-	  +formViewModel: ScreenerQuestionFormViewModel
+	  +authRepository: IAuthRepository;
+	  +notificationService: INotificationService;
+	  +router: GoRouter;
+	  +emailControl: FormControl&lt;String&gt;;
+	  +passwordControl: FormControl&lt;String&gt;;
+	  +passwordConfirmationControl: FormControl&lt;String&gt;;
+	  +termsOfServiceControl: FormControl&lt;bool&gt;;
+	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
+	  +loginForm: FormGroup;
+	  +signupForm: FormGroup;
+	  +passwordForgotForm: FormGroup;
+	  +passwordRecoveryForm: FormGroup;
+	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
+	  -_formKey: AuthFormKey;
+	  +formKey: AuthFormKey;
+	  +form: FormGroup
 	  |
-	  +Widget build();
-	  -dynamic _buildInfoBanner();
-	  -dynamic _buildAnswerOptionsLogicControls();
-	  -List&lt;Widget&gt; _buildOptionLogicRow()
+	  -dynamic _getFormFor();
+	  -dynamic _onChangeFormKey();
+	  +dynamic resetControlsFor();
+	  -dynamic _forceValidationMessages();
+	  +dynamic signUp();
+	  -dynamic _signUp();
+	  +dynamic signIn();
+	  -dynamic _signInWith();
+	  +dynamic signOut();
+	  +dynamic resetPasswordForEmail();
+	  +dynamic sendPasswordResetLink();
+	  +dynamic recoverPassword();
+	  +dynamic updateUser();
+	  -dynamic _readDebugUser()
 	]
 	
-	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
+	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
+	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
+	[AuthFormController]o-[GoRouter]
+	[AuthFormController]o-[FormControl]
+	[AuthFormController]o-[FormGroup]
+	[AuthFormController]o-[AuthFormKey]
+	[&lt;abstract&gt;IFormGroupController]&lt;:--[AuthFormController]
 	
-	[ConsentItemFormData
-	  |
-	  +consentId: String;
-	  +title: String;
-	  +description: String;
-	  +iconName: String?;
-	  +id: String
+	[AuthFormKey
 	  |
-	  +ConsentItem toConsentItem();
-	  +ConsentItemFormData copy()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;AuthFormKey&gt;;
+	  &lt;static&gt;+login: AuthFormKey;
+	  &lt;static&gt;+signup: AuthFormKey;
+	  &lt;static&gt;+passwordForgot: AuthFormKey;
+	  &lt;static&gt;+passwordRecovery: AuthFormKey;
+	  &lt;static&gt;-_loginSubmit: AuthFormKey;
+	  &lt;static&gt;-_signupSubmit: AuthFormKey
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
+	[AuthFormKey]o-[AuthFormKey]
+	[Enum]&lt;:--[AuthFormKey]
 	
-	[EnrollmentFormViewModel
+	[AppStatus
 	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
-	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
-	  +consentItemArray: FormArray&lt;dynamic&gt;;
-	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +form: FormGroup;
-	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
-	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestScreener: bool;
-	  +canTestConsent: bool;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
+	  &lt;static&gt;+initializing: AppStatus;
+	  &lt;static&gt;+initialized: AppStatus
+	]
+	
+	[AppStatus]o-[AppStatus]
+	[Enum]&lt;:--[AppStatus]
+	
+	[FormArrayTable
 	  |
-	  +void setControlsFrom();
-	  +EnrollmentFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
-	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
-	  +dynamic testScreener();
-	  +dynamic testConsent();
-	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
+	  +control: AbstractControl&lt;dynamic&gt;;
+	  +items: List&lt;T&gt;;
+	  +onSelectItem: void Function(T);
+	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
+	  +onNewItem: void Function()?;
+	  +rowTitle: String Function(T);
+	  +onNewItemLabel: String;
+	  +sectionTitle: String?;
+	  +sectionDescription: String?;
+	  +emptyIcon: IconData?;
+	  +emptyTitle: String?;
+	  +emptyDescription: String?;
+	  +sectionTitleDivider: bool?;
+	  +rowPrefix: Widget Function(BuildContext, T, int)?;
+	  +rowSuffix: Widget Function(BuildContext, T, int)?;
+	  +leadingWidget: Widget?;
+	  +itemsSectionPadding: EdgeInsets?;
+	  +hideLeadingTrailingWhenEmpty: bool;
+	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
+	  |
+	  +Widget build();
+	  -List&lt;Widget&gt; _buildRow();
+	  -Widget _newItemButton()
 	]
 	
-	[EnrollmentFormViewModel]o-[Study]
-	[EnrollmentFormViewModel]o-[GoRouter]
-	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
-	[EnrollmentFormViewModel]o-[FormControl]
-	[EnrollmentFormViewModel]o-[FormArray]
-	[EnrollmentFormViewModel]o-[FormViewModelCollection]
-	[EnrollmentFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
+	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
+	[FormArrayTable]o-[void Function(T)]
+	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
+	[FormArrayTable]o-[void Function()?]
+	[FormArrayTable]o-[String Function(T)]
+	[FormArrayTable]o-[IconData]
+	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
+	[FormArrayTable]o-[&lt;abstract&gt;Widget]
+	[FormArrayTable]o-[EdgeInsets]
 	
-	[EnrollmentFormConsentItemDelegate
-	  |
-	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +owner: EnrollmentFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
+	[&lt;abstract&gt;ManagedFormViewModel
 	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ConsentItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
+	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
 	]
 	
-	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
-	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
 	
-	[ConsentItemFormViewModel
-	  |
-	  +consentIdControl: FormControl&lt;String&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +form: FormGroup;
-	  +consentId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +ConsentItemFormData buildFormData();
-	  +ConsentItemFormViewModel createDuplicate()
+	[FormViewModelNotFoundException
 	]
 	
-	[ConsentItemFormViewModel]o-[FormControl]
-	[ConsentItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
+	[Exception]&lt;:--[FormViewModelNotFoundException]
 	
-	[ConsentItemFormView
+	[FormViewModelCollection
 	  |
-	  +formViewModel: ConsentItemFormViewModel
+	  +formViewModels: List&lt;T&gt;;
+	  +formArray: FormArray&lt;dynamic&gt;;
+	  +stagedViewModels: List&lt;T&gt;;
+	  +retrievableViewModels: List&lt;T&gt;;
+	  +formData: List&lt;D&gt;
+	  |
+	  +void add();
+	  +T remove();
+	  +T? findWhere();
+	  +T? removeWhere();
+	  +bool contains();
+	  +void stage();
+	  +T commit();
+	  +void reset();
+	  +void read()
 	]
 	
-	[ConsentItemFormView]o-[ConsentItemFormViewModel]
+	[FormViewModelCollection]o-[FormArray]
 	
-	[EnrollmentFormData
+	[CustomFormControl
 	  |
-	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
-	  +enrollmentType: Participation;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
-	  +id: String
+	  -_onValueChangedDebouncer: Debouncer?;
+	  -_onStatusChangedDebouncer: Debouncer?;
+	  +onValueChanged: void Function(T?)?;
+	  +onStatusChanged: void Function(ControlStatus)?;
+	  +onStatusChangedDebounceTime: int?;
+	  +onValueChangedDebounceTime: int?
 	  |
-	  +Study apply();
-	  +EnrollmentFormData copy()
+	  +void dispose()
 	]
 	
-	[EnrollmentFormData]o-[Participation]
-	[EnrollmentFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
+	[CustomFormControl]o-[Debouncer]
+	[CustomFormControl]o-[void Function(T?)?]
+	[CustomFormControl]o-[void Function(ControlStatus)?]
+	[FormControl]&lt;:-[CustomFormControl]
 	
-	[StudyDesignInterventionsFormView
+	[UnsavedChangesDialog
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
-	
-	[InterventionsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +interventionsArray: FormArray&lt;dynamic&gt;;
-	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
-	  +form: FormGroup;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +interventionsRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestStudySchedule: bool
-	  |
-	  +void setControlsFrom();
-	  +InterventionsFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +InterventionFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +dynamic testStudySchedule()
+	[&lt;abstract&gt;FormValidationSetEnum
 	]
 	
-	[InterventionsFormViewModel]o-[Study]
-	[InterventionsFormViewModel]o-[GoRouter]
-	[InterventionsFormViewModel]o-[FormArray]
-	[InterventionsFormViewModel]o-[FormViewModelCollection]
-	[InterventionsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
-	
-	[InterventionFormViewModel
+	[FormControlValidation
 	  |
-	  +study: Study;
-	  +interventionIdControl: FormControl&lt;String&gt;;
-	  +interventionTitleControl: FormControl&lt;String&gt;;
-	  +interventionIconControl: FormControl&lt;IconOption&gt;;
-	  +interventionDescriptionControl: FormControl&lt;String&gt;;
-	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
-	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
-	  +form: FormGroup;
-	  +interventionId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneTask: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +control: AbstractControl&lt;dynamic&gt;;
+	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
+	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
+	  +validationMessages: Map&lt;String, String Function(Object)&gt;
 	  |
-	  +void setControlsFrom();
-	  +InterventionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +InterventionTaskFormViewModel provide();
-	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
-	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
-	  +InterventionFormViewModel createDuplicate()
+	  +FormControlValidation merge()
 	]
 	
-	[InterventionFormViewModel]o-[Study]
-	[InterventionFormViewModel]o-[FormControl]
-	[InterventionFormViewModel]o-[FormArray]
-	[InterventionFormViewModel]o-[FormViewModelCollection]
-	[InterventionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
+	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
 	
-	[InterventionTaskFormData
+	[&lt;abstract&gt;IFormData
 	  |
-	  +taskId: String;
-	  +taskTitle: String;
-	  +taskDescription: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
 	  +id: String
 	  |
-	  +CheckmarkTask toTask();
-	  +InterventionTaskFormData copy()
+	  +IFormData copy()
 	]
 	
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
-	
-	[StudyScheduleFormData
-	  |
-	  +sequenceType: PhaseSequence;
-	  +sequenceTypeCustom: String;
-	  +numCycles: int;
-	  +phaseDuration: int;
-	  +includeBaseline: bool;
-	  +id: String
-	  |
-	  +StudySchedule toStudySchedule();
-	  +Study apply();
-	  +StudyScheduleFormData copy()
+	[FormInvalidException
 	]
 	
-	[StudyScheduleFormData]o-[PhaseSequence]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
+	[Exception]&lt;:--[FormInvalidException]
 	
-	[InterventionPreview
-	  |
-	  +routeArgs: InterventionFormRouteArgs
+	[FormConfigException
 	  |
-	  +Widget build()
+	  +message: String?
 	]
 	
-	[InterventionPreview]o-[InterventionFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
+	[Exception]&lt;:--[FormConfigException]
 	
-	[InterventionTaskFormViewModel
+	[&lt;abstract&gt;IFormViewModelDelegate
 	  |
-	  +taskIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +taskTitleControl: FormControl&lt;String&gt;;
-	  +taskDescriptionControl: FormControl&lt;String&gt;;
-	  +markAsCompletedControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +taskId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +dynamic onSave();
+	  +void onCancel()
+	]
+	
+	[&lt;abstract&gt;IFormGroupController
 	  |
-	  +void setControlsFrom();
-	  +InterventionTaskFormData buildFormData();
-	  +InterventionTaskFormViewModel createDuplicate()
+	  +form: FormGroup
 	]
 	
-	[InterventionTaskFormViewModel]o-[FormControl]
-	[InterventionTaskFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
+	[&lt;abstract&gt;IFormGroupController]o-[FormGroup]
 	
-	[InterventionsFormData
+	[FormControlOption
 	  |
-	  +interventionsData: List&lt;InterventionFormData&gt;;
-	  +studyScheduleData: StudyScheduleFormData;
-	  +id: String
+	  +value: T;
+	  +label: String;
+	  +description: String?;
+	  +props: List&lt;Object?&gt;
+	]
+	
+	[&lt;abstract&gt;Equatable]&lt;:-[FormControlOption]
+	
+	[&lt;abstract&gt;FormViewModel
 	  |
-	  +Study apply();
-	  +InterventionsFormData copy()
+	  -_formData: T?;
+	  -_formMode: FormMode;
+	  -_validationSet: FormValidationSetEnum?;
+	  +delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?;
+	  +autosave: bool;
+	  -_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;;
+	  -_immediateFormChildrenListenerDebouncer: Debouncer?;
+	  -_autosaveOperation: CancelableOperation&lt;dynamic&gt;?;
+	  -_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;;
+	  +prevFormValue: Map&lt;String, dynamic&gt;?;
+	  &lt;static&gt;-_formKey: String;
+	  +formData: T?;
+	  +formMode: FormMode;
+	  +isReadonly: bool;
+	  +validationSet: FormValidationSetEnum?;
+	  +isDirty: bool;
+	  +title: String;
+	  +isValid: bool;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;
+	  |
+	  -dynamic _setFormData();
+	  -dynamic _rememberDefaultControlValidators();
+	  -Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators();
+	  -dynamic _disableAllControls();
+	  -dynamic _formModeUpdated();
+	  -dynamic _restoreControlsFromFormData();
+	  +void revalidate();
+	  -void _applyValidationSet();
+	  +void read();
+	  +dynamic save();
+	  +dynamic cancel();
+	  +void enableAutosave();
+	  +void listenToImmediateFormChildren();
+	  +dynamic markFormGroupChanged();
+	  +void dispose();
+	  +void setControlsFrom();
+	  +T buildFormData();
+	  +void initControls()
 	]
 	
-	[InterventionsFormData]o-[StudyScheduleFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
+	[&lt;abstract&gt;FormViewModel]o-[FormMode]
+	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;FormValidationSetEnum]
+	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;IFormViewModelDelegate]
+	[&lt;abstract&gt;FormViewModel]o-[Debouncer]
+	[&lt;abstract&gt;FormViewModel]o-[CancelableOperation]
+	[&lt;abstract&gt;IFormGroupController]&lt;:--[&lt;abstract&gt;FormViewModel]
 	
-	[InterventionFormView
+	[FormMode
 	  |
-	  +formViewModel: InterventionFormViewModel
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;FormMode&gt;;
+	  &lt;static&gt;+create: FormMode;
+	  &lt;static&gt;+readonly: FormMode;
+	  &lt;static&gt;+edit: FormMode
 	]
 	
-	[InterventionFormView]o-[InterventionFormViewModel]
+	[FormMode]o-[FormMode]
+	[Enum]&lt;:--[FormMode]
 	
-	[&lt;abstract&gt;StudyScheduleControls
+	[EnrolledBadge
 	  |
-	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
-	  &lt;static&gt;+defaultScheduleTypeSequence: String;
-	  &lt;static&gt;+defaultNumCycles: int;
-	  &lt;static&gt;+defaultPeriodLength: int;
-	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
-	  +phaseDurationControl: FormControl&lt;int&gt;;
-	  +numCyclesControl: FormControl&lt;int&gt;;
-	  +includeBaselineControl: FormControl&lt;bool&gt;;
-	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  &lt;static&gt;+kNumCyclesMin: int;
-	  &lt;static&gt;+kNumCyclesMax: int;
-	  &lt;static&gt;+kPhaseDurationMin: int;
-	  &lt;static&gt;+kPhaseDurationMax: int;
-	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +numCyclesRange: dynamic;
-	  +phaseDurationRange: dynamic;
-	  +customSequenceRequired: dynamic
+	  +enrolledCount: int
 	  |
-	  +void setStudyScheduleControlsFrom();
-	  +StudyScheduleFormData buildStudyScheduleFormData();
-	  +bool isSequencingCustom()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
-	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
-	
-	[InterventionTaskFormView
+	[StudyRecruitController
 	  |
-	  +formViewModel: InterventionTaskFormViewModel
+	  +inviteCodeRepository: IInviteCodeRepository;
+	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
+	  |
+	  -dynamic _subscribeInvites();
+	  +Intervention? getIntervention();
+	  +int getParticipantCountForInvite();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void dispose()
 	]
 	
-	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
+	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
+	[StudyRecruitController]o-[StreamSubscription]
+	[StudyBaseController]&lt;:-[StudyRecruitController]
+	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
 	
-	[InterventionFormData
-	  |
-	  +interventionId: String;
-	  +title: String;
-	  +description: String?;
-	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
-	  +iconName: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
+	[StudyRecruitScreen
 	  |
-	  +Intervention toIntervention();
-	  +InterventionFormData copy()
+	  +Widget build();
+	  -Widget _inviteCodesSectionHeader();
+	  -Widget _newInviteCodeButton();
+	  -dynamic _onSelectInvite()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
 	
-	[StudyScheduleFormView
+	[InviteCodeFormView
 	  |
-	  +formViewModel: StudyScheduleControls
+	  +formViewModel: InviteCodeFormViewModel
 	  |
-	  -FormTableRow _renderCustomSequence();
-	  +Widget build()
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
 	]
 	
-	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
+	[InviteCodeFormView]o-[InviteCodeFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
 	
-	[&lt;abstract&gt;IStudyFormData
+	[StudyInvitesTable
 	  |
-	  +Study apply()
+	  +invites: List&lt;StudyInvite&gt;;
+	  +onSelect: void Function(StudyInvite);
+	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
+	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
+	  +getIntervention: Intervention? Function(String);
+	  +getParticipantCountForInvite: int Function(StudyInvite)
+	  |
+	  +Widget build();
+	  -List&lt;Widget&gt; _buildRow()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
+	[StudyInvitesTable]o-[void Function(StudyInvite)]
+	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
+	[StudyInvitesTable]o-[Intervention? Function(String)]
+	[StudyInvitesTable]o-[int Function(StudyInvite)]
 	
-	[StudyInfoFormData
+	[InviteCodeFormViewModel
 	  |
-	  +title: String;
-	  +description: String?;
-	  +iconName: String;
-	  +contactInfoFormData: StudyContactInfoFormData;
-	  +id: String
+	  +study: Study;
+	  +inviteCodeRepository: IInviteCodeRepository;
+	  +codeControl: FormControl&lt;String&gt;;
+	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
+	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
+	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
+	  +interventionAControl: FormControl&lt;String&gt;;
+	  +interventionBControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
+	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
+	  +isPreconfiguredSchedule: bool;
+	  +preconfiguredSchedule: List&lt;String&gt;?
 	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
+	  +void initControls();
+	  -dynamic _uniqueInviteCode();
+	  +void regenerateCode();
+	  -String _generateCode();
+	  +StudyInvite buildFormData();
+	  +void setControlsFrom();
+	  +dynamic save()
 	]
 	
-	[StudyInfoFormData]o-[StudyContactInfoFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
+	[InviteCodeFormViewModel]o-[Study]
+	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
+	[InviteCodeFormViewModel]o-[FormControl]
+	[InviteCodeFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
 	
-	[StudyContactInfoFormData
-	  |
-	  +organization: String?;
-	  +institutionalReviewBoard: String?;
-	  +institutionalReviewBoardNumber: String?;
-	  +researchers: String?;
-	  +email: String?;
-	  +website: String?;
-	  +phone: String?;
-	  +additionalInfo: String?;
-	  +id: String
+	[PublishSuccessDialog
 	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
 	
-	[StudyDesignInfoFormView
+	[PublishDialog
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
 	
-	[StudyInfoFormViewModel
+	[PublishConfirmationDialog
 	  |
-	  +study: Study;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +organizationControl: FormControl&lt;String&gt;;
-	  +reviewBoardControl: FormControl&lt;String&gt;;
-	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
-	  +researchersControl: FormControl&lt;String&gt;;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +websiteControl: FormControl&lt;String&gt;;
-	  +phoneControl: FormControl&lt;String&gt;;
-	  +additionalInfoControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +iconRequired: dynamic;
-	  +organizationRequired: dynamic;
-	  +reviewBoardRequired: dynamic;
-	  +reviewBoardNumberRequired: dynamic;
-	  +researchersRequired: dynamic;
-	  +emailRequired: dynamic;
-	  +phoneRequired: dynamic;
-	  +emailFormat: dynamic;
-	  +websiteFormat: dynamic
-	  |
-	  +void setControlsFrom();
-	  +StudyInfoFormData buildFormData()
+	  +Widget build()
 	]
 	
-	[StudyInfoFormViewModel]o-[Study]
-	[StudyInfoFormViewModel]o-[FormControl]
-	[StudyInfoFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
 	
-	[MeasurementSurveyFormData
+	[FrameControlsWidget
 	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
+	  +onRefresh: void Function()?;
+	  +onOpenNewTab: void Function()?;
+	  +enabled: bool
 	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
+	  +Widget build()
 	]
 	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
+	[FrameControlsWidget]o-[void Function()?]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
 	
-	[MeasurementSurveyFormView
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel
 	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
+	  +studyParticipation: Participation?;
+	  +studyStatus: StudyStatus?
 	]
 	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
 	
-	[MeasurementSurveyFormViewModel
+	[StudyStatusBadge
 	  |
-	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +participation: Participation?;
+	  +status: StudyStatus?;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +showTooltip: bool
 	  |
-	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
+	  +Widget build()
 	]
 	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
+	[StudyStatusBadge]o-[Participation]
+	[StudyStatusBadge]o-[StudyStatus]
+	[StudyStatusBadge]o-[BadgeType]
 	
-	[SurveyPreview
+	[RouteInformation
 	  |
-	  +routeArgs: MeasurementFormRouteArgs
+	  +route: String?;
+	  +extra: String?;
+	  +cmd: String?;
+	  +data: String?
 	  |
-	  +Widget build()
+	  +String toString()
 	]
 	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
-	
-	[StudyDesignMeasurementsFormView
+	[&lt;abstract&gt;PlatformController
 	  |
-	  +Widget build()
+	  +studyId: String;
+	  +baseSrc: String;
+	  +previewSrc: String;
+	  +routeInformation: RouteInformation;
+	  +frameWidget: Widget
+	  |
+	  +void activate();
+	  +void registerViews();
+	  +void generateUrl();
+	  +void navigate();
+	  +void refresh();
+	  +void listen();
+	  +void send();
+	  +void openNewPage()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
+	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
+	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
 	
-	[MeasurementsFormData
+	[WebController
 	  |
-	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
-	  +id: String
+	  +iFrameElement: IFrameElement
 	  |
-	  +Study apply();
-	  +MeasurementsFormData copy()
+	  +void activate();
+	  +void registerViews();
+	  +void generateUrl();
+	  +void navigate();
+	  +void refresh();
+	  +void openNewPage();
+	  +void listen();
+	  +void send()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
+	[WebController]o-[IFrameElement]
+	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
 	
-	[MeasurementsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +measurementsArray: FormArray&lt;dynamic&gt;;
-	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
-	  +form: FormGroup;
-	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +measurementRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
+	[MobileController
 	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +MeasurementsFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +MeasurementSurveyFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave()
+	  +void openNewPage();
+	  +void refresh();
+	  +void registerViews();
+	  +void listen();
+	  +void send();
+	  +void navigate();
+	  +void activate();
+	  +void generateUrl()
 	]
 	
-	[MeasurementsFormViewModel]o-[Study]
-	[MeasurementsFormViewModel]o-[GoRouter]
-	[MeasurementsFormViewModel]o-[FormArray]
-	[MeasurementsFormViewModel]o-[FormViewModelCollection]
-	[MeasurementsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
 	
-	[StudyFormValidationSet
+	[StudyController
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
+	  +notificationService: INotificationService;
+	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
+	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
+	  |
+	  +dynamic syncStudyStatus();
+	  +dynamic onStudySubscriptionUpdate();
+	  -dynamic _redirectNewToActualStudyID();
+	  +dynamic publishStudy();
+	  +void onChangeStudyParticipation();
+	  +void onAddParticipants();
+	  +void onSettingsPressed();
+	  +void dispose()
 	]
 	
-	[Enum]&lt;:--[StudyFormValidationSet]
+	[StudyController]o-[&lt;abstract&gt;INotificationService]
+	[StudyController]o-[StreamSubscription]
+	[StudyBaseController]&lt;:-[StudyController]
 	
-	[ReportsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +reportItemDelegate: ReportFormItemDelegate;
-	  +reportItemArray: FormArray&lt;dynamic&gt;;
-	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +form: FormGroup;
-	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestConsent: bool
+	[&lt;abstract&gt;IStudyNavViewModel
 	  |
-	  +void setControlsFrom();
-	  +ReportsFormData buildFormData();
-	  +void read();
-	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
-	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
-	  +dynamic testReport();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide()
+	  +isEditTabEnabled: bool;
+	  +isTestTabEnabled: bool;
+	  +isRecruitTabEnabled: bool;
+	  +isMonitorTabEnabled: bool;
+	  +isAnalyzeTabEnabled: bool;
+	  +isSettingsEnabled: bool
 	]
 	
-	[ReportsFormViewModel]o-[Study]
-	[ReportsFormViewModel]o-[GoRouter]
-	[ReportsFormViewModel]o-[ReportFormItemDelegate]
-	[ReportsFormViewModel]o-[FormArray]
-	[ReportsFormViewModel]o-[FormViewModelCollection]
-	[ReportsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
-	
-	[ReportFormItemDelegate
+	[StudyNav
 	  |
-	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +owner: ReportsFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
-	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
+	  &lt;static&gt;+dynamic tabs();
+	  &lt;static&gt;+dynamic edit();
+	  &lt;static&gt;+dynamic test();
+	  &lt;static&gt;+dynamic recruit();
+	  &lt;static&gt;+dynamic monitor();
+	  &lt;static&gt;+dynamic analyze()
 	]
 	
-	[ReportFormItemDelegate]o-[FormViewModelCollection]
-	[ReportFormItemDelegate]o-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
-	
-	[ReportItemFormData
-	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
-	  +id: String
+	[StudyDesignNav
 	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
+	  &lt;static&gt;+dynamic tabs();
+	  &lt;static&gt;+dynamic info();
+	  &lt;static&gt;+dynamic enrollment();
+	  &lt;static&gt;+dynamic interventions();
+	  &lt;static&gt;+dynamic measurements();
+	  &lt;static&gt;+dynamic reports()
 	]
 	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
-	
-	[ReportItemFormView
+	[&lt;abstract&gt;StudyPageWidget
 	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
+	  +studyId: String
 	  |
-	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
+	  +Widget? banner()
 	]
 	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
+	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
 	
-	[ReportItemFormViewModel
+	[StudyParticipationBadge
 	  |
-	  &lt;static&gt;+defaultSectionType: ReportSectionType;
-	  +sectionIdControl: FormControl&lt;String&gt;;
-	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +sectionControl: FormControl&lt;ReportSection&gt;;
-	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
-	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
-	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
-	  +alphaControl: FormControl&lt;double&gt;;
-	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +form: FormGroup;
-	  +sectionId: String;
-	  +sectionType: ReportSectionType;
-	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
-	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
-	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +dataReferenceRequired: dynamic;
-	  +aggregationRequired: dynamic;
-	  +improvementDirectionRequired: dynamic;
-	  +alphaConfidenceRequired: dynamic
+	  +participation: Participation;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +center: bool
 	  |
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +ReportItemFormData buildFormData();
-	  +ReportItemFormViewModel createDuplicate();
-	  +dynamic onSectionTypeChanged();
-	  -void _updateFormControls();
-	  +void setControlsFrom()
+	  +Widget build()
 	]
 	
-	[ReportItemFormViewModel]o-[ReportSectionType]
-	[ReportItemFormViewModel]o-[FormControl]
-	[ReportItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
+	[StudyParticipationBadge]o-[Participation]
+	[StudyParticipationBadge]o-[BadgeType]
 	
-	[TemporalAggregationFormatted
+	[StudyBaseController
 	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
+	  +studyId: String;
+	  +studyRepository: IStudyRepository;
+	  +router: GoRouter;
+	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
 	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
+	  +dynamic subscribeStudy();
+	  +dynamic onStudySubscriptionUpdate();
+	  +dynamic onStudySubscriptionError();
+	  +void dispose()
 	]
 	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
+	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
+	[StudyBaseController]o-[GoRouter]
+	[StudyBaseController]o-[StreamSubscription]
 	
-	[ImprovementDirectionFormatted
-	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
+	[PreviewFrame
 	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
+	  +studyId: String;
+	  +routeArgs: StudyFormRouteArgs?;
+	  +route: String?
 	]
 	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
+	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
 	
-	[ReportSectionType
+	[&lt;abstract&gt;IStudyAppBarViewModel
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
+	  +isSyncIndicatorVisible: bool;
+	  +isStatusBadgeVisible: bool;
+	  +isPublishVisible: bool
 	]
 	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
+	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
 	
-	[AverageSectionFormView
+	[StudyScaffold
 	  |
-	  +formViewModel: ReportItemFormViewModel;
 	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
+	  +tabs: List&lt;NavbarTab&gt;?;
+	  +tabsSubnav: List&lt;NavbarTab&gt;?;
+	  +selectedTab: NavbarTab?;
+	  +selectedTabSubnav: NavbarTab?;
+	  +body: StudyPageWidget;
+	  +drawer: Widget?;
+	  +disableActions: bool;
+	  +actionsSpacing: double;
+	  +actionsPadding: double;
+	  +layoutType: SingleColumnLayoutType?;
+	  +appbarHeight: double;
+	  +appbarSubnavHeight: double
 	]
 	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
+	[StudyScaffold]o-[NavbarTab]
+	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
+	[StudyScaffold]o-[&lt;abstract&gt;Widget]
+	[StudyScaffold]o-[SingleColumnLayoutType]
 	
-	[LinearRegressionSectionFormView
+	[WebFrame
 	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
+	  +previewSrc: String;
+	  +studyId: String
 	  |
 	  +Widget build()
 	]
 	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
-	
-	[DataReferenceIdentifier
-	  |
-	  +hashCode: int
+	[DisabledFrame
 	  |
-	  +bool ==()
+	  +Widget build()
 	]
 	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
-	
-	[DataReferenceEditor
+	[PhoneContainer
 	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
+	  &lt;static&gt;+defaultWidth: double;
+	  &lt;static&gt;+defaultHeight: double;
+	  +width: double;
+	  +height: double;
+	  +borderColor: Color;
+	  +borderWidth: double;
+	  +borderRadius: double;
+	  +innerContent: Widget;
+	  +innerContentBackgroundColor: Color?
 	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
+	  +Widget build()
 	]
 	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
+	[PhoneContainer]o-[Color]
+	[PhoneContainer]o-[&lt;abstract&gt;Widget]
 	
-	[ReportsFormData
-	  |
-	  +reportItems: List&lt;ReportItemFormData&gt;;
-	  +id: String
+	[MobileFrame
 	  |
-	  +Study apply();
-	  +ReportsFormData copy()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
-	
-	[ReportStatus
+	[DesktopFrame
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
-	  &lt;static&gt;+primary: ReportStatus;
-	  &lt;static&gt;+secondary: ReportStatus
+	  +Widget build()
 	]
 	
-	[ReportStatus]o-[ReportStatus]
-	[Enum]&lt;:--[ReportStatus]
-	
-	[ReportBadge
+	[StudyTestScreen
 	  |
-	  +status: ReportStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
+	  +previewRoute: String?
 	  |
-	  +Widget build()
+	  +Widget build();
+	  +Widget? banner();
+	  +dynamic load();
+	  +dynamic save();
+	  +dynamic showHelp()
 	]
 	
-	[ReportBadge]o-[ReportStatus]
-	[ReportBadge]o-[BadgeType]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
 	
-	[StudyDesignReportsFormView
+	[StudySettingsFormViewModel
 	  |
-	  +Widget build();
-	  -dynamic _showReportItemSidesheetWithArgs()
+	  +study: AsyncValue&lt;Study&gt;;
+	  +studyRepository: IStudyRepository;
+	  &lt;static&gt;+defaultPublishedToRegistry: bool;
+	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
+	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
+	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void setControlsFrom();
+	  +Study buildFormData();
+	  +dynamic keepControlsSynced();
+	  +dynamic save();
+	  +dynamic setLaunchDefaults()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
+	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
+	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
+	[StudySettingsFormViewModel]o-[FormControl]
+	[StudySettingsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
 	
-	[StudyFormScaffold
+	[StudySettingsDialog
 	  |
-	  +studyId: String;
-	  +formViewModelBuilder: T Function(WidgetRef);
-	  +formViewBuilder: Widget Function(T)
+	  +Widget build()
+	]
+	
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
+	
+	[StudyTestController
 	  |
+	  +authRepository: IAuthRepository;
+	  +languageCode: String
+	]
+	
+	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyBaseController]&lt;:-[StudyTestController]
+	
+	[TestAppRoutes
+	  |
+	  &lt;static&gt;+studyOverview: String;
+	  &lt;static&gt;+eligibility: String;
+	  &lt;static&gt;+intervention: String;
+	  &lt;static&gt;+consent: String;
+	  &lt;static&gt;+journey: String;
+	  &lt;static&gt;+dashboard: String
+	]
+	
+	[DrawerEntry
+	  |
+	  +localizedTitle: String Function();
+	  +icon: IconData?;
+	  +localizedHelpText: String Function()?;
+	  +enabled: bool;
+	  +onSelected: void Function(BuildContext, WidgetRef)?;
+	  +autoCloseDrawer: bool;
+	  +title: String;
+	  +helpText: String?
+	  |
+	  +void onClick()
+	]
+	
+	[DrawerEntry]o-[String Function()]
+	[DrawerEntry]o-[IconData]
+	[DrawerEntry]o-[String Function()?]
+	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
+	
+	[GoRouterDrawerEntry
+	  |
+	  +intent: RoutingIntent;
+	  +onNavigated: void Function()?
+	  |
+	  +void onClick()
+	]
+	
+	[GoRouterDrawerEntry]o-[RoutingIntent]
+	[GoRouterDrawerEntry]o-[void Function()?]
+	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
+	
+	[AppDrawer
+	  |
+	  +width: int;
+	  +autoCloseDrawer: bool;
+	  +leftPaddingEntries: double;
+	  +logoPaddingVertical: double;
+	  +logoPaddingHorizontal: double;
+	  +logoMaxHeight: double;
+	  +logoSectionMinHeight: double;
+	  +logoSectionMaxHeight: double
+	]
+	
+	[StudyAnalyzeScreen
+	  |
+	  +Widget? banner();
 	  +Widget build()
 	]
 	
-	[StudyFormScaffold]o-[T Function(WidgetRef)]
-	[StudyFormScaffold]o-[Widget Function(T)]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
 	
-	[SurveyQuestionFormView
+	[StudyAnalyzeController
 	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
+	  +dynamic onExport()
 	]
 	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
+	[StudyBaseController]&lt;:-[StudyAnalyzeController]
 	
-	[QuestionFormViewModel
+	[StudyDesignInterventionsFormView
 	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
+	  +Widget build()
+	]
+	
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
+	
+	[InterventionFormView
 	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
+	  +formViewModel: InterventionFormViewModel
 	]
 	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
+	[InterventionFormView]o-[InterventionFormViewModel]
 	
-	[&lt;abstract&gt;QuestionFormData
+	[InterventionPreview
 	  |
-	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
-	  +questionId: String;
-	  +questionText: String;
-	  +questionInfoText: String?;
-	  +questionType: SurveyQuestionType;
-	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
-	  +responseOptions: List&lt;dynamic&gt;;
+	  +routeArgs: InterventionFormRouteArgs
+	  |
+	  +Widget build()
+	]
+	
+	[InterventionPreview]o-[InterventionFormRouteArgs]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
+	
+	[StudyScheduleFormView
+	  |
+	  +formViewModel: StudyScheduleControls
+	  |
+	  -FormTableRow _renderCustomSequence();
+	  +Widget build()
+	]
+	
+	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
+	
+	[InterventionTaskFormData
+	  |
+	  +taskId: String;
+	  +taskTitle: String;
+	  +taskDescription: String?;
+	  &lt;static&gt;+kDefaultTitle: String;
 	  +id: String
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +EligibilityCriterion toEligibilityCriterion();
-	  +Answer&lt;dynamic&gt; constructAnswerFor();
-	  +dynamic setResponseOptionsValidityFrom();
-	  +QuestionFormData copy()
+	  +CheckmarkTask toTask();
+	  +InterventionTaskFormData copy()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
+	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
 	
-	[ChoiceQuestionFormData
+	[InterventionsFormViewModel
 	  |
-	  +isMultipleChoice: bool;
-	  +answerOptions: List&lt;String&gt;;
-	  +responseOptions: List&lt;String&gt;
+	  +study: Study;
+	  +router: GoRouter;
+	  +interventionsArray: FormArray&lt;dynamic&gt;;
+	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
+	  +form: FormGroup;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +interventionsRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestStudySchedule: bool
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +QuestionFormData copy();
-	  -Choice _buildChoiceForValue();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +void setControlsFrom();
+	  +InterventionsFormData buildFormData();
+	  +void read();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +InterventionFormViewModel provide();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +dynamic testStudySchedule()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
+	[InterventionsFormViewModel]o-[Study]
+	[InterventionsFormViewModel]o-[GoRouter]
+	[InterventionsFormViewModel]o-[FormArray]
+	[InterventionsFormViewModel]o-[FormViewModelCollection]
+	[InterventionsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
+	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
 	
-	[BoolQuestionFormData
+	[InterventionTaskFormViewModel
 	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
-	  +responseOptions: List&lt;String&gt;
+	  +taskIdControl: FormControl&lt;String&gt;;
+	  +instanceIdControl: FormControl&lt;String&gt;;
+	  +taskTitleControl: FormControl&lt;String&gt;;
+	  +taskDescriptionControl: FormControl&lt;String&gt;;
+	  +markAsCompletedControl: FormControl&lt;bool&gt;;
+	  +form: FormGroup;
+	  +taskId: String;
+	  +instanceId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +BoolQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +void setControlsFrom();
+	  +InterventionTaskFormData buildFormData();
+	  +InterventionTaskFormViewModel createDuplicate()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
+	[InterventionTaskFormViewModel]o-[FormControl]
+	[InterventionTaskFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
+	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
 	
-	[ImageQuestionFormData
+	[&lt;abstract&gt;StudyScheduleControls
 	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
+	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
+	  &lt;static&gt;+defaultScheduleTypeSequence: String;
+	  &lt;static&gt;+defaultNumCycles: int;
+	  &lt;static&gt;+defaultPeriodLength: int;
+	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
+	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
+	  +phaseDurationControl: FormControl&lt;int&gt;;
+	  +numCyclesControl: FormControl&lt;int&gt;;
+	  +includeBaselineControl: FormControl&lt;bool&gt;;
+	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
+	  &lt;static&gt;+kNumCyclesMin: int;
+	  &lt;static&gt;+kNumCyclesMax: int;
+	  &lt;static&gt;+kPhaseDurationMin: int;
+	  &lt;static&gt;+kPhaseDurationMax: int;
+	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
+	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +numCyclesRange: dynamic;
+	  +phaseDurationRange: dynamic;
+	  +customSequenceRequired: dynamic
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +ImageQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +void setStudyScheduleControlsFrom();
+	  +StudyScheduleFormData buildStudyScheduleFormData();
+	  +bool isSequencingCustom()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
+	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
+	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
 	
-	[AudioQuestionFormData
+	[InterventionFormData
 	  |
-	  +maxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
+	  +interventionId: String;
+	  +title: String;
+	  +description: String?;
+	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
+	  +iconName: String?;
+	  &lt;static&gt;+kDefaultTitle: String;
+	  +id: String
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +AudioQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +Intervention toIntervention();
+	  +InterventionFormData copy()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
+	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
 	
-	[ScaleQuestionFormData
+	[StudyScheduleFormData
 	  |
-	  +minValue: double;
-	  +maxValue: double;
-	  +minLabel: String?;
-	  +maxLabel: String?;
-	  +midValues: List&lt;double?&gt;;
-	  +midLabels: List&lt;String?&gt;;
-	  +stepSize: double;
-	  +initialValue: double?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +responseOptions: List&lt;double&gt;;
-	  +midAnnotations: List&lt;Annotation&gt;
+	  +sequenceType: PhaseSequence;
+	  +sequenceTypeCustom: String;
+	  +numCycles: int;
+	  +phaseDuration: int;
+	  +includeBaseline: bool;
+	  +id: String
 	  |
-	  +ScaleQuestion toQuestion();
-	  +QuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +StudySchedule toStudySchedule();
+	  +Study apply();
+	  +StudyScheduleFormData copy()
+	]
+	
+	[StudyScheduleFormData]o-[PhaseSequence]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
+	
+	[InterventionTaskFormView
+	  |
+	  +formViewModel: InterventionTaskFormViewModel
 	]
 	
-	[ScaleQuestionFormData]o-[Color]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
+	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
 	
-	[FreeTextQuestionFormData
+	[InterventionsFormData
 	  |
-	  +textLengthRange: List&lt;int&gt;;
-	  +textType: FreeTextQuestionType;
-	  +textTypeExpression: String?;
-	  +responseOptions: List&lt;String&gt;
+	  +interventionsData: List&lt;InterventionFormData&gt;;
+	  +studyScheduleData: StudyScheduleFormData;
+	  +id: String
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +FreeTextQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +Study apply();
+	  +InterventionsFormData copy()
 	]
 	
-	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
+	[InterventionsFormData]o-[StudyScheduleFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
 	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
+	[InterventionFormViewModel
 	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
+	  +study: Study;
+	  +interventionIdControl: FormControl&lt;String&gt;;
+	  +interventionTitleControl: FormControl&lt;String&gt;;
+	  +interventionIconControl: FormControl&lt;IconOption&gt;;
+	  +interventionDescriptionControl: FormControl&lt;String&gt;;
+	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
+	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
+	  +form: FormGroup;
+	  +interventionId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +atLeastOneTask: dynamic;
+	  +breadcrumbsTitle: String;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  +void setControlsFrom();
+	  +InterventionFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +InterventionTaskFormViewModel provide();
+	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
+	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
+	  +InterventionFormViewModel createDuplicate()
 	]
 	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
+	[InterventionFormViewModel]o-[Study]
+	[InterventionFormViewModel]o-[FormControl]
+	[InterventionFormViewModel]o-[FormArray]
+	[InterventionFormViewModel]o-[FormViewModelCollection]
+	[InterventionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
 	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
+	[StudyDesignReportsFormView
 	  |
 	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
+	  -dynamic _showReportItemSidesheetWithArgs()
 	]
 	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
 	
-	[BoolQuestionFormView
+	[ReportItemFormData
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  +isPrimary: bool;
+	  +section: ReportSection;
+	  +id: String
 	  |
-	  +Widget build()
+	  &lt;static&gt;+dynamic fromDomainModel();
+	  +ReportItemFormData copy()
 	]
 	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
+	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
+	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
 	
-	[SurveyQuestionType
+	[DataReferenceEditor
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
+	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
+	  +availableTasks: List&lt;Task&gt;;
+	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
+	  |
+	  +FormTableRow buildFormTableRow();
+	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
 	]
 	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
+	[DataReferenceEditor]o-[FormControl]
+	[DataReferenceEditor]o-[ReactiveDropdownField]
 	
-	[AudioRecordingQuestionFormView
+	[TemporalAggregationFormatted
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  -_value: TemporalAggregation;
+	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
+	  +value: TemporalAggregation;
+	  +string: String;
+	  +icon: IconData?;
+	  +hashCode: int
 	  |
-	  +Widget build()
+	  +bool ==();
+	  +String toString();
+	  +String toJson();
+	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
 	]
 	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
+	[TemporalAggregationFormatted]o-[TemporalAggregation]
+	[TemporalAggregationFormatted]o-[IconData]
 	
-	[ChoiceQuestionFormView
+	[ImprovementDirectionFormatted
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  -_value: ImprovementDirection;
+	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
+	  +value: ImprovementDirection;
+	  +string: String;
+	  +icon: IconData?;
+	  +hashCode: int
 	  |
-	  +Widget build()
+	  +bool ==();
+	  +String toString();
+	  +String toJson();
+	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
 	]
 	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
+	[ImprovementDirectionFormatted]o-[ImprovementDirection]
+	[ImprovementDirectionFormatted]o-[IconData]
 	
-	[ImageCapturingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
+	[ReportSectionType
 	  |
-	  +Widget build()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
+	  &lt;static&gt;+average: ReportSectionType;
+	  &lt;static&gt;+linearRegression: ReportSectionType
 	]
 	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
+	[ReportSectionType]o-[ReportSectionType]
+	[Enum]&lt;:--[ReportSectionType]
 	
-	[&lt;abstract&gt;WithQuestionnaireControls
+	[AverageSectionFormView
 	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
 	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
-	  +void read();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[AverageSectionFormView]o-[ReportItemFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
 	
-	[QuestionnaireFormData
+	[DataReferenceIdentifier
 	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
+	  +hashCode: int
 	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
+	  +bool ==()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
+	[DataReference]&lt;:-[DataReferenceIdentifier]
 	
-	[ScheduleControls
+	[LinearRegressionSectionFormView
 	  |
-	  +formViewModel: WithScheduleControls
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
 	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
+	  +Widget build()
 	]
 	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
+	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
 	
-	[&lt;abstract&gt;IFormDataWithSchedule
+	[ReportItemFormViewModel
 	  |
-	  +instanceId: String;
-	  +isTimeLocked: bool;
-	  +timeLockStart: StudyUTimeOfDay?;
-	  +timeLockEnd: StudyUTimeOfDay?;
-	  +hasReminder: bool;
-	  +reminderTime: StudyUTimeOfDay?
+	  &lt;static&gt;+defaultSectionType: ReportSectionType;
+	  +sectionIdControl: FormControl&lt;String&gt;;
+	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +sectionControl: FormControl&lt;ReportSection&gt;;
+	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
+	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
+	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
+	  +alphaControl: FormControl&lt;double&gt;;
+	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +form: FormGroup;
+	  +sectionId: String;
+	  +sectionType: ReportSectionType;
+	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
+	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
+	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +dataReferenceRequired: dynamic;
+	  +aggregationRequired: dynamic;
+	  +improvementDirectionRequired: dynamic;
+	  +alphaConfidenceRequired: dynamic
 	  |
-	  +Schedule toSchedule()
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +ReportItemFormData buildFormData();
+	  +ReportItemFormViewModel createDuplicate();
+	  +dynamic onSectionTypeChanged();
+	  -void _updateFormControls();
+	  +void setControlsFrom()
 	]
 	
-	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
+	[ReportItemFormViewModel]o-[ReportSectionType]
+	[ReportItemFormViewModel]o-[FormControl]
+	[ReportItemFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
 	
-	[&lt;abstract&gt;WithScheduleControls
+	[ReportItemFormView
 	  |
-	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
-	  +instanceID: FormControl&lt;String&gt;;
-	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +hasReminderControl: FormControl&lt;bool&gt;;
-	  +reminderTimeControl: FormControl&lt;Time&gt;;
-	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
-	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
-	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  +hasReminder: bool;
-	  +isTimeRestricted: bool;
-	  +timeRestriction: List&lt;Time&gt;?
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: dynamic;
+	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
 	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
+	  +Widget build();
+	  -dynamic _buildSectionText();
+	  -dynamic _buildSectionTypeHeader()
 	]
 	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
+	[ReportItemFormView]o-[ReportItemFormViewModel]
+	[ReportItemFormView]o-[Widget Function(BuildContext)]
 	
-	[StudyFormViewModel
+	[ReportsFormViewModel
 	  |
-	  +studyDirtyCopy: Study?;
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
+	  +study: Study;
 	  +router: GoRouter;
-	  +studyInfoFormViewModel: StudyInfoFormViewModel;
-	  +enrollmentFormViewModel: EnrollmentFormViewModel;
-	  +measurementsFormViewModel: MeasurementsFormViewModel;
-	  +reportsFormViewModel: ReportsFormViewModel;
-	  +interventionsFormViewModel: InterventionsFormViewModel;
+	  +reportItemDelegate: ReportFormItemDelegate;
+	  +reportItemArray: FormArray&lt;dynamic&gt;;
+	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
 	  +form: FormGroup;
-	  +isStudyReadonly: bool;
+	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
 	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestConsent: bool
 	  |
-	  +void read();
 	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +void dispose();
+	  +ReportsFormData buildFormData();
+	  +void read();
+	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
+	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
+	  +dynamic testReport();
 	  +void onCancel();
 	  +dynamic onSave();
-	  -dynamic _applyAndSaveSubform()
+	  +ReportItemFormViewModel provide()
 	]
 	
-	[StudyFormViewModel]o-[Study]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyFormViewModel]o-[GoRouter]
-	[StudyFormViewModel]o-[StudyInfoFormViewModel]
-	[StudyFormViewModel]o-[EnrollmentFormViewModel]
-	[StudyFormViewModel]o-[MeasurementsFormViewModel]
-	[StudyFormViewModel]o-[ReportsFormViewModel]
-	[StudyFormViewModel]o-[InterventionsFormViewModel]
-	[StudyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
+	[ReportsFormViewModel]o-[Study]
+	[ReportsFormViewModel]o-[GoRouter]
+	[ReportsFormViewModel]o-[ReportFormItemDelegate]
+	[ReportsFormViewModel]o-[FormArray]
+	[ReportsFormViewModel]o-[FormViewModelCollection]
+	[ReportsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget
+	[ReportFormItemDelegate
 	  |
-	  +Widget? banner()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
-	
-	[StudyAnalyzeScreen
+	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
+	  +owner: ReportsFormViewModel;
+	  +propagateOnSave: bool;
+	  +validationSet: dynamic
 	  |
-	  +Widget? banner();
-	  +Widget build()
+	  +void onCancel();
+	  +dynamic onSave();
+	  +ReportItemFormViewModel provide();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
+	[ReportFormItemDelegate]o-[FormViewModelCollection]
+	[ReportFormItemDelegate]o-[ReportsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
 	
-	[StudyAnalyzeController
+	[ReportBadge
 	  |
-	  +dynamic onExport()
-	]
-	
-	[StudyBaseController]&lt;:-[StudyAnalyzeController]
-	
-	[StudyMonitorScreen
+	  +status: ReportStatus?;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +showTooltip: bool
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
+	[ReportBadge]o-[ReportStatus]
+	[ReportBadge]o-[BadgeType]
 	
-	[StudiesTableItem
+	[ReportsFormData
 	  |
-	  +study: Study;
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
-	  +isPinned: bool;
-	  +onPinnedChanged: void Function(Study, bool)?;
-	  +onTap: void Function(Study)?
+	  +reportItems: List&lt;ReportItemFormData&gt;;
+	  +id: String
+	  |
+	  +Study apply();
+	  +ReportsFormData copy()
 	]
 	
-	[StudiesTableItem]o-[Study]
-	[StudiesTableItem]o-[void Function(Study, bool)?]
-	[StudiesTableItem]o-[void Function(Study)?]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
 	
-	[DashboardController
-	  |
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +userRepository: IUserRepository;
-	  +router: GoRouter;
-	  -_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?;
-	  +searchController: SearchController;
-	  +isSortAscending: bool
+	[ReportStatus
 	  |
-	  -dynamic _subscribeStudies();
-	  +dynamic setSearchText();
-	  +dynamic setStudiesFilter();
-	  +dynamic onSelectStudy();
-	  +dynamic onClickNewStudy();
-	  +dynamic pinStudy();
-	  +dynamic pinOffStudy();
-	  +void setSorting();
-	  +void filterStudies();
-	  +void sortStudies();
-	  +bool isSortingActiveForColumn();
-	  +bool isPinned();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void dispose()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
+	  &lt;static&gt;+primary: ReportStatus;
+	  &lt;static&gt;+secondary: ReportStatus
 	]
 	
-	[DashboardController]o-[&lt;abstract&gt;IStudyRepository]
-	[DashboardController]o-[&lt;abstract&gt;IAuthRepository]
-	[DashboardController]o-[&lt;abstract&gt;IUserRepository]
-	[DashboardController]o-[GoRouter]
-	[DashboardController]o-[StreamSubscription]
-	[DashboardController]o-[SearchController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
+	[ReportStatus]o-[ReportStatus]
+	[Enum]&lt;:--[ReportStatus]
 	
-	[StudiesTableColumnSize
-	  |
-	  +collapsed: bool;
-	  +flex: int?;
-	  +width: double?
+	[&lt;abstract&gt;IStudyFormData
 	  |
-	  +Widget createContainer()
+	  +Study apply()
 	]
 	
-	[StudiesTable
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
+	
+	[StudyInfoFormViewModel
 	  |
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +compactWidthThreshold: double;
-	  +superCompactWidthThreshold: double;
-	  +compactStatTitleThreshold: double;
-	  +studies: List&lt;Study&gt;;
-	  +onSelect: void Function(Study);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study);
-	  +emptyWidget: Widget;
-	  +pinnedStudies: Iterable&lt;String&gt;;
-	  +dashboardController: DashboardController
+	  +study: Study;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +iconControl: FormControl&lt;IconOption&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +organizationControl: FormControl&lt;String&gt;;
+	  +reviewBoardControl: FormControl&lt;String&gt;;
+	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
+	  +researchersControl: FormControl&lt;String&gt;;
+	  +emailControl: FormControl&lt;String&gt;;
+	  +websiteControl: FormControl&lt;String&gt;;
+	  +phoneControl: FormControl&lt;String&gt;;
+	  +additionalInfoControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +iconRequired: dynamic;
+	  +organizationRequired: dynamic;
+	  +reviewBoardRequired: dynamic;
+	  +reviewBoardNumberRequired: dynamic;
+	  +researchersRequired: dynamic;
+	  +emailRequired: dynamic;
+	  +phoneRequired: dynamic;
+	  +emailFormat: dynamic;
+	  +websiteFormat: dynamic
 	  |
-	  +Widget build();
-	  -Widget _buildColumnHeader()
+	  +void setControlsFrom();
+	  +StudyInfoFormData buildFormData()
 	]
 	
-	[StudiesTable]o-[void Function(Study)]
-	[StudiesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)]
-	[StudiesTable]o-[&lt;abstract&gt;Widget]
-	[StudiesTable]o-[DashboardController]
+	[StudyInfoFormViewModel]o-[Study]
+	[StudyInfoFormViewModel]o-[FormControl]
+	[StudyInfoFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
 	
-	[StudiesTableColumn
+	[StudyDesignInfoFormView
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesTableColumn&gt;;
-	  &lt;static&gt;+pin: StudiesTableColumn;
-	  &lt;static&gt;+title: StudiesTableColumn;
-	  &lt;static&gt;+status: StudiesTableColumn;
-	  &lt;static&gt;+participation: StudiesTableColumn;
-	  &lt;static&gt;+createdAt: StudiesTableColumn;
-	  &lt;static&gt;+enrolled: StudiesTableColumn;
-	  &lt;static&gt;+active: StudiesTableColumn;
-	  &lt;static&gt;+completed: StudiesTableColumn;
-	  &lt;static&gt;+action: StudiesTableColumn
+	  +Widget build()
 	]
 	
-	[StudiesTableColumn]o-[StudiesTableColumn]
-	[Enum]&lt;:--[StudiesTableColumn]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
 	
-	[DashboardScreen
+	[StudyInfoFormData
 	  |
-	  +filter: StudiesFilter?
+	  +title: String;
+	  +description: String?;
+	  +iconName: String;
+	  +contactInfoFormData: StudyContactInfoFormData;
+	  +id: String
+	  |
+	  +Study apply();
+	  +StudyInfoFormData copy()
 	]
 	
-	[DashboardScreen]o-[StudiesFilter]
+	[StudyInfoFormData]o-[StudyContactInfoFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
 	
-	[DashboardScaffold
+	[StudyContactInfoFormData
 	  |
-	  &lt;static&gt;+compactWidthThreshold: double;
-	  +body: Widget
+	  +organization: String?;
+	  +institutionalReviewBoard: String?;
+	  +institutionalReviewBoardNumber: String?;
+	  +researchers: String?;
+	  +email: String?;
+	  +website: String?;
+	  +phone: String?;
+	  +additionalInfo: String?;
+	  +id: String
 	  |
-	  +Widget build()
+	  +Study apply();
+	  +StudyInfoFormData copy()
 	]
 	
-	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
 	
-	[StudiesFilter
+	[StudyFormValidationSet
 	  |
 	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
+	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
 	]
 	
-	[Enum]&lt;:--[StudiesFilter]
+	[Enum]&lt;:--[StudyFormValidationSet]
 	
-	[StudiesTableColumnHeader
+	[MeasurementsFormData
 	  |
-	  +title: String;
-	  +sortable: bool;
-	  +sortAscending: bool;
-	  +sortingActive: bool;
-	  +onSort: void Function()?
+	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
+	  +id: String
+	  |
+	  +Study apply();
+	  +MeasurementsFormData copy()
 	]
 	
-	[StudiesTableColumnHeader]o-[void Function()?]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
 	
-	[AccountSettingsDialog
+	[MeasurementSurveyFormView
 	  |
-	  +Widget build()
+	  +formViewModel: MeasurementSurveyFormViewModel
 	]
 	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AccountSettingsDialog]
+	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
 	
-	[StudyInvitesTable
+	[SurveyPreview
 	  |
-	  +invites: List&lt;StudyInvite&gt;;
-	  +onSelect: void Function(StudyInvite);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getIntervention: Intervention? Function(String);
-	  +getParticipantCountForInvite: int Function(StudyInvite)
+	  +routeArgs: MeasurementFormRouteArgs
 	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow()
+	  +Widget build()
 	]
 	
-	[StudyInvitesTable]o-[void Function(StudyInvite)]
-	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
-	[StudyInvitesTable]o-[Intervention? Function(String)]
-	[StudyInvitesTable]o-[int Function(StudyInvite)]
+	[SurveyPreview]o-[MeasurementFormRouteArgs]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
 	
-	[StudyRecruitController
+	[MeasurementSurveyFormData
 	  |
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
+	  +measurementId: String;
+	  +title: String;
+	  +introText: String?;
+	  +outroText: String?;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  &lt;static&gt;+kDefaultTitle: String;
+	  +id: String
 	  |
-	  -dynamic _subscribeInvites();
-	  +Intervention? getIntervention();
-	  +int getParticipantCountForInvite();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void dispose()
+	  +QuestionnaireTask toQuestionnaireTask();
+	  +MeasurementSurveyFormData copy()
 	]
 	
-	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[StudyRecruitController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyRecruitController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
+	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
 	
-	[InviteCodeFormViewModel
+	[MeasurementSurveyFormViewModel
 	  |
 	  +study: Study;
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  +codeControl: FormControl&lt;String&gt;;
-	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
-	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +interventionAControl: FormControl&lt;String&gt;;
-	  +interventionBControl: FormControl&lt;String&gt;;
+	  +measurementIdControl: FormControl&lt;String&gt;;
+	  +instanceIdControl: FormControl&lt;String&gt;;
+	  +surveyTitleControl: FormControl&lt;String&gt;;
+	  +surveyIntroTextControl: FormControl&lt;String&gt;;
+	  +surveyOutroTextControl: FormControl&lt;String&gt;;
 	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
-	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +isPreconfiguredSchedule: bool;
-	  +preconfiguredSchedule: List&lt;String&gt;?
+	  +measurementId: String;
+	  +instanceId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +atLeastOneQuestion: dynamic;
+	  +breadcrumbsTitle: String;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +void initControls();
-	  -dynamic _uniqueInviteCode();
-	  +void regenerateCode();
-	  -String _generateCode();
-	  +StudyInvite buildFormData();
 	  +void setControlsFrom();
-	  +dynamic save()
+	  +MeasurementSurveyFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
+	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
+	  +MeasurementSurveyFormViewModel createDuplicate()
 	]
 	
-	[InviteCodeFormViewModel]o-[Study]
-	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[InviteCodeFormViewModel]o-[FormControl]
-	[InviteCodeFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
+	[MeasurementSurveyFormViewModel]o-[Study]
+	[MeasurementSurveyFormViewModel]o-[FormControl]
+	[MeasurementSurveyFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
 	
-	[EnrolledBadge
-	  |
-	  +enrolledCount: int
+	[StudyDesignMeasurementsFormView
 	  |
 	  +Widget build()
 	]
 	
-	[InviteCodeFormView
-	  |
-	  +formViewModel: InviteCodeFormViewModel
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
-	]
-	
-	[InviteCodeFormView]o-[InviteCodeFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
-	
-	[StudyRecruitScreen
-	  |
-	  +Widget build();
-	  -Widget _inviteCodesSectionHeader();
-	  -Widget _newInviteCodeButton();
-	  -dynamic _onSelectInvite()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
 	
-	[DrawerEntry
+	[MeasurementsFormViewModel
 	  |
-	  +localizedTitle: String Function();
-	  +icon: IconData?;
-	  +localizedHelpText: String Function()?;
-	  +enabled: bool;
-	  +onSelected: void Function(BuildContext, WidgetRef)?;
-	  +autoCloseDrawer: bool;
-	  +title: String;
-	  +helpText: String?
+	  +study: Study;
+	  +router: GoRouter;
+	  +measurementsArray: FormArray&lt;dynamic&gt;;
+	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
+	  +form: FormGroup;
+	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +measurementRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +void onClick()
+	  +void read();
+	  +void setControlsFrom();
+	  +MeasurementsFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +MeasurementSurveyFormViewModel provide();
+	  +void onCancel();
+	  +dynamic onSave()
 	]
 	
-	[DrawerEntry]o-[String Function()]
-	[DrawerEntry]o-[IconData]
-	[DrawerEntry]o-[String Function()?]
-	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
+	[MeasurementsFormViewModel]o-[Study]
+	[MeasurementsFormViewModel]o-[GoRouter]
+	[MeasurementsFormViewModel]o-[FormArray]
+	[MeasurementsFormViewModel]o-[FormViewModelCollection]
+	[MeasurementsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
 	
-	[GoRouterDrawerEntry
+	[StudyFormScaffold
 	  |
-	  +intent: RoutingIntent;
-	  +onNavigated: void Function()?
+	  +studyId: String;
+	  +formViewModelBuilder: T Function(WidgetRef);
+	  +formViewBuilder: Widget Function(T)
 	  |
-	  +void onClick()
+	  +Widget build()
 	]
 	
-	[GoRouterDrawerEntry]o-[RoutingIntent]
-	[GoRouterDrawerEntry]o-[void Function()?]
-	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
+	[StudyFormScaffold]o-[T Function(WidgetRef)]
+	[StudyFormScaffold]o-[Widget Function(T)]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
 	
-	[AppDrawer
+	[ConsentItemFormViewModel
+	  |
+	  +consentIdControl: FormControl&lt;String&gt;;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +iconControl: FormControl&lt;IconOption&gt;;
+	  +form: FormGroup;
+	  +consentId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +width: int;
-	  +autoCloseDrawer: bool;
-	  +leftPaddingEntries: double;
-	  +logoPaddingVertical: double;
-	  +logoPaddingHorizontal: double;
-	  +logoMaxHeight: double;
-	  +logoSectionMinHeight: double;
-	  +logoSectionMaxHeight: double
+	  +void setControlsFrom();
+	  +ConsentItemFormData buildFormData();
+	  +ConsentItemFormViewModel createDuplicate()
 	]
 	
-	[NotificationDispatcher
+	[ConsentItemFormViewModel]o-[FormControl]
+	[ConsentItemFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
+	
+	[StudyDesignEnrollmentFormView
 	  |
-	  +child: Widget?;
-	  +snackbarInnerPadding: double;
-	  +snackbarWidth: double?;
-	  +snackbarBehavior: SnackBarBehavior;
-	  +snackbarDefaultDuration: int
+	  +Widget build();
+	  -dynamic _showScreenerQuestionSidesheetWithArgs();
+	  -dynamic _showConsentItemSidesheetWithArgs()
 	]
 	
-	[NotificationDispatcher]o-[&lt;abstract&gt;Widget]
-	[NotificationDispatcher]o-[SnackBarBehavior]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
 	
-	[Notifications
+	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
 	  |
-	  &lt;static&gt;+credentialsInvalid: SnackbarIntent;
-	  &lt;static&gt;+userAlreadyRegistered: SnackbarIntent;
-	  &lt;static&gt;+passwordReset: SnackbarIntent;
-	  &lt;static&gt;+passwordResetSuccess: SnackbarIntent;
-	  &lt;static&gt;+studyDeleted: SnackbarIntent;
-	  &lt;static&gt;+inviteCodeDeleted: SnackbarIntent;
-	  &lt;static&gt;+inviteCodeClipped: SnackbarIntent;
-	  &lt;static&gt;+studyDeleteConfirmation: AlertIntent
+	  +isDirtyOptionsBannerVisible: bool
 	]
 	
-	[Notifications]o-[SnackbarIntent]
-	[Notifications]o-[AlertIntent]
-	
-	[NotificationDefaultActions
+	[ScreenerQuestionLogicFormView
 	  |
-	  &lt;static&gt;+cancel: NotificationAction
+	  +formViewModel: ScreenerQuestionFormViewModel
+	  |
+	  +Widget build();
+	  -dynamic _buildInfoBanner();
+	  -dynamic _buildAnswerOptionsLogicControls();
+	  -List&lt;Widget&gt; _buildOptionLogicRow()
 	]
 	
-	[NotificationDefaultActions]o-[NotificationAction]
+	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
 	
-	[&lt;abstract&gt;NotificationIntent
+	[ConsentItemFormData
 	  |
-	  +message: String?;
-	  +customContent: Widget?;
-	  +icon: IconData?;
-	  +actions: List&lt;NotificationAction&gt;?;
-	  +type: NotificationType
+	  +consentId: String;
+	  +title: String;
+	  +description: String;
+	  +iconName: String?;
+	  +id: String
 	  |
-	  +void register()
+	  +ConsentItem toConsentItem();
+	  +ConsentItemFormData copy()
 	]
 	
-	[&lt;abstract&gt;NotificationIntent]o-[&lt;abstract&gt;Widget]
-	[&lt;abstract&gt;NotificationIntent]o-[IconData]
-	[&lt;abstract&gt;NotificationIntent]o-[NotificationType]
+	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
 	
-	[NotificationAction
+	[ConsentItemFormView
 	  |
-	  +label: String;
-	  +onSelect: dynamic Function();
-	  +isDestructive: bool
+	  +formViewModel: ConsentItemFormViewModel
 	]
 	
-	[NotificationAction]o-[dynamic Function()]
+	[ConsentItemFormView]o-[ConsentItemFormViewModel]
 	
-	[SnackbarIntent
+	[EnrollmentFormData
 	  |
-	  +duration: int?
+	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
+	  +enrollmentType: Participation;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
+	  +id: String
+	  |
+	  +Study apply();
+	  +EnrollmentFormData copy()
 	]
 	
-	[&lt;abstract&gt;NotificationIntent]&lt;:-[SnackbarIntent]
+	[EnrollmentFormData]o-[Participation]
+	[EnrollmentFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
 	
-	[AlertIntent
+	[ScreenerQuestionFormViewModel
 	  |
-	  +title: String;
-	  +dismissOnAction: bool;
-	  +isDestructive: dynamic
+	  &lt;static&gt;+defaultResponseOptionValidity: bool;
+	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
+	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
+	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
+	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +prevResponseOptionValues: List&lt;dynamic&gt;;
+	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isDirtyOptionsBannerVisible: bool
+	  |
+	  +dynamic onResponseOptionsChanged();
+	  +void setControlsFrom();
+	  +QuestionFormData buildFormData();
+	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
+	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
+	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
+	  +ScreenerQuestionFormViewModel createDuplicate()
 	]
 	
-	[&lt;abstract&gt;NotificationIntent]&lt;:-[AlertIntent]
+	[ScreenerQuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
+	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
 	
-	[NotificationType
+	[EnrollmentFormViewModel
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;NotificationType&gt;;
-	  &lt;static&gt;+snackbar: NotificationType;
-	  &lt;static&gt;+alert: NotificationType;
-	  &lt;static&gt;+custom: NotificationType
+	  +study: Study;
+	  +router: GoRouter;
+	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
+	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
+	  +consentItemArray: FormArray&lt;dynamic&gt;;
+	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
+	  +form: FormGroup;
+	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
+	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestScreener: bool;
+	  +canTestConsent: bool;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  |
+	  +void setControlsFrom();
+	  +EnrollmentFormData buildFormData();
+	  +void read();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
+	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
+	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
+	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
+	  +dynamic testScreener();
+	  +dynamic testConsent();
+	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
 	]
 	
-	[NotificationType]o-[NotificationType]
-	[Enum]&lt;:--[NotificationType]
+	[EnrollmentFormViewModel]o-[Study]
+	[EnrollmentFormViewModel]o-[GoRouter]
+	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
+	[EnrollmentFormViewModel]o-[FormControl]
+	[EnrollmentFormViewModel]o-[FormArray]
+	[EnrollmentFormViewModel]o-[FormViewModelCollection]
+	[EnrollmentFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
 	
-	[&lt;abstract&gt;IClipboardService
+	[EnrollmentFormConsentItemDelegate
 	  |
-	  +dynamic copy()
-	]
-	
-	[ClipboardService
+	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
+	  +owner: EnrollmentFormViewModel;
+	  +propagateOnSave: bool;
+	  +validationSet: dynamic
 	  |
-	  +dynamic copy()
+	  +void onCancel();
+	  +dynamic onSave();
+	  +ConsentItemFormViewModel provide();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem()
 	]
 	
-	[&lt;abstract&gt;IClipboardService]&lt;:--[ClipboardService]
+	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
+	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
 	
-	[&lt;abstract&gt;INotificationService
+	[StudyFormViewModel
 	  |
-	  +void showMessage();
-	  +void show();
-	  +Stream&lt;NotificationIntent&gt; watchNotifications();
-	  +void dispose()
+	  +studyDirtyCopy: Study?;
+	  +studyRepository: IStudyRepository;
+	  +authRepository: IAuthRepository;
+	  +router: GoRouter;
+	  +studyInfoFormViewModel: StudyInfoFormViewModel;
+	  +enrollmentFormViewModel: EnrollmentFormViewModel;
+	  +measurementsFormViewModel: MeasurementsFormViewModel;
+	  +reportsFormViewModel: ReportsFormViewModel;
+	  +interventionsFormViewModel: InterventionsFormViewModel;
+	  +form: FormGroup;
+	  +isStudyReadonly: bool;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void read();
+	  +void setControlsFrom();
+	  +Study buildFormData();
+	  +void dispose();
+	  +void onCancel();
+	  +dynamic onSave();
+	  -dynamic _applyAndSaveSubform()
 	]
 	
-	[NotificationService
+	[StudyFormViewModel]o-[Study]
+	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
+	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyFormViewModel]o-[GoRouter]
+	[StudyFormViewModel]o-[StudyInfoFormViewModel]
+	[StudyFormViewModel]o-[EnrollmentFormViewModel]
+	[StudyFormViewModel]o-[MeasurementsFormViewModel]
+	[StudyFormViewModel]o-[ReportsFormViewModel]
+	[StudyFormViewModel]o-[InterventionsFormViewModel]
+	[StudyFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
+	
+	[&lt;abstract&gt;WithQuestionnaireControls
 	  |
-	  -_streamController: BehaviorSubject&lt;NotificationIntent&gt;
+	  +questionsArray: FormArray&lt;dynamic&gt;;
+	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
+	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
+	  +propagateOnSave: bool;
+	  +questionModels: List&lt;Q&gt;;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
 	  |
-	  +Stream&lt;NotificationIntent&gt; watchNotifications();
-	  +void showMessage();
-	  +void show();
-	  +void dispose()
+	  +void setQuestionnaireControlsFrom();
+	  +QuestionnaireFormData buildQuestionnaireFormData();
+	  +void read();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +Q provide();
+	  +Q provideQuestionFormViewModel()
 	]
 	
-	[NotificationService]o-[BehaviorSubject]
-	[&lt;abstract&gt;INotificationService]&lt;:--[NotificationService]
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
 	
-	[Assets
+	[QuestionnaireFormData
 	  |
-	  &lt;static&gt;+logoWide: String
-	]
-	
-	[Hyperlink
+	  +questionsData: List&lt;QuestionFormData&gt;?;
+	  +id: String
 	  |
-	  +text: String;
-	  +url: String?;
-	  +onClick: void Function()?;
-	  +linkColor: Color;
-	  +hoverColor: Color?;
-	  +visitedColor: Color?;
-	  +style: TextStyle?;
-	  +hoverStyle: TextStyle?;
-	  +visitedStyle: TextStyle?;
-	  +icon: IconData?;
-	  +iconSize: double?
+	  +StudyUQuestionnaire toQuestionnaire();
+	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
+	  +QuestionnaireFormData copy()
 	]
 	
-	[Hyperlink]o-[void Function()?]
-	[Hyperlink]o-[Color]
-	[Hyperlink]o-[TextStyle]
-	[Hyperlink]o-[IconData]
+	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
 	
-	[StandardTableColumn
+	[&lt;abstract&gt;QuestionFormData
 	  |
-	  +label: String;
-	  +tooltip: String?;
-	  +columnWidth: TableColumnWidth;
-	  +sortable: bool;
-	  +sortAscending: bool?;
-	  +sortableIcon: Widget?
-	]
-	
-	[StandardTableColumn]o-[&lt;abstract&gt;TableColumnWidth]
-	[StandardTableColumn]o-[&lt;abstract&gt;Widget]
-	
-	[StandardTable
+	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
+	  +questionId: String;
+	  +questionText: String;
+	  +questionInfoText: String?;
+	  +questionType: SurveyQuestionType;
+	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
+	  +responseOptions: List&lt;dynamic&gt;;
+	  +id: String
 	  |
-	  +items: List&lt;T&gt;;
-	  +inputColumns: List&lt;StandardTableColumn&gt;;
-	  +onSelectItem: void Function(T);
-	  +trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?;
-	  +trailingActionsMenuType: ActionMenuType?;
-	  +sortColumnPredicates: List&lt;int Function(T, T)?&gt;?;
-	  +pinnedPredicates: int Function(T, T)?;
-	  +headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
-	  +dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
-	  +inputTrailingActionsColumn: StandardTableColumn;
-	  +tableWrapper: Widget Function(Widget)?;
-	  +cellSpacing: double;
-	  +rowSpacing: double;
-	  +minRowHeight: double?;
-	  +showTableHeader: bool;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  +leadingWidget: Widget?;
-	  +trailingWidget: Widget?;
-	  +leadingWidgetSpacing: double?;
-	  +trailingWidgetSpacing: double?;
-	  +emptyWidget: Widget?;
-	  +rowStyle: StandardTableStyle;
-	  +disableRowInteractions: bool
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +EligibilityCriterion toEligibilityCriterion();
+	  +Answer&lt;dynamic&gt; constructAnswerFor();
+	  +dynamic setResponseOptionsValidityFrom();
+	  +QuestionFormData copy()
 	]
 	
-	[StandardTable]o-[void Function(T)]
-	[StandardTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?]
-	[StandardTable]o-[ActionMenuType]
-	[StandardTable]o-[int Function(T, T)?]
-	[StandardTable]o-[TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?]
-	[StandardTable]o-[StandardTableColumn]
-	[StandardTable]o-[Widget Function(Widget)?]
-	[StandardTable]o-[&lt;abstract&gt;Widget]
-	[StandardTable]o-[StandardTableStyle]
+	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
 	
-	[StandardTableStyle
+	[ChoiceQuestionFormData
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StandardTableStyle&gt;;
-	  &lt;static&gt;+plain: StandardTableStyle;
-	  &lt;static&gt;+material: StandardTableStyle
+	  +isMultipleChoice: bool;
+	  +answerOptions: List&lt;String&gt;;
+	  +responseOptions: List&lt;String&gt;
+	  |
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +QuestionFormData copy();
+	  -Choice _buildChoiceForValue();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[StandardTableStyle]o-[StandardTableStyle]
-	[Enum]&lt;:--[StandardTableStyle]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
 	
-	[HelpIcon
+	[BoolQuestionFormData
 	  |
-	  +tooltipText: String?
+	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
+	  +responseOptions: List&lt;String&gt;
 	  |
-	  +Widget build()
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +BoolQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[ErrorPage
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
+	
+	[ImageQuestionFormData
 	  |
-	  +error: Exception?
+	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
+	  +responseOptions: List&lt;String&gt;
 	  |
-	  +Widget build()
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +ImageQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ErrorPage]
-	
-	[SplashPage
-	  |
-	  +Widget build()
-	]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
 	
-	[IconPack
+	[AudioQuestionFormData
 	  |
-	  &lt;static&gt;+defaultPack: List&lt;IconOption&gt;;
-	  &lt;static&gt;+material: List&lt;IconOption&gt;
+	  +maxRecordingDurationSeconds: int;
+	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
+	  +responseOptions: List&lt;String&gt;
 	  |
-	  &lt;static&gt;+IconOption? resolveIconByName()
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +AudioQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[IconOption
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
+	
+	[ScaleQuestionFormData
 	  |
-	  +name: String;
-	  +icon: IconData?;
-	  +isEmpty: bool;
-	  +props: List&lt;Object?&gt;
+	  +minValue: double;
+	  +maxValue: double;
+	  +minLabel: String?;
+	  +maxLabel: String?;
+	  +midValues: List&lt;double?&gt;;
+	  +midLabels: List&lt;String?&gt;;
+	  +stepSize: double;
+	  +initialValue: double?;
+	  +minColor: Color?;
+	  +maxColor: Color?;
+	  +responseOptions: List&lt;double&gt;;
+	  +midAnnotations: List&lt;Annotation&gt;
 	  |
-	  +String toJson();
-	  &lt;static&gt;+IconOption fromJson()
+	  +ScaleQuestion toQuestion();
+	  +QuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[IconOption]o-[IconData]
-	[&lt;abstract&gt;Equatable]&lt;:-[IconOption]
+	[ScaleQuestionFormData]o-[Color]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
 	
-	[ReactiveIconPicker
+	[FreeTextQuestionFormData
+	  |
+	  +textLengthRange: List&lt;int&gt;;
+	  +textType: FreeTextQuestionType;
+	  +textTypeExpression: String?;
+	  +responseOptions: List&lt;String&gt;
+	  |
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +FreeTextQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[ReactiveFocusableFormField]&lt;:-[ReactiveIconPicker]
+	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
 	
-	[IconPicker
+	[AudioRecordingQuestionFormView
 	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +selectedOption: IconOption?;
-	  +onSelect: void Function(IconOption)?;
-	  +galleryIconSize: double?;
-	  +selectedIconSize: double?;
-	  +focusNode: FocusNode?;
-	  +isDisabled: bool
+	  +formViewModel: QuestionFormViewModel
 	  |
 	  +Widget build()
 	]
 	
-	[IconPicker]o-[IconOption]
-	[IconPicker]o-[void Function(IconOption)?]
-	[IconPicker]o-[FocusNode]
+	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
 	
-	[IconPickerField
+	[FreeTextQuestionFormView
 	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +selectedOption: IconOption?;
-	  +selectedIconSize: double?;
-	  +galleryIconSize: double?;
-	  +onSelect: void Function(IconOption)?;
-	  +focusNode: FocusNode?;
-	  +isDisabled: bool
+	  +formViewModel: QuestionFormViewModel;
+	  +generateLabelHelpTextMap: dynamic
 	  |
-	  +Widget build()
+	  +Widget build();
+	  +Widget disableOnReadonly();
+	  +Widget generateRow()
 	]
 	
-	[IconPickerField]o-[IconOption]
-	[IconPickerField]o-[void Function(IconOption)?]
-	[IconPickerField]o-[FocusNode]
+	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
 	
-	[IconPickerGallery
-	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +onSelect: void Function(IconOption)?;
-	  +iconSize: double
+	[SurveyQuestionType
 	  |
-	  +Widget build()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
+	  &lt;static&gt;+choice: SurveyQuestionType;
+	  &lt;static&gt;+bool: SurveyQuestionType;
+	  &lt;static&gt;+scale: SurveyQuestionType;
+	  &lt;static&gt;+image: SurveyQuestionType;
+	  &lt;static&gt;+audio: SurveyQuestionType;
+	  &lt;static&gt;+freeText: SurveyQuestionType
 	]
 	
-	[IconPickerGallery]o-[void Function(IconOption)?]
+	[SurveyQuestionType]o-[SurveyQuestionType]
+	[Enum]&lt;:--[SurveyQuestionType]
 	
-	[FormSideSheetTab
+	[ImageCapturingQuestionFormView
 	  |
-	  +formViewBuilder: Widget Function(T)
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
 	]
 	
-	[FormSideSheetTab]o-[Widget Function(T)]
-	[NavbarTab]&lt;:-[FormSideSheetTab]
+	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
 	
-	[SidesheetTab
+	[&lt;abstract&gt;IScaleQuestionFormViewModel
 	  |
-	  +builder: Widget Function(BuildContext)
+	  +isMidValuesClearedInfoVisible: bool
 	]
 	
-	[SidesheetTab]o-[Widget Function(BuildContext)]
-	[NavbarTab]&lt;:-[SidesheetTab]
-	
-	[Sidesheet
+	[ScaleQuestionFormView
 	  |
-	  &lt;static&gt;+kDefaultWidth: double;
-	  +titleText: String;
-	  +body: Widget?;
-	  +tabs: List&lt;SidesheetTab&gt;?;
-	  +actionButtons: List&lt;Widget&gt;?;
-	  +width: double?;
-	  +withCloseButton: bool;
-	  +ignoreAppBar: bool;
-	  +collapseSingleTab: bool;
-	  +bodyPadding: EdgeInsets?;
-	  +wrapContent: Widget Function(Widget)?
+	  +formViewModel: QuestionFormViewModel
 	]
 	
-	[Sidesheet]o-[&lt;abstract&gt;Widget]
-	[Sidesheet]o-[EdgeInsets]
-	[Sidesheet]o-[Widget Function(Widget)?]
+	[ScaleQuestionFormView]o-[QuestionFormViewModel]
 	
-	[ReactiveCustomColorPicker
+	[ChoiceQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
 	]
 	
-	[ReactiveFormField]&lt;:-[ReactiveCustomColorPicker]
+	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
 	
-	[TextParagraph
+	[BoolQuestionFormView
 	  |
-	  +text: String?;
-	  +style: TextStyle?;
-	  +selectable: bool;
-	  +span: List&lt;TextSpan&gt;?
+	  +formViewModel: QuestionFormViewModel
 	  |
 	  +Widget build()
 	]
 	
-	[TextParagraph]o-[TextStyle]
+	[BoolQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
 	
-	[ConstrainedWidthFlexible
+	[QuestionFormViewModel
 	  |
-	  +minWidth: double;
-	  +maxWidth: double;
-	  +flex: int;
-	  +flexSum: int;
-	  +child: Widget;
-	  +outerConstraints: BoxConstraints
+	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
+	  -_titles: Map&lt;FormMode, String Function()&gt;?;
+	  +questionIdControl: FormControl&lt;String&gt;;
+	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
+	  +questionTextControl: FormControl&lt;String&gt;;
+	  +questionInfoTextControl: FormControl&lt;String&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
+	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +customOptionsMin: int;
+	  +customOptionsMax: int;
+	  +customOptionsInitial: int;
+	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
+	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
+	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
+	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
+	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
+	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
+	  &lt;static&gt;+kDefaultScaleMinValue: int;
+	  &lt;static&gt;+kDefaultScaleMaxValue: int;
+	  &lt;static&gt;+kNumMidValueControls: int;
+	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
+	  +scaleMinValueControl: FormControl&lt;int&gt;;
+	  +scaleMaxValueControl: FormControl&lt;int&gt;;
+	  -_scaleRangeControl: FormControl&lt;int&gt;;
+	  +scaleMinLabelControl: FormControl&lt;String&gt;;
+	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
+	  +scaleMidValueControls: FormArray&lt;int&gt;;
+	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
+	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
+	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
+	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
+	  +prevMidValues: List&lt;int?&gt;?;
+	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
+	  +customRegexControl: FormControl&lt;String&gt;;
+	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
+	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
+	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
+	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
+	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
+	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
+	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +form: FormGroup;
+	  +questionId: String;
+	  +questionType: SurveyQuestionType;
+	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
+	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
+	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +validAnswerOptions: List&lt;String&gt;;
+	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +scaleMinValue: int;
+	  +scaleMaxValue: int;
+	  +scaleRange: int;
+	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +questionTextRequired: dynamic;
+	  +numValidChoiceOptions: dynamic;
+	  +scaleRangeValid: dynamic;
+	  +maxRecordingDurationValid: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +isAddOptionButtonVisible: bool;
+	  +isMidValuesClearedInfoVisible: bool
 	  |
-	  +Widget build();
-	  -double _getWidth()
+	  +String? scaleMidLabelAt();
+	  -dynamic _onScaleRangeChanged();
+	  -dynamic _applyInputFormatters();
+	  -dynamic _updateScaleMidValueControls();
+	  -Map&lt;String, dynamic&gt;? _validateFreeText();
+	  -dynamic _onFreeTextLengthChanged();
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +dynamic onQuestionTypeChanged();
+	  +dynamic onResponseOptionsChanged();
+	  -void _updateFormControls();
+	  +void initControls();
+	  +void setControlsFrom();
+	  +QuestionFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem();
+	  +dynamic save();
+	  +QuestionFormViewModel createDuplicate()
 	]
 	
-	[ConstrainedWidthFlexible]o-[&lt;abstract&gt;Widget]
-	[ConstrainedWidthFlexible]o-[BoxConstraints]
+	[QuestionFormViewModel]o-[SurveyQuestionType]
+	[QuestionFormViewModel]o-[FormControl]
+	[QuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
+	[QuestionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
 	
-	[PrimaryButton
+	[SurveyQuestionFormView
 	  |
-	  +text: String;
-	  +icon: IconData?;
-	  +isLoading: bool;
-	  +showLoadingEarliestAfterMs: int;
-	  +onPressed: void Function()?;
-	  +tooltip: String;
-	  +tooltipDisabled: String;
-	  +enabled: bool;
-	  +onPressedFuture: dynamic Function()?;
-	  +innerPadding: EdgeInsets;
-	  +minimumSize: Size?;
-	  +isDisabled: bool
+	  +formViewModel: QuestionFormViewModel;
+	  +isHtmlStyleable: bool
 	]
 	
-	[PrimaryButton]o-[IconData]
-	[PrimaryButton]o-[void Function()?]
-	[PrimaryButton]o-[dynamic Function()?]
-	[PrimaryButton]o-[EdgeInsets]
-	[PrimaryButton]o-[Size]
+	[SurveyQuestionFormView]o-[QuestionFormViewModel]
 	
-	[EmptyBody
+	[&lt;abstract&gt;IFormDataWithSchedule
 	  |
-	  +icon: IconData?;
-	  +leading: Widget?;
-	  +leadingSpacing: double?;
-	  +title: String?;
-	  +description: String?;
-	  +button: Widget?
+	  +instanceId: String;
+	  +isTimeLocked: bool;
+	  +timeLockStart: StudyUTimeOfDay?;
+	  +timeLockEnd: StudyUTimeOfDay?;
+	  +hasReminder: bool;
+	  +reminderTime: StudyUTimeOfDay?
 	  |
-	  +Widget build()
+	  +Schedule toSchedule()
 	]
 	
-	[EmptyBody]o-[IconData]
-	[EmptyBody]o-[&lt;abstract&gt;Widget]
+	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
 	
-	[&lt;abstract&gt;FormConsumerWidget
+	[ScheduleControls
 	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;FormConsumerRefWidget
+	  +formViewModel: WithScheduleControls
 	  |
-	  +Widget build()
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
 	]
 	
-	[Badge
+	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
+	
+	[&lt;abstract&gt;WithScheduleControls
 	  |
-	  +icon: IconData?;
-	  +color: Color?;
-	  +borderRadius: double;
-	  +label: String;
-	  +type: BadgeType;
-	  +padding: EdgeInsets;
-	  +iconSize: double?;
-	  +labelStyle: TextStyle?;
-	  +center: bool
+	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
+	  +instanceID: FormControl&lt;String&gt;;
+	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
+	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
+	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
+	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
+	  +hasReminderControl: FormControl&lt;bool&gt;;
+	  +reminderTimeControl: FormControl&lt;Time&gt;;
+	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
+	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
+	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
+	  +hasReminder: bool;
+	  +isTimeRestricted: bool;
+	  +timeRestriction: List&lt;Time&gt;?
 	  |
-	  +Widget build();
-	  -Color? _getBackgroundColor();
-	  -Color _getBorderColor();
-	  -Color? _getLabelColor()
+	  +void setScheduleControlsFrom();
+	  -dynamic _initReminderControl()
 	]
 	
-	[Badge]o-[IconData]
-	[Badge]o-[Color]
-	[Badge]o-[BadgeType]
-	[Badge]o-[EdgeInsets]
-	[Badge]o-[TextStyle]
+	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
+	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
 	
-	[BadgeType
+	[&lt;abstract&gt;StudyDesignPageWidget
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;BadgeType&gt;;
-	  &lt;static&gt;+filled: BadgeType;
-	  &lt;static&gt;+outlined: BadgeType;
-	  &lt;static&gt;+outlineFill: BadgeType;
-	  &lt;static&gt;+plain: BadgeType
+	  +Widget? banner()
 	]
 	
-	[BadgeType]o-[BadgeType]
-	[Enum]&lt;:--[BadgeType]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
 	
-	[NullHelperDecoration
+	[StudiesTableColumnHeader
+	  |
+	  +title: String;
+	  +sortable: bool;
+	  +sortAscending: bool;
+	  +sortingActive: bool;
+	  +onSort: void Function()?
 	]
 	
-	[InputDecoration]&lt;:-[NullHelperDecoration]
+	[StudiesTableColumnHeader]o-[void Function()?]
 	
-	[Collapsible
+	[DashboardScreen
 	  |
-	  +contentBuilder: Widget Function(BuildContext, bool);
-	  +headerBuilder: Widget Function(BuildContext, bool)?;
-	  +title: String?;
-	  +isCollapsed: bool
+	  +filter: StudiesFilter?
 	]
 	
-	[Collapsible]o-[Widget Function(BuildContext, bool)]
-	[Collapsible]o-[Widget Function(BuildContext, bool)?]
+	[DashboardScreen]o-[StudiesFilter]
 	
-	[ActionMenuInline
+	[DashboardScaffold
 	  |
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +iconSize: double?;
-	  +visible: bool;
-	  +splashRadius: double?;
-	  +paddingVertical: double?;
-	  +paddingHorizontal: double?
+	  &lt;static&gt;+compactWidthThreshold: double;
+	  +body: Widget
 	  |
 	  +Widget build()
 	]
 	
-	[StudyULogo
+	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
+	
+	[DashboardController
 	  |
-	  +onTap: void Function()?
+	  +studyRepository: IStudyRepository;
+	  +authRepository: IAuthRepository;
+	  +userRepository: IUserRepository;
+	  +router: GoRouter;
+	  -_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?;
+	  +searchController: SearchController;
+	  +isSortAscending: bool
 	  |
-	  +Widget build()
+	  -dynamic _subscribeStudies();
+	  +dynamic setSearchText();
+	  +dynamic setStudiesFilter();
+	  +dynamic onSelectStudy();
+	  +dynamic onClickNewStudy();
+	  +dynamic pinStudy();
+	  +dynamic pinOffStudy();
+	  +void setSorting();
+	  +void filterStudies();
+	  +void sortStudies();
+	  +bool isSortingActiveForColumn();
+	  +bool isPinned();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void dispose()
 	]
 	
-	[StudyULogo]o-[void Function()?]
+	[DashboardController]o-[&lt;abstract&gt;IStudyRepository]
+	[DashboardController]o-[&lt;abstract&gt;IAuthRepository]
+	[DashboardController]o-[&lt;abstract&gt;IUserRepository]
+	[DashboardController]o-[GoRouter]
+	[DashboardController]o-[StreamSubscription]
+	[DashboardController]o-[SearchController]
+	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
 	
-	[NavbarTab
+	[StudiesFilter
 	  |
-	  +title: String;
-	  +intent: RoutingIntent?;
 	  +index: int;
-	  +enabled: bool
+	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
 	]
 	
-	[NavbarTab]o-[RoutingIntent]
+	[Enum]&lt;:--[StudiesFilter]
 	
-	[TabbedNavbar
+	[StudiesTableColumnSize
 	  |
-	  +tabs: List&lt;T&gt;;
-	  +selectedTab: T?;
-	  +indicator: BoxDecoration?;
-	  +height: double?;
-	  +disabledBackgroundColor: Color?;
-	  +disabledTooltipText: String?;
-	  +onSelect: void Function(int, T)?;
-	  +labelPadding: EdgeInsets?;
-	  +labelSpacing: double?;
-	  +indicatorSize: TabBarIndicatorSize?;
-	  +isScrollable: bool;
-	  +backgroundColor: Color?;
-	  +labelColorHover: Color?;
-	  +unselectedLabelColorHover: Color?
+	  +collapsed: bool;
+	  +flex: int?;
+	  +width: double?
+	  |
+	  +Widget createContainer()
 	]
 	
-	[TabbedNavbar]o-[BoxDecoration]
-	[TabbedNavbar]o-[Color]
-	[TabbedNavbar]o-[void Function(int, T)?]
-	[TabbedNavbar]o-[EdgeInsets]
-	[TabbedNavbar]o-[TabBarIndicatorSize]
-	
-	[HtmlStylingBanner
+	[StudiesTable
 	  |
-	  +isDismissed: bool;
-	  +onDismissed: dynamic Function()?
+	  +itemHeight: double;
+	  +itemPadding: double;
+	  +rowSpacing: double;
+	  +columnSpacing: double;
+	  +compactWidthThreshold: double;
+	  +superCompactWidthThreshold: double;
+	  +compactStatTitleThreshold: double;
+	  +studies: List&lt;Study&gt;;
+	  +onSelect: void Function(Study);
+	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study);
+	  +emptyWidget: Widget;
+	  +pinnedStudies: Iterable&lt;String&gt;;
+	  +dashboardController: DashboardController
 	  |
-	  +Widget build()
+	  +Widget build();
+	  -Widget _buildColumnHeader()
 	]
 	
-	[HtmlStylingBanner]o-[dynamic Function()?]
+	[StudiesTable]o-[void Function(Study)]
+	[StudiesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)]
+	[StudiesTable]o-[&lt;abstract&gt;Widget]
+	[StudiesTable]o-[DashboardController]
 	
-	[&lt;abstract&gt;ISyncIndicatorViewModel
+	[StudiesTableColumn
 	  |
-	  +isDirty: bool;
-	  +lastSynced: DateTime?
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudiesTableColumn&gt;;
+	  &lt;static&gt;+pin: StudiesTableColumn;
+	  &lt;static&gt;+title: StudiesTableColumn;
+	  &lt;static&gt;+status: StudiesTableColumn;
+	  &lt;static&gt;+participation: StudiesTableColumn;
+	  &lt;static&gt;+createdAt: StudiesTableColumn;
+	  &lt;static&gt;+enrolled: StudiesTableColumn;
+	  &lt;static&gt;+active: StudiesTableColumn;
+	  &lt;static&gt;+completed: StudiesTableColumn;
+	  &lt;static&gt;+action: StudiesTableColumn
 	]
 	
-	[SyncIndicator
+	[StudiesTableColumn]o-[StudiesTableColumn]
+	[Enum]&lt;:--[StudiesTableColumn]
+	
+	[StudiesTableItem
 	  |
-	  +state: AsyncValue&lt;T&gt;;
-	  +lastSynced: DateTime?;
-	  +isDirty: bool;
-	  +animationDuration: int;
-	  +iconSize: double
+	  +study: Study;
+	  +itemHeight: double;
+	  +itemPadding: double;
+	  +rowSpacing: double;
+	  +columnSpacing: double;
+	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
+	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
+	  +isPinned: bool;
+	  +onPinnedChanged: void Function(Study, bool)?;
+	  +onTap: void Function(Study)?
 	]
 	
-	[SyncIndicator]o-[&lt;abstract&gt;AsyncValue]
+	[StudiesTableItem]o-[Study]
+	[StudiesTableItem]o-[void Function(Study, bool)?]
+	[StudiesTableItem]o-[void Function(Study)?]
 	
-	[Search
-	  |
-	  +onQueryChanged: dynamic Function(String);
-	  +searchController: SearchController?;
-	  +hintText: String?;
-	  +initialText: String?
+	[App
 	]
 	
-	[Search]o-[dynamic Function(String)]
-	[Search]o-[SearchController]
+	[AppContent
+	]
 	
-	[SearchController
+	[AccountSettingsDialog
 	  |
-	  +setText: void Function(String)
+	  +Widget build()
 	]
 	
-	[SearchController]o-[void Function(String)]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AccountSettingsDialog]
 	
-	[ActionMenuType
+	[&lt;abstract&gt;IInviteCodeRepository
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ActionMenuType&gt;;
-	  &lt;static&gt;+inline: ActionMenuType;
-	  &lt;static&gt;+popup: ActionMenuType
+	  +dynamic isCodeAlreadyUsed()
 	]
 	
-	[ActionMenuType]o-[ActionMenuType]
-	[Enum]&lt;:--[ActionMenuType]
+	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IInviteCodeRepository]
 	
-	[SecondaryButton
+	[InviteCodeRepository
 	  |
-	  +text: String;
-	  +icon: IconData?;
-	  +isLoading: bool;
-	  +onPressed: void Function()?
+	  +studyId: String;
+	  +ref: ProviderRef&lt;dynamic&gt;;
+	  +apiClient: StudyUApi;
+	  +authRepository: IAuthRepository;
+	  +studyRepository: IStudyRepository;
+	  +study: Study
 	  |
-	  +Widget build()
+	  +String getKey();
+	  +dynamic isCodeAlreadyUsed();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +dynamic emitUpdate()
 	]
 	
-	[SecondaryButton]o-[IconData]
-	[SecondaryButton]o-[void Function()?]
+	[InviteCodeRepository]o-[&lt;abstract&gt;ProviderRef]
+	[InviteCodeRepository]o-[&lt;abstract&gt;StudyUApi]
+	[InviteCodeRepository]o-[&lt;abstract&gt;IAuthRepository]
+	[InviteCodeRepository]o-[&lt;abstract&gt;IStudyRepository]
+	[InviteCodeRepository]o-[Study]
+	[&lt;abstract&gt;ModelRepository]&lt;:-[InviteCodeRepository]
+	[&lt;abstract&gt;IInviteCodeRepository]&lt;:--[InviteCodeRepository]
 	
-	[FormTableRow
+	[InviteCodeRepositoryDelegate
 	  |
-	  +label: String?;
-	  +labelBuilder: Widget Function(BuildContext)?;
-	  +labelStyle: TextStyle?;
-	  +labelHelpText: String?;
-	  +input: Widget;
-	  +control: AbstractControl&lt;dynamic&gt;?;
-	  +layout: FormTableRowLayout?
+	  +study: Study;
+	  +apiClient: StudyUApi;
+	  +studyRepository: IStudyRepository
+	  |
+	  +dynamic fetch();
+	  +dynamic fetchAll();
+	  +dynamic save();
+	  +dynamic delete();
+	  +dynamic onError();
+	  +StudyInvite createDuplicate();
+	  +StudyInvite createNewInstance()
 	]
 	
-	[FormTableRow]o-[Widget Function(BuildContext)?]
-	[FormTableRow]o-[TextStyle]
-	[FormTableRow]o-[&lt;abstract&gt;Widget]
-	[FormTableRow]o-[&lt;abstract&gt;AbstractControl]
-	[FormTableRow]o-[FormTableRowLayout]
+	[InviteCodeRepositoryDelegate]o-[Study]
+	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
+	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;IStudyRepository]
+	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[InviteCodeRepositoryDelegate]
 	
-	[FormTableLayout
-	  |
-	  +rows: List&lt;FormTableRow&gt;;
-	  +columnWidths: Map&lt;int, TableColumnWidth&gt;;
-	  +rowDivider: Widget?;
-	  +rowLayout: FormTableRowLayout?;
-	  +rowLabelStyle: TextStyle?
+	[&lt;abstract&gt;IStudyRepository
 	  |
-	  +Widget build()
+	  +dynamic launch();
+	  +dynamic deleteParticipants()
 	]
 	
-	[FormTableLayout]o-[&lt;abstract&gt;Widget]
-	[FormTableLayout]o-[FormTableRowLayout]
-	[FormTableLayout]o-[TextStyle]
+	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IStudyRepository]
 	
-	[FormSectionHeader
+	[StudyRepository
 	  |
-	  +title: String;
-	  +titleTextStyle: TextStyle?;
-	  +helpText: String?;
-	  +divider: bool;
-	  +helpTextDisabled: bool
+	  +apiClient: StudyUApi;
+	  +authRepository: IAuthRepository;
+	  +ref: ProviderRef&lt;dynamic&gt;;
+	  +sortCallback: void Function()?
 	  |
-	  +Widget build()
+	  +String getKey();
+	  +dynamic deleteParticipants();
+	  +dynamic launch();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
 	]
 	
-	[FormSectionHeader]o-[TextStyle]
+	[StudyRepository]o-[&lt;abstract&gt;StudyUApi]
+	[StudyRepository]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyRepository]o-[&lt;abstract&gt;ProviderRef]
+	[StudyRepository]o-[void Function()?]
+	[&lt;abstract&gt;ModelRepository]&lt;:-[StudyRepository]
+	[&lt;abstract&gt;IStudyRepository]&lt;:--[StudyRepository]
 	
-	[FormLabel
+	[StudyRepositoryDelegate
 	  |
-	  +labelText: String?;
-	  +helpText: String?;
-	  +labelTextStyle: TextStyle?;
-	  +layout: FormTableRowLayout?
+	  +apiClient: StudyUApi;
+	  +authRepository: IAuthRepository
 	  |
-	  +Widget build()
+	  +dynamic fetchAll();
+	  +dynamic fetch();
+	  +dynamic save();
+	  +dynamic delete();
+	  +dynamic onError();
+	  +Study createNewInstance();
+	  +Study createDuplicate()
 	]
 	
-	[FormLabel]o-[TextStyle]
-	[FormLabel]o-[FormTableRowLayout]
+	[StudyRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
+	[StudyRepositoryDelegate]o-[&lt;abstract&gt;IAuthRepository]
+	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[StudyRepositoryDelegate]
 	
-	[FormTableRowLayout
+	[&lt;abstract&gt;StudyUApi
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;FormTableRowLayout&gt;;
-	  &lt;static&gt;+vertical: FormTableRowLayout;
-	  &lt;static&gt;+horizontal: FormTableRowLayout
+	  +dynamic saveStudy();
+	  +dynamic fetchStudy();
+	  +dynamic getUserStudies();
+	  +dynamic deleteStudy();
+	  +dynamic saveStudyInvite();
+	  +dynamic fetchStudyInvite();
+	  +dynamic deleteStudyInvite();
+	  +dynamic deleteParticipants();
+	  +dynamic fetchAppConfig();
+	  +dynamic fetchUser();
+	  +dynamic saveUser()
 	]
 	
-	[FormTableRowLayout]o-[FormTableRowLayout]
-	[Enum]&lt;:--[FormTableRowLayout]
-	
-	[MouseEventsRegion
-	  |
-	  +onTap: void Function()?;
-	  +onHover: void Function(PointerHoverEvent)?;
-	  +onEnter: void Function(PointerEnterEvent)?;
-	  +onExit: void Function(PointerExitEvent)?;
-	  +autoselectCursor: bool;
-	  +cursor: SystemMouseCursor;
-	  &lt;static&gt;+defaultCursor: SystemMouseCursor;
-	  +autoCursor: SystemMouseCursor
+	[APIException
 	]
 	
-	[MouseEventsRegion]o-[void Function()?]
-	[MouseEventsRegion]o-[void Function(PointerHoverEvent)?]
-	[MouseEventsRegion]o-[void Function(PointerEnterEvent)?]
-	[MouseEventsRegion]o-[void Function(PointerExitEvent)?]
-	[MouseEventsRegion]o-[SystemMouseCursor]
+	[Exception]&lt;:--[APIException]
 	
-	[FormControlLabel
-	  |
-	  +formControl: AbstractControl&lt;dynamic&gt;;
-	  +text: String;
-	  +isClickable: bool;
-	  +textStyle: TextStyle?;
-	  +onClick: void Function(AbstractControl&lt;dynamic&gt;)?
-	  |
-	  +Widget build()
+	[StudyNotFoundException
 	]
 	
-	[FormControlLabel]o-[&lt;abstract&gt;AbstractControl]
-	[FormControlLabel]o-[TextStyle]
-	[FormControlLabel]o-[void Function(AbstractControl&lt;dynamic&gt;)?]
+	[APIException]&lt;:-[StudyNotFoundException]
 	
-	[SingleColumnLayout
-	  |
-	  &lt;static&gt;+defaultConstraints: BoxConstraints;
-	  &lt;static&gt;+defaultConstraintsNarrow: BoxConstraints;
-	  +body: Widget;
-	  +header: Widget?;
-	  +stickyHeader: bool;
-	  +constraints: BoxConstraints?;
-	  +scroll: bool;
-	  +padding: EdgeInsets?
-	  |
-	  &lt;static&gt;+dynamic fromType()
+	[MeasurementNotFoundException
 	]
 	
-	[SingleColumnLayout]o-[BoxConstraints]
-	[SingleColumnLayout]o-[&lt;abstract&gt;Widget]
-	[SingleColumnLayout]o-[EdgeInsets]
+	[APIException]&lt;:-[MeasurementNotFoundException]
 	
-	[SingleColumnLayoutType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;;
-	  &lt;static&gt;+boundedWide: SingleColumnLayoutType;
-	  &lt;static&gt;+boundedNarrow: SingleColumnLayoutType;
-	  &lt;static&gt;+stretched: SingleColumnLayoutType;
-	  &lt;static&gt;+split: SingleColumnLayoutType
+	[QuestionNotFoundException
 	]
 	
-	[SingleColumnLayoutType]o-[SingleColumnLayoutType]
-	[Enum]&lt;:--[SingleColumnLayoutType]
+	[APIException]&lt;:-[QuestionNotFoundException]
 	
-	[TwoColumnLayout
-	  |
-	  &lt;static&gt;+defaultDivider: VerticalDivider;
-	  &lt;static&gt;+defaultContentPadding: EdgeInsets;
-	  &lt;static&gt;+slimContentPadding: EdgeInsets;
-	  +leftWidget: Widget;
-	  +rightWidget: Widget;
-	  +dividerWidget: Widget?;
-	  +headerWidget: Widget?;
-	  +flexLeft: int?;
-	  +flexRight: int?;
-	  +constraintsLeft: BoxConstraints?;
-	  +constraintsRight: BoxConstraints?;
-	  +scrollLeft: bool;
-	  +scrollRight: bool;
-	  +paddingLeft: EdgeInsets?;
-	  +paddingRight: EdgeInsets?;
-	  +backgroundColorLeft: Color?;
-	  +backgroundColorRight: Color?;
-	  +stretchHeight: bool
+	[ConsentItemNotFoundException
 	]
 	
-	[TwoColumnLayout]o-[VerticalDivider]
-	[TwoColumnLayout]o-[EdgeInsets]
-	[TwoColumnLayout]o-[&lt;abstract&gt;Widget]
-	[TwoColumnLayout]o-[BoxConstraints]
-	[TwoColumnLayout]o-[Color]
+	[APIException]&lt;:-[ConsentItemNotFoundException]
 	
-	[UnderConstruction
-	  |
-	  +Widget build()
+	[InterventionNotFoundException
 	]
 	
-	[StandardDialog
-	  |
-	  +title: Widget?;
-	  +titleText: String?;
-	  +body: Widget;
-	  +actionButtons: List&lt;Widget&gt;;
-	  +backgroundColor: Color?;
-	  +borderRadius: double?;
-	  +width: double?;
-	  +height: double?;
-	  +minWidth: double;
-	  +minHeight: double;
-	  +maxWidth: double?;
-	  +maxHeight: double?;
-	  +padding: EdgeInsets
-	  |
-	  +Widget build()
+	[APIException]&lt;:-[InterventionNotFoundException]
+	
+	[InterventionTaskNotFoundException
 	]
 	
-	[StandardDialog]o-[&lt;abstract&gt;Widget]
-	[StandardDialog]o-[Color]
-	[StandardDialog]o-[EdgeInsets]
+	[APIException]&lt;:-[InterventionTaskNotFoundException]
 	
-	[IndicatorRangeSliderThumbShape
-	  |
-	  +buildContext: BuildContext;
-	  +start: T;
-	  +end: T
-	  |
-	  +Size getPreferredSize();
-	  +void paint()
+	[ReportNotFoundException
 	]
 	
-	[IndicatorRangeSliderThumbShape]o-[&lt;abstract&gt;BuildContext]
-	[&lt;abstract&gt;RangeSliderThumbShape]&lt;:-[IndicatorRangeSliderThumbShape]
+	[APIException]&lt;:-[ReportNotFoundException]
 	
-	[&lt;abstract&gt;IWithBanner
-	  |
-	  +Widget? banner()
+	[ReportSectionNotFoundException
 	]
 	
-	[BannerBox
-	  |
-	  +prefixIcon: Widget?;
-	  +body: Widget;
-	  +style: BannerStyle;
-	  +padding: EdgeInsets?;
-	  +noPrefix: bool;
-	  +dismissable: bool;
-	  +isDismissed: bool?;
-	  +onDismissed: dynamic Function()?;
-	  +dismissIconSize: double
+	[APIException]&lt;:-[ReportSectionNotFoundException]
+	
+	[StudyInviteNotFoundException
 	]
 	
-	[BannerBox]o-[&lt;abstract&gt;Widget]
-	[BannerBox]o-[BannerStyle]
-	[BannerBox]o-[EdgeInsets]
-	[BannerBox]o-[dynamic Function()?]
+	[APIException]&lt;:-[StudyInviteNotFoundException]
 	
-	[BannerStyle
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;BannerStyle&gt;;
-	  &lt;static&gt;+warning: BannerStyle;
-	  &lt;static&gt;+info: BannerStyle;
-	  &lt;static&gt;+error: BannerStyle
+	[UserNotFoundException
 	]
 	
-	[BannerStyle]o-[BannerStyle]
-	[Enum]&lt;:--[BannerStyle]
+	[APIException]&lt;:-[UserNotFoundException]
 	
-	[ActionPopUpMenuButton
+	[StudyUApiClient
 	  |
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +triggerIconColor: Color?;
-	  +triggerIconColorHover: Color?;
-	  +triggerIconSize: double;
-	  +disableSplashEffect: bool;
-	  +hideOnEmpty: bool;
-	  +orientation: Axis;
-	  +elevation: double?;
-	  +splashRadius: double?;
-	  +enabled: bool;
-	  +position: PopupMenuPosition
+	  +supabaseClient: SupabaseClient;
+	  &lt;static&gt;+studyColumns: List&lt;String&gt;;
+	  &lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;;
+	  +testDelayMilliseconds: int
 	  |
-	  +Widget build();
-	  -Widget _buildPopupMenu()
+	  +dynamic deleteParticipants();
+	  +dynamic getUserStudies();
+	  +dynamic fetchStudy();
+	  +dynamic deleteStudy();
+	  +dynamic saveStudy();
+	  +dynamic fetchStudyInvite();
+	  +dynamic saveStudyInvite();
+	  +dynamic deleteStudyInvite();
+	  +dynamic fetchAppConfig();
+	  +dynamic fetchUser();
+	  +dynamic saveUser();
+	  -dynamic _awaitGuarded();
+	  -dynamic _apiException();
+	  -dynamic _testDelay()
 	]
 	
-	[ActionPopUpMenuButton]o-[Color]
-	[ActionPopUpMenuButton]o-[Axis]
-	[ActionPopUpMenuButton]o-[PopupMenuPosition]
+	[StudyUApiClient]o-[SupabaseClient]
+	[&lt;abstract&gt;SupabaseClientDependant]&lt;:-[StudyUApiClient]
+	[&lt;abstract&gt;SupabaseQueryMixin]&lt;:-[StudyUApiClient]
+	[&lt;abstract&gt;StudyUApi]&lt;:--[StudyUApiClient]
 	
-	[DismissButton
-	  |
-	  +onPressed: void Function()?;
-	  +text: String?
+	[&lt;abstract&gt;IAppRepository
 	  |
-	  +Widget build()
+	  +dynamic fetchAppConfig();
+	  +void dispose()
 	]
 	
-	[DismissButton]o-[void Function()?]
-	
-	[FormScaffold
+	[AppRepository
 	  |
-	  +formViewModel: T;
-	  +actions: List&lt;Widget&gt;?;
-	  +body: Widget;
-	  +drawer: Widget?;
-	  +actionsSpacing: double;
-	  +actionsPadding: double
+	  +apiClient: StudyUApi
+	  |
+	  +dynamic fetchAppConfig();
+	  +void dispose()
 	]
 	
-	[FormScaffold]o-[&lt;abstract&gt;Widget]
+	[AppRepository]o-[&lt;abstract&gt;StudyUApi]
+	[&lt;abstract&gt;IAppRepository]&lt;:--[AppRepository]
 	
-	[AsyncValueWidget
+	[&lt;abstract&gt;IUserRepository
 	  |
-	  +value: AsyncValue&lt;T&gt;;
-	  +data: Widget Function(T);
-	  +error: Widget Function(Object, StackTrace?)?;
-	  +loading: Widget Function()?;
-	  +empty: Widget Function()?
+	  +user: StudyUUser
 	  |
-	  +Widget build();
-	  -Widget _buildDataOrEmptyWidget();
-	  -Widget _defaultError();
-	  -Widget _defaultLoad()
+	  +dynamic fetchUser();
+	  +dynamic saveUser();
+	  +dynamic updatePreferences()
 	]
 	
-	[AsyncValueWidget]o-[&lt;abstract&gt;AsyncValue]
-	[AsyncValueWidget]o-[Widget Function(T)]
-	[AsyncValueWidget]o-[Widget Function(Object, StackTrace?)?]
-	[AsyncValueWidget]o-[Widget Function()?]
-	
-	[&lt;abstract&gt;ResultTypes
-	]
+	[&lt;abstract&gt;IUserRepository]o-[StudyUUser]
 	
-	[MeasurementResultTypes
+	[UserRepository
 	  |
-	  &lt;static&gt;+questionnaire: String;
-	  &lt;static&gt;+values: List&lt;String&gt;
+	  +apiClient: StudyUApi;
+	  +authRepository: IAuthRepository;
+	  +ref: Ref&lt;Object?&gt;;
+	  +user: StudyUUser
+	  |
+	  +dynamic fetchUser();
+	  +dynamic saveUser();
+	  +dynamic updatePreferences()
 	]
 	
-	[&lt;abstract&gt;ResultTypes]&lt;:-[MeasurementResultTypes]
+	[UserRepository]o-[&lt;abstract&gt;StudyUApi]
+	[UserRepository]o-[&lt;abstract&gt;IAuthRepository]
+	[UserRepository]o-[&lt;abstract&gt;Ref]
+	[UserRepository]o-[StudyUUser]
+	[&lt;abstract&gt;IUserRepository]&lt;:--[UserRepository]
 	
-	[InterventionResultTypes
+	[PreferenceAction
 	  |
-	  &lt;static&gt;+checkmarkTask: String;
-	  &lt;static&gt;+values: List&lt;String&gt;
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;PreferenceAction&gt;;
+	  &lt;static&gt;+pin: PreferenceAction;
+	  &lt;static&gt;+pinOff: PreferenceAction
 	]
 	
-	[&lt;abstract&gt;ResultTypes]&lt;:-[InterventionResultTypes]
+	[PreferenceAction]o-[PreferenceAction]
+	[Enum]&lt;:--[PreferenceAction]
 	
-	[StudyExportData
+	[&lt;abstract&gt;IAuthRepository
 	  |
-	  +study: Study;
-	  +measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
-	  +interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
-	  +mediaData: List&lt;String&gt;;
-	  +isEmpty: bool
+	  +allowPasswordReset: bool;
+	  +currentUser: User?;
+	  +isLoggedIn: bool;
+	  +session: Session?;
+	  +serializedSession: String?
+	  |
+	  +dynamic signUp();
+	  +dynamic signInWith();
+	  +dynamic signOut();
+	  +dynamic resetPasswordForEmail();
+	  +dynamic updateUser();
+	  +void dispose()
 	]
 	
-	[StudyExportData]o-[Study]
+	[&lt;abstract&gt;IAuthRepository]o-[User]
+	[&lt;abstract&gt;IAuthRepository]o-[Session]
+	[&lt;abstract&gt;IAppDelegate]&lt;:-[&lt;abstract&gt;IAuthRepository]
 	
-	[StudyTemplates
+	[AuthRepository
 	  |
-	  &lt;static&gt;+kUnnamedStudyTitle: String
+	  +supabaseClient: SupabaseClient;
+	  +allowPasswordReset: bool;
+	  +authClient: GoTrueClient;
+	  +session: Session?;
+	  +serializedSession: String?;
+	  +currentUser: User?;
+	  +isLoggedIn: bool
 	  |
-	  &lt;static&gt;+Study emptyDraft()
+	  -void _registerAuthListener();
+	  +dynamic signUp();
+	  +dynamic signInWith();
+	  +dynamic signOut();
+	  +dynamic resetPasswordForEmail();
+	  +dynamic updateUser();
+	  +void dispose();
+	  +dynamic onAppStart()
 	]
 	
-	[StudyActionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyActionType&gt;;
-	  &lt;static&gt;+pin: StudyActionType;
-	  &lt;static&gt;+pinoff: StudyActionType;
-	  &lt;static&gt;+edit: StudyActionType;
-	  &lt;static&gt;+duplicate: StudyActionType;
-	  &lt;static&gt;+duplicateDraft: StudyActionType;
-	  &lt;static&gt;+addCollaborator: StudyActionType;
-	  &lt;static&gt;+export: StudyActionType;
-	  &lt;static&gt;+delete: StudyActionType
+	[AuthRepository]o-[SupabaseClient]
+	[AuthRepository]o-[GoTrueClient]
+	[AuthRepository]o-[Session]
+	[AuthRepository]o-[User]
+	[&lt;abstract&gt;IAuthRepository]&lt;:--[AuthRepository]
+	
+	[StudyLaunched
 	]
 	
-	[StudyActionType]o-[StudyActionType]
-	[Enum]&lt;:--[StudyActionType]
+	[&lt;abstract&gt;ModelEvent]&lt;:-[StudyLaunched]
 	
-	[DropdownMenuItemTheme
+	[&lt;abstract&gt;SupabaseClientDependant
 	  |
-	  +iconTheme: IconThemeData?
+	  +supabaseClient: SupabaseClient
 	]
 	
-	[DropdownMenuItemTheme]o-[IconThemeData]
-	[&lt;abstract&gt;Diagnosticable]&lt;:-[DropdownMenuItemTheme]
+	[&lt;abstract&gt;SupabaseClientDependant]o-[SupabaseClient]
 	
-	[ThemeConfig
-	  |
-	  &lt;static&gt;+kMinContentWidth: double;
-	  &lt;static&gt;+kMaxContentWidth: double;
-	  &lt;static&gt;+kHoverFadeFactor: double;
-	  &lt;static&gt;+kMuteFadeFactor: double
+	[SupabaseQueryError
 	  |
-	  &lt;static&gt;+dynamic bodyBackgroundColor();
-	  &lt;static&gt;+Color modalBarrierColor();
-	  &lt;static&gt;+Color containerColor();
-	  &lt;static&gt;+Color colorPickerInitialColor();
-	  &lt;static&gt;+TextStyle bodyTextMuted();
-	  &lt;static&gt;+TextStyle bodyTextBackground();
-	  &lt;static&gt;+double iconSplashRadius();
-	  &lt;static&gt;+Color sidesheetBackgroundColor();
-	  &lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme();
-	  &lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()
+	  +statusCode: String?;
+	  +message: String;
+	  +details: dynamic
 	]
 	
-	[NoAnimationPageTransitionsBuilder
+	[Exception]&lt;:--[SupabaseQueryError]
+	
+	[&lt;abstract&gt;SupabaseQueryMixin
 	  |
-	  +Widget buildTransitions()
+	  +dynamic deleteAll();
+	  +dynamic getAll();
+	  +dynamic getById();
+	  +dynamic getByColumn();
+	  +List&lt;T&gt; deserializeList();
+	  +T deserializeObject()
 	]
 	
-	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[NoAnimationPageTransitionsBuilder]
-	
-	[WebTransitionBuilder
+	[WrappedModel
 	  |
-	  +Widget buildTransitions()
+	  -_model: T;
+	  +asyncValue: AsyncValue&lt;T&gt;;
+	  +isLocalOnly: bool;
+	  +isDirty: bool;
+	  +isDeleted: bool;
+	  +lastSaved: DateTime?;
+	  +lastFetched: DateTime?;
+	  +lastUpdated: DateTime?;
+	  +model: T
+	  |
+	  +dynamic markWithError();
+	  +dynamic markAsLoading();
+	  +dynamic markAsFetched();
+	  +dynamic markAsSaved()
 	]
 	
-	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[WebTransitionBuilder]
+	[WrappedModel]o-[&lt;abstract&gt;AsyncValue]
 	
-	[ThemeSettingChange
-	  |
-	  +settings: ThemeSettings
+	[ModelRepositoryException
 	]
 	
-	[ThemeSettingChange]o-[ThemeSettings]
-	[&lt;abstract&gt;Notification]&lt;:-[ThemeSettingChange]
+	[Exception]&lt;:--[ModelRepositoryException]
 	
-	[ThemeProvider
-	  |
-	  +settings: ValueNotifier&lt;ThemeSettings&gt;;
-	  +lightDynamic: ColorScheme?;
-	  +darkDynamic: ColorScheme?;
-	  +pageTransitionsTheme: PageTransitionsTheme;
-	  +shapeMedium: ShapeBorder
-	  |
-	  +Color custom();
-	  +Color blend();
-	  +Color source();
-	  +ColorScheme colors();
-	  +CardTheme cardTheme();
-	  +ListTileThemeData listTileTheme();
-	  +AppBarTheme appBarTheme();
-	  +SnackBarThemeData snackBarThemeData();
-	  +TabBarTheme tabBarTheme();
-	  +BottomAppBarTheme bottomAppBarTheme();
-	  +BottomNavigationBarThemeData bottomNavigationBarTheme();
-	  +SwitchThemeData switchTheme();
-	  +InputDecorationTheme inputDecorationTheme();
-	  +TextTheme textTheme();
-	  +DividerThemeData dividerTheme();
-	  +NavigationRailThemeData navigationRailTheme();
-	  +DrawerThemeData drawerTheme();
-	  +IconThemeData iconTheme();
-	  +CheckboxThemeData checkboxTheme();
-	  +RadioThemeData radioTheme();
-	  +TooltipThemeData tooltipTheme();
-	  +ThemeData light();
-	  +ThemeData dark();
-	  +ThemeMode themeMode();
-	  +ThemeData theme();
-	  &lt;static&gt;+ThemeProvider of();
-	  +bool updateShouldNotify()
+	[ModelNotFoundException
 	]
 	
-	[ThemeProvider]o-[ValueNotifier]
-	[ThemeProvider]o-[ColorScheme]
-	[ThemeProvider]o-[PageTransitionsTheme]
-	[ThemeProvider]o-[&lt;abstract&gt;ShapeBorder]
-	[&lt;abstract&gt;InheritedWidget]&lt;:-[ThemeProvider]
+	[ModelRepositoryException]&lt;:--[ModelNotFoundException]
 	
-	[ThemeSettings
+	[&lt;abstract&gt;IModelRepository
 	  |
-	  +sourceColor: Color;
-	  +themeMode: ThemeMode
+	  +String getKey();
+	  +WrappedModel&lt;T&gt;? get();
+	  +dynamic fetchAll();
+	  +dynamic fetch();
+	  +dynamic save();
+	  +dynamic delete();
+	  +dynamic duplicateAndSave();
+	  +dynamic duplicateAndSaveFromRemote();
+	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
+	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
+	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
+	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
+	  +dynamic ensurePersisted();
+	  +void dispose()
 	]
 	
-	[ThemeSettings]o-[Color]
-	[ThemeSettings]o-[ThemeMode]
+	[&lt;abstract&gt;IModelActionProvider]&lt;:--[&lt;abstract&gt;IModelRepository]
 	
-	[CustomColor
-	  |
-	  +name: String;
-	  +color: Color;
-	  +blend: bool
+	[&lt;abstract&gt;IModelRepositoryDelegate
 	  |
-	  +Color value()
+	  +dynamic fetchAll();
+	  +dynamic fetch();
+	  +dynamic save();
+	  +dynamic delete();
+	  +T createNewInstance();
+	  +T createDuplicate();
+	  +dynamic onError()
 	]
 	
-	[CustomColor]o-[Color]
-	
-	[LanguagePicker
+	[&lt;abstract&gt;ModelRepository
 	  |
-	  +languagePickerType: LanguagePickerType;
-	  +iconColor: Color?;
-	  +offset: Offset?
+	  +delegate: IModelRepositoryDelegate&lt;T&gt;;
+	  -_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;;
+	  -_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;;
+	  +modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;;
+	  +modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;;
+	  -_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;
+	  |
+	  +WrappedModel&lt;T&gt;? get();
+	  +dynamic fetchAll();
+	  +dynamic fetch();
+	  +dynamic save();
+	  +dynamic delete();
+	  +dynamic duplicateAndSave();
+	  +dynamic duplicateAndSaveFromRemote();
+	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
+	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
+	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
+	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
+	  -dynamic _buildModelSpecificController();
+	  +dynamic ensurePersisted();
+	  +WrappedModel&lt;T&gt; upsertLocally();
+	  +List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally();
+	  +dynamic emitUpdate();
+	  +dynamic emitModelEvent();
+	  +dynamic emitError();
+	  +void dispose();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
 	]
 	
-	[LanguagePicker]o-[LanguagePickerType]
-	[LanguagePicker]o-[Color]
-	[LanguagePicker]o-[Offset]
+	[&lt;abstract&gt;ModelRepository]o-[&lt;abstract&gt;IModelRepositoryDelegate]
+	[&lt;abstract&gt;ModelRepository]o-[BehaviorSubject]
+	[&lt;abstract&gt;IModelRepository]&lt;:-[&lt;abstract&gt;ModelRepository]
 	
-	[LanguagePickerType
+	[&lt;abstract&gt;ModelEvent
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;LanguagePickerType&gt;;
-	  &lt;static&gt;+field: LanguagePickerType;
-	  &lt;static&gt;+icon: LanguagePickerType
+	  +modelId: String;
+	  +model: T
 	]
 	
-	[LanguagePickerType]o-[LanguagePickerType]
-	[Enum]&lt;:--[LanguagePickerType]
-	
-	[PlatformLocaleMobile
-	  |
-	  +Locale getPlatformLocale()
+	[IsFetched
 	]
 	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleMobile]
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsFetched]
 	
-	[&lt;abstract&gt;PlatformLocale
-	  |
-	  +Locale getPlatformLocale()
+	[IsSaving
 	]
 	
-	[PlatformLocaleWeb
-	  |
-	  +Locale getPlatformLocale()
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaving]
+	
+	[IsSaved
 	]
 	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleWeb]
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaved]
 	
-	[AppTranslation
-	  |
-	  &lt;static&gt;+dynamic init()
+	[IsDeleted
 	]
 	
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsDeleted]
+	
 	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
+	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="4748.0" width="84324.8" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="4748.0" width="84279.3" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
 				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M2163.5 1823.2 L1891.25 1936 L17708.25 2618.5914002066957 L17708.3 2618.6 " fill="none"></path>
+					<path d="M25639.0 158.2 L25380.5 293 L25380.5 591 L25380.5 591.0 " fill="none"></path>
+					<path d="M25641.4 162.9 L25639.0 158.2 L25636.5 153.4 L25650.8 152.0 Z"></path>
+					<path d="M25680.5 165.3 L25680.5 293 L25680.5 591 L25680.5 591.0 " fill="none"></path>
+					<path d="M25685.8 165.3 L25680.5 165.3 L25675.2 165.3 L25680.5 152.0 Z"></path>
+					<path d="M207.0 2704.7 L207 3314 L64938 3500.41216617898 L64938.0 3500.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2174.2 1824.5 L2163.5 1823.2 L2170.1 1814.7 L2180.8 1816.0 Z"></path>
+						<path d="M212.3 2695.3 L207.0 2704.7 L201.7 2695.3 L207.0 2686.0 Z"></path>
 					</g>
-					<path d="M2163.7 1832.5 L1931.25 1936 L1931.25 2609.5 L1931.3 2609.5 " fill="none"></path>
+					<path d="M442.9 3408.2 L456 3402 L463.5 3402 L463.5 3402 L471 3500.5 L471 3500.5 L463.5 3599 L463.5 3599 L456 3599 L456 3599 L426 3584.8612440191387 L426.0 3584.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2174.4 1833.5 L2163.7 1832.5 L2170.1 1823.8 L2180.8 1824.9 Z"></path>
+						<path d="M432.2 3407.3 L442.9 3408.2 L436.7 3417.0 L426.0 3416.1 Z"></path>
 					</g>
-					<path d="M2257.8 1929.9 L2252.25 1936 L2252.25 2609.5 L2252.3 2609.5 " fill="none"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3061.8 2635.5 L247 3314 L247 3402 L247.0 3402.0 " fill="none"></path>
+					</g>
+					<path d="M3063.0 2640.7 L3061.8 2635.5 L3060.5 2630.3 L3074.8 2632.4 Z"></path>
+					<path d="M3821.2 2726.9 L3721.5 3314 L3470.9490616621983 3469.5 L3470.9 3469.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2268.0 1926.5 L2257.8 1929.9 L2260.0 1919.4 L2270.2 1916.0 Z"></path>
+						<path d="M3828.0 2718.6 L3821.2 2726.9 L3817.5 2716.8 L3824.3 2708.5 Z"></path>
 					</g>
-					<path d="M2649.1 1930.7 L2653.25 1936 L2653.25 2609.5 L2653.3 2609.5 " fill="none"></path>
+					<path d="M3864.1 2726.6 L4012.25 3314 L3725.0348525469167 3454.5 L3725.0 3454.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2647.6 1920.1 L2649.1 1930.7 L2639.2 1926.6 L2637.6 1916.0 Z"></path>
+						<path d="M3867.0 2716.2 L3864.1 2726.6 L3856.7 2718.9 L3859.6 2708.5 Z"></path>
 					</g>
-					<path d="M2770.0 1823.2 L3042.25 1936 L3042.25 2609.5 L3042.3 2609.5 " fill="none"></path>
+					<path d="M1867.5 3550.2 L1867.5 3687 L1867.5 3797.5 L1867.5 3797.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2763.4 1814.7 L2770.0 1823.2 L2759.3 1824.5 L2752.8 1816.0 Z"></path>
+						<path d="M1872.8 3540.8 L1867.5 3550.2 L1862.2 3540.8 L1867.5 3531.5 Z"></path>
 					</g>
-					<path d="M17832.1 2749.8 L17720.75 3314 L17720.75 3485 L17720.8 3485.0 " fill="none"></path>
+					<path d="M60380.8 3931.2 L60380.75 4000 L62172 4128.787391012743 L62172.0 4128.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17839.2 2741.7 L17832.1 2749.8 L17828.7 2739.6 L17835.7 2731.5 Z"></path>
+						<path d="M60386.1 3921.8 L60380.8 3931.2 L60375.4 3921.8 L60380.8 3912.5 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M60380.8 3567.3 L60380.75 3687 L60380.75 3774.5 L60380.8 3774.5 " fill="none"></path>
 					</g>
-					<path d="M17933.5 2747.3 L18289 3314 L2916 3498.264565056718 L2916.0 3498.3 " fill="none"></path>
+					<path d="M60386.1 3567.3 L60380.8 3567.3 L60375.4 3567.3 L60380.8 3554.0 Z"></path>
+					<path d="M4202.1 2719.6 L4052.25 3314 L21428.75 3500.11975936136 L21428.8 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17933.0 2736.6 L17933.5 2747.3 L17924.0 2742.2 L17923.6 2731.5 Z"></path>
+						<path d="M4209.6 2711.9 L4202.1 2719.6 L4199.3 2709.2 L4206.7 2701.5 Z"></path>
 					</g>
-					<path d="M3763.4 1718.0 L3229.5 1936 L17708.25 2618.005076142132 L17708.3 2618.0 " fill="none"></path>
-					<path d="M3765.5 1723.0 L3763.4 1718.0 L3761.4 1713.1 L3775.8 1713.0 Z"></path>
-					<path d="M2934.1 3449.9 L2946 3447 L2953.5 3447 L2953.5 3447 L2961 3500.5 L2961 3500.5 L2953.5 3554 L2953.5 3554 L2946 3554 L2946 3554 L2916 3546.5866050808313 L2916.0 3546.6 " fill="none"></path>
+					<path d="M4207.6 2719.8 L4092.25 3314 L25696 3500.1252295326194 L25696.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2923.8 3447.0 L2934.1 3449.9 L2926.3 3457.4 L2916.0 3454.4 Z"></path>
+						<path d="M4214.6 2711.7 L4207.6 2719.8 L4204.1 2709.6 L4211.1 2701.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3637.3 2646.6 L2342.25 3314 L2618.412198391421 3447 L2618.4 3447.0 " fill="none"></path>
+					<path d="M4213.1 2720.0 L4132.25 3314 L1634 3489.1098844310814 L1634.0 3489.1 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M4219.6 2711.5 L4213.1 2720.0 L4209.0 2710.0 L4215.6 2701.5 Z"></path>
 					</g>
-					<path d="M3639.8 2651.3 L3637.3 2646.6 L3634.9 2641.9 L3649.2 2640.5 Z"></path>
-					<path d="M3095.5 193.7 L3095.5 293 L3095.5 614 L3095.5 614.0 " fill="none"></path>
+					<path d="M1867.5 3908.2 L1867.5 4000 L6731 4131.738225186982 L6731.0 4131.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3100.8 184.3 L3095.5 193.7 L3090.2 184.3 L3095.5 175.0 Z"></path>
+						<path d="M1872.8 3898.8 L1867.5 3908.2 L1862.2 3898.8 L1867.5 3889.5 Z"></path>
 					</g>
-					<path d="M4909.5 2712.7 L4909.5 3314 L59360 3500.3425770462322 L59360.0 3500.3 " fill="none"></path>
+					<path d="M4336.6 2709.6 L5127 3314 L3489 3493.0662368112544 L3489.0 3493.1 " fill="none"></path>
+					<path d="M4339.9 2705.4 L4336.6 2709.6 L4333.4 2713.8 L4326.0 2701.5 Z"></path>
+					<path d="M4361.7 2708.5 L5345.75 3314 L3733 3489.406254556058 L3733.0 3489.4 " fill="none"></path>
+					<path d="M4364.5 2703.9 L4361.7 2708.5 L4358.9 2713.0 L4350.3 2701.5 Z"></path>
+					<path d="M1651.8 3443.4 L1664 3439.5 L1671.5 3439.5 L1671.5 3439.5 L1679 3500.5 L1679 3500.5 L1671.5 3561.5 L1671.5 3561.5 L1664 3561.5 L1664 3561.5 L1634 3551.9935064935066 L1634.0 3552.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4914.8 2703.3 L4909.5 2712.7 L4904.2 2703.3 L4909.5 2694.0 Z"></path>
+						<path d="M1641.3 3441.1 L1651.8 3443.4 L1644.5 3451.3 L1634.0 3449.0 Z"></path>
 					</g>
-					<path d="M14922.1 1734.3 L14501.75 1936 L14501.75 2594 L14501.8 2594.0 " fill="none"></path>
-					<path d="M14924.4 1739.1 L14922.1 1734.3 L14919.8 1729.5 L14934.2 1728.5 Z"></path>
-					<path d="M14498.4 2669.3 L14449.25 3314 L11511.25 3491.9594024033777 L11511.3 3492.0 " fill="none"></path>
-					<path d="M14503.7 2669.7 L14498.4 2669.3 L14493.1 2668.9 L14499.4 2656.0 Z"></path>
-					<path d="M14959.2 1738.0 L14766.25 1936 L14766.25 2594 L14766.3 2594.0 " fill="none"></path>
-					<path d="M14963.0 1741.8 L14959.2 1738.0 L14955.4 1734.3 L14968.5 1728.5 Z"></path>
-					<path d="M14977.8 1740.5 L14882.5 1936 L17424.96806966618 2594 L17425.0 2594.0 " fill="none"></path>
-					<path d="M14982.6 1742.8 L14977.8 1740.5 L14973.0 1738.1 L14983.6 1728.5 Z"></path>
-					<path d="M17544.8 2669.3 L17544.75 3314 L16508.25 3479.36120615911 L16508.3 3479.4 " fill="none"></path>
-					<path d="M17550.1 2669.3 L17544.8 2669.3 L17539.4 2669.3 L17544.8 2656.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M14522.1 2668.1 L14826.75 3314 L16243.25 3484.546965784377 L16243.3 3484.5 " fill="none"></path>
+						<path d="M3062.1 2639.2 L1016 3314 L1322.5160857908847 3439.5 L1322.5 3439.5 " fill="none"></path>
 					</g>
-					<path d="M14526.9 2665.8 L14522.1 2668.1 L14517.2 2670.3 L14516.4 2656.0 Z"></path>
-					<path d="M14984.8 1741.2 L14922.5 1936 L16604.506531204643 2594 L16604.5 2594.0 " fill="none"></path>
-					<path d="M14989.9 1742.8 L14984.8 1741.2 L14979.7 1739.6 L14988.8 1728.5 Z"></path>
-					<path d="M16683.8 2669.3 L16683.75 3314 L16683.75 3469.5 L16683.8 3469.5 " fill="none"></path>
-					<path d="M16689.1 2669.3 L16683.8 2669.3 L16678.4 2669.3 L16683.8 2656.0 Z"></path>
-					<path d="M15006.2 1741.6 L15038.75 1936 L15038.75 2594 L15038.8 2594.0 " fill="none"></path>
-					<path d="M15011.4 1740.8 L15006.2 1741.6 L15000.9 1742.5 L15003.9 1728.5 Z"></path>
-					<path d="M4024.5 165.3 L4024.5 293 L4024.5 583 L4024.5 583.0 " fill="none"></path>
-					<path d="M4029.8 165.3 L4024.5 165.3 L4019.2 165.3 L4024.5 152.0 Z"></path>
-					<path d="M5975.6 3931.0 L5966.75 4000 L50246.75 4133.780959359676 L50246.8 4133.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5982.0 3922.4 L5975.6 3931.0 L5971.5 3921.1 L5977.9 3912.5 Z"></path>
+					<path d="M3063.8 2644.3 L3062.1 2639.2 L3060.4 2634.2 L3074.8 2635.1 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M26202.5 180.8 L26202.5 293 L26202.5 598.5 L26202.5 598.5 " fill="none"></path>
 					</g>
-					<path d="M6173.5 3919.5 L6371 4000 L5375.25 4124.67227283345 L5375.3 4124.7 " fill="none"></path>
+					<path d="M26207.8 180.8 L26202.5 180.8 L26197.2 180.8 L26202.5 167.5 Z"></path>
+					<path d="M5521.4 2704.2 L5385.75 3314 L21428.75 3500.0882234039245 L21428.8 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6166.8 3911.1 L6173.5 3919.5 L6162.8 3921.0 L6156.2 3912.5 Z"></path>
+						<path d="M5528.6 2696.3 L5521.4 2704.2 L5518.2 2694.0 L5525.4 2686.0 Z"></path>
 					</g>
-					<path d="M4428.5 165.3 L4428.5 293 L4428.5 583.5 L4428.5 583.5 " fill="none"></path>
-					<path d="M4433.8 165.3 L4428.5 165.3 L4423.2 165.3 L4428.5 152.0 Z"></path>
-					<path d="M4763.5 165.3 L4763.5 293 L4763.5 583.5 L4763.5 583.5 " fill="none"></path>
-					<path d="M4768.8 165.3 L4763.5 165.3 L4758.2 165.3 L4763.5 152.0 Z"></path>
-					<path d="M3776.5 1719.9 L3416.75 1936 L3416.75 2541 L3416.8 2541.0 " fill="none"></path>
-					<path d="M3779.3 1724.4 L3776.5 1719.9 L3773.8 1715.3 L3787.9 1713.0 Z"></path>
-					<path d="M6514.6 3963.8 L6481.75 4000 L5549.25 4125.017508754378 L5549.3 4125.0 " fill="none"></path>
+					<path d="M5550.0 2704.5 L5634.25 3314 L3935 3492.01439404578 L3935.0 3492.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6524.8 3960.5 L6514.6 3963.8 L6516.9 3953.3 L6527.1 3950.0 Z"></path>
+						<path d="M5554.0 2694.5 L5550.0 2704.5 L5543.4 2696.0 L5547.4 2686.0 Z"></path>
 					</g>
-					<path d="M6544.1 3965.6 L6521.75 4000 L22095 4133.285356156291 L22095.0 4133.3 " fill="none"></path>
+					<path d="M5903.4 2742.1 L5756.25 3314 L32617.5 3500.1223679444192 L32617.5 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6553.7 3960.7 L6544.1 3965.6 L6544.8 3954.9 L6554.3 3950.0 Z"></path>
+						<path d="M5910.9 2734.4 L5903.4 2742.1 L5900.5 2731.7 L5908.0 2724.0 Z"></path>
 					</g>
-					<path d="M6769.2 3961.8 L6816.25 4000 L29878.5 4133.582956006787 L29878.5 4133.6 " fill="none"></path>
+					<path d="M5910.1 2742.3 L5796.25 3314 L28098.25 3499.8084878266695 L28098.3 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6765.4 3951.7 L6769.2 3961.8 L6758.6 3960.0 L6754.7 3950.0 Z"></path>
+						<path d="M5917.2 2734.2 L5910.1 2742.3 L5906.7 2732.1 L5913.8 2724.0 Z"></path>
 					</g>
-					<path d="M6797.5 3960.4 L6856.25 4000 L5881.2779850746265 4118.5 L5881.3 4118.5 " fill="none"></path>
+					<path d="M5916.9 2742.5 L5836.25 3314 L4279.141420911528 3485 L4279.1 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6792.7 3950.8 L6797.5 3960.4 L6786.7 3959.6 L6782.0 3950.0 Z"></path>
+						<path d="M5923.5 2734.0 L5916.9 2742.5 L5912.9 2732.5 L5919.5 2724.0 Z"></path>
 					</g>
-					<path d="M51924.8 3529.3 L51924.75 3687 L51924.75 3805 L51924.8 3805.0 " fill="none"></path>
-					<path d="M51930.1 3529.3 L51924.8 3529.3 L51919.4 3529.3 L51924.8 3516.0 Z"></path>
-					<path d="M5097.7 193.7 L5033 293 L5033 598.5 L5033.0 598.5 " fill="none"></path>
-					<path d="M5102.2 196.6 L5097.7 193.7 L5093.3 190.8 L5105.0 182.5 Z"></path>
-					<path d="M5172.3 193.7 L5237 293 L5237 598.5 L5237.0 598.5 " fill="none"></path>
-					<path d="M5176.7 190.8 L5172.3 193.7 L5167.8 196.6 L5165.0 182.5 Z"></path>
-					<path d="M5665.5 160.8 L5516.5 293 L5516.5 575.5 L5516.5 575.5 " fill="none"></path>
-					<path d="M5669.1 164.8 L5665.5 160.8 L5662.0 156.9 L5675.5 152.0 Z"></path>
-					<path d="M5720.5 160.8 L5869.5 293 L5869.5 598.5 L5869.5 598.5 " fill="none"></path>
-					<path d="M5724.0 156.9 L5720.5 160.8 L5716.9 164.8 L5710.5 152.0 Z"></path>
-					<path d="M6257.5 724.7 L6257.5 966 L6257.5 1197 L6257.5 1197.0 " fill="none"></path>
+					<path d="M5964.6 2742.0 L6116.5 3314 L4507 3491.3540620384047 L4507.0 3491.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6262.8 715.3 L6257.5 724.7 L6252.2 715.3 L6257.5 706.0 Z"></path>
+						<path d="M5967.3 2731.7 L5964.6 2742.0 L5957.0 2734.4 L5959.8 2724.0 Z"></path>
 					</g>
-					<path d="M6257.5 165.3 L6257.5 293 L6257.5 553 L6257.5 553.0 " fill="none"></path>
-					<path d="M6262.8 165.3 L6257.5 165.3 L6252.2 165.3 L6257.5 152.0 Z"></path>
-					<path d="M7067.4 3911.3 L6987.25 4000 L6005.75 4130.025704399407 L6005.8 4130.0 " fill="none"></path>
+					<path d="M6421.6 2719.4 L6246 3314 L23930.25 3499.7751468041065 L23930.3 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7077.6 3908.0 L7067.4 3911.3 L7069.7 3900.8 L7079.9 3897.5 Z"></path>
+						<path d="M6429.4 2712.0 L6421.6 2719.4 L6419.1 2708.9 L6426.9 2701.5 Z"></path>
 					</g>
-					<path d="M56074.0 4214.2 L56074 4268 L60064 4450.319000367512 L60064.0 4450.3 " fill="none"></path>
+					<path d="M6427.0 2719.7 L6286 3314 L10158 3498.3809523809523 L10158.0 3498.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56079.3 4204.8 L56074.0 4214.2 L56068.7 4204.8 L56074.0 4195.5 Z"></path>
+						<path d="M6434.4 2711.8 L6427.0 2719.7 L6424.0 2709.3 L6431.3 2701.5 Z"></path>
 					</g>
-					<path d="M7128.8 3910.8 L7128.75 4000 L55806 4133.266282223505 L55806.0 4133.3 " fill="none"></path>
-					<path d="M7134.1 3910.8 L7128.8 3910.8 L7123.4 3910.8 L7128.8 3897.5 Z"></path>
-					<path d="M7240.4 3861.7 L8087.5 4000 L6254.25 4129.207363576595 L6254.3 4129.2 " fill="none"></path>
-					<path d="M7241.3 3856.5 L7240.4 3861.7 L7239.5 3867.0 L7227.3 3859.6 Z"></path>
-					<path d="M7990.5 2712.2 L7990.5 3314 L39589.25 3500.2436102047104 L39589.3 3500.2 " fill="none"></path>
+					<path d="M6455.0 2720.1 L6489.5 3314 L4869.813672922252 3485 L4869.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7995.8 2702.8 L7990.5 2712.2 L7985.2 2702.8 L7990.5 2693.5 Z"></path>
+						<path d="M6459.8 2710.5 L6455.0 2720.1 L6449.2 2711.1 L6453.9 2701.5 Z"></path>
 					</g>
-					<path d="M82314.0 152.3 L80401 293 L80401 629.5 L80401 629.5 L80401 966 L80401 966 L80401 1212.5 L80401 1212.5 L80401 1459 L80401 1459 L80401 1659 L80401.0 1659.0 " fill="none"></path>
-					<path d="M82314.3 157.6 L82314.0 152.3 L82313.6 147.0 L82327.3 151.3 Z"></path>
-					<path d="M351.2 3422.4 L364 3417 L371.5 3417 L371.5 3417 L379 3500.5 L379 3500.5 L371.5 3584 L371.5 3584 L364 3584 L364 3584 L334 3571.284263959391 L334.0 3571.3 " fill="none"></path>
+					<path d="M6950.0 2772.0 L6801.75 3314 L21539.75 3500.133744159274 L21539.8 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M340.5 3421.2 L351.2 3422.4 L344.7 3431.0 L334.0 3429.7 Z"></path>
+						<path d="M6957.6 2764.4 L6950.0 2772.0 L6947.4 2761.6 L6955.0 2754.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3638.3 2646.8 L2382.25 3314 L334 3486.4404130459316 L334.0 3486.4 " fill="none"></path>
-					</g>
-					<path d="M3640.8 2651.5 L3638.3 2646.8 L3635.8 2642.0 L3650.1 2640.5 Z"></path>
-					<path d="M60830.4 4165.3 L60287 4268 L60287 4454.5 L60287 4454.5 L60287 4641 L60287 4641 L60697 4674.344788087056 L60697.0 4674.3 " fill="none"></path>
+					<path d="M6958.5 2772.2 L6841.75 3314 L5712.25 3496.5405112651647 L5712.3 3496.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60840.6 4168.8 L60830.4 4165.3 L60838.6 4158.4 L60848.8 4161.9 Z"></path>
+						<path d="M6965.7 2764.2 L6958.5 2772.2 L6955.3 2762.0 L6962.4 2754.0 Z"></path>
 					</g>
-					<path d="M60831.4 4200.2 L60662.75 4268 L60662.75 4454.5 L60662.75 4454.5 L60662.75 4641 L60662.75 4641 L60790 4668.090704647676 L60790.0 4668.1 " fill="none"></path>
+					<path d="M7010.7 2772.5 L7086 3314 L5926.25 3487.485762983758 L5926.3 3487.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60842.1 4201.7 L60831.4 4200.2 L60838.1 4191.8 L60848.8 4193.3 Z"></path>
+						<path d="M7014.7 2762.5 L7010.7 2772.5 L7004.2 2764.0 L7008.2 2754.0 Z"></path>
 					</g>
-					<path d="M8206.0 3887.8 L8206 4000 L60848.75 4133.625593741269 L60848.8 4133.6 " fill="none"></path>
-					<path d="M8211.3 3887.8 L8206.0 3887.8 L8200.7 3887.8 L8206.0 3874.5 Z"></path>
-					<path d="M60925.7 4533.6 L60702.75 4641 L58470 4675.413383262781 L58470.0 4675.4 " fill="none"></path>
+					<path d="M7388.9 2697.0 L7319.5 3314 L6176.367292225201 3485 L6176.4 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60936.4 4534.4 L60925.7 4533.6 L60931.8 4524.8 L60942.5 4525.5 Z"></path>
+						<path d="M7395.2 2688.4 L7388.9 2697.0 L7384.6 2687.2 L7391.0 2678.5 Z"></path>
 					</g>
-					<path d="M60926.4 4550.6 L60772.5 4641 L60909 4665.660305343511 L60909.0 4665.7 " fill="none"></path>
+					<path d="M7412.2 2696.8 L7543.25 3314 L36070.5 3499.6604449291167 L36070.5 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60937.2 4550.5 L60926.4 4550.6 L60931.8 4541.3 L60942.5 4541.1 Z"></path>
+						<path d="M7415.5 2686.5 L7412.2 2696.8 L7405.1 2688.7 L7408.4 2678.5 Z"></path>
 					</g>
-					<path d="M60927.7 4578.7 L60846.25 4641 L60836.81338028169 4661 L60836.8 4661.0 " fill="none"></path>
+					<path d="M36199.5 3550.2 L36199.5 3687 L36199.5 3828 L36199.5 3828.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60938.3 4577.3 L60927.7 4578.7 L60931.8 4568.8 L60942.5 4567.4 Z"></path>
+						<path d="M36204.8 3540.8 L36199.5 3550.2 L36194.2 3540.8 L36199.5 3531.5 Z"></path>
 					</g>
-					<path d="M61107.4 4617.1 L61110 4641 L60750 4674.0659767141005 L60750.0 4674.1 " fill="none"></path>
+					<path d="M7729.5 2712.2 L7729.5 3314 L21428.75 3500.017956278782 L21428.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M61111.7 4607.2 L61107.4 4617.1 L61101.1 4608.3 L61105.4 4598.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M61083.7 4258.9 L61090 4268 L61090 4310.5 L61090.0 4310.5 " fill="none"></path>
+						<path d="M7734.8 2702.8 L7729.5 2712.2 L7724.2 2702.8 L7729.5 2693.5 Z"></path>
 					</g>
-					<path d="M61088.0 4255.9 L61083.7 4258.9 L61079.3 4262.0 L61076.0 4248.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M81795.3 1414.6 L81720 1459 L80795.5 1667.6028855250709 L80795.5 1667.6 " fill="none"></path>
-					</g>
-					<path d="M81798.0 1419.2 L81795.3 1414.6 L81792.6 1410.0 L81806.8 1407.8 Z"></path>
-					<path d="M81306.4 2746.4 L80875.5 3314 L80875.5 3500.5 L80875.5 3500.5 L80875.5 3687 L80875.5 3687 L80875.5 3843.5 L80875.5 3843.5 L80875.5 4000 L80875.5 4000 L80982.28264925373 4118.5 L80982.3 4118.5 " fill="none"></path>
+					<path d="M7999.1 2734.9 L7894.25 3314 L21428.75 3500.0121039056744 L21428.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81316.3 2742.2 L81306.4 2746.4 L81307.8 2735.7 L81317.7 2731.5 Z"></path>
+						<path d="M8006.0 2726.6 L7999.1 2734.9 L7995.5 2724.7 L8002.4 2716.5 Z"></path>
 					</g>
-					<path d="M81391.2 2750.1 L81358.5 3314 L81358.5 3500.5 L81358.5 3500.5 L81358.5 3687 L81358.5 3687 L81358.5 3843.5 L81358.5 3843.5 L81358.5 4000 L81358.5 4000 L68820.75 4132.671983890392 L68820.8 4132.7 " fill="none"></path>
+					<path d="M8043.7 2734.7 L8174 3314 L12912 3497.861215147732 L12912.0 3497.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81397.1 2741.1 L81391.2 2750.1 L81386.5 2740.5 L81392.3 2731.5 Z"></path>
+						<path d="M8046.8 2724.4 L8043.7 2734.7 L8036.4 2726.8 L8039.6 2716.5 Z"></path>
 					</g>
-					<path d="M81398.5 2750.2 L81398.5 3314 L81398.5 3500.5 L81398.5 3500.5 L81398.5 3687 L81398.5 3687 L81398.5 3843.5 L81398.5 3843.5 L81398.5 4000 L81398.5 4000 L61143.75 4133.031234300139 L61143.8 4133.0 " fill="none"></path>
+					<path d="M8339.4 2756.7 L8214 3314 L25696 3500.0370888134435 L25696.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81403.8 2740.8 L81398.5 2750.2 L81393.2 2740.8 L81398.5 2731.5 Z"></path>
+						<path d="M8346.6 2748.8 L8339.4 2756.7 L8336.2 2746.4 L8343.5 2738.5 Z"></path>
 					</g>
-					<path d="M81416.8 2750.0 L81499.25 3314 L69940.25 3498.4968548076513 L69940.3 3498.5 " fill="none"></path>
+					<path d="M8350.6 2757.0 L8273 3314 L8273 3500.5 L8273 3500.5 L8273 3687 L8273 3687 L8273 3843.5 L8273 3843.5 L8273 4000 L8273 4000 L18277.25 4133.042500930405 L18277.3 4133.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81420.7 2740.0 L81416.8 2750.0 L81410.1 2741.5 L81414.1 2731.5 Z"></path>
+						<path d="M8357.2 2748.5 L8350.6 2757.0 L8346.6 2747.0 L8353.2 2738.5 Z"></path>
 					</g>
-					<path d="M81424.0 2749.8 L81539.25 3314 L64748 3500.1618514720526 L64748.0 3500.2 " fill="none"></path>
+					<path d="M8358.3 2757.1 L8313 3314 L11377.75 3495.2656386268136 L11377.8 3495.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81427.3 2739.6 L81424.0 2749.8 L81416.9 2741.7 L81420.3 2731.5 Z"></path>
-					</g>
-					<path d="M81795.6 1435.8 L81760 1459 L81760 1697.5 L81760 1697.5 L81760 1936 L81760 1936 L81454.37772133527 2518.5 L81454.4 2518.5 " fill="none"></path>
-					<path d="M81798.5 1440.2 L81795.6 1435.8 L81792.7 1431.3 L81806.8 1428.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M80663.0 1741.8 L80663 1936 L81284.81240928882 2518.5 L81284.8 2518.5 " fill="none"></path>
+						<path d="M8364.3 2748.2 L8358.3 2757.1 L8353.7 2747.4 L8359.8 2738.5 Z"></path>
 					</g>
-					<path d="M80668.3 1741.8 L80663.0 1741.8 L80657.7 1741.8 L80663.0 1728.5 Z"></path>
-					<path d="M81873.8 2750.0 L81796.25 3314 L64748 3500.1669399107077 L64748.0 3500.2 " fill="none"></path>
+					<path d="M8365.9 2757.2 L8353 3314 L13098.75 3498.4594122857293 L13098.8 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81880.4 2741.5 L81873.8 2750.0 L81869.8 2740.0 L81876.4 2731.5 Z"></path>
+						<path d="M8371.5 2748.0 L8365.9 2757.2 L8360.8 2747.7 L8366.4 2738.5 Z"></path>
 					</g>
-					<path d="M81891.0 2750.2 L81891 3314 L81891 3500.5 L81891 3500.5 L81891 3687 L81891 3687 L81891 3843.5 L81891 3843.5 L81891 4000 L81891 4000 L68820.75 4132.7255745221 L68820.8 4132.7 " fill="none"></path>
+					<path d="M8388.0 2757.0 L8468 3314 L8468 3485 L8468.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81896.3 2740.8 L81891.0 2750.2 L81885.7 2740.8 L81891.0 2731.5 Z"></path>
+						<path d="M8391.9 2747.0 L8388.0 2757.0 L8381.4 2748.5 L8385.3 2738.5 Z"></path>
 					</g>
-					<path d="M81908.2 2750.0 L81985.75 3314 L69940.25 3498.5769246569716 L69940.3 3498.6 " fill="none"></path>
+					<path d="M8751.4 2719.5 L8666 3314 L8666 3485 L8666.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81912.2 2740.0 L81908.2 2750.0 L81901.6 2741.5 L81905.6 2731.5 Z"></path>
+						<path d="M8758.0 2711.0 L8751.4 2719.5 L8747.5 2709.5 L8754.1 2701.0 Z"></path>
 					</g>
-					<path d="M81950.6 1785.9 L81891 1936 L81891 2518.5 L81891.0 2518.5 " fill="none"></path>
-					<path d="M81955.6 1787.9 L81950.6 1785.9 L81945.7 1783.9 L81955.6 1773.5 Z"></path>
-					<path d="M6839.1 181.7 L6649.5 293 L6649.5 614 L6649.5 614.0 " fill="none"></path>
-					<path d="M6841.8 186.3 L6839.1 181.7 L6836.4 177.1 L6850.6 175.0 Z"></path>
-					<path d="M10933.5 2772.7 L10933.5 3314 L47948 3500.225801882975 L47948.0 3500.2 " fill="none"></path>
+					<path d="M8823.5 2716.7 L9204.5 3314 L10158 3492.184118236473 L10158.0 3492.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10938.8 2763.3 L10933.5 2772.7 L10928.2 2763.3 L10933.5 2754.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M34049.7 136.9 L7382 293 L7382 614 L7382.0 614.0 " fill="none"></path>
-					</g>
-					<path d="M34049.7 142.2 L34049.7 136.9 L34049.6 131.5 L34063.0 136.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M7382.0 658.3 L7382 966 L7382 1197 L7382.0 1197.0 " fill="none"></path>
+						<path d="M8823.0 2706.0 L8823.5 2716.7 L8814.0 2711.7 L8813.5 2701.0 Z"></path>
 					</g>
-					<path d="M7387.3 658.3 L7382.0 658.3 L7376.7 658.3 L7382.0 645.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M82438.9 172.5 L82137.75 293 L82137.75 501 L82137.8 501.0 " fill="none"></path>
-					</g>
-					<path d="M82440.9 177.4 L82438.9 172.5 L82436.9 167.5 L82451.3 167.5 Z"></path>
-					<path d="M81988.3 1454.9 L81985.75 1459 L81985.75 1621.5 L81985.8 1621.5 " fill="none"></path>
+					<path d="M8828.6 2716.3 L9244.5 3314 L21428.75 3499.958192679883 L21428.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81997.7 1449.7 L81988.3 1454.9 L81988.6 1444.1 L81998.1 1439.0 Z"></path>
+						<path d="M8827.6 2705.6 L8828.6 2716.3 L8818.8 2711.7 L8817.9 2701.0 Z"></path>
 					</g>
-					<path d="M82310.3 1454.2 L82313.75 1459 L82313.75 1697.5 L82313.75 1697.5 L82313.75 1936 L82313.75 1936 L82313.75 2625 L82313.75 2625 L82313.75 3314 L82313.75 3314 L82313.75 3500.5 L82313.75 3500.5 L82313.75 3687 L82313.75 3687 L82313.75 3843.5 L82313.75 3843.5 L82313.75 4000 L82313.75 4000 L50391.75 4133.696354060854 L50391.8 4133.7 " fill="none"></path>
+					<path d="M8833.5 2715.9 L9284.5 3314 L23930.25 3499.625469341987 L23930.3 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82309.2 1443.5 L82310.3 1454.2 L82300.6 1449.7 L82299.5 1439.0 Z"></path>
+						<path d="M8832.2 2705.2 L8833.5 2715.9 L8823.7 2711.7 L8822.3 2701.0 Z"></path>
 					</g>
-					<path d="M82137.8 771.3 L82137.75 966 L82137.75 986 L82137.8 986.0 " fill="none"></path>
-					<path d="M82143.1 771.3 L82137.8 771.3 L82132.4 771.3 L82137.8 758.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M34049.7 136.9 L8988.5 293 L8988.5 614 L8988.5 614.0 " fill="none"></path>
-					</g>
-					<path d="M34049.7 142.2 L34049.7 136.9 L34049.6 131.5 L34063.0 136.8 Z"></path>
-					<path d="M8915.1 647.8 L7639.5 966 L7639.5 1197 L7639.5 1197.0 " fill="none"></path>
-					<path d="M8916.4 653.0 L8915.1 647.8 L8913.8 642.6 L8928.0 644.6 Z"></path>
-					<path d="M8926.9 649.0 L7927 966 L7927 1197 L7927.0 1197.0 " fill="none"></path>
-					<path d="M8928.5 654.1 L8926.9 649.0 L8925.3 643.9 L8939.6 645.0 Z"></path>
-					<path d="M8941.3 650.4 L8227.5 966 L8227.5 1197 L8227.5 1197.0 " fill="none"></path>
-					<path d="M8943.4 655.3 L8941.3 650.4 L8939.1 645.5 L8953.4 645.0 Z"></path>
-					<path d="M8956.3 652.8 L8524 966 L8524 1197 L8524.0 1197.0 " fill="none"></path>
-					<path d="M8959.4 657.1 L8956.3 652.8 L8953.2 648.5 L8967.1 645.0 Z"></path>
-					<path d="M8975.7 657.1 L8832 966 L8832 1197 L8832.0 1197.0 " fill="none"></path>
-					<path d="M8980.5 659.3 L8975.7 657.1 L8970.8 654.8 L8981.3 645.0 Z"></path>
-					<path d="M9002.2 656.9 L9156 966 L9156 1197 L9156.0 1197.0 " fill="none"></path>
-					<path d="M9006.9 654.6 L9002.2 656.9 L8997.4 659.3 L8996.2 645.0 Z"></path>
-					<path d="M9021.0 652.8 L9459.5 966 L9459.5 1197 L9459.5 1197.0 " fill="none"></path>
-					<path d="M9024.1 648.4 L9021.0 652.8 L9017.9 657.1 L9010.2 645.0 Z"></path>
-					<path d="M9035.9 650.4 L9753 966 L9753 1197 L9753.0 1197.0 " fill="none"></path>
-					<path d="M9038.1 645.5 L9035.9 650.4 L9033.8 655.3 L9023.7 645.0 Z"></path>
-					<path d="M9050.8 649.0 L10064 966 L10064 1197 L10064.0 1197.0 " fill="none"></path>
-					<path d="M9052.4 643.9 L9050.8 649.0 L9049.2 654.1 L9038.0 645.0 Z"></path>
-					<path d="M9061.9 647.8 L10337.5 966 L10337.5 1197 L10337.5 1197.0 " fill="none"></path>
-					<path d="M9063.2 642.6 L9061.9 647.8 L9060.6 653.0 L9049.0 644.6 Z"></path>
-					<path d="M58399.5 4639.7 L58399.5 4641 L58399.5 4661 L58399.5 4661.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M58404.8 4630.3 L58399.5 4639.7 L58394.2 4630.3 L58399.5 4621.0 Z"></path>
-					</g>
-					<path d="M58036.4 4172.3 L57890 4268 L58160 4366.8321884200195 L58160.0 4366.8 " fill="none"></path>
-					<path d="M58039.3 4176.8 L58036.4 4172.3 L58033.5 4167.8 L58047.6 4165.0 Z"></path>
-					<path d="M58399.5 4215.8 L58399.5 4268 L58399.5 4288 L58399.5 4288.0 " fill="none"></path>
-					<path d="M58404.8 4215.8 L58399.5 4215.8 L58394.2 4215.8 L58399.5 4202.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M68695.3 4253.3 L68695.25 4268 L58639 4450.16163222689 L58639.0 4450.2 " fill="none"></path>
+					<path d="M8840.8 2715.3 L9343.5 3314 L6811 3487.8035878564856 L6811.0 3487.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M8838.9 2704.7 L8840.8 2715.3 L8830.7 2711.6 L8828.8 2701.0 Z"></path>
 					</g>
-					<path d="M68700.6 4253.3 L68695.3 4253.3 L68689.9 4253.3 L68695.3 4240.0 Z"></path>
-					<path d="M6881.6 185.9 L6806.5 293 L6806.5 614 L6806.5 614.0 " fill="none"></path>
-					<path d="M6886.0 189.0 L6881.6 185.9 L6877.2 182.9 L6889.3 175.0 Z"></path>
-					<path d="M6922.6 188.2 L6935.5 293 L6935.5 614 L6935.5 614.0 " fill="none"></path>
-					<path d="M6927.9 187.6 L6922.6 188.2 L6917.3 188.9 L6921.0 175.0 Z"></path>
-					<path d="M6959.9 184.9 L7057.5 293 L7057.5 614 L7057.5 614.0 " fill="none"></path>
-					<path d="M6963.9 181.3 L6959.9 184.9 L6956.0 188.5 L6951.0 175.0 Z"></path>
-					<path d="M6993.4 181.7 L7183 293 L7183 614 L7183.0 614.0 " fill="none"></path>
-					<path d="M6996.1 177.1 L6993.4 181.7 L6990.7 186.3 L6981.9 175.0 Z"></path>
-					<path d="M58102.4 4183.5 L58115 4268 L58115 4454.5 L58115 4454.5 L58115 4641 L58115 4641 L58329 4667.702987697715 L58329.0 4667.7 " fill="none"></path>
+					<path d="M9547.0 2719.5 L9383.5 3314 L21428.75 3499.9519586946176 L21428.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58106.3 4173.4 L58102.4 4183.5 L58095.7 4175.0 L58099.6 4165.0 Z"></path>
+						<path d="M9554.6 2711.9 L9547.0 2719.5 L9544.3 2709.1 L9552.0 2701.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M34049.7 136.9 L10135.25 293 L10135.25 583.5 L10135.3 583.5 " fill="none"></path>
+					<path d="M9567.5 2720.1 L9533.25 3314 L6811 3488.6322555679767 L6811.0 3488.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M9573.4 2711.1 L9567.5 2720.1 L9562.7 2710.5 L9568.6 2701.5 Z"></path>
 					</g>
-					<path d="M34049.7 142.2 L34049.7 136.9 L34049.6 131.6 L34063.0 136.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M82345.0 1449.0 L82353.75 1459 L82353.75 1697.5 L82353.75 1697.5 L82353.75 1936 L82353.75 1936 L82353.75 2625 L82353.75 2625 L82353.75 3314 L82353.75 3314 L69940.25 3498.6333639046175 L69940.3 3498.6 " fill="none"></path>
+					<path d="M9593.6 2719.7 L9722.75 3314 L10162.628016085791 3485 L10162.6 3485.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M9596.8 2709.5 L9593.6 2719.7 L9586.4 2711.8 L9589.6 2701.5 Z"></path>
 					</g>
-					<path d="M82349.0 1445.5 L82345.0 1449.0 L82341.0 1452.5 L82336.2 1439.0 Z"></path>
-					<path d="M81035.0 3949.8 L80996.25 4000 L68820.75 4132.632875375985 L68820.8 4132.6 " fill="none"></path>
+					<path d="M9912.5 2720.2 L9912.5 3314 L10178.398123324398 3485 L10178.4 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81044.9 3945.6 L81035.0 3949.8 L81036.5 3939.1 L81046.4 3935.0 Z"></path>
+						<path d="M9917.8 2710.8 L9912.5 2720.2 L9907.2 2710.8 L9912.5 2701.5 Z"></path>
 					</g>
-					<path d="M81061.2 3951.6 L81036.25 4000 L61143.75 4133.013722554891 L61143.8 4133.0 " fill="none"></path>
+					<path d="M10361.5 2712.7 L10344 3314 L10214.260053619302 3485 L10214.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81070.2 3945.7 L81061.2 3951.6 L81060.8 3940.8 L81069.8 3935.0 Z"></path>
+						<path d="M10367.1 2703.5 L10361.5 2712.7 L10356.4 2703.2 L10362.0 2694.0 Z"></path>
 					</g>
-					<path d="M81172.8 3951.6 L81197.75 4000 L81019.5578358209 4118.5 L81019.6 4118.5 " fill="none"></path>
+					<path d="M10380.8 2712.3 L10496.25 3314 L6811 3491.585201214392 L6811.0 3491.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81173.2 3940.8 L81172.8 3951.6 L81163.8 3945.7 L81164.2 3935.0 Z"></path>
+						<path d="M10384.2 2702.2 L10380.8 2712.3 L10373.8 2704.2 L10377.2 2694.0 Z"></path>
 					</g>
-					<path d="M81199.0 3949.8 L81237.75 4000 L30022.5 4133.811883070353 L30022.5 4133.8 " fill="none"></path>
+					<path d="M6829.6 3490.1 L7672.1666666666715 3447 L7887.4583333333285 3447 L7887.4583333333285 3447 L8102.75 3500.5 L8102.75 3500.5 L7887.4583333333285 3554 L7887.4583333333285 3554 L7672.1666666666715 3554 L7672.1666666666715 3554 L6811 3509.9607296479207 L6811.0 3510.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81197.5 3939.1 L81199.0 3949.8 L81189.1 3945.6 L81187.6 3935.0 Z"></path>
+						<path d="M6820.0 3485.2 L6829.6 3490.1 L6820.6 3495.9 L6811.0 3491.0 Z"></path>
 					</g>
-					<path d="M82382.6 1448.2 L82393.75 1459 L82393.75 1697.5 L82393.75 1697.5 L82393.75 1936 L82393.75 1936 L82393.75 2625 L82393.75 2625 L82393.75 3314 L82393.75 3314 L82393.75 3500.5 L82393.75 3500.5 L82393.75 3687 L82393.75 3687 L81318.5 3818.8007636577245 L81318.5 3818.8 " fill="none"></path>
-					<path d="M82386.3 1444.4 L82382.6 1448.2 L82378.9 1452.1 L82373.0 1439.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M69814.8 3552.3 L69814.75 3687 L80915.5 3840.709869716207 L80915.5 3840.7 " fill="none"></path>
+						<path d="M3062.1 2639.5 L1056 3314 L6441 3494.30565529623 L6441.0 3494.3 " fill="none"></path>
 					</g>
-					<path d="M69820.1 3552.3 L69814.8 3552.3 L69809.4 3552.3 L69814.8 3539.0 Z"></path>
-					<path d="M82025.2 3959.3 L82005.75 4000 L68820.75 4132.736561361331 L68820.8 4132.7 " fill="none"></path>
+					<path d="M3063.8 2644.6 L3062.1 2639.5 L3060.4 2634.4 L3074.8 2635.3 Z"></path>
+					<path d="M15730.5 3916.2 L15730.5 4000 L18277.25 4130.315799522673 L18277.3 4130.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82034.0 3953.2 L82025.2 3959.3 L82024.4 3948.6 L82033.2 3942.5 Z"></path>
+						<path d="M15735.8 3906.8 L15730.5 3916.2 L15725.2 3906.8 L15730.5 3897.5 Z"></path>
 					</g>
-					<path d="M82132.8 3959.5 L82151 4000 L61143.75 4133.065694465782 L61143.8 4133.1 " fill="none"></path>
+					<path d="M10640.2 2772.3 L10536.25 3314 L25696 3499.966380543634 L25696.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82133.8 3948.8 L82132.8 3959.5 L82124.1 3953.2 L82125.1 3942.5 Z"></path>
+						<path d="M10647.2 2764.2 L10640.2 2772.3 L10636.7 2762.2 L10643.7 2754.0 Z"></path>
 					</g>
-					<path d="M82020.9 1785.9 L82080.5 1936 L82080.5 2625 L82080.5 2625 L82080.5 3314 L82080.5 3314 L82080.5 3500.5 L82080.5 3500.5 L82080.5 3687 L82080.5 3687 L82080.5 3744.5 L82080.5 3744.5 " fill="none"></path>
-					<path d="M82025.8 1783.9 L82020.9 1785.9 L82015.9 1787.9 L82015.9 1773.5 Z"></path>
-					<path d="M67577.3 3578.8 L67524.75 3687 L67524.75 3843.5 L67524.75 3843.5 L67524.75 4000 L67524.75 4000 L68335 4125.4822305692 L68335.0 4125.5 " fill="none"></path>
+					<path d="M10658.9 2772.6 L10623.75 3314 L21539.75 3500.0058474189127 L21539.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67586.1 3572.7 L67577.3 3578.8 L67576.5 3568.1 L67585.4 3562.0 Z"></path>
+						<path d="M10664.8 2763.7 L10658.9 2772.6 L10654.2 2763.0 L10660.1 2754.0 Z"></path>
 					</g>
-					<path d="M67913.3 3943.7 L67880.75 4000 L68569.75 4113.352977286679 L68569.8 4113.4 " fill="none"></path>
+					<path d="M10667.5 2772.7 L10663.75 3314 L24426 3498.568782022472 L24426.0 3498.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67922.6 3938.2 L67913.3 3943.7 L67913.4 3932.9 L67922.7 3927.5 Z"></path>
+						<path d="M10672.9 2763.4 L10667.5 2772.7 L10662.2 2763.3 L10667.6 2754.0 Z"></path>
 					</g>
-					<path d="M67938.4 3945.3 L67920.75 4000 L61143.75 4131.145642284641 L61143.8 4131.1 " fill="none"></path>
+					<path d="M10676.1 2772.6 L10703.75 3314 L13098.75 3496.49948927477 L13098.8 3496.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67946.4 3938.0 L67938.4 3945.3 L67936.2 3934.7 L67944.1 3927.5 Z"></path>
+						<path d="M10680.9 2763.0 L10676.1 2772.6 L10670.3 2763.6 L10675.1 2754.0 Z"></path>
 					</g>
-					<path d="M68004.1 3945.3 L68021.75 4000 L68486.75 4128.078108941419 L68486.8 4128.1 " fill="none"></path>
+					<path d="M10695.8 2772.4 L10796 3314 L10247 3486.5164279696714 L10247.0 3486.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68006.3 3934.7 L68004.1 3945.3 L67996.1 3938.0 L67998.4 3927.5 Z"></path>
+						<path d="M10699.3 2762.2 L10695.8 2772.4 L10688.8 2764.1 L10692.4 2754.0 Z"></path>
 					</g>
-					<path d="M68029.2 3943.7 L68061.75 4000 L68352.03078358209 4118.5 L68352.0 4118.5 " fill="none"></path>
+					<path d="M24731.4 3437.0 L24744 3432 L24751.5 3432 L24751.5 3432 L24759 3500.5 L24759 3500.5 L24751.5 3569 L24751.5 3569 L24744 3569 L24744 3569 L24714 3557.189655172414 L24714.0 3557.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68029.1 3932.9 L68029.2 3943.7 L68019.9 3938.2 L68019.8 3927.5 Z"></path>
+						<path d="M24720.7 3435.4 L24731.4 3437.0 L24724.6 3445.4 L24714.0 3443.8 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M67744.5 3568.2 L67971.25 3687 L67971.25 3759.5 L67971.3 3759.5 " fill="none"></path>
+						<path d="M3062.1 2639.8 L1096 3314 L24426 3499.355925705035 L24426.0 3499.4 " fill="none"></path>
 					</g>
-					<path d="M67746.9 3563.5 L67744.5 3568.2 L67742.0 3572.9 L67732.6 3562.0 Z"></path>
-					<path d="M776.0 3450.3 L788 3447 L795.5 3447 L795.5 3447 L803 3500.5 L803 3500.5 L795.5 3554 L795.5 3554 L788 3554 L788 3554 L758 3545.8527918781724 L758.0 3545.9 " fill="none"></path>
+					<path d="M3063.9 2644.8 L3062.1 2639.8 L3060.4 2634.7 L3074.8 2635.5 Z"></path>
+					<path d="M10934.8 2779.9 L10836 3314 L21428.75 3499.877061134241 L21428.8 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M765.6 3447.6 L776.0 3450.3 L768.4 3457.8 L758.0 3455.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3644.1 2647.7 L2614.25 3314 L758 3485.1062028913875 L758.0 3485.1 " fill="none"></path>
+						<path d="M10941.8 2771.6 L10934.8 2779.9 L10931.3 2769.7 L10938.2 2761.5 Z"></path>
 					</g>
-					<path d="M3647.0 2652.2 L3644.1 2647.7 L3641.2 2643.3 L3655.3 2640.5 Z"></path>
-					<path d="M11074.3 3916.2 L11074.25 4000 L68569.75 4133.708144600059 L68569.8 4133.7 " fill="none"></path>
+					<path d="M10960.4 2780.2 L10949.75 3314 L21539.75 3499.990677088238 L21539.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11079.6 3906.8 L11074.3 3916.2 L11068.9 3906.8 L11074.3 3897.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M11074.3 3552.3 L11074.25 3687 L11074.25 3789.5 L11074.3 3789.5 " fill="none"></path>
+						<path d="M10965.9 2770.9 L10960.4 2780.2 L10955.3 2770.7 L10960.8 2761.5 Z"></path>
 					</g>
-					<path d="M11079.6 3552.3 L11074.3 3552.3 L11068.9 3552.3 L11074.3 3539.0 Z"></path>
-					<path d="M11236.3 2749.8 L11118 3314 L51895.75 3500.3674606529557 L51895.8 3500.4 " fill="none"></path>
+					<path d="M10989.1 2779.9 L11077.25 3314 L13098.75 3495.779050144648 L13098.8 3495.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11243.5 2741.7 L11236.3 2749.8 L11233.0 2739.5 L11240.2 2731.5 Z"></path>
+						<path d="M10992.8 2769.8 L10989.1 2779.9 L10982.3 2771.6 L10986.0 2761.5 Z"></path>
 					</g>
-					<path d="M11291.5 2749.7 L11422.5 3314 L39892.25 3500.2677357679727 L39892.3 3500.3 " fill="none"></path>
+					<path d="M11231.0 2704.7 L11231 3314 L32617.5 3500.025943286227 L32617.5 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11294.5 2739.4 L11291.5 2749.7 L11284.1 2741.8 L11287.2 2731.5 Z"></path>
+						<path d="M11236.3 2695.3 L11231.0 2704.7 L11225.7 2695.3 L11231.0 2686.0 Z"></path>
 					</g>
-					<path d="M10177.2 2721.5 L8307.75 3314 L40720.75 3499.3704941659894 L40720.8 3499.4 " fill="none"></path>
+					<path d="M11503.9 2734.4 L11397.5 3314 L21428.75 3499.8423150470608 L21428.8 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10187.7 2723.7 L10177.2 2721.5 L10184.5 2713.5 L10195.0 2715.8 Z"></path>
+						<path d="M11510.9 2726.1 L11503.9 2734.4 L11500.4 2724.2 L11507.3 2716.0 Z"></path>
 					</g>
-					<path d="M10520.9 2756.9 L10687.5 3314 L59150 3500.1734641330654 L59150.0 3500.2 " fill="none"></path>
+					<path d="M11520.8 2734.7 L11503.75 3314 L5233 3496.2281757625337 L5233.0 3496.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10523.4 2746.4 L10520.9 2756.9 L10513.1 2749.5 L10515.6 2739.0 Z"></path>
-					</g>
-					<path d="M58144.2 631.5 L10481.5 966 L10481.5 1212.5 L10481.5 1212.5 L10481.5 1459 L10481.5 1459 L10481.5 1697.5 L10481.5 1697.5 L10481.5 1936 L10481.5 1936 L10481.5 2511 L10481.5 2511.0 " fill="none"></path>
-					<path d="M58144.2 636.8 L58144.2 631.5 L58144.1 626.2 L58157.5 631.4 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M11950.3 2676.5 L11812 3314 L6554.25 3496.2875633220247 L6554.3 3496.3 " fill="none"></path>
-					</g>
-					<path d="M11955.5 2677.7 L11950.3 2676.5 L11945.1 2675.4 L11953.1 2663.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M12264.5 2706.8 L12264.5 3314 L6554.25 3496.6144167702664 L6554.3 3496.6 " fill="none"></path>
+						<path d="M11526.4 2725.5 L11520.8 2734.7 L11515.7 2725.2 L11521.3 2716.0 Z"></path>
 					</g>
-					<path d="M12269.8 2706.8 L12264.5 2706.8 L12259.2 2706.8 L12264.5 2693.5 Z"></path>
-					<path d="M12543.4 1346.8 L12432.75 1459 L12432.75 1644 L12432.8 1644.0 " fill="none"></path>
+					<path d="M11527.1 2734.7 L11543.75 3314 L13098.75 3494.4090202177294 L13098.8 3494.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12553.7 1343.9 L12543.4 1346.8 L12546.1 1336.4 L12556.5 1333.5 Z"></path>
+						<path d="M11532.2 2725.2 L11527.1 2734.7 L11521.5 2725.5 L11526.6 2716.0 Z"></path>
 					</g>
-					<path d="M12861.1 1270.3 L13466 1459 L21406.75 1695.0623071889315 L21406.8 1695.1 " fill="none"></path>
+					<path d="M11544.0 2734.4 L11650.25 3314 L11481.542225201072 3485 L11481.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12853.7 1262.4 L12861.1 1270.3 L12850.6 1272.6 L12843.3 1264.7 Z"></path>
+						<path d="M11547.6 2724.2 L11544.0 2734.4 L11537.1 2726.1 L11540.7 2716.0 Z"></path>
 					</g>
-					<path d="M12861.4 1257.7 L13689 1459 L13689 1697.5 L13689 1697.5 L13689 1936 L13689 1936 L13689 2625 L13689 2625 L13689 3314 L13689 3314 L39892.25 3500.247672812158 L39892.3 3500.2 " fill="none"></path>
+					<path d="M5250.6 3443.8 L5263 3439.5 L5270.5 3439.5 L5270.5 3439.5 L5278 3500.5 L5278 3500.5 L5270.5 3561.5 L5270.5 3561.5 L5263 3561.5 L5263 3561.5 L5233 3551.1610169491523 L5233.0 3551.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12853.6 1250.3 L12861.4 1257.7 L12851.1 1260.6 L12843.3 1253.2 Z"></path>
+						<path d="M5240.1 3441.8 L5250.6 3443.8 L5243.6 3451.8 L5233.0 3449.8 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M3096.2 2653.2 L2883.25 3314 L4939 3488.0539666326185 L4939.0 3488.1 " fill="none"></path>
 					</g>
-					<path d="M12861.4 1256.0 L13729 1459 L13729 1697.5 L13729 1697.5 L13729 1936 L13729 1936 L13729 2625 L13729 2625 L13729 3314 L13729 3314 L6221.25 3495.35483923194 L6221.3 3495.4 " fill="none"></path>
+					<path d="M3101.2 2654.8 L3096.2 2653.2 L3091.1 2651.6 L3100.3 2640.5 Z"></path>
+					<path d="M27178.1 175.9 L26468 293 L26468 614 L26468.0 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12853.6 1248.6 L12861.4 1256.0 L12851.1 1259.0 L12843.3 1251.7 Z"></path>
+						<path d="M27188.2 179.6 L27178.1 175.9 L27186.4 169.1 L27196.5 172.9 Z"></path>
 					</g>
-					<path d="M14998.8 1277.2 L14998.75 1459 L14998.75 1666.5 L14998.8 1666.5 " fill="none"></path>
+					<path d="M27417.0 208.7 L27417 293 L27417 614 L27417.0 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15004.1 1267.8 L14998.8 1277.2 L14993.4 1267.8 L14998.8 1258.5 Z"></path>
+						<path d="M27422.3 199.3 L27417.0 208.7 L27411.7 199.3 L27417.0 190.0 Z"></path>
 					</g>
-					<path d="M12547.0 2772.3 L12440.25 3314 L6746.25 3498.0435008665513 L6746.3 3498.0 " fill="none"></path>
+					<path d="M62263.5 1761.7 L62015.25 1936 L44706.5 2619.1390253333143 L44706.5 2619.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12554.0 2764.2 L12547.0 2772.3 L12543.5 2762.1 L12550.6 2754.0 Z"></path>
+						<path d="M62274.2 1760.7 L62263.5 1761.7 L62268.1 1752.0 L62278.8 1751.0 Z"></path>
 					</g>
-					<path d="M12571.2 2772.7 L12553.5 3314 L39892.25 3500.2581394924064 L39892.3 3500.3 " fill="none"></path>
+					<path d="M12149.5 2771.4 L11985.25 3314 L11753.276809651474 3485 L11753.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12576.8 2763.5 L12571.2 2772.7 L12566.2 2763.2 L12571.8 2754.0 Z"></path>
+						<path d="M12157.3 2764.0 L12149.5 2771.4 L12147.1 2760.9 L12154.9 2753.5 Z"></path>
 					</g>
-					<path d="M6922.8 3618.2 L6922.75 3687 L6922.75 3828 L6922.8 3828.0 " fill="none"></path>
+					<path d="M12170.3 2771.9 L12084 3314 L21539.75 3499.9297688394527 L21539.8 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6928.1 3608.8 L6922.8 3618.2 L6917.4 3608.8 L6922.8 3599.5 Z"></path>
+						<path d="M12177.1 2763.6 L12170.3 2771.9 L12166.5 2761.9 L12173.3 2753.5 Z"></path>
 					</g>
-					<path d="M12579.6 2767.3 L12593.5 3314 L7059.25 3496.0107789974873 L7059.3 3496.0 " fill="none"></path>
-					<path d="M12584.9 2767.2 L12579.6 2767.3 L12574.3 2767.5 L12579.3 2754.0 Z"></path>
-					<path d="M12603.5 2767.1 L12709.25 3314 L7290.25 3497.270196754012 L7290.3 3497.3 " fill="none"></path>
-					<path d="M12608.7 2766.1 L12603.5 2767.1 L12598.2 2768.1 L12600.9 2754.0 Z"></path>
-					<path d="M12865.6 2712.3 L12749.25 3314 L13190.04490616622 3485 L13190.0 3485.0 " fill="none"></path>
+					<path d="M12191.4 2772.2 L12182.75 3314 L11950.776809651474 3485 L11950.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12872.6 2704.2 L12865.6 2712.3 L12862.1 2702.2 L12869.2 2694.0 Z"></path>
+						<path d="M12196.9 2762.9 L12191.4 2772.2 L12186.2 2762.7 L12191.7 2753.5 Z"></path>
 					</g>
-					<path d="M12900.3 2712.3 L13022.75 3314 L24215 3498.130962619914 L24215.0 3498.1 " fill="none"></path>
+					<path d="M12214.8 2772.0 L12292.5 3314 L13098.75 3489.098253275109 L13098.8 3489.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12903.6 2702.1 L12900.3 2712.3 L12893.2 2704.2 L12896.5 2694.0 Z"></path>
+						<path d="M12218.8 2762.0 L12214.8 2772.0 L12208.2 2763.5 L12212.2 2753.5 Z"></path>
 					</g>
-					<path d="M21393.5 1705.8 L18759.25 1936 L18759.25 2548.5 L18759.3 2548.5 " fill="none"></path>
-					<path d="M21393.9 1711.1 L21393.5 1705.8 L21393.0 1700.5 L21406.8 1704.7 Z"></path>
-					<path d="M56927.3 3900.7 L56927.25 4000 L60848.75 4129.142541164905 L60848.8 4129.1 " fill="none"></path>
+					<path d="M12238.0 2771.4 L12402.25 3314 L12170.276809651474 3485 L12170.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56932.6 3891.3 L56927.3 3900.7 L56921.9 3891.3 L56927.3 3882.0 Z"></path>
+						<path d="M12240.4 2760.9 L12238.0 2771.4 L12230.2 2764.0 L12232.6 2753.5 Z"></path>
 					</g>
-					<path d="M58605.8 727.5 L59032.5 966 L59032.5 1212.5 L59032.5 1212.5 L59032.5 1459 L59032.5 1459 L59032.5 1697.5 L59032.5 1697.5 L59032.5 1936 L59032.5 1936 L59032.5 2625 L59032.5 2625 L59032.5 3314 L59032.5 3314 L59032.5 3500.5 L59032.5 3500.5 L59032.5 3687 L59032.5 3687 L57068.25 3833.0183469896688 L57068.3 3833.0 " fill="none"></path>
-					<path d="M58608.4 722.9 L58605.8 727.5 L58603.2 732.2 L58594.2 721.0 Z"></path>
-					<path d="M11960.0 2682.2 L11943.5 3314 L13173 3492.236883015935 L13173.0 3492.2 " fill="none"></path>
+					<path d="M62174.3 2674.7 L62174.25 3314 L48870 3498.722784715889 L48870.0 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11965.6 2673.0 L11960.0 2682.2 L11954.9 2672.7 L11960.5 2663.5 Z"></path>
+						<path d="M62179.6 2665.3 L62174.3 2674.7 L62168.9 2665.3 L62174.3 2656.0 Z"></path>
 					</g>
-					<path d="M11972.3 2681.8 L12093 3314 L7441.25 3498.3011046789525 L7441.3 3498.3 " fill="none"></path>
+					<path d="M62306.4 1761.6 L62174.25 1936 L62174.25 2594 L62174.3 2594.0 " fill="none"></path>
+					<path d="M62310.7 1764.8 L62306.4 1761.6 L62302.2 1758.4 L62314.5 1751.0 Z"></path>
+					<path d="M12861.0 2749.3 L12748.5 3314 L21428.75 3499.7403694461177 L21428.8 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11975.8 2671.7 L11972.3 2681.8 L11965.4 2673.7 L11968.8 2663.5 Z"></path>
+						<path d="M12868.0 2741.2 L12861.0 2749.3 L12857.6 2739.1 L12864.6 2731.0 Z"></path>
 					</g>
-					<path d="M13508.9 2719.8 L13385.75 3314 L13242.944369973191 3485 L13242.9 3485.0 " fill="none"></path>
+					<path d="M12885.7 2749.7 L12885.5 3314 L13129.163538873994 3485 L13129.2 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13516.0 2711.7 L13508.9 2719.8 L13505.5 2709.6 L13512.7 2701.5 Z"></path>
+						<path d="M12891.0 2740.3 L12885.7 2749.7 L12880.4 2740.3 L12885.7 2731.0 Z"></path>
 					</g>
-					<path d="M13517.1 2720.0 L13446 3314 L7441.25 3498.792025906522 L7441.3 3498.8 " fill="none"></path>
+					<path d="M12910.5 2749.3 L13022.75 3314 L19573.75 3497.4063649328227 L19573.8 3497.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13523.5 2711.4 L13517.1 2720.0 L13512.9 2710.1 L13519.3 2701.5 Z"></path>
+						<path d="M12913.9 2739.1 L12910.5 2749.3 L12903.4 2741.2 L12906.8 2731.0 Z"></path>
 					</g>
-					<path d="M13536.8 2720.1 L13588.75 3314 L24215 3498.006464566746 L24215.0 3498.0 " fill="none"></path>
+					<path d="M62535.8 2674.7 L62535.75 3314 L28264.25 3500.0494185623425 L28264.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13541.3 2710.3 L13536.8 2720.1 L13530.7 2711.3 L13535.2 2701.5 Z"></path>
+						<path d="M62541.1 2665.3 L62535.8 2674.7 L62530.4 2665.3 L62535.8 2656.0 Z"></path>
 					</g>
-					<path d="M15191.8 3923.7 L15191.75 4000 L29878.5 4133.346286101465 L29878.5 4133.3 " fill="none"></path>
+					<path d="M62403.6 1761.6 L62535.75 1936 L62535.75 2594 L62535.8 2594.0 " fill="none"></path>
+					<path d="M62407.8 1758.4 L62403.6 1761.6 L62399.3 1764.8 L62395.5 1751.0 Z"></path>
+					<path d="M13767.1 2727.4 L13675.75 3314 L25696 3499.82751010258 L25696.0 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15197.1 3914.3 L15191.8 3923.7 L15186.4 3914.3 L15191.8 3905.0 Z"></path>
+						<path d="M13773.8 2719.0 L13767.1 2727.4 L13763.2 2717.4 L13769.9 2709.0 Z"></path>
 					</g>
-					<path d="M22964.9 1215.3 L15191.75 1459 L15191.75 1697.5 L15191.75 1697.5 L15191.75 1936 L15191.75 1936 L15191.75 2625 L15191.75 2625 L15191.75 3314 L15191.75 3314 L15191.75 3500.5 L15191.75 3500.5 L15191.75 3687 L15191.75 3687 L15191.75 3782 L15191.8 3782.0 " fill="none"></path>
-					<path d="M22965.1 1220.6 L22964.9 1215.3 L22964.8 1210.0 L22978.3 1214.9 Z"></path>
-					<path d="M21393.7 1718.2 L20393.25 1936 L20393.25 2594 L20393.3 2594.0 " fill="none"></path>
-					<path d="M21394.9 1723.4 L21393.7 1718.2 L21392.6 1713.0 L21406.8 1715.4 Z"></path>
-					<path d="M66803.1 2772.3 L66693.25 3314 L48057 3499.9561882214466 L48057.0 3500.0 " fill="none"></path>
+					<path d="M13799.0 2727.4 L13890.5 3314 L21428.75 3499.6258293447763 L21428.8 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66810.2 2764.2 L66803.1 2772.3 L66799.8 2762.1 L66806.8 2754.0 Z"></path>
+						<path d="M13802.8 2717.4 L13799.0 2727.4 L13792.3 2719.0 L13796.1 2709.0 Z"></path>
 					</g>
-					<path d="M66811.6 2772.5 L66733.25 3314 L69689.25 3492.9044296608795 L69689.3 3492.9 " fill="none"></path>
+					<path d="M28000.5 717.2 L28000.5 966 L28000.5 1197 L28000.5 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66818.3 2764.0 L66811.6 2772.5 L66807.7 2762.5 L66814.3 2754.0 Z"></path>
+						<path d="M28005.8 707.8 L28000.5 717.2 L27995.2 707.8 L28000.5 698.5 Z"></path>
 					</g>
-					<path d="M66866.4 2772.2 L66989.5 3314 L54355.75 3499.6696578081596 L54355.8 3499.7 " fill="none"></path>
+					<path d="M28000.5 165.3 L28000.5 293 L28000.5 560.5 L28000.5 560.5 " fill="none"></path>
+					<path d="M28005.8 165.3 L28000.5 165.3 L27995.2 165.3 L28000.5 152.0 Z"></path>
+					<path d="M16003.2 3938.7 L15927.5 4000 L18277.25 4130.016104056984 L18277.3 4130.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66869.6 2761.9 L66866.4 2772.2 L66859.2 2764.3 L66862.3 2754.0 Z"></path>
+						<path d="M16013.9 3937.0 L16003.2 3938.7 L16007.1 3928.7 L16017.8 3927.0 Z"></path>
 					</g>
-					<path d="M66874.9 2772.0 L67029.5 3314 L58796.5 3499.318266851729 L58796.5 3499.3 " fill="none"></path>
+					<path d="M16026.0 3940.3 L15967.5 4000 L6118.75 4132.042572350484 L6118.8 4132.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66877.5 2761.5 L66874.9 2772.0 L66867.2 2764.4 L66869.8 2754.0 Z"></path>
+						<path d="M16036.4 3937.4 L16026.0 3940.3 L16028.8 3929.9 L16039.1 3927.0 Z"></path>
 					</g>
-					<path d="M71334.7 660.0 L66833 966 L66833 1212.5 L66833 1212.5 L66833 1459 L66833 1459 L66833 1697.5 L66833 1697.5 L66833 1936 L66833 1936 L66833 2496 L66833.0 2496.0 " fill="none"></path>
-					<path d="M71335.1 665.4 L71334.7 660.0 L71334.3 654.7 L71348.0 659.1 Z"></path>
-					<path d="M58621.6 729.7 L59072.5 966 L59072.5 1212.5 L59072.5 1212.5 L59072.5 1459 L59072.5 1459 L59072.5 1697.5 L59072.5 1697.5 L59072.5 1936 L59072.5 1936 L59072.5 2625 L59072.5 2625 L59072.5 3314 L59072.5 3314 L69689.25 3498.32115013149 L69689.3 3498.3 " fill="none"></path>
+					<path d="M16141.3 3945.3 L16152.25 4000 L6445.75 4132.047817258884 L6445.8 4132.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58615.8 720.6 L58621.6 729.7 L58610.9 730.1 L58605.1 721.0 Z"></path>
+						<path d="M16144.7 3935.1 L16141.3 3945.3 L16134.3 3937.2 L16137.7 3927.0 Z"></path>
 					</g>
-					<path d="M58721.8 689.9 L60054.5 966 L60054.5 1212.5 L60054.5 1212.5 L60054.5 1459 L60054.5 1459 L60054.5 1697.5 L60054.5 1697.5 L60054.5 1936 L60054.5 1936 L60054.5 2625 L60054.5 2625 L60054.5 3314 L60054.5 3314 L59452 3487.27101002313 L59452.0 3487.3 " fill="none"></path>
+					<path d="M16166.7 3944.0 L16192.25 4000 L14241 4125.208906979528 L14241.0 4125.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58713.7 682.7 L58721.8 689.9 L58711.6 693.2 L58703.5 686.1 Z"></path>
+						<path d="M16167.7 3933.3 L16166.7 3944.0 L16158.0 3937.7 L16159.0 3927.0 Z"></path>
 					</g>
-					<path d="M58721.9 680.4 L60358.75 966 L60358.75 1212.5 L60358.75 1212.5 L60358.75 1459 L60358.75 1459 L60358.75 1697.5 L60358.75 1697.5 L60358.75 1936 L60358.75 1936 L60358.75 2625 L60358.75 2625 L60358.75 3314 L60358.75 3314 L59320 3486.393214682981 L59320.0 3486.4 " fill="none"></path>
+					<path d="M16256.2 3937.7 L16345.75 4000 L14461 4127.892897835169 L14461.0 4127.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58713.6 673.5 L58721.9 680.4 L58711.8 684.0 L58703.5 677.1 Z"></path>
+						<path d="M16251.6 3928.0 L16256.2 3937.7 L16245.5 3936.7 L16240.9 3927.0 Z"></path>
 					</g>
-					<path d="M22965.0 1220.5 L20292.75 1459 L21406.75 1681.1479933110368 L21406.8 1681.1 " fill="none"></path>
-					<path d="M22965.4 1225.8 L22965.0 1220.5 L22964.5 1215.2 L22978.3 1219.3 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29343.3 1256.8 L29343.25 1459 L21570.75 1695.010089757464 L21570.8 1695.0 " fill="none"></path>
+					<path d="M36524.0 165.3 L36524 293 L36524 614 L36524.0 614.0 " fill="none"></path>
+					<path d="M36529.3 165.3 L36524.0 165.3 L36518.7 165.3 L36524.0 152.0 Z"></path>
+					<path d="M14038.0 2712.7 L14038 3314 L10247 3498.3362012775387 L10247.0 3498.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M14043.3 2703.3 L14038.0 2712.7 L14032.7 2703.3 L14038.0 2694.0 Z"></path>
 					</g>
-					<path d="M29348.6 1256.8 L29343.3 1256.8 L29337.9 1256.8 L29343.3 1243.5 Z"></path>
-					<path d="M1144.8 3450.9 L1157 3447 L1164.5 3447 L1164.5 3447 L1172 3500.5 L1172 3500.5 L1164.5 3554 L1164.5 3554 L1157 3554 L1157 3554 L1127 3544.5309734513276 L1127.0 3544.5 " fill="none"></path>
+					<path d="M36920.5 165.3 L36920.5 293 L36920.5 614 L36920.5 614.0 " fill="none"></path>
+					<path d="M36925.8 165.3 L36920.5 165.3 L36915.2 165.3 L36920.5 152.0 Z"></path>
+					<path d="M9187.0 3450.3 L9199 3447 L9206.5 3447 L9206.5 3447 L9214 3500.5 L9214 3500.5 L9206.5 3554 L9206.5 3554 L9199 3554 L9199 3554 L9169 3545.769230769231 L9169.0 3545.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1134.3 3448.6 L1144.8 3450.9 L1137.5 3458.7 L1127.0 3456.5 Z"></path>
+						<path d="M9176.6 3447.6 L9187.0 3450.3 L9179.4 3457.9 L9169.0 3455.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3649.9 2648.9 L2832.5 3314 L1127 3486.3987804878047 L1127.0 3486.4 " fill="none"></path>
+						<path d="M3097.8 2653.4 L2923.25 3314 L8839 3495.439357809481 L8839.0 3495.4 " fill="none"></path>
 					</g>
-					<path d="M3653.2 2653.1 L3649.9 2648.9 L3646.5 2644.8 L3660.2 2640.5 Z"></path>
-					<path d="M63093.1 2800.1 L61795 3314 L61795 3500.5 L61795 3500.5 L61795 3687 L61795 3687 L61795 3843.5 L61795 3843.5 L61795 4000 L61795 4000 L61143.75 4109.2550860719875 L61143.8 4109.3 " fill="none"></path>
+					<path d="M3102.9 2654.8 L3097.8 2653.4 L3092.6 2652.0 L3101.2 2640.5 Z"></path>
+					<path d="M14331.0 2697.7 L14331 3314 L11554.75 3494.7385024871282 L11554.8 3494.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63103.8 2801.6 L63093.1 2800.1 L63099.9 2791.7 L63110.5 2793.2 Z"></path>
+						<path d="M14336.3 2688.3 L14331.0 2697.7 L14325.7 2688.3 L14331.0 2679.0 Z"></path>
 					</g>
-					<path d="M63093.2 2804.2 L61835 3314 L41115.75 3498.7390309201955 L41115.8 3498.7 " fill="none"></path>
+					<path d="M29232.9 1213.9 L13364.5 1459 L13364.5 1651 L13364.5 1651.0 " fill="none"></path>
+					<path d="M29233.0 1219.2 L29232.9 1213.9 L29232.8 1208.5 L29246.3 1213.7 Z"></path>
+					<path d="M16534.0 3908.7 L16534 4000 L18277.25 4128.685029610247 L18277.3 4128.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63103.9 2805.6 L63093.2 2804.2 L63099.8 2795.8 L63110.5 2797.2 Z"></path>
+						<path d="M16539.3 3899.3 L16534.0 3908.7 L16528.7 3899.3 L16534.0 3890.0 Z"></path>
 					</g>
-					<path d="M63093.3 2808.5 L61875 3314 L59452 3497.025313892264 L59452.0 3497.0 " fill="none"></path>
+					<path d="M14698.6 2742.1 L14550 3314 L13048 3492.4222929936304 L13048.0 3492.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63103.9 2809.9 L63093.3 2808.5 L63099.8 2800.0 L63110.5 2801.3 Z"></path>
+						<path d="M14706.1 2734.4 L14698.6 2742.1 L14695.8 2731.7 L14703.3 2724.0 Z"></path>
 					</g>
-					<path d="M63672.9 2898.2 L63882 3314 L54355.75 3499.4003939370223 L54355.8 3499.4 " fill="none"></path>
+					<path d="M14830.3 2737.9 L15347 3314 L21428.75 3499.4176917732643 L21428.8 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63673.5 2887.4 L63672.9 2898.2 L63663.9 2892.2 L63664.5 2881.5 Z"></path>
+						<path d="M14828.0 2727.4 L14830.3 2737.9 L14820.1 2734.5 L14817.8 2724.0 Z"></path>
 					</g>
-					<path d="M63688.5 2897.8 L63922 3314 L58796.5 3498.609067207416 L58796.5 3498.6 " fill="none"></path>
+					<path d="M14857.6 2736.2 L15526 3314 L13203.75 3496.3769344141488 L13203.8 3496.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63688.6 2887.0 L63688.5 2897.8 L63679.3 2892.2 L63679.4 2881.5 Z"></path>
+						<path d="M14854.1 2726.1 L14857.6 2736.2 L14847.1 2734.1 L14843.5 2724.0 Z"></path>
 					</g>
-					<path d="M63704.1 2897.4 L63962 3314 L17321.75 3499.7929230900672 L17321.8 3499.8 " fill="none"></path>
+					<path d="M27476.2 3435.4 L27488.25 3432 L27495.75 3432 L27495.75 3432 L27503.25 3500.5 L27503.25 3500.5 L27495.75 3569 L27495.75 3569 L27488.25 3569 L27488.25 3569 L27458.25 3560.543209876543 L27458.3 3560.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63703.7 2886.6 L63704.1 2897.4 L63694.7 2892.2 L63694.3 2881.5 Z"></path>
+						<path d="M27465.8 3432.8 L27476.2 3435.4 L27468.7 3443.1 L27458.3 3440.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M69400.4 139.3 L63535.5 293 L63535.5 629.5 L63535.5 629.5 L63535.5 966 L63535.5 966 L63535.5 1212.5 L63535.5 1212.5 L63535.5 1459 L63535.5 1459 L63535.5 1697.5 L63535.5 1697.5 L63535.5 1936 L63535.5 1936 L63535.5 2368.5 L63535.5 2368.5 " fill="none"></path>
+						<path d="M3099.4 2653.6 L2963.25 3314 L27032.25 3498.8640350877195 L27032.3 3498.9 " fill="none"></path>
 					</g>
-					<path d="M69400.6 144.6 L69400.4 139.3 L69400.3 134.0 L69413.8 139.0 Z"></path>
-					<path d="M17339.8 3447.1 L17449.916666666664 3417 L17481.958333333336 3417 L17481.958333333336 3417 L17514 3500.5 L17514 3500.5 L17481.958333333336 3584 L17481.958333333336 3584 L17449.916666666664 3584 L17449.916666666664 3584 L17321.75 3548.9882769901856 L17321.8 3549.0 " fill="none"></path>
+					<path d="M3104.6 2654.6 L3099.4 2653.6 L3094.1 2652.5 L3102.1 2640.5 Z"></path>
+					<path d="M15697.2 2749.2 L15566 3314 L15566 3500.5 L15566 3500.5 L15566 3687 L15566 3687 L15566 3843.5 L15566 3843.5 L15566 4000 L15566 4000 L18277.25 4130.53354890865 L18277.3 4130.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17329.3 3444.4 L17339.8 3447.1 L17332.2 3454.7 L17321.8 3452.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3655.3 2650.2 L3024 3314 L16966.75 3498.155583293497 L16966.8 3498.2 " fill="none"></path>
+						<path d="M15704.5 2741.3 L15697.2 2749.2 L15694.1 2738.9 L15701.4 2731.0 Z"></path>
 					</g>
-					<path d="M3659.2 2653.8 L3655.3 2650.2 L3651.5 2646.5 L3664.5 2640.5 Z"></path>
-					<path d="M6940.5 2690.2 L6940.5 3314 L16966.75 3497.2557270611296 L16966.8 3497.3 " fill="none"></path>
+					<path d="M15853.9 2685.5 L17183 3314 L21539.75 3499.266801573277 L21539.8 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6945.8 2680.8 L6940.5 2690.2 L6935.2 2680.8 L6940.5 2671.5 Z"></path>
+						<path d="M15847.7 2676.7 L15853.9 2685.5 L15843.2 2686.3 L15837.0 2677.5 Z"></path>
 					</g>
-					<path d="M7267.1 1735.5 L6940.5 1936 L6940.5 2578.5 L6940.5 2578.5 " fill="none"></path>
-					<path d="M7269.9 1740.0 L7267.1 1735.5 L7264.3 1730.9 L7278.5 1728.5 Z"></path>
-					<path d="M7188.0 2690.2 L7188 3314 L16966.75 3497.175078468299 L16966.8 3497.2 " fill="none"></path>
+					<path d="M15854.0 2683.9 L17223 3314 L10247 3499.317854853643 L10247.0 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7193.3 2680.8 L7188.0 2690.2 L7182.7 2680.8 L7188.0 2671.5 Z"></path>
+						<path d="M15847.7 2675.1 L15854.0 2683.9 L15843.2 2684.8 L15837.0 2676.1 Z"></path>
 					</g>
-					<path d="M7303.9 1740.0 L7188 1936 L7188 2578.5 L7188.0 2578.5 " fill="none"></path>
-					<path d="M7308.5 1742.7 L7303.9 1740.0 L7299.3 1737.3 L7310.7 1728.5 Z"></path>
-					<path d="M7435.0 2690.2 L7435 3314 L16966.75 3497.0904936014626 L16966.8 3497.1 " fill="none"></path>
+					<path d="M15854.2 2679.0 L17363 3314 L25696 3499.531486897869 L25696.0 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7440.3 2680.8 L7435.0 2690.2 L7429.7 2680.8 L7435.0 2671.5 Z"></path>
+						<path d="M15847.7 2670.4 L15854.2 2679.0 L15843.5 2680.3 L15837.0 2671.7 Z"></path>
 					</g>
-					<path d="M7348.2 1740.7 L7435 1936 L7435 2578.5 L7435.0 2578.5 " fill="none"></path>
-					<path d="M7353.1 1738.5 L7348.2 1740.7 L7343.3 1742.9 L7342.8 1728.5 Z"></path>
-					<path d="M15392.3 2697.2 L15392.25 3314 L54242.75 3500.2291682730615 L54242.8 3500.2 " fill="none"></path>
+					<path d="M21716.1 2711.9 L21623.25 3314 L24211.25 3494.738438494664 L24211.3 3494.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15397.6 2687.8 L15392.3 2697.2 L15386.9 2687.8 L15392.3 2678.5 Z"></path>
+						<path d="M21722.8 2703.5 L21716.1 2711.9 L21712.2 2701.9 L21718.9 2693.5 Z"></path>
 					</g>
-					<path d="M15809.3 2703.9 L15632.25 3314 L15632.25 3485 L15632.3 3485.0 " fill="none"></path>
+					<path d="M21738.6 2712.1 L21801.25 3314 L21492.258042895442 3485 L21492.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15817.1 2696.5 L15809.3 2703.9 L15806.8 2693.5 L15814.5 2686.0 Z"></path>
+						<path d="M21742.9 2702.2 L21738.6 2712.1 L21732.3 2703.3 L21736.6 2693.5 Z"></path>
 					</g>
-					<path d="M15888.1 2701.0 L16338 3314 L54242.75 3500.2224208897233 L54242.8 3500.2 " fill="none"></path>
+					<path d="M19853.4 1762.6 L18888.25 1936 L18888.25 2625 L18888.25 2625 L18888.25 3314 L18888.25 3314 L25512 3498.494548780943 L25512.0 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15886.8 2690.4 L15888.1 2701.0 L15878.2 2696.7 L15877.0 2686.0 Z"></path>
+						<path d="M19863.5 1766.2 L19853.4 1762.6 L19861.6 1755.7 L19871.8 1759.3 Z"></path>
 					</g>
-					<path d="M7717.5 2705.2 L7717.5 3314 L16966.75 3496.9883178189725 L16966.8 3497.0 " fill="none"></path>
+					<path d="M19853.5 1776.3 L19118.75 1936 L19118.75 2609.5 L19118.8 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7722.8 2695.8 L7717.5 2705.2 L7712.2 2695.8 L7717.5 2686.5 Z"></path>
+						<path d="M19863.8 1779.5 L19853.5 1776.3 L19861.5 1769.1 L19871.8 1772.3 Z"></path>
 					</g>
-					<path d="M7390.9 1735.5 L7717.5 1936 L7717.5 2563.5 L7717.5 2563.5 " fill="none"></path>
-					<path d="M7393.7 1730.9 L7390.9 1735.5 L7388.1 1740.0 L7379.5 1728.5 Z"></path>
-					<path d="M17094.3 2704.3 L16967.75 3314 L39892.25 3500.211639808362 L39892.3 3500.2 " fill="none"></path>
+					<path d="M19853.8 1797.1 L19349.25 1936 L19349.25 2625 L19349.25 2625 L19349.25 3314 L19349.25 3314 L9169 3497.525446460936 L9169.0 3497.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17101.4 2696.2 L17094.3 2704.3 L17091.0 2694.1 L17098.1 2686.0 Z"></path>
+						<path d="M19864.2 1799.8 L19853.8 1797.1 L19861.3 1789.5 L19871.8 1792.2 Z"></path>
 					</g>
-					<path d="M17098.9 2704.5 L17007.75 3314 L17083.136058981232 3417 L17083.1 3417.0 " fill="none"></path>
+					<path d="M19854.0 1813.1 L19469.25 1936 L19469.25 2609.5 L19469.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17105.5 2696.0 L17098.9 2704.5 L17095.0 2694.4 L17101.6 2686.0 Z"></path>
+						<path d="M19864.5 1815.3 L19854.0 1813.1 L19861.2 1805.2 L19871.8 1807.4 Z"></path>
 					</g>
-					<path d="M17125.3 2704.4 L17237.25 3314 L46909 3500.1705972396276 L46909.0 3500.2 " fill="none"></path>
+					<path d="M19900.2 1903.7 L19850.75 1936 L19850.75 2609.5 L19850.8 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17128.9 2694.2 L17125.3 2704.4 L17118.4 2696.1 L17121.9 2686.0 Z"></path>
+						<path d="M19910.9 1903.1 L19900.2 1903.7 L19905.1 1894.1 L19915.8 1893.5 Z"></path>
 					</g>
-					<path d="M21404.4 1751.2 L21113.75 1936 L21113.75 2594 L21113.8 2594.0 " fill="none"></path>
-					<path d="M21407.2 1755.7 L21404.4 1751.2 L21401.5 1746.7 L21415.6 1744.0 Z"></path>
-					<path d="M21536.4 1754.2 L21689.25 1936 L21689.25 2594 L21689.3 2594.0 " fill="none"></path>
-					<path d="M21540.5 1750.8 L21536.4 1754.2 L21532.3 1757.6 L21527.8 1744.0 Z"></path>
-					<path d="M21582.5 1747.4 L21936.75 1936 L21936.75 2594 L21936.8 2594.0 " fill="none"></path>
-					<path d="M21585.0 1742.7 L21582.5 1747.4 L21580.0 1752.1 L21570.8 1741.2 Z"></path>
-					<path d="M19641.1 2739.7 L18329 3314 L38917 3499.877039260299 L38917.0 3499.9 " fill="none"></path>
+					<path d="M20578.2 1754.6 L21729.5 1936 L21729.5 2556.5 L21729.5 2556.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19651.8 2740.9 L19641.1 2739.7 L19647.6 2731.1 L19658.3 2732.2 Z"></path>
+						<path d="M20569.8 1747.9 L20578.2 1754.6 L20568.1 1758.4 L20559.8 1751.7 Z"></path>
 					</g>
-					<path d="M19641.2 2742.7 L18369 3314 L28574.5 3499.1934565799074 L28574.5 3499.2 " fill="none"></path>
+					<path d="M20578.2 1748.4 L21913 1936 L21913 2625 L21913 2625 L21913 3314 L21913 3314 L19794.75 3491.253449242849 L19794.8 3491.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19651.9 2743.7 L19641.2 2742.7 L19647.6 2734.0 L19658.3 2735.0 Z"></path>
+						<path d="M20569.7 1741.9 L20578.2 1748.4 L20568.3 1752.4 L20559.8 1745.8 Z"></path>
 					</g>
-					<path d="M19642.1 2775.2 L18705.25 3314 L18705.25 3485 L18705.3 3485.0 " fill="none"></path>
+					<path d="M20578.2 1747.3 L21953 1936 L21953 2625 L21953 2625 L21953 3314 L21953 3314 L21499.75 3486.9537084398976 L21499.8 3487.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19652.8 2775.2 L19642.1 2775.2 L19647.5 2765.9 L19658.3 2765.9 Z"></path>
+						<path d="M20569.7 1740.7 L20578.2 1747.3 L20568.3 1751.3 L20559.8 1744.7 Z"></path>
 					</g>
-					<path d="M19843.0 2839.5 L19709.75 3314 L19709.75 3500.5 L19709.75 3500.5 L19709.75 3687 L19709.75 3687 L19709.75 3843.5 L19709.75 3843.5 L19709.75 4000 L19709.75 4000 L29878.5 4133.057881502819 L29878.5 4133.1 " fill="none"></path>
+					<path d="M20578.3 1746.1 L21993 1936 L21993 2625 L21993 2625 L21993 3314 L21993 3314 L10068 3497.7799033177707 L10068.0 3497.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19850.7 2831.9 L19843.0 2839.5 L19840.4 2829.0 L19848.1 2821.5 Z"></path>
+						<path d="M20569.7 1739.6 L20578.3 1746.1 L20568.3 1750.2 L20559.8 1743.7 Z"></path>
 					</g>
-					<path d="M19879.8 2840.1 L19828.25 3314 L19828.25 3485 L19828.3 3485.0 " fill="none"></path>
+					<path d="M10086.1 3450.1 L10098 3447 L10105.5 3447 L10105.5 3447 L10113 3500.5 L10113 3500.5 L10105.5 3554 L10105.5 3554 L10098 3554 L10098 3554 L10068 3546.227602905569 L10068.0 3546.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19886.2 2831.4 L19879.8 2840.1 L19875.5 2830.2 L19881.9 2821.5 Z"></path>
+						<path d="M10075.7 3447.3 L10086.1 3450.1 L10078.4 3457.6 L10068.0 3454.8 Z"></path>
 					</g>
-					<path d="M19922.9 2840.1 L19966.25 3314 L39589.25 3500.0874837922356 L39589.3 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19927.4 2830.3 L19922.9 2840.1 L19916.8 2831.3 L19921.2 2821.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3101.0 2653.7 L3003.25 3314 L9715 3495.721246325264 L9715.0 3495.7 " fill="none"></path>
 					</g>
-					<path d="M19965.8 2839.4 L20104.25 3314 L20104.25 3485 L20104.3 3485.0 " fill="none"></path>
+					<path d="M3106.3 2654.5 L3101.0 2653.7 L3095.7 2652.9 L3103.0 2640.5 Z"></path>
+					<path d="M23185.0 2720.2 L23185 3314 L25696 3497.324133881386 L25696.0 3497.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19968.3 2829.0 L19965.8 2839.4 L19958.1 2832.0 L19960.6 2821.5 Z"></path>
+						<path d="M23190.3 2710.8 L23185.0 2720.2 L23179.7 2710.8 L23185.0 2701.5 Z"></path>
 					</g>
-					<path d="M20035.4 2837.3 L20332 3314 L39892.25 3500.1621333707562 L39892.3 3500.2 " fill="none"></path>
+					<path d="M22674.0 1719.3 L22272 1936 L23083.629172714078 2548.5 L23083.6 2548.5 " fill="none"></path>
+					<path d="M22676.5 1724.0 L22674.0 1719.3 L22671.5 1714.6 L22685.7 1713.0 Z"></path>
+					<path d="M37154.0 165.3 L37154 293 L37154 614 L37154.0 614.0 " fill="none"></path>
+					<path d="M37159.3 165.3 L37154.0 165.3 L37148.7 165.3 L37154.0 152.0 Z"></path>
+					<path d="M23246.4 1805.9 L23185 1936 L23185 2548.5 L23185.0 2548.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20035.0 2826.6 L20035.4 2837.3 L20025.9 2832.2 L20025.5 2821.5 Z"></path>
+						<path d="M23255.2 1799.7 L23246.4 1805.9 L23245.5 1795.2 L23254.3 1789.0 Z"></path>
 					</g>
-					<path d="M20047.4 2836.9 L20372 3314 L46909 3500.1317625378438 L46909.0 3500.1 " fill="none"></path>
+					<path d="M23319.1 1807.3 L23344.5 1936 L23712.04136429608 2609.5 L23712.0 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20046.6 2826.2 L20047.4 2836.9 L20037.8 2832.2 L20036.9 2821.5 Z"></path>
+						<path d="M23322.6 1797.1 L23319.1 1807.3 L23312.1 1799.2 L23315.5 1789.0 Z"></path>
 					</g>
-					<path d="M71334.7 672.3 L68249.75 966 L68249.75 1212.5 L68249.75 1212.5 L68249.75 1459 L68249.75 1459 L68249.75 1666.5 L68249.8 1666.5 " fill="none"></path>
-					<path d="M71335.2 677.6 L71334.7 672.3 L71334.2 667.0 L71348.0 671.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M34049.7 136.9 L10414.75 293 L10414.75 614 L10414.8 614.0 " fill="none"></path>
+					<path d="M23369.1 1804.5 L23457 1936 L23457 2609.5 L23457.0 2609.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M23368.3 1793.8 L23369.1 1804.5 L23359.4 1799.7 L23358.7 1789.0 Z"></path>
 					</g>
-					<path d="M34049.7 142.2 L34049.7 136.9 L34049.6 131.6 L34063.0 136.8 Z"></path>
-					<path d="M57248.8 3998.7 L57248.75 4000 L58767 4129.810496091881 L58767.0 4129.8 " fill="none"></path>
+					<path d="M23584.9 1804.5 L23497 1936 L23219.64150943396 2548.5 L23219.6 2548.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57254.1 3989.3 L57248.8 3998.7 L57243.4 3989.3 L57248.8 3980.0 Z"></path>
+						<path d="M23594.6 1799.7 L23584.9 1804.5 L23585.7 1793.8 L23595.3 1789.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M34170.3 136.9 L60460.5 293 L60460.5 614 L60460.5 614.0 " fill="none"></path>
+					<path d="M23685.9 1807.0 L23720.5 1936 L23720.5 2609.5 L23720.5 2609.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M23688.6 1796.6 L23685.9 1807.0 L23678.3 1799.4 L23681.1 1789.0 Z"></path>
 					</g>
-					<path d="M34170.4 131.5 L34170.3 136.9 L34170.3 142.2 L34157.0 136.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M34170.3 136.9 L60686 293 L60686 598.5 L60686.0 598.5 " fill="none"></path>
+					<path d="M23728.1 1804.5 L23816 1936 L23465.07619738752 2609.5 L23465.1 2609.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M23727.3 1793.8 L23728.1 1804.5 L23718.4 1799.7 L23717.7 1789.0 Z"></path>
 					</g>
-					<path d="M34170.4 131.5 L34170.3 136.9 L34170.3 142.2 L34157.0 136.8 Z"></path>
-					<path d="M69395.1 142.4 L66553.5 293 L66553.5 629.5 L66553.5 629.5 L66553.5 966 L66553.5 966 L66553.5 1212.5 L66553.5 1212.5 L66553.5 1459 L66553.5 1459 L66553.5 1697.5 L66553.5 1697.5 L66553.5 1936 L66553.5 1936 L66553.5 2625 L66553.5 2625 L66553.5 3314 L66553.5 3314 L58796.5 3499.2462385556055 L58796.5 3499.2 " fill="none"></path>
+					<path d="M24015.5 1777.7 L24015.5 1936 L23727.136429608126 2609.5 L23727.1 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69404.7 147.3 L69395.1 142.4 L69404.1 136.6 L69413.8 141.5 Z"></path>
+						<path d="M24020.8 1768.3 L24015.5 1777.7 L24010.2 1768.3 L24015.5 1759.0 Z"></path>
 					</g>
-					<path d="M3874.9 1708.0 L5207.5 1936 L5207.5 2571.5 L5207.5 2571.5 " fill="none"></path>
-					<path d="M3875.8 1702.7 L3874.9 1708.0 L3874.0 1713.2 L3861.8 1705.7 Z"></path>
-					<path d="M71329.5 687.9 L69165.5 966 L69165.5 1212.5 L69165.5 1212.5 L69165.5 1459 L69165.5 1459 L69165.5 1697.5 L69165.5 1697.5 L69165.5 1936 L69165.5 1936 L69165.5 2625 L69165.5 2625 L69165.5 3314 L69165.5 3314 L41507.75 3499.554040199649 L41507.8 3499.6 " fill="none"></path>
+					<path d="M20222.2 2709.7 L19833 3314 L25696 3499.126470837213 L25696.0 3499.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71339.4 692.0 L71329.5 687.9 L71338.1 681.4 L71348.0 685.5 Z"></path>
+						<path d="M20231.7 2704.7 L20222.2 2709.7 L20222.8 2699.0 L20232.3 2694.0 Z"></path>
 					</g>
-					<path d="M71329.6 700.5 L69630.75 966 L69630.75 1197 L69630.8 1197.0 " fill="none"></path>
+					<path d="M20292.2 2712.4 L20398.5 3314 L20398.5 3500.5 L20398.5 3500.5 L20398.5 3687 L20398.5 3687 L20398.5 3843.5 L20398.5 3843.5 L20398.5 4000 L20398.5 4000 L18421.25 4129.2919360741735 L18421.3 4129.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71339.6 704.3 L71329.6 700.5 L71338.0 693.8 L71348.0 697.6 Z"></path>
+						<path d="M20295.8 2702.3 L20292.2 2712.4 L20285.3 2704.1 L20288.9 2694.0 Z"></path>
 					</g>
-					<path d="M71329.8 730.7 L70273.75 966 L70273.75 1174 L70273.8 1174.0 " fill="none"></path>
+					<path d="M20740.5 2800.4 L20503.5 3314 L20503.5 3485 L20503.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71340.0 733.9 L71329.8 730.7 L71337.7 723.5 L71348.0 726.6 Z"></path>
+						<path d="M20749.3 2794.2 L20740.5 2800.4 L20739.6 2789.7 L20748.3 2783.5 Z"></path>
 					</g>
-					<path d="M71329.9 745.6 L70468 966 L70468 1212.5 L70468 1212.5 L70468 1459 L70468 1459 L70468 1697.5 L70468 1697.5 L70468 1936 L70468 1936 L70468 2625 L70468 2625 L70468 3314 L70468 3314 L70468 3500.5 L70468 3500.5 L70468 3687 L70468 3687 L70468 3843.5 L70468 3843.5 L70468 4000 L70468 4000 L56342 4131.5050715575935 L56342.0 4131.5 " fill="none"></path>
+					<path d="M20811.2 2802.1 L20781.5 3314 L13203.75 3499.216785164313 L13203.8 3499.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71340.3 748.5 L71329.9 745.6 L71337.6 738.1 L71348.0 741.0 Z"></path>
+						<path d="M20817.1 2793.1 L20811.2 2802.1 L20806.4 2792.5 L20812.3 2783.5 Z"></path>
 					</g>
-					<path d="M71764.1 964.6 L71764 966 L71764 1212.5 L71764 1212.5 L71764 1459 L71764 1459 L71764 1697.5 L71764 1697.5 L71764 1936 L71764 1936 L71764 2625 L71764 2625 L71764 3314 L71764 3314 L71764 3500.5 L71764 3500.5 L71764 3687 L71764 3687 L71764 3843.5 L71764 3843.5 L71764 4000 L71764 4000 L71764 4134 L71764 4134 L71764 4268 L71764 4268 L60247 4453.029978033338 L60247.0 4453.0 " fill="none"></path>
+					<path d="M20821.5 2802.2 L20821.5 3314 L21428.75 3490.199338778685 L21428.8 3490.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71770.0 955.6 L71764.1 964.6 L71759.3 955.0 L71765.2 946.0 Z"></path>
+						<path d="M20826.8 2792.8 L20821.5 2802.2 L20816.2 2792.8 L20821.5 2783.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M69614.1 143.8 L71784 293 L71784 313 L71784.0 313.0 " fill="none"></path>
+					<path d="M20831.8 2802.1 L20861.5 3314 L13048 3498.890915434879 L13048.0 3498.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M20836.6 2792.5 L20831.8 2802.1 L20825.9 2793.1 L20830.7 2783.5 Z"></path>
 					</g>
-					<path d="M69614.4 138.5 L69614.1 143.8 L69613.7 149.2 L69600.8 142.9 Z"></path>
-					<path d="M41525.3 3443.9 L41537.75 3439.5 L41545.25 3439.5 L41545.25 3439.5 L41552.75 3500.5 L41552.75 3500.5 L41545.25 3561.5 L41545.25 3561.5 L41537.75 3561.5 L41537.75 3561.5 L41507.75 3550.7982456140353 L41507.8 3550.8 " fill="none"></path>
+					<path d="M20902.5 2800.4 L21139.5 3314 L21539.75 3487.9001164822366 L21539.8 3487.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41514.7 3442.0 L41525.3 3443.9 L41518.3 3452.1 L41507.8 3450.2 Z"></path>
+						<path d="M20903.4 2789.7 L20902.5 2800.4 L20893.7 2794.2 L20894.7 2783.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3656.5 2650.4 L3064 3314 L41225.75 3499.813456605596 L41225.8 3499.8 " fill="none"></path>
+						<path d="M37938.4 173.6 L37704.25 293 L37704.25 598.5 L37704.3 598.5 " fill="none"></path>
 					</g>
-					<path d="M3660.5 2654.0 L3656.5 2650.4 L3652.6 2646.9 L3665.4 2640.5 Z"></path>
-					<path d="M54074.4 3886.3 L53478 4000 L55806 4120.1664098613255 L55806.0 4120.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M54084.6 3889.8 L54074.4 3886.3 L54082.6 3879.4 L54092.8 3882.9 Z"></path>
+					<path d="M37940.8 178.3 L37938.4 173.6 L37935.9 168.8 L37950.2 167.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M38055.0 176.5 L38183.25 293 L38183.25 598.5 L38183.3 598.5 " fill="none"></path>
 					</g>
-					<path d="M54299.3 3946.2 L54299.25 4000 L60332 4132.203033648146 L60332.0 4132.2 " fill="none"></path>
+					<path d="M38058.6 172.5 L38055.0 176.5 L38051.4 180.4 L38045.1 167.5 Z"></path>
+					<path d="M21345.9 2689.0 L21179.5 3314 L9625 3497.592268370607 L9625.0 3497.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54304.6 3936.8 L54299.3 3946.2 L54293.9 3936.8 L54299.3 3927.5 Z"></path>
+						<path d="M21353.5 2681.4 L21345.9 2689.0 L21343.2 2678.6 L21350.7 2671.0 Z"></path>
 					</g>
-					<path d="M54524.1 3887.2 L55104 4000 L60557.75 4130.985795581843 L60557.8 4131.0 " fill="none"></path>
+					<path d="M21361.1 2689.7 L21342.75 3314 L21549.967158176943 3485 L21550.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54515.9 3880.2 L54524.1 3887.2 L54513.9 3890.7 L54505.8 3883.7 Z"></path>
+						<path d="M21366.7 2680.5 L21361.1 2689.7 L21356.0 2680.2 L21361.6 2671.0 Z"></path>
 					</g>
-					<path d="M54299.3 3529.3 L54299.25 3687 L54299.25 3759.5 L54299.3 3759.5 " fill="none"></path>
-					<path d="M54304.6 3529.3 L54299.3 3529.3 L54293.9 3529.3 L54299.3 3516.0 Z"></path>
-					<path d="M20763.3 2712.7 L20763.25 3314 L38917 3499.7938222825865 L38917.0 3499.8 " fill="none"></path>
+					<path d="M21378.2 2689.2 L21526.25 3314 L24108.25 3498.252152286206 L24108.3 3498.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20768.6 2703.3 L20763.3 2712.7 L20757.9 2703.3 L20763.3 2694.0 Z"></path>
+						<path d="M21381.2 2678.9 L21378.2 2689.2 L21370.9 2681.3 L21373.9 2671.0 Z"></path>
 					</g>
-					<path d="M47455.0 3685.7 L47455 3687 L47455 3843.5 L47455 3843.5 L47455 4000 L47455 4000 L58767 4133.422057917437 L58767.0 4133.4 " fill="none"></path>
+					<path d="M9643.1 3450.0 L9655 3447 L9662.5 3447 L9662.5 3447 L9670 3500.5 L9670 3500.5 L9662.5 3554 L9662.5 3554 L9655 3554 L9655 3554 L9625 3546.4647887323945 L9625.0 3546.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47460.3 3676.3 L47455.0 3685.7 L47449.7 3676.3 L47455.0 3667.0 Z"></path>
+						<path d="M9632.8 3447.1 L9643.1 3450.0 L9635.4 3457.4 L9625.0 3454.5 Z"></path>
 					</g>
-					<path d="M35325.0 3304.8 L35318.25 3314 L47174 3496.181998887676 L47174.0 3496.2 " fill="none"></path>
-					<path d="M35329.3 3307.9 L35325.0 3304.8 L35320.7 3301.6 L35332.9 3294.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M21387.8 2669.3 L21387.75 3314 L47174 3498.489565450901 L47174.0 3498.5 " fill="none"></path>
+						<path d="M3102.7 2653.8 L3043.25 3314 L9259 3495.16622387185 L9259.0 3495.2 " fill="none"></path>
 					</g>
-					<path d="M21393.1 2669.3 L21387.8 2669.3 L21382.4 2669.3 L21387.8 2656.0 Z"></path>
-					<path d="M22457.3 2663.3 L21455.25 3314 L24593 3488.0472525838354 L24593.0 3488.0 " fill="none"></path>
-					<path d="M22460.2 2667.7 L22457.3 2663.3 L22454.4 2658.8 L22468.5 2656.0 Z"></path>
-					<path d="M82705.3 2712.7 L82705.25 3314 L47736 3499.0133013241043 L47736.0 3499.0 " fill="none"></path>
+					<path d="M3108.0 2654.3 L3102.7 2653.8 L3097.3 2653.3 L3103.9 2640.5 Z"></path>
+					<path d="M24747.9 1791.2 L24278.25 1936 L44409.5 2619.954745497356 L44409.5 2620.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82710.6 2703.3 L82705.3 2712.7 L82699.9 2703.3 L82705.3 2694.0 Z"></path>
+						<path d="M24758.4 1793.5 L24747.9 1791.2 L24755.3 1783.3 L24765.8 1785.7 Z"></path>
 					</g>
-					<path d="M83694.5 152.1 L82705.25 293 L82705.25 629.5 L82705.25 629.5 L82705.25 966 L82705.25 966 L82705.25 1212.5 L82705.25 1212.5 L82705.25 1459 L82705.25 1459 L82705.25 1697.5 L82705.25 1697.5 L82705.25 1936 L82705.25 1936 L82705.25 2556 L82705.3 2556.0 " fill="none"></path>
-					<path d="M83695.3 157.3 L83694.5 152.1 L83693.8 146.8 L83707.8 150.2 Z"></path>
-					<path d="M34048.9 1217.5 L29471 1459 L29471 1613.5 L29471.0 1613.5 " fill="none"></path>
-					<path d="M34049.2 1222.8 L34048.9 1217.5 L34048.7 1212.2 L34062.3 1216.8 Z"></path>
-					<path d="M59453.2 2891.2 L59278 3314 L64687 3499.4542696939056 L64687.0 3499.5 " fill="none"></path>
+					<path d="M24748.0 1796.3 L24318.25 1936 L24318.25 2609.5 L24318.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59461.7 2884.7 L59453.2 2891.2 L59451.8 2880.6 L59460.3 2874.0 Z"></path>
+						<path d="M24758.5 1798.5 L24748.0 1796.3 L24755.2 1788.3 L24765.8 1790.5 Z"></path>
 					</g>
-					<path d="M59502.4 2892.2 L59406 3314 L59406 3485 L59406.0 3485.0 " fill="none"></path>
+					<path d="M25035.3 1934.6 L25035.25 1936 L25035.25 2609.5 L25035.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59509.7 2884.3 L59502.4 2892.2 L59499.3 2881.9 L59506.6 2874.0 Z"></path>
+						<path d="M25041.3 1925.7 L25035.3 1934.6 L25030.7 1924.9 L25036.6 1916.0 Z"></path>
 					</g>
-					<path d="M59517.9 2892.4 L59446 3314 L56149.5 3480.318747463817 L56149.5 3480.3 " fill="none"></path>
+					<path d="M25353.6 1884.7 L25436.25 1936 L25436.25 2609.5 L25436.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59524.7 2884.1 L59517.9 2892.4 L59514.2 2882.3 L59521.0 2874.0 Z"></path>
+						<path d="M25348.5 1875.3 L25353.6 1884.7 L25342.9 1884.4 L25337.8 1874.9 Z"></path>
 					</g>
-					<path d="M59533.4 2892.5 L59486 3314 L54355.75 3498.4684291704825 L54355.8 3498.5 " fill="none"></path>
+					<path d="M25355.6 1791.2 L25825.25 1936 L25825.25 2609.5 L25825.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59539.7 2883.9 L59533.4 2892.5 L59529.1 2882.7 L59535.5 2874.0 Z"></path>
+						<path d="M25348.2 1783.3 L25355.6 1791.2 L25345.1 1793.5 L25337.8 1785.7 Z"></path>
 					</g>
-					<path d="M59627.7 2892.2 L59729 3314 L59729 3500.5 L59729 3500.5 L59729 3687 L59729 3687 L59729 3843.5 L59729 3843.5 L59729 4000 L59729 4000 L58865 4126.808324205915 L58865.0 4126.8 " fill="none"></path>
+					<path d="M44544.5 2750.1 L44483.75 3314 L44483.75 3485 L44483.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59630.7 2881.8 L59627.7 2892.2 L59620.3 2884.3 L59623.3 2874.0 Z"></path>
+						<path d="M44550.8 2741.4 L44544.5 2750.1 L44540.2 2740.2 L44546.5 2731.5 Z"></path>
 					</g>
-					<path d="M59643.1 2891.9 L59769 3314 L59769 3500.5 L59769 3500.5 L59769 3687 L59769 3687 L57389.25 3834.7753695069932 L57389.3 3834.8 " fill="none"></path>
+					<path d="M44582.0 2749.8 L44690.5 3314 L14544.5 3499.3533009148605 L14544.5 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59645.5 2881.4 L59643.1 2891.9 L59635.3 2884.5 L59637.8 2874.0 Z"></path>
+						<path d="M44585.5 2739.7 L44582.0 2749.8 L44575.0 2741.7 L44578.5 2731.5 Z"></path>
 					</g>
-					<path d="M59658.5 2891.6 L59809 3314 L58796.5 3491.306338028169 L58796.5 3491.3 " fill="none"></path>
+					<path d="M22676.9 1719.8 L22312 1936 L44409.5 2620.400678773712 L44409.5 2620.4 " fill="none"></path>
+					<path d="M22679.6 1724.4 L22676.9 1719.8 L22674.2 1715.2 L22688.3 1713.0 Z"></path>
+					<path d="M14562.6 3449.9 L14574.5 3447 L14582 3447 L14582 3447 L14589.5 3500.5 L14589.5 3500.5 L14582 3554 L14582 3554 L14574.5 3554 L14574.5 3554 L14544.5 3546.5866050808313 L14544.5 3546.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59660.4 2881.0 L59658.5 2891.6 L59650.3 2884.6 L59652.2 2874.0 Z"></path>
-					</g>
-					<path d="M72106.1 955.5 L72116.5 966 L72116.5 1212.5 L72116.5 1212.5 L72116.5 1459 L72116.5 1459 L72116.5 1697.5 L72116.5 1697.5 L72116.5 1936 L72116.5 1936 L60014.5 2600.245837648371 L60014.5 2600.2 " fill="none"></path>
-					<path d="M72109.9 951.7 L72106.1 955.5 L72102.3 959.2 L72096.7 946.0 Z"></path>
-					<path d="M38748.9 1833.6 L38585.5 1936 L59112.5 2610.187386786157 L59112.5 2610.2 " fill="none"></path>
-					<path d="M38751.7 1838.1 L38748.9 1833.6 L38746.1 1829.1 L38760.2 1826.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M70160.0 1255.7 L69625 1459 L69625 1697.5 L69625 1697.5 L69625 1936 L69625 1936 L60014.5 2594.116036376286 L60014.5 2594.1 " fill="none"></path>
-					</g>
-					<path d="M70161.9 1260.7 L70160.0 1255.7 L70158.1 1250.8 L70172.4 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M80298.2 1704.1 L76712 1936 L60014.5 2606.879522990349 L60014.5 2606.9 " fill="none"></path>
+						<path d="M14552.3 3447.0 L14562.6 3449.9 L14554.8 3457.4 L14544.5 3454.4 Z"></path>
 					</g>
-					<path d="M80298.5 1709.5 L80298.2 1704.1 L80297.9 1698.8 L80311.5 1703.3 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M5938.8 1247.8 L5311.5 1459 L5311.5 1697.5 L5311.5 1697.5 L5311.5 1936 L5311.5 1936 L59112.5 2619.272303325223 L59112.5 2619.3 " fill="none"></path>
+						<path d="M3104.3 2653.8 L3083.25 3314 L14171.5 3497.4150313754185 L14171.5 3497.4 " fill="none"></path>
 					</g>
-					<path d="M5940.5 1252.8 L5938.8 1247.8 L5937.1 1242.7 L5951.4 1243.5 Z"></path>
-					<path d="M55749.5 3625.7 L55749.5 3687 L57108.25 3828.8338335834583 L57108.3 3828.8 " fill="none"></path>
+					<path d="M3109.7 2654.0 L3104.3 2653.8 L3099.0 2653.7 L3104.8 2640.5 Z"></path>
+					<path d="M38560.5 193.7 L38560.5 293 L38560.5 614 L38560.5 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55754.8 3616.3 L55749.5 3625.7 L55744.2 3616.3 L55749.5 3607.0 Z"></path>
+						<path d="M38565.8 184.3 L38560.5 193.7 L38555.2 184.3 L38560.5 175.0 Z"></path>
 					</g>
-					<path d="M56168.1 3481.5 L59849 3314 L59666.67779390421 2874 L59666.7 2874.0 " fill="none"></path>
+					<path d="M22196.0 2712.7 L22196 3314 L64028.25 3500.295144257461 L64028.3 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56158.6 3476.6 L56168.1 3481.5 L56159.1 3487.2 L56149.5 3482.3 Z"></path>
+						<path d="M22201.3 2703.3 L22196.0 2712.7 L22190.7 2703.3 L22196.0 2694.0 Z"></path>
 					</g>
+					<path d="M61576.0 1709.5 L59591.5 1936 L59591.5 2594 L59591.5 2594.0 " fill="none"></path>
+					<path d="M61576.6 1714.8 L61576.0 1709.5 L61575.4 1704.2 L61589.3 1708.0 Z"></path>
+					<path d="M59588.1 2669.3 L59539 3314 L58447.671581769435 3485 L58447.7 3485.0 " fill="none"></path>
+					<path d="M59593.4 2669.7 L59588.1 2669.3 L59582.8 2668.9 L59589.1 2656.0 Z"></path>
+					<path d="M61576.2 1719.8 L60556.75 1936 L60556.75 2594 L60556.8 2594.0 " fill="none"></path>
+					<path d="M61577.3 1725.0 L61576.2 1719.8 L61575.1 1714.6 L61589.3 1717.0 Z"></path>
+					<path d="M61604.9 1734.3 L61186.5 1936 L45688 2619.553098194853 L45688.0 2619.6 " fill="none"></path>
+					<path d="M61607.2 1739.1 L61604.9 1734.3 L61602.6 1729.5 L61616.9 1728.5 Z"></path>
+					<path d="M45564.5 2669.3 L45564.5 3314 L50428.5 3495.554288001601 L50428.5 3495.6 " fill="none"></path>
+					<path d="M45569.8 2669.3 L45564.5 2669.3 L45559.2 2669.3 L45564.5 2656.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M70236.1 1261.6 L70084.5 1459 L70084.5 1697.5 L70084.5 1697.5 L70084.5 1936 L70084.5 1936 L70084.5 2625 L70084.5 2625 L70084.5 3314 L70084.5 3314 L56149.5 3495.295953958842 L56149.5 3495.3 " fill="none"></path>
+						<path d="M59600.0 2669.1 L59724 3314 L50693.5 3497.8031485321403 L50693.5 3497.8 " fill="none"></path>
 					</g>
-					<path d="M70240.3 1264.8 L70236.1 1261.6 L70231.8 1258.3 L70244.2 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M80298.2 1704.2 L76752 1936 L76752 2625 L76752 2625 L76752 3314 L76752 3314 L56149.5 3496.9480418997737 L56149.5 3496.9 " fill="none"></path>
+					<path d="M59605.2 2668.1 L59600.0 2669.1 L59594.7 2670.1 L59597.5 2656.0 Z"></path>
+					<path d="M61610.3 1734.7 L61226.5 1936 L44979.5 2620.09466189996 L44979.5 2620.1 " fill="none"></path>
+					<path d="M61612.8 1739.4 L61610.3 1734.7 L61607.9 1730.0 L61622.1 1728.5 Z"></path>
+					<path d="M44863.0 2669.3 L44863 3314 L44863 3469.5 L44863.0 3469.5 " fill="none"></path>
+					<path d="M44868.3 2669.3 L44863.0 2669.3 L44857.7 2669.3 L44863.0 2656.0 Z"></path>
+					<path d="M61711.9 1739.2 L61856.25 1936 L61856.25 2594 L61856.3 2594.0 " fill="none"></path>
+					<path d="M61716.2 1736.1 L61711.9 1739.2 L61707.6 1742.4 L61704.0 1728.5 Z"></path>
+					<path d="M39065.0 679.2 L39065 966 L39065 1197 L39065.0 1197.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M39070.3 669.8 L39065.0 679.2 L39059.7 669.8 L39065.0 660.5 Z"></path>
 					</g>
-					<path d="M80298.5 1709.5 L80298.2 1704.2 L80297.8 1698.9 L80311.5 1703.3 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M6033.9 1256.5 L5989.75 1459 L5989.75 1697.5 L5989.75 1697.5 L5989.75 1936 L5989.75 1936 L5989.75 2625 L5989.75 2625 L5989.75 3314 L5989.75 3314 L55349.5 3499.000796326348 L55349.5 3499.0 " fill="none"></path>
+					<path d="M39065.0 165.3 L39065 293 L39065 598.5 L39065.0 598.5 " fill="none"></path>
+					<path d="M39070.3 165.3 L39065.0 165.3 L39059.7 165.3 L39065.0 152.0 Z"></path>
+					<path d="M39607.1 161.6 L39480.75 293 L39480.75 598.5 L39480.8 598.5 " fill="none"></path>
+					<path d="M39610.9 165.3 L39607.1 161.6 L39603.3 157.9 L39616.3 152.0 Z"></path>
+					<path d="M39660.5 160.5 L39822.25 293 L39822.25 598.5 L39822.3 598.5 " fill="none"></path>
+					<path d="M39663.9 156.3 L39660.5 160.5 L39657.1 164.6 L39650.2 152.0 Z"></path>
+					<path d="M39914.8 1747.2 L39914.75 1936 L37633 2592.3514246947084 L37633.0 2592.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M39920.1 1737.8 L39914.8 1747.2 L39909.4 1737.8 L39914.8 1728.5 Z"></path>
 					</g>
-					<path d="M6039.1 1257.7 L6033.9 1256.5 L6028.7 1255.4 L6036.7 1243.5 Z"></path>
-					<path d="M31322.6 2771.3 L31104 3314 L54242.75 3500.045715178754 L54242.8 3500.0 " fill="none"></path>
+					<path d="M39914.8 1241.3 L39914.75 1459 L39914.75 1666.5 L39914.8 1666.5 " fill="none"></path>
+					<path d="M39920.1 1241.3 L39914.8 1241.3 L39909.4 1241.3 L39914.8 1228.0 Z"></path>
+					<path d="M40151.1 885.5 L40065.25 966 L40065.25 1197 L40065.3 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31331.0 2764.7 L31322.6 2771.3 L31321.1 2760.7 L31329.5 2754.0 Z"></path>
+						<path d="M40161.6 883.0 L40151.1 885.5 L40154.3 875.2 L40164.8 872.7 Z"></path>
 					</g>
-					<path d="M31418.6 2772.1 L31555.5 3314 L58691.5 3500.139875314931 L58691.5 3500.1 " fill="none"></path>
+					<path d="M40253.8 917.1 L40224.75 966 L40224.75 1197 L40224.8 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31421.5 2761.7 L31418.6 2772.1 L31411.2 2764.4 L31414.1 2754.0 Z"></path>
+						<path d="M40263.1 911.7 L40253.8 917.1 L40253.9 906.3 L40263.3 901.0 Z"></path>
 					</g>
-					<path d="M68216.3 1738.9 L68056.75 1936 L31729.5 2618.462294053892 L31729.5 2618.5 " fill="none"></path>
-					<path d="M68220.4 1742.2 L68216.3 1738.9 L68212.1 1735.5 L68224.7 1728.5 Z"></path>
-					<path d="M11003.0 1747.2 L11003 1936 L31033.5 2613.2340702210663 L31033.5 2613.2 " fill="none"></path>
+					<path d="M40700.7 756.2 L41158.5 966 L41158.5 1197 L41158.5 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11008.3 1737.8 L11003.0 1747.2 L10997.7 1737.8 L11003.0 1728.5 Z"></path>
+						<path d="M40694.5 747.5 L40700.7 756.2 L40690.0 757.2 L40683.8 748.4 Z"></path>
 					</g>
-					<path d="M28794.6 2727.4 L28698 3314 L13287 3499.812742435997 L13287.0 3499.8 " fill="none"></path>
+					<path d="M40701.3 729.4 L41357.5 966 L41357.5 1197 L41357.5 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28801.4 2719.1 L28794.6 2727.4 L28790.9 2717.3 L28797.7 2709.0 Z"></path>
+						<path d="M40694.3 721.2 L40701.3 729.4 L40690.7 731.3 L40683.8 723.1 Z"></path>
 					</g>
-					<path d="M28828.4 2727.4 L28925 3314 L53266.75 3499.1008175081292 L53266.8 3499.1 " fill="none"></path>
+					<path d="M40424.3 165.3 L40424.25 293 L40424.25 358 L40424.3 358.0 " fill="none"></path>
+					<path d="M40429.6 165.3 L40424.3 165.3 L40418.9 165.3 L40424.3 152.0 Z"></path>
+					<path d="M37508.1 2681.8 L37381 3314 L21597.75 3500.1579550664833 L21597.8 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28832.1 2717.3 L28828.4 2727.4 L28821.6 2719.1 L28825.3 2709.0 Z"></path>
+						<path d="M37515.2 2673.7 L37508.1 2681.8 L37504.7 2671.6 L37511.8 2663.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M32358.4 1703.1 L28811.5 1936 L28811.5 2541 L28811.5 2541.0 " fill="none"></path>
+					<path d="M37542.4 2680.8 L37803 3314 L37803 3485 L37803.0 3485.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M37543.8 2670.1 L37542.4 2680.8 L37534.0 2674.2 L37535.3 2663.5 Z"></path>
 					</g>
-					<path d="M32358.8 1708.4 L32358.4 1703.1 L32358.1 1697.7 L32371.8 1702.2 Z"></path>
-					<path d="M22477.9 2665.7 L21867.75 3314 L25082 3492.2906164027067 L25082.0 3492.3 " fill="none"></path>
-					<path d="M22481.8 2669.4 L22477.9 2665.7 L22474.1 2662.1 L22487.1 2656.0 Z"></path>
-					<path d="M69550.1 2831.5 L69375.25 3314 L64748 3499.278755837046 L64748.0 3499.3 " fill="none"></path>
+					<path d="M24548.8 2705.2 L24548.75 3314 L21597.75 3498.685067114094 L21597.8 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69558.3 2824.6 L69550.1 2831.5 L69548.3 2821.0 L69556.5 2814.0 Z"></path>
+						<path d="M24554.1 2695.8 L24548.8 2705.2 L24543.4 2695.8 L24548.8 2686.5 Z"></path>
 					</g>
-					<path d="M69562.0 2831.9 L69415.25 3314 L59452 3499.6428928241376 L59452.0 3499.6 " fill="none"></path>
+					<path d="M16795.7 3926.0 L16724.5 4000 L62172 4133.786577328647 L62172.0 4133.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69569.8 2824.5 L69562.0 2831.9 L69559.6 2821.4 L69567.5 2814.0 Z"></path>
+						<path d="M16806.0 3922.9 L16795.7 3926.0 L16798.3 3915.5 L16808.6 3912.5 Z"></path>
 					</g>
-					<path d="M69625.0 2832.7 L69625 3314 L69625 3500.5 L69625 3500.5 L69625 3687 L69625 3687 L69625 3843.5 L69625 3843.5 L69625 4000 L69625 4000 L58865 4133.392543250994 L58865.0 4133.4 " fill="none"></path>
+					<path d="M16974.5 3924.3 L17067.75 4000 L14886.5 4129.574420924305 L14886.5 4129.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69630.3 2823.3 L69625.0 2832.7 L69619.7 2823.3 L69625.0 2814.0 Z"></path>
+						<path d="M16970.6 3914.2 L16974.5 3924.3 L16963.9 3922.5 L16960.0 3912.5 Z"></path>
 					</g>
-					<path d="M69731.0 2830.6 L69980.25 3314 L69980.25 3500.5 L69980.25 3500.5 L69980.25 3687 L69980.25 3687 L57389.25 3841.7729254211995 L57389.3 3841.8 " fill="none"></path>
+					<path d="M40870.3 165.3 L40870.25 293 L40870.25 583.5 L40870.3 583.5 " fill="none"></path>
+					<path d="M40875.6 165.3 L40870.3 165.3 L40864.9 165.3 L40870.3 152.0 Z"></path>
+					<path d="M41205.3 165.3 L41205.25 293 L41205.25 583.5 L41205.3 583.5 " fill="none"></path>
+					<path d="M41210.6 165.3 L41205.3 165.3 L41199.9 165.3 L41205.3 152.0 Z"></path>
+					<path d="M24746.8 2712.2 L24746.75 3314 L25696 3492.328003021909 L25696.0 3492.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69731.5 2819.9 L69731.0 2830.6 L69722.0 2824.7 L69722.4 2814.0 Z"></path>
+						<path d="M24752.1 2702.8 L24746.8 2712.2 L24741.4 2702.8 L24746.8 2693.5 Z"></path>
 					</g>
-					<path d="M69742.7 2830.2 L70020.25 3314 L58796.5 3499.6316927169937 L58796.5 3499.6 " fill="none"></path>
+					<path d="M83574.0 171.4 L83182 293 L83182 629.5 L83182 629.5 L83182 966 L83182 966 L83182 1174 L83182.0 1174.0 " fill="none"></path>
+					<path d="M83575.6 176.5 L83574.0 171.4 L83572.5 166.4 L83586.8 167.5 Z"></path>
+					<path d="M867.2 3422.4 L880 3417 L887.5 3417 L887.5 3417 L895 3500.5 L895 3500.5 L887.5 3584 L887.5 3584 L880 3584 L880 3584 L850 3571.284263959391 L850.0 3571.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69742.7 2819.4 L69742.7 2830.2 L69733.4 2824.7 L69733.4 2814.0 Z"></path>
+						<path d="M856.5 3421.2 L867.2 3422.4 L860.7 3431.0 L850.0 3429.7 Z"></path>
 					</g>
-					<path d="M72144.3 954.9 L72156.5 966 L72156.5 1212.5 L72156.5 1212.5 L72156.5 1459 L72156.5 1459 L72156.5 1697.5 L72156.5 1697.5 L72156.5 1936 L72156.5 1936 L70044.5 2510.8244124037133 L70044.5 2510.8 " fill="none"></path>
-					<path d="M72147.8 951.0 L72144.3 954.9 L72140.7 958.9 L72134.4 946.0 Z"></path>
-					<path d="M82942.8 1904.0 L82914.75 1936 L70044.5 2603.2512462612162 L70044.5 2603.3 " fill="none"></path>
-					<path d="M82946.9 1907.5 L82942.8 1904.0 L82938.8 1900.5 L82951.6 1894.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M70243.5 1262.4 L70124.5 1459 L70124.5 1697.5 L70124.5 1697.5 L70124.5 1936 L70124.5 1936 L69762.01814223512 2436 L69762.0 2436.0 " fill="none"></path>
+						<path d="M3106.0 2653.8 L3123.25 3314 L850 3487.7367585288393 L850.0 3487.7 " fill="none"></path>
 					</g>
-					<path d="M70248.1 1265.2 L70243.5 1262.4 L70239.0 1259.6 L70250.4 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M80298.2 1704.3 L76792 1936 L70044.5 2584.6713408678665 L70044.5 2584.7 " fill="none"></path>
+					<path d="M3111.3 2653.7 L3106.0 2653.8 L3100.7 2654.0 L3105.7 2640.5 Z"></path>
+					<path d="M17301.6 3941.9 L17178.5 4000 L15060.5 4129.8910755148745 L15060.5 4129.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M17312.3 3942.7 L17301.6 3941.9 L17307.8 3933.1 L17318.5 3933.9 Z"></path>
 					</g>
-					<path d="M80298.5 1709.6 L80298.2 1704.3 L80297.8 1699.0 L80311.5 1703.4 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M6041.0 1256.8 L6029.75 1459 L6029.75 1697.5 L6029.75 1697.5 L6029.75 1936 L6029.75 1936 L69205.5 2620.45507722668 L69205.5 2620.5 " fill="none"></path>
+					<path d="M17302.1 3955.1 L17218.5 4000 L6898 4132.924548250673 L6898.0 4132.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M17312.8 3955.4 L17302.1 3955.1 L17307.8 3946.0 L17318.5 3946.3 Z"></path>
 					</g>
-					<path d="M6046.4 1257.1 L6041.0 1256.8 L6035.7 1256.5 L6041.8 1243.5 Z"></path>
-					<path d="M42045.4 2873.1 L41661.75 3314 L64687 3500.253282803639 L64687.0 3500.3 " fill="none"></path>
+					<path d="M17719.5 3901.4 L18076.25 4000 L18317.671641791047 4118.5 L18317.7 4118.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42055.5 2869.5 L42045.4 2873.1 L42047.5 2862.5 L42057.6 2859.0 Z"></path>
+						<path d="M17711.9 3893.8 L17719.5 3901.4 L17709.1 3904.1 L17701.5 3896.4 Z"></path>
 					</g>
-					<path d="M42059.5 2873.5 L41701.75 3314 L54242.75 3499.6635443540385 L54242.8 3499.7 " fill="none"></path>
+					<path d="M17719.6 3897.6 L18116.25 4000 L15404.5 4126.887647315582 L15404.5 4126.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42069.5 2869.6 L42059.5 2873.5 L42061.2 2862.9 L42071.2 2859.0 Z"></path>
+						<path d="M17711.9 3890.1 L17719.6 3897.6 L17709.2 3900.4 L17701.5 3892.9 Z"></path>
 					</g>
-					<path d="M42186.8 2876.9 L42057.75 3314 L42057.75 3500.5 L42057.75 3500.5 L42057.75 3687 L42057.75 3687 L42057.75 3843.5 L42057.75 3843.5 L42057.75 4000 L42057.75 4000 L58767 4133.608192979577 L58767.0 4133.6 " fill="none"></path>
+					<path d="M41539.5 193.7 L41474.75 293 L41474.75 598.5 L41474.8 598.5 " fill="none"></path>
+					<path d="M41544.0 196.6 L41539.5 193.7 L41535.0 190.8 L41546.8 182.5 Z"></path>
+					<path d="M41614.0 193.7 L41678.75 293 L41678.75 598.5 L41678.8 598.5 " fill="none"></path>
+					<path d="M41618.5 190.8 L41614.0 193.7 L41609.5 196.6 L41606.7 182.5 Z"></path>
+					<path d="M18329.5 3911.2 L18247.25 4000 L15504.5 4132.550175818231 L15504.5 4132.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42194.6 2869.5 L42186.8 2876.9 L42184.4 2866.4 L42192.1 2859.0 Z"></path>
+						<path d="M18339.8 3908.0 L18329.5 3911.2 L18332.0 3900.7 L18342.2 3897.5 Z"></path>
 					</g>
-					<path d="M42506.4 2872.3 L42944.5 3314 L42944.5 3500.5 L42944.5 3500.5 L42944.5 3687 L42944.5 3687 L57108.25 3841.962816994949 L57108.3 3842.0 " fill="none"></path>
+					<path d="M60478.8 4214.2 L60478.75 4268 L65854.25 4451.378589720139 L65854.3 4451.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42503.7 2861.9 L42506.4 2872.3 L42496.1 2869.4 L42493.3 2859.0 Z"></path>
+						<path d="M60484.1 4204.8 L60478.8 4214.2 L60473.4 4204.8 L60478.8 4195.5 Z"></path>
 					</g>
-					<path d="M42520.4 2871.9 L42984.5 3314 L58691.5 3499.87870808084 L58691.5 3499.9 " fill="none"></path>
+					<path d="M18382.4 3910.7 L18369.25 4000 L60210.75 4133.147175815434 L60210.8 4133.1 " fill="none"></path>
+					<path d="M18387.7 3911.5 L18382.4 3910.7 L18377.1 3909.9 L18384.3 3897.5 Z"></path>
+					<path d="M18442.5 3908.0 L18514.25 4000 L40095 4133.579098100352 L40095.0 4133.6 " fill="none"></path>
+					<path d="M18446.7 3904.7 L18442.5 3908.0 L18438.3 3911.3 L18434.3 3897.5 Z"></path>
+					<path d="M21568.8 3529.3 L21568.75 3687 L21568.75 3805 L21568.8 3805.0 " fill="none"></path>
+					<path d="M21574.1 3529.3 L21568.8 3529.3 L21563.4 3529.3 L21568.8 3516.0 Z"></path>
+					<path d="M42019.3 165.3 L42019.25 293 L42019.25 583 L42019.3 583.0 " fill="none"></path>
+					<path d="M42024.6 165.3 L42019.3 165.3 L42013.9 165.3 L42019.3 152.0 Z"></path>
+					<path d="M42468.3 724.7 L42468.25 966 L42468.25 1197 L42468.3 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42517.3 2861.6 L42520.4 2871.9 L42510.0 2869.3 L42506.9 2859.0 Z"></path>
+						<path d="M42473.6 715.3 L42468.3 724.7 L42462.9 715.3 L42468.3 706.0 Z"></path>
 					</g>
-					<path d="M68222.7 1739.7 L68096.75 1936 L42688.75 2613.5991174933715 L42688.8 2613.6 " fill="none"></path>
-					<path d="M68227.2 1742.6 L68222.7 1739.7 L68218.2 1736.8 L68229.9 1728.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M70251.3 1263.2 L70164.5 1459 L70164.5 1697.5 L70164.5 1697.5 L70164.5 1936 L70164.5 1936 L42688.75 2614.4439715803715 L42688.8 2614.4 " fill="none"></path>
+					<path d="M42468.3 165.3 L42468.25 293 L42468.25 553 L42468.3 553.0 " fill="none"></path>
+					<path d="M42473.6 165.3 L42468.3 165.3 L42462.9 165.3 L42468.3 152.0 Z"></path>
+					<path d="M43431.5 160.8 L43282.5 293 L43282.5 575.5 L43282.5 575.5 " fill="none"></path>
+					<path d="M43435.1 164.8 L43431.5 160.8 L43428.0 156.9 L43441.5 152.0 Z"></path>
+					<path d="M43486.5 160.8 L43635.5 293 L43635.5 598.5 L43635.5 598.5 " fill="none"></path>
+					<path d="M43490.0 156.9 L43486.5 160.8 L43482.9 164.8 L43476.5 152.0 Z"></path>
+					<path d="M22700.3 1724.8 L22591 1936 L22591 2541 L22591.0 2541.0 " fill="none"></path>
+					<path d="M22705.1 1727.3 L22700.3 1724.8 L22695.6 1722.4 L22706.5 1713.0 Z"></path>
+					<path d="M33529.7 1703.9 L30085.75 1936 L29013.75435413643 2594 L29013.8 2594.0 " fill="none"></path>
+					<path d="M33530.1 1709.2 L33529.7 1703.9 L33529.3 1698.6 L33543.0 1703.0 Z"></path>
+					<path d="M11816.5 2690.2 L11816.5 3314 L14634.5 3489.4488399265565 L14634.5 3489.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M11821.8 2680.8 L11816.5 2690.2 L11811.2 2680.8 L11816.5 2671.5 Z"></path>
 					</g>
-					<path d="M70256.2 1265.4 L70251.3 1263.2 L70246.4 1261.0 L70256.7 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M80298.2 1704.4 L76832 1936 L42688.75 2616.4798637576564 L42688.8 2616.5 " fill="none"></path>
+					<path d="M13472.3 1714.0 L11816.5 1936 L11816.5 2578.5 L11816.5 2578.5 " fill="none"></path>
+					<path d="M13473.0 1719.2 L13472.3 1714.0 L13471.6 1708.7 L13485.5 1712.2 Z"></path>
+					<path d="M12571.3 2690.2 L12571.25 3314 L14634.5 3485.7264866674104 L14634.5 3485.7 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M12576.6 2680.8 L12571.3 2690.2 L12565.9 2680.8 L12571.3 2671.5 Z"></path>
 					</g>
-					<path d="M80298.6 1709.7 L80298.2 1704.4 L80297.8 1699.0 L80311.5 1703.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M6048.2 1256.8 L6069.75 1459 L6069.75 1697.5 L6069.75 1697.5 L6069.75 1936 L6069.75 1936 L41833.75 2616.8614177362088 L41833.8 2616.9 " fill="none"></path>
+					<path d="M13472.5 1726.0 L12571.25 1936 L12571.25 2578.5 L12571.3 2578.5 " fill="none"></path>
+					<path d="M13473.7 1731.2 L13472.5 1726.0 L13471.3 1720.8 L13485.5 1723.0 Z"></path>
+					<path d="M13528.5 2690.2 L13528.5 3314 L14634.5 3474.7082197117256 L14634.5 3474.7 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M13533.8 2680.8 L13528.5 2690.2 L13523.2 2680.8 L13528.5 2671.5 Z"></path>
 					</g>
-					<path d="M6053.5 1256.2 L6048.2 1256.8 L6042.9 1257.3 L6046.8 1243.5 Z"></path>
-					<path d="M58352.5 1767.2 L57962 1936 L57962 2541 L57962.0 2541.0 " fill="none"></path>
-					<path d="M58354.6 1772.1 L58352.5 1767.2 L58350.4 1762.3 L58364.8 1761.9 Z"></path>
-					<path d="M29359.5 3618.2 L29359.5 3687 L62577.5 3843.1568291730496 L62577.5 3843.2 " fill="none"></path>
+					<path d="M13582.8 1741.3 L13528.5 1936 L13528.5 2578.5 L13528.5 2578.5 " fill="none"></path>
+					<path d="M13587.9 1742.8 L13582.8 1741.3 L13577.6 1739.9 L13586.4 1728.5 Z"></path>
+					<path d="M18497.3 2705.2 L18497.25 3314 L14989.5 3491.5172308527235 L14989.5 3491.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29364.8 3608.8 L29359.5 3618.2 L29354.2 3608.8 L29359.5 3599.5 Z"></path>
+						<path d="M18502.6 2695.8 L18497.3 2705.2 L18491.9 2695.8 L18497.3 2686.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M32358.5 1703.5 L29078.5 1936 L29078.5 2625 L29078.5 2625 L29078.5 3314 L29078.5 3314 L29211.5 3402.2722419928828 L29211.5 3402.3 " fill="none"></path>
+					<path d="M13717.8 1703.5 L18497.25 1936 L18497.25 2563.5 L18497.3 2563.5 " fill="none"></path>
+					<path d="M13718.1 1698.1 L13717.8 1703.5 L13717.6 1708.8 L13704.5 1702.8 Z"></path>
+					<path d="M29431.8 2694.1 L28149.5 3314 L21499.75 3499.509648105905 L21499.8 3499.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M29442.5 2694.9 L29431.8 2694.1 L29437.8 2685.3 L29448.6 2686.0 Z"></path>
 					</g>
-					<path d="M32358.8 1708.8 L32358.5 1703.5 L32358.1 1698.2 L32371.8 1702.6 Z"></path>
-					<path d="M16683.8 1762.7 L16683.75 1936 L16683.75 2594 L16683.8 2594.0 " fill="none"></path>
+					<path d="M29435.4 2694.3 L28189.5 3314 L14989.5 3498.025415810129 L14989.5 3498.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16689.1 1753.3 L16683.8 1762.7 L16678.4 1753.3 L16683.8 1744.0 Z"></path>
+						<path d="M29446.1 2694.9 L29435.4 2694.3 L29441.4 2685.4 L29452.1 2686.0 Z"></path>
 					</g>
-					<path d="M22965.0 1220.6 L20332.75 1459 L16848.75 1686.7155385036997 L16848.8 1686.7 " fill="none"></path>
-					<path d="M22965.5 1225.9 L22965.0 1220.6 L22964.5 1215.3 L22978.3 1219.4 Z"></path>
-					<path d="M64271.5 2778.2 L64002 3314 L54355.75 3499.4139934554637 L54355.8 3499.4 " fill="none"></path>
+					<path d="M29591.4 2704.3 L29719.75 3314 L13203.75 3499.9090442707547 L13203.8 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64280.4 2772.2 L64271.5 2778.2 L64270.9 2767.4 L64279.9 2761.5 Z"></path>
+						<path d="M29594.7 2694.0 L29591.4 2704.3 L29584.3 2696.2 L29587.6 2686.0 Z"></path>
 					</g>
-					<path d="M64421.7 2778.3 L64677.5 3314 L58796.5 3498.849835678773 L58796.5 3498.8 " fill="none"></path>
+					<path d="M29904.8 2697.2 L29904.75 3314 L59258.25 3500.14171200272 L59258.3 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64422.5 2767.6 L64421.7 2778.3 L64412.9 2772.2 L64413.7 2761.5 Z"></path>
+						<path d="M29910.1 2687.8 L29904.8 2697.2 L29899.4 2687.8 L29904.8 2678.5 Z"></path>
 					</g>
-					<path d="M68229.4 1740.5 L68136.75 1936 L64696.5 2561.7063947733122 L64696.5 2561.7 " fill="none"></path>
-					<path d="M68234.2 1742.8 L68229.4 1740.5 L68224.5 1738.3 L68235.1 1728.5 Z"></path>
-					<path d="M83581.2 1857.1 L83477.5 1936 L64696.5 2612.4655235506298 L64696.5 2612.5 " fill="none"></path>
-					<path d="M83584.4 1861.3 L83581.2 1857.1 L83577.9 1852.8 L83591.8 1849.0 Z"></path>
-					<path d="M29315.5 2712.7 L29315.5 3314 L29336.143431635388 3401.5 L29336.1 3401.5 " fill="none"></path>
+					<path d="M30321.8 2703.9 L30144.75 3314 L30144.75 3485 L30144.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29320.8 2703.3 L29315.5 2712.7 L29310.2 2703.3 L29315.5 2694.0 Z"></path>
+						<path d="M30329.6 2696.5 L30321.8 2703.9 L30319.3 2693.5 L30327.0 2686.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M32358.5 1704.0 L29315.5 1936 L29315.5 2556 L29315.5 2556.0 " fill="none"></path>
+					<path d="M30361.5 2704.3 L30490.5 3314 L59258.25 3500.1344310779987 L59258.3 3500.1 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M30364.8 2694.0 L30361.5 2704.3 L30354.4 2696.2 L30357.7 2686.0 Z"></path>
+					</g>
+					<path d="M43527.9 2893.9 L43052.75 3314 L43052.75 3500.5 L43052.75 3500.5 L43052.75 3687 L43052.75 3687 L43052.75 3843.5 L43052.75 3843.5 L43052.75 4000 L43052.75 4000 L72971.75 4133.342623850464 L72971.8 4133.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M43538.4 2891.7 L43527.9 2893.9 L43531.4 2883.7 L43541.9 2881.5 Z"></path>
 					</g>
-					<path d="M32358.9 1709.3 L32358.5 1704.0 L32358.0 1698.6 L32371.8 1703.0 Z"></path>
-					<path d="M15728.8 1747.2 L15728.75 1936 L41833.75 2613.898614906247 L41833.8 2613.9 " fill="none"></path>
+					<path d="M43543.1 2894.2 L43092.75 3314 L60183.25 3498.3694036325774 L60183.3 3498.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15734.1 1737.8 L15728.8 1747.2 L15723.4 1737.8 L15728.8 1728.5 Z"></path>
+						<path d="M43553.6 2891.8 L43543.1 2894.2 L43546.3 2884.0 L43556.8 2881.5 Z"></path>
 					</g>
-					<path d="M83124.3 1912.7 L83124.25 1936 L83124.25 2625 L83124.25 2625 L83124.25 3314 L83124.25 3314 L83124.25 3500.5 L83124.25 3500.5 L83124.25 3687 L83124.25 3687 L62723.5 3842.941992795653 L62723.5 3842.9 " fill="none"></path>
+					<path d="M43558.4 2894.6 L43132.75 3314 L64028.25 3500.09033498078 L64028.3 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M83129.6 1903.3 L83124.3 1912.7 L83118.9 1903.3 L83124.3 1894.0 Z"></path>
+						<path d="M43568.8 2891.8 L43558.4 2894.6 L43561.3 2884.3 L43571.7 2881.5 Z"></path>
 					</g>
-					<path d="M83397.2 1905.3 L83437.5 1936 L83437.5 2625 L83437.5 2625 L83437.5 3314 L83437.5 3314 L54355.75 3500.138370526713 L54355.8 3500.1 " fill="none"></path>
+					<path d="M43635.8 2896.6 L43334.25 3314 L59258.25 3499.8406182534964 L59258.3 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M83393.0 1895.4 L83397.2 1905.3 L83386.5 1903.9 L83382.3 1894.0 Z"></path>
+						<path d="M43645.6 2892.2 L43635.8 2896.6 L43636.9 2885.9 L43646.7 2881.5 Z"></path>
 					</g>
-					<path d="M16162.8 1747.2 L16162.75 1936 L64000.5 2620.024006059883 L64000.5 2620.0 " fill="none"></path>
+					<path d="M43651.3 2897.0 L43374.25 3314 L61341.25 3499.9566303171564 L61341.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16168.1 1737.8 L16162.8 1747.2 L16157.4 1737.8 L16162.8 1728.5 Z"></path>
+						<path d="M43660.9 2892.2 L43651.3 2897.0 L43652.0 2886.3 L43661.6 2881.5 Z"></path>
 					</g>
-					<path d="M34048.9 1217.9 L29831 1459 L29831 1598.5 L29831.0 1598.5 " fill="none"></path>
-					<path d="M34049.2 1223.2 L34048.9 1217.9 L34048.6 1212.6 L34062.3 1217.2 Z"></path>
-					<path d="M83124.3 1285.2 L83124.25 1459 L83124.25 1501 L83124.3 1501.0 " fill="none"></path>
+					<path d="M43916.6 2899.3 L44044.5 3314 L14989.5 3499.36757034123 L14989.5 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M83129.6 1275.8 L83124.3 1285.2 L83118.9 1275.8 L83124.3 1266.5 Z"></path>
+						<path d="M43919.0 2888.8 L43916.6 2899.3 L43908.8 2892.0 L43911.1 2881.5 Z"></path>
 					</g>
-					<path d="M83694.8 161.6 L83124.25 293 L83124.25 629.5 L83124.25 629.5 L83124.25 966 L83124.25 966 L83124.25 1158.5 L83124.3 1158.5 " fill="none"></path>
-					<path d="M83696.0 166.8 L83694.8 161.6 L83693.6 156.4 L83707.8 158.6 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M34049.1 1226.2 L32443.25 1459 L32443.25 1666.5 L32443.3 1666.5 " fill="none"></path>
+						<path d="M47006.2 141.6 L43832 293 L43832 629.5 L43832 629.5 L43832 966 L43832 966 L43832 1212.5 L43832 1212.5 L43832 1459 L43832 1459 L43832 1697.5 L43832 1697.5 L43832 1936 L43832 1936 L43832 2368.5 L43832.0 2368.5 " fill="none"></path>
 					</g>
-					<path d="M34049.8 1231.5 L34049.1 1226.2 L34048.3 1220.9 L34062.3 1224.3 Z"></path>
-					<path d="M30786.5 2727.7 L30786.5 3314 L29895.5 3470.029577464789 L29895.5 3470.0 " fill="none"></path>
+					<path d="M47006.4 146.9 L47006.2 141.6 L47005.9 136.3 L47019.5 141.0 Z"></path>
+					<path d="M15006.8 3422.1 L15019.5 3417 L15027 3417 L15027 3417 L15034.5 3500.5 L15034.5 3500.5 L15027 3584 L15027 3584 L15019.5 3584 L15019.5 3584 L14989.5 3571.9277108433735 L14989.5 3571.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30791.8 2718.3 L30786.5 2727.7 L30781.2 2718.3 L30786.5 2709.0 Z"></path>
+						<path d="M14996.2 3420.6 L15006.8 3422.1 L15000.1 3430.5 L14989.5 3429.1 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M32358.6 1709.7 L30786.5 1936 L30786.5 2541 L30786.5 2541.0 " fill="none"></path>
+						<path d="M3114.1 2653.2 L3321.5 3314 L14634.5 3497.6190331143116 L14634.5 3497.6 " fill="none"></path>
+					</g>
+					<path d="M3119.2 2651.6 L3114.1 2653.2 L3109.0 2654.8 L3110.1 2640.5 Z"></path>
+					<path d="M1236.8 3450.9 L1249 3447 L1256.5 3447 L1256.5 3447 L1264 3500.5 L1264 3500.5 L1256.5 3554 L1256.5 3554 L1249 3554 L1249 3554 L1219 3544.5309734513276 L1219.0 3544.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1226.3 3448.6 L1236.8 3450.9 L1229.5 3458.7 L1219.0 3456.5 Z"></path>
 					</g>
-					<path d="M32359.3 1715.0 L32358.6 1709.7 L32357.8 1704.4 L32371.8 1707.8 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M32359.2 1727.3 L31769.5 1936 L31769.5 2625 L31769.5 2625 L31769.5 3314 L31769.5 3314 L29895.5 3484.65478515625 L29895.5 3484.7 " fill="none"></path>
+						<path d="M3115.7 2653.0 L3361.5 3314 L1219 3489.0991454864156 L1219.0 3489.1 " fill="none"></path>
 					</g>
-					<path d="M32361.0 1732.3 L32359.2 1727.3 L32357.4 1722.2 L32371.8 1722.8 Z"></path>
-					<path d="M22494.5 2667.9 L22167.25 3314 L25418 3494.315227897985 L25418.0 3494.3 " fill="none"></path>
-					<path d="M22499.3 2670.3 L22494.5 2667.9 L22489.8 2665.5 L22500.5 2656.0 Z"></path>
-					<path d="M72631.4 2884.5 L72510.5 3314 L64748 3499.770082124984 L64748.0 3499.8 " fill="none"></path>
+					<path d="M3120.7 2651.1 L3115.7 2653.0 L3110.7 2654.9 L3111.0 2640.5 Z"></path>
+					<path d="M31074.8 2833.8 L30530.5 3314 L24068.25 3498.5297033492825 L24068.3 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72639.1 2876.9 L72631.4 2884.5 L72628.8 2874.0 L72636.5 2866.5 Z"></path>
+						<path d="M31085.3 2831.7 L31074.8 2833.8 L31078.2 2823.7 L31088.8 2821.5 Z"></path>
 					</g>
-					<path d="M72704.5 2885.2 L72704.5 3314 L54355.75 3499.9274867225386 L54355.8 3499.9 " fill="none"></path>
+					<path d="M31086.5 2834.2 L30570.5 3314 L25656 3497.807129248972 L25656.0 3497.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72709.8 2875.8 L72704.5 2885.2 L72699.2 2875.8 L72704.5 2866.5 Z"></path>
+						<path d="M31097.0 2831.8 L31086.5 2834.2 L31089.7 2823.9 L31100.2 2821.5 Z"></path>
 					</g>
-					<path d="M72777.6 2884.5 L72898.5 3314 L58796.5 3499.808258857607 L58796.5 3499.8 " fill="none"></path>
+					<path d="M31098.3 2834.6 L30610.5 3314 L30610.5 3485 L30610.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72780.2 2874.0 L72777.6 2884.5 L72769.9 2876.9 L72772.5 2866.5 Z"></path>
+						<path d="M31108.7 2831.8 L31098.3 2834.6 L31101.2 2824.2 L31111.6 2821.5 Z"></path>
 					</g>
-					<path d="M72233.0 726.9 L73335.25 966 L73335.25 1212.5 L73335.25 1212.5 L73335.25 1459 L73335.25 1459 L73335.25 1697.5 L73335.25 1697.5 L73335.25 1936 L73335.25 1936 L72925.58291001452 2383.5 L72925.6 2383.5 " fill="none"></path>
-					<path d="M72234.2 721.7 L72233.0 726.9 L72231.9 732.1 L72220.0 724.1 Z"></path>
-					<path d="M58351.5 2742.7 L58351.5 3314 L53634.75 3493.497806458195 L53634.8 3493.5 " fill="none"></path>
+					<path d="M31165.3 2836.9 L30836 3314 L30836 3500.5 L30836 3500.5 L30836 3687 L30836 3687 L30836 3843.5 L30836 3843.5 L30836 4000 L30836 4000 L18421.25 4133.227340981441 L18421.3 4133.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58356.8 2733.3 L58351.5 2742.7 L58346.2 2733.3 L58351.5 2724.0 Z"></path>
+						<path d="M31175.0 2832.2 L31165.3 2836.9 L31166.2 2826.2 L31175.9 2821.5 Z"></path>
 					</g>
-					<path d="M58449.1 1792.5 L58351.5 1936 L58351.5 2526 L58351.5 2526.0 " fill="none"></path>
-					<path d="M58453.5 1795.5 L58449.1 1792.5 L58444.7 1789.5 L58456.6 1781.5 Z"></path>
-					<path d="M17110.8 1747.2 L17110.75 1936 L57081 2619.0530156938853 L57081.0 2619.1 " fill="none"></path>
+					<path d="M31201.1 2838.1 L30954.5 3314 L30954.5 3485 L30954.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17116.1 1737.8 L17110.8 1747.2 L17105.4 1737.8 L17110.8 1728.5 Z"></path>
+						<path d="M31210.1 2832.2 L31201.1 2838.1 L31200.7 2827.3 L31209.7 2821.5 Z"></path>
 					</g>
-					<path d="M57364.4 2854.5 L57235 3314 L64687 3499.739792849983 L64687.0 3499.7 " fill="none"></path>
+					<path d="M31313.8 2840.2 L31319 3314 L25783 3499.045971861278 L25783.0 3499.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57372.1 2846.9 L57364.4 2854.5 L57361.8 2844.0 L57369.4 2836.5 Z"></path>
+						<path d="M31319.1 2830.8 L31313.8 2840.2 L31308.4 2830.9 L31313.6 2821.5 Z"></path>
 					</g>
-					<path d="M57377.7 2854.7 L57275 3314 L54355.75 3496.958959926069 L54355.8 3497.0 " fill="none"></path>
+					<path d="M31426.5 2837.9 L31683.5 3314 L31683.5 3485 L31683.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57384.9 2846.8 L57377.7 2854.7 L57374.5 2844.4 L57381.7 2836.5 Z"></path>
+						<path d="M31426.7 2827.2 L31426.5 2837.9 L31417.3 2832.2 L31417.6 2821.5 Z"></path>
 					</g>
-					<path d="M57574.5 2852.2 L57870.25 3314 L58691.5 3489.293991416309 L58691.5 3489.3 " fill="none"></path>
+					<path d="M31573.4 2747.5 L32784.75 3314 L21499.75 3499.9151539242966 L21499.8 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57574.0 2841.5 L57574.5 2852.2 L57565.0 2847.2 L57564.4 2836.5 Z"></path>
+						<path d="M31567.2 2738.7 L31573.4 2747.5 L31562.7 2748.4 L31556.5 2739.6 Z"></path>
 					</g>
-					<path d="M68260.6 1741.4 L68308.75 1936 L57777 2602.9616259564787 L57777.0 2603.0 " fill="none"></path>
-					<path d="M68265.8 1740.2 L68260.6 1741.4 L68255.4 1742.7 L68257.4 1728.5 Z"></path>
-					<path d="M38770.9 1834.1 L38625.5 1936 L57081 2612.248544154014 L57081.0 2612.2 " fill="none"></path>
-					<path d="M38774.0 1838.5 L38770.9 1834.1 L38767.8 1829.8 L38781.8 1826.5 Z"></path>
-					<path d="M83607.1 1857.8 L83517.5 1936 L57777 2615.8092837840427 L57777.0 2615.8 " fill="none"></path>
-					<path d="M83610.6 1861.8 L83607.1 1857.8 L83603.6 1853.7 L83617.2 1849.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M70259.3 1263.8 L70204.5 1459 L70204.5 1697.5 L70204.5 1697.5 L70204.5 1936 L70204.5 1936 L57777 2606.2318891628506 L57777.0 2606.2 " fill="none"></path>
+					<path d="M31573.5 2744.3 L32824.75 3314 L13203.75 3500.0023127557374 L13203.8 3500.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M31567.2 2735.6 L31573.5 2744.3 L31562.8 2745.3 L31556.5 2736.6 Z"></path>
 					</g>
-					<path d="M70264.5 1265.3 L70259.3 1263.8 L70254.2 1262.4 L70262.9 1251.0 Z"></path>
+					<path d="M68285.7 645.3 L59173.75 966 L59173.75 1212.5 L59173.75 1212.5 L59173.75 1459 L59173.75 1459 L59173.75 1666.5 L59173.8 1666.5 " fill="none"></path>
+					<path d="M68285.9 650.6 L68285.7 645.3 L68285.5 640.0 L68299.0 644.8 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80412.0 1749.0 L80452 1936 L57777 2614.585544889893 L57777.0 2614.6 " fill="none"></path>
+						<path d="M75443.2 139.8 L72668.75 293 L72668.75 614 L72668.8 614.0 " fill="none"></path>
 					</g>
-					<path d="M80417.2 1747.9 L80412.0 1749.0 L80406.8 1750.2 L80409.2 1736.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M6055.3 1256.4 L6109.75 1459 L6109.75 1697.5 L6109.75 1697.5 L6109.75 1936 L6109.75 1936 L57081 2620.327835071635 L57081.0 2620.3 " fill="none"></path>
+					<path d="M75443.5 145.2 L75443.2 139.8 L75442.9 134.5 L75456.5 139.1 Z"></path>
+					<path d="M65858.3 3998.7 L65858.25 4000 L61787 4132.406407378193 L61787.0 4132.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M65863.6 3989.3 L65858.3 3998.7 L65852.9 3989.3 L65858.3 3980.0 Z"></path>
+					</g>
+					<path d="M59089.7 3869.4 L57954.25 4000 L60210.75 4119.7746088334325 L60210.8 4119.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M59099.6 3873.6 L59089.7 3869.4 L59098.4 3863.0 L59108.3 3867.3 Z"></path>
+					</g>
+					<path d="M59314.8 3946.2 L59314.75 4000 L60887 4127.357714976575 L60887.0 4127.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M59320.1 3936.8 L59314.8 3946.2 L59309.4 3936.8 L59314.8 3927.5 Z"></path>
+					</g>
+					<path d="M59460.5 3937.6 L59557 4000 L61384.25 4125.388042504161 L61384.3 4125.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M59455.5 3928.1 L59460.5 3937.6 L59449.7 3937.0 L59444.8 3927.5 Z"></path>
 					</g>
-					<path d="M6060.4 1255.0 L6055.3 1256.4 L6050.1 1257.8 L6051.8 1243.5 Z"></path>
-					<path d="M17544.8 1762.7 L17544.75 1936 L17544.75 2594 L17544.8 2594.0 " fill="none"></path>
+					<path d="M59314.8 3529.3 L59314.75 3687 L59314.75 3759.5 L59314.8 3759.5 " fill="none"></path>
+					<path d="M59320.1 3529.3 L59314.8 3529.3 L59309.4 3529.3 L59314.8 3516.0 Z"></path>
+					<path d="M33108.5 2712.7 L33108.5 3314 L24068.25 3499.0873150918023 L24068.3 3499.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17550.1 1753.3 L17544.8 1762.7 L17539.4 1753.3 L17544.8 1744.0 Z"></path>
+						<path d="M33113.8 2703.3 L33108.5 2712.7 L33103.2 2703.3 L33108.5 2694.0 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M75443.3 145.5 L74452.25 293 L74452.25 614 L74452.3 614.0 " fill="none"></path>
 					</g>
-					<path d="M22965.0 1222.2 L20783.25 1459 L17716.75 1684.8330245484021 L17716.8 1684.8 " fill="none"></path>
-					<path d="M22965.6 1227.5 L22965.0 1222.2 L22964.4 1216.9 L22978.3 1220.7 Z"></path>
-					<path d="M22529.9 2668.7 L22730.75 3314 L25938 3491.902334746078 L25938.0 3491.9 " fill="none"></path>
-					<path d="M22535.0 2667.1 L22529.9 2668.7 L22524.8 2670.3 L22525.9 2656.0 Z"></path>
+					<path d="M75444.1 150.7 L75443.3 145.5 L75442.5 140.2 L75456.5 143.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M32527.9 1712.5 L33784.5 1936 L33784.5 2563.5 L33784.5 2563.5 " fill="none"></path>
+						<path d="M75443.4 147.9 L74677.75 293 L74677.75 598.5 L74677.8 598.5 " fill="none"></path>
 					</g>
-					<path d="M32528.8 1707.3 L32527.9 1712.5 L32526.9 1717.8 L32514.8 1710.2 Z"></path>
-					<path d="M68457.3 2822.4 L68153 3314 L64748 3498.844273031582 L64748.0 3498.8 " fill="none"></path>
+					<path d="M75444.4 153.1 L75443.4 147.9 L75442.4 142.7 L75456.5 145.4 Z"></path>
+					<path d="M47000.9 142.7 L44297 293 L44297 629.5 L44297 629.5 L44297 966 L44297 966 L44297 1212.5 L44297 1212.5 L44297 1459 L44297 1459 L44297 1697.5 L44297 1697.5 L44297 1936 L44297 1936 L44297 2625 L44297 2625 L44297 3314 L44297 3314 L61341.25 3499.9273034348635 L61341.3 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68466.8 2817.2 L68457.3 2822.4 L68457.7 2811.6 L68467.1 2806.5 Z"></path>
+						<path d="M47010.5 147.5 L47000.9 142.7 L47009.9 136.9 L47019.5 141.7 Z"></path>
 					</g>
-					<path d="M68468.6 2822.8 L68193 3314 L59452 3499.5236713326503 L59452.0 3499.5 " fill="none"></path>
+					<path d="M22736.4 1723.1 L22918 1936 L22918 2571.5 L22918.0 2571.5 " fill="none"></path>
+					<path d="M22740.4 1719.7 L22736.4 1723.1 L22732.3 1726.6 L22727.7 1713.0 Z"></path>
+					<path d="M68280.3 646.0 L59446.5 966 L59446.5 1212.5 L59446.5 1212.5 L59446.5 1459 L59446.5 1459 L59446.5 1697.5 L59446.5 1697.5 L59446.5 1936 L59446.5 1936 L59446.5 2625 L59446.5 2625 L59446.5 3314 L59446.5 3314 L25422 3499.7303200597094 L25422.0 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68477.8 2817.2 L68468.6 2822.8 L68468.5 2812.0 L68477.7 2806.5 Z"></path>
+						<path d="M68289.9 651.0 L68280.3 646.0 L68289.5 640.3 L68299.0 645.3 Z"></path>
 					</g>
-					<path d="M68579.5 2825.2 L68579.5 3314 L68579.5 3500.5 L68579.5 3500.5 L68579.5 3687 L68579.5 3687 L68579.5 3843.5 L68579.5 3843.5 L68579.5 4000 L68579.5 4000 L58865 4133.327495262969 L58865.0 4133.3 " fill="none"></path>
+					<path d="M68280.3 647.6 L60273.25 966 L60273.25 1197 L60273.3 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68584.8 2815.8 L68579.5 2825.2 L68574.2 2815.8 L68579.5 2806.5 Z"></path>
+						<path d="M68289.9 652.5 L68280.3 647.6 L68289.5 641.9 L68299.0 646.8 Z"></path>
 					</g>
-					<path d="M68658.3 2823.9 L68852.5 3314 L68852.5 3500.5 L68852.5 3500.5 L68852.5 3687 L68852.5 3687 L57389.25 3841.6050737908004 L57389.3 3841.6 " fill="none"></path>
+					<path d="M68281.1 762.4 L67586 966 L67586 1174 L67586.0 1174.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68659.8 2813.2 L68658.3 2823.9 L68649.9 2817.1 L68651.4 2806.5 Z"></path>
+						<path d="M68291.5 764.9 L68281.1 762.4 L68288.5 754.7 L68299.0 757.2 Z"></path>
 					</g>
-					<path d="M68669.7 2823.5 L68892.5 3314 L58796.5 3499.5352022466373 L58796.5 3499.5 " fill="none"></path>
+					<path d="M68283.4 925.2 L68221 966 L68221 1212.5 L68221 1212.5 L68221 1459 L68221 1459 L68221 1697.5 L68221 1697.5 L68221 1936 L68221 1936 L68221 2625 L68221 2625 L68221 3314 L68221 3314 L68221 3500.5 L68221 3500.5 L68221 3687 L68221 3687 L68221 3843.5 L68221 3843.5 L68221 4000 L68221 4000 L60746.75 4129.361555103491 L60746.8 4129.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68670.7 2812.8 L68669.7 2823.5 L68661.0 2817.2 L68662.0 2806.5 Z"></path>
+						<path d="M68294.1 924.5 L68283.4 925.2 L68288.3 915.6 L68299.0 914.9 Z"></path>
 					</g>
-					<path d="M72233.0 724.5 L73375.25 966 L73375.25 1212.5 L73375.25 1212.5 L73375.25 1459 L73375.25 1459 L73375.25 1697.5 L73375.25 1697.5 L73375.25 1936 L73375.25 1936 L69125.5 2546.5567950789764 L69125.5 2546.6 " fill="none"></path>
-					<path d="M72234.1 719.2 L72233.0 724.5 L72231.9 729.7 L72220.0 721.7 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M70267.6 1264.2 L70244.5 1459 L70244.5 1697.5 L70244.5 1697.5 L70244.5 1936 L70244.5 1936 L69018.1030478955 2443.5 L69018.1 2443.5 " fill="none"></path>
+					<path d="M69130.3 957.9 L69140 966 L69140 1212.5 L69140 1212.5 L69140 1459 L69140 1459 L69140 1697.5 L69140 1697.5 L69140 1936 L69140 1936 L69140 2625 L69140 2625 L69140 3314 L69140 3314 L69140 3500.5 L69140 3500.5 L69140 3687 L69140 3687 L69140 3843.5 L69140 3843.5 L69140 4000 L69140 4000 L69140 4134 L69140 4134 L69140 4268 L69140 4268 L66037.25 4449.157666118807 L66037.3 4449.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M69126.5 947.9 L69130.3 957.9 L69119.7 956.1 L69115.9 946.0 Z"></path>
 					</g>
-					<path d="M70272.9 1264.9 L70267.6 1264.2 L70262.3 1263.6 L70269.2 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80420.4 1748.5 L80492 1936 L69125.5 2593.4202308499475 L69125.5 2593.4 " fill="none"></path>
+						<path d="M47219.8 137.3 L68735 293 L68735 313 L68735.0 313.0 " fill="none"></path>
 					</g>
-					<path d="M80425.4 1746.6 L80420.4 1748.5 L80415.5 1750.4 L80415.7 1736.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M6152.7 1246.1 L6845.75 1459 L6845.75 1697.5 L6845.75 1697.5 L6845.75 1936 L6845.75 1936 L68033.5 2618.9061858383784 L68033.5 2618.9 " fill="none"></path>
+					<path d="M47219.9 131.9 L47219.8 137.3 L47219.8 142.6 L47206.5 137.2 Z"></path>
+					<path d="M25439.6 3443.9 L25452 3439.5 L25459.5 3439.5 L25459.5 3439.5 L25467 3500.5 L25467 3500.5 L25459.5 3561.5 L25459.5 3561.5 L25452 3561.5 L25452 3561.5 L25422 3550.7982456140353 L25422.0 3550.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M25429.0 3442.0 L25439.6 3443.9 L25432.6 3452.1 L25422.0 3450.2 Z"></path>
 					</g>
-					<path d="M6154.3 1241.0 L6152.7 1246.1 L6151.2 1251.2 L6140.0 1242.2 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3657.8 2650.7 L3104 3314 L1604 3479.1904340124 L1604.0 3479.2 " fill="none"></path>
+						<path d="M3117.2 2652.7 L3401.5 3314 L25140 3499.2981215292853 L25140.0 3499.3 " fill="none"></path>
 					</g>
-					<path d="M3661.9 2654.2 L3657.8 2650.7 L3653.7 2647.3 L3666.3 2640.5 Z"></path>
-					<path d="M65042.9 2814.6 L64717.5 3314 L64717.5 3485 L64717.5 3485.0 " fill="none"></path>
+					<path d="M3122.1 2650.6 L3117.2 2652.7 L3112.3 2654.9 L3111.9 2640.5 Z"></path>
+					<path d="M75333.4 1295.6 L74657.25 1459 L81834 1693.176540000684 L81834.0 1693.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65052.5 2809.7 L65042.9 2814.6 L65043.5 2803.9 L65053.1 2799.0 Z"></path>
+						<path d="M75343.7 1298.6 L75333.4 1295.6 L75341.2 1288.2 L75351.5 1291.2 Z"></path>
 					</g>
-					<path d="M65053.7 2815.1 L64757.5 3314 L59452 3498.896898065963 L59452.0 3498.9 " fill="none"></path>
+					<path d="M76021.1 1241.6 L78596 1459 L78596 1697.5 L78596 1697.5 L78596 1936 L78596 1936 L78596 2625 L78596 2625 L78596 3314 L78596 3314 L72068.25 3498.102737136592 L72068.3 3498.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65063.0 2809.7 L65053.7 2815.1 L65053.9 2804.3 L65063.2 2799.0 Z"></path>
+						<path d="M76012.2 1235.5 L76021.1 1241.6 L76011.4 1246.1 L76002.5 1240.0 Z"></path>
 					</g>
-					<path d="M65064.5 2815.5 L64797.5 3314 L58651.5 3488.5304910544346 L58651.5 3488.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65073.6 2809.7 L65064.5 2815.5 L65064.2 2804.7 L65073.3 2799.0 Z"></path>
+					<path d="M73025.2 725.8 L72404 966 L75351.5 1187.9855637030248 L75351.5 1188.0 " fill="none"></path>
+					<path d="M73027.1 730.8 L73025.2 725.8 L73023.3 720.8 L73037.6 721.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M83594.1 172.3 L83282 293 L83282 629.5 L83282 629.5 L83282 966 L83282 966 L76002.5 1201.9496055226825 L76002.5 1201.9 " fill="none"></path>
 					</g>
-					<path d="M65166.5 2817.7 L65166.5 3314 L65166.5 3500.5 L65166.5 3500.5 L65166.5 3687 L65166.5 3687 L65166.5 3843.5 L65166.5 3843.5 L65166.5 4000 L65166.5 4000 L58865 4132.966065664121 L58865.0 4133.0 " fill="none"></path>
+					<path d="M83596.1 177.3 L83594.1 172.3 L83592.2 167.3 L83606.6 167.5 Z"></path>
+					<path d="M33529.7 1704.5 L30370.75 1936 L29335.41074020319 2571.5 L29335.4 2571.5 " fill="none"></path>
+					<path d="M33530.1 1709.8 L33529.7 1704.5 L33529.3 1699.2 L33543.0 1703.5 Z"></path>
+					<path d="M81116.0 702.2 L81116 966 L73557.5 1202.083407247846 L73557.5 1202.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65171.8 2808.3 L65166.5 2817.7 L65161.2 2808.3 L65166.5 2799.0 Z"></path>
+						<path d="M81121.3 692.8 L81116.0 702.2 L81110.7 692.8 L81116.0 683.5 Z"></path>
 					</g>
-					<path d="M65220.8 2817.0 L65361.5 3314 L65361.5 3500.5 L65361.5 3500.5 L65361.5 3687 L65361.5 3687 L57389.25 3840.7896674986905 L57389.3 3840.8 " fill="none"></path>
+					<path d="M82061.8 152.7 L81116 293 L81116 575.5 L81116.0 575.5 " fill="none"></path>
+					<path d="M82062.6 158.0 L82061.8 152.7 L82061.0 147.4 L82075.0 150.7 Z"></path>
+					<path d="M78384.3 203.8 L77985.25 293 L77985.25 614 L77985.3 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65223.4 2806.5 L65220.8 2817.0 L65213.2 2809.4 L65215.7 2799.0 Z"></path>
+						<path d="M78394.6 207.0 L78384.3 203.8 L78392.2 196.6 L78402.5 199.7 Z"></path>
 					</g>
-					<path d="M65231.9 2816.7 L65401.5 3314 L58796.5 3499.029290274127 L58796.5 3499.0 " fill="none"></path>
+					<path d="M78470.2 235.8 L78346.25 293 L78346.25 614 L78346.3 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65233.9 2806.1 L65231.9 2816.7 L65223.8 2809.6 L65225.8 2799.0 Z"></path>
-					</g>
-					<path d="M72233.1 722.1 L73415.25 966 L73415.25 1212.5 L73415.25 1212.5 L73415.25 1459 L73415.25 1459 L73415.25 1697.5 L73415.25 1697.5 L73415.25 1936 L73415.25 1936 L65596.5 2589.0830428852855 L65596.5 2589.1 " fill="none"></path>
-					<path d="M72234.1 716.9 L72233.1 722.1 L72232.0 727.4 L72220.0 719.4 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M70276.0 1264.3 L70284.5 1459 L70284.5 1697.5 L70284.5 1697.5 L70284.5 1936 L70284.5 1936 L65596.5 2567.112153184838 L65596.5 2567.1 " fill="none"></path>
+						<path d="M78480.9 236.8 L78470.2 235.8 L78476.4 227.1 L78487.2 228.0 Z"></path>
 					</g>
-					<path d="M70281.3 1264.1 L70276.0 1264.3 L70270.7 1264.6 L70275.4 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M6153.2 1226.5 L7975.75 1459 L7975.75 1697.5 L7975.75 1697.5 L7975.75 1936 L7975.75 1936 L64736.5 2619.8196168086624 L64736.5 2619.8 " fill="none"></path>
+					<path d="M78710.9 246.2 L78721.75 293 L78721.75 614 L78721.8 614.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M78714.0 235.9 L78710.9 246.2 L78703.6 238.3 L78706.7 228.0 Z"></path>
 					</g>
-					<path d="M6153.9 1221.2 L6153.2 1226.5 L6152.6 1231.8 L6140.0 1224.8 Z"></path>
-					<path d="M58230.0 3625.7 L58230 3687 L57389.25 3821.091592356688 L57389.3 3821.1 " fill="none"></path>
+					<path d="M78890.8 236.1 L79008 293 L79008 614 L79008.0 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58235.3 3616.3 L58230.0 3625.7 L58224.7 3616.3 L58230.0 3607.0 Z"></path>
+						<path d="M78884.8 227.3 L78890.8 236.1 L78880.1 236.9 L78874.1 228.0 Z"></path>
 					</g>
-					<path d="M58670.2 3489.1 L65441.5 3314 L65235.94847605225 2799 L65235.9 2799.0 " fill="none"></path>
+					<path d="M73069.5 1416.4 L73037.25 1459 L73037.25 1697.5 L73037.25 1697.5 L73037.25 1936 L73037.25 1936 L73037.25 2625 L73037.25 2625 L73037.25 3314 L73037.25 3314 L64999 3499.795027110767 L64999.0 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58660.7 3484.0 L58670.2 3489.1 L58661.0 3494.7 L58651.5 3489.6 Z"></path>
+						<path d="M73079.4 1412.2 L73069.5 1416.4 L73070.9 1405.7 L73080.8 1401.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M70284.4 1264.1 L70324.5 1459 L70324.5 1697.5 L70324.5 1697.5 L70324.5 1936 L70324.5 1936 L70324.5 2625 L70324.5 2625 L70324.5 3314 L70324.5 3314 L58651.5 3494.000372069949 L58651.5 3494.0 " fill="none"></path>
+					<path d="M73101.9 1417.5 L73077.25 1459 L81834 1693.9450037967208 L81834.0 1693.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M73111.3 1412.2 L73101.9 1417.5 L73102.1 1406.8 L73111.5 1401.5 Z"></path>
 					</g>
-					<path d="M70289.6 1263.0 L70284.4 1264.1 L70279.1 1265.1 L70281.7 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M80428.6 1747.7 L80532 1936 L80532 2625 L80532 2625 L80532 3314 L80532 3314 L58651.5 3496.975215227334 L58651.5 3497.0 " fill="none"></path>
+					<path d="M73240.8 1420.1 L73244 1459 L73244 1697.5 L73244 1697.5 L73244 1936 L73244 1936 L73244 2625 L73244 2625 L73244 3314 L73244 3314 L59371.25 3499.7435163415116 L59371.3 3499.7 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M73245.4 1410.4 L73240.8 1420.1 L73234.8 1411.2 L73239.3 1401.5 Z"></path>
 					</g>
-					<path d="M80433.2 1745.1 L80428.6 1747.7 L80423.9 1750.3 L80422.1 1736.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M6153.2 1225.5 L8124.5 1459 L8124.5 1697.5 L8124.5 1697.5 L8124.5 1936 L8124.5 1936 L8124.5 2625 L8124.5 2625 L8124.5 3314 L8124.5 3314 L57808.5 3498.9311153466188 L57808.5 3498.9 " fill="none"></path>
+					<path d="M73362.3 1417.0 L73390.75 1459 L73390.75 1697.5 L73390.75 1697.5 L73390.75 1936 L73390.75 1936 L73390.75 2625 L73390.75 2625 L73390.75 3314 L73390.75 3314 L61446.25 3499.683858464616 L61446.3 3499.7 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M73361.5 1406.2 L73362.3 1417.0 L73352.7 1412.2 L73351.9 1401.5 Z"></path>
 					</g>
-					<path d="M6153.9 1220.2 L6153.2 1225.5 L6152.6 1230.8 L6140.0 1223.9 Z"></path>
-					<path d="M34750.5 1785.2 L34750.5 1936 L34750.5 2609.5 L34750.5 2609.5 " fill="none"></path>
+					<path d="M69182.3 905.8 L69279.75 966 L72890.5 1191.6575711478736 L72890.5 1191.7 " fill="none"></path>
+					<path d="M69185.1 901.3 L69182.3 905.8 L69179.5 910.4 L69171.0 898.8 Z"></path>
+					<path d="M33529.8 1710.2 L31842.25 1936 L30770.25435413643 2594 L30770.3 2594.0 " fill="none"></path>
+					<path d="M33530.5 1715.5 L33529.8 1710.2 L33529.1 1705.0 L33543.0 1708.5 Z"></path>
+					<path d="M33720.2 1710.5 L35369.5 1936 L33527 2600.476576812353 L33527.0 2600.5 " fill="none"></path>
+					<path d="M33720.9 1705.2 L33720.2 1710.5 L33719.5 1715.8 L33707.0 1708.7 Z"></path>
+					<path d="M33720.2 1709.1 L35589.5 1936 L33764.958635703915 2594 L33765.0 2594.0 " fill="none"></path>
+					<path d="M33720.9 1703.8 L33720.2 1709.1 L33719.6 1714.4 L33707.0 1707.5 Z"></path>
+					<path d="M18676.3 3923.7 L18676.25 4000 L18387.074626865673 4118.5 L18387.1 4118.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34755.8 1775.8 L34750.5 1785.2 L34745.2 1775.8 L34750.5 1766.5 Z"></path>
+						<path d="M18681.6 3914.3 L18676.3 3923.7 L18670.9 3914.3 L18676.3 3905.0 Z"></path>
 					</g>
-					<path d="M34237.6 1250.6 L34750.5 1459 L34750.5 1628.5 L34750.5 1628.5 " fill="none"></path>
-					<path d="M34239.6 1245.7 L34237.6 1250.6 L34235.6 1255.6 L34225.3 1245.6 Z"></path>
-					<path d="M23387.1 1797.1 L23295.25 1936 L29552.5 2574.632040884346 L29552.5 2574.6 " fill="none"></path>
+					<path d="M29232.9 1214.6 L18676.25 1459 L18676.25 1697.5 L18676.25 1697.5 L18676.25 1936 L18676.25 1936 L18676.25 2625 L18676.25 2625 L18676.25 3314 L18676.25 3314 L18676.25 3500.5 L18676.25 3500.5 L18676.25 3687 L18676.25 3687 L18676.25 3782 L18676.3 3782.0 " fill="none"></path>
+					<path d="M29233.0 1219.9 L29232.9 1214.6 L29232.8 1209.2 L29246.3 1214.3 Z"></path>
+					<path d="M34591.6 2675.9 L33878.5 3314 L36368.5 3496.326266195524 L36368.5 3496.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23396.7 1792.2 L23387.1 1797.1 L23387.8 1786.3 L23397.4 1781.5 Z"></path>
+						<path d="M34602.1 2673.7 L34591.6 2675.9 L34595.0 2665.7 L34605.5 2663.5 Z"></path>
 					</g>
-					<path d="M23549.4 1794.8 L23689.5 1936 L23689.5 2625 L23689.5 2625 L23689.5 3314 L23689.5 3314 L18059.75 3496.353935999305 L18059.8 3496.4 " fill="none"></path>
+					<path d="M34594.1 2676.3 L33918.5 3314 L32385.5 3493.9839471199243 L32385.5 3494.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23546.7 1784.4 L23549.4 1794.8 L23539.1 1791.9 L23536.3 1781.5 Z"></path>
+						<path d="M34604.6 2673.8 L34594.1 2676.3 L34597.3 2666.0 L34607.7 2663.5 Z"></path>
 					</g>
-					<path d="M29885.4 2928.0 L29680.75 3314 L7864.25 3498.8771923845875 L7864.3 3498.9 " fill="none"></path>
+					<path d="M34930.7 2719.7 L34800 3314 L36368.5 3493.9601661027377 L36368.5 3494.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29894.5 2922.2 L29885.4 2928.0 L29885.0 2917.2 L29894.1 2911.5 Z"></path>
+						<path d="M34937.9 2711.8 L34930.7 2719.7 L34927.5 2709.5 L34934.7 2701.5 Z"></path>
 					</g>
-					<path d="M29902.8 2928.4 L29720.75 3314 L54242.75 3500.0712818113393 L54242.8 3500.1 " fill="none"></path>
+					<path d="M34936.1 2719.9 L34840 3314 L32385.5 3496.3761952191235 L32385.5 3496.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29911.6 2922.2 L29902.8 2928.4 L29901.9 2917.7 L29910.8 2911.5 Z"></path>
+						<path d="M34942.9 2711.6 L34936.1 2719.9 L34932.4 2709.9 L34939.1 2701.5 Z"></path>
 					</g>
-					<path d="M30200.1 2928.1 L30396.25 3314 L58691.5 3500.1546022171074 L58691.5 3500.2 " fill="none"></path>
+					<path d="M34967.4 2719.9 L35067.25 3314 L24714 3497.9416156612447 L24714.0 3497.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30200.6 2917.4 L30200.1 2928.1 L30191.1 2922.2 L30191.6 2911.5 Z"></path>
+						<path d="M34971.2 2709.8 L34967.4 2719.9 L34960.6 2711.6 L34964.4 2701.5 Z"></path>
 					</g>
-					<path d="M68267.7 1740.8 L68348.75 1936 L30539.5 2616.1227914444785 L30539.5 2616.1 " fill="none"></path>
-					<path d="M68272.7 1738.8 L68267.7 1740.8 L68262.8 1742.9 L68262.6 1728.5 Z"></path>
-					<path d="M32013.2 2749.9 L31921.5 3314 L30121.5 3491.337559429477 L30121.5 3491.3 " fill="none"></path>
+					<path d="M35229.7 2772.2 L35107.25 3314 L32577.5 3495.0604912213375 L32577.5 3495.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32020.0 2741.6 L32013.2 2749.9 L32009.4 2739.9 L32016.2 2731.5 Z"></path>
+						<path d="M35237.0 2764.3 L35229.7 2772.2 L35226.6 2761.9 L35233.8 2754.0 Z"></path>
 					</g>
-					<path d="M32074.0 2749.2 L32258.25 3314 L39589.25 3499.399891518069 L39589.3 3499.4 " fill="none"></path>
+					<path d="M35238.2 2772.4 L35147.25 3314 L21499.75 3500.0161331579334 L21499.8 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32076.2 2738.7 L32074.0 2749.2 L32066.1 2742.0 L32068.2 2731.5 Z"></path>
+						<path d="M35245.0 2764.1 L35238.2 2772.4 L35234.5 2762.3 L35241.3 2754.0 Z"></path>
 					</g>
-					<path d="M32482.5 2749.2 L32298.25 3314 L30350.5 3491.870179948586 L30350.5 3491.9 " fill="none"></path>
+					<path d="M32903.0 3618.2 L32903 3687 L32903 3828 L32903.0 3828.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32490.4 2742.0 L32482.5 2749.2 L32480.3 2738.7 L32488.3 2731.5 Z"></path>
+						<path d="M32908.3 3608.8 L32903.0 3618.2 L32897.7 3608.8 L32903.0 3599.5 Z"></path>
 					</g>
-					<path d="M32575.1 2748.7 L32813 3314 L39589.25 3499.3104036071704 L39589.3 3499.3 " fill="none"></path>
+					<path d="M35257.4 2767.3 L35235.75 3314 L33039.5 3489.587021755439 L33039.5 3489.6 " fill="none"></path>
+					<path d="M35262.7 2767.5 L35257.4 2767.3 L35252.0 2767.1 L35257.9 2754.0 Z"></path>
+					<path d="M35281.3 2767.2 L35351.5 3314 L34159.5 3486.6664077669902 L34159.5 3486.7 " fill="none"></path>
+					<path d="M35286.6 2766.5 L35281.3 2767.2 L35276.0 2767.9 L35279.6 2754.0 Z"></path>
+					<path d="M72384.3 2756.0 L72130 3314 L60578.25 3497.3650126603825 L60578.3 3497.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32576.4 2738.0 L32575.1 2748.7 L32566.5 2742.2 L32567.8 2731.5 Z"></path>
+						<path d="M72393.0 2749.7 L72384.3 2756.0 L72383.3 2745.3 L72392.0 2739.0 Z"></path>
 					</g>
-					<path d="M7882.9 3495.4 L9897.583333333332 3447 L10405.916666666666 3447 L10405.916666666666 3447 L10914.25 3500.5 L10914.25 3500.5 L10405.916666666666 3554 L10405.916666666666 3554 L9897.583333333332 3554 L9897.583333333332 3554 L7864.25 3505.104951681774 L7864.3 3505.1 " fill="none"></path>
+					<path d="M72451.3 2757.6 L72482 3314 L72024.70107238606 3485 L72024.7 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7873.5 3490.3 L7882.9 3495.4 L7873.7 3501.0 L7864.3 3495.9 Z"></path>
+						<path d="M72456.1 2748.0 L72451.3 2757.6 L72445.5 2748.6 L72450.3 2739.0 Z"></path>
 					</g>
+					<path d="M73036.1 726.0 L72444 966 L72444 1212.5 L72444 1212.5 L72444 1459 L72444 1459 L72444 1697.5 L72444 1697.5 L72444 1936 L72444 1936 L72444 2511 L72444.0 2511.0 " fill="none"></path>
+					<path d="M73038.1 731.0 L73036.1 726.0 L73034.1 721.1 L73048.5 721.0 Z"></path>
+					<path d="M29232.9 1215.7 L22381 1459 L33543 1695.7606723585911 L33543.0 1695.8 " fill="none"></path>
+					<path d="M29233.1 1221.0 L29232.9 1215.7 L29232.7 1210.3 L29246.3 1215.2 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3699.3 2651.1 L4208 3314 L7481.25 3490.191969117541 L7481.3 3490.2 " fill="none"></path>
+						<path d="M13167.5 1256.8 L13167.5 1459 L33543 1696.5440180862765 L33543.0 1696.5 " fill="none"></path>
 					</g>
-					<path d="M3703.5 2647.8 L3699.3 2651.1 L3695.0 2654.3 L3691.1 2640.5 Z"></path>
-					<path d="M23966.0 1777.7 L23966 1936 L29552.5 2569.0754111842107 L29552.5 2569.1 " fill="none"></path>
+					<path d="M13172.8 1256.8 L13167.5 1256.8 L13162.2 1256.8 L13167.5 1243.5 Z"></path>
+					<path d="M36881.0 2712.7 L36863.5 3314 L36461.90214477212 3485 L36461.9 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23971.3 1768.3 L23966.0 1777.7 L23960.7 1768.3 L23966.0 1759.0 Z"></path>
+						<path d="M36886.6 2703.5 L36881.0 2712.7 L36875.9 2703.2 L36881.5 2694.0 Z"></path>
 					</g>
-					<path d="M23124.5 1231.5 L23966 1459 L23966 1636 L23966.0 1636.0 " fill="none"></path>
-					<path d="M23125.8 1226.3 L23124.5 1231.5 L23123.1 1236.6 L23111.6 1228.0 Z"></path>
-					<path d="M24485.0 1777.7 L24485 1936 L29552.5 2563.8560510699513 L29552.5 2563.9 " fill="none"></path>
+					<path d="M36901.2 2712.3 L37023 3314 L24714 3498.3434112262107 L24714.0 3498.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24490.3 1768.3 L24485.0 1777.7 L24479.7 1768.3 L24485.0 1759.0 Z"></path>
+						<path d="M36904.5 2702.1 L36901.2 2712.3 L36894.1 2704.2 L36897.5 2694.0 Z"></path>
 					</g>
-					<path d="M23143.4 1227.9 L24485 1459 L24485 1636 L24485.0 1636.0 " fill="none"></path>
-					<path d="M23144.3 1222.6 L23143.4 1227.9 L23142.5 1233.1 L23130.3 1225.6 Z"></path>
-					<path d="M63393.5 165.3 L63393.5 293 L63393.5 583 L63393.5 583.0 " fill="none"></path>
-					<path d="M63398.8 165.3 L63393.5 165.3 L63388.2 165.3 L63393.5 152.0 Z"></path>
-					<path d="M33106.7 2711.2 L32853 3314 L54242.75 3500.0086670163782 L54242.8 3500.0 " fill="none"></path>
+					<path d="M73121.7 731.4 L72770.5 966 L72770.5 1212.5 L72770.5 1212.5 L72770.5 1459 L72770.5 1459 L72770.5 1697.5 L72770.5 1697.5 L72770.5 1936 L72770.5 1936 L72770.5 2625 L72770.5 2625 L72770.5 3314 L72770.5 3314 L72770.5 3462 L72770.5 3462.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33115.3 2704.7 L33106.7 2711.2 L33105.4 2700.5 L33114.0 2694.0 Z"></path>
+						<path d="M73132.5 730.6 L73121.7 731.4 L73126.5 721.7 L73137.3 721.0 Z"></path>
 					</g>
-					<path d="M33203.3 2709.2 L33636.5 3314 L30593.5 3494.4800445221817 L30593.5 3494.5 " fill="none"></path>
+					<path d="M73133.0 732.0 L72810.5 966 L72810.5 1212.5 L72810.5 1212.5 L72810.5 1459 L72810.5 1459 L72810.5 1697.5 L72810.5 1697.5 L72810.5 1936 L72810.5 1936 L72810.5 2625 L72810.5 2625 L72810.5 3314 L72810.5 3314 L64120.25 3499.517999713836 L64120.3 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33202.2 2698.5 L33203.3 2709.2 L33193.5 2704.7 L33192.4 2694.0 Z"></path>
+						<path d="M73143.7 730.8 L73133.0 732.0 L73137.5 722.2 L73148.1 721.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M32528.0 1707.4 L34477.5 1936 L34477.5 2563.5 L34477.5 2563.5 " fill="none"></path>
+					<path d="M73144.4 732.6 L72850.5 966 L72850.5 1212.5 L72850.5 1212.5 L72850.5 1459 L72850.5 1459 L72850.5 1697.5 L72850.5 1697.5 L72850.5 1936 L72850.5 1936 L72850.5 2625 L72850.5 2625 L72850.5 3314 L72850.5 3314 L72055.32707774799 3485 L72055.3 3485.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M73155.0 731.0 L73144.4 732.6 L73148.4 722.6 L73159.0 721.0 Z"></path>
 					</g>
-					<path d="M32528.6 1702.1 L32528.0 1707.4 L32527.4 1712.7 L32514.8 1705.9 Z"></path>
-					<path d="M16171.1 3450.6 L16183.25 3447 L16190.75 3447 L16190.75 3447 L16198.25 3500.5 L16198.25 3500.5 L16190.75 3554 L16190.75 3554 L16183.25 3554 L16183.25 3554 L16153.25 3545.1080332409974 L16153.3 3545.1 " fill="none"></path>
+					<path d="M61681.3 1277.2 L61681.25 1459 L61681.25 1666.5 L61681.3 1666.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16160.7 3448.1 L16171.1 3450.6 L16163.7 3458.4 L16153.3 3455.9 Z"></path>
+						<path d="M61686.6 1267.8 L61681.3 1277.2 L61675.9 1267.8 L61681.3 1258.5 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M34656.9 2676.7 L34760 3314 L33749.75 3480.478131212724 L33749.8 3480.5 " fill="none"></path>
 					</g>
+					<path d="M34662.1 2675.8 L34656.9 2676.7 L34651.6 2677.5 L34654.7 2663.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3700.5 2650.8 L4248 3314 L15852.25 3498.1121780556796 L15852.3 3498.1 " fill="none"></path>
+						<path d="M36549.0 2706.8 L36549 3314 L33749.75 3492.7418043310795 L33749.8 3492.7 " fill="none"></path>
 					</g>
-					<path d="M3704.6 2647.4 L3700.5 2650.8 L3696.4 2654.2 L3692.0 2640.5 Z"></path>
-					<path d="M34109.7 2709.2 L33676.5 3314 L16153.25 3498.91186788316 L16153.3 3498.9 " fill="none"></path>
+					<path d="M36554.3 2706.8 L36549.0 2706.8 L36543.7 2706.8 L36549.0 2693.5 Z"></path>
+					<path d="M63112.7 1261.0 L62355 1459 L62355 1644 L62355.0 1644.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34119.5 2704.7 L34109.7 2709.2 L34110.8 2698.5 L34120.6 2694.0 Z"></path>
+						<path d="M63123.1 1263.8 L63112.7 1261.0 L63120.4 1253.5 L63130.8 1256.3 Z"></path>
 					</g>
-					<path d="M34210.2 2710.9 L34492.25 3314 L24503 3497.849715046999 L24503.0 3497.8 " fill="none"></path>
+					<path d="M63113.2 1281.2 L62634 1459 L33707 1696.825829914854 L33707.0 1696.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34211.1 2700.2 L34210.2 2710.9 L34201.4 2704.7 L34202.3 2694.0 Z"></path>
+						<path d="M63123.9 1282.9 L63113.2 1281.2 L63120.1 1272.9 L63130.8 1274.7 Z"></path>
 					</g>
-					<path d="M22552.3 2666.0 L23122.25 3314 L26288 3489.60037921035 L26288.0 3489.6 " fill="none"></path>
-					<path d="M22556.3 2662.5 L22552.3 2666.0 L22548.3 2669.5 L22543.5 2656.0 Z"></path>
-					<path d="M25346.3 2696.2 L24324.75 3314 L27658.5 3495.2533707455723 L27658.5 3495.3 " fill="none"></path>
+					<path d="M63113.6 1292.9 L62732.25 1459 L62732.25 1697.5 L62732.25 1697.5 L62732.25 1936 L62732.25 1936 L62732.25 2625 L62732.25 2625 L62732.25 3314 L62732.25 3314 L21499.75 3500.3395669768342 L21499.8 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25357.1 2695.9 L25346.3 2696.2 L25351.6 2686.8 L25362.3 2686.5 Z"></path>
+						<path d="M63124.3 1294.1 L63113.6 1292.9 L63120.1 1284.3 L63130.8 1285.4 Z"></path>
 					</g>
-					<path d="M25590.3 2695.6 L26696.75 3314 L30633.5 3496.649138628024 L30633.5 3496.6 " fill="none"></path>
+					<path d="M63482.1 1313.7 L63746.25 1459 L63746.25 1697.5 L63746.25 1697.5 L63746.25 1936 L63746.25 1936 L63746.25 2625 L63746.25 2625 L63746.25 3314 L63746.25 3314 L27458.25 3499.4116873510316 L27458.3 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25584.8 2686.4 L25590.3 2695.6 L25579.6 2695.7 L25574.0 2686.5 Z"></path>
+						<path d="M63476.5 1304.5 L63482.1 1313.7 L63471.4 1313.8 L63465.8 1304.7 Z"></path>
 					</g>
-					<path d="M23143.5 1221.6 L25464 1459 L25464 1697.5 L25464 1697.5 L25464 1936 L25464 1936 L25464 2563.5 L25464.0 2563.5 " fill="none"></path>
-					<path d="M23144.1 1216.3 L23143.5 1221.6 L23143.0 1226.9 L23130.3 1220.3 Z"></path>
-					<path d="M24940.5 1754.7 L24940.5 1936 L35315.5 2592.929191747461 L35315.5 2592.9 " fill="none"></path>
+					<path d="M37177.2 2749.8 L37063 3314 L21597.75 3500.150935024283 L21597.8 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24945.8 1745.3 L24940.5 1754.7 L24935.2 1745.3 L24940.5 1736.0 Z"></path>
+						<path d="M37184.3 2741.7 L37177.2 2749.8 L37173.9 2739.6 L37180.9 2731.5 Z"></path>
 					</g>
-					<path d="M35361.3 3309.5 L35358.25 3314 L29121.5 3495.226015658474 L29121.5 3495.2 " fill="none"></path>
+					<path d="M37227.6 2749.8 L37341 3314 L21499.75 3500.0829908514024 L21499.8 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35370.9 3304.7 L35361.3 3309.5 L35362.1 3298.8 L35371.7 3294.0 Z"></path>
+						<path d="M37231.0 2739.6 L37227.6 2749.8 L37220.5 2741.7 L37223.9 2731.5 Z"></path>
 					</g>
-					<path d="M35400.8 3309.9 L35398.25 3314 L54242.75 3499.942503042167 L54242.8 3499.9 " fill="none"></path>
+					<path d="M33720.3 1707.7 L35841.5 1936 L34031 2588.936142371107 L34031.0 2588.9 " fill="none"></path>
+					<path d="M33720.8 1702.4 L33720.3 1707.7 L33719.7 1713.1 L33707.0 1706.3 Z"></path>
+					<path d="M69389.6 2772.3 L69279.75 3314 L32726.5 3500.2223470440003 L32726.5 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35410.2 3304.7 L35400.8 3309.9 L35401.1 3299.2 L35410.6 3294.0 Z"></path>
+						<path d="M69396.7 2764.2 L69389.6 2772.3 L69386.3 2762.1 L69393.3 2754.0 Z"></path>
 					</g>
-					<path d="M35632.1 3312.0 L35631.5 3314 L35631.5 3500.5 L35631.5 3500.5 L35631.5 3687 L35631.5 3687 L35631.5 3843.5 L35631.5 3843.5 L35631.5 4000 L35631.5 4000 L58767 4133.7167935474135 L58767.0 4133.7 " fill="none"></path>
+					<path d="M69398.1 2772.5 L69319.75 3314 L72645 3493.717199159603 L72645.0 3493.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35639.7 3304.4 L35632.1 3312.0 L35629.4 3301.6 L35637.0 3294.0 Z"></path>
+						<path d="M69404.8 2764.0 L69398.1 2772.5 L69394.2 2762.5 L69400.8 2754.0 Z"></path>
 					</g>
-					<path d="M35671.9 3312.2 L35671.5 3314 L38917 3496.617513953839 L38917.0 3496.6 " fill="none"></path>
+					<path d="M69423.8 2772.7 L69439.5 3314 L59371.25 3499.45925825329 L59371.3 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35679.1 3304.3 L35671.9 3312.2 L35668.7 3302.0 L35675.9 3294.0 Z"></path>
+						<path d="M69428.8 2763.2 L69423.8 2772.7 L69418.2 2763.5 L69423.2 2754.0 Z"></path>
 					</g>
-					<path d="M36074.3 3311.5 L36075.25 3314 L58691.5 3500.068072787428 L58691.5 3500.1 " fill="none"></path>
+					<path d="M69445.1 2772.4 L69539.25 3314 L61446.25 3499.297955926585 L61446.3 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36076.1 3300.9 L36074.3 3311.5 L36066.1 3304.6 L36067.9 3294.0 Z"></path>
+						<path d="M69448.8 2762.3 L69445.1 2772.4 L69438.3 2764.1 L69441.9 2754.0 Z"></path>
 					</g>
-					<path d="M68274.5 1740.0 L68388.75 1936 L36328.5 2614.2842085869793 L36328.5 2614.3 " fill="none"></path>
-					<path d="M68279.1 1737.3 L68274.5 1740.0 L68269.9 1742.7 L68267.8 1728.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M80436.4 1746.8 L80572 1936 L36328.5 2617.201597765363 L36328.5 2617.2 " fill="none"></path>
+					<path d="M69183.0 849.7 L69419.5 966 L69419.5 1212.5 L69419.5 1212.5 L69419.5 1459 L69419.5 1459 L69419.5 1697.5 L69419.5 1697.5 L69419.5 1936 L69419.5 1936 L69419.5 2496 L69419.5 2496.0 " fill="none"></path>
+					<path d="M69185.3 844.9 L69183.0 849.7 L69180.6 854.5 L69171.0 843.8 Z"></path>
+					<path d="M33720.3 1706.8 L36069 1936 L34244.458635703915 2594 L34244.5 2594.0 " fill="none"></path>
+					<path d="M33720.8 1701.5 L33720.3 1706.8 L33719.8 1712.1 L33707.0 1705.5 Z"></path>
+					<path d="M72290.8 3900.7 L72290.75 4000 L72971.75 4110.143633071816 L72971.8 4110.1 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M72296.1 3891.3 L72290.8 3900.7 L72285.4 3891.3 L72290.8 3882.0 Z"></path>
 					</g>
-					<path d="M80440.7 1743.7 L80436.4 1746.8 L80432.0 1749.9 L80428.6 1736.0 Z"></path>
-					<path d="M47374.4 1730.7 L43643.75 1936 L43643.75 2625 L43643.75 2625 L43643.75 3314 L43643.75 3314 L29121.5 3498.197883193063 L29121.5 3498.2 " fill="none"></path>
+					<path d="M73371.4 730.6 L73597.5 966 L73597.5 1212.5 L73597.5 1212.5 L73597.5 1459 L73597.5 1459 L73597.5 1697.5 L73597.5 1697.5 L73597.5 1936 L73597.5 1936 L73597.5 2625 L73597.5 2625 L73597.5 3314 L73597.5 3314 L73597.5 3500.5 L73597.5 3500.5 L73597.5 3687 L73597.5 3687 L72431.75 3826.61344939736 L72431.8 3826.6 " fill="none"></path>
+					<path d="M73375.2 726.9 L73371.4 730.6 L73367.5 734.3 L73362.1 721.0 Z"></path>
+					<path d="M64169.0 1319.2 L63859.75 1459 L63859.75 1682 L63859.8 1682.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47384.0 1735.5 L47374.4 1730.7 L47383.4 1724.8 L47393.0 1729.6 Z"></path>
+						<path d="M64179.7 1320.2 L64169.0 1319.2 L64175.3 1310.5 L64186.0 1311.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M34238.6 1214.2 L47977 1459 L47977 1568.5 L47977.0 1568.5 " fill="none"></path>
+					<path d="M64215.4 1320.8 L63973.25 1459 L63973.25 1697.5 L63973.25 1697.5 L63973.25 1936 L63973.25 1936 L63973.25 2625 L63973.25 2625 L63973.25 3314 L63973.25 3314 L25783 3500.287811815477 L25783.0 3500.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M64226.1 1320.8 L64215.4 1320.8 L64220.8 1311.5 L64231.6 1311.5 Z"></path>
 					</g>
-					<path d="M34238.7 1208.9 L34238.6 1214.2 L34238.5 1219.5 L34225.3 1214.0 Z"></path>
-					<path d="M47379.7 1732.1 L43855.75 1936 L43855.75 2541 L43855.8 2541.0 " fill="none"></path>
-					<path d="M47380.0 1737.4 L47379.7 1732.1 L47379.4 1726.7 L47393.0 1731.3 Z"></path>
-					<path d="M47379.7 1735.9 L44263.75 1936 L44263.75 2556 L44263.8 2556.0 " fill="none"></path>
-					<path d="M47380.0 1741.2 L47379.7 1735.9 L47379.4 1730.5 L47393.0 1735.0 Z"></path>
-					<path d="M47379.7 1741.5 L44735.75 1936 L44735.75 2556 L44735.8 2556.0 " fill="none"></path>
-					<path d="M47380.1 1746.8 L47379.7 1741.5 L47379.3 1736.1 L47393.0 1740.5 Z"></path>
-					<path d="M47379.7 1749.7 L45247.75 1936 L45247.75 2548.5 L45247.8 2548.5 " fill="none"></path>
-					<path d="M47380.2 1755.0 L47379.7 1749.7 L47379.3 1744.4 L47393.0 1748.5 Z"></path>
-					<path d="M45695.8 2787.7 L45695.75 3314 L51895.75 3499.631722587895 L51895.8 3499.6 " fill="none"></path>
+					<path d="M64264.5 1323.0 L64091.75 1459 L64091.75 1682 L64091.8 1682.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45701.1 2778.3 L45695.8 2787.7 L45690.4 2778.3 L45695.8 2769.0 Z"></path>
+						<path d="M64275.2 1321.5 L64264.5 1323.0 L64268.6 1313.1 L64279.2 1311.5 Z"></path>
 					</g>
-					<path d="M47379.7 1759.9 L45695.75 1936 L45695.75 2481 L45695.8 2481.0 " fill="none"></path>
-					<path d="M47380.3 1765.2 L47379.7 1759.9 L47379.2 1754.6 L47393.0 1758.6 Z"></path>
-					<path d="M56255.0 2727.7 L56255 3314 L56918.36997319035 3485 L56918.4 3485.0 " fill="none"></path>
+					<path d="M64392.2 1330.1 L64378.25 1459 L64378.25 1682 L64378.3 1682.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56260.3 2718.3 L56255.0 2727.7 L56249.7 2718.3 L56255.0 2709.0 Z"></path>
+						<path d="M64398.6 1321.4 L64392.2 1330.1 L64387.9 1320.2 L64394.3 1311.5 Z"></path>
 					</g>
-					<path d="M48574.3 1714.7 L56255 1936 L56255 2541 L56255.0 2541.0 " fill="none"></path>
-					<path d="M48574.5 1709.4 L48574.3 1714.7 L48574.2 1720.0 L48561.0 1714.3 Z"></path>
-					<path d="M25680.0 1747.2 L25680 1936 L35315.5 2590.5907611910866 L35315.5 2590.6 " fill="none"></path>
+					<path d="M64623.0 1762.0 L64365.75 1936 L44706.5 2619.8345218411987 L44706.5 2619.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25685.3 1737.8 L25680.0 1747.2 L25674.7 1737.8 L25680.0 1728.5 Z"></path>
+						<path d="M64633.7 1761.1 L64623.0 1762.0 L64627.7 1752.3 L64638.4 1751.5 Z"></path>
 					</g>
-					<path d="M26072.0 1785.2 L26072 1936 L35315.5 2589.2073333333333 L35315.5 2589.2 " fill="none"></path>
+					<path d="M64724.3 1770.1 L64738.25 1936 L64738.25 2625 L64738.25 2625 L64738.25 3314 L64738.25 3314 L64738.25 3500.5 L64738.25 3500.5 L64738.25 3687 L64738.25 3687 L64738.25 3843.5 L64738.25 3843.5 L64738.25 4000 L64738.25 4000 L18421.25 4133.792019659833 L18421.3 4133.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26077.3 1775.8 L26072.0 1785.2 L26066.7 1775.8 L26072.0 1766.5 Z"></path>
+						<path d="M64728.9 1760.4 L64724.3 1770.1 L64718.2 1761.2 L64722.8 1751.5 Z"></path>
 					</g>
-					<path d="M23143.5 1219.8 L26072 1459 L26072 1628.5 L26072.0 1628.5 " fill="none"></path>
-					<path d="M23144.0 1214.5 L23143.5 1219.8 L23143.1 1225.1 L23130.3 1218.7 Z"></path>
-					<path d="M26464.0 1762.7 L26464 1936 L35315.5 2587.7080038469758 L35315.5 2587.7 " fill="none"></path>
+					<path d="M64541.3 1319.7 L64718.25 1459 L64718.25 1643.5 L64718.3 1643.5 " fill="none"></path>
+					<path d="M64544.6 1315.6 L64541.3 1319.7 L64538.0 1323.9 L64530.8 1311.5 Z"></path>
+					<path d="M33720.3 1706.0 L36286.5 1936 L34466 2592.5425281339963 L34466.0 2592.5 " fill="none"></path>
+					<path d="M33720.8 1700.7 L33720.3 1706.0 L33719.8 1711.4 L33707.0 1704.8 Z"></path>
+					<path d="M73411.1 728.8 L73738 966 L73738 1181.5 L73738.0 1181.5 " fill="none"></path>
+					<path d="M73414.3 724.5 L73411.1 728.8 L73408.0 733.1 L73400.4 721.0 Z"></path>
+					<path d="M36238.0 2664.9 L35513.25 3314 L34495.5 3476.822539137894 L34495.5 3476.8 " fill="none"></path>
+					<path d="M36241.5 2668.9 L36238.0 2664.9 L36234.4 2660.9 L36247.9 2656.0 Z"></path>
+					<path d="M29513.3 1747.2 L29513.25 1936 L57557 2614.6545638143743 L57557.0 2614.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26469.3 1753.3 L26464.0 1762.7 L26458.7 1753.3 L26464.0 1744.0 Z"></path>
+						<path d="M29518.6 1737.8 L29513.3 1747.2 L29507.9 1737.8 L29513.3 1728.5 Z"></path>
 					</g>
-					<path d="M23143.5 1219.0 L26464 1459 L26464 1651 L26464.0 1651.0 " fill="none"></path>
-					<path d="M23143.9 1213.6 L23143.5 1219.0 L23143.2 1224.3 L23130.3 1218.0 Z"></path>
-					<path d="M29138.9 3422.0 L29151.5 3417 L29159 3417 L29159 3417 L29166.5 3500.5 L29166.5 3500.5 L29159 3584 L29159 3584 L29151.5 3584 L29151.5 3584 L29121.5 3572.1560283687945 L29121.5 3572.2 " fill="none"></path>
+					<path d="M26090.8 1762.7 L26090.75 1936 L44746.5 2620.7240874162662 L44746.5 2620.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29128.2 3420.5 L29138.9 3422.0 L29132.1 3430.4 L29121.5 3428.8 Z"></path>
+						<path d="M26096.1 1753.3 L26090.8 1762.7 L26085.4 1753.3 L26090.8 1744.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3701.8 2650.5 L4288 3314 L28758.5 3499.126896397858 L28758.5 3499.1 " fill="none"></path>
+					<path d="M29233.0 1219.3 L26090.75 1459 L26090.75 1651 L26090.8 1651.0 " fill="none"></path>
+					<path d="M29233.4 1224.6 L29233.0 1219.3 L29232.5 1214.0 L29246.3 1218.3 Z"></path>
+					<path d="M81375.0 1285.2 L81375 1459 L81375 1501 L81375.0 1501.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M81380.3 1275.8 L81375.0 1285.2 L81369.7 1275.8 L81375.0 1266.5 Z"></path>
 					</g>
-					<path d="M3705.8 2647.0 L3701.8 2650.5 L3697.8 2654.0 L3692.9 2640.5 Z"></path>
-					<path d="M26856.0 1762.7 L26856 1936 L35315.5 2586.0775708231095 L35315.5 2586.1 " fill="none"></path>
+					<path d="M82061.9 157.9 L81375 293 L81375 629.5 L81375 629.5 L81375 966 L81375 966 L81375 1158.5 L81375.0 1158.5 " fill="none"></path>
+					<path d="M82062.9 163.2 L82061.9 157.9 L82060.9 152.7 L82075.0 155.4 Z"></path>
+					<path d="M55738.8 1767.2 L55348.25 1936 L55348.25 2541 L55348.3 2541.0 " fill="none"></path>
+					<path d="M55740.9 1772.1 L55738.8 1767.2 L55736.6 1762.3 L55751.0 1761.9 Z"></path>
+					<path d="M68605.6 2831.5 L68430.75 3314 L64999 3498.857065492093 L64999.0 3498.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26861.3 1753.3 L26856.0 1762.7 L26850.7 1753.3 L26856.0 1744.0 Z"></path>
+						<path d="M68613.8 2824.6 L68605.6 2831.5 L68603.8 2821.0 L68612.0 2814.0 Z"></path>
 					</g>
-					<path d="M23143.6 1218.3 L26856 1459 L26856 1651 L26856.0 1651.0 " fill="none"></path>
-					<path d="M23143.9 1213.0 L23143.6 1218.3 L23143.2 1223.6 L23130.3 1217.4 Z"></path>
-					<path d="M27248.0 1762.7 L27248 1936 L35315.5 2584.2980522509915 L35315.5 2584.3 " fill="none"></path>
+					<path d="M68617.5 2831.9 L68470.75 3314 L64120.25 3498.548675082452 L64120.3 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27253.3 1753.3 L27248.0 1762.7 L27242.7 1753.3 L27248.0 1744.0 Z"></path>
+						<path d="M68625.3 2824.5 L68617.5 2831.9 L68615.1 2821.4 L68623.0 2814.0 Z"></path>
 					</g>
-					<path d="M23143.6 1217.7 L27248 1459 L27248 1651 L27248.0 1651.0 " fill="none"></path>
-					<path d="M23143.9 1212.4 L23143.6 1217.7 L23143.2 1223.1 L23130.3 1217.0 Z"></path>
-					<path d="M27640.0 1762.7 L27640 1936 L35315.5 2582.348020043999 L35315.5 2582.3 " fill="none"></path>
+					<path d="M68629.5 2832.1 L68510.75 3314 L68510.75 3500.5 L68510.75 3500.5 L68510.75 3687 L68510.75 3687 L68510.75 3843.5 L68510.75 3843.5 L68510.75 4000 L68510.75 4000 L61787 4133.030526743199 L61787.0 4133.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27645.3 1753.3 L27640.0 1762.7 L27634.7 1753.3 L27640.0 1744.0 Z"></path>
+						<path d="M68636.9 2824.3 L68629.5 2832.1 L68626.5 2821.8 L68633.9 2814.0 Z"></path>
 					</g>
-					<path d="M23143.6 1217.3 L27640 1459 L27640 1651 L27640.0 1651.0 " fill="none"></path>
-					<path d="M23143.9 1212.0 L23143.6 1217.3 L23143.3 1222.6 L23130.3 1216.6 Z"></path>
-					<path d="M38788.8 1838.1 L38665.5 1936 L38665.5 2625 L38665.5 2625 L38665.5 3314 L38665.5 3314 L38665.5 3500.5 L38665.5 3500.5 L38665.5 3687 L38665.5 3687 L38665.5 3843.5 L38665.5 3843.5 L38665.5 4000 L38665.5 4000 L58767 4133.674152006154 L58767.0 4133.7 " fill="none"></path>
+					<path d="M68692.6 2832.6 L68720.5 3314 L68720.5 3500.5 L68720.5 3500.5 L68720.5 3687 L68720.5 3687 L65998.75 3835.817844353219 L65998.8 3835.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38799.5 1836.5 L38788.8 1838.1 L38792.8 1828.1 L38803.5 1826.5 Z"></path>
+						<path d="M68697.3 2823.0 L68692.6 2832.6 L68686.7 2823.6 L68691.5 2814.0 Z"></path>
 					</g>
-					<path d="M39165.5 1837.2 L39306.5 1936 L39306.5 2625 L39306.5 2625 L39306.5 3314 L39306.5 3314 L39306.5 3500.5 L39306.5 3500.5 L39306.5 3687 L39306.5 3687 L57108.25 3842.2744987390097 L57108.3 3842.3 " fill="none"></path>
+					<path d="M68743.5 2831.9 L68890.25 3314 L61446.25 3499.193890482225 L61446.3 3499.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39160.9 1827.5 L39165.5 1837.2 L39154.8 1836.2 L39150.2 1826.5 Z"></path>
+						<path d="M68745.9 2821.4 L68743.5 2831.9 L68735.7 2824.5 L68738.0 2814.0 Z"></path>
 					</g>
+					<path d="M69184.3 673.6 L72164 966 L72164 1212.5 L72164 1212.5 L72164 1459 L72164 1459 L72164 1697.5 L72164 1697.5 L72164 1936 L72164 1936 L69100 2542.02727142242 L69100.0 2542.0 " fill="none"></path>
+					<path d="M69184.8 668.3 L69184.3 673.6 L69183.7 678.9 L69171.0 672.3 Z"></path>
+					<path d="M80982.7 1733.9 L78805.5 1936 L69100 2596.4532839506173 L69100.0 2596.5 " fill="none"></path>
+					<path d="M80983.2 1739.2 L80982.7 1733.9 L80982.2 1728.6 L80996.0 1732.7 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M70292.5 1263.5 L70364.5 1459 L39282 1695.0996942529102 L39282.0 1695.1 " fill="none"></path>
+						<path d="M67464.2 1224.2 L65019.25 1459 L65019.25 1697.5 L65019.25 1697.5 L65019.25 1936 L65019.25 1936 L68261 2546.055513827245 L68261.0 2546.1 " fill="none"></path>
 					</g>
-					<path d="M70297.5 1261.7 L70292.5 1263.5 L70287.5 1265.4 L70287.9 1251.0 Z"></path>
+					<path d="M67464.7 1229.5 L67464.2 1224.2 L67463.7 1218.9 L67477.5 1222.9 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M6153.3 1224.6 L8287.75 1459 L38650 1695.0433409663199 L38650.0 1695.0 " fill="none"></path>
+						<path d="M83142.4 1261.4 L82982 1459 L82982 1697.5 L82982 1697.5 L82982 1936 L82982 1936 L69100 2604.789847218823 L69100.0 2604.8 " fill="none"></path>
 					</g>
-					<path d="M6153.8 1219.3 L6153.3 1224.6 L6152.7 1229.9 L6140.0 1223.1 Z"></path>
+					<path d="M83146.5 1264.7 L83142.4 1261.4 L83138.2 1258.0 L83150.8 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M34238.6 1213.5 L57041 1459 L57041 1697.5 L57041 1697.5 L57041 1936 L57041 1936 L57041 2625 L57041 2625 L57041 3314 L57041 3314 L53634.75 3490.941891233201 L53634.8 3490.9 " fill="none"></path>
+						<path d="M42572.6 1228.3 L40966.25 1459 L40966.25 1697.5 L40966.25 1697.5 L40966.25 1936 L40966.25 1936 L68261 2614.570870581019 L68261.0 2614.6 " fill="none"></path>
 					</g>
-					<path d="M34238.6 1208.2 L34238.6 1213.5 L34238.5 1218.9 L34225.3 1213.4 Z"></path>
-					<path d="M83790.8 1285.2 L83790.75 1459 L83790.75 1546 L83790.8 1546.0 " fill="none"></path>
+					<path d="M42573.3 1233.5 L42572.6 1228.3 L42571.8 1223.0 L42585.8 1226.4 Z"></path>
+					<path d="M60972.7 2777.5 L60650.75 3314 L59371.25 3492.612836826347 L59371.3 3492.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M83796.1 1275.8 L83790.8 1285.2 L83785.4 1275.8 L83790.8 1266.5 Z"></path>
+						<path d="M60982.1 2772.2 L60972.7 2777.5 L60973.0 2766.8 L60982.3 2761.5 Z"></path>
 					</g>
-					<path d="M83800.1 180.8 L83790.75 293 L83790.75 629.5 L83790.75 629.5 L83790.75 966 L83790.75 966 L83790.75 1158.5 L83790.8 1158.5 " fill="none"></path>
-					<path d="M83805.4 181.2 L83800.1 180.8 L83794.8 180.3 L83801.2 167.5 Z"></path>
-					<path d="M58581.4 1796.9 L58676 1936 L58676 2609.5 L58676.0 2609.5 " fill="none"></path>
+					<path d="M61117.2 2779.2 L61301 3314 L61386.04155495978 3485 L61386.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58580.6 1786.2 L58581.4 1796.9 L58571.7 1792.2 L58570.9 1781.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M34238.6 1213.5 L58513.75 1459 L58513.75 1613.5 L58513.8 1613.5 " fill="none"></path>
+						<path d="M61119.2 2768.6 L61117.2 2779.2 L61109.1 2772.1 L61111.2 2761.5 Z"></path>
 					</g>
-					<path d="M34238.6 1208.1 L34238.6 1213.5 L34238.5 1218.8 L34225.3 1213.3 Z"></path>
-					<path d="M83805.0 1867.6 L83810.75 1936 L83810.75 2625 L83810.75 2625 L83810.75 3314 L83810.75 3314 L54355.75 3500.1429442759604 L54355.8 3500.1 " fill="none"></path>
+					<path d="M58962.5 1727.1 L57470.25 1936 L60716.25 2558.285475792988 L60716.3 2558.3 " fill="none"></path>
+					<path d="M58963.3 1732.4 L58962.5 1727.1 L58961.8 1721.8 L58975.8 1725.2 Z"></path>
+					<path d="M82417.2 1821.2 L82176.5 1936 L61412.25 2613.642991628083 L61412.3 2613.6 " fill="none"></path>
+					<path d="M82419.5 1826.1 L82417.2 1821.2 L82414.9 1816.4 L82429.3 1815.5 Z"></path>
+					<path d="M80978.1 1813.6 L80559.75 1936 L80559.75 2625 L80559.75 2625 L80559.75 3314 L80559.75 3314 L80559.75 3500.5 L80559.75 3500.5 L80559.75 3687 L80559.75 3687 L66685.5 3842.6808779508506 L66685.5 3842.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M83809.5 1857.9 L83805.0 1867.6 L83798.9 1858.7 L83803.5 1849.0 Z"></path>
+						<path d="M80988.5 1816.1 L80978.1 1813.6 L80985.5 1805.9 L80996.0 1808.4 Z"></path>
 					</g>
-					<path d="M83833.4 1867.1 L83850.75 1936 L83850.75 2625 L83850.75 2625 L83850.75 3314 L83850.75 3314 L59320 3499.856001746849 L59320.0 3499.9 " fill="none"></path>
+					<path d="M81450.0 1911.6 L81458.5 1936 L81458.5 2625 L81458.5 2625 L81458.5 3314 L81458.5 3314 L59371.25 3500.0241433813153 L59371.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M83836.3 1856.8 L83833.4 1867.1 L83826.0 1859.4 L83828.9 1849.0 Z"></path>
+						<path d="M81451.9 1901.0 L81450.0 1911.6 L81441.8 1904.6 L81443.8 1894.0 Z"></path>
 					</g>
-					<path d="M72359.5 1862.4 L72196.5 1936 L72196.5 2625 L72196.5 2625 L72196.5 3314 L72196.5 3314 L64748 3499.73943709052 L64748.0 3499.7 " fill="none"></path>
+					<path d="M50903.7 1216.4 L44949 1459 L44949 1598.5 L44949.0 1598.5 " fill="none"></path>
+					<path d="M50903.9 1221.7 L50903.7 1216.4 L50903.5 1211.0 L50917.0 1215.8 Z"></path>
+					<path d="M46040.3 3618.2 L46040.25 3687 L66539.5 3842.944664535965 L66539.5 3842.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72370.2 1863.4 L72359.5 1862.4 L72365.8 1853.7 L72376.5 1854.7 Z"></path>
+						<path d="M46045.6 3608.8 L46040.3 3618.2 L46034.9 3608.8 L46040.3 3599.5 Z"></path>
 					</g>
-					<path d="M72359.7 1875.8 L72236.5 1936 L72236.5 2625 L72236.5 2625 L72236.5 3314 L72236.5 3314 L69940.25 3490.8351914937543 L69940.3 3490.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72370.5 1876.5 L72359.7 1875.8 L72365.8 1866.9 L72376.5 1867.6 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M49361.2 1702.9 L45728 1936 L45728 2625 L45728 2625 L45728 3314 L45728 3314 L45892.25 3412.1028823058446 L45892.3 3412.1 " fill="none"></path>
 					</g>
-					<path d="M72367.1 1887.8 L72276.5 1936 L72276.5 2625 L72276.5 2625 L72276.5 3314 L72276.5 3314 L72276.5 3500.5 L72276.5 3500.5 L72276.5 3687 L72276.5 3687 L72276.5 3843.5 L72276.5 3843.5 L72276.5 4000 L72276.5 4000 L61143.75 4132.247822521664 L61143.8 4132.2 " fill="none"></path>
+					<path d="M49361.5 1708.3 L49361.2 1702.9 L49360.9 1697.6 L49374.5 1702.1 Z"></path>
+					<path d="M41252.8 1747.2 L41252.75 1936 L60716.25 2612.897332357469 L60716.3 2612.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72377.8 1888.1 L72367.1 1887.8 L72372.8 1878.7 L72383.6 1879.0 Z"></path>
+						<path d="M41258.1 1737.8 L41252.8 1747.2 L41247.4 1737.8 L41252.8 1728.5 Z"></path>
 					</g>
-					<path d="M72397.9 1888.4 L72316.5 1936 L72316.5 2625 L72316.5 2625 L72316.5 3314 L72316.5 3314 L59452 3499.835502110685 L59452.0 3499.8 " fill="none"></path>
+					<path d="M47693.0 2712.7 L47693 3314 L46188.25 3483.7993495689 L46188.3 3483.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72408.6 1888.3 L72397.9 1888.4 L72403.3 1879.1 L72414.0 1879.0 Z"></path>
+						<path d="M47698.3 2703.3 L47693.0 2712.7 L47687.7 2703.3 L47693.0 2694.0 Z"></path>
 					</g>
-					<path d="M72707.7 1897.6 L72704.5 1936 L72704.5 2383.5 L72704.5 2383.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72713.8 1888.7 L72707.7 1897.6 L72703.2 1887.9 L72709.3 1879.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M49361.3 1709.0 L47693 1936 L47693 2556 L47693.0 2556.0 " fill="none"></path>
 					</g>
-					<path d="M72819.3 1895.8 L72838.5 1936 L60014.5 2601.592165725047 L60014.5 2601.6 " fill="none"></path>
+					<path d="M49362.0 1714.3 L49361.3 1709.0 L49360.6 1703.7 L49374.5 1707.2 Z"></path>
+					<path d="M57860.9 2875.7 L57645 3314 L64938 3499.7232880453334 L64938.0 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72820.1 1885.1 L72819.3 1895.8 L72810.5 1889.7 L72811.3 1879.0 Z"></path>
+						<path d="M57869.9 2869.7 L57860.9 2875.7 L57860.3 2865.0 L57869.2 2859.0 Z"></path>
 					</g>
-					<path d="M72851.8 1894.7 L72878.5 1936 L69125.5 2537.492672714585 L69125.5 2537.5 " fill="none"></path>
+					<path d="M57875.3 2876.1 L57685 3314 L59258.25 3494.0344377972083 L59258.3 3494.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72851.2 1883.9 L72851.8 1894.7 L72842.3 1889.7 L72841.7 1879.0 Z"></path>
+						<path d="M57884.0 2869.7 L57875.3 2876.1 L57874.2 2865.4 L57882.8 2859.0 Z"></path>
 					</g>
-					<path d="M72883.9 1893.5 L72918.5 1936 L65596.5 2586.781475748194 L65596.5 2586.8 " fill="none"></path>
+					<path d="M57889.8 2876.5 L57725 3314 L57725 3500.5 L57725 3500.5 L57725 3687 L57725 3687 L57725 3843.5 L57725 3843.5 L57725 4000 L57725 4000 L61689 4132.363817592824 L61689.0 4132.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72882.2 1882.9 L72883.9 1893.5 L72873.9 1889.6 L72872.1 1879.0 Z"></path>
+						<path d="M57898.1 2869.6 L57889.8 2876.5 L57888.1 2865.9 L57896.4 2859.0 Z"></path>
 					</g>
-					<path d="M72915.6 1892.3 L72958.5 1936 L70044.5 2538.2936853157344 L70044.5 2538.3 " fill="none"></path>
+					<path d="M57904.3 2876.8 L57765 3314 L57765 3500.5 L57765 3500.5 L57765 3687 L57765 3687 L65717.75 3840.78313718222 L65717.8 3840.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72912.9 1881.9 L72915.6 1892.3 L72905.3 1889.4 L72902.6 1879.0 Z"></path>
+						<path d="M57912.2 2869.5 L57904.3 2876.8 L57902.0 2866.3 L57910.0 2859.0 Z"></path>
 					</g>
-					<path d="M73020.2 1889.2 L73092.5 1936 L73092.5 2625 L73092.5 2625 L73092.5 3314 L73092.5 3314 L58796.5 3499.817611597031 L58796.5 3499.8 " fill="none"></path>
+					<path d="M58411.1 2868.2 L59192.75 3314 L61341.25 3496.051453884598 L61341.3 3496.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73015.3 1879.6 L73020.2 1889.2 L73009.5 1888.6 L73004.6 1879.0 Z"></path>
+						<path d="M58405.6 2859.0 L58411.1 2868.2 L58400.3 2868.3 L58394.8 2859.0 Z"></path>
 					</g>
-					<path d="M72233.1 719.9 L73455.25 966 L73455.25 1212.5 L73455.25 1212.5 L73455.25 1459 L73455.25 1459 L73072.5 1583.920800547383 L73072.5 1583.9 " fill="none"></path>
-					<path d="M72234.1 714.7 L72233.1 719.9 L72232.0 725.1 L72220.0 717.3 Z"></path>
+					<path d="M59006.1 1731.1 L57984.5 1936 L57984.5 2391 L57984.5 2391.0 " fill="none"></path>
+					<path d="M59007.1 1736.4 L59006.1 1731.1 L59005.1 1725.9 L59019.2 1728.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M70300.4 1262.8 L70404.5 1459 L72376.5 1661.725 L72376.5 1661.7 " fill="none"></path>
+						<path d="M67464.2 1224.4 L65059.25 1459 L65059.25 1697.5 L65059.25 1697.5 L65059.25 1936 L65059.25 1936 L58412 2583.3663733700837 L58412.0 2583.4 " fill="none"></path>
 					</g>
-					<path d="M70305.1 1260.3 L70300.4 1262.8 L70295.7 1265.3 L70294.2 1251.0 Z"></path>
-					<path d="M21583.7 1719.5 L22516.25 1936 L22516.25 2594 L22516.3 2594.0 " fill="none"></path>
-					<path d="M21584.9 1714.4 L21583.7 1719.5 L21582.5 1724.7 L21570.8 1716.5 Z"></path>
-					<path d="M21583.9 1715.5 L22752.25 1936 L22752.25 2586.5 L22752.3 2586.5 " fill="none"></path>
-					<path d="M21584.8 1710.2 L21583.9 1715.5 L21582.9 1720.7 L21570.8 1713.0 Z"></path>
-					<path d="M58716.7 676.0 L60499.25 966 L60499.25 1181.5 L60499.3 1181.5 " fill="none"></path>
-					<path d="M58717.5 670.8 L58716.7 676.0 L58715.8 681.3 L58703.5 673.9 Z"></path>
-					<path d="M21583.9 1712.8 L22970.25 1936 L22970.25 2594 L22970.3 2594.0 " fill="none"></path>
-					<path d="M21584.8 1707.6 L21583.9 1712.8 L21583.1 1718.1 L21570.8 1710.7 Z"></path>
-					<path d="M37946.5 2739.7 L37618.5 3314 L64687 3500.290093730396 L64687.0 3500.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37955.7 2734.2 L37946.5 2739.7 L37946.5 2729.0 L37955.7 2723.5 Z"></path>
+					<path d="M67464.7 1229.7 L67464.2 1224.4 L67463.7 1219.1 L67477.5 1223.1 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M83149.8 1262.2 L83022 1459 L83022 1697.5 L83022 1697.5 L83022 1936 L83022 1936 L58412 2613.235746380429 L58412.0 2613.2 " fill="none"></path>
+					</g>
+					<path d="M83154.2 1265.1 L83149.8 1262.2 L83145.3 1259.3 L83157.0 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M42572.6 1228.6 L41006.25 1459 L41006.25 1697.5 L41006.25 1697.5 L41006.25 1936 L41006.25 1936 L57557 2607.65148057073 L57557.0 2607.7 " fill="none"></path>
 					</g>
-					<path d="M37952.9 2740.1 L37658.5 3314 L37658.5 3485 L37658.5 3485.0 " fill="none"></path>
+					<path d="M42573.3 1233.9 L42572.6 1228.6 L42571.8 1223.4 L42585.8 1226.7 Z"></path>
+					<path d="M36249.1 2666.4 L35725.5 3314 L34928.5 3463.612984398591 L34928.5 3463.6 " fill="none"></path>
+					<path d="M36253.2 2669.7 L36249.1 2666.4 L36244.9 2663.0 L36257.4 2656.0 Z"></path>
+					<path d="M45337.0 1785.2 L45337 1936 L45337 2609.5 L45337.0 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37961.9 2734.2 L37952.9 2740.1 L37952.5 2729.4 L37961.5 2723.5 Z"></path>
+						<path d="M45342.3 1775.8 L45337.0 1785.2 L45331.7 1775.8 L45337.0 1766.5 Z"></path>
 					</g>
-					<path d="M38071.1 2740.1 L38365.5 3314 L38365.5 3485 L38365.5 3485.0 " fill="none"></path>
+					<path d="M50903.7 1216.6 L45337 1459 L45337 1628.5 L45337.0 1628.5 " fill="none"></path>
+					<path d="M50903.9 1222.0 L50903.7 1216.6 L50903.4 1211.3 L50917.0 1216.0 Z"></path>
+					<path d="M46100.1 2712.1 L45945.25 3314 L59258.25 3499.7118441228167 L59258.3 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38071.5 2729.4 L38071.1 2740.1 L38062.1 2734.2 L38062.5 2723.5 Z"></path>
+						<path d="M46107.6 2704.4 L46100.1 2712.1 L46097.3 2701.7 L46104.7 2694.0 Z"></path>
 					</g>
-					<path d="M67592.3 2831.0 L67371.25 3314 L69689.25 3490.9212195621035 L69689.3 3490.9 " fill="none"></path>
+					<path d="M46158.7 2711.2 L46411.75 3314 L45241.5 3485.615195596619 L45241.5 3485.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67601.0 2824.7 L67592.3 2831.0 L67591.3 2820.3 L67600.0 2814.0 Z"></path>
+						<path d="M46160.0 2700.5 L46158.7 2711.2 L46150.2 2704.7 L46151.5 2694.0 Z"></path>
 					</g>
-					<path d="M67606.6 2831.4 L67419.75 3314 L67419.75 3500.5 L67419.75 3500.5 L67419.75 3687 L67419.75 3687 L67419.75 3843.5 L67419.75 3843.5 L67419.75 4000 L67419.75 4000 L61143.75 4130.923017046782 L61143.8 4130.9 " fill="none"></path>
+					<path d="M46689.1 2748.7 L46451.75 3314 L45464.03016085791 3485 L45464.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67614.9 2824.6 L67606.6 2831.4 L67605.0 2820.8 L67613.3 2814.0 Z"></path>
+						<path d="M46697.6 2742.2 L46689.1 2748.7 L46687.8 2738.0 L46696.3 2731.5 Z"></path>
 					</g>
-					<path d="M67665.0 2832.6 L67615.25 3314 L67615.25 3439 L67615.3 3439.0 " fill="none"></path>
+					<path d="M46781.5 2749.2 L46965.75 3314 L25783 3500.1177963606383 L25783.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67671.3 2823.8 L67665.0 2832.6 L67660.7 2822.7 L67667.0 2814.0 Z"></path>
+						<path d="M46783.7 2738.7 L46781.5 2749.2 L46773.6 2742.0 L46775.7 2731.5 Z"></path>
 					</g>
-					<path d="M67789.9 2830.7 L68033 3314 L59452 3499.5055639272055 L59452.0 3499.5 " fill="none"></path>
+					<path d="M47190.0 2749.2 L47005.75 3314 L47005.75 3485 L47005.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67790.5 2819.9 L67789.9 2830.7 L67781.0 2824.7 L67781.5 2814.0 Z"></path>
+						<path d="M47197.9 2742.0 L47190.0 2749.2 L47187.8 2738.7 L47195.8 2731.5 Z"></path>
 					</g>
-					<path d="M67801.7 2830.3 L68073 3314 L59320 3498.7063249603984 L59320.0 3498.7 " fill="none"></path>
+					<path d="M47268.6 2749.3 L47441.75 3314 L25783 3500.126179313205 L25783.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67801.7 2819.5 L67801.7 2830.3 L67792.4 2824.7 L67792.5 2814.0 Z"></path>
+						<path d="M47271.0 2738.9 L47268.6 2749.3 L47260.8 2742.0 L47263.2 2731.5 Z"></path>
 					</g>
-					<path d="M67813.3 2829.9 L68113 3314 L57768.5 3498.202916885473 L57768.5 3498.2 " fill="none"></path>
+					<path d="M14099.6 3449.9 L14111.5 3447 L14119 3447 L14119 3447 L14126.5 3500.5 L14126.5 3500.5 L14119 3554 L14119 3554 L14111.5 3554 L14111.5 3554 L14081.5 3546.7539503386006 L14081.5 3546.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67812.9 2819.1 L67813.3 2829.9 L67803.9 2824.7 L67803.5 2814.0 Z"></path>
+						<path d="M14089.3 3446.9 L14099.6 3449.9 L14091.8 3457.2 L14081.5 3454.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M82554.9 178.8 L82625.25 293 L82625.25 629.5 L82625.25 629.5 L82625.25 966 L82625.25 966 L82625.25 1212.5 L82625.25 1212.5 L82625.25 1459 L82625.25 1459 L82625.25 1697.5 L82625.25 1697.5 L82625.25 1936 L82625.25 1936 L67993.5 2610.8406493180487 L67993.5 2610.8 " fill="none"></path>
+						<path d="M3118.7 2652.5 L3441.5 3314 L13698.5 3497.0818299277407 L13698.5 3497.1 " fill="none"></path>
 					</g>
-					<path d="M82559.4 176.0 L82554.9 178.8 L82550.3 181.6 L82547.9 167.5 Z"></path>
-					<path d="M28192.4 1778.8 L27694 1936 L27694 2609.5 L27694.0 2609.5 " fill="none"></path>
+					<path d="M3123.5 2650.1 L3118.7 2652.5 L3113.9 2654.8 L3112.8 2640.5 Z"></path>
+					<path d="M26535.3 1777.7 L26535.25 1936 L38452.5 2597.6026630139195 L38452.5 2597.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28203.0 1781.1 L28192.4 1778.8 L28199.7 1770.9 L28210.3 1773.2 Z"></path>
+						<path d="M26540.6 1768.3 L26535.3 1777.7 L26529.9 1768.3 L26535.3 1759.0 Z"></path>
 					</g>
-					<path d="M28360.0 1857.8 L28316 1936 L28316 2609.5 L28316.0 2609.5 " fill="none"></path>
+					<path d="M29233.0 1220.4 L26535.25 1459 L26535.25 1636 L26535.3 1636.0 " fill="none"></path>
+					<path d="M29233.4 1225.7 L29233.0 1220.4 L29232.5 1215.1 L29246.3 1219.2 Z"></path>
+					<path d="M79326.3 165.3 L79326.25 293 L79326.25 583 L79326.3 583.0 " fill="none"></path>
+					<path d="M79331.6 165.3 L79326.3 165.3 L79320.9 165.3 L79326.3 152.0 Z"></path>
+					<path d="M27054.3 1777.7 L27054.25 1936 L38452.5 2596.4069417873734 L38452.5 2596.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28369.3 1852.2 L28360.0 1857.8 L28360.0 1847.0 L28369.2 1841.5 Z"></path>
+						<path d="M27059.6 1768.3 L27054.3 1777.7 L27048.9 1768.3 L27054.3 1759.0 Z"></path>
 					</g>
-					<path d="M28514.0 1858.9 L28544.5 1936 L28544.5 2625 L28544.5 2625 L28544.5 3314 L28544.5 3314 L39892.25 3499.9183778797797 L39892.3 3499.9 " fill="none"></path>
+					<path d="M29233.0 1222.2 L27054.25 1459 L27054.25 1636 L27054.3 1636.0 " fill="none"></path>
+					<path d="M29233.6 1227.5 L29233.0 1222.2 L29232.4 1216.9 L29246.3 1220.8 Z"></path>
+					<path d="M38471.5 2921.4 L37843 3314 L14081.5 3499.008965474053 L14081.5 3499.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28515.5 1848.2 L28514.0 1858.9 L28505.6 1852.1 L28507.2 1841.5 Z"></path>
+						<path d="M38482.3 2921.0 L38471.5 2921.4 L38476.6 2911.9 L38487.4 2911.5 Z"></path>
 					</g>
-					<path d="M28600.7 1855.0 L28678 1936 L67379.5 2619.577515156953 L67379.5 2619.6 " fill="none"></path>
+					<path d="M38778.8 2927.8 L38565.5 3314 L59258.25 3499.9921623673144 L59258.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28598.1 1844.6 L28600.7 1855.0 L28590.3 1851.9 L28587.8 1841.5 Z"></path>
+						<path d="M38787.9 2922.2 L38778.8 2927.8 L38778.6 2917.1 L38787.8 2911.5 Z"></path>
 					</g>
-					<path d="M2021.7 3401.2 L2035 3394.5 L2042.5 3394.5 L2042.5 3394.5 L2050 3500.5 L2050 3500.5 L2042.5 3606.5 L2042.5 3606.5 L2035 3606.5 L2035 3606.5 L2005 3591.393111638955 L2005.0 3591.4 " fill="none"></path>
+					<path d="M39457.7 2745.5 L41872.75 3314 L61341.25 3499.998424773321 L61341.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2010.9 3400.6 L2021.7 3401.2 L2015.7 3410.2 L2005.0 3409.6 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3703.0 2650.2 L4328 3314 L2005 3487.053525064909 L2005.0 3487.1 " fill="none"></path>
+						<path d="M39449.8 2738.1 L39457.7 2745.5 L39447.4 2748.5 L39439.5 2741.2 Z"></path>
 					</g>
-					<path d="M3706.9 2646.6 L3703.0 2650.2 L3699.1 2653.9 L3693.8 2640.5 Z"></path>
-					<path d="M38794.5 2674.7 L38794.5 3314 L19226.75 3499.1000025360436 L19226.8 3499.1 " fill="none"></path>
+					<path d="M59162.7 1741.4 L59113.75 1936 L39439.5 2608.140335436526 L39439.5 2608.1 " fill="none"></path>
+					<path d="M59167.9 1742.7 L59162.7 1741.4 L59157.5 1740.1 L59166.0 1728.5 Z"></path>
+					<path d="M41934.9 1793.9 L41776 1936 L39439.5 2504.8510600706713 L39439.5 2504.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38799.8 2665.3 L38794.5 2674.7 L38789.2 2665.3 L38794.5 2656.0 Z"></path>
+						<path d="M41945.4 1791.7 L41934.9 1793.9 L41938.3 1783.7 L41948.8 1781.5 Z"></path>
 					</g>
-					<path d="M39095.0 2697.7 L39095 3314 L39892.25 3492.549534674272 L39892.3 3492.5 " fill="none"></path>
+					<path d="M42092.1 1798.3 L42159.5 1936 L42159.5 2625 L42159.5 2625 L42159.5 3314 L42159.5 3314 L48614 3496.873414356248 L48614.0 3496.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39100.3 2688.3 L39095.0 2697.7 L39089.7 2688.3 L39095.0 2679.0 Z"></path>
+						<path d="M42092.8 1787.5 L42092.1 1798.3 L42083.2 1792.2 L42083.9 1781.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3705.5 2649.6 L4412.75 3314 L18930.75 3498.6179599072684 L18930.8 3498.6 " fill="none"></path>
+					<path d="M65137.4 2816.5 L64953.25 3314 L64967.23257372654 3485 L64967.2 3485.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M65145.6 2809.6 L65137.4 2816.5 L65135.6 2805.9 L65143.9 2799.0 Z"></path>
 					</g>
-					<path d="M3709.1 2645.7 L3705.5 2649.6 L3701.8 2653.5 L3695.8 2640.5 Z"></path>
-					<path d="M47147.0 3923.2 L47147 4000 L30022.5 4133.43895560143 L30022.5 4133.4 " fill="none"></path>
+					<path d="M65148.4 2816.8 L64993.25 3314 L64120.25 3491.164853101197 L64120.3 3491.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47152.3 3913.8 L47147.0 3923.2 L47141.7 3913.8 L47147.0 3904.5 Z"></path>
+						<path d="M65156.3 2809.5 L65148.4 2816.8 L65146.1 2806.3 L65154.0 2799.0 Z"></path>
 					</g>
-					<path d="M23143.6 1217.0 L27953 1459 L27953 1666.5 L27953.0 1666.5 " fill="none"></path>
-					<path d="M23143.8 1211.7 L23143.6 1217.0 L23143.3 1222.3 L23130.3 1216.3 Z"></path>
-					<path d="M72618.8 222.3 L72371 293 L72371 614 L72371.0 614.0 " fill="none"></path>
+					<path d="M65536.2 2441.9 L66442.25 1936 L66325.60849056604 1804 L66325.6 1804.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72629.2 224.9 L72618.8 222.3 L72626.3 214.6 L72636.8 217.2 Z"></path>
+						<path d="M65525.4 2441.8 L65536.2 2441.9 L65530.6 2451.1 L65519.9 2451.0 Z"></path>
 					</g>
-					<path d="M72795.6 240.0 L72732 293 L72732 614 L72732.0 614.0 " fill="none"></path>
+					<path d="M65162.4 2817.2 L65043.75 3314 L65043.75 3500.5 L65043.75 3500.5 L65043.75 3687 L65043.75 3687 L65043.75 3843.5 L65043.75 3843.5 L65043.75 4000 L65043.75 4000 L61787 4132.0137638962415 L61787.0 4132.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72806.2 238.1 L72795.6 240.0 L72799.4 229.9 L72810.0 228.0 Z"></path>
+						<path d="M65169.7 2809.3 L65162.4 2817.2 L65159.4 2806.8 L65166.7 2799.0 Z"></path>
 					</g>
-					<path d="M73070.0 238.5 L73150.25 293 L73150.25 614 L73150.3 614.0 " fill="none"></path>
+					<path d="M65222.4 2817.6 L65258.75 3314 L65258.75 3500.5 L65258.75 3500.5 L65258.75 3687 L65258.75 3687 L65717.75 3806.8223519599665 L65717.8 3806.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73065.2 228.8 L73070.0 238.5 L73059.2 237.7 L73054.5 228.0 Z"></path>
+						<path d="M65227.0 2807.9 L65222.4 2817.6 L65216.4 2808.7 L65221.0 2799.0 Z"></path>
 					</g>
-					<path d="M73220.6 230.7 L73419.75 293 L73419.75 614 L73419.8 614.0 " fill="none"></path>
+					<path d="M65268.1 2816.8 L65423.25 3314 L61446.25 3498.0701079538403 L61446.3 3498.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73213.3 222.8 L73220.6 230.7 L73210.1 233.0 L73202.8 225.1 Z"></path>
+						<path d="M65270.4 2806.3 L65268.1 2816.8 L65260.2 2809.5 L65262.5 2799.0 Z"></path>
+					</g>
+					<path d="M69184.3 673.1 L72204 966 L72204 1212.5 L72204 1212.5 L72204 1459 L72204 1459 L72204 1697.5 L72204 1697.5 L72204 1936 L72204 1936 L65638.25 2582.6500017867993 L65638.3 2582.7 " fill="none"></path>
+					<path d="M69184.8 667.8 L69184.3 673.1 L69183.8 678.4 L69171.0 671.8 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M67464.2 1224.6 L65099.25 1459 L65099.25 1697.5 L65099.25 1697.5 L65099.25 1936 L65099.25 1936 L65180.72314949202 2451 L65180.7 2451.0 " fill="none"></path>
+					</g>
+					<path d="M67464.8 1229.9 L67464.2 1224.6 L67463.7 1219.3 L67477.5 1223.3 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M42572.7 1235.3 L41499.25 1459 L41499.25 1697.5 L41499.25 1697.5 L41499.25 1936 L41499.25 1936 L64778.25 2612.503901472015 L64778.3 2612.5 " fill="none"></path>
 					</g>
-					<path d="M72779.5 1312.7 L72501.75 1459 L80530.5 1693.6278909480777 L80530.5 1693.6 " fill="none"></path>
+					<path d="M42573.8 1240.5 L42572.7 1235.3 L42571.6 1230.1 L42585.8 1232.6 Z"></path>
+					<path d="M65967.3 1811.4 L65678.25 1936 L65678.25 2625 L65678.25 2625 L65678.25 3314 L65678.25 3314 L65678.25 3500.5 L65678.25 3500.5 L65678.25 3687 L65678.25 3687 L65717.75 3721.3430555555556 L65717.8 3721.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72790.3 1313.1 L72779.5 1312.7 L72785.3 1303.6 L72796.0 1304.0 Z"></path>
+						<path d="M65978.0 1812.6 L65967.3 1811.4 L65973.8 1802.8 L65984.5 1804.0 Z"></path>
 					</g>
-					<path d="M73040.4 1319.6 L73132.5 1459 L73132.5 1697.5 L73132.5 1697.5 L73132.5 1936 L73132.5 1936 L73132.5 2625 L73132.5 2625 L73132.5 3314 L73132.5 3314 L59320 3499.359327217125 L59320.0 3499.4 " fill="none"></path>
+					<path d="M66221.0 1822.6 L66211.5 1936 L65461.61066763425 2451 L65461.6 2451.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73039.8 1308.9 L73040.4 1319.6 L73030.9 1314.7 L73030.2 1304.0 Z"></path>
+						<path d="M66227.1 1813.7 L66221.0 1822.6 L66216.5 1812.9 L66222.6 1804.0 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M67464.4 1234.6 L66231.5 1459 L66231.5 1591 L66231.5 1591.0 " fill="none"></path>
 					</g>
-					<path d="M58716.7 673.9 L60598.5 966 L72644.25 1206.0143376780843 L72644.3 1206.0 " fill="none"></path>
-					<path d="M58717.5 668.6 L58716.7 673.9 L58715.9 679.2 L58703.5 671.9 Z"></path>
+					<path d="M67465.3 1239.9 L67464.4 1234.6 L67463.4 1229.4 L67477.5 1232.2 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M82564.6 177.5 L82665.25 293 L82665.25 629.5 L82665.25 629.5 L82665.25 966 L82665.25 966 L73295.25 1204.2244340157806 L73295.3 1204.2 " fill="none"></path>
+						<path d="M83157.4 1263.0 L83062 1459 L66653 1691.5270491072754 L66653.0 1691.5 " fill="none"></path>
 					</g>
-					<path d="M82568.6 174.0 L82564.6 177.5 L82560.5 181.1 L82555.8 167.5 Z"></path>
-					<path d="M81082.5 1357.1 L80835.5 1459 L80835.5 1697.5 L80835.5 1697.5 L80835.5 1936 L80835.5 1936 L80835.5 2625 L80835.5 2625 L80835.5 3314 L80835.5 3314 L64748 3500.1470871075817 L64748.0 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M81093.2 1358.5 L81082.5 1357.1 L81089.1 1348.7 L81099.8 1350.0 Z"></path>
+					<path d="M83162.2 1265.3 L83157.4 1263.0 L83152.6 1260.7 L83163.3 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M42572.7 1236.1 L41539.25 1459 L65810 1693.4287731980683 L65810.0 1693.4 " fill="none"></path>
 					</g>
-					<path d="M81117.3 1411.4 L81041.75 1459 L80712.22955974843 1666.5 L80712.2 1666.5 " fill="none"></path>
+					<path d="M42573.8 1241.3 L42572.7 1236.1 L42571.6 1230.9 L42585.8 1233.3 Z"></path>
+					<path d="M49043.7 2711.1 L48779 3314 L20909.5 3499.498278015703 L20909.5 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81128.0 1411.0 L81117.3 1411.4 L81122.3 1402.0 L81133.1 1401.5 Z"></path>
+						<path d="M49052.3 2704.7 L49043.7 2711.1 L49042.6 2700.4 L49051.2 2694.0 Z"></path>
 					</g>
-					<path d="M81603.8 1415.8 L81640 1459 L81640 1697.5 L81640 1697.5 L81640 1936 L81640 1936 L81640 2625 L81640 2625 L81640 3314 L81640 3314 L54355.75 3500.1145954298986 L54355.8 3500.1 " fill="none"></path>
+					<path d="M49124.0 2710.7 L49423.25 3314 L24714 3499.419416977659 L24714.0 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81601.9 1405.2 L81603.8 1415.8 L81593.7 1412.1 L81591.8 1401.5 Z"></path>
+						<path d="M49124.6 2700.0 L49124.0 2710.7 L49115.1 2704.7 L49115.7 2694.0 Z"></path>
 					</g>
-					<path d="M81635.6 1414.7 L81680 1459 L81680 1697.5 L81680 1697.5 L81680 1936 L81680 1936 L81680 2625 L81680 2625 L81680 3314 L81680 3314 L58796.5 3500.0731055981864 L58796.5 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M81632.8 1404.3 L81635.6 1414.7 L81625.3 1411.9 L81622.4 1401.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M49435.5 1741.5 L49389 1936 L49389 2563.5 L49389.0 2563.5 " fill="none"></path>
 					</g>
-					<path d="M72233.1 717.0 L73510.5 966 L81099.75 1202.1238364204348 L81099.8 1202.1 " fill="none"></path>
-					<path d="M72234.1 711.8 L72233.1 717.0 L72232.1 722.3 L72220.0 714.5 Z"></path>
-					<path d="M84049.8 702.2 L84049.75 966 L81766.75 1181.0810242690618 L81766.8 1181.1 " fill="none"></path>
+					<path d="M49440.7 1742.7 L49435.5 1741.5 L49430.3 1740.2 L49438.6 1728.5 Z"></path>
+					<path d="M20927.4 3450.6 L20939.5 3447 L20947 3447 L20947 3447 L20954.5 3500.5 L20954.5 3500.5 L20947 3554 L20947 3554 L20939.5 3554 L20939.5 3554 L20909.5 3545.1080332409974 L20909.5 3545.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M84055.1 692.8 L84049.8 702.2 L84044.4 692.8 L84049.8 683.5 Z"></path>
+						<path d="M20916.9 3448.1 L20927.4 3450.6 L20920.0 3458.4 L20909.5 3455.9 Z"></path>
 					</g>
-					<path d="M83863.7 174.7 L84049.75 293 L84049.75 575.5 L84049.8 575.5 " fill="none"></path>
-					<path d="M83866.6 170.2 L83863.7 174.7 L83860.9 179.2 L83852.5 167.5 Z"></path>
-					<path d="M21584.0 1710.4 L23255.25 1936 L23255.25 2571.5 L23255.3 2571.5 " fill="none"></path>
-					<path d="M21584.7 1705.1 L21584.0 1710.4 L21583.2 1715.6 L21570.8 1708.6 Z"></path>
-					<path d="M65735.6 1255.2 L64586 1459 L64586 1682 L64586.0 1682.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65745.7 1258.8 L65735.6 1255.2 L65743.9 1248.3 L65754.0 1251.9 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3120.1 2652.2 L3481.5 3314 L20608.5 3498.8754449428448 L20608.5 3498.9 " fill="none"></path>
 					</g>
-					<path d="M65824.8 1322.5 L65636.5 1459 L65636.5 1697.5 L65636.5 1697.5 L65636.5 1936 L65636.5 1936 L65636.5 2625 L65636.5 2625 L65636.5 3314 L65636.5 3314 L39676.25 3500.1880161515164 L39676.3 3500.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65835.5 1321.3 L65824.8 1322.5 L65829.3 1312.7 L65839.9 1311.5 Z"></path>
+					<path d="M3124.8 2649.6 L3120.1 2652.2 L3115.4 2654.8 L3113.7 2640.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M50903.8 1227.5 L49446 1459 L49446 1666.5 L49446.0 1666.5 " fill="none"></path>
 					</g>
-					<path d="M65875.1 1325.4 L65755 1459 L65755 1682 L65755.0 1682.0 " fill="none"></path>
+					<path d="M50904.7 1232.8 L50903.8 1227.5 L50903.0 1222.3 L50917.0 1225.4 Z"></path>
+					<path d="M71485.7 2884.5 L71364.75 3314 L64999 3499.6106898573385 L64999.0 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65885.3 1322.0 L65875.1 1325.4 L65877.3 1314.9 L65887.5 1311.5 Z"></path>
+						<path d="M71493.4 2876.9 L71485.7 2884.5 L71483.1 2874.0 L71490.8 2866.5 Z"></path>
 					</g>
-					<path d="M66007.4 1329.5 L66041.5 1459 L66041.5 1682 L66041.5 1682.0 " fill="none"></path>
+					<path d="M71500.7 2884.7 L71404.75 3314 L59371.25 3499.6284325889164 L59371.3 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66010.1 1319.2 L66007.4 1329.5 L65999.8 1321.9 L66002.6 1311.5 Z"></path>
+						<path d="M71507.9 2876.8 L71500.7 2884.7 L71497.5 2874.4 L71504.8 2866.5 Z"></path>
 					</g>
-					<path d="M66286.2 1762.0 L66029 1936 L18005.25 2622.8760282112626 L18005.3 2622.9 " fill="none"></path>
+					<path d="M71624.3 2884.6 L71732.75 3314 L61446.25 3499.5529790115097 L61446.3 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66296.9 1761.1 L66286.2 1762.0 L66291.0 1752.3 L66301.7 1751.5 Z"></path>
+						<path d="M71627.2 2874.2 L71624.3 2884.6 L71616.9 2876.9 L71619.7 2866.5 Z"></path>
 					</g>
-					<path d="M66401.4 1769.5 L66447.5 1936 L66447.5 2625 L66447.5 2625 L66447.5 3314 L66447.5 3314 L66447.5 3500.5 L66447.5 3500.5 L66447.5 3687 L66447.5 3687 L66447.5 3843.5 L66447.5 3843.5 L66447.5 4000 L66447.5 4000 L30022.5 4133.735649505439 L30022.5 4133.7 " fill="none"></path>
+					<path d="M69184.3 672.6 L72244 966 L72244 1212.5 L72244 1212.5 L72244 1459 L72244 1459 L72244 1697.5 L72244 1697.5 L72244 1936 L72244 1936 L71798.93559506531 2383.5 L71798.9 2383.5 " fill="none"></path>
+					<path d="M69184.8 667.3 L69184.3 672.6 L69183.8 677.9 L69171.0 671.3 Z"></path>
+					<path d="M36260.0 2667.8 L35919.5 3314 L35191.5 3475.729600952948 L35191.5 3475.7 " fill="none"></path>
+					<path d="M36264.7 2670.3 L36260.0 2667.8 L36255.2 2665.3 L36266.2 2656.0 Z"></path>
+					<path d="M49805.0 2727.7 L49805 3314 L49853.00938337802 3386.5 L49853.0 3386.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66404.1 1759.1 L66401.4 1769.5 L66393.8 1761.9 L66396.4 1751.5 Z"></path>
+						<path d="M49810.3 2718.3 L49805.0 2727.7 L49799.7 2718.3 L49805.0 2709.0 Z"></path>
 					</g>
-					<path d="M66150.5 1318.4 L66381.5 1459 L66381.5 1643.5 L66381.5 1643.5 " fill="none"></path>
-					<path d="M66153.3 1313.9 L66150.5 1318.4 L66147.8 1323.0 L66139.2 1311.5 Z"></path>
-					<path d="M39688.6 2704.5 L39616.75 3314 L39901.9028150134 3485 L39901.9 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39695.0 2695.9 L39688.6 2704.5 L39684.4 2694.6 L39690.8 2686.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M49503.8 1735.9 L49805 1936 L49805 2541 L49805.0 2541.0 " fill="none"></path>
 					</g>
-					<path d="M39719.0 2704.0 L39881 3314 L39502.55361930295 3485 L39502.6 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39721.8 2693.7 L39719.0 2704.0 L39711.4 2696.4 L39714.2 2686.0 Z"></path>
+					<path d="M49506.7 1731.4 L49503.8 1735.9 L49500.8 1740.3 L49492.7 1728.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M49529.9 1730.5 L50052 1936 L50052 2625 L50052 2625 L50052 3314 L50052 3314 L50003.99061662198 3386.5 L50004.0 3386.5 " fill="none"></path>
 					</g>
-					<path d="M40097.3 2727.1 L40059 3314 L39829.91890080429 3469.5 L39829.9 3469.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40103.3 2718.2 L40097.3 2727.1 L40092.6 2717.5 L40098.5 2708.5 Z"></path>
+					<path d="M49531.9 1725.6 L49529.9 1730.5 L49528.0 1735.5 L49517.5 1725.6 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3121.5 2651.9 L3521.5 3314 L2438 3472.240211433046 L2438.0 3472.2 " fill="none"></path>
 					</g>
-					<path d="M40107.0 2727.2 L40124 3314 L40269.96179624665 3454.5 L40270.0 3454.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40112.0 2717.7 L40107.0 2727.2 L40101.4 2718.0 L40106.4 2708.5 Z"></path>
+					<path d="M3126.1 2649.2 L3121.5 2651.9 L3116.9 2654.7 L3114.6 2640.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M49530.4 1720.0 L50339 1936 L50339 2563.5 L50339.0 2563.5 " fill="none"></path>
 					</g>
-					<path d="M42761.0 3550.2 L42761 3687 L42761 3797.5 L42761.0 3797.5 " fill="none"></path>
+					<path d="M49531.8 1714.9 L49530.4 1720.0 L49529.0 1725.2 L49517.5 1716.6 Z"></path>
+					<path d="M42578.3 1747.2 L42578.25 1936 L62772.25 2613.3277188199786 L62772.3 2613.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42766.3 3540.8 L42761.0 3550.2 L42755.7 3540.8 L42761.0 3531.5 Z"></path>
+						<path d="M42583.6 1737.8 L42578.3 1747.2 L42572.9 1737.8 L42578.3 1728.5 Z"></path>
 					</g>
-					<path d="M40663.4 2719.4 L40484.75 3314 L39963.25 3488.61355475763 L39963.3 3488.6 " fill="none"></path>
+					<path d="M27505.8 1762.7 L27505.75 1936 L45441 2620.2880736485085 L45441.0 2620.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40671.2 2712.0 L40663.4 2719.4 L40661.0 2708.9 L40668.8 2701.5 Z"></path>
+						<path d="M27511.1 1753.3 L27505.8 1762.7 L27500.4 1753.3 L27505.8 1744.0 Z"></path>
 					</g>
-					<path d="M40668.8 2719.6 L40524.75 3314 L39676.25 3491.4049887892374 L39676.3 3491.4 " fill="none"></path>
+					<path d="M29233.0 1224.6 L27505.75 1459 L27505.75 1651 L27505.8 1651.0 " fill="none"></path>
+					<path d="M29233.8 1229.9 L29233.0 1224.6 L29232.3 1219.3 L29246.3 1222.8 Z"></path>
+					<path d="M55737.8 2742.7 L55737.75 3314 L52887 3489.1923140291624 L52887.0 3489.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40676.2 2711.8 L40668.8 2719.6 L40665.8 2709.3 L40673.2 2701.5 Z"></path>
+						<path d="M55743.1 2733.3 L55737.8 2742.7 L55732.4 2733.3 L55737.8 2724.0 Z"></path>
 					</g>
-					<path d="M40674.3 2719.9 L40564.75 3314 L20626.75 3498.992263874033 L20626.8 3499.0 " fill="none"></path>
+					<path d="M55835.4 1792.5 L55737.75 1936 L55737.75 2526 L55737.8 2526.0 " fill="none"></path>
+					<path d="M55839.8 1795.5 L55835.4 1792.5 L55830.9 1789.5 L55842.9 1781.5 Z"></path>
+					<path d="M63055.6 2854.5 L62926.25 3314 L64938 3497.7147141633004 L64938.0 3497.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40681.2 2711.6 L40674.3 2719.9 L40670.7 2709.7 L40677.6 2701.5 Z"></path>
+						<path d="M63063.3 2846.9 L63055.6 2854.5 L63053.0 2844.0 L63060.7 2836.5 Z"></path>
 					</g>
-					<path d="M42761.0 3908.2 L42761 4000 L22262 4133.456382849508 L22262.0 4133.5 " fill="none"></path>
+					<path d="M63068.9 2854.7 L62966.25 3314 L59371.25 3497.6142681089964 L59371.3 3497.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42766.3 3898.8 L42761.0 3908.2 L42755.7 3898.8 L42761.0 3889.5 Z"></path>
+						<path d="M63076.1 2846.8 L63068.9 2854.7 L63065.7 2844.4 L63073.0 2836.5 Z"></path>
 					</g>
-					<path d="M40680.4 2714.7 L40604.75 3314 L39852.25 3485.0435709932967 L39852.3 3485.0 " fill="none"></path>
-					<path d="M40685.7 2715.4 L40680.4 2714.7 L40675.1 2714.1 L40682.1 2701.5 Z"></path>
-					<path d="M40697.0 2714.8 L40731.75 3314 L40419.75 3454.550724637681 L40419.8 3454.6 " fill="none"></path>
-					<path d="M40702.3 2714.5 L40697.0 2714.8 L40691.6 2715.1 L40696.2 2701.5 Z"></path>
-					<path d="M20644.5 3443.4 L20656.75 3439.5 L20664.25 3439.5 L20664.25 3439.5 L20671.75 3500.5 L20671.75 3500.5 L20664.25 3561.5 L20664.25 3561.5 L20656.75 3561.5 L20656.75 3561.5 L20626.75 3551.9935064935066 L20626.8 3552.0 " fill="none"></path>
+					<path d="M63178.2 2854.6 L63294.25 3314 L61446.25 3495.3480662983425 L61446.3 3495.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20634.0 3441.1 L20644.5 3443.4 L20637.3 3451.3 L20626.8 3449.0 Z"></path>
+						<path d="M63181.1 2844.2 L63178.2 2854.6 L63170.8 2846.9 L63173.7 2836.5 Z"></path>
 					</g>
+					<path d="M59177.3 1741.8 L59192.75 1936 L62772.25 2563.9504774029283 L62772.3 2564.0 " fill="none"></path>
+					<path d="M59182.6 1741.4 L59177.3 1741.8 L59172.0 1742.2 L59176.2 1728.5 Z"></path>
+					<path d="M63234.2 1835.3 L63120.25 1936 L63120.25 2413.5 L63120.3 2413.5 " fill="none"></path>
+					<path d="M63237.8 1839.3 L63234.2 1835.3 L63230.7 1831.3 L63244.2 1826.5 Z"></path>
+					<path d="M82417.4 1831.9 L82216.5 1936 L63468.25 2612.4440269686456 L63468.3 2612.4 " fill="none"></path>
+					<path d="M82419.9 1836.6 L82417.4 1831.9 L82415.0 1827.2 L82429.3 1825.8 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3706.6 2649.4 L4452.75 3314 L20301.75 3498.607219810761 L20301.8 3498.6 " fill="none"></path>
+						<path d="M67464.6 1246.0 L66693 1459 L66693 1697.5 L66693 1697.5 L66693 1936 L66693 1936 L63468.25 2557.888671191659 L63468.3 2557.9 " fill="none"></path>
 					</g>
-					<path d="M3710.2 2645.4 L3706.6 2649.4 L3703.1 2653.4 L3696.7 2640.5 Z"></path>
+					<path d="M67466.1 1251.1 L67464.6 1246.0 L67463.2 1240.9 L67477.5 1242.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M74622.8 180.8 L74622.75 293 L74622.75 598.5 L74622.8 598.5 " fill="none"></path>
-					</g>
-					<path d="M74628.1 180.8 L74622.8 180.8 L74617.4 180.8 L74622.8 167.5 Z"></path>
-					<path d="M40918.3 3931.2 L40918.25 4000 L50246.75 4132.966599297947 L50246.8 4133.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40923.6 3921.8 L40918.3 3931.2 L40912.9 3921.8 L40918.3 3912.5 Z"></path>
+						<path d="M83165.4 1263.7 L83102 1459 L83102 1697.5 L83102 1697.5 L83102 1936 L83102 1936 L63468.25 2613.000450411 L63468.3 2613.0 " fill="none"></path>
 					</g>
+					<path d="M83170.5 1265.3 L83165.4 1263.7 L83160.3 1262.0 L83169.5 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M40918.3 3567.3 L40918.25 3687 L40918.25 3774.5 L40918.3 3774.5 " fill="none"></path>
+						<path d="M42572.7 1237.0 L41579.25 1459 L41579.25 1697.5 L41579.25 1697.5 L41579.25 1936 L41579.25 1936 L62772.25 2613.8690404345202 L62772.3 2613.9 " fill="none"></path>
 					</g>
-					<path d="M40923.6 3567.3 L40918.3 3567.3 L40912.9 3567.3 L40918.3 3554.0 Z"></path>
-					<path d="M41355.3 2748.9 L41185.75 3314 L41185.75 3500.5 L41185.75 3500.5 L41185.75 3687 L41185.75 3687 L41185.75 3843.5 L41185.75 3843.5 L41185.75 4000 L41185.75 4000 L30022.5 4133.141274114951 L30022.5 4133.1 " fill="none"></path>
+					<path d="M42573.9 1242.2 L42572.7 1237.0 L42571.6 1231.8 L42585.8 1234.1 Z"></path>
+					<path d="M36275.0 2669.1 L36166 3314 L35516.06836461126 3469.5 L35516.1 3469.5 " fill="none"></path>
+					<path d="M36280.3 2670.0 L36275.0 2669.1 L36269.8 2668.3 L36277.3 2656.0 Z"></path>
+					<path d="M67307.4 2821.2 L66922.25 3314 L64999 3497.5885476647472 L64999.0 3497.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41363.1 2741.5 L41355.3 2748.9 L41352.9 2738.4 L41360.7 2731.0 Z"></path>
+						<path d="M67317.4 2817.1 L67307.4 2821.2 L67308.9 2810.6 L67318.9 2806.5 Z"></path>
 					</g>
-					<path d="M41385.3 2749.6 L41352.5 3314 L51895.75 3499.9884248859044 L51895.8 3500.0 " fill="none"></path>
+					<path d="M67318.5 2821.6 L66962.25 3314 L64120.25 3497.529432132964 L64120.3 3497.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41391.1 2740.6 L41385.3 2749.6 L41380.5 2740.0 L41386.3 2731.0 Z"></path>
+						<path d="M67328.3 2817.2 L67318.5 2821.6 L67319.6 2810.9 L67329.4 2806.5 Z"></path>
 					</g>
-					<path d="M41426.6 2749.0 L41581.75 3314 L48536 3499.3141811037685 L48536.0 3499.3 " fill="none"></path>
+					<path d="M67360.5 2823.2 L67112 3314 L67112 3500.5 L67112 3500.5 L67112 3687 L67112 3687 L67112 3843.5 L67112 3843.5 L67112 4000 L67112 4000 L61787 4132.778191291403 L61787.0 4132.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41429.2 2738.6 L41426.6 2749.0 L41418.9 2741.4 L41421.6 2731.0 Z"></path>
+						<path d="M67369.4 2817.2 L67360.5 2823.2 L67359.9 2812.4 L67368.9 2806.5 Z"></path>
 					</g>
-					<path d="M41433.7 2748.7 L41621.75 3314 L39676.25 3496.4211915535443 L39676.3 3496.4 " fill="none"></path>
+					<path d="M67438.8 2825.1 L67385 3314 L67385 3500.5 L67385 3500.5 L67385 3687 L67385 3687 L65998.75 3829.0980022924514 L65998.8 3829.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41435.8 2738.2 L41433.7 2748.7 L41425.7 2741.5 L41427.8 2731.0 Z"></path>
+						<path d="M67445.1 2816.4 L67438.8 2825.1 L67434.5 2815.2 L67440.8 2806.5 Z"></path>
 					</g>
-					<path d="M37259.7 2709.1 L36861.75 3314 L36861.75 3485 L36861.8 3485.0 " fill="none"></path>
+					<path d="M67539.5 2823.9 L67733.75 3314 L61446.25 3498.955638801262 L61446.3 3499.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37269.3 2704.2 L37259.7 2709.1 L37260.4 2698.4 L37269.9 2693.5 Z"></path>
+						<path d="M67541.1 2813.2 L67539.5 2823.9 L67531.1 2817.1 L67532.7 2806.5 Z"></path>
 					</g>
-					<path d="M37324.1 2712.1 L37386.75 3314 L39892.25 3497.8944313262496 L39892.3 3497.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37328.4 2702.2 L37324.1 2712.1 L37317.8 2703.3 L37322.1 2693.5 Z"></path>
+					<path d="M69184.3 672.1 L72284 966 L72284 1212.5 L72284 1212.5 L72284 1459 L72284 1459 L72284 1697.5 L72284 1697.5 L72284 1936 L72284 1936 L68006.75 2547.0040429171204 L68006.8 2547.0 " fill="none"></path>
+					<path d="M69184.8 666.8 L69184.3 672.1 L69183.8 677.4 L69171.0 670.8 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M67464.7 1247.6 L66733 1459 L66733 1697.5 L66733 1697.5 L66733 1936 L66733 1936 L67269.04227140783 2443.5 L67269.0 2443.5 " fill="none"></path>
 					</g>
-					<path d="M37355.1 1727.7 L34854.5 1936 L34854.5 2625 L34854.5 2625 L34854.5 3314 L34854.5 3314 L28718.5 3498.3369845360826 L28718.5 3498.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37364.9 1732.2 L37355.1 1727.7 L37364.0 1721.6 L37373.8 1726.2 Z"></path>
+					<path d="M67466.2 1252.7 L67464.7 1247.6 L67463.2 1242.4 L67477.5 1243.9 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M83173.6 1264.2 L83142 1459 L83142 1697.5 L83142 1697.5 L83142 1936 L83142 1936 L68006.75 2601.0099481865286 L68006.8 2601.0 " fill="none"></path>
 					</g>
-					<path d="M37355.2 1730.3 L35085 1936 L35085 2609.5 L35085.0 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37364.9 1734.8 L37355.2 1730.3 L37364.0 1724.2 L37373.8 1728.7 Z"></path>
+					<path d="M83178.9 1265.0 L83173.6 1264.2 L83168.4 1263.3 L83175.8 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M42572.8 1237.9 L41619.25 1459 L41619.25 1697.5 L41619.25 1697.5 L41619.25 1936 L41619.25 1936 L66914.75 2610.4422537391406 L66914.8 2610.4 " fill="none"></path>
 					</g>
-					<path d="M37355.4 1761.6 L36368.5 1936 L36368.5 2625 L36368.5 2625 L36368.5 3314 L36368.5 3314 L18429.75 3498.8002140440517 L18429.8 3498.8 " fill="none"></path>
+					<path d="M42574.0 1243.1 L42572.8 1237.9 L42571.6 1232.7 L42585.8 1234.9 Z"></path>
+					<path d="M27524.8 2694.0 L26104.5 3314 L27548.25 3488.8153708813506 L27548.3 3488.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37365.5 1765.2 L37355.4 1761.6 L37363.6 1754.7 L37373.8 1758.3 Z"></path>
+						<path d="M27535.5 2695.1 L27524.8 2694.0 L27531.2 2685.3 L27541.9 2686.5 Z"></path>
 					</g>
-					<path d="M37355.4 1767.8 L36488.5 1936 L36488.5 2609.5 L36488.5 2609.5 " fill="none"></path>
+					<path d="M27730.7 2702.4 L28109.5 3314 L28175.286863270776 3485 L28175.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37365.6 1771.3 L37355.4 1767.8 L37363.6 1760.8 L37373.8 1764.2 Z"></path>
+						<path d="M27730.3 2691.6 L27730.7 2702.4 L27721.2 2697.2 L27720.8 2686.5 Z"></path>
 					</g>
-					<path d="M37355.8 1799.3 L36870 1936 L36870 2609.5 L36870.0 2609.5 " fill="none"></path>
+					<path d="M29233.1 1226.2 L27717.75 1459 L27717.75 1697.5 L27717.75 1697.5 L27717.75 1936 L27717.75 1936 L27685.874092888243 2563.5 L27685.9 2563.5 " fill="none"></path>
+					<path d="M29233.9 1231.5 L29233.1 1226.2 L29232.3 1220.9 L29246.3 1224.2 Z"></path>
+					<path d="M53428.1 2769.0 L53022.25 3314 L59258.25 3498.825427095749 L59258.3 3498.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37366.2 1801.9 L37355.8 1799.3 L37363.3 1791.7 L37373.8 1794.3 Z"></path>
+						<path d="M53437.9 2764.7 L53428.1 2769.0 L53429.4 2758.3 L53439.2 2754.0 Z"></path>
 					</g>
-					<path d="M37370.7 1903.0 L37315 1936 L37315 2556.5 L37315.0 2556.5 " fill="none"></path>
+					<path d="M53643.0 2768.9 L54051.25 3314 L61341.25 3499.1664964249235 L61341.3 3499.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37381.5 1902.8 L37370.7 1903.0 L37376.0 1893.7 L37386.8 1893.5 Z"></path>
+						<path d="M53641.7 2758.3 L53643.0 2768.9 L53633.2 2764.7 L53631.9 2754.0 Z"></path>
 					</g>
-					<path d="M37524.9 1907.2 L37498.5 1936 L37498.5 2625 L37498.5 2625 L37498.5 3314 L37498.5 3314 L40459.75 3493.7910393098396 L40459.8 3493.8 " fill="none"></path>
+					<path d="M59184.6 1741.4 L59232.75 1936 L53883.25 2582.9162790697674 L53883.3 2582.9 " fill="none"></path>
+					<path d="M59189.8 1740.2 L59184.6 1741.4 L59179.4 1742.7 L59181.4 1728.5 Z"></path>
+					<path d="M36289.8 2669.2 L36395.75 3314 L35951.461126005364 3454.5 L35951.5 3454.5 " fill="none"></path>
+					<path d="M36295.0 2668.3 L36289.8 2669.2 L36284.5 2670.0 L36287.6 2656.0 Z"></path>
+					<path d="M81794.0 2712.7 L81794 3314 L61180.25 3497.991881932064 L61180.3 3498.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37535.2 1904.0 L37524.9 1907.2 L37527.3 1896.8 L37537.6 1893.5 Z"></path>
+						<path d="M81799.3 2703.3 L81794.0 2712.7 L81788.7 2703.3 L81794.0 2694.0 Z"></path>
 					</g>
-					<path d="M38079.6 1807.1 L38505.5 1936 L38505.5 2625 L38505.5 2625 L38505.5 3314 L38505.5 3314 L39892.25 3495.844876076639 L39892.3 3495.8 " fill="none"></path>
+					<path d="M82084.0 172.6 L81794 293 L81794 629.5 L81794 629.5 L81794 966 L81794 966 L81794 1212.5 L81794 1212.5 L81794 1459 L81794 1459 L81794 1697.5 L81794 1697.5 L81794 1936 L81794 1936 L81794 2556 L81794.0 2556.0 " fill="none"></path>
+					<path d="M82086.1 177.5 L82084.0 172.6 L82082.0 167.7 L82096.3 167.5 Z"></path>
+					<path d="M51004.3 1272.3 L51022.25 1459 L51022.25 1613.5 L51022.3 1613.5 " fill="none"></path>
+					<path d="M51009.6 1271.8 L51004.3 1272.3 L50999.0 1272.8 L51003.0 1259.0 Z"></path>
+					<path d="M44527.5 1747.2 L44527.5 1936 L53187.25 2598.381588076934 L53187.3 2598.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38072.2 1799.2 L38079.6 1807.1 L38069.1 1809.5 L38061.8 1801.6 Z"></path>
+						<path d="M44532.8 1737.8 L44527.5 1747.2 L44522.2 1737.8 L44527.5 1728.5 Z"></path>
 					</g>
-					<path d="M38079.7 1801.8 L38545.5 1936 L38545.5 2625 L38545.5 2625 L38545.5 3314 L38545.5 3314 L19619.75 3498.776786765957 L19619.8 3498.8 " fill="none"></path>
+					<path d="M50797.6 2725.3 L50472.5 3314 L36482.5 3499.74321919271 L36482.5 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38072.2 1794.1 L38079.7 1801.8 L38069.2 1804.3 L38061.8 1796.6 Z"></path>
+						<path d="M50806.8 2719.7 L50797.6 2725.3 L50797.4 2714.6 L50806.6 2709.0 Z"></path>
 					</g>
-					<path d="M19637.8 3450.1 L19649.75 3447 L19657.25 3447 L19657.25 3447 L19664.75 3500.5 L19664.75 3500.5 L19657.25 3554 L19657.25 3554 L19649.75 3554 L19649.75 3554 L19619.75 3546.227602905569 L19619.8 3546.2 " fill="none"></path>
+					<path d="M50869.9 2727.4 L50966.5 3314 L52519 3480.7384105960264 L52519.0 3480.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19627.4 3447.3 L19637.8 3450.1 L19630.1 3457.6 L19619.8 3454.8 Z"></path>
+						<path d="M50873.6 2717.3 L50869.9 2727.4 L50863.1 2719.1 L50866.8 2709.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3707.7 2649.1 L4492.75 3314 L19266.75 3498.298250894619 L19266.8 3498.3 " fill="none"></path>
+						<path d="M49530.6 1711.8 L50853 1936 L50853 2541 L50853.0 2541.0 " fill="none"></path>
 					</g>
-					<path d="M3711.2 2645.0 L3707.7 2649.1 L3704.3 2653.2 L3697.6 2640.5 Z"></path>
-					<path d="M23143.6 1216.1 L29221 1459 L29221 1651 L29221.0 1651.0 " fill="none"></path>
-					<path d="M23143.8 1210.7 L23143.6 1216.1 L23143.4 1221.4 L23130.3 1215.5 Z"></path>
-					<path d="M27955.5 2720.2 L27955.5 3314 L39589.25 3499.8052516645616 L39589.3 3499.8 " fill="none"></path>
+					<path d="M49531.5 1706.6 L49530.6 1711.8 L49529.8 1717.1 L49517.5 1709.6 Z"></path>
+					<path d="M60899.3 3685.7 L60899.25 3687 L60899.25 3843.5 L60899.25 3843.5 L60899.25 4000 L60899.25 4000 L61689 4126.171684053651 L61689.0 4126.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27960.8 2710.8 L27955.5 2720.2 L27950.2 2710.8 L27955.5 2701.5 Z"></path>
+						<path d="M60904.6 3676.3 L60899.3 3685.7 L60893.9 3676.3 L60899.3 3667.0 Z"></path>
 					</g>
-					<path d="M3874.9 1707.7 L5247.5 1936 L27823.5 2620.9948916681346 L27823.5 2621.0 " fill="none"></path>
-					<path d="M3875.8 1702.4 L3874.9 1707.7 L3874.0 1712.9 L3861.8 1705.5 Z"></path>
-					<path d="M75910.3 165.3 L75910.25 293 L75910.25 614 L75910.3 614.0 " fill="none"></path>
-					<path d="M75915.6 165.3 L75910.3 165.3 L75904.9 165.3 L75910.3 152.0 Z"></path>
-					<path d="M42707.7 1720.7 L41054 1936 L28087.5 2618.056609535443 L28087.5 2618.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42717.7 1724.8 L42707.7 1720.7 L42716.3 1714.2 L42726.3 1718.3 Z"></path>
+					<path d="M48049.5 3305.6 L48044.75 3314 L60618.25 3496.423100859621 L60618.3 3496.4 " fill="none"></path>
+					<path d="M48054.2 3308.2 L48049.5 3305.6 L48044.9 3303.0 L48056.1 3294.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M52469.3 2669.3 L52469.25 3314 L60618.25 3494.2833333333333 L60618.3 3494.3 " fill="none"></path>
 					</g>
-					<path d="M42707.7 1721.2 L41094 1936 L42947.10250362845 2609.5 L42947.1 2609.5 " fill="none"></path>
+					<path d="M52474.6 2669.3 L52469.3 2669.3 L52463.9 2669.3 L52469.3 2656.0 Z"></path>
+					<path d="M66217.1 2888.7 L65883.75 3314 L64999 3494.2850314121824 L64999.0 3494.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42717.7 1725.2 L42707.7 1721.2 L42716.3 1714.7 L42726.3 1718.7 Z"></path>
+						<path d="M66227.0 2884.6 L66217.1 2888.7 L66218.6 2878.1 L66228.6 2874.0 Z"></path>
 					</g>
-					<path d="M42948.7 1805.1 L43025.25 1936 L42787.22786647315 2609.5 L42787.2 2609.5 " fill="none"></path>
+					<path d="M66232.1 2889.1 L65923.75 3314 L64120.25 3495.861449040281 L64120.3 3495.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42948.6 1794.4 L42948.7 1805.1 L42939.4 1799.7 L42939.3 1789.0 Z"></path>
+						<path d="M66241.9 2884.7 L66232.1 2889.1 L66233.3 2878.4 L66243.1 2874.0 Z"></path>
 					</g>
-					<path d="M43164.7 1803.9 L43065.25 1936 L28087.5 2618.9808401859727 L28087.5 2619.0 " fill="none"></path>
+					<path d="M66247.1 2889.5 L65963.75 3314 L66032.3827077748 3394 L66032.4 3394.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43174.5 1799.7 L43164.7 1803.9 L43166.0 1793.3 L43175.9 1789.0 Z"></path>
+						<path d="M66256.8 2884.7 L66247.1 2889.5 L66247.9 2878.8 L66257.5 2874.0 Z"></path>
 					</g>
-					<path d="M43210.2 1806.8 L43169.25 1936 L42993.78809869376 2609.5 L42993.8 2609.5 " fill="none"></path>
+					<path d="M66262.2 2889.9 L66003.75 3314 L59371.25 3498.9246897892062 L59371.3 3498.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43218.1 1799.5 L43210.2 1806.8 L43207.9 1796.3 L43215.8 1789.0 Z"></path>
+						<path d="M66271.7 2884.7 L66262.2 2889.9 L66262.6 2879.2 L66272.0 2874.0 Z"></path>
 					</g>
-					<path d="M43316.3 1804.5 L43404.25 1936 L42795.75399129173 2609.5 L42795.8 2609.5 " fill="none"></path>
+					<path d="M66554.3 2890.8 L66762.25 3314 L66762.25 3500.5 L66762.25 3500.5 L66762.25 3687 L66762.25 3687 L66762.25 3843.5 L66762.25 3843.5 L66762.25 4000 L66762.25 4000 L61787 4132.6931382793455 L61787.0 4132.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43315.6 1793.8 L43316.3 1804.5 L43306.7 1799.7 L43305.9 1789.0 Z"></path>
+						<path d="M66555.0 2880.0 L66554.3 2890.8 L66545.4 2884.7 L66546.1 2874.0 Z"></path>
 					</g>
-					<path d="M43603.8 1777.7 L43603.75 1936 L43003.562772133526 2609.5 L43003.6 2609.5 " fill="none"></path>
+					<path d="M66569.5 2890.4 L66802.25 3314 L66802.25 3500.5 L66802.25 3500.5 L66802.25 3687 L66802.25 3687 L65998.75 3820.2073622881358 L65998.8 3820.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43609.1 1768.3 L43603.8 1777.7 L43598.4 1768.3 L43603.8 1759.0 Z"></path>
+						<path d="M66569.7 2879.6 L66569.5 2890.4 L66560.4 2884.7 L66560.5 2874.0 Z"></path>
 					</g>
-					<path d="M11622.5 2674.7 L11622.5 3314 L30633.5 3499.6893003037603 L30633.5 3499.7 " fill="none"></path>
+					<path d="M66584.7 2890.0 L66842.25 3314 L61446.25 3498.7029457648896 L61446.3 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11627.8 2665.3 L11622.5 2674.7 L11617.2 2665.3 L11622.5 2656.0 Z"></path>
+						<path d="M66584.4 2879.2 L66584.7 2890.0 L66575.3 2884.7 L66575.0 2874.0 Z"></path>
 					</g>
-					<path d="M12322.0 1730.1 L11622.5 1936 L11622.5 2594 L11622.5 2594.0 " fill="none"></path>
-					<path d="M12323.5 1735.2 L12322.0 1730.1 L12320.5 1725.0 L12334.8 1726.3 Z"></path>
-					<path d="M13203.0 2674.7 L13203 3314 L17803.75 3495.451731430082 L17803.8 3495.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13208.3 2665.3 L13203.0 2674.7 L13197.7 2665.3 L13203.0 2656.0 Z"></path>
+					<path d="M69184.3 671.6 L72324 966 L72324 1212.5 L72324 1212.5 L72324 1459 L72324 1459 L72324 1697.5 L72324 1697.5 L72324 1936 L72324 1936 L66874.75 2572.3346044659124 L66874.8 2572.3 " fill="none"></path>
+					<path d="M69184.8 666.3 L69184.3 671.6 L69183.8 676.9 L69171.0 670.4 Z"></path>
+					<path d="M63276.9 1836.8 L63196.25 1936 L65972.75 2528.7214562354766 L65972.8 2528.7 " fill="none"></path>
+					<path d="M63281.0 1840.2 L63276.9 1836.8 L63272.8 1833.5 L63285.3 1826.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M67517.0 1258.4 L67215.25 1459 L67215.25 1697.5 L67215.25 1697.5 L67215.25 1936 L67215.25 1936 L66709.7928156749 2376 L66709.8 2376.0 " fill="none"></path>
 					</g>
-					<path d="M12543.5 1731.8 L13203 1936 L13203 2594 L13203.0 2594.0 " fill="none"></path>
-					<path d="M12545.1 1726.7 L12543.5 1731.8 L12541.9 1736.9 L12530.8 1727.8 Z"></path>
-					<path d="M46043.8 2749.0 L45887 3314 L39963.25 3499.3889960985025 L39963.3 3499.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46051.5 2741.4 L46043.8 2749.0 L46041.2 2738.6 L46048.8 2731.0 Z"></path>
+					<path d="M67519.9 1262.8 L67517.0 1258.4 L67514.0 1253.9 L67528.1 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M83182.0 1264.3 L83182 1459 L83182 1697.5 L83182 1697.5 L83182 1936 L83182 1936 L66874.75 2606.4575507585814 L66874.8 2606.5 " fill="none"></path>
 					</g>
-					<path d="M46051.0 2749.2 L45927 3314 L46909 3491.0352827452875 L46909.0 3491.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46058.2 2741.3 L46051.0 2749.2 L46047.8 2739.0 L46055.0 2731.0 Z"></path>
+					<path d="M83187.3 1264.3 L83182.0 1264.3 L83176.7 1264.3 L83182.0 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M42625.2 1250.9 L42316.25 1459 L42316.25 1697.5 L42316.25 1697.5 L42316.25 1936 L42316.25 1936 L65972.75 2612.110276884787 L65972.8 2612.1 " fill="none"></path>
 					</g>
-					<path d="M46103.0 2749.3 L46215.5 3314 L40680.75 3496.849453080023 L40680.8 3496.8 " fill="none"></path>
+					<path d="M42628.1 1255.4 L42625.2 1250.9 L42622.2 1246.5 L42636.2 1243.5 Z"></path>
+					<path d="M66123.8 3625.7 L66123.75 3687 L65998.75 3760.6817325800375 L65998.8 3760.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M46106.4 2739.1 L46103.0 2749.3 L46096.0 2741.2 L46099.4 2731.0 Z"></path>
+						<path d="M66129.1 3616.3 L66123.8 3625.7 L66118.4 3616.3 L66123.8 3607.0 Z"></path>
 					</g>
-					<path d="M76154.3 165.3 L76154.25 293 L76154.25 614 L76154.3 614.0 " fill="none"></path>
-					<path d="M76159.6 165.3 L76154.3 165.3 L76148.9 165.3 L76154.3 152.0 Z"></path>
-					<path d="M46392.8 2712.7 L46392.75 3314 L48536 3496.7064906867786 L48536.0 3496.7 " fill="none"></path>
+					<path d="M66541.9 3397.7 L66882.25 3314 L66589.44883889695 2874 L66589.4 2874.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M46398.1 2703.3 L46392.8 2712.7 L46387.4 2703.3 L46392.8 2694.0 Z"></path>
+						<path d="M66531.5 3394.7 L66541.9 3397.7 L66534.1 3405.1 L66523.8 3402.1 Z"></path>
 					</g>
-					<path d="M46660.5 2734.9 L46556.5 3314 L39963.25 3499.5012068640394 L39963.3 3499.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46667.4 2726.6 L46660.5 2734.9 L46656.9 2724.7 L46663.8 2716.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M67669.7 1257.3 L68046.75 1459 L68046.75 1697.5 L68046.75 1697.5 L68046.75 1936 L68046.75 1936 L68046.75 2625 L68046.75 2625 L68046.75 3314 L68046.75 3314 L66523.75 3461.7064482579303 L66523.8 3461.7 " fill="none"></path>
 					</g>
-					<path d="M46697.6 2734.9 L46789 3314 L53674.75 3498.676235843969 L53674.8 3498.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46701.4 2724.9 L46697.6 2734.9 L46690.9 2726.6 L46694.7 2716.5 Z"></path>
+					<path d="M67672.2 1252.6 L67669.7 1257.3 L67667.2 1262.0 L67658.0 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M83190.4 1264.2 L83222 1459 L83222 1697.5 L83222 1697.5 L83222 1936 L83222 1936 L83222 2625 L83222 2625 L83222 3314 L83222 3314 L66523.75 3496.13698039273 L66523.8 3496.1 " fill="none"></path>
 					</g>
-					<path d="M46991.9 2756.4 L46829 3314 L39676.25 3499.372642001042 L39676.3 3499.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46999.6 2749.0 L46991.9 2756.4 L46989.4 2746.0 L46997.1 2738.5 Z"></path>
+					<path d="M83195.6 1263.3 L83190.4 1264.2 L83185.1 1265.0 L83188.2 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M42709.3 1254.7 L42840.25 1459 L42840.25 1697.5 L42840.25 1697.5 L42840.25 1936 L42840.25 1936 L42840.25 2625 L42840.25 2625 L42840.25 3314 L42840.25 3314 L65723.75 3497.2960143449222 L65723.8 3497.3 " fill="none"></path>
 					</g>
-					<path d="M46999.4 2756.7 L46869 3314 L46869 3500.5 L46869 3500.5 L46869 3687 L46869 3687 L46869 3843.5 L46869 3843.5 L46869 4000 L46869 4000 L30022.5 4133.429736678783 L30022.5 4133.4 " fill="none"></path>
+					<path d="M42713.8 1251.8 L42709.3 1254.7 L42704.8 1257.6 L42702.1 1243.5 Z"></path>
+					<path d="M71338.5 1741.1 L69699 1936 L69699 2625 L69699 2625 L69699 3314 L69699 3314 L64999 3499.2975372582177 L64999.0 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47006.8 2748.8 L46999.4 2756.7 L46996.4 2746.4 L47003.7 2738.5 Z"></path>
+						<path d="M71348.4 1745.3 L71338.5 1741.1 L71347.1 1734.7 L71357.0 1738.9 Z"></path>
 					</g>
-					<path d="M47008.2 2756.9 L46915.25 3314 L52671 3497.6758138341106 L52671.0 3497.7 " fill="none"></path>
+					<path d="M71339.6 1839.4 L71090.75 1936 L71090.75 2625 L71090.75 2625 L71090.75 3314 L71090.75 3314 L72645 3486.565932430421 L72645.0 3486.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47015.0 2748.6 L47008.2 2756.9 L47004.5 2746.8 L47011.3 2738.5 Z"></path>
+						<path d="M71350.2 1841.0 L71339.6 1839.4 L71346.4 1831.0 L71357.0 1832.6 Z"></path>
 					</g>
-					<path d="M47015.9 2757.1 L46955.25 3314 L46960.98056300268 3485 L46961.0 3485.0 " fill="none"></path>
+					<path d="M71339.8 1849.2 L71130.75 1936 L71130.75 2625 L71130.75 2625 L71130.75 3314 L71130.75 3314 L71130.75 3500.5 L71130.75 3500.5 L71130.75 3687 L71130.75 3687 L71130.75 3843.5 L71130.75 3843.5 L71130.75 4000 L71130.75 4000 L72971.75 4124.060346995223 L72971.8 4124.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47022.2 2748.4 L47015.9 2757.1 L47011.6 2747.2 L47017.9 2738.5 Z"></path>
+						<path d="M71350.4 1850.5 L71339.8 1849.2 L71346.3 1840.7 L71357.0 1842.0 Z"></path>
 					</g>
-					<path d="M47045.3 2757.0 L47109 3314 L47109 3485 L47109.0 3485.0 " fill="none"></path>
+					<path d="M71340.0 1860.5 L71170.75 1936 L71170.75 2625 L71170.75 2625 L71170.75 3314 L71170.75 3314 L64120.25 3499.291094201367 L64120.3 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47049.6 2747.2 L47045.3 2757.0 L47039.0 2748.4 L47043.2 2738.5 Z"></path>
+						<path d="M71350.7 1861.5 L71340.0 1860.5 L71346.3 1851.8 L71357.0 1852.9 Z"></path>
 					</g>
-					<path d="M47738.9 2727.3 L47620.75 3314 L39676.25 3499.4843828242365 L39676.3 3499.5 " fill="none"></path>
+					<path d="M71583.9 1894.9 L71558.75 1936 L71558.75 2383.5 L71558.8 2383.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47746.0 2719.2 L47738.9 2727.3 L47735.5 2717.1 L47742.6 2709.0 Z"></path>
+						<path d="M71593.4 1889.7 L71583.9 1894.9 L71584.3 1884.2 L71593.7 1879.0 Z"></path>
 					</g>
-					<path d="M47771.6 2727.5 L47840.75 3314 L39963.25 3499.663307215974 L39963.3 3499.7 " fill="none"></path>
+					<path d="M71694.7 1897.6 L71692.75 1936 L66874.75 2566.0250521920666 L66874.8 2566.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47775.8 2717.6 L47771.6 2727.5 L47765.2 2718.9 L47769.4 2709.0 Z"></path>
+						<path d="M71700.5 1888.6 L71694.7 1897.6 L71689.9 1888.0 L71695.7 1879.0 Z"></path>
 					</g>
-					<path d="M48007.6 2772.2 L47880.75 3314 L39676.25 3499.516397914646 L39676.3 3499.5 " fill="none"></path>
+					<path d="M71728.3 1897.5 L71732.75 1936 L68006.75 2536.9396067415732 L68006.8 2536.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48014.9 2764.3 L48007.6 2772.2 L48004.5 2761.9 L48011.8 2754.0 Z"></path>
+						<path d="M71732.5 1887.7 L71728.3 1897.5 L71721.9 1888.9 L71726.1 1879.0 Z"></path>
 					</g>
-					<path d="M48016.1 2772.4 L47920.75 3314 L51895.75 3499.1492257742257 L51895.8 3499.1 " fill="none"></path>
+					<path d="M71761.7 1897.0 L71772.75 1936 L65638.25 2579.867849798157 L65638.3 2579.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48022.9 2764.1 L48016.1 2772.4 L48012.4 2762.3 L48019.3 2754.0 Z"></path>
+						<path d="M71764.2 1886.5 L71761.7 1897.0 L71754.0 1889.4 L71756.6 1879.0 Z"></path>
 					</g>
-					<path d="M48024.6 2772.5 L47960.75 3314 L24503 3499.362118275128 L24503.0 3499.4 " fill="none"></path>
+					<path d="M71794.7 1896.0 L71812.75 1936 L69100 2532.722723281986 L69100.0 2532.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48031.0 2763.9 L48024.6 2772.5 L48020.4 2762.6 L48026.8 2754.0 Z"></path>
+						<path d="M71795.7 1885.3 L71794.7 1896.0 L71786.0 1889.7 L71787.0 1879.0 Z"></path>
 					</g>
-					<path d="M48046.6 2772.7 L48063.5 3314 L47014 3491.61501814882 L47014.0 3491.6 " fill="none"></path>
+					<path d="M71902.3 1892.1 L71946.75 1936 L71946.75 2625 L71946.75 2625 L71946.75 3314 L71946.75 3314 L61446.25 3499.572183265422 L61446.3 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48051.6 2763.2 L48046.6 2772.7 L48041.0 2763.5 L48046.0 2754.0 Z"></path>
+						<path d="M71899.4 1881.8 L71902.3 1892.1 L71891.9 1889.4 L71889.0 1879.0 Z"></path>
+					</g>
+					<path d="M69184.3 671.2 L72364 966 L72364 1212.5 L72364 1212.5 L72364 1459 L72364 1459 L72053 1571.5546282245828 L72053.0 1571.6 " fill="none"></path>
+					<path d="M69184.8 665.8 L69184.3 671.2 L69183.8 676.5 L69171.0 669.9 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M67676.2 1256.9 L68086.75 1459 L71357 1674.5612865335452 L71357.0 1674.6 " fill="none"></path>
 					</g>
-					<path d="M48064.0 2772.5 L48144.75 3314 L48544.284852546916 3485 L48544.3 3485.0 " fill="none"></path>
+					<path d="M67678.5 1252.1 L67676.2 1256.9 L67673.8 1261.7 L67664.2 1251.0 Z"></path>
+					<path d="M63462.4 1843.2 L63508.25 1936 L63508.25 2625 L63508.25 2625 L63508.25 3314 L63508.25 3314 L63508.25 3500.5 L63508.25 3500.5 L63508.25 3687 L63508.25 3687 L63508.25 3843.5 L63508.25 3843.5 L63508.25 4000 L63508.25 4000 L61787 4130.290919361672 L61787.0 4130.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48067.9 2762.4 L48064.0 2772.5 L48057.3 2764.0 L48061.2 2754.0 Z"></path>
+						<path d="M63463.0 1832.5 L63462.4 1843.2 L63453.4 1837.2 L63454.1 1826.5 Z"></path>
 					</g>
-					<path d="M24520.4 3437.0 L24533 3432 L24540.5 3432 L24540.5 3432 L24548 3500.5 L24548 3500.5 L24540.5 3569 L24540.5 3569 L24533 3569 L24533 3569 L24503 3557.189655172414 L24503.0 3557.2 " fill="none"></path>
+					<path d="M63486.0 1842.1 L63548.25 1936 L63548.25 2625 L63548.25 2625 L63548.25 3314 L63548.25 3314 L63548.25 3500.5 L63548.25 3500.5 L63548.25 3687 L63548.25 3687 L65717.75 3833.981277056277 L65717.8 3834.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24509.7 3435.4 L24520.4 3437.0 L24513.6 3445.4 L24503.0 3443.8 Z"></path>
+						<path d="M63485.3 1831.3 L63486.0 1842.1 L63476.4 1837.2 L63475.7 1826.5 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M67682.6 1256.5 L68126.75 1459 L63706.25 1681.5882508181146 L63706.3 1681.6 " fill="none"></path>
+					</g>
+					<path d="M67684.8 1251.7 L67682.6 1256.5 L67680.4 1261.4 L67670.5 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M42791.4 1247.5 L43450.25 1459 L63074.25 1693.7203610832498 L63074.3 1693.7 " fill="none"></path>
 					</g>
+					<path d="M42793.1 1242.5 L42791.4 1247.5 L42789.8 1252.6 L42778.8 1243.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3708.8 2648.9 L4532.75 3314 L24215 3499.1454321921697 L24215.0 3499.1 " fill="none"></path>
+						<path d="M51043.1 1269.5 L51191.25 1459 L51191.25 1697.5 L51191.25 1697.5 L51191.25 1936 L51191.25 1936 L51191.25 2625 L51191.25 2625 L51191.25 3314 L51191.25 3314 L52519 3477.8004795766496 L52519.0 3477.8 " fill="none"></path>
 					</g>
-					<path d="M3712.2 2644.7 L3708.8 2648.9 L3705.5 2653.0 L3698.5 2640.5 Z"></path>
-					<path d="M76404.3 165.3 L76404.25 293 L76404.25 614 L76404.3 614.0 " fill="none"></path>
-					<path d="M76409.6 165.3 L76404.3 165.3 L76398.9 165.3 L76404.3 152.0 Z"></path>
-					<path d="M76810.7 202.5 L76711 293 L76711 614 L76711.0 614.0 " fill="none"></path>
+					<path d="M51047.3 1266.2 L51043.1 1269.5 L51038.9 1272.8 L51034.9 1259.0 Z"></path>
+					<path d="M53348.7 1754.9 L51447.25 1936 L51447.25 2625 L51447.25 2625 L51447.25 3314 L51447.25 3314 L31436 3498.8236681482217 L31436.0 3498.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M76821.2 200.2 L76810.7 202.5 L76814.0 192.3 L76824.5 190.0 Z"></path>
+						<path d="M53358.5 1759.3 L53348.7 1754.9 L53357.5 1748.7 L53367.3 1753.1 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M51093.3 1220.4 L53951.25 1459 L53951.25 1568.5 L53951.3 1568.5 " fill="none"></path>
 					</g>
-					<path d="M77040.8 196.7 L77292.75 293 L77292.75 614 L77292.8 614.0 " fill="none"></path>
+					<path d="M51093.7 1215.1 L51093.3 1220.4 L51092.8 1225.7 L51080.0 1219.3 Z"></path>
+					<path d="M53354.0 1759.6 L51659.25 1936 L51659.25 2541 L51659.3 2541.0 " fill="none"></path>
+					<path d="M53354.5 1765.0 L53354.0 1759.6 L53353.4 1754.3 L53367.3 1758.3 Z"></path>
+					<path d="M53354.0 1773.1 L52067.25 1936 L52067.25 2556 L52067.3 2556.0 " fill="none"></path>
+					<path d="M53354.7 1778.4 L53354.0 1773.1 L53353.4 1767.8 L53367.3 1771.4 Z"></path>
+					<path d="M53375.7 1829.5 L52911.25 1936 L52911.25 2556 L52911.3 2556.0 " fill="none"></path>
+					<path d="M53376.9 1834.7 L53375.7 1829.5 L53374.5 1824.3 L53388.7 1826.5 Z"></path>
+					<path d="M54072.5 1836.5 L54159.25 1936 L54159.25 2548.5 L54159.3 2548.5 " fill="none"></path>
+					<path d="M54076.5 1833.0 L54072.5 1836.5 L54068.5 1840.1 L54063.8 1826.5 Z"></path>
+					<path d="M54607.3 2787.7 L54607.25 3314 L21597.75 3500.336297047384 L21597.8 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M77034.0 188.4 L77040.8 196.7 L77030.2 198.3 L77023.4 190.0 Z"></path>
+						<path d="M54612.6 2778.3 L54607.3 2787.7 L54601.9 2778.3 L54607.3 2769.0 Z"></path>
 					</g>
-					<path d="M50038.8 3908.7 L50038.75 4000 L30022.5 4133.519719238859 L30022.5 4133.5 " fill="none"></path>
+					<path d="M54318.6 1831.1 L54607.25 1936 L54607.25 2481 L54607.3 2481.0 " fill="none"></path>
+					<path d="M54320.4 1826.0 L54318.6 1831.1 L54316.8 1836.1 L54306.1 1826.5 Z"></path>
+					<path d="M54991.3 2727.7 L54991.25 3314 L54991.25 3485 L54991.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M50044.1 3899.3 L50038.8 3908.7 L50033.4 3899.3 L50038.8 3890.0 Z"></path>
+						<path d="M54996.6 2718.3 L54991.3 2727.7 L54985.9 2718.3 L54991.3 2709.0 Z"></path>
 					</g>
-					<path d="M12548.9 1724.8 L13446 1936 L17708.25 2601.8029246726746 L17708.3 2601.8 " fill="none"></path>
+					<path d="M54526.8 1829.5 L54991.25 1936 L54991.25 2541 L54991.3 2541.0 " fill="none"></path>
+					<path d="M54528.0 1824.3 L54526.8 1829.5 L54525.6 1834.7 L54513.8 1826.5 Z"></path>
+					<path d="M27933.8 1762.7 L27933.75 1936 L47930 2607.978941849264 L47930.0 2608.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12541.1 1717.5 L12548.9 1724.8 L12538.6 1727.9 L12530.8 1720.6 Z"></path>
+						<path d="M27939.1 1753.3 L27933.8 1762.7 L27928.4 1753.3 L27933.8 1744.0 Z"></path>
 					</g>
-					<path d="M48486.1 2770.4 L48231.25 3314 L47874.35053619303 3485 L47874.4 3485.0 " fill="none"></path>
+					<path d="M29233.1 1228.3 L27933.75 1459 L27933.75 1651 L27933.8 1651.0 " fill="none"></path>
+					<path d="M29234.1 1233.6 L29233.1 1228.3 L29232.2 1223.1 L29246.3 1226.0 Z"></path>
+					<path d="M28325.8 1785.2 L28325.75 1936 L47930 2607.647166316522 L47930.0 2607.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48494.9 2764.2 L48486.1 2770.4 L48485.2 2759.7 L48494.0 2753.5 Z"></path>
+						<path d="M28331.1 1775.8 L28325.8 1785.2 L28320.4 1775.8 L28325.8 1766.5 Z"></path>
 					</g>
-					<path d="M48494.4 2770.8 L48271.25 3314 L51895.75 3499.019638702614 L51895.8 3499.0 " fill="none"></path>
+					<path d="M29246.6 1231.2 L28325.75 1459 L28325.75 1628.5 L28325.8 1628.5 " fill="none"></path>
+					<path d="M29247.9 1236.4 L29246.6 1231.2 L29245.4 1226.0 L29259.6 1228.0 Z"></path>
+					<path d="M31453.4 3422.0 L31466 3417 L31473.5 3417 L31473.5 3417 L31481 3500.5 L31481 3500.5 L31473.5 3584 L31473.5 3584 L31466 3584 L31466 3584 L31436 3572.1560283687945 L31436.0 3572.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48502.9 2764.2 L48494.4 2770.8 L48493.0 2760.1 L48501.5 2753.5 Z"></path>
+						<path d="M31442.7 3420.5 L31453.4 3422.0 L31446.6 3430.4 L31436.0 3428.8 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M3122.9 2651.6 L3561.5 3314 L31073 3499.2776784747048 L31073.0 3499.3 " fill="none"></path>
 					</g>
-					<path d="M48530.8 2771.9 L48444.5 3314 L48209.77613941019 3485 L48209.8 3485.0 " fill="none"></path>
+					<path d="M3127.3 2648.7 L3122.9 2651.6 L3118.4 2654.6 L3115.5 2640.5 Z"></path>
+					<path d="M28717.8 1762.7 L28717.75 1936 L47930 2607.302199683043 L47930.0 2607.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48537.6 2763.6 L48530.8 2771.9 L48527.0 2761.9 L48533.8 2753.5 Z"></path>
+						<path d="M28723.1 1753.3 L28717.8 1762.7 L28712.4 1753.3 L28717.8 1744.0 Z"></path>
 					</g>
-					<path d="M48563.2 2772.1 L48596 3314 L47014 3494.5096359743043 L47014.0 3494.5 " fill="none"></path>
+					<path d="M29271.9 1233.0 L28717.75 1459 L28717.75 1651 L28717.8 1651.0 " fill="none"></path>
+					<path d="M29273.9 1238.0 L29271.9 1233.0 L29269.9 1228.1 L29284.2 1228.0 Z"></path>
+					<path d="M51407.3 1747.2 L51407.25 1936 L48943 2507.5284860725405 L48943.0 2507.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48567.9 2762.5 L48563.2 2772.1 L48557.3 2763.1 L48562.0 2753.5 Z"></path>
+						<path d="M51412.6 1737.8 L51407.3 1747.2 L51401.9 1737.8 L51407.3 1728.5 Z"></path>
 					</g>
-					<path d="M48586.5 2771.7 L48705.75 3314 L48432.74597855228 3485 L48432.7 3485.0 " fill="none"></path>
+					<path d="M29109.8 1762.7 L29109.75 1936 L47930 2606.94323929269 L47930.0 2606.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48589.7 2761.5 L48586.5 2771.7 L48579.3 2763.8 L48582.5 2753.5 Z"></path>
+						<path d="M29115.1 1753.3 L29109.8 1762.7 L29104.4 1753.3 L29109.8 1744.0 Z"></path>
 					</g>
-					<path d="M48897.3 2697.7 L48897.25 3314 L52671 3496.226519515826 L52671.0 3496.2 " fill="none"></path>
+					<path d="M29300.2 1238.1 L29109.75 1459 L29109.75 1651 L29109.8 1651.0 " fill="none"></path>
+					<path d="M29304.2 1241.6 L29300.2 1238.1 L29296.1 1234.6 L29308.9 1228.0 Z"></path>
+					<path d="M29916.8 1762.7 L29916.75 1936 L47930 2606.1564140984624 L47930.0 2606.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48902.6 2688.3 L48897.3 2697.7 L48891.9 2688.3 L48897.3 2679.0 Z"></path>
+						<path d="M29922.1 1753.3 L29916.8 1762.7 L29911.4 1753.3 L29916.8 1744.0 Z"></path>
 					</g>
-					<path d="M49190.3 2704.7 L49190.25 3314 L48057 3491.942433171964 L48057.0 3491.9 " fill="none"></path>
+					<path d="M29371.9 1233.1 L29916.75 1459 L29916.75 1651 L29916.8 1651.0 " fill="none"></path>
+					<path d="M29374.0 1228.2 L29371.9 1233.1 L29369.9 1238.0 L29359.6 1228.0 Z"></path>
+					<path d="M48086.5 3310.6 L48084.75 3314 L31436 3498.488755366082 L31436.0 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49195.6 2695.3 L49190.3 2704.7 L49184.9 2695.3 L49190.3 2686.0 Z"></path>
+						<path d="M48095.5 3304.7 L48086.5 3310.6 L48086.0 3299.9 L48095.0 3294.0 Z"></path>
 					</g>
-					<path d="M49505.6 2696.8 L49375.5 3314 L49375.5 3485 L49375.5 3485.0 " fill="none"></path>
+					<path d="M48126.1 3311.0 L48124.75 3314 L59258.25 3499.5583333333334 L59258.3 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49512.8 2688.7 L49505.6 2696.8 L49502.3 2686.5 L49509.5 2678.5 Z"></path>
+						<path d="M48134.8 3304.7 L48126.1 3311.0 L48125.1 3300.3 L48133.8 3294.0 Z"></path>
 					</g>
-					<path d="M49536.9 2696.7 L49676.25 3314 L57510.5 3497.4788089034 L57510.5 3497.5 " fill="none"></path>
+					<path d="M48407.3 3312.6 L48407.25 3314 L48407.25 3500.5 L48407.25 3500.5 L48407.25 3687 L48407.25 3687 L48407.25 3843.5 L48407.25 3843.5 L48407.25 4000 L48407.25 4000 L61689 4133.507454569322 L61689.0 4133.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49540.1 2686.4 L49536.9 2696.7 L49529.7 2688.8 L49532.8 2678.5 Z"></path>
+						<path d="M48413.0 3303.6 L48407.3 3312.6 L48402.4 3303.1 L48408.1 3294.0 Z"></path>
 					</g>
-					<path d="M57639.5 3550.2 L57639.5 3687 L56283.25 3833.7610198789976 L56283.3 3833.8 " fill="none"></path>
+					<path d="M48447.2 3312.7 L48447.25 3314 L24068.25 3499.9736379253927 L24068.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57644.8 3540.8 L57639.5 3550.2 L57634.2 3540.8 L57639.5 3531.5 Z"></path>
+						<path d="M48452.4 3303.2 L48447.2 3312.7 L48441.8 3303.4 L48446.9 3294.0 Z"></path>
 					</g>
-					<path d="M18447.8 3450.3 L18459.75 3447 L18467.25 3447 L18467.25 3447 L18474.75 3500.5 L18474.75 3500.5 L18467.25 3554 L18467.25 3554 L18459.75 3554 L18459.75 3554 L18429.75 3545.769230769231 L18429.8 3545.8 " fill="none"></path>
+					<path d="M48737.7 3311.1 L48739 3314 L61341.25 3499.7262786700644 L61341.3 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18437.3 3447.6 L18447.8 3450.3 L18440.2 3457.9 L18429.8 3455.2 Z"></path>
+						<path d="M48738.9 3300.4 L48737.7 3311.1 L48729.1 3304.7 L48730.2 3294.0 Z"></path>
 					</g>
+					<path d="M59191.7 1740.8 L59272.75 1936 L48943 2592.7952705040952 L48943.0 2592.8 " fill="none"></path>
+					<path d="M59196.7 1738.8 L59191.7 1740.8 L59186.8 1742.9 L59186.6 1728.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3709.9 2648.6 L4572.75 3314 L18099.75 3498.252519719544 L18099.8 3498.3 " fill="none"></path>
+						<path d="M83198.6 1263.7 L83262 1459 L83262 1697.5 L83262 1697.5 L83262 1936 L83262 1936 L48943 2614.97922499318 L48943.0 2615.0 " fill="none"></path>
 					</g>
-					<path d="M3713.2 2644.4 L3709.9 2648.6 L3706.7 2652.9 L3699.4 2640.5 Z"></path>
-					<path d="M49852.1 2712.2 L49716.25 3314 L39676.25 3499.695443050528 L39676.3 3499.7 " fill="none"></path>
+					<path d="M83203.7 1262.0 L83198.6 1263.7 L83193.5 1265.3 L83194.5 1251.0 Z"></path>
+					<path d="M56280.5 1754.7 L56280.5 1936 L48943 2580.510135135135 L48943.0 2580.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49859.3 2704.3 L49852.1 2712.2 L49848.9 2701.9 L49856.2 2694.0 Z"></path>
+						<path d="M56285.8 1745.3 L56280.5 1754.7 L56275.2 1745.3 L56280.5 1736.0 Z"></path>
 					</g>
-					<path d="M49874.3 2712.7 L49891.75 3314 L49891.75 3500.5 L49891.75 3500.5 L49891.75 3687 L49891.75 3687 L49891.75 3843.5 L49891.75 3843.5 L49891.75 4000 L49891.75 4000 L30022.5 4133.516178775152 L30022.5 4133.5 " fill="none"></path>
+					<path d="M55967.6 1796.9 L56062.25 1936 L56062.25 2609.5 L56062.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49879.4 2703.2 L49874.3 2712.7 L49868.7 2703.5 L49873.8 2694.0 Z"></path>
+						<path d="M55966.8 1786.2 L55967.6 1796.9 L55958.0 1792.2 L55957.1 1781.5 Z"></path>
 					</g>
-					<path d="M50647.3 2719.4 L50543.75 3314 L51995.18699731903 3485 L51995.2 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M50654.2 2711.1 L50647.3 2719.4 L50643.7 2709.3 L50650.5 2701.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M51093.3 1217.3 L55900 1459 L55900 1613.5 L55900.0 1613.5 " fill="none"></path>
 					</g>
-					<path d="M50652.8 2719.5 L50583.75 3314 L48625 3496.3571072007985 L48625.0 3496.4 " fill="none"></path>
+					<path d="M51093.6 1211.9 L51093.3 1217.3 L51093.0 1222.6 L51080.0 1216.6 Z"></path>
+					<path d="M82676.8 1285.2 L82676.75 1459 L82676.75 1546 L82676.8 1546.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M50659.1 2710.9 L50652.8 2719.5 L50648.6 2709.7 L50654.9 2701.0 Z"></path>
+						<path d="M82682.1 1275.8 L82676.8 1285.2 L82671.4 1275.8 L82676.8 1266.5 Z"></path>
 					</g>
-					<path d="M50658.3 2719.6 L50623.75 3314 L39963.25 3499.881006918474 L39963.3 3499.9 " fill="none"></path>
+					<path d="M82279.7 170.1 L82676.75 293 L82676.75 629.5 L82676.75 629.5 L82676.75 966 L82676.75 966 L82676.75 1158.5 L82676.8 1158.5 " fill="none"></path>
+					<path d="M82281.3 165.1 L82279.7 170.1 L82278.2 175.2 L82267.0 166.2 Z"></path>
+					<path d="M82413.0 1847.2 L82256.5 1936 L82256.5 2625 L82256.5 2625 L82256.5 3314 L82256.5 3314 L59371.25 3500.0406954569726 L59371.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M50664.1 2710.6 L50658.3 2719.6 L50653.5 2710.0 L50659.3 2701.0 Z"></path>
+						<path d="M82423.8 1847.2 L82413.0 1847.2 L82418.5 1837.9 L82429.3 1838.0 Z"></path>
 					</g>
-					<path d="M50681.5 2719.3 L50793.25 3314 L39055 3499.410118782951 L39055.0 3499.4 " fill="none"></path>
+					<path d="M82705.2 1867.4 L82716.75 1936 L82716.75 2625 L82716.75 2625 L82716.75 3314 L82716.75 3314 L72068.25 3499.0230819397216 L72068.3 3499.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M50685.0 2709.2 L50681.5 2719.3 L50674.5 2711.2 L50678.0 2701.0 Z"></path>
+						<path d="M82709.0 1857.3 L82705.2 1867.4 L82698.4 1859.1 L82702.2 1849.0 Z"></path>
 					</g>
-					<path d="M50686.9 2719.1 L50833.25 3314 L41967.75 3496.6877796806807 L41967.8 3496.7 " fill="none"></path>
+					<path d="M33720.3 1702.4 L38285.25 1936 L36372.60921625544 2594 L36372.6 2594.0 " fill="none"></path>
+					<path d="M33720.6 1697.1 L33720.3 1702.4 L33720.0 1707.7 L33707.0 1701.7 Z"></path>
+					<path d="M45657.5 3923.2 L45657.5 4000 L18421.25 4133.646700173024 L18421.3 4133.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M50689.9 2708.8 L50686.9 2719.1 L50679.5 2711.3 L50682.4 2701.0 Z"></path>
+						<path d="M45662.8 3913.8 L45657.5 3923.2 L45652.2 3913.8 L45657.5 3904.5 Z"></path>
 					</g>
-					<path d="M51054.1 2719.4 L50873.25 3314 L39963.25 3499.8951167146315 L39963.3 3499.9 " fill="none"></path>
+					<path d="M57045.0 2674.7 L57045 3314 L25100 3499.639937057925 L25100.0 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51061.9 2712.0 L51054.1 2719.4 L51051.7 2708.9 L51059.5 2701.5 Z"></path>
+						<path d="M57050.3 2665.3 L57045.0 2674.7 L57039.7 2665.3 L57045.0 2656.0 Z"></path>
 					</g>
-					<path d="M51059.5 2719.6 L50913.25 3314 L41967.75 3496.7211817534635 L41967.8 3496.7 " fill="none"></path>
+					<path d="M57345.5 2697.7 L57345.5 3314 L21499.75 3500.3154816234105 L21499.8 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51066.9 2711.8 L51059.5 2719.6 L51056.5 2709.3 L51063.9 2701.5 Z"></path>
+						<path d="M57350.8 2688.3 L57345.5 2697.7 L57340.2 2688.3 L57345.5 2679.0 Z"></path>
 					</g>
-					<path d="M51103.3 2719.7 L51232.5 3314 L48625 3497.3705693815987 L48625.0 3497.4 " fill="none"></path>
+					<path d="M70185.6 2827.8 L69742.25 3314 L72645 3492.770866011723 L72645.0 3492.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51106.6 2709.5 L51103.3 2719.7 L51096.1 2711.8 L51099.4 2701.5 Z"></path>
+						<path d="M70195.8 2824.5 L70185.6 2827.8 L70187.9 2817.3 L70198.2 2814.0 Z"></path>
 					</g>
-					<path d="M51422.3 2720.2 L51422.25 3314 L48625 3497.579528459576 L48625.0 3497.6 " fill="none"></path>
+					<path d="M70197.0 2828.2 L69782.25 3314 L69782.25 3500.5 L69782.25 3500.5 L69782.25 3687 L69782.25 3687 L69782.25 3843.5 L69782.25 3843.5 L69782.25 4000 L69782.25 4000 L72971.75 4128.077015283188 L72971.8 4128.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51427.6 2710.8 L51422.3 2720.2 L51416.9 2710.8 L51422.3 2701.5 Z"></path>
+						<path d="M70207.1 2824.6 L70197.0 2828.2 L70199.0 2817.6 L70209.1 2814.0 Z"></path>
 					</g>
-					<path d="M51689.8 2712.4 L51583.75 3314 L48625 3497.736577041538 L48625.0 3497.7 " fill="none"></path>
+					<path d="M70352.4 2832.6 L70310.5 3314 L70310.5 3439 L70310.5 3439.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51696.7 2704.1 L51689.8 2712.4 L51686.2 2702.3 L51693.1 2694.0 Z"></path>
+						<path d="M70358.5 2823.8 L70352.4 2832.6 L70347.9 2822.8 L70354.0 2814.0 Z"></path>
 					</g>
-					<path d="M51724.7 2712.2 L51859.25 3314 L41967.75 3497.0759440281845 L41967.8 3497.1 " fill="none"></path>
+					<path d="M70503.2 2829.7 L70817.25 3314 L64120.25 3499.227717633101 L64120.3 3499.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51727.9 2701.9 L51724.7 2712.2 L51717.5 2704.3 L51720.7 2694.0 Z"></path>
+						<path d="M70502.6 2818.9 L70503.2 2829.7 L70493.7 2824.7 L70493.0 2814.0 Z"></path>
 					</g>
-					<path d="M41985.9 3450.0 L41997.75 3447 L42005.25 3447 L42005.25 3447 L42012.75 3500.5 L42012.75 3500.5 L42005.25 3554 L42005.25 3554 L41997.75 3554 L41997.75 3554 L41967.75 3546.5348837209303 L41967.8 3546.5 " fill="none"></path>
+					<path d="M70514.8 2829.2 L70857.25 3314 L71898.25 3486.4214031971583 L71898.3 3486.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41975.5 3447.0 L41985.9 3450.0 L41978.1 3457.4 L41967.8 3454.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3711.0 2648.4 L4612.75 3314 L41597.75 3499.5717648641375 L41597.8 3499.6 " fill="none"></path>
+						<path d="M70513.8 2818.5 L70514.8 2829.2 L70505.1 2824.7 L70504.0 2814.0 Z"></path>
 					</g>
-					<path d="M3714.1 2644.1 L3711.0 2648.4 L3707.8 2652.7 L3700.3 2640.5 Z"></path>
-					<path d="M52730.4 3860.2 L50991.25 4000 L30022.5 4133.541461212171 L30022.5 4133.5 " fill="none"></path>
+					<path d="M70526.3 2828.8 L70897.25 3314 L36328.5 3499.8066265103644 L36328.5 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M52740.1 3864.8 L52730.4 3860.2 L52739.3 3854.2 L52749.0 3858.7 Z"></path>
+						<path d="M70524.9 2818.2 L70526.3 2828.8 L70516.4 2824.7 L70515.0 2814.0 Z"></path>
 					</g>
-					<path d="M52730.4 3860.6 L51031.25 4000 L54830 4129.040496862919 L54830.0 4129.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M52740.1 3865.1 L52730.4 3860.6 L52739.3 3854.5 L52749.0 3859.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M83607.3 173.1 L83346.75 293 L83346.75 629.5 L83346.75 629.5 L83346.75 966 L83346.75 966 L83346.75 1212.5 L83346.75 1212.5 L83346.75 1459 L83346.75 1459 L83346.75 1697.5 L83346.75 1697.5 L83346.75 1936 L83346.75 1936 L70677.5 2608.69921972835 L70677.5 2608.7 " fill="none"></path>
 					</g>
-					<path d="M52938.5 3945.7 L52938.5 4000 L55162 4125.87621461766 L55162.0 4125.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M52943.8 3936.3 L52938.5 3945.7 L52933.2 3936.3 L52938.5 3927.0 Z"></path>
+					<path d="M83609.5 177.9 L83607.3 173.1 L83605.1 168.2 L83619.4 167.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3124.2 2651.3 L3601.5 3314 L24804 3499.207196552774 L24804.0 3499.2 " fill="none"></path>
 					</g>
-					<path d="M53035.5 3940.2 L53095.5 4000 L55489 4126.745307251531 L55489.0 4126.7 " fill="none"></path>
+					<path d="M3128.5 2648.2 L3124.2 2651.3 L3119.9 2654.4 L3116.4 2640.5 Z"></path>
+					<path d="M56565.2 1832.8 L56369.5 1936 L56369.5 2609.5 L56369.5 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53032.6 3929.8 L53035.5 3940.2 L53025.1 3937.4 L53022.3 3927.0 Z"></path>
+						<path d="M56576.0 1833.1 L56565.2 1832.8 L56571.0 1823.7 L56581.8 1824.1 Z"></path>
 					</g>
-					<path d="M53058.2 3938.6 L53135.5 4000 L58547 4131.807870580751 L58547.0 4131.8 " fill="none"></path>
+					<path d="M56731.5 1857.8 L56687.5 1936 L56687.5 2609.5 L56687.5 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53054.2 3928.6 L53058.2 3938.6 L53047.6 3937.0 L53043.6 3927.0 Z"></path>
+						<path d="M56740.8 1852.2 L56731.5 1857.8 L56731.5 1847.0 L56740.7 1841.5 Z"></path>
 					</g>
-					<path d="M52066.7 2719.5 L51899.25 3314 L39055 3499.503465432792 L39055.0 3499.5 " fill="none"></path>
+					<path d="M56885.5 1858.9 L56916 1936 L56916 2625 L56916 2625 L56916 3314 L56916 3314 L21499.75 3500.313246172615 L21499.8 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M52074.3 2711.9 L52066.7 2719.5 L52064.0 2709.0 L52071.7 2701.5 Z"></path>
+						<path d="M56887.0 1848.2 L56885.5 1858.9 L56877.1 1852.1 L56878.7 1841.5 Z"></path>
 					</g>
-					<path d="M52072.1 2719.7 L51939.25 3314 L48625 3498.0290658727204 L48625.0 3498.0 " fill="none"></path>
+					<path d="M57079.1 1798.4 L57430.25 1936 L70063.5 2608.6538706748324 L70063.5 2608.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M52079.3 2711.8 L52072.1 2719.7 L52068.9 2709.4 L52076.2 2701.5 Z"></path>
+						<path d="M57072.4 1790.0 L57079.1 1798.4 L57068.5 1799.9 L57061.8 1791.6 Z"></path>
 					</g>
-					<path d="M52119.5 2719.5 L52284.75 3314 L53881.972520107236 3485 L53882.0 3485.0 " fill="none"></path>
+					<path d="M2855.7 3401.2 L2869 3394.5 L2876.5 3394.5 L2876.5 3394.5 L2884 3500.5 L2884 3500.5 L2876.5 3606.5 L2876.5 3606.5 L2869 3606.5 L2869 3606.5 L2839 3591.393111638955 L2839.0 3591.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M52122.2 2709.1 L52119.5 2719.5 L52111.9 2711.9 L52114.5 2701.5 Z"></path>
+						<path d="M2844.9 3400.6 L2855.7 3401.2 L2849.7 3410.2 L2839.0 3409.6 Z"></path>
 					</g>
-					<path d="M52518.0 2741.7 L52325.25 3314 L53674.75 3491.553262786596 L53674.8 3491.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M52526.0 2734.5 L52518.0 2741.7 L52515.9 2731.1 L52523.9 2724.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3125.5 2651.0 L3641.5 3314 L2839 3466.254577822991 L2839.0 3466.3 " fill="none"></path>
 					</g>
-					<path d="M52524.7 2742.0 L52365.25 3314 L39963.25 3499.96767839196 L39963.3 3500.0 " fill="none"></path>
+					<path d="M3129.7 2647.7 L3125.5 2651.0 L3121.3 2654.3 L3117.3 2640.5 Z"></path>
+					<path d="M60125.4 2739.3 L59764 3314 L64938 3499.4070515899703 L64938.0 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M52532.3 2734.4 L52524.7 2742.0 L52522.0 2731.6 L52529.7 2724.0 Z"></path>
+						<path d="M60134.9 2734.2 L60125.4 2739.3 L60125.8 2728.6 L60135.3 2723.5 Z"></path>
 					</g>
-					<path d="M52583.9 2742.2 L52713.75 3314 L47014 3498.7978399756616 L47014.0 3498.8 " fill="none"></path>
+					<path d="M60153.4 2741.0 L59936.75 3314 L59561.74195710456 3485 L59561.7 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M52587.0 2731.9 L52583.9 2742.2 L52576.6 2734.3 L52579.7 2724.0 Z"></path>
+						<path d="M60161.7 2734.1 L60153.4 2741.0 L60151.7 2730.3 L60160.0 2723.5 Z"></path>
 					</g>
-					<path d="M6239.2 3435.4 L6251.25 3432 L6258.75 3432 L6258.75 3432 L6266.25 3500.5 L6266.25 3500.5 L6258.75 3569 L6258.75 3569 L6251.25 3569 L6251.25 3569 L6221.25 3560.543209876543 L6221.3 3560.5 " fill="none"></path>
+					<path d="M60266.0 2739.5 L60610.75 3314 L60095.457774798924 3485 L60095.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6228.8 3432.8 L6239.2 3435.4 L6231.7 3443.1 L6221.3 3440.5 Z"></path>
+						<path d="M60265.7 2728.8 L60266.0 2739.5 L60256.6 2734.2 L60256.4 2723.5 Z"></path>
 					</g>
+					<path d="M29411.6 1214.7 L39254 1459 L39254 1666.5 L39254.0 1666.5 " fill="none"></path>
+					<path d="M29411.7 1209.4 L29411.6 1214.7 L29411.4 1220.0 L29398.3 1214.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3712.0 2648.2 L4652.75 3314 L5795.25 3471.193839911472 L5795.3 3471.2 " fill="none"></path>
+						<path d="M83550.1 1434.5 L83512.25 1459 L82099 1677.0560407569142 L82099.0 1677.1 " fill="none"></path>
 					</g>
-					<path d="M3715.1 2643.8 L3712.0 2648.2 L3709.0 2652.6 L3701.2 2640.5 Z"></path>
-					<path d="M53062.9 2801.9 L52973.75 3314 L54395.75 3492.3476798924007 L54395.8 3492.3 " fill="none"></path>
+					<path d="M83553.0 1438.9 L83550.1 1434.5 L83547.2 1430.0 L83561.3 1427.2 Z"></path>
+					<path d="M82932.8 2749.8 L82817.5 3314 L82817.5 3500.5 L82817.5 3500.5 L82817.5 3687 L82817.5 3687 L82817.5 3843.5 L82817.5 3843.5 L82817.5 4000 L82817.5 4000 L83411.5 4122.738627602159 L83411.5 4122.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53069.8 2793.6 L53062.9 2801.9 L53059.3 2791.8 L53066.1 2783.5 Z"></path>
+						<path d="M82939.9 2741.7 L82932.8 2749.8 L82929.4 2739.6 L82936.5 2731.5 Z"></path>
 					</g>
-					<path d="M53073.2 2802.0 L53013.75 3314 L47014 3498.882213226486 L47014.0 3498.9 " fill="none"></path>
+					<path d="M82940.0 2750.0 L82857.5 3314 L82857.5 3500.5 L82857.5 3500.5 L82857.5 3687 L82857.5 3687 L82857.5 3843.5 L82857.5 3843.5 L82857.5 4000 L82857.5 4000 L77468.25 4130.950541728999 L77468.3 4131.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53079.6 2793.4 L53073.2 2802.0 L53069.0 2792.2 L53075.3 2783.5 Z"></path>
+						<path d="M82946.6 2741.5 L82940.0 2750.0 L82936.0 2740.0 L82942.7 2731.5 Z"></path>
 					</g>
-					<path d="M53083.5 2802.1 L53053.75 3314 L39963.25 3499.9956003352127 L39963.3 3500.0 " fill="none"></path>
+					<path d="M82947.2 2750.1 L82897.5 3314 L82897.5 3500.5 L82897.5 3500.5 L82897.5 3687 L82897.5 3687 L82897.5 3843.5 L82897.5 3843.5 L82897.5 4000 L82897.5 4000 L73266.75 4131.978677166159 L73266.8 4132.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53089.3 2793.1 L53083.5 2802.1 L53078.7 2792.5 L53084.5 2783.5 Z"></path>
+						<path d="M82953.4 2741.3 L82947.2 2750.1 L82942.7 2740.3 L82948.9 2731.5 Z"></path>
 					</g>
-					<path d="M53117.8 2802.0 L53187.5 3314 L53696.603217158176 3485 L53696.6 3485.0 " fill="none"></path>
+					<path d="M82965.5 2750.1 L82998.25 3314 L72896 3498.2115445723643 L72896.0 3498.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53121.9 2792.0 L53117.8 2802.0 L53111.3 2793.5 L53115.3 2783.5 Z"></path>
+						<path d="M82970.3 2740.5 L82965.5 2750.1 L82959.6 2741.1 L82964.4 2731.5 Z"></path>
 					</g>
-					<path d="M53128.1 2801.8 L53227.5 3314 L51953.75 3496.3483976204184 L51953.8 3496.3 " fill="none"></path>
+					<path d="M82976.5 2750.0 L83059 3314 L64999 3500.185567010309 L64999.0 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53131.5 2791.6 L53128.1 2801.8 L53121.1 2793.7 L53124.5 2783.5 Z"></path>
+						<path d="M82980.5 2740.0 L82976.5 2750.0 L82969.9 2741.5 L82973.8 2731.5 Z"></path>
 					</g>
-					<path d="M53402.3 2779.6 L53267.5 3314 L39963.25 3500.0036826027476 L39963.3 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M53409.7 2771.9 L53402.3 2779.6 L53399.4 2769.2 L53406.8 2761.5 Z"></path>
+					<path d="M83569.0 1446.8 L83552.25 1459 L83552.25 1697.5 L83552.25 1697.5 L83552.25 1936 L83552.25 1936 L83050.06567489114 2518.5 L83050.1 2518.5 " fill="none"></path>
+					<path d="M83572.2 1451.1 L83569.0 1446.8 L83565.9 1442.5 L83579.8 1439.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M81966.5 1741.8 L81966.5 1936 L82804.95337445573 2518.5 L82805.0 2518.5 " fill="none"></path>
 					</g>
-					<path d="M53411.2 2779.8 L53307.5 3314 L51953.75 3496.5885915747604 L51953.8 3496.6 " fill="none"></path>
+					<path d="M81971.8 1741.8 L81966.5 1741.8 L81961.2 1741.8 L81966.5 1728.5 Z"></path>
+					<path d="M83804.6 2750.0 L83727 3314 L64999 3500.1967641335928 L64999.0 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53418.2 2771.7 L53411.2 2779.8 L53407.7 2769.6 L53414.8 2761.5 Z"></path>
+						<path d="M83811.1 2741.5 L83804.6 2750.0 L83800.5 2740.0 L83807.1 2731.5 Z"></path>
 					</g>
-					<path d="M53467.4 2779.9 L53557.5 3314 L47014 3499.0155776228016 L47014.0 3499.0 " fill="none"></path>
+					<path d="M83811.8 2750.1 L83767 3314 L83767 3500.5 L83767 3500.5 L83767 3687 L83767 3687 L83767 3843.5 L83767 3843.5 L83767 4000 L83767 4000 L77468.25 4131.382262520917 L77468.3 4131.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53471.1 2769.8 L53467.4 2779.9 L53460.6 2771.6 L53464.3 2761.5 Z"></path>
+						<path d="M83817.9 2741.2 L83811.8 2750.1 L83807.2 2740.4 L83813.3 2731.5 Z"></path>
 					</g>
-					<path d="M60962.0 717.2 L60962 966 L60962 1197 L60962.0 1197.0 " fill="none"></path>
+					<path d="M83835.3 2750.1 L83896.5 3314 L72896 3498.396301456049 L72896.0 3498.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60967.3 707.8 L60962.0 717.2 L60956.7 707.8 L60962.0 698.5 Z"></path>
+						<path d="M83839.6 2740.2 L83835.3 2750.1 L83829.0 2741.4 L83833.3 2731.5 Z"></path>
 					</g>
-					<path d="M60962.0 165.3 L60962 293 L60962 560.5 L60962.0 560.5 " fill="none"></path>
-					<path d="M60967.3 165.3 L60962.0 165.3 L60956.7 165.3 L60962.0 152.0 Z"></path>
-					<path d="M53729.0 2734.2 L53597.5 3314 L39963.25 3500.015664148942 L39963.3 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M53736.3 2726.3 L53729.0 2734.2 L53725.8 2723.9 L53733.1 2716.0 Z"></path>
+					<path d="M83881.4 1785.9 L83821.75 1936 L83821.75 2518.5 L83821.8 2518.5 " fill="none"></path>
+					<path d="M83886.3 1787.9 L83881.4 1785.9 L83876.4 1783.9 L83886.3 1773.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M83606.3 1447.5 L83592.25 1459 L83592.25 1697.5 L83592.25 1697.5 L83592.25 1936 L83592.25 1936 L83592.25 2625 L83592.25 2625 L83592.25 3314 L83592.25 3314 L72896 3498.3371566521128 L72896.0 3498.3 " fill="none"></path>
 					</g>
-					<path d="M53735.3 2734.4 L53637.5 3314 L36245.5 3498.9368835167343 L36245.5 3498.9 " fill="none"></path>
+					<path d="M83609.7 1451.6 L83606.3 1447.5 L83602.9 1443.3 L83616.6 1439.0 Z"></path>
+					<path d="M72585.4 3943.9 L72482 4000 L77217.25 4130.540245846834 L77217.3 4130.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53742.1 2726.1 L53735.3 2734.4 L53731.6 2724.3 L53738.4 2716.0 Z"></path>
+						<path d="M72596.2 3944.1 L72585.4 3943.9 L72591.1 3934.8 L72601.8 3935.0 Z"></path>
 					</g>
-					<path d="M53756.8 2734.7 L53773 3314 L47014 3499.0625412904647 L47014.0 3499.1 " fill="none"></path>
+					<path d="M72609.4 3944.9 L72522 4000 L72971.75 4100.9066555043955 L72971.8 4100.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53761.9 2725.2 L53756.8 2734.7 L53751.2 2725.5 L53756.3 2716.0 Z"></path>
+						<path d="M72620.2 3944.5 L72609.4 3944.9 L72614.5 3935.5 L72625.2 3935.0 Z"></path>
 					</g>
-					<path d="M53775.2 2734.3 L53889.25 3314 L52848 3485.890351847754 L52848.0 3485.9 " fill="none"></path>
+					<path d="M72990.7 3850.3 L77841.5 4000 L83411.5 4132.701573473198 L83411.5 4132.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53778.7 2724.1 L53775.2 2734.3 L53768.2 2726.2 L53771.6 2716.0 Z"></path>
+						<path d="M72981.5 3844.7 L72990.7 3850.3 L72981.2 3855.3 L72972.0 3849.7 Z"></path>
 					</g>
-					<path d="M36263.1 3443.8 L36275.5 3439.5 L36283 3439.5 L36283 3439.5 L36290.5 3500.5 L36290.5 3500.5 L36283 3561.5 L36283 3561.5 L36275.5 3561.5 L36275.5 3561.5 L36245.5 3551.1610169491523 L36245.5 3551.2 " fill="none"></path>
+					<path d="M72990.7 3850.1 L77958.75 4000 L18421.25 4133.838146604148 L18421.3 4133.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36252.6 3441.8 L36263.1 3443.8 L36256.1 3451.8 L36245.5 3449.8 Z"></path>
+						<path d="M72981.5 3844.5 L72990.7 3850.1 L72981.2 3855.2 L72972.0 3849.6 Z"></path>
 					</g>
+					<path d="M83643.7 1448.2 L83632.25 1459 L83632.25 1697.5 L83632.25 1697.5 L83632.25 1936 L83632.25 1936 L83632.25 2625 L83632.25 2625 L83632.25 3314 L83632.25 3314 L83632.25 3500.5 L83632.25 3500.5 L83632.25 3687 L83632.25 3687 L72972 3840.5967155384724 L72972.0 3840.6 " fill="none"></path>
+					<path d="M83647.3 1452.0 L83643.7 1448.2 L83640.0 1444.3 L83653.3 1439.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3713.1 2648.0 L4692.75 3314 L35951.5 3499.6270547590807 L35951.5 3499.6 " fill="none"></path>
-					</g>
-					<path d="M3716.1 2643.6 L3713.1 2648.0 L3710.1 2652.4 L3702.1 2640.5 Z"></path>
-					<path d="M54067.3 2772.1 L53929.25 3314 L51953.75 3497.8018209029683 L51953.8 3497.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M54074.8 2764.4 L54067.3 2772.1 L54064.4 2761.7 L54071.9 2754.0 Z"></path>
+						<path d="M72770.5 3552.3 L72770.5 3687 L72770.5 3752 L72770.5 3752.0 " fill="none"></path>
 					</g>
-					<path d="M54075.8 2772.3 L53969.25 3314 L55046.5 3496.3527342863626 L55046.5 3496.4 " fill="none"></path>
+					<path d="M72775.8 3552.3 L72770.5 3552.3 L72765.2 3552.3 L72770.5 3539.0 Z"></path>
+					<path d="M83917.4 3956.9 L83881.75 4000 L77468.25 4131.428200030586 L77468.3 4131.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54082.8 2764.2 L54075.8 2772.3 L54072.3 2762.1 L54079.4 2754.0 Z"></path>
+						<path d="M83927.5 3953.1 L83917.4 3956.9 L83919.3 3946.3 L83929.3 3942.5 Z"></path>
 					</g>
-					<path d="M54121.0 2772.6 L54180.5 3314 L55135.89946380697 3485 L55135.9 3485.0 " fill="none"></path>
+					<path d="M84063.5 3959.5 L84081.75 4000 L73266.75 4132.197035347776 L73266.8 4132.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54125.3 2762.7 L54121.0 2772.6 L54114.7 2763.9 L54118.9 2754.0 Z"></path>
+						<path d="M84064.5 3948.8 L84063.5 3959.5 L84054.8 3953.2 L84055.8 3942.5 Z"></path>
 					</g>
-					<path d="M53292.5 3916.2 L53292.5 4000 L30022.5 4133.5866678091 L30022.5 4133.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M53297.8 3906.8 L53292.5 3916.2 L53287.2 3906.8 L53292.5 3897.5 Z"></path>
+					<path d="M83951.6 1785.9 L84011.25 1936 L84011.25 2625 L84011.25 2625 L84011.25 3314 L84011.25 3314 L84011.25 3500.5 L84011.25 3500.5 L84011.25 3687 L84011.25 3687 L84011.25 3744.5 L84011.3 3744.5 " fill="none"></path>
+					<path d="M83956.6 1783.9 L83951.6 1785.9 L83946.7 1787.9 L83946.7 1773.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M75563.6 148.6 L76277.25 293 L76277.25 614 L76277.3 614.0 " fill="none"></path>
+					</g>
+					<path d="M75564.6 143.4 L75563.6 148.6 L75562.5 153.9 L75550.5 146.0 Z"></path>
+					<path d="M76203.6 640.3 L73986.5 966 L73986.5 1197 L73986.5 1197.0 " fill="none"></path>
+					<path d="M76204.3 645.6 L76203.6 640.3 L76202.8 635.0 L76216.8 638.4 Z"></path>
+					<path d="M76203.6 641.9 L74274 966 L74274 1197 L74274.0 1197.0 " fill="none"></path>
+					<path d="M76204.5 647.1 L76203.6 641.9 L76202.7 636.6 L76216.8 639.7 Z"></path>
+					<path d="M76203.7 644.0 L74574.5 966 L74574.5 1197 L74574.5 1197.0 " fill="none"></path>
+					<path d="M76204.7 649.3 L76203.7 644.0 L76202.6 638.8 L76216.8 641.5 Z"></path>
+					<path d="M76203.8 647.1 L74871 966 L74871 1197 L74871.0 1197.0 " fill="none"></path>
+					<path d="M76205.0 652.3 L76203.8 647.1 L76202.5 641.9 L76216.8 644.0 Z"></path>
+					<path d="M76213.9 648.9 L75179 966 L75179 1197 L75179.0 1197.0 " fill="none"></path>
+					<path d="M76215.5 654.0 L76213.9 648.9 L76212.4 643.8 L76226.7 645.0 Z"></path>
+					<path d="M76270.2 657.9 L76194 966 L76194 1197 L76194.0 1197.0 " fill="none"></path>
+					<path d="M76275.4 659.2 L76270.2 657.9 L76265.0 656.7 L76273.4 645.0 Z"></path>
+					<path d="M76294.7 656.2 L76497.5 966 L76497.5 1197 L76497.5 1197.0 " fill="none"></path>
+					<path d="M76299.2 653.2 L76294.7 656.2 L76290.2 659.1 L76287.4 645.0 Z"></path>
+					<path d="M76312.1 652.3 L76791 966 L76791 1197 L76791.0 1197.0 " fill="none"></path>
+					<path d="M76315.0 647.8 L76312.1 652.3 L76309.1 656.8 L76300.9 645.0 Z"></path>
+					<path d="M76327.6 650.0 L77102 966 L77102 1197 L77102.0 1197.0 " fill="none"></path>
+					<path d="M76329.6 645.1 L76327.6 650.0 L76325.6 655.0 L76315.2 645.0 Z"></path>
+					<path d="M76340.6 648.9 L77375.5 966 L77375.5 1197 L77375.5 1197.0 " fill="none"></path>
+					<path d="M76342.1 643.8 L76340.6 648.9 L76339.0 654.0 L76327.8 645.0 Z"></path>
+					<path d="M77164.8 4639.7 L77164.75 4641 L76981.75 4666.627218934911 L76981.8 4666.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M77170.1 4630.3 L77164.8 4639.7 L77159.4 4630.3 L77164.8 4621.0 Z"></path>
+					</g>
+					<path d="M76644.0 4174.7 L76556.25 4268 L76925.25 4381.095316351684 L76925.3 4381.1 " fill="none"></path>
+					<path d="M76647.9 4178.4 L76644.0 4174.7 L76640.1 4171.1 L76653.1 4165.0 Z"></path>
+					<path d="M76986.8 4215.8 L76986.75 4268 L77005.83847184987 4288 L77005.8 4288.0 " fill="none"></path>
+					<path d="M76992.1 4215.8 L76986.8 4215.8 L76981.4 4215.8 L76986.8 4202.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M77342.8 4253.3 L77342.75 4268 L77323.66152815013 4288 L77323.7 4288.0 " fill="none"></path>
 					</g>
-					<path d="M54674.0 2712.2 L54674 3314 L39963.25 3500.0510214461306 L39963.3 3500.1 " fill="none"></path>
+					<path d="M77348.1 4253.3 L77342.8 4253.3 L77337.4 4253.3 L77342.8 4240.0 Z"></path>
+					<path d="M59799.3 3916.2 L59799.25 4000 L77217.25 4133.041411348932 L77217.3 4133.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54679.3 2702.8 L54674.0 2712.2 L54668.7 2702.8 L54674.0 2693.5 Z"></path>
+						<path d="M59804.6 3906.8 L59799.3 3916.2 L59793.9 3906.8 L59799.3 3897.5 Z"></path>
 					</g>
-					<path d="M55305.7 2738.5 L54843 3314 L48057 3499.0141071559096 L48057.0 3499.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M55315.7 2734.6 L55305.7 2738.5 L55307.4 2727.9 L55317.4 2724.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M59799.3 3552.3 L59799.25 3687 L59799.25 3789.5 L59799.3 3789.5 " fill="none"></path>
 					</g>
-					<path d="M55312.0 2739.0 L54883 3314 L30799.5 3499.859464548031 L30799.5 3499.9 " fill="none"></path>
+					<path d="M59804.6 3552.3 L59799.3 3552.3 L59793.9 3552.3 L59799.3 3539.0 Z"></path>
+					<path d="M70172.6 3570.4 L69942.75 3687 L69942.75 3843.5 L69942.75 3843.5 L69942.75 4000 L69942.75 4000 L76390.25 4132.866589773164 L76390.3 4132.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55321.8 2734.7 L55312.0 2739.0 L55313.3 2728.3 L55323.1 2724.0 Z"></path>
+						<path d="M70183.3 3571.0 L70172.6 3570.4 L70178.5 3561.5 L70189.2 3562.0 Z"></path>
 					</g>
-					<path d="M55382.2 2742.5 L55310.5 3314 L56265.89946380697 3485 L56265.9 3485.0 " fill="none"></path>
+					<path d="M70628.6 3910.8 L70419 4000 L77217.25 4131.57111391948 L77217.3 4131.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55388.7 2733.9 L55382.2 2742.5 L55378.1 2732.6 L55384.6 2724.0 Z"></path>
+						<path d="M70639.3 3912.1 L70628.6 3910.8 L70635.1 3902.3 L70645.8 3903.5 Z"></path>
 					</g>
-					<path d="M55430.9 2741.9 L55596.5 3314 L56555.5 3485.64443378119 L56555.5 3485.6 " fill="none"></path>
+					<path d="M70628.9 3918.9 L70459 4000 L72971.75 4126.570247157222 L72971.8 4126.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55433.4 2731.5 L55430.9 2741.9 L55423.1 2734.4 L55425.7 2724.0 Z"></path>
+						<path d="M70639.6 3919.7 L70628.9 3918.9 L70635.0 3910.0 L70645.8 3910.8 Z"></path>
 					</g>
-					<path d="M77970.0 156.8 L77613.75 293 L77613.75 591 L77613.8 591.0 " fill="none"></path>
-					<path d="M77971.9 161.7 L77970.0 156.8 L77968.1 151.8 L77982.5 152.0 Z"></path>
-					<path d="M78047.1 161.6 L78173 293 L78173 591 L78173.0 591.0 " fill="none"></path>
-					<path d="M78050.9 157.9 L78047.1 161.6 L78043.2 165.3 L78037.9 152.0 Z"></path>
-					<path d="M55836.0 2704.7 L55836 3314 L64687 3499.859539492203 L64687.0 3499.9 " fill="none"></path>
+					<path d="M70806.7 3945.8 L70817.25 4000 L77134.25 4133.545476059005 L77134.3 4133.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55841.3 2695.3 L55836.0 2704.7 L55830.7 2695.3 L55836.0 2686.0 Z"></path>
+						<path d="M70810.1 3935.6 L70806.7 3945.8 L70799.7 3937.7 L70803.1 3927.5 Z"></path>
 					</g>
-					<path d="M2469.9 3408.2 L2483 3402 L2490.5 3402 L2490.5 3402 L2498 3500.5 L2498 3500.5 L2490.5 3599 L2490.5 3599 L2483 3599 L2483 3599 L2453 3584.8612440191387 L2453.0 3584.9 " fill="none"></path>
+					<path d="M70832.3 3944.5 L70857.25 4000 L76390.25 4132.681102362205 L76390.3 4132.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2459.2 3407.3 L2469.9 3408.2 L2463.7 3417.0 L2453.0 3416.1 Z"></path>
+						<path d="M70833.3 3933.8 L70832.3 3944.5 L70823.6 3938.2 L70824.6 3927.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3714.1 2647.8 L4732.75 3314 L2453 3486.922572445348 L2453.0 3486.9 " fill="none"></path>
-					</g>
-					<path d="M3717.0 2643.3 L3714.1 2647.8 L3711.2 2652.3 L3702.9 2640.5 Z"></path>
-					<path d="M73923.3 679.2 L73923.25 966 L73923.25 1197 L73923.3 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73928.6 669.8 L73923.3 679.2 L73917.9 669.8 L73923.3 660.5 Z"></path>
+						<path d="M70452.9 3556.3 L70786.75 3687 L70786.75 3759.5 L70786.8 3759.5 " fill="none"></path>
 					</g>
-					<path d="M73923.3 165.3 L73923.25 293 L73923.25 598.5 L73923.3 598.5 " fill="none"></path>
-					<path d="M73928.6 165.3 L73923.3 165.3 L73917.9 165.3 L73923.3 152.0 Z"></path>
-					<path d="M79235.9 161.6 L79109.5 293 L79109.5 598.5 L79109.5 598.5 " fill="none"></path>
-					<path d="M79239.7 165.3 L79235.9 161.6 L79232.0 157.9 L79245.1 152.0 Z"></path>
-					<path d="M79300.0 158.4 L79545.5 293 L79545.5 598.5 L79545.5 598.5 " fill="none"></path>
-					<path d="M79302.5 153.7 L79300.0 158.4 L79297.4 163.1 L79288.3 152.0 Z"></path>
-					<path d="M67226.0 1747.2 L67226 1936 L67226 2586.5 L67226.0 2586.5 " fill="none"></path>
+					<path d="M70454.9 3551.3 L70452.9 3556.3 L70451.0 3561.2 L70440.5 3551.4 Z"></path>
+					<path d="M3281.0 3450.3 L3293 3447 L3300.5 3447 L3300.5 3447 L3308 3500.5 L3308 3500.5 L3300.5 3554 L3300.5 3554 L3293 3554 L3293 3554 L3263 3545.8527918781724 L3263.0 3545.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67231.3 1737.8 L67226.0 1747.2 L67220.7 1737.8 L67226.0 1728.5 Z"></path>
+						<path d="M3270.6 3447.6 L3281.0 3450.3 L3273.4 3457.8 L3263.0 3455.1 Z"></path>
 					</g>
-					<path d="M67226.0 1241.3 L67226 1459 L67226 1666.5 L67226.0 1666.5 " fill="none"></path>
-					<path d="M67231.3 1241.3 L67226.0 1241.3 L67220.7 1241.3 L67226.0 1228.0 Z"></path>
-					<path d="M78328.5 669.5 L76270.75 966 L76270.75 1197 L76270.8 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M78338.5 673.5 L78328.5 669.5 L78337.0 662.9 L78347.0 666.9 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3126.8 2650.7 L3681.5 3314 L3263 3447.3052946199828 L3263.0 3447.3 " fill="none"></path>
 					</g>
-					<path d="M78328.6 672.5 L76430.25 966 L76430.25 1197 L76430.3 1197.0 " fill="none"></path>
+					<path d="M3130.9 2647.3 L3126.8 2650.7 L3122.7 2654.1 L3118.2 2640.5 Z"></path>
+					<path d="M72953.1 4140.1 L69475.5 4268 L69475.5 4454.5 L69475.5 4454.5 L69475.5 4641 L69475.5 4641 L73039.75 4676.238007380074 L73039.8 4676.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M78338.6 676.3 L78328.6 672.5 L78337.0 665.8 L78347.0 669.6 Z"></path>
+						<path d="M72962.6 4145.1 L72953.1 4140.1 L72962.2 4134.4 L72971.8 4139.4 Z"></path>
 					</g>
-					<path d="M78883.1 750.5 L79375.75 966 L79375.75 1197 L79375.8 1197.0 " fill="none"></path>
+					<path d="M73285.4 4141.2 L76193.75 4268 L76193.75 4454.5 L76193.75 4454.5 L76193.75 4641 L76193.75 4641 L76321 4668.090704647676 L76321.0 4668.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M78876.7 741.9 L78883.1 750.5 L78872.4 751.6 L78866.0 743.0 Z"></path>
+						<path d="M73276.3 4135.5 L73285.4 4141.2 L73275.8 4146.2 L73266.8 4140.4 Z"></path>
 					</g>
-					<path d="M78883.6 725.8 L79574.75 966 L79574.75 1197 L79574.8 1197.0 " fill="none"></path>
+					<path d="M19757.0 3887.8 L19757 4000 L72971.75 4133.629607072416 L72971.8 4133.6 " fill="none"></path>
+					<path d="M19762.3 3887.8 L19757.0 3887.8 L19751.7 3887.8 L19757.0 3874.5 Z"></path>
+					<path d="M76381.7 4615.2 L76368.75 4641 L76840.75 4671.8866359447 L76840.8 4671.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M78876.6 717.7 L78883.6 725.8 L78873.1 727.8 L78866.0 719.7 Z"></path>
+						<path d="M76390.7 4609.2 L76381.7 4615.2 L76381.2 4604.4 L76390.1 4598.5 Z"></path>
 					</g>
-					<path d="M78606.5 165.3 L78606.5 293 L78606.5 358 L78606.5 358.0 " fill="none"></path>
-					<path d="M78611.8 165.3 L78606.5 165.3 L78601.2 165.3 L78606.5 152.0 Z"></path>
-					<path d="M67213.1 2681.7 L67069.5 3314 L51953.75 3500.1428795457173 L51953.8 3500.1 " fill="none"></path>
+					<path d="M76415.8 4616.4 L76408.75 4641 L76460.15845070423 4661 L76460.2 4661.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67220.4 2673.8 L67213.1 2681.7 L67210.0 2671.4 L67217.3 2663.5 Z"></path>
+						<path d="M76423.5 4608.9 L76415.8 4616.4 L76413.3 4606.0 L76421.0 4598.5 Z"></path>
 					</g>
-					<path d="M67234.0 2682.0 L67322.75 3314 L67322.75 3485 L67322.8 3485.0 " fill="none"></path>
+					<path d="M76509.2 4616.4 L76516.25 4641 L76400 4667.496789727127 L76400.0 4667.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67238.0 2672.0 L67234.0 2682.0 L67227.4 2673.5 L67231.4 2663.5 Z"></path>
+						<path d="M76511.7 4606.0 L76509.2 4616.4 L76501.5 4608.9 L76504.0 4598.5 Z"></path>
 					</g>
-					<path d="M56531.0 2705.2 L56531 3314 L51953.75 3499.3258344640435 L51953.8 3499.3 " fill="none"></path>
+					<path d="M76543.3 4615.2 L76556.25 4641 L73092.75 4676.230444126075 L73092.8 4676.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56536.3 2695.8 L56531.0 2705.2 L56525.7 2695.8 L56531.0 2686.5 Z"></path>
+						<path d="M76543.8 4604.4 L76543.3 4615.2 L76534.3 4609.2 L76534.9 4598.5 Z"></path>
 					</g>
-					<path d="M56804.6 2689.3 L56674.5 3314 L38181 3498.672596578588 L38181.0 3498.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M56811.7 2681.2 L56804.6 2689.3 L56801.3 2679.0 L56808.4 2671.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M73280.1 4140.4 L76462.5 4268 L76462.5 4310.5 L76462.5 4310.5 " fill="none"></path>
 					</g>
-					<path d="M56808.3 2689.5 L56714.5 3314 L51953.75 3499.3708178923744 L51953.8 3499.4 " fill="none"></path>
+					<path d="M73280.3 4135.1 L73280.1 4140.4 L73279.9 4145.8 L73266.8 4139.9 Z"></path>
+					<path d="M79930.5 168.9 L79605.75 293 L79605.75 614 L79605.8 614.0 " fill="none"></path>
+					<path d="M79932.4 173.9 L79930.5 168.9 L79928.6 164.0 L79943.0 164.2 Z"></path>
+					<path d="M76689.6 4183.5 L76702.25 4268 L76702.25 4454.5 L76702.25 4454.5 L76702.25 4641 L76702.25 4641 L76840.75 4664.525119617225 L76840.8 4664.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56815.0 2681.0 L56808.3 2689.5 L56804.4 2679.4 L56811.1 2671.0 Z"></path>
+						<path d="M76693.5 4173.4 L76689.6 4183.5 L76683.0 4175.0 L76686.9 4165.0 Z"></path>
 					</g>
-					<path d="M56826.6 2689.5 L56909.5 3314 L57404.75 3489.3471760797343 L57404.8 3489.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M56830.6 2679.5 L56826.6 2689.5 L56820.1 2681.0 L56824.1 2671.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M75563.8 141.3 L77475.75 293 L77475.75 583.5 L77475.8 583.5 " fill="none"></path>
 					</g>
-					<path d="M38199.1 3450.0 L38211 3447 L38218.5 3447 L38218.5 3447 L38226 3500.5 L38226 3500.5 L38218.5 3554 L38218.5 3554 L38211 3554 L38211 3554 L38181 3546.4647887323945 L38181.0 3546.5 " fill="none"></path>
+					<path d="M75564.2 136.0 L75563.8 141.3 L75563.4 146.6 L75550.5 140.2 Z"></path>
+					<path d="M61577.8 2772.7 L61577.75 3314 L32726.5 3500.148365809571 L32726.5 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38188.8 3447.1 L38199.1 3450.0 L38191.4 3457.4 L38181.0 3454.5 Z"></path>
+						<path d="M61583.1 2763.3 L61577.8 2772.7 L61572.4 2763.3 L61577.8 2754.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3715.1 2647.6 L4772.75 3314 L37815 3499.47278425294 L37815.0 3499.5 " fill="none"></path>
+						<path d="M75563.8 140.8 L77720.75 293 L77720.75 614 L77720.8 614.0 " fill="none"></path>
 					</g>
-					<path d="M3718.0 2643.1 L3715.1 2647.6 L3712.3 2652.1 L3703.8 2640.5 Z"></path>
+					<path d="M75564.2 135.4 L75563.8 140.8 L75563.4 146.1 L75550.5 139.8 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80033.8 173.9 L79816.5 293 L79816.5 598.5 L79816.5 598.5 " fill="none"></path>
+						<path d="M77720.8 658.3 L77720.75 966 L77720.75 1197 L77720.8 1197.0 " fill="none"></path>
 					</g>
-					<path d="M80036.3 178.6 L80033.8 173.9 L80031.2 169.2 L80045.4 167.5 Z"></path>
+					<path d="M77726.1 658.3 L77720.8 658.3 L77715.4 658.3 L77720.8 645.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M80138.5 177.5 L80241.5 293 L80241.5 598.5 L80241.5 598.5 " fill="none"></path>
-					</g>
-					<path d="M80142.5 173.9 L80138.5 177.5 L80134.5 181.0 L80129.6 167.5 Z"></path>
-					<g data-name="GoRouteParamEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouteParamEnum">
-							<rect x="2697.5" y="98.0" height="77.0" width="202.0" data-name="GoRouteParamEnum"></rect>
-							<path d="M2697.5 129.0 L2899.5 129.0" fill="none" data-name="GoRouteParamEnum"></path>
-						</g>
-						<g transform="translate(2697.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GoRouteParamEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouteParamEnum">
-								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouteParamEnum">GoRouteParamEnum</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2697.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouteParamEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouteParamEnum">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouteParamEnum">+String toRouteParam()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GoRouteParamEnum">+String toShortString()</text>
-								
-							</g>
-						</g>
+						<path d="M83738.1 175.6 L83892.25 293 L83892.25 501 L83892.3 501.0 " fill="none"></path>
 					</g>
-					<g data-name="RoutingIntents">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntents">
-							<rect x="2180.8" y="1479.0" height="437.0" width="572.0" data-name="RoutingIntents"></rect>
-							<path d="M2180.8 1510.0 L2752.8 1510.0" fill="none" data-name="RoutingIntents"></path>
-						</g>
-						<g transform="translate(2180.75, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntents">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntents">
-								<text x="278.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntents">RoutingIntents</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2180.75, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntents">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntents">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+root: RoutingIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studies: RoutingIntent</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studiesShared: RoutingIntent</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+publicRegistry: RoutingIntent</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+study: RoutingIntent Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEdit: RoutingIntent Function(String)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInfo: RoutingIntent Function(String)</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String)</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInterventions: RoutingIntent Function(String)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String)</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditReports: RoutingIntent Function(String)</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String)</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute})</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyRecruit: RoutingIntent Function(String)</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyMonitor: RoutingIntent Function(String)</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyAnalyze: RoutingIntent Function(String)</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studySettings: RoutingIntent Function(String)</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+accountSettings: RoutingIntent</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyNew: RoutingIntent</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+login: RoutingIntent</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+signup: RoutingIntent</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot: RoutingIntent</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot2: RoutingIntent Function(String)</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordRecovery: RoutingIntent</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+error: RoutingIntent Function(Exception)</text>
-								
-							</g>
-						</g>
+					<path d="M83741.3 171.3 L83738.1 175.6 L83734.8 179.8 L83727.5 167.5 Z"></path>
+					<path d="M83916.4 1457.6 L83916.5 1459 L83916.5 1621.5 L83916.5 1621.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M83920.8 1447.8 L83916.4 1457.6 L83910.1 1448.8 L83914.5 1439.0 Z"></path>
 					</g>
-					<g data-name="RoutingIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="17708.3" y="2518.5" height="213.0" width="297.0" data-name="RoutingIntent"></rect>
-							<path d="M17708.3 2549.5 L18005.3 2549.5" fill="none" data-name="RoutingIntent"></path>
-							<path d="M17708.3 2685.5 L18005.3 2685.5" fill="none" data-name="RoutingIntent"></path>
-						</g>
-						<g transform="translate(17708.25, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17708.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">+route: GoRoute</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+params: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntent">+queryParams: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntent">+dispatch: RoutingIntentDispatch?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntent">+extra: Object?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntent">+routeName: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntent">+arguments: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntent">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17708.25, 2685.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">-dynamic _validateRoute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+bool matches()</text>
-								
-							</g>
-						</g>
+					<path d="M84182.3 1450.9 L84192.25 1459 L84192.25 1697.5 L84192.25 1697.5 L84192.25 1936 L84192.25 1936 L84192.25 2625 L84192.25 2625 L84192.25 3314 L84192.25 3314 L84192.25 3500.5 L84192.25 3500.5 L84192.25 3687 L84192.25 3687 L84192.25 3843.5 L84192.25 3843.5 L84192.25 4000 L84192.25 4000 L62317 4133.557357815722 L62317.0 4133.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M84178.5 1440.8 L84182.3 1450.9 L84171.7 1449.0 L84167.9 1439.0 Z"></path>
 					</g>
-					<g data-name="RoutingIntent Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String)">
-							<rect x="1804.8" y="2609.5" height="31.0" width="253.0" data-name="RoutingIntent Function(String)"></rect>
+					<path d="M83892.3 771.3 L83892.25 966 L83892.25 986 L83892.3 986.0 " fill="none"></path>
+					<path d="M83897.6 771.3 L83892.3 771.3 L83886.9 771.3 L83892.3 758.0 Z"></path>
+					<path d="M79942.0 182.0 L79762.75 293 L79762.75 614 L79762.8 614.0 " fill="none"></path>
+					<path d="M79944.8 186.6 L79942.0 182.0 L79939.2 177.5 L79953.3 175.0 Z"></path>
+					<path d="M79976.8 185.5 L79891.75 293 L79891.75 614 L79891.8 614.0 " fill="none"></path>
+					<path d="M79981.0 188.8 L79976.8 185.5 L79972.6 182.2 L79985.1 175.0 Z"></path>
+					<path d="M80101.0 156.5 L80686 293 L80686 614 L80686.0 614.0 " fill="none"></path>
+					<path d="M80102.2 151.3 L80101.0 156.5 L80099.8 161.6 L80088.0 153.4 Z"></path>
+					<path d="M80101.1 153.3 L80811.5 293 L80811.5 614 L80811.5 614.0 " fill="none"></path>
+					<path d="M80102.1 148.1 L80101.1 153.3 L80100.1 158.6 L80088.0 150.8 Z"></path>
+					<g data-name="Config">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Config">
+							<rect x="25187.5" y="60.5" height="152.0" width="396.0" data-name="Config"></rect>
+							<path d="M25187.5 91.5 L25583.5 91.5" fill="none" data-name="Config"></path>
 						</g>
-						<g transform="translate(1804.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String)">
-								<text x="118.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String)">RoutingIntent Function(String)</text>
+						<g transform="translate(25187.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Config">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Config">
+								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="Config">Config</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="RoutingIntent Function(String, String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, String)">
-							<rect x="2097.8" y="2609.5" height="31.0" width="309.0" data-name="RoutingIntent Function(String, String)"></rect>
-						</g>
-						<g transform="translate(2097.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, String)">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, String)">RoutingIntent Function(String, String)</text>
+						<g transform="translate(25187.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Config">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Config">
+								<text x="0.0" y="13.5" stroke="none" data-name="Config">&lt;static&gt;+isDebugMode: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Config">&lt;static&gt;+defaultLocale: Set&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Config">&lt;static&gt;+supportedLocales: Map&lt;String, String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Config">&lt;static&gt;+newStudyId: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Config">&lt;static&gt;+newModelId: String</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Config">&lt;static&gt;+minSplashTime: int</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Config">&lt;static&gt;+formAutosaveDebounce: int</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RoutingIntent Function(String, {String? appRoute})">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, {String? appRoute})">
-							<rect x="2446.8" y="2609.5" height="31.0" width="413.0" data-name="RoutingIntent Function(String, {String? appRoute})"></rect>
+					<g data-name="ResultTypes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ResultTypes">
+							<rect x="25623.5" y="121.0" height="31.0" width="114.0" data-name="ResultTypes"></rect>
 						</g>
-						<g transform="translate(2446.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, {String? appRoute})">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, {String? appRoute})">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, {String? appRoute})">RoutingIntent Function(String, {String? appRoute})</text>
+						<g transform="translate(25623.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ResultTypes">
+								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ResultTypes">ResultTypes</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RoutingIntent Function(Exception)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(Exception)">
-							<rect x="2899.8" y="2609.5" height="31.0" width="285.0" data-name="RoutingIntent Function(Exception)"></rect>
+					<g data-name="MeasurementResultTypes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementResultTypes">
+							<rect x="25254.5" y="591.0" height="77.0" width="252.0" data-name="MeasurementResultTypes"></rect>
+							<path d="M25254.5 622.0 L25506.5 622.0" fill="none" data-name="MeasurementResultTypes"></path>
 						</g>
-						<g transform="translate(2899.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(Exception)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(Exception)">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(Exception)">RoutingIntent Function(Exception)</text>
+						<g transform="translate(25254.5, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementResultTypes">
+								<text x="118.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementResultTypes">MeasurementResultTypes</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="GoRoute">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRoute">
-							<rect x="17677.8" y="3485.0" height="31.0" width="86.0" data-name="GoRoute"></rect>
-						</g>
-						<g transform="translate(17677.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRoute">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRoute">
-								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRoute">GoRoute</text>
+						<g transform="translate(25254.5, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementResultTypes">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+questionnaire: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RoutingIntentDispatch">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntentDispatch">
-							<rect x="2543.0" y="3447.0" height="107.0" width="373.0" data-name="RoutingIntentDispatch"></rect>
-							<path d="M2543.0 3478.0 L2916.0 3478.0" fill="none" data-name="RoutingIntentDispatch"></path>
+					<g data-name="InterventionResultTypes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionResultTypes">
+							<rect x="25546.5" y="591.0" height="77.0" width="268.0" data-name="InterventionResultTypes"></rect>
+							<path d="M25546.5 622.0 L25814.5 622.0" fill="none" data-name="InterventionResultTypes"></path>
 						</g>
-						<g transform="translate(2543, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntentDispatch">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntentDispatch">
-								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntentDispatch">RoutingIntentDispatch</text>
+						<g transform="translate(25546.5, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionResultTypes">
+								<text x="126.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionResultTypes">InterventionResultTypes</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2543, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntentDispatch">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntentDispatch">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntentDispatch">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+go: RoutingIntentDispatch</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+push: RoutingIntentDispatch</text>
+						<g transform="translate(25546.5, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResultTypes">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+checkmarkTask: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="3765.8" y="1682.0" height="31.0" width="96.0" data-name="Equatable"></rect>
+					<g data-name="StudyExportData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyExportData">
+							<rect x="0.0" y="2564.0" height="122.0" width="414.0" data-name="StudyExportData"></rect>
+							<path d="M0.0 2595.0 L414.0 2595.0" fill="none" data-name="StudyExportData"></path>
 						</g>
-						<g transform="translate(3765.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
+						<g transform="translate(0, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyExportData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyExportData">
+								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyExportData">StudyExportData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="3648.8" y="2609.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(3648.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
+						<g transform="translate(0, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyExportData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyExportData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyExportData">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyExportData">+measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyExportData">+interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyExportData">+mediaData: List&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyExportData">+isEmpty: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RouterKeys">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouterKeys">
-							<rect x="2939.5" y="98.0" height="77.0" width="312.0" data-name="RouterKeys"></rect>
-							<path d="M2939.5 129.0 L3251.5 129.0" fill="none" data-name="RouterKeys"></path>
-						</g>
-						<g transform="translate(2939.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterKeys">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterKeys">
-								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterKeys">RouterKeys</text>
-								
-							</g>
+					<g data-name="Study">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
+							<rect x="64938.0" y="3485.0" height="31.0" width="61.0" data-name="Study"></rect>
 						</g>
-						<g transform="translate(2939.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterKeys">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterKeys">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+studyKey: ValueKey&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+authKey: ValueKey&lt;String&gt;</text>
+						<g transform="translate(64938, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ValueKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ValueKey">
-							<rect x="3050.0" y="614.0" height="31.0" width="91.0" data-name="ValueKey"></rect>
+					<g data-name="StudyTemplates">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTemplates">
+							<rect x="25777.5" y="90.0" height="93.0" width="307.0" data-name="StudyTemplates"></rect>
+							<path d="M25777.5 121.0 L26084.5 121.0" fill="none" data-name="StudyTemplates"></path>
+							<path d="M25777.5 152.0 L26084.5 152.0" fill="none" data-name="StudyTemplates"></path>
 						</g>
-						<g transform="translate(3050, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueKey">
-								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueKey">ValueKey</text>
+						<g transform="translate(25777.5, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTemplates">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTemplates">
+								<text x="145.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTemplates">StudyTemplates</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="RouteParams">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteParams">
-							<rect x="3291.5" y="75.5" height="122.0" width="267.0" data-name="RouteParams"></rect>
-							<path d="M3291.5 106.5 L3558.5 106.5" fill="none" data-name="RouteParams"></path>
-						</g>
-						<g transform="translate(3291.5, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteParams">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteParams">
-								<text x="125.5" y="13.5" stroke="none" text-anchor="middle" data-name="RouteParams">RouteParams</text>
+						<g transform="translate(25777.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+kUnnamedStudyTitle: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3291.5, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteParams">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteParams">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studiesFilter: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteParams">&lt;static&gt;+measurementId: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteParams">&lt;static&gt;+interventionId: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RouteParams">&lt;static&gt;+testAppRoute: String</text>
+						<g transform="translate(25777.5, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+Study emptyDraft()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RouterConf">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouterConf">
-							<rect x="4746.5" y="2556.0" height="138.0" width="326.0" data-name="RouterConf"></rect>
-							<path d="M4746.5 2587.0 L5072.5 2587.0" fill="none" data-name="RouterConf"></path>
-							<path d="M4746.5 2663.0 L5072.5 2663.0" fill="none" data-name="RouterConf"></path>
-						</g>
-						<g transform="translate(4746.5, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterConf">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterConf">RouterConf</text>
-								
-							</g>
+					<g data-name="StudyActionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyActionType">
+							<rect x="68.0" y="3402.0" height="197.0" width="358.0" data-name="StudyActionType"></rect>
+							<path d="M68.0 3433.0 L426.0 3433.0" fill="none" data-name="StudyActionType"></path>
 						</g>
-						<g transform="translate(4746.5, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+router: GoRouter</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouterConf">&lt;static&gt;+routes: List&lt;GoRoute&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouterConf">&lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouterConf">&lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;</text>
+						<g transform="translate(68, 3402)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyActionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyActionType">
+								<text x="171.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyActionType">StudyActionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4746.5, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+GoRoute route()</text>
+						<g transform="translate(68, 3433)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyActionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyActionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyActionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+values: List&lt;StudyActionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pin: StudyActionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pinoff: StudyActionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+edit: StudyActionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicate: StudyActionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicateDraft: StudyActionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+addCollaborator: StudyActionType</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+export: StudyActionType</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+delete: StudyActionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="59360.0" y="3485.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
+					<g data-name="Enum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
+							<rect x="3074.8" y="2609.5" height="31.0" width="61.0" data-name="Enum"></rect>
 						</g>
-						<g transform="translate(59360, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
+						<g transform="translate(3074.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="14906.8" y="1666.5" height="62.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
-							<path d="M14906.8 1697.5 L15090.8 1697.5" fill="none" data-name="StudyFormRouteArgs"></path>
+					<g data-name="Notifications">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Notifications">
+							<rect x="3635.0" y="2541.5" height="167.0" width="407.0" data-name="Notifications"></rect>
+							<path d="M3635.0 2572.5 L4042.0 2572.5" fill="none" data-name="Notifications"></path>
 						</g>
-						<g transform="translate(14906.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
+						<g transform="translate(3635, 2541.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Notifications">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notifications">
+								<text x="195.5" y="13.5" stroke="none" text-anchor="middle" data-name="Notifications">Notifications</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14906.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormRouteArgs">+studyId: String</text>
+						<g transform="translate(3635, 2572.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Notifications">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Notifications">
+								<text x="0.0" y="13.5" stroke="none" data-name="Notifications">&lt;static&gt;+credentialsInvalid: SnackbarIntent</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Notifications">&lt;static&gt;+userAlreadyRegistered: SnackbarIntent</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordReset: SnackbarIntent</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordResetSuccess: SnackbarIntent</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleted: SnackbarIntent</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeDeleted: SnackbarIntent</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeClipped: SnackbarIntent</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleteConfirmation: AlertIntent</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormRouteArgs">
-							<rect x="14396.8" y="2594.0" height="62.0" width="210.0" data-name="QuestionFormRouteArgs"></rect>
-							<path d="M14396.8 2625.0 L14606.8 2625.0" fill="none" data-name="QuestionFormRouteArgs"></path>
+					<g data-name="SnackbarIntent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SnackbarIntent">
+							<rect x="3353.0" y="3469.5" height="62.0" width="136.0" data-name="SnackbarIntent"></rect>
+							<path d="M3353.0 3500.5 L3489.0 3500.5" fill="none" data-name="SnackbarIntent"></path>
 						</g>
-						<g transform="translate(14396.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormRouteArgs">
-								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormRouteArgs">QuestionFormRouteArgs</text>
+						<g transform="translate(3353, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackbarIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackbarIntent">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackbarIntent">SnackbarIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14396.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormRouteArgs">+questionId: String</text>
+						<g transform="translate(3353, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SnackbarIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SnackbarIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="SnackbarIntent">+duration: int?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormRouteArgs">
-							<rect x="11229.3" y="3485.0" height="31.0" width="282.0" data-name="ScreenerQuestionFormRouteArgs"></rect>
+					<g data-name="AlertIntent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AlertIntent">
+							<rect x="3529.0" y="3454.5" height="92.0" width="204.0" data-name="AlertIntent"></rect>
+							<path d="M3529.0 3485.5 L3733.0 3485.5" fill="none" data-name="AlertIntent"></path>
 						</g>
-						<g transform="translate(11229.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormRouteArgs">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormRouteArgs">ScreenerQuestionFormRouteArgs</text>
+						<g transform="translate(3529, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AlertIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AlertIntent">
+								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="AlertIntent">AlertIntent</text>
+								
+							</g>
+						</g>
+						<g transform="translate(3529, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AlertIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AlertIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="AlertIntent">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AlertIntent">+dismissOnAction: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AlertIntent">+isDestructive: dynamic</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormRouteArgs">
-							<rect x="14646.8" y="2594.0" height="62.0" width="239.0" data-name="ConsentItemFormRouteArgs"></rect>
-							<path d="M14646.8 2625.0 L14885.8 2625.0" fill="none" data-name="ConsentItemFormRouteArgs"></path>
+					<g data-name="NotificationDefaultActions">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDefaultActions">
+							<rect x="1724.0" y="3469.5" height="62.0" width="287.0" data-name="NotificationDefaultActions"></rect>
+							<path d="M1724.0 3500.5 L2011.0 3500.5" fill="none" data-name="NotificationDefaultActions"></path>
 						</g>
-						<g transform="translate(14646.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormRouteArgs">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormRouteArgs">ConsentItemFormRouteArgs</text>
+						<g transform="translate(1724, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDefaultActions">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDefaultActions">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDefaultActions">NotificationDefaultActions</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14646.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormRouteArgs">+consentId: String</text>
+						<g transform="translate(1724, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDefaultActions">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDefaultActions">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDefaultActions">&lt;static&gt;+cancel: NotificationAction</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="17421.3" y="2594.0" height="62.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
-							<path d="M17421.3 2625.0 L17668.3 2625.0" fill="none" data-name="MeasurementFormRouteArgs"></path>
+					<g data-name="NotificationAction">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationAction">
+							<rect x="1739.5" y="3797.5" height="92.0" width="256.0" data-name="NotificationAction"></rect>
+							<path d="M1739.5 3828.5 L1995.5 3828.5" fill="none" data-name="NotificationAction"></path>
 						</g>
-						<g transform="translate(17421.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
+						<g transform="translate(1739.5, 3797.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationAction">
+								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationAction">NotificationAction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17421.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementFormRouteArgs">+measurementId: String</text>
+						<g transform="translate(1739.5, 3828.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationAction">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationAction">+label: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationAction">+onSelect: dynamic Function()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationAction">+isDestructive: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormRouteArgs">
-							<rect x="16243.3" y="3469.5" height="62.0" width="265.0" data-name="SurveyQuestionFormRouteArgs"></rect>
-							<path d="M16243.3 3500.5 L16508.3 3500.5" fill="none" data-name="SurveyQuestionFormRouteArgs"></path>
+					<g data-name="INotificationService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
+							<rect x="60183.3" y="3447.0" height="107.0" width="395.0" data-name="INotificationService"></rect>
+							<path d="M60183.3 3478.0 L60578.3 3478.0" fill="none" data-name="INotificationService"></path>
 						</g>
-						<g transform="translate(16243.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormRouteArgs">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormRouteArgs">SurveyQuestionFormRouteArgs</text>
+						<g transform="translate(60183.25, 3447)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
+								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16243.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormRouteArgs">+questionId: String</text>
+						<g transform="translate(60183.25, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="INotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="INotificationService">
+								<text x="0.0" y="13.5" stroke="none" data-name="INotificationService">+void showMessage()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="INotificationService">+void show()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="INotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="INotificationService">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="16567.3" y="2594.0" height="62.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
-							<path d="M16567.3 2625.0 L16800.3 2625.0" fill="none" data-name="InterventionFormRouteArgs"></path>
+					<g data-name="NotificationService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationService">
+							<rect x="60153.3" y="3774.5" height="138.0" width="455.0" data-name="NotificationService"></rect>
+							<path d="M60153.3 3805.5 L60608.3 3805.5" fill="none" data-name="NotificationService"></path>
+							<path d="M60153.3 3836.5 L60608.3 3836.5" fill="none" data-name="NotificationService"></path>
 						</g>
-						<g transform="translate(16567.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
+						<g transform="translate(60153.25, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationService">
+								<text x="219.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationService">NotificationService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16567.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormRouteArgs">+interventionId: String</text>
+						<g transform="translate(60153.25, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">-_streamController: BehaviorSubject&lt;NotificationIntent&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InterventionTaskFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormRouteArgs">
-							<rect x="16548.3" y="3469.5" height="62.0" width="271.0" data-name="InterventionTaskFormRouteArgs"></rect>
-							<path d="M16548.3 3500.5 L16819.3 3500.5" fill="none" data-name="InterventionTaskFormRouteArgs"></path>
-						</g>
-						<g transform="translate(16548.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormRouteArgs">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormRouteArgs">InterventionTaskFormRouteArgs</text>
+						<g transform="translate(60153.25, 3836.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationService">+void showMessage()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationService">+void show()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NotificationService">+void dispose()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16548.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormRouteArgs">+taskId: String</text>
+					</g>
+					<g data-name="BehaviorSubject">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BehaviorSubject">
+							<rect x="62172.0" y="4118.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
+						</g>
+						<g transform="translate(62172, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BehaviorSubject">
+								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="BehaviorSubject">BehaviorSubject</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormRouteArgs">
-							<rect x="14925.8" y="2594.0" height="62.0" width="226.0" data-name="ReportItemFormRouteArgs"></rect>
-							<path d="M14925.8 2625.0 L15151.8 2625.0" fill="none" data-name="ReportItemFormRouteArgs"></path>
+					<g data-name="NotificationIntent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationIntent">
+							<rect x="4082.0" y="2548.5" height="153.0" width="288.0" data-name="NotificationIntent"></rect>
+							<path d="M4082.0 2579.5 L4370.0 2579.5" fill="none" data-name="NotificationIntent"></path>
+							<path d="M4082.0 2670.5 L4370.0 2670.5" fill="none" data-name="NotificationIntent"></path>
 						</g>
-						<g transform="translate(14925.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormRouteArgs">
-								<text x="105.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormRouteArgs">ReportItemFormRouteArgs</text>
+						<g transform="translate(4082, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="NotificationIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationIntent">
+								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationIntent">NotificationIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14925.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormRouteArgs">+sectionId: String</text>
+						<g transform="translate(4082, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+message: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationIntent">+customContent: Widget?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationIntent">+icon: IconData?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NotificationIntent">+actions: List&lt;NotificationAction&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="NotificationIntent">+type: NotificationType</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="JsonFileLoader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JsonFileLoader">
-							<rect x="3598.5" y="75.0" height="123.0" width="319.0" data-name="JsonFileLoader"></rect>
-							<path d="M3598.5 106.0 L3917.5 106.0" fill="none" data-name="JsonFileLoader"></path>
-							<path d="M3598.5 137.0 L3917.5 137.0" fill="none" data-name="JsonFileLoader"></path>
-						</g>
-						<g transform="translate(3598.5, 75)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonFileLoader">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="JsonFileLoader">JsonFileLoader</text>
+						<g transform="translate(4082, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+void register()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3598.5, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+jsonAssetsPath: String</text>
-								
-							</g>
+					</g>
+					<g data-name="Widget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
+							<rect x="21428.8" y="3485.0" height="31.0" width="71.0" data-name="Widget"></rect>
 						</g>
-						<g transform="translate(3598.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+dynamic loadJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonMapFromAssets()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonListFromAssets()</text>
+						<g transform="translate(21428.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
+								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CombinedStreamNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CombinedStreamNotifier">
-							<rect x="3807.0" y="583.0" height="93.0" width="435.0" data-name="CombinedStreamNotifier"></rect>
-							<path d="M3807.0 614.0 L4242.0 614.0" fill="none" data-name="CombinedStreamNotifier"></path>
-							<path d="M3807.0 645.0 L4242.0 645.0" fill="none" data-name="CombinedStreamNotifier"></path>
+					<g data-name="IconData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
+							<rect x="25696.0" y="3485.0" height="31.0" width="87.0" data-name="IconData"></rect>
 						</g>
-						<g transform="translate(3807, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CombinedStreamNotifier">
-								<text x="209.5" y="13.5" stroke="none" text-anchor="middle" data-name="CombinedStreamNotifier">CombinedStreamNotifier</text>
+						<g transform="translate(25696, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
+								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3807, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">-_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
+					</g>
+					<g data-name="NotificationType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationType">
+							<rect x="1309.0" y="3439.5" height="122.0" width="325.0" data-name="NotificationType"></rect>
+							<path d="M1309.0 3470.5 L1634.0 3470.5" fill="none" data-name="NotificationType"></path>
+						</g>
+						<g transform="translate(1309, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationType">
+								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationType">NotificationType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3807, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">+void dispose()</text>
+						<g transform="translate(1309, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationType">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationType">&lt;static&gt;+values: List&lt;NotificationType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationType">&lt;static&gt;+snackbar: NotificationType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NotificationType">&lt;static&gt;+alert: NotificationType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="NotificationType">&lt;static&gt;+custom: NotificationType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChangeNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
-							<rect x="3957.5" y="121.0" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
+					<g data-name="dynamic Function()">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
+							<rect x="6731.0" y="4118.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
 						</g>
-						<g transform="translate(3957.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
+						<g transform="translate(6731, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
+								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="5947.0" y="1181.5" height="62.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-							<path d="M5947.0 1212.5 L6140.0 1212.5" fill="none" data-name="IProviderArgsResolver"></path>
+					<g data-name="IClipboardService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IClipboardService">
+							<rect x="26124.5" y="105.5" height="62.0" width="156.0" data-name="IClipboardService"></rect>
+							<path d="M26124.5 136.5 L26280.5 136.5" fill="none" data-name="IClipboardService"></path>
 						</g>
-						<g transform="translate(5947, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
+						<g transform="translate(26124.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IClipboardService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IClipboardService">
+								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="IClipboardService">IClipboardService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5947, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IProviderArgsResolver">
-								<text x="0.0" y="13.5" stroke="none" data-name="IProviderArgsResolver">+R provide()</text>
+						<g transform="translate(26124.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IClipboardService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IClipboardService">
+								<text x="0.0" y="13.5" stroke="none" data-name="IClipboardService">+dynamic copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SuppressedBehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SuppressedBehaviorSubject">
-							<rect x="5792.8" y="3774.5" height="138.0" width="388.0" data-name="SuppressedBehaviorSubject"></rect>
-							<path d="M5792.8 3805.5 L6180.8 3805.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
-							<path d="M5792.8 3866.5 L6180.8 3866.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
+					<g data-name="ClipboardService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ClipboardService">
+							<rect x="26127.0" y="598.5" height="62.0" width="151.0" data-name="ClipboardService"></rect>
+							<path d="M26127.0 629.5 L26278.0 629.5" fill="none" data-name="ClipboardService"></path>
 						</g>
-						<g transform="translate(5792.75, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SuppressedBehaviorSubject">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="SuppressedBehaviorSubject">SuppressedBehaviorSubject</text>
+						<g transform="translate(26127, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ClipboardService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ClipboardService">
+								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="ClipboardService">ClipboardService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5792.75, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
-								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">+subject: BehaviorSubject&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+didSuppressInitialEvent: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SuppressedBehaviorSubject">-_controller: StreamController&lt;T&gt;</text>
+						<g transform="translate(26127, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ClipboardService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ClipboardService">
+								<text x="0.0" y="13.5" stroke="none" data-name="ClipboardService">+dynamic copy()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5792.75, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
-								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">-StreamController&lt;T&gt; _buildDerivedController()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+dynamic close()</text>
+					</g>
+					<g data-name="NotificationDispatcher">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDispatcher">
+							<rect x="5376.5" y="2564.0" height="122.0" width="325.0" data-name="NotificationDispatcher"></rect>
+							<path d="M5376.5 2595.0 L5701.5 2595.0" fill="none" data-name="NotificationDispatcher"></path>
+						</g>
+						<g transform="translate(5376.5, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDispatcher">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDispatcher">
+								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDispatcher">NotificationDispatcher</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="BehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BehaviorSubject">
-							<rect x="50246.8" y="4118.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
-						</g>
-						<g transform="translate(50246.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BehaviorSubject">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="BehaviorSubject">BehaviorSubject</text>
+						<g transform="translate(5376.5, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDispatcher">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDispatcher">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDispatcher">+child: Widget?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationDispatcher">+snackbarInnerPadding: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationDispatcher">+snackbarWidth: double?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NotificationDispatcher">+snackbarBehavior: SnackBarBehavior</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="NotificationDispatcher">+snackbarDefaultDuration: int</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StreamController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
-							<rect x="5226.3" y="4118.5" height="31.0" width="149.0" data-name="StreamController"></rect>
+					<g data-name="SnackBarBehavior">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SnackBarBehavior">
+							<rect x="3773.0" y="3485.0" height="31.0" width="162.0" data-name="SnackBarBehavior"></rect>
 						</g>
-						<g transform="translate(5226.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
+						<g transform="translate(3773, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackBarBehavior">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackBarBehavior">
+								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackBarBehavior">SnackBarBehavior</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Time">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Time">
-							<rect x="4282.0" y="583.5" height="92.0" width="293.0" data-name="Time"></rect>
-							<path d="M4282.0 614.5 L4575.0 614.5" fill="none" data-name="Time"></path>
+					<g data-name="Assets">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Assets">
+							<rect x="26320.5" y="105.5" height="62.0" width="218.0" data-name="Assets"></rect>
+							<path d="M26320.5 136.5 L26538.5 136.5" fill="none" data-name="Assets"></path>
 						</g>
-						<g transform="translate(4282, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Time">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Time">
-								<text x="138.5" y="13.5" stroke="none" text-anchor="middle" data-name="Time">Time</text>
+						<g transform="translate(26320.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Assets">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Assets">
+								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="Assets">Assets</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4282, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Time">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Time">
-								<text x="0.0" y="13.5" stroke="none" data-name="Time">&lt;static&gt;+dynamic fromTimeOfDay()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Time">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Time">&lt;static&gt;+Time fromJson()</text>
+						<g transform="translate(26320.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Assets">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Assets">
+								<text x="0.0" y="13.5" stroke="none" data-name="Assets">&lt;static&gt;+logoWide: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimeOfDay">
-							<rect x="4377.0" y="121.0" height="31.0" width="103.0" data-name="TimeOfDay"></rect>
+					<g data-name="AsyncValueWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValueWidget">
+							<rect x="5741.5" y="2526.0" height="198.0" width="384.0" data-name="AsyncValueWidget"></rect>
+							<path d="M5741.5 2557.0 L6125.5 2557.0" fill="none" data-name="AsyncValueWidget"></path>
+							<path d="M5741.5 2648.0 L6125.5 2648.0" fill="none" data-name="AsyncValueWidget"></path>
 						</g>
-						<g transform="translate(4377, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeOfDay">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeOfDay">TimeOfDay</text>
+						<g transform="translate(5741.5, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AsyncValueWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValueWidget">
+								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValueWidget">AsyncValueWidget</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="TimeValueAccessor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimeValueAccessor">
-							<rect x="4615.0" y="583.5" height="92.0" width="297.0" data-name="TimeValueAccessor"></rect>
-							<path d="M4615.0 614.5 L4912.0 614.5" fill="none" data-name="TimeValueAccessor"></path>
-						</g>
-						<g transform="translate(4615, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeValueAccessor">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeValueAccessor">TimeValueAccessor</text>
+						<g transform="translate(5741.5, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+value: AsyncValue&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">+data: Widget Function(T)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">+error: Widget Function(Object, StackTrace?)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">+loading: Widget Function()?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AsyncValueWidget">+empty: Widget Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4615, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimeValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimeValueAccessor">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimeValueAccessor">+String modelToViewValue()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TimeValueAccessor">+Time? viewToModelValue()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TimeValueAccessor">-String _addLeadingZeroIfNeeded()</text>
+						<g transform="translate(5741.5, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">-Widget _buildDataOrEmptyWidget()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultError()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultLoad()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ControlValueAccessor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ControlValueAccessor">
-							<rect x="4668.0" y="121.0" height="31.0" width="191.0" data-name="ControlValueAccessor"></rect>
+					<g data-name="AsyncValue">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
+							<rect x="32617.5" y="3485.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
 						</g>
-						<g transform="translate(4668, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ControlValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ControlValueAccessor">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="ControlValueAccessor">ControlValueAccessor</text>
+						<g transform="translate(32617.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Tuple">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Tuple">
-							<rect x="3224.8" y="2541.0" height="168.0" width="384.0" data-name="Tuple"></rect>
-							<path d="M3224.8 2572.0 L3608.8 2572.0" fill="none" data-name="Tuple"></path>
-							<path d="M3224.8 2633.0 L3608.8 2633.0" fill="none" data-name="Tuple"></path>
+					<g data-name="Widget Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
+							<rect x="28098.3" y="3485.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
 						</g>
-						<g transform="translate(3224.75, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Tuple">
-								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="Tuple">Tuple</text>
+						<g transform="translate(28098.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3224.75, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
-								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+first: T1</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">+second: T2</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+props: List&lt;Object?&gt;</text>
+					</g>
+					<g data-name="Widget Function(Object, StackTrace?)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Object, StackTrace?)?">
+							<rect x="3975.0" y="3485.0" height="31.0" width="326.0" data-name="Widget Function(Object, StackTrace?)?"></rect>
+						</g>
+						<g transform="translate(3975, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Object, StackTrace?)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Object, StackTrace?)?">
+								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Object, StackTrace?)?">Widget Function(Object, StackTrace?)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3224.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
-								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">&lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copy()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copyWith()</text>
+					</g>
+					<g data-name="Widget Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function()?">
+							<rect x="4341.0" y="3485.0" height="31.0" width="166.0" data-name="Widget Function()?"></rect>
+						</g>
+						<g transform="translate(4341, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function()?">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function()?">Widget Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="OptimisticUpdate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OptimisticUpdate">
-							<rect x="6432.3" y="3737.0" height="213.0" width="383.0" data-name="OptimisticUpdate"></rect>
-							<path d="M6432.3 3768.0 L6815.3 3768.0" fill="none" data-name="OptimisticUpdate"></path>
-							<path d="M6432.3 3904.0 L6815.3 3904.0" fill="none" data-name="OptimisticUpdate"></path>
+					<g data-name="FormControlLabel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlLabel">
+							<rect x="6234.5" y="2548.5" height="153.0" width="430.0" data-name="FormControlLabel"></rect>
+							<path d="M6234.5 2579.5 L6664.5 2579.5" fill="none" data-name="FormControlLabel"></path>
+							<path d="M6234.5 2670.5 L6664.5 2670.5" fill="none" data-name="FormControlLabel"></path>
 						</g>
-						<g transform="translate(6432.25, 3737)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptimisticUpdate">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptimisticUpdate">OptimisticUpdate</text>
+						<g transform="translate(6234.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlLabel">
+								<text x="207.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlLabel">FormControlLabel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6432.25, 3768)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+applyOptimistic: void Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">+apply: dynamic Function()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="OptimisticUpdate">+rollback: void Function()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="OptimisticUpdate">+onUpdate: void Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="OptimisticUpdate">+onError: void Function(Object, StackTrace?)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="OptimisticUpdate">+rethrowErrors: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="OptimisticUpdate">+runOptimistically: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="OptimisticUpdate">+completeFutureOptimistically: bool</text>
+						<g transform="translate(6234.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+formControl: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlLabel">+text: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlLabel">+isClickable: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlLabel">+textStyle: TextStyle?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormControlLabel">+onClick: void Function(AbstractControl&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6432.25, 3904)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+dynamic execute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">-void _runUpdateHandlerIfAny()</text>
+						<g transform="translate(6234.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()">
-							<rect x="5415.3" y="4118.5" height="31.0" width="134.0" data-name="void Function()"></rect>
+					<g data-name="AbstractControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
+							<rect x="23930.3" y="3485.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
 						</g>
-						<g transform="translate(5415.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()">void Function()</text>
+						<g transform="translate(23930.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
+								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="22095.0" y="4118.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
+					<g data-name="TextStyle">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
+							<rect x="10158.0" y="3485.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
 						</g>
-						<g transform="translate(22095, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
+						<g transform="translate(10158, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
+								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="29878.5" y="4118.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
+					<g data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+							<rect x="4547.0" y="3485.0" height="31.0" width="352.0" data-name="void Function(AbstractControl&lt;dynamic&gt;)?"></rect>
 						</g>
-						<g transform="translate(29878.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
+						<g transform="translate(4547, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">void Function(AbstractControl&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(Object, StackTrace?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Object, StackTrace?)?">
-							<rect x="5601.8" y="4118.5" height="31.0" width="304.0" data-name="void Function(Object, StackTrace?)?"></rect>
+					<g data-name="ActionPopUpMenuButton">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ActionPopUpMenuButton">
+							<rect x="6828.3" y="2496.0" height="258.0" width="324.0" data-name="ActionPopUpMenuButton"></rect>
+							<path d="M6828.3 2527.0 L7152.3 2527.0" fill="none" data-name="ActionPopUpMenuButton"></path>
+							<path d="M6828.3 2708.0 L7152.3 2708.0" fill="none" data-name="ActionPopUpMenuButton"></path>
 						</g>
-						<g transform="translate(5601.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Object, StackTrace?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Object, StackTrace?)?">
-								<text x="144.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Object, StackTrace?)?">void Function(Object, StackTrace?)?</text>
+						<g transform="translate(6828.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionPopUpMenuButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionPopUpMenuButton">
+								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionPopUpMenuButton">ActionPopUpMenuButton</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SerializableColor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SerializableColor">
-							<rect x="51768.8" y="3805.0" height="77.0" width="312.0" data-name="SerializableColor"></rect>
-							<path d="M51768.8 3836.0 L52080.8 3836.0" fill="none" data-name="SerializableColor"></path>
-						</g>
-						<g transform="translate(51768.75, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SerializableColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SerializableColor">
-								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="SerializableColor">SerializableColor</text>
+						<g transform="translate(6828.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColor: Color?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColorHover: Color?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconSize: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ActionPopUpMenuButton">+disableSplashEffect: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ActionPopUpMenuButton">+hideOnEmpty: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ActionPopUpMenuButton">+orientation: Axis</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ActionPopUpMenuButton">+elevation: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ActionPopUpMenuButton">+splashRadius: double?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ActionPopUpMenuButton">+enabled: bool</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ActionPopUpMenuButton">+position: PopupMenuPosition</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51768.75, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SerializableColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SerializableColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="SerializableColor">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SerializableColor">&lt;static&gt;+SerializableColor fromJson()</text>
+						<g transform="translate(6828.25, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">-Widget _buildPopupMenu()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="Color">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="51895.8" y="3485.0" height="31.0" width="58.0" data-name="Color"></rect>
+							<rect x="21539.8" y="3485.0" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(51895.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+						<g transform="translate(21539.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
 								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FileFormatEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FileFormatEncoder">
-							<rect x="5027.0" y="90.5" height="92.0" width="216.0" data-name="FileFormatEncoder"></rect>
-							<path d="M5027.0 121.5 L5243.0 121.5" fill="none" data-name="FileFormatEncoder"></path>
+					<g data-name="Axis">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Axis">
+							<rect x="5663.3" y="3485.0" height="31.0" width="49.0" data-name="Axis"></rect>
 						</g>
-						<g transform="translate(5027, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FileFormatEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FileFormatEncoder">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="FileFormatEncoder">FileFormatEncoder</text>
+						<g transform="translate(5663.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Axis">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Axis">
+								<text x="16.5" y="13.5" stroke="none" text-anchor="middle" data-name="Axis">Axis</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5027, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FileFormatEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FileFormatEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="FileFormatEncoder">+dynamic encodeAsync()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FileFormatEncoder">+String encode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FileFormatEncoder">+dynamic call()</text>
+					</g>
+					<g data-name="PopupMenuPosition">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PopupMenuPosition">
+							<rect x="5752.3" y="3485.0" height="31.0" width="174.0" data-name="PopupMenuPosition"></rect>
+						</g>
+						<g transform="translate(5752.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PopupMenuPosition">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PopupMenuPosition">
+								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="PopupMenuPosition">PopupMenuPosition</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CSVStringEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CSVStringEncoder">
-							<rect x="4952.0" y="598.5" height="62.0" width="162.0" data-name="CSVStringEncoder"></rect>
-							<path d="M4952.0 629.5 L5114.0 629.5" fill="none" data-name="CSVStringEncoder"></path>
+					<g data-name="Search">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Search">
+							<rect x="7210.5" y="2571.5" height="107.0" width="373.0" data-name="Search"></rect>
+							<path d="M7210.5 2602.5 L7583.5 2602.5" fill="none" data-name="Search"></path>
 						</g>
-						<g transform="translate(4952, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CSVStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CSVStringEncoder">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="CSVStringEncoder">CSVStringEncoder</text>
+						<g transform="translate(7210.5, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Search">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Search">
+								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="Search">Search</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4952, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CSVStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CSVStringEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="CSVStringEncoder">+String encode()</text>
+						<g transform="translate(7210.5, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Search">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Search">
+								<text x="0.0" y="13.5" stroke="none" data-name="Search">+onQueryChanged: dynamic Function(String)</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Search">+searchController: SearchController?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Search">+hintText: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Search">+initialText: String?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="JsonStringEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JsonStringEncoder">
-							<rect x="5154.0" y="598.5" height="62.0" width="166.0" data-name="JsonStringEncoder"></rect>
-							<path d="M5154.0 629.5 L5320.0 629.5" fill="none" data-name="JsonStringEncoder"></path>
-						</g>
-						<g transform="translate(5154, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JsonStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonStringEncoder">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="JsonStringEncoder">JsonStringEncoder</text>
-								
-							</g>
+					<g data-name="dynamic Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(String)">
+							<rect x="5966.3" y="3485.0" height="31.0" width="213.0" data-name="dynamic Function(String)"></rect>
 						</g>
-						<g transform="translate(5154, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonStringEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonStringEncoder">+String encode()</text>
+						<g transform="translate(5966.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(String)">
+								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(String)">dynamic Function(String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NumericalRangeFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NumericalRangeFormatter">
-							<rect x="5360.0" y="575.5" height="108.0" width="313.0" data-name="NumericalRangeFormatter"></rect>
-							<path d="M5360.0 606.5 L5673.0 606.5" fill="none" data-name="NumericalRangeFormatter"></path>
-							<path d="M5360.0 652.5 L5673.0 652.5" fill="none" data-name="NumericalRangeFormatter"></path>
-						</g>
-						<g transform="translate(5360, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NumericalRangeFormatter">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="NumericalRangeFormatter">NumericalRangeFormatter</text>
-								
-							</g>
+					<g data-name="SearchController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
+							<rect x="36070.5" y="3469.5" height="62.0" width="258.0" data-name="SearchController"></rect>
+							<path d="M36070.5 3500.5 L36328.5 3500.5" fill="none" data-name="SearchController"></path>
 						</g>
-						<g transform="translate(5360, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+min: int?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NumericalRangeFormatter">+max: int?</text>
+						<g transform="translate(36070.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
+								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5360, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+TextEditingValue formatEditUpdate()</text>
+						<g transform="translate(36070.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SearchController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SearchController">
+								<text x="0.0" y="13.5" stroke="none" data-name="SearchController">+setText: void Function(String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TextInputFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextInputFormatter">
-							<rect x="5610.0" y="121.0" height="31.0" width="166.0" data-name="TextInputFormatter"></rect>
+					<g data-name="void Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(String)">
+							<rect x="36109.5" y="3828.0" height="31.0" width="180.0" data-name="void Function(String)"></rect>
 						</g>
-						<g transform="translate(5610, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TextInputFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextInputFormatter">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextInputFormatter">TextInputFormatter</text>
+						<g transform="translate(36109.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(String)">
+								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(String)">void Function(String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudySequenceFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySequenceFormatter">
-							<rect x="5713.0" y="598.5" height="62.0" width="313.0" data-name="StudySequenceFormatter"></rect>
-							<path d="M5713.0 629.5 L6026.0 629.5" fill="none" data-name="StudySequenceFormatter"></path>
+					<g data-name="FormScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormScaffold">
+							<rect x="7623.5" y="2556.5" height="137.0" width="212.0" data-name="FormScaffold"></rect>
+							<path d="M7623.5 2587.5 L7835.5 2587.5" fill="none" data-name="FormScaffold"></path>
 						</g>
-						<g transform="translate(5713, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySequenceFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySequenceFormatter">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySequenceFormatter">StudySequenceFormatter</text>
+						<g transform="translate(7623.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormScaffold">
+								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormScaffold">FormScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5713, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySequenceFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySequenceFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySequenceFormatter">+TextEditingValue formatEditUpdate()</text>
+						<g transform="translate(7623.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormScaffold">+formViewModel: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormScaffold">+actions: List&lt;Widget&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormScaffold">+body: Widget</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormScaffold">+drawer: Widget?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormScaffold">+actionsSpacing: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormScaffold">+actionsPadding: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CountWhereValidator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CountWhereValidator">
-							<rect x="6066.0" y="553.0" height="153.0" width="383.0" data-name="CountWhereValidator"></rect>
-							<path d="M6066.0 584.0 L6449.0 584.0" fill="none" data-name="CountWhereValidator"></path>
-							<path d="M6066.0 675.0 L6449.0 675.0" fill="none" data-name="CountWhereValidator"></path>
-						</g>
-						<g transform="translate(6066, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CountWhereValidator">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="CountWhereValidator">CountWhereValidator</text>
-								
-							</g>
+					<g data-name="ConstrainedWidthFlexible">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConstrainedWidthFlexible">
+							<rect x="7875.5" y="2533.5" height="183.0" width="287.0" data-name="ConstrainedWidthFlexible"></rect>
+							<path d="M7875.5 2564.5 L8162.5 2564.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
+							<path d="M7875.5 2670.5 L8162.5 2670.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
 						</g>
-						<g transform="translate(6066, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
-								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+predicate: bool Function(T?)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CountWhereValidator">+minCount: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CountWhereValidator">+maxCount: int?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMinCount: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMaxCount: String</text>
+						<g transform="translate(7875.5, 2533.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConstrainedWidthFlexible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConstrainedWidthFlexible">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConstrainedWidthFlexible">ConstrainedWidthFlexible</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6066, 675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
-								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+Map&lt;String, dynamic&gt;? validate()</text>
+						<g transform="translate(7875.5, 2564.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+minWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">+maxWidth: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConstrainedWidthFlexible">+flex: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConstrainedWidthFlexible">+flexSum: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConstrainedWidthFlexible">+child: Widget</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ConstrainedWidthFlexible">+outerConstraints: BoxConstraints</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="bool Function(T?)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="bool Function(T?)">
-							<rect x="6180.0" y="1197.0" height="31.0" width="155.0" data-name="bool Function(T?)"></rect>
-						</g>
-						<g transform="translate(6180, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="bool Function(T?)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="bool Function(T?)">
-								<text x="69.5" y="13.5" stroke="none" text-anchor="middle" data-name="bool Function(T?)">bool Function(T?)</text>
+						<g transform="translate(7875.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">-double _getWidth()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Validator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Validator">
-							<rect x="6214.5" y="121.0" height="31.0" width="86.0" data-name="Validator"></rect>
+					<g data-name="BoxConstraints">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoxConstraints">
+							<rect x="12912.0" y="3485.0" height="31.0" width="136.0" data-name="BoxConstraints"></rect>
 						</g>
-						<g transform="translate(6214.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Validator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Validator">
-								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="Validator">Validator</text>
+						<g transform="translate(12912, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxConstraints">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxConstraints">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxConstraints">BoxConstraints</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Patterns">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Patterns">
-							<rect x="6340.5" y="90.5" height="92.0" width="287.0" data-name="Patterns"></rect>
-							<path d="M6340.5 121.5 L6627.5 121.5" fill="none" data-name="Patterns"></path>
+					<g data-name="PrimaryButton">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PrimaryButton">
+							<rect x="8202.5" y="2511.5" height="227.0" width="333.0" data-name="PrimaryButton"></rect>
+							<path d="M8202.5 2542.5 L8535.5 2542.5" fill="none" data-name="PrimaryButton"></path>
 						</g>
-						<g transform="translate(6340.5, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Patterns">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Patterns">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="Patterns">Patterns</text>
+						<g transform="translate(8202.5, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PrimaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PrimaryButton">
+								<text x="158.5" y="13.5" stroke="none" text-anchor="middle" data-name="PrimaryButton">PrimaryButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6340.5, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Patterns">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Patterns">
-								<text x="0.0" y="13.5" stroke="none" data-name="Patterns">&lt;static&gt;+timeFormatString: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Patterns">&lt;static&gt;+emailFormatString: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Patterns">&lt;static&gt;+url: String</text>
+						<g transform="translate(8202.5, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PrimaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PrimaryButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="PrimaryButton">+text: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PrimaryButton">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PrimaryButton">+isLoading: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PrimaryButton">+showLoadingEarliestAfterMs: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PrimaryButton">+onPressed: void Function()?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PrimaryButton">+tooltip: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PrimaryButton">+tooltipDisabled: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PrimaryButton">+enabled: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="PrimaryButton">+onPressedFuture: dynamic Function()?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="PrimaryButton">+innerPadding: EdgeInsets</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="PrimaryButton">+minimumSize: Size?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="PrimaryButton">+isDisabled: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ExecutionLimiter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ExecutionLimiter">
-							<rect x="7030.3" y="3789.5" height="108.0" width="197.0" data-name="ExecutionLimiter"></rect>
-							<path d="M7030.3 3820.5 L7227.3 3820.5" fill="none" data-name="ExecutionLimiter"></path>
-							<path d="M7030.3 3866.5 L7227.3 3866.5" fill="none" data-name="ExecutionLimiter"></path>
+					<g data-name="void Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
+							<rect x="18277.3" y="4118.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
 						</g>
-						<g transform="translate(7030.25, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ExecutionLimiter">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ExecutionLimiter">ExecutionLimiter</text>
+						<g transform="translate(18277.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
+								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7030.25, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
-								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+milliseconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ExecutionLimiter">&lt;static&gt;-_timer: Timer?</text>
-								
-							</g>
+					</g>
+					<g data-name="dynamic Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
+							<rect x="11377.8" y="3485.0" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
 						</g>
-						<g transform="translate(7030.25, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
-								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+void dispose()</text>
+						<g transform="translate(11377.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
+								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Timer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Timer">
-							<rect x="5945.8" y="4118.5" height="31.0" width="60.0" data-name="Timer"></rect>
+					<g data-name="EdgeInsets">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
+							<rect x="13098.8" y="3485.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
 						</g>
-						<g transform="translate(5945.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timer">
-								<text x="22.0" y="13.5" stroke="none" text-anchor="middle" data-name="Timer">Timer</text>
+						<g transform="translate(13098.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Debouncer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="55806.0" y="4072.5" height="123.0" width="536.0" data-name="Debouncer"></rect>
-							<path d="M55806.0 4103.5 L56342.0 4103.5" fill="none" data-name="Debouncer"></path>
-							<path d="M55806.0 4164.5 L56342.0 4164.5" fill="none" data-name="Debouncer"></path>
+					<g data-name="Size">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Size">
+							<rect x="8443.0" y="3485.0" height="31.0" width="50.0" data-name="Size"></rect>
 						</g>
-						<g transform="translate(55806, 4072.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
-								<text x="260.0" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
+						<g transform="translate(8443, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Size">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Size">
+								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Size">Size</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55806, 4103.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
-								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+leading: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Debouncer">+cancelUncompleted: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Debouncer">-_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?</text>
+					</g>
+					<g data-name="FormTableRow">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRow">
+							<rect x="8575.5" y="2549.0" height="152.0" width="379.0" data-name="FormTableRow"></rect>
+							<path d="M8575.5 2580.0 L8954.5 2580.0" fill="none" data-name="FormTableRow"></path>
+						</g>
+						<g transform="translate(8575.5, 2549)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRow">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRow">
+								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRow">FormTableRow</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55806, 4164.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
-								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+dynamic call()</text>
+						<g transform="translate(8575.5, 2580)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRow">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRow">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRow">+label: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRow">+labelBuilder: Widget Function(BuildContext)?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRow">+labelStyle: TextStyle?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRow">+labelHelpText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormTableRow">+input: Widget</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormTableRow">+control: AbstractControl&lt;dynamic&gt;?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormTableRow">+layout: FormTableRowLayout?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CancelableOperation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="60064.0" y="4439.0" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
+					<g data-name="Widget Function(BuildContext)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
+							<rect x="8533.0" y="3485.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
 						</g>
-						<g transform="translate(60064, 4439)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
+						<g transform="translate(8533, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
+								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Throttler">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Throttler">
-							<rect x="6118.3" y="4103.0" height="62.0" width="136.0" data-name="Throttler"></rect>
-							<path d="M6118.3 4134.0 L6254.3 4134.0" fill="none" data-name="Throttler"></path>
+					<g data-name="FormTableRowLayout">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRowLayout">
+							<rect x="6441.0" y="3447.0" height="107.0" width="370.0" data-name="FormTableRowLayout"></rect>
+							<path d="M6441.0 3478.0 L6811.0 3478.0" fill="none" data-name="FormTableRowLayout"></path>
 						</g>
-						<g transform="translate(6118.25, 4103)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Throttler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Throttler">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="Throttler">Throttler</text>
+						<g transform="translate(6441, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRowLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRowLayout">
+								<text x="177.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRowLayout">FormTableRowLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6118.25, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Throttler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Throttler">
-								<text x="0.0" y="13.5" stroke="none" data-name="Throttler">+dynamic call()</text>
+						<g transform="translate(6441, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRowLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRowLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRowLayout">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+values: List&lt;FormTableRowLayout&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+vertical: FormTableRowLayout</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+horizontal: FormTableRowLayout</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ModelAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelAction">
-							<rect x="7896.5" y="2556.5" height="137.0" width="188.0" data-name="ModelAction"></rect>
-							<path d="M7896.5 2587.5 L8084.5 2587.5" fill="none" data-name="ModelAction"></path>
+					<g data-name="FormTableLayout">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableLayout">
+							<rect x="9383.5" y="2548.5" height="153.0" width="379.0" data-name="FormTableLayout"></rect>
+							<path d="M9383.5 2579.5 L9762.5 2579.5" fill="none" data-name="FormTableLayout"></path>
+							<path d="M9383.5 2670.5 L9762.5 2670.5" fill="none" data-name="FormTableLayout"></path>
 						</g>
-						<g transform="translate(7896.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelAction">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelAction">ModelAction</text>
+						<g transform="translate(9383.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableLayout">
+								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableLayout">FormTableLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7896.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelAction">+type: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelAction">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelAction">+icon: IconData?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelAction">+onExecute: Function</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelAction">+isAvailable: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelAction">+isDestructive: bool</text>
+						<g transform="translate(9383.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+rows: List&lt;FormTableRow&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormTableLayout">+columnWidths: Map&lt;int, TableColumnWidth&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormTableLayout">+rowDivider: Widget?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormTableLayout">+rowLayout: FormTableRowLayout?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormTableLayout">+rowLabelStyle: TextStyle?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="39589.3" y="3485.0" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(39589.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
+						<g transform="translate(9383.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="82327.3" y="105.5" height="62.0" width="403.0" data-name="IModelActionProvider"></rect>
-							<path d="M82327.3 136.5 L82730.3 136.5" fill="none" data-name="IModelActionProvider"></path>
+					<g data-name="FormSectionHeader">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormSectionHeader">
+							<rect x="9802.5" y="2548.5" height="153.0" width="220.0" data-name="FormSectionHeader"></rect>
+							<path d="M9802.5 2579.5 L10022.5 2579.5" fill="none" data-name="FormSectionHeader"></path>
+							<path d="M9802.5 2670.5 L10022.5 2670.5" fill="none" data-name="FormSectionHeader"></path>
 						</g>
-						<g transform="translate(82327.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
+						<g transform="translate(9802.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSectionHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSectionHeader">
+								<text x="102.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormSectionHeader">FormSectionHeader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82327.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelActionProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelActionProvider">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+						<g transform="translate(9802.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormSectionHeader">+titleTextStyle: TextStyle?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormSectionHeader">+helpText: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormSectionHeader">+divider: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormSectionHeader">+helpTextDisabled: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(9802.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="80311.5" y="1659.0" height="77.0" width="179.0" data-name="IListActionProvider"></rect>
-							<path d="M80311.5 1690.0 L80490.5 1690.0" fill="none" data-name="IListActionProvider"></path>
+					<g data-name="FormLabel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormLabel">
+							<rect x="10231.0" y="2556.0" height="138.0" width="266.0" data-name="FormLabel"></rect>
+							<path d="M10231.0 2587.0 L10497.0 2587.0" fill="none" data-name="FormLabel"></path>
+							<path d="M10231.0 2663.0 L10497.0 2663.0" fill="none" data-name="FormLabel"></path>
 						</g>
-						<g transform="translate(80311.5, 1659)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
+						<g transform="translate(10231, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormLabel">
+								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormLabel">FormLabel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(10231, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+labelText: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormLabel">+helpText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormLabel">+labelTextStyle: TextStyle?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormLabel">+layout: FormTableRowLayout?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80311.5, 1690)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IListActionProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="IListActionProvider">+void onSelectItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IListActionProvider">+void onNewItem()</text>
+						<g transform="translate(10231, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ModelActionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelActionType">
-							<rect x="0.0" y="3417.0" height="167.0" width="334.0" data-name="ModelActionType"></rect>
-							<path d="M0.0 3448.0 L334.0 3448.0" fill="none" data-name="ModelActionType"></path>
+					<g data-name="DismissButton">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DismissButton">
+							<rect x="15606.0" y="3789.5" height="108.0" width="249.0" data-name="DismissButton"></rect>
+							<path d="M15606.0 3820.5 L15855.0 3820.5" fill="none" data-name="DismissButton"></path>
+							<path d="M15606.0 3866.5 L15855.0 3866.5" fill="none" data-name="DismissButton"></path>
 						</g>
-						<g transform="translate(0, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelActionType">
-								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelActionType">ModelActionType</text>
+						<g transform="translate(15606, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DismissButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DismissButton">
+								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="DismissButton">DismissButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelActionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelActionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+values: List&lt;ModelActionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+edit: ModelActionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+delete: ModelActionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+remove: ModelActionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+duplicate: ModelActionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+clipboard: ModelActionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+primary: ModelActionType</text>
+						<g transform="translate(15606, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+onPressed: void Function()?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DismissButton">+text: String?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(15606, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Config">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Config">
-							<rect x="7097.3" y="60.5" height="152.0" width="396.0" data-name="Config"></rect>
-							<path d="M7097.3 91.5 L7493.3 91.5" fill="none" data-name="Config"></path>
+					<g data-name="Badge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Badge">
+							<rect x="10537.0" y="2496.0" height="258.0" width="263.0" data-name="Badge"></rect>
+							<path d="M10537.0 2527.0 L10800.0 2527.0" fill="none" data-name="Badge"></path>
+							<path d="M10537.0 2678.0 L10800.0 2678.0" fill="none" data-name="Badge"></path>
 						</g>
-						<g transform="translate(7097.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Config">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Config">
-								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="Config">Config</text>
+						<g transform="translate(10537, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Badge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Badge">
+								<text x="123.5" y="13.5" stroke="none" text-anchor="middle" data-name="Badge">Badge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7097.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Config">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Config">
-								<text x="0.0" y="13.5" stroke="none" data-name="Config">&lt;static&gt;+isDebugMode: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Config">&lt;static&gt;+defaultLocale: Set&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Config">&lt;static&gt;+supportedLocales: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Config">&lt;static&gt;+newStudyId: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Config">&lt;static&gt;+newModelId: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Config">&lt;static&gt;+minSplashTime: int</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Config">&lt;static&gt;+formAutosaveDebounce: int</text>
+						<g transform="translate(10537, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
+								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+icon: IconData?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Badge">+color: Color?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Badge">+borderRadius: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Badge">+label: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Badge">+type: BadgeType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Badge">+padding: EdgeInsets</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Badge">+iconSize: double?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Badge">+labelStyle: TextStyle?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="Badge">+center: bool</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="60848.8" y="4020.0" height="228.0" width="295.0" data-name="IAuthRepository"></rect>
-							<path d="M60848.8 4051.0 L61143.8 4051.0" fill="none" data-name="IAuthRepository"></path>
-							<path d="M60848.8 4142.0 L61143.8 4142.0" fill="none" data-name="IAuthRepository"></path>
-						</g>
-						<g transform="translate(60848.75, 4020)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
+						<g transform="translate(10537, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
+								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Badge">-Color? _getBackgroundColor()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Badge">-Color _getBorderColor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Badge">-Color? _getLabelColor()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60848.75, 4051)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+allowPasswordReset: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+currentUser: User?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+isLoggedIn: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+session: Session?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+serializedSession: String?</text>
+					</g>
+					<g data-name="BadgeType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
+							<rect x="24426.0" y="3432.0" height="137.0" width="288.0" data-name="BadgeType"></rect>
+							<path d="M24426.0 3463.0 L24714.0 3463.0" fill="none" data-name="BadgeType"></path>
+						</g>
+						<g transform="translate(24426, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
+								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60848.75, 4142)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+dynamic signUp()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+dynamic signInWith()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+dynamic signOut()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+dynamic updateUser()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IAuthRepository">+void dispose()</text>
+						<g transform="translate(24426, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BadgeType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BadgeType">
+								<text x="0.0" y="13.5" stroke="none" data-name="BadgeType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BadgeType">&lt;static&gt;+values: List&lt;BadgeType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BadgeType">&lt;static&gt;+filled: BadgeType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlined: BadgeType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlineFill: BadgeType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="BadgeType">&lt;static&gt;+plain: BadgeType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="User">
-						<g fill="#eee8d5" stroke="#33322E" data-name="User">
-							<rect x="60697.0" y="4661.0" height="31.0" width="53.0" data-name="User"></rect>
+					<g data-name="StandardDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StandardDialog">
+							<rect x="10840.0" y="2488.5" height="273.0" width="247.0" data-name="StandardDialog"></rect>
+							<path d="M10840.0 2519.5 L11087.0 2519.5" fill="none" data-name="StandardDialog"></path>
+							<path d="M10840.0 2730.5 L11087.0 2730.5" fill="none" data-name="StandardDialog"></path>
 						</g>
-						<g transform="translate(60697, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="User">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="User">
-								<text x="18.5" y="13.5" stroke="none" text-anchor="middle" data-name="User">User</text>
+						<g transform="translate(10840, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardDialog">
+								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardDialog">StandardDialog</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Session">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Session">
-							<rect x="60790.0" y="4661.0" height="31.0" width="79.0" data-name="Session"></rect>
+						<g transform="translate(10840, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+title: Widget?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StandardDialog">+titleText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StandardDialog">+body: Widget</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StandardDialog">+actionButtons: List&lt;Widget&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StandardDialog">+backgroundColor: Color?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StandardDialog">+borderRadius: double?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StandardDialog">+width: double?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StandardDialog">+height: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StandardDialog">+minWidth: double</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StandardDialog">+minHeight: double</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StandardDialog">+maxWidth: double?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StandardDialog">+maxHeight: double?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StandardDialog">+padding: EdgeInsets</text>
+								
+							</g>
 						</g>
-						<g transform="translate(60790, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Session">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Session">
-								<text x="31.5" y="13.5" stroke="none" text-anchor="middle" data-name="Session">Session</text>
+						<g transform="translate(10840, 2730.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IAppDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
-							<rect x="8107.5" y="3812.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
-							<path d="M8107.5 3843.5 L8304.5 3843.5" fill="none" data-name="IAppDelegate"></path>
+					<g data-name="ISyncIndicatorViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ISyncIndicatorViewModel">
+							<rect x="26578.5" y="98.0" height="77.0" width="214.0" data-name="ISyncIndicatorViewModel"></rect>
+							<path d="M26578.5 129.0 L26792.5 129.0" fill="none" data-name="ISyncIndicatorViewModel"></path>
 						</g>
-						<g transform="translate(8107.5, 3812.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
+						<g transform="translate(26578.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ISyncIndicatorViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ISyncIndicatorViewModel">
+								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="ISyncIndicatorViewModel">ISyncIndicatorViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8107.5, 3843.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
+						<g transform="translate(26578.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ISyncIndicatorViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ISyncIndicatorViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ISyncIndicatorViewModel">+isDirty: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ISyncIndicatorViewModel">+lastSynced: DateTime?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthRepository">
-							<rect x="60942.5" y="4310.5" height="288.0" width="295.0" data-name="AuthRepository"></rect>
-							<path d="M60942.5 4341.5 L61237.5 4341.5" fill="none" data-name="AuthRepository"></path>
-							<path d="M60942.5 4462.5 L61237.5 4462.5" fill="none" data-name="AuthRepository"></path>
-						</g>
-						<g transform="translate(60942.5, 4310.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthRepository">
-								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthRepository">AuthRepository</text>
-								
-							</g>
+					<g data-name="SyncIndicator">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SyncIndicator">
+							<rect x="11127.0" y="2564.0" height="122.0" width="208.0" data-name="SyncIndicator"></rect>
+							<path d="M11127.0 2595.0 L11335.0 2595.0" fill="none" data-name="SyncIndicator"></path>
 						</g>
-						<g transform="translate(60942.5, 4341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">+supabaseClient: SupabaseClient</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+allowPasswordReset: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+authClient: GoTrueClient</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+session: Session?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+serializedSession: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+currentUser: User?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+isLoggedIn: bool</text>
+						<g transform="translate(11127, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SyncIndicator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SyncIndicator">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="SyncIndicator">SyncIndicator</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60942.5, 4462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">-void _registerAuthListener()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+dynamic signUp()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+dynamic signInWith()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+dynamic signOut()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+dynamic updateUser()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+void dispose()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthRepository">+dynamic onAppStart()</text>
+						<g transform="translate(11127, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SyncIndicator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SyncIndicator">
+								<text x="0.0" y="13.5" stroke="none" data-name="SyncIndicator">+state: AsyncValue&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SyncIndicator">+lastSynced: DateTime?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SyncIndicator">+isDirty: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SyncIndicator">+animationDuration: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SyncIndicator">+iconSize: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SupabaseClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClient">
-							<rect x="58329.0" y="4661.0" height="31.0" width="141.0" data-name="SupabaseClient"></rect>
+					<g data-name="IWithBanner">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
+							<rect x="13085.5" y="1181.5" height="62.0" width="164.0" data-name="IWithBanner"></rect>
+							<path d="M13085.5 1212.5 L13249.5 1212.5" fill="none" data-name="IWithBanner"></path>
 						</g>
-						<g transform="translate(58329, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClient">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClient">SupabaseClient</text>
+						<g transform="translate(13085.5, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="GoTrueClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoTrueClient">
-							<rect x="60909.0" y="4661.0" height="31.0" width="120.0" data-name="GoTrueClient"></rect>
-						</g>
-						<g transform="translate(60909, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoTrueClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoTrueClient">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoTrueClient">GoTrueClient</text>
+						<g transform="translate(13085.5, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IWithBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IWithBanner">
+								<text x="0.0" y="13.5" stroke="none" data-name="IWithBanner">+Widget? banner()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IInviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="80530.5" y="1666.5" height="62.0" width="265.0" data-name="IInviteCodeRepository"></rect>
-							<path d="M80530.5 1697.5 L80795.5 1697.5" fill="none" data-name="IInviteCodeRepository"></path>
+					<g data-name="BannerBox">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BannerBox">
+							<rect x="11375.0" y="2534.0" height="182.0" width="298.0" data-name="BannerBox"></rect>
+							<path d="M11375.0 2565.0 L11673.0 2565.0" fill="none" data-name="BannerBox"></path>
 						</g>
-						<g transform="translate(80530.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
+						<g transform="translate(11375, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerBox">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerBox">
+								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerBox">BannerBox</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80530.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IInviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IInviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
+						<g transform="translate(11375, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerBox">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerBox">
+								<text x="0.0" y="13.5" stroke="none" data-name="BannerBox">+prefixIcon: Widget?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BannerBox">+body: Widget</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BannerBox">+style: BannerStyle</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="BannerBox">+padding: EdgeInsets?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="BannerBox">+noPrefix: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="BannerBox">+dismissable: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="BannerBox">+isDismissed: bool?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="BannerBox">+onDismissed: dynamic Function()?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="BannerBox">+dismissIconSize: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ModelRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepository">
-							<rect x="81806.8" y="986.0" height="453.0" width="662.0" data-name="ModelRepository"></rect>
-							<path d="M81806.8 1017.0 L82468.8 1017.0" fill="none" data-name="ModelRepository"></path>
-							<path d="M81806.8 1123.0 L82468.8 1123.0" fill="none" data-name="ModelRepository"></path>
+					<g data-name="BannerStyle">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BannerStyle">
+							<rect x="4939.0" y="3439.5" height="122.0" width="294.0" data-name="BannerStyle"></rect>
+							<path d="M4939.0 3470.5 L5233.0 3470.5" fill="none" data-name="BannerStyle"></path>
 						</g>
-						<g transform="translate(81806.75, 986)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepository">
-								<text x="323.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepository">ModelRepository</text>
+						<g transform="translate(4939, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerStyle">
+								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerStyle">BannerStyle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81806.75, 1017)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+delegate: IModelRepositoryDelegate&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">-_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">-_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">-_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;</text>
+						<g transform="translate(4939, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerStyle">
+								<text x="0.0" y="13.5" stroke="none" data-name="BannerStyle">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+values: List&lt;BannerStyle&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+warning: BannerStyle</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+info: BannerStyle</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+error: BannerStyle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81806.75, 1123)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt;? get()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">+dynamic fetchAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">+dynamic fetch()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ModelRepository">-dynamic _buildModelSpecificController()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ModelRepository">+dynamic ensurePersisted()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt; upsertLocally()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ModelRepository">+List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ModelRepository">+dynamic emitUpdate()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ModelRepository">+dynamic emitModelEvent()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ModelRepository">+dynamic emitError()</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ModelRepository">+void dispose()</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ModelRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+					</g>
+					<g data-name="ActionMenuInline">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuInline">
+							<rect x="26832.5" y="52.5" height="168.0" width="324.0" data-name="ActionMenuInline"></rect>
+							<path d="M26832.5 83.5 L27156.5 83.5" fill="none" data-name="ActionMenuInline"></path>
+							<path d="M26832.5 189.5 L27156.5 189.5" fill="none" data-name="ActionMenuInline"></path>
+						</g>
+						<g transform="translate(26832.5, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuInline">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuInline">
+								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuInline">ActionMenuInline</text>
+								
+							</g>
+						</g>
+						<g transform="translate(26832.5, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuInline">+iconSize: double?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuInline">+visible: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuInline">+splashRadius: double?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ActionMenuInline">+paddingVertical: double?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ActionMenuInline">+paddingHorizontal: double?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(26832.5, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepository">
-							<rect x="81197.0" y="2518.5" height="213.0" width="403.0" data-name="InviteCodeRepository"></rect>
-							<path d="M81197.0 2549.5 L81600.0 2549.5" fill="none" data-name="InviteCodeRepository"></path>
-							<path d="M81197.0 2655.5 L81600.0 2655.5" fill="none" data-name="InviteCodeRepository"></path>
+					<g data-name="Collapsible">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Collapsible">
+							<rect x="27196.5" y="83.0" height="107.0" width="441.0" data-name="Collapsible"></rect>
+							<path d="M27196.5 114.0 L27637.5 114.0" fill="none" data-name="Collapsible"></path>
 						</g>
-						<g transform="translate(81197, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepository">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepository">InviteCodeRepository</text>
+						<g transform="translate(27196.5, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Collapsible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Collapsible">
+								<text x="212.5" y="13.5" stroke="none" text-anchor="middle" data-name="Collapsible">Collapsible</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81197, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepository">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepository">+study: Study</text>
+						<g transform="translate(27196.5, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Collapsible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Collapsible">
+								<text x="0.0" y="13.5" stroke="none" data-name="Collapsible">+contentBuilder: Widget Function(BuildContext, bool)</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Collapsible">+headerBuilder: Widget Function(BuildContext, bool)?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Collapsible">+title: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Collapsible">+isCollapsed: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81197, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+dynamic emitUpdate()</text>
+					</g>
+					<g data-name="Widget Function(BuildContext, bool)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)">
+							<rect x="26318.0" y="614.0" height="31.0" width="300.0" data-name="Widget Function(BuildContext, bool)"></rect>
+						</g>
+						<g transform="translate(26318, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)">
+								<text x="142.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)">Widget Function(BuildContext, bool)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ProviderRef">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ProviderRef">
-							<rect x="80941.8" y="4118.5" height="31.0" width="109.0" data-name="ProviderRef"></rect>
+					<g data-name="Widget Function(BuildContext, bool)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)?">
+							<rect x="27262.0" y="614.0" height="31.0" width="310.0" data-name="Widget Function(BuildContext, bool)?"></rect>
 						</g>
-						<g transform="translate(80941.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ProviderRef">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProviderRef">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProviderRef">ProviderRef</text>
+						<g transform="translate(27262, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)?">
+								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)?">Widget Function(BuildContext, bool)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyUApi">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApi">
-							<rect x="68569.8" y="4028.0" height="212.0" width="251.0" data-name="StudyUApi"></rect>
-							<path d="M68569.8 4059.0 L68820.8 4059.0" fill="none" data-name="StudyUApi"></path>
+					<g data-name="NavbarTab">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
+							<rect x="62257.0" y="1644.0" height="107.0" width="196.0" data-name="NavbarTab"></rect>
+							<path d="M62257.0 1675.0 L62453.0 1675.0" fill="none" data-name="NavbarTab"></path>
 						</g>
-						<g transform="translate(68569.75, 4028)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyUApi">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApi">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApi">StudyUApi</text>
+						<g transform="translate(62257, 1644)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
+								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68569.75, 4059)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApi">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApi">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApi">+dynamic saveStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApi">+dynamic getUserStudies()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApi">+dynamic saveStudyInvite()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudyInvite()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudyInvite()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApi">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApi">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApi">+dynamic fetchUser()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApi">+dynamic saveUser()</text>
+						<g transform="translate(62257, 1675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NavbarTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NavbarTab">
+								<text x="0.0" y="13.5" stroke="none" data-name="NavbarTab">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NavbarTab">+intent: RoutingIntent?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NavbarTab">+index: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NavbarTab">+enabled: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="69689.3" y="3462.0" height="77.0" width="251.0" data-name="IStudyRepository"></rect>
-							<path d="M69689.3 3493.0 L69940.3 3493.0" fill="none" data-name="IStudyRepository"></path>
+					<g data-name="RoutingIntent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
+							<rect x="44409.5" y="2518.5" height="213.0" width="297.0" data-name="RoutingIntent"></rect>
+							<path d="M44409.5 2549.5 L44706.5 2549.5" fill="none" data-name="RoutingIntent"></path>
+							<path d="M44409.5 2685.5 L44706.5 2685.5" fill="none" data-name="RoutingIntent"></path>
 						</g>
-						<g transform="translate(69689.25, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
+						<g transform="translate(44409.5, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
+								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(69689.25, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyRepository">+dynamic launch()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyRepository">+dynamic deleteParticipants()</text>
+						<g transform="translate(44409.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">+route: GoRoute</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+params: Map&lt;String, String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntent">+queryParams: Map&lt;String, String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntent">+dispatch: RoutingIntentDispatch?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntent">+extra: Object?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntent">+routeName: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntent">+arguments: Map&lt;String, String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntent">+props: List&lt;Object?&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(44409.5, 2685.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">-dynamic _validateRoute()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+bool matches()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="64687.0" y="3485.0" height="31.0" width="61.0" data-name="Study"></rect>
+					<g data-name="TabbedNavbar">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TabbedNavbar">
+							<rect x="12039.8" y="2496.5" height="257.0" width="308.0" data-name="TabbedNavbar"></rect>
+							<path d="M12039.8 2527.5 L12347.8 2527.5" fill="none" data-name="TabbedNavbar"></path>
 						</g>
-						<g transform="translate(64687, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
+						<g transform="translate(12039.75, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabbedNavbar">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabbedNavbar">
+								<text x="146.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabbedNavbar">TabbedNavbar</text>
+								
+							</g>
+						</g>
+						<g transform="translate(12039.75, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TabbedNavbar">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TabbedNavbar">
+								<text x="0.0" y="13.5" stroke="none" data-name="TabbedNavbar">+tabs: List&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TabbedNavbar">+selectedTab: T?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TabbedNavbar">+indicator: BoxDecoration?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TabbedNavbar">+height: double?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TabbedNavbar">+disabledBackgroundColor: Color?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TabbedNavbar">+disabledTooltipText: String?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="TabbedNavbar">+onSelect: void Function(int, T)?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="TabbedNavbar">+labelPadding: EdgeInsets?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="TabbedNavbar">+labelSpacing: double?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="TabbedNavbar">+indicatorSize: TabBarIndicatorSize?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="TabbedNavbar">+isScrollable: bool</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="TabbedNavbar">+backgroundColor: Color?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="TabbedNavbar">+labelColorHover: Color?</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="TabbedNavbar">+unselectedLabelColorHover: Color?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepositoryDelegate">
-							<rect x="81741.5" y="2518.5" height="213.0" width="299.0" data-name="InviteCodeRepositoryDelegate"></rect>
-							<path d="M81741.5 2549.5 L82040.5 2549.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
-							<path d="M81741.5 2610.5 L82040.5 2610.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
+					<g data-name="BoxDecoration">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoxDecoration">
+							<rect x="11666.3" y="3485.0" height="31.0" width="132.0" data-name="BoxDecoration"></rect>
 						</g>
-						<g transform="translate(81741.5, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepositoryDelegate">
-								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepositoryDelegate">InviteCodeRepositoryDelegate</text>
+						<g transform="translate(11666.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxDecoration">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxDecoration">
+								<text x="58.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxDecoration">BoxDecoration</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81741.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+apiClient: StudyUApi</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+studyRepository: IStudyRepository</text>
+					</g>
+					<g data-name="void Function(int, T)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(int, T)?">
+							<rect x="11838.3" y="3485.0" height="31.0" width="183.0" data-name="void Function(int, T)?"></rect>
+						</g>
+						<g transform="translate(11838.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(int, T)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(int, T)?">
+								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(int, T)?">void Function(int, T)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81741.5, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic onError()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createDuplicate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createNewInstance()</text>
+					</g>
+					<g data-name="TabBarIndicatorSize">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TabBarIndicatorSize">
+							<rect x="12061.3" y="3485.0" height="31.0" width="176.0" data-name="TabBarIndicatorSize"></rect>
+						</g>
+						<g transform="translate(12061.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabBarIndicatorSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabBarIndicatorSize">
+								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabBarIndicatorSize">TabBarIndicatorSize</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IModelRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepositoryDelegate">
-							<rect x="81873.3" y="1621.5" height="152.0" width="225.0" data-name="IModelRepositoryDelegate"></rect>
-							<path d="M81873.3 1652.5 L82098.3 1652.5" fill="none" data-name="IModelRepositoryDelegate"></path>
+					<g data-name="SidesheetTab">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SidesheetTab">
+							<rect x="62009.3" y="2594.0" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
+							<path d="M62009.3 2625.0 L62339.3 2625.0" fill="none" data-name="SidesheetTab"></path>
 						</g>
-						<g transform="translate(81873.25, 1621.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepositoryDelegate">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepositoryDelegate">IModelRepositoryDelegate</text>
+						<g transform="translate(62009.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SidesheetTab">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="SidesheetTab">SidesheetTab</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81873.25, 1652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepositoryDelegate">+T createNewInstance()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepositoryDelegate">+T createDuplicate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic onError()</text>
+						<g transform="translate(62009.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SidesheetTab">
+								<text x="0.0" y="13.5" stroke="none" data-name="SidesheetTab">+builder: Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyLaunched">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyLaunched">
-							<rect x="6579.5" y="614.0" height="31.0" width="140.0" data-name="StudyLaunched"></rect>
+					<g data-name="Widget Function(BuildContext)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
+							<rect x="48614.0" y="3485.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
 						</g>
-						<g transform="translate(6579.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyLaunched">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyLaunched">
-								<text x="62.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyLaunched">StudyLaunched</text>
+						<g transform="translate(48614, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
+								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ModelEvent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelEvent">
-							<rect x="6843.8" y="98.0" height="77.0" width="145.0" data-name="ModelEvent"></rect>
-							<path d="M6843.8 129.0 L6988.8 129.0" fill="none" data-name="ModelEvent"></path>
+					<g data-name="Sidesheet">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Sidesheet">
+							<rect x="12715.3" y="2519.0" height="212.0" width="341.0" data-name="Sidesheet"></rect>
+							<path d="M12715.3 2550.0 L13056.3 2550.0" fill="none" data-name="Sidesheet"></path>
 						</g>
-						<g transform="translate(6843.75, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelEvent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelEvent">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelEvent">ModelEvent</text>
+						<g transform="translate(12715.25, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Sidesheet">
+								<text x="162.5" y="13.5" stroke="none" text-anchor="middle" data-name="Sidesheet">Sidesheet</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6843.75, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelEvent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelEvent">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelEvent">+modelId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelEvent">+model: T</text>
+						<g transform="translate(12715.25, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Sidesheet">
+								<text x="0.0" y="13.5" stroke="none" data-name="Sidesheet">&lt;static&gt;+kDefaultWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Sidesheet">+titleText: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Sidesheet">+body: Widget?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Sidesheet">+tabs: List&lt;SidesheetTab&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Sidesheet">+actionButtons: List&lt;Widget&gt;?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Sidesheet">+width: double?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Sidesheet">+withCloseButton: bool</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Sidesheet">+ignoreAppBar: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="Sidesheet">+collapseSingleTab: bool</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="Sidesheet">+bodyPadding: EdgeInsets?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="Sidesheet">+wrapContent: Widget Function(Widget)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WrappedModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WrappedModel">
-							<rect x="10808.0" y="2496.0" height="258.0" width="251.0" data-name="WrappedModel"></rect>
-							<path d="M10808.0 2527.0 L11059.0 2527.0" fill="none" data-name="WrappedModel"></path>
-							<path d="M10808.0 2678.0 L11059.0 2678.0" fill="none" data-name="WrappedModel"></path>
+					<g data-name="Widget Function(Widget)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Widget)?">
+							<rect x="19573.8" y="3485.0" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
 						</g>
-						<g transform="translate(10808, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WrappedModel">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="WrappedModel">WrappedModel</text>
+						<g transform="translate(19573.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Widget)?">
+								<text x="102.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Widget)?">Widget Function(Widget)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10808, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">-_model: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+asyncValue: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+isLocalOnly: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+isDirty: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WrappedModel">+isDeleted: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WrappedModel">+lastSaved: DateTime?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WrappedModel">+lastFetched: DateTime?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WrappedModel">+lastUpdated: DateTime?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WrappedModel">+model: T</text>
+					</g>
+					<g data-name="FormSideSheetTab">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormSideSheetTab">
+							<rect x="62379.3" y="2594.0" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
+							<path d="M62379.3 2625.0 L62692.3 2625.0" fill="none" data-name="FormSideSheetTab"></path>
+						</g>
+						<g transform="translate(62379.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSideSheetTab">
+								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormSideSheetTab">FormSideSheetTab</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10808, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">+dynamic markWithError()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+dynamic markAsLoading()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+dynamic markAsFetched()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+dynamic markAsSaved()</text>
+						<g transform="translate(62379.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSideSheetTab">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormSideSheetTab">+formViewBuilder: Widget Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="47948.0" y="3485.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
+					<g data-name="HelpIcon">
+						<g fill="#eee8d5" stroke="#33322E" data-name="HelpIcon">
+							<rect x="27677.5" y="90.0" height="93.0" width="174.0" data-name="HelpIcon"></rect>
+							<path d="M27677.5 121.0 L27851.5 121.0" fill="none" data-name="HelpIcon"></path>
+							<path d="M27677.5 152.0 L27851.5 152.0" fill="none" data-name="HelpIcon"></path>
 						</g>
-						<g transform="translate(47948, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
+						<g transform="translate(27677.5, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HelpIcon">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HelpIcon">
+								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="HelpIcon">HelpIcon</text>
+								
+							</g>
+						</g>
+						<g transform="translate(27677.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
+								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+tooltipText: String?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ModelRepositoryException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepositoryException">
-							<rect x="7268.5" y="614.0" height="31.0" width="227.0" data-name="ModelRepositoryException"></rect>
-						</g>
-						<g transform="translate(7268.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelRepositoryException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepositoryException">
-								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepositoryException">ModelRepositoryException</text>
+						<g transform="translate(27677.5, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
+								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Exception">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="34063.0" y="121.0" height="31.0" width="94.0" data-name="Exception"></rect>
+					<g data-name="EmptyBody">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EmptyBody">
+							<rect x="13672.0" y="2541.0" height="168.0" width="222.0" data-name="EmptyBody"></rect>
+							<path d="M13672.0 2572.0 L13894.0 2572.0" fill="none" data-name="EmptyBody"></path>
+							<path d="M13672.0 2678.0 L13894.0 2678.0" fill="none" data-name="EmptyBody"></path>
 						</g>
-						<g transform="translate(34063, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
+						<g transform="translate(13672, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmptyBody">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmptyBody">
+								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="EmptyBody">EmptyBody</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelNotFoundException">
-							<rect x="7272.5" y="1197.0" height="31.0" width="219.0" data-name="ModelNotFoundException"></rect>
+						<g transform="translate(13672, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
+								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+icon: IconData?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EmptyBody">+leading: Widget?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EmptyBody">+leadingSpacing: double?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EmptyBody">+title: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EmptyBody">+description: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EmptyBody">+button: Widget?</text>
+								
+							</g>
 						</g>
-						<g transform="translate(7272.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelNotFoundException">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelNotFoundException">ModelNotFoundException</text>
+						<g transform="translate(13672, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
+								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IModelRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepository">
-							<rect x="81946.8" y="501.0" height="257.0" width="382.0" data-name="IModelRepository"></rect>
-							<path d="M81946.8 532.0 L82328.8 532.0" fill="none" data-name="IModelRepository"></path>
+					<g data-name="IndicatorRangeSliderThumbShape">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IndicatorRangeSliderThumbShape">
+							<rect x="27857.0" y="560.5" height="138.0" width="287.0" data-name="IndicatorRangeSliderThumbShape"></rect>
+							<path d="M27857.0 591.5 L28144.0 591.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
+							<path d="M27857.0 652.5 L28144.0 652.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
 						</g>
-						<g transform="translate(81946.75, 501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepository">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepository">IModelRepository</text>
+						<g transform="translate(27857, 560.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IndicatorRangeSliderThumbShape">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="IndicatorRangeSliderThumbShape">IndicatorRangeSliderThumbShape</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81946.75, 532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepository">+WrappedModel&lt;T&gt;? get()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepository">+dynamic fetchAll()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepository">+dynamic fetch()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepository">+dynamic save()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepository">+dynamic delete()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSave()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="IModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="IModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="IModelRepository">+dynamic ensurePersisted()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="IModelRepository">+void dispose()</text>
+						<g transform="translate(27857, 591.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
+								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+buildContext: BuildContext</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+start: T</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+end: T</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="APIException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="APIException">
-							<rect x="8928.0" y="614.0" height="31.0" width="121.0" data-name="APIException"></rect>
-						</g>
-						<g transform="translate(8928, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="APIException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="APIException">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="APIException">APIException</text>
+						<g transform="translate(27857, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
+								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+Size getPreferredSize()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+void paint()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotFoundException">
-							<rect x="7531.5" y="1197.0" height="31.0" width="216.0" data-name="StudyNotFoundException"></rect>
+					<g data-name="BuildContext">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
+							<rect x="27942.5" y="1197.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
 						</g>
-						<g transform="translate(7531.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotFoundException">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotFoundException">StudyNotFoundException</text>
+						<g transform="translate(27942.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
+								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementNotFoundException">
-							<rect x="7787.5" y="1197.0" height="31.0" width="279.0" data-name="MeasurementNotFoundException"></rect>
+					<g data-name="RangeSliderThumbShape">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RangeSliderThumbShape">
+							<rect x="27891.5" y="121.0" height="31.0" width="218.0" data-name="RangeSliderThumbShape"></rect>
 						</g>
-						<g transform="translate(7787.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementNotFoundException">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementNotFoundException">MeasurementNotFoundException</text>
+						<g transform="translate(27891.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="RangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RangeSliderThumbShape">
+								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="RangeSliderThumbShape">RangeSliderThumbShape</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionNotFoundException">
-							<rect x="8106.5" y="1197.0" height="31.0" width="242.0" data-name="QuestionNotFoundException"></rect>
+					<g data-name="MouseEventsRegion">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MouseEventsRegion">
+							<rect x="15931.5" y="3760.0" height="167.0" width="379.0" data-name="MouseEventsRegion"></rect>
+							<path d="M15931.5 3791.0 L16310.5 3791.0" fill="none" data-name="MouseEventsRegion"></path>
 						</g>
-						<g transform="translate(8106.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionNotFoundException">
-								<text x="113.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionNotFoundException">QuestionNotFoundException</text>
+						<g transform="translate(15931.5, 3760)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MouseEventsRegion">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MouseEventsRegion">
+								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="MouseEventsRegion">MouseEventsRegion</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ConsentItemNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemNotFoundException">
-							<rect x="8388.5" y="1197.0" height="31.0" width="271.0" data-name="ConsentItemNotFoundException"></rect>
-						</g>
-						<g transform="translate(8388.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemNotFoundException">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemNotFoundException">ConsentItemNotFoundException</text>
+						<g transform="translate(15931.5, 3791)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MouseEventsRegion">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MouseEventsRegion">
+								<text x="0.0" y="13.5" stroke="none" data-name="MouseEventsRegion">+onTap: void Function()?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MouseEventsRegion">+onHover: void Function(PointerHoverEvent)?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MouseEventsRegion">+onEnter: void Function(PointerEnterEvent)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MouseEventsRegion">+onExit: void Function(PointerExitEvent)?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MouseEventsRegion">+autoselectCursor: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MouseEventsRegion">+cursor: SystemMouseCursor</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MouseEventsRegion">&lt;static&gt;+defaultCursor: SystemMouseCursor</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MouseEventsRegion">+autoCursor: SystemMouseCursor</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionNotFoundException">
-							<rect x="8699.5" y="1197.0" height="31.0" width="265.0" data-name="InterventionNotFoundException"></rect>
+					<g data-name="void Function(PointerHoverEvent)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerHoverEvent)?">
+							<rect x="5826.8" y="4118.5" height="31.0" width="292.0" data-name="void Function(PointerHoverEvent)?"></rect>
 						</g>
-						<g transform="translate(8699.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionNotFoundException">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionNotFoundException">InterventionNotFoundException</text>
+						<g transform="translate(5826.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerHoverEvent)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerHoverEvent)?">
+								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerHoverEvent)?">void Function(PointerHoverEvent)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskNotFoundException">
-							<rect x="9004.5" y="1197.0" height="31.0" width="303.0" data-name="InterventionTaskNotFoundException"></rect>
+					<g data-name="void Function(PointerEnterEvent)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerEnterEvent)?">
+							<rect x="6158.8" y="4118.5" height="31.0" width="287.0" data-name="void Function(PointerEnterEvent)?"></rect>
 						</g>
-						<g transform="translate(9004.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskNotFoundException">
-								<text x="143.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskNotFoundException">InterventionTaskNotFoundException</text>
+						<g transform="translate(6158.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerEnterEvent)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerEnterEvent)?">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerEnterEvent)?">void Function(PointerEnterEvent)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportNotFoundException">
-							<rect x="9347.5" y="1197.0" height="31.0" width="224.0" data-name="ReportNotFoundException"></rect>
+					<g data-name="void Function(PointerExitEvent)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerExitEvent)?">
+							<rect x="13967.0" y="4118.5" height="31.0" width="274.0" data-name="void Function(PointerExitEvent)?"></rect>
 						</g>
-						<g transform="translate(9347.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportNotFoundException">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportNotFoundException">ReportNotFoundException</text>
+						<g transform="translate(13967, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerExitEvent)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerExitEvent)?">
+								<text x="129.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerExitEvent)?">void Function(PointerExitEvent)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportSectionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionNotFoundException">
-							<rect x="9611.5" y="1197.0" height="31.0" width="283.0" data-name="ReportSectionNotFoundException"></rect>
+					<g data-name="SystemMouseCursor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SystemMouseCursor">
+							<rect x="14281.0" y="4118.5" height="31.0" width="180.0" data-name="SystemMouseCursor"></rect>
 						</g>
-						<g transform="translate(9611.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionNotFoundException">
-								<text x="133.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionNotFoundException">ReportSectionNotFoundException</text>
+						<g transform="translate(14281, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SystemMouseCursor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SystemMouseCursor">
+								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="SystemMouseCursor">SystemMouseCursor</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInviteNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInviteNotFoundException">
-							<rect x="9934.5" y="1197.0" height="31.0" width="259.0" data-name="StudyInviteNotFoundException"></rect>
+					<g data-name="ReactiveCustomColorPicker">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveCustomColorPicker">
+							<rect x="36406.0" y="614.0" height="31.0" width="236.0" data-name="ReactiveCustomColorPicker"></rect>
 						</g>
-						<g transform="translate(9934.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInviteNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInviteNotFoundException">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInviteNotFoundException">StudyInviteNotFoundException</text>
+						<g transform="translate(36406, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveCustomColorPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveCustomColorPicker">
+								<text x="110.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveCustomColorPicker">ReactiveCustomColorPicker</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="UserNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UserNotFoundException">
-							<rect x="10233.5" y="1197.0" height="31.0" width="208.0" data-name="UserNotFoundException"></rect>
+					<g data-name="ReactiveFormField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFormField">
+							<rect x="36442.5" y="121.0" height="31.0" width="163.0" data-name="ReactiveFormField"></rect>
 						</g>
-						<g transform="translate(10233.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserNotFoundException">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserNotFoundException">UserNotFoundException</text>
+						<g transform="translate(36442.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFormField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFormField">
+								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFormField">ReactiveFormField</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyUApiClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApiClient">
-							<rect x="58160.0" y="4288.0" height="333.0" width="479.0" data-name="StudyUApiClient"></rect>
-							<path d="M58160.0 4319.0 L58639.0 4319.0" fill="none" data-name="StudyUApiClient"></path>
-							<path d="M58160.0 4395.0 L58639.0 4395.0" fill="none" data-name="StudyUApiClient"></path>
+					<g data-name="TextParagraph">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TextParagraph">
+							<rect x="13934.0" y="2556.0" height="138.0" width="208.0" data-name="TextParagraph"></rect>
+							<path d="M13934.0 2587.0 L14142.0 2587.0" fill="none" data-name="TextParagraph"></path>
+							<path d="M13934.0 2663.0 L14142.0 2663.0" fill="none" data-name="TextParagraph"></path>
 						</g>
-						<g transform="translate(58160, 4288)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApiClient">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApiClient">StudyUApiClient</text>
+						<g transform="translate(13934, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextParagraph">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextParagraph">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextParagraph">TextParagraph</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58160, 4319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+supabaseClient: SupabaseClient</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyColumns: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+testDelayMilliseconds: int</text>
+						<g transform="translate(13934, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
+								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+text: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TextParagraph">+style: TextStyle?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TextParagraph">+selectable: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TextParagraph">+span: List&lt;TextSpan&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58160, 4395)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">+dynamic getUserStudies()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudy()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudyInvite()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudyInvite()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudyInvite()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchUser()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApiClient">+dynamic saveUser()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyUApiClient">-dynamic _awaitGuarded()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyUApiClient">-dynamic _apiException()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyUApiClient">-dynamic _testDelay()</text>
+						<g transform="translate(13934, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
+								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SupabaseClientDependant">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClientDependant">
-							<rect x="57953.0" y="4103.0" height="62.0" width="284.0" data-name="SupabaseClientDependant"></rect>
-							<path d="M57953.0 4134.0 L58237.0 4134.0" fill="none" data-name="SupabaseClientDependant"></path>
+					<g data-name="UnderConstruction">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UnderConstruction">
+							<rect x="36645.5" y="105.5" height="62.0" width="164.0" data-name="UnderConstruction"></rect>
+							<path d="M36645.5 136.5 L36809.5 136.5" fill="none" data-name="UnderConstruction"></path>
 						</g>
-						<g transform="translate(57953, 4103)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseClientDependant">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClientDependant">
-								<text x="134.0" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClientDependant">SupabaseClientDependant</text>
+						<g transform="translate(36645.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnderConstruction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnderConstruction">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="UnderConstruction">UnderConstruction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57953, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseClientDependant">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseClientDependant">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseClientDependant">+supabaseClient: SupabaseClient</text>
+						<g transform="translate(36645.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnderConstruction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnderConstruction">
+								<text x="0.0" y="13.5" stroke="none" data-name="UnderConstruction">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SupabaseQueryMixin">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryMixin">
-							<rect x="58292.0" y="4065.5" height="137.0" width="215.0" data-name="SupabaseQueryMixin"></rect>
-							<path d="M58292.0 4096.5 L58507.0 4096.5" fill="none" data-name="SupabaseQueryMixin"></path>
+					<g data-name="NullHelperDecoration">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NullHelperDecoration">
+							<rect x="36828.5" y="614.0" height="31.0" width="184.0" data-name="NullHelperDecoration"></rect>
 						</g>
-						<g transform="translate(58292, 4065.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseQueryMixin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryMixin">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryMixin">SupabaseQueryMixin</text>
+						<g transform="translate(36828.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NullHelperDecoration">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NullHelperDecoration">
+								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="NullHelperDecoration">NullHelperDecoration</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58292, 4096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryMixin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryMixin">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic deleteAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getById()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getByColumn()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseQueryMixin">+List&lt;T&gt; deserializeList()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SupabaseQueryMixin">+T deserializeObject()</text>
+					</g>
+					<g data-name="InputDecoration">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InputDecoration">
+							<rect x="36849.5" y="121.0" height="31.0" width="142.0" data-name="InputDecoration"></rect>
+						</g>
+						<g transform="translate(36849.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InputDecoration">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InputDecoration">
+								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="InputDecoration">InputDecoration</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IsFetched">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsFetched">
-							<rect x="6759.5" y="614.0" height="31.0" width="94.0" data-name="IsFetched"></rect>
+					<g data-name="ActionMenuType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuType">
+							<rect x="8839.0" y="3447.0" height="107.0" width="330.0" data-name="ActionMenuType"></rect>
+							<path d="M8839.0 3478.0 L9169.0 3478.0" fill="none" data-name="ActionMenuType"></path>
 						</g>
-						<g transform="translate(6759.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsFetched">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsFetched">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsFetched">IsFetched</text>
+						<g transform="translate(8839, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuType">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuType">ActionMenuType</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IsSaving">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaving">
-							<rect x="6893.5" y="614.0" height="31.0" width="84.0" data-name="IsSaving"></rect>
-						</g>
-						<g transform="translate(6893.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaving">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaving">
-								<text x="34.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaving">IsSaving</text>
+						<g transform="translate(8839, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuType">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+values: List&lt;ActionMenuType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+inline: ActionMenuType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+popup: ActionMenuType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IsSaved">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaved">
-							<rect x="7017.5" y="614.0" height="31.0" width="80.0" data-name="IsSaved"></rect>
+					<g data-name="HtmlStylingBanner">
+						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlStylingBanner">
+							<rect x="14182.0" y="2571.0" height="108.0" width="298.0" data-name="HtmlStylingBanner"></rect>
+							<path d="M14182.0 2602.0 L14480.0 2602.0" fill="none" data-name="HtmlStylingBanner"></path>
+							<path d="M14182.0 2648.0 L14480.0 2648.0" fill="none" data-name="HtmlStylingBanner"></path>
 						</g>
-						<g transform="translate(7017.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaved">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaved">
-								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaved">IsSaved</text>
+						<g transform="translate(14182, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlStylingBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlStylingBanner">
+								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlStylingBanner">HtmlStylingBanner</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IsDeleted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsDeleted">
-							<rect x="7137.5" y="614.0" height="31.0" width="91.0" data-name="IsDeleted"></rect>
+						<g transform="translate(14182, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
+								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+isDismissed: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="HtmlStylingBanner">+onDismissed: dynamic Function()?</text>
+								
+							</g>
 						</g>
-						<g transform="translate(7137.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsDeleted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsDeleted">
-								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="IsDeleted">IsDeleted</text>
+						<g transform="translate(14182, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
+								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SupabaseQueryError">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryError">
-							<rect x="10043.8" y="583.5" height="92.0" width="183.0" data-name="SupabaseQueryError"></rect>
-							<path d="M10043.8 614.5 L10226.8 614.5" fill="none" data-name="SupabaseQueryError"></path>
+					<g data-name="FormConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
+							<rect x="82075.0" y="105.5" height="62.0" width="192.0" data-name="FormConsumerWidget"></rect>
+							<path d="M82075.0 136.5 L82267.0 136.5" fill="none" data-name="FormConsumerWidget"></path>
 						</g>
-						<g transform="translate(10043.75, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseQueryError">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryError">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryError">SupabaseQueryError</text>
+						<g transform="translate(82075, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
+								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10043.75, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryError">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryError">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryError">+statusCode: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryError">+message: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryError">+details: dynamic</text>
+						<g transform="translate(82075, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerWidget">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepository">
-							<rect x="80915.5" y="3752.0" height="183.0" width="403.0" data-name="StudyRepository"></rect>
-							<path d="M80915.5 3783.0 L81318.5 3783.0" fill="none" data-name="StudyRepository"></path>
-							<path d="M80915.5 3859.0 L81318.5 3859.0" fill="none" data-name="StudyRepository"></path>
-						</g>
-						<g transform="translate(80915.5, 3752)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepository">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepository">StudyRepository</text>
-								
-							</g>
+					<g data-name="FormConsumerRefWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
+							<rect x="13485.5" y="1666.5" height="62.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
+							<path d="M13485.5 1697.5 L13704.5 1697.5" fill="none" data-name="FormConsumerRefWidget"></path>
 						</g>
-						<g transform="translate(80915.5, 3783)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+sortCallback: void Function()?</text>
+						<g transform="translate(13485.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
+								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80915.5, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+dynamic launch()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+						<g transform="translate(13485.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerRefWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerRefWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerRefWidget">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepositoryDelegate">
-							<rect x="81939.5" y="3744.5" height="198.0" width="282.0" data-name="StudyRepositoryDelegate"></rect>
-							<path d="M81939.5 3775.5 L82221.5 3775.5" fill="none" data-name="StudyRepositoryDelegate"></path>
-							<path d="M81939.5 3821.5 L82221.5 3821.5" fill="none" data-name="StudyRepositoryDelegate"></path>
-						</g>
-						<g transform="translate(81939.5, 3744.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepositoryDelegate">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepositoryDelegate">StudyRepositoryDelegate</text>
-								
-							</g>
+					<g data-name="SplashPage">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SplashPage">
+							<rect x="37316.5" y="105.5" height="62.0" width="136.0" data-name="SplashPage"></rect>
+							<path d="M37316.5 136.5 L37452.5 136.5" fill="none" data-name="SplashPage"></path>
 						</g>
-						<g transform="translate(81939.5, 3775.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+authRepository: IAuthRepository</text>
+						<g transform="translate(37316.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SplashPage">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SplashPage">SplashPage</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81939.5, 3821.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic onError()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createNewInstance()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createDuplicate()</text>
+						<g transform="translate(37316.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SplashPage">
+								<text x="0.0" y="13.5" stroke="none" data-name="SplashPage">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IUserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="67485.3" y="3439.0" height="123.0" width="260.0" data-name="IUserRepository"></rect>
-							<path d="M67485.3 3470.0 L67745.3 3470.0" fill="none" data-name="IUserRepository"></path>
-							<path d="M67485.3 3501.0 L67745.3 3501.0" fill="none" data-name="IUserRepository"></path>
+					<g data-name="ErrorPage">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ErrorPage">
+							<rect x="13283.5" y="1651.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
+							<path d="M13283.5 1682.0 L13445.5 1682.0" fill="none" data-name="ErrorPage"></path>
+							<path d="M13283.5 1713.0 L13445.5 1713.0" fill="none" data-name="ErrorPage"></path>
 						</g>
-						<g transform="translate(67485.25, 3439)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
+						<g transform="translate(13283.5, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ErrorPage">
+								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="ErrorPage">ErrorPage</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67485.25, 3470)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+user: StudyUUser</text>
+						<g transform="translate(13283.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
+								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+error: Exception?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67485.25, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+dynamic fetchUser()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IUserRepository">+dynamic saveUser()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IUserRepository">+dynamic updatePreferences()</text>
+						<g transform="translate(13283.5, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
+								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyUUser">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUUser">
-							<rect x="68335.0" y="4118.5" height="31.0" width="110.0" data-name="StudyUUser"></rect>
+					<g data-name="ConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
+							<rect x="29246.3" y="1197.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
 						</g>
-						<g transform="translate(68335, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUUser">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUUser">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUUser">StudyUUser</text>
+						<g transform="translate(29246.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="UserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UserRepository">
-							<rect x="67830.3" y="3759.5" height="168.0" width="282.0" data-name="UserRepository"></rect>
-							<path d="M67830.3 3790.5 L68112.3 3790.5" fill="none" data-name="UserRepository"></path>
-							<path d="M67830.3 3866.5 L68112.3 3866.5" fill="none" data-name="UserRepository"></path>
+					<g data-name="StudyULogo">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyULogo">
+							<rect x="16427.0" y="3797.0" height="93.0" width="214.0" data-name="StudyULogo"></rect>
+							<path d="M16427.0 3828.0 L16641.0 3828.0" fill="none" data-name="StudyULogo"></path>
+							<path d="M16427.0 3859.0 L16641.0 3859.0" fill="none" data-name="StudyULogo"></path>
 						</g>
-						<g transform="translate(67830.25, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserRepository">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserRepository">UserRepository</text>
+						<g transform="translate(16427, 3797)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyULogo">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyULogo">
+								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyULogo">StudyULogo</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67830.25, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+ref: Ref&lt;Object?&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="UserRepository">+user: StudyUUser</text>
+						<g transform="translate(16427, 3828)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+onTap: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67830.25, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+dynamic fetchUser()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+dynamic saveUser()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+dynamic updatePreferences()</text>
+						<g transform="translate(16427, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Ref">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Ref">
-							<rect x="68486.8" y="4118.5" height="31.0" width="43.0" data-name="Ref"></rect>
+					<g data-name="SingleColumnLayout">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayout">
+							<rect x="14520.0" y="2526.0" height="198.0" width="418.0" data-name="SingleColumnLayout"></rect>
+							<path d="M14520.0 2557.0 L14938.0 2557.0" fill="none" data-name="SingleColumnLayout"></path>
+							<path d="M14520.0 2693.0 L14938.0 2693.0" fill="none" data-name="SingleColumnLayout"></path>
 						</g>
-						<g transform="translate(68486.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Ref">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Ref">
-								<text x="13.5" y="13.5" stroke="none" text-anchor="middle" data-name="Ref">Ref</text>
+						<g transform="translate(14520, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayout">
+								<text x="201.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayout">SingleColumnLayout</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PreferenceAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreferenceAction">
-							<rect x="424.0" y="3447.0" height="107.0" width="334.0" data-name="PreferenceAction"></rect>
-							<path d="M424.0 3478.0 L758.0 3478.0" fill="none" data-name="PreferenceAction"></path>
-						</g>
-						<g transform="translate(424, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreferenceAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreferenceAction">
-								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="PreferenceAction">PreferenceAction</text>
+						<g transform="translate(14520, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraints: BoxConstraints</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraintsNarrow: BoxConstraints</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayout">+body: Widget</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayout">+header: Widget?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayout">+stickyHeader: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayout">+constraints: BoxConstraints?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="SingleColumnLayout">+scroll: bool</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="SingleColumnLayout">+padding: EdgeInsets?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(424, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreferenceAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreferenceAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreferenceAction">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+values: List&lt;PreferenceAction&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pin: PreferenceAction</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pinOff: PreferenceAction</text>
+						<g transform="translate(14520, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+dynamic fromType()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IAppRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppRepository">
-							<rect x="10959.3" y="3462.0" height="77.0" width="230.0" data-name="IAppRepository"></rect>
-							<path d="M10959.3 3493.0 L11189.3 3493.0" fill="none" data-name="IAppRepository"></path>
+					<g data-name="SingleColumnLayoutType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
+							<rect x="27032.3" y="3432.0" height="137.0" width="426.0" data-name="SingleColumnLayoutType"></rect>
+							<path d="M27032.3 3463.0 L27458.3 3463.0" fill="none" data-name="SingleColumnLayoutType"></path>
 						</g>
-						<g transform="translate(10959.25, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppRepository">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAppRepository">IAppRepository</text>
+						<g transform="translate(27032.25, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
+								<text x="205.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10959.25, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppRepository">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAppRepository">+void dispose()</text>
+						<g transform="translate(27032.25, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayoutType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayoutType">
+								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayoutType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedWide: SingleColumnLayoutType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedNarrow: SingleColumnLayoutType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+stretched: SingleColumnLayoutType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+split: SingleColumnLayoutType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppRepository">
-							<rect x="10959.3" y="3789.5" height="108.0" width="230.0" data-name="AppRepository"></rect>
-							<path d="M10959.3 3820.5 L11189.3 3820.5" fill="none" data-name="AppRepository"></path>
-							<path d="M10959.3 3851.5 L11189.3 3851.5" fill="none" data-name="AppRepository"></path>
-						</g>
-						<g transform="translate(10959.25, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppRepository">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppRepository">AppRepository</text>
-								
-							</g>
+					<g data-name="Hyperlink">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Hyperlink">
+							<rect x="15615.0" y="2519.0" height="212.0" width="222.0" data-name="Hyperlink"></rect>
+							<path d="M15615.0 2550.0 L15837.0 2550.0" fill="none" data-name="Hyperlink"></path>
 						</g>
-						<g transform="translate(10959.25, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+apiClient: StudyUApi</text>
+						<g transform="translate(15615, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Hyperlink">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Hyperlink">
+								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="Hyperlink">Hyperlink</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10959.25, 3851.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppRepository">+void dispose()</text>
+						<g transform="translate(15615, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Hyperlink">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Hyperlink">
+								<text x="0.0" y="13.5" stroke="none" data-name="Hyperlink">+text: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Hyperlink">+url: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Hyperlink">+onClick: void Function()?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Hyperlink">+linkColor: Color</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Hyperlink">+hoverColor: Color?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Hyperlink">+visitedColor: Color?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Hyperlink">+style: TextStyle?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Hyperlink">+hoverStyle: TextStyle?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="Hyperlink">+visitedStyle: TextStyle?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="Hyperlink">+icon: IconData?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="Hyperlink">+iconSize: double?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WebFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
-							<rect x="61111.0" y="82.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
-							<path d="M61111.0 113.5 L61280.0 113.5" fill="none" data-name="WebFrame"></path>
-							<path d="M61111.0 159.5 L61280.0 159.5" fill="none" data-name="WebFrame"></path>
+					<g data-name="StandardTableColumn">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableColumn">
+							<rect x="21586.0" y="2556.5" height="137.0" width="287.0" data-name="StandardTableColumn"></rect>
+							<path d="M21586.0 2587.5 L21873.0 2587.5" fill="none" data-name="StandardTableColumn"></path>
 						</g>
-						<g transform="translate(61111, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
+						<g transform="translate(21586, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableColumn">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableColumn">StandardTableColumn</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61111, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
+						<g transform="translate(21586, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableColumn">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableColumn">+label: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableColumn">+tooltip: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableColumn">+columnWidth: TableColumnWidth</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableColumn">+sortable: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StandardTableColumn">+sortAscending: bool?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StandardTableColumn">+sortableIcon: Widget?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61111, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
+					</g>
+					<g data-name="TableColumnWidth">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TableColumnWidth">
+							<rect x="24211.3" y="3485.0" height="31.0" width="165.0" data-name="TableColumnWidth"></rect>
+						</g>
+						<g transform="translate(24211.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TableColumnWidth">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableColumnWidth">
+								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableColumnWidth">TableColumnWidth</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DisabledFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
-							<rect x="61320.0" y="105.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
-							<path d="M61320.0 136.5 L61456.0 136.5" fill="none" data-name="DisabledFrame"></path>
+					<g data-name="StandardTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTable">
+							<rect x="19871.8" y="1501.5" height="392.0" width="688.0" data-name="StandardTable"></rect>
+							<path d="M19871.8 1532.5 L20559.8 1532.5" fill="none" data-name="StandardTable"></path>
 						</g>
-						<g transform="translate(61320, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
+						<g transform="translate(19871.75, 1501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTable">
+								<text x="336.0" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTable">StandardTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61320, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
+						<g transform="translate(19871.75, 1532.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardTable">+items: List&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StandardTable">+inputColumns: List&lt;StandardTableColumn&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StandardTable">+onSelectItem: void Function(T)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StandardTable">+trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StandardTable">+trailingActionsMenuType: ActionMenuType?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StandardTable">+sortColumnPredicates: List&lt;int Function(T, T)?&gt;?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StandardTable">+pinnedPredicates: int Function(T, T)?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StandardTable">+headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StandardTable">+dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StandardTable">+inputTrailingActionsColumn: StandardTableColumn</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StandardTable">+tableWrapper: Widget Function(Widget)?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StandardTable">+cellSpacing: double</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StandardTable">+rowSpacing: double</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StandardTable">+minRowHeight: double?</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StandardTable">+showTableHeader: bool</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StandardTable">+hideLeadingTrailingWhenEmpty: bool</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StandardTable">+leadingWidget: Widget?</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StandardTable">+trailingWidget: Widget?</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StandardTable">+leadingWidgetSpacing: double?</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="StandardTable">+trailingWidgetSpacing: double?</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="StandardTable">+emptyWidget: Widget?</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="StandardTable">+rowStyle: StandardTableStyle</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="StandardTable">+disableRowInteractions: bool</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="void Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
+							<rect x="25512.0" y="3485.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
+						</g>
+						<g transform="translate(25512, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
+								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PhoneContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
-							<rect x="11099.0" y="2518.5" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
-							<path d="M11099.0 2549.5 L11426.0 2549.5" fill="none" data-name="PhoneContainer"></path>
-							<path d="M11099.0 2700.5 L11426.0 2700.5" fill="none" data-name="PhoneContainer"></path>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
+							<rect x="18928.3" y="2609.5" height="31.0" width="381.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?"></rect>
 						</g>
-						<g transform="translate(11099, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
-								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
+						<g transform="translate(18928.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
+								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11099, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
-								
-							</g>
+					</g>
+					<g data-name="int Function(T, T)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(T, T)?">
+							<rect x="19389.3" y="2609.5" height="31.0" width="160.0" data-name="int Function(T, T)?"></rect>
 						</g>
-						<g transform="translate(11099, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
+						<g transform="translate(19389.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(T, T)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(T, T)?">
+								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(T, T)?">int Function(T, T)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="39892.3" y="3485.0" height="31.0" width="71.0" data-name="Widget"></rect>
+					<g data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+							<rect x="19589.3" y="2609.5" height="31.0" width="523.0" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?"></rect>
 						</g>
-						<g transform="translate(39892.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
+						<g transform="translate(19589.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+								<text x="253.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MobileFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
-							<rect x="61496.0" y="105.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
-							<path d="M61496.0 136.5 L61632.0 136.5" fill="none" data-name="MobileFrame"></path>
+					<g data-name="StandardTableStyle">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableStyle">
+							<rect x="9715.0" y="3447.0" height="107.0" width="353.0" data-name="StandardTableStyle"></rect>
+							<path d="M9715.0 3478.0 L10068.0 3478.0" fill="none" data-name="StandardTableStyle"></path>
 						</g>
-						<g transform="translate(61496, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
+						<g transform="translate(9715, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableStyle">
+								<text x="168.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableStyle">StandardTableStyle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61496, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
+						<g transform="translate(9715, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableStyle">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableStyle">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+values: List&lt;StandardTableStyle&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+plain: StandardTableStyle</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+material: StandardTableStyle</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DesktopFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
-							<rect x="61672.0" y="105.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
-							<path d="M61672.0 136.5 L61808.0 136.5" fill="none" data-name="DesktopFrame"></path>
+					<g data-name="IconPack">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPack">
+							<rect x="37492.5" y="82.5" height="108.0" width="359.0" data-name="IconPack"></rect>
+							<path d="M37492.5 113.5 L37851.5 113.5" fill="none" data-name="IconPack"></path>
+							<path d="M37492.5 159.5 L37851.5 159.5" fill="none" data-name="IconPack"></path>
 						</g>
-						<g transform="translate(61672, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
+						<g transform="translate(37492.5, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPack">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPack">
+								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPack">IconPack</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61672, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
+						<g transform="translate(37492.5, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+defaultPack: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPack">&lt;static&gt;+material: List&lt;IconOption&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(37492.5, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+IconOption? resolveIconByName()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
-							<rect x="10195.0" y="2511.0" height="228.0" width="573.0" data-name="StudyController"></rect>
-							<path d="M10195.0 2542.0 L10768.0 2542.0" fill="none" data-name="StudyController"></path>
-							<path d="M10195.0 2603.0 L10768.0 2603.0" fill="none" data-name="StudyController"></path>
+					<g data-name="IconOption">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconOption">
+							<rect x="23053.0" y="2548.5" height="153.0" width="264.0" data-name="IconOption"></rect>
+							<path d="M23053.0 2579.5 L23317.0 2579.5" fill="none" data-name="IconOption"></path>
+							<path d="M23053.0 2655.5 L23317.0 2655.5" fill="none" data-name="IconOption"></path>
 						</g>
-						<g transform="translate(10195, 2511)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
-								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
+						<g transform="translate(23053, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconOption">
+								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="IconOption">IconOption</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10195, 2542)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+						<g transform="translate(23053, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+name: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconOption">+isEmpty: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IconOption">+props: List&lt;Object?&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10195, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
+						<g transform="translate(23053, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+String toJson()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">&lt;static&gt;+IconOption fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="INotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="40720.8" y="3447.0" height="107.0" width="395.0" data-name="INotificationService"></rect>
-							<path d="M40720.8 3478.0 L41115.8 3478.0" fill="none" data-name="INotificationService"></path>
+					<g data-name="Equatable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
+							<rect x="22666.5" y="1682.0" height="31.0" width="96.0" data-name="Equatable"></rect>
 						</g>
-						<g transform="translate(40720.75, 3447)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
-								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
+						<g transform="translate(22666.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
+								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40720.75, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="INotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="INotificationService">+void showMessage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="INotificationService">+void show()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="INotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="INotificationService">+void dispose()</text>
+					</g>
+					<g data-name="ReactiveIconPicker">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveIconPicker">
+							<rect x="37070.0" y="614.0" height="31.0" width="168.0" data-name="ReactiveIconPicker"></rect>
+						</g>
+						<g transform="translate(37070, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveIconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveIconPicker">
+								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveIconPicker">ReactiveIconPicker</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="59150.0" y="3485.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+					<g data-name="ReactiveFocusableFormField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFocusableFormField">
+							<rect x="37031.5" y="121.0" height="31.0" width="245.0" data-name="ReactiveFocusableFormField"></rect>
 						</g>
-						<g transform="translate(59150, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
+						<g transform="translate(37031.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFocusableFormField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFocusableFormField">
+								<text x="114.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFocusableFormField">ReactiveFocusableFormField</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyBaseController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="58157.5" y="538.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
-							<path d="M58157.5 569.0 L58703.5 569.0" fill="none" data-name="StudyBaseController"></path>
-							<path d="M58157.5 645.0 L58703.5 645.0" fill="none" data-name="StudyBaseController"></path>
+					<g data-name="IconPicker">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPicker">
+							<rect x="23138.0" y="1606.0" height="183.0" width="319.0" data-name="IconPicker"></rect>
+							<path d="M23138.0 1637.0 L23457.0 1637.0" fill="none" data-name="IconPicker"></path>
+							<path d="M23138.0 1758.0 L23457.0 1758.0" fill="none" data-name="IconPicker"></path>
 						</g>
-						<g transform="translate(58157.5, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
-								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
+						<g transform="translate(23138, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPicker">
+								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPicker">IconPicker</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58157.5, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
+						<g transform="translate(23138, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+iconOptions: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPicker">+selectedOption: IconOption?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconPicker">+onSelect: void Function(IconOption)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IconPicker">+galleryIconSize: double?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IconPicker">+selectedIconSize: double?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IconPicker">+focusNode: FocusNode?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="IconPicker">+isDisabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58157.5, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
+						<g transform="translate(23138, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyAppBarViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
-							<rect x="6311.3" y="3454.5" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
-							<path d="M6311.3 3485.5 L6554.3 3485.5" fill="none" data-name="IStudyAppBarViewModel"></path>
+					<g data-name="void Function(IconOption)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(IconOption)?">
+							<rect x="23605.5" y="2609.5" height="31.0" width="230.0" data-name="void Function(IconOption)?"></rect>
 						</g>
-						<g transform="translate(6311.25, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
+						<g transform="translate(23605.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(IconOption)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(IconOption)?">
+								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(IconOption)?">void Function(IconOption)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6311.25, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
+					</g>
+					<g data-name="FocusNode">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FocusNode">
+							<rect x="23404.0" y="2609.5" height="31.0" width="106.0" data-name="FocusNode"></rect>
+						</g>
+						<g transform="translate(23404, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FocusNode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FocusNode">
+								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="FocusNode">FocusNode</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyStatusBadgeViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
-							<rect x="11819.0" y="2586.5" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
-							<path d="M11819.0 2617.5 L12104.0 2617.5" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
+					<g data-name="IconPickerField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerField">
+							<rect x="23497.0" y="1606.0" height="183.0" width="319.0" data-name="IconPickerField"></rect>
+							<path d="M23497.0 1637.0 L23816.0 1637.0" fill="none" data-name="IconPickerField"></path>
+							<path d="M23497.0 1758.0 L23816.0 1758.0" fill="none" data-name="IconPickerField"></path>
 						</g>
-						<g transform="translate(11819, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
+						<g transform="translate(23497, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerField">
+								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerField">IconPickerField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11819, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
+						<g transform="translate(23497, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+iconOptions: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerField">+selectedOption: IconOption?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerField">+selectedIconSize: double?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IconPickerField">+galleryIconSize: double?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IconPickerField">+onSelect: void Function(IconOption)?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IconPickerField">+focusNode: FocusNode?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="IconPickerField">+isDisabled: bool</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IStudyNavViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
-							<rect x="12144.0" y="2556.5" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
-							<path d="M12144.0 2587.5 L12385.0 2587.5" fill="none" data-name="IStudyNavViewModel"></path>
-						</g>
-						<g transform="translate(12144, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
+						<g transform="translate(23497, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12144, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
+					</g>
+					<g data-name="IconPickerGallery">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerGallery">
+							<rect x="23856.0" y="1636.0" height="123.0" width="319.0" data-name="IconPickerGallery"></rect>
+							<path d="M23856.0 1667.0 L24175.0 1667.0" fill="none" data-name="IconPickerGallery"></path>
+							<path d="M23856.0 1728.0 L24175.0 1728.0" fill="none" data-name="IconPickerGallery"></path>
+						</g>
+						<g transform="translate(23856, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerGallery">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerGallery">
+								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerGallery">IconPickerGallery</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
-							<rect x="12508.3" y="1091.5" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
-							<path d="M12508.3 1122.5 L12843.3 1122.5" fill="none" data-name="StudyScaffold"></path>
-						</g>
-						<g transform="translate(12508.25, 1091.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
-								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
+						<g transform="translate(23856, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+iconOptions: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerGallery">+onSelect: void Function(IconOption)?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerGallery">+iconSize: double</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12508.25, 1122.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
+						<g transform="translate(23856, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NavbarTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="12334.8" y="1644.0" height="107.0" width="196.0" data-name="NavbarTab"></rect>
-							<path d="M12334.8 1675.0 L12530.8 1675.0" fill="none" data-name="NavbarTab"></path>
+					<g data-name="SecondaryButton">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SecondaryButton">
+							<rect x="20152.3" y="2556.0" height="138.0" width="249.0" data-name="SecondaryButton"></rect>
+							<path d="M20152.3 2587.0 L20401.3 2587.0" fill="none" data-name="SecondaryButton"></path>
+							<path d="M20152.3 2663.0 L20401.3 2663.0" fill="none" data-name="SecondaryButton"></path>
 						</g>
-						<g transform="translate(12334.75, 1644)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
+						<g transform="translate(20152.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecondaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecondaryButton">
+								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecondaryButton">SecondaryButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12334.75, 1675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NavbarTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="NavbarTab">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NavbarTab">+intent: RoutingIntent?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NavbarTab">+index: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NavbarTab">+enabled: bool</text>
+						<g transform="translate(20152.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+text: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SecondaryButton">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SecondaryButton">+isLoading: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SecondaryButton">+onPressed: void Function()?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(20152.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="21406.8" y="1651.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
-							<path d="M21406.8 1682.0 L21570.8 1682.0" fill="none" data-name="StudyPageWidget"></path>
-							<path d="M21406.8 1713.0 L21570.8 1713.0" fill="none" data-name="StudyPageWidget"></path>
+					<g data-name="TwoColumnLayout">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TwoColumnLayout">
+							<rect x="20637.5" y="2466.5" height="317.0" width="368.0" data-name="TwoColumnLayout"></rect>
+							<path d="M20637.5 2497.5 L21005.5 2497.5" fill="none" data-name="TwoColumnLayout"></path>
 						</g>
-						<g transform="translate(21406.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
+						<g transform="translate(20637.5, 2466.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TwoColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TwoColumnLayout">
+								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="TwoColumnLayout">TwoColumnLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21406.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
+						<g transform="translate(20637.5, 2497.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TwoColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TwoColumnLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultDivider: VerticalDivider</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultContentPadding: EdgeInsets</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+slimContentPadding: EdgeInsets</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TwoColumnLayout">+leftWidget: Widget</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TwoColumnLayout">+rightWidget: Widget</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TwoColumnLayout">+dividerWidget: Widget?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="TwoColumnLayout">+headerWidget: Widget?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="TwoColumnLayout">+flexLeft: int?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="TwoColumnLayout">+flexRight: int?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="TwoColumnLayout">+constraintsLeft: BoxConstraints?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="TwoColumnLayout">+constraintsRight: BoxConstraints?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="TwoColumnLayout">+scrollLeft: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="TwoColumnLayout">+scrollRight: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="TwoColumnLayout">+paddingLeft: EdgeInsets?</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="TwoColumnLayout">+paddingRight: EdgeInsets?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorLeft: Color?</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorRight: Color?</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="TwoColumnLayout">+stretchHeight: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21406.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
+					</g>
+					<g data-name="VerticalDivider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="VerticalDivider">
+							<rect x="20438.5" y="3485.0" height="31.0" width="130.0" data-name="VerticalDivider"></rect>
+						</g>
+						<g transform="translate(20438.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VerticalDivider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VerticalDivider">
+								<text x="57.0" y="13.5" stroke="none" text-anchor="middle" data-name="VerticalDivider">VerticalDivider</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SingleColumnLayoutType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="5795.3" y="3432.0" height="137.0" width="426.0" data-name="SingleColumnLayoutType"></rect>
-							<path d="M5795.3 3463.0 L6221.3 3463.0" fill="none" data-name="SingleColumnLayoutType"></path>
+					<g data-name="AppTranslation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppTranslation">
+							<rect x="38170.5" y="105.5" height="62.0" width="194.0" data-name="AppTranslation"></rect>
+							<path d="M38170.5 136.5 L38364.5 136.5" fill="none" data-name="AppTranslation"></path>
 						</g>
-						<g transform="translate(5795.25, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
-								<text x="205.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
+						<g transform="translate(38170.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppTranslation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppTranslation">
+								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppTranslation">AppTranslation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5795.25, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayoutType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayoutType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedWide: SingleColumnLayoutType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedNarrow: SingleColumnLayoutType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+stretched: SingleColumnLayoutType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+split: SingleColumnLayoutType</text>
+						<g transform="translate(38170.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppTranslation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppTranslation">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppTranslation">&lt;static&gt;+dynamic init()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PreviewFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
-							<rect x="14853.3" y="1166.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
-							<path d="M14853.3 1197.5 L15144.3 1197.5" fill="none" data-name="PreviewFrame"></path>
+					<g data-name="PlatformLocale">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocale">
+							<rect x="37891.5" y="105.5" height="62.0" width="239.0" data-name="PlatformLocale"></rect>
+							<path d="M37891.5 136.5 L38130.5 136.5" fill="none" data-name="PlatformLocale"></path>
 						</g>
-						<g transform="translate(14853.25, 1166.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
+						<g transform="translate(37891.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformLocale">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocale">
+								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocale">PlatformLocale</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14853.25, 1197.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
+						<g transform="translate(37891.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocale">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocale">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocale">+Locale getPlatformLocale()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RouteInformation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
-							<rect x="6594.3" y="3431.5" height="138.0" width="152.0" data-name="RouteInformation"></rect>
-							<path d="M6594.3 3462.5 L6746.3 3462.5" fill="none" data-name="RouteInformation"></path>
-							<path d="M6594.3 3538.5 L6746.3 3538.5" fill="none" data-name="RouteInformation"></path>
-						</g>
-						<g transform="translate(6594.25, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
-								
-							</g>
+					<g data-name="PlatformLocaleWeb">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleWeb">
+							<rect x="37584.8" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleWeb"></rect>
+							<path d="M37584.8 629.5 L37823.8 629.5" fill="none" data-name="PlatformLocaleWeb"></path>
 						</g>
-						<g transform="translate(6594.25, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
+						<g transform="translate(37584.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleWeb">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleWeb">
+								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleWeb">PlatformLocaleWeb</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6594.25, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
+						<g transform="translate(37584.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleWeb">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleWeb">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleWeb">+Locale getPlatformLocale()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
-							<rect x="12425.0" y="2496.0" height="258.0" width="302.0" data-name="PlatformController"></rect>
-							<path d="M12425.0 2527.0 L12727.0 2527.0" fill="none" data-name="PlatformController"></path>
-							<path d="M12425.0 2618.0 L12727.0 2618.0" fill="none" data-name="PlatformController"></path>
+					<g data-name="PlatformLocaleMobile">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleMobile">
+							<rect x="38063.8" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleMobile"></rect>
+							<path d="M38063.8 629.5 L38302.8 629.5" fill="none" data-name="PlatformLocaleMobile"></path>
 						</g>
-						<g transform="translate(12425, 2496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
-								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
+						<g transform="translate(38063.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleMobile">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleMobile">
+								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleMobile">PlatformLocaleMobile</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12425, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
+						<g transform="translate(38063.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleMobile">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleMobile">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleMobile">+Locale getPlatformLocale()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12425, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
+					</g>
+					<g data-name="LanguagePicker">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePicker">
+							<rect x="21180.0" y="2579.0" height="92.0" width="366.0" data-name="LanguagePicker"></rect>
+							<path d="M21180.0 2610.0 L21546.0 2610.0" fill="none" data-name="LanguagePicker"></path>
+						</g>
+						<g transform="translate(21180, 2579)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePicker">
+								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePicker">LanguagePicker</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="WebController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
-							<rect x="6786.3" y="3401.5" height="198.0" width="273.0" data-name="WebController"></rect>
-							<path d="M6786.3 3432.5 L7059.3 3432.5" fill="none" data-name="WebController"></path>
-							<path d="M6786.3 3463.5 L7059.3 3463.5" fill="none" data-name="WebController"></path>
-						</g>
-						<g transform="translate(6786.25, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
-								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
+						<g transform="translate(21180, 2610)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePicker">
+								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePicker">+languagePickerType: LanguagePickerType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePicker">+iconColor: Color?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePicker">+offset: Offset?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6786.25, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
+					</g>
+					<g data-name="LanguagePickerType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePickerType">
+							<rect x="9259.0" y="3447.0" height="107.0" width="366.0" data-name="LanguagePickerType"></rect>
+							<path d="M9259.0 3478.0 L9625.0 3478.0" fill="none" data-name="LanguagePickerType"></path>
+						</g>
+						<g transform="translate(9259, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePickerType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePickerType">
+								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePickerType">LanguagePickerType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6786.25, 3463.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
+						<g transform="translate(9259, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePickerType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePickerType">
+								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePickerType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+values: List&lt;LanguagePickerType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+field: LanguagePickerType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+icon: LanguagePickerType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFrameElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
-							<rect x="6855.3" y="3828.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
+					<g data-name="Offset">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Offset">
+							<rect x="24108.3" y="3485.0" height="31.0" width="63.0" data-name="Offset"></rect>
 						</g>
-						<g transform="translate(6855.25, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
+						<g transform="translate(24108.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Offset">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Offset">
+								<text x="23.5" y="13.5" stroke="none" text-anchor="middle" data-name="Offset">Offset</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MobileController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
-							<rect x="7099.3" y="3417.0" height="167.0" width="191.0" data-name="MobileController"></rect>
-							<path d="M7099.3 3448.0 L7290.3 3448.0" fill="none" data-name="MobileController"></path>
+					<g data-name="GoRouteParamEnum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouteParamEnum">
+							<rect x="38756.5" y="98.0" height="77.0" width="202.0" data-name="GoRouteParamEnum"></rect>
+							<path d="M38756.5 129.0 L38958.5 129.0" fill="none" data-name="GoRouteParamEnum"></path>
 						</g>
-						<g transform="translate(7099.25, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
+						<g transform="translate(38756.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GoRouteParamEnum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouteParamEnum">
+								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouteParamEnum">GoRouteParamEnum</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7099.25, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
+						<g transform="translate(38756.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouteParamEnum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouteParamEnum">
+								<text x="0.0" y="13.5" stroke="none" data-name="GoRouteParamEnum">+String toRouteParam()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="GoRouteParamEnum">+String toShortString()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyParticipationBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
-							<rect x="12767.0" y="2556.0" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
-							<path d="M12767.0 2587.0 L12998.0 2587.0" fill="none" data-name="StudyParticipationBadge"></path>
-							<path d="M12767.0 2663.0 L12998.0 2663.0" fill="none" data-name="StudyParticipationBadge"></path>
-						</g>
-						<g transform="translate(12767, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
-								
-							</g>
+					<g data-name="RoutingIntents">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntents">
+							<rect x="24765.8" y="1479.0" height="437.0" width="572.0" data-name="RoutingIntents"></rect>
+							<path d="M24765.8 1510.0 L25337.8 1510.0" fill="none" data-name="RoutingIntents"></path>
 						</g>
-						<g transform="translate(12767, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
+						<g transform="translate(24765.75, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntents">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntents">
+								<text x="278.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntents">RoutingIntents</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12767, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
+						<g transform="translate(24765.75, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntents">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntents">
+								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+root: RoutingIntent</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studies: RoutingIntent</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studiesShared: RoutingIntent</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+publicRegistry: RoutingIntent</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+study: RoutingIntent Function(String)</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEdit: RoutingIntent Function(String)</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInfo: RoutingIntent Function(String)</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String)</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInterventions: RoutingIntent Function(String)</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String)</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String)</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditReports: RoutingIntent Function(String)</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String)</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute})</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyRecruit: RoutingIntent Function(String)</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyMonitor: RoutingIntent Function(String)</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyAnalyze: RoutingIntent Function(String)</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studySettings: RoutingIntent Function(String)</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+accountSettings: RoutingIntent</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyNew: RoutingIntent</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+login: RoutingIntent</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+signup: RoutingIntent</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot: RoutingIntent</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot2: RoutingIntent Function(String)</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordRecovery: RoutingIntent</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+error: RoutingIntent Function(Exception)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="13173.0" y="3485.0" height="31.0" width="114.0" data-name="Participation"></rect>
+					<g data-name="RoutingIntent Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String)">
+							<rect x="24191.8" y="2609.5" height="31.0" width="253.0" data-name="RoutingIntent Function(String)"></rect>
 						</g>
-						<g transform="translate(13173, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
+						<g transform="translate(24191.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String)">
+								<text x="118.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String)">RoutingIntent Function(String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="24215.0" y="3432.0" height="137.0" width="288.0" data-name="BadgeType"></rect>
-							<path d="M24215.0 3463.0 L24503.0 3463.0" fill="none" data-name="BadgeType"></path>
-						</g>
-						<g transform="translate(24215, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
-								
-							</g>
+					<g data-name="RoutingIntent Function(String, String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, String)">
+							<rect x="24880.8" y="2609.5" height="31.0" width="309.0" data-name="RoutingIntent Function(String, String)"></rect>
 						</g>
-						<g transform="translate(24215, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BadgeType">
-								<text x="0.0" y="13.5" stroke="none" data-name="BadgeType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BadgeType">&lt;static&gt;+values: List&lt;BadgeType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BadgeType">&lt;static&gt;+filled: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlined: BadgeType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlineFill: BadgeType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BadgeType">&lt;static&gt;+plain: BadgeType</text>
+						<g transform="translate(24880.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, String)">
+								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, String)">RoutingIntent Function(String, String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTestScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
-							<rect x="18659.3" y="2548.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
-							<path d="M18659.3 2579.5 L18859.3 2579.5" fill="none" data-name="StudyTestScreen"></path>
-							<path d="M18659.3 2610.5 L18859.3 2610.5" fill="none" data-name="StudyTestScreen"></path>
+					<g data-name="RoutingIntent Function(String, {String? appRoute})">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, {String? appRoute})">
+							<rect x="25229.8" y="2609.5" height="31.0" width="413.0" data-name="RoutingIntent Function(String, {String? appRoute})"></rect>
 						</g>
-						<g transform="translate(18659.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
-								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
+						<g transform="translate(25229.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, {String? appRoute})">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, {String? appRoute})">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, {String? appRoute})">RoutingIntent Function(String, {String? appRoute})</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18659.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
+					</g>
+					<g data-name="RoutingIntent Function(Exception)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(Exception)">
+							<rect x="25682.8" y="2609.5" height="31.0" width="285.0" data-name="RoutingIntent Function(Exception)"></rect>
+						</g>
+						<g transform="translate(25682.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(Exception)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(Exception)">
+								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(Exception)">RoutingIntent Function(Exception)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18659.25, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
+					</g>
+					<g data-name="GoRoute">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRoute">
+							<rect x="44440.8" y="3485.0" height="31.0" width="86.0" data-name="GoRoute"></rect>
+						</g>
+						<g transform="translate(44440.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRoute">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRoute">
+								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRoute">GoRoute</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TestAppRoutes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
-							<rect x="61848.0" y="68.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
-							<path d="M61848.0 99.0 L62108.0 99.0" fill="none" data-name="TestAppRoutes"></path>
+					<g data-name="RoutingIntentDispatch">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntentDispatch">
+							<rect x="14171.5" y="3447.0" height="107.0" width="373.0" data-name="RoutingIntentDispatch"></rect>
+							<path d="M14171.5 3478.0 L14544.5 3478.0" fill="none" data-name="RoutingIntentDispatch"></path>
 						</g>
-						<g transform="translate(61848, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
+						<g transform="translate(14171.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntentDispatch">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntentDispatch">
+								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntentDispatch">RoutingIntentDispatch</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61848, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
-								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
+						<g transform="translate(14171.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntentDispatch">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntentDispatch">
+								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntentDispatch">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+go: RoutingIntentDispatch</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+push: RoutingIntentDispatch</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
-							<rect x="62148.0" y="68.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
-							<path d="M62148.0 99.0 L62381.0 99.0" fill="none" data-name="StudyNav"></path>
+					<g data-name="RouterKeys">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouterKeys">
+							<rect x="38404.5" y="98.0" height="77.0" width="312.0" data-name="RouterKeys"></rect>
+							<path d="M38404.5 129.0 L38716.5 129.0" fill="none" data-name="RouterKeys"></path>
 						</g>
-						<g transform="translate(62148, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
+						<g transform="translate(38404.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterKeys">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterKeys">
+								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterKeys">RouterKeys</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62148, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
+						<g transform="translate(38404.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterKeys">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterKeys">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+studyKey: ValueKey&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+authKey: ValueKey&lt;String&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
-							<rect x="62421.0" y="68.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
-							<path d="M62421.0 99.0 L62709.0 99.0" fill="none" data-name="StudyDesignNav"></path>
-						</g>
-						<g transform="translate(62421, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
-								
-							</g>
+					<g data-name="ValueKey">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ValueKey">
+							<rect x="38515.0" y="614.0" height="31.0" width="91.0" data-name="ValueKey"></rect>
 						</g>
-						<g transform="translate(62421, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
+						<g transform="translate(38515, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueKey">
+								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueKey">ValueKey</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTestController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
-							<rect x="56786.3" y="3805.0" height="77.0" width="282.0" data-name="StudyTestController"></rect>
-							<path d="M56786.3 3836.0 L57068.3 3836.0" fill="none" data-name="StudyTestController"></path>
+					<g data-name="RouteParams">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouteParams">
+							<rect x="39171.5" y="75.5" height="122.0" width="267.0" data-name="RouteParams"></rect>
+							<path d="M39171.5 106.5 L39438.5 106.5" fill="none" data-name="RouteParams"></path>
 						</g>
-						<g transform="translate(56786.25, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
+						<g transform="translate(39171.5, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteParams">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteParams">
+								<text x="125.5" y="13.5" stroke="none" text-anchor="middle" data-name="RouteParams">RouteParams</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56786.25, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
+						<g transform="translate(39171.5, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteParams">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteParams">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studiesFilter: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RouteParams">&lt;static&gt;+measurementId: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RouteParams">&lt;static&gt;+interventionId: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="RouteParams">&lt;static&gt;+testAppRoute: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
-							<rect x="7330.3" y="3485.0" height="31.0" width="111.0" data-name="StudyStatus"></rect>
+					<g data-name="RouterConf">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouterConf">
+							<rect x="22033.0" y="2556.0" height="138.0" width="326.0" data-name="RouterConf"></rect>
+							<path d="M22033.0 2587.0 L22359.0 2587.0" fill="none" data-name="RouterConf"></path>
+							<path d="M22033.0 2663.0 L22359.0 2663.0" fill="none" data-name="RouterConf"></path>
 						</g>
-						<g transform="translate(7330.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
-								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
+						<g transform="translate(22033, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterConf">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterConf">
+								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterConf">RouterConf</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyStatusBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
-							<rect x="13408.0" y="2548.5" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
-							<path d="M13408.0 2579.5 L13649.0 2579.5" fill="none" data-name="StudyStatusBadge"></path>
-							<path d="M13408.0 2670.5 L13649.0 2670.5" fill="none" data-name="StudyStatusBadge"></path>
-						</g>
-						<g transform="translate(13408, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
+						<g transform="translate(22033, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+router: GoRouter</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouterConf">&lt;static&gt;+routes: List&lt;GoRoute&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RouterConf">&lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RouterConf">&lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13408, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
+						<g transform="translate(22033, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+GoRoute route()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13408, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
+					</g>
+					<g data-name="GoRouter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
+							<rect x="64028.3" y="3485.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
+						</g>
+						<g transform="translate(64028.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
+								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FrameControlsWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
-							<rect x="15046.3" y="3782.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
-							<path d="M15046.3 3813.0 L15337.3 3813.0" fill="none" data-name="FrameControlsWidget"></path>
-							<path d="M15046.3 3874.0 L15337.3 3874.0" fill="none" data-name="FrameControlsWidget"></path>
+					<g data-name="StudyFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
+							<rect x="61589.3" y="1666.5" height="62.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
+							<path d="M61589.3 1697.5 L61773.3 1697.5" fill="none" data-name="StudyFormRouteArgs"></path>
 						</g>
-						<g transform="translate(15046.25, 3782)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
+						<g transform="translate(61589.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
+								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15046.25, 3813)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
+						<g transform="translate(61589.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormRouteArgs">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15046.25, 3874)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
+					</g>
+					<g data-name="QuestionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormRouteArgs">
+							<rect x="59486.5" y="2594.0" height="62.0" width="210.0" data-name="QuestionFormRouteArgs"></rect>
+							<path d="M59486.5 2625.0 L59696.5 2625.0" fill="none" data-name="QuestionFormRouteArgs"></path>
+						</g>
+						<g transform="translate(59486.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormRouteArgs">
+								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormRouteArgs">QuestionFormRouteArgs</text>
+								
+							</g>
+						</g>
+						<g transform="translate(59486.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormRouteArgs">+questionId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="22978.3" y="1197.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+					<g data-name="ScreenerQuestionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormRouteArgs">
+							<rect x="58207.8" y="3485.0" height="31.0" width="282.0" data-name="ScreenerQuestionFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(22978.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
+						<g transform="translate(58207.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormRouteArgs">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormRouteArgs">ScreenerQuestionFormRouteArgs</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudySettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="20305.8" y="2594.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M20305.8 2625.0 L20480.8 2625.0" fill="none" data-name="StudySettingsDialog"></path>
+					<g data-name="ConsentItemFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormRouteArgs">
+							<rect x="60437.3" y="2594.0" height="62.0" width="239.0" data-name="ConsentItemFormRouteArgs"></rect>
+							<path d="M60437.3 2625.0 L60676.3 2625.0" fill="none" data-name="ConsentItemFormRouteArgs"></path>
 						</g>
-						<g transform="translate(20305.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
-								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
+						<g transform="translate(60437.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormRouteArgs">
+								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormRouteArgs">ConsentItemFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20305.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
+						<g transform="translate(60437.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormRouteArgs">+consentId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudySettingsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="66593.5" y="2496.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M66593.5 2527.0 L67072.5 2527.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M66593.5 2663.0 L67072.5 2663.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-						</g>
-						<g transform="translate(66593.5, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
-								
-							</g>
+					<g data-name="MeasurementFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
+							<rect x="45441.0" y="2594.0" height="62.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
+							<path d="M45441.0 2625.0 L45688.0 2625.0" fill="none" data-name="MeasurementFormRouteArgs"></path>
 						</g>
-						<g transform="translate(66593.5, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(45441, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
+								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(66593.5, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
+						<g transform="translate(45441, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementFormRouteArgs">+measurementId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="54242.8" y="3485.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+					<g data-name="SurveyQuestionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormRouteArgs">
+							<rect x="50428.5" y="3469.5" height="62.0" width="265.0" data-name="SurveyQuestionFormRouteArgs"></rect>
+							<path d="M50428.5 3500.5 L50693.5 3500.5" fill="none" data-name="SurveyQuestionFormRouteArgs"></path>
 						</g>
-						<g transform="translate(54242.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+						<g transform="translate(50428.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormRouteArgs">
+								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormRouteArgs">SurveyQuestionFormRouteArgs</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="58691.5" y="3485.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(58691.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+						<g transform="translate(50428.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormRouteArgs">+questionId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="71348.0" y="313.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
-							<path d="M71348.0 344.0 L72220.0 344.0" fill="none" data-name="FormViewModel"></path>
-							<path d="M71348.0 660.0 L72220.0 660.0" fill="none" data-name="FormViewModel"></path>
+					<g data-name="InterventionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
+							<rect x="44746.5" y="2594.0" height="62.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
+							<path d="M44746.5 2625.0 L44979.5 2625.0" fill="none" data-name="InterventionFormRouteArgs"></path>
 						</g>
-						<g transform="translate(71348, 313)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+						<g transform="translate(44746.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(71348, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+						<g transform="translate(44746.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormRouteArgs">+interventionId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(71348, 660)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
+					</g>
+					<g data-name="InterventionTaskFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormRouteArgs">
+							<rect x="44727.5" y="3469.5" height="62.0" width="271.0" data-name="InterventionTaskFormRouteArgs"></rect>
+							<path d="M44727.5 3500.5 L44998.5 3500.5" fill="none" data-name="InterventionTaskFormRouteArgs"></path>
+						</g>
+						<g transform="translate(44727.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormRouteArgs">
+								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormRouteArgs">InterventionTaskFormRouteArgs</text>
+								
+							</g>
+						</g>
+						<g transform="translate(44727.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormRouteArgs">+taskId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IWithBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="29261.3" y="1181.5" height="62.0" width="164.0" data-name="IWithBanner"></rect>
-							<path d="M29261.3 1212.5 L29425.3 1212.5" fill="none" data-name="IWithBanner"></path>
+					<g data-name="ReportItemFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormRouteArgs">
+							<rect x="61743.3" y="2594.0" height="62.0" width="226.0" data-name="ReportItemFormRouteArgs"></rect>
+							<path d="M61743.3 2625.0 L61969.3 2625.0" fill="none" data-name="ReportItemFormRouteArgs"></path>
 						</g>
-						<g transform="translate(29261.25, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
+						<g transform="translate(61743.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormRouteArgs">
+								<text x="105.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormRouteArgs">ReportItemFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29261.25, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IWithBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="IWithBanner">+Widget? banner()</text>
+						<g transform="translate(61743.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormRouteArgs">+sectionId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
-							<rect x="848.0" y="3447.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
-							<path d="M848.0 3478.0 L1127.0 3478.0" fill="none" data-name="AppStatus"></path>
+					<g data-name="DropdownMenuItemTheme">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DropdownMenuItemTheme">
+							<rect x="38936.0" y="598.5" height="62.0" width="258.0" data-name="DropdownMenuItemTheme"></rect>
+							<path d="M38936.0 629.5 L39194.0 629.5" fill="none" data-name="DropdownMenuItemTheme"></path>
 						</g>
-						<g transform="translate(848, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
+						<g transform="translate(38936, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DropdownMenuItemTheme">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DropdownMenuItemTheme">
+								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="DropdownMenuItemTheme">DropdownMenuItemTheme</text>
 								
 							</g>
 						</g>
-						<g transform="translate(848, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
+						<g transform="translate(38936, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DropdownMenuItemTheme">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DropdownMenuItemTheme">
+								<text x="0.0" y="13.5" stroke="none" data-name="DropdownMenuItemTheme">+iconTheme: IconThemeData?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
-							<rect x="62749.0" y="67.5" height="138.0" width="301.0" data-name="AppController"></rect>
-							<path d="M62749.0 98.5 L63050.0 98.5" fill="none" data-name="AppController"></path>
-							<path d="M62749.0 159.5 L63050.0 159.5" fill="none" data-name="AppController"></path>
+					<g data-name="IconThemeData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconThemeData">
+							<rect x="38994.5" y="1197.0" height="31.0" width="141.0" data-name="IconThemeData"></rect>
 						</g>
-						<g transform="translate(62749, 67.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
+						<g transform="translate(38994.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconThemeData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconThemeData">
+								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconThemeData">IconThemeData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62749, 98.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
+					</g>
+					<g data-name="Diagnosticable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Diagnosticable">
+							<rect x="38998.5" y="121.0" height="31.0" width="133.0" data-name="Diagnosticable"></rect>
+						</g>
+						<g transform="translate(38998.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Diagnosticable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Diagnosticable">
+								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="Diagnosticable">Diagnosticable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62749, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
+					</g>
+					<g data-name="ThemeConfig">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeConfig">
+							<rect x="39770.8" y="0.0" height="273.0" width="543.0" data-name="ThemeConfig"></rect>
+							<path d="M39770.8 31.0 L40313.8 31.0" fill="none" data-name="ThemeConfig"></path>
+							<path d="M39770.8 107.0 L40313.8 107.0" fill="none" data-name="ThemeConfig"></path>
+						</g>
+						<g transform="translate(39770.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeConfig">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeConfig">
+								<text x="263.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeConfig">ThemeConfig</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="App">
-						<g fill="#eee8d5" stroke="#33322E" data-name="App">
-							<rect x="63090.0" y="121.0" height="31.0" width="47.0" data-name="App"></rect>
+						<g transform="translate(39770.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMinContentWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMaxContentWidth: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kHoverFadeFactor: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMuteFadeFactor: double</text>
+								
+							</g>
 						</g>
-						<g transform="translate(63090, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
-								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
+						<g transform="translate(39770.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+dynamic bodyBackgroundColor()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color modalBarrierColor()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color containerColor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color colorPickerInitialColor()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextMuted()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextBackground()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+double iconSplashRadius()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color sidesheetBackgroundColor()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppContent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
-							<rect x="63177.0" y="121.0" height="31.0" width="109.0" data-name="AppContent"></rect>
+					<g data-name="NoAnimationPageTransitionsBuilder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NoAnimationPageTransitionsBuilder">
+							<rect x="39331.3" y="598.5" height="62.0" width="299.0" data-name="NoAnimationPageTransitionsBuilder"></rect>
+							<path d="M39331.3 629.5 L39630.3 629.5" fill="none" data-name="NoAnimationPageTransitionsBuilder"></path>
 						</g>
-						<g transform="translate(63177, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
+						<g transform="translate(39331.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NoAnimationPageTransitionsBuilder">
+								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="NoAnimationPageTransitionsBuilder">NoAnimationPageTransitionsBuilder</text>
+								
+							</g>
+						</g>
+						<g transform="translate(39331.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NoAnimationPageTransitionsBuilder">
+								<text x="0.0" y="13.5" stroke="none" data-name="NoAnimationPageTransitionsBuilder">+Widget buildTransitions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthFormController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
-							<rect x="63110.5" y="2368.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
-							<path d="M63110.5 2399.5 L63960.5 2399.5" fill="none" data-name="AuthFormController"></path>
-							<path d="M63110.5 2655.5 L63960.5 2655.5" fill="none" data-name="AuthFormController"></path>
+					<g data-name="PageTransitionsBuilder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsBuilder">
+							<rect x="39531.8" y="121.0" height="31.0" width="199.0" data-name="PageTransitionsBuilder"></rect>
 						</g>
-						<g transform="translate(63110.5, 2368.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
-								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
+						<g transform="translate(39531.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PageTransitionsBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsBuilder">
+								<text x="91.5" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsBuilder">PageTransitionsBuilder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63110.5, 2399.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
+					</g>
+					<g data-name="WebTransitionBuilder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebTransitionBuilder">
+							<rect x="39710.8" y="598.5" height="62.0" width="223.0" data-name="WebTransitionBuilder"></rect>
+							<path d="M39710.8 629.5 L39933.8 629.5" fill="none" data-name="WebTransitionBuilder"></path>
+						</g>
+						<g transform="translate(39710.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebTransitionBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebTransitionBuilder">
+								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebTransitionBuilder">WebTransitionBuilder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63110.5, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
+						<g transform="translate(39710.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebTransitionBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebTransitionBuilder">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebTransitionBuilder">+Widget buildTransitions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthFormKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
-							<rect x="16966.8" y="3417.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
-							<path d="M16966.8 3448.0 L17321.8 3448.0" fill="none" data-name="AuthFormKey"></path>
+					<g data-name="ThemeSettingChange">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettingChange">
+							<rect x="39806.8" y="1666.5" height="62.0" width="216.0" data-name="ThemeSettingChange"></rect>
+							<path d="M39806.8 1697.5 L40022.8 1697.5" fill="none" data-name="ThemeSettingChange"></path>
 						</g>
-						<g transform="translate(16966.75, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
-								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
+						<g transform="translate(39806.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettingChange">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettingChange">
+								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettingChange">ThemeSettingChange</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16966.75, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
+						<g transform="translate(39806.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettingChange">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettingChange">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettingChange">+settings: ThemeSettings</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormGroupController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="69413.8" y="105.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
-							<path d="M69413.8 136.5 L69600.8 136.5" fill="none" data-name="IFormGroupController"></path>
+					<g data-name="ThemeSettings">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettings">
+							<rect x="37406.0" y="2586.5" height="77.0" width="227.0" data-name="ThemeSettings"></rect>
+							<path d="M37406.0 2617.5 L37633.0 2617.5" fill="none" data-name="ThemeSettings"></path>
 						</g>
-						<g transform="translate(69413.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
-								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
+						<g transform="translate(37406, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettings">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettings">
+								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettings">ThemeSettings</text>
 								
 							</g>
 						</g>
-						<g transform="translate(69413.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
+						<g transform="translate(37406, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettings">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettings">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettings">+sourceColor: Color</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeSettings">+themeMode: ThemeMode</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PasswordRecoveryForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
-							<rect x="6836.5" y="2578.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
-							<path d="M6836.5 2609.5 L7044.5 2609.5" fill="none" data-name="PasswordRecoveryForm"></path>
-							<path d="M6836.5 2640.5 L7044.5 2640.5" fill="none" data-name="PasswordRecoveryForm"></path>
+					<g data-name="Notification">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Notification">
+							<rect x="39862.8" y="1197.0" height="31.0" width="104.0" data-name="Notification"></rect>
 						</g>
-						<g transform="translate(6836.5, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
+						<g transform="translate(39862.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Notification">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notification">
+								<text x="44.0" y="13.5" stroke="none" text-anchor="middle" data-name="Notification">Notification</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6836.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
+					</g>
+					<g data-name="ThemeProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeProvider">
+							<rect x="40164.8" y="358.0" height="543.0" width="519.0" data-name="ThemeProvider"></rect>
+							<path d="M40164.8 389.0 L40683.8 389.0" fill="none" data-name="ThemeProvider"></path>
+							<path d="M40164.8 480.0 L40683.8 480.0" fill="none" data-name="ThemeProvider"></path>
+						</g>
+						<g transform="translate(40164.75, 358)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeProvider">
+								<text x="251.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeProvider">ThemeProvider</text>
+								
+							</g>
+						</g>
+						<g transform="translate(40164.75, 389)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+settings: ValueNotifier&lt;ThemeSettings&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+lightDynamic: ColorScheme?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+darkDynamic: ColorScheme?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+pageTransitionsTheme: PageTransitionsTheme</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+shapeMedium: ShapeBorder</text>
+								
+							</g>
+						</g>
+						<g transform="translate(40164.75, 480)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+Color custom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+Color blend()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+Color source()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+ColorScheme colors()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+CardTheme cardTheme()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ThemeProvider">+ListTileThemeData listTileTheme()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ThemeProvider">+AppBarTheme appBarTheme()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ThemeProvider">+SnackBarThemeData snackBarThemeData()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ThemeProvider">+TabBarTheme tabBarTheme()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ThemeProvider">+BottomAppBarTheme bottomAppBarTheme()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ThemeProvider">+BottomNavigationBarThemeData bottomNavigationBarTheme()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ThemeProvider">+SwitchThemeData switchTheme()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="ThemeProvider">+InputDecorationTheme inputDecorationTheme()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="ThemeProvider">+TextTheme textTheme()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="ThemeProvider">+DividerThemeData dividerTheme()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="ThemeProvider">+NavigationRailThemeData navigationRailTheme()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="ThemeProvider">+DrawerThemeData drawerTheme()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="ThemeProvider">+IconThemeData iconTheme()</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="ThemeProvider">+CheckboxThemeData checkboxTheme()</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="ThemeProvider">+RadioThemeData radioTheme()</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="ThemeProvider">+TooltipThemeData tooltipTheme()</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="ThemeProvider">+ThemeData light()</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="ThemeProvider">+ThemeData dark()</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="ThemeProvider">+ThemeMode themeMode()</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="ThemeProvider">+ThemeData theme()</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="ThemeProvider">&lt;static&gt;+ThemeProvider of()</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="ThemeProvider">+bool updateShouldNotify()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6836.5, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
+					</g>
+					<g data-name="ValueNotifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ValueNotifier">
+							<rect x="40006.8" y="1197.0" height="31.0" width="117.0" data-name="ValueNotifier"></rect>
+						</g>
+						<g transform="translate(40006.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueNotifier">
+								<text x="50.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueNotifier">ValueNotifier</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConsumerRefWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="7219.5" y="1666.5" height="62.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
-							<path d="M7219.5 1697.5 L7438.5 1697.5" fill="none" data-name="FormConsumerRefWidget"></path>
+					<g data-name="ColorScheme">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ColorScheme">
+							<rect x="40163.8" y="1197.0" height="31.0" width="122.0" data-name="ColorScheme"></rect>
 						</g>
-						<g transform="translate(7219.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
+						<g transform="translate(40163.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ColorScheme">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ColorScheme">
+								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="ColorScheme">ColorScheme</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7219.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerRefWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerRefWidget">+Widget build()</text>
+					</g>
+					<g data-name="PageTransitionsTheme">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsTheme">
+							<rect x="41059.5" y="1197.0" height="31.0" width="198.0" data-name="PageTransitionsTheme"></rect>
+						</g>
+						<g transform="translate(41059.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PageTransitionsTheme">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsTheme">
+								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsTheme">PageTransitionsTheme</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PasswordForgotForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
-							<rect x="7084.5" y="2578.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
-							<path d="M7084.5 2609.5 L7291.5 2609.5" fill="none" data-name="PasswordForgotForm"></path>
-							<path d="M7084.5 2640.5 L7291.5 2640.5" fill="none" data-name="PasswordForgotForm"></path>
+					<g data-name="ShapeBorder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ShapeBorder">
+							<rect x="41297.5" y="1197.0" height="31.0" width="120.0" data-name="ShapeBorder"></rect>
 						</g>
-						<g transform="translate(7084.5, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
+						<g transform="translate(41297.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ShapeBorder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ShapeBorder">
+								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="ShapeBorder">ShapeBorder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7084.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
+					</g>
+					<g data-name="InheritedWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InheritedWidget">
+							<rect x="40353.8" y="121.0" height="31.0" width="141.0" data-name="InheritedWidget"></rect>
+						</g>
+						<g transform="translate(40353.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="InheritedWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InheritedWidget">
+								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="InheritedWidget">InheritedWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7084.5, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
+					</g>
+					<g data-name="ThemeMode">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeMode">
+							<rect x="37746.0" y="3485.0" height="31.0" width="114.0" data-name="ThemeMode"></rect>
+						</g>
+						<g transform="translate(37746, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeMode">
+								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeMode">ThemeMode</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LoginForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
-							<rect x="7331.5" y="2578.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
-							<path d="M7331.5 2609.5 L7538.5 2609.5" fill="none" data-name="LoginForm"></path>
-							<path d="M7331.5 2640.5 L7538.5 2640.5" fill="none" data-name="LoginForm"></path>
+					<g data-name="CustomColor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CustomColor">
+							<rect x="24484.8" y="2563.5" height="123.0" width="128.0" data-name="CustomColor"></rect>
+							<path d="M24484.8 2594.5 L24612.8 2594.5" fill="none" data-name="CustomColor"></path>
+							<path d="M24484.8 2655.5 L24612.8 2655.5" fill="none" data-name="CustomColor"></path>
 						</g>
-						<g transform="translate(7331.5, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
+						<g transform="translate(24484.75, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomColor">
+								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomColor">CustomColor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7331.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
+						<g transform="translate(24484.75, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+name: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="CustomColor">+color: Color</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="CustomColor">+blend: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7331.5, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
+						<g transform="translate(24484.75, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+Color value()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EmailTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
-							<rect x="15231.8" y="2571.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
-							<path d="M15231.8 2602.5 L15552.8 2602.5" fill="none" data-name="EmailTextField"></path>
-						</g>
-						<g transform="translate(15231.75, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
-								
-							</g>
+					<g data-name="SuppressedBehaviorSubject">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SuppressedBehaviorSubject">
+							<rect x="16681.0" y="3774.5" height="138.0" width="388.0" data-name="SuppressedBehaviorSubject"></rect>
+							<path d="M16681.0 3805.5 L17069.0 3805.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
+							<path d="M16681.0 3866.5 L17069.0 3866.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
 						</g>
-						<g transform="translate(15231.75, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
+						<g transform="translate(16681, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SuppressedBehaviorSubject">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SuppressedBehaviorSubject">
+								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="SuppressedBehaviorSubject">SuppressedBehaviorSubject</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PasswordTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
-							<rect x="15592.8" y="2564.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
-							<path d="M15592.8 2595.0 L16071.8 2595.0" fill="none" data-name="PasswordTextField"></path>
-						</g>
-						<g transform="translate(15592.75, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
+						<g transform="translate(16681, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
+								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">+subject: BehaviorSubject&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+didSuppressInitialEvent: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SuppressedBehaviorSubject">-_controller: StreamController&lt;T&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15592.75, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
+						<g transform="translate(16681, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
+								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">-StreamController&lt;T&gt; _buildDerivedController()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+dynamic close()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<rect x="15452.3" y="3485.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
+					<g data-name="StreamController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
+							<rect x="14737.5" y="4118.5" height="31.0" width="149.0" data-name="StreamController"></rect>
 						</g>
-						<g transform="translate(15452.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
+						<g transform="translate(14737.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
+								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SignupForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
-							<rect x="7578.5" y="2563.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
-							<path d="M7578.5 2594.5 L7856.5 2594.5" fill="none" data-name="SignupForm"></path>
-							<path d="M7578.5 2625.5 L7856.5 2625.5" fill="none" data-name="SignupForm"></path>
+					<g data-name="Time">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Time">
+							<rect x="40723.8" y="583.5" height="92.0" width="293.0" data-name="Time"></rect>
+							<path d="M40723.8 614.5 L41016.8 614.5" fill="none" data-name="Time"></path>
 						</g>
-						<g transform="translate(7578.5, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
-								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
+						<g transform="translate(40723.75, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Time">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Time">
+								<text x="138.5" y="13.5" stroke="none" text-anchor="middle" data-name="Time">Time</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7578.5, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
+						<g transform="translate(40723.75, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Time">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Time">
+								<text x="0.0" y="13.5" stroke="none" data-name="Time">&lt;static&gt;+dynamic fromTimeOfDay()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Time">+Map&lt;String, dynamic&gt; toJson()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Time">&lt;static&gt;+Time fromJson()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7578.5, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
+					</g>
+					<g data-name="TimeOfDay">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TimeOfDay">
+							<rect x="40818.8" y="121.0" height="31.0" width="103.0" data-name="TimeOfDay"></rect>
+						</g>
+						<g transform="translate(40818.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeOfDay">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeOfDay">
+								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeOfDay">TimeOfDay</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyUJobsToBeDone">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
-							<rect x="64740.0" y="105.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
-							<path d="M64740.0 136.5 L64934.0 136.5" fill="none" data-name="StudyUJobsToBeDone"></path>
+					<g data-name="TimeValueAccessor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TimeValueAccessor">
+							<rect x="41056.8" y="583.5" height="92.0" width="297.0" data-name="TimeValueAccessor"></rect>
+							<path d="M41056.8 614.5 L41353.8 614.5" fill="none" data-name="TimeValueAccessor"></path>
 						</g>
-						<g transform="translate(64740, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
+						<g transform="translate(41056.75, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeValueAccessor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeValueAccessor">
+								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeValueAccessor">TimeValueAccessor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64740, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
+						<g transform="translate(41056.75, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimeValueAccessor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimeValueAccessor">
+								<text x="0.0" y="13.5" stroke="none" data-name="TimeValueAccessor">+String modelToViewValue()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TimeValueAccessor">+Time? viewToModelValue()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TimeValueAccessor">-String _addLeadingZeroIfNeeded()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
-							<rect x="16981.3" y="2564.0" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
-							<path d="M16981.3 2595.0 L17240.3 2595.0" fill="none" data-name="AuthScaffold"></path>
+					<g data-name="ControlValueAccessor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ControlValueAccessor">
+							<rect x="41109.8" y="121.0" height="31.0" width="191.0" data-name="ControlValueAccessor"></rect>
 						</g>
-						<g transform="translate(16981.25, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
+						<g transform="translate(41109.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ControlValueAccessor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ControlValueAccessor">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="ControlValueAccessor">ControlValueAccessor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16981.25, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
+					</g>
+					<g data-name="ModelAction">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelAction">
+							<rect x="24652.8" y="2556.5" height="137.0" width="188.0" data-name="ModelAction"></rect>
+							<path d="M24652.8 2587.5 L24840.8 2587.5" fill="none" data-name="ModelAction"></path>
+						</g>
+						<g transform="translate(24652.75, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelAction">
+								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelAction">ModelAction</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="EdgeInsets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="46909.0" y="3485.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
-						</g>
-						<g transform="translate(46909, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
+						<g transform="translate(24652.75, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelAction">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelAction">+type: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelAction">+label: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ModelAction">+icon: IconData?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ModelAction">+onExecute: Function</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ModelAction">+isAvailable: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ModelAction">+isDestructive: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PublishDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
-							<rect x="21045.8" y="2594.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
-							<path d="M21045.8 2625.0 L21181.8 2625.0" fill="none" data-name="PublishDialog"></path>
+					<g data-name="IModelActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
+							<rect x="83485.3" y="105.5" height="62.0" width="403.0" data-name="IModelActionProvider"></rect>
+							<path d="M83485.3 136.5 L83888.3 136.5" fill="none" data-name="IModelActionProvider"></path>
 						</g>
-						<g transform="translate(21045.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
+						<g transform="translate(83485.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
+								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21045.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
+						<g transform="translate(83485.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelActionProvider">
+								<text x="0.0" y="13.5" stroke="none" data-name="IModelActionProvider">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PublishSuccessDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
-							<rect x="21593.8" y="2594.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
-							<path d="M21593.8 2625.0 L21784.8 2625.0" fill="none" data-name="PublishSuccessDialog"></path>
+					<g data-name="IListActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
+							<rect x="83092.5" y="1174.0" height="77.0" width="179.0" data-name="IListActionProvider"></rect>
+							<path d="M83092.5 1205.0 L83271.5 1205.0" fill="none" data-name="IListActionProvider"></path>
 						</g>
-						<g transform="translate(21593.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
+						<g transform="translate(83092.5, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
+								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21593.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
+						<g transform="translate(83092.5, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IListActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IListActionProvider">
+								<text x="0.0" y="13.5" stroke="none" data-name="IListActionProvider">+void onSelectItem()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IListActionProvider">+void onNewItem()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PublishConfirmationDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
-							<rect x="21824.8" y="2594.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
-							<path d="M21824.8 2625.0 L22048.8 2625.0" fill="none" data-name="PublishConfirmationDialog"></path>
+					<g data-name="ModelActionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelActionType">
+							<rect x="516.0" y="3417.0" height="167.0" width="334.0" data-name="ModelActionType"></rect>
+							<path d="M516.0 3448.0 L850.0 3448.0" fill="none" data-name="ModelActionType"></path>
 						</g>
-						<g transform="translate(21824.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
+						<g transform="translate(516, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelActionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelActionType">
+								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelActionType">ModelActionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21824.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
+						<g transform="translate(516, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelActionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelActionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelActionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+values: List&lt;ModelActionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+edit: ModelActionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+delete: ModelActionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+remove: ModelActionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+duplicate: ModelActionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+clipboard: ModelActionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+primary: ModelActionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormArrayTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
-							<rect x="19658.3" y="2428.5" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
-							<path d="M19658.3 2459.5 L20148.3 2459.5" fill="none" data-name="FormArrayTable"></path>
-							<path d="M19658.3 2760.5 L20148.3 2760.5" fill="none" data-name="FormArrayTable"></path>
-						</g>
-						<g transform="translate(19658.25, 2428.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
-								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
-								
-							</g>
+					<g data-name="OptimisticUpdate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="OptimisticUpdate">
+							<rect x="17318.5" y="3737.0" height="213.0" width="383.0" data-name="OptimisticUpdate"></rect>
+							<path d="M17318.5 3768.0 L17701.5 3768.0" fill="none" data-name="OptimisticUpdate"></path>
+							<path d="M17318.5 3904.0 L17701.5 3904.0" fill="none" data-name="OptimisticUpdate"></path>
 						</g>
-						<g transform="translate(19658.25, 2459.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
+						<g transform="translate(17318.5, 3737)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptimisticUpdate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptimisticUpdate">
+								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptimisticUpdate">OptimisticUpdate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19658.25, 2760.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
+						<g transform="translate(17318.5, 3768)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
+								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+applyOptimistic: void Function()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">+apply: dynamic Function()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="OptimisticUpdate">+rollback: void Function()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="OptimisticUpdate">+onUpdate: void Function()?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="OptimisticUpdate">+onError: void Function(Object, StackTrace?)?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="OptimisticUpdate">+rethrowErrors: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="OptimisticUpdate">+runOptimistically: bool</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="OptimisticUpdate">+completeFutureOptimistically: bool</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="38917.0" y="3485.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(38917, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
+						<g transform="translate(17318.5, 3904)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
+								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+dynamic execute()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">-void _runUpdateHandlerIfAny()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="28574.5" y="3485.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
+					<g data-name="void Function()">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()">
+							<rect x="14926.5" y="4118.5" height="31.0" width="134.0" data-name="void Function()"></rect>
 						</g>
-						<g transform="translate(28574.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
+						<g transform="translate(14926.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()">
+								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()">void Function()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<rect x="18519.8" y="3485.0" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
+					<g data-name="void Function(Object, StackTrace?)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Object, StackTrace?)?">
+							<rect x="15100.5" y="4118.5" height="31.0" width="304.0" data-name="void Function(Object, StackTrace?)?"></rect>
 						</g>
-						<g transform="translate(18519.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
+						<g transform="translate(15100.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Object, StackTrace?)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Object, StackTrace?)?">
+								<text x="144.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Object, StackTrace?)?">void Function(Object, StackTrace?)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="String Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
-							<rect x="19749.8" y="3485.0" height="31.0" width="157.0" data-name="String Function(T)"></rect>
+					<g data-name="FileFormatEncoder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FileFormatEncoder">
+							<rect x="41468.8" y="90.5" height="92.0" width="216.0" data-name="FileFormatEncoder"></rect>
+							<path d="M41468.8 121.5 L41684.8 121.5" fill="none" data-name="FileFormatEncoder"></path>
 						</g>
-						<g transform="translate(19749.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
+						<g transform="translate(41468.75, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FileFormatEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FileFormatEncoder">
+								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="FileFormatEncoder">FileFormatEncoder</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
-							<rect x="19946.8" y="3485.0" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
-						</g>
-						<g transform="translate(19946.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
-								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
+						<g transform="translate(41468.75, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FileFormatEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FileFormatEncoder">
+								<text x="0.0" y="13.5" stroke="none" data-name="FileFormatEncoder">+dynamic encodeAsync()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FileFormatEncoder">+String encode()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FileFormatEncoder">+dynamic call()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="34062.3" y="1166.0" height="93.0" width="163.0" data-name="IFormData"></rect>
-							<path d="M34062.3 1197.0 L34225.3 1197.0" fill="none" data-name="IFormData"></path>
-							<path d="M34062.3 1228.0 L34225.3 1228.0" fill="none" data-name="IFormData"></path>
+					<g data-name="CSVStringEncoder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CSVStringEncoder">
+							<rect x="41393.8" y="598.5" height="62.0" width="162.0" data-name="CSVStringEncoder"></rect>
+							<path d="M41393.8 629.5 L41555.8 629.5" fill="none" data-name="CSVStringEncoder"></path>
 						</g>
-						<g transform="translate(34062.25, 1166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
+						<g transform="translate(41393.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CSVStringEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CSVStringEncoder">
+								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="CSVStringEncoder">CSVStringEncoder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34062.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
+						<g transform="translate(41393.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CSVStringEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CSVStringEncoder">
+								<text x="0.0" y="13.5" stroke="none" data-name="CSVStringEncoder">+String encode()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34062.25, 1228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
+					</g>
+					<g data-name="JsonStringEncoder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="JsonStringEncoder">
+							<rect x="41595.8" y="598.5" height="62.0" width="166.0" data-name="JsonStringEncoder"></rect>
+							<path d="M41595.8 629.5 L41761.8 629.5" fill="none" data-name="JsonStringEncoder"></path>
+						</g>
+						<g transform="translate(41595.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JsonStringEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonStringEncoder">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="JsonStringEncoder">JsonStringEncoder</text>
+								
+							</g>
+						</g>
+						<g transform="translate(41595.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonStringEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonStringEncoder">
+								<text x="0.0" y="13.5" stroke="none" data-name="JsonStringEncoder">+String encode()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="68051.8" y="1666.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
-							<path d="M68051.8 1697.5 L68447.8 1697.5" fill="none" data-name="ManagedFormViewModel"></path>
+					<g data-name="ExecutionLimiter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ExecutionLimiter">
+							<rect x="18293.8" y="3789.5" height="108.0" width="197.0" data-name="ExecutionLimiter"></rect>
+							<path d="M18293.8 3820.5 L18490.8 3820.5" fill="none" data-name="ExecutionLimiter"></path>
+							<path d="M18293.8 3866.5 L18490.8 3866.5" fill="none" data-name="ExecutionLimiter"></path>
 						</g>
-						<g transform="translate(68051.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
+						<g transform="translate(18293.75, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ExecutionLimiter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ExecutionLimiter">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ExecutionLimiter">ExecutionLimiter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68051.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
+						<g transform="translate(18293.75, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
+								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+milliseconds: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ExecutionLimiter">&lt;static&gt;-_timer: Timer?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(18293.75, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
+								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
-							<rect x="10266.8" y="614.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
+					<g data-name="Timer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Timer">
+							<rect x="15444.5" y="4118.5" height="31.0" width="60.0" data-name="Timer"></rect>
 						</g>
-						<g transform="translate(10266.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
+						<g transform="translate(15444.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timer">
+								<text x="22.0" y="13.5" stroke="none" text-anchor="middle" data-name="Timer">Timer</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="57108.3" y="3707.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
-							<path d="M57108.3 3738.0 L57389.3 3738.0" fill="none" data-name="FormViewModelCollection"></path>
-							<path d="M57108.3 3829.0 L57389.3 3829.0" fill="none" data-name="FormViewModelCollection"></path>
+					<g data-name="Debouncer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
+							<rect x="60210.8" y="4072.5" height="123.0" width="536.0" data-name="Debouncer"></rect>
+							<path d="M60210.8 4103.5 L60746.8 4103.5" fill="none" data-name="Debouncer"></path>
+							<path d="M60210.8 4164.5 L60746.8 4164.5" fill="none" data-name="Debouncer"></path>
 						</g>
-						<g transform="translate(57108.25, 3707)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
+						<g transform="translate(60210.75, 4072.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
+								<text x="260.0" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57108.25, 3738)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
+						<g transform="translate(60210.75, 4103.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
+								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+leading: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Debouncer">+cancelUncompleted: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Debouncer">-_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57108.25, 3829)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
+						<g transform="translate(60210.75, 4164.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
+								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+dynamic call()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="58767.0" y="4118.5" height="31.0" width="98.0" data-name="FormArray"></rect>
+					<g data-name="CancelableOperation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
+							<rect x="65854.3" y="4439.0" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
 						</g>
-						<g transform="translate(58767, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
+						<g transform="translate(65854.25, 4439)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
+								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormInvalidException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
-							<rect x="60367.5" y="614.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
+					<g data-name="Throttler">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Throttler">
+							<rect x="40095.0" y="4103.0" height="62.0" width="136.0" data-name="Throttler"></rect>
+							<path d="M40095.0 4134.0 L40231.0 4134.0" fill="none" data-name="Throttler"></path>
 						</g>
-						<g transform="translate(60367.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
+						<g transform="translate(40095, 4103)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Throttler">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Throttler">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="Throttler">Throttler</text>
+								
+							</g>
+						</g>
+						<g transform="translate(40095, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Throttler">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Throttler">
+								<text x="0.0" y="13.5" stroke="none" data-name="Throttler">+dynamic call()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConfigException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
-							<rect x="60593.5" y="598.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
-							<path d="M60593.5 629.5 L60778.5 629.5" fill="none" data-name="FormConfigException"></path>
+					<g data-name="SerializableColor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SerializableColor">
+							<rect x="21412.8" y="3805.0" height="77.0" width="312.0" data-name="SerializableColor"></rect>
+							<path d="M21412.8 3836.0 L21724.8 3836.0" fill="none" data-name="SerializableColor"></path>
 						</g>
-						<g transform="translate(60593.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
-								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
+						<g transform="translate(21412.75, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SerializableColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SerializableColor">
+								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="SerializableColor">SerializableColor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60593.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
+						<g transform="translate(21412.75, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SerializableColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SerializableColor">
+								<text x="0.0" y="13.5" stroke="none" data-name="SerializableColor">+Map&lt;String, dynamic&gt; toJson()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SerializableColor">&lt;static&gt;+SerializableColor fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="70165.3" y="1174.0" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-							<path d="M70165.3 1205.0 L70382.3 1205.0" fill="none" data-name="IFormViewModelDelegate"></path>
+					<g data-name="IProviderArgsResolver">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
+							<rect x="42585.8" y="1181.5" height="62.0" width="193.0" data-name="IProviderArgsResolver"></rect>
+							<path d="M42585.8 1212.5 L42778.8 1212.5" fill="none" data-name="IProviderArgsResolver"></path>
 						</g>
-						<g transform="translate(70165.25, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
+						<g transform="translate(42585.75, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
 								
 							</g>
 						</g>
-						<g transform="translate(70165.25, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
+						<g transform="translate(42585.75, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IProviderArgsResolver">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IProviderArgsResolver">
+								<text x="0.0" y="13.5" stroke="none" data-name="IProviderArgsResolver">+R provide()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControlOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
-							<rect x="5112.5" y="2571.5" height="107.0" width="190.0" data-name="FormControlOption"></rect>
-							<path d="M5112.5 2602.5 L5302.5 2602.5" fill="none" data-name="FormControlOption"></path>
+					<g data-name="CombinedStreamNotifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CombinedStreamNotifier">
+							<rect x="41801.8" y="583.0" height="93.0" width="435.0" data-name="CombinedStreamNotifier"></rect>
+							<path d="M41801.8 614.0 L42236.8 614.0" fill="none" data-name="CombinedStreamNotifier"></path>
+							<path d="M41801.8 645.0 L42236.8 645.0" fill="none" data-name="CombinedStreamNotifier"></path>
 						</g>
-						<g transform="translate(5112.5, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
+						<g transform="translate(41801.75, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CombinedStreamNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CombinedStreamNotifier">
+								<text x="209.5" y="13.5" stroke="none" text-anchor="middle" data-name="CombinedStreamNotifier">CombinedStreamNotifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5112.5, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
+						<g transform="translate(41801.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">-_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(41801.75, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
-							<rect x="41225.8" y="3439.5" height="122.0" width="282.0" data-name="FormMode"></rect>
-							<path d="M41225.8 3470.5 L41507.8 3470.5" fill="none" data-name="FormMode"></path>
+					<g data-name="ChangeNotifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
+							<rect x="41952.3" y="121.0" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
 						</g>
-						<g transform="translate(41225.75, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
+						<g transform="translate(41952.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
+								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41225.75, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
+					</g>
+					<g data-name="CountWhereValidator">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CountWhereValidator">
+							<rect x="42276.8" y="553.0" height="153.0" width="383.0" data-name="CountWhereValidator"></rect>
+							<path d="M42276.8 584.0 L42659.8 584.0" fill="none" data-name="CountWhereValidator"></path>
+							<path d="M42276.8 675.0 L42659.8 675.0" fill="none" data-name="CountWhereValidator"></path>
+						</g>
+						<g transform="translate(42276.75, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CountWhereValidator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CountWhereValidator">
+								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="CountWhereValidator">CountWhereValidator</text>
+								
+							</g>
+						</g>
+						<g transform="translate(42276.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
+								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+predicate: bool Function(T?)</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="CountWhereValidator">+minCount: int?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="CountWhereValidator">+maxCount: int?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMinCount: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMaxCount: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(42276.75, 675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
+								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+Map&lt;String, dynamic&gt;? validate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormValidationSetEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
-							<rect x="69528.3" y="1197.0" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
+					<g data-name="bool Function(T?)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="bool Function(T?)">
+							<rect x="42390.8" y="1197.0" height="31.0" width="155.0" data-name="bool Function(T?)"></rect>
 						</g>
-						<g transform="translate(69528.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
-								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
+						<g transform="translate(42390.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="bool Function(T?)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="bool Function(T?)">
+								<text x="69.5" y="13.5" stroke="none" text-anchor="middle" data-name="bool Function(T?)">bool Function(T?)</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="Validator">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Validator">
+							<rect x="42425.3" y="121.0" height="31.0" width="86.0" data-name="Validator"></rect>
+						</g>
+						<g transform="translate(42425.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Validator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Validator">
+								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="Validator">Validator</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CustomFormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
-							<rect x="54092.8" y="3759.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
-							<path d="M54092.8 3790.5 L54505.8 3790.5" fill="none" data-name="CustomFormControl"></path>
-							<path d="M54092.8 3896.5 L54505.8 3896.5" fill="none" data-name="CustomFormControl"></path>
+					<g data-name="Patterns">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Patterns">
+							<rect x="72659.0" y="90.5" height="92.0" width="287.0" data-name="Patterns"></rect>
+							<path d="M72659.0 121.5 L72946.0 121.5" fill="none" data-name="Patterns"></path>
 						</g>
-						<g transform="translate(54092.75, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
+						<g transform="translate(72659, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Patterns">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Patterns">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="Patterns">Patterns</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54092.75, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
+						<g transform="translate(72659, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Patterns">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Patterns">
+								<text x="0.0" y="13.5" stroke="none" data-name="Patterns">&lt;static&gt;+timeFormatString: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Patterns">&lt;static&gt;+emailFormatString: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Patterns">&lt;static&gt;+url: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54092.75, 3896.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
+					</g>
+					<g data-name="NumericalRangeFormatter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NumericalRangeFormatter">
+							<rect x="43126.0" y="575.5" height="108.0" width="313.0" data-name="NumericalRangeFormatter"></rect>
+							<path d="M43126.0 606.5 L43439.0 606.5" fill="none" data-name="NumericalRangeFormatter"></path>
+							<path d="M43126.0 652.5 L43439.0 652.5" fill="none" data-name="NumericalRangeFormatter"></path>
+						</g>
+						<g transform="translate(43126, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericalRangeFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NumericalRangeFormatter">
+								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="NumericalRangeFormatter">NumericalRangeFormatter</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(T?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
-							<rect x="60332.0" y="4118.5" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
+						<g transform="translate(43126, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
+								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+min: int?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NumericalRangeFormatter">+max: int?</text>
+								
+							</g>
 						</g>
-						<g transform="translate(60332, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
+						<g transform="translate(43126, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
+								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+TextEditingValue formatEditUpdate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(ControlStatus)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
-							<rect x="60557.8" y="4118.5" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
+					<g data-name="TextInputFormatter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TextInputFormatter">
+							<rect x="43376.0" y="121.0" height="31.0" width="166.0" data-name="TextInputFormatter"></rect>
 						</g>
-						<g transform="translate(60557.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
+						<g transform="translate(43376, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TextInputFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextInputFormatter">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextInputFormatter">TextInputFormatter</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="UnsavedChangesDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
-							<rect x="64974.0" y="105.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
-							<path d="M64974.0 136.5 L65181.0 136.5" fill="none" data-name="UnsavedChangesDialog"></path>
+					<g data-name="StudySequenceFormatter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySequenceFormatter">
+							<rect x="43479.0" y="598.5" height="62.0" width="313.0" data-name="StudySequenceFormatter"></rect>
+							<path d="M43479.0 629.5 L43792.0 629.5" fill="none" data-name="StudySequenceFormatter"></path>
 						</g>
-						<g transform="translate(64974, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
+						<g transform="translate(43479, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySequenceFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySequenceFormatter">
+								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySequenceFormatter">StudySequenceFormatter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64974, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
+						<g transform="translate(43479, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySequenceFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySequenceFormatter">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySequenceFormatter">+TextEditingValue formatEditUpdate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControlValidation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
-							<rect x="20520.8" y="2556.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
-							<path d="M20520.8 2587.0 L21005.8 2587.0" fill="none" data-name="FormControlValidation"></path>
-							<path d="M20520.8 2663.0 L21005.8 2663.0" fill="none" data-name="FormControlValidation"></path>
+					<g data-name="Tuple">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Tuple">
+							<rect x="22399.0" y="2541.0" height="168.0" width="384.0" data-name="Tuple"></rect>
+							<path d="M22399.0 2572.0 L22783.0 2572.0" fill="none" data-name="Tuple"></path>
+							<path d="M22399.0 2633.0 L22783.0 2633.0" fill="none" data-name="Tuple"></path>
 						</g>
-						<g transform="translate(20520.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
-								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
+						<g transform="translate(22399, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Tuple">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Tuple">
+								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="Tuple">Tuple</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20520.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
+						<g transform="translate(22399, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
+								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+first: T1</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">+second: T2</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+props: List&lt;Object?&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20520.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
+						<g transform="translate(22399, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
+								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+Map&lt;String, dynamic&gt; toJson()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">&lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copy()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copyWith()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="47174.0" y="3334.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M47174.0 3365.0 L47736.0 3365.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M47174.0 3546.0 L47736.0 3546.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+					<g data-name="JsonFileLoader">
+						<g fill="#eee8d5" stroke="#33322E" data-name="JsonFileLoader">
+							<rect x="77468.5" y="75.0" height="123.0" width="319.0" data-name="JsonFileLoader"></rect>
+							<path d="M77468.5 106.0 L77787.5 106.0" fill="none" data-name="JsonFileLoader"></path>
+							<path d="M77468.5 137.0 L77787.5 137.0" fill="none" data-name="JsonFileLoader"></path>
 						</g>
-						<g transform="translate(47174, 3334)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
-								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
+						<g transform="translate(77468.5, 75)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="JsonFileLoader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonFileLoader">
+								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="JsonFileLoader">JsonFileLoader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47174, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+						<g transform="translate(77468.5, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
+								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+jsonAssetsPath: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47174, 3546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
+						<g transform="translate(77468.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
+								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+dynamic loadJson()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonMapFromAssets()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonListFromAssets()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="35315.5" y="1956.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M35315.5 1987.0 L36328.5 1987.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M35315.5 3008.0 L36328.5 3008.0" fill="none" data-name="QuestionFormViewModel"></path>
+					<g data-name="IAppDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
+							<rect x="19658.5" y="3812.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
+							<path d="M19658.5 3843.5 L19855.5 3843.5" fill="none" data-name="IAppDelegate"></path>
 						</g>
-						<g transform="translate(35315.5, 1956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
+						<g transform="translate(19658.5, 3812.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35315.5, 1987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(19658.5, 3843.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35315.5, 3008)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
+					</g>
+					<g data-name="AppController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
+							<rect x="77827.5" y="67.5" height="138.0" width="301.0" data-name="AppController"></rect>
+							<path d="M77827.5 98.5 L78128.5 98.5" fill="none" data-name="AppController"></path>
+							<path d="M77827.5 159.5 L78128.5 159.5" fill="none" data-name="AppController"></path>
+						</g>
+						<g transform="translate(77827.5, 67.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
+								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IScreenerQuestionLogicFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="21221.8" y="2594.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M21221.8 2625.0 L21553.8 2625.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
-						</g>
-						<g transform="translate(21221.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
+						<g transform="translate(77827.5, 98.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21221.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+						<g transform="translate(77827.5, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignEnrollmentFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="24593.0" y="3454.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M24593.0 3485.5 L25042.0 3485.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
+					<g data-name="StudyMonitorScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
+							<rect x="28875.3" y="2594.0" height="62.0" width="176.0" data-name="StudyMonitorScreen"></rect>
+							<path d="M28875.3 2625.0 L29051.3 2625.0" fill="none" data-name="StudyMonitorScreen"></path>
 						</g>
-						<g transform="translate(24593, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
+						<g transform="translate(28875.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
+								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24593, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
+						<g transform="translate(28875.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StudyPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
+							<rect x="33543.0" y="1651.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
+							<path d="M33543.0 1682.0 L33707.0 1682.0" fill="none" data-name="StudyPageWidget"></path>
+							<path d="M33543.0 1713.0 L33707.0 1713.0" fill="none" data-name="StudyPageWidget"></path>
+						</g>
+						<g transform="translate(33543, 1651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="22410.3" y="2594.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M22410.3 2625.0 L22622.3 2625.0" fill="none" data-name="StudyDesignPageWidget"></path>
-						</g>
-						<g transform="translate(22410.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
+						<g transform="translate(33543, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22410.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
+						<g transform="translate(33543, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionLogicFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="82493.3" y="2556.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M82493.3 2587.0 L82917.3 2587.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M82493.3 2618.0 L82917.3 2618.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+					<g data-name="LoginForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
+							<rect x="11713.0" y="2578.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
+							<path d="M11713.0 2609.5 L11920.0 2609.5" fill="none" data-name="LoginForm"></path>
+							<path d="M11713.0 2640.5 L11920.0 2640.5" fill="none" data-name="LoginForm"></path>
 						</g>
-						<g transform="translate(82493.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
-								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
+						<g transform="translate(11713, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82493.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
+						<g transform="translate(11713, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82493.25, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
+						<g transform="translate(11713, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="83707.8" y="105.5" height="62.0" width="192.0" data-name="FormConsumerWidget"></rect>
-							<path d="M83707.8 136.5 L83899.8 136.5" fill="none" data-name="FormConsumerWidget"></path>
+					<g data-name="AuthFormKey">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
+							<rect x="14634.5" y="3417.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
+							<path d="M14634.5 3448.0 L14989.5 3448.0" fill="none" data-name="AuthFormKey"></path>
 						</g>
-						<g transform="translate(83707.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
+						<g transform="translate(14634.5, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
+								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83707.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerWidget">+Widget build()</text>
+						<g transform="translate(14634.5, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="29342.0" y="1613.5" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M29342.0 1644.5 L29600.0 1644.5" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M29342.0 1735.5 L29600.0 1735.5" fill="none" data-name="ConsentItemFormData"></path>
+					<g data-name="PasswordRecoveryForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
+							<rect x="12467.3" y="2578.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
+							<path d="M12467.3 2609.5 L12675.3 2609.5" fill="none" data-name="PasswordRecoveryForm"></path>
+							<path d="M12467.3 2640.5 L12675.3 2640.5" fill="none" data-name="PasswordRecoveryForm"></path>
 						</g>
-						<g transform="translate(29342, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
+						<g transform="translate(12467.25, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29342, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
+						<g transform="translate(12467.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29342, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
+						<g transform="translate(12467.25, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="59112.5" y="2376.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M59112.5 2407.0 L60014.5 2407.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M59112.5 2633.0 L60014.5 2633.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+					<g data-name="PasswordForgotForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
+							<rect x="13425.0" y="2578.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
+							<path d="M13425.0 2609.5 L13632.0 2609.5" fill="none" data-name="PasswordForgotForm"></path>
+							<path d="M13425.0 2640.5 L13632.0 2640.5" fill="none" data-name="PasswordForgotForm"></path>
 						</g>
-						<g transform="translate(59112.5, 2376)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
-								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
+						<g transform="translate(13425, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59112.5, 2407)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
+						<g transform="translate(13425, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59112.5, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
+						<g transform="translate(13425, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormConsentItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="55349.5" y="3394.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M55349.5 3425.0 L56149.5 3425.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M55349.5 3501.0 L56149.5 3501.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+					<g data-name="SignupForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
+							<rect x="18358.3" y="2563.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
+							<path d="M18358.3 2594.5 L18636.3 2594.5" fill="none" data-name="SignupForm"></path>
+							<path d="M18358.3 2625.5 L18636.3 2625.5" fill="none" data-name="SignupForm"></path>
 						</g>
-						<g transform="translate(55349.5, 3394)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
+						<g transform="translate(18358.25, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
+								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55349.5, 3425)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
+						<g transform="translate(18358.25, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55349.5, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
+						<g transform="translate(18358.25, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="38650.0" y="1568.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M38650.0 1599.5 L39282.0 1599.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M38650.0 1705.5 L39282.0 1705.5" fill="none" data-name="WithQuestionnaireControls"></path>
-						</g>
-						<g transform="translate(38650, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
+					<g data-name="AuthScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
+							<rect x="29445.3" y="2564.0" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
+							<path d="M29445.3 2595.0 L29704.3 2595.0" fill="none" data-name="AuthScaffold"></path>
 						</g>
-						<g transform="translate(38650, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
+						<g transform="translate(29445.25, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
+								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38650, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
+						<g transform="translate(29445.25, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="31033.5" y="2496.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M31033.5 2527.0 L31729.5 2527.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M31033.5 2693.0 L31729.5 2693.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+					<g data-name="EmailTextField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
+							<rect x="29744.3" y="2571.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
+							<path d="M29744.3 2602.5 L30065.3 2602.5" fill="none" data-name="EmailTextField"></path>
 						</g>
-						<g transform="translate(31033.5, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
+						<g transform="translate(29744.25, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
+								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31033.5, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(29744.25, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
+								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31033.5, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
+					</g>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="59258.3" y="3485.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+						</g>
+						<g transform="translate(59258.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="10812.5" y="1666.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M10812.5 1697.5 L11193.5 1697.5" fill="none" data-name="ConsentItemFormView"></path>
+					<g data-name="PasswordTextField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
+							<rect x="30105.3" y="2564.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
+							<path d="M30105.3 2595.0 L30584.3 2595.0" fill="none" data-name="PasswordTextField"></path>
 						</g>
-						<g transform="translate(10812.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
+						<g transform="translate(30105.25, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10812.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
+						<g transform="translate(30105.25, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="28584.5" y="2541.0" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M28584.5 2572.0 L29038.5 2572.0" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M28584.5 2663.0 L29038.5 2663.0" fill="none" data-name="EnrollmentFormData"></path>
+					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+							<rect x="29964.8" y="3485.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
 						</g>
-						<g transform="translate(28584.5, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
-								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
+						<g transform="translate(29964.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28584.5, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
+					</g>
+					<g data-name="StudyUJobsToBeDone">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
+							<rect x="78168.5" y="105.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
+							<path d="M78168.5 136.5 L78362.5 136.5" fill="none" data-name="StudyUJobsToBeDone"></path>
+						</g>
+						<g transform="translate(78168.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
+								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28584.5, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
+						<g transform="translate(78168.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="53266.8" y="3431.5" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M53266.8 3462.5 L53634.8 3462.5" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M53266.8 3508.5 L53634.8 3508.5" fill="none" data-name="QuestionnaireFormData"></path>
+					<g data-name="AuthFormController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
+							<rect x="43407.0" y="2368.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
+							<path d="M43407.0 2399.5 L44257.0 2399.5" fill="none" data-name="AuthFormController"></path>
+							<path d="M43407.0 2655.5 L44257.0 2655.5" fill="none" data-name="AuthFormController"></path>
 						</g>
-						<g transform="translate(53266.75, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
+						<g transform="translate(43407, 2368.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
+								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53266.75, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
+						<g transform="translate(43407, 2399.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53266.75, 3508.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
+						<g transform="translate(43407, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="32371.8" y="1666.5" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M32371.8 1697.5 L32514.8 1697.5" fill="none" data-name="IStudyFormData"></path>
-						</g>
-						<g transform="translate(32371.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
-								
-							</g>
+					<g data-name="IAuthRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
+							<rect x="72971.8" y="4020.0" height="228.0" width="295.0" data-name="IAuthRepository"></rect>
+							<path d="M72971.8 4051.0 L73266.8 4051.0" fill="none" data-name="IAuthRepository"></path>
+							<path d="M72971.8 4142.0 L73266.8 4142.0" fill="none" data-name="IAuthRepository"></path>
 						</g>
-						<g transform="translate(32371.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
+						<g transform="translate(72971.75, 4020)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
+								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyDesignInterventionsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="25082.0" y="3469.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M25082.0 3500.5 L25378.0 3500.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
-						</g>
-						<g transform="translate(25082, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
+						<g transform="translate(72971.75, 4051)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+allowPasswordReset: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+currentUser: User?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+isLoggedIn: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+session: Session?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+serializedSession: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25082, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
+						<g transform="translate(72971.75, 4142)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+dynamic signUp()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+dynamic signInWith()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+dynamic signOut()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+dynamic resetPasswordForEmail()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+dynamic updateUser()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IAuthRepository">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="69205.5" y="2436.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M69205.5 2467.0 L70044.5 2467.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M69205.5 2618.0 L70044.5 2618.0" fill="none" data-name="InterventionsFormViewModel"></path>
+					<g data-name="FormGroup">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
+							<rect x="61341.3" y="3485.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
 						</g>
-						<g transform="translate(69205.5, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
-								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
+						<g transform="translate(61341.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
 								
 							</g>
 						</g>
-						<g transform="translate(69205.5, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
+					</g>
+					<g data-name="IFormGroupController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
+							<rect x="47019.5" y="105.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
+							<path d="M47019.5 136.5 L47206.5 136.5" fill="none" data-name="IFormGroupController"></path>
+						</g>
+						<g transform="translate(47019.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
+								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(69205.5, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
+						<g transform="translate(47019.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="82745.3" y="1501.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M82745.3 1532.0 L83503.3 1532.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M82745.3 1833.0 L83503.3 1833.0" fill="none" data-name="StudyScheduleControls"></path>
-						</g>
-						<g transform="translate(82745.25, 1501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
-								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
-								
-							</g>
+					<g data-name="AppStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
+							<rect x="940.0" y="3447.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
+							<path d="M940.0 3478.0 L1219.0 3478.0" fill="none" data-name="AppStatus"></path>
 						</g>
-						<g transform="translate(82745.25, 1532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
+						<g transform="translate(940, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
+								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82745.25, 1833)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
+						<g transform="translate(940, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="41833.8" y="2391.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M41833.8 2422.0 L42688.8 2422.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M41833.8 2648.0 L42688.8 2648.0" fill="none" data-name="InterventionFormViewModel"></path>
+					<g data-name="FormArrayTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
+							<rect x="31066.5" y="2428.5" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
+							<path d="M31066.5 2459.5 L31556.5 2459.5" fill="none" data-name="FormArrayTable"></path>
+							<path d="M31066.5 2760.5 L31556.5 2760.5" fill="none" data-name="FormArrayTable"></path>
 						</g>
-						<g transform="translate(41833.75, 2391)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
-								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
+						<g transform="translate(31066.5, 2428.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
+								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41833.75, 2422)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(31066.5, 2459.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41833.75, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
+						<g transform="translate(31066.5, 2760.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="57817.0" y="2541.0" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M57817.0 2572.0 L58107.0 2572.0" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M57817.0 2663.0 L58107.0 2663.0" fill="none" data-name="InterventionTaskFormData"></path>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+							<rect x="30425.0" y="3485.0" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
 						</g>
-						<g transform="translate(57817, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
+						<g transform="translate(30425, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57817, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
-								
-							</g>
+					</g>
+					<g data-name="String Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
+							<rect x="30876.0" y="3485.0" height="31.0" width="157.0" data-name="String Function(T)"></rect>
 						</g>
-						<g transform="translate(57817, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
+						<g transform="translate(30876, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
+								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="58364.8" y="1613.5" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M58364.8 1644.5 L58662.8 1644.5" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M58364.8 1750.5 L58662.8 1750.5" fill="none" data-name="IFormDataWithSchedule"></path>
+					<g data-name="Widget Function(BuildContext, T, int)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
+							<rect x="31526.0" y="3485.0" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
 						</g>
-						<g transform="translate(58364.75, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
+						<g transform="translate(31526, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
+								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58364.75, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
+					</g>
+					<g data-name="ManagedFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
+							<rect x="58975.8" y="1666.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
+							<path d="M58975.8 1697.5 L59371.8 1697.5" fill="none" data-name="ManagedFormViewModel"></path>
+						</g>
+						<g transform="translate(58975.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
+								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58364.75, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
+						<g transform="translate(58975.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="29211.5" y="3401.5" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M29211.5 3432.5 L29507.5 3432.5" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M29211.5 3538.5 L29507.5 3538.5" fill="none" data-name="StudyScheduleFormData"></path>
+					<g data-name="FormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
+							<rect x="68299.0" y="313.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
+							<path d="M68299.0 344.0 L69171.0 344.0" fill="none" data-name="FormViewModel"></path>
+							<path d="M68299.0 660.0 L69171.0 660.0" fill="none" data-name="FormViewModel"></path>
 						</g>
-						<g transform="translate(29211.5, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
+						<g transform="translate(68299, 313)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
+								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29211.5, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
+						<g transform="translate(68299, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29211.5, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
+						<g transform="translate(68299, 660)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PhaseSequence">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="62577.5" y="3828.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
+					<g data-name="FormViewModelNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
+							<rect x="72520.8" y="614.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
 						</g>
-						<g transform="translate(62577.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
-								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
+						<g transform="translate(72520.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="16518.8" y="1651.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M16518.8 1682.0 L16848.8 1682.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M16518.8 1713.0 L16848.8 1713.0" fill="none" data-name="InterventionPreview"></path>
+					<g data-name="Exception">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
+							<rect x="75456.5" y="121.0" height="31.0" width="94.0" data-name="Exception"></rect>
 						</g>
-						<g transform="translate(16518.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
+						<g transform="translate(75456.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
+								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16518.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
-								
-							</g>
+					</g>
+					<g data-name="FormViewModelCollection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
+							<rect x="65717.8" y="3707.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
+							<path d="M65717.8 3738.0 L65998.8 3738.0" fill="none" data-name="FormViewModelCollection"></path>
+							<path d="M65717.8 3829.0 L65998.8 3829.0" fill="none" data-name="FormViewModelCollection"></path>
 						</g>
-						<g transform="translate(16518.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
+						<g transform="translate(65717.75, 3707)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
+								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InterventionTaskFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="64000.5" y="2488.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M64000.5 2519.5 L64696.5 2519.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M64000.5 2700.5 L64696.5 2700.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-						</g>
-						<g transform="translate(64000.5, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
+						<g transform="translate(65717.75, 3738)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64000.5, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(65717.75, 3829)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64000.5, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
+					</g>
+					<g data-name="FormArray">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
+							<rect x="61689.0" y="4118.5" height="31.0" width="98.0" data-name="FormArray"></rect>
+						</g>
+						<g transform="translate(61689, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="83543.3" y="1546.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M83543.3 1577.0 L84038.3 1577.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M83543.3 1803.0 L84038.3 1803.0" fill="none" data-name="WithScheduleControls"></path>
+					<g data-name="CustomFormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
+							<rect x="59108.3" y="3759.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
+							<path d="M59108.3 3790.5 L59521.3 3790.5" fill="none" data-name="CustomFormControl"></path>
+							<path d="M59108.3 3896.5 L59521.3 3896.5" fill="none" data-name="CustomFormControl"></path>
 						</g>
-						<g transform="translate(83543.25, 1546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
+						<g transform="translate(59108.25, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83543.25, 1577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
+						<g transform="translate(59108.25, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83543.25, 1803)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
+						<g transform="translate(59108.25, 3896.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="29118.5" y="2556.0" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M29118.5 2587.0 L29512.5 2587.0" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M29118.5 2648.0 L29512.5 2648.0" fill="none" data-name="InterventionsFormData"></path>
+					<g data-name="void Function(T?)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
+							<rect x="60887.0" y="4118.5" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
 						</g>
-						<g transform="translate(29118.5, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
+						<g transform="translate(60887, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29118.5, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
-								
-							</g>
+					</g>
+					<g data-name="void Function(ControlStatus)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
+							<rect x="61384.3" y="4118.5" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
 						</g>
-						<g transform="translate(29118.5, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
+						<g transform="translate(61384.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="15541.3" y="1666.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M15541.3 1697.5 L15916.3 1697.5" fill="none" data-name="InterventionFormView"></path>
+					<g data-name="UnsavedChangesDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
+							<rect x="79433.8" y="105.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
+							<path d="M79433.8 136.5 L79640.8 136.5" fill="none" data-name="UnsavedChangesDialog"></path>
 						</g>
-						<g transform="translate(15541.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
-								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
+						<g transform="translate(79433.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15541.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
+						<g transform="translate(79433.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="15956.3" y="1666.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M15956.3 1697.5 L16369.3 1697.5" fill="none" data-name="InterventionTaskFormView"></path>
-						</g>
-						<g transform="translate(15956.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
-								
-							</g>
+					<g data-name="FormValidationSetEnum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
+							<rect x="60170.8" y="1197.0" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
 						</g>
-						<g transform="translate(15956.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
+						<g transform="translate(60170.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
+								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="29640.0" y="1598.5" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M29640.0 1629.5 L30022.0 1629.5" fill="none" data-name="InterventionFormData"></path>
-							<path d="M29640.0 1750.5 L30022.0 1750.5" fill="none" data-name="InterventionFormData"></path>
+					<g data-name="FormControlValidation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
+							<rect x="32866.0" y="2556.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
+							<path d="M32866.0 2587.0 L33351.0 2587.0" fill="none" data-name="FormControlValidation"></path>
+							<path d="M32866.0 2663.0 L33351.0 2663.0" fill="none" data-name="FormControlValidation"></path>
 						</g>
-						<g transform="translate(29640, 1598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
+						<g transform="translate(32866, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
+								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29640, 1629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
+						<g transform="translate(32866, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29640, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
+						<g transform="translate(32866, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="82944.8" y="1158.5" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M82944.8 1189.5 L83303.8 1189.5" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M82944.8 1220.5 L83303.8 1220.5" fill="none" data-name="StudyScheduleFormView"></path>
+					<g data-name="IFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
+							<rect x="50917.0" y="1166.0" height="93.0" width="163.0" data-name="IFormData"></rect>
+							<path d="M50917.0 1197.0 L51080.0 1197.0" fill="none" data-name="IFormData"></path>
+							<path d="M50917.0 1228.0 L51080.0 1228.0" fill="none" data-name="IFormData"></path>
 						</g>
-						<g transform="translate(82944.75, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
+						<g transform="translate(50917, 1166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
+								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82944.75, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
+						<g transform="translate(50917, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82944.75, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
+						<g transform="translate(50917, 1228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="30579.5" y="2541.0" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M30579.5 2572.0 L30993.5 2572.0" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M30579.5 2663.0 L30993.5 2663.0" fill="none" data-name="StudyInfoFormData"></path>
+					<g data-name="FormInvalidException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
+							<rect x="74359.3" y="614.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
 						</g>
-						<g transform="translate(30579.5, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
+						<g transform="translate(74359.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
+								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30579.5, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
+					</g>
+					<g data-name="FormConfigException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
+							<rect x="74585.3" y="598.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
+							<path d="M74585.3 629.5 L74770.3 629.5" fill="none" data-name="FormConfigException"></path>
+						</g>
+						<g transform="translate(74585.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
+								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30579.5, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
+						<g transform="translate(74585.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyContactInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="29547.5" y="3386.5" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M29547.5 3417.5 L29895.5 3417.5" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M29547.5 3568.5 L29895.5 3568.5" fill="none" data-name="StudyContactInfoFormData"></path>
-						</g>
-						<g transform="translate(29547.5, 3386.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
-								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
-								
-							</g>
+					<g data-name="IFormViewModelDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
+							<rect x="67477.5" y="1174.0" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
+							<path d="M67477.5 1205.0 L67694.5 1205.0" fill="none" data-name="IFormViewModelDelegate"></path>
 						</g>
-						<g transform="translate(29547.5, 3417.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
+						<g transform="translate(67477.5, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
+								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29547.5, 3568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
+						<g transform="translate(67477.5, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignInfoFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="25418.0" y="3469.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M25418.0 3500.5 L25641.0 3500.5" fill="none" data-name="StudyDesignInfoFormView"></path>
+					<g data-name="FormControlOption">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
+							<rect x="22823.0" y="2571.5" height="107.0" width="190.0" data-name="FormControlOption"></rect>
+							<path d="M22823.0 2602.5 L23013.0 2602.5" fill="none" data-name="FormControlOption"></path>
 						</g>
-						<g transform="translate(25418, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
+						<g transform="translate(22823, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
+								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25418, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
+						<g transform="translate(22823, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInfoFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="72356.5" y="2383.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M72356.5 2414.5 L73052.5 2414.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M72356.5 2820.5 L73052.5 2820.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-						</g>
-						<g transform="translate(72356.5, 2383.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
-								
-							</g>
+					<g data-name="FormMode">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
+							<rect x="25140.0" y="3439.5" height="122.0" width="282.0" data-name="FormMode"></rect>
+							<path d="M25140.0 3470.5 L25422.0 3470.5" fill="none" data-name="FormMode"></path>
 						</g>
-						<g transform="translate(72356.5, 2414.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
+						<g transform="translate(25140, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72356.5, 2820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
+						<g transform="translate(25140, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="58147.0" y="2526.0" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M58147.0 2557.0 L58556.0 2557.0" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M58147.0 2678.0 L58556.0 2678.0" fill="none" data-name="MeasurementSurveyFormData"></path>
+					<g data-name="EnrolledBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
+							<rect x="79680.8" y="90.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
+							<path d="M79680.8 121.0 L79846.8 121.0" fill="none" data-name="EnrolledBadge"></path>
+							<path d="M79680.8 152.0 L79846.8 152.0" fill="none" data-name="EnrolledBadge"></path>
 						</g>
-						<g transform="translate(58147, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
+						<g transform="translate(79680.75, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58147, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
+						<g transform="translate(79680.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58147, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
+						<g transform="translate(79680.75, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="16888.8" y="1666.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M16888.8 1697.5 L17332.8 1697.5" fill="none" data-name="MeasurementSurveyFormView"></path>
+					<g data-name="StudyRecruitController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
+							<rect x="75351.5" y="1121.0" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
+							<path d="M75351.5 1152.0 L76002.5 1152.0" fill="none" data-name="StudyRecruitController"></path>
+							<path d="M75351.5 1198.0 L76002.5 1198.0" fill="none" data-name="StudyRecruitController"></path>
 						</g>
-						<g transform="translate(16888.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
+						<g transform="translate(75351.5, 1121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
+								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16888.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
+						<g transform="translate(75351.5, 1152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(75351.5, 1198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="57081.0" y="2413.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M57081.0 2444.5 L57777.0 2444.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M57081.0 2670.5 L57777.0 2670.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+					<g data-name="IInviteCodeRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
+							<rect x="81834.0" y="1666.5" height="62.0" width="265.0" data-name="IInviteCodeRepository"></rect>
+							<path d="M81834.0 1697.5 L82099.0 1697.5" fill="none" data-name="IInviteCodeRepository"></path>
 						</g>
-						<g transform="translate(57081, 2413.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
+						<g transform="translate(81834, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
+								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57081, 2444.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(81834, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IInviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IInviteCodeRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IInviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57081, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
+					</g>
+					<g data-name="StreamSubscription">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
+							<rect x="71898.3" y="3485.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+						</g>
+						<g transform="translate(71898.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
+								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="17372.8" y="1651.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M17372.8 1682.0 L17716.8 1682.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M17372.8 1713.0 L17716.8 1713.0" fill="none" data-name="SurveyPreview"></path>
+					<g data-name="StudyBaseController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
+							<rect x="73001.3" y="538.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
+							<path d="M73001.3 569.0 L73547.3 569.0" fill="none" data-name="StudyBaseController"></path>
+							<path d="M73001.3 645.0 L73547.3 645.0" fill="none" data-name="StudyBaseController"></path>
 						</g>
-						<g transform="translate(17372.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
+						<g transform="translate(73001.25, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
+								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17372.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
+						<g transform="translate(73001.25, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17372.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
+						<g transform="translate(73001.25, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignMeasurementsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="25938.0" y="3469.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M25938.0 3500.5 L26248.0 3500.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
+					<g data-name="StudyRecruitScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
+							<rect x="29091.3" y="2571.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
+							<path d="M29091.3 2602.5 L29405.3 2602.5" fill="none" data-name="StudyRecruitScreen"></path>
 						</g>
-						<g transform="translate(25938, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
+						<g transform="translate(29091.25, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
+								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25938, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
+						<g transform="translate(29091.25, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="33537.5" y="2563.5" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M33537.5 2594.5 L34031.5 2594.5" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M33537.5 2640.5 L34031.5 2640.5" fill="none" data-name="MeasurementsFormData"></path>
+					<g data-name="InviteCodeFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
+							<rect x="80897.0" y="575.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
+							<path d="M80897.0 606.5 L81335.0 606.5" fill="none" data-name="InviteCodeFormView"></path>
+							<path d="M80897.0 637.5 L81335.0 637.5" fill="none" data-name="InviteCodeFormView"></path>
 						</g>
-						<g transform="translate(33537.5, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
-								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
+						<g transform="translate(80897, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
+								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33537.5, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
+						<g transform="translate(80897, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33537.5, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
+						<g transform="translate(80897, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="68033.5" y="2443.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M68033.5 2474.5 L69125.5 2474.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M68033.5 2625.5 L69125.5 2625.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+					<g data-name="InviteCodeFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
+							<rect x="72890.5" y="1023.5" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
+							<path d="M72890.5 1054.5 L73557.5 1054.5" fill="none" data-name="InviteCodeFormViewModel"></path>
+							<path d="M72890.5 1280.5 L73557.5 1280.5" fill="none" data-name="InviteCodeFormViewModel"></path>
 						</g>
-						<g transform="translate(68033.5, 2443.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
-								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
+						<g transform="translate(72890.5, 1023.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
+								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68033.5, 2474.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(72890.5, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68033.5, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
+						<g transform="translate(72890.5, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormValidationSet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="1217.0" y="3462.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M1217.0 3493.0 L1604.0 3493.0" fill="none" data-name="StudyFormValidationSet"></path>
+					<g data-name="StudyInvitesTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
+							<rect x="78402.5" y="45.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
+							<path d="M78402.5 76.0 L78968.5 76.0" fill="none" data-name="StudyInvitesTable"></path>
+							<path d="M78402.5 182.0 L78968.5 182.0" fill="none" data-name="StudyInvitesTable"></path>
 						</g>
-						<g transform="translate(1217, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
-								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
+						<g transform="translate(78402.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
+								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1217, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
+						<g transform="translate(78402.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
+								
+							</g>
+						</g>
+						<g transform="translate(78402.5, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="64736.5" y="2451.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M64736.5 2482.0 L65596.5 2482.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M64736.5 2648.0 L65596.5 2648.0" fill="none" data-name="ReportsFormViewModel"></path>
+					<g data-name="void Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
+							<rect x="77874.3" y="614.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(64736.5, 2451)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
-								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
+						<g transform="translate(77874.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
+								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64736.5, 2482)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
+					</g>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+							<rect x="78136.3" y="614.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
+						</g>
+						<g transform="translate(78136.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64736.5, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
+					</g>
+					<g data-name="Intervention? Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
+							<rect x="78596.3" y="614.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
+						</g>
+						<g transform="translate(78596.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportFormItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="57808.5" y="3394.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M57808.5 3425.0 L58651.5 3425.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M57808.5 3501.0 L58651.5 3501.0" fill="none" data-name="ReportFormItemDelegate"></path>
+					<g data-name="int Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
+							<rect x="78904.0" y="614.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(57808.5, 3394)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
-								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
+						<g transform="translate(78904, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57808.5, 3425)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
+					</g>
+					<g data-name="PublishSuccessDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
+							<rect x="30624.3" y="2594.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
+							<path d="M30624.3 2625.0 L30815.3 2625.0" fill="none" data-name="PublishSuccessDialog"></path>
+						</g>
+						<g transform="translate(30624.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57808.5, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
+						<g transform="translate(30624.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="34593.5" y="1628.5" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M34593.5 1659.5 L34907.5 1659.5" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M34593.5 1720.5 L34907.5 1720.5" fill="none" data-name="ReportItemFormData"></path>
+					<g data-name="PublishDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
+							<rect x="33391.0" y="2594.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
+							<path d="M33391.0 2625.0 L33527.0 2625.0" fill="none" data-name="PublishDialog"></path>
 						</g>
-						<g transform="translate(34593.5, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
+						<g transform="translate(33391, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34593.5, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
+						<g transform="translate(33391, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34593.5, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
+					</g>
+					<g data-name="PublishConfirmationDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
+							<rect x="33567.0" y="2594.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
+							<path d="M33567.0 2625.0 L33791.0 2625.0" fill="none" data-name="PublishConfirmationDialog"></path>
+						</g>
+						<g transform="translate(33567, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
+								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="34686.5" y="2609.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(34686.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
+						<g transform="translate(33567, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="23219.5" y="1613.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M23219.5 1644.5 L23686.5 1644.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M23219.5 1720.5 L23686.5 1720.5" fill="none" data-name="ReportItemFormView"></path>
+					<g data-name="FrameControlsWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
+							<rect x="18530.8" y="3782.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
+							<path d="M18530.8 3813.0 L18821.8 3813.0" fill="none" data-name="FrameControlsWidget"></path>
+							<path d="M18530.8 3874.0 L18821.8 3874.0" fill="none" data-name="FrameControlsWidget"></path>
 						</g>
-						<g transform="translate(23219.5, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
-								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
+						<g transform="translate(18530.75, 3782)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
+								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23219.5, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
+						<g transform="translate(18530.75, 3813)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23219.5, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
+						<g transform="translate(18530.75, 3874)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="29552.5" y="2338.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M29552.5 2369.5 L30539.5 2369.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M29552.5 2805.5 L30539.5 2805.5" fill="none" data-name="ReportItemFormViewModel"></path>
+					<g data-name="IStudyStatusBadgeViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
+							<rect x="34506.0" y="2586.5" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
+							<path d="M34506.0 2617.5 L34791.0 2617.5" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
 						</g>
-						<g transform="translate(29552.5, 2338.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
-								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
+						<g transform="translate(34506, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
+								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29552.5, 2369.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
+						<g transform="translate(34506, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29552.5, 2805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
+					</g>
+					<g data-name="Participation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
+							<rect x="36368.5" y="3485.0" height="31.0" width="114.0" data-name="Participation"></rect>
+						</g>
+						<g transform="translate(36368.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
+								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="17803.8" y="3485.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
+					<g data-name="StudyStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
+							<rect x="32274.5" y="3485.0" height="31.0" width="111.0" data-name="StudyStatus"></rect>
 						</g>
-						<g transform="translate(17803.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
+						<g transform="translate(32274.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
+								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="7481.3" y="3447.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M7481.3 3478.0 L7864.3 3478.0" fill="none" data-name="ReportSectionType"></path>
+					<g data-name="StudyStatusBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
+							<rect x="34831.0" y="2548.5" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
+							<path d="M34831.0 2579.5 L35072.0 2579.5" fill="none" data-name="StudyStatusBadge"></path>
+							<path d="M34831.0 2670.5 L35072.0 2670.5" fill="none" data-name="StudyStatusBadge"></path>
 						</g>
-						<g transform="translate(7481.25, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
+						<g transform="translate(34831, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
+								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7481.25, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
+						<g transform="translate(34831, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(34831, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="31809.5" y="2518.5" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M31809.5 2549.5 L32257.5 2549.5" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M31809.5 2655.5 L32257.5 2655.5" fill="none" data-name="TemporalAggregationFormatted"></path>
+					<g data-name="RouteInformation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
+							<rect x="32425.5" y="3431.5" height="138.0" width="152.0" data-name="RouteInformation"></rect>
+							<path d="M32425.5 3462.5 L32577.5 3462.5" fill="none" data-name="RouteInformation"></path>
+							<path d="M32425.5 3538.5 L32577.5 3538.5" fill="none" data-name="RouteInformation"></path>
 						</g>
-						<g transform="translate(31809.5, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
+						<g transform="translate(32425.5, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31809.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
+						<g transform="translate(32425.5, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31809.5, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
+						<g transform="translate(32425.5, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="29935.5" y="3485.0" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
+					<g data-name="PlatformController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
+							<rect x="35112.0" y="2496.0" height="258.0" width="302.0" data-name="PlatformController"></rect>
+							<path d="M35112.0 2527.0 L35414.0 2527.0" fill="none" data-name="PlatformController"></path>
+							<path d="M35112.0 2618.0 L35414.0 2618.0" fill="none" data-name="PlatformController"></path>
 						</g>
-						<g transform="translate(29935.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
+						<g transform="translate(35112, 2496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
+								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="32297.5" y="2518.5" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M32297.5 2549.5 L32748.5 2549.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M32297.5 2655.5 L32748.5 2655.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
-						</g>
-						<g transform="translate(32297.5, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
+						<g transform="translate(35112, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32297.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
+						<g transform="translate(35112, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32297.5, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
+					</g>
+					<g data-name="WebController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
+							<rect x="32766.5" y="3401.5" height="198.0" width="273.0" data-name="WebController"></rect>
+							<path d="M32766.5 3432.5 L33039.5 3432.5" fill="none" data-name="WebController"></path>
+							<path d="M32766.5 3463.5 L33039.5 3463.5" fill="none" data-name="WebController"></path>
+						</g>
+						<g transform="translate(32766.5, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
+								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="30161.5" y="3485.0" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
+						<g transform="translate(32766.5, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
+								
+							</g>
 						</g>
-						<g transform="translate(30161.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
+						<g transform="translate(32766.5, 3463.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="23726.5" y="1636.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M23726.5 1667.0 L24205.5 1667.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M23726.5 1728.0 L24205.5 1728.0" fill="none" data-name="AverageSectionFormView"></path>
+					<g data-name="IFrameElement">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
+							<rect x="32835.5" y="3828.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
 						</g>
-						<g transform="translate(23726.5, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
+						<g transform="translate(32835.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
+								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23726.5, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+					</g>
+					<g data-name="MobileController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
+							<rect x="33968.5" y="3417.0" height="167.0" width="191.0" data-name="MobileController"></rect>
+							<path d="M33968.5 3448.0 L34159.5 3448.0" fill="none" data-name="MobileController"></path>
+						</g>
+						<g transform="translate(33968.5, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23726.5, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
+						<g transform="translate(33968.5, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
+								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="24245.5" y="1636.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M24245.5 1667.0 L24724.5 1667.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M24245.5 1728.0 L24724.5 1728.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+					<g data-name="StudyController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
+							<rect x="72157.5" y="2511.0" height="228.0" width="573.0" data-name="StudyController"></rect>
+							<path d="M72157.5 2542.0 L72730.5 2542.0" fill="none" data-name="StudyController"></path>
+							<path d="M72157.5 2603.0 L72730.5 2603.0" fill="none" data-name="StudyController"></path>
 						</g>
-						<g transform="translate(24245.5, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
+						<g transform="translate(72157.5, 2511)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
+								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24245.5, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+						<g transform="translate(72157.5, 2542)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24245.5, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
+						<g transform="translate(72157.5, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="63291.5" y="583.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M63291.5 614.0 L63495.5 614.0" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M63291.5 645.0 L63495.5 645.0" fill="none" data-name="DataReferenceIdentifier"></path>
+					<g data-name="IStudyNavViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
+							<rect x="36428.5" y="2556.5" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
+							<path d="M36428.5 2587.5 L36669.5 2587.5" fill="none" data-name="IStudyNavViewModel"></path>
 						</g>
-						<g transform="translate(63291.5, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
+						<g transform="translate(36428.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
+								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63291.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
+						<g transform="translate(36428.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63291.5, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
+					</g>
+					<g data-name="StudyNav">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
+							<rect x="80128.0" y="68.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
+							<path d="M80128.0 99.0 L80361.0 99.0" fill="none" data-name="StudyNav"></path>
+						</g>
+						<g transform="translate(80128, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
+								
+							</g>
+						</g>
+						<g transform="translate(80128, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="63326.0" y="121.0" height="31.0" width="135.0" data-name="DataReference"></rect>
+					<g data-name="StudyDesignNav">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
+							<rect x="80401.0" y="68.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
+							<path d="M80401.0 99.0 L80689.0 99.0" fill="none" data-name="StudyDesignNav"></path>
 						</g>
-						<g transform="translate(63326, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
+						<g transform="translate(80401, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
+								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
+								
+							</g>
+						</g>
+						<g transform="translate(80401, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="32788.5" y="2556.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M32788.5 2587.0 L33497.5 2587.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M32788.5 2648.0 L33497.5 2648.0" fill="none" data-name="DataReferenceEditor"></path>
+					<g data-name="StudyParticipationBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
+							<rect x="36768.0" y="2556.0" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
+							<path d="M36768.0 2587.0 L36999.0 2587.0" fill="none" data-name="StudyParticipationBadge"></path>
+							<path d="M36768.0 2663.0 L36999.0 2663.0" fill="none" data-name="StudyParticipationBadge"></path>
 						</g>
-						<g transform="translate(32788.5, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
+						<g transform="translate(36768, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
+								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
+								
+							</g>
+						</g>
+						<g transform="translate(36768, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(36768, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32788.5, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
+					</g>
+					<g data-name="IStudyRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
+							<rect x="72645.0" y="3462.0" height="77.0" width="251.0" data-name="IStudyRepository"></rect>
+							<path d="M72645.0 3493.0 L72896.0 3493.0" fill="none" data-name="IStudyRepository"></path>
+						</g>
+						<g transform="translate(72645, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32788.5, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
+						<g transform="translate(72645, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyRepository">+dynamic launch()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyRepository">+dynamic deleteParticipants()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="30390.5" y="3485.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
+					<g data-name="PreviewFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
+							<rect x="61535.8" y="1166.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
+							<path d="M61535.8 1197.5 L61826.8 1197.5" fill="none" data-name="PreviewFrame"></path>
 						</g>
-						<g transform="translate(30390.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
+						<g transform="translate(61535.75, 1166.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
+								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReportsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="34308.5" y="2563.5" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M34308.5 2594.5 L34646.5 2594.5" fill="none" data-name="ReportsFormData"></path>
-							<path d="M34308.5 2640.5 L34646.5 2640.5" fill="none" data-name="ReportsFormData"></path>
-						</g>
-						<g transform="translate(34308.5, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
+						<g transform="translate(61535.75, 1197.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34308.5, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
+					</g>
+					<g data-name="IStudyAppBarViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
+							<rect x="33506.8" y="3454.5" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
+							<path d="M33506.8 3485.5 L33749.8 3485.5" fill="none" data-name="IStudyAppBarViewModel"></path>
+						</g>
+						<g transform="translate(33506.75, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
+								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34308.5, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
+						<g transform="translate(33506.75, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="15852.3" y="3447.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M15852.3 3478.0 L16153.3 3478.0" fill="none" data-name="ReportStatus"></path>
+					<g data-name="StudyScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
+							<rect x="63130.8" y="1091.5" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
+							<path d="M63130.8 1122.5 L63465.8 1122.5" fill="none" data-name="StudyScaffold"></path>
 						</g>
-						<g transform="translate(15852.25, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
+						<g transform="translate(63130.75, 1091.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
+								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15852.25, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
+						<g transform="translate(63130.75, 1122.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="34071.5" y="2556.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M34071.5 2587.0 L34268.5 2587.0" fill="none" data-name="ReportBadge"></path>
-							<path d="M34071.5 2663.0 L34268.5 2663.0" fill="none" data-name="ReportBadge"></path>
+					<g data-name="WebFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
+							<rect x="80729.0" y="82.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
+							<path d="M80729.0 113.5 L80898.0 113.5" fill="none" data-name="WebFrame"></path>
+							<path d="M80729.0 159.5 L80898.0 159.5" fill="none" data-name="WebFrame"></path>
 						</g>
-						<g transform="translate(34071.5, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
+						<g transform="translate(80729, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
+								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34071.5, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
+						<g transform="translate(80729, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34071.5, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
+						<g transform="translate(80729, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignReportsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="26288.0" y="3462.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M26288.0 3493.0 L26681.0 3493.0" fill="none" data-name="StudyDesignReportsFormView"></path>
+					<g data-name="DisabledFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
+							<rect x="80938.0" y="105.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
+							<path d="M80938.0 136.5 L81074.0 136.5" fill="none" data-name="DisabledFrame"></path>
 						</g>
-						<g transform="translate(26288, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
+						<g transform="translate(80938, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26288, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
+						<g transform="translate(80938, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="25270.0" y="2563.5" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M25270.0 2594.5 L25658.0 2594.5" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M25270.0 2655.5 L25658.0 2655.5" fill="none" data-name="StudyFormScaffold"></path>
+					<g data-name="PhoneContainer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
+							<rect x="37039.0" y="2518.5" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
+							<path d="M37039.0 2549.5 L37366.0 2549.5" fill="none" data-name="PhoneContainer"></path>
+							<path d="M37039.0 2700.5 L37366.0 2700.5" fill="none" data-name="PhoneContainer"></path>
 						</g>
-						<g transform="translate(25270, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
+						<g transform="translate(37039, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
+								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25270, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
+						<g transform="translate(37039, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
+								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25270, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
+						<g transform="translate(37039, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
+								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="T Function(WidgetRef)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="27658.5" y="3485.0" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
+					<g data-name="MobileFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
+							<rect x="81114.0" y="105.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
+							<path d="M81114.0 136.5 L81250.0 136.5" fill="none" data-name="MobileFrame"></path>
 						</g>
-						<g transform="translate(27658.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
+						<g transform="translate(81114, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="30633.5" y="3485.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
-						</g>
-						<g transform="translate(30633.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
+						<g transform="translate(81114, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="24764.5" y="1659.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M24764.5 1690.0 L25116.5 1690.0" fill="none" data-name="SurveyQuestionFormView"></path>
+					<g data-name="DesktopFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
+							<rect x="81290.0" y="105.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
+							<path d="M81290.0 136.5 L81426.0 136.5" fill="none" data-name="DesktopFrame"></path>
 						</g>
-						<g transform="translate(24764.5, 1659)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
+						<g transform="translate(81290, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24764.5, 1690)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
+						<g transform="translate(81290, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="28758.5" y="3417.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M28758.5 3448.0 L29121.5 3448.0" fill="none" data-name="SurveyQuestionType"></path>
+					<g data-name="StudyTestScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
+							<rect x="33831.0" y="2548.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
+							<path d="M33831.0 2579.5 L34031.0 2579.5" fill="none" data-name="StudyTestScreen"></path>
+							<path d="M33831.0 2610.5 L34031.0 2610.5" fill="none" data-name="StudyTestScreen"></path>
 						</g>
-						<g transform="translate(28758.5, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
+						<g transform="translate(33831, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
+								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28758.5, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
+						<g transform="translate(33831, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(33831, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="47393.0" y="1568.5" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M47393.0 1599.5 L48561.0 1599.5" fill="none" data-name="QuestionFormData"></path>
-							<path d="M47393.0 1735.5 L48561.0 1735.5" fill="none" data-name="QuestionFormData"></path>
+					<g data-name="StudySettingsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
+							<rect x="69180.0" y="2496.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
+							<path d="M69180.0 2527.0 L69659.0 2527.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+							<path d="M69180.0 2663.0 L69659.0 2663.0" fill="none" data-name="StudySettingsFormViewModel"></path>
 						</g>
-						<g transform="translate(47393, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
+						<g transform="translate(69180, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47393, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
+						<g transform="translate(69180, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47393, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
+						<g transform="translate(69180, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="43683.8" y="2541.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M43683.8 2572.0 L44027.8 2572.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M43683.8 2633.0 L44027.8 2633.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-						</g>
-						<g transform="translate(43683.75, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
-								
-							</g>
+					<g data-name="StudySettingsDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
+							<rect x="34071.0" y="2594.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
+							<path d="M34071.0 2625.0 L34246.0 2625.0" fill="none" data-name="StudySettingsDialog"></path>
 						</g>
-						<g transform="translate(43683.75, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(34071, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
+								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43683.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(34071, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="44067.8" y="2556.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M44067.8 2587.0 L44459.8 2587.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M44067.8 2633.0 L44459.8 2633.0" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(44067.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
+					<g data-name="StudyTestController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
+							<rect x="72149.8" y="3805.0" height="77.0" width="282.0" data-name="StudyTestController"></rect>
+							<path d="M72149.8 3836.0 L72431.8 3836.0" fill="none" data-name="StudyTestController"></path>
 						</g>
-						<g transform="translate(44067.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(72149.75, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44067.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(72149.75, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="44499.8" y="2556.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M44499.8 2587.0 L44971.8 2587.0" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M44499.8 2633.0 L44971.8 2633.0" fill="none" data-name="ImageQuestionFormData"></path>
-						</g>
-						<g transform="translate(44499.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
-								
-							</g>
+					<g data-name="TestAppRoutes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
+							<rect x="81466.0" y="68.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
+							<path d="M81466.0 99.0 L81726.0 99.0" fill="none" data-name="TestAppRoutes"></path>
 						</g>
-						<g transform="translate(44499.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(81466, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
+								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44499.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(81466, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
+								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="45011.8" y="2548.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M45011.8 2579.5 L45483.8 2579.5" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M45011.8 2640.5 L45483.8 2640.5" fill="none" data-name="AudioQuestionFormData"></path>
+					<g data-name="DrawerEntry">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
+							<rect x="64182.5" y="1113.5" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
+							<path d="M64182.5 1144.5 L64627.5 1144.5" fill="none" data-name="DrawerEntry"></path>
+							<path d="M64182.5 1280.5 L64627.5 1280.5" fill="none" data-name="DrawerEntry"></path>
 						</g>
-						<g transform="translate(45011.75, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
+						<g transform="translate(64182.5, 1113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
+								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45011.75, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(64182.5, 1144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DrawerEntry">+localizedHelpText: String Function()?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DrawerEntry">+enabled: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DrawerEntry">+onSelected: void Function(BuildContext, WidgetRef)?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DrawerEntry">+autoCloseDrawer: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DrawerEntry">+title: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="DrawerEntry">+helpText: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45011.75, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(64182.5, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="45523.8" y="2481.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M45523.8 2512.0 L45867.8 2512.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M45523.8 2708.0 L45867.8 2708.0" fill="none" data-name="ScaleQuestionFormData"></path>
+					<g data-name="String Function()">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
+							<rect x="63786.3" y="1682.0" height="31.0" width="147.0" data-name="String Function()"></rect>
 						</g>
-						<g transform="translate(45523.75, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
+						<g transform="translate(63786.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
+								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45523.75, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
+					</g>
+					<g data-name="String Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
+							<rect x="64013.3" y="1682.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
+						</g>
+						<g transform="translate(64013.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
+								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45523.75, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+					</g>
+					<g data-name="void Function(BuildContext, WidgetRef)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
+							<rect x="64210.3" y="1682.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
+						</g>
+						<g transform="translate(64210.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
+								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="56083.0" y="2541.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M56083.0 2572.0 L56427.0 2572.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M56083.0 2648.0 L56427.0 2648.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+					<g data-name="GoRouterDrawerEntry">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
+							<rect x="64586.3" y="1643.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
+							<path d="M64586.3 1674.5 L64850.3 1674.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+							<path d="M64586.3 1720.5 L64850.3 1720.5" fill="none" data-name="GoRouterDrawerEntry"></path>
 						</g>
-						<g transform="translate(56083, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
+						<g transform="translate(64586.25, 1643.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
+								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56083, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(64586.25, 1674.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56083, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(64586.25, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="56880.5" y="3485.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+					<g data-name="AppDrawer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
+							<rect x="81766.0" y="53.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
+							<path d="M81766.0 84.0 L82035.0 84.0" fill="none" data-name="AppDrawer"></path>
 						</g>
-						<g transform="translate(56880.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
+						<g transform="translate(81766, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
+								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
+								
+							</g>
+						</g>
+						<g transform="translate(81766, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppDrawer">+leftPaddingEntries: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AppDrawer">+logoPaddingVertical: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AppDrawer">+logoPaddingHorizontal: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AppDrawer">+logoMaxHeight: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AppDrawer">+logoSectionMinHeight: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AppDrawer">+logoSectionMaxHeight: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="73242.8" y="105.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M73242.8 136.5 L73551.8 136.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
+					<g data-name="StudyAnalyzeScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
+							<rect x="34286.0" y="2586.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
+							<path d="M34286.0 2617.5 L34466.0 2617.5" fill="none" data-name="StudyAnalyzeScreen"></path>
 						</g>
-						<g transform="translate(73242.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
+						<g transform="translate(34286, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
+								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73242.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(34286, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="25504.0" y="1666.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M25504.0 1697.5 L25856.0 1697.5" fill="none" data-name="ScaleQuestionFormView"></path>
+					<g data-name="StudyAnalyzeController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
+							<rect x="73637.5" y="1181.5" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
+							<path d="M73637.5 1212.5 L73838.5 1212.5" fill="none" data-name="StudyAnalyzeController"></path>
 						</g>
-						<g transform="translate(25504, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
+						<g transform="translate(73637.5, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
+								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25504, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(73637.5, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="25896.0" y="1628.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M25896.0 1659.5 L26248.0 1659.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M25896.0 1705.5 L26248.0 1705.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+					<g data-name="StudyDesignInterventionsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
+							<rect x="34199.5" y="3469.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
+							<path d="M34199.5 3500.5 L34495.5 3500.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
 						</g>
-						<g transform="translate(25896, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
+						<g transform="translate(34199.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25896, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
+						<g transform="translate(34199.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25896, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
+					</g>
+					<g data-name="StudyDesignPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
+							<rect x="36176.5" y="2594.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
+							<path d="M36176.5 2625.0 L36388.5 2625.0" fill="none" data-name="StudyDesignPageWidget"></path>
+						</g>
+						<g transform="translate(36176.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
+								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="26288.0" y="1651.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M26288.0 1682.0 L26640.0 1682.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M26288.0 1713.0 L26640.0 1713.0" fill="none" data-name="BoolQuestionFormView"></path>
-						</g>
-						<g transform="translate(26288, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
+						<g transform="translate(36176.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26288, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+					</g>
+					<g data-name="InterventionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
+							<rect x="29325.8" y="1666.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
+							<path d="M29325.8 1697.5 L29700.8 1697.5" fill="none" data-name="InterventionFormView"></path>
+						</g>
+						<g transform="translate(29325.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
+								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26288, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+						<g transform="translate(29325.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="26680.0" y="1651.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M26680.0 1682.0 L27032.0 1682.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M26680.0 1713.0 L27032.0 1713.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+					<g data-name="InterventionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
+							<rect x="57557.0" y="2391.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
+							<path d="M57557.0 2422.0 L58412.0 2422.0" fill="none" data-name="InterventionFormViewModel"></path>
+							<path d="M57557.0 2648.0 L58412.0 2648.0" fill="none" data-name="InterventionFormViewModel"></path>
 						</g>
-						<g transform="translate(26680, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
+						<g transform="translate(57557, 2391)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
+								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26680, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(57557, 2422)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26680, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
+						<g transform="translate(57557, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="27072.0" y="1651.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M27072.0 1682.0 L27424.0 1682.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M27072.0 1713.0 L27424.0 1713.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+					<g data-name="InterventionPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
+							<rect x="25925.8" y="1651.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
+							<path d="M25925.8 1682.0 L26255.8 1682.0" fill="none" data-name="InterventionPreview"></path>
+							<path d="M25925.8 1713.0 L26255.8 1713.0" fill="none" data-name="InterventionPreview"></path>
 						</g>
-						<g transform="translate(27072, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
+						<g transform="translate(25925.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27072, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(25925.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27072, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
+						<g transform="translate(25925.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="27464.0" y="1651.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M27464.0 1682.0 L27816.0 1682.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M27464.0 1713.0 L27816.0 1713.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+					<g data-name="StudyScheduleFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
+							<rect x="81195.5" y="1158.5" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
+							<path d="M81195.5 1189.5 L81554.5 1189.5" fill="none" data-name="StudyScheduleFormView"></path>
+							<path d="M81195.5 1220.5 L81554.5 1220.5" fill="none" data-name="StudyScheduleFormView"></path>
 						</g>
-						<g transform="translate(27464, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
+						<g transform="translate(81195.5, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
+								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27464, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(81195.5, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27464, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
+						<g transform="translate(81195.5, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="83574.8" y="1158.5" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M83574.8 1189.5 L84006.8 1189.5" fill="none" data-name="ScheduleControls"></path>
-							<path d="M83574.8 1220.5 L84006.8 1220.5" fill="none" data-name="ScheduleControls"></path>
-						</g>
-						<g transform="translate(83574.75, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
-								
-							</g>
+					<g data-name="StudyScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
+							<rect x="80996.0" y="1501.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
+							<path d="M80996.0 1532.0 L81754.0 1532.0" fill="none" data-name="StudyScheduleControls"></path>
+							<path d="M80996.0 1833.0 L81754.0 1833.0" fill="none" data-name="StudyScheduleControls"></path>
 						</g>
-						<g transform="translate(83574.75, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
+						<g transform="translate(80996, 1501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
+								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83574.75, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
+						<g transform="translate(80996, 1532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="58596.0" y="2609.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
-						</g>
-						<g transform="translate(58596, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
+						<g transform="translate(80996, 1833)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="72376.5" y="1516.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M72376.5 1547.0 L73072.5 1547.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M72376.5 1758.0 L73072.5 1758.0" fill="none" data-name="StudyFormViewModel"></path>
+					<g data-name="InterventionTaskFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
+							<rect x="55203.3" y="2541.0" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
+							<path d="M55203.3 2572.0 L55493.3 2572.0" fill="none" data-name="InterventionTaskFormData"></path>
+							<path d="M55203.3 2663.0 L55493.3 2663.0" fill="none" data-name="InterventionTaskFormData"></path>
 						</g>
-						<g transform="translate(72376.5, 1516)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
+						<g transform="translate(55203.25, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
+								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72376.5, 1547)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(55203.25, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72376.5, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
+						<g transform="translate(55203.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyAnalyzeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
-							<rect x="22662.3" y="2586.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
-							<path d="M22662.3 2617.5 L22842.3 2617.5" fill="none" data-name="StudyAnalyzeScreen"></path>
-						</g>
-						<g transform="translate(22662.25, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
-								
-							</g>
+					<g data-name="IFormDataWithSchedule">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
+							<rect x="55751.0" y="1613.5" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
+							<path d="M55751.0 1644.5 L56049.0 1644.5" fill="none" data-name="IFormDataWithSchedule"></path>
+							<path d="M55751.0 1750.5 L56049.0 1750.5" fill="none" data-name="IFormDataWithSchedule"></path>
 						</g>
-						<g transform="translate(22662.25, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
+						<g transform="translate(55751, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
+								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyAnalyzeController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
-							<rect x="60398.8" y="1181.5" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
-							<path d="M60398.8 1212.5 L60599.8 1212.5" fill="none" data-name="StudyAnalyzeController"></path>
-						</g>
-						<g transform="translate(60398.75, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
-								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
+						<g transform="translate(55751, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60398.75, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
+						<g transform="translate(55751, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyMonitorScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="22882.3" y="2594.0" height="62.0" width="176.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M22882.3 2625.0 L23058.3 2625.0" fill="none" data-name="StudyMonitorScreen"></path>
-						</g>
-						<g transform="translate(22882.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
-								
-							</g>
+					<g data-name="InterventionsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
+							<rect x="68261.0" y="2436.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
+							<path d="M68261.0 2467.0 L69100.0 2467.0" fill="none" data-name="InterventionsFormViewModel"></path>
+							<path d="M68261.0 2618.0 L69100.0 2618.0" fill="none" data-name="InterventionsFormViewModel"></path>
 						</g>
-						<g transform="translate(22882.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
+						<g transform="translate(68261, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
+								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudiesTableItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
-							<rect x="37812.0" y="2526.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
-							<path d="M37812.0 2557.5 L38212.0 2557.5" fill="none" data-name="StudiesTableItem"></path>
-						</g>
-						<g transform="translate(37812, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
-								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
+						<g transform="translate(68261, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37812, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
+						<g transform="translate(68261, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(Study, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
-							<rect x="37542.0" y="3485.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
+					<g data-name="InterventionTaskFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
+							<rect x="60716.3" y="2488.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
+							<path d="M60716.3 2519.5 L61412.3 2519.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<path d="M60716.3 2700.5 L61412.3 2700.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
 						</g>
-						<g transform="translate(37542, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
+						<g transform="translate(60716.25, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(Study)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
-							<rect x="38271.0" y="3485.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
-						</g>
-						<g transform="translate(38271, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
+						<g transform="translate(60716.25, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="DashboardController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
-							<rect x="67379.5" y="2436.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
-							<path d="M67379.5 2467.0 L67993.5 2467.0" fill="none" data-name="DashboardController"></path>
-							<path d="M67379.5 2588.0 L67993.5 2588.0" fill="none" data-name="DashboardController"></path>
-						</g>
-						<g transform="translate(67379.5, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
-								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
+						<g transform="translate(60716.25, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67379.5, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
+					</g>
+					<g data-name="WithScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
+							<rect x="82429.3" y="1546.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
+							<path d="M82429.3 1577.0 L82924.3 1577.0" fill="none" data-name="WithScheduleControls"></path>
+							<path d="M82429.3 1803.0 L82924.3 1803.0" fill="none" data-name="WithScheduleControls"></path>
+						</g>
+						<g transform="translate(82429.25, 1546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
+								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67379.5, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
+						<g transform="translate(82429.25, 1577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SearchController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="57510.5" y="3469.5" height="62.0" width="258.0" data-name="SearchController"></rect>
-							<path d="M57510.5 3500.5 L57768.5 3500.5" fill="none" data-name="SearchController"></path>
-						</g>
-						<g transform="translate(57510.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
+						<g transform="translate(82429.25, 1803)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57510.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SearchController">
-								<text x="0.0" y="13.5" stroke="none" data-name="SearchController">+setText: void Function(String)</text>
+					</g>
+					<g data-name="PhaseSequence">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
+							<rect x="66539.5" y="3828.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
+						</g>
+						<g transform="translate(66539.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
+								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumnSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
-							<rect x="73591.8" y="75.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
-							<path d="M73591.8 106.0 L73816.8 106.0" fill="none" data-name="StudiesTableColumnSize"></path>
-							<path d="M73591.8 167.0 L73816.8 167.0" fill="none" data-name="StudiesTableColumnSize"></path>
+					<g data-name="InterventionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
+							<rect x="44758.0" y="1598.5" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
+							<path d="M44758.0 1629.5 L45140.0 1629.5" fill="none" data-name="InterventionFormData"></path>
+							<path d="M44758.0 1750.5 L45140.0 1750.5" fill="none" data-name="InterventionFormData"></path>
 						</g>
-						<g transform="translate(73591.75, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
+						<g transform="translate(44758, 1598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
+								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73591.75, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
+						<g transform="translate(44758, 1629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73591.75, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
+						<g transform="translate(44758, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
-							<rect x="28210.3" y="1553.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
-							<path d="M28210.3 1584.5 L28690.3 1584.5" fill="none" data-name="StudiesTable"></path>
-							<path d="M28210.3 1795.5 L28690.3 1795.5" fill="none" data-name="StudiesTable"></path>
+					<g data-name="StudyScheduleFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
+							<rect x="45892.3" y="3401.5" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
+							<path d="M45892.3 3432.5 L46188.3 3432.5" fill="none" data-name="StudyScheduleFormData"></path>
+							<path d="M45892.3 3538.5 L46188.3 3538.5" fill="none" data-name="StudyScheduleFormData"></path>
 						</g>
-						<g transform="translate(28210.25, 1553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
-								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
+						<g transform="translate(45892.25, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28210.25, 1584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
+						<g transform="translate(45892.25, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28210.25, 1795.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
+						<g transform="translate(45892.25, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
-							<rect x="27604.5" y="2609.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
+					<g data-name="IStudyFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
+							<rect x="49374.5" y="1666.5" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
+							<path d="M49374.5 1697.5 L49517.5 1697.5" fill="none" data-name="IStudyFormData"></path>
 						</g>
-						<g transform="translate(27604.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
+						<g transform="translate(49374.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
+								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<rect x="28127.5" y="2609.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
-						</g>
-						<g transform="translate(28127.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
+						<g transform="translate(49374.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
-							<rect x="1644.0" y="3394.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
-							<path d="M1644.0 3425.5 L2005.0 3425.5" fill="none" data-name="StudiesTableColumn"></path>
+					<g data-name="InterventionTaskFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
+							<rect x="41046.3" y="1666.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
+							<path d="M41046.3 1697.5 L41459.3 1697.5" fill="none" data-name="InterventionTaskFormView"></path>
 						</g>
-						<g transform="translate(1644, 3394.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
-								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
+						<g transform="translate(41046.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1644, 3425.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
+						<g transform="translate(41046.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="38705.5" y="2594.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
-							<path d="M38705.5 2625.0 L38883.5 2625.0" fill="none" data-name="DashboardScreen"></path>
+					<g data-name="InterventionsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
+							<rect x="47496.0" y="2556.0" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
+							<path d="M47496.0 2587.0 L47890.0 2587.0" fill="none" data-name="InterventionsFormData"></path>
+							<path d="M47496.0 2648.0 L47890.0 2648.0" fill="none" data-name="InterventionsFormData"></path>
 						</g>
-						<g transform="translate(38705.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
+						<g transform="translate(47496, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
+								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38705.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
+						<g transform="translate(47496, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(47496, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesFilter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
-							<rect x="18930.8" y="3462.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
-							<path d="M18930.8 3493.0 L19226.8 3493.0" fill="none" data-name="StudiesFilter"></path>
+					<g data-name="StudyDesignReportsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
+							<rect x="34535.5" y="3462.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
+							<path d="M34535.5 3493.0 L34928.5 3493.0" fill="none" data-name="StudyDesignReportsFormView"></path>
 						</g>
-						<g transform="translate(18930.75, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
+						<g transform="translate(34535.5, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
+								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18930.75, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
+						<g transform="translate(34535.5, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
-							<rect x="38923.5" y="2571.0" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
-							<path d="M38923.5 2602.0 L39266.5 2602.0" fill="none" data-name="DashboardScaffold"></path>
-							<path d="M38923.5 2648.0 L39266.5 2648.0" fill="none" data-name="DashboardScaffold"></path>
+					<g data-name="ReportItemFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
+							<rect x="45180.0" y="1628.5" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
+							<path d="M45180.0 1659.5 L45494.0 1659.5" fill="none" data-name="ReportItemFormData"></path>
+							<path d="M45180.0 1720.5 L45494.0 1720.5" fill="none" data-name="ReportItemFormData"></path>
 						</g>
-						<g transform="translate(38923.5, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
-								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
+						<g transform="translate(45180, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
+								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38923.5, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
+						<g transform="translate(45180, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38923.5, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
+						<g transform="translate(45180, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumnHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
-							<rect x="47028.5" y="3782.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
-							<path d="M47028.5 3813.5 L47265.5 3813.5" fill="none" data-name="StudiesTableColumnHeader"></path>
+					<g data-name="ReportSection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
+							<rect x="45273.0" y="2609.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
 						</g>
-						<g transform="translate(47028.5, 3782.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
-								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
+						<g transform="translate(45273, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
+								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47028.5, 3813.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
+					</g>
+					<g data-name="DataReferenceEditor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
+							<rect x="45768.0" y="2556.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
+							<path d="M45768.0 2587.0 L46477.0 2587.0" fill="none" data-name="DataReferenceEditor"></path>
+							<path d="M45768.0 2648.0 L46477.0 2648.0" fill="none" data-name="DataReferenceEditor"></path>
+						</g>
+						<g transform="translate(45768, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
+								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AccountSettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
-							<rect x="27856.0" y="1666.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
-							<path d="M27856.0 1697.5 L28050.0 1697.5" fill="none" data-name="AccountSettingsDialog"></path>
-						</g>
-						<g transform="translate(27856, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
+						<g transform="translate(45768, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27856, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
+						<g transform="translate(45768, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInvitesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="72636.8" y="45.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M72636.8 76.0 L73202.8 76.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M72636.8 182.0 L73202.8 182.0" fill="none" data-name="StudyInvitesTable"></path>
+					<g data-name="ReactiveDropdownField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
+							<rect x="45038.5" y="3485.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
 						</g>
-						<g transform="translate(72636.75, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
-								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
+						<g transform="translate(45038.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
+								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72636.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
+					</g>
+					<g data-name="TemporalAggregationFormatted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
+							<rect x="46517.0" y="2518.5" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
+							<path d="M46517.0 2549.5 L46965.0 2549.5" fill="none" data-name="TemporalAggregationFormatted"></path>
+							<path d="M46517.0 2655.5 L46965.0 2655.5" fill="none" data-name="TemporalAggregationFormatted"></path>
+						</g>
+						<g transform="translate(46517, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
+								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72636.75, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
+						<g transform="translate(46517, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="72260.0" y="614.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(72260, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
+						<g transform="translate(46517, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="72522.0" y="614.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
+					<g data-name="TemporalAggregation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
+							<rect x="45281.5" y="3485.0" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
 						</g>
-						<g transform="translate(72522, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+						<g transform="translate(45281.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
+								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Intervention? Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="73024.8" y="614.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
+					<g data-name="ImprovementDirectionFormatted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
+							<rect x="47005.0" y="2518.5" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
+							<path d="M47005.0 2549.5 L47456.0 2549.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
+							<path d="M47005.0 2655.5 L47456.0 2655.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
 						</g>
-						<g transform="translate(73024.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
+						<g transform="translate(47005, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
+								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="int Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="73315.8" y="614.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
+						<g transform="translate(47005, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
+								
+							</g>
 						</g>
-						<g transform="translate(73315.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
+						<g transform="translate(47005, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRecruitController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="72644.3" y="1121.0" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M72644.3 1152.0 L73295.3 1152.0" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M72644.3 1198.0 L73295.3 1198.0" fill="none" data-name="StudyRecruitController"></path>
+					<g data-name="ImprovementDirection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
+							<rect x="46911.3" y="3485.0" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
 						</g>
-						<g transform="translate(72644.25, 1121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
-								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
+						<g transform="translate(46911.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
+								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72644.25, 1152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
+					</g>
+					<g data-name="ReportSectionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
+							<rect x="13698.5" y="3447.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
+							<path d="M13698.5 3478.0 L14081.5 3478.0" fill="none" data-name="ReportSectionType"></path>
+						</g>
+						<g transform="translate(13698.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
+								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72644.25, 1198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
+						<g transform="translate(13698.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="81099.8" y="1023.5" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M81099.8 1054.5 L81766.8 1054.5" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M81099.8 1280.5 L81766.8 1280.5" fill="none" data-name="InviteCodeFormViewModel"></path>
+					<g data-name="AverageSectionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
+							<rect x="26295.8" y="1636.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
+							<path d="M26295.8 1667.0 L26774.8 1667.0" fill="none" data-name="AverageSectionFormView"></path>
+							<path d="M26295.8 1728.0 L26774.8 1728.0" fill="none" data-name="AverageSectionFormView"></path>
 						</g>
-						<g transform="translate(81099.75, 1023.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
-								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
+						<g transform="translate(26295.75, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81099.75, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
+						<g transform="translate(26295.75, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81099.75, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
+						<g transform="translate(26295.75, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrolledBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="74029.8" y="90.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M74029.8 121.0 L74195.8 121.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M74029.8 152.0 L74195.8 152.0" fill="none" data-name="EnrolledBadge"></path>
+					<g data-name="ReportItemFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
+							<rect x="38452.5" y="2338.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
+							<path d="M38452.5 2369.5 L39439.5 2369.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<path d="M38452.5 2805.5 L39439.5 2805.5" fill="none" data-name="ReportItemFormViewModel"></path>
 						</g>
-						<g transform="translate(74029.75, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
+						<g transform="translate(38452.5, 2338.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
+								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74029.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
+						<g transform="translate(38452.5, 2369.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74029.75, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
+						<g transform="translate(38452.5, 2805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
-							<rect x="83830.8" y="575.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
-							<path d="M83830.8 606.5 L84268.8 606.5" fill="none" data-name="InviteCodeFormView"></path>
-							<path d="M83830.8 637.5 L84268.8 637.5" fill="none" data-name="InviteCodeFormView"></path>
+					<g data-name="DataReferenceIdentifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
+							<rect x="79224.3" y="583.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
+							<path d="M79224.3 614.0 L79428.3 614.0" fill="none" data-name="DataReferenceIdentifier"></path>
+							<path d="M79224.3 645.0 L79428.3 645.0" fill="none" data-name="DataReferenceIdentifier"></path>
 						</g>
-						<g transform="translate(83830.75, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
-								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
+						<g transform="translate(79224.25, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
+								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83830.75, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
+						<g transform="translate(79224.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83830.75, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
+						<g transform="translate(79224.25, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRecruitScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="23098.3" y="2571.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M23098.3 2602.5 L23412.3 2602.5" fill="none" data-name="StudyRecruitScreen"></path>
-						</g>
-						<g transform="translate(23098.25, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
-								
-							</g>
+					<g data-name="DataReference">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
+							<rect x="79258.8" y="121.0" height="31.0" width="135.0" data-name="DataReference"></rect>
 						</g>
-						<g transform="translate(23098.25, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
+						<g transform="translate(79258.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
+								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
-							<rect x="65754.0" y="1113.5" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
-							<path d="M65754.0 1144.5 L66199.0 1144.5" fill="none" data-name="DrawerEntry"></path>
-							<path d="M65754.0 1280.5 L66199.0 1280.5" fill="none" data-name="DrawerEntry"></path>
+					<g data-name="LinearRegressionSectionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
+							<rect x="26814.8" y="1636.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
+							<path d="M26814.8 1667.0 L27293.8 1667.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<path d="M26814.8 1728.0 L27293.8 1728.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
 						</g>
-						<g transform="translate(65754, 1113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
-								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
+						<g transform="translate(26814.75, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65754, 1144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DrawerEntry">+localizedHelpText: String Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DrawerEntry">+enabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DrawerEntry">+onSelected: void Function(BuildContext, WidgetRef)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DrawerEntry">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DrawerEntry">+title: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DrawerEntry">+helpText: String?</text>
+						<g transform="translate(26814.75, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65754, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
+						<g transform="translate(26814.75, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="String Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
-							<rect x="64512.5" y="1682.0" height="31.0" width="147.0" data-name="String Function()"></rect>
+					<g data-name="ReportItemFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
+							<rect x="41809.3" y="1613.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
+							<path d="M41809.3 1644.5 L42276.3 1644.5" fill="none" data-name="ReportItemFormView"></path>
+							<path d="M41809.3 1720.5 L42276.3 1720.5" fill="none" data-name="ReportItemFormView"></path>
 						</g>
-						<g transform="translate(64512.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
-								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
+						<g transform="translate(41809.25, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
+								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="String Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
-							<rect x="65676.5" y="1682.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
-						</g>
-						<g transform="translate(65676.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
+						<g transform="translate(41809.25, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(BuildContext, WidgetRef)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
-							<rect x="65873.5" y="1682.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
-						</g>
-						<g transform="translate(65873.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
-								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
+						<g transform="translate(41809.25, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="GoRouterDrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
-							<rect x="66249.5" y="1643.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
-							<path d="M66249.5 1674.5 L66513.5 1674.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-							<path d="M66249.5 1720.5 L66513.5 1720.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+					<g data-name="ReportsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
+							<rect x="64778.3" y="2451.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
+							<path d="M64778.3 2482.0 L65638.3 2482.0" fill="none" data-name="ReportsFormViewModel"></path>
+							<path d="M64778.3 2648.0 L65638.3 2648.0" fill="none" data-name="ReportsFormViewModel"></path>
 						</g>
-						<g transform="translate(66249.5, 1643.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
+						<g transform="translate(64778.25, 2451)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
+								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(66249.5, 1674.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
+						<g transform="translate(64778.25, 2482)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(66249.5, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
+						<g transform="translate(64778.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppDrawer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
-							<rect x="74235.8" y="53.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
-							<path d="M74235.8 84.0 L74504.8 84.0" fill="none" data-name="AppDrawer"></path>
+					<g data-name="ReportFormItemDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
+							<rect x="65810.0" y="1591.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
+							<path d="M65810.0 1622.0 L66653.0 1622.0" fill="none" data-name="ReportFormItemDelegate"></path>
+							<path d="M65810.0 1698.0 L66653.0 1698.0" fill="none" data-name="ReportFormItemDelegate"></path>
 						</g>
-						<g transform="translate(74235.75, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
-								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
+						<g transform="translate(65810, 1591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
+								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74235.75, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppDrawer">+leftPaddingEntries: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppDrawer">+logoPaddingVertical: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppDrawer">+logoPaddingHorizontal: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AppDrawer">+logoMaxHeight: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AppDrawer">+logoSectionMinHeight: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AppDrawer">+logoSectionMaxHeight: double</text>
+						<g transform="translate(65810, 1622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
+								
+							</g>
+						</g>
+						<g transform="translate(65810, 1698)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationDispatcher">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDispatcher">
-							<rect x="39535.5" y="2564.0" height="122.0" width="325.0" data-name="NotificationDispatcher"></rect>
-							<path d="M39535.5 2595.0 L39860.5 2595.0" fill="none" data-name="NotificationDispatcher"></path>
+					<g data-name="ReportBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
+							<rect x="48983.0" y="2556.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
+							<path d="M48983.0 2587.0 L49180.0 2587.0" fill="none" data-name="ReportBadge"></path>
+							<path d="M48983.0 2663.0 L49180.0 2663.0" fill="none" data-name="ReportBadge"></path>
 						</g>
-						<g transform="translate(39535.5, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDispatcher">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDispatcher">
-								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDispatcher">NotificationDispatcher</text>
+						<g transform="translate(48983, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39535.5, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDispatcher">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDispatcher">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDispatcher">+child: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationDispatcher">+snackbarInnerPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationDispatcher">+snackbarWidth: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationDispatcher">+snackbarBehavior: SnackBarBehavior</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationDispatcher">+snackbarDefaultDuration: int</text>
+						<g transform="translate(48983, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SnackBarBehavior">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SnackBarBehavior">
-							<rect x="39387.3" y="3485.0" height="31.0" width="162.0" data-name="SnackBarBehavior"></rect>
-						</g>
-						<g transform="translate(39387.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackBarBehavior">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackBarBehavior">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackBarBehavior">SnackBarBehavior</text>
+						<g transform="translate(48983, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Notifications">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Notifications">
-							<rect x="39900.5" y="2541.5" height="167.0" width="407.0" data-name="Notifications"></rect>
-							<path d="M39900.5 2572.5 L40307.5 2572.5" fill="none" data-name="Notifications"></path>
+					<g data-name="ReportStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
+							<rect x="20608.5" y="3447.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
+							<path d="M20608.5 3478.0 L20909.5 3478.0" fill="none" data-name="ReportStatus"></path>
 						</g>
-						<g transform="translate(39900.5, 2541.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Notifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notifications">
-								<text x="195.5" y="13.5" stroke="none" text-anchor="middle" data-name="Notifications">Notifications</text>
+						<g transform="translate(20608.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
+								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39900.5, 2572.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Notifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Notifications">
-								<text x="0.0" y="13.5" stroke="none" data-name="Notifications">&lt;static&gt;+credentialsInvalid: SnackbarIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Notifications">&lt;static&gt;+userAlreadyRegistered: SnackbarIntent</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordReset: SnackbarIntent</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordResetSuccess: SnackbarIntent</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleted: SnackbarIntent</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeDeleted: SnackbarIntent</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeClipped: SnackbarIntent</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleteConfirmation: AlertIntent</text>
+						<g transform="translate(20608.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SnackbarIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SnackbarIntent">
-							<rect x="39716.3" y="3469.5" height="62.0" width="136.0" data-name="SnackbarIntent"></rect>
-							<path d="M39716.3 3500.5 L39852.3 3500.5" fill="none" data-name="SnackbarIntent"></path>
+					<g data-name="ReportsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
+							<rect x="49220.0" y="2563.5" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
+							<path d="M49220.0 2594.5 L49558.0 2594.5" fill="none" data-name="ReportsFormData"></path>
+							<path d="M49220.0 2640.5 L49558.0 2640.5" fill="none" data-name="ReportsFormData"></path>
 						</g>
-						<g transform="translate(39716.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackbarIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackbarIntent">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackbarIntent">SnackbarIntent</text>
+						<g transform="translate(49220, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
+								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39716.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SnackbarIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SnackbarIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="SnackbarIntent">+duration: int?</text>
+						<g transform="translate(49220, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AlertIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AlertIntent">
-							<rect x="40215.8" y="3454.5" height="92.0" width="204.0" data-name="AlertIntent"></rect>
-							<path d="M40215.8 3485.5 L40419.8 3485.5" fill="none" data-name="AlertIntent"></path>
-						</g>
-						<g transform="translate(40215.75, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AlertIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AlertIntent">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="AlertIntent">AlertIntent</text>
+						<g transform="translate(49220, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40215.75, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AlertIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AlertIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="AlertIntent">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AlertIntent">+dismissOnAction: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AlertIntent">+isDestructive: dynamic</text>
+					</g>
+					<g data-name="StudyInfoFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
+							<rect x="71210.8" y="2383.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
+							<path d="M71210.8 2414.5 L71906.8 2414.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+							<path d="M71210.8 2820.5 L71906.8 2820.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+						</g>
+						<g transform="translate(71210.75, 2383.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="NotificationDefaultActions">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDefaultActions">
-							<rect x="42617.5" y="3469.5" height="62.0" width="287.0" data-name="NotificationDefaultActions"></rect>
-							<path d="M42617.5 3500.5 L42904.5 3500.5" fill="none" data-name="NotificationDefaultActions"></path>
-						</g>
-						<g transform="translate(42617.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDefaultActions">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDefaultActions">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDefaultActions">NotificationDefaultActions</text>
+						<g transform="translate(71210.75, 2414.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42617.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDefaultActions">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDefaultActions">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDefaultActions">&lt;static&gt;+cancel: NotificationAction</text>
+						<g transform="translate(71210.75, 2820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationAction">
-							<rect x="42633.0" y="3797.5" height="92.0" width="256.0" data-name="NotificationAction"></rect>
-							<path d="M42633.0 3828.5 L42889.0 3828.5" fill="none" data-name="NotificationAction"></path>
+					<g data-name="StudyDesignInfoFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
+							<rect x="34968.5" y="3469.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
+							<path d="M34968.5 3500.5 L35191.5 3500.5" fill="none" data-name="StudyDesignInfoFormView"></path>
 						</g>
-						<g transform="translate(42633, 3797.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationAction">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationAction">NotificationAction</text>
+						<g transform="translate(34968.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
+								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42633, 3828.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationAction">+label: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationAction">+onSelect: dynamic Function()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationAction">+isDestructive: bool</text>
+						<g transform="translate(34968.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationIntent">
-							<rect x="40547.8" y="2548.5" height="153.0" width="288.0" data-name="NotificationIntent"></rect>
-							<path d="M40547.8 2579.5 L40835.8 2579.5" fill="none" data-name="NotificationIntent"></path>
-							<path d="M40547.8 2670.5 L40835.8 2670.5" fill="none" data-name="NotificationIntent"></path>
+					<g data-name="StudyInfoFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
+							<rect x="49598.0" y="2541.0" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
+							<path d="M49598.0 2572.0 L50012.0 2572.0" fill="none" data-name="StudyInfoFormData"></path>
+							<path d="M49598.0 2663.0 L50012.0 2663.0" fill="none" data-name="StudyInfoFormData"></path>
 						</g>
-						<g transform="translate(40547.75, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationIntent">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationIntent">NotificationIntent</text>
+						<g transform="translate(49598, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
+								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40547.75, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+message: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationIntent">+customContent: Widget?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationIntent">+icon: IconData?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationIntent">+actions: List&lt;NotificationAction&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationIntent">+type: NotificationType</text>
+						<g transform="translate(49598, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40547.75, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+void register()</text>
+						<g transform="translate(49598, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationType">
-							<rect x="20301.8" y="3439.5" height="122.0" width="325.0" data-name="NotificationType"></rect>
-							<path d="M20301.8 3470.5 L20626.8 3470.5" fill="none" data-name="NotificationType"></path>
-						</g>
-						<g transform="translate(20301.75, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationType">
-								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationType">NotificationType</text>
-								
-							</g>
+					<g data-name="StudyContactInfoFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
+							<rect x="49754.5" y="3386.5" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
+							<path d="M49754.5 3417.5 L50102.5 3417.5" fill="none" data-name="StudyContactInfoFormData"></path>
+							<path d="M49754.5 3568.5 L50102.5 3568.5" fill="none" data-name="StudyContactInfoFormData"></path>
 						</g>
-						<g transform="translate(20301.75, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationType">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationType">&lt;static&gt;+values: List&lt;NotificationType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationType">&lt;static&gt;+snackbar: NotificationType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationType">&lt;static&gt;+alert: NotificationType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationType">&lt;static&gt;+custom: NotificationType</text>
+						<g transform="translate(49754.5, 3386.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
+								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IClipboardService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IClipboardService">
-							<rect x="74544.8" y="105.5" height="62.0" width="156.0" data-name="IClipboardService"></rect>
-							<path d="M74544.8 136.5 L74700.8 136.5" fill="none" data-name="IClipboardService"></path>
-						</g>
-						<g transform="translate(74544.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IClipboardService">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="IClipboardService">IClipboardService</text>
+						<g transform="translate(49754.5, 3417.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74544.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IClipboardService">
-								<text x="0.0" y="13.5" stroke="none" data-name="IClipboardService">+dynamic copy()</text>
+						<g transform="translate(49754.5, 3568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ClipboardService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ClipboardService">
-							<rect x="74547.3" y="598.5" height="62.0" width="151.0" data-name="ClipboardService"></rect>
-							<path d="M74547.3 629.5 L74698.3 629.5" fill="none" data-name="ClipboardService"></path>
+					<g data-name="StudyFormValidationSet">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
+							<rect x="2051.0" y="3462.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
+							<path d="M2051.0 3493.0 L2438.0 3493.0" fill="none" data-name="StudyFormValidationSet"></path>
 						</g>
-						<g transform="translate(74547.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ClipboardService">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="ClipboardService">ClipboardService</text>
+						<g transform="translate(2051, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
+								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74547.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ClipboardService">
-								<text x="0.0" y="13.5" stroke="none" data-name="ClipboardService">+dynamic copy()</text>
+						<g transform="translate(2051, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationService">
-							<rect x="40690.8" y="3774.5" height="138.0" width="455.0" data-name="NotificationService"></rect>
-							<path d="M40690.8 3805.5 L41145.8 3805.5" fill="none" data-name="NotificationService"></path>
-							<path d="M40690.8 3836.5 L41145.8 3836.5" fill="none" data-name="NotificationService"></path>
+					<g data-name="MeasurementsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
+							<rect x="50092.0" y="2563.5" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
+							<path d="M50092.0 2594.5 L50586.0 2594.5" fill="none" data-name="MeasurementsFormData"></path>
+							<path d="M50092.0 2640.5 L50586.0 2640.5" fill="none" data-name="MeasurementsFormData"></path>
 						</g>
-						<g transform="translate(40690.75, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationService">
-								<text x="219.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationService">NotificationService</text>
+						<g transform="translate(50092, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
+								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40690.75, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">-_streamController: BehaviorSubject&lt;NotificationIntent&gt;</text>
+						<g transform="translate(50092, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40690.75, 3836.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationService">+void showMessage()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationService">+void show()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationService">+void dispose()</text>
+						<g transform="translate(50092, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Assets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Assets">
-							<rect x="74740.8" y="105.5" height="62.0" width="218.0" data-name="Assets"></rect>
-							<path d="M74740.8 136.5 L74958.8 136.5" fill="none" data-name="Assets"></path>
+					<g data-name="MeasurementSurveyFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
+							<rect x="42356.3" y="1666.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
+							<path d="M42356.3 1697.5 L42800.3 1697.5" fill="none" data-name="MeasurementSurveyFormView"></path>
 						</g>
-						<g transform="translate(74740.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Assets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Assets">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="Assets">Assets</text>
+						<g transform="translate(42356.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
+								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74740.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Assets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Assets">
-								<text x="0.0" y="13.5" stroke="none" data-name="Assets">&lt;static&gt;+logoWide: String</text>
+						<g transform="translate(42356.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Hyperlink">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Hyperlink">
-							<rect x="41281.5" y="2519.0" height="212.0" width="222.0" data-name="Hyperlink"></rect>
-							<path d="M41281.5 2550.0 L41503.5 2550.0" fill="none" data-name="Hyperlink"></path>
+					<g data-name="MeasurementSurveyFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
+							<rect x="62772.3" y="2413.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
+							<path d="M62772.3 2444.5 L63468.3 2444.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+							<path d="M62772.3 2670.5 L63468.3 2670.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
 						</g>
-						<g transform="translate(41281.5, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Hyperlink">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Hyperlink">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="Hyperlink">Hyperlink</text>
+						<g transform="translate(62772.25, 2413.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41281.5, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Hyperlink">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Hyperlink">
-								<text x="0.0" y="13.5" stroke="none" data-name="Hyperlink">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Hyperlink">+url: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Hyperlink">+onClick: void Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Hyperlink">+linkColor: Color</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Hyperlink">+hoverColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Hyperlink">+visitedColor: Color?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Hyperlink">+style: TextStyle?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Hyperlink">+hoverStyle: TextStyle?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Hyperlink">+visitedStyle: TextStyle?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Hyperlink">+icon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Hyperlink">+iconSize: double?</text>
+						<g transform="translate(62772.25, 2444.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="TextStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
-							<rect x="48536.0" y="3485.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
-						</g>
-						<g transform="translate(48536, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
-								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
+						<g transform="translate(62772.25, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StandardTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableColumn">
-							<rect x="37171.5" y="2556.5" height="137.0" width="287.0" data-name="StandardTableColumn"></rect>
-							<path d="M37171.5 2587.5 L37458.5 2587.5" fill="none" data-name="StandardTableColumn"></path>
+					<g data-name="SurveyPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
+							<rect x="27333.8" y="1651.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
+							<path d="M27333.8 1682.0 L27677.8 1682.0" fill="none" data-name="SurveyPreview"></path>
+							<path d="M27333.8 1713.0 L27677.8 1713.0" fill="none" data-name="SurveyPreview"></path>
 						</g>
-						<g transform="translate(37171.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableColumn">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableColumn">StandardTableColumn</text>
+						<g transform="translate(27333.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37171.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableColumn">+label: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableColumn">+tooltip: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableColumn">+columnWidth: TableColumnWidth</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableColumn">+sortable: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardTableColumn">+sortAscending: bool?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardTableColumn">+sortableIcon: Widget?</text>
+						<g transform="translate(27333.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="TableColumnWidth">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TableColumnWidth">
-							<rect x="36779.3" y="3485.0" height="31.0" width="165.0" data-name="TableColumnWidth"></rect>
-						</g>
-						<g transform="translate(36779.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TableColumnWidth">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableColumnWidth">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableColumnWidth">TableColumnWidth</text>
+						<g transform="translate(27333.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StandardTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTable">
-							<rect x="37373.8" y="1501.5" height="392.0" width="688.0" data-name="StandardTable"></rect>
-							<path d="M37373.8 1532.5 L38061.8 1532.5" fill="none" data-name="StandardTable"></path>
+					<g data-name="MeasurementSurveyFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
+							<rect x="55533.3" y="2526.0" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
+							<path d="M55533.3 2557.0 L55942.3 2557.0" fill="none" data-name="MeasurementSurveyFormData"></path>
+							<path d="M55533.3 2678.0 L55942.3 2678.0" fill="none" data-name="MeasurementSurveyFormData"></path>
 						</g>
-						<g transform="translate(37373.75, 1501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTable">
-								<text x="336.0" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTable">StandardTable</text>
+						<g transform="translate(55533.25, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
+								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37373.75, 1532.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTable">+inputColumns: List&lt;StandardTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTable">+trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardTable">+trailingActionsMenuType: ActionMenuType?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardTable">+sortColumnPredicates: List&lt;int Function(T, T)?&gt;?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StandardTable">+pinnedPredicates: int Function(T, T)?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StandardTable">+headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StandardTable">+dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StandardTable">+inputTrailingActionsColumn: StandardTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StandardTable">+tableWrapper: Widget Function(Widget)?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StandardTable">+cellSpacing: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StandardTable">+rowSpacing: double</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StandardTable">+minRowHeight: double?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StandardTable">+showTableHeader: bool</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StandardTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StandardTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StandardTable">+trailingWidget: Widget?</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StandardTable">+leadingWidgetSpacing: double?</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StandardTable">+trailingWidgetSpacing: double?</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StandardTable">+emptyWidget: Widget?</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StandardTable">+rowStyle: StandardTableStyle</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StandardTable">+disableRowInteractions: bool</text>
+						<g transform="translate(55533.25, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-							<rect x="34894.5" y="2609.5" height="31.0" width="381.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?"></rect>
-						</g>
-						<g transform="translate(34894.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
+						<g transform="translate(55533.25, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ActionMenuType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuType">
-							<rect x="18099.8" y="3447.0" height="107.0" width="330.0" data-name="ActionMenuType"></rect>
-							<path d="M18099.8 3478.0 L18429.8 3478.0" fill="none" data-name="ActionMenuType"></path>
-						</g>
-						<g transform="translate(18099.75, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuType">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuType">ActionMenuType</text>
-								
-							</g>
+					<g data-name="QuestionnaireFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
+							<rect x="52519.0" y="3431.5" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
+							<path d="M52519.0 3462.5 L52887.0 3462.5" fill="none" data-name="QuestionnaireFormData"></path>
+							<path d="M52519.0 3508.5 L52887.0 3508.5" fill="none" data-name="QuestionnaireFormData"></path>
 						</g>
-						<g transform="translate(18099.75, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+values: List&lt;ActionMenuType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+inline: ActionMenuType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+popup: ActionMenuType</text>
+						<g transform="translate(52519, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
+								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="int Function(T, T)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(T, T)?">
-							<rect x="36408.5" y="2609.5" height="31.0" width="160.0" data-name="int Function(T, T)?"></rect>
-						</g>
-						<g transform="translate(36408.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(T, T)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(T, T)?">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(T, T)?">int Function(T, T)?</text>
+						<g transform="translate(52519, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<rect x="36608.5" y="2609.5" height="31.0" width="523.0" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?"></rect>
-						</g>
-						<g transform="translate(36608.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-								<text x="253.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
+						<g transform="translate(52519, 3508.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(Widget)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Widget)?">
-							<rect x="40459.8" y="3485.0" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
+					<g data-name="WithQuestionnaireControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
+							<rect x="63074.3" y="1568.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
+							<path d="M63074.3 1599.5 L63706.3 1599.5" fill="none" data-name="WithQuestionnaireControls"></path>
+							<path d="M63074.3 1705.5 L63706.3 1705.5" fill="none" data-name="WithQuestionnaireControls"></path>
 						</g>
-						<g transform="translate(40459.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Widget)?">
-								<text x="102.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Widget)?">Widget Function(Widget)?</text>
+						<g transform="translate(63074.25, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
+								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StandardTableStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableStyle">
-							<rect x="19266.8" y="3447.0" height="107.0" width="353.0" data-name="StandardTableStyle"></rect>
-							<path d="M19266.8 3478.0 L19619.8 3478.0" fill="none" data-name="StandardTableStyle"></path>
-						</g>
-						<g transform="translate(19266.75, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableStyle">
-								<text x="168.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableStyle">StandardTableStyle</text>
+						<g transform="translate(63074.25, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19266.75, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableStyle">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableStyle">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+values: List&lt;StandardTableStyle&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+plain: StandardTableStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+material: StandardTableStyle</text>
+						<g transform="translate(63074.25, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="HelpIcon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HelpIcon">
-							<rect x="74998.8" y="90.0" height="93.0" width="174.0" data-name="HelpIcon"></rect>
-							<path d="M74998.8 121.0 L75172.8 121.0" fill="none" data-name="HelpIcon"></path>
-							<path d="M74998.8 152.0 L75172.8 152.0" fill="none" data-name="HelpIcon"></path>
-						</g>
-						<g transform="translate(74998.75, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HelpIcon">
-								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="HelpIcon">HelpIcon</text>
-								
-							</g>
+					<g data-name="StudyDesignMeasurementsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
+							<rect x="35231.5" y="3469.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
+							<path d="M35231.5 3500.5 L35541.5 3500.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
 						</g>
-						<g transform="translate(74998.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
-								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+tooltipText: String?</text>
+						<g transform="translate(35231.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
+								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74998.75, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
-								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+Widget build()</text>
+						<g transform="translate(35231.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ErrorPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ErrorPage">
-							<rect x="29140.0" y="1651.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
-							<path d="M29140.0 1682.0 L29302.0 1682.0" fill="none" data-name="ErrorPage"></path>
-							<path d="M29140.0 1713.0 L29302.0 1713.0" fill="none" data-name="ErrorPage"></path>
+					<g data-name="MeasurementsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
+							<rect x="66914.8" y="2443.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
+							<path d="M66914.8 2474.5 L68006.8 2474.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+							<path d="M66914.8 2625.5 L68006.8 2625.5" fill="none" data-name="MeasurementsFormViewModel"></path>
 						</g>
-						<g transform="translate(29140, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ErrorPage">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="ErrorPage">ErrorPage</text>
+						<g transform="translate(66914.75, 2443.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
+								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29140, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+error: Exception?</text>
+						<g transform="translate(66914.75, 2474.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29140, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+Widget build()</text>
+						<g transform="translate(66914.75, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SplashPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SplashPage">
-							<rect x="75212.8" y="105.5" height="62.0" width="136.0" data-name="SplashPage"></rect>
-							<path d="M75212.8 136.5 L75348.8 136.5" fill="none" data-name="SplashPage"></path>
+					<g data-name="StudyFormScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
+							<rect x="27488.8" y="2563.5" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
+							<path d="M27488.8 2594.5 L27876.8 2594.5" fill="none" data-name="StudyFormScaffold"></path>
+							<path d="M27488.8 2655.5 L27876.8 2655.5" fill="none" data-name="StudyFormScaffold"></path>
 						</g>
-						<g transform="translate(75212.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SplashPage">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SplashPage">SplashPage</text>
+						<g transform="translate(27488.75, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
+								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75212.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SplashPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SplashPage">+Widget build()</text>
+						<g transform="translate(27488.75, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IconPack">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPack">
-							<rect x="75388.8" y="82.5" height="108.0" width="359.0" data-name="IconPack"></rect>
-							<path d="M75388.8 113.5 L75747.8 113.5" fill="none" data-name="IconPack"></path>
-							<path d="M75388.8 159.5 L75747.8 159.5" fill="none" data-name="IconPack"></path>
-						</g>
-						<g transform="translate(75388.75, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPack">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPack">IconPack</text>
+						<g transform="translate(27488.75, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75388.75, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+defaultPack: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPack">&lt;static&gt;+material: List&lt;IconOption&gt;</text>
-								
-							</g>
+					</g>
+					<g data-name="T Function(WidgetRef)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
+							<rect x="27548.3" y="3485.0" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
 						</g>
-						<g transform="translate(75388.75, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+IconOption? resolveIconByName()</text>
+						<g transform="translate(27548.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconOption">
-							<rect x="27823.5" y="2548.5" height="153.0" width="264.0" data-name="IconOption"></rect>
-							<path d="M27823.5 2579.5 L28087.5 2579.5" fill="none" data-name="IconOption"></path>
-							<path d="M27823.5 2655.5 L28087.5 2655.5" fill="none" data-name="IconOption"></path>
+					<g data-name="ConsentItemFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
+							<rect x="53187.3" y="2496.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
+							<path d="M53187.3 2527.0 L53883.3 2527.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+							<path d="M53187.3 2693.0 L53883.3 2693.0" fill="none" data-name="ConsentItemFormViewModel"></path>
 						</g>
-						<g transform="translate(27823.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconOption">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="IconOption">IconOption</text>
+						<g transform="translate(53187.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27823.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconOption">+isEmpty: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconOption">+props: List&lt;Object?&gt;</text>
+						<g transform="translate(53187.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27823.5, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+String toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">&lt;static&gt;+IconOption fromJson()</text>
+						<g transform="translate(53187.25, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReactiveIconPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveIconPicker">
-							<rect x="75826.3" y="614.0" height="31.0" width="168.0" data-name="ReactiveIconPicker"></rect>
+					<g data-name="StudyDesignEnrollmentFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
+							<rect x="35581.5" y="3454.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
+							<path d="M35581.5 3485.5 L36030.5 3485.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
 						</g>
-						<g transform="translate(75826.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveIconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveIconPicker">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveIconPicker">ReactiveIconPicker</text>
+						<g transform="translate(35581.5, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
+								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReactiveFocusableFormField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFocusableFormField">
-							<rect x="75787.8" y="121.0" height="31.0" width="245.0" data-name="ReactiveFocusableFormField"></rect>
-						</g>
-						<g transform="translate(75787.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFocusableFormField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFocusableFormField">
-								<text x="114.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFocusableFormField">ReactiveFocusableFormField</text>
+						<g transform="translate(35581.5, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPicker">
-							<rect x="42726.3" y="1606.0" height="183.0" width="319.0" data-name="IconPicker"></rect>
-							<path d="M42726.3 1637.0 L43045.3 1637.0" fill="none" data-name="IconPicker"></path>
-							<path d="M42726.3 1758.0 L43045.3 1758.0" fill="none" data-name="IconPicker"></path>
-						</g>
-						<g transform="translate(42726.25, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPicker">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPicker">IconPicker</text>
-								
-							</g>
+					<g data-name="IScreenerQuestionLogicFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
+							<rect x="52303.3" y="2594.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
+							<path d="M52303.3 2625.0 L52635.3 2625.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
 						</g>
-						<g transform="translate(42726.25, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPicker">+selectedOption: IconOption?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPicker">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconPicker">+galleryIconSize: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IconPicker">+selectedIconSize: double?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IconPicker">+focusNode: FocusNode?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IconPicker">+isDisabled: bool</text>
+						<g transform="translate(52303.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
+								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42726.25, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+Widget build()</text>
+						<g transform="translate(52303.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(IconOption)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(IconOption)?">
-							<rect x="42874.8" y="2609.5" height="31.0" width="230.0" data-name="void Function(IconOption)?"></rect>
+					<g data-name="ScreenerQuestionLogicFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
+							<rect x="81582.0" y="2556.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
+							<path d="M81582.0 2587.0 L82006.0 2587.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+							<path d="M81582.0 2618.0 L82006.0 2618.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
 						</g>
-						<g transform="translate(42874.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(IconOption)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(IconOption)?">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(IconOption)?">void Function(IconOption)?</text>
+						<g transform="translate(81582, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
+								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FocusNode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FocusNode">
-							<rect x="42728.8" y="2609.5" height="31.0" width="106.0" data-name="FocusNode"></rect>
+						<g transform="translate(81582, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
+								
+							</g>
 						</g>
-						<g transform="translate(42728.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FocusNode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FocusNode">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="FocusNode">FocusNode</text>
+						<g transform="translate(81582, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconPickerField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerField">
-							<rect x="43085.3" y="1606.0" height="183.0" width="319.0" data-name="IconPickerField"></rect>
-							<path d="M43085.3 1637.0 L43404.3 1637.0" fill="none" data-name="IconPickerField"></path>
-							<path d="M43085.3 1758.0 L43404.3 1758.0" fill="none" data-name="IconPickerField"></path>
+					<g data-name="ScreenerQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
+							<rect x="60618.3" y="3334.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
+							<path d="M60618.3 3365.0 L61180.3 3365.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+							<path d="M60618.3 3546.0 L61180.3 3546.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(43085.25, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerField">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerField">IconPickerField</text>
+						<g transform="translate(60618.25, 3334)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
+								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43085.25, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerField">+selectedOption: IconOption?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerField">+selectedIconSize: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconPickerField">+galleryIconSize: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IconPickerField">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IconPickerField">+focusNode: FocusNode?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IconPickerField">+isDisabled: bool</text>
+						<g transform="translate(60618.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43085.25, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+Widget build()</text>
+						<g transform="translate(60618.25, 3546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconPickerGallery">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerGallery">
-							<rect x="43444.3" y="1636.0" height="123.0" width="319.0" data-name="IconPickerGallery"></rect>
-							<path d="M43444.3 1667.0 L43763.3 1667.0" fill="none" data-name="IconPickerGallery"></path>
-							<path d="M43444.3 1728.0 L43763.3 1728.0" fill="none" data-name="IconPickerGallery"></path>
+					<g data-name="ConsentItemFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
+							<rect x="50893.3" y="1613.5" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
+							<path d="M50893.3 1644.5 L51151.3 1644.5" fill="none" data-name="ConsentItemFormData"></path>
+							<path d="M50893.3 1735.5 L51151.3 1735.5" fill="none" data-name="ConsentItemFormData"></path>
 						</g>
-						<g transform="translate(43444.25, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerGallery">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerGallery">IconPickerGallery</text>
+						<g transform="translate(50893.25, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
+								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43444.25, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerGallery">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerGallery">+iconSize: double</text>
+						<g transform="translate(50893.25, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43444.25, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+Widget build()</text>
+						<g transform="translate(50893.25, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormSideSheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSideSheetTab">
-							<rect x="11466.0" y="2594.0" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
-							<path d="M11466.0 2625.0 L11779.0 2625.0" fill="none" data-name="FormSideSheetTab"></path>
+					<g data-name="ConsentItemFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
+							<rect x="44337.0" y="1666.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
+							<path d="M44337.0 1697.5 L44718.0 1697.5" fill="none" data-name="ConsentItemFormView"></path>
 						</g>
-						<g transform="translate(11466, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSideSheetTab">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormSideSheetTab">FormSideSheetTab</text>
+						<g transform="translate(44337, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
+								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11466, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSideSheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSideSheetTab">+formViewBuilder: Widget Function(T)</text>
+						<g transform="translate(44337, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SidesheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SidesheetTab">
-							<rect x="13038.0" y="2594.0" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
-							<path d="M13038.0 2625.0 L13368.0 2625.0" fill="none" data-name="SidesheetTab"></path>
-						</g>
-						<g transform="translate(13038, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SidesheetTab">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="SidesheetTab">SidesheetTab</text>
-								
-							</g>
+					<g data-name="EnrollmentFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
+							<rect x="50626.0" y="2541.0" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
+							<path d="M50626.0 2572.0 L51080.0 2572.0" fill="none" data-name="EnrollmentFormData"></path>
+							<path d="M50626.0 2663.0 L51080.0 2663.0" fill="none" data-name="EnrollmentFormData"></path>
 						</g>
-						<g transform="translate(13038, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SidesheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="SidesheetTab">+builder: Widget Function(BuildContext)</text>
+						<g transform="translate(50626, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
+								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Sidesheet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Sidesheet">
-							<rect x="45907.8" y="2519.0" height="212.0" width="341.0" data-name="Sidesheet"></rect>
-							<path d="M45907.8 2550.0 L46248.8 2550.0" fill="none" data-name="Sidesheet"></path>
-						</g>
-						<g transform="translate(45907.75, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Sidesheet">
-								<text x="162.5" y="13.5" stroke="none" text-anchor="middle" data-name="Sidesheet">Sidesheet</text>
+						<g transform="translate(50626, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45907.75, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Sidesheet">
-								<text x="0.0" y="13.5" stroke="none" data-name="Sidesheet">&lt;static&gt;+kDefaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Sidesheet">+titleText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Sidesheet">+body: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Sidesheet">+tabs: List&lt;SidesheetTab&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Sidesheet">+actionButtons: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Sidesheet">+width: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Sidesheet">+withCloseButton: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Sidesheet">+ignoreAppBar: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Sidesheet">+collapseSingleTab: bool</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Sidesheet">+bodyPadding: EdgeInsets?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Sidesheet">+wrapContent: Widget Function(Widget)?</text>
+						<g transform="translate(50626, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReactiveCustomColorPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveCustomColorPicker">
-							<rect x="76036.3" y="614.0" height="31.0" width="236.0" data-name="ReactiveCustomColorPicker"></rect>
+					<g data-name="QuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
+							<rect x="47930.0" y="1956.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M47930.0 1987.0 L48943.0 1987.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M47930.0 3008.0 L48943.0 3008.0" fill="none" data-name="QuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(76036.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveCustomColorPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveCustomColorPicker">
-								<text x="110.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveCustomColorPicker">ReactiveCustomColorPicker</text>
+						<g transform="translate(47930, 1956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
+								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReactiveFormField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFormField">
-							<rect x="76072.8" y="121.0" height="31.0" width="163.0" data-name="ReactiveFormField"></rect>
+						<g transform="translate(47930, 1987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
+								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
+								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
+								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
+								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
+								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
+								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
+								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
+								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
+								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
+								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
+								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
+								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
+								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
+								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
+								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
+								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
+								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
+								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+								
+							</g>
 						</g>
-						<g transform="translate(76072.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFormField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFormField">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFormField">ReactiveFormField</text>
+						<g transform="translate(47930, 3008)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TextParagraph">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextParagraph">
-							<rect x="46288.8" y="2556.0" height="138.0" width="208.0" data-name="TextParagraph"></rect>
-							<path d="M46288.8 2587.0 L46496.8 2587.0" fill="none" data-name="TextParagraph"></path>
-							<path d="M46288.8 2663.0 L46496.8 2663.0" fill="none" data-name="TextParagraph"></path>
+					<g data-name="EnrollmentFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
+							<rect x="65972.8" y="2376.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
+							<path d="M65972.8 2407.0 L66874.8 2407.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+							<path d="M65972.8 2633.0 L66874.8 2633.0" fill="none" data-name="EnrollmentFormViewModel"></path>
 						</g>
-						<g transform="translate(46288.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextParagraph">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextParagraph">TextParagraph</text>
+						<g transform="translate(65972.75, 2376)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
+								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46288.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
-								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+text: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TextParagraph">+style: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TextParagraph">+selectable: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TextParagraph">+span: List&lt;TextSpan&gt;?</text>
+						<g transform="translate(65972.75, 2407)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46288.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
-								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+Widget build()</text>
+						<g transform="translate(65972.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConstrainedWidthFlexible">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConstrainedWidthFlexible">
-							<rect x="46536.8" y="2533.5" height="183.0" width="287.0" data-name="ConstrainedWidthFlexible"></rect>
-							<path d="M46536.8 2564.5 L46823.8 2564.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
-							<path d="M46536.8 2670.5 L46823.8 2670.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
+					<g data-name="EnrollmentFormConsentItemDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
+							<rect x="65723.8" y="3394.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
+							<path d="M65723.8 3425.0 L66523.8 3425.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+							<path d="M65723.8 3501.0 L66523.8 3501.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
 						</g>
-						<g transform="translate(46536.75, 2533.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConstrainedWidthFlexible">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConstrainedWidthFlexible">ConstrainedWidthFlexible</text>
+						<g transform="translate(65723.75, 3394)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46536.75, 2564.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+minWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">+maxWidth: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConstrainedWidthFlexible">+flex: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConstrainedWidthFlexible">+flexSum: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConstrainedWidthFlexible">+child: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConstrainedWidthFlexible">+outerConstraints: BoxConstraints</text>
+						<g transform="translate(65723.75, 3425)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46536.75, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">-double _getWidth()</text>
+						<g transform="translate(65723.75, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoxConstraints">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoxConstraints">
-							<rect x="53674.8" y="3485.0" height="31.0" width="136.0" data-name="BoxConstraints"></rect>
+					<g data-name="StudyFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
+							<rect x="71357.0" y="1516.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
+							<path d="M71357.0 1547.0 L72053.0 1547.0" fill="none" data-name="StudyFormViewModel"></path>
+							<path d="M71357.0 1758.0 L72053.0 1758.0" fill="none" data-name="StudyFormViewModel"></path>
 						</g>
-						<g transform="translate(53674.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxConstraints">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxConstraints">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxConstraints">BoxConstraints</text>
+						<g transform="translate(71357, 1516)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PrimaryButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PrimaryButton">
-							<rect x="46863.8" y="2511.5" height="227.0" width="333.0" data-name="PrimaryButton"></rect>
-							<path d="M46863.8 2542.5 L47196.8 2542.5" fill="none" data-name="PrimaryButton"></path>
-						</g>
-						<g transform="translate(46863.75, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PrimaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PrimaryButton">
-								<text x="158.5" y="13.5" stroke="none" text-anchor="middle" data-name="PrimaryButton">PrimaryButton</text>
+						<g transform="translate(71357, 1547)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46863.75, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PrimaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PrimaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="PrimaryButton">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PrimaryButton">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PrimaryButton">+isLoading: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PrimaryButton">+showLoadingEarliestAfterMs: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PrimaryButton">+onPressed: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PrimaryButton">+tooltip: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PrimaryButton">+tooltipDisabled: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PrimaryButton">+enabled: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PrimaryButton">+onPressedFuture: dynamic Function()?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="PrimaryButton">+innerPadding: EdgeInsets</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="PrimaryButton">+minimumSize: Size?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="PrimaryButton">+isDisabled: bool</text>
+						<g transform="translate(71357, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="52671.0" y="3485.0" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
+					<g data-name="QuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
+							<rect x="53367.3" y="1568.5" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M53367.3 1599.5 L54535.3 1599.5" fill="none" data-name="QuestionFormData"></path>
+							<path d="M53367.3 1735.5 L54535.3 1735.5" fill="none" data-name="QuestionFormData"></path>
 						</g>
-						<g transform="translate(52671, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
-								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
+						<g transform="translate(53367.25, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
+								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Size">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Size">
-							<rect x="47084.0" y="3485.0" height="31.0" width="50.0" data-name="Size"></rect>
-						</g>
-						<g transform="translate(47084, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Size">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Size">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Size">Size</text>
+						<g transform="translate(53367.25, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="EmptyBody">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmptyBody">
-							<rect x="47648.5" y="2541.0" height="168.0" width="222.0" data-name="EmptyBody"></rect>
-							<path d="M47648.5 2572.0 L47870.5 2572.0" fill="none" data-name="EmptyBody"></path>
-							<path d="M47648.5 2678.0 L47870.5 2678.0" fill="none" data-name="EmptyBody"></path>
-						</g>
-						<g transform="translate(47648.5, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmptyBody">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="EmptyBody">EmptyBody</text>
+						<g transform="translate(53367.25, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47648.5, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+icon: IconData?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmptyBody">+leading: Widget?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmptyBody">+leadingSpacing: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmptyBody">+title: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EmptyBody">+description: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EmptyBody">+button: Widget?</text>
+					</g>
+					<g data-name="SurveyQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
+							<rect x="31073.0" y="3417.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M31073.0 3448.0 L31436.0 3448.0" fill="none" data-name="SurveyQuestionType"></path>
+						</g>
+						<g transform="translate(31073, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
+								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47648.5, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+Widget build()</text>
+						<g transform="translate(31073, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Badge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Badge">
-							<rect x="47910.5" y="2496.0" height="258.0" width="263.0" data-name="Badge"></rect>
-							<path d="M47910.5 2527.0 L48173.5 2527.0" fill="none" data-name="Badge"></path>
-							<path d="M47910.5 2678.0 L48173.5 2678.0" fill="none" data-name="Badge"></path>
+					<g data-name="ChoiceQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
+							<rect x="51487.3" y="2541.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M51487.3 2572.0 L51831.3 2572.0" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M51487.3 2633.0 L51831.3 2633.0" fill="none" data-name="ChoiceQuestionFormData"></path>
 						</g>
-						<g transform="translate(47910.5, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Badge">
-								<text x="123.5" y="13.5" stroke="none" text-anchor="middle" data-name="Badge">Badge</text>
+						<g transform="translate(51487.25, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47910.5, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
-								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+icon: IconData?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Badge">+color: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Badge">+borderRadius: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Badge">+label: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Badge">+type: BadgeType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Badge">+padding: EdgeInsets</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Badge">+iconSize: double?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Badge">+labelStyle: TextStyle?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Badge">+center: bool</text>
+						<g transform="translate(51487.25, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47910.5, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
-								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Badge">-Color? _getBackgroundColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Badge">-Color _getBorderColor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Badge">-Color? _getLabelColor()</text>
+						<g transform="translate(51487.25, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NullHelperDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NullHelperDecoration">
-							<rect x="76312.3" y="614.0" height="31.0" width="184.0" data-name="NullHelperDecoration"></rect>
+					<g data-name="BoolQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
+							<rect x="51871.3" y="2556.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M51871.3 2587.0 L52263.3 2587.0" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M51871.3 2633.0 L52263.3 2633.0" fill="none" data-name="BoolQuestionFormData"></path>
 						</g>
-						<g transform="translate(76312.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NullHelperDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NullHelperDecoration">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="NullHelperDecoration">NullHelperDecoration</text>
+						<g transform="translate(51871.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
+								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InputDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InputDecoration">
-							<rect x="76333.3" y="121.0" height="31.0" width="142.0" data-name="InputDecoration"></rect>
+						<g transform="translate(51871.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(76333.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InputDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InputDecoration">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="InputDecoration">InputDecoration</text>
+						<g transform="translate(51871.25, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Collapsible">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Collapsible">
-							<rect x="76663.0" y="83.0" height="107.0" width="441.0" data-name="Collapsible"></rect>
-							<path d="M76663.0 114.0 L77104.0 114.0" fill="none" data-name="Collapsible"></path>
+					<g data-name="ImageQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
+							<rect x="52675.3" y="2556.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
+							<path d="M52675.3 2587.0 L53147.3 2587.0" fill="none" data-name="ImageQuestionFormData"></path>
+							<path d="M52675.3 2633.0 L53147.3 2633.0" fill="none" data-name="ImageQuestionFormData"></path>
 						</g>
-						<g transform="translate(76663, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Collapsible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Collapsible">
-								<text x="212.5" y="13.5" stroke="none" text-anchor="middle" data-name="Collapsible">Collapsible</text>
+						<g transform="translate(52675.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76663, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Collapsible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Collapsible">
-								<text x="0.0" y="13.5" stroke="none" data-name="Collapsible">+contentBuilder: Widget Function(BuildContext, bool)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Collapsible">+headerBuilder: Widget Function(BuildContext, bool)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Collapsible">+title: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Collapsible">+isCollapsed: bool</text>
+						<g transform="translate(52675.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(52675.25, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext, bool)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)">
-							<rect x="76561.0" y="614.0" height="31.0" width="300.0" data-name="Widget Function(BuildContext, bool)"></rect>
+					<g data-name="AudioQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
+							<rect x="53923.3" y="2548.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
+							<path d="M53923.3 2579.5 L54395.3 2579.5" fill="none" data-name="AudioQuestionFormData"></path>
+							<path d="M53923.3 2640.5 L54395.3 2640.5" fill="none" data-name="AudioQuestionFormData"></path>
 						</g>
-						<g transform="translate(76561, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)">
-								<text x="142.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)">Widget Function(BuildContext, bool)</text>
+						<g transform="translate(53923.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)?">
-							<rect x="77137.8" y="614.0" height="31.0" width="310.0" data-name="Widget Function(BuildContext, bool)?"></rect>
+						<g transform="translate(53923.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(77137.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)?">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)?">Widget Function(BuildContext, bool)?</text>
+						<g transform="translate(53923.25, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ActionMenuInline">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuInline">
-							<rect x="77144.0" y="52.5" height="168.0" width="324.0" data-name="ActionMenuInline"></rect>
-							<path d="M77144.0 83.5 L77468.0 83.5" fill="none" data-name="ActionMenuInline"></path>
-							<path d="M77144.0 189.5 L77468.0 189.5" fill="none" data-name="ActionMenuInline"></path>
+					<g data-name="ScaleQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
+							<rect x="54435.3" y="2481.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M54435.3 2512.0 L54779.3 2512.0" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M54435.3 2708.0 L54779.3 2708.0" fill="none" data-name="ScaleQuestionFormData"></path>
 						</g>
-						<g transform="translate(77144, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuInline">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuInline">ActionMenuInline</text>
+						<g transform="translate(54435.25, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77144, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuInline">+iconSize: double?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuInline">+visible: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuInline">+splashRadius: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ActionMenuInline">+paddingVertical: double?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ActionMenuInline">+paddingHorizontal: double?</text>
+						<g transform="translate(54435.25, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77144, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+Widget build()</text>
+						<g transform="translate(54435.25, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyULogo">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyULogo">
-							<rect x="49931.8" y="3797.0" height="93.0" width="214.0" data-name="StudyULogo"></rect>
-							<path d="M49931.8 3828.0 L50145.8 3828.0" fill="none" data-name="StudyULogo"></path>
-							<path d="M49931.8 3859.0 L50145.8 3859.0" fill="none" data-name="StudyULogo"></path>
+					<g data-name="FreeTextQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
+							<rect x="54819.3" y="2541.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M54819.3 2572.0 L55163.3 2572.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M54819.3 2648.0 L55163.3 2648.0" fill="none" data-name="FreeTextQuestionFormData"></path>
 						</g>
-						<g transform="translate(49931.75, 3797)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyULogo">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyULogo">StudyULogo</text>
+						<g transform="translate(54819.25, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49931.75, 3828)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+onTap: void Function()?</text>
+						<g transform="translate(54819.25, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49931.75, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+Widget build()</text>
+						<g transform="translate(54819.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TabbedNavbar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TabbedNavbar">
-							<rect x="48400.3" y="2496.5" height="257.0" width="308.0" data-name="TabbedNavbar"></rect>
-							<path d="M48400.3 2527.5 L48708.3 2527.5" fill="none" data-name="TabbedNavbar"></path>
-						</g>
-						<g transform="translate(48400.25, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabbedNavbar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabbedNavbar">
-								<text x="146.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabbedNavbar">TabbedNavbar</text>
-								
-							</g>
+					<g data-name="FreeTextQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
+							<rect x="54893.3" y="3485.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
 						</g>
-						<g transform="translate(48400.25, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TabbedNavbar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TabbedNavbar">
-								<text x="0.0" y="13.5" stroke="none" data-name="TabbedNavbar">+tabs: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TabbedNavbar">+selectedTab: T?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TabbedNavbar">+indicator: BoxDecoration?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TabbedNavbar">+height: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TabbedNavbar">+disabledBackgroundColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TabbedNavbar">+disabledTooltipText: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TabbedNavbar">+onSelect: void Function(int, T)?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TabbedNavbar">+labelPadding: EdgeInsets?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="TabbedNavbar">+labelSpacing: double?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="TabbedNavbar">+indicatorSize: TabBarIndicatorSize?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="TabbedNavbar">+isScrollable: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="TabbedNavbar">+backgroundColor: Color?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="TabbedNavbar">+labelColorHover: Color?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="TabbedNavbar">+unselectedLabelColorHover: Color?</text>
+						<g transform="translate(54893.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
+								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoxDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoxDecoration">
-							<rect x="47776.0" y="3485.0" height="31.0" width="132.0" data-name="BoxDecoration"></rect>
+					<g data-name="AudioRecordingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
+							<rect x="27757.8" y="1651.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
+							<path d="M27757.8 1682.0 L28109.8 1682.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<path d="M27757.8 1713.0 L28109.8 1713.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
 						</g>
-						<g transform="translate(47776, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxDecoration">
-								<text x="58.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxDecoration">BoxDecoration</text>
+						<g transform="translate(27757.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(int, T)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(int, T)?">
-							<rect x="48097.0" y="3485.0" height="31.0" width="183.0" data-name="void Function(int, T)?"></rect>
-						</g>
-						<g transform="translate(48097, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(int, T)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(int, T)?">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(int, T)?">void Function(int, T)?</text>
+						<g transform="translate(27757.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="TabBarIndicatorSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TabBarIndicatorSize">
-							<rect x="48320.0" y="3485.0" height="31.0" width="176.0" data-name="TabBarIndicatorSize"></rect>
-						</g>
-						<g transform="translate(48320, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabBarIndicatorSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabBarIndicatorSize">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabBarIndicatorSize">TabBarIndicatorSize</text>
+						<g transform="translate(27757.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="HtmlStylingBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlStylingBanner">
-							<rect x="48748.3" y="2571.0" height="108.0" width="298.0" data-name="HtmlStylingBanner"></rect>
-							<path d="M48748.3 2602.0 L49046.3 2602.0" fill="none" data-name="HtmlStylingBanner"></path>
-							<path d="M48748.3 2648.0 L49046.3 2648.0" fill="none" data-name="HtmlStylingBanner"></path>
+					<g data-name="FreeTextQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
+							<rect x="28149.8" y="1628.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M28149.8 1659.5 L28501.8 1659.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M28149.8 1705.5 L28501.8 1705.5" fill="none" data-name="FreeTextQuestionFormView"></path>
 						</g>
-						<g transform="translate(48748.25, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlStylingBanner">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlStylingBanner">HtmlStylingBanner</text>
+						<g transform="translate(28149.75, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(48748.25, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+isDismissed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="HtmlStylingBanner">+onDismissed: dynamic Function()?</text>
+						<g transform="translate(28149.75, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(48748.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+Widget build()</text>
+						<g transform="translate(28149.75, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ISyncIndicatorViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ISyncIndicatorViewModel">
-							<rect x="77508.0" y="98.0" height="77.0" width="214.0" data-name="ISyncIndicatorViewModel"></rect>
-							<path d="M77508.0 129.0 L77722.0 129.0" fill="none" data-name="ISyncIndicatorViewModel"></path>
-						</g>
-						<g transform="translate(77508, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ISyncIndicatorViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ISyncIndicatorViewModel">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="ISyncIndicatorViewModel">ISyncIndicatorViewModel</text>
-								
-							</g>
+					<g data-name="ImageCapturingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
+							<rect x="28541.8" y="1651.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
+							<path d="M28541.8 1682.0 L28893.8 1682.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<path d="M28541.8 1713.0 L28893.8 1713.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
 						</g>
-						<g transform="translate(77508, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ISyncIndicatorViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ISyncIndicatorViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ISyncIndicatorViewModel">+isDirty: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ISyncIndicatorViewModel">+lastSynced: DateTime?</text>
+						<g transform="translate(28541.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SyncIndicator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SyncIndicator">
-							<rect x="49086.3" y="2564.0" height="122.0" width="208.0" data-name="SyncIndicator"></rect>
-							<path d="M49086.3 2595.0 L49294.3 2595.0" fill="none" data-name="SyncIndicator"></path>
-						</g>
-						<g transform="translate(49086.25, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SyncIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SyncIndicator">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="SyncIndicator">SyncIndicator</text>
+						<g transform="translate(28541.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49086.25, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SyncIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SyncIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="SyncIndicator">+state: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SyncIndicator">+lastSynced: DateTime?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SyncIndicator">+isDirty: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SyncIndicator">+animationDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SyncIndicator">+iconSize: double</text>
+						<g transform="translate(28541.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Search">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Search">
-							<rect x="49334.3" y="2571.5" height="107.0" width="373.0" data-name="Search"></rect>
-							<path d="M49334.3 2602.5 L49707.3 2602.5" fill="none" data-name="Search"></path>
+					<g data-name="IScaleQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
+							<rect x="82520.5" y="105.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M82520.5 136.5 L82829.5 136.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(49334.25, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Search">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Search">
-								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="Search">Search</text>
+						<g transform="translate(82520.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
+								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49334.25, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Search">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Search">
-								<text x="0.0" y="13.5" stroke="none" data-name="Search">+onQueryChanged: dynamic Function(String)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Search">+searchController: SearchController?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Search">+hintText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Search">+initialText: String?</text>
+						<g transform="translate(82520.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(String)">
-							<rect x="49269.0" y="3485.0" height="31.0" width="213.0" data-name="dynamic Function(String)"></rect>
+					<g data-name="ScaleQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
+							<rect x="51231.3" y="1666.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M51231.3 1697.5 L51583.3 1697.5" fill="none" data-name="ScaleQuestionFormView"></path>
 						</g>
-						<g transform="translate(49269, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(String)">
-								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(String)">dynamic Function(String)</text>
+						<g transform="translate(51231.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(String)">
-							<rect x="56103.3" y="3828.0" height="31.0" width="180.0" data-name="void Function(String)"></rect>
-						</g>
-						<g transform="translate(56103.25, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(String)">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(String)">void Function(String)</text>
+						<g transform="translate(51231.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SecondaryButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SecondaryButton">
-							<rect x="49747.3" y="2556.0" height="138.0" width="249.0" data-name="SecondaryButton"></rect>
-							<path d="M49747.3 2587.0 L49996.3 2587.0" fill="none" data-name="SecondaryButton"></path>
-							<path d="M49747.3 2663.0 L49996.3 2663.0" fill="none" data-name="SecondaryButton"></path>
+					<g data-name="ChoiceQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
+							<rect x="28933.8" y="1651.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M28933.8 1682.0 L29285.8 1682.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M28933.8 1713.0 L29285.8 1713.0" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(49747.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecondaryButton">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecondaryButton">SecondaryButton</text>
+						<g transform="translate(28933.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49747.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SecondaryButton">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SecondaryButton">+isLoading: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SecondaryButton">+onPressed: void Function()?</text>
+						<g transform="translate(28933.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49747.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+Widget build()</text>
+						<g transform="translate(28933.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormTableRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRow">
-							<rect x="50474.3" y="2549.0" height="152.0" width="379.0" data-name="FormTableRow"></rect>
-							<path d="M50474.3 2580.0 L50853.3 2580.0" fill="none" data-name="FormTableRow"></path>
+					<g data-name="BoolQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
+							<rect x="29740.8" y="1651.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M29740.8 1682.0 L30092.8 1682.0" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M29740.8 1713.0 L30092.8 1713.0" fill="none" data-name="BoolQuestionFormView"></path>
 						</g>
-						<g transform="translate(50474.25, 2549)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRow">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRow">FormTableRow</text>
+						<g transform="translate(29740.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50474.25, 2580)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRow">+label: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRow">+labelBuilder: Widget Function(BuildContext)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRow">+labelStyle: TextStyle?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRow">+labelHelpText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormTableRow">+input: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormTableRow">+control: AbstractControl&lt;dynamic&gt;?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormTableRow">+layout: FormTableRowLayout?</text>
+						<g transform="translate(29740.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
-							<rect x="51993.8" y="3485.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
-						</g>
-						<g transform="translate(51993.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
+						<g transform="translate(29740.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormTableRowLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRowLayout">
-							<rect x="41597.8" y="3447.0" height="107.0" width="370.0" data-name="FormTableRowLayout"></rect>
-							<path d="M41597.8 3478.0 L41967.8 3478.0" fill="none" data-name="FormTableRowLayout"></path>
+					<g data-name="SurveyQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
+							<rect x="56104.5" y="1659.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M56104.5 1690.0 L56456.5 1690.0" fill="none" data-name="SurveyQuestionFormView"></path>
 						</g>
-						<g transform="translate(41597.75, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRowLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRowLayout">
-								<text x="177.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRowLayout">FormTableRowLayout</text>
+						<g transform="translate(56104.5, 1659)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41597.75, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRowLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRowLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRowLayout">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+values: List&lt;FormTableRowLayout&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+vertical: FormTableRowLayout</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+horizontal: FormTableRowLayout</text>
+						<g transform="translate(56104.5, 1690)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormTableLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableLayout">
-							<rect x="50893.3" y="2548.5" height="153.0" width="379.0" data-name="FormTableLayout"></rect>
-							<path d="M50893.3 2579.5 L51272.3 2579.5" fill="none" data-name="FormTableLayout"></path>
-							<path d="M50893.3 2670.5 L51272.3 2670.5" fill="none" data-name="FormTableLayout"></path>
+					<g data-name="StudyUTimeOfDay">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
+							<rect x="55982.3" y="2609.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
 						</g>
-						<g transform="translate(50893.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableLayout">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableLayout">FormTableLayout</text>
+						<g transform="translate(55982.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
+								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50893.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+rows: List&lt;FormTableRow&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableLayout">+columnWidths: Map&lt;int, TableColumnWidth&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableLayout">+rowDivider: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableLayout">+rowLayout: FormTableRowLayout?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormTableLayout">+rowLabelStyle: TextStyle?</text>
+					</g>
+					<g data-name="ScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
+							<rect x="82460.8" y="1158.5" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
+							<path d="M82460.8 1189.5 L82892.8 1189.5" fill="none" data-name="ScheduleControls"></path>
+							<path d="M82460.8 1220.5 L82892.8 1220.5" fill="none" data-name="ScheduleControls"></path>
+						</g>
+						<g transform="translate(82460.75, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
+								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50893.25, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+Widget build()</text>
+						<g transform="translate(82460.75, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormSectionHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSectionHeader">
-							<rect x="51312.3" y="2548.5" height="153.0" width="220.0" data-name="FormSectionHeader"></rect>
-							<path d="M51312.3 2579.5 L51532.3 2579.5" fill="none" data-name="FormSectionHeader"></path>
-							<path d="M51312.3 2670.5 L51532.3 2670.5" fill="none" data-name="FormSectionHeader"></path>
-						</g>
-						<g transform="translate(51312.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSectionHeader">
-								<text x="102.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormSectionHeader">FormSectionHeader</text>
+						<g transform="translate(82460.75, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51312.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormSectionHeader">+titleTextStyle: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormSectionHeader">+helpText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormSectionHeader">+divider: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormSectionHeader">+helpTextDisabled: bool</text>
+					</g>
+					<g data-name="StudiesTableColumnHeader">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
+							<rect x="45539.0" y="3782.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
+							<path d="M45539.0 3813.5 L45776.0 3813.5" fill="none" data-name="StudiesTableColumnHeader"></path>
+						</g>
+						<g transform="translate(45539, 3782.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
+								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51312.25, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+Widget build()</text>
+						<g transform="translate(45539, 3813.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormLabel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormLabel">
-							<rect x="51572.3" y="2556.0" height="138.0" width="266.0" data-name="FormLabel"></rect>
-							<path d="M51572.3 2587.0 L51838.3 2587.0" fill="none" data-name="FormLabel"></path>
-							<path d="M51572.3 2663.0 L51838.3 2663.0" fill="none" data-name="FormLabel"></path>
-						</g>
-						<g transform="translate(51572.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormLabel">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormLabel">FormLabel</text>
-								
-							</g>
+					<g data-name="DashboardScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
+							<rect x="56956.0" y="2594.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
+							<path d="M56956.0 2625.0 L57134.0 2625.0" fill="none" data-name="DashboardScreen"></path>
 						</g>
-						<g transform="translate(51572.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+labelText: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormLabel">+helpText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormLabel">+labelTextStyle: TextStyle?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormLabel">+layout: FormTableRowLayout?</text>
+						<g transform="translate(56956, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
+								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51572.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+Widget build()</text>
+						<g transform="translate(56956, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MouseEventsRegion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MouseEventsRegion">
-							<rect x="52749.0" y="3760.0" height="167.0" width="379.0" data-name="MouseEventsRegion"></rect>
-							<path d="M52749.0 3791.0 L53128.0 3791.0" fill="none" data-name="MouseEventsRegion"></path>
+					<g data-name="StudiesFilter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
+							<rect x="24804.0" y="3462.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
+							<path d="M24804.0 3493.0 L25100.0 3493.0" fill="none" data-name="StudiesFilter"></path>
 						</g>
-						<g transform="translate(52749, 3760)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MouseEventsRegion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MouseEventsRegion">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="MouseEventsRegion">MouseEventsRegion</text>
+						<g transform="translate(24804, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52749, 3791)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MouseEventsRegion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MouseEventsRegion">
-								<text x="0.0" y="13.5" stroke="none" data-name="MouseEventsRegion">+onTap: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MouseEventsRegion">+onHover: void Function(PointerHoverEvent)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MouseEventsRegion">+onEnter: void Function(PointerEnterEvent)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MouseEventsRegion">+onExit: void Function(PointerExitEvent)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MouseEventsRegion">+autoselectCursor: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MouseEventsRegion">+cursor: SystemMouseCursor</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MouseEventsRegion">&lt;static&gt;+defaultCursor: SystemMouseCursor</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MouseEventsRegion">+autoCursor: SystemMouseCursor</text>
+						<g transform="translate(24804, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(PointerHoverEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerHoverEvent)?">
-							<rect x="54830.0" y="4118.5" height="31.0" width="292.0" data-name="void Function(PointerHoverEvent)?"></rect>
+					<g data-name="DashboardScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
+							<rect x="57174.0" y="2571.0" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
+							<path d="M57174.0 2602.0 L57517.0 2602.0" fill="none" data-name="DashboardScaffold"></path>
+							<path d="M57174.0 2648.0 L57517.0 2648.0" fill="none" data-name="DashboardScaffold"></path>
 						</g>
-						<g transform="translate(54830, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerHoverEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerHoverEvent)?">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerHoverEvent)?">void Function(PointerHoverEvent)?</text>
+						<g transform="translate(57174, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
+								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
+								
+							</g>
+						</g>
+						<g transform="translate(57174, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(PointerEnterEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerEnterEvent)?">
-							<rect x="55162.0" y="4118.5" height="31.0" width="287.0" data-name="void Function(PointerEnterEvent)?"></rect>
-						</g>
-						<g transform="translate(55162, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerEnterEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerEnterEvent)?">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerEnterEvent)?">void Function(PointerEnterEvent)?</text>
+						<g transform="translate(57174, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(PointerExitEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerExitEvent)?">
-							<rect x="55489.0" y="4118.5" height="31.0" width="274.0" data-name="void Function(PointerExitEvent)?"></rect>
+					<g data-name="DashboardController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
+							<rect x="70063.5" y="2436.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
+							<path d="M70063.5 2467.0 L70677.5 2467.0" fill="none" data-name="DashboardController"></path>
+							<path d="M70063.5 2588.0 L70677.5 2588.0" fill="none" data-name="DashboardController"></path>
 						</g>
-						<g transform="translate(55489, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerExitEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerExitEvent)?">
-								<text x="129.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerExitEvent)?">void Function(PointerExitEvent)?</text>
+						<g transform="translate(70063.5, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
+								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SystemMouseCursor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SystemMouseCursor">
-							<rect x="58547.0" y="4118.5" height="31.0" width="180.0" data-name="SystemMouseCursor"></rect>
+						<g transform="translate(70063.5, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
+								
+							</g>
 						</g>
-						<g transform="translate(58547, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SystemMouseCursor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SystemMouseCursor">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="SystemMouseCursor">SystemMouseCursor</text>
+						<g transform="translate(70063.5, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControlLabel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlLabel">
-							<rect x="51878.3" y="2548.5" height="153.0" width="430.0" data-name="FormControlLabel"></rect>
-							<path d="M51878.3 2579.5 L52308.3 2579.5" fill="none" data-name="FormControlLabel"></path>
-							<path d="M51878.3 2670.5 L52308.3 2670.5" fill="none" data-name="FormControlLabel"></path>
+					<g data-name="IUserRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
+							<rect x="70180.5" y="3439.0" height="123.0" width="260.0" data-name="IUserRepository"></rect>
+							<path d="M70180.5 3470.0 L70440.5 3470.0" fill="none" data-name="IUserRepository"></path>
+							<path d="M70180.5 3501.0 L70440.5 3501.0" fill="none" data-name="IUserRepository"></path>
 						</g>
-						<g transform="translate(51878.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlLabel">
-								<text x="207.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlLabel">FormControlLabel</text>
+						<g transform="translate(70180.5, 3439)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
+								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51878.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+formControl: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlLabel">+text: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlLabel">+isClickable: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlLabel">+textStyle: TextStyle?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormControlLabel">+onClick: void Function(AbstractControl&lt;dynamic&gt;)?</text>
+						<g transform="translate(70180.5, 3470)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+user: StudyUUser</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51878.25, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+Widget build()</text>
+						<g transform="translate(70180.5, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+dynamic fetchUser()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IUserRepository">+dynamic saveUser()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IUserRepository">+dynamic updatePreferences()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<rect x="53850.8" y="3485.0" height="31.0" width="352.0" data-name="void Function(AbstractControl&lt;dynamic&gt;)?"></rect>
+					<g data-name="StudiesTableColumnSize">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
+							<rect x="82869.5" y="75.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
+							<path d="M82869.5 106.0 L83094.5 106.0" fill="none" data-name="StudiesTableColumnSize"></path>
+							<path d="M82869.5 167.0 L83094.5 167.0" fill="none" data-name="StudiesTableColumnSize"></path>
 						</g>
-						<g transform="translate(53850.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">void Function(AbstractControl&lt;dynamic&gt;)?</text>
+						<g transform="translate(82869.5, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
+								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SingleColumnLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayout">
-							<rect x="52348.3" y="2526.0" height="198.0" width="418.0" data-name="SingleColumnLayout"></rect>
-							<path d="M52348.3 2557.0 L52766.3 2557.0" fill="none" data-name="SingleColumnLayout"></path>
-							<path d="M52348.3 2693.0 L52766.3 2693.0" fill="none" data-name="SingleColumnLayout"></path>
-						</g>
-						<g transform="translate(52348.25, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayout">
-								<text x="201.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayout">SingleColumnLayout</text>
+						<g transform="translate(82869.5, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52348.25, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraints: BoxConstraints</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraintsNarrow: BoxConstraints</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayout">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayout">+header: Widget?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayout">+stickyHeader: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayout">+constraints: BoxConstraints?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SingleColumnLayout">+scroll: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SingleColumnLayout">+padding: EdgeInsets?</text>
+						<g transform="translate(82869.5, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52348.25, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+dynamic fromType()</text>
+					</g>
+					<g data-name="StudiesTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
+							<rect x="56581.8" y="1553.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
+							<path d="M56581.8 1584.5 L57061.8 1584.5" fill="none" data-name="StudiesTable"></path>
+							<path d="M56581.8 1795.5 L57061.8 1795.5" fill="none" data-name="StudiesTable"></path>
+						</g>
+						<g transform="translate(56581.75, 1553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
+								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="TwoColumnLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TwoColumnLayout">
-							<rect x="52909.8" y="2466.5" height="317.0" width="368.0" data-name="TwoColumnLayout"></rect>
-							<path d="M52909.8 2497.5 L53277.8 2497.5" fill="none" data-name="TwoColumnLayout"></path>
-						</g>
-						<g transform="translate(52909.75, 2466.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TwoColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TwoColumnLayout">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="TwoColumnLayout">TwoColumnLayout</text>
+						<g transform="translate(56581.75, 1584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52909.75, 2497.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TwoColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TwoColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultDivider: VerticalDivider</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultContentPadding: EdgeInsets</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+slimContentPadding: EdgeInsets</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TwoColumnLayout">+leftWidget: Widget</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TwoColumnLayout">+rightWidget: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TwoColumnLayout">+dividerWidget: Widget?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TwoColumnLayout">+headerWidget: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TwoColumnLayout">+flexLeft: int?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="TwoColumnLayout">+flexRight: int?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="TwoColumnLayout">+constraintsLeft: BoxConstraints?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="TwoColumnLayout">+constraintsRight: BoxConstraints?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="TwoColumnLayout">+scrollLeft: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="TwoColumnLayout">+scrollRight: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="TwoColumnLayout">+paddingLeft: EdgeInsets?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="TwoColumnLayout">+paddingRight: EdgeInsets?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorLeft: Color?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorRight: Color?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="TwoColumnLayout">+stretchHeight: bool</text>
+						<g transform="translate(56581.75, 1795.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="VerticalDivider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VerticalDivider">
-							<rect x="54395.8" y="3485.0" height="31.0" width="130.0" data-name="VerticalDivider"></rect>
+					<g data-name="void Function(Study)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
+							<rect x="56280.0" y="2609.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
 						</g>
-						<g transform="translate(54395.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VerticalDivider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VerticalDivider">
-								<text x="57.0" y="13.5" stroke="none" text-anchor="middle" data-name="VerticalDivider">VerticalDivider</text>
+						<g transform="translate(56280, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
+								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="UnderConstruction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnderConstruction">
-							<rect x="77762.0" y="105.5" height="62.0" width="164.0" data-name="UnderConstruction"></rect>
-							<path d="M77762.0 136.5 L77926.0 136.5" fill="none" data-name="UnderConstruction"></path>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+							<rect x="56499.0" y="2609.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
 						</g>
-						<g transform="translate(77762, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnderConstruction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnderConstruction">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="UnderConstruction">UnderConstruction</text>
+						<g transform="translate(56499, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77762, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnderConstruction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnderConstruction">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnderConstruction">+Widget build()</text>
+					</g>
+					<g data-name="StudiesTableColumn">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
+							<rect x="2478.0" y="3394.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
+							<path d="M2478.0 3425.5 L2839.0 3425.5" fill="none" data-name="StudiesTableColumn"></path>
+						</g>
+						<g transform="translate(2478, 3394.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
+								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StandardDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardDialog">
-							<rect x="53317.8" y="2488.5" height="273.0" width="247.0" data-name="StandardDialog"></rect>
-							<path d="M53317.8 2519.5 L53564.8 2519.5" fill="none" data-name="StandardDialog"></path>
-							<path d="M53317.8 2730.5 L53564.8 2730.5" fill="none" data-name="StandardDialog"></path>
-						</g>
-						<g transform="translate(53317.75, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardDialog">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardDialog">StandardDialog</text>
+						<g transform="translate(2478, 3425.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53317.75, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+title: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardDialog">+titleText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardDialog">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardDialog">+actionButtons: List&lt;Widget&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardDialog">+backgroundColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardDialog">+borderRadius: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StandardDialog">+width: double?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StandardDialog">+height: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StandardDialog">+minWidth: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StandardDialog">+minHeight: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StandardDialog">+maxWidth: double?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StandardDialog">+maxHeight: double?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StandardDialog">+padding: EdgeInsets</text>
+					</g>
+					<g data-name="StudiesTableItem">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
+							<rect x="59997.3" y="2526.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
+							<path d="M59997.3 2557.5 L60397.3 2557.5" fill="none" data-name="StudiesTableItem"></path>
+						</g>
+						<g transform="translate(59997.25, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
+								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53317.75, 2730.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+Widget build()</text>
+						<g transform="translate(59997.25, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IndicatorRangeSliderThumbShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IndicatorRangeSliderThumbShape">
-							<rect x="60818.5" y="560.5" height="138.0" width="287.0" data-name="IndicatorRangeSliderThumbShape"></rect>
-							<path d="M60818.5 591.5 L61105.5 591.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
-							<path d="M60818.5 652.5 L61105.5 652.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
+					<g data-name="void Function(Study, bool)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
+							<rect x="59411.3" y="3485.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
 						</g>
-						<g transform="translate(60818.5, 560.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IndicatorRangeSliderThumbShape">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="IndicatorRangeSliderThumbShape">IndicatorRangeSliderThumbShape</text>
+						<g transform="translate(59411.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60818.5, 591.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+buildContext: BuildContext</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+start: T</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+end: T</text>
-								
-							</g>
+					</g>
+					<g data-name="void Function(Study)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
+							<rect x="59954.3" y="3485.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
 						</g>
-						<g transform="translate(60818.5, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+Size getPreferredSize()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+void paint()</text>
+						<g transform="translate(59954.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
+								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BuildContext">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
-							<rect x="60904.0" y="1197.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
+					<g data-name="App">
+						<g fill="#eee8d5" stroke="#33322E" data-name="App">
+							<rect x="83134.5" y="121.0" height="31.0" width="47.0" data-name="App"></rect>
 						</g>
-						<g transform="translate(60904, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
+						<g transform="translate(83134.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
+								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="RangeSliderThumbShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RangeSliderThumbShape">
-							<rect x="60853.0" y="121.0" height="31.0" width="218.0" data-name="RangeSliderThumbShape"></rect>
+					</g>
+					<g data-name="AppContent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
+							<rect x="83221.5" y="121.0" height="31.0" width="109.0" data-name="AppContent"></rect>
 						</g>
-						<g transform="translate(60853, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="RangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RangeSliderThumbShape">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="RangeSliderThumbShape">RangeSliderThumbShape</text>
+						<g transform="translate(83221.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BannerBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BannerBox">
-							<rect x="53604.8" y="2534.0" height="182.0" width="298.0" data-name="BannerBox"></rect>
-							<path d="M53604.8 2565.0 L53902.8 2565.0" fill="none" data-name="BannerBox"></path>
+					<g data-name="AccountSettingsDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
+							<rect x="39157.0" y="1666.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
+							<path d="M39157.0 1697.5 L39351.0 1697.5" fill="none" data-name="AccountSettingsDialog"></path>
 						</g>
-						<g transform="translate(53604.75, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerBox">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerBox">BannerBox</text>
+						<g transform="translate(39157, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
+								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53604.75, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="BannerBox">+prefixIcon: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BannerBox">+body: Widget</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BannerBox">+style: BannerStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BannerBox">+padding: EdgeInsets?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BannerBox">+noPrefix: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BannerBox">+dismissable: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="BannerBox">+isDismissed: bool?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="BannerBox">+onDismissed: dynamic Function()?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="BannerBox">+dismissIconSize: double</text>
+						<g transform="translate(39157, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BannerStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BannerStyle">
-							<rect x="35951.5" y="3439.5" height="122.0" width="294.0" data-name="BannerStyle"></rect>
-							<path d="M35951.5 3470.5 L36245.5 3470.5" fill="none" data-name="BannerStyle"></path>
+					<g data-name="ModelRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepository">
+							<rect x="83561.3" y="986.0" height="453.0" width="662.0" data-name="ModelRepository"></rect>
+							<path d="M83561.3 1017.0 L84223.3 1017.0" fill="none" data-name="ModelRepository"></path>
+							<path d="M83561.3 1123.0 L84223.3 1123.0" fill="none" data-name="ModelRepository"></path>
 						</g>
-						<g transform="translate(35951.5, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerStyle">
-								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerStyle">BannerStyle</text>
+						<g transform="translate(83561.25, 986)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepository">
+								<text x="323.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepository">ModelRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35951.5, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerStyle">
-								<text x="0.0" y="13.5" stroke="none" data-name="BannerStyle">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+values: List&lt;BannerStyle&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+warning: BannerStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+info: BannerStyle</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+error: BannerStyle</text>
+						<g transform="translate(83561.25, 1017)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+delegate: IModelRepositoryDelegate&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">-_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">-_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">-_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(83561.25, 1123)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt;? get()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">+dynamic fetchAll()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">+dynamic fetch()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+dynamic delete()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSave()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ModelRepository">-dynamic _buildModelSpecificController()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="ModelRepository">+dynamic ensurePersisted()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt; upsertLocally()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="ModelRepository">+List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="ModelRepository">+dynamic emitUpdate()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="ModelRepository">+dynamic emitModelEvent()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="ModelRepository">+dynamic emitError()</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="ModelRepository">+void dispose()</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="ModelRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ActionPopUpMenuButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionPopUpMenuButton">
-							<rect x="53942.8" y="2496.0" height="258.0" width="324.0" data-name="ActionPopUpMenuButton"></rect>
-							<path d="M53942.8 2527.0 L54266.8 2527.0" fill="none" data-name="ActionPopUpMenuButton"></path>
-							<path d="M53942.8 2708.0 L54266.8 2708.0" fill="none" data-name="ActionPopUpMenuButton"></path>
+					<g data-name="InviteCodeRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepository">
+							<rect x="82756.8" y="2518.5" height="213.0" width="403.0" data-name="InviteCodeRepository"></rect>
+							<path d="M82756.8 2549.5 L83159.8 2549.5" fill="none" data-name="InviteCodeRepository"></path>
+							<path d="M82756.8 2655.5 L83159.8 2655.5" fill="none" data-name="InviteCodeRepository"></path>
 						</g>
-						<g transform="translate(53942.75, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionPopUpMenuButton">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionPopUpMenuButton">ActionPopUpMenuButton</text>
+						<g transform="translate(82756.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepository">
+								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepository">InviteCodeRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53942.75, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColor: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColorHover: Color?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconSize: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ActionPopUpMenuButton">+disableSplashEffect: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ActionPopUpMenuButton">+hideOnEmpty: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ActionPopUpMenuButton">+orientation: Axis</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ActionPopUpMenuButton">+elevation: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ActionPopUpMenuButton">+splashRadius: double?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ActionPopUpMenuButton">+enabled: bool</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ActionPopUpMenuButton">+position: PopupMenuPosition</text>
+						<g transform="translate(82756.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+apiClient: StudyUApi</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepository">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepository">+study: Study</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53942.75, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">-Widget _buildPopupMenu()</text>
+						<g transform="translate(82756.75, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+String getKey()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+dynamic emitUpdate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Axis">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Axis">
-							<rect x="55046.5" y="3485.0" height="31.0" width="49.0" data-name="Axis"></rect>
+					<g data-name="ProviderRef">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ProviderRef">
+							<rect x="83411.5" y="4118.5" height="31.0" width="109.0" data-name="ProviderRef"></rect>
 						</g>
-						<g transform="translate(55046.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Axis">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Axis">
-								<text x="16.5" y="13.5" stroke="none" text-anchor="middle" data-name="Axis">Axis</text>
+						<g transform="translate(83411.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ProviderRef">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProviderRef">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProviderRef">ProviderRef</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PopupMenuPosition">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PopupMenuPosition">
-							<rect x="55135.5" y="3485.0" height="31.0" width="174.0" data-name="PopupMenuPosition"></rect>
+					<g data-name="StudyUApi">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApi">
+							<rect x="77217.3" y="4028.0" height="212.0" width="251.0" data-name="StudyUApi"></rect>
+							<path d="M77217.3 4059.0 L77468.3 4059.0" fill="none" data-name="StudyUApi"></path>
 						</g>
-						<g transform="translate(55135.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PopupMenuPosition">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PopupMenuPosition">
-								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="PopupMenuPosition">PopupMenuPosition</text>
+						<g transform="translate(77217.25, 4028)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyUApi">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApi">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApi">StudyUApi</text>
+								
+							</g>
+						</g>
+						<g transform="translate(77217.25, 4059)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApi">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApi">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApi">+dynamic saveStudy()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApi">+dynamic getUserStudies()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApi">+dynamic saveStudyInvite()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudyInvite()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudyInvite()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApi">+dynamic deleteParticipants()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApi">+dynamic fetchAppConfig()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApi">+dynamic fetchUser()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApi">+dynamic saveUser()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DismissButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DismissButton">
-							<rect x="53168.0" y="3789.5" height="108.0" width="249.0" data-name="DismissButton"></rect>
-							<path d="M53168.0 3820.5 L53417.0 3820.5" fill="none" data-name="DismissButton"></path>
-							<path d="M53168.0 3866.5 L53417.0 3866.5" fill="none" data-name="DismissButton"></path>
+					<g data-name="InviteCodeRepositoryDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepositoryDelegate">
+							<rect x="83672.3" y="2518.5" height="213.0" width="299.0" data-name="InviteCodeRepositoryDelegate"></rect>
+							<path d="M83672.3 2549.5 L83971.3 2549.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
+							<path d="M83672.3 2610.5 L83971.3 2610.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(53168, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DismissButton">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="DismissButton">DismissButton</text>
+						<g transform="translate(83672.25, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepositoryDelegate">
+								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepositoryDelegate">InviteCodeRepositoryDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53168, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+onPressed: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DismissButton">+text: String?</text>
+						<g transform="translate(83672.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+apiClient: StudyUApi</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+studyRepository: IStudyRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53168, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+Widget build()</text>
+						<g transform="translate(83672.25, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetch()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetchAll()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic save()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic delete()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic onError()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createDuplicate()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createNewInstance()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormScaffold">
-							<rect x="54568.0" y="2556.5" height="137.0" width="212.0" data-name="FormScaffold"></rect>
-							<path d="M54568.0 2587.5 L54780.0 2587.5" fill="none" data-name="FormScaffold"></path>
+					<g data-name="IModelRepositoryDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepositoryDelegate">
+							<rect x="83804.0" y="1621.5" height="152.0" width="225.0" data-name="IModelRepositoryDelegate"></rect>
+							<path d="M83804.0 1652.5 L84029.0 1652.5" fill="none" data-name="IModelRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(54568, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormScaffold">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormScaffold">FormScaffold</text>
+						<g transform="translate(83804, 1621.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepositoryDelegate">
+								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepositoryDelegate">IModelRepositoryDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54568, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormScaffold">+formViewModel: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormScaffold">+actions: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormScaffold">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormScaffold">+actionsPadding: double</text>
+						<g transform="translate(83804, 1652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetchAll()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetch()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic save()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic delete()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepositoryDelegate">+T createNewInstance()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepositoryDelegate">+T createDuplicate()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic onError()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AsyncValueWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValueWidget">
-							<rect x="55205.0" y="2526.0" height="198.0" width="384.0" data-name="AsyncValueWidget"></rect>
-							<path d="M55205.0 2557.0 L55589.0 2557.0" fill="none" data-name="AsyncValueWidget"></path>
-							<path d="M55205.0 2648.0 L55589.0 2648.0" fill="none" data-name="AsyncValueWidget"></path>
+					<g data-name="StudyRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepository">
+							<rect x="72569.0" y="3752.0" height="183.0" width="403.0" data-name="StudyRepository"></rect>
+							<path d="M72569.0 3783.0 L72972.0 3783.0" fill="none" data-name="StudyRepository"></path>
+							<path d="M72569.0 3859.0 L72972.0 3859.0" fill="none" data-name="StudyRepository"></path>
 						</g>
-						<g transform="translate(55205, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValueWidget">
-								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValueWidget">AsyncValueWidget</text>
+						<g transform="translate(72569, 3752)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepository">
+								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepository">StudyRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55205, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+value: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">+data: Widget Function(T)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">+error: Widget Function(Object, StackTrace?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">+loading: Widget Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AsyncValueWidget">+empty: Widget Function()?</text>
+						<g transform="translate(72569, 3783)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+apiClient: StudyUApi</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+sortCallback: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55205, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">-Widget _buildDataOrEmptyWidget()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultLoad()</text>
+						<g transform="translate(72569, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+String getKey()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+dynamic deleteParticipants()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+dynamic launch()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(Object, StackTrace?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Object, StackTrace?)?">
-							<rect x="56189.5" y="3485.0" height="31.0" width="326.0" data-name="Widget Function(Object, StackTrace?)?"></rect>
+					<g data-name="StudyRepositoryDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepositoryDelegate">
+							<rect x="83870.3" y="3744.5" height="198.0" width="282.0" data-name="StudyRepositoryDelegate"></rect>
+							<path d="M83870.3 3775.5 L84152.3 3775.5" fill="none" data-name="StudyRepositoryDelegate"></path>
+							<path d="M83870.3 3821.5 L84152.3 3821.5" fill="none" data-name="StudyRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(56189.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Object, StackTrace?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Object, StackTrace?)?">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Object, StackTrace?)?">Widget Function(Object, StackTrace?)?</text>
+						<g transform="translate(83870.25, 3744.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepositoryDelegate">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepositoryDelegate">StudyRepositoryDelegate</text>
+								
+							</g>
+						</g>
+						<g transform="translate(83870.25, 3775.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+apiClient: StudyUApi</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+authRepository: IAuthRepository</text>
+								
+							</g>
+						</g>
+						<g transform="translate(83870.25, 3821.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetchAll()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetch()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic save()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic delete()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic onError()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createNewInstance()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function()?">
-							<rect x="56555.5" y="3485.0" height="31.0" width="166.0" data-name="Widget Function()?"></rect>
+					<g data-name="APIException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="APIException">
+							<rect x="76216.8" y="614.0" height="31.0" width="121.0" data-name="APIException"></rect>
 						</g>
-						<g transform="translate(56555.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function()?">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function()?">Widget Function()?</text>
+						<g transform="translate(76216.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="APIException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="APIException">
+								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="APIException">APIException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ResultTypes">
-							<rect x="77966.0" y="121.0" height="31.0" width="114.0" data-name="ResultTypes"></rect>
+					<g data-name="StudyNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotFoundException">
+							<rect x="73878.5" y="1197.0" height="31.0" width="216.0" data-name="StudyNotFoundException"></rect>
 						</g>
-						<g transform="translate(77966, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ResultTypes">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ResultTypes">ResultTypes</text>
+						<g transform="translate(73878.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotFoundException">
+								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotFoundException">StudyNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementResultTypes">
-							<rect x="77487.8" y="591.0" height="77.0" width="252.0" data-name="MeasurementResultTypes"></rect>
-							<path d="M77487.8 622.0 L77739.8 622.0" fill="none" data-name="MeasurementResultTypes"></path>
+					<g data-name="MeasurementNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementNotFoundException">
+							<rect x="74134.5" y="1197.0" height="31.0" width="279.0" data-name="MeasurementNotFoundException"></rect>
 						</g>
-						<g transform="translate(77487.75, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementResultTypes">
-								<text x="118.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementResultTypes">MeasurementResultTypes</text>
+						<g transform="translate(74134.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementNotFoundException">
+								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementNotFoundException">MeasurementNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77487.75, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementResultTypes">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+questionnaire: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
+					</g>
+					<g data-name="QuestionNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionNotFoundException">
+							<rect x="74453.5" y="1197.0" height="31.0" width="242.0" data-name="QuestionNotFoundException"></rect>
+						</g>
+						<g transform="translate(74453.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionNotFoundException">
+								<text x="113.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionNotFoundException">QuestionNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionResultTypes">
-							<rect x="78039.0" y="591.0" height="77.0" width="268.0" data-name="InterventionResultTypes"></rect>
-							<path d="M78039.0 622.0 L78307.0 622.0" fill="none" data-name="InterventionResultTypes"></path>
+					<g data-name="ConsentItemNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemNotFoundException">
+							<rect x="74735.5" y="1197.0" height="31.0" width="271.0" data-name="ConsentItemNotFoundException"></rect>
 						</g>
-						<g transform="translate(78039, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionResultTypes">
-								<text x="126.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionResultTypes">InterventionResultTypes</text>
+						<g transform="translate(74735.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemNotFoundException">
+								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemNotFoundException">ConsentItemNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78039, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResultTypes">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+checkmarkTask: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
+					</g>
+					<g data-name="InterventionNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionNotFoundException">
+							<rect x="75046.5" y="1197.0" height="31.0" width="265.0" data-name="InterventionNotFoundException"></rect>
+						</g>
+						<g transform="translate(75046.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionNotFoundException">
+								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionNotFoundException">InterventionNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyExportData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyExportData">
-							<rect x="55629.0" y="2564.0" height="122.0" width="414.0" data-name="StudyExportData"></rect>
-							<path d="M55629.0 2595.0 L56043.0 2595.0" fill="none" data-name="StudyExportData"></path>
+					<g data-name="InterventionTaskNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskNotFoundException">
+							<rect x="76042.5" y="1197.0" height="31.0" width="303.0" data-name="InterventionTaskNotFoundException"></rect>
 						</g>
-						<g transform="translate(55629, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyExportData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyExportData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyExportData">StudyExportData</text>
+						<g transform="translate(76042.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskNotFoundException">
+								<text x="143.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskNotFoundException">InterventionTaskNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55629, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyExportData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyExportData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyExportData">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyExportData">+measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyExportData">+interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyExportData">+mediaData: List&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyExportData">+isEmpty: bool</text>
+					</g>
+					<g data-name="ReportNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportNotFoundException">
+							<rect x="76385.5" y="1197.0" height="31.0" width="224.0" data-name="ReportNotFoundException"></rect>
+						</g>
+						<g transform="translate(76385.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportNotFoundException">
+								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportNotFoundException">ReportNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTemplates">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTemplates">
-							<rect x="78717.0" y="90.0" height="93.0" width="307.0" data-name="StudyTemplates"></rect>
-							<path d="M78717.0 121.0 L79024.0 121.0" fill="none" data-name="StudyTemplates"></path>
-							<path d="M78717.0 152.0 L79024.0 152.0" fill="none" data-name="StudyTemplates"></path>
+					<g data-name="ReportSectionNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionNotFoundException">
+							<rect x="76649.5" y="1197.0" height="31.0" width="283.0" data-name="ReportSectionNotFoundException"></rect>
 						</g>
-						<g transform="translate(78717, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTemplates">
-								<text x="145.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTemplates">StudyTemplates</text>
+						<g transform="translate(76649.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionNotFoundException">
+								<text x="133.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionNotFoundException">ReportSectionNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78717, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+kUnnamedStudyTitle: String</text>
-								
-							</g>
+					</g>
+					<g data-name="StudyInviteNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInviteNotFoundException">
+							<rect x="76972.5" y="1197.0" height="31.0" width="259.0" data-name="StudyInviteNotFoundException"></rect>
 						</g>
-						<g transform="translate(78717, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+Study emptyDraft()</text>
+						<g transform="translate(76972.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInviteNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInviteNotFoundException">
+								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInviteNotFoundException">StudyInviteNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyActionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyActionType">
-							<rect x="2095.0" y="3402.0" height="197.0" width="358.0" data-name="StudyActionType"></rect>
-							<path d="M2095.0 3433.0 L2453.0 3433.0" fill="none" data-name="StudyActionType"></path>
+					<g data-name="UserNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UserNotFoundException">
+							<rect x="77271.5" y="1197.0" height="31.0" width="208.0" data-name="UserNotFoundException"></rect>
 						</g>
-						<g transform="translate(2095, 3402)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyActionType">
-								<text x="171.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyActionType">StudyActionType</text>
+						<g transform="translate(77271.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserNotFoundException">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserNotFoundException">UserNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2095, 3433)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyActionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyActionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+values: List&lt;StudyActionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pin: StudyActionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pinoff: StudyActionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+edit: StudyActionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicate: StudyActionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicateDraft: StudyActionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+addCollaborator: StudyActionType</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+export: StudyActionType</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+delete: StudyActionType</text>
+					</g>
+					<g data-name="StudyUApiClient">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApiClient">
+							<rect x="76925.3" y="4288.0" height="333.0" width="479.0" data-name="StudyUApiClient"></rect>
+							<path d="M76925.3 4319.0 L77404.3 4319.0" fill="none" data-name="StudyUApiClient"></path>
+							<path d="M76925.3 4395.0 L77404.3 4395.0" fill="none" data-name="StudyUApiClient"></path>
+						</g>
+						<g transform="translate(76925.25, 4288)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUApiClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApiClient">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApiClient">StudyUApiClient</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="DropdownMenuItemTheme">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DropdownMenuItemTheme">
-							<rect x="73794.3" y="598.5" height="62.0" width="258.0" data-name="DropdownMenuItemTheme"></rect>
-							<path d="M73794.3 629.5 L74052.3 629.5" fill="none" data-name="DropdownMenuItemTheme"></path>
-						</g>
-						<g transform="translate(73794.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DropdownMenuItemTheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DropdownMenuItemTheme">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="DropdownMenuItemTheme">DropdownMenuItemTheme</text>
+						<g transform="translate(76925.25, 4319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+supabaseClient: SupabaseClient</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyColumns: List&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+testDelayMilliseconds: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73794.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DropdownMenuItemTheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DropdownMenuItemTheme">
-								<text x="0.0" y="13.5" stroke="none" data-name="DropdownMenuItemTheme">+iconTheme: IconThemeData?</text>
+						<g transform="translate(76925.25, 4395)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteParticipants()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">+dynamic getUserStudies()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudy()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudy()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudyInvite()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudyInvite()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudyInvite()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchAppConfig()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchUser()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApiClient">+dynamic saveUser()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyUApiClient">-dynamic _awaitGuarded()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyUApiClient">-dynamic _apiException()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyUApiClient">-dynamic _testDelay()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconThemeData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconThemeData">
-							<rect x="73852.8" y="1197.0" height="31.0" width="141.0" data-name="IconThemeData"></rect>
+					<g data-name="SupabaseClient">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClient">
+							<rect x="76840.8" y="4661.0" height="31.0" width="141.0" data-name="SupabaseClient"></rect>
 						</g>
-						<g transform="translate(73852.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconThemeData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconThemeData">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconThemeData">IconThemeData</text>
+						<g transform="translate(76840.75, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClient">
+								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClient">SupabaseClient</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Diagnosticable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Diagnosticable">
-							<rect x="73856.8" y="121.0" height="31.0" width="133.0" data-name="Diagnosticable"></rect>
+					<g data-name="SupabaseClientDependant">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClientDependant">
+							<rect x="76540.3" y="4103.0" height="62.0" width="284.0" data-name="SupabaseClientDependant"></rect>
+							<path d="M76540.3 4134.0 L76824.3 4134.0" fill="none" data-name="SupabaseClientDependant"></path>
 						</g>
-						<g transform="translate(73856.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Diagnosticable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Diagnosticable">
-								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="Diagnosticable">Diagnosticable</text>
+						<g transform="translate(76540.25, 4103)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseClientDependant">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClientDependant">
+								<text x="134.0" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClientDependant">SupabaseClientDependant</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ThemeConfig">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeConfig">
-							<rect x="79399.5" y="0.0" height="273.0" width="543.0" data-name="ThemeConfig"></rect>
-							<path d="M79399.5 31.0 L79942.5 31.0" fill="none" data-name="ThemeConfig"></path>
-							<path d="M79399.5 107.0 L79942.5 107.0" fill="none" data-name="ThemeConfig"></path>
-						</g>
-						<g transform="translate(79399.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeConfig">
-								<text x="263.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeConfig">ThemeConfig</text>
+						<g transform="translate(76540.25, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseClientDependant">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseClientDependant">
+								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseClientDependant">+supabaseClient: SupabaseClient</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79399.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMinContentWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMaxContentWidth: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kHoverFadeFactor: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMuteFadeFactor: double</text>
+					</g>
+					<g data-name="SupabaseQueryMixin">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryMixin">
+							<rect x="76879.3" y="4065.5" height="137.0" width="215.0" data-name="SupabaseQueryMixin"></rect>
+							<path d="M76879.3 4096.5 L77094.3 4096.5" fill="none" data-name="SupabaseQueryMixin"></path>
+						</g>
+						<g transform="translate(76879.25, 4065.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseQueryMixin">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryMixin">
+								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryMixin">SupabaseQueryMixin</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79399.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+dynamic bodyBackgroundColor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color modalBarrierColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color containerColor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color colorPickerInitialColor()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextMuted()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextBackground()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+double iconSplashRadius()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color sidesheetBackgroundColor()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()</text>
+						<g transform="translate(76879.25, 4096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryMixin">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryMixin">
+								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic deleteAll()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getAll()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getById()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getByColumn()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseQueryMixin">+List&lt;T&gt; deserializeList()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SupabaseQueryMixin">+T deserializeObject()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NoAnimationPageTransitionsBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NoAnimationPageTransitionsBuilder">
-							<rect x="78960.0" y="598.5" height="62.0" width="299.0" data-name="NoAnimationPageTransitionsBuilder"></rect>
-							<path d="M78960.0 629.5 L79259.0 629.5" fill="none" data-name="NoAnimationPageTransitionsBuilder"></path>
+					<g data-name="IAppRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAppRepository">
+							<rect x="59684.3" y="3462.0" height="77.0" width="230.0" data-name="IAppRepository"></rect>
+							<path d="M59684.3 3493.0 L59914.3 3493.0" fill="none" data-name="IAppRepository"></path>
 						</g>
-						<g transform="translate(78960, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NoAnimationPageTransitionsBuilder">
-								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="NoAnimationPageTransitionsBuilder">NoAnimationPageTransitionsBuilder</text>
+						<g transform="translate(59684.25, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppRepository">
+								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAppRepository">IAppRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78960, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NoAnimationPageTransitionsBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="NoAnimationPageTransitionsBuilder">+Widget buildTransitions()</text>
+						<g transform="translate(59684.25, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAppRepository">+dynamic fetchAppConfig()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IAppRepository">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PageTransitionsBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsBuilder">
-							<rect x="79160.5" y="121.0" height="31.0" width="199.0" data-name="PageTransitionsBuilder"></rect>
+					<g data-name="AppRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppRepository">
+							<rect x="59684.3" y="3789.5" height="108.0" width="230.0" data-name="AppRepository"></rect>
+							<path d="M59684.3 3820.5 L59914.3 3820.5" fill="none" data-name="AppRepository"></path>
+							<path d="M59684.3 3851.5 L59914.3 3851.5" fill="none" data-name="AppRepository"></path>
 						</g>
-						<g transform="translate(79160.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PageTransitionsBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsBuilder">
-								<text x="91.5" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsBuilder">PageTransitionsBuilder</text>
+						<g transform="translate(59684.25, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppRepository">
+								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppRepository">AppRepository</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="WebTransitionBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebTransitionBuilder">
-							<rect x="79434.0" y="598.5" height="62.0" width="223.0" data-name="WebTransitionBuilder"></rect>
-							<path d="M79434.0 629.5 L79657.0 629.5" fill="none" data-name="WebTransitionBuilder"></path>
-						</g>
-						<g transform="translate(79434, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebTransitionBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebTransitionBuilder">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebTransitionBuilder">WebTransitionBuilder</text>
+						<g transform="translate(59684.25, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+apiClient: StudyUApi</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79434, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebTransitionBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebTransitionBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebTransitionBuilder">+Widget buildTransitions()</text>
+						<g transform="translate(59684.25, 3851.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+dynamic fetchAppConfig()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppRepository">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ThemeSettingChange">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettingChange">
-							<rect x="67118.0" y="1666.5" height="62.0" width="216.0" data-name="ThemeSettingChange"></rect>
-							<path d="M67118.0 1697.5 L67334.0 1697.5" fill="none" data-name="ThemeSettingChange"></path>
-						</g>
-						<g transform="translate(67118, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettingChange">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettingChange">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettingChange">ThemeSettingChange</text>
-								
-							</g>
+					<g data-name="StudyUUser">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUUser">
+							<rect x="76390.3" y="4118.5" height="31.0" width="110.0" data-name="StudyUUser"></rect>
 						</g>
-						<g transform="translate(67118, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettingChange">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettingChange">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettingChange">+settings: ThemeSettings</text>
+						<g transform="translate(76390.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUUser">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUUser">
+								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUUser">StudyUUser</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ThemeSettings">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettings">
-							<rect x="67112.5" y="2586.5" height="77.0" width="227.0" data-name="ThemeSettings"></rect>
-							<path d="M67112.5 2617.5 L67339.5 2617.5" fill="none" data-name="ThemeSettings"></path>
+					<g data-name="UserRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UserRepository">
+							<rect x="70645.8" y="3759.5" height="168.0" width="282.0" data-name="UserRepository"></rect>
+							<path d="M70645.8 3790.5 L70927.8 3790.5" fill="none" data-name="UserRepository"></path>
+							<path d="M70645.8 3866.5 L70927.8 3866.5" fill="none" data-name="UserRepository"></path>
 						</g>
-						<g transform="translate(67112.5, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettings">
-								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettings">ThemeSettings</text>
+						<g transform="translate(70645.75, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserRepository">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserRepository">UserRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67112.5, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettings">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettings">+sourceColor: Color</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeSettings">+themeMode: ThemeMode</text>
+						<g transform="translate(70645.75, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+apiClient: StudyUApi</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+ref: Ref&lt;Object?&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="UserRepository">+user: StudyUUser</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Notification">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Notification">
-							<rect x="67174.0" y="1197.0" height="31.0" width="104.0" data-name="Notification"></rect>
-						</g>
-						<g transform="translate(67174, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Notification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notification">
-								<text x="44.0" y="13.5" stroke="none" text-anchor="middle" data-name="Notification">Notification</text>
+						<g transform="translate(70645.75, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+dynamic fetchUser()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+dynamic saveUser()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+dynamic updatePreferences()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ThemeProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeProvider">
-							<rect x="78347.0" y="358.0" height="543.0" width="519.0" data-name="ThemeProvider"></rect>
-							<path d="M78347.0 389.0 L78866.0 389.0" fill="none" data-name="ThemeProvider"></path>
-							<path d="M78347.0 480.0 L78866.0 480.0" fill="none" data-name="ThemeProvider"></path>
+					<g data-name="Ref">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Ref">
+							<rect x="77134.3" y="4118.5" height="31.0" width="43.0" data-name="Ref"></rect>
 						</g>
-						<g transform="translate(78347, 358)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeProvider">
-								<text x="251.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeProvider">ThemeProvider</text>
+						<g transform="translate(77134.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Ref">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Ref">
+								<text x="13.5" y="13.5" stroke="none" text-anchor="middle" data-name="Ref">Ref</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78347, 389)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+settings: ValueNotifier&lt;ThemeSettings&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+lightDynamic: ColorScheme?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+darkDynamic: ColorScheme?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+pageTransitionsTheme: PageTransitionsTheme</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+shapeMedium: ShapeBorder</text>
+					</g>
+					<g data-name="PreferenceAction">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PreferenceAction">
+							<rect x="2929.0" y="3447.0" height="107.0" width="334.0" data-name="PreferenceAction"></rect>
+							<path d="M2929.0 3478.0 L3263.0 3478.0" fill="none" data-name="PreferenceAction"></path>
+						</g>
+						<g transform="translate(2929, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreferenceAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreferenceAction">
+								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="PreferenceAction">PreferenceAction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78347, 480)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+Color custom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+Color blend()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+Color source()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+ColorScheme colors()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+CardTheme cardTheme()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ThemeProvider">+ListTileThemeData listTileTheme()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ThemeProvider">+AppBarTheme appBarTheme()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ThemeProvider">+SnackBarThemeData snackBarThemeData()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ThemeProvider">+TabBarTheme tabBarTheme()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ThemeProvider">+BottomAppBarTheme bottomAppBarTheme()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ThemeProvider">+BottomNavigationBarThemeData bottomNavigationBarTheme()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ThemeProvider">+SwitchThemeData switchTheme()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ThemeProvider">+InputDecorationTheme inputDecorationTheme()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ThemeProvider">+TextTheme textTheme()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ThemeProvider">+DividerThemeData dividerTheme()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ThemeProvider">+NavigationRailThemeData navigationRailTheme()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ThemeProvider">+DrawerThemeData drawerTheme()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ThemeProvider">+IconThemeData iconTheme()</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ThemeProvider">+CheckboxThemeData checkboxTheme()</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ThemeProvider">+RadioThemeData radioTheme()</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ThemeProvider">+TooltipThemeData tooltipTheme()</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ThemeProvider">+ThemeData light()</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ThemeProvider">+ThemeData dark()</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ThemeProvider">+ThemeMode themeMode()</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ThemeProvider">+ThemeData theme()</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ThemeProvider">&lt;static&gt;+ThemeProvider of()</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ThemeProvider">+bool updateShouldNotify()</text>
+						<g transform="translate(2929, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreferenceAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreferenceAction">
+								<text x="0.0" y="13.5" stroke="none" data-name="PreferenceAction">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+values: List&lt;PreferenceAction&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pin: PreferenceAction</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pinOff: PreferenceAction</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ValueNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ValueNotifier">
-							<rect x="76212.3" y="1197.0" height="31.0" width="117.0" data-name="ValueNotifier"></rect>
+					<g data-name="User">
+						<g fill="#eee8d5" stroke="#33322E" data-name="User">
+							<rect x="73039.8" y="4661.0" height="31.0" width="53.0" data-name="User"></rect>
 						</g>
-						<g transform="translate(76212.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueNotifier">
-								<text x="50.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueNotifier">ValueNotifier</text>
+						<g transform="translate(73039.75, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="User">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="User">
+								<text x="18.5" y="13.5" stroke="none" text-anchor="middle" data-name="User">User</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ColorScheme">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ColorScheme">
-							<rect x="76369.3" y="1197.0" height="31.0" width="122.0" data-name="ColorScheme"></rect>
+					<g data-name="Session">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Session">
+							<rect x="76321.0" y="4661.0" height="31.0" width="79.0" data-name="Session"></rect>
 						</g>
-						<g transform="translate(76369.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ColorScheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ColorScheme">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="ColorScheme">ColorScheme</text>
+						<g transform="translate(76321, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Session">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Session">
+								<text x="31.5" y="13.5" stroke="none" text-anchor="middle" data-name="Session">Session</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PageTransitionsTheme">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsTheme">
-							<rect x="79276.8" y="1197.0" height="31.0" width="198.0" data-name="PageTransitionsTheme"></rect>
+					<g data-name="AuthRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthRepository">
+							<rect x="76315.0" y="4310.5" height="288.0" width="295.0" data-name="AuthRepository"></rect>
+							<path d="M76315.0 4341.5 L76610.0 4341.5" fill="none" data-name="AuthRepository"></path>
+							<path d="M76315.0 4462.5 L76610.0 4462.5" fill="none" data-name="AuthRepository"></path>
 						</g>
-						<g transform="translate(79276.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PageTransitionsTheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsTheme">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsTheme">PageTransitionsTheme</text>
+						<g transform="translate(76315, 4310.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthRepository">
+								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthRepository">AuthRepository</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ShapeBorder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ShapeBorder">
-							<rect x="79514.8" y="1197.0" height="31.0" width="120.0" data-name="ShapeBorder"></rect>
-						</g>
-						<g transform="translate(79514.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ShapeBorder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ShapeBorder">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="ShapeBorder">ShapeBorder</text>
+						<g transform="translate(76315, 4341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">+supabaseClient: SupabaseClient</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+allowPasswordReset: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+authClient: GoTrueClient</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+session: Session?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+serializedSession: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+currentUser: User?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+isLoggedIn: bool</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InheritedWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InheritedWidget">
-							<rect x="78536.0" y="121.0" height="31.0" width="141.0" data-name="InheritedWidget"></rect>
-						</g>
-						<g transform="translate(78536, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="InheritedWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InheritedWidget">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="InheritedWidget">InheritedWidget</text>
+						<g transform="translate(76315, 4462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">-void _registerAuthListener()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+dynamic signUp()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+dynamic signInWith()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+dynamic signOut()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+dynamic resetPasswordForEmail()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+dynamic updateUser()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+void dispose()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthRepository">+dynamic onAppStart()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ThemeMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeMode">
-							<rect x="67265.8" y="3485.0" height="31.0" width="114.0" data-name="ThemeMode"></rect>
+					<g data-name="GoTrueClient">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoTrueClient">
+							<rect x="76440.0" y="4661.0" height="31.0" width="120.0" data-name="GoTrueClient"></rect>
 						</g>
-						<g transform="translate(67265.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeMode">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeMode">ThemeMode</text>
+						<g transform="translate(76440, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoTrueClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoTrueClient">
+								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoTrueClient">GoTrueClient</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CustomColor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomColor">
-							<rect x="56467.0" y="2563.5" height="123.0" width="128.0" data-name="CustomColor"></rect>
-							<path d="M56467.0 2594.5 L56595.0 2594.5" fill="none" data-name="CustomColor"></path>
-							<path d="M56467.0 2655.5 L56595.0 2655.5" fill="none" data-name="CustomColor"></path>
+					<g data-name="StudyLaunched">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyLaunched">
+							<rect x="79535.8" y="614.0" height="31.0" width="140.0" data-name="StudyLaunched"></rect>
 						</g>
-						<g transform="translate(56467, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomColor">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomColor">CustomColor</text>
+						<g transform="translate(79535.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyLaunched">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyLaunched">
+								<text x="62.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyLaunched">StudyLaunched</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56467, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomColor">+color: Color</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomColor">+blend: bool</text>
+					</g>
+					<g data-name="ModelEvent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelEvent">
+							<rect x="79943.0" y="98.0" height="77.0" width="145.0" data-name="ModelEvent"></rect>
+							<path d="M79943.0 129.0 L80088.0 129.0" fill="none" data-name="ModelEvent"></path>
+						</g>
+						<g transform="translate(79943, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelEvent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelEvent">
+								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelEvent">ModelEvent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56467, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+Color value()</text>
+						<g transform="translate(79943, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelEvent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelEvent">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelEvent">+modelId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelEvent">+model: T</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LanguagePicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePicker">
-							<rect x="56635.0" y="2579.0" height="92.0" width="366.0" data-name="LanguagePicker"></rect>
-							<path d="M56635.0 2610.0 L57001.0 2610.0" fill="none" data-name="LanguagePicker"></path>
+					<g data-name="SupabaseQueryError">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryError">
+							<rect x="77384.3" y="583.5" height="92.0" width="183.0" data-name="SupabaseQueryError"></rect>
+							<path d="M77384.3 614.5 L77567.3 614.5" fill="none" data-name="SupabaseQueryError"></path>
 						</g>
-						<g transform="translate(56635, 2579)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePicker">
-								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePicker">LanguagePicker</text>
+						<g transform="translate(77384.25, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseQueryError">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryError">
+								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryError">SupabaseQueryError</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56635, 2610)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePicker">+languagePickerType: LanguagePickerType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePicker">+iconColor: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePicker">+offset: Offset?</text>
+						<g transform="translate(77384.25, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryError">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryError">
+								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryError">+statusCode: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryError">+message: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryError">+details: dynamic</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LanguagePickerType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePickerType">
-							<rect x="37815.0" y="3447.0" height="107.0" width="366.0" data-name="LanguagePickerType"></rect>
-							<path d="M37815.0 3478.0 L38181.0 3478.0" fill="none" data-name="LanguagePickerType"></path>
+					<g data-name="WrappedModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WrappedModel">
+							<rect x="61452.3" y="2496.0" height="258.0" width="251.0" data-name="WrappedModel"></rect>
+							<path d="M61452.3 2527.0 L61703.3 2527.0" fill="none" data-name="WrappedModel"></path>
+							<path d="M61452.3 2678.0 L61703.3 2678.0" fill="none" data-name="WrappedModel"></path>
 						</g>
-						<g transform="translate(37815, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePickerType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePickerType">
-								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePickerType">LanguagePickerType</text>
+						<g transform="translate(61452.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WrappedModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WrappedModel">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="WrappedModel">WrappedModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37815, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePickerType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePickerType">
-								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePickerType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+values: List&lt;LanguagePickerType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+field: LanguagePickerType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+icon: LanguagePickerType</text>
+						<g transform="translate(61452.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">-_model: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+asyncValue: AsyncValue&lt;T&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+isLocalOnly: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+isDirty: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WrappedModel">+isDeleted: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WrappedModel">+lastSaved: DateTime?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WrappedModel">+lastFetched: DateTime?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WrappedModel">+lastUpdated: DateTime?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="WrappedModel">+model: T</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Offset">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Offset">
-							<rect x="57404.8" y="3485.0" height="31.0" width="63.0" data-name="Offset"></rect>
-						</g>
-						<g transform="translate(57404.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Offset">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Offset">
-								<text x="23.5" y="13.5" stroke="none" text-anchor="middle" data-name="Offset">Offset</text>
+						<g transform="translate(61452.25, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">+dynamic markWithError()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+dynamic markAsLoading()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+dynamic markAsFetched()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+dynamic markAsSaved()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformLocaleMobile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleMobile">
-							<rect x="79697.0" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleMobile"></rect>
-							<path d="M79697.0 629.5 L79936.0 629.5" fill="none" data-name="PlatformLocaleMobile"></path>
+					<g data-name="ModelRepositoryException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepositoryException">
+							<rect x="77607.3" y="614.0" height="31.0" width="227.0" data-name="ModelRepositoryException"></rect>
 						</g>
-						<g transform="translate(79697, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleMobile">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleMobile">PlatformLocaleMobile</text>
+						<g transform="translate(77607.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelRepositoryException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepositoryException">
+								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepositoryException">ModelRepositoryException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79697, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleMobile">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleMobile">+Locale getPlatformLocale()</text>
+					</g>
+					<g data-name="ModelNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelNotFoundException">
+							<rect x="77611.3" y="1197.0" height="31.0" width="219.0" data-name="ModelNotFoundException"></rect>
+						</g>
+						<g transform="translate(77611.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelNotFoundException">
+								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelNotFoundException">ModelNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformLocale">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocale">
-							<rect x="79982.5" y="105.5" height="62.0" width="239.0" data-name="PlatformLocale"></rect>
-							<path d="M79982.5 136.5 L80221.5 136.5" fill="none" data-name="PlatformLocale"></path>
+					<g data-name="IModelRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepository">
+							<rect x="83701.3" y="501.0" height="257.0" width="382.0" data-name="IModelRepository"></rect>
+							<path d="M83701.3 532.0 L84083.3 532.0" fill="none" data-name="IModelRepository"></path>
 						</g>
-						<g transform="translate(79982.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocale">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocale">PlatformLocale</text>
+						<g transform="translate(83701.25, 501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepository">
+								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepository">IModelRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79982.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocale">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocale">+Locale getPlatformLocale()</text>
+						<g transform="translate(83701.25, 532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepository">+String getKey()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepository">+WrappedModel&lt;T&gt;? get()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepository">+dynamic fetchAll()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepository">+dynamic fetch()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepository">+dynamic save()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepository">+dynamic delete()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSave()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="IModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="IModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="IModelRepository">+dynamic ensurePersisted()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="IModelRepository">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformLocaleWeb">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleWeb">
-							<rect x="80122.0" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleWeb"></rect>
-							<path d="M80122.0 629.5 L80361.0 629.5" fill="none" data-name="PlatformLocaleWeb"></path>
+					<g data-name="IsFetched">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsFetched">
+							<rect x="79715.8" y="614.0" height="31.0" width="94.0" data-name="IsFetched"></rect>
 						</g>
-						<g transform="translate(80122, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleWeb">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleWeb">PlatformLocaleWeb</text>
+						<g transform="translate(79715.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsFetched">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsFetched">
+								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsFetched">IsFetched</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80122, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleWeb">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleWeb">+Locale getPlatformLocale()</text>
+					</g>
+					<g data-name="IsSaving">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaving">
+							<rect x="79849.8" y="614.0" height="31.0" width="84.0" data-name="IsSaving"></rect>
+						</g>
+						<g transform="translate(79849.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaving">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaving">
+								<text x="34.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaving">IsSaving</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppTranslation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppTranslation">
-							<rect x="83939.8" y="105.5" height="62.0" width="194.0" data-name="AppTranslation"></rect>
-							<path d="M83939.8 136.5 L84133.8 136.5" fill="none" data-name="AppTranslation"></path>
+					<g data-name="IsSaved">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaved">
+							<rect x="80646.0" y="614.0" height="31.0" width="80.0" data-name="IsSaved"></rect>
 						</g>
-						<g transform="translate(83939.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppTranslation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppTranslation">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppTranslation">AppTranslation</text>
+						<g transform="translate(80646, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaved">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaved">
+								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaved">IsSaved</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83939.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppTranslation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppTranslation">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppTranslation">&lt;static&gt;+dynamic init()</text>
+					</g>
+					<g data-name="IsDeleted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsDeleted">
+							<rect x="80766.0" y="614.0" height="31.0" width="91.0" data-name="IsDeleted"></rect>
+						</g>
+						<g transform="translate(80766, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsDeleted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsDeleted">
+								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="IsDeleted">IsDeleted</text>
 								
 							</g>
 						</g>

From 396ca07c4036de580628499f3a52b9903099b551 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 25 Apr 2024 15:03:43 +0200
Subject: [PATCH 019/314] chore: upgrade deps

---
 app/pubspec.lock            | 28 ++++++++++++++--------------
 app/pubspec.yaml            | 10 +++++-----
 core/pubspec.lock           | 12 ++++++------
 core/pubspec.yaml           |  6 +++---
 designer_v2/pubspec.lock    | 12 ++++++------
 designer_v2/pubspec.yaml    |  6 +++---
 flutter_common/pubspec.lock |  8 ++++----
 flutter_common/pubspec.yaml |  2 +-
 pubspec.lock                |  4 ++--
 pubspec.yaml                |  2 +-
 10 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index 9a97219fb..7d2100ae0 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -338,10 +338,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: a701df4866f9a38bb8e4450a54c143bbeeb0ce2381e7df5a36e1006f3b43bb28
+      sha256: "8cdc719114ab1c86c64bb7a86d3a679674c3637edd229e3a994797d4a1504ce4"
       url: "https://pub.dev"
     source: hosted
-    version: "17.0.1"
+    version: "17.1.0"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
@@ -354,10 +354,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_local_notifications_platform_interface
-      sha256: "7cf643d6d5022f3baed0be777b0662cce5919c0a7b86e700299f22dc4ae660ef"
+      sha256: "340abf67df238f7f0ef58f4a26d2a83e1ab74c77ab03cd2b2d5018ac64db30b7"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0+1"
+    version: "7.1.0"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -593,10 +593,10 @@ packages:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.9.0"
   just_audio:
     dependency: transitive
     description:
@@ -1033,26 +1033,26 @@ packages:
     dependency: transitive
     description:
       name: sentry
-      sha256: "19a267774906ca3a3c4677fc7e9582ea9da79ae9a28f84bbe4885dac2c269b70"
+      sha256: "961630a4dba41cebd692612421fd3805a991ebd8ef4a8d84a6c179e6b89eaf22"
       url: "https://pub.dev"
     source: hosted
-    version: "7.20.0"
+    version: "8.0.0"
   sentry_flutter:
     dependency: "direct main"
     description:
       name: sentry_flutter
-      sha256: "2d2917f7d795167e33a790db9bc5e1104d2035569ecf83e09a3f491bc6978cfe"
+      sha256: "705da7adfcd1fb23fc8720b6e222f5e03d53f1d020cd635586c319ee323366b4"
       url: "https://pub.dev"
     source: hosted
-    version: "7.20.0"
+    version: "8.0.0"
   sentry_logging:
     dependency: "direct main"
     description:
       name: sentry_logging
-      sha256: "73002a2d4baec71f34e6e775223780279c005644fcd3422127d8802aaed8f86d"
+      sha256: "136751f7d0428b89267fb0c5d20308cb6237148930ce3a5ff9f82c069a9ea793"
       url: "https://pub.dev"
     source: hosted
-    version: "7.20.0"
+    version: "8.0.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -1252,10 +1252,10 @@ packages:
     dependency: "direct main"
     description:
       name: timezone
-      sha256: "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0"
+      sha256: a6ccda4a69a442098b602c44e61a1e2b4bf6f5516e875bbf0f427d5df14745d5
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.2"
+    version: "0.9.3"
   typed_data:
     dependency: transitive
     description:
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 655d7ebab..608fbd9ef 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -16,7 +16,7 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_file_dialog: ^3.0.2
-  flutter_local_notifications: ^17.0.1
+  flutter_local_notifications: ^17.1.0
   flutter_localizations:
     sdk: flutter
   flutter_timezone: ^1.0.8
@@ -26,7 +26,7 @@ dependencies:
   intersperse: ^2.0.0
   intl: ^0.18.1 # flutter_localizations
   material_design_icons_flutter: ^7.0.7296
-  package_info_plus: ^7.0.0
+  package_info_plus: ^7.0.0 # wakelock_plus <= 1.2.4
   path: ^1.9.0
   path_provider: ^2.1.3
   pdf: ^3.10.8
@@ -35,15 +35,15 @@ dependencies:
   quiver: ^3.2.1
   rainbow_color: ^2.0.1
   record: ^5.0.5
-  sentry_flutter: ^7.20.0
-  sentry_logging: ^7.20.0
+  sentry_flutter: ^8.0.0
+  sentry_logging: ^8.0.0
   shared_preferences: ^2.2.3
   studyu_core: ^4.4.1
   studyu_flutter_common: ^1.8.2
   supabase: ^2.1.1
   supabase_flutter: ^2.5.1
   timeline_tile: ^2.0.0
-  timezone: ^0.9.2
+  timezone: ^0.9.3
   universal_html: ^2.2.4
   url_launcher: ^6.2.6
   uuid: ^4.4.0
diff --git a/core/pubspec.lock b/core/pubspec.lock
index 358397574..f07c31977 100644
--- a/core/pubspec.lock
+++ b/core/pubspec.lock
@@ -269,18 +269,18 @@ packages:
     dependency: "direct main"
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.9.0"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
-      sha256: aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969
+      sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b
       url: "https://pub.dev"
     source: hosted
-    version: "6.7.1"
+    version: "6.8.0"
   jwt_decode:
     dependency: transitive
     description:
@@ -429,10 +429,10 @@ packages:
     dependency: "direct main"
     description:
       name: sentry
-      sha256: "19a267774906ca3a3c4677fc7e9582ea9da79ae9a28f84bbe4885dac2c269b70"
+      sha256: "961630a4dba41cebd692612421fd3805a991ebd8ef4a8d84a6c179e6b89eaf22"
       url: "https://pub.dev"
     source: hosted
-    version: "7.20.0"
+    version: "8.0.0"
   shelf:
     dependency: transitive
     description:
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index ca55b430d..e3019f053 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -10,15 +10,15 @@ environment:
 dependencies:
   collection: ^1.18.0
   csv: ^6.0.0
-  json_annotation: ^4.8.1
+  json_annotation: ^4.9.0
   logger: ^2.2.0
   quiver: ^3.2.1
-  sentry: ^7.20.0
+  sentry: ^8.0.0
   supabase: ^2.1.1
   uuid: ^4.4.0
 
 dev_dependencies:
   build_runner: ^2.4.9
-  json_serializable: ^6.7.1
+  json_serializable: ^6.8.0
   lint: ^2.3.0
   test: ^1.25.4
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 961564d98..dedbea596 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -387,10 +387,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: "771c8feb40ad0ef639973d7ecf1b43d55ffcedb2207fd43fab030f5639e40446"
+      sha256: "28ef8a8320ab3bf5752424e6bca6961ce25108afc344f3127b5155caf7a792c8"
       url: "https://pub.dev"
     source: hosted
-    version: "13.2.4"
+    version: "14.0.0"
   gotrue:
     dependency: transitive
     description:
@@ -480,10 +480,10 @@ packages:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.9.0"
   jwt_decode:
     dependency: transitive
     description:
@@ -864,10 +864,10 @@ packages:
     dependency: transitive
     description:
       name: sentry
-      sha256: "19a267774906ca3a3c4677fc7e9582ea9da79ae9a28f84bbe4885dac2c269b70"
+      sha256: "961630a4dba41cebd692612421fd3805a991ebd8ef4a8d84a6c179e6b89eaf22"
       url: "https://pub.dev"
     source: hosted
-    version: "7.20.0"
+    version: "8.0.0"
   shared_preferences:
     dependency: transitive
     description:
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 8731ccf78..e4b28a826 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -23,14 +23,14 @@ dependencies:
   flutter_riverpod: ^2.5.1
   flutter_web_plugins:
     sdk: flutter
-  go_router: ^13.2.4
+  go_router: ^14.0.0
   material_color_utilities:
   material_design_icons_flutter: ^7.0.7296
   pointer_interceptor: ^0.10.1
   reactive_color_picker: ^2.0.0
-  reactive_forms: ^16.1.1
+  reactive_forms: ^16.1.1 # reactive_range_slider <= 2.0.0
   reactive_multi_select_flutter: ^2.0.0
-  reactive_range_slider: ^2.0.0 # reactive_forms <= 16.1.1
+  reactive_range_slider: ^2.0.0
   rxdart: ^0.27.7
   studyu_core: ^4.4.1
   studyu_flutter_common: ^1.8.2
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index 1da42973a..b663c054c 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -228,10 +228,10 @@ packages:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.9.0"
   jwt_decode:
     dependency: transitive
     description:
@@ -428,10 +428,10 @@ packages:
     dependency: transitive
     description:
       name: sentry
-      sha256: "19a267774906ca3a3c4677fc7e9582ea9da79ae9a28f84bbe4885dac2c269b70"
+      sha256: "961630a4dba41cebd692612421fd3805a991ebd8ef4a8d84a6c179e6b89eaf22"
       url: "https://pub.dev"
     source: hosted
-    version: "7.20.0"
+    version: "8.0.0"
   shared_preferences:
     dependency: "direct main"
     description:
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index bf12523c3..0522ef65c 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -12,7 +12,7 @@ dependencies:
     sdk: flutter
   flutter_dotenv: ^5.1.0
   flutter_secure_storage: ^9.0.0
-  shared_preferences: ^2.2.2 # Can be removed after migrating phase
+  shared_preferences: ^2.2.3 # Can be removed after migrating phase
   studyu_core: ^4.4.1
   supabase_flutter: ^2.5.1
   synchronized: ^3.1.0+1
diff --git a/pubspec.lock b/pubspec.lock
index 206912c52..1d4a296ac 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -165,10 +165,10 @@ packages:
     dependency: "direct dev"
     description:
       name: melos
-      sha256: a0cb264096a315e4acdb66ae75ee594a76c97fe15ce9ae469f6c58c6c4b2be87
+      sha256: f9a6fc4f4842b7edfca2e00ab3b5b06928584f24bdc3d776ab0b30be7d599450
       url: "https://pub.dev"
     source: hosted
-    version: "5.3.0"
+    version: "6.0.0"
   meta:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 839421ca3..bfc6f81d4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -9,4 +9,4 @@ environment:
 dev_dependencies:
   flutter_lints: ^3.0.2
   lint: ^2.3.0
-  melos: ^5.3.0
+  melos: ^6.0.0

From 9841938b8b46d32470bf488eaa3326f347235d60 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 25 Apr 2024 20:24:03 +0200
Subject: [PATCH 020/314] chore: regenerate files

---
 .../questionnaire/questions/annotated_scale_question.g.dart  | 2 +-
 .../questionnaire/questions/audio_recording_question.g.dart  | 3 ++-
 .../models/questionnaire/questions/free_text_question.g.dart | 5 +++--
 .../src/models/questionnaire/questions/scale_question.g.dart | 4 ++--
 .../questionnaire/questions/visual_analogue_question.g.dart  | 4 ++--
 core/lib/src/models/study_schedule/study_schedule.g.dart     | 4 ++--
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/core/lib/src/models/questionnaire/questions/annotated_scale_question.g.dart b/core/lib/src/models/questionnaire/questions/annotated_scale_question.g.dart
index 88f580b18..1de91484b 100644
--- a/core/lib/src/models/questionnaire/questions/annotated_scale_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/annotated_scale_question.g.dart
@@ -50,7 +50,7 @@ Map<String, dynamic> _$AnnotatedScaleQuestionToJson(
 }
 
 Annotation _$AnnotationFromJson(Map<String, dynamic> json) => Annotation()
-  ..value = json['value'] as int
+  ..value = (json['value'] as num).toInt()
   ..annotation = json['annotation'] as String;
 
 Map<String, dynamic> _$AnnotationToJson(Annotation instance) =>
diff --git a/core/lib/src/models/questionnaire/questions/audio_recording_question.g.dart b/core/lib/src/models/questionnaire/questions/audio_recording_question.g.dart
index 15d48dc67..c09581df9 100644
--- a/core/lib/src/models/questionnaire/questions/audio_recording_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/audio_recording_question.g.dart
@@ -9,7 +9,8 @@ part of 'audio_recording_question.dart';
 AudioRecordingQuestion _$AudioRecordingQuestionFromJson(
         Map<String, dynamic> json) =>
     AudioRecordingQuestion(
-      maxRecordingDurationSeconds: json['maxRecordingDurationSeconds'] as int,
+      maxRecordingDurationSeconds:
+          (json['maxRecordingDurationSeconds'] as num).toInt(),
     )
       ..type = json['type'] as String
       ..id = json['id'] as String
diff --git a/core/lib/src/models/questionnaire/questions/free_text_question.g.dart b/core/lib/src/models/questionnaire/questions/free_text_question.g.dart
index c15443724..4a6865334 100644
--- a/core/lib/src/models/questionnaire/questions/free_text_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/free_text_question.g.dart
@@ -9,8 +9,9 @@ part of 'free_text_question.dart';
 FreeTextQuestion _$FreeTextQuestionFromJson(Map<String, dynamic> json) =>
     FreeTextQuestion(
       textType: $enumDecode(_$FreeTextQuestionTypeEnumMap, json['textType']),
-      lengthRange:
-          (json['lengthRange'] as List<dynamic>).map((e) => e as int).toList(),
+      lengthRange: (json['lengthRange'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList(),
       customTypeExpression: json['customTypeExpression'] as String?,
     )
       ..type = json['type'] as String
diff --git a/core/lib/src/models/questionnaire/questions/scale_question.g.dart b/core/lib/src/models/questionnaire/questions/scale_question.g.dart
index d05ec400c..e69c71d08 100644
--- a/core/lib/src/models/questionnaire/questions/scale_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/scale_question.g.dart
@@ -22,8 +22,8 @@ ScaleQuestion _$ScaleQuestionFromJson(Map<String, dynamic> json) =>
       ..annotations = (json['annotations'] as List<dynamic>)
           .map((e) => Annotation.fromJson(e as Map<String, dynamic>))
           .toList()
-      ..minColor = json['min_color'] as int?
-      ..maxColor = json['max_color'] as int?
+      ..minColor = (json['min_color'] as num?)?.toInt()
+      ..maxColor = (json['max_color'] as num?)?.toInt()
       ..step = (json['step'] as num).toDouble();
 
 Map<String, dynamic> _$ScaleQuestionToJson(ScaleQuestion instance) {
diff --git a/core/lib/src/models/questionnaire/questions/visual_analogue_question.g.dart b/core/lib/src/models/questionnaire/questions/visual_analogue_question.g.dart
index 2511e9751..2c2a2b505 100644
--- a/core/lib/src/models/questionnaire/questions/visual_analogue_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/visual_analogue_question.g.dart
@@ -21,8 +21,8 @@ VisualAnalogueQuestion _$VisualAnalogueQuestionFromJson(
       ..maximum = (json['maximum'] as num).toDouble()
       ..step = (json['step'] as num).toDouble()
       ..initial = (json['initial'] as num).toDouble()
-      ..minimumColor = json['minimumColor'] as int
-      ..maximumColor = json['maximumColor'] as int
+      ..minimumColor = (json['minimumColor'] as num).toInt()
+      ..maximumColor = (json['maximumColor'] as num).toInt()
       ..minimumAnnotation = json['minimumAnnotation'] as String
       ..maximumAnnotation = json['maximumAnnotation'] as String;
 
diff --git a/core/lib/src/models/study_schedule/study_schedule.g.dart b/core/lib/src/models/study_schedule/study_schedule.g.dart
index 22f3cd80f..ae103a19d 100644
--- a/core/lib/src/models/study_schedule/study_schedule.g.dart
+++ b/core/lib/src/models/study_schedule/study_schedule.g.dart
@@ -10,8 +10,8 @@ StudySchedule _$StudyScheduleFromJson(Map<String, dynamic> json) =>
     StudySchedule(
       sequenceCustom: json['sequenceCustom'] as String? ?? 'ABAB',
     )
-      ..numberOfCycles = json['numberOfCycles'] as int
-      ..phaseDuration = json['phaseDuration'] as int
+      ..numberOfCycles = (json['numberOfCycles'] as num).toInt()
+      ..phaseDuration = (json['phaseDuration'] as num).toInt()
       ..includeBaseline = json['includeBaseline'] as bool
       ..sequence = $enumDecode(_$PhaseSequenceEnumMap, json['sequence']);
 

From 97d7e33dc79641c45e5c909076dfc76b6f59d9d1 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 26 Apr 2024 10:40:21 +0200
Subject: [PATCH 021/314] chore: add reset melos command

---
 melos.yaml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/melos.yaml b/melos.yaml
index 16c3c92b1..3f11616a5 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -8,16 +8,6 @@ packages:
   - core
   - flutter_common
 
-command:
-  clean:
-    hooks:
-      # Clean things very deeply, can be used to establish "pristine checkout" status
-      pre: >
-        git clean -x -d -f -q || true
-      # Additional cleanup lifecycle script, executed when `melos clean` is ran.
-      post: >
-        melos exec --flutter --concurrency=3 -- "flutter clean"
-
 scripts:
   analyze:
     run: |
@@ -76,6 +66,14 @@ scripts:
     packageFilters:
       scope: studyu_core
 
+  reset:
+    run: |
+      git clean -x -d -f -q || true
+      melos clean
+      melos exec --flutter --concurrency=1 -- "flutter clean"
+      melos bootstrap
+    description: Reset the workspace to a "pristine checkout" status.
+
   dev:designer:
     run: |
       melos exec -c 1 -- \

From 6fb574dcf5b7b67084f00895b58f4ea35e180b0f Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 26 Apr 2024 10:40:10 +0200
Subject: [PATCH 022/314] chore: upgrade deps

---
 app/pubspec.lock            | 16 ++++++++--------
 designer_v2/pubspec.lock    | 12 ++++++------
 designer_v2/pubspec.yaml    |  2 +-
 flutter_common/pubspec.lock |  4 ++--
 pubspec.lock                |  4 ++--
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index 7d2100ae0..cbad20ab3 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -109,10 +109,10 @@ packages:
     dependency: transitive
     description:
       name: camera_avfoundation
-      sha256: "9375082d2da45754277b5ae6ff2560cfecb799a4991aa9a3a2ee8e56d2bb0561"
+      sha256: "7d021e8cd30d9b71b8b92b4ad669e80af432d722d18d6aac338572754a786c15"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.15+1"
+    version: "0.9.16"
   camera_platform_interface:
     dependency: transitive
     description:
@@ -298,10 +298,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_cache_manager
-      sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba"
+      sha256: "395d6b7831f21f3b989ebedbb785545932adb9afe2622c1ffacf7f4b53a7e544"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.1"
+    version: "3.3.2"
   flutter_dotenv:
     dependency: transitive
     description:
@@ -897,10 +897,10 @@ packages:
     dependency: transitive
     description:
       name: pointycastle
-      sha256: "70fe966348fe08c34bf929582f1d8247d9d9408130723206472b4687227e4333"
+      sha256: "79fbafed02cfdbe85ef3fd06c7f4bc2cbcba0177e61b765264853d4253b21744"
       url: "https://pub.dev"
     source: hosted
-    version: "3.8.0"
+    version: "3.9.0"
   postgrest:
     dependency: transitive
     description:
@@ -1500,10 +1500,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "0a989dc7ca2bb51eac91e8fd00851297cfffd641aa7538b165c62637ca0eaa4a"
+      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "5.5.0"
   xdg_directories:
     dependency: transitive
     description:
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index dedbea596..bb00fcb1a 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -387,10 +387,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: "28ef8a8320ab3bf5752424e6bca6961ce25108afc344f3127b5155caf7a792c8"
+      sha256: "466425a64508ca00983882f523400d9169365cb9b464e2e2419f3b6545ff9c51"
       url: "https://pub.dev"
     source: hosted
-    version: "14.0.0"
+    version: "14.0.1"
   gotrue:
     dependency: transitive
     description:
@@ -728,10 +728,10 @@ packages:
     dependency: transitive
     description:
       name: pointycastle
-      sha256: "70fe966348fe08c34bf929582f1d8247d9d9408130723206472b4687227e4333"
+      sha256: "79fbafed02cfdbe85ef3fd06c7f4bc2cbcba0177e61b765264853d4253b21744"
       url: "https://pub.dev"
     source: hosted
-    version: "3.8.0"
+    version: "3.9.0"
   pool:
     dependency: transitive
     description:
@@ -1259,10 +1259,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "0a989dc7ca2bb51eac91e8fd00851297cfffd641aa7538b165c62637ca0eaa4a"
+      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "5.5.0"
   xdg_directories:
     dependency: transitive
     description:
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index e4b28a826..378fa75a5 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -23,7 +23,7 @@ dependencies:
   flutter_riverpod: ^2.5.1
   flutter_web_plugins:
     sdk: flutter
-  go_router: ^14.0.0
+  go_router: ^14.0.1
   material_color_utilities:
   material_design_icons_flutter: ^7.0.7296
   pointer_interceptor: ^0.10.1
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index b663c054c..5521f4aa5 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -704,10 +704,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "0a989dc7ca2bb51eac91e8fd00851297cfffd641aa7538b165c62637ca0eaa4a"
+      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "5.5.0"
   xdg_directories:
     dependency: transitive
     description:
diff --git a/pubspec.lock b/pubspec.lock
index 1d4a296ac..7435a66c5 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -133,10 +133,10 @@ packages:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.9.0"
   lint:
     dependency: "direct dev"
     description:

From 6bf4f3e26b89a5285894f484190d878fe4354e71 Mon Sep 17 00:00:00 2001
From: StudyU Documenter <studyu-documenter>
Date: Fri, 26 Apr 2024 13:14:09 +0000
Subject: [PATCH 023/314] docs: update UML documentation

---
 docs/uml/app/lib/uml.svg      | 4488 +++++++++++++++++----------------
 docs/uml/app/lib/util/uml.svg |  468 ++--
 2 files changed, 2573 insertions(+), 2383 deletions(-)

diff --git a/docs/uml/app/lib/uml.svg b/docs/uml/app/lib/uml.svg
index b774303a4..befab00ad 100644
--- a/docs/uml/app/lib/uml.svg
+++ b/docs/uml/app/lib/uml.svg
@@ -1,170 +1,111 @@
-<svg version="1.1" baseProfile="full" width="23475.0" height="1221.0" viewbox="0 0 23475 1221" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[MyApp
+<svg version="1.1" baseProfile="full" width="23935.3" height="1221.0" viewbox="0 0 23935.25 1221" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[AboutScreen
 	  |
-	  +queryParameters: Map&lt;String, String&gt;;
-	  +appConfig: AppConfig?;
-	  +initialRoute: String
+	  +Widget build()
 	]
 	
-	[MyApp]o-[AppConfig]
-	
-	[NotificationValidators
+	[WelcomeScreen
 	  |
-	  +didNotificationLaunchApp: bool;
-	  +wasNotificationActionHandled: bool;
-	  +wasNotificationActionCompleted: bool
+	  +Widget build()
 	]
 	
-	[StudyNotifications
+	[Preview
 	  |
-	  +subject: StudySubject?;
-	  +flutterLocalNotificationsPlugin: FlutterLocalNotificationsPlugin;
-	  +context: BuildContext;
-	  +didReceiveLocalNotificationStream: StreamController&lt;ReceivedNotification&gt;;
-	  +selectNotificationStream: StreamController&lt;String?&gt;;
-	  &lt;static&gt;+validator: NotificationValidators;
-	  &lt;static&gt;+debug: bool;
-	  &lt;static&gt;+scheduledNotificationsDebug: String?
+	  +queryParameters: Map&lt;String, String&gt;?;
+	  +appLanguage: AppLanguage;
+	  +selectedRoute: String?;
+	  +extra: String?;
+	  +study: Study?;
+	  +selectedStudyObjectId: String?;
+	  +subject: StudySubject?
 	  |
-	  &lt;static&gt;+dynamic create();
-	  -dynamic _isAndroidPermissionGranted();
-	  -dynamic _requestPermissions();
-	  -void _configureDidReceiveLocalNotificationSubject();
-	  -void _configureSelectNotificationSubject();
-	  -void _initNotificationsPlugin();
-	  +dynamic handleNotificationResponse()
+	  +bool hasRoute();
+	  +void handleQueries();
+	  +dynamic init();
+	  +dynamic handleAuthorization();
+	  +dynamic runCommands();
+	  +String? getSelectedRoute();
+	  +bool containsQuery();
+	  +bool containsQueryPair();
+	  +dynamic getStudySubject();
+	  -dynamic _createFakeSubject();
+	  +List&lt;String&gt; getInterventionIds()
 	]
 	
-	[StudyNotifications]o-[StudySubject]
-	[StudyNotifications]o-[FlutterLocalNotificationsPlugin]
-	[StudyNotifications]o-[&lt;abstract&gt;BuildContext]
-	[StudyNotifications]o-[StreamController]
-	[StudyNotifications]o-[NotificationValidators]
-	
-	[ReceivedNotification
-	  |
-	  +id: int?;
-	  +title: String?;
-	  +body: String?;
-	  +payload: String?
-	]
+	[Preview]o-[AppLanguage]
+	[Preview]o-[Study]
+	[Preview]o-[StudySubject]
 	
-	[StudyNotification
+	[IFrameHelper
 	  |
-	  +taskInstance: TaskInstance;
-	  +date: DateTime
+	  +void postRouteFinished();
+	  +void listen()
 	]
 	
-	[StudyNotification]o-[TaskInstance]
-	
-	[AppAnalytics
-	  |
-	  &lt;static&gt;-_userEnabled: bool?;
-	  &lt;static&gt;+keyAnalyticsUserEnable: String;
-	  +context: BuildContext;
-	  +subject: StudySubject?;
-	  &lt;static&gt;+isUserEnabled: dynamic
-	  |
-	  &lt;static&gt;+dynamic init();
-	  &lt;static&gt;+dynamic start();
-	  &lt;static&gt;+void setEnabled();
-	  +dynamic initBasic();
-	  +void initAdvanced()
+	[TermsScreen
 	]
 	
-	[AppAnalytics]o-[&lt;abstract&gt;BuildContext]
-	[AppAnalytics]o-[StudySubject]
-	
-	[GroupedIterable
+	[LegalSection
 	  |
-	  +data: Map&lt;K, Iterable&lt;V&gt;&gt;;
-	  +iterator: Iterator&lt;MapEntry&lt;K, Iterable&lt;V&gt;&gt;&gt;
+	  +title: String?;
+	  +description: String?;
+	  +icon: Icon?;
+	  +pdfUrl: String?;
+	  +pdfUrlLabel: String?;
+	  +acknowledgment: String?;
+	  +isChecked: bool?;
+	  +onChange: void Function(bool?)?
 	  |
-	  +Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregate();
-	  +Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregateWithKey()
+	  +Widget build()
 	]
 	
-	[Iterable]&lt;:-[GroupedIterable]
+	[LegalSection]o-[Icon]
+	[LegalSection]o-[void Function(bool?)?]
 	
-	[Cache
-	  |
-	  &lt;static&gt;+isSynchronizing: bool;
-	  &lt;static&gt;+sharedPrefs: dynamic
+	[AppOutdatedScreen
 	  |
-	  &lt;static&gt;+dynamic storeSubject();
-	  &lt;static&gt;+dynamic loadSubject();
-	  &lt;static&gt;+dynamic storeAnalytics();
-	  &lt;static&gt;+dynamic loadAnalytics();
-	  &lt;static&gt;+dynamic delete();
-	  &lt;static&gt;+dynamic synchronize()
-	]
-	
-	[ConsentScreen
+	  +Widget build()
 	]
 	
-	[ConsentCard
-	  |
-	  +consent: ConsentItem?;
-	  +index: int?;
-	  +onTapped: dynamic Function(int);
-	  +isChecked: bool?
+	[LoadingScreen
 	  |
-	  +Widget build()
+	  +sessionString: String?;
+	  +queryParameters: Map&lt;String, String&gt;?
 	]
 	
-	[ConsentCard]o-[ConsentItem]
-	[ConsentCard]o-[dynamic Function(int)]
-	
-	[ConsentElement
+	[QuestionnaireTaskWidget
 	  |
-	  +title: String;
-	  +descriptionText: String;
-	  +acknowledgmentText: String;
-	  +icon: IconData
+	  +task: QuestionnaireTask;
+	  +completionPeriod: CompletionPeriod
 	]
 	
-	[ConsentElement]o-[IconData]
-	
-	[StudyOverviewScreen
-	]
+	[QuestionnaireTaskWidget]o-[QuestionnaireTask]
+	[QuestionnaireTaskWidget]o-[CompletionPeriod]
 	
-	[_StudyOverviewScreen
+	[TaskScreen
 	  |
-	  +study: Study?
+	  +taskInstance: TaskInstance
 	  |
-	  +dynamic navigateToJourney();
-	  +dynamic navigateToEligibilityCheck();
-	  +Widget build()
+	  &lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()
 	]
 	
-	[_StudyOverviewScreen]o-[Study]
+	[TaskScreen]o-[TaskInstance]
 	
-	[StudyDetailsView
-	  |
-	  +study: Study?;
-	  +iconSize: double
+	[CheckmarkTaskWidget
 	  |
-	  +Widget build()
+	  +task: CheckmarkTask?;
+	  +completionPeriod: CompletionPeriod?
 	]
 	
-	[StudyDetailsView]o-[Study]
-	
-	[KickoffScreen
-	]
+	[CheckmarkTaskWidget]o-[CheckmarkTask]
+	[CheckmarkTaskWidget]o-[CompletionPeriod]
 	
-	[_KickoffScreen
-	  |
-	  +subject: StudySubject?;
-	  +ready: bool
+	[CapturePictureScreen
 	  |
-	  -dynamic _storeUserStudy();
-	  -Widget _constructStatusIcon();
-	  -String _getStatusText();
-	  +Widget build()
+	  +userId: String;
+	  +studyId: String
 	]
 	
-	[_KickoffScreen]o-[StudySubject]
-	
 	[EligibilityResult
 	  |
 	  +eligible: bool;
@@ -182,23 +123,32 @@
 	
 	[EligibilityScreen]o-[Study]
 	
-	[OnboardingProgress
+	[InterventionSelectionScreen
+	]
+	
+	[StudyOverviewScreen
+	]
+	
+	[_StudyOverviewScreen
 	  |
-	  +stage: int;
-	  +progress: double
+	  +study: Study?
 	  |
-	  -double _getProgressForStage();
+	  +dynamic navigateToJourney();
+	  +dynamic navigateToEligibilityCheck();
 	  +Widget build()
 	]
 	
-	[StudySelectionScreen
-	]
+	[_StudyOverviewScreen]o-[Study]
 	
-	[InviteCodeDialog
+	[StudyDetailsView
+	  |
+	  +study: Study?;
+	  +iconSize: double
+	  |
+	  +Widget build()
 	]
 	
-	[InterventionSelectionScreen
-	]
+	[StudyDetailsView]o-[Study]
 	
 	[JourneyOverviewScreen
 	]
@@ -255,61 +205,63 @@
 	
 	[TimelineChild]o-[&lt;abstract&gt;Widget]
 	
-	[AverageSectionWidget
+	[KickoffScreen
+	]
+	
+	[_KickoffScreen
 	  |
-	  +section: AverageSection;
-	  +titlePos: List&lt;int&gt;;
-	  +phasePos: List&lt;int&gt;
+	  +subject: StudySubject?;
+	  +ready: bool
 	  |
-	  +Widget build();
-	  +Widget getLegend();
-	  +Widget getDiagram();
-	  +BarChartData getChartData();
-	  +Widget getTitles();
-	  +Widget getValues();
-	  +List&lt;BarChartGroupData&gt; getBarGroups();
-	  +FlGridData getGridData();
-	  +MaterialColor getColor();
-	  +int getDayIndex();
-	  +Iterable&lt;DiagramDatum&gt; getAggregatedData();
-	  +Map&lt;String, String?&gt; getInterventionNames()
+	  -dynamic _storeUserStudy();
+	  -Widget _constructStatusIcon();
+	  -String _getStatusText();
+	  +Widget build()
 	]
 	
-	[AverageSectionWidget]o-[AverageSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[AverageSectionWidget]
+	[_KickoffScreen]o-[StudySubject]
 	
-	[DiagramDatum
-	  |
-	  +x: num;
-	  +value: num;
-	  +timestamp: DateTime?;
-	  +intervention: String
+	[ConsentScreen
 	]
 	
-	[LinearRegressionSectionWidget
+	[ConsentCard
 	  |
-	  +section: LinearRegressionSection
+	  +consent: ConsentItem?;
+	  +index: int?;
+	  +onTapped: dynamic Function(int);
+	  +isChecked: bool?
 	  |
 	  +Widget build()
 	]
 	
-	[LinearRegressionSectionWidget]o-[LinearRegressionSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[LinearRegressionSectionWidget]
+	[ConsentCard]o-[ConsentItem]
+	[ConsentCard]o-[dynamic Function(int)]
 	
-	[ReportHistoryScreen
+	[ConsentElement
 	  |
-	  +Widget build()
+	  +title: String;
+	  +descriptionText: String;
+	  +acknowledgmentText: String;
+	  +icon: IconData
 	]
 	
-	[ReportHistoryItem
+	[ConsentElement]o-[IconData]
+	
+	[StudySelectionScreen
+	]
+	
+	[InviteCodeDialog
+	]
+	
+	[OnboardingProgress
 	  |
-	  +subject: StudySubject
+	  +stage: int;
+	  +progress: double
 	  |
+	  -double _getProgressForStage();
 	  +Widget build()
 	]
 	
-	[ReportHistoryItem]o-[StudySubject]
-	
 	[ReportDetailsScreen
 	  |
 	  +subject: StudySubject
@@ -327,31 +279,19 @@
 	
 	[&lt;abstract&gt;GenericSection]&lt;:-[GeneralDetailsSection]
 	
-	[&lt;abstract&gt;GenericSection
-	  |
-	  +subject: StudySubject?;
-	  +onTap: void Function()?
+	[ReportHistoryScreen
 	  |
-	  +Widget buildContent();
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;GenericSection]o-[StudySubject]
-	[&lt;abstract&gt;GenericSection]o-[void Function()?]
-	
-	[DisclaimerSection
-	  |
-	  +Widget buildContent()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[DisclaimerSection]
-	
-	[&lt;abstract&gt;ReportSectionWidget
+	[ReportHistoryItem
 	  |
 	  +subject: StudySubject
+	  |
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;ReportSectionWidget]o-[StudySubject]
+	[ReportHistoryItem]o-[StudySubject]
 	
 	[LegendWidget
 	  |
@@ -441,6 +381,66 @@
 	  +Widget build()
 	]
 	
+	[&lt;abstract&gt;ReportSectionWidget
+	  |
+	  +subject: StudySubject
+	]
+	
+	[&lt;abstract&gt;ReportSectionWidget]o-[StudySubject]
+	
+	[&lt;abstract&gt;GenericSection
+	  |
+	  +subject: StudySubject?;
+	  +onTap: void Function()?
+	  |
+	  +Widget buildContent();
+	  +Widget build()
+	]
+	
+	[&lt;abstract&gt;GenericSection]o-[StudySubject]
+	[&lt;abstract&gt;GenericSection]o-[void Function()?]
+	
+	[AverageSectionWidget
+	  |
+	  +section: AverageSection;
+	  +titlePos: List&lt;int&gt;;
+	  +phasePos: List&lt;int&gt;
+	  |
+	  +Widget build();
+	  +Widget getLegend();
+	  +Widget getDiagram();
+	  +BarChartData getChartData();
+	  +Widget getTitles();
+	  +Widget getValues();
+	  +List&lt;BarChartGroupData&gt; getBarGroups();
+	  +FlGridData getGridData();
+	  +MaterialColor getColor();
+	  +int getDayIndex();
+	  +Iterable&lt;DiagramDatum&gt; getAggregatedData();
+	  +Map&lt;String, String?&gt; getInterventionNames()
+	]
+	
+	[AverageSectionWidget]o-[AverageSection]
+	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[AverageSectionWidget]
+	
+	[DiagramDatum
+	  |
+	  +x: num;
+	  +value: num;
+	  +timestamp: DateTime?;
+	  +intervention: String
+	]
+	
+	[LinearRegressionSectionWidget
+	  |
+	  +section: LinearRegressionSection
+	  |
+	  +Widget build()
+	]
+	
+	[LinearRegressionSectionWidget]o-[LinearRegressionSection]
+	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[LinearRegressionSectionWidget]
+	
 	[ReportSectionContainer
 	  |
 	  +section: ReportSection;
@@ -458,6 +458,13 @@
 	[ReportSectionContainer]o-[StudySubject]
 	[ReportSectionContainer]o-[void Function()?]
 	
+	[DisclaimerSection
+	  |
+	  +Widget buildContent()
+	]
+	
+	[&lt;abstract&gt;GenericSection]&lt;:-[DisclaimerSection]
+	
 	[Settings
 	]
 	
@@ -479,47 +486,26 @@
 	
 	[DeleteAlertDialog]o-[StudySubject]
 	
-	[TaskBox
+	[FAQ
 	  |
-	  +taskInstance: TaskInstance;
-	  +icon: Icon;
-	  +onCompleted: dynamic Function()
+	  +Widget build()
 	]
 	
-	[TaskBox]o-[TaskInstance]
-	[TaskBox]o-[Icon]
-	[TaskBox]o-[dynamic Function()]
-	
-	[ProgressRow
+	[Entry
 	  |
-	  +subject: StudySubject?
+	  +title: String;
+	  +children: List&lt;Entry&gt;
 	]
 	
-	[ProgressRow]o-[StudySubject]
-	
-	[InterventionSegment
+	[EntryItem
 	  |
-	  +intervention: Intervention;
-	  +percentCompleted: double;
-	  +percentMissed: double;
-	  +isCurrent: bool;
-	  +isFuture: bool;
-	  +phaseDuration: int
+	  +entry: Entry
 	  |
-	  +List&lt;Widget&gt; buildSeparators();
+	  -Widget _buildTiles();
 	  +Widget build()
 	]
 	
-	[InterventionSegment]o-[Intervention]
-	
-	[TaskOverview
-	  |
-	  +subject: StudySubject?;
-	  +scheduleToday: List&lt;TaskInstance&gt;?;
-	  +interventionIcon: String?
-	]
-	
-	[TaskOverview]o-[StudySubject]
+	[EntryItem]o-[Entry]
 	
 	[ContactScreen
 	]
@@ -565,27 +551,6 @@
 	[ContactItemType]o-[ContactItemType]
 	[Enum]&lt;:--[ContactItemType]
 	
-	[FAQ
-	  |
-	  +Widget build()
-	]
-	
-	[Entry
-	  |
-	  +title: String;
-	  +children: List&lt;Entry&gt;
-	]
-	
-	[EntryItem
-	  |
-	  +entry: Entry
-	  |
-	  -Widget _buildTiles();
-	  +Widget build()
-	]
-	
-	[EntryItem]o-[Entry]
-	
 	[DashboardScreen
 	  |
 	  +error: String?
@@ -611,192 +576,219 @@
 	
 	[StudyFinishedPlaceholder]o-[SizedBox]
 	
-	[QuestionnaireTaskWidget
+	[TaskOverview
 	  |
-	  +task: QuestionnaireTask;
-	  +completionPeriod: CompletionPeriod
+	  +subject: StudySubject?;
+	  +scheduleToday: List&lt;TaskInstance&gt;?;
+	  +interventionIcon: String?
 	]
 	
-	[QuestionnaireTaskWidget]o-[QuestionnaireTask]
-	[QuestionnaireTaskWidget]o-[CompletionPeriod]
+	[TaskOverview]o-[StudySubject]
 	
-	[TaskScreen
-	  |
-	  +taskInstance: TaskInstance
+	[ProgressRow
 	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()
+	  +subject: StudySubject?
 	]
 	
-	[TaskScreen]o-[TaskInstance]
+	[ProgressRow]o-[StudySubject]
 	
-	[CheckmarkTaskWidget
+	[InterventionSegment
 	  |
-	  +task: CheckmarkTask?;
-	  +completionPeriod: CompletionPeriod?
-	]
-	
-	[CheckmarkTaskWidget]o-[CheckmarkTask]
-	[CheckmarkTaskWidget]o-[CompletionPeriod]
-	
-	[AppOutdatedScreen
+	  +intervention: Intervention;
+	  +percentCompleted: double;
+	  +percentMissed: double;
+	  +isCurrent: bool;
+	  +isFuture: bool;
+	  +phaseDuration: int
 	  |
+	  +List&lt;Widget&gt; buildSeparators();
 	  +Widget build()
 	]
 	
-	[TermsScreen
-	]
+	[InterventionSegment]o-[Intervention]
 	
-	[LegalSection
-	  |
-	  +title: String?;
-	  +description: String?;
-	  +icon: Icon?;
-	  +pdfUrl: String?;
-	  +pdfUrlLabel: String?;
-	  +acknowledgment: String?;
-	  +isChecked: bool?;
-	  +onChange: void Function(bool?)?
+	[TaskBox
 	  |
-	  +Widget build()
+	  +taskInstance: TaskInstance;
+	  +icon: Icon;
+	  +onCompleted: dynamic Function()
 	]
 	
-	[LegalSection]o-[Icon]
-	[LegalSection]o-[void Function(bool?)?]
+	[TaskBox]o-[TaskInstance]
+	[TaskBox]o-[Icon]
+	[TaskBox]o-[dynamic Function()]
 	
-	[IFrameHelper
+	[Routes
 	  |
-	  +void postRouteFinished();
-	  +void listen()
+	  &lt;static&gt;+loading: String;
+	  &lt;static&gt;+preview: String;
+	  &lt;static&gt;+appOutdated: String;
+	  &lt;static&gt;+dashboard: String;
+	  &lt;static&gt;+welcome: String;
+	  &lt;static&gt;+about: String;
+	  &lt;static&gt;+terms: String;
+	  &lt;static&gt;+studySelection: String;
+	  &lt;static&gt;+studyOverview: String;
+	  &lt;static&gt;+interventionSelection: String;
+	  &lt;static&gt;+journey: String;
+	  &lt;static&gt;+consent: String;
+	  &lt;static&gt;+kickoff: String;
+	  &lt;static&gt;+contact: String;
+	  &lt;static&gt;+faq: String;
+	  &lt;static&gt;+appSettings: String;
+	  &lt;static&gt;+questionnaire: String;
+	  &lt;static&gt;+reportHistory: String;
+	  &lt;static&gt;+reportDetails: String;
+	  &lt;static&gt;+performanceDetails: String
+	  |
+	  &lt;static&gt;+Route&lt;dynamic&gt; unknownRoute();
+	  &lt;static&gt;+Route&lt;dynamic&gt;? generateRoute()
 	]
 	
-	[LoadingScreen
-	  |
-	  +sessionString: String?;
-	  +queryParameters: Map&lt;String, String&gt;?
-	]
-	
-	[AboutScreen
+	[NotificationValidators
 	  |
-	  +Widget build()
+	  +didNotificationLaunchApp: bool;
+	  +wasNotificationActionHandled: bool;
+	  +wasNotificationActionCompleted: bool
 	]
 	
-	[Preview
+	[StudyNotifications
 	  |
-	  +queryParameters: Map&lt;String, String&gt;?;
-	  +appLanguage: AppLanguage;
-	  +selectedRoute: String?;
-	  +extra: String?;
-	  +study: Study?;
-	  +selectedStudyObjectId: String?;
-	  +subject: StudySubject?
+	  +subject: StudySubject?;
+	  +flutterLocalNotificationsPlugin: FlutterLocalNotificationsPlugin;
+	  +context: BuildContext;
+	  +didReceiveLocalNotificationStream: StreamController&lt;ReceivedNotification&gt;;
+	  +selectNotificationStream: StreamController&lt;String?&gt;;
+	  &lt;static&gt;+validator: NotificationValidators;
+	  &lt;static&gt;+debug: bool;
+	  &lt;static&gt;+scheduledNotificationsDebug: String?
 	  |
-	  +bool hasRoute();
-	  +void handleQueries();
-	  +dynamic init();
-	  +dynamic handleAuthorization();
-	  +dynamic runCommands();
-	  +String? getSelectedRoute();
-	  +bool containsQuery();
-	  +bool containsQueryPair();
-	  +dynamic getStudySubject();
-	  -dynamic _createFakeSubject();
-	  +List&lt;String&gt; getInterventionIds()
+	  &lt;static&gt;+dynamic create();
+	  -dynamic _isAndroidPermissionGranted();
+	  -dynamic _requestPermissions();
+	  -void _configureDidReceiveLocalNotificationSubject();
+	  -void _configureSelectNotificationSubject();
+	  -void _initNotificationsPlugin();
+	  +dynamic handleNotificationResponse()
 	]
 	
-	[Preview]o-[AppLanguage]
-	[Preview]o-[Study]
-	[Preview]o-[StudySubject]
+	[StudyNotifications]o-[StudySubject]
+	[StudyNotifications]o-[FlutterLocalNotificationsPlugin]
+	[StudyNotifications]o-[&lt;abstract&gt;BuildContext]
+	[StudyNotifications]o-[StreamController]
+	[StudyNotifications]o-[NotificationValidators]
 	
-	[WelcomeScreen
+	[ReceivedNotification
 	  |
-	  +Widget build()
+	  +id: int?;
+	  +title: String?;
+	  +body: String?;
+	  +payload: String?
 	]
 	
-	[ThemeConfig
+	[StudyNotification
 	  |
-	  &lt;static&gt;+SliderThemeData coloredSliderTheme()
+	  +taskInstance: TaskInstance;
+	  +date: DateTime
 	]
 	
-	[HtmlText
+	[StudyNotification]o-[TaskInstance]
+	
+	[TemporaryStorageHandler
+	  |
+	  &lt;static&gt;-_stagingBaseNamePrefix: String;
+	  &lt;static&gt;-_audioFileType: String;
+	  &lt;static&gt;-_imageFileType: String;
+	  -_userId: String;
+	  -_studyId: String
+	  |
+	  -String _buildFileName();
+	  &lt;static&gt;-dynamic _getMultimodalTempDirectory();
+	  &lt;static&gt;-dynamic _getMultimodalUploadDirectory();
+	  &lt;static&gt;+dynamic moveStagingFileToUploadDirectory();
+	  &lt;static&gt;+dynamic getFutureBlobFiles();
+	  +dynamic getStagingAudio();
+	  +dynamic getStagingImage();
+	  &lt;static&gt;+dynamic deleteAllStagingFiles()
+	]
+	
+	[GroupedIterable
 	  |
-	  +text: String?;
-	  +style: TextStyle?;
-	  +centered: bool
+	  +data: Map&lt;K, Iterable&lt;V&gt;&gt;;
+	  +iterator: Iterator&lt;MapEntry&lt;K, Iterable&lt;V&gt;&gt;&gt;
 	  |
-	  +Widget build()
+	  +Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregate();
+	  +Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregateWithKey()
 	]
 	
-	[HtmlText]o-[TextStyle]
+	[Iterable]&lt;:-[GroupedIterable]
 	
-	[RoundCheckbox
+	[Cache
 	  |
-	  +onChanged: dynamic Function(bool)?;
-	  +value: bool?
+	  &lt;static&gt;+isSynchronizing: bool
 	  |
-	  +Widget build()
+	  &lt;static&gt;+dynamic storeSubject();
+	  &lt;static&gt;+dynamic loadSubject();
+	  &lt;static&gt;+dynamic storeAnalytics();
+	  &lt;static&gt;+dynamic loadAnalytics();
+	  &lt;static&gt;+dynamic delete();
+	  &lt;static&gt;+dynamic uploadBlobFiles();
+	  &lt;static&gt;+dynamic synchronize()
 	]
 	
-	[RoundCheckbox]o-[dynamic Function(bool)?]
-	
-	[CustomSlider
+	[AppAnalytics
 	  |
-	  +value: double?;
-	  +minValue: double?;
-	  +maxValue: double?;
-	  +minorTick: int?;
-	  +onChanged: dynamic Function(double)?;
-	  +onChangeEnd: dynamic Function(double)?;
-	  +activeColor: Color?;
-	  +inactiveColor: Color?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +thumbColor: Color?;
-	  +isColored: bool;
-	  +labelValuePrecision: int;
-	  +tickValuePrecision: int;
-	  +linearStep: bool;
-	  +steps: AnnotatedScaleQuestion?
+	  &lt;static&gt;-_userEnabled: bool?;
+	  &lt;static&gt;+keyAnalyticsUserEnable: String;
+	  +context: BuildContext;
+	  +subject: StudySubject?;
+	  &lt;static&gt;+isUserEnabled: dynamic
 	  |
-	  +Widget build()
+	  &lt;static&gt;+dynamic init();
+	  &lt;static&gt;+dynamic start();
+	  &lt;static&gt;+void setEnabled();
+	  +dynamic initBasic();
+	  +void initAdvanced()
 	]
 	
-	[CustomSlider]o-[dynamic Function(double)?]
-	[CustomSlider]o-[Color]
-	[CustomSlider]o-[AnnotatedScaleQuestion]
+	[AppAnalytics]o-[&lt;abstract&gt;BuildContext]
+	[AppAnalytics]o-[StudySubject]
 	
-	[CustomTrackShape
+	[ThemeConfig
 	  |
-	  +Rect getPreferredRect()
+	  &lt;static&gt;+SliderThemeData coloredSliderTheme()
 	]
 	
-	[RoundedRectSliderTrackShape]&lt;:-[CustomTrackShape]
-	
-	[QuestionHeader
-	  |
-	  +prompt: String?;
-	  +subtitle: String?;
-	  +rationale: String?
+	[ScaleQuestionWidget
 	  |
-	  -List&lt;Widget&gt; _buildSubtitle();
-	  -List&lt;Widget&gt; _buildRationaleButton();
-	  +Widget build()
+	  +question: ScaleQuestion;
+	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
 	]
 	
-	[QuestionnaireWidget
+	[ScaleQuestionWidget]o-[ScaleQuestion]
+	[ScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
+	[&lt;abstract&gt;QuestionWidget]&lt;:-[ScaleQuestionWidget]
+	
+	[VisualAnalogueQuestionWidget
 	  |
-	  +title: String?;
-	  +header: String?;
-	  +footer: String?;
-	  +questions: List&lt;Question&lt;dynamic&gt;&gt;
+	  +question: VisualAnalogueQuestion;
+	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
 	]
 	
-	[HtmlTextBox
-	  |
-	  +text: String?
+	[VisualAnalogueQuestionWidget]o-[VisualAnalogueQuestion]
+	[VisualAnalogueQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
+	[&lt;abstract&gt;QuestionWidget]&lt;:-[VisualAnalogueQuestionWidget]
+	
+	[AnnotatedScaleQuestionWidget
 	  |
-	  +Widget build()
+	  +question: AnnotatedScaleQuestion;
+	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
 	]
 	
+	[AnnotatedScaleQuestionWidget]o-[AnnotatedScaleQuestion]
+	[AnnotatedScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
+	[&lt;abstract&gt;QuestionWidget]&lt;:-[AnnotatedScaleQuestionWidget]
+	
 	[BooleanQuestionWidget
 	  |
 	  +question: BooleanQuestion;
@@ -807,11 +799,6 @@
 	[BooleanQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
 	[&lt;abstract&gt;QuestionWidget]&lt;:-[BooleanQuestionWidget]
 	
-	[&lt;abstract&gt;QuestionWidget
-	  |
-	  +subtitle: String?
-	]
-	
 	[FreeTextQuestionWidget
 	  |
 	  +question: FreeTextQuestion;
@@ -822,26 +809,11 @@
 	[FreeTextQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
 	[&lt;abstract&gt;QuestionWidget]&lt;:-[FreeTextQuestionWidget]
 	
-	[ScaleQuestionWidget
-	  |
-	  +question: ScaleQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[ScaleQuestionWidget]o-[ScaleQuestion]
-	[ScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ScaleQuestionWidget]
-	
-	[VisualAnalogueQuestionWidget
+	[&lt;abstract&gt;QuestionWidget
 	  |
-	  +question: VisualAnalogueQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
+	  +subtitle: String?
 	]
 	
-	[VisualAnalogueQuestionWidget]o-[VisualAnalogueQuestion]
-	[VisualAnalogueQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[VisualAnalogueQuestionWidget]
-	
 	[ChoiceQuestionWidget
 	  |
 	  +question: ChoiceQuestion;
@@ -854,99 +826,94 @@
 	[ChoiceQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)]
 	[&lt;abstract&gt;QuestionWidget]&lt;:-[ChoiceQuestionWidget]
 	
-	[AnnotatedScaleQuestionWidget
+	[AudioRecordingQuestionWidget
 	  |
-	  +question: AnnotatedScaleQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
+	  +question: AudioRecordingQuestion;
+	  +onDone: dynamic Function(Answer&lt;FutureBlobFile&gt;)?
 	]
 	
-	[AnnotatedScaleQuestionWidget]o-[AnnotatedScaleQuestion]
-	[AnnotatedScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[AnnotatedScaleQuestionWidget]
+	[AudioRecordingQuestionWidget]o-[AudioRecordingQuestion]
+	[AudioRecordingQuestionWidget]o-[dynamic Function(Answer&lt;FutureBlobFile&gt;)?]
+	[&lt;abstract&gt;QuestionWidget]&lt;:-[AudioRecordingQuestionWidget]
 	
-	[QuestionContainer
+	[QuestionnaireWidget
 	  |
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;, int);
-	  +question: Question&lt;dynamic&gt;;
-	  +index: int
+	  +title: String?;
+	  +header: String?;
+	  +footer: String?;
+	  +questions: List&lt;Question&lt;dynamic&gt;&gt;
 	]
 	
-	[QuestionContainer]o-[dynamic Function(Answer&lt;dynamic&gt;, int)]
-	[QuestionContainer]o-[&lt;abstract&gt;Question]
-	
-	[InterventionCard
+	[HtmlTextBox
 	  |
-	  +intervention: Intervention;
-	  +selected: bool;
-	  +showCheckbox: bool;
-	  +showTasks: bool;
-	  +showDescription: bool;
-	  +onTap: dynamic Function()?
+	  +text: String?
 	  |
 	  +Widget build()
 	]
 	
-	[InterventionCard]o-[Intervention]
-	[InterventionCard]o-[dynamic Function()?]
-	
-	[InterventionCardTitle
-	  |
-	  +intervention: Intervention?;
-	  +selected: bool;
-	  +showCheckbox: bool;
-	  +showDescriptionButton: bool;
-	  +onTap: dynamic Function()?
+	[ImageCapturingQuestionWidget
 	  |
-	  +Widget build()
+	  +question: ImageCapturingQuestion;
+	  +onDone: dynamic Function(Answer&lt;FutureBlobFile&gt;)?
 	]
 	
-	[InterventionCardTitle]o-[Intervention]
-	[InterventionCardTitle]o-[dynamic Function()?]
+	[ImageCapturingQuestionWidget]o-[ImageCapturingQuestion]
+	[ImageCapturingQuestionWidget]o-[dynamic Function(Answer&lt;FutureBlobFile&gt;)?]
+	[&lt;abstract&gt;QuestionWidget]&lt;:-[ImageCapturingQuestionWidget]
 	
-	[InterventionCardDescription
-	  |
-	  +intervention: Intervention
+	[QuestionContainer
 	  |
-	  +Widget build()
+	  +onDone: dynamic Function(Answer&lt;dynamic&gt;, int);
+	  +question: Question&lt;dynamic&gt;;
+	  +index: int
 	]
 	
-	[InterventionCardDescription]o-[Intervention]
+	[QuestionContainer]o-[dynamic Function(Answer&lt;dynamic&gt;, int)]
+	[QuestionContainer]o-[&lt;abstract&gt;Question]
 	
-	[_TaskList
+	[QuestionHeader
 	  |
-	  +tasks: List&lt;InterventionTask&gt;
+	  +prompt: String?;
+	  +subtitle: String?;
+	  +rationale: String?
 	  |
-	  +String scheduleString();
+	  -List&lt;Widget&gt; _buildSubtitle();
+	  -List&lt;Widget&gt; _buildRationaleButton();
 	  +Widget build()
 	]
 	
-	[SelectableButton
+	[CustomSlider
 	  |
-	  +child: Widget;
-	  +selected: bool;
-	  +onTap: dynamic Function()?
+	  +value: double?;
+	  +minValue: double?;
+	  +maxValue: double?;
+	  +minorTick: int?;
+	  +onChanged: dynamic Function(double)?;
+	  +onChangeEnd: dynamic Function(double)?;
+	  +activeColor: Color?;
+	  +inactiveColor: Color?;
+	  +minColor: Color?;
+	  +maxColor: Color?;
+	  +thumbColor: Color?;
+	  +isColored: bool;
+	  +labelValuePrecision: int;
+	  +tickValuePrecision: int;
+	  +linearStep: bool;
+	  +steps: AnnotatedScaleQuestion?
 	  |
-	  -Color _getFillColor();
-	  -Color _getTextColor();
 	  +Widget build()
 	]
 	
-	[SelectableButton]o-[&lt;abstract&gt;Widget]
-	[SelectableButton]o-[dynamic Function()?]
+	[CustomSlider]o-[dynamic Function(double)?]
+	[CustomSlider]o-[Color]
+	[CustomSlider]o-[AnnotatedScaleQuestion]
 	
-	[StudyTile
-	  |
-	  +title: String?;
-	  +description: String?;
-	  +iconName: String;
-	  +onTap: dynamic Function()?;
-	  +contentPadding: EdgeInsetsGeometry
+	[CustomTrackShape
 	  |
-	  +Widget build()
+	  +Rect getPreferredRect()
 	]
 	
-	[StudyTile]o-[dynamic Function()?]
-	[StudyTile]o-[&lt;abstract&gt;EdgeInsetsGeometry]
+	[RoundedRectSliderTrackShape]&lt;:-[CustomTrackShape]
 	
 	[BottomOnboardingNavigation
 	  |
@@ -966,973 +933,933 @@
 	[BottomOnboardingNavigation]o-[Icon]
 	[BottomOnboardingNavigation]o-[&lt;abstract&gt;Widget]
 	
-	[Routes
+	[InterventionCard
 	  |
-	  &lt;static&gt;+loading: String;
-	  &lt;static&gt;+preview: String;
-	  &lt;static&gt;+appOutdated: String;
-	  &lt;static&gt;+dashboard: String;
-	  &lt;static&gt;+welcome: String;
-	  &lt;static&gt;+about: String;
-	  &lt;static&gt;+terms: String;
-	  &lt;static&gt;+studySelection: String;
-	  &lt;static&gt;+studyOverview: String;
-	  &lt;static&gt;+interventionSelection: String;
-	  &lt;static&gt;+journey: String;
-	  &lt;static&gt;+consent: String;
-	  &lt;static&gt;+kickoff: String;
-	  &lt;static&gt;+contact: String;
-	  &lt;static&gt;+faq: String;
-	  &lt;static&gt;+appSettings: String;
-	  &lt;static&gt;+questionnaire: String;
-	  &lt;static&gt;+reportHistory: String;
-	  &lt;static&gt;+reportDetails: String;
-	  &lt;static&gt;+performanceDetails: String
+	  +intervention: Intervention;
+	  +selected: bool;
+	  +showCheckbox: bool;
+	  +showTasks: bool;
+	  +showDescription: bool;
+	  +onTap: dynamic Function()?
 	  |
-	  &lt;static&gt;+Route&lt;dynamic&gt; unknownRoute();
-	  &lt;static&gt;+Route&lt;dynamic&gt;? generateRoute()
+	  +Widget build()
+	]
+	
+	[InterventionCard]o-[Intervention]
+	[InterventionCard]o-[dynamic Function()?]
+	
+	[InterventionCardTitle
+	  |
+	  +intervention: Intervention?;
+	  +selected: bool;
+	  +showCheckbox: bool;
+	  +showDescriptionButton: bool;
+	  +onTap: dynamic Function()?
+	  |
+	  +Widget build()
+	]
+	
+	[InterventionCardTitle]o-[Intervention]
+	[InterventionCardTitle]o-[dynamic Function()?]
+	
+	[InterventionCardDescription
+	  |
+	  +intervention: Intervention
+	  |
+	  +Widget build()
+	]
+	
+	[InterventionCardDescription]o-[Intervention]
+	
+	[_TaskList
+	  |
+	  +tasks: List&lt;InterventionTask&gt;
+	  |
+	  +String scheduleString();
+	  +Widget build()
 	]
 	
+	[StudyTile
+	  |
+	  +title: String?;
+	  +description: String?;
+	  +iconName: String;
+	  +onTap: dynamic Function()?;
+	  +contentPadding: EdgeInsetsGeometry
+	  |
+	  +Widget build()
+	]
+	
+	[StudyTile]o-[dynamic Function()?]
+	[StudyTile]o-[&lt;abstract&gt;EdgeInsetsGeometry]
+	
+	[RoundCheckbox
+	  |
+	  +onChanged: dynamic Function(bool)?;
+	  +value: bool?
+	  |
+	  +Widget build()
+	]
+	
+	[RoundCheckbox]o-[dynamic Function(bool)?]
+	
+	[SelectableButton
+	  |
+	  +child: Widget;
+	  +selected: bool;
+	  +onTap: dynamic Function()?
+	  |
+	  -Color _getFillColor();
+	  -Color _getTextColor();
+	  +Widget build()
+	]
+	
+	[SelectableButton]o-[&lt;abstract&gt;Widget]
+	[SelectableButton]o-[dynamic Function()?]
+	
+	[HtmlText
+	  |
+	  +text: String?;
+	  +style: TextStyle?;
+	  +centered: bool
+	  |
+	  +Widget build()
+	]
+	
+	[HtmlText]o-[TextStyle]
+	
+	[MyApp
+	  |
+	  +queryParameters: Map&lt;String, String&gt;;
+	  +appConfig: AppConfig?;
+	  +initialRoute: String
+	]
+	
+	[MyApp]o-[AppConfig]
+	
 	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
+	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="1221.0" width="23475.0" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="1221.0" width="23935.3" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
 				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M164.0 261.2 L164 413 L164 584 L164.0 584.0 " fill="none"></path>
+					<path d="M577.2 782.9 L575.75 786 L575.75 934.5 L575.8 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M169.3 251.8 L164.0 261.2 L158.7 251.8 L164.0 242.5 Z"></path>
+						<path d="M586.0 776.7 L577.2 782.9 L576.3 772.2 L585.1 766.0 Z"></path>
 					</g>
-					<path d="M4080.4 625.1 L1994.75 786 L5237.25 947.0204390613172 L5237.3 947.0 " fill="none"></path>
+					<path d="M662.8 784.7 L662.75 786 L1779.75 945.6409586056645 L1779.8 945.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4090.1 629.7 L4080.4 625.1 L4089.3 619.0 L4099.0 623.6 Z"></path>
+						<path d="M668.1 775.3 L662.8 784.7 L657.4 775.3 L662.8 766.0 Z"></path>
 					</g>
-					<path d="M4743.6 629.2 L6492 786 L6492 934.5 L6492.0 934.5 " fill="none"></path>
+					<path d="M850.4 614.9 L2932.25 786 L6618.75 947.3735486454024 L6618.8 947.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4734.8 623.1 L4743.6 629.2 L4733.8 633.7 L4725.0 627.6 Z"></path>
+						<path d="M841.5 608.8 L850.4 614.9 L840.6 619.5 L831.8 613.4 Z"></path>
 					</g>
-					<path d="M4743.6 627.4 L6624.75 786 L6708.733993902439 934.5 L6708.7 934.5 " fill="none"></path>
+					<path d="M6813.1 610.5 L9430.75 786 L9469.233231707318 934.5 L9469.2 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4734.7 621.4 L4743.6 627.4 L4733.9 632.0 L4725.0 625.9 Z"></path>
+						<path d="M6804.2 604.5 L6813.1 610.5 L6803.5 615.2 L6794.5 609.2 Z"></path>
 					</g>
-					<path d="M4743.6 617.3 L7880.5 786 L7880.5 934.5 L7880.5 934.5 " fill="none"></path>
+					<path d="M6813.1 609.7 L9642 786 L9642 934.5 L9642.0 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4734.6 611.5 L4743.6 617.3 L4734.0 622.2 L4725.0 616.3 Z"></path>
+						<path d="M6804.1 603.8 L6813.1 609.7 L6803.5 614.4 L6794.5 608.5 Z"></path>
 					</g>
-					<path d="M4080.4 623.6 L1844 786 L1844 904 L1844.0 904.0 " fill="none"></path>
+					<path d="M1515.7 252.5 L1456.25 413 L1456.25 584 L1456.3 584.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4090.1 628.2 L4080.4 623.6 L4089.3 617.6 L4099.0 622.2 Z"></path>
+						<path d="M1524.0 245.6 L1515.7 252.5 L1514.0 241.9 L1522.2 235.0 Z"></path>
 					</g>
-					<path d="M6128.6 612.6 L7988.25 786 L8049.596798780488 934.5 L8049.6 934.5 " fill="none"></path>
+					<path d="M1562.2 251.9 L1636.75 413 L1655.0878016085792 584 L1655.1 584.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6119.8 606.4 L6128.6 612.6 L6118.8 617.0 L6110.0 610.8 Z"></path>
+						<path d="M1563.1 241.2 L1562.2 251.9 L1553.4 245.7 L1554.3 235.0 Z"></path>
 					</g>
-					<path d="M3885.6 610.9 L6737.5 786 L6719.390243902439 934.5 L6719.4 934.5 " fill="none"></path>
+					<path d="M7230.1 613.6 L9759.5 786 L9829.675304878048 934.5 L9829.7 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3876.6 605.0 L3885.6 610.9 L3876.0 615.7 L3867.0 609.8 Z"></path>
+						<path d="M7221.2 607.7 L7230.1 613.6 L7220.4 618.3 L7211.5 612.3 Z"></path>
 					</g>
-					<path d="M3513.4 620.3 L2034.75 786 L5237.25 946.983908045977 L5237.3 947.0 " fill="none"></path>
+					<path d="M2060.9 249.1 L2202.25 413 L2202.25 584 L2202.3 584.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3523.3 624.6 L3513.4 620.3 L3522.1 614.0 L3532.0 618.3 Z"></path>
+						<path d="M2058.8 238.6 L2060.9 249.1 L2050.8 245.6 L2048.7 235.0 Z"></path>
 					</g>
-					<path d="M1447.5 225.3 L1447.5 413 L1447.5 538 L1447.5 538.0 " fill="none"></path>
-					<path d="M1452.8 225.3 L1447.5 225.3 L1442.2 225.3 L1447.5 212.0 Z"></path>
-					<path d="M2087.8 278.8 L1956.25 413 L1956.25 584 L1956.3 584.0 " fill="none"></path>
+					<path d="M1952.4 246.6 L1742.75 413 L1663.89745308311 584 L1663.9 584.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2098.1 275.9 L2087.8 278.8 L2090.5 268.4 L2100.9 265.5 Z"></path>
+						<path d="M1963.0 245.0 L1952.4 246.6 L1956.4 236.6 L1967.0 235.0 Z"></path>
 					</g>
-					<path d="M2206.5 282.6 L2264 413 L2264 584 L2264.0 584.0 " fill="none"></path>
+					<path d="M2576.5 253.7 L2576.5 413 L2576.5 584 L2576.5 584.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2207.6 271.9 L2206.5 282.6 L2197.8 276.2 L2198.9 265.5 Z"></path>
+						<path d="M2581.8 244.3 L2576.5 253.7 L2571.2 244.3 L2576.5 235.0 Z"></path>
 					</g>
-					<path d="M6834.6 614.9 L8427.5 786 L9019.75 938.7786079433739 L9019.8 938.8 " fill="none"></path>
+					<path d="M1102.8 664.7 L1102.75 786 L1779.75 942.930035335689 L1779.8 942.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6825.8 608.6 L6834.6 614.9 L6824.7 619.2 L6816.0 612.9 Z"></path>
+						<path d="M1108.1 655.3 L1102.8 664.7 L1097.4 655.3 L1102.8 646.0 Z"></path>
 					</g>
-					<path d="M7190.6 614.3 L9244.5 786 L9298.829268292682 934.5 L9298.8 934.5 " fill="none"></path>
+					<path d="M1932.8 679.7 L1932.75 786 L1821.8277439024391 934.5 L1821.8 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7181.7 608.2 L7190.6 614.3 L7180.9 618.8 L7172.0 612.7 Z"></path>
+						<path d="M1938.1 670.3 L1932.8 679.7 L1927.4 670.3 L1932.8 661.0 Z"></path>
 					</g>
-					<path d="M7387.6 608.1 L9402.75 786 L9313.785823170732 934.5 L9313.8 934.5 " fill="none"></path>
+					<path d="M2771.0 672.2 L2771 786 L1840.75 944.7936507936508 L1840.8 944.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7378.8 601.9 L7387.6 608.1 L7377.8 612.6 L7369.0 606.4 Z"></path>
+						<path d="M2776.3 662.8 L2771.0 672.2 L2765.7 662.8 L2771.0 653.5 Z"></path>
 					</g>
-					<path d="M532.6 615.9 L2074.75 786 L5237.25 946.9464701318852 L5237.3 946.9 " fill="none"></path>
+					<path d="M3093.5 672.2 L3093.5 786 L6618.75 947.2554215187225 L6618.8 947.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M523.9 609.6 L532.6 615.9 L522.7 620.2 L514.0 613.9 Z"></path>
+						<path d="M3098.8 662.8 L3093.5 672.2 L3088.2 662.8 L3093.5 653.5 Z"></path>
 					</g>
-					<path d="M3983.0 253.7 L3983 413 L3983 584 L3983.0 584.0 " fill="none"></path>
+					<path d="M3441.0 664.7 L3441 786 L6618.75 946.9608524438268 L6618.8 947.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3988.3 244.3 L3983.0 253.7 L3977.7 244.3 L3983.0 235.0 Z"></path>
+						<path d="M3446.3 655.3 L3441.0 664.7 L3435.7 655.3 L3441.0 646.0 Z"></path>
 					</g>
-					<path d="M8312.2 633.2 L9442.75 786 L9317.56631097561 934.5 L9317.6 934.5 " fill="none"></path>
+					<path d="M7992.1 608.6 L9922 786 L10030.658536585366 934.5 L10030.7 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8303.7 626.7 L8312.2 633.2 L8302.3 637.3 L8293.8 630.7 Z"></path>
+						<path d="M7983.3 602.4 L7992.1 608.6 L7982.3 613.1 L7973.5 606.9 Z"></path>
 					</g>
-					<path d="M980.5 626.7 L2282 786 L5237.25 946.7365890058868 L5237.3 946.7 " fill="none"></path>
+					<path d="M8193.1 609.4 L9962 786 L10034.439024390244 934.5 L10034.4 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M971.9 620.3 L980.5 626.7 L970.6 630.9 L962.0 624.5 Z"></path>
+						<path d="M8184.3 603.2 L8193.1 609.4 L8183.3 613.8 L8174.5 607.5 Z"></path>
 					</g>
-					<path d="M1227.5 616.1 L2475.75 786 L5237.25 946.5124933545986 L5237.3 946.5 " fill="none"></path>
+					<path d="M9086.9 613.1 L10202 786 L10443.3125 934.5 L10443.3 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1219.0 609.6 L1227.5 616.1 L1217.5 620.1 L1209.0 613.6 Z"></path>
+						<path d="M9078.5 606.4 L9086.9 613.1 L9076.9 616.9 L9068.5 610.2 Z"></path>
 					</g>
-					<path d="M8750.0 620.6 L9522.75 786 L9836.75 936.1341107871721 L9836.8 936.1 " fill="none"></path>
+					<path d="M3715.0 694.7 L3715 786 L6618.75 946.6798819063686 L6618.8 946.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8742.0 613.5 L8750.0 620.6 L8739.8 623.9 L8731.8 616.7 Z"></path>
+						<path d="M3720.3 685.3 L3715.0 694.7 L3709.7 685.3 L3715.0 676.0 Z"></path>
 					</g>
-					<path d="M9323.1 653.2 L9562.75 786 L9837.112804878048 934.5 L9837.1 934.5 " fill="none"></path>
+					<path d="M5630.0 282.6 L5572.5 413 L5572.5 584 L5572.5 584.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9317.5 644.0 L9323.1 653.2 L9312.3 653.3 L9306.8 644.1 Z"></path>
+						<path d="M5638.7 276.2 L5630.0 282.6 L5628.9 271.9 L5637.6 265.5 Z"></path>
 					</g>
-					<path d="M10085.9 662.8 L10025.75 786 L11808 946.7971393205886 L11808.0 946.8 " fill="none"></path>
+					<path d="M5706.0 282.6 L5763.5 413 L5763.5 584 L5763.5 584.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10094.8 656.7 L10085.9 662.8 L10085.2 652.0 L10094.1 646.0 Z"></path>
+						<path d="M5707.1 271.9 L5706.0 282.6 L5697.3 276.2 L5698.4 265.5 Z"></path>
 					</g>
-					<path d="M12116.0 1112.7 L12116 1114 L12116 1134 L12116.0 1134.0 " fill="none"></path>
+					<path d="M10460.5 668.0 L10548.5 786 L10584.719512195123 934.5 L10584.7 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12121.3 1103.3 L12116.0 1112.7 L12110.7 1103.3 L12116.0 1094.0 Z"></path>
+						<path d="M10459.2 657.3 L10460.5 668.0 L10450.7 663.7 L10449.4 653.0 Z"></path>
 					</g>
-					<path d="M8544.1 605.2 L12116 786 L12116 806 L12116.0 806.0 " fill="none"></path>
-					<path d="M8544.3 599.8 L8544.1 605.2 L8543.8 610.5 L8530.8 604.5 Z"></path>
-					<path d="M12499.0 1015.2 L12499 1114 L12499 1134 L12499.0 1134.0 " fill="none"></path>
+					<path d="M4090.0 672.2 L4090 786 L6618.75 946.1989377112506 L6618.8 946.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12504.3 1005.8 L12499.0 1015.2 L12493.7 1005.8 L12499.0 996.5 Z"></path>
+						<path d="M4095.3 662.8 L4090.0 672.2 L4084.7 662.8 L4090.0 653.5 Z"></path>
 					</g>
-					<path d="M8544.1 604.6 L12499 786 L12499 903.5 L12499.0 903.5 " fill="none"></path>
-					<path d="M8544.3 599.3 L8544.1 604.6 L8543.8 610.0 L8530.8 604.0 Z"></path>
-					<path d="M2612.1 628.8 L3238.5 786 L5237.25 945.2204007285975 L5237.3 945.2 " fill="none"></path>
+					<path d="M11287.2 634.6 L10771 786 L10771 919 L10771.0 919.0 " fill="none"></path>
+					<path d="M11288.7 639.7 L11287.2 634.6 L11285.7 629.5 L11300.0 630.9 Z"></path>
+					<path d="M4433.0 664.7 L4433 786 L6618.75 945.6183902927752 L6618.8 945.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2604.4 621.3 L2612.1 628.8 L2601.8 631.7 L2594.0 624.2 Z"></path>
+						<path d="M4438.3 655.3 L4433.0 664.7 L4427.7 655.3 L4433.0 646.0 Z"></path>
 					</g>
-					<path d="M3027.6 659.1 L3430 786 L5237.25 944.7302182353728 L5237.3 944.7 " fill="none"></path>
+					<path d="M8743.0 611.5 L10002 786 L10038.219512195123 934.5 L10038.2 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3020.3 651.2 L3027.6 659.1 L3017.1 661.4 L3009.8 653.5 Z"></path>
+						<path d="M8734.5 604.9 L8743.0 611.5 L8733.0 615.5 L8724.5 608.9 Z"></path>
 					</g>
-					<path d="M11282.0 613.3 L12784 786 L12784 919 L12784.0 919.0 " fill="none"></path>
-					<path d="M11282.6 608.0 L11282.0 613.3 L11281.4 618.6 L11268.8 611.8 Z"></path>
-					<path d="M11036.1 602.6 L3634.5 786 L5237.25 944.0820929183582 L5237.3 944.1 " fill="none"></path>
+					<path d="M8909.0 612.0 L10042 786 L10042 934.5 L10042.0 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11045.6 607.7 L11036.1 602.6 L11045.3 597.1 L11054.8 602.2 Z"></path>
+						<path d="M8900.5 605.3 L8909.0 612.0 L8898.9 615.9 L8890.5 609.2 Z"></path>
 					</g>
-					<path d="M11287.3 612.9 L12909.5 786 L12986.919207317073 934.5 L12986.9 934.5 " fill="none"></path>
+					<path d="M4776.0 672.2 L4776 786 L6618.75 944.8285376428853 L6618.8 944.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11278.6 606.6 L11287.3 612.9 L11277.5 617.2 L11268.8 610.9 Z"></path>
+						<path d="M4781.3 662.8 L4776.0 672.2 L4770.7 662.8 L4776.0 653.5 Z"></path>
 					</g>
-					<path d="M11282.0 610.5 L13206 786 L13206 919 L13206.0 919.0 " fill="none"></path>
-					<path d="M11282.5 605.2 L11282.0 610.5 L11281.5 615.8 L11268.8 609.3 Z"></path>
-					<path d="M8315.1 604.1 L3674.5 786 L5237.25 943.936219380681 L5237.3 943.9 " fill="none"></path>
+					<path d="M7508.1 606.8 L10888 786 L11073.172256097561 934.5 L11073.2 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8324.6 609.1 L8315.1 604.1 L8324.2 598.4 L8333.8 603.4 Z"></path>
+						<path d="M7499.1 601.0 L7508.1 606.8 L7498.5 611.6 L7489.5 605.8 Z"></path>
 					</g>
-					<path d="M9482.4 666.6 L9602.75 786 L9840.893292682927 934.5 L9840.9 934.5 " fill="none"></path>
+					<path d="M7233.0 620.5 L6147.25 786 L6628.516768292683 934.5 L6628.5 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9479.6 656.3 L9482.4 666.6 L9472.1 663.9 L9469.2 653.5 Z"></path>
+						<path d="M7243.1 624.3 L7233.0 620.5 L7241.5 613.8 L7251.5 617.6 Z"></path>
 					</g>
-					<path d="M9603.0 655.9 L9642.75 786 L9844.673780487805 934.5 L9844.7 934.5 " fill="none"></path>
+					<path d="M8473.1 607.3 L11650 786 L11650 934.5 L11650.0 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9605.3 645.4 L9603.0 655.9 L9595.1 648.5 L9597.5 638.0 Z"></path>
+						<path d="M8464.1 601.4 L8473.1 607.3 L8463.5 612.1 L8454.5 606.3 Z"></path>
 					</g>
-					<path d="M3428.2 661.0 L3714.5 786 L5237.25 943.7829726741431 L5237.3 943.8 " fill="none"></path>
+					<path d="M8195.9 614.8 L6649.25 786 L6675.961890243902 934.5 L6676.0 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3421.8 652.3 L3428.2 661.0 L3417.6 662.1 L3411.1 653.5 Z"></path>
+						<path d="M8205.8 619.1 L8195.9 614.8 L8204.6 608.5 L8214.5 612.8 Z"></path>
 					</g>
-					<path d="M7810.4 604.0 L13323 786 L13508.172256097561 934.5 L13508.2 934.5 " fill="none"></path>
+					<path d="M8521.5 276.7 L8521.5 413 L8521.5 584 L8521.5 584.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7801.3 598.4 L7810.4 604.0 L7800.9 609.1 L7791.8 603.4 Z"></path>
+						<path d="M8526.8 267.3 L8521.5 276.7 L8516.2 267.3 L8521.5 258.0 Z"></path>
 					</g>
-					<path d="M7535.2 611.3 L5488.75 786 L5315.349085365854 934.5 L5315.3 934.5 " fill="none"></path>
+					<path d="M11527.1 620.1 L12492.25 786 L12492.25 881 L12492.3 881.0 " fill="none"></path>
+					<path d="M11528.0 614.9 L11527.1 620.1 L11526.2 625.4 L11514.0 617.9 Z"></path>
+					<path d="M10555.4 605.0 L6689.25 786 L6679.742378048781 934.5 L6679.7 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7544.9 615.8 L7535.2 611.3 L7544.0 605.1 L7553.8 609.7 Z"></path>
+						<path d="M10564.9 609.9 L10555.4 605.0 L10564.4 599.2 L10574.0 604.1 Z"></path>
 					</g>
-					<path d="M9030.4 604.4 L14212.5 786 L14212.5 934.5 L14212.5 934.5 " fill="none"></path>
+					<path d="M11281.3 604.5 L6729.25 786 L6683.522865853659 934.5 L6683.5 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9021.3 598.7 L9030.4 604.4 L9020.9 609.4 L9011.8 603.7 Z"></path>
+						<path d="M11290.9 609.5 L11281.3 604.5 L11290.5 598.8 L11300.0 603.8 Z"></path>
 					</g>
-					<path d="M8753.1 608.8 L6118.25 786 L5357.25 938.0146163215591 L5357.3 938.0 " fill="none"></path>
+					<path d="M11532.5 618.3 L12649.25 786 L12755.192073170732 934.5 L12755.2 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8762.8 613.5 L8753.1 608.8 L8762.1 602.9 L8771.8 607.6 Z"></path>
+						<path d="M11524.0 611.7 L11532.5 618.3 L11522.4 622.2 L11514.0 615.6 Z"></path>
 					</g>
-					<path d="M9078.8 276.7 L9078.75 413 L9078.75 584 L9078.8 584.0 " fill="none"></path>
+					<path d="M13075.3 1112.7 L13075.25 1114 L13075.25 1134 L13075.3 1134.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9084.1 267.3 L9078.8 276.7 L9073.4 267.3 L9078.8 258.0 Z"></path>
+						<path d="M13080.6 1103.3 L13075.3 1112.7 L13069.9 1103.3 L13075.3 1094.0 Z"></path>
 					</g>
-					<path d="M11282.1 605.6 L14870.5 786 L14870.5 881 L14870.5 881.0 " fill="none"></path>
-					<path d="M11282.3 600.2 L11282.1 605.6 L11281.8 610.9 L11268.8 604.9 Z"></path>
-					<path d="M10026.4 605.8 L15136.5 786 L15136.5 934.5 L15136.5 934.5 " fill="none"></path>
+					<path d="M10784.3 608.2 L13075.25 786 L13075.25 806 L13075.3 806.0 " fill="none"></path>
+					<path d="M10784.7 602.9 L10784.3 608.2 L10783.9 613.5 L10771.0 607.1 Z"></path>
+					<path d="M13720.5 1015.2 L13720.5 1114 L13720.5 1134 L13720.5 1134.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10017.3 600.1 L10026.4 605.8 L10016.9 610.8 L10007.8 605.1 Z"></path>
+						<path d="M13725.8 1005.8 L13720.5 1015.2 L13715.2 1005.8 L13720.5 996.5 Z"></path>
 					</g>
-					<path d="M9670.1 608.5 L6158.25 786 L5357.25 938.5714285714286 L5357.3 938.6 " fill="none"></path>
+					<path d="M10784.3 606.3 L13720.5 786 L13720.5 903.5 L13720.5 903.5 " fill="none"></path>
+					<path d="M10784.6 601.0 L10784.3 606.3 L10784.0 611.7 L10771.0 605.5 Z"></path>
+					<path d="M11148.6 610.6 L13970.5 786 L13970.5 934.5 L13970.5 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9679.7 613.4 L9670.1 608.5 L9679.2 602.7 L9688.8 607.6 Z"></path>
+						<path d="M11139.6 604.7 L11148.6 610.6 L11139.0 615.3 L11130.0 609.4 Z"></path>
 					</g>
-					<path d="M10026.4 610.1 L12995 786 L12995 934.5 L12995.0 934.5 " fill="none"></path>
+					<path d="M10792.4 607.4 L6769.25 786 L6687.303353658536 934.5 L6687.3 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10017.4 604.2 L10026.4 610.1 L10016.8 614.8 L10007.8 609.0 Z"></path>
+						<path d="M10801.9 612.3 L10792.4 607.4 L10801.4 601.7 L10811.0 606.6 Z"></path>
 					</g>
-					<path d="M4990.5 616.6 L6198.25 786 L5357.25 939.0788013318535 L5357.3 939.1 " fill="none"></path>
+					<path d="M11148.6 617.8 L12783.75 786 L12767.903963414634 934.5 L12767.9 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4982.0 610.0 L4990.5 616.6 L4980.5 620.6 L4972.0 614.0 Z"></path>
+						<path d="M11139.8 611.6 L11148.6 617.8 L11138.7 622.2 L11130.0 615.9 Z"></path>
 					</g>
-					<path d="M5237.4 619.8 L6238.25 786 L5357.25 939.5430393198725 L5357.3 939.5 " fill="none"></path>
+					<path d="M11527.3 607.6 L14173.5 786 L14173.5 919 L14173.5 919.0 " fill="none"></path>
+					<path d="M11527.7 602.3 L11527.3 607.6 L11526.9 612.9 L11514.0 606.7 Z"></path>
+					<path d="M5246.1 613.0 L6809.25 786 L6691.0838414634145 934.5 L6691.1 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5229.1 613.0 L5237.4 619.8 L5227.3 623.5 L5219.0 616.7 Z"></path>
+						<path d="M5237.4 606.7 L5246.1 613.0 L5236.2 617.3 L5227.5 611.0 Z"></path>
 					</g>
-					<path d="M11925.4 607.3 L8163.25 786 L8066.136432926829 934.5 L8066.1 934.5 " fill="none"></path>
+					<path d="M5493.0 613.9 L6952.75 786 L6704.6463414634145 934.5 L6704.6 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11934.9 612.2 L11925.4 607.3 L11934.4 601.5 L11944.0 606.4 Z"></path>
+						<path d="M5484.4 607.5 L5493.0 613.9 L5483.1 618.1 L5474.5 611.7 Z"></path>
 					</g>
-					<path d="M12254.6 609.3 L15221 786 L15266.500762195123 934.5 L15266.5 934.5 " fill="none"></path>
+					<path d="M9490.5 269.2 L9490.5 413 L9490.5 561 L9490.5 561.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12245.6 603.4 L12254.6 609.3 L12245.0 614.1 L12236.0 608.2 Z"></path>
+						<path d="M9495.8 259.8 L9490.5 269.2 L9485.2 259.8 L9490.5 250.5 Z"></path>
 					</g>
-					<path d="M12254.6 608.7 L15419.75 786 L15419.75 934.5 L15419.8 934.5 " fill="none"></path>
+					<path d="M12311.6 608.3 L14351 786 L14351 934.5 L14351.0 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12245.6 602.9 L12254.6 608.7 L12245.0 613.5 L12236.0 607.7 Z"></path>
+						<path d="M12302.8 602.2 L12311.6 608.3 L12301.8 612.8 L12293.0 606.7 Z"></path>
 					</g>
-					<path d="M5484.3 624.3 L6278.25 786 L5357.25 939.9694189602446 L5357.3 940.0 " fill="none"></path>
+					<path d="M12109.4 608.4 L10082 786 L10045.780487804877 934.5 L10045.8 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5476.2 617.2 L5484.3 624.3 L5474.1 627.7 L5466.0 620.6 Z"></path>
+						<path d="M12119.2 612.9 L12109.4 608.4 L12118.2 602.2 L12128.0 606.7 Z"></path>
 					</g>
-					<path d="M14335.9 645.9 L13872.5 786 L13560.106707317073 934.5 L13560.1 934.5 " fill="none"></path>
+					<path d="M11535.6 622.7 L10619.75 786 L10591.453506097561 934.5 L10591.5 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14346.4 648.3 L14335.9 645.9 L14343.3 638.1 L14353.8 640.5 Z"></path>
+						<path d="M11545.7 626.3 L11535.6 622.7 L11543.9 615.8 L11554.0 619.4 Z"></path>
 					</g>
-					<path d="M5844.9 650.6 L6318.25 786 L5357.25 940.362389813908 L5357.3 940.4 " fill="none"></path>
+					<path d="M11795.6 608.1 L14493.25 786 L14557.467987804877 889 L14557.5 889.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5837.4 642.9 L5844.9 650.6 L5834.5 653.1 L5827.0 645.4 Z"></path>
+						<path d="M11786.7 602.1 L11795.6 608.1 L11786.0 612.8 L11777.0 606.9 Z"></path>
 					</g>
-					<path d="M12715.4 605.9 L15581.75 786 L15581.75 934.5 L15581.8 934.5 " fill="none"></path>
+					<path d="M11535.5 615.2 L10122 786 L10049.560975609756 934.5 L10049.6 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12706.4 599.9 L12715.4 605.9 L12705.7 610.6 L12696.8 604.7 Z"></path>
+						<path d="M11545.4 619.4 L11535.5 615.2 L11544.1 608.8 L11554.0 613.0 Z"></path>
 					</g>
-					<path d="M12513.1 606.5 L9905.75 786 L9869.530487804877 934.5 L9869.5 934.5 " fill="none"></path>
+					<path d="M14779.3 892.8 L14791.5 889 L14799 889 L14799 889 L14806.5 950 L14806.5 950 L14799 1011 L14799 1011 L14791.5 1011 L14791.5 1011 L14761.5 1001.6632653061224 L14761.5 1001.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12522.8 611.1 L12513.1 606.5 L12522.1 600.5 L12531.8 605.2 Z"></path>
+						<path d="M14768.8 890.5 L14779.3 892.8 L14772.0 900.7 L14761.5 898.3 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M15759.1 607.2 L14747.75 786 L14652.129573170732 889 L14652.1 889.0 " fill="none"></path>
 					</g>
-					<path d="M11375.4 607.8 L8568.75 786 L9019.75 935.5733063700708 L9019.8 935.6 " fill="none"></path>
+					<path d="M15760.0 612.5 L15759.1 607.2 L15758.2 602.0 L15772.3 604.9 Z"></path>
+					<path d="M13403.4 608.7 L10659.75 786 L10595.233993902439 934.5 L10595.2 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11385.0 612.5 L11375.4 607.8 L11384.3 601.8 L11394.0 606.6 Z"></path>
+						<path d="M13413.0 613.4 L13403.4 608.7 L13412.3 602.8 L13422.0 607.5 Z"></path>
 					</g>
-					<path d="M11635.6 605.3 L15724 786 L15788.217987804877 889 L15788.2 889.0 " fill="none"></path>
+					<path d="M13687.5 620.8 L14787.75 786 L16204.75 940.3593490534706 L16204.8 940.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11626.6 599.5 L11635.6 605.3 L11626.1 610.2 L11617.0 604.4 Z"></path>
+						<path d="M13679.0 614.2 L13687.5 620.8 L13677.4 624.7 L13669.0 618.0 Z"></path>
 					</g>
-					<path d="M11375.5 615.0 L9945.75 786 L9873.310975609756 934.5 L9873.3 934.5 " fill="none"></path>
+					<path d="M11215.0 261.7 L11215 413 L11215 584 L11215.0 584.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11385.4 619.2 L11375.5 615.0 L11384.1 608.6 L11394.0 612.8 Z"></path>
+						<path d="M11220.3 252.3 L11215.0 261.7 L11209.7 252.3 L11215.0 243.0 Z"></path>
 					</g>
-					<path d="M16010.1 892.8 L16022.25 889 L16029.75 889 L16029.75 889 L16037.25 950 L16037.25 950 L16029.75 1011 L16029.75 1011 L16022.25 1011 L16022.25 1011 L15992.25 1001.6632653061224 L15992.3 1001.7 " fill="none"></path>
+					<path d="M6236.0 626.0 L7315.75 786 L6738.75 934.552590266876 L6738.8 934.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15999.6 890.5 L16010.1 892.8 L16002.7 900.7 L15992.3 898.3 Z"></path>
+						<path d="M6227.5 619.4 L6236.0 626.0 L6226.0 629.9 L6217.5 623.3 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M18540.2 602.6 L15978.5 786 L15882.879573170732 889 L15882.9 889.0 " fill="none"></path>
+					<path d="M6482.9 619.7 L7487.75 786 L6738.75 937.8368355995055 L6738.8 937.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M6474.6 612.9 L6482.9 619.7 L6472.8 623.4 L6464.5 616.6 Z"></path>
 					</g>
-					<path d="M18540.6 608.0 L18540.2 602.6 L18539.8 597.3 L18553.5 601.7 Z"></path>
-					<path d="M12370.0 269.2 L12370 413 L12370 561 L12370.0 561.0 " fill="none"></path>
+					<path d="M11799.1 644.0 L11310 786 L11113.056402439024 934.5 L11113.1 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12375.3 259.8 L12370.0 269.2 L12364.7 259.8 L12370.0 250.5 Z"></path>
+						<path d="M11809.5 646.6 L11799.1 644.0 L11806.5 636.3 L11817.0 638.8 Z"></path>
 					</g>
-					<path d="M11638.4 609.8 L9204.5 786 L9076.599847560976 934.5 L9076.6 934.5 " fill="none"></path>
+					<path d="M10010.6 655.5 L9804.5 786 L9833.928353658537 934.5 L9833.9 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11648.1 614.4 L11638.4 609.8 L11647.3 603.8 L11657.0 608.4 Z"></path>
+						<path d="M10021.3 655.0 L10010.6 655.5 L10015.6 646.0 L10026.4 645.5 Z"></path>
 					</g>
-					<path d="M11922.6 605.8 L16018.5 786 L16519.23475609756 934.5 L16519.2 934.5 " fill="none"></path>
+					<path d="M9935.2 650.5 L9500 786 L9475.778201219513 934.5 L9475.8 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11913.6 600.0 L11922.6 605.8 L11913.1 610.7 L11904.0 604.9 Z"></path>
+						<path d="M9945.7 652.8 L9935.2 650.5 L9942.5 642.6 L9953.0 645.0 Z"></path>
 					</g>
-					<path d="M12809.5 261.7 L12809.5 413 L12809.5 584 L12809.5 584.0 " fill="none"></path>
+					<path d="M10263.7 604.3 L16505.25 786 L16505.25 934.5 L16505.3 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12814.8 252.3 L12809.5 261.7 L12804.2 252.3 L12809.5 243.0 Z"></path>
+						<path d="M10254.5 598.7 L10263.7 604.3 L10254.2 609.4 L10245.0 603.8 Z"></path>
 					</g>
-					<path d="M13098.8 252.8 L13047 413 L13047 584 L13047.0 584.0 " fill="none"></path>
+					<path d="M14555.3 608.0 L7612 786 L6738.75 939.4562014465578 L6738.8 939.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13106.8 245.5 L13098.8 252.8 L13096.6 242.2 L13104.6 235.0 Z"></path>
+						<path d="M14564.8 613.1 L14555.3 608.0 L14564.5 602.4 L14574.0 607.5 Z"></path>
 					</g>
-					<path d="M13156.3 250.0 L13276 413 L13303.735924932977 584 L13303.7 584.0 " fill="none"></path>
+					<path d="M15218.6 627.2 L17119.25 786 L17119.25 934.5 L17119.3 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13155.1 239.4 L13156.3 250.0 L13146.5 245.7 L13145.3 235.0 Z"></path>
+						<path d="M15209.7 621.1 L15218.6 627.2 L15208.9 631.7 L15200.0 625.7 Z"></path>
 					</g>
-					<path d="M6545.6 619.9 L8231 786 L8072.539634146341 934.5 L8072.5 934.5 " fill="none"></path>
+					<path d="M15218.6 625.7 L17252 786 L17335.98399390244 934.5 L17336.0 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6536.8 613.7 L6545.6 619.9 L6535.8 624.3 L6527.0 618.1 Z"></path>
+						<path d="M15209.7 619.6 L15218.6 625.7 L15208.9 630.2 L15200.0 624.2 Z"></path>
 					</g>
-					<path d="M13703.2 240.7 L14242.25 413 L14242.25 584 L14242.3 584.0 " fill="none"></path>
+					<path d="M15218.6 616.9 L18441 786 L18441 934.5 L18441.0 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13695.9 232.8 L13703.2 240.7 L13692.7 242.9 L13685.4 235.0 Z"></path>
+						<path d="M15209.6 611.1 L15218.6 616.9 L15209.0 621.7 L15200.0 615.9 Z"></path>
 					</g>
-					<path d="M13508.7 247.5 L13326.25 413 L13307.912198391421 584 L13307.9 584.0 " fill="none"></path>
+					<path d="M15218.6 632.0 L16790.25 786 L16790.25 904 L16790.3 904.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13519.2 245.2 L13508.7 247.5 L13512.0 237.3 L13522.5 235.0 Z"></path>
+						<path d="M15209.8 625.8 L15218.6 632.0 L15208.8 636.4 L15200.0 630.2 Z"></path>
 					</g>
-					<path d="M18635.9 608.2 L15285.5 786 L15272.596798780487 934.5 L15272.6 934.5 " fill="none"></path>
+					<path d="M7791.1 611.2 L9882 786 L9841.253048780487 934.5 L9841.3 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18645.5 613.0 L18635.9 608.2 L18644.9 602.4 L18654.5 607.2 Z"></path>
+						<path d="M7782.2 605.1 L7791.1 611.2 L7781.4 615.7 L7772.5 609.7 Z"></path>
 					</g>
-					<path d="M18961.7 669.1 L19234 786 L19234 934.5 L19234.0 934.5 " fill="none"></path>
+					<path d="M13183.5 225.3 L13183.5 413 L13183.5 538 L13183.5 538.0 " fill="none"></path>
+					<path d="M13188.8 225.3 L13183.5 225.3 L13178.2 225.3 L13183.5 212.0 Z"></path>
+					<path d="M12686.7 606.6 L17364.75 786 L17346.64024390244 934.5 L17346.6 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18955.2 660.5 L18961.7 669.1 L18951.0 670.3 L18944.5 661.7 Z"></path>
+						<path d="M12677.5 601.0 L12686.7 606.6 L12677.1 611.6 L12668.0 605.9 Z"></path>
 					</g>
-					<path d="M11033.4 603.6 L19431.5 786 L19431.5 934.5 L19431.5 934.5 " fill="none"></path>
+					<path d="M12314.4 610.7 L9390.75 786 L6738.75 946.3716814159292 L6738.8 946.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11024.2 598.0 L11033.4 603.6 L11024.0 608.7 L11014.8 603.2 Z"></path>
+						<path d="M12324.0 615.4 L12314.4 610.7 L12323.4 604.8 L12333.0 609.5 Z"></path>
 					</g>
-					<path d="M10658.3 625.2 L9482.75 786 L9321.346798780487 934.5 L9321.3 934.5 " fill="none"></path>
+					<path d="M17886.2 641.6 L18621 786 L18621 934.5 L18621.0 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10668.2 629.2 L10658.3 625.2 L10666.8 618.6 L10676.8 622.6 Z"></path>
+						<path d="M17878.1 634.6 L17886.2 641.6 L17876.0 645.0 L17867.9 638.0 Z"></path>
 					</g>
-					<path d="M10658.1 607.3 L6358.25 786 L5357.25 940.7257304429784 L5357.3 940.7 " fill="none"></path>
+					<path d="M17891.9 636.7 L18774 786 L18876.32012195122 934.5 L18876.3 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10667.6 612.2 L10658.1 607.3 L10667.2 601.6 L10676.8 606.5 Z"></path>
+						<path d="M17883.6 629.9 L17891.9 636.7 L17881.8 640.4 L17873.5 633.6 Z"></path>
 					</g>
-					<path d="M15663.5 276.7 L15663.5 413 L15663.5 584 L15663.5 584.0 " fill="none"></path>
+					<path d="M21162.9 201.8 L17672 413 L17672 561 L17672.0 561.0 " fill="none"></path>
+					<path d="M21163.3 207.1 L21162.9 201.8 L21162.6 196.5 L21176.3 201.0 Z"></path>
+					<path d="M18334.9 637.6 L19192.5 786 L19192.5 934.5 L19192.5 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15668.8 267.3 L15663.5 276.7 L15658.2 267.3 L15663.5 258.0 Z"></path>
+						<path d="M18326.6 630.7 L18334.9 637.6 L18324.8 641.2 L18316.5 634.4 Z"></path>
 					</g>
-					<path d="M15943.0 269.2 L15943 413 L15943 584 L15943.0 584.0 " fill="none"></path>
+					<path d="M18288.3 642.5 L18866.75 786 L18885.08612804878 934.5 L18885.1 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15948.3 259.8 L15943.0 269.2 L15937.7 259.8 L15943.0 250.5 Z"></path>
+						<path d="M18280.5 635.1 L18288.3 642.5 L18278.0 645.4 L18270.2 638.0 Z"></path>
 					</g>
-					<path d="M17990.1 619.6 L19650.5 786 L19650.5 934.5 L19650.5 934.5 " fill="none"></path>
+					<path d="M21162.9 202.6 L18115 413 L18115 561 L18115.0 561.0 " fill="none"></path>
+					<path d="M21163.3 207.9 L21162.9 202.6 L21162.6 197.2 L21176.3 201.6 Z"></path>
+					<path d="M19136.8 648.5 L19338 786 L19433.528963414636 934.5 L19433.5 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17981.3 613.4 L17990.1 619.6 L17980.3 624.0 L17971.5 617.7 Z"></path>
+						<path d="M19132.1 638.9 L19136.8 648.5 L19126.1 647.7 L19121.4 638.0 Z"></path>
 					</g>
-					<path d="M17588.8 604.3 L9985.75 786 L9877.091463414634 934.5 L9877.1 934.5 " fill="none"></path>
+					<path d="M19020.3 652.2 L18906.75 786 L18888.866615853658 934.5 L18888.9 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17598.3 609.4 L17588.8 604.3 L17598.0 598.7 L17607.5 603.8 Z"></path>
+						<path d="M19030.4 648.6 L19020.3 652.2 L19022.2 641.7 L19032.3 638.0 Z"></path>
 					</g>
-					<path d="M17990.1 616.5 L19986.75 786 L20087.032774390245 934.5 L20087.0 934.5 " fill="none"></path>
+					<path d="M21163.0 205.2 L19065 413 L19065 561 L19065.0 561.0 " fill="none"></path>
+					<path d="M21163.5 210.5 L21163.0 205.2 L21162.5 199.9 L21176.3 203.9 Z"></path>
+					<path d="M20809.3 632.0 L19765.5 786 L19765.5 934.5 L19765.5 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17981.3 610.4 L17990.1 616.5 L17980.3 621.1 L17971.5 614.9 Z"></path>
+						<path d="M20819.3 635.9 L20809.3 632.0 L20817.7 625.3 L20827.8 629.2 Z"></path>
 					</g>
-					<path d="M16482.5 225.3 L16482.5 413 L16482.5 568.5 L16482.5 568.5 " fill="none"></path>
-					<path d="M16487.8 225.3 L16482.5 225.3 L16477.2 225.3 L16482.5 212.0 Z"></path>
-					<path d="M19405.9 635.7 L20319.5 786 L20319.5 934.5 L20319.5 934.5 " fill="none"></path>
+					<path d="M20809.2 619.2 L18946.75 786 L18892.647103658535 934.5 L18892.6 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19397.6 628.9 L19405.9 635.7 L19395.8 639.4 L19387.5 632.7 Z"></path>
+						<path d="M20818.9 623.7 L20809.2 619.2 L20818.0 613.1 L20827.8 617.5 Z"></path>
 					</g>
-					<path d="M19406.0 626.7 L20695 786 L20802.07393292683 934.5 L20802.1 934.5 " fill="none"></path>
+					<path d="M21209.5 236.8 L21029.25 413 L21029.25 561 L21029.3 561.0 " fill="none"></path>
+					<path d="M21213.2 240.6 L21209.5 236.8 L21205.8 233.0 L21219.0 227.5 Z"></path>
+					<path d="M21252.2 629.1 L20084.25 786 L20084.25 934.5 L20084.3 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19397.4 620.3 L19406.0 626.7 L19396.1 630.8 L19387.5 624.4 Z"></path>
+						<path d="M21262.2 633.1 L21252.2 629.1 L21260.8 622.5 L21270.8 626.6 Z"></path>
 					</g>
-					<path d="M22010.0 203.0 L19186 413 L19186 561 L19186.0 561.0 " fill="none"></path>
-					<path d="M22010.3 208.3 L22010.0 203.0 L22009.6 197.7 L22023.3 202.0 Z"></path>
-					<path d="M21658.6 642.6 L21092.25 786 L21092.25 934.5 L21092.3 934.5 " fill="none"></path>
+					<path d="M21252.1 616.2 L19019.75 786 L18899.54649390244 934.5 L18899.5 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21669.0 645.5 L21658.6 642.6 L21666.4 635.1 L21676.7 638.0 Z"></path>
+						<path d="M21261.8 620.8 L21252.1 616.2 L21261.0 610.2 L21270.8 614.8 Z"></path>
 					</g>
-					<path d="M21608.9 638.4 L20774.5 786 L20809.587652439026 934.5 L20809.6 934.5 " fill="none"></path>
+					<path d="M21292.0 236.8 L21472.25 413 L21472.25 561 L21472.3 561.0 " fill="none"></path>
+					<path d="M21295.7 233.0 L21292.0 236.8 L21288.3 240.6 L21282.5 227.5 Z"></path>
+					<path d="M21704.2 623.9 L20273.75 786 L20273.75 934.5 L20273.8 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21619.0 642.0 L21608.9 638.4 L21617.1 631.5 L21627.3 635.1 Z"></path>
+						<path d="M21714.1 628.1 L21704.2 623.9 L21712.9 617.5 L21722.8 621.8 Z"></path>
 					</g>
-					<path d="M22048.8 235.9 L21828.75 413 L21828.75 561 L21828.8 561.0 " fill="none"></path>
-					<path d="M22052.2 240.0 L22048.8 235.9 L22045.5 231.7 L22059.2 227.5 Z"></path>
-					<path d="M22074.7 641.9 L21405.75 786 L21405.75 934.5 L21405.8 934.5 " fill="none"></path>
+					<path d="M21704.3 628.6 L20540.25 786 L20540.25 934.5 L20540.3 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22085.0 645.2 L22074.7 641.9 L22082.7 634.8 L22093.0 638.0 Z"></path>
+						<path d="M21714.2 632.6 L21704.3 628.6 L21712.8 622.0 L21722.8 626.1 Z"></path>
 					</g>
-					<path d="M22051.7 627.7 L20814.5 786 L20813.368140243903 934.5 L20813.4 934.5 " fill="none"></path>
+					<path d="M21337.9 224.7 L21919.25 413 L21919.25 546 L21919.3 546.0 " fill="none"></path>
+					<path d="M21339.6 219.7 L21337.9 224.7 L21336.3 229.8 L21325.3 220.6 Z"></path>
+					<path d="M22137.2 629.1 L20842.25 786 L20842.25 934.5 L20842.3 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22061.7 631.8 L22051.7 627.7 L22060.3 621.2 L22070.3 625.3 Z"></path>
+						<path d="M22147.1 633.2 L22137.2 629.1 L22145.8 622.7 L22155.8 626.8 Z"></path>
 					</g>
-					<path d="M22131.0 237.9 L22271.75 413 L22271.75 561 L22271.8 561.0 " fill="none"></path>
-					<path d="M22135.2 234.6 L22131.0 237.9 L22126.9 241.2 L22122.7 227.5 Z"></path>
-					<path d="M22494.9 641.2 L21732.5 786 L21732.5 934.5 L21732.5 934.5 " fill="none"></path>
+					<path d="M22137.3 634.7 L21087.75 786 L21165.169207317074 934.5 L21165.2 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22505.1 644.7 L22494.9 641.2 L22503.1 634.3 L22513.3 637.8 Z"></path>
+						<path d="M22147.3 638.6 L22137.3 634.7 L22145.8 628.1 L22155.8 632.0 Z"></path>
 					</g>
-					<path d="M22494.7 621.6 L20854.5 786 L20817.14862804878 934.5 L20817.1 934.5 " fill="none"></path>
+					<path d="M21338.3 213.3 L22381.25 413 L22381.25 561 L22381.3 561.0 " fill="none"></path>
+					<path d="M21339.3 208.0 L21338.3 213.3 L21337.3 218.5 L21325.3 210.8 Z"></path>
+					<path d="M22879.2 629.9 L21624.25 786 L21624.25 934.5 L21624.3 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22504.5 625.9 L22494.7 621.6 L22503.4 615.3 L22513.3 619.7 Z"></path>
+						<path d="M22889.1 634.0 L22879.2 629.9 L22887.8 623.4 L22897.8 627.6 Z"></path>
 					</g>
-					<path d="M22184.8 227.1 L22714.75 413 L22714.75 561 L22714.8 561.0 " fill="none"></path>
-					<path d="M22186.6 222.0 L22184.8 227.1 L22183.1 232.1 L22172.3 222.6 Z"></path>
-					<path d="M23007.5 631.0 L21948.5 786 L21948.5 934.5 L21948.5 934.5 " fill="none"></path>
+					<path d="M22879.2 624.7 L21318.75 786 L21187.001524390245 934.5 L21187.0 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23017.5 634.9 L23007.5 631.0 L23016.0 624.3 L23026.0 628.3 Z"></path>
+						<path d="M22889.0 629.1 L22879.2 624.7 L22887.9 618.5 L22897.8 622.8 Z"></path>
 					</g>
-					<path d="M23007.6 639.3 L22215 786 L22215 934.5 L22215.0 934.5 " fill="none"></path>
+					<path d="M21338.5 206.6 L23123.25 413 L23123.25 561 L23123.3 561.0 " fill="none"></path>
+					<path d="M21339.1 201.3 L21338.5 206.6 L21337.9 211.9 L21325.3 205.1 Z"></path>
+					<path d="M18194.8 250.7 L18526.5 413 L18526.5 584 L18526.5 584.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23017.8 642.8 L23007.6 639.3 L23015.9 632.3 L23026.0 635.9 Z"></path>
+						<path d="M18188.7 241.8 L18194.8 250.7 L18184.1 251.4 L18178.0 242.5 Z"></path>
 					</g>
-					<path d="M22185.3 213.4 L23222.5 413 L23222.5 546 L23222.5 546.0 " fill="none"></path>
-					<path d="M22186.4 208.1 L22185.3 213.4 L22184.3 218.6 L22172.3 210.8 Z"></path>
-					<path d="M20151.9 656.0 L20188.5 786 L20106.100609756097 934.5 L20106.1 934.5 " fill="none"></path>
+					<path d="M18249.7 248.0 L18780 413 L18780 584 L18780.0 584.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20154.5 645.5 L20151.9 656.0 L20144.2 648.4 L20146.8 638.0 Z"></path>
+						<path d="M18242.4 240.2 L18249.7 248.0 L18239.2 250.4 L18231.9 242.5 Z"></path>
 					</g>
-					<path d="M20318.7 642.3 L20932.75 786 L20824.544207317074 934.5 L20824.5 934.5 " fill="none"></path>
+					<path d="M17035.2 606.9 L21886.25 786 L21886.25 934.5 L21886.3 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20310.8 634.9 L20318.7 642.3 L20308.3 645.3 L20300.5 638.0 Z"></path>
+						<path d="M17026.0 601.2 L17035.2 606.9 L17025.6 611.9 L17016.5 606.2 Z"></path>
 					</g>
-					<path d="M22010.0 206.2 L20136 413 L20136 561 L20136.0 561.0 " fill="none"></path>
-					<path d="M22010.6 211.5 L22010.0 206.2 L22009.4 200.9 L22023.3 204.7 Z"></path>
-					<path d="M19454.5 256.3 L19597.5 413 L19597.5 584 L19597.5 584.0 " fill="none"></path>
+					<path d="M16633.8 605.1 L10162 786 L10053.341463414634 934.5 L10053.3 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19452.2 245.8 L19454.5 256.3 L19444.3 253.0 L19442.0 242.5 Z"></path>
+						<path d="M16643.3 610.2 L16633.8 605.1 L16643.0 599.5 L16652.5 604.6 Z"></path>
 					</g>
-					<path d="M19512.7 250.6 L19851 413 L19851 584 L19851.0 584.0 " fill="none"></path>
+					<path d="M17035.1 613.7 L19463.5 786 L19445.39024390244 934.5 L19445.4 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19506.5 241.7 L19512.7 250.6 L19501.9 251.3 L19495.8 242.5 Z"></path>
+						<path d="M17026.2 607.8 L17035.1 613.7 L17025.4 618.4 L17016.5 612.4 Z"></path>
 					</g>
-					<path d="M17010.9 607.7 L13912.5 786 L13563.887195121952 934.5 L13563.9 934.5 " fill="none"></path>
+					<path d="M19053.1 216.9 L19555.25 413 L19555.25 568.5 L19555.3 568.5 " fill="none"></path>
+					<path d="M19055.0 211.9 L19053.1 216.9 L19051.2 221.8 L19040.7 212.0 Z"></path>
+					<path d="M9375.1 606.8 L12900.75 786 L12778.961890243903 934.5 L12779.0 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17020.5 612.5 L17010.9 607.7 L17019.9 601.8 L17029.5 606.6 Z"></path>
+						<path d="M9366.1 601.0 L9375.1 606.8 L9365.6 611.6 L9356.5 605.8 Z"></path>
 					</g>
-					<path d="M17294.9 625.5 L18169.25 786 L16660 940.9159755906744 L16660.0 940.9 " fill="none"></path>
+					<path d="M9372.5 683.7 L9542.5 786 L9479.794969512195 934.5 L9479.8 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17286.6 618.6 L17294.9 625.5 L17284.7 629.1 L17276.5 622.2 Z"></path>
+						<path d="M9367.2 674.3 L9372.5 683.7 L9361.7 683.5 L9356.5 674.1 Z"></path>
 					</g>
-					<path d="M17297.9 607.5 L14077 786 L13579.434451219513 934.5 L13579.4 934.5 " fill="none"></path>
+					<path d="M9374.9 625.8 L10242 786 L10447.092987804877 934.5 L10447.1 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17307.5 612.3 L17297.9 607.5 L17306.9 601.6 L17316.5 606.5 Z"></path>
+						<path d="M9366.6 618.9 L9374.9 625.8 L9364.7 629.3 L9356.5 622.4 Z"></path>
 					</g>
-					<path d="M17585.6 634.4 L18209.25 786 L16660 941.1378415509082 L16660.0 941.1 " fill="none"></path>
+					<path d="M13977.4 609.1 L11350 786 L11116.836890243903 934.5 L11116.8 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17577.8 627.0 L17585.6 634.4 L17575.3 637.4 L17567.5 630.0 Z"></path>
+						<path d="M13987.0 613.8 L13977.4 609.1 L13986.3 603.1 L13996.0 607.8 Z"></path>
 					</g>
-					<path d="M14646.8 637.7 L14117 786 L13582.5 934.6988973706531 L13582.5 934.7 " fill="none"></path>
+					<path d="M14261.1 636.5 L14833.75 786 L16204.75 940.0554984583762 L16204.8 940.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14657.2 640.3 L14646.8 637.7 L14654.3 630.1 L14664.8 632.7 Z"></path>
+						<path d="M14253.4 628.9 L14261.1 636.5 L14250.7 639.3 L14243.0 631.7 Z"></path>
 					</g>
-					<path d="M16069.9 605.7 L11919.75 786 L11850.706554878048 934.5 L11850.7 934.5 " fill="none"></path>
+					<path d="M14264.4 608.8 L11514.5 786 L11132.384146341463 934.5 L11132.4 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16079.4 610.6 L16069.9 605.7 L16078.9 599.9 L16088.5 604.9 Z"></path>
+						<path d="M14274.0 613.5 L14264.4 608.8 L14273.3 602.9 L14283.0 607.6 Z"></path>
 					</g>
-					<path d="M16354.1 612.5 L18249.25 786 L16660 941.349128296826 L16660.0 941.3 " fill="none"></path>
+					<path d="M14551.3 656.8 L14873.75 786 L16204.75 939.7752729834449 L16204.8 939.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16345.3 606.3 L16354.1 612.5 L16344.3 617.0 L16335.5 610.8 Z"></path>
+						<path d="M14544.6 648.3 L14551.3 656.8 L14540.7 658.2 L14534.0 649.8 Z"></path>
 					</g>
-					<path d="M20802.7 617.5 L19102.75 786 L16660 944.266074074074 L16660.0 944.3 " fill="none"></path>
+					<path d="M12689.5 619.6 L11554.5 786 L11136.164634146342 934.5 L11136.2 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20812.5 621.9 L20802.7 617.5 L20811.4 611.3 L20821.3 615.7 Z"></path>
+						<path d="M12699.5 623.5 L12689.5 619.6 L12698.0 613.0 L12708.0 616.9 Z"></path>
 					</g>
-					<path d="M21165.8 621.8 L22501.5 786 L22501.5 934.5 L22501.5 934.5 " fill="none"></path>
+					<path d="M19683.6 609.1 L16339.25 786 L16297.59756097561 934.5 L16297.6 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21157.2 615.4 L21165.8 621.8 L21155.9 626.0 L21147.3 619.5 Z"></path>
+						<path d="M19693.2 613.9 L19683.6 609.1 L19692.6 603.3 L19702.3 608.1 Z"></path>
 					</g>
-					<path d="M13864.5 628.2 L13080.5 786 L13003.080792682927 934.5 L13003.1 934.5 " fill="none"></path>
+					<path d="M20046.9 614.4 L22132.75 786 L22132.75 934.5 L22132.8 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13874.7 631.5 L13864.5 628.2 L13872.5 621.1 L13882.8 624.5 Z"></path>
+						<path d="M20038.0 608.4 L20046.9 614.4 L20037.1 619.0 L20028.3 612.9 Z"></path>
 					</g>
-					<path d="M14149.2 619.7 L15325.5 786 L15276.377286585366 934.5 L15276.4 934.5 " fill="none"></path>
+					<path d="M22890.2 264.2 L22752.25 413 L22752.25 584 L22752.3 584.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14140.7 613.1 L14149.2 619.7 L14139.2 623.6 L14130.8 617.0 Z"></path>
+						<path d="M22900.5 261.0 L22890.2 264.2 L22892.7 253.7 L22902.9 250.5 Z"></path>
 					</g>
-					<path d="M13864.2 612.5 L11959.75 786 L11854.487042682927 934.5 L11854.5 934.5 " fill="none"></path>
+					<path d="M13690.4 607.5 L10508.5 786 L10472.280487804877 934.5 L10472.3 934.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13873.9 617.0 L13864.2 612.5 L13873.0 606.3 L13882.8 610.8 Z"></path>
+						<path d="M13700.0 612.3 L13690.4 607.5 L13699.4 601.6 L13709.0 606.4 Z"></path>
 					</g>
-					<g data-name="MyApp">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MyApp">
-							<rect x="0.0" y="150.5" height="92.0" width="328.0" data-name="MyApp"></rect>
-							<path d="M0.0 181.5 L328.0 181.5" fill="none" data-name="MyApp"></path>
-						</g>
-						<g transform="translate(0, 150.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MyApp">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MyApp">
-								<text x="156.0" y="13.5" stroke="none" text-anchor="middle" data-name="MyApp">MyApp</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MyApp">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MyApp">
-								<text x="0.0" y="13.5" stroke="none" data-name="MyApp">+queryParameters: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MyApp">+appConfig: AppConfig?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MyApp">+initialRoute: String</text>
-								
-							</g>
-						</g>
+					<path d="M13974.6 609.9 L16379.25 786 L16301.378048780487 934.5 L16301.4 934.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M13965.7 603.9 L13974.6 609.9 L13964.9 614.5 L13956.0 608.5 Z"></path>
 					</g>
-					<g data-name="AppConfig">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppConfig">
-							<rect x="115.0" y="584.0" height="31.0" width="98.0" data-name="AppConfig"></rect>
-						</g>
-						<g transform="translate(115, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppConfig">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppConfig">AppConfig</text>
-								
-							</g>
-						</g>
+					<path d="M23433.3 276.7 L23433.25 413 L23433.25 584 L23433.3 584.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M23438.6 267.3 L23433.3 276.7 L23427.9 267.3 L23433.3 258.0 Z"></path>
 					</g>
-					<g data-name="NotificationValidators">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationValidators">
-							<rect x="1682.5" y="904.0" height="92.0" width="323.0" data-name="NotificationValidators"></rect>
-							<path d="M1682.5 935.0 L2005.5 935.0" fill="none" data-name="NotificationValidators"></path>
-						</g>
-						<g transform="translate(1682.5, 904)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationValidators">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationValidators">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationValidators">NotificationValidators</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1682.5, 935)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationValidators">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationValidators">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationValidators">+didNotificationLaunchApp: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationValidators">+wasNotificationActionHandled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationValidators">+wasNotificationActionCompleted: bool</text>
-								
-							</g>
-						</g>
+					<path d="M23715.3 261.2 L23715.25 413 L23715.25 584 L23715.3 584.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M23720.6 251.8 L23715.3 261.2 L23709.9 251.8 L23715.3 242.5 Z"></path>
 					</g>
-					<g data-name="StudyNotifications">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotifications">
-							<rect x="4099.0" y="455.5" height="288.0" width="626.0" data-name="StudyNotifications"></rect>
-							<path d="M4099.0 486.5 L4725.0 486.5" fill="none" data-name="StudyNotifications"></path>
-							<path d="M4099.0 622.5 L4725.0 622.5" fill="none" data-name="StudyNotifications"></path>
-						</g>
-						<g transform="translate(4099, 455.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotifications">
-								<text x="305.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotifications">StudyNotifications</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4099, 486.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotifications">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotifications">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotifications">+flutterLocalNotificationsPlugin: FlutterLocalNotificationsPlugin</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNotifications">+context: BuildContext</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNotifications">+didReceiveLocalNotificationStream: StreamController&lt;ReceivedNotification&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNotifications">+selectNotificationStream: StreamController&lt;String?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+validator: NotificationValidators</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+debug: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+scheduledNotificationsDebug: String?</text>
-								
-							</g>
+					<g data-name="AboutScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AboutScreen">
+							<rect x="0.0" y="165.5" height="62.0" width="136.0" data-name="AboutScreen"></rect>
+							<path d="M0.0 196.5 L136.0 196.5" fill="none" data-name="AboutScreen"></path>
 						</g>
-						<g transform="translate(4099, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotifications">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+dynamic create()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotifications">-dynamic _isAndroidPermissionGranted()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNotifications">-dynamic _requestPermissions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNotifications">-void _configureDidReceiveLocalNotificationSubject()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNotifications">-void _configureSelectNotificationSubject()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNotifications">-void _initNotificationsPlugin()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyNotifications">+dynamic handleNotificationResponse()</text>
+						<g transform="translate(0, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AboutScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AboutScreen">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="AboutScreen">AboutScreen</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="5237.3" y="934.5" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(5237.25, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
+						<g transform="translate(0, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AboutScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AboutScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="AboutScreen">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FlutterLocalNotificationsPlugin">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FlutterLocalNotificationsPlugin">
-							<rect x="6364.5" y="934.5" height="31.0" width="255.0" data-name="FlutterLocalNotificationsPlugin"></rect>
+					<g data-name="WelcomeScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WelcomeScreen">
+							<rect x="176.0" y="165.5" height="62.0" width="145.0" data-name="WelcomeScreen"></rect>
+							<path d="M176.0 196.5 L321.0 196.5" fill="none" data-name="WelcomeScreen"></path>
 						</g>
-						<g transform="translate(6364.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FlutterLocalNotificationsPlugin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FlutterLocalNotificationsPlugin">
-								<text x="119.5" y="13.5" stroke="none" text-anchor="middle" data-name="FlutterLocalNotificationsPlugin">FlutterLocalNotificationsPlugin</text>
+						<g transform="translate(176, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WelcomeScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WelcomeScreen">
+								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="WelcomeScreen">WelcomeScreen</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="BuildContext">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
-							<rect x="6659.5" y="934.5" height="31.0" width="116.0" data-name="BuildContext"></rect>
-						</g>
-						<g transform="translate(6659.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
+						<g transform="translate(176, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WelcomeScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WelcomeScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="WelcomeScreen">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StreamController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
-							<rect x="7806.0" y="934.5" height="31.0" width="149.0" data-name="StreamController"></rect>
+					<g data-name="Preview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Preview">
+							<rect x="493.8" y="433.0" height="333.0" width="338.0" data-name="Preview"></rect>
+							<path d="M493.8 464.0 L831.8 464.0" fill="none" data-name="Preview"></path>
+							<path d="M493.8 585.0 L831.8 585.0" fill="none" data-name="Preview"></path>
 						</g>
-						<g transform="translate(7806, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
+						<g transform="translate(493.75, 433)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Preview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Preview">
+								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="Preview">Preview</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReceivedNotification">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReceivedNotification">
-							<rect x="779.8" y="143.0" height="107.0" width="178.0" data-name="ReceivedNotification"></rect>
-							<path d="M779.8 174.0 L957.8 174.0" fill="none" data-name="ReceivedNotification"></path>
-						</g>
-						<g transform="translate(779.75, 143)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReceivedNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReceivedNotification">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReceivedNotification">ReceivedNotification</text>
+						<g transform="translate(493.75, 464)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Preview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Preview">
+								<text x="0.0" y="13.5" stroke="none" data-name="Preview">+queryParameters: Map&lt;String, String&gt;?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Preview">+appLanguage: AppLanguage</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Preview">+selectedRoute: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Preview">+extra: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Preview">+study: Study?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Preview">+selectedStudyObjectId: String?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Preview">+subject: StudySubject?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(779.75, 174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReceivedNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReceivedNotification">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReceivedNotification">+id: int?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReceivedNotification">+title: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReceivedNotification">+body: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReceivedNotification">+payload: String?</text>
+						<g transform="translate(493.75, 585)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Preview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Preview">
+								<text x="0.0" y="13.5" stroke="none" data-name="Preview">+bool hasRoute()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Preview">+void handleQueries()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Preview">+dynamic init()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Preview">+dynamic handleAuthorization()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Preview">+dynamic runCommands()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Preview">+String? getSelectedRoute()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Preview">+bool containsQuery()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Preview">+bool containsQueryPair()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="Preview">+dynamic getStudySubject()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="Preview">-dynamic _createFakeSubject()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="Preview">+List&lt;String&gt; getInterventionIds()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyNotification">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotification">
-							<rect x="5867.0" y="561.0" height="77.0" width="243.0" data-name="StudyNotification"></rect>
-							<path d="M5867.0 592.0 L6110.0 592.0" fill="none" data-name="StudyNotification"></path>
-						</g>
-						<g transform="translate(5867, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotification">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotification">StudyNotification</text>
-								
-							</g>
+					<g data-name="AppLanguage">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppLanguage">
+							<rect x="512.3" y="934.5" height="31.0" width="127.0" data-name="AppLanguage"></rect>
 						</g>
-						<g transform="translate(5867, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotification">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotification">+taskInstance: TaskInstance</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotification">+date: DateTime</text>
+						<g transform="translate(512.25, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppLanguage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppLanguage">
+								<text x="55.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppLanguage">AppLanguage</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TaskInstance">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskInstance">
-							<rect x="7995.0" y="934.5" height="31.0" width="122.0" data-name="TaskInstance"></rect>
+					<g data-name="Study">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
+							<rect x="1779.8" y="934.5" height="31.0" width="61.0" data-name="Study"></rect>
 						</g>
-						<g transform="translate(7995, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskInstance">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskInstance">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskInstance">TaskInstance</text>
+						<g transform="translate(1779.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppAnalytics">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppAnalytics">
-							<rect x="3532.0" y="493.0" height="213.0" width="335.0" data-name="AppAnalytics"></rect>
-							<path d="M3532.0 524.0 L3867.0 524.0" fill="none" data-name="AppAnalytics"></path>
-							<path d="M3532.0 615.0 L3867.0 615.0" fill="none" data-name="AppAnalytics"></path>
-						</g>
-						<g transform="translate(3532, 493)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppAnalytics">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppAnalytics">
-								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppAnalytics">AppAnalytics</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3532, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppAnalytics">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppAnalytics">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;-_userEnabled: bool?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+keyAnalyticsUserEnable: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppAnalytics">+context: BuildContext</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppAnalytics">+subject: StudySubject?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+isUserEnabled: dynamic</text>
-								
-							</g>
+					<g data-name="StudySubject">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
+							<rect x="6618.8" y="934.5" height="31.0" width="120.0" data-name="StudySubject"></rect>
 						</g>
-						<g transform="translate(3532, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppAnalytics">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppAnalytics">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+dynamic init()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+dynamic start()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+void setEnabled()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppAnalytics">+dynamic initBasic()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppAnalytics">+void initAdvanced()</text>
+						<g transform="translate(6618.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
+								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="GroupedIterable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GroupedIterable">
-							<rect x="1249.0" y="538.0" height="123.0" width="397.0" data-name="GroupedIterable"></rect>
-							<path d="M1249.0 569.0 L1646.0 569.0" fill="none" data-name="GroupedIterable"></path>
-							<path d="M1249.0 615.0 L1646.0 615.0" fill="none" data-name="GroupedIterable"></path>
-						</g>
-						<g transform="translate(1249, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GroupedIterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GroupedIterable">
-								<text x="190.5" y="13.5" stroke="none" text-anchor="middle" data-name="GroupedIterable">GroupedIterable</text>
-								
-							</g>
+					<g data-name="IFrameHelper">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameHelper">
+							<rect x="361.0" y="158.0" height="77.0" width="224.0" data-name="IFrameHelper"></rect>
+							<path d="M361.0 189.0 L585.0 189.0" fill="none" data-name="IFrameHelper"></path>
 						</g>
-						<g transform="translate(1249, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GroupedIterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GroupedIterable">
-								<text x="0.0" y="13.5" stroke="none" data-name="GroupedIterable">+data: Map&lt;K, Iterable&lt;V&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GroupedIterable">+iterator: Iterator&lt;MapEntry&lt;K, Iterable&lt;V&gt;&gt;&gt;</text>
+						<g transform="translate(361, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameHelper">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameHelper">
+								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameHelper">IFrameHelper</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1249, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GroupedIterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GroupedIterable">
-								<text x="0.0" y="13.5" stroke="none" data-name="GroupedIterable">+Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GroupedIterable">+Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregateWithKey()</text>
+						<g transform="translate(361, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFrameHelper">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFrameHelper">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFrameHelper">+void postRouteFinished()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IFrameHelper">+void listen()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Iterable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Iterable">
-							<rect x="1409.5" y="181.0" height="31.0" width="76.0" data-name="Iterable"></rect>
+					<g data-name="TermsScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TermsScreen">
+							<rect x="625.0" y="181.0" height="31.0" width="121.0" data-name="TermsScreen"></rect>
 						</g>
-						<g transform="translate(1409.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Iterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Iterable">
-								<text x="30.0" y="13.5" stroke="none" text-anchor="middle" data-name="Iterable">Iterable</text>
+						<g transform="translate(625, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TermsScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TermsScreen">
+								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="TermsScreen">TermsScreen</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Cache">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Cache">
-							<rect x="1525.5" y="105.0" height="183.0" width="282.0" data-name="Cache"></rect>
-							<path d="M1525.5 136.0 L1807.5 136.0" fill="none" data-name="Cache"></path>
-							<path d="M1525.5 182.0 L1807.5 182.0" fill="none" data-name="Cache"></path>
+					<g data-name="LegalSection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LegalSection">
+							<rect x="6504.5" y="500.5" height="198.0" width="290.0" data-name="LegalSection"></rect>
+							<path d="M6504.5 531.5 L6794.5 531.5" fill="none" data-name="LegalSection"></path>
+							<path d="M6504.5 667.5 L6794.5 667.5" fill="none" data-name="LegalSection"></path>
 						</g>
-						<g transform="translate(1525.5, 105)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Cache">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Cache">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="Cache">Cache</text>
+						<g transform="translate(6504.5, 500.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegalSection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegalSection">
+								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="LegalSection">LegalSection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1525.5, 136)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Cache">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Cache">
-								<text x="0.0" y="13.5" stroke="none" data-name="Cache">&lt;static&gt;+isSynchronizing: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Cache">&lt;static&gt;+sharedPrefs: dynamic</text>
+						<g transform="translate(6504.5, 531.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegalSection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegalSection">
+								<text x="0.0" y="13.5" stroke="none" data-name="LegalSection">+title: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="LegalSection">+description: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="LegalSection">+icon: Icon?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="LegalSection">+pdfUrl: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="LegalSection">+pdfUrlLabel: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="LegalSection">+acknowledgment: String?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="LegalSection">+isChecked: bool?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="LegalSection">+onChange: void Function(bool?)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1525.5, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Cache">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Cache">
-								<text x="0.0" y="13.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic storeSubject()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic loadSubject()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic storeAnalytics()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic loadAnalytics()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic synchronize()</text>
+						<g transform="translate(6504.5, 667.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegalSection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegalSection">
+								<text x="0.0" y="13.5" stroke="none" data-name="LegalSection">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentScreen">
-							<rect x="1847.5" y="181.0" height="31.0" width="138.0" data-name="ConsentScreen"></rect>
+					<g data-name="Icon">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Icon">
+							<rect x="9448.3" y="934.5" height="31.0" width="50.0" data-name="Icon"></rect>
 						</g>
-						<g transform="translate(1847.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentScreen">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentScreen">ConsentScreen</text>
+						<g transform="translate(9448.25, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Icon">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Icon">
+								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Icon">Icon</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentCard">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentCard">
-							<rect x="2025.5" y="127.5" height="138.0" width="286.0" data-name="ConsentCard"></rect>
-							<path d="M2025.5 158.5 L2311.5 158.5" fill="none" data-name="ConsentCard"></path>
-							<path d="M2025.5 234.5 L2311.5 234.5" fill="none" data-name="ConsentCard"></path>
+					<g data-name="void Function(bool?)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(bool?)?">
+							<rect x="9548.0" y="934.5" height="31.0" width="188.0" data-name="void Function(bool?)?"></rect>
 						</g>
-						<g transform="translate(2025.5, 127.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentCard">
-								<text x="135.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentCard">ConsentCard</text>
+						<g transform="translate(9548, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(bool?)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(bool?)?">
+								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(bool?)?">void Function(bool?)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2025.5, 158.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+consent: ConsentItem?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentCard">+index: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentCard">+onTapped: dynamic Function(int)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentCard">+isChecked: bool?</text>
-								
-							</g>
+					</g>
+					<g data-name="AppOutdatedScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppOutdatedScreen">
+							<rect x="786.0" y="165.5" height="62.0" width="176.0" data-name="AppOutdatedScreen"></rect>
+							<path d="M786.0 196.5 L962.0 196.5" fill="none" data-name="AppOutdatedScreen"></path>
 						</g>
-						<g transform="translate(2025.5, 234.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+Widget build()</text>
+						<g transform="translate(786, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppOutdatedScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppOutdatedScreen">
+								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppOutdatedScreen">AppOutdatedScreen</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ConsentItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItem">
-							<rect x="1898.3" y="584.0" height="31.0" width="116.0" data-name="ConsentItem"></rect>
-						</g>
-						<g transform="translate(1898.25, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItem">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItem">ConsentItem</text>
+						<g transform="translate(786, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppOutdatedScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppOutdatedScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppOutdatedScreen">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function(int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(int)">
-							<rect x="2171.0" y="584.0" height="31.0" width="186.0" data-name="dynamic Function(int)"></rect>
+					<g data-name="LoadingScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LoadingScreen">
+							<rect x="1002.0" y="158.0" height="77.0" width="338.0" data-name="LoadingScreen"></rect>
+							<path d="M1002.0 189.0 L1340.0 189.0" fill="none" data-name="LoadingScreen"></path>
+						</g>
+						<g transform="translate(1002, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoadingScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoadingScreen">
+								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="LoadingScreen">LoadingScreen</text>
+								
+							</g>
 						</g>
-						<g transform="translate(2171, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(int)">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(int)">dynamic Function(int)</text>
+						<g transform="translate(1002, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoadingScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoadingScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="LoadingScreen">+sessionString: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="LoadingScreen">+queryParameters: Map&lt;String, String&gt;?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentElement">
-							<rect x="6567.0" y="546.0" height="107.0" width="249.0" data-name="ConsentElement"></rect>
-							<path d="M6567.0 577.0 L6816.0 577.0" fill="none" data-name="ConsentElement"></path>
+					<g data-name="QuestionnaireTaskWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTaskWidget">
+							<rect x="1380.0" y="158.0" height="77.0" width="313.0" data-name="QuestionnaireTaskWidget"></rect>
+							<path d="M1380.0 189.0 L1693.0 189.0" fill="none" data-name="QuestionnaireTaskWidget"></path>
 						</g>
-						<g transform="translate(6567, 546)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentElement">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentElement">ConsentElement</text>
+						<g transform="translate(1380, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTaskWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTaskWidget">
+								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTaskWidget">QuestionnaireTaskWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6567, 577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentElement">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentElement">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentElement">+descriptionText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentElement">+acknowledgmentText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentElement">+icon: IconData</text>
+						<g transform="translate(1380, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireTaskWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireTaskWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireTaskWidget">+task: QuestionnaireTask</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireTaskWidget">+completionPeriod: CompletionPeriod</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="9019.8" y="934.5" height="31.0" width="87.0" data-name="IconData"></rect>
+					<g data-name="QuestionnaireTask">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTask">
+							<rect x="1373.8" y="584.0" height="31.0" width="165.0" data-name="QuestionnaireTask"></rect>
 						</g>
-						<g transform="translate(9019.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
+						<g transform="translate(1373.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTask">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTask">
+								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTask">QuestionnaireTask</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyOverviewScreen">
-							<rect x="2952.8" y="181.0" height="31.0" width="190.0" data-name="StudyOverviewScreen"></rect>
+					<g data-name="CompletionPeriod">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CompletionPeriod">
+							<rect x="1578.8" y="584.0" height="31.0" width="156.0" data-name="CompletionPeriod"></rect>
 						</g>
-						<g transform="translate(2952.75, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyOverviewScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyOverviewScreen">StudyOverviewScreen</text>
+						<g transform="translate(1578.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CompletionPeriod">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CompletionPeriod">
+								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="CompletionPeriod">CompletionPeriod</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="_StudyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_StudyOverviewScreen">
-							<rect x="6856.0" y="538.0" height="123.0" width="316.0" data-name="_StudyOverviewScreen"></rect>
-							<path d="M6856.0 569.0 L7172.0 569.0" fill="none" data-name="_StudyOverviewScreen"></path>
-							<path d="M6856.0 600.0 L7172.0 600.0" fill="none" data-name="_StudyOverviewScreen"></path>
+					<g data-name="TaskScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TaskScreen">
+							<rect x="6834.5" y="553.0" height="93.0" width="377.0" data-name="TaskScreen"></rect>
+							<path d="M6834.5 584.0 L7211.5 584.0" fill="none" data-name="TaskScreen"></path>
+							<path d="M6834.5 615.0 L7211.5 615.0" fill="none" data-name="TaskScreen"></path>
 						</g>
-						<g transform="translate(6856, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_StudyOverviewScreen">
-								<text x="150.0" y="13.5" stroke="none" text-anchor="middle" data-name="_StudyOverviewScreen">_StudyOverviewScreen</text>
+						<g transform="translate(6834.5, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskScreen">
+								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskScreen">TaskScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6856, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+study: Study?</text>
+						<g transform="translate(6834.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">+taskInstance: TaskInstance</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6856, 600)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToJourney()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToEligibilityCheck()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="_StudyOverviewScreen">+Widget build()</text>
+						<g transform="translate(6834.5, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">&lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="9274.0" y="934.5" height="31.0" width="61.0" data-name="Study"></rect>
+					<g data-name="TaskInstance">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TaskInstance">
+							<rect x="9776.0" y="934.5" height="31.0" width="122.0" data-name="TaskInstance"></rect>
 						</g>
-						<g transform="translate(9274, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
+						<g transform="translate(9776, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskInstance">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskInstance">
+								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskInstance">TaskInstance</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDetailsView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDetailsView">
-							<rect x="7212.0" y="545.5" height="108.0" width="157.0" data-name="StudyDetailsView"></rect>
-							<path d="M7212.0 576.5 L7369.0 576.5" fill="none" data-name="StudyDetailsView"></path>
-							<path d="M7212.0 622.5 L7369.0 622.5" fill="none" data-name="StudyDetailsView"></path>
-						</g>
-						<g transform="translate(7212, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDetailsView">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDetailsView">StudyDetailsView</text>
-								
-							</g>
+					<g data-name="CheckmarkTaskWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTaskWidget">
+							<rect x="1854.0" y="158.0" height="77.0" width="323.0" data-name="CheckmarkTaskWidget"></rect>
+							<path d="M1854.0 189.0 L2177.0 189.0" fill="none" data-name="CheckmarkTaskWidget"></path>
 						</g>
-						<g transform="translate(7212, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+study: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDetailsView">+iconSize: double</text>
+						<g transform="translate(1854, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTaskWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTaskWidget">
+								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTaskWidget">CheckmarkTaskWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7212, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+Widget build()</text>
+						<g transform="translate(1854, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CheckmarkTaskWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CheckmarkTaskWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="CheckmarkTaskWidget">+task: CheckmarkTask?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="CheckmarkTaskWidget">+completionPeriod: CompletionPeriod?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="KickoffScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="KickoffScreen">
-							<rect x="3182.8" y="181.0" height="31.0" width="125.0" data-name="KickoffScreen"></rect>
+					<g data-name="CheckmarkTask">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTask">
+							<rect x="2130.8" y="584.0" height="31.0" width="143.0" data-name="CheckmarkTask"></rect>
 						</g>
-						<g transform="translate(3182.75, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="KickoffScreen">
-								<text x="54.5" y="13.5" stroke="none" text-anchor="middle" data-name="KickoffScreen">KickoffScreen</text>
+						<g transform="translate(2130.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTask">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTask">
+								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTask">CheckmarkTask</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="_KickoffScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_KickoffScreen">
-							<rect x="253.0" y="523.0" height="153.0" width="261.0" data-name="_KickoffScreen"></rect>
-							<path d="M253.0 554.0 L514.0 554.0" fill="none" data-name="_KickoffScreen"></path>
-							<path d="M253.0 600.0 L514.0 600.0" fill="none" data-name="_KickoffScreen"></path>
-						</g>
-						<g transform="translate(253, 523)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_KickoffScreen">
-								<text x="122.5" y="13.5" stroke="none" text-anchor="middle" data-name="_KickoffScreen">_KickoffScreen</text>
-								
-							</g>
+					<g data-name="CapturePictureScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CapturePictureScreen">
+							<rect x="2217.0" y="158.0" height="77.0" width="190.0" data-name="CapturePictureScreen"></rect>
+							<path d="M2217.0 189.0 L2407.0 189.0" fill="none" data-name="CapturePictureScreen"></path>
 						</g>
-						<g transform="translate(253, 554)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">+ready: bool</text>
+						<g transform="translate(2217, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CapturePictureScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CapturePictureScreen">
+								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="CapturePictureScreen">CapturePictureScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(253, 600)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">-dynamic _storeUserStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">-Widget _constructStatusIcon()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="_KickoffScreen">-String _getStatusText()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="_KickoffScreen">+Widget build()</text>
+						<g transform="translate(2217, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CapturePictureScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CapturePictureScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="CapturePictureScreen">+userId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="CapturePictureScreen">+studyId: String</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="EligibilityResult">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityResult">
-							<rect x="3853.5" y="158.0" height="77.0" width="259.0" data-name="EligibilityResult"></rect>
-							<path d="M3853.5 189.0 L4112.5 189.0" fill="none" data-name="EligibilityResult"></path>
+							<rect x="2447.0" y="158.0" height="77.0" width="259.0" data-name="EligibilityResult"></rect>
+							<path d="M2447.0 189.0 L2706.0 189.0" fill="none" data-name="EligibilityResult"></path>
 						</g>
-						<g transform="translate(3853.5, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityResult">
+						<g transform="translate(2447, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityResult">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityResult">
 								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityResult">EligibilityResult</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3853.5, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityResult">
+						<g transform="translate(2447, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityResult">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityResult">
 								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityResult">+eligible: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="EligibilityResult">+firstFailed: EligibilityCriterion?</text>
@@ -1942,9 +1869,9 @@
 					</g>
 					<g data-name="EligibilityCriterion">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityCriterion">
-							<rect x="3907.0" y="584.0" height="31.0" width="152.0" data-name="EligibilityCriterion"></rect>
+							<rect x="2500.5" y="584.0" height="31.0" width="152.0" data-name="EligibilityCriterion"></rect>
 						</g>
-						<g transform="translate(3907, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityCriterion">
+						<g transform="translate(2500.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityCriterion">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityCriterion">
 								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityCriterion">EligibilityCriterion</text>
 								
@@ -1953,94 +1880,109 @@
 					</g>
 					<g data-name="EligibilityScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityScreen">
-							<rect x="7831.8" y="553.0" height="93.0" width="462.0" data-name="EligibilityScreen"></rect>
-							<path d="M7831.8 584.0 L8293.8 584.0" fill="none" data-name="EligibilityScreen"></path>
-							<path d="M7831.8 615.0 L8293.8 615.0" fill="none" data-name="EligibilityScreen"></path>
+							<rect x="871.8" y="553.0" height="93.0" width="462.0" data-name="EligibilityScreen"></rect>
+							<path d="M871.8 584.0 L1333.8 584.0" fill="none" data-name="EligibilityScreen"></path>
+							<path d="M871.8 615.0 L1333.8 615.0" fill="none" data-name="EligibilityScreen"></path>
 						</g>
-						<g transform="translate(7831.75, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityScreen">
+						<g transform="translate(871.75, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityScreen">
 								<text x="223.0" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityScreen">EligibilityScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7831.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
+						<g transform="translate(871.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityScreen">+study: Study?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7831.75, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
+						<g transform="translate(871.75, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityScreen">&lt;static&gt;+MaterialPageRoute&lt;EligibilityResult&gt; routeFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="OnboardingProgress">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OnboardingProgress">
-							<rect x="5522.8" y="135.0" height="123.0" width="271.0" data-name="OnboardingProgress"></rect>
-							<path d="M5522.8 166.0 L5793.8 166.0" fill="none" data-name="OnboardingProgress"></path>
-							<path d="M5522.8 212.0 L5793.8 212.0" fill="none" data-name="OnboardingProgress"></path>
+					<g data-name="InterventionSelectionScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSelectionScreen">
+							<rect x="3537.3" y="181.0" height="31.0" width="239.0" data-name="InterventionSelectionScreen"></rect>
 						</g>
-						<g transform="translate(5522.75, 135)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OnboardingProgress">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="OnboardingProgress">OnboardingProgress</text>
+						<g transform="translate(3537.25, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSelectionScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSelectionScreen">
+								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSelectionScreen">InterventionSelectionScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5522.75, 166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
-								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">+stage: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+progress: double</text>
+					</g>
+					<g data-name="StudyOverviewScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyOverviewScreen">
+							<rect x="3816.3" y="181.0" height="31.0" width="190.0" data-name="StudyOverviewScreen"></rect>
+						</g>
+						<g transform="translate(3816.25, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyOverviewScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyOverviewScreen">
+								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyOverviewScreen">StudyOverviewScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5522.75, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
-								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">-double _getProgressForStage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+Widget build()</text>
+					</g>
+					<g data-name="_StudyOverviewScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="_StudyOverviewScreen">
+							<rect x="1774.8" y="538.0" height="123.0" width="316.0" data-name="_StudyOverviewScreen"></rect>
+							<path d="M1774.8 569.0 L2090.8 569.0" fill="none" data-name="_StudyOverviewScreen"></path>
+							<path d="M1774.8 600.0 L2090.8 600.0" fill="none" data-name="_StudyOverviewScreen"></path>
+						</g>
+						<g transform="translate(1774.75, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_StudyOverviewScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_StudyOverviewScreen">
+								<text x="150.0" y="13.5" stroke="none" text-anchor="middle" data-name="_StudyOverviewScreen">_StudyOverviewScreen</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudySelectionScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySelectionScreen">
-							<rect x="5833.8" y="181.0" height="31.0" width="190.0" data-name="StudySelectionScreen"></rect>
+						<g transform="translate(1774.75, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+study: Study?</text>
+								
+							</g>
 						</g>
-						<g transform="translate(5833.75, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySelectionScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySelectionScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySelectionScreen">StudySelectionScreen</text>
+						<g transform="translate(1774.75, 600)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToJourney()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToEligibilityCheck()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="_StudyOverviewScreen">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeDialog">
-							<rect x="6063.8" y="181.0" height="31.0" width="151.0" data-name="InviteCodeDialog"></rect>
+					<g data-name="StudyDetailsView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDetailsView">
+							<rect x="2692.5" y="545.5" height="108.0" width="157.0" data-name="StudyDetailsView"></rect>
+							<path d="M2692.5 576.5 L2849.5 576.5" fill="none" data-name="StudyDetailsView"></path>
+							<path d="M2692.5 622.5 L2849.5 622.5" fill="none" data-name="StudyDetailsView"></path>
 						</g>
-						<g transform="translate(6063.75, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeDialog">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeDialog">InviteCodeDialog</text>
+						<g transform="translate(2692.5, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDetailsView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDetailsView">
+								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDetailsView">StudyDetailsView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InterventionSelectionScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSelectionScreen">
-							<rect x="6254.8" y="181.0" height="31.0" width="239.0" data-name="InterventionSelectionScreen"></rect>
+						<g transform="translate(2692.5, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+study: Study?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDetailsView">+iconSize: double</text>
+								
+							</g>
 						</g>
-						<g transform="translate(6254.75, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSelectionScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSelectionScreen">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSelectionScreen">InterventionSelectionScreen</text>
+						<g transform="translate(2692.5, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="JourneyOverviewScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="JourneyOverviewScreen">
-							<rect x="6533.8" y="181.0" height="31.0" width="209.0" data-name="JourneyOverviewScreen"></rect>
+							<rect x="4046.3" y="181.0" height="31.0" width="209.0" data-name="JourneyOverviewScreen"></rect>
 						</g>
-						<g transform="translate(6533.75, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JourneyOverviewScreen">
+						<g transform="translate(4046.25, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JourneyOverviewScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JourneyOverviewScreen">
 								<text x="96.5" y="13.5" stroke="none" text-anchor="middle" data-name="JourneyOverviewScreen">JourneyOverviewScreen</text>
 								
@@ -2049,23 +1991,23 @@
 					</g>
 					<g data-name="_JourneyOverviewScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="_JourneyOverviewScreen">
-							<rect x="554.0" y="545.5" height="108.0" width="408.0" data-name="_JourneyOverviewScreen"></rect>
-							<path d="M554.0 576.5 L962.0 576.5" fill="none" data-name="_JourneyOverviewScreen"></path>
-							<path d="M554.0 607.5 L962.0 607.5" fill="none" data-name="_JourneyOverviewScreen"></path>
+							<rect x="2889.5" y="545.5" height="108.0" width="408.0" data-name="_JourneyOverviewScreen"></rect>
+							<path d="M2889.5 576.5 L3297.5 576.5" fill="none" data-name="_JourneyOverviewScreen"></path>
+							<path d="M2889.5 607.5 L3297.5 607.5" fill="none" data-name="_JourneyOverviewScreen"></path>
 						</g>
-						<g transform="translate(554, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_JourneyOverviewScreen">
+						<g transform="translate(2889.5, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_JourneyOverviewScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_JourneyOverviewScreen">
 								<text x="196.0" y="13.5" stroke="none" text-anchor="middle" data-name="_JourneyOverviewScreen">_JourneyOverviewScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(554, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
+						<g transform="translate(2889.5, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_JourneyOverviewScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="_JourneyOverviewScreen">+subject: StudySubject?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(554, 607.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
+						<g transform="translate(2889.5, 607.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_JourneyOverviewScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="_JourneyOverviewScreen">+dynamic getConsentAndNavigateToDashboard()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="_JourneyOverviewScreen">+Widget build()</text>
@@ -2075,23 +2017,23 @@
 					</g>
 					<g data-name="Timeline">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Timeline">
-							<rect x="1002.0" y="553.0" height="93.0" width="207.0" data-name="Timeline"></rect>
-							<path d="M1002.0 584.0 L1209.0 584.0" fill="none" data-name="Timeline"></path>
-							<path d="M1002.0 615.0 L1209.0 615.0" fill="none" data-name="Timeline"></path>
+							<rect x="3337.5" y="553.0" height="93.0" width="207.0" data-name="Timeline"></rect>
+							<path d="M3337.5 584.0 L3544.5 584.0" fill="none" data-name="Timeline"></path>
+							<path d="M3337.5 615.0 L3544.5 615.0" fill="none" data-name="Timeline"></path>
 						</g>
-						<g transform="translate(1002, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timeline">
+						<g transform="translate(3337.5, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timeline">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timeline">
 								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="Timeline">Timeline</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1002, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
+						<g transform="translate(3337.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Timeline">
 								<text x="0.0" y="13.5" stroke="none" data-name="Timeline">+subject: StudySubject?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1002, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
+						<g transform="translate(3337.5, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Timeline">
 								<text x="0.0" y="13.5" stroke="none" data-name="Timeline">+Widget build()</text>
 								
@@ -2100,17 +2042,17 @@
 					</g>
 					<g data-name="InterventionTile">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTile">
-							<rect x="8570.8" y="515.5" height="168.0" width="161.0" data-name="InterventionTile"></rect>
-							<path d="M8570.8 546.5 L8731.8 546.5" fill="none" data-name="InterventionTile"></path>
-							<path d="M8570.8 652.5 L8731.8 652.5" fill="none" data-name="InterventionTile"></path>
+							<rect x="7812.5" y="515.5" height="168.0" width="161.0" data-name="InterventionTile"></rect>
+							<path d="M7812.5 546.5 L7973.5 546.5" fill="none" data-name="InterventionTile"></path>
+							<path d="M7812.5 652.5 L7973.5 652.5" fill="none" data-name="InterventionTile"></path>
 						</g>
-						<g transform="translate(8570.75, 515.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTile">
+						<g transform="translate(7812.5, 515.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTile">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTile">
 								<text x="72.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTile">InterventionTile</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8570.75, 546.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
+						<g transform="translate(7812.5, 546.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTile">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTile">+title: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTile">+iconName: String</text>
@@ -2121,7 +2063,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(8570.75, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
+						<g transform="translate(7812.5, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTile">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTile">+Widget build()</text>
 								
@@ -2130,9 +2072,9 @@
 					</g>
 					<g data-name="Color">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="9836.8" y="934.5" height="31.0" width="58.0" data-name="Color"></rect>
+							<rect x="10013.0" y="934.5" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(9836.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+						<g transform="translate(10013, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
 								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
@@ -2141,24 +2083,24 @@
 					</g>
 					<g data-name="IconIndicator">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IconIndicator">
-							<rect x="9145.8" y="545.5" height="108.0" width="161.0" data-name="IconIndicator"></rect>
-							<path d="M9145.8 576.5 L9306.8 576.5" fill="none" data-name="IconIndicator"></path>
-							<path d="M9145.8 622.5 L9306.8 622.5" fill="none" data-name="IconIndicator"></path>
+							<rect x="8013.5" y="545.5" height="108.0" width="161.0" data-name="IconIndicator"></rect>
+							<path d="M8013.5 576.5 L8174.5 576.5" fill="none" data-name="IconIndicator"></path>
+							<path d="M8013.5 622.5 L8174.5 622.5" fill="none" data-name="IconIndicator"></path>
 						</g>
-						<g transform="translate(9145.75, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconIndicator">
+						<g transform="translate(8013.5, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconIndicator">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconIndicator">
 								<text x="72.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconIndicator">IconIndicator</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9145.75, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
+						<g transform="translate(8013.5, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconIndicator">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconIndicator">+iconName: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IconIndicator">+color: Color?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9145.75, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
+						<g transform="translate(8013.5, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconIndicator">
 								<text x="0.0" y="13.5" stroke="none" data-name="IconIndicator">+Widget build()</text>
 								
@@ -2167,23 +2109,23 @@
 					</g>
 					<g data-name="TimelineChild">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TimelineChild">
-							<rect x="10047.8" y="553.0" height="93.0" width="138.0" data-name="TimelineChild"></rect>
-							<path d="M10047.8 584.0 L10185.8 584.0" fill="none" data-name="TimelineChild"></path>
-							<path d="M10047.8 615.0 L10185.8 615.0" fill="none" data-name="TimelineChild"></path>
+							<rect x="8930.5" y="553.0" height="93.0" width="138.0" data-name="TimelineChild"></rect>
+							<path d="M8930.5 584.0 L9068.5 584.0" fill="none" data-name="TimelineChild"></path>
+							<path d="M8930.5 615.0 L9068.5 615.0" fill="none" data-name="TimelineChild"></path>
 						</g>
-						<g transform="translate(10047.75, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimelineChild">
+						<g transform="translate(8930.5, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimelineChild">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimelineChild">
 								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="TimelineChild">TimelineChild</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10047.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
+						<g transform="translate(8930.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimelineChild">
 								<text x="0.0" y="13.5" stroke="none" data-name="TimelineChild">+child: Widget?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10047.75, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
+						<g transform="translate(8930.5, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimelineChild">
 								<text x="0.0" y="13.5" stroke="none" data-name="TimelineChild">+Widget build()</text>
 								
@@ -2192,201 +2134,216 @@
 					</g>
 					<g data-name="Widget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="11808.0" y="934.5" height="31.0" width="71.0" data-name="Widget"></rect>
+							<rect x="10433.0" y="934.5" height="31.0" width="71.0" data-name="Widget"></rect>
 						</g>
-						<g transform="translate(11808, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
+						<g transform="translate(10433, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
 								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AverageSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionWidget">
-							<rect x="11919.0" y="806.0" height="288.0" width="394.0" data-name="AverageSectionWidget"></rect>
-							<path d="M11919.0 837.0 L12313.0 837.0" fill="none" data-name="AverageSectionWidget"></path>
-							<path d="M11919.0 898.0 L12313.0 898.0" fill="none" data-name="AverageSectionWidget"></path>
+					<g data-name="KickoffScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="KickoffScreen">
+							<rect x="4295.3" y="181.0" height="31.0" width="125.0" data-name="KickoffScreen"></rect>
 						</g>
-						<g transform="translate(11919, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionWidget">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionWidget">AverageSectionWidget</text>
+						<g transform="translate(4295.25, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="KickoffScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="KickoffScreen">
+								<text x="54.5" y="13.5" stroke="none" text-anchor="middle" data-name="KickoffScreen">KickoffScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11919, 837)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+section: AverageSection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+titlePos: List&lt;int&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+phasePos: List&lt;int&gt;</text>
+					</g>
+					<g data-name="_KickoffScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="_KickoffScreen">
+							<rect x="3584.5" y="523.0" height="153.0" width="261.0" data-name="_KickoffScreen"></rect>
+							<path d="M3584.5 554.0 L3845.5 554.0" fill="none" data-name="_KickoffScreen"></path>
+							<path d="M3584.5 600.0 L3845.5 600.0" fill="none" data-name="_KickoffScreen"></path>
+						</g>
+						<g transform="translate(3584.5, 523)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_KickoffScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_KickoffScreen">
+								<text x="122.5" y="13.5" stroke="none" text-anchor="middle" data-name="_KickoffScreen">_KickoffScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11919, 898)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+Widget getLegend()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+Widget getDiagram()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AverageSectionWidget">+BarChartData getChartData()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AverageSectionWidget">+Widget getTitles()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AverageSectionWidget">+Widget getValues()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AverageSectionWidget">+List&lt;BarChartGroupData&gt; getBarGroups()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AverageSectionWidget">+FlGridData getGridData()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AverageSectionWidget">+MaterialColor getColor()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AverageSectionWidget">+int getDayIndex()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AverageSectionWidget">+Iterable&lt;DiagramDatum&gt; getAggregatedData()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AverageSectionWidget">+Map&lt;String, String?&gt; getInterventionNames()</text>
+						<g transform="translate(3584.5, 554)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">+subject: StudySubject?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">+ready: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(3584.5, 600)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">-dynamic _storeUserStudy()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">-Widget _constructStatusIcon()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="_KickoffScreen">-String _getStatusText()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="_KickoffScreen">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AverageSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSection">
-							<rect x="12045.5" y="1134.0" height="31.0" width="141.0" data-name="AverageSection"></rect>
+					<g data-name="ConsentScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentScreen">
+							<rect x="4460.3" y="181.0" height="31.0" width="138.0" data-name="ConsentScreen"></rect>
 						</g>
-						<g transform="translate(12045.5, 1134)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSection">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSection">AverageSection</text>
+						<g transform="translate(4460.25, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentScreen">
+								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentScreen">ConsentScreen</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionWidget">
-							<rect x="8333.8" y="568.5" height="62.0" width="197.0" data-name="ReportSectionWidget"></rect>
-							<path d="M8333.8 599.5 L8530.8 599.5" fill="none" data-name="ReportSectionWidget"></path>
+					<g data-name="ConsentCard">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentCard">
+							<rect x="5525.0" y="127.5" height="138.0" width="286.0" data-name="ConsentCard"></rect>
+							<path d="M5525.0 158.5 L5811.0 158.5" fill="none" data-name="ConsentCard"></path>
+							<path d="M5525.0 234.5 L5811.0 234.5" fill="none" data-name="ConsentCard"></path>
 						</g>
-						<g transform="translate(8333.75, 568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionWidget">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionWidget">ReportSectionWidget</text>
+						<g transform="translate(5525, 127.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentCard">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentCard">
+								<text x="135.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentCard">ConsentCard</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8333.75, 599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionWidget">+subject: StudySubject</text>
+						<g transform="translate(5525, 158.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+consent: ConsentItem?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentCard">+index: int?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentCard">+onTapped: dynamic Function(int)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentCard">+isChecked: bool?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="DiagramDatum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DiagramDatum">
-							<rect x="6782.8" y="143.0" height="107.0" width="202.0" data-name="DiagramDatum"></rect>
-							<path d="M6782.8 174.0 L6984.8 174.0" fill="none" data-name="DiagramDatum"></path>
-						</g>
-						<g transform="translate(6782.75, 143)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DiagramDatum">
-								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="DiagramDatum">DiagramDatum</text>
+						<g transform="translate(5525, 234.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6782.75, 174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DiagramDatum">
-								<text x="0.0" y="13.5" stroke="none" data-name="DiagramDatum">+x: num</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DiagramDatum">+value: num</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DiagramDatum">+timestamp: DateTime?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DiagramDatum">+intervention: String</text>
+					</g>
+					<g data-name="ConsentItem">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItem">
+							<rect x="5514.5" y="584.0" height="31.0" width="116.0" data-name="ConsentItem"></rect>
+						</g>
+						<g transform="translate(5514.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItem">
+								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItem">ConsentItem</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LinearRegressionSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionWidget">
-							<rect x="12353.0" y="903.5" height="93.0" width="292.0" data-name="LinearRegressionSectionWidget"></rect>
-							<path d="M12353.0 934.5 L12645.0 934.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-							<path d="M12353.0 965.5 L12645.0 965.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
+					<g data-name="dynamic Function(int)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(int)">
+							<rect x="5670.5" y="584.0" height="31.0" width="186.0" data-name="dynamic Function(int)"></rect>
 						</g>
-						<g transform="translate(12353, 903.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionWidget">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionWidget">LinearRegressionSectionWidget</text>
+						<g transform="translate(5670.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(int)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(int)">
+								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(int)">dynamic Function(int)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12353, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+section: LinearRegressionSection</text>
+					</g>
+					<g data-name="ConsentElement">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentElement">
+							<rect x="10285.0" y="546.0" height="107.0" width="249.0" data-name="ConsentElement"></rect>
+							<path d="M10285.0 577.0 L10534.0 577.0" fill="none" data-name="ConsentElement"></path>
+						</g>
+						<g transform="translate(10285, 546)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentElement">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentElement">
+								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentElement">ConsentElement</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12353, 965.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+Widget build()</text>
+						<g transform="translate(10285, 577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentElement">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentElement">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentElement">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentElement">+descriptionText: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentElement">+acknowledgmentText: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentElement">+icon: IconData</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LinearRegressionSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSection">
-							<rect x="12391.5" y="1134.0" height="31.0" width="215.0" data-name="LinearRegressionSection"></rect>
+					<g data-name="IconData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
+							<rect x="10545.0" y="934.5" height="31.0" width="87.0" data-name="IconData"></rect>
 						</g>
-						<g transform="translate(12391.5, 1134)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSection">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSection">LinearRegressionSection</text>
+						<g transform="translate(10545, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
+								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportHistoryScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryScreen">
-							<rect x="7024.8" y="165.5" height="62.0" width="180.0" data-name="ReportHistoryScreen"></rect>
-							<path d="M7024.8 196.5 L7204.8 196.5" fill="none" data-name="ReportHistoryScreen"></path>
+					<g data-name="StudySelectionScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySelectionScreen">
+							<rect x="6598.5" y="181.0" height="31.0" width="190.0" data-name="StudySelectionScreen"></rect>
 						</g>
-						<g transform="translate(7024.75, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryScreen">ReportHistoryScreen</text>
+						<g transform="translate(6598.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySelectionScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySelectionScreen">
+								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySelectionScreen">StudySelectionScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7024.75, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryScreen">+Widget build()</text>
+					</g>
+					<g data-name="InviteCodeDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeDialog">
+							<rect x="6828.5" y="181.0" height="31.0" width="151.0" data-name="InviteCodeDialog"></rect>
+						</g>
+						<g transform="translate(6828.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeDialog">
+								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeDialog">InviteCodeDialog</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportHistoryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryItem">
-							<rect x="2397.0" y="553.0" height="93.0" width="197.0" data-name="ReportHistoryItem"></rect>
-							<path d="M2397.0 584.0 L2594.0 584.0" fill="none" data-name="ReportHistoryItem"></path>
-							<path d="M2397.0 615.0 L2594.0 615.0" fill="none" data-name="ReportHistoryItem"></path>
+					<g data-name="OnboardingProgress">
+						<g fill="#eee8d5" stroke="#33322E" data-name="OnboardingProgress">
+							<rect x="7019.5" y="135.0" height="123.0" width="271.0" data-name="OnboardingProgress"></rect>
+							<path d="M7019.5 166.0 L7290.5 166.0" fill="none" data-name="OnboardingProgress"></path>
+							<path d="M7019.5 212.0 L7290.5 212.0" fill="none" data-name="OnboardingProgress"></path>
 						</g>
-						<g transform="translate(2397, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryItem">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryItem">ReportHistoryItem</text>
+						<g transform="translate(7019.5, 135)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OnboardingProgress">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OnboardingProgress">
+								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="OnboardingProgress">OnboardingProgress</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2397, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+subject: StudySubject</text>
+						<g transform="translate(7019.5, 166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
+								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">+stage: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+progress: double</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2397, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+Widget build()</text>
+						<g transform="translate(7019.5, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
+								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">-double _getProgressForStage()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ReportDetailsScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportDetailsScreen">
-							<rect x="2634.0" y="545.5" height="108.0" width="409.0" data-name="ReportDetailsScreen"></rect>
-							<path d="M2634.0 576.5 L3043.0 576.5" fill="none" data-name="ReportDetailsScreen"></path>
-							<path d="M2634.0 607.5 L3043.0 607.5" fill="none" data-name="ReportDetailsScreen"></path>
+							<rect x="3885.5" y="545.5" height="108.0" width="409.0" data-name="ReportDetailsScreen"></rect>
+							<path d="M3885.5 576.5 L4294.5 576.5" fill="none" data-name="ReportDetailsScreen"></path>
+							<path d="M3885.5 607.5 L4294.5 607.5" fill="none" data-name="ReportDetailsScreen"></path>
 						</g>
-						<g transform="translate(2634, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportDetailsScreen">
+						<g transform="translate(3885.5, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportDetailsScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportDetailsScreen">
 								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportDetailsScreen">ReportDetailsScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2634, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
+						<g transform="translate(3885.5, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportDetailsScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportDetailsScreen">+subject: StudySubject</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2634, 607.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
+						<g transform="translate(3885.5, 607.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportDetailsScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportDetailsScreen">+Widget build()</text>
@@ -2396,16 +2353,16 @@
 					</g>
 					<g data-name="GeneralDetailsSection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GeneralDetailsSection">
-							<rect x="12685.0" y="919.0" height="62.0" width="198.0" data-name="GeneralDetailsSection"></rect>
-							<path d="M12685.0 950.0 L12883.0 950.0" fill="none" data-name="GeneralDetailsSection"></path>
+							<rect x="10672.0" y="919.0" height="62.0" width="198.0" data-name="GeneralDetailsSection"></rect>
+							<path d="M10672.0 950.0 L10870.0 950.0" fill="none" data-name="GeneralDetailsSection"></path>
 						</g>
-						<g transform="translate(12685, 919)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GeneralDetailsSection">
+						<g transform="translate(10672, 919)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GeneralDetailsSection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GeneralDetailsSection">
 								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="GeneralDetailsSection">GeneralDetailsSection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12685, 950)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GeneralDetailsSection">
+						<g transform="translate(10672, 950)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GeneralDetailsSection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GeneralDetailsSection">
 								<text x="0.0" y="13.5" stroke="none" data-name="GeneralDetailsSection">+Widget buildContent()</text>
 								
@@ -2414,24 +2371,24 @@
 					</g>
 					<g data-name="GenericSection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GenericSection">
-							<rect x="11054.8" y="538.0" height="123.0" width="214.0" data-name="GenericSection"></rect>
-							<path d="M11054.8 569.0 L11268.8 569.0" fill="none" data-name="GenericSection"></path>
-							<path d="M11054.8 615.0 L11268.8 615.0" fill="none" data-name="GenericSection"></path>
+							<rect x="11300.0" y="538.0" height="123.0" width="214.0" data-name="GenericSection"></rect>
+							<path d="M11300.0 569.0 L11514.0 569.0" fill="none" data-name="GenericSection"></path>
+							<path d="M11300.0 615.0 L11514.0 615.0" fill="none" data-name="GenericSection"></path>
 						</g>
-						<g transform="translate(11054.75, 538)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GenericSection">
+						<g transform="translate(11300, 538)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GenericSection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GenericSection">
 								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="GenericSection">GenericSection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11054.75, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
+						<g transform="translate(11300, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GenericSection">
 								<text x="0.0" y="13.5" stroke="none" data-name="GenericSection">+subject: StudySubject?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="GenericSection">+onTap: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11054.75, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
+						<g transform="translate(11300, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GenericSection">
 								<text x="0.0" y="13.5" stroke="none" data-name="GenericSection">+Widget buildContent()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="GenericSection">+Widget build()</text>
@@ -2439,55 +2396,69 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="12923.0" y="934.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
+					<g data-name="ReportHistoryScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryScreen">
+							<rect x="7330.5" y="165.5" height="62.0" width="180.0" data-name="ReportHistoryScreen"></rect>
+							<path d="M7330.5 196.5 L7510.5 196.5" fill="none" data-name="ReportHistoryScreen"></path>
 						</g>
-						<g transform="translate(12923, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
+						<g transform="translate(7330.5, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryScreen">
+								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryScreen">ReportHistoryScreen</text>
+								
+							</g>
+						</g>
+						<g transform="translate(7330.5, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryScreen">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DisclaimerSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisclaimerSection">
-							<rect x="13107.0" y="919.0" height="62.0" width="198.0" data-name="DisclaimerSection"></rect>
-							<path d="M13107.0 950.0 L13305.0 950.0" fill="none" data-name="DisclaimerSection"></path>
+					<g data-name="ReportHistoryItem">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryItem">
+							<rect x="4334.5" y="553.0" height="93.0" width="197.0" data-name="ReportHistoryItem"></rect>
+							<path d="M4334.5 584.0 L4531.5 584.0" fill="none" data-name="ReportHistoryItem"></path>
+							<path d="M4334.5 615.0 L4531.5 615.0" fill="none" data-name="ReportHistoryItem"></path>
 						</g>
-						<g transform="translate(13107, 919)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisclaimerSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisclaimerSection">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisclaimerSection">DisclaimerSection</text>
+						<g transform="translate(4334.5, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryItem">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryItem">ReportHistoryItem</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13107, 950)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisclaimerSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisclaimerSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisclaimerSection">+Widget buildContent()</text>
+						<g transform="translate(4334.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+subject: StudySubject</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4334.5, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="LegendWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="LegendWidget">
-							<rect x="9346.8" y="545.5" height="108.0" width="136.0" data-name="LegendWidget"></rect>
-							<path d="M9346.8 576.5 L9482.8 576.5" fill="none" data-name="LegendWidget"></path>
-							<path d="M9346.8 622.5 L9482.8 622.5" fill="none" data-name="LegendWidget"></path>
+							<rect x="8588.5" y="545.5" height="108.0" width="136.0" data-name="LegendWidget"></rect>
+							<path d="M8588.5 576.5 L8724.5 576.5" fill="none" data-name="LegendWidget"></path>
+							<path d="M8588.5 622.5 L8724.5 622.5" fill="none" data-name="LegendWidget"></path>
 						</g>
-						<g transform="translate(9346.75, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendWidget">
+						<g transform="translate(8588.5, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendWidget">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="LegendWidget">LegendWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9346.75, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
+						<g transform="translate(8588.5, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+name: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="LegendWidget">+color: Color</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9346.75, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
+						<g transform="translate(8588.5, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+Widget build()</text>
 								
@@ -2496,23 +2467,23 @@
 					</g>
 					<g data-name="LegendsListWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="LegendsListWidget">
-							<rect x="7244.8" y="150.0" height="93.0" width="207.0" data-name="LegendsListWidget"></rect>
-							<path d="M7244.8 181.0 L7451.8 181.0" fill="none" data-name="LegendsListWidget"></path>
-							<path d="M7244.8 212.0 L7451.8 212.0" fill="none" data-name="LegendsListWidget"></path>
+							<rect x="7550.5" y="150.0" height="93.0" width="207.0" data-name="LegendsListWidget"></rect>
+							<path d="M7550.5 181.0 L7757.5 181.0" fill="none" data-name="LegendsListWidget"></path>
+							<path d="M7550.5 212.0 L7757.5 212.0" fill="none" data-name="LegendsListWidget"></path>
 						</g>
-						<g transform="translate(7244.75, 150)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendsListWidget">
+						<g transform="translate(7550.5, 150)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendsListWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendsListWidget">
 								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LegendsListWidget">LegendsListWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7244.75, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
+						<g transform="translate(7550.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+legends: List&lt;Legend&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7244.75, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
+						<g transform="translate(7550.5, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+Widget build()</text>
 								
@@ -2521,16 +2492,16 @@
 					</g>
 					<g data-name="Legend">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Legend">
-							<rect x="9522.8" y="561.0" height="77.0" width="126.0" data-name="Legend"></rect>
-							<path d="M9522.8 592.0 L9648.8 592.0" fill="none" data-name="Legend"></path>
+							<rect x="8764.5" y="561.0" height="77.0" width="126.0" data-name="Legend"></rect>
+							<path d="M8764.5 592.0 L8890.5 592.0" fill="none" data-name="Legend"></path>
 						</g>
-						<g transform="translate(9522.75, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Legend">
+						<g transform="translate(8764.5, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Legend">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Legend">
 								<text x="55.0" y="13.5" stroke="none" text-anchor="middle" data-name="Legend">Legend</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9522.75, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Legend">
+						<g transform="translate(8764.5, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Legend">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Legend">
 								<text x="0.0" y="13.5" stroke="none" data-name="Legend">+name: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="Legend">+color: Color</text>
@@ -2540,23 +2511,23 @@
 					</g>
 					<g data-name="PerformanceDetailsScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceDetailsScreen">
-							<rect x="3083.0" y="545.5" height="108.0" width="409.0" data-name="PerformanceDetailsScreen"></rect>
-							<path d="M3083.0 576.5 L3492.0 576.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-							<path d="M3083.0 607.5 L3492.0 607.5" fill="none" data-name="PerformanceDetailsScreen"></path>
+							<rect x="4571.5" y="545.5" height="108.0" width="409.0" data-name="PerformanceDetailsScreen"></rect>
+							<path d="M4571.5 576.5 L4980.5 576.5" fill="none" data-name="PerformanceDetailsScreen"></path>
+							<path d="M4571.5 607.5 L4980.5 607.5" fill="none" data-name="PerformanceDetailsScreen"></path>
 						</g>
-						<g transform="translate(3083, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceDetailsScreen">
+						<g transform="translate(4571.5, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceDetailsScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceDetailsScreen">
 								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceDetailsScreen">PerformanceDetailsScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3083, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
+						<g transform="translate(4571.5, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">+reportSubject: StudySubject?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3083, 607.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
+						<g transform="translate(4571.5, 607.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceDetailsScreen">+Widget build()</text>
@@ -2566,24 +2537,24 @@
 					</g>
 					<g data-name="InterventionPerformanceBar">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPerformanceBar">
-							<rect x="7553.8" y="545.5" height="108.0" width="238.0" data-name="InterventionPerformanceBar"></rect>
-							<path d="M7553.8 576.5 L7791.8 576.5" fill="none" data-name="InterventionPerformanceBar"></path>
-							<path d="M7553.8 622.5 L7791.8 622.5" fill="none" data-name="InterventionPerformanceBar"></path>
+							<rect x="7251.5" y="545.5" height="108.0" width="238.0" data-name="InterventionPerformanceBar"></rect>
+							<path d="M7251.5 576.5 L7489.5 576.5" fill="none" data-name="InterventionPerformanceBar"></path>
+							<path d="M7251.5 622.5 L7489.5 622.5" fill="none" data-name="InterventionPerformanceBar"></path>
 						</g>
-						<g transform="translate(7553.75, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPerformanceBar">
+						<g transform="translate(7251.5, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPerformanceBar">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPerformanceBar">
 								<text x="111.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPerformanceBar">InterventionPerformanceBar</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7553.75, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
+						<g transform="translate(7251.5, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+intervention: Intervention</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionPerformanceBar">+subject: StudySubject?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7553.75, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
+						<g transform="translate(7251.5, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+Widget build()</text>
 								
@@ -2592,9 +2563,9 @@
 					</g>
 					<g data-name="Intervention">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention">
-							<rect x="13472.5" y="934.5" height="31.0" width="110.0" data-name="Intervention"></rect>
+							<rect x="11037.5" y="934.5" height="31.0" width="110.0" data-name="Intervention"></rect>
 						</g>
-						<g transform="translate(13472.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention">
+						<g transform="translate(11037.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention">
 								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention">Intervention</text>
 								
@@ -2603,24 +2574,24 @@
 					</g>
 					<g data-name="ObservationPerformanceBar">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ObservationPerformanceBar">
-							<rect x="8771.8" y="545.5" height="108.0" width="240.0" data-name="ObservationPerformanceBar"></rect>
-							<path d="M8771.8 576.5 L9011.8 576.5" fill="none" data-name="ObservationPerformanceBar"></path>
-							<path d="M8771.8 622.5 L9011.8 622.5" fill="none" data-name="ObservationPerformanceBar"></path>
+							<rect x="8214.5" y="545.5" height="108.0" width="240.0" data-name="ObservationPerformanceBar"></rect>
+							<path d="M8214.5 576.5 L8454.5 576.5" fill="none" data-name="ObservationPerformanceBar"></path>
+							<path d="M8214.5 622.5 L8454.5 622.5" fill="none" data-name="ObservationPerformanceBar"></path>
 						</g>
-						<g transform="translate(8771.75, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ObservationPerformanceBar">
+						<g transform="translate(8214.5, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ObservationPerformanceBar">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ObservationPerformanceBar">
 								<text x="112.0" y="13.5" stroke="none" text-anchor="middle" data-name="ObservationPerformanceBar">ObservationPerformanceBar</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8771.75, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
+						<g transform="translate(8214.5, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
 								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+observation: Observation</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ObservationPerformanceBar">+subject: StudySubject?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8771.75, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
+						<g transform="translate(8214.5, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
 								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+Widget build()</text>
 								
@@ -2629,9 +2600,9 @@
 					</g>
 					<g data-name="Observation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Observation">
-							<rect x="14156.5" y="934.5" height="31.0" width="112.0" data-name="Observation"></rect>
+							<rect x="11594.0" y="934.5" height="31.0" width="112.0" data-name="Observation"></rect>
 						</g>
-						<g transform="translate(14156.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Observation">
+						<g transform="translate(11594, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Observation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Observation">
 								<text x="48.0" y="13.5" stroke="none" text-anchor="middle" data-name="Observation">Observation</text>
 								
@@ -2640,17 +2611,17 @@
 					</g>
 					<g data-name="PerformanceBar">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceBar">
-							<rect x="9006.8" y="135.0" height="123.0" width="144.0" data-name="PerformanceBar"></rect>
-							<path d="M9006.8 166.0 L9150.8 166.0" fill="none" data-name="PerformanceBar"></path>
-							<path d="M9006.8 227.0 L9150.8 227.0" fill="none" data-name="PerformanceBar"></path>
+							<rect x="8449.5" y="135.0" height="123.0" width="144.0" data-name="PerformanceBar"></rect>
+							<path d="M8449.5 166.0 L8593.5 166.0" fill="none" data-name="PerformanceBar"></path>
+							<path d="M8449.5 227.0 L8593.5 227.0" fill="none" data-name="PerformanceBar"></path>
 						</g>
-						<g transform="translate(9006.75, 135)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceBar">
+						<g transform="translate(8449.5, 135)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceBar">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceBar">
 								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceBar">PerformanceBar</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9006.75, 166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
+						<g transform="translate(8449.5, 166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
 								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+task: Task</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceBar">+completed: int</text>
@@ -2658,7 +2629,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(9006.75, 227)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
+						<g transform="translate(8449.5, 227)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
 								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+Widget build()</text>
 								
@@ -2667,9 +2638,9 @@
 					</g>
 					<g data-name="Task">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Task">
-							<rect x="9051.8" y="584.0" height="31.0" width="54.0" data-name="Task"></rect>
+							<rect x="8494.5" y="584.0" height="31.0" width="54.0" data-name="Task"></rect>
 						</g>
-						<g transform="translate(9051.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Task">
+						<g transform="translate(8494.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Task">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Task">
 								<text x="19.0" y="13.5" stroke="none" text-anchor="middle" data-name="Task">Task</text>
 								
@@ -2678,24 +2649,24 @@
 					</g>
 					<g data-name="PerformanceSection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceSection">
-							<rect x="14708.5" y="881.0" height="138.0" width="324.0" data-name="PerformanceSection"></rect>
-							<path d="M14708.5 912.0 L15032.5 912.0" fill="none" data-name="PerformanceSection"></path>
-							<path d="M14708.5 958.0 L15032.5 958.0" fill="none" data-name="PerformanceSection"></path>
+							<rect x="12330.3" y="881.0" height="138.0" width="324.0" data-name="PerformanceSection"></rect>
+							<path d="M12330.3 912.0 L12654.3 912.0" fill="none" data-name="PerformanceSection"></path>
+							<path d="M12330.3 958.0 L12654.3 958.0" fill="none" data-name="PerformanceSection"></path>
 						</g>
-						<g transform="translate(14708.5, 881)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceSection">
+						<g transform="translate(12330.25, 881)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceSection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceSection">
 								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceSection">PerformanceSection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14708.5, 912)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
+						<g transform="translate(12330.25, 912)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
 								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+minimumRatio: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+maximum: double</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14708.5, 958)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
+						<g transform="translate(12330.25, 958)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
 								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+Widget buildContent()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+String getPowerLevelDescription()</text>
@@ -2704,19 +2675,154 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="ReportSectionWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionWidget">
+							<rect x="10574.0" y="568.5" height="62.0" width="197.0" data-name="ReportSectionWidget"></rect>
+							<path d="M10574.0 599.5 L10771.0 599.5" fill="none" data-name="ReportSectionWidget"></path>
+						</g>
+						<g transform="translate(10574, 568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSectionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionWidget">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionWidget">ReportSectionWidget</text>
+								
+							</g>
+						</g>
+						<g transform="translate(10574, 599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionWidget">+subject: StudySubject</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="void Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
+							<rect x="12694.3" y="934.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
+						</g>
+						<g transform="translate(12694.25, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
+								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="AverageSectionWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionWidget">
+							<rect x="12878.3" y="806.0" height="288.0" width="394.0" data-name="AverageSectionWidget"></rect>
+							<path d="M12878.3 837.0 L13272.3 837.0" fill="none" data-name="AverageSectionWidget"></path>
+							<path d="M12878.3 898.0 L13272.3 898.0" fill="none" data-name="AverageSectionWidget"></path>
+						</g>
+						<g transform="translate(12878.25, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionWidget">
+								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionWidget">AverageSectionWidget</text>
+								
+							</g>
+						</g>
+						<g transform="translate(12878.25, 837)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+section: AverageSection</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+titlePos: List&lt;int&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+phasePos: List&lt;int&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(12878.25, 898)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+Widget getLegend()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+Widget getDiagram()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AverageSectionWidget">+BarChartData getChartData()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AverageSectionWidget">+Widget getTitles()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AverageSectionWidget">+Widget getValues()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AverageSectionWidget">+List&lt;BarChartGroupData&gt; getBarGroups()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AverageSectionWidget">+FlGridData getGridData()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="AverageSectionWidget">+MaterialColor getColor()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="AverageSectionWidget">+int getDayIndex()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="AverageSectionWidget">+Iterable&lt;DiagramDatum&gt; getAggregatedData()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="AverageSectionWidget">+Map&lt;String, String?&gt; getInterventionNames()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="AverageSection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSection">
+							<rect x="13004.8" y="1134.0" height="31.0" width="141.0" data-name="AverageSection"></rect>
+						</g>
+						<g transform="translate(13004.75, 1134)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSection">
+								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSection">AverageSection</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="DiagramDatum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DiagramDatum">
+							<rect x="8748.3" y="143.0" height="107.0" width="202.0" data-name="DiagramDatum"></rect>
+							<path d="M8748.3 174.0 L8950.3 174.0" fill="none" data-name="DiagramDatum"></path>
+						</g>
+						<g transform="translate(8748.25, 143)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DiagramDatum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DiagramDatum">
+								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="DiagramDatum">DiagramDatum</text>
+								
+							</g>
+						</g>
+						<g transform="translate(8748.25, 174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DiagramDatum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DiagramDatum">
+								<text x="0.0" y="13.5" stroke="none" data-name="DiagramDatum">+x: num</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DiagramDatum">+value: num</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DiagramDatum">+timestamp: DateTime?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DiagramDatum">+intervention: String</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="LinearRegressionSectionWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionWidget">
+							<rect x="13574.5" y="903.5" height="93.0" width="292.0" data-name="LinearRegressionSectionWidget"></rect>
+							<path d="M13574.5 934.5 L13866.5 934.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
+							<path d="M13574.5 965.5 L13866.5 965.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
+						</g>
+						<g transform="translate(13574.5, 903.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionWidget">
+								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionWidget">LinearRegressionSectionWidget</text>
+								
+							</g>
+						</g>
+						<g transform="translate(13574.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+section: LinearRegressionSection</text>
+								
+							</g>
+						</g>
+						<g transform="translate(13574.5, 965.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="LinearRegressionSection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSection">
+							<rect x="13613.0" y="1134.0" height="31.0" width="215.0" data-name="LinearRegressionSection"></rect>
+						</g>
+						<g transform="translate(13613, 1134)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSection">
+								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSection">LinearRegressionSection</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="ReportSectionContainer">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionContainer">
-							<rect x="9688.8" y="508.0" height="183.0" width="319.0" data-name="ReportSectionContainer"></rect>
-							<path d="M9688.8 539.0 L10007.8 539.0" fill="none" data-name="ReportSectionContainer"></path>
-							<path d="M9688.8 615.0 L10007.8 615.0" fill="none" data-name="ReportSectionContainer"></path>
+							<rect x="10811.0" y="508.0" height="183.0" width="319.0" data-name="ReportSectionContainer"></rect>
+							<path d="M10811.0 539.0 L11130.0 539.0" fill="none" data-name="ReportSectionContainer"></path>
+							<path d="M10811.0 615.0 L11130.0 615.0" fill="none" data-name="ReportSectionContainer"></path>
 						</g>
-						<g transform="translate(9688.75, 508)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionContainer">
+						<g transform="translate(10811, 508)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionContainer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionContainer">
 								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionContainer">ReportSectionContainer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9688.75, 539)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
+						<g transform="translate(10811, 539)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionContainer">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionContainer">+section: ReportSection</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionContainer">+subject: StudySubject</text>
@@ -2725,7 +2831,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(9688.75, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
+						<g transform="translate(10811, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionContainer">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionContainer">+ReportSectionWidget buildContents()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionContainer">+dynamic ()</text>
@@ -2737,20 +2843,38 @@
 					</g>
 					<g data-name="ReportSection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="15072.5" y="934.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
+							<rect x="13906.5" y="934.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
 						</g>
-						<g transform="translate(15072.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
+						<g transform="translate(13906.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
 								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
 								
 							</g>
 						</g>
 					</g>
+					<g data-name="DisclaimerSection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DisclaimerSection">
+							<rect x="14074.5" y="919.0" height="62.0" width="198.0" data-name="DisclaimerSection"></rect>
+							<path d="M14074.5 950.0 L14272.5 950.0" fill="none" data-name="DisclaimerSection"></path>
+						</g>
+						<g transform="translate(14074.5, 919)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisclaimerSection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisclaimerSection">
+								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisclaimerSection">DisclaimerSection</text>
+								
+							</g>
+						</g>
+						<g transform="translate(14074.5, 950)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisclaimerSection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisclaimerSection">
+								<text x="0.0" y="13.5" stroke="none" data-name="DisclaimerSection">+Widget buildContent()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="Settings">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Settings">
-							<rect x="10318.3" y="181.0" height="31.0" width="80.0" data-name="Settings"></rect>
+							<rect x="8990.3" y="181.0" height="31.0" width="80.0" data-name="Settings"></rect>
 						</g>
-						<g transform="translate(10318.25, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Settings">
+						<g transform="translate(8990.25, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Settings">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Settings">
 								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="Settings">Settings</text>
 								
@@ -2759,23 +2883,23 @@
 					</g>
 					<g data-name="OptOutAlertDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="OptOutAlertDialog">
-							<rect x="4765.0" y="553.0" height="93.0" width="207.0" data-name="OptOutAlertDialog"></rect>
-							<path d="M4765.0 584.0 L4972.0 584.0" fill="none" data-name="OptOutAlertDialog"></path>
-							<path d="M4765.0 615.0 L4972.0 615.0" fill="none" data-name="OptOutAlertDialog"></path>
+							<rect x="5020.5" y="553.0" height="93.0" width="207.0" data-name="OptOutAlertDialog"></rect>
+							<path d="M5020.5 584.0 L5227.5 584.0" fill="none" data-name="OptOutAlertDialog"></path>
+							<path d="M5020.5 615.0 L5227.5 615.0" fill="none" data-name="OptOutAlertDialog"></path>
 						</g>
-						<g transform="translate(4765, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptOutAlertDialog">
+						<g transform="translate(5020.5, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptOutAlertDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptOutAlertDialog">
 								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptOutAlertDialog">OptOutAlertDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4765, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
+						<g transform="translate(5020.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptOutAlertDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="OptOutAlertDialog">+subject: StudySubject?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4765, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
+						<g transform="translate(5020.5, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptOutAlertDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="OptOutAlertDialog">+Widget build()</text>
 								
@@ -2784,145 +2908,97 @@
 					</g>
 					<g data-name="DeleteAlertDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="DeleteAlertDialog">
-							<rect x="5012.0" y="553.0" height="93.0" width="207.0" data-name="DeleteAlertDialog"></rect>
-							<path d="M5012.0 584.0 L5219.0 584.0" fill="none" data-name="DeleteAlertDialog"></path>
-							<path d="M5012.0 615.0 L5219.0 615.0" fill="none" data-name="DeleteAlertDialog"></path>
+							<rect x="5267.5" y="553.0" height="93.0" width="207.0" data-name="DeleteAlertDialog"></rect>
+							<path d="M5267.5 584.0 L5474.5 584.0" fill="none" data-name="DeleteAlertDialog"></path>
+							<path d="M5267.5 615.0 L5474.5 615.0" fill="none" data-name="DeleteAlertDialog"></path>
 						</g>
-						<g transform="translate(5012, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DeleteAlertDialog">
+						<g transform="translate(5267.5, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DeleteAlertDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DeleteAlertDialog">
 								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="DeleteAlertDialog">DeleteAlertDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5012, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
+						<g transform="translate(5267.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DeleteAlertDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="DeleteAlertDialog">+subject: StudySubject?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5012, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
+						<g transform="translate(5267.5, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DeleteAlertDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="DeleteAlertDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TaskBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskBox">
-							<rect x="11944.0" y="553.5" height="92.0" width="292.0" data-name="TaskBox"></rect>
-							<path d="M11944.0 584.5 L12236.0 584.5" fill="none" data-name="TaskBox"></path>
-						</g>
-						<g transform="translate(11944, 553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskBox">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskBox">TaskBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11944, 584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskBox">+taskInstance: TaskInstance</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskBox">+icon: Icon</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskBox">+onCompleted: dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Icon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Icon">
-							<rect x="15246.3" y="934.5" height="31.0" width="50.0" data-name="Icon"></rect>
-						</g>
-						<g transform="translate(15246.25, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Icon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Icon">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Icon">Icon</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="15336.3" y="934.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(15336.25, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ProgressRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ProgressRow">
-							<rect x="5259.0" y="568.5" height="62.0" width="207.0" data-name="ProgressRow"></rect>
-							<path d="M5259.0 599.5 L5466.0 599.5" fill="none" data-name="ProgressRow"></path>
+					<g data-name="FAQ">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FAQ">
+							<rect x="9110.3" y="165.5" height="62.0" width="136.0" data-name="FAQ"></rect>
+							<path d="M9110.3 196.5 L9246.3 196.5" fill="none" data-name="FAQ"></path>
 						</g>
-						<g transform="translate(5259, 568.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProgressRow">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProgressRow">ProgressRow</text>
+						<g transform="translate(9110.25, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FAQ">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FAQ">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="FAQ">FAQ</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5259, 599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ProgressRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="ProgressRow">+subject: StudySubject?</text>
+						<g transform="translate(9110.25, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FAQ">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FAQ">
+								<text x="0.0" y="13.5" stroke="none" data-name="FAQ">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionSegment">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSegment">
-							<rect x="14353.8" y="508.0" height="183.0" width="271.0" data-name="InterventionSegment"></rect>
-							<path d="M14353.8 539.0 L14624.8 539.0" fill="none" data-name="InterventionSegment"></path>
-							<path d="M14353.8 645.0 L14624.8 645.0" fill="none" data-name="InterventionSegment"></path>
+					<g data-name="Entry">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Entry">
+							<rect x="9396.5" y="561.0" height="77.0" width="188.0" data-name="Entry"></rect>
+							<path d="M9396.5 592.0 L9584.5 592.0" fill="none" data-name="Entry"></path>
 						</g>
-						<g transform="translate(14353.75, 508)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSegment">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSegment">InterventionSegment</text>
+						<g transform="translate(9396.5, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Entry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Entry">
+								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="Entry">Entry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14353.75, 539)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+percentCompleted: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionSegment">+percentMissed: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionSegment">+isCurrent: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionSegment">+isFuture: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionSegment">+phaseDuration: int</text>
+						<g transform="translate(9396.5, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Entry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Entry">
+								<text x="0.0" y="13.5" stroke="none" data-name="Entry">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Entry">+children: List&lt;Entry&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14353.75, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+List&lt;Widget&gt; buildSeparators()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+Widget build()</text>
+					</g>
+					<g data-name="EntryItem">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EntryItem">
+							<rect x="9401.0" y="142.5" height="108.0" width="179.0" data-name="EntryItem"></rect>
+							<path d="M9401.0 173.5 L9580.0 173.5" fill="none" data-name="EntryItem"></path>
+							<path d="M9401.0 204.5 L9580.0 204.5" fill="none" data-name="EntryItem"></path>
+						</g>
+						<g transform="translate(9401, 142.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EntryItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EntryItem">
+								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="EntryItem">EntryItem</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="TaskOverview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskOverview">
-							<rect x="5506.0" y="553.5" height="92.0" width="321.0" data-name="TaskOverview"></rect>
-							<path d="M5506.0 584.5 L5827.0 584.5" fill="none" data-name="TaskOverview"></path>
-						</g>
-						<g transform="translate(5506, 553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskOverview">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskOverview">TaskOverview</text>
+						<g transform="translate(9401, 173.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">+entry: Entry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5506, 584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskOverview">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskOverview">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskOverview">+scheduleToday: List&lt;TaskInstance&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskOverview">+interventionIcon: String?</text>
+						<g transform="translate(9401, 204.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">-Widget _buildTiles()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EntryItem">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ContactScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ContactScreen">
-							<rect x="10438.3" y="181.0" height="31.0" width="133.0" data-name="ContactScreen"></rect>
+							<rect x="10011.8" y="181.0" height="31.0" width="133.0" data-name="ContactScreen"></rect>
 						</g>
-						<g transform="translate(10438.25, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactScreen">
+						<g transform="translate(10011.75, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactScreen">
 								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactScreen">ContactScreen</text>
 								
@@ -2931,17 +3007,17 @@
 					</g>
 					<g data-name="ContactWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ContactWidget">
-							<rect x="12531.8" y="530.5" height="138.0" width="165.0" data-name="ContactWidget"></rect>
-							<path d="M12531.8 561.5 L12696.8 561.5" fill="none" data-name="ContactWidget"></path>
-							<path d="M12531.8 637.5 L12696.8 637.5" fill="none" data-name="ContactWidget"></path>
+							<rect x="12128.0" y="530.5" height="138.0" width="165.0" data-name="ContactWidget"></rect>
+							<path d="M12128.0 561.5 L12293.0 561.5" fill="none" data-name="ContactWidget"></path>
+							<path d="M12128.0 637.5 L12293.0 637.5" fill="none" data-name="ContactWidget"></path>
 						</g>
-						<g transform="translate(12531.75, 530.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactWidget">
+						<g transform="translate(12128, 530.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactWidget">
 								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactWidget">ContactWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12531.75, 561.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
+						<g transform="translate(12128, 561.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+contact: Contact?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ContactWidget">+title: String</text>
@@ -2950,7 +3026,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(12531.75, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
+						<g transform="translate(12128, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+Widget build()</text>
 								
@@ -2959,9 +3035,9 @@
 					</g>
 					<g data-name="Contact">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Contact">
-							<rect x="15543.3" y="934.5" height="31.0" width="77.0" data-name="Contact"></rect>
+							<rect x="14312.5" y="934.5" height="31.0" width="77.0" data-name="Contact"></rect>
 						</g>
-						<g transform="translate(15543.25, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Contact">
+						<g transform="translate(14312.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Contact">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Contact">
 								<text x="30.5" y="13.5" stroke="none" text-anchor="middle" data-name="Contact">Contact</text>
 								
@@ -2970,17 +3046,17 @@
 					</g>
 					<g data-name="ContactItem">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItem">
-							<rect x="11394.0" y="515.5" height="168.0" width="223.0" data-name="ContactItem"></rect>
-							<path d="M11394.0 546.5 L11617.0 546.5" fill="none" data-name="ContactItem"></path>
-							<path d="M11394.0 637.5 L11617.0 637.5" fill="none" data-name="ContactItem"></path>
+							<rect x="11554.0" y="515.5" height="168.0" width="223.0" data-name="ContactItem"></rect>
+							<path d="M11554.0 546.5 L11777.0 546.5" fill="none" data-name="ContactItem"></path>
+							<path d="M11554.0 637.5 L11777.0 637.5" fill="none" data-name="ContactItem"></path>
 						</g>
-						<g transform="translate(11394, 515.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItem">
+						<g transform="translate(11554, 515.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItem">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItem">
 								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItem">ContactItem</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11394, 546.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
+						<g transform="translate(11554, 546.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
 								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+iconData: IconData</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+itemName: String</text>
@@ -2990,7 +3066,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(11394, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
+						<g transform="translate(11554, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
 								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+dynamic launchContact()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+Widget build()</text>
@@ -3000,16 +3076,16 @@
 					</g>
 					<g data-name="ContactItemType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItemType">
-							<rect x="15660.3" y="889.0" height="122.0" width="332.0" data-name="ContactItemType"></rect>
-							<path d="M15660.3 920.0 L15992.3 920.0" fill="none" data-name="ContactItemType"></path>
+							<rect x="14429.5" y="889.0" height="122.0" width="332.0" data-name="ContactItemType"></rect>
+							<path d="M14429.5 920.0 L14761.5 920.0" fill="none" data-name="ContactItemType"></path>
 						</g>
-						<g transform="translate(15660.25, 889)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItemType">
+						<g transform="translate(14429.5, 889)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItemType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItemType">
 								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItemType">ContactItemType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15660.25, 920)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItemType">
+						<g transform="translate(14429.5, 920)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItemType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItemType">
 								<text x="0.0" y="13.5" stroke="none" data-name="ContactItemType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+values: List&lt;ContactItemType&gt;</text>
@@ -3022,683 +3098,808 @@
 					</g>
 					<g data-name="Enum">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="18553.5" y="584.0" height="31.0" width="61.0" data-name="Enum"></rect>
+							<rect x="15772.3" y="584.0" height="31.0" width="61.0" data-name="Enum"></rect>
 						</g>
-						<g transform="translate(18553.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+						<g transform="translate(15772.25, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
 								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FAQ">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FAQ">
-							<rect x="10611.3" y="165.5" height="62.0" width="136.0" data-name="FAQ"></rect>
-							<path d="M10611.3 196.5 L10747.3 196.5" fill="none" data-name="FAQ"></path>
+					<g data-name="DashboardScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
+							<rect x="10184.8" y="165.5" height="62.0" width="159.0" data-name="DashboardScreen"></rect>
+							<path d="M10184.8 196.5 L10343.8 196.5" fill="none" data-name="DashboardScreen"></path>
 						</g>
-						<g transform="translate(10611.25, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FAQ">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="FAQ">FAQ</text>
+						<g transform="translate(10184.75, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
+								<text x="71.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10611.25, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FAQ">
-								<text x="0.0" y="13.5" stroke="none" data-name="FAQ">+Widget build()</text>
+						<g transform="translate(10184.75, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+error: String?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Entry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Entry">
-							<rect x="12276.0" y="561.0" height="77.0" width="188.0" data-name="Entry"></rect>
-							<path d="M12276.0 592.0 L12464.0 592.0" fill="none" data-name="Entry"></path>
+					<g data-name="OverflowMenuItem">
+						<g fill="#eee8d5" stroke="#33322E" data-name="OverflowMenuItem">
+							<rect x="13422.0" y="546.0" height="107.0" width="247.0" data-name="OverflowMenuItem"></rect>
+							<path d="M13422.0 577.0 L13669.0 577.0" fill="none" data-name="OverflowMenuItem"></path>
 						</g>
-						<g transform="translate(12276, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Entry">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="Entry">Entry</text>
+						<g transform="translate(13422, 546)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OverflowMenuItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OverflowMenuItem">
+								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="OverflowMenuItem">OverflowMenuItem</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12276, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Entry">
-								<text x="0.0" y="13.5" stroke="none" data-name="Entry">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Entry">+children: List&lt;Entry&gt;</text>
+						<g transform="translate(13422, 577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OverflowMenuItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OverflowMenuItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="OverflowMenuItem">+name: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="OverflowMenuItem">+icon: IconData</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="OverflowMenuItem">+routeName: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="OverflowMenuItem">+onTap: dynamic Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EntryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EntryItem">
-							<rect x="12280.5" y="142.5" height="108.0" width="179.0" data-name="EntryItem"></rect>
-							<path d="M12280.5 173.5 L12459.5 173.5" fill="none" data-name="EntryItem"></path>
-							<path d="M12280.5 204.5 L12459.5 204.5" fill="none" data-name="EntryItem"></path>
+					<g data-name="dynamic Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
+							<rect x="16204.8" y="934.5" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
 						</g>
-						<g transform="translate(12280.5, 142.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EntryItem">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="EntryItem">EntryItem</text>
+						<g transform="translate(16204.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
+								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12280.5, 173.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">+entry: Entry</text>
+					</g>
+					<g data-name="StudyFinishedPlaceholder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFinishedPlaceholder">
+							<rect x="11104.0" y="150.0" height="93.0" width="222.0" data-name="StudyFinishedPlaceholder"></rect>
+							<path d="M11104.0 181.0 L11326.0 181.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
+							<path d="M11104.0 212.0 L11326.0 212.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
+						</g>
+						<g transform="translate(11104, 150)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFinishedPlaceholder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFinishedPlaceholder">
+								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFinishedPlaceholder">StudyFinishedPlaceholder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12280.5, 204.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">-Widget _buildTiles()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EntryItem">+Widget build()</text>
+						<g transform="translate(11104, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">&lt;static&gt;+space: SizedBox</text>
+								
+							</g>
+						</g>
+						<g transform="translate(11104, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="12499.5" y="165.5" height="62.0" width="159.0" data-name="DashboardScreen"></rect>
-							<path d="M12499.5 196.5 L12658.5 196.5" fill="none" data-name="DashboardScreen"></path>
+					<g data-name="SizedBox">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SizedBox">
+							<rect x="11170.0" y="584.0" height="31.0" width="90.0" data-name="SizedBox"></rect>
 						</g>
-						<g transform="translate(12499.5, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="71.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
+						<g transform="translate(11170, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SizedBox">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SizedBox">
+								<text x="37.0" y="13.5" stroke="none" text-anchor="middle" data-name="SizedBox">SizedBox</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12499.5, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+error: String?</text>
+					</g>
+					<g data-name="TaskOverview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TaskOverview">
+							<rect x="5896.5" y="553.5" height="92.0" width="321.0" data-name="TaskOverview"></rect>
+							<path d="M5896.5 584.5 L6217.5 584.5" fill="none" data-name="TaskOverview"></path>
+						</g>
+						<g transform="translate(5896.5, 553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskOverview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskOverview">
+								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskOverview">TaskOverview</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5896.5, 584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskOverview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskOverview">
+								<text x="0.0" y="13.5" stroke="none" data-name="TaskOverview">+subject: StudySubject?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TaskOverview">+scheduleToday: List&lt;TaskInstance&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TaskOverview">+interventionIcon: String?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="OverflowMenuItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OverflowMenuItem">
-							<rect x="11657.0" y="546.0" height="107.0" width="247.0" data-name="OverflowMenuItem"></rect>
-							<path d="M11657.0 577.0 L11904.0 577.0" fill="none" data-name="OverflowMenuItem"></path>
+					<g data-name="ProgressRow">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ProgressRow">
+							<rect x="6257.5" y="568.5" height="62.0" width="207.0" data-name="ProgressRow"></rect>
+							<path d="M6257.5 599.5 L6464.5 599.5" fill="none" data-name="ProgressRow"></path>
 						</g>
-						<g transform="translate(11657, 546)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OverflowMenuItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OverflowMenuItem">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="OverflowMenuItem">OverflowMenuItem</text>
+						<g transform="translate(6257.5, 568.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ProgressRow">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProgressRow">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProgressRow">ProgressRow</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11657, 577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OverflowMenuItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OverflowMenuItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="OverflowMenuItem">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OverflowMenuItem">+icon: IconData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="OverflowMenuItem">+routeName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="OverflowMenuItem">+onTap: dynamic Function()?</text>
+						<g transform="translate(6257.5, 599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ProgressRow">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ProgressRow">
+								<text x="0.0" y="13.5" stroke="none" data-name="ProgressRow">+subject: StudySubject?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="16483.0" y="934.5" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
+					<g data-name="InterventionSegment">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSegment">
+							<rect x="11817.0" y="508.0" height="183.0" width="271.0" data-name="InterventionSegment"></rect>
+							<path d="M11817.0 539.0 L12088.0 539.0" fill="none" data-name="InterventionSegment"></path>
+							<path d="M11817.0 645.0 L12088.0 645.0" fill="none" data-name="InterventionSegment"></path>
 						</g>
-						<g transform="translate(16483, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
-								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
+						<g transform="translate(11817, 508)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSegment">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSegment">
+								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSegment">InterventionSegment</text>
+								
+							</g>
+						</g>
+						<g transform="translate(11817, 539)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+intervention: Intervention</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+percentCompleted: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionSegment">+percentMissed: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionSegment">+isCurrent: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionSegment">+isFuture: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionSegment">+phaseDuration: int</text>
+								
+							</g>
+						</g>
+						<g transform="translate(11817, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+List&lt;Widget&gt; buildSeparators()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFinishedPlaceholder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFinishedPlaceholder">
-							<rect x="12698.5" y="150.0" height="93.0" width="222.0" data-name="StudyFinishedPlaceholder"></rect>
-							<path d="M12698.5 181.0 L12920.5 181.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
-							<path d="M12698.5 212.0 L12920.5 212.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
+					<g data-name="TaskBox">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TaskBox">
+							<rect x="9953.0" y="553.5" height="92.0" width="292.0" data-name="TaskBox"></rect>
+							<path d="M9953.0 584.5 L10245.0 584.5" fill="none" data-name="TaskBox"></path>
 						</g>
-						<g transform="translate(12698.5, 150)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFinishedPlaceholder">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFinishedPlaceholder">StudyFinishedPlaceholder</text>
+						<g transform="translate(9953, 553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskBox">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskBox">
+								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskBox">TaskBox</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12698.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">&lt;static&gt;+space: SizedBox</text>
+						<g transform="translate(9953, 584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskBox">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskBox">
+								<text x="0.0" y="13.5" stroke="none" data-name="TaskBox">+taskInstance: TaskInstance</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TaskBox">+icon: Icon</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TaskBox">+onCompleted: dynamic Function()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="dynamic Function()">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
+							<rect x="16421.8" y="934.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
+						</g>
+						<g transform="translate(16421.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
+								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="Routes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Routes">
+							<rect x="11699.3" y="0.0" height="393.0" width="366.0" data-name="Routes"></rect>
+							<path d="M11699.3 31.0 L12065.3 31.0" fill="none" data-name="Routes"></path>
+							<path d="M11699.3 347.0 L12065.3 347.0" fill="none" data-name="Routes"></path>
+						</g>
+						<g transform="translate(11699.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Routes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Routes">
+								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="Routes">Routes</text>
+								
+							</g>
+						</g>
+						<g transform="translate(11699.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Routes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Routes">
+								<text x="0.0" y="13.5" stroke="none" data-name="Routes">&lt;static&gt;+loading: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Routes">&lt;static&gt;+preview: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Routes">&lt;static&gt;+appOutdated: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Routes">&lt;static&gt;+dashboard: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Routes">&lt;static&gt;+welcome: String</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Routes">&lt;static&gt;+about: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Routes">&lt;static&gt;+terms: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Routes">&lt;static&gt;+studySelection: String</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="Routes">&lt;static&gt;+studyOverview: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="Routes">&lt;static&gt;+interventionSelection: String</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="Routes">&lt;static&gt;+journey: String</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="Routes">&lt;static&gt;+consent: String</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="Routes">&lt;static&gt;+kickoff: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="Routes">&lt;static&gt;+contact: String</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="Routes">&lt;static&gt;+faq: String</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="Routes">&lt;static&gt;+appSettings: String</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="Routes">&lt;static&gt;+questionnaire: String</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="Routes">&lt;static&gt;+reportHistory: String</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="Routes">&lt;static&gt;+reportDetails: String</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="Routes">&lt;static&gt;+performanceDetails: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(11699.25, 347)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Routes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Routes">
+								<text x="0.0" y="13.5" stroke="none" data-name="Routes">&lt;static&gt;+Route&lt;dynamic&gt; unknownRoute()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Routes">&lt;static&gt;+Route&lt;dynamic&gt;? generateRoute()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="NotificationValidators">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationValidators">
+							<rect x="16628.8" y="904.0" height="92.0" width="323.0" data-name="NotificationValidators"></rect>
+							<path d="M16628.8 935.0 L16951.8 935.0" fill="none" data-name="NotificationValidators"></path>
+						</g>
+						<g transform="translate(16628.75, 904)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationValidators">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationValidators">
+								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationValidators">NotificationValidators</text>
+								
+							</g>
+						</g>
+						<g transform="translate(16628.75, 935)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationValidators">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationValidators">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationValidators">+didNotificationLaunchApp: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationValidators">+wasNotificationActionHandled: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationValidators">+wasNotificationActionCompleted: bool</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StudyNotifications">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotifications">
+							<rect x="14574.0" y="455.5" height="288.0" width="626.0" data-name="StudyNotifications"></rect>
+							<path d="M14574.0 486.5 L15200.0 486.5" fill="none" data-name="StudyNotifications"></path>
+							<path d="M14574.0 622.5 L15200.0 622.5" fill="none" data-name="StudyNotifications"></path>
+						</g>
+						<g transform="translate(14574, 455.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotifications">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotifications">
+								<text x="305.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotifications">StudyNotifications</text>
+								
+							</g>
+						</g>
+						<g transform="translate(14574, 486.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotifications">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotifications">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotifications">+subject: StudySubject?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotifications">+flutterLocalNotificationsPlugin: FlutterLocalNotificationsPlugin</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyNotifications">+context: BuildContext</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyNotifications">+didReceiveLocalNotificationStream: StreamController&lt;ReceivedNotification&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyNotifications">+selectNotificationStream: StreamController&lt;String?&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+validator: NotificationValidators</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+debug: bool</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+scheduledNotificationsDebug: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12698.5, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">+Widget build()</text>
+						<g transform="translate(14574, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotifications">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotifications">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+dynamic create()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotifications">-dynamic _isAndroidPermissionGranted()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyNotifications">-dynamic _requestPermissions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyNotifications">-void _configureDidReceiveLocalNotificationSubject()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyNotifications">-void _configureSelectNotificationSubject()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyNotifications">-void _initNotificationsPlugin()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyNotifications">+dynamic handleNotificationResponse()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SizedBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SizedBox">
-							<rect x="12764.5" y="584.0" height="31.0" width="90.0" data-name="SizedBox"></rect>
+					<g data-name="FlutterLocalNotificationsPlugin">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FlutterLocalNotificationsPlugin">
+							<rect x="16991.8" y="934.5" height="31.0" width="255.0" data-name="FlutterLocalNotificationsPlugin"></rect>
 						</g>
-						<g transform="translate(12764.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SizedBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SizedBox">
-								<text x="37.0" y="13.5" stroke="none" text-anchor="middle" data-name="SizedBox">SizedBox</text>
+						<g transform="translate(16991.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FlutterLocalNotificationsPlugin">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FlutterLocalNotificationsPlugin">
+								<text x="119.5" y="13.5" stroke="none" text-anchor="middle" data-name="FlutterLocalNotificationsPlugin">FlutterLocalNotificationsPlugin</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionnaireTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTaskWidget">
-							<rect x="12960.5" y="158.0" height="77.0" width="313.0" data-name="QuestionnaireTaskWidget"></rect>
-							<path d="M12960.5 189.0 L13273.5 189.0" fill="none" data-name="QuestionnaireTaskWidget"></path>
+					<g data-name="BuildContext">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
+							<rect x="17286.8" y="934.5" height="31.0" width="116.0" data-name="BuildContext"></rect>
 						</g>
-						<g transform="translate(12960.5, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTaskWidget">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTaskWidget">QuestionnaireTaskWidget</text>
+						<g transform="translate(17286.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
+								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12960.5, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireTaskWidget">+task: QuestionnaireTask</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireTaskWidget">+completionPeriod: CompletionPeriod</text>
+					</g>
+					<g data-name="StreamController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
+							<rect x="18366.5" y="934.5" height="31.0" width="149.0" data-name="StreamController"></rect>
+						</g>
+						<g transform="translate(18366.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
+								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionnaireTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTask">
-							<rect x="12964.5" y="584.0" height="31.0" width="165.0" data-name="QuestionnaireTask"></rect>
+					<g data-name="ReceivedNotification">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReceivedNotification">
+							<rect x="12105.3" y="143.0" height="107.0" width="178.0" data-name="ReceivedNotification"></rect>
+							<path d="M12105.3 174.0 L12283.3 174.0" fill="none" data-name="ReceivedNotification"></path>
 						</g>
-						<g transform="translate(12964.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTask">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTask">QuestionnaireTask</text>
+						<g transform="translate(12105.25, 143)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReceivedNotification">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReceivedNotification">
+								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReceivedNotification">ReceivedNotification</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="CompletionPeriod">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CompletionPeriod">
-							<rect x="13228.3" y="584.0" height="31.0" width="156.0" data-name="CompletionPeriod"></rect>
-						</g>
-						<g transform="translate(13228.25, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CompletionPeriod">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CompletionPeriod">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="CompletionPeriod">CompletionPeriod</text>
+						<g transform="translate(12105.25, 174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReceivedNotification">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReceivedNotification">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReceivedNotification">+id: int?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReceivedNotification">+title: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReceivedNotification">+body: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReceivedNotification">+payload: String?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TaskScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskScreen">
-							<rect x="6150.0" y="553.0" height="93.0" width="377.0" data-name="TaskScreen"></rect>
-							<path d="M6150.0 584.0 L6527.0 584.0" fill="none" data-name="TaskScreen"></path>
-							<path d="M6150.0 615.0 L6527.0 615.0" fill="none" data-name="TaskScreen"></path>
+					<g data-name="StudyNotification">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotification">
+							<rect x="7529.5" y="561.0" height="77.0" width="243.0" data-name="StudyNotification"></rect>
+							<path d="M7529.5 592.0 L7772.5 592.0" fill="none" data-name="StudyNotification"></path>
 						</g>
-						<g transform="translate(6150, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskScreen">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskScreen">TaskScreen</text>
+						<g transform="translate(7529.5, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotification">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotification">
+								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotification">StudyNotification</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6150, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">+taskInstance: TaskInstance</text>
+						<g transform="translate(7529.5, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotification">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotification">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotification">+taskInstance: TaskInstance</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotification">+date: DateTime</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6150, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">&lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()</text>
+					</g>
+					<g data-name="TemporaryStorageHandler">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporaryStorageHandler">
+							<rect x="12323.3" y="67.5" height="258.0" width="449.0" data-name="TemporaryStorageHandler"></rect>
+							<path d="M12323.3 98.5 L12772.3 98.5" fill="none" data-name="TemporaryStorageHandler"></path>
+							<path d="M12323.3 189.5 L12772.3 189.5" fill="none" data-name="TemporaryStorageHandler"></path>
+						</g>
+						<g transform="translate(12323.25, 67.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporaryStorageHandler">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporaryStorageHandler">
+								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="TemporaryStorageHandler">TemporaryStorageHandler</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="CheckmarkTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTaskWidget">
-							<rect x="13403.5" y="158.0" height="77.0" width="323.0" data-name="CheckmarkTaskWidget"></rect>
-							<path d="M13403.5 189.0 L13726.5 189.0" fill="none" data-name="CheckmarkTaskWidget"></path>
-						</g>
-						<g transform="translate(13403.5, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTaskWidget">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTaskWidget">CheckmarkTaskWidget</text>
+						<g transform="translate(12323.25, 98.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporaryStorageHandler">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporaryStorageHandler">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-_stagingBaseNamePrefix: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-_audioFileType: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-_imageFileType: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporaryStorageHandler">-_userId: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TemporaryStorageHandler">-_studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13403.5, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CheckmarkTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="CheckmarkTaskWidget">+task: CheckmarkTask?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CheckmarkTaskWidget">+completionPeriod: CompletionPeriod?</text>
+						<g transform="translate(12323.25, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporaryStorageHandler">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporaryStorageHandler">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporaryStorageHandler">-String _buildFileName()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-dynamic _getMultimodalTempDirectory()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-dynamic _getMultimodalUploadDirectory()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;+dynamic moveStagingFileToUploadDirectory()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;+dynamic getFutureBlobFiles()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TemporaryStorageHandler">+dynamic getStagingAudio()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="TemporaryStorageHandler">+dynamic getStagingImage()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;+dynamic deleteAllStagingFiles()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CheckmarkTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTask">
-							<rect x="14170.8" y="584.0" height="31.0" width="143.0" data-name="CheckmarkTask"></rect>
+					<g data-name="GroupedIterable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GroupedIterable">
+							<rect x="12985.0" y="538.0" height="123.0" width="397.0" data-name="GroupedIterable"></rect>
+							<path d="M12985.0 569.0 L13382.0 569.0" fill="none" data-name="GroupedIterable"></path>
+							<path d="M12985.0 615.0 L13382.0 615.0" fill="none" data-name="GroupedIterable"></path>
 						</g>
-						<g transform="translate(14170.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTask">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTask">CheckmarkTask</text>
+						<g transform="translate(12985, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GroupedIterable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GroupedIterable">
+								<text x="190.5" y="13.5" stroke="none" text-anchor="middle" data-name="GroupedIterable">GroupedIterable</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AppOutdatedScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppOutdatedScreen">
-							<rect x="13766.5" y="165.5" height="62.0" width="176.0" data-name="AppOutdatedScreen"></rect>
-							<path d="M13766.5 196.5 L13942.5 196.5" fill="none" data-name="AppOutdatedScreen"></path>
-						</g>
-						<g transform="translate(13766.5, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppOutdatedScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppOutdatedScreen">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppOutdatedScreen">AppOutdatedScreen</text>
+						<g transform="translate(12985, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GroupedIterable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GroupedIterable">
+								<text x="0.0" y="13.5" stroke="none" data-name="GroupedIterable">+data: Map&lt;K, Iterable&lt;V&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="GroupedIterable">+iterator: Iterator&lt;MapEntry&lt;K, Iterable&lt;V&gt;&gt;&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13766.5, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppOutdatedScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppOutdatedScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppOutdatedScreen">+Widget build()</text>
+						<g transform="translate(12985, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GroupedIterable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GroupedIterable">
+								<text x="0.0" y="13.5" stroke="none" data-name="GroupedIterable">+Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregate()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="GroupedIterable">+Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregateWithKey()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TermsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TermsScreen">
-							<rect x="13982.5" y="181.0" height="31.0" width="121.0" data-name="TermsScreen"></rect>
+					<g data-name="Iterable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Iterable">
+							<rect x="13145.5" y="181.0" height="31.0" width="76.0" data-name="Iterable"></rect>
 						</g>
-						<g transform="translate(13982.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TermsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TermsScreen">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="TermsScreen">TermsScreen</text>
+						<g transform="translate(13145.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Iterable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Iterable">
+								<text x="30.0" y="13.5" stroke="none" text-anchor="middle" data-name="Iterable">Iterable</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LegalSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegalSection">
-							<rect x="18654.5" y="500.5" height="198.0" width="290.0" data-name="LegalSection"></rect>
-							<path d="M18654.5 531.5 L18944.5 531.5" fill="none" data-name="LegalSection"></path>
-							<path d="M18654.5 667.5 L18944.5 667.5" fill="none" data-name="LegalSection"></path>
+					<g data-name="Cache">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Cache">
+							<rect x="13843.8" y="105.0" height="183.0" width="297.0" data-name="Cache"></rect>
+							<path d="M13843.8 136.0 L14140.8 136.0" fill="none" data-name="Cache"></path>
+							<path d="M13843.8 167.0 L14140.8 167.0" fill="none" data-name="Cache"></path>
 						</g>
-						<g transform="translate(18654.5, 500.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegalSection">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="LegalSection">LegalSection</text>
+						<g transform="translate(13843.75, 105)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Cache">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Cache">
+								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="Cache">Cache</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18654.5, 531.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegalSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegalSection">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LegalSection">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LegalSection">+icon: Icon?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="LegalSection">+pdfUrl: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="LegalSection">+pdfUrlLabel: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="LegalSection">+acknowledgment: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="LegalSection">+isChecked: bool?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="LegalSection">+onChange: void Function(bool?)?</text>
+						<g transform="translate(13843.75, 136)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Cache">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Cache">
+								<text x="0.0" y="13.5" stroke="none" data-name="Cache">&lt;static&gt;+isSynchronizing: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18654.5, 667.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegalSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegalSection">+Widget build()</text>
+						<g transform="translate(13843.75, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Cache">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Cache">
+								<text x="0.0" y="13.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic storeSubject()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic loadSubject()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic storeAnalytics()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic loadAnalytics()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic delete()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic uploadBlobFiles()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic synchronize()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(bool?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(bool?)?">
-							<rect x="19140.0" y="934.5" height="31.0" width="188.0" data-name="void Function(bool?)?"></rect>
+					<g data-name="AppAnalytics">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppAnalytics">
+							<rect x="12333.0" y="493.0" height="213.0" width="335.0" data-name="AppAnalytics"></rect>
+							<path d="M12333.0 524.0 L12668.0 524.0" fill="none" data-name="AppAnalytics"></path>
+							<path d="M12333.0 615.0 L12668.0 615.0" fill="none" data-name="AppAnalytics"></path>
 						</g>
-						<g transform="translate(19140, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(bool?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(bool?)?">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(bool?)?">void Function(bool?)?</text>
+						<g transform="translate(12333, 493)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppAnalytics">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppAnalytics">
+								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppAnalytics">AppAnalytics</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IFrameHelper">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameHelper">
-							<rect x="14143.5" y="158.0" height="77.0" width="224.0" data-name="IFrameHelper"></rect>
-							<path d="M14143.5 189.0 L14367.5 189.0" fill="none" data-name="IFrameHelper"></path>
-						</g>
-						<g transform="translate(14143.5, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameHelper">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameHelper">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameHelper">IFrameHelper</text>
+						<g transform="translate(12333, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppAnalytics">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppAnalytics">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;-_userEnabled: bool?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+keyAnalyticsUserEnable: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppAnalytics">+context: BuildContext</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AppAnalytics">+subject: StudySubject?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+isUserEnabled: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14143.5, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFrameHelper">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFrameHelper">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFrameHelper">+void postRouteFinished()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFrameHelper">+void listen()</text>
+						<g transform="translate(12333, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppAnalytics">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppAnalytics">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+dynamic init()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+dynamic start()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+void setEnabled()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AppAnalytics">+dynamic initBasic()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AppAnalytics">+void initAdvanced()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LoadingScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoadingScreen">
-							<rect x="14407.5" y="158.0" height="77.0" width="338.0" data-name="LoadingScreen"></rect>
-							<path d="M14407.5 189.0 L14745.5 189.0" fill="none" data-name="LoadingScreen"></path>
+					<g data-name="ThemeConfig">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeConfig">
+							<rect x="14180.8" y="165.5" height="62.0" width="399.0" data-name="ThemeConfig"></rect>
+							<path d="M14180.8 196.5 L14579.8 196.5" fill="none" data-name="ThemeConfig"></path>
 						</g>
-						<g transform="translate(14407.5, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoadingScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoadingScreen">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="LoadingScreen">LoadingScreen</text>
+						<g transform="translate(14180.75, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeConfig">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeConfig">
+								<text x="191.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeConfig">ThemeConfig</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14407.5, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoadingScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoadingScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoadingScreen">+sessionString: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LoadingScreen">+queryParameters: Map&lt;String, String&gt;?</text>
+						<g transform="translate(14180.75, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+SliderThemeData coloredSliderTheme()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AboutScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AboutScreen">
-							<rect x="14785.5" y="165.5" height="62.0" width="136.0" data-name="AboutScreen"></rect>
-							<path d="M14785.5 196.5 L14921.5 196.5" fill="none" data-name="AboutScreen"></path>
+					<g data-name="ScaleQuestionWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionWidget">
+							<rect x="17470.5" y="561.0" height="77.0" width="403.0" data-name="ScaleQuestionWidget"></rect>
+							<path d="M17470.5 592.0 L17873.5 592.0" fill="none" data-name="ScaleQuestionWidget"></path>
 						</g>
-						<g transform="translate(14785.5, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AboutScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AboutScreen">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="AboutScreen">AboutScreen</text>
+						<g transform="translate(17470.5, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionWidget">
+								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionWidget">ScaleQuestionWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14785.5, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AboutScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AboutScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="AboutScreen">+Widget build()</text>
+						<g transform="translate(17470.5, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionWidget">+question: ScaleQuestion</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Preview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Preview">
-							<rect x="10676.8" y="433.0" height="333.0" width="338.0" data-name="Preview"></rect>
-							<path d="M10676.8 464.0 L11014.8 464.0" fill="none" data-name="Preview"></path>
-							<path d="M10676.8 585.0 L11014.8 585.0" fill="none" data-name="Preview"></path>
-						</g>
-						<g transform="translate(10676.75, 433)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Preview">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="Preview">Preview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10676.75, 464)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Preview">
-								<text x="0.0" y="13.5" stroke="none" data-name="Preview">+queryParameters: Map&lt;String, String&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Preview">+appLanguage: AppLanguage</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Preview">+selectedRoute: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Preview">+extra: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Preview">+study: Study?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Preview">+selectedStudyObjectId: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Preview">+subject: StudySubject?</text>
-								
-							</g>
+					<g data-name="ScaleQuestion">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestion">
+							<rect x="18555.5" y="934.5" height="31.0" width="131.0" data-name="ScaleQuestion"></rect>
 						</g>
-						<g transform="translate(10676.75, 585)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Preview">
-								<text x="0.0" y="13.5" stroke="none" data-name="Preview">+bool hasRoute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Preview">+void handleQueries()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Preview">+dynamic init()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Preview">+dynamic handleAuthorization()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Preview">+dynamic runCommands()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Preview">+String? getSelectedRoute()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Preview">+bool containsQuery()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Preview">+bool containsQueryPair()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Preview">+dynamic getStudySubject()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Preview">-dynamic _createFakeSubject()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Preview">+List&lt;String&gt; getInterventionIds()</text>
+						<g transform="translate(18555.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestion">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestion">
+								<text x="57.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestion">ScaleQuestion</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppLanguage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppLanguage">
-							<rect x="19368.0" y="934.5" height="31.0" width="127.0" data-name="AppLanguage"></rect>
+					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
+							<rect x="18726.5" y="934.5" height="31.0" width="321.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)?"></rect>
 						</g>
-						<g transform="translate(19368, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppLanguage">
-								<text x="55.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppLanguage">AppLanguage</text>
+						<g transform="translate(18726.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
+								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">dynamic Function(Answer&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WelcomeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WelcomeScreen">
-							<rect x="14961.5" y="165.5" height="62.0" width="145.0" data-name="WelcomeScreen"></rect>
-							<path d="M14961.5 196.5 L15106.5 196.5" fill="none" data-name="WelcomeScreen"></path>
+					<g data-name="QuestionWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionWidget">
+							<rect x="21176.3" y="165.5" height="62.0" width="149.0" data-name="QuestionWidget"></rect>
+							<path d="M21176.3 196.5 L21325.3 196.5" fill="none" data-name="QuestionWidget"></path>
 						</g>
-						<g transform="translate(14961.5, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WelcomeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WelcomeScreen">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="WelcomeScreen">WelcomeScreen</text>
+						<g transform="translate(21176.25, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionWidget">
+								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionWidget">QuestionWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14961.5, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WelcomeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WelcomeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="WelcomeScreen">+Widget build()</text>
+						<g transform="translate(21176.25, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionWidget">+subtitle: String?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ThemeConfig">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeConfig">
-							<rect x="15146.5" y="165.5" height="62.0" width="399.0" data-name="ThemeConfig"></rect>
-							<path d="M15146.5 196.5 L15545.5 196.5" fill="none" data-name="ThemeConfig"></path>
+					<g data-name="VisualAnalogueQuestionWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestionWidget">
+							<rect x="17913.5" y="561.0" height="77.0" width="403.0" data-name="VisualAnalogueQuestionWidget"></rect>
+							<path d="M17913.5 592.0 L18316.5 592.0" fill="none" data-name="VisualAnalogueQuestionWidget"></path>
 						</g>
-						<g transform="translate(15146.5, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeConfig">
-								<text x="191.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeConfig">ThemeConfig</text>
+						<g transform="translate(17913.5, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestionWidget">
+								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestionWidget">VisualAnalogueQuestionWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15146.5, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+SliderThemeData coloredSliderTheme()</text>
+						<g transform="translate(17913.5, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="VisualAnalogueQuestionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="VisualAnalogueQuestionWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+question: VisualAnalogueQuestion</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="HtmlText">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlText">
-							<rect x="15585.5" y="135.0" height="123.0" width="156.0" data-name="HtmlText"></rect>
-							<path d="M15585.5 166.0 L15741.5 166.0" fill="none" data-name="HtmlText"></path>
-							<path d="M15585.5 227.0 L15741.5 227.0" fill="none" data-name="HtmlText"></path>
+					<g data-name="VisualAnalogueQuestion">
+						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestion">
+							<rect x="19087.5" y="934.5" height="31.0" width="210.0" data-name="VisualAnalogueQuestion"></rect>
 						</g>
-						<g transform="translate(15585.5, 135)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlText">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlText">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlText">HtmlText</text>
+						<g transform="translate(19087.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestion">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestion">
+								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestion">VisualAnalogueQuestion</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15585.5, 166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlText">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlText">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlText">+text: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="HtmlText">+style: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="HtmlText">+centered: bool</text>
+					</g>
+					<g data-name="AnnotatedScaleQuestionWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestionWidget">
+							<rect x="18863.5" y="561.0" height="77.0" width="403.0" data-name="AnnotatedScaleQuestionWidget"></rect>
+							<path d="M18863.5 592.0 L19266.5 592.0" fill="none" data-name="AnnotatedScaleQuestionWidget"></path>
+						</g>
+						<g transform="translate(18863.5, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestionWidget">
+								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestionWidget">AnnotatedScaleQuestionWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15585.5, 227)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlText">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlText">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlText">+Widget build()</text>
+						<g transform="translate(18863.5, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AnnotatedScaleQuestionWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+question: AnnotatedScaleQuestion</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TextStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
-							<rect x="15619.0" y="584.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
+					<g data-name="AnnotatedScaleQuestion">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestion">
+							<rect x="19337.5" y="934.5" height="31.0" width="212.0" data-name="AnnotatedScaleQuestion"></rect>
 						</g>
-						<g transform="translate(15619, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
-								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
+						<g transform="translate(19337.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestion">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestion">
+								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestion">AnnotatedScaleQuestion</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RoundCheckbox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoundCheckbox">
-							<rect x="15781.5" y="142.5" height="108.0" width="323.0" data-name="RoundCheckbox"></rect>
-							<path d="M15781.5 173.5 L16104.5 173.5" fill="none" data-name="RoundCheckbox"></path>
-							<path d="M15781.5 219.5 L16104.5 219.5" fill="none" data-name="RoundCheckbox"></path>
+					<g data-name="BooleanQuestionWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestionWidget">
+							<rect x="20827.8" y="561.0" height="77.0" width="403.0" data-name="BooleanQuestionWidget"></rect>
+							<path d="M20827.8 592.0 L21230.8 592.0" fill="none" data-name="BooleanQuestionWidget"></path>
 						</g>
-						<g transform="translate(15781.5, 142.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoundCheckbox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoundCheckbox">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoundCheckbox">RoundCheckbox</text>
+						<g transform="translate(20827.75, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestionWidget">
+								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestionWidget">BooleanQuestionWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15781.5, 173.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoundCheckbox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoundCheckbox">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoundCheckbox">+onChanged: dynamic Function(bool)?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoundCheckbox">+value: bool?</text>
+						<g transform="translate(20827.75, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BooleanQuestionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BooleanQuestionWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="BooleanQuestionWidget">+question: BooleanQuestion</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BooleanQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15781.5, 219.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoundCheckbox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoundCheckbox">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoundCheckbox">+Widget build()</text>
+					</g>
+					<g data-name="BooleanQuestion">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestion">
+							<rect x="19689.5" y="934.5" height="31.0" width="152.0" data-name="BooleanQuestion"></rect>
+						</g>
+						<g transform="translate(19689.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestion">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestion">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestion">BooleanQuestion</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function(bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(bool)?">
-							<rect x="15837.5" y="584.0" height="31.0" width="211.0" data-name="dynamic Function(bool)?"></rect>
+					<g data-name="FreeTextQuestionWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionWidget">
+							<rect x="21270.8" y="561.0" height="77.0" width="403.0" data-name="FreeTextQuestionWidget"></rect>
+							<path d="M21270.8 592.0 L21673.8 592.0" fill="none" data-name="FreeTextQuestionWidget"></path>
 						</g>
-						<g transform="translate(15837.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(bool)?">
-								<text x="97.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(bool)?">dynamic Function(bool)?</text>
+						<g transform="translate(21270.75, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionWidget">
+								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionWidget">FreeTextQuestionWidget</text>
+								
+							</g>
+						</g>
+						<g transform="translate(21270.75, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionWidget">+question: FreeTextQuestion</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CustomSlider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomSlider">
-							<rect x="17607.5" y="440.5" height="318.0" width="364.0" data-name="CustomSlider"></rect>
-							<path d="M17607.5 471.5 L17971.5 471.5" fill="none" data-name="CustomSlider"></path>
-							<path d="M17607.5 727.5 L17971.5 727.5" fill="none" data-name="CustomSlider"></path>
+					<g data-name="FreeTextQuestion">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestion">
+							<rect x="20005.8" y="934.5" height="31.0" width="157.0" data-name="FreeTextQuestion"></rect>
 						</g>
-						<g transform="translate(17607.5, 440.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomSlider">
-								<text x="174.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomSlider">CustomSlider</text>
+						<g transform="translate(20005.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestion">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestion">
+								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestion">FreeTextQuestion</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17607.5, 471.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomSlider">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomSlider">+value: double?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomSlider">+minValue: double?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomSlider">+maxValue: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomSlider">+minorTick: int?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomSlider">+onChanged: dynamic Function(double)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomSlider">+onChangeEnd: dynamic Function(double)?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="CustomSlider">+activeColor: Color?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="CustomSlider">+inactiveColor: Color?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="CustomSlider">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="CustomSlider">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="CustomSlider">+thumbColor: Color?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="CustomSlider">+isColored: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="CustomSlider">+labelValuePrecision: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="CustomSlider">+tickValuePrecision: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="CustomSlider">+linearStep: bool</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="CustomSlider">+steps: AnnotatedScaleQuestion?</text>
+					</g>
+					<g data-name="ChoiceQuestionWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionWidget">
+							<rect x="21722.8" y="546.0" height="107.0" width="393.0" data-name="ChoiceQuestionWidget"></rect>
+							<path d="M21722.8 577.0 L22115.8 577.0" fill="none" data-name="ChoiceQuestionWidget"></path>
+						</g>
+						<g transform="translate(21722.75, 546)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionWidget">
+								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionWidget">ChoiceQuestionWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17607.5, 727.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomSlider">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomSlider">+Widget build()</text>
+						<g transform="translate(21722.75, 577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionWidget">+question: ChoiceQuestion</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionWidget">+multiSelectionText: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionWidget">+subtitle: String?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function(double)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(double)?">
-							<rect x="19535.0" y="934.5" height="31.0" width="231.0" data-name="dynamic Function(double)?"></rect>
+					<g data-name="ChoiceQuestion">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestion">
+							<rect x="20202.8" y="934.5" height="31.0" width="142.0" data-name="ChoiceQuestion"></rect>
 						</g>
-						<g transform="translate(19535, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(double)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(double)?">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(double)?">dynamic Function(double)?</text>
+						<g transform="translate(20202.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestion">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestion">
+								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestion">ChoiceQuestion</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AnnotatedScaleQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestion">
-							<rect x="19991.5" y="934.5" height="31.0" width="212.0" data-name="AnnotatedScaleQuestion"></rect>
+					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
+							<rect x="20384.8" y="934.5" height="31.0" width="311.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)"></rect>
 						</g>
-						<g transform="translate(19991.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestion">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestion">AnnotatedScaleQuestion</text>
+						<g transform="translate(20384.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
+								<text x="147.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)">dynamic Function(Answer&lt;dynamic&gt;)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CustomTrackShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomTrackShape">
-							<rect x="16375.5" y="568.5" height="62.0" width="214.0" data-name="CustomTrackShape"></rect>
-							<path d="M16375.5 599.5 L16589.5 599.5" fill="none" data-name="CustomTrackShape"></path>
+					<g data-name="AudioRecordingQuestionWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionWidget">
+							<rect x="22155.8" y="561.0" height="77.0" width="451.0" data-name="AudioRecordingQuestionWidget"></rect>
+							<path d="M22155.8 592.0 L22606.8 592.0" fill="none" data-name="AudioRecordingQuestionWidget"></path>
 						</g>
-						<g transform="translate(16375.5, 568.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomTrackShape">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomTrackShape">CustomTrackShape</text>
+						<g transform="translate(22155.75, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionWidget">
+								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionWidget">AudioRecordingQuestionWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16375.5, 599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomTrackShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomTrackShape">+Rect getPreferredRect()</text>
+						<g transform="translate(22155.75, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionWidget">+question: AudioRecordingQuestion</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioRecordingQuestionWidget">+onDone: dynamic Function(Answer&lt;FutureBlobFile&gt;)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RoundedRectSliderTrackShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoundedRectSliderTrackShape">
-							<rect x="16350.5" y="181.0" height="31.0" width="264.0" data-name="RoundedRectSliderTrackShape"></rect>
+					<g data-name="AudioRecordingQuestion">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestion">
+							<rect x="20735.8" y="934.5" height="31.0" width="213.0" data-name="AudioRecordingQuestion"></rect>
 						</g>
-						<g transform="translate(16350.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoundedRectSliderTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoundedRectSliderTrackShape">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoundedRectSliderTrackShape">RoundedRectSliderTrackShape</text>
+						<g transform="translate(20735.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestion">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestion">
+								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestion">AudioRecordingQuestion</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionHeader">
-							<rect x="17722.3" y="120.0" height="153.0" width="316.0" data-name="QuestionHeader"></rect>
-							<path d="M17722.3 151.0 L18038.3 151.0" fill="none" data-name="QuestionHeader"></path>
-							<path d="M17722.3 212.0 L18038.3 212.0" fill="none" data-name="QuestionHeader"></path>
-						</g>
-						<g transform="translate(17722.25, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionHeader">
-								<text x="150.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionHeader">QuestionHeader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17722.25, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionHeader">+prompt: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionHeader">+subtitle: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionHeader">+rationale: String?</text>
-								
-							</g>
+					<g data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">
+							<rect x="20988.8" y="934.5" height="31.0" width="369.0" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?"></rect>
 						</g>
-						<g transform="translate(17722.25, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionHeader">-List&lt;Widget&gt; _buildSubtitle()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionHeader">-List&lt;Widget&gt; _buildRationaleButton()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionHeader">+Widget build()</text>
+						<g transform="translate(20988.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">
+								<text x="176.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">dynamic Function(Answer&lt;FutureBlobFile&gt;)?</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="QuestionnaireWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireWidget">
-							<rect x="18078.3" y="143.0" height="107.0" width="318.0" data-name="QuestionnaireWidget"></rect>
-							<path d="M18078.3 174.0 L18396.3 174.0" fill="none" data-name="QuestionnaireWidget"></path>
+							<rect x="18335.0" y="143.0" height="107.0" width="318.0" data-name="QuestionnaireWidget"></rect>
+							<path d="M18335.0 174.0 L18653.0 174.0" fill="none" data-name="QuestionnaireWidget"></path>
 						</g>
-						<g transform="translate(18078.25, 143)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireWidget">
+						<g transform="translate(18335, 143)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireWidget">
 								<text x="151.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireWidget">QuestionnaireWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18078.25, 174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireWidget">
+						<g transform="translate(18335, 174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireWidget">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireWidget">+title: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireWidget">+header: String?</text>
@@ -3710,295 +3911,255 @@
 					</g>
 					<g data-name="HtmlTextBox">
 						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlTextBox">
-							<rect x="18436.3" y="150.0" height="93.0" width="136.0" data-name="HtmlTextBox"></rect>
-							<path d="M18436.3 181.0 L18572.3 181.0" fill="none" data-name="HtmlTextBox"></path>
-							<path d="M18436.3 212.0 L18572.3 212.0" fill="none" data-name="HtmlTextBox"></path>
+							<rect x="18693.0" y="150.0" height="93.0" width="136.0" data-name="HtmlTextBox"></rect>
+							<path d="M18693.0 181.0 L18829.0 181.0" fill="none" data-name="HtmlTextBox"></path>
+							<path d="M18693.0 212.0 L18829.0 212.0" fill="none" data-name="HtmlTextBox"></path>
 						</g>
-						<g transform="translate(18436.25, 150)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlTextBox">
+						<g transform="translate(18693, 150)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlTextBox">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlTextBox">
 								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlTextBox">HtmlTextBox</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18436.25, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlTextBox">
+						<g transform="translate(18693, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlTextBox">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlTextBox">
 								<text x="0.0" y="13.5" stroke="none" data-name="HtmlTextBox">+text: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18436.25, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlTextBox">
+						<g transform="translate(18693, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlTextBox">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlTextBox">
 								<text x="0.0" y="13.5" stroke="none" data-name="HtmlTextBox">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BooleanQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestionWidget">
-							<rect x="18984.5" y="561.0" height="77.0" width="403.0" data-name="BooleanQuestionWidget"></rect>
-							<path d="M18984.5 592.0 L19387.5 592.0" fill="none" data-name="BooleanQuestionWidget"></path>
-						</g>
-						<g transform="translate(18984.5, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestionWidget">BooleanQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18984.5, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BooleanQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BooleanQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="BooleanQuestionWidget">+question: BooleanQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BooleanQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BooleanQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestion">
-							<rect x="20243.5" y="934.5" height="31.0" width="152.0" data-name="BooleanQuestion"></rect>
+					<g data-name="ImageCapturingQuestionWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionWidget">
+							<rect x="22897.8" y="561.0" height="77.0" width="451.0" data-name="ImageCapturingQuestionWidget"></rect>
+							<path d="M22897.8 592.0 L23348.8 592.0" fill="none" data-name="ImageCapturingQuestionWidget"></path>
 						</g>
-						<g transform="translate(20243.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestion">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestion">BooleanQuestion</text>
+						<g transform="translate(22897.75, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionWidget">
+								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionWidget">ImageCapturingQuestionWidget</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-							<rect x="20652.8" y="934.5" height="31.0" width="321.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(20652.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">dynamic Function(Answer&lt;dynamic&gt;)?</text>
+						<g transform="translate(22897.75, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionWidget">+question: ImageCapturingQuestion</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageCapturingQuestionWidget">+onDone: dynamic Function(Answer&lt;FutureBlobFile&gt;)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionWidget">
-							<rect x="22023.3" y="165.5" height="62.0" width="149.0" data-name="QuestionWidget"></rect>
-							<path d="M22023.3 196.5 L22172.3 196.5" fill="none" data-name="QuestionWidget"></path>
-						</g>
-						<g transform="translate(22023.25, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionWidget">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionWidget">QuestionWidget</text>
-								
-							</g>
+					<g data-name="ImageCapturingQuestion">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestion">
+							<rect x="21517.8" y="934.5" height="31.0" width="213.0" data-name="ImageCapturingQuestion"></rect>
 						</g>
-						<g transform="translate(22023.25, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionWidget">+subtitle: String?</text>
+						<g transform="translate(21517.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestion">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestion">
+								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestion">ImageCapturingQuestion</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionWidget">
-							<rect x="21627.3" y="561.0" height="77.0" width="403.0" data-name="FreeTextQuestionWidget"></rect>
-							<path d="M21627.3 592.0 L22030.3 592.0" fill="none" data-name="FreeTextQuestionWidget"></path>
-						</g>
-						<g transform="translate(21627.25, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionWidget">FreeTextQuestionWidget</text>
-								
-							</g>
+					<g data-name="QuestionContainer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionContainer">
+							<rect x="17873.0" y="150.5" height="92.0" width="422.0" data-name="QuestionContainer"></rect>
+							<path d="M17873.0 181.5 L18295.0 181.5" fill="none" data-name="QuestionContainer"></path>
 						</g>
-						<g transform="translate(21627.25, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionWidget">+question: FreeTextQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
+						<g transform="translate(17873, 150.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionContainer">
+								<text x="203.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionContainer">QuestionContainer</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FreeTextQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestion">
-							<rect x="21013.8" y="934.5" height="31.0" width="157.0" data-name="FreeTextQuestion"></rect>
-						</g>
-						<g transform="translate(21013.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestion">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestion">FreeTextQuestion</text>
+						<g transform="translate(17873, 181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionContainer">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionContainer">+onDone: dynamic Function(Answer&lt;dynamic&gt;, int)</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionContainer">+question: Question&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionContainer">+index: int</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionWidget">
-							<rect x="22070.3" y="561.0" height="77.0" width="403.0" data-name="ScaleQuestionWidget"></rect>
-							<path d="M22070.3 592.0 L22473.3 592.0" fill="none" data-name="ScaleQuestionWidget"></path>
-						</g>
-						<g transform="translate(22070.25, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionWidget">ScaleQuestionWidget</text>
-								
-							</g>
+					<g data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
+							<rect x="18356.5" y="584.0" height="31.0" width="340.0" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)"></rect>
 						</g>
-						<g transform="translate(22070.25, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionWidget">+question: ScaleQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
+						<g transform="translate(18356.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
+								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">dynamic Function(Answer&lt;dynamic&gt;, int)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestion">
-							<rect x="21340.3" y="934.5" height="31.0" width="131.0" data-name="ScaleQuestion"></rect>
+					<g data-name="Question">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Question">
+							<rect x="18736.5" y="584.0" height="31.0" width="87.0" data-name="Question"></rect>
 						</g>
-						<g transform="translate(21340.25, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestion">
-								<text x="57.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestion">ScaleQuestion</text>
+						<g transform="translate(18736.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Question">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Question">
+								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="Question">Question</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="VisualAnalogueQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestionWidget">
-							<rect x="22513.3" y="561.0" height="77.0" width="403.0" data-name="VisualAnalogueQuestionWidget"></rect>
-							<path d="M22513.3 592.0 L22916.3 592.0" fill="none" data-name="VisualAnalogueQuestionWidget"></path>
+					<g data-name="QuestionHeader">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionHeader">
+							<rect x="19173.0" y="120.0" height="153.0" width="316.0" data-name="QuestionHeader"></rect>
+							<path d="M19173.0 151.0 L19489.0 151.0" fill="none" data-name="QuestionHeader"></path>
+							<path d="M19173.0 212.0 L19489.0 212.0" fill="none" data-name="QuestionHeader"></path>
 						</g>
-						<g transform="translate(22513.25, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestionWidget">VisualAnalogueQuestionWidget</text>
+						<g transform="translate(19173, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionHeader">
+								<text x="150.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionHeader">QuestionHeader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22513.25, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="VisualAnalogueQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="VisualAnalogueQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+question: VisualAnalogueQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
+						<g transform="translate(19173, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionHeader">+prompt: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionHeader">+subtitle: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionHeader">+rationale: String?</text>
 								
 							</g>
-						</g>
-					</g>
-					<g data-name="VisualAnalogueQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestion">
-							<rect x="21627.5" y="934.5" height="31.0" width="210.0" data-name="VisualAnalogueQuestion"></rect>
-						</g>
-						<g transform="translate(21627.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestion">
-								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestion">VisualAnalogueQuestion</text>
+						</g>
+						<g transform="translate(19173, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionHeader">-List&lt;Widget&gt; _buildSubtitle()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionHeader">-List&lt;Widget&gt; _buildRationaleButton()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionHeader">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionWidget">
-							<rect x="23026.0" y="546.0" height="107.0" width="393.0" data-name="ChoiceQuestionWidget"></rect>
-							<path d="M23026.0 577.0 L23419.0 577.0" fill="none" data-name="ChoiceQuestionWidget"></path>
+					<g data-name="CustomSlider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CustomSlider">
+							<rect x="16652.5" y="440.5" height="318.0" width="364.0" data-name="CustomSlider"></rect>
+							<path d="M16652.5 471.5 L17016.5 471.5" fill="none" data-name="CustomSlider"></path>
+							<path d="M16652.5 727.5 L17016.5 727.5" fill="none" data-name="CustomSlider"></path>
 						</g>
-						<g transform="translate(23026, 546)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionWidget">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionWidget">ChoiceQuestionWidget</text>
+						<g transform="translate(16652.5, 440.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomSlider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomSlider">
+								<text x="174.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomSlider">CustomSlider</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23026, 577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionWidget">+question: ChoiceQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionWidget">+multiSelectionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionWidget">+subtitle: String?</text>
+						<g transform="translate(16652.5, 471.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomSlider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomSlider">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomSlider">+value: double?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="CustomSlider">+minValue: double?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="CustomSlider">+maxValue: double?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="CustomSlider">+minorTick: int?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="CustomSlider">+onChanged: dynamic Function(double)?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="CustomSlider">+onChangeEnd: dynamic Function(double)?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="CustomSlider">+activeColor: Color?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="CustomSlider">+inactiveColor: Color?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="CustomSlider">+minColor: Color?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="CustomSlider">+maxColor: Color?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="CustomSlider">+thumbColor: Color?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="CustomSlider">+isColored: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="CustomSlider">+labelValuePrecision: int</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="CustomSlider">+tickValuePrecision: int</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="CustomSlider">+linearStep: bool</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="CustomSlider">+steps: AnnotatedScaleQuestion?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ChoiceQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestion">
-							<rect x="21877.5" y="934.5" height="31.0" width="142.0" data-name="ChoiceQuestion"></rect>
-						</g>
-						<g transform="translate(21877.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestion">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestion">ChoiceQuestion</text>
+						<g transform="translate(16652.5, 727.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomSlider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomSlider">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomSlider">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-							<rect x="22059.5" y="934.5" height="31.0" width="311.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)"></rect>
+					<g data-name="dynamic Function(double)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(double)?">
+							<rect x="21770.8" y="934.5" height="31.0" width="231.0" data-name="dynamic Function(double)?"></rect>
 						</g>
-						<g transform="translate(22059.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-								<text x="147.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)">dynamic Function(Answer&lt;dynamic&gt;)</text>
+						<g transform="translate(21770.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(double)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(double)?">
+								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(double)?">dynamic Function(double)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AnnotatedScaleQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestionWidget">
-							<rect x="19934.5" y="561.0" height="77.0" width="403.0" data-name="AnnotatedScaleQuestionWidget"></rect>
-							<path d="M19934.5 592.0 L20337.5 592.0" fill="none" data-name="AnnotatedScaleQuestionWidget"></path>
+					<g data-name="CustomTrackShape">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CustomTrackShape">
+							<rect x="19448.3" y="568.5" height="62.0" width="214.0" data-name="CustomTrackShape"></rect>
+							<path d="M19448.3 599.5 L19662.3 599.5" fill="none" data-name="CustomTrackShape"></path>
 						</g>
-						<g transform="translate(19934.5, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestionWidget">AnnotatedScaleQuestionWidget</text>
+						<g transform="translate(19448.25, 568.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomTrackShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomTrackShape">
+								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomTrackShape">CustomTrackShape</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19934.5, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AnnotatedScaleQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+question: AnnotatedScaleQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
+						<g transform="translate(19448.25, 599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomTrackShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomTrackShape">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomTrackShape">+Rect getPreferredRect()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionContainer">
-							<rect x="19189.0" y="150.5" height="92.0" width="422.0" data-name="QuestionContainer"></rect>
-							<path d="M19189.0 181.5 L19611.0 181.5" fill="none" data-name="QuestionContainer"></path>
-						</g>
-						<g transform="translate(19189, 150.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionContainer">
-								<text x="203.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionContainer">QuestionContainer</text>
-								
-							</g>
+					<g data-name="RoundedRectSliderTrackShape">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoundedRectSliderTrackShape">
+							<rect x="18869.0" y="181.0" height="31.0" width="264.0" data-name="RoundedRectSliderTrackShape"></rect>
 						</g>
-						<g transform="translate(19189, 181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionContainer">+onDone: dynamic Function(Answer&lt;dynamic&gt;, int)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionContainer">+question: Question&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionContainer">+index: int</text>
+						<g transform="translate(18869, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoundedRectSliderTrackShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoundedRectSliderTrackShape">
+								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoundedRectSliderTrackShape">RoundedRectSliderTrackShape</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-							<rect x="19427.5" y="584.0" height="31.0" width="340.0" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)"></rect>
+					<g data-name="BottomOnboardingNavigation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BottomOnboardingNavigation">
+							<rect x="9108.5" y="500.5" height="198.0" width="248.0" data-name="BottomOnboardingNavigation"></rect>
+							<path d="M9108.5 531.5 L9356.5 531.5" fill="none" data-name="BottomOnboardingNavigation"></path>
+							<path d="M9108.5 667.5 L9356.5 667.5" fill="none" data-name="BottomOnboardingNavigation"></path>
 						</g>
-						<g transform="translate(19427.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">dynamic Function(Answer&lt;dynamic&gt;, int)</text>
+						<g transform="translate(9108.5, 500.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BottomOnboardingNavigation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BottomOnboardingNavigation">
+								<text x="116.0" y="13.5" stroke="none" text-anchor="middle" data-name="BottomOnboardingNavigation">BottomOnboardingNavigation</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Question">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Question">
-							<rect x="19807.5" y="584.0" height="31.0" width="87.0" data-name="Question"></rect>
+						<g transform="translate(9108.5, 531.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BottomOnboardingNavigation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BottomOnboardingNavigation">
+								<text x="0.0" y="13.5" stroke="none" data-name="BottomOnboardingNavigation">+onBack: void Function()?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BottomOnboardingNavigation">+onNext: void Function()?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BottomOnboardingNavigation">+backLabel: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="BottomOnboardingNavigation">+nextLabel: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="BottomOnboardingNavigation">+hideNext: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="BottomOnboardingNavigation">+nextIcon: Icon?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="BottomOnboardingNavigation">+backIcon: Icon?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="BottomOnboardingNavigation">+progress: Widget?</text>
+								
+							</g>
 						</g>
-						<g transform="translate(19807.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Question">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Question">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="Question">Question</text>
+						<g transform="translate(9108.5, 667.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BottomOnboardingNavigation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BottomOnboardingNavigation">
+								<text x="0.0" y="13.5" stroke="none" data-name="BottomOnboardingNavigation">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="InterventionCard">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionCard">
-							<rect x="17029.5" y="515.5" height="168.0" width="247.0" data-name="InterventionCard"></rect>
-							<path d="M17029.5 546.5 L17276.5 546.5" fill="none" data-name="InterventionCard"></path>
-							<path d="M17029.5 652.5 L17276.5 652.5" fill="none" data-name="InterventionCard"></path>
+							<rect x="13996.0" y="515.5" height="168.0" width="247.0" data-name="InterventionCard"></rect>
+							<path d="M13996.0 546.5 L14243.0 546.5" fill="none" data-name="InterventionCard"></path>
+							<path d="M13996.0 652.5 L14243.0 652.5" fill="none" data-name="InterventionCard"></path>
 						</g>
-						<g transform="translate(17029.5, 515.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionCard">
+						<g transform="translate(13996, 515.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionCard">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionCard">
 								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionCard">InterventionCard</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17029.5, 546.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCard">
+						<g transform="translate(13996, 546.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCard">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCard">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCard">+intervention: Intervention</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionCard">+selected: bool</text>
@@ -4009,7 +4170,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(17029.5, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCard">
+						<g transform="translate(13996, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCard">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCard">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCard">+Widget build()</text>
 								
@@ -4018,17 +4179,17 @@
 					</g>
 					<g data-name="InterventionCardTitle">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionCardTitle">
-							<rect x="17316.5" y="523.0" height="153.0" width="251.0" data-name="InterventionCardTitle"></rect>
-							<path d="M17316.5 554.0 L17567.5 554.0" fill="none" data-name="InterventionCardTitle"></path>
-							<path d="M17316.5 645.0 L17567.5 645.0" fill="none" data-name="InterventionCardTitle"></path>
+							<rect x="14283.0" y="523.0" height="153.0" width="251.0" data-name="InterventionCardTitle"></rect>
+							<path d="M14283.0 554.0 L14534.0 554.0" fill="none" data-name="InterventionCardTitle"></path>
+							<path d="M14283.0 645.0 L14534.0 645.0" fill="none" data-name="InterventionCardTitle"></path>
 						</g>
-						<g transform="translate(17316.5, 523)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionCardTitle">
+						<g transform="translate(14283, 523)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionCardTitle">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionCardTitle">
 								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionCardTitle">InterventionCardTitle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17316.5, 554)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardTitle">
+						<g transform="translate(14283, 554)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardTitle">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardTitle">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardTitle">+intervention: Intervention?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InterventionCardTitle">+selected: bool</text>
@@ -4038,7 +4199,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(17316.5, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardTitle">
+						<g transform="translate(14283, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardTitle">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardTitle">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardTitle">+Widget build()</text>
 								
@@ -4047,23 +4208,23 @@
 					</g>
 					<g data-name="InterventionCardDescription">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionCardDescription">
-							<rect x="14664.8" y="553.0" height="93.0" width="237.0" data-name="InterventionCardDescription"></rect>
-							<path d="M14664.8 584.0 L14901.8 584.0" fill="none" data-name="InterventionCardDescription"></path>
-							<path d="M14664.8 615.0 L14901.8 615.0" fill="none" data-name="InterventionCardDescription"></path>
+							<rect x="12708.0" y="553.0" height="93.0" width="237.0" data-name="InterventionCardDescription"></rect>
+							<path d="M12708.0 584.0 L12945.0 584.0" fill="none" data-name="InterventionCardDescription"></path>
+							<path d="M12708.0 615.0 L12945.0 615.0" fill="none" data-name="InterventionCardDescription"></path>
 						</g>
-						<g transform="translate(14664.75, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionCardDescription">
+						<g transform="translate(12708, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionCardDescription">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionCardDescription">
 								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionCardDescription">InterventionCardDescription</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14664.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardDescription">
+						<g transform="translate(12708, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardDescription">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardDescription">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardDescription">+intervention: Intervention</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14664.75, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardDescription">
+						<g transform="translate(12708, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardDescription">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardDescription">
 								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardDescription">+Widget build()</text>
 								
@@ -4072,23 +4233,23 @@
 					</g>
 					<g data-name="_TaskList">
 						<g fill="#eee8d5" stroke="#33322E" data-name="_TaskList">
-							<rect x="22212.3" y="142.5" height="108.0" width="258.0" data-name="_TaskList"></rect>
-							<path d="M22212.3 173.5 L22470.3 173.5" fill="none" data-name="_TaskList"></path>
-							<path d="M22212.3 204.5 L22470.3 204.5" fill="none" data-name="_TaskList"></path>
+							<rect x="22493.5" y="142.5" height="108.0" width="258.0" data-name="_TaskList"></rect>
+							<path d="M22493.5 173.5 L22751.5 173.5" fill="none" data-name="_TaskList"></path>
+							<path d="M22493.5 204.5 L22751.5 204.5" fill="none" data-name="_TaskList"></path>
 						</g>
-						<g transform="translate(22212.25, 142.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_TaskList">
+						<g transform="translate(22493.5, 142.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_TaskList">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_TaskList">
 								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="_TaskList">_TaskList</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22212.25, 173.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_TaskList">
+						<g transform="translate(22493.5, 173.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_TaskList">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_TaskList">
 								<text x="0.0" y="13.5" stroke="none" data-name="_TaskList">+tasks: List&lt;InterventionTask&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22212.25, 204.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_TaskList">
+						<g transform="translate(22493.5, 204.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_TaskList">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_TaskList">
 								<text x="0.0" y="13.5" stroke="none" data-name="_TaskList">+String scheduleString()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="_TaskList">+Widget build()</text>
@@ -4096,48 +4257,19 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="SelectableButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SelectableButton">
-							<rect x="16088.5" y="523.0" height="153.0" width="247.0" data-name="SelectableButton"></rect>
-							<path d="M16088.5 554.0 L16335.5 554.0" fill="none" data-name="SelectableButton"></path>
-							<path d="M16088.5 615.0 L16335.5 615.0" fill="none" data-name="SelectableButton"></path>
-						</g>
-						<g transform="translate(16088.5, 523)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SelectableButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SelectableButton">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="SelectableButton">SelectableButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16088.5, 554)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SelectableButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SelectableButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SelectableButton">+child: Widget</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SelectableButton">+selected: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SelectableButton">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16088.5, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SelectableButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SelectableButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SelectableButton">-Color _getFillColor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SelectableButton">-Color _getTextColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SelectableButton">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
 					<g data-name="StudyTile">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTile">
-							<rect x="20821.3" y="523.0" height="153.0" width="326.0" data-name="StudyTile"></rect>
-							<path d="M20821.3 554.0 L21147.3 554.0" fill="none" data-name="StudyTile"></path>
-							<path d="M20821.3 645.0 L21147.3 645.0" fill="none" data-name="StudyTile"></path>
+							<rect x="19702.3" y="523.0" height="153.0" width="326.0" data-name="StudyTile"></rect>
+							<path d="M19702.3 554.0 L20028.3 554.0" fill="none" data-name="StudyTile"></path>
+							<path d="M19702.3 645.0 L20028.3 645.0" fill="none" data-name="StudyTile"></path>
 						</g>
-						<g transform="translate(20821.25, 523)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTile">
+						<g transform="translate(19702.25, 523)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTile">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTile">
 								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTile">StudyTile</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20821.25, 554)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTile">
+						<g transform="translate(19702.25, 554)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTile">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTile">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTile">+title: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyTile">+description: String?</text>
@@ -4147,7 +4279,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(20821.25, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTile">
+						<g transform="translate(19702.25, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTile">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTile">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyTile">+Widget build()</text>
 								
@@ -4156,88 +4288,146 @@
 					</g>
 					<g data-name="EdgeInsetsGeometry">
 						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsetsGeometry">
-							<rect x="22410.5" y="934.5" height="31.0" width="182.0" data-name="EdgeInsetsGeometry"></rect>
+							<rect x="22041.8" y="934.5" height="31.0" width="182.0" data-name="EdgeInsetsGeometry"></rect>
 						</g>
-						<g transform="translate(22410.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="EdgeInsetsGeometry">
+						<g transform="translate(22041.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="EdgeInsetsGeometry">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsetsGeometry">
 								<text x="83.0" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsetsGeometry">EdgeInsetsGeometry</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BottomOnboardingNavigation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BottomOnboardingNavigation">
-							<rect x="13882.8" y="500.5" height="198.0" width="248.0" data-name="BottomOnboardingNavigation"></rect>
-							<path d="M13882.8 531.5 L14130.8 531.5" fill="none" data-name="BottomOnboardingNavigation"></path>
-							<path d="M13882.8 667.5 L14130.8 667.5" fill="none" data-name="BottomOnboardingNavigation"></path>
+					<g data-name="RoundCheckbox">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoundCheckbox">
+							<rect x="22791.5" y="142.5" height="108.0" width="323.0" data-name="RoundCheckbox"></rect>
+							<path d="M22791.5 173.5 L23114.5 173.5" fill="none" data-name="RoundCheckbox"></path>
+							<path d="M22791.5 219.5 L23114.5 219.5" fill="none" data-name="RoundCheckbox"></path>
 						</g>
-						<g transform="translate(13882.75, 500.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BottomOnboardingNavigation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BottomOnboardingNavigation">
-								<text x="116.0" y="13.5" stroke="none" text-anchor="middle" data-name="BottomOnboardingNavigation">BottomOnboardingNavigation</text>
+						<g transform="translate(22791.5, 142.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoundCheckbox">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoundCheckbox">
+								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoundCheckbox">RoundCheckbox</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13882.75, 531.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BottomOnboardingNavigation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BottomOnboardingNavigation">
-								<text x="0.0" y="13.5" stroke="none" data-name="BottomOnboardingNavigation">+onBack: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BottomOnboardingNavigation">+onNext: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BottomOnboardingNavigation">+backLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BottomOnboardingNavigation">+nextLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BottomOnboardingNavigation">+hideNext: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BottomOnboardingNavigation">+nextIcon: Icon?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="BottomOnboardingNavigation">+backIcon: Icon?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="BottomOnboardingNavigation">+progress: Widget?</text>
+						<g transform="translate(22791.5, 173.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoundCheckbox">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoundCheckbox">
+								<text x="0.0" y="13.5" stroke="none" data-name="RoundCheckbox">+onChanged: dynamic Function(bool)?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RoundCheckbox">+value: bool?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13882.75, 667.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BottomOnboardingNavigation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BottomOnboardingNavigation">
-								<text x="0.0" y="13.5" stroke="none" data-name="BottomOnboardingNavigation">+Widget build()</text>
+						<g transform="translate(22791.5, 219.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoundCheckbox">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoundCheckbox">
+								<text x="0.0" y="13.5" stroke="none" data-name="RoundCheckbox">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Routes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Routes">
-							<rect x="22510.3" y="0.0" height="393.0" width="366.0" data-name="Routes"></rect>
-							<path d="M22510.3 31.0 L22876.3 31.0" fill="none" data-name="Routes"></path>
-							<path d="M22510.3 347.0 L22876.3 347.0" fill="none" data-name="Routes"></path>
+					<g data-name="dynamic Function(bool)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(bool)?">
+							<rect x="22646.8" y="584.0" height="31.0" width="211.0" data-name="dynamic Function(bool)?"></rect>
 						</g>
-						<g transform="translate(22510.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Routes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Routes">
-								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="Routes">Routes</text>
+						<g transform="translate(22646.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(bool)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(bool)?">
+								<text x="97.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(bool)?">dynamic Function(bool)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22510.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Routes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Routes">
-								<text x="0.0" y="13.5" stroke="none" data-name="Routes">&lt;static&gt;+loading: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Routes">&lt;static&gt;+preview: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Routes">&lt;static&gt;+appOutdated: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Routes">&lt;static&gt;+dashboard: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Routes">&lt;static&gt;+welcome: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Routes">&lt;static&gt;+about: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Routes">&lt;static&gt;+terms: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Routes">&lt;static&gt;+studySelection: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Routes">&lt;static&gt;+studyOverview: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Routes">&lt;static&gt;+interventionSelection: String</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Routes">&lt;static&gt;+journey: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="Routes">&lt;static&gt;+consent: String</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="Routes">&lt;static&gt;+kickoff: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="Routes">&lt;static&gt;+contact: String</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="Routes">&lt;static&gt;+faq: String</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="Routes">&lt;static&gt;+appSettings: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="Routes">&lt;static&gt;+questionnaire: String</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="Routes">&lt;static&gt;+reportHistory: String</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="Routes">&lt;static&gt;+reportDetails: String</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="Routes">&lt;static&gt;+performanceDetails: String</text>
+					</g>
+					<g data-name="SelectableButton">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SelectableButton">
+							<rect x="13709.0" y="523.0" height="153.0" width="247.0" data-name="SelectableButton"></rect>
+							<path d="M13709.0 554.0 L13956.0 554.0" fill="none" data-name="SelectableButton"></path>
+							<path d="M13709.0 615.0 L13956.0 615.0" fill="none" data-name="SelectableButton"></path>
+						</g>
+						<g transform="translate(13709, 523)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SelectableButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SelectableButton">
+								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="SelectableButton">SelectableButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22510.25, 347)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Routes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Routes">
-								<text x="0.0" y="13.5" stroke="none" data-name="Routes">&lt;static&gt;+Route&lt;dynamic&gt; unknownRoute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Routes">&lt;static&gt;+Route&lt;dynamic&gt;? generateRoute()</text>
+						<g transform="translate(13709, 554)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SelectableButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SelectableButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="SelectableButton">+child: Widget</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SelectableButton">+selected: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SelectableButton">+onTap: dynamic Function()?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(13709, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SelectableButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SelectableButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="SelectableButton">-Color _getFillColor()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SelectableButton">-Color _getTextColor()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SelectableButton">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="HtmlText">
+						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlText">
+							<rect x="23355.3" y="135.0" height="123.0" width="156.0" data-name="HtmlText"></rect>
+							<path d="M23355.3 166.0 L23511.3 166.0" fill="none" data-name="HtmlText"></path>
+							<path d="M23355.3 227.0 L23511.3 227.0" fill="none" data-name="HtmlText"></path>
+						</g>
+						<g transform="translate(23355.25, 135)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlText">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlText">
+								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlText">HtmlText</text>
+								
+							</g>
+						</g>
+						<g transform="translate(23355.25, 166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlText">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlText">
+								<text x="0.0" y="13.5" stroke="none" data-name="HtmlText">+text: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="HtmlText">+style: TextStyle?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="HtmlText">+centered: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(23355.25, 227)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlText">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlText">
+								<text x="0.0" y="13.5" stroke="none" data-name="HtmlText">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="TextStyle">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
+							<rect x="23388.8" y="584.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
+						</g>
+						<g transform="translate(23388.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
+								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="MyApp">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MyApp">
+							<rect x="23551.3" y="150.5" height="92.0" width="328.0" data-name="MyApp"></rect>
+							<path d="M23551.3 181.5 L23879.3 181.5" fill="none" data-name="MyApp"></path>
+						</g>
+						<g transform="translate(23551.25, 150.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MyApp">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MyApp">
+								<text x="156.0" y="13.5" stroke="none" text-anchor="middle" data-name="MyApp">MyApp</text>
+								
+							</g>
+						</g>
+						<g transform="translate(23551.25, 181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MyApp">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MyApp">
+								<text x="0.0" y="13.5" stroke="none" data-name="MyApp">+queryParameters: Map&lt;String, String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MyApp">+appConfig: AppConfig?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MyApp">+initialRoute: String</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="AppConfig">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppConfig">
+							<rect x="23666.3" y="584.0" height="31.0" width="98.0" data-name="AppConfig"></rect>
+						</g>
+						<g transform="translate(23666.25, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppConfig">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppConfig">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppConfig">AppConfig</text>
 								
 							</g>
 						</g>
diff --git a/docs/uml/app/lib/util/uml.svg b/docs/uml/app/lib/util/uml.svg
index 67876f367..d4be4e904 100644
--- a/docs/uml/app/lib/util/uml.svg
+++ b/docs/uml/app/lib/util/uml.svg
@@ -1,55 +1,5 @@
-<svg version="1.1" baseProfile="full" width="2730.0" height="507.0" viewbox="0 0 2730 507" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudyNotification
-	  |
-	  +taskInstance: TaskInstance;
-	  +date: DateTime
-	]
-	
-	[StudyNotification]o-[TaskInstance]
-	
-	[GroupedIterable
-	  |
-	  +data: Map&lt;K, Iterable&lt;V&gt;&gt;;
-	  +iterator: Iterator&lt;MapEntry&lt;K, Iterable&lt;V&gt;&gt;&gt;
-	  |
-	  +Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregate();
-	  +Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregateWithKey()
-	]
-	
-	[Iterable]&lt;:-[GroupedIterable]
-	
-	[TemporaryStorageHandler
-	  |
-	  &lt;static&gt;-_stagingBaseNamePrefix: String;
-	  &lt;static&gt;-_audioFileType: String;
-	  &lt;static&gt;-_imageFileType: String;
-	  -_userId: String;
-	  -_studyId: String
-	  |
-	  -String _buildFileName();
-	  &lt;static&gt;-dynamic _getMultimodalTempDirectory();
-	  &lt;static&gt;-dynamic _getMultimodalUploadDirectory();
-	  &lt;static&gt;+dynamic moveStagingFileToUploadDirectory();
-	  &lt;static&gt;+dynamic getFutureBlobFiles();
-	  +dynamic getStagingAudio();
-	  +dynamic getStagingImage();
-	  &lt;static&gt;+dynamic deleteAllStagingFiles()
-	]
-	
-	[Cache
-	  |
-	  &lt;static&gt;+isSynchronizing: bool
-	  |
-	  &lt;static&gt;+dynamic storeSubject();
-	  &lt;static&gt;+dynamic loadSubject();
-	  &lt;static&gt;+dynamic storeAnalytics();
-	  &lt;static&gt;+dynamic loadAnalytics();
-	  &lt;static&gt;+dynamic delete();
-	  &lt;static&gt;+dynamic uploadBlobFiles();
-	  &lt;static&gt;+dynamic synchronize()
-	]
-	
-	[NotificationValidators
+<svg version="1.1" baseProfile="full" width="2660.5" height="507.0" viewbox="0 0 2660.5 507" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[NotificationValidators
 	  |
 	  +didNotificationLaunchApp: bool;
 	  +wasNotificationActionHandled: bool;
@@ -90,6 +40,56 @@
 	  +payload: String?
 	]
 	
+	[StudyNotification
+	  |
+	  +taskInstance: TaskInstance;
+	  +date: DateTime
+	]
+	
+	[StudyNotification]o-[TaskInstance]
+	
+	[TemporaryStorageHandler
+	  |
+	  &lt;static&gt;-_stagingBaseNamePrefix: String;
+	  &lt;static&gt;-_audioFileType: String;
+	  &lt;static&gt;-_imageFileType: String;
+	  -_userId: String;
+	  -_studyId: String
+	  |
+	  -String _buildFileName();
+	  &lt;static&gt;-dynamic _getMultimodalTempDirectory();
+	  &lt;static&gt;-dynamic _getMultimodalUploadDirectory();
+	  &lt;static&gt;+dynamic moveStagingFileToUploadDirectory();
+	  &lt;static&gt;+dynamic getFutureBlobFiles();
+	  +dynamic getStagingAudio();
+	  +dynamic getStagingImage();
+	  &lt;static&gt;+dynamic deleteAllStagingFiles()
+	]
+	
+	[GroupedIterable
+	  |
+	  +data: Map&lt;K, Iterable&lt;V&gt;&gt;;
+	  +iterator: Iterator&lt;MapEntry&lt;K, Iterable&lt;V&gt;&gt;&gt;
+	  |
+	  +Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregate();
+	  +Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregateWithKey()
+	]
+	
+	[Iterable]&lt;:-[GroupedIterable]
+	
+	[Cache
+	  |
+	  &lt;static&gt;+isSynchronizing: bool
+	  |
+	  &lt;static&gt;+dynamic storeSubject();
+	  &lt;static&gt;+dynamic loadSubject();
+	  &lt;static&gt;+dynamic storeAnalytics();
+	  &lt;static&gt;+dynamic loadAnalytics();
+	  &lt;static&gt;+dynamic delete();
+	  &lt;static&gt;+dynamic uploadBlobFiles();
+	  &lt;static&gt;+dynamic synchronize()
+	]
+	
 	[AppAnalytics
 	  |
 	  &lt;static&gt;-_userEnabled: bool?;
@@ -112,191 +112,56 @@
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="507.0" width="2730.0" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="507.0" width="2660.5" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
 				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M121.5 201.2 L121.5 308 L121.5 374 L121.5 374.0 " fill="none"></path>
+					<path d="M575.2 247.9 L384 308 L192.47852760736197 374 L192.5 374.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M126.8 191.8 L121.5 201.2 L116.2 191.8 L121.5 182.5 Z"></path>
+						<path d="M585.7 250.2 L575.2 247.9 L582.5 240.0 L593.0 242.3 Z"></path>
 					</g>
-					<path d="M421.0 172.8 L421 308 L421 328 L421.0 328.0 " fill="none"></path>
-					<path d="M426.3 172.8 L421.0 172.8 L415.7 172.8 L421.0 159.5 Z"></path>
-					<path d="M1899.6 205.2 L1342.5 308 L1150.978527607362 374 L1151.0 374.0 " fill="none"></path>
+					<path d="M906.0 306.7 L906 308 L906 374 L906.0 374.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1909.8 208.7 L1899.6 205.2 L1907.9 198.2 L1918.0 201.8 Z"></path>
+						<path d="M911.3 297.3 L906.0 306.7 L900.7 297.3 L906.0 288.0 Z"></path>
 					</g>
-					<path d="M2008.0 298.6 L1994.5 308 L1994.5 374 L1994.5 374.0 " fill="none"></path>
+					<path d="M599.3 296.3 L575.75 308 L500.63957055214723 374 L500.6 374.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2018.7 297.7 L2008.0 298.6 L2012.6 288.9 L2023.3 288.0 Z"></path>
+						<path d="M610.0 296.9 L599.3 296.3 L605.3 287.4 L616.0 288.0 Z"></path>
 					</g>
-					<path d="M1900.9 290.6 L1861.75 308 L1786.6395705521472 374 L1786.6 374.0 " fill="none"></path>
+					<path d="M1215.6 296.2 L1239.5 308 L1239.5 374 L1239.5 374.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1911.6 291.7 L1900.9 290.6 L1907.3 281.9 L1918.0 283.0 Z"></path>
+						<path d="M1209.6 287.3 L1215.6 296.2 L1204.9 296.9 L1198.8 288.0 Z"></path>
 					</g>
-					<path d="M2236.5 306.7 L2236.5 308 L2236.5 374 L2236.5 374.0 " fill="none"></path>
+					<path d="M1237.0 233.1 L1515.5 308 L1515.5 343.5 L1515.5 343.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2241.5 297.1 L2236.5 306.7 L2230.8 297.5 L2235.8 288.0 Z"></path>
+						<path d="M1229.4 225.5 L1237.0 233.1 L1226.6 235.8 L1219.0 228.2 Z"></path>
 					</g>
-					<path d="M2494.3 297.4 L2512.5 308 L2512.5 343.5 L2512.5 343.5 " fill="none"></path>
+					<path d="M1869.5 201.2 L1869.5 308 L1869.5 374 L1869.5 374.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2488.9 288.1 L2494.3 297.4 L2483.6 297.3 L2478.2 288.0 Z"></path>
+						<path d="M1874.8 191.8 L1869.5 201.2 L1864.2 191.8 L1869.5 182.5 Z"></path>
 					</g>
-					<path d="M1674.8 260.6 L1749 308 L1765.196319018405 374 L1765.2 374.0 " fill="none"></path>
+					<path d="M2406.0 172.8 L2406 308 L2406 328 L2406.0 328.0 " fill="none"></path>
+					<path d="M2411.3 172.8 L2406.0 172.8 L2400.7 172.8 L2406.0 159.5 Z"></path>
+					<path d="M349.8 260.6 L424 308 L471.77914110429447 374 L471.8 374.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1669.8 251.0 L1674.8 260.6 L1664.1 260.0 L1659.1 250.5 Z"></path>
+						<path d="M344.8 251.0 L349.8 260.6 L339.1 260.0 L334.1 250.5 Z"></path>
 					</g>
-					<path d="M1307.2 202.9 L976.75 308 L1081.4187116564417 374 L1081.4 374.0 " fill="none"></path>
+					<path d="M137.1 268.6 L127.5 308 L143.69631901840492 374 L143.7 374.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1317.7 205.2 L1307.2 202.9 L1314.5 195.0 L1325.0 197.3 Z"></path>
-					</g>
-					<g data-name="StudyNotification">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotification">
-							<rect x="0.0" y="105.5" height="77.0" width="243.0" data-name="StudyNotification"></rect>
-							<path d="M0.0 136.5 L243.0 136.5" fill="none" data-name="StudyNotification"></path>
-						</g>
-						<g transform="translate(0, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotification">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotification">StudyNotification</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotification">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotification">+taskInstance: TaskInstance</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotification">+date: DateTime</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskInstance">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskInstance">
-							<rect x="60.5" y="374.0" height="31.0" width="122.0" data-name="TaskInstance"></rect>
-						</g>
-						<g transform="translate(60.5, 374)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskInstance">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskInstance">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskInstance">TaskInstance</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GroupedIterable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GroupedIterable">
-							<rect x="222.5" y="328.0" height="123.0" width="397.0" data-name="GroupedIterable"></rect>
-							<path d="M222.5 359.0 L619.5 359.0" fill="none" data-name="GroupedIterable"></path>
-							<path d="M222.5 405.0 L619.5 405.0" fill="none" data-name="GroupedIterable"></path>
-						</g>
-						<g transform="translate(222.5, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GroupedIterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GroupedIterable">
-								<text x="190.5" y="13.5" stroke="none" text-anchor="middle" data-name="GroupedIterable">GroupedIterable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(222.5, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GroupedIterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GroupedIterable">
-								<text x="0.0" y="13.5" stroke="none" data-name="GroupedIterable">+data: Map&lt;K, Iterable&lt;V&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GroupedIterable">+iterator: Iterator&lt;MapEntry&lt;K, Iterable&lt;V&gt;&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(222.5, 405)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GroupedIterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GroupedIterable">
-								<text x="0.0" y="13.5" stroke="none" data-name="GroupedIterable">+Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GroupedIterable">+Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregateWithKey()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Iterable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Iterable">
-							<rect x="383.0" y="128.5" height="31.0" width="76.0" data-name="Iterable"></rect>
-						</g>
-						<g transform="translate(383, 128.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Iterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Iterable">
-								<text x="30.0" y="13.5" stroke="none" text-anchor="middle" data-name="Iterable">Iterable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporaryStorageHandler">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporaryStorageHandler">
-							<rect x="499.0" y="15.0" height="258.0" width="449.0" data-name="TemporaryStorageHandler"></rect>
-							<path d="M499.0 46.0 L948.0 46.0" fill="none" data-name="TemporaryStorageHandler"></path>
-							<path d="M499.0 137.0 L948.0 137.0" fill="none" data-name="TemporaryStorageHandler"></path>
-						</g>
-						<g transform="translate(499, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporaryStorageHandler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporaryStorageHandler">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="TemporaryStorageHandler">TemporaryStorageHandler</text>
-								
-							</g>
-						</g>
-						<g transform="translate(499, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporaryStorageHandler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporaryStorageHandler">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-_stagingBaseNamePrefix: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-_audioFileType: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-_imageFileType: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporaryStorageHandler">-_userId: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporaryStorageHandler">-_studyId: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(499, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporaryStorageHandler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporaryStorageHandler">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporaryStorageHandler">-String _buildFileName()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-dynamic _getMultimodalTempDirectory()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-dynamic _getMultimodalUploadDirectory()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;+dynamic moveStagingFileToUploadDirectory()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;+dynamic getFutureBlobFiles()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporaryStorageHandler">+dynamic getStagingAudio()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TemporaryStorageHandler">+dynamic getStagingImage()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;+dynamic deleteAllStagingFiles()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Cache">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Cache">
-							<rect x="988.0" y="52.5" height="183.0" width="297.0" data-name="Cache"></rect>
-							<path d="M988.0 83.5 L1285.0 83.5" fill="none" data-name="Cache"></path>
-							<path d="M988.0 114.5 L1285.0 114.5" fill="none" data-name="Cache"></path>
-						</g>
-						<g transform="translate(988, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Cache">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Cache">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="Cache">Cache</text>
-								
-							</g>
-						</g>
-						<g transform="translate(988, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Cache">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Cache">
-								<text x="0.0" y="13.5" stroke="none" data-name="Cache">&lt;static&gt;+isSynchronizing: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(988, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Cache">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Cache">
-								<text x="0.0" y="13.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic storeSubject()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic loadSubject()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic storeAnalytics()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic loadAnalytics()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic uploadBlobFiles()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic synchronize()</text>
-								
-							</g>
-						</g>
+						<path d="M144.5 260.8 L137.1 268.6 L134.1 258.3 L141.5 250.5 Z"></path>
 					</g>
 					<g data-name="NotificationValidators">
 						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationValidators">
-							<rect x="2351.0" y="343.5" height="92.0" width="323.0" data-name="NotificationValidators"></rect>
-							<path d="M2351.0 374.5 L2674.0 374.5" fill="none" data-name="NotificationValidators"></path>
+							<rect x="1354.0" y="343.5" height="92.0" width="323.0" data-name="NotificationValidators"></rect>
+							<path d="M1354.0 374.5 L1677.0 374.5" fill="none" data-name="NotificationValidators"></path>
 						</g>
-						<g transform="translate(2351, 343.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationValidators">
+						<g transform="translate(1354, 343.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationValidators">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationValidators">
 								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationValidators">NotificationValidators</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2351, 374.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationValidators">
+						<g transform="translate(1354, 374.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationValidators">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationValidators">
 								<text x="0.0" y="13.5" stroke="none" data-name="NotificationValidators">+didNotificationLaunchApp: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="NotificationValidators">+wasNotificationActionHandled: bool</text>
@@ -307,17 +172,17 @@
 					</g>
 					<g data-name="StudyNotifications">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotifications">
-							<rect x="1918.0" y="0.0" height="288.0" width="626.0" data-name="StudyNotifications"></rect>
-							<path d="M1918.0 31.0 L2544.0 31.0" fill="none" data-name="StudyNotifications"></path>
-							<path d="M1918.0 167.0 L2544.0 167.0" fill="none" data-name="StudyNotifications"></path>
+							<rect x="593.0" y="0.0" height="288.0" width="626.0" data-name="StudyNotifications"></rect>
+							<path d="M593.0 31.0 L1219.0 31.0" fill="none" data-name="StudyNotifications"></path>
+							<path d="M593.0 167.0 L1219.0 167.0" fill="none" data-name="StudyNotifications"></path>
 						</g>
-						<g transform="translate(1918, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotifications">
+						<g transform="translate(593, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotifications">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotifications">
 								<text x="305.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotifications">StudyNotifications</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1918, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotifications">
+						<g transform="translate(593, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotifications">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotifications">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotifications">+subject: StudySubject?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotifications">+flutterLocalNotificationsPlugin: FlutterLocalNotificationsPlugin</text>
@@ -330,7 +195,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(1918, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotifications">
+						<g transform="translate(593, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotifications">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotifications">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+dynamic create()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotifications">-dynamic _isAndroidPermissionGranted()</text>
@@ -345,9 +210,9 @@
 					</g>
 					<g data-name="StudySubject">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="1046.0" y="374.0" height="31.0" width="120.0" data-name="StudySubject"></rect>
+							<rect x="87.5" y="374.0" height="31.0" width="120.0" data-name="StudySubject"></rect>
 						</g>
-						<g transform="translate(1046, 374)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
+						<g transform="translate(87.5, 374)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
 								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
 								
@@ -356,9 +221,9 @@
 					</g>
 					<g data-name="FlutterLocalNotificationsPlugin">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FlutterLocalNotificationsPlugin">
-							<rect x="1867.0" y="374.0" height="31.0" width="255.0" data-name="FlutterLocalNotificationsPlugin"></rect>
+							<rect x="778.5" y="374.0" height="31.0" width="255.0" data-name="FlutterLocalNotificationsPlugin"></rect>
 						</g>
-						<g transform="translate(1867, 374)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FlutterLocalNotificationsPlugin">
+						<g transform="translate(778.5, 374)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FlutterLocalNotificationsPlugin">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FlutterLocalNotificationsPlugin">
 								<text x="119.5" y="13.5" stroke="none" text-anchor="middle" data-name="FlutterLocalNotificationsPlugin">FlutterLocalNotificationsPlugin</text>
 								
@@ -367,9 +232,9 @@
 					</g>
 					<g data-name="BuildContext">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
-							<rect x="1711.0" y="374.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
+							<rect x="425.0" y="374.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
 						</g>
-						<g transform="translate(1711, 374)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
+						<g transform="translate(425, 374)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
 								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
 								
@@ -378,9 +243,9 @@
 					</g>
 					<g data-name="StreamController">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
-							<rect x="2162.0" y="374.0" height="31.0" width="149.0" data-name="StreamController"></rect>
+							<rect x="1165.0" y="374.0" height="31.0" width="149.0" data-name="StreamController"></rect>
 						</g>
-						<g transform="translate(2162, 374)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
+						<g transform="translate(1165, 374)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
 								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
 								
@@ -389,16 +254,16 @@
 					</g>
 					<g data-name="ReceivedNotification">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReceivedNotification">
-							<rect x="1700.0" y="90.5" height="107.0" width="178.0" data-name="ReceivedNotification"></rect>
-							<path d="M1700.0 121.5 L1878.0 121.5" fill="none" data-name="ReceivedNotification"></path>
+							<rect x="375.0" y="90.5" height="107.0" width="178.0" data-name="ReceivedNotification"></rect>
+							<path d="M375.0 121.5 L553.0 121.5" fill="none" data-name="ReceivedNotification"></path>
 						</g>
-						<g transform="translate(1700, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReceivedNotification">
+						<g transform="translate(375, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReceivedNotification">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReceivedNotification">
 								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReceivedNotification">ReceivedNotification</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1700, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReceivedNotification">
+						<g transform="translate(375, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReceivedNotification">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReceivedNotification">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReceivedNotification">+id: int?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReceivedNotification">+title: String?</text>
@@ -408,19 +273,154 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="StudyNotification">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotification">
+							<rect x="1748.0" y="105.5" height="77.0" width="243.0" data-name="StudyNotification"></rect>
+							<path d="M1748.0 136.5 L1991.0 136.5" fill="none" data-name="StudyNotification"></path>
+						</g>
+						<g transform="translate(1748, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotification">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotification">
+								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotification">StudyNotification</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1748, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotification">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotification">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotification">+taskInstance: TaskInstance</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotification">+date: DateTime</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="TaskInstance">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TaskInstance">
+							<rect x="1808.5" y="374.0" height="31.0" width="122.0" data-name="TaskInstance"></rect>
+						</g>
+						<g transform="translate(1808.5, 374)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskInstance">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskInstance">
+								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskInstance">TaskInstance</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="TemporaryStorageHandler">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporaryStorageHandler">
+							<rect x="1259.0" y="15.0" height="258.0" width="449.0" data-name="TemporaryStorageHandler"></rect>
+							<path d="M1259.0 46.0 L1708.0 46.0" fill="none" data-name="TemporaryStorageHandler"></path>
+							<path d="M1259.0 137.0 L1708.0 137.0" fill="none" data-name="TemporaryStorageHandler"></path>
+						</g>
+						<g transform="translate(1259, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporaryStorageHandler">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporaryStorageHandler">
+								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="TemporaryStorageHandler">TemporaryStorageHandler</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1259, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporaryStorageHandler">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporaryStorageHandler">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-_stagingBaseNamePrefix: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-_audioFileType: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-_imageFileType: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporaryStorageHandler">-_userId: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TemporaryStorageHandler">-_studyId: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1259, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporaryStorageHandler">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporaryStorageHandler">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporaryStorageHandler">-String _buildFileName()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-dynamic _getMultimodalTempDirectory()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-dynamic _getMultimodalUploadDirectory()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;+dynamic moveStagingFileToUploadDirectory()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;+dynamic getFutureBlobFiles()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TemporaryStorageHandler">+dynamic getStagingAudio()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="TemporaryStorageHandler">+dynamic getStagingImage()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;+dynamic deleteAllStagingFiles()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="GroupedIterable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GroupedIterable">
+							<rect x="2207.5" y="328.0" height="123.0" width="397.0" data-name="GroupedIterable"></rect>
+							<path d="M2207.5 359.0 L2604.5 359.0" fill="none" data-name="GroupedIterable"></path>
+							<path d="M2207.5 405.0 L2604.5 405.0" fill="none" data-name="GroupedIterable"></path>
+						</g>
+						<g transform="translate(2207.5, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GroupedIterable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GroupedIterable">
+								<text x="190.5" y="13.5" stroke="none" text-anchor="middle" data-name="GroupedIterable">GroupedIterable</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2207.5, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GroupedIterable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GroupedIterable">
+								<text x="0.0" y="13.5" stroke="none" data-name="GroupedIterable">+data: Map&lt;K, Iterable&lt;V&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="GroupedIterable">+iterator: Iterator&lt;MapEntry&lt;K, Iterable&lt;V&gt;&gt;&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2207.5, 405)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GroupedIterable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GroupedIterable">
+								<text x="0.0" y="13.5" stroke="none" data-name="GroupedIterable">+Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregate()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="GroupedIterable">+Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregateWithKey()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="Iterable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Iterable">
+							<rect x="2368.0" y="128.5" height="31.0" width="76.0" data-name="Iterable"></rect>
+						</g>
+						<g transform="translate(2368, 128.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Iterable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Iterable">
+								<text x="30.0" y="13.5" stroke="none" text-anchor="middle" data-name="Iterable">Iterable</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="Cache">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Cache">
+							<rect x="2031.0" y="52.5" height="183.0" width="297.0" data-name="Cache"></rect>
+							<path d="M2031.0 83.5 L2328.0 83.5" fill="none" data-name="Cache"></path>
+							<path d="M2031.0 114.5 L2328.0 114.5" fill="none" data-name="Cache"></path>
+						</g>
+						<g transform="translate(2031, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Cache">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Cache">
+								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="Cache">Cache</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2031, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Cache">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Cache">
+								<text x="0.0" y="13.5" stroke="none" data-name="Cache">&lt;static&gt;+isSynchronizing: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2031, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Cache">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Cache">
+								<text x="0.0" y="13.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic storeSubject()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic loadSubject()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic storeAnalytics()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic loadAnalytics()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic delete()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic uploadBlobFiles()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic synchronize()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="AppAnalytics">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AppAnalytics">
-							<rect x="1325.0" y="37.5" height="213.0" width="335.0" data-name="AppAnalytics"></rect>
-							<path d="M1325.0 68.5 L1660.0 68.5" fill="none" data-name="AppAnalytics"></path>
-							<path d="M1325.0 159.5 L1660.0 159.5" fill="none" data-name="AppAnalytics"></path>
+							<rect x="0.0" y="37.5" height="213.0" width="335.0" data-name="AppAnalytics"></rect>
+							<path d="M0.0 68.5 L335.0 68.5" fill="none" data-name="AppAnalytics"></path>
+							<path d="M0.0 159.5 L335.0 159.5" fill="none" data-name="AppAnalytics"></path>
 						</g>
-						<g transform="translate(1325, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppAnalytics">
+						<g transform="translate(0, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppAnalytics">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppAnalytics">
 								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppAnalytics">AppAnalytics</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1325, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppAnalytics">
+						<g transform="translate(0, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppAnalytics">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppAnalytics">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;-_userEnabled: bool?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+keyAnalyticsUserEnable: String</text>
@@ -430,7 +430,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(1325, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppAnalytics">
+						<g transform="translate(0, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppAnalytics">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppAnalytics">
 								<text x="0.0" y="13.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+dynamic init()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+dynamic start()</text>

From f12fcd9502afc55a4ad694f7ac5b87831a938052 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 29 Apr 2024 11:54:17 +0200
Subject: [PATCH 024/314] fix: upgrade deps and migrate

---
 app/pubspec.lock                              | 64 +++++++------------
 app/pubspec.yaml                              |  6 +-
 core/pubspec.lock                             | 12 ++--
 core/pubspec.yaml                             |  2 +-
 .../question/question_form_controller.dart    |  6 +-
 designer_v2/pubspec.lock                      | 64 ++++++++-----------
 designer_v2/pubspec.yaml                      | 14 ++--
 flutter_common/pubspec.lock                   | 32 +++++-----
 flutter_common/pubspec.yaml                   |  2 +-
 9 files changed, 89 insertions(+), 113 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index cbad20ab3..19dda25f1 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -5,18 +5,18 @@ packages:
     dependency: transitive
     description:
       name: app_links
-      sha256: "42dc15aecf2618ace4ffb74a2e58a50e45cd1b9f2c17c8f0cafe4c297f08c815"
+      sha256: "0fd41f0501f131d931251e0942ac63d6216096a0052aeca037915c2c1deeb121"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "5.0.0"
   archive:
     dependency: transitive
     description:
       name: archive
-      sha256: "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d"
+      sha256: "0763b45fa9294197a2885c8567927e2830ade852e5c896fd4ab7e0e348d0f373"
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.10"
+    version: "3.5.0"
   args:
     dependency: transitive
     description:
@@ -45,10 +45,10 @@ packages:
     dependency: transitive
     description:
       name: barcode
-      sha256: "1fe4a55344505850517ce72d4a3a7b9ccf51b0dc1631ee7e552f6eacc4947f96"
+      sha256: ab180ce22c6555d77d45f0178a523669db67f95856e3378259ef2ffeb43e6003
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.7"
+    version: "2.2.8"
   bidi:
     dependency: transitive
     description:
@@ -85,10 +85,10 @@ packages:
     dependency: transitive
     description:
       name: cached_network_image_web
-      sha256: "42a835caa27c220d1294311ac409a43361088625a4f23c820b006dd9bffb3316"
+      sha256: "205d6a9f1862de34b93184f22b9d2d94586b2f05c581d546695e3d8f6a805cd7"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.2.0"
   camera:
     dependency: "direct main"
     description:
@@ -185,14 +185,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.18.0"
-  convert:
-    dependency: transitive
-    description:
-      name: convert
-      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.1"
   cross_file:
     dependency: "direct main"
     description:
@@ -465,10 +457,10 @@ packages:
     dependency: transitive
     description:
       name: functions_client
-      sha256: "9a0ab83a525c8691a6724746e642de755a299afa04158807787364cd9e718001"
+      sha256: a70b0dd9a1c35d05d1141557f7e49ffe4de5f450ffde31755a9eeeadca03b8ee
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   fwfh_cached_network_image:
     dependency: transitive
     description:
@@ -521,10 +513,10 @@ packages:
     dependency: transitive
     description:
       name: gotrue
-      sha256: a0eee21a7e8ec09e6bbd5c9a36e31e423827b575ba6fc2dd049805dcfaac5b02
+      sha256: c9c984f088320a5c5e87c7a34571e3de3982cca4cbd8b978e59d36baf748edfb
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.0"
+    version: "2.6.1"
   gtk:
     dependency: transitive
     description:
@@ -577,10 +569,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   js:
     dependency: transitive
     description:
@@ -633,10 +625,10 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
@@ -649,10 +641,10 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: d4c8f568c60af6b6daa74c80fc04411765769882600f6bf9cd4b391c96de42ce
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.3"
   lints:
     dependency: transitive
     description:
@@ -705,10 +697,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.14.0"
   mime:
     dependency: transitive
     description:
@@ -893,14 +885,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
-  pointycastle:
-    dependency: transitive
-    description:
-      name: pointycastle
-      sha256: "79fbafed02cfdbe85ef3fd06c7f4bc2cbcba0177e61b765264853d4253b21744"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.9.0"
   postgrest:
     dependency: transitive
     description:
@@ -1204,18 +1188,18 @@ packages:
     dependency: "direct main"
     description:
       name: supabase
-      sha256: b652dab5f3041ae85c94358bf9142b3c85655446ab9a78e1b40bbd41b9d8087b
+      sha256: ef407187b18c440f4a5c3f3cf30eb5cc1daadd4ff5616febf445a37e0e0ed34e
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   supabase_flutter:
     dependency: "direct main"
     description:
       name: supabase_flutter
-      sha256: cfbe0ad4e3e7a0d4621340323d3c9da5326e7a19689b93359f130f7a27b3c284
+      sha256: "6a77bd6ef6dc451bb2561de0334d68d620b84d7df1de1448dd7962ed5d1a79ea"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.1"
+    version: "2.5.2"
   synchronized:
     dependency: transitive
     description:
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 608fbd9ef..2a8d77388 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -24,7 +24,7 @@ dependencies:
     sdk: flutter
   flutter_widget_from_html: ^0.14.11
   intersperse: ^2.0.0
-  intl: ^0.18.1 # flutter_localizations
+  intl: ^0.19.0
   material_design_icons_flutter: ^7.0.7296
   package_info_plus: ^7.0.0 # wakelock_plus <= 1.2.4
   path: ^1.9.0
@@ -40,8 +40,8 @@ dependencies:
   shared_preferences: ^2.2.3
   studyu_core: ^4.4.1
   studyu_flutter_common: ^1.8.2
-  supabase: ^2.1.1
-  supabase_flutter: ^2.5.1
+  supabase: ^2.1.2
+  supabase_flutter: ^2.5.2
   timeline_tile: ^2.0.0
   timezone: ^0.9.3
   universal_html: ^2.2.4
diff --git a/core/pubspec.lock b/core/pubspec.lock
index f07c31977..cfdd1b72f 100644
--- a/core/pubspec.lock
+++ b/core/pubspec.lock
@@ -197,10 +197,10 @@ packages:
     dependency: transitive
     description:
       name: functions_client
-      sha256: "9a0ab83a525c8691a6724746e642de755a299afa04158807787364cd9e718001"
+      sha256: a70b0dd9a1c35d05d1141557f7e49ffe4de5f450ffde31755a9eeeadca03b8ee
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   glob:
     dependency: transitive
     description:
@@ -213,10 +213,10 @@ packages:
     dependency: transitive
     description:
       name: gotrue
-      sha256: a0eee21a7e8ec09e6bbd5c9a36e31e423827b575ba6fc2dd049805dcfaac5b02
+      sha256: c9c984f088320a5c5e87c7a34571e3de3982cca4cbd8b978e59d36baf748edfb
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.0"
+    version: "2.6.1"
   graphs:
     dependency: transitive
     description:
@@ -557,10 +557,10 @@ packages:
     dependency: "direct main"
     description:
       name: supabase
-      sha256: b652dab5f3041ae85c94358bf9142b3c85655446ab9a78e1b40bbd41b9d8087b
+      sha256: ef407187b18c440f4a5c3f3cf30eb5cc1daadd4ff5616febf445a37e0e0ed34e
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   term_glyph:
     dependency: transitive
     description:
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index e3019f053..bd5987f50 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
   logger: ^2.2.0
   quiver: ^3.2.1
   sentry: ^8.0.0
-  supabase: ^2.1.1
+  supabase: ^2.1.2
   uuid: ^4.4.0
 
 dev_dependencies:
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/question_form_controller.dart b/designer_v2/lib/features/design/shared/questionnaire/question/question_form_controller.dart
index 0863dba3c..0cf3d6c9b 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/question_form_controller.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/question_form_controller.dart
@@ -115,7 +115,7 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
   late final FormArray<String> audioResponseOptionsArray = FormArray(audioOptions);
   final FormControl<int> maxRecordingDurationSecondsControl = FormControl(
       value: kDefaultMaxRecordingDurationSeconds,
-      validators: [Validators.number, Validators.min(1), Validators.max(kMaxRecordingDurationSeconds)]);
+      validators: [Validators.number(allowNegatives: false), Validators.min(1), Validators.max(kMaxRecordingDurationSeconds)]);
 
   // Scale
   static const int kDefaultScaleMinValue = 0;
@@ -234,7 +234,7 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
         validators.add(Validators.pattern(alphanumericPattern));
         break;
       case FreeTextQuestionType.numeric:
-        validators.add(Validators.number);
+        validators.add(Validators.number(allowNegatives: false));
         break;
       case FreeTextQuestionType.custom:
         if (customRegexControl.value != null) {
@@ -362,7 +362,7 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
 
   get maxRecordingDurationValid {
     return FormControlValidation(control: maxRecordingDurationSecondsControl, validators: [
-      Validators.number,
+      Validators.number(allowNegatives: false),
       Validators.min(1),
       Validators.max(kMaxRecordingDurationSeconds),
     ], validationMessages: {
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index bb00fcb1a..f0cc30dea 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -29,18 +29,18 @@ packages:
     dependency: transitive
     description:
       name: app_links
-      sha256: "42dc15aecf2618ace4ffb74a2e58a50e45cd1b9f2c17c8f0cafe4c297f08c815"
+      sha256: "0fd41f0501f131d931251e0942ac63d6216096a0052aeca037915c2c1deeb121"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "5.0.0"
   archive:
     dependency: "direct main"
     description:
       name: archive
-      sha256: "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d"
+      sha256: "0763b45fa9294197a2885c8567927e2830ade852e5c896fd4ab7e0e348d0f373"
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.10"
+    version: "3.5.0"
   args:
     dependency: transitive
     description:
@@ -371,10 +371,10 @@ packages:
     dependency: transitive
     description:
       name: functions_client
-      sha256: "9a0ab83a525c8691a6724746e642de755a299afa04158807787364cd9e718001"
+      sha256: a70b0dd9a1c35d05d1141557f7e49ffe4de5f450ffde31755a9eeeadca03b8ee
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   glob:
     dependency: transitive
     description:
@@ -395,10 +395,10 @@ packages:
     dependency: transitive
     description:
       name: gotrue
-      sha256: a0eee21a7e8ec09e6bbd5c9a36e31e423827b575ba6fc2dd049805dcfaac5b02
+      sha256: c9c984f088320a5c5e87c7a34571e3de3982cca4cbd8b978e59d36baf748edfb
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.0"
+    version: "2.6.1"
   gtk:
     dependency: transitive
     description:
@@ -456,10 +456,10 @@ packages:
     dependency: transitive
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   io:
     dependency: transitive
     description:
@@ -496,10 +496,10 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
@@ -512,10 +512,10 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: d4c8f568c60af6b6daa74c80fc04411765769882600f6bf9cd4b391c96de42ce
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.3"
   lints:
     dependency: transitive
     description:
@@ -568,10 +568,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.14.0"
   mime:
     dependency: transitive
     description:
@@ -724,14 +724,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.10.2"
-  pointycastle:
-    dependency: transitive
-    description:
-      name: pointycastle
-      sha256: "79fbafed02cfdbe85ef3fd06c7f4bc2cbcba0177e61b765264853d4253b21744"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.9.0"
   pool:
     dependency: transitive
     description:
@@ -784,34 +776,34 @@ packages:
     dependency: "direct main"
     description:
       name: reactive_color_picker
-      sha256: dbb0dcd2a41f2af836baf06164deddeaa0465ba75ef537ab4b2747073214561b
+      sha256: "175889c7a0435de18d56dd3e821bb0e398ca25ae4895f02baef95289bf4a1acb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   reactive_forms:
     dependency: "direct main"
     description:
       name: reactive_forms
-      sha256: b7d64d8fe45c19f506c762e219f4c6a3bdcfc4842d6fba98f866be5fca75d8e5
+      sha256: "10771b3b8f7df3dc6942928cc55b2abb49c0a5eb56ca8ab1ff4084b2bd968044"
       url: "https://pub.dev"
     source: hosted
-    version: "16.1.1"
+    version: "17.0.0"
   reactive_multi_select_flutter:
     dependency: "direct main"
     description:
       name: reactive_multi_select_flutter
-      sha256: "78bd530847d9d37d2ec05b18413ca68ec670cd65ddc59ba40a4bbf532757093e"
+      sha256: "1127da052f7d315e96563a23958c1aa5952ab702a6093aba20aa459d58c183eb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   reactive_range_slider:
     dependency: "direct main"
     description:
       name: reactive_range_slider
-      sha256: "63c35ef17a146e02d3d98c8912278ac718106ba1ed72679eeba8d784855c713a"
+      sha256: b493aaf682a7bb0800b582951e63cbba92563c3361164b566a377e498dc8cfd5
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   realtime_client:
     dependency: transitive
     description:
@@ -1059,18 +1051,18 @@ packages:
     dependency: "direct main"
     description:
       name: supabase
-      sha256: b652dab5f3041ae85c94358bf9142b3c85655446ab9a78e1b40bbd41b9d8087b
+      sha256: ef407187b18c440f4a5c3f3cf30eb5cc1daadd4ff5616febf445a37e0e0ed34e
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   supabase_flutter:
     dependency: "direct main"
     description:
       name: supabase_flutter
-      sha256: cfbe0ad4e3e7a0d4621340323d3c9da5326e7a19689b93359f130f7a27b3c284
+      sha256: "6a77bd6ef6dc451bb2561de0334d68d620b84d7df1de1448dd7962ed5d1a79ea"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.1"
+    version: "2.5.2"
   sync_http:
     dependency: transitive
     description:
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 378fa75a5..f36fe086e 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
   sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
-  archive: ^3.4.10
+  archive: ^3.5.0
   async: ^2.11.0
   csv: ^6.0.0
   cupertino_icons: ^1.0.8
@@ -27,15 +27,15 @@ dependencies:
   material_color_utilities:
   material_design_icons_flutter: ^7.0.7296
   pointer_interceptor: ^0.10.1
-  reactive_color_picker: ^2.0.0
-  reactive_forms: ^16.1.1 # reactive_range_slider <= 2.0.0
-  reactive_multi_select_flutter: ^2.0.0
-  reactive_range_slider: ^2.0.0
+  reactive_color_picker: ^2.0.1
+  reactive_forms: ^17.0.0
+  reactive_multi_select_flutter: ^2.0.1
+  reactive_range_slider: ^2.0.1
   rxdart: ^0.27.7
   studyu_core: ^4.4.1
   studyu_flutter_common: ^1.8.2
-  supabase: ^2.1.1
-  supabase_flutter: ^2.5.1
+  supabase: ^2.1.2
+  supabase_flutter: ^2.5.2
   url_launcher: ^6.2.6
   uuid: ^4.4.0
 
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index 5521f4aa5..bf35dd539 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: app_links
-      sha256: "42dc15aecf2618ace4ffb74a2e58a50e45cd1b9f2c17c8f0cafe4c297f08c815"
+      sha256: "0fd41f0501f131d931251e0942ac63d6216096a0052aeca037915c2c1deeb121"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "5.0.0"
   async:
     dependency: transitive
     description:
@@ -180,18 +180,18 @@ packages:
     dependency: transitive
     description:
       name: functions_client
-      sha256: "9a0ab83a525c8691a6724746e642de755a299afa04158807787364cd9e718001"
+      sha256: a70b0dd9a1c35d05d1141557f7e49ffe4de5f450ffde31755a9eeeadca03b8ee
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   gotrue:
     dependency: transitive
     description:
       name: gotrue
-      sha256: a0eee21a7e8ec09e6bbd5c9a36e31e423827b575ba6fc2dd049805dcfaac5b02
+      sha256: c9c984f088320a5c5e87c7a34571e3de3982cca4cbd8b978e59d36baf748edfb
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.0"
+    version: "2.6.1"
   gtk:
     dependency: transitive
     description:
@@ -244,10 +244,10 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
@@ -260,10 +260,10 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: d4c8f568c60af6b6daa74c80fc04411765769882600f6bf9cd4b391c96de42ce
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.3"
   lints:
     dependency: transitive
     description:
@@ -300,10 +300,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.14.0"
   mime:
     dependency: transitive
     description:
@@ -552,18 +552,18 @@ packages:
     dependency: transitive
     description:
       name: supabase
-      sha256: b652dab5f3041ae85c94358bf9142b3c85655446ab9a78e1b40bbd41b9d8087b
+      sha256: ef407187b18c440f4a5c3f3cf30eb5cc1daadd4ff5616febf445a37e0e0ed34e
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   supabase_flutter:
     dependency: "direct main"
     description:
       name: supabase_flutter
-      sha256: cfbe0ad4e3e7a0d4621340323d3c9da5326e7a19689b93359f130f7a27b3c284
+      sha256: "6a77bd6ef6dc451bb2561de0334d68d620b84d7df1de1448dd7962ed5d1a79ea"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.1"
+    version: "2.5.2"
   synchronized:
     dependency: "direct main"
     description:
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index 0522ef65c..15437a3fb 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
   flutter_secure_storage: ^9.0.0
   shared_preferences: ^2.2.3 # Can be removed after migrating phase
   studyu_core: ^4.4.1
-  supabase_flutter: ^2.5.1
+  supabase_flutter: ^2.5.2
   synchronized: ^3.1.0+1
   uuid: ^4.4.0
 

From 9e5cf789aafcc1581c366f36293248f0d05d628e Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 29 Apr 2024 11:58:07 +0200
Subject: [PATCH 025/314] chore(release): publish packages

 - studyu_app@2.7.4-dev.0
 - studyu_core@4.4.2-dev.0
 - studyu_designer_v2@1.8.0-dev.0
 - studyu_flutter_common@1.8.3-dev.0
---
 CHANGELOG.md                | 37 +++++++++++++++++++++++++++++++++++++
 app/CHANGELOG.md            |  4 ++++
 app/pubspec.yaml            |  6 +++---
 core/CHANGELOG.md           |  4 ++++
 core/pubspec.yaml           |  2 +-
 designer_v2/CHANGELOG.md    |  5 +++++
 designer_v2/pubspec.yaml    |  6 +++---
 flutter_common/CHANGELOG.md |  4 ++++
 flutter_common/pubspec.yaml |  4 ++--
 9 files changed, 63 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d09abeb61..fac3f4242 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,43 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2024-04-29
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`studyu_app` - `v2.7.4-dev.0`](#studyu_app---v274-dev0)
+ - [`studyu_core` - `v4.4.2-dev.0`](#studyu_core---v442-dev0)
+ - [`studyu_designer_v2` - `v1.8.0-dev.0`](#studyu_designer_v2---v180-dev0)
+ - [`studyu_flutter_common` - `v1.8.3-dev.0`](#studyu_flutter_common---v183-dev0)
+
+---
+
+#### `studyu_app` - `v2.7.4-dev.0`
+
+ - **FIX**: upgrade deps and migrate.
+
+#### `studyu_core` - `v4.4.2-dev.0`
+
+ - **FIX**: upgrade deps and migrate.
+
+#### `studyu_designer_v2` - `v1.8.0-dev.0`
+
+ - **FIX**: upgrade deps and migrate.
+ - **FEAT**: sort invite codes alphabetically.
+
+#### `studyu_flutter_common` - `v1.8.3-dev.0`
+
+ - **FIX**: upgrade deps and migrate.
+
+
 ## 2024-04-26
 
 ### Changes
diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md
index 3eb285599..0aa8a48f3 100644
--- a/app/CHANGELOG.md
+++ b/app/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.7.4-dev.0
+
+ - **FIX**: upgrade deps and migrate.
+
 ## 2.7.3
 
  - **FIX**: skip handling multimodal for web. ([27ba5298](https://github.com/hpi-studyu/studyu/commit/27ba5298a1b714e1cc7e21a6d88c286f91e2907a))
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 2a8d77388..f21aa8416 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_app
-version: 2.7.3
+version: 2.7.4-dev.0
 description: Partake in digital N-of-1 trials with the innovative StudyU Health App
 publish_to: none
 homepage: https://studyu.health
@@ -38,8 +38,8 @@ dependencies:
   sentry_flutter: ^8.0.0
   sentry_logging: ^8.0.0
   shared_preferences: ^2.2.3
-  studyu_core: ^4.4.1
-  studyu_flutter_common: ^1.8.2
+  studyu_core: ^4.4.2-dev.0
+  studyu_flutter_common: ^1.8.3-dev.0
   supabase: ^2.1.2
   supabase_flutter: ^2.5.2
   timeline_tile: ^2.0.0
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 628add53f..e4b68e9a5 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.4.2-dev.0
+
+ - **FIX**: upgrade deps and migrate.
+
 ## 4.4.1
 
  - **FIX**: check if result is QuestionnaireState. ([c7535804](https://github.com/hpi-studyu/studyu/commit/c7535804281f9bbdf757a2eb11df03940eceeec9))
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index bd5987f50..457b30aca 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_core
-version: 4.4.1
+version: 4.4.2-dev.0
 description: This package contains StudyU models and common functions for the app and designer packages
 homepage: https://studyu.health
 repository: https://github.com/hpi-studyu/studyu
diff --git a/designer_v2/CHANGELOG.md b/designer_v2/CHANGELOG.md
index d099f7090..8793c2e3a 100644
--- a/designer_v2/CHANGELOG.md
+++ b/designer_v2/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.8.0-dev.0
+
+ - **FIX**: upgrade deps and migrate.
+ - **FEAT**: sort invite codes alphabetically.
+
 ## 1.7.2
 
  - **FIX**: signup was not possible with flutter_secure_storage. ([26425971](https://github.com/hpi-studyu/studyu/commit/2642597141653aa724a1305456e43840d6fbebe5))
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index f36fe086e..294c1a8d1 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_designer_v2
-version: 1.7.2
+version: 1.8.0-dev.0
 description: Implement digital N-of-1 studies seamlessly with the StudyU Health Designer
 publish_to: none
 homepage: https://studyu.health
@@ -32,8 +32,8 @@ dependencies:
   reactive_multi_select_flutter: ^2.0.1
   reactive_range_slider: ^2.0.1
   rxdart: ^0.27.7
-  studyu_core: ^4.4.1
-  studyu_flutter_common: ^1.8.2
+  studyu_core: ^4.4.2-dev.0
+  studyu_flutter_common: ^1.8.3-dev.0
   supabase: ^2.1.2
   supabase_flutter: ^2.5.2
   url_launcher: ^6.2.6
diff --git a/flutter_common/CHANGELOG.md b/flutter_common/CHANGELOG.md
index 684b4435b..c7262f9c0 100644
--- a/flutter_common/CHANGELOG.md
+++ b/flutter_common/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.8.3-dev.0
+
+ - **FIX**: upgrade deps and migrate.
+
 ## 1.8.2
 
  - **FIX**: skip signin after signup if user is already authenticated. ([7e978122](https://github.com/hpi-studyu/studyu/commit/7e97812279b77fb9406fb288341c0fd9e349ad9c))
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index 15437a3fb..068a8c397 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_flutter_common
-version: 1.8.2
+version: 1.8.3-dev.0
 description: StudyU common flutter components and functions for app and designer
 homepage: https://studyu.health
 repository: https://github.com/hpi-studyu/studyu
@@ -13,7 +13,7 @@ dependencies:
   flutter_dotenv: ^5.1.0
   flutter_secure_storage: ^9.0.0
   shared_preferences: ^2.2.3 # Can be removed after migrating phase
-  studyu_core: ^4.4.1
+  studyu_core: ^4.4.2-dev.0
   supabase_flutter: ^2.5.2
   synchronized: ^3.1.0+1
   uuid: ^4.4.0

From 7a68007f03b1d0c49e0c50fadd77e7fc512ea882 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 29 Apr 2024 12:45:12 +0200
Subject: [PATCH 026/314] chore: lock files

---
 app/pubspec.lock            | 4 ++--
 designer_v2/pubspec.lock    | 4 ++--
 flutter_common/pubspec.lock | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index 19dda25f1..c1d20a32e 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -1176,14 +1176,14 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.1"
+    version: "4.4.2-dev.0"
   studyu_flutter_common:
     dependency: "direct main"
     description:
       path: "../flutter_common"
       relative: true
     source: path
-    version: "1.8.2"
+    version: "1.8.3-dev.0"
   supabase:
     dependency: "direct main"
     description:
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index f0cc30dea..fc33e6cb2 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -1039,14 +1039,14 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.1"
+    version: "4.4.2-dev.0"
   studyu_flutter_common:
     dependency: "direct main"
     description:
       path: "../flutter_common"
       relative: true
     source: path
-    version: "1.8.2"
+    version: "1.8.3-dev.0"
   supabase:
     dependency: "direct main"
     description:
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index bf35dd539..9c7d8768c 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -547,7 +547,7 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.1"
+    version: "4.4.2-dev.0"
   supabase:
     dependency: transitive
     description:

From e45970e09a3b639dcb0b44f31796f8b5581980f9 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 29 Apr 2024 14:33:57 +0200
Subject: [PATCH 027/314] chore: override intl: ^0.19.0

---
 app/pubspec.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index f21aa8416..d8c4269c0 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -55,6 +55,9 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
 
+dependency_overrides:
+  intl: ^0.19.0
+
 flutter:
   generate: true
   uses-material-design: true

From f7178f5158053b8a5e9b712fcdc0c508b520b27c Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 13 May 2024 14:36:30 +0200
Subject: [PATCH 028/314] docs: update docs

---
 CONTRIBUTING.md | 17 ++++++++++++++---
 README.md       |  8 ++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 508848533..fe7f35f17 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,10 +2,10 @@
 
 ## Getting Started
 
-1. Clone this repository and `cd` into it.
-2. [Setup Flutter](https://flutter.dev/docs/get-started/install)
-3. Make sure both flutter and dart are in your PATH. Run `dart --version` and
+1. [Setup Flutter](https://flutter.dev/docs/get-started/install)
+2. Make sure both flutter and dart are in your PATH. Run `dart --version` and
    `flutter --version` to check.
+3. Clone this repository and `cd` into it.
 4. Install [Melos](https://melos.invertase.dev/) by running: `dart pub global
    activate melos`. Melos is used to manage the Monorepo structure and links all
    packages.
@@ -58,6 +58,7 @@ STUDYU_SUPABASE_URL=https://efeapuvwaxtxnlkzlajv.supabase.co
 STUDYU_SUPABASE_PUBLIC_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiYW5vbiIsImlhdCI6MTYyNTUwODMyOCwiZXhwIjoxOTQxMDg0MzI4fQ.PUirsx5Zzhj3akaStc5Djid0aAVza3ELoZ5XUTqM91A
 STUDYU_PROJECT_GENERATOR_URL=https://studyu-project-generator-2zro3rzera-ew.a.run.app
 STUDYU_APP_URL="https://app.studyu.health/"
+STUDYU_DESIGNER_URL="https://designer.studyu.health/"
 ```
 
 The great advantage of this new approach (compared to the previous approach
@@ -91,6 +92,16 @@ Contrary to most recommendations, we commit those generated files to Git. This
 is needed, because core is a dependency by app and designer and dependencies
 need to have all files generated, when being imported.
 
+## Code Style
+
+We use the [Effective Dart](https://dart.dev/guides/language/effective-dart)
+guidelines for Dart and Flutter. Run `melos format` to format your code and
+`melos analyze` to check for any issues. For commit messages, we use the
+[Conventional Commits](https://www.conventionalcommits.org) format. For any new
+features or bug fixes, create a new branch and open a pull request.
+
+Please make sure to follow these guidelines when contributing to the project.
+
 ## Database and Backend
 
 We are using a self-hosted instance of [Supabase](https://supabase.com/) as a
diff --git a/README.md b/README.md
index b426a3cb5..c87fd03ca 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,14 @@ research methods.
 Find out more about StudyU and start your first digital N-of-1 trial now at:
 **[StudyU.health](https://www.studyu.health)**
 
+Are you a researcher or clinician interested in conducting large-scale N-of-1
+trials on a digital basis? Then the StudyU platform is the right choice for you.
+[Contact us](https://www.studyu.health/contact) to learn more about how we can
+support your research.
+
+Are you a developer interested in contributing to the StudyU platform? Then
+check out our [contributing guidelines](CONTRIBUTING.md) to get started.
+
 ## The StudyU Platform
 
 The StudyU platform incorporates the [StudyU App](https://app.studyu.health)

From 983c1e6513b680bcd0d95d5a856508ad0ef4a884 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 11 Apr 2024 11:32:40 +0200
Subject: [PATCH 029/314] refactor: improved app config error handling

---
 core/lib/src/models/tables/app_config.dart | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/lib/src/models/tables/app_config.dart b/core/lib/src/models/tables/app_config.dart
index a4e4a5764..020097540 100644
--- a/core/lib/src/models/tables/app_config.dart
+++ b/core/lib/src/models/tables/app_config.dart
@@ -43,7 +43,14 @@ class AppConfig extends SupabaseObjectFunctions<AppConfig> {
   @override
   Map<String, dynamic> toJson() => _$AppConfigToJson(this);
 
-  static Future<AppConfig> getAppConfig() async => SupabaseQuery.getById<AppConfig>('prod');
+  static Future<AppConfig> getAppConfig() async {
+    try {
+      return await SupabaseQuery.getById<AppConfig>('prod');
+    } catch (error) {
+      throw Exception("Could not load app config. Check if the database is "
+          "running and app_config table is properly set up.");
+    }
+  }
 
   static Future<Contact> getAppContact() async {
     return (await getAppConfig()).contact;

From cbb04b6ed0997a9f1f6b108fdd3cc198fa51af14 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 13 May 2024 16:16:08 +0200
Subject: [PATCH 030/314] chore: load whole env asset folder

---
 flutter_common/lib/src/utils/env_loader.dart | 2 +-
 flutter_common/pubspec.yaml                  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/flutter_common/lib/src/utils/env_loader.dart b/flutter_common/lib/src/utils/env_loader.dart
index 7a0796e71..c4e6886a5 100644
--- a/flutter_common/lib/src/utils/env_loader.dart
+++ b/flutter_common/lib/src/utils/env_loader.dart
@@ -3,7 +3,7 @@ import 'package:studyu_core/env.dart' as env;
 import 'package:studyu_flutter_common/src/utils/storage.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 
-const envsAssetPath = 'packages/studyu_flutter_common/envs';
+const envsAssetPath = 'packages/studyu_flutter_common/lib/envs';
 
 // load env from envs/.env or from the filename specified in the STUDYU_ENV runtime-variable
 String envFilePath() {
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index bf12523c3..95d68592f 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -26,5 +26,4 @@ dev_dependencies:
 flutter:
   generate: true
   assets:
-    - packages/studyu_flutter_common/envs/.env
-    - packages/studyu_flutter_common/envs/.env.dev
+    - lib/envs/

From d7e843491dd7078c05e2b6e1582f65f060ed0b4d Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 13 May 2024 16:27:39 +0200
Subject: [PATCH 031/314] chore: refactor melos scripts for dev

---
 melos.yaml | 64 +++++++++---------------------------------------------
 1 file changed, 10 insertions(+), 54 deletions(-)

diff --git a/melos.yaml b/melos.yaml
index 16c3c92b1..26004f38a 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -76,21 +76,21 @@ scripts:
     packageFilters:
       scope: studyu_core
 
-  dev:designer:
+  dev:app:
     run: |
       melos exec -c 1 -- \
-        "flutter run -d chrome --web-port 3001 --dart-define=STUDYU_ENV=.env.local"
+        "flutter run -d chrome --web-port 8080 --dart-define=STUDYU_ENV=.env.local"
     packageFilters:
-      scope: studyu_designer_v2
-    description: Runs designer in Chrome on port 3001 with local env for local development
+      scope: studyu_app
+    description: Runs app for local development
 
-  dev:app:
+  dev:designer:
     run: |
       melos exec -c 1 -- \
-        "flutter run --dart-define=STUDYU_ENV=.env.local"
+        "flutter run -d chrome --web-port 8081 --dart-define=STUDYU_ENV=.env.local"
     packageFilters:
-      scope: studyu_app
-    description: Runs app with local env for local development
+      scope: studyu_designer_v2
+    description: Runs designer for local development
 
   build:android:
     run: |
@@ -125,54 +125,10 @@ scripts:
     packageFilters:
       scope: studyu_app
 
-  build:web:designer_v2:
+  build:web:designer:
     run: |
       melos exec -c 1 --fail-fast -- \
         "flutter build web"
-    description: Build designer_v2 for Web.
-    packageFilters:
-      scope: studyu_designer_v2
-
-  build:web:dev:
-    run: |
-      melos exec -c 2 --fail-fast -- \
-        "flutter build web --web-renderer auto --dart-define=STUDYU_ENV=.env.dev"
-    description: Build web dev.
-    packageFilters:
-      scope: [studyu_app, studyu_designer_v2]
-      dir-exists: web
-
-  build:web:app:dev:
-    run: |
-      melos exec -c 2 --fail-fast -- \
-        "flutter build web --web-renderer auto --dart-define=STUDYU_ENV=.env.dev"
-    description: Build web app dev.
-    packageFilters:
-      scope: studyu_app
-      dir-exists: web
-
-  build:web:designer_v2:dev:
-    run: |
-      melos exec -c 2 --fail-fast -- \
-        "flutter build web --web-renderer auto --dart-define=STUDYU_ENV=.env.dev"
-    description: Build web designer_v2 dev.
-    packageFilters:
-      scope: studyu_designer_v2
-      dir-exists: web
-
-  # Used to test Designer "Try out study" feature, where the designer opens the App using the user auth token from designer
-  app:web:local:
-    run: |
-      melos exec -c 1 -- \
-        "flutter run lib/main.dart -d chrome --web-port 8080 --dart-define=STUDYU_ENV=.env.local"
-    packageFilters:
-      scope: studyu_app
-    description: Runs app in chrome on port 8080 with local env
-
-  designer_v2:web:local:
-    run: |
-      melos exec -c 1 -- \
-        "flutter run lib/main.dart -d chrome --web-port 8081 --dart-define=STUDYU_ENV=.env.local"
+    description: Build designer for Web.
     packageFilters:
       scope: studyu_designer_v2
-    description: Runs designer in chrome on port 8081 with local env

From 04a708643f5068e0f84283f5759689e4ac92f345 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 26 Apr 2024 10:40:21 +0200
Subject: [PATCH 032/314] chore: add reset melos script

---
 melos.yaml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/melos.yaml b/melos.yaml
index 26004f38a..eceeb013b 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -8,16 +8,6 @@ packages:
   - core
   - flutter_common
 
-command:
-  clean:
-    hooks:
-      # Clean things very deeply, can be used to establish "pristine checkout" status
-      pre: >
-        git clean -x -d -f -q || true
-      # Additional cleanup lifecycle script, executed when `melos clean` is ran.
-      post: >
-        melos exec --flutter --concurrency=3 -- "flutter clean"
-
 scripts:
   analyze:
     run: |
@@ -76,6 +66,14 @@ scripts:
     packageFilters:
       scope: studyu_core
 
+  reset:
+    run: |
+      git clean -x -d -f -q || true
+      melos clean
+      melos exec --flutter --concurrency=1 -- "flutter clean"
+      melos bootstrap
+    description: Reset the workspace to a pristine checkout status.
+
   dev:app:
     run: |
       melos exec -c 1 -- \

From e278abfa3647624e462b4856cfe43833a8c32ae0 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 13 May 2024 16:34:44 +0200
Subject: [PATCH 033/314] chore: upgrade deps

---
 app/pubspec.lock            | 96 ++++++++++++++++++-------------------
 app/pubspec.yaml            | 18 +++----
 core/pubspec.lock           | 12 ++---
 core/pubspec.yaml           |  6 +--
 designer_v2/pubspec.lock    | 76 ++++++++++++++---------------
 designer_v2/pubspec.yaml    | 12 ++---
 flutter_common/pubspec.lock | 52 ++++++++++----------
 flutter_common/pubspec.yaml |  4 +-
 pubspec.lock                | 16 +++----
 pubspec.yaml                |  2 +-
 10 files changed, 147 insertions(+), 147 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index c1d20a32e..d8c5b9b1e 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -93,10 +93,10 @@ packages:
     dependency: "direct main"
     description:
       name: camera
-      sha256: "9499cbc2e51d8eb0beadc158b288380037618ce4e30c9acbc4fae1ac3ecb5797"
+      sha256: dfa8fc5a1adaeb95e7a54d86a5bd56f4bb0e035515354c8ac6d262e35cec2ec8
       url: "https://pub.dev"
     source: hosted
-    version: "0.10.5+9"
+    version: "0.10.6"
   camera_android:
     dependency: transitive
     description:
@@ -277,10 +277,10 @@ packages:
     dependency: "direct main"
     description:
       name: fl_chart
-      sha256: "2b7c1f5d867da9a054661641c8f499c55c47c39acccb97b3bc673f5fa9a39e74"
+      sha256: d0f0d49112f2f4b192481c16d05b6418bd7820e021e265a3c22db98acf7ed7fb
       url: "https://pub.dev"
     source: hosted
-    version: "0.67.0"
+    version: "0.68.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -322,18 +322,18 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1"
+      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "4.0.0"
   flutter_local_notifications:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: "8cdc719114ab1c86c64bb7a86d3a679674c3637edd229e3a994797d4a1504ce4"
+      sha256: "40e6fbd2da7dcc7ed78432c5cdab1559674b4af035fddbfb2f9a8f9c2112fcef"
       url: "https://pub.dev"
     source: hosted
-    version: "17.1.0"
+    version: "17.1.2"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
@@ -367,50 +367,50 @@ packages:
     dependency: transitive
     description:
       name: flutter_secure_storage
-      sha256: ffdbb60130e4665d2af814a0267c481bcf522c41ae2e43caf69fa0146876d685
+      sha256: c0f402067fb0498934faa6bddd670de0a3db45222e2ca9a068c6177c9a2360a4
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.0"
+    version: "9.1.1"
   flutter_secure_storage_linux:
     dependency: transitive
     description:
       name: flutter_secure_storage_linux
-      sha256: "3d5032e314774ee0e1a7d0a9f5e2793486f0dff2dd9ef5a23f4e3fb2a0ae6a9e"
+      sha256: "4d91bfc23047422cbcd73ac684bc169859ee766482517c22172c86596bf1464b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   flutter_secure_storage_macos:
     dependency: transitive
     description:
       name: flutter_secure_storage_macos
-      sha256: bd33935b4b628abd0b86c8ca20655c5b36275c3a3f5194769a7b3f37c905369c
+      sha256: "8cfa53010a294ff095d7be8fa5bb15f2252c50018d69c5104851303f3ff92510"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.1.0"
   flutter_secure_storage_platform_interface:
     dependency: transitive
     description:
       name: flutter_secure_storage_platform_interface
-      sha256: "0d4d3a5dd4db28c96ae414d7ba3b8422fd735a8255642774803b2532c9a61d7e"
+      sha256: "301f67ee9b87f04aef227f57f13f126fa7b13543c8e7a93f25c5d2d534c28a4a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.1.1"
   flutter_secure_storage_web:
     dependency: transitive
     description:
       name: flutter_secure_storage_web
-      sha256: "30f84f102df9dcdaa2241866a958c2ec976902ebdaa8883fbfe525f1f2f3cf20"
+      sha256: f4ebff989b4f07b2656fb16b47852c0aab9fed9b4ec1c70103368337bc1886a9
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.2.1"
   flutter_secure_storage_windows:
     dependency: transitive
     description:
       name: flutter_secure_storage_windows
-      sha256: "5809c66f9dd3b4b93b0a6e2e8561539405322ee767ac2f64d084e2ab5429d108"
+      sha256: b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "3.1.2"
   flutter_svg:
     dependency: transitive
     description:
@@ -441,18 +441,18 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_widget_from_html
-      sha256: "22c911b6ccf82b83e0c457d987bac4e703440fea0fc88dab24f4dfe995a5f33f"
+      sha256: b931148824bcfc24c7be6f2daeabf549e237c9e617e93cd63256d924884ce423
       url: "https://pub.dev"
     source: hosted
-    version: "0.14.11"
+    version: "0.15.0"
   flutter_widget_from_html_core:
     dependency: transitive
     description:
       name: flutter_widget_from_html_core
-      sha256: "028f4989b9ff4907466af233d50146d807772600d98a3e895662fbdb09c39225"
+      sha256: cc1d9be3d187ce668ee02091cd5442dfb050cdaf98e0ab9a4d12ad008f966979
       url: "https://pub.dev"
     source: hosted
-    version: "0.14.11"
+    version: "0.14.12"
   functions_client:
     dependency: transitive
     description:
@@ -481,10 +481,10 @@ packages:
     dependency: transitive
     description:
       name: fwfh_just_audio
-      sha256: "4962bc59cf8bbb0a77a55ff56a7b925612b0d8263bc2ede3636b9c86113cb493"
+      sha256: "209cf9644599e37b0edb6961c4f30ce80d156f5a53a50355f75fb4a22f9fdb0a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.14.2"
+    version: "0.14.3"
   fwfh_svg:
     dependency: transitive
     description:
@@ -505,10 +505,10 @@ packages:
     dependency: transitive
     description:
       name: fwfh_webview
-      sha256: b828bb5ddd4361a866cdb8f1b0de4f3348f332915ecf2f4215ba17e46c656adc
+      sha256: "63fa69577d5cbed5603cc91d6a7eca62472a852db14225da2f4ec6839c2f59e6"
       url: "https://pub.dev"
     source: hosted
-    version: "0.14.8"
+    version: "0.15.0"
   gotrue:
     dependency: transitive
     description:
@@ -625,10 +625,10 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.0"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
@@ -641,26 +641,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: d4c8f568c60af6b6daa74c80fc04411765769882600f6bf9cd4b391c96de42ce
+      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.1"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "4.0.0"
   logger:
     dependency: transitive
     description:
       name: logger
-      sha256: "8c94b8c219e7e50194efc8771cd0e9f10807d8d3e219af473d89b06cc2ee4e04"
+      sha256: af05cc8714f356fd1f3888fb6741cbe9fbe25cdb6eedbab80e1a6db21047d4a4
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   logging:
     dependency: transitive
     description:
@@ -697,10 +697,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b"
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
       url: "https://pub.dev"
     source: hosted
-    version: "1.14.0"
+    version: "1.11.0"
   mime:
     dependency: transitive
     description:
@@ -729,10 +729,10 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: "2c582551839386fa7ddbc7770658be7c0f87f388a4bff72066478f597c34d17f"
+      sha256: b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "8.0.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -1017,26 +1017,26 @@ packages:
     dependency: transitive
     description:
       name: sentry
-      sha256: "961630a4dba41cebd692612421fd3805a991ebd8ef4a8d84a6c179e6b89eaf22"
+      sha256: "1d2952d40b99da0dc4bf3ba4797e3985dd60cc61a13d0a1d2c62b02f6528441a"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "8.1.0"
   sentry_flutter:
     dependency: "direct main"
     description:
       name: sentry_flutter
-      sha256: "705da7adfcd1fb23fc8720b6e222f5e03d53f1d020cd635586c319ee323366b4"
+      sha256: "848aaccfc75f1d35d5f7e5230770761f1b2a33e604f24498200566443da1470a"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "8.1.0"
   sentry_logging:
     dependency: "direct main"
     description:
       name: sentry_logging
-      sha256: "136751f7d0428b89267fb0c5d20308cb6237148930ce3a5ff9f82c069a9ea793"
+      sha256: "86a0b30a868cd9738694ddde4b82a2ac60b1e33abdff04216dfc556ef6d56fb1"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "8.1.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -1420,10 +1420,10 @@ packages:
     dependency: "direct main"
     description:
       name: wakelock_plus
-      sha256: c8b7cc80f045533b40a0e6c9109905494e3cf32c0fbd5c62616998e0de44003f
+      sha256: "14758533319a462ffb5aa3b7ddb198e59b29ac3b02da14173a1715d65d4e6e68"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.4"
+    version: "1.2.5"
   wakelock_plus_platform_interface:
     dependency: transitive
     description:
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index d8c4269c0..0af37b3e9 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -8,25 +8,25 @@ repository: https://github.com/hpi-studyu/studyu
 environment:
   sdk: '>=3.2.0 <4.0.0'
 dependencies:
-  camera: ^0.10.5+9
+  camera: ^0.10.6
   collection: ^1.18.0
   cross_file: ^0.3.4+1
   cupertino_icons: ^1.0.8
-  fl_chart: ^0.67.0
+  fl_chart: ^0.68.0
   flutter:
     sdk: flutter
   flutter_file_dialog: ^3.0.2
-  flutter_local_notifications: ^17.1.0
+  flutter_local_notifications: ^17.1.2
   flutter_localizations:
     sdk: flutter
   flutter_timezone: ^1.0.8
   flutter_web_plugins:
     sdk: flutter
-  flutter_widget_from_html: ^0.14.11
+  flutter_widget_from_html: ^0.15.0
   intersperse: ^2.0.0
   intl: ^0.19.0
   material_design_icons_flutter: ^7.0.7296
-  package_info_plus: ^7.0.0 # wakelock_plus <= 1.2.4
+  package_info_plus: ^8.0.0
   path: ^1.9.0
   path_provider: ^2.1.3
   pdf: ^3.10.8
@@ -35,8 +35,8 @@ dependencies:
   quiver: ^3.2.1
   rainbow_color: ^2.0.1
   record: ^5.0.5
-  sentry_flutter: ^8.0.0
-  sentry_logging: ^8.0.0
+  sentry_flutter: ^8.1.0
+  sentry_logging: ^8.1.0
   shared_preferences: ^2.2.3
   studyu_core: ^4.4.2-dev.0
   studyu_flutter_common: ^1.8.3-dev.0
@@ -47,11 +47,11 @@ dependencies:
   universal_html: ^2.2.4
   url_launcher: ^6.2.6
   uuid: ^4.4.0
-  wakelock_plus: ^1.2.4
+  wakelock_plus: ^1.2.5
 
 dev_dependencies:
   flutter_launcher_icons: ^0.13.1
-  flutter_lints: ^3.0.2
+  flutter_lints: ^4.0.0
   flutter_test:
     sdk: flutter
 
diff --git a/core/pubspec.lock b/core/pubspec.lock
index cfdd1b72f..e5bb2e1a2 100644
--- a/core/pubspec.lock
+++ b/core/pubspec.lock
@@ -301,10 +301,10 @@ packages:
     dependency: "direct main"
     description:
       name: logger
-      sha256: "8c94b8c219e7e50194efc8771cd0e9f10807d8d3e219af473d89b06cc2ee4e04"
+      sha256: af05cc8714f356fd1f3888fb6741cbe9fbe25cdb6eedbab80e1a6db21047d4a4
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   logging:
     dependency: transitive
     description:
@@ -429,10 +429,10 @@ packages:
     dependency: "direct main"
     description:
       name: sentry
-      sha256: "961630a4dba41cebd692612421fd3805a991ebd8ef4a8d84a6c179e6b89eaf22"
+      sha256: "1d2952d40b99da0dc4bf3ba4797e3985dd60cc61a13d0a1d2c62b02f6528441a"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "8.1.0"
   shelf:
     dependency: transitive
     description:
@@ -573,10 +573,10 @@ packages:
     dependency: "direct dev"
     description:
       name: test
-      sha256: d72b538180efcf8413cd2e4e6fcc7ae99c7712e0909eb9223f9da6e6d0ef715f
+      sha256: d11b55850c68c1f6c0cf00eabded4e66c4043feaf6c0d7ce4a36785137df6331
       url: "https://pub.dev"
     source: hosted
-    version: "1.25.4"
+    version: "1.25.5"
   test_api:
     dependency: transitive
     description:
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index 457b30aca..64ab17b22 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -11,9 +11,9 @@ dependencies:
   collection: ^1.18.0
   csv: ^6.0.0
   json_annotation: ^4.9.0
-  logger: ^2.2.0
+  logger: ^2.3.0
   quiver: ^3.2.1
-  sentry: ^8.0.0
+  sentry: ^8.1.0
   supabase: ^2.1.2
   uuid: ^4.4.0
 
@@ -21,4 +21,4 @@ dev_dependencies:
   build_runner: ^2.4.9
   json_serializable: ^6.8.0
   lint: ^2.3.0
-  test: ^1.25.4
+  test: ^1.25.5
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index fc33e6cb2..c98bfe6dc 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -37,10 +37,10 @@ packages:
     dependency: "direct main"
     description:
       name: archive
-      sha256: "0763b45fa9294197a2885c8567927e2830ade852e5c896fd4ab7e0e348d0f373"
+      sha256: ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265
       url: "https://pub.dev"
     source: hosted
-    version: "3.5.0"
+    version: "3.5.1"
   args:
     dependency: transitive
     description:
@@ -271,10 +271,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1"
+      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "4.0.0"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -292,50 +292,50 @@ packages:
     dependency: transitive
     description:
       name: flutter_secure_storage
-      sha256: ffdbb60130e4665d2af814a0267c481bcf522c41ae2e43caf69fa0146876d685
+      sha256: c0f402067fb0498934faa6bddd670de0a3db45222e2ca9a068c6177c9a2360a4
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.0"
+    version: "9.1.1"
   flutter_secure_storage_linux:
     dependency: transitive
     description:
       name: flutter_secure_storage_linux
-      sha256: "3d5032e314774ee0e1a7d0a9f5e2793486f0dff2dd9ef5a23f4e3fb2a0ae6a9e"
+      sha256: "4d91bfc23047422cbcd73ac684bc169859ee766482517c22172c86596bf1464b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   flutter_secure_storage_macos:
     dependency: transitive
     description:
       name: flutter_secure_storage_macos
-      sha256: bd33935b4b628abd0b86c8ca20655c5b36275c3a3f5194769a7b3f37c905369c
+      sha256: "8cfa53010a294ff095d7be8fa5bb15f2252c50018d69c5104851303f3ff92510"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.1.0"
   flutter_secure_storage_platform_interface:
     dependency: transitive
     description:
       name: flutter_secure_storage_platform_interface
-      sha256: "0d4d3a5dd4db28c96ae414d7ba3b8422fd735a8255642774803b2532c9a61d7e"
+      sha256: "301f67ee9b87f04aef227f57f13f126fa7b13543c8e7a93f25c5d2d534c28a4a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.1.1"
   flutter_secure_storage_web:
     dependency: transitive
     description:
       name: flutter_secure_storage_web
-      sha256: "30f84f102df9dcdaa2241866a958c2ec976902ebdaa8883fbfe525f1f2f3cf20"
+      sha256: f4ebff989b4f07b2656fb16b47852c0aab9fed9b4ec1c70103368337bc1886a9
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.2.1"
   flutter_secure_storage_windows:
     dependency: transitive
     description:
       name: flutter_secure_storage_windows
-      sha256: "5809c66f9dd3b4b93b0a6e2e8561539405322ee767ac2f64d084e2ab5429d108"
+      sha256: b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "3.1.2"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -387,10 +387,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: "466425a64508ca00983882f523400d9169365cb9b464e2e2419f3b6545ff9c51"
+      sha256: "81f94e16d7063b60f0da3a79f872e140d6518f306749303bf981abd7d6b46734"
       url: "https://pub.dev"
     source: hosted
-    version: "14.0.1"
+    version: "14.1.0"
   gotrue:
     dependency: transitive
     description:
@@ -456,10 +456,10 @@ packages:
     dependency: transitive
     description:
       name: intl
-      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.19.0"
+    version: "0.18.1"
   io:
     dependency: transitive
     description:
@@ -496,10 +496,10 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.0"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
@@ -512,26 +512,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: d4c8f568c60af6b6daa74c80fc04411765769882600f6bf9cd4b391c96de42ce
+      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.1"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "4.0.0"
   logger:
     dependency: transitive
     description:
       name: logger
-      sha256: "8c94b8c219e7e50194efc8771cd0e9f10807d8d3e219af473d89b06cc2ee4e04"
+      sha256: af05cc8714f356fd1f3888fb6741cbe9fbe25cdb6eedbab80e1a6db21047d4a4
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   logging:
     dependency: transitive
     description:
@@ -568,10 +568,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b"
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
       url: "https://pub.dev"
     source: hosted
-    version: "1.14.0"
+    version: "1.11.0"
   mime:
     dependency: transitive
     description:
@@ -696,10 +696,10 @@ packages:
     dependency: "direct main"
     description:
       name: pointer_interceptor
-      sha256: bd18321519718678d5fa98ad3a3359cbc7a31f018554eab80b73d08a7f0c165a
+      sha256: d0a8e660d1204eaec5bd34b34cc92174690e076d2e4f893d9d68c486a13b07c4
       url: "https://pub.dev"
     source: hosted
-    version: "0.10.1"
+    version: "0.10.1+1"
   pointer_interceptor_ios:
     dependency: transitive
     description:
@@ -784,10 +784,10 @@ packages:
     dependency: "direct main"
     description:
       name: reactive_forms
-      sha256: "10771b3b8f7df3dc6942928cc55b2abb49c0a5eb56ca8ab1ff4084b2bd968044"
+      sha256: "9b1fb18e0aae9c50cfa0aaabaaa38bc4d78eefc9b7b95fa9c947b051f6524b8e"
       url: "https://pub.dev"
     source: hosted
-    version: "17.0.0"
+    version: "17.0.1"
   reactive_multi_select_flutter:
     dependency: "direct main"
     description:
@@ -800,10 +800,10 @@ packages:
     dependency: "direct main"
     description:
       name: reactive_range_slider
-      sha256: b493aaf682a7bb0800b582951e63cbba92563c3361164b566a377e498dc8cfd5
+      sha256: becdfbacd56e405a9e64afcf34e100dc2f593bf9d7b1fb2407eb0f542420fd62
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.1.0"
   realtime_client:
     dependency: transitive
     description:
@@ -856,10 +856,10 @@ packages:
     dependency: transitive
     description:
       name: sentry
-      sha256: "961630a4dba41cebd692612421fd3805a991ebd8ef4a8d84a6c179e6b89eaf22"
+      sha256: "1d2952d40b99da0dc4bf3ba4797e3985dd60cc61a13d0a1d2c62b02f6528441a"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "8.1.0"
   shared_preferences:
     dependency: transitive
     description:
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 294c1a8d1..e31b647df 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
   sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
-  archive: ^3.5.0
+  archive: ^3.5.1
   async: ^2.11.0
   csv: ^6.0.0
   cupertino_icons: ^1.0.8
@@ -23,14 +23,14 @@ dependencies:
   flutter_riverpod: ^2.5.1
   flutter_web_plugins:
     sdk: flutter
-  go_router: ^14.0.1
+  go_router: ^14.1.0
   material_color_utilities:
   material_design_icons_flutter: ^7.0.7296
-  pointer_interceptor: ^0.10.1
+  pointer_interceptor: ^0.10.1+1
   reactive_color_picker: ^2.0.1
-  reactive_forms: ^17.0.0
+  reactive_forms: ^17.0.1
   reactive_multi_select_flutter: ^2.0.1
-  reactive_range_slider: ^2.0.1
+  reactive_range_slider: ^2.1.0
   rxdart: ^0.27.7
   studyu_core: ^4.4.2-dev.0
   studyu_flutter_common: ^1.8.3-dev.0
@@ -42,7 +42,7 @@ dependencies:
 dev_dependencies:
   custom_lint:
   flutter_launcher_icons: ^0.13.1
-  flutter_lints: ^3.0.2
+  flutter_lints: ^4.0.0
   flutter_test:
     sdk: flutter
   integration_test:
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index 9c7d8768c..d9ab74a12 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -114,58 +114,58 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1"
+      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "4.0.0"
   flutter_secure_storage:
     dependency: "direct main"
     description:
       name: flutter_secure_storage
-      sha256: ffdbb60130e4665d2af814a0267c481bcf522c41ae2e43caf69fa0146876d685
+      sha256: c0f402067fb0498934faa6bddd670de0a3db45222e2ca9a068c6177c9a2360a4
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.0"
+    version: "9.1.1"
   flutter_secure_storage_linux:
     dependency: transitive
     description:
       name: flutter_secure_storage_linux
-      sha256: "3d5032e314774ee0e1a7d0a9f5e2793486f0dff2dd9ef5a23f4e3fb2a0ae6a9e"
+      sha256: "4d91bfc23047422cbcd73ac684bc169859ee766482517c22172c86596bf1464b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   flutter_secure_storage_macos:
     dependency: transitive
     description:
       name: flutter_secure_storage_macos
-      sha256: bd33935b4b628abd0b86c8ca20655c5b36275c3a3f5194769a7b3f37c905369c
+      sha256: "8cfa53010a294ff095d7be8fa5bb15f2252c50018d69c5104851303f3ff92510"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.1.0"
   flutter_secure_storage_platform_interface:
     dependency: transitive
     description:
       name: flutter_secure_storage_platform_interface
-      sha256: "0d4d3a5dd4db28c96ae414d7ba3b8422fd735a8255642774803b2532c9a61d7e"
+      sha256: "301f67ee9b87f04aef227f57f13f126fa7b13543c8e7a93f25c5d2d534c28a4a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.1.1"
   flutter_secure_storage_web:
     dependency: transitive
     description:
       name: flutter_secure_storage_web
-      sha256: "30f84f102df9dcdaa2241866a958c2ec976902ebdaa8883fbfe525f1f2f3cf20"
+      sha256: f4ebff989b4f07b2656fb16b47852c0aab9fed9b4ec1c70103368337bc1886a9
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.2.1"
   flutter_secure_storage_windows:
     dependency: transitive
     description:
       name: flutter_secure_storage_windows
-      sha256: "5809c66f9dd3b4b93b0a6e2e8561539405322ee767ac2f64d084e2ab5429d108"
+      sha256: b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "3.1.2"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -244,10 +244,10 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.0"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
@@ -260,26 +260,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: d4c8f568c60af6b6daa74c80fc04411765769882600f6bf9cd4b391c96de42ce
+      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.1"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "4.0.0"
   logger:
     dependency: transitive
     description:
       name: logger
-      sha256: "8c94b8c219e7e50194efc8771cd0e9f10807d8d3e219af473d89b06cc2ee4e04"
+      sha256: af05cc8714f356fd1f3888fb6741cbe9fbe25cdb6eedbab80e1a6db21047d4a4
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   matcher:
     dependency: transitive
     description:
@@ -300,10 +300,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b"
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
       url: "https://pub.dev"
     source: hosted
-    version: "1.14.0"
+    version: "1.11.0"
   mime:
     dependency: transitive
     description:
@@ -428,10 +428,10 @@ packages:
     dependency: transitive
     description:
       name: sentry
-      sha256: "961630a4dba41cebd692612421fd3805a991ebd8ef4a8d84a6c179e6b89eaf22"
+      sha256: "1d2952d40b99da0dc4bf3ba4797e3985dd60cc61a13d0a1d2c62b02f6528441a"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "8.1.0"
   shared_preferences:
     dependency: "direct main"
     description:
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index 068a8c397..296605606 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_dotenv: ^5.1.0
-  flutter_secure_storage: ^9.0.0
+  flutter_secure_storage: ^9.1.1
   shared_preferences: ^2.2.3 # Can be removed after migrating phase
   studyu_core: ^4.4.2-dev.0
   supabase_flutter: ^2.5.2
@@ -19,7 +19,7 @@ dependencies:
   uuid: ^4.4.0
 
 dev_dependencies:
-  flutter_lints: ^3.0.2
+  flutter_lints: ^4.0.0
   flutter_test:
     sdk: flutter
 
diff --git a/pubspec.lock b/pubspec.lock
index 7435a66c5..fc4a0080a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -85,10 +85,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1"
+      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "4.0.0"
   glob:
     dependency: transitive
     description:
@@ -149,10 +149,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "4.0.0"
   matcher:
     dependency: transitive
     description:
@@ -173,10 +173,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.14.0"
+    version: "1.15.0"
   mustache_template:
     dependency: transitive
     description:
@@ -341,9 +341,9 @@ packages:
     dependency: transitive
     description:
       name: yaml_edit
-      sha256: c566f4f804215d84a7a2c377667f546c6033d5b34b4f9e60dfb09d17c4e97826
+      sha256: e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
 sdks:
   dart: ">=3.3.0 <4.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index bfc6f81d4..b8592b1e2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,6 +7,6 @@ environment:
   sdk: ">=2.18.0 <3.0.0"
 
 dev_dependencies:
-  flutter_lints: ^3.0.2
+  flutter_lints: ^4.0.0
   lint: ^2.3.0
   melos: ^6.0.0

From a4ccf86756c2e3aaf7b451cb1511c5d39283b82b Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 13 May 2024 16:38:57 +0200
Subject: [PATCH 034/314] chore: add deployment

---
 melos.yaml | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/melos.yaml b/melos.yaml
index eceeb013b..f4da45be8 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -106,6 +106,8 @@ scripts:
     packageFilters:
       dir-exists: ios
 
+  # The following scripts are used for deployment
+
   build:web:
     run: |
       melos exec -c 2 --fail-fast -- \
@@ -123,10 +125,37 @@ scripts:
     packageFilters:
       scope: studyu_app
 
-  build:web:designer:
+  build:web:designer_v2:
     run: |
       melos exec -c 1 --fail-fast -- \
         "flutter build web"
-    description: Build designer for Web.
+    description: Build designer_v2 for Web.
     packageFilters:
       scope: studyu_designer_v2
+
+  build:web:dev:
+    run: |
+      melos exec -c 2 --fail-fast -- \
+        "flutter build web --web-renderer auto --dart-define=STUDYU_ENV=.env.dev"
+    description: Build web dev.
+    packageFilters:
+      scope: [studyu_app, studyu_designer_v2]
+      dir-exists: web
+
+  build:web:app:dev:
+    run: |
+      melos exec -c 2 --fail-fast -- \
+        "flutter build web --web-renderer auto --dart-define=STUDYU_ENV=.env.dev"
+    description: Build web app dev.
+    packageFilters:
+      scope: studyu_app
+      dir-exists: web
+
+  build:web:designer_v2:dev:
+    run: |
+      melos exec -c 2 --fail-fast -- \
+        "flutter build web --web-renderer auto --dart-define=STUDYU_ENV=.env.dev"
+    description: Build web designer_v2 dev.
+    packageFilters:
+      scope: studyu_designer_v2
+      dir-exists: web

From d54cb6d927f37509f95af73f0c8927abeec558e9 Mon Sep 17 00:00:00 2001
From: StudyU Documenter <studyu-documenter>
Date: Mon, 13 May 2024 14:39:19 +0000
Subject: [PATCH 035/314] docs: update UML documentation

---
 .../shared/questionnaire/question/uml.svg     | 1102 ++--
 .../design/shared/questionnaire/uml.svg       | 1222 ++--
 .../lib/features/design/shared/uml.svg        | 1454 ++---
 .../designer_v2/lib/features/design/uml.svg   | 5816 ++++++++---------
 4 files changed, 4797 insertions(+), 4797 deletions(-)

diff --git a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/uml.svg b/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/uml.svg
index 13434ccb4..557598554 100644
--- a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/uml.svg
+++ b/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/uml.svg
@@ -1,111 +1,5 @@
-<svg version="1.1" baseProfile="full" width="4795.5" height="2073.0" viewbox="0 0 4795.5 2073" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[SurveyQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
-	]
-	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
-	
-	[QuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
-	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
-	]
-	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
-	
-	[&lt;abstract&gt;QuestionFormData
+<svg version="1.1" baseProfile="full" width="4932.3" height="2073.0" viewbox="0 0 4932.25 2073" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[&lt;abstract&gt;QuestionFormData
 	  |
 	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
 	  +questionId: String;
@@ -215,17 +109,15 @@
 	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
 	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
 	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
+	[AudioRecordingQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
 	]
 	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
+	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
 	
 	[FreeTextQuestionFormView
 	  |
@@ -240,16 +132,6 @@
 	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
 	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
 	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
 	[SurveyQuestionType
 	  |
 	  +index: int;
@@ -265,15 +147,27 @@
 	[SurveyQuestionType]o-[SurveyQuestionType]
 	[Enum]&lt;:--[SurveyQuestionType]
 	
-	[AudioRecordingQuestionFormView
+	[ImageCapturingQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel
 	  |
 	  +Widget build()
 	]
 	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
+	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
+	
+	[&lt;abstract&gt;IScaleQuestionFormViewModel
+	  |
+	  +isMidValuesClearedInfoVisible: bool
+	]
+	
+	[ScaleQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	]
+	
+	[ScaleQuestionFormView]o-[QuestionFormViewModel]
 	
 	[ChoiceQuestionFormView
 	  |
@@ -285,263 +179,278 @@
 	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
 	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
 	
-	[ImageCapturingQuestionFormView
+	[BoolQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel
 	  |
 	  +Widget build()
 	]
 	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
+	[BoolQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
+	
+	[QuestionFormViewModel
+	  |
+	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
+	  -_titles: Map&lt;FormMode, String Function()&gt;?;
+	  +questionIdControl: FormControl&lt;String&gt;;
+	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
+	  +questionTextControl: FormControl&lt;String&gt;;
+	  +questionInfoTextControl: FormControl&lt;String&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
+	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +customOptionsMin: int;
+	  +customOptionsMax: int;
+	  +customOptionsInitial: int;
+	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
+	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
+	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
+	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
+	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
+	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
+	  &lt;static&gt;+kDefaultScaleMinValue: int;
+	  &lt;static&gt;+kDefaultScaleMaxValue: int;
+	  &lt;static&gt;+kNumMidValueControls: int;
+	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
+	  +scaleMinValueControl: FormControl&lt;int&gt;;
+	  +scaleMaxValueControl: FormControl&lt;int&gt;;
+	  -_scaleRangeControl: FormControl&lt;int&gt;;
+	  +scaleMinLabelControl: FormControl&lt;String&gt;;
+	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
+	  +scaleMidValueControls: FormArray&lt;int&gt;;
+	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
+	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
+	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
+	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
+	  +prevMidValues: List&lt;int?&gt;?;
+	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
+	  +customRegexControl: FormControl&lt;String&gt;;
+	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
+	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
+	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
+	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
+	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
+	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
+	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +form: FormGroup;
+	  +questionId: String;
+	  +questionType: SurveyQuestionType;
+	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
+	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
+	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +validAnswerOptions: List&lt;String&gt;;
+	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +scaleMinValue: int;
+	  +scaleMaxValue: int;
+	  +scaleRange: int;
+	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +questionTextRequired: dynamic;
+	  +numValidChoiceOptions: dynamic;
+	  +scaleRangeValid: dynamic;
+	  +maxRecordingDurationValid: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +isAddOptionButtonVisible: bool;
+	  +isMidValuesClearedInfoVisible: bool
+	  |
+	  +String? scaleMidLabelAt();
+	  -dynamic _onScaleRangeChanged();
+	  -dynamic _applyInputFormatters();
+	  -dynamic _updateScaleMidValueControls();
+	  -Map&lt;String, dynamic&gt;? _validateFreeText();
+	  -dynamic _onFreeTextLengthChanged();
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +dynamic onQuestionTypeChanged();
+	  +dynamic onResponseOptionsChanged();
+	  -void _updateFormControls();
+	  +void initControls();
+	  +void setControlsFrom();
+	  +QuestionFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem();
+	  +dynamic save();
+	  +QuestionFormViewModel createDuplicate()
+	]
+	
+	[QuestionFormViewModel]o-[SurveyQuestionType]
+	[QuestionFormViewModel]o-[FormControl]
+	[QuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
+	[QuestionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
+	
+	[SurveyQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel;
+	  +isHtmlStyleable: bool
+	]
+	
+	[SurveyQuestionFormView]o-[QuestionFormViewModel]
 	
 	</desc>
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="2073.0" width="4795.5" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="2073.0" width="4932.3" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M2987.0 228.2 L2987 260 L1955.5 722.0959037711314 L1955.5 722.1 " fill="none"></path>
+				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
+					<path d="M1543.4 1087.1 L2528.25 1638 L3865.75 1782.4042132982224 L3865.8 1782.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2992.3 218.8 L2987.0 228.2 L2981.7 218.8 L2987.0 209.5 Z"></path>
+						<path d="M1537.9 1077.9 L1543.4 1087.1 L1532.7 1087.2 L1527.1 1078.0 Z"></path>
 					</g>
-					<path d="M930.0 1521.2 L824 1638 L814.1829268292682 1718.5 L814.2 1718.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M940.2 1517.9 L930.0 1521.2 L932.3 1510.7 L942.5 1507.4 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M1296.5 199.8 L1296.5 260 L1296.5 820 L1296.5 820.0 " fill="none"></path>
 					</g>
-					<path d="M1133.4 1635.0 L1132 1638 L1132 1786.5 L1132.0 1786.5 " fill="none"></path>
+					<path d="M1301.8 199.8 L1296.5 199.8 L1291.2 199.8 L1296.5 186.5 Z"></path>
+					<path d="M1513.7 1085.1 L2396 1638 L2396 1718 L2396.0 1718.0 " fill="none"></path>
+					<path d="M1516.5 1080.6 L1513.7 1085.1 L1510.8 1089.6 L1502.4 1078.0 Z"></path>
+					<path d="M1435.4 1087.4 L1988 1638 L1988 1733 L1988.0 1733.0 " fill="none"></path>
+					<path d="M1439.2 1083.6 L1435.4 1087.4 L1431.6 1091.2 L1426.0 1078.0 Z"></path>
+					<path d="M1341.6 1090.7 L1516 1638 L1516 1733 L1516.0 1733.0 " fill="none"></path>
+					<path d="M1346.7 1089.1 L1341.6 1090.7 L1336.6 1092.3 L1337.6 1078.0 Z"></path>
+					<path d="M1236.5 1090.3 L1004 1638 L1004 1725.5 L1004.0 1725.5 " fill="none"></path>
+					<path d="M1241.4 1092.4 L1236.5 1090.3 L1231.6 1088.2 L1241.7 1078.0 Z"></path>
+					<path d="M556.0 1964.7 L556 1966 L556 1986 L556.0 1986.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1142.1 1628.7 L1133.4 1635.0 L1132.5 1624.2 L1141.2 1618.0 Z"></path>
+						<path d="M561.3 1955.3 L556.0 1964.7 L550.7 1955.3 L556.0 1946.0 Z"></path>
 					</g>
-					<path d="M1289.7 1636.2 L1289.25 1638 L1289.25 1786.5 L1289.3 1786.5 " fill="none"></path>
+					<path d="M1148.1 1087.1 L556 1638 L556 1658 L556.0 1658.0 " fill="none"></path>
+					<path d="M1151.7 1091.0 L1148.1 1087.1 L1144.5 1083.2 L1157.9 1078.0 Z"></path>
+					<path d="M172.0 1904.7 L172 1966 L172 1986 L172.0 1986.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1297.0 1628.3 L1289.7 1636.2 L1286.6 1625.9 L1293.9 1618.0 Z"></path>
+						<path d="M177.3 1895.3 L172.0 1904.7 L166.7 1895.3 L172.0 1886.0 Z"></path>
 					</g>
-					<path d="M1914.4 1633.4 L1917.5 1638 L1917.5 1786.5 L1917.5 1786.5 " fill="none"></path>
+					<path d="M1074.6 1085.0 L172 1638 L172 1718 L172.0 1718.0 " fill="none"></path>
+					<path d="M1077.4 1089.5 L1074.6 1085.0 L1071.8 1080.4 L1086.0 1078.0 Z"></path>
+					<path d="M3849.3 236.2 L3849.25 260 L3842.7768505079825 280 L3842.8 280.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1913.6 1622.7 L1914.4 1633.4 L1904.7 1628.7 L1903.9 1618.0 Z"></path>
+						<path d="M3854.6 226.8 L3849.3 236.2 L3843.9 226.8 L3849.3 217.5 Z"></path>
 					</g>
-					<path d="M1968.1 1516.7 L2079 1638 L2079 1786.5 L2079.0 1786.5 " fill="none"></path>
+					<path d="M2898.1 35.4 L3849.25 82 L3849.25 124.5 L3849.3 124.5 " fill="none"></path>
+					<path d="M2898.3 30.1 L2898.1 35.4 L2897.8 40.7 L2884.8 34.7 Z"></path>
+					<path d="M3457.3 258.7 L3457.25 260 L3462.1556603773583 280 L3462.2 280.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1965.7 1506.2 L1968.1 1516.7 L1957.9 1513.4 L1955.5 1502.9 Z"></path>
-					</g>
-					<path d="M2663.5 199.8 L2663.5 260 L1955.5 661.6566488266776 L1955.5 661.7 " fill="none"></path>
-					<path d="M2668.8 199.8 L2663.5 199.8 L2658.2 199.8 L2663.5 186.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M2434.0 199.8 L2434 260 L1955.5 594.7071065989848 L1955.5 594.7 " fill="none"></path>
+						<path d="M3462.6 249.3 L3457.3 258.7 L3451.9 249.3 L3457.3 240.0 Z"></path>
 					</g>
-					<path d="M2439.3 199.8 L2434.0 199.8 L2428.7 199.8 L2434.0 186.5 Z"></path>
-					<path d="M3006.3 1082.5 L784 1638 L793.8170731707318 1718.5 L793.8 1718.5 " fill="none"></path>
+					<path d="M2898.0 38.0 L3457.25 82 L3457.25 102 L3457.3 102.0 " fill="none"></path>
+					<path d="M2898.5 32.7 L2898.0 38.0 L2897.6 43.3 L2884.8 37.0 Z"></path>
+					<path d="M4246.8 1747.9 L4355.083333333334 1718.5 L4386.666666666666 1718.5 L4386.666666666666 1718.5 L4418.25 1802 L4418.25 1802 L4386.666666666666 1885.5 L4386.666666666666 1885.5 L4355.083333333334 1885.5 L4355.083333333334 1885.5 L4228.75 1851.2319978343257 L4228.8 1851.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3016.6 1085.4 L3006.3 1082.5 L3014.1 1075.1 L3024.4 1078.0 Z"></path>
+						<path d="M4236.4 1745.2 L4246.8 1747.9 L4239.2 1755.5 L4228.8 1752.8 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3540.5 199.8 L3540.5 260 L3540.5 820 L3540.5 820.0 " fill="none"></path>
+						<path d="M4229.8 977.8 L4229.75 1638 L4140.169207317073 1718.5 L4140.2 1718.5 " fill="none"></path>
 					</g>
-					<path d="M3545.8 199.8 L3540.5 199.8 L3535.2 199.8 L3540.5 186.5 Z"></path>
-					<path d="M3304.8 1084.7 L2343.5 1638 L2343.5 1718 L2343.5 1718.0 " fill="none"></path>
-					<path d="M3307.5 1089.3 L3304.8 1084.7 L3302.2 1080.0 L3316.4 1078.0 Z"></path>
-					<path d="M3382.7 1086.8 L2751.5 1638 L2751.5 1733 L2751.5 1733.0 " fill="none"></path>
-					<path d="M3386.2 1090.8 L3382.7 1086.8 L3379.2 1082.8 L3392.8 1078.0 Z"></path>
-					<path d="M3475.6 1090.1 L3223.5 1638 L3223.5 1733 L3223.5 1733.0 " fill="none"></path>
-					<path d="M3480.4 1092.3 L3475.6 1090.1 L3470.7 1087.9 L3481.1 1078.0 Z"></path>
-					<path d="M3580.6 1090.8 L3735.5 1638 L3735.5 1725.5 L3735.5 1725.5 " fill="none"></path>
-					<path d="M3585.8 1089.4 L3580.6 1090.8 L3575.5 1092.3 L3577.0 1078.0 Z"></path>
-					<path d="M4183.5 1964.7 L4183.5 1966 L4183.5 1986 L4183.5 1986.0 " fill="none"></path>
+					<path d="M4235.1 977.8 L4229.8 977.8 L4224.4 977.8 L4229.8 964.5 Z"></path>
+					<path d="M2673.3 236.2 L2673.25 260 L3119.75 582.8105981112277 L3119.8 582.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4188.8 1955.3 L4183.5 1964.7 L4178.2 1955.3 L4183.5 1946.0 Z"></path>
+						<path d="M2678.6 226.8 L2673.3 236.2 L2667.9 226.8 L2673.3 217.5 Z"></path>
 					</g>
-					<path d="M3670.0 1087.7 L4183.5 1638 L4183.5 1658 L4183.5 1658.0 " fill="none"></path>
-					<path d="M3673.9 1084.1 L3670.0 1087.7 L3666.1 1091.4 L3660.9 1078.0 Z"></path>
-					<path d="M4567.5 1904.7 L4567.5 1966 L4567.5 1986 L4567.5 1986.0 " fill="none"></path>
+					<path d="M2755.1 51.2 L2673.25 82 L2673.25 124.5 L2673.3 124.5 " fill="none"></path>
+					<path d="M2757.0 56.2 L2755.1 51.2 L2753.2 46.2 L2767.6 46.5 Z"></path>
+					<path d="M3065.3 220.7 L3065.25 260 L3119.75 326.93493761140815 L3119.8 326.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4572.8 1895.3 L4567.5 1904.7 L4562.2 1895.3 L4567.5 1886.0 Z"></path>
+						<path d="M3070.6 211.3 L3065.3 220.7 L3059.9 211.3 L3065.3 202.0 Z"></path>
 					</g>
-					<path d="M3743.9 1085.4 L4567.5 1638 L4567.5 1718 L4567.5 1718.0 " fill="none"></path>
-					<path d="M3746.8 1081.0 L3743.9 1085.4 L3740.9 1089.9 L3732.8 1078.0 Z"></path>
-					<path d="M2136.0 220.7 L2136 260 L1955.5 441.0254730713246 L1955.5 441.0 " fill="none"></path>
+					<path d="M2281.3 236.2 L2281.25 260 L3119.75 689.5364312267658 L3119.8 689.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2141.3 211.3 L2136.0 220.7 L2130.7 211.3 L2136.0 202.0 Z"></path>
+						<path d="M2286.6 226.8 L2281.3 236.2 L2275.9 226.8 L2281.3 217.5 Z"></path>
 					</g>
-					<path d="M1744.0 258.7 L1744 260 L1735.4368650217707 280 L1735.4 280.0 " fill="none"></path>
+					<path d="M2719.5 39.6 L2281.25 82 L2281.25 124.5 L2281.3 124.5 " fill="none"></path>
+					<path d="M2720.0 44.9 L2719.5 39.6 L2719.0 34.3 L2732.8 38.3 Z"></path>
+					<path d="M1561.5 236.2 L1561.5 260 L3119.75 779.982685555152 L3119.8 780.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1749.3 249.3 L1744.0 258.7 L1738.7 249.3 L1744.0 240.0 Z"></path>
+						<path d="M1566.8 226.8 L1561.5 236.2 L1556.2 226.8 L1561.5 217.5 Z"></path>
 					</g>
-					<path d="M945.8 36.1 L1744 82 L1744 102 L1744.0 102.0 " fill="none"></path>
-					<path d="M946.1 30.8 L945.8 36.1 L945.5 41.5 L932.5 35.4 Z"></path>
-					<path d="M1352.0 236.2 L1352 260 L1354.8156748911465 280 L1354.8 280.0 " fill="none"></path>
+					<path d="M2719.4 34.7 L1561.5 82 L1561.5 124.5 L1561.5 124.5 " fill="none"></path>
+					<path d="M2719.6 40.0 L2719.4 34.7 L2719.2 29.3 L2732.8 34.1 Z"></path>
+					<path d="M3959.7 1634.8 L3961.25 1638 L4003.4634146341464 1718.5 L4003.5 1718.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1357.3 226.8 L1352.0 236.2 L1346.7 226.8 L1352.0 217.5 Z"></path>
+						<path d="M3960.4 1624.1 L3959.7 1634.8 L3950.8 1628.7 L3951.5 1618.0 Z"></path>
 					</g>
-					<path d="M945.8 40.2 L1352 82 L1352 124.5 L1352.0 124.5 " fill="none"></path>
-					<path d="M946.3 34.9 L945.8 40.2 L945.2 45.5 L932.5 38.8 Z"></path>
-					<path d="M1002.9 1723.5 L1015.5 1718.5 L1023 1718.5 L1023 1718.5 L1030.5 1802 L1030.5 1802 L1023 1885.5 L1023 1885.5 L1015.5 1885.5 L1015.5 1885.5 L985.5 1873.6560283687943 L985.5 1873.7 " fill="none"></path>
+					<path d="M3920.0 1635.2 L3921.25 1638 L4463.25 1786.5179615705931 L4463.3 1786.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M992.2 1722.0 L1002.9 1723.5 L996.1 1731.9 L985.5 1730.3 Z"></path>
+						<path d="M3921.3 1624.5 L3920.0 1635.2 L3911.5 1628.7 L3912.7 1618.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M744.0 977.8 L744 1638 L773.4512195121952 1718.5 L773.5 1718.5 " fill="none"></path>
-					</g>
-					<path d="M749.3 977.8 L744.0 977.8 L738.7 977.8 L744.0 964.5 Z"></path>
-					<path d="M960.0 236.2 L960 260 L974.1944847605225 280 L974.2 280.0 " fill="none"></path>
+					<path d="M3785.6 1636.2 L3786 1638 L3777.6242378048782 1786.5 L3777.6 1786.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M965.3 226.8 L960.0 236.2 L954.7 226.8 L960.0 217.5 Z"></path>
+						<path d="M3788.7 1625.9 L3785.6 1636.2 L3778.3 1628.3 L3781.4 1618.0 Z"></path>
 					</g>
-					<path d="M899.9 52.4 L960 82 L960 124.5 L960.0 124.5 " fill="none"></path>
-					<path d="M902.3 47.6 L899.9 52.4 L897.6 57.2 L888.0 46.5 Z"></path>
-					<path d="M568.0 236.2 L568 260 L942.5 552.883654937571 L942.5 552.9 " fill="none"></path>
+					<path d="M3105.6 1395.1 L2822 1638 L2822 1786.5 L2822.0 1786.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M573.3 226.8 L568.0 236.2 L562.7 226.8 L568.0 217.5 Z"></path>
+						<path d="M3116.1 1393.0 L3105.6 1395.1 L3109.2 1384.9 L3119.8 1382.9 Z"></path>
 					</g>
-					<path d="M767.4 46.8 L568 82 L568 124.5 L568.0 124.5 " fill="none"></path>
-					<path d="M768.3 52.0 L767.4 46.8 L766.4 41.5 L780.5 44.4 Z"></path>
-					<path d="M176.0 236.2 L176 260 L942.5 674.8613511390416 L942.5 674.9 " fill="none"></path>
+					<path d="M3104.6 1321.2 L2660.5 1638 L2660.5 1786.5 L2660.5 1786.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M181.3 226.8 L176.0 236.2 L170.7 226.8 L176.0 217.5 Z"></path>
+						<path d="M3115.2 1320.1 L3104.6 1321.2 L3109.1 1311.4 L3119.8 1310.4 Z"></path>
 					</g>
-					<path d="M767.2 37.7 L176 82 L176 124.5 L176.0 124.5 " fill="none"></path>
-					<path d="M767.6 43.0 L767.2 37.7 L766.8 32.4 L780.5 36.7 Z"></path>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="2811.0" y="132.5" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M2811.0 163.5 L3163.0 163.5" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(2811, 132.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2811, 163.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
-								
-							</g>
-						</g>
+					<path d="M4172.8 199.8 L4172.75 260 L4132.75 310.4300091491308 L4132.8 310.4 " fill="none"></path>
+					<path d="M4178.1 199.8 L4172.8 199.8 L4167.4 199.8 L4172.8 186.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M4402.3 199.8 L4402.25 260 L4132.75 499.2854381443299 L4132.8 499.3 " fill="none"></path>
 					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="942.5" y="280.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M942.5 311.0 L1955.5 311.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M942.5 1332.0 L1955.5 1332.0" fill="none" data-name="QuestionFormViewModel"></path>
+					<path d="M4407.6 199.8 L4402.3 199.8 L4396.9 199.8 L4402.3 186.5 Z"></path>
+					<path d="M4700.3 228.2 L4700.25 260 L4132.75 624.066573556797 L4132.8 624.1 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M4705.6 218.8 L4700.3 228.2 L4694.9 218.8 L4700.3 209.5 Z"></path>
+					</g>
+					<g data-name="QuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
+							<rect x="712.5" y="820.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M712.5 851.0 L1880.5 851.0" fill="none" data-name="QuestionFormData"></path>
+							<path d="M712.5 987.0 L1880.5 987.0" fill="none" data-name="QuestionFormData"></path>
 						</g>
-						<g transform="translate(942.5, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
+						<g transform="translate(712.5, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
+								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(942.5, 311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(712.5, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(942.5, 1332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
+						<g transform="translate(712.5, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="SurveyQuestionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="622.5" y="1718.5" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M622.5 1749.5 L985.5 1749.5" fill="none" data-name="SurveyQuestionType"></path>
+							<rect x="3865.8" y="1718.5" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M3865.8 1749.5 L4228.8 1749.5" fill="none" data-name="SurveyQuestionType"></path>
 						</g>
-						<g transform="translate(622.5, 1718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+						<g transform="translate(3865.75, 1718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
 								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(622.5, 1749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+						<g transform="translate(3865.75, 1749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
@@ -555,113 +464,11 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="1075.5" y="1786.5" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(1075.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="1240.3" y="1786.5" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(1240.25, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="1848.5" y="1786.5" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(1848.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="2026.5" y="1786.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(2026.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="2556.0" y="155.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(2556, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="2352.0" y="155.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(2352, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="2956.5" y="820.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M2956.5 851.0 L4124.5 851.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M2956.5 987.0 L4124.5 987.0" fill="none" data-name="QuestionFormData"></path>
-						</g>
-						<g transform="translate(2956.5, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2956.5, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2956.5, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
 					<g data-name="IFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="3491.5" y="155.5" height="31.0" width="98.0" data-name="IFormData"></rect>
+							<rect x="1247.5" y="155.5" height="31.0" width="98.0" data-name="IFormData"></rect>
 						</g>
-						<g transform="translate(3491.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
+						<g transform="translate(1247.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
 								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
 								
@@ -670,17 +477,17 @@
 					</g>
 					<g data-name="ChoiceQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="2171.5" y="1718.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M2171.5 1749.0 L2515.5 1749.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M2171.5 1810.0 L2515.5 1810.0" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<rect x="2224.0" y="1718.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M2224.0 1749.0 L2568.0 1749.0" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M2224.0 1810.0 L2568.0 1810.0" fill="none" data-name="ChoiceQuestionFormData"></path>
 						</g>
-						<g transform="translate(2171.5, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(2224, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2171.5, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(2224, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
@@ -688,7 +495,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(2171.5, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(2224, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
@@ -700,24 +507,24 @@
 					</g>
 					<g data-name="BoolQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="2555.5" y="1733.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M2555.5 1764.0 L2947.5 1764.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M2555.5 1810.0 L2947.5 1810.0" fill="none" data-name="BoolQuestionFormData"></path>
+							<rect x="1792.0" y="1733.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M1792.0 1764.0 L2184.0 1764.0" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M1792.0 1810.0 L2184.0 1810.0" fill="none" data-name="BoolQuestionFormData"></path>
 						</g>
-						<g transform="translate(2555.5, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(1792, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
 								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2555.5, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(1792, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2555.5, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(1792, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
@@ -728,24 +535,24 @@
 					</g>
 					<g data-name="ImageQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="2987.5" y="1733.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M2987.5 1764.0 L3459.5 1764.0" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M2987.5 1810.0 L3459.5 1810.0" fill="none" data-name="ImageQuestionFormData"></path>
+							<rect x="1280.0" y="1733.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
+							<path d="M1280.0 1764.0 L1752.0 1764.0" fill="none" data-name="ImageQuestionFormData"></path>
+							<path d="M1280.0 1810.0 L1752.0 1810.0" fill="none" data-name="ImageQuestionFormData"></path>
 						</g>
-						<g transform="translate(2987.5, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(1280, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
 								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2987.5, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(1280, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2987.5, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(1280, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
@@ -756,17 +563,17 @@
 					</g>
 					<g data-name="AudioQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="3499.5" y="1725.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M3499.5 1756.5 L3971.5 1756.5" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M3499.5 1817.5 L3971.5 1817.5" fill="none" data-name="AudioQuestionFormData"></path>
+							<rect x="768.0" y="1725.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
+							<path d="M768.0 1756.5 L1240.0 1756.5" fill="none" data-name="AudioQuestionFormData"></path>
+							<path d="M768.0 1817.5 L1240.0 1817.5" fill="none" data-name="AudioQuestionFormData"></path>
 						</g>
-						<g transform="translate(3499.5, 1725.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(768, 1725.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
 								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3499.5, 1756.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(768, 1756.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
@@ -774,7 +581,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(3499.5, 1817.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(768, 1817.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
@@ -785,17 +592,17 @@
 					</g>
 					<g data-name="ScaleQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="4011.5" y="1658.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M4011.5 1689.0 L4355.5 1689.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M4011.5 1885.0 L4355.5 1885.0" fill="none" data-name="ScaleQuestionFormData"></path>
+							<rect x="384.0" y="1658.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M384.0 1689.0 L728.0 1689.0" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M384.0 1885.0 L728.0 1885.0" fill="none" data-name="ScaleQuestionFormData"></path>
 						</g>
-						<g transform="translate(4011.5, 1658)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(384, 1658)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4011.5, 1689)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(384, 1689)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
@@ -812,7 +619,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(4011.5, 1885)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(384, 1885)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
@@ -823,9 +630,9 @@
 					</g>
 					<g data-name="Color">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="4154.5" y="1986.0" height="31.0" width="58.0" data-name="Color"></rect>
+							<rect x="527.0" y="1986.0" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(4154.5, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+						<g transform="translate(527, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
 								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
@@ -834,17 +641,17 @@
 					</g>
 					<g data-name="FreeTextQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="4395.5" y="1718.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M4395.5 1749.0 L4739.5 1749.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M4395.5 1825.0 L4739.5 1825.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<rect x="0.0" y="1718.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M0.0 1749.0 L344.0 1749.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M0.0 1825.0 L344.0 1825.0" fill="none" data-name="FreeTextQuestionFormData"></path>
 						</g>
-						<g transform="translate(4395.5, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(0, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4395.5, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(0, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
@@ -853,7 +660,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(4395.5, 1825)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(0, 1825)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
@@ -864,71 +671,179 @@
 					</g>
 					<g data-name="FreeTextQuestionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="4469.5" y="1986.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+							<rect x="74.0" y="1986.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
 						</g>
-						<g transform="translate(4469.5, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+						<g transform="translate(74, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
 								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="431.5" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M431.5 31.0 L740.5 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
+					<g data-name="AudioRecordingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
+							<rect x="3673.3" y="124.5" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
+							<path d="M3673.3 155.5 L4025.3 155.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<path d="M3673.3 186.5 L4025.3 186.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
 						</g>
-						<g transform="translate(431.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
+						<g transform="translate(3673.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(431.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(3673.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(3673.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="1960.0" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M1960.0 171.0 L2312.0 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
+					<g data-name="QuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
+							<rect x="3119.8" y="280.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M3119.8 311.0 L4132.8 311.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M3119.8 1332.0 L4132.8 1332.0" fill="none" data-name="QuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(1960, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
+						<g transform="translate(3119.75, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
+								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1960, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(3119.75, 311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
+								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
+								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
+								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
+								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
+								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
+								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
+								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
+								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
+								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
+								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
+								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
+								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
+								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
+								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
+								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
+								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
+								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
+								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(3119.75, 1332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
+							<rect x="2732.8" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+						</g>
+						<g transform="translate(2732.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="FreeTextQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="1568.0" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M1568.0 133.0 L1920.0 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M1568.0 179.0 L1920.0 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<rect x="3281.3" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M3281.3 133.0 L3633.3 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M3281.3 179.0 L3633.3 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
 						</g>
-						<g transform="translate(1568, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(3281.25, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1568, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(3281.25, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1568, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(3281.25, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
@@ -937,124 +852,209 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="780.5" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+					<g data-name="Enum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
+							<rect x="4199.3" y="933.5" height="31.0" width="61.0" data-name="Enum"></rect>
 						</g>
-						<g transform="translate(780.5, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
+						<g transform="translate(4199.25, 933.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="1176.0" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M1176.0 155.5 L1528.0 155.5" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M1176.0 186.5 L1528.0 186.5" fill="none" data-name="BoolQuestionFormView"></path>
+					<g data-name="ImageCapturingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
+							<rect x="2497.3" y="124.5" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
+							<path d="M2497.3 155.5 L2849.3 155.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<path d="M2497.3 186.5 L2849.3 186.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
 						</g>
-						<g transform="translate(1176, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
+						<g transform="translate(2497.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1176, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(2497.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1176, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+						<g transform="translate(2497.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="713.5" y="933.5" height="31.0" width="61.0" data-name="Enum"></rect>
+					<g data-name="IScaleQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
+							<rect x="2924.8" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M2924.8 31.0 L3233.8 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(713.5, 933.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
+						<g transform="translate(2924.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
+								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="784.0" y="124.5" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M784.0 155.5 L1136.0 155.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M784.0 186.5 L1136.0 186.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(784, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
+						<g transform="translate(2924.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(784, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+					</g>
+					<g data-name="ScaleQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
+							<rect x="2889.3" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M2889.3 171.0 L3241.3 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
+						</g>
+						<g transform="translate(2889.25, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(784, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
+						<g transform="translate(2889.25, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ChoiceQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="392.0" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M392.0 155.5 L744.0 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M392.0 186.5 L744.0 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<rect x="2105.3" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M2105.3 155.5 L2457.3 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M2105.3 186.5 L2457.3 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(392, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(2105.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(392, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(2105.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(392, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(2105.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="0.0" y="124.5" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M0.0 155.5 L352.0 155.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M0.0 186.5 L352.0 186.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+					<g data-name="BoolQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
+							<rect x="1385.5" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M1385.5 155.5 L1737.5 155.5" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M1385.5 186.5 L1737.5 186.5" fill="none" data-name="BoolQuestionFormView"></path>
 						</g>
-						<g transform="translate(0, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
+						<g transform="translate(1385.5, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(1385.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
+						<g transform="translate(1385.5, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="4463.3" y="1786.5" height="31.0" width="113.0" data-name="FormControl"></rect>
+						</g>
+						<g transform="translate(4463.25, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormArray">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
+							<rect x="3727.8" y="1786.5" height="31.0" width="98.0" data-name="FormArray"></rect>
+						</g>
+						<g transform="translate(3727.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="AbstractControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
+							<rect x="2753.0" y="1786.5" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+						</g>
+						<g transform="translate(2753, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
+								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormGroup">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
+							<rect x="2608.0" y="1786.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
+						</g>
+						<g transform="translate(2608, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ManagedFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
+							<rect x="4065.3" y="155.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
+						</g>
+						<g transform="translate(4065.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
+								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="IListActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
+							<rect x="4320.3" y="155.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
+						</g>
+						<g transform="translate(4320.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="SurveyQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
+							<rect x="4524.3" y="132.5" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M4524.3 163.5 L4876.3 163.5" fill="none" data-name="SurveyQuestionFormView"></path>
+						</g>
+						<g transform="translate(4524.25, 132.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4524.25, 163.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
 								
 							</g>
 						</g>
diff --git a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/uml.svg b/docs/uml/designer_v2/lib/features/design/shared/questionnaire/uml.svg
index fc77234fa..c2db0b180 100644
--- a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/uml.svg
+++ b/docs/uml/designer_v2/lib/features/design/shared/questionnaire/uml.svg
@@ -1,109 +1,38 @@
-<svg version="1.1" baseProfile="full" width="6044.3" height="2073.0" viewbox="0 0 6044.25 2073" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[SurveyQuestionFormView
+<svg version="1.1" baseProfile="full" width="6068.5" height="2073.0" viewbox="0 0 6068.5 2073" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[&lt;abstract&gt;WithQuestionnaireControls
 	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
+	  +questionsArray: FormArray&lt;dynamic&gt;;
+	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
+	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
+	  +propagateOnSave: bool;
+	  +questionModels: List&lt;Q&gt;;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  |
+	  +void setQuestionnaireControlsFrom();
+	  +QuestionnaireFormData buildQuestionnaireFormData();
+	  +void read();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +Q provide();
+	  +Q provideQuestionFormViewModel()
 	]
 	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
 	
-	[QuestionFormViewModel
+	[QuestionnaireFormData
 	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
+	  +questionsData: List&lt;QuestionFormData&gt;?;
+	  +id: String
 	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
+	  +StudyUQuestionnaire toQuestionnaire();
+	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
+	  +QuestionnaireFormData copy()
 	]
 	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
+	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
 	
 	[&lt;abstract&gt;QuestionFormData
 	  |
@@ -215,17 +144,15 @@
 	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
 	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
 	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
+	[AudioRecordingQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
 	]
 	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
+	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
 	
 	[FreeTextQuestionFormView
 	  |
@@ -240,16 +167,6 @@
 	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
 	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
 	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
 	[SurveyQuestionType
 	  |
 	  +index: int;
@@ -265,15 +182,27 @@
 	[SurveyQuestionType]o-[SurveyQuestionType]
 	[Enum]&lt;:--[SurveyQuestionType]
 	
-	[AudioRecordingQuestionFormView
+	[ImageCapturingQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel
 	  |
 	  +Widget build()
 	]
 	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
+	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
+	
+	[&lt;abstract&gt;IScaleQuestionFormViewModel
+	  |
+	  +isMidValuesClearedInfoVisible: bool
+	]
+	
+	[ScaleQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	]
+	
+	[ScaleQuestionFormView]o-[QuestionFormViewModel]
 	
 	[ChoiceQuestionFormView
 	  |
@@ -285,410 +214,382 @@
 	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
 	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
 	
-	[ImageCapturingQuestionFormView
+	[BoolQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel
 	  |
 	  +Widget build()
 	]
 	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
+	[BoolQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
 	
-	[&lt;abstract&gt;WithQuestionnaireControls
+	[QuestionFormViewModel
 	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
+	  -_titles: Map&lt;FormMode, String Function()&gt;?;
+	  +questionIdControl: FormControl&lt;String&gt;;
+	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
+	  +questionTextControl: FormControl&lt;String&gt;;
+	  +questionInfoTextControl: FormControl&lt;String&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
+	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +customOptionsMin: int;
+	  +customOptionsMax: int;
+	  +customOptionsInitial: int;
+	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
+	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
+	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
+	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
+	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
+	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
+	  &lt;static&gt;+kDefaultScaleMinValue: int;
+	  &lt;static&gt;+kDefaultScaleMaxValue: int;
+	  &lt;static&gt;+kNumMidValueControls: int;
+	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
+	  +scaleMinValueControl: FormControl&lt;int&gt;;
+	  +scaleMaxValueControl: FormControl&lt;int&gt;;
+	  -_scaleRangeControl: FormControl&lt;int&gt;;
+	  +scaleMinLabelControl: FormControl&lt;String&gt;;
+	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
+	  +scaleMidValueControls: FormArray&lt;int&gt;;
+	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
+	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
+	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
+	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
+	  +prevMidValues: List&lt;int?&gt;?;
+	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
+	  +customRegexControl: FormControl&lt;String&gt;;
+	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
+	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
+	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
+	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
+	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
+	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
+	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +form: FormGroup;
+	  +questionId: String;
+	  +questionType: SurveyQuestionType;
+	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
+	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
+	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +validAnswerOptions: List&lt;String&gt;;
+	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +scaleMinValue: int;
+	  +scaleMaxValue: int;
+	  +scaleRange: int;
+	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +questionTextRequired: dynamic;
+	  +numValidChoiceOptions: dynamic;
+	  +scaleRangeValid: dynamic;
+	  +maxRecordingDurationValid: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +isAddOptionButtonVisible: bool;
+	  +isMidValuesClearedInfoVisible: bool
 	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
-	  +void read();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
-	]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	
-	[QuestionnaireFormData
-	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
+	  +String? scaleMidLabelAt();
+	  -dynamic _onScaleRangeChanged();
+	  -dynamic _applyInputFormatters();
+	  -dynamic _updateScaleMidValueControls();
+	  -Map&lt;String, dynamic&gt;? _validateFreeText();
+	  -dynamic _onFreeTextLengthChanged();
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +dynamic onQuestionTypeChanged();
+	  +dynamic onResponseOptionsChanged();
+	  -void _updateFormControls();
+	  +void initControls();
+	  +void setControlsFrom();
+	  +QuestionFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem();
+	  +dynamic save();
+	  +QuestionFormViewModel createDuplicate()
+	]
+	
+	[QuestionFormViewModel]o-[SurveyQuestionType]
+	[QuestionFormViewModel]o-[FormControl]
+	[QuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
+	[QuestionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
+	
+	[SurveyQuestionFormView
 	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
+	  +formViewModel: QuestionFormViewModel;
+	  +isHtmlStyleable: bool
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
+	[SurveyQuestionFormView]o-[QuestionFormViewModel]
 	
 	</desc>
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="2073.0" width="6044.3" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="2073.0" width="6068.5" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M176.0 228.2 L176 260 L3189.5 849.8583806818182 L3189.5 849.9 " fill="none"></path>
+				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
+					<path d="M1219.5 1093.6 L1575 1638 L4046.5 1798.8117437016465 L4046.5 1798.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M181.3 218.8 L176.0 228.2 L170.7 218.8 L176.0 209.5 Z"></path>
+						<path d="M1218.8 1082.9 L1219.5 1093.6 L1209.9 1088.7 L1209.3 1078.0 Z"></path>
 					</g>
-					<path d="M4219.4 1195.0 L5161.75 1638 L3591.75 1785.0054239223523 L3591.8 1785.0 " fill="none"></path>
+					<path d="M919.4 1088.5 L109.5 1638 L109.5 1786.5 L109.5 1786.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4213.2 1186.2 L4219.4 1195.0 L4208.7 1195.9 L4202.5 1187.1 Z"></path>
+						<path d="M930.1 1087.7 L919.4 1088.5 L924.2 1078.8 L934.9 1078.0 Z"></path>
 					</g>
-					<path d="M4219.3 1204.2 L5109 1638 L3972.75 1794.231398029763 L3972.8 1794.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4213.2 1195.3 L4219.3 1204.2 L4208.6 1204.9 L4202.5 1196.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M1002.5 199.8 L1002.5 260 L1102.0645863570392 820 L1102.1 820.0 " fill="none"></path>
 					</g>
-					<path d="M3696.0 1636.7 L3696 1638 L4086.4916158536585 1786.5 L4086.5 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3701.3 1627.3 L3696.0 1636.7 L3690.7 1627.3 L3696.0 1618.0 Z"></path>
+					<path d="M1007.8 199.8 L1002.5 199.8 L997.2 199.8 L1002.5 186.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M1502.3 199.8 L1502.25 260 L1195.6317126269957 820 L1195.6 820.0 " fill="none"></path>
 					</g>
-					<path d="M3176.4 1478.8 L3020.25 1638 L3681.75 1786.5092402464065 L3681.8 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3186.8 1475.8 L3176.4 1478.8 L3179.2 1468.4 L3189.5 1465.4 Z"></path>
+					<path d="M1507.6 199.8 L1502.3 199.8 L1496.9 199.8 L1502.3 186.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M2531.0 184.7 L2873 260 L2873 880 L2873.0 880.0 " fill="none"></path>
 					</g>
-					<path d="M3176.1 1449.5 L2980.25 1638 L2720.1486280487807 1786.5 L2720.1 1786.5 " fill="none"></path>
+					<path d="M2532.2 179.5 L2531.0 184.7 L2529.9 189.9 L2518.0 181.8 Z"></path>
+					<path d="M2303.6 1087.4 L3253 1638 L5192 1787.9627446356992 L5192.0 1788.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3186.5 1446.9 L3176.1 1449.5 L3179.1 1439.2 L3189.5 1436.6 Z"></path>
+						<path d="M2298.2 1078.1 L2303.6 1087.4 L2292.8 1087.3 L2287.4 1078.0 Z"></path>
 					</g>
-					<path d="M499.5 199.8 L499.5 260 L3189.5 839.8248083841702 L3189.5 839.8 " fill="none"></path>
-					<path d="M504.8 199.8 L499.5 199.8 L494.2 199.8 L499.5 186.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M729.0 199.8 L729 260 L3189.5 831.3800134816313 L3189.5 831.4 " fill="none"></path>
+						<path d="M2407.0 184.7 L2065 260 L2065 820 L2065.0 820.0 " fill="none"></path>
 					</g>
-					<path d="M734.3 199.8 L729.0 199.8 L723.7 199.8 L729.0 186.5 Z"></path>
-					<path d="M1783.5 1087.5 L2717.75 1638 L3228.75 1759.016606498195 L3228.8 1759.0 " fill="none"></path>
+					<path d="M2408.1 189.9 L2407.0 184.7 L2405.8 179.5 L2420.0 181.8 Z"></path>
+					<path d="M2230.4 1086.5 L2893.5 1638 L4485 1786.0045364332293 L4485.0 1786.0 " fill="none"></path>
+					<path d="M2233.8 1082.4 L2230.4 1086.5 L2227.0 1090.6 L2220.1 1078.0 Z"></path>
+					<path d="M2212.4 1087.1 L2800.5 1638 L2443 1743.9259259259259 L2443.0 1743.9 " fill="none"></path>
+					<path d="M2216.1 1083.2 L2212.4 1087.1 L2208.8 1091.0 L2202.7 1078.0 Z"></path>
+					<path d="M2152.8 1089.3 L2496.25 1638 L2011 1748.3376083188907 L2011.0 1748.3 " fill="none"></path>
+					<path d="M2157.3 1086.5 L2152.8 1089.3 L2148.3 1092.1 L2145.7 1078.0 Z"></path>
+					<path d="M2106.9 1090.8 L2268.5 1638 L1499 1763.5077076081552 L1499.0 1763.5 " fill="none"></path>
+					<path d="M2112.0 1089.3 L2106.9 1090.8 L2101.8 1092.3 L2103.1 1078.0 Z"></path>
+					<path d="M815.0 1964.7 L815 1966 L815 1986 L815.0 1986.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1778.2 1078.1 L1783.5 1087.5 L1772.7 1087.3 L1767.4 1078.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1502.3 192.3 L1642.5 260 L1566.099419448476 820 L1566.1 820.0 " fill="none"></path>
+						<path d="M820.3 1955.3 L815.0 1964.7 L809.7 1955.3 L815.0 1946.0 Z"></path>
 					</g>
-					<path d="M1504.7 187.5 L1502.3 192.3 L1500.0 197.1 L1490.3 186.5 Z"></path>
-					<path d="M1723.8 1086.2 L2428.5 1638 L2428.5 1718 L2428.5 1718.0 " fill="none"></path>
-					<path d="M1727.0 1082.0 L1723.8 1086.2 L1720.5 1090.4 L1713.3 1078.0 Z"></path>
-					<path d="M1644.4 1089.0 L2020.5 1638 L2020.5 1733 L2020.5 1733.0 " fill="none"></path>
-					<path d="M1648.8 1086.0 L1644.4 1089.0 L1640.0 1092.0 L1636.9 1078.0 Z"></path>
-					<path d="M1548.5 1091.3 L1548.5 1638 L1548.5 1733 L1548.5 1733.0 " fill="none"></path>
-					<path d="M1553.8 1091.3 L1548.5 1091.3 L1543.2 1091.3 L1548.5 1078.0 Z"></path>
-					<path d="M1444.7 1088.7 L1036.5 1638 L1036.5 1725.5 L1036.5 1725.5 " fill="none"></path>
-					<path d="M1449.0 1091.9 L1444.7 1088.7 L1440.4 1085.5 L1452.6 1078.0 Z"></path>
-					<path d="M588.5 1964.7 L588.5 1966 L588.5 1986 L588.5 1986.0 " fill="none"></path>
+					<path d="M2056.6 1091.3 L2024.5 1638 L987 1778.677966101695 L987.0 1778.7 " fill="none"></path>
+					<path d="M2062.0 1091.6 L2056.6 1091.3 L2051.3 1091.0 L2057.4 1078.0 Z"></path>
+					<path d="M431.0 1904.7 L431 1966 L431 1986 L431.0 1986.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M593.8 1955.3 L588.5 1964.7 L583.2 1955.3 L588.5 1946.0 Z"></path>
+						<path d="M436.3 1895.3 L431.0 1904.7 L425.7 1895.3 L431.0 1886.0 Z"></path>
 					</g>
-					<path d="M1357.9 1085.8 L588.5 1638 L588.5 1658 L588.5 1658.0 " fill="none"></path>
-					<path d="M1361.0 1090.1 L1357.9 1085.8 L1354.8 1081.4 L1368.8 1078.0 Z"></path>
-					<path d="M204.5 1904.7 L204.5 1966 L204.5 1986 L204.5 1986.0 " fill="none"></path>
+					<path d="M1973.5 1089.2 L1615 1638 L603 1778.1756756756756 L603.0 1778.2 " fill="none"></path>
+					<path d="M1977.9 1092.1 L1973.5 1089.2 L1969.0 1086.2 L1980.7 1078.0 Z"></path>
+					<path d="M4985.5 236.2 L4985.5 260 L4975.2822931785195 280 L4975.3 280.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M209.8 1895.3 L204.5 1904.7 L199.2 1895.3 L204.5 1886.0 Z"></path>
+						<path d="M4990.8 226.8 L4985.5 236.2 L4980.2 226.8 L4985.5 217.5 Z"></path>
 					</g>
-					<path d="M1285.0 1084.1 L204.5 1638 L204.5 1718 L204.5 1718.0 " fill="none"></path>
-					<path d="M1287.4 1088.8 L1285.0 1084.1 L1282.6 1079.3 L1296.9 1078.0 Z"></path>
-					<path d="M3019.5 220.7 L3019.5 260 L3189.5 433.1411677753141 L3189.5 433.1 " fill="none"></path>
+					<path d="M4094.8 35.6 L4985.5 82 L4985.5 124.5 L4985.5 124.5 " fill="none"></path>
+					<path d="M4095.1 30.3 L4094.8 35.6 L4094.5 41.0 L4081.5 35.0 Z"></path>
+					<path d="M4593.5 258.7 L4593.5 260 L4594.661103047895 280 L4594.7 280.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3024.8 211.3 L3019.5 220.7 L3014.2 211.3 L3019.5 202.0 Z"></path>
+						<path d="M4598.8 249.3 L4593.5 258.7 L4588.2 249.3 L4593.5 240.0 Z"></path>
 					</g>
-					<path d="M5225.3 258.7 L5225.25 260 L4202.5 720.7976132090894 L4202.5 720.8 " fill="none"></path>
+					<path d="M4094.8 38.7 L4593.5 82 L4593.5 102 L4593.5 102.0 " fill="none"></path>
+					<path d="M4095.2 33.4 L4094.8 38.7 L4094.3 44.1 L4081.5 37.6 Z"></path>
+					<path d="M5573.0 1747.9 L5681.333333333333 1718.5 L5712.916666666667 1718.5 L5712.916666666667 1718.5 L5744.5 1802 L5744.5 1802 L5712.916666666667 1885.5 L5712.916666666667 1885.5 L5681.333333333333 1885.5 L5681.333333333333 1885.5 L5555 1851.231997834326 L5555.0 1851.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5230.6 249.3 L5225.3 258.7 L5219.9 249.3 L5225.3 240.0 Z"></path>
+						<path d="M5562.6 1745.2 L5573.0 1747.9 L5565.4 1755.5 L5555.0 1752.8 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M5599.8 977.8 L5599.75 1638 L5488.694359756098 1718.5 L5488.7 1718.5 " fill="none"></path>
 					</g>
-					<path d="M4530.6 36.8 L5225.25 82 L5225.25 102 L5225.3 102.0 " fill="none"></path>
-					<path d="M4530.9 31.5 L4530.6 36.8 L4530.2 42.1 L4517.3 35.9 Z"></path>
-					<path d="M4833.3 236.2 L4833.25 260 L4202.5 642.1382721477248 L4202.5 642.1 " fill="none"></path>
+					<path d="M5605.1 977.8 L5599.8 977.8 L5594.4 977.8 L5599.8 964.5 Z"></path>
+					<path d="M3809.5 236.2 L3809.5 260 L4127 525.4824029126214 L4127.0 525.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4838.6 226.8 L4833.3 236.2 L4827.9 226.8 L4833.3 217.5 Z"></path>
+						<path d="M3814.8 226.8 L3809.5 236.2 L3804.2 226.8 L3809.5 217.5 Z"></path>
 					</g>
-					<path d="M4530.5 42.6 L4833.25 82 L4833.25 124.5 L4833.3 124.5 " fill="none"></path>
-					<path d="M4531.2 37.3 L4530.5 42.6 L4529.8 47.9 L4517.3 40.9 Z"></path>
-					<path d="M3609.1 1723.5 L3621.75 1718.5 L3629.25 1718.5 L3629.25 1718.5 L3636.75 1802 L3636.75 1802 L3629.25 1885.5 L3629.25 1885.5 L3621.75 1885.5 L3621.75 1885.5 L3591.75 1873.6560283687943 L3591.8 1873.7 " fill="none"></path>
+					<path d="M3933.0 49.9 L3809.5 82 L3809.5 124.5 L3809.5 124.5 " fill="none"></path>
+					<path d="M3934.4 55.0 L3933.0 49.9 L3931.7 44.7 L3945.9 46.5 Z"></path>
+					<path d="M4201.5 220.7 L4201.5 260 L4214.039912917271 280 L4214.0 280.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3598.5 1722.0 L3609.1 1723.5 L3602.4 1731.9 L3591.8 1730.3 Z"></path>
+						<path d="M4206.8 211.3 L4201.5 220.7 L4196.2 211.3 L4201.5 202.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2775.0 977.8 L2775 1638 L3228.75 1755.142857142857 L3228.8 1755.1 " fill="none"></path>
+					<path d="M3417.5 236.2 L3417.5 260 L4127 662.0111019736842 L4127.0 662.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M3422.8 226.8 L3417.5 236.2 L3412.2 226.8 L3417.5 217.5 Z"></path>
 					</g>
-					<path d="M2780.3 977.8 L2775.0 977.8 L2769.7 977.8 L2775.0 964.5 Z"></path>
-					<path d="M4441.3 236.2 L4441.25 260 L4202.5 480.72962093257297 L4202.5 480.7 " fill="none"></path>
+					<path d="M3916.2 38.7 L3417.5 82 L3417.5 124.5 L3417.5 124.5 " fill="none"></path>
+					<path d="M3916.7 44.1 L3916.2 38.7 L3915.8 33.4 L3929.5 37.6 Z"></path>
+					<path d="M3025.5 236.2 L3025.5 260 L4127 731.9735696517413 L4127.0 732.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4446.6 226.8 L4441.3 236.2 L4435.9 226.8 L4441.3 217.5 Z"></path>
+						<path d="M3030.8 226.8 L3025.5 236.2 L3020.2 226.8 L3025.5 217.5 Z"></path>
 					</g>
-					<path d="M4441.3 59.8 L4441.25 82 L4441.25 124.5 L4441.3 124.5 " fill="none"></path>
-					<path d="M4446.6 59.8 L4441.3 59.8 L4435.9 59.8 L4441.3 46.5 Z"></path>
-					<path d="M4049.3 236.2 L4049.25 260 L4038.9960087082727 280 L4039.0 280.0 " fill="none"></path>
+					<path d="M3916.2 35.6 L3025.5 82 L3025.5 124.5 L3025.5 124.5 " fill="none"></path>
+					<path d="M3916.5 41.0 L3916.2 35.6 L3915.9 30.3 L3929.5 35.0 Z"></path>
+					<path d="M5127.5 1633.1 L5131 1638 L5250.032012195122 1718.5 L5250.0 1718.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4054.6 226.8 L4049.3 236.2 L4043.9 226.8 L4049.3 217.5 Z"></path>
+						<path d="M5126.3 1622.4 L5127.5 1633.1 L5117.7 1628.7 L5116.6 1618.0 Z"></path>
 					</g>
-					<path d="M4352.0 42.6 L4049.25 82 L4049.25 124.5 L4049.3 124.5 " fill="none"></path>
-					<path d="M4352.7 47.9 L4352.0 42.6 L4351.3 37.3 L4365.3 40.9 Z"></path>
-					<path d="M3657.3 236.2 L3657.25 260 L3658.374818577649 280 L3658.4 280.0 " fill="none"></path>
+					<path d="M5088.0 1633.6 L5091 1638 L5789.5 1789.7271523178808 L5789.5 1789.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3662.6 226.8 L3657.3 236.2 L3651.9 226.8 L3657.3 217.5 Z"></path>
+						<path d="M5087.3 1622.8 L5088.0 1633.6 L5078.4 1628.7 L5077.7 1618.0 Z"></path>
 					</g>
-					<path d="M4351.9 36.8 L3657.25 82 L3657.25 124.5 L3657.3 124.5 " fill="none"></path>
-					<path d="M4352.3 42.1 L4351.9 36.8 L4351.6 31.5 L4365.3 35.9 Z"></path>
-					<path d="M5676.5 1096.7 L5692.25 1638 L4176.25 1796.8651757188497 L4176.3 1796.9 " fill="none"></path>
+					<path d="M4602.3 1636.6 L4602.25 1638 L4143.394054878048 1786.5 L4143.4 1786.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5681.6 1087.2 L5676.5 1096.7 L5670.9 1087.5 L5676.0 1078.0 Z"></path>
+						<path d="M4608.1 1627.6 L4602.3 1636.6 L4597.4 1627.1 L4603.2 1618.0 Z"></path>
 					</g>
-					<path d="M5573.6 1093.4 L5201.75 1638 L5735.761432926829 1786.5 L5735.8 1786.5 " fill="none"></path>
+					<path d="M4110.7 1239.6 L3393.75 1638 L5014 1795.3011691579104 L5014.0 1795.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5583.3 1088.7 L5573.6 1093.4 L5574.5 1082.7 L5584.2 1078.0 Z"></path>
+						<path d="M4121.4 1239.7 L4110.7 1239.6 L4116.3 1230.4 L4127.0 1230.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M5549.8 199.8 L5549.75 260 L5649.314586357039 820 L5649.3 820.0 " fill="none"></path>
+					<path d="M4110.4 1217.9 L3293 1638 L4869 1796.7129260055265 L4869.0 1796.7 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M4121.1 1218.3 L4110.4 1217.9 L4116.3 1208.9 L4127.0 1209.3 Z"></path>
 					</g>
-					<path d="M5555.1 199.8 L5549.8 199.8 L5544.4 199.8 L5549.8 186.5 Z"></path>
+					<path d="M5309.0 199.8 L5309 260 L5140 432.37749814951883 L5140.0 432.4 " fill="none"></path>
+					<path d="M5314.3 199.8 L5309.0 199.8 L5303.7 199.8 L5309.0 186.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M5794.8 199.8 L5794.75 260 L5695.185413642961 820 L5695.2 820.0 " fill="none"></path>
+						<path d="M5538.5 199.8 L5538.5 260 L5140 563.3883977900553 L5140.0 563.4 " fill="none"></path>
 					</g>
-					<path d="M5800.1 199.8 L5794.8 199.8 L5789.4 199.8 L5794.8 186.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1396.1 179.9 L834.5 260 L749.9136429608128 880 L749.9 880.0 " fill="none"></path>
+					<path d="M5543.8 199.8 L5538.5 199.8 L5533.2 199.8 L5538.5 186.5 Z"></path>
+					<path d="M5836.5 228.2 L5836.5 260 L5140 658.9098088113051 L5140.0 658.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M5841.8 218.8 L5836.5 228.2 L5831.2 218.8 L5836.5 209.5 Z"></path>
 					</g>
-					<path d="M1396.8 185.2 L1396.1 179.9 L1395.3 174.6 L1409.3 178.0 Z"></path>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="0.0" y="132.5" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M0.0 163.5 L352.0 163.5" fill="none" data-name="SurveyQuestionFormView"></path>
+					<g data-name="WithQuestionnaireControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
+							<rect x="809.0" y="820.0" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
+							<path d="M809.0 851.0 L1441.0 851.0" fill="none" data-name="WithQuestionnaireControls"></path>
+							<path d="M809.0 957.0 L1441.0 957.0" fill="none" data-name="WithQuestionnaireControls"></path>
 						</g>
-						<g transform="translate(0, 132.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
+						<g transform="translate(809, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
+								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 163.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
+						<g transform="translate(809, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="3189.5" y="280.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M3189.5 311.0 L4202.5 311.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M3189.5 1332.0 L4202.5 1332.0" fill="none" data-name="QuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(3189.5, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
+						<g transform="translate(809, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3189.5, 311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
+					</g>
+					<g data-name="FormArray">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
+							<rect x="4046.5" y="1786.5" height="31.0" width="98.0" data-name="FormArray"></rect>
 						</g>
-						<g transform="translate(3189.5, 1332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
+						<g transform="translate(4046.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="3228.8" y="1718.5" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M3228.8 1749.5 L3591.8 1749.5" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(3228.75, 1718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
-								
-							</g>
+					<g data-name="FormViewModelCollection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
+							<rect x="0.0" y="1786.5" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
 						</g>
-						<g transform="translate(3228.75, 1749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
+						<g transform="translate(0, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
+								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="3859.8" y="1786.5" height="31.0" width="113.0" data-name="FormControl"></rect>
+					<g data-name="IFormViewModelDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
+							<rect x="894.0" y="155.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
 						</g>
-						<g transform="translate(3859.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+						<g transform="translate(894, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
+								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="4078.3" y="1786.5" height="31.0" width="98.0" data-name="FormArray"></rect>
+					<g data-name="IProviderArgsResolver">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
+							<rect x="1405.8" y="155.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
 						</g>
-						<g transform="translate(4078.25, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
+						<g transform="translate(1405.75, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="3681.8" y="1786.5" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+					<g data-name="QuestionnaireFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
+							<rect x="2689.0" y="880.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
+							<path d="M2689.0 911.0 L3057.0 911.0" fill="none" data-name="QuestionnaireFormData"></path>
+							<path d="M2689.0 957.0 L3057.0 957.0" fill="none" data-name="QuestionnaireFormData"></path>
 						</g>
-						<g transform="translate(3681.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
+						<g transform="translate(2689, 880)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
+								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="2640.5" y="1786.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(2640.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+						<g transform="translate(2689, 911)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="392.0" y="155.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(392, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
+						<g transform="translate(2689, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="647.0" y="155.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
+					<g data-name="IFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
+							<rect x="2420.0" y="155.5" height="31.0" width="98.0" data-name="IFormData"></rect>
 						</g>
-						<g transform="translate(647, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
+						<g transform="translate(2420, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="QuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="964.5" y="820.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M964.5 851.0 L2132.5 851.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M964.5 987.0 L2132.5 987.0" fill="none" data-name="QuestionFormData"></path>
+							<rect x="1481.0" y="820.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M1481.0 851.0 L2649.0 851.0" fill="none" data-name="QuestionFormData"></path>
+							<path d="M1481.0 987.0 L2649.0 987.0" fill="none" data-name="QuestionFormData"></path>
 						</g>
-						<g transform="translate(964.5, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+						<g transform="translate(1481, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
 								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(964.5, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+						<g transform="translate(1481, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
@@ -701,7 +602,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(964.5, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+						<g transform="translate(1481, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
@@ -712,30 +613,44 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="1409.3" y="155.5" height="31.0" width="98.0" data-name="IFormData"></rect>
+					<g data-name="SurveyQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
+							<rect x="5192.0" y="1718.5" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M5192.0 1749.5 L5555.0 1749.5" fill="none" data-name="SurveyQuestionType"></path>
 						</g>
-						<g transform="translate(1409.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
+						<g transform="translate(5192, 1718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
+								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5192, 1749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ChoiceQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="2256.5" y="1718.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M2256.5 1749.0 L2600.5 1749.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M2256.5 1810.0 L2600.5 1810.0" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<rect x="4485.0" y="1718.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M4485.0 1749.0 L4829.0 1749.0" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M4485.0 1810.0 L4829.0 1810.0" fill="none" data-name="ChoiceQuestionFormData"></path>
 						</g>
-						<g transform="translate(2256.5, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(4485, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2256.5, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(4485, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
@@ -743,7 +658,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(2256.5, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(4485, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
@@ -755,24 +670,24 @@
 					</g>
 					<g data-name="BoolQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="1824.5" y="1733.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M1824.5 1764.0 L2216.5 1764.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M1824.5 1810.0 L2216.5 1810.0" fill="none" data-name="BoolQuestionFormData"></path>
+							<rect x="2051.0" y="1733.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M2051.0 1764.0 L2443.0 1764.0" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M2051.0 1810.0 L2443.0 1810.0" fill="none" data-name="BoolQuestionFormData"></path>
 						</g>
-						<g transform="translate(1824.5, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(2051, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
 								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1824.5, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(2051, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1824.5, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(2051, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
@@ -783,24 +698,24 @@
 					</g>
 					<g data-name="ImageQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="1312.5" y="1733.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M1312.5 1764.0 L1784.5 1764.0" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M1312.5 1810.0 L1784.5 1810.0" fill="none" data-name="ImageQuestionFormData"></path>
+							<rect x="1539.0" y="1733.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
+							<path d="M1539.0 1764.0 L2011.0 1764.0" fill="none" data-name="ImageQuestionFormData"></path>
+							<path d="M1539.0 1810.0 L2011.0 1810.0" fill="none" data-name="ImageQuestionFormData"></path>
 						</g>
-						<g transform="translate(1312.5, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(1539, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
 								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1312.5, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(1539, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1312.5, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(1539, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
@@ -811,17 +726,17 @@
 					</g>
 					<g data-name="AudioQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="800.5" y="1725.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M800.5 1756.5 L1272.5 1756.5" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M800.5 1817.5 L1272.5 1817.5" fill="none" data-name="AudioQuestionFormData"></path>
+							<rect x="1027.0" y="1725.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
+							<path d="M1027.0 1756.5 L1499.0 1756.5" fill="none" data-name="AudioQuestionFormData"></path>
+							<path d="M1027.0 1817.5 L1499.0 1817.5" fill="none" data-name="AudioQuestionFormData"></path>
 						</g>
-						<g transform="translate(800.5, 1725.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(1027, 1725.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
 								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(800.5, 1756.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(1027, 1756.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
@@ -829,7 +744,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(800.5, 1817.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(1027, 1817.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
@@ -840,17 +755,17 @@
 					</g>
 					<g data-name="ScaleQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="416.5" y="1658.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M416.5 1689.0 L760.5 1689.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M416.5 1885.0 L760.5 1885.0" fill="none" data-name="ScaleQuestionFormData"></path>
+							<rect x="643.0" y="1658.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M643.0 1689.0 L987.0 1689.0" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M643.0 1885.0 L987.0 1885.0" fill="none" data-name="ScaleQuestionFormData"></path>
 						</g>
-						<g transform="translate(416.5, 1658)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(643, 1658)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(416.5, 1689)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(643, 1689)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
@@ -867,7 +782,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(416.5, 1885)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(643, 1885)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
@@ -878,9 +793,9 @@
 					</g>
 					<g data-name="Color">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="559.5" y="1986.0" height="31.0" width="58.0" data-name="Color"></rect>
+							<rect x="786.0" y="1986.0" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(559.5, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+						<g transform="translate(786, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
 								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
@@ -889,17 +804,17 @@
 					</g>
 					<g data-name="FreeTextQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="32.5" y="1718.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M32.5 1749.0 L376.5 1749.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M32.5 1825.0 L376.5 1825.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<rect x="259.0" y="1718.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M259.0 1749.0 L603.0 1749.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M259.0 1825.0 L603.0 1825.0" fill="none" data-name="FreeTextQuestionFormData"></path>
 						</g>
-						<g transform="translate(32.5, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(259, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32.5, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(259, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
@@ -908,7 +823,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(32.5, 1825)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(259, 1825)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
@@ -919,71 +834,179 @@
 					</g>
 					<g data-name="FreeTextQuestionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="106.5" y="1986.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+							<rect x="333.0" y="1986.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
 						</g>
-						<g transform="translate(106.5, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+						<g transform="translate(333, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
 								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="4016.3" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M4016.3 31.0 L4325.3 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
+					<g data-name="AudioRecordingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
+							<rect x="4809.5" y="124.5" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
+							<path d="M4809.5 155.5 L5161.5 155.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<path d="M4809.5 186.5 L5161.5 186.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+						</g>
+						<g transform="translate(4809.5, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4809.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4809.5, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="QuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
+							<rect x="4127.0" y="280.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M4127.0 311.0 L5140.0 311.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M4127.0 1332.0 L5140.0 1332.0" fill="none" data-name="QuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(4016.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
+						<g transform="translate(4127, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
+								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4016.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(4127, 311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
+								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
+								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
+								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
+								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
+								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
+								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
+								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
+								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
+								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
+								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
+								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
+								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
+								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
+								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
+								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
+								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
+								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
+								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="2843.5" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M2843.5 171.0 L3195.5 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
-						</g>
-						<g transform="translate(2843.5, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
+						<g transform="translate(4127, 1332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2843.5, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+					</g>
+					<g data-name="ConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
+							<rect x="3929.5" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+						</g>
+						<g transform="translate(3929.5, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="FreeTextQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="5049.3" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M5049.3 133.0 L5401.3 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M5049.3 179.0 L5401.3 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<rect x="4417.5" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M4417.5 133.0 L4769.5 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M4417.5 179.0 L4769.5 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
 						</g>
-						<g transform="translate(5049.25, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(4417.5, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5049.25, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(4417.5, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5049.25, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(4417.5, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
@@ -992,221 +1015,198 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="4365.3" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+					<g data-name="Enum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
+							<rect x="5569.3" y="933.5" height="31.0" width="61.0" data-name="Enum"></rect>
 						</g>
-						<g transform="translate(4365.25, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
+						<g transform="translate(5569.25, 933.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="4657.3" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M4657.3 155.5 L5009.3 155.5" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M4657.3 186.5 L5009.3 186.5" fill="none" data-name="BoolQuestionFormView"></path>
+					<g data-name="ImageCapturingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
+							<rect x="3633.5" y="124.5" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
+							<path d="M3633.5 155.5 L3985.5 155.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<path d="M3633.5 186.5 L3985.5 186.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
 						</g>
-						<g transform="translate(4657.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
+						<g transform="translate(3633.5, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4657.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(3633.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4657.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+						<g transform="translate(3633.5, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="2744.5" y="933.5" height="31.0" width="61.0" data-name="Enum"></rect>
+					<g data-name="IScaleQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
+							<rect x="4121.5" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M4121.5 31.0 L4430.5 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(2744.5, 933.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
+						<g transform="translate(4121.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
+								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="4265.3" y="124.5" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M4265.3 155.5 L4617.3 155.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M4265.3 186.5 L4617.3 186.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(4265.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
+						<g transform="translate(4121.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4265.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+					</g>
+					<g data-name="ScaleQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
+							<rect x="4025.5" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M4025.5 171.0 L4377.5 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
+						</g>
+						<g transform="translate(4025.5, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4265.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
+						<g transform="translate(4025.5, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ChoiceQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="3873.3" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M3873.3 155.5 L4225.3 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M3873.3 186.5 L4225.3 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<rect x="3241.5" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M3241.5 155.5 L3593.5 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M3241.5 186.5 L3593.5 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(3873.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(3241.5, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3873.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(3241.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3873.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(3241.5, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="3481.3" y="124.5" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M3481.3 155.5 L3833.3 155.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M3481.3 186.5 L3833.3 186.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+					<g data-name="BoolQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
+							<rect x="2849.5" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M2849.5 155.5 L3201.5 155.5" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M2849.5 186.5 L3201.5 186.5" fill="none" data-name="BoolQuestionFormView"></path>
 						</g>
-						<g transform="translate(3481.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
+						<g transform="translate(2849.5, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3481.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(2849.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3481.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
+						<g transform="translate(2849.5, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="5356.3" y="820.0" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M5356.3 851.0 L5988.3 851.0" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M5356.3 957.0 L5988.3 957.0" fill="none" data-name="WithQuestionnaireControls"></path>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="5789.5" y="1786.5" height="31.0" width="113.0" data-name="FormControl"></rect>
 						</g>
-						<g transform="translate(5356.25, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
+						<g transform="translate(5789.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5356.25, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
+					</g>
+					<g data-name="AbstractControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
+							<rect x="5014.0" y="1786.5" height="31.0" width="138.0" data-name="AbstractControl"></rect>
 						</g>
-						<g transform="translate(5356.25, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
+						<g transform="translate(5014, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
+								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="5682.0" y="1786.5" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
+					<g data-name="FormGroup">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
+							<rect x="4869.0" y="1786.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
 						</g>
-						<g transform="translate(5682, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
+						<g transform="translate(4869, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="5441.3" y="155.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
+					<g data-name="ManagedFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
+							<rect x="5201.5" y="155.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
 						</g>
-						<g transform="translate(5441.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
+						<g transform="translate(5201.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
+								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="5698.3" y="155.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
+					<g data-name="IListActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
+							<rect x="5456.5" y="155.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
 						</g>
-						<g transform="translate(5698.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
+						<g transform="translate(5456.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="556.5" y="880.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M556.5 911.0 L924.5 911.0" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M556.5 957.0 L924.5 957.0" fill="none" data-name="QuestionnaireFormData"></path>
-						</g>
-						<g transform="translate(556.5, 880)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
-								
-							</g>
+					<g data-name="SurveyQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
+							<rect x="5660.5" y="132.5" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M5660.5 163.5 L6012.5 163.5" fill="none" data-name="SurveyQuestionFormView"></path>
 						</g>
-						<g transform="translate(556.5, 911)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
+						<g transform="translate(5660.5, 132.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(556.5, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
+						<g transform="translate(5660.5, 163.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
 								
 							</g>
 						</g>
diff --git a/docs/uml/designer_v2/lib/features/design/shared/uml.svg b/docs/uml/designer_v2/lib/features/design/shared/uml.svg
index 164371e09..cb3e53617 100644
--- a/docs/uml/designer_v2/lib/features/design/shared/uml.svg
+++ b/docs/uml/designer_v2/lib/features/design/shared/uml.svg
@@ -1,109 +1,38 @@
-<svg version="1.1" baseProfile="full" width="7327.3" height="2073.0" viewbox="0 0 7327.25 2073" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[SurveyQuestionFormView
+<svg version="1.1" baseProfile="full" width="6809.5" height="2073.0" viewbox="0 0 6809.5 2073" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[&lt;abstract&gt;WithQuestionnaireControls
 	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
+	  +questionsArray: FormArray&lt;dynamic&gt;;
+	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
+	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
+	  +propagateOnSave: bool;
+	  +questionModels: List&lt;Q&gt;;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  |
+	  +void setQuestionnaireControlsFrom();
+	  +QuestionnaireFormData buildQuestionnaireFormData();
+	  +void read();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +Q provide();
+	  +Q provideQuestionFormViewModel()
 	]
 	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
 	
-	[QuestionFormViewModel
+	[QuestionnaireFormData
 	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
+	  +questionsData: List&lt;QuestionFormData&gt;?;
+	  +id: String
 	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
+	  +StudyUQuestionnaire toQuestionnaire();
+	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
+	  +QuestionnaireFormData copy()
 	]
 	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
+	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
 	
 	[&lt;abstract&gt;QuestionFormData
 	  |
@@ -215,17 +144,15 @@
 	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
 	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
 	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
+	[AudioRecordingQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
 	]
 	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
+	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
 	
 	[FreeTextQuestionFormView
 	  |
@@ -240,16 +167,6 @@
 	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
 	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
 	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
 	[SurveyQuestionType
 	  |
 	  +index: int;
@@ -265,81 +182,153 @@
 	[SurveyQuestionType]o-[SurveyQuestionType]
 	[Enum]&lt;:--[SurveyQuestionType]
 	
-	[AudioRecordingQuestionFormView
+	[ImageCapturingQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel
 	  |
 	  +Widget build()
 	]
 	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
+	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
 	
-	[ChoiceQuestionFormView
+	[&lt;abstract&gt;IScaleQuestionFormViewModel
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  +isMidValuesClearedInfoVisible: bool
+	]
+	
+	[ScaleQuestionFormView
 	  |
-	  +Widget build()
+	  +formViewModel: QuestionFormViewModel
 	]
 	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
+	[ScaleQuestionFormView]o-[QuestionFormViewModel]
 	
-	[ImageCapturingQuestionFormView
+	[ChoiceQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel
 	  |
 	  +Widget build()
 	]
 	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
+	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
 	
-	[&lt;abstract&gt;WithQuestionnaireControls
+	[BoolQuestionFormView
 	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  +formViewModel: QuestionFormViewModel
 	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
-	  +void read();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[BoolQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
 	
-	[QuestionnaireFormData
+	[QuestionFormViewModel
 	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
+	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
+	  -_titles: Map&lt;FormMode, String Function()&gt;?;
+	  +questionIdControl: FormControl&lt;String&gt;;
+	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
+	  +questionTextControl: FormControl&lt;String&gt;;
+	  +questionInfoTextControl: FormControl&lt;String&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
+	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +customOptionsMin: int;
+	  +customOptionsMax: int;
+	  +customOptionsInitial: int;
+	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
+	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
+	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
+	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
+	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
+	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
+	  &lt;static&gt;+kDefaultScaleMinValue: int;
+	  &lt;static&gt;+kDefaultScaleMaxValue: int;
+	  &lt;static&gt;+kNumMidValueControls: int;
+	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
+	  +scaleMinValueControl: FormControl&lt;int&gt;;
+	  +scaleMaxValueControl: FormControl&lt;int&gt;;
+	  -_scaleRangeControl: FormControl&lt;int&gt;;
+	  +scaleMinLabelControl: FormControl&lt;String&gt;;
+	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
+	  +scaleMidValueControls: FormArray&lt;int&gt;;
+	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
+	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
+	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
+	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
+	  +prevMidValues: List&lt;int?&gt;?;
+	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
+	  +customRegexControl: FormControl&lt;String&gt;;
+	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
+	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
+	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
+	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
+	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
+	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
+	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +form: FormGroup;
+	  +questionId: String;
+	  +questionType: SurveyQuestionType;
+	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
+	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
+	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +validAnswerOptions: List&lt;String&gt;;
+	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +scaleMinValue: int;
+	  +scaleMaxValue: int;
+	  +scaleRange: int;
+	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +questionTextRequired: dynamic;
+	  +numValidChoiceOptions: dynamic;
+	  +scaleRangeValid: dynamic;
+	  +maxRecordingDurationValid: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +isAddOptionButtonVisible: bool;
+	  +isMidValuesClearedInfoVisible: bool
 	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
+	  +String? scaleMidLabelAt();
+	  -dynamic _onScaleRangeChanged();
+	  -dynamic _applyInputFormatters();
+	  -dynamic _updateScaleMidValueControls();
+	  -Map&lt;String, dynamic&gt;? _validateFreeText();
+	  -dynamic _onFreeTextLengthChanged();
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +dynamic onQuestionTypeChanged();
+	  +dynamic onResponseOptionsChanged();
+	  -void _updateFormControls();
+	  +void initControls();
+	  +void setControlsFrom();
+	  +QuestionFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem();
+	  +dynamic save();
+	  +QuestionFormViewModel createDuplicate()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
+	[QuestionFormViewModel]o-[SurveyQuestionType]
+	[QuestionFormViewModel]o-[FormControl]
+	[QuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
+	[QuestionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
 	
-	[ScheduleControls
+	[SurveyQuestionFormView
 	  |
-	  +formViewModel: WithScheduleControls
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
+	  +formViewModel: QuestionFormViewModel;
+	  +isHtmlStyleable: bool
 	]
 	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
+	[SurveyQuestionFormView]o-[QuestionFormViewModel]
 	
 	[&lt;abstract&gt;IFormDataWithSchedule
 	  |
@@ -356,6 +345,17 @@
 	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
 	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
 	
+	[ScheduleControls
+	  |
+	  +formViewModel: WithScheduleControls
+	  |
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
+	]
+	
+	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
+	
 	[&lt;abstract&gt;WithScheduleControls
 	  |
 	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
@@ -384,383 +384,284 @@
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="2073.0" width="7327.3" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="2073.0" width="6809.5" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
 				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M176.0 228.2 L176 260 L4319 873.9427895472631 L4319.0 873.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M181.3 218.8 L176.0 228.2 L170.7 218.8 L176.0 209.5 Z"></path>
-					</g>
-					<path d="M5347.8 1278.3 L5918.25 1638 L4124 1786.9343287359231 L4124.0 1786.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5342.7 1268.8 L5347.8 1278.3 L5337.1 1277.8 L5332.0 1268.4 Z"></path>
-					</g>
-					<path d="M5347.6 1290.7 L5878.25 1638 L6896.5 1793.3784601070017 L6896.5 1793.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5342.7 1281.1 L5347.6 1290.7 L5336.9 1290.1 L5332.0 1280.5 Z"></path>
-					</g>
-					<path d="M4825.5 1636.7 L4825.5 1638 L5215.991615853659 1786.5 L5216.0 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4830.8 1627.3 L4825.5 1636.7 L4820.2 1627.3 L4825.5 1618.0 Z"></path>
-					</g>
-					<path d="M4307.0 1566.0 L4246.5 1638 L4960.25 1787.5432769083359 L4960.3 1787.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4317.1 1562.3 L4307.0 1566.0 L4308.9 1555.4 L4319.0 1551.7 Z"></path>
-					</g>
-					<path d="M4305.9 1475.7 L4145.75 1638 L4784.75 1789.5488069414316 L4784.8 1789.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4316.2 1472.8 L4305.9 1475.7 L4308.6 1465.3 L4319.0 1462.4 Z"></path>
-					</g>
-					<path d="M499.5 199.8 L499.5 260 L4319 868.3299815071659 L4319.0 868.3 " fill="none"></path>
-					<path d="M504.8 199.8 L499.5 199.8 L494.2 199.8 L499.5 186.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M729.0 199.8 L729 260 L4319 863.8105699987794 L4319.0 863.8 " fill="none"></path>
-					</g>
-					<path d="M734.3 199.8 L729.0 199.8 L723.7 199.8 L729.0 186.5 Z"></path>
-					<path d="M2954.4 1086.1 L4105.75 1638 L4025.6181402439024 1718.5 L4025.6 1718.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2948.3 1077.2 L2954.4 1086.1 L2943.7 1086.8 L2937.6 1078.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1911.5 177.8 L2668.5 260 L2668.5 820 L2668.5 820.0 " fill="none"></path>
-					</g>
-					<path d="M1912.1 172.5 L1911.5 177.8 L1910.9 183.1 L1898.3 176.3 Z"></path>
-					<path d="M2935.9 1084.0 L4033.25 1638 L3348.25 1769.0851808634773 L3348.3 1769.1 " fill="none"></path>
-					<path d="M2938.3 1079.2 L2935.9 1084.0 L2933.5 1088.8 L2924.0 1078.0 Z"></path>
-					<path d="M2858.4 1085.8 L3625.25 1638 L2964.25 1764.492415402567 L2964.3 1764.5 " fill="none"></path>
-					<path d="M2861.6 1081.5 L2858.4 1085.8 L2855.3 1090.1 L2847.6 1078.0 Z"></path>
-					<path d="M2766.9 1088.9 L3153.25 1638 L2532.25 1756.8378063010503 L2532.3 1756.8 " fill="none"></path>
-					<path d="M2771.3 1085.8 L2766.9 1088.9 L2762.6 1092.0 L2759.3 1078.0 Z"></path>
-					<path d="M2662.9 1091.3 L2641.25 1638 L2020.25 1756.8378063010503 L2020.3 1756.8 " fill="none"></path>
-					<path d="M2668.2 1091.5 L2662.9 1091.3 L2657.5 1091.1 L2663.4 1078.0 Z"></path>
-					<path d="M1336.3 1964.7 L1336.25 1966 L1336.25 1986 L1336.3 1986.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1341.6 1955.3 L1336.3 1964.7 L1330.9 1955.3 L1336.3 1946.0 Z"></path>
-					</g>
-					<path d="M2571.9 1089.0 L2193.25 1638 L1508.25 1769.0851808634773 L1508.3 1769.1 " fill="none"></path>
-					<path d="M2576.3 1092.0 L2571.9 1089.0 L2567.6 1085.9 L2579.5 1078.0 Z"></path>
-					<path d="M952.3 1904.7 L952.25 1966 L952.25 1986 L952.3 1986.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M957.6 1895.3 L952.3 1904.7 L946.9 1895.3 L952.3 1886.0 Z"></path>
-					</g>
-					<path d="M2497.2 1086.3 L1809.25 1638 L1124.25 1769.0851808634773 L1124.3 1769.1 " fill="none"></path>
-					<path d="M2500.6 1090.5 L2497.2 1086.3 L2493.9 1082.2 L2507.6 1078.0 Z"></path>
-					<path d="M3776.5 220.7 L3776.5 260 L4319 616.3226882745472 L4319.0 616.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3781.8 211.3 L3776.5 220.7 L3771.2 211.3 L3776.5 202.0 Z"></path>
-					</g>
-					<path d="M5973.3 258.7 L5973.25 260 L5332 644.9455456327598 L5332.0 644.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5978.6 249.3 L5973.3 258.7 L5967.9 249.3 L5973.3 240.0 Z"></path>
-					</g>
-					<path d="M5278.6 36.8 L5973.25 82 L5973.25 102 L5973.3 102.0 " fill="none"></path>
-					<path d="M5278.9 31.5 L5278.6 36.8 L5278.2 42.1 L5265.3 35.9 Z"></path>
-					<path d="M5581.3 236.2 L5581.25 260 L5332 487.235527621568 L5332.0 487.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5586.6 226.8 L5581.3 236.2 L5575.9 226.8 L5581.3 217.5 Z"></path>
-					</g>
-					<path d="M5278.5 42.6 L5581.25 82 L5581.25 124.5 L5581.3 124.5 " fill="none"></path>
-					<path d="M5279.2 37.3 L5278.5 42.6 L5277.8 47.9 L5265.3 40.9 Z"></path>
-					<path d="M4142.5 1773.8 L4534.5 1718.5 L4637.125 1718.5 L4637.125 1718.5 L4739.75 1802 L4739.75 1802 L4637.125 1885.5 L4637.125 1885.5 L4534.5 1885.5 L4534.5 1885.5 L4124 1827.6000844594594 L4124.0 1827.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4132.5 1769.8 L4142.5 1773.8 L4134.0 1780.4 L4124.0 1776.4 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1462.0 977.8 L1462 1638 L3761 1790 L3761.0 1790.0 " fill="none"></path>
-					</g>
-					<path d="M1467.3 977.8 L1462.0 977.8 L1456.7 977.8 L1462.0 964.5 Z"></path>
-					<path d="M5189.3 236.2 L5189.25 260 L5178.6912191582005 280 L5178.7 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5194.6 226.8 L5189.3 236.2 L5183.9 226.8 L5189.3 217.5 Z"></path>
-					</g>
-					<path d="M5189.3 59.8 L5189.25 82 L5189.25 124.5 L5189.3 124.5 " fill="none"></path>
-					<path d="M5194.6 59.8 L5189.3 59.8 L5183.9 59.8 L5189.3 46.5 Z"></path>
-					<path d="M4797.3 236.2 L4797.25 260 L4798.070029027576 280 L4798.1 280.0 " fill="none"></path>
+					<path d="M1025.5 1095.7 L1208.5 1638 L4271.75 1799.4179452164833 L4271.8 1799.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4802.6 226.8 L4797.3 236.2 L4791.9 226.8 L4797.3 217.5 Z"></path>
+						<path d="M1027.6 1085.1 L1025.5 1095.7 L1017.5 1088.5 L1019.5 1078.0 Z"></path>
 					</g>
-					<path d="M5100.0 42.6 L4797.25 82 L4797.25 124.5 L4797.3 124.5 " fill="none"></path>
-					<path d="M5100.7 47.9 L5100.0 42.6 L5099.3 37.3 L5113.3 40.9 Z"></path>
-					<path d="M4405.3 236.2 L4405.25 260 L4417.448838896952 280 L4417.4 280.0 " fill="none"></path>
+					<path d="M799.2 1089.6 L109.5 1638 L109.5 1786.5 L109.5 1786.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4410.6 226.8 L4405.3 236.2 L4399.9 226.8 L4405.3 217.5 Z"></path>
-					</g>
-					<path d="M5099.9 36.8 L4405.25 82 L4405.25 124.5 L4405.3 124.5 " fill="none"></path>
-					<path d="M5100.3 42.1 L5099.9 36.8 L5099.6 31.5 L5113.3 35.9 Z"></path>
-					<path d="M6480.1 1095.3 L6702 1638 L5305.75 1796.4397163120568 L5305.8 1796.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6481.5 1084.6 L6480.1 1095.3 L6471.6 1088.7 L6473.0 1078.0 Z"></path>
-					</g>
-					<path d="M6323.4 1093.5 L5958.25 1638 L6384.282012195122 1786.5 L6384.3 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6333.0 1088.7 L6323.4 1093.5 L6324.1 1082.8 L6333.8 1078.0 Z"></path>
+						<path d="M809.8 1088.0 L799.2 1089.6 L803.1 1079.6 L813.8 1078.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M6297.8 199.8 L6297.75 260 L6397.314586357039 820 L6397.3 820.0 " fill="none"></path>
+						<path d="M853.5 199.8 L853.5 260 L953.0645863570392 820 L953.1 820.0 " fill="none"></path>
 					</g>
-					<path d="M6303.1 199.8 L6297.8 199.8 L6292.4 199.8 L6297.8 186.5 Z"></path>
+					<path d="M858.8 199.8 L853.5 199.8 L848.2 199.8 L853.5 186.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M6545.8 199.8 L6545.75 260 L6443.74709724238 820 L6443.7 820.0 " fill="none"></path>
-					</g>
-					<path d="M6551.1 199.8 L6545.8 199.8 L6540.4 199.8 L6545.8 186.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1787.0 179.6 L1207.5 260 L1207.5 880 L1207.5 880.0 " fill="none"></path>
-					</g>
-					<path d="M1787.8 184.9 L1787.0 179.6 L1786.3 174.3 L1800.3 177.8 Z"></path>
-					<path d="M7023.8 243.7 L7023.75 260 L7023.75 797.5 L7023.8 797.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7029.1 234.3 L7023.8 243.7 L7018.4 234.3 L7023.8 225.0 Z"></path>
-					</g>
-					<path d="M7023.8 59.8 L7023.75 82 L7023.75 117 L7023.8 117.0 " fill="none"></path>
-					<path d="M7029.1 59.8 L7023.8 59.8 L7018.4 59.8 L7023.8 46.5 Z"></path>
-					<path d="M472.5 1051.7 L472.5 1638 L472.5 1786.5 L472.5 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M477.8 1042.3 L472.5 1051.7 L467.2 1042.3 L472.5 1033.0 Z"></path>
+						<path d="M1135.8 199.8 L1135.75 260 L1005.9096516690856 820 L1005.9 820.0 " fill="none"></path>
 					</g>
+					<path d="M1141.1 199.8 L1135.8 199.8 L1130.4 199.8 L1135.8 186.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M1787.0 176.5 L834.5 260 L516.633526850508 865 L516.6 865.0 " fill="none"></path>
-					</g>
-					<path d="M1787.4 181.8 L1787.0 176.5 L1786.5 171.1 L1800.3 175.3 Z"></path>
-					<path d="M7028.7 1119.2 L7043.75 1638 L6961.576981707317 1786.5 L6961.6 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7033.7 1109.7 L7028.7 1119.2 L7023.1 1110.0 L7028.1 1100.5 Z"></path>
-					</g>
-					<path d="M6954.7 1117.8 L6742 1638 L7097.403963414634 1786.5 L7097.4 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6963.2 1111.2 L6954.7 1117.8 L6953.3 1107.1 L6961.8 1100.5 Z"></path>
-					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="0.0" y="132.5" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M0.0 163.5 L352.0 163.5" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(0, 132.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 163.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
-								
-							</g>
-						</g>
+						<path d="M2333.8 177.6 L3110.5 260 L3110.5 880 L3110.5 880.0 " fill="none"></path>
 					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="4319.0" y="280.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M4319.0 311.0 L5332.0 311.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M4319.0 1332.0 L5332.0 1332.0" fill="none" data-name="QuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(4319, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4319, 311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+					<path d="M2334.3 172.3 L2333.8 177.6 L2333.2 182.9 L2320.5 176.2 Z"></path>
+					<path d="M2446.6 1089.0 L3202 1638 L5456.75 1789.7820420728578 L5456.8 1789.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M2442.2 1079.2 L2446.6 1089.0 L2435.9 1087.8 L2431.5 1078.0 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M2265.9 199.6 L2254 260 L2254 820 L2254.0 820.0 " fill="none"></path>
+					</g>
+					<path d="M2271.1 200.6 L2265.9 199.6 L2260.6 198.6 L2268.5 186.5 Z"></path>
+					<path d="M2407.9 1086.9 L3023 1638 L4927.75 1788.4172384735764 L4927.8 1788.4 " fill="none"></path>
+					<path d="M2411.5 1082.9 L2407.9 1086.9 L2404.3 1090.9 L2398.0 1078.0 Z"></path>
+					<path d="M2400.2 1087.2 L2983 1638 L2763.891768292683 1733 L2763.9 1733.0 " fill="none"></path>
+					<path d="M2403.8 1083.3 L2400.2 1087.2 L2396.5 1091.0 L2390.5 1078.0 Z"></path>
+					<path d="M2328.7 1089.8 L2619.5 1638 L2337.5411585365855 1733 L2337.5 1733.0 " fill="none"></path>
+					<path d="M2333.4 1087.3 L2328.7 1089.8 L2324.0 1092.3 L2322.4 1078.0 Z"></path>
+					<path d="M2272.5 1091.2 L2343.5 1638 L1856.75 1748.4489795918366 L1856.8 1748.4 " fill="none"></path>
+					<path d="M2277.8 1090.5 L2272.5 1091.2 L2267.2 1091.9 L2270.8 1078.0 Z"></path>
+					<path d="M1172.8 1964.7 L1172.75 1966 L1172.75 1986 L1172.8 1986.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1178.1 1955.3 L1172.8 1964.7 L1167.4 1955.3 L1172.8 1946.0 Z"></path>
+					</g>
+					<path d="M2222.2 1091.0 L2099.5 1638 L1344.75 1771.5624494200163 L1344.8 1771.6 " fill="none"></path>
+					<path d="M2227.4 1092.2 L2222.2 1091.0 L2217.0 1089.8 L2225.1 1078.0 Z"></path>
+					<path d="M788.8 1904.7 L788.75 1966 L788.75 1986 L788.8 1986.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M794.1 1895.3 L788.8 1904.7 L783.4 1895.3 L788.8 1886.0 Z"></path>
+					</g>
+					<path d="M2179.1 1089.8 L1887.5 1638 L960.75 1776.3271899886233 L960.8 1776.3 " fill="none"></path>
+					<path d="M2183.8 1092.3 L2179.1 1089.8 L2174.4 1087.3 L2185.4 1078.0 Z"></path>
+					<path d="M5223.0 236.2 L5223 260 L5214.930333817127 280 L5214.9 280.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M5228.3 226.8 L5223.0 236.2 L5217.7 226.8 L5223.0 217.5 Z"></path>
+					</g>
+					<path d="M4332.3 35.6 L5223 82 L5223 124.5 L5223.0 124.5 " fill="none"></path>
+					<path d="M4332.6 30.3 L4332.3 35.6 L4332.0 41.0 L4319.0 35.0 Z"></path>
+					<path d="M4831.0 258.7 L4831 260 L4834.3091436865025 280 L4834.3 280.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M4836.3 249.3 L4831.0 258.7 L4825.7 249.3 L4831.0 240.0 Z"></path>
+					</g>
+					<path d="M4332.3 38.7 L4831 82 L4831 102 L4831.0 102.0 " fill="none"></path>
+					<path d="M4332.7 33.4 L4332.3 38.7 L4331.8 44.1 L4319.0 37.6 Z"></path>
+					<path d="M5837.7 1744.6 L5928.583333333333 1718.5 L5955.791666666667 1718.5 L5955.791666666667 1718.5 L5983 1802 L5983 1802 L5955.791666666667 1885.5 L5955.791666666667 1885.5 L5928.583333333333 1885.5 L5928.583333333333 1885.5 L5819.75 1854.1994833524684 L5819.8 1854.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M5827.2 1742.1 L5837.7 1744.6 L5830.2 1752.3 L5819.8 1749.8 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M3753.3 977.8 L3753.25 1638 L5456.75 1786.2090185676393 L5456.8 1786.2 " fill="none"></path>
+					</g>
+					<path d="M3758.6 977.8 L3753.3 977.8 L3747.9 977.8 L3753.3 964.5 Z"></path>
+					<path d="M4047.0 236.2 L4047 260 L4438.5 560.3825167037862 L4438.5 560.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M4052.3 226.8 L4047.0 236.2 L4041.7 226.8 L4047.0 217.5 Z"></path>
+					</g>
+					<path d="M4170.5 49.9 L4047 82 L4047 124.5 L4047.0 124.5 " fill="none"></path>
+					<path d="M4171.9 55.0 L4170.5 49.9 L4169.2 44.7 L4183.4 46.5 Z"></path>
+					<path d="M4439.0 220.7 L4439 260 L4453.687953555878 280 L4453.7 280.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M4444.3 211.3 L4439.0 220.7 L4433.7 211.3 L4439.0 202.0 Z"></path>
+					</g>
+					<path d="M3655.0 236.2 L3655 260 L4438.5 678.4740310077519 L4438.5 678.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M3660.3 226.8 L3655.0 236.2 L3649.7 226.8 L3655.0 217.5 Z"></path>
+					</g>
+					<path d="M4153.7 38.7 L3655 82 L3655 124.5 L3655.0 124.5 " fill="none"></path>
+					<path d="M4154.2 44.1 L4153.7 38.7 L4153.3 33.4 L4167.0 37.6 Z"></path>
+					<path d="M3263.0 236.2 L3263 260 L4438.5 741.5217003567182 L4438.5 741.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M3268.3 226.8 L3263.0 236.2 L3257.7 226.8 L3263.0 217.5 Z"></path>
+					</g>
+					<path d="M4153.7 35.6 L3263 82 L3263 124.5 L3263.0 124.5 " fill="none"></path>
+					<path d="M4154.0 41.0 L4153.7 35.6 L4153.4 30.3 L4167.0 35.0 Z"></path>
+					<path d="M5467.7 1249.8 L6142.25 1638 L5819.75 1742.9404761904761 L5819.8 1742.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M5462.2 1240.5 L5467.7 1249.8 L5456.9 1249.8 L5451.5 1240.5 Z"></path>
+					</g>
+					<path d="M5465.2 1429.0 L5691.75 1638 L6268 1787.355985776373 L6268.0 1787.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M5462.0 1418.7 L5465.2 1429.0 L5454.7 1426.6 L5451.5 1416.3 Z"></path>
+					</g>
+					<path d="M5018.8 1636.6 L5019 1638 L4369.75 1790.4912280701753 L4369.8 1790.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M5023.2 1626.7 L5018.8 1636.6 L5012.5 1627.8 L5016.9 1618.0 Z"></path>
+					</g>
+					<path d="M4425.6 1492.0 L4286 1638 L6028 1795.7515184980673 L6028.0 1795.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M4435.9 1489.0 L4425.6 1492.0 L4428.2 1481.6 L4438.5 1478.6 Z"></path>
+					</g>
+					<path d="M4423.8 1355.6 L4061.75 1638 L5311.75 1795.3896353166986 L5311.8 1795.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M4434.4 1354.1 L4423.8 1355.6 L4427.9 1345.6 L4438.5 1344.1 Z"></path>
+					</g>
+					<path d="M5546.5 199.8 L5546.5 260 L5451.5 368.81961762261017 L5451.5 368.8 " fill="none"></path>
+					<path d="M5551.8 199.8 L5546.5 199.8 L5541.2 199.8 L5546.5 186.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M5776.0 199.8 L5776 260 L5451.5 529.0499398315283 L5451.5 529.0 " fill="none"></path>
+					</g>
+					<path d="M5781.3 199.8 L5776.0 199.8 L5770.7 199.8 L5776.0 186.5 Z"></path>
+					<path d="M6074.0 228.2 L6074 260 L5451.5 639.8959255978742 L5451.5 639.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M6079.3 218.8 L6074.0 228.2 L6068.7 218.8 L6074.0 209.5 Z"></path>
+					</g>
+					<path d="M1481.0 1051.7 L1481 1638 L576.75 1788.6700533401067 L576.8 1788.7 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M1486.3 1042.3 L1481.0 1051.7 L1475.7 1042.3 L1481.0 1033.0 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M2209.3 178.0 L1481 260 L1481 865 L1481.0 865.0 " fill="none"></path>
+					</g>
+					<path d="M2209.8 183.3 L2209.3 178.0 L2208.7 172.7 L2222.5 176.5 Z"></path>
+					<path d="M6506.0 243.7 L6506 260 L6506 797.5 L6506.0 797.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M6511.3 234.3 L6506.0 243.7 L6500.7 234.3 L6506.0 225.0 Z"></path>
+					</g>
+					<path d="M6506.0 59.8 L6506 82 L6506 117 L6506.0 117.0 " fill="none"></path>
+					<path d="M6511.3 59.8 L6506.0 59.8 L6500.7 59.8 L6506.0 46.5 Z"></path>
+					<path d="M6510.9 1119.2 L6526 1638 L6343.544207317073 1786.5 L6343.5 1786.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M6516.0 1109.7 L6510.9 1119.2 L6505.3 1110.0 L6510.4 1100.5 Z"></path>
+					</g>
+					<path d="M6426.9 1117.4 L6182.25 1638 L6475.401676829269 1786.5 L6475.4 1786.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M6435.7 1111.2 L6426.9 1117.4 L6426.0 1106.7 L6434.8 1100.5 Z"></path>
+					</g>
+					<g data-name="WithQuestionnaireControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
+							<rect x="660.0" y="820.0" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
+							<path d="M660.0 851.0 L1292.0 851.0" fill="none" data-name="WithQuestionnaireControls"></path>
+							<path d="M660.0 957.0 L1292.0 957.0" fill="none" data-name="WithQuestionnaireControls"></path>
+						</g>
+						<g transform="translate(660, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
+								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4319, 1332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
+						<g transform="translate(660, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="3761.0" y="1718.5" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M3761.0 1749.5 L4124.0 1749.5" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(3761, 1718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
+						<g transform="translate(660, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3761, 1749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
+					</g>
+					<g data-name="FormArray">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
+							<rect x="4271.8" y="1786.5" height="31.0" width="98.0" data-name="FormArray"></rect>
+						</g>
+						<g transform="translate(4271.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="6896.5" y="1786.5" height="31.0" width="113.0" data-name="FormControl"></rect>
+					<g data-name="FormViewModelCollection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
+							<rect x="0.0" y="1786.5" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
 						</g>
-						<g transform="translate(6896.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+						<g transform="translate(0, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
+								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="5207.8" y="1786.5" height="31.0" width="98.0" data-name="FormArray"></rect>
+					<g data-name="IFormViewModelDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
+							<rect x="745.0" y="155.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
 						</g>
-						<g transform="translate(5207.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
+						<g transform="translate(745, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
+								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="4960.3" y="1786.5" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+					<g data-name="IProviderArgsResolver">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
+							<rect x="1039.3" y="155.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
 						</g>
-						<g transform="translate(4960.25, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
+						<g transform="translate(1039.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="4784.8" y="1786.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
+					<g data-name="QuestionnaireFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
+							<rect x="2926.5" y="880.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
+							<path d="M2926.5 911.0 L3294.5 911.0" fill="none" data-name="QuestionnaireFormData"></path>
+							<path d="M2926.5 957.0 L3294.5 957.0" fill="none" data-name="QuestionnaireFormData"></path>
 						</g>
-						<g transform="translate(4784.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+						<g transform="translate(2926.5, 880)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
+								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="392.0" y="155.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
+						<g transform="translate(2926.5, 911)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
+								
+							</g>
 						</g>
-						<g transform="translate(392, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
+						<g transform="translate(2926.5, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="647.0" y="155.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
+					<g data-name="IFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
+							<rect x="2222.5" y="155.5" height="31.0" width="98.0" data-name="IFormData"></rect>
 						</g>
-						<g transform="translate(647, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
+						<g transform="translate(2222.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="QuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="2084.5" y="820.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M2084.5 851.0 L3252.5 851.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M2084.5 987.0 L3252.5 987.0" fill="none" data-name="QuestionFormData"></path>
+							<rect x="1670.0" y="820.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M1670.0 851.0 L2838.0 851.0" fill="none" data-name="QuestionFormData"></path>
+							<path d="M1670.0 987.0 L2838.0 987.0" fill="none" data-name="QuestionFormData"></path>
 						</g>
-						<g transform="translate(2084.5, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+						<g transform="translate(1670, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
 								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2084.5, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+						<g transform="translate(1670, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
@@ -773,7 +674,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(2084.5, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+						<g transform="translate(1670, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
@@ -784,30 +685,44 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="1800.3" y="155.5" height="31.0" width="98.0" data-name="IFormData"></rect>
+					<g data-name="SurveyQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
+							<rect x="5456.8" y="1718.5" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M5456.8 1749.5 L5819.8 1749.5" fill="none" data-name="SurveyQuestionType"></path>
 						</g>
-						<g transform="translate(1800.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
+						<g transform="translate(5456.75, 1718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
+								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5456.75, 1749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ChoiceQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="3004.3" y="1718.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M3004.3 1749.0 L3348.3 1749.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M3004.3 1810.0 L3348.3 1810.0" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<rect x="4927.8" y="1718.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M4927.8 1749.0 L5271.8 1749.0" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M4927.8 1810.0 L5271.8 1810.0" fill="none" data-name="ChoiceQuestionFormData"></path>
 						</g>
-						<g transform="translate(3004.25, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(4927.75, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3004.25, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(4927.75, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
@@ -815,7 +730,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(3004.25, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(4927.75, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
@@ -827,24 +742,24 @@
 					</g>
 					<g data-name="BoolQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="2572.3" y="1733.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M2572.3 1764.0 L2964.3 1764.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M2572.3 1810.0 L2964.3 1810.0" fill="none" data-name="BoolQuestionFormData"></path>
+							<rect x="2408.8" y="1733.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M2408.8 1764.0 L2800.8 1764.0" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M2408.8 1810.0 L2800.8 1810.0" fill="none" data-name="BoolQuestionFormData"></path>
 						</g>
-						<g transform="translate(2572.25, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(2408.75, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
 								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2572.25, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(2408.75, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2572.25, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(2408.75, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
@@ -855,24 +770,24 @@
 					</g>
 					<g data-name="ImageQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="2060.3" y="1733.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M2060.3 1764.0 L2532.3 1764.0" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M2060.3 1810.0 L2532.3 1810.0" fill="none" data-name="ImageQuestionFormData"></path>
+							<rect x="1896.8" y="1733.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
+							<path d="M1896.8 1764.0 L2368.8 1764.0" fill="none" data-name="ImageQuestionFormData"></path>
+							<path d="M1896.8 1810.0 L2368.8 1810.0" fill="none" data-name="ImageQuestionFormData"></path>
 						</g>
-						<g transform="translate(2060.25, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(1896.75, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
 								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2060.25, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(1896.75, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2060.25, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(1896.75, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
@@ -883,17 +798,17 @@
 					</g>
 					<g data-name="AudioQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="1548.3" y="1725.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M1548.3 1756.5 L2020.3 1756.5" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M1548.3 1817.5 L2020.3 1817.5" fill="none" data-name="AudioQuestionFormData"></path>
+							<rect x="1384.8" y="1725.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
+							<path d="M1384.8 1756.5 L1856.8 1756.5" fill="none" data-name="AudioQuestionFormData"></path>
+							<path d="M1384.8 1817.5 L1856.8 1817.5" fill="none" data-name="AudioQuestionFormData"></path>
 						</g>
-						<g transform="translate(1548.25, 1725.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(1384.75, 1725.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
 								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1548.25, 1756.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(1384.75, 1756.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
@@ -901,7 +816,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(1548.25, 1817.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(1384.75, 1817.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
@@ -912,17 +827,17 @@
 					</g>
 					<g data-name="ScaleQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="1164.3" y="1658.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M1164.3 1689.0 L1508.3 1689.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M1164.3 1885.0 L1508.3 1885.0" fill="none" data-name="ScaleQuestionFormData"></path>
+							<rect x="1000.8" y="1658.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M1000.8 1689.0 L1344.8 1689.0" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M1000.8 1885.0 L1344.8 1885.0" fill="none" data-name="ScaleQuestionFormData"></path>
 						</g>
-						<g transform="translate(1164.25, 1658)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(1000.75, 1658)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1164.25, 1689)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(1000.75, 1689)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
@@ -939,7 +854,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(1164.25, 1885)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(1000.75, 1885)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
@@ -950,9 +865,9 @@
 					</g>
 					<g data-name="Color">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="1307.3" y="1986.0" height="31.0" width="58.0" data-name="Color"></rect>
+							<rect x="1143.8" y="1986.0" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(1307.25, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+						<g transform="translate(1143.75, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
 								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
@@ -961,17 +876,17 @@
 					</g>
 					<g data-name="FreeTextQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="780.3" y="1718.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M780.3 1749.0 L1124.3 1749.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M780.3 1825.0 L1124.3 1825.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<rect x="616.8" y="1718.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M616.8 1749.0 L960.8 1749.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M616.8 1825.0 L960.8 1825.0" fill="none" data-name="FreeTextQuestionFormData"></path>
 						</g>
-						<g transform="translate(780.25, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(616.75, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(780.25, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(616.75, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
@@ -980,7 +895,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(780.25, 1825)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(616.75, 1825)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
@@ -991,71 +906,179 @@
 					</g>
 					<g data-name="FreeTextQuestionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="854.3" y="1986.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+							<rect x="690.8" y="1986.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
 						</g>
-						<g transform="translate(854.25, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+						<g transform="translate(690.75, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
 								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="4764.3" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M4764.3 31.0 L5073.3 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
+					<g data-name="AudioRecordingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
+							<rect x="5047.0" y="124.5" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
+							<path d="M5047.0 155.5 L5399.0 155.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<path d="M5047.0 186.5 L5399.0 186.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
 						</g>
-						<g transform="translate(4764.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
+						<g transform="translate(5047, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5047, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5047, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="QuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
+							<rect x="4438.5" y="280.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M4438.5 311.0 L5451.5 311.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M4438.5 1332.0 L5451.5 1332.0" fill="none" data-name="QuestionFormViewModel"></path>
+						</g>
+						<g transform="translate(4438.5, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
+								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4438.5, 311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
+								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
+								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
+								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
+								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
+								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
+								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
+								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
+								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
+								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
+								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
+								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
+								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
+								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
+								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
+								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
+								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
+								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
+								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4764.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(4438.5, 1332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="3600.5" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M3600.5 171.0 L3952.5 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
-						</g>
-						<g transform="translate(3600.5, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
-								
-							</g>
+					<g data-name="ConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
+							<rect x="4167.0" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
 						</g>
-						<g transform="translate(3600.5, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(4167, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="FreeTextQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="5797.3" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M5797.3 133.0 L6149.3 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M5797.3 179.0 L6149.3 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<rect x="4655.0" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M4655.0 133.0 L5007.0 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M4655.0 179.0 L5007.0 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
 						</g>
-						<g transform="translate(5797.25, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(4655, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5797.25, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(4655, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5797.25, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(4655, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
@@ -1064,244 +1087,262 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="5113.3" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+					<g data-name="Enum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
+							<rect x="3722.8" y="933.5" height="31.0" width="61.0" data-name="Enum"></rect>
 						</g>
-						<g transform="translate(5113.25, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
+						<g transform="translate(3722.75, 933.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="5405.3" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M5405.3 155.5 L5757.3 155.5" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M5405.3 186.5 L5757.3 186.5" fill="none" data-name="BoolQuestionFormView"></path>
+					<g data-name="ImageCapturingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
+							<rect x="3871.0" y="124.5" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
+							<path d="M3871.0 155.5 L4223.0 155.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<path d="M3871.0 186.5 L4223.0 186.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
 						</g>
-						<g transform="translate(5405.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
+						<g transform="translate(3871, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5405.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(3871, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5405.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+						<g transform="translate(3871, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="1431.5" y="933.5" height="31.0" width="61.0" data-name="Enum"></rect>
+					<g data-name="IScaleQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
+							<rect x="5700.0" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M5700.0 31.0 L6009.0 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(1431.5, 933.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
+						<g transform="translate(5700, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
+								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="5013.3" y="124.5" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M5013.3 155.5 L5365.3 155.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M5013.3 186.5 L5365.3 186.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(5013.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
+						<g transform="translate(5700, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5013.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+					</g>
+					<g data-name="ScaleQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
+							<rect x="4263.0" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M4263.0 171.0 L4615.0 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
+						</g>
+						<g transform="translate(4263, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5013.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
+						<g transform="translate(4263, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ChoiceQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="4621.3" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M4621.3 155.5 L4973.3 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M4621.3 186.5 L4973.3 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<rect x="3479.0" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M3479.0 155.5 L3831.0 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M3479.0 186.5 L3831.0 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(4621.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(3479, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4621.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(3479, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4621.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(3479, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="4229.3" y="124.5" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M4229.3 155.5 L4581.3 155.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M4229.3 186.5 L4581.3 186.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+					<g data-name="BoolQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
+							<rect x="3087.0" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M3087.0 155.5 L3439.0 155.5" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M3087.0 186.5 L3439.0 186.5" fill="none" data-name="BoolQuestionFormView"></path>
 						</g>
-						<g transform="translate(4229.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
+						<g transform="translate(3087, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4229.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(3087, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4229.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
+						<g transform="translate(3087, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="6104.3" y="820.0" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M6104.3 851.0 L6736.3 851.0" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M6104.3 957.0 L6736.3 957.0" fill="none" data-name="WithQuestionnaireControls"></path>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="6268.0" y="1786.5" height="31.0" width="113.0" data-name="FormControl"></rect>
 						</g>
-						<g transform="translate(6104.25, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
+						<g transform="translate(6268, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6104.25, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
+					</g>
+					<g data-name="AbstractControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
+							<rect x="6028.0" y="1786.5" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+						</g>
+						<g transform="translate(6028, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
+								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6104.25, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
+					</g>
+					<g data-name="FormGroup">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
+							<rect x="5311.8" y="1786.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
+						</g>
+						<g transform="translate(5311.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="6319.3" y="1786.5" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
+					<g data-name="ManagedFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
+							<rect x="5439.0" y="155.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
 						</g>
-						<g transform="translate(6319.25, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
+						<g transform="translate(5439, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
+								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="6189.3" y="155.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
+					<g data-name="IListActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
+							<rect x="5694.0" y="155.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
 						</g>
-						<g transform="translate(6189.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
+						<g transform="translate(5694, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="6449.3" y="155.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
+					<g data-name="SurveyQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
+							<rect x="5898.0" y="132.5" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M5898.0 163.5 L6250.0 163.5" fill="none" data-name="SurveyQuestionFormView"></path>
 						</g>
-						<g transform="translate(6449.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
+						<g transform="translate(5898, 132.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5898, 163.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="1023.5" y="880.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M1023.5 911.0 L1391.5 911.0" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M1023.5 957.0 L1391.5 957.0" fill="none" data-name="QuestionnaireFormData"></path>
+					<g data-name="IFormDataWithSchedule">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
+							<rect x="1332.0" y="865.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
+							<path d="M1332.0 896.0 L1630.0 896.0" fill="none" data-name="IFormDataWithSchedule"></path>
+							<path d="M1332.0 1002.0 L1630.0 1002.0" fill="none" data-name="IFormDataWithSchedule"></path>
 						</g>
-						<g transform="translate(1023.5, 880)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
+						<g transform="translate(1332, 865)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
+								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1023.5, 911)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
+						<g transform="translate(1332, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1023.5, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
+						<g transform="translate(1332, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StudyUTimeOfDay">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
+							<rect x="416.8" y="1786.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
+						</g>
+						<g transform="translate(416.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
+								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ScheduleControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="6807.8" y="117.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M6807.8 148.0 L7239.8 148.0" fill="none" data-name="ScheduleControls"></path>
-							<path d="M6807.8 179.0 L7239.8 179.0" fill="none" data-name="ScheduleControls"></path>
+							<rect x="6290.0" y="117.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
+							<path d="M6290.0 148.0 L6722.0 148.0" fill="none" data-name="ScheduleControls"></path>
+							<path d="M6290.0 179.0 L6722.0 179.0" fill="none" data-name="ScheduleControls"></path>
 						</g>
-						<g transform="translate(6807.75, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
+						<g transform="translate(6290, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
 								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6807.75, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+						<g transform="translate(6290, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6807.75, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+						<g transform="translate(6290, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
@@ -1311,17 +1352,17 @@
 					</g>
 					<g data-name="WithScheduleControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="6776.3" y="797.5" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M6776.3 828.5 L7271.3 828.5" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M6776.3 1054.5 L7271.3 1054.5" fill="none" data-name="WithScheduleControls"></path>
+							<rect x="6258.5" y="797.5" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
+							<path d="M6258.5 828.5 L6753.5 828.5" fill="none" data-name="WithScheduleControls"></path>
+							<path d="M6258.5 1054.5 L6753.5 1054.5" fill="none" data-name="WithScheduleControls"></path>
 						</g>
-						<g transform="translate(6776.25, 797.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
+						<g transform="translate(6258.5, 797.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
 								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6776.25, 828.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+						<g transform="translate(6258.5, 828.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
@@ -1340,7 +1381,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(6776.25, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+						<g transform="translate(6258.5, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
@@ -1350,61 +1391,20 @@
 					</g>
 					<g data-name="FormConsumerWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="6927.8" y="15.5" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
+							<rect x="6410.0" y="15.5" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
 						</g>
-						<g transform="translate(6927.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+						<g transform="translate(6410, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
 								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="323.5" y="865.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M323.5 896.0 L621.5 896.0" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M323.5 1002.0 L621.5 1002.0" fill="none" data-name="IFormDataWithSchedule"></path>
-						</g>
-						<g transform="translate(323.5, 865)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
-								
-							</g>
-						</g>
-						<g transform="translate(323.5, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(323.5, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="392.5" y="1786.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
-						</g>
-						<g transform="translate(392.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
-								
-							</g>
-						</g>
-					</g>
 					<g data-name="StreamSubscription">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="7049.5" y="1786.5" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+							<rect x="6421.0" y="1786.5" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
 						</g>
-						<g transform="translate(7049.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
+						<g transform="translate(6421, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
 								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
 								
diff --git a/docs/uml/designer_v2/lib/features/design/uml.svg b/docs/uml/designer_v2/lib/features/design/uml.svg
index 5ea2c816d..e752ee322 100644
--- a/docs/uml/designer_v2/lib/features/design/uml.svg
+++ b/docs/uml/designer_v2/lib/features/design/uml.svg
@@ -1,191 +1,52 @@
-<svg version="1.1" baseProfile="full" width="29994.8" height="2822.0" viewbox="0 0 29994.75 2822" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[ScreenerQuestionFormViewModel
+<svg version="1.1" baseProfile="full" width="30192.8" height="2822.0" viewbox="0 0 30192.75 2822" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[StudyDesignInterventionsFormView
 	  |
-	  &lt;static&gt;+defaultResponseOptionValidity: bool;
-	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
-	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
-	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
-	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionValues: List&lt;dynamic&gt;;
-	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isDirtyOptionsBannerVisible: bool
-	  |
-	  +dynamic onResponseOptionsChanged();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
-	  +ScreenerQuestionFormViewModel createDuplicate()
-	]
-	
-	[ScreenerQuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
-	
-	[StudyDesignEnrollmentFormView
-	  |
-	  +Widget build();
-	  -dynamic _showScreenerQuestionSidesheetWithArgs();
-	  -dynamic _showConsentItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
-	
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
-	  |
-	  +isDirtyOptionsBannerVisible: bool
-	]
-	
-	[ScreenerQuestionLogicFormView
-	  |
-	  +formViewModel: ScreenerQuestionFormViewModel
-	  |
-	  +Widget build();
-	  -dynamic _buildInfoBanner();
-	  -dynamic _buildAnswerOptionsLogicControls();
-	  -List&lt;Widget&gt; _buildOptionLogicRow()
-	]
-	
-	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
-	
-	[ConsentItemFormData
-	  |
-	  +consentId: String;
-	  +title: String;
-	  +description: String;
-	  +iconName: String?;
-	  +id: String
-	  |
-	  +ConsentItem toConsentItem();
-	  +ConsentItemFormData copy()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
 	
-	[EnrollmentFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
-	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
-	  +consentItemArray: FormArray&lt;dynamic&gt;;
-	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +form: FormGroup;
-	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
-	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestScreener: bool;
-	  +canTestConsent: bool;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	[InterventionFormView
 	  |
-	  +void setControlsFrom();
-	  +EnrollmentFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
-	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
-	  +dynamic testScreener();
-	  +dynamic testConsent();
-	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
+	  +formViewModel: InterventionFormViewModel
 	]
 	
-	[EnrollmentFormViewModel]o-[Study]
-	[EnrollmentFormViewModel]o-[GoRouter]
-	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
-	[EnrollmentFormViewModel]o-[FormControl]
-	[EnrollmentFormViewModel]o-[FormArray]
-	[EnrollmentFormViewModel]o-[FormViewModelCollection]
-	[EnrollmentFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
+	[InterventionFormView]o-[InterventionFormViewModel]
 	
-	[EnrollmentFormConsentItemDelegate
+	[InterventionPreview
 	  |
-	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +owner: EnrollmentFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
+	  +routeArgs: InterventionFormRouteArgs
 	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ConsentItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
+	  +Widget build()
 	]
 	
-	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
-	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[InterventionPreview]o-[InterventionFormRouteArgs]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
 	
-	[ConsentItemFormViewModel
-	  |
-	  +consentIdControl: FormControl&lt;String&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +form: FormGroup;
-	  +consentId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
+	[StudyScheduleFormView
 	  |
-	  +void setControlsFrom();
-	  +ConsentItemFormData buildFormData();
-	  +ConsentItemFormViewModel createDuplicate()
-	]
-	
-	[ConsentItemFormViewModel]o-[FormControl]
-	[ConsentItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
-	
-	[ConsentItemFormView
+	  +formViewModel: StudyScheduleControls
 	  |
-	  +formViewModel: ConsentItemFormViewModel
+	  -FormTableRow _renderCustomSequence();
+	  +Widget build()
 	]
 	
-	[ConsentItemFormView]o-[ConsentItemFormViewModel]
+	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
 	
-	[EnrollmentFormData
+	[InterventionTaskFormData
 	  |
-	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
-	  +enrollmentType: Participation;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
+	  +taskId: String;
+	  +taskTitle: String;
+	  +taskDescription: String?;
+	  &lt;static&gt;+kDefaultTitle: String;
 	  +id: String
 	  |
-	  +Study apply();
-	  +EnrollmentFormData copy()
-	]
-	
-	[EnrollmentFormData]o-[Participation]
-	[EnrollmentFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
-	
-	[StudyDesignInterventionsFormView
-	  |
-	  +Widget build()
+	  +CheckmarkTask toTask();
+	  +InterventionTaskFormData copy()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
+	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
 	
 	[InterventionsFormViewModel
 	  |
@@ -224,134 +85,31 @@
 	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
 	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
 	
-	[InterventionFormViewModel
+	[InterventionTaskFormViewModel
 	  |
-	  +study: Study;
-	  +interventionIdControl: FormControl&lt;String&gt;;
-	  +interventionTitleControl: FormControl&lt;String&gt;;
-	  +interventionIconControl: FormControl&lt;IconOption&gt;;
-	  +interventionDescriptionControl: FormControl&lt;String&gt;;
-	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
-	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
+	  +taskIdControl: FormControl&lt;String&gt;;
+	  +instanceIdControl: FormControl&lt;String&gt;;
+	  +taskTitleControl: FormControl&lt;String&gt;;
+	  +taskDescriptionControl: FormControl&lt;String&gt;;
+	  +markAsCompletedControl: FormControl&lt;bool&gt;;
 	  +form: FormGroup;
-	  +interventionId: String;
+	  +taskId: String;
+	  +instanceId: String;
 	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
 	  +titleRequired: dynamic;
-	  +atLeastOneTask: dynamic;
-	  +breadcrumbsTitle: String;
 	  +titles: Map&lt;FormMode, String&gt;
 	  |
 	  +void setControlsFrom();
-	  +InterventionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +InterventionTaskFormViewModel provide();
-	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
-	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
-	  +InterventionFormViewModel createDuplicate()
-	]
-	
-	[InterventionFormViewModel]o-[Study]
-	[InterventionFormViewModel]o-[FormControl]
-	[InterventionFormViewModel]o-[FormArray]
-	[InterventionFormViewModel]o-[FormViewModelCollection]
-	[InterventionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
-	
-	[InterventionTaskFormData
-	  |
-	  +taskId: String;
-	  +taskTitle: String;
-	  +taskDescription: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +CheckmarkTask toTask();
-	  +InterventionTaskFormData copy()
+	  +InterventionTaskFormData buildFormData();
+	  +InterventionTaskFormViewModel createDuplicate()
 	]
 	
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
+	[InterventionTaskFormViewModel]o-[FormControl]
+	[InterventionTaskFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
+	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
 	
-	[StudyScheduleFormData
-	  |
-	  +sequenceType: PhaseSequence;
-	  +sequenceTypeCustom: String;
-	  +numCycles: int;
-	  +phaseDuration: int;
-	  +includeBaseline: bool;
-	  +id: String
-	  |
-	  +StudySchedule toStudySchedule();
-	  +Study apply();
-	  +StudyScheduleFormData copy()
-	]
-	
-	[StudyScheduleFormData]o-[PhaseSequence]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
-	
-	[InterventionPreview
-	  |
-	  +routeArgs: InterventionFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPreview]o-[InterventionFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
-	
-	[InterventionTaskFormViewModel
-	  |
-	  +taskIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +taskTitleControl: FormControl&lt;String&gt;;
-	  +taskDescriptionControl: FormControl&lt;String&gt;;
-	  +markAsCompletedControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +taskId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +InterventionTaskFormData buildFormData();
-	  +InterventionTaskFormViewModel createDuplicate()
-	]
-	
-	[InterventionTaskFormViewModel]o-[FormControl]
-	[InterventionTaskFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
-	
-	[InterventionsFormData
-	  |
-	  +interventionsData: List&lt;InterventionFormData&gt;;
-	  +studyScheduleData: StudyScheduleFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +InterventionsFormData copy()
-	]
-	
-	[InterventionsFormData]o-[StudyScheduleFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
-	
-	[InterventionFormView
-	  |
-	  +formViewModel: InterventionFormViewModel
-	]
-	
-	[InterventionFormView]o-[InterventionFormViewModel]
-	
-	[&lt;abstract&gt;StudyScheduleControls
+	[&lt;abstract&gt;StudyScheduleControls
 	  |
 	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
 	  &lt;static&gt;+defaultScheduleTypeSequence: String;
@@ -381,13 +139,6 @@
 	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
 	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
 	
-	[InterventionTaskFormView
-	  |
-	  +formViewModel: InterventionTaskFormViewModel
-	]
-	
-	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
-	
 	[InterventionFormData
 	  |
 	  +interventionId: String;
@@ -404,235 +155,257 @@
 	
 	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
 	
-	[StudyScheduleFormView
+	[StudyScheduleFormData
 	  |
-	  +formViewModel: StudyScheduleControls
+	  +sequenceType: PhaseSequence;
+	  +sequenceTypeCustom: String;
+	  +numCycles: int;
+	  +phaseDuration: int;
+	  +includeBaseline: bool;
+	  +id: String
 	  |
-	  -FormTableRow _renderCustomSequence();
-	  +Widget build()
+	  +StudySchedule toStudySchedule();
+	  +Study apply();
+	  +StudyScheduleFormData copy()
 	]
 	
-	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
+	[StudyScheduleFormData]o-[PhaseSequence]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
 	
-	[&lt;abstract&gt;IStudyFormData
+	[InterventionTaskFormView
 	  |
-	  +Study apply()
+	  +formViewModel: InterventionTaskFormViewModel
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
+	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
 	
-	[StudyInfoFormData
+	[InterventionsFormData
 	  |
-	  +title: String;
-	  +description: String?;
-	  +iconName: String;
-	  +contactInfoFormData: StudyContactInfoFormData;
+	  +interventionsData: List&lt;InterventionFormData&gt;;
+	  +studyScheduleData: StudyScheduleFormData;
 	  +id: String
 	  |
 	  +Study apply();
-	  +StudyInfoFormData copy()
+	  +InterventionsFormData copy()
 	]
 	
-	[StudyInfoFormData]o-[StudyContactInfoFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
+	[InterventionsFormData]o-[StudyScheduleFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
 	
-	[StudyContactInfoFormData
+	[InterventionFormViewModel
 	  |
-	  +organization: String?;
-	  +institutionalReviewBoard: String?;
-	  +institutionalReviewBoardNumber: String?;
-	  +researchers: String?;
-	  +email: String?;
-	  +website: String?;
-	  +phone: String?;
-	  +additionalInfo: String?;
-	  +id: String
+	  +study: Study;
+	  +interventionIdControl: FormControl&lt;String&gt;;
+	  +interventionTitleControl: FormControl&lt;String&gt;;
+	  +interventionIconControl: FormControl&lt;IconOption&gt;;
+	  +interventionDescriptionControl: FormControl&lt;String&gt;;
+	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
+	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
+	  +form: FormGroup;
+	  +interventionId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +atLeastOneTask: dynamic;
+	  +breadcrumbsTitle: String;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
+	  +void setControlsFrom();
+	  +InterventionFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +InterventionTaskFormViewModel provide();
+	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
+	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
+	  +InterventionFormViewModel createDuplicate()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
+	[InterventionFormViewModel]o-[Study]
+	[InterventionFormViewModel]o-[FormControl]
+	[InterventionFormViewModel]o-[FormArray]
+	[InterventionFormViewModel]o-[FormViewModelCollection]
+	[InterventionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
 	
-	[StudyDesignInfoFormView
+	[StudyDesignReportsFormView
 	  |
-	  +Widget build()
+	  +Widget build();
+	  -dynamic _showReportItemSidesheetWithArgs()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
 	
-	[StudyInfoFormViewModel
+	[ReportItemFormData
 	  |
-	  +study: Study;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +organizationControl: FormControl&lt;String&gt;;
-	  +reviewBoardControl: FormControl&lt;String&gt;;
-	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
-	  +researchersControl: FormControl&lt;String&gt;;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +websiteControl: FormControl&lt;String&gt;;
-	  +phoneControl: FormControl&lt;String&gt;;
-	  +additionalInfoControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +iconRequired: dynamic;
-	  +organizationRequired: dynamic;
-	  +reviewBoardRequired: dynamic;
-	  +reviewBoardNumberRequired: dynamic;
-	  +researchersRequired: dynamic;
-	  +emailRequired: dynamic;
-	  +phoneRequired: dynamic;
-	  +emailFormat: dynamic;
-	  +websiteFormat: dynamic
+	  +isPrimary: bool;
+	  +section: ReportSection;
+	  +id: String
 	  |
-	  +void setControlsFrom();
-	  +StudyInfoFormData buildFormData()
+	  &lt;static&gt;+dynamic fromDomainModel();
+	  +ReportItemFormData copy()
 	]
 	
-	[StudyInfoFormViewModel]o-[Study]
-	[StudyInfoFormViewModel]o-[FormControl]
-	[StudyInfoFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
+	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
+	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
 	
-	[MeasurementSurveyFormData
+	[DataReferenceEditor
 	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
+	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
+	  +availableTasks: List&lt;Task&gt;;
+	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
 	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
+	  +FormTableRow buildFormTableRow();
+	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
 	]
 	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
+	[DataReferenceEditor]o-[FormControl]
+	[DataReferenceEditor]o-[ReactiveDropdownField]
 	
-	[MeasurementSurveyFormView
+	[TemporalAggregationFormatted
 	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
+	  -_value: TemporalAggregation;
+	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
+	  +value: TemporalAggregation;
+	  +string: String;
+	  +icon: IconData?;
+	  +hashCode: int
+	  |
+	  +bool ==();
+	  +String toString();
+	  +String toJson();
+	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
 	]
 	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
+	[TemporalAggregationFormatted]o-[TemporalAggregation]
+	[TemporalAggregationFormatted]o-[IconData]
 	
-	[MeasurementSurveyFormViewModel
+	[ImprovementDirectionFormatted
 	  |
-	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
+	  -_value: ImprovementDirection;
+	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
+	  +value: ImprovementDirection;
+	  +string: String;
+	  +icon: IconData?;
+	  +hashCode: int
 	  |
-	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
+	  +bool ==();
+	  +String toString();
+	  +String toJson();
+	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
 	]
 	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
+	[ImprovementDirectionFormatted]o-[ImprovementDirection]
+	[ImprovementDirectionFormatted]o-[IconData]
 	
-	[SurveyPreview
+	[ReportSectionType
 	  |
-	  +routeArgs: MeasurementFormRouteArgs
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
+	  &lt;static&gt;+average: ReportSectionType;
+	  &lt;static&gt;+linearRegression: ReportSectionType
+	]
+	
+	[ReportSectionType]o-[ReportSectionType]
+	[Enum]&lt;:--[ReportSectionType]
+	
+	[AverageSectionFormView
+	  |
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
 	  |
 	  +Widget build()
 	]
 	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
+	[AverageSectionFormView]o-[ReportItemFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
 	
-	[StudyDesignMeasurementsFormView
+	[DataReferenceIdentifier
 	  |
-	  +Widget build()
+	  +hashCode: int
+	  |
+	  +bool ==()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
+	[DataReference]&lt;:-[DataReferenceIdentifier]
 	
-	[MeasurementsFormData
+	[LinearRegressionSectionFormView
 	  |
-	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
-	  +id: String
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
 	  |
-	  +Study apply();
-	  +MeasurementsFormData copy()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
+	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
 	
-	[MeasurementsFormViewModel
+	[ReportItemFormViewModel
 	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +measurementsArray: FormArray&lt;dynamic&gt;;
-	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
+	  &lt;static&gt;+defaultSectionType: ReportSectionType;
+	  +sectionIdControl: FormControl&lt;String&gt;;
+	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +sectionControl: FormControl&lt;ReportSection&gt;;
+	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
+	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
+	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
+	  +alphaControl: FormControl&lt;double&gt;;
+	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
 	  +form: FormGroup;
-	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
+	  +sectionId: String;
+	  +sectionType: ReportSectionType;
+	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
+	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
+	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;;
 	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +measurementRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +dataReferenceRequired: dynamic;
+	  +aggregationRequired: dynamic;
+	  +improvementDirectionRequired: dynamic;
+	  +alphaConfidenceRequired: dynamic
 	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +MeasurementsFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +MeasurementSurveyFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave()
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +ReportItemFormData buildFormData();
+	  +ReportItemFormViewModel createDuplicate();
+	  +dynamic onSectionTypeChanged();
+	  -void _updateFormControls();
+	  +void setControlsFrom()
 	]
 	
-	[MeasurementsFormViewModel]o-[Study]
-	[MeasurementsFormViewModel]o-[GoRouter]
-	[MeasurementsFormViewModel]o-[FormArray]
-	[MeasurementsFormViewModel]o-[FormViewModelCollection]
-	[MeasurementsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
+	[ReportItemFormViewModel]o-[ReportSectionType]
+	[ReportItemFormViewModel]o-[FormControl]
+	[ReportItemFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
 	
-	[StudyFormValidationSet
+	[ReportItemFormView
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: dynamic;
+	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
+	  |
+	  +Widget build();
+	  -dynamic _buildSectionText();
+	  -dynamic _buildSectionTypeHeader()
 	]
 	
-	[Enum]&lt;:--[StudyFormValidationSet]
+	[ReportItemFormView]o-[ReportItemFormViewModel]
+	[ReportItemFormView]o-[Widget Function(BuildContext)]
 	
 	[ReportsFormViewModel
 	  |
@@ -689,213 +462,259 @@
 	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
 	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
 	
-	[ReportItemFormData
+	[ReportBadge
 	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
+	  +status: ReportStatus?;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +showTooltip: bool
+	  |
+	  +Widget build()
+	]
+	
+	[ReportBadge]o-[ReportStatus]
+	[ReportBadge]o-[BadgeType]
+	
+	[ReportsFormData
+	  |
+	  +reportItems: List&lt;ReportItemFormData&gt;;
 	  +id: String
 	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
+	  +Study apply();
+	  +ReportsFormData copy()
 	]
 	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
 	
-	[ReportItemFormView
+	[ReportStatus
 	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
+	  &lt;static&gt;+primary: ReportStatus;
+	  &lt;static&gt;+secondary: ReportStatus
+	]
+	
+	[ReportStatus]o-[ReportStatus]
+	[Enum]&lt;:--[ReportStatus]
+	
+	[&lt;abstract&gt;IStudyFormData
 	  |
-	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
+	  +Study apply()
 	]
 	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
 	
-	[ReportItemFormViewModel
+	[StudyInfoFormViewModel
 	  |
-	  &lt;static&gt;+defaultSectionType: ReportSectionType;
-	  +sectionIdControl: FormControl&lt;String&gt;;
-	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
+	  +study: Study;
 	  +titleControl: FormControl&lt;String&gt;;
+	  +iconControl: FormControl&lt;IconOption&gt;;
 	  +descriptionControl: FormControl&lt;String&gt;;
-	  +sectionControl: FormControl&lt;ReportSection&gt;;
-	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
-	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
-	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
-	  +alphaControl: FormControl&lt;double&gt;;
-	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +organizationControl: FormControl&lt;String&gt;;
+	  +reviewBoardControl: FormControl&lt;String&gt;;
+	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
+	  +researchersControl: FormControl&lt;String&gt;;
+	  +emailControl: FormControl&lt;String&gt;;
+	  +websiteControl: FormControl&lt;String&gt;;
+	  +phoneControl: FormControl&lt;String&gt;;
+	  +additionalInfoControl: FormControl&lt;String&gt;;
 	  +form: FormGroup;
-	  +sectionId: String;
-	  +sectionType: ReportSectionType;
-	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
-	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
-	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
 	  +titles: Map&lt;FormMode, String&gt;;
 	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
 	  +titleRequired: dynamic;
 	  +descriptionRequired: dynamic;
-	  +dataReferenceRequired: dynamic;
-	  +aggregationRequired: dynamic;
-	  +improvementDirectionRequired: dynamic;
-	  +alphaConfidenceRequired: dynamic
+	  +iconRequired: dynamic;
+	  +organizationRequired: dynamic;
+	  +reviewBoardRequired: dynamic;
+	  +reviewBoardNumberRequired: dynamic;
+	  +researchersRequired: dynamic;
+	  +emailRequired: dynamic;
+	  +phoneRequired: dynamic;
+	  +emailFormat: dynamic;
+	  +websiteFormat: dynamic
 	  |
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +ReportItemFormData buildFormData();
-	  +ReportItemFormViewModel createDuplicate();
-	  +dynamic onSectionTypeChanged();
-	  -void _updateFormControls();
-	  +void setControlsFrom()
+	  +void setControlsFrom();
+	  +StudyInfoFormData buildFormData()
 	]
 	
-	[ReportItemFormViewModel]o-[ReportSectionType]
-	[ReportItemFormViewModel]o-[FormControl]
-	[ReportItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
+	[StudyInfoFormViewModel]o-[Study]
+	[StudyInfoFormViewModel]o-[FormControl]
+	[StudyInfoFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
 	
-	[TemporalAggregationFormatted
-	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
+	[StudyDesignInfoFormView
 	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
+	  +Widget build()
 	]
 	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
 	
-	[ImprovementDirectionFormatted
+	[StudyInfoFormData
 	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
+	  +title: String;
+	  +description: String?;
+	  +iconName: String;
+	  +contactInfoFormData: StudyContactInfoFormData;
+	  +id: String
 	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
+	  +Study apply();
+	  +StudyInfoFormData copy()
 	]
 	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
+	[StudyInfoFormData]o-[StudyContactInfoFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
 	
-	[ReportSectionType
+	[StudyContactInfoFormData
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
+	  +organization: String?;
+	  +institutionalReviewBoard: String?;
+	  +institutionalReviewBoardNumber: String?;
+	  +researchers: String?;
+	  +email: String?;
+	  +website: String?;
+	  +phone: String?;
+	  +additionalInfo: String?;
+	  +id: String
+	  |
+	  +Study apply();
+	  +StudyInfoFormData copy()
 	]
 	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
 	
-	[AverageSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
+	[StudyFormValidationSet
 	  |
-	  +Widget build()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
 	]
 	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
+	[Enum]&lt;:--[StudyFormValidationSet]
 	
-	[LinearRegressionSectionFormView
+	[MeasurementsFormData
 	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
+	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
+	  +id: String
 	  |
-	  +Widget build()
+	  +Study apply();
+	  +MeasurementsFormData copy()
 	]
 	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
 	
-	[DataReferenceIdentifier
-	  |
-	  +hashCode: int
+	[MeasurementSurveyFormView
 	  |
-	  +bool ==()
+	  +formViewModel: MeasurementSurveyFormViewModel
 	]
 	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
+	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
 	
-	[DataReferenceEditor
+	[SurveyPreview
 	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
+	  +routeArgs: MeasurementFormRouteArgs
 	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
+	  +Widget build()
 	]
 	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
+	[SurveyPreview]o-[MeasurementFormRouteArgs]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
 	
-	[ReportsFormData
+	[MeasurementSurveyFormData
 	  |
-	  +reportItems: List&lt;ReportItemFormData&gt;;
+	  +measurementId: String;
+	  +title: String;
+	  +introText: String?;
+	  +outroText: String?;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  &lt;static&gt;+kDefaultTitle: String;
 	  +id: String
 	  |
-	  +Study apply();
-	  +ReportsFormData copy()
+	  +QuestionnaireTask toQuestionnaireTask();
+	  +MeasurementSurveyFormData copy()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
+	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
 	
-	[ReportStatus
+	[MeasurementSurveyFormViewModel
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
-	  &lt;static&gt;+primary: ReportStatus;
-	  &lt;static&gt;+secondary: ReportStatus
+	  +study: Study;
+	  +measurementIdControl: FormControl&lt;String&gt;;
+	  +instanceIdControl: FormControl&lt;String&gt;;
+	  +surveyTitleControl: FormControl&lt;String&gt;;
+	  +surveyIntroTextControl: FormControl&lt;String&gt;;
+	  +surveyOutroTextControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +measurementId: String;
+	  +instanceId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +atLeastOneQuestion: dynamic;
+	  +breadcrumbsTitle: String;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void setControlsFrom();
+	  +MeasurementSurveyFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
+	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
+	  +MeasurementSurveyFormViewModel createDuplicate()
 	]
 	
-	[ReportStatus]o-[ReportStatus]
-	[Enum]&lt;:--[ReportStatus]
+	[MeasurementSurveyFormViewModel]o-[Study]
+	[MeasurementSurveyFormViewModel]o-[FormControl]
+	[MeasurementSurveyFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
 	
-	[ReportBadge
-	  |
-	  +status: ReportStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
+	[StudyDesignMeasurementsFormView
 	  |
 	  +Widget build()
 	]
 	
-	[ReportBadge]o-[ReportStatus]
-	[ReportBadge]o-[BadgeType]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
 	
-	[StudyDesignReportsFormView
+	[MeasurementsFormViewModel
 	  |
-	  +Widget build();
-	  -dynamic _showReportItemSidesheetWithArgs()
+	  +study: Study;
+	  +router: GoRouter;
+	  +measurementsArray: FormArray&lt;dynamic&gt;;
+	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
+	  +form: FormGroup;
+	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +measurementRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void read();
+	  +void setControlsFrom();
+	  +MeasurementsFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +MeasurementSurveyFormViewModel provide();
+	  +void onCancel();
+	  +dynamic onSave()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
+	[MeasurementsFormViewModel]o-[Study]
+	[MeasurementsFormViewModel]o-[GoRouter]
+	[MeasurementsFormViewModel]o-[FormArray]
+	[MeasurementsFormViewModel]o-[FormViewModelCollection]
+	[MeasurementsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
 	
 	[StudyFormScaffold
 	  |
@@ -910,111 +729,259 @@
 	[StudyFormScaffold]o-[Widget Function(T)]
 	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
 	
-	[SurveyQuestionFormView
+	[ConsentItemFormViewModel
 	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
+	  +consentIdControl: FormControl&lt;String&gt;;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +iconControl: FormControl&lt;IconOption&gt;;
+	  +form: FormGroup;
+	  +consentId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void setControlsFrom();
+	  +ConsentItemFormData buildFormData();
+	  +ConsentItemFormViewModel createDuplicate()
 	]
 	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
+	[ConsentItemFormViewModel]o-[FormControl]
+	[ConsentItemFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
 	
-	[QuestionFormViewModel
+	[StudyDesignEnrollmentFormView
 	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +Widget build();
+	  -dynamic _showScreenerQuestionSidesheetWithArgs();
+	  -dynamic _showConsentItemSidesheetWithArgs()
+	]
+	
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
+	
+	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
+	  |
+	  +isDirtyOptionsBannerVisible: bool
+	]
+	
+	[ScreenerQuestionLogicFormView
+	  |
+	  +formViewModel: ScreenerQuestionFormViewModel
+	  |
+	  +Widget build();
+	  -dynamic _buildInfoBanner();
+	  -dynamic _buildAnswerOptionsLogicControls();
+	  -List&lt;Widget&gt; _buildOptionLogicRow()
+	]
+	
+	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
+	
+	[ConsentItemFormData
+	  |
+	  +consentId: String;
+	  +title: String;
+	  +description: String;
+	  +iconName: String?;
+	  +id: String
+	  |
+	  +ConsentItem toConsentItem();
+	  +ConsentItemFormData copy()
+	]
+	
+	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
+	
+	[ConsentItemFormView
+	  |
+	  +formViewModel: ConsentItemFormViewModel
+	]
+	
+	[ConsentItemFormView]o-[ConsentItemFormViewModel]
+	
+	[EnrollmentFormData
+	  |
+	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
+	  +enrollmentType: Participation;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
+	  +id: String
+	  |
+	  +Study apply();
+	  +EnrollmentFormData copy()
+	]
+	
+	[EnrollmentFormData]o-[Participation]
+	[EnrollmentFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
+	
+	[ScreenerQuestionFormViewModel
+	  |
+	  &lt;static&gt;+defaultResponseOptionValidity: bool;
+	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
+	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
+	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
+	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +prevResponseOptionValues: List&lt;dynamic&gt;;
+	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isDirtyOptionsBannerVisible: bool
+	  |
+	  +dynamic onResponseOptionsChanged();
+	  +void setControlsFrom();
+	  +QuestionFormData buildFormData();
+	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
+	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
+	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
+	  +ScreenerQuestionFormViewModel createDuplicate()
+	]
+	
+	[ScreenerQuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
+	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
+	
+	[EnrollmentFormViewModel
+	  |
+	  +study: Study;
+	  +router: GoRouter;
+	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
+	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
+	  +consentItemArray: FormArray&lt;dynamic&gt;;
+	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
 	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
+	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
+	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
 	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
 	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
+	  +canTestScreener: bool;
+	  +canTestConsent: bool;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
 	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
 	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
+	  +EnrollmentFormData buildFormData();
+	  +void read();
 	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
 	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
+	  +void onNewItem();
+	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
+	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
+	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
+	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
+	  +dynamic testScreener();
+	  +dynamic testConsent();
+	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
 	]
 	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
+	[EnrollmentFormViewModel]o-[Study]
+	[EnrollmentFormViewModel]o-[GoRouter]
+	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
+	[EnrollmentFormViewModel]o-[FormControl]
+	[EnrollmentFormViewModel]o-[FormArray]
+	[EnrollmentFormViewModel]o-[FormViewModelCollection]
+	[EnrollmentFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
+	
+	[EnrollmentFormConsentItemDelegate
+	  |
+	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
+	  +owner: EnrollmentFormViewModel;
+	  +propagateOnSave: bool;
+	  +validationSet: dynamic
+	  |
+	  +void onCancel();
+	  +dynamic onSave();
+	  +ConsentItemFormViewModel provide();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem()
+	]
+	
+	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
+	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
+	
+	[StudyFormViewModel
+	  |
+	  +studyDirtyCopy: Study?;
+	  +studyRepository: IStudyRepository;
+	  +authRepository: IAuthRepository;
+	  +router: GoRouter;
+	  +studyInfoFormViewModel: StudyInfoFormViewModel;
+	  +enrollmentFormViewModel: EnrollmentFormViewModel;
+	  +measurementsFormViewModel: MeasurementsFormViewModel;
+	  +reportsFormViewModel: ReportsFormViewModel;
+	  +interventionsFormViewModel: InterventionsFormViewModel;
+	  +form: FormGroup;
+	  +isStudyReadonly: bool;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void read();
+	  +void setControlsFrom();
+	  +Study buildFormData();
+	  +void dispose();
+	  +void onCancel();
+	  +dynamic onSave();
+	  -dynamic _applyAndSaveSubform()
+	]
+	
+	[StudyFormViewModel]o-[Study]
+	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
+	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyFormViewModel]o-[GoRouter]
+	[StudyFormViewModel]o-[StudyInfoFormViewModel]
+	[StudyFormViewModel]o-[EnrollmentFormViewModel]
+	[StudyFormViewModel]o-[MeasurementsFormViewModel]
+	[StudyFormViewModel]o-[ReportsFormViewModel]
+	[StudyFormViewModel]o-[InterventionsFormViewModel]
+	[StudyFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
+	
+	[&lt;abstract&gt;WithQuestionnaireControls
+	  |
+	  +questionsArray: FormArray&lt;dynamic&gt;;
+	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
+	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
+	  +propagateOnSave: bool;
+	  +questionModels: List&lt;Q&gt;;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  |
+	  +void setQuestionnaireControlsFrom();
+	  +QuestionnaireFormData buildQuestionnaireFormData();
+	  +void read();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +Q provide();
+	  +Q provideQuestionFormViewModel()
+	]
+	
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	
+	[QuestionnaireFormData
+	  |
+	  +questionsData: List&lt;QuestionFormData&gt;?;
+	  +id: String
+	  |
+	  +StudyUQuestionnaire toQuestionnaire();
+	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
+	  +QuestionnaireFormData copy()
+	]
+	
+	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
 	
 	[&lt;abstract&gt;QuestionFormData
 	  |
@@ -1126,17 +1093,15 @@
 	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
 	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
 	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
+	[AudioRecordingQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
 	]
 	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
+	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
 	
 	[FreeTextQuestionFormView
 	  |
@@ -1151,16 +1116,6 @@
 	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
 	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
 	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
 	[SurveyQuestionType
 	  |
 	  +index: int;
@@ -1176,81 +1131,153 @@
 	[SurveyQuestionType]o-[SurveyQuestionType]
 	[Enum]&lt;:--[SurveyQuestionType]
 	
-	[AudioRecordingQuestionFormView
+	[ImageCapturingQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel
 	  |
 	  +Widget build()
 	]
 	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
+	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
 	
-	[ChoiceQuestionFormView
+	[&lt;abstract&gt;IScaleQuestionFormViewModel
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  +isMidValuesClearedInfoVisible: bool
+	]
+	
+	[ScaleQuestionFormView
 	  |
-	  +Widget build()
+	  +formViewModel: QuestionFormViewModel
 	]
 	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
+	[ScaleQuestionFormView]o-[QuestionFormViewModel]
 	
-	[ImageCapturingQuestionFormView
+	[ChoiceQuestionFormView
 	  |
 	  +formViewModel: QuestionFormViewModel
 	  |
 	  +Widget build()
 	]
 	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
+	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
 	
-	[&lt;abstract&gt;WithQuestionnaireControls
+	[BoolQuestionFormView
 	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  +formViewModel: QuestionFormViewModel
 	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
-	  +void read();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[BoolQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
 	
-	[QuestionnaireFormData
+	[QuestionFormViewModel
 	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
+	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
+	  -_titles: Map&lt;FormMode, String Function()&gt;?;
+	  +questionIdControl: FormControl&lt;String&gt;;
+	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
+	  +questionTextControl: FormControl&lt;String&gt;;
+	  +questionInfoTextControl: FormControl&lt;String&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
+	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +customOptionsMin: int;
+	  +customOptionsMax: int;
+	  +customOptionsInitial: int;
+	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
+	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
+	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
+	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
+	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
+	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
+	  &lt;static&gt;+kDefaultScaleMinValue: int;
+	  &lt;static&gt;+kDefaultScaleMaxValue: int;
+	  &lt;static&gt;+kNumMidValueControls: int;
+	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
+	  +scaleMinValueControl: FormControl&lt;int&gt;;
+	  +scaleMaxValueControl: FormControl&lt;int&gt;;
+	  -_scaleRangeControl: FormControl&lt;int&gt;;
+	  +scaleMinLabelControl: FormControl&lt;String&gt;;
+	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
+	  +scaleMidValueControls: FormArray&lt;int&gt;;
+	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
+	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
+	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
+	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
+	  +prevMidValues: List&lt;int?&gt;?;
+	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
+	  +customRegexControl: FormControl&lt;String&gt;;
+	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
+	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
+	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
+	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
+	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
+	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
+	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +form: FormGroup;
+	  +questionId: String;
+	  +questionType: SurveyQuestionType;
+	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
+	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
+	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +validAnswerOptions: List&lt;String&gt;;
+	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +scaleMinValue: int;
+	  +scaleMaxValue: int;
+	  +scaleRange: int;
+	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +questionTextRequired: dynamic;
+	  +numValidChoiceOptions: dynamic;
+	  +scaleRangeValid: dynamic;
+	  +maxRecordingDurationValid: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +isAddOptionButtonVisible: bool;
+	  +isMidValuesClearedInfoVisible: bool
 	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
+	  +String? scaleMidLabelAt();
+	  -dynamic _onScaleRangeChanged();
+	  -dynamic _applyInputFormatters();
+	  -dynamic _updateScaleMidValueControls();
+	  -Map&lt;String, dynamic&gt;? _validateFreeText();
+	  -dynamic _onFreeTextLengthChanged();
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +dynamic onQuestionTypeChanged();
+	  +dynamic onResponseOptionsChanged();
+	  -void _updateFormControls();
+	  +void initControls();
+	  +void setControlsFrom();
+	  +QuestionFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem();
+	  +dynamic save();
+	  +QuestionFormViewModel createDuplicate()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
+	[QuestionFormViewModel]o-[SurveyQuestionType]
+	[QuestionFormViewModel]o-[FormControl]
+	[QuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
+	[QuestionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
 	
-	[ScheduleControls
-	  |
-	  +formViewModel: WithScheduleControls
+	[SurveyQuestionFormView
 	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
+	  +formViewModel: QuestionFormViewModel;
+	  +isHtmlStyleable: bool
 	]
 	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
+	[SurveyQuestionFormView]o-[QuestionFormViewModel]
 	
 	[&lt;abstract&gt;IFormDataWithSchedule
 	  |
@@ -1267,6 +1294,17 @@
 	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
 	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
 	
+	[ScheduleControls
+	  |
+	  +formViewModel: WithScheduleControls
+	  |
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
+	]
+	
+	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
+	
 	[&lt;abstract&gt;WithScheduleControls
 	  |
 	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
@@ -1291,44 +1329,6 @@
 	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
 	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
 	
-	[StudyFormViewModel
-	  |
-	  +studyDirtyCopy: Study?;
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +router: GoRouter;
-	  +studyInfoFormViewModel: StudyInfoFormViewModel;
-	  +enrollmentFormViewModel: EnrollmentFormViewModel;
-	  +measurementsFormViewModel: MeasurementsFormViewModel;
-	  +reportsFormViewModel: ReportsFormViewModel;
-	  +interventionsFormViewModel: InterventionsFormViewModel;
-	  +form: FormGroup;
-	  +isStudyReadonly: bool;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +void dispose();
-	  +void onCancel();
-	  +dynamic onSave();
-	  -dynamic _applyAndSaveSubform()
-	]
-	
-	[StudyFormViewModel]o-[Study]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyFormViewModel]o-[GoRouter]
-	[StudyFormViewModel]o-[StudyInfoFormViewModel]
-	[StudyFormViewModel]o-[EnrollmentFormViewModel]
-	[StudyFormViewModel]o-[MeasurementsFormViewModel]
-	[StudyFormViewModel]o-[ReportsFormViewModel]
-	[StudyFormViewModel]o-[InterventionsFormViewModel]
-	[StudyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
-	
 	[&lt;abstract&gt;StudyDesignPageWidget
 	  |
 	  +Widget? banner()
@@ -1340,1077 +1340,1066 @@
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="2822.0" width="29994.8" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="2822.0" width="30192.8" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
 				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M6857.5 2713.7 L6857.5 2715 L8258.25 2749.30013795482 L8258.3 2749.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6862.8 2704.3 L6857.5 2713.7 L6852.2 2704.3 L6857.5 2695.0 Z"></path>
-					</g>
-					<path d="M16177.0 2334.1 L16173.25 2342 L7138.5 2522.87441966562 L7138.5 2522.9 " fill="none"></path>
-					<path d="M16181.8 2336.3 L16177.0 2334.1 L16172.2 2331.8 L16182.7 2322.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M801.0 1697.3 L801 2342 L6576.5 2519.84706513663 L6576.5 2519.8 " fill="none"></path>
-					</g>
-					<path d="M806.3 1697.3 L801.0 1697.3 L795.7 1697.3 L801.0 1684.0 Z"></path>
-					<path d="M1189.3 398.4 L224.5 531 L224.5 701.5 L224.5 701.5 " fill="none"></path>
-					<path d="M1190.0 403.7 L1189.3 398.4 L1188.6 393.1 L1202.5 396.6 Z"></path>
-					<path d="M2408.3 1740.7 L2408.25 2342 L6576.5 2516.7212732483003 L6576.5 2516.7 " fill="none"></path>
+					<path d="M1481.7 394.2 L148 531 L148 716.5 L148.0 716.5 " fill="none"></path>
+					<path d="M1482.3 399.5 L1481.7 394.2 L1481.2 388.9 L1495.0 392.9 Z"></path>
+					<path d="M523.5 797.2 L523.5 964 L6483 1606.8832785345232 L6483.0 1606.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2413.6 1731.3 L2408.3 1740.7 L2402.9 1731.3 L2408.3 1722.0 Z"></path>
+						<path d="M528.8 787.8 L523.5 797.2 L518.2 787.8 L523.5 778.5 Z"></path>
 					</g>
-					<path d="M16034.4 107.6 L3081.5 233 L3081.5 382 L3081.5 382 L3081.5 531 L3081.5 531 L3081.5 747.5 L3081.5 747.5 L3081.5 964 L3081.5 964 L2475.6727140783746 1584 L2475.7 1584.0 " fill="none"></path>
-					<path d="M16034.5 112.9 L16034.4 107.6 L16034.4 102.2 L16047.8 107.4 Z"></path>
-					<path d="M24974.4 109.1 L22050.5 233 L22050.5 298 L22050.5 298.0 " fill="none"></path>
-					<path d="M24974.7 114.5 L24974.4 109.1 L24974.2 103.8 L24987.8 108.6 Z"></path>
-					<path d="M5489.2 1919.7 L5351 2342 L7178.5 2525.4385091496233 L7178.5 2525.4 " fill="none"></path>
+					<path d="M4733.0 812.7 L4733 964 L2828.3341799709724 1637.5 L2828.3 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5497.2 1912.5 L5489.2 1919.7 L5487.0 1909.2 L5495.0 1902.0 Z"></path>
+						<path d="M4738.3 803.3 L4733.0 812.7 L4727.7 803.3 L4733.0 794.0 Z"></path>
 					</g>
-					<path d="M5504.6 1920.0 L5391 2342 L8915.5 2526.0972552863745 L8915.5 2526.1 " fill="none"></path>
+					<path d="M9145.9 385.0 L4733 531 L4733 701 L4733.0 701.0 " fill="none"></path>
+					<path d="M9146.1 390.3 L9145.9 385.0 L9145.7 379.6 L9159.3 384.5 Z"></path>
+					<path d="M11566.8 454.7 L11566.75 531 L11566.75 551 L11566.8 551.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5512.2 1912.4 L5504.6 1920.0 L5501.9 1909.6 L5509.5 1902.0 Z"></path>
+						<path d="M11572.1 445.3 L11566.8 454.7 L11561.4 445.3 L11566.8 436.0 Z"></path>
 					</g>
-					<path d="M5520.1 1920.3 L5431 2342 L5736.5 2422.759390503189 L5736.5 2422.8 " fill="none"></path>
+					<path d="M14294.9 111.4 L11566.75 233 L11566.75 328 L11566.8 328.0 " fill="none"></path>
+					<path d="M14295.2 116.7 L14294.9 111.4 L14294.7 106.0 L14308.3 110.8 Z"></path>
+					<path d="M28440.9 474.1 L28366.5 531 L28366.5 663.5 L28366.5 663.5 " fill="none"></path>
+					<path d="M28444.1 478.3 L28440.9 474.1 L28437.6 469.9 L28451.5 466.0 Z"></path>
+					<path d="M13202.3 1858.8 L12970.5 2342 L15307.5 2526.0973600844773 L15307.5 2526.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5527.2 1912.2 L5520.1 1920.3 L5516.8 1910.0 L5523.9 1902.0 Z"></path>
+						<path d="M13211.1 1852.7 L13202.3 1858.8 L13201.5 1848.1 L13210.3 1842.0 Z"></path>
 					</g>
-					<path d="M5535.5 1920.5 L5471 2342 L10248.5 2526.320179975176 L10248.5 2526.3 " fill="none"></path>
+					<path d="M13229.2 1859.6 L13061.5 2342 L17274.75 2526.485795621295 L17274.8 2526.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5542.2 1912.0 L5535.5 1920.5 L5531.7 1910.4 L5538.4 1902.0 Z"></path>
+						<path d="M13237.3 1852.6 L13229.2 1859.6 L13227.2 1849.1 L13235.3 1842.0 Z"></path>
 					</g>
-					<path d="M5607.6 1920.5 L5656.5 2342 L5656.5 2528.5 L5656.5 2528.5 L5656.5 2715 L5656.5 2715 L8258.25 2749.8437706309537 L8258.3 2749.8 " fill="none"></path>
+					<path d="M13328.4 1860.5 L13392 2342 L13392 2528.5 L13392 2528.5 L13392 2715 L13392 2715 L14290.75 2748.664600369296 L14290.8 2748.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5611.8 1910.7 L5607.6 1920.5 L5601.2 1911.9 L5605.4 1902.0 Z"></path>
+						<path d="M13332.5 1850.6 L13328.4 1860.5 L13321.9 1852.0 L13326.0 1842.0 Z"></path>
 					</g>
-					<path d="M5623.1 1920.4 L5696.5 2342 L5696.5 2528.5 L5696.5 2528.5 L5696.5 2715 L5696.5 2715 L8396.25 2749.116267687105 L8396.3 2749.1 " fill="none"></path>
+					<path d="M13340.4 1860.3 L13432 2342 L13432 2528.5 L13432 2528.5 L13432 2715 L13432 2715 L16712.5 2749.3533185840706 L16712.5 2749.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5626.7 1910.3 L5623.1 1920.4 L5616.2 1912.1 L5619.9 1902.0 Z"></path>
+						<path d="M13343.9 1850.2 L13340.4 1860.3 L13333.4 1852.2 L13336.9 1842.0 Z"></path>
 					</g>
-					<path d="M5808.5 1916.0 L6184.25 2342 L9467.25 2525.5645330535153 L9467.3 2525.6 " fill="none"></path>
+					<path d="M13427.0 1857.9 L13724.75 2342 L14630 2518.2768206734536 L14630.0 2518.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5806.3 1905.5 L5808.5 1916.0 L5798.3 1912.5 L5796.1 1902.0 Z"></path>
+						<path d="M13426.7 1847.2 L13427.0 1857.9 L13417.6 1852.7 L13417.2 1842.0 Z"></path>
 					</g>
-					<path d="M3865.8 400.4 L3287.5 531 L3287.5 747.5 L3287.5 747.5 L3287.5 964 L3287.5 964 L5125.5 1517.2468326780254 L5125.5 1517.2 " fill="none"></path>
-					<path d="M3867.0 405.6 L3865.8 400.4 L3864.7 395.2 L3878.8 397.5 Z"></path>
-					<path d="M15518.8 874.1 L15285.5 964 L6027.5 1620.9947471418272 L6027.5 1621.0 " fill="none"></path>
-					<path d="M15520.7 879.1 L15518.8 874.1 L15516.9 869.1 L15531.3 869.3 Z"></path>
+					<path d="M13386.0 401.5 L12970.5 531 L12970.5 747.5 L12970.5 747.5 L12970.5 964 L12970.5 964 L13210.340348330914 1464 L13210.3 1464.0 " fill="none"></path>
+					<path d="M13387.6 406.6 L13386.0 401.5 L13384.5 396.4 L13398.8 397.5 Z"></path>
+					<path d="M11304.4 952.2 L11289.25 964 L12881.5 1509.3263327948303 L12881.5 1509.3 " fill="none"></path>
+					<path d="M11307.7 956.4 L11304.4 952.2 L11301.1 948.0 L11314.9 944.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M11147.9 384.7 L4561.5 531 L4561.5 747.5 L4561.5 747.5 L4561.5 964 L4561.5 964 L5209.685776487663 1404 L5209.7 1404.0 " fill="none"></path>
+						<path d="M19282.2 385.5 L14192.25 531 L14192.25 747.5 L14192.25 747.5 L14192.25 964 L14192.25 964 L13545.47931785196 1464 L13545.5 1464.0 " fill="none"></path>
 					</g>
-					<path d="M11148.0 390.0 L11147.9 384.7 L11147.8 379.4 L11161.3 384.4 Z"></path>
+					<path d="M19282.3 390.8 L19282.2 385.5 L19282.0 380.2 L19295.5 385.1 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M870.4 770.0 L555 964 L5125.5 1591.118291347207 L5125.5 1591.1 " fill="none"></path>
+						<path d="M1814.8 766.9 L1161.25 964 L12881.5 1629.1909841635947 L12881.5 1629.2 " fill="none"></path>
 					</g>
-					<path d="M873.2 774.5 L870.4 770.0 L867.6 765.4 L881.8 763.0 Z"></path>
+					<path d="M1816.4 772.0 L1814.8 766.9 L1813.3 761.7 L1827.6 763.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M15015.3 398.4 L14129.25 531 L14129.25 747.5 L14129.25 747.5 L14129.25 964 L14129.25 964 L6027.5 1616.6679430592499 L6027.5 1616.7 " fill="none"></path>
+						<path d="M21030.3 398.0 L20115.75 531 L20115.75 747.5 L20115.75 747.5 L20115.75 964 L20115.75 964 L13720.5 1610.5867786786016 L13720.5 1610.6 " fill="none"></path>
 					</g>
-					<path d="M15016.1 403.7 L15015.3 398.4 L15014.5 393.1 L15028.5 396.4 Z"></path>
-					<path d="M6136.5 2653.7 L6136.5 2715 L8396.25 2748.8592909148465 L8396.3 2748.9 " fill="none"></path>
+					<path d="M21031.1 403.2 L21030.3 398.0 L21029.5 392.7 L21043.5 396.0 Z"></path>
+					<path d="M11935.7 1807.6 L11800.75 2342 L13125.5 2520.871221719457 L13125.5 2520.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6141.8 2644.3 L6136.5 2653.7 L6131.2 2644.3 L6136.5 2635.0 Z"></path>
+						<path d="M11943.2 1799.9 L11935.7 1807.6 L11932.8 1797.2 L11940.3 1789.5 Z"></path>
 					</g>
-					<path d="M6304.7 2411.3 L6404.25 2342 L5875.643323657475 1902 L5875.6 1902.0 " fill="none"></path>
+					<path d="M12013.8 1807.6 L12148.75 2342 L14630 2524.6356684755797 L14630.0 2524.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6294.0 2412.3 L6304.7 2411.3 L6300.1 2421.0 L6289.4 2422.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M11147.9 384.9 L5085.5 531 L5085.5 747.5 L5085.5 747.5 L5085.5 964 L5085.5 964 L5085.5 1653 L5085.5 1653 L5085.5 2342 L5085.5 2342 L5736.5 2457.519980970504 L5736.5 2457.5 " fill="none"></path>
+						<path d="M12016.7 1797.2 L12013.8 1807.6 L12006.3 1799.9 L12009.2 1789.5 Z"></path>
 					</g>
-					<path d="M11148.0 390.3 L11147.9 384.9 L11147.8 379.6 L11161.3 384.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M873.7 770.6 L595 964 L595 1653 L595 1653 L595 2342 L595 2342 L5736.5 2515.0379409907064 L5736.5 2515.0 " fill="none"></path>
-					</g>
-					<path d="M876.7 775.0 L873.7 770.6 L870.7 766.2 L884.7 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M15053.5 400.9 L14561.25 531 L14561.25 747.5 L14561.25 747.5 L14561.25 964 L14561.25 964 L14561.25 1653 L14561.25 1653 L14561.25 2342 L14561.25 2342 L6536.5 2519.645137837918 L6536.5 2519.6 " fill="none"></path>
-					</g>
-					<path d="M15054.8 406.1 L15053.5 400.9 L15052.1 395.8 L15066.4 397.5 Z"></path>
-					<path d="M1417.0 1799.6 L1221 2342 L10248.5 2527.3400209158963 L10248.5 2527.3 " fill="none"></path>
+					<path d="M3368.0 765.1 L2119 964 L11626.75 1628.6718666768131 L11626.8 1628.7 " fill="none"></path>
+					<path d="M3368.8 770.4 L3368.0 765.1 L3367.2 759.8 L3381.2 763.0 Z"></path>
+					<path d="M21654.0 910.6 L21623.5 964 L12322.75 1628.149941702293 L12322.8 1628.1 " fill="none"></path>
+					<path d="M21658.7 913.2 L21654.0 910.6 L21649.4 907.9 L21660.7 899.0 Z"></path>
+					<path d="M11586.6 962.6 L11586.75 964 L11586.75 1653 L11586.75 1653 L11586.75 2342 L11586.75 2342 L17466.25 2526.2128097438053 L17466.3 2526.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1425.2 1792.6 L1417.0 1799.6 L1415.2 1789.0 L1423.4 1782.0 Z"></path>
+						<path d="M11591.1 952.8 L11586.6 962.6 L11580.5 953.8 L11584.9 944.0 Z"></path>
 					</g>
-					<path d="M1529.5 1799.3 L1750 2342 L9467.25 2527.2398243186717 L9467.3 2527.2 " fill="none"></path>
+					<path d="M11963.8 855.5 L12362.75 964 L12362.75 1653 L12362.75 1653 L12362.75 2342 L12362.75 2342 L13125.5 2515.637931034483 L13125.5 2515.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1530.9 1788.6 L1529.5 1799.3 L1521.0 1792.7 L1522.4 1782.0 Z"></path>
+						<path d="M11956.2 847.9 L11963.8 855.5 L11953.4 858.2 L11945.8 850.6 Z"></path>
 					</g>
-					<path d="M1441.2 772.2 L1241 964 L1427.1248185776487 1524 L1427.1 1524.0 " fill="none"></path>
-					<path d="M1444.9 776.1 L1441.2 772.2 L1437.5 768.4 L1450.8 763.0 Z"></path>
-					<path d="M1805.0 797.2 L1805 964 L1532.721335268505 1524 L1532.7 1524.0 " fill="none"></path>
+					<path d="M26170.2 108.5 L22194.25 233 L22194.25 283 L22194.3 283.0 " fill="none"></path>
+					<path d="M26170.3 113.8 L26170.2 108.5 L26170.0 103.1 L26183.5 108.0 Z"></path>
+					<path d="M22887.0 1770.7 L22887 2342 L17612.25 2525.9541629657333 L17612.3 2526.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1810.3 787.8 L1805.0 797.2 L1799.7 787.8 L1805.0 778.5 Z"></path>
+						<path d="M22892.3 1761.3 L22887.0 1770.7 L22881.7 1761.3 L22887.0 1752.0 Z"></path>
 					</g>
-					<path d="M22734.9 845.2 L22624.25 964 L22624.25 1637.5 L22624.3 1637.5 " fill="none"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M23957.3 391.9 L22768.5 531 L22768.5 747.5 L22768.5 747.5 L22768.5 964 L22768.5 964 L22869.973149492016 1554 L22870.0 1554.0 " fill="none"></path>
+					</g>
+					<path d="M23957.9 397.2 L23957.3 391.9 L23956.6 386.6 L23970.5 390.4 Z"></path>
+					<path d="M4321.5 797.2 L4321.5 964 L11626.75 1621.6705647927351 L11626.8 1621.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22745.1 842.0 L22734.9 845.2 L22737.3 834.7 L22747.6 831.5 Z"></path>
+						<path d="M4326.8 787.8 L4321.5 797.2 L4316.2 787.8 L4321.5 778.5 Z"></path>
 					</g>
-					<path d="M22878.5 848.0 L22939.25 964 L27467.5 1626.0965037933047 L27467.5 1626.1 " fill="none"></path>
+					<path d="M23005.5 835.2 L23005.5 964 L22904.026850507984 1554 L22904.0 1554.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22878.8 837.3 L22878.5 848.0 L22869.4 842.2 L22869.8 831.5 Z"></path>
+						<path d="M23010.8 825.8 L23005.5 835.2 L23000.2 825.8 L23005.5 816.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M23365.3 402.2 L22825.75 531 L22825.75 663.5 L22825.8 663.5 " fill="none"></path>
+						<path d="M23957.3 394.2 L23005.5 531 L23005.5 678.5 L23005.5 678.5 " fill="none"></path>
 					</g>
-					<path d="M23366.5 407.4 L23365.3 402.2 L23364.0 397.0 L23378.3 399.1 Z"></path>
-					<path d="M1189.5 408.4 L637 531 L637 716.5 L637.0 716.5 " fill="none"></path>
-					<path d="M1190.6 413.6 L1189.5 408.4 L1188.3 403.2 L1202.5 405.5 Z"></path>
-					<path d="M8181.0 1859.4 L7993.25 2342 L7239.5 2521.24689193497 L7239.5 2521.2 " fill="none"></path>
+					<path d="M23958.1 399.5 L23957.3 394.2 L23956.5 388.9 L23970.5 392.3 Z"></path>
+					<path d="M6740.9 1902.4 L6442 2342 L15307.5 2527.860583408273 L15307.5 2527.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8189.3 1852.6 L8181.0 1859.4 L8179.4 1848.8 L8187.7 1842.0 Z"></path>
+						<path d="M6750.5 1897.7 L6740.9 1902.4 L6741.7 1891.7 L6751.4 1887.0 Z"></path>
 					</g>
-					<path d="M8261.2 1860.7 L8261 2342 L8915.5 2516.253033547466 L8915.5 2516.3 " fill="none"></path>
+					<path d="M6755.1 1902.9 L6482 2342 L13125.5 2526.927276119403 L13125.5 2526.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8266.5 1851.3 L8261.2 1860.7 L8255.8 1851.3 L8261.2 1842.0 Z"></path>
+						<path d="M6764.6 1897.7 L6755.1 1902.9 L6755.5 1892.1 L6765.0 1887.0 Z"></path>
 					</g>
-					<path d="M8341.5 1859.4 L8529 2342 L8529 2528.5 L8529 2528.5 L8529 2715 L8529 2715 L8356.25 2742.6555806087936 L8356.3 2742.7 " fill="none"></path>
+					<path d="M6910.5 1905.7 L6910.5 2342 L6910.5 2528.5 L6910.5 2528.5 L6910.5 2715 L6910.5 2715 L14290.75 2750.2658579264394 L14290.8 2750.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8343.0 1848.8 L8341.5 1859.4 L8333.1 1852.6 L8334.7 1842.0 Z"></path>
+						<path d="M6915.8 1896.3 L6910.5 1905.7 L6905.2 1896.3 L6910.5 1887.0 Z"></path>
 					</g>
-					<path d="M8404.4 1857.3 L8744 2342 L8744 2528.5 L8744 2528.5 L8744 2715 L8744 2715 L8609.774647887323 2735 L8609.8 2735.0 " fill="none"></path>
+					<path d="M7006.5 1904.4 L7173.5 2342 L7173.5 2528.5 L7173.5 2528.5 L7173.5 2715 L7173.5 2715 L16712.5 2750.097113540965 L16712.5 2750.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8403.4 1846.6 L8404.4 1857.3 L8394.7 1852.7 L8393.7 1842.0 Z"></path>
+						<path d="M7008.1 1893.8 L7006.5 1904.4 L6998.2 1897.6 L6999.8 1887.0 Z"></path>
 					</g>
-					<path d="M8415.9 1856.9 L8784 2342 L9467.25 2515.1921508664627 L9467.3 2515.2 " fill="none"></path>
+					<path d="M7020.9 1904.1 L7213.5 2342 L14630 2527.18908153702 L14630.0 2527.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8414.5 1846.2 L8415.9 1856.9 L8406.0 1852.7 L8404.6 1842.0 Z"></path>
+						<path d="M7022.0 1893.4 L7020.9 1904.1 L7012.3 1897.7 L7013.4 1887.0 Z"></path>
 					</g>
-					<path d="M3870.0 400.6 L3327.5 531 L3327.5 747.5 L3327.5 747.5 L3327.5 964 L3327.5 964 L7841.75 1594.416670889283 L7841.8 1594.4 " fill="none"></path>
-					<path d="M3871.3 405.8 L3870.0 400.6 L3868.8 395.4 L3883.0 397.5 Z"></path>
-					<path d="M17265.3 953.6 L17255.25 964 L8680.75 1620.8635201245274 L8680.8 1620.9 " fill="none"></path>
-					<path d="M17269.2 957.3 L17265.3 953.6 L17261.5 949.9 L17274.6 944.0 Z"></path>
+					<path d="M3440.3 769.7 L3105.75 964 L6483 1575.5842696629213 L6483.0 1575.6 " fill="none"></path>
+					<path d="M3443.0 774.3 L3440.3 769.7 L3437.6 765.1 L3451.8 763.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M11147.9 385.4 L5993.25 531 L5993.25 747.5 L5993.25 747.5 L5993.25 964 L5993.25 964 L7841.75 1525.55930335097 L7841.8 1525.6 " fill="none"></path>
+						<path d="M19282.2 385.5 L14232.25 531 L14232.25 747.5 L14232.25 747.5 L14232.25 964 L14232.25 964 L7338 1612.7708881073513 L7338.0 1612.8 " fill="none"></path>
 					</g>
-					<path d="M11148.1 390.8 L11147.9 385.4 L11147.8 380.1 L11161.3 385.1 Z"></path>
+					<path d="M19282.3 390.8 L19282.2 385.5 L19282.0 380.2 L19295.5 385.1 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M887.0 773.6 L741 964 L7841.75 1614.5657059273296 L7841.8 1614.6 " fill="none"></path>
+						<path d="M1817.8 767.1 L1201.25 964 L6483 1601.4087226868678 L6483.0 1601.4 " fill="none"></path>
 					</g>
-					<path d="M891.2 776.8 L887.0 773.6 L882.8 770.3 L895.1 763.0 Z"></path>
+					<path d="M1819.4 772.1 L1817.8 767.1 L1816.2 762.0 L1830.5 763.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M15121.6 410.7 L15107.5 531 L15107.5 747.5 L15107.5 747.5 L15107.5 964 L15107.5 964 L8680.75 1610.781924411174 L8680.8 1610.8 " fill="none"></path>
+						<path d="M21030.3 398.6 L20155.75 531 L20155.75 747.5 L20155.75 747.5 L20155.75 964 L20155.75 964 L7338 1630.7620278967931 L7338.0 1630.8 " fill="none"></path>
 					</g>
-					<path d="M15126.9 411.4 L15121.6 410.7 L15116.3 410.1 L15123.2 397.5 Z"></path>
-					<path d="M2956.9 1903.5 L2728 2342 L7178.5 2527.230584690917 L7178.5 2527.2 " fill="none"></path>
+					<path d="M21031.1 403.9 L21030.3 398.6 L21029.5 393.3 L21043.5 396.6 Z"></path>
+					<path d="M1482.0 409.1 L947.5 531 L947.5 709 L947.5 709.0 " fill="none"></path>
+					<path d="M1483.2 414.3 L1482.0 409.1 L1480.8 403.9 L1495.0 406.2 Z"></path>
+					<path d="M22582.3 469.7 L22582.25 531 L22582.25 732 L22582.3 732.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2966.0 1897.7 L2956.9 1903.5 L2956.5 1892.8 L2965.6 1887.0 Z"></path>
+						<path d="M22587.6 460.3 L22582.3 469.7 L22576.9 460.3 L22582.3 451.0 Z"></path>
 					</g>
-					<path d="M2971.3 1903.9 L2768 2342 L10248.5 2527.1019304763167 L10248.5 2527.1 " fill="none"></path>
+					<path d="M26170.2 108.7 L22582.25 233 L22582.25 313 L22582.3 313.0 " fill="none"></path>
+					<path d="M26170.4 114.0 L26170.2 108.7 L26170.0 103.3 L26183.5 108.2 Z"></path>
+					<path d="M5148.6 1736.6 L4667.5 2342 L13125.5 2527.2624346702682 L13125.5 2527.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2980.1 1897.7 L2971.3 1903.9 L2970.4 1893.2 L2979.2 1887.0 Z"></path>
+						<path d="M5158.5 1732.6 L5148.6 1736.6 L5150.2 1726.0 L5160.2 1722.0 Z"></path>
 					</g>
-					<path d="M3087.8 1905.7 L3087.75 2342 L3087.75 2528.5 L3087.75 2528.5 L3087.75 2715 L3087.75 2715 L8258.25 2750.166730529744 L8258.3 2750.2 " fill="none"></path>
+					<path d="M5217.5 1740.7 L5235 2342 L5428.922252010724 2513 L5428.9 2513.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3093.1 1896.3 L3087.8 1905.7 L3082.4 1896.3 L3087.8 1887.0 Z"></path>
+						<path d="M5222.6 1731.2 L5217.5 1740.7 L5211.9 1731.5 L5217.0 1722.0 Z"></path>
 					</g>
-					<path d="M3390.0 1898.8 L3935 2342 L3935 2528.5 L3935 2528.5 L3935 2715 L3935 2715 L8396.25 2749.6495378220206 L8396.3 2749.6 " fill="none"></path>
+					<path d="M28843.5 231.4 L28843.25 233 L28843.25 366.5 L28843.3 366.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3386.1 1888.8 L3390.0 1898.8 L3379.4 1897.0 L3375.5 1887.0 Z"></path>
+						<path d="M28850.2 223.1 L28843.5 231.4 L28839.7 221.4 L28846.4 213.0 Z"></path>
 					</g>
-					<path d="M3403.8 1898.4 L3975 2342 L9467.25 2526.734140403084 L9467.3 2526.7 " fill="none"></path>
+					<path d="M29008.9 224.8 L29019 233 L29238.289429530203 366.5 L29238.3 366.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3399.7 1888.5 L3403.8 1898.4 L3393.2 1896.9 L3389.1 1887.0 Z"></path>
-					</g>
-					<path d="M1470.8 776.2 L1496 964 L2660.25 1467.9536673472594 L2660.3 1468.0 " fill="none"></path>
-					<path d="M1476.1 775.5 L1470.8 776.2 L1465.6 776.9 L1469.1 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M11147.9 385.5 L6033.25 531 L6033.25 747.5 L6033.25 747.5 L6033.25 964 L6033.25 964 L3515.25 1553.0008487523342 L3515.3 1553.0 " fill="none"></path>
+						<path d="M29005.0 214.7 L29008.9 224.8 L28998.3 223.0 L28994.4 213.0 Z"></path>
 					</g>
-					<path d="M11148.1 390.8 L11147.9 385.5 L11147.8 380.1 L11161.3 385.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M891.3 774.5 L781 964 L2660.25 1525.3106101658177 L2660.3 1525.3 " fill="none"></path>
+					<path d="M29207.1 224.8 L29197 233 L29416.289429530203 366.5 L29416.3 366.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M29217.7 223.0 L29207.1 224.8 L29211.0 214.7 L29221.6 213.0 Z"></path>
 					</g>
-					<path d="M895.9 777.2 L891.3 774.5 L886.7 771.8 L898.0 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M15234.7 397.2 L16203.25 531 L16203.25 747.5 L16203.25 747.5 L16203.25 964 L16203.25 964 L3515.25 1630.5420304220197 L3515.3 1630.5 " fill="none"></path>
+					<path d="M29595.6 202.2 L29673.75 233 L29306.40100671141 366.5 L29306.4 366.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M29588.9 193.8 L29595.6 202.2 L29585.0 203.7 L29578.3 195.4 Z"></path>
 					</g>
-					<path d="M15235.4 391.9 L15234.7 397.2 L15234.0 402.4 L15221.5 395.3 Z"></path>
-					<path d="M28201.8 443.8 L27973.75 531 L27973.75 663.5 L27973.8 663.5 " fill="none"></path>
-					<path d="M28203.7 448.7 L28201.8 443.8 L28199.9 438.8 L28214.3 439.0 Z"></path>
-					<path d="M23211.3 1770.7 L23211.25 2342 L20418.5 2523.749236674518 L20418.5 2523.7 " fill="none"></path>
+					<path d="M4523.9 2512.9 L5035.083333333334 2475 L5167.541666666667 2475 L5167.541666666667 2475 L5300 2528.5 L5300 2528.5 L5167.541666666667 2582 L5167.541666666667 2582 L5035.083333333334 2582 L5035.083333333334 2582 L4505.25 2542.703211645102 L4505.3 2542.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23216.6 1761.3 L23211.3 1770.7 L23205.9 1761.3 L23211.3 1752.0 Z"></path>
+						<path d="M4514.2 2508.3 L4523.9 2512.9 L4515.0 2518.9 L4505.3 2514.3 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M23365.9 417.0 L23092.75 531 L23092.75 747.5 L23092.75 747.5 L23092.75 964 L23092.75 964 L23194.223149492016 1554 L23194.2 1554.0 " fill="none"></path>
+						<path d="M5958.5 1680.2 L5594.5 2342 L4505.25 2500.6141909037674 L4505.3 2500.6 " fill="none"></path>
 					</g>
-					<path d="M23368.0 421.9 L23365.9 417.0 L23363.9 412.1 L23378.3 411.8 Z"></path>
-					<path d="M18583.8 812.7 L18583.75 964 L18583.75 1637.5 L18583.8 1637.5 " fill="none"></path>
+					<path d="M5963.2 1682.8 L5958.5 1680.2 L5953.9 1677.6 L5965.0 1668.5 Z"></path>
+					<path d="M5280.3 827.7 L5280.25 964 L4533.5 1378.8443862124573 L4533.5 1378.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18589.1 803.3 L18583.8 812.7 L18578.4 803.3 L18583.8 794.0 Z"></path>
+						<path d="M5285.6 818.3 L5280.3 827.7 L5274.9 818.3 L5280.3 809.0 Z"></path>
 					</g>
-					<path d="M20049.0 390.6 L18583.75 531 L18583.75 701 L18583.8 701.0 " fill="none"></path>
-					<path d="M20049.5 395.9 L20049.0 390.6 L20048.5 385.2 L20062.3 389.3 Z"></path>
-					<path d="M7373.7 1806.0 L7093.25 2342 L10248.5 2525.219156223243 L10248.5 2525.2 " fill="none"></path>
+					<path d="M9145.9 385.4 L5280.25 531 L5280.25 686 L5280.3 686.0 " fill="none"></path>
+					<path d="M9146.1 390.7 L9145.9 385.4 L9145.7 380.0 L9159.3 384.9 Z"></path>
+					<path d="M30034.8 135.3 L30034.75 233 L30034.75 335.5 L30034.8 335.5 " fill="none"></path>
+					<path d="M30040.1 135.3 L30034.8 135.3 L30029.4 135.3 L30034.8 122.0 Z"></path>
+					<path d="M5799.3 827.7 L5799.25 964 L4533.5 1459.723603808441 L4533.5 1459.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7382.7 1800.2 L7373.7 1806.0 L7373.3 1795.3 L7382.3 1789.5 Z"></path>
+						<path d="M5804.6 818.3 L5799.3 827.7 L5793.9 818.3 L5799.3 809.0 Z"></path>
 					</g>
-					<path d="M7538.9 1805.8 L7837.5 2342 L9467.25 2522.679670084708 L9467.3 2522.7 " fill="none"></path>
+					<path d="M9145.9 385.9 L5799.25 531 L5799.25 686 L5799.3 686.0 " fill="none"></path>
+					<path d="M9146.2 391.2 L9145.9 385.9 L9145.7 380.5 L9159.3 385.3 Z"></path>
+					<path d="M3529.3 1865.3 L2382.25 2342 L4122.25 2510.009319181983 L4122.3 2510.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7539.0 1795.1 L7538.9 1805.8 L7529.7 1800.2 L7529.8 1789.5 Z"></path>
+						<path d="M3539.9 1866.6 L3529.3 1865.3 L3535.8 1856.8 L3546.5 1858.1 Z"></path>
 					</g>
-					<path d="M1476.0 775.7 L1536 964 L7105.75 1612.482573613282 L7105.8 1612.5 " fill="none"></path>
-					<path d="M1481.1 774.1 L1476.0 775.7 L1470.9 777.3 L1471.9 763.0 Z"></path>
-					<path d="M17901.1 906.6 L17818 964 L7801.75 1629.865475070555 L7801.8 1629.9 " fill="none"></path>
-					<path d="M17904.1 911.0 L17901.1 906.6 L17898.0 902.2 L17912.0 899.0 Z"></path>
-					<path d="M23329.8 835.2 L23329.75 964 L23228.276850507984 1554 L23228.3 1554.0 " fill="none"></path>
+					<path d="M4040.0 1958.2 L4040 2342 L13125.5 2527.347380223146 L13125.5 2527.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23335.1 825.8 L23329.8 835.2 L23324.4 825.8 L23329.8 816.5 Z"></path>
+						<path d="M4045.3 1948.8 L4040.0 1958.2 L4034.7 1948.8 L4040.0 1939.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M23416.4 423.4 L23329.75 531 L23329.75 678.5 L23329.8 678.5 " fill="none"></path>
-					</g>
-					<path d="M23420.6 426.7 L23416.4 423.4 L23412.3 420.0 L23424.8 413.0 Z"></path>
-					<path d="M3761.0 797.2 L3761 964 L3316.4009433962265 1419 L3316.4 1419.0 " fill="none"></path>
+					<path d="M4296.4 1953.7 L4627.5 2342 L14630 2527.5262307309795 L14630.0 2527.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3766.3 787.8 L3761.0 797.2 L3755.7 787.8 L3761.0 778.5 Z"></path>
+						<path d="M4294.4 1943.1 L4296.4 1953.7 L4286.3 1950.1 L4284.3 1939.5 Z"></path>
 					</g>
-					<path d="M17464.8 962.7 L17464.75 964 L17464.75 1653 L17464.75 1653 L17464.75 2342 L17464.75 2342 L20272.5 2523.773973791547 L20272.5 2523.8 " fill="none"></path>
+					<path d="M3443.5 770.3 L3145.75 964 L3668.15293904209 1366.5 L3668.2 1366.5 " fill="none"></path>
+					<path d="M3446.4 774.7 L3443.5 770.3 L3440.6 765.8 L3454.7 763.0 Z"></path>
+					<path d="M8130.3 838.3 L7810 964 L4533.5 1562.808620689655 L4533.5 1562.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17470.1 953.3 L17464.8 962.7 L17459.4 953.3 L17464.8 944.0 Z"></path>
+						<path d="M8140.9 839.9 L8130.3 838.3 L8137.0 829.9 L8147.7 831.5 Z"></path>
 					</g>
-					<path d="M17764.4 954.6 L17778 964 L17778 1653 L17778 1653 L17778 2342 L17778 2342 L10361.5 2527.0899571791783 L10361.5 2527.1 " fill="none"></path>
+					<path d="M8371.2 850.1 L8381.75 964 L7757.369557329463 1637.5 L7757.4 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17759.8 944.9 L17764.4 954.6 L17753.7 953.7 L17749.1 944.0 Z"></path>
+						<path d="M8375.7 840.3 L8371.2 850.1 L8365.1 841.3 L8369.5 831.5 Z"></path>
 					</g>
-					<path d="M4195.0 797.2 L4195 964 L7105.75 1579.422094361335 L7105.8 1579.4 " fill="none"></path>
+					<path d="M17954.3 1841.3 L17535.75 2342 L15368.5 2525.9117847798884 L15368.5 2525.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4200.3 787.8 L4195.0 797.2 L4189.7 787.8 L4195.0 778.5 Z"></path>
+						<path d="M17964.4 1837.6 L17954.3 1841.3 L17956.2 1830.7 L17966.3 1827.0 Z"></path>
 					</g>
-					<path d="M24974.4 109.5 L22410.5 233 L22410.5 283 L22410.5 283.0 " fill="none"></path>
-					<path d="M24974.7 114.8 L24974.4 109.5 L24974.2 104.2 L24987.8 108.9 Z"></path>
-					<path d="M17464.8 454.7 L17464.75 531 L17464.75 551 L17464.8 551.0 " fill="none"></path>
+					<path d="M18051.8 1844.8 L17896.25 2342 L17366.75 2513.5929626411817 L17366.8 2513.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17470.1 445.3 L17464.8 454.7 L17459.4 445.3 L17464.8 436.0 Z"></path>
-					</g>
-					<path d="M16253.0 117.0 L17464.75 233 L17464.75 328 L17464.8 328.0 " fill="none"></path>
-					<path d="M16253.5 111.7 L16253.0 117.0 L16252.5 122.3 L16239.8 115.7 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M24974.5 111.5 L23449.75 233 L23449.75 351 L23449.8 351.0 " fill="none"></path>
+						<path d="M18059.6 1837.5 L18051.8 1844.8 L18049.5 1834.3 L18057.3 1827.0 Z"></path>
 					</g>
-					<path d="M24974.9 116.8 L24974.5 111.5 L24974.0 106.1 L24987.8 110.4 Z"></path>
-					<path d="M23773.8 850.2 L23773.75 964 L23876.81603773585 1539 L23876.8 1539.0 " fill="none"></path>
+					<path d="M18062.8 1845.1 L17936.25 2342 L16474.75 2486.7529208709507 L16474.8 2486.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23779.1 840.8 L23773.8 850.2 L23768.4 840.8 L23773.8 831.5 Z"></path>
+						<path d="M18070.3 1837.4 L18062.8 1845.1 L18060.0 1834.7 L18067.4 1827.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M23529.3 418.6 L23773.75 531 L23773.75 663.5 L23773.8 663.5 " fill="none"></path>
-					</g>
-					<path d="M23531.5 413.7 L23529.3 418.6 L23527.0 423.4 L23517.2 413.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M23534.2 404.0 L24020.75 531 L24020.75 747.5 L24020.75 747.5 L24020.75 964 L24020.75 964 L23917.68396226415 1539 L23917.7 1539.0 " fill="none"></path>
-					</g>
-					<path d="M23535.5 398.9 L23534.2 404.0 L23532.8 409.2 L23521.3 400.7 Z"></path>
-					<path d="M1427.6 403.2 L2147 531 L2147 716.5 L2147.0 716.5 " fill="none"></path>
-					<path d="M1428.6 397.9 L1427.6 403.2 L1426.7 408.4 L1414.5 400.8 Z"></path>
-					<path d="M4245.1 1911.0 L4015 2342 L7178.5 2526.719082654978 L7178.5 2526.7 " fill="none"></path>
+					<path d="M18216.9 1843.3 L18492.25 2342 L18492.25 2528.5 L18492.25 2528.5 L18492.25 2715 L18492.25 2715 L14388.75 2750.0810957254666 L14388.8 2750.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4254.2 1905.2 L4245.1 1911.0 L4244.8 1900.2 L4253.9 1894.5 Z"></path>
+						<path d="M18217.0 1832.6 L18216.9 1843.3 L18207.7 1837.7 L18207.8 1827.0 Z"></path>
 					</g>
-					<path d="M4382.8 1913.2 L4382.75 2342 L10248.5 2526.7207353624044 L10248.5 2526.7 " fill="none"></path>
+					<path d="M18227.7 1842.9 L18532.25 2342 L18532.25 2528.5 L18532.25 2528.5 L18532.25 2715 L18532.25 2715 L16931.5 2748.2270866832337 L16931.5 2748.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4388.1 1903.8 L4382.8 1913.2 L4377.4 1903.8 L4382.8 1894.5 Z"></path>
+						<path d="M18227.4 1832.2 L18227.7 1842.9 L18218.3 1837.7 L18217.9 1827.0 Z"></path>
 					</g>
-					<path d="M4550.0 1910.1 L4831 2342 L9467.25 2526.411756864836 L9467.3 2526.4 " fill="none"></path>
+					<path d="M18238.4 1842.5 L18572.25 2342 L14735 2525.982807378366 L14735.0 2526.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4549.4 1899.4 L4550.0 1910.1 L4540.5 1905.2 L4539.9 1894.5 Z"></path>
+						<path d="M18237.7 1831.8 L18238.4 1842.5 L18228.8 1837.7 L18228.0 1827.0 Z"></path>
 					</g>
-					<path d="M3874.3 400.8 L3367.5 531 L3367.5 747.5 L3367.5 747.5 L3367.5 964 L3367.5 964 L4034.75 1416.8295986210294 L4034.8 1416.8 " fill="none"></path>
-					<path d="M3875.6 406.0 L3874.3 400.8 L3872.9 395.7 L3887.2 397.5 Z"></path>
-					<path d="M28363.3 865.2 L28363.25 964 L27722.778301886792 1584 L27722.8 1584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28368.6 855.8 L28363.3 865.2 L28357.9 855.8 L28363.3 846.5 Z"></path>
+					<path d="M13434.8 409.4 L13374.25 531 L13374.25 747.5 L13374.25 747.5 L13374.25 964 L13374.25 964 L17681.75 1590.4627968337732 L17681.8 1590.5 " fill="none"></path>
+					<path d="M13439.6 411.8 L13434.8 409.4 L13430.1 407.1 L13440.8 397.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M19282.2 385.5 L14272.25 531 L14272.25 747.5 L14272.25 747.5 L14272.25 964 L14272.25 964 L17681.75 1575.8363068107826 L17681.8 1575.8 " fill="none"></path>
 					</g>
-					<path d="M28363.3 479.3 L28363.25 531 L28363.25 648.5 L28363.3 648.5 " fill="none"></path>
-					<path d="M28368.6 479.3 L28363.3 479.3 L28357.9 479.3 L28363.3 466.0 Z"></path>
-					<path d="M4823.5 797.2 L4823.5 964 L9892.75 1608.7391665512944 L9892.8 1608.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4828.8 787.8 L4823.5 797.2 L4818.2 787.8 L4823.5 778.5 Z"></path>
+					<path d="M19282.3 390.9 L19282.2 385.5 L19282.0 380.2 L19295.5 385.2 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M21069.7 401.0 L20587.75 531 L20587.75 747.5 L20587.75 747.5 L20587.75 964 L20587.75 964 L18541.75 1533.343295638126 L18541.8 1533.3 " fill="none"></path>
 					</g>
-					<path d="M10182.8 1882.6 L10066.75 2342 L7239.5 2526.509535473712 L7239.5 2526.5 " fill="none"></path>
+					<path d="M21071.1 406.1 L21069.7 401.0 L21068.3 395.8 L21082.6 397.5 Z"></path>
+					<path d="M16053.3 2653.7 L16053.25 2715 L16712.5 2745.4434146341464 L16712.5 2745.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10190.2 1874.9 L10182.8 1882.6 L10179.9 1872.2 L10187.3 1864.5 Z"></path>
+						<path d="M16058.6 2644.3 L16053.3 2653.7 L16047.9 2644.3 L16053.3 2635.0 Z"></path>
 					</g>
-					<path d="M10262.2 1883.1 L10305 2342 L10305 2513 L10305.0 2513.0 " fill="none"></path>
+					<path d="M16493.4 2496.4 L18612.25 2342 L18238.146226415094 1827 L18238.1 1827.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10266.6 1873.3 L10262.2 1883.1 L10256.0 1874.3 L10260.5 1864.5 Z"></path>
+						<path d="M16483.7 2491.8 L16493.4 2496.4 L16484.4 2502.4 L16474.8 2497.8 Z"></path>
 					</g>
-					<path d="M10310.4 1882.4 L10450 2342 L9572.25 2517.9746036011825 L9572.3 2518.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10312.8 1871.9 L10310.4 1882.4 L10302.6 1875.0 L10305.0 1864.5 Z"></path>
-					</g>
-					<path d="M1480.8 774.9 L1576 964 L9892.75 1625.327880204276 L9892.8 1625.3 " fill="none"></path>
-					<path d="M1485.6 772.5 L1480.8 774.9 L1476.0 777.3 L1474.8 763.0 Z"></path>
-					<path d="M15524.1 881.6 L15325.5 964 L10588.75 1605.8448792959339 L10588.8 1605.8 " fill="none"></path>
-					<path d="M15526.1 886.5 L15524.1 881.6 L15522.0 876.7 L15536.4 876.5 Z"></path>
-					<path d="M17929.6 907.3 L17858 964 L10588.75 1621.5224982769373 L10588.8 1621.5 " fill="none"></path>
-					<path d="M17932.9 911.5 L17929.6 907.3 L17926.3 903.1 L17940.0 899.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M11389.9 399.4 L12297.5 531 L12297.5 747.5 L12297.5 747.5 L12297.5 964 L12297.5 964 L10588.75 1536.4219034885134 L10588.8 1536.4 " fill="none"></path>
+						<path d="M19282.2 386.0 L14868.5 531 L14868.5 747.5 L14868.5 747.5 L14868.5 964 L14868.5 964 L14868.5 1653 L14868.5 1653 L14868.5 2342 L14868.5 2342 L15631.75 2462.1486600548637 L15631.8 2462.1 " fill="none"></path>
 					</g>
-					<path d="M11390.6 394.1 L11389.9 399.4 L11389.1 404.7 L11376.7 397.5 Z"></path>
+					<path d="M19282.3 391.3 L19282.2 386.0 L19282.0 380.7 L19295.5 385.6 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M909.7 776.3 L927 964 L9892.75 1627.2561266944035 L9892.8 1627.3 " fill="none"></path>
+						<path d="M1820.7 767.3 L1241.25 964 L1241.25 1653 L1241.25 1653 L1241.25 2342 L1241.25 2342 L15631.75 2523.1928335133675 L15631.8 2523.2 " fill="none"></path>
 					</g>
-					<path d="M915.0 775.8 L909.7 776.3 L904.3 776.8 L908.4 763.0 Z"></path>
+					<path d="M1822.4 772.3 L1820.7 767.3 L1819.0 762.2 L1833.3 763.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M15234.7 396.6 L16243.25 531 L16243.25 747.5 L16243.25 747.5 L16243.25 964 L16243.25 964 L10588.75 1613.0546438983756 L10588.8 1613.1 " fill="none"></path>
+						<path d="M21073.9 401.2 L20627.75 531 L20627.75 747.5 L20627.75 747.5 L20627.75 964 L20627.75 964 L20627.75 1653 L20627.75 1653 L20627.75 2342 L20627.75 2342 L16474.75 2511.31566291398 L16474.8 2511.3 " fill="none"></path>
+					</g>
+					<path d="M21075.4 406.3 L21073.9 401.2 L21072.4 396.1 L21086.7 397.5 Z"></path>
+					<path d="M7448.4 1739.8 L7253.5 2342 L6316 2502.701976102941 L6316.0 2502.7 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M7456.4 1732.5 L7448.4 1739.8 L7446.2 1729.2 L7454.2 1722.0 Z"></path>
 					</g>
-					<path d="M15235.4 391.3 L15234.7 396.6 L15234.0 401.9 L15221.5 394.9 Z"></path>
-					<path d="M18960.8 812.7 L18960.75 964 L18960.75 1637.5 L18960.8 1637.5 " fill="none"></path>
+					<path d="M7522.5 1738.4 L7847.75 2342 L7847.75 2513 L7847.8 2513.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18966.1 803.3 L18960.8 812.7 L18955.4 803.3 L18960.8 794.0 Z"></path>
+						<path d="M7522.8 1727.7 L7522.5 1738.4 L7513.4 1732.7 L7513.7 1722.0 Z"></path>
 					</g>
-					<path d="M20049.0 393.3 L18960.75 531 L18960.75 701 L18960.8 701.0 " fill="none"></path>
-					<path d="M20049.7 398.6 L20049.0 393.3 L20048.4 388.0 L20062.3 391.6 Z"></path>
-					<path d="M1427.7 397.5 L2453.5 531 L2453.5 716.5 L2453.5 716.5 " fill="none"></path>
-					<path d="M1428.4 392.2 L1427.7 397.5 L1427.0 402.8 L1414.5 395.8 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M23534.4 396.7 L24307.75 531 L24307.75 686 L24307.8 686.0 " fill="none"></path>
+						<path d="M23957.5 402.0 L23411.5 531 L23411.5 686 L23411.5 686.0 " fill="none"></path>
 					</g>
-					<path d="M23535.3 391.4 L23534.4 396.7 L23533.5 402.0 L23521.3 394.4 Z"></path>
-					<path d="M9140.0 1850.2 L8824 2342 L7239.5 2524.9778637770896 L7239.5 2525.0 " fill="none"></path>
+					<path d="M23958.8 407.2 L23957.5 402.0 L23956.3 396.8 L23970.5 398.9 Z"></path>
+					<path d="M6334.5 2506.6 L6578.166666666667 2475 L6643.708333333333 2475 L6643.708333333333 2475 L6709.25 2528.5 L6709.25 2528.5 L6643.708333333333 2582 L6643.708333333333 2582 L6578.166666666667 2582 L6578.166666666667 2582 L6316 2548.0115105008076 L6316.0 2548.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9149.6 1845.2 L9140.0 1850.2 L9140.6 1839.5 L9150.1 1834.5 Z"></path>
+						<path d="M6324.6 2502.5 L6334.5 2506.6 L6325.9 2513.1 L6316.0 2509.0 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M5960.0 1680.5 L5634.5 2342 L6015 2475.6407721280602 L6015.0 2475.6 " fill="none"></path>
+					</g>
+					<path d="M5964.8 1682.8 L5960.0 1680.5 L5955.2 1678.1 L5965.9 1668.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M26170.2 110.1 L24042 233 L24042 351 L24042.0 351.0 " fill="none"></path>
 					</g>
-					<path d="M9178.8 1851.6 L8961.5 2342 L8961.5 2513 L8961.5 2513.0 " fill="none"></path>
+					<path d="M26170.5 115.4 L26170.2 110.1 L26169.9 104.8 L26183.5 109.3 Z"></path>
+					<path d="M13979.7 1911.2 L13764.75 2342 L15307.5 2524.884395359924 L15307.5 2524.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9187.4 1845.2 L9178.8 1851.6 L9177.7 1840.9 L9186.3 1834.5 Z"></path>
+						<path d="M13988.6 1905.2 L13979.7 1911.2 L13979.1 1900.5 L13988.0 1894.5 Z"></path>
 					</g>
-					<path d="M9313.3 1852.7 L9427.25 2342 L9427.25 2528.5 L9427.25 2528.5 L9427.25 2715 L9427.25 2715 L8356.25 2748.946875 L8356.3 2748.9 " fill="none"></path>
+					<path d="M14197.6 1912.2 L14345.5 2342 L13238.5 2519.4434894714223 L13238.5 2519.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9316.3 1842.4 L9313.3 1852.7 L9306.0 1844.8 L9309.0 1834.5 Z"></path>
+						<path d="M14199.6 1901.6 L14197.6 1912.2 L14189.6 1905.1 L14191.6 1894.5 Z"></path>
 					</g>
-					<path d="M9366.1 1851.2 L9612.25 2342 L9612.25 2528.5 L9612.25 2528.5 L9612.25 2715 L9612.25 2715 L8615.25 2746.9868956168098 L8615.3 2747.0 " fill="none"></path>
+					<path d="M14212.6 1911.8 L14385.5 2342 L14657.8163538874 2513 L14657.8 2513.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9366.7 1840.5 L9366.1 1851.2 L9357.2 1845.2 L9357.8 1834.5 Z"></path>
+						<path d="M14214.0 1901.2 L14212.6 1911.8 L14204.1 1905.1 L14205.6 1894.5 Z"></path>
 					</g>
-					<path d="M9377.4 1850.8 L9652.25 2342 L9530.762064343164 2513 L9530.8 2513.0 " fill="none"></path>
+					<path d="M13471.2 407.4 L13581.75 531 L13581.75 747.5 L13581.75 747.5 L13581.75 964 L13581.75 964 L13923.869920174166 1411.5 L13923.9 1411.5 " fill="none"></path>
+					<path d="M13475.2 403.9 L13471.2 407.4 L13467.3 411.0 L13462.4 397.5 Z"></path>
+					<path d="M1525.5 418.8 L1295.5 531 L1295.5 716.5 L1295.5 716.5 " fill="none"></path>
+					<path d="M1527.8 423.6 L1525.5 418.8 L1523.1 414.1 L1537.4 413.0 Z"></path>
+					<path d="M23827.5 850.2 L23827.5 964 L23930.56603773585 1539 L23930.6 1539.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9377.5 1840.0 L9377.4 1850.8 L9368.2 1845.2 L9368.3 1834.5 Z"></path>
+						<path d="M23832.8 840.8 L23827.5 850.2 L23822.2 840.8 L23827.5 831.5 Z"></path>
 					</g>
-					<path d="M4011.7 401.4 L4441.5 531 L4441.5 747.5 L4441.5 747.5 L4441.5 964 L4441.5 964 L8720.75 1575.036371172478 L8720.8 1575.0 " fill="none"></path>
-					<path d="M4013.2 396.2 L4011.7 401.4 L4010.1 406.5 L3998.9 397.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M11391.5 399.0 L12337.5 531 L12337.5 747.5 L12337.5 747.5 L12337.5 964 L12337.5 964 L9812.75 1530.4911666530977 L9812.8 1530.5 " fill="none"></path>
+						<path d="M23986.4 420.6 L23827.5 531 L23827.5 663.5 L23827.5 663.5 " fill="none"></path>
 					</g>
-					<path d="M11392.2 393.7 L11391.5 399.0 L11390.7 404.3 L11378.3 397.1 Z"></path>
+					<path d="M23989.5 425.0 L23986.4 420.6 L23983.4 416.2 L23997.4 413.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M914.9 775.8 L967 964 L8720.75 1607.6740564474833 L8720.8 1607.7 " fill="none"></path>
+						<path d="M24051.6 426.0 L24074.5 531 L24074.5 747.5 L24074.5 747.5 L24074.5 964 L24074.5 964 L23971.43396226415 1539 L23971.4 1539.0 " fill="none"></path>
 					</g>
-					<path d="M920.0 774.4 L914.9 775.8 L909.7 777.3 L911.3 763.0 Z"></path>
+					<path d="M24056.8 424.9 L24051.6 426.0 L24046.4 427.2 L24048.8 413.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M15234.7 396.1 L16283.25 531 L16283.25 747.5 L16283.25 747.5 L16283.25 964 L16283.25 964 L9812.75 1599.3843796764768 L9812.8 1599.4 " fill="none"></path>
+						<path d="M5988.8 1680.1 L6362 2342 L5901.335120643432 2490 L5901.3 2490.0 " fill="none"></path>
 					</g>
-					<path d="M15235.4 390.8 L15234.7 396.1 L15234.0 401.4 L15221.5 394.4 Z"></path>
+					<path d="M5993.4 1677.5 L5988.8 1680.1 L5984.1 1682.7 L5982.2 1668.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M10717.7 1681.6 L10595 2342 L10595 2490 L10595.0 2490.0 " fill="none"></path>
+						<path d="M24120.6 418.6 L24361.5 531 L24361.5 686 L24361.5 686.0 " fill="none"></path>
 					</g>
-					<path d="M10722.9 1682.6 L10717.7 1681.6 L10712.4 1680.6 L10720.1 1668.5 Z"></path>
-					<path d="M12101.3 1841.4 L11686.75 2342 L7239.5 2527.2296633353803 L7239.5 2527.2 " fill="none"></path>
+					<path d="M24122.8 413.8 L24120.6 418.6 L24118.3 423.5 L24108.5 413.0 Z"></path>
+					<path d="M10533.8 797.2 L10533.75 964 L14908.5 1602.2304271875496 L14908.5 1602.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12111.3 1837.6 L12101.3 1841.4 L12103.1 1830.8 L12113.2 1827.0 Z"></path>
+						<path d="M10539.1 787.8 L10533.8 797.2 L10528.4 787.8 L10533.8 778.5 Z"></path>
 					</g>
-					<path d="M12150.4 1843.3 L11870.25 2342 L9007.5 2525.550623119897 L9007.5 2525.6 " fill="none"></path>
+					<path d="M6250.8 812.7 L6250.75 964 L4731.953737300435 1637.5 L4732.0 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12159.6 1837.7 L12150.4 1843.3 L12150.3 1832.5 L12159.5 1827.0 Z"></path>
+						<path d="M6256.1 803.3 L6250.8 812.7 L6245.4 803.3 L6250.8 794.0 Z"></path>
 					</g>
-					<path d="M12189.7 1844.6 L12014.5 2342 L11671.5 2425.674950948332 L11671.5 2425.7 " fill="none"></path>
+					<path d="M9145.9 386.5 L6250.75 531 L6250.75 701 L6250.8 701.0 " fill="none"></path>
+					<path d="M9146.2 391.8 L9145.9 386.5 L9145.7 381.1 L9159.3 385.8 Z"></path>
+					<path d="M28756.0 865.2 L28756 964 L25333.5 1617.8479134895329 L25333.5 1617.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12197.9 1837.6 L12189.7 1844.6 L12187.8 1834.0 L12195.9 1827.0 Z"></path>
+						<path d="M28761.3 855.8 L28756.0 865.2 L28750.7 855.8 L28756.0 846.5 Z"></path>
 					</g>
-					<path d="M12313.9 1844.9 L12460.75 2342 L12460.75 2528.5 L12460.75 2528.5 L12460.75 2715 L12460.75 2715 L8356.25 2750.0811965811968 L8356.3 2750.1 " fill="none"></path>
+					<path d="M28681.6 474.1 L28756 531 L28756 648.5 L28756.0 648.5 " fill="none"></path>
+					<path d="M28684.9 469.9 L28681.6 474.1 L28678.4 478.3 L28671.0 466.0 Z"></path>
+					<path d="M15198.5 1882.6 L15082.5 2342 L15316.765415549598 2513 L15316.8 2513.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12316.4 1834.4 L12313.9 1844.9 L12306.2 1837.5 L12308.6 1827.0 Z"></path>
+						<path d="M15206.0 1874.9 L15198.5 1882.6 L15195.6 1872.2 L15203.1 1864.5 Z"></path>
 					</g>
-					<path d="M12399.9 1841.9 L12777.5 2342 L12777.5 2528.5 L12777.5 2528.5 L12777.5 2715 L12777.5 2715 L8615.25 2749.590009949084 L8615.3 2749.6 " fill="none"></path>
+					<path d="M15397.4 1880.4 L15683.5 2342 L13238.5 2524.287627423546 L13238.5 2524.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12398.5 1831.2 L12399.9 1841.9 L12390.0 1837.7 L12388.6 1827.0 Z"></path>
+						<path d="M15397.0 1869.6 L15397.4 1880.4 L15388.0 1875.2 L15387.6 1864.5 Z"></path>
 					</g>
-					<path d="M12410.5 1841.5 L12817.5 2342 L9572.25 2525.530930179668 L9572.3 2525.5 " fill="none"></path>
+					<path d="M15410.3 1880.0 L15723.5 2342 L14735 2519.094380403458 L14735.0 2519.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12408.8 1830.9 L12410.5 1841.5 L12400.5 1837.6 L12398.7 1827.0 Z"></path>
+						<path d="M15409.5 1869.2 L15410.3 1880.0 L15400.7 1875.2 L15399.9 1864.5 Z"></path>
+					</g>
+					<path d="M3446.8 770.9 L3185.75 964 L14908.5 1633.1361141602633 L14908.5 1633.1 " fill="none"></path>
+					<path d="M3450.0 775.2 L3446.8 770.9 L3443.6 766.6 L3457.5 763.0 Z"></path>
+					<path d="M20881.7 887.3 L20825.75 964 L15604.5 1609.9471652376892 L15604.5 1609.9 " fill="none"></path>
+					<path d="M20886.1 890.4 L20881.7 887.3 L20877.4 884.1 L20889.6 876.5 Z"></path>
+					<path d="M21917.2 908.2 L21976.25 964 L15604.5 1617.31831541352 L15604.5 1617.3 " fill="none"></path>
+					<path d="M21920.8 904.3 L21917.2 908.2 L21913.5 912.0 L21907.5 899.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M19430.4 406.6 L19563.75 531 L19563.75 747.5 L19563.75 747.5 L19563.75 964 L19563.75 964 L15604.5 1597.332927041616 L15604.5 1597.3 " fill="none"></path>
 					</g>
-					<path d="M4015.9 401.1 L4481.5 531 L4481.5 747.5 L4481.5 747.5 L4481.5 964 L4481.5 964 L11827.25 1614.8982091759638 L11827.3 1614.9 " fill="none"></path>
-					<path d="M4017.3 395.9 L4015.9 401.1 L4014.5 406.2 L4003.1 397.5 Z"></path>
+					<path d="M19434.0 402.7 L19430.4 406.6 L19426.7 410.5 L19420.6 397.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M11391.5 398.4 L12377.5 531 L12377.5 747.5 L12377.5 747.5 L12377.5 964 L12377.5 964 L12287.617924528302 1479 L12287.6 1479.0 " fill="none"></path>
+						<path d="M1823.7 767.5 L1281.25 964 L14908.5 1635.843097619005 L14908.5 1635.8 " fill="none"></path>
 					</g>
-					<path d="M11392.2 393.1 L11391.5 398.4 L11390.8 403.7 L11378.3 396.6 Z"></path>
+					<path d="M1825.5 772.6 L1823.7 767.5 L1821.9 762.5 L1836.2 763.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M15234.8 391.4 L16860.5 531 L16860.5 747.5 L16860.5 747.5 L16860.5 964 L16860.5 964 L12687.25 1588.6389507413242 L12687.3 1588.6 " fill="none"></path>
+						<path d="M21171.5 405.5 L21339.75 531 L21339.75 747.5 L21339.75 747.5 L21339.75 964 L21339.75 964 L15604.5 1613.5848847244483 L15604.5 1613.6 " fill="none"></path>
 					</g>
-					<path d="M15235.2 386.1 L15234.8 391.4 L15234.3 396.7 L15221.5 390.3 Z"></path>
-					<path d="M11250.0 2653.7 L11250 2715 L8615.25 2749.083492757584 L8615.3 2749.1 " fill="none"></path>
+					<path d="M21174.7 401.2 L21171.5 405.5 L21168.3 409.7 L21160.8 397.5 Z"></path>
+					<path d="M1601.3 426.3 L1602 531 L1602 716.5 L1602.0 716.5 " fill="none"></path>
+					<path d="M1606.6 426.3 L1601.3 426.3 L1596.0 426.4 L1601.2 413.0 Z"></path>
+					<path d="M16145.5 1849.9 L15805 2342 L15368.5 2516.3195931477517 L15368.5 2516.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11255.3 2644.3 L11250.0 2653.7 L11244.7 2644.3 L11250.0 2635.0 Z"></path>
+						<path d="M16155.2 1845.2 L16145.5 1849.9 L16146.5 1839.1 L16156.2 1834.5 Z"></path>
 					</g>
-					<path d="M11690.0 2477.4 L12857.5 2342 L12408.837082728593 1827 L12408.8 1827.0 " fill="none"></path>
+					<path d="M16211.3 1852.1 L16038 2342 L17274.75 2521.812024946404 L17274.8 2521.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11680.2 2473.2 L11690.0 2477.4 L11681.4 2483.8 L11671.5 2479.6 Z"></path>
+						<path d="M16219.5 1845.1 L16211.3 1852.1 L16209.4 1841.5 L16217.5 1834.5 Z"></path>
 					</g>
+					<path d="M16349.1 1852.2 L16514.75 2342 L16514.75 2528.5 L16514.75 2528.5 L16514.75 2715 L16514.75 2715 L14388.75 2749.7002298850575 L14388.8 2749.7 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M16351.2 1841.6 L16349.1 1852.2 L16341.1 1845.0 L16343.1 1834.5 Z"></path>
+					</g>
+					<path d="M16360.5 1851.9 L16554.75 2342 L16554.75 2528.5 L16554.75 2528.5 L16554.75 2715 L16554.75 2715 L16712.5 2735.9546304957903 L16712.5 2736.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M16362.1 1841.2 L16360.5 1851.9 L16352.1 1845.1 L16353.7 1834.5 Z"></path>
+					</g>
+					<path d="M16371.9 1851.5 L16594.75 2342 L14735 2523.379722839587 L14735.0 2523.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M16372.9 1840.8 L16371.9 1851.5 L16363.2 1845.2 L16364.2 1834.5 Z"></path>
+					</g>
+					<path d="M13526.4 400.6 L14072.25 531 L14072.25 747.5 L14072.25 747.5 L14072.25 964 L14072.25 964 L15735.75 1482.7379497623897 L15735.8 1482.7 " fill="none"></path>
+					<path d="M13527.6 395.4 L13526.4 400.6 L13525.1 405.8 L13513.4 397.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M11391.6 388.6 L14009.25 531 L14009.25 747.5 L14009.25 747.5 L14009.25 964 L14009.25 964 L14009.25 1653 L14009.25 1653 L14009.25 2342 L14009.25 2342 L11671.5 2500.0104648002175 L11671.5 2500.0 " fill="none"></path>
+						<path d="M19435.5 405.5 L19603.75 531 L19603.75 747.5 L19603.75 747.5 L19603.75 964 L19603.75 964 L16827.75 1539.7567730282963 L16827.8 1539.8 " fill="none"></path>
 					</g>
-					<path d="M11391.9 383.3 L11391.6 388.6 L11391.3 394.0 L11378.3 387.9 Z"></path>
+					<path d="M19438.7 401.2 L19435.5 405.5 L19432.3 409.7 L19424.8 397.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M919.8 775.1 L1007 964 L1007 1653 L1007 1653 L1007 2342 L1007 2342 L10828.5 2520.825514985844 L10828.5 2520.8 " fill="none"></path>
+						<path d="M1881.7 776.3 L1899 964 L15735.75 1626.844084059029 L15735.8 1626.8 " fill="none"></path>
 					</g>
-					<path d="M924.6 772.9 L919.8 775.1 L914.9 777.3 L914.2 763.0 Z"></path>
+					<path d="M1887.0 775.8 L1881.7 776.3 L1876.3 776.8 L1880.4 763.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M15234.8 390.5 L17045.75 531 L17045.75 747.5 L17045.75 747.5 L17045.75 964 L17045.75 964 L17045.75 1653 L17045.75 1653 L17045.75 2342 L17045.75 2342 L11671.5 2514.9366561704696 L11671.5 2514.9 " fill="none"></path>
+						<path d="M21176.3 404.5 L21379.75 531 L21379.75 747.5 L21379.75 747.5 L21379.75 964 L21379.75 964 L16827.75 1579.2075323656336 L16827.8 1579.2 " fill="none"></path>
 					</g>
-					<path d="M15235.2 385.2 L15234.8 390.5 L15234.4 395.8 L15221.5 389.5 Z"></path>
-					<path d="M25036.8 469.7 L25036.75 531 L25036.75 732 L25036.8 732.0 " fill="none"></path>
+					<path d="M21179.1 400.0 L21176.3 404.5 L21173.4 409.1 L21164.9 397.5 Z"></path>
+					<path d="M6944.7 823.3 L6825.75 964 L6155.915638606676 1637.5 L6155.9 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25042.1 460.3 L25036.8 469.7 L25031.4 460.3 L25036.8 451.0 Z"></path>
+						<path d="M6954.8 819.6 L6944.7 823.3 L6946.7 812.7 L6956.8 809.0 Z"></path>
 					</g>
-					<path d="M25036.8 135.3 L25036.75 233 L25036.75 313 L25036.8 313.0 " fill="none"></path>
-					<path d="M25042.1 135.3 L25036.8 135.3 L25031.4 135.3 L25036.8 122.0 Z"></path>
-					<path d="M11807.4 838.7 L11510 964 L14601.25 1558.1477787851315 L14601.3 1558.1 " fill="none"></path>
+					<path d="M7048.4 825.6 L7118.5 964 L6377.063497822932 1637.5 L6377.1 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11818.0 840.0 L11807.4 838.7 L11813.9 830.2 L11824.6 831.5 Z"></path>
+						<path d="M7048.9 814.9 L7048.4 825.6 L7039.4 819.7 L7039.9 809.0 Z"></path>
 					</g>
-					<path d="M12078.2 847.9 L12140.75 964 L12839.1763425254 1637.5 L12839.2 1637.5 " fill="none"></path>
+					<path d="M9145.9 388.0 L7008.75 531 L7008.75 686 L7008.8 686.0 " fill="none"></path>
+					<path d="M9146.3 393.3 L9145.9 388.0 L9145.6 382.7 L9159.3 387.1 Z"></path>
+					<path d="M8180.6 1798.4 L7887.75 2342 L13125.5 2526.5096803135475 L13125.5 2526.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12078.4 837.2 L12078.2 847.9 L12069.0 842.2 L12069.3 831.5 Z"></path>
+						<path d="M8189.8 1792.7 L8180.6 1798.4 L8180.4 1787.7 L8189.5 1782.0 Z"></path>
 					</g>
-					<path d="M14985.9 1957.1 L14848 2342 L14385.887399463807 2475 L14385.9 2475.0 " fill="none"></path>
+					<path d="M8340.6 1798.3 L8646.25 2342 L14630 2526.8779250362395 L14630.0 2526.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14994.0 1950.1 L14985.9 1957.1 L14984.0 1946.5 L14992.1 1939.5 Z"></path>
+						<path d="M8340.7 1787.5 L8340.6 1798.3 L8331.4 1792.7 L8331.5 1782.0 Z"></path>
 					</g>
-					<path d="M15184.7 1957.4 L15298.25 2342 L10361.5 2526.38970109648 L10361.5 2526.4 " fill="none"></path>
+					<path d="M3515.8 769.9 L3840 964 L7911 1598.7406653088933 L7911.0 1598.7 " fill="none"></path>
+					<path d="M3518.6 765.3 L3515.8 769.9 L3513.1 774.4 L3504.4 763.0 Z"></path>
+					<path d="M1720.3 389.9 L3850.5 531 L3850.5 701.5 L3850.5 701.5 " fill="none"></path>
+					<path d="M1720.7 384.6 L1720.3 389.9 L1720.0 395.2 L1707.0 389.0 Z"></path>
+					<path d="M12614.8 1740.7 L12614.75 2342 L12614.75 2362 L12614.8 2362.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15187.1 1946.9 L15184.7 1957.4 L15176.9 1950.0 L15179.4 1939.5 Z"></path>
+						<path d="M12620.1 1731.3 L12614.8 1740.7 L12609.4 1731.3 L12614.8 1722.0 Z"></path>
 					</g>
-					<path d="M15300.8 1954.9 L15565 2342 L9572.25 2526.8803399363137 L9572.3 2526.9 " fill="none"></path>
+					<path d="M14294.9 114.2 L12614.75 233 L12614.75 382 L12614.75 382 L12614.75 531 L12614.75 531 L12614.75 747.5 L12614.75 747.5 L12614.75 964 L12614.75 964 L12614.75 1584 L12614.8 1584.0 " fill="none"></path>
+					<path d="M14295.3 119.5 L14294.9 114.2 L14294.6 108.9 L14308.3 113.3 Z"></path>
+					<path d="M26170.2 111.8 L24750 233 L24750 298 L24750.0 298.0 " fill="none"></path>
+					<path d="M26170.7 117.1 L26170.2 111.8 L26169.8 106.5 L26183.5 110.7 Z"></path>
+					<path d="M13841.8 797.2 L13841.75 964 L8607 1610.0512740137028 L8607.0 1610.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15300.0 1944.2 L15300.8 1954.9 L15291.1 1950.2 L15290.3 1939.5 Z"></path>
+						<path d="M13847.1 787.8 L13841.8 797.2 L13836.4 787.8 L13841.8 778.5 Z"></path>
 					</g>
-					<path d="M1485.2 774.0 L1616 964 L14601.25 1627.7735138644161 L14601.3 1627.8 " fill="none"></path>
-					<path d="M1489.6 771.0 L1485.2 774.0 L1480.8 777.0 L1477.7 763.0 Z"></path>
-					<path d="M28645.5 231.4 L28645.25 233 L28645.25 366.5 L28645.3 366.5 " fill="none"></path>
+					<path d="M24758.2 843.3 L24610.5 964 L24610.5 1637.5 L24610.5 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28652.2 223.1 L28645.5 231.4 L28641.7 221.4 L28648.4 213.0 Z"></path>
+						<path d="M24768.8 841.5 L24758.2 843.3 L24762.1 833.3 L24772.7 831.5 Z"></path>
 					</g>
-					<path d="M28810.9 224.8 L28821 233 L29040.289429530203 366.5 L29040.3 366.5 " fill="none"></path>
+					<path d="M24931.3 847.8 L24996 964 L25134.12772133527 1584 L25134.1 1584.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28807.0 214.7 L28810.9 224.8 L28800.3 223.0 L28796.4 213.0 Z"></path>
+						<path d="M24931.5 837.1 L24931.3 847.8 L24922.1 842.2 L24922.3 831.5 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M24126.6 397.1 L24875.5 531 L24875.5 663.5 L24875.5 663.5 " fill="none"></path>
 					</g>
-					<path d="M29009.1 224.8 L28999 233 L29218.289429530203 366.5 L29218.3 366.5 " fill="none"></path>
+					<path d="M24127.6 391.9 L24126.6 397.1 L24125.7 402.4 L24113.5 394.8 Z"></path>
+					<path d="M12614.8 2713.7 L12614.75 2715 L14290.75 2749.4915942028983 L14290.8 2749.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29019.7 223.0 L29009.1 224.8 L29013.0 214.7 L29023.6 213.0 Z"></path>
+						<path d="M12620.1 2704.3 L12614.8 2713.7 L12609.4 2704.3 L12614.8 2695.0 Z"></path>
 					</g>
-					<path d="M29397.6 202.2 L29475.75 233 L29108.40100671141 366.5 L29108.4 366.5 " fill="none"></path>
+					<path d="M8921.2 2126.5 L8686.25 2342 L12333.75 2515.159921089474 L12333.8 2515.2 " fill="none"></path>
+					<path d="M8924.8 2130.5 L8921.2 2126.5 L8917.6 2122.6 L8931.0 2117.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M14662.5 1697.3 L14662.5 2342 L12895.75 2502.9077646197047 L12895.8 2502.9 " fill="none"></path>
+					</g>
+					<path d="M14667.8 1697.3 L14662.5 1697.3 L14657.2 1697.3 L14662.5 1684.0 Z"></path>
+					<path d="M18886.2 1918.3 L18652.25 2342 L15368.5 2526.7836991777926 L15368.5 2526.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29390.9 193.8 L29397.6 202.2 L29387.0 203.7 L29380.3 195.4 Z"></path>
+						<path d="M18895.4 1912.7 L18886.2 1918.3 L18886.1 1907.6 L18895.2 1902.0 Z"></path>
 					</g>
-					<path d="M14409.6 2477.9 L14421.5 2475 L14429 2475 L14429 2475 L14436.5 2528.5 L14436.5 2528.5 L14429 2582 L14429 2582 L14421.5 2582 L14421.5 2582 L14391.5 2574.7539503386006 L14391.5 2574.8 " fill="none"></path>
+					<path d="M18934.1 1919.5 L18777.75 2342 L17366.75 2522.611873713109 L17366.8 2522.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14399.3 2474.9 L14409.6 2477.9 L14401.8 2485.2 L14391.5 2482.2 Z"></path>
+						<path d="M18942.4 1912.6 L18934.1 1919.5 L18932.4 1908.9 L18940.6 1902.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M10742.3 1679.3 L11228.5 2342 L14008.5 2516.4809019013965 L14008.5 2516.5 " fill="none"></path>
+					<path d="M18949.5 1919.8 L18817.75 2342 L18452.25 2431.04735467015 L18452.3 2431.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M18957.4 1912.5 L18949.5 1919.8 L18947.2 1909.3 L18955.1 1902.0 Z"></path>
 					</g>
-					<path d="M10746.6 1676.1 L10742.3 1679.3 L10738.0 1682.4 L10734.4 1668.5 Z"></path>
-					<path d="M19412.3 827.7 L19412.25 964 L15588.25 1574.2457440648523 L15588.3 1574.2 " fill="none"></path>
+					<path d="M18964.9 1920.1 L18857.75 2342 L13238.5 2526.6434612165795 L13238.5 2526.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19417.6 818.3 L19412.3 827.7 L19406.9 818.3 L19412.3 809.0 Z"></path>
+						<path d="M18972.4 1912.4 L18964.9 1920.1 L18962.0 1909.7 L18969.5 1902.0 Z"></path>
 					</g>
-					<path d="M20049.7 400.2 L19412.25 531 L19412.25 686 L19412.3 686.0 " fill="none"></path>
-					<path d="M20050.7 405.4 L20049.7 400.2 L20048.6 395.0 L20062.7 397.5 Z"></path>
-					<path d="M19931.3 827.7 L19931.25 964 L15588.25 1582.6967848650884 L15588.3 1582.7 " fill="none"></path>
+					<path d="M19096.9 1920.2 L19198.25 2342 L19198.25 2528.5 L19198.25 2528.5 L19198.25 2715 L19198.25 2715 L14388.75 2750.1419676855 L14388.8 2750.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19936.6 818.3 L19931.3 827.7 L19925.9 818.3 L19931.3 809.0 Z"></path>
+						<path d="M19099.9 1909.8 L19096.9 1920.2 L19089.6 1912.3 L19092.6 1902.0 Z"></path>
 					</g>
-					<path d="M20105.9 405.3 L19931.25 531 L19931.25 686 L19931.3 686.0 " fill="none"></path>
-					<path d="M20109.0 409.6 L20105.9 405.3 L20102.8 401.0 L20116.7 397.5 Z"></path>
-					<path d="M29836.8 135.3 L29836.75 233 L29836.75 335.5 L29836.8 335.5 " fill="none"></path>
-					<path d="M29842.1 135.3 L29836.8 135.3 L29831.4 135.3 L29836.8 122.0 Z"></path>
-					<path d="M13319.0 1737.3 L12897.5 2342 L10361.5 2524.435486981678 L10361.5 2524.4 " fill="none"></path>
+					<path d="M19112.4 1919.9 L19238.25 2342 L19238.25 2528.5 L19238.25 2528.5 L19238.25 2715 L19238.25 2715 L16931.5 2748.891205380238 L16931.5 2748.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13328.7 1732.7 L13319.0 1737.3 L13319.9 1726.6 L13329.7 1722.0 Z"></path>
+						<path d="M19114.8 1909.4 L19112.4 1919.9 L19104.6 1912.5 L19107.0 1902.0 Z"></path>
 					</g>
-					<path d="M13406.3 1739.7 L13604.25 2342 L14501.656166219838 2513 L14501.7 2513.0 " fill="none"></path>
+					<path d="M19127.7 1919.6 L19278.25 2342 L14735 2526.3694989936353 L14735.0 2526.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13408.4 1729.2 L13406.3 1739.7 L13398.3 1732.5 L13400.4 1722.0 Z"></path>
+						<path d="M19129.6 1909.0 L19127.7 1919.6 L19119.6 1912.6 L19121.5 1902.0 Z"></path>
 					</g>
+					<path d="M13530.6 400.4 L14112.25 531 L14112.25 747.5 L14112.25 747.5 L14112.25 964 L14112.25 964 L18581.75 1589.8480845442537 L18581.8 1589.8 " fill="none"></path>
+					<path d="M13531.7 395.2 L13530.6 400.4 L13529.4 405.6 L13517.5 397.5 Z"></path>
+					<path d="M20970.6 889.8 L20963.75 964 L19483.75 1492.0787156913516 L19483.8 1492.1 " fill="none"></path>
+					<path d="M20975.9 890.3 L20970.6 889.8 L20965.3 889.3 L20971.8 876.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M23534.5 391.6 L24763.75 531 L24763.75 686 L24763.8 686.0 " fill="none"></path>
+						<path d="M19440.3 404.5 L19643.75 531 L19643.75 747.5 L19643.75 747.5 L19643.75 964 L19643.75 964 L19253.561320754718 1404 L19253.6 1404.0 " fill="none"></path>
 					</g>
-					<path d="M23535.1 386.3 L23534.5 391.6 L23533.9 396.9 L23521.3 390.1 Z"></path>
-					<path d="M12031.0 2506.9 L12281.333333333334 2475 L12348.541666666666 2475 L12348.541666666666 2475 L12415.75 2528.5 L12415.75 2528.5 L12348.541666666666 2582 L12348.541666666666 2582 L12281.333333333334 2582 L12281.333333333334 2582 L12012.5 2547.7013116057233 L12012.5 2547.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12021.1 2502.8 L12031.0 2506.9 L12022.4 2513.4 L12012.5 2509.3 Z"></path>
+					<path d="M19443.1 400.0 L19440.3 404.5 L19437.4 409.1 L19428.9 397.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M1886.9 775.8 L1939 964 L18581.75 1634.8214844606946 L18581.8 1634.8 " fill="none"></path>
 					</g>
+					<path d="M1892.0 774.4 L1886.9 775.8 L1881.7 777.3 L1883.3 763.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M10745.7 1678.5 L11336.5 2342 L11711.5 2475.0875356803044 L11711.5 2475.1 " fill="none"></path>
+						<path d="M21180.9 403.8 L21419.75 531 L21419.75 747.5 L21419.75 747.5 L21419.75 964 L21419.75 964 L19483.75 1522.8202764976959 L19483.8 1522.8 " fill="none"></path>
 					</g>
-					<path d="M10749.7 1674.9 L10745.7 1678.5 L10741.7 1682.0 L10736.8 1668.5 Z"></path>
-					<path d="M13842.2 1739.7 L13644.25 2342 L12012.5 2512.7512273811194 L12012.5 2512.8 " fill="none"></path>
+					<path d="M21183.4 399.1 L21180.9 403.8 L21178.4 408.5 L21169.1 397.5 Z"></path>
+					<path d="M18052.3 2653.7 L18052.25 2715 L16931.5 2747.340276366592 L16931.5 2747.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13850.2 1732.5 L13842.2 1739.7 L13840.1 1729.2 L13848.1 1722.0 Z"></path>
+						<path d="M18057.6 2644.3 L18052.3 2653.7 L18046.9 2644.3 L18052.3 2635.0 Z"></path>
 					</g>
-					<path d="M13877.0 1740.6 L13920 2342 L14724.5 2516.972886297376 L14724.5 2517.0 " fill="none"></path>
+					<path d="M18470.7 2466.9 L19318.25 2342 L19135.927793904208 1902 L19135.9 1902.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13881.7 1730.9 L13877.0 1740.6 L13871.0 1731.7 L13875.7 1722.0 Z"></path>
+						<path d="M18460.7 2462.9 L18470.7 2466.9 L18462.3 2473.5 L18452.3 2469.6 Z"></path>
 					</g>
-					<path d="M1427.8 393.6 L2845 531 L2845 709 L2845.0 709.0 " fill="none"></path>
-					<path d="M1428.3 388.3 L1427.8 393.6 L1427.3 398.9 L1414.5 392.3 Z"></path>
-					<path d="M20330.0 822.2 L20188 964 L20188 1637.5 L20188.0 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20340.3 819.4 L20330.0 822.2 L20332.8 811.8 L20343.2 809.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M19444.9 403.8 L19683.75 531 L19683.75 747.5 L19683.75 747.5 L19683.75 964 L19683.75 964 L19683.75 1653 L19683.75 1653 L19683.75 2342 L19683.75 2342 L18452.25 2482.7752068648483 L18452.3 2482.8 " fill="none"></path>
 					</g>
-					<path d="M20469.4 823.2 L20589.75 964 L20589.75 1637.5 L20589.8 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20467.4 812.6 L20469.4 823.2 L20459.3 819.6 L20457.3 809.0 Z"></path>
+					<path d="M19447.4 399.1 L19444.9 403.8 L19442.4 408.5 L19433.1 397.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M1891.8 775.1 L1979 964 L1979 1653 L1979 1653 L1979 2342 L1979 2342 L17652.25 2523.858748230756 L17652.3 2523.9 " fill="none"></path>
 					</g>
-					<path d="M20177.6 404.0 L20404.75 531 L20404.75 686 L20404.8 686.0 " fill="none"></path>
-					<path d="M20180.2 399.4 L20177.6 404.0 L20175.0 408.7 L20166.0 397.5 Z"></path>
-					<path d="M14345.3 804.7 L14345.25 964 L15992.75 1490.9858402971217 L15992.8 1491.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14350.6 795.3 L14345.3 804.7 L14339.9 795.3 L14345.3 786.0 Z"></path>
+					<path d="M1896.6 772.9 L1891.8 775.1 L1886.9 777.3 L1886.2 763.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M21185.3 403.1 L21459.75 531 L21459.75 747.5 L21459.75 747.5 L21459.75 964 L21459.75 964 L21459.75 1653 L21459.75 1653 L21459.75 2342 L21459.75 2342 L18452.25 2506.607116654439 L18452.3 2506.6 " fill="none"></path>
 					</g>
-					<path d="M16214.4 2339.2 L16213.25 2342 L15790 2472.526870607689 L15790.0 2472.5 " fill="none"></path>
+					<path d="M21187.6 398.3 L21185.3 403.1 L21183.1 408.0 L21173.3 397.5 Z"></path>
+					<path d="M17481.8 828.4 L16867.75 964 L16867.75 1653 L16867.75 1653 L16867.75 2342 L16867.75 2342 L15368.5 2524.7815819578364 L15368.5 2524.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16222.9 2332.7 L16214.4 2339.2 L16213.0 2328.6 L16221.6 2322.0 Z"></path>
+						<path d="M17492.0 831.6 L17481.8 828.4 L17489.7 821.2 L17500.0 824.4 Z"></path>
 					</g>
-					<path d="M16254.1 2339.6 L16253.25 2342 L10361.5 2526.728512587736 L10361.5 2526.7 " fill="none"></path>
+					<path d="M17481.9 839.2 L16983.25 964 L16983.25 1637.5 L16983.3 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16262.3 2332.6 L16254.1 2339.6 L16252.2 2329.0 L16260.4 2322.0 Z"></path>
+						<path d="M17492.2 842.1 L17481.9 839.2 L17489.7 831.7 L17500.0 834.6 Z"></path>
 					</g>
-					<path d="M16677.5 2340.1 L16678 2342 L16678 2528.5 L16678 2528.5 L16678 2715 L16678 2715 L8356.25 2750.292193053191 L8356.3 2750.3 " fill="none"></path>
+					<path d="M17482.2 864.3 L17169.75 964 L17169.75 1637.5 L17169.8 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16680.3 2329.7 L16677.5 2340.1 L16670.0 2332.4 L16672.8 2322.0 Z"></path>
+						<path d="M17492.7 866.5 L17482.2 864.3 L17489.5 856.3 L17500.0 858.6 Z"></path>
 					</g>
-					<path d="M16785.8 2339.2 L16787 2342 L16787 2513 L16787.0 2513.0 " fill="none"></path>
+					<path d="M17482.6 887.0 L17280.75 964 L17280.75 1653 L17280.75 1653 L17280.75 2342 L17280.75 2342 L17317.425603217158 2513 L17317.4 2513.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16787.2 2328.6 L16785.8 2339.2 L16777.3 2332.7 L16778.6 2322.0 Z"></path>
+						<path d="M17493.2 888.6 L17482.6 887.0 L17489.4 878.7 L17500.0 880.3 Z"></path>
 					</g>
-					<path d="M16825.5 2338.9 L16827 2342 L9572.25 2527.1600636354306 L9572.3 2527.2 " fill="none"></path>
+					<path d="M17519.8 938.4 L17475.75 964 L14456.5 1581.792931917737 L14456.5 1581.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16826.3 2328.1 L16825.5 2338.9 L16816.7 2332.7 L16817.5 2322.0 Z"></path>
+						<path d="M17530.5 938.3 L17519.8 938.4 L17525.2 929.1 L17535.9 929.0 Z"></path>
 					</g>
-					<path d="M1489.3 773.0 L1656 964 L15992.75 1629.489077526822 L15992.8 1629.5 " fill="none"></path>
-					<path d="M1493.3 769.5 L1489.3 773.0 L1485.3 776.6 L1480.5 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M938.8 770.9 L1201 964 L15992.75 1630.1883385354533 L15992.8 1630.2 " fill="none"></path>
-					</g>
-					<path d="M941.9 766.6 L938.8 770.9 L935.6 775.2 L928.0 763.0 Z"></path>
-					<path d="M25749.7 456.1 L25140.75 531 L25140.75 747.5 L25140.75 747.5 L25140.75 964 L25140.75 964 L25140.75 1653 L25140.75 1653 L25140.75 2342 L25140.75 2342 L15790 2524.9489233916443 L15790.0 2524.9 " fill="none"></path>
+					<path d="M17989.7 944.1 L18004 964 L18660.966618287373 1404 L18661.0 1404.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25759.6 460.3 L25749.7 456.1 L25758.3 449.7 L25768.3 453.8 Z"></path>
+						<path d="M17988.6 933.5 L17989.7 944.1 L17979.9 939.7 L17978.8 929.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M25099.0 112.5 L26352.25 233 L26352.25 253 L26352.3 253.0 " fill="none"></path>
-					</g>
-					<path d="M25099.5 107.2 L25099.0 112.5 L25098.5 117.8 L25085.8 111.2 Z"></path>
-					<path d="M25755.1 471.0 L25352.75 531 L25352.75 663.5 L25352.8 663.5 " fill="none"></path>
-					<path d="M25755.8 476.3 L25755.1 471.0 L25754.3 465.8 L25768.3 469.1 Z"></path>
-					<path d="M25827.2 514.3 L25760.75 531 L25760.75 678.5 L25760.8 678.5 " fill="none"></path>
-					<path d="M25828.5 519.4 L25827.2 514.3 L25825.9 509.1 L25840.1 511.0 Z"></path>
-					<path d="M26240.4 521.4 L26232.75 531 L26232.75 678.5 L26232.8 678.5 " fill="none"></path>
-					<path d="M26244.6 524.7 L26240.4 521.4 L26236.3 518.1 L26248.8 511.0 Z"></path>
-					<path d="M26704.5 515.7 L26744.75 531 L26744.75 671 L26744.8 671.0 " fill="none"></path>
-					<path d="M26706.4 510.7 L26704.5 515.7 L26702.6 520.7 L26692.1 511.0 Z"></path>
-					<path d="M27192.8 910.2 L27192.75 964 L27888.48820754717 1637.5 L27888.5 1637.5 " fill="none"></path>
+					<path d="M18024.8 942.8 L18044 964 L16745.971153846152 1471.5 L16746.0 1471.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27198.1 900.8 L27192.8 910.2 L27187.4 900.8 L27192.8 891.5 Z"></path>
+						<path d="M18022.5 932.3 L18024.8 942.8 L18014.6 939.5 L18012.3 929.0 Z"></path>
 					</g>
-					<path d="M26949.4 487.9 L27192.75 531 L27192.75 603.5 L27192.8 603.5 " fill="none"></path>
-					<path d="M26950.3 482.6 L26949.4 487.9 L26948.4 493.1 L26936.3 485.5 Z"></path>
-					<path d="M27576.8 850.2 L27576.75 964 L28166.42906386067 1637.5 L28166.4 1637.5 " fill="none"></path>
+					<path d="M18123.6 939.7 L18158.5 964 L18123.556240928883 1479 L18123.6 1479.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27582.1 840.8 L27576.8 850.2 L27571.4 840.8 L27576.8 831.5 Z"></path>
+						<path d="M18119.0 930.0 L18123.6 939.7 L18112.9 938.7 L18108.3 929.0 Z"></path>
 					</g>
-					<path d="M26949.5 454.7 L27576.75 531 L27576.75 663.5 L27576.8 663.5 " fill="none"></path>
-					<path d="M26950.1 449.4 L26949.5 454.7 L26948.8 460.0 L26936.3 453.1 Z"></path>
-					<path d="M16499.3 797.2 L16499.25 964 L16499.25 984 L16499.3 984.0 " fill="none"></path>
+					<path d="M18214.2 829.3 L18817.75 964 L13720.5 1600.6076494312774 L13720.5 1600.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16504.6 787.8 L16499.3 797.2 L16493.9 787.8 L16499.3 778.5 Z"></path>
+						<path d="M18206.3 822.0 L18214.2 829.3 L18203.9 832.4 L18196.0 825.2 Z"></path>
 					</g>
-					<path d="M20814.8 835.2 L20814.75 964 L17005.75 1572.1337040899084 L17005.8 1572.1 " fill="none"></path>
+					<path d="M18214.5 794.9 L19523.75 964 L19523.75 1653 L19523.75 1653 L19523.75 2342 L19523.75 2342 L14735 2526.4775367931834 L14735.0 2526.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20820.1 825.8 L20814.8 835.2 L20809.4 825.8 L20814.8 816.5 Z"></path>
+						<path d="M18205.9 788.4 L18214.5 794.9 L18204.6 798.9 L18196.0 792.5 Z"></path>
+					</g>
+					<path d="M13532.0 399.7 L14152.25 531 L17500 727.1138808090374 L17500.0 727.1 " fill="none"></path>
+					<path d="M13533.1 394.5 L13532.0 399.7 L13530.9 404.9 L13519.0 396.9 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M19466.2 401.5 L19879.75 531 L18196 710.4176818014028 L18196.0 710.4 " fill="none"></path>
 					</g>
-					<path d="M20221.6 400.4 L20814.75 531 L20814.75 678.5 L20814.8 678.5 " fill="none"></path>
-					<path d="M20222.8 395.2 L20221.6 400.4 L20220.5 405.6 L20208.6 397.5 Z"></path>
-					<path d="M21206.8 812.7 L21206.75 964 L17005.75 1578.867551779076 L17005.8 1578.9 " fill="none"></path>
+					<path d="M19467.8 396.4 L19466.2 401.5 L19464.6 406.6 L19453.5 397.5 Z"></path>
+					<path d="M21076.0 892.2 L21121.75 964 L21121.75 1653 L21121.75 1653 L21121.75 2342 L21121.75 2342 L21121.75 2528.5 L21121.75 2528.5 L21121.75 2715 L21121.75 2715 L14388.75 2750.2435122382776 L14388.8 2750.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21212.1 803.3 L21206.8 812.7 L21201.4 803.3 L21206.8 794.0 Z"></path>
+						<path d="M21075.5 881.5 L21076.0 892.2 L21066.5 887.2 L21066.0 876.5 Z"></path>
 					</g>
-					<path d="M20227.5 394.4 L21206.75 531 L21206.75 701 L21206.8 701.0 " fill="none"></path>
-					<path d="M20228.2 389.2 L20227.5 394.4 L20226.7 399.7 L20214.3 392.6 Z"></path>
-					<path d="M15807.4 2450.0 L15820 2445 L15827.5 2445 L15827.5 2445 L15835 2528.5 L15835 2528.5 L15827.5 2612 L15827.5 2612 L15820 2612 L15820 2612 L15790 2600.1560283687945 L15790.0 2600.2 " fill="none"></path>
+					<path d="M21151.3 888.5 L21241 964 L21241 1653 L21241 1653 L21241 2342 L21241 2342 L21241 2528.5 L21241 2528.5 L21241 2715 L21241 2715 L16931.5 2749.620332654447 L16931.5 2749.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15796.7 2448.5 L15807.4 2450.0 L15800.6 2458.4 L15790.0 2456.8 Z"></path>
+						<path d="M21147.6 878.4 L21151.3 888.5 L21140.7 886.6 L21137.0 876.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M10746.9 1678.2 L11376.5 2342 L15427 2520.5014768431 L15427.0 2520.5 " fill="none"></path>
+						<path d="M19470.5 401.2 L19919.75 531 L20667.75 683.2011278195489 L20667.8 683.2 " fill="none"></path>
 					</g>
-					<path d="M10750.7 1674.5 L10746.9 1678.2 L10743.0 1681.8 L10737.7 1668.5 Z"></path>
-					<path d="M21598.8 812.7 L21598.75 964 L17005.75 1584.5661339346996 L17005.8 1584.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21604.1 803.3 L21598.8 812.7 L21593.4 803.3 L21598.8 794.0 Z"></path>
+					<path d="M19471.9 396.1 L19470.5 401.2 L19469.0 406.3 L19457.7 397.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M21200.9 401.6 L21603.5 531 L21299.75 637.1103267446551 L21299.8 637.1 " fill="none"></path>
+					</g>
+					<path d="M21202.5 396.5 L21200.9 401.6 L21199.3 406.7 L21188.2 397.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M26170.3 113.8 L25149.5 233 L25149.5 382 L25149.5 382 L25149.5 531 L25149.5 531 L25149.5 747.5 L25149.5 747.5 L25149.5 964 L25149.5 964 L25149.5 1584 L25149.5 1584.0 " fill="none"></path>
 					</g>
-					<path d="M20227.5 391.1 L21598.75 531 L21598.75 701 L21598.8 701.0 " fill="none"></path>
-					<path d="M20228.1 385.8 L20227.5 391.1 L20227.0 396.4 L20214.3 389.8 Z"></path>
-					<path d="M21990.8 812.7 L21990.75 964 L17005.75 1589.4511517800236 L17005.8 1589.5 " fill="none"></path>
+					<path d="M26170.9 119.1 L26170.3 113.8 L26169.6 108.5 L26183.5 112.2 Z"></path>
+					<path d="M26289.7 450.1 L25573.5 531 L25573.5 747.5 L25573.5 747.5 L25573.5 964 L25573.5 964 L25573.5 1653 L25573.5 1653 L25573.5 2342 L25573.5 2342 L13835 2525.660255872483 L13835.0 2525.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21996.1 803.3 L21990.8 812.7 L21985.4 803.3 L21990.8 794.0 Z"></path>
+						<path d="M26299.6 454.3 L26289.7 450.1 L26298.4 443.7 L26308.3 448.0 Z"></path>
 					</g>
-					<path d="M20227.5 389.2 L21990.75 531 L21990.75 701 L21990.8 701.0 " fill="none"></path>
-					<path d="M20228.0 383.9 L20227.5 389.2 L20227.1 394.5 L20214.3 388.1 Z"></path>
-					<path d="M22382.8 812.7 L22382.75 964 L17005.75 1593.6852213818306 L17005.8 1593.7 " fill="none"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M26294.6 118.4 L26892.25 233 L26892.25 253 L26892.3 253.0 " fill="none"></path>
+					</g>
+					<path d="M26295.6 113.2 L26294.6 118.4 L26293.6 123.6 L26281.5 115.9 Z"></path>
+					<path d="M26295.0 462.4 L25785.5 531 L25785.5 663.5 L25785.5 663.5 " fill="none"></path>
+					<path d="M26295.7 467.7 L26295.0 462.4 L26294.3 457.1 L26308.3 460.6 Z"></path>
+					<path d="M26295.2 509.3 L26193.5 531 L26193.5 678.5 L26193.5 678.5 " fill="none"></path>
+					<path d="M26296.3 514.5 L26295.2 509.3 L26294.1 504.1 L26308.3 506.5 Z"></path>
+					<path d="M26684.8 518.3 L26665.5 531 L26665.5 678.5 L26665.5 678.5 " fill="none"></path>
+					<path d="M26687.7 522.8 L26684.8 518.3 L26681.9 513.9 L26695.9 511.0 Z"></path>
+					<path d="M27151.0 517.2 L27177.5 531 L27177.5 671 L27177.5 671.0 " fill="none"></path>
+					<path d="M27153.5 512.4 L27151.0 517.2 L27148.6 521.9 L27139.2 511.0 Z"></path>
+					<path d="M27625.5 910.2 L27625.5 964 L27625.5 1637.5 L27625.5 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22388.1 803.3 L22382.8 812.7 L22377.4 803.3 L22382.8 794.0 Z"></path>
+						<path d="M27630.8 900.8 L27625.5 910.2 L27620.2 900.8 L27625.5 891.5 Z"></path>
 					</g>
-					<path d="M20227.6 387.9 L22382.75 531 L22382.75 701 L22382.8 701.0 " fill="none"></path>
-					<path d="M20227.9 382.6 L20227.6 387.9 L20227.2 393.3 L20214.3 387.0 Z"></path>
-					<path d="M15869.6 895.0 L15880 964 L15880 1653 L15880 1653 L15880 2342 L15880 2342 L15880 2528.5 L15880 2528.5 L15880 2715 L15880 2715 L8356.25 2750.270294807038 L8356.3 2750.3 " fill="none"></path>
+					<path d="M27489.3 503.3 L27625.5 531 L27625.5 603.5 L27625.5 603.5 " fill="none"></path>
+					<path d="M27490.4 498.1 L27489.3 503.3 L27488.3 508.6 L27476.3 500.7 Z"></path>
+					<path d="M28009.5 850.2 L28009.5 964 L28009.5 1637.5 L28009.5 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15873.4 884.9 L15869.6 895.0 L15862.9 886.5 L15866.8 876.5 Z"></path>
+						<path d="M28014.8 840.8 L28009.5 850.2 L28004.2 840.8 L28009.5 831.5 Z"></path>
 					</g>
-					<path d="M15896.5 894.2 L15920 964 L15920 1653 L15920 1653 L15920 2342 L15920 2342 L15920 2528.5 L15920 2528.5 L15920 2715 L15920 2715 L8615.25 2749.9757055669825 L8615.3 2750.0 " fill="none"></path>
+					<path d="M27489.5 461.6 L28009.5 531 L28009.5 663.5 L28009.5 663.5 " fill="none"></path>
+					<path d="M27490.2 456.4 L27489.5 461.6 L27488.8 466.9 L27476.3 459.9 Z"></path>
+					<path d="M8919.8 812.7 L8919.75 964 L8934.779027576198 984 L8934.8 984.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15898.6 883.6 L15896.5 894.2 L15888.5 887.0 L15890.6 876.5 Z"></path>
+						<path d="M8925.1 803.3 L8919.8 812.7 L8914.4 803.3 L8919.8 794.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M11391.6 388.5 L14049.25 531 L15531.25 709.4499443826473 L15531.3 709.4 " fill="none"></path>
+					<path d="M9190.4 403.2 L8919.75 531 L8919.75 701 L8919.8 701.0 " fill="none"></path>
+					<path d="M9192.7 408.0 L9190.4 403.2 L9188.1 398.4 L9202.4 397.5 Z"></path>
+					<path d="M9311.8 835.2 L9311.75 964 L9315.400217706821 984 L9315.4 984.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M9317.1 825.8 L9311.8 835.2 L9306.4 825.8 L9311.8 816.5 Z"></path>
 					</g>
-					<path d="M11391.8 383.2 L11391.6 388.5 L11391.3 393.9 L11378.3 387.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M15234.8 389.7 L17255.25 531 L16163.25 698.9105113636364 L16163.3 698.9 " fill="none"></path>
+					<path d="M9249.3 409.4 L9311.75 531 L9311.75 678.5 L9311.8 678.5 " fill="none"></path>
+					<path d="M9254.0 406.9 L9249.3 409.4 L9244.6 411.8 L9243.2 397.5 Z"></path>
+					<path d="M13852.4 2450.0 L13865 2445 L13872.5 2445 L13872.5 2445 L13880 2528.5 L13880 2528.5 L13872.5 2612 L13872.5 2612 L13865 2612 L13865 2612 L13835 2600.1560283687945 L13835.0 2600.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M13841.7 2448.5 L13852.4 2450.0 L13845.6 2458.4 L13835.0 2456.8 Z"></path>
 					</g>
-					<path d="M15235.2 384.4 L15234.8 389.7 L15234.4 395.0 L15221.5 388.7 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M25099.1 109.4 L27788.75 233 L27788.75 382 L27788.75 382 L27788.75 531 L27788.75 531 L27788.75 747.5 L27788.75 747.5 L27788.75 964 L27788.75 964 L27665.244920174166 1584 L27665.2 1584.0 " fill="none"></path>
+						<path d="M5990.2 1679.8 L6402 2342 L13472 2523.832034751431 L13472.0 2523.8 " fill="none"></path>
 					</g>
-					<path d="M25099.3 104.0 L25099.1 109.4 L25098.8 114.7 L25085.8 108.8 Z"></path>
-					<path d="M18131.3 454.7 L18131.25 531 L18131.25 596 L18131.3 596.0 " fill="none"></path>
+					<path d="M5994.7 1677.0 L5990.2 1679.8 L5985.7 1682.6 L5983.1 1668.5 Z"></path>
+					<path d="M9703.8 812.7 L9703.75 964 L9696.021407837445 984 L9696.0 984.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18136.6 445.3 L18131.3 454.7 L18125.9 445.3 L18131.3 436.0 Z"></path>
+						<path d="M9709.1 803.3 L9703.8 812.7 L9698.4 803.3 L9703.8 794.0 Z"></path>
 					</g>
-					<path d="M16253.1 113.5 L18131.25 233 L18131.25 328 L18131.3 328.0 " fill="none"></path>
-					<path d="M16253.4 108.1 L16253.1 113.5 L16252.7 118.8 L16239.8 112.6 Z"></path>
-					<path d="M28529.2 458.2 L28687.75 531 L28687.75 732 L28687.8 732.0 " fill="none"></path>
+					<path d="M9296.7 401.5 L9703.75 531 L9703.75 701 L9703.8 701.0 " fill="none"></path>
+					<path d="M9298.3 396.5 L9296.7 401.5 L9295.1 406.6 L9284.0 397.5 Z"></path>
+					<path d="M19899.8 797.2 L19899.75 964 L9944 1619.6440297259194 L9944.0 1619.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28523.0 449.5 L28529.2 458.2 L28518.5 459.2 L28512.3 450.4 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M25099.1 108.9 L28363.25 233 L28363.25 298 L28363.3 298.0 " fill="none"></path>
+						<path d="M19905.1 787.8 L19899.8 797.2 L19894.4 787.8 L19899.8 778.5 Z"></path>
 					</g>
-					<path d="M25099.3 103.5 L25099.1 108.9 L25098.9 114.2 L25085.8 108.4 Z"></path>
-					<path d="M18165.0 917.3 L18174.25 964 L18174.25 1653 L18174.25 1653 L18174.25 2342 L18174.25 2342 L10361.5 2527.1609587953108 L10361.5 2527.2 " fill="none"></path>
+					<path d="M10095.8 812.7 L10095.75 964 L9944 1122.8389669578428 L9944.0 1122.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18168.4 907.1 L18165.0 917.3 L18157.9 909.2 L18161.3 899.0 Z"></path>
+						<path d="M10101.1 803.3 L10095.8 812.7 L10090.4 803.3 L10095.8 794.0 Z"></path>
 					</g>
-					<path d="M18260.3 913.7 L18299.25 964 L18299.25 1637.5 L18299.3 1637.5 " fill="none"></path>
+					<path d="M9324.4 397.4 L10095.75 531 L10095.75 701 L10095.8 701.0 " fill="none"></path>
+					<path d="M9325.3 392.2 L9324.4 397.4 L9323.5 402.7 L9311.3 395.2 Z"></path>
+					<path d="M10971.8 812.7 L10971.75 964 L9944 1425.5413068274402 L9944.0 1425.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18258.7 903.1 L18260.3 913.7 L18250.3 909.6 L18248.8 899.0 Z"></path>
+						<path d="M10977.1 803.3 L10971.8 812.7 L10966.4 803.3 L10971.8 794.0 Z"></path>
 					</g>
-					<path d="M9152.1 775.6 L6692.75 964 L6692.75 1653 L6692.75 1653 L6692.75 2342 L6692.75 2342 L7178.5 2517.481598062954 L7178.5 2517.5 " fill="none"></path>
+					<path d="M9324.5 389.7 L10971.75 531 L10971.75 701 L10971.8 701.0 " fill="none"></path>
+					<path d="M9325.0 384.3 L9324.5 389.7 L9324.1 395.0 L9311.3 388.5 Z"></path>
+					<path d="M8917.6 2156.6 L8726.25 2342 L13472 2521.630092850982 L13472.0 2521.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9161.9 780.2 L9152.1 775.6 L9161.0 769.6 L9170.8 774.2 Z"></path>
+						<path d="M8928.0 2154.0 L8917.6 2156.6 L8920.6 2146.3 L8931.0 2143.7 Z"></path>
 					</g>
-					<path d="M9152.1 776.8 L6808.25 964 L6808.25 1637.5 L6808.3 1637.5 " fill="none"></path>
+					<path d="M8918.0 2186.3 L8766.25 2342 L13125.5 2526.1137122799073 L13125.5 2526.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9161.9 781.4 L9152.1 776.8 L9161.0 770.7 L9170.8 775.3 Z"></path>
+						<path d="M8928.3 2183.3 L8918.0 2186.3 L8920.7 2175.9 L8931.0 2172.9 Z"></path>
 					</g>
-					<path d="M9152.2 778.9 L6994.75 964 L6994.75 1637.5 L6994.8 1637.5 " fill="none"></path>
+					<path d="M9961.4 1858.4 L11194.75 2342 L11194.75 2528.5 L11194.75 2528.5 L11194.75 2715 L11194.75 2715 L14290.75 2749.9468998410175 L14290.8 2749.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9161.9 783.5 L9152.2 778.9 L9161.0 772.8 L9170.8 777.4 Z"></path>
+						<path d="M9954.6 1850.0 L9961.4 1858.4 L9950.7 1860.0 L9944.0 1851.6 Z"></path>
 					</g>
-					<path d="M9814.4 939.2 L9852.75 964 L9852.75 1653 L9852.75 1653 L9852.75 2342 L9852.75 2342 L9007.5 2518.874193548387 L9007.5 2518.9 " fill="none"></path>
+					<path d="M9961.5 1846.5 L11303.75 2342 L11303.75 2513 L11303.8 2513.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9809.5 929.6 L9814.4 939.2 L9803.7 938.6 L9798.8 929.0 Z"></path>
+						<path d="M9954.6 1838.2 L9961.5 1846.5 L9950.9 1848.2 L9944.0 1840.0 Z"></path>
 					</g>
-					<path d="M9885.2 807.1 L10849.5 964 L4730.75 1615.922333475084 L4730.8 1615.9 " fill="none"></path>
+					<path d="M9961.6 1842.4 L11343.75 2342 L14630 2525.567390490453 L14630.0 2525.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9876.8 800.4 L9885.2 807.1 L9875.1 810.9 L9866.8 804.1 Z"></path>
+						<path d="M9954.6 1834.2 L9961.6 1842.4 L9951.0 1844.3 L9944.0 1836.1 Z"></path>
 					</g>
-					<path d="M9885.2 805.4 L10889.5 964 L6027.5 1594.513457556936 L6027.5 1594.5 " fill="none"></path>
+					<path d="M3519.0 769.3 L3880 964 L8931 1590.2058479532163 L8931.0 1590.2 " fill="none"></path>
+					<path d="M3521.5 764.6 L3519.0 769.3 L3516.4 774.0 L3507.2 763.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M1902.4 772.8 L2079 964 L8931 1605.574777468234 L8931.0 1605.6 " fill="none"></path>
+					</g>
+					<path d="M1906.3 769.2 L1902.4 772.8 L1898.4 776.4 L1893.3 763.0 Z"></path>
+					<path d="M20371.8 804.7 L20371.75 964 L9944 1621.0839106477354 L9944.0 1621.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9876.8 798.7 L9885.2 805.4 L9875.1 809.2 L9866.8 802.5 Z"></path>
+						<path d="M20377.1 795.3 L20371.8 804.7 L20366.4 795.3 L20371.8 786.0 Z"></path>
 					</g>
-					<path d="M9885.2 803.7 L10929.5 964 L9704.760341074021 1471.5 L9704.8 1471.5 " fill="none"></path>
+					<path d="M28728.2 429.9 L29080.5 531 L29080.5 732 L29080.5 732.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9876.8 797.0 L9885.2 803.7 L9875.2 807.6 L9866.8 800.9 Z"></path>
+						<path d="M28720.7 422.2 L28728.2 429.9 L28717.8 432.5 L28710.3 424.8 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M26294.8 109.9 L28561.25 233 L28561.25 298 L28561.3 298.0 " fill="none"></path>
 					</g>
-					<path d="M9885.2 802.2 L10969.5 964 L11932.041727140784 1479 L11932.0 1479.0 " fill="none"></path>
+					<path d="M26295.1 104.6 L26294.8 109.9 L26294.5 115.2 L26281.5 109.2 Z"></path>
+					<path d="M21747.3 454.7 L21747.25 531 L21747.25 596 L21747.3 596.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9876.8 795.5 L9885.2 802.2 L9875.2 806.1 L9866.8 799.4 Z"></path>
+						<path d="M21752.6 445.3 L21747.3 454.7 L21741.9 445.3 L21747.3 436.0 Z"></path>
 					</g>
-					<path d="M9885.2 800.7 L11009.5 964 L8680.75 1547.829254980442 L8680.8 1547.8 " fill="none"></path>
+					<path d="M14513.6 108.4 L21747.25 233 L21747.25 328 L21747.3 328.0 " fill="none"></path>
+					<path d="M14513.7 103.1 L14513.6 108.4 L14513.5 113.7 L14500.3 108.2 Z"></path>
+					<path d="M22010.0 908.8 L22100 964 L22100 1653 L22100 1653 L22100 2342 L22100 2342 L13238.5 2527.3184290199597 L13238.5 2527.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9876.8 794.1 L9885.2 800.7 L9875.2 804.7 L9866.8 798.0 Z"></path>
+						<path d="M22004.8 899.3 L22010.0 908.8 L21999.3 908.4 L21994.1 899.0 Z"></path>
 					</g>
-					<path d="M9885.3 789.0 L11431.75 964 L11431.75 1653 L11431.75 1653 L11431.75 2342 L11431.75 2342 L9572.25 2523.37905334728 L9572.3 2523.4 " fill="none"></path>
+					<path d="M22011.8 867.4 L22225 964 L22225 1637.5 L22225.0 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9876.6 782.6 L9885.3 789.0 L9875.4 793.2 L9866.8 786.9 Z"></path>
+						<path d="M22005.5 858.7 L22011.8 867.4 L22001.0 868.4 L21994.8 859.7 Z"></path>
 					</g>
-					<path d="M4020.1 400.9 L4521.5 531 L9170.75 732.4233078193006 L9170.8 732.4 " fill="none"></path>
-					<path d="M4021.5 395.7 L4020.1 400.9 L4018.8 406.0 L4007.2 397.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M11391.6 388.4 L14089.25 531 L9866.75 731.0155891040367 L9866.8 731.0 " fill="none"></path>
+					<path d="M1601.0 135.3 L1601 233 L1601 351 L1601.0 351.0 " fill="none"></path>
+					<path d="M1606.3 135.3 L1601.0 135.3 L1595.7 135.3 L1601.0 122.0 Z"></path>
+					<g data-name="StudyDesignInterventionsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
+							<rect x="0.0" y="716.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
+							<path d="M0.0 747.5 L296.0 747.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
+						</g>
+						<g transform="translate(0, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(0, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
+								
+							</g>
+						</g>
 					</g>
-					<path d="M11391.8 383.1 L11391.6 388.4 L11391.3 393.8 L11378.3 387.7 Z"></path>
-					<path d="M1308.5 135.3 L1308.5 233 L1308.5 351 L1308.5 351.0 " fill="none"></path>
-					<path d="M1313.8 135.3 L1308.5 135.3 L1303.2 135.3 L1308.5 122.0 Z"></path>
-					<g data-name="ScreenerQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="6576.5" y="2362.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M6576.5 2393.0 L7138.5 2393.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M6576.5 2574.0 L7138.5 2574.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+					<g data-name="StudyDesignPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
+							<rect x="1495.0" y="351.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
+							<path d="M1495.0 382.0 L1707.0 382.0" fill="none" data-name="StudyDesignPageWidget"></path>
 						</g>
-						<g transform="translate(6576.5, 2362)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
-								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
+						<g transform="translate(1495, 351)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
+								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6576.5, 2393)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+						<g transform="translate(1495, 382)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6576.5, 2574)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
+					</g>
+					<g data-name="InterventionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
+							<rect x="336.0" y="716.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
+							<path d="M336.0 747.5 L711.0 747.5" fill="none" data-name="InterventionFormView"></path>
+						</g>
+						<g transform="translate(336, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
+								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(336, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="InterventionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
+							<rect x="6483.0" y="1419.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
+							<path d="M6483.0 1450.0 L7338.0 1450.0" fill="none" data-name="InterventionFormViewModel"></path>
+							<path d="M6483.0 1676.0 L7338.0 1676.0" fill="none" data-name="InterventionFormViewModel"></path>
+						</g>
+						<g transform="translate(6483, 1419)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
+								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(6483, 1450)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="8258.3" y="2735.0" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(8258.25, 2735)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
+						<g transform="translate(6483, 1676)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="15992.8" y="984.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M15992.8 1015.0 L17005.8 1015.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M15992.8 2036.0 L17005.8 2036.0" fill="none" data-name="QuestionFormViewModel"></path>
+					<g data-name="InterventionPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
+							<rect x="4568.0" y="701.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
+							<path d="M4568.0 732.0 L4898.0 732.0" fill="none" data-name="InterventionPreview"></path>
+							<path d="M4568.0 763.0 L4898.0 763.0" fill="none" data-name="InterventionPreview"></path>
 						</g>
-						<g transform="translate(15992.75, 984)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
+						<g transform="translate(4568, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15992.75, 1015)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(4568, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15992.75, 2036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
+						<g transform="translate(4568, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IScreenerQuestionLogicFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="635.0" y="1622.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M635.0 1653.0 L967.0 1653.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
-						</g>
-						<g transform="translate(635, 1622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
-								
-							</g>
+					<g data-name="InterventionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
+							<rect x="2668.0" y="1637.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(635, 1653)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+						<g transform="translate(2668, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignEnrollmentFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="0.0" y="701.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M0.0 732.5 L449.0 732.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
+					<g data-name="ConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
+							<rect x="9159.3" y="366.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
 						</g>
-						<g transform="translate(0, 701.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
+						<g transform="translate(9159.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 732.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
+					</g>
+					<g data-name="StudyScheduleFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
+							<rect x="11387.3" y="328.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
+							<path d="M11387.3 359.0 L11746.3 359.0" fill="none" data-name="StudyScheduleFormView"></path>
+							<path d="M11387.3 390.0 L11746.3 390.0" fill="none" data-name="StudyScheduleFormView"></path>
+						</g>
+						<g transform="translate(11387.25, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
+								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="1202.5" y="351.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M1202.5 382.0 L1414.5 382.0" fill="none" data-name="StudyDesignPageWidget"></path>
-						</g>
-						<g transform="translate(1202.5, 351)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
+						<g transform="translate(11387.25, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1202.5, 382)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
+						<g transform="translate(11387.25, 390)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionLogicFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="2196.3" y="1584.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M2196.3 1615.0 L2620.3 1615.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M2196.3 1646.0 L2620.3 1646.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+					<g data-name="StudyScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
+							<rect x="11187.8" y="551.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
+							<path d="M11187.8 582.0 L11945.8 582.0" fill="none" data-name="StudyScheduleControls"></path>
+							<path d="M11187.8 883.0 L11945.8 883.0" fill="none" data-name="StudyScheduleControls"></path>
 						</g>
-						<g transform="translate(2196.25, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
-								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
+						<g transform="translate(11187.75, 551)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
+								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2196.25, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
+						<g transform="translate(11187.75, 582)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2196.25, 1646)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
+						<g transform="translate(11187.75, 883)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="FormConsumerWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="16047.8" y="91.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
+							<rect x="14308.3" y="91.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
 						</g>
-						<g transform="translate(16047.75, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+						<g transform="translate(14308.25, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
 								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="21921.5" y="298.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M21921.5 329.0 L22179.5 329.0" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M21921.5 420.0 L22179.5 420.0" fill="none" data-name="ConsentItemFormData"></path>
+					<g data-name="InterventionTaskFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
+							<rect x="28221.5" y="663.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
+							<path d="M28221.5 694.5 L28511.5 694.5" fill="none" data-name="InterventionTaskFormData"></path>
+							<path d="M28221.5 785.5 L28511.5 785.5" fill="none" data-name="InterventionTaskFormData"></path>
 						</g>
-						<g transform="translate(21921.5, 298)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
+						<g transform="translate(28221.5, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
+								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21921.5, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
+						<g transform="translate(28221.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21921.5, 420)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
+						<g transform="translate(28221.5, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="24987.8" y="91.0" height="31.0" width="98.0" data-name="IFormData"></rect>
+					<g data-name="IFormDataWithSchedule">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
+							<rect x="28412.3" y="298.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
+							<path d="M28412.3 329.0 L28710.3 329.0" fill="none" data-name="IFormDataWithSchedule"></path>
+							<path d="M28412.3 435.0 L28710.3 435.0" fill="none" data-name="IFormDataWithSchedule"></path>
+						</g>
+						<g transform="translate(28412.25, 298)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
+								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
+								
+							</g>
+						</g>
+						<g transform="translate(28412.25, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
+								
+							</g>
 						</g>
-						<g transform="translate(24987.75, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
+						<g transform="translate(28412.25, 435)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="5125.5" y="1404.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M5125.5 1435.0 L6027.5 1435.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M5125.5 1661.0 L6027.5 1661.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+					<g data-name="InterventionsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
+							<rect x="12881.5" y="1464.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
+							<path d="M12881.5 1495.0 L13720.5 1495.0" fill="none" data-name="InterventionsFormViewModel"></path>
+							<path d="M12881.5 1646.0 L13720.5 1646.0" fill="none" data-name="InterventionsFormViewModel"></path>
 						</g>
-						<g transform="translate(5125.5, 1404)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
-								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
+						<g transform="translate(12881.5, 1464)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
+								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5125.5, 1435)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
+						<g transform="translate(12881.5, 1495)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5125.5, 1661)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
+						<g transform="translate(12881.5, 1646)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="Study">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="7178.5" y="2513.0" height="31.0" width="61.0" data-name="Study"></rect>
+							<rect x="15307.5" y="2513.0" height="31.0" width="61.0" data-name="Study"></rect>
 						</g>
-						<g transform="translate(7178.5, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
+						<g transform="translate(15307.5, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
 								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
 								
@@ -2419,64 +2408,31 @@
 					</g>
 					<g data-name="GoRouter">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="8915.5" y="2513.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
+							<rect x="17274.8" y="2513.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
 						</g>
-						<g transform="translate(8915.5, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
+						<g transform="translate(17274.75, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
 								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormConsentItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="5736.5" y="2422.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M5736.5 2453.0 L6536.5 2453.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M5736.5 2529.0 L6536.5 2529.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-						</g>
-						<g transform="translate(5736.5, 2422)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5736.5, 2453)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5736.5, 2529)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="10248.5" y="2513.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+					<g data-name="FormArray">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
+							<rect x="14290.8" y="2735.0" height="31.0" width="98.0" data-name="FormArray"></rect>
 						</g>
-						<g transform="translate(10248.5, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+						<g transform="translate(14290.75, 2735)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="FormViewModelCollection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="8396.3" y="2735.0" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
+							<rect x="16712.5" y="2735.0" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
 						</g>
-						<g transform="translate(8396.25, 2735)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
+						<g transform="translate(16712.5, 2735)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
 								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
 								
@@ -2485,9 +2441,9 @@
 					</g>
 					<g data-name="FormGroup">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="9467.3" y="2513.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
+							<rect x="14630.0" y="2513.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
 						</g>
-						<g transform="translate(9467.25, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+						<g transform="translate(14630, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
 								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
 								
@@ -2496,56 +2452,20 @@
 					</g>
 					<g data-name="FormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="3877.0" y="366.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
+							<rect x="13378.0" y="366.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
 						</g>
-						<g transform="translate(3877, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
+						<g transform="translate(13378, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
 								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="15531.3" y="618.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M15531.3 649.5 L16163.3 649.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M15531.3 755.5 L16163.3 755.5" fill="none" data-name="WithQuestionnaireControls"></path>
-						</g>
-						<g transform="translate(15531.25, 618.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15531.25, 649.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15531.25, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
 					<g data-name="IFormViewModelDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="11161.3" y="366.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
+							<rect x="19295.5" y="366.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
 						</g>
-						<g transform="translate(11161.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
+						<g transform="translate(19295.5, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
 								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
 								
@@ -2554,9 +2474,9 @@
 					</g>
 					<g data-name="IListActionProvider">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="825.0" y="732.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
+							<rect x="1797.0" y="732.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
 						</g>
-						<g transform="translate(825, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+						<g transform="translate(1797, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
 								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
 								
@@ -2565,767 +2485,854 @@
 					</g>
 					<g data-name="IProviderArgsResolver">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="15028.5" y="366.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
+							<rect x="21043.5" y="366.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
 						</g>
-						<g transform="translate(15028.5, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
+						<g transform="translate(21043.5, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
 								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="1122.0" y="1524.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M1122.0 1555.0 L1818.0 1555.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M1122.0 1721.0 L1818.0 1721.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+					<g data-name="InterventionTaskFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
+							<rect x="11626.8" y="1516.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
+							<path d="M11626.8 1547.5 L12322.8 1547.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<path d="M11626.8 1728.5 L12322.8 1728.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
 						</g>
-						<g transform="translate(1122, 1524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
+						<g transform="translate(11626.75, 1516.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1122, 1555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(11626.75, 1547.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1122, 1721)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
+						<g transform="translate(11626.75, 1728.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="13125.5" y="2513.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+						</g>
+						<g transform="translate(13125.5, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ManagedFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="1359.5" y="732.0" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
+							<rect x="3371.0" y="732.0" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
 						</g>
-						<g transform="translate(1359.5, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+						<g transform="translate(3371, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
 								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="1614.5" y="716.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M1614.5 747.5 L1995.5 747.5" fill="none" data-name="ConsentItemFormView"></path>
+					<g data-name="WithScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
+							<rect x="21499.8" y="596.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
+							<path d="M21499.8 627.0 L21994.8 627.0" fill="none" data-name="WithScheduleControls"></path>
+							<path d="M21499.8 853.0 L21994.8 853.0" fill="none" data-name="WithScheduleControls"></path>
 						</g>
-						<g transform="translate(1614.5, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
+						<g transform="translate(21499.75, 596)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
+								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1614.5, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
+						<g transform="translate(21499.75, 627)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(21499.75, 853)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="22598.8" y="663.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M22598.8 694.5 L23052.8 694.5" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M22598.8 785.5 L23052.8 785.5" fill="none" data-name="EnrollmentFormData"></path>
+					<g data-name="PhaseSequence">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
+							<rect x="17466.3" y="2513.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
 						</g>
-						<g transform="translate(22598.75, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
-								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
+						<g transform="translate(17466.25, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
+								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22598.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
+					</g>
+					<g data-name="InterventionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
+							<rect x="22003.3" y="283.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
+							<path d="M22003.3 314.0 L22385.3 314.0" fill="none" data-name="InterventionFormData"></path>
+							<path d="M22003.3 435.0 L22385.3 435.0" fill="none" data-name="InterventionFormData"></path>
+						</g>
+						<g transform="translate(22003.25, 283)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
+								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22598.75, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
+						<g transform="translate(22003.25, 314)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(22003.25, 435)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="22567.3" y="1637.5" height="31.0" width="114.0" data-name="Participation"></rect>
+					<g data-name="IFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
+							<rect x="26183.5" y="91.0" height="31.0" width="98.0" data-name="IFormData"></rect>
 						</g>
-						<g transform="translate(22567.25, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
+						<g transform="translate(26183.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="27467.5" y="1584.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M27467.5 1615.0 L27835.5 1615.0" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M27467.5 1661.0 L27835.5 1661.0" fill="none" data-name="QuestionnaireFormData"></path>
+					<g data-name="StudyScheduleFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
+							<rect x="22739.0" y="1554.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
+							<path d="M22739.0 1585.0 L23035.0 1585.0" fill="none" data-name="StudyScheduleFormData"></path>
+							<path d="M22739.0 1691.0 L23035.0 1691.0" fill="none" data-name="StudyScheduleFormData"></path>
 						</g>
-						<g transform="translate(27467.5, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
+						<g transform="translate(22739, 1554)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27467.5, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
+						<g transform="translate(22739, 1585)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27467.5, 1661)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
+						<g transform="translate(22739, 1691)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="IStudyFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="23378.3" y="351.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M23378.3 382.0 L23521.3 382.0" fill="none" data-name="IStudyFormData"></path>
+							<rect x="23970.5" y="351.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
+							<path d="M23970.5 382.0 L24113.5 382.0" fill="none" data-name="IStudyFormData"></path>
 						</g>
-						<g transform="translate(23378.25, 351)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
+						<g transform="translate(23970.5, 351)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
 								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23378.25, 382)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
+						<g transform="translate(23970.5, 382)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignInterventionsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="489.0" y="716.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M489.0 747.5 L785.0 747.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
+					<g data-name="InterventionTaskFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
+							<rect x="4115.0" y="716.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
+							<path d="M4115.0 747.5 L4528.0 747.5" fill="none" data-name="InterventionTaskFormView"></path>
 						</g>
-						<g transform="translate(489, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
+						<g transform="translate(4115, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(489, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
+						<g transform="translate(4115, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="7841.8" y="1464.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M7841.8 1495.0 L8680.8 1495.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M7841.8 1646.0 L8680.8 1646.0" fill="none" data-name="InterventionsFormViewModel"></path>
+					<g data-name="InterventionsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
+							<rect x="22808.5" y="678.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
+							<path d="M22808.5 709.5 L23202.5 709.5" fill="none" data-name="InterventionsFormData"></path>
+							<path d="M22808.5 770.5 L23202.5 770.5" fill="none" data-name="InterventionsFormData"></path>
 						</g>
-						<g transform="translate(7841.75, 1464)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
-								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
+						<g transform="translate(22808.5, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
+								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7841.75, 1495)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
+						<g transform="translate(22808.5, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7841.75, 1646)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
+						<g transform="translate(22808.5, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="17085.8" y="551.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M17085.8 582.0 L17843.8 582.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M17085.8 883.0 L17843.8 883.0" fill="none" data-name="StudyScheduleControls"></path>
+					<g data-name="StudyDesignReportsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
+							<rect x="751.0" y="709.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
+							<path d="M751.0 740.0 L1144.0 740.0" fill="none" data-name="StudyDesignReportsFormView"></path>
 						</g>
-						<g transform="translate(17085.75, 551)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
-								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
+						<g transform="translate(751, 709)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
+								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17085.75, 582)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
+						<g transform="translate(751, 740)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17085.75, 883)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
+					</g>
+					<g data-name="ReportItemFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
+							<rect x="22425.3" y="313.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
+							<path d="M22425.3 344.0 L22739.3 344.0" fill="none" data-name="ReportItemFormData"></path>
+							<path d="M22425.3 405.0 L22739.3 405.0" fill="none" data-name="ReportItemFormData"></path>
+						</g>
+						<g transform="translate(22425.25, 313)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
+								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(22425.25, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(22425.25, 405)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="2660.3" y="1419.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M2660.3 1450.0 L3515.3 1450.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M2660.3 1676.0 L3515.3 1676.0" fill="none" data-name="InterventionFormViewModel"></path>
+					<g data-name="ReportSection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
+							<rect x="22518.3" y="732.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
 						</g>
-						<g transform="translate(2660.25, 1419)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
-								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
+						<g transform="translate(22518.25, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
+								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2660.25, 1450)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+					</g>
+					<g data-name="DataReferenceEditor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
+							<rect x="4860.5" y="1584.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
+							<path d="M4860.5 1615.0 L5569.5 1615.0" fill="none" data-name="DataReferenceEditor"></path>
+							<path d="M4860.5 1676.0 L5569.5 1676.0" fill="none" data-name="DataReferenceEditor"></path>
+						</g>
+						<g transform="translate(4860.5, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
+								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2660.25, 1676)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
+						<g transform="translate(4860.5, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4860.5, 1676)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="27828.8" y="663.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M27828.8 694.5 L28118.8 694.5" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M27828.8 785.5 L28118.8 785.5" fill="none" data-name="InterventionTaskFormData"></path>
+					<g data-name="ReactiveDropdownField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
+							<rect x="5345.0" y="2513.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
 						</g>
-						<g transform="translate(27828.75, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
+						<g transform="translate(5345, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
+								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27828.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
+					</g>
+					<g data-name="TemporalAggregationFormatted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
+							<rect x="28639.3" y="0.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
+							<path d="M28639.3 31.0 L29087.3 31.0" fill="none" data-name="TemporalAggregationFormatted"></path>
+							<path d="M28639.3 137.0 L29087.3 137.0" fill="none" data-name="TemporalAggregationFormatted"></path>
+						</g>
+						<g transform="translate(28639.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
+								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27828.75, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
+						<g transform="translate(28639.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
+								
+							</g>
+						</g>
+						<g transform="translate(28639.25, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="28214.3" y="298.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M28214.3 329.0 L28512.3 329.0" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M28214.3 435.0 L28512.3 435.0" fill="none" data-name="IFormDataWithSchedule"></path>
+					<g data-name="TemporalAggregation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
+							<rect x="28750.3" y="366.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
 						</g>
-						<g transform="translate(28214.25, 298)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
+						<g transform="translate(28750.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
+								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28214.25, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
+					</g>
+					<g data-name="IconData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
+							<rect x="29220.3" y="366.5" height="31.0" width="87.0" data-name="IconData"></rect>
+						</g>
+						<g transform="translate(29220.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
+								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ImprovementDirectionFormatted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
+							<rect x="29127.3" y="0.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
+							<path d="M29127.3 31.0 L29578.3 31.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
+							<path d="M29127.3 137.0 L29578.3 137.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
+						</g>
+						<g transform="translate(29127.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
+								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
+								
+							</g>
+						</g>
+						<g transform="translate(29127.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28214.25, 435)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
+						<g transform="translate(29127.25, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="23063.3" y="1554.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M23063.3 1585.0 L23359.3 1585.0" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M23063.3 1691.0 L23359.3 1691.0" fill="none" data-name="StudyScheduleFormData"></path>
+					<g data-name="ImprovementDirection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
+							<rect x="29347.3" y="366.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
 						</g>
-						<g transform="translate(23063.25, 1554)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
+						<g transform="translate(29347.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
+								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23063.25, 1585)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
+					</g>
+					<g data-name="ReportSectionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
+							<rect x="4122.3" y="2475.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
+							<path d="M4122.3 2506.0 L4505.3 2506.0" fill="none" data-name="ReportSectionType"></path>
+						</g>
+						<g transform="translate(4122.25, 2475)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
+								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23063.25, 1691)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
+						<g transform="translate(4122.25, 2506)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PhaseSequence">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="20272.5" y="2513.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
+					<g data-name="Enum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
+							<rect x="5943.0" y="1637.5" height="31.0" width="61.0" data-name="Enum"></rect>
 						</g>
-						<g transform="translate(20272.5, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
-								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
+						<g transform="translate(5943, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="18418.8" y="701.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M18418.8 732.0 L18748.8 732.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M18418.8 763.0 L18748.8 763.0" fill="none" data-name="InterventionPreview"></path>
+					<g data-name="AverageSectionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
+							<rect x="5040.8" y="686.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
+							<path d="M5040.8 717.0 L5519.8 717.0" fill="none" data-name="AverageSectionFormView"></path>
+							<path d="M5040.8 778.0 L5519.8 778.0" fill="none" data-name="AverageSectionFormView"></path>
 						</g>
-						<g transform="translate(18418.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
+						<g transform="translate(5040.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18418.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
+						<g transform="translate(5040.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18418.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
+						<g transform="translate(5040.75, 778)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="18467.3" y="1637.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
+					<g data-name="ReportItemFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
+							<rect x="3546.5" y="1366.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
+							<path d="M3546.5 1397.5 L4533.5 1397.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<path d="M3546.5 1833.5 L4533.5 1833.5" fill="none" data-name="ReportItemFormViewModel"></path>
 						</g>
-						<g transform="translate(18467.25, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
+						<g transform="translate(3546.5, 1366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
+								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="20062.3" y="366.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+						<g transform="translate(3546.5, 1397.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
+								
+							</g>
 						</g>
-						<g transform="translate(20062.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
+						<g transform="translate(3546.5, 1833.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="7105.8" y="1516.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M7105.8 1547.5 L7801.8 1547.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M7105.8 1728.5 L7801.8 1728.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+					<g data-name="DataReferenceIdentifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
+							<rect x="29932.8" y="335.5" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
+							<path d="M29932.8 366.5 L30136.8 366.5" fill="none" data-name="DataReferenceIdentifier"></path>
+							<path d="M29932.8 397.5 L30136.8 397.5" fill="none" data-name="DataReferenceIdentifier"></path>
 						</g>
-						<g transform="translate(7105.75, 1516.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
+						<g transform="translate(29932.75, 335.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
+								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7105.75, 1547.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(29932.75, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7105.75, 1728.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
+						<g transform="translate(29932.75, 397.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="17883.8" y="596.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M17883.8 627.0 L18378.8 627.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M17883.8 853.0 L18378.8 853.0" fill="none" data-name="WithScheduleControls"></path>
+					<g data-name="DataReference">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
+							<rect x="29967.3" y="91.0" height="31.0" width="135.0" data-name="DataReference"></rect>
 						</g>
-						<g transform="translate(17883.75, 596)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
+						<g transform="translate(29967.25, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
+								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17883.75, 627)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
+					</g>
+					<g data-name="LinearRegressionSectionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
+							<rect x="5559.8" y="686.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
+							<path d="M5559.8 717.0 L6038.8 717.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<path d="M5559.8 778.0 L6038.8 778.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+						</g>
+						<g transform="translate(5559.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17883.75, 853)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
+						<g transform="translate(5559.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5559.75, 778)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="23132.8" y="678.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M23132.8 709.5 L23526.8 709.5" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M23132.8 770.5 L23526.8 770.5" fill="none" data-name="InterventionsFormData"></path>
+					<g data-name="ReportItemFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
+							<rect x="8128.3" y="663.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
+							<path d="M8128.3 694.5 L8595.3 694.5" fill="none" data-name="ReportItemFormView"></path>
+							<path d="M8128.3 770.5 L8595.3 770.5" fill="none" data-name="ReportItemFormView"></path>
 						</g>
-						<g transform="translate(23132.75, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
+						<g transform="translate(8128.25, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
+								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23132.75, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
+						<g transform="translate(8128.25, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23132.75, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
+						<g transform="translate(8128.25, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="3573.5" y="716.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M3573.5 747.5 L3948.5 747.5" fill="none" data-name="InterventionFormView"></path>
+					<g data-name="Widget Function(BuildContext)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
+							<rect x="7615.0" y="1637.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
 						</g>
-						<g transform="translate(3573.5, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
-								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
+						<g transform="translate(7615, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
+								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3573.5, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
+					</g>
+					<g data-name="ReportsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
+							<rect x="17681.8" y="1479.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
+							<path d="M17681.8 1510.0 L18541.8 1510.0" fill="none" data-name="ReportsFormViewModel"></path>
+							<path d="M17681.8 1676.0 L18541.8 1676.0" fill="none" data-name="ReportsFormViewModel"></path>
+						</g>
+						<g transform="translate(17681.75, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
+								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InterventionTaskFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="3988.5" y="716.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M3988.5 747.5 L4401.5 747.5" fill="none" data-name="InterventionTaskFormView"></path>
-						</g>
-						<g transform="translate(3988.5, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
+						<g transform="translate(17681.75, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3988.5, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
+						<g transform="translate(17681.75, 1676)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="22219.5" y="283.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M22219.5 314.0 L22601.5 314.0" fill="none" data-name="InterventionFormData"></path>
-							<path d="M22219.5 435.0 L22601.5 435.0" fill="none" data-name="InterventionFormData"></path>
+					<g data-name="ReportFormItemDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
+							<rect x="15631.8" y="2422.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
+							<path d="M15631.8 2453.0 L16474.8 2453.0" fill="none" data-name="ReportFormItemDelegate"></path>
+							<path d="M15631.8 2529.0 L16474.8 2529.0" fill="none" data-name="ReportFormItemDelegate"></path>
 						</g>
-						<g transform="translate(22219.5, 283)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
+						<g transform="translate(15631.75, 2422)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
+								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22219.5, 314)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
+						<g transform="translate(15631.75, 2453)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22219.5, 435)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
+						<g transform="translate(15631.75, 2529)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="17285.3" y="328.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M17285.3 359.0 L17644.3 359.0" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M17285.3 390.0 L17644.3 390.0" fill="none" data-name="StudyScheduleFormView"></path>
+					<g data-name="ReportBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
+							<rect x="7378.0" y="1584.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
+							<path d="M7378.0 1615.0 L7575.0 1615.0" fill="none" data-name="ReportBadge"></path>
+							<path d="M7378.0 1691.0 L7575.0 1691.0" fill="none" data-name="ReportBadge"></path>
 						</g>
-						<g transform="translate(17285.25, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
+						<g transform="translate(7378, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17285.25, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
+						<g transform="translate(7378, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17285.25, 390)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
+						<g transform="translate(7378, 1691)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="23566.8" y="663.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M23566.8 694.5 L23980.8 694.5" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M23566.8 785.5 L23980.8 785.5" fill="none" data-name="StudyInfoFormData"></path>
-						</g>
-						<g transform="translate(23566.75, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
-								
-							</g>
+					<g data-name="ReportStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
+							<rect x="6015.0" y="2475.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
+							<path d="M6015.0 2506.0 L6316.0 2506.0" fill="none" data-name="ReportStatus"></path>
 						</g>
-						<g transform="translate(23566.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
+						<g transform="translate(6015, 2475)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
+								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23566.75, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
+						<g transform="translate(6015, 2506)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyContactInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="23723.3" y="1539.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M23723.3 1570.0 L24071.3 1570.0" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M23723.3 1721.0 L24071.3 1721.0" fill="none" data-name="StudyContactInfoFormData"></path>
+					<g data-name="BadgeType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
+							<rect x="7794.8" y="2513.0" height="31.0" width="106.0" data-name="BadgeType"></rect>
 						</g>
-						<g transform="translate(23723.25, 1539)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
-								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
+						<g transform="translate(7794.75, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
+								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23723.25, 1570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
-								
-							</g>
+					</g>
+					<g data-name="ReportsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
+							<rect x="23242.5" y="686.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
+							<path d="M23242.5 717.0 L23580.5 717.0" fill="none" data-name="ReportsFormData"></path>
+							<path d="M23242.5 763.0 L23580.5 763.0" fill="none" data-name="ReportsFormData"></path>
 						</g>
-						<g transform="translate(23723.25, 1721)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
+						<g transform="translate(23242.5, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
+								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyDesignInfoFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="2035.5" y="716.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M2035.5 747.5 L2258.5 747.5" fill="none" data-name="StudyDesignInfoFormView"></path>
-						</g>
-						<g transform="translate(2035.5, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
+						<g transform="translate(23242.5, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2035.5, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
+						<g transform="translate(23242.5, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="StudyInfoFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="4034.8" y="1411.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M4034.8 1442.5 L4730.8 1442.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M4034.8 1848.5 L4730.8 1848.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+							<rect x="13760.5" y="1411.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
+							<path d="M13760.5 1442.5 L14456.5 1442.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+							<path d="M13760.5 1848.5 L14456.5 1848.5" fill="none" data-name="StudyInfoFormViewModel"></path>
 						</g>
-						<g transform="translate(4034.75, 1411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
+						<g transform="translate(13760.5, 1411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4034.75, 1442.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+						<g transform="translate(13760.5, 1442.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
@@ -3356,7 +3363,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(4034.75, 1848.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+						<g transform="translate(13760.5, 1848.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
@@ -3364,239 +3371,100 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="28158.8" y="648.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M28158.8 679.5 L28567.8 679.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M28158.8 800.5 L28567.8 800.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-						</g>
-						<g transform="translate(28158.75, 648.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28158.75, 679.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28158.75, 800.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="4601.5" y="716.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M4601.5 747.5 L5045.5 747.5" fill="none" data-name="MeasurementSurveyFormView"></path>
-						</g>
-						<g transform="translate(4601.5, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4601.5, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="9892.8" y="1441.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M9892.8 1472.5 L10588.8 1472.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M9892.8 1698.5 L10588.8 1698.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-						</g>
-						<g transform="translate(9892.75, 1441.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9892.75, 1472.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9892.75, 1698.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="18788.8" y="701.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M18788.8 732.0 L19132.8 732.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M18788.8 763.0 L19132.8 763.0" fill="none" data-name="SurveyPreview"></path>
-						</g>
-						<g transform="translate(18788.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18788.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18788.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="18837.3" y="1637.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(18837.25, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignMeasurementsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="2298.5" y="716.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M2298.5 747.5 L2608.5 747.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
+					<g data-name="StudyDesignInfoFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
+							<rect x="1184.0" y="716.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
+							<path d="M1184.0 747.5 L1407.0 747.5" fill="none" data-name="StudyDesignInfoFormView"></path>
 						</g>
-						<g transform="translate(2298.5, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
+						<g transform="translate(1184, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
+								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2298.5, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
+						<g transform="translate(1184, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="24060.8" y="686.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M24060.8 717.0 L24554.8 717.0" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M24060.8 763.0 L24554.8 763.0" fill="none" data-name="MeasurementsFormData"></path>
+					<g data-name="StudyInfoFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
+							<rect x="23620.5" y="663.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
+							<path d="M23620.5 694.5 L24034.5 694.5" fill="none" data-name="StudyInfoFormData"></path>
+							<path d="M23620.5 785.5 L24034.5 785.5" fill="none" data-name="StudyInfoFormData"></path>
 						</g>
-						<g transform="translate(24060.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
-								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
+						<g transform="translate(23620.5, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
+								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24060.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
+						<g transform="translate(23620.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24060.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
+						<g transform="translate(23620.5, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="8720.8" y="1471.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M8720.8 1502.5 L9812.8 1502.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M8720.8 1653.5 L9812.8 1653.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+					<g data-name="StudyContactInfoFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
+							<rect x="23777.0" y="1539.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
+							<path d="M23777.0 1570.0 L24125.0 1570.0" fill="none" data-name="StudyContactInfoFormData"></path>
+							<path d="M23777.0 1721.0 L24125.0 1721.0" fill="none" data-name="StudyContactInfoFormData"></path>
 						</g>
-						<g transform="translate(8720.75, 1471.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
-								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
+						<g transform="translate(23777, 1539)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
+								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8720.75, 1502.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(23777, 1570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8720.75, 1653.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
+						<g transform="translate(23777, 1721)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="StudyFormValidationSet">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="10401.5" y="2490.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M10401.5 2521.0 L10788.5 2521.0" fill="none" data-name="StudyFormValidationSet"></path>
+							<rect x="5588.0" y="2490.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
+							<path d="M5588.0 2521.0 L5975.0 2521.0" fill="none" data-name="StudyFormValidationSet"></path>
 						</g>
-						<g transform="translate(10401.5, 2490)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
+						<g transform="translate(5588, 2490)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
 								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10401.5, 2521)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
+						<g transform="translate(5588, 2521)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
@@ -3604,701 +3472,843 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="10692.5" y="1637.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(10692.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="11827.3" y="1479.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M11827.3 1510.0 L12687.3 1510.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M11827.3 1676.0 L12687.3 1676.0" fill="none" data-name="ReportsFormViewModel"></path>
+					<g data-name="MeasurementsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
+							<rect x="24114.5" y="686.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
+							<path d="M24114.5 717.0 L24608.5 717.0" fill="none" data-name="MeasurementsFormData"></path>
+							<path d="M24114.5 763.0 L24608.5 763.0" fill="none" data-name="MeasurementsFormData"></path>
 						</g>
-						<g transform="translate(11827.25, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
-								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
+						<g transform="translate(24114.5, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
+								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11827.25, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
+						<g transform="translate(24114.5, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11827.25, 1676)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
+						<g transform="translate(24114.5, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportFormItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="10828.5" y="2422.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M10828.5 2453.0 L11671.5 2453.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M10828.5 2529.0 L11671.5 2529.0" fill="none" data-name="ReportFormItemDelegate"></path>
-						</g>
-						<g transform="translate(10828.5, 2422)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
-								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
-								
-							</g>
+					<g data-name="MeasurementSurveyFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
+							<rect x="10311.8" y="716.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
+							<path d="M10311.8 747.5 L10755.8 747.5" fill="none" data-name="MeasurementSurveyFormView"></path>
 						</g>
-						<g transform="translate(10828.5, 2453)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
+						<g transform="translate(10311.75, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
+								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10828.5, 2529)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
+						<g transform="translate(10311.75, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="24879.8" y="313.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M24879.8 344.0 L25193.8 344.0" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M24879.8 405.0 L25193.8 405.0" fill="none" data-name="ReportItemFormData"></path>
-						</g>
-						<g transform="translate(24879.75, 313)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
-								
-							</g>
+					<g data-name="MeasurementSurveyFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
+							<rect x="14908.5" y="1441.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
+							<path d="M14908.5 1472.5 L15604.5 1472.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+							<path d="M14908.5 1698.5 L15604.5 1698.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
 						</g>
-						<g transform="translate(24879.75, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
+						<g transform="translate(14908.5, 1441.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24879.75, 405)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
+						<g transform="translate(14908.5, 1472.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="24972.8" y="732.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(24972.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
+						<g transform="translate(14908.5, 1698.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="11790.5" y="663.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M11790.5 694.5 L12257.5 694.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M11790.5 770.5 L12257.5 770.5" fill="none" data-name="ReportItemFormView"></path>
+					<g data-name="SurveyPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
+							<rect x="6078.8" y="701.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
+							<path d="M6078.8 732.0 L6422.8 732.0" fill="none" data-name="SurveyPreview"></path>
+							<path d="M6078.8 763.0 L6422.8 763.0" fill="none" data-name="SurveyPreview"></path>
 						</g>
-						<g transform="translate(11790.5, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
-								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
+						<g transform="translate(6078.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11790.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
+						<g transform="translate(6078.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11790.5, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
+						<g transform="translate(6078.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="14601.3" y="1366.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M14601.3 1397.5 L15588.3 1397.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M14601.3 1833.5 L15588.3 1833.5" fill="none" data-name="ReportItemFormViewModel"></path>
+					<g data-name="MeasurementFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
+							<rect x="4573.5" y="1637.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(14601.25, 1366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
-								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
+						<g transform="translate(4573.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
+								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14601.25, 1397.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
+					</g>
+					<g data-name="MeasurementSurveyFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
+							<rect x="28551.5" y="648.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
+							<path d="M28551.5 679.5 L28960.5 679.5" fill="none" data-name="MeasurementSurveyFormData"></path>
+							<path d="M28551.5 800.5 L28960.5 800.5" fill="none" data-name="MeasurementSurveyFormData"></path>
+						</g>
+						<g transform="translate(28551.5, 648.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
+								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14601.25, 1833.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
+						<g transform="translate(28551.5, 679.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="12727.3" y="1637.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
-						</g>
-						<g transform="translate(12727.25, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
+						<g transform="translate(28551.5, 800.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="14008.5" y="2475.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M14008.5 2506.0 L14391.5 2506.0" fill="none" data-name="ReportSectionType"></path>
+					<g data-name="QuestionnaireFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
+							<rect x="24965.5" y="1584.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
+							<path d="M24965.5 1615.0 L25333.5 1615.0" fill="none" data-name="QuestionnaireFormData"></path>
+							<path d="M24965.5 1661.0 L25333.5 1661.0" fill="none" data-name="QuestionnaireFormData"></path>
 						</g>
-						<g transform="translate(14008.5, 2475)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
+						<g transform="translate(24965.5, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
+								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14008.5, 2506)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
+						<g transform="translate(24965.5, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(24965.5, 1661)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="28441.3" y="0.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M28441.3 31.0 L28889.3 31.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M28441.3 137.0 L28889.3 137.0" fill="none" data-name="TemporalAggregationFormatted"></path>
+					<g data-name="WithQuestionnaireControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
+							<rect x="20667.8" y="618.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
+							<path d="M20667.8 649.5 L21299.8 649.5" fill="none" data-name="WithQuestionnaireControls"></path>
+							<path d="M20667.8 755.5 L21299.8 755.5" fill="none" data-name="WithQuestionnaireControls"></path>
 						</g>
-						<g transform="translate(28441.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
+						<g transform="translate(20667.75, 618.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
+								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28441.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
+						<g transform="translate(20667.75, 649.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28441.25, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
+						<g transform="translate(20667.75, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="28552.3" y="366.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
+					<g data-name="StudyDesignMeasurementsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
+							<rect x="1447.0" y="716.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
+							<path d="M1447.0 747.5 L1757.0 747.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
 						</g>
-						<g transform="translate(28552.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
+						<g transform="translate(1447, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
+								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="29022.3" y="366.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(29022.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
+						<g transform="translate(1447, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="28929.3" y="0.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M28929.3 31.0 L29380.3 31.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M28929.3 137.0 L29380.3 137.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
+					<g data-name="MeasurementsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
+							<rect x="15735.8" y="1471.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
+							<path d="M15735.8 1502.5 L16827.8 1502.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+							<path d="M15735.8 1653.5 L16827.8 1653.5" fill="none" data-name="MeasurementsFormViewModel"></path>
 						</g>
-						<g transform="translate(28929.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
+						<g transform="translate(15735.75, 1471.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
+								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28929.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
+						<g transform="translate(15735.75, 1502.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28929.25, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
+						<g transform="translate(15735.75, 1653.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="29149.3" y="366.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
+					<g data-name="StudyFormScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
+							<rect x="6814.8" y="686.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
+							<path d="M6814.8 717.0 L7202.8 717.0" fill="none" data-name="StudyFormScaffold"></path>
+							<path d="M6814.8 778.0 L7202.8 778.0" fill="none" data-name="StudyFormScaffold"></path>
 						</g>
-						<g transform="translate(29149.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
+						<g transform="translate(6814.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
+								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="19172.8" y="686.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M19172.8 717.0 L19651.8 717.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M19172.8 778.0 L19651.8 778.0" fill="none" data-name="AverageSectionFormView"></path>
+						<g transform="translate(6814.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
+								
+							</g>
 						</g>
-						<g transform="translate(19172.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
+						<g transform="translate(6814.75, 778)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19172.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+					</g>
+					<g data-name="T Function(WidgetRef)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
+							<rect x="6044.0" y="1637.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
+						</g>
+						<g transform="translate(6044, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19172.75, 778)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
+					</g>
+					<g data-name="Widget Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
+							<rect x="6277.0" y="1637.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
+						</g>
+						<g transform="translate(6277, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="19691.8" y="686.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M19691.8 717.0 L20170.8 717.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M19691.8 778.0 L20170.8 778.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+					<g data-name="ConsentItemFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
+							<rect x="7911.0" y="1524.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
+							<path d="M7911.0 1555.0 L8607.0 1555.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+							<path d="M7911.0 1721.0 L8607.0 1721.0" fill="none" data-name="ConsentItemFormViewModel"></path>
 						</g>
-						<g transform="translate(19691.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
+						<g transform="translate(7911, 1524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19691.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+						<g transform="translate(7911, 1555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19691.75, 778)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
+						<g transform="translate(7911, 1721)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="29734.8" y="335.5" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M29734.8 366.5 L29938.8 366.5" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M29734.8 397.5 L29938.8 397.5" fill="none" data-name="DataReferenceIdentifier"></path>
+					<g data-name="StudyDesignEnrollmentFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
+							<rect x="3626.0" y="701.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
+							<path d="M3626.0 732.5 L4075.0 732.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
 						</g>
-						<g transform="translate(29734.75, 335.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
+						<g transform="translate(3626, 701.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
+								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29734.75, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
+						<g transform="translate(3626, 732.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29734.75, 397.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
+					</g>
+					<g data-name="IScreenerQuestionLogicFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
+							<rect x="14496.5" y="1622.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
+							<path d="M14496.5 1653.0 L14828.5 1653.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
+						</g>
+						<g transform="translate(14496.5, 1622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
+								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(14496.5, 1653)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="29769.3" y="91.0" height="31.0" width="135.0" data-name="DataReference"></rect>
+					<g data-name="ScreenerQuestionLogicFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
+							<rect x="12402.8" y="1584.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
+							<path d="M12402.8 1615.0 L12826.8 1615.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+							<path d="M12402.8 1646.0 L12826.8 1646.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
 						</g>
-						<g transform="translate(29769.25, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
+						<g transform="translate(12402.75, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
+								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="13023.3" y="1584.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M13023.3 1615.0 L13732.3 1615.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M13023.3 1676.0 L13732.3 1676.0" fill="none" data-name="DataReferenceEditor"></path>
+						<g transform="translate(12402.75, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
+								
+							</g>
 						</g>
-						<g transform="translate(13023.25, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
+						<g transform="translate(12402.75, 1646)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13023.25, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
+					</g>
+					<g data-name="ScreenerQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
+							<rect x="12333.8" y="2362.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
+							<path d="M12333.8 2393.0 L12895.8 2393.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+							<path d="M12333.8 2574.0 L12895.8 2574.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+						</g>
+						<g transform="translate(12333.75, 2362)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
+								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13023.25, 1676)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
+						<g transform="translate(12333.75, 2393)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="14481.5" y="2513.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
-						</g>
-						<g transform="translate(14481.5, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
+						<g transform="translate(12333.75, 2574)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="24594.8" y="686.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M24594.8 717.0 L24932.8 717.0" fill="none" data-name="ReportsFormData"></path>
-							<path d="M24594.8 763.0 L24932.8 763.0" fill="none" data-name="ReportsFormData"></path>
+					<g data-name="ConsentItemFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
+							<rect x="24621.0" y="298.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
+							<path d="M24621.0 329.0 L24879.0 329.0" fill="none" data-name="ConsentItemFormData"></path>
+							<path d="M24621.0 420.0 L24879.0 420.0" fill="none" data-name="ConsentItemFormData"></path>
 						</g>
-						<g transform="translate(24594.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
+						<g transform="translate(24621, 298)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
+								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24594.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
+						<g transform="translate(24621, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24594.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
+						<g transform="translate(24621, 420)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="11711.5" y="2475.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M11711.5 2506.0 L12012.5 2506.0" fill="none" data-name="ReportStatus"></path>
+					<g data-name="ConsentItemFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
+							<rect x="13651.3" y="716.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
+							<path d="M13651.3 747.5 L14032.3 747.5" fill="none" data-name="ConsentItemFormView"></path>
 						</g>
-						<g transform="translate(11711.5, 2475)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
+						<g transform="translate(13651.25, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
+								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11711.5, 2506)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
+						<g transform="translate(13651.25, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="13772.3" y="1584.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M13772.3 1615.0 L13969.3 1615.0" fill="none" data-name="ReportBadge"></path>
-							<path d="M13772.3 1691.0 L13969.3 1691.0" fill="none" data-name="ReportBadge"></path>
+					<g data-name="EnrollmentFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
+							<rect x="24648.5" y="663.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
+							<path d="M24648.5 694.5 L25102.5 694.5" fill="none" data-name="EnrollmentFormData"></path>
+							<path d="M24648.5 785.5 L25102.5 785.5" fill="none" data-name="EnrollmentFormData"></path>
 						</g>
-						<g transform="translate(13772.25, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
+						<g transform="translate(24648.5, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
+								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13772.25, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
+						<g transform="translate(24648.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13772.25, 1691)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
+						<g transform="translate(24648.5, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="14724.5" y="2513.0" height="31.0" width="106.0" data-name="BadgeType"></rect>
+					<g data-name="Participation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
+							<rect x="24553.5" y="1637.5" height="31.0" width="114.0" data-name="Participation"></rect>
 						</g>
-						<g transform="translate(14724.5, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
+						<g transform="translate(24553.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
+								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignReportsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="2648.5" y="709.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M2648.5 740.0 L3041.5 740.0" fill="none" data-name="StudyDesignReportsFormView"></path>
+					<g data-name="QuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
+							<rect x="8931.0" y="984.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M8931.0 1015.0 L9944.0 1015.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M8931.0 2036.0 L9944.0 2036.0" fill="none" data-name="QuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(2648.5, 709)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
+						<g transform="translate(8931, 984)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
+								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2648.5, 740)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
+						<g transform="translate(8931, 1015)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
+								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
+								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
+								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
+								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
+								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
+								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
+								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
+								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
+								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
+								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
+								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
+								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
+								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
+								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
+								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
+								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
+								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
+								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(8931, 2036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="20210.8" y="686.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M20210.8 717.0 L20598.8 717.0" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M20210.8 778.0 L20598.8 778.0" fill="none" data-name="StudyFormScaffold"></path>
+					<g data-name="EnrollmentFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
+							<rect x="18581.8" y="1404.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
+							<path d="M18581.8 1435.0 L19483.8 1435.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+							<path d="M18581.8 1661.0 L19483.8 1661.0" fill="none" data-name="EnrollmentFormViewModel"></path>
 						</g>
-						<g transform="translate(20210.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
+						<g transform="translate(18581.75, 1404)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
+								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20210.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
+						<g transform="translate(18581.75, 1435)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20210.75, 778)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
+						<g transform="translate(18581.75, 1661)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="T Function(WidgetRef)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="20091.5" y="1637.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
+					<g data-name="EnrollmentFormConsentItemDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
+							<rect x="17652.3" y="2422.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
+							<path d="M17652.3 2453.0 L18452.3 2453.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+							<path d="M17652.3 2529.0 L18452.3 2529.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
 						</g>
-						<g transform="translate(20091.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
+						<g transform="translate(17652.25, 2422)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
+								
+							</g>
+						</g>
+						<g transform="translate(17652.25, 2453)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
+								
+							</g>
+						</g>
+						<g transform="translate(17652.25, 2529)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="20506.8" y="1637.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
+					<g data-name="StudyFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
+							<rect x="17500.0" y="566.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
+							<path d="M17500.0 597.0 L18196.0 597.0" fill="none" data-name="StudyFormViewModel"></path>
+							<path d="M17500.0 808.0 L18196.0 808.0" fill="none" data-name="StudyFormViewModel"></path>
 						</g>
-						<g transform="translate(20506.75, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
+						<g transform="translate(17500, 566)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="14169.3" y="709.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M14169.3 740.0 L14521.3 740.0" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(14169.25, 709)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
+						<g transform="translate(17500, 597)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14169.25, 740)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
+						<g transform="translate(17500, 808)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="15427.0" y="2445.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M15427.0 2476.0 L15790.0 2476.0" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(15427, 2445)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
-								
-							</g>
+					<g data-name="IStudyRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
+							<rect x="16907.8" y="1637.5" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
 						</g>
-						<g transform="translate(15427, 2476)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
+						<g transform="translate(16907.75, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
+								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="16718.0" y="2513.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+					<g data-name="IAuthRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
+							<rect x="17098.8" y="1637.5" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
 						</g>
-						<g transform="translate(16718, 2513)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
+						<g transform="translate(17098.75, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
+								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="QuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="25768.3" y="253.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M25768.3 284.0 L26936.3 284.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M25768.3 420.0 L26936.3 420.0" fill="none" data-name="QuestionFormData"></path>
+							<rect x="26308.3" y="253.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M26308.3 284.0 L27476.3 284.0" fill="none" data-name="QuestionFormData"></path>
+							<path d="M26308.3 420.0 L27476.3 420.0" fill="none" data-name="QuestionFormData"></path>
 						</g>
-						<g transform="translate(25768.25, 253)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+						<g transform="translate(26308.25, 253)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
 								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25768.25, 284)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+						<g transform="translate(26308.25, 284)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
@@ -4311,7 +4321,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(25768.25, 420)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+						<g transform="translate(26308.25, 420)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
@@ -4322,19 +4332,44 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="SurveyQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
+							<rect x="13472.0" y="2445.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M13472.0 2476.0 L13835.0 2476.0" fill="none" data-name="SurveyQuestionType"></path>
+						</g>
+						<g transform="translate(13472, 2445)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
+								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
+								
+							</g>
+						</g>
+						<g transform="translate(13472, 2476)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="ChoiceQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="25180.8" y="663.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M25180.8 694.5 L25524.8 694.5" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M25180.8 755.5 L25524.8 755.5" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<rect x="25613.5" y="663.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M25613.5 694.5 L25957.5 694.5" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M25613.5 755.5 L25957.5 755.5" fill="none" data-name="ChoiceQuestionFormData"></path>
 						</g>
-						<g transform="translate(25180.75, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(25613.5, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25180.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(25613.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
@@ -4342,7 +4377,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(25180.75, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(25613.5, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
@@ -4354,24 +4389,24 @@
 					</g>
 					<g data-name="BoolQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="25564.8" y="678.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M25564.8 709.5 L25956.8 709.5" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M25564.8 755.5 L25956.8 755.5" fill="none" data-name="BoolQuestionFormData"></path>
+							<rect x="25997.5" y="678.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M25997.5 709.5 L26389.5 709.5" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M25997.5 755.5 L26389.5 755.5" fill="none" data-name="BoolQuestionFormData"></path>
 						</g>
-						<g transform="translate(25564.75, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(25997.5, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
 								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25564.75, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(25997.5, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25564.75, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(25997.5, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
@@ -4382,24 +4417,24 @@
 					</g>
 					<g data-name="ImageQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="25996.8" y="678.5" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M25996.8 709.5 L26468.8 709.5" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M25996.8 755.5 L26468.8 755.5" fill="none" data-name="ImageQuestionFormData"></path>
+							<rect x="26429.5" y="678.5" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
+							<path d="M26429.5 709.5 L26901.5 709.5" fill="none" data-name="ImageQuestionFormData"></path>
+							<path d="M26429.5 755.5 L26901.5 755.5" fill="none" data-name="ImageQuestionFormData"></path>
 						</g>
-						<g transform="translate(25996.75, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(26429.5, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
 								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25996.75, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(26429.5, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25996.75, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(26429.5, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
@@ -4410,17 +4445,17 @@
 					</g>
 					<g data-name="AudioQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="26508.8" y="671.0" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M26508.8 702.0 L26980.8 702.0" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M26508.8 763.0 L26980.8 763.0" fill="none" data-name="AudioQuestionFormData"></path>
+							<rect x="26941.5" y="671.0" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
+							<path d="M26941.5 702.0 L27413.5 702.0" fill="none" data-name="AudioQuestionFormData"></path>
+							<path d="M26941.5 763.0 L27413.5 763.0" fill="none" data-name="AudioQuestionFormData"></path>
 						</g>
-						<g transform="translate(26508.75, 671)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(26941.5, 671)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
 								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26508.75, 702)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(26941.5, 702)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
@@ -4428,7 +4463,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(26508.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(26941.5, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
@@ -4439,17 +4474,17 @@
 					</g>
 					<g data-name="ScaleQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="27020.8" y="603.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M27020.8 634.5 L27364.8 634.5" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M27020.8 830.5 L27364.8 830.5" fill="none" data-name="ScaleQuestionFormData"></path>
+							<rect x="27453.5" y="603.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M27453.5 634.5 L27797.5 634.5" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M27453.5 830.5 L27797.5 830.5" fill="none" data-name="ScaleQuestionFormData"></path>
 						</g>
-						<g transform="translate(27020.75, 603.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(27453.5, 603.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27020.75, 634.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(27453.5, 634.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
@@ -4466,7 +4501,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(27020.75, 830.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(27453.5, 830.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
@@ -4477,9 +4512,9 @@
 					</g>
 					<g data-name="Color">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="27875.5" y="1637.5" height="31.0" width="58.0" data-name="Color"></rect>
+							<rect x="27596.5" y="1637.5" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(27875.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+						<g transform="translate(27596.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
 								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
@@ -4488,17 +4523,17 @@
 					</g>
 					<g data-name="FreeTextQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="27404.8" y="663.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M27404.8 694.5 L27748.8 694.5" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M27404.8 770.5 L27748.8 770.5" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<rect x="27837.5" y="663.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M27837.5 694.5 L28181.5 694.5" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M27837.5 770.5 L28181.5 770.5" fill="none" data-name="FreeTextQuestionFormData"></path>
 						</g>
-						<g transform="translate(27404.75, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(27837.5, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27404.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(27837.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
@@ -4507,7 +4542,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(27404.75, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(27837.5, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
@@ -4518,71 +4553,60 @@
 					</g>
 					<g data-name="FreeTextQuestionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="28082.0" y="1637.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+							<rect x="27911.5" y="1637.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
 						</g>
-						<g transform="translate(28082, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+						<g transform="translate(27911.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
 								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="29420.3" y="75.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M29420.3 106.5 L29729.3 106.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(29420.25, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
-								
-							</g>
+					<g data-name="AudioRecordingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
+							<rect x="8743.8" y="701.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
+							<path d="M8743.8 732.0 L9095.8 732.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<path d="M8743.8 763.0 L9095.8 763.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
 						</g>
-						<g transform="translate(29420.25, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(8743.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="16323.3" y="716.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M16323.3 747.5 L16675.3 747.5" fill="none" data-name="ScaleQuestionFormView"></path>
-						</g>
-						<g transform="translate(16323.25, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
+						<g transform="translate(8743.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16323.25, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(8743.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="FreeTextQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="20638.8" y="678.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M20638.8 709.5 L20990.8 709.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M20638.8 755.5 L20990.8 755.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<rect x="9135.8" y="678.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M9135.8 709.5 L9487.8 709.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M9135.8 755.5 L9487.8 755.5" fill="none" data-name="FreeTextQuestionFormView"></path>
 						</g>
-						<g transform="translate(20638.75, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(9135.75, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20638.75, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(9135.75, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20638.75, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(9135.75, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
@@ -4591,224 +4615,200 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="21030.8" y="701.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M21030.8 732.0 L21382.8 732.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M21030.8 763.0 L21382.8 763.0" fill="none" data-name="BoolQuestionFormView"></path>
+					<g data-name="ImageCapturingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
+							<rect x="9527.8" y="701.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
+							<path d="M9527.8 732.0 L9879.8 732.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<path d="M9527.8 763.0 L9879.8 763.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
 						</g>
-						<g transform="translate(21030.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
+						<g transform="translate(9527.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21030.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(9527.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21030.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+						<g transform="translate(9527.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="21422.8" y="701.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M21422.8 732.0 L21774.8 732.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M21422.8 763.0 L21774.8 763.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+					<g data-name="IScaleQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
+							<rect x="29618.3" y="75.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M29618.3 106.5 L29927.3 106.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(21422.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
+						<g transform="translate(29618.25, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
+								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21422.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(29618.25, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21422.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
+					</g>
+					<g data-name="ScaleQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
+							<rect x="19723.8" y="716.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M19723.8 747.5 L20075.8 747.5" fill="none" data-name="ScaleQuestionFormView"></path>
+						</g>
+						<g transform="translate(19723.75, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(19723.75, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ChoiceQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="21814.8" y="701.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M21814.8 732.0 L22166.8 732.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M21814.8 763.0 L22166.8 763.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<rect x="9919.8" y="701.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M9919.8 732.0 L10271.8 732.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M9919.8 763.0 L10271.8 763.0" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(21814.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(9919.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21814.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(9919.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21814.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+						<g transform="translate(9919.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="22206.8" y="701.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M22206.8 732.0 L22558.8 732.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M22206.8 763.0 L22558.8 763.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+					<g data-name="BoolQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
+							<rect x="10795.8" y="701.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M10795.8 732.0 L11147.8 732.0" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M10795.8 763.0 L11147.8 763.0" fill="none" data-name="BoolQuestionFormView"></path>
 						</g>
-						<g transform="translate(22206.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
+						<g transform="translate(10795.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22206.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(10795.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22206.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
+						<g transform="translate(10795.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="17915.3" y="328.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M17915.3 359.0 L18347.3 359.0" fill="none" data-name="ScheduleControls"></path>
-							<path d="M17915.3 390.0 L18347.3 390.0" fill="none" data-name="ScheduleControls"></path>
+					<g data-name="AbstractControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
+							<rect x="11234.8" y="2513.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
 						</g>
-						<g transform="translate(17915.25, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
+						<g transform="translate(11234.75, 2513)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
+								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17915.25, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
+					</g>
+					<g data-name="SurveyQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
+							<rect x="20195.8" y="709.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M20195.8 740.0 L20547.8 740.0" fill="none" data-name="SurveyQuestionFormView"></path>
+						</g>
+						<g transform="translate(20195.75, 709)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17915.25, 390)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
+						<g transform="translate(20195.75, 740)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="StudyUTimeOfDay">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="28607.8" y="732.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
+							<rect x="29000.5" y="732.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
 						</g>
-						<g transform="translate(28607.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
+						<g transform="translate(29000.5, 732)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
 								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="18214.3" y="1637.5" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
-						</g>
-						<g transform="translate(18214.25, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="9170.8" y="566.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M9170.8 597.0 L9866.8 597.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M9170.8 808.0 L9866.8 808.0" fill="none" data-name="StudyFormViewModel"></path>
-						</g>
-						<g transform="translate(9170.75, 566)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
-								
-							</g>
+					<g data-name="ScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
+							<rect x="21531.3" y="328.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
+							<path d="M21531.3 359.0 L21963.3 359.0" fill="none" data-name="ScheduleControls"></path>
+							<path d="M21531.3 390.0 L21963.3 390.0" fill="none" data-name="ScheduleControls"></path>
 						</g>
-						<g transform="translate(9170.75, 597)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(21531.25, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
+								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9170.75, 808)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
+						<g transform="translate(21531.25, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="6732.8" y="1637.5" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
-						</g>
-						<g transform="translate(6732.75, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
+						<g transform="translate(21531.25, 390)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="6923.8" y="1637.5" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
+					<g data-name="StreamSubscription">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
+							<rect x="22140.0" y="1637.5" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
 						</g>
-						<g transform="translate(6923.75, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
+						<g transform="translate(22140, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
+								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="StudyPageWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="1230.0" y="91.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
+							<rect x="1522.5" y="91.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
 						</g>
-						<g transform="translate(1230, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
+						<g transform="translate(1522.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
 								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
 								

From ef118dc351c60aa0e28a5e028bec7337a02d8499 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 13 May 2024 16:43:55 +0200
Subject: [PATCH 036/314] chore: format

---
 .../questionnaire/question/question_form_controller.dart    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/question_form_controller.dart b/designer_v2/lib/features/design/shared/questionnaire/question/question_form_controller.dart
index 0cf3d6c9b..cdc0b995d 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/question_form_controller.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/question_form_controller.dart
@@ -115,7 +115,11 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
   late final FormArray<String> audioResponseOptionsArray = FormArray(audioOptions);
   final FormControl<int> maxRecordingDurationSecondsControl = FormControl(
       value: kDefaultMaxRecordingDurationSeconds,
-      validators: [Validators.number(allowNegatives: false), Validators.min(1), Validators.max(kMaxRecordingDurationSeconds)]);
+      validators: [
+        Validators.number(allowNegatives: false),
+        Validators.min(1),
+        Validators.max(kMaxRecordingDurationSeconds)
+      ]);
 
   // Scale
   static const int kDefaultScaleMinValue = 0;

From 9f4750c350d196c80e0692ef36950e3bc45f015e Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 13 May 2024 17:27:03 +0200
Subject: [PATCH 037/314] chore(release): publish packages

 - studyu_core@4.4.2-dev.1
 - studyu_app@2.7.4-dev.1
 - studyu_designer_v2@1.8.0-dev.1
 - studyu_flutter_common@1.8.3-dev.1
---
 CHANGELOG.md                | 36 ++++++++++++++++++++++++++++++++++++
 app/CHANGELOG.md            |  4 ++++
 app/pubspec.yaml            |  6 +++---
 core/CHANGELOG.md           |  4 ++++
 core/pubspec.yaml           |  2 +-
 designer_v2/CHANGELOG.md    |  4 ++++
 designer_v2/pubspec.yaml    |  6 +++---
 flutter_common/CHANGELOG.md |  4 ++++
 flutter_common/pubspec.yaml |  4 ++--
 9 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fac3f4242..e145354a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2024-05-13
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`studyu_core` - `v4.4.2-dev.1`](#studyu_core---v442-dev1)
+ - [`studyu_app` - `v2.7.4-dev.1`](#studyu_app---v274-dev1)
+ - [`studyu_designer_v2` - `v1.8.0-dev.1`](#studyu_designer_v2---v180-dev1)
+ - [`studyu_flutter_common` - `v1.8.3-dev.1`](#studyu_flutter_common---v183-dev1)
+
+Packages with dependency updates only:
+
+> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project.
+
+ - `studyu_app` - `v2.7.4-dev.1`
+ - `studyu_designer_v2` - `v1.8.0-dev.1`
+ - `studyu_flutter_common` - `v1.8.3-dev.1`
+
+---
+
+#### `studyu_core` - `v4.4.2-dev.1`
+
+ - **REFACTOR**: improved app config error handling.
+
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
 ## 2024-04-29
 
 ### Changes
diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md
index 0aa8a48f3..d4d847b3d 100644
--- a/app/CHANGELOG.md
+++ b/app/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.7.4-dev.1
+
+ - Update a dependency to the latest release.
+
 ## 2.7.4-dev.0
 
  - **FIX**: upgrade deps and migrate.
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 0af37b3e9..cb616b323 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_app
-version: 2.7.4-dev.0
+version: 2.7.4-dev.1
 description: Partake in digital N-of-1 trials with the innovative StudyU Health App
 publish_to: none
 homepage: https://studyu.health
@@ -38,8 +38,8 @@ dependencies:
   sentry_flutter: ^8.1.0
   sentry_logging: ^8.1.0
   shared_preferences: ^2.2.3
-  studyu_core: ^4.4.2-dev.0
-  studyu_flutter_common: ^1.8.3-dev.0
+  studyu_core: ^4.4.2-dev.1
+  studyu_flutter_common: ^1.8.3-dev.1
   supabase: ^2.1.2
   supabase_flutter: ^2.5.2
   timeline_tile: ^2.0.0
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index e4b68e9a5..85b3aa307 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.4.2-dev.1
+
+ - **REFACTOR**: improved app config error handling.
+
 ## 4.4.2-dev.0
 
  - **FIX**: upgrade deps and migrate.
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index 64ab17b22..88cbd8704 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_core
-version: 4.4.2-dev.0
+version: 4.4.2-dev.1
 description: This package contains StudyU models and common functions for the app and designer packages
 homepage: https://studyu.health
 repository: https://github.com/hpi-studyu/studyu
diff --git a/designer_v2/CHANGELOG.md b/designer_v2/CHANGELOG.md
index 8793c2e3a..34f3595bc 100644
--- a/designer_v2/CHANGELOG.md
+++ b/designer_v2/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.8.0-dev.1
+
+ - Update a dependency to the latest release.
+
 ## 1.8.0-dev.0
 
  - **FIX**: upgrade deps and migrate.
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index e31b647df..f7d669f75 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_designer_v2
-version: 1.8.0-dev.0
+version: 1.8.0-dev.1
 description: Implement digital N-of-1 studies seamlessly with the StudyU Health Designer
 publish_to: none
 homepage: https://studyu.health
@@ -32,8 +32,8 @@ dependencies:
   reactive_multi_select_flutter: ^2.0.1
   reactive_range_slider: ^2.1.0
   rxdart: ^0.27.7
-  studyu_core: ^4.4.2-dev.0
-  studyu_flutter_common: ^1.8.3-dev.0
+  studyu_core: ^4.4.2-dev.1
+  studyu_flutter_common: ^1.8.3-dev.1
   supabase: ^2.1.2
   supabase_flutter: ^2.5.2
   url_launcher: ^6.2.6
diff --git a/flutter_common/CHANGELOG.md b/flutter_common/CHANGELOG.md
index c7262f9c0..6de6c86db 100644
--- a/flutter_common/CHANGELOG.md
+++ b/flutter_common/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.8.3-dev.1
+
+ - Update a dependency to the latest release.
+
 ## 1.8.3-dev.0
 
  - **FIX**: upgrade deps and migrate.
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index 296605606..5780c4758 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_flutter_common
-version: 1.8.3-dev.0
+version: 1.8.3-dev.1
 description: StudyU common flutter components and functions for app and designer
 homepage: https://studyu.health
 repository: https://github.com/hpi-studyu/studyu
@@ -13,7 +13,7 @@ dependencies:
   flutter_dotenv: ^5.1.0
   flutter_secure_storage: ^9.1.1
   shared_preferences: ^2.2.3 # Can be removed after migrating phase
-  studyu_core: ^4.4.2-dev.0
+  studyu_core: ^4.4.2-dev.1
   supabase_flutter: ^2.5.2
   synchronized: ^3.1.0+1
   uuid: ^4.4.0

From 5895e3caa72764d08ef585e8d7371f21c5942b06 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 13 May 2024 17:31:34 +0200
Subject: [PATCH 038/314] chore: lock files

---
 app/pubspec.lock            | 4 ++--
 designer_v2/pubspec.lock    | 4 ++--
 flutter_common/pubspec.lock | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index d8c5b9b1e..6e1f1ed70 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -1176,14 +1176,14 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.2-dev.0"
+    version: "4.4.2-dev.1"
   studyu_flutter_common:
     dependency: "direct main"
     description:
       path: "../flutter_common"
       relative: true
     source: path
-    version: "1.8.3-dev.0"
+    version: "1.8.3-dev.1"
   supabase:
     dependency: "direct main"
     description:
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index c98bfe6dc..979c1231f 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -1039,14 +1039,14 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.2-dev.0"
+    version: "4.4.2-dev.1"
   studyu_flutter_common:
     dependency: "direct main"
     description:
       path: "../flutter_common"
       relative: true
     source: path
-    version: "1.8.3-dev.0"
+    version: "1.8.3-dev.1"
   supabase:
     dependency: "direct main"
     description:
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index d9ab74a12..d220a5f26 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -547,7 +547,7 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.2-dev.0"
+    version: "4.4.2-dev.1"
   supabase:
     dependency: transitive
     description:

From 5625900efd3109c89d7a6d48e55475ea48267ac1 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 13 May 2024 17:45:06 +0200
Subject: [PATCH 039/314] chore(release): publish packages

 - studyu_app@2.7.4
 - studyu_core@4.4.2
 - studyu_designer_v2@1.8.0
 - studyu_flutter_common@1.8.3
---
 CHANGELOG.md                | 38 +++++++++++++++++++++++++++++++++++++
 app/CHANGELOG.md            |  4 ++++
 app/pubspec.yaml            |  6 +++---
 core/CHANGELOG.md           |  4 ++++
 core/pubspec.yaml           |  2 +-
 designer_v2/CHANGELOG.md    |  4 ++++
 designer_v2/pubspec.yaml    |  6 +++---
 flutter_common/CHANGELOG.md |  4 ++++
 flutter_common/pubspec.yaml |  4 ++--
 9 files changed, 63 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e145354a8..b6ad89708 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,44 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ---
 
+Packages with breaking changes:
+
+ - [`studyu_app` - `v2.7.4`](#studyu_app---v274)
+ - [`studyu_core` - `v4.4.2`](#studyu_core---v442)
+ - [`studyu_flutter_common` - `v1.8.3`](#studyu_flutter_common---v183)
+
+Packages with other changes:
+
+ - [`studyu_designer_v2` - `v1.8.0`](#studyu_designer_v2---v180)
+
+Packages graduated to a stable release (see pre-releases prior to the stable version for changelog entries):
+
+ - `studyu_app` - `v2.7.4`
+ - `studyu_core` - `v4.4.2`
+ - `studyu_designer_v2` - `v1.8.0`
+ - `studyu_flutter_common` - `v1.8.3`
+
+---
+
+#### `studyu_app` - `v2.7.4`
+
+#### `studyu_core` - `v4.4.2`
+
+#### `studyu_flutter_common` - `v1.8.3`
+
+#### `studyu_designer_v2` - `v1.8.0`
+
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## 2024-05-13
+
+### Changes
+
+---
+
 Packages with breaking changes:
 
  - There are no breaking changes in this release.
diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md
index d4d847b3d..ac60e5485 100644
--- a/app/CHANGELOG.md
+++ b/app/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.7.4
+
+ - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
+
 ## 2.7.4-dev.1
 
  - Update a dependency to the latest release.
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index cb616b323..f7cee3b47 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_app
-version: 2.7.4-dev.1
+version: 2.7.4
 description: Partake in digital N-of-1 trials with the innovative StudyU Health App
 publish_to: none
 homepage: https://studyu.health
@@ -38,8 +38,8 @@ dependencies:
   sentry_flutter: ^8.1.0
   sentry_logging: ^8.1.0
   shared_preferences: ^2.2.3
-  studyu_core: ^4.4.2-dev.1
-  studyu_flutter_common: ^1.8.3-dev.1
+  studyu_core: ^4.4.2
+  studyu_flutter_common: ^1.8.3
   supabase: ^2.1.2
   supabase_flutter: ^2.5.2
   timeline_tile: ^2.0.0
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 85b3aa307..7b8d97130 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.4.2
+
+ - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
+
 ## 4.4.2-dev.1
 
  - **REFACTOR**: improved app config error handling.
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index 88cbd8704..c5361ac52 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_core
-version: 4.4.2-dev.1
+version: 4.4.2
 description: This package contains StudyU models and common functions for the app and designer packages
 homepage: https://studyu.health
 repository: https://github.com/hpi-studyu/studyu
diff --git a/designer_v2/CHANGELOG.md b/designer_v2/CHANGELOG.md
index 34f3595bc..dbe71f863 100644
--- a/designer_v2/CHANGELOG.md
+++ b/designer_v2/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.8.0
+
+ - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
+
 ## 1.8.0-dev.1
 
  - Update a dependency to the latest release.
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index f7d669f75..4beebd13e 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_designer_v2
-version: 1.8.0-dev.1
+version: 1.8.0
 description: Implement digital N-of-1 studies seamlessly with the StudyU Health Designer
 publish_to: none
 homepage: https://studyu.health
@@ -32,8 +32,8 @@ dependencies:
   reactive_multi_select_flutter: ^2.0.1
   reactive_range_slider: ^2.1.0
   rxdart: ^0.27.7
-  studyu_core: ^4.4.2-dev.1
-  studyu_flutter_common: ^1.8.3-dev.1
+  studyu_core: ^4.4.2
+  studyu_flutter_common: ^1.8.3
   supabase: ^2.1.2
   supabase_flutter: ^2.5.2
   url_launcher: ^6.2.6
diff --git a/flutter_common/CHANGELOG.md b/flutter_common/CHANGELOG.md
index 6de6c86db..e15cea9e6 100644
--- a/flutter_common/CHANGELOG.md
+++ b/flutter_common/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.8.3
+
+ - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
+
 ## 1.8.3-dev.1
 
  - Update a dependency to the latest release.
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index 5780c4758..18a4d95b7 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_flutter_common
-version: 1.8.3-dev.1
+version: 1.8.3
 description: StudyU common flutter components and functions for app and designer
 homepage: https://studyu.health
 repository: https://github.com/hpi-studyu/studyu
@@ -13,7 +13,7 @@ dependencies:
   flutter_dotenv: ^5.1.0
   flutter_secure_storage: ^9.1.1
   shared_preferences: ^2.2.3 # Can be removed after migrating phase
-  studyu_core: ^4.4.2-dev.1
+  studyu_core: ^4.4.2
   supabase_flutter: ^2.5.2
   synchronized: ^3.1.0+1
   uuid: ^4.4.0

From 9cdcf10c225ad56d42da562f29d31f09d5651455 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 13 May 2024 17:45:39 +0200
Subject: [PATCH 040/314] chore: lock files

---
 app/pubspec.lock            | 4 ++--
 designer_v2/pubspec.lock    | 4 ++--
 flutter_common/pubspec.lock | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index 6e1f1ed70..8fda1fbd1 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -1176,14 +1176,14 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.2-dev.1"
+    version: "4.4.2"
   studyu_flutter_common:
     dependency: "direct main"
     description:
       path: "../flutter_common"
       relative: true
     source: path
-    version: "1.8.3-dev.1"
+    version: "1.8.3"
   supabase:
     dependency: "direct main"
     description:
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 979c1231f..d76411159 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -1039,14 +1039,14 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.2-dev.1"
+    version: "4.4.2"
   studyu_flutter_common:
     dependency: "direct main"
     description:
       path: "../flutter_common"
       relative: true
     source: path
-    version: "1.8.3-dev.1"
+    version: "1.8.3"
   supabase:
     dependency: "direct main"
     description:
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index d220a5f26..bfe5e83fe 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -547,7 +547,7 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.2-dev.1"
+    version: "4.4.2"
   supabase:
     dependency: transitive
     description:

From c989ec004aefb7a55fb842756eaf785c12b641b5 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 13 May 2024 18:13:34 +0200
Subject: [PATCH 041/314] fix: update podfile

---
 app/ios/Podfile.lock | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock
index 2f2376adc..bf4adfc7d 100644
--- a/app/ios/Podfile.lock
+++ b/app/ios/Podfile.lock
@@ -26,13 +26,11 @@ PODS:
   - record_darwin (1.0.0):
     - Flutter
     - FlutterMacOS
-  - Sentry/HybridSDK (8.21.0):
-    - SentryPrivate (= 8.21.0)
-  - sentry_flutter (7.20.0):
+  - Sentry/HybridSDK (8.25.0)
+  - sentry_flutter (8.1.0):
     - Flutter
     - FlutterMacOS
-    - Sentry/HybridSDK (= 8.21.0)
-  - SentryPrivate (8.21.0)
+    - Sentry/HybridSDK (= 8.25.0)
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -74,7 +72,6 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - Sentry
-    - SentryPrivate
 
 EXTERNAL SOURCES:
   app_links:
@@ -125,16 +122,15 @@ SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_file_dialog: 4c014a45b105709a27391e266c277d7e588e9299
   flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
-  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
+  flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
   flutter_timezone: ffb07bdad3c6276af8dada0f11978d8a1f8a20bb
   just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
   package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
   path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
   record_darwin: 1f6619f2abac4d1ca91d3eeab038c980d76f1517
-  Sentry: ebc12276bd17613a114ab359074096b6b3725203
-  sentry_flutter: df6e28477322fc5202bbe20aafdd7404b6e97729
-  SentryPrivate: d651efb234cf385ec9a1cdd3eff94b5e78a0e0fe
+  Sentry: cd86fc55628f5b7c572cabe66cc8f95a9d2f165a
+  sentry_flutter: ca7760fc008dc3bc2981730dc0c1d2f892178370
   shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586

From bcf6344f7d1dff6c47825ac62554f0178a29b659 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 13 May 2024 18:15:12 +0200
Subject: [PATCH 042/314] chore(release): publish packages

 - studyu_app@2.7.5
---
 CHANGELOG.md     | 21 +++++++++++++++++++++
 app/CHANGELOG.md |  4 ++++
 app/pubspec.yaml |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6ad89708..23f3fc9b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,27 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2024-05-13
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`studyu_app` - `v2.7.5`](#studyu_app---v275)
+
+---
+
+#### `studyu_app` - `v2.7.5`
+
+ - **FIX**: update podfile.
+
+
 ## 2024-05-13
 
 ### Changes
diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md
index ac60e5485..cc511277d 100644
--- a/app/CHANGELOG.md
+++ b/app/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.7.5
+
+ - **FIX**: update podfile.
+
 ## 2.7.4
 
  - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index f7cee3b47..8599dffca 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_app
-version: 2.7.4
+version: 2.7.5
 description: Partake in digital N-of-1 trials with the innovative StudyU Health App
 publish_to: none
 homepage: https://studyu.health

From be5b9dee8929184c6d69fe2c5909d7aab94771b7 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 13 May 2024 14:42:43 +0200
Subject: [PATCH 043/314] chore: remove docs action

---
 .github/docker/db-docs.yml                    |    17 -
 .github/scripts/generate-uml.bash             |    69 -
 .github/workflows/db-docs.yml                 |    41 -
 .github/workflows/uml-docs.yml                |    43 -
 docs/README.md                                |    28 -
 docs/database/README.md                       |   295 -
 docs/database/auth.audit_log_entries.md       |    35 -
 docs/database/auth.audit_log_entries.svg      |    35 -
 docs/database/auth.instances.md               |    35 -
 docs/database/auth.instances.svg              |    38 -
 docs/database/auth.refresh_tokens.md          |    40 -
 docs/database/auth.refresh_tokens.svg         |    44 -
 docs/database/auth.schema_migrations.md       |    31 -
 docs/database/auth.schema_migrations.svg      |    26 -
 docs/database/auth.users.md                   |    61 -
 docs/database/auth.users.svg                  |   157 -
 .../database/extensions.pg_stat_statements.md |   117 -
 .../extensions.pg_stat_statements.svg         |   152 -
 .../extensions.pg_stat_statements_info.md     |    35 -
 .../extensions.pg_stat_statements_info.svg    |    29 -
 docs/database/net._http_response.md           |    30 -
 docs/database/net._http_response.svg          |    47 -
 docs/database/net.http_request_queue.md       |    22 -
 docs/database/net.http_request_queue.svg      |    41 -
 docs/database/pgsodium.decrypted_key.md       |    66 -
 docs/database/pgsodium.decrypted_key.svg      |    65 -
 docs/database/pgsodium.key.md                 |    58 -
 docs/database/pgsodium.key.svg                |   112 -
 docs/database/pgsodium.mask_columns.md        |    49 -
 docs/database/pgsodium.mask_columns.svg       |    44 -
 docs/database/pgsodium.masking_rule.md        |    85 -
 docs/database/pgsodium.masking_rule.svg       |    65 -
 docs/database/pgsodium.valid_key.md           |    54 -
 docs/database/pgsodium.valid_key.svg          |    50 -
 docs/database/public.app_config.md            |    39 -
 docs/database/public.app_config.svg           |    50 -
 docs/database/public.repo.md                  |    36 -
 docs/database/public.repo.svg                 |   139 -
 docs/database/public.study.md                 |    58 -
 docs/database/public.study.svg                |   201 -
 docs/database/public.study_invite.md          |    34 -
 docs/database/public.study_invite.svg         |   148 -
 docs/database/public.study_progress_export.md |    53 -
 .../database/public.study_progress_export.svg |    53 -
 docs/database/public.study_subject.md         |    38 -
 docs/database/public.study_subject.svg        |   207 -
 docs/database/public.study_tag.md             |    32 -
 docs/database/public.study_tag.svg            |   130 -
 docs/database/public.subject_progress.md      |    35 -
 docs/database/public.subject_progress.svg     |    78 -
 docs/database/public.tag.md                   |    32 -
 docs/database/public.tag.svg                  |    51 -
 docs/database/public.user.md                  |    33 -
 docs/database/public.user.svg                 |   176 -
 docs/database/schema.json                     |     1 -
 docs/database/schema.svg                      |  1142 --
 docs/database/storage.buckets.md              |    35 -
 docs/database/storage.buckets.svg             |   157 -
 docs/database/storage.migrations.md           |    34 -
 docs/database/storage.migrations.svg          |    35 -
 docs/database/storage.objects.md              |    40 -
 docs/database/storage.objects.svg             |   157 -
 docs/database/supabase_functions.hooks.md     |    37 -
 docs/database/supabase_functions.hooks.svg    |    38 -
 .../database/supabase_functions.migrations.md |    30 -
 .../supabase_functions.migrations.svg         |    29 -
 docs/database/vault.decrypted_secrets.md      |    56 -
 docs/database/vault.decrypted_secrets.svg     |    50 -
 docs/database/vault.secrets.md                |    46 -
 docs/database/vault.secrets.svg               |   105 -
 docs/uml/app/lib/models/uml.svg               |    14 -
 .../app/lib/screens/app_onboarding/uml.svg    |   339 -
 .../study/dashboard/contact_tab/uml.svg       |   309 -
 .../study/dashboard/task_overview_tab/uml.svg |   224 -
 .../app/lib/screens/study/dashboard/uml.svg   |   732 -
 .../app/lib/screens/study/multimodal/uml.svg  |    39 -
 .../app/lib/screens/study/onboarding/uml.svg  |   721 -
 .../screens/study/report/performance/uml.svg  |   291 -
 .../lib/screens/study/report/sections/uml.svg |   184 -
 docs/uml/app/lib/screens/study/report/uml.svg |   865 -
 .../app/lib/screens/study/report/util/uml.svg |   128 -
 .../screens/study/tasks/intervention/uml.svg  |    72 -
 .../screens/study/tasks/observation/uml.svg   |    72 -
 docs/uml/app/lib/screens/study/tasks/uml.svg  |   168 -
 docs/uml/app/lib/screens/study/uml.svg        |  2368 ---
 docs/uml/app/lib/screens/uml.svg              |  2660 ---
 .../widgets/questionnaire/questions/uml.svg   |   363 -
 .../uml/app/lib/widgets/questionnaire/uml.svg |   773 -
 docs/uml/app/lib/widgets/uml.svg              |  1172 --
 docs/uml/core/lib/src/env/uml.svg             |    14 -
 docs/uml/core/lib/src/models/consent/uml.svg  |    54 -
 docs/uml/core/lib/src/models/data/uml.svg     |    52 -
 .../core/lib/src/models/eligibility/uml.svg   |    12 -
 .../lib/src/models/expressions/types/uml.svg  |    12 -
 .../core/lib/src/models/expressions/uml.svg   |    12 -
 .../src/models/interventions/tasks/uml.svg    |    12 -
 .../core/lib/src/models/interventions/uml.svg |    12 -
 .../lib/src/models/observations/tasks/uml.svg |    12 -
 .../core/lib/src/models/observations/uml.svg  |    12 -
 .../models/questionnaire/questions/uml.svg    |    12 -
 .../core/lib/src/models/questionnaire/uml.svg |    12 -
 .../lib/src/models/report/sections/uml.svg    |   200 -
 docs/uml/core/lib/src/models/report/uml.svg   |   306 -
 docs/uml/core/lib/src/models/results/uml.svg  |    12 -
 .../src/models/study_results/results/uml.svg  |   123 -
 .../core/lib/src/models/study_results/uml.svg |   156 -
 .../lib/src/models/study_schedule/uml.svg     |    12 -
 docs/uml/core/lib/src/models/tables/uml.svg   |    12 -
 docs/uml/core/lib/src/models/tasks/uml.svg    |    12 -
 docs/uml/core/lib/src/models/uml.svg          |    12 -
 docs/uml/core/lib/src/uml.svg                 |    12 -
 docs/uml/core/lib/src/util/multimodal/uml.svg |    50 -
 docs/uml/core/lib/src/util/uml.svg            |    12 -
 docs/uml/core/lib/uml.svg                     |    12 -
 .../lib/common_views/pages/uml.svg            |    84 -
 .../lib/common_views/sidesheet/uml.svg        |   203 -
 docs/uml/designer_v2/lib/common_views/uml.svg |  3242 ---
 docs/uml/designer_v2/lib/domain/uml.svg       |   229 -
 .../designer_v2/lib/features/account/uml.svg  |    52 -
 .../designer_v2/lib/features/analyze/uml.svg  |    92 -
 .../uml/designer_v2/lib/features/auth/uml.svg |   650 -
 .../lib/features/dashboard/uml.svg            |   648 -
 .../lib/features/design/enrollment/uml.svg    |   820 -
 .../lib/features/design/info/uml.svg          |   319 -
 .../lib/features/design/interventions/uml.svg |  1004 -
 .../design/measurements/survey/uml.svg        |   398 -
 .../lib/features/design/measurements/uml.svg  |   645 -
 .../design/reports/section/types/uml.svg      |   446 -
 .../features/design/reports/section/uml.svg   |   705 -
 .../lib/features/design/reports/uml.svg       |  1170 --
 .../questionnaire/question/types/uml.svg      |   272 -
 .../features/design/shared/schedule/uml.svg   |   236 -
 .../designer_v2/lib/features/forms/uml.svg    |   937 -
 .../designer_v2/lib/features/monitor/uml.svg  |    52 -
 .../designer_v2/lib/features/publish/uml.svg  |   106 -
 .../designer_v2/lib/features/recruit/uml.svg  |   498 -
 .../lib/features/study/settings/uml.svg       |   185 -
 .../designer_v2/lib/features/study/uml.svg    |  1411 --
 docs/uml/designer_v2/lib/features/uml.svg     |  8823 ---------
 .../lib/localization/platform_locale/uml.svg  |    95 -
 docs/uml/designer_v2/lib/localization/uml.svg |   234 -
 docs/uml/designer_v2/lib/repositories/uml.svg |  1725 --
 docs/uml/designer_v2/lib/routing/uml.svg      |   680 -
 docs/uml/designer_v2/lib/services/uml.svg     |   518 -
 docs/uml/designer_v2/lib/uml.svg              | 16246 ----------------
 docs/uml/designer_v2/lib/utils/uml.svg        |  1035 -
 docs/uml/flutter_common/lib/src/uml.svg       |   299 -
 docs/uml/flutter_common/lib/src/utils/uml.svg |   299 -
 docs/uml/flutter_common/lib/uml.svg           |   299 -
 149 files changed, 63041 deletions(-)
 delete mode 100644 .github/docker/db-docs.yml
 delete mode 100755 .github/scripts/generate-uml.bash
 delete mode 100644 .github/workflows/db-docs.yml
 delete mode 100644 .github/workflows/uml-docs.yml
 delete mode 100644 docs/README.md
 delete mode 100644 docs/database/README.md
 delete mode 100644 docs/database/auth.audit_log_entries.md
 delete mode 100644 docs/database/auth.audit_log_entries.svg
 delete mode 100644 docs/database/auth.instances.md
 delete mode 100644 docs/database/auth.instances.svg
 delete mode 100644 docs/database/auth.refresh_tokens.md
 delete mode 100644 docs/database/auth.refresh_tokens.svg
 delete mode 100644 docs/database/auth.schema_migrations.md
 delete mode 100644 docs/database/auth.schema_migrations.svg
 delete mode 100644 docs/database/auth.users.md
 delete mode 100644 docs/database/auth.users.svg
 delete mode 100644 docs/database/extensions.pg_stat_statements.md
 delete mode 100644 docs/database/extensions.pg_stat_statements.svg
 delete mode 100644 docs/database/extensions.pg_stat_statements_info.md
 delete mode 100644 docs/database/extensions.pg_stat_statements_info.svg
 delete mode 100644 docs/database/net._http_response.md
 delete mode 100644 docs/database/net._http_response.svg
 delete mode 100644 docs/database/net.http_request_queue.md
 delete mode 100644 docs/database/net.http_request_queue.svg
 delete mode 100644 docs/database/pgsodium.decrypted_key.md
 delete mode 100644 docs/database/pgsodium.decrypted_key.svg
 delete mode 100644 docs/database/pgsodium.key.md
 delete mode 100644 docs/database/pgsodium.key.svg
 delete mode 100644 docs/database/pgsodium.mask_columns.md
 delete mode 100644 docs/database/pgsodium.mask_columns.svg
 delete mode 100644 docs/database/pgsodium.masking_rule.md
 delete mode 100644 docs/database/pgsodium.masking_rule.svg
 delete mode 100644 docs/database/pgsodium.valid_key.md
 delete mode 100644 docs/database/pgsodium.valid_key.svg
 delete mode 100644 docs/database/public.app_config.md
 delete mode 100644 docs/database/public.app_config.svg
 delete mode 100644 docs/database/public.repo.md
 delete mode 100644 docs/database/public.repo.svg
 delete mode 100644 docs/database/public.study.md
 delete mode 100644 docs/database/public.study.svg
 delete mode 100644 docs/database/public.study_invite.md
 delete mode 100644 docs/database/public.study_invite.svg
 delete mode 100644 docs/database/public.study_progress_export.md
 delete mode 100644 docs/database/public.study_progress_export.svg
 delete mode 100644 docs/database/public.study_subject.md
 delete mode 100644 docs/database/public.study_subject.svg
 delete mode 100644 docs/database/public.study_tag.md
 delete mode 100644 docs/database/public.study_tag.svg
 delete mode 100644 docs/database/public.subject_progress.md
 delete mode 100644 docs/database/public.subject_progress.svg
 delete mode 100644 docs/database/public.tag.md
 delete mode 100644 docs/database/public.tag.svg
 delete mode 100644 docs/database/public.user.md
 delete mode 100644 docs/database/public.user.svg
 delete mode 100644 docs/database/schema.json
 delete mode 100644 docs/database/schema.svg
 delete mode 100644 docs/database/storage.buckets.md
 delete mode 100644 docs/database/storage.buckets.svg
 delete mode 100644 docs/database/storage.migrations.md
 delete mode 100644 docs/database/storage.migrations.svg
 delete mode 100644 docs/database/storage.objects.md
 delete mode 100644 docs/database/storage.objects.svg
 delete mode 100644 docs/database/supabase_functions.hooks.md
 delete mode 100644 docs/database/supabase_functions.hooks.svg
 delete mode 100644 docs/database/supabase_functions.migrations.md
 delete mode 100644 docs/database/supabase_functions.migrations.svg
 delete mode 100644 docs/database/vault.decrypted_secrets.md
 delete mode 100644 docs/database/vault.decrypted_secrets.svg
 delete mode 100644 docs/database/vault.secrets.md
 delete mode 100644 docs/database/vault.secrets.svg
 delete mode 100644 docs/uml/app/lib/models/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/app_onboarding/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/dashboard/contact_tab/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/dashboard/task_overview_tab/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/dashboard/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/multimodal/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/onboarding/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/report/performance/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/report/sections/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/report/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/report/util/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/tasks/intervention/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/tasks/observation/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/tasks/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/uml.svg
 delete mode 100644 docs/uml/app/lib/widgets/questionnaire/questions/uml.svg
 delete mode 100644 docs/uml/app/lib/widgets/questionnaire/uml.svg
 delete mode 100644 docs/uml/app/lib/widgets/uml.svg
 delete mode 100644 docs/uml/core/lib/src/env/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/consent/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/data/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/eligibility/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/expressions/types/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/expressions/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/interventions/tasks/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/interventions/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/observations/tasks/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/observations/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/questionnaire/questions/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/questionnaire/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/report/sections/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/report/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/results/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/study_results/results/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/study_results/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/study_schedule/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/tables/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/tasks/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/uml.svg
 delete mode 100644 docs/uml/core/lib/src/uml.svg
 delete mode 100644 docs/uml/core/lib/src/util/multimodal/uml.svg
 delete mode 100644 docs/uml/core/lib/src/util/uml.svg
 delete mode 100644 docs/uml/core/lib/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/common_views/pages/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/common_views/sidesheet/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/common_views/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/domain/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/account/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/analyze/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/auth/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/dashboard/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/enrollment/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/info/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/interventions/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/measurements/survey/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/measurements/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/reports/section/types/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/reports/section/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/reports/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/types/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/shared/schedule/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/forms/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/monitor/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/publish/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/recruit/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/study/settings/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/study/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/localization/platform_locale/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/localization/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/repositories/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/routing/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/services/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/utils/uml.svg
 delete mode 100644 docs/uml/flutter_common/lib/src/uml.svg
 delete mode 100644 docs/uml/flutter_common/lib/src/utils/uml.svg
 delete mode 100644 docs/uml/flutter_common/lib/uml.svg

diff --git a/.github/docker/db-docs.yml b/.github/docker/db-docs.yml
deleted file mode 100644
index 5603897a0..000000000
--- a/.github/docker/db-docs.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-version: '3'
-name: 'studyu'
-
-services:
-  autodocs:
-    image: ghcr.io/k1low/tbls
-    depends_on:
-      db:
-        condition: service_healthy
-    command:
-      - doc
-      - --force
-      - postgres://postgres:${POSTGRES_PASSWORD}@supabase-db:${POSTGRES_PORT}/${POSTGRES_DB}?sslmode=disable
-      - output
-    working_dir: /work
-    volumes:
-      - ${DB_DOCS_DEST}:/work/output
diff --git a/.github/scripts/generate-uml.bash b/.github/scripts/generate-uml.bash
deleted file mode 100755
index a760082c5..000000000
--- a/.github/scripts/generate-uml.bash
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-# repo root at ../.. from this file's directory
-root="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-
-docs_dir="$root/docs/uml"
-
-# find directories whose umls need updates -------------------------------------
-# regenerating all umls every time is too slow
-
-# find latest commit that updated uml diagrams (or use initial commit)
-prev_update="$(git log -n 1 --pretty=format:%H -- "$docs_dir")"
-[[ -z  "$prev_update" ]] && prev_update="$(git rev-list --max-parents=0 HEAD)"
-
-# associative array, keys will be all directories whose uml has to be
-# regenerated
-declare -A dirty
-# get all directories that have changed since prev_update
-for changed in $(git diff --name-only "$prev_update" \
-    | grep --extended-regexp '(flutter_common|core|designer_v2|app)/lib/.*\.dart' \
-    | xargs dirname \
-    | sort --unique \
-); do
-    # set changed dir as dirty for all parents until we reach lib
-    while grep --extended-regexp -q '[^/]*/lib' <<< "$changed"; do
-        dirty[$changed]=1
-        changed="$(dirname "$changed")"
-    done
-done
-
-# generate needed umls ---------------------------------------------------------
-
-# temporary file for uml data
-tmpf=$(mktemp)
-
-# iterate keys of dirty
-for d in "${!dirty[@]}"; do
-    out="$docs_dir/$d/uml.svg"
-    # remove old uml if it exists
-    rm -rf "$out"
-    # skip to next if directory doesn't exist (i.e. git diff showed it because
-    # it was deleted
-    test -d "$root/$d" || continue
-
-    echo "Generating diagram for $d"
-
-    # ensure destination dir extists
-    mkdir -p "$(dirname "$out")"
-
-    # go to package dir, i.e. first path component
-    cd "$root/$(cut -d/ -f1 <<< "$d")" || exit
-    # uml generator gets confused with generated files so we have to remove
-    # them
-    find . -type f -name '*.g.dart' -exec rm {} \;
-
-    # generate uml & svg
-    dart pub global run dcdg \
-        --exclude=State --exclude=StatefulWidget --exclude=StatelessWidget \
-        -b nomnoml \
-        -s "$(cut -d/ -f2- <<< "$d")" \
-        > "$tmpf"
-    npx --yes nomnoml "$tmpf" "$out"
-
-    # get deleted generated files back from git
-    git checkout HEAD -- .
-done
-
-# remove temporary file
-rm "$tmpf"
diff --git a/.github/workflows/db-docs.yml b/.github/workflows/db-docs.yml
deleted file mode 100644
index f54e9f55b..000000000
--- a/.github/workflows/db-docs.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: Generate database docs
-
-on:
-  push:
-    branches:
-      - '**'
-      - '!dev'
-      - '!main'
-    paths:
-      - 'database/**'
-      - 'docker/supabase/**'
-
-concurrency:
-  group: ${{ github.ref }}-db-docs
-  cancel-in-progress: true
-
-jobs:
-  generate-docs:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repo
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Generate documentation
-        env:
-          POSTGRES_PORT: 5432
-          POSTGRES_PASSWORD: your-super-secret-and-long-postgres-password
-          POSTGRES_DB: postgres
-          DB_DOCS_DEST: ${{ github.workspace }}/docs/database
-        run: |
-          docker network create studyu_network || true
-          docker compose -f docker/supabase/docker-compose-db.yml -f .github/docker/db-docs.yml up --abort-on-container-exit
-
-      - name: Commit documentation
-        run: |
-          git config --global user.name "StudyU Documenter"
-          git config --global user.email "studyu-documenter"
-          git add --all
-          git commit -m 'docs: update database documentation' || true
-          git push
diff --git a/.github/workflows/uml-docs.yml b/.github/workflows/uml-docs.yml
deleted file mode 100644
index 5577b47ea..000000000
--- a/.github/workflows/uml-docs.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Generate UML docs
-
-on:
-  push:
-    branches:
-      - '**'
-      - '!dev'
-      - '!main'
-    paths:
-      - 'flutter_common/**/*.dart'
-      - 'core/**/*.dart'
-      - 'designer_v2/**/*.dart'
-      - '!designer_v2/integration_test/**'
-      - '!designer_v2/test_driver/**'
-      - 'app/**/*.dart'
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.ref }}-uml-docs
-  cancel-in-progress: true
-
-jobs:
-  generate-docs:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Check out repo"
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.READY_TO_MERGE_TOKEN }}
-      - name: Init workspace
-        uses: ./.github/workflows/init-workspace
-      - name: "Install dcdg"
-        run: dart pub global activate dcdg
-      - name: "Generate documentation"
-        run: bash .github/scripts/generate-uml.bash
-      - name: "Commit documentation"
-        run: |
-          git config --global user.name "StudyU Documenter"
-          git config --global user.email "studyu-documenter"
-          git add docs/uml
-          git commit -m 'docs: update UML documentation' || true
-          git push
diff --git a/docs/README.md b/docs/README.md
deleted file mode 100644
index 030cc4870..000000000
--- a/docs/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# StudyU documentation
-
-To get an overview of the project and learn how to get started, please refer to
-our [contribution guide](../CONTRIBUTING.md).
-
-The contents of this directory serve as more detailed and specific
-documentation.
-
-## Automatically generated documentation
-
-The StudyU repository has GitHub workflows that automatically generate and
-update
-
-- Documentation of the database in [database/](database), generated by the
-  [`db-docs.yml`](../.github/workflows/db-docs.yml) workflow
-- UML diagrams for all dart code in [uml/](uml), organized in directories
-  analogous to the file structure of the code, generated by the
-  [`uml-docs.yml`](../.github/workflows/uml-docs.yml) workflow
-
-These documentation updates are committed to your branch while you are working
-on it, meaning you should pull and rebase where appropriate to keep a clean
-commit history.
-
-**Important note** The documentation workflows are designed to do as little work
-as necessary by detecting which parts of the documentation need to be updated.
-Manually committing anything to the [database/](database) or [uml/](uml)
-directories may break this detection. If you have to make any changes there,
-please make sure you understand how the respective workflow functions first.
diff --git a/docs/database/README.md b/docs/database/README.md
deleted file mode 100644
index 6d3d3bbf4..000000000
--- a/docs/database/README.md
+++ /dev/null
@@ -1,295 +0,0 @@
-# postgres
-
-## Tables
-
-| Name | Columns | Comment | Type |
-| ---- | ------- | ------- | ---- |
-| [auth.users](auth.users.md) | 21 | Auth: Stores user login data within a secure schema. | BASE TABLE |
-| [auth.refresh_tokens](auth.refresh_tokens.md) | 7 | Auth: Store of tokens used to refresh JWT tokens once they expire. | BASE TABLE |
-| [auth.instances](auth.instances.md) | 5 | Auth: Manages users across multiple sites. | BASE TABLE |
-| [auth.audit_log_entries](auth.audit_log_entries.md) | 4 | Auth: Audit trail for user actions. | BASE TABLE |
-| [auth.schema_migrations](auth.schema_migrations.md) | 1 | Auth: Manages updates to the auth system. | BASE TABLE |
-| [storage.buckets](storage.buckets.md) | 5 |  | BASE TABLE |
-| [storage.objects](storage.objects.md) | 8 |  | BASE TABLE |
-| [storage.migrations](storage.migrations.md) | 4 |  | BASE TABLE |
-| [net.http_request_queue](net.http_request_queue.md) | 6 |  | BASE TABLE |
-| [net._http_response](net._http_response.md) | 8 |  | BASE TABLE |
-| [supabase_functions.migrations](supabase_functions.migrations.md) | 2 |  | BASE TABLE |
-| [supabase_functions.hooks](supabase_functions.hooks.md) | 5 | Supabase Functions Hooks: Audit trail for triggered hooks. | BASE TABLE |
-| [public.study](public.study.md) | 21 |  | BASE TABLE |
-| [public.study_subject](public.study_subject.md) | 7 |  | BASE TABLE |
-| [public.app_config](public.app_config.md) | 9 | Stores app config for different envs | BASE TABLE |
-| [public.repo](public.repo.md) | 4 | Git repo where the generated project is stored | BASE TABLE |
-| [public.study_invite](public.study_invite.md) | 3 | Study invite codes | BASE TABLE |
-| [public.subject_progress](public.subject_progress.md) | 6 |  | BASE TABLE |
-| [public.study_progress_export](public.study_progress_export.md) | 10 |  | VIEW |
-| [public.user](public.user.md) | 3 | Users get automatically added, when a new user is created in auth.users | BASE TABLE |
-| [extensions.pg_stat_statements_info](extensions.pg_stat_statements_info.md) | 2 |  | VIEW |
-| [extensions.pg_stat_statements](extensions.pg_stat_statements.md) | 43 |  | VIEW |
-| [pgsodium.key](pgsodium.key.md) | 14 | This table holds metadata for derived keys given a key_id and key_context. The raw key is never stored. | BASE TABLE |
-| [pgsodium.valid_key](pgsodium.valid_key.md) | 9 |  | VIEW |
-| [pgsodium.masking_rule](pgsodium.masking_rule.md) | 14 |  | VIEW |
-| [pgsodium.mask_columns](pgsodium.mask_columns.md) | 7 |  | VIEW |
-| [pgsodium.decrypted_key](pgsodium.decrypted_key.md) | 14 |  | VIEW |
-| [vault.secrets](vault.secrets.md) | 8 | Table with encrypted `secret` column for storing sensitive information on disk. | BASE TABLE |
-| [vault.decrypted_secrets](vault.decrypted_secrets.md) | 9 |  | VIEW |
-
-## Stored procedures and functions
-
-| Name | ReturnType | Arguments | Type |
-| ---- | ------- | ------- | ---- |
-| extensions.uuid_generate_v4 | uuid |  | FUNCTION |
-| pgbouncer.get_auth | record | p_usename text | FUNCTION |
-| storage.filename | text | name text | FUNCTION |
-| extensions.digest | bytea | text, text | FUNCTION |
-| storage.foldername | _text | name text | FUNCTION |
-| extensions.decrypt_iv | bytea | bytea, bytea, bytea, text | FUNCTION |
-| storage.extension | text | name text | FUNCTION |
-| extensions.gen_random_bytes | bytea | integer | FUNCTION |
-| extensions.encrypt | bytea | bytea, bytea, text | FUNCTION |
-| extensions.decrypt | bytea | bytea, bytea, text | FUNCTION |
-| extensions.encrypt_iv | bytea | bytea, bytea, bytea, text | FUNCTION |
-| extensions.gen_random_uuid | uuid |  | FUNCTION |
-| extensions.uuid_nil | uuid |  | FUNCTION |
-| extensions.uuid_ns_dns | uuid |  | FUNCTION |
-| storage.search | record | prefix text, bucketname text, limits integer DEFAULT 100, levels integer DEFAULT 1, offsets integer DEFAULT 0 | FUNCTION |
-| extensions.uuid_ns_url | uuid |  | FUNCTION |
-| extensions.uuid_ns_oid | uuid |  | FUNCTION |
-| auth.uid | uuid |  | FUNCTION |
-| auth.email | text |  | FUNCTION |
-| extensions.uuid_generate_v3 | uuid | namespace uuid, name text | FUNCTION |
-| extensions.uuid_ns_x500 | uuid |  | FUNCTION |
-| extensions.uuid_generate_v1 | uuid |  | FUNCTION |
-| extensions.uuid_generate_v1mc | uuid |  | FUNCTION |
-| net.check_worker_is_up | void |  | FUNCTION |
-| net._await_response | bool | request_id bigint | FUNCTION |
-| net._urlencode_string | text | string character varying | FUNCTION |
-| net._encode_url_with_params_array | text | url text, params_array text[] | FUNCTION |
-| graphql.increment_schema_version | event_trigger |  | FUNCTION |
-| graphql.get_schema_version | int4 |  | FUNCTION |
-| graphql.resolve | jsonb | query text, variables jsonb DEFAULT '{}'::jsonb, "operationName" text DEFAULT NULL::text, extensions jsonb DEFAULT NULL::jsonb | FUNCTION |
-| extensions.pgp_pub_decrypt_bytea | bytea | bytea, bytea, text | FUNCTION |
-| extensions.pgp_pub_decrypt | text | bytea, bytea, text, text | FUNCTION |
-| extensions.pgp_pub_decrypt_bytea | bytea | bytea, bytea, text, text | FUNCTION |
-| net.http_delete | int8 | url text, params jsonb DEFAULT '{}'::jsonb, headers jsonb DEFAULT '{}'::jsonb, timeout_milliseconds integer DEFAULT 2000 | FUNCTION |
-| net._http_collect_response | http_response_result | request_id bigint, async boolean DEFAULT true | FUNCTION |
-| net.http_collect_response | http_response_result | request_id bigint, async boolean DEFAULT true | FUNCTION |
-| supabase_functions.http_request | trigger |  | FUNCTION |
-| public.active_subject_count | int4 | study study | FUNCTION |
-| public.can_edit | bool | user_id uuid, study_param study | FUNCTION |
-| public.get_study_from_invite | record | invite_code text | FUNCTION |
-| public.get_study_record_from_invite | study | invite_code text | FUNCTION |
-| public.handle_new_user | trigger |  | FUNCTION |
-| public.has_study_ended | bool | psubject_id uuid | FUNCTION |
-| public.has_results_public | bool | psubject_id uuid | FUNCTION |
-| public.has_study_ended | bool | subject study_subject | FUNCTION |
-| public.is_active_subject | bool | psubject_id uuid, days_active integer | FUNCTION |
-| public.is_study_subject_of | bool | _user_id uuid, _study_id uuid | FUNCTION |
-| public.last_completed_task | date | psubject_id uuid | FUNCTION |
-| public.study_active_days | _int4 | study_param study | FUNCTION |
-| public.study_ended_count | int4 | study study | FUNCTION |
-| public.study_length | int4 | study_param study | FUNCTION |
-| public.study_missed_days | _int4 | study_param study | FUNCTION |
-| net.http_get | int8 | url text, params jsonb DEFAULT '{}'::jsonb, headers jsonb DEFAULT '{}'::jsonb, timeout_milliseconds integer DEFAULT 2000 | FUNCTION |
-| extensions.pgp_sym_decrypt_bytea | bytea | bytea, text, text | FUNCTION |
-| public.study_participant_count | int4 | study study | FUNCTION |
-| public.study_total_tasks | int4 | subject study_subject | FUNCTION |
-| public.subject_current_day | int4 | subject study_subject | FUNCTION |
-| public.subject_total_active_days | int4 | subject study_subject | FUNCTION |
-| public.user_email | text | user_id uuid | FUNCTION |
-| extensions.pgp_pub_encrypt | bytea | text, bytea | FUNCTION |
-| extensions.pgp_pub_encrypt_bytea | bytea | bytea, bytea | FUNCTION |
-| extensions.pgp_pub_encrypt | bytea | text, bytea, text | FUNCTION |
-| extensions.pgp_pub_encrypt_bytea | bytea | bytea, bytea, text | FUNCTION |
-| extensions.pgp_pub_decrypt | text | bytea, bytea | FUNCTION |
-| extensions.pgp_pub_decrypt_bytea | bytea | bytea, bytea | FUNCTION |
-| extensions.pgp_pub_decrypt | text | bytea, bytea, text | FUNCTION |
-| extensions.gen_salt | text | text, integer | FUNCTION |
-| auth.role | text |  | FUNCTION |
-| extensions.uuid_generate_v5 | uuid | namespace uuid, name text | FUNCTION |
-| extensions.digest | bytea | bytea, text | FUNCTION |
-| extensions.hmac | bytea | text, text, text | FUNCTION |
-| extensions.hmac | bytea | bytea, bytea, text | FUNCTION |
-| extensions.crypt | text | text, text | FUNCTION |
-| extensions.gen_salt | text | text | FUNCTION |
-| extensions.sign | text | payload json, secret text, algorithm text DEFAULT 'HS256'::text | FUNCTION |
-| extensions.pgrst_ddl_watch | event_trigger |  | FUNCTION |
-| graphql._internal_resolve | jsonb | query text, variables jsonb DEFAULT '{}'::jsonb, "operationName" text DEFAULT NULL::text, extensions jsonb DEFAULT NULL::jsonb | FUNCTION |
-| graphql.exception | text | message text | FUNCTION |
-| graphql.comment_directive | jsonb | comment_ text | FUNCTION |
-| extensions.pgrst_drop_watch | event_trigger |  | FUNCTION |
-| graphql_public.graphql | jsonb | "operationName" text DEFAULT NULL::text, query text DEFAULT NULL::text, variables jsonb DEFAULT NULL::jsonb, extensions jsonb DEFAULT NULL::jsonb | FUNCTION |
-| extensions.grant_pg_graphql_access | event_trigger |  | FUNCTION |
-| net.http_post | int8 | url text, body jsonb DEFAULT '{}'::jsonb, params jsonb DEFAULT '{}'::jsonb, headers jsonb DEFAULT '{"Content-Type": "application/json"}'::jsonb, timeout_milliseconds integer DEFAULT 2000 | FUNCTION |
-| pgsodium.crypto_pwhash_saltgen | bytea |  | FUNCTION |
-| pgsodium.crypto_kx_client_session_keys | crypto_kx_session | client_pk bytea, client_sk bytea, server_pk bytea | FUNCTION |
-| pgsodium.crypto_kx_server_session_keys | crypto_kx_session | server_pk bytea, server_sk bytea, client_pk bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha512_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_box_new_seed | bytea |  | FUNCTION |
-| pgsodium.crypto_sign_new_seed | bytea |  | FUNCTION |
-| pgsodium.derive_key | bytea | key_id bigint, key_len integer DEFAULT 32, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.pgsodium_derive | bytea | key_id bigint, key_len integer DEFAULT 32, context bytea DEFAULT decode('pgsodium'::text, 'escape'::text) | FUNCTION |
-| pgsodium.randombytes_new_seed | bytea |  | FUNCTION |
-| pgsodium.crypto_secretbox_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_auth_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_box_noncegen | bytea |  | FUNCTION |
-| pgsodium.crypto_aead_ietf_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_shorthash_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_generichash_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_kdf_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_kx_new_keypair | crypto_kx_keypair |  | FUNCTION |
-| pgsodium.crypto_kx_new_seed | bytea |  | FUNCTION |
-| pgsodium.crypto_kx_seed_new_keypair | crypto_kx_keypair | seed bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha256_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_box_new_keypair | crypto_box_keypair |  | FUNCTION |
-| pgsodium.crypto_sign_new_keypair | crypto_sign_keypair |  | FUNCTION |
-| pgsodium.crypto_sign_init | bytea |  | FUNCTION |
-| pgsodium.crypto_sign_update | bytea | state bytea, message bytea | FUNCTION |
-| pgsodium.randombytes_random | int4 |  | FUNCTION |
-| pgsodium.crypto_secretbox_noncegen | bytea |  | FUNCTION |
-| pgsodium.crypto_aead_ietf_noncegen | bytea |  | FUNCTION |
-| pgsodium.crypto_secretstream_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_stream_xchacha20_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_stream_xchacha20_noncegen | bytea |  | FUNCTION |
-| pgsodium.crypto_cmp | bool | text, text | FUNCTION |
-| pgsodium.crypto_signcrypt_new_keypair | crypto_signcrypt_keypair |  | FUNCTION |
-| pgsodium.crypto_aead_det_encrypt | bytea | message bytea, additional bytea, key bytea, nonce bytea DEFAULT NULL::bytea | FUNCTION |
-| pgsodium.crypto_aead_det_decrypt | bytea | ciphertext bytea, additional bytea, key bytea, nonce bytea DEFAULT NULL::bytea | FUNCTION |
-| pgsodium.crypto_aead_det_encrypt | bytea | message bytea, additional bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea, nonce bytea DEFAULT NULL::bytea | FUNCTION |
-| pgsodium.crypto_aead_det_decrypt | bytea | message bytea, additional bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea, nonce bytea DEFAULT NULL::bytea | FUNCTION |
-| pgsodium.version | text |  | FUNCTION |
-| pgsodium.crypto_aead_det_noncegen | bytea |  | FUNCTION |
-| pgsodium.has_mask | bool | role regrole, source_name text | FUNCTION |
-| pgsodium.mask_columns | record | source_relid oid | FUNCTION |
-| pgsodium.crypto_sign_final_verify | bool | state bytea, signature bytea, key bytea | FUNCTION |
-| pgsodium.create_mask_view | void | relid oid, debug boolean DEFAULT false | FUNCTION |
-| pgsodium.create_key | valid_key | key_type pgsodium.key_type DEFAULT 'aead-det'::pgsodium.key_type, name text DEFAULT NULL::text, raw_key bytea DEFAULT NULL::bytea, raw_key_nonce bytea DEFAULT NULL::bytea, parent_key uuid DEFAULT NULL::uuid, key_context bytea DEFAULT '\x7067736f6469756d'::bytea, expires timestamp with time zone DEFAULT NULL::timestamp with time zone, associated_data text DEFAULT ''::text | FUNCTION |
-| pgsodium.get_key_by_name | valid_key | text | FUNCTION |
-| pgsodium.quote_assoc | text | text, boolean DEFAULT false | FUNCTION |
-| pgsodium.crypto_sign_open | bytea | signed_message bytea, key bytea | FUNCTION |
-| pgsodium.crypto_kdf_derive_from_key | bytea | subkey_size integer, subkey_id bigint, context bytea, primary_key uuid | FUNCTION |
-| pgsodium.get_named_keys | valid_key | filter text DEFAULT '%'::text | FUNCTION |
-| pgsodium.crypto_aead_det_encrypt | bytea | message bytea, additional bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_aead_det_decrypt | bytea | message bytea, additional bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_aead_ietf_encrypt | bytea | message bytea, additional bytea, nonce bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.get_key_by_id | valid_key | uuid | FUNCTION |
-| pgsodium.enable_security_label_trigger | void |  | FUNCTION |
-| pgsodium.disable_security_label_trigger | void |  | FUNCTION |
-| pgsodium.update_mask | void | target oid, debug boolean DEFAULT false | FUNCTION |
-| pgsodium.crypto_sign_update_agg1 | bytea | state bytea, message bytea | FUNCTION |
-| pgsodium.crypto_sign_update_agg2 | bytea | cur_state bytea, initial_state bytea, message bytea | FUNCTION |
-| pgsodium.crypto_sign_update_agg | bytea | message bytea | a |
-| pgsodium.crypto_sign_update_agg | bytea | state bytea, message bytea | a |
-| pgsodium.encrypted_columns | text | relid oid | FUNCTION |
-| pgsodium.decrypted_columns | text | relid oid | FUNCTION |
-| pgsodium.crypto_aead_ietf_encrypt | bytea | message bytea, additional bytea, nonce bytea, key bytea | FUNCTION |
-| pgsodium.crypto_aead_ietf_encrypt | bytea | message bytea, additional bytea, nonce bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_aead_ietf_decrypt | bytea | message bytea, additional bytea, nonce bytea, key bytea | FUNCTION |
-| pgsodium.crypto_aead_ietf_decrypt | bytea | message bytea, additional bytea, nonce bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_aead_ietf_decrypt | bytea | message bytea, additional bytea, nonce bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_auth | bytea | message bytea, key bytea | FUNCTION |
-| pgsodium.crypto_auth | bytea | message bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_auth | bytea | message bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_auth_verify | bool | mac bytea, message bytea, key bytea | FUNCTION |
-| pgsodium.crypto_auth_verify | bool | mac bytea, message bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_auth_verify | bool | mac bytea, message bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_box_seed_new_keypair | crypto_box_keypair | seed bytea | FUNCTION |
-| pgsodium.crypto_box | bytea | message bytea, nonce bytea, public bytea, secret bytea | FUNCTION |
-| pgsodium.crypto_box_open | bytea | ciphertext bytea, nonce bytea, public bytea, secret bytea | FUNCTION |
-| pgsodium.crypto_box_seal | bytea | message bytea, public_key bytea | FUNCTION |
-| pgsodium.crypto_box_seal_open | bytea | ciphertext bytea, public_key bytea, secret_key bytea | FUNCTION |
-| pgsodium.crypto_generichash | bytea | message bytea, key bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_generichash | bytea | message bytea, key bytea DEFAULT NULL::bytea | FUNCTION |
-| pgsodium.crypto_generichash | bytea | message bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_shorthash | bytea | message bytea, key bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_shorthash | bytea | message bytea, key bytea | FUNCTION |
-| pgsodium.crypto_shorthash | bytea | message bytea, key_uuid uuid | FUNCTION |
-| pgsodium.sodium_bin2base64 | text | bin bytea | FUNCTION |
-| pgsodium.sodium_base642bin | bytea | base64 text | FUNCTION |
-| pgsodium.crypto_auth_hmacsha512 | bytea | message bytea, secret bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha512 | bytea | message bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha512 | bytea | message bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_auth_hmacsha512_verify | bool | hash bytea, message bytea, secret bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha512_verify | bool | hash bytea, message bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha512_verify | bool | signature bytea, message bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_auth_hmacsha256 | bytea | message bytea, secret bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha256 | bytea | message bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha256 | bytea | message bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_auth_hmacsha256_verify | bool | hash bytea, message bytea, secret bytea | FUNCTION |
-| pgsodium.crypto_sign_final_create | bytea | state bytea, key bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha256_verify | bool | hash bytea, message bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha256_verify | bool | signature bytea, message bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_kdf_derive_from_key | bytea | subkey_size bigint, subkey_id bigint, context bytea, primary_key bytea | FUNCTION |
-| pgsodium.crypto_pwhash | bytea | password bytea, salt bytea | FUNCTION |
-| pgsodium.crypto_pwhash_str | bytea | password bytea | FUNCTION |
-| pgsodium.crypto_pwhash_str_verify | bool | hashed_password bytea, password bytea | FUNCTION |
-| pgsodium.randombytes_uniform | int4 | upper_bound integer | FUNCTION |
-| pgsodium.randombytes_buf | bytea | size integer | FUNCTION |
-| pgsodium.randombytes_buf_deterministic | bytea | size integer, seed bytea | FUNCTION |
-| pgsodium.crypto_secretbox | bytea | message bytea, nonce bytea, key bytea | FUNCTION |
-| pgsodium.crypto_secretbox | bytea | message bytea, nonce bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_secretbox | bytea | message bytea, nonce bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_secretbox_open | bytea | ciphertext bytea, nonce bytea, key bytea | FUNCTION |
-| pgsodium.crypto_secretbox_open | bytea | message bytea, nonce bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_secretbox_open | bytea | message bytea, nonce bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_hash_sha256 | bytea | message bytea | FUNCTION |
-| pgsodium.crypto_hash_sha512 | bytea | message bytea | FUNCTION |
-| pgsodium.crypto_sign | bytea | message bytea, key bytea | FUNCTION |
-| pgsodium.crypto_sign_detached | bytea | message bytea, key bytea | FUNCTION |
-| pgsodium.crypto_sign_seed_new_keypair | crypto_sign_keypair | seed bytea | FUNCTION |
-| pgsodium.crypto_sign_verify_detached | bool | sig bytea, message bytea, key bytea | FUNCTION |
-| pgsodium.crypto_signcrypt_sign_after | bytea | state bytea, sender_sk bytea, ciphertext bytea | FUNCTION |
-| pgsodium.crypto_signcrypt_sign_before | crypto_signcrypt_state_key | sender bytea, recipient bytea, sender_sk bytea, recipient_pk bytea, additional bytea | FUNCTION |
-| pgsodium.crypto_signcrypt_verify_after | bool | state bytea, signature bytea, sender_pk bytea, ciphertext bytea | FUNCTION |
-| pgsodium.crypto_signcrypt_verify_before | crypto_signcrypt_state_key | signature bytea, sender bytea, recipient bytea, additional bytea, sender_pk bytea, recipient_sk bytea | FUNCTION |
-| pgsodium.crypto_signcrypt_verify_public | bool | signature bytea, sender bytea, recipient bytea, additional bytea, sender_pk bytea, ciphertext bytea | FUNCTION |
-| pgsodium.crypto_stream_xchacha20 | bytea | bigint, bytea, bytea | FUNCTION |
-| pgsodium.crypto_stream_xchacha20 | bytea | bigint, bytea, bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_stream_xchacha20_xor | bytea | bytea, bytea, bytea | FUNCTION |
-| pgsodium.crypto_stream_xchacha20_xor | bytea | bytea, bytea, bigint, context bytea DEFAULT '\x70676f736469756d'::bytea | FUNCTION |
-| pgsodium.crypto_stream_xchacha20_xor_ic | bytea | bytea, bytea, bigint, bytea | FUNCTION |
-| pgsodium.crypto_stream_xchacha20_xor_ic | bytea | bytea, bytea, bigint, bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.encrypted_column | text | relid oid, m record | FUNCTION |
-| pgsodium.update_masks | void | debug boolean DEFAULT false | FUNCTION |
-| pgsodium.key_encrypt_secret_raw_key | trigger |  | FUNCTION |
-| pgsodium.mask_role | void | masked_role regrole, source_name text, view_name text | FUNCTION |
-| pgsodium.create_mask_view | void | relid oid, subid integer, debug boolean DEFAULT false | FUNCTION |
-| pgsodium.trg_mask_update | event_trigger |  | FUNCTION |
-| pgsodium.crypto_aead_det_decrypt | bytea | message bytea, additional bytea, key_uuid uuid, nonce bytea | FUNCTION |
-| pgsodium.crypto_aead_det_encrypt | bytea | message bytea, additional bytea, key_uuid uuid, nonce bytea | FUNCTION |
-| pgsodium.crypto_aead_det_keygen | bytea |  | FUNCTION |
-| vault.secrets_encrypt_secret_secret | trigger |  | FUNCTION |
-| vault.create_secret | uuid | new_secret text, new_name text DEFAULT NULL::text, new_description text DEFAULT ''::text, new_key_id uuid DEFAULT NULL::uuid | FUNCTION |
-| vault.update_secret | void | secret_id uuid, new_secret text DEFAULT NULL::text, new_name text DEFAULT NULL::text, new_description text DEFAULT NULL::text, new_key_id uuid DEFAULT NULL::uuid | FUNCTION |
-| extensions.pgp_key_id | text | bytea | FUNCTION |
-| extensions.armor | text | bytea | FUNCTION |
-| extensions.armor | text | bytea, text[], text[] | FUNCTION |
-| extensions.dearmor | bytea | text | FUNCTION |
-| extensions.pgp_armor_headers | record | text, OUT key text, OUT value text | FUNCTION |
-| extensions.url_encode | text | data bytea | FUNCTION |
-| extensions.url_decode | bytea | data text | FUNCTION |
-| extensions.try_cast_double | float8 | inp text | FUNCTION |
-| extensions.moddatetime | trigger |  | FUNCTION |
-| extensions.pgp_sym_encrypt | bytea | text, text | FUNCTION |
-| extensions.pgp_sym_encrypt_bytea | bytea | bytea, text | FUNCTION |
-| extensions.pgp_sym_encrypt | bytea | text, text, text | FUNCTION |
-| extensions.pgp_sym_encrypt_bytea | bytea | bytea, text, text | FUNCTION |
-| extensions.pgp_sym_decrypt | text | bytea, text | FUNCTION |
-| extensions.pgp_sym_decrypt_bytea | bytea | bytea, text | FUNCTION |
-| extensions.pgp_sym_decrypt | text | bytea, text, text | FUNCTION |
-| extensions.algorithm_sign | text | signables text, secret text, algorithm text | FUNCTION |
-| extensions.verify | record | token text, secret text, algorithm text DEFAULT 'HS256'::text | FUNCTION |
-| extensions.grant_pg_cron_access | event_trigger |  | FUNCTION |
-| extensions.grant_pg_net_access | event_trigger |  | FUNCTION |
-| extensions.pg_stat_statements_reset | void | userid oid DEFAULT 0, dbid oid DEFAULT 0, queryid bigint DEFAULT 0 | FUNCTION |
-| extensions.pg_stat_statements_info | record | OUT dealloc bigint, OUT stats_reset timestamp with time zone | FUNCTION |
-| extensions.pg_stat_statements | record | showtext boolean, OUT userid oid, OUT dbid oid, OUT toplevel boolean, OUT queryid bigint, OUT query text, OUT plans bigint, OUT total_plan_time double precision, OUT min_plan_time double precision, OUT max_plan_time double precision, OUT mean_plan_time double precision, OUT stddev_plan_time double precision, OUT calls bigint, OUT total_exec_time double precision, OUT min_exec_time double precision, OUT max_exec_time double precision, OUT mean_exec_time double precision, OUT stddev_exec_time double precision, OUT rows bigint, OUT shared_blks_hit bigint, OUT shared_blks_read bigint, OUT shared_blks_dirtied bigint, OUT shared_blks_written bigint, OUT local_blks_hit bigint, OUT local_blks_read bigint, OUT local_blks_dirtied bigint, OUT local_blks_written bigint, OUT temp_blks_read bigint, OUT temp_blks_written bigint, OUT blk_read_time double precision, OUT blk_write_time double precision, OUT temp_blk_read_time double precision, OUT temp_blk_write_time double precision, OUT wal_records bigint, OUT wal_fpi bigint, OUT wal_bytes numeric, OUT jit_functions bigint, OUT jit_generation_time double precision, OUT jit_inlining_count bigint, OUT jit_inlining_time double precision, OUT jit_optimization_count bigint, OUT jit_optimization_time double precision, OUT jit_emission_count bigint, OUT jit_emission_time double precision | FUNCTION |
-| extensions.set_graphql_placeholder | event_trigger |  | FUNCTION |
-
-## Relations
-
-![er](schema.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/auth.audit_log_entries.md b/docs/database/auth.audit_log_entries.md
deleted file mode 100644
index 5753c1844..000000000
--- a/docs/database/auth.audit_log_entries.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# auth.audit_log_entries
-
-## Description
-
-Auth: Audit trail for user actions.
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| instance_id | uuid |  | true |  |  |  |
-| id | uuid |  | false |  |  |  |
-| payload | json |  | true |  |  |  |
-| created_at | timestamp with time zone |  | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| audit_log_entries_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| audit_log_entries_pkey | CREATE UNIQUE INDEX audit_log_entries_pkey ON auth.audit_log_entries USING btree (id) |
-| audit_logs_instance_id_idx | CREATE INDEX audit_logs_instance_id_idx ON auth.audit_log_entries USING btree (instance_id) |
-
-## Relations
-
-![er](auth.audit_log_entries.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/auth.audit_log_entries.svg b/docs/database/auth.audit_log_entries.svg
deleted file mode 100644
index 64855f6ea..000000000
--- a/docs/database/auth.audit_log_entries.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: auth.audit_log_entries Pages: 1 -->
-<svg width="418pt" height="255pt"
- viewBox="0.00 0.00 418.00 255.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 251)">
-<title>auth.audit_log_entries</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-251 414,-251 414,4 -4,4"/>
-<!-- auth.audit_log_entries -->
-<g id="node1" class="node">
-<title>auth.audit_log_entries</title>
-<polygon fill="#efefef" stroke="transparent" points="46,-165.5 46,-200.5 364,-200.5 364,-165.5 46,-165.5"/>
-<polygon fill="none" stroke="#000000" points="46,-165.5 46,-200.5 364,-200.5 364,-165.5 46,-165.5"/>
-<text text-anchor="start" x="52.6839" y="-178.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.audit_log_entries</text>
-<text text-anchor="start" x="229.7481" y="-178.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="263.9529" y="-178.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46,-135.5 46,-165.5 364,-165.5 364,-135.5 46,-135.5"/>
-<text text-anchor="start" x="53" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">instance_id </text>
-<text text-anchor="start" x="127.69" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46,-105.5 46,-135.5 364,-135.5 364,-105.5 46,-105.5"/>
-<text text-anchor="start" x="53" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="67.7798" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46,-75.5 46,-105.5 364,-105.5 364,-75.5 46,-75.5"/>
-<text text-anchor="start" x="53" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">payload </text>
-<text text-anchor="start" x="105.9102" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[json]</text>
-<polygon fill="none" stroke="#000000" points="46,-45.5 46,-75.5 364,-75.5 364,-45.5 46,-45.5"/>
-<text text-anchor="start" x="53" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="123.028" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-202.5 365.5,-202.5 365.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/auth.instances.md b/docs/database/auth.instances.md
deleted file mode 100644
index fd7b006fc..000000000
--- a/docs/database/auth.instances.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# auth.instances
-
-## Description
-
-Auth: Manages users across multiple sites.
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid |  | false |  |  |  |
-| uuid | uuid |  | true |  |  |  |
-| raw_base_config | text |  | true |  |  |  |
-| created_at | timestamp with time zone |  | true |  |  |  |
-| updated_at | timestamp with time zone |  | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| instances_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| instances_pkey | CREATE UNIQUE INDEX instances_pkey ON auth.instances USING btree (id) |
-
-## Relations
-
-![er](auth.instances.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/auth.instances.svg b/docs/database/auth.instances.svg
deleted file mode 100644
index 1de2be15a..000000000
--- a/docs/database/auth.instances.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: auth.instances Pages: 1 -->
-<svg width="357pt" height="285pt"
- viewBox="0.00 0.00 357.00 285.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 281)">
-<title>auth.instances</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-281 353,-281 353,4 -4,4"/>
-<!-- auth.instances -->
-<g id="node1" class="node">
-<title>auth.instances</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-195.5 46.5,-230.5 303.5,-230.5 303.5,-195.5 46.5,-195.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-195.5 46.5,-230.5 303.5,-230.5 303.5,-195.5 46.5,-195.5"/>
-<text text-anchor="start" x="53.1939" y="-208.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.instances</text>
-<text text-anchor="start" x="169.2381" y="-208.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="203.4429" y="-208.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-195.5 303.5,-195.5 303.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="68.2798" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 303.5,-165.5 303.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">uuid </text>
-<text text-anchor="start" x="83.845" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 303.5,-135.5 303.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">raw_base_config </text>
-<text text-anchor="start" x="163.1984" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 303.5,-105.5 303.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="123.528" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 303.5,-75.5 303.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at </text>
-<text text-anchor="start" x="127.4326" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-232.5 304.5,-232.5 304.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/auth.refresh_tokens.md b/docs/database/auth.refresh_tokens.md
deleted file mode 100644
index db4b1aca0..000000000
--- a/docs/database/auth.refresh_tokens.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# auth.refresh_tokens
-
-## Description
-
-Auth: Store of tokens used to refresh JWT tokens once they expire.
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| instance_id | uuid |  | true |  |  |  |
-| id | bigint | nextval('auth.refresh_tokens_id_seq'::regclass) | false |  |  |  |
-| token | varchar(255) |  | true |  |  |  |
-| user_id | varchar(255) |  | true |  |  |  |
-| revoked | boolean |  | true |  |  |  |
-| created_at | timestamp with time zone |  | true |  |  |  |
-| updated_at | timestamp with time zone |  | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| refresh_tokens_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| refresh_tokens_pkey | CREATE UNIQUE INDEX refresh_tokens_pkey ON auth.refresh_tokens USING btree (id) |
-| refresh_tokens_instance_id_idx | CREATE INDEX refresh_tokens_instance_id_idx ON auth.refresh_tokens USING btree (instance_id) |
-| refresh_tokens_instance_id_user_id_idx | CREATE INDEX refresh_tokens_instance_id_user_id_idx ON auth.refresh_tokens USING btree (instance_id, user_id) |
-| refresh_tokens_token_idx | CREATE INDEX refresh_tokens_token_idx ON auth.refresh_tokens USING btree (token) |
-
-## Relations
-
-![er](auth.refresh_tokens.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/auth.refresh_tokens.svg b/docs/database/auth.refresh_tokens.svg
deleted file mode 100644
index a9e4582f5..000000000
--- a/docs/database/auth.refresh_tokens.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: auth.refresh_tokens Pages: 1 -->
-<svg width="400pt" height="345pt"
- viewBox="0.00 0.00 400.00 345.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 341)">
-<title>auth.refresh_tokens</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-341 396,-341 396,4 -4,4"/>
-<!-- auth.refresh_tokens -->
-<g id="node1" class="node">
-<title>auth.refresh_tokens</title>
-<polygon fill="#efefef" stroke="transparent" points="46,-255.5 46,-290.5 346,-290.5 346,-255.5 46,-255.5"/>
-<polygon fill="none" stroke="#000000" points="46,-255.5 46,-290.5 346,-290.5 346,-255.5 46,-255.5"/>
-<text text-anchor="start" x="52.6884" y="-268.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.refresh_tokens</text>
-<text text-anchor="start" x="211.7436" y="-268.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="245.9484" y="-268.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46,-225.5 46,-255.5 346,-255.5 346,-225.5 46,-225.5"/>
-<text text-anchor="start" x="53" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">instance_id </text>
-<text text-anchor="start" x="127.69" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46,-195.5 46,-225.5 346,-225.5 346,-195.5 46,-195.5"/>
-<text text-anchor="start" x="53" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="67.7798" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46,-165.5 46,-195.5 346,-195.5 346,-165.5 46,-165.5"/>
-<text text-anchor="start" x="53" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">token </text>
-<text text-anchor="start" x="91.129" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="46,-135.5 46,-165.5 346,-165.5 346,-135.5 46,-135.5"/>
-<text text-anchor="start" x="53" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">user_id </text>
-<text text-anchor="start" x="102.7882" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="46,-105.5 46,-135.5 346,-135.5 346,-105.5 46,-105.5"/>
-<text text-anchor="start" x="53" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">revoked </text>
-<text text-anchor="start" x="106.6816" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="46,-75.5 46,-105.5 346,-105.5 346,-75.5 46,-75.5"/>
-<text text-anchor="start" x="53" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="123.028" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46,-45.5 46,-75.5 346,-75.5 346,-45.5 46,-45.5"/>
-<text text-anchor="start" x="53" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at </text>
-<text text-anchor="start" x="126.9326" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-292.5 347.5,-292.5 347.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/auth.schema_migrations.md b/docs/database/auth.schema_migrations.md
deleted file mode 100644
index d765593a2..000000000
--- a/docs/database/auth.schema_migrations.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# auth.schema_migrations
-
-## Description
-
-Auth: Manages updates to the auth system.
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| version | varchar(255) |  | false |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| schema_migrations_pkey | PRIMARY KEY | PRIMARY KEY (version) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| schema_migrations_pkey | CREATE UNIQUE INDEX schema_migrations_pkey ON auth.schema_migrations USING btree (version) |
-
-## Relations
-
-![er](auth.schema_migrations.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/auth.schema_migrations.svg b/docs/database/auth.schema_migrations.svg
deleted file mode 100644
index 4a9d4324a..000000000
--- a/docs/database/auth.schema_migrations.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: auth.schema_migrations Pages: 1 -->
-<svg width="437pt" height="165pt"
- viewBox="0.00 0.00 437.00 165.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 161)">
-<title>auth.schema_migrations</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-161 433,-161 433,4 -4,4"/>
-<!-- auth.schema_migrations -->
-<g id="node1" class="node">
-<title>auth.schema_migrations</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-75.5 46.5,-110.5 383.5,-110.5 383.5,-75.5 46.5,-75.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-110.5 383.5,-110.5 383.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.1961" y="-88.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.schema_migrations</text>
-<text text-anchor="start" x="249.2359" y="-88.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="283.4407" y="-88.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 383.5,-75.5 383.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">version </text>
-<text text-anchor="start" x="102.5056" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-112.5 384.5,-112.5 384.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/auth.users.md b/docs/database/auth.users.md
deleted file mode 100644
index 4e1cf1bf9..000000000
--- a/docs/database/auth.users.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# auth.users
-
-## Description
-
-Auth: Stores user login data within a secure schema.
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| instance_id | uuid |  | true |  |  |  |
-| id | uuid |  | false | [storage.buckets](storage.buckets.md) [storage.objects](storage.objects.md) |  |  |
-| aud | varchar(255) |  | true |  |  |  |
-| role | varchar(255) |  | true |  |  |  |
-| email | varchar(255) |  | true |  |  |  |
-| encrypted_password | varchar(255) |  | true |  |  |  |
-| confirmed_at | timestamp with time zone |  | true |  |  |  |
-| invited_at | timestamp with time zone |  | true |  |  |  |
-| confirmation_token | varchar(255) |  | true |  |  |  |
-| confirmation_sent_at | timestamp with time zone |  | true |  |  |  |
-| recovery_token | varchar(255) |  | true |  |  |  |
-| recovery_sent_at | timestamp with time zone |  | true |  |  |  |
-| email_change_token | varchar(255) |  | true |  |  |  |
-| email_change | varchar(255) |  | true |  |  |  |
-| email_change_sent_at | timestamp with time zone |  | true |  |  |  |
-| last_sign_in_at | timestamp with time zone |  | true |  |  |  |
-| raw_app_meta_data | jsonb |  | true |  |  |  |
-| raw_user_meta_data | jsonb |  | true |  |  |  |
-| is_super_admin | boolean |  | true |  |  |  |
-| created_at | timestamp with time zone |  | true |  |  |  |
-| updated_at | timestamp with time zone |  | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| users_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-| users_email_key | UNIQUE | UNIQUE (email) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| users_pkey | CREATE UNIQUE INDEX users_pkey ON auth.users USING btree (id) |
-| users_email_key | CREATE UNIQUE INDEX users_email_key ON auth.users USING btree (email) |
-| users_instance_id_email_idx | CREATE INDEX users_instance_id_email_idx ON auth.users USING btree (instance_id, email) |
-| users_instance_id_idx | CREATE INDEX users_instance_id_idx ON auth.users USING btree (instance_id) |
-
-## Triggers
-
-| Name | Definition |
-| ---- | ---------- |
-| on_auth_user_created | CREATE TRIGGER on_auth_user_created AFTER INSERT ON auth.users FOR EACH ROW EXECUTE FUNCTION handle_new_user() |
-
-## Relations
-
-![er](auth.users.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/auth.users.svg b/docs/database/auth.users.svg
deleted file mode 100644
index d921f4f1b..000000000
--- a/docs/database/auth.users.svg
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: auth.users Pages: 1 -->
-<svg width="804pt" height="1162pt"
- viewBox="0.00 0.00 803.50 1162.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1158)">
-<title>auth.users</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1158 799.5,-1158 799.5,4 -4,4"/>
-<!-- auth.users -->
-<g id="node1" class="node">
-<title>auth.users</title>
-<polygon fill="#efefef" stroke="transparent" points="226.5,-675.5 226.5,-710.5 550.5,-710.5 550.5,-675.5 226.5,-675.5"/>
-<polygon fill="none" stroke="#000000" points="226.5,-675.5 226.5,-710.5 550.5,-710.5 550.5,-675.5 226.5,-675.5"/>
-<text text-anchor="start" x="282.7022" y="-688.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.users</text>
-<text text-anchor="start" x="366.7298" y="-688.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="400.9346" y="-688.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-645.5 226.5,-675.5 550.5,-675.5 550.5,-645.5 226.5,-645.5"/>
-<text text-anchor="start" x="233.5" y="-656.9" font-family="Arial" font-size="14.00" fill="#000000">instance_id </text>
-<text text-anchor="start" x="308.19" y="-656.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-615.5 226.5,-645.5 550.5,-645.5 550.5,-615.5 226.5,-615.5"/>
-<text text-anchor="start" x="233.5" y="-626.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="248.2798" y="-626.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-585.5 226.5,-615.5 550.5,-615.5 550.5,-585.5 226.5,-585.5"/>
-<text text-anchor="start" x="233.5" y="-596.9" font-family="Arial" font-size="14.00" fill="#000000">aud </text>
-<text text-anchor="start" x="260.7384" y="-596.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-555.5 226.5,-585.5 550.5,-585.5 550.5,-555.5 226.5,-555.5"/>
-<text text-anchor="start" x="233.5" y="-566.9" font-family="Arial" font-size="14.00" fill="#000000">role </text>
-<text text-anchor="start" x="260.723" y="-566.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-525.5 226.5,-555.5 550.5,-555.5 550.5,-525.5 226.5,-525.5"/>
-<text text-anchor="start" x="233.5" y="-536.9" font-family="Arial" font-size="14.00" fill="#000000">email </text>
-<text text-anchor="start" x="270.8296" y="-536.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-495.5 226.5,-525.5 550.5,-525.5 550.5,-495.5 226.5,-495.5"/>
-<text text-anchor="start" x="233.5" y="-506.9" font-family="Arial" font-size="14.00" fill="#000000">encrypted_password </text>
-<text text-anchor="start" x="366.535" y="-506.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-465.5 226.5,-495.5 550.5,-495.5 550.5,-465.5 226.5,-465.5"/>
-<text text-anchor="start" x="233.5" y="-476.9" font-family="Arial" font-size="14.00" fill="#000000">confirmed_at </text>
-<text text-anchor="start" x="318.2952" y="-476.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-435.5 226.5,-465.5 550.5,-465.5 550.5,-435.5 226.5,-435.5"/>
-<text text-anchor="start" x="233.5" y="-446.9" font-family="Arial" font-size="14.00" fill="#000000">invited_at </text>
-<text text-anchor="start" x="297.298" y="-446.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-405.5 226.5,-435.5 550.5,-435.5 550.5,-405.5 226.5,-405.5"/>
-<text text-anchor="start" x="233.5" y="-416.9" font-family="Arial" font-size="14.00" fill="#000000">confirmation_token </text>
-<text text-anchor="start" x="355.6402" y="-416.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-375.5 226.5,-405.5 550.5,-405.5 550.5,-375.5 226.5,-375.5"/>
-<text text-anchor="start" x="233.5" y="-386.9" font-family="Arial" font-size="14.00" fill="#000000">confirmation_sent_at </text>
-<text text-anchor="start" x="367.3134" y="-386.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-345.5 226.5,-375.5 550.5,-375.5 550.5,-345.5 226.5,-345.5"/>
-<text text-anchor="start" x="233.5" y="-356.9" font-family="Arial" font-size="14.00" fill="#000000">recovery_token </text>
-<text text-anchor="start" x="333.0806" y="-356.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-315.5 226.5,-345.5 550.5,-345.5 550.5,-315.5 226.5,-315.5"/>
-<text text-anchor="start" x="233.5" y="-326.9" font-family="Arial" font-size="14.00" fill="#000000">recovery_sent_at </text>
-<text text-anchor="start" x="344.7538" y="-326.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-285.5 226.5,-315.5 550.5,-315.5 550.5,-285.5 226.5,-285.5"/>
-<text text-anchor="start" x="233.5" y="-296.9" font-family="Arial" font-size="14.00" fill="#000000">email_change_token </text>
-<text text-anchor="start" x="366.5462" y="-296.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-255.5 226.5,-285.5 550.5,-285.5 550.5,-255.5 226.5,-255.5"/>
-<text text-anchor="start" x="233.5" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">email_change </text>
-<text text-anchor="start" x="324.5252" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-225.5 226.5,-255.5 550.5,-255.5 550.5,-225.5 226.5,-225.5"/>
-<text text-anchor="start" x="233.2981" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">email_change_sent_at </text>
-<text text-anchor="start" x="378.0175" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-195.5 226.5,-225.5 550.5,-225.5 550.5,-195.5 226.5,-195.5"/>
-<text text-anchor="start" x="233.5" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">last_sign_in_at </text>
-<text text-anchor="start" x="330.7524" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-165.5 226.5,-195.5 550.5,-195.5 550.5,-165.5 226.5,-165.5"/>
-<text text-anchor="start" x="233.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">raw_app_meta_data </text>
-<text text-anchor="start" x="364.9908" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-135.5 226.5,-165.5 550.5,-165.5 550.5,-135.5 226.5,-135.5"/>
-<text text-anchor="start" x="233.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">raw_user_meta_data </text>
-<text text-anchor="start" x="368.8688" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-105.5 226.5,-135.5 550.5,-135.5 550.5,-105.5 226.5,-105.5"/>
-<text text-anchor="start" x="233.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">is_super_admin </text>
-<text text-anchor="start" x="336.1858" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-75.5 226.5,-105.5 550.5,-105.5 550.5,-75.5 226.5,-75.5"/>
-<text text-anchor="start" x="233.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="303.528" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-45.5 226.5,-75.5 550.5,-75.5 550.5,-45.5 226.5,-45.5"/>
-<text text-anchor="start" x="233.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at </text>
-<text text-anchor="start" x="307.4326" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="225,-44.5 225,-712.5 552,-712.5 552,-44.5 225,-44.5"/>
-</g>
-<!-- storage.buckets -->
-<g id="node2" class="node">
-<title>storage.buckets</title>
-<polygon fill="#efefef" stroke="transparent" points="43.5,-1030.5 43.5,-1065.5 326.5,-1065.5 326.5,-1030.5 43.5,-1030.5"/>
-<polygon fill="none" stroke="#000000" points="43.5,-1030.5 43.5,-1065.5 326.5,-1065.5 326.5,-1030.5 43.5,-1030.5"/>
-<text text-anchor="start" x="57.6949" y="-1043.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.buckets</text>
-<text text-anchor="start" x="184.7371" y="-1043.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="218.9419" y="-1043.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-1000.5 43.5,-1030.5 326.5,-1030.5 326.5,-1000.5 43.5,-1000.5"/>
-<text text-anchor="start" x="50.5" y="-1011.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="95.594" y="-1011.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-970.5 43.5,-1000.5 326.5,-1000.5 326.5,-970.5 43.5,-970.5"/>
-<text text-anchor="start" x="50.5" y="-981.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="119.7132" y="-981.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-940.5 43.5,-970.5 326.5,-970.5 326.5,-940.5 43.5,-940.5"/>
-<text text-anchor="start" x="50.5" y="-951.9" font-family="Arial" font-size="14.00" fill="#000000">owner    </text>
-<text text-anchor="start" x="122.8198" y="-951.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-910.5 43.5,-940.5 326.5,-940.5 326.5,-910.5 43.5,-910.5"/>
-<text text-anchor="start" x="50.5" y="-921.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="150.8422" y="-921.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-880.5 43.5,-910.5 326.5,-910.5 326.5,-880.5 43.5,-880.5"/>
-<text text-anchor="start" x="50.0344" y="-891.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="154.2812" y="-891.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- storage.buckets&#45;&gt;auth.users -->
-<g id="edge1" class="edge">
-<title>storage.buckets:owner&#45;&gt;auth.users:id</title>
-<path fill="none" stroke="#000000" d="M336.8096,-954.3755C374.3473,-945.1834 347.3108,-881.6381 326.5,-838 301.8801,-786.3747 251.1199,-808.6253 226.5,-757 202.299,-706.2531 170.2778,-630.5 226.5,-630.5"/>
-<polygon fill="#000000" stroke="#000000" points="336.441,-954.4156 326.012,-951.0265 331.4705,-954.9578 326.5,-955.5 326.5,-955.5 326.5,-955.5 331.4705,-954.9578 326.988,-959.9735 336.441,-954.4156 336.441,-954.4156"/>
-<text text-anchor="start" x="333.4965" y="-965.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (owner) REFERENCES auth.users(id)</text>
-</g>
-<!-- storage.objects -->
-<g id="node3" class="node">
-<title>storage.objects</title>
-<polygon fill="#efefef" stroke="transparent" points="430.5,-1075.5 430.5,-1110.5 752.5,-1110.5 752.5,-1075.5 430.5,-1075.5"/>
-<polygon fill="none" stroke="#000000" points="430.5,-1075.5 430.5,-1110.5 752.5,-1110.5 752.5,-1075.5 430.5,-1075.5"/>
-<text text-anchor="start" x="466.6978" y="-1088.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.objects</text>
-<text text-anchor="start" x="588.7342" y="-1088.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="622.939" y="-1088.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-1045.5 430.5,-1075.5 752.5,-1075.5 752.5,-1045.5 430.5,-1045.5"/>
-<text text-anchor="start" x="437.5" y="-1056.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="482.594" y="-1056.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-1015.5 430.5,-1045.5 752.5,-1045.5 752.5,-1015.5 430.5,-1015.5"/>
-<text text-anchor="start" x="437.5" y="-1026.9" font-family="Arial" font-size="14.00" fill="#000000">bucket_id    </text>
-<text text-anchor="start" x="531.615" y="-1026.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-985.5 430.5,-1015.5 752.5,-1015.5 752.5,-985.5 430.5,-985.5"/>
-<text text-anchor="start" x="437.5" y="-996.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="506.7132" y="-996.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-955.5 430.5,-985.5 752.5,-985.5 752.5,-955.5 430.5,-955.5"/>
-<text text-anchor="start" x="437.5" y="-966.9" font-family="Arial" font-size="14.00" fill="#000000">owner    </text>
-<text text-anchor="start" x="509.8198" y="-966.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-925.5 430.5,-955.5 752.5,-955.5 752.5,-925.5 430.5,-925.5"/>
-<text text-anchor="start" x="437.5" y="-936.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="537.8422" y="-936.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-895.5 430.5,-925.5 752.5,-925.5 752.5,-895.5 430.5,-895.5"/>
-<text text-anchor="start" x="437.5" y="-906.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="541.7468" y="-906.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-865.5 430.5,-895.5 752.5,-895.5 752.5,-865.5 430.5,-865.5"/>
-<text text-anchor="start" x="437.4811" y="-876.9" font-family="Arial" font-size="14.00" fill="#000000">last_accessed_at    </text>
-<text text-anchor="start" x="579.8345" y="-876.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-835.5 430.5,-865.5 752.5,-865.5 752.5,-835.5 430.5,-835.5"/>
-<text text-anchor="start" x="437.5" y="-846.9" font-family="Arial" font-size="14.00" fill="#000000">metadata    </text>
-<text text-anchor="start" x="530.0596" y="-846.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- storage.objects&#45;&gt;auth.users -->
-<g id="edge2" class="edge">
-<title>storage.objects:owner&#45;&gt;auth.users:id</title>
-<path fill="none" stroke="#000000" d="M420.126,-969.7642C354.6257,-959.9049 385.6162,-853.3252 430.5,-793 463.7381,-748.327 517.2619,-801.673 550.5,-757 584.0608,-711.8933 606.7222,-630.5 550.5,-630.5"/>
-<polygon fill="#000000" stroke="#000000" points="420.5251,-969.7924 430.1816,-974.9887 425.5125,-970.1462 430.5,-970.5 430.5,-970.5 430.5,-970.5 425.5125,-970.1462 430.8184,-966.0113 420.5251,-969.7924 420.5251,-969.7924"/>
-<text text-anchor="start" x="437.4965" y="-980.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (owner) REFERENCES auth.users(id)</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/extensions.pg_stat_statements.md b/docs/database/extensions.pg_stat_statements.md
deleted file mode 100644
index 1ac95502f..000000000
--- a/docs/database/extensions.pg_stat_statements.md
+++ /dev/null
@@ -1,117 +0,0 @@
-# extensions.pg_stat_statements
-
-## Description
-
-<details>
-<summary><strong>Table Definition</strong></summary>
-
-```sql
-CREATE VIEW pg_stat_statements AS (
- SELECT pg_stat_statements.userid,
-    pg_stat_statements.dbid,
-    pg_stat_statements.toplevel,
-    pg_stat_statements.queryid,
-    pg_stat_statements.query,
-    pg_stat_statements.plans,
-    pg_stat_statements.total_plan_time,
-    pg_stat_statements.min_plan_time,
-    pg_stat_statements.max_plan_time,
-    pg_stat_statements.mean_plan_time,
-    pg_stat_statements.stddev_plan_time,
-    pg_stat_statements.calls,
-    pg_stat_statements.total_exec_time,
-    pg_stat_statements.min_exec_time,
-    pg_stat_statements.max_exec_time,
-    pg_stat_statements.mean_exec_time,
-    pg_stat_statements.stddev_exec_time,
-    pg_stat_statements.rows,
-    pg_stat_statements.shared_blks_hit,
-    pg_stat_statements.shared_blks_read,
-    pg_stat_statements.shared_blks_dirtied,
-    pg_stat_statements.shared_blks_written,
-    pg_stat_statements.local_blks_hit,
-    pg_stat_statements.local_blks_read,
-    pg_stat_statements.local_blks_dirtied,
-    pg_stat_statements.local_blks_written,
-    pg_stat_statements.temp_blks_read,
-    pg_stat_statements.temp_blks_written,
-    pg_stat_statements.blk_read_time,
-    pg_stat_statements.blk_write_time,
-    pg_stat_statements.temp_blk_read_time,
-    pg_stat_statements.temp_blk_write_time,
-    pg_stat_statements.wal_records,
-    pg_stat_statements.wal_fpi,
-    pg_stat_statements.wal_bytes,
-    pg_stat_statements.jit_functions,
-    pg_stat_statements.jit_generation_time,
-    pg_stat_statements.jit_inlining_count,
-    pg_stat_statements.jit_inlining_time,
-    pg_stat_statements.jit_optimization_count,
-    pg_stat_statements.jit_optimization_time,
-    pg_stat_statements.jit_emission_count,
-    pg_stat_statements.jit_emission_time
-   FROM pg_stat_statements(true) pg_stat_statements(userid, dbid, toplevel, queryid, query, plans, total_plan_time, min_plan_time, max_plan_time, mean_plan_time, stddev_plan_time, calls, total_exec_time, min_exec_time, max_exec_time, mean_exec_time, stddev_exec_time, rows, shared_blks_hit, shared_blks_read, shared_blks_dirtied, shared_blks_written, local_blks_hit, local_blks_read, local_blks_dirtied, local_blks_written, temp_blks_read, temp_blks_written, blk_read_time, blk_write_time, temp_blk_read_time, temp_blk_write_time, wal_records, wal_fpi, wal_bytes, jit_functions, jit_generation_time, jit_inlining_count, jit_inlining_time, jit_optimization_count, jit_optimization_time, jit_emission_count, jit_emission_time)
-)
-```
-
-</details>
-
-## Referenced Tables
-
-- pg_stat_statements
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| userid | oid |  | true |  |  |  |
-| dbid | oid |  | true |  |  |  |
-| toplevel | boolean |  | true |  |  |  |
-| queryid | bigint |  | true |  |  |  |
-| query | text |  | true |  |  |  |
-| plans | bigint |  | true |  |  |  |
-| total_plan_time | double precision |  | true |  |  |  |
-| min_plan_time | double precision |  | true |  |  |  |
-| max_plan_time | double precision |  | true |  |  |  |
-| mean_plan_time | double precision |  | true |  |  |  |
-| stddev_plan_time | double precision |  | true |  |  |  |
-| calls | bigint |  | true |  |  |  |
-| total_exec_time | double precision |  | true |  |  |  |
-| min_exec_time | double precision |  | true |  |  |  |
-| max_exec_time | double precision |  | true |  |  |  |
-| mean_exec_time | double precision |  | true |  |  |  |
-| stddev_exec_time | double precision |  | true |  |  |  |
-| rows | bigint |  | true |  |  |  |
-| shared_blks_hit | bigint |  | true |  |  |  |
-| shared_blks_read | bigint |  | true |  |  |  |
-| shared_blks_dirtied | bigint |  | true |  |  |  |
-| shared_blks_written | bigint |  | true |  |  |  |
-| local_blks_hit | bigint |  | true |  |  |  |
-| local_blks_read | bigint |  | true |  |  |  |
-| local_blks_dirtied | bigint |  | true |  |  |  |
-| local_blks_written | bigint |  | true |  |  |  |
-| temp_blks_read | bigint |  | true |  |  |  |
-| temp_blks_written | bigint |  | true |  |  |  |
-| blk_read_time | double precision |  | true |  |  |  |
-| blk_write_time | double precision |  | true |  |  |  |
-| temp_blk_read_time | double precision |  | true |  |  |  |
-| temp_blk_write_time | double precision |  | true |  |  |  |
-| wal_records | bigint |  | true |  |  |  |
-| wal_fpi | bigint |  | true |  |  |  |
-| wal_bytes | numeric |  | true |  |  |  |
-| jit_functions | bigint |  | true |  |  |  |
-| jit_generation_time | double precision |  | true |  |  |  |
-| jit_inlining_count | bigint |  | true |  |  |  |
-| jit_inlining_time | double precision |  | true |  |  |  |
-| jit_optimization_count | bigint |  | true |  |  |  |
-| jit_optimization_time | double precision |  | true |  |  |  |
-| jit_emission_count | bigint |  | true |  |  |  |
-| jit_emission_time | double precision |  | true |  |  |  |
-
-## Relations
-
-![er](extensions.pg_stat_statements.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/extensions.pg_stat_statements.svg b/docs/database/extensions.pg_stat_statements.svg
deleted file mode 100644
index 141127ffc..000000000
--- a/docs/database/extensions.pg_stat_statements.svg
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: extensions.pg_stat_statements Pages: 1 -->
-<svg width="439pt" height="1425pt"
- viewBox="0.00 0.00 439.00 1425.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1421)">
-<title>extensions.pg_stat_statements</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1421 435,-1421 435,4 -4,4"/>
-<!-- extensions.pg_stat_statements -->
-<g id="node1" class="node">
-<title>extensions.pg_stat_statements</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-1335.5 46.5,-1370.5 385.5,-1370.5 385.5,-1335.5 46.5,-1335.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-1335.5 46.5,-1370.5 385.5,-1370.5 385.5,-1335.5 46.5,-1335.5"/>
-<text text-anchor="start" x="53.0735" y="-1348.3" font-family="Arial Bold" font-size="18.00" fill="#000000">extensions.pg_stat_statements</text>
-<text text-anchor="start" x="301.1621" y="-1348.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="335.3669" y="-1348.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1305.5 46.5,-1335.5 385.5,-1335.5 385.5,-1305.5 46.5,-1305.5"/>
-<text text-anchor="start" x="53.5" y="-1316.9" font-family="Arial" font-size="14.00" fill="#000000">userid </text>
-<text text-anchor="start" x="95.5056" y="-1316.9" font-family="Arial" font-size="14.00" fill="#666666">[oid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1275.5 46.5,-1305.5 385.5,-1305.5 385.5,-1275.5 46.5,-1275.5"/>
-<text text-anchor="start" x="53.5" y="-1286.9" font-family="Arial" font-size="14.00" fill="#000000">dbid </text>
-<text text-anchor="start" x="83.845" y="-1286.9" font-family="Arial" font-size="14.00" fill="#666666">[oid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1245.5 46.5,-1275.5 385.5,-1275.5 385.5,-1245.5 46.5,-1245.5"/>
-<text text-anchor="start" x="53.5" y="-1256.9" font-family="Arial" font-size="14.00" fill="#000000">toplevel </text>
-<text text-anchor="start" x="105.6248" y="-1256.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1215.5 46.5,-1245.5 385.5,-1245.5 385.5,-1215.5 46.5,-1215.5"/>
-<text text-anchor="start" x="53.5" y="-1226.9" font-family="Arial" font-size="14.00" fill="#000000">queryid </text>
-<text text-anchor="start" x="103.2882" y="-1226.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1185.5 46.5,-1215.5 385.5,-1215.5 385.5,-1185.5 46.5,-1185.5"/>
-<text text-anchor="start" x="53.5" y="-1196.9" font-family="Arial" font-size="14.00" fill="#000000">query </text>
-<text text-anchor="start" x="92.399" y="-1196.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1155.5 46.5,-1185.5 385.5,-1185.5 385.5,-1155.5 46.5,-1155.5"/>
-<text text-anchor="start" x="53.5" y="-1166.9" font-family="Arial" font-size="14.00" fill="#000000">plans </text>
-<text text-anchor="start" x="90.845" y="-1166.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1125.5 46.5,-1155.5 385.5,-1155.5 385.5,-1125.5 46.5,-1125.5"/>
-<text text-anchor="start" x="53.5" y="-1136.9" font-family="Arial" font-size="14.00" fill="#000000">total_plan_time </text>
-<text text-anchor="start" x="152.3036" y="-1136.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1095.5 46.5,-1125.5 385.5,-1125.5 385.5,-1095.5 46.5,-1095.5"/>
-<text text-anchor="start" x="53.5" y="-1106.9" font-family="Arial" font-size="14.00" fill="#000000">min_plan_time </text>
-<text text-anchor="start" x="148.4004" y="-1106.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1065.5 46.5,-1095.5 385.5,-1095.5 385.5,-1065.5 46.5,-1065.5"/>
-<text text-anchor="start" x="53.5" y="-1076.9" font-family="Arial" font-size="14.00" fill="#000000">max_plan_time </text>
-<text text-anchor="start" x="152.2938" y="-1076.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1035.5 46.5,-1065.5 385.5,-1065.5 385.5,-1035.5 46.5,-1035.5"/>
-<text text-anchor="start" x="53.5" y="-1046.9" font-family="Arial" font-size="14.00" fill="#000000">mean_plan_time </text>
-<text text-anchor="start" x="160.859" y="-1046.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1005.5 46.5,-1035.5 385.5,-1035.5 385.5,-1005.5 46.5,-1005.5"/>
-<text text-anchor="start" x="53.5" y="-1016.9" font-family="Arial" font-size="14.00" fill="#000000">stddev_plan_time </text>
-<text text-anchor="start" x="167.089" y="-1016.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-975.5 46.5,-1005.5 385.5,-1005.5 385.5,-975.5 46.5,-975.5"/>
-<text text-anchor="start" x="53.5" y="-986.9" font-family="Arial" font-size="14.00" fill="#000000">calls </text>
-<text text-anchor="start" x="85.3864" y="-986.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-945.5 46.5,-975.5 385.5,-975.5 385.5,-945.5 46.5,-945.5"/>
-<text text-anchor="start" x="53.5" y="-956.9" font-family="Arial" font-size="14.00" fill="#000000">total_exec_time </text>
-<text text-anchor="start" x="155.4144" y="-956.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-915.5 46.5,-945.5 385.5,-945.5 385.5,-915.5 46.5,-915.5"/>
-<text text-anchor="start" x="53.5" y="-926.9" font-family="Arial" font-size="14.00" fill="#000000">min_exec_time </text>
-<text text-anchor="start" x="151.5112" y="-926.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-885.5 46.5,-915.5 385.5,-915.5 385.5,-885.5 46.5,-885.5"/>
-<text text-anchor="start" x="53.5" y="-896.9" font-family="Arial" font-size="14.00" fill="#000000">max_exec_time </text>
-<text text-anchor="start" x="155.4046" y="-896.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-855.5 46.5,-885.5 385.5,-885.5 385.5,-855.5 46.5,-855.5"/>
-<text text-anchor="start" x="53.5" y="-866.9" font-family="Arial" font-size="14.00" fill="#000000">mean_exec_time </text>
-<text text-anchor="start" x="163.9698" y="-866.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-825.5 46.5,-855.5 385.5,-855.5 385.5,-825.5 46.5,-825.5"/>
-<text text-anchor="start" x="53.5" y="-836.9" font-family="Arial" font-size="14.00" fill="#000000">stddev_exec_time </text>
-<text text-anchor="start" x="170.1998" y="-836.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-795.5 46.5,-825.5 385.5,-825.5 385.5,-795.5 46.5,-795.5"/>
-<text text-anchor="start" x="53.5" y="-806.9" font-family="Arial" font-size="14.00" fill="#000000">rows </text>
-<text text-anchor="start" x="86.9404" y="-806.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-765.5 46.5,-795.5 385.5,-795.5 385.5,-765.5 46.5,-765.5"/>
-<text text-anchor="start" x="53.5" y="-776.9" font-family="Arial" font-size="14.00" fill="#000000">shared_blks_hit </text>
-<text text-anchor="start" x="155.4158" y="-776.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-735.5 46.5,-765.5 385.5,-765.5 385.5,-735.5 46.5,-735.5"/>
-<text text-anchor="start" x="53.5" y="-746.9" font-family="Arial" font-size="14.00" fill="#000000">shared_blks_read </text>
-<text text-anchor="start" x="168.6444" y="-746.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-705.5 46.5,-735.5 385.5,-735.5 385.5,-705.5 46.5,-705.5"/>
-<text text-anchor="start" x="53.5" y="-716.9" font-family="Arial" font-size="14.00" fill="#000000">shared_blks_dirtied </text>
-<text text-anchor="start" x="178.7482" y="-716.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-675.5 46.5,-705.5 385.5,-705.5 385.5,-675.5 46.5,-675.5"/>
-<text text-anchor="start" x="53.5" y="-686.9" font-family="Arial" font-size="14.00" fill="#000000">shared_blks_written </text>
-<text text-anchor="start" x="181.8562" y="-686.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-645.5 46.5,-675.5 385.5,-675.5 385.5,-645.5 46.5,-645.5"/>
-<text text-anchor="start" x="53.5" y="-656.9" font-family="Arial" font-size="14.00" fill="#000000">local_blks_hit </text>
-<text text-anchor="start" x="141.4032" y="-656.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-615.5 46.5,-645.5 385.5,-645.5 385.5,-615.5 46.5,-615.5"/>
-<text text-anchor="start" x="53.5" y="-626.9" font-family="Arial" font-size="14.00" fill="#000000">local_blks_read </text>
-<text text-anchor="start" x="154.6318" y="-626.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-585.5 46.5,-615.5 385.5,-615.5 385.5,-585.5 46.5,-585.5"/>
-<text text-anchor="start" x="53.5" y="-596.9" font-family="Arial" font-size="14.00" fill="#000000">local_blks_dirtied </text>
-<text text-anchor="start" x="164.7356" y="-596.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-555.5 46.5,-585.5 385.5,-585.5 385.5,-555.5 46.5,-555.5"/>
-<text text-anchor="start" x="53.5" y="-566.9" font-family="Arial" font-size="14.00" fill="#000000">local_blks_written </text>
-<text text-anchor="start" x="167.8436" y="-566.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-525.5 46.5,-555.5 385.5,-555.5 385.5,-525.5 46.5,-525.5"/>
-<text text-anchor="start" x="53.5" y="-536.9" font-family="Arial" font-size="14.00" fill="#000000">temp_blks_read </text>
-<text text-anchor="start" x="156.9698" y="-536.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-495.5 46.5,-525.5 385.5,-525.5 385.5,-495.5 46.5,-495.5"/>
-<text text-anchor="start" x="53.5" y="-506.9" font-family="Arial" font-size="14.00" fill="#000000">temp_blks_written </text>
-<text text-anchor="start" x="170.1816" y="-506.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-465.5 46.5,-495.5 385.5,-495.5 385.5,-465.5 46.5,-465.5"/>
-<text text-anchor="start" x="53.5" y="-476.9" font-family="Arial" font-size="14.00" fill="#000000">blk_read_time </text>
-<text text-anchor="start" x="145.2938" y="-476.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-435.5 46.5,-465.5 385.5,-465.5 385.5,-435.5 46.5,-435.5"/>
-<text text-anchor="start" x="53.5" y="-446.9" font-family="Arial" font-size="14.00" fill="#000000">blk_write_time </text>
-<text text-anchor="start" x="146.8324" y="-446.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-405.5 46.5,-435.5 385.5,-435.5 385.5,-405.5 46.5,-405.5"/>
-<text text-anchor="start" x="53.5" y="-416.9" font-family="Arial" font-size="14.00" fill="#000000">temp_blk_read_time </text>
-<text text-anchor="start" x="184.1928" y="-416.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-375.5 46.5,-405.5 385.5,-405.5 385.5,-375.5 46.5,-375.5"/>
-<text text-anchor="start" x="53.5" y="-386.9" font-family="Arial" font-size="14.00" fill="#000000">temp_blk_write_time </text>
-<text text-anchor="start" x="185.7314" y="-386.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-345.5 46.5,-375.5 385.5,-375.5 385.5,-345.5 46.5,-345.5"/>
-<text text-anchor="start" x="53.5" y="-356.9" font-family="Arial" font-size="14.00" fill="#000000">wal_records </text>
-<text text-anchor="start" x="132.838" y="-356.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-315.5 46.5,-345.5 385.5,-345.5 385.5,-315.5 46.5,-315.5"/>
-<text text-anchor="start" x="53.5" y="-326.9" font-family="Arial" font-size="14.00" fill="#000000">wal_fpi </text>
-<text text-anchor="start" x="100.9488" y="-326.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-285.5 46.5,-315.5 385.5,-315.5 385.5,-285.5 46.5,-285.5"/>
-<text text-anchor="start" x="53.5" y="-296.9" font-family="Arial" font-size="14.00" fill="#000000">wal_bytes </text>
-<text text-anchor="start" x="119.6248" y="-296.9" font-family="Arial" font-size="14.00" fill="#666666">[numeric]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-255.5 46.5,-285.5 385.5,-285.5 385.5,-255.5 46.5,-255.5"/>
-<text text-anchor="start" x="53.5" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">jit_functions </text>
-<text text-anchor="start" x="131.2952" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-225.5 46.5,-255.5 385.5,-255.5 385.5,-225.5 46.5,-225.5"/>
-<text text-anchor="start" x="53.5" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">jit_generation_time </text>
-<text text-anchor="start" x="175.636" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-195.5 46.5,-225.5 385.5,-225.5 385.5,-195.5 46.5,-195.5"/>
-<text text-anchor="start" x="53.5" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">jit_inlining_count </text>
-<text text-anchor="start" x="160.8548" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-195.5 385.5,-195.5 385.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">jit_inlining_time </text>
-<text text-anchor="start" x="153.0568" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 385.5,-165.5 385.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">jit_optimization_count </text>
-<text text-anchor="start" x="191.9726" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 385.5,-135.5 385.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">jit_optimization_time </text>
-<text text-anchor="start" x="184.1746" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 385.5,-105.5 385.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">jit_emission_count </text>
-<text text-anchor="start" x="172.5196" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 385.5,-75.5 385.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">jit_emission_time </text>
-<text text-anchor="start" x="164.7216" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-1372.5 386.5,-1372.5 386.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/extensions.pg_stat_statements_info.md b/docs/database/extensions.pg_stat_statements_info.md
deleted file mode 100644
index 8d09611a4..000000000
--- a/docs/database/extensions.pg_stat_statements_info.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# extensions.pg_stat_statements_info
-
-## Description
-
-<details>
-<summary><strong>Table Definition</strong></summary>
-
-```sql
-CREATE VIEW pg_stat_statements_info AS (
- SELECT pg_stat_statements_info.dealloc,
-    pg_stat_statements_info.stats_reset
-   FROM pg_stat_statements_info() pg_stat_statements_info(dealloc, stats_reset)
-)
-```
-
-</details>
-
-## Referenced Tables
-
-- pg_stat_statements_info
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| dealloc | bigint |  | true |  |  |  |
-| stats_reset | timestamp with time zone |  | true |  |  |  |
-
-## Relations
-
-![er](extensions.pg_stat_statements_info.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/extensions.pg_stat_statements_info.svg b/docs/database/extensions.pg_stat_statements_info.svg
deleted file mode 100644
index 3802f8f3f..000000000
--- a/docs/database/extensions.pg_stat_statements_info.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: extensions.pg_stat_statements_info Pages: 1 -->
-<svg width="478pt" height="195pt"
- viewBox="0.00 0.00 478.00 195.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 191)">
-<title>extensions.pg_stat_statements_info</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-191 474,-191 474,4 -4,4"/>
-<!-- extensions.pg_stat_statements_info -->
-<g id="node1" class="node">
-<title>extensions.pg_stat_statements_info</title>
-<polygon fill="#efefef" stroke="transparent" points="46,-105.5 46,-140.5 424,-140.5 424,-105.5 46,-105.5"/>
-<polygon fill="none" stroke="#000000" points="46,-105.5 46,-140.5 424,-140.5 424,-105.5 46,-105.5"/>
-<text text-anchor="start" x="52.566" y="-118.3" font-family="Arial Bold" font-size="18.00" fill="#000000">extensions.pg_stat_statements_info</text>
-<text text-anchor="start" x="339.6696" y="-118.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="373.8744" y="-118.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="46,-75.5 46,-105.5 424,-105.5 424,-75.5 46,-75.5"/>
-<text text-anchor="start" x="53" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">dealloc </text>
-<text text-anchor="start" x="101.2342" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46,-45.5 46,-75.5 424,-75.5 424,-45.5 46,-45.5"/>
-<text text-anchor="start" x="53" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">stats_reset </text>
-<text text-anchor="start" x="125.3534" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-142.5 425.5,-142.5 425.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/net._http_response.md b/docs/database/net._http_response.md
deleted file mode 100644
index fe5d4f918..000000000
--- a/docs/database/net._http_response.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# net._http_response
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | bigint |  | true |  |  |  |
-| status_code | integer |  | true |  |  |  |
-| content_type | text |  | true |  |  |  |
-| headers | jsonb |  | true |  |  |  |
-| content | text |  | true |  |  |  |
-| timed_out | boolean |  | true |  |  |  |
-| error_msg | text |  | true |  |  |  |
-| created | timestamp with time zone | now() | false |  |  |  |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| _http_response_created_idx | CREATE INDEX _http_response_created_idx ON net._http_response USING btree (created) |
-
-## Relations
-
-![er](net._http_response.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/net._http_response.svg b/docs/database/net._http_response.svg
deleted file mode 100644
index ce4d35d7a..000000000
--- a/docs/database/net._http_response.svg
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: net._http_response Pages: 1 -->
-<svg width="395pt" height="375pt"
- viewBox="0.00 0.00 395.00 375.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 371)">
-<title>net._http_response</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-371 391,-371 391,4 -4,4"/>
-<!-- net._http_response -->
-<g id="node1" class="node">
-<title>net._http_response</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-285.5 46.5,-320.5 341.5,-320.5 341.5,-285.5 46.5,-285.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-285.5 46.5,-320.5 341.5,-320.5 341.5,-285.5 46.5,-285.5"/>
-<text text-anchor="start" x="53.1814" y="-298.3" font-family="Arial Bold" font-size="18.00" fill="#000000">net._http_response</text>
-<text text-anchor="start" x="207.2506" y="-298.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="241.4554" y="-298.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-255.5 46.5,-285.5 341.5,-285.5 341.5,-255.5 46.5,-255.5"/>
-<text text-anchor="start" x="53.5" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="68.2798" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-225.5 46.5,-255.5 341.5,-255.5 341.5,-225.5 46.5,-225.5"/>
-<text text-anchor="start" x="53.5" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">status_code </text>
-<text text-anchor="start" x="132.8674" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-195.5 46.5,-225.5 341.5,-225.5 341.5,-195.5 46.5,-195.5"/>
-<text text-anchor="start" x="53.5" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">content_type </text>
-<text text-anchor="start" x="137.5406" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-195.5 341.5,-195.5 341.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">headers </text>
-<text text-anchor="start" x="107.9642" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 341.5,-165.5 341.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">content </text>
-<text text-anchor="start" x="103.3022" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 341.5,-135.5 341.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">timed_out </text>
-<text text-anchor="start" x="118.852" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 341.5,-105.5 341.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">error_msg </text>
-<text text-anchor="start" x="121.1634" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 341.5,-75.5 341.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">created </text>
-<text text-anchor="start" x="104.0722" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-322.5 342.5,-322.5 342.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/net.http_request_queue.md b/docs/database/net.http_request_queue.md
deleted file mode 100644
index af4cbff0b..000000000
--- a/docs/database/net.http_request_queue.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# net.http_request_queue
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | bigint | nextval('net.http_request_queue_id_seq'::regclass) | false |  |  |  |
-| method | net.http_method |  | false |  |  |  |
-| url | text |  | false |  |  |  |
-| headers | jsonb |  | false |  |  |  |
-| body | bytea |  | true |  |  |  |
-| timeout_milliseconds | integer |  | false |  |  |  |
-
-## Relations
-
-![er](net.http_request_queue.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/net.http_request_queue.svg b/docs/database/net.http_request_queue.svg
deleted file mode 100644
index 9472b9f9c..000000000
--- a/docs/database/net.http_request_queue.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: net.http_request_queue Pages: 1 -->
-<svg width="431pt" height="315pt"
- viewBox="0.00 0.00 431.00 315.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 311)">
-<title>net.http_request_queue</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-311 427,-311 427,4 -4,4"/>
-<!-- net.http_request_queue -->
-<g id="node1" class="node">
-<title>net.http_request_queue</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-225.5 46.5,-260.5 377.5,-260.5 377.5,-225.5 46.5,-225.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-225.5 46.5,-260.5 377.5,-260.5 377.5,-225.5 46.5,-225.5"/>
-<text text-anchor="start" x="53.1679" y="-238.3" font-family="Arial Bold" font-size="18.00" fill="#000000">net.http_request_queue</text>
-<text text-anchor="start" x="243.2641" y="-238.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="277.4689" y="-238.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-195.5 46.5,-225.5 377.5,-225.5 377.5,-195.5 46.5,-195.5"/>
-<text text-anchor="start" x="53.5" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="68.2798" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-195.5 377.5,-195.5 377.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">method </text>
-<text text-anchor="start" x="104.0722" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[net.http_method]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 377.5,-165.5 377.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">url </text>
-<text text-anchor="start" x="72.9404" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 377.5,-135.5 377.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">headers </text>
-<text text-anchor="start" x="107.9642" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 377.5,-105.5 377.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">body </text>
-<text text-anchor="start" x="87.7384" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 377.5,-75.5 377.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">timeout_milliseconds </text>
-<text text-anchor="start" x="187.2868" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-262.5 378.5,-262.5 378.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/pgsodium.decrypted_key.md b/docs/database/pgsodium.decrypted_key.md
deleted file mode 100644
index 8c383e7a3..000000000
--- a/docs/database/pgsodium.decrypted_key.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# pgsodium.decrypted_key
-
-## Description
-
-<details>
-<summary><strong>Table Definition</strong></summary>
-
-```sql
-CREATE VIEW decrypted_key AS (
- SELECT key.id,
-    key.status,
-    key.created,
-    key.expires,
-    key.key_type,
-    key.key_id,
-    key.key_context,
-    key.name,
-    key.associated_data,
-    key.raw_key,
-        CASE
-            WHEN (key.raw_key IS NULL) THEN NULL::bytea
-            ELSE
-            CASE
-                WHEN (key.parent_key IS NULL) THEN NULL::bytea
-                ELSE pgsodium.crypto_aead_det_decrypt(key.raw_key, convert_to(((key.id)::text || key.associated_data), 'utf8'::name), key.parent_key, key.raw_key_nonce)
-            END
-        END AS decrypted_raw_key,
-    key.raw_key_nonce,
-    key.parent_key,
-    key.comment
-   FROM pgsodium.key
-)
-```
-
-</details>
-
-## Referenced Tables
-
-- [pgsodium.key](pgsodium.key.md)
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid |  | true |  |  |  |
-| status | pgsodium.key_status |  | true |  |  |  |
-| created | timestamp with time zone |  | true |  |  |  |
-| expires | timestamp with time zone |  | true |  |  |  |
-| key_type | pgsodium.key_type |  | true |  |  |  |
-| key_id | bigint |  | true |  |  |  |
-| key_context | bytea |  | true |  |  |  |
-| name | text |  | true |  |  |  |
-| associated_data | text |  | true |  |  |  |
-| raw_key | bytea |  | true |  |  |  |
-| decrypted_raw_key | bytea |  | true |  |  |  |
-| raw_key_nonce | bytea |  | true |  |  |  |
-| parent_key | uuid |  | true |  |  |  |
-| comment | text |  | true |  |  |  |
-
-## Relations
-
-![er](pgsodium.decrypted_key.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/pgsodium.decrypted_key.svg b/docs/database/pgsodium.decrypted_key.svg
deleted file mode 100644
index 934d30424..000000000
--- a/docs/database/pgsodium.decrypted_key.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: pgsodium.decrypted_key Pages: 1 -->
-<svg width="391pt" height="555pt"
- viewBox="0.00 0.00 391.00 555.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 551)">
-<title>pgsodium.decrypted_key</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-551 387,-551 387,4 -4,4"/>
-<!-- pgsodium.decrypted_key -->
-<g id="node1" class="node">
-<title>pgsodium.decrypted_key</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-465.5 46.5,-500.5 337.5,-500.5 337.5,-465.5 46.5,-465.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-465.5 46.5,-500.5 337.5,-500.5 337.5,-465.5 46.5,-465.5"/>
-<text text-anchor="start" x="53.0891" y="-478.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.decrypted_key</text>
-<text text-anchor="start" x="253.1465" y="-478.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="287.3513" y="-478.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-435.5 46.5,-465.5 337.5,-465.5 337.5,-435.5 46.5,-435.5"/>
-<text text-anchor="start" x="53.5" y="-446.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="68.2798" y="-446.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-405.5 46.5,-435.5 337.5,-435.5 337.5,-405.5 46.5,-405.5"/>
-<text text-anchor="start" x="53.5" y="-416.9" font-family="Arial" font-size="14.00" fill="#000000">status </text>
-<text text-anchor="start" x="94.737" y="-416.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_status]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-375.5 46.5,-405.5 337.5,-405.5 337.5,-375.5 46.5,-375.5"/>
-<text text-anchor="start" x="53.5" y="-386.9" font-family="Arial" font-size="14.00" fill="#000000">created </text>
-<text text-anchor="start" x="104.0722" y="-386.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-345.5 46.5,-375.5 337.5,-375.5 337.5,-345.5 46.5,-345.5"/>
-<text text-anchor="start" x="53.5" y="-356.9" font-family="Arial" font-size="14.00" fill="#000000">expires </text>
-<text text-anchor="start" x="102.5056" y="-356.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-315.5 46.5,-345.5 337.5,-345.5 337.5,-315.5 46.5,-315.5"/>
-<text text-anchor="start" x="53.5" y="-326.9" font-family="Arial" font-size="14.00" fill="#000000">key_type </text>
-<text text-anchor="start" x="113.4116" y="-326.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_type]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-285.5 46.5,-315.5 337.5,-315.5 337.5,-285.5 46.5,-285.5"/>
-<text text-anchor="start" x="53.5" y="-296.9" font-family="Arial" font-size="14.00" fill="#000000">key_id </text>
-<text text-anchor="start" x="97.845" y="-296.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-255.5 46.5,-285.5 337.5,-285.5 337.5,-255.5 46.5,-255.5"/>
-<text text-anchor="start" x="53.5" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">key_context </text>
-<text text-anchor="start" x="132.0848" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-225.5 46.5,-255.5 337.5,-255.5 337.5,-225.5 46.5,-225.5"/>
-<text text-anchor="start" x="53.5" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">name </text>
-<text text-anchor="start" x="92.399" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-195.5 46.5,-225.5 337.5,-225.5 337.5,-195.5 46.5,-195.5"/>
-<text text-anchor="start" x="53.5" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">associated_data </text>
-<text text-anchor="start" x="159.3218" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-195.5 337.5,-195.5 337.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key </text>
-<text text-anchor="start" x="109.5056" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 337.5,-165.5 337.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">decrypted_raw_key </text>
-<text text-anchor="start" x="178.7524" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 337.5,-135.5 337.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key_nonce </text>
-<text text-anchor="start" x="155.4186" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 337.5,-105.5 337.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">parent_key </text>
-<text text-anchor="start" x="126.6374" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 337.5,-75.5 337.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">comment </text>
-<text text-anchor="start" x="114.9502" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-502.5 338.5,-502.5 338.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/pgsodium.key.md b/docs/database/pgsodium.key.md
deleted file mode 100644
index 974783813..000000000
--- a/docs/database/pgsodium.key.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# pgsodium.key
-
-## Description
-
-This table holds metadata for derived keys given a key_id and key_context. The raw key is never stored.
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid | gen_random_uuid() | false | [pgsodium.key](pgsodium.key.md) [vault.secrets](vault.secrets.md) |  |  |
-| status | pgsodium.key_status | 'valid'::pgsodium.key_status | true |  |  |  |
-| created | timestamp with time zone | CURRENT_TIMESTAMP | false |  |  |  |
-| expires | timestamp with time zone |  | true |  |  |  |
-| key_type | pgsodium.key_type |  | true |  |  |  |
-| key_id | bigint | nextval('pgsodium.key_key_id_seq'::regclass) | true |  |  |  |
-| key_context | bytea | '\x7067736f6469756d'::bytea | true |  |  |  |
-| name | text |  | true |  |  |  |
-| associated_data | text | 'associated'::text | true |  |  |  |
-| raw_key | bytea |  | true |  |  |  |
-| raw_key_nonce | bytea |  | true |  |  |  |
-| parent_key | uuid |  | true |  | [pgsodium.key](pgsodium.key.md) |  |
-| comment | text |  | true |  |  |  |
-| user_data | text |  | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| key_key_context_check | CHECK | CHECK ((length(key_context) = 8)) |
-| pgsodium_raw | CHECK | CHECK (<br>CASE<br>    WHEN (raw_key IS NOT NULL) THEN ((key_id IS NULL) AND (key_context IS NULL) AND (parent_key IS NOT NULL))<br>    ELSE ((key_id IS NOT NULL) AND (key_context IS NOT NULL) AND (parent_key IS NULL))<br>END) |
-| key_parent_key_fkey | FOREIGN KEY | FOREIGN KEY (parent_key) REFERENCES pgsodium.key(id) |
-| key_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-| pgsodium_key_unique_name | UNIQUE | UNIQUE (name) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| key_pkey | CREATE UNIQUE INDEX key_pkey ON pgsodium.key USING btree (id) |
-| key_status_idx | CREATE INDEX key_status_idx ON pgsodium.key USING btree (status) WHERE (status = ANY (ARRAY['valid'::pgsodium.key_status, 'default'::pgsodium.key_status])) |
-| key_status_idx1 | CREATE UNIQUE INDEX key_status_idx1 ON pgsodium.key USING btree (status) WHERE (status = 'default'::pgsodium.key_status) |
-| key_key_id_key_context_key_type_idx | CREATE UNIQUE INDEX key_key_id_key_context_key_type_idx ON pgsodium.key USING btree (key_id, key_context, key_type) |
-| pgsodium_key_unique_name | CREATE UNIQUE INDEX pgsodium_key_unique_name ON pgsodium.key USING btree (name) |
-
-## Triggers
-
-| Name | Definition |
-| ---- | ---------- |
-| key_encrypt_secret_trigger_raw_key | CREATE TRIGGER key_encrypt_secret_trigger_raw_key BEFORE INSERT OR UPDATE OF raw_key ON pgsodium.key FOR EACH ROW EXECUTE FUNCTION pgsodium.key_encrypt_secret_raw_key() |
-
-## Relations
-
-![er](pgsodium.key.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/pgsodium.key.svg b/docs/database/pgsodium.key.svg
deleted file mode 100644
index 9ba436b27..000000000
--- a/docs/database/pgsodium.key.svg
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: pgsodium.key Pages: 1 -->
-<svg width="709pt" height="952pt"
- viewBox="0.00 0.00 709.27 952.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 948)">
-<title>pgsodium.key</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-948 705.2694,-948 705.2694,4 -4,4"/>
-<!-- pgsodium.key -->
-<g id="node1" class="node">
-<title>pgsodium.key</title>
-<polygon fill="#efefef" stroke="transparent" points="164.2694,-465.5 164.2694,-500.5 416.2694,-500.5 416.2694,-465.5 164.2694,-465.5"/>
-<polygon fill="none" stroke="#000000" points="164.2694,-465.5 164.2694,-500.5 416.2694,-500.5 416.2694,-465.5 164.2694,-465.5"/>
-<text text-anchor="start" x="170.9725" y="-478.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.key</text>
-<text text-anchor="start" x="281.9983" y="-478.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="316.2031" y="-478.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-435.5 164.2694,-465.5 416.2694,-465.5 416.2694,-435.5 164.2694,-435.5"/>
-<text text-anchor="start" x="171.2694" y="-446.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="186.0492" y="-446.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-405.5 164.2694,-435.5 416.2694,-435.5 416.2694,-405.5 164.2694,-405.5"/>
-<text text-anchor="start" x="171.2694" y="-416.9" font-family="Arial" font-size="14.00" fill="#000000">status </text>
-<text text-anchor="start" x="212.5064" y="-416.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_status]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-375.5 164.2694,-405.5 416.2694,-405.5 416.2694,-375.5 164.2694,-375.5"/>
-<text text-anchor="start" x="171.2694" y="-386.9" font-family="Arial" font-size="14.00" fill="#000000">created </text>
-<text text-anchor="start" x="221.8416" y="-386.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-345.5 164.2694,-375.5 416.2694,-375.5 416.2694,-345.5 164.2694,-345.5"/>
-<text text-anchor="start" x="171.2694" y="-356.9" font-family="Arial" font-size="14.00" fill="#000000">expires </text>
-<text text-anchor="start" x="220.275" y="-356.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-315.5 164.2694,-345.5 416.2694,-345.5 416.2694,-315.5 164.2694,-315.5"/>
-<text text-anchor="start" x="171.2694" y="-326.9" font-family="Arial" font-size="14.00" fill="#000000">key_type </text>
-<text text-anchor="start" x="231.181" y="-326.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_type]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-285.5 164.2694,-315.5 416.2694,-315.5 416.2694,-285.5 164.2694,-285.5"/>
-<text text-anchor="start" x="171.2694" y="-296.9" font-family="Arial" font-size="14.00" fill="#000000">key_id </text>
-<text text-anchor="start" x="215.6144" y="-296.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-255.5 164.2694,-285.5 416.2694,-285.5 416.2694,-255.5 164.2694,-255.5"/>
-<text text-anchor="start" x="171.2694" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">key_context </text>
-<text text-anchor="start" x="249.8542" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-225.5 164.2694,-255.5 416.2694,-255.5 416.2694,-225.5 164.2694,-225.5"/>
-<text text-anchor="start" x="171.2694" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">name </text>
-<text text-anchor="start" x="210.1684" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-195.5 164.2694,-225.5 416.2694,-225.5 416.2694,-195.5 164.2694,-195.5"/>
-<text text-anchor="start" x="171.2694" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">associated_data </text>
-<text text-anchor="start" x="277.0912" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-165.5 164.2694,-195.5 416.2694,-195.5 416.2694,-165.5 164.2694,-165.5"/>
-<text text-anchor="start" x="171.2694" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key </text>
-<text text-anchor="start" x="227.275" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-135.5 164.2694,-165.5 416.2694,-165.5 416.2694,-135.5 164.2694,-135.5"/>
-<text text-anchor="start" x="171.2694" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key_nonce </text>
-<text text-anchor="start" x="273.188" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-105.5 164.2694,-135.5 416.2694,-135.5 416.2694,-105.5 164.2694,-105.5"/>
-<text text-anchor="start" x="171.2694" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">parent_key </text>
-<text text-anchor="start" x="244.4068" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-75.5 164.2694,-105.5 416.2694,-105.5 416.2694,-75.5 164.2694,-75.5"/>
-<text text-anchor="start" x="171.2694" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">comment </text>
-<text text-anchor="start" x="232.7196" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-45.5 164.2694,-75.5 416.2694,-75.5 416.2694,-45.5 164.2694,-45.5"/>
-<text text-anchor="start" x="171.2694" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">user_data </text>
-<text text-anchor="start" x="237.4068" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="162.7694,-44.5 162.7694,-502.5 417.7694,-502.5 417.7694,-44.5 162.7694,-44.5"/>
-</g>
-<!-- pgsodium.key&#45;&gt;pgsodium.key -->
-<g id="edge1" class="edge">
-<title>pgsodium.key:parent_key&#45;&gt;pgsodium.key:id</title>
-<path fill="none" stroke="#000000" d="M291.4278,-145.6892C299.2513,-337.1282 298.8652,-792 290.2694,-792 281.5331,-792 281.2772,-633.0714 289.5016,-465.6756"/>
-<polygon fill="#000000" stroke="#000000" points="291.4267,-145.6612 295.4959,-135.4783 291.2134,-140.6658 291,-135.6703 291,-135.6703 291,-135.6703 291.2134,-140.6658 286.5041,-135.8624 291.4267,-145.6612 291.4267,-145.6612"/>
-<text text-anchor="start" x="7.3785" y="-145.6703" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (parent_key) REFERENCES pgsodium.key(id)</text>
-</g>
-<!-- vault.secrets -->
-<g id="node2" class="node">
-<title>vault.secrets</title>
-<polygon fill="#efefef" stroke="transparent" points="148.2694,-865.5 148.2694,-900.5 431.2694,-900.5 431.2694,-865.5 148.2694,-865.5"/>
-<polygon fill="none" stroke="#000000" points="148.2694,-865.5 148.2694,-900.5 431.2694,-900.5 431.2694,-865.5 148.2694,-865.5"/>
-<text text-anchor="start" x="175.4765" y="-878.3" font-family="Arial Bold" font-size="18.00" fill="#000000">vault.secrets</text>
-<text text-anchor="start" x="276.4943" y="-878.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="310.6991" y="-878.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="148.2694,-835.5 148.2694,-865.5 431.2694,-865.5 431.2694,-835.5 148.2694,-835.5"/>
-<text text-anchor="start" x="155.2694" y="-846.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="200.3634" y="-846.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="148.2694,-805.5 148.2694,-835.5 431.2694,-835.5 431.2694,-805.5 148.2694,-805.5"/>
-<text text-anchor="start" x="155.2694" y="-816.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="224.4826" y="-816.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="148.2694,-775.5 148.2694,-805.5 431.2694,-805.5 431.2694,-775.5 148.2694,-775.5"/>
-<text text-anchor="start" x="155.2694" y="-786.9" font-family="Arial" font-size="14.00" fill="#000000">description    </text>
-<text text-anchor="start" x="257.1516" y="-786.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="148.2694,-745.5 148.2694,-775.5 431.2694,-775.5 431.2694,-745.5 148.2694,-745.5"/>
-<text text-anchor="start" x="155.2694" y="-756.9" font-family="Arial" font-size="14.00" fill="#000000">secret    </text>
-<text text-anchor="start" x="227.5906" y="-756.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="148.2694,-715.5 148.2694,-745.5 431.2694,-745.5 431.2694,-715.5 148.2694,-715.5"/>
-<text text-anchor="start" x="155.2694" y="-726.9" font-family="Arial" font-size="14.00" fill="#000000">key_id    </text>
-<text text-anchor="start" x="229.9286" y="-726.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="148.2694,-685.5 148.2694,-715.5 431.2694,-715.5 431.2694,-685.5 148.2694,-685.5"/>
-<text text-anchor="start" x="155.2694" y="-696.9" font-family="Arial" font-size="14.00" fill="#000000">nonce    </text>
-<text text-anchor="start" x="227.6046" y="-696.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="148.2694,-655.5 148.2694,-685.5 431.2694,-685.5 431.2694,-655.5 148.2694,-655.5"/>
-<text text-anchor="start" x="155.2694" y="-666.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="255.6116" y="-666.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="148.2694,-625.5 148.2694,-655.5 431.2694,-655.5 431.2694,-625.5 148.2694,-625.5"/>
-<text text-anchor="start" x="154.8038" y="-636.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="259.0506" y="-636.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- vault.secrets&#45;&gt;pgsodium.key -->
-<g id="edge2" class="edge">
-<title>vault.secrets:key_id&#45;&gt;pgsodium.key:id</title>
-<path fill="none" stroke="#000000" d="M441.2464,-729.6435C494.312,-719.9113 472.0566,-629.6556 431.2694,-583 352.4598,-492.8512 243.0791,-637.1488 164.2694,-547 136.0412,-514.7103 121.3806,-450.5 164.2694,-450.5"/>
-<polygon fill="#000000" stroke="#000000" points="441.2328,-729.6445 430.8845,-726.0165 436.2511,-730.0723 431.2694,-730.5 431.2694,-730.5 431.2694,-730.5 436.2511,-730.0723 431.6544,-734.9835 441.2328,-729.6445 441.2328,-729.6445"/>
-<text text-anchor="start" x="437.9309" y="-740.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (key_id) REFERENCES pgsodium.key(id)</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/pgsodium.mask_columns.md b/docs/database/pgsodium.mask_columns.md
deleted file mode 100644
index 74198bb0a..000000000
--- a/docs/database/pgsodium.mask_columns.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# pgsodium.mask_columns
-
-## Description
-
-<details>
-<summary><strong>Table Definition</strong></summary>
-
-```sql
-CREATE VIEW mask_columns AS (
- SELECT a.attname,
-    a.attrelid,
-    m.key_id,
-    m.key_id_column,
-    m.associated_columns,
-    m.nonce_column,
-    m.format_type
-   FROM (pg_attribute a
-     LEFT JOIN pgsodium.masking_rule m ON (((m.attrelid = a.attrelid) AND (m.attname = a.attname))))
-  WHERE ((a.attnum > 0) AND (NOT a.attisdropped))
-  ORDER BY a.attnum
-)
-```
-
-</details>
-
-## Referenced Tables
-
-- pg_attribute
-- [pgsodium.masking_rule](pgsodium.masking_rule.md)
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| attname | name |  | true |  |  |  |
-| attrelid | oid |  | true |  |  |  |
-| key_id | text |  | true |  |  |  |
-| key_id_column | text |  | true |  |  |  |
-| associated_columns | text |  | true |  |  |  |
-| nonce_column | text |  | true |  |  |  |
-| format_type | text |  | true |  |  |  |
-
-## Relations
-
-![er](pgsodium.mask_columns.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/pgsodium.mask_columns.svg b/docs/database/pgsodium.mask_columns.svg
deleted file mode 100644
index 931fa30af..000000000
--- a/docs/database/pgsodium.mask_columns.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: pgsodium.mask_columns Pages: 1 -->
-<svg width="394pt" height="345pt"
- viewBox="0.00 0.00 394.00 345.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 341)">
-<title>pgsodium.mask_columns</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-341 390,-341 390,4 -4,4"/>
-<!-- pgsodium.mask_columns -->
-<g id="node1" class="node">
-<title>pgsodium.mask_columns</title>
-<polygon fill="#efefef" stroke="transparent" points="46,-255.5 46,-290.5 340,-290.5 340,-255.5 46,-255.5"/>
-<polygon fill="none" stroke="#000000" points="46,-255.5 46,-290.5 340,-290.5 340,-255.5 46,-255.5"/>
-<text text-anchor="start" x="52.6032" y="-268.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.mask_columns</text>
-<text text-anchor="start" x="255.6324" y="-268.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="289.8372" y="-268.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="46,-225.5 46,-255.5 340,-255.5 340,-225.5 46,-225.5"/>
-<text text-anchor="start" x="53" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">attname </text>
-<text text-anchor="start" x="107.4628" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[name]</text>
-<polygon fill="none" stroke="#000000" points="46,-195.5 46,-225.5 340,-225.5 340,-195.5 46,-195.5"/>
-<text text-anchor="start" x="53" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">attrelid </text>
-<text text-anchor="start" x="98.8934" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[oid]</text>
-<polygon fill="none" stroke="#000000" points="46,-165.5 46,-195.5 340,-195.5 340,-165.5 46,-165.5"/>
-<text text-anchor="start" x="53" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">key_id </text>
-<text text-anchor="start" x="97.345" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46,-135.5 46,-165.5 340,-165.5 340,-135.5 46,-135.5"/>
-<text text-anchor="start" x="53" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">key_id_column </text>
-<text text-anchor="start" x="150.2426" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46,-105.5 46,-135.5 340,-135.5 340,-105.5 46,-105.5"/>
-<text text-anchor="start" x="53" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">associated_columns </text>
-<text text-anchor="start" x="183.6984" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46,-75.5 46,-105.5 340,-105.5 340,-75.5 46,-75.5"/>
-<text text-anchor="start" x="53" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">nonce_column </text>
-<text text-anchor="start" x="147.9186" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46,-45.5 46,-75.5 340,-75.5 340,-45.5 46,-45.5"/>
-<text text-anchor="start" x="53" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">format_type </text>
-<text text-anchor="start" x="130.7966" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-292.5 341.5,-292.5 341.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/pgsodium.masking_rule.md b/docs/database/pgsodium.masking_rule.md
deleted file mode 100644
index 339482785..000000000
--- a/docs/database/pgsodium.masking_rule.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# pgsodium.masking_rule
-
-## Description
-
-<details>
-<summary><strong>Table Definition</strong></summary>
-
-```sql
-CREATE VIEW masking_rule AS (
- WITH const AS (
-         SELECT 'encrypt +with +key +id +([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})'::text AS pattern_key_id,
-            'encrypt +with +key +column +([\w\"\-$]+)'::text AS pattern_key_id_column,
-            '(?<=associated) +\(([\w\"\-$, ]+)\)'::text AS pattern_associated_columns,
-            '(?<=nonce) +([\w\"\-$]+)'::text AS pattern_nonce_column,
-            '(?<=decrypt with view) +([\w\"\-$]+\.[\w\"\-$]+)'::text AS pattern_view_name,
-            '(?<=security invoker)'::text AS pattern_security_invoker
-        ), rules_from_seclabels AS (
-         SELECT sl.objoid AS attrelid,
-            sl.objsubid AS attnum,
-            (c.relnamespace)::regnamespace AS relnamespace,
-            c.relname,
-            a.attname,
-            format_type(a.atttypid, a.atttypmod) AS format_type,
-            sl.label AS col_description,
-            (regexp_match(sl.label, k.pattern_key_id_column, 'i'::text))[1] AS key_id_column,
-            (regexp_match(sl.label, k.pattern_key_id, 'i'::text))[1] AS key_id,
-            (regexp_match(sl.label, k.pattern_associated_columns, 'i'::text))[1] AS associated_columns,
-            (regexp_match(sl.label, k.pattern_nonce_column, 'i'::text))[1] AS nonce_column,
-            COALESCE((regexp_match(sl2.label, k.pattern_view_name, 'i'::text))[1], (((c.relnamespace)::regnamespace || '.'::text) || quote_ident(('decrypted_'::text || (c.relname)::text)))) AS view_name,
-            100 AS priority,
-            ((regexp_match(sl.label, k.pattern_security_invoker, 'i'::text))[1] IS NOT NULL) AS security_invoker
-           FROM const k,
-            (((pg_seclabel sl
-             JOIN pg_class c ON (((sl.classoid = c.tableoid) AND (sl.objoid = c.oid))))
-             JOIN pg_attribute a ON (((a.attrelid = c.oid) AND (sl.objsubid = a.attnum))))
-             LEFT JOIN pg_seclabel sl2 ON (((sl2.objoid = c.oid) AND (sl2.objsubid = 0))))
-          WHERE ((a.attnum > 0) AND (((c.relnamespace)::regnamespace)::oid <> ('pg_catalog'::regnamespace)::oid) AND (NOT a.attisdropped) AND (sl.label ~~* 'ENCRYPT%'::text) AND (sl.provider = 'pgsodium'::text))
-        )
- SELECT DISTINCT ON (rules_from_seclabels.attrelid, rules_from_seclabels.attnum) rules_from_seclabels.attrelid,
-    rules_from_seclabels.attnum,
-    rules_from_seclabels.relnamespace,
-    rules_from_seclabels.relname,
-    rules_from_seclabels.attname,
-    rules_from_seclabels.format_type,
-    rules_from_seclabels.col_description,
-    rules_from_seclabels.key_id_column,
-    rules_from_seclabels.key_id,
-    rules_from_seclabels.associated_columns,
-    rules_from_seclabels.nonce_column,
-    rules_from_seclabels.view_name,
-    rules_from_seclabels.priority,
-    rules_from_seclabels.security_invoker
-   FROM rules_from_seclabels
-  ORDER BY rules_from_seclabels.attrelid, rules_from_seclabels.attnum, rules_from_seclabels.priority DESC
-)
-```
-
-</details>
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| attrelid | oid |  | true |  |  |  |
-| attnum | integer |  | true |  |  |  |
-| relnamespace | regnamespace |  | true |  |  |  |
-| relname | name |  | true |  |  |  |
-| attname | name |  | true |  |  |  |
-| format_type | text |  | true |  |  |  |
-| col_description | text |  | true |  |  |  |
-| key_id_column | text |  | true |  |  |  |
-| key_id | text |  | true |  |  |  |
-| associated_columns | text |  | true |  |  |  |
-| nonce_column | text |  | true |  |  |  |
-| view_name | text |  | true |  |  |  |
-| priority | integer |  | true |  |  |  |
-| security_invoker | boolean |  | true |  |  |  |
-
-## Relations
-
-![er](pgsodium.masking_rule.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/pgsodium.masking_rule.svg b/docs/database/pgsodium.masking_rule.svg
deleted file mode 100644
index ade669e03..000000000
--- a/docs/database/pgsodium.masking_rule.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: pgsodium.masking_rule Pages: 1 -->
-<svg width="381pt" height="555pt"
- viewBox="0.00 0.00 381.00 555.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 551)">
-<title>pgsodium.masking_rule</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-551 377,-551 377,4 -4,4"/>
-<!-- pgsodium.masking_rule -->
-<g id="node1" class="node">
-<title>pgsodium.masking_rule</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-465.5 46.5,-500.5 327.5,-500.5 327.5,-465.5 46.5,-465.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-465.5 46.5,-500.5 327.5,-500.5 327.5,-465.5 46.5,-465.5"/>
-<text text-anchor="start" x="53.103" y="-478.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.masking_rule</text>
-<text text-anchor="start" x="243.1326" y="-478.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="277.3374" y="-478.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-435.5 46.5,-465.5 327.5,-465.5 327.5,-435.5 46.5,-435.5"/>
-<text text-anchor="start" x="53.5" y="-446.9" font-family="Arial" font-size="14.00" fill="#000000">attrelid </text>
-<text text-anchor="start" x="99.3934" y="-446.9" font-family="Arial" font-size="14.00" fill="#666666">[oid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-405.5 46.5,-435.5 327.5,-435.5 327.5,-405.5 46.5,-405.5"/>
-<text text-anchor="start" x="53.5" y="-416.9" font-family="Arial" font-size="14.00" fill="#000000">attnum </text>
-<text text-anchor="start" x="100.1802" y="-416.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-375.5 46.5,-405.5 327.5,-405.5 327.5,-375.5 46.5,-375.5"/>
-<text text-anchor="start" x="53.5" y="-386.9" font-family="Arial" font-size="14.00" fill="#000000">relnamespace </text>
-<text text-anchor="start" x="145.2966" y="-386.9" font-family="Arial" font-size="14.00" fill="#666666">[regnamespace]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-345.5 46.5,-375.5 327.5,-375.5 327.5,-345.5 46.5,-345.5"/>
-<text text-anchor="start" x="53.5" y="-356.9" font-family="Arial" font-size="14.00" fill="#000000">relname </text>
-<text text-anchor="start" x="107.9488" y="-356.9" font-family="Arial" font-size="14.00" fill="#666666">[name]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-315.5 46.5,-345.5 327.5,-345.5 327.5,-315.5 46.5,-315.5"/>
-<text text-anchor="start" x="53.5" y="-326.9" font-family="Arial" font-size="14.00" fill="#000000">attname </text>
-<text text-anchor="start" x="107.9628" y="-326.9" font-family="Arial" font-size="14.00" fill="#666666">[name]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-285.5 46.5,-315.5 327.5,-315.5 327.5,-285.5 46.5,-285.5"/>
-<text text-anchor="start" x="53.5" y="-296.9" font-family="Arial" font-size="14.00" fill="#000000">format_type </text>
-<text text-anchor="start" x="131.2966" y="-296.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-255.5 46.5,-285.5 327.5,-285.5 327.5,-255.5 46.5,-255.5"/>
-<text text-anchor="start" x="53.5" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">col_description </text>
-<text text-anchor="start" x="150.7398" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-225.5 46.5,-255.5 327.5,-255.5 327.5,-225.5 46.5,-225.5"/>
-<text text-anchor="start" x="53.5" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">key_id_column </text>
-<text text-anchor="start" x="150.7426" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-195.5 46.5,-225.5 327.5,-225.5 327.5,-195.5 46.5,-195.5"/>
-<text text-anchor="start" x="53.5" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">key_id </text>
-<text text-anchor="start" x="97.845" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-195.5 327.5,-195.5 327.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">associated_columns </text>
-<text text-anchor="start" x="184.1984" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 327.5,-165.5 327.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">nonce_column </text>
-<text text-anchor="start" x="148.4186" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 327.5,-135.5 327.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">view_name </text>
-<text text-anchor="start" x="128.1774" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 327.5,-105.5 327.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">priority </text>
-<text text-anchor="start" x="99.3808" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 327.5,-75.5 327.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">security_invoker </text>
-<text text-anchor="start" x="158.5112" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-502.5 328.5,-502.5 328.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/pgsodium.valid_key.md b/docs/database/pgsodium.valid_key.md
deleted file mode 100644
index 666f5b9a0..000000000
--- a/docs/database/pgsodium.valid_key.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# pgsodium.valid_key
-
-## Description
-
-<details>
-<summary><strong>Table Definition</strong></summary>
-
-```sql
-CREATE VIEW valid_key AS (
- SELECT key.id,
-    key.name,
-    key.status,
-    key.key_type,
-    key.key_id,
-    key.key_context,
-    key.created,
-    key.expires,
-    key.associated_data
-   FROM pgsodium.key
-  WHERE ((key.status = ANY (ARRAY['valid'::pgsodium.key_status, 'default'::pgsodium.key_status])) AND
-        CASE
-            WHEN (key.expires IS NULL) THEN true
-            ELSE (key.expires > now())
-        END)
-)
-```
-
-</details>
-
-## Referenced Tables
-
-- [pgsodium.key](pgsodium.key.md)
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid |  | true |  |  |  |
-| name | text |  | true |  |  |  |
-| status | pgsodium.key_status |  | true |  |  |  |
-| key_type | pgsodium.key_type |  | true |  |  |  |
-| key_id | bigint |  | true |  |  |  |
-| key_context | bytea |  | true |  |  |  |
-| created | timestamp with time zone |  | true |  |  |  |
-| expires | timestamp with time zone |  | true |  |  |  |
-| associated_data | text |  | true |  |  |  |
-
-## Relations
-
-![er](pgsodium.valid_key.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/pgsodium.valid_key.svg b/docs/database/pgsodium.valid_key.svg
deleted file mode 100644
index 807fa951e..000000000
--- a/docs/database/pgsodium.valid_key.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: pgsodium.valid_key Pages: 1 -->
-<svg width="349pt" height="405pt"
- viewBox="0.00 0.00 349.00 405.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 401)">
-<title>pgsodium.valid_key</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-401 345,-401 345,4 -4,4"/>
-<!-- pgsodium.valid_key -->
-<g id="node1" class="node">
-<title>pgsodium.valid_key</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-315.5 46.5,-350.5 295.5,-350.5 295.5,-315.5 46.5,-315.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-315.5 46.5,-350.5 295.5,-350.5 295.5,-315.5 46.5,-315.5"/>
-<text text-anchor="start" x="53.1014" y="-328.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.valid_key</text>
-<text text-anchor="start" x="211.1342" y="-328.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="245.339" y="-328.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-285.5 46.5,-315.5 295.5,-315.5 295.5,-285.5 46.5,-285.5"/>
-<text text-anchor="start" x="53.5" y="-296.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="68.2798" y="-296.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-255.5 46.5,-285.5 295.5,-285.5 295.5,-255.5 46.5,-255.5"/>
-<text text-anchor="start" x="53.5" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">name </text>
-<text text-anchor="start" x="92.399" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-225.5 46.5,-255.5 295.5,-255.5 295.5,-225.5 46.5,-225.5"/>
-<text text-anchor="start" x="53.5" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">status </text>
-<text text-anchor="start" x="94.737" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_status]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-195.5 46.5,-225.5 295.5,-225.5 295.5,-195.5 46.5,-195.5"/>
-<text text-anchor="start" x="53.5" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">key_type </text>
-<text text-anchor="start" x="113.4116" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_type]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-195.5 295.5,-195.5 295.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">key_id </text>
-<text text-anchor="start" x="97.845" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 295.5,-165.5 295.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">key_context </text>
-<text text-anchor="start" x="132.0848" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 295.5,-135.5 295.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">created </text>
-<text text-anchor="start" x="104.0722" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 295.5,-105.5 295.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">expires </text>
-<text text-anchor="start" x="102.5056" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 295.5,-75.5 295.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">associated_data </text>
-<text text-anchor="start" x="159.3218" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-352.5 296.5,-352.5 296.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.app_config.md b/docs/database/public.app_config.md
deleted file mode 100644
index 05b404751..000000000
--- a/docs/database/public.app_config.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# public.app_config
-
-## Description
-
-Stores app config for different envs
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | text |  | false |  |  |  |
-| app_min_version | text |  | false |  |  |  |
-| app_privacy | jsonb |  | false |  |  |  |
-| app_terms | jsonb |  | false |  |  |  |
-| designer_privacy | jsonb |  | false |  |  |  |
-| designer_terms | jsonb |  | false |  |  |  |
-| imprint | jsonb |  | false |  |  |  |
-| contact | jsonb | '{"email": "hpi-info@hpi.de", "phone": "+49-(0)331 5509-0", "website": "https://hpi.de/", "organization": "Hasso Plattner Institute"}'::jsonb | false |  |  |  |
-| analytics | jsonb |  | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| AppConfig_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| AppConfig_pkey | CREATE UNIQUE INDEX "AppConfig_pkey" ON public.app_config USING btree (id) |
-
-## Relations
-
-![er](public.app_config.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.app_config.svg b/docs/database/public.app_config.svg
deleted file mode 100644
index 7c1a3cfa0..000000000
--- a/docs/database/public.app_config.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.app_config Pages: 1 -->
-<svg width="381pt" height="405pt"
- viewBox="0.00 0.00 381.00 405.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 401)">
-<title>public.app_config</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-401 377,-401 377,4 -4,4"/>
-<!-- public.app_config -->
-<g id="node1" class="node">
-<title>public.app_config</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-315.5 46.5,-350.5 327.5,-350.5 327.5,-315.5 46.5,-315.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-315.5 46.5,-350.5 327.5,-350.5 327.5,-315.5 46.5,-315.5"/>
-<text text-anchor="start" x="53.1915" y="-328.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.app_config</text>
-<text text-anchor="start" x="193.2405" y="-328.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="227.4453" y="-328.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-285.5 46.5,-315.5 327.5,-315.5 327.5,-285.5 46.5,-285.5"/>
-<text text-anchor="start" x="53.5" y="-296.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="68.2798" y="-296.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-255.5 46.5,-285.5 327.5,-285.5 327.5,-255.5 46.5,-255.5"/>
-<text text-anchor="start" x="53.5" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">app_min_version </text>
-<text text-anchor="start" x="163.9684" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-225.5 46.5,-255.5 327.5,-255.5 327.5,-225.5 46.5,-225.5"/>
-<text text-anchor="start" x="53.5" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">app_privacy </text>
-<text text-anchor="start" x="132.8534" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-195.5 46.5,-225.5 327.5,-225.5 327.5,-195.5 46.5,-195.5"/>
-<text text-anchor="start" x="53.5" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">app_terms </text>
-<text text-anchor="start" x="123.5154" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-195.5 327.5,-195.5 327.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">designer_privacy </text>
-<text text-anchor="start" x="163.1858" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 327.5,-165.5 327.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">designer_terms </text>
-<text text-anchor="start" x="153.8478" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 327.5,-135.5 327.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">imprint </text>
-<text text-anchor="start" x="99.3808" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 327.5,-105.5 327.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">contact </text>
-<text text-anchor="start" x="102.5196" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 327.5,-75.5 327.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">analytics </text>
-<text text-anchor="start" x="111.8422" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-352.5 328.5,-352.5 328.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.repo.md b/docs/database/public.repo.md
deleted file mode 100644
index 9e45555ca..000000000
--- a/docs/database/public.repo.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# public.repo
-
-## Description
-
-Git repo where the generated project is stored
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| project_id | text |  | false |  |  |  |
-| user_id | uuid |  | false |  | [public.user](public.user.md) |  |
-| study_id | uuid |  | false |  | [public.study](public.study.md) |  |
-| provider | git_provider |  | false |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| repo_studyId_fkey | FOREIGN KEY | FOREIGN KEY (study_id) REFERENCES study(id) |
-| repo_pkey | PRIMARY KEY | PRIMARY KEY (project_id) |
-| repo_userId_fkey | FOREIGN KEY | FOREIGN KEY (user_id) REFERENCES "user"(id) ON DELETE CASCADE |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| repo_pkey | CREATE UNIQUE INDEX repo_pkey ON public.repo USING btree (project_id) |
-
-## Relations
-
-![er](public.repo.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.repo.svg b/docs/database/public.repo.svg
deleted file mode 100644
index ac7efbd9a..000000000
--- a/docs/database/public.repo.svg
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.repo Pages: 1 -->
-<svg width="837pt" height="1042pt"
- viewBox="0.00 0.00 836.50 1042.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1038)">
-<title>public.repo</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1038 832.5,-1038 832.5,4 -4,4"/>
-<!-- public.repo -->
-<g id="node1" class="node">
-<title>public.repo</title>
-<polygon fill="#efefef" stroke="transparent" points="349,-952.5 349,-987.5 578,-987.5 578,-952.5 349,-952.5"/>
-<polygon fill="none" stroke="#000000" points="349,-952.5 349,-987.5 578,-987.5 578,-952.5 349,-952.5"/>
-<text text-anchor="start" x="355.706" y="-965.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.repo</text>
-<text text-anchor="start" x="443.726" y="-965.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="477.9308" y="-965.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="349,-922.5 349,-952.5 578,-952.5 578,-922.5 349,-922.5"/>
-<text text-anchor="start" x="356" y="-933.9" font-family="Arial" font-size="14.00" fill="#000000">project_id </text>
-<text text-anchor="start" x="420.568" y="-933.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="349,-892.5 349,-922.5 578,-922.5 578,-892.5 349,-892.5"/>
-<text text-anchor="start" x="356" y="-903.9" font-family="Arial" font-size="14.00" fill="#000000">user_id </text>
-<text text-anchor="start" x="405.7882" y="-903.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="349,-862.5 349,-892.5 578,-892.5 578,-862.5 349,-862.5"/>
-<text text-anchor="start" x="356" y="-873.9" font-family="Arial" font-size="14.00" fill="#000000">study_id </text>
-<text text-anchor="start" x="412.0182" y="-873.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="349,-832.5 349,-862.5 578,-862.5 578,-832.5 349,-832.5"/>
-<text text-anchor="start" x="356" y="-843.9" font-family="Arial" font-size="14.00" fill="#000000">provider </text>
-<text text-anchor="start" x="410.4488" y="-843.9" font-family="Arial" font-size="14.00" fill="#666666">[git_provider]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="347,-831.5 347,-989.5 579,-989.5 579,-831.5 347,-831.5"/>
-</g>
-<!-- public.user -->
-<g id="node2" class="node">
-<title>public.user</title>
-<polygon fill="#efefef" stroke="transparent" points="170,-402.5 170,-437.5 398,-437.5 398,-402.5 170,-402.5"/>
-<polygon fill="none" stroke="#000000" points="170,-402.5 170,-437.5 398,-437.5 398,-402.5 170,-402.5"/>
-<text text-anchor="start" x="176.7091" y="-415.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.user</text>
-<text text-anchor="start" x="263.7229" y="-415.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="297.9277" y="-415.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="170,-372.5 170,-402.5 398,-402.5 398,-372.5 170,-372.5"/>
-<text text-anchor="start" x="177" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="222.094" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="170,-342.5 170,-372.5 398,-372.5 398,-342.5 170,-342.5"/>
-<text text-anchor="start" x="177" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">email    </text>
-<text text-anchor="start" x="244.6438" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="170,-312.5 170,-342.5 398,-342.5 398,-312.5 170,-312.5"/>
-<text text-anchor="start" x="177" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">preferences    </text>
-<text text-anchor="start" x="285.1122" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- public.repo&#45;&gt;public.user -->
-<g id="edge1" class="edge">
-<title>public.repo:user_id&#45;&gt;public.user:id</title>
-<path fill="none" stroke="#000000" d="M338.9896,-905.9147C250.6401,-874.5244 510.327,-387.5 398,-387.5"/>
-<polygon fill="#000000" stroke="#000000" points="339.1231,-905.9357 348.2961,-911.9446 344.0615,-906.7179 349,-907.5 349,-907.5 349,-907.5 344.0615,-906.7179 349.7039,-903.0554 339.1231,-905.9357 339.1231,-905.9357"/>
-<text text-anchor="start" x="7.0045" y="-917.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (user_id) REFERENCES &quot;user&quot;(id) ON DELETE CASCADE</text>
-</g>
-<!-- public.study -->
-<g id="node3" class="node">
-<title>public.study</title>
-<polygon fill="#efefef" stroke="transparent" points="503,-672.5 503,-707.5 786,-707.5 786,-672.5 503,-672.5"/>
-<polygon fill="none" stroke="#000000" points="503,-672.5 503,-707.5 786,-707.5 786,-672.5 503,-672.5"/>
-<text text-anchor="start" x="533.2041" y="-685.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study</text>
-<text text-anchor="start" x="628.2279" y="-685.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="662.4327" y="-685.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="503,-642.5 503,-672.5 786,-672.5 786,-642.5 503,-642.5"/>
-<text text-anchor="start" x="510" y="-653.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="555.094" y="-653.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="503,-612.5 503,-642.5 786,-642.5 786,-612.5 503,-612.5"/>
-<text text-anchor="start" x="510" y="-623.9" font-family="Arial" font-size="14.00" fill="#000000">contact    </text>
-<text text-anchor="start" x="589.3338" y="-623.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="503,-582.5 503,-612.5 786,-612.5 786,-582.5 503,-582.5"/>
-<text text-anchor="start" x="510" y="-593.9" font-family="Arial" font-size="14.00" fill="#000000">title    </text>
-<text text-anchor="start" x="565.9818" y="-593.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="503,-552.5 503,-582.5 786,-582.5 786,-552.5 503,-552.5"/>
-<text text-anchor="start" x="510" y="-563.9" font-family="Arial" font-size="14.00" fill="#000000">description    </text>
-<text text-anchor="start" x="611.8822" y="-563.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="503,-522.5 503,-552.5 786,-552.5 786,-522.5 503,-522.5"/>
-<text text-anchor="start" x="510" y="-533.9" font-family="Arial" font-size="14.00" fill="#000000">icon_name    </text>
-<text text-anchor="start" x="612.6676" y="-533.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="503,-492.5 503,-522.5 786,-522.5 786,-492.5 503,-492.5"/>
-<text text-anchor="start" x="510" y="-503.9" font-family="Arial" font-size="14.00" fill="#000000">published    </text>
-<text text-anchor="start" x="604.1136" y="-503.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="503,-462.5 503,-492.5 786,-492.5 786,-462.5 503,-462.5"/>
-<text text-anchor="start" x="510" y="-473.9" font-family="Arial" font-size="14.00" fill="#000000">registry_published    </text>
-<text text-anchor="start" x="657.7798" y="-473.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="503,-432.5 503,-462.5 786,-462.5 786,-432.5 503,-432.5"/>
-<text text-anchor="start" x="510" y="-443.9" font-family="Arial" font-size="14.00" fill="#000000">questionnaire    </text>
-<text text-anchor="start" x="628.23" y="-443.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="503,-402.5 503,-432.5 786,-432.5 786,-402.5 503,-402.5"/>
-<text text-anchor="start" x="510" y="-413.9" font-family="Arial" font-size="14.00" fill="#000000">eligibility_criteria    </text>
-<text text-anchor="start" x="646.8556" y="-413.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="503,-372.5 503,-402.5 786,-402.5 786,-372.5 503,-372.5"/>
-<text text-anchor="start" x="510" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">observations    </text>
-<text text-anchor="start" x="623.5582" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="503,-342.5 503,-372.5 786,-372.5 786,-342.5 503,-342.5"/>
-<text text-anchor="start" x="510" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">interventions    </text>
-<text text-anchor="start" x="623.5554" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="503,-312.5 503,-342.5 786,-342.5 786,-312.5 503,-312.5"/>
-<text text-anchor="start" x="510" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">consent    </text>
-<text text-anchor="start" x="593.2258" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="503,-282.5 503,-312.5 786,-312.5 786,-282.5 503,-282.5"/>
-<text text-anchor="start" x="510" y="-293.9" font-family="Arial" font-size="14.00" fill="#000000">schedule    </text>
-<text text-anchor="start" x="600.2244" y="-293.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="503,-252.5 503,-282.5 786,-282.5 786,-252.5 503,-252.5"/>
-<text text-anchor="start" x="510" y="-263.9" font-family="Arial" font-size="14.00" fill="#000000">report_specification    </text>
-<text text-anchor="start" x="665.561" y="-263.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="503,-222.5 503,-252.5 786,-252.5 786,-222.5 503,-222.5"/>
-<text text-anchor="start" x="510" y="-233.9" font-family="Arial" font-size="14.00" fill="#000000">results    </text>
-<text text-anchor="start" x="585.4278" y="-233.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="503,-192.5 503,-222.5 786,-222.5 786,-192.5 503,-192.5"/>
-<text text-anchor="start" x="510" y="-203.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="610.3422" y="-203.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="503,-162.5 503,-192.5 786,-192.5 786,-162.5 503,-162.5"/>
-<text text-anchor="start" x="509.5344" y="-173.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="613.7812" y="-173.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="503,-132.5 503,-162.5 786,-162.5 786,-132.5 503,-132.5"/>
-<text text-anchor="start" x="510" y="-143.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="590.1024" y="-143.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="503,-102.5 503,-132.5 786,-132.5 786,-102.5 503,-102.5"/>
-<text text-anchor="start" x="510" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">participation    </text>
-<text text-anchor="start" x="619.662" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[participation]</text>
-<polygon fill="none" stroke="#000000" points="503,-72.5 503,-102.5 786,-102.5 786,-72.5 503,-72.5"/>
-<text text-anchor="start" x="510" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">result_sharing    </text>
-<text text-anchor="start" x="632.108" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[result_sharing]</text>
-<polygon fill="none" stroke="#000000" points="503,-42.5 503,-72.5 786,-72.5 786,-42.5 503,-42.5"/>
-<text text-anchor="start" x="510" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">collaborator_emails    </text>
-<text text-anchor="start" x="665.547" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- public.repo&#45;&gt;public.study -->
-<g id="edge2" class="edge">
-<title>public.repo:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M588.1477,-875.9582C614.5252,-866.6871 597.3294,-817.7189 578,-787 558.3084,-755.7054 522.6916,-782.2946 503,-751 480.8686,-715.8281 461.4444,-657.5 503,-657.5"/>
-<polygon fill="#000000" stroke="#000000" points="587.8865,-875.9978 577.324,-873.0511 582.9433,-876.7489 578,-877.5 578,-877.5 578,-877.5 582.9433,-876.7489 578.676,-881.9489 587.8865,-875.9978 587.8865,-875.9978"/>
-<text text-anchor="start" x="585.3845" y="-887.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id)</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.study.md b/docs/database/public.study.md
deleted file mode 100644
index 96eddd9f7..000000000
--- a/docs/database/public.study.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# public.study
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid | gen_random_uuid() | false | [public.study_subject](public.study_subject.md) [public.repo](public.repo.md) [public.study_invite](public.study_invite.md) |  |  |
-| contact | jsonb |  | false |  |  |  |
-| title | text |  | false |  |  |  |
-| description | text |  | false |  |  |  |
-| icon_name | text |  | false |  |  |  |
-| published | boolean | false | false |  |  |  |
-| registry_published | boolean | false | false |  |  |  |
-| questionnaire | jsonb |  | false |  |  |  |
-| eligibility_criteria | jsonb |  | false |  |  |  |
-| observations | jsonb |  | false |  |  |  |
-| interventions | jsonb |  | false |  |  |  |
-| consent | jsonb |  | false |  |  |  |
-| schedule | jsonb |  | false |  |  |  |
-| report_specification | jsonb |  | false |  |  |  |
-| results | jsonb |  | false |  |  |  |
-| created_at | timestamp with time zone | now() | false |  |  |  |
-| updated_at | timestamp with time zone | now() | false |  |  |  |
-| user_id | uuid |  | false |  | [public.user](public.user.md) | UserId of study creator |
-| participation | participation | 'invite'::participation | false |  |  |  |
-| result_sharing | result_sharing | 'private'::result_sharing | false |  |  |  |
-| collaborator_emails | text[] | '{}'::text[] | false |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| study_id_key | UNIQUE | UNIQUE (id) |
-| study_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-| study_userId_fkey | FOREIGN KEY | FOREIGN KEY (user_id) REFERENCES "user"(id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| study_id_key | CREATE UNIQUE INDEX study_id_key ON public.study USING btree (id) |
-| study_pkey | CREATE UNIQUE INDEX study_pkey ON public.study USING btree (id) |
-
-## Triggers
-
-| Name | Definition |
-| ---- | ---------- |
-| handle_updated_at | CREATE TRIGGER handle_updated_at BEFORE UPDATE ON public.study FOR EACH ROW EXECUTE FUNCTION moddatetime('updated_at') |
-
-## Relations
-
-![er](public.study.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.study.svg b/docs/database/public.study.svg
deleted file mode 100644
index dec6fcf50..000000000
--- a/docs/database/public.study.svg
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.study Pages: 1 -->
-<svg width="1143pt" height="1379pt"
- viewBox="0.00 0.00 1142.50 1379.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1375)">
-<title>public.study</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1375 1138.5,-1375 1138.5,4 -4,4"/>
-<!-- public.study -->
-<g id="node1" class="node">
-<title>public.study</title>
-<polygon fill="#efefef" stroke="transparent" points="438.5,-922.5 438.5,-957.5 691.5,-957.5 691.5,-922.5 438.5,-922.5"/>
-<polygon fill="none" stroke="#000000" points="438.5,-922.5 438.5,-957.5 691.5,-957.5 691.5,-922.5 438.5,-922.5"/>
-<text text-anchor="start" x="453.7041" y="-935.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study</text>
-<text text-anchor="start" x="548.7279" y="-935.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="582.9327" y="-935.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-892.5 438.5,-922.5 691.5,-922.5 691.5,-892.5 438.5,-892.5"/>
-<text text-anchor="start" x="445.5" y="-903.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="460.2798" y="-903.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-862.5 438.5,-892.5 691.5,-892.5 691.5,-862.5 438.5,-862.5"/>
-<text text-anchor="start" x="445.5" y="-873.9" font-family="Arial" font-size="14.00" fill="#000000">contact </text>
-<text text-anchor="start" x="494.5196" y="-873.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-832.5 438.5,-862.5 691.5,-862.5 691.5,-832.5 438.5,-832.5"/>
-<text text-anchor="start" x="445.5" y="-843.9" font-family="Arial" font-size="14.00" fill="#000000">title </text>
-<text text-anchor="start" x="471.1676" y="-843.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-802.5 438.5,-832.5 691.5,-832.5 691.5,-802.5 438.5,-802.5"/>
-<text text-anchor="start" x="445.5" y="-813.9" font-family="Arial" font-size="14.00" fill="#000000">description </text>
-<text text-anchor="start" x="517.068" y="-813.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-772.5 438.5,-802.5 691.5,-802.5 691.5,-772.5 438.5,-772.5"/>
-<text text-anchor="start" x="445.5" y="-783.9" font-family="Arial" font-size="14.00" fill="#000000">icon_name </text>
-<text text-anchor="start" x="517.8534" y="-783.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-742.5 438.5,-772.5 691.5,-772.5 691.5,-742.5 438.5,-742.5"/>
-<text text-anchor="start" x="445.5" y="-753.9" font-family="Arial" font-size="14.00" fill="#000000">published </text>
-<text text-anchor="start" x="509.2994" y="-753.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-712.5 438.5,-742.5 691.5,-742.5 691.5,-712.5 438.5,-712.5"/>
-<text text-anchor="start" x="445.5" y="-723.9" font-family="Arial" font-size="14.00" fill="#000000">registry_published </text>
-<text text-anchor="start" x="562.9656" y="-723.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-682.5 438.5,-712.5 691.5,-712.5 691.5,-682.5 438.5,-682.5"/>
-<text text-anchor="start" x="445.5" y="-693.9" font-family="Arial" font-size="14.00" fill="#000000">questionnaire </text>
-<text text-anchor="start" x="533.4158" y="-693.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-652.5 438.5,-682.5 691.5,-682.5 691.5,-652.5 438.5,-652.5"/>
-<text text-anchor="start" x="445.5" y="-663.9" font-family="Arial" font-size="14.00" fill="#000000">eligibility_criteria </text>
-<text text-anchor="start" x="552.0414" y="-663.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-622.5 438.5,-652.5 691.5,-652.5 691.5,-622.5 438.5,-622.5"/>
-<text text-anchor="start" x="445.5" y="-633.9" font-family="Arial" font-size="14.00" fill="#000000">observations </text>
-<text text-anchor="start" x="528.744" y="-633.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-592.5 438.5,-622.5 691.5,-622.5 691.5,-592.5 438.5,-592.5"/>
-<text text-anchor="start" x="445.5" y="-603.9" font-family="Arial" font-size="14.00" fill="#000000">interventions </text>
-<text text-anchor="start" x="528.7412" y="-603.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-562.5 438.5,-592.5 691.5,-592.5 691.5,-562.5 438.5,-562.5"/>
-<text text-anchor="start" x="445.5" y="-573.9" font-family="Arial" font-size="14.00" fill="#000000">consent </text>
-<text text-anchor="start" x="498.4116" y="-573.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-532.5 438.5,-562.5 691.5,-562.5 691.5,-532.5 438.5,-532.5"/>
-<text text-anchor="start" x="445.5" y="-543.9" font-family="Arial" font-size="14.00" fill="#000000">schedule </text>
-<text text-anchor="start" x="505.4102" y="-543.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-502.5 438.5,-532.5 691.5,-532.5 691.5,-502.5 438.5,-502.5"/>
-<text text-anchor="start" x="445.5" y="-513.9" font-family="Arial" font-size="14.00" fill="#000000">report_specification </text>
-<text text-anchor="start" x="570.7468" y="-513.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-472.5 438.5,-502.5 691.5,-502.5 691.5,-472.5 438.5,-472.5"/>
-<text text-anchor="start" x="445.5" y="-483.9" font-family="Arial" font-size="14.00" fill="#000000">results </text>
-<text text-anchor="start" x="490.6136" y="-483.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-442.5 438.5,-472.5 691.5,-472.5 691.5,-442.5 438.5,-442.5"/>
-<text text-anchor="start" x="445.5" y="-453.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="515.528" y="-453.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-412.5 438.5,-442.5 691.5,-442.5 691.5,-412.5 438.5,-412.5"/>
-<text text-anchor="start" x="445.1915" y="-423.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at </text>
-<text text-anchor="start" x="519.1241" y="-423.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-382.5 438.5,-412.5 691.5,-412.5 691.5,-382.5 438.5,-382.5"/>
-<text text-anchor="start" x="445.5" y="-393.9" font-family="Arial" font-size="14.00" fill="#000000">user_id </text>
-<text text-anchor="start" x="495.2882" y="-393.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-352.5 438.5,-382.5 691.5,-382.5 691.5,-352.5 438.5,-352.5"/>
-<text text-anchor="start" x="445.5" y="-363.9" font-family="Arial" font-size="14.00" fill="#000000">participation </text>
-<text text-anchor="start" x="524.8478" y="-363.9" font-family="Arial" font-size="14.00" fill="#666666">[participation]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-322.5 438.5,-352.5 691.5,-352.5 691.5,-322.5 438.5,-322.5"/>
-<text text-anchor="start" x="445.5" y="-333.9" font-family="Arial" font-size="14.00" fill="#000000">result_sharing </text>
-<text text-anchor="start" x="537.2938" y="-333.9" font-family="Arial" font-size="14.00" fill="#666666">[result_sharing]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-292.5 438.5,-322.5 691.5,-322.5 691.5,-292.5 438.5,-292.5"/>
-<text text-anchor="start" x="445.5" y="-303.9" font-family="Arial" font-size="14.00" fill="#000000">collaborator_emails </text>
-<text text-anchor="start" x="570.7328" y="-303.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="436.5,-291.5 436.5,-959.5 692.5,-959.5 692.5,-291.5 436.5,-291.5"/>
-</g>
-<!-- public.user -->
-<g id="node5" class="node">
-<title>public.user</title>
-<polygon fill="#efefef" stroke="transparent" points="451.5,-132.5 451.5,-167.5 679.5,-167.5 679.5,-132.5 451.5,-132.5"/>
-<polygon fill="none" stroke="#000000" points="451.5,-132.5 451.5,-167.5 679.5,-167.5 679.5,-132.5 451.5,-132.5"/>
-<text text-anchor="start" x="458.2091" y="-145.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.user</text>
-<text text-anchor="start" x="545.2229" y="-145.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="579.4277" y="-145.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="451.5,-102.5 451.5,-132.5 679.5,-132.5 679.5,-102.5 451.5,-102.5"/>
-<text text-anchor="start" x="458.5" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="503.594" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="451.5,-72.5 451.5,-102.5 679.5,-102.5 679.5,-72.5 451.5,-72.5"/>
-<text text-anchor="start" x="458.5" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">email    </text>
-<text text-anchor="start" x="526.1438" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="451.5,-42.5 451.5,-72.5 679.5,-72.5 679.5,-42.5 451.5,-42.5"/>
-<text text-anchor="start" x="458.5" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">preferences    </text>
-<text text-anchor="start" x="566.6122" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- public.study&#45;&gt;public.user -->
-<g id="edge4" class="edge">
-<title>public.study:user_id&#45;&gt;public.user:id</title>
-<path fill="none" stroke="#000000" d="M701.6767,-396.6288C755.786,-386.7296 732.7617,-294.9126 691.5,-247 621.1153,-165.2701 521.8847,-292.7299 451.5,-211 424.3827,-179.5117 409.9444,-117.5 451.5,-117.5"/>
-<polygon fill="#000000" stroke="#000000" points="701.4636,-396.647 691.1161,-393.0164 696.4818,-397.0735 691.5,-397.5 691.5,-397.5 691.5,-397.5 696.4818,-397.0735 691.8839,-401.9836 701.4636,-396.647 701.4636,-396.647"/>
-<text text-anchor="start" x="698.7855" y="-407.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (user_id) REFERENCES &quot;user&quot;(id)</text>
-</g>
-<!-- public.study_subject -->
-<g id="node2" class="node">
-<title>public.study_subject</title>
-<polygon fill="#efefef" stroke="transparent" points="43.5,-1292.5 43.5,-1327.5 346.5,-1327.5 346.5,-1292.5 43.5,-1292.5"/>
-<polygon fill="none" stroke="#000000" points="43.5,-1292.5 43.5,-1327.5 346.5,-1327.5 346.5,-1292.5 43.5,-1292.5"/>
-<text text-anchor="start" x="50.1935" y="-1305.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_subject</text>
-<text text-anchor="start" x="212.2385" y="-1305.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="246.4433" y="-1305.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-1262.5 43.5,-1292.5 346.5,-1292.5 346.5,-1262.5 43.5,-1262.5"/>
-<text text-anchor="start" x="50.5" y="-1273.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="95.594" y="-1273.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-1232.5 43.5,-1262.5 346.5,-1262.5 346.5,-1232.5 43.5,-1232.5"/>
-<text text-anchor="start" x="50.5" y="-1243.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="136.8324" y="-1243.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-1202.5 43.5,-1232.5 346.5,-1232.5 346.5,-1202.5 43.5,-1202.5"/>
-<text text-anchor="start" x="50.5" y="-1213.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="130.6024" y="-1213.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-1172.5 43.5,-1202.5 346.5,-1202.5 346.5,-1172.5 43.5,-1172.5"/>
-<text text-anchor="start" x="50.5" y="-1183.9" font-family="Arial" font-size="14.00" fill="#000000">started_at    </text>
-<text text-anchor="start" x="146.9502" y="-1183.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-1142.5 43.5,-1172.5 346.5,-1172.5 346.5,-1142.5 43.5,-1142.5"/>
-<text text-anchor="start" x="50.5" y="-1153.9" font-family="Arial" font-size="14.00" fill="#000000">selected_intervention_ids    </text>
-<text text-anchor="start" x="242.6374" y="-1153.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-1112.5 43.5,-1142.5 346.5,-1142.5 346.5,-1112.5 43.5,-1112.5"/>
-<text text-anchor="start" x="50.5" y="-1123.9" font-family="Arial" font-size="14.00" fill="#000000">invite_code    </text>
-<text text-anchor="start" x="155.5042" y="-1123.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-1082.5 43.5,-1112.5 346.5,-1112.5 346.5,-1082.5 43.5,-1082.5"/>
-<text text-anchor="start" x="50.5" y="-1093.9" font-family="Arial" font-size="14.00" fill="#000000">is_deleted    </text>
-<text text-anchor="start" x="148.5042" y="-1093.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-</g>
-<!-- public.study_subject&#45;&gt;public.study -->
-<g id="edge1" class="edge">
-<title>public.study_subject:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M356.5951,-1245.3288C419.0354,-1216.3721 363.8963,-907.5 438.5,-907.5"/>
-<polygon fill="#000000" stroke="#000000" points="356.2764,-1245.3973 345.5538,-1243.1006 351.3882,-1246.4486 346.5,-1247.5 346.5,-1247.5 346.5,-1247.5 351.3882,-1246.4486 347.4462,-1251.8994 356.2764,-1245.3973 356.2764,-1245.3973"/>
-<text text-anchor="start" x="353.6035" y="-1257.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE</text>
-</g>
-<!-- public.repo -->
-<g id="node3" class="node">
-<title>public.repo</title>
-<polygon fill="#efefef" stroke="transparent" points="450.5,-1247.5 450.5,-1282.5 679.5,-1282.5 679.5,-1247.5 450.5,-1247.5"/>
-<polygon fill="none" stroke="#000000" points="450.5,-1247.5 450.5,-1282.5 679.5,-1282.5 679.5,-1247.5 450.5,-1247.5"/>
-<text text-anchor="start" x="457.206" y="-1260.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.repo</text>
-<text text-anchor="start" x="545.226" y="-1260.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="579.4308" y="-1260.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="450.5,-1217.5 450.5,-1247.5 679.5,-1247.5 679.5,-1217.5 450.5,-1217.5"/>
-<text text-anchor="start" x="457.5" y="-1228.9" font-family="Arial" font-size="14.00" fill="#000000">project_id    </text>
-<text text-anchor="start" x="552.3822" y="-1228.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="450.5,-1187.5 450.5,-1217.5 679.5,-1217.5 679.5,-1187.5 450.5,-1187.5"/>
-<text text-anchor="start" x="457.5" y="-1198.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="537.6024" y="-1198.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="450.5,-1157.5 450.5,-1187.5 679.5,-1187.5 679.5,-1157.5 450.5,-1157.5"/>
-<text text-anchor="start" x="457.5" y="-1168.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="543.8324" y="-1168.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="450.5,-1127.5 450.5,-1157.5 679.5,-1157.5 679.5,-1127.5 450.5,-1127.5"/>
-<text text-anchor="start" x="457.5" y="-1138.9" font-family="Arial" font-size="14.00" fill="#000000">provider    </text>
-<text text-anchor="start" x="542.263" y="-1138.9" font-family="Arial" font-size="14.00" fill="#666666">[git_provider]</text>
-</g>
-<!-- public.repo&#45;&gt;public.study -->
-<g id="edge2" class="edge">
-<title>public.repo:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M440.6262,-1169.8772C390.3881,-1142.3551 383.0048,-907.5 438.5,-907.5"/>
-<polygon fill="#000000" stroke="#000000" points="440.8352,-1169.9326 449.3447,-1176.8492 445.6676,-1171.2163 450.5,-1172.5 450.5,-1172.5 450.5,-1172.5 445.6676,-1171.2163 451.6553,-1168.1508 440.8352,-1169.9326 440.8352,-1169.9326"/>
-<text text-anchor="start" x="397.6345" y="-1156.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id)</text>
-</g>
-<!-- public.study_invite -->
-<g id="node4" class="node">
-<title>public.study_invite</title>
-<polygon fill="#efefef" stroke="transparent" points="783.5,-1232.5 783.5,-1267.5 1071.5,-1267.5 1071.5,-1232.5 783.5,-1232.5"/>
-<polygon fill="none" stroke="#000000" points="783.5,-1232.5 783.5,-1267.5 1071.5,-1267.5 1071.5,-1232.5 783.5,-1232.5"/>
-<text text-anchor="start" x="790.1995" y="-1245.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_invite</text>
-<text text-anchor="start" x="937.2325" y="-1245.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="971.4373" y="-1245.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="783.5,-1202.5 783.5,-1232.5 1071.5,-1232.5 1071.5,-1202.5 783.5,-1202.5"/>
-<text text-anchor="start" x="790.5" y="-1213.9" font-family="Arial" font-size="14.00" fill="#000000">code    </text>
-<text text-anchor="start" x="855.0526" y="-1213.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="783.5,-1172.5 783.5,-1202.5 1071.5,-1202.5 1071.5,-1172.5 783.5,-1172.5"/>
-<text text-anchor="start" x="790.5" y="-1183.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="876.8324" y="-1183.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="783.5,-1142.5 783.5,-1172.5 1071.5,-1172.5 1071.5,-1142.5 783.5,-1142.5"/>
-<text text-anchor="start" x="790.5" y="-1153.9" font-family="Arial" font-size="14.00" fill="#000000">preselected_intervention_ids    </text>
-<text text-anchor="start" x="1002.8632" y="-1153.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- public.study_invite&#45;&gt;public.study -->
-<g id="edge3" class="edge">
-<title>public.study_invite:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M773.658,-1185.0794C721.9571,-1157.7124 753.4131,-907.5 691.5,-907.5"/>
-<polygon fill="#000000" stroke="#000000" points="773.7894,-1185.1116 782.4252,-1191.8698 778.6447,-1186.3058 783.5,-1187.5 783.5,-1187.5 783.5,-1187.5 778.6447,-1186.3058 784.5748,-1183.1302 773.7894,-1185.1116 773.7894,-1185.1116"/>
-<text text-anchor="start" x="790.6035" y="-1197.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.study_invite.md b/docs/database/public.study_invite.md
deleted file mode 100644
index 79c271b4f..000000000
--- a/docs/database/public.study_invite.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# public.study_invite
-
-## Description
-
-Study invite codes
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| code | text |  | false | [public.study_subject](public.study_subject.md) |  |  |
-| study_id | uuid |  | false |  | [public.study](public.study.md) |  |
-| preselected_intervention_ids | text[] |  | true |  |  | Intervention Ids (and order) preselected by study creator |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| study_invite_studyId_fkey | FOREIGN KEY | FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE |
-| study_invite_pkey | PRIMARY KEY | PRIMARY KEY (code) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| study_invite_pkey | CREATE UNIQUE INDEX study_invite_pkey ON public.study_invite USING btree (code) |
-
-## Relations
-
-![er](public.study_invite.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.study_invite.svg b/docs/database/public.study_invite.svg
deleted file mode 100644
index 2c39a3f06..000000000
--- a/docs/database/public.study_invite.svg
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.study_invite Pages: 1 -->
-<svg width="1061pt" height="1379pt"
- viewBox="0.00 0.00 1061.00 1379.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1375)">
-<title>public.study_invite</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1375 1057,-1375 1057,4 -4,4"/>
-<!-- public.study_invite -->
-<g id="node1" class="node">
-<title>public.study_invite</title>
-<polygon fill="#efefef" stroke="transparent" points="351,-922.5 351,-957.5 639,-957.5 639,-922.5 351,-922.5"/>
-<polygon fill="none" stroke="#000000" points="351,-922.5 351,-957.5 639,-957.5 639,-922.5 351,-922.5"/>
-<text text-anchor="start" x="357.6995" y="-935.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_invite</text>
-<text text-anchor="start" x="504.7325" y="-935.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="538.9373" y="-935.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="351,-892.5 351,-922.5 639,-922.5 639,-892.5 351,-892.5"/>
-<text text-anchor="start" x="358" y="-903.9" font-family="Arial" font-size="14.00" fill="#000000">code </text>
-<text text-anchor="start" x="392.2384" y="-903.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="351,-862.5 351,-892.5 639,-892.5 639,-862.5 351,-862.5"/>
-<text text-anchor="start" x="358" y="-873.9" font-family="Arial" font-size="14.00" fill="#000000">study_id </text>
-<text text-anchor="start" x="414.0182" y="-873.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="351,-832.5 351,-862.5 639,-862.5 639,-832.5 351,-832.5"/>
-<text text-anchor="start" x="358" y="-843.9" font-family="Arial" font-size="14.00" fill="#000000">preselected_intervention_ids </text>
-<text text-anchor="start" x="540.049" y="-843.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="349.5,-831.5 349.5,-959.5 640.5,-959.5 640.5,-831.5 349.5,-831.5"/>
-</g>
-<!-- public.study -->
-<g id="node3" class="node">
-<title>public.study</title>
-<polygon fill="#efefef" stroke="transparent" points="353,-672.5 353,-707.5 636,-707.5 636,-672.5 353,-672.5"/>
-<polygon fill="none" stroke="#000000" points="353,-672.5 353,-707.5 636,-707.5 636,-672.5 353,-672.5"/>
-<text text-anchor="start" x="383.2041" y="-685.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study</text>
-<text text-anchor="start" x="478.2279" y="-685.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="512.4327" y="-685.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="353,-642.5 353,-672.5 636,-672.5 636,-642.5 353,-642.5"/>
-<text text-anchor="start" x="360" y="-653.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="405.094" y="-653.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="353,-612.5 353,-642.5 636,-642.5 636,-612.5 353,-612.5"/>
-<text text-anchor="start" x="360" y="-623.9" font-family="Arial" font-size="14.00" fill="#000000">contact    </text>
-<text text-anchor="start" x="439.3338" y="-623.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="353,-582.5 353,-612.5 636,-612.5 636,-582.5 353,-582.5"/>
-<text text-anchor="start" x="360" y="-593.9" font-family="Arial" font-size="14.00" fill="#000000">title    </text>
-<text text-anchor="start" x="415.9818" y="-593.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="353,-552.5 353,-582.5 636,-582.5 636,-552.5 353,-552.5"/>
-<text text-anchor="start" x="360" y="-563.9" font-family="Arial" font-size="14.00" fill="#000000">description    </text>
-<text text-anchor="start" x="461.8822" y="-563.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="353,-522.5 353,-552.5 636,-552.5 636,-522.5 353,-522.5"/>
-<text text-anchor="start" x="360" y="-533.9" font-family="Arial" font-size="14.00" fill="#000000">icon_name    </text>
-<text text-anchor="start" x="462.6676" y="-533.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="353,-492.5 353,-522.5 636,-522.5 636,-492.5 353,-492.5"/>
-<text text-anchor="start" x="360" y="-503.9" font-family="Arial" font-size="14.00" fill="#000000">published    </text>
-<text text-anchor="start" x="454.1136" y="-503.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="353,-462.5 353,-492.5 636,-492.5 636,-462.5 353,-462.5"/>
-<text text-anchor="start" x="360" y="-473.9" font-family="Arial" font-size="14.00" fill="#000000">registry_published    </text>
-<text text-anchor="start" x="507.7798" y="-473.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="353,-432.5 353,-462.5 636,-462.5 636,-432.5 353,-432.5"/>
-<text text-anchor="start" x="360" y="-443.9" font-family="Arial" font-size="14.00" fill="#000000">questionnaire    </text>
-<text text-anchor="start" x="478.23" y="-443.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="353,-402.5 353,-432.5 636,-432.5 636,-402.5 353,-402.5"/>
-<text text-anchor="start" x="360" y="-413.9" font-family="Arial" font-size="14.00" fill="#000000">eligibility_criteria    </text>
-<text text-anchor="start" x="496.8556" y="-413.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="353,-372.5 353,-402.5 636,-402.5 636,-372.5 353,-372.5"/>
-<text text-anchor="start" x="360" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">observations    </text>
-<text text-anchor="start" x="473.5582" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="353,-342.5 353,-372.5 636,-372.5 636,-342.5 353,-342.5"/>
-<text text-anchor="start" x="360" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">interventions    </text>
-<text text-anchor="start" x="473.5554" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="353,-312.5 353,-342.5 636,-342.5 636,-312.5 353,-312.5"/>
-<text text-anchor="start" x="360" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">consent    </text>
-<text text-anchor="start" x="443.2258" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="353,-282.5 353,-312.5 636,-312.5 636,-282.5 353,-282.5"/>
-<text text-anchor="start" x="360" y="-293.9" font-family="Arial" font-size="14.00" fill="#000000">schedule    </text>
-<text text-anchor="start" x="450.2244" y="-293.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="353,-252.5 353,-282.5 636,-282.5 636,-252.5 353,-252.5"/>
-<text text-anchor="start" x="360" y="-263.9" font-family="Arial" font-size="14.00" fill="#000000">report_specification    </text>
-<text text-anchor="start" x="515.561" y="-263.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="353,-222.5 353,-252.5 636,-252.5 636,-222.5 353,-222.5"/>
-<text text-anchor="start" x="360" y="-233.9" font-family="Arial" font-size="14.00" fill="#000000">results    </text>
-<text text-anchor="start" x="435.4278" y="-233.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="353,-192.5 353,-222.5 636,-222.5 636,-192.5 353,-192.5"/>
-<text text-anchor="start" x="360" y="-203.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="460.3422" y="-203.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="353,-162.5 353,-192.5 636,-192.5 636,-162.5 353,-162.5"/>
-<text text-anchor="start" x="359.5344" y="-173.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="463.7812" y="-173.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="353,-132.5 353,-162.5 636,-162.5 636,-132.5 353,-132.5"/>
-<text text-anchor="start" x="360" y="-143.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="440.1024" y="-143.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="353,-102.5 353,-132.5 636,-132.5 636,-102.5 353,-102.5"/>
-<text text-anchor="start" x="360" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">participation    </text>
-<text text-anchor="start" x="469.662" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[participation]</text>
-<polygon fill="none" stroke="#000000" points="353,-72.5 353,-102.5 636,-102.5 636,-72.5 353,-72.5"/>
-<text text-anchor="start" x="360" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">result_sharing    </text>
-<text text-anchor="start" x="482.108" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[result_sharing]</text>
-<polygon fill="none" stroke="#000000" points="353,-42.5 353,-72.5 636,-72.5 636,-42.5 353,-42.5"/>
-<text text-anchor="start" x="360" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">collaborator_emails    </text>
-<text text-anchor="start" x="515.547" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- public.study_invite&#45;&gt;public.study -->
-<g id="edge2" class="edge">
-<title>public.study_invite:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M341.0736,-875.9839C313.4461,-866.4534 326.8941,-814.3424 351,-787 435.4324,-691.2315 551.5676,-846.7685 636,-751 663.4814,-719.8289 677.5556,-657.5 636,-657.5"/>
-<polygon fill="#000000" stroke="#000000" points="341.1146,-875.99 350.3205,-881.9484 346.0573,-876.745 351,-877.5 351,-877.5 351,-877.5 346.0573,-876.745 351.6795,-873.0516 341.1146,-875.99 341.1146,-875.99"/>
-<text text-anchor="start" x="7.1035" y="-887.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE</text>
-</g>
-<!-- public.study_subject -->
-<g id="node2" class="node">
-<title>public.study_subject</title>
-<polygon fill="#efefef" stroke="transparent" points="343,-1292.5 343,-1327.5 646,-1327.5 646,-1292.5 343,-1292.5"/>
-<polygon fill="none" stroke="#000000" points="343,-1292.5 343,-1327.5 646,-1327.5 646,-1292.5 343,-1292.5"/>
-<text text-anchor="start" x="349.6935" y="-1305.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_subject</text>
-<text text-anchor="start" x="511.7385" y="-1305.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="545.9433" y="-1305.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="343,-1262.5 343,-1292.5 646,-1292.5 646,-1262.5 343,-1262.5"/>
-<text text-anchor="start" x="350" y="-1273.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="395.094" y="-1273.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="343,-1232.5 343,-1262.5 646,-1262.5 646,-1232.5 343,-1232.5"/>
-<text text-anchor="start" x="350" y="-1243.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="436.3324" y="-1243.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="343,-1202.5 343,-1232.5 646,-1232.5 646,-1202.5 343,-1202.5"/>
-<text text-anchor="start" x="350" y="-1213.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="430.1024" y="-1213.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="343,-1172.5 343,-1202.5 646,-1202.5 646,-1172.5 343,-1172.5"/>
-<text text-anchor="start" x="350" y="-1183.9" font-family="Arial" font-size="14.00" fill="#000000">started_at    </text>
-<text text-anchor="start" x="446.4502" y="-1183.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="343,-1142.5 343,-1172.5 646,-1172.5 646,-1142.5 343,-1142.5"/>
-<text text-anchor="start" x="350" y="-1153.9" font-family="Arial" font-size="14.00" fill="#000000">selected_intervention_ids    </text>
-<text text-anchor="start" x="542.1374" y="-1153.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-<polygon fill="none" stroke="#000000" points="343,-1112.5 343,-1142.5 646,-1142.5 646,-1112.5 343,-1112.5"/>
-<text text-anchor="start" x="350" y="-1123.9" font-family="Arial" font-size="14.00" fill="#000000">invite_code    </text>
-<text text-anchor="start" x="455.0042" y="-1123.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="343,-1082.5 343,-1112.5 646,-1112.5 646,-1082.5 343,-1082.5"/>
-<text text-anchor="start" x="350" y="-1093.9" font-family="Arial" font-size="14.00" fill="#000000">is_deleted    </text>
-<text text-anchor="start" x="448.0042" y="-1093.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-</g>
-<!-- public.study_subject&#45;&gt;public.study_invite -->
-<g id="edge1" class="edge">
-<title>public.study_subject:invite_code&#45;&gt;public.study_invite:code</title>
-<path fill="none" stroke="#000000" d="M655.9422,-1125.9113C682.2076,-1116.3761 669.2618,-1066.2731 646,-1040 558.4421,-941.1075 438.5579,-1102.8925 351,-1004 322.5691,-971.8886 308.1111,-907.5 351,-907.5"/>
-<polygon fill="#000000" stroke="#000000" points="655.8747,-1125.922 645.2899,-1123.0564 650.9374,-1126.711 646,-1127.5 646,-1127.5 646,-1127.5 650.9374,-1126.711 646.7101,-1131.9436 655.8747,-1125.922 655.8747,-1125.922"/>
-<text text-anchor="start" x="653.0385" y="-1137.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (invite_code) REFERENCES study_invite(code) ON DELETE CASCADE</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.study_progress_export.md b/docs/database/public.study_progress_export.md
deleted file mode 100644
index 44e005d14..000000000
--- a/docs/database/public.study_progress_export.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# public.study_progress_export
-
-## Description
-
-<details>
-<summary><strong>Table Definition</strong></summary>
-
-```sql
-CREATE VIEW study_progress_export AS (
- SELECT subject_progress.completed_at,
-    subject_progress.intervention_id,
-    subject_progress.task_id,
-    subject_progress.result_type,
-    subject_progress.result,
-    subject_progress.subject_id,
-    study_subject.user_id,
-    study_subject.study_id,
-    study_subject.started_at,
-    study_subject.selected_intervention_ids
-   FROM study_subject,
-    subject_progress
-  WHERE (study_subject.id = subject_progress.subject_id)
-)
-```
-
-</details>
-
-## Referenced Tables
-
-- [public.study_subject](public.study_subject.md)
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| completed_at | timestamp with time zone |  | true |  |  |  |
-| intervention_id | text |  | true |  |  |  |
-| task_id | text |  | true |  |  |  |
-| result_type | text |  | true |  |  |  |
-| result | jsonb |  | true |  |  |  |
-| subject_id | uuid |  | true |  |  |  |
-| user_id | uuid |  | true |  |  |  |
-| study_id | uuid |  | true |  |  |  |
-| started_at | timestamp with time zone |  | true |  |  |  |
-| selected_intervention_ids | text[] |  | true |  |  |  |
-
-## Relations
-
-![er](public.study_progress_export.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.study_progress_export.svg b/docs/database/public.study_progress_export.svg
deleted file mode 100644
index 628fd0f66..000000000
--- a/docs/database/public.study_progress_export.svg
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.study_progress_export Pages: 1 -->
-<svg width="426pt" height="435pt"
- viewBox="0.00 0.00 426.00 435.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 431)">
-<title>public.study_progress_export</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-431 422,-431 422,4 -4,4"/>
-<!-- public.study_progress_export -->
-<g id="node1" class="node">
-<title>public.study_progress_export</title>
-<polygon fill="#efefef" stroke="transparent" points="46,-345.5 46,-380.5 372,-380.5 372,-345.5 46,-345.5"/>
-<polygon fill="none" stroke="#000000" points="46,-345.5 46,-380.5 372,-380.5 372,-345.5 46,-345.5"/>
-<text text-anchor="start" x="52.5886" y="-358.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_progress_export</text>
-<text text-anchor="start" x="287.647" y="-358.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="321.8518" y="-358.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="46,-315.5 46,-345.5 372,-345.5 372,-315.5 46,-315.5"/>
-<text text-anchor="start" x="53" y="-326.9" font-family="Arial" font-size="14.00" fill="#000000">completed_at </text>
-<text text-anchor="start" x="140.9172" y="-326.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46,-285.5 46,-315.5 372,-315.5 372,-285.5 46,-285.5"/>
-<text text-anchor="start" x="53" y="-296.9" font-family="Arial" font-size="14.00" fill="#000000">intervention_id </text>
-<text text-anchor="start" x="147.913" y="-296.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46,-255.5 46,-285.5 372,-285.5 372,-255.5 46,-255.5"/>
-<text text-anchor="start" x="53" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">task_id </text>
-<text text-anchor="start" x="101.2356" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46,-225.5 46,-255.5 372,-255.5 372,-225.5 46,-225.5"/>
-<text text-anchor="start" x="53" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">result_type </text>
-<text text-anchor="start" x="125.352" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46,-195.5 46,-225.5 372,-225.5 372,-195.5 46,-195.5"/>
-<text text-anchor="start" x="53" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">result </text>
-<text text-anchor="start" x="91.1136" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="46,-165.5 46,-195.5 372,-195.5 372,-165.5 46,-165.5"/>
-<text text-anchor="start" x="53" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">subject_id </text>
-<text text-anchor="start" x="119.9074" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46,-135.5 46,-165.5 372,-165.5 372,-135.5 46,-135.5"/>
-<text text-anchor="start" x="53" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">user_id </text>
-<text text-anchor="start" x="102.7882" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46,-105.5 46,-135.5 372,-135.5 372,-105.5 46,-105.5"/>
-<text text-anchor="start" x="53" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">study_id </text>
-<text text-anchor="start" x="109.0182" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46,-75.5 46,-105.5 372,-105.5 372,-75.5 46,-75.5"/>
-<text text-anchor="start" x="53" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">started_at </text>
-<text text-anchor="start" x="119.136" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46,-45.5 46,-75.5 372,-75.5 372,-45.5 46,-45.5"/>
-<text text-anchor="start" x="53" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">selected_intervention_ids </text>
-<text text-anchor="start" x="214.8232" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-382.5 373.5,-382.5 373.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.study_subject.md b/docs/database/public.study_subject.md
deleted file mode 100644
index 76d3dd93c..000000000
--- a/docs/database/public.study_subject.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# public.study_subject
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid | gen_random_uuid() | false | [public.subject_progress](public.subject_progress.md) |  |  |
-| study_id | uuid |  | false |  | [public.study](public.study.md) |  |
-| user_id | uuid |  | false |  | [public.user](public.user.md) |  |
-| started_at | timestamp with time zone | now() | true |  |  |  |
-| selected_intervention_ids | text[] |  | false |  |  |  |
-| invite_code | text |  | true |  | [public.study_invite](public.study_invite.md) |  |
-| is_deleted | boolean | false | false |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| study_subject_studyId_fkey | FOREIGN KEY | FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE |
-| study_subject_loginCode_fkey | FOREIGN KEY | FOREIGN KEY (invite_code) REFERENCES study_invite(code) ON DELETE CASCADE |
-| study_subject_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-| study_subject_userId_fkey | FOREIGN KEY | FOREIGN KEY (user_id) REFERENCES "user"(id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| study_subject_pkey | CREATE UNIQUE INDEX study_subject_pkey ON public.study_subject USING btree (id) |
-
-## Relations
-
-![er](public.study_subject.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.study_subject.svg b/docs/database/public.study_subject.svg
deleted file mode 100644
index 00b4f83b2..000000000
--- a/docs/database/public.study_subject.svg
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.study_subject Pages: 1 -->
-<svg width="1127pt" height="1469pt"
- viewBox="0.00 0.00 1127.00 1469.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1465)">
-<title>public.study_subject</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1465 1123,-1465 1123,4 -4,4"/>
-<!-- public.study_subject -->
-<g id="node1" class="node">
-<title>public.study_subject</title>
-<polygon fill="#efefef" stroke="transparent" points="409,-1042.5 409,-1077.5 712,-1077.5 712,-1042.5 409,-1042.5"/>
-<polygon fill="none" stroke="#000000" points="409,-1042.5 409,-1077.5 712,-1077.5 712,-1042.5 409,-1042.5"/>
-<text text-anchor="start" x="415.6935" y="-1055.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_subject</text>
-<text text-anchor="start" x="577.7385" y="-1055.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="611.9433" y="-1055.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="409,-1012.5 409,-1042.5 712,-1042.5 712,-1012.5 409,-1012.5"/>
-<text text-anchor="start" x="416" y="-1023.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="430.7798" y="-1023.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="409,-982.5 409,-1012.5 712,-1012.5 712,-982.5 409,-982.5"/>
-<text text-anchor="start" x="416" y="-993.9" font-family="Arial" font-size="14.00" fill="#000000">study_id </text>
-<text text-anchor="start" x="472.0182" y="-993.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="409,-952.5 409,-982.5 712,-982.5 712,-952.5 409,-952.5"/>
-<text text-anchor="start" x="416" y="-963.9" font-family="Arial" font-size="14.00" fill="#000000">user_id </text>
-<text text-anchor="start" x="465.7882" y="-963.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="409,-922.5 409,-952.5 712,-952.5 712,-922.5 409,-922.5"/>
-<text text-anchor="start" x="416" y="-933.9" font-family="Arial" font-size="14.00" fill="#000000">started_at </text>
-<text text-anchor="start" x="482.136" y="-933.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="409,-892.5 409,-922.5 712,-922.5 712,-892.5 409,-892.5"/>
-<text text-anchor="start" x="416" y="-903.9" font-family="Arial" font-size="14.00" fill="#000000">selected_intervention_ids </text>
-<text text-anchor="start" x="577.8232" y="-903.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-<polygon fill="none" stroke="#000000" points="409,-862.5 409,-892.5 712,-892.5 712,-862.5 409,-862.5"/>
-<text text-anchor="start" x="416" y="-873.9" font-family="Arial" font-size="14.00" fill="#000000">invite_code </text>
-<text text-anchor="start" x="490.69" y="-873.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="409,-832.5 409,-862.5 712,-862.5 712,-832.5 409,-832.5"/>
-<text text-anchor="start" x="416" y="-843.9" font-family="Arial" font-size="14.00" fill="#000000">is_deleted </text>
-<text text-anchor="start" x="483.69" y="-843.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="407,-831.5 407,-1079.5 713,-1079.5 713,-831.5 407,-831.5"/>
-</g>
-<!-- public.study -->
-<g id="node3" class="node">
-<title>public.study</title>
-<polygon fill="#efefef" stroke="transparent" points="60,-672.5 60,-707.5 343,-707.5 343,-672.5 60,-672.5"/>
-<polygon fill="none" stroke="#000000" points="60,-672.5 60,-707.5 343,-707.5 343,-672.5 60,-672.5"/>
-<text text-anchor="start" x="90.2041" y="-685.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study</text>
-<text text-anchor="start" x="185.2279" y="-685.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="219.4327" y="-685.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="60,-642.5 60,-672.5 343,-672.5 343,-642.5 60,-642.5"/>
-<text text-anchor="start" x="67" y="-653.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="112.094" y="-653.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="60,-612.5 60,-642.5 343,-642.5 343,-612.5 60,-612.5"/>
-<text text-anchor="start" x="67" y="-623.9" font-family="Arial" font-size="14.00" fill="#000000">contact    </text>
-<text text-anchor="start" x="146.3338" y="-623.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="60,-582.5 60,-612.5 343,-612.5 343,-582.5 60,-582.5"/>
-<text text-anchor="start" x="67" y="-593.9" font-family="Arial" font-size="14.00" fill="#000000">title    </text>
-<text text-anchor="start" x="122.9818" y="-593.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="60,-552.5 60,-582.5 343,-582.5 343,-552.5 60,-552.5"/>
-<text text-anchor="start" x="67" y="-563.9" font-family="Arial" font-size="14.00" fill="#000000">description    </text>
-<text text-anchor="start" x="168.8822" y="-563.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="60,-522.5 60,-552.5 343,-552.5 343,-522.5 60,-522.5"/>
-<text text-anchor="start" x="67" y="-533.9" font-family="Arial" font-size="14.00" fill="#000000">icon_name    </text>
-<text text-anchor="start" x="169.6676" y="-533.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="60,-492.5 60,-522.5 343,-522.5 343,-492.5 60,-492.5"/>
-<text text-anchor="start" x="67" y="-503.9" font-family="Arial" font-size="14.00" fill="#000000">published    </text>
-<text text-anchor="start" x="161.1136" y="-503.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="60,-462.5 60,-492.5 343,-492.5 343,-462.5 60,-462.5"/>
-<text text-anchor="start" x="67" y="-473.9" font-family="Arial" font-size="14.00" fill="#000000">registry_published    </text>
-<text text-anchor="start" x="214.7798" y="-473.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="60,-432.5 60,-462.5 343,-462.5 343,-432.5 60,-432.5"/>
-<text text-anchor="start" x="67" y="-443.9" font-family="Arial" font-size="14.00" fill="#000000">questionnaire    </text>
-<text text-anchor="start" x="185.23" y="-443.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="60,-402.5 60,-432.5 343,-432.5 343,-402.5 60,-402.5"/>
-<text text-anchor="start" x="67" y="-413.9" font-family="Arial" font-size="14.00" fill="#000000">eligibility_criteria    </text>
-<text text-anchor="start" x="203.8556" y="-413.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="60,-372.5 60,-402.5 343,-402.5 343,-372.5 60,-372.5"/>
-<text text-anchor="start" x="67" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">observations    </text>
-<text text-anchor="start" x="180.5582" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="60,-342.5 60,-372.5 343,-372.5 343,-342.5 60,-342.5"/>
-<text text-anchor="start" x="67" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">interventions    </text>
-<text text-anchor="start" x="180.5554" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="60,-312.5 60,-342.5 343,-342.5 343,-312.5 60,-312.5"/>
-<text text-anchor="start" x="67" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">consent    </text>
-<text text-anchor="start" x="150.2258" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="60,-282.5 60,-312.5 343,-312.5 343,-282.5 60,-282.5"/>
-<text text-anchor="start" x="67" y="-293.9" font-family="Arial" font-size="14.00" fill="#000000">schedule    </text>
-<text text-anchor="start" x="157.2244" y="-293.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="60,-252.5 60,-282.5 343,-282.5 343,-252.5 60,-252.5"/>
-<text text-anchor="start" x="67" y="-263.9" font-family="Arial" font-size="14.00" fill="#000000">report_specification    </text>
-<text text-anchor="start" x="222.561" y="-263.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="60,-222.5 60,-252.5 343,-252.5 343,-222.5 60,-222.5"/>
-<text text-anchor="start" x="67" y="-233.9" font-family="Arial" font-size="14.00" fill="#000000">results    </text>
-<text text-anchor="start" x="142.4278" y="-233.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="60,-192.5 60,-222.5 343,-222.5 343,-192.5 60,-192.5"/>
-<text text-anchor="start" x="67" y="-203.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="167.3422" y="-203.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="60,-162.5 60,-192.5 343,-192.5 343,-162.5 60,-162.5"/>
-<text text-anchor="start" x="66.5344" y="-173.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="170.7812" y="-173.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="60,-132.5 60,-162.5 343,-162.5 343,-132.5 60,-132.5"/>
-<text text-anchor="start" x="67" y="-143.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="147.1024" y="-143.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="60,-102.5 60,-132.5 343,-132.5 343,-102.5 60,-102.5"/>
-<text text-anchor="start" x="67" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">participation    </text>
-<text text-anchor="start" x="176.662" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[participation]</text>
-<polygon fill="none" stroke="#000000" points="60,-72.5 60,-102.5 343,-102.5 343,-72.5 60,-72.5"/>
-<text text-anchor="start" x="67" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">result_sharing    </text>
-<text text-anchor="start" x="189.108" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[result_sharing]</text>
-<polygon fill="none" stroke="#000000" points="60,-42.5 60,-72.5 343,-72.5 343,-42.5 60,-42.5"/>
-<text text-anchor="start" x="67" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">collaborator_emails    </text>
-<text text-anchor="start" x="222.547" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- public.study_subject&#45;&gt;public.study -->
-<g id="edge2" class="edge">
-<title>public.study_subject:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M399.2297,-995.3288C339.9154,-966.3721 416.3581,-657.5 343,-657.5"/>
-<polygon fill="#000000" stroke="#000000" points="399.2381,-995.3306 408.0238,-1001.8928 404.1191,-996.4153 409,-997.5 409,-997.5 409,-997.5 404.1191,-996.4153 409.9762,-993.1072 399.2381,-995.3306 399.2381,-995.3306"/>
-<text text-anchor="start" x="65.1035" y="-1007.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE</text>
-</g>
-<!-- public.user -->
-<g id="node4" class="node">
-<title>public.user</title>
-<polygon fill="#efefef" stroke="transparent" points="447,-402.5 447,-437.5 675,-437.5 675,-402.5 447,-402.5"/>
-<polygon fill="none" stroke="#000000" points="447,-402.5 447,-437.5 675,-437.5 675,-402.5 447,-402.5"/>
-<text text-anchor="start" x="453.7091" y="-415.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.user</text>
-<text text-anchor="start" x="540.7229" y="-415.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="574.9277" y="-415.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="447,-372.5 447,-402.5 675,-402.5 675,-372.5 447,-372.5"/>
-<text text-anchor="start" x="454" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="499.094" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="447,-342.5 447,-372.5 675,-372.5 675,-342.5 447,-342.5"/>
-<text text-anchor="start" x="454" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">email    </text>
-<text text-anchor="start" x="521.6438" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="447,-312.5 447,-342.5 675,-342.5 675,-312.5 447,-312.5"/>
-<text text-anchor="start" x="454" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">preferences    </text>
-<text text-anchor="start" x="562.1122" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- public.study_subject&#45;&gt;public.user -->
-<g id="edge3" class="edge">
-<title>public.study_subject:user_id&#45;&gt;public.user:id</title>
-<path fill="none" stroke="#000000" d="M722.0237,-966.8746C787.5813,-958.0975 738.7653,-858.7914 712,-787 649.1516,-618.4246 509.8484,-649.5754 447,-481 432.4833,-442.0625 405.4444,-387.5 447,-387.5"/>
-<polygon fill="#000000" stroke="#000000" points="721.9806,-966.8772 711.7197,-963.0087 716.9903,-967.1886 712,-967.5 712,-967.5 712,-967.5 716.9903,-967.1886 712.2803,-971.9913 721.9806,-966.8772 721.9806,-966.8772"/>
-<text text-anchor="start" x="719.2855" y="-977.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (user_id) REFERENCES &quot;user&quot;(id)</text>
-</g>
-<!-- public.study_invite -->
-<g id="node5" class="node">
-<title>public.study_invite</title>
-<polygon fill="#efefef" stroke="transparent" points="779,-402.5 779,-437.5 1067,-437.5 1067,-402.5 779,-402.5"/>
-<polygon fill="none" stroke="#000000" points="779,-402.5 779,-437.5 1067,-437.5 1067,-402.5 779,-402.5"/>
-<text text-anchor="start" x="785.6995" y="-415.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_invite</text>
-<text text-anchor="start" x="932.7325" y="-415.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="966.9373" y="-415.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="779,-372.5 779,-402.5 1067,-402.5 1067,-372.5 779,-372.5"/>
-<text text-anchor="start" x="786" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">code    </text>
-<text text-anchor="start" x="850.5526" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="779,-342.5 779,-372.5 1067,-372.5 1067,-342.5 779,-342.5"/>
-<text text-anchor="start" x="786" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="872.3324" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="779,-312.5 779,-342.5 1067,-342.5 1067,-312.5 779,-312.5"/>
-<text text-anchor="start" x="786" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">preselected_intervention_ids    </text>
-<text text-anchor="start" x="998.3632" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- public.study_subject&#45;&gt;public.study_invite -->
-<g id="edge4" class="edge">
-<title>public.study_subject:invite_code&#45;&gt;public.study_invite:code</title>
-<path fill="none" stroke="#000000" d="M722.0977,-875.9153C812.0446,-845.5011 672.747,-387.5 779,-387.5"/>
-<polygon fill="#000000" stroke="#000000" points="721.8791,-875.9495 711.3023,-873.0544 716.9395,-876.7247 712,-877.5 712,-877.5 712,-877.5 716.9395,-876.7247 712.6977,-881.9456 721.8791,-875.9495 721.8791,-875.9495"/>
-<text text-anchor="start" x="719.0385" y="-887.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (invite_code) REFERENCES study_invite(code) ON DELETE CASCADE</text>
-</g>
-<!-- public.subject_progress -->
-<g id="node2" class="node">
-<title>public.subject_progress</title>
-<polygon fill="#efefef" stroke="transparent" points="396,-1382.5 396,-1417.5 726,-1417.5 726,-1382.5 396,-1382.5"/>
-<polygon fill="none" stroke="#000000" points="396,-1382.5 396,-1417.5 726,-1417.5 726,-1382.5 396,-1382.5"/>
-<text text-anchor="start" x="402.6962" y="-1395.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.subject_progress</text>
-<text text-anchor="start" x="591.7358" y="-1395.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="625.9406" y="-1395.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="396,-1352.5 396,-1382.5 726,-1382.5 726,-1352.5 396,-1352.5"/>
-<text text-anchor="start" x="403" y="-1363.9" font-family="Arial" font-size="14.00" fill="#000000">completed_at    </text>
-<text text-anchor="start" x="521.2314" y="-1363.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="396,-1322.5 396,-1352.5 726,-1352.5 726,-1322.5 396,-1322.5"/>
-<text text-anchor="start" x="403" y="-1333.9" font-family="Arial" font-size="14.00" fill="#000000">subject_id    </text>
-<text text-anchor="start" x="500.2216" y="-1333.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="396,-1292.5 396,-1322.5 726,-1322.5 726,-1292.5 396,-1292.5"/>
-<text text-anchor="start" x="403" y="-1303.9" font-family="Arial" font-size="14.00" fill="#000000">intervention_id    </text>
-<text text-anchor="start" x="528.2272" y="-1303.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="396,-1262.5 396,-1292.5 726,-1292.5 726,-1262.5 396,-1262.5"/>
-<text text-anchor="start" x="403" y="-1273.9" font-family="Arial" font-size="14.00" fill="#000000">task_id    </text>
-<text text-anchor="start" x="481.5498" y="-1273.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="396,-1232.5 396,-1262.5 726,-1262.5 726,-1232.5 396,-1232.5"/>
-<text text-anchor="start" x="403" y="-1243.9" font-family="Arial" font-size="14.00" fill="#000000">result_type    </text>
-<text text-anchor="start" x="505.6662" y="-1243.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="396,-1202.5 396,-1232.5 726,-1232.5 726,-1202.5 396,-1202.5"/>
-<text text-anchor="start" x="403" y="-1213.9" font-family="Arial" font-size="14.00" fill="#000000">result    </text>
-<text text-anchor="start" x="471.4278" y="-1213.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- public.subject_progress&#45;&gt;public.study_subject -->
-<g id="edge1" class="edge">
-<title>public.subject_progress:subject_id&#45;&gt;public.study_subject:id</title>
-<path fill="none" stroke="#000000" d="M385.9985,-1336.7979C319.532,-1326.9612 345.8288,-1216.2114 396,-1160 490.1249,-1054.5432 617.8751,-1229.4568 712,-1124 740.5591,-1092.0026 754.8889,-1027.5 712,-1027.5"/>
-<polygon fill="#000000" stroke="#000000" points="386.0245,-1336.7996 395.6848,-1341.989 391.0123,-1337.1498 396,-1337.5 396,-1337.5 396,-1337.5 391.0123,-1337.1498 396.3152,-1333.011 386.0245,-1336.7996 386.0245,-1336.7996"/>
-<text text-anchor="start" x="6.5975" y="-1347.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (subject_id) REFERENCES study_subject(id) ON DELETE CASCADE</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.study_tag.md b/docs/database/public.study_tag.md
deleted file mode 100644
index c04ba255c..000000000
--- a/docs/database/public.study_tag.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# public.study_tag
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| study_id | uuid |  | false |  | [public.study](public.study.md) |  |
-| tag_id | uuid |  | false |  | [public.tag](public.tag.md) |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| study_tag_studyId_fkey | FOREIGN KEY | FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE |
-| study_tag_tagId_fkey | FOREIGN KEY | FOREIGN KEY (tag_id) REFERENCES tag(id) ON DELETE CASCADE |
-| study_tag_pkey | PRIMARY KEY | PRIMARY KEY (study_id, tag_id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| study_tag_pkey | CREATE UNIQUE INDEX study_tag_pkey ON public.study_tag USING btree (study_id, tag_id) |
-
-## Relations
-
-![er](public.study_tag.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.study_tag.svg b/docs/database/public.study_tag.svg
deleted file mode 100644
index 8df118323..000000000
--- a/docs/database/public.study_tag.svg
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.study_tag Pages: 1 -->
-<svg width="961pt" height="982pt"
- viewBox="0.00 0.00 961.00 982.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 978)">
-<title>public.study_tag</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-978 957,-978 957,4 -4,4"/>
-<!-- public.study_tag -->
-<g id="node1" class="node">
-<title>public.study_tag</title>
-<polygon fill="#efefef" stroke="transparent" points="351,-892.5 351,-927.5 622,-927.5 622,-892.5 351,-892.5"/>
-<polygon fill="none" stroke="#000000" points="351,-892.5 351,-927.5 622,-927.5 622,-892.5 351,-892.5"/>
-<text text-anchor="start" x="357.6937" y="-905.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_tag</text>
-<text text-anchor="start" x="487.7383" y="-905.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="521.9431" y="-905.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="351,-862.5 351,-892.5 622,-892.5 622,-862.5 351,-862.5"/>
-<text text-anchor="start" x="358" y="-873.9" font-family="Arial" font-size="14.00" fill="#000000">study_id </text>
-<text text-anchor="start" x="414.0182" y="-873.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="351,-832.5 351,-862.5 622,-862.5 622,-832.5 351,-832.5"/>
-<text text-anchor="start" x="358" y="-843.9" font-family="Arial" font-size="14.00" fill="#000000">tag_id </text>
-<text text-anchor="start" x="400.0182" y="-843.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="349,-831.5 349,-929.5 623,-929.5 623,-831.5 349,-831.5"/>
-</g>
-<!-- public.study -->
-<g id="node2" class="node">
-<title>public.study</title>
-<polygon fill="#efefef" stroke="transparent" points="168,-672.5 168,-707.5 451,-707.5 451,-672.5 168,-672.5"/>
-<polygon fill="none" stroke="#000000" points="168,-672.5 168,-707.5 451,-707.5 451,-672.5 168,-672.5"/>
-<text text-anchor="start" x="198.2041" y="-685.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study</text>
-<text text-anchor="start" x="293.2279" y="-685.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="327.4327" y="-685.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="168,-642.5 168,-672.5 451,-672.5 451,-642.5 168,-642.5"/>
-<text text-anchor="start" x="175" y="-653.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="220.094" y="-653.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="168,-612.5 168,-642.5 451,-642.5 451,-612.5 168,-612.5"/>
-<text text-anchor="start" x="175" y="-623.9" font-family="Arial" font-size="14.00" fill="#000000">contact    </text>
-<text text-anchor="start" x="254.3338" y="-623.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="168,-582.5 168,-612.5 451,-612.5 451,-582.5 168,-582.5"/>
-<text text-anchor="start" x="175" y="-593.9" font-family="Arial" font-size="14.00" fill="#000000">title    </text>
-<text text-anchor="start" x="230.9818" y="-593.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="168,-552.5 168,-582.5 451,-582.5 451,-552.5 168,-552.5"/>
-<text text-anchor="start" x="175" y="-563.9" font-family="Arial" font-size="14.00" fill="#000000">description    </text>
-<text text-anchor="start" x="276.8822" y="-563.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="168,-522.5 168,-552.5 451,-552.5 451,-522.5 168,-522.5"/>
-<text text-anchor="start" x="175" y="-533.9" font-family="Arial" font-size="14.00" fill="#000000">icon_name    </text>
-<text text-anchor="start" x="277.6676" y="-533.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="168,-492.5 168,-522.5 451,-522.5 451,-492.5 168,-492.5"/>
-<text text-anchor="start" x="175" y="-503.9" font-family="Arial" font-size="14.00" fill="#000000">published    </text>
-<text text-anchor="start" x="269.1136" y="-503.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="168,-462.5 168,-492.5 451,-492.5 451,-462.5 168,-462.5"/>
-<text text-anchor="start" x="175" y="-473.9" font-family="Arial" font-size="14.00" fill="#000000">registry_published    </text>
-<text text-anchor="start" x="322.7798" y="-473.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="168,-432.5 168,-462.5 451,-462.5 451,-432.5 168,-432.5"/>
-<text text-anchor="start" x="175" y="-443.9" font-family="Arial" font-size="14.00" fill="#000000">questionnaire    </text>
-<text text-anchor="start" x="293.23" y="-443.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="168,-402.5 168,-432.5 451,-432.5 451,-402.5 168,-402.5"/>
-<text text-anchor="start" x="175" y="-413.9" font-family="Arial" font-size="14.00" fill="#000000">eligibility_criteria    </text>
-<text text-anchor="start" x="311.8556" y="-413.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="168,-372.5 168,-402.5 451,-402.5 451,-372.5 168,-372.5"/>
-<text text-anchor="start" x="175" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">observations    </text>
-<text text-anchor="start" x="288.5582" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="168,-342.5 168,-372.5 451,-372.5 451,-342.5 168,-342.5"/>
-<text text-anchor="start" x="175" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">interventions    </text>
-<text text-anchor="start" x="288.5554" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="168,-312.5 168,-342.5 451,-342.5 451,-312.5 168,-312.5"/>
-<text text-anchor="start" x="175" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">consent    </text>
-<text text-anchor="start" x="258.2258" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="168,-282.5 168,-312.5 451,-312.5 451,-282.5 168,-282.5"/>
-<text text-anchor="start" x="175" y="-293.9" font-family="Arial" font-size="14.00" fill="#000000">schedule    </text>
-<text text-anchor="start" x="265.2244" y="-293.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="168,-252.5 168,-282.5 451,-282.5 451,-252.5 168,-252.5"/>
-<text text-anchor="start" x="175" y="-263.9" font-family="Arial" font-size="14.00" fill="#000000">report_specification    </text>
-<text text-anchor="start" x="330.561" y="-263.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="168,-222.5 168,-252.5 451,-252.5 451,-222.5 168,-222.5"/>
-<text text-anchor="start" x="175" y="-233.9" font-family="Arial" font-size="14.00" fill="#000000">results    </text>
-<text text-anchor="start" x="250.4278" y="-233.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="168,-192.5 168,-222.5 451,-222.5 451,-192.5 168,-192.5"/>
-<text text-anchor="start" x="175" y="-203.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="275.3422" y="-203.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="168,-162.5 168,-192.5 451,-192.5 451,-162.5 168,-162.5"/>
-<text text-anchor="start" x="174.5344" y="-173.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="278.7812" y="-173.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="168,-132.5 168,-162.5 451,-162.5 451,-132.5 168,-132.5"/>
-<text text-anchor="start" x="175" y="-143.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="255.1024" y="-143.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="168,-102.5 168,-132.5 451,-132.5 451,-102.5 168,-102.5"/>
-<text text-anchor="start" x="175" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">participation    </text>
-<text text-anchor="start" x="284.662" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[participation]</text>
-<polygon fill="none" stroke="#000000" points="168,-72.5 168,-102.5 451,-102.5 451,-72.5 168,-72.5"/>
-<text text-anchor="start" x="175" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">result_sharing    </text>
-<text text-anchor="start" x="297.108" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[result_sharing]</text>
-<polygon fill="none" stroke="#000000" points="168,-42.5 168,-72.5 451,-72.5 451,-42.5 168,-42.5"/>
-<text text-anchor="start" x="175" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">collaborator_emails    </text>
-<text text-anchor="start" x="330.547" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- public.study_tag&#45;&gt;public.study -->
-<g id="edge1" class="edge">
-<title>public.study_tag:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M340.8082,-875.9289C314.174,-866.4869 330.1303,-816.6939 351,-787 378.1617,-748.3535 423.8383,-789.6465 451,-751 474.895,-717.0016 492.5556,-657.5 451,-657.5"/>
-<polygon fill="#000000" stroke="#000000" points="341.1167,-875.9764 350.3144,-881.9475 346.0584,-876.7382 351,-877.5 351,-877.5 351,-877.5 346.0584,-876.7382 351.6856,-873.0525 341.1167,-875.9764 341.1167,-875.9764"/>
-<text text-anchor="start" x="7.1035" y="-887.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE</text>
-</g>
-<!-- public.tag -->
-<g id="node3" class="node">
-<title>public.tag</title>
-<polygon fill="#efefef" stroke="transparent" points="555,-387.5 555,-422.5 773,-422.5 773,-387.5 555,-387.5"/>
-<polygon fill="none" stroke="#000000" points="555,-387.5 555,-422.5 773,-422.5 773,-387.5 555,-387.5"/>
-<text text-anchor="start" x="561.7041" y="-400.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.tag</text>
-<text text-anchor="start" x="638.7279" y="-400.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="672.9327" y="-400.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="555,-357.5 555,-387.5 773,-387.5 773,-357.5 555,-357.5"/>
-<text text-anchor="start" x="562" y="-368.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="607.094" y="-368.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="555,-327.5 555,-357.5 773,-357.5 773,-327.5 555,-327.5"/>
-<text text-anchor="start" x="562" y="-338.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="631.2132" y="-338.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-</g>
-<!-- public.study_tag&#45;&gt;public.tag -->
-<g id="edge2" class="edge">
-<title>public.study_tag:tag_id&#45;&gt;public.tag:id</title>
-<path fill="none" stroke="#000000" d="M632.3092,-845.5862C708.3369,-812.9002 452.3554,-372.5 555,-372.5"/>
-<polygon fill="#000000" stroke="#000000" points="631.832,-845.6747 621.1786,-843.0756 626.916,-846.5873 622,-847.5 622,-847.5 622,-847.5 626.916,-846.5873 622.8214,-851.9244 631.832,-845.6747 631.832,-845.6747"/>
-<text text-anchor="start" x="629.1035" y="-857.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (tag_id) REFERENCES tag(id) ON DELETE CASCADE</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.subject_progress.md b/docs/database/public.subject_progress.md
deleted file mode 100644
index 4290bc003..000000000
--- a/docs/database/public.subject_progress.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# public.subject_progress
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| completed_at | timestamp with time zone | timezone('utc'::text, now()) | false |  |  |  |
-| subject_id | uuid |  | false |  | [public.study_subject](public.study_subject.md) |  |
-| intervention_id | text |  | false |  |  |  |
-| task_id | text |  | false |  |  |  |
-| result_type | text |  | false |  |  |  |
-| result | jsonb |  | false |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| participant_progress_pkey | PRIMARY KEY | PRIMARY KEY (completed_at, subject_id) |
-| participant_progress_subjectId_fkey | FOREIGN KEY | FOREIGN KEY (subject_id) REFERENCES study_subject(id) ON DELETE CASCADE |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| participant_progress_pkey | CREATE UNIQUE INDEX participant_progress_pkey ON public.subject_progress USING btree (completed_at, subject_id) |
-
-## Relations
-
-![er](public.subject_progress.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.subject_progress.svg b/docs/database/public.subject_progress.svg
deleted file mode 100644
index 4d3b52aaa..000000000
--- a/docs/database/public.subject_progress.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.subject_progress Pages: 1 -->
-<svg width="780pt" height="682pt"
- viewBox="0.00 0.00 780.00 682.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 678)">
-<title>public.subject_progress</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-678 776,-678 776,4 -4,4"/>
-<!-- public.subject_progress -->
-<g id="node1" class="node">
-<title>public.subject_progress</title>
-<polygon fill="#efefef" stroke="transparent" points="396,-592.5 396,-627.5 726,-627.5 726,-592.5 396,-592.5"/>
-<polygon fill="none" stroke="#000000" points="396,-592.5 396,-627.5 726,-627.5 726,-592.5 396,-592.5"/>
-<text text-anchor="start" x="402.6962" y="-605.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.subject_progress</text>
-<text text-anchor="start" x="591.7358" y="-605.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="625.9406" y="-605.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="396,-562.5 396,-592.5 726,-592.5 726,-562.5 396,-562.5"/>
-<text text-anchor="start" x="403" y="-573.9" font-family="Arial" font-size="14.00" fill="#000000">completed_at </text>
-<text text-anchor="start" x="490.9172" y="-573.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="396,-532.5 396,-562.5 726,-562.5 726,-532.5 396,-532.5"/>
-<text text-anchor="start" x="403" y="-543.9" font-family="Arial" font-size="14.00" fill="#000000">subject_id </text>
-<text text-anchor="start" x="469.9074" y="-543.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="396,-502.5 396,-532.5 726,-532.5 726,-502.5 396,-502.5"/>
-<text text-anchor="start" x="403" y="-513.9" font-family="Arial" font-size="14.00" fill="#000000">intervention_id </text>
-<text text-anchor="start" x="497.913" y="-513.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="396,-472.5 396,-502.5 726,-502.5 726,-472.5 396,-472.5"/>
-<text text-anchor="start" x="403" y="-483.9" font-family="Arial" font-size="14.00" fill="#000000">task_id </text>
-<text text-anchor="start" x="451.2356" y="-483.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="396,-442.5 396,-472.5 726,-472.5 726,-442.5 396,-442.5"/>
-<text text-anchor="start" x="403" y="-453.9" font-family="Arial" font-size="14.00" fill="#000000">result_type </text>
-<text text-anchor="start" x="475.352" y="-453.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="396,-412.5 396,-442.5 726,-442.5 726,-412.5 396,-412.5"/>
-<text text-anchor="start" x="403" y="-423.9" font-family="Arial" font-size="14.00" fill="#000000">result </text>
-<text text-anchor="start" x="441.1136" y="-423.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="394.5,-411.5 394.5,-629.5 727.5,-629.5 727.5,-411.5 394.5,-411.5"/>
-</g>
-<!-- public.study_subject -->
-<g id="node2" class="node">
-<title>public.study_subject</title>
-<polygon fill="#efefef" stroke="transparent" points="409,-252.5 409,-287.5 712,-287.5 712,-252.5 409,-252.5"/>
-<polygon fill="none" stroke="#000000" points="409,-252.5 409,-287.5 712,-287.5 712,-252.5 409,-252.5"/>
-<text text-anchor="start" x="415.6935" y="-265.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_subject</text>
-<text text-anchor="start" x="577.7385" y="-265.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="611.9433" y="-265.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="409,-222.5 409,-252.5 712,-252.5 712,-222.5 409,-222.5"/>
-<text text-anchor="start" x="416" y="-233.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="461.094" y="-233.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="409,-192.5 409,-222.5 712,-222.5 712,-192.5 409,-192.5"/>
-<text text-anchor="start" x="416" y="-203.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="502.3324" y="-203.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="409,-162.5 409,-192.5 712,-192.5 712,-162.5 409,-162.5"/>
-<text text-anchor="start" x="416" y="-173.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="496.1024" y="-173.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="409,-132.5 409,-162.5 712,-162.5 712,-132.5 409,-132.5"/>
-<text text-anchor="start" x="416" y="-143.9" font-family="Arial" font-size="14.00" fill="#000000">started_at    </text>
-<text text-anchor="start" x="512.4502" y="-143.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="409,-102.5 409,-132.5 712,-132.5 712,-102.5 409,-102.5"/>
-<text text-anchor="start" x="416" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">selected_intervention_ids    </text>
-<text text-anchor="start" x="608.1374" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-<polygon fill="none" stroke="#000000" points="409,-72.5 409,-102.5 712,-102.5 712,-72.5 409,-72.5"/>
-<text text-anchor="start" x="416" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">invite_code    </text>
-<text text-anchor="start" x="521.0042" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="409,-42.5 409,-72.5 712,-72.5 712,-42.5 409,-42.5"/>
-<text text-anchor="start" x="416" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">is_deleted    </text>
-<text text-anchor="start" x="514.0042" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-</g>
-<!-- public.subject_progress&#45;&gt;public.study_subject -->
-<g id="edge1" class="edge">
-<title>public.subject_progress:subject_id&#45;&gt;public.study_subject:id</title>
-<path fill="none" stroke="#000000" d="M385.8294,-546.786C318.2396,-536.7831 344.9808,-424.1615 396,-367 490.1249,-261.5432 617.8751,-436.4568 712,-331 739.6713,-299.9973 753.5556,-237.5 712,-237.5"/>
-<polygon fill="#000000" stroke="#000000" points="386.0245,-546.7996 395.6848,-551.989 391.0123,-547.1498 396,-547.5 396,-547.5 396,-547.5 391.0123,-547.1498 396.3152,-543.011 386.0245,-546.7996 386.0245,-546.7996"/>
-<text text-anchor="start" x="6.5975" y="-557.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (subject_id) REFERENCES study_subject(id) ON DELETE CASCADE</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.tag.md b/docs/database/public.tag.md
deleted file mode 100644
index 7b5185da3..000000000
--- a/docs/database/public.tag.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# public.tag
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid | gen_random_uuid() | false | [public.study_tag](public.study_tag.md) |  |  |
-| name | text |  | false |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| tag_name_key | UNIQUE | UNIQUE (name) |
-| tag_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| tag_name_key | CREATE UNIQUE INDEX tag_name_key ON public.tag USING btree (name) |
-| tag_pkey | CREATE UNIQUE INDEX tag_pkey ON public.tag USING btree (id) |
-
-## Relations
-
-![er](public.tag.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.tag.svg b/docs/database/public.tag.svg
deleted file mode 100644
index 6f2c73503..000000000
--- a/docs/database/public.tag.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.tag Pages: 1 -->
-<svg width="519pt" height="412pt"
- viewBox="0.00 0.00 518.50 412.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 408)">
-<title>public.tag</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-408 514.5,-408 514.5,4 -4,4"/>
-<!-- public.tag -->
-<g id="node1" class="node">
-<title>public.tag</title>
-<polygon fill="#efefef" stroke="transparent" points="70.5,-105.5 70.5,-140.5 288.5,-140.5 288.5,-105.5 70.5,-105.5"/>
-<polygon fill="none" stroke="#000000" points="70.5,-105.5 70.5,-140.5 288.5,-140.5 288.5,-105.5 70.5,-105.5"/>
-<text text-anchor="start" x="77.2041" y="-118.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.tag</text>
-<text text-anchor="start" x="154.2279" y="-118.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="188.4327" y="-118.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="70.5,-75.5 70.5,-105.5 288.5,-105.5 288.5,-75.5 70.5,-75.5"/>
-<text text-anchor="start" x="77.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="92.2798" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="70.5,-45.5 70.5,-75.5 288.5,-75.5 288.5,-45.5 70.5,-45.5"/>
-<text text-anchor="start" x="77.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">name </text>
-<text text-anchor="start" x="116.399" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="69,-44.5 69,-142.5 290,-142.5 290,-44.5 69,-44.5"/>
-</g>
-<!-- public.study_tag -->
-<g id="node2" class="node">
-<title>public.study_tag</title>
-<polygon fill="#efefef" stroke="transparent" points="43.5,-325.5 43.5,-360.5 314.5,-360.5 314.5,-325.5 43.5,-325.5"/>
-<polygon fill="none" stroke="#000000" points="43.5,-325.5 43.5,-360.5 314.5,-360.5 314.5,-325.5 43.5,-325.5"/>
-<text text-anchor="start" x="50.1937" y="-338.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_tag</text>
-<text text-anchor="start" x="180.2383" y="-338.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="214.4431" y="-338.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-295.5 43.5,-325.5 314.5,-325.5 314.5,-295.5 43.5,-295.5"/>
-<text text-anchor="start" x="50.5" y="-306.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="136.8324" y="-306.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-265.5 43.5,-295.5 314.5,-295.5 314.5,-265.5 43.5,-265.5"/>
-<text text-anchor="start" x="50.5" y="-276.9" font-family="Arial" font-size="14.00" fill="#000000">tag_id    </text>
-<text text-anchor="start" x="122.8324" y="-276.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-</g>
-<!-- public.study_tag&#45;&gt;public.tag -->
-<g id="edge1" class="edge">
-<title>public.study_tag:tag_id&#45;&gt;public.tag:id</title>
-<path fill="none" stroke="#000000" d="M178.5749,-255.3639C169.4899,-209.7503 96.0133,-236.8154 70.5,-187 50.9491,-148.8264 27.6111,-90.5 70.5,-90.5"/>
-<polygon fill="#000000" stroke="#000000" points="178.591,-255.5414 175.0186,-265.9091 179.0455,-260.5207 179.5,-265.5 179.5,-265.5 179.5,-265.5 179.0455,-260.5207 183.9814,-265.0909 178.591,-255.5414 178.591,-255.5414"/>
-<text text-anchor="start" x="186.6035" y="-275.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (tag_id) REFERENCES tag(id) ON DELETE CASCADE</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.user.md b/docs/database/public.user.md
deleted file mode 100644
index 5164cc9ca..000000000
--- a/docs/database/public.user.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# public.user
-
-## Description
-
-Users get automatically added, when a new user is created in auth.users
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid |  | false | [public.study](public.study.md) [public.study_subject](public.study_subject.md) [public.repo](public.repo.md) |  |  |
-| email | text |  | true |  |  |  |
-| preferences | jsonb |  | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| user_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| user_pkey | CREATE UNIQUE INDEX user_pkey ON public."user" USING btree (id) |
-
-## Relations
-
-![er](public.user.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.user.svg b/docs/database/public.user.svg
deleted file mode 100644
index 696e041a9..000000000
--- a/docs/database/public.user.svg
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.user Pages: 1 -->
-<svg width="1117pt" height="1012pt"
- viewBox="0.00 0.00 1117.00 1012.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1008)">
-<title>public.user</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1008 1113,-1008 1113,4 -4,4"/>
-<!-- public.user -->
-<g id="node1" class="node">
-<title>public.user</title>
-<polygon fill="#efefef" stroke="transparent" points="468.5,-135.5 468.5,-170.5 696.5,-170.5 696.5,-135.5 468.5,-135.5"/>
-<polygon fill="none" stroke="#000000" points="468.5,-135.5 468.5,-170.5 696.5,-170.5 696.5,-135.5 468.5,-135.5"/>
-<text text-anchor="start" x="475.2091" y="-148.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.user</text>
-<text text-anchor="start" x="562.2229" y="-148.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="596.4277" y="-148.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="468.5,-105.5 468.5,-135.5 696.5,-135.5 696.5,-105.5 468.5,-105.5"/>
-<text text-anchor="start" x="475.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="490.2798" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="468.5,-75.5 468.5,-105.5 696.5,-105.5 696.5,-75.5 468.5,-75.5"/>
-<text text-anchor="start" x="475.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">email </text>
-<text text-anchor="start" x="512.8296" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="468.5,-45.5 468.5,-75.5 696.5,-75.5 696.5,-45.5 468.5,-45.5"/>
-<text text-anchor="start" x="475.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">preferences </text>
-<text text-anchor="start" x="553.298" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="467,-44.5 467,-172.5 698,-172.5 698,-44.5 467,-44.5"/>
-</g>
-<!-- public.study -->
-<g id="node2" class="node">
-<title>public.study</title>
-<polygon fill="#efefef" stroke="transparent" points="43.5,-925.5 43.5,-960.5 326.5,-960.5 326.5,-925.5 43.5,-925.5"/>
-<polygon fill="none" stroke="#000000" points="43.5,-925.5 43.5,-960.5 326.5,-960.5 326.5,-925.5 43.5,-925.5"/>
-<text text-anchor="start" x="73.7041" y="-938.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study</text>
-<text text-anchor="start" x="168.7279" y="-938.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="202.9327" y="-938.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-895.5 43.5,-925.5 326.5,-925.5 326.5,-895.5 43.5,-895.5"/>
-<text text-anchor="start" x="50.5" y="-906.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="95.594" y="-906.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-865.5 43.5,-895.5 326.5,-895.5 326.5,-865.5 43.5,-865.5"/>
-<text text-anchor="start" x="50.5" y="-876.9" font-family="Arial" font-size="14.00" fill="#000000">contact    </text>
-<text text-anchor="start" x="129.8338" y="-876.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-835.5 43.5,-865.5 326.5,-865.5 326.5,-835.5 43.5,-835.5"/>
-<text text-anchor="start" x="50.5" y="-846.9" font-family="Arial" font-size="14.00" fill="#000000">title    </text>
-<text text-anchor="start" x="106.4818" y="-846.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-805.5 43.5,-835.5 326.5,-835.5 326.5,-805.5 43.5,-805.5"/>
-<text text-anchor="start" x="50.5" y="-816.9" font-family="Arial" font-size="14.00" fill="#000000">description    </text>
-<text text-anchor="start" x="152.3822" y="-816.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-775.5 43.5,-805.5 326.5,-805.5 326.5,-775.5 43.5,-775.5"/>
-<text text-anchor="start" x="50.5" y="-786.9" font-family="Arial" font-size="14.00" fill="#000000">icon_name    </text>
-<text text-anchor="start" x="153.1676" y="-786.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-745.5 43.5,-775.5 326.5,-775.5 326.5,-745.5 43.5,-745.5"/>
-<text text-anchor="start" x="50.5" y="-756.9" font-family="Arial" font-size="14.00" fill="#000000">published    </text>
-<text text-anchor="start" x="144.6136" y="-756.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-715.5 43.5,-745.5 326.5,-745.5 326.5,-715.5 43.5,-715.5"/>
-<text text-anchor="start" x="50.5" y="-726.9" font-family="Arial" font-size="14.00" fill="#000000">registry_published    </text>
-<text text-anchor="start" x="198.2798" y="-726.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-685.5 43.5,-715.5 326.5,-715.5 326.5,-685.5 43.5,-685.5"/>
-<text text-anchor="start" x="50.5" y="-696.9" font-family="Arial" font-size="14.00" fill="#000000">questionnaire    </text>
-<text text-anchor="start" x="168.73" y="-696.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-655.5 43.5,-685.5 326.5,-685.5 326.5,-655.5 43.5,-655.5"/>
-<text text-anchor="start" x="50.5" y="-666.9" font-family="Arial" font-size="14.00" fill="#000000">eligibility_criteria    </text>
-<text text-anchor="start" x="187.3556" y="-666.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-625.5 43.5,-655.5 326.5,-655.5 326.5,-625.5 43.5,-625.5"/>
-<text text-anchor="start" x="50.5" y="-636.9" font-family="Arial" font-size="14.00" fill="#000000">observations    </text>
-<text text-anchor="start" x="164.0582" y="-636.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-595.5 43.5,-625.5 326.5,-625.5 326.5,-595.5 43.5,-595.5"/>
-<text text-anchor="start" x="50.5" y="-606.9" font-family="Arial" font-size="14.00" fill="#000000">interventions    </text>
-<text text-anchor="start" x="164.0554" y="-606.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-565.5 43.5,-595.5 326.5,-595.5 326.5,-565.5 43.5,-565.5"/>
-<text text-anchor="start" x="50.5" y="-576.9" font-family="Arial" font-size="14.00" fill="#000000">consent    </text>
-<text text-anchor="start" x="133.7258" y="-576.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-535.5 43.5,-565.5 326.5,-565.5 326.5,-535.5 43.5,-535.5"/>
-<text text-anchor="start" x="50.5" y="-546.9" font-family="Arial" font-size="14.00" fill="#000000">schedule    </text>
-<text text-anchor="start" x="140.7244" y="-546.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-505.5 43.5,-535.5 326.5,-535.5 326.5,-505.5 43.5,-505.5"/>
-<text text-anchor="start" x="50.5" y="-516.9" font-family="Arial" font-size="14.00" fill="#000000">report_specification    </text>
-<text text-anchor="start" x="206.061" y="-516.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-475.5 43.5,-505.5 326.5,-505.5 326.5,-475.5 43.5,-475.5"/>
-<text text-anchor="start" x="50.5" y="-486.9" font-family="Arial" font-size="14.00" fill="#000000">results    </text>
-<text text-anchor="start" x="125.9278" y="-486.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-445.5 43.5,-475.5 326.5,-475.5 326.5,-445.5 43.5,-445.5"/>
-<text text-anchor="start" x="50.5" y="-456.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="150.8422" y="-456.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-415.5 43.5,-445.5 326.5,-445.5 326.5,-415.5 43.5,-415.5"/>
-<text text-anchor="start" x="50.0344" y="-426.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="154.2812" y="-426.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-385.5 43.5,-415.5 326.5,-415.5 326.5,-385.5 43.5,-385.5"/>
-<text text-anchor="start" x="50.5" y="-396.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="130.6024" y="-396.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-355.5 43.5,-385.5 326.5,-385.5 326.5,-355.5 43.5,-355.5"/>
-<text text-anchor="start" x="50.5" y="-366.9" font-family="Arial" font-size="14.00" fill="#000000">participation    </text>
-<text text-anchor="start" x="160.162" y="-366.9" font-family="Arial" font-size="14.00" fill="#666666">[participation]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-325.5 43.5,-355.5 326.5,-355.5 326.5,-325.5 43.5,-325.5"/>
-<text text-anchor="start" x="50.5" y="-336.9" font-family="Arial" font-size="14.00" fill="#000000">result_sharing    </text>
-<text text-anchor="start" x="172.608" y="-336.9" font-family="Arial" font-size="14.00" fill="#666666">[result_sharing]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-295.5 43.5,-325.5 326.5,-325.5 326.5,-295.5 43.5,-295.5"/>
-<text text-anchor="start" x="50.5" y="-306.9" font-family="Arial" font-size="14.00" fill="#000000">collaborator_emails    </text>
-<text text-anchor="start" x="206.047" y="-306.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- public.study&#45;&gt;public.user -->
-<g id="edge1" class="edge">
-<title>public.study:user_id&#45;&gt;public.user:id</title>
-<path fill="none" stroke="#000000" d="M336.5102,-399.8021C390.8558,-391.5403 347.8981,-311.6598 377.5,-253 409.6853,-189.221 397.0601,-120.5 468.5,-120.5"/>
-<polygon fill="#000000" stroke="#000000" points="336.4758,-399.8044 326.187,-396.0109 331.4879,-400.1522 326.5,-400.5 326.5,-400.5 326.5,-400.5 331.4879,-400.1522 326.813,-404.9891 336.4758,-399.8044 336.4758,-399.8044"/>
-<text text-anchor="start" x="333.7855" y="-410.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (user_id) REFERENCES &quot;user&quot;(id)</text>
-</g>
-<!-- public.study_subject -->
-<g id="node3" class="node">
-<title>public.study_subject</title>
-<polygon fill="#efefef" stroke="transparent" points="430.5,-715.5 430.5,-750.5 733.5,-750.5 733.5,-715.5 430.5,-715.5"/>
-<polygon fill="none" stroke="#000000" points="430.5,-715.5 430.5,-750.5 733.5,-750.5 733.5,-715.5 430.5,-715.5"/>
-<text text-anchor="start" x="437.1935" y="-728.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_subject</text>
-<text text-anchor="start" x="599.2385" y="-728.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="633.4433" y="-728.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-685.5 430.5,-715.5 733.5,-715.5 733.5,-685.5 430.5,-685.5"/>
-<text text-anchor="start" x="437.5" y="-696.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="482.594" y="-696.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-655.5 430.5,-685.5 733.5,-685.5 733.5,-655.5 430.5,-655.5"/>
-<text text-anchor="start" x="437.5" y="-666.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="523.8324" y="-666.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-625.5 430.5,-655.5 733.5,-655.5 733.5,-625.5 430.5,-625.5"/>
-<text text-anchor="start" x="437.5" y="-636.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="517.6024" y="-636.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-595.5 430.5,-625.5 733.5,-625.5 733.5,-595.5 430.5,-595.5"/>
-<text text-anchor="start" x="437.5" y="-606.9" font-family="Arial" font-size="14.00" fill="#000000">started_at    </text>
-<text text-anchor="start" x="533.9502" y="-606.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-565.5 430.5,-595.5 733.5,-595.5 733.5,-565.5 430.5,-565.5"/>
-<text text-anchor="start" x="437.5" y="-576.9" font-family="Arial" font-size="14.00" fill="#000000">selected_intervention_ids    </text>
-<text text-anchor="start" x="629.6374" y="-576.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-535.5 430.5,-565.5 733.5,-565.5 733.5,-535.5 430.5,-535.5"/>
-<text text-anchor="start" x="437.5" y="-546.9" font-family="Arial" font-size="14.00" fill="#000000">invite_code    </text>
-<text text-anchor="start" x="542.5042" y="-546.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-505.5 430.5,-535.5 733.5,-535.5 733.5,-505.5 430.5,-505.5"/>
-<text text-anchor="start" x="437.5" y="-516.9" font-family="Arial" font-size="14.00" fill="#000000">is_deleted    </text>
-<text text-anchor="start" x="535.5042" y="-516.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-</g>
-<!-- public.study_subject&#45;&gt;public.user -->
-<g id="edge2" class="edge">
-<title>public.study_subject:user_id&#45;&gt;public.user:id</title>
-<path fill="none" stroke="#000000" d="M743.7762,-639.8208C807.9845,-630.7107 763.5602,-531.9207 733.5,-463 669.2536,-315.6983 532.7464,-364.3017 468.5,-217 451.3537,-177.6876 425.6111,-120.5 468.5,-120.5"/>
-<polygon fill="#000000" stroke="#000000" points="743.4782,-639.8404 733.2032,-636.0098 738.4891,-640.1702 733.5,-640.5 733.5,-640.5 733.5,-640.5 738.4891,-640.1702 733.7968,-644.9902 743.4782,-639.8404 743.4782,-639.8404"/>
-<text text-anchor="start" x="621.2855" y="-624.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (user_id) REFERENCES &quot;user&quot;(id)</text>
-</g>
-<!-- public.repo -->
-<g id="node4" class="node">
-<title>public.repo</title>
-<polygon fill="#efefef" stroke="transparent" points="837.5,-670.5 837.5,-705.5 1066.5,-705.5 1066.5,-670.5 837.5,-670.5"/>
-<polygon fill="none" stroke="#000000" points="837.5,-670.5 837.5,-705.5 1066.5,-705.5 1066.5,-670.5 837.5,-670.5"/>
-<text text-anchor="start" x="844.206" y="-683.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.repo</text>
-<text text-anchor="start" x="932.226" y="-683.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="966.4308" y="-683.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="837.5,-640.5 837.5,-670.5 1066.5,-670.5 1066.5,-640.5 837.5,-640.5"/>
-<text text-anchor="start" x="844.5" y="-651.9" font-family="Arial" font-size="14.00" fill="#000000">project_id    </text>
-<text text-anchor="start" x="939.3822" y="-651.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="837.5,-610.5 837.5,-640.5 1066.5,-640.5 1066.5,-610.5 837.5,-610.5"/>
-<text text-anchor="start" x="844.5" y="-621.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="924.6024" y="-621.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="837.5,-580.5 837.5,-610.5 1066.5,-610.5 1066.5,-580.5 837.5,-580.5"/>
-<text text-anchor="start" x="844.5" y="-591.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="930.8324" y="-591.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="837.5,-550.5 837.5,-580.5 1066.5,-580.5 1066.5,-550.5 837.5,-550.5"/>
-<text text-anchor="start" x="844.5" y="-561.9" font-family="Arial" font-size="14.00" fill="#000000">provider    </text>
-<text text-anchor="start" x="929.263" y="-561.9" font-family="Arial" font-size="14.00" fill="#666666">[git_provider]</text>
-</g>
-<!-- public.repo&#45;&gt;public.user -->
-<g id="edge3" class="edge">
-<title>public.repo:user_id&#45;&gt;public.user:id</title>
-<path fill="none" stroke="#000000" d="M827.5104,-623.9097C759.0295,-600.597 814.0587,-327.7172 785.5,-253 760.1719,-186.7351 767.4404,-120.5 696.5,-120.5"/>
-<polygon fill="#000000" stroke="#000000" points="827.6244,-623.9278 836.7925,-629.944 832.5622,-624.7139 837.5,-625.5 837.5,-625.5 837.5,-625.5 832.5622,-624.7139 838.2075,-621.056 827.6244,-623.9278 827.6244,-623.9278"/>
-<text text-anchor="start" x="495.5045" y="-635.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (user_id) REFERENCES &quot;user&quot;(id) ON DELETE CASCADE</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/schema.json b/docs/database/schema.json
deleted file mode 100644
index 3d40ab780..000000000
--- a/docs/database/schema.json
+++ /dev/null
@@ -1 +0,0 @@
-{"name":"postgres","desc":"","tables":[{"name":"auth.users","type":"BASE TABLE","comment":"Auth: Stores user login data within a secure schema.","columns":[{"name":"instance_id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"aud","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"role","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"email","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"encrypted_password","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"confirmed_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"invited_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"confirmation_token","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"confirmation_sent_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"recovery_token","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"recovery_sent_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"email_change_token","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"email_change","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"email_change_sent_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"last_sign_in_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"raw_app_meta_data","type":"jsonb","nullable":true,"default":null,"comment":""},{"name":"raw_user_meta_data","type":"jsonb","nullable":true,"default":null,"comment":""},{"name":"is_super_admin","type":"boolean","nullable":true,"default":null,"comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"updated_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""}],"indexes":[{"name":"users_pkey","def":"CREATE UNIQUE INDEX users_pkey ON auth.users USING btree (id)","table":"auth.users","columns":["id"],"comment":""},{"name":"users_email_key","def":"CREATE UNIQUE INDEX users_email_key ON auth.users USING btree (email)","table":"auth.users","columns":["email"],"comment":""},{"name":"users_instance_id_email_idx","def":"CREATE INDEX users_instance_id_email_idx ON auth.users USING btree (instance_id, email)","table":"auth.users","columns":["email","instance_id"],"comment":""},{"name":"users_instance_id_idx","def":"CREATE INDEX users_instance_id_idx ON auth.users USING btree (instance_id)","table":"auth.users","columns":["instance_id"],"comment":""}],"constraints":[{"name":"users_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"auth.users","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""},{"name":"users_email_key","type":"UNIQUE","def":"UNIQUE (email)","table":"auth.users","referenced_table":"","columns":["email"],"referenced_columns":[],"comment":""}],"triggers":[{"name":"on_auth_user_created","def":"CREATE TRIGGER on_auth_user_created AFTER INSERT ON auth.users FOR EACH ROW EXECUTE FUNCTION handle_new_user()","comment":""}],"def":""},{"name":"auth.refresh_tokens","type":"BASE TABLE","comment":"Auth: Store of tokens used to refresh JWT tokens once they expire.","columns":[{"name":"instance_id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"id","type":"bigint","nullable":false,"default":"nextval('auth.refresh_tokens_id_seq'::regclass)","comment":""},{"name":"token","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"user_id","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"revoked","type":"boolean","nullable":true,"default":null,"comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"updated_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""}],"indexes":[{"name":"refresh_tokens_pkey","def":"CREATE UNIQUE INDEX refresh_tokens_pkey ON auth.refresh_tokens USING btree (id)","table":"auth.refresh_tokens","columns":["id"],"comment":""},{"name":"refresh_tokens_instance_id_idx","def":"CREATE INDEX refresh_tokens_instance_id_idx ON auth.refresh_tokens USING btree (instance_id)","table":"auth.refresh_tokens","columns":["instance_id"],"comment":""},{"name":"refresh_tokens_instance_id_user_id_idx","def":"CREATE INDEX refresh_tokens_instance_id_user_id_idx ON auth.refresh_tokens USING btree (instance_id, user_id)","table":"auth.refresh_tokens","columns":["instance_id","user_id"],"comment":""},{"name":"refresh_tokens_token_idx","def":"CREATE INDEX refresh_tokens_token_idx ON auth.refresh_tokens USING btree (token)","table":"auth.refresh_tokens","columns":["token"],"comment":""}],"constraints":[{"name":"refresh_tokens_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"auth.refresh_tokens","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"auth.instances","type":"BASE TABLE","comment":"Auth: Manages users across multiple sites.","columns":[{"name":"id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"uuid","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"raw_base_config","type":"text","nullable":true,"default":null,"comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"updated_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""}],"indexes":[{"name":"instances_pkey","def":"CREATE UNIQUE INDEX instances_pkey ON auth.instances USING btree (id)","table":"auth.instances","columns":["id"],"comment":""}],"constraints":[{"name":"instances_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"auth.instances","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"auth.audit_log_entries","type":"BASE TABLE","comment":"Auth: Audit trail for user actions.","columns":[{"name":"instance_id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"payload","type":"json","nullable":true,"default":null,"comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""}],"indexes":[{"name":"audit_log_entries_pkey","def":"CREATE UNIQUE INDEX audit_log_entries_pkey ON auth.audit_log_entries USING btree (id)","table":"auth.audit_log_entries","columns":["id"],"comment":""},{"name":"audit_logs_instance_id_idx","def":"CREATE INDEX audit_logs_instance_id_idx ON auth.audit_log_entries USING btree (instance_id)","table":"auth.audit_log_entries","columns":["instance_id"],"comment":""}],"constraints":[{"name":"audit_log_entries_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"auth.audit_log_entries","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"auth.schema_migrations","type":"BASE TABLE","comment":"Auth: Manages updates to the auth system.","columns":[{"name":"version","type":"varchar(255)","nullable":false,"default":null,"comment":""}],"indexes":[{"name":"schema_migrations_pkey","def":"CREATE UNIQUE INDEX schema_migrations_pkey ON auth.schema_migrations USING btree (version)","table":"auth.schema_migrations","columns":["version"],"comment":""}],"constraints":[{"name":"schema_migrations_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (version)","table":"auth.schema_migrations","referenced_table":"","columns":["version"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"storage.buckets","type":"BASE TABLE","comment":"","columns":[{"name":"id","type":"text","nullable":false,"default":null,"comment":""},{"name":"name","type":"text","nullable":false,"default":null,"comment":""},{"name":"owner","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":true,"default":"now()","comment":""},{"name":"updated_at","type":"timestamp with time zone","nullable":true,"default":"now()","comment":""}],"indexes":[{"name":"buckets_pkey","def":"CREATE UNIQUE INDEX buckets_pkey ON storage.buckets USING btree (id)","table":"storage.buckets","columns":["id"],"comment":""},{"name":"bname","def":"CREATE UNIQUE INDEX bname ON storage.buckets USING btree (name)","table":"storage.buckets","columns":["name"],"comment":""}],"constraints":[{"name":"buckets_owner_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (owner) REFERENCES auth.users(id)","table":"storage.buckets","referenced_table":"users","columns":["owner"],"referenced_columns":["id"],"comment":""},{"name":"buckets_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"storage.buckets","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"storage.objects","type":"BASE TABLE","comment":"","columns":[{"name":"id","type":"uuid","nullable":false,"default":"uuid_generate_v4()","comment":""},{"name":"bucket_id","type":"text","nullable":true,"default":null,"comment":""},{"name":"name","type":"text","nullable":true,"default":null,"comment":""},{"name":"owner","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":true,"default":"now()","comment":""},{"name":"updated_at","type":"timestamp with time zone","nullable":true,"default":"now()","comment":""},{"name":"last_accessed_at","type":"timestamp with time zone","nullable":true,"default":"now()","comment":""},{"name":"metadata","type":"jsonb","nullable":true,"default":null,"comment":""}],"indexes":[{"name":"objects_pkey","def":"CREATE UNIQUE INDEX objects_pkey ON storage.objects USING btree (id)","table":"storage.objects","columns":["id"],"comment":""},{"name":"bucketid_objname","def":"CREATE UNIQUE INDEX bucketid_objname ON storage.objects USING btree (bucket_id, name)","table":"storage.objects","columns":["bucket_id","name"],"comment":""},{"name":"name_prefix_search","def":"CREATE INDEX name_prefix_search ON storage.objects USING btree (name text_pattern_ops)","table":"storage.objects","columns":["name"],"comment":""}],"constraints":[{"name":"objects_owner_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (owner) REFERENCES auth.users(id)","table":"storage.objects","referenced_table":"users","columns":["owner"],"referenced_columns":["id"],"comment":""},{"name":"objects_bucketId_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (bucket_id) REFERENCES storage.buckets(id)","table":"storage.objects","referenced_table":"buckets","columns":["bucket_id"],"referenced_columns":["id"],"comment":""},{"name":"objects_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"storage.objects","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"storage.migrations","type":"BASE TABLE","comment":"","columns":[{"name":"id","type":"integer","nullable":false,"default":null,"comment":""},{"name":"name","type":"varchar(100)","nullable":false,"default":null,"comment":""},{"name":"hash","type":"varchar(40)","nullable":false,"default":null,"comment":""},{"name":"executed_at","type":"timestamp without time zone","nullable":true,"default":"CURRENT_TIMESTAMP","comment":""}],"indexes":[{"name":"migrations_pkey","def":"CREATE UNIQUE INDEX migrations_pkey ON storage.migrations USING btree (id)","table":"storage.migrations","columns":["id"],"comment":""},{"name":"migrations_name_key","def":"CREATE UNIQUE INDEX migrations_name_key ON storage.migrations USING btree (name)","table":"storage.migrations","columns":["name"],"comment":""}],"constraints":[{"name":"migrations_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"storage.migrations","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""},{"name":"migrations_name_key","type":"UNIQUE","def":"UNIQUE (name)","table":"storage.migrations","referenced_table":"","columns":["name"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"net.http_request_queue","type":"BASE TABLE","comment":"","columns":[{"name":"id","type":"bigint","nullable":false,"default":"nextval('net.http_request_queue_id_seq'::regclass)","comment":""},{"name":"method","type":"net.http_method","nullable":false,"default":null,"comment":""},{"name":"url","type":"text","nullable":false,"default":null,"comment":""},{"name":"headers","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"body","type":"bytea","nullable":true,"default":null,"comment":""},{"name":"timeout_milliseconds","type":"integer","nullable":false,"default":null,"comment":""}],"indexes":[],"constraints":[],"triggers":[],"def":""},{"name":"net._http_response","type":"BASE TABLE","comment":"","columns":[{"name":"id","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"status_code","type":"integer","nullable":true,"default":null,"comment":""},{"name":"content_type","type":"text","nullable":true,"default":null,"comment":""},{"name":"headers","type":"jsonb","nullable":true,"default":null,"comment":""},{"name":"content","type":"text","nullable":true,"default":null,"comment":""},{"name":"timed_out","type":"boolean","nullable":true,"default":null,"comment":""},{"name":"error_msg","type":"text","nullable":true,"default":null,"comment":""},{"name":"created","type":"timestamp with time zone","nullable":false,"default":"now()","comment":""}],"indexes":[{"name":"_http_response_created_idx","def":"CREATE INDEX _http_response_created_idx ON net._http_response USING btree (created)","table":"net._http_response","columns":["created"],"comment":""}],"constraints":[],"triggers":[],"def":""},{"name":"supabase_functions.migrations","type":"BASE TABLE","comment":"","columns":[{"name":"version","type":"text","nullable":false,"default":null,"comment":""},{"name":"inserted_at","type":"timestamp with time zone","nullable":false,"default":"now()","comment":""}],"indexes":[{"name":"migrations_pkey","def":"CREATE UNIQUE INDEX migrations_pkey ON supabase_functions.migrations USING btree (version)","table":"supabase_functions.migrations","columns":["version"],"comment":""}],"constraints":[{"name":"migrations_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (version)","table":"supabase_functions.migrations","referenced_table":"","columns":["version"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"supabase_functions.hooks","type":"BASE TABLE","comment":"Supabase Functions Hooks: Audit trail for triggered hooks.","columns":[{"name":"id","type":"bigint","nullable":false,"default":"nextval('supabase_functions.hooks_id_seq'::regclass)","comment":""},{"name":"hook_table_id","type":"integer","nullable":false,"default":null,"comment":""},{"name":"hook_name","type":"text","nullable":false,"default":null,"comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":false,"default":"now()","comment":""},{"name":"request_id","type":"bigint","nullable":true,"default":null,"comment":""}],"indexes":[{"name":"hooks_pkey","def":"CREATE UNIQUE INDEX hooks_pkey ON supabase_functions.hooks USING btree (id)","table":"supabase_functions.hooks","columns":["id"],"comment":""},{"name":"supabase_functions_hooks_request_id_idx","def":"CREATE INDEX supabase_functions_hooks_request_id_idx ON supabase_functions.hooks USING btree (request_id)","table":"supabase_functions.hooks","columns":["request_id"],"comment":""},{"name":"supabase_functions_hooks_h_table_id_h_name_idx","def":"CREATE INDEX supabase_functions_hooks_h_table_id_h_name_idx ON supabase_functions.hooks USING btree (hook_table_id, hook_name)","table":"supabase_functions.hooks","columns":["hook_name","hook_table_id"],"comment":""}],"constraints":[{"name":"hooks_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"supabase_functions.hooks","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"public.study","type":"BASE TABLE","comment":"","columns":[{"name":"id","type":"uuid","nullable":false,"default":"gen_random_uuid()","comment":""},{"name":"contact","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"title","type":"text","nullable":false,"default":null,"comment":""},{"name":"description","type":"text","nullable":false,"default":null,"comment":""},{"name":"icon_name","type":"text","nullable":false,"default":null,"comment":""},{"name":"published","type":"boolean","nullable":false,"default":"false","comment":""},{"name":"registry_published","type":"boolean","nullable":false,"default":"false","comment":""},{"name":"questionnaire","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"eligibility_criteria","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"observations","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"interventions","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"consent","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"schedule","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"report_specification","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"results","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":false,"default":"now()","comment":""},{"name":"updated_at","type":"timestamp with time zone","nullable":false,"default":"now()","comment":""},{"name":"user_id","type":"uuid","nullable":false,"default":null,"comment":"UserId of study creator"},{"name":"participation","type":"participation","nullable":false,"default":"'invite'::participation","comment":""},{"name":"result_sharing","type":"result_sharing","nullable":false,"default":"'private'::result_sharing","comment":""},{"name":"collaborator_emails","type":"text[]","nullable":false,"default":"'{}'::text[]","comment":""}],"indexes":[{"name":"study_id_key","def":"CREATE UNIQUE INDEX study_id_key ON public.study USING btree (id)","table":"public.study","columns":["id"],"comment":""},{"name":"study_pkey","def":"CREATE UNIQUE INDEX study_pkey ON public.study USING btree (id)","table":"public.study","columns":["id"],"comment":""}],"constraints":[{"name":"study_id_key","type":"UNIQUE","def":"UNIQUE (id)","table":"public.study","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""},{"name":"study_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"public.study","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""},{"name":"study_userId_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (user_id) REFERENCES \"user\"(id)","table":"public.study","referenced_table":"user","columns":["user_id"],"referenced_columns":["id"],"comment":""}],"triggers":[{"name":"handle_updated_at","def":"CREATE TRIGGER handle_updated_at BEFORE UPDATE ON public.study FOR EACH ROW EXECUTE FUNCTION moddatetime('updated_at')","comment":""}],"def":""},{"name":"public.study_subject","type":"BASE TABLE","comment":"","columns":[{"name":"id","type":"uuid","nullable":false,"default":"gen_random_uuid()","comment":""},{"name":"study_id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"user_id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"started_at","type":"timestamp with time zone","nullable":true,"default":"now()","comment":""},{"name":"selected_intervention_ids","type":"text[]","nullable":false,"default":null,"comment":""},{"name":"invite_code","type":"text","nullable":true,"default":null,"comment":""},{"name":"is_deleted","type":"boolean","nullable":false,"default":"false","comment":""}],"indexes":[{"name":"study_subject_pkey","def":"CREATE UNIQUE INDEX study_subject_pkey ON public.study_subject USING btree (id)","table":"public.study_subject","columns":["id"],"comment":""}],"constraints":[{"name":"study_subject_studyId_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE","table":"public.study_subject","referenced_table":"study","columns":["study_id"],"referenced_columns":["id"],"comment":""},{"name":"study_subject_loginCode_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (invite_code) REFERENCES study_invite(code) ON DELETE CASCADE","table":"public.study_subject","referenced_table":"study_invite","columns":["invite_code"],"referenced_columns":["code"],"comment":""},{"name":"study_subject_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"public.study_subject","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""},{"name":"study_subject_userId_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (user_id) REFERENCES \"user\"(id)","table":"public.study_subject","referenced_table":"user","columns":["user_id"],"referenced_columns":["id"],"comment":""}],"triggers":[],"def":""},{"name":"public.app_config","type":"BASE TABLE","comment":"Stores app config for different envs","columns":[{"name":"id","type":"text","nullable":false,"default":null,"comment":""},{"name":"app_min_version","type":"text","nullable":false,"default":null,"comment":""},{"name":"app_privacy","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"app_terms","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"designer_privacy","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"designer_terms","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"imprint","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"contact","type":"jsonb","nullable":false,"default":"'{\"email\": \"hpi-info@hpi.de\", \"phone\": \"+49-(0)331 5509-0\", \"website\": \"https://hpi.de/\", \"organization\": \"Hasso Plattner Institute\"}'::jsonb","comment":""},{"name":"analytics","type":"jsonb","nullable":true,"default":null,"comment":""}],"indexes":[{"name":"AppConfig_pkey","def":"CREATE UNIQUE INDEX \"AppConfig_pkey\" ON public.app_config USING btree (id)","table":"public.app_config","columns":["id"],"comment":""}],"constraints":[{"name":"AppConfig_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"public.app_config","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"public.repo","type":"BASE TABLE","comment":"Git repo where the generated project is stored","columns":[{"name":"project_id","type":"text","nullable":false,"default":null,"comment":""},{"name":"user_id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"study_id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"provider","type":"git_provider","nullable":false,"default":null,"comment":""}],"indexes":[{"name":"repo_pkey","def":"CREATE UNIQUE INDEX repo_pkey ON public.repo USING btree (project_id)","table":"public.repo","columns":["project_id"],"comment":""}],"constraints":[{"name":"repo_studyId_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (study_id) REFERENCES study(id)","table":"public.repo","referenced_table":"study","columns":["study_id"],"referenced_columns":["id"],"comment":""},{"name":"repo_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (project_id)","table":"public.repo","referenced_table":"","columns":["project_id"],"referenced_columns":[],"comment":""},{"name":"repo_userId_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (user_id) REFERENCES \"user\"(id) ON DELETE CASCADE","table":"public.repo","referenced_table":"user","columns":["user_id"],"referenced_columns":["id"],"comment":""}],"triggers":[],"def":""},{"name":"public.study_invite","type":"BASE TABLE","comment":"Study invite codes","columns":[{"name":"code","type":"text","nullable":false,"default":null,"comment":""},{"name":"study_id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"preselected_intervention_ids","type":"text[]","nullable":true,"default":null,"comment":"Intervention Ids (and order) preselected by study creator"}],"indexes":[{"name":"study_invite_pkey","def":"CREATE UNIQUE INDEX study_invite_pkey ON public.study_invite USING btree (code)","table":"public.study_invite","columns":["code"],"comment":""}],"constraints":[{"name":"study_invite_studyId_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE","table":"public.study_invite","referenced_table":"study","columns":["study_id"],"referenced_columns":["id"],"comment":""},{"name":"study_invite_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (code)","table":"public.study_invite","referenced_table":"","columns":["code"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"public.subject_progress","type":"BASE TABLE","comment":"","columns":[{"name":"completed_at","type":"timestamp with time zone","nullable":false,"default":"timezone('utc'::text, now())","comment":""},{"name":"subject_id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"intervention_id","type":"text","nullable":false,"default":null,"comment":""},{"name":"task_id","type":"text","nullable":false,"default":null,"comment":""},{"name":"result_type","type":"text","nullable":false,"default":null,"comment":""},{"name":"result","type":"jsonb","nullable":false,"default":null,"comment":""}],"indexes":[{"name":"participant_progress_pkey","def":"CREATE UNIQUE INDEX participant_progress_pkey ON public.subject_progress USING btree (completed_at, subject_id)","table":"public.subject_progress","columns":["completed_at","subject_id"],"comment":""}],"constraints":[{"name":"participant_progress_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (completed_at, subject_id)","table":"public.subject_progress","referenced_table":"","columns":["completed_at","subject_id"],"referenced_columns":[],"comment":""},{"name":"participant_progress_subjectId_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (subject_id) REFERENCES study_subject(id) ON DELETE CASCADE","table":"public.subject_progress","referenced_table":"study_subject","columns":["subject_id"],"referenced_columns":["id"],"comment":""}],"triggers":[],"def":""},{"name":"public.study_progress_export","type":"VIEW","comment":"","columns":[{"name":"completed_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"intervention_id","type":"text","nullable":true,"default":null,"comment":""},{"name":"task_id","type":"text","nullable":true,"default":null,"comment":""},{"name":"result_type","type":"text","nullable":true,"default":null,"comment":""},{"name":"result","type":"jsonb","nullable":true,"default":null,"comment":""},{"name":"subject_id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"user_id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"study_id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"started_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"selected_intervention_ids","type":"text[]","nullable":true,"default":null,"comment":""}],"indexes":[],"constraints":[],"triggers":[],"def":"CREATE VIEW study_progress_export AS (\n SELECT subject_progress.completed_at,\n    subject_progress.intervention_id,\n    subject_progress.task_id,\n    subject_progress.result_type,\n    subject_progress.result,\n    subject_progress.subject_id,\n    study_subject.user_id,\n    study_subject.study_id,\n    study_subject.started_at,\n    study_subject.selected_intervention_ids\n   FROM study_subject,\n    subject_progress\n  WHERE (study_subject.id = subject_progress.subject_id)\n)","referenced_tables":["public.study_subject"]},{"name":"public.user","type":"BASE TABLE","comment":"Users get automatically added, when a new user is created in auth.users","columns":[{"name":"id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"email","type":"text","nullable":true,"default":null,"comment":""},{"name":"preferences","type":"jsonb","nullable":true,"default":null,"comment":""}],"indexes":[{"name":"user_pkey","def":"CREATE UNIQUE INDEX user_pkey ON public.\"user\" USING btree (id)","table":"public.user","columns":["id"],"comment":""}],"constraints":[{"name":"user_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"public.user","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"extensions.pg_stat_statements_info","type":"VIEW","comment":"","columns":[{"name":"dealloc","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"stats_reset","type":"timestamp with time zone","nullable":true,"default":null,"comment":""}],"indexes":[],"constraints":[],"triggers":[],"def":"CREATE VIEW pg_stat_statements_info AS (\n SELECT pg_stat_statements_info.dealloc,\n    pg_stat_statements_info.stats_reset\n   FROM pg_stat_statements_info() pg_stat_statements_info(dealloc, stats_reset)\n)","referenced_tables":["pg_stat_statements_info"]},{"name":"extensions.pg_stat_statements","type":"VIEW","comment":"","columns":[{"name":"userid","type":"oid","nullable":true,"default":null,"comment":""},{"name":"dbid","type":"oid","nullable":true,"default":null,"comment":""},{"name":"toplevel","type":"boolean","nullable":true,"default":null,"comment":""},{"name":"queryid","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"query","type":"text","nullable":true,"default":null,"comment":""},{"name":"plans","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"total_plan_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"min_plan_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"max_plan_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"mean_plan_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"stddev_plan_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"calls","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"total_exec_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"min_exec_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"max_exec_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"mean_exec_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"stddev_exec_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"rows","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"shared_blks_hit","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"shared_blks_read","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"shared_blks_dirtied","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"shared_blks_written","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"local_blks_hit","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"local_blks_read","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"local_blks_dirtied","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"local_blks_written","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"temp_blks_read","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"temp_blks_written","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"blk_read_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"blk_write_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"temp_blk_read_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"temp_blk_write_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"wal_records","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"wal_fpi","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"wal_bytes","type":"numeric","nullable":true,"default":null,"comment":""},{"name":"jit_functions","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"jit_generation_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"jit_inlining_count","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"jit_inlining_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"jit_optimization_count","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"jit_optimization_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"jit_emission_count","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"jit_emission_time","type":"double precision","nullable":true,"default":null,"comment":""}],"indexes":[],"constraints":[],"triggers":[],"def":"CREATE VIEW pg_stat_statements AS (\n SELECT pg_stat_statements.userid,\n    pg_stat_statements.dbid,\n    pg_stat_statements.toplevel,\n    pg_stat_statements.queryid,\n    pg_stat_statements.query,\n    pg_stat_statements.plans,\n    pg_stat_statements.total_plan_time,\n    pg_stat_statements.min_plan_time,\n    pg_stat_statements.max_plan_time,\n    pg_stat_statements.mean_plan_time,\n    pg_stat_statements.stddev_plan_time,\n    pg_stat_statements.calls,\n    pg_stat_statements.total_exec_time,\n    pg_stat_statements.min_exec_time,\n    pg_stat_statements.max_exec_time,\n    pg_stat_statements.mean_exec_time,\n    pg_stat_statements.stddev_exec_time,\n    pg_stat_statements.rows,\n    pg_stat_statements.shared_blks_hit,\n    pg_stat_statements.shared_blks_read,\n    pg_stat_statements.shared_blks_dirtied,\n    pg_stat_statements.shared_blks_written,\n    pg_stat_statements.local_blks_hit,\n    pg_stat_statements.local_blks_read,\n    pg_stat_statements.local_blks_dirtied,\n    pg_stat_statements.local_blks_written,\n    pg_stat_statements.temp_blks_read,\n    pg_stat_statements.temp_blks_written,\n    pg_stat_statements.blk_read_time,\n    pg_stat_statements.blk_write_time,\n    pg_stat_statements.temp_blk_read_time,\n    pg_stat_statements.temp_blk_write_time,\n    pg_stat_statements.wal_records,\n    pg_stat_statements.wal_fpi,\n    pg_stat_statements.wal_bytes,\n    pg_stat_statements.jit_functions,\n    pg_stat_statements.jit_generation_time,\n    pg_stat_statements.jit_inlining_count,\n    pg_stat_statements.jit_inlining_time,\n    pg_stat_statements.jit_optimization_count,\n    pg_stat_statements.jit_optimization_time,\n    pg_stat_statements.jit_emission_count,\n    pg_stat_statements.jit_emission_time\n   FROM pg_stat_statements(true) pg_stat_statements(userid, dbid, toplevel, queryid, query, plans, total_plan_time, min_plan_time, max_plan_time, mean_plan_time, stddev_plan_time, calls, total_exec_time, min_exec_time, max_exec_time, mean_exec_time, stddev_exec_time, rows, shared_blks_hit, shared_blks_read, shared_blks_dirtied, shared_blks_written, local_blks_hit, local_blks_read, local_blks_dirtied, local_blks_written, temp_blks_read, temp_blks_written, blk_read_time, blk_write_time, temp_blk_read_time, temp_blk_write_time, wal_records, wal_fpi, wal_bytes, jit_functions, jit_generation_time, jit_inlining_count, jit_inlining_time, jit_optimization_count, jit_optimization_time, jit_emission_count, jit_emission_time)\n)","referenced_tables":["pg_stat_statements"]},{"name":"pgsodium.key","type":"BASE TABLE","comment":"This table holds metadata for derived keys given a key_id and key_context. The raw key is never stored.","columns":[{"name":"id","type":"uuid","nullable":false,"default":"gen_random_uuid()","comment":""},{"name":"status","type":"pgsodium.key_status","nullable":true,"default":"'valid'::pgsodium.key_status","comment":""},{"name":"created","type":"timestamp with time zone","nullable":false,"default":"CURRENT_TIMESTAMP","comment":""},{"name":"expires","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"key_type","type":"pgsodium.key_type","nullable":true,"default":null,"comment":""},{"name":"key_id","type":"bigint","nullable":true,"default":"nextval('pgsodium.key_key_id_seq'::regclass)","comment":""},{"name":"key_context","type":"bytea","nullable":true,"default":"'\\x7067736f6469756d'::bytea","comment":""},{"name":"name","type":"text","nullable":true,"default":null,"comment":""},{"name":"associated_data","type":"text","nullable":true,"default":"'associated'::text","comment":""},{"name":"raw_key","type":"bytea","nullable":true,"default":null,"comment":""},{"name":"raw_key_nonce","type":"bytea","nullable":true,"default":null,"comment":""},{"name":"parent_key","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"comment","type":"text","nullable":true,"default":null,"comment":""},{"name":"user_data","type":"text","nullable":true,"default":null,"comment":""}],"indexes":[{"name":"key_pkey","def":"CREATE UNIQUE INDEX key_pkey ON pgsodium.key USING btree (id)","table":"pgsodium.key","columns":["id"],"comment":""},{"name":"key_status_idx","def":"CREATE INDEX key_status_idx ON pgsodium.key USING btree (status) WHERE (status = ANY (ARRAY['valid'::pgsodium.key_status, 'default'::pgsodium.key_status]))","table":"pgsodium.key","columns":["status"],"comment":""},{"name":"key_status_idx1","def":"CREATE UNIQUE INDEX key_status_idx1 ON pgsodium.key USING btree (status) WHERE (status = 'default'::pgsodium.key_status)","table":"pgsodium.key","columns":["status"],"comment":""},{"name":"key_key_id_key_context_key_type_idx","def":"CREATE UNIQUE INDEX key_key_id_key_context_key_type_idx ON pgsodium.key USING btree (key_id, key_context, key_type)","table":"pgsodium.key","columns":["key_context","key_id","key_type"],"comment":""},{"name":"pgsodium_key_unique_name","def":"CREATE UNIQUE INDEX pgsodium_key_unique_name ON pgsodium.key USING btree (name)","table":"pgsodium.key","columns":["name"],"comment":""}],"constraints":[{"name":"key_key_context_check","type":"CHECK","def":"CHECK ((length(key_context) = 8))","table":"pgsodium.key","referenced_table":"","columns":["key_context"],"referenced_columns":[],"comment":""},{"name":"pgsodium_raw","type":"CHECK","def":"CHECK (\nCASE\n    WHEN (raw_key IS NOT NULL) THEN ((key_id IS NULL) AND (key_context IS NULL) AND (parent_key IS NOT NULL))\n    ELSE ((key_id IS NOT NULL) AND (key_context IS NOT NULL) AND (parent_key IS NULL))\nEND)","table":"pgsodium.key","referenced_table":"","columns":["key_id","key_context","raw_key","parent_key"],"referenced_columns":[],"comment":""},{"name":"key_parent_key_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (parent_key) REFERENCES pgsodium.key(id)","table":"pgsodium.key","referenced_table":"key","columns":["parent_key"],"referenced_columns":["id"],"comment":""},{"name":"key_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"pgsodium.key","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""},{"name":"pgsodium_key_unique_name","type":"UNIQUE","def":"UNIQUE (name)","table":"pgsodium.key","referenced_table":"","columns":["name"],"referenced_columns":[],"comment":""}],"triggers":[{"name":"key_encrypt_secret_trigger_raw_key","def":"CREATE TRIGGER key_encrypt_secret_trigger_raw_key BEFORE INSERT OR UPDATE OF raw_key ON pgsodium.key FOR EACH ROW EXECUTE FUNCTION pgsodium.key_encrypt_secret_raw_key()","comment":""}],"def":""},{"name":"pgsodium.valid_key","type":"VIEW","comment":"","columns":[{"name":"id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"name","type":"text","nullable":true,"default":null,"comment":""},{"name":"status","type":"pgsodium.key_status","nullable":true,"default":null,"comment":""},{"name":"key_type","type":"pgsodium.key_type","nullable":true,"default":null,"comment":""},{"name":"key_id","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"key_context","type":"bytea","nullable":true,"default":null,"comment":""},{"name":"created","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"expires","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"associated_data","type":"text","nullable":true,"default":null,"comment":""}],"indexes":[],"constraints":[],"triggers":[],"def":"CREATE VIEW valid_key AS (\n SELECT key.id,\n    key.name,\n    key.status,\n    key.key_type,\n    key.key_id,\n    key.key_context,\n    key.created,\n    key.expires,\n    key.associated_data\n   FROM pgsodium.key\n  WHERE ((key.status = ANY (ARRAY['valid'::pgsodium.key_status, 'default'::pgsodium.key_status])) AND\n        CASE\n            WHEN (key.expires IS NULL) THEN true\n            ELSE (key.expires \u003e now())\n        END)\n)","referenced_tables":["pgsodium.key"]},{"name":"pgsodium.masking_rule","type":"VIEW","comment":"","columns":[{"name":"attrelid","type":"oid","nullable":true,"default":null,"comment":""},{"name":"attnum","type":"integer","nullable":true,"default":null,"comment":""},{"name":"relnamespace","type":"regnamespace","nullable":true,"default":null,"comment":""},{"name":"relname","type":"name","nullable":true,"default":null,"comment":""},{"name":"attname","type":"name","nullable":true,"default":null,"comment":""},{"name":"format_type","type":"text","nullable":true,"default":null,"comment":""},{"name":"col_description","type":"text","nullable":true,"default":null,"comment":""},{"name":"key_id_column","type":"text","nullable":true,"default":null,"comment":""},{"name":"key_id","type":"text","nullable":true,"default":null,"comment":""},{"name":"associated_columns","type":"text","nullable":true,"default":null,"comment":""},{"name":"nonce_column","type":"text","nullable":true,"default":null,"comment":""},{"name":"view_name","type":"text","nullable":true,"default":null,"comment":""},{"name":"priority","type":"integer","nullable":true,"default":null,"comment":""},{"name":"security_invoker","type":"boolean","nullable":true,"default":null,"comment":""}],"indexes":[],"constraints":[],"triggers":[],"def":"CREATE VIEW masking_rule AS (\n WITH const AS (\n         SELECT 'encrypt +with +key +id +([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})'::text AS pattern_key_id,\n            'encrypt +with +key +column +([\\w\\\"\\-$]+)'::text AS pattern_key_id_column,\n            '(?\u003c=associated) +\\(([\\w\\\"\\-$, ]+)\\)'::text AS pattern_associated_columns,\n            '(?\u003c=nonce) +([\\w\\\"\\-$]+)'::text AS pattern_nonce_column,\n            '(?\u003c=decrypt with view) +([\\w\\\"\\-$]+\\.[\\w\\\"\\-$]+)'::text AS pattern_view_name,\n            '(?\u003c=security invoker)'::text AS pattern_security_invoker\n        ), rules_from_seclabels AS (\n         SELECT sl.objoid AS attrelid,\n            sl.objsubid AS attnum,\n            (c.relnamespace)::regnamespace AS relnamespace,\n            c.relname,\n            a.attname,\n            format_type(a.atttypid, a.atttypmod) AS format_type,\n            sl.label AS col_description,\n            (regexp_match(sl.label, k.pattern_key_id_column, 'i'::text))[1] AS key_id_column,\n            (regexp_match(sl.label, k.pattern_key_id, 'i'::text))[1] AS key_id,\n            (regexp_match(sl.label, k.pattern_associated_columns, 'i'::text))[1] AS associated_columns,\n            (regexp_match(sl.label, k.pattern_nonce_column, 'i'::text))[1] AS nonce_column,\n            COALESCE((regexp_match(sl2.label, k.pattern_view_name, 'i'::text))[1], (((c.relnamespace)::regnamespace || '.'::text) || quote_ident(('decrypted_'::text || (c.relname)::text)))) AS view_name,\n            100 AS priority,\n            ((regexp_match(sl.label, k.pattern_security_invoker, 'i'::text))[1] IS NOT NULL) AS security_invoker\n           FROM const k,\n            (((pg_seclabel sl\n             JOIN pg_class c ON (((sl.classoid = c.tableoid) AND (sl.objoid = c.oid))))\n             JOIN pg_attribute a ON (((a.attrelid = c.oid) AND (sl.objsubid = a.attnum))))\n             LEFT JOIN pg_seclabel sl2 ON (((sl2.objoid = c.oid) AND (sl2.objsubid = 0))))\n          WHERE ((a.attnum \u003e 0) AND (((c.relnamespace)::regnamespace)::oid \u003c\u003e ('pg_catalog'::regnamespace)::oid) AND (NOT a.attisdropped) AND (sl.label ~~* 'ENCRYPT%'::text) AND (sl.provider = 'pgsodium'::text))\n        )\n SELECT DISTINCT ON (rules_from_seclabels.attrelid, rules_from_seclabels.attnum) rules_from_seclabels.attrelid,\n    rules_from_seclabels.attnum,\n    rules_from_seclabels.relnamespace,\n    rules_from_seclabels.relname,\n    rules_from_seclabels.attname,\n    rules_from_seclabels.format_type,\n    rules_from_seclabels.col_description,\n    rules_from_seclabels.key_id_column,\n    rules_from_seclabels.key_id,\n    rules_from_seclabels.associated_columns,\n    rules_from_seclabels.nonce_column,\n    rules_from_seclabels.view_name,\n    rules_from_seclabels.priority,\n    rules_from_seclabels.security_invoker\n   FROM rules_from_seclabels\n  ORDER BY rules_from_seclabels.attrelid, rules_from_seclabels.attnum, rules_from_seclabels.priority DESC\n)"},{"name":"pgsodium.mask_columns","type":"VIEW","comment":"","columns":[{"name":"attname","type":"name","nullable":true,"default":null,"comment":""},{"name":"attrelid","type":"oid","nullable":true,"default":null,"comment":""},{"name":"key_id","type":"text","nullable":true,"default":null,"comment":""},{"name":"key_id_column","type":"text","nullable":true,"default":null,"comment":""},{"name":"associated_columns","type":"text","nullable":true,"default":null,"comment":""},{"name":"nonce_column","type":"text","nullable":true,"default":null,"comment":""},{"name":"format_type","type":"text","nullable":true,"default":null,"comment":""}],"indexes":[],"constraints":[],"triggers":[],"def":"CREATE VIEW mask_columns AS (\n SELECT a.attname,\n    a.attrelid,\n    m.key_id,\n    m.key_id_column,\n    m.associated_columns,\n    m.nonce_column,\n    m.format_type\n   FROM (pg_attribute a\n     LEFT JOIN pgsodium.masking_rule m ON (((m.attrelid = a.attrelid) AND (m.attname = a.attname))))\n  WHERE ((a.attnum \u003e 0) AND (NOT a.attisdropped))\n  ORDER BY a.attnum\n)","referenced_tables":["pg_attribute","pgsodium.masking_rule"]},{"name":"pgsodium.decrypted_key","type":"VIEW","comment":"","columns":[{"name":"id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"status","type":"pgsodium.key_status","nullable":true,"default":null,"comment":""},{"name":"created","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"expires","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"key_type","type":"pgsodium.key_type","nullable":true,"default":null,"comment":""},{"name":"key_id","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"key_context","type":"bytea","nullable":true,"default":null,"comment":""},{"name":"name","type":"text","nullable":true,"default":null,"comment":""},{"name":"associated_data","type":"text","nullable":true,"default":null,"comment":""},{"name":"raw_key","type":"bytea","nullable":true,"default":null,"comment":""},{"name":"decrypted_raw_key","type":"bytea","nullable":true,"default":null,"comment":""},{"name":"raw_key_nonce","type":"bytea","nullable":true,"default":null,"comment":""},{"name":"parent_key","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"comment","type":"text","nullable":true,"default":null,"comment":""}],"indexes":[],"constraints":[],"triggers":[],"def":"CREATE VIEW decrypted_key AS (\n SELECT key.id,\n    key.status,\n    key.created,\n    key.expires,\n    key.key_type,\n    key.key_id,\n    key.key_context,\n    key.name,\n    key.associated_data,\n    key.raw_key,\n        CASE\n            WHEN (key.raw_key IS NULL) THEN NULL::bytea\n            ELSE\n            CASE\n                WHEN (key.parent_key IS NULL) THEN NULL::bytea\n                ELSE pgsodium.crypto_aead_det_decrypt(key.raw_key, convert_to(((key.id)::text || key.associated_data), 'utf8'::name), key.parent_key, key.raw_key_nonce)\n            END\n        END AS decrypted_raw_key,\n    key.raw_key_nonce,\n    key.parent_key,\n    key.comment\n   FROM pgsodium.key\n)","referenced_tables":["pgsodium.key"]},{"name":"vault.secrets","type":"BASE TABLE","comment":"Table with encrypted `secret` column for storing sensitive information on disk.","columns":[{"name":"id","type":"uuid","nullable":false,"default":"gen_random_uuid()","comment":""},{"name":"name","type":"text","nullable":true,"default":null,"comment":""},{"name":"description","type":"text","nullable":false,"default":"''::text","comment":""},{"name":"secret","type":"text","nullable":false,"default":null,"comment":""},{"name":"key_id","type":"uuid","nullable":true,"default":"(pgsodium.create_key()).id","comment":""},{"name":"nonce","type":"bytea","nullable":true,"default":"pgsodium.crypto_aead_det_noncegen()","comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":false,"default":"CURRENT_TIMESTAMP","comment":""},{"name":"updated_at","type":"timestamp with time zone","nullable":false,"default":"CURRENT_TIMESTAMP","comment":""}],"indexes":[{"name":"secrets_pkey","def":"CREATE UNIQUE INDEX secrets_pkey ON vault.secrets USING btree (id)","table":"vault.secrets","columns":["id"],"comment":""},{"name":"secrets_name_idx","def":"CREATE UNIQUE INDEX secrets_name_idx ON vault.secrets USING btree (name) WHERE (name IS NOT NULL)","table":"vault.secrets","columns":["name"],"comment":""}],"constraints":[{"name":"secrets_key_id_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (key_id) REFERENCES pgsodium.key(id)","table":"vault.secrets","referenced_table":"key","columns":["key_id"],"referenced_columns":["id"],"comment":""},{"name":"secrets_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"vault.secrets","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""}],"triggers":[{"name":"secrets_encrypt_secret_trigger_secret","def":"CREATE TRIGGER secrets_encrypt_secret_trigger_secret BEFORE INSERT OR UPDATE OF secret ON vault.secrets FOR EACH ROW EXECUTE FUNCTION vault.secrets_encrypt_secret_secret()","comment":""}],"def":""},{"name":"vault.decrypted_secrets","type":"VIEW","comment":"","columns":[{"name":"id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"name","type":"text","nullable":true,"default":null,"comment":""},{"name":"description","type":"text","nullable":true,"default":null,"comment":""},{"name":"secret","type":"text","nullable":true,"default":null,"comment":""},{"name":"decrypted_secret","type":"text","nullable":true,"default":null,"comment":""},{"name":"key_id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"nonce","type":"bytea","nullable":true,"default":null,"comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"updated_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""}],"indexes":[],"constraints":[],"triggers":[],"def":"CREATE VIEW decrypted_secrets AS (\n SELECT secrets.id,\n    secrets.name,\n    secrets.description,\n    secrets.secret,\n        CASE\n            WHEN (secrets.secret IS NULL) THEN NULL::text\n            ELSE\n            CASE\n                WHEN (secrets.key_id IS NULL) THEN NULL::text\n                ELSE convert_from(pgsodium.crypto_aead_det_decrypt(decode(secrets.secret, 'base64'::text), convert_to(((((secrets.id)::text || secrets.description) || (secrets.created_at)::text) || (secrets.updated_at)::text), 'utf8'::name), secrets.key_id, secrets.nonce), 'utf8'::name)\n            END\n        END AS decrypted_secret,\n    secrets.key_id,\n    secrets.nonce,\n    secrets.created_at,\n    secrets.updated_at\n   FROM vault.secrets\n)","referenced_tables":["vault.secrets"]}],"relations":[{"table":"storage.buckets","columns":["owner"],"cardinality":"Zero or more","parent_table":"auth.users","parent_columns":["id"],"parent_cardinality":"Zero or one","def":"FOREIGN KEY (owner) REFERENCES auth.users(id)","virtual":false},{"table":"storage.objects","columns":["owner"],"cardinality":"Zero or more","parent_table":"auth.users","parent_columns":["id"],"parent_cardinality":"Zero or one","def":"FOREIGN KEY (owner) REFERENCES auth.users(id)","virtual":false},{"table":"storage.objects","columns":["bucket_id"],"cardinality":"Zero or more","parent_table":"storage.buckets","parent_columns":["id"],"parent_cardinality":"Zero or one","def":"FOREIGN KEY (bucket_id) REFERENCES storage.buckets(id)","virtual":false},{"table":"public.study","columns":["user_id"],"cardinality":"Zero or more","parent_table":"public.user","parent_columns":["id"],"parent_cardinality":"Exactly one","def":"FOREIGN KEY (user_id) REFERENCES \"user\"(id)","virtual":false},{"table":"public.study_subject","columns":["study_id"],"cardinality":"Zero or more","parent_table":"public.study","parent_columns":["id"],"parent_cardinality":"Exactly one","def":"FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE","virtual":false},{"table":"public.study_subject","columns":["invite_code"],"cardinality":"Zero or more","parent_table":"public.study_invite","parent_columns":["code"],"parent_cardinality":"Zero or one","def":"FOREIGN KEY (invite_code) REFERENCES study_invite(code) ON DELETE CASCADE","virtual":false},{"table":"public.study_subject","columns":["user_id"],"cardinality":"Zero or more","parent_table":"public.user","parent_columns":["id"],"parent_cardinality":"Exactly one","def":"FOREIGN KEY (user_id) REFERENCES \"user\"(id)","virtual":false},{"table":"public.repo","columns":["study_id"],"cardinality":"Zero or more","parent_table":"public.study","parent_columns":["id"],"parent_cardinality":"Exactly one","def":"FOREIGN KEY (study_id) REFERENCES study(id)","virtual":false},{"table":"public.repo","columns":["user_id"],"cardinality":"Zero or more","parent_table":"public.user","parent_columns":["id"],"parent_cardinality":"Exactly one","def":"FOREIGN KEY (user_id) REFERENCES \"user\"(id) ON DELETE CASCADE","virtual":false},{"table":"public.study_invite","columns":["study_id"],"cardinality":"Zero or more","parent_table":"public.study","parent_columns":["id"],"parent_cardinality":"Exactly one","def":"FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE","virtual":false},{"table":"public.subject_progress","columns":["subject_id"],"cardinality":"Zero or more","parent_table":"public.study_subject","parent_columns":["id"],"parent_cardinality":"Exactly one","def":"FOREIGN KEY (subject_id) REFERENCES study_subject(id) ON DELETE CASCADE","virtual":false},{"table":"pgsodium.key","columns":["parent_key"],"cardinality":"Zero or more","parent_table":"pgsodium.key","parent_columns":["id"],"parent_cardinality":"Zero or one","def":"FOREIGN KEY (parent_key) REFERENCES pgsodium.key(id)","virtual":false},{"table":"vault.secrets","columns":["key_id"],"cardinality":"Zero or more","parent_table":"pgsodium.key","parent_columns":["id"],"parent_cardinality":"Zero or one","def":"FOREIGN KEY (key_id) REFERENCES pgsodium.key(id)","virtual":false}],"functions":[{"name":"extensions.uuid_generate_v4","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"pgbouncer.get_auth","return_type":"record","arguments":"p_usename text","type":"FUNCTION"},{"name":"storage.filename","return_type":"text","arguments":"name text","type":"FUNCTION"},{"name":"extensions.digest","return_type":"bytea","arguments":"text, text","type":"FUNCTION"},{"name":"storage.foldername","return_type":"_text","arguments":"name text","type":"FUNCTION"},{"name":"extensions.decrypt_iv","return_type":"bytea","arguments":"bytea, bytea, bytea, text","type":"FUNCTION"},{"name":"storage.extension","return_type":"text","arguments":"name text","type":"FUNCTION"},{"name":"extensions.gen_random_bytes","return_type":"bytea","arguments":"integer","type":"FUNCTION"},{"name":"extensions.encrypt","return_type":"bytea","arguments":"bytea, bytea, text","type":"FUNCTION"},{"name":"extensions.decrypt","return_type":"bytea","arguments":"bytea, bytea, text","type":"FUNCTION"},{"name":"extensions.encrypt_iv","return_type":"bytea","arguments":"bytea, bytea, bytea, text","type":"FUNCTION"},{"name":"extensions.gen_random_uuid","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"extensions.uuid_nil","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"extensions.uuid_ns_dns","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"storage.search","return_type":"record","arguments":"prefix text, bucketname text, limits integer DEFAULT 100, levels integer DEFAULT 1, offsets integer DEFAULT 0","type":"FUNCTION"},{"name":"extensions.uuid_ns_url","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"extensions.uuid_ns_oid","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"auth.uid","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"auth.email","return_type":"text","arguments":"","type":"FUNCTION"},{"name":"extensions.uuid_generate_v3","return_type":"uuid","arguments":"namespace uuid, name text","type":"FUNCTION"},{"name":"extensions.uuid_ns_x500","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"extensions.uuid_generate_v1","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"extensions.uuid_generate_v1mc","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"net.check_worker_is_up","return_type":"void","arguments":"","type":"FUNCTION"},{"name":"net._await_response","return_type":"bool","arguments":"request_id bigint","type":"FUNCTION"},{"name":"net._urlencode_string","return_type":"text","arguments":"string character varying","type":"FUNCTION"},{"name":"net._encode_url_with_params_array","return_type":"text","arguments":"url text, params_array text[]","type":"FUNCTION"},{"name":"graphql.increment_schema_version","return_type":"event_trigger","arguments":"","type":"FUNCTION"},{"name":"graphql.get_schema_version","return_type":"int4","arguments":"","type":"FUNCTION"},{"name":"graphql.resolve","return_type":"jsonb","arguments":"query text, variables jsonb DEFAULT '{}'::jsonb, \"operationName\" text DEFAULT NULL::text, extensions jsonb DEFAULT NULL::jsonb","type":"FUNCTION"},{"name":"extensions.pgp_pub_decrypt_bytea","return_type":"bytea","arguments":"bytea, bytea, text","type":"FUNCTION"},{"name":"extensions.pgp_pub_decrypt","return_type":"text","arguments":"bytea, bytea, text, text","type":"FUNCTION"},{"name":"extensions.pgp_pub_decrypt_bytea","return_type":"bytea","arguments":"bytea, bytea, text, text","type":"FUNCTION"},{"name":"net.http_delete","return_type":"int8","arguments":"url text, params jsonb DEFAULT '{}'::jsonb, headers jsonb DEFAULT '{}'::jsonb, timeout_milliseconds integer DEFAULT 2000","type":"FUNCTION"},{"name":"net._http_collect_response","return_type":"http_response_result","arguments":"request_id bigint, async boolean DEFAULT true","type":"FUNCTION"},{"name":"net.http_collect_response","return_type":"http_response_result","arguments":"request_id bigint, async boolean DEFAULT true","type":"FUNCTION"},{"name":"supabase_functions.http_request","return_type":"trigger","arguments":"","type":"FUNCTION"},{"name":"public.active_subject_count","return_type":"int4","arguments":"study study","type":"FUNCTION"},{"name":"public.can_edit","return_type":"bool","arguments":"user_id uuid, study_param study","type":"FUNCTION"},{"name":"public.get_study_from_invite","return_type":"record","arguments":"invite_code text","type":"FUNCTION"},{"name":"public.get_study_record_from_invite","return_type":"study","arguments":"invite_code text","type":"FUNCTION"},{"name":"public.handle_new_user","return_type":"trigger","arguments":"","type":"FUNCTION"},{"name":"public.has_study_ended","return_type":"bool","arguments":"psubject_id uuid","type":"FUNCTION"},{"name":"public.has_results_public","return_type":"bool","arguments":"psubject_id uuid","type":"FUNCTION"},{"name":"public.has_study_ended","return_type":"bool","arguments":"subject study_subject","type":"FUNCTION"},{"name":"public.is_active_subject","return_type":"bool","arguments":"psubject_id uuid, days_active integer","type":"FUNCTION"},{"name":"public.is_study_subject_of","return_type":"bool","arguments":"_user_id uuid, _study_id uuid","type":"FUNCTION"},{"name":"public.last_completed_task","return_type":"date","arguments":"psubject_id uuid","type":"FUNCTION"},{"name":"public.study_active_days","return_type":"_int4","arguments":"study_param study","type":"FUNCTION"},{"name":"public.study_ended_count","return_type":"int4","arguments":"study study","type":"FUNCTION"},{"name":"public.study_length","return_type":"int4","arguments":"study_param study","type":"FUNCTION"},{"name":"public.study_missed_days","return_type":"_int4","arguments":"study_param study","type":"FUNCTION"},{"name":"net.http_get","return_type":"int8","arguments":"url text, params jsonb DEFAULT '{}'::jsonb, headers jsonb DEFAULT '{}'::jsonb, timeout_milliseconds integer DEFAULT 2000","type":"FUNCTION"},{"name":"extensions.pgp_sym_decrypt_bytea","return_type":"bytea","arguments":"bytea, text, text","type":"FUNCTION"},{"name":"public.study_participant_count","return_type":"int4","arguments":"study study","type":"FUNCTION"},{"name":"public.study_total_tasks","return_type":"int4","arguments":"subject study_subject","type":"FUNCTION"},{"name":"public.subject_current_day","return_type":"int4","arguments":"subject study_subject","type":"FUNCTION"},{"name":"public.subject_total_active_days","return_type":"int4","arguments":"subject study_subject","type":"FUNCTION"},{"name":"public.user_email","return_type":"text","arguments":"user_id uuid","type":"FUNCTION"},{"name":"extensions.pgp_pub_encrypt","return_type":"bytea","arguments":"text, bytea","type":"FUNCTION"},{"name":"extensions.pgp_pub_encrypt_bytea","return_type":"bytea","arguments":"bytea, bytea","type":"FUNCTION"},{"name":"extensions.pgp_pub_encrypt","return_type":"bytea","arguments":"text, bytea, text","type":"FUNCTION"},{"name":"extensions.pgp_pub_encrypt_bytea","return_type":"bytea","arguments":"bytea, bytea, text","type":"FUNCTION"},{"name":"extensions.pgp_pub_decrypt","return_type":"text","arguments":"bytea, bytea","type":"FUNCTION"},{"name":"extensions.pgp_pub_decrypt_bytea","return_type":"bytea","arguments":"bytea, bytea","type":"FUNCTION"},{"name":"extensions.pgp_pub_decrypt","return_type":"text","arguments":"bytea, bytea, text","type":"FUNCTION"},{"name":"extensions.gen_salt","return_type":"text","arguments":"text, integer","type":"FUNCTION"},{"name":"auth.role","return_type":"text","arguments":"","type":"FUNCTION"},{"name":"extensions.uuid_generate_v5","return_type":"uuid","arguments":"namespace uuid, name text","type":"FUNCTION"},{"name":"extensions.digest","return_type":"bytea","arguments":"bytea, text","type":"FUNCTION"},{"name":"extensions.hmac","return_type":"bytea","arguments":"text, text, text","type":"FUNCTION"},{"name":"extensions.hmac","return_type":"bytea","arguments":"bytea, bytea, text","type":"FUNCTION"},{"name":"extensions.crypt","return_type":"text","arguments":"text, text","type":"FUNCTION"},{"name":"extensions.gen_salt","return_type":"text","arguments":"text","type":"FUNCTION"},{"name":"extensions.sign","return_type":"text","arguments":"payload json, secret text, algorithm text DEFAULT 'HS256'::text","type":"FUNCTION"},{"name":"extensions.pgrst_ddl_watch","return_type":"event_trigger","arguments":"","type":"FUNCTION"},{"name":"graphql._internal_resolve","return_type":"jsonb","arguments":"query text, variables jsonb DEFAULT '{}'::jsonb, \"operationName\" text DEFAULT NULL::text, extensions jsonb DEFAULT NULL::jsonb","type":"FUNCTION"},{"name":"graphql.exception","return_type":"text","arguments":"message text","type":"FUNCTION"},{"name":"graphql.comment_directive","return_type":"jsonb","arguments":"comment_ text","type":"FUNCTION"},{"name":"extensions.pgrst_drop_watch","return_type":"event_trigger","arguments":"","type":"FUNCTION"},{"name":"graphql_public.graphql","return_type":"jsonb","arguments":"\"operationName\" text DEFAULT NULL::text, query text DEFAULT NULL::text, variables jsonb DEFAULT NULL::jsonb, extensions jsonb DEFAULT NULL::jsonb","type":"FUNCTION"},{"name":"extensions.grant_pg_graphql_access","return_type":"event_trigger","arguments":"","type":"FUNCTION"},{"name":"net.http_post","return_type":"int8","arguments":"url text, body jsonb DEFAULT '{}'::jsonb, params jsonb DEFAULT '{}'::jsonb, headers jsonb DEFAULT '{\"Content-Type\": \"application/json\"}'::jsonb, timeout_milliseconds integer DEFAULT 2000","type":"FUNCTION"},{"name":"pgsodium.crypto_pwhash_saltgen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_kx_client_session_keys","return_type":"crypto_kx_session","arguments":"client_pk bytea, client_sk bytea, server_pk bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_kx_server_session_keys","return_type":"crypto_kx_session","arguments":"server_pk bytea, server_sk bytea, client_pk bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha512_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_box_new_seed","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_new_seed","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.derive_key","return_type":"bytea","arguments":"key_id bigint, key_len integer DEFAULT 32, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.pgsodium_derive","return_type":"bytea","arguments":"key_id bigint, key_len integer DEFAULT 32, context bytea DEFAULT decode('pgsodium'::text, 'escape'::text)","type":"FUNCTION"},{"name":"pgsodium.randombytes_new_seed","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_secretbox_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_box_noncegen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_ietf_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_shorthash_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_generichash_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_kdf_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_kx_new_keypair","return_type":"crypto_kx_keypair","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_kx_new_seed","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_kx_seed_new_keypair","return_type":"crypto_kx_keypair","arguments":"seed bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha256_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_box_new_keypair","return_type":"crypto_box_keypair","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_new_keypair","return_type":"crypto_sign_keypair","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_init","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_update","return_type":"bytea","arguments":"state bytea, message bytea","type":"FUNCTION"},{"name":"pgsodium.randombytes_random","return_type":"int4","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_secretbox_noncegen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_ietf_noncegen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_secretstream_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_stream_xchacha20_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_stream_xchacha20_noncegen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_cmp","return_type":"bool","arguments":"text, text","type":"FUNCTION"},{"name":"pgsodium.crypto_signcrypt_new_keypair","return_type":"crypto_signcrypt_keypair","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_encrypt","return_type":"bytea","arguments":"message bytea, additional bytea, key bytea, nonce bytea DEFAULT NULL::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_decrypt","return_type":"bytea","arguments":"ciphertext bytea, additional bytea, key bytea, nonce bytea DEFAULT NULL::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_encrypt","return_type":"bytea","arguments":"message bytea, additional bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea, nonce bytea DEFAULT NULL::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_decrypt","return_type":"bytea","arguments":"message bytea, additional bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea, nonce bytea DEFAULT NULL::bytea","type":"FUNCTION"},{"name":"pgsodium.version","return_type":"text","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_noncegen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.has_mask","return_type":"bool","arguments":"role regrole, source_name text","type":"FUNCTION"},{"name":"pgsodium.mask_columns","return_type":"record","arguments":"source_relid oid","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_final_verify","return_type":"bool","arguments":"state bytea, signature bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.create_mask_view","return_type":"void","arguments":"relid oid, debug boolean DEFAULT false","type":"FUNCTION"},{"name":"pgsodium.create_key","return_type":"valid_key","arguments":"key_type pgsodium.key_type DEFAULT 'aead-det'::pgsodium.key_type, name text DEFAULT NULL::text, raw_key bytea DEFAULT NULL::bytea, raw_key_nonce bytea DEFAULT NULL::bytea, parent_key uuid DEFAULT NULL::uuid, key_context bytea DEFAULT '\\x7067736f6469756d'::bytea, expires timestamp with time zone DEFAULT NULL::timestamp with time zone, associated_data text DEFAULT ''::text","type":"FUNCTION"},{"name":"pgsodium.get_key_by_name","return_type":"valid_key","arguments":"text","type":"FUNCTION"},{"name":"pgsodium.quote_assoc","return_type":"text","arguments":"text, boolean DEFAULT false","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_open","return_type":"bytea","arguments":"signed_message bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_kdf_derive_from_key","return_type":"bytea","arguments":"subkey_size integer, subkey_id bigint, context bytea, primary_key uuid","type":"FUNCTION"},{"name":"pgsodium.get_named_keys","return_type":"valid_key","arguments":"filter text DEFAULT '%'::text","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_encrypt","return_type":"bytea","arguments":"message bytea, additional bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_decrypt","return_type":"bytea","arguments":"message bytea, additional bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_ietf_encrypt","return_type":"bytea","arguments":"message bytea, additional bytea, nonce bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.get_key_by_id","return_type":"valid_key","arguments":"uuid","type":"FUNCTION"},{"name":"pgsodium.enable_security_label_trigger","return_type":"void","arguments":"","type":"FUNCTION"},{"name":"pgsodium.disable_security_label_trigger","return_type":"void","arguments":"","type":"FUNCTION"},{"name":"pgsodium.update_mask","return_type":"void","arguments":"target oid, debug boolean DEFAULT false","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_update_agg1","return_type":"bytea","arguments":"state bytea, message bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_update_agg2","return_type":"bytea","arguments":"cur_state bytea, initial_state bytea, message bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_update_agg","return_type":"bytea","arguments":"message bytea","type":"a"},{"name":"pgsodium.crypto_sign_update_agg","return_type":"bytea","arguments":"state bytea, message bytea","type":"a"},{"name":"pgsodium.encrypted_columns","return_type":"text","arguments":"relid oid","type":"FUNCTION"},{"name":"pgsodium.decrypted_columns","return_type":"text","arguments":"relid oid","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_ietf_encrypt","return_type":"bytea","arguments":"message bytea, additional bytea, nonce bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_ietf_encrypt","return_type":"bytea","arguments":"message bytea, additional bytea, nonce bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_ietf_decrypt","return_type":"bytea","arguments":"message bytea, additional bytea, nonce bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_ietf_decrypt","return_type":"bytea","arguments":"message bytea, additional bytea, nonce bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_ietf_decrypt","return_type":"bytea","arguments":"message bytea, additional bytea, nonce bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_auth","return_type":"bytea","arguments":"message bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth","return_type":"bytea","arguments":"message bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth","return_type":"bytea","arguments":"message bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_verify","return_type":"bool","arguments":"mac bytea, message bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_verify","return_type":"bool","arguments":"mac bytea, message bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_verify","return_type":"bool","arguments":"mac bytea, message bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_box_seed_new_keypair","return_type":"crypto_box_keypair","arguments":"seed bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_box","return_type":"bytea","arguments":"message bytea, nonce bytea, public bytea, secret bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_box_open","return_type":"bytea","arguments":"ciphertext bytea, nonce bytea, public bytea, secret bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_box_seal","return_type":"bytea","arguments":"message bytea, public_key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_box_seal_open","return_type":"bytea","arguments":"ciphertext bytea, public_key bytea, secret_key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_generichash","return_type":"bytea","arguments":"message bytea, key bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_generichash","return_type":"bytea","arguments":"message bytea, key bytea DEFAULT NULL::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_generichash","return_type":"bytea","arguments":"message bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_shorthash","return_type":"bytea","arguments":"message bytea, key bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_shorthash","return_type":"bytea","arguments":"message bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_shorthash","return_type":"bytea","arguments":"message bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.sodium_bin2base64","return_type":"text","arguments":"bin bytea","type":"FUNCTION"},{"name":"pgsodium.sodium_base642bin","return_type":"bytea","arguments":"base64 text","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha512","return_type":"bytea","arguments":"message bytea, secret bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha512","return_type":"bytea","arguments":"message bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha512","return_type":"bytea","arguments":"message bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha512_verify","return_type":"bool","arguments":"hash bytea, message bytea, secret bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha512_verify","return_type":"bool","arguments":"hash bytea, message bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha512_verify","return_type":"bool","arguments":"signature bytea, message bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha256","return_type":"bytea","arguments":"message bytea, secret bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha256","return_type":"bytea","arguments":"message bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha256","return_type":"bytea","arguments":"message bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha256_verify","return_type":"bool","arguments":"hash bytea, message bytea, secret bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_final_create","return_type":"bytea","arguments":"state bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha256_verify","return_type":"bool","arguments":"hash bytea, message bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha256_verify","return_type":"bool","arguments":"signature bytea, message bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_kdf_derive_from_key","return_type":"bytea","arguments":"subkey_size bigint, subkey_id bigint, context bytea, primary_key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_pwhash","return_type":"bytea","arguments":"password bytea, salt bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_pwhash_str","return_type":"bytea","arguments":"password bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_pwhash_str_verify","return_type":"bool","arguments":"hashed_password bytea, password bytea","type":"FUNCTION"},{"name":"pgsodium.randombytes_uniform","return_type":"int4","arguments":"upper_bound integer","type":"FUNCTION"},{"name":"pgsodium.randombytes_buf","return_type":"bytea","arguments":"size integer","type":"FUNCTION"},{"name":"pgsodium.randombytes_buf_deterministic","return_type":"bytea","arguments":"size integer, seed bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_secretbox","return_type":"bytea","arguments":"message bytea, nonce bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_secretbox","return_type":"bytea","arguments":"message bytea, nonce bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_secretbox","return_type":"bytea","arguments":"message bytea, nonce bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_secretbox_open","return_type":"bytea","arguments":"ciphertext bytea, nonce bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_secretbox_open","return_type":"bytea","arguments":"message bytea, nonce bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_secretbox_open","return_type":"bytea","arguments":"message bytea, nonce bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_hash_sha256","return_type":"bytea","arguments":"message bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_hash_sha512","return_type":"bytea","arguments":"message bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_sign","return_type":"bytea","arguments":"message bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_detached","return_type":"bytea","arguments":"message bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_seed_new_keypair","return_type":"crypto_sign_keypair","arguments":"seed bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_verify_detached","return_type":"bool","arguments":"sig bytea, message bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_signcrypt_sign_after","return_type":"bytea","arguments":"state bytea, sender_sk bytea, ciphertext bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_signcrypt_sign_before","return_type":"crypto_signcrypt_state_key","arguments":"sender bytea, recipient bytea, sender_sk bytea, recipient_pk bytea, additional bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_signcrypt_verify_after","return_type":"bool","arguments":"state bytea, signature bytea, sender_pk bytea, ciphertext bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_signcrypt_verify_before","return_type":"crypto_signcrypt_state_key","arguments":"signature bytea, sender bytea, recipient bytea, additional bytea, sender_pk bytea, recipient_sk bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_signcrypt_verify_public","return_type":"bool","arguments":"signature bytea, sender bytea, recipient bytea, additional bytea, sender_pk bytea, ciphertext bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_stream_xchacha20","return_type":"bytea","arguments":"bigint, bytea, bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_stream_xchacha20","return_type":"bytea","arguments":"bigint, bytea, bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_stream_xchacha20_xor","return_type":"bytea","arguments":"bytea, bytea, bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_stream_xchacha20_xor","return_type":"bytea","arguments":"bytea, bytea, bigint, context bytea DEFAULT '\\x70676f736469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_stream_xchacha20_xor_ic","return_type":"bytea","arguments":"bytea, bytea, bigint, bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_stream_xchacha20_xor_ic","return_type":"bytea","arguments":"bytea, bytea, bigint, bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.encrypted_column","return_type":"text","arguments":"relid oid, m record","type":"FUNCTION"},{"name":"pgsodium.update_masks","return_type":"void","arguments":"debug boolean DEFAULT false","type":"FUNCTION"},{"name":"pgsodium.key_encrypt_secret_raw_key","return_type":"trigger","arguments":"","type":"FUNCTION"},{"name":"pgsodium.mask_role","return_type":"void","arguments":"masked_role regrole, source_name text, view_name text","type":"FUNCTION"},{"name":"pgsodium.create_mask_view","return_type":"void","arguments":"relid oid, subid integer, debug boolean DEFAULT false","type":"FUNCTION"},{"name":"pgsodium.trg_mask_update","return_type":"event_trigger","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_decrypt","return_type":"bytea","arguments":"message bytea, additional bytea, key_uuid uuid, nonce bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_encrypt","return_type":"bytea","arguments":"message bytea, additional bytea, key_uuid uuid, nonce bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"vault.secrets_encrypt_secret_secret","return_type":"trigger","arguments":"","type":"FUNCTION"},{"name":"vault.create_secret","return_type":"uuid","arguments":"new_secret text, new_name text DEFAULT NULL::text, new_description text DEFAULT ''::text, new_key_id uuid DEFAULT NULL::uuid","type":"FUNCTION"},{"name":"vault.update_secret","return_type":"void","arguments":"secret_id uuid, new_secret text DEFAULT NULL::text, new_name text DEFAULT NULL::text, new_description text DEFAULT NULL::text, new_key_id uuid DEFAULT NULL::uuid","type":"FUNCTION"},{"name":"extensions.pgp_key_id","return_type":"text","arguments":"bytea","type":"FUNCTION"},{"name":"extensions.armor","return_type":"text","arguments":"bytea","type":"FUNCTION"},{"name":"extensions.armor","return_type":"text","arguments":"bytea, text[], text[]","type":"FUNCTION"},{"name":"extensions.dearmor","return_type":"bytea","arguments":"text","type":"FUNCTION"},{"name":"extensions.pgp_armor_headers","return_type":"record","arguments":"text, OUT key text, OUT value text","type":"FUNCTION"},{"name":"extensions.url_encode","return_type":"text","arguments":"data bytea","type":"FUNCTION"},{"name":"extensions.url_decode","return_type":"bytea","arguments":"data text","type":"FUNCTION"},{"name":"extensions.try_cast_double","return_type":"float8","arguments":"inp text","type":"FUNCTION"},{"name":"extensions.moddatetime","return_type":"trigger","arguments":"","type":"FUNCTION"},{"name":"extensions.pgp_sym_encrypt","return_type":"bytea","arguments":"text, text","type":"FUNCTION"},{"name":"extensions.pgp_sym_encrypt_bytea","return_type":"bytea","arguments":"bytea, text","type":"FUNCTION"},{"name":"extensions.pgp_sym_encrypt","return_type":"bytea","arguments":"text, text, text","type":"FUNCTION"},{"name":"extensions.pgp_sym_encrypt_bytea","return_type":"bytea","arguments":"bytea, text, text","type":"FUNCTION"},{"name":"extensions.pgp_sym_decrypt","return_type":"text","arguments":"bytea, text","type":"FUNCTION"},{"name":"extensions.pgp_sym_decrypt_bytea","return_type":"bytea","arguments":"bytea, text","type":"FUNCTION"},{"name":"extensions.pgp_sym_decrypt","return_type":"text","arguments":"bytea, text, text","type":"FUNCTION"},{"name":"extensions.algorithm_sign","return_type":"text","arguments":"signables text, secret text, algorithm text","type":"FUNCTION"},{"name":"extensions.verify","return_type":"record","arguments":"token text, secret text, algorithm text DEFAULT 'HS256'::text","type":"FUNCTION"},{"name":"extensions.grant_pg_cron_access","return_type":"event_trigger","arguments":"","type":"FUNCTION"},{"name":"extensions.grant_pg_net_access","return_type":"event_trigger","arguments":"","type":"FUNCTION"},{"name":"extensions.pg_stat_statements_reset","return_type":"void","arguments":"userid oid DEFAULT 0, dbid oid DEFAULT 0, queryid bigint DEFAULT 0","type":"FUNCTION"},{"name":"extensions.pg_stat_statements_info","return_type":"record","arguments":"OUT dealloc bigint, OUT stats_reset timestamp with time zone","type":"FUNCTION"},{"name":"extensions.pg_stat_statements","return_type":"record","arguments":"showtext boolean, OUT userid oid, OUT dbid oid, OUT toplevel boolean, OUT queryid bigint, OUT query text, OUT plans bigint, OUT total_plan_time double precision, OUT min_plan_time double precision, OUT max_plan_time double precision, OUT mean_plan_time double precision, OUT stddev_plan_time double precision, OUT calls bigint, OUT total_exec_time double precision, OUT min_exec_time double precision, OUT max_exec_time double precision, OUT mean_exec_time double precision, OUT stddev_exec_time double precision, OUT rows bigint, OUT shared_blks_hit bigint, OUT shared_blks_read bigint, OUT shared_blks_dirtied bigint, OUT shared_blks_written bigint, OUT local_blks_hit bigint, OUT local_blks_read bigint, OUT local_blks_dirtied bigint, OUT local_blks_written bigint, OUT temp_blks_read bigint, OUT temp_blks_written bigint, OUT blk_read_time double precision, OUT blk_write_time double precision, OUT temp_blk_read_time double precision, OUT temp_blk_write_time double precision, OUT wal_records bigint, OUT wal_fpi bigint, OUT wal_bytes numeric, OUT jit_functions bigint, OUT jit_generation_time double precision, OUT jit_inlining_count bigint, OUT jit_inlining_time double precision, OUT jit_optimization_count bigint, OUT jit_optimization_time double precision, OUT jit_emission_count bigint, OUT jit_emission_time double precision","type":"FUNCTION"},{"name":"extensions.set_graphql_placeholder","return_type":"event_trigger","arguments":"","type":"FUNCTION"}],"driver":{"name":"postgres","database_version":"PostgreSQL 15.1 (Ubuntu 15.1-1.pgdg20.04+1) on x86_64-pc-linux-gnu, compiled by gcc (Ubuntu 9.4.0-1ubuntu1~20.04.1) 9.4.0, 64-bit","meta":{"current_schema":"public","search_paths":["\"\\$user\"","public","extensions"],"dict":{"Functions":"Stored procedures and functions"}}}}
diff --git a/docs/database/schema.svg b/docs/database/schema.svg
deleted file mode 100644
index 7d67f2b18..000000000
--- a/docs/database/schema.svg
+++ /dev/null
@@ -1,1142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: postgres Pages: 1 -->
-<svg width="8975pt" height="3817pt"
- viewBox="0.00 0.00 8974.50 3817.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 3813)">
-<title>postgres</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-3813 8970.5,-3813 8970.5,4 -4,4"/>
-<!-- auth.users -->
-<g id="node1" class="node">
-<title>auth.users</title>
-<polygon fill="#efefef" stroke="transparent" points="238,-1706.5 238,-1741.5 592,-1741.5 592,-1706.5 238,-1706.5"/>
-<polygon fill="none" stroke="#000000" points="238,-1706.5 238,-1741.5 592,-1741.5 592,-1706.5 238,-1706.5"/>
-<text text-anchor="start" x="309.2022" y="-1719.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.users</text>
-<text text-anchor="start" x="393.2298" y="-1719.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="427.4346" y="-1719.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="238,-1676.5 238,-1706.5 592,-1706.5 592,-1676.5 238,-1676.5"/>
-<text text-anchor="start" x="245" y="-1687.9" font-family="Arial" font-size="14.00" fill="#000000">instance_id    </text>
-<text text-anchor="start" x="350.0042" y="-1687.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="238,-1646.5 238,-1676.5 592,-1676.5 592,-1646.5 238,-1646.5"/>
-<text text-anchor="start" x="245" y="-1657.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="290.094" y="-1657.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="238,-1616.5 238,-1646.5 592,-1646.5 592,-1616.5 238,-1616.5"/>
-<text text-anchor="start" x="245" y="-1627.9" font-family="Arial" font-size="14.00" fill="#000000">aud    </text>
-<text text-anchor="start" x="302.5526" y="-1627.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="238,-1586.5 238,-1616.5 592,-1616.5 592,-1586.5 238,-1586.5"/>
-<text text-anchor="start" x="245" y="-1597.9" font-family="Arial" font-size="14.00" fill="#000000">role    </text>
-<text text-anchor="start" x="302.5372" y="-1597.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="238,-1556.5 238,-1586.5 592,-1586.5 592,-1556.5 238,-1556.5"/>
-<text text-anchor="start" x="245" y="-1567.9" font-family="Arial" font-size="14.00" fill="#000000">email    </text>
-<text text-anchor="start" x="312.6438" y="-1567.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="238,-1526.5 238,-1556.5 592,-1556.5 592,-1526.5 238,-1526.5"/>
-<text text-anchor="start" x="245" y="-1537.9" font-family="Arial" font-size="14.00" fill="#000000">encrypted_password    </text>
-<text text-anchor="start" x="408.3492" y="-1537.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="238,-1496.5 238,-1526.5 592,-1526.5 592,-1496.5 238,-1496.5"/>
-<text text-anchor="start" x="245" y="-1507.9" font-family="Arial" font-size="14.00" fill="#000000">confirmed_at    </text>
-<text text-anchor="start" x="360.1094" y="-1507.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="238,-1466.5 238,-1496.5 592,-1496.5 592,-1466.5 238,-1466.5"/>
-<text text-anchor="start" x="245" y="-1477.9" font-family="Arial" font-size="14.00" fill="#000000">invited_at    </text>
-<text text-anchor="start" x="339.1122" y="-1477.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="238,-1436.5 238,-1466.5 592,-1466.5 592,-1436.5 238,-1436.5"/>
-<text text-anchor="start" x="245" y="-1447.9" font-family="Arial" font-size="14.00" fill="#000000">confirmation_token    </text>
-<text text-anchor="start" x="397.4544" y="-1447.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="238,-1406.5 238,-1436.5 592,-1436.5 592,-1406.5 238,-1406.5"/>
-<text text-anchor="start" x="245" y="-1417.9" font-family="Arial" font-size="14.00" fill="#000000">confirmation_sent_at    </text>
-<text text-anchor="start" x="409.1276" y="-1417.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="238,-1376.5 238,-1406.5 592,-1406.5 592,-1376.5 238,-1376.5"/>
-<text text-anchor="start" x="245" y="-1387.9" font-family="Arial" font-size="14.00" fill="#000000">recovery_token    </text>
-<text text-anchor="start" x="374.8948" y="-1387.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="238,-1346.5 238,-1376.5 592,-1376.5 592,-1346.5 238,-1346.5"/>
-<text text-anchor="start" x="245" y="-1357.9" font-family="Arial" font-size="14.00" fill="#000000">recovery_sent_at    </text>
-<text text-anchor="start" x="386.568" y="-1357.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="238,-1316.5 238,-1346.5 592,-1346.5 592,-1316.5 238,-1316.5"/>
-<text text-anchor="start" x="245" y="-1327.9" font-family="Arial" font-size="14.00" fill="#000000">email_change_token    </text>
-<text text-anchor="start" x="408.3604" y="-1327.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="238,-1286.5 238,-1316.5 592,-1316.5 592,-1286.5 238,-1286.5"/>
-<text text-anchor="start" x="245" y="-1297.9" font-family="Arial" font-size="14.00" fill="#000000">email_change    </text>
-<text text-anchor="start" x="366.3394" y="-1297.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="238,-1256.5 238,-1286.5 592,-1286.5 592,-1256.5 238,-1256.5"/>
-<text text-anchor="start" x="244.641" y="-1267.9" font-family="Arial" font-size="14.00" fill="#000000">email_change_sent_at    </text>
-<text text-anchor="start" x="419.6746" y="-1267.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="238,-1226.5 238,-1256.5 592,-1256.5 592,-1226.5 238,-1226.5"/>
-<text text-anchor="start" x="245" y="-1237.9" font-family="Arial" font-size="14.00" fill="#000000">last_sign_in_at    </text>
-<text text-anchor="start" x="372.5666" y="-1237.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="238,-1196.5 238,-1226.5 592,-1226.5 592,-1196.5 238,-1196.5"/>
-<text text-anchor="start" x="245" y="-1207.9" font-family="Arial" font-size="14.00" fill="#000000">raw_app_meta_data    </text>
-<text text-anchor="start" x="406.805" y="-1207.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="238,-1166.5 238,-1196.5 592,-1196.5 592,-1166.5 238,-1166.5"/>
-<text text-anchor="start" x="245" y="-1177.9" font-family="Arial" font-size="14.00" fill="#000000">raw_user_meta_data    </text>
-<text text-anchor="start" x="410.683" y="-1177.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="238,-1136.5 238,-1166.5 592,-1166.5 592,-1136.5 238,-1136.5"/>
-<text text-anchor="start" x="245" y="-1147.9" font-family="Arial" font-size="14.00" fill="#000000">is_super_admin    </text>
-<text text-anchor="start" x="378" y="-1147.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="238,-1106.5 238,-1136.5 592,-1136.5 592,-1106.5 238,-1106.5"/>
-<text text-anchor="start" x="245" y="-1117.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="345.3422" y="-1117.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="238,-1076.5 238,-1106.5 592,-1106.5 592,-1076.5 238,-1076.5"/>
-<text text-anchor="start" x="245" y="-1087.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="349.2468" y="-1087.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- auth.refresh_tokens -->
-<g id="node2" class="node">
-<title>auth.refresh_tokens</title>
-<polygon fill="#efefef" stroke="transparent" points="680,-3190.5 680,-3225.5 980,-3225.5 980,-3190.5 680,-3190.5"/>
-<polygon fill="none" stroke="#000000" points="680,-3190.5 680,-3225.5 980,-3225.5 980,-3190.5 680,-3190.5"/>
-<text text-anchor="start" x="686.6884" y="-3203.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.refresh_tokens</text>
-<text text-anchor="start" x="845.7436" y="-3203.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="879.9484" y="-3203.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="680,-3160.5 680,-3190.5 980,-3190.5 980,-3160.5 680,-3160.5"/>
-<text text-anchor="start" x="687" y="-3171.9" font-family="Arial" font-size="14.00" fill="#000000">instance_id    </text>
-<text text-anchor="start" x="792.0042" y="-3171.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="680,-3130.5 680,-3160.5 980,-3160.5 980,-3130.5 680,-3130.5"/>
-<text text-anchor="start" x="687" y="-3141.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="732.094" y="-3141.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="680,-3100.5 680,-3130.5 980,-3130.5 980,-3100.5 680,-3100.5"/>
-<text text-anchor="start" x="687" y="-3111.9" font-family="Arial" font-size="14.00" fill="#000000">token    </text>
-<text text-anchor="start" x="755.4432" y="-3111.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="680,-3070.5 680,-3100.5 980,-3100.5 980,-3070.5 680,-3070.5"/>
-<text text-anchor="start" x="687" y="-3081.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="767.1024" y="-3081.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="680,-3040.5 680,-3070.5 980,-3070.5 980,-3040.5 680,-3040.5"/>
-<text text-anchor="start" x="687" y="-3051.9" font-family="Arial" font-size="14.00" fill="#000000">revoked    </text>
-<text text-anchor="start" x="770.9958" y="-3051.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="680,-3010.5 680,-3040.5 980,-3040.5 980,-3010.5 680,-3010.5"/>
-<text text-anchor="start" x="687" y="-3021.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="787.3422" y="-3021.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="680,-2980.5 680,-3010.5 980,-3010.5 980,-2980.5 680,-2980.5"/>
-<text text-anchor="start" x="687" y="-2991.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="791.2468" y="-2991.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- auth.instances -->
-<g id="node3" class="node">
-<title>auth.instances</title>
-<polygon fill="#efefef" stroke="transparent" points="1085,-3160.5 1085,-3195.5 1368,-3195.5 1368,-3160.5 1085,-3160.5"/>
-<polygon fill="none" stroke="#000000" points="1085,-3160.5 1085,-3195.5 1368,-3195.5 1368,-3160.5 1085,-3160.5"/>
-<text text-anchor="start" x="1104.6939" y="-3173.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.instances</text>
-<text text-anchor="start" x="1220.7381" y="-3173.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="1254.9429" y="-3173.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="1085,-3130.5 1085,-3160.5 1368,-3160.5 1368,-3130.5 1085,-3130.5"/>
-<text text-anchor="start" x="1092" y="-3141.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="1137.094" y="-3141.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="1085,-3100.5 1085,-3130.5 1368,-3130.5 1368,-3100.5 1085,-3100.5"/>
-<text text-anchor="start" x="1092" y="-3111.9" font-family="Arial" font-size="14.00" fill="#000000">uuid    </text>
-<text text-anchor="start" x="1152.6592" y="-3111.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="1085,-3070.5 1085,-3100.5 1368,-3100.5 1368,-3070.5 1085,-3070.5"/>
-<text text-anchor="start" x="1092" y="-3081.9" font-family="Arial" font-size="14.00" fill="#000000">raw_base_config    </text>
-<text text-anchor="start" x="1232.0126" y="-3081.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="1085,-3040.5 1085,-3070.5 1368,-3070.5 1368,-3040.5 1085,-3040.5"/>
-<text text-anchor="start" x="1092" y="-3051.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="1192.3422" y="-3051.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="1085,-3010.5 1085,-3040.5 1368,-3040.5 1368,-3010.5 1085,-3010.5"/>
-<text text-anchor="start" x="1091.5344" y="-3021.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="1195.7812" y="-3021.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- auth.audit_log_entries -->
-<g id="node4" class="node">
-<title>auth.audit_log_entries</title>
-<polygon fill="#efefef" stroke="transparent" points="1472,-3145.5 1472,-3180.5 1790,-3180.5 1790,-3145.5 1472,-3145.5"/>
-<polygon fill="none" stroke="#000000" points="1472,-3145.5 1472,-3180.5 1790,-3180.5 1790,-3145.5 1472,-3145.5"/>
-<text text-anchor="start" x="1478.6839" y="-3158.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.audit_log_entries</text>
-<text text-anchor="start" x="1655.7481" y="-3158.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="1689.9529" y="-3158.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="1472,-3115.5 1472,-3145.5 1790,-3145.5 1790,-3115.5 1472,-3115.5"/>
-<text text-anchor="start" x="1479" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">instance_id    </text>
-<text text-anchor="start" x="1584.0042" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="1472,-3085.5 1472,-3115.5 1790,-3115.5 1790,-3085.5 1472,-3085.5"/>
-<text text-anchor="start" x="1479" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="1524.094" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="1472,-3055.5 1472,-3085.5 1790,-3085.5 1790,-3055.5 1472,-3055.5"/>
-<text text-anchor="start" x="1479" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">payload    </text>
-<text text-anchor="start" x="1562.2244" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[json]</text>
-<polygon fill="none" stroke="#000000" points="1472,-3025.5 1472,-3055.5 1790,-3055.5 1790,-3025.5 1472,-3025.5"/>
-<text text-anchor="start" x="1479" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="1579.3422" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- auth.schema_migrations -->
-<g id="node5" class="node">
-<title>auth.schema_migrations</title>
-<polygon fill="#efefef" stroke="transparent" points="1895,-3100.5 1895,-3135.5 2232,-3135.5 2232,-3100.5 1895,-3100.5"/>
-<polygon fill="none" stroke="#000000" points="1895,-3100.5 1895,-3135.5 2232,-3135.5 2232,-3100.5 1895,-3100.5"/>
-<text text-anchor="start" x="1901.6961" y="-3113.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.schema_migrations</text>
-<text text-anchor="start" x="2097.7359" y="-3113.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="2131.9407" y="-3113.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="1895,-3070.5 1895,-3100.5 2232,-3100.5 2232,-3070.5 1895,-3070.5"/>
-<text text-anchor="start" x="1902" y="-3081.9" font-family="Arial" font-size="14.00" fill="#000000">version    </text>
-<text text-anchor="start" x="1981.3198" y="-3081.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-</g>
-<!-- storage.buckets -->
-<g id="node6" class="node">
-<title>storage.buckets</title>
-<polygon fill="#efefef" stroke="transparent" points="380,-2148.5 380,-2183.5 663,-2183.5 663,-2148.5 380,-2148.5"/>
-<polygon fill="none" stroke="#000000" points="380,-2148.5 380,-2183.5 663,-2183.5 663,-2148.5 380,-2148.5"/>
-<text text-anchor="start" x="394.1949" y="-2161.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.buckets</text>
-<text text-anchor="start" x="521.2371" y="-2161.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="555.4419" y="-2161.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="380,-2118.5 380,-2148.5 663,-2148.5 663,-2118.5 380,-2118.5"/>
-<text text-anchor="start" x="387" y="-2129.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="432.094" y="-2129.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="380,-2088.5 380,-2118.5 663,-2118.5 663,-2088.5 380,-2088.5"/>
-<text text-anchor="start" x="387" y="-2099.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="456.2132" y="-2099.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="380,-2058.5 380,-2088.5 663,-2088.5 663,-2058.5 380,-2058.5"/>
-<text text-anchor="start" x="387" y="-2069.9" font-family="Arial" font-size="14.00" fill="#000000">owner    </text>
-<text text-anchor="start" x="459.3198" y="-2069.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="380,-2028.5 380,-2058.5 663,-2058.5 663,-2028.5 380,-2028.5"/>
-<text text-anchor="start" x="387" y="-2039.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="487.3422" y="-2039.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="380,-1998.5 380,-2028.5 663,-2028.5 663,-1998.5 380,-1998.5"/>
-<text text-anchor="start" x="386.5344" y="-2009.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="490.7812" y="-2009.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- storage.buckets&#45;&gt;auth.users -->
-<g id="edge1" class="edge">
-<title>storage.buckets:owner&#45;&gt;auth.users:id</title>
-<path fill="none" stroke="#000000" d="M369.6897,-2072.3751C332.1461,-2063.1802 359.1444,-1999.6167 380,-1956 432.2197,-1846.7895 539.7803,-1894.2105 592,-1785 615.6779,-1735.4808 646.8889,-1661.5 592,-1661.5"/>
-<polygon fill="#000000" stroke="#000000" points="370.059,-2072.4153 379.5119,-2077.9735 375.0295,-2072.9577 380,-2073.5 380,-2073.5 380,-2073.5 375.0295,-2072.9577 380.4881,-2069.0265 370.059,-2072.4153 370.059,-2072.4153"/>
-<text text-anchor="start" x="132.9965" y="-2083.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (owner) REFERENCES auth.users(id)</text>
-</g>
-<!-- storage.objects -->
-<g id="node7" class="node">
-<title>storage.objects</title>
-<polygon fill="#efefef" stroke="transparent" points="254,-3205.5 254,-3240.5 576,-3240.5 576,-3205.5 254,-3205.5"/>
-<polygon fill="none" stroke="#000000" points="254,-3205.5 254,-3240.5 576,-3240.5 576,-3205.5 254,-3205.5"/>
-<text text-anchor="start" x="290.1978" y="-3218.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.objects</text>
-<text text-anchor="start" x="412.2342" y="-3218.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="446.439" y="-3218.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="254,-3175.5 254,-3205.5 576,-3205.5 576,-3175.5 254,-3175.5"/>
-<text text-anchor="start" x="261" y="-3186.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="306.094" y="-3186.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="254,-3145.5 254,-3175.5 576,-3175.5 576,-3145.5 254,-3145.5"/>
-<text text-anchor="start" x="261" y="-3156.9" font-family="Arial" font-size="14.00" fill="#000000">bucket_id    </text>
-<text text-anchor="start" x="355.115" y="-3156.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="254,-3115.5 254,-3145.5 576,-3145.5 576,-3115.5 254,-3115.5"/>
-<text text-anchor="start" x="261" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="330.2132" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="254,-3085.5 254,-3115.5 576,-3115.5 576,-3085.5 254,-3085.5"/>
-<text text-anchor="start" x="261" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">owner    </text>
-<text text-anchor="start" x="333.3198" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="254,-3055.5 254,-3085.5 576,-3085.5 576,-3055.5 254,-3055.5"/>
-<text text-anchor="start" x="261" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="361.3422" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="254,-3025.5 254,-3055.5 576,-3055.5 576,-3025.5 254,-3025.5"/>
-<text text-anchor="start" x="261" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="365.2468" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="254,-2995.5 254,-3025.5 576,-3025.5 576,-2995.5 254,-2995.5"/>
-<text text-anchor="start" x="260.9811" y="-3006.9" font-family="Arial" font-size="14.00" fill="#000000">last_accessed_at    </text>
-<text text-anchor="start" x="403.3345" y="-3006.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="254,-2965.5 254,-2995.5 576,-2995.5 576,-2965.5 254,-2965.5"/>
-<text text-anchor="start" x="261" y="-2976.9" font-family="Arial" font-size="14.00" fill="#000000">metadata    </text>
-<text text-anchor="start" x="353.5596" y="-2976.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- storage.objects&#45;&gt;auth.users -->
-<g id="edge2" class="edge">
-<title>storage.objects:owner&#45;&gt;auth.users:id</title>
-<path fill="none" stroke="#000000" d="M245.5856,-3094.9996C173.0196,-2998.3885 160.9394,-1661.5 238,-1661.5"/>
-<polygon fill="#000000" stroke="#000000" points="245.6297,-3095.0284 251.5378,-3104.2666 249.8148,-3097.7642 254,-3100.5 254,-3100.5 254,-3100.5 249.8148,-3097.7642 256.4622,-3096.7334 245.6297,-3095.0284 245.6297,-3095.0284"/>
-<text text-anchor="start" x="6.9965" y="-3110.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (owner) REFERENCES auth.users(id)</text>
-</g>
-<!-- storage.objects&#45;&gt;storage.buckets -->
-<g id="edge3" class="edge">
-<title>storage.objects:bucket_id&#45;&gt;storage.buckets:id</title>
-<path fill="none" stroke="#000000" d="M586.2437,-3159.7556C787.913,-3128.657 151.2891,-2133.5 380,-2133.5"/>
-<polygon fill="#000000" stroke="#000000" points="585.9737,-3159.7752 575.6738,-3156.0118 580.9869,-3160.1376 576,-3160.5 576,-3160.5 576,-3160.5 580.9869,-3160.1376 576.3262,-3164.9882 585.9737,-3159.7752 585.9737,-3159.7752"/>
-<text text-anchor="start" x="436.764" y="-3144.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (bucket_id) REFERENCES storage.buckets(id)</text>
-</g>
-<!-- storage.migrations -->
-<g id="node8" class="node">
-<title>storage.migrations</title>
-<polygon fill="#efefef" stroke="transparent" points="2336,-3145.5 2336,-3180.5 2645,-3180.5 2645,-3145.5 2336,-3145.5"/>
-<polygon fill="none" stroke="#000000" points="2336,-3145.5 2336,-3180.5 2645,-3180.5 2645,-3145.5 2336,-3145.5"/>
-<text text-anchor="start" x="2352.7054" y="-3158.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.migrations</text>
-<text text-anchor="start" x="2500.7266" y="-3158.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="2534.9314" y="-3158.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="2336,-3115.5 2336,-3145.5 2645,-3145.5 2645,-3115.5 2336,-3115.5"/>
-<text text-anchor="start" x="2343" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="2388.094" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="2336,-3085.5 2336,-3115.5 2645,-3115.5 2645,-3085.5 2336,-3085.5"/>
-<text text-anchor="start" x="2343" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="2412.2132" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(100)]</text>
-<polygon fill="none" stroke="#000000" points="2336,-3055.5 2336,-3085.5 2645,-3085.5 2645,-3055.5 2336,-3055.5"/>
-<text text-anchor="start" x="2343" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">hash    </text>
-<text text-anchor="start" x="2407.5526" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(40)]</text>
-<polygon fill="none" stroke="#000000" points="2336,-3025.5 2336,-3055.5 2645,-3055.5 2645,-3025.5 2336,-3025.5"/>
-<text text-anchor="start" x="2342.6978" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">executed_at    </text>
-<text text-anchor="start" x="2453.162" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp without time zone]</text>
-</g>
-<!-- net.http_request_queue -->
-<g id="node9" class="node">
-<title>net.http_request_queue</title>
-<polygon fill="#efefef" stroke="transparent" points="2749,-3175.5 2749,-3210.5 3080,-3210.5 3080,-3175.5 2749,-3175.5"/>
-<polygon fill="none" stroke="#000000" points="2749,-3175.5 2749,-3210.5 3080,-3210.5 3080,-3175.5 2749,-3175.5"/>
-<text text-anchor="start" x="2755.6679" y="-3188.3" font-family="Arial Bold" font-size="18.00" fill="#000000">net.http_request_queue</text>
-<text text-anchor="start" x="2945.7641" y="-3188.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="2979.9689" y="-3188.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="2749,-3145.5 2749,-3175.5 3080,-3175.5 3080,-3145.5 2749,-3145.5"/>
-<text text-anchor="start" x="2756" y="-3156.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="2801.094" y="-3156.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="2749,-3115.5 2749,-3145.5 3080,-3145.5 3080,-3115.5 2749,-3115.5"/>
-<text text-anchor="start" x="2756" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">method    </text>
-<text text-anchor="start" x="2836.8864" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[net.http_method]</text>
-<polygon fill="none" stroke="#000000" points="2749,-3085.5 2749,-3115.5 3080,-3115.5 3080,-3085.5 2749,-3085.5"/>
-<text text-anchor="start" x="2756" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">url    </text>
-<text text-anchor="start" x="2805.7546" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="2749,-3055.5 2749,-3085.5 3080,-3085.5 3080,-3055.5 2749,-3055.5"/>
-<text text-anchor="start" x="2756" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">headers    </text>
-<text text-anchor="start" x="2840.7784" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="2749,-3025.5 2749,-3055.5 3080,-3055.5 3080,-3025.5 2749,-3025.5"/>
-<text text-anchor="start" x="2756" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">body    </text>
-<text text-anchor="start" x="2820.5526" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="2749,-2995.5 2749,-3025.5 3080,-3025.5 3080,-2995.5 2749,-2995.5"/>
-<text text-anchor="start" x="2756" y="-3006.9" font-family="Arial" font-size="14.00" fill="#000000">timeout_milliseconds    </text>
-<text text-anchor="start" x="2920.101" y="-3006.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-</g>
-<!-- net._http_response -->
-<g id="node10" class="node">
-<title>net._http_response</title>
-<polygon fill="#efefef" stroke="transparent" points="3184,-3205.5 3184,-3240.5 3479,-3240.5 3479,-3205.5 3184,-3205.5"/>
-<polygon fill="none" stroke="#000000" points="3184,-3205.5 3184,-3240.5 3479,-3240.5 3479,-3205.5 3184,-3205.5"/>
-<text text-anchor="start" x="3190.6814" y="-3218.3" font-family="Arial Bold" font-size="18.00" fill="#000000">net._http_response</text>
-<text text-anchor="start" x="3344.7506" y="-3218.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="3378.9554" y="-3218.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="3184,-3175.5 3184,-3205.5 3479,-3205.5 3479,-3175.5 3184,-3175.5"/>
-<text text-anchor="start" x="3191" y="-3186.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="3236.094" y="-3186.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="3184,-3145.5 3184,-3175.5 3479,-3175.5 3479,-3145.5 3184,-3145.5"/>
-<text text-anchor="start" x="3191" y="-3156.9" font-family="Arial" font-size="14.00" fill="#000000">status_code    </text>
-<text text-anchor="start" x="3300.6816" y="-3156.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="3184,-3115.5 3184,-3145.5 3479,-3145.5 3479,-3115.5 3184,-3115.5"/>
-<text text-anchor="start" x="3191" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">content_type    </text>
-<text text-anchor="start" x="3305.3548" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="3184,-3085.5 3184,-3115.5 3479,-3115.5 3479,-3085.5 3184,-3085.5"/>
-<text text-anchor="start" x="3191" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">headers    </text>
-<text text-anchor="start" x="3275.7784" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="3184,-3055.5 3184,-3085.5 3479,-3085.5 3479,-3055.5 3184,-3055.5"/>
-<text text-anchor="start" x="3191" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">content    </text>
-<text text-anchor="start" x="3271.1164" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="3184,-3025.5 3184,-3055.5 3479,-3055.5 3479,-3025.5 3184,-3025.5"/>
-<text text-anchor="start" x="3191" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">timed_out    </text>
-<text text-anchor="start" x="3286.6662" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="3184,-2995.5 3184,-3025.5 3479,-3025.5 3479,-2995.5 3184,-2995.5"/>
-<text text-anchor="start" x="3191" y="-3006.9" font-family="Arial" font-size="14.00" fill="#000000">error_msg    </text>
-<text text-anchor="start" x="3288.9776" y="-3006.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="3184,-2965.5 3184,-2995.5 3479,-2995.5 3479,-2965.5 3184,-2965.5"/>
-<text text-anchor="start" x="3191" y="-2976.9" font-family="Arial" font-size="14.00" fill="#000000">created    </text>
-<text text-anchor="start" x="3271.8864" y="-2976.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- supabase_functions.migrations -->
-<g id="node11" class="node">
-<title>supabase_functions.migrations</title>
-<polygon fill="#efefef" stroke="transparent" points="3583,-3115.5 3583,-3150.5 3972,-3150.5 3972,-3115.5 3583,-3115.5"/>
-<polygon fill="none" stroke="#000000" points="3583,-3115.5 3583,-3150.5 3972,-3150.5 3972,-3115.5 3583,-3115.5"/>
-<text text-anchor="start" x="3589.6816" y="-3128.3" font-family="Arial Bold" font-size="18.00" fill="#000000">supabase_functions.migrations</text>
-<text text-anchor="start" x="3837.7504" y="-3128.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="3871.9552" y="-3128.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="3583,-3085.5 3583,-3115.5 3972,-3115.5 3972,-3085.5 3583,-3085.5"/>
-<text text-anchor="start" x="3590" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">version    </text>
-<text text-anchor="start" x="3669.3198" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="3583,-3055.5 3583,-3085.5 3972,-3085.5 3972,-3055.5 3583,-3055.5"/>
-<text text-anchor="start" x="3590" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">inserted_at    </text>
-<text text-anchor="start" x="3693.4488" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- supabase_functions.hooks -->
-<g id="node12" class="node">
-<title>supabase_functions.hooks</title>
-<polygon fill="#efefef" stroke="transparent" points="4076,-3160.5 4076,-3195.5 4430,-3195.5 4430,-3160.5 4076,-3160.5"/>
-<polygon fill="none" stroke="#000000" points="4076,-3160.5 4076,-3195.5 4430,-3195.5 4430,-3160.5 4076,-3160.5"/>
-<text text-anchor="start" x="4082.6722" y="-3173.3" font-family="Arial Bold" font-size="18.00" fill="#000000">supabase_functions.hooks</text>
-<text text-anchor="start" x="4295.7598" y="-3173.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="4329.9646" y="-3173.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="4076,-3130.5 4076,-3160.5 4430,-3160.5 4430,-3130.5 4076,-3130.5"/>
-<text text-anchor="start" x="4083" y="-3141.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="4128.094" y="-3141.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="4076,-3100.5 4076,-3130.5 4430,-3130.5 4430,-3100.5 4076,-3100.5"/>
-<text text-anchor="start" x="4083" y="-3111.9" font-family="Arial" font-size="14.00" fill="#000000">hook_table_id    </text>
-<text text-anchor="start" x="4204.352" y="-3111.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="4076,-3070.5 4076,-3100.5 4430,-3100.5 4430,-3070.5 4076,-3070.5"/>
-<text text-anchor="start" x="4083" y="-3081.9" font-family="Arial" font-size="14.00" fill="#000000">hook_name    </text>
-<text text-anchor="start" x="4190.3436" y="-3081.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4076,-3040.5 4076,-3070.5 4430,-3070.5 4430,-3040.5 4076,-3040.5"/>
-<text text-anchor="start" x="4083" y="-3051.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="4183.3422" y="-3051.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="4076,-3010.5 4076,-3040.5 4430,-3040.5 4430,-3010.5 4076,-3010.5"/>
-<text text-anchor="start" x="4083" y="-3021.9" font-family="Arial" font-size="14.00" fill="#000000">request_id    </text>
-<text text-anchor="start" x="4182.5582" y="-3021.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-</g>
-<!-- public.study -->
-<g id="node13" class="node">
-<title>public.study</title>
-<polygon fill="#efefef" stroke="transparent" points="4747,-919.5 4747,-954.5 5030,-954.5 5030,-919.5 4747,-919.5"/>
-<polygon fill="none" stroke="#000000" points="4747,-919.5 4747,-954.5 5030,-954.5 5030,-919.5 4747,-919.5"/>
-<text text-anchor="start" x="4777.2041" y="-932.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study</text>
-<text text-anchor="start" x="4872.2279" y="-932.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="4906.4327" y="-932.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="4747,-889.5 4747,-919.5 5030,-919.5 5030,-889.5 4747,-889.5"/>
-<text text-anchor="start" x="4754" y="-900.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="4799.094" y="-900.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4747,-859.5 4747,-889.5 5030,-889.5 5030,-859.5 4747,-859.5"/>
-<text text-anchor="start" x="4754" y="-870.9" font-family="Arial" font-size="14.00" fill="#000000">contact    </text>
-<text text-anchor="start" x="4833.3338" y="-870.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4747,-829.5 4747,-859.5 5030,-859.5 5030,-829.5 4747,-829.5"/>
-<text text-anchor="start" x="4754" y="-840.9" font-family="Arial" font-size="14.00" fill="#000000">title    </text>
-<text text-anchor="start" x="4809.9818" y="-840.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4747,-799.5 4747,-829.5 5030,-829.5 5030,-799.5 4747,-799.5"/>
-<text text-anchor="start" x="4754" y="-810.9" font-family="Arial" font-size="14.00" fill="#000000">description    </text>
-<text text-anchor="start" x="4855.8822" y="-810.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4747,-769.5 4747,-799.5 5030,-799.5 5030,-769.5 4747,-769.5"/>
-<text text-anchor="start" x="4754" y="-780.9" font-family="Arial" font-size="14.00" fill="#000000">icon_name    </text>
-<text text-anchor="start" x="4856.6676" y="-780.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4747,-739.5 4747,-769.5 5030,-769.5 5030,-739.5 4747,-739.5"/>
-<text text-anchor="start" x="4754" y="-750.9" font-family="Arial" font-size="14.00" fill="#000000">published    </text>
-<text text-anchor="start" x="4848.1136" y="-750.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="4747,-709.5 4747,-739.5 5030,-739.5 5030,-709.5 4747,-709.5"/>
-<text text-anchor="start" x="4754" y="-720.9" font-family="Arial" font-size="14.00" fill="#000000">registry_published    </text>
-<text text-anchor="start" x="4901.7798" y="-720.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="4747,-679.5 4747,-709.5 5030,-709.5 5030,-679.5 4747,-679.5"/>
-<text text-anchor="start" x="4754" y="-690.9" font-family="Arial" font-size="14.00" fill="#000000">questionnaire    </text>
-<text text-anchor="start" x="4872.23" y="-690.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4747,-649.5 4747,-679.5 5030,-679.5 5030,-649.5 4747,-649.5"/>
-<text text-anchor="start" x="4754" y="-660.9" font-family="Arial" font-size="14.00" fill="#000000">eligibility_criteria    </text>
-<text text-anchor="start" x="4890.8556" y="-660.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4747,-619.5 4747,-649.5 5030,-649.5 5030,-619.5 4747,-619.5"/>
-<text text-anchor="start" x="4754" y="-630.9" font-family="Arial" font-size="14.00" fill="#000000">observations    </text>
-<text text-anchor="start" x="4867.5582" y="-630.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4747,-589.5 4747,-619.5 5030,-619.5 5030,-589.5 4747,-589.5"/>
-<text text-anchor="start" x="4754" y="-600.9" font-family="Arial" font-size="14.00" fill="#000000">interventions    </text>
-<text text-anchor="start" x="4867.5554" y="-600.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4747,-559.5 4747,-589.5 5030,-589.5 5030,-559.5 4747,-559.5"/>
-<text text-anchor="start" x="4754" y="-570.9" font-family="Arial" font-size="14.00" fill="#000000">consent    </text>
-<text text-anchor="start" x="4837.2258" y="-570.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4747,-529.5 4747,-559.5 5030,-559.5 5030,-529.5 4747,-529.5"/>
-<text text-anchor="start" x="4754" y="-540.9" font-family="Arial" font-size="14.00" fill="#000000">schedule    </text>
-<text text-anchor="start" x="4844.2244" y="-540.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4747,-499.5 4747,-529.5 5030,-529.5 5030,-499.5 4747,-499.5"/>
-<text text-anchor="start" x="4754" y="-510.9" font-family="Arial" font-size="14.00" fill="#000000">report_specification    </text>
-<text text-anchor="start" x="4909.561" y="-510.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4747,-469.5 4747,-499.5 5030,-499.5 5030,-469.5 4747,-469.5"/>
-<text text-anchor="start" x="4754" y="-480.9" font-family="Arial" font-size="14.00" fill="#000000">results    </text>
-<text text-anchor="start" x="4829.4278" y="-480.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4747,-439.5 4747,-469.5 5030,-469.5 5030,-439.5 4747,-439.5"/>
-<text text-anchor="start" x="4754" y="-450.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="4854.3422" y="-450.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="4747,-409.5 4747,-439.5 5030,-439.5 5030,-409.5 4747,-409.5"/>
-<text text-anchor="start" x="4753.5344" y="-420.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="4857.7812" y="-420.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="4747,-379.5 4747,-409.5 5030,-409.5 5030,-379.5 4747,-379.5"/>
-<text text-anchor="start" x="4754" y="-390.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="4834.1024" y="-390.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4747,-349.5 4747,-379.5 5030,-379.5 5030,-349.5 4747,-349.5"/>
-<text text-anchor="start" x="4754" y="-360.9" font-family="Arial" font-size="14.00" fill="#000000">participation    </text>
-<text text-anchor="start" x="4863.662" y="-360.9" font-family="Arial" font-size="14.00" fill="#666666">[participation]</text>
-<polygon fill="none" stroke="#000000" points="4747,-319.5 4747,-349.5 5030,-349.5 5030,-319.5 4747,-319.5"/>
-<text text-anchor="start" x="4754" y="-330.9" font-family="Arial" font-size="14.00" fill="#000000">result_sharing    </text>
-<text text-anchor="start" x="4876.108" y="-330.9" font-family="Arial" font-size="14.00" fill="#666666">[result_sharing]</text>
-<polygon fill="none" stroke="#000000" points="4747,-289.5 4747,-319.5 5030,-319.5 5030,-289.5 4747,-289.5"/>
-<text text-anchor="start" x="4754" y="-300.9" font-family="Arial" font-size="14.00" fill="#000000">collaborator_emails    </text>
-<text text-anchor="start" x="4909.547" y="-300.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- public.user -->
-<g id="node20" class="node">
-<title>public.user</title>
-<polygon fill="#efefef" stroke="transparent" points="4775,-132.5 4775,-167.5 5003,-167.5 5003,-132.5 4775,-132.5"/>
-<polygon fill="none" stroke="#000000" points="4775,-132.5 4775,-167.5 5003,-167.5 5003,-132.5 4775,-132.5"/>
-<text text-anchor="start" x="4781.7091" y="-145.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.user</text>
-<text text-anchor="start" x="4868.7229" y="-145.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="4902.9277" y="-145.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="4775,-102.5 4775,-132.5 5003,-132.5 5003,-102.5 4775,-102.5"/>
-<text text-anchor="start" x="4782" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="4827.094" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4775,-72.5 4775,-102.5 5003,-102.5 5003,-72.5 4775,-72.5"/>
-<text text-anchor="start" x="4782" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">email    </text>
-<text text-anchor="start" x="4849.6438" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4775,-42.5 4775,-72.5 5003,-72.5 5003,-42.5 4775,-42.5"/>
-<text text-anchor="start" x="4782" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">preferences    </text>
-<text text-anchor="start" x="4890.1122" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- public.study&#45;&gt;public.user -->
-<g id="edge4" class="edge">
-<title>public.study:user_id&#45;&gt;public.user:id</title>
-<path fill="none" stroke="#000000" d="M5039.9757,-393.6446C5093.0267,-383.9251 5070.6417,-293.7824 5030,-247 4954.9363,-160.5947 4850.0637,-297.4053 4775,-211 4747.7469,-179.6291 4733.4444,-117.5 4775,-117.5"/>
-<polygon fill="#000000" stroke="#000000" points="5039.9634,-393.6456 5029.6155,-390.0165 5034.9817,-394.0728 5030,-394.5 5030,-394.5 5030,-394.5 5034.9817,-394.0728 5030.3845,-398.9835 5039.9634,-393.6456 5039.9634,-393.6456"/>
-<text text-anchor="start" x="5037.2855" y="-404.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (user_id) REFERENCES &quot;user&quot;(id)</text>
-</g>
-<!-- public.study_subject -->
-<g id="node14" class="node">
-<title>public.study_subject</title>
-<polygon fill="#efefef" stroke="transparent" points="4547,-2178.5 4547,-2213.5 4850,-2213.5 4850,-2178.5 4547,-2178.5"/>
-<polygon fill="none" stroke="#000000" points="4547,-2178.5 4547,-2213.5 4850,-2213.5 4850,-2178.5 4547,-2178.5"/>
-<text text-anchor="start" x="4553.6935" y="-2191.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_subject</text>
-<text text-anchor="start" x="4715.7385" y="-2191.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="4749.9433" y="-2191.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="4547,-2148.5 4547,-2178.5 4850,-2178.5 4850,-2148.5 4547,-2148.5"/>
-<text text-anchor="start" x="4554" y="-2159.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="4599.094" y="-2159.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4547,-2118.5 4547,-2148.5 4850,-2148.5 4850,-2118.5 4547,-2118.5"/>
-<text text-anchor="start" x="4554" y="-2129.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="4640.3324" y="-2129.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4547,-2088.5 4547,-2118.5 4850,-2118.5 4850,-2088.5 4547,-2088.5"/>
-<text text-anchor="start" x="4554" y="-2099.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="4634.1024" y="-2099.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4547,-2058.5 4547,-2088.5 4850,-2088.5 4850,-2058.5 4547,-2058.5"/>
-<text text-anchor="start" x="4554" y="-2069.9" font-family="Arial" font-size="14.00" fill="#000000">started_at    </text>
-<text text-anchor="start" x="4650.4502" y="-2069.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="4547,-2028.5 4547,-2058.5 4850,-2058.5 4850,-2028.5 4547,-2028.5"/>
-<text text-anchor="start" x="4554" y="-2039.9" font-family="Arial" font-size="14.00" fill="#000000">selected_intervention_ids    </text>
-<text text-anchor="start" x="4746.1374" y="-2039.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-<polygon fill="none" stroke="#000000" points="4547,-1998.5 4547,-2028.5 4850,-2028.5 4850,-1998.5 4547,-1998.5"/>
-<text text-anchor="start" x="4554" y="-2009.9" font-family="Arial" font-size="14.00" fill="#000000">invite_code    </text>
-<text text-anchor="start" x="4659.0042" y="-2009.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4547,-1968.5 4547,-1998.5 4850,-1998.5 4850,-1968.5 4547,-1968.5"/>
-<text text-anchor="start" x="4554" y="-1979.9" font-family="Arial" font-size="14.00" fill="#000000">is_deleted    </text>
-<text text-anchor="start" x="4652.0042" y="-1979.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-</g>
-<!-- public.study_subject&#45;&gt;public.study -->
-<g id="edge5" class="edge">
-<title>public.study_subject:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M4860.1025,-2133.2106C5000.6238,-2124.8512 4881.3568,-1937.0561 4895,-1785 4902.4666,-1701.7831 4883.5748,-1101.3643 4933,-1034 4960.2024,-996.9244 5003.7434,-1035.7513 5030,-998 5053.7278,-963.8846 5071.5556,-904.5 5030,-904.5"/>
-<polygon fill="#000000" stroke="#000000" points="4859.9959,-2133.2135 4849.8711,-2129.0018 4854.9979,-2133.3568 4850,-2133.5 4850,-2133.5 4850,-2133.5 4854.9979,-2133.3568 4850.1289,-2137.9982 4859.9959,-2133.2135 4859.9959,-2133.2135"/>
-<text text-anchor="start" x="4857.1035" y="-2143.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE</text>
-</g>
-<!-- public.study_invite -->
-<g id="node17" class="node">
-<title>public.study_invite</title>
-<polygon fill="#efefef" stroke="transparent" points="4555,-1436.5 4555,-1471.5 4843,-1471.5 4843,-1436.5 4555,-1436.5"/>
-<polygon fill="none" stroke="#000000" points="4555,-1436.5 4555,-1471.5 4843,-1471.5 4843,-1436.5 4555,-1436.5"/>
-<text text-anchor="start" x="4561.6995" y="-1449.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_invite</text>
-<text text-anchor="start" x="4708.7325" y="-1449.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="4742.9373" y="-1449.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="4555,-1406.5 4555,-1436.5 4843,-1436.5 4843,-1406.5 4555,-1406.5"/>
-<text text-anchor="start" x="4562" y="-1417.9" font-family="Arial" font-size="14.00" fill="#000000">code    </text>
-<text text-anchor="start" x="4626.5526" y="-1417.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4555,-1376.5 4555,-1406.5 4843,-1406.5 4843,-1376.5 4555,-1376.5"/>
-<text text-anchor="start" x="4562" y="-1387.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="4648.3324" y="-1387.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4555,-1346.5 4555,-1376.5 4843,-1376.5 4843,-1346.5 4555,-1346.5"/>
-<text text-anchor="start" x="4562" y="-1357.9" font-family="Arial" font-size="14.00" fill="#000000">preselected_intervention_ids    </text>
-<text text-anchor="start" x="4774.3632" y="-1357.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- public.study_subject&#45;&gt;public.study_invite -->
-<g id="edge6" class="edge">
-<title>public.study_subject:invite_code&#45;&gt;public.study_invite:code</title>
-<path fill="none" stroke="#000000" d="M4859.8955,-2012.0049C4883.5643,-2003.3851 4860.7009,-1959.2602 4850,-1926 4781.1351,-1711.9559 4623.8649,-1729.0441 4555,-1515 4542.2727,-1475.4414 4513.4444,-1421.5 4555,-1421.5"/>
-<polygon fill="#000000" stroke="#000000" points="4859.8878,-2012.006 4849.3277,-2009.0505 4854.9439,-2012.753 4850,-2013.5 4850,-2013.5 4850,-2013.5 4854.9439,-2012.753 4850.6723,-2017.9495 4859.8878,-2012.006 4859.8878,-2012.006"/>
-<text text-anchor="start" x="4857.0385" y="-2023.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (invite_code) REFERENCES study_invite(code) ON DELETE CASCADE</text>
-</g>
-<!-- public.study_subject&#45;&gt;public.user -->
-<g id="edge7" class="edge">
-<title>public.study_subject:user_id&#45;&gt;public.user:id</title>
-<path fill="none" stroke="#000000" d="M4536.9616,-2103.4149C3660.2707,-2088.4977 3889.8978,-117.5 4775,-117.5"/>
-<polygon fill="#000000" stroke="#000000" points="4537.0004,-2103.4151 4546.9618,-2107.9998 4542.0002,-2103.4576 4547,-2103.5 4547,-2103.5 4547,-2103.5 4542.0002,-2103.4576 4547.0382,-2099.0002 4537.0004,-2103.4151 4537.0004,-2103.4151"/>
-<text text-anchor="start" x="4315.2855" y="-2113.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (user_id) REFERENCES &quot;user&quot;(id)</text>
-</g>
-<!-- public.app_config -->
-<g id="node15" class="node">
-<title>public.app_config</title>
-<polygon fill="#efefef" stroke="transparent" points="4969,-3220.5 4969,-3255.5 5250,-3255.5 5250,-3220.5 4969,-3220.5"/>
-<polygon fill="none" stroke="#000000" points="4969,-3220.5 4969,-3255.5 5250,-3255.5 5250,-3220.5 4969,-3220.5"/>
-<text text-anchor="start" x="4975.6915" y="-3233.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.app_config</text>
-<text text-anchor="start" x="5115.7405" y="-3233.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="5149.9453" y="-3233.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="4969,-3190.5 4969,-3220.5 5250,-3220.5 5250,-3190.5 4969,-3190.5"/>
-<text text-anchor="start" x="4976" y="-3201.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="5021.094" y="-3201.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4969,-3160.5 4969,-3190.5 5250,-3190.5 5250,-3160.5 4969,-3160.5"/>
-<text text-anchor="start" x="4976" y="-3171.9" font-family="Arial" font-size="14.00" fill="#000000">app_min_version    </text>
-<text text-anchor="start" x="5116.7826" y="-3171.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4969,-3130.5 4969,-3160.5 5250,-3160.5 5250,-3130.5 4969,-3130.5"/>
-<text text-anchor="start" x="4976" y="-3141.9" font-family="Arial" font-size="14.00" fill="#000000">app_privacy    </text>
-<text text-anchor="start" x="5085.6676" y="-3141.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4969,-3100.5 4969,-3130.5 5250,-3130.5 5250,-3100.5 4969,-3100.5"/>
-<text text-anchor="start" x="4976" y="-3111.9" font-family="Arial" font-size="14.00" fill="#000000">app_terms    </text>
-<text text-anchor="start" x="5076.3296" y="-3111.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4969,-3070.5 4969,-3100.5 5250,-3100.5 5250,-3070.5 4969,-3070.5"/>
-<text text-anchor="start" x="4976" y="-3081.9" font-family="Arial" font-size="14.00" fill="#000000">designer_privacy    </text>
-<text text-anchor="start" x="5116" y="-3081.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4969,-3040.5 4969,-3070.5 5250,-3070.5 5250,-3040.5 4969,-3040.5"/>
-<text text-anchor="start" x="4976" y="-3051.9" font-family="Arial" font-size="14.00" fill="#000000">designer_terms    </text>
-<text text-anchor="start" x="5106.662" y="-3051.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4969,-3010.5 4969,-3040.5 5250,-3040.5 5250,-3010.5 4969,-3010.5"/>
-<text text-anchor="start" x="4976" y="-3021.9" font-family="Arial" font-size="14.00" fill="#000000">imprint    </text>
-<text text-anchor="start" x="5052.195" y="-3021.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4969,-2980.5 4969,-3010.5 5250,-3010.5 5250,-2980.5 4969,-2980.5"/>
-<text text-anchor="start" x="4976" y="-2991.9" font-family="Arial" font-size="14.00" fill="#000000">contact    </text>
-<text text-anchor="start" x="5055.3338" y="-2991.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4969,-2950.5 4969,-2980.5 5250,-2980.5 5250,-2950.5 4969,-2950.5"/>
-<text text-anchor="start" x="4976" y="-2961.9" font-family="Arial" font-size="14.00" fill="#000000">analytics    </text>
-<text text-anchor="start" x="5064.6564" y="-2961.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- public.repo -->
-<g id="node16" class="node">
-<title>public.repo</title>
-<polygon fill="#efefef" stroke="transparent" points="4986,-1451.5 4986,-1486.5 5215,-1486.5 5215,-1451.5 4986,-1451.5"/>
-<polygon fill="none" stroke="#000000" points="4986,-1451.5 4986,-1486.5 5215,-1486.5 5215,-1451.5 4986,-1451.5"/>
-<text text-anchor="start" x="4992.706" y="-1464.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.repo</text>
-<text text-anchor="start" x="5080.726" y="-1464.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="5114.9308" y="-1464.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="4986,-1421.5 4986,-1451.5 5215,-1451.5 5215,-1421.5 4986,-1421.5"/>
-<text text-anchor="start" x="4993" y="-1432.9" font-family="Arial" font-size="14.00" fill="#000000">project_id    </text>
-<text text-anchor="start" x="5087.8822" y="-1432.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4986,-1391.5 4986,-1421.5 5215,-1421.5 5215,-1391.5 4986,-1391.5"/>
-<text text-anchor="start" x="4993" y="-1402.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="5073.1024" y="-1402.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4986,-1361.5 4986,-1391.5 5215,-1391.5 5215,-1361.5 4986,-1361.5"/>
-<text text-anchor="start" x="4993" y="-1372.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="5079.3324" y="-1372.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4986,-1331.5 4986,-1361.5 5215,-1361.5 5215,-1331.5 4986,-1331.5"/>
-<text text-anchor="start" x="4993" y="-1342.9" font-family="Arial" font-size="14.00" fill="#000000">provider    </text>
-<text text-anchor="start" x="5077.763" y="-1342.9" font-family="Arial" font-size="14.00" fill="#666666">[git_provider]</text>
-</g>
-<!-- public.repo&#45;&gt;public.study -->
-<g id="edge8" class="edge">
-<title>public.repo:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M4975.7838,-1376.0912C4791.0216,-1360.505 5237.0867,-904.5 5030,-904.5"/>
-<polygon fill="#000000" stroke="#000000" points="4976.008,-1376.1 4985.82,-1380.9964 4981.004,-1376.3 4986,-1376.5 4986,-1376.5 4986,-1376.5 4981.004,-1376.3 4986.18,-1372.0036 4976.008,-1376.1 4976.008,-1376.1"/>
-<text text-anchor="start" x="4752.3845" y="-1386.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id)</text>
-</g>
-<!-- public.repo&#45;&gt;public.user -->
-<g id="edge9" class="edge">
-<title>public.repo:user_id&#45;&gt;public.user:id</title>
-<path fill="none" stroke="#000000" d="M5225.1241,-1406.3678C5793.0885,-1391.4388 5580.1836,-117.5 5003,-117.5"/>
-<polygon fill="#000000" stroke="#000000" points="5224.9991,-1406.3693 5214.9412,-1402.0004 5219.9996,-1406.4346 5215,-1406.5 5215,-1406.5 5215,-1406.5 5219.9996,-1406.4346 5215.0588,-1410.9996 5224.9991,-1406.3693 5224.9991,-1406.3693"/>
-<text text-anchor="start" x="5222.0045" y="-1416.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (user_id) REFERENCES &quot;user&quot;(id) ON DELETE CASCADE</text>
-</g>
-<!-- public.study_invite&#45;&gt;public.study -->
-<g id="edge10" class="edge">
-<title>public.study_invite:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M4853.0803,-1391.1247C5046.4937,-1375.9321 4529.945,-904.5 4747,-904.5"/>
-<polygon fill="#000000" stroke="#000000" points="4852.9931,-1391.1279 4842.8326,-1387.0031 4847.9965,-1391.3139 4843,-1391.5 4843,-1391.5 4843,-1391.5 4847.9965,-1391.3139 4843.1674,-1395.9969 4852.9931,-1391.1279 4852.9931,-1391.1279"/>
-<text text-anchor="start" x="4762.3535" y="-1375.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE</text>
-</g>
-<!-- public.subject_progress -->
-<g id="node18" class="node">
-<title>public.subject_progress</title>
-<polygon fill="#efefef" stroke="transparent" points="4534,-3175.5 4534,-3210.5 4864,-3210.5 4864,-3175.5 4534,-3175.5"/>
-<polygon fill="none" stroke="#000000" points="4534,-3175.5 4534,-3210.5 4864,-3210.5 4864,-3175.5 4534,-3175.5"/>
-<text text-anchor="start" x="4540.6962" y="-3188.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.subject_progress</text>
-<text text-anchor="start" x="4729.7358" y="-3188.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="4763.9406" y="-3188.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="4534,-3145.5 4534,-3175.5 4864,-3175.5 4864,-3145.5 4534,-3145.5"/>
-<text text-anchor="start" x="4541" y="-3156.9" font-family="Arial" font-size="14.00" fill="#000000">completed_at    </text>
-<text text-anchor="start" x="4659.2314" y="-3156.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="4534,-3115.5 4534,-3145.5 4864,-3145.5 4864,-3115.5 4534,-3115.5"/>
-<text text-anchor="start" x="4541" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">subject_id    </text>
-<text text-anchor="start" x="4638.2216" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4534,-3085.5 4534,-3115.5 4864,-3115.5 4864,-3085.5 4534,-3085.5"/>
-<text text-anchor="start" x="4541" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">intervention_id    </text>
-<text text-anchor="start" x="4666.2272" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4534,-3055.5 4534,-3085.5 4864,-3085.5 4864,-3055.5 4534,-3055.5"/>
-<text text-anchor="start" x="4541" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">task_id    </text>
-<text text-anchor="start" x="4619.5498" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4534,-3025.5 4534,-3055.5 4864,-3055.5 4864,-3025.5 4534,-3025.5"/>
-<text text-anchor="start" x="4541" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">result_type    </text>
-<text text-anchor="start" x="4643.6662" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4534,-2995.5 4534,-3025.5 4864,-3025.5 4864,-2995.5 4534,-2995.5"/>
-<text text-anchor="start" x="4541" y="-3006.9" font-family="Arial" font-size="14.00" fill="#000000">result    </text>
-<text text-anchor="start" x="4609.4278" y="-3006.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- public.subject_progress&#45;&gt;public.study_subject -->
-<g id="edge11" class="edge">
-<title>public.subject_progress:subject_id&#45;&gt;public.study_subject:id</title>
-<path fill="none" stroke="#000000" d="M4523.8378,-3129.7549C4332.4248,-3099.588 5072.4289,-2163.5 4850,-2163.5"/>
-<polygon fill="#000000" stroke="#000000" points="4524.0268,-3129.7686 4533.6709,-3134.988 4529.0134,-3130.1343 4534,-3130.5 4534,-3130.5 4534,-3130.5 4529.0134,-3130.1343 4534.3291,-3126.012 4524.0268,-3129.7686 4524.0268,-3129.7686"/>
-<text text-anchor="start" x="4540.5975" y="-3140.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (subject_id) REFERENCES study_subject(id) ON DELETE CASCADE</text>
-</g>
-<!-- public.study_progress_export -->
-<g id="node19" class="node">
-<title>public.study_progress_export</title>
-<polygon fill="#efefef" stroke="transparent" points="5354,-3235.5 5354,-3270.5 5680,-3270.5 5680,-3235.5 5354,-3235.5"/>
-<polygon fill="none" stroke="#000000" points="5354,-3235.5 5354,-3270.5 5680,-3270.5 5680,-3235.5 5354,-3235.5"/>
-<text text-anchor="start" x="5360.5886" y="-3248.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_progress_export</text>
-<text text-anchor="start" x="5595.647" y="-3248.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="5629.8518" y="-3248.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="5354,-3205.5 5354,-3235.5 5680,-3235.5 5680,-3205.5 5354,-3205.5"/>
-<text text-anchor="start" x="5361" y="-3216.9" font-family="Arial" font-size="14.00" fill="#000000">completed_at    </text>
-<text text-anchor="start" x="5479.2314" y="-3216.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="5354,-3175.5 5354,-3205.5 5680,-3205.5 5680,-3175.5 5354,-3175.5"/>
-<text text-anchor="start" x="5361" y="-3186.9" font-family="Arial" font-size="14.00" fill="#000000">intervention_id    </text>
-<text text-anchor="start" x="5486.2272" y="-3186.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="5354,-3145.5 5354,-3175.5 5680,-3175.5 5680,-3145.5 5354,-3145.5"/>
-<text text-anchor="start" x="5361" y="-3156.9" font-family="Arial" font-size="14.00" fill="#000000">task_id    </text>
-<text text-anchor="start" x="5439.5498" y="-3156.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="5354,-3115.5 5354,-3145.5 5680,-3145.5 5680,-3115.5 5354,-3115.5"/>
-<text text-anchor="start" x="5361" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">result_type    </text>
-<text text-anchor="start" x="5463.6662" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="5354,-3085.5 5354,-3115.5 5680,-3115.5 5680,-3085.5 5354,-3085.5"/>
-<text text-anchor="start" x="5361" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">result    </text>
-<text text-anchor="start" x="5429.4278" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="5354,-3055.5 5354,-3085.5 5680,-3085.5 5680,-3055.5 5354,-3055.5"/>
-<text text-anchor="start" x="5361" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">subject_id    </text>
-<text text-anchor="start" x="5458.2216" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="5354,-3025.5 5354,-3055.5 5680,-3055.5 5680,-3025.5 5354,-3025.5"/>
-<text text-anchor="start" x="5361" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="5441.1024" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="5354,-2995.5 5354,-3025.5 5680,-3025.5 5680,-2995.5 5354,-2995.5"/>
-<text text-anchor="start" x="5361" y="-3006.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="5447.3324" y="-3006.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="5354,-2965.5 5354,-2995.5 5680,-2995.5 5680,-2965.5 5354,-2965.5"/>
-<text text-anchor="start" x="5361" y="-2976.9" font-family="Arial" font-size="14.00" fill="#000000">started_at    </text>
-<text text-anchor="start" x="5457.4502" y="-2976.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="5354,-2935.5 5354,-2965.5 5680,-2965.5 5680,-2935.5 5354,-2935.5"/>
-<text text-anchor="start" x="5361" y="-2946.9" font-family="Arial" font-size="14.00" fill="#000000">selected_intervention_ids    </text>
-<text text-anchor="start" x="5553.1374" y="-2946.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- extensions.pg_stat_statements_info -->
-<g id="node21" class="node">
-<title>extensions.pg_stat_statements_info</title>
-<polygon fill="#efefef" stroke="transparent" points="5784,-3115.5 5784,-3150.5 6162,-3150.5 6162,-3115.5 5784,-3115.5"/>
-<polygon fill="none" stroke="#000000" points="5784,-3115.5 5784,-3150.5 6162,-3150.5 6162,-3115.5 5784,-3115.5"/>
-<text text-anchor="start" x="5790.566" y="-3128.3" font-family="Arial Bold" font-size="18.00" fill="#000000">extensions.pg_stat_statements_info</text>
-<text text-anchor="start" x="6077.6696" y="-3128.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="6111.8744" y="-3128.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="5784,-3085.5 5784,-3115.5 6162,-3115.5 6162,-3085.5 5784,-3085.5"/>
-<text text-anchor="start" x="5791" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">dealloc    </text>
-<text text-anchor="start" x="5869.5484" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="5784,-3055.5 5784,-3085.5 6162,-3085.5 6162,-3055.5 5784,-3055.5"/>
-<text text-anchor="start" x="5791" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">stats_reset    </text>
-<text text-anchor="start" x="5893.6676" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- extensions.pg_stat_statements -->
-<g id="node22" class="node">
-<title>extensions.pg_stat_statements</title>
-<polygon fill="#efefef" stroke="transparent" points="6267,-3730.5 6267,-3765.5 6606,-3765.5 6606,-3730.5 6267,-3730.5"/>
-<polygon fill="none" stroke="#000000" points="6267,-3730.5 6267,-3765.5 6606,-3765.5 6606,-3730.5 6267,-3730.5"/>
-<text text-anchor="start" x="6273.5735" y="-3743.3" font-family="Arial Bold" font-size="18.00" fill="#000000">extensions.pg_stat_statements</text>
-<text text-anchor="start" x="6521.6621" y="-3743.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="6555.8669" y="-3743.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3700.5 6267,-3730.5 6606,-3730.5 6606,-3700.5 6267,-3700.5"/>
-<text text-anchor="start" x="6274" y="-3711.9" font-family="Arial" font-size="14.00" fill="#000000">userid    </text>
-<text text-anchor="start" x="6346.3198" y="-3711.9" font-family="Arial" font-size="14.00" fill="#666666">[oid]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3670.5 6267,-3700.5 6606,-3700.5 6606,-3670.5 6267,-3670.5"/>
-<text text-anchor="start" x="6274" y="-3681.9" font-family="Arial" font-size="14.00" fill="#000000">dbid    </text>
-<text text-anchor="start" x="6334.6592" y="-3681.9" font-family="Arial" font-size="14.00" fill="#666666">[oid]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3640.5 6267,-3670.5 6606,-3670.5 6606,-3640.5 6267,-3640.5"/>
-<text text-anchor="start" x="6274" y="-3651.9" font-family="Arial" font-size="14.00" fill="#000000">toplevel    </text>
-<text text-anchor="start" x="6356.439" y="-3651.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3610.5 6267,-3640.5 6606,-3640.5 6606,-3610.5 6267,-3610.5"/>
-<text text-anchor="start" x="6274" y="-3621.9" font-family="Arial" font-size="14.00" fill="#000000">queryid    </text>
-<text text-anchor="start" x="6354.1024" y="-3621.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3580.5 6267,-3610.5 6606,-3610.5 6606,-3580.5 6267,-3580.5"/>
-<text text-anchor="start" x="6274" y="-3591.9" font-family="Arial" font-size="14.00" fill="#000000">query    </text>
-<text text-anchor="start" x="6343.2132" y="-3591.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3550.5 6267,-3580.5 6606,-3580.5 6606,-3550.5 6267,-3550.5"/>
-<text text-anchor="start" x="6274" y="-3561.9" font-family="Arial" font-size="14.00" fill="#000000">plans    </text>
-<text text-anchor="start" x="6341.6592" y="-3561.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3520.5 6267,-3550.5 6606,-3550.5 6606,-3520.5 6267,-3520.5"/>
-<text text-anchor="start" x="6274" y="-3531.9" font-family="Arial" font-size="14.00" fill="#000000">total_plan_time    </text>
-<text text-anchor="start" x="6403.1178" y="-3531.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3490.5 6267,-3520.5 6606,-3520.5 6606,-3490.5 6267,-3490.5"/>
-<text text-anchor="start" x="6274" y="-3501.9" font-family="Arial" font-size="14.00" fill="#000000">min_plan_time    </text>
-<text text-anchor="start" x="6399.2146" y="-3501.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3460.5 6267,-3490.5 6606,-3490.5 6606,-3460.5 6267,-3460.5"/>
-<text text-anchor="start" x="6274" y="-3471.9" font-family="Arial" font-size="14.00" fill="#000000">max_plan_time    </text>
-<text text-anchor="start" x="6403.108" y="-3471.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3430.5 6267,-3460.5 6606,-3460.5 6606,-3430.5 6267,-3430.5"/>
-<text text-anchor="start" x="6274" y="-3441.9" font-family="Arial" font-size="14.00" fill="#000000">mean_plan_time    </text>
-<text text-anchor="start" x="6411.6732" y="-3441.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3400.5 6267,-3430.5 6606,-3430.5 6606,-3400.5 6267,-3400.5"/>
-<text text-anchor="start" x="6274" y="-3411.9" font-family="Arial" font-size="14.00" fill="#000000">stddev_plan_time    </text>
-<text text-anchor="start" x="6417.9032" y="-3411.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3370.5 6267,-3400.5 6606,-3400.5 6606,-3370.5 6267,-3370.5"/>
-<text text-anchor="start" x="6274" y="-3381.9" font-family="Arial" font-size="14.00" fill="#000000">calls    </text>
-<text text-anchor="start" x="6336.2006" y="-3381.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3340.5 6267,-3370.5 6606,-3370.5 6606,-3340.5 6267,-3340.5"/>
-<text text-anchor="start" x="6274" y="-3351.9" font-family="Arial" font-size="14.00" fill="#000000">total_exec_time    </text>
-<text text-anchor="start" x="6406.2286" y="-3351.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3310.5 6267,-3340.5 6606,-3340.5 6606,-3310.5 6267,-3310.5"/>
-<text text-anchor="start" x="6274" y="-3321.9" font-family="Arial" font-size="14.00" fill="#000000">min_exec_time    </text>
-<text text-anchor="start" x="6402.3254" y="-3321.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3280.5 6267,-3310.5 6606,-3310.5 6606,-3280.5 6267,-3280.5"/>
-<text text-anchor="start" x="6274" y="-3291.9" font-family="Arial" font-size="14.00" fill="#000000">max_exec_time    </text>
-<text text-anchor="start" x="6406.2188" y="-3291.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3250.5 6267,-3280.5 6606,-3280.5 6606,-3250.5 6267,-3250.5"/>
-<text text-anchor="start" x="6274" y="-3261.9" font-family="Arial" font-size="14.00" fill="#000000">mean_exec_time    </text>
-<text text-anchor="start" x="6414.784" y="-3261.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3220.5 6267,-3250.5 6606,-3250.5 6606,-3220.5 6267,-3220.5"/>
-<text text-anchor="start" x="6274" y="-3231.9" font-family="Arial" font-size="14.00" fill="#000000">stddev_exec_time    </text>
-<text text-anchor="start" x="6421.014" y="-3231.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3190.5 6267,-3220.5 6606,-3220.5 6606,-3190.5 6267,-3190.5"/>
-<text text-anchor="start" x="6274" y="-3201.9" font-family="Arial" font-size="14.00" fill="#000000">rows    </text>
-<text text-anchor="start" x="6337.7546" y="-3201.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3160.5 6267,-3190.5 6606,-3190.5 6606,-3160.5 6267,-3160.5"/>
-<text text-anchor="start" x="6274" y="-3171.9" font-family="Arial" font-size="14.00" fill="#000000">shared_blks_hit    </text>
-<text text-anchor="start" x="6406.23" y="-3171.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3130.5 6267,-3160.5 6606,-3160.5 6606,-3130.5 6267,-3130.5"/>
-<text text-anchor="start" x="6274" y="-3141.9" font-family="Arial" font-size="14.00" fill="#000000">shared_blks_read    </text>
-<text text-anchor="start" x="6419.4586" y="-3141.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3100.5 6267,-3130.5 6606,-3130.5 6606,-3100.5 6267,-3100.5"/>
-<text text-anchor="start" x="6274" y="-3111.9" font-family="Arial" font-size="14.00" fill="#000000">shared_blks_dirtied    </text>
-<text text-anchor="start" x="6429.5624" y="-3111.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3070.5 6267,-3100.5 6606,-3100.5 6606,-3070.5 6267,-3070.5"/>
-<text text-anchor="start" x="6274" y="-3081.9" font-family="Arial" font-size="14.00" fill="#000000">shared_blks_written    </text>
-<text text-anchor="start" x="6432.6704" y="-3081.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3040.5 6267,-3070.5 6606,-3070.5 6606,-3040.5 6267,-3040.5"/>
-<text text-anchor="start" x="6274" y="-3051.9" font-family="Arial" font-size="14.00" fill="#000000">local_blks_hit    </text>
-<text text-anchor="start" x="6392.2174" y="-3051.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3010.5 6267,-3040.5 6606,-3040.5 6606,-3010.5 6267,-3010.5"/>
-<text text-anchor="start" x="6274" y="-3021.9" font-family="Arial" font-size="14.00" fill="#000000">local_blks_read    </text>
-<text text-anchor="start" x="6405.446" y="-3021.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2980.5 6267,-3010.5 6606,-3010.5 6606,-2980.5 6267,-2980.5"/>
-<text text-anchor="start" x="6274" y="-2991.9" font-family="Arial" font-size="14.00" fill="#000000">local_blks_dirtied    </text>
-<text text-anchor="start" x="6415.5498" y="-2991.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2950.5 6267,-2980.5 6606,-2980.5 6606,-2950.5 6267,-2950.5"/>
-<text text-anchor="start" x="6274" y="-2961.9" font-family="Arial" font-size="14.00" fill="#000000">local_blks_written    </text>
-<text text-anchor="start" x="6418.6578" y="-2961.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2920.5 6267,-2950.5 6606,-2950.5 6606,-2920.5 6267,-2920.5"/>
-<text text-anchor="start" x="6274" y="-2931.9" font-family="Arial" font-size="14.00" fill="#000000">temp_blks_read    </text>
-<text text-anchor="start" x="6407.784" y="-2931.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2890.5 6267,-2920.5 6606,-2920.5 6606,-2890.5 6267,-2890.5"/>
-<text text-anchor="start" x="6274" y="-2901.9" font-family="Arial" font-size="14.00" fill="#000000">temp_blks_written    </text>
-<text text-anchor="start" x="6420.9958" y="-2901.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2860.5 6267,-2890.5 6606,-2890.5 6606,-2860.5 6267,-2860.5"/>
-<text text-anchor="start" x="6274" y="-2871.9" font-family="Arial" font-size="14.00" fill="#000000">blk_read_time    </text>
-<text text-anchor="start" x="6396.108" y="-2871.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2830.5 6267,-2860.5 6606,-2860.5 6606,-2830.5 6267,-2830.5"/>
-<text text-anchor="start" x="6274" y="-2841.9" font-family="Arial" font-size="14.00" fill="#000000">blk_write_time    </text>
-<text text-anchor="start" x="6397.6466" y="-2841.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2800.5 6267,-2830.5 6606,-2830.5 6606,-2800.5 6267,-2800.5"/>
-<text text-anchor="start" x="6274" y="-2811.9" font-family="Arial" font-size="14.00" fill="#000000">temp_blk_read_time    </text>
-<text text-anchor="start" x="6435.007" y="-2811.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2770.5 6267,-2800.5 6606,-2800.5 6606,-2770.5 6267,-2770.5"/>
-<text text-anchor="start" x="6274" y="-2781.9" font-family="Arial" font-size="14.00" fill="#000000">temp_blk_write_time    </text>
-<text text-anchor="start" x="6436.5456" y="-2781.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2740.5 6267,-2770.5 6606,-2770.5 6606,-2740.5 6267,-2740.5"/>
-<text text-anchor="start" x="6274" y="-2751.9" font-family="Arial" font-size="14.00" fill="#000000">wal_records    </text>
-<text text-anchor="start" x="6383.6522" y="-2751.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2710.5 6267,-2740.5 6606,-2740.5 6606,-2710.5 6267,-2710.5"/>
-<text text-anchor="start" x="6274" y="-2721.9" font-family="Arial" font-size="14.00" fill="#000000">wal_fpi    </text>
-<text text-anchor="start" x="6351.763" y="-2721.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2680.5 6267,-2710.5 6606,-2710.5 6606,-2680.5 6267,-2680.5"/>
-<text text-anchor="start" x="6274" y="-2691.9" font-family="Arial" font-size="14.00" fill="#000000">wal_bytes    </text>
-<text text-anchor="start" x="6370.439" y="-2691.9" font-family="Arial" font-size="14.00" fill="#666666">[numeric]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2650.5 6267,-2680.5 6606,-2680.5 6606,-2650.5 6267,-2650.5"/>
-<text text-anchor="start" x="6274" y="-2661.9" font-family="Arial" font-size="14.00" fill="#000000">jit_functions    </text>
-<text text-anchor="start" x="6382.1094" y="-2661.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2620.5 6267,-2650.5 6606,-2650.5 6606,-2620.5 6267,-2620.5"/>
-<text text-anchor="start" x="6274" y="-2631.9" font-family="Arial" font-size="14.00" fill="#000000">jit_generation_time    </text>
-<text text-anchor="start" x="6426.4502" y="-2631.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2590.5 6267,-2620.5 6606,-2620.5 6606,-2590.5 6267,-2590.5"/>
-<text text-anchor="start" x="6274" y="-2601.9" font-family="Arial" font-size="14.00" fill="#000000">jit_inlining_count    </text>
-<text text-anchor="start" x="6411.669" y="-2601.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2560.5 6267,-2590.5 6606,-2590.5 6606,-2560.5 6267,-2560.5"/>
-<text text-anchor="start" x="6274" y="-2571.9" font-family="Arial" font-size="14.00" fill="#000000">jit_inlining_time    </text>
-<text text-anchor="start" x="6403.871" y="-2571.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2530.5 6267,-2560.5 6606,-2560.5 6606,-2530.5 6267,-2530.5"/>
-<text text-anchor="start" x="6274" y="-2541.9" font-family="Arial" font-size="14.00" fill="#000000">jit_optimization_count    </text>
-<text text-anchor="start" x="6442.7868" y="-2541.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2500.5 6267,-2530.5 6606,-2530.5 6606,-2500.5 6267,-2500.5"/>
-<text text-anchor="start" x="6274" y="-2511.9" font-family="Arial" font-size="14.00" fill="#000000">jit_optimization_time    </text>
-<text text-anchor="start" x="6434.9888" y="-2511.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2470.5 6267,-2500.5 6606,-2500.5 6606,-2470.5 6267,-2470.5"/>
-<text text-anchor="start" x="6274" y="-2481.9" font-family="Arial" font-size="14.00" fill="#000000">jit_emission_count    </text>
-<text text-anchor="start" x="6423.3338" y="-2481.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2440.5 6267,-2470.5 6606,-2470.5 6606,-2440.5 6267,-2440.5"/>
-<text text-anchor="start" x="6274" y="-2451.9" font-family="Arial" font-size="14.00" fill="#000000">jit_emission_time    </text>
-<text text-anchor="start" x="6415.5358" y="-2451.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-</g>
-<!-- pgsodium.key -->
-<g id="node23" class="node">
-<title>pgsodium.key</title>
-<polygon fill="#efefef" stroke="transparent" points="6722,-2283.5 6722,-2318.5 6982,-2318.5 6982,-2283.5 6722,-2283.5"/>
-<polygon fill="none" stroke="#000000" points="6722,-2283.5 6722,-2318.5 6982,-2318.5 6982,-2283.5 6722,-2283.5"/>
-<text text-anchor="start" x="6732.7031" y="-2296.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.key</text>
-<text text-anchor="start" x="6843.7289" y="-2296.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="6877.9337" y="-2296.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="6722,-2253.5 6722,-2283.5 6982,-2283.5 6982,-2253.5 6722,-2253.5"/>
-<text text-anchor="start" x="6729" y="-2264.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="6774.094" y="-2264.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="6722,-2223.5 6722,-2253.5 6982,-2253.5 6982,-2223.5 6722,-2223.5"/>
-<text text-anchor="start" x="6729" y="-2234.9" font-family="Arial" font-size="14.00" fill="#000000">status    </text>
-<text text-anchor="start" x="6800.5512" y="-2234.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_status]</text>
-<polygon fill="none" stroke="#000000" points="6722,-2193.5 6722,-2223.5 6982,-2223.5 6982,-2193.5 6722,-2193.5"/>
-<text text-anchor="start" x="6728.7146" y="-2204.9" font-family="Arial" font-size="14.00" fill="#000000">created    </text>
-<text text-anchor="start" x="6809.601" y="-2204.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="6722,-2163.5 6722,-2193.5 6982,-2193.5 6982,-2163.5 6722,-2163.5"/>
-<text text-anchor="start" x="6729" y="-2174.9" font-family="Arial" font-size="14.00" fill="#000000">expires    </text>
-<text text-anchor="start" x="6808.3198" y="-2174.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="6722,-2133.5 6722,-2163.5 6982,-2163.5 6982,-2133.5 6722,-2133.5"/>
-<text text-anchor="start" x="6729" y="-2144.9" font-family="Arial" font-size="14.00" fill="#000000">key_type    </text>
-<text text-anchor="start" x="6819.2258" y="-2144.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_type]</text>
-<polygon fill="none" stroke="#000000" points="6722,-2103.5 6722,-2133.5 6982,-2133.5 6982,-2103.5 6722,-2103.5"/>
-<text text-anchor="start" x="6729" y="-2114.9" font-family="Arial" font-size="14.00" fill="#000000">key_id    </text>
-<text text-anchor="start" x="6803.6592" y="-2114.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6722,-2073.5 6722,-2103.5 6982,-2103.5 6982,-2073.5 6722,-2073.5"/>
-<text text-anchor="start" x="6729" y="-2084.9" font-family="Arial" font-size="14.00" fill="#000000">key_context    </text>
-<text text-anchor="start" x="6837.899" y="-2084.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="6722,-2043.5 6722,-2073.5 6982,-2073.5 6982,-2043.5 6722,-2043.5"/>
-<text text-anchor="start" x="6729" y="-2054.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="6798.2132" y="-2054.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="6722,-2013.5 6722,-2043.5 6982,-2043.5 6982,-2013.5 6722,-2013.5"/>
-<text text-anchor="start" x="6729" y="-2024.9" font-family="Arial" font-size="14.00" fill="#000000">associated_data    </text>
-<text text-anchor="start" x="6865.136" y="-2024.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="6722,-1983.5 6722,-2013.5 6982,-2013.5 6982,-1983.5 6722,-1983.5"/>
-<text text-anchor="start" x="6729" y="-1994.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key    </text>
-<text text-anchor="start" x="6815.3198" y="-1994.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="6722,-1953.5 6722,-1983.5 6982,-1983.5 6982,-1953.5 6722,-1953.5"/>
-<text text-anchor="start" x="6729" y="-1964.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key_nonce    </text>
-<text text-anchor="start" x="6861.2328" y="-1964.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="6722,-1923.5 6722,-1953.5 6982,-1953.5 6982,-1923.5 6722,-1923.5"/>
-<text text-anchor="start" x="6729" y="-1934.9" font-family="Arial" font-size="14.00" fill="#000000">parent_key    </text>
-<text text-anchor="start" x="6832.4516" y="-1934.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="6722,-1893.5 6722,-1923.5 6982,-1923.5 6982,-1893.5 6722,-1893.5"/>
-<text text-anchor="start" x="6729" y="-1904.9" font-family="Arial" font-size="14.00" fill="#000000">comment    </text>
-<text text-anchor="start" x="6820.7644" y="-1904.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="6722,-1863.5 6722,-1893.5 6982,-1893.5 6982,-1863.5 6722,-1863.5"/>
-<text text-anchor="start" x="6729" y="-1874.9" font-family="Arial" font-size="14.00" fill="#000000">user_data    </text>
-<text text-anchor="start" x="6825.4516" y="-1874.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-</g>
-<!-- pgsodium.key&#45;&gt;pgsodium.key -->
-<g id="edge12" class="edge">
-<title>pgsodium.key:parent_key&#45;&gt;pgsodium.key:id</title>
-<path fill="none" stroke="#000000" d="M6853.0163,-1964.0446C6860.9862,-2185.4032 6860.6474,-2703 6852,-2703 6843.2241,-2703 6843.0056,-2483.6786 6851.3444,-2283.7737"/>
-<polygon fill="#000000" stroke="#000000" points="6853.0044,-1963.7239 6857.1274,-1953.5626 6852.8175,-1958.7274 6852.6305,-1953.7308 6852.6305,-1953.7308 6852.6305,-1953.7308 6852.8175,-1958.7274 6848.1337,-1953.8991 6853.0044,-1963.7239 6853.0044,-1963.7239"/>
-<text text-anchor="start" x="6569.009" y="-1963.7308" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (parent_key) REFERENCES pgsodium.key(id)</text>
-</g>
-<!-- pgsodium.valid_key -->
-<g id="node24" class="node">
-<title>pgsodium.valid_key</title>
-<polygon fill="#efefef" stroke="transparent" points="7097,-3220.5 7097,-3255.5 7357,-3255.5 7357,-3220.5 7097,-3220.5"/>
-<polygon fill="none" stroke="#000000" points="7097,-3220.5 7097,-3255.5 7357,-3255.5 7357,-3220.5 7097,-3220.5"/>
-<text text-anchor="start" x="7109.1014" y="-3233.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.valid_key</text>
-<text text-anchor="start" x="7267.1342" y="-3233.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="7301.339" y="-3233.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="7097,-3190.5 7097,-3220.5 7357,-3220.5 7357,-3190.5 7097,-3190.5"/>
-<text text-anchor="start" x="7104" y="-3201.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="7149.094" y="-3201.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="7097,-3160.5 7097,-3190.5 7357,-3190.5 7357,-3160.5 7097,-3160.5"/>
-<text text-anchor="start" x="7104" y="-3171.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="7173.2132" y="-3171.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7097,-3130.5 7097,-3160.5 7357,-3160.5 7357,-3130.5 7097,-3130.5"/>
-<text text-anchor="start" x="7104" y="-3141.9" font-family="Arial" font-size="14.00" fill="#000000">status    </text>
-<text text-anchor="start" x="7175.5512" y="-3141.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_status]</text>
-<polygon fill="none" stroke="#000000" points="7097,-3100.5 7097,-3130.5 7357,-3130.5 7357,-3100.5 7097,-3100.5"/>
-<text text-anchor="start" x="7104" y="-3111.9" font-family="Arial" font-size="14.00" fill="#000000">key_type    </text>
-<text text-anchor="start" x="7194.2258" y="-3111.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_type]</text>
-<polygon fill="none" stroke="#000000" points="7097,-3070.5 7097,-3100.5 7357,-3100.5 7357,-3070.5 7097,-3070.5"/>
-<text text-anchor="start" x="7104" y="-3081.9" font-family="Arial" font-size="14.00" fill="#000000">key_id    </text>
-<text text-anchor="start" x="7178.6592" y="-3081.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="7097,-3040.5 7097,-3070.5 7357,-3070.5 7357,-3040.5 7097,-3040.5"/>
-<text text-anchor="start" x="7104" y="-3051.9" font-family="Arial" font-size="14.00" fill="#000000">key_context    </text>
-<text text-anchor="start" x="7212.899" y="-3051.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="7097,-3010.5 7097,-3040.5 7357,-3040.5 7357,-3010.5 7097,-3010.5"/>
-<text text-anchor="start" x="7103.7146" y="-3021.9" font-family="Arial" font-size="14.00" fill="#000000">created    </text>
-<text text-anchor="start" x="7184.601" y="-3021.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="7097,-2980.5 7097,-3010.5 7357,-3010.5 7357,-2980.5 7097,-2980.5"/>
-<text text-anchor="start" x="7104" y="-2991.9" font-family="Arial" font-size="14.00" fill="#000000">expires    </text>
-<text text-anchor="start" x="7183.3198" y="-2991.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="7097,-2950.5 7097,-2980.5 7357,-2980.5 7357,-2950.5 7097,-2950.5"/>
-<text text-anchor="start" x="7104" y="-2961.9" font-family="Arial" font-size="14.00" fill="#000000">associated_data    </text>
-<text text-anchor="start" x="7240.136" y="-2961.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-</g>
-<!-- pgsodium.masking_rule -->
-<g id="node25" class="node">
-<title>pgsodium.masking_rule</title>
-<polygon fill="#efefef" stroke="transparent" points="7462,-3295.5 7462,-3330.5 7743,-3330.5 7743,-3295.5 7462,-3295.5"/>
-<polygon fill="none" stroke="#000000" points="7462,-3295.5 7462,-3330.5 7743,-3330.5 7743,-3295.5 7462,-3295.5"/>
-<text text-anchor="start" x="7468.603" y="-3308.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.masking_rule</text>
-<text text-anchor="start" x="7658.6326" y="-3308.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="7692.8374" y="-3308.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="7462,-3265.5 7462,-3295.5 7743,-3295.5 7743,-3265.5 7462,-3265.5"/>
-<text text-anchor="start" x="7469" y="-3276.9" font-family="Arial" font-size="14.00" fill="#000000">attrelid    </text>
-<text text-anchor="start" x="7545.2076" y="-3276.9" font-family="Arial" font-size="14.00" fill="#666666">[oid]</text>
-<polygon fill="none" stroke="#000000" points="7462,-3235.5 7462,-3265.5 7743,-3265.5 7743,-3235.5 7462,-3235.5"/>
-<text text-anchor="start" x="7469" y="-3246.9" font-family="Arial" font-size="14.00" fill="#000000">attnum    </text>
-<text text-anchor="start" x="7545.9944" y="-3246.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="7462,-3205.5 7462,-3235.5 7743,-3235.5 7743,-3205.5 7462,-3205.5"/>
-<text text-anchor="start" x="7469" y="-3216.9" font-family="Arial" font-size="14.00" fill="#000000">relnamespace    </text>
-<text text-anchor="start" x="7591.1108" y="-3216.9" font-family="Arial" font-size="14.00" fill="#666666">[regnamespace]</text>
-<polygon fill="none" stroke="#000000" points="7462,-3175.5 7462,-3205.5 7743,-3205.5 7743,-3175.5 7462,-3175.5"/>
-<text text-anchor="start" x="7469" y="-3186.9" font-family="Arial" font-size="14.00" fill="#000000">relname    </text>
-<text text-anchor="start" x="7553.763" y="-3186.9" font-family="Arial" font-size="14.00" fill="#666666">[name]</text>
-<polygon fill="none" stroke="#000000" points="7462,-3145.5 7462,-3175.5 7743,-3175.5 7743,-3145.5 7462,-3145.5"/>
-<text text-anchor="start" x="7469" y="-3156.9" font-family="Arial" font-size="14.00" fill="#000000">attname    </text>
-<text text-anchor="start" x="7553.777" y="-3156.9" font-family="Arial" font-size="14.00" fill="#666666">[name]</text>
-<polygon fill="none" stroke="#000000" points="7462,-3115.5 7462,-3145.5 7743,-3145.5 7743,-3115.5 7462,-3115.5"/>
-<text text-anchor="start" x="7469" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">format_type    </text>
-<text text-anchor="start" x="7577.1108" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7462,-3085.5 7462,-3115.5 7743,-3115.5 7743,-3085.5 7462,-3085.5"/>
-<text text-anchor="start" x="7469" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">col_description    </text>
-<text text-anchor="start" x="7596.554" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7462,-3055.5 7462,-3085.5 7743,-3085.5 7743,-3055.5 7462,-3055.5"/>
-<text text-anchor="start" x="7469" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">key_id_column    </text>
-<text text-anchor="start" x="7596.5568" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7462,-3025.5 7462,-3055.5 7743,-3055.5 7743,-3025.5 7462,-3025.5"/>
-<text text-anchor="start" x="7469" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">key_id    </text>
-<text text-anchor="start" x="7543.6592" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7462,-2995.5 7462,-3025.5 7743,-3025.5 7743,-2995.5 7462,-2995.5"/>
-<text text-anchor="start" x="7469" y="-3006.9" font-family="Arial" font-size="14.00" fill="#000000">associated_columns    </text>
-<text text-anchor="start" x="7630.0126" y="-3006.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7462,-2965.5 7462,-2995.5 7743,-2995.5 7743,-2965.5 7462,-2965.5"/>
-<text text-anchor="start" x="7469" y="-2976.9" font-family="Arial" font-size="14.00" fill="#000000">nonce_column    </text>
-<text text-anchor="start" x="7594.2328" y="-2976.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7462,-2935.5 7462,-2965.5 7743,-2965.5 7743,-2935.5 7462,-2935.5"/>
-<text text-anchor="start" x="7469" y="-2946.9" font-family="Arial" font-size="14.00" fill="#000000">view_name    </text>
-<text text-anchor="start" x="7573.9916" y="-2946.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7462,-2905.5 7462,-2935.5 7743,-2935.5 7743,-2905.5 7462,-2905.5"/>
-<text text-anchor="start" x="7469" y="-2916.9" font-family="Arial" font-size="14.00" fill="#000000">priority    </text>
-<text text-anchor="start" x="7545.195" y="-2916.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="7462,-2875.5 7462,-2905.5 7743,-2905.5 7743,-2875.5 7462,-2875.5"/>
-<text text-anchor="start" x="7469" y="-2886.9" font-family="Arial" font-size="14.00" fill="#000000">security_invoker    </text>
-<text text-anchor="start" x="7604.3254" y="-2886.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-</g>
-<!-- pgsodium.mask_columns -->
-<g id="node26" class="node">
-<title>pgsodium.mask_columns</title>
-<polygon fill="#efefef" stroke="transparent" points="7847,-3190.5 7847,-3225.5 8141,-3225.5 8141,-3190.5 7847,-3190.5"/>
-<polygon fill="none" stroke="#000000" points="7847,-3190.5 7847,-3225.5 8141,-3225.5 8141,-3190.5 7847,-3190.5"/>
-<text text-anchor="start" x="7853.6032" y="-3203.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.mask_columns</text>
-<text text-anchor="start" x="8056.6324" y="-3203.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="8090.8372" y="-3203.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="7847,-3160.5 7847,-3190.5 8141,-3190.5 8141,-3160.5 7847,-3160.5"/>
-<text text-anchor="start" x="7854" y="-3171.9" font-family="Arial" font-size="14.00" fill="#000000">attname    </text>
-<text text-anchor="start" x="7938.777" y="-3171.9" font-family="Arial" font-size="14.00" fill="#666666">[name]</text>
-<polygon fill="none" stroke="#000000" points="7847,-3130.5 7847,-3160.5 8141,-3160.5 8141,-3130.5 7847,-3130.5"/>
-<text text-anchor="start" x="7854" y="-3141.9" font-family="Arial" font-size="14.00" fill="#000000">attrelid    </text>
-<text text-anchor="start" x="7930.2076" y="-3141.9" font-family="Arial" font-size="14.00" fill="#666666">[oid]</text>
-<polygon fill="none" stroke="#000000" points="7847,-3100.5 7847,-3130.5 8141,-3130.5 8141,-3100.5 7847,-3100.5"/>
-<text text-anchor="start" x="7854" y="-3111.9" font-family="Arial" font-size="14.00" fill="#000000">key_id    </text>
-<text text-anchor="start" x="7928.6592" y="-3111.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7847,-3070.5 7847,-3100.5 8141,-3100.5 8141,-3070.5 7847,-3070.5"/>
-<text text-anchor="start" x="7854" y="-3081.9" font-family="Arial" font-size="14.00" fill="#000000">key_id_column    </text>
-<text text-anchor="start" x="7981.5568" y="-3081.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7847,-3040.5 7847,-3070.5 8141,-3070.5 8141,-3040.5 7847,-3040.5"/>
-<text text-anchor="start" x="7854" y="-3051.9" font-family="Arial" font-size="14.00" fill="#000000">associated_columns    </text>
-<text text-anchor="start" x="8015.0126" y="-3051.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7847,-3010.5 7847,-3040.5 8141,-3040.5 8141,-3010.5 7847,-3010.5"/>
-<text text-anchor="start" x="7854" y="-3021.9" font-family="Arial" font-size="14.00" fill="#000000">nonce_column    </text>
-<text text-anchor="start" x="7979.2328" y="-3021.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7847,-2980.5 7847,-3010.5 8141,-3010.5 8141,-2980.5 7847,-2980.5"/>
-<text text-anchor="start" x="7854" y="-2991.9" font-family="Arial" font-size="14.00" fill="#000000">format_type    </text>
-<text text-anchor="start" x="7962.1108" y="-2991.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-</g>
-<!-- pgsodium.decrypted_key -->
-<g id="node27" class="node">
-<title>pgsodium.decrypted_key</title>
-<polygon fill="#efefef" stroke="transparent" points="8246,-3295.5 8246,-3330.5 8537,-3330.5 8537,-3295.5 8246,-3295.5"/>
-<polygon fill="none" stroke="#000000" points="8246,-3295.5 8246,-3330.5 8537,-3330.5 8537,-3295.5 8246,-3295.5"/>
-<text text-anchor="start" x="8252.5891" y="-3308.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.decrypted_key</text>
-<text text-anchor="start" x="8452.6465" y="-3308.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="8486.8513" y="-3308.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="8246,-3265.5 8246,-3295.5 8537,-3295.5 8537,-3265.5 8246,-3265.5"/>
-<text text-anchor="start" x="8253" y="-3276.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="8298.094" y="-3276.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="8246,-3235.5 8246,-3265.5 8537,-3265.5 8537,-3235.5 8246,-3235.5"/>
-<text text-anchor="start" x="8253" y="-3246.9" font-family="Arial" font-size="14.00" fill="#000000">status    </text>
-<text text-anchor="start" x="8324.5512" y="-3246.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_status]</text>
-<polygon fill="none" stroke="#000000" points="8246,-3205.5 8246,-3235.5 8537,-3235.5 8537,-3205.5 8246,-3205.5"/>
-<text text-anchor="start" x="8253" y="-3216.9" font-family="Arial" font-size="14.00" fill="#000000">created    </text>
-<text text-anchor="start" x="8333.8864" y="-3216.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="8246,-3175.5 8246,-3205.5 8537,-3205.5 8537,-3175.5 8246,-3175.5"/>
-<text text-anchor="start" x="8253" y="-3186.9" font-family="Arial" font-size="14.00" fill="#000000">expires    </text>
-<text text-anchor="start" x="8332.3198" y="-3186.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="8246,-3145.5 8246,-3175.5 8537,-3175.5 8537,-3145.5 8246,-3145.5"/>
-<text text-anchor="start" x="8253" y="-3156.9" font-family="Arial" font-size="14.00" fill="#000000">key_type    </text>
-<text text-anchor="start" x="8343.2258" y="-3156.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_type]</text>
-<polygon fill="none" stroke="#000000" points="8246,-3115.5 8246,-3145.5 8537,-3145.5 8537,-3115.5 8246,-3115.5"/>
-<text text-anchor="start" x="8253" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">key_id    </text>
-<text text-anchor="start" x="8327.6592" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="8246,-3085.5 8246,-3115.5 8537,-3115.5 8537,-3085.5 8246,-3085.5"/>
-<text text-anchor="start" x="8253" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">key_context    </text>
-<text text-anchor="start" x="8361.899" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="8246,-3055.5 8246,-3085.5 8537,-3085.5 8537,-3055.5 8246,-3055.5"/>
-<text text-anchor="start" x="8253" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="8322.2132" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="8246,-3025.5 8246,-3055.5 8537,-3055.5 8537,-3025.5 8246,-3025.5"/>
-<text text-anchor="start" x="8253" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">associated_data    </text>
-<text text-anchor="start" x="8389.136" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="8246,-2995.5 8246,-3025.5 8537,-3025.5 8537,-2995.5 8246,-2995.5"/>
-<text text-anchor="start" x="8253" y="-3006.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key    </text>
-<text text-anchor="start" x="8339.3198" y="-3006.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="8246,-2965.5 8246,-2995.5 8537,-2995.5 8537,-2965.5 8246,-2965.5"/>
-<text text-anchor="start" x="8253" y="-2976.9" font-family="Arial" font-size="14.00" fill="#000000">decrypted_raw_key    </text>
-<text text-anchor="start" x="8408.5666" y="-2976.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="8246,-2935.5 8246,-2965.5 8537,-2965.5 8537,-2935.5 8246,-2935.5"/>
-<text text-anchor="start" x="8253" y="-2946.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key_nonce    </text>
-<text text-anchor="start" x="8385.2328" y="-2946.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="8246,-2905.5 8246,-2935.5 8537,-2935.5 8537,-2905.5 8246,-2905.5"/>
-<text text-anchor="start" x="8253" y="-2916.9" font-family="Arial" font-size="14.00" fill="#000000">parent_key    </text>
-<text text-anchor="start" x="8356.4516" y="-2916.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="8246,-2875.5 8246,-2905.5 8537,-2905.5 8537,-2875.5 8246,-2875.5"/>
-<text text-anchor="start" x="8253" y="-2886.9" font-family="Arial" font-size="14.00" fill="#000000">comment    </text>
-<text text-anchor="start" x="8344.7644" y="-2886.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-</g>
-<!-- vault.secrets -->
-<g id="node28" class="node">
-<title>vault.secrets</title>
-<polygon fill="#efefef" stroke="transparent" points="6710,-3205.5 6710,-3240.5 6993,-3240.5 6993,-3205.5 6710,-3205.5"/>
-<polygon fill="none" stroke="#000000" points="6710,-3205.5 6710,-3240.5 6993,-3240.5 6993,-3205.5 6710,-3205.5"/>
-<text text-anchor="start" x="6737.2071" y="-3218.3" font-family="Arial Bold" font-size="18.00" fill="#000000">vault.secrets</text>
-<text text-anchor="start" x="6838.2249" y="-3218.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="6872.4297" y="-3218.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="6710,-3175.5 6710,-3205.5 6993,-3205.5 6993,-3175.5 6710,-3175.5"/>
-<text text-anchor="start" x="6717" y="-3186.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="6762.094" y="-3186.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="6710,-3145.5 6710,-3175.5 6993,-3175.5 6993,-3145.5 6710,-3145.5"/>
-<text text-anchor="start" x="6717" y="-3156.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="6786.2132" y="-3156.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="6710,-3115.5 6710,-3145.5 6993,-3145.5 6993,-3115.5 6710,-3115.5"/>
-<text text-anchor="start" x="6717" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">description    </text>
-<text text-anchor="start" x="6818.8822" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="6710,-3085.5 6710,-3115.5 6993,-3115.5 6993,-3085.5 6710,-3085.5"/>
-<text text-anchor="start" x="6717" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">secret    </text>
-<text text-anchor="start" x="6789.3212" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="6710,-3055.5 6710,-3085.5 6993,-3085.5 6993,-3055.5 6710,-3055.5"/>
-<text text-anchor="start" x="6717" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">key_id    </text>
-<text text-anchor="start" x="6791.6592" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="6710,-3025.5 6710,-3055.5 6993,-3055.5 6993,-3025.5 6710,-3025.5"/>
-<text text-anchor="start" x="6717" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">nonce    </text>
-<text text-anchor="start" x="6789.3352" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="6710,-2995.5 6710,-3025.5 6993,-3025.5 6993,-2995.5 6710,-2995.5"/>
-<text text-anchor="start" x="6717" y="-3006.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="6817.3422" y="-3006.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="6710,-2965.5 6710,-2995.5 6993,-2995.5 6993,-2965.5 6710,-2965.5"/>
-<text text-anchor="start" x="6716.5344" y="-2976.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="6820.7812" y="-2976.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- vault.secrets&#45;&gt;pgsodium.key -->
-<g id="edge13" class="edge">
-<title>vault.secrets:key_id&#45;&gt;pgsodium.key:id</title>
-<path fill="none" stroke="#000000" d="M7003.0792,-3069.5941C7156.1577,-3039.4778 6537.5523,-2268.5 6722,-2268.5"/>
-<polygon fill="#000000" stroke="#000000" points="7002.9599,-3069.6048 6992.5971,-3066.0181 6997.9799,-3070.0524 6993,-3070.5 6993,-3070.5 6993,-3070.5 6997.9799,-3070.0524 6993.4029,-3074.9819 7002.9599,-3069.6048 7002.9599,-3069.6048"/>
-<text text-anchor="start" x="6864.6615" y="-3054.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (key_id) REFERENCES pgsodium.key(id)</text>
-</g>
-<!-- vault.decrypted_secrets -->
-<g id="node29" class="node">
-<title>vault.decrypted_secrets</title>
-<polygon fill="#efefef" stroke="transparent" points="8641,-3220.5 8641,-3255.5 8924,-3255.5 8924,-3220.5 8641,-3220.5"/>
-<polygon fill="none" stroke="#000000" points="8641,-3220.5 8641,-3255.5 8924,-3255.5 8924,-3220.5 8641,-3220.5"/>
-<text text-anchor="start" x="8648.5931" y="-3233.3" font-family="Arial Bold" font-size="18.00" fill="#000000">vault.decrypted_secrets</text>
-<text text-anchor="start" x="8838.6425" y="-3233.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="8872.8473" y="-3233.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="8641,-3190.5 8641,-3220.5 8924,-3220.5 8924,-3190.5 8641,-3190.5"/>
-<text text-anchor="start" x="8648" y="-3201.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="8693.094" y="-3201.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="8641,-3160.5 8641,-3190.5 8924,-3190.5 8924,-3160.5 8641,-3160.5"/>
-<text text-anchor="start" x="8648" y="-3171.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="8717.2132" y="-3171.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="8641,-3130.5 8641,-3160.5 8924,-3160.5 8924,-3130.5 8641,-3130.5"/>
-<text text-anchor="start" x="8648" y="-3141.9" font-family="Arial" font-size="14.00" fill="#000000">description    </text>
-<text text-anchor="start" x="8749.8822" y="-3141.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="8641,-3100.5 8641,-3130.5 8924,-3130.5 8924,-3100.5 8641,-3100.5"/>
-<text text-anchor="start" x="8648" y="-3111.9" font-family="Arial" font-size="14.00" fill="#000000">secret    </text>
-<text text-anchor="start" x="8720.3212" y="-3111.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="8641,-3070.5 8641,-3100.5 8924,-3100.5 8924,-3070.5 8641,-3070.5"/>
-<text text-anchor="start" x="8648" y="-3081.9" font-family="Arial" font-size="14.00" fill="#000000">decrypted_secret    </text>
-<text text-anchor="start" x="8789.568" y="-3081.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="8641,-3040.5 8641,-3070.5 8924,-3070.5 8924,-3040.5 8641,-3040.5"/>
-<text text-anchor="start" x="8648" y="-3051.9" font-family="Arial" font-size="14.00" fill="#000000">key_id    </text>
-<text text-anchor="start" x="8722.6592" y="-3051.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="8641,-3010.5 8641,-3040.5 8924,-3040.5 8924,-3010.5 8641,-3010.5"/>
-<text text-anchor="start" x="8648" y="-3021.9" font-family="Arial" font-size="14.00" fill="#000000">nonce    </text>
-<text text-anchor="start" x="8720.3352" y="-3021.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="8641,-2980.5 8641,-3010.5 8924,-3010.5 8924,-2980.5 8641,-2980.5"/>
-<text text-anchor="start" x="8648" y="-2991.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="8748.3422" y="-2991.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="8641,-2950.5 8641,-2980.5 8924,-2980.5 8924,-2950.5 8641,-2950.5"/>
-<text text-anchor="start" x="8647.5344" y="-2961.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="8751.7812" y="-2961.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/storage.buckets.md b/docs/database/storage.buckets.md
deleted file mode 100644
index 721b3da57..000000000
--- a/docs/database/storage.buckets.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# storage.buckets
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | text |  | false | [storage.objects](storage.objects.md) |  |  |
-| name | text |  | false |  |  |  |
-| owner | uuid |  | true |  | [auth.users](auth.users.md) |  |
-| created_at | timestamp with time zone | now() | true |  |  |  |
-| updated_at | timestamp with time zone | now() | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| buckets_owner_fkey | FOREIGN KEY | FOREIGN KEY (owner) REFERENCES auth.users(id) |
-| buckets_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| buckets_pkey | CREATE UNIQUE INDEX buckets_pkey ON storage.buckets USING btree (id) |
-| bname | CREATE UNIQUE INDEX bname ON storage.buckets USING btree (name) |
-
-## Relations
-
-![er](storage.buckets.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/storage.buckets.svg b/docs/database/storage.buckets.svg
deleted file mode 100644
index eb745c9e2..000000000
--- a/docs/database/storage.buckets.svg
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: storage.buckets Pages: 1 -->
-<svg width="682pt" height="1469pt"
- viewBox="0.00 0.00 682.00 1469.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1465)">
-<title>storage.buckets</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1465 678,-1465 678,4 -4,4"/>
-<!-- storage.buckets -->
-<g id="node1" class="node">
-<title>storage.buckets</title>
-<polygon fill="#efefef" stroke="transparent" points="86,-982.5 86,-1017.5 354,-1017.5 354,-982.5 86,-982.5"/>
-<polygon fill="none" stroke="#000000" points="86,-982.5 86,-1017.5 354,-1017.5 354,-982.5 86,-982.5"/>
-<text text-anchor="start" x="92.6949" y="-995.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.buckets</text>
-<text text-anchor="start" x="219.7371" y="-995.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="253.9419" y="-995.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="86,-952.5 86,-982.5 354,-982.5 354,-952.5 86,-952.5"/>
-<text text-anchor="start" x="93" y="-963.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="107.7798" y="-963.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="86,-922.5 86,-952.5 354,-952.5 354,-922.5 86,-922.5"/>
-<text text-anchor="start" x="93" y="-933.9" font-family="Arial" font-size="14.00" fill="#000000">name </text>
-<text text-anchor="start" x="131.899" y="-933.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="86,-892.5 86,-922.5 354,-922.5 354,-892.5 86,-892.5"/>
-<text text-anchor="start" x="93" y="-903.9" font-family="Arial" font-size="14.00" fill="#000000">owner </text>
-<text text-anchor="start" x="135.0056" y="-903.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="86,-862.5 86,-892.5 354,-892.5 354,-862.5 86,-862.5"/>
-<text text-anchor="start" x="93" y="-873.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="163.028" y="-873.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="86,-832.5 86,-862.5 354,-862.5 354,-832.5 86,-832.5"/>
-<text text-anchor="start" x="93" y="-843.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at </text>
-<text text-anchor="start" x="166.9326" y="-843.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="84.5,-831.5 84.5,-1019.5 355.5,-1019.5 355.5,-831.5 84.5,-831.5"/>
-</g>
-<!-- auth.users -->
-<g id="node3" class="node">
-<title>auth.users</title>
-<polygon fill="#efefef" stroke="transparent" points="43,-672.5 43,-707.5 397,-707.5 397,-672.5 43,-672.5"/>
-<polygon fill="none" stroke="#000000" points="43,-672.5 43,-707.5 397,-707.5 397,-672.5 43,-672.5"/>
-<text text-anchor="start" x="114.2022" y="-685.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.users</text>
-<text text-anchor="start" x="198.2298" y="-685.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="232.4346" y="-685.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="43,-642.5 43,-672.5 397,-672.5 397,-642.5 43,-642.5"/>
-<text text-anchor="start" x="50" y="-653.9" font-family="Arial" font-size="14.00" fill="#000000">instance_id    </text>
-<text text-anchor="start" x="155.0042" y="-653.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43,-612.5 43,-642.5 397,-642.5 397,-612.5 43,-612.5"/>
-<text text-anchor="start" x="50" y="-623.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="95.094" y="-623.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43,-582.5 43,-612.5 397,-612.5 397,-582.5 43,-582.5"/>
-<text text-anchor="start" x="50" y="-593.9" font-family="Arial" font-size="14.00" fill="#000000">aud    </text>
-<text text-anchor="start" x="107.5526" y="-593.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="43,-552.5 43,-582.5 397,-582.5 397,-552.5 43,-552.5"/>
-<text text-anchor="start" x="50" y="-563.9" font-family="Arial" font-size="14.00" fill="#000000">role    </text>
-<text text-anchor="start" x="107.5372" y="-563.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="43,-522.5 43,-552.5 397,-552.5 397,-522.5 43,-522.5"/>
-<text text-anchor="start" x="50" y="-533.9" font-family="Arial" font-size="14.00" fill="#000000">email    </text>
-<text text-anchor="start" x="117.6438" y="-533.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="43,-492.5 43,-522.5 397,-522.5 397,-492.5 43,-492.5"/>
-<text text-anchor="start" x="50" y="-503.9" font-family="Arial" font-size="14.00" fill="#000000">encrypted_password    </text>
-<text text-anchor="start" x="213.3492" y="-503.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="43,-462.5 43,-492.5 397,-492.5 397,-462.5 43,-462.5"/>
-<text text-anchor="start" x="50" y="-473.9" font-family="Arial" font-size="14.00" fill="#000000">confirmed_at    </text>
-<text text-anchor="start" x="165.1094" y="-473.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43,-432.5 43,-462.5 397,-462.5 397,-432.5 43,-432.5"/>
-<text text-anchor="start" x="50" y="-443.9" font-family="Arial" font-size="14.00" fill="#000000">invited_at    </text>
-<text text-anchor="start" x="144.1122" y="-443.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43,-402.5 43,-432.5 397,-432.5 397,-402.5 43,-402.5"/>
-<text text-anchor="start" x="50" y="-413.9" font-family="Arial" font-size="14.00" fill="#000000">confirmation_token    </text>
-<text text-anchor="start" x="202.4544" y="-413.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="43,-372.5 43,-402.5 397,-402.5 397,-372.5 43,-372.5"/>
-<text text-anchor="start" x="50" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">confirmation_sent_at    </text>
-<text text-anchor="start" x="214.1276" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43,-342.5 43,-372.5 397,-372.5 397,-342.5 43,-342.5"/>
-<text text-anchor="start" x="50" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">recovery_token    </text>
-<text text-anchor="start" x="179.8948" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="43,-312.5 43,-342.5 397,-342.5 397,-312.5 43,-312.5"/>
-<text text-anchor="start" x="50" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">recovery_sent_at    </text>
-<text text-anchor="start" x="191.568" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43,-282.5 43,-312.5 397,-312.5 397,-282.5 43,-282.5"/>
-<text text-anchor="start" x="50" y="-293.9" font-family="Arial" font-size="14.00" fill="#000000">email_change_token    </text>
-<text text-anchor="start" x="213.3604" y="-293.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="43,-252.5 43,-282.5 397,-282.5 397,-252.5 43,-252.5"/>
-<text text-anchor="start" x="50" y="-263.9" font-family="Arial" font-size="14.00" fill="#000000">email_change    </text>
-<text text-anchor="start" x="171.3394" y="-263.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="43,-222.5 43,-252.5 397,-252.5 397,-222.5 43,-222.5"/>
-<text text-anchor="start" x="49.641" y="-233.9" font-family="Arial" font-size="14.00" fill="#000000">email_change_sent_at    </text>
-<text text-anchor="start" x="224.6746" y="-233.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43,-192.5 43,-222.5 397,-222.5 397,-192.5 43,-192.5"/>
-<text text-anchor="start" x="50" y="-203.9" font-family="Arial" font-size="14.00" fill="#000000">last_sign_in_at    </text>
-<text text-anchor="start" x="177.5666" y="-203.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43,-162.5 43,-192.5 397,-192.5 397,-162.5 43,-162.5"/>
-<text text-anchor="start" x="50" y="-173.9" font-family="Arial" font-size="14.00" fill="#000000">raw_app_meta_data    </text>
-<text text-anchor="start" x="211.805" y="-173.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43,-132.5 43,-162.5 397,-162.5 397,-132.5 43,-132.5"/>
-<text text-anchor="start" x="50" y="-143.9" font-family="Arial" font-size="14.00" fill="#000000">raw_user_meta_data    </text>
-<text text-anchor="start" x="215.683" y="-143.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43,-102.5 43,-132.5 397,-132.5 397,-102.5 43,-102.5"/>
-<text text-anchor="start" x="50" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">is_super_admin    </text>
-<text text-anchor="start" x="183" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="43,-72.5 43,-102.5 397,-102.5 397,-72.5 43,-72.5"/>
-<text text-anchor="start" x="50" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="150.3422" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43,-42.5 43,-72.5 397,-72.5 397,-42.5 43,-42.5"/>
-<text text-anchor="start" x="50" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="154.2468" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- storage.buckets&#45;&gt;auth.users -->
-<g id="edge2" class="edge">
-<title>storage.buckets:owner&#45;&gt;auth.users:id</title>
-<path fill="none" stroke="#000000" d="M363.7801,-905.2462C421.1922,-878.7474 456.632,-627.5 397,-627.5"/>
-<polygon fill="#000000" stroke="#000000" points="363.7446,-905.2543 352.9894,-903.1149 358.8723,-906.3771 354,-907.5 354,-907.5 354,-907.5 358.8723,-906.3771 355.0106,-911.8851 363.7446,-905.2543 363.7446,-905.2543"/>
-<text text-anchor="start" x="360.9965" y="-917.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (owner) REFERENCES auth.users(id)</text>
-</g>
-<!-- storage.objects -->
-<g id="node2" class="node">
-<title>storage.objects</title>
-<polygon fill="#efefef" stroke="transparent" points="59,-1382.5 59,-1417.5 381,-1417.5 381,-1382.5 59,-1382.5"/>
-<polygon fill="none" stroke="#000000" points="59,-1382.5 59,-1417.5 381,-1417.5 381,-1382.5 59,-1382.5"/>
-<text text-anchor="start" x="95.1978" y="-1395.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.objects</text>
-<text text-anchor="start" x="217.2342" y="-1395.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="251.439" y="-1395.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="59,-1352.5 59,-1382.5 381,-1382.5 381,-1352.5 59,-1352.5"/>
-<text text-anchor="start" x="66" y="-1363.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="111.094" y="-1363.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="59,-1322.5 59,-1352.5 381,-1352.5 381,-1322.5 59,-1322.5"/>
-<text text-anchor="start" x="66" y="-1333.9" font-family="Arial" font-size="14.00" fill="#000000">bucket_id    </text>
-<text text-anchor="start" x="160.115" y="-1333.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="59,-1292.5 59,-1322.5 381,-1322.5 381,-1292.5 59,-1292.5"/>
-<text text-anchor="start" x="66" y="-1303.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="135.2132" y="-1303.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="59,-1262.5 59,-1292.5 381,-1292.5 381,-1262.5 59,-1262.5"/>
-<text text-anchor="start" x="66" y="-1273.9" font-family="Arial" font-size="14.00" fill="#000000">owner    </text>
-<text text-anchor="start" x="138.3198" y="-1273.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="59,-1232.5 59,-1262.5 381,-1262.5 381,-1232.5 59,-1232.5"/>
-<text text-anchor="start" x="66" y="-1243.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="166.3422" y="-1243.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="59,-1202.5 59,-1232.5 381,-1232.5 381,-1202.5 59,-1202.5"/>
-<text text-anchor="start" x="66" y="-1213.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="170.2468" y="-1213.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="59,-1172.5 59,-1202.5 381,-1202.5 381,-1172.5 59,-1172.5"/>
-<text text-anchor="start" x="65.9811" y="-1183.9" font-family="Arial" font-size="14.00" fill="#000000">last_accessed_at    </text>
-<text text-anchor="start" x="208.3345" y="-1183.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="59,-1142.5 59,-1172.5 381,-1172.5 381,-1142.5 59,-1142.5"/>
-<text text-anchor="start" x="66" y="-1153.9" font-family="Arial" font-size="14.00" fill="#000000">metadata    </text>
-<text text-anchor="start" x="158.5596" y="-1153.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- storage.objects&#45;&gt;storage.buckets -->
-<g id="edge1" class="edge">
-<title>storage.objects:bucket_id&#45;&gt;storage.buckets:id</title>
-<path fill="none" stroke="#000000" d="M391.0252,-1335.5093C461.0182,-1306.3863 432.8985,-967.5 354,-967.5"/>
-<polygon fill="#000000" stroke="#000000" points="390.8085,-1335.5523 380.1235,-1333.0862 385.9042,-1336.5261 381,-1337.5 381,-1337.5 381,-1337.5 385.9042,-1336.5261 381.8765,-1341.9138 390.8085,-1335.5523 390.8085,-1335.5523"/>
-<text text-anchor="start" x="388.264" y="-1347.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (bucket_id) REFERENCES storage.buckets(id)</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/storage.migrations.md b/docs/database/storage.migrations.md
deleted file mode 100644
index 2d9064cfd..000000000
--- a/docs/database/storage.migrations.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# storage.migrations
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | integer |  | false |  |  |  |
-| name | varchar(100) |  | false |  |  |  |
-| hash | varchar(40) |  | false |  |  |  |
-| executed_at | timestamp without time zone | CURRENT_TIMESTAMP | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| migrations_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-| migrations_name_key | UNIQUE | UNIQUE (name) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| migrations_pkey | CREATE UNIQUE INDEX migrations_pkey ON storage.migrations USING btree (id) |
-| migrations_name_key | CREATE UNIQUE INDEX migrations_name_key ON storage.migrations USING btree (name) |
-
-## Relations
-
-![er](storage.migrations.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/storage.migrations.svg b/docs/database/storage.migrations.svg
deleted file mode 100644
index 4b38ba13d..000000000
--- a/docs/database/storage.migrations.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: storage.migrations Pages: 1 -->
-<svg width="389pt" height="255pt"
- viewBox="0.00 0.00 389.00 255.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 251)">
-<title>storage.migrations</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-251 385,-251 385,4 -4,4"/>
-<!-- storage.migrations -->
-<g id="node1" class="node">
-<title>storage.migrations</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-165.5 46.5,-200.5 335.5,-200.5 335.5,-165.5 46.5,-165.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-200.5 335.5,-200.5 335.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.2054" y="-178.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.migrations</text>
-<text text-anchor="start" x="201.2266" y="-178.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="235.4314" y="-178.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 335.5,-165.5 335.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="68.2798" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 335.5,-135.5 335.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">name </text>
-<text text-anchor="start" x="92.399" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(100)]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 335.5,-105.5 335.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">hash </text>
-<text text-anchor="start" x="87.7384" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(40)]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 335.5,-75.5 335.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">executed_at </text>
-<text text-anchor="start" x="133.65" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp without time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-202.5 336.5,-202.5 336.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/storage.objects.md b/docs/database/storage.objects.md
deleted file mode 100644
index 521b2a999..000000000
--- a/docs/database/storage.objects.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# storage.objects
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid | uuid_generate_v4() | false |  |  |  |
-| bucket_id | text |  | true |  | [storage.buckets](storage.buckets.md) |  |
-| name | text |  | true |  |  |  |
-| owner | uuid |  | true |  | [auth.users](auth.users.md) |  |
-| created_at | timestamp with time zone | now() | true |  |  |  |
-| updated_at | timestamp with time zone | now() | true |  |  |  |
-| last_accessed_at | timestamp with time zone | now() | true |  |  |  |
-| metadata | jsonb |  | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| objects_owner_fkey | FOREIGN KEY | FOREIGN KEY (owner) REFERENCES auth.users(id) |
-| objects_bucketId_fkey | FOREIGN KEY | FOREIGN KEY (bucket_id) REFERENCES storage.buckets(id) |
-| objects_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| objects_pkey | CREATE UNIQUE INDEX objects_pkey ON storage.objects USING btree (id) |
-| bucketid_objname | CREATE UNIQUE INDEX bucketid_objname ON storage.objects USING btree (bucket_id, name) |
-| name_prefix_search | CREATE INDEX name_prefix_search ON storage.objects USING btree (name text_pattern_ops) |
-
-## Relations
-
-![er](storage.objects.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/storage.objects.svg b/docs/database/storage.objects.svg
deleted file mode 100644
index 0a9fcd470..000000000
--- a/docs/database/storage.objects.svg
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: storage.objects Pages: 1 -->
-<svg width="878pt" height="1162pt"
- viewBox="0.00 0.00 878.00 1162.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1158)">
-<title>storage.objects</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1158 874,-1158 874,4 -4,4"/>
-<!-- storage.objects -->
-<g id="node1" class="node">
-<title>storage.objects</title>
-<polygon fill="#efefef" stroke="transparent" points="293,-1072.5 293,-1107.5 584,-1107.5 584,-1072.5 293,-1072.5"/>
-<polygon fill="none" stroke="#000000" points="293,-1072.5 293,-1107.5 584,-1107.5 584,-1072.5 293,-1072.5"/>
-<text text-anchor="start" x="313.6978" y="-1085.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.objects</text>
-<text text-anchor="start" x="435.7342" y="-1085.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="469.939" y="-1085.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="293,-1042.5 293,-1072.5 584,-1072.5 584,-1042.5 293,-1042.5"/>
-<text text-anchor="start" x="300" y="-1053.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="314.7798" y="-1053.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="293,-1012.5 293,-1042.5 584,-1042.5 584,-1012.5 293,-1012.5"/>
-<text text-anchor="start" x="300" y="-1023.9" font-family="Arial" font-size="14.00" fill="#000000">bucket_id </text>
-<text text-anchor="start" x="363.8008" y="-1023.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="293,-982.5 293,-1012.5 584,-1012.5 584,-982.5 293,-982.5"/>
-<text text-anchor="start" x="300" y="-993.9" font-family="Arial" font-size="14.00" fill="#000000">name </text>
-<text text-anchor="start" x="338.899" y="-993.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="293,-952.5 293,-982.5 584,-982.5 584,-952.5 293,-952.5"/>
-<text text-anchor="start" x="300" y="-963.9" font-family="Arial" font-size="14.00" fill="#000000">owner </text>
-<text text-anchor="start" x="342.0056" y="-963.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="293,-922.5 293,-952.5 584,-952.5 584,-922.5 293,-922.5"/>
-<text text-anchor="start" x="300" y="-933.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="370.028" y="-933.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="293,-892.5 293,-922.5 584,-922.5 584,-892.5 293,-892.5"/>
-<text text-anchor="start" x="300" y="-903.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at </text>
-<text text-anchor="start" x="373.9326" y="-903.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="293,-862.5 293,-892.5 584,-892.5 584,-862.5 293,-862.5"/>
-<text text-anchor="start" x="299.6382" y="-873.9" font-family="Arial" font-size="14.00" fill="#000000">last_accessed_at </text>
-<text text-anchor="start" x="411.6774" y="-873.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="293,-832.5 293,-862.5 584,-862.5 584,-832.5 293,-832.5"/>
-<text text-anchor="start" x="300" y="-843.9" font-family="Arial" font-size="14.00" fill="#000000">metadata </text>
-<text text-anchor="start" x="362.2454" y="-843.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="291,-831.5 291,-1109.5 585,-1109.5 585,-831.5 291,-831.5"/>
-</g>
-<!-- storage.buckets -->
-<g id="node2" class="node">
-<title>storage.buckets</title>
-<polygon fill="#efefef" stroke="transparent" points="86,-432.5 86,-467.5 369,-467.5 369,-432.5 86,-432.5"/>
-<polygon fill="none" stroke="#000000" points="86,-432.5 86,-467.5 369,-467.5 369,-432.5 86,-432.5"/>
-<text text-anchor="start" x="100.1949" y="-445.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.buckets</text>
-<text text-anchor="start" x="227.2371" y="-445.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="261.4419" y="-445.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="86,-402.5 86,-432.5 369,-432.5 369,-402.5 86,-402.5"/>
-<text text-anchor="start" x="93" y="-413.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="138.094" y="-413.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="86,-372.5 86,-402.5 369,-402.5 369,-372.5 86,-372.5"/>
-<text text-anchor="start" x="93" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="162.2132" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="86,-342.5 86,-372.5 369,-372.5 369,-342.5 86,-342.5"/>
-<text text-anchor="start" x="93" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">owner    </text>
-<text text-anchor="start" x="165.3198" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="86,-312.5 86,-342.5 369,-342.5 369,-312.5 86,-312.5"/>
-<text text-anchor="start" x="93" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="193.3422" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="86,-282.5 86,-312.5 369,-312.5 369,-282.5 86,-282.5"/>
-<text text-anchor="start" x="92.5344" y="-293.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="196.7812" y="-293.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- storage.objects&#45;&gt;storage.buckets -->
-<g id="edge1" class="edge">
-<title>storage.objects:bucket_id&#45;&gt;storage.buckets:id</title>
-<path fill="none" stroke="#000000" d="M282.9864,-1026.1946C188.2843,-999.4826 360.8697,-571.1506 369,-511 374.5663,-469.8189 410.5556,-417.5 369,-417.5"/>
-<polygon fill="#000000" stroke="#000000" points="283.0839,-1026.2072 292.4182,-1031.9622 288.042,-1026.8536 293,-1027.5 293,-1027.5 293,-1027.5 288.042,-1026.8536 293.5818,-1023.0378 283.0839,-1026.2072 283.0839,-1026.2072"/>
-<text text-anchor="start" x="7.264" y="-1037.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (bucket_id) REFERENCES storage.buckets(id)</text>
-</g>
-<!-- auth.users -->
-<g id="node3" class="node">
-<title>auth.users</title>
-<polygon fill="#efefef" stroke="transparent" points="473,-672.5 473,-707.5 827,-707.5 827,-672.5 473,-672.5"/>
-<polygon fill="none" stroke="#000000" points="473,-672.5 473,-707.5 827,-707.5 827,-672.5 473,-672.5"/>
-<text text-anchor="start" x="544.2022" y="-685.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.users</text>
-<text text-anchor="start" x="628.2298" y="-685.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="662.4346" y="-685.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="473,-642.5 473,-672.5 827,-672.5 827,-642.5 473,-642.5"/>
-<text text-anchor="start" x="480" y="-653.9" font-family="Arial" font-size="14.00" fill="#000000">instance_id    </text>
-<text text-anchor="start" x="585.0042" y="-653.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="473,-612.5 473,-642.5 827,-642.5 827,-612.5 473,-612.5"/>
-<text text-anchor="start" x="480" y="-623.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="525.094" y="-623.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="473,-582.5 473,-612.5 827,-612.5 827,-582.5 473,-582.5"/>
-<text text-anchor="start" x="480" y="-593.9" font-family="Arial" font-size="14.00" fill="#000000">aud    </text>
-<text text-anchor="start" x="537.5526" y="-593.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="473,-552.5 473,-582.5 827,-582.5 827,-552.5 473,-552.5"/>
-<text text-anchor="start" x="480" y="-563.9" font-family="Arial" font-size="14.00" fill="#000000">role    </text>
-<text text-anchor="start" x="537.5372" y="-563.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="473,-522.5 473,-552.5 827,-552.5 827,-522.5 473,-522.5"/>
-<text text-anchor="start" x="480" y="-533.9" font-family="Arial" font-size="14.00" fill="#000000">email    </text>
-<text text-anchor="start" x="547.6438" y="-533.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="473,-492.5 473,-522.5 827,-522.5 827,-492.5 473,-492.5"/>
-<text text-anchor="start" x="480" y="-503.9" font-family="Arial" font-size="14.00" fill="#000000">encrypted_password    </text>
-<text text-anchor="start" x="643.3492" y="-503.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="473,-462.5 473,-492.5 827,-492.5 827,-462.5 473,-462.5"/>
-<text text-anchor="start" x="480" y="-473.9" font-family="Arial" font-size="14.00" fill="#000000">confirmed_at    </text>
-<text text-anchor="start" x="595.1094" y="-473.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="473,-432.5 473,-462.5 827,-462.5 827,-432.5 473,-432.5"/>
-<text text-anchor="start" x="480" y="-443.9" font-family="Arial" font-size="14.00" fill="#000000">invited_at    </text>
-<text text-anchor="start" x="574.1122" y="-443.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="473,-402.5 473,-432.5 827,-432.5 827,-402.5 473,-402.5"/>
-<text text-anchor="start" x="480" y="-413.9" font-family="Arial" font-size="14.00" fill="#000000">confirmation_token    </text>
-<text text-anchor="start" x="632.4544" y="-413.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="473,-372.5 473,-402.5 827,-402.5 827,-372.5 473,-372.5"/>
-<text text-anchor="start" x="480" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">confirmation_sent_at    </text>
-<text text-anchor="start" x="644.1276" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="473,-342.5 473,-372.5 827,-372.5 827,-342.5 473,-342.5"/>
-<text text-anchor="start" x="480" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">recovery_token    </text>
-<text text-anchor="start" x="609.8948" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="473,-312.5 473,-342.5 827,-342.5 827,-312.5 473,-312.5"/>
-<text text-anchor="start" x="480" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">recovery_sent_at    </text>
-<text text-anchor="start" x="621.568" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="473,-282.5 473,-312.5 827,-312.5 827,-282.5 473,-282.5"/>
-<text text-anchor="start" x="480" y="-293.9" font-family="Arial" font-size="14.00" fill="#000000">email_change_token    </text>
-<text text-anchor="start" x="643.3604" y="-293.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="473,-252.5 473,-282.5 827,-282.5 827,-252.5 473,-252.5"/>
-<text text-anchor="start" x="480" y="-263.9" font-family="Arial" font-size="14.00" fill="#000000">email_change    </text>
-<text text-anchor="start" x="601.3394" y="-263.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="473,-222.5 473,-252.5 827,-252.5 827,-222.5 473,-222.5"/>
-<text text-anchor="start" x="479.641" y="-233.9" font-family="Arial" font-size="14.00" fill="#000000">email_change_sent_at    </text>
-<text text-anchor="start" x="654.6746" y="-233.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="473,-192.5 473,-222.5 827,-222.5 827,-192.5 473,-192.5"/>
-<text text-anchor="start" x="480" y="-203.9" font-family="Arial" font-size="14.00" fill="#000000">last_sign_in_at    </text>
-<text text-anchor="start" x="607.5666" y="-203.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="473,-162.5 473,-192.5 827,-192.5 827,-162.5 473,-162.5"/>
-<text text-anchor="start" x="480" y="-173.9" font-family="Arial" font-size="14.00" fill="#000000">raw_app_meta_data    </text>
-<text text-anchor="start" x="641.805" y="-173.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="473,-132.5 473,-162.5 827,-162.5 827,-132.5 473,-132.5"/>
-<text text-anchor="start" x="480" y="-143.9" font-family="Arial" font-size="14.00" fill="#000000">raw_user_meta_data    </text>
-<text text-anchor="start" x="645.683" y="-143.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="473,-102.5 473,-132.5 827,-132.5 827,-102.5 473,-102.5"/>
-<text text-anchor="start" x="480" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">is_super_admin    </text>
-<text text-anchor="start" x="613" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="473,-72.5 473,-102.5 827,-102.5 827,-72.5 473,-72.5"/>
-<text text-anchor="start" x="480" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="580.3422" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="473,-42.5 473,-72.5 827,-72.5 827,-42.5 473,-42.5"/>
-<text text-anchor="start" x="480" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="584.2468" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- storage.objects&#45;&gt;auth.users -->
-<g id="edge2" class="edge">
-<title>storage.objects:owner&#45;&gt;auth.users:id</title>
-<path fill="none" stroke="#000000" d="M594.1344,-966.8152C661.2243,-957.2154 629.0519,-848.9735 584,-787 553.5044,-745.0501 503.4956,-792.9499 473,-751 440.7252,-706.6026 418.1111,-627.5 473,-627.5"/>
-<polygon fill="#000000" stroke="#000000" points="593.9772,-966.8257 583.6966,-963.0102 588.9886,-967.1629 584,-967.5 584,-967.5 584,-967.5 588.9886,-967.1629 584.3034,-971.9898 593.9772,-966.8257 593.9772,-966.8257"/>
-<text text-anchor="start" x="590.9965" y="-977.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (owner) REFERENCES auth.users(id)</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/supabase_functions.hooks.md b/docs/database/supabase_functions.hooks.md
deleted file mode 100644
index b7940b96e..000000000
--- a/docs/database/supabase_functions.hooks.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# supabase_functions.hooks
-
-## Description
-
-Supabase Functions Hooks: Audit trail for triggered hooks.
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | bigint | nextval('supabase_functions.hooks_id_seq'::regclass) | false |  |  |  |
-| hook_table_id | integer |  | false |  |  |  |
-| hook_name | text |  | false |  |  |  |
-| created_at | timestamp with time zone | now() | false |  |  |  |
-| request_id | bigint |  | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| hooks_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| hooks_pkey | CREATE UNIQUE INDEX hooks_pkey ON supabase_functions.hooks USING btree (id) |
-| supabase_functions_hooks_request_id_idx | CREATE INDEX supabase_functions_hooks_request_id_idx ON supabase_functions.hooks USING btree (request_id) |
-| supabase_functions_hooks_h_table_id_h_name_idx | CREATE INDEX supabase_functions_hooks_h_table_id_h_name_idx ON supabase_functions.hooks USING btree (hook_table_id, hook_name) |
-
-## Relations
-
-![er](supabase_functions.hooks.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/supabase_functions.hooks.svg b/docs/database/supabase_functions.hooks.svg
deleted file mode 100644
index 770472c71..000000000
--- a/docs/database/supabase_functions.hooks.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: supabase_functions.hooks Pages: 1 -->
-<svg width="454pt" height="285pt"
- viewBox="0.00 0.00 454.00 285.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 281)">
-<title>supabase_functions.hooks</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-281 450,-281 450,4 -4,4"/>
-<!-- supabase_functions.hooks -->
-<g id="node1" class="node">
-<title>supabase_functions.hooks</title>
-<polygon fill="#efefef" stroke="transparent" points="46,-195.5 46,-230.5 400,-230.5 400,-195.5 46,-195.5"/>
-<polygon fill="none" stroke="#000000" points="46,-195.5 46,-230.5 400,-230.5 400,-195.5 46,-195.5"/>
-<text text-anchor="start" x="52.6722" y="-208.3" font-family="Arial Bold" font-size="18.00" fill="#000000">supabase_functions.hooks</text>
-<text text-anchor="start" x="265.7598" y="-208.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="299.9646" y="-208.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46,-165.5 46,-195.5 400,-195.5 400,-165.5 46,-165.5"/>
-<text text-anchor="start" x="53" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="67.7798" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46,-135.5 46,-165.5 400,-165.5 400,-135.5 46,-135.5"/>
-<text text-anchor="start" x="53" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">hook_table_id </text>
-<text text-anchor="start" x="144.0378" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="46,-105.5 46,-135.5 400,-135.5 400,-105.5 46,-105.5"/>
-<text text-anchor="start" x="53" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">hook_name </text>
-<text text-anchor="start" x="130.0294" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46,-75.5 46,-105.5 400,-105.5 400,-75.5 46,-75.5"/>
-<text text-anchor="start" x="53" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="123.028" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46,-45.5 46,-75.5 400,-75.5 400,-45.5 46,-45.5"/>
-<text text-anchor="start" x="53" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">request_id </text>
-<text text-anchor="start" x="122.244" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-232.5 401.5,-232.5 401.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/supabase_functions.migrations.md b/docs/database/supabase_functions.migrations.md
deleted file mode 100644
index 8c6ad439e..000000000
--- a/docs/database/supabase_functions.migrations.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# supabase_functions.migrations
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| version | text |  | false |  |  |  |
-| inserted_at | timestamp with time zone | now() | false |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| migrations_pkey | PRIMARY KEY | PRIMARY KEY (version) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| migrations_pkey | CREATE UNIQUE INDEX migrations_pkey ON supabase_functions.migrations USING btree (version) |
-
-## Relations
-
-![er](supabase_functions.migrations.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/supabase_functions.migrations.svg b/docs/database/supabase_functions.migrations.svg
deleted file mode 100644
index bc1eca4aa..000000000
--- a/docs/database/supabase_functions.migrations.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: supabase_functions.migrations Pages: 1 -->
-<svg width="489pt" height="195pt"
- viewBox="0.00 0.00 489.00 195.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 191)">
-<title>supabase_functions.migrations</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-191 485,-191 485,4 -4,4"/>
-<!-- supabase_functions.migrations -->
-<g id="node1" class="node">
-<title>supabase_functions.migrations</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-105.5 46.5,-140.5 435.5,-140.5 435.5,-105.5 46.5,-105.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-140.5 435.5,-140.5 435.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.1816" y="-118.3" font-family="Arial Bold" font-size="18.00" fill="#000000">supabase_functions.migrations</text>
-<text text-anchor="start" x="301.2504" y="-118.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="335.4552" y="-118.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 435.5,-105.5 435.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">version </text>
-<text text-anchor="start" x="102.5056" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 435.5,-75.5 435.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">inserted_at </text>
-<text text-anchor="start" x="126.6346" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-142.5 436.5,-142.5 436.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/vault.decrypted_secrets.md b/docs/database/vault.decrypted_secrets.md
deleted file mode 100644
index a0e489c91..000000000
--- a/docs/database/vault.decrypted_secrets.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# vault.decrypted_secrets
-
-## Description
-
-<details>
-<summary><strong>Table Definition</strong></summary>
-
-```sql
-CREATE VIEW decrypted_secrets AS (
- SELECT secrets.id,
-    secrets.name,
-    secrets.description,
-    secrets.secret,
-        CASE
-            WHEN (secrets.secret IS NULL) THEN NULL::text
-            ELSE
-            CASE
-                WHEN (secrets.key_id IS NULL) THEN NULL::text
-                ELSE convert_from(pgsodium.crypto_aead_det_decrypt(decode(secrets.secret, 'base64'::text), convert_to(((((secrets.id)::text || secrets.description) || (secrets.created_at)::text) || (secrets.updated_at)::text), 'utf8'::name), secrets.key_id, secrets.nonce), 'utf8'::name)
-            END
-        END AS decrypted_secret,
-    secrets.key_id,
-    secrets.nonce,
-    secrets.created_at,
-    secrets.updated_at
-   FROM vault.secrets
-)
-```
-
-</details>
-
-## Referenced Tables
-
-- [vault.secrets](vault.secrets.md)
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid |  | true |  |  |  |
-| name | text |  | true |  |  |  |
-| description | text |  | true |  |  |  |
-| secret | text |  | true |  |  |  |
-| decrypted_secret | text |  | true |  |  |  |
-| key_id | uuid |  | true |  |  |  |
-| nonce | bytea |  | true |  |  |  |
-| created_at | timestamp with time zone |  | true |  |  |  |
-| updated_at | timestamp with time zone |  | true |  |  |  |
-
-## Relations
-
-![er](vault.decrypted_secrets.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/vault.decrypted_secrets.svg b/docs/database/vault.decrypted_secrets.svg
deleted file mode 100644
index e83fd10c6..000000000
--- a/docs/database/vault.decrypted_secrets.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: vault.decrypted_secrets Pages: 1 -->
-<svg width="381pt" height="405pt"
- viewBox="0.00 0.00 381.00 405.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 401)">
-<title>vault.decrypted_secrets</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-401 377,-401 377,4 -4,4"/>
-<!-- vault.decrypted_secrets -->
-<g id="node1" class="node">
-<title>vault.decrypted_secrets</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-315.5 46.5,-350.5 327.5,-350.5 327.5,-315.5 46.5,-315.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-315.5 46.5,-350.5 327.5,-350.5 327.5,-315.5 46.5,-315.5"/>
-<text text-anchor="start" x="53.0931" y="-328.3" font-family="Arial Bold" font-size="18.00" fill="#000000">vault.decrypted_secrets</text>
-<text text-anchor="start" x="243.1425" y="-328.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="277.3473" y="-328.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-285.5 46.5,-315.5 327.5,-315.5 327.5,-285.5 46.5,-285.5"/>
-<text text-anchor="start" x="53.5" y="-296.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="68.2798" y="-296.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-255.5 46.5,-285.5 327.5,-285.5 327.5,-255.5 46.5,-255.5"/>
-<text text-anchor="start" x="53.5" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">name </text>
-<text text-anchor="start" x="92.399" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-225.5 46.5,-255.5 327.5,-255.5 327.5,-225.5 46.5,-225.5"/>
-<text text-anchor="start" x="53.5" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">description </text>
-<text text-anchor="start" x="125.068" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-195.5 46.5,-225.5 327.5,-225.5 327.5,-195.5 46.5,-195.5"/>
-<text text-anchor="start" x="53.5" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">secret </text>
-<text text-anchor="start" x="95.507" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-195.5 327.5,-195.5 327.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">decrypted_secret </text>
-<text text-anchor="start" x="164.7538" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 327.5,-165.5 327.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">key_id </text>
-<text text-anchor="start" x="97.845" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 327.5,-135.5 327.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">nonce </text>
-<text text-anchor="start" x="95.521" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 327.5,-105.5 327.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="123.528" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 327.5,-75.5 327.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at </text>
-<text text-anchor="start" x="127.4326" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-352.5 328.5,-352.5 328.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/vault.secrets.md b/docs/database/vault.secrets.md
deleted file mode 100644
index 35390903d..000000000
--- a/docs/database/vault.secrets.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# vault.secrets
-
-## Description
-
-Table with encrypted `secret` column for storing sensitive information on disk.
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid | gen_random_uuid() | false |  |  |  |
-| name | text |  | true |  |  |  |
-| description | text | ''::text | false |  |  |  |
-| secret | text |  | false |  |  |  |
-| key_id | uuid | (pgsodium.create_key()).id | true |  | [pgsodium.key](pgsodium.key.md) |  |
-| nonce | bytea | pgsodium.crypto_aead_det_noncegen() | true |  |  |  |
-| created_at | timestamp with time zone | CURRENT_TIMESTAMP | false |  |  |  |
-| updated_at | timestamp with time zone | CURRENT_TIMESTAMP | false |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| secrets_key_id_fkey | FOREIGN KEY | FOREIGN KEY (key_id) REFERENCES pgsodium.key(id) |
-| secrets_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| secrets_pkey | CREATE UNIQUE INDEX secrets_pkey ON vault.secrets USING btree (id) |
-| secrets_name_idx | CREATE UNIQUE INDEX secrets_name_idx ON vault.secrets USING btree (name) WHERE (name IS NOT NULL) |
-
-## Triggers
-
-| Name | Definition |
-| ---- | ---------- |
-| secrets_encrypt_secret_trigger_secret | CREATE TRIGGER secrets_encrypt_secret_trigger_secret BEFORE INSERT OR UPDATE OF secret ON vault.secrets FOR EACH ROW EXECUTE FUNCTION vault.secrets_encrypt_secret_secret() |
-
-## Relations
-
-![er](vault.secrets.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/vault.secrets.svg b/docs/database/vault.secrets.svg
deleted file mode 100644
index 3f750eb5e..000000000
--- a/docs/database/vault.secrets.svg
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: vault.secrets Pages: 1 -->
-<svg width="578pt" height="952pt"
- viewBox="0.00 0.00 577.50 952.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 948)">
-<title>vault.secrets</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-948 573.5,-948 573.5,4 -4,4"/>
-<!-- vault.secrets -->
-<g id="node1" class="node">
-<title>vault.secrets</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-862.5 46.5,-897.5 299.5,-897.5 299.5,-862.5 46.5,-862.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-862.5 46.5,-897.5 299.5,-897.5 299.5,-862.5 46.5,-862.5"/>
-<text text-anchor="start" x="58.7071" y="-875.3" font-family="Arial Bold" font-size="18.00" fill="#000000">vault.secrets</text>
-<text text-anchor="start" x="159.7249" y="-875.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="193.9297" y="-875.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-832.5 46.5,-862.5 299.5,-862.5 299.5,-832.5 46.5,-832.5"/>
-<text text-anchor="start" x="53.5" y="-843.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="68.2798" y="-843.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-802.5 46.5,-832.5 299.5,-832.5 299.5,-802.5 46.5,-802.5"/>
-<text text-anchor="start" x="53.5" y="-813.9" font-family="Arial" font-size="14.00" fill="#000000">name </text>
-<text text-anchor="start" x="92.399" y="-813.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-772.5 46.5,-802.5 299.5,-802.5 299.5,-772.5 46.5,-772.5"/>
-<text text-anchor="start" x="53.5" y="-783.9" font-family="Arial" font-size="14.00" fill="#000000">description </text>
-<text text-anchor="start" x="125.068" y="-783.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-742.5 46.5,-772.5 299.5,-772.5 299.5,-742.5 46.5,-742.5"/>
-<text text-anchor="start" x="53.5" y="-753.9" font-family="Arial" font-size="14.00" fill="#000000">secret </text>
-<text text-anchor="start" x="95.507" y="-753.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-712.5 46.5,-742.5 299.5,-742.5 299.5,-712.5 46.5,-712.5"/>
-<text text-anchor="start" x="53.5" y="-723.9" font-family="Arial" font-size="14.00" fill="#000000">key_id </text>
-<text text-anchor="start" x="97.845" y="-723.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-682.5 46.5,-712.5 299.5,-712.5 299.5,-682.5 46.5,-682.5"/>
-<text text-anchor="start" x="53.5" y="-693.9" font-family="Arial" font-size="14.00" fill="#000000">nonce </text>
-<text text-anchor="start" x="95.521" y="-693.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-652.5 46.5,-682.5 299.5,-682.5 299.5,-652.5 46.5,-652.5"/>
-<text text-anchor="start" x="53.5" y="-663.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="123.528" y="-663.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-622.5 46.5,-652.5 299.5,-652.5 299.5,-622.5 46.5,-622.5"/>
-<text text-anchor="start" x="53.1915" y="-633.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at </text>
-<text text-anchor="start" x="127.1241" y="-633.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-621.5 44.5,-899.5 300.5,-899.5 300.5,-621.5 44.5,-621.5"/>
-</g>
-<!-- pgsodium.key -->
-<g id="node2" class="node">
-<title>pgsodium.key</title>
-<polygon fill="#efefef" stroke="transparent" points="43.5,-462.5 43.5,-497.5 303.5,-497.5 303.5,-462.5 43.5,-462.5"/>
-<polygon fill="none" stroke="#000000" points="43.5,-462.5 43.5,-497.5 303.5,-497.5 303.5,-462.5 43.5,-462.5"/>
-<text text-anchor="start" x="54.2031" y="-475.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.key</text>
-<text text-anchor="start" x="165.2289" y="-475.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="199.4337" y="-475.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-432.5 43.5,-462.5 303.5,-462.5 303.5,-432.5 43.5,-432.5"/>
-<text text-anchor="start" x="50.5" y="-443.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="95.594" y="-443.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-402.5 43.5,-432.5 303.5,-432.5 303.5,-402.5 43.5,-402.5"/>
-<text text-anchor="start" x="50.5" y="-413.9" font-family="Arial" font-size="14.00" fill="#000000">status    </text>
-<text text-anchor="start" x="122.0512" y="-413.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_status]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-372.5 43.5,-402.5 303.5,-402.5 303.5,-372.5 43.5,-372.5"/>
-<text text-anchor="start" x="50.2146" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">created    </text>
-<text text-anchor="start" x="131.101" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-342.5 43.5,-372.5 303.5,-372.5 303.5,-342.5 43.5,-342.5"/>
-<text text-anchor="start" x="50.5" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">expires    </text>
-<text text-anchor="start" x="129.8198" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-312.5 43.5,-342.5 303.5,-342.5 303.5,-312.5 43.5,-312.5"/>
-<text text-anchor="start" x="50.5" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">key_type    </text>
-<text text-anchor="start" x="140.7258" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_type]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-282.5 43.5,-312.5 303.5,-312.5 303.5,-282.5 43.5,-282.5"/>
-<text text-anchor="start" x="50.5" y="-293.9" font-family="Arial" font-size="14.00" fill="#000000">key_id    </text>
-<text text-anchor="start" x="125.1592" y="-293.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-252.5 43.5,-282.5 303.5,-282.5 303.5,-252.5 43.5,-252.5"/>
-<text text-anchor="start" x="50.5" y="-263.9" font-family="Arial" font-size="14.00" fill="#000000">key_context    </text>
-<text text-anchor="start" x="159.399" y="-263.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-222.5 43.5,-252.5 303.5,-252.5 303.5,-222.5 43.5,-222.5"/>
-<text text-anchor="start" x="50.5" y="-233.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="119.7132" y="-233.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-192.5 43.5,-222.5 303.5,-222.5 303.5,-192.5 43.5,-192.5"/>
-<text text-anchor="start" x="50.5" y="-203.9" font-family="Arial" font-size="14.00" fill="#000000">associated_data    </text>
-<text text-anchor="start" x="186.636" y="-203.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-162.5 43.5,-192.5 303.5,-192.5 303.5,-162.5 43.5,-162.5"/>
-<text text-anchor="start" x="50.5" y="-173.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key    </text>
-<text text-anchor="start" x="136.8198" y="-173.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-132.5 43.5,-162.5 303.5,-162.5 303.5,-132.5 43.5,-132.5"/>
-<text text-anchor="start" x="50.5" y="-143.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key_nonce    </text>
-<text text-anchor="start" x="182.7328" y="-143.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-102.5 43.5,-132.5 303.5,-132.5 303.5,-102.5 43.5,-102.5"/>
-<text text-anchor="start" x="50.5" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">parent_key    </text>
-<text text-anchor="start" x="153.9516" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-72.5 43.5,-102.5 303.5,-102.5 303.5,-72.5 43.5,-72.5"/>
-<text text-anchor="start" x="50.5" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">comment    </text>
-<text text-anchor="start" x="142.2644" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-42.5 43.5,-72.5 303.5,-72.5 303.5,-42.5 43.5,-42.5"/>
-<text text-anchor="start" x="50.5" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">user_data    </text>
-<text text-anchor="start" x="146.9516" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-</g>
-<!-- vault.secrets&#45;&gt;pgsodium.key -->
-<g id="edge1" class="edge">
-<title>vault.secrets:key_id&#45;&gt;pgsodium.key:id</title>
-<path fill="none" stroke="#000000" d="M309.6787,-726.6271C363.81,-716.7088 340.9812,-624.7227 299.5,-577 224.1242,-490.2828 118.8758,-627.7172 43.5,-541 16.2384,-509.6365 1.9444,-447.5 43.5,-447.5"/>
-<polygon fill="#000000" stroke="#000000" points="309.4634,-726.6455 299.1155,-723.0165 304.4817,-727.0727 299.5,-727.5 299.5,-727.5 299.5,-727.5 304.4817,-727.0727 299.8845,-731.9835 309.4634,-726.6455 309.4634,-726.6455"/>
-<text text-anchor="start" x="306.1615" y="-737.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (key_id) REFERENCES pgsodium.key(id)</text>
-</g>
-</g>
-</svg>
diff --git a/docs/uml/app/lib/models/uml.svg b/docs/uml/app/lib/models/uml.svg
deleted file mode 100644
index e1d655211..000000000
--- a/docs/uml/app/lib/models/uml.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/app_onboarding/uml.svg b/docs/uml/app/lib/screens/app_onboarding/uml.svg
deleted file mode 100644
index d3d4c5668..000000000
--- a/docs/uml/app/lib/screens/app_onboarding/uml.svg
+++ /dev/null
@@ -1,339 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2104.0" height="460.0" viewbox="0 0 2104 460" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[LoadingScreen
-	  |
-	  +sessionString: String?;
-	  +queryParameters: Map&lt;String, String&gt;?
-	]
-	
-	[AppOutdatedScreen
-	  |
-	  +Widget build()
-	]
-	
-	[WelcomeScreen
-	  |
-	  +Widget build()
-	]
-	
-	[TermsScreen
-	]
-	
-	[LegalSection
-	  |
-	  +title: String?;
-	  +description: String?;
-	  +icon: Icon?;
-	  +pdfUrl: String?;
-	  +pdfUrlLabel: String?;
-	  +acknowledgment: String?;
-	  +isChecked: bool?;
-	  +onChange: void Function(bool?)?
-	  |
-	  +Widget build()
-	]
-	
-	[LegalSection]o-[Icon]
-	[LegalSection]o-[void Function(bool?)?]
-	
-	[IFrameHelper
-	  |
-	  +void postRouteFinished();
-	  +void listen()
-	]
-	
-	[Preview
-	  |
-	  +queryParameters: Map&lt;String, String&gt;?;
-	  +appLanguage: AppLanguage;
-	  +selectedRoute: String?;
-	  +extra: String?;
-	  +study: Study?;
-	  +selectedStudyObjectId: String?;
-	  +subject: StudySubject?
-	  |
-	  +bool hasRoute();
-	  +void handleQueries();
-	  +dynamic init();
-	  +dynamic handleAuthorization();
-	  +dynamic runCommands();
-	  +String? getSelectedRoute();
-	  +bool containsQuery();
-	  +bool containsQueryPair();
-	  +dynamic getStudySubject();
-	  -dynamic _createFakeSubject();
-	  +List&lt;String&gt; getInterventionIds()
-	]
-	
-	[Preview]o-[AppLanguage]
-	[Preview]o-[Study]
-	[Preview]o-[StudySubject]
-	
-	[AboutScreen
-	  |
-	  +Widget build()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="460.0" width="2104.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M1035.5 282.7 L1005.5 353 L1005.5 373 L1005.5 373.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1044.0 276.2 L1035.5 282.7 L1034.2 272.0 L1042.8 265.5 Z"></path>
-					</g>
-					<path d="M1172.4 280.3 L1228.25 353 L1228.25 373 L1228.3 373.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1171.0 269.7 L1172.4 280.3 L1162.5 276.2 L1161.0 265.5 Z"></path>
-					</g>
-					<path d="M1518.5 290.6 L1425.75 353 L1425.75 373 L1425.8 373.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1529.2 289.8 L1518.5 290.6 L1523.3 281.0 L1534.0 280.2 Z"></path>
-					</g>
-					<path d="M1703.0 351.7 L1703 353 L1703 373 L1703.0 373.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1708.3 342.3 L1703.0 351.7 L1697.7 342.3 L1703.0 333.0 Z"></path>
-					</g>
-					<path d="M1830.2 348.3 L1833.5 353 L1833.5 373 L1833.5 373.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1829.2 337.6 L1830.2 348.3 L1820.5 343.7 L1819.5 333.0 Z"></path>
-					</g>
-					<g data-name="LoadingScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoadingScreen">
-							<rect x="0.0" y="128.0" height="77.0" width="338.0" data-name="LoadingScreen"></rect>
-							<path d="M0.0 159.0 L338.0 159.0" fill="none" data-name="LoadingScreen"></path>
-						</g>
-						<g transform="translate(0, 128)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoadingScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoadingScreen">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="LoadingScreen">LoadingScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 159)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoadingScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoadingScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoadingScreen">+sessionString: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LoadingScreen">+queryParameters: Map&lt;String, String&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppOutdatedScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppOutdatedScreen">
-							<rect x="378.0" y="135.5" height="62.0" width="176.0" data-name="AppOutdatedScreen"></rect>
-							<path d="M378.0 166.5 L554.0 166.5" fill="none" data-name="AppOutdatedScreen"></path>
-						</g>
-						<g transform="translate(378, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppOutdatedScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppOutdatedScreen">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppOutdatedScreen">AppOutdatedScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(378, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppOutdatedScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppOutdatedScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppOutdatedScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WelcomeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WelcomeScreen">
-							<rect x="594.0" y="135.5" height="62.0" width="145.0" data-name="WelcomeScreen"></rect>
-							<path d="M594.0 166.5 L739.0 166.5" fill="none" data-name="WelcomeScreen"></path>
-						</g>
-						<g transform="translate(594, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WelcomeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WelcomeScreen">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="WelcomeScreen">WelcomeScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(594, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WelcomeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WelcomeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="WelcomeScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TermsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TermsScreen">
-							<rect x="779.0" y="151.0" height="31.0" width="121.0" data-name="TermsScreen"></rect>
-						</g>
-						<g transform="translate(779, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TermsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TermsScreen">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="TermsScreen">TermsScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegalSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegalSection">
-							<rect x="940.0" y="67.5" height="198.0" width="290.0" data-name="LegalSection"></rect>
-							<path d="M940.0 98.5 L1230.0 98.5" fill="none" data-name="LegalSection"></path>
-							<path d="M940.0 234.5 L1230.0 234.5" fill="none" data-name="LegalSection"></path>
-						</g>
-						<g transform="translate(940, 67.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegalSection">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="LegalSection">LegalSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(940, 98.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegalSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegalSection">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LegalSection">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LegalSection">+icon: Icon?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="LegalSection">+pdfUrl: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="LegalSection">+pdfUrlLabel: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="LegalSection">+acknowledgment: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="LegalSection">+isChecked: bool?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="LegalSection">+onChange: void Function(bool?)?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(940, 234.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegalSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegalSection">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Icon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Icon">
-							<rect x="980.5" y="373.0" height="31.0" width="50.0" data-name="Icon"></rect>
-						</g>
-						<g transform="translate(980.5, 373)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Icon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Icon">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Icon">Icon</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(bool?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(bool?)?">
-							<rect x="1134.3" y="373.0" height="31.0" width="188.0" data-name="void Function(bool?)?"></rect>
-						</g>
-						<g transform="translate(1134.25, 373)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(bool?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(bool?)?">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(bool?)?">void Function(bool?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFrameHelper">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameHelper">
-							<rect x="1270.0" y="128.0" height="77.0" width="224.0" data-name="IFrameHelper"></rect>
-							<path d="M1270.0 159.0 L1494.0 159.0" fill="none" data-name="IFrameHelper"></path>
-						</g>
-						<g transform="translate(1270, 128)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameHelper">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameHelper">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameHelper">IFrameHelper</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1270, 159)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFrameHelper">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFrameHelper">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFrameHelper">+void postRouteFinished()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFrameHelper">+void listen()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Preview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Preview">
-							<rect x="1534.0" y="0.0" height="333.0" width="338.0" data-name="Preview"></rect>
-							<path d="M1534.0 31.0 L1872.0 31.0" fill="none" data-name="Preview"></path>
-							<path d="M1534.0 152.0 L1872.0 152.0" fill="none" data-name="Preview"></path>
-						</g>
-						<g transform="translate(1534, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Preview">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="Preview">Preview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1534, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Preview">
-								<text x="0.0" y="13.5" stroke="none" data-name="Preview">+queryParameters: Map&lt;String, String&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Preview">+appLanguage: AppLanguage</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Preview">+selectedRoute: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Preview">+extra: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Preview">+study: Study?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Preview">+selectedStudyObjectId: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Preview">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1534, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Preview">
-								<text x="0.0" y="13.5" stroke="none" data-name="Preview">+bool hasRoute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Preview">+void handleQueries()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Preview">+dynamic init()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Preview">+dynamic handleAuthorization()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Preview">+dynamic runCommands()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Preview">+String? getSelectedRoute()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Preview">+bool containsQuery()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Preview">+bool containsQueryPair()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Preview">+dynamic getStudySubject()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Preview">-dynamic _createFakeSubject()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Preview">+List&lt;String&gt; getInterventionIds()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppLanguage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppLanguage">
-							<rect x="1362.3" y="373.0" height="31.0" width="127.0" data-name="AppLanguage"></rect>
-						</g>
-						<g transform="translate(1362.25, 373)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppLanguage">
-								<text x="55.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppLanguage">AppLanguage</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="1672.5" y="373.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(1672.5, 373)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="1773.5" y="373.0" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(1773.5, 373)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AboutScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AboutScreen">
-							<rect x="1912.0" y="135.5" height="62.0" width="136.0" data-name="AboutScreen"></rect>
-							<path d="M1912.0 166.5 L2048.0 166.5" fill="none" data-name="AboutScreen"></path>
-						</g>
-						<g transform="translate(1912, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AboutScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AboutScreen">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="AboutScreen">AboutScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1912, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AboutScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AboutScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="AboutScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/dashboard/contact_tab/uml.svg b/docs/uml/app/lib/screens/study/dashboard/contact_tab/uml.svg
deleted file mode 100644
index c00cf0806..000000000
--- a/docs/uml/app/lib/screens/study/dashboard/contact_tab/uml.svg
+++ /dev/null
@@ -1,309 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1218.3" height="386.0" viewbox="0 0 1218.25 386" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[ContactScreen
-	]
-	
-	[ContactWidget
-	  |
-	  +contact: Contact?;
-	  +title: String;
-	  +subtitle: String?;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[ContactWidget]o-[Contact]
-	[ContactWidget]o-[Color]
-	
-	[ContactItem
-	  |
-	  +iconData: IconData;
-	  +itemName: String;
-	  +itemValue: String?;
-	  +type: ContactItemType?;
-	  +iconColor: Color?
-	  |
-	  +dynamic launchContact();
-	  +Widget build()
-	]
-	
-	[ContactItem]o-[IconData]
-	[ContactItem]o-[ContactItemType]
-	[ContactItem]o-[Color]
-	
-	[ContactItemType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ContactItemType&gt;;
-	  &lt;static&gt;+website: ContactItemType;
-	  &lt;static&gt;+email: ContactItemType;
-	  &lt;static&gt;+phone: ContactItemType
-	]
-	
-	[ContactItemType]o-[ContactItemType]
-	[Enum]&lt;:--[ContactItemType]
-	
-	[FAQ
-	  |
-	  +Widget build()
-	]
-	
-	[Entry
-	  |
-	  +title: String;
-	  +children: List&lt;Entry&gt;
-	]
-	
-	[EntryItem
-	  |
-	  +entry: Entry
-	  |
-	  -Widget _buildTiles();
-	  +Widget build()
-	]
-	
-	[EntryItem]o-[Entry]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="386.0" width="1218.3" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M233.1 171.1 L228.75 188 L228.75 253.5 L228.8 253.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M240.6 163.4 L233.1 171.1 L230.3 160.7 L237.8 153.0 Z"></path>
-					</g>
-					<path d="M305.2 169.1 L316.25 188 L338.0833333333333 253.5 L338.1 253.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M305.1 158.4 L305.2 169.1 L295.9 163.7 L295.8 153.0 Z"></path>
-					</g>
-					<path d="M456.5 185.8 L455.75 188 L455.75 253.5 L455.8 253.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M464.4 178.5 L456.5 185.8 L454.3 175.2 L462.2 168.0 Z"></path>
-					</g>
-					<path d="M604.6 180.0 L614.25 188 L636.7191358024692 208 L636.7 208.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M600.8 169.9 L604.6 180.0 L594.0 178.1 L590.3 168.0 Z"></path>
-					</g>
-					<path d="M387.1 180.8 L379.5 188 L350.1867283950617 253.5 L350.2 253.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M397.5 178.3 L387.1 180.8 L390.2 170.5 L400.7 168.0 Z"></path>
-					</g>
-					<path d="M889.1 214.2 L909.9166666666666 208 L919.5833333333334 208 L919.5833333333334 208 L929.25 269 L929.25 269 L919.5833333333334 330 L919.5833333333334 330 L909.9166666666666 330 L909.9166666666666 330 L871.25 318.4755700325733 L871.3 318.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M878.7 211.7 L889.1 214.2 L881.7 222.0 L871.3 219.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M725.3 112.8 L725.25 188 L720.3117283950618 208 L720.3 208.0 " fill="none"></path>
-					</g>
-					<path d="M730.6 112.8 L725.3 112.8 L719.9 112.8 L725.3 99.5 Z"></path>
-					<path d="M1068.3 156.7 L1068.25 188 L1068.25 230.5 L1068.3 230.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1073.6 147.3 L1068.3 156.7 L1062.9 147.3 L1068.3 138.0 Z"></path>
-					</g>
-					<g data-name="ContactScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactScreen">
-							<rect x="0.0" y="68.5" height="31.0" width="133.0" data-name="ContactScreen"></rect>
-						</g>
-						<g transform="translate(0, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactScreen">
-								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactScreen">ContactScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactWidget">
-							<rect x="173.0" y="15.0" height="138.0" width="165.0" data-name="ContactWidget"></rect>
-							<path d="M173.0 46.0 L338.0 46.0" fill="none" data-name="ContactWidget"></path>
-							<path d="M173.0 122.0 L338.0 122.0" fill="none" data-name="ContactWidget"></path>
-						</g>
-						<g transform="translate(173, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactWidget">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactWidget">ContactWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(173, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+contact: Contact?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactWidget">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactWidget">+subtitle: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(173, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Contact">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Contact">
-							<rect x="190.3" y="253.5" height="31.0" width="77.0" data-name="Contact"></rect>
-						</g>
-						<g transform="translate(190.25, 253.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Contact">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Contact">
-								<text x="30.5" y="13.5" stroke="none" text-anchor="middle" data-name="Contact">Contact</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="314.3" y="253.5" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(314.25, 253.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItem">
-							<rect x="378.0" y="0.0" height="168.0" width="223.0" data-name="ContactItem"></rect>
-							<path d="M378.0 31.0 L601.0 31.0" fill="none" data-name="ContactItem"></path>
-							<path d="M378.0 122.0 L601.0 122.0" fill="none" data-name="ContactItem"></path>
-						</g>
-						<g transform="translate(378, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItem">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItem">ContactItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(378, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+iconData: IconData</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+itemName: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItem">+itemValue: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItem">+type: ContactItemType?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItem">+iconColor: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(378, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+dynamic launchContact()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="412.3" y="253.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(412.25, 253.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItemType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItemType">
-							<rect x="539.3" y="208.0" height="122.0" width="332.0" data-name="ContactItemType"></rect>
-							<path d="M539.3 239.0 L871.3 239.0" fill="none" data-name="ContactItemType"></path>
-						</g>
-						<g transform="translate(539.25, 208)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItemType">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItemType">ContactItemType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(539.25, 239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItemType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItemType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+values: List&lt;ContactItemType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+website: ContactItemType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+email: ContactItemType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+phone: ContactItemType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="694.8" y="68.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(694.75, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FAQ">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FAQ">
-							<rect x="795.8" y="53.0" height="62.0" width="136.0" data-name="FAQ"></rect>
-							<path d="M795.8 84.0 L931.8 84.0" fill="none" data-name="FAQ"></path>
-						</g>
-						<g transform="translate(795.75, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FAQ">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="FAQ">FAQ</text>
-								
-							</g>
-						</g>
-						<g transform="translate(795.75, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FAQ">
-								<text x="0.0" y="13.5" stroke="none" data-name="FAQ">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Entry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Entry">
-							<rect x="974.3" y="230.5" height="77.0" width="188.0" data-name="Entry"></rect>
-							<path d="M974.3 261.5 L1162.3 261.5" fill="none" data-name="Entry"></path>
-						</g>
-						<g transform="translate(974.25, 230.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Entry">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="Entry">Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(974.25, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Entry">
-								<text x="0.0" y="13.5" stroke="none" data-name="Entry">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Entry">+children: List&lt;Entry&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EntryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EntryItem">
-							<rect x="978.8" y="30.0" height="108.0" width="179.0" data-name="EntryItem"></rect>
-							<path d="M978.8 61.0 L1157.8 61.0" fill="none" data-name="EntryItem"></path>
-							<path d="M978.8 92.0 L1157.8 92.0" fill="none" data-name="EntryItem"></path>
-						</g>
-						<g transform="translate(978.75, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EntryItem">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="EntryItem">EntryItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(978.75, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">+entry: Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(978.75, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">-Widget _buildTiles()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EntryItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/dashboard/task_overview_tab/uml.svg b/docs/uml/app/lib/screens/study/dashboard/task_overview_tab/uml.svg
deleted file mode 100644
index b5d839b5e..000000000
--- a/docs/uml/app/lib/screens/study/dashboard/task_overview_tab/uml.svg
+++ /dev/null
@@ -1,224 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1272.5" height="310.0" viewbox="0 0 1272.5 310" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[TaskOverview
-	  |
-	  +subject: StudySubject?;
-	  +scheduleToday: List&lt;TaskInstance&gt;?;
-	  +interventionIcon: String?
-	]
-	
-	[TaskOverview]o-[StudySubject]
-	
-	[TaskBox
-	  |
-	  +taskInstance: TaskInstance;
-	  +icon: Icon;
-	  +onCompleted: dynamic Function()
-	]
-	
-	[TaskBox]o-[TaskInstance]
-	[TaskBox]o-[Icon]
-	[TaskBox]o-[dynamic Function()]
-	
-	[ProgressRow
-	  |
-	  +subject: StudySubject?
-	]
-	
-	[ProgressRow]o-[StudySubject]
-	
-	[InterventionSegment
-	  |
-	  +intervention: Intervention;
-	  +percentCompleted: double;
-	  +percentMissed: double;
-	  +isCurrent: bool;
-	  +isFuture: bool;
-	  +phaseDuration: int
-	  |
-	  +List&lt;Widget&gt; buildSeparators();
-	  +Widget build()
-	]
-	
-	[InterventionSegment]o-[Intervention]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="310.0" width="1272.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M160.5 156.2 L160.5 203 L206.55633802816902 223 L206.6 223.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M165.8 146.8 L160.5 156.2 L155.2 146.8 L160.5 137.5 Z"></path>
-					</g>
-					<path d="M687.5 149.8 L626.75 203 L626.75 223 L626.8 223.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M698.0 147.7 L687.5 149.8 L691.0 139.6 L701.5 137.5 Z"></path>
-					</g>
-					<path d="M754.0 156.2 L754 203 L754 223 L754.0 223.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M759.3 146.8 L754.0 156.2 L748.7 146.8 L754.0 137.5 Z"></path>
-					</g>
-					<path d="M830.2 148.7 L902.5 203 L902.5 223 L902.5 223.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M825.9 138.8 L830.2 148.7 L819.5 147.4 L815.3 137.5 Z"></path>
-					</g>
-					<path d="M464.5 141.2 L464.5 203 L302.25 228.91619797525308 L302.3 228.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M469.8 131.8 L464.5 141.2 L459.2 131.8 L464.5 122.5 Z"></path>
-					</g>
-					<path d="M1081.0 201.7 L1081 203 L1081 223 L1081.0 223.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1086.3 192.3 L1081.0 201.7 L1075.7 192.3 L1081.0 183.0 Z"></path>
-					</g>
-					<g data-name="TaskOverview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskOverview">
-							<rect x="0.0" y="45.5" height="92.0" width="321.0" data-name="TaskOverview"></rect>
-							<path d="M0.0 76.5 L321.0 76.5" fill="none" data-name="TaskOverview"></path>
-						</g>
-						<g transform="translate(0, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskOverview">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskOverview">TaskOverview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskOverview">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskOverview">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskOverview">+scheduleToday: List&lt;TaskInstance&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskOverview">+interventionIcon: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="182.3" y="223.0" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(182.25, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskBox">
-							<rect x="608.0" y="45.5" height="92.0" width="292.0" data-name="TaskBox"></rect>
-							<path d="M608.0 76.5 L900.0 76.5" fill="none" data-name="TaskBox"></path>
-						</g>
-						<g transform="translate(608, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskBox">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskBox">TaskBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(608, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskBox">+taskInstance: TaskInstance</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskBox">+icon: Icon</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskBox">+onCompleted: dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskInstance">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskInstance">
-							<rect x="565.8" y="223.0" height="31.0" width="122.0" data-name="TaskInstance"></rect>
-						</g>
-						<g transform="translate(565.75, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskInstance">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskInstance">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskInstance">TaskInstance</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Icon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Icon">
-							<rect x="729.0" y="223.0" height="31.0" width="50.0" data-name="Icon"></rect>
-						</g>
-						<g transform="translate(729, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Icon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Icon">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Icon">Icon</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="819.0" y="223.0" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(819, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ProgressRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ProgressRow">
-							<rect x="361.0" y="60.5" height="62.0" width="207.0" data-name="ProgressRow"></rect>
-							<path d="M361.0 91.5 L568.0 91.5" fill="none" data-name="ProgressRow"></path>
-						</g>
-						<g transform="translate(361, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProgressRow">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProgressRow">ProgressRow</text>
-								
-							</g>
-						</g>
-						<g transform="translate(361, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ProgressRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="ProgressRow">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionSegment">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSegment">
-							<rect x="945.5" y="0.0" height="183.0" width="271.0" data-name="InterventionSegment"></rect>
-							<path d="M945.5 31.0 L1216.5 31.0" fill="none" data-name="InterventionSegment"></path>
-							<path d="M945.5 137.0 L1216.5 137.0" fill="none" data-name="InterventionSegment"></path>
-						</g>
-						<g transform="translate(945.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSegment">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSegment">InterventionSegment</text>
-								
-							</g>
-						</g>
-						<g transform="translate(945.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+percentCompleted: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionSegment">+percentMissed: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionSegment">+isCurrent: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionSegment">+isFuture: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionSegment">+phaseDuration: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(945.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+List&lt;Widget&gt; buildSeparators()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention">
-							<rect x="1026.0" y="223.0" height="31.0" width="110.0" data-name="Intervention"></rect>
-						</g>
-						<g transform="translate(1026, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention">Intervention</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/dashboard/uml.svg b/docs/uml/app/lib/screens/study/dashboard/uml.svg
deleted file mode 100644
index f9ee5b73d..000000000
--- a/docs/uml/app/lib/screens/study/dashboard/uml.svg
+++ /dev/null
@@ -1,732 +0,0 @@
-<svg version="1.1" baseProfile="full" width="4075.5" height="401.0" viewbox="0 0 4075.5 401" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[Settings
-	]
-	
-	[OptOutAlertDialog
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[OptOutAlertDialog]o-[StudySubject]
-	
-	[DeleteAlertDialog
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[DeleteAlertDialog]o-[StudySubject]
-	
-	[DashboardScreen
-	  |
-	  +error: String?
-	]
-	
-	[OverflowMenuItem
-	  |
-	  +name: String;
-	  +icon: IconData;
-	  +routeName: String?;
-	  +onTap: dynamic Function()?
-	]
-	
-	[OverflowMenuItem]o-[IconData]
-	[OverflowMenuItem]o-[dynamic Function()?]
-	
-	[StudyFinishedPlaceholder
-	  |
-	  &lt;static&gt;+space: SizedBox
-	  |
-	  +Widget build()
-	]
-	
-	[StudyFinishedPlaceholder]o-[SizedBox]
-	
-	[ProgressRow
-	  |
-	  +subject: StudySubject?
-	]
-	
-	[ProgressRow]o-[StudySubject]
-	
-	[InterventionSegment
-	  |
-	  +intervention: Intervention;
-	  +percentCompleted: double;
-	  +percentMissed: double;
-	  +isCurrent: bool;
-	  +isFuture: bool;
-	  +phaseDuration: int
-	  |
-	  +List&lt;Widget&gt; buildSeparators();
-	  +Widget build()
-	]
-	
-	[InterventionSegment]o-[Intervention]
-	
-	[TaskBox
-	  |
-	  +taskInstance: TaskInstance;
-	  +icon: Icon;
-	  +onCompleted: dynamic Function()
-	]
-	
-	[TaskBox]o-[TaskInstance]
-	[TaskBox]o-[Icon]
-	[TaskBox]o-[dynamic Function()]
-	
-	[TaskOverview
-	  |
-	  +subject: StudySubject?;
-	  +scheduleToday: List&lt;TaskInstance&gt;?;
-	  +interventionIcon: String?
-	]
-	
-	[TaskOverview]o-[StudySubject]
-	
-	[FAQ
-	  |
-	  +Widget build()
-	]
-	
-	[Entry
-	  |
-	  +title: String;
-	  +children: List&lt;Entry&gt;
-	]
-	
-	[EntryItem
-	  |
-	  +entry: Entry
-	  |
-	  -Widget _buildTiles();
-	  +Widget build()
-	]
-	
-	[EntryItem]o-[Entry]
-	
-	[ContactScreen
-	]
-	
-	[ContactWidget
-	  |
-	  +contact: Contact?;
-	  +title: String;
-	  +subtitle: String?;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[ContactWidget]o-[Contact]
-	[ContactWidget]o-[Color]
-	
-	[ContactItem
-	  |
-	  +iconData: IconData;
-	  +itemName: String;
-	  +itemValue: String?;
-	  +type: ContactItemType?;
-	  +iconColor: Color?
-	  |
-	  +dynamic launchContact();
-	  +Widget build()
-	]
-	
-	[ContactItem]o-[IconData]
-	[ContactItem]o-[ContactItemType]
-	[ContactItem]o-[Color]
-	
-	[ContactItemType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ContactItemType&gt;;
-	  &lt;static&gt;+website: ContactItemType;
-	  &lt;static&gt;+email: ContactItemType;
-	  &lt;static&gt;+phone: ContactItemType
-	]
-	
-	[ContactItemType]o-[ContactItemType]
-	[Enum]&lt;:--[ContactItemType]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="401.0" width="4075.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M223.5 156.7 L223.5 203 L611.5 273.1517857142857 L611.5 273.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M228.8 147.3 L223.5 156.7 L218.2 147.3 L223.5 138.0 Z"></path>
-					</g>
-					<path d="M470.5 156.7 L470.5 203 L633.0370370370371 268.5 L633.0 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M475.8 147.3 L470.5 156.7 L465.2 147.3 L470.5 138.0 Z"></path>
-					</g>
-					<path d="M2417.0 128.9 L2698 203 L2740.2515432098767 268.5 L2740.3 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2409.4 121.3 L2417.0 128.9 L2406.7 131.6 L2399.0 124.1 Z"></path>
-					</g>
-					<path d="M2184.4 155.8 L2117.5 203 L2117.5 268.5 L2117.5 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2195.1 154.7 L2184.4 155.8 L2189.0 146.0 L2199.7 145.0 Z"></path>
-					</g>
-					<path d="M1532.0 156.7 L1532 203 L1532 268.5 L1532.0 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1537.3 147.3 L1532.0 156.7 L1526.7 147.3 L1532.0 138.0 Z"></path>
-					</g>
-					<path d="M916.5 141.2 L916.5 203 L718.3827160493827 268.5 L718.4 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M921.8 131.8 L916.5 141.2 L911.2 131.8 L916.5 122.5 Z"></path>
-					</g>
-					<path d="M1818.5 201.7 L1818.5 203 L1818.5 268.5 L1818.5 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1823.8 192.3 L1818.5 201.7 L1813.2 192.3 L1818.5 183.0 Z"></path>
-					</g>
-					<path d="M2607.7 156.1 L2605.75 203 L2605.75 268.5 L2605.8 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2613.5 147.1 L2607.7 156.1 L2602.8 146.6 L2608.5 137.5 Z"></path>
-					</g>
-					<path d="M2541.6 149.5 L2478 203 L2478 268.5 L2478.0 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2552.1 147.6 L2541.6 149.5 L2545.3 139.4 L2555.8 137.5 Z"></path>
-					</g>
-					<path d="M2477.2 144.4 L2329.5 203 L2329.5 268.5 L2329.5 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2487.9 145.9 L2477.2 144.4 L2483.9 136.0 L2494.6 137.5 Z"></path>
-					</g>
-					<path d="M1220.5 156.2 L1220.5 203 L731.5 275.1475409836066 L731.5 275.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1225.8 146.8 L1220.5 156.2 L1215.2 146.8 L1220.5 137.5 Z"></path>
-					</g>
-					<path d="M3078.5 163.7 L3087.5 203 L3087.5 245.5 L3087.5 245.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3081.6 153.4 L3078.5 163.7 L3071.2 155.8 L3074.3 145.5 Z"></path>
-					</g>
-					<path d="M3857.8 162.9 L3912.5 203 L3912.5 268.5 L3912.5 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3853.4 153.1 L3857.8 162.9 L3847.1 161.7 L3842.8 151.9 Z"></path>
-					</g>
-					<path d="M3659.8 119.7 L3363 203 L3379.1728395061727 268.5 L3379.2 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3670.2 122.3 L3659.8 119.7 L3667.3 112.0 L3677.8 114.7 Z"></path>
-					</g>
-					<path d="M3346.1 113.5 L2819 203 L2763.4058641975307 268.5 L2763.4 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3356.2 117.2 L3346.1 113.5 L3354.4 106.7 L3364.5 110.4 Z"></path>
-					</g>
-					<path d="M3517.3 192.8 L3521.5 203 L3545.3271604938273 223 L3545.3 223.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3518.7 182.1 L3517.3 192.8 L3508.9 186.2 L3510.3 175.5 Z"></path>
-					</g>
-					<path d="M3480.1 194.2 L3480.5 203 L3401.6574074074074 268.5 L3401.7 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3485.1 184.6 L3480.1 194.2 L3474.4 185.0 L3479.4 175.5 Z"></path>
-					</g>
-					<path d="M3801.8 226.8 L3814 223 L3821.5 223 L3821.5 223 L3829 284 L3829 284 L3821.5 345 L3821.5 345 L3814 345 L3814 345 L3784 335.66326530612247 L3784.0 335.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3791.3 224.5 L3801.8 226.8 L3794.5 234.7 L3784.0 232.3 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3946.4 111.0 L3745.25 203 L3713.83024691358 223 L3713.8 223.0 " fill="none"></path>
-					</g>
-					<path d="M3948.6 115.8 L3946.4 111.0 L3944.2 106.1 L3958.5 105.5 Z"></path>
-					<g data-name="Settings">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Settings">
-							<rect x="0.0" y="76.0" height="31.0" width="80.0" data-name="Settings"></rect>
-						</g>
-						<g transform="translate(0, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Settings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Settings">
-								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="Settings">Settings</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OptOutAlertDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OptOutAlertDialog">
-							<rect x="120.0" y="45.0" height="93.0" width="207.0" data-name="OptOutAlertDialog"></rect>
-							<path d="M120.0 76.0 L327.0 76.0" fill="none" data-name="OptOutAlertDialog"></path>
-							<path d="M120.0 107.0 L327.0 107.0" fill="none" data-name="OptOutAlertDialog"></path>
-						</g>
-						<g transform="translate(120, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptOutAlertDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptOutAlertDialog">OptOutAlertDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(120, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptOutAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptOutAlertDialog">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(120, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptOutAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptOutAlertDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="611.5" y="268.5" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(611.5, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DeleteAlertDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DeleteAlertDialog">
-							<rect x="367.0" y="45.0" height="93.0" width="207.0" data-name="DeleteAlertDialog"></rect>
-							<path d="M367.0 76.0 L574.0 76.0" fill="none" data-name="DeleteAlertDialog"></path>
-							<path d="M367.0 107.0 L574.0 107.0" fill="none" data-name="DeleteAlertDialog"></path>
-						</g>
-						<g transform="translate(367, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DeleteAlertDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="DeleteAlertDialog">DeleteAlertDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(367, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DeleteAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="DeleteAlertDialog">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(367, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DeleteAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="DeleteAlertDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="614.0" y="60.5" height="62.0" width="159.0" data-name="DashboardScreen"></rect>
-							<path d="M614.0 91.5 L773.0 91.5" fill="none" data-name="DashboardScreen"></path>
-						</g>
-						<g transform="translate(614, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="71.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(614, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+error: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OverflowMenuItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OverflowMenuItem">
-							<rect x="2152.0" y="38.0" height="107.0" width="247.0" data-name="OverflowMenuItem"></rect>
-							<path d="M2152.0 69.0 L2399.0 69.0" fill="none" data-name="OverflowMenuItem"></path>
-						</g>
-						<g transform="translate(2152, 38)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OverflowMenuItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OverflowMenuItem">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="OverflowMenuItem">OverflowMenuItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2152, 69)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OverflowMenuItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OverflowMenuItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="OverflowMenuItem">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OverflowMenuItem">+icon: IconData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="OverflowMenuItem">+routeName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="OverflowMenuItem">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="2706.8" y="268.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(2706.75, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="2029.0" y="268.5" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
-						</g>
-						<g transform="translate(2029, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
-								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFinishedPlaceholder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFinishedPlaceholder">
-							<rect x="1421.0" y="45.0" height="93.0" width="222.0" data-name="StudyFinishedPlaceholder"></rect>
-							<path d="M1421.0 76.0 L1643.0 76.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
-							<path d="M1421.0 107.0 L1643.0 107.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
-						</g>
-						<g transform="translate(1421, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFinishedPlaceholder">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFinishedPlaceholder">StudyFinishedPlaceholder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1421, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">&lt;static&gt;+space: SizedBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1421, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SizedBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SizedBox">
-							<rect x="1487.0" y="268.5" height="31.0" width="90.0" data-name="SizedBox"></rect>
-						</g>
-						<g transform="translate(1487, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SizedBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SizedBox">
-								<text x="37.0" y="13.5" stroke="none" text-anchor="middle" data-name="SizedBox">SizedBox</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ProgressRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ProgressRow">
-							<rect x="813.0" y="60.5" height="62.0" width="207.0" data-name="ProgressRow"></rect>
-							<path d="M813.0 91.5 L1020.0 91.5" fill="none" data-name="ProgressRow"></path>
-						</g>
-						<g transform="translate(813, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProgressRow">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProgressRow">ProgressRow</text>
-								
-							</g>
-						</g>
-						<g transform="translate(813, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ProgressRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="ProgressRow">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionSegment">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSegment">
-							<rect x="1683.0" y="0.0" height="183.0" width="271.0" data-name="InterventionSegment"></rect>
-							<path d="M1683.0 31.0 L1954.0 31.0" fill="none" data-name="InterventionSegment"></path>
-							<path d="M1683.0 137.0 L1954.0 137.0" fill="none" data-name="InterventionSegment"></path>
-						</g>
-						<g transform="translate(1683, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSegment">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSegment">InterventionSegment</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1683, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+percentCompleted: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionSegment">+percentMissed: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionSegment">+isCurrent: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionSegment">+isFuture: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionSegment">+phaseDuration: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1683, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+List&lt;Widget&gt; buildSeparators()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention">
-							<rect x="1763.5" y="268.5" height="31.0" width="110.0" data-name="Intervention"></rect>
-						</g>
-						<g transform="translate(1763.5, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention">Intervention</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskBox">
-							<rect x="2464.5" y="45.5" height="92.0" width="292.0" data-name="TaskBox"></rect>
-							<path d="M2464.5 76.5 L2756.5 76.5" fill="none" data-name="TaskBox"></path>
-						</g>
-						<g transform="translate(2464.5, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskBox">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskBox">TaskBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2464.5, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskBox">+taskInstance: TaskInstance</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskBox">+icon: Icon</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskBox">+onCompleted: dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskInstance">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskInstance">
-							<rect x="2544.8" y="268.5" height="31.0" width="122.0" data-name="TaskInstance"></rect>
-						</g>
-						<g transform="translate(2544.75, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskInstance">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskInstance">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskInstance">TaskInstance</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Icon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Icon">
-							<rect x="2453.0" y="268.5" height="31.0" width="50.0" data-name="Icon"></rect>
-						</g>
-						<g transform="translate(2453, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Icon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Icon">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Icon">Icon</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="2246.0" y="268.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(2246, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskOverview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskOverview">
-							<rect x="1060.0" y="45.5" height="92.0" width="321.0" data-name="TaskOverview"></rect>
-							<path d="M1060.0 76.5 L1381.0 76.5" fill="none" data-name="TaskOverview"></path>
-						</g>
-						<g transform="translate(1060, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskOverview">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskOverview">TaskOverview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1060, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskOverview">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskOverview">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskOverview">+scheduleToday: List&lt;TaskInstance&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskOverview">+interventionIcon: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FAQ">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FAQ">
-							<rect x="2796.5" y="60.5" height="62.0" width="136.0" data-name="FAQ"></rect>
-							<path d="M2796.5 91.5 L2932.5 91.5" fill="none" data-name="FAQ"></path>
-						</g>
-						<g transform="translate(2796.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FAQ">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="FAQ">FAQ</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2796.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FAQ">
-								<text x="0.0" y="13.5" stroke="none" data-name="FAQ">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Entry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Entry">
-							<rect x="2993.5" y="245.5" height="77.0" width="188.0" data-name="Entry"></rect>
-							<path d="M2993.5 276.5 L3181.5 276.5" fill="none" data-name="Entry"></path>
-						</g>
-						<g transform="translate(2993.5, 245.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Entry">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="Entry">Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2993.5, 276.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Entry">
-								<text x="0.0" y="13.5" stroke="none" data-name="Entry">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Entry">+children: List&lt;Entry&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EntryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EntryItem">
-							<rect x="2972.5" y="37.5" height="108.0" width="179.0" data-name="EntryItem"></rect>
-							<path d="M2972.5 68.5 L3151.5 68.5" fill="none" data-name="EntryItem"></path>
-							<path d="M2972.5 99.5 L3151.5 99.5" fill="none" data-name="EntryItem"></path>
-						</g>
-						<g transform="translate(2972.5, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EntryItem">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="EntryItem">EntryItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2972.5, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">+entry: Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2972.5, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">-Widget _buildTiles()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EntryItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactScreen">
-							<rect x="3191.5" y="76.0" height="31.0" width="133.0" data-name="ContactScreen"></rect>
-						</g>
-						<g transform="translate(3191.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactScreen">
-								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactScreen">ContactScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactWidget">
-							<rect x="3677.8" y="22.5" height="138.0" width="165.0" data-name="ContactWidget"></rect>
-							<path d="M3677.8 53.5 L3842.8 53.5" fill="none" data-name="ContactWidget"></path>
-							<path d="M3677.8 129.5 L3842.8 129.5" fill="none" data-name="ContactWidget"></path>
-						</g>
-						<g transform="translate(3677.75, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactWidget">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactWidget">ContactWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3677.75, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+contact: Contact?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactWidget">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactWidget">+subtitle: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3677.75, 129.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Contact">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Contact">
-							<rect x="3874.0" y="268.5" height="31.0" width="77.0" data-name="Contact"></rect>
-						</g>
-						<g transform="translate(3874, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Contact">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Contact">
-								<text x="30.5" y="13.5" stroke="none" text-anchor="middle" data-name="Contact">Contact</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="3354.0" y="268.5" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(3354, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItem">
-							<rect x="3364.5" y="7.5" height="168.0" width="223.0" data-name="ContactItem"></rect>
-							<path d="M3364.5 38.5 L3587.5 38.5" fill="none" data-name="ContactItem"></path>
-							<path d="M3364.5 129.5 L3587.5 129.5" fill="none" data-name="ContactItem"></path>
-						</g>
-						<g transform="translate(3364.5, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItem">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItem">ContactItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3364.5, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+iconData: IconData</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+itemName: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItem">+itemValue: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItem">+type: ContactItemType?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItem">+iconColor: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3364.5, 129.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+dynamic launchContact()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItemType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItemType">
-							<rect x="3452.0" y="223.0" height="122.0" width="332.0" data-name="ContactItemType"></rect>
-							<path d="M3452.0 254.0 L3784.0 254.0" fill="none" data-name="ContactItemType"></path>
-						</g>
-						<g transform="translate(3452, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItemType">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItemType">ContactItemType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3452, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItemType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItemType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+values: List&lt;ContactItemType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+website: ContactItemType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+email: ContactItemType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+phone: ContactItemType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="3958.5" y="76.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(3958.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/multimodal/uml.svg b/docs/uml/app/lib/screens/study/multimodal/uml.svg
deleted file mode 100644
index 6f6fa36dc..000000000
--- a/docs/uml/app/lib/screens/study/multimodal/uml.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<svg version="1.1" baseProfile="full" width="246.0" height="133.0" viewbox="0 0 246 133" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[CapturePictureScreen
-	  |
-	  +userId: String;
-	  +studyId: String
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="133.0" width="246.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)">
-					<g data-name="CapturePictureScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CapturePictureScreen">
-							<rect x="0.0" y="0.0" height="77.0" width="190.0" data-name="CapturePictureScreen"></rect>
-							<path d="M0.0 31.0 L190.0 31.0" fill="none" data-name="CapturePictureScreen"></path>
-						</g>
-						<g transform="translate(0, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CapturePictureScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CapturePictureScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="CapturePictureScreen">CapturePictureScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CapturePictureScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CapturePictureScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="CapturePictureScreen">+userId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CapturePictureScreen">+studyId: String</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/onboarding/uml.svg b/docs/uml/app/lib/screens/study/onboarding/uml.svg
deleted file mode 100644
index 942820264..000000000
--- a/docs/uml/app/lib/screens/study/onboarding/uml.svg
+++ /dev/null
@@ -1,721 +0,0 @@
-<svg version="1.1" baseProfile="full" width="5394.0" height="295.0" viewbox="0 0 5394 295" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudySelectionScreen
-	]
-	
-	[InviteCodeDialog
-	]
-	
-	[EligibilityResult
-	  |
-	  +eligible: bool;
-	  +firstFailed: EligibilityCriterion?
-	]
-	
-	[EligibilityResult]o-[EligibilityCriterion]
-	
-	[EligibilityScreen
-	  |
-	  +study: Study?
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;EligibilityResult&gt; routeFor()
-	]
-	
-	[EligibilityScreen]o-[Study]
-	
-	[ConsentScreen
-	]
-	
-	[ConsentCard
-	  |
-	  +consent: ConsentItem?;
-	  +index: int?;
-	  +onTapped: dynamic Function(int);
-	  +isChecked: bool?
-	  |
-	  +Widget build()
-	]
-	
-	[ConsentCard]o-[ConsentItem]
-	[ConsentCard]o-[dynamic Function(int)]
-	
-	[ConsentElement
-	  |
-	  +title: String;
-	  +descriptionText: String;
-	  +acknowledgmentText: String;
-	  +icon: IconData
-	]
-	
-	[ConsentElement]o-[IconData]
-	
-	[KickoffScreen
-	]
-	
-	[_KickoffScreen
-	  |
-	  +subject: StudySubject?;
-	  +ready: bool
-	  |
-	  -dynamic _storeUserStudy();
-	  -Widget _constructStatusIcon();
-	  -String _getStatusText();
-	  +Widget build()
-	]
-	
-	[_KickoffScreen]o-[StudySubject]
-	
-	[InterventionSelectionScreen
-	]
-	
-	[OnboardingProgress
-	  |
-	  +stage: int;
-	  +progress: double
-	  |
-	  -double _getProgressForStage();
-	  +Widget build()
-	]
-	
-	[StudyOverviewScreen
-	]
-	
-	[_StudyOverviewScreen
-	  |
-	  +study: Study?
-	  |
-	  +dynamic navigateToJourney();
-	  +dynamic navigateToEligibilityCheck();
-	  +Widget build()
-	]
-	
-	[_StudyOverviewScreen]o-[Study]
-	
-	[StudyDetailsView
-	  |
-	  +study: Study?;
-	  +iconSize: double
-	  |
-	  +Widget build()
-	]
-	
-	[StudyDetailsView]o-[Study]
-	
-	[JourneyOverviewScreen
-	]
-	
-	[_JourneyOverviewScreen
-	  |
-	  +subject: StudySubject?
-	  |
-	  +dynamic getConsentAndNavigateToDashboard();
-	  +Widget build()
-	]
-	
-	[_JourneyOverviewScreen]o-[StudySubject]
-	
-	[Timeline
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[Timeline]o-[StudySubject]
-	
-	[InterventionTile
-	  |
-	  +title: String?;
-	  +iconName: String;
-	  +date: DateTime;
-	  +color: Color?;
-	  +isFirst: bool;
-	  +isLast: bool
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionTile]o-[Color]
-	
-	[IconIndicator
-	  |
-	  +iconName: String;
-	  +color: Color?
-	  |
-	  +Widget build()
-	]
-	
-	[IconIndicator]o-[Color]
-	
-	[TimelineChild
-	  |
-	  +child: Widget?
-	  |
-	  +Widget build()
-	]
-	
-	[TimelineChild]o-[&lt;abstract&gt;Widget]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="295.0" width="5394.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M550.5 141.2 L550.5 188 L550.5 208 L550.5 208.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M555.8 131.8 L550.5 141.2 L545.2 131.8 L550.5 122.5 Z"></path>
-					</g>
-					<path d="M951.0 149.2 L951 188 L1527.5 221.7162273476112 L1527.5 221.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M956.3 139.8 L951.0 149.2 L945.7 139.8 L951.0 130.5 Z"></path>
-					</g>
-					<path d="M2146.8 163.7 L2112 188 L2112 208 L2112.0 208.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2157.5 162.7 L2146.8 163.7 L2151.4 154.0 L2162.1 153.0 Z"></path>
-					</g>
-					<path d="M2422.2 119.3 L2736.5 188 L2736.5 208 L2736.5 208.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2414.3 112.1 L2422.2 119.3 L2412.0 122.5 L2404.0 115.3 Z"></path>
-					</g>
-					<path d="M3388.5 156.2 L3388.5 188 L3388.5 208 L3388.5 208.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3393.8 146.8 L3388.5 156.2 L3383.2 146.8 L3388.5 137.5 Z"></path>
-					</g>
-					<path d="M3683.5 179.2 L3683.5 188 L4247 220.08380112269447 L4247.0 220.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3688.8 169.8 L3683.5 179.2 L3678.2 169.8 L3683.5 160.5 Z"></path>
-					</g>
-					<path d="M1558.0 164.2 L1558 188 L1558 208 L1558.0 208.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1563.3 154.8 L1558.0 164.2 L1552.7 154.8 L1558.0 145.5 Z"></path>
-					</g>
-					<path d="M1834.5 156.7 L1834.5 188 L1588.5 219.58408679927666 L1588.5 219.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1839.8 147.3 L1834.5 156.7 L1829.2 147.3 L1834.5 138.0 Z"></path>
-					</g>
-					<path d="M4307.0 156.7 L4307 188 L4307 208 L4307.0 208.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4312.3 147.3 L4307.0 156.7 L4301.7 147.3 L4307.0 138.0 Z"></path>
-					</g>
-					<path d="M4654.5 149.2 L4654.5 188 L4367 217.3705035971223 L4367.0 217.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4659.8 139.8 L4654.5 149.2 L4649.2 139.8 L4654.5 130.5 Z"></path>
-					</g>
-					<path d="M4878.5 186.7 L4878.5 188 L4950 213.25621890547262 L4950.0 213.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4883.8 177.3 L4878.5 186.7 L4873.2 177.3 L4878.5 168.0 Z"></path>
-					</g>
-					<path d="M5079.5 156.7 L5079.5 188 L5008 213.25621890547262 L5008.0 213.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5084.8 147.3 L5079.5 156.7 L5074.2 147.3 L5079.5 138.0 Z"></path>
-					</g>
-					<path d="M5269.0 149.2 L5269 188 L5269 208 L5269.0 208.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5274.3 139.8 L5269.0 149.2 L5263.7 139.8 L5269.0 130.5 Z"></path>
-					</g>
-					<g data-name="StudySelectionScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySelectionScreen">
-							<rect x="0.0" y="68.5" height="31.0" width="190.0" data-name="StudySelectionScreen"></rect>
-						</g>
-						<g transform="translate(0, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySelectionScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySelectionScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySelectionScreen">StudySelectionScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeDialog">
-							<rect x="230.0" y="68.5" height="31.0" width="151.0" data-name="InviteCodeDialog"></rect>
-						</g>
-						<g transform="translate(230, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeDialog">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeDialog">InviteCodeDialog</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityResult">
-							<rect x="421.0" y="45.5" height="77.0" width="259.0" data-name="EligibilityResult"></rect>
-							<path d="M421.0 76.5 L680.0 76.5" fill="none" data-name="EligibilityResult"></path>
-						</g>
-						<g transform="translate(421, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityResult">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityResult">EligibilityResult</text>
-								
-							</g>
-						</g>
-						<g transform="translate(421, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityResult">+eligible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EligibilityResult">+firstFailed: EligibilityCriterion?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityCriterion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityCriterion">
-							<rect x="474.5" y="208.0" height="31.0" width="152.0" data-name="EligibilityCriterion"></rect>
-						</g>
-						<g transform="translate(474.5, 208)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityCriterion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityCriterion">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityCriterion">EligibilityCriterion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityScreen">
-							<rect x="720.0" y="37.5" height="93.0" width="462.0" data-name="EligibilityScreen"></rect>
-							<path d="M720.0 68.5 L1182.0 68.5" fill="none" data-name="EligibilityScreen"></path>
-							<path d="M720.0 99.5 L1182.0 99.5" fill="none" data-name="EligibilityScreen"></path>
-						</g>
-						<g transform="translate(720, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityScreen">
-								<text x="223.0" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityScreen">EligibilityScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(720, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityScreen">+study: Study?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(720, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityScreen">&lt;static&gt;+MaterialPageRoute&lt;EligibilityResult&gt; routeFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="1527.5" y="208.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(1527.5, 208)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentScreen">
-							<rect x="1222.0" y="68.5" height="31.0" width="138.0" data-name="ConsentScreen"></rect>
-						</g>
-						<g transform="translate(1222, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentScreen">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentScreen">ConsentScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentCard">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentCard">
-							<rect x="2118.0" y="15.0" height="138.0" width="286.0" data-name="ConsentCard"></rect>
-							<path d="M2118.0 46.0 L2404.0 46.0" fill="none" data-name="ConsentCard"></path>
-							<path d="M2118.0 122.0 L2404.0 122.0" fill="none" data-name="ConsentCard"></path>
-						</g>
-						<g transform="translate(2118, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentCard">
-								<text x="135.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentCard">ConsentCard</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2118, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+consent: ConsentItem?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentCard">+index: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentCard">+onTapped: dynamic Function(int)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentCard">+isChecked: bool?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2118, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItem">
-							<rect x="2054.0" y="208.0" height="31.0" width="116.0" data-name="ConsentItem"></rect>
-						</g>
-						<g transform="translate(2054, 208)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItem">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItem">ConsentItem</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(int)">
-							<rect x="2643.5" y="208.0" height="31.0" width="186.0" data-name="dynamic Function(int)"></rect>
-						</g>
-						<g transform="translate(2643.5, 208)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(int)">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(int)">dynamic Function(int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentElement">
-							<rect x="3264.0" y="30.5" height="107.0" width="249.0" data-name="ConsentElement"></rect>
-							<path d="M3264.0 61.5 L3513.0 61.5" fill="none" data-name="ConsentElement"></path>
-						</g>
-						<g transform="translate(3264, 30.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentElement">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentElement">ConsentElement</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3264, 61.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentElement">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentElement">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentElement">+descriptionText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentElement">+acknowledgmentText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentElement">+icon: IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="3345.0" y="208.0" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(3345, 208)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="KickoffScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="KickoffScreen">
-							<rect x="1953.0" y="68.5" height="31.0" width="125.0" data-name="KickoffScreen"></rect>
-						</g>
-						<g transform="translate(1953, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="KickoffScreen">
-								<text x="54.5" y="13.5" stroke="none" text-anchor="middle" data-name="KickoffScreen">KickoffScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_KickoffScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_KickoffScreen">
-							<rect x="3553.0" y="7.5" height="153.0" width="261.0" data-name="_KickoffScreen"></rect>
-							<path d="M3553.0 38.5 L3814.0 38.5" fill="none" data-name="_KickoffScreen"></path>
-							<path d="M3553.0 84.5 L3814.0 84.5" fill="none" data-name="_KickoffScreen"></path>
-						</g>
-						<g transform="translate(3553, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_KickoffScreen">
-								<text x="122.5" y="13.5" stroke="none" text-anchor="middle" data-name="_KickoffScreen">_KickoffScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3553, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">+ready: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3553, 84.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">-dynamic _storeUserStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">-Widget _constructStatusIcon()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="_KickoffScreen">-String _getStatusText()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="_KickoffScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="4247.0" y="208.0" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(4247, 208)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionSelectionScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSelectionScreen">
-							<rect x="2444.0" y="68.5" height="31.0" width="239.0" data-name="InterventionSelectionScreen"></rect>
-						</g>
-						<g transform="translate(2444, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSelectionScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSelectionScreen">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSelectionScreen">InterventionSelectionScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OnboardingProgress">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OnboardingProgress">
-							<rect x="2723.0" y="22.5" height="123.0" width="271.0" data-name="OnboardingProgress"></rect>
-							<path d="M2723.0 53.5 L2994.0 53.5" fill="none" data-name="OnboardingProgress"></path>
-							<path d="M2723.0 99.5 L2994.0 99.5" fill="none" data-name="OnboardingProgress"></path>
-						</g>
-						<g transform="translate(2723, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OnboardingProgress">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="OnboardingProgress">OnboardingProgress</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2723, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
-								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">+stage: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+progress: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2723, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
-								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">-double _getProgressForStage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyOverviewScreen">
-							<rect x="3034.0" y="68.5" height="31.0" width="190.0" data-name="StudyOverviewScreen"></rect>
-						</g>
-						<g transform="translate(3034, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyOverviewScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyOverviewScreen">StudyOverviewScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_StudyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_StudyOverviewScreen">
-							<rect x="1400.0" y="22.5" height="123.0" width="316.0" data-name="_StudyOverviewScreen"></rect>
-							<path d="M1400.0 53.5 L1716.0 53.5" fill="none" data-name="_StudyOverviewScreen"></path>
-							<path d="M1400.0 84.5 L1716.0 84.5" fill="none" data-name="_StudyOverviewScreen"></path>
-						</g>
-						<g transform="translate(1400, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_StudyOverviewScreen">
-								<text x="150.0" y="13.5" stroke="none" text-anchor="middle" data-name="_StudyOverviewScreen">_StudyOverviewScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1400, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+study: Study?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1400, 84.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToJourney()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToEligibilityCheck()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="_StudyOverviewScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDetailsView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDetailsView">
-							<rect x="1756.0" y="30.0" height="108.0" width="157.0" data-name="StudyDetailsView"></rect>
-							<path d="M1756.0 61.0 L1913.0 61.0" fill="none" data-name="StudyDetailsView"></path>
-							<path d="M1756.0 107.0 L1913.0 107.0" fill="none" data-name="StudyDetailsView"></path>
-						</g>
-						<g transform="translate(1756, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDetailsView">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDetailsView">StudyDetailsView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1756, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+study: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDetailsView">+iconSize: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1756, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="JourneyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JourneyOverviewScreen">
-							<rect x="3854.0" y="68.5" height="31.0" width="209.0" data-name="JourneyOverviewScreen"></rect>
-						</g>
-						<g transform="translate(3854, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JourneyOverviewScreen">
-								<text x="96.5" y="13.5" stroke="none" text-anchor="middle" data-name="JourneyOverviewScreen">JourneyOverviewScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_JourneyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_JourneyOverviewScreen">
-							<rect x="4103.0" y="30.0" height="108.0" width="408.0" data-name="_JourneyOverviewScreen"></rect>
-							<path d="M4103.0 61.0 L4511.0 61.0" fill="none" data-name="_JourneyOverviewScreen"></path>
-							<path d="M4103.0 92.0 L4511.0 92.0" fill="none" data-name="_JourneyOverviewScreen"></path>
-						</g>
-						<g transform="translate(4103, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_JourneyOverviewScreen">
-								<text x="196.0" y="13.5" stroke="none" text-anchor="middle" data-name="_JourneyOverviewScreen">_JourneyOverviewScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4103, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_JourneyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_JourneyOverviewScreen">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4103, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_JourneyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_JourneyOverviewScreen">+dynamic getConsentAndNavigateToDashboard()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_JourneyOverviewScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Timeline">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Timeline">
-							<rect x="4551.0" y="37.5" height="93.0" width="207.0" data-name="Timeline"></rect>
-							<path d="M4551.0 68.5 L4758.0 68.5" fill="none" data-name="Timeline"></path>
-							<path d="M4551.0 99.5 L4758.0 99.5" fill="none" data-name="Timeline"></path>
-						</g>
-						<g transform="translate(4551, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timeline">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="Timeline">Timeline</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4551, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Timeline">
-								<text x="0.0" y="13.5" stroke="none" data-name="Timeline">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4551, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Timeline">
-								<text x="0.0" y="13.5" stroke="none" data-name="Timeline">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTile">
-							<rect x="4798.0" y="0.0" height="168.0" width="161.0" data-name="InterventionTile"></rect>
-							<path d="M4798.0 31.0 L4959.0 31.0" fill="none" data-name="InterventionTile"></path>
-							<path d="M4798.0 137.0 L4959.0 137.0" fill="none" data-name="InterventionTile"></path>
-						</g>
-						<g transform="translate(4798, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTile">
-								<text x="72.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTile">InterventionTile</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4798, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTile">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTile">+iconName: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTile">+date: DateTime</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTile">+color: Color?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTile">+isFirst: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTile">+isLast: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4798, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTile">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="4950.0" y="208.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(4950, 208)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconIndicator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconIndicator">
-							<rect x="4999.0" y="30.0" height="108.0" width="161.0" data-name="IconIndicator"></rect>
-							<path d="M4999.0 61.0 L5160.0 61.0" fill="none" data-name="IconIndicator"></path>
-							<path d="M4999.0 107.0 L5160.0 107.0" fill="none" data-name="IconIndicator"></path>
-						</g>
-						<g transform="translate(4999, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconIndicator">
-								<text x="72.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconIndicator">IconIndicator</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4999, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconIndicator">+iconName: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconIndicator">+color: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4999, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconIndicator">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TimelineChild">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimelineChild">
-							<rect x="5200.0" y="37.5" height="93.0" width="138.0" data-name="TimelineChild"></rect>
-							<path d="M5200.0 68.5 L5338.0 68.5" fill="none" data-name="TimelineChild"></path>
-							<path d="M5200.0 99.5 L5338.0 99.5" fill="none" data-name="TimelineChild"></path>
-						</g>
-						<g transform="translate(5200, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimelineChild">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="TimelineChild">TimelineChild</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5200, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimelineChild">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimelineChild">+child: Widget?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5200, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimelineChild">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimelineChild">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="5233.5" y="208.0" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(5233.5, 208)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/report/performance/uml.svg b/docs/uml/app/lib/screens/study/report/performance/uml.svg
deleted file mode 100644
index 882316c2f..000000000
--- a/docs/uml/app/lib/screens/study/report/performance/uml.svg
+++ /dev/null
@@ -1,291 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1567.0" height="357.0" viewbox="0 0 1567 357" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[PerformanceDetailsScreen
-	  |
-	  +reportSubject: StudySubject?
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor();
-	  +Widget build()
-	]
-	
-	[PerformanceDetailsScreen]o-[StudySubject]
-	
-	[InterventionPerformanceBar
-	  |
-	  +intervention: Intervention;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPerformanceBar]o-[Intervention]
-	[InterventionPerformanceBar]o-[StudySubject]
-	
-	[ObservationPerformanceBar
-	  |
-	  +observation: Observation;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[ObservationPerformanceBar]o-[&lt;abstract&gt;Observation]
-	[ObservationPerformanceBar]o-[StudySubject]
-	
-	[PerformanceBar
-	  |
-	  +task: Task;
-	  +completed: int;
-	  +total: int
-	  |
-	  +Widget build()
-	]
-	
-	[PerformanceBar]o-[&lt;abstract&gt;Task]
-	
-	[PerformanceSection
-	  |
-	  +minimumRatio: double;
-	  +maximum: double
-	  |
-	  +Widget buildContent();
-	  +String getPowerLevelDescription();
-	  +int getCountableObservationAmount()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[PerformanceSection]
-	
-	[PerformanceBar
-	  |
-	  +progress: double;
-	  +minimum: double?
-	  |
-	  +Widget build()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="357.0" width="1567.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M204.5 134.2 L204.5 143 L254.0505617977528 216.5 L254.1 216.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M209.8 124.8 L204.5 134.2 L199.2 124.8 L204.5 115.5 Z"></path>
-					</g>
-					<path d="M690.3 124.0 L727.5 143 L727.5 216.5 L727.5 216.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M684.4 115.0 L690.3 124.0 L679.6 124.5 L673.7 115.5 Z"></path>
-					</g>
-					<path d="M444.2 123.9 L406.25 143 L289.186797752809 216.5 L289.2 216.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M454.9 124.5 L444.2 123.9 L450.1 114.9 L460.8 115.5 Z"></path>
-					</g>
-					<path d="M924.5 127.6 L942.5 143 L942.5 216.5 L942.5 216.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M920.8 117.5 L924.5 127.6 L913.9 125.6 L910.3 115.5 Z"></path>
-					</g>
-					<path d="M709.1 101.5 L565.75 143 L316.96488764044943 216.5 L317.0 216.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M719.5 104.0 L709.1 101.5 L716.6 93.7 L727.0 96.3 Z"></path>
-					</g>
-					<path d="M1120.0 141.7 L1120 143 L1120 216.5 L1120.0 216.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1125.3 132.3 L1120.0 141.7 L1114.7 132.3 L1120.0 123.0 Z"></path>
-					</g>
-					<path d="M1349.0 90.3 L1349 143 L1349 163 L1349.0 163.0 " fill="none"></path>
-					<path d="M1354.3 90.3 L1349.0 90.3 L1343.7 90.3 L1349.0 77.0 Z"></path>
-					<g data-name="PerformanceDetailsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceDetailsScreen">
-							<rect x="0.0" y="7.5" height="108.0" width="409.0" data-name="PerformanceDetailsScreen"></rect>
-							<path d="M0.0 38.5 L409.0 38.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-							<path d="M0.0 69.5 L409.0 69.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-						</g>
-						<g transform="translate(0, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceDetailsScreen">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceDetailsScreen">PerformanceDetailsScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">+reportSubject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 69.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceDetailsScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="204.5" y="216.5" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(204.5, 216.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPerformanceBar">
-							<rect x="449.0" y="7.5" height="108.0" width="238.0" data-name="InterventionPerformanceBar"></rect>
-							<path d="M449.0 38.5 L687.0 38.5" fill="none" data-name="InterventionPerformanceBar"></path>
-							<path d="M449.0 84.5 L687.0 84.5" fill="none" data-name="InterventionPerformanceBar"></path>
-						</g>
-						<g transform="translate(449, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPerformanceBar">
-								<text x="111.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPerformanceBar">InterventionPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(449, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(449, 84.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention">
-							<rect x="672.5" y="216.5" height="31.0" width="110.0" data-name="Intervention"></rect>
-						</g>
-						<g transform="translate(672.5, 216.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention">Intervention</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ObservationPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ObservationPerformanceBar">
-							<rect x="727.0" y="7.5" height="108.0" width="240.0" data-name="ObservationPerformanceBar"></rect>
-							<path d="M727.0 38.5 L967.0 38.5" fill="none" data-name="ObservationPerformanceBar"></path>
-							<path d="M727.0 84.5 L967.0 84.5" fill="none" data-name="ObservationPerformanceBar"></path>
-						</g>
-						<g transform="translate(727, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ObservationPerformanceBar">
-								<text x="112.0" y="13.5" stroke="none" text-anchor="middle" data-name="ObservationPerformanceBar">ObservationPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(727, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+observation: Observation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ObservationPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(727, 84.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Observation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Observation">
-							<rect x="886.5" y="216.5" height="31.0" width="112.0" data-name="Observation"></rect>
-						</g>
-						<g transform="translate(886.5, 216.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Observation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Observation">
-								<text x="48.0" y="13.5" stroke="none" text-anchor="middle" data-name="Observation">Observation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceBar">
-							<rect x="1048.0" y="0.0" height="123.0" width="144.0" data-name="PerformanceBar"></rect>
-							<path d="M1048.0 31.0 L1192.0 31.0" fill="none" data-name="PerformanceBar"></path>
-							<path d="M1048.0 92.0 L1192.0 92.0" fill="none" data-name="PerformanceBar"></path>
-						</g>
-						<g transform="translate(1048, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceBar">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceBar">PerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1048, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+task: Task</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceBar">+completed: int</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PerformanceBar">+total: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1048, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Task">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Task">
-							<rect x="1093.0" y="216.5" height="31.0" width="54.0" data-name="Task"></rect>
-						</g>
-						<g transform="translate(1093, 216.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Task">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Task">
-								<text x="19.0" y="13.5" stroke="none" text-anchor="middle" data-name="Task">Task</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceSection">
-							<rect x="1187.0" y="163.0" height="138.0" width="324.0" data-name="PerformanceSection"></rect>
-							<path d="M1187.0 194.0 L1511.0 194.0" fill="none" data-name="PerformanceSection"></path>
-							<path d="M1187.0 240.0 L1511.0 240.0" fill="none" data-name="PerformanceSection"></path>
-						</g>
-						<g transform="translate(1187, 163)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceSection">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceSection">PerformanceSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1187, 194)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+minimumRatio: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+maximum: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1187, 240)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+Widget buildContent()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+String getPowerLevelDescription()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PerformanceSection">+int getCountableObservationAmount()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GenericSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GenericSection">
-							<rect x="1280.5" y="46.0" height="31.0" width="137.0" data-name="GenericSection"></rect>
-						</g>
-						<g transform="translate(1280.5, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GenericSection">
-								<text x="60.5" y="13.5" stroke="none" text-anchor="middle" data-name="GenericSection">GenericSection</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/report/sections/uml.svg b/docs/uml/app/lib/screens/study/report/sections/uml.svg
deleted file mode 100644
index 61a7f1b00..000000000
--- a/docs/uml/app/lib/screens/study/report/sections/uml.svg
+++ /dev/null
@@ -1,184 +0,0 @@
-<svg version="1.1" baseProfile="full" width="782.0" height="562.0" viewbox="0 0 782 562" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[LinearRegressionSectionWidget
-	  |
-	  +section: LinearRegressionSection
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionWidget]o-[LinearRegressionSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[LinearRegressionSectionWidget]
-	
-	[AverageSectionWidget
-	  |
-	  +section: AverageSection;
-	  +titlePos: List&lt;int&gt;;
-	  +phasePos: List&lt;int&gt;
-	  |
-	  +Widget build();
-	  +Widget getLegend();
-	  +Widget getDiagram();
-	  +BarChartData getChartData();
-	  +Widget getTitles();
-	  +Widget getValues();
-	  +List&lt;BarChartGroupData&gt; getBarGroups();
-	  +FlGridData getGridData();
-	  +MaterialColor getColor();
-	  +int getDayIndex();
-	  +Iterable&lt;DiagramDatum&gt; getAggregatedData();
-	  +Map&lt;String, String?&gt; getInterventionNames()
-	]
-	
-	[AverageSectionWidget]o-[AverageSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[AverageSectionWidget]
-	
-	[DiagramDatum
-	  |
-	  +x: num;
-	  +value: num;
-	  +timestamp: DateTime?;
-	  +intervention: String
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="562.0" width="782.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M146.0 356.2 L146 455 L146 475 L146.0 475.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M151.3 346.8 L146.0 356.2 L140.7 346.8 L146.0 337.5 Z"></path>
-					</g>
-					<path d="M284.7 73.8 L146 127 L146 244.5 L146.0 244.5 " fill="none"></path>
-					<path d="M286.6 78.8 L284.7 73.8 L282.8 68.8 L297.1 69.0 Z"></path>
-					<path d="M529.0 453.7 L529 455 L529 475 L529.0 475.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M534.3 444.3 L529.0 453.7 L523.7 444.3 L529.0 435.0 Z"></path>
-					</g>
-					<path d="M390.3 73.8 L529 127 L529 147 L529.0 147.0 " fill="none"></path>
-					<path d="M392.2 68.8 L390.3 73.8 L388.4 78.8 L377.9 69.0 Z"></path>
-					<g data-name="LinearRegressionSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionWidget">
-							<rect x="0.0" y="244.5" height="93.0" width="292.0" data-name="LinearRegressionSectionWidget"></rect>
-							<path d="M0.0 275.5 L292.0 275.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-							<path d="M0.0 306.5 L292.0 306.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-						</g>
-						<g transform="translate(0, 244.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionWidget">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionWidget">LinearRegressionSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 275.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+section: LinearRegressionSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSection">
-							<rect x="38.5" y="475.0" height="31.0" width="215.0" data-name="LinearRegressionSection"></rect>
-						</g>
-						<g transform="translate(38.5, 475)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSection">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSection">LinearRegressionSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionWidget">
-							<rect x="246.0" y="38.0" height="31.0" width="183.0" data-name="ReportSectionWidget"></rect>
-						</g>
-						<g transform="translate(246, 38)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionWidget">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionWidget">ReportSectionWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionWidget">
-							<rect x="332.0" y="147.0" height="288.0" width="394.0" data-name="AverageSectionWidget"></rect>
-							<path d="M332.0 178.0 L726.0 178.0" fill="none" data-name="AverageSectionWidget"></path>
-							<path d="M332.0 239.0 L726.0 239.0" fill="none" data-name="AverageSectionWidget"></path>
-						</g>
-						<g transform="translate(332, 147)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionWidget">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionWidget">AverageSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(332, 178)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+section: AverageSection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+titlePos: List&lt;int&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+phasePos: List&lt;int&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(332, 239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+Widget getLegend()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+Widget getDiagram()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AverageSectionWidget">+BarChartData getChartData()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AverageSectionWidget">+Widget getTitles()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AverageSectionWidget">+Widget getValues()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AverageSectionWidget">+List&lt;BarChartGroupData&gt; getBarGroups()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AverageSectionWidget">+FlGridData getGridData()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AverageSectionWidget">+MaterialColor getColor()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AverageSectionWidget">+int getDayIndex()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AverageSectionWidget">+Iterable&lt;DiagramDatum&gt; getAggregatedData()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AverageSectionWidget">+Map&lt;String, String?&gt; getInterventionNames()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSection">
-							<rect x="458.5" y="475.0" height="31.0" width="141.0" data-name="AverageSection"></rect>
-						</g>
-						<g transform="translate(458.5, 475)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSection">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSection">AverageSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DiagramDatum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DiagramDatum">
-							<rect x="469.0" y="0.0" height="107.0" width="202.0" data-name="DiagramDatum"></rect>
-							<path d="M469.0 31.0 L671.0 31.0" fill="none" data-name="DiagramDatum"></path>
-						</g>
-						<g transform="translate(469, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DiagramDatum">
-								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="DiagramDatum">DiagramDatum</text>
-								
-							</g>
-						</g>
-						<g transform="translate(469, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DiagramDatum">
-								<text x="0.0" y="13.5" stroke="none" data-name="DiagramDatum">+x: num</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DiagramDatum">+value: num</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DiagramDatum">+timestamp: DateTime?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DiagramDatum">+intervention: String</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/report/uml.svg b/docs/uml/app/lib/screens/study/report/uml.svg
deleted file mode 100644
index 6e51568c4..000000000
--- a/docs/uml/app/lib/screens/study/report/uml.svg
+++ /dev/null
@@ -1,865 +0,0 @@
-<svg version="1.1" baseProfile="full" width="4663.8" height="638.0" viewbox="0 0 4663.75 638" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[PerformanceSection
-	  |
-	  +minimumRatio: double;
-	  +maximum: double
-	  |
-	  +Widget buildContent();
-	  +String getPowerLevelDescription();
-	  +int getCountableObservationAmount()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[PerformanceSection]
-	
-	[PerformanceBar
-	  |
-	  +progress: double;
-	  +minimum: double?
-	  |
-	  +Widget build()
-	]
-	
-	[PerformanceDetailsScreen
-	  |
-	  +reportSubject: StudySubject?
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor();
-	  +Widget build()
-	]
-	
-	[PerformanceDetailsScreen]o-[StudySubject]
-	
-	[InterventionPerformanceBar
-	  |
-	  +intervention: Intervention;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPerformanceBar]o-[Intervention]
-	[InterventionPerformanceBar]o-[StudySubject]
-	
-	[ObservationPerformanceBar
-	  |
-	  +observation: Observation;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[ObservationPerformanceBar]o-[&lt;abstract&gt;Observation]
-	[ObservationPerformanceBar]o-[StudySubject]
-	
-	[PerformanceBar
-	  |
-	  +task: Task;
-	  +completed: int;
-	  +total: int
-	  |
-	  +Widget build()
-	]
-	
-	[PerformanceBar]o-[&lt;abstract&gt;Task]
-	
-	[ReportDetailsScreen
-	  |
-	  +subject: StudySubject
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor();
-	  +Widget build()
-	]
-	
-	[ReportDetailsScreen]o-[StudySubject]
-	
-	[ReportSectionContainer
-	  |
-	  +section: ReportSection;
-	  +subject: StudySubject;
-	  +primary: bool;
-	  +onTap: void Function()?
-	  |
-	  +ReportSectionWidget buildContents();
-	  +dynamic ();
-	  +List&lt;Widget&gt; buildPrimaryHeader();
-	  +Widget build()
-	]
-	
-	[ReportSectionContainer]o-[&lt;abstract&gt;ReportSection]
-	[ReportSectionContainer]o-[StudySubject]
-	[ReportSectionContainer]o-[void Function()?]
-	
-	[ReportHistoryScreen
-	  |
-	  +Widget build()
-	]
-	
-	[ReportHistoryItem
-	  |
-	  +subject: StudySubject
-	  |
-	  +Widget build()
-	]
-	
-	[ReportHistoryItem]o-[StudySubject]
-	
-	[GeneralDetailsSection
-	  |
-	  +Widget buildContent()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[GeneralDetailsSection]
-	
-	[&lt;abstract&gt;GenericSection
-	  |
-	  +subject: StudySubject?;
-	  +onTap: void Function()?
-	  |
-	  +Widget buildContent();
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;GenericSection]o-[StudySubject]
-	[&lt;abstract&gt;GenericSection]o-[void Function()?]
-	
-	[LegendWidget
-	  |
-	  +name: String;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[LegendWidget]o-[Color]
-	
-	[LegendsListWidget
-	  |
-	  +legends: List&lt;Legend&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[Legend
-	  |
-	  +name: String;
-	  +color: Color
-	]
-	
-	[Legend]o-[Color]
-	
-	[DisclaimerSection
-	  |
-	  +Widget buildContent()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[DisclaimerSection]
-	
-	[&lt;abstract&gt;ReportSectionWidget
-	  |
-	  +subject: StudySubject
-	]
-	
-	[&lt;abstract&gt;ReportSectionWidget]o-[StudySubject]
-	
-	[AverageSectionWidget
-	  |
-	  +section: AverageSection;
-	  +titlePos: List&lt;int&gt;;
-	  +phasePos: List&lt;int&gt;
-	  |
-	  +Widget build();
-	  +Widget getLegend();
-	  +Widget getDiagram();
-	  +BarChartData getChartData();
-	  +Widget getTitles();
-	  +Widget getValues();
-	  +List&lt;BarChartGroupData&gt; getBarGroups();
-	  +FlGridData getGridData();
-	  +MaterialColor getColor();
-	  +int getDayIndex();
-	  +Iterable&lt;DiagramDatum&gt; getAggregatedData();
-	  +Map&lt;String, String?&gt; getInterventionNames()
-	]
-	
-	[AverageSectionWidget]o-[AverageSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[AverageSectionWidget]
-	
-	[DiagramDatum
-	  |
-	  +x: num;
-	  +value: num;
-	  +timestamp: DateTime?;
-	  +intervention: String
-	]
-	
-	[LinearRegressionSectionWidget
-	  |
-	  +section: LinearRegressionSection
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionWidget]o-[LinearRegressionSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[LinearRegressionSectionWidget]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="638.0" width="4663.8" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M2304.0 156.2 L2218.25 203 L2253.7301829268295 298 L2253.7 298.0 " fill="none"></path>
-					<path d="M2306.6 160.9 L2304.0 156.2 L2301.5 151.5 L2315.8 149.8 Z"></path>
-					<path d="M204.5 164.2 L204.5 203 L1551 360.00391041592604 L1551.0 360.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M209.8 154.8 L204.5 164.2 L199.2 154.8 L204.5 145.5 Z"></path>
-					</g>
-					<path d="M923.3 156.1 L855.25 203 L487.3955792682927 351.5 L487.4 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M934.0 155.2 L923.3 156.1 L928.0 146.4 L938.7 145.5 Z"></path>
-					</g>
-					<path d="M1082.7 158.9 L1125.75 203 L1565.1379573170732 351.5 L1565.1 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1080.0 148.5 L1082.7 158.9 L1072.4 155.9 L1069.7 145.5 Z"></path>
-					</g>
-					<path d="M1467.0 158.8 L1423.75 203 L1024.8826219512196 351.5 L1024.9 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1477.4 155.9 L1467.0 158.8 L1469.7 148.4 L1480.1 145.5 Z"></path>
-					</g>
-					<path d="M1581.5 160.8 L1611 203 L1611 351.5 L1611.0 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1580.5 150.1 L1581.5 160.8 L1571.8 156.2 L1570.8 145.5 Z"></path>
-					</g>
-					<path d="M3093.3 164.2 L3093.25 203 L3201.2294207317073 351.5 L3201.2 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3098.6 154.8 L3093.3 164.2 L3087.9 154.8 L3093.3 145.5 Z"></path>
-					</g>
-					<path d="M653.5 164.2 L653.5 203 L1551 356.72323759791124 L1551.0 356.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M658.8 154.8 L653.5 164.2 L648.2 154.8 L653.5 145.5 Z"></path>
-					</g>
-					<path d="M1868.2 164.5 L1775 203 L1972.622713414634 351.5 L1972.6 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1878.9 165.9 L1868.2 164.5 L1874.8 156.0 L1885.5 157.4 Z"></path>
-					</g>
-					<path d="M1918.3 194.8 L1908.25 203 L1639.09375 351.5 L1639.1 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1928.9 193.0 L1918.3 194.8 L1922.2 184.8 L1932.8 183.0 Z"></path>
-					</g>
-					<path d="M2168.7 195.0 L2178.25 203 L2518.034298780488 351.5 L2518.0 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2164.9 184.9 L2168.7 195.0 L2158.1 193.1 L2154.3 183.0 Z"></path>
-					</g>
-					<path d="M1274.5 156.7 L1274.5 203 L1579.1966463414635 351.5 L1579.2 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1279.8 147.3 L1274.5 156.7 L1269.2 147.3 L1274.5 138.0 Z"></path>
-					</g>
-					<path d="M2408.0 166.1 L2400.75 203 L2695.7423780487807 336 L2695.7 336.0 " fill="none"></path>
-					<path d="M2413.3 167.1 L2408.0 166.1 L2402.8 165.0 L2410.6 153.0 Z"></path>
-					<path d="M2435.7 171.4 L2440.75 203 L1671 355.141006327207 L1671.0 355.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2439.4 161.4 L2435.7 171.4 L2428.9 163.1 L2432.7 153.0 Z"></path>
-					</g>
-					<path d="M2463.4 169.6 L2480.75 203 L2546.6242378048782 351.5 L2546.6 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2463.8 158.8 L2463.4 169.6 L2454.3 163.7 L2454.7 153.0 Z"></path>
-					</g>
-					<path d="M4131.8 164.2 L4131.75 203 L4209.169207317073 351.5 L4209.2 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4137.1 154.8 L4131.8 164.2 L4126.4 154.8 L4131.8 145.5 Z"></path>
-					</g>
-					<path d="M4302.8 148.7 L4302.75 203 L4225.330792682927 351.5 L4225.3 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4308.1 139.3 L4302.8 148.7 L4297.4 139.3 L4302.8 130.0 Z"></path>
-					</g>
-					<path d="M2542.5 128.4 L2784.25 203 L2996.9283536585367 336 L2996.9 336.0 " fill="none"></path>
-					<path d="M2544.1 123.3 L2542.5 128.4 L2540.9 133.5 L2529.8 124.5 Z"></path>
-					<path d="M3489.6 125.6 L3225.25 203 L1671 360.90428991791856 L1671.0 360.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3500.0 128.1 L3489.6 125.6 L3497.0 117.8 L3507.5 120.3 Z"></path>
-					</g>
-					<path d="M3476.5 529.7 L3476.5 531 L3476.5 551 L3476.5 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3481.8 520.3 L3476.5 529.7 L3471.2 520.3 L3476.5 511.0 Z"></path>
-					</g>
-					<path d="M3559.9 131.2 L3476.5 203 L3476.5 223 L3476.5 223.0 " fill="none"></path>
-					<path d="M3563.4 135.2 L3559.9 131.2 L3556.4 127.2 L3570.0 122.5 Z"></path>
-					<path d="M3859.5 432.2 L3859.5 531 L3859.5 551 L3859.5 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3864.8 422.8 L3859.5 432.2 L3854.2 422.8 L3859.5 413.5 Z"></path>
-					</g>
-					<path d="M3688.7 127.9 L3859.5 203 L3859.5 320.5 L3859.5 320.5 " fill="none"></path>
-					<path d="M3690.8 123.0 L3688.7 127.9 L3686.5 132.8 L3676.5 122.5 Z"></path>
-					<g data-name="PerformanceSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceSection">
-							<rect x="2117.5" y="298.0" height="138.0" width="324.0" data-name="PerformanceSection"></rect>
-							<path d="M2117.5 329.0 L2441.5 329.0" fill="none" data-name="PerformanceSection"></path>
-							<path d="M2117.5 375.0 L2441.5 375.0" fill="none" data-name="PerformanceSection"></path>
-						</g>
-						<g transform="translate(2117.5, 298)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceSection">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceSection">PerformanceSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2117.5, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+minimumRatio: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+maximum: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2117.5, 375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+Widget buildContent()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+String getPowerLevelDescription()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PerformanceSection">+int getCountableObservationAmount()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GenericSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GenericSection">
-							<rect x="2315.8" y="30.0" height="123.0" width="214.0" data-name="GenericSection"></rect>
-							<path d="M2315.8 61.0 L2529.8 61.0" fill="none" data-name="GenericSection"></path>
-							<path d="M2315.8 107.0 L2529.8 107.0" fill="none" data-name="GenericSection"></path>
-						</g>
-						<g transform="translate(2315.75, 30)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GenericSection">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="GenericSection">GenericSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2315.75, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GenericSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GenericSection">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GenericSection">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2315.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GenericSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GenericSection">+Widget buildContent()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GenericSection">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceBar">
-							<rect x="3008.3" y="37.5" height="108.0" width="170.0" data-name="PerformanceBar"></rect>
-							<path d="M3008.3 68.5 L3178.3 68.5" fill="none" data-name="PerformanceBar"></path>
-							<path d="M3008.3 114.5 L3178.3 114.5" fill="none" data-name="PerformanceBar"></path>
-						</g>
-						<g transform="translate(3008.25, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceBar">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceBar">PerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3008.25, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+progress: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceBar">+minimum: double?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3008.25, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceDetailsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceDetailsScreen">
-							<rect x="0.0" y="37.5" height="108.0" width="409.0" data-name="PerformanceDetailsScreen"></rect>
-							<path d="M0.0 68.5 L409.0 68.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-							<path d="M0.0 99.5 L409.0 99.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-						</g>
-						<g transform="translate(0, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceDetailsScreen">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceDetailsScreen">PerformanceDetailsScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">+reportSubject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceDetailsScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="1551.0" y="351.5" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(1551, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPerformanceBar">
-							<rect x="898.0" y="37.5" height="108.0" width="238.0" data-name="InterventionPerformanceBar"></rect>
-							<path d="M898.0 68.5 L1136.0 68.5" fill="none" data-name="InterventionPerformanceBar"></path>
-							<path d="M898.0 114.5 L1136.0 114.5" fill="none" data-name="InterventionPerformanceBar"></path>
-						</g>
-						<g transform="translate(898, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPerformanceBar">
-								<text x="111.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPerformanceBar">InterventionPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(898, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(898, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention">
-							<rect x="394.0" y="351.5" height="31.0" width="110.0" data-name="Intervention"></rect>
-						</g>
-						<g transform="translate(394, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention">Intervention</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ObservationPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ObservationPerformanceBar">
-							<rect x="1413.0" y="37.5" height="108.0" width="240.0" data-name="ObservationPerformanceBar"></rect>
-							<path d="M1413.0 68.5 L1653.0 68.5" fill="none" data-name="ObservationPerformanceBar"></path>
-							<path d="M1413.0 114.5 L1653.0 114.5" fill="none" data-name="ObservationPerformanceBar"></path>
-						</g>
-						<g transform="translate(1413, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ObservationPerformanceBar">
-								<text x="112.0" y="13.5" stroke="none" text-anchor="middle" data-name="ObservationPerformanceBar">ObservationPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1413, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+observation: Observation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ObservationPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1413, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Observation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Observation">
-							<rect x="927.3" y="351.5" height="31.0" width="112.0" data-name="Observation"></rect>
-						</g>
-						<g transform="translate(927.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Observation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Observation">
-								<text x="48.0" y="13.5" stroke="none" text-anchor="middle" data-name="Observation">Observation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Task">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Task">
-							<rect x="3185.5" y="351.5" height="31.0" width="54.0" data-name="Task"></rect>
-						</g>
-						<g transform="translate(3185.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Task">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Task">
-								<text x="19.0" y="13.5" stroke="none" text-anchor="middle" data-name="Task">Task</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportDetailsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportDetailsScreen">
-							<rect x="449.0" y="37.5" height="108.0" width="409.0" data-name="ReportDetailsScreen"></rect>
-							<path d="M449.0 68.5 L858.0 68.5" fill="none" data-name="ReportDetailsScreen"></path>
-							<path d="M449.0 99.5 L858.0 99.5" fill="none" data-name="ReportDetailsScreen"></path>
-						</g>
-						<g transform="translate(449, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportDetailsScreen">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportDetailsScreen">ReportDetailsScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(449, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportDetailsScreen">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(449, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportDetailsScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionContainer">
-							<rect x="1885.5" y="0.0" height="183.0" width="319.0" data-name="ReportSectionContainer"></rect>
-							<path d="M1885.5 31.0 L2204.5 31.0" fill="none" data-name="ReportSectionContainer"></path>
-							<path d="M1885.5 107.0 L2204.5 107.0" fill="none" data-name="ReportSectionContainer"></path>
-						</g>
-						<g transform="translate(1885.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionContainer">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionContainer">ReportSectionContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1885.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionContainer">+section: ReportSection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionContainer">+subject: StudySubject</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionContainer">+primary: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionContainer">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1885.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionContainer">+ReportSectionWidget buildContents()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionContainer">+dynamic ()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionContainer">+List&lt;Widget&gt; buildPrimaryHeader()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionContainer">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="1929.3" y="351.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(1929.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="2481.5" y="351.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(2481.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportHistoryScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryScreen">
-							<rect x="2788.3" y="60.5" height="62.0" width="180.0" data-name="ReportHistoryScreen"></rect>
-							<path d="M2788.3 91.5 L2968.3 91.5" fill="none" data-name="ReportHistoryScreen"></path>
-						</g>
-						<g transform="translate(2788.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryScreen">ReportHistoryScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2788.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportHistoryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryItem">
-							<rect x="1176.0" y="45.0" height="93.0" width="197.0" data-name="ReportHistoryItem"></rect>
-							<path d="M1176.0 76.0 L1373.0 76.0" fill="none" data-name="ReportHistoryItem"></path>
-							<path d="M1176.0 107.0 L1373.0 107.0" fill="none" data-name="ReportHistoryItem"></path>
-						</g>
-						<g transform="translate(1176, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryItem">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryItem">ReportHistoryItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1176, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1176, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GeneralDetailsSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GeneralDetailsSection">
-							<rect x="2665.5" y="336.0" height="62.0" width="198.0" data-name="GeneralDetailsSection"></rect>
-							<path d="M2665.5 367.0 L2863.5 367.0" fill="none" data-name="GeneralDetailsSection"></path>
-						</g>
-						<g transform="translate(2665.5, 336)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GeneralDetailsSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GeneralDetailsSection">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="GeneralDetailsSection">GeneralDetailsSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2665.5, 367)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GeneralDetailsSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GeneralDetailsSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GeneralDetailsSection">+Widget buildContent()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegendWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendWidget">
-							<rect x="4063.8" y="37.5" height="108.0" width="136.0" data-name="LegendWidget"></rect>
-							<path d="M4063.8 68.5 L4199.8 68.5" fill="none" data-name="LegendWidget"></path>
-							<path d="M4063.8 114.5 L4199.8 114.5" fill="none" data-name="LegendWidget"></path>
-						</g>
-						<g transform="translate(4063.75, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendWidget">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="LegendWidget">LegendWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4063.75, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LegendWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4063.75, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="4188.3" y="351.5" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(4188.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegendsListWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendsListWidget">
-							<rect x="3816.8" y="45.0" height="93.0" width="207.0" data-name="LegendsListWidget"></rect>
-							<path d="M3816.8 76.0 L4023.8 76.0" fill="none" data-name="LegendsListWidget"></path>
-							<path d="M3816.8 107.0 L4023.8 107.0" fill="none" data-name="LegendsListWidget"></path>
-						</g>
-						<g transform="translate(3816.75, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendsListWidget">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LegendsListWidget">LegendsListWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3816.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+legends: List&lt;Legend&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3816.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Legend">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Legend">
-							<rect x="4239.8" y="53.0" height="77.0" width="126.0" data-name="Legend"></rect>
-							<path d="M4239.8 84.0 L4365.8 84.0" fill="none" data-name="Legend"></path>
-						</g>
-						<g transform="translate(4239.75, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Legend">
-								<text x="55.0" y="13.5" stroke="none" text-anchor="middle" data-name="Legend">Legend</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4239.75, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Legend">
-								<text x="0.0" y="13.5" stroke="none" data-name="Legend">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Legend">+color: Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DisclaimerSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisclaimerSection">
-							<rect x="2947.5" y="336.0" height="62.0" width="198.0" data-name="DisclaimerSection"></rect>
-							<path d="M2947.5 367.0 L3145.5 367.0" fill="none" data-name="DisclaimerSection"></path>
-						</g>
-						<g transform="translate(2947.5, 336)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisclaimerSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisclaimerSection">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisclaimerSection">DisclaimerSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2947.5, 367)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisclaimerSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisclaimerSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisclaimerSection">+Widget buildContent()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionWidget">
-							<rect x="3507.5" y="60.5" height="62.0" width="197.0" data-name="ReportSectionWidget"></rect>
-							<path d="M3507.5 91.5 L3704.5 91.5" fill="none" data-name="ReportSectionWidget"></path>
-						</g>
-						<g transform="translate(3507.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionWidget">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionWidget">ReportSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3507.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionWidget">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionWidget">
-							<rect x="3279.5" y="223.0" height="288.0" width="394.0" data-name="AverageSectionWidget"></rect>
-							<path d="M3279.5 254.0 L3673.5 254.0" fill="none" data-name="AverageSectionWidget"></path>
-							<path d="M3279.5 315.0 L3673.5 315.0" fill="none" data-name="AverageSectionWidget"></path>
-						</g>
-						<g transform="translate(3279.5, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionWidget">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionWidget">AverageSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3279.5, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+section: AverageSection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+titlePos: List&lt;int&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+phasePos: List&lt;int&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3279.5, 315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+Widget getLegend()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+Widget getDiagram()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AverageSectionWidget">+BarChartData getChartData()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AverageSectionWidget">+Widget getTitles()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AverageSectionWidget">+Widget getValues()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AverageSectionWidget">+List&lt;BarChartGroupData&gt; getBarGroups()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AverageSectionWidget">+FlGridData getGridData()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AverageSectionWidget">+MaterialColor getColor()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AverageSectionWidget">+int getDayIndex()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AverageSectionWidget">+Iterable&lt;DiagramDatum&gt; getAggregatedData()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AverageSectionWidget">+Map&lt;String, String?&gt; getInterventionNames()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSection">
-							<rect x="3406.0" y="551.0" height="31.0" width="141.0" data-name="AverageSection"></rect>
-						</g>
-						<g transform="translate(3406, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSection">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSection">AverageSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DiagramDatum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DiagramDatum">
-							<rect x="4405.8" y="38.0" height="107.0" width="202.0" data-name="DiagramDatum"></rect>
-							<path d="M4405.8 69.0 L4607.8 69.0" fill="none" data-name="DiagramDatum"></path>
-						</g>
-						<g transform="translate(4405.75, 38)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DiagramDatum">
-								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="DiagramDatum">DiagramDatum</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4405.75, 69)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DiagramDatum">
-								<text x="0.0" y="13.5" stroke="none" data-name="DiagramDatum">+x: num</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DiagramDatum">+value: num</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DiagramDatum">+timestamp: DateTime?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DiagramDatum">+intervention: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionWidget">
-							<rect x="3713.5" y="320.5" height="93.0" width="292.0" data-name="LinearRegressionSectionWidget"></rect>
-							<path d="M3713.5 351.5 L4005.5 351.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-							<path d="M3713.5 382.5 L4005.5 382.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-						</g>
-						<g transform="translate(3713.5, 320.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionWidget">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionWidget">LinearRegressionSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3713.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+section: LinearRegressionSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3713.5, 382.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSection">
-							<rect x="3752.0" y="551.0" height="31.0" width="215.0" data-name="LinearRegressionSection"></rect>
-						</g>
-						<g transform="translate(3752, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSection">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSection">LinearRegressionSection</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/report/util/uml.svg b/docs/uml/app/lib/screens/study/report/util/uml.svg
deleted file mode 100644
index d13841612..000000000
--- a/docs/uml/app/lib/screens/study/report/util/uml.svg
+++ /dev/null
@@ -1,128 +0,0 @@
-<svg version="1.1" baseProfile="full" width="605.0" height="235.0" viewbox="0 0 605 235" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[LegendWidget
-	  |
-	  +name: String;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[LegendWidget]o-[Color]
-	
-	[LegendsListWidget
-	  |
-	  +legends: List&lt;Legend&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[Legend
-	  |
-	  +name: String;
-	  +color: Color
-	]
-	
-	[Legend]o-[Color]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="235.0" width="605.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M68.0 126.7 L68 128 L248 158.57416267942583 L248.0 158.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73.3 117.3 L68.0 126.7 L62.7 117.3 L68.0 108.0 Z"></path>
-					</g>
-					<path d="M486.0 111.2 L486 128 L306 158.57416267942583 L306.0 158.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M491.3 101.8 L486.0 111.2 L480.7 101.8 L486.0 92.5 Z"></path>
-					</g>
-					<g data-name="LegendWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendWidget">
-							<rect x="0.0" y="0.0" height="108.0" width="136.0" data-name="LegendWidget"></rect>
-							<path d="M0.0 31.0 L136.0 31.0" fill="none" data-name="LegendWidget"></path>
-							<path d="M0.0 77.0 L136.0 77.0" fill="none" data-name="LegendWidget"></path>
-						</g>
-						<g transform="translate(0, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendWidget">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="LegendWidget">LegendWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LegendWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 77)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="248.0" y="148.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(248, 148)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegendsListWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendsListWidget">
-							<rect x="176.0" y="7.5" height="93.0" width="207.0" data-name="LegendsListWidget"></rect>
-							<path d="M176.0 38.5 L383.0 38.5" fill="none" data-name="LegendsListWidget"></path>
-							<path d="M176.0 69.5 L383.0 69.5" fill="none" data-name="LegendsListWidget"></path>
-						</g>
-						<g transform="translate(176, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendsListWidget">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LegendsListWidget">LegendsListWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(176, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+legends: List&lt;Legend&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(176, 69.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Legend">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Legend">
-							<rect x="423.0" y="15.5" height="77.0" width="126.0" data-name="Legend"></rect>
-							<path d="M423.0 46.5 L549.0 46.5" fill="none" data-name="Legend"></path>
-						</g>
-						<g transform="translate(423, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Legend">
-								<text x="55.0" y="13.5" stroke="none" text-anchor="middle" data-name="Legend">Legend</text>
-								
-							</g>
-						</g>
-						<g transform="translate(423, 46.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Legend">
-								<text x="0.0" y="13.5" stroke="none" data-name="Legend">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Legend">+color: Color</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/tasks/intervention/uml.svg b/docs/uml/app/lib/screens/study/tasks/intervention/uml.svg
deleted file mode 100644
index e9e196b72..000000000
--- a/docs/uml/app/lib/screens/study/tasks/intervention/uml.svg
+++ /dev/null
@@ -1,72 +0,0 @@
-<svg version="1.1" baseProfile="full" width="395.0" height="204.0" viewbox="0 0 395 204" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[CheckmarkTaskWidget
-	  |
-	  +task: CheckmarkTask?;
-	  +completionPeriod: CompletionPeriod?
-	]
-	
-	[CheckmarkTaskWidget]o-[CheckmarkTask]
-	[CheckmarkTaskWidget]o-[CompletionPeriod]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="204.0" width="395.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M88.0 86.8 L71.5 97 L71.5 117 L71.5 117.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M98.8 86.4 L88.0 86.8 L93.1 77.4 L103.9 77.0 Z"></path>
-					</g>
-					<path d="M244.5 86.8 L261 97 L261 117 L261.0 117.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M239.4 77.4 L244.5 86.8 L233.7 86.4 L228.6 77.0 Z"></path>
-					</g>
-					<g data-name="CheckmarkTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTaskWidget">
-							<rect x="4.8" y="0.0" height="77.0" width="323.0" data-name="CheckmarkTaskWidget"></rect>
-							<path d="M4.8 31.0 L327.8 31.0" fill="none" data-name="CheckmarkTaskWidget"></path>
-						</g>
-						<g transform="translate(4.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTaskWidget">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTaskWidget">CheckmarkTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CheckmarkTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="CheckmarkTaskWidget">+task: CheckmarkTask?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CheckmarkTaskWidget">+completionPeriod: CompletionPeriod?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CheckmarkTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTask">
-							<rect x="0.0" y="117.0" height="31.0" width="143.0" data-name="CheckmarkTask"></rect>
-						</g>
-						<g transform="translate(0, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTask">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTask">CheckmarkTask</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CompletionPeriod">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CompletionPeriod">
-							<rect x="183.0" y="117.0" height="31.0" width="156.0" data-name="CompletionPeriod"></rect>
-						</g>
-						<g transform="translate(183, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CompletionPeriod">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CompletionPeriod">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="CompletionPeriod">CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/tasks/observation/uml.svg b/docs/uml/app/lib/screens/study/tasks/observation/uml.svg
deleted file mode 100644
index 6e6f81627..000000000
--- a/docs/uml/app/lib/screens/study/tasks/observation/uml.svg
+++ /dev/null
@@ -1,72 +0,0 @@
-<svg version="1.1" baseProfile="full" width="417.0" height="204.0" viewbox="0 0 417 204" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[QuestionnaireTaskWidget
-	  |
-	  +task: QuestionnaireTask;
-	  +completionPeriod: CompletionPeriod
-	]
-	
-	[QuestionnaireTaskWidget]o-[QuestionnaireTask]
-	[QuestionnaireTaskWidget]o-[CompletionPeriod]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="204.0" width="417.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M100.7 86.4 L82.5 97 L82.5 117 L82.5 117.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M111.4 86.3 L100.7 86.4 L106.0 77.1 L116.8 77.0 Z"></path>
-					</g>
-					<path d="M264.8 86.4 L283 97 L283 117 L283.0 117.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M259.5 77.1 L264.8 86.4 L254.1 86.3 L248.7 77.0 Z"></path>
-					</g>
-					<g data-name="QuestionnaireTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTaskWidget">
-							<rect x="26.3" y="0.0" height="77.0" width="313.0" data-name="QuestionnaireTaskWidget"></rect>
-							<path d="M26.3 31.0 L339.3 31.0" fill="none" data-name="QuestionnaireTaskWidget"></path>
-						</g>
-						<g transform="translate(26.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTaskWidget">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTaskWidget">QuestionnaireTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireTaskWidget">+task: QuestionnaireTask</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireTaskWidget">+completionPeriod: CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTask">
-							<rect x="0.0" y="117.0" height="31.0" width="165.0" data-name="QuestionnaireTask"></rect>
-						</g>
-						<g transform="translate(0, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTask">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTask">QuestionnaireTask</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CompletionPeriod">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CompletionPeriod">
-							<rect x="205.0" y="117.0" height="31.0" width="156.0" data-name="CompletionPeriod"></rect>
-						</g>
-						<g transform="translate(205, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CompletionPeriod">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CompletionPeriod">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="CompletionPeriod">CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/tasks/uml.svg b/docs/uml/app/lib/screens/study/tasks/uml.svg
deleted file mode 100644
index 49428166b..000000000
--- a/docs/uml/app/lib/screens/study/tasks/uml.svg
+++ /dev/null
@@ -1,168 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1149.0" height="220.0" viewbox="0 0 1149 220" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[QuestionnaireTaskWidget
-	  |
-	  +task: QuestionnaireTask;
-	  +completionPeriod: CompletionPeriod
-	]
-	
-	[QuestionnaireTaskWidget]o-[QuestionnaireTask]
-	[QuestionnaireTaskWidget]o-[CompletionPeriod]
-	
-	[TaskScreen
-	  |
-	  +taskInstance: TaskInstance
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()
-	]
-	
-	[TaskScreen]o-[TaskInstance]
-	
-	[CheckmarkTaskWidget
-	  |
-	  +task: CheckmarkTask?;
-	  +completionPeriod: CompletionPeriod?
-	]
-	
-	[CheckmarkTaskWidget]o-[CheckmarkTask]
-	[CheckmarkTaskWidget]o-[CompletionPeriod]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="220.0" width="1149.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M139.5 102.9 L136.5 113 L136.5 133 L136.5 133.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M147.3 95.5 L139.5 102.9 L137.1 92.4 L144.9 85.0 Z"></path>
-					</g>
-					<path d="M231.8 95.1 L259.5 113 L304.7112676056338 133 L304.7 133.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M226.9 85.6 L231.8 95.1 L221.1 94.5 L216.1 85.0 Z"></path>
-					</g>
-					<path d="M560.9 110.9 L561.5 113 L561.5 133 L561.5 133.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M563.3 100.4 L560.9 110.9 L553.1 103.5 L555.5 93.0 Z"></path>
-					</g>
-					<path d="M948.5 102.9 L951.5 113 L951.5 133 L951.5 133.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M950.9 92.4 L948.5 102.9 L940.7 95.5 L943.1 85.0 Z"></path>
-					</g>
-					<path d="M751.5 69.4 L409.25 113 L370.09507042253523 133 L370.1 133.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M761.4 73.5 L751.5 69.4 L760.1 63.0 L770.0 67.1 Z"></path>
-					</g>
-					<g data-name="QuestionnaireTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTaskWidget">
-							<rect x="0.0" y="8.0" height="77.0" width="313.0" data-name="QuestionnaireTaskWidget"></rect>
-							<path d="M0.0 39.0 L313.0 39.0" fill="none" data-name="QuestionnaireTaskWidget"></path>
-						</g>
-						<g transform="translate(0, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTaskWidget">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTaskWidget">QuestionnaireTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireTaskWidget">+task: QuestionnaireTask</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireTaskWidget">+completionPeriod: CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTask">
-							<rect x="54.0" y="133.0" height="31.0" width="165.0" data-name="QuestionnaireTask"></rect>
-						</g>
-						<g transform="translate(54, 133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTask">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTask">QuestionnaireTask</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CompletionPeriod">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CompletionPeriod">
-							<rect x="261.8" y="133.0" height="31.0" width="156.0" data-name="CompletionPeriod"></rect>
-						</g>
-						<g transform="translate(261.75, 133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CompletionPeriod">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CompletionPeriod">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="CompletionPeriod">CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskScreen">
-							<rect x="353.0" y="0.0" height="93.0" width="377.0" data-name="TaskScreen"></rect>
-							<path d="M353.0 31.0 L730.0 31.0" fill="none" data-name="TaskScreen"></path>
-							<path d="M353.0 62.0 L730.0 62.0" fill="none" data-name="TaskScreen"></path>
-						</g>
-						<g transform="translate(353, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskScreen">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskScreen">TaskScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(353, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">+taskInstance: TaskInstance</text>
-								
-							</g>
-						</g>
-						<g transform="translate(353, 62)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">&lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskInstance">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskInstance">
-							<rect x="500.5" y="133.0" height="31.0" width="122.0" data-name="TaskInstance"></rect>
-						</g>
-						<g transform="translate(500.5, 133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskInstance">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskInstance">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskInstance">TaskInstance</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CheckmarkTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTaskWidget">
-							<rect x="770.0" y="8.0" height="77.0" width="323.0" data-name="CheckmarkTaskWidget"></rect>
-							<path d="M770.0 39.0 L1093.0 39.0" fill="none" data-name="CheckmarkTaskWidget"></path>
-						</g>
-						<g transform="translate(770, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTaskWidget">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTaskWidget">CheckmarkTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(770, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CheckmarkTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="CheckmarkTaskWidget">+task: CheckmarkTask?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CheckmarkTaskWidget">+completionPeriod: CompletionPeriod?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CheckmarkTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTask">
-							<rect x="880.0" y="133.0" height="31.0" width="143.0" data-name="CheckmarkTask"></rect>
-						</g>
-						<g transform="translate(880, 133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTask">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTask">CheckmarkTask</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/uml.svg b/docs/uml/app/lib/screens/study/uml.svg
deleted file mode 100644
index 5476a482f..000000000
--- a/docs/uml/app/lib/screens/study/uml.svg
+++ /dev/null
@@ -1,2368 +0,0 @@
-<svg version="1.1" baseProfile="full" width="14919.8" height="638.0" viewbox="0 0 14919.75 638" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[ConsentScreen
-	]
-	
-	[ConsentCard
-	  |
-	  +consent: ConsentItem?;
-	  +index: int?;
-	  +onTapped: dynamic Function(int);
-	  +isChecked: bool?
-	  |
-	  +Widget build()
-	]
-	
-	[ConsentCard]o-[ConsentItem]
-	[ConsentCard]o-[dynamic Function(int)]
-	
-	[ConsentElement
-	  |
-	  +title: String;
-	  +descriptionText: String;
-	  +acknowledgmentText: String;
-	  +icon: IconData
-	]
-	
-	[ConsentElement]o-[IconData]
-	
-	[StudyOverviewScreen
-	]
-	
-	[_StudyOverviewScreen
-	  |
-	  +study: Study?
-	  |
-	  +dynamic navigateToJourney();
-	  +dynamic navigateToEligibilityCheck();
-	  +Widget build()
-	]
-	
-	[_StudyOverviewScreen]o-[Study]
-	
-	[StudyDetailsView
-	  |
-	  +study: Study?;
-	  +iconSize: double
-	  |
-	  +Widget build()
-	]
-	
-	[StudyDetailsView]o-[Study]
-	
-	[KickoffScreen
-	]
-	
-	[_KickoffScreen
-	  |
-	  +subject: StudySubject?;
-	  +ready: bool
-	  |
-	  -dynamic _storeUserStudy();
-	  -Widget _constructStatusIcon();
-	  -String _getStatusText();
-	  +Widget build()
-	]
-	
-	[_KickoffScreen]o-[StudySubject]
-	
-	[EligibilityResult
-	  |
-	  +eligible: bool;
-	  +firstFailed: EligibilityCriterion?
-	]
-	
-	[EligibilityResult]o-[EligibilityCriterion]
-	
-	[EligibilityScreen
-	  |
-	  +study: Study?
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;EligibilityResult&gt; routeFor()
-	]
-	
-	[EligibilityScreen]o-[Study]
-	
-	[OnboardingProgress
-	  |
-	  +stage: int;
-	  +progress: double
-	  |
-	  -double _getProgressForStage();
-	  +Widget build()
-	]
-	
-	[StudySelectionScreen
-	]
-	
-	[InviteCodeDialog
-	]
-	
-	[InterventionSelectionScreen
-	]
-	
-	[JourneyOverviewScreen
-	]
-	
-	[_JourneyOverviewScreen
-	  |
-	  +subject: StudySubject?
-	  |
-	  +dynamic getConsentAndNavigateToDashboard();
-	  +Widget build()
-	]
-	
-	[_JourneyOverviewScreen]o-[StudySubject]
-	
-	[Timeline
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[Timeline]o-[StudySubject]
-	
-	[InterventionTile
-	  |
-	  +title: String?;
-	  +iconName: String;
-	  +date: DateTime;
-	  +color: Color?;
-	  +isFirst: bool;
-	  +isLast: bool
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionTile]o-[Color]
-	
-	[IconIndicator
-	  |
-	  +iconName: String;
-	  +color: Color?
-	  |
-	  +Widget build()
-	]
-	
-	[IconIndicator]o-[Color]
-	
-	[TimelineChild
-	  |
-	  +child: Widget?
-	  |
-	  +Widget build()
-	]
-	
-	[TimelineChild]o-[&lt;abstract&gt;Widget]
-	
-	[AverageSectionWidget
-	  |
-	  +section: AverageSection;
-	  +titlePos: List&lt;int&gt;;
-	  +phasePos: List&lt;int&gt;
-	  |
-	  +Widget build();
-	  +Widget getLegend();
-	  +Widget getDiagram();
-	  +BarChartData getChartData();
-	  +Widget getTitles();
-	  +Widget getValues();
-	  +List&lt;BarChartGroupData&gt; getBarGroups();
-	  +FlGridData getGridData();
-	  +MaterialColor getColor();
-	  +int getDayIndex();
-	  +Iterable&lt;DiagramDatum&gt; getAggregatedData();
-	  +Map&lt;String, String?&gt; getInterventionNames()
-	]
-	
-	[AverageSectionWidget]o-[AverageSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[AverageSectionWidget]
-	
-	[DiagramDatum
-	  |
-	  +x: num;
-	  +value: num;
-	  +timestamp: DateTime?;
-	  +intervention: String
-	]
-	
-	[LinearRegressionSectionWidget
-	  |
-	  +section: LinearRegressionSection
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionWidget]o-[LinearRegressionSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[LinearRegressionSectionWidget]
-	
-	[ReportHistoryScreen
-	  |
-	  +Widget build()
-	]
-	
-	[ReportHistoryItem
-	  |
-	  +subject: StudySubject
-	  |
-	  +Widget build()
-	]
-	
-	[ReportHistoryItem]o-[StudySubject]
-	
-	[ReportDetailsScreen
-	  |
-	  +subject: StudySubject
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor();
-	  +Widget build()
-	]
-	
-	[ReportDetailsScreen]o-[StudySubject]
-	
-	[GeneralDetailsSection
-	  |
-	  +Widget buildContent()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[GeneralDetailsSection]
-	
-	[&lt;abstract&gt;GenericSection
-	  |
-	  +subject: StudySubject?;
-	  +onTap: void Function()?
-	  |
-	  +Widget buildContent();
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;GenericSection]o-[StudySubject]
-	[&lt;abstract&gt;GenericSection]o-[void Function()?]
-	
-	[DisclaimerSection
-	  |
-	  +Widget buildContent()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[DisclaimerSection]
-	
-	[&lt;abstract&gt;ReportSectionWidget
-	  |
-	  +subject: StudySubject
-	]
-	
-	[&lt;abstract&gt;ReportSectionWidget]o-[StudySubject]
-	
-	[LegendWidget
-	  |
-	  +name: String;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[LegendWidget]o-[Color]
-	
-	[LegendsListWidget
-	  |
-	  +legends: List&lt;Legend&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[Legend
-	  |
-	  +name: String;
-	  +color: Color
-	]
-	
-	[Legend]o-[Color]
-	
-	[PerformanceDetailsScreen
-	  |
-	  +reportSubject: StudySubject?
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor();
-	  +Widget build()
-	]
-	
-	[PerformanceDetailsScreen]o-[StudySubject]
-	
-	[InterventionPerformanceBar
-	  |
-	  +intervention: Intervention;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPerformanceBar]o-[Intervention]
-	[InterventionPerformanceBar]o-[StudySubject]
-	
-	[ObservationPerformanceBar
-	  |
-	  +observation: Observation;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[ObservationPerformanceBar]o-[&lt;abstract&gt;Observation]
-	[ObservationPerformanceBar]o-[StudySubject]
-	
-	[PerformanceBar
-	  |
-	  +task: Task;
-	  +completed: int;
-	  +total: int
-	  |
-	  +Widget build()
-	]
-	
-	[PerformanceBar]o-[&lt;abstract&gt;Task]
-	
-	[PerformanceSection
-	  |
-	  +minimumRatio: double;
-	  +maximum: double
-	  |
-	  +Widget buildContent();
-	  +String getPowerLevelDescription();
-	  +int getCountableObservationAmount()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[PerformanceSection]
-	
-	[PerformanceBar
-	  |
-	  +progress: double;
-	  +minimum: double?
-	  |
-	  +Widget build()
-	]
-	
-	[ReportSectionContainer
-	  |
-	  +section: ReportSection;
-	  +subject: StudySubject;
-	  +primary: bool;
-	  +onTap: void Function()?
-	  |
-	  +ReportSectionWidget buildContents();
-	  +dynamic ();
-	  +List&lt;Widget&gt; buildPrimaryHeader();
-	  +Widget build()
-	]
-	
-	[ReportSectionContainer]o-[&lt;abstract&gt;ReportSection]
-	[ReportSectionContainer]o-[StudySubject]
-	[ReportSectionContainer]o-[void Function()?]
-	
-	[Settings
-	]
-	
-	[OptOutAlertDialog
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[OptOutAlertDialog]o-[StudySubject]
-	
-	[DeleteAlertDialog
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[DeleteAlertDialog]o-[StudySubject]
-	
-	[TaskBox
-	  |
-	  +taskInstance: TaskInstance;
-	  +icon: Icon;
-	  +onCompleted: dynamic Function()
-	]
-	
-	[TaskBox]o-[TaskInstance]
-	[TaskBox]o-[Icon]
-	[TaskBox]o-[dynamic Function()]
-	
-	[ProgressRow
-	  |
-	  +subject: StudySubject?
-	]
-	
-	[ProgressRow]o-[StudySubject]
-	
-	[InterventionSegment
-	  |
-	  +intervention: Intervention;
-	  +percentCompleted: double;
-	  +percentMissed: double;
-	  +isCurrent: bool;
-	  +isFuture: bool;
-	  +phaseDuration: int
-	  |
-	  +List&lt;Widget&gt; buildSeparators();
-	  +Widget build()
-	]
-	
-	[InterventionSegment]o-[Intervention]
-	
-	[TaskOverview
-	  |
-	  +subject: StudySubject?;
-	  +scheduleToday: List&lt;TaskInstance&gt;?;
-	  +interventionIcon: String?
-	]
-	
-	[TaskOverview]o-[StudySubject]
-	
-	[ContactScreen
-	]
-	
-	[ContactWidget
-	  |
-	  +contact: Contact?;
-	  +title: String;
-	  +subtitle: String?;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[ContactWidget]o-[Contact]
-	[ContactWidget]o-[Color]
-	
-	[ContactItem
-	  |
-	  +iconData: IconData;
-	  +itemName: String;
-	  +itemValue: String?;
-	  +type: ContactItemType?;
-	  +iconColor: Color?
-	  |
-	  +dynamic launchContact();
-	  +Widget build()
-	]
-	
-	[ContactItem]o-[IconData]
-	[ContactItem]o-[ContactItemType]
-	[ContactItem]o-[Color]
-	
-	[ContactItemType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ContactItemType&gt;;
-	  &lt;static&gt;+website: ContactItemType;
-	  &lt;static&gt;+email: ContactItemType;
-	  &lt;static&gt;+phone: ContactItemType
-	]
-	
-	[ContactItemType]o-[ContactItemType]
-	[Enum]&lt;:--[ContactItemType]
-	
-	[FAQ
-	  |
-	  +Widget build()
-	]
-	
-	[Entry
-	  |
-	  +title: String;
-	  +children: List&lt;Entry&gt;
-	]
-	
-	[EntryItem
-	  |
-	  +entry: Entry
-	  |
-	  -Widget _buildTiles();
-	  +Widget build()
-	]
-	
-	[EntryItem]o-[Entry]
-	
-	[DashboardScreen
-	  |
-	  +error: String?
-	]
-	
-	[OverflowMenuItem
-	  |
-	  +name: String;
-	  +icon: IconData;
-	  +routeName: String?;
-	  +onTap: dynamic Function()?
-	]
-	
-	[OverflowMenuItem]o-[IconData]
-	[OverflowMenuItem]o-[dynamic Function()?]
-	
-	[StudyFinishedPlaceholder
-	  |
-	  &lt;static&gt;+space: SizedBox
-	  |
-	  +Widget build()
-	]
-	
-	[StudyFinishedPlaceholder]o-[SizedBox]
-	
-	[QuestionnaireTaskWidget
-	  |
-	  +task: QuestionnaireTask;
-	  +completionPeriod: CompletionPeriod
-	]
-	
-	[QuestionnaireTaskWidget]o-[QuestionnaireTask]
-	[QuestionnaireTaskWidget]o-[CompletionPeriod]
-	
-	[TaskScreen
-	  |
-	  +taskInstance: TaskInstance
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()
-	]
-	
-	[TaskScreen]o-[TaskInstance]
-	
-	[CheckmarkTaskWidget
-	  |
-	  +task: CheckmarkTask?;
-	  +completionPeriod: CompletionPeriod?
-	]
-	
-	[CheckmarkTaskWidget]o-[CheckmarkTask]
-	[CheckmarkTaskWidget]o-[CompletionPeriod]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="638.0" width="14919.8" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M392.2 174.7 L416.5 203 L416.5 351.5 L416.5 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M390.2 164.1 L392.2 174.7 L382.1 171.1 L380.1 160.5 Z"></path>
-					</g>
-					<path d="M249.8 174.7 L225.5 203 L225.5 351.5 L225.5 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M259.9 171.1 L249.8 174.7 L251.8 164.1 L261.9 160.5 Z"></path>
-					</g>
-					<path d="M628.5 163.7 L628.5 203 L6950.75 365.8793150846326 L6950.8 365.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M633.8 154.3 L628.5 163.7 L623.2 154.3 L628.5 145.0 Z"></path>
-					</g>
-					<path d="M2045.0 171.7 L2045 203 L1152.5 361.5807150595883 L1152.5 361.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2050.3 162.3 L2045.0 171.7 L2039.7 162.3 L2045.0 153.0 Z"></path>
-					</g>
-					<path d="M1603.5 164.2 L1603.5 203 L1152.5 356.6116303219107 L1152.5 356.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1608.8 154.8 L1603.5 164.2 L1598.2 154.8 L1603.5 145.5 Z"></path>
-					</g>
-					<path d="M7027.5 186.7 L7027.5 203 L6867.455030487805 351.5 L6867.5 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7032.8 177.3 L7027.5 186.7 L7022.2 177.3 L7027.5 168.0 Z"></path>
-					</g>
-					<path d="M7327.5 148.7 L7327.5 203 L3225.25 364.01693292646445 L3225.3 364.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7332.8 139.3 L7327.5 148.7 L7322.2 139.3 L7327.5 130.0 Z"></path>
-					</g>
-					<path d="M1254.0 156.7 L1254 203 L1134.4756097560976 351.5 L1134.5 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1259.3 147.3 L1254.0 156.7 L1248.7 147.3 L1254.0 138.0 Z"></path>
-					</g>
-					<path d="M6653.0 164.2 L6653 203 L6832.060213414634 351.5 L6832.1 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6658.3 154.8 L6653.0 164.2 L6647.7 154.8 L6653.0 145.5 Z"></path>
-					</g>
-					<path d="M5843.5 156.7 L5843.5 203 L6790.75 357.23082650781834 L6790.8 357.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5848.8 147.3 L5843.5 156.7 L5838.2 147.3 L5843.5 138.0 Z"></path>
-					</g>
-					<path d="M10101.3 194.2 L10101.25 203 L8576.25 363.93951093951097 L8576.3 363.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10106.6 184.8 L10101.3 194.2 L10095.9 184.8 L10101.3 175.5 Z"></path>
-					</g>
-					<path d="M9900.3 164.2 L9900.25 203 L8576.25 363.4848484848485 L8576.3 363.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9905.6 154.8 L9900.3 164.2 L9894.9 154.8 L9900.3 145.5 Z"></path>
-					</g>
-					<path d="M10649.8 156.7 L10649.75 203 L11404.75 359.6350411132195 L11404.8 359.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10655.1 147.3 L10649.8 156.7 L10644.4 147.3 L10649.8 138.0 Z"></path>
-					</g>
-					<path d="M8064.3 529.7 L8064.25 531 L8064.25 551 L8064.3 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8069.6 520.3 L8064.3 529.7 L8058.9 520.3 L8064.3 511.0 Z"></path>
-					</g>
-					<path d="M8925.6 128.7 L9066.5 203 L8261.25 334.76452980793215 L8261.3 334.8 " fill="none"></path>
-					<path d="M8928.1 124.0 L8925.6 128.7 L8923.1 133.4 L8913.8 122.5 Z"></path>
-					<path d="M7681.3 432.2 L7681.25 531 L7681.25 551 L7681.3 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7686.6 422.8 L7681.3 432.2 L7675.9 422.8 L7681.3 413.5 Z"></path>
-					</g>
-					<path d="M8839.1 135.0 L8814.25 203 L7827.25 345.8667255075022 L7827.3 345.9 " fill="none"></path>
-					<path d="M8844.1 136.9 L8839.1 135.0 L8834.1 133.2 L8843.7 122.5 Z"></path>
-					<path d="M5601.5 156.7 L5601.5 203 L6790.75 359.12327396437865 L6790.8 359.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5606.8 147.3 L5601.5 156.7 L5596.2 147.3 L5601.5 138.0 Z"></path>
-					</g>
-					<path d="M5258.5 164.2 L5258.5 203 L6790.75 360.8200659444183 L6790.8 360.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5263.8 154.8 L5258.5 164.2 L5253.2 154.8 L5258.5 145.5 Z"></path>
-					</g>
-					<path d="M11206.9 163.2 L11240.75 203 L12117.75 350.36475409836066 L12117.8 350.4 " fill="none"></path>
-					<path d="M11211.0 159.7 L11206.9 163.2 L11202.8 166.6 L11198.3 153.0 Z"></path>
-					<path d="M11142.9 171.7 L11141.75 203 L6910.75 364.7068282451643 L6910.8 364.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11148.6 162.5 L11142.9 171.7 L11138.0 162.1 L11143.7 153.0 Z"></path>
-					</g>
-					<path d="M11114.7 170.4 L11101.75 203 L11201.806402439024 351.5 L11201.8 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11123.1 163.6 L11114.7 170.4 L11113.2 159.7 L11121.6 153.0 Z"></path>
-					</g>
-					<path d="M11091.5 163.6 L11061.75 203 L11879.75 349.29443838604146 L11879.8 349.3 " fill="none"></path>
-					<path d="M11095.7 166.9 L11091.5 163.6 L11087.2 160.4 L11099.5 153.0 Z"></path>
-					<path d="M8821.6 137.6 L8774.25 203 L6910.75 361.88432544840134 L6910.8 361.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8831.4 133.2 L8821.6 137.6 L8822.8 126.9 L8832.5 122.5 Z"></path>
-					</g>
-					<path d="M9591.8 164.2 L9591.75 203 L8576.25 362.4466251795117 L8576.3 362.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9597.1 154.8 L9591.8 164.2 L9586.4 154.8 L9591.8 145.5 Z"></path>
-					</g>
-					<path d="M8653.5 148.7 L8653.5 203 L8557.291920731708 351.5 L8557.3 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8658.8 139.3 L8653.5 148.7 L8648.2 139.3 L8653.5 130.0 Z"></path>
-					</g>
-					<path d="M4809.5 164.2 L4809.5 203 L6790.75 362.1794243723209 L6790.8 362.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4814.8 154.8 L4809.5 164.2 L4804.2 154.8 L4809.5 145.5 Z"></path>
-					</g>
-					<path d="M8487.4 160.0 L8522.5 203 L8814.293445121952 351.5 L8814.3 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8485.6 149.4 L8487.4 160.0 L8477.3 156.1 L8475.6 145.5 Z"></path>
-					</g>
-					<path d="M8360.0 158.2 L8312 203 L6910.75 360.2660393498717 L6910.8 360.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8370.4 155.8 L8360.0 158.2 L8363.2 148.0 L8373.6 145.5 Z"></path>
-					</g>
-					<path d="M8224.0 158.2 L8272 203 L7495.25 355.97148003602524 L7495.3 356.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8220.8 148.0 L8224.0 158.2 L8213.6 155.8 L8210.4 145.5 Z"></path>
-					</g>
-					<path d="M8019.7 153.4 L7913.25 203 L6910.75 357.7388235294118 L6910.8 357.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8030.4 154.3 L8019.7 153.4 L8025.9 144.6 L8036.6 145.5 Z"></path>
-					</g>
-					<path d="M12054.0 171.7 L12054 203 L12690.5 360.32629992464206 L12690.5 360.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12059.3 162.3 L12054.0 171.7 L12048.7 162.3 L12054.0 153.0 Z"></path>
-					</g>
-					<path d="M11026.7 140.9 L10876.5 203 L11515.75 333.8418096723869 L11515.8 333.8 " fill="none"></path>
-					<path d="M11028.7 145.8 L11026.7 140.9 L11024.6 135.9 L11039.0 135.8 Z"></path>
-					<path d="M10488.4 196.0 L10495.5 203 L10985.142530487805 351.5 L10985.1 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10485.4 185.7 L10488.4 196.0 L10478.0 193.3 L10475.0 183.0 Z"></path>
-					</g>
-					<path d="M10349.6 200.9 L10349 203 L6910.75 364.18716501107696 L6910.8 364.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10357.3 193.4 L10349.6 200.9 L10347.1 190.5 L10354.8 183.0 Z"></path>
-					</g>
-					<path d="M10269.1 195.7 L10261.25 203 L11140.25 354.58359621451103 L11140.3 354.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10279.6 193.3 L10269.1 195.7 L10272.3 185.4 L10282.8 183.0 Z"></path>
-					</g>
-					<path d="M4461.5 156.7 L4461.5 203 L6790.75 362.88155278853196 L6790.8 362.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4466.8 147.3 L4461.5 156.7 L4456.2 147.3 L4461.5 138.0 Z"></path>
-					</g>
-					<path d="M4214.5 156.7 L4214.5 203 L6790.75 363.2674253200569 L6790.8 363.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4219.8 147.3 L4214.5 156.7 L4209.2 147.3 L4214.5 138.0 Z"></path>
-					</g>
-					<path d="M13015.8 147.0 L13110 203 L13057.934451219513 351.5 L13057.9 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13010.5 137.7 L13015.8 147.0 L13005.0 146.9 L12999.7 137.5 Z"></path>
-					</g>
-					<path d="M12897.0 154.8 L12877.75 203 L13365.75 359.00779727095517 L13365.8 359.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12905.4 148.1 L12897.0 154.8 L12895.5 144.2 L12903.9 137.5 Z"></path>
-					</g>
-					<path d="M12799.8 145.0 L12667 203 L12849.003048780487 351.5 L12849.0 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12810.5 146.1 L12799.8 145.0 L12806.3 136.3 L12816.9 137.5 Z"></path>
-					</g>
-					<path d="M2707.5 141.2 L2707.5 203 L6790.75 364.62505279671757 L6790.8 364.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2712.8 131.8 L2707.5 141.2 L2702.2 131.8 L2707.5 122.5 Z"></path>
-					</g>
-					<path d="M11806.5 201.7 L11806.5 203 L8899.75 363.95450324976787 L8899.8 364.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11811.8 192.3 L11806.5 201.7 L11801.2 192.3 L11806.5 183.0 Z"></path>
-					</g>
-					<path d="M2403.5 156.2 L2403.5 203 L6790.75 364.78739670582945 L6790.8 364.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2408.8 146.8 L2403.5 156.2 L2398.2 146.8 L2403.5 137.5 Z"></path>
-					</g>
-					<path d="M11474.2 147.8 L11571 203 L12482.5 360.3536842105263 L12482.5 360.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11468.7 138.5 L11474.2 147.8 L11463.5 147.8 L11458.0 138.6 Z"></path>
-					</g>
-					<path d="M11304.8 174.7 L11280.75 203 L8576.25 365.260106091092 L8576.3 365.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11314.9 171.1 L11304.8 174.7 L11306.8 164.2 L11316.9 160.5 Z"></path>
-					</g>
-					<path d="M7762.4 151.3 L7873.25 203 L7037.75 358.8839590443686 L7037.8 358.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7756.2 142.6 L7762.4 151.3 L7751.7 152.2 L7745.5 143.5 Z"></path>
-					</g>
-					<path d="M7761.8 163.0 L7833.25 203 L9566.25 352.66403370194837 L9566.3 352.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7756.2 153.8 L7761.8 163.0 L7751.0 163.1 L7745.5 153.9 Z"></path>
-					</g>
-					<path d="M7509.2 186.8 L7488 203 L8518.25 362.5100306820864 L8518.3 362.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7519.8 185.4 L7509.2 186.8 L7513.4 176.9 L7524.0 175.5 Z"></path>
-					</g>
-					<path d="M9916.9 353.8 L10584.25 306 L10755.75 306 L10755.75 306 L10927.25 367 L10927.25 367 L10755.75 428 L10755.75 428 L10584.25 428 L10584.25 428 L9898.25 378.88497652582157 L9898.3 378.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9907.2 349.1 L9916.9 353.8 L9907.9 359.8 L9898.3 355.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M13337.8 120.3 L13337.75 203 L9898.25 359.44931354874495 L9898.3 359.4 " fill="none"></path>
-					</g>
-					<path d="M13343.1 120.3 L13337.8 120.3 L13332.4 120.3 L13337.8 107.0 Z"></path>
-					<path d="M13768.3 164.2 L13768.25 203 L13768.25 328.5 L13768.3 328.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13773.6 154.8 L13768.3 164.2 L13762.9 154.8 L13768.3 145.5 Z"></path>
-					</g>
-					<path d="M9418.4 159.2 L9456 203 L7037.75 364.1020615415863 L7037.8 364.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9416.3 148.6 L9418.4 159.2 L9408.2 155.6 L9406.2 145.0 Z"></path>
-					</g>
-					<path d="M9293.8 158.2 L9249.25 203 L8470.983231707318 351.5 L8471.0 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9304.2 155.4 L9293.8 158.2 L9296.6 147.9 L9307.0 145.0 Z"></path>
-					</g>
-					<path d="M14008.8 156.7 L14008.75 203 L14008.75 351.5 L14008.8 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14014.1 147.3 L14008.8 156.7 L14003.4 147.3 L14008.8 138.0 Z"></path>
-					</g>
-					<path d="M14392.1 143.8 L14446.25 203 L14520.5 351.5 L14520.5 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14389.7 133.3 L14392.1 143.8 L14381.8 140.5 L14379.5 130.0 Z"></path>
-					</g>
-					<path d="M14297.2 143.9 L14244 203 L14318.25 351.5 L14318.3 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14307.4 140.5 L14297.2 143.9 L14299.4 133.4 L14309.6 130.0 Z"></path>
-					</g>
-					<path d="M12371.8 156.7 L12371.75 203 L12991.5 352.30444362835107 L12991.5 352.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12377.1 147.3 L12371.8 156.7 L12366.4 147.3 L12371.8 138.0 Z"></path>
-					</g>
-					<path d="M14712.5 148.4 L14722.25 203 L14722.25 351.5 L14722.3 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14716.1 138.2 L14712.5 148.4 L14705.6 140.1 L14709.2 130.0 Z"></path>
-					</g>
-					<path d="M14632.1 140.7 L14543.25 203 L14346.532774390244 351.5 L14346.5 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14642.8 139.7 L14632.1 140.7 L14636.6 131.0 L14647.3 130.0 Z"></path>
-					</g>
-					<g data-name="ConsentScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentScreen">
-							<rect x="0.0" y="76.0" height="31.0" width="138.0" data-name="ConsentScreen"></rect>
-						</g>
-						<g transform="translate(0, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentScreen">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentScreen">ConsentScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentCard">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentCard">
-							<rect x="178.0" y="22.5" height="138.0" width="286.0" data-name="ConsentCard"></rect>
-							<path d="M178.0 53.5 L464.0 53.5" fill="none" data-name="ConsentCard"></path>
-							<path d="M178.0 129.5 L464.0 129.5" fill="none" data-name="ConsentCard"></path>
-						</g>
-						<g transform="translate(178, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentCard">
-								<text x="135.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentCard">ConsentCard</text>
-								
-							</g>
-						</g>
-						<g transform="translate(178, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+consent: ConsentItem?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentCard">+index: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentCard">+onTapped: dynamic Function(int)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentCard">+isChecked: bool?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(178, 129.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItem">
-							<rect x="358.5" y="351.5" height="31.0" width="116.0" data-name="ConsentItem"></rect>
-						</g>
-						<g transform="translate(358.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItem">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItem">ConsentItem</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(int)">
-							<rect x="132.5" y="351.5" height="31.0" width="186.0" data-name="dynamic Function(int)"></rect>
-						</g>
-						<g transform="translate(132.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(int)">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(int)">dynamic Function(int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentElement">
-							<rect x="504.0" y="38.0" height="107.0" width="249.0" data-name="ConsentElement"></rect>
-							<path d="M504.0 69.0 L753.0 69.0" fill="none" data-name="ConsentElement"></path>
-						</g>
-						<g transform="translate(504, 38)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentElement">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentElement">ConsentElement</text>
-								
-							</g>
-						</g>
-						<g transform="translate(504, 69)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentElement">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentElement">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentElement">+descriptionText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentElement">+acknowledgmentText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentElement">+icon: IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="6950.8" y="351.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(6950.75, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyOverviewScreen">
-							<rect x="793.0" y="76.0" height="31.0" width="190.0" data-name="StudyOverviewScreen"></rect>
-						</g>
-						<g transform="translate(793, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyOverviewScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyOverviewScreen">StudyOverviewScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_StudyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_StudyOverviewScreen">
-							<rect x="1887.0" y="30.0" height="123.0" width="316.0" data-name="_StudyOverviewScreen"></rect>
-							<path d="M1887.0 61.0 L2203.0 61.0" fill="none" data-name="_StudyOverviewScreen"></path>
-							<path d="M1887.0 92.0 L2203.0 92.0" fill="none" data-name="_StudyOverviewScreen"></path>
-						</g>
-						<g transform="translate(1887, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_StudyOverviewScreen">
-								<text x="150.0" y="13.5" stroke="none" text-anchor="middle" data-name="_StudyOverviewScreen">_StudyOverviewScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1887, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+study: Study?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1887, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToJourney()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToEligibilityCheck()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="_StudyOverviewScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="1091.5" y="351.5" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(1091.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDetailsView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDetailsView">
-							<rect x="1525.0" y="37.5" height="108.0" width="157.0" data-name="StudyDetailsView"></rect>
-							<path d="M1525.0 68.5 L1682.0 68.5" fill="none" data-name="StudyDetailsView"></path>
-							<path d="M1525.0 114.5 L1682.0 114.5" fill="none" data-name="StudyDetailsView"></path>
-						</g>
-						<g transform="translate(1525, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDetailsView">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDetailsView">StudyDetailsView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1525, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+study: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDetailsView">+iconSize: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1525, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="KickoffScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="KickoffScreen">
-							<rect x="1722.0" y="76.0" height="31.0" width="125.0" data-name="KickoffScreen"></rect>
-						</g>
-						<g transform="translate(1722, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="KickoffScreen">
-								<text x="54.5" y="13.5" stroke="none" text-anchor="middle" data-name="KickoffScreen">KickoffScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_KickoffScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_KickoffScreen">
-							<rect x="6897.0" y="15.0" height="153.0" width="261.0" data-name="_KickoffScreen"></rect>
-							<path d="M6897.0 46.0 L7158.0 46.0" fill="none" data-name="_KickoffScreen"></path>
-							<path d="M6897.0 92.0 L7158.0 92.0" fill="none" data-name="_KickoffScreen"></path>
-						</g>
-						<g transform="translate(6897, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_KickoffScreen">
-								<text x="122.5" y="13.5" stroke="none" text-anchor="middle" data-name="_KickoffScreen">_KickoffScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6897, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">+ready: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6897, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">-dynamic _storeUserStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">-Widget _constructStatusIcon()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="_KickoffScreen">-String _getStatusText()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="_KickoffScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="6790.8" y="351.5" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(6790.75, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityResult">
-							<rect x="7198.0" y="53.0" height="77.0" width="259.0" data-name="EligibilityResult"></rect>
-							<path d="M7198.0 84.0 L7457.0 84.0" fill="none" data-name="EligibilityResult"></path>
-						</g>
-						<g transform="translate(7198, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityResult">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityResult">EligibilityResult</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7198, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityResult">+eligible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EligibilityResult">+firstFailed: EligibilityCriterion?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityCriterion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityCriterion">
-							<rect x="3073.3" y="351.5" height="31.0" width="152.0" data-name="EligibilityCriterion"></rect>
-						</g>
-						<g transform="translate(3073.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityCriterion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityCriterion">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityCriterion">EligibilityCriterion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityScreen">
-							<rect x="1023.0" y="45.0" height="93.0" width="462.0" data-name="EligibilityScreen"></rect>
-							<path d="M1023.0 76.0 L1485.0 76.0" fill="none" data-name="EligibilityScreen"></path>
-							<path d="M1023.0 107.0 L1485.0 107.0" fill="none" data-name="EligibilityScreen"></path>
-						</g>
-						<g transform="translate(1023, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityScreen">
-								<text x="223.0" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityScreen">EligibilityScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1023, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityScreen">+study: Study?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1023, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityScreen">&lt;static&gt;+MaterialPageRoute&lt;EligibilityResult&gt; routeFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OnboardingProgress">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OnboardingProgress">
-							<rect x="2851.0" y="30.0" height="123.0" width="271.0" data-name="OnboardingProgress"></rect>
-							<path d="M2851.0 61.0 L3122.0 61.0" fill="none" data-name="OnboardingProgress"></path>
-							<path d="M2851.0 107.0 L3122.0 107.0" fill="none" data-name="OnboardingProgress"></path>
-						</g>
-						<g transform="translate(2851, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OnboardingProgress">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="OnboardingProgress">OnboardingProgress</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2851, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
-								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">+stage: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+progress: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2851, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
-								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">-double _getProgressForStage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySelectionScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySelectionScreen">
-							<rect x="3162.0" y="76.0" height="31.0" width="190.0" data-name="StudySelectionScreen"></rect>
-						</g>
-						<g transform="translate(3162, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySelectionScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySelectionScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySelectionScreen">StudySelectionScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeDialog">
-							<rect x="3392.0" y="76.0" height="31.0" width="151.0" data-name="InviteCodeDialog"></rect>
-						</g>
-						<g transform="translate(3392, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeDialog">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeDialog">InviteCodeDialog</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionSelectionScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSelectionScreen">
-							<rect x="3583.0" y="76.0" height="31.0" width="239.0" data-name="InterventionSelectionScreen"></rect>
-						</g>
-						<g transform="translate(3583, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSelectionScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSelectionScreen">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSelectionScreen">InterventionSelectionScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="JourneyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JourneyOverviewScreen">
-							<rect x="3862.0" y="76.0" height="31.0" width="209.0" data-name="JourneyOverviewScreen"></rect>
-						</g>
-						<g transform="translate(3862, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JourneyOverviewScreen">
-								<text x="96.5" y="13.5" stroke="none" text-anchor="middle" data-name="JourneyOverviewScreen">JourneyOverviewScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_JourneyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_JourneyOverviewScreen">
-							<rect x="6449.0" y="37.5" height="108.0" width="408.0" data-name="_JourneyOverviewScreen"></rect>
-							<path d="M6449.0 68.5 L6857.0 68.5" fill="none" data-name="_JourneyOverviewScreen"></path>
-							<path d="M6449.0 99.5 L6857.0 99.5" fill="none" data-name="_JourneyOverviewScreen"></path>
-						</g>
-						<g transform="translate(6449, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_JourneyOverviewScreen">
-								<text x="196.0" y="13.5" stroke="none" text-anchor="middle" data-name="_JourneyOverviewScreen">_JourneyOverviewScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6449, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_JourneyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_JourneyOverviewScreen">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6449, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_JourneyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_JourneyOverviewScreen">+dynamic getConsentAndNavigateToDashboard()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_JourneyOverviewScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Timeline">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Timeline">
-							<rect x="5740.0" y="45.0" height="93.0" width="207.0" data-name="Timeline"></rect>
-							<path d="M5740.0 76.0 L5947.0 76.0" fill="none" data-name="Timeline"></path>
-							<path d="M5740.0 107.0 L5947.0 107.0" fill="none" data-name="Timeline"></path>
-						</g>
-						<g transform="translate(5740, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timeline">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="Timeline">Timeline</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5740, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Timeline">
-								<text x="0.0" y="13.5" stroke="none" data-name="Timeline">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5740, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Timeline">
-								<text x="0.0" y="13.5" stroke="none" data-name="Timeline">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTile">
-							<rect x="10020.8" y="7.5" height="168.0" width="161.0" data-name="InterventionTile"></rect>
-							<path d="M10020.8 38.5 L10181.8 38.5" fill="none" data-name="InterventionTile"></path>
-							<path d="M10020.8 144.5 L10181.8 144.5" fill="none" data-name="InterventionTile"></path>
-						</g>
-						<g transform="translate(10020.75, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTile">
-								<text x="72.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTile">InterventionTile</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10020.75, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTile">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTile">+iconName: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTile">+date: DateTime</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTile">+color: Color?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTile">+isFirst: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTile">+isLast: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10020.75, 144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTile">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="8518.3" y="351.5" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(8518.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconIndicator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconIndicator">
-							<rect x="9819.8" y="37.5" height="108.0" width="161.0" data-name="IconIndicator"></rect>
-							<path d="M9819.8 68.5 L9980.8 68.5" fill="none" data-name="IconIndicator"></path>
-							<path d="M9819.8 114.5 L9980.8 114.5" fill="none" data-name="IconIndicator"></path>
-						</g>
-						<g transform="translate(9819.75, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconIndicator">
-								<text x="72.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconIndicator">IconIndicator</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9819.75, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconIndicator">+iconName: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconIndicator">+color: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9819.75, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconIndicator">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TimelineChild">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimelineChild">
-							<rect x="10580.8" y="45.0" height="93.0" width="138.0" data-name="TimelineChild"></rect>
-							<path d="M10580.8 76.0 L10718.8 76.0" fill="none" data-name="TimelineChild"></path>
-							<path d="M10580.8 107.0 L10718.8 107.0" fill="none" data-name="TimelineChild"></path>
-						</g>
-						<g transform="translate(10580.75, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimelineChild">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="TimelineChild">TimelineChild</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10580.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimelineChild">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimelineChild">+child: Widget?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10580.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimelineChild">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimelineChild">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="11404.8" y="351.5" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(11404.75, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionWidget">
-							<rect x="7867.3" y="223.0" height="288.0" width="394.0" data-name="AverageSectionWidget"></rect>
-							<path d="M7867.3 254.0 L8261.3 254.0" fill="none" data-name="AverageSectionWidget"></path>
-							<path d="M7867.3 315.0 L8261.3 315.0" fill="none" data-name="AverageSectionWidget"></path>
-						</g>
-						<g transform="translate(7867.25, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionWidget">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionWidget">AverageSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7867.25, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+section: AverageSection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+titlePos: List&lt;int&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+phasePos: List&lt;int&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7867.25, 315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+Widget getLegend()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+Widget getDiagram()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AverageSectionWidget">+BarChartData getChartData()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AverageSectionWidget">+Widget getTitles()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AverageSectionWidget">+Widget getValues()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AverageSectionWidget">+List&lt;BarChartGroupData&gt; getBarGroups()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AverageSectionWidget">+FlGridData getGridData()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AverageSectionWidget">+MaterialColor getColor()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AverageSectionWidget">+int getDayIndex()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AverageSectionWidget">+Iterable&lt;DiagramDatum&gt; getAggregatedData()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AverageSectionWidget">+Map&lt;String, String?&gt; getInterventionNames()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSection">
-							<rect x="7993.8" y="551.0" height="31.0" width="141.0" data-name="AverageSection"></rect>
-						</g>
-						<g transform="translate(7993.75, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSection">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSection">AverageSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionWidget">
-							<rect x="8756.5" y="60.5" height="62.0" width="197.0" data-name="ReportSectionWidget"></rect>
-							<path d="M8756.5 91.5 L8953.5 91.5" fill="none" data-name="ReportSectionWidget"></path>
-						</g>
-						<g transform="translate(8756.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionWidget">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionWidget">ReportSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8756.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionWidget">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DiagramDatum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DiagramDatum">
-							<rect x="5987.0" y="38.0" height="107.0" width="202.0" data-name="DiagramDatum"></rect>
-							<path d="M5987.0 69.0 L6189.0 69.0" fill="none" data-name="DiagramDatum"></path>
-						</g>
-						<g transform="translate(5987, 38)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DiagramDatum">
-								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="DiagramDatum">DiagramDatum</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5987, 69)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DiagramDatum">
-								<text x="0.0" y="13.5" stroke="none" data-name="DiagramDatum">+x: num</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DiagramDatum">+value: num</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DiagramDatum">+timestamp: DateTime?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DiagramDatum">+intervention: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionWidget">
-							<rect x="7535.3" y="320.5" height="93.0" width="292.0" data-name="LinearRegressionSectionWidget"></rect>
-							<path d="M7535.3 351.5 L7827.3 351.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-							<path d="M7535.3 382.5 L7827.3 382.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-						</g>
-						<g transform="translate(7535.25, 320.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionWidget">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionWidget">LinearRegressionSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7535.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+section: LinearRegressionSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7535.25, 382.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSection">
-							<rect x="7573.8" y="551.0" height="31.0" width="215.0" data-name="LinearRegressionSection"></rect>
-						</g>
-						<g transform="translate(7573.75, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSection">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSection">LinearRegressionSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportHistoryScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryScreen">
-							<rect x="6229.0" y="60.5" height="62.0" width="180.0" data-name="ReportHistoryScreen"></rect>
-							<path d="M6229.0 91.5 L6409.0 91.5" fill="none" data-name="ReportHistoryScreen"></path>
-						</g>
-						<g transform="translate(6229, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryScreen">ReportHistoryScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6229, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportHistoryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryItem">
-							<rect x="5503.0" y="45.0" height="93.0" width="197.0" data-name="ReportHistoryItem"></rect>
-							<path d="M5503.0 76.0 L5700.0 76.0" fill="none" data-name="ReportHistoryItem"></path>
-							<path d="M5503.0 107.0 L5700.0 107.0" fill="none" data-name="ReportHistoryItem"></path>
-						</g>
-						<g transform="translate(5503, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryItem">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryItem">ReportHistoryItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5503, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5503, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportDetailsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportDetailsScreen">
-							<rect x="5054.0" y="37.5" height="108.0" width="409.0" data-name="ReportDetailsScreen"></rect>
-							<path d="M5054.0 68.5 L5463.0 68.5" fill="none" data-name="ReportDetailsScreen"></path>
-							<path d="M5054.0 99.5 L5463.0 99.5" fill="none" data-name="ReportDetailsScreen"></path>
-						</g>
-						<g transform="translate(5054, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportDetailsScreen">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportDetailsScreen">ReportDetailsScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5054, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportDetailsScreen">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5054, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportDetailsScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GeneralDetailsSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GeneralDetailsSection">
-							<rect x="12117.8" y="336.0" height="62.0" width="198.0" data-name="GeneralDetailsSection"></rect>
-							<path d="M12117.8 367.0 L12315.8 367.0" fill="none" data-name="GeneralDetailsSection"></path>
-						</g>
-						<g transform="translate(12117.75, 336)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GeneralDetailsSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GeneralDetailsSection">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="GeneralDetailsSection">GeneralDetailsSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12117.75, 367)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GeneralDetailsSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GeneralDetailsSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GeneralDetailsSection">+Widget buildContent()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GenericSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GenericSection">
-							<rect x="11039.0" y="30.0" height="123.0" width="214.0" data-name="GenericSection"></rect>
-							<path d="M11039.0 61.0 L11253.0 61.0" fill="none" data-name="GenericSection"></path>
-							<path d="M11039.0 107.0 L11253.0 107.0" fill="none" data-name="GenericSection"></path>
-						</g>
-						<g transform="translate(11039, 30)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GenericSection">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="GenericSection">GenericSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11039, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GenericSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GenericSection">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GenericSection">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11039, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GenericSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GenericSection">+Widget buildContent()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GenericSection">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="11140.3" y="351.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(11140.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DisclaimerSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisclaimerSection">
-							<rect x="11879.8" y="336.0" height="62.0" width="198.0" data-name="DisclaimerSection"></rect>
-							<path d="M11879.8 367.0 L12077.8 367.0" fill="none" data-name="DisclaimerSection"></path>
-						</g>
-						<g transform="translate(11879.75, 336)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisclaimerSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisclaimerSection">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisclaimerSection">DisclaimerSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11879.75, 367)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisclaimerSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisclaimerSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisclaimerSection">+Widget buildContent()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegendWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendWidget">
-							<rect x="9523.8" y="37.5" height="108.0" width="136.0" data-name="LegendWidget"></rect>
-							<path d="M9523.8 68.5 L9659.8 68.5" fill="none" data-name="LegendWidget"></path>
-							<path d="M9523.8 114.5 L9659.8 114.5" fill="none" data-name="LegendWidget"></path>
-						</g>
-						<g transform="translate(9523.75, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendWidget">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="LegendWidget">LegendWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9523.75, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LegendWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9523.75, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegendsListWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendsListWidget">
-							<rect x="7785.5" y="45.0" height="93.0" width="207.0" data-name="LegendsListWidget"></rect>
-							<path d="M7785.5 76.0 L7992.5 76.0" fill="none" data-name="LegendsListWidget"></path>
-							<path d="M7785.5 107.0 L7992.5 107.0" fill="none" data-name="LegendsListWidget"></path>
-						</g>
-						<g transform="translate(7785.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendsListWidget">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LegendsListWidget">LegendsListWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7785.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+legends: List&lt;Legend&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7785.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Legend">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Legend">
-							<rect x="8590.5" y="53.0" height="77.0" width="126.0" data-name="Legend"></rect>
-							<path d="M8590.5 84.0 L8716.5 84.0" fill="none" data-name="Legend"></path>
-						</g>
-						<g transform="translate(8590.5, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Legend">
-								<text x="55.0" y="13.5" stroke="none" text-anchor="middle" data-name="Legend">Legend</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8590.5, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Legend">
-								<text x="0.0" y="13.5" stroke="none" data-name="Legend">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Legend">+color: Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceDetailsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceDetailsScreen">
-							<rect x="4605.0" y="37.5" height="108.0" width="409.0" data-name="PerformanceDetailsScreen"></rect>
-							<path d="M4605.0 68.5 L5014.0 68.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-							<path d="M4605.0 99.5 L5014.0 99.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-						</g>
-						<g transform="translate(4605, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceDetailsScreen">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceDetailsScreen">PerformanceDetailsScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4605, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">+reportSubject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4605, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceDetailsScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPerformanceBar">
-							<rect x="8312.5" y="37.5" height="108.0" width="238.0" data-name="InterventionPerformanceBar"></rect>
-							<path d="M8312.5 68.5 L8550.5 68.5" fill="none" data-name="InterventionPerformanceBar"></path>
-							<path d="M8312.5 114.5 L8550.5 114.5" fill="none" data-name="InterventionPerformanceBar"></path>
-						</g>
-						<g transform="translate(8312.5, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPerformanceBar">
-								<text x="111.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPerformanceBar">InterventionPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8312.5, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8312.5, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention">
-							<rect x="8789.8" y="351.5" height="31.0" width="110.0" data-name="Intervention"></rect>
-						</g>
-						<g transform="translate(8789.75, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention">Intervention</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ObservationPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ObservationPerformanceBar">
-							<rect x="8032.5" y="37.5" height="108.0" width="240.0" data-name="ObservationPerformanceBar"></rect>
-							<path d="M8032.5 68.5 L8272.5 68.5" fill="none" data-name="ObservationPerformanceBar"></path>
-							<path d="M8032.5 114.5 L8272.5 114.5" fill="none" data-name="ObservationPerformanceBar"></path>
-						</g>
-						<g transform="translate(8032.5, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ObservationPerformanceBar">
-								<text x="112.0" y="13.5" stroke="none" text-anchor="middle" data-name="ObservationPerformanceBar">ObservationPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8032.5, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+observation: Observation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ObservationPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8032.5, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Observation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Observation">
-							<rect x="7383.3" y="351.5" height="31.0" width="112.0" data-name="Observation"></rect>
-						</g>
-						<g transform="translate(7383.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Observation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Observation">
-								<text x="48.0" y="13.5" stroke="none" text-anchor="middle" data-name="Observation">Observation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceBar">
-							<rect x="11982.0" y="30.0" height="123.0" width="144.0" data-name="PerformanceBar"></rect>
-							<path d="M11982.0 61.0 L12126.0 61.0" fill="none" data-name="PerformanceBar"></path>
-							<path d="M11982.0 122.0 L12126.0 122.0" fill="none" data-name="PerformanceBar"></path>
-						</g>
-						<g transform="translate(11982, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceBar">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceBar">PerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11982, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+task: Task</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceBar">+completed: int</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PerformanceBar">+total: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11982, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Task">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Task">
-							<rect x="12690.5" y="351.5" height="31.0" width="54.0" data-name="Task"></rect>
-						</g>
-						<g transform="translate(12690.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Task">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Task">
-								<text x="19.0" y="13.5" stroke="none" text-anchor="middle" data-name="Task">Task</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceSection">
-							<rect x="11515.8" y="298.0" height="138.0" width="324.0" data-name="PerformanceSection"></rect>
-							<path d="M11515.8 329.0 L11839.8 329.0" fill="none" data-name="PerformanceSection"></path>
-							<path d="M11515.8 375.0 L11839.8 375.0" fill="none" data-name="PerformanceSection"></path>
-						</g>
-						<g transform="translate(11515.75, 298)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceSection">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceSection">PerformanceSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11515.75, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+minimumRatio: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+maximum: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11515.75, 375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+Widget buildContent()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+String getPowerLevelDescription()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PerformanceSection">+int getCountableObservationAmount()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionContainer">
-							<rect x="10221.8" y="0.0" height="183.0" width="319.0" data-name="ReportSectionContainer"></rect>
-							<path d="M10221.8 31.0 L10540.8 31.0" fill="none" data-name="ReportSectionContainer"></path>
-							<path d="M10221.8 107.0 L10540.8 107.0" fill="none" data-name="ReportSectionContainer"></path>
-						</g>
-						<g transform="translate(10221.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionContainer">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionContainer">ReportSectionContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10221.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionContainer">+section: ReportSection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionContainer">+subject: StudySubject</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionContainer">+primary: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionContainer">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10221.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionContainer">+ReportSectionWidget buildContents()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionContainer">+dynamic ()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionContainer">+List&lt;Widget&gt; buildPrimaryHeader()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionContainer">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="10972.3" y="351.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(10972.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Settings">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Settings">
-							<rect x="9699.8" y="76.0" height="31.0" width="80.0" data-name="Settings"></rect>
-						</g>
-						<g transform="translate(9699.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Settings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Settings">
-								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="Settings">Settings</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OptOutAlertDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OptOutAlertDialog">
-							<rect x="4358.0" y="45.0" height="93.0" width="207.0" data-name="OptOutAlertDialog"></rect>
-							<path d="M4358.0 76.0 L4565.0 76.0" fill="none" data-name="OptOutAlertDialog"></path>
-							<path d="M4358.0 107.0 L4565.0 107.0" fill="none" data-name="OptOutAlertDialog"></path>
-						</g>
-						<g transform="translate(4358, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptOutAlertDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptOutAlertDialog">OptOutAlertDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4358, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptOutAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptOutAlertDialog">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4358, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptOutAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptOutAlertDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DeleteAlertDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DeleteAlertDialog">
-							<rect x="4111.0" y="45.0" height="93.0" width="207.0" data-name="DeleteAlertDialog"></rect>
-							<path d="M4111.0 76.0 L4318.0 76.0" fill="none" data-name="DeleteAlertDialog"></path>
-							<path d="M4111.0 107.0 L4318.0 107.0" fill="none" data-name="DeleteAlertDialog"></path>
-						</g>
-						<g transform="translate(4111, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DeleteAlertDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="DeleteAlertDialog">DeleteAlertDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4111, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DeleteAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="DeleteAlertDialog">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4111, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DeleteAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="DeleteAlertDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskBox">
-							<rect x="12776.3" y="45.5" height="92.0" width="292.0" data-name="TaskBox"></rect>
-							<path d="M12776.3 76.5 L13068.3 76.5" fill="none" data-name="TaskBox"></path>
-						</g>
-						<g transform="translate(12776.25, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskBox">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskBox">TaskBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12776.25, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskBox">+taskInstance: TaskInstance</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskBox">+icon: Icon</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskBox">+onCompleted: dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskInstance">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskInstance">
-							<rect x="12991.5" y="351.5" height="31.0" width="122.0" data-name="TaskInstance"></rect>
-						</g>
-						<g transform="translate(12991.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskInstance">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskInstance">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskInstance">TaskInstance</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Icon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Icon">
-							<rect x="13365.8" y="351.5" height="31.0" width="50.0" data-name="Icon"></rect>
-						</g>
-						<g transform="translate(13365.75, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Icon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Icon">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Icon">Icon</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="12784.5" y="351.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(12784.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ProgressRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ProgressRow">
-							<rect x="2604.0" y="60.5" height="62.0" width="207.0" data-name="ProgressRow"></rect>
-							<path d="M2604.0 91.5 L2811.0 91.5" fill="none" data-name="ProgressRow"></path>
-						</g>
-						<g transform="translate(2604, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProgressRow">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProgressRow">ProgressRow</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2604, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ProgressRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="ProgressRow">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionSegment">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSegment">
-							<rect x="11671.0" y="0.0" height="183.0" width="271.0" data-name="InterventionSegment"></rect>
-							<path d="M11671.0 31.0 L11942.0 31.0" fill="none" data-name="InterventionSegment"></path>
-							<path d="M11671.0 137.0 L11942.0 137.0" fill="none" data-name="InterventionSegment"></path>
-						</g>
-						<g transform="translate(11671, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSegment">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSegment">InterventionSegment</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11671, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+percentCompleted: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionSegment">+percentMissed: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionSegment">+isCurrent: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionSegment">+isFuture: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionSegment">+phaseDuration: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11671, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+List&lt;Widget&gt; buildSeparators()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskOverview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskOverview">
-							<rect x="2243.0" y="45.5" height="92.0" width="321.0" data-name="TaskOverview"></rect>
-							<path d="M2243.0 76.5 L2564.0 76.5" fill="none" data-name="TaskOverview"></path>
-						</g>
-						<g transform="translate(2243, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskOverview">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskOverview">TaskOverview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2243, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskOverview">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskOverview">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskOverview">+scheduleToday: List&lt;TaskInstance&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskOverview">+interventionIcon: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactScreen">
-							<rect x="11498.0" y="76.0" height="31.0" width="133.0" data-name="ContactScreen"></rect>
-						</g>
-						<g transform="translate(11498, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactScreen">
-								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactScreen">ContactScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactWidget">
-							<rect x="11293.0" y="22.5" height="138.0" width="165.0" data-name="ContactWidget"></rect>
-							<path d="M11293.0 53.5 L11458.0 53.5" fill="none" data-name="ContactWidget"></path>
-							<path d="M11293.0 129.5 L11458.0 129.5" fill="none" data-name="ContactWidget"></path>
-						</g>
-						<g transform="translate(11293, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactWidget">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactWidget">ContactWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11293, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+contact: Contact?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactWidget">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactWidget">+subtitle: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11293, 129.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Contact">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Contact">
-							<rect x="12482.5" y="351.5" height="31.0" width="77.0" data-name="Contact"></rect>
-						</g>
-						<g transform="translate(12482.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Contact">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Contact">
-								<text x="30.5" y="13.5" stroke="none" text-anchor="middle" data-name="Contact">Contact</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItem">
-							<rect x="7522.5" y="7.5" height="168.0" width="223.0" data-name="ContactItem"></rect>
-							<path d="M7522.5 38.5 L7745.5 38.5" fill="none" data-name="ContactItem"></path>
-							<path d="M7522.5 129.5 L7745.5 129.5" fill="none" data-name="ContactItem"></path>
-						</g>
-						<g transform="translate(7522.5, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItem">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItem">ContactItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7522.5, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+iconData: IconData</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+itemName: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItem">+itemValue: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItem">+type: ContactItemType?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItem">+iconColor: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7522.5, 129.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+dynamic launchContact()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItemType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItemType">
-							<rect x="9566.3" y="306.0" height="122.0" width="332.0" data-name="ContactItemType"></rect>
-							<path d="M9566.3 337.0 L9898.3 337.0" fill="none" data-name="ContactItemType"></path>
-						</g>
-						<g transform="translate(9566.25, 306)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItemType">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItemType">ContactItemType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9566.25, 337)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItemType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItemType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+values: List&lt;ContactItemType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+website: ContactItemType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+email: ContactItemType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+phone: ContactItemType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="13307.3" y="76.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(13307.25, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FAQ">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FAQ">
-							<rect x="12600.3" y="60.5" height="62.0" width="136.0" data-name="FAQ"></rect>
-							<path d="M12600.3 91.5 L12736.3 91.5" fill="none" data-name="FAQ"></path>
-						</g>
-						<g transform="translate(12600.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FAQ">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="FAQ">FAQ</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12600.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FAQ">
-								<text x="0.0" y="13.5" stroke="none" data-name="FAQ">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Entry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Entry">
-							<rect x="13674.3" y="328.5" height="77.0" width="188.0" data-name="Entry"></rect>
-							<path d="M13674.3 359.5 L13862.3 359.5" fill="none" data-name="Entry"></path>
-						</g>
-						<g transform="translate(13674.25, 328.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Entry">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="Entry">Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13674.25, 359.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Entry">
-								<text x="0.0" y="13.5" stroke="none" data-name="Entry">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Entry">+children: List&lt;Entry&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EntryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EntryItem">
-							<rect x="13678.8" y="37.5" height="108.0" width="179.0" data-name="EntryItem"></rect>
-							<path d="M13678.8 68.5 L13857.8 68.5" fill="none" data-name="EntryItem"></path>
-							<path d="M13678.8 99.5 L13857.8 99.5" fill="none" data-name="EntryItem"></path>
-						</g>
-						<g transform="translate(13678.75, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EntryItem">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="EntryItem">EntryItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13678.75, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">+entry: Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13678.75, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">-Widget _buildTiles()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EntryItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="13108.3" y="60.5" height="62.0" width="159.0" data-name="DashboardScreen"></rect>
-							<path d="M13108.3 91.5 L13267.3 91.5" fill="none" data-name="DashboardScreen"></path>
-						</g>
-						<g transform="translate(13108.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="71.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13108.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+error: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OverflowMenuItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OverflowMenuItem">
-							<rect x="9236.8" y="38.0" height="107.0" width="247.0" data-name="OverflowMenuItem"></rect>
-							<path d="M9236.8 69.0 L9483.8 69.0" fill="none" data-name="OverflowMenuItem"></path>
-						</g>
-						<g transform="translate(9236.75, 38)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OverflowMenuItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OverflowMenuItem">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="OverflowMenuItem">OverflowMenuItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9236.75, 69)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OverflowMenuItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OverflowMenuItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="OverflowMenuItem">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OverflowMenuItem">+icon: IconData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="OverflowMenuItem">+routeName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="OverflowMenuItem">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="8301.3" y="351.5" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
-						</g>
-						<g transform="translate(8301.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
-								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFinishedPlaceholder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFinishedPlaceholder">
-							<rect x="13897.8" y="45.0" height="93.0" width="222.0" data-name="StudyFinishedPlaceholder"></rect>
-							<path d="M13897.8 76.0 L14119.8 76.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
-							<path d="M13897.8 107.0 L14119.8 107.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
-						</g>
-						<g transform="translate(13897.75, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFinishedPlaceholder">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFinishedPlaceholder">StudyFinishedPlaceholder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13897.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">&lt;static&gt;+space: SizedBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13897.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SizedBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SizedBox">
-							<rect x="13963.8" y="351.5" height="31.0" width="90.0" data-name="SizedBox"></rect>
-						</g>
-						<g transform="translate(13963.75, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SizedBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SizedBox">
-								<text x="37.0" y="13.5" stroke="none" text-anchor="middle" data-name="SizedBox">SizedBox</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTaskWidget">
-							<rect x="14187.8" y="53.0" height="77.0" width="313.0" data-name="QuestionnaireTaskWidget"></rect>
-							<path d="M14187.8 84.0 L14500.8 84.0" fill="none" data-name="QuestionnaireTaskWidget"></path>
-						</g>
-						<g transform="translate(14187.75, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTaskWidget">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTaskWidget">QuestionnaireTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14187.75, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireTaskWidget">+task: QuestionnaireTask</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireTaskWidget">+completionPeriod: CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTask">
-							<rect x="14445.8" y="351.5" height="31.0" width="165.0" data-name="QuestionnaireTask"></rect>
-						</g>
-						<g transform="translate(14445.75, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTask">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTask">QuestionnaireTask</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CompletionPeriod">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CompletionPeriod">
-							<rect x="14248.0" y="351.5" height="31.0" width="156.0" data-name="CompletionPeriod"></rect>
-						</g>
-						<g transform="translate(14248, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CompletionPeriod">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CompletionPeriod">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="CompletionPeriod">CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskScreen">
-							<rect x="12183.3" y="45.0" height="93.0" width="377.0" data-name="TaskScreen"></rect>
-							<path d="M12183.3 76.0 L12560.3 76.0" fill="none" data-name="TaskScreen"></path>
-							<path d="M12183.3 107.0 L12560.3 107.0" fill="none" data-name="TaskScreen"></path>
-						</g>
-						<g transform="translate(12183.25, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskScreen">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskScreen">TaskScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12183.25, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">+taskInstance: TaskInstance</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12183.25, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">&lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CheckmarkTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTaskWidget">
-							<rect x="14540.8" y="53.0" height="77.0" width="323.0" data-name="CheckmarkTaskWidget"></rect>
-							<path d="M14540.8 84.0 L14863.8 84.0" fill="none" data-name="CheckmarkTaskWidget"></path>
-						</g>
-						<g transform="translate(14540.75, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTaskWidget">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTaskWidget">CheckmarkTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14540.75, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CheckmarkTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="CheckmarkTaskWidget">+task: CheckmarkTask?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CheckmarkTaskWidget">+completionPeriod: CompletionPeriod?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CheckmarkTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTask">
-							<rect x="14650.8" y="351.5" height="31.0" width="143.0" data-name="CheckmarkTask"></rect>
-						</g>
-						<g transform="translate(14650.75, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTask">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTask">CheckmarkTask</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/uml.svg b/docs/uml/app/lib/screens/uml.svg
deleted file mode 100644
index 7e5967908..000000000
--- a/docs/uml/app/lib/screens/uml.svg
+++ /dev/null
@@ -1,2660 +0,0 @@
-<svg version="1.1" baseProfile="full" width="17674.5" height="788.0" viewbox="0 0 17674.5 788" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[ConsentScreen
-	]
-	
-	[ConsentCard
-	  |
-	  +consent: ConsentItem?;
-	  +index: int?;
-	  +onTapped: dynamic Function(int);
-	  +isChecked: bool?
-	  |
-	  +Widget build()
-	]
-	
-	[ConsentCard]o-[ConsentItem]
-	[ConsentCard]o-[dynamic Function(int)]
-	
-	[ConsentElement
-	  |
-	  +title: String;
-	  +descriptionText: String;
-	  +acknowledgmentText: String;
-	  +icon: IconData
-	]
-	
-	[ConsentElement]o-[IconData]
-	
-	[StudyOverviewScreen
-	]
-	
-	[_StudyOverviewScreen
-	  |
-	  +study: Study?
-	  |
-	  +dynamic navigateToJourney();
-	  +dynamic navigateToEligibilityCheck();
-	  +Widget build()
-	]
-	
-	[_StudyOverviewScreen]o-[Study]
-	
-	[StudyDetailsView
-	  |
-	  +study: Study?;
-	  +iconSize: double
-	  |
-	  +Widget build()
-	]
-	
-	[StudyDetailsView]o-[Study]
-	
-	[KickoffScreen
-	]
-	
-	[_KickoffScreen
-	  |
-	  +subject: StudySubject?;
-	  +ready: bool
-	  |
-	  -dynamic _storeUserStudy();
-	  -Widget _constructStatusIcon();
-	  -String _getStatusText();
-	  +Widget build()
-	]
-	
-	[_KickoffScreen]o-[StudySubject]
-	
-	[EligibilityResult
-	  |
-	  +eligible: bool;
-	  +firstFailed: EligibilityCriterion?
-	]
-	
-	[EligibilityResult]o-[EligibilityCriterion]
-	
-	[EligibilityScreen
-	  |
-	  +study: Study?
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;EligibilityResult&gt; routeFor()
-	]
-	
-	[EligibilityScreen]o-[Study]
-	
-	[OnboardingProgress
-	  |
-	  +stage: int;
-	  +progress: double
-	  |
-	  -double _getProgressForStage();
-	  +Widget build()
-	]
-	
-	[StudySelectionScreen
-	]
-	
-	[InviteCodeDialog
-	]
-	
-	[InterventionSelectionScreen
-	]
-	
-	[JourneyOverviewScreen
-	]
-	
-	[_JourneyOverviewScreen
-	  |
-	  +subject: StudySubject?
-	  |
-	  +dynamic getConsentAndNavigateToDashboard();
-	  +Widget build()
-	]
-	
-	[_JourneyOverviewScreen]o-[StudySubject]
-	
-	[Timeline
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[Timeline]o-[StudySubject]
-	
-	[InterventionTile
-	  |
-	  +title: String?;
-	  +iconName: String;
-	  +date: DateTime;
-	  +color: Color?;
-	  +isFirst: bool;
-	  +isLast: bool
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionTile]o-[Color]
-	
-	[IconIndicator
-	  |
-	  +iconName: String;
-	  +color: Color?
-	  |
-	  +Widget build()
-	]
-	
-	[IconIndicator]o-[Color]
-	
-	[TimelineChild
-	  |
-	  +child: Widget?
-	  |
-	  +Widget build()
-	]
-	
-	[TimelineChild]o-[&lt;abstract&gt;Widget]
-	
-	[AverageSectionWidget
-	  |
-	  +section: AverageSection;
-	  +titlePos: List&lt;int&gt;;
-	  +phasePos: List&lt;int&gt;
-	  |
-	  +Widget build();
-	  +Widget getLegend();
-	  +Widget getDiagram();
-	  +BarChartData getChartData();
-	  +Widget getTitles();
-	  +Widget getValues();
-	  +List&lt;BarChartGroupData&gt; getBarGroups();
-	  +FlGridData getGridData();
-	  +MaterialColor getColor();
-	  +int getDayIndex();
-	  +Iterable&lt;DiagramDatum&gt; getAggregatedData();
-	  +Map&lt;String, String?&gt; getInterventionNames()
-	]
-	
-	[AverageSectionWidget]o-[AverageSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[AverageSectionWidget]
-	
-	[DiagramDatum
-	  |
-	  +x: num;
-	  +value: num;
-	  +timestamp: DateTime?;
-	  +intervention: String
-	]
-	
-	[LinearRegressionSectionWidget
-	  |
-	  +section: LinearRegressionSection
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionWidget]o-[LinearRegressionSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[LinearRegressionSectionWidget]
-	
-	[ReportHistoryScreen
-	  |
-	  +Widget build()
-	]
-	
-	[ReportHistoryItem
-	  |
-	  +subject: StudySubject
-	  |
-	  +Widget build()
-	]
-	
-	[ReportHistoryItem]o-[StudySubject]
-	
-	[ReportDetailsScreen
-	  |
-	  +subject: StudySubject
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor();
-	  +Widget build()
-	]
-	
-	[ReportDetailsScreen]o-[StudySubject]
-	
-	[GeneralDetailsSection
-	  |
-	  +Widget buildContent()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[GeneralDetailsSection]
-	
-	[&lt;abstract&gt;GenericSection
-	  |
-	  +subject: StudySubject?;
-	  +onTap: void Function()?
-	  |
-	  +Widget buildContent();
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;GenericSection]o-[StudySubject]
-	[&lt;abstract&gt;GenericSection]o-[void Function()?]
-	
-	[DisclaimerSection
-	  |
-	  +Widget buildContent()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[DisclaimerSection]
-	
-	[&lt;abstract&gt;ReportSectionWidget
-	  |
-	  +subject: StudySubject
-	]
-	
-	[&lt;abstract&gt;ReportSectionWidget]o-[StudySubject]
-	
-	[LegendWidget
-	  |
-	  +name: String;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[LegendWidget]o-[Color]
-	
-	[LegendsListWidget
-	  |
-	  +legends: List&lt;Legend&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[Legend
-	  |
-	  +name: String;
-	  +color: Color
-	]
-	
-	[Legend]o-[Color]
-	
-	[PerformanceDetailsScreen
-	  |
-	  +reportSubject: StudySubject?
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor();
-	  +Widget build()
-	]
-	
-	[PerformanceDetailsScreen]o-[StudySubject]
-	
-	[InterventionPerformanceBar
-	  |
-	  +intervention: Intervention;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPerformanceBar]o-[Intervention]
-	[InterventionPerformanceBar]o-[StudySubject]
-	
-	[ObservationPerformanceBar
-	  |
-	  +observation: Observation;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[ObservationPerformanceBar]o-[&lt;abstract&gt;Observation]
-	[ObservationPerformanceBar]o-[StudySubject]
-	
-	[PerformanceBar
-	  |
-	  +task: Task;
-	  +completed: int;
-	  +total: int
-	  |
-	  +Widget build()
-	]
-	
-	[PerformanceBar]o-[&lt;abstract&gt;Task]
-	
-	[PerformanceSection
-	  |
-	  +minimumRatio: double;
-	  +maximum: double
-	  |
-	  +Widget buildContent();
-	  +String getPowerLevelDescription();
-	  +int getCountableObservationAmount()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[PerformanceSection]
-	
-	[PerformanceBar
-	  |
-	  +progress: double;
-	  +minimum: double?
-	  |
-	  +Widget build()
-	]
-	
-	[ReportSectionContainer
-	  |
-	  +section: ReportSection;
-	  +subject: StudySubject;
-	  +primary: bool;
-	  +onTap: void Function()?
-	  |
-	  +ReportSectionWidget buildContents();
-	  +dynamic ();
-	  +List&lt;Widget&gt; buildPrimaryHeader();
-	  +Widget build()
-	]
-	
-	[ReportSectionContainer]o-[&lt;abstract&gt;ReportSection]
-	[ReportSectionContainer]o-[StudySubject]
-	[ReportSectionContainer]o-[void Function()?]
-	
-	[Settings
-	]
-	
-	[OptOutAlertDialog
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[OptOutAlertDialog]o-[StudySubject]
-	
-	[DeleteAlertDialog
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[DeleteAlertDialog]o-[StudySubject]
-	
-	[TaskBox
-	  |
-	  +taskInstance: TaskInstance;
-	  +icon: Icon;
-	  +onCompleted: dynamic Function()
-	]
-	
-	[TaskBox]o-[TaskInstance]
-	[TaskBox]o-[Icon]
-	[TaskBox]o-[dynamic Function()]
-	
-	[ProgressRow
-	  |
-	  +subject: StudySubject?
-	]
-	
-	[ProgressRow]o-[StudySubject]
-	
-	[InterventionSegment
-	  |
-	  +intervention: Intervention;
-	  +percentCompleted: double;
-	  +percentMissed: double;
-	  +isCurrent: bool;
-	  +isFuture: bool;
-	  +phaseDuration: int
-	  |
-	  +List&lt;Widget&gt; buildSeparators();
-	  +Widget build()
-	]
-	
-	[InterventionSegment]o-[Intervention]
-	
-	[TaskOverview
-	  |
-	  +subject: StudySubject?;
-	  +scheduleToday: List&lt;TaskInstance&gt;?;
-	  +interventionIcon: String?
-	]
-	
-	[TaskOverview]o-[StudySubject]
-	
-	[ContactScreen
-	]
-	
-	[ContactWidget
-	  |
-	  +contact: Contact?;
-	  +title: String;
-	  +subtitle: String?;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[ContactWidget]o-[Contact]
-	[ContactWidget]o-[Color]
-	
-	[ContactItem
-	  |
-	  +iconData: IconData;
-	  +itemName: String;
-	  +itemValue: String?;
-	  +type: ContactItemType?;
-	  +iconColor: Color?
-	  |
-	  +dynamic launchContact();
-	  +Widget build()
-	]
-	
-	[ContactItem]o-[IconData]
-	[ContactItem]o-[ContactItemType]
-	[ContactItem]o-[Color]
-	
-	[ContactItemType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ContactItemType&gt;;
-	  &lt;static&gt;+website: ContactItemType;
-	  &lt;static&gt;+email: ContactItemType;
-	  &lt;static&gt;+phone: ContactItemType
-	]
-	
-	[ContactItemType]o-[ContactItemType]
-	[Enum]&lt;:--[ContactItemType]
-	
-	[FAQ
-	  |
-	  +Widget build()
-	]
-	
-	[Entry
-	  |
-	  +title: String;
-	  +children: List&lt;Entry&gt;
-	]
-	
-	[EntryItem
-	  |
-	  +entry: Entry
-	  |
-	  -Widget _buildTiles();
-	  +Widget build()
-	]
-	
-	[EntryItem]o-[Entry]
-	
-	[DashboardScreen
-	  |
-	  +error: String?
-	]
-	
-	[OverflowMenuItem
-	  |
-	  +name: String;
-	  +icon: IconData;
-	  +routeName: String?;
-	  +onTap: dynamic Function()?
-	]
-	
-	[OverflowMenuItem]o-[IconData]
-	[OverflowMenuItem]o-[dynamic Function()?]
-	
-	[StudyFinishedPlaceholder
-	  |
-	  &lt;static&gt;+space: SizedBox
-	  |
-	  +Widget build()
-	]
-	
-	[StudyFinishedPlaceholder]o-[SizedBox]
-	
-	[QuestionnaireTaskWidget
-	  |
-	  +task: QuestionnaireTask;
-	  +completionPeriod: CompletionPeriod
-	]
-	
-	[QuestionnaireTaskWidget]o-[QuestionnaireTask]
-	[QuestionnaireTaskWidget]o-[CompletionPeriod]
-	
-	[TaskScreen
-	  |
-	  +taskInstance: TaskInstance
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()
-	]
-	
-	[TaskScreen]o-[TaskInstance]
-	
-	[CheckmarkTaskWidget
-	  |
-	  +task: CheckmarkTask?;
-	  +completionPeriod: CompletionPeriod?
-	]
-	
-	[CheckmarkTaskWidget]o-[CheckmarkTask]
-	[CheckmarkTaskWidget]o-[CompletionPeriod]
-	
-	[AppOutdatedScreen
-	  |
-	  +Widget build()
-	]
-	
-	[TermsScreen
-	]
-	
-	[LegalSection
-	  |
-	  +title: String?;
-	  +description: String?;
-	  +icon: Icon?;
-	  +pdfUrl: String?;
-	  +pdfUrlLabel: String?;
-	  +acknowledgment: String?;
-	  +isChecked: bool?;
-	  +onChange: void Function(bool?)?
-	  |
-	  +Widget build()
-	]
-	
-	[LegalSection]o-[Icon]
-	[LegalSection]o-[void Function(bool?)?]
-	
-	[IFrameHelper
-	  |
-	  +void postRouteFinished();
-	  +void listen()
-	]
-	
-	[LoadingScreen
-	  |
-	  +sessionString: String?;
-	  +queryParameters: Map&lt;String, String&gt;?
-	]
-	
-	[AboutScreen
-	  |
-	  +Widget build()
-	]
-	
-	[Preview
-	  |
-	  +queryParameters: Map&lt;String, String&gt;?;
-	  +appLanguage: AppLanguage;
-	  +selectedRoute: String?;
-	  +extra: String?;
-	  +study: Study?;
-	  +selectedStudyObjectId: String?;
-	  +subject: StudySubject?
-	  |
-	  +bool hasRoute();
-	  +void handleQueries();
-	  +dynamic init();
-	  +dynamic handleAuthorization();
-	  +dynamic runCommands();
-	  +String? getSelectedRoute();
-	  +bool containsQuery();
-	  +bool containsQueryPair();
-	  +dynamic getStudySubject();
-	  -dynamic _createFakeSubject();
-	  +List&lt;String&gt; getInterventionIds()
-	]
-	
-	[Preview]o-[AppLanguage]
-	[Preview]o-[Study]
-	[Preview]o-[StudySubject]
-	
-	[WelcomeScreen
-	  |
-	  +Widget build()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="788.0" width="17674.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M364.8 252.1 L416.5 353 L416.5 501.5 L416.5 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M365.3 241.4 L364.8 252.1 L355.8 246.2 L356.3 235.5 Z"></path>
-					</g>
-					<path d="M277.2 252.1 L225.5 353 L225.5 501.5 L225.5 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M286.2 246.2 L277.2 252.1 L276.7 241.4 L285.7 235.5 Z"></path>
-					</g>
-					<path d="M628.5 238.7 L628.5 353 L4303 515.0812264658418 L4303.0 515.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M633.8 229.3 L628.5 238.7 L623.2 229.3 L628.5 220.0 Z"></path>
-					</g>
-					<path d="M2045.0 246.7 L2045 353 L1845.1135670731708 501.5 L1845.1 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2050.3 237.3 L2045.0 246.7 L2039.7 237.3 L2045.0 228.0 Z"></path>
-					</g>
-					<path d="M1603.5 239.2 L1603.5 353 L1803.3864329268292 501.5 L1803.4 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1608.8 229.8 L1603.5 239.2 L1598.2 229.8 L1603.5 220.5 Z"></path>
-					</g>
-					<path d="M7027.5 261.7 L7027.5 353 L7505.144817073171 501.5 L7505.1 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7032.8 252.3 L7027.5 261.7 L7022.2 252.3 L7027.5 243.0 Z"></path>
-					</g>
-					<path d="M7705.5 223.7 L7705.5 353 L8308.78125 501.5 L8308.8 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7710.8 214.3 L7705.5 223.7 L7700.2 214.3 L7705.5 205.0 Z"></path>
-					</g>
-					<path d="M1254.0 231.7 L1254 353 L1793.75 508.2284085927225 L1793.8 508.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1259.3 222.3 L1254.0 231.7 L1248.7 222.3 L1254.0 213.0 Z"></path>
-					</g>
-					<path d="M6653.0 239.2 L6653 353 L7495 506.09090909090907 L7495.0 506.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6658.3 229.8 L6653.0 239.2 L6647.7 229.8 L6653.0 220.5 Z"></path>
-					</g>
-					<path d="M5843.5 231.7 L5843.5 353 L7495 511.250657318142 L7495.0 511.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5848.8 222.3 L5843.5 231.7 L5838.2 222.3 L5843.5 213.0 Z"></path>
-					</g>
-					<path d="M11153.3 269.2 L11153.25 353 L9972.5 513.0686092167804 L9972.5 513.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11158.6 259.8 L11153.3 269.2 L11147.9 259.8 L11153.3 250.5 Z"></path>
-					</g>
-					<path d="M10952.3 239.2 L10952.25 353 L9972.5 512.2852540272614 L9972.5 512.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10957.6 229.8 L10952.3 239.2 L10946.9 229.8 L10952.3 220.5 Z"></path>
-					</g>
-					<path d="M11701.8 231.7 L11701.75 353 L12591 510.7042443903758 L12591.0 510.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11707.1 222.3 L11701.8 231.7 L11696.4 222.3 L11701.8 213.0 Z"></path>
-					</g>
-					<path d="M9677.5 679.7 L9677.5 681 L9677.5 701 L9677.5 701.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9682.8 670.3 L9677.5 679.7 L9672.2 670.3 L9677.5 661.0 Z"></path>
-					</g>
-					<path d="M10301.2 206.3 L10467.5 353 L9874.5 476.1037974683544 L9874.5 476.1 " fill="none"></path>
-					<path d="M10304.7 202.3 L10301.2 206.3 L10297.6 210.3 L10291.2 197.5 Z"></path>
-					<path d="M9294.5 582.2 L9294.5 681 L9294.5 701 L9294.5 701.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9299.8 572.8 L9294.5 582.2 L9289.2 572.8 L9294.5 563.5 Z"></path>
-					</g>
-					<path d="M10246.4 210.5 L10215.25 353 L9440.5 490.99511267988055 L9440.5 491.0 " fill="none"></path>
-					<path d="M10251.6 211.7 L10246.4 210.5 L10241.2 209.4 L10249.2 197.5 Z"></path>
-					<path d="M5601.5 231.7 L5601.5 353 L7495 511.9628871256719 L7495.0 512.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5606.8 222.3 L5601.5 231.7 L5596.2 222.3 L5601.5 213.0 Z"></path>
-					</g>
-					<path d="M5258.5 239.2 L5258.5 353 L7495 512.7152188112345 L7495.0 512.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5263.8 229.8 L5258.5 239.2 L5253.2 229.8 L5258.5 220.5 Z"></path>
-					</g>
-					<path d="M12267.1 237.6 L12379.25 353 L13386.25 502.32007233273055 L13386.3 502.3 " fill="none"></path>
-					<path d="M12270.9 233.8 L12267.1 237.6 L12263.2 241.3 L12257.8 228.0 Z"></path>
-					<path d="M12232.7 245.1 L12280.25 353 L7615 514.9175704989154 L7615.0 514.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12233.8 234.4 L12232.7 245.1 L12224.0 238.7 L12225.1 228.0 Z"></path>
-					</g>
-					<path d="M12216.1 246.2 L12240.25 353 L12383.543445121952 501.5 L12383.5 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12219.2 235.9 L12216.1 246.2 L12208.8 238.3 L12211.9 228.0 Z"></path>
-					</g>
-					<path d="M12198.9 241.3 L12200.25 353 L13066 500.1707696294377 L13066.0 500.2 " fill="none"></path>
-					<path d="M12204.2 241.3 L12198.9 241.3 L12193.6 241.4 L12198.7 228.0 Z"></path>
-					<path d="M10235.2 214.6 L10175.25 353 L7615 513.2446331456922 L7615.0 513.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10243.8 208.2 L10235.2 214.6 L10234.0 203.9 L10242.6 197.5 Z"></path>
-					</g>
-					<path d="M10763.8 239.2 L10763.75 353 L9972.5 511.20176775373363 L9972.5 511.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10769.1 229.8 L10763.8 239.2 L10758.4 229.8 L10763.8 220.5 Z"></path>
-					</g>
-					<path d="M10054.5 223.7 L10054.5 353 L9953.990853658537 501.5 L9954.0 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10059.8 214.3 L10054.5 223.7 L10049.2 214.3 L10054.5 205.0 Z"></path>
-					</g>
-					<path d="M4809.5 239.2 L4809.5 353 L7495 513.4159533782554 L7495.0 513.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4814.8 229.8 L4809.5 239.2 L4804.2 229.8 L4809.5 220.5 Z"></path>
-					</g>
-					<path d="M9867.0 237.3 L9923.5 353 L11577.25 511.7212874908559 L11577.3 511.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9867.7 226.5 L9867.0 237.3 L9858.1 231.2 L9858.8 220.5 Z"></path>
-					</g>
-					<path d="M9787.8 236.2 L9713 353 L7615 512.4402224281743 L7615.0 512.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9797.4 231.2 L9787.8 236.2 L9788.4 225.5 L9797.9 220.5 Z"></path>
-					</g>
-					<path d="M9598.2 236.2 L9673 353 L8985.75 504.6434577867474 L8985.8 504.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9597.6 225.5 L9598.2 236.2 L9588.6 231.2 L9588.1 220.5 Z"></path>
-					</g>
-					<path d="M9508.0 236.1 L9431.75 353 L7615 511.7568935660051 L7615.0 511.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9517.6 231.2 L9508.0 236.1 L9508.7 225.4 L9518.2 220.5 Z"></path>
-					</g>
-					<path d="M13106.0 246.7 L13106 353 L13872.5 511.41965973534974 L13872.5 511.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13111.3 237.3 L13106.0 246.7 L13100.7 237.3 L13106.0 228.0 Z"></path>
-					</g>
-					<path d="M12098.2 235.6 L11928.5 353 L12702 488.6002137894174 L12702.0 488.6 " fill="none"></path>
-					<path d="M12101.2 240.0 L12098.2 235.6 L12095.1 231.2 L12109.1 228.0 Z"></path>
-					<path d="M11499.1 273.9 L11547.5 353 L12158.704268292682 501.5 L12158.7 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11498.7 263.2 L11499.1 273.9 L11489.6 268.7 L11489.3 258.0 Z"></path>
-					</g>
-					<path d="M11429.9 276.7 L11427.5 353 L7615 514.4590058102001 L7615.0 514.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11435.5 267.5 L11429.9 276.7 L11424.8 267.2 L11430.4 258.0 Z"></path>
-					</g>
-					<path d="M11364.3 273.7 L11313.25 353 L12326.5 506.1195577055978 L12326.5 506.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11373.8 268.7 L11364.3 273.7 L11364.8 263.0 L11374.4 258.0 Z"></path>
-					</g>
-					<path d="M4461.5 231.7 L4461.5 353 L7495 513.8191368999516 L7495.0 513.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4466.8 222.3 L4461.5 231.7 L4456.2 222.3 L4461.5 213.0 Z"></path>
-					</g>
-					<path d="M4214.5 231.7 L4214.5 353 L7495 514.0543331836551 L7495.0 514.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4219.8 222.3 L4214.5 231.7 L4209.2 222.3 L4214.5 213.0 Z"></path>
-					</g>
-					<path d="M14185.8 229.4 L14244.25 353 L14299.484756097561 501.5 L14299.5 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14186.6 218.7 L14185.8 229.4 L14176.9 223.2 L14177.8 212.5 Z"></path>
-					</g>
-					<path d="M14105.7 226.8 L14000.5 353 L14630 510.73567608861725 L14630.0 510.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14115.8 223.1 L14105.7 226.8 L14107.6 216.3 L14117.6 212.5 Z"></path>
-					</g>
-					<path d="M14074.9 223.2 L13889.25 353 L14098.870426829268 501.5 L14098.9 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14085.6 222.2 L14074.9 223.2 L14079.5 213.5 L14090.2 212.5 Z"></path>
-					</g>
-					<path d="M2707.5 216.2 L2707.5 353 L7495 514.9700876740588 L7495.0 515.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2712.8 206.8 L2707.5 216.2 L2702.2 206.8 L2707.5 197.5 Z"></path>
-					</g>
-					<path d="M12858.5 276.7 L12858.5 353 L11687.25 509.6442405708461 L11687.3 509.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12863.8 267.3 L12858.5 276.7 L12853.2 267.3 L12858.5 258.0 Z"></path>
-					</g>
-					<path d="M2403.5 231.2 L2403.5 353 L7495 515.0898767349315 L7495.0 515.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2408.8 221.8 L2403.5 231.2 L2398.2 221.8 L2403.5 212.5 Z"></path>
-					</g>
-					<path d="M12650.2 251.6 L12709.5 353 L13664.5 510.6446904881731 L13664.5 510.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12650.1 240.9 L12650.2 251.6 L12640.9 246.2 L12640.8 235.5 Z"></path>
-					</g>
-					<path d="M12520.4 248.9 L12419.25 353 L9972.5 515.0789659699082 L9972.5 515.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12530.8 245.9 L12520.4 248.9 L12523.1 238.5 L12533.4 235.5 Z"></path>
-					</g>
-					<path d="M8768.9 268.8 L8787 353 L4390 515.3934241639455 L4390.0 515.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8772.2 258.5 L8768.9 268.8 L8761.8 260.7 L8765.0 250.5 Z"></path>
-					</g>
-					<path d="M8747.0 269.2 L8747 353 L10801 504.73693693693696 L10801.0 504.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8752.3 259.8 L8747.0 269.2 L8741.7 259.8 L8747.0 250.5 Z"></path>
-					</g>
-					<path d="M8617.4 198.4 L7989.5 353 L9914.5 514.5660184237462 L9914.5 514.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8627.7 201.4 L8617.4 198.4 L8625.2 191.0 L8635.5 194.0 Z"></path>
-					</g>
-					<path d="M11151.5 491.0 L11399.166666666666 456 L11465.708333333334 456 L11465.708333333334 456 L11532.25 517 L11532.25 517 L11465.708333333334 578 L11465.708333333334 578 L11399.166666666666 578 L11399.166666666666 578 L11133 540.4307751639028 L11133.0 540.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11141.5 487.0 L11151.5 491.0 L11143.0 497.5 L11133.0 493.6 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M14372.5 195.3 L14372.5 353 L11133 509.0058728527382 L11133.0 509.0 " fill="none"></path>
-					</g>
-					<path d="M14377.8 195.3 L14372.5 195.3 L14367.2 195.3 L14372.5 182.0 Z"></path>
-					<path d="M14841.0 239.2 L14841 353 L14903.55868902439 478.5 L14903.6 478.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14846.3 229.8 L14841.0 239.2 L14835.7 229.8 L14841.0 220.5 Z"></path>
-					</g>
-					<path d="M9315.1 235.6 L9391.75 353 L4390 515.5859967295971 L4390.0 515.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9314.5 224.9 L9315.1 235.6 L9305.6 230.7 L9304.9 220.0 Z"></path>
-					</g>
-					<path d="M9226.3 235.8 L9152.5 353 L8630.712652439024 501.5 L8630.7 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9235.8 230.7 L9226.3 235.8 L9226.8 225.1 L9236.3 220.0 Z"></path>
-					</g>
-					<path d="M15411.5 231.7 L15411.5 353 L15411.5 501.5 L15411.5 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15416.8 222.3 L15411.5 231.7 L15406.2 222.3 L15411.5 213.0 Z"></path>
-					</g>
-					<path d="M16219.0 211.4 L16607 353 L16715.884908536584 501.5 L16715.9 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16212.1 203.2 L16219.0 211.4 L16208.4 213.2 L16201.5 205.0 Z"></path>
-					</g>
-					<path d="M16027.0 215.9 L15835.25 353 L16089.465701219513 501.5 L16089.5 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16037.7 214.8 L16027.0 215.9 L16031.5 206.1 L16042.2 205.0 Z"></path>
-					</g>
-					<path d="M13582.5 231.7 L13582.5 353 L14244.25 503.15842269111033 L14244.3 503.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13587.8 222.3 L13582.5 231.7 L13577.2 222.3 L13582.5 213.0 Z"></path>
-					</g>
-					<path d="M17278.1 223.6 L17292 353 L17292 501.5 L17292.0 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17282.4 213.7 L17278.1 223.6 L17271.8 214.8 L17276.1 205.0 Z"></path>
-					</g>
-					<path d="M17137.0 210.8 L16704 353 L16171.573170731708 501.5 L16171.6 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17147.5 213.0 L17137.0 210.8 L17144.2 202.8 L17154.7 205.0 Z"></path>
-					</g>
-					<path d="M15194.0 280.9 L15243.5 353 L14680 510.03313508920985 L14680.0 510.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15193.1 270.2 L15194.0 280.9 L15184.3 276.2 L15183.4 265.5 Z"></path>
-					</g>
-					<path d="M15100.8 284.0 L15092.25 353 L15166.27362804878 501.5 L15166.3 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15107.3 275.4 L15100.8 284.0 L15096.7 274.1 L15103.2 265.5 Z"></path>
-					</g>
-					<path d="M7505.6 347.8 L7509.5 353 L8128.75 501.74697912852434 L8128.8 501.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7504.1 337.2 L7505.6 347.8 L7495.6 343.7 L7494.2 333.0 Z"></path>
-					</g>
-					<path d="M7301.1 350.6 L7300.25 353 L1854.75 516.0865595325055 L1854.8 516.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7309.3 343.6 L7301.1 350.6 L7299.2 340.0 L7307.4 333.0 Z"></path>
-					</g>
-					<path d="M7221.6 347.6 L7217.25 353 L7523.078506097561 501.5 L7523.1 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7231.6 343.6 L7221.6 347.6 L7223.3 336.9 L7233.3 333.0 Z"></path>
-					</g>
-					<g data-name="ConsentScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentScreen">
-							<rect x="0.0" y="151.0" height="31.0" width="138.0" data-name="ConsentScreen"></rect>
-						</g>
-						<g transform="translate(0, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentScreen">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentScreen">ConsentScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentCard">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentCard">
-							<rect x="178.0" y="97.5" height="138.0" width="286.0" data-name="ConsentCard"></rect>
-							<path d="M178.0 128.5 L464.0 128.5" fill="none" data-name="ConsentCard"></path>
-							<path d="M178.0 204.5 L464.0 204.5" fill="none" data-name="ConsentCard"></path>
-						</g>
-						<g transform="translate(178, 97.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentCard">
-								<text x="135.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentCard">ConsentCard</text>
-								
-							</g>
-						</g>
-						<g transform="translate(178, 128.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+consent: ConsentItem?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentCard">+index: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentCard">+onTapped: dynamic Function(int)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentCard">+isChecked: bool?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(178, 204.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItem">
-							<rect x="358.5" y="501.5" height="31.0" width="116.0" data-name="ConsentItem"></rect>
-						</g>
-						<g transform="translate(358.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItem">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItem">ConsentItem</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(int)">
-							<rect x="132.5" y="501.5" height="31.0" width="186.0" data-name="dynamic Function(int)"></rect>
-						</g>
-						<g transform="translate(132.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(int)">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(int)">dynamic Function(int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentElement">
-							<rect x="504.0" y="113.0" height="107.0" width="249.0" data-name="ConsentElement"></rect>
-							<path d="M504.0 144.0 L753.0 144.0" fill="none" data-name="ConsentElement"></path>
-						</g>
-						<g transform="translate(504, 113)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentElement">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentElement">ConsentElement</text>
-								
-							</g>
-						</g>
-						<g transform="translate(504, 144)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentElement">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentElement">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentElement">+descriptionText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentElement">+acknowledgmentText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentElement">+icon: IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="4303.0" y="501.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(4303, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyOverviewScreen">
-							<rect x="793.0" y="151.0" height="31.0" width="190.0" data-name="StudyOverviewScreen"></rect>
-						</g>
-						<g transform="translate(793, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyOverviewScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyOverviewScreen">StudyOverviewScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_StudyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_StudyOverviewScreen">
-							<rect x="1887.0" y="105.0" height="123.0" width="316.0" data-name="_StudyOverviewScreen"></rect>
-							<path d="M1887.0 136.0 L2203.0 136.0" fill="none" data-name="_StudyOverviewScreen"></path>
-							<path d="M1887.0 167.0 L2203.0 167.0" fill="none" data-name="_StudyOverviewScreen"></path>
-						</g>
-						<g transform="translate(1887, 105)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_StudyOverviewScreen">
-								<text x="150.0" y="13.5" stroke="none" text-anchor="middle" data-name="_StudyOverviewScreen">_StudyOverviewScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1887, 136)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+study: Study?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1887, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToJourney()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToEligibilityCheck()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="_StudyOverviewScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="1793.8" y="501.5" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(1793.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDetailsView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDetailsView">
-							<rect x="1525.0" y="112.5" height="108.0" width="157.0" data-name="StudyDetailsView"></rect>
-							<path d="M1525.0 143.5 L1682.0 143.5" fill="none" data-name="StudyDetailsView"></path>
-							<path d="M1525.0 189.5 L1682.0 189.5" fill="none" data-name="StudyDetailsView"></path>
-						</g>
-						<g transform="translate(1525, 112.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDetailsView">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDetailsView">StudyDetailsView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1525, 143.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+study: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDetailsView">+iconSize: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1525, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="KickoffScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="KickoffScreen">
-							<rect x="1722.0" y="151.0" height="31.0" width="125.0" data-name="KickoffScreen"></rect>
-						</g>
-						<g transform="translate(1722, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="KickoffScreen">
-								<text x="54.5" y="13.5" stroke="none" text-anchor="middle" data-name="KickoffScreen">KickoffScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_KickoffScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_KickoffScreen">
-							<rect x="6897.0" y="90.0" height="153.0" width="261.0" data-name="_KickoffScreen"></rect>
-							<path d="M6897.0 121.0 L7158.0 121.0" fill="none" data-name="_KickoffScreen"></path>
-							<path d="M6897.0 167.0 L7158.0 167.0" fill="none" data-name="_KickoffScreen"></path>
-						</g>
-						<g transform="translate(6897, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_KickoffScreen">
-								<text x="122.5" y="13.5" stroke="none" text-anchor="middle" data-name="_KickoffScreen">_KickoffScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6897, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">+ready: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6897, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">-dynamic _storeUserStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">-Widget _constructStatusIcon()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="_KickoffScreen">-String _getStatusText()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="_KickoffScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="7495.0" y="501.5" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(7495, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityResult">
-							<rect x="7576.0" y="128.0" height="77.0" width="259.0" data-name="EligibilityResult"></rect>
-							<path d="M7576.0 159.0 L7835.0 159.0" fill="none" data-name="EligibilityResult"></path>
-						</g>
-						<g transform="translate(7576, 128)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityResult">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityResult">EligibilityResult</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7576, 159)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityResult">+eligible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EligibilityResult">+firstFailed: EligibilityCriterion?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityCriterion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityCriterion">
-							<rect x="8295.8" y="501.5" height="31.0" width="152.0" data-name="EligibilityCriterion"></rect>
-						</g>
-						<g transform="translate(8295.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityCriterion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityCriterion">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityCriterion">EligibilityCriterion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityScreen">
-							<rect x="1023.0" y="120.0" height="93.0" width="462.0" data-name="EligibilityScreen"></rect>
-							<path d="M1023.0 151.0 L1485.0 151.0" fill="none" data-name="EligibilityScreen"></path>
-							<path d="M1023.0 182.0 L1485.0 182.0" fill="none" data-name="EligibilityScreen"></path>
-						</g>
-						<g transform="translate(1023, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityScreen">
-								<text x="223.0" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityScreen">EligibilityScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1023, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityScreen">+study: Study?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1023, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityScreen">&lt;static&gt;+MaterialPageRoute&lt;EligibilityResult&gt; routeFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OnboardingProgress">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OnboardingProgress">
-							<rect x="2851.0" y="105.0" height="123.0" width="271.0" data-name="OnboardingProgress"></rect>
-							<path d="M2851.0 136.0 L3122.0 136.0" fill="none" data-name="OnboardingProgress"></path>
-							<path d="M2851.0 182.0 L3122.0 182.0" fill="none" data-name="OnboardingProgress"></path>
-						</g>
-						<g transform="translate(2851, 105)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OnboardingProgress">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="OnboardingProgress">OnboardingProgress</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2851, 136)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
-								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">+stage: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+progress: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2851, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
-								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">-double _getProgressForStage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySelectionScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySelectionScreen">
-							<rect x="3162.0" y="151.0" height="31.0" width="190.0" data-name="StudySelectionScreen"></rect>
-						</g>
-						<g transform="translate(3162, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySelectionScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySelectionScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySelectionScreen">StudySelectionScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeDialog">
-							<rect x="3392.0" y="151.0" height="31.0" width="151.0" data-name="InviteCodeDialog"></rect>
-						</g>
-						<g transform="translate(3392, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeDialog">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeDialog">InviteCodeDialog</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionSelectionScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSelectionScreen">
-							<rect x="3583.0" y="151.0" height="31.0" width="239.0" data-name="InterventionSelectionScreen"></rect>
-						</g>
-						<g transform="translate(3583, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSelectionScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSelectionScreen">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSelectionScreen">InterventionSelectionScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="JourneyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JourneyOverviewScreen">
-							<rect x="3862.0" y="151.0" height="31.0" width="209.0" data-name="JourneyOverviewScreen"></rect>
-						</g>
-						<g transform="translate(3862, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JourneyOverviewScreen">
-								<text x="96.5" y="13.5" stroke="none" text-anchor="middle" data-name="JourneyOverviewScreen">JourneyOverviewScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_JourneyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_JourneyOverviewScreen">
-							<rect x="6449.0" y="112.5" height="108.0" width="408.0" data-name="_JourneyOverviewScreen"></rect>
-							<path d="M6449.0 143.5 L6857.0 143.5" fill="none" data-name="_JourneyOverviewScreen"></path>
-							<path d="M6449.0 174.5 L6857.0 174.5" fill="none" data-name="_JourneyOverviewScreen"></path>
-						</g>
-						<g transform="translate(6449, 112.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_JourneyOverviewScreen">
-								<text x="196.0" y="13.5" stroke="none" text-anchor="middle" data-name="_JourneyOverviewScreen">_JourneyOverviewScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6449, 143.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_JourneyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_JourneyOverviewScreen">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6449, 174.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_JourneyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_JourneyOverviewScreen">+dynamic getConsentAndNavigateToDashboard()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_JourneyOverviewScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Timeline">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Timeline">
-							<rect x="5740.0" y="120.0" height="93.0" width="207.0" data-name="Timeline"></rect>
-							<path d="M5740.0 151.0 L5947.0 151.0" fill="none" data-name="Timeline"></path>
-							<path d="M5740.0 182.0 L5947.0 182.0" fill="none" data-name="Timeline"></path>
-						</g>
-						<g transform="translate(5740, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timeline">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="Timeline">Timeline</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5740, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Timeline">
-								<text x="0.0" y="13.5" stroke="none" data-name="Timeline">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5740, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Timeline">
-								<text x="0.0" y="13.5" stroke="none" data-name="Timeline">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTile">
-							<rect x="11072.8" y="82.5" height="168.0" width="161.0" data-name="InterventionTile"></rect>
-							<path d="M11072.8 113.5 L11233.8 113.5" fill="none" data-name="InterventionTile"></path>
-							<path d="M11072.8 219.5 L11233.8 219.5" fill="none" data-name="InterventionTile"></path>
-						</g>
-						<g transform="translate(11072.75, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTile">
-								<text x="72.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTile">InterventionTile</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11072.75, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTile">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTile">+iconName: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTile">+date: DateTime</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTile">+color: Color?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTile">+isFirst: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTile">+isLast: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11072.75, 219.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTile">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="9914.5" y="501.5" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(9914.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconIndicator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconIndicator">
-							<rect x="10871.8" y="112.5" height="108.0" width="161.0" data-name="IconIndicator"></rect>
-							<path d="M10871.8 143.5 L11032.8 143.5" fill="none" data-name="IconIndicator"></path>
-							<path d="M10871.8 189.5 L11032.8 189.5" fill="none" data-name="IconIndicator"></path>
-						</g>
-						<g transform="translate(10871.75, 112.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconIndicator">
-								<text x="72.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconIndicator">IconIndicator</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10871.75, 143.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconIndicator">+iconName: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconIndicator">+color: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10871.75, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconIndicator">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TimelineChild">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimelineChild">
-							<rect x="11632.8" y="120.0" height="93.0" width="138.0" data-name="TimelineChild"></rect>
-							<path d="M11632.8 151.0 L11770.8 151.0" fill="none" data-name="TimelineChild"></path>
-							<path d="M11632.8 182.0 L11770.8 182.0" fill="none" data-name="TimelineChild"></path>
-						</g>
-						<g transform="translate(11632.75, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimelineChild">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="TimelineChild">TimelineChild</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11632.75, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimelineChild">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimelineChild">+child: Widget?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11632.75, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimelineChild">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimelineChild">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="12591.0" y="501.5" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(12591, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionWidget">
-							<rect x="9480.5" y="373.0" height="288.0" width="394.0" data-name="AverageSectionWidget"></rect>
-							<path d="M9480.5 404.0 L9874.5 404.0" fill="none" data-name="AverageSectionWidget"></path>
-							<path d="M9480.5 465.0 L9874.5 465.0" fill="none" data-name="AverageSectionWidget"></path>
-						</g>
-						<g transform="translate(9480.5, 373)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionWidget">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionWidget">AverageSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9480.5, 404)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+section: AverageSection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+titlePos: List&lt;int&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+phasePos: List&lt;int&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9480.5, 465)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+Widget getLegend()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+Widget getDiagram()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AverageSectionWidget">+BarChartData getChartData()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AverageSectionWidget">+Widget getTitles()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AverageSectionWidget">+Widget getValues()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AverageSectionWidget">+List&lt;BarChartGroupData&gt; getBarGroups()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AverageSectionWidget">+FlGridData getGridData()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AverageSectionWidget">+MaterialColor getColor()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AverageSectionWidget">+int getDayIndex()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AverageSectionWidget">+Iterable&lt;DiagramDatum&gt; getAggregatedData()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AverageSectionWidget">+Map&lt;String, String?&gt; getInterventionNames()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSection">
-							<rect x="9607.0" y="701.0" height="31.0" width="141.0" data-name="AverageSection"></rect>
-						</g>
-						<g transform="translate(9607, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSection">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSection">AverageSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionWidget">
-							<rect x="10157.5" y="135.5" height="62.0" width="197.0" data-name="ReportSectionWidget"></rect>
-							<path d="M10157.5 166.5 L10354.5 166.5" fill="none" data-name="ReportSectionWidget"></path>
-						</g>
-						<g transform="translate(10157.5, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionWidget">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionWidget">ReportSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10157.5, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionWidget">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DiagramDatum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DiagramDatum">
-							<rect x="5987.0" y="113.0" height="107.0" width="202.0" data-name="DiagramDatum"></rect>
-							<path d="M5987.0 144.0 L6189.0 144.0" fill="none" data-name="DiagramDatum"></path>
-						</g>
-						<g transform="translate(5987, 113)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DiagramDatum">
-								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="DiagramDatum">DiagramDatum</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5987, 144)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DiagramDatum">
-								<text x="0.0" y="13.5" stroke="none" data-name="DiagramDatum">+x: num</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DiagramDatum">+value: num</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DiagramDatum">+timestamp: DateTime?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DiagramDatum">+intervention: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionWidget">
-							<rect x="9148.5" y="470.5" height="93.0" width="292.0" data-name="LinearRegressionSectionWidget"></rect>
-							<path d="M9148.5 501.5 L9440.5 501.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-							<path d="M9148.5 532.5 L9440.5 532.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-						</g>
-						<g transform="translate(9148.5, 470.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionWidget">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionWidget">LinearRegressionSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9148.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+section: LinearRegressionSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9148.5, 532.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSection">
-							<rect x="9187.0" y="701.0" height="31.0" width="215.0" data-name="LinearRegressionSection"></rect>
-						</g>
-						<g transform="translate(9187, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSection">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSection">LinearRegressionSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportHistoryScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryScreen">
-							<rect x="6229.0" y="135.5" height="62.0" width="180.0" data-name="ReportHistoryScreen"></rect>
-							<path d="M6229.0 166.5 L6409.0 166.5" fill="none" data-name="ReportHistoryScreen"></path>
-						</g>
-						<g transform="translate(6229, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryScreen">ReportHistoryScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6229, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportHistoryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryItem">
-							<rect x="5503.0" y="120.0" height="93.0" width="197.0" data-name="ReportHistoryItem"></rect>
-							<path d="M5503.0 151.0 L5700.0 151.0" fill="none" data-name="ReportHistoryItem"></path>
-							<path d="M5503.0 182.0 L5700.0 182.0" fill="none" data-name="ReportHistoryItem"></path>
-						</g>
-						<g transform="translate(5503, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryItem">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryItem">ReportHistoryItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5503, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5503, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportDetailsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportDetailsScreen">
-							<rect x="5054.0" y="112.5" height="108.0" width="409.0" data-name="ReportDetailsScreen"></rect>
-							<path d="M5054.0 143.5 L5463.0 143.5" fill="none" data-name="ReportDetailsScreen"></path>
-							<path d="M5054.0 174.5 L5463.0 174.5" fill="none" data-name="ReportDetailsScreen"></path>
-						</g>
-						<g transform="translate(5054, 112.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportDetailsScreen">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportDetailsScreen">ReportDetailsScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5054, 143.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportDetailsScreen">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5054, 174.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportDetailsScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GeneralDetailsSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GeneralDetailsSection">
-							<rect x="13386.3" y="486.0" height="62.0" width="198.0" data-name="GeneralDetailsSection"></rect>
-							<path d="M13386.3 517.0 L13584.3 517.0" fill="none" data-name="GeneralDetailsSection"></path>
-						</g>
-						<g transform="translate(13386.25, 486)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GeneralDetailsSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GeneralDetailsSection">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="GeneralDetailsSection">GeneralDetailsSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13386.25, 517)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GeneralDetailsSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GeneralDetailsSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GeneralDetailsSection">+Widget buildContent()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GenericSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GenericSection">
-							<rect x="12091.0" y="105.0" height="123.0" width="214.0" data-name="GenericSection"></rect>
-							<path d="M12091.0 136.0 L12305.0 136.0" fill="none" data-name="GenericSection"></path>
-							<path d="M12091.0 182.0 L12305.0 182.0" fill="none" data-name="GenericSection"></path>
-						</g>
-						<g transform="translate(12091, 105)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GenericSection">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="GenericSection">GenericSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12091, 136)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GenericSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GenericSection">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GenericSection">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12091, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GenericSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GenericSection">+Widget buildContent()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GenericSection">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="12326.5" y="501.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(12326.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DisclaimerSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisclaimerSection">
-							<rect x="13066.0" y="486.0" height="62.0" width="198.0" data-name="DisclaimerSection"></rect>
-							<path d="M13066.0 517.0 L13264.0 517.0" fill="none" data-name="DisclaimerSection"></path>
-						</g>
-						<g transform="translate(13066, 486)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisclaimerSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisclaimerSection">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisclaimerSection">DisclaimerSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13066, 517)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisclaimerSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisclaimerSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisclaimerSection">+Widget buildContent()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegendWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendWidget">
-							<rect x="10695.8" y="112.5" height="108.0" width="136.0" data-name="LegendWidget"></rect>
-							<path d="M10695.8 143.5 L10831.8 143.5" fill="none" data-name="LegendWidget"></path>
-							<path d="M10695.8 189.5 L10831.8 189.5" fill="none" data-name="LegendWidget"></path>
-						</g>
-						<g transform="translate(10695.75, 112.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendWidget">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="LegendWidget">LegendWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10695.75, 143.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LegendWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10695.75, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegendsListWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendsListWidget">
-							<rect x="7875.0" y="120.0" height="93.0" width="207.0" data-name="LegendsListWidget"></rect>
-							<path d="M7875.0 151.0 L8082.0 151.0" fill="none" data-name="LegendsListWidget"></path>
-							<path d="M7875.0 182.0 L8082.0 182.0" fill="none" data-name="LegendsListWidget"></path>
-						</g>
-						<g transform="translate(7875, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendsListWidget">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LegendsListWidget">LegendsListWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7875, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+legends: List&lt;Legend&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7875, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Legend">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Legend">
-							<rect x="9991.5" y="128.0" height="77.0" width="126.0" data-name="Legend"></rect>
-							<path d="M9991.5 159.0 L10117.5 159.0" fill="none" data-name="Legend"></path>
-						</g>
-						<g transform="translate(9991.5, 128)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Legend">
-								<text x="55.0" y="13.5" stroke="none" text-anchor="middle" data-name="Legend">Legend</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9991.5, 159)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Legend">
-								<text x="0.0" y="13.5" stroke="none" data-name="Legend">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Legend">+color: Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceDetailsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceDetailsScreen">
-							<rect x="4605.0" y="112.5" height="108.0" width="409.0" data-name="PerformanceDetailsScreen"></rect>
-							<path d="M4605.0 143.5 L5014.0 143.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-							<path d="M4605.0 174.5 L5014.0 174.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-						</g>
-						<g transform="translate(4605, 112.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceDetailsScreen">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceDetailsScreen">PerformanceDetailsScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4605, 143.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">+reportSubject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4605, 174.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceDetailsScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPerformanceBar">
-							<rect x="9713.5" y="112.5" height="108.0" width="238.0" data-name="InterventionPerformanceBar"></rect>
-							<path d="M9713.5 143.5 L9951.5 143.5" fill="none" data-name="InterventionPerformanceBar"></path>
-							<path d="M9713.5 189.5 L9951.5 189.5" fill="none" data-name="InterventionPerformanceBar"></path>
-						</g>
-						<g transform="translate(9713.5, 112.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPerformanceBar">
-								<text x="111.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPerformanceBar">InterventionPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9713.5, 143.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9713.5, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention">
-							<rect x="11577.3" y="501.5" height="31.0" width="110.0" data-name="Intervention"></rect>
-						</g>
-						<g transform="translate(11577.25, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention">Intervention</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ObservationPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ObservationPerformanceBar">
-							<rect x="9433.5" y="112.5" height="108.0" width="240.0" data-name="ObservationPerformanceBar"></rect>
-							<path d="M9433.5 143.5 L9673.5 143.5" fill="none" data-name="ObservationPerformanceBar"></path>
-							<path d="M9433.5 189.5 L9673.5 189.5" fill="none" data-name="ObservationPerformanceBar"></path>
-						</g>
-						<g transform="translate(9433.5, 112.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ObservationPerformanceBar">
-								<text x="112.0" y="13.5" stroke="none" text-anchor="middle" data-name="ObservationPerformanceBar">ObservationPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9433.5, 143.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+observation: Observation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ObservationPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9433.5, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Observation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Observation">
-							<rect x="8873.8" y="501.5" height="31.0" width="112.0" data-name="Observation"></rect>
-						</g>
-						<g transform="translate(8873.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Observation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Observation">
-								<text x="48.0" y="13.5" stroke="none" text-anchor="middle" data-name="Observation">Observation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceBar">
-							<rect x="13034.0" y="105.0" height="123.0" width="144.0" data-name="PerformanceBar"></rect>
-							<path d="M13034.0 136.0 L13178.0 136.0" fill="none" data-name="PerformanceBar"></path>
-							<path d="M13034.0 197.0 L13178.0 197.0" fill="none" data-name="PerformanceBar"></path>
-						</g>
-						<g transform="translate(13034, 105)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceBar">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceBar">PerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13034, 136)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+task: Task</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceBar">+completed: int</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PerformanceBar">+total: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13034, 197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Task">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Task">
-							<rect x="13872.5" y="501.5" height="31.0" width="54.0" data-name="Task"></rect>
-						</g>
-						<g transform="translate(13872.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Task">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Task">
-								<text x="19.0" y="13.5" stroke="none" text-anchor="middle" data-name="Task">Task</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceSection">
-							<rect x="12702.0" y="448.0" height="138.0" width="324.0" data-name="PerformanceSection"></rect>
-							<path d="M12702.0 479.0 L13026.0 479.0" fill="none" data-name="PerformanceSection"></path>
-							<path d="M12702.0 525.0 L13026.0 525.0" fill="none" data-name="PerformanceSection"></path>
-						</g>
-						<g transform="translate(12702, 448)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceSection">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceSection">PerformanceSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12702, 479)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+minimumRatio: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+maximum: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12702, 525)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+Widget buildContent()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+String getPowerLevelDescription()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PerformanceSection">+int getCountableObservationAmount()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionContainer">
-							<rect x="11273.8" y="75.0" height="183.0" width="319.0" data-name="ReportSectionContainer"></rect>
-							<path d="M11273.8 106.0 L11592.8 106.0" fill="none" data-name="ReportSectionContainer"></path>
-							<path d="M11273.8 182.0 L11592.8 182.0" fill="none" data-name="ReportSectionContainer"></path>
-						</g>
-						<g transform="translate(11273.75, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionContainer">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionContainer">ReportSectionContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11273.75, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionContainer">+section: ReportSection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionContainer">+subject: StudySubject</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionContainer">+primary: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionContainer">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11273.75, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionContainer">+ReportSectionWidget buildContents()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionContainer">+dynamic ()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionContainer">+List&lt;Widget&gt; buildPrimaryHeader()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionContainer">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="12158.5" y="501.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(12158.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Settings">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Settings">
-							<rect x="10575.8" y="151.0" height="31.0" width="80.0" data-name="Settings"></rect>
-						</g>
-						<g transform="translate(10575.75, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Settings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Settings">
-								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="Settings">Settings</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OptOutAlertDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OptOutAlertDialog">
-							<rect x="4358.0" y="120.0" height="93.0" width="207.0" data-name="OptOutAlertDialog"></rect>
-							<path d="M4358.0 151.0 L4565.0 151.0" fill="none" data-name="OptOutAlertDialog"></path>
-							<path d="M4358.0 182.0 L4565.0 182.0" fill="none" data-name="OptOutAlertDialog"></path>
-						</g>
-						<g transform="translate(4358, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptOutAlertDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptOutAlertDialog">OptOutAlertDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4358, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptOutAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptOutAlertDialog">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4358, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptOutAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptOutAlertDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DeleteAlertDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DeleteAlertDialog">
-							<rect x="4111.0" y="120.0" height="93.0" width="207.0" data-name="DeleteAlertDialog"></rect>
-							<path d="M4111.0 151.0 L4318.0 151.0" fill="none" data-name="DeleteAlertDialog"></path>
-							<path d="M4111.0 182.0 L4318.0 182.0" fill="none" data-name="DeleteAlertDialog"></path>
-						</g>
-						<g transform="translate(4111, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DeleteAlertDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="DeleteAlertDialog">DeleteAlertDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4111, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DeleteAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="DeleteAlertDialog">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4111, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DeleteAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="DeleteAlertDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskBox">
-							<rect x="14010.0" y="120.5" height="92.0" width="292.0" data-name="TaskBox"></rect>
-							<path d="M14010.0 151.5 L14302.0 151.5" fill="none" data-name="TaskBox"></path>
-						</g>
-						<g transform="translate(14010, 120.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskBox">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskBox">TaskBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14010, 151.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskBox">+taskInstance: TaskInstance</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskBox">+icon: Icon</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskBox">+onCompleted: dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskInstance">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskInstance">
-							<rect x="14244.3" y="501.5" height="31.0" width="122.0" data-name="TaskInstance"></rect>
-						</g>
-						<g transform="translate(14244.25, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskInstance">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskInstance">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskInstance">TaskInstance</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Icon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Icon">
-							<rect x="14630.0" y="501.5" height="31.0" width="50.0" data-name="Icon"></rect>
-						</g>
-						<g transform="translate(14630, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Icon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Icon">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Icon">Icon</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="14037.3" y="501.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(14037.25, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ProgressRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ProgressRow">
-							<rect x="2604.0" y="135.5" height="62.0" width="207.0" data-name="ProgressRow"></rect>
-							<path d="M2604.0 166.5 L2811.0 166.5" fill="none" data-name="ProgressRow"></path>
-						</g>
-						<g transform="translate(2604, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProgressRow">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProgressRow">ProgressRow</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2604, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ProgressRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="ProgressRow">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionSegment">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSegment">
-							<rect x="12723.0" y="75.0" height="183.0" width="271.0" data-name="InterventionSegment"></rect>
-							<path d="M12723.0 106.0 L12994.0 106.0" fill="none" data-name="InterventionSegment"></path>
-							<path d="M12723.0 212.0 L12994.0 212.0" fill="none" data-name="InterventionSegment"></path>
-						</g>
-						<g transform="translate(12723, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSegment">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSegment">InterventionSegment</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12723, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+percentCompleted: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionSegment">+percentMissed: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionSegment">+isCurrent: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionSegment">+isFuture: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionSegment">+phaseDuration: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12723, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+List&lt;Widget&gt; buildSeparators()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskOverview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskOverview">
-							<rect x="2243.0" y="120.5" height="92.0" width="321.0" data-name="TaskOverview"></rect>
-							<path d="M2243.0 151.5 L2564.0 151.5" fill="none" data-name="TaskOverview"></path>
-						</g>
-						<g transform="translate(2243, 120.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskOverview">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskOverview">TaskOverview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2243, 151.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskOverview">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskOverview">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskOverview">+scheduleToday: List&lt;TaskInstance&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskOverview">+interventionIcon: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactScreen">
-							<rect x="12345.0" y="151.0" height="31.0" width="133.0" data-name="ContactScreen"></rect>
-						</g>
-						<g transform="translate(12345, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactScreen">
-								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactScreen">ContactScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactWidget">
-							<rect x="12518.0" y="97.5" height="138.0" width="165.0" data-name="ContactWidget"></rect>
-							<path d="M12518.0 128.5 L12683.0 128.5" fill="none" data-name="ContactWidget"></path>
-							<path d="M12518.0 204.5 L12683.0 204.5" fill="none" data-name="ContactWidget"></path>
-						</g>
-						<g transform="translate(12518, 97.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactWidget">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactWidget">ContactWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12518, 128.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+contact: Contact?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactWidget">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactWidget">+subtitle: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12518, 204.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Contact">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Contact">
-							<rect x="13664.5" y="501.5" height="31.0" width="77.0" data-name="Contact"></rect>
-						</g>
-						<g transform="translate(13664.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Contact">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Contact">
-								<text x="30.5" y="13.5" stroke="none" text-anchor="middle" data-name="Contact">Contact</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItem">
-							<rect x="8635.5" y="82.5" height="168.0" width="223.0" data-name="ContactItem"></rect>
-							<path d="M8635.5 113.5 L8858.5 113.5" fill="none" data-name="ContactItem"></path>
-							<path d="M8635.5 204.5 L8858.5 204.5" fill="none" data-name="ContactItem"></path>
-						</g>
-						<g transform="translate(8635.5, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItem">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItem">ContactItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8635.5, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+iconData: IconData</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+itemName: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItem">+itemValue: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItem">+type: ContactItemType?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItem">+iconColor: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8635.5, 204.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+dynamic launchContact()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItemType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItemType">
-							<rect x="10801.0" y="456.0" height="122.0" width="332.0" data-name="ContactItemType"></rect>
-							<path d="M10801.0 487.0 L11133.0 487.0" fill="none" data-name="ContactItemType"></path>
-						</g>
-						<g transform="translate(10801, 456)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItemType">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItemType">ContactItemType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10801, 487)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItemType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItemType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+values: List&lt;ContactItemType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+website: ContactItemType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+email: ContactItemType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+phone: ContactItemType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="14342.0" y="151.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(14342, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FAQ">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FAQ">
-							<rect x="13218.0" y="135.5" height="62.0" width="136.0" data-name="FAQ"></rect>
-							<path d="M13218.0 166.5 L13354.0 166.5" fill="none" data-name="FAQ"></path>
-						</g>
-						<g transform="translate(13218, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FAQ">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="FAQ">FAQ</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13218, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FAQ">
-								<text x="0.0" y="13.5" stroke="none" data-name="FAQ">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Entry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Entry">
-							<rect x="14828.8" y="478.5" height="77.0" width="188.0" data-name="Entry"></rect>
-							<path d="M14828.8 509.5 L15016.8 509.5" fill="none" data-name="Entry"></path>
-						</g>
-						<g transform="translate(14828.75, 478.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Entry">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="Entry">Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14828.75, 509.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Entry">
-								<text x="0.0" y="13.5" stroke="none" data-name="Entry">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Entry">+children: List&lt;Entry&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EntryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EntryItem">
-							<rect x="14751.5" y="112.5" height="108.0" width="179.0" data-name="EntryItem"></rect>
-							<path d="M14751.5 143.5 L14930.5 143.5" fill="none" data-name="EntryItem"></path>
-							<path d="M14751.5 174.5 L14930.5 174.5" fill="none" data-name="EntryItem"></path>
-						</g>
-						<g transform="translate(14751.5, 112.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EntryItem">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="EntryItem">EntryItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14751.5, 143.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">+entry: Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14751.5, 174.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">-Widget _buildTiles()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EntryItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="13811.0" y="135.5" height="62.0" width="159.0" data-name="DashboardScreen"></rect>
-							<path d="M13811.0 166.5 L13970.0 166.5" fill="none" data-name="DashboardScreen"></path>
-						</g>
-						<g transform="translate(13811, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="71.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13811, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+error: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OverflowMenuItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OverflowMenuItem">
-							<rect x="9146.5" y="113.0" height="107.0" width="247.0" data-name="OverflowMenuItem"></rect>
-							<path d="M9146.5 144.0 L9393.5 144.0" fill="none" data-name="OverflowMenuItem"></path>
-						</g>
-						<g transform="translate(9146.5, 113)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OverflowMenuItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OverflowMenuItem">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="OverflowMenuItem">OverflowMenuItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9146.5, 144)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OverflowMenuItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OverflowMenuItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="OverflowMenuItem">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OverflowMenuItem">+icon: IconData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="OverflowMenuItem">+routeName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="OverflowMenuItem">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="8487.8" y="501.5" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
-						</g>
-						<g transform="translate(8487.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
-								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFinishedPlaceholder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFinishedPlaceholder">
-							<rect x="15300.5" y="120.0" height="93.0" width="222.0" data-name="StudyFinishedPlaceholder"></rect>
-							<path d="M15300.5 151.0 L15522.5 151.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
-							<path d="M15300.5 182.0 L15522.5 182.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
-						</g>
-						<g transform="translate(15300.5, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFinishedPlaceholder">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFinishedPlaceholder">StudyFinishedPlaceholder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15300.5, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">&lt;static&gt;+space: SizedBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15300.5, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SizedBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SizedBox">
-							<rect x="15366.5" y="501.5" height="31.0" width="90.0" data-name="SizedBox"></rect>
-						</g>
-						<g transform="translate(15366.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SizedBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SizedBox">
-								<text x="37.0" y="13.5" stroke="none" text-anchor="middle" data-name="SizedBox">SizedBox</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTaskWidget">
-							<rect x="15939.5" y="128.0" height="77.0" width="313.0" data-name="QuestionnaireTaskWidget"></rect>
-							<path d="M15939.5 159.0 L16252.5 159.0" fill="none" data-name="QuestionnaireTaskWidget"></path>
-						</g>
-						<g transform="translate(15939.5, 128)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTaskWidget">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTaskWidget">QuestionnaireTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15939.5, 159)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireTaskWidget">+task: QuestionnaireTask</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireTaskWidget">+completionPeriod: CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTask">
-							<rect x="16644.8" y="501.5" height="31.0" width="165.0" data-name="QuestionnaireTask"></rect>
-						</g>
-						<g transform="translate(16644.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTask">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTask">QuestionnaireTask</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CompletionPeriod">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CompletionPeriod">
-							<rect x="16038.0" y="501.5" height="31.0" width="156.0" data-name="CompletionPeriod"></rect>
-						</g>
-						<g transform="translate(16038, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CompletionPeriod">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CompletionPeriod">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="CompletionPeriod">CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskScreen">
-							<rect x="13394.0" y="120.0" height="93.0" width="377.0" data-name="TaskScreen"></rect>
-							<path d="M13394.0 151.0 L13771.0 151.0" fill="none" data-name="TaskScreen"></path>
-							<path d="M13394.0 182.0 L13771.0 182.0" fill="none" data-name="TaskScreen"></path>
-						</g>
-						<g transform="translate(13394, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskScreen">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskScreen">TaskScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13394, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">+taskInstance: TaskInstance</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13394, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">&lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CheckmarkTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTaskWidget">
-							<rect x="17110.5" y="128.0" height="77.0" width="323.0" data-name="CheckmarkTaskWidget"></rect>
-							<path d="M17110.5 159.0 L17433.5 159.0" fill="none" data-name="CheckmarkTaskWidget"></path>
-						</g>
-						<g transform="translate(17110.5, 128)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTaskWidget">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTaskWidget">CheckmarkTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17110.5, 159)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CheckmarkTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="CheckmarkTaskWidget">+task: CheckmarkTask?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CheckmarkTaskWidget">+completionPeriod: CompletionPeriod?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CheckmarkTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTask">
-							<rect x="17220.5" y="501.5" height="31.0" width="143.0" data-name="CheckmarkTask"></rect>
-						</g>
-						<g transform="translate(17220.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTask">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTask">CheckmarkTask</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppOutdatedScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppOutdatedScreen">
-							<rect x="15562.5" y="135.5" height="62.0" width="176.0" data-name="AppOutdatedScreen"></rect>
-							<path d="M15562.5 166.5 L15738.5 166.5" fill="none" data-name="AppOutdatedScreen"></path>
-						</g>
-						<g transform="translate(15562.5, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppOutdatedScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppOutdatedScreen">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppOutdatedScreen">AppOutdatedScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15562.5, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppOutdatedScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppOutdatedScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppOutdatedScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TermsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TermsScreen">
-							<rect x="15778.5" y="151.0" height="31.0" width="121.0" data-name="TermsScreen"></rect>
-						</g>
-						<g transform="translate(15778.5, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TermsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TermsScreen">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="TermsScreen">TermsScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegalSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegalSection">
-							<rect x="14970.5" y="67.5" height="198.0" width="290.0" data-name="LegalSection"></rect>
-							<path d="M14970.5 98.5 L15260.5 98.5" fill="none" data-name="LegalSection"></path>
-							<path d="M14970.5 234.5 L15260.5 234.5" fill="none" data-name="LegalSection"></path>
-						</g>
-						<g transform="translate(14970.5, 67.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegalSection">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="LegalSection">LegalSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14970.5, 98.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegalSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegalSection">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LegalSection">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LegalSection">+icon: Icon?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="LegalSection">+pdfUrl: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="LegalSection">+pdfUrlLabel: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="LegalSection">+acknowledgment: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="LegalSection">+isChecked: bool?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="LegalSection">+onChange: void Function(bool?)?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14970.5, 234.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegalSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegalSection">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(bool?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(bool?)?">
-							<rect x="15080.0" y="501.5" height="31.0" width="188.0" data-name="void Function(bool?)?"></rect>
-						</g>
-						<g transform="translate(15080, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(bool?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(bool?)?">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(bool?)?">void Function(bool?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFrameHelper">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameHelper">
-							<rect x="16292.5" y="128.0" height="77.0" width="224.0" data-name="IFrameHelper"></rect>
-							<path d="M16292.5 159.0 L16516.5 159.0" fill="none" data-name="IFrameHelper"></path>
-						</g>
-						<g transform="translate(16292.5, 128)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameHelper">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameHelper">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameHelper">IFrameHelper</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16292.5, 159)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFrameHelper">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFrameHelper">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFrameHelper">+void postRouteFinished()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFrameHelper">+void listen()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LoadingScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoadingScreen">
-							<rect x="16556.5" y="128.0" height="77.0" width="338.0" data-name="LoadingScreen"></rect>
-							<path d="M16556.5 159.0 L16894.5 159.0" fill="none" data-name="LoadingScreen"></path>
-						</g>
-						<g transform="translate(16556.5, 128)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoadingScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoadingScreen">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="LoadingScreen">LoadingScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16556.5, 159)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoadingScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoadingScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoadingScreen">+sessionString: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LoadingScreen">+queryParameters: Map&lt;String, String&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AboutScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AboutScreen">
-							<rect x="16934.5" y="135.5" height="62.0" width="136.0" data-name="AboutScreen"></rect>
-							<path d="M16934.5 166.5 L17070.5 166.5" fill="none" data-name="AboutScreen"></path>
-						</g>
-						<g transform="translate(16934.5, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AboutScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AboutScreen">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="AboutScreen">AboutScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16934.5, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AboutScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AboutScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="AboutScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Preview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Preview">
-							<rect x="7198.0" y="0.0" height="333.0" width="338.0" data-name="Preview"></rect>
-							<path d="M7198.0 31.0 L7536.0 31.0" fill="none" data-name="Preview"></path>
-							<path d="M7198.0 152.0 L7536.0 152.0" fill="none" data-name="Preview"></path>
-						</g>
-						<g transform="translate(7198, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Preview">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="Preview">Preview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7198, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Preview">
-								<text x="0.0" y="13.5" stroke="none" data-name="Preview">+queryParameters: Map&lt;String, String&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Preview">+appLanguage: AppLanguage</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Preview">+selectedRoute: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Preview">+extra: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Preview">+study: Study?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Preview">+selectedStudyObjectId: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Preview">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7198, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Preview">
-								<text x="0.0" y="13.5" stroke="none" data-name="Preview">+bool hasRoute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Preview">+void handleQueries()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Preview">+dynamic init()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Preview">+dynamic handleAuthorization()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Preview">+dynamic runCommands()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Preview">+String? getSelectedRoute()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Preview">+bool containsQuery()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Preview">+bool containsQueryPair()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Preview">+dynamic getStudySubject()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Preview">-dynamic _createFakeSubject()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Preview">+List&lt;String&gt; getInterventionIds()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppLanguage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppLanguage">
-							<rect x="8128.8" y="501.5" height="31.0" width="127.0" data-name="AppLanguage"></rect>
-						</g>
-						<g transform="translate(8128.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppLanguage">
-								<text x="55.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppLanguage">AppLanguage</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WelcomeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WelcomeScreen">
-							<rect x="17473.5" y="135.5" height="62.0" width="145.0" data-name="WelcomeScreen"></rect>
-							<path d="M17473.5 166.5 L17618.5 166.5" fill="none" data-name="WelcomeScreen"></path>
-						</g>
-						<g transform="translate(17473.5, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WelcomeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WelcomeScreen">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="WelcomeScreen">WelcomeScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17473.5, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WelcomeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WelcomeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="WelcomeScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/widgets/questionnaire/questions/uml.svg b/docs/uml/app/lib/widgets/questionnaire/questions/uml.svg
deleted file mode 100644
index abe98c1f5..000000000
--- a/docs/uml/app/lib/widgets/questionnaire/questions/uml.svg
+++ /dev/null
@@ -1,363 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2956.5" height="336.0" viewbox="0 0 2956.5 336" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[ChoiceQuestionWidget
-	  |
-	  +question: ChoiceQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;);
-	  +multiSelectionText: String;
-	  +subtitle: String?
-	]
-	
-	[ChoiceQuestionWidget]o-[ChoiceQuestion]
-	[ChoiceQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ChoiceQuestionWidget]
-	
-	[&lt;abstract&gt;QuestionWidget
-	  |
-	  +subtitle: String?
-	]
-	
-	[AnnotatedScaleQuestionWidget
-	  |
-	  +question: AnnotatedScaleQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[AnnotatedScaleQuestionWidget]o-[AnnotatedScaleQuestion]
-	[AnnotatedScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[AnnotatedScaleQuestionWidget]
-	
-	[BooleanQuestionWidget
-	  |
-	  +question: BooleanQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[BooleanQuestionWidget]o-[BooleanQuestion]
-	[BooleanQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[BooleanQuestionWidget]
-	
-	[FreeTextQuestionWidget
-	  |
-	  +question: FreeTextQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[FreeTextQuestionWidget]o-[FreeTextQuestion]
-	[FreeTextQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[FreeTextQuestionWidget]
-	
-	[ScaleQuestionWidget
-	  |
-	  +question: ScaleQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[ScaleQuestionWidget]o-[ScaleQuestion]
-	[ScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ScaleQuestionWidget]
-	
-	[VisualAnalogueQuestionWidget
-	  |
-	  +question: VisualAnalogueQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[VisualAnalogueQuestionWidget]o-[VisualAnalogueQuestion]
-	[VisualAnalogueQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[VisualAnalogueQuestionWidget]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="336.0" width="2956.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M90.9 218.0 L71 229 L71 249 L71.0 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M101.7 218.2 L90.9 218.0 L96.5 208.8 L107.3 209.0 Z"></path>
-					</g>
-					<path d="M317.6 218.0 L337.5 229 L337.5 249 L337.5 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M312.0 208.8 L317.6 218.0 L306.8 218.2 L301.2 209.0 Z"></path>
-					</g>
-					<path d="M1285.7 34.8 L204.25 82 L204.25 102 L204.3 102.0 " fill="none"></path>
-					<path d="M1285.9 40.2 L1285.7 34.8 L1285.4 29.5 L1299.0 34.2 Z"></path>
-					<path d="M658.8 207.7 L639 229 L639 249 L639.0 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M669.1 204.5 L658.8 207.7 L661.2 197.2 L671.5 194.0 Z"></path>
-					</g>
-					<path d="M830.3 200.4 L908.75 229 L956.637323943662 249 L956.6 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M823.4 192.2 L830.3 200.4 L819.7 202.2 L812.8 194.0 Z"></path>
-					</g>
-					<path d="M1285.7 37.7 L707.25 82 L707.25 117 L707.3 117.0 " fill="none"></path>
-					<path d="M1286.1 43.0 L1285.7 37.7 L1285.3 32.4 L1299.0 36.7 Z"></path>
-					<path d="M1372.1 179.1 L1836.5 229 L1836.5 249 L1836.5 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1363.3 172.8 L1372.1 179.1 L1362.2 183.4 L1353.5 177.1 Z"></path>
-					</g>
-					<path d="M1028.0 200.3 L948.75 229 L974.1021126760563 249 L974.1 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1038.6 202.2 L1028.0 200.3 L1034.9 192.2 L1045.5 194.0 Z"></path>
-					</g>
-					<path d="M1286.0 51.1 L1152 82 L1152 117 L1152.0 117.0 " fill="none"></path>
-					<path d="M1287.2 56.3 L1286.0 51.1 L1284.8 45.9 L1299.0 48.2 Z"></path>
-					<path d="M1815.0 184.4 L2155.25 229 L2155.25 249 L2155.3 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1806.4 177.9 L1815.0 184.4 L1805.1 188.4 L1796.5 181.9 Z"></path>
-					</g>
-					<path d="M1388.3 197.7 L1235.25 229 L1099.193661971831 249 L1099.2 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1398.5 201.1 L1388.3 197.7 L1396.3 190.6 L1406.6 194.0 Z"></path>
-					</g>
-					<path d="M1461.0 51.1 L1595 82 L1595 117 L1595.0 117.0 " fill="none"></path>
-					<path d="M1462.2 45.9 L1461.0 51.1 L1459.8 56.3 L1448.0 48.2 Z"></path>
-					<path d="M2257.9 193.0 L2468.75 229 L2468.75 249 L2468.8 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2249.6 186.2 L2257.9 193.0 L2247.8 196.7 L2239.5 189.9 Z"></path>
-					</g>
-					<path d="M1818.0 184.3 L1476.75 229 L1154.25 252.70341614906832 L1154.3 252.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1827.9 188.4 L1818.0 184.3 L1826.6 177.8 L1836.5 181.9 Z"></path>
-					</g>
-					<path d="M1461.3 37.7 L2038 82 L2038 117 L2038.0 117.0 " fill="none"></path>
-					<path d="M1461.7 32.4 L1461.3 37.7 L1460.9 43.1 L1448.0 36.7 Z"></path>
-					<path d="M2663.9 198.2 L2795.5 229 L2795.5 249 L2795.5 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2656.0 190.9 L2663.9 198.2 L2653.6 201.3 L2645.7 194.0 Z"></path>
-					</g>
-					<path d="M2260.9 176.7 L1718.25 229 L1154.25 256.63561076604555 L1154.3 256.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2270.7 181.1 L2260.9 176.7 L2269.7 170.5 L2279.5 174.9 Z"></path>
-					</g>
-					<path d="M1461.3 35.0 L2481 82 L2481 117 L2481.0 117.0 " fill="none"></path>
-					<path d="M1461.6 29.7 L1461.3 35.0 L1461.1 40.4 L1448.0 34.4 Z"></path>
-					<g data-name="ChoiceQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionWidget">
-							<rect x="7.8" y="102.0" height="107.0" width="393.0" data-name="ChoiceQuestionWidget"></rect>
-							<path d="M7.8 133.0 L400.8 133.0" fill="none" data-name="ChoiceQuestionWidget"></path>
-						</g>
-						<g transform="translate(7.75, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionWidget">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionWidget">ChoiceQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7.75, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionWidget">+question: ChoiceQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionWidget">+multiSelectionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionWidget">+subtitle: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestion">
-							<rect x="0.0" y="249.0" height="31.0" width="142.0" data-name="ChoiceQuestion"></rect>
-						</g>
-						<g transform="translate(0, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestion">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestion">ChoiceQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-							<rect x="182.0" y="249.0" height="31.0" width="311.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)"></rect>
-						</g>
-						<g transform="translate(182, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-								<text x="147.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)">dynamic Function(Answer&lt;dynamic&gt;)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionWidget">
-							<rect x="1299.0" y="0.0" height="62.0" width="149.0" data-name="QuestionWidget"></rect>
-							<path d="M1299.0 31.0 L1448.0 31.0" fill="none" data-name="QuestionWidget"></path>
-						</g>
-						<g transform="translate(1299, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionWidget">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionWidget">QuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1299, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionWidget">+subtitle: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AnnotatedScaleQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestionWidget">
-							<rect x="505.8" y="117.0" height="77.0" width="403.0" data-name="AnnotatedScaleQuestionWidget"></rect>
-							<path d="M505.8 148.0 L908.8 148.0" fill="none" data-name="AnnotatedScaleQuestionWidget"></path>
-						</g>
-						<g transform="translate(505.75, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestionWidget">AnnotatedScaleQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(505.75, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AnnotatedScaleQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+question: AnnotatedScaleQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AnnotatedScaleQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestion">
-							<rect x="533.0" y="249.0" height="31.0" width="212.0" data-name="AnnotatedScaleQuestion"></rect>
-						</g>
-						<g transform="translate(533, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestion">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestion">AnnotatedScaleQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-							<rect x="833.3" y="249.0" height="31.0" width="321.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(833.25, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BooleanQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestionWidget">
-							<rect x="950.5" y="117.0" height="77.0" width="403.0" data-name="BooleanQuestionWidget"></rect>
-							<path d="M950.5 148.0 L1353.5 148.0" fill="none" data-name="BooleanQuestionWidget"></path>
-						</g>
-						<g transform="translate(950.5, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestionWidget">BooleanQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(950.5, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BooleanQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BooleanQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="BooleanQuestionWidget">+question: BooleanQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BooleanQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BooleanQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestion">
-							<rect x="1760.5" y="249.0" height="31.0" width="152.0" data-name="BooleanQuestion"></rect>
-						</g>
-						<g transform="translate(1760.5, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestion">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestion">BooleanQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionWidget">
-							<rect x="1393.5" y="117.0" height="77.0" width="403.0" data-name="FreeTextQuestionWidget"></rect>
-							<path d="M1393.5 148.0 L1796.5 148.0" fill="none" data-name="FreeTextQuestionWidget"></path>
-						</g>
-						<g transform="translate(1393.5, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionWidget">FreeTextQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1393.5, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionWidget">+question: FreeTextQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestion">
-							<rect x="2076.8" y="249.0" height="31.0" width="157.0" data-name="FreeTextQuestion"></rect>
-						</g>
-						<g transform="translate(2076.75, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestion">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestion">FreeTextQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionWidget">
-							<rect x="1836.5" y="117.0" height="77.0" width="403.0" data-name="ScaleQuestionWidget"></rect>
-							<path d="M1836.5 148.0 L2239.5 148.0" fill="none" data-name="ScaleQuestionWidget"></path>
-						</g>
-						<g transform="translate(1836.5, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionWidget">ScaleQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1836.5, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionWidget">+question: ScaleQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestion">
-							<rect x="2403.3" y="249.0" height="31.0" width="131.0" data-name="ScaleQuestion"></rect>
-						</g>
-						<g transform="translate(2403.25, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestion">
-								<text x="57.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestion">ScaleQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VisualAnalogueQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestionWidget">
-							<rect x="2279.5" y="117.0" height="77.0" width="403.0" data-name="VisualAnalogueQuestionWidget"></rect>
-							<path d="M2279.5 148.0 L2682.5 148.0" fill="none" data-name="VisualAnalogueQuestionWidget"></path>
-						</g>
-						<g transform="translate(2279.5, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestionWidget">VisualAnalogueQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2279.5, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="VisualAnalogueQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="VisualAnalogueQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+question: VisualAnalogueQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VisualAnalogueQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestion">
-							<rect x="2690.5" y="249.0" height="31.0" width="210.0" data-name="VisualAnalogueQuestion"></rect>
-						</g>
-						<g transform="translate(2690.5, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestion">
-								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestion">VisualAnalogueQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/widgets/questionnaire/uml.svg b/docs/uml/app/lib/widgets/questionnaire/uml.svg
deleted file mode 100644
index 8feef1090..000000000
--- a/docs/uml/app/lib/widgets/questionnaire/uml.svg
+++ /dev/null
@@ -1,773 +0,0 @@
-<svg version="1.1" baseProfile="full" width="5393.5" height="638.0" viewbox="0 0 5393.5 638" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[AudioRecordingQuestionWidget
-	  |
-	  +question: AudioRecordingQuestion;
-	  +onDone: dynamic Function(Answer&lt;FutureBlobFile&gt;)?
-	]
-	
-	[AudioRecordingQuestionWidget]o-[AudioRecordingQuestion]
-	[AudioRecordingQuestionWidget]o-[dynamic Function(Answer&lt;FutureBlobFile&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[AudioRecordingQuestionWidget]
-	
-	[CustomSlider
-	  |
-	  +value: double?;
-	  +minValue: double?;
-	  +maxValue: double?;
-	  +minorTick: int?;
-	  +onChanged: dynamic Function(double)?;
-	  +onChangeEnd: dynamic Function(double)?;
-	  +activeColor: Color?;
-	  +inactiveColor: Color?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +thumbColor: Color?;
-	  +isColored: bool;
-	  +labelValuePrecision: int;
-	  +tickValuePrecision: int;
-	  +linearStep: bool;
-	  +steps: AnnotatedScaleQuestion?
-	  |
-	  +Widget build()
-	]
-	
-	[CustomSlider]o-[dynamic Function(double)?]
-	[CustomSlider]o-[Color]
-	[CustomSlider]o-[AnnotatedScaleQuestion]
-	
-	[CustomTrackShape
-	  |
-	  +Rect getPreferredRect()
-	]
-	
-	[RoundedRectSliderTrackShape]&lt;:-[CustomTrackShape]
-	
-	[QuestionContainer
-	  |
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;, int);
-	  +question: Question&lt;dynamic&gt;;
-	  +index: int
-	]
-	
-	[QuestionContainer]o-[dynamic Function(Answer&lt;dynamic&gt;, int)]
-	[QuestionContainer]o-[&lt;abstract&gt;Question]
-	
-	[QuestionHeader
-	  |
-	  +prompt: String?;
-	  +subtitle: String?;
-	  +rationale: String?
-	  |
-	  -List&lt;Widget&gt; _buildSubtitle();
-	  -List&lt;Widget&gt; _buildRationaleButton();
-	  +Widget build()
-	]
-	
-	[ImageCapturingQuestionWidget
-	  |
-	  +question: ImageCapturingQuestion;
-	  +onDone: dynamic Function(Answer&lt;FutureBlobFile&gt;)?
-	]
-	
-	[ImageCapturingQuestionWidget]o-[ImageCapturingQuestion]
-	[ImageCapturingQuestionWidget]o-[dynamic Function(Answer&lt;FutureBlobFile&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ImageCapturingQuestionWidget]
-	
-	[QuestionnaireWidget
-	  |
-	  +title: String?;
-	  +header: String?;
-	  +footer: String?;
-	  +questions: List&lt;Question&lt;dynamic&gt;&gt;
-	]
-	
-	[HtmlTextBox
-	  |
-	  +text: String?
-	  |
-	  +Widget build()
-	]
-	
-	[BooleanQuestionWidget
-	  |
-	  +question: BooleanQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[BooleanQuestionWidget]o-[BooleanQuestion]
-	[BooleanQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[BooleanQuestionWidget]
-	
-	[ChoiceQuestionWidget
-	  |
-	  +question: ChoiceQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;);
-	  +multiSelectionText: String;
-	  +subtitle: String?
-	]
-	
-	[ChoiceQuestionWidget]o-[ChoiceQuestion]
-	[ChoiceQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ChoiceQuestionWidget]
-	
-	[VisualAnalogueQuestionWidget
-	  |
-	  +question: VisualAnalogueQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[VisualAnalogueQuestionWidget]o-[VisualAnalogueQuestion]
-	[VisualAnalogueQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[VisualAnalogueQuestionWidget]
-	
-	[FreeTextQuestionWidget
-	  |
-	  +question: FreeTextQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[FreeTextQuestionWidget]o-[FreeTextQuestion]
-	[FreeTextQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[FreeTextQuestionWidget]
-	
-	[AnnotatedScaleQuestionWidget
-	  |
-	  +question: AnnotatedScaleQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[AnnotatedScaleQuestionWidget]o-[AnnotatedScaleQuestion]
-	[AnnotatedScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[AnnotatedScaleQuestionWidget]
-	
-	[&lt;abstract&gt;QuestionWidget
-	  |
-	  +subtitle: String?
-	]
-	
-	[ScaleQuestionWidget
-	  |
-	  +question: ScaleQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[ScaleQuestionWidget]o-[ScaleQuestion]
-	[ScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ScaleQuestionWidget]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="638.0" width="5393.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M5129.3 405.0 L5231 531 L5231 551 L5231.0 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5127.6 394.4 L5129.3 405.0 L5119.3 401.1 L5117.6 390.5 Z"></path>
-					</g>
-					<path d="M5043.4 405.0 L4941 531 L4861.56338028169 551 L4861.6 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5053.5 401.1 L5043.4 405.0 L5045.2 394.4 L5055.2 390.5 Z"></path>
-					</g>
-					<path d="M3105.8 80.6 L5086.5 173 L5086.5 313.5 L5086.5 313.5 " fill="none"></path>
-					<path d="M3106.1 75.3 L3105.8 80.6 L3105.6 85.9 L3092.5 80.0 Z"></path>
-					<path d="M660.7 418.5 L998.5 531 L596.5 558.5768115942029 L596.5 558.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M653.5 410.5 L660.7 418.5 L650.2 420.6 L643.0 412.6 Z"></path>
-					</g>
-					<path d="M538.2 528.1 L539.5 531 L325.5 562.2633744855967 L325.5 562.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M539.4 517.4 L538.2 528.1 L529.6 521.7 L530.7 511.0 Z"></path>
-					</g>
-					<path d="M441.2 529.6 L441 531 L1100.25 561.5826527278667 L1100.3 561.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M447.5 520.9 L441.2 529.6 L436.9 519.7 L443.2 511.0 Z"></path>
-					</g>
-					<path d="M132.0 105.3 L132 173 L132 321 L132.0 321.0 " fill="none"></path>
-					<path d="M137.3 105.3 L132.0 105.3 L126.7 105.3 L132.0 92.0 Z"></path>
-					<path d="M928.5 133.8 L980 173 L980 336.5 L980.0 336.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M924.3 123.9 L928.5 133.8 L917.9 132.4 L913.7 122.5 Z"></path>
-					</g>
-					<path d="M778.0 133.8 L726.5 173 L726.5 336.5 L726.5 336.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M788.6 132.4 L778.0 133.8 L782.2 123.9 L792.8 122.5 Z"></path>
-					</g>
-					<path d="M4554.8 407.5 L4610 531 L4530.56338028169 551 L4530.6 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4555.9 396.8 L4554.8 407.5 L4546.1 401.2 L4547.2 390.5 Z"></path>
-					</g>
-					<path d="M4469.8 402.5 L4316.5 531 L4615.5 552.9534643226474 L4615.5 553.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4480.4 400.6 L4469.8 402.5 L4473.5 392.4 L4484.1 390.5 Z"></path>
-					</g>
-					<path d="M3105.8 82.1 L4530 173 L4530 313.5 L4530.0 313.5 " fill="none"></path>
-					<path d="M3106.1 76.8 L3105.8 82.1 L3105.5 87.4 L3092.5 81.3 Z"></path>
-					<path d="M4082.2 408.2 L4124.25 531 L4124.25 551 L4124.3 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4084.2 397.6 L4082.2 408.2 L4074.1 401.1 L4076.2 390.5 Z"></path>
-					</g>
-					<path d="M3909.9 395.6 L3434.75 531 L2463.75 561.4644277507733 L2463.8 561.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3920.4 398.2 L3909.9 395.6 L3917.4 387.9 L3927.9 390.5 Z"></path>
-					</g>
-					<path d="M3105.8 84.6 L4063 173 L4063 313.5 L4063.0 313.5 " fill="none"></path>
-					<path d="M3106.3 79.3 L3105.8 84.6 L3105.3 89.9 L3092.5 83.4 Z"></path>
-					<path d="M3265.0 418.4 L3382.5 531 L3866.25 561.9565119423164 L3866.3 562.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3262.0 408.1 L3265.0 418.4 L3254.6 415.8 L3251.6 405.5 Z"></path>
-					</g>
-					<path d="M3138.2 419.7 L3043.5 531 L3461.75 556.8786492374728 L3461.8 556.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3148.3 416.1 L3138.2 419.7 L3140.1 409.2 L3150.2 405.5 Z"></path>
-					</g>
-					<path d="M3086.8 113.9 L3195.75 173 L3195.75 298.5 L3195.8 298.5 " fill="none"></path>
-					<path d="M3089.4 109.2 L3086.8 113.9 L3084.3 118.5 L3075.1 107.5 Z"></path>
-					<path d="M2779.2 407.9 L2826.5 531 L3211.75 558.8967363590006 L3211.8 558.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2780.9 397.3 L2779.2 407.9 L2770.9 401.1 L2772.5 390.5 Z"></path>
-					</g>
-					<path d="M2700.5 402.9 L2556.25 531 L2413.7147887323945 551 L2413.7 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2711.0 400.7 L2700.5 402.9 L2703.9 392.7 L2714.4 390.5 Z"></path>
-					</g>
-					<path d="M2931.0 108.8 L2757.75 173 L2757.75 313.5 L2757.8 313.5 " fill="none"></path>
-					<path d="M2932.9 113.8 L2931.0 108.8 L2929.1 103.8 L2943.5 104.1 Z"></path>
-					<path d="M2366.3 403.7 L2493.25 531 L3014.75 561.8554166666667 L3014.8 561.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2363.5 393.3 L2366.3 403.7 L2356.0 400.9 L2353.1 390.5 Z"></path>
-					</g>
-					<path d="M2257.5 402.9 L2113.25 531 L2220.292253521127 551 L2220.3 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2268.0 400.7 L2257.5 402.9 L2260.9 392.7 L2271.4 390.5 Z"></path>
-					</g>
-					<path d="M2930.3 88.5 L2314.75 173 L2314.75 313.5 L2314.8 313.5 " fill="none"></path>
-					<path d="M2931.0 93.8 L2930.3 88.5 L2929.6 83.3 L2943.5 86.7 Z"></path>
-					<path d="M1840.9 409.1 L1854.5 531 L1312.25 560.6951407635943 L1312.3 560.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1845.1 399.2 L1840.9 409.1 L1834.5 400.4 L1838.8 390.5 Z"></path>
-					</g>
-					<path d="M1777.2 402.9 L1633 531 L2142.75 557.9990675121223 L2142.8 558.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1787.7 400.7 L1777.2 402.9 L1780.6 392.7 L1791.2 390.5 Z"></path>
-					</g>
-					<path d="M2930.2 83.7 L1834.5 173 L1834.5 313.5 L1834.5 313.5 " fill="none"></path>
-					<path d="M2930.6 89.0 L2930.2 83.7 L2929.8 78.3 L2943.5 82.6 Z"></path>
-					<path d="M1448.8 402.9 L1593 531 L1633.1408450704225 551 L1633.1 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1445.4 392.7 L1448.8 402.9 L1438.3 400.7 L1434.8 390.5 Z"></path>
-					</g>
-					<path d="M1298.9 398.9 L1038.5 531 L2142.75 561.9949594781577 L2142.8 562.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1309.7 399.5 L1298.9 398.9 L1304.8 390.0 L1315.6 390.5 Z"></path>
-					</g>
-					<path d="M2930.2 81.7 L1391.5 173 L1391.5 313.5 L1391.5 313.5 " fill="none"></path>
-					<path d="M2930.5 87.0 L2930.2 81.7 L2929.9 76.4 L2943.5 80.9 Z"></path>
-					<g data-name="AudioRecordingQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionWidget">
-							<rect x="4861.0" y="313.5" height="77.0" width="451.0" data-name="AudioRecordingQuestionWidget"></rect>
-							<path d="M4861.0 344.5 L5312.0 344.5" fill="none" data-name="AudioRecordingQuestionWidget"></path>
-						</g>
-						<g transform="translate(4861, 313.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionWidget">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionWidget">AudioRecordingQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4861, 344.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionWidget">+question: AudioRecordingQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioRecordingQuestionWidget">+onDone: dynamic Function(Answer&lt;FutureBlobFile&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioRecordingQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestion">
-							<rect x="5124.5" y="551.0" height="31.0" width="213.0" data-name="AudioRecordingQuestion"></rect>
-						</g>
-						<g transform="translate(5124.5, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestion">
-								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestion">AudioRecordingQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">
-							<rect x="4615.5" y="551.0" height="31.0" width="369.0" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?"></rect>
-						</g>
-						<g transform="translate(4615.5, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">
-								<text x="176.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">dynamic Function(Answer&lt;FutureBlobFile&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionWidget">
-							<rect x="2943.5" y="45.5" height="62.0" width="149.0" data-name="QuestionWidget"></rect>
-							<path d="M2943.5 76.5 L3092.5 76.5" fill="none" data-name="QuestionWidget"></path>
-						</g>
-						<g transform="translate(2943.5, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionWidget">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionWidget">QuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2943.5, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionWidget">+subtitle: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomSlider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomSlider">
-							<rect x="279.0" y="193.0" height="318.0" width="364.0" data-name="CustomSlider"></rect>
-							<path d="M279.0 224.0 L643.0 224.0" fill="none" data-name="CustomSlider"></path>
-							<path d="M279.0 480.0 L643.0 480.0" fill="none" data-name="CustomSlider"></path>
-						</g>
-						<g transform="translate(279, 193)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomSlider">
-								<text x="174.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomSlider">CustomSlider</text>
-								
-							</g>
-						</g>
-						<g transform="translate(279, 224)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomSlider">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomSlider">+value: double?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomSlider">+minValue: double?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomSlider">+maxValue: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomSlider">+minorTick: int?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomSlider">+onChanged: dynamic Function(double)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomSlider">+onChangeEnd: dynamic Function(double)?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="CustomSlider">+activeColor: Color?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="CustomSlider">+inactiveColor: Color?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="CustomSlider">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="CustomSlider">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="CustomSlider">+thumbColor: Color?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="CustomSlider">+isColored: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="CustomSlider">+labelValuePrecision: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="CustomSlider">+tickValuePrecision: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="CustomSlider">+linearStep: bool</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="CustomSlider">+steps: AnnotatedScaleQuestion?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(279, 480)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomSlider">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomSlider">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(double)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(double)?">
-							<rect x="365.5" y="551.0" height="31.0" width="231.0" data-name="dynamic Function(double)?"></rect>
-						</g>
-						<g transform="translate(365.5, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(double)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(double)?">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(double)?">dynamic Function(double)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="267.5" y="551.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(267.5, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AnnotatedScaleQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestion">
-							<rect x="1100.3" y="551.0" height="31.0" width="212.0" data-name="AnnotatedScaleQuestion"></rect>
-						</g>
-						<g transform="translate(1100.25, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestion">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestion">AnnotatedScaleQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomTrackShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomTrackShape">
-							<rect x="25.0" y="321.0" height="62.0" width="214.0" data-name="CustomTrackShape"></rect>
-							<path d="M25.0 352.0 L239.0 352.0" fill="none" data-name="CustomTrackShape"></path>
-						</g>
-						<g transform="translate(25, 321)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomTrackShape">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomTrackShape">CustomTrackShape</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25, 352)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomTrackShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomTrackShape">+Rect getPreferredRect()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoundedRectSliderTrackShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoundedRectSliderTrackShape">
-							<rect x="0.0" y="61.0" height="31.0" width="264.0" data-name="RoundedRectSliderTrackShape"></rect>
-						</g>
-						<g transform="translate(0, 61)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoundedRectSliderTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoundedRectSliderTrackShape">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoundedRectSliderTrackShape">RoundedRectSliderTrackShape</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionContainer">
-							<rect x="642.3" y="30.5" height="92.0" width="422.0" data-name="QuestionContainer"></rect>
-							<path d="M642.3 61.5 L1064.3 61.5" fill="none" data-name="QuestionContainer"></path>
-						</g>
-						<g transform="translate(642.25, 30.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionContainer">
-								<text x="203.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionContainer">QuestionContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(642.25, 61.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionContainer">+onDone: dynamic Function(Answer&lt;dynamic&gt;, int)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionContainer">+question: Question&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionContainer">+index: int</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-							<rect x="810.0" y="336.5" height="31.0" width="340.0" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)"></rect>
-						</g>
-						<g transform="translate(810, 336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">dynamic Function(Answer&lt;dynamic&gt;, int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Question">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Question">
-							<rect x="683.0" y="336.5" height="31.0" width="87.0" data-name="Question"></rect>
-						</g>
-						<g transform="translate(683, 336.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Question">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Question">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="Question">Question</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionHeader">
-							<rect x="3132.5" y="0.0" height="153.0" width="316.0" data-name="QuestionHeader"></rect>
-							<path d="M3132.5 31.0 L3448.5 31.0" fill="none" data-name="QuestionHeader"></path>
-							<path d="M3132.5 92.0 L3448.5 92.0" fill="none" data-name="QuestionHeader"></path>
-						</g>
-						<g transform="translate(3132.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionHeader">
-								<text x="150.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionHeader">QuestionHeader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3132.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionHeader">+prompt: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionHeader">+subtitle: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionHeader">+rationale: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3132.5, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionHeader">-List&lt;Widget&gt; _buildSubtitle()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionHeader">-List&lt;Widget&gt; _buildRationaleButton()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionHeader">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageCapturingQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionWidget">
-							<rect x="4304.5" y="313.5" height="77.0" width="451.0" data-name="ImageCapturingQuestionWidget"></rect>
-							<path d="M4304.5 344.5 L4755.5 344.5" fill="none" data-name="ImageCapturingQuestionWidget"></path>
-						</g>
-						<g transform="translate(4304.5, 313.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionWidget">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionWidget">ImageCapturingQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4304.5, 344.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionWidget">+question: ImageCapturingQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageCapturingQuestionWidget">+onDone: dynamic Function(Answer&lt;FutureBlobFile&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageCapturingQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestion">
-							<rect x="4362.5" y="551.0" height="31.0" width="213.0" data-name="ImageCapturingQuestion"></rect>
-						</g>
-						<g transform="translate(4362.5, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestion">
-								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestion">ImageCapturingQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireWidget">
-							<rect x="3488.5" y="23.0" height="107.0" width="318.0" data-name="QuestionnaireWidget"></rect>
-							<path d="M3488.5 54.0 L3806.5 54.0" fill="none" data-name="QuestionnaireWidget"></path>
-						</g>
-						<g transform="translate(3488.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireWidget">
-								<text x="151.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireWidget">QuestionnaireWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3488.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireWidget">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireWidget">+header: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireWidget">+footer: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionnaireWidget">+questions: List&lt;Question&lt;dynamic&gt;&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="HtmlTextBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlTextBox">
-							<rect x="3846.5" y="30.0" height="93.0" width="136.0" data-name="HtmlTextBox"></rect>
-							<path d="M3846.5 61.0 L3982.5 61.0" fill="none" data-name="HtmlTextBox"></path>
-							<path d="M3846.5 92.0 L3982.5 92.0" fill="none" data-name="HtmlTextBox"></path>
-						</g>
-						<g transform="translate(3846.5, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlTextBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlTextBox">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlTextBox">HtmlTextBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3846.5, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlTextBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlTextBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlTextBox">+text: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3846.5, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlTextBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlTextBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlTextBox">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BooleanQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestionWidget">
-							<rect x="3861.5" y="313.5" height="77.0" width="403.0" data-name="BooleanQuestionWidget"></rect>
-							<path d="M3861.5 344.5 L4264.5 344.5" fill="none" data-name="BooleanQuestionWidget"></path>
-						</g>
-						<g transform="translate(3861.5, 313.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestionWidget">BooleanQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3861.5, 344.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BooleanQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BooleanQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="BooleanQuestionWidget">+question: BooleanQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BooleanQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BooleanQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestion">
-							<rect x="4048.3" y="551.0" height="31.0" width="152.0" data-name="BooleanQuestion"></rect>
-						</g>
-						<g transform="translate(4048.25, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestion">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestion">BooleanQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-							<rect x="2142.8" y="551.0" height="31.0" width="321.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(2142.75, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionWidget">
-							<rect x="2999.3" y="298.5" height="107.0" width="393.0" data-name="ChoiceQuestionWidget"></rect>
-							<path d="M2999.3 329.5 L3392.3 329.5" fill="none" data-name="ChoiceQuestionWidget"></path>
-						</g>
-						<g transform="translate(2999.25, 298.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionWidget">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionWidget">ChoiceQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2999.25, 329.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionWidget">+question: ChoiceQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionWidget">+multiSelectionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionWidget">+subtitle: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestion">
-							<rect x="3866.3" y="551.0" height="31.0" width="142.0" data-name="ChoiceQuestion"></rect>
-						</g>
-						<g transform="translate(3866.25, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestion">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestion">ChoiceQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-							<rect x="3461.8" y="551.0" height="31.0" width="311.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)"></rect>
-						</g>
-						<g transform="translate(3461.75, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-								<text x="147.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)">dynamic Function(Answer&lt;dynamic&gt;)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VisualAnalogueQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestionWidget">
-							<rect x="2556.3" y="313.5" height="77.0" width="403.0" data-name="VisualAnalogueQuestionWidget"></rect>
-							<path d="M2556.3 344.5 L2959.3 344.5" fill="none" data-name="VisualAnalogueQuestionWidget"></path>
-						</g>
-						<g transform="translate(2556.25, 313.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestionWidget">VisualAnalogueQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2556.25, 344.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="VisualAnalogueQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="VisualAnalogueQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+question: VisualAnalogueQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VisualAnalogueQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestion">
-							<rect x="3211.8" y="551.0" height="31.0" width="210.0" data-name="VisualAnalogueQuestion"></rect>
-						</g>
-						<g transform="translate(3211.75, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestion">
-								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestion">VisualAnalogueQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionWidget">
-							<rect x="2113.3" y="313.5" height="77.0" width="403.0" data-name="FreeTextQuestionWidget"></rect>
-							<path d="M2113.3 344.5 L2516.3 344.5" fill="none" data-name="FreeTextQuestionWidget"></path>
-						</g>
-						<g transform="translate(2113.25, 313.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionWidget">FreeTextQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2113.25, 344.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionWidget">+question: FreeTextQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestion">
-							<rect x="3014.8" y="551.0" height="31.0" width="157.0" data-name="FreeTextQuestion"></rect>
-						</g>
-						<g transform="translate(3014.75, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestion">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestion">FreeTextQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AnnotatedScaleQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestionWidget">
-							<rect x="1633.0" y="313.5" height="77.0" width="403.0" data-name="AnnotatedScaleQuestionWidget"></rect>
-							<path d="M1633.0 344.5 L2036.0 344.5" fill="none" data-name="AnnotatedScaleQuestionWidget"></path>
-						</g>
-						<g transform="translate(1633, 313.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestionWidget">AnnotatedScaleQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1633, 344.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AnnotatedScaleQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+question: AnnotatedScaleQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionWidget">
-							<rect x="1190.0" y="313.5" height="77.0" width="403.0" data-name="ScaleQuestionWidget"></rect>
-							<path d="M1190.0 344.5 L1593.0 344.5" fill="none" data-name="ScaleQuestionWidget"></path>
-						</g>
-						<g transform="translate(1190, 313.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionWidget">ScaleQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1190, 344.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionWidget">+question: ScaleQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestion">
-							<rect x="1598.8" y="551.0" height="31.0" width="131.0" data-name="ScaleQuestion"></rect>
-						</g>
-						<g transform="translate(1598.75, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestion">
-								<text x="57.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestion">ScaleQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/widgets/uml.svg b/docs/uml/app/lib/widgets/uml.svg
deleted file mode 100644
index 81d54b744..000000000
--- a/docs/uml/app/lib/widgets/uml.svg
+++ /dev/null
@@ -1,1172 +0,0 @@
-<svg version="1.1" baseProfile="full" width="7194.8" height="683.0" viewbox="0 0 7194.75 683" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[SelectableButton
-	  |
-	  +child: Widget;
-	  +selected: bool;
-	  +onTap: dynamic Function()?
-	  |
-	  -Color _getFillColor();
-	  -Color _getTextColor();
-	  +Widget build()
-	]
-	
-	[SelectableButton]o-[&lt;abstract&gt;Widget]
-	[SelectableButton]o-[dynamic Function()?]
-	
-	[CustomSlider
-	  |
-	  +value: double?;
-	  +minValue: double?;
-	  +maxValue: double?;
-	  +minorTick: int?;
-	  +onChanged: dynamic Function(double)?;
-	  +onChangeEnd: dynamic Function(double)?;
-	  +activeColor: Color?;
-	  +inactiveColor: Color?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +thumbColor: Color?;
-	  +isColored: bool;
-	  +labelValuePrecision: int;
-	  +tickValuePrecision: int;
-	  +linearStep: bool;
-	  +steps: AnnotatedScaleQuestion?
-	  |
-	  +Widget build()
-	]
-	
-	[CustomSlider]o-[dynamic Function(double)?]
-	[CustomSlider]o-[Color]
-	[CustomSlider]o-[AnnotatedScaleQuestion]
-	
-	[CustomTrackShape
-	  |
-	  +Rect getPreferredRect()
-	]
-	
-	[RoundedRectSliderTrackShape]&lt;:-[CustomTrackShape]
-	
-	[QuestionnaireWidget
-	  |
-	  +title: String?;
-	  +header: String?;
-	  +footer: String?;
-	  +questions: List&lt;Question&lt;dynamic&gt;&gt;
-	]
-	
-	[HtmlTextBox
-	  |
-	  +text: String?
-	  |
-	  +Widget build()
-	]
-	
-	[QuestionContainer
-	  |
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;, int);
-	  +question: Question&lt;dynamic&gt;;
-	  +index: int
-	]
-	
-	[QuestionContainer]o-[dynamic Function(Answer&lt;dynamic&gt;, int)]
-	[QuestionContainer]o-[&lt;abstract&gt;Question]
-	
-	[QuestionHeader
-	  |
-	  +prompt: String?;
-	  +subtitle: String?;
-	  +rationale: String?
-	  |
-	  -List&lt;Widget&gt; _buildSubtitle();
-	  -List&lt;Widget&gt; _buildRationaleButton();
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionWidget
-	  |
-	  +question: ChoiceQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;);
-	  +multiSelectionText: String;
-	  +subtitle: String?
-	]
-	
-	[ChoiceQuestionWidget]o-[ChoiceQuestion]
-	[ChoiceQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ChoiceQuestionWidget]
-	
-	[FreeTextQuestionWidget
-	  |
-	  +question: FreeTextQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[FreeTextQuestionWidget]o-[FreeTextQuestion]
-	[FreeTextQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[FreeTextQuestionWidget]
-	
-	[AnnotatedScaleQuestionWidget
-	  |
-	  +question: AnnotatedScaleQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[AnnotatedScaleQuestionWidget]o-[AnnotatedScaleQuestion]
-	[AnnotatedScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[AnnotatedScaleQuestionWidget]
-	
-	[VisualAnalogueQuestionWidget
-	  |
-	  +question: VisualAnalogueQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[VisualAnalogueQuestionWidget]o-[VisualAnalogueQuestion]
-	[VisualAnalogueQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[VisualAnalogueQuestionWidget]
-	
-	[&lt;abstract&gt;QuestionWidget
-	  |
-	  +subtitle: String?
-	]
-	
-	[BooleanQuestionWidget
-	  |
-	  +question: BooleanQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[BooleanQuestionWidget]o-[BooleanQuestion]
-	[BooleanQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[BooleanQuestionWidget]
-	
-	[ScaleQuestionWidget
-	  |
-	  +question: ScaleQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[ScaleQuestionWidget]o-[ScaleQuestion]
-	[ScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ScaleQuestionWidget]
-	
-	[StudyTile
-	  |
-	  +title: String?;
-	  +description: String?;
-	  +iconName: String;
-	  +onTap: dynamic Function()?;
-	  +contentPadding: EdgeInsetsGeometry
-	  |
-	  +Widget build()
-	]
-	
-	[StudyTile]o-[dynamic Function()?]
-	[StudyTile]o-[&lt;abstract&gt;EdgeInsetsGeometry]
-	
-	[RoundCheckbox
-	  |
-	  +onChanged: dynamic Function(bool)?;
-	  +value: bool?
-	  |
-	  +Widget build()
-	]
-	
-	[RoundCheckbox]o-[dynamic Function(bool)?]
-	
-	[InterventionCard
-	  |
-	  +intervention: Intervention;
-	  +selected: bool;
-	  +showCheckbox: bool;
-	  +showTasks: bool;
-	  +showDescription: bool;
-	  +onTap: dynamic Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionCard]o-[Intervention]
-	[InterventionCard]o-[dynamic Function()?]
-	
-	[InterventionCardTitle
-	  |
-	  +intervention: Intervention?;
-	  +selected: bool;
-	  +showCheckbox: bool;
-	  +showDescriptionButton: bool;
-	  +onTap: dynamic Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionCardTitle]o-[Intervention]
-	[InterventionCardTitle]o-[dynamic Function()?]
-	
-	[InterventionCardDescription
-	  |
-	  +intervention: Intervention
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionCardDescription]o-[Intervention]
-	
-	[_TaskList
-	  |
-	  +tasks: List&lt;InterventionTask&gt;
-	  |
-	  +String scheduleString();
-	  +Widget build()
-	]
-	
-	[HtmlText
-	  |
-	  +text: String?;
-	  +style: TextStyle?;
-	  +centered: bool
-	  |
-	  +Widget build()
-	]
-	
-	[HtmlText]o-[TextStyle]
-	
-	[BottomOnboardingNavigation
-	  |
-	  +onBack: void Function()?;
-	  +onNext: void Function()?;
-	  +backLabel: String?;
-	  +nextLabel: String?;
-	  +hideNext: bool;
-	  +nextIcon: Icon?;
-	  +backIcon: Icon?;
-	  +progress: Widget?
-	  |
-	  +Widget build()
-	]
-	
-	[BottomOnboardingNavigation]o-[void Function()?]
-	[BottomOnboardingNavigation]o-[Icon]
-	[BottomOnboardingNavigation]o-[&lt;abstract&gt;Widget]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="683.0" width="7194.8" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M614.9 190.2 L636.75 218 L2249 393.14352905477165 L2249.0 393.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M613.3 179.5 L614.9 190.2 L604.9 186.1 L603.4 175.5 Z"></path>
-					</g>
-					<path d="M511.6 193.2 L503.25 218 L1764.75 385.2655555555556 L1764.8 385.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M519.6 186.0 L511.6 193.2 L509.5 182.6 L517.5 175.5 Z"></path>
-					</g>
-					<path d="M832.3 422.1 L2061.25 576 L603.25 608.8941849380362 L603.3 608.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M823.7 415.7 L832.3 422.1 L822.3 426.2 L813.8 419.8 Z"></path>
-					</g>
-					<path d="M631.8 574.7 L631.75 576 L332.25 608.3660578386606 L332.3 608.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M637.1 565.3 L631.8 574.7 L626.4 565.3 L631.8 556.0 Z"></path>
-					</g>
-					<path d="M592.1 574.2 L591.75 576 L2475.25 609.6085699924604 L2475.3 609.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M599.4 566.3 L592.1 574.2 L589.0 563.9 L596.2 556.0 Z"></path>
-					</g>
-					<path d="M838.8 127.8 L838.75 218 L214 370.8257601639904 L214.0 370.8 " fill="none"></path>
-					<path d="M844.1 127.8 L838.8 127.8 L833.4 127.8 L838.8 114.5 Z"></path>
-					<path d="M1886.9 152.0 L2050.25 218 L1112.63687150838 381.5 L1112.6 381.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1880.2 143.6 L1886.9 152.0 L1876.2 153.4 L1869.6 145.0 Z"></path>
-					</g>
-					<path d="M1554.9 149.6 L1283 218 L375.25 388.8144546649146 L375.3 388.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1565.3 152.5 L1554.9 149.6 L1562.7 142.1 L1573.0 145.0 Z"></path>
-					</g>
-					<path d="M5963.1 464.8 L6055.75 576 L6055.75 596 L6055.8 596.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5961.2 454.3 L5963.1 464.8 L5953.0 461.1 L5951.1 450.5 Z"></path>
-					</g>
-					<path d="M5861.2 466.1 L5789.25 576 L5789.25 596 L5789.3 596.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5870.8 461.2 L5861.2 466.1 L5861.9 455.4 L5871.5 450.5 Z"></path>
-					</g>
-					<path d="M3663.4 113.7 L4283.75 218 L5710 375.32475735633955 L5710.0 375.3 " fill="none"></path>
-					<path d="M3664.3 108.5 L3663.4 113.7 L3662.5 119.0 L3650.3 111.5 Z"></path>
-					<path d="M5458.7 452.5 L5515.25 576 L5515.25 596 L5515.3 596.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5459.6 441.8 L5458.7 452.5 L5449.9 446.2 L5450.9 435.5 Z"></path>
-					</g>
-					<path d="M5360.9 446.0 L5168.75 576 L4368.25 605.5710197710717 L4368.3 605.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5371.6 445.1 L5360.9 446.0 L5365.6 436.3 L5376.4 435.5 Z"></path>
-					</g>
-					<path d="M3663.1 123.9 L3993.5 218 L5231.75 371.94808126410834 L5231.8 371.9 " fill="none"></path>
-					<path d="M3664.5 118.7 L3663.1 123.9 L3661.6 129.0 L3650.3 120.2 Z"></path>
-					<path d="M4730.3 451.6 L4804 576 L2687.25 609.8070520751321 L2687.3 609.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4730.1 440.8 L4730.3 451.6 L4721.0 446.2 L4720.8 435.5 Z"></path>
-					</g>
-					<path d="M4640.7 447.9 L4496.5 576 L4333.8239436619715 596 L4333.8 596.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4651.2 445.7 L4640.7 447.9 L4644.1 437.7 L4654.7 435.5 Z"></path>
-					</g>
-					<path d="M3632.7 137.5 L3752 218 L4496.5 358.872621564482 L4496.5 358.9 " fill="none"></path>
-					<path d="M3635.7 133.0 L3632.7 137.5 L3629.7 141.9 L3621.7 130.0 Z"></path>
-					<path d="M4312.3 447.9 L4456.5 576 L4975 605.5216519647153 L4975.0 605.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4308.9 437.7 L4312.3 447.9 L4301.8 445.7 L4298.3 435.5 Z"></path>
-					</g>
-					<path d="M4174.6 445.1 L3955.75 576 L4097.721830985915 596 L4097.7 596.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4185.4 444.9 L4174.6 445.1 L4179.9 435.7 L4190.6 435.5 Z"></path>
-					</g>
-					<path d="M3552.3 141.7 L3510.5 218 L4094.8701117318437 358.5 L4094.9 358.5 " fill="none"></path>
-					<path d="M3557.0 144.3 L3552.3 141.7 L3547.7 139.1 L3558.8 130.0 Z"></path>
-					<path d="M3714.4 445.6 L3915.75 576 L3924.4823943661972 596 L3924.5 596.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3709.5 436.1 L3714.4 445.6 L3703.7 445.0 L3698.7 435.5 Z"></path>
-					</g>
-					<path d="M3582.0 447.9 L3437.75 576 L4047.25 604.1003246753247 L4047.3 604.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3592.5 445.7 L3582.0 447.9 L3585.4 437.7 L3595.9 435.5 Z"></path>
-					</g>
-					<path d="M3514.0 137.0 L3382.25 218 L3583.973463687151 358.5 L3584.0 358.5 " fill="none"></path>
-					<path d="M3516.8 141.5 L3514.0 137.0 L3511.2 132.4 L3525.3 130.0 Z"></path>
-					<path d="M3253.5 447.9 L3397.75 576 L1778.75 610.1196200653013 L1778.8 610.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3250.1 437.7 L3253.5 447.9 L3243.0 445.7 L3239.6 435.5 Z"></path>
-					</g>
-					<path d="M2976.3 433.0 L2101.25 576 L4047.25 608.7951578447662 L4047.3 608.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2986.4 436.7 L2976.3 433.0 L2984.7 426.2 L2994.8 429.9 Z"></path>
-					</g>
-					<path d="M3503.0 136.1 L3342.25 218 L3227.6522346368715 358.5 L3227.7 358.5 " fill="none"></path>
-					<path d="M3505.5 140.8 L3503.0 136.1 L3500.6 131.3 L3514.9 130.0 Z"></path>
-					<path d="M2692.9 187.4 L2730 218 L1929.16969273743 381.5 L1929.2 381.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2689.1 177.3 L2692.9 187.4 L2682.3 185.6 L2678.5 175.5 Z"></path>
-					</g>
-					<path d="M2405.0 157.9 L2220.75 218 L1402.3365921787708 381.5 L1402.3 381.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2415.5 160.1 L2405.0 157.9 L2412.2 150.0 L2422.8 152.1 Z"></path>
-					</g>
-					<path d="M6206.3 171.7 L6206.25 218 L6495.1152234636875 381.5 L6495.1 381.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6211.6 162.3 L6206.3 171.7 L6200.9 162.3 L6206.3 153.0 Z"></path>
-					</g>
-					<path d="M3285.1 197.4 L3302.25 218 L3903.5 381.99809523809523 L3903.5 382.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3283.2 186.8 L3285.1 197.4 L3275.0 193.6 L3273.1 183.0 Z"></path>
-					</g>
-					<path d="M3101.9 195.9 L3078.75 218 L1941.75 384.0734394124847 L1941.8 384.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3112.3 193.3 L3101.9 195.9 L3104.9 185.6 L3115.4 183.0 Z"></path>
-					</g>
-					<path d="M3007.8 188.4 L3038.75 218 L3903.5 386.2960043490079 L3903.5 386.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3004.7 178.1 L3007.8 188.4 L2997.3 185.8 L2994.3 175.5 Z"></path>
-					</g>
-					<path d="M2807.1 187.4 L2770 218 L1932.633379888268 381.5 L1932.6 381.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2817.7 185.6 L2807.1 187.4 L2810.9 177.3 L2821.5 175.5 Z"></path>
-					</g>
-					<path d="M6824.3 164.2 L6824.25 218 L4013.5 393.5645991450755 L4013.5 393.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6829.6 154.8 L6824.3 164.2 L6818.9 154.8 L6824.3 145.5 Z"></path>
-					</g>
-					<path d="M7060.8 179.2 L7060.75 218 L7060.75 381.5 L7060.8 381.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7066.1 169.8 L7060.8 179.2 L7055.4 169.8 L7060.8 160.5 Z"></path>
-					</g>
-					<path d="M4631.1 110.7 L5934.75 218 L6272.939245810056 381.5 L6272.9 381.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4622.2 104.7 L4631.1 110.7 L4621.4 115.3 L4612.5 109.2 Z"></path>
-					</g>
-					<path d="M4631.1 112.0 L5797.75 218 L6143 384.91357191087104 L6143.0 384.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4622.3 105.8 L4631.1 112.0 L4621.3 116.4 L4612.5 110.3 Z"></path>
-					</g>
-					<path d="M4349.4 199.5 L4323.75 218 L2320 393.8839033958563 L2320.0 393.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4360.1 198.4 L4349.4 199.5 L4353.8 189.7 L4364.5 188.6 Z"></path>
-					</g>
-					<g data-name="SelectableButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SelectableButton">
-							<rect x="419.8" y="22.5" height="153.0" width="247.0" data-name="SelectableButton"></rect>
-							<path d="M419.8 53.5 L666.8 53.5" fill="none" data-name="SelectableButton"></path>
-							<path d="M419.8 114.5 L666.8 114.5" fill="none" data-name="SelectableButton"></path>
-						</g>
-						<g transform="translate(419.75, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SelectableButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SelectableButton">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="SelectableButton">SelectableButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(419.75, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SelectableButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SelectableButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SelectableButton">+child: Widget</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SelectableButton">+selected: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SelectableButton">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(419.75, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SelectableButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SelectableButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SelectableButton">-Color _getFillColor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SelectableButton">-Color _getTextColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SelectableButton">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="2249.0" y="381.5" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(2249, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="1764.8" y="381.5" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
-						</g>
-						<g transform="translate(1764.75, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
-								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomSlider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomSlider">
-							<rect x="449.8" y="238.0" height="318.0" width="364.0" data-name="CustomSlider"></rect>
-							<path d="M449.8 269.0 L813.8 269.0" fill="none" data-name="CustomSlider"></path>
-							<path d="M449.8 525.0 L813.8 525.0" fill="none" data-name="CustomSlider"></path>
-						</g>
-						<g transform="translate(449.75, 238)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomSlider">
-								<text x="174.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomSlider">CustomSlider</text>
-								
-							</g>
-						</g>
-						<g transform="translate(449.75, 269)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomSlider">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomSlider">+value: double?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomSlider">+minValue: double?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomSlider">+maxValue: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomSlider">+minorTick: int?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomSlider">+onChanged: dynamic Function(double)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomSlider">+onChangeEnd: dynamic Function(double)?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="CustomSlider">+activeColor: Color?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="CustomSlider">+inactiveColor: Color?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="CustomSlider">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="CustomSlider">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="CustomSlider">+thumbColor: Color?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="CustomSlider">+isColored: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="CustomSlider">+labelValuePrecision: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="CustomSlider">+tickValuePrecision: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="CustomSlider">+linearStep: bool</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="CustomSlider">+steps: AnnotatedScaleQuestion?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(449.75, 525)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomSlider">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomSlider">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(double)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(double)?">
-							<rect x="372.3" y="596.0" height="31.0" width="231.0" data-name="dynamic Function(double)?"></rect>
-						</g>
-						<g transform="translate(372.25, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(double)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(double)?">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(double)?">dynamic Function(double)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="274.3" y="596.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(274.25, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AnnotatedScaleQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestion">
-							<rect x="2475.3" y="596.0" height="31.0" width="212.0" data-name="AnnotatedScaleQuestion"></rect>
-						</g>
-						<g transform="translate(2475.25, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestion">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestion">AnnotatedScaleQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomTrackShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomTrackShape">
-							<rect x="0.0" y="366.0" height="62.0" width="214.0" data-name="CustomTrackShape"></rect>
-							<path d="M0.0 397.0 L214.0 397.0" fill="none" data-name="CustomTrackShape"></path>
-						</g>
-						<g transform="translate(0, 366)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomTrackShape">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomTrackShape">CustomTrackShape</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 397)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomTrackShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomTrackShape">+Rect getPreferredRect()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoundedRectSliderTrackShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoundedRectSliderTrackShape">
-							<rect x="706.8" y="83.5" height="31.0" width="264.0" data-name="RoundedRectSliderTrackShape"></rect>
-						</g>
-						<g transform="translate(706.75, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoundedRectSliderTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoundedRectSliderTrackShape">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoundedRectSliderTrackShape">RoundedRectSliderTrackShape</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireWidget">
-							<rect x="1010.8" y="45.5" height="107.0" width="318.0" data-name="QuestionnaireWidget"></rect>
-							<path d="M1010.8 76.5 L1328.8 76.5" fill="none" data-name="QuestionnaireWidget"></path>
-						</g>
-						<g transform="translate(1010.75, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireWidget">
-								<text x="151.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireWidget">QuestionnaireWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1010.75, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireWidget">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireWidget">+header: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireWidget">+footer: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionnaireWidget">+questions: List&lt;Question&lt;dynamic&gt;&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="HtmlTextBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlTextBox">
-							<rect x="1368.8" y="52.5" height="93.0" width="136.0" data-name="HtmlTextBox"></rect>
-							<path d="M1368.8 83.5 L1504.8 83.5" fill="none" data-name="HtmlTextBox"></path>
-							<path d="M1368.8 114.5 L1504.8 114.5" fill="none" data-name="HtmlTextBox"></path>
-						</g>
-						<g transform="translate(1368.75, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlTextBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlTextBox">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlTextBox">HtmlTextBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1368.75, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlTextBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlTextBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlTextBox">+text: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1368.75, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlTextBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlTextBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlTextBox">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionContainer">
-							<rect x="1544.8" y="53.0" height="92.0" width="422.0" data-name="QuestionContainer"></rect>
-							<path d="M1544.8 84.0 L1966.8 84.0" fill="none" data-name="QuestionContainer"></path>
-						</g>
-						<g transform="translate(1544.75, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionContainer">
-								<text x="203.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionContainer">QuestionContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1544.75, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionContainer">+onDone: dynamic Function(Answer&lt;dynamic&gt;, int)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionContainer">+question: Question&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionContainer">+index: int</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-							<rect x="853.8" y="381.5" height="31.0" width="340.0" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)"></rect>
-						</g>
-						<g transform="translate(853.75, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">dynamic Function(Answer&lt;dynamic&gt;, int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Question">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Question">
-							<rect x="288.3" y="381.5" height="31.0" width="87.0" data-name="Question"></rect>
-						</g>
-						<g transform="translate(288.25, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Question">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Question">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="Question">Question</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionHeader">
-							<rect x="2066.8" y="22.5" height="153.0" width="316.0" data-name="QuestionHeader"></rect>
-							<path d="M2066.8 53.5 L2382.8 53.5" fill="none" data-name="QuestionHeader"></path>
-							<path d="M2066.8 114.5 L2382.8 114.5" fill="none" data-name="QuestionHeader"></path>
-						</g>
-						<g transform="translate(2066.75, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionHeader">
-								<text x="150.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionHeader">QuestionHeader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2066.75, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionHeader">+prompt: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionHeader">+subtitle: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionHeader">+rationale: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2066.75, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionHeader">-List&lt;Widget&gt; _buildSubtitle()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionHeader">-List&lt;Widget&gt; _buildRationaleButton()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionHeader">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionWidget">
-							<rect x="5710.0" y="343.5" height="107.0" width="393.0" data-name="ChoiceQuestionWidget"></rect>
-							<path d="M5710.0 374.5 L6103.0 374.5" fill="none" data-name="ChoiceQuestionWidget"></path>
-						</g>
-						<g transform="translate(5710, 343.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionWidget">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionWidget">ChoiceQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5710, 374.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionWidget">+question: ChoiceQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionWidget">+multiSelectionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionWidget">+subtitle: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestion">
-							<rect x="5984.8" y="596.0" height="31.0" width="142.0" data-name="ChoiceQuestion"></rect>
-						</g>
-						<g transform="translate(5984.75, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestion">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestion">ChoiceQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-							<rect x="5633.8" y="596.0" height="31.0" width="311.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)"></rect>
-						</g>
-						<g transform="translate(5633.75, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-								<text x="147.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)">dynamic Function(Answer&lt;dynamic&gt;)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionWidget">
-							<rect x="3501.3" y="68.0" height="62.0" width="149.0" data-name="QuestionWidget"></rect>
-							<path d="M3501.3 99.0 L3650.3 99.0" fill="none" data-name="QuestionWidget"></path>
-						</g>
-						<g transform="translate(3501.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionWidget">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionWidget">QuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3501.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionWidget">+subtitle: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionWidget">
-							<rect x="5231.8" y="358.5" height="77.0" width="403.0" data-name="FreeTextQuestionWidget"></rect>
-							<path d="M5231.8 389.5 L5634.8 389.5" fill="none" data-name="FreeTextQuestionWidget"></path>
-						</g>
-						<g transform="translate(5231.75, 358.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionWidget">FreeTextQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5231.75, 389.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionWidget">+question: FreeTextQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestion">
-							<rect x="5436.8" y="596.0" height="31.0" width="157.0" data-name="FreeTextQuestion"></rect>
-						</g>
-						<g transform="translate(5436.75, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestion">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestion">FreeTextQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-							<rect x="4047.3" y="596.0" height="31.0" width="321.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(4047.25, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AnnotatedScaleQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestionWidget">
-							<rect x="4496.5" y="358.5" height="77.0" width="403.0" data-name="AnnotatedScaleQuestionWidget"></rect>
-							<path d="M4496.5 389.5 L4899.5 389.5" fill="none" data-name="AnnotatedScaleQuestionWidget"></path>
-						</g>
-						<g transform="translate(4496.5, 358.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestionWidget">AnnotatedScaleQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4496.5, 389.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AnnotatedScaleQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+question: AnnotatedScaleQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VisualAnalogueQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestionWidget">
-							<rect x="4053.5" y="358.5" height="77.0" width="403.0" data-name="VisualAnalogueQuestionWidget"></rect>
-							<path d="M4053.5 389.5 L4456.5 389.5" fill="none" data-name="VisualAnalogueQuestionWidget"></path>
-						</g>
-						<g transform="translate(4053.5, 358.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestionWidget">VisualAnalogueQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4053.5, 389.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="VisualAnalogueQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="VisualAnalogueQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+question: VisualAnalogueQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VisualAnalogueQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestion">
-							<rect x="4975.0" y="596.0" height="31.0" width="210.0" data-name="VisualAnalogueQuestion"></rect>
-						</g>
-						<g transform="translate(4975, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestion">
-								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestion">VisualAnalogueQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BooleanQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestionWidget">
-							<rect x="3437.8" y="358.5" height="77.0" width="403.0" data-name="BooleanQuestionWidget"></rect>
-							<path d="M3437.8 389.5 L3840.8 389.5" fill="none" data-name="BooleanQuestionWidget"></path>
-						</g>
-						<g transform="translate(3437.75, 358.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestionWidget">BooleanQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3437.75, 389.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BooleanQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BooleanQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="BooleanQuestionWidget">+question: BooleanQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BooleanQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BooleanQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestion">
-							<rect x="3855.3" y="596.0" height="31.0" width="152.0" data-name="BooleanQuestion"></rect>
-						</g>
-						<g transform="translate(3855.25, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestion">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestion">BooleanQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionWidget">
-							<rect x="2994.8" y="358.5" height="77.0" width="403.0" data-name="ScaleQuestionWidget"></rect>
-							<path d="M2994.8 389.5 L3397.8 389.5" fill="none" data-name="ScaleQuestionWidget"></path>
-						</g>
-						<g transform="translate(2994.75, 358.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionWidget">ScaleQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2994.75, 389.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionWidget">+question: ScaleQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestion">
-							<rect x="1647.8" y="596.0" height="31.0" width="131.0" data-name="ScaleQuestion"></rect>
-						</g>
-						<g transform="translate(1647.75, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestion">
-								<text x="57.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestion">ScaleQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTile">
-							<rect x="2422.8" y="22.5" height="153.0" width="326.0" data-name="StudyTile"></rect>
-							<path d="M2422.8 53.5 L2748.8 53.5" fill="none" data-name="StudyTile"></path>
-							<path d="M2422.8 144.5 L2748.8 144.5" fill="none" data-name="StudyTile"></path>
-						</g>
-						<g transform="translate(2422.75, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTile">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTile">StudyTile</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2422.75, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTile">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTile">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyTile">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyTile">+onTap: dynamic Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyTile">+contentPadding: EdgeInsetsGeometry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2422.75, 144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTile">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EdgeInsetsGeometry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsetsGeometry">
-							<rect x="1233.8" y="381.5" height="31.0" width="182.0" data-name="EdgeInsetsGeometry"></rect>
-						</g>
-						<g transform="translate(1233.75, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="EdgeInsetsGeometry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsetsGeometry">
-								<text x="83.0" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsetsGeometry">EdgeInsetsGeometry</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoundCheckbox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoundCheckbox">
-							<rect x="6044.8" y="45.0" height="108.0" width="323.0" data-name="RoundCheckbox"></rect>
-							<path d="M6044.8 76.0 L6367.8 76.0" fill="none" data-name="RoundCheckbox"></path>
-							<path d="M6044.8 122.0 L6367.8 122.0" fill="none" data-name="RoundCheckbox"></path>
-						</g>
-						<g transform="translate(6044.75, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoundCheckbox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoundCheckbox">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoundCheckbox">RoundCheckbox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6044.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoundCheckbox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoundCheckbox">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoundCheckbox">+onChanged: dynamic Function(bool)?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoundCheckbox">+value: bool?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6044.75, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoundCheckbox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoundCheckbox">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoundCheckbox">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(bool)?">
-							<rect x="6417.0" y="381.5" height="31.0" width="211.0" data-name="dynamic Function(bool)?"></rect>
-						</g>
-						<g transform="translate(6417, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(bool)?">
-								<text x="97.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(bool)?">dynamic Function(bool)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionCard">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionCard">
-							<rect x="3079.8" y="15.0" height="168.0" width="247.0" data-name="InterventionCard"></rect>
-							<path d="M3079.8 46.0 L3326.8 46.0" fill="none" data-name="InterventionCard"></path>
-							<path d="M3079.8 152.0 L3326.8 152.0" fill="none" data-name="InterventionCard"></path>
-						</g>
-						<g transform="translate(3079.75, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionCard">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionCard">InterventionCard</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3079.75, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCard">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionCard">+selected: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionCard">+showCheckbox: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionCard">+showTasks: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionCard">+showDescription: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionCard">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3079.75, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCard">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention">
-							<rect x="3903.5" y="381.5" height="31.0" width="110.0" data-name="Intervention"></rect>
-						</g>
-						<g transform="translate(3903.5, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention">Intervention</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionCardTitle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionCardTitle">
-							<rect x="2788.8" y="22.5" height="153.0" width="251.0" data-name="InterventionCardTitle"></rect>
-							<path d="M2788.8 53.5 L3039.8 53.5" fill="none" data-name="InterventionCardTitle"></path>
-							<path d="M2788.8 144.5 L3039.8 144.5" fill="none" data-name="InterventionCardTitle"></path>
-						</g>
-						<g transform="translate(2788.75, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionCardTitle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionCardTitle">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionCardTitle">InterventionCardTitle</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2788.75, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardTitle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardTitle">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardTitle">+intervention: Intervention?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionCardTitle">+selected: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionCardTitle">+showCheckbox: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionCardTitle">+showDescriptionButton: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionCardTitle">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2788.75, 144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardTitle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardTitle">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardTitle">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionCardDescription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionCardDescription">
-							<rect x="6705.8" y="52.5" height="93.0" width="237.0" data-name="InterventionCardDescription"></rect>
-							<path d="M6705.8 83.5 L6942.8 83.5" fill="none" data-name="InterventionCardDescription"></path>
-							<path d="M6705.8 114.5 L6942.8 114.5" fill="none" data-name="InterventionCardDescription"></path>
-						</g>
-						<g transform="translate(6705.75, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionCardDescription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionCardDescription">
-								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionCardDescription">InterventionCardDescription</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6705.75, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardDescription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardDescription">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardDescription">+intervention: Intervention</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6705.75, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardDescription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardDescription">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardDescription">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_TaskList">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_TaskList">
-							<rect x="6407.8" y="45.0" height="108.0" width="258.0" data-name="_TaskList"></rect>
-							<path d="M6407.8 76.0 L6665.8 76.0" fill="none" data-name="_TaskList"></path>
-							<path d="M6407.8 107.0 L6665.8 107.0" fill="none" data-name="_TaskList"></path>
-						</g>
-						<g transform="translate(6407.75, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_TaskList">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_TaskList">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="_TaskList">_TaskList</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6407.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_TaskList">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_TaskList">
-								<text x="0.0" y="13.5" stroke="none" data-name="_TaskList">+tasks: List&lt;InterventionTask&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6407.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_TaskList">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_TaskList">
-								<text x="0.0" y="13.5" stroke="none" data-name="_TaskList">+String scheduleString()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_TaskList">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="HtmlText">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlText">
-							<rect x="6982.8" y="37.5" height="123.0" width="156.0" data-name="HtmlText"></rect>
-							<path d="M6982.8 68.5 L7138.8 68.5" fill="none" data-name="HtmlText"></path>
-							<path d="M6982.8 129.5 L7138.8 129.5" fill="none" data-name="HtmlText"></path>
-						</g>
-						<g transform="translate(6982.75, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlText">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlText">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlText">HtmlText</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6982.75, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlText">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlText">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlText">+text: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="HtmlText">+style: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="HtmlText">+centered: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6982.75, 129.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlText">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlText">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlText">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TextStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
-							<rect x="7016.3" y="381.5" height="31.0" width="89.0" data-name="TextStyle"></rect>
-						</g>
-						<g transform="translate(7016.25, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
-								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BottomOnboardingNavigation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BottomOnboardingNavigation">
-							<rect x="4364.5" y="0.0" height="198.0" width="248.0" data-name="BottomOnboardingNavigation"></rect>
-							<path d="M4364.5 31.0 L4612.5 31.0" fill="none" data-name="BottomOnboardingNavigation"></path>
-							<path d="M4364.5 167.0 L4612.5 167.0" fill="none" data-name="BottomOnboardingNavigation"></path>
-						</g>
-						<g transform="translate(4364.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BottomOnboardingNavigation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BottomOnboardingNavigation">
-								<text x="116.0" y="13.5" stroke="none" text-anchor="middle" data-name="BottomOnboardingNavigation">BottomOnboardingNavigation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4364.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BottomOnboardingNavigation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BottomOnboardingNavigation">
-								<text x="0.0" y="13.5" stroke="none" data-name="BottomOnboardingNavigation">+onBack: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BottomOnboardingNavigation">+onNext: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BottomOnboardingNavigation">+backLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BottomOnboardingNavigation">+nextLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BottomOnboardingNavigation">+hideNext: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BottomOnboardingNavigation">+nextIcon: Icon?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="BottomOnboardingNavigation">+backIcon: Icon?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="BottomOnboardingNavigation">+progress: Widget?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4364.5, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BottomOnboardingNavigation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BottomOnboardingNavigation">
-								<text x="0.0" y="13.5" stroke="none" data-name="BottomOnboardingNavigation">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="6233.0" y="381.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(6233, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Icon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Icon">
-							<rect x="6143.0" y="381.5" height="31.0" width="50.0" data-name="Icon"></rect>
-						</g>
-						<g transform="translate(6143, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Icon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Icon">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Icon">Icon</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/env/uml.svg b/docs/uml/core/lib/src/env/uml.svg
deleted file mode 100644
index e1d655211..000000000
--- a/docs/uml/core/lib/src/env/uml.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/consent/uml.svg b/docs/uml/core/lib/src/models/consent/uml.svg
deleted file mode 100644
index d14fbdd3c..000000000
--- a/docs/uml/core/lib/src/models/consent/uml.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<svg version="1.1" baseProfile="full" width="328.0" height="209.0" viewbox="0 0 328 209" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[ConsentItem
-	  |
-	  +id: String;
-	  +title: String?;
-	  +description: String?;
-	  +iconName: String
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  +String toString()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="209.0" width="328.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)">
-					<g data-name="ConsentItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItem">
-							<rect x="0.0" y="0.0" height="153.0" width="272.0" data-name="ConsentItem"></rect>
-							<path d="M0.0 31.0 L272.0 31.0" fill="none" data-name="ConsentItem"></path>
-							<path d="M0.0 107.0 L272.0 107.0" fill="none" data-name="ConsentItem"></path>
-						</g>
-						<g transform="translate(0, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItem">
-								<text x="128.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItem">ConsentItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItem">+id: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItem">+title: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItem">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItem">+iconName: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItem">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItem">+String toString()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/data/uml.svg b/docs/uml/core/lib/src/models/data/uml.svg
deleted file mode 100644
index 615c4e2a3..000000000
--- a/docs/uml/core/lib/src/models/data/uml.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<svg version="1.1" baseProfile="full" width="407.0" height="194.0" viewbox="0 0 407 194" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[DataReference
-	  |
-	  +task: String;
-	  +property: String
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  +String toString();
-	  +Map&lt;DateTime, T&gt; retrieveFromResults()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="194.0" width="407.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)">
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="0.0" y="0.0" height="138.0" width="351.0" data-name="DataReference"></rect>
-							<path d="M0.0 31.0 L351.0 31.0" fill="none" data-name="DataReference"></path>
-							<path d="M0.0 77.0 L351.0 77.0" fill="none" data-name="DataReference"></path>
-						</g>
-						<g transform="translate(0, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="167.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReference">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReference">+task: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReference">+property: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 77)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReference">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReference">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReference">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReference">+Map&lt;DateTime, T&gt; retrieveFromResults()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/eligibility/uml.svg b/docs/uml/core/lib/src/models/eligibility/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/eligibility/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/expressions/types/uml.svg b/docs/uml/core/lib/src/models/expressions/types/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/expressions/types/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/expressions/uml.svg b/docs/uml/core/lib/src/models/expressions/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/expressions/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/interventions/tasks/uml.svg b/docs/uml/core/lib/src/models/interventions/tasks/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/interventions/tasks/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/interventions/uml.svg b/docs/uml/core/lib/src/models/interventions/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/interventions/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/observations/tasks/uml.svg b/docs/uml/core/lib/src/models/observations/tasks/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/observations/tasks/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/observations/uml.svg b/docs/uml/core/lib/src/models/observations/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/observations/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/questionnaire/questions/uml.svg b/docs/uml/core/lib/src/models/questionnaire/questions/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/questionnaire/questions/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/questionnaire/uml.svg b/docs/uml/core/lib/src/models/questionnaire/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/questionnaire/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/report/sections/uml.svg b/docs/uml/core/lib/src/models/report/sections/uml.svg
deleted file mode 100644
index 62be008e4..000000000
--- a/docs/uml/core/lib/src/models/report/sections/uml.svg
+++ /dev/null
@@ -1,200 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1011.0" height="412.0" viewbox="0 0 1011 412" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[AverageSection
-	  |
-	  &lt;static&gt;+sectionType: String;
-	  +aggregate: TemporalAggregation?;
-	  +resultProperty: DataReference&lt;num&gt;?
-	  |
-	  +Map&lt;String, dynamic&gt; toJson()
-	]
-	
-	[AverageSection]o-[TemporalAggregation]
-	[AverageSection]o-[DataReference]
-	[&lt;abstract&gt;ReportSection]&lt;:-[AverageSection]
-	
-	[LinearRegressionSection
-	  |
-	  &lt;static&gt;+sectionType: String;
-	  +resultProperty: DataReference&lt;num&gt;?;
-	  +alpha: double;
-	  +improvement: ImprovementDirection?
-	  |
-	  +Map&lt;String, dynamic&gt; toJson()
-	]
-	
-	[LinearRegressionSection]o-[DataReference]
-	[LinearRegressionSection]o-[ImprovementDirection]
-	[&lt;abstract&gt;ReportSection]&lt;:-[LinearRegressionSection]
-	
-	[ImprovementDirection
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ImprovementDirection&gt;;
-	  &lt;static&gt;+positive: ImprovementDirection;
-	  &lt;static&gt;+negative: ImprovementDirection
-	]
-	
-	[ImprovementDirection]o-[ImprovementDirection]
-	[Enum]&lt;:--[ImprovementDirection]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="412.0" width="1011.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M147.1 219.7 L145 229 L145 287 L145.0 287.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M154.3 211.8 L147.1 219.7 L143.9 209.4 L151.2 201.5 Z"></path>
-					</g>
-					<path d="M248.2 213.9 L265.25 229 L328.5765306122449 287 L328.6 287.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M244.8 203.7 L248.2 213.9 L237.7 211.7 L234.3 201.5 Z"></path>
-					</g>
-					<path d="M272.9 30.3 L165 51 L165 78.5 L165.0 78.5 " fill="none"></path>
-					<path d="M273.9 35.5 L272.9 30.3 L271.9 25.1 L286.0 27.8 Z"></path>
-					<path d="M439.6 221.1 L430.25 229 L363.3724489795918 287 L363.4 287.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M450.1 219.1 L439.6 221.1 L443.2 211.0 L453.8 209.0 Z"></path>
-					</g>
-					<path d="M593.5 224.3 L596.75 229 L628.7908163265306 249 L628.8 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M592.6 213.6 L593.5 224.3 L583.8 219.7 L582.9 209.0 Z"></path>
-					</g>
-					<path d="M427.1 30.3 L535 51 L535 71 L535.0 71.0 " fill="none"></path>
-					<path d="M428.1 25.1 L427.1 30.3 L426.1 35.5 L414.0 27.8 Z"></path>
-					<path d="M918.1 252.0 L930 249 L937.5 249 L937.5 249 L945 302.5 L945 302.5 L937.5 356 L937.5 356 L930 356 L930 356 L900 348.5522041763341 L900.0 348.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M907.8 249.0 L918.1 252.0 L910.3 259.4 L900.0 256.4 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M770.5 168.8 L770.5 229 L755.2619047619048 249 L755.3 249.0 " fill="none"></path>
-					</g>
-					<path d="M775.8 168.8 L770.5 168.8 L765.2 168.8 L770.5 155.5 Z"></path>
-					<g data-name="AverageSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSection">
-							<rect x="0.0" y="78.5" height="123.0" width="330.0" data-name="AverageSection"></rect>
-							<path d="M0.0 109.5 L330.0 109.5" fill="none" data-name="AverageSection"></path>
-							<path d="M0.0 170.5 L330.0 170.5" fill="none" data-name="AverageSection"></path>
-						</g>
-						<g transform="translate(0, 78.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSection">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSection">AverageSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 109.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSection">&lt;static&gt;+sectionType: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSection">+aggregate: TemporalAggregation?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSection">+resultProperty: DataReference&lt;num&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 170.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSection">+Map&lt;String, dynamic&gt; toJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="52.0" y="287.0" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
-						</g>
-						<g transform="translate(52, 287)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="278.0" y="287.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(278, 287)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="286.0" y="0.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(286, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSection">
-							<rect x="370.0" y="71.0" height="138.0" width="330.0" data-name="LinearRegressionSection"></rect>
-							<path d="M370.0 102.0 L700.0 102.0" fill="none" data-name="LinearRegressionSection"></path>
-							<path d="M370.0 178.0 L700.0 178.0" fill="none" data-name="LinearRegressionSection"></path>
-						</g>
-						<g transform="translate(370, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSection">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSection">LinearRegressionSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(370, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSection">&lt;static&gt;+sectionType: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSection">+resultProperty: DataReference&lt;num&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSection">+alpha: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="LinearRegressionSection">+improvement: ImprovementDirection?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(370, 178)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSection">+Map&lt;String, dynamic&gt; toJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="529.0" y="249.0" height="107.0" width="371.0" data-name="ImprovementDirection"></rect>
-							<path d="M529.0 280.0 L900.0 280.0" fill="none" data-name="ImprovementDirection"></path>
-						</g>
-						<g transform="translate(529, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(529, 280)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirection">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirection">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirection">&lt;static&gt;+values: List&lt;ImprovementDirection&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirection">&lt;static&gt;+positive: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirection">&lt;static&gt;+negative: ImprovementDirection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="740.0" y="124.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(740, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/report/uml.svg b/docs/uml/core/lib/src/models/report/uml.svg
deleted file mode 100644
index e323c06c7..000000000
--- a/docs/uml/core/lib/src/models/report/uml.svg
+++ /dev/null
@@ -1,306 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1115.0" height="742.0" viewbox="0 0 1115 742" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[AverageSection
-	  |
-	  &lt;static&gt;+sectionType: String;
-	  +aggregate: TemporalAggregation?;
-	  +resultProperty: DataReference&lt;num&gt;?
-	  |
-	  +Map&lt;String, dynamic&gt; toJson()
-	]
-	
-	[AverageSection]o-[TemporalAggregation]
-	[AverageSection]o-[DataReference]
-	[&lt;abstract&gt;ReportSection]&lt;:-[AverageSection]
-	
-	[LinearRegressionSection
-	  |
-	  &lt;static&gt;+sectionType: String;
-	  +resultProperty: DataReference&lt;num&gt;?;
-	  +alpha: double;
-	  +improvement: ImprovementDirection?
-	  |
-	  +Map&lt;String, dynamic&gt; toJson()
-	]
-	
-	[LinearRegressionSection]o-[DataReference]
-	[LinearRegressionSection]o-[ImprovementDirection]
-	[&lt;abstract&gt;ReportSection]&lt;:-[LinearRegressionSection]
-	
-	[ImprovementDirection
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ImprovementDirection&gt;;
-	  &lt;static&gt;+positive: ImprovementDirection;
-	  &lt;static&gt;+negative: ImprovementDirection
-	]
-	
-	[ImprovementDirection]o-[ImprovementDirection]
-	[Enum]&lt;:--[ImprovementDirection]
-	
-	[TemporalAggregation
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;TemporalAggregation&gt;;
-	  &lt;static&gt;+day: TemporalAggregation;
-	  &lt;static&gt;+phase: TemporalAggregation;
-	  &lt;static&gt;+intervention: TemporalAggregation
-	]
-	
-	[TemporalAggregation]o-[TemporalAggregation]
-	[Enum]&lt;:--[TemporalAggregation]
-	
-	[ReportSpecification
-	  |
-	  +primary: ReportSection?;
-	  +secondary: List&lt;ReportSection&gt;
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  +String toString()
-	]
-	
-	[ReportSpecification]o-[&lt;abstract&gt;ReportSection]
-	
-	[&lt;abstract&gt;ReportSection
-	  |
-	  &lt;static&gt;+sectionTypes: Map&lt;String, ReportSection Function(Map&lt;String, dynamic&gt;)&gt;;
-	  &lt;static&gt;+keyType: String;
-	  +type: String;
-	  +id: String;
-	  +title: String?;
-	  +description: String?
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  +String toString()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="742.0" width="1115.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M163.9 534.6 L161.5 544 L167.05555555555554 564 L167.1 564.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M171.3 526.9 L163.9 534.6 L161.0 524.2 L168.5 516.5 Z"></path>
-					</g>
-					<path d="M332.7 524.4 L374.75 544 L496.65277777777777 609.5 L496.7 609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M326.5 515.6 L332.7 524.4 L322.0 525.3 L315.8 516.5 Z"></path>
-					</g>
-					<path d="M206.7 352.7 L184 366 L184 393.5 L184.0 393.5 " fill="none"></path>
-					<path d="M209.4 357.3 L206.7 352.7 L204.0 348.1 L218.2 346.0 Z"></path>
-					<path d="M665.2 534.7 L652 544 L549.7067901234568 609.5 L549.7 609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M675.9 533.7 L665.2 534.7 L669.7 525.0 L680.4 524.0 Z"></path>
-					</g>
-					<path d="M698.4 537.4 L692 544 L734.9475308641976 571.5 L734.9 571.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M708.8 534.4 L698.4 537.4 L701.1 527.0 L711.4 524.0 Z"></path>
-					</g>
-					<path d="M718.9 349.5 L778.5 366 L778.5 386 L778.5 386.0 " fill="none"></path>
-					<path d="M720.4 344.4 L718.9 349.5 L717.5 354.7 L706.1 346.0 Z"></path>
-					<path d="M1022.1 574.5 L1034 571.5 L1041.5 571.5 L1041.5 571.5 L1049 625 L1049 625 L1041.5 678.5 L1041.5 678.5 L1034 678.5 L1034 678.5 L1004 671.0522041763342 L1004.0 671.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1011.8 571.5 L1022.1 574.5 L1014.3 581.9 L1004.0 578.9 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M528.9 465.9 L838.5 544 L831.7098765432099 571.5 L831.7 571.5 " fill="none"></path>
-					</g>
-					<path d="M530.2 460.8 L528.9 465.9 L527.6 471.1 L516.0 462.7 Z"></path>
-					<path d="M386.0 567.4 L398 564 L405.5 564 L405.5 564 L413 625 L413 625 L405.5 686 L405.5 686 L398 686 L398 686 L368 677.4485981308411 L368.0 677.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M375.5 564.9 L386.0 567.4 L378.4 575.1 L368.0 572.6 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M447.8 477.3 L334.75 544 L297.52777777777777 564 L297.5 564.0 " fill="none"></path>
-					</g>
-					<path d="M450.5 481.9 L447.8 477.3 L445.1 472.7 L459.2 470.5 Z"></path>
-					<path d="M374.8 141.7 L374.75 143 L374.75 163 L374.8 163.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M380.1 132.3 L374.8 141.7 L369.4 132.3 L374.8 123.0 Z"></path>
-					</g>
-					<g data-name="AverageSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSection">
-							<rect x="19.0" y="393.5" height="123.0" width="330.0" data-name="AverageSection"></rect>
-							<path d="M19.0 424.5 L349.0 424.5" fill="none" data-name="AverageSection"></path>
-							<path d="M19.0 485.5 L349.0 485.5" fill="none" data-name="AverageSection"></path>
-						</g>
-						<g transform="translate(19, 393.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSection">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSection">AverageSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19, 424.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSection">&lt;static&gt;+sectionType: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSection">+aggregate: TemporalAggregation?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSection">+resultProperty: DataReference&lt;num&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19, 485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSection">+Map&lt;String, dynamic&gt; toJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="0.0" y="564.0" height="122.0" width="368.0" data-name="TemporalAggregation"></rect>
-							<path d="M0.0 595.0 L368.0 595.0" fill="none" data-name="TemporalAggregation"></path>
-						</g>
-						<g transform="translate(0, 564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregation">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregation">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregation">&lt;static&gt;+values: List&lt;TemporalAggregation&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregation">&lt;static&gt;+day: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregation">&lt;static&gt;+phase: TemporalAggregation</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregation">&lt;static&gt;+intervention: TemporalAggregation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="458.0" y="609.5" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(458, 609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="31.8" y="163.0" height="183.0" width="686.0" data-name="ReportSection"></rect>
-							<path d="M31.8 194.0 L717.8 194.0" fill="none" data-name="ReportSection"></path>
-							<path d="M31.8 300.0 L717.8 300.0" fill="none" data-name="ReportSection"></path>
-						</g>
-						<g transform="translate(31.75, 163)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="335.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31.75, 194)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSection">&lt;static&gt;+sectionTypes: Map&lt;String, ReportSection Function(Map&lt;String, dynamic&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSection">&lt;static&gt;+keyType: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSection">+type: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSection">+id: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportSection">+title: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportSection">+description: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31.75, 300)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSection">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSection">+String toString()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSection">
-							<rect x="613.5" y="386.0" height="138.0" width="330.0" data-name="LinearRegressionSection"></rect>
-							<path d="M613.5 417.0 L943.5 417.0" fill="none" data-name="LinearRegressionSection"></path>
-							<path d="M613.5 493.0 L943.5 493.0" fill="none" data-name="LinearRegressionSection"></path>
-						</g>
-						<g transform="translate(613.5, 386)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSection">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSection">LinearRegressionSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(613.5, 417)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSection">&lt;static&gt;+sectionType: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSection">+resultProperty: DataReference&lt;num&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSection">+alpha: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="LinearRegressionSection">+improvement: ImprovementDirection?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(613.5, 493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSection">+Map&lt;String, dynamic&gt; toJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="633.0" y="571.5" height="107.0" width="371.0" data-name="ImprovementDirection"></rect>
-							<path d="M633.0 602.5 L1004.0 602.5" fill="none" data-name="ImprovementDirection"></path>
-						</g>
-						<g transform="translate(633, 571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(633, 602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirection">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirection">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirection">&lt;static&gt;+values: List&lt;ImprovementDirection&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirection">&lt;static&gt;+positive: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirection">&lt;static&gt;+negative: ImprovementDirection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="455.0" y="439.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(455, 439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSpecification">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSpecification">
-							<rect x="235.3" y="0.0" height="123.0" width="279.0" data-name="ReportSpecification"></rect>
-							<path d="M235.3 31.0 L514.3 31.0" fill="none" data-name="ReportSpecification"></path>
-							<path d="M235.3 77.0 L514.3 77.0" fill="none" data-name="ReportSpecification"></path>
-						</g>
-						<g transform="translate(235.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSpecification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSpecification">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSpecification">ReportSpecification</text>
-								
-							</g>
-						</g>
-						<g transform="translate(235.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSpecification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSpecification">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSpecification">+primary: ReportSection?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSpecification">+secondary: List&lt;ReportSection&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(235.25, 77)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSpecification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSpecification">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSpecification">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSpecification">+String toString()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/results/uml.svg b/docs/uml/core/lib/src/models/results/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/results/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/study_results/results/uml.svg b/docs/uml/core/lib/src/models/study_results/results/uml.svg
deleted file mode 100644
index d1a28082e..000000000
--- a/docs/uml/core/lib/src/models/study_results/results/uml.svg
+++ /dev/null
@@ -1,123 +0,0 @@
-<svg version="1.1" baseProfile="full" width="692.0" height="336.0" viewbox="0 0 692 336" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[InterventionResult
-	  |
-	  &lt;static&gt;+studyResultType: String
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  +List&lt;String&gt; getHeaders();
-	  +List&lt;dynamic&gt; getValues()
-	]
-	
-	[&lt;abstract&gt;StudyResult]&lt;:-[InterventionResult]
-	
-	[NumericResult
-	  |
-	  &lt;static&gt;+studyResultType: String;
-	  +resultProperty: DataReference&lt;num&gt;
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  +List&lt;String&gt; getHeaders();
-	  +List&lt;dynamic&gt; getValues()
-	]
-	
-	[NumericResult]o-[DataReference]
-	[&lt;abstract&gt;StudyResult]&lt;:-[NumericResult]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="336.0" width="692.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M238.5 29.9 L138 51 L138 78.5 L138.0 78.5 " fill="none"></path>
-					<path d="M239.5 35.1 L238.5 29.9 L237.4 24.7 L251.5 27.2 Z"></path>
-					<path d="M476.0 227.7 L476 229 L476 249 L476.0 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M481.3 218.3 L476.0 227.7 L470.7 218.3 L476.0 209.0 Z"></path>
-					</g>
-					<path d="M375.5 29.9 L476 51 L476 71 L476.0 71.0 " fill="none"></path>
-					<path d="M376.6 24.7 L375.5 29.9 L374.5 35.1 L362.5 27.2 Z"></path>
-					<g data-name="InterventionResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionResult">
-							<rect x="0.0" y="78.5" height="123.0" width="276.0" data-name="InterventionResult"></rect>
-							<path d="M0.0 109.5 L276.0 109.5" fill="none" data-name="InterventionResult"></path>
-							<path d="M0.0 140.5 L276.0 140.5" fill="none" data-name="InterventionResult"></path>
-						</g>
-						<g transform="translate(0, 78.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionResult">
-								<text x="130.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionResult">InterventionResult</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 109.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResult">&lt;static&gt;+studyResultType: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 140.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResult">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionResult">+List&lt;String&gt; getHeaders()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionResult">+List&lt;dynamic&gt; getValues()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyResult">
-							<rect x="251.5" y="0.0" height="31.0" width="111.0" data-name="StudyResult"></rect>
-						</g>
-						<g transform="translate(251.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyResult">
-								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyResult">StudyResult</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NumericResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NumericResult">
-							<rect x="316.0" y="71.0" height="138.0" width="320.0" data-name="NumericResult"></rect>
-							<path d="M316.0 102.0 L636.0 102.0" fill="none" data-name="NumericResult"></path>
-							<path d="M316.0 148.0 L636.0 148.0" fill="none" data-name="NumericResult"></path>
-						</g>
-						<g transform="translate(316, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NumericResult">
-								<text x="152.0" y="13.5" stroke="none" text-anchor="middle" data-name="NumericResult">NumericResult</text>
-								
-							</g>
-						</g>
-						<g transform="translate(316, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericResult">&lt;static&gt;+studyResultType: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NumericResult">+resultProperty: DataReference&lt;num&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(316, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericResult">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NumericResult">+List&lt;String&gt; getHeaders()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NumericResult">+List&lt;dynamic&gt; getValues()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="408.5" y="249.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(408.5, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/study_results/uml.svg b/docs/uml/core/lib/src/models/study_results/uml.svg
deleted file mode 100644
index 7cdd82c0c..000000000
--- a/docs/uml/core/lib/src/models/study_results/uml.svg
+++ /dev/null
@@ -1,156 +0,0 @@
-<svg version="1.1" baseProfile="full" width="761.0" height="488.0" viewbox="0 0 761 488" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;StudyResult
-	  |
-	  &lt;static&gt;+studyResultTypes: Map&lt;String, StudyResult Function(Map&lt;String, dynamic&gt;)&gt;;
-	  &lt;static&gt;+keyType: String;
-	  +type: String;
-	  +id: String;
-	  +filename: String
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  +List&lt;String&gt; getHeaders();
-	  +List&lt;dynamic&gt; getValues()
-	]
-	
-	[InterventionResult
-	  |
-	  &lt;static&gt;+studyResultType: String
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  +List&lt;String&gt; getHeaders();
-	  +List&lt;dynamic&gt; getValues()
-	]
-	
-	[&lt;abstract&gt;StudyResult]&lt;:-[InterventionResult]
-	
-	[NumericResult
-	  |
-	  &lt;static&gt;+studyResultType: String;
-	  +resultProperty: DataReference&lt;num&gt;
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  +List&lt;String&gt; getHeaders();
-	  +List&lt;dynamic&gt; getValues()
-	]
-	
-	[NumericResult]o-[DataReference]
-	[&lt;abstract&gt;StudyResult]&lt;:-[NumericResult]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="488.0" width="761.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M202.7 190.3 L183.5 203 L183.5 230.5 L183.5 230.5 " fill="none"></path>
-					<path d="M205.6 194.8 L202.7 190.3 L199.7 185.9 L213.8 183.0 Z"></path>
-					<path d="M521.5 379.7 L521.5 381 L521.5 401 L521.5 401.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M526.8 370.3 L521.5 379.7 L516.2 370.3 L521.5 361.0 Z"></path>
-					</g>
-					<path d="M502.3 190.3 L521.5 203 L521.5 223 L521.5 223.0 " fill="none"></path>
-					<path d="M505.3 185.9 L502.3 190.3 L499.4 194.8 L491.2 183.0 Z"></path>
-					<g data-name="StudyResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyResult">
-							<rect x="0.0" y="0.0" height="183.0" width="705.0" data-name="StudyResult"></rect>
-							<path d="M0.0 31.0 L705.0 31.0" fill="none" data-name="StudyResult"></path>
-							<path d="M0.0 122.0 L705.0 122.0" fill="none" data-name="StudyResult"></path>
-						</g>
-						<g transform="translate(0, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyResult">
-								<text x="344.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyResult">StudyResult</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyResult">&lt;static&gt;+studyResultTypes: Map&lt;String, StudyResult Function(Map&lt;String, dynamic&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyResult">&lt;static&gt;+keyType: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyResult">+type: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyResult">+id: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyResult">+filename: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyResult">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyResult">+List&lt;String&gt; getHeaders()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyResult">+List&lt;dynamic&gt; getValues()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionResult">
-							<rect x="45.5" y="230.5" height="123.0" width="276.0" data-name="InterventionResult"></rect>
-							<path d="M45.5 261.5 L321.5 261.5" fill="none" data-name="InterventionResult"></path>
-							<path d="M45.5 292.5 L321.5 292.5" fill="none" data-name="InterventionResult"></path>
-						</g>
-						<g transform="translate(45.5, 230.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionResult">
-								<text x="130.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionResult">InterventionResult</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResult">&lt;static&gt;+studyResultType: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45.5, 292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResult">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionResult">+List&lt;String&gt; getHeaders()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionResult">+List&lt;dynamic&gt; getValues()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NumericResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NumericResult">
-							<rect x="361.5" y="223.0" height="138.0" width="320.0" data-name="NumericResult"></rect>
-							<path d="M361.5 254.0 L681.5 254.0" fill="none" data-name="NumericResult"></path>
-							<path d="M361.5 300.0 L681.5 300.0" fill="none" data-name="NumericResult"></path>
-						</g>
-						<g transform="translate(361.5, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NumericResult">
-								<text x="152.0" y="13.5" stroke="none" text-anchor="middle" data-name="NumericResult">NumericResult</text>
-								
-							</g>
-						</g>
-						<g transform="translate(361.5, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericResult">&lt;static&gt;+studyResultType: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NumericResult">+resultProperty: DataReference&lt;num&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(361.5, 300)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericResult">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NumericResult">+List&lt;String&gt; getHeaders()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NumericResult">+List&lt;dynamic&gt; getValues()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="454.0" y="401.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(454, 401)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/study_schedule/uml.svg b/docs/uml/core/lib/src/models/study_schedule/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/study_schedule/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/tables/uml.svg b/docs/uml/core/lib/src/models/tables/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/tables/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/tasks/uml.svg b/docs/uml/core/lib/src/models/tasks/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/tasks/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/uml.svg b/docs/uml/core/lib/src/models/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/uml.svg b/docs/uml/core/lib/src/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/util/multimodal/uml.svg b/docs/uml/core/lib/src/util/multimodal/uml.svg
deleted file mode 100644
index 987386914..000000000
--- a/docs/uml/core/lib/src/util/multimodal/uml.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<svg version="1.1" baseProfile="full" width="408.0" height="179.0" viewbox="0 0 408 179" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[BlobStorageHandler
-	  |
-	  &lt;static&gt;-_observationsBucketName: String
-	  |
-	  +dynamic uploadObservation();
-	  +dynamic downloadObservation();
-	  +dynamic removeObservation()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="179.0" width="408.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)">
-					<g data-name="BlobStorageHandler">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BlobStorageHandler">
-							<rect x="0.0" y="0.0" height="123.0" width="352.0" data-name="BlobStorageHandler"></rect>
-							<path d="M0.0 31.0 L352.0 31.0" fill="none" data-name="BlobStorageHandler"></path>
-							<path d="M0.0 62.0 L352.0 62.0" fill="none" data-name="BlobStorageHandler"></path>
-						</g>
-						<g transform="translate(0, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BlobStorageHandler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BlobStorageHandler">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BlobStorageHandler">BlobStorageHandler</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BlobStorageHandler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BlobStorageHandler">
-								<text x="0.0" y="13.5" stroke="none" data-name="BlobStorageHandler">&lt;static&gt;-_observationsBucketName: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 62)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BlobStorageHandler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BlobStorageHandler">
-								<text x="0.0" y="13.5" stroke="none" data-name="BlobStorageHandler">+dynamic uploadObservation()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BlobStorageHandler">+dynamic downloadObservation()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BlobStorageHandler">+dynamic removeObservation()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/util/uml.svg b/docs/uml/core/lib/src/util/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/util/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/uml.svg b/docs/uml/core/lib/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/common_views/pages/uml.svg b/docs/uml/designer_v2/lib/common_views/pages/uml.svg
deleted file mode 100644
index afcb7191f..000000000
--- a/docs/uml/designer_v2/lib/common_views/pages/uml.svg
+++ /dev/null
@@ -1,84 +0,0 @@
-<svg version="1.1" baseProfile="full" width="389.0" height="251.0" viewbox="0 0 389 251" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[SplashPage
-	  |
-	  +Widget build()
-	]
-	
-	[ErrorPage
-	  |
-	  +error: Exception?
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ErrorPage]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="251.0" width="389.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M252.0 59.8 L252 82 L252 102 L252.0 102.0 " fill="none"></path>
-					<path d="M257.3 59.8 L252.0 59.8 L246.7 59.8 L252.0 46.5 Z"></path>
-					<g data-name="SplashPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SplashPage">
-							<rect x="0.0" y="0.0" height="62.0" width="136.0" data-name="SplashPage"></rect>
-							<path d="M0.0 31.0 L136.0 31.0" fill="none" data-name="SplashPage"></path>
-						</g>
-						<g transform="translate(0, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SplashPage">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SplashPage">SplashPage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SplashPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SplashPage">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ErrorPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ErrorPage">
-							<rect x="171.0" y="102.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
-							<path d="M171.0 133.0 L333.0 133.0" fill="none" data-name="ErrorPage"></path>
-							<path d="M171.0 164.0 L333.0 164.0" fill="none" data-name="ErrorPage"></path>
-						</g>
-						<g transform="translate(171, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ErrorPage">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="ErrorPage">ErrorPage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(171, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+error: Exception?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(171, 164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="176.0" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(176, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/common_views/sidesheet/uml.svg b/docs/uml/designer_v2/lib/common_views/sidesheet/uml.svg
deleted file mode 100644
index 828b9f312..000000000
--- a/docs/uml/designer_v2/lib/common_views/sidesheet/uml.svg
+++ /dev/null
@@ -1,203 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1256.0" height="441.0" viewbox="0 0 1256 441" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[FormSideSheetTab
-	  |
-	  +formViewBuilder: Widget Function(T)
-	]
-	
-	[FormSideSheetTab]o-[Widget Function(T)]
-	[NavbarTab]&lt;:-[FormSideSheetTab]
-	
-	[SidesheetTab
-	  |
-	  +builder: Widget Function(BuildContext)
-	]
-	
-	[SidesheetTab]o-[Widget Function(BuildContext)]
-	[NavbarTab]&lt;:-[SidesheetTab]
-	
-	[Sidesheet
-	  |
-	  &lt;static&gt;+kDefaultWidth: double;
-	  +titleText: String;
-	  +body: Widget?;
-	  +tabs: List&lt;SidesheetTab&gt;?;
-	  +actionButtons: List&lt;Widget&gt;?;
-	  +width: double?;
-	  +withCloseButton: bool;
-	  +ignoreAppBar: bool;
-	  +collapseSingleTab: bool;
-	  +bodyPadding: EdgeInsets?;
-	  +wrapContent: Widget Function(Widget)?
-	]
-	
-	[Sidesheet]o-[&lt;abstract&gt;Widget]
-	[Sidesheet]o-[EdgeInsets]
-	[Sidesheet]o-[Widget Function(Widget)?]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="441.0" width="1256.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M156.5 332.7 L156.5 334 L156.5 354 L156.5 354.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M161.8 323.3 L156.5 332.7 L151.2 323.3 L156.5 314.0 Z"></path>
-					</g>
-					<path d="M304.1 129.1 L156.5 232 L156.5 252 L156.5 252.0 " fill="none"></path>
-					<path d="M307.1 133.5 L304.1 129.1 L301.0 124.7 L315.0 121.5 Z"></path>
-					<path d="M518.0 332.7 L518 334 L518 354 L518.0 354.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M523.3 323.3 L518.0 332.7 L512.7 323.3 L518.0 314.0 Z"></path>
-					</g>
-					<path d="M370.4 129.1 L518 232 L518 252 L518.0 252.0 " fill="none"></path>
-					<path d="M373.5 124.7 L370.4 129.1 L367.4 133.5 L359.5 121.5 Z"></path>
-					<path d="M765.5 225.1 L758.5 232 L758.5 267.5 L758.5 267.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M775.9 222.3 L765.5 225.1 L768.4 214.7 L778.8 212.0 Z"></path>
-					</g>
-					<path d="M886.5 230.7 L886.5 232 L886.5 267.5 L886.5 267.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M891.8 221.3 L886.5 230.7 L881.2 221.3 L886.5 212.0 Z"></path>
-					</g>
-					<path d="M1072.9 221.7 L1089.5 232 L1089.5 267.5 L1089.5 267.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1067.7 212.2 L1072.9 221.7 L1062.1 221.3 L1057.0 211.8 Z"></path>
-					</g>
-					<g data-name="FormSideSheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSideSheetTab">
-							<rect x="0.0" y="252.0" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
-							<path d="M0.0 283.0 L313.0 283.0" fill="none" data-name="FormSideSheetTab"></path>
-						</g>
-						<g transform="translate(0, 252)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSideSheetTab">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormSideSheetTab">FormSideSheetTab</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 283)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSideSheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSideSheetTab">+formViewBuilder: Widget Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="73.5" y="354.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
-						</g>
-						<g transform="translate(73.5, 354)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NavbarTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="285.8" y="90.5" height="31.0" width="103.0" data-name="NavbarTab"></rect>
-						</g>
-						<g transform="translate(285.75, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SidesheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SidesheetTab">
-							<rect x="353.0" y="252.0" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
-							<path d="M353.0 283.0 L683.0 283.0" fill="none" data-name="SidesheetTab"></path>
-						</g>
-						<g transform="translate(353, 252)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SidesheetTab">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="SidesheetTab">SidesheetTab</text>
-								
-							</g>
-						</g>
-						<g transform="translate(353, 283)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SidesheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="SidesheetTab">+builder: Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="390.0" y="354.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
-						</g>
-						<g transform="translate(390, 354)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Sidesheet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Sidesheet">
-							<rect x="716.0" y="0.0" height="212.0" width="341.0" data-name="Sidesheet"></rect>
-							<path d="M716.0 31.0 L1057.0 31.0" fill="none" data-name="Sidesheet"></path>
-						</g>
-						<g transform="translate(716, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Sidesheet">
-								<text x="162.5" y="13.5" stroke="none" text-anchor="middle" data-name="Sidesheet">Sidesheet</text>
-								
-							</g>
-						</g>
-						<g transform="translate(716, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Sidesheet">
-								<text x="0.0" y="13.5" stroke="none" data-name="Sidesheet">&lt;static&gt;+kDefaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Sidesheet">+titleText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Sidesheet">+body: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Sidesheet">+tabs: List&lt;SidesheetTab&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Sidesheet">+actionButtons: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Sidesheet">+width: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Sidesheet">+withCloseButton: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Sidesheet">+ignoreAppBar: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Sidesheet">+collapseSingleTab: bool</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Sidesheet">+bodyPadding: EdgeInsets?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Sidesheet">+wrapContent: Widget Function(Widget)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="723.0" y="267.5" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(723, 267.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EdgeInsets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="834.0" y="267.5" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
-						</g>
-						<g transform="translate(834, 267.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(Widget)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Widget)?">
-							<rect x="979.0" y="267.5" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
-						</g>
-						<g transform="translate(979, 267.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Widget)?">
-								<text x="102.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Widget)?">Widget Function(Widget)?</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/common_views/uml.svg b/docs/uml/designer_v2/lib/common_views/uml.svg
deleted file mode 100644
index 425f28f48..000000000
--- a/docs/uml/designer_v2/lib/common_views/uml.svg
+++ /dev/null
@@ -1,3242 +0,0 @@
-<svg version="1.1" baseProfile="full" width="21546.0" height="982.0" viewbox="0 0 21546 982" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;ISyncIndicatorViewModel
-	  |
-	  +isDirty: bool;
-	  +lastSynced: DateTime?
-	]
-	
-	[SyncIndicator
-	  |
-	  +state: AsyncValue&lt;T&gt;;
-	  +lastSynced: DateTime?;
-	  +isDirty: bool;
-	  +animationDuration: int;
-	  +iconSize: double
-	]
-	
-	[SyncIndicator]o-[&lt;abstract&gt;AsyncValue]
-	
-	[EmptyBody
-	  |
-	  +icon: IconData?;
-	  +leading: Widget?;
-	  +leadingSpacing: double?;
-	  +title: String?;
-	  +description: String?;
-	  +button: Widget?
-	  |
-	  +Widget build()
-	]
-	
-	[EmptyBody]o-[IconData]
-	[EmptyBody]o-[&lt;abstract&gt;Widget]
-	
-	[NullHelperDecoration
-	]
-	
-	[InputDecoration]&lt;:-[NullHelperDecoration]
-	
-	[Search
-	  |
-	  +onQueryChanged: dynamic Function(String);
-	  +searchController: SearchController?;
-	  +hintText: String?;
-	  +initialText: String?
-	]
-	
-	[Search]o-[dynamic Function(String)]
-	[Search]o-[SearchController]
-	
-	[SearchController
-	  |
-	  +setText: void Function(String)
-	]
-	
-	[SearchController]o-[void Function(String)]
-	
-	[ConstrainedWidthFlexible
-	  |
-	  +minWidth: double;
-	  +maxWidth: double;
-	  +flex: int;
-	  +flexSum: int;
-	  +child: Widget;
-	  +outerConstraints: BoxConstraints
-	  |
-	  +Widget build();
-	  -double _getWidth()
-	]
-	
-	[ConstrainedWidthFlexible]o-[&lt;abstract&gt;Widget]
-	[ConstrainedWidthFlexible]o-[BoxConstraints]
-	
-	[AsyncValueWidget
-	  |
-	  +value: AsyncValue&lt;T&gt;;
-	  +data: Widget Function(T);
-	  +error: Widget Function(Object, StackTrace?)?;
-	  +loading: Widget Function()?;
-	  +empty: Widget Function()?
-	  |
-	  +Widget build();
-	  -Widget _buildDataOrEmptyWidget();
-	  -Widget _defaultError();
-	  -Widget _defaultLoad()
-	]
-	
-	[AsyncValueWidget]o-[&lt;abstract&gt;AsyncValue]
-	[AsyncValueWidget]o-[Widget Function(T)]
-	[AsyncValueWidget]o-[Widget Function(Object, StackTrace?)?]
-	[AsyncValueWidget]o-[Widget Function()?]
-	
-	[ActionPopUpMenuButton
-	  |
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +triggerIconColor: Color?;
-	  +triggerIconColorHover: Color?;
-	  +triggerIconSize: double;
-	  +disableSplashEffect: bool;
-	  +hideOnEmpty: bool;
-	  +orientation: Axis;
-	  +elevation: double?;
-	  +splashRadius: double?;
-	  +enabled: bool;
-	  +position: PopupMenuPosition
-	  |
-	  +Widget build();
-	  -Widget _buildPopupMenu()
-	]
-	
-	[ActionPopUpMenuButton]o-[Color]
-	[ActionPopUpMenuButton]o-[Axis]
-	[ActionPopUpMenuButton]o-[PopupMenuPosition]
-	
-	[PrimaryButton
-	  |
-	  +text: String;
-	  +icon: IconData?;
-	  +isLoading: bool;
-	  +showLoadingEarliestAfterMs: int;
-	  +onPressed: void Function()?;
-	  +tooltip: String;
-	  +tooltipDisabled: String;
-	  +enabled: bool;
-	  +onPressedFuture: dynamic Function()?;
-	  +innerPadding: EdgeInsets;
-	  +minimumSize: Size?;
-	  +isDisabled: bool
-	]
-	
-	[PrimaryButton]o-[IconData]
-	[PrimaryButton]o-[void Function()?]
-	[PrimaryButton]o-[dynamic Function()?]
-	[PrimaryButton]o-[EdgeInsets]
-	[PrimaryButton]o-[Size]
-	
-	[Hyperlink
-	  |
-	  +text: String;
-	  +url: String?;
-	  +onClick: void Function()?;
-	  +linkColor: Color;
-	  +hoverColor: Color?;
-	  +visitedColor: Color?;
-	  +style: TextStyle?;
-	  +hoverStyle: TextStyle?;
-	  +visitedStyle: TextStyle?;
-	  +icon: IconData?;
-	  +iconSize: double?
-	]
-	
-	[Hyperlink]o-[void Function()?]
-	[Hyperlink]o-[Color]
-	[Hyperlink]o-[TextStyle]
-	[Hyperlink]o-[IconData]
-	
-	[DismissButton
-	  |
-	  +onPressed: void Function()?;
-	  +text: String?
-	  |
-	  +Widget build()
-	]
-	
-	[DismissButton]o-[void Function()?]
-	
-	[FormTableRow
-	  |
-	  +label: String?;
-	  +labelBuilder: Widget Function(BuildContext)?;
-	  +labelStyle: TextStyle?;
-	  +labelHelpText: String?;
-	  +input: Widget;
-	  +control: AbstractControl&lt;dynamic&gt;?;
-	  +layout: FormTableRowLayout?
-	]
-	
-	[FormTableRow]o-[Widget Function(BuildContext)?]
-	[FormTableRow]o-[TextStyle]
-	[FormTableRow]o-[&lt;abstract&gt;Widget]
-	[FormTableRow]o-[&lt;abstract&gt;AbstractControl]
-	[FormTableRow]o-[FormTableRowLayout]
-	
-	[FormTableLayout
-	  |
-	  +rows: List&lt;FormTableRow&gt;;
-	  +columnWidths: Map&lt;int, TableColumnWidth&gt;;
-	  +rowDivider: Widget?;
-	  +rowLayout: FormTableRowLayout?;
-	  +rowLabelStyle: TextStyle?
-	  |
-	  +Widget build()
-	]
-	
-	[FormTableLayout]o-[&lt;abstract&gt;Widget]
-	[FormTableLayout]o-[FormTableRowLayout]
-	[FormTableLayout]o-[TextStyle]
-	
-	[FormSectionHeader
-	  |
-	  +title: String;
-	  +titleTextStyle: TextStyle?;
-	  +helpText: String?;
-	  +divider: bool;
-	  +helpTextDisabled: bool
-	  |
-	  +Widget build()
-	]
-	
-	[FormSectionHeader]o-[TextStyle]
-	
-	[FormLabel
-	  |
-	  +labelText: String?;
-	  +helpText: String?;
-	  +labelTextStyle: TextStyle?;
-	  +layout: FormTableRowLayout?
-	  |
-	  +Widget build()
-	]
-	
-	[FormLabel]o-[TextStyle]
-	[FormLabel]o-[FormTableRowLayout]
-	
-	[FormTableRowLayout
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;FormTableRowLayout&gt;;
-	  &lt;static&gt;+vertical: FormTableRowLayout;
-	  &lt;static&gt;+horizontal: FormTableRowLayout
-	]
-	
-	[FormTableRowLayout]o-[FormTableRowLayout]
-	[Enum]&lt;:--[FormTableRowLayout]
-	
-	[ActionMenuType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ActionMenuType&gt;;
-	  &lt;static&gt;+inline: ActionMenuType;
-	  &lt;static&gt;+popup: ActionMenuType
-	]
-	
-	[ActionMenuType]o-[ActionMenuType]
-	[Enum]&lt;:--[ActionMenuType]
-	
-	[ReactiveCustomColorPicker
-	]
-	
-	[ReactiveFormField]&lt;:-[ReactiveCustomColorPicker]
-	
-	[NavbarTab
-	  |
-	  +title: String;
-	  +intent: RoutingIntent?;
-	  +index: int;
-	  +enabled: bool
-	]
-	
-	[NavbarTab]o-[RoutingIntent]
-	
-	[TabbedNavbar
-	  |
-	  +tabs: List&lt;T&gt;;
-	  +selectedTab: T?;
-	  +indicator: BoxDecoration?;
-	  +height: double?;
-	  +disabledBackgroundColor: Color?;
-	  +disabledTooltipText: String?;
-	  +onSelect: void Function(int, T)?;
-	  +labelPadding: EdgeInsets?;
-	  +labelSpacing: double?;
-	  +indicatorSize: TabBarIndicatorSize?;
-	  +isScrollable: bool;
-	  +backgroundColor: Color?;
-	  +labelColorHover: Color?;
-	  +unselectedLabelColorHover: Color?
-	]
-	
-	[TabbedNavbar]o-[BoxDecoration]
-	[TabbedNavbar]o-[Color]
-	[TabbedNavbar]o-[void Function(int, T)?]
-	[TabbedNavbar]o-[EdgeInsets]
-	[TabbedNavbar]o-[TabBarIndicatorSize]
-	
-	[Collapsible
-	  |
-	  +contentBuilder: Widget Function(BuildContext, bool);
-	  +headerBuilder: Widget Function(BuildContext, bool)?;
-	  +title: String?;
-	  +isCollapsed: bool
-	]
-	
-	[Collapsible]o-[Widget Function(BuildContext, bool)]
-	[Collapsible]o-[Widget Function(BuildContext, bool)?]
-	
-	[StudyULogo
-	  |
-	  +onTap: void Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[StudyULogo]o-[void Function()?]
-	
-	[FormSideSheetTab
-	  |
-	  +formViewBuilder: Widget Function(T)
-	]
-	
-	[FormSideSheetTab]o-[Widget Function(T)]
-	[NavbarTab]&lt;:-[FormSideSheetTab]
-	
-	[SidesheetTab
-	  |
-	  +builder: Widget Function(BuildContext)
-	]
-	
-	[SidesheetTab]o-[Widget Function(BuildContext)]
-	[NavbarTab]&lt;:-[SidesheetTab]
-	
-	[Sidesheet
-	  |
-	  &lt;static&gt;+kDefaultWidth: double;
-	  +titleText: String;
-	  +body: Widget?;
-	  +tabs: List&lt;SidesheetTab&gt;?;
-	  +actionButtons: List&lt;Widget&gt;?;
-	  +width: double?;
-	  +withCloseButton: bool;
-	  +ignoreAppBar: bool;
-	  +collapseSingleTab: bool;
-	  +bodyPadding: EdgeInsets?;
-	  +wrapContent: Widget Function(Widget)?
-	]
-	
-	[Sidesheet]o-[&lt;abstract&gt;Widget]
-	[Sidesheet]o-[EdgeInsets]
-	[Sidesheet]o-[Widget Function(Widget)?]
-	
-	[MouseEventsRegion
-	  |
-	  +onTap: void Function()?;
-	  +onHover: void Function(PointerHoverEvent)?;
-	  +onEnter: void Function(PointerEnterEvent)?;
-	  +onExit: void Function(PointerExitEvent)?;
-	  +autoselectCursor: bool;
-	  +cursor: SystemMouseCursor;
-	  &lt;static&gt;+defaultCursor: SystemMouseCursor;
-	  +autoCursor: SystemMouseCursor
-	]
-	
-	[MouseEventsRegion]o-[void Function()?]
-	[MouseEventsRegion]o-[void Function(PointerHoverEvent)?]
-	[MouseEventsRegion]o-[void Function(PointerEnterEvent)?]
-	[MouseEventsRegion]o-[void Function(PointerExitEvent)?]
-	[MouseEventsRegion]o-[SystemMouseCursor]
-	
-	[FormControlLabel
-	  |
-	  +formControl: AbstractControl&lt;dynamic&gt;;
-	  +text: String;
-	  +isClickable: bool;
-	  +textStyle: TextStyle?;
-	  +onClick: void Function(AbstractControl&lt;dynamic&gt;)?
-	  |
-	  +Widget build()
-	]
-	
-	[FormControlLabel]o-[&lt;abstract&gt;AbstractControl]
-	[FormControlLabel]o-[TextStyle]
-	[FormControlLabel]o-[void Function(AbstractControl&lt;dynamic&gt;)?]
-	
-	[&lt;abstract&gt;IWithBanner
-	  |
-	  +Widget? banner()
-	]
-	
-	[BannerBox
-	  |
-	  +prefixIcon: Widget?;
-	  +body: Widget;
-	  +style: BannerStyle;
-	  +padding: EdgeInsets?;
-	  +noPrefix: bool;
-	  +dismissable: bool;
-	  +isDismissed: bool?;
-	  +onDismissed: dynamic Function()?;
-	  +dismissIconSize: double
-	]
-	
-	[BannerBox]o-[&lt;abstract&gt;Widget]
-	[BannerBox]o-[BannerStyle]
-	[BannerBox]o-[EdgeInsets]
-	[BannerBox]o-[dynamic Function()?]
-	
-	[BannerStyle
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;BannerStyle&gt;;
-	  &lt;static&gt;+warning: BannerStyle;
-	  &lt;static&gt;+info: BannerStyle;
-	  &lt;static&gt;+error: BannerStyle
-	]
-	
-	[BannerStyle]o-[BannerStyle]
-	[Enum]&lt;:--[BannerStyle]
-	
-	[SecondaryButton
-	  |
-	  +text: String;
-	  +icon: IconData?;
-	  +isLoading: bool;
-	  +onPressed: void Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[SecondaryButton]o-[IconData]
-	[SecondaryButton]o-[void Function()?]
-	
-	[IconPack
-	  |
-	  &lt;static&gt;+defaultPack: List&lt;IconOption&gt;;
-	  &lt;static&gt;+material: List&lt;IconOption&gt;
-	  |
-	  &lt;static&gt;+IconOption? resolveIconByName()
-	]
-	
-	[IconOption
-	  |
-	  +name: String;
-	  +icon: IconData?;
-	  +isEmpty: bool;
-	  +props: List&lt;Object?&gt;
-	  |
-	  +String toJson();
-	  &lt;static&gt;+IconOption fromJson()
-	]
-	
-	[IconOption]o-[IconData]
-	[&lt;abstract&gt;Equatable]&lt;:-[IconOption]
-	
-	[ReactiveIconPicker
-	]
-	
-	[ReactiveFocusableFormField]&lt;:-[ReactiveIconPicker]
-	
-	[IconPicker
-	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +selectedOption: IconOption?;
-	  +onSelect: void Function(IconOption)?;
-	  +galleryIconSize: double?;
-	  +selectedIconSize: double?;
-	  +focusNode: FocusNode?;
-	  +isDisabled: bool
-	  |
-	  +Widget build()
-	]
-	
-	[IconPicker]o-[IconOption]
-	[IconPicker]o-[void Function(IconOption)?]
-	[IconPicker]o-[FocusNode]
-	
-	[IconPickerField
-	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +selectedOption: IconOption?;
-	  +selectedIconSize: double?;
-	  +galleryIconSize: double?;
-	  +onSelect: void Function(IconOption)?;
-	  +focusNode: FocusNode?;
-	  +isDisabled: bool
-	  |
-	  +Widget build()
-	]
-	
-	[IconPickerField]o-[IconOption]
-	[IconPickerField]o-[void Function(IconOption)?]
-	[IconPickerField]o-[FocusNode]
-	
-	[IconPickerGallery
-	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +onSelect: void Function(IconOption)?;
-	  +iconSize: double
-	  |
-	  +Widget build()
-	]
-	
-	[IconPickerGallery]o-[void Function(IconOption)?]
-	
-	[SingleColumnLayout
-	  |
-	  &lt;static&gt;+defaultConstraints: BoxConstraints;
-	  &lt;static&gt;+defaultConstraintsNarrow: BoxConstraints;
-	  +body: Widget;
-	  +header: Widget?;
-	  +stickyHeader: bool;
-	  +constraints: BoxConstraints?;
-	  +scroll: bool;
-	  +padding: EdgeInsets?
-	  |
-	  &lt;static&gt;+dynamic fromType()
-	]
-	
-	[SingleColumnLayout]o-[BoxConstraints]
-	[SingleColumnLayout]o-[&lt;abstract&gt;Widget]
-	[SingleColumnLayout]o-[EdgeInsets]
-	
-	[SingleColumnLayoutType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;;
-	  &lt;static&gt;+boundedWide: SingleColumnLayoutType;
-	  &lt;static&gt;+boundedNarrow: SingleColumnLayoutType;
-	  &lt;static&gt;+stretched: SingleColumnLayoutType;
-	  &lt;static&gt;+split: SingleColumnLayoutType
-	]
-	
-	[SingleColumnLayoutType]o-[SingleColumnLayoutType]
-	[Enum]&lt;:--[SingleColumnLayoutType]
-	
-	[&lt;abstract&gt;FormConsumerWidget
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;FormConsumerRefWidget
-	  |
-	  +Widget build()
-	]
-	
-	[FormScaffold
-	  |
-	  +formViewModel: T;
-	  +actions: List&lt;Widget&gt;?;
-	  +body: Widget;
-	  +drawer: Widget?;
-	  +actionsSpacing: double;
-	  +actionsPadding: double
-	]
-	
-	[FormScaffold]o-[&lt;abstract&gt;Widget]
-	
-	[StandardDialog
-	  |
-	  +title: Widget?;
-	  +titleText: String?;
-	  +body: Widget;
-	  +actionButtons: List&lt;Widget&gt;;
-	  +backgroundColor: Color?;
-	  +borderRadius: double?;
-	  +width: double?;
-	  +height: double?;
-	  +minWidth: double;
-	  +minHeight: double;
-	  +maxWidth: double?;
-	  +maxHeight: double?;
-	  +padding: EdgeInsets
-	  |
-	  +Widget build()
-	]
-	
-	[StandardDialog]o-[&lt;abstract&gt;Widget]
-	[StandardDialog]o-[Color]
-	[StandardDialog]o-[EdgeInsets]
-	
-	[HtmlStylingBanner
-	  |
-	  +isDismissed: bool;
-	  +onDismissed: dynamic Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[HtmlStylingBanner]o-[dynamic Function()?]
-	
-	[StandardTableColumn
-	  |
-	  +label: String;
-	  +tooltip: String?;
-	  +columnWidth: TableColumnWidth;
-	  +sortable: bool;
-	  +sortAscending: bool?;
-	  +sortableIcon: Widget?
-	]
-	
-	[StandardTableColumn]o-[&lt;abstract&gt;TableColumnWidth]
-	[StandardTableColumn]o-[&lt;abstract&gt;Widget]
-	
-	[StandardTable
-	  |
-	  +items: List&lt;T&gt;;
-	  +inputColumns: List&lt;StandardTableColumn&gt;;
-	  +onSelectItem: void Function(T);
-	  +trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?;
-	  +trailingActionsMenuType: ActionMenuType?;
-	  +sortColumnPredicates: List&lt;int Function(T, T)?&gt;?;
-	  +pinnedPredicates: int Function(T, T)?;
-	  +headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
-	  +dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
-	  +inputTrailingActionsColumn: StandardTableColumn;
-	  +tableWrapper: Widget Function(Widget)?;
-	  +cellSpacing: double;
-	  +rowSpacing: double;
-	  +minRowHeight: double?;
-	  +showTableHeader: bool;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  +leadingWidget: Widget?;
-	  +trailingWidget: Widget?;
-	  +leadingWidgetSpacing: double?;
-	  +trailingWidgetSpacing: double?;
-	  +emptyWidget: Widget?;
-	  +rowStyle: StandardTableStyle;
-	  +disableRowInteractions: bool
-	]
-	
-	[StandardTable]o-[void Function(T)]
-	[StandardTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?]
-	[StandardTable]o-[ActionMenuType]
-	[StandardTable]o-[int Function(T, T)?]
-	[StandardTable]o-[TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?]
-	[StandardTable]o-[StandardTableColumn]
-	[StandardTable]o-[Widget Function(Widget)?]
-	[StandardTable]o-[&lt;abstract&gt;Widget]
-	[StandardTable]o-[StandardTableStyle]
-	
-	[StandardTableStyle
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StandardTableStyle&gt;;
-	  &lt;static&gt;+plain: StandardTableStyle;
-	  &lt;static&gt;+material: StandardTableStyle
-	]
-	
-	[StandardTableStyle]o-[StandardTableStyle]
-	[Enum]&lt;:--[StandardTableStyle]
-	
-	[TwoColumnLayout
-	  |
-	  &lt;static&gt;+defaultDivider: VerticalDivider;
-	  &lt;static&gt;+defaultContentPadding: EdgeInsets;
-	  &lt;static&gt;+slimContentPadding: EdgeInsets;
-	  +leftWidget: Widget;
-	  +rightWidget: Widget;
-	  +dividerWidget: Widget?;
-	  +headerWidget: Widget?;
-	  +flexLeft: int?;
-	  +flexRight: int?;
-	  +constraintsLeft: BoxConstraints?;
-	  +constraintsRight: BoxConstraints?;
-	  +scrollLeft: bool;
-	  +scrollRight: bool;
-	  +paddingLeft: EdgeInsets?;
-	  +paddingRight: EdgeInsets?;
-	  +backgroundColorLeft: Color?;
-	  +backgroundColorRight: Color?;
-	  +stretchHeight: bool
-	]
-	
-	[TwoColumnLayout]o-[VerticalDivider]
-	[TwoColumnLayout]o-[EdgeInsets]
-	[TwoColumnLayout]o-[&lt;abstract&gt;Widget]
-	[TwoColumnLayout]o-[BoxConstraints]
-	[TwoColumnLayout]o-[Color]
-	
-	[ActionMenuInline
-	  |
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +iconSize: double?;
-	  +visible: bool;
-	  +splashRadius: double?;
-	  +paddingVertical: double?;
-	  +paddingHorizontal: double?
-	  |
-	  +Widget build()
-	]
-	
-	[TextParagraph
-	  |
-	  +text: String?;
-	  +style: TextStyle?;
-	  +selectable: bool;
-	  +span: List&lt;TextSpan&gt;?
-	  |
-	  +Widget build()
-	]
-	
-	[TextParagraph]o-[TextStyle]
-	
-	[SplashPage
-	  |
-	  +Widget build()
-	]
-	
-	[ErrorPage
-	  |
-	  +error: Exception?
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ErrorPage]
-	
-	[Badge
-	  |
-	  +icon: IconData?;
-	  +color: Color?;
-	  +borderRadius: double;
-	  +label: String;
-	  +type: BadgeType;
-	  +padding: EdgeInsets;
-	  +iconSize: double?;
-	  +labelStyle: TextStyle?;
-	  +center: bool
-	  |
-	  +Widget build();
-	  -Color? _getBackgroundColor();
-	  -Color _getBorderColor();
-	  -Color? _getLabelColor()
-	]
-	
-	[Badge]o-[IconData]
-	[Badge]o-[Color]
-	[Badge]o-[BadgeType]
-	[Badge]o-[EdgeInsets]
-	[Badge]o-[TextStyle]
-	
-	[BadgeType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;BadgeType&gt;;
-	  &lt;static&gt;+filled: BadgeType;
-	  &lt;static&gt;+outlined: BadgeType;
-	  &lt;static&gt;+outlineFill: BadgeType;
-	  &lt;static&gt;+plain: BadgeType
-	]
-	
-	[BadgeType]o-[BadgeType]
-	[Enum]&lt;:--[BadgeType]
-	
-	[IndicatorRangeSliderThumbShape
-	  |
-	  +buildContext: BuildContext;
-	  +start: T;
-	  +end: T
-	  |
-	  +Size getPreferredSize();
-	  +void paint()
-	]
-	
-	[IndicatorRangeSliderThumbShape]o-[&lt;abstract&gt;BuildContext]
-	[&lt;abstract&gt;RangeSliderThumbShape]&lt;:-[IndicatorRangeSliderThumbShape]
-	
-	[HelpIcon
-	  |
-	  +tooltipText: String?
-	  |
-	  +Widget build()
-	]
-	
-	[UnderConstruction
-	  |
-	  +Widget build()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="982.0" width="21546.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M7515.9 600.3 L5413.5 769 L5429.997175141243 842 L5430.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7525.6 604.9 L7515.9 600.3 L7524.8 594.3 L7534.5 598.8 Z"></path>
-					</g>
-					<path d="M2123.0 686.2 L2020.25 769 L2102.7358757062148 842 L2102.7 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2133.6 684.5 L2123.0 686.2 L2126.9 676.2 L2137.5 674.5 Z"></path>
-					</g>
-					<path d="M2370.8 625.4 L2901 769 L3335 850.8083067092651 L3335.0 850.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2363.2 617.8 L2370.8 625.4 L2360.4 628.1 L2352.8 620.6 Z"></path>
-					</g>
-					<path d="M915.5 222.3 L1054.5 412 L1054.5 575 L1054.5 575.0 " fill="none"></path>
-					<path d="M919.8 219.1 L915.5 222.3 L911.2 225.4 L907.6 211.5 Z"></path>
-					<path d="M645.1 247.8 L1293 412 L1293 575 L1293.0 575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M637.4 240.4 L645.1 247.8 L634.7 250.7 L627.0 243.3 Z"></path>
-					</g>
-					<path d="M440.5 268.2 L440.5 412 L440.5 559.5 L440.5 559.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M445.8 258.8 L440.5 268.2 L435.2 258.8 L440.5 249.5 Z"></path>
-					</g>
-					<path d="M440.5 640.2 L440.5 769 L440.5 842 L440.5 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M445.8 630.8 L440.5 640.2 L435.2 630.8 L440.5 621.5 Z"></path>
-					</g>
-					<path d="M3304.1 692.4 L3190.5 769 L3338.9745762711864 842 L3339.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3314.8 691.6 L3304.1 692.4 L3308.8 682.8 L3319.5 682.0 Z"></path>
-					</g>
-					<path d="M3617.3 604.4 L5534.75 769 L5820.975988700565 842 L5821.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3608.5 598.3 L3617.3 604.4 L3607.6 608.9 L3598.8 602.8 Z"></path>
-					</g>
-					<path d="M4169.5 615.0 L5494.75 769 L5444.227401129943 842 L5444.2 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4160.9 608.6 L4169.5 615.0 L4159.7 619.2 L4151.0 612.8 Z"></path>
-					</g>
-					<path d="M3748.4 601.7 L603.25 769 L720.9985875706215 842 L721.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3758.0 606.5 L3748.4 601.7 L3757.4 595.9 L3767.0 600.7 Z"></path>
-					</g>
-					<path d="M4169.6 607.6 L6152.75 769 L6152.75 842 L6152.8 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4160.7 601.6 L4169.6 607.6 L4159.9 612.2 L4151.0 606.1 Z"></path>
-					</g>
-					<path d="M4169.6 605.7 L6438.75 769 L6438.75 842 L6438.8 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4160.7 599.7 L4169.6 605.7 L4159.9 610.3 L4151.0 604.3 Z"></path>
-					</g>
-					<path d="M9151.9 602.0 L6534.75 769 L8120.25 855.910343759678 L8120.3 855.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9161.5 606.8 L9151.9 602.0 L9160.8 596.1 L9170.5 600.8 Z"></path>
-					</g>
-					<path d="M9152.1 622.2 L8316 769 L8316 842 L8316.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9162.2 625.8 L9152.1 622.2 L9160.4 615.3 L9170.5 618.9 Z"></path>
-					</g>
-					<path d="M9152.2 627.7 L8467.5 769 L8467.5 842 L8467.5 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9162.4 631.0 L9152.2 627.7 L9160.3 620.6 L9170.5 623.9 Z"></path>
-					</g>
-					<path d="M9515.8 594.8 L2060.25 769 L2109.741525423729 842 L2109.7 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9525.3 599.9 L9515.8 594.8 L9525.0 589.3 L9534.5 594.4 Z"></path>
-					</g>
-					<path d="M9516.1 620.1 L8587 769 L8669.485875706214 842 L8669.5 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9526.1 623.9 L9516.1 620.1 L9524.4 613.4 L9534.5 617.2 Z"></path>
-					</g>
-					<path d="M9886.0 618.4 L10885 769 L11346.5 843.2595454545454 L11346.5 843.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9877.5 611.7 L9886.0 618.4 L9875.9 622.3 L9867.5 615.6 Z"></path>
-					</g>
-					<path d="M9886.2 598.2 L13997.75 769 L14113.2302259887 842 L14113.2 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9877.0 592.5 L9886.2 598.2 L9876.6 603.1 L9867.5 597.4 Z"></path>
-					</g>
-					<path d="M9886.2 597.6 L14356.5 769 L14356.5 842 L14356.5 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9877.0 591.9 L9886.2 597.6 L9876.6 602.6 L9867.5 596.9 Z"></path>
-					</g>
-					<path d="M8660.4 712.6 L8627 769 L8676.49152542373 842 L8676.5 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8669.7 707.2 L8660.4 712.6 L8660.5 701.8 L8669.9 696.5 Z"></path>
-					</g>
-					<path d="M8602.9 601.2 L6574.75 769 L8120.25 855.869958717053 L8120.3 855.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8612.6 605.8 L8602.9 601.2 L8611.8 595.1 L8621.5 599.7 Z"></path>
-					</g>
-					<path d="M8862.2 594.6 L14431.25 769 L15842 854.7937639580828 L15842.0 854.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8853.0 588.9 L8862.2 594.6 L8852.7 599.6 L8843.5 594.0 Z"></path>
-					</g>
-					<path d="M8602.8 594.0 L2100.25 769 L2116.747175141243 842 L2116.7 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8612.3 599.1 L8602.8 594.0 L8612.0 588.4 L8621.5 593.5 Z"></path>
-					</g>
-					<path d="M9889.0 609.2 L8667 769 L8683.497175141243 842 L8683.5 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9898.9 613.3 L9889.0 609.2 L9897.6 602.7 L9907.5 606.8 Z"></path>
-					</g>
-					<path d="M15974.2 618.9 L17075 769 L17075 842 L17075.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15965.7 612.3 L15974.2 618.9 L15964.3 622.9 L15955.8 616.3 Z"></path>
-					</g>
-					<path d="M15558.3 619.2 L14471.25 769 L15842 854.7172760996291 L15842.0 854.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15568.2 623.2 L15558.3 619.2 L15566.8 612.6 L15576.8 616.6 Z"></path>
-					</g>
-					<path d="M15558.1 593.5 L3230.5 769 L3345.9802259887006 842 L3346.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15567.5 598.7 L15558.1 593.5 L15567.3 588.0 L15576.8 593.2 Z"></path>
-					</g>
-					<path d="M15974.3 616.1 L17216 769 L17299.310734463277 842 L17299.3 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15965.7 609.7 L15974.3 616.1 L15964.4 620.3 L15955.8 613.8 Z"></path>
-					</g>
-					<path d="M15974.3 612.4 L17464 769 L17522.13559322034 804 L17522.1 804.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15965.6 606.1 L15974.3 612.4 L15964.5 616.7 L15955.8 610.4 Z"></path>
-					</g>
-					<path d="M13130.1 594.2 L3270.5 769 L3352.9858757062148 842 L3353.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13139.5 599.4 L13130.1 594.2 L13139.3 588.7 L13148.8 593.9 Z"></path>
-					</g>
-					<path d="M13546.4 599.4 L17504 769 L17546.31638418079 804 L17546.3 804.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13537.3 593.7 L13546.4 599.4 L13536.8 604.3 L13527.8 598.6 Z"></path>
-					</g>
-					<path d="M13546.2 622.1 L14511.25 769 L15842 854.6363388474823 L15842.0 854.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13537.8 615.5 L13546.2 622.1 L13536.2 626.0 L13527.8 619.3 Z"></path>
-					</g>
-					<path d="M16961.6 621.8 L16358 769 L15931 849.1474019088017 L15931.0 849.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16971.9 624.7 L16961.6 621.8 L16969.4 614.4 L16979.8 617.3 Z"></path>
-					</g>
-					<path d="M17817.3 614.2 L16826.25 769 L15931 853.3092577813248 L15931.0 853.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17827.4 618.0 L17817.3 614.2 L17825.7 607.5 L17835.8 611.3 Z"></path>
-					</g>
-					<path d="M17847.3 669.7 L17695 769 L17661.77966101695 804 L17661.8 804.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17858.0 669.1 L17847.3 669.7 L17852.2 660.1 L17862.9 659.5 Z"></path>
-					</g>
-					<path d="M17814.1 807.0 L17826 804 L17833.5 804 L17833.5 804 L17841 857.5 L17841 857.5 L17833.5 911 L17833.5 911 L17826 911 L17826 911 L17796 903.5348837209302 L17796.0 903.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17803.8 804.0 L17814.1 807.0 L17806.3 814.4 L17796.0 811.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M16070.0 594.9 L17802 769 L17726.46327683616 804 L17726.5 804.0 " fill="none"></path>
-					</g>
-					<path d="M16070.5 589.6 L16070.0 594.9 L16069.5 600.2 L16056.8 593.6 Z"></path>
-					<path d="M2647.5 807.3 L2659.5 804 L2667 804 L2667 804 L2674.5 857.5 L2674.5 857.5 L2667 911 L2667 911 L2659.5 911 L2659.5 911 L2629.5 902.7692307692307 L2629.5 902.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2637.1 804.6 L2647.5 807.3 L2639.9 814.9 L2629.5 812.2 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M15982.4 591.1 L2360.25 769 L2401.478813559322 804 L2401.5 804.0 " fill="none"></path>
-					</g>
-					<path d="M15982.5 596.4 L15982.4 591.1 L15982.3 585.7 L15995.8 590.9 Z"></path>
-					<path d="M4068.5 207.2 L5793.25 412 L5793.25 575 L5793.3 575.0 " fill="none"></path>
-					<path d="M4069.1 202.0 L4068.5 207.2 L4067.9 212.5 L4055.3 205.7 Z"></path>
-					<path d="M3870.8 207.2 L6012.25 412 L6012.25 575 L6012.3 575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3862.0 201.0 L3870.8 207.2 L3861.0 211.6 L3852.3 205.4 Z"></path>
-					</g>
-					<path d="M17814.3 609.9 L19230 769 L19230 842 L19230.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17805.6 603.6 L17814.3 609.9 L17804.4 614.2 L17795.8 607.8 Z"></path>
-					</g>
-					<path d="M17469.1 593.3 L6614.75 769 L8120.25 855.8274682306941 L8120.3 855.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17478.5 598.5 L17469.1 593.3 L17478.3 587.8 L17487.8 593.0 Z"></path>
-					</g>
-					<path d="M17814.3 607.8 L19427.5 769 L19427.5 842 L19427.5 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17805.6 601.5 L17814.3 607.8 L17804.5 612.1 L17795.8 605.9 Z"></path>
-					</g>
-					<path d="M17469.1 599.1 L14037.75 769 L14120.235875706214 842 L14120.2 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17478.7 603.9 L17469.1 599.1 L17478.2 593.3 L17487.8 598.1 Z"></path>
-					</g>
-					<path d="M17814.3 605.9 L19647 769 L19647 842 L19647.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17805.5 599.7 L17814.3 605.9 L17804.6 610.3 L17795.8 604.2 Z"></path>
-					</g>
-					<path d="M7341.0 257.1 L6994.5 412 L6994.5 575 L6994.5 575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7351.7 258.2 L7341.0 257.1 L7347.4 248.4 L7358.1 249.5 Z"></path>
-					</g>
-					<path d="M7433.4 265.2 L7339.5 412 L7339.5 575 L7339.5 575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7443.0 260.2 L7433.4 265.2 L7434.0 254.5 L7443.5 249.5 Z"></path>
-					</g>
-					<path d="M10177.9 604.5 L8707 769 L8690.502824858757 842 L8690.5 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10187.8 608.8 L10177.9 604.5 L10186.6 598.2 L10196.5 602.5 Z"></path>
-					</g>
-					<path d="M766.0 640.2 L766 769 L749.5028248587571 842 L749.5 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M771.3 630.8 L766.0 640.2 L760.7 630.8 L766.0 621.5 Z"></path>
-					</g>
-					<path d="M3643.0 204.0 L766 412 L766 559.5 L766.0 559.5 " fill="none"></path>
-					<path d="M3643.3 209.4 L3643.0 204.0 L3642.6 198.7 L3656.3 203.1 Z"></path>
-					<path d="M1604.5 640.2 L1604.5 769 L1604.5 842 L1604.5 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1609.8 630.8 L1604.5 640.2 L1599.2 630.8 L1604.5 621.5 Z"></path>
-					</g>
-					<path d="M3643.0 207.2 L1604.5 412 L1604.5 559.5 L1604.5 559.5 " fill="none"></path>
-					<path d="M3643.5 212.5 L3643.0 207.2 L3642.5 201.9 L3656.3 205.8 Z"></path>
-					<path d="M7763.8 597.8 L3310.5 769 L3359.991525423729 842 L3360.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7773.4 602.7 L7763.8 597.8 L7773.0 592.1 L7782.5 597.1 Z"></path>
-					</g>
-					<path d="M8142.2 596.0 L14077.75 769 L14127.24152542373 842 L14127.2 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8133.0 590.4 L8142.2 596.0 L8132.7 601.1 L8123.5 595.5 Z"></path>
-					</g>
-					<path d="M7763.9 598.7 L3855.5 769 L4013.8728813559323 842 L4013.9 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7773.4 603.7 L7763.9 598.7 L7772.9 593.0 L7782.5 597.9 Z"></path>
-					</g>
-					<path d="M19726.6 593.8 L8747 769 L8697.50847457627 842 L8697.5 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19736.0 599.0 L19726.6 593.8 L19735.8 588.3 L19745.3 593.5 Z"></path>
-					</g>
-					<path d="M19926.9 692.6 L19921 769 L19921 842 L19921.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19932.9 683.7 L19926.9 692.6 L19922.3 682.9 L19928.3 674.0 Z"></path>
-					</g>
-					<path d="M20098.7 683.2 L20250.5 769 L20250.5 842 L20250.5 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20093.2 674.0 L20098.7 683.2 L20088.0 683.2 L20082.5 674.0 Z"></path>
-					</g>
-					<path d="M20142.2 648.7 L20571 769 L20571 842 L20571.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20134.7 641.1 L20142.2 648.7 L20131.8 651.3 L20124.3 643.7 Z"></path>
-					</g>
-					<path d="M20142.6 631.6 L20838 769 L20838 842 L20838.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20134.4 624.5 L20142.6 631.6 L20132.4 635.0 L20124.3 627.9 Z"></path>
-					</g>
-					<path d="M18123.4 635.2 L17424 769 L17335.74011299435 842 L17335.7 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18133.6 638.6 L18123.4 635.2 L18131.6 628.2 L18141.8 631.6 Z"></path>
-					</g>
-					<path d="M18123.2 618.5 L16866.25 769 L15931 853.4803521306455 L15931.0 853.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18133.1 622.7 L18123.2 618.5 L18131.8 612.1 L18141.8 616.2 Z"></path>
-					</g>
-					<path d="M18590.4 605.5 L21144 769 L21144 842 L21144.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18581.4 599.5 L18590.4 605.5 L18580.7 610.2 L18571.8 604.3 Z"></path>
-					</g>
-					<path d="M12792.1 593.6 L3350.5 769 L3366.997175141243 842 L3367.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12801.5 598.8 L12792.1 593.6 L12801.3 588.1 L12810.8 593.3 Z"></path>
-					</g>
-					<path d="M13127.4 596.6 L17842 769 L17901.350282485877 796.5 L17901.4 796.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13118.3 591.0 L13127.4 596.6 L13117.9 601.6 L13108.8 595.9 Z"></path>
-					</g>
-					<path d="M13127.2 616.3 L14117.75 769 L14134.247175141243 842 L14134.2 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13118.8 609.6 L13127.2 616.3 L13117.2 620.2 L13108.8 613.5 Z"></path>
-					</g>
-					<path d="M13126.1 656.8 L13407.75 769 L11523.5 853.5297807628945 L11523.5 853.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13119.4 648.4 L13126.1 656.8 L13115.4 658.3 L13108.8 649.9 Z"></path>
-					</g>
-					<path d="M18197.6 800.8 L18210 796.5 L18217.5 796.5 L18217.5 796.5 L18225 857.5 L18225 857.5 L18217.5 918.5 L18217.5 918.5 L18210 918.5 L18210 918.5 L18180 908.1610169491526 L18180.0 908.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18187.1 798.8 L18197.6 800.8 L18190.6 808.8 L18180.0 806.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M16070.0 594.0 L18238 769 L18174.29943502825 796.5 L18174.3 796.5 " fill="none"></path>
-					</g>
-					<path d="M16070.5 588.7 L16070.0 594.0 L16069.6 599.4 L16056.8 593.0 Z"></path>
-					<path d="M5367.6 598.1 L2140.25 769 L2123.752824858757 842 L2123.8 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5377.2 602.9 L5367.6 598.1 L5376.6 592.3 L5386.3 597.1 Z"></path>
-					</g>
-					<path d="M5653.9 598.3 L8787 769 L8704.514124293786 842 L8704.5 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5644.9 592.5 L5653.9 598.3 L5644.3 603.1 L5635.3 597.3 Z"></path>
-					</g>
-					<path d="M2068.2 678.7 L2180.25 769 L2130.758474576271 842 L2130.8 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2064.3 668.7 L2068.2 678.7 L2057.6 677.0 L2053.7 667.0 Z"></path>
-					</g>
-					<path d="M1116.1 213.4 L1810.25 412 L1895.107142857143 514 L1895.1 514.0 " fill="none"></path>
-					<path d="M1117.5 208.3 L1116.1 213.4 L1114.6 218.5 L1103.3 209.7 Z"></path>
-					<path d="M11879.6 213.4 L10534.5 412 L10534.5 575 L10534.5 575.0 " fill="none"></path>
-					<path d="M11880.3 218.7 L11879.6 213.4 L11878.8 208.2 L11892.7 211.5 Z"></path>
-					<path d="M6879.6 203.6 L2007.25 412 L1979.5357142857142 514 L1979.5 514.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6889.2 208.5 L6879.6 203.6 L6888.7 197.9 L6898.3 202.8 Z"></path>
-					</g>
-					<path d="M7235.9 206.1 L10881.5 412 L10990.62324929972 575 L10990.6 575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7226.9 200.2 L7235.9 206.1 L7226.3 210.9 L7217.3 205.0 Z"></path>
-					</g>
-					<path d="M7235.9 205.4 L11145 412 L11528.529411764706 575 L11528.5 575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7226.9 199.6 L7235.9 205.4 L7226.3 210.2 L7217.3 204.4 Z"></path>
-					</g>
-					<path d="M7719.6 202.7 L2155.75 412 L2043.1785714285713 514 L2043.2 514.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7729.1 207.7 L7719.6 202.7 L7728.7 197.0 L7738.3 202.0 Z"></path>
-					</g>
-					<path d="M8075.9 208.4 L11001 412 L11001 575 L11001.0 575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8066.9 202.4 L8075.9 208.4 L8066.2 213.1 L8057.3 207.1 Z"></path>
-					</g>
-					<path d="M8075.9 204.3 L12530.5 412 L11618 580.7014500258933 L11618.0 580.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8066.8 198.5 L8075.9 204.3 L8066.3 209.2 L8057.3 203.4 Z"></path>
-					</g>
-					<path d="M12681.7 217.9 L11105 412 L11010.03081232493 575 L11010.0 575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12691.6 222.1 L12681.7 217.9 L12690.3 211.5 L12700.3 215.6 Z"></path>
-					</g>
-					<path d="M8144.9 607.3 L5957.25 769 L5894.973163841808 842 L5895.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8154.6 612.0 L8144.9 607.3 L8153.8 601.3 L8163.5 605.9 Z"></path>
-					</g>
-					<path d="M8144.8 598.7 L3390.5 769 L3374.002824858757 842 L3374.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8154.4 603.7 L8144.8 598.7 L8154.0 593.0 L8163.5 598.0 Z"></path>
-					</g>
-					<path d="M8600.2 597.5 L14157.75 769 L14141.252824858757 842 L14141.3 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8591.0 591.9 L8600.2 597.5 L8590.7 602.6 L8581.5 596.9 Z"></path>
-					</g>
-					<path d="M18714.0 792.4 L18726 789 L18733.5 789 L18733.5 789 L18741 857.5 L18741 857.5 L18733.5 926 L18733.5 926 L18726 926 L18726 926 L18696 917.5432098765432 L18696.0 917.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18703.5 789.8 L18714.0 792.4 L18706.4 800.1 L18696.0 797.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M16070.0 593.7 L18483 769 L18483 789 L18483.0 789.0 " fill="none"></path>
-					</g>
-					<path d="M16070.4 588.4 L16070.0 593.7 L16069.7 599.0 L16056.8 592.7 Z"></path>
-					<path d="M3282.8 669.4 L3430.5 769 L3381.008474576271 842 L3381.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3278.1 659.8 L3282.8 669.4 L3272.1 668.6 L3267.3 659.0 Z"></path>
-					</g>
-					<path d="M8864.8 595.2 L3647 769 L3406 846.1374321880651 L3406.0 846.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8874.3 600.3 L8864.8 595.2 L8874.0 589.6 L8883.5 594.6 Z"></path>
-					</g>
-					<path d="M8864.9 601.7 L6752 769 L8120.25 855.663177670424 L8120.3 855.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8874.6 606.3 L8864.9 601.7 L8873.8 595.7 L8883.5 600.3 Z"></path>
-					</g>
-					<path d="M9149.2 595.4 L14197.75 769 L14148.25847457627 842 L14148.3 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9140.0 589.7 L9149.2 595.4 L9139.6 600.4 L9130.5 594.7 Z"></path>
-					</g>
-					<path d="M13994.9 662.1 L13957.75 769 L11523.5 854.3953522941234 L11523.5 854.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14003.0 655.1 L13994.9 662.1 L13992.9 651.6 L14001.0 644.5 Z"></path>
-					</g>
-					<path d="M2802.0 677.7 L2802 769 L2802 842 L2802.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2807.3 668.3 L2802.0 677.7 L2796.7 668.3 L2802.0 659.0 Z"></path>
-					</g>
-					<path d="M2963.8 623.1 L3687 769 L3406 847.5734597156398 L3406.0 847.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2955.7 616.1 L2963.8 623.1 L2953.6 626.5 L2945.5 619.4 Z"></path>
-					</g>
-					<path d="M8969.2 209.8 L14280.75 412 L14280.75 575 L14280.8 575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8960.0 204.1 L8969.2 209.8 L8959.6 214.8 L8950.5 209.1 Z"></path>
-					</g>
-					<path d="M8969.2 209.1 L14583.25 412 L14583.25 575 L14583.3 575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8960.0 203.4 L8969.2 209.1 L8959.6 214.1 L8950.5 208.4 Z"></path>
-					</g>
-					<path d="M8243.8 208.9 L2541.5 412 L2541.5 590.5 L2541.5 590.5 L2541.5 769 L2541.5 769 L2511.04802259887 804 L2511.0 804.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8253.4 213.9 L8243.8 208.9 L8253.0 203.3 L8262.5 208.3 Z"></path>
-					</g>
-					<path d="M8969.2 208.5 L14893.75 412 L14893.75 575 L14893.8 575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8960.0 202.8 L8969.2 208.5 L8959.6 213.5 L8950.5 207.8 Z"></path>
-					</g>
-					<path d="M8969.2 207.7 L15275.25 412 L15275.25 575 L15275.3 575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8960.0 202.1 L8969.2 207.7 L8959.7 212.8 L8950.5 207.1 Z"></path>
-					</g>
-					<path d="M8243.8 209.5 L2802 412 L2802 522 L2802.0 522.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8253.4 214.5 L8243.8 209.5 L8253.0 203.8 L8262.5 208.8 Z"></path>
-					</g>
-					<path d="M8243.9 213.7 L4191 412 L4191 590.5 L4191 590.5 L4191 769 L4191 769 L4072.632768361582 842 L4072.6 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8253.4 218.6 L8243.9 213.7 L8252.9 208.0 L8262.5 212.8 Z"></path>
-					</g>
-					<path d="M8243.9 212.1 L3727 412 L3727 590.5 L3727 590.5 L3727 769 L3727 769 L3406 848.687237026648 L3406.0 848.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8253.4 217.0 L8243.9 212.1 L8252.9 206.3 L8262.5 211.2 Z"></path>
-					</g>
-					<path d="M8243.9 213.9 L4231 412 L4231 590.5 L4231 590.5 L4231 769 L4231 769 L4287.751412429378 804 L4287.8 804.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8253.4 218.8 L8243.9 213.9 L8252.9 208.1 L8262.5 213.0 Z"></path>
-					</g>
-					<path d="M4569.1 807.1 L4581 804 L4588.5 804 L4588.5 804 L4596 857.5 L4596 857.5 L4588.5 911 L4588.5 911 L4581 911 L4581 911 L4551 903.227602905569 L4551.0 903.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4558.7 804.3 L4569.1 807.1 L4561.4 814.6 L4551.0 811.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M15982.4 591.2 L4516.75 769 L4460.492937853107 804 L4460.5 804.0 " fill="none"></path>
-					</g>
-					<path d="M15982.5 596.5 L15982.4 591.2 L15982.3 585.8 L15995.8 591.0 Z"></path>
-					<path d="M12789.4 594.6 L21425 769 L21425 842 L21425.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12780.2 589.1 L12789.4 594.6 L12780.0 599.7 L12770.8 594.2 Z"></path>
-					</g>
-					<path d="M12789.3 612.4 L14237.75 769 L14155.264124293786 842 L14155.3 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12780.6 606.1 L12789.3 612.4 L12779.5 616.7 L12770.8 610.4 Z"></path>
-					</g>
-					<path d="M12384.1 594.6 L3815.5 769 L3406 850.4398876404495 L3406.0 850.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12393.5 599.8 L12384.1 594.6 L12393.3 589.1 L12402.8 594.2 Z"></path>
-					</g>
-					<path d="M12384.1 596.0 L5997.25 769 L5901.978813559322 842 L5902.0 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12393.6 601.1 L12384.1 596.0 L12393.3 590.4 L12402.8 595.5 Z"></path>
-					</g>
-					<path d="M12384.1 598.8 L8209.25 769 L8159.7584745762715 842 L8159.8 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12393.6 603.7 L12384.1 598.8 L12393.2 593.1 L12402.8 598.0 Z"></path>
-					</g>
-					<path d="M17222.5 640.0 L16906.25 769 L15931 853.6380240254964 L15931.0 853.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17233.1 641.4 L17222.5 640.0 L17229.1 631.5 L17239.8 632.9 Z"></path>
-					</g>
-					<path d="M16794.0 224.8 L16794 412 L16794 544 L16794.0 544.0 " fill="none"></path>
-					<path d="M16799.3 224.8 L16794.0 224.8 L16788.7 224.8 L16794.0 211.5 Z"></path>
-					<path d="M13549.1 592.9 L2320.25 769 L2155.2782485875705 842 L2155.3 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13558.5 598.0 L13549.1 592.9 L13558.3 587.4 L13567.8 592.6 Z"></path>
-					</g>
-					<path d="M13549.1 595.4 L8249.25 769 L8166.764124293785 842 L8166.8 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13558.6 600.4 L13549.1 595.4 L13558.2 589.8 L13567.8 594.8 Z"></path>
-					</g>
-					<path d="M13849.4 595.8 L18726.5 769 L18786 794.8759213759214 L18786.0 794.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13840.3 590.2 L13849.4 595.8 L13839.9 600.8 L13830.8 595.2 Z"></path>
-					</g>
-					<path d="M13848.6 636.6 L14277.75 769 L14162.2697740113 842 L14162.3 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13841.2 628.7 L13848.6 636.6 L13838.1 638.9 L13830.8 631.1 Z"></path>
-					</g>
-					<path d="M13849.4 598.8 L16946.25 769 L15931 853.7837933474876 L15931.0 853.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13840.4 592.9 L13849.4 598.8 L13839.8 603.6 L13830.8 597.7 Z"></path>
-					</g>
-					<path d="M19091.4 794.0 L19104 789 L19111.5 789 L19111.5 789 L19119 857.5 L19119 857.5 L19111.5 926 L19111.5 926 L19104 926 L19104 926 L19074 914.1896551724138 L19074.0 914.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19080.7 792.4 L19091.4 794.0 L19084.6 802.4 L19074.0 800.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M16070.1 593.1 L19060 769 L19030.621468926554 789 L19030.6 789.0 " fill="none"></path>
-					</g>
-					<path d="M16070.4 587.8 L16070.1 593.1 L16069.7 598.4 L16056.8 592.3 Z"></path>
-					<path d="M6498.9 606.5 L4848.5 769 L4848.5 842 L4848.5 842.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6508.7 610.9 L6498.9 606.5 L6507.7 600.2 L6517.5 604.6 Z"></path>
-					</g>
-					<path d="M4929.5 210.2 L6661 412 L6661 521.5 L6661.0 521.5 " fill="none"></path>
-					<path d="M4930.1 204.9 L4929.5 210.2 L4928.9 215.5 L4916.3 208.7 Z"></path>
-					<g data-name="ISyncIndicatorViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ISyncIndicatorViewModel">
-							<rect x="0.0" y="157.5" height="77.0" width="214.0" data-name="ISyncIndicatorViewModel"></rect>
-							<path d="M0.0 188.5 L214.0 188.5" fill="none" data-name="ISyncIndicatorViewModel"></path>
-						</g>
-						<g transform="translate(0, 157.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ISyncIndicatorViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ISyncIndicatorViewModel">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="ISyncIndicatorViewModel">ISyncIndicatorViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 188.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ISyncIndicatorViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ISyncIndicatorViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ISyncIndicatorViewModel">+isDirty: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ISyncIndicatorViewModel">+lastSynced: DateTime?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SyncIndicator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SyncIndicator">
-							<rect x="7534.5" y="529.5" height="122.0" width="208.0" data-name="SyncIndicator"></rect>
-							<path d="M7534.5 560.5 L7742.5 560.5" fill="none" data-name="SyncIndicator"></path>
-						</g>
-						<g transform="translate(7534.5, 529.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SyncIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SyncIndicator">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="SyncIndicator">SyncIndicator</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7534.5, 560.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SyncIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SyncIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="SyncIndicator">+state: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SyncIndicator">+lastSynced: DateTime?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SyncIndicator">+isDirty: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SyncIndicator">+animationDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SyncIndicator">+iconSize: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="5379.0" y="842.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
-						</g>
-						<g transform="translate(5379, 842)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EmptyBody">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmptyBody">
-							<rect x="2130.8" y="506.5" height="168.0" width="222.0" data-name="EmptyBody"></rect>
-							<path d="M2130.8 537.5 L2352.8 537.5" fill="none" data-name="EmptyBody"></path>
-							<path d="M2130.8 643.5 L2352.8 643.5" fill="none" data-name="EmptyBody"></path>
-						</g>
-						<g transform="translate(2130.75, 506.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmptyBody">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="EmptyBody">EmptyBody</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2130.75, 537.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+icon: IconData?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmptyBody">+leading: Widget?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmptyBody">+leadingSpacing: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmptyBody">+title: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EmptyBody">+description: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EmptyBody">+button: Widget?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2130.75, 643.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="2076.8" y="842.0" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(2076.75, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="3335.0" y="842.0" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(3335, 842)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NullHelperDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NullHelperDecoration">
-							<rect x="962.5" y="575.0" height="31.0" width="184.0" data-name="NullHelperDecoration"></rect>
-						</g>
-						<g transform="translate(962.5, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NullHelperDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NullHelperDecoration">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="NullHelperDecoration">NullHelperDecoration</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InputDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InputDecoration">
-							<rect x="825.3" y="180.5" height="31.0" width="142.0" data-name="InputDecoration"></rect>
-						</g>
-						<g transform="translate(825.25, 180.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InputDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InputDecoration">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="InputDecoration">InputDecoration</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Search">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Search">
-							<rect x="254.0" y="142.5" height="107.0" width="373.0" data-name="Search"></rect>
-							<path d="M254.0 173.5 L627.0 173.5" fill="none" data-name="Search"></path>
-						</g>
-						<g transform="translate(254, 142.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Search">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Search">
-								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="Search">Search</text>
-								
-							</g>
-						</g>
-						<g transform="translate(254, 173.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Search">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Search">
-								<text x="0.0" y="13.5" stroke="none" data-name="Search">+onQueryChanged: dynamic Function(String)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Search">+searchController: SearchController?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Search">+hintText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Search">+initialText: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(String)">
-							<rect x="1186.5" y="575.0" height="31.0" width="213.0" data-name="dynamic Function(String)"></rect>
-						</g>
-						<g transform="translate(1186.5, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(String)">
-								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(String)">dynamic Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SearchController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="311.5" y="559.5" height="62.0" width="258.0" data-name="SearchController"></rect>
-							<path d="M311.5 590.5 L569.5 590.5" fill="none" data-name="SearchController"></path>
-						</g>
-						<g transform="translate(311.5, 559.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(311.5, 590.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SearchController">
-								<text x="0.0" y="13.5" stroke="none" data-name="SearchController">+setText: void Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(String)">
-							<rect x="350.5" y="842.0" height="31.0" width="180.0" data-name="void Function(String)"></rect>
-						</g>
-						<g transform="translate(350.5, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(String)">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(String)">void Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConstrainedWidthFlexible">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConstrainedWidthFlexible">
-							<rect x="3311.8" y="499.0" height="183.0" width="287.0" data-name="ConstrainedWidthFlexible"></rect>
-							<path d="M3311.8 530.0 L3598.8 530.0" fill="none" data-name="ConstrainedWidthFlexible"></path>
-							<path d="M3311.8 636.0 L3598.8 636.0" fill="none" data-name="ConstrainedWidthFlexible"></path>
-						</g>
-						<g transform="translate(3311.75, 499)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConstrainedWidthFlexible">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConstrainedWidthFlexible">ConstrainedWidthFlexible</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3311.75, 530)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+minWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">+maxWidth: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConstrainedWidthFlexible">+flex: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConstrainedWidthFlexible">+flexSum: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConstrainedWidthFlexible">+child: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConstrainedWidthFlexible">+outerConstraints: BoxConstraints</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3311.75, 636)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">-double _getWidth()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoxConstraints">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoxConstraints">
-							<rect x="5813.8" y="842.0" height="31.0" width="136.0" data-name="BoxConstraints"></rect>
-						</g>
-						<g transform="translate(5813.75, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxConstraints">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxConstraints">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxConstraints">BoxConstraints</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AsyncValueWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValueWidget">
-							<rect x="3767.0" y="491.5" height="198.0" width="384.0" data-name="AsyncValueWidget"></rect>
-							<path d="M3767.0 522.5 L4151.0 522.5" fill="none" data-name="AsyncValueWidget"></path>
-							<path d="M3767.0 613.5 L4151.0 613.5" fill="none" data-name="AsyncValueWidget"></path>
-						</g>
-						<g transform="translate(3767, 491.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValueWidget">
-								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValueWidget">AsyncValueWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3767, 522.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+value: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">+data: Widget Function(T)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">+error: Widget Function(Object, StackTrace?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">+loading: Widget Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AsyncValueWidget">+empty: Widget Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3767, 613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">-Widget _buildDataOrEmptyWidget()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultLoad()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="663.0" y="842.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
-						</g>
-						<g transform="translate(663, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(Object, StackTrace?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Object, StackTrace?)?">
-							<rect x="5989.8" y="842.0" height="31.0" width="326.0" data-name="Widget Function(Object, StackTrace?)?"></rect>
-						</g>
-						<g transform="translate(5989.75, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Object, StackTrace?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Object, StackTrace?)?">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Object, StackTrace?)?">Widget Function(Object, StackTrace?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function()?">
-							<rect x="6355.8" y="842.0" height="31.0" width="166.0" data-name="Widget Function()?"></rect>
-						</g>
-						<g transform="translate(6355.75, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function()?">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function()?">Widget Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ActionPopUpMenuButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionPopUpMenuButton">
-							<rect x="9170.5" y="461.5" height="258.0" width="324.0" data-name="ActionPopUpMenuButton"></rect>
-							<path d="M9170.5 492.5 L9494.5 492.5" fill="none" data-name="ActionPopUpMenuButton"></path>
-							<path d="M9170.5 673.5 L9494.5 673.5" fill="none" data-name="ActionPopUpMenuButton"></path>
-						</g>
-						<g transform="translate(9170.5, 461.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionPopUpMenuButton">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionPopUpMenuButton">ActionPopUpMenuButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9170.5, 492.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColor: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColorHover: Color?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconSize: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ActionPopUpMenuButton">+disableSplashEffect: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ActionPopUpMenuButton">+hideOnEmpty: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ActionPopUpMenuButton">+orientation: Axis</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ActionPopUpMenuButton">+elevation: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ActionPopUpMenuButton">+splashRadius: double?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ActionPopUpMenuButton">+enabled: bool</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ActionPopUpMenuButton">+position: PopupMenuPosition</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9170.5, 673.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">-Widget _buildPopupMenu()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="8120.3" y="842.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(8120.25, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Axis">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Axis">
-							<rect x="8291.5" y="842.0" height="31.0" width="49.0" data-name="Axis"></rect>
-						</g>
-						<g transform="translate(8291.5, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Axis">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Axis">
-								<text x="16.5" y="13.5" stroke="none" text-anchor="middle" data-name="Axis">Axis</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PopupMenuPosition">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PopupMenuPosition">
-							<rect x="8380.5" y="842.0" height="31.0" width="174.0" data-name="PopupMenuPosition"></rect>
-						</g>
-						<g transform="translate(8380.5, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PopupMenuPosition">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PopupMenuPosition">
-								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="PopupMenuPosition">PopupMenuPosition</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PrimaryButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PrimaryButton">
-							<rect x="9534.5" y="477.0" height="227.0" width="333.0" data-name="PrimaryButton"></rect>
-							<path d="M9534.5 508.0 L9867.5 508.0" fill="none" data-name="PrimaryButton"></path>
-						</g>
-						<g transform="translate(9534.5, 477)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PrimaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PrimaryButton">
-								<text x="158.5" y="13.5" stroke="none" text-anchor="middle" data-name="PrimaryButton">PrimaryButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9534.5, 508)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PrimaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PrimaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="PrimaryButton">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PrimaryButton">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PrimaryButton">+isLoading: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PrimaryButton">+showLoadingEarliestAfterMs: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PrimaryButton">+onPressed: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PrimaryButton">+tooltip: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PrimaryButton">+tooltipDisabled: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PrimaryButton">+enabled: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PrimaryButton">+onPressedFuture: dynamic Function()?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="PrimaryButton">+innerPadding: EdgeInsets</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="PrimaryButton">+minimumSize: Size?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="PrimaryButton">+isDisabled: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="8615.0" y="842.0" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(8615, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="11346.5" y="842.0" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
-						</g>
-						<g transform="translate(11346.5, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
-								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EdgeInsets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="14085.3" y="842.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
-						</g>
-						<g transform="translate(14085.25, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Size">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Size">
-							<rect x="14331.5" y="842.0" height="31.0" width="50.0" data-name="Size"></rect>
-						</g>
-						<g transform="translate(14331.5, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Size">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Size">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Size">Size</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Hyperlink">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Hyperlink">
-							<rect x="8621.5" y="484.5" height="212.0" width="222.0" data-name="Hyperlink"></rect>
-							<path d="M8621.5 515.5 L8843.5 515.5" fill="none" data-name="Hyperlink"></path>
-						</g>
-						<g transform="translate(8621.5, 484.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Hyperlink">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Hyperlink">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="Hyperlink">Hyperlink</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8621.5, 515.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Hyperlink">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Hyperlink">
-								<text x="0.0" y="13.5" stroke="none" data-name="Hyperlink">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Hyperlink">+url: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Hyperlink">+onClick: void Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Hyperlink">+linkColor: Color</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Hyperlink">+hoverColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Hyperlink">+visitedColor: Color?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Hyperlink">+style: TextStyle?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Hyperlink">+hoverStyle: TextStyle?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Hyperlink">+visitedStyle: TextStyle?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Hyperlink">+icon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Hyperlink">+iconSize: double?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TextStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
-							<rect x="15842.0" y="842.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
-						</g>
-						<g transform="translate(15842, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
-								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DismissButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DismissButton">
-							<rect x="9907.5" y="536.5" height="108.0" width="249.0" data-name="DismissButton"></rect>
-							<path d="M9907.5 567.5 L10156.5 567.5" fill="none" data-name="DismissButton"></path>
-							<path d="M9907.5 613.5 L10156.5 613.5" fill="none" data-name="DismissButton"></path>
-						</g>
-						<g transform="translate(9907.5, 536.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DismissButton">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="DismissButton">DismissButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9907.5, 567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+onPressed: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DismissButton">+text: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9907.5, 613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormTableRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRow">
-							<rect x="15576.8" y="514.5" height="152.0" width="379.0" data-name="FormTableRow"></rect>
-							<path d="M15576.8 545.5 L15955.8 545.5" fill="none" data-name="FormTableRow"></path>
-						</g>
-						<g transform="translate(15576.75, 514.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRow">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRow">FormTableRow</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15576.75, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRow">+label: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRow">+labelBuilder: Widget Function(BuildContext)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRow">+labelStyle: TextStyle?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRow">+labelHelpText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormTableRow">+input: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormTableRow">+control: AbstractControl&lt;dynamic&gt;?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormTableRow">+layout: FormTableRowLayout?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
-							<rect x="16942.0" y="842.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
-						</g>
-						<g transform="translate(16942, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="17248.0" y="842.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(17248, 842)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormTableRowLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRowLayout">
-							<rect x="17426.0" y="804.0" height="107.0" width="370.0" data-name="FormTableRowLayout"></rect>
-							<path d="M17426.0 835.0 L17796.0 835.0" fill="none" data-name="FormTableRowLayout"></path>
-						</g>
-						<g transform="translate(17426, 804)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRowLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRowLayout">
-								<text x="177.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRowLayout">FormTableRowLayout</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17426, 835)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRowLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRowLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRowLayout">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+values: List&lt;FormTableRowLayout&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+vertical: FormTableRowLayout</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+horizontal: FormTableRowLayout</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormTableLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableLayout">
-							<rect x="13148.8" y="514.0" height="153.0" width="379.0" data-name="FormTableLayout"></rect>
-							<path d="M13148.8 545.0 L13527.8 545.0" fill="none" data-name="FormTableLayout"></path>
-							<path d="M13148.8 636.0 L13527.8 636.0" fill="none" data-name="FormTableLayout"></path>
-						</g>
-						<g transform="translate(13148.75, 514)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableLayout">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableLayout">FormTableLayout</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13148.75, 545)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+rows: List&lt;FormTableRow&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableLayout">+columnWidths: Map&lt;int, TableColumnWidth&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableLayout">+rowDivider: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableLayout">+rowLayout: FormTableRowLayout?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormTableLayout">+rowLabelStyle: TextStyle?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13148.75, 636)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormSectionHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSectionHeader">
-							<rect x="16979.8" y="514.0" height="153.0" width="220.0" data-name="FormSectionHeader"></rect>
-							<path d="M16979.8 545.0 L17199.8 545.0" fill="none" data-name="FormSectionHeader"></path>
-							<path d="M16979.8 636.0 L17199.8 636.0" fill="none" data-name="FormSectionHeader"></path>
-						</g>
-						<g transform="translate(16979.75, 514)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSectionHeader">
-								<text x="102.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormSectionHeader">FormSectionHeader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16979.75, 545)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormSectionHeader">+titleTextStyle: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormSectionHeader">+helpText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormSectionHeader">+divider: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormSectionHeader">+helpTextDisabled: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16979.75, 636)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormLabel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormLabel">
-							<rect x="17835.8" y="521.5" height="138.0" width="266.0" data-name="FormLabel"></rect>
-							<path d="M17835.8 552.5 L18101.8 552.5" fill="none" data-name="FormLabel"></path>
-							<path d="M17835.8 628.5 L18101.8 628.5" fill="none" data-name="FormLabel"></path>
-						</g>
-						<g transform="translate(17835.75, 521.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormLabel">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormLabel">FormLabel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17835.75, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+labelText: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormLabel">+helpText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormLabel">+labelTextStyle: TextStyle?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormLabel">+layout: FormTableRowLayout?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17835.75, 628.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="15995.8" y="575.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(15995.75, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ActionMenuType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuType">
-							<rect x="2299.5" y="804.0" height="107.0" width="330.0" data-name="ActionMenuType"></rect>
-							<path d="M2299.5 835.0 L2629.5 835.0" fill="none" data-name="ActionMenuType"></path>
-						</g>
-						<g transform="translate(2299.5, 804)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuType">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuType">ActionMenuType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2299.5, 835)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+values: List&lt;ActionMenuType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+inline: ActionMenuType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+popup: ActionMenuType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveCustomColorPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveCustomColorPicker">
-							<rect x="5675.3" y="575.0" height="31.0" width="236.0" data-name="ReactiveCustomColorPicker"></rect>
-						</g>
-						<g transform="translate(5675.25, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveCustomColorPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveCustomColorPicker">
-								<text x="110.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveCustomColorPicker">ReactiveCustomColorPicker</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveFormField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFormField">
-							<rect x="3892.3" y="180.5" height="31.0" width="163.0" data-name="ReactiveFormField"></rect>
-						</g>
-						<g transform="translate(3892.25, 180.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFormField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFormField">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFormField">ReactiveFormField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NavbarTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="3656.3" y="142.5" height="107.0" width="196.0" data-name="NavbarTab"></rect>
-							<path d="M3656.3 173.5 L3852.3 173.5" fill="none" data-name="NavbarTab"></path>
-						</g>
-						<g transform="translate(3656.25, 142.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3656.25, 173.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NavbarTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="NavbarTab">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NavbarTab">+intent: RoutingIntent?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NavbarTab">+index: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NavbarTab">+enabled: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="5951.3" y="575.0" height="31.0" width="122.0" data-name="RoutingIntent"></rect>
-						</g>
-						<g transform="translate(5951.25, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TabbedNavbar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TabbedNavbar">
-							<rect x="17487.8" y="462.0" height="257.0" width="308.0" data-name="TabbedNavbar"></rect>
-							<path d="M17487.8 493.0 L17795.8 493.0" fill="none" data-name="TabbedNavbar"></path>
-						</g>
-						<g transform="translate(17487.75, 462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabbedNavbar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabbedNavbar">
-								<text x="146.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabbedNavbar">TabbedNavbar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17487.75, 493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TabbedNavbar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TabbedNavbar">
-								<text x="0.0" y="13.5" stroke="none" data-name="TabbedNavbar">+tabs: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TabbedNavbar">+selectedTab: T?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TabbedNavbar">+indicator: BoxDecoration?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TabbedNavbar">+height: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TabbedNavbar">+disabledBackgroundColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TabbedNavbar">+disabledTooltipText: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TabbedNavbar">+onSelect: void Function(int, T)?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TabbedNavbar">+labelPadding: EdgeInsets?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="TabbedNavbar">+labelSpacing: double?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="TabbedNavbar">+indicatorSize: TabBarIndicatorSize?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="TabbedNavbar">+isScrollable: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="TabbedNavbar">+backgroundColor: Color?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="TabbedNavbar">+labelColorHover: Color?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="TabbedNavbar">+unselectedLabelColorHover: Color?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoxDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoxDecoration">
-							<rect x="19164.0" y="842.0" height="31.0" width="132.0" data-name="BoxDecoration"></rect>
-						</g>
-						<g transform="translate(19164, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxDecoration">
-								<text x="58.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxDecoration">BoxDecoration</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(int, T)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(int, T)?">
-							<rect x="19336.0" y="842.0" height="31.0" width="183.0" data-name="void Function(int, T)?"></rect>
-						</g>
-						<g transform="translate(19336, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(int, T)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(int, T)?">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(int, T)?">void Function(int, T)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TabBarIndicatorSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TabBarIndicatorSize">
-							<rect x="19559.0" y="842.0" height="31.0" width="176.0" data-name="TabBarIndicatorSize"></rect>
-						</g>
-						<g transform="translate(19559, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabBarIndicatorSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabBarIndicatorSize">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabBarIndicatorSize">TabBarIndicatorSize</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Collapsible">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Collapsible">
-							<rect x="7257.3" y="142.5" height="107.0" width="441.0" data-name="Collapsible"></rect>
-							<path d="M7257.3 173.5 L7698.3 173.5" fill="none" data-name="Collapsible"></path>
-						</g>
-						<g transform="translate(7257.25, 142.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Collapsible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Collapsible">
-								<text x="212.5" y="13.5" stroke="none" text-anchor="middle" data-name="Collapsible">Collapsible</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7257.25, 173.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Collapsible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Collapsible">
-								<text x="0.0" y="13.5" stroke="none" data-name="Collapsible">+contentBuilder: Widget Function(BuildContext, bool)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Collapsible">+headerBuilder: Widget Function(BuildContext, bool)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Collapsible">+title: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Collapsible">+isCollapsed: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, bool)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)">
-							<rect x="6844.5" y="575.0" height="31.0" width="300.0" data-name="Widget Function(BuildContext, bool)"></rect>
-						</g>
-						<g transform="translate(6844.5, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)">
-								<text x="142.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)">Widget Function(BuildContext, bool)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)?">
-							<rect x="7184.5" y="575.0" height="31.0" width="310.0" data-name="Widget Function(BuildContext, bool)?"></rect>
-						</g>
-						<g transform="translate(7184.5, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)?">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)?">Widget Function(BuildContext, bool)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyULogo">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyULogo">
-							<rect x="10196.5" y="544.0" height="93.0" width="214.0" data-name="StudyULogo"></rect>
-							<path d="M10196.5 575.0 L10410.5 575.0" fill="none" data-name="StudyULogo"></path>
-							<path d="M10196.5 606.0 L10410.5 606.0" fill="none" data-name="StudyULogo"></path>
-						</g>
-						<g transform="translate(10196.5, 544)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyULogo">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyULogo">StudyULogo</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10196.5, 575)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10196.5, 606)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormSideSheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSideSheetTab">
-							<rect x="609.5" y="559.5" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
-							<path d="M609.5 590.5 L922.5 590.5" fill="none" data-name="FormSideSheetTab"></path>
-						</g>
-						<g transform="translate(609.5, 559.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSideSheetTab">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormSideSheetTab">FormSideSheetTab</text>
-								
-							</g>
-						</g>
-						<g transform="translate(609.5, 590.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSideSheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSideSheetTab">+formViewBuilder: Widget Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SidesheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SidesheetTab">
-							<rect x="1439.5" y="559.5" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
-							<path d="M1439.5 590.5 L1769.5 590.5" fill="none" data-name="SidesheetTab"></path>
-						</g>
-						<g transform="translate(1439.5, 559.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SidesheetTab">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="SidesheetTab">SidesheetTab</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1439.5, 590.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SidesheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="SidesheetTab">+builder: Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="1476.5" y="842.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
-						</g>
-						<g transform="translate(1476.5, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Sidesheet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Sidesheet">
-							<rect x="7782.5" y="484.5" height="212.0" width="341.0" data-name="Sidesheet"></rect>
-							<path d="M7782.5 515.5 L8123.5 515.5" fill="none" data-name="Sidesheet"></path>
-						</g>
-						<g transform="translate(7782.5, 484.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Sidesheet">
-								<text x="162.5" y="13.5" stroke="none" text-anchor="middle" data-name="Sidesheet">Sidesheet</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7782.5, 515.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Sidesheet">
-								<text x="0.0" y="13.5" stroke="none" data-name="Sidesheet">&lt;static&gt;+kDefaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Sidesheet">+titleText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Sidesheet">+body: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Sidesheet">+tabs: List&lt;SidesheetTab&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Sidesheet">+actionButtons: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Sidesheet">+width: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Sidesheet">+withCloseButton: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Sidesheet">+ignoreAppBar: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Sidesheet">+collapseSingleTab: bool</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Sidesheet">+bodyPadding: EdgeInsets?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Sidesheet">+wrapContent: Widget Function(Widget)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(Widget)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Widget)?">
-							<rect x="3937.0" y="842.0" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
-						</g>
-						<g transform="translate(3937, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Widget)?">
-								<text x="102.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Widget)?">Widget Function(Widget)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MouseEventsRegion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MouseEventsRegion">
-							<rect x="19745.3" y="507.0" height="167.0" width="379.0" data-name="MouseEventsRegion"></rect>
-							<path d="M19745.3 538.0 L20124.3 538.0" fill="none" data-name="MouseEventsRegion"></path>
-						</g>
-						<g transform="translate(19745.25, 507)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MouseEventsRegion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MouseEventsRegion">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="MouseEventsRegion">MouseEventsRegion</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19745.25, 538)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MouseEventsRegion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MouseEventsRegion">
-								<text x="0.0" y="13.5" stroke="none" data-name="MouseEventsRegion">+onTap: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MouseEventsRegion">+onHover: void Function(PointerHoverEvent)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MouseEventsRegion">+onEnter: void Function(PointerEnterEvent)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MouseEventsRegion">+onExit: void Function(PointerExitEvent)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MouseEventsRegion">+autoselectCursor: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MouseEventsRegion">+cursor: SystemMouseCursor</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MouseEventsRegion">&lt;static&gt;+defaultCursor: SystemMouseCursor</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MouseEventsRegion">+autoCursor: SystemMouseCursor</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(PointerHoverEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerHoverEvent)?">
-							<rect x="19775.0" y="842.0" height="31.0" width="292.0" data-name="void Function(PointerHoverEvent)?"></rect>
-						</g>
-						<g transform="translate(19775, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerHoverEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerHoverEvent)?">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerHoverEvent)?">void Function(PointerHoverEvent)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(PointerEnterEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerEnterEvent)?">
-							<rect x="20107.0" y="842.0" height="31.0" width="287.0" data-name="void Function(PointerEnterEvent)?"></rect>
-						</g>
-						<g transform="translate(20107, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerEnterEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerEnterEvent)?">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerEnterEvent)?">void Function(PointerEnterEvent)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(PointerExitEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerExitEvent)?">
-							<rect x="20434.0" y="842.0" height="31.0" width="274.0" data-name="void Function(PointerExitEvent)?"></rect>
-						</g>
-						<g transform="translate(20434, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerExitEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerExitEvent)?">
-								<text x="129.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerExitEvent)?">void Function(PointerExitEvent)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SystemMouseCursor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SystemMouseCursor">
-							<rect x="20748.0" y="842.0" height="31.0" width="180.0" data-name="SystemMouseCursor"></rect>
-						</g>
-						<g transform="translate(20748, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SystemMouseCursor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SystemMouseCursor">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="SystemMouseCursor">SystemMouseCursor</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControlLabel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlLabel">
-							<rect x="18141.8" y="514.0" height="153.0" width="430.0" data-name="FormControlLabel"></rect>
-							<path d="M18141.8 545.0 L18571.8 545.0" fill="none" data-name="FormControlLabel"></path>
-							<path d="M18141.8 636.0 L18571.8 636.0" fill="none" data-name="FormControlLabel"></path>
-						</g>
-						<g transform="translate(18141.75, 514)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlLabel">
-								<text x="207.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlLabel">FormControlLabel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18141.75, 545)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+formControl: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlLabel">+text: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlLabel">+isClickable: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlLabel">+textStyle: TextStyle?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormControlLabel">+onClick: void Function(AbstractControl&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18141.75, 636)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<rect x="20968.0" y="842.0" height="31.0" width="352.0" data-name="void Function(AbstractControl&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(20968, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">void Function(AbstractControl&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IWithBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="4095.3" y="165.0" height="62.0" width="164.0" data-name="IWithBanner"></rect>
-							<path d="M4095.3 196.0 L4259.3 196.0" fill="none" data-name="IWithBanner"></path>
-						</g>
-						<g transform="translate(4095.25, 165)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4095.25, 196)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IWithBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="IWithBanner">+Widget? banner()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BannerBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BannerBox">
-							<rect x="12810.8" y="499.5" height="182.0" width="298.0" data-name="BannerBox"></rect>
-							<path d="M12810.8 530.5 L13108.8 530.5" fill="none" data-name="BannerBox"></path>
-						</g>
-						<g transform="translate(12810.75, 499.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerBox">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerBox">BannerBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12810.75, 530.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="BannerBox">+prefixIcon: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BannerBox">+body: Widget</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BannerBox">+style: BannerStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BannerBox">+padding: EdgeInsets?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BannerBox">+noPrefix: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BannerBox">+dismissable: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="BannerBox">+isDismissed: bool?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="BannerBox">+onDismissed: dynamic Function()?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="BannerBox">+dismissIconSize: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BannerStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BannerStyle">
-							<rect x="17886.0" y="796.5" height="122.0" width="294.0" data-name="BannerStyle"></rect>
-							<path d="M17886.0 827.5 L18180.0 827.5" fill="none" data-name="BannerStyle"></path>
-						</g>
-						<g transform="translate(17886, 796.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerStyle">
-								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerStyle">BannerStyle</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17886, 827.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerStyle">
-								<text x="0.0" y="13.5" stroke="none" data-name="BannerStyle">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+values: List&lt;BannerStyle&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+warning: BannerStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+info: BannerStyle</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+error: BannerStyle</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SecondaryButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SecondaryButton">
-							<rect x="5386.3" y="521.5" height="138.0" width="249.0" data-name="SecondaryButton"></rect>
-							<path d="M5386.3 552.5 L5635.3 552.5" fill="none" data-name="SecondaryButton"></path>
-							<path d="M5386.3 628.5 L5635.3 628.5" fill="none" data-name="SecondaryButton"></path>
-						</g>
-						<g transform="translate(5386.25, 521.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecondaryButton">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecondaryButton">SecondaryButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5386.25, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SecondaryButton">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SecondaryButton">+isLoading: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SecondaryButton">+onPressed: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5386.25, 628.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconPack">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPack">
-							<rect x="4299.3" y="142.0" height="108.0" width="359.0" data-name="IconPack"></rect>
-							<path d="M4299.3 173.0 L4658.3 173.0" fill="none" data-name="IconPack"></path>
-							<path d="M4299.3 219.0 L4658.3 219.0" fill="none" data-name="IconPack"></path>
-						</g>
-						<g transform="translate(4299.25, 142)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPack">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPack">IconPack</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4299.25, 173)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+defaultPack: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPack">&lt;static&gt;+material: List&lt;IconOption&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4299.25, 219)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+IconOption? resolveIconByName()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconOption">
-							<rect x="1826.8" y="514.0" height="153.0" width="264.0" data-name="IconOption"></rect>
-							<path d="M1826.8 545.0 L2090.8 545.0" fill="none" data-name="IconOption"></path>
-							<path d="M1826.8 621.0 L2090.8 621.0" fill="none" data-name="IconOption"></path>
-						</g>
-						<g transform="translate(1826.75, 514)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconOption">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="IconOption">IconOption</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1826.75, 545)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconOption">+isEmpty: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconOption">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1826.75, 621)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+String toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">&lt;static&gt;+IconOption fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="1007.3" y="180.5" height="31.0" width="96.0" data-name="Equatable"></rect>
-						</g>
-						<g transform="translate(1007.25, 180.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveIconPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveIconPicker">
-							<rect x="10450.5" y="575.0" height="31.0" width="168.0" data-name="ReactiveIconPicker"></rect>
-						</g>
-						<g transform="translate(10450.5, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveIconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveIconPicker">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveIconPicker">ReactiveIconPicker</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveFocusableFormField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFocusableFormField">
-							<rect x="11875.3" y="180.5" height="31.0" width="245.0" data-name="ReactiveFocusableFormField"></rect>
-						</g>
-						<g transform="translate(11875.25, 180.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFocusableFormField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFocusableFormField">
-								<text x="114.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFocusableFormField">ReactiveFocusableFormField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPicker">
-							<rect x="6898.3" y="104.5" height="183.0" width="319.0" data-name="IconPicker"></rect>
-							<path d="M6898.3 135.5 L7217.3 135.5" fill="none" data-name="IconPicker"></path>
-							<path d="M6898.3 256.5 L7217.3 256.5" fill="none" data-name="IconPicker"></path>
-						</g>
-						<g transform="translate(6898.25, 104.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPicker">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPicker">IconPicker</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6898.25, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPicker">+selectedOption: IconOption?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPicker">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconPicker">+galleryIconSize: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IconPicker">+selectedIconSize: double?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IconPicker">+focusNode: FocusNode?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IconPicker">+isDisabled: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6898.25, 256.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(IconOption)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(IconOption)?">
-							<rect x="10886.0" y="575.0" height="31.0" width="230.0" data-name="void Function(IconOption)?"></rect>
-						</g>
-						<g transform="translate(10886, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(IconOption)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(IconOption)?">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(IconOption)?">void Function(IconOption)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FocusNode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FocusNode">
-							<rect x="11512.0" y="575.0" height="31.0" width="106.0" data-name="FocusNode"></rect>
-						</g>
-						<g transform="translate(11512, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FocusNode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FocusNode">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="FocusNode">FocusNode</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconPickerField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerField">
-							<rect x="7738.3" y="104.5" height="183.0" width="319.0" data-name="IconPickerField"></rect>
-							<path d="M7738.3 135.5 L8057.3 135.5" fill="none" data-name="IconPickerField"></path>
-							<path d="M7738.3 256.5 L8057.3 256.5" fill="none" data-name="IconPickerField"></path>
-						</g>
-						<g transform="translate(7738.25, 104.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerField">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerField">IconPickerField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7738.25, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerField">+selectedOption: IconOption?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerField">+selectedIconSize: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconPickerField">+galleryIconSize: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IconPickerField">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IconPickerField">+focusNode: FocusNode?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IconPickerField">+isDisabled: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7738.25, 256.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconPickerGallery">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerGallery">
-							<rect x="12700.3" y="134.5" height="123.0" width="319.0" data-name="IconPickerGallery"></rect>
-							<path d="M12700.3 165.5 L13019.3 165.5" fill="none" data-name="IconPickerGallery"></path>
-							<path d="M12700.3 226.5 L13019.3 226.5" fill="none" data-name="IconPickerGallery"></path>
-						</g>
-						<g transform="translate(12700.25, 134.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerGallery">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerGallery">IconPickerGallery</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12700.25, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerGallery">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerGallery">+iconSize: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12700.25, 226.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SingleColumnLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayout">
-							<rect x="8163.5" y="491.5" height="198.0" width="418.0" data-name="SingleColumnLayout"></rect>
-							<path d="M8163.5 522.5 L8581.5 522.5" fill="none" data-name="SingleColumnLayout"></path>
-							<path d="M8163.5 658.5 L8581.5 658.5" fill="none" data-name="SingleColumnLayout"></path>
-						</g>
-						<g transform="translate(8163.5, 491.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayout">
-								<text x="201.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayout">SingleColumnLayout</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8163.5, 522.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraints: BoxConstraints</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraintsNarrow: BoxConstraints</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayout">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayout">+header: Widget?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayout">+stickyHeader: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayout">+constraints: BoxConstraints?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SingleColumnLayout">+scroll: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SingleColumnLayout">+padding: EdgeInsets?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8163.5, 658.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+dynamic fromType()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SingleColumnLayoutType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="18270.0" y="789.0" height="137.0" width="426.0" data-name="SingleColumnLayoutType"></rect>
-							<path d="M18270.0 820.0 L18696.0 820.0" fill="none" data-name="SingleColumnLayoutType"></path>
-						</g>
-						<g transform="translate(18270, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
-								<text x="205.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18270, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayoutType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayoutType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedWide: SingleColumnLayoutType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedNarrow: SingleColumnLayoutType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+stretched: SingleColumnLayoutType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+split: SingleColumnLayoutType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="11384.3" y="165.0" height="62.0" width="192.0" data-name="FormConsumerWidget"></rect>
-							<path d="M11384.3 196.0 L11576.3 196.0" fill="none" data-name="FormConsumerWidget"></path>
-						</g>
-						<g transform="translate(11384.25, 165)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11384.25, 196)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerRefWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="11616.3" y="165.0" height="62.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
-							<path d="M11616.3 196.0 L11835.3 196.0" fill="none" data-name="FormConsumerRefWidget"></path>
-						</g>
-						<g transform="translate(11616.25, 165)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11616.25, 196)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerRefWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerRefWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormScaffold">
-							<rect x="3059.8" y="522.0" height="137.0" width="212.0" data-name="FormScaffold"></rect>
-							<path d="M3059.8 553.0 L3271.8 553.0" fill="none" data-name="FormScaffold"></path>
-						</g>
-						<g transform="translate(3059.75, 522)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormScaffold">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormScaffold">FormScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3059.75, 553)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormScaffold">+formViewModel: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormScaffold">+actions: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormScaffold">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormScaffold">+actionsPadding: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StandardDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardDialog">
-							<rect x="8883.5" y="454.0" height="273.0" width="247.0" data-name="StandardDialog"></rect>
-							<path d="M8883.5 485.0 L9130.5 485.0" fill="none" data-name="StandardDialog"></path>
-							<path d="M8883.5 696.0 L9130.5 696.0" fill="none" data-name="StandardDialog"></path>
-						</g>
-						<g transform="translate(8883.5, 454)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardDialog">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardDialog">StandardDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8883.5, 485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+title: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardDialog">+titleText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardDialog">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardDialog">+actionButtons: List&lt;Widget&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardDialog">+backgroundColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardDialog">+borderRadius: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StandardDialog">+width: double?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StandardDialog">+height: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StandardDialog">+minWidth: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StandardDialog">+minHeight: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StandardDialog">+maxWidth: double?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StandardDialog">+maxHeight: double?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StandardDialog">+padding: EdgeInsets</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8883.5, 696)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="HtmlStylingBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlStylingBanner">
-							<rect x="13870.8" y="536.5" height="108.0" width="298.0" data-name="HtmlStylingBanner"></rect>
-							<path d="M13870.8 567.5 L14168.8 567.5" fill="none" data-name="HtmlStylingBanner"></path>
-							<path d="M13870.8 613.5 L14168.8 613.5" fill="none" data-name="HtmlStylingBanner"></path>
-						</g>
-						<g transform="translate(13870.75, 536.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlStylingBanner">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlStylingBanner">HtmlStylingBanner</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13870.75, 567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+isDismissed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="HtmlStylingBanner">+onDismissed: dynamic Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13870.75, 613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StandardTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableColumn">
-							<rect x="2658.5" y="522.0" height="137.0" width="287.0" data-name="StandardTableColumn"></rect>
-							<path d="M2658.5 553.0 L2945.5 553.0" fill="none" data-name="StandardTableColumn"></path>
-						</g>
-						<g transform="translate(2658.5, 522)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableColumn">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableColumn">StandardTableColumn</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2658.5, 553)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableColumn">+label: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableColumn">+tooltip: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableColumn">+columnWidth: TableColumnWidth</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableColumn">+sortable: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardTableColumn">+sortAscending: bool?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardTableColumn">+sortableIcon: Widget?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TableColumnWidth">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TableColumnWidth">
-							<rect x="2719.5" y="842.0" height="31.0" width="165.0" data-name="TableColumnWidth"></rect>
-						</g>
-						<g transform="translate(2719.5, 842)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TableColumnWidth">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableColumnWidth">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableColumnWidth">TableColumnWidth</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StandardTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTable">
-							<rect x="8262.5" y="0.0" height="392.0" width="688.0" data-name="StandardTable"></rect>
-							<path d="M8262.5 31.0 L8950.5 31.0" fill="none" data-name="StandardTable"></path>
-						</g>
-						<g transform="translate(8262.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTable">
-								<text x="336.0" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTable">StandardTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8262.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTable">+inputColumns: List&lt;StandardTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTable">+trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardTable">+trailingActionsMenuType: ActionMenuType?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardTable">+sortColumnPredicates: List&lt;int Function(T, T)?&gt;?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StandardTable">+pinnedPredicates: int Function(T, T)?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StandardTable">+headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StandardTable">+dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StandardTable">+inputTrailingActionsColumn: StandardTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StandardTable">+tableWrapper: Widget Function(Widget)?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StandardTable">+cellSpacing: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StandardTable">+rowSpacing: double</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StandardTable">+minRowHeight: double?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StandardTable">+showTableHeader: bool</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StandardTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StandardTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StandardTable">+trailingWidget: Widget?</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StandardTable">+leadingWidgetSpacing: double?</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StandardTable">+trailingWidgetSpacing: double?</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StandardTable">+emptyWidget: Widget?</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StandardTable">+rowStyle: StandardTableStyle</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StandardTable">+disableRowInteractions: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="14208.8" y="575.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
-						</g>
-						<g transform="translate(14208.75, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-							<rect x="14392.8" y="575.0" height="31.0" width="381.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?"></rect>
-						</g>
-						<g transform="translate(14392.75, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="int Function(T, T)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(T, T)?">
-							<rect x="14813.8" y="575.0" height="31.0" width="160.0" data-name="int Function(T, T)?"></rect>
-						</g>
-						<g transform="translate(14813.75, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(T, T)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(T, T)?">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(T, T)?">int Function(T, T)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<rect x="15013.8" y="575.0" height="31.0" width="523.0" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?"></rect>
-						</g>
-						<g transform="translate(15013.75, 575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-								<text x="253.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StandardTableStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableStyle">
-							<rect x="4198.0" y="804.0" height="107.0" width="353.0" data-name="StandardTableStyle"></rect>
-							<path d="M4198.0 835.0 L4551.0 835.0" fill="none" data-name="StandardTableStyle"></path>
-						</g>
-						<g transform="translate(4198, 804)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableStyle">
-								<text x="168.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableStyle">StandardTableStyle</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4198, 835)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableStyle">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableStyle">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+values: List&lt;StandardTableStyle&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+plain: StandardTableStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+material: StandardTableStyle</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TwoColumnLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TwoColumnLayout">
-							<rect x="12402.8" y="432.0" height="317.0" width="368.0" data-name="TwoColumnLayout"></rect>
-							<path d="M12402.8 463.0 L12770.8 463.0" fill="none" data-name="TwoColumnLayout"></path>
-						</g>
-						<g transform="translate(12402.75, 432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TwoColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TwoColumnLayout">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="TwoColumnLayout">TwoColumnLayout</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12402.75, 463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TwoColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TwoColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultDivider: VerticalDivider</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultContentPadding: EdgeInsets</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+slimContentPadding: EdgeInsets</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TwoColumnLayout">+leftWidget: Widget</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TwoColumnLayout">+rightWidget: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TwoColumnLayout">+dividerWidget: Widget?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TwoColumnLayout">+headerWidget: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TwoColumnLayout">+flexLeft: int?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="TwoColumnLayout">+flexRight: int?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="TwoColumnLayout">+constraintsLeft: BoxConstraints?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="TwoColumnLayout">+constraintsRight: BoxConstraints?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="TwoColumnLayout">+scrollLeft: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="TwoColumnLayout">+scrollRight: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="TwoColumnLayout">+paddingLeft: EdgeInsets?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="TwoColumnLayout">+paddingRight: EdgeInsets?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorLeft: Color?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorRight: Color?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="TwoColumnLayout">+stretchHeight: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VerticalDivider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VerticalDivider">
-							<rect x="21360.0" y="842.0" height="31.0" width="130.0" data-name="VerticalDivider"></rect>
-						</g>
-						<g transform="translate(21360, 842)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VerticalDivider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VerticalDivider">
-								<text x="57.0" y="13.5" stroke="none" text-anchor="middle" data-name="VerticalDivider">VerticalDivider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ActionMenuInline">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuInline">
-							<rect x="12160.3" y="112.0" height="168.0" width="324.0" data-name="ActionMenuInline"></rect>
-							<path d="M12160.3 143.0 L12484.3 143.0" fill="none" data-name="ActionMenuInline"></path>
-							<path d="M12160.3 249.0 L12484.3 249.0" fill="none" data-name="ActionMenuInline"></path>
-						</g>
-						<g transform="translate(12160.25, 112)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuInline">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuInline">ActionMenuInline</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12160.25, 143)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuInline">+iconSize: double?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuInline">+visible: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuInline">+splashRadius: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ActionMenuInline">+paddingVertical: double?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ActionMenuInline">+paddingHorizontal: double?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12160.25, 249)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TextParagraph">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextParagraph">
-							<rect x="17239.8" y="521.5" height="138.0" width="208.0" data-name="TextParagraph"></rect>
-							<path d="M17239.8 552.5 L17447.8 552.5" fill="none" data-name="TextParagraph"></path>
-							<path d="M17239.8 628.5 L17447.8 628.5" fill="none" data-name="TextParagraph"></path>
-						</g>
-						<g transform="translate(17239.75, 521.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextParagraph">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextParagraph">TextParagraph</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17239.75, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
-								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+text: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TextParagraph">+style: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TextParagraph">+selectable: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TextParagraph">+span: List&lt;TextSpan&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17239.75, 628.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
-								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SplashPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SplashPage">
-							<rect x="12524.3" y="165.0" height="62.0" width="136.0" data-name="SplashPage"></rect>
-							<path d="M12524.3 196.0 L12660.3 196.0" fill="none" data-name="SplashPage"></path>
-						</g>
-						<g transform="translate(12524.25, 165)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SplashPage">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SplashPage">SplashPage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12524.25, 196)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SplashPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SplashPage">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ErrorPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ErrorPage">
-							<rect x="16713.0" y="544.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
-							<path d="M16713.0 575.0 L16875.0 575.0" fill="none" data-name="ErrorPage"></path>
-							<path d="M16713.0 606.0 L16875.0 606.0" fill="none" data-name="ErrorPage"></path>
-						</g>
-						<g transform="translate(16713, 544)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ErrorPage">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="ErrorPage">ErrorPage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16713, 575)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+error: Exception?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16713, 606)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="16718.0" y="180.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(16718, 180.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Badge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Badge">
-							<rect x="13567.8" y="461.5" height="258.0" width="263.0" data-name="Badge"></rect>
-							<path d="M13567.8 492.5 L13830.8 492.5" fill="none" data-name="Badge"></path>
-							<path d="M13567.8 643.5 L13830.8 643.5" fill="none" data-name="Badge"></path>
-						</g>
-						<g transform="translate(13567.75, 461.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Badge">
-								<text x="123.5" y="13.5" stroke="none" text-anchor="middle" data-name="Badge">Badge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13567.75, 492.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
-								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+icon: IconData?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Badge">+color: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Badge">+borderRadius: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Badge">+label: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Badge">+type: BadgeType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Badge">+padding: EdgeInsets</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Badge">+iconSize: double?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Badge">+labelStyle: TextStyle?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Badge">+center: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13567.75, 643.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
-								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Badge">-Color? _getBackgroundColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Badge">-Color _getBorderColor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Badge">-Color? _getLabelColor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="18786.0" y="789.0" height="137.0" width="288.0" data-name="BadgeType"></rect>
-							<path d="M18786.0 820.0 L19074.0 820.0" fill="none" data-name="BadgeType"></path>
-						</g>
-						<g transform="translate(18786, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18786, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BadgeType">
-								<text x="0.0" y="13.5" stroke="none" data-name="BadgeType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BadgeType">&lt;static&gt;+values: List&lt;BadgeType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BadgeType">&lt;static&gt;+filled: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlined: BadgeType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlineFill: BadgeType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BadgeType">&lt;static&gt;+plain: BadgeType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IndicatorRangeSliderThumbShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IndicatorRangeSliderThumbShape">
-							<rect x="6517.5" y="521.5" height="138.0" width="287.0" data-name="IndicatorRangeSliderThumbShape"></rect>
-							<path d="M6517.5 552.5 L6804.5 552.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
-							<path d="M6517.5 613.5 L6804.5 613.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
-						</g>
-						<g transform="translate(6517.5, 521.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IndicatorRangeSliderThumbShape">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="IndicatorRangeSliderThumbShape">IndicatorRangeSliderThumbShape</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6517.5, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+buildContext: BuildContext</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+start: T</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+end: T</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6517.5, 613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+Size getPreferredSize()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+void paint()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BuildContext">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
-							<rect x="4790.5" y="842.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
-						</g>
-						<g transform="translate(4790.5, 842)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RangeSliderThumbShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RangeSliderThumbShape">
-							<rect x="4698.3" y="180.5" height="31.0" width="218.0" data-name="RangeSliderThumbShape"></rect>
-						</g>
-						<g transform="translate(4698.25, 180.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="RangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RangeSliderThumbShape">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="RangeSliderThumbShape">RangeSliderThumbShape</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="HelpIcon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HelpIcon">
-							<rect x="16910.0" y="149.5" height="93.0" width="174.0" data-name="HelpIcon"></rect>
-							<path d="M16910.0 180.5 L17084.0 180.5" fill="none" data-name="HelpIcon"></path>
-							<path d="M16910.0 211.5 L17084.0 211.5" fill="none" data-name="HelpIcon"></path>
-						</g>
-						<g transform="translate(16910, 149.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HelpIcon">
-								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="HelpIcon">HelpIcon</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16910, 180.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
-								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+tooltipText: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16910, 211.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
-								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="UnderConstruction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnderConstruction">
-							<rect x="17124.0" y="165.0" height="62.0" width="164.0" data-name="UnderConstruction"></rect>
-							<path d="M17124.0 196.0 L17288.0 196.0" fill="none" data-name="UnderConstruction"></path>
-						</g>
-						<g transform="translate(17124, 165)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnderConstruction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnderConstruction">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="UnderConstruction">UnderConstruction</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17124, 196)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnderConstruction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnderConstruction">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnderConstruction">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/domain/uml.svg b/docs/uml/designer_v2/lib/domain/uml.svg
deleted file mode 100644
index 6959fd20f..000000000
--- a/docs/uml/designer_v2/lib/domain/uml.svg
+++ /dev/null
@@ -1,229 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1594.8" height="415.0" viewbox="0 0 1594.75 415" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;ResultTypes
-	]
-	
-	[MeasurementResultTypes
-	  |
-	  &lt;static&gt;+questionnaire: String;
-	  &lt;static&gt;+values: List&lt;String&gt;
-	]
-	
-	[&lt;abstract&gt;ResultTypes]&lt;:-[MeasurementResultTypes]
-	
-	[InterventionResultTypes
-	  |
-	  &lt;static&gt;+checkmarkTask: String;
-	  &lt;static&gt;+values: List&lt;String&gt;
-	]
-	
-	[&lt;abstract&gt;ResultTypes]&lt;:-[InterventionResultTypes]
-	
-	[StudyExportData
-	  |
-	  +study: Study;
-	  +measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
-	  +interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
-	  +mediaData: List&lt;String&gt;;
-	  +isEmpty: bool
-	]
-	
-	[StudyExportData]o-[Study]
-	
-	[StudyTemplates
-	  |
-	  &lt;static&gt;+kUnnamedStudyTitle: String
-	  |
-	  &lt;static&gt;+Study emptyDraft()
-	]
-	
-	[StudyActionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyActionType&gt;;
-	  &lt;static&gt;+pin: StudyActionType;
-	  &lt;static&gt;+pinoff: StudyActionType;
-	  &lt;static&gt;+edit: StudyActionType;
-	  &lt;static&gt;+duplicate: StudyActionType;
-	  &lt;static&gt;+duplicateDraft: StudyActionType;
-	  &lt;static&gt;+addCollaborator: StudyActionType;
-	  &lt;static&gt;+export: StudyActionType;
-	  &lt;static&gt;+delete: StudyActionType
-	]
-	
-	[StudyActionType]o-[StudyActionType]
-	[Enum]&lt;:--[StudyActionType]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="415.0" width="1594.8" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M235.6 82.8 L126 142 L126 222 L126.0 222.0 " fill="none"></path>
-					<path d="M238.1 87.5 L235.6 82.8 L233.0 78.1 L247.3 76.5 Z"></path>
-					<path d="M316.4 82.8 L426 142 L426 222 L426.0 222.0 " fill="none"></path>
-					<path d="M319.0 78.1 L316.4 82.8 L313.9 87.5 L304.7 76.5 Z"></path>
-					<path d="M680.3 140.7 L680.25 142 L680.25 245 L680.3 245.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M685.6 131.3 L680.3 140.7 L674.9 131.3 L680.3 122.0 Z"></path>
-					</g>
-					<path d="M1500.6 168.2 L1513.75 162 L1521.25 162 L1521.25 162 L1528.75 260.5 L1528.75 260.5 L1521.25 359 L1521.25 359 L1513.75 359 L1513.75 359 L1483.75 344.8612440191388 L1483.8 344.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1489.9 167.3 L1500.6 168.2 L1494.5 177.0 L1483.8 176.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1304.8 89.8 L1304.75 142 L1304.75 162 L1304.8 162.0 " fill="none"></path>
-					</g>
-					<path d="M1310.1 89.8 L1304.8 89.8 L1299.4 89.8 L1304.8 76.5 Z"></path>
-					<g data-name="ResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ResultTypes">
-							<rect x="219.0" y="45.5" height="31.0" width="114.0" data-name="ResultTypes"></rect>
-						</g>
-						<g transform="translate(219, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ResultTypes">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ResultTypes">ResultTypes</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementResultTypes">
-							<rect x="0.0" y="222.0" height="77.0" width="252.0" data-name="MeasurementResultTypes"></rect>
-							<path d="M0.0 253.0 L252.0 253.0" fill="none" data-name="MeasurementResultTypes"></path>
-						</g>
-						<g transform="translate(0, 222)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementResultTypes">
-								<text x="118.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementResultTypes">MeasurementResultTypes</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 253)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementResultTypes">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+questionnaire: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionResultTypes">
-							<rect x="292.0" y="222.0" height="77.0" width="268.0" data-name="InterventionResultTypes"></rect>
-							<path d="M292.0 253.0 L560.0 253.0" fill="none" data-name="InterventionResultTypes"></path>
-						</g>
-						<g transform="translate(292, 222)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionResultTypes">
-								<text x="126.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionResultTypes">InterventionResultTypes</text>
-								
-							</g>
-						</g>
-						<g transform="translate(292, 253)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResultTypes">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+checkmarkTask: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyExportData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyExportData">
-							<rect x="473.3" y="0.0" height="122.0" width="414.0" data-name="StudyExportData"></rect>
-							<path d="M473.3 31.0 L887.3 31.0" fill="none" data-name="StudyExportData"></path>
-						</g>
-						<g transform="translate(473.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyExportData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyExportData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyExportData">StudyExportData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(473.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyExportData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyExportData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyExportData">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyExportData">+measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyExportData">+interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyExportData">+mediaData: List&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyExportData">+isEmpty: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="649.8" y="245.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(649.75, 245)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTemplates">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTemplates">
-							<rect x="927.3" y="14.5" height="93.0" width="307.0" data-name="StudyTemplates"></rect>
-							<path d="M927.3 45.5 L1234.3 45.5" fill="none" data-name="StudyTemplates"></path>
-							<path d="M927.3 76.5 L1234.3 76.5" fill="none" data-name="StudyTemplates"></path>
-						</g>
-						<g transform="translate(927.25, 14.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTemplates">
-								<text x="145.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTemplates">StudyTemplates</text>
-								
-							</g>
-						</g>
-						<g transform="translate(927.25, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+kUnnamedStudyTitle: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(927.25, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+Study emptyDraft()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyActionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyActionType">
-							<rect x="1125.8" y="162.0" height="197.0" width="358.0" data-name="StudyActionType"></rect>
-							<path d="M1125.8 193.0 L1483.8 193.0" fill="none" data-name="StudyActionType"></path>
-						</g>
-						<g transform="translate(1125.75, 162)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyActionType">
-								<text x="171.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyActionType">StudyActionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1125.75, 193)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyActionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyActionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+values: List&lt;StudyActionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pin: StudyActionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pinoff: StudyActionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+edit: StudyActionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicate: StudyActionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicateDraft: StudyActionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+addCollaborator: StudyActionType</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+export: StudyActionType</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+delete: StudyActionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="1274.3" y="45.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(1274.25, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/account/uml.svg b/docs/uml/designer_v2/lib/features/account/uml.svg
deleted file mode 100644
index 732599e0e..000000000
--- a/docs/uml/designer_v2/lib/features/account/uml.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<svg version="1.1" baseProfile="full" width="250.0" height="189.0" viewbox="0 0 250 189" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[AccountSettingsDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AccountSettingsDialog]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="189.0" width="250.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M97.0 44.3 L97 51 L97 71 L97.0 71.0 " fill="none"></path>
-					<path d="M102.3 44.3 L97.0 44.3 L91.7 44.3 L97.0 31.0 Z"></path>
-					<g data-name="AccountSettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
-							<rect x="0.0" y="71.0" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
-							<path d="M0.0 102.0 L194.0 102.0" fill="none" data-name="AccountSettingsDialog"></path>
-						</g>
-						<g transform="translate(0, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="21.0" y="0.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(21, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/analyze/uml.svg b/docs/uml/designer_v2/lib/features/analyze/uml.svg
deleted file mode 100644
index eae674115..000000000
--- a/docs/uml/designer_v2/lib/features/analyze/uml.svg
+++ /dev/null
@@ -1,92 +0,0 @@
-<svg version="1.1" baseProfile="full" width="477.0" height="204.0" viewbox="0 0 477 204" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudyAnalyzeScreen
-	  |
-	  +Widget? banner();
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
-	
-	[StudyAnalyzeController
-	  |
-	  +dynamic onExport()
-	]
-	
-	[StudyBaseController]&lt;:-[StudyAnalyzeController]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="204.0" width="477.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M90.0 44.3 L90 51 L90 71 L90.0 71.0 " fill="none"></path>
-					<path d="M95.3 44.3 L90.0 44.3 L84.7 44.3 L90.0 31.0 Z"></path>
-					<path d="M320.5 44.3 L320.5 51 L320.5 78.5 L320.5 78.5 " fill="none"></path>
-					<path d="M325.8 44.3 L320.5 44.3 L315.2 44.3 L320.5 31.0 Z"></path>
-					<g data-name="StudyAnalyzeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
-							<rect x="0.0" y="71.0" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
-							<path d="M0.0 102.0 L180.0 102.0" fill="none" data-name="StudyAnalyzeScreen"></path>
-						</g>
-						<g transform="translate(0, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="11.5" y="0.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
-						</g>
-						<g transform="translate(11.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyAnalyzeController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
-							<rect x="220.0" y="78.5" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
-							<path d="M220.0 109.5 L421.0 109.5" fill="none" data-name="StudyAnalyzeController"></path>
-						</g>
-						<g transform="translate(220, 78.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
-								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(220, 109.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyBaseController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="231.5" y="0.0" height="31.0" width="178.0" data-name="StudyBaseController"></rect>
-						</g>
-						<g transform="translate(231.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/auth/uml.svg b/docs/uml/designer_v2/lib/features/auth/uml.svg
deleted file mode 100644
index dc5d87f42..000000000
--- a/docs/uml/designer_v2/lib/features/auth/uml.svg
+++ /dev/null
@@ -1,650 +0,0 @@
-<svg version="1.1" baseProfile="full" width="3553.3" height="968.0" viewbox="0 0 3553.25 968" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudyUJobsToBeDone
-	  |
-	  +Widget build()
-	]
-	
-	[LoginForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build()
-	]
-	
-	[LoginForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
-	
-	[PasswordForgotForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build()
-	]
-	
-	[PasswordForgotForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
-	
-	[AuthFormController
-	  |
-	  +authRepository: IAuthRepository;
-	  +sharedPreferences: SharedPreferences;
-	  +notificationService: INotificationService;
-	  +router: GoRouter;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +passwordControl: FormControl&lt;String&gt;;
-	  +passwordConfirmationControl: FormControl&lt;String&gt;;
-	  +rememberMeControl: FormControl&lt;bool&gt;;
-	  +termsOfServiceControl: FormControl&lt;bool&gt;;
-	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +loginForm: FormGroup;
-	  +signupForm: FormGroup;
-	  +passwordForgotForm: FormGroup;
-	  +passwordRecoveryForm: FormGroup;
-	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  -_formKey: AuthFormKey;
-	  +shouldRemember: bool;
-	  +formKey: AuthFormKey;
-	  +form: FormGroup
-	  |
-	  -dynamic _getFormFor();
-	  -dynamic _onChangeFormKey();
-	  +dynamic resetControlsFor();
-	  -dynamic _forceValidationMessages();
-	  +dynamic signUp();
-	  -dynamic _signUp();
-	  +dynamic signIn();
-	  -dynamic _signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic sendPasswordResetLink();
-	  +dynamic recoverPassword();
-	  +dynamic updateUser();
-	  -dynamic _readDebugUser();
-	  -void _setRememberMe();
-	  -void _delRememberMe();
-	  -void _initRememberMe()
-	]
-	
-	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
-	[AuthFormController]o-[SharedPreferences]
-	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
-	[AuthFormController]o-[GoRouter]
-	[AuthFormController]o-[FormControl]
-	[AuthFormController]o-[FormGroup]
-	[AuthFormController]o-[AuthFormKey]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[AuthFormController]
-	
-	[AuthFormKey
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AuthFormKey&gt;;
-	  &lt;static&gt;+login: AuthFormKey;
-	  &lt;static&gt;+signup: AuthFormKey;
-	  &lt;static&gt;+passwordForgot: AuthFormKey;
-	  &lt;static&gt;+passwordRecovery: AuthFormKey;
-	  &lt;static&gt;-_loginSubmit: AuthFormKey;
-	  &lt;static&gt;-_signupSubmit: AuthFormKey
-	]
-	
-	[AuthFormKey]o-[AuthFormKey]
-	[Enum]&lt;:--[AuthFormKey]
-	
-	[EmailTextField
-	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
-	]
-	
-	[EmailTextField]o-[FormControl]
-	
-	[PasswordTextField
-	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
-	]
-	
-	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
-	[PasswordTextField]o-[FormControl]
-	
-	[AuthScaffold
-	  |
-	  +body: Widget;
-	  +formKey: AuthFormKey;
-	  +leftContentMinWidth: double;
-	  +leftPanelMinWidth: double;
-	  +leftPanelPadding: EdgeInsets
-	]
-	
-	[AuthScaffold]o-[&lt;abstract&gt;Widget]
-	[AuthScaffold]o-[AuthFormKey]
-	[AuthScaffold]o-[EdgeInsets]
-	
-	[SignupForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build();
-	  -dynamic _onClickTermsOfUse();
-	  -dynamic _onClickPrivacyPolicy()
-	]
-	
-	[SignupForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
-	
-	[PasswordRecoveryForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build()
-	]
-	
-	[PasswordRecoveryForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="968.0" width="3553.3" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M103.5 468.7 L103.5 725 L483 795.5175044883304 L483.0 795.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M108.8 459.3 L103.5 468.7 L98.2 459.3 L103.5 450.0 Z"></path>
-					</g>
-					<path d="M319.0 48.5 L103.5 82 L103.5 357 L103.5 357.0 " fill="none"></path>
-					<path d="M319.8 53.8 L319.0 48.5 L318.2 43.3 L332.2 46.5 Z"></path>
-					<path d="M350.5 468.7 L350.5 725 L483 769.2379032258065 L483.0 769.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M355.8 459.3 L350.5 468.7 L345.2 459.3 L350.5 450.0 Z"></path>
-					</g>
-					<path d="M395.9 53.6 L350.5 82 L350.5 357 L350.5 357.0 " fill="none"></path>
-					<path d="M398.8 58.1 L395.9 53.6 L393.1 49.1 L407.2 46.5 Z"></path>
-					<path d="M1268.1 661.0 L1158.5 725 L1158.5 813 L1158.5 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1278.9 660.9 L1268.1 661.0 L1273.5 651.7 L1284.3 651.6 Z"></path>
-					</g>
-					<path d="M1362.3 717.5 L1354 725 L1354 813 L1354.0 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1372.8 715.2 L1362.3 717.5 L1365.6 707.3 L1376.1 705.0 Z"></path>
-					</g>
-					<path d="M1563.9 722.0 L1562.5 725 L1562.5 813 L1562.5 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1572.6 715.7 L1563.9 722.0 L1562.9 711.3 L1571.6 705.0 Z"></path>
-					</g>
-					<path d="M1853.1 722.0 L1854.5 725 L1854.5 813 L1854.5 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1854.2 711.3 L1853.1 722.0 L1844.4 715.7 L1845.5 705.0 Z"></path>
-					</g>
-					<path d="M1942.1 720.0 L1945.75 725 L2139.3925120772947 813 L2139.4 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1940.9 709.4 L1942.1 720.0 L1932.3 715.7 L1931.0 705.0 Z"></path>
-					</g>
-					<path d="M2150.8 635.0 L2322.5 725 L2322.5 813 L2322.5 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2145.0 625.9 L2150.8 635.0 L2140.0 635.4 L2134.3 626.3 Z"></path>
-					</g>
-					<path d="M1266.2 515.5 L437.5 725 L483 746.1177130044844 L483.0 746.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1276.5 518.4 L1266.2 515.5 L1273.9 508.1 L1284.3 510.9 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1709.3 59.8 L1709.25 82 L1709.25 102 L1709.3 102.0 " fill="none"></path>
-					</g>
-					<path d="M1714.6 59.8 L1709.3 59.8 L1703.9 59.8 L1709.3 46.5 Z"></path>
-					<path d="M856.0 776.5 L974.3333333333335 745 L1008.4166666666665 745 L1008.4166666666665 745 L1042.5 828.5 L1042.5 828.5 L1008.4166666666665 912 L1008.4166666666665 912 L974.3333333333335 912 L974.3333333333335 912 L838 875.7265002655337 L838.0 875.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M845.6 773.7 L856.0 776.5 L848.4 784.0 L838.0 781.3 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M524.5 432.3 L524.5 725 L550.7801932367149 745 L550.8 745.0 " fill="none"></path>
-					</g>
-					<path d="M529.8 432.3 L524.5 432.3 L519.2 432.3 L524.5 419.0 Z"></path>
-					<path d="M2302.6 474.0 L2188 725 L2175.671497584541 813 L2175.7 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2311.3 467.7 L2302.6 474.0 L2301.6 463.3 L2310.3 457.0 Z"></path>
-					</g>
-					<path d="M3142.4 474.3 L2733.75 725 L2733.75 813 L2733.8 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3153.2 473.9 L3142.4 474.3 L3147.6 464.8 L3158.3 464.5 Z"></path>
-					</g>
-					<path d="M3044.6 470.1 L2228 725 L2181.6618357487923 813 L2181.7 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3055.1 472.4 L3044.6 470.1 L3051.9 462.2 L3062.4 464.5 Z"></path>
-					</g>
-					<path d="M2848.3 480.7 L2989.25 725 L2989.25 813 L2989.3 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2848.2 469.9 L2848.3 480.7 L2839.0 475.2 L2838.9 464.5 Z"></path>
-					</g>
-					<path d="M2655.8 425.4 L629.25 725 L635.2886473429952 745 L635.3 745.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2665.8 429.3 L2655.8 425.4 L2664.2 418.7 L2674.3 422.6 Z"></path>
-					</g>
-					<path d="M2876.3 477.9 L3117.25 725 L3117.25 813 L3117.3 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2873.6 467.5 L2876.3 477.9 L2865.9 474.9 L2863.2 464.5 Z"></path>
-					</g>
-					<path d="M734.0 483.7 L734 725 L719.7971014492754 745 L719.8 745.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M739.3 474.3 L734.0 483.7 L728.7 474.3 L734.0 465.0 Z"></path>
-					</g>
-					<path d="M536.9 48.7 L734 82 L734 342 L734.0 342.0 " fill="none"></path>
-					<path d="M537.8 43.5 L536.9 48.7 L536.0 54.0 L523.8 46.5 Z"></path>
-					<path d="M1017.0 468.7 L1017 725 L838 776.9677419354839 L838.0 777.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1022.3 459.3 L1017.0 468.7 L1011.7 459.3 L1017.0 450.0 Z"></path>
-					</g>
-					<path d="M554.8 41.7 L1017 82 L1017 357 L1017.0 357.0 " fill="none"></path>
-					<path d="M555.2 36.4 L554.8 41.7 L554.3 47.0 L541.5 40.5 Z"></path>
-					<g data-name="StudyUJobsToBeDone">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
-							<rect x="88.5" y="0.0" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
-							<path d="M88.5 31.0 L282.5 31.0" fill="none" data-name="StudyUJobsToBeDone"></path>
-						</g>
-						<g transform="translate(88.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
-								
-							</g>
-						</g>
-						<g transform="translate(88.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LoginForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
-							<rect x="0.0" y="357.0" height="93.0" width="207.0" data-name="LoginForm"></rect>
-							<path d="M0.0 388.0 L207.0 388.0" fill="none" data-name="LoginForm"></path>
-							<path d="M0.0 419.0 L207.0 419.0" fill="none" data-name="LoginForm"></path>
-						</g>
-						<g transform="translate(0, 357)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 388)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 419)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthFormKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
-							<rect x="483.0" y="745.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
-							<path d="M483.0 776.0 L838.0 776.0" fill="none" data-name="AuthFormKey"></path>
-						</g>
-						<g transform="translate(483, 745)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
-								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(483, 776)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerRefWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="322.5" y="15.5" height="31.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
-						</g>
-						<g transform="translate(322.5, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordForgotForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
-							<rect x="247.0" y="357.0" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
-							<path d="M247.0 388.0 L454.0 388.0" fill="none" data-name="PasswordForgotForm"></path>
-							<path d="M247.0 419.0 L454.0 419.0" fill="none" data-name="PasswordForgotForm"></path>
-						</g>
-						<g transform="translate(247, 357)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(247, 388)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(247, 419)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthFormController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
-							<rect x="1284.3" y="102.0" height="603.0" width="850.0" data-name="AuthFormController"></rect>
-							<path d="M1284.3 133.0 L2134.3 133.0" fill="none" data-name="AuthFormController"></path>
-							<path d="M1284.3 434.0 L2134.3 434.0" fill="none" data-name="AuthFormController"></path>
-						</g>
-						<g transform="translate(1284.25, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
-								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1284.25, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+sharedPreferences: SharedPreferences</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">+rememberMeControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="AuthFormController">+shouldRemember: bool</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1284.25, 434)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">-void _setRememberMe()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">-void _delRememberMe()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="AuthFormController">-void _initRememberMe()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="1087.5" y="813.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
-						</g>
-						<g transform="translate(1087.5, 813)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SharedPreferences">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SharedPreferences">
-							<rect x="1269.5" y="813.0" height="31.0" width="169.0" data-name="SharedPreferences"></rect>
-						</g>
-						<g transform="translate(1269.5, 813)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SharedPreferences">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SharedPreferences">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="SharedPreferences">SharedPreferences</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="INotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="1478.5" y="813.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
-						</g>
-						<g transform="translate(1478.5, 813)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="1808.5" y="813.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(1808.5, 813)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="2117.0" y="813.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(2117, 813)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="2270.0" y="813.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(2270, 813)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormGroupController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="1615.8" y="15.5" height="31.0" width="187.0" data-name="IFormGroupController"></rect>
-						</g>
-						<g transform="translate(1615.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
-								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="494.0" y="388.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(494, 388)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EmailTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
-							<rect x="2174.3" y="350.0" height="107.0" width="321.0" data-name="EmailTextField"></rect>
-							<path d="M2174.3 381.0 L2495.3 381.0" fill="none" data-name="EmailTextField"></path>
-						</g>
-						<g transform="translate(2174.25, 350)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2174.25, 381)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
-							<rect x="3018.3" y="342.5" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
-							<path d="M3018.3 373.5 L3497.3 373.5" fill="none" data-name="PasswordTextField"></path>
-						</g>
-						<g transform="translate(3018.25, 342.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3018.25, 373.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<rect x="2553.8" y="813.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(2553.75, 813)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
-							<rect x="2674.3" y="342.5" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
-							<path d="M2674.3 373.5 L2933.3 373.5" fill="none" data-name="AuthScaffold"></path>
-						</g>
-						<g transform="translate(2674.25, 342.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2674.25, 373.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="2953.8" y="813.0" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(2953.75, 813)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EdgeInsets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="3064.8" y="813.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
-						</g>
-						<g transform="translate(3064.75, 813)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SignupForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
-							<rect x="595.0" y="342.0" height="123.0" width="278.0" data-name="SignupForm"></rect>
-							<path d="M595.0 373.0 L873.0 373.0" fill="none" data-name="SignupForm"></path>
-							<path d="M595.0 404.0 L873.0 404.0" fill="none" data-name="SignupForm"></path>
-						</g>
-						<g transform="translate(595, 342)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
-								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(595, 373)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(595, 404)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordRecoveryForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
-							<rect x="913.0" y="357.0" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
-							<path d="M913.0 388.0 L1121.0 388.0" fill="none" data-name="PasswordRecoveryForm"></path>
-							<path d="M913.0 419.0 L1121.0 419.0" fill="none" data-name="PasswordRecoveryForm"></path>
-						</g>
-						<g transform="translate(913, 357)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(913, 388)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(913, 419)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/dashboard/uml.svg b/docs/uml/designer_v2/lib/features/dashboard/uml.svg
deleted file mode 100644
index 74b4061b4..000000000
--- a/docs/uml/designer_v2/lib/features/dashboard/uml.svg
+++ /dev/null
@@ -1,648 +0,0 @@
-<svg version="1.1" baseProfile="full" width="3530.8" height="833.0" viewbox="0 0 3530.75 833" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudiesTableColumnHeader
-	  |
-	  +title: String;
-	  +sortable: bool;
-	  +sortAscending: bool;
-	  +sortingActive: bool;
-	  +onSort: void Function()?
-	]
-	
-	[StudiesTableColumnHeader]o-[void Function()?]
-	
-	[DashboardScaffold
-	  |
-	  &lt;static&gt;+compactWidthThreshold: double;
-	  +body: Widget
-	  |
-	  +Widget build()
-	]
-	
-	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
-	
-	[StudiesTableColumnSize
-	  |
-	  +collapsed: bool;
-	  +flex: int?;
-	  +width: double?
-	  |
-	  +Widget createContainer()
-	]
-	
-	[StudiesTable
-	  |
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +compactWidthThreshold: double;
-	  +superCompactWidthThreshold: double;
-	  +compactStatTitleThreshold: double;
-	  +studies: List&lt;Study&gt;;
-	  +onSelect: void Function(Study);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study);
-	  +emptyWidget: Widget;
-	  +pinnedStudies: Iterable&lt;String&gt;;
-	  +dashboardController: DashboardController
-	  |
-	  +Widget build();
-	  -Widget _buildColumnHeader()
-	]
-	
-	[StudiesTable]o-[void Function(Study)]
-	[StudiesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)]
-	[StudiesTable]o-[&lt;abstract&gt;Widget]
-	[StudiesTable]o-[DashboardController]
-	
-	[StudiesTableColumn
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesTableColumn&gt;;
-	  &lt;static&gt;+pin: StudiesTableColumn;
-	  &lt;static&gt;+title: StudiesTableColumn;
-	  &lt;static&gt;+status: StudiesTableColumn;
-	  &lt;static&gt;+participation: StudiesTableColumn;
-	  &lt;static&gt;+createdAt: StudiesTableColumn;
-	  &lt;static&gt;+enrolled: StudiesTableColumn;
-	  &lt;static&gt;+active: StudiesTableColumn;
-	  &lt;static&gt;+completed: StudiesTableColumn;
-	  &lt;static&gt;+action: StudiesTableColumn
-	]
-	
-	[StudiesTableColumn]o-[StudiesTableColumn]
-	[Enum]&lt;:--[StudiesTableColumn]
-	
-	[DashboardScreen
-	  |
-	  +filter: StudiesFilter?
-	]
-	
-	[DashboardScreen]o-[StudiesFilter]
-	
-	[DashboardController
-	  |
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +userRepository: IUserRepository;
-	  +router: GoRouter;
-	  -_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?;
-	  +searchController: SearchController;
-	  +isSortAscending: bool
-	  |
-	  -dynamic _subscribeStudies();
-	  +dynamic setSearchText();
-	  +dynamic setStudiesFilter();
-	  +dynamic onSelectStudy();
-	  +dynamic onClickNewStudy();
-	  +dynamic pinStudy();
-	  +dynamic pinOffStudy();
-	  +void setSorting();
-	  +void filterStudies();
-	  +void sortStudies();
-	  +bool isSortingActiveForColumn();
-	  +bool isPinned();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void dispose()
-	]
-	
-	[DashboardController]o-[&lt;abstract&gt;IStudyRepository]
-	[DashboardController]o-[&lt;abstract&gt;IAuthRepository]
-	[DashboardController]o-[&lt;abstract&gt;IUserRepository]
-	[DashboardController]o-[GoRouter]
-	[DashboardController]o-[StreamSubscription]
-	[DashboardController]o-[SearchController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
-	
-	[StudiesTableItem
-	  |
-	  +study: Study;
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
-	  +isPinned: bool;
-	  +onPinnedChanged: void Function(Study, bool)?;
-	  +onTap: void Function(Study)?
-	]
-	
-	[StudiesTableItem]o-[Study]
-	[StudiesTableItem]o-[void Function(Study, bool)?]
-	[StudiesTableItem]o-[void Function(Study)?]
-	
-	[StudiesFilter
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
-	]
-	
-	[Enum]&lt;:--[StudiesFilter]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="833.0" width="3530.8" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M118.5 223.7 L118.5 308 L118.5 501.5 L118.5 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M123.8 214.3 L118.5 223.7 L113.2 214.3 L118.5 205.0 Z"></path>
-					</g>
-					<path d="M448.5 216.7 L448.5 308 L448.5 501.5 L448.5 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M453.8 207.3 L448.5 216.7 L443.2 207.3 L448.5 198.0 Z"></path>
-					</g>
-					<path d="M924.7 298.1 L909.25 308 L909.25 501.5 L909.3 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M935.5 297.5 L924.7 298.1 L929.7 288.5 L940.4 288.0 Z"></path>
-					</g>
-					<path d="M1240.8 304.9 L1242.25 308 L1242.25 501.5 L1242.3 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1241.6 294.2 L1240.8 304.9 L1232.0 298.7 L1232.8 288.0 Z"></path>
-					</g>
-					<path d="M908.0 261.6 L806.75 308 L475.0687799043062 501.5 L475.1 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M918.7 262.6 L908.0 261.6 L914.3 252.9 L925.0 253.9 Z"></path>
-					</g>
-					<path d="M1422.4 242.9 L1591.75 308 L1609.549043062201 328 L1609.5 328.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1415.6 234.6 L1422.4 242.9 L1411.8 244.6 L1405.0 236.2 Z"></path>
-					</g>
-					<path d="M2502.4 417.7 L2515.75 411 L2523.25 411 L2523.25 411 L2530.75 517 L2530.75 517 L2523.25 623 L2523.25 623 L2515.75 623 L2515.75 623 L2485.75 607.8931116389549 L2485.8 607.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2491.7 417.1 L2502.4 417.7 L2496.5 426.7 L2485.8 426.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2484.2 167.7 L2305.25 308 L2305.25 411 L2305.3 411.0 " fill="none"></path>
-					</g>
-					<path d="M2487.5 171.9 L2484.2 167.7 L2480.9 163.5 L2494.7 159.5 Z"></path>
-					<path d="M2749.3 186.5 L2594.25 308 L2699.8947368421054 478.5 L2699.9 478.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2759.9 185.0 L2749.3 186.5 L2753.3 176.6 L2763.9 175.0 Z"></path>
-					</g>
-					<path d="M1453.8 668.2 L1330 726 L1330 746 L1330.0 746.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1464.5 669.1 L1453.8 668.2 L1460.0 659.4 L1470.8 660.3 Z"></path>
-					</g>
-					<path d="M1526.9 717.7 L1516.5 726 L1516.5 746 L1516.5 746.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1537.5 716.0 L1526.9 717.7 L1530.9 707.7 L1541.5 706.0 Z"></path>
-					</g>
-					<path d="M1700.0 723.5 L1699 726 L1699 746 L1699.0 746.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1708.2 716.6 L1700.0 723.5 L1698.3 712.9 L1706.5 706.0 Z"></path>
-					</g>
-					<path d="M1855.5 723.5 L1856.5 726 L1856.5 746 L1856.5 746.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1857.2 712.9 L1855.5 723.5 L1847.3 716.6 L1849.0 706.0 Z"></path>
-					</g>
-					<path d="M2017.9 718.0 L2027.5 726 L2027.5 746 L2027.5 746.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2014.2 707.9 L2017.9 718.0 L2007.3 716.1 L2003.6 706.0 Z"></path>
-					</g>
-					<path d="M2101.7 667.7 L2227 726 L2227 746 L2227.0 746.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2095.5 658.9 L2101.7 667.7 L2091.0 668.6 L2084.8 659.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1960.3 172.8 L1960.25 308 L1942.7858851674641 328 L1942.8 328.0 " fill="none"></path>
-					</g>
-					<path d="M1965.6 172.8 L1960.3 172.8 L1954.9 172.8 L1960.3 159.5 Z"></path>
-					<path d="M3043.5 251.6 L2942.25 308 L2942.25 501.5 L2942.3 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3054.2 251.7 L3043.5 251.6 L3049.0 242.4 L3059.8 242.5 Z"></path>
-					</g>
-					<path d="M3161.9 258.1 L3129.25 308 L3129.25 501.5 L3129.3 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3171.4 253.2 L3161.9 258.1 L3162.5 247.4 L3172.1 242.5 Z"></path>
-					</g>
-					<path d="M3335.1 256.5 L3380.25 308 L3380.25 501.5 L3380.3 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3333.0 246.0 L3335.1 256.5 L3325.0 253.0 L3322.8 242.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2554.4 165.9 L2813 308 L2740.190789473684 478.5 L2740.2 478.5 " fill="none"></path>
-					</g>
-					<path d="M2557.0 161.2 L2554.4 165.9 L2551.8 170.6 L2542.7 159.5 Z"></path>
-					<g data-name="StudiesTableColumnHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
-							<rect x="0.0" y="83.0" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
-							<path d="M0.0 114.0 L237.0 114.0" fill="none" data-name="StudiesTableColumnHeader"></path>
-						</g>
-						<g transform="translate(0, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
-								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="46.5" y="501.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(46.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
-							<rect x="277.0" y="90.0" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
-							<path d="M277.0 121.0 L620.0 121.0" fill="none" data-name="DashboardScaffold"></path>
-							<path d="M277.0 167.0 L620.0 167.0" fill="none" data-name="DashboardScaffold"></path>
-						</g>
-						<g transform="translate(277, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
-								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(277, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(277, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="413.0" y="501.5" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(413, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableColumnSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
-							<rect x="660.0" y="82.5" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
-							<path d="M660.0 113.5 L885.0 113.5" fill="none" data-name="StudiesTableColumnSize"></path>
-							<path d="M660.0 174.5 L885.0 174.5" fill="none" data-name="StudiesTableColumnSize"></path>
-						</g>
-						<g transform="translate(660, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
-								
-							</g>
-						</g>
-						<g transform="translate(660, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(660, 174.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
-							<rect x="925.0" y="0.0" height="288.0" width="480.0" data-name="StudiesTable"></rect>
-							<path d="M925.0 31.0 L1405.0 31.0" fill="none" data-name="StudiesTable"></path>
-							<path d="M925.0 242.0 L1405.0 242.0" fill="none" data-name="StudiesTable"></path>
-						</g>
-						<g transform="translate(925, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
-								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(925, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(925, 242)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
-							<rect x="819.8" y="501.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
-						</g>
-						<g transform="translate(819.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<rect x="1053.8" y="501.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
-						</g>
-						<g transform="translate(1053.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
-							<rect x="1470.8" y="328.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
-							<path d="M1470.8 359.0 L2084.8 359.0" fill="none" data-name="DashboardController"></path>
-							<path d="M1470.8 480.0 L2084.8 480.0" fill="none" data-name="DashboardController"></path>
-						</g>
-						<g transform="translate(1470.75, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
-								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1470.75, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1470.75, 480)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
-							<rect x="2124.8" y="411.0" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
-							<path d="M2124.8 442.0 L2485.8 442.0" fill="none" data-name="StudiesTableColumn"></path>
-						</g>
-						<g transform="translate(2124.75, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
-								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2124.75, 442)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="2484.0" y="128.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(2484, 128.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="2714.5" y="113.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
-							<path d="M2714.5 144.0 L2892.5 144.0" fill="none" data-name="DashboardScreen"></path>
-						</g>
-						<g transform="translate(2714.5, 113)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2714.5, 144)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesFilter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
-							<rect x="2575.8" y="478.5" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
-							<path d="M2575.8 509.5 L2871.8 509.5" fill="none" data-name="StudiesFilter"></path>
-						</g>
-						<g transform="translate(2575.75, 478.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2575.75, 509.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="1254.5" y="746.0" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
-						</g>
-						<g transform="translate(1254.5, 746)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="1445.5" y="746.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
-						</g>
-						<g transform="translate(1445.5, 746)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IUserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="1627.5" y="746.0" height="31.0" width="143.0" data-name="IUserRepository"></rect>
-						</g>
-						<g transform="translate(1627.5, 746)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="1810.5" y="746.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(1810.5, 746)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="1942.5" y="746.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
-						</g>
-						<g transform="translate(1942.5, 746)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SearchController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="2152.5" y="746.0" height="31.0" width="149.0" data-name="SearchController"></rect>
-						</g>
-						<g transform="translate(2152.5, 746)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="1868.3" y="128.5" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
-						</g>
-						<g transform="translate(1868.25, 128.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
-							<rect x="3036.5" y="45.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
-							<path d="M3036.5 76.5 L3436.5 76.5" fill="none" data-name="StudiesTableItem"></path>
-						</g>
-						<g transform="translate(3036.5, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
-								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3036.5, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="2911.8" y="501.5" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(2911.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Study, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
-							<rect x="3012.8" y="501.5" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
-						</g>
-						<g transform="translate(3012.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Study)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
-							<rect x="3285.8" y="501.5" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
-						</g>
-						<g transform="translate(3285.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/enrollment/uml.svg b/docs/uml/designer_v2/lib/features/design/enrollment/uml.svg
deleted file mode 100644
index a0c07f4f0..000000000
--- a/docs/uml/designer_v2/lib/features/design/enrollment/uml.svg
+++ /dev/null
@@ -1,820 +0,0 @@
-<svg version="1.1" baseProfile="full" width="4949.5" height="1157.0" viewbox="0 0 4949.5 1157" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
-	  |
-	  +isDirtyOptionsBannerVisible: bool
-	]
-	
-	[ScreenerQuestionLogicFormView
-	  |
-	  +formViewModel: ScreenerQuestionFormViewModel
-	  |
-	  +Widget build();
-	  -dynamic _buildInfoBanner();
-	  -dynamic _buildAnswerOptionsLogicControls();
-	  -List&lt;Widget&gt; _buildOptionLogicRow()
-	]
-	
-	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
-	
-	[EnrollmentFormData
-	  |
-	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
-	  +enrollmentType: Participation;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
-	  +id: String
-	  |
-	  +Study apply();
-	  +EnrollmentFormData copy()
-	]
-	
-	[EnrollmentFormData]o-[Participation]
-	[EnrollmentFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
-	
-	[ConsentItemFormView
-	  |
-	  +formViewModel: ConsentItemFormViewModel
-	]
-	
-	[ConsentItemFormView]o-[ConsentItemFormViewModel]
-	
-	[ConsentItemFormData
-	  |
-	  +consentId: String;
-	  +title: String;
-	  +description: String;
-	  +iconName: String?;
-	  +id: String
-	  |
-	  +ConsentItem toConsentItem();
-	  +ConsentItemFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
-	
-	[StudyDesignEnrollmentFormView
-	  |
-	  +Widget build();
-	  -dynamic _showScreenerQuestionSidesheetWithArgs();
-	  -dynamic _showConsentItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
-	
-	[ScreenerQuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultResponseOptionValidity: bool;
-	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
-	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
-	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
-	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionValues: List&lt;dynamic&gt;;
-	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isDirtyOptionsBannerVisible: bool
-	  |
-	  +dynamic onResponseOptionsChanged();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
-	  +ScreenerQuestionFormViewModel createDuplicate()
-	]
-	
-	[ScreenerQuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
-	
-	[EnrollmentFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
-	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
-	  +consentItemArray: FormArray&lt;dynamic&gt;;
-	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +form: FormGroup;
-	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
-	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestScreener: bool;
-	  +canTestConsent: bool;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setControlsFrom();
-	  +EnrollmentFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
-	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
-	  +dynamic testScreener();
-	  +dynamic testConsent();
-	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
-	]
-	
-	[EnrollmentFormViewModel]o-[Study]
-	[EnrollmentFormViewModel]o-[GoRouter]
-	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
-	[EnrollmentFormViewModel]o-[FormControl]
-	[EnrollmentFormViewModel]o-[FormArray]
-	[EnrollmentFormViewModel]o-[FormViewModelCollection]
-	[EnrollmentFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
-	
-	[EnrollmentFormConsentItemDelegate
-	  |
-	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +owner: EnrollmentFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
-	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ConsentItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
-	]
-	
-	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
-	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
-	
-	[ConsentItemFormViewModel
-	  |
-	  +consentIdControl: FormControl&lt;String&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +form: FormGroup;
-	  +consentId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +ConsentItemFormData buildFormData();
-	  +ConsentItemFormViewModel createDuplicate()
-	]
-	
-	[ConsentItemFormViewModel]o-[FormControl]
-	[ConsentItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="1157.0" width="4949.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M212.0 242.7 L212 259 L337.17193308550185 361.5 L337.2 361.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M217.3 233.3 L212.0 242.7 L206.7 233.3 L212.0 224.0 Z"></path>
-					</g>
-					<path d="M212.0 44.3 L212 51 L212 86 L212.0 86.0 " fill="none"></path>
-					<path d="M217.3 44.3 L212.0 44.3 L206.7 44.3 L212.0 31.0 Z"></path>
-					<path d="M1287.2 252.5 L1281 259 L1281 512.5 L1281.0 512.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1297.5 249.4 L1287.2 252.5 L1289.8 242.1 L1300.1 239.0 Z"></path>
-					</g>
-					<path d="M1612.5 245.8 L1646.25 259 L1646.25 512.5 L1646.3 512.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1605.8 237.4 L1612.5 245.8 L1601.9 247.4 L1595.1 239.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1380.5 44.3 L1380.5 51 L1380.5 71 L1380.5 71.0 " fill="none"></path>
-					</g>
-					<path d="M1385.8 44.3 L1380.5 44.3 L1375.2 44.3 L1380.5 31.0 Z"></path>
-					<path d="M3581.0 200.5 L3533.75 259 L3741.668215613383 399 L3741.7 399.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3591.0 196.6 L3581.0 200.5 L3582.7 189.9 L3592.7 186.0 Z"></path>
-					</g>
-					<path d="M1776.5 44.3 L1776.5 51 L1776.5 71 L1776.5 71.0 " fill="none"></path>
-					<path d="M1781.8 44.3 L1776.5 44.3 L1771.2 44.3 L1776.5 31.0 Z"></path>
-					<path d="M2170.0 44.3 L2170 51 L2170 109 L2170.0 109.0 " fill="none"></path>
-					<path d="M2175.3 44.3 L2170.0 44.3 L2164.7 44.3 L2170.0 31.0 Z"></path>
-					<path d="M540.5 713.2 L540.5 797 L558.0494071146245 908 L558.0 908.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M545.8 703.8 L540.5 713.2 L535.2 703.8 L540.5 694.5 Z"></path>
-					</g>
-					<path d="M570.0 183.8 L570 259 L558.7592936802974 361.5 L558.8 361.5 " fill="none"></path>
-					<path d="M575.3 183.8 L570.0 183.8 L564.7 183.8 L570.0 170.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M882.0 199.3 L882 259 L751.8745353159851 361.5 L751.9 361.5 " fill="none"></path>
-					</g>
-					<path d="M887.3 199.3 L882.0 199.3 L876.7 199.3 L882.0 186.0 Z"></path>
-					<path d="M2559.4 618.4 L1632.75 797 L1632.75 908 L1632.8 908.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2569.6 621.9 L2559.4 618.4 L2567.6 611.4 L2577.8 614.9 Z"></path>
-					</g>
-					<path d="M2559.5 626.7 L1749.25 797 L1749.25 908 L1749.3 908.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2569.7 630.0 L2559.5 626.7 L2567.5 619.5 L2577.8 622.8 Z"></path>
-					</g>
-					<path d="M3498.0 634.0 L4219.5 797 L4262.820158102767 817 L4262.8 817.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3490.0 626.7 L3498.0 634.0 L3487.7 637.1 L3479.8 629.9 Z"></path>
-					</g>
-					<path d="M3443.1 786.9 L3459.25 797 L3476.7994071146245 908 L3476.8 908.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3438.0 777.4 L3443.1 786.9 L3432.3 786.5 L3427.2 777.0 Z"></path>
-					</g>
-					<path d="M2559.4 613.6 L1553 797 L609.5 917.2546599496221 L609.5 917.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2569.5 617.1 L2559.4 613.6 L2567.6 606.6 L2577.8 610.2 Z"></path>
-					</g>
-					<path d="M2559.5 633.8 L1835.25 797 L1835.25 923.5 L1835.25 923.5 L1835.25 1050 L1835.25 1050 L4124.75 1083.8796373488954 L4124.8 1083.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2569.8 636.9 L2559.5 633.8 L2567.5 626.5 L2577.8 629.6 Z"></path>
-					</g>
-					<path d="M3496.5 758.9 L3573.75 797 L3906.75 908 L3906.8 908.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3490.5 750.0 L3496.5 758.9 L3485.8 759.5 L3479.8 750.6 Z"></path>
-					</g>
-					<path d="M2505.0 183.8 L2505 259 L2577.75 296.364677804296 L2577.8 296.4 " fill="none"></path>
-					<path d="M2510.3 183.8 L2505.0 183.8 L2499.7 183.8 L2505.0 170.5 Z"></path>
-					<path d="M2729.5 183.8 L2729.5 259 L2751.7490706319704 279 L2751.7 279.0 " fill="none"></path>
-					<path d="M2734.8 183.8 L2729.5 183.8 L2724.2 183.8 L2729.5 170.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3223.5 175.0 L2992 259 L2994.732342007435 279 L2994.7 279.0 " fill="none"></path>
-					</g>
-					<path d="M3225.3 180.1 L3223.5 175.0 L3221.7 170.0 L3236.0 170.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3985.1 170.8 L3453.75 259 L3422.1514869888474 279 L3422.2 279.0 " fill="none"></path>
-					</g>
-					<path d="M3986.0 176.1 L3985.1 170.8 L3984.2 165.5 L3998.3 168.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M4600.5 164.4 L3493.75 259 L3459.1775092936805 279 L3459.2 279.0 " fill="none"></path>
-					</g>
-					<path d="M4600.9 169.7 L4600.5 164.4 L4600.0 159.1 L4613.8 163.2 Z"></path>
-					<path d="M4493.5 1048.7 L4493.5 1050 L4343.75 1070.5057859209257 L4343.8 1070.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4498.8 1039.3 L4493.5 1048.7 L4488.2 1039.3 L4493.5 1030.0 Z"></path>
-					</g>
-					<path d="M4726.4 808.7 L4750.25 797 L3479.75 598.4728434504792 L3479.8 598.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4715.7 808.1 L4726.4 808.7 L4720.4 817.7 L4709.7 817.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3400.5 166.2 L4413.5 259 L4413.5 528 L4413.5 528 L4413.5 797 L4413.5 797 L4426.148221343874 817 L4426.1 817.0 " fill="none"></path>
-					</g>
-					<path d="M3401.0 160.8 L3400.5 166.2 L3400.0 171.5 L3387.3 164.9 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M4148.7 174.1 L4453.5 259 L4453.5 528 L4453.5 528 L4453.5 797 L4453.5 797 L4459.824110671937 817 L4459.8 817.0 " fill="none"></path>
-					</g>
-					<path d="M4150.2 168.9 L4148.7 174.1 L4147.3 179.2 L4135.9 170.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M4710.3 183.8 L4710.25 259 L4710.25 528 L4710.25 528 L4710.25 797 L4710.25 797 L4675.981225296443 817 L4676.0 817.0 " fill="none"></path>
-					</g>
-					<path d="M4715.6 183.8 L4710.3 183.8 L4704.9 183.8 L4710.3 170.5 Z"></path>
-					<path d="M3726.2 667.4 L3533.75 797 L3485.927865612648 908 L3485.9 908.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3736.9 666.6 L3726.2 667.4 L3730.9 657.8 L3741.7 657.0 Z"></path>
-					</g>
-					<path d="M4063.9 670.8 L4179.5 797 L3980.9723320158105 908 L3981.0 908.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4061.6 660.3 L4063.9 670.8 L4053.7 667.5 L4051.3 657.0 Z"></path>
-					</g>
-					<path d="M4320.1 177.9 L4199.5 259 L4060.9312267657992 399 L4060.9 399.0 " fill="none"></path>
-					<path d="M4323.1 182.4 L4320.1 177.9 L4317.1 173.5 L4331.2 170.5 Z"></path>
-					<g data-name="IScreenerQuestionLogicFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="716.0" y="124.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M716.0 155.0 L1048.0 155.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
-						</g>
-						<g transform="translate(716, 124)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(716, 155)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionLogicFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="0.0" y="86.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M0.0 117.0 L424.0 117.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M0.0 148.0 L424.0 148.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-						</g>
-						<g transform="translate(0, 86)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
-								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 117)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="259.5" y="361.5" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M259.5 392.5 L821.5 392.5" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M259.5 573.5 L821.5 573.5" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(259.5, 361.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
-								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(259.5, 392.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(259.5, 573.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="116.0" y="0.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
-						</g>
-						<g transform="translate(116, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="1153.5" y="71.0" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M1153.5 102.0 L1607.5 102.0" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M1153.5 193.0 L1607.5 193.0" fill="none" data-name="EnrollmentFormData"></path>
-						</g>
-						<g transform="translate(1153.5, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
-								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1153.5, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1153.5, 193)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="1224.0" y="512.5" height="31.0" width="114.0" data-name="Participation"></rect>
-						</g>
-						<g transform="translate(1224, 512.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="1544.3" y="512.5" height="31.0" width="204.0" data-name="QuestionnaireFormData"></rect>
-						</g>
-						<g transform="translate(1544.25, 512.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="1309.0" y="0.0" height="31.0" width="143.0" data-name="IStudyFormData"></rect>
-						</g>
-						<g transform="translate(1309, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="3427.3" y="124.0" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M3427.3 155.0 L3808.3 155.0" fill="none" data-name="ConsentItemFormView"></path>
-						</g>
-						<g transform="translate(3427.25, 124)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3427.25, 155)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="3585.3" y="399.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M3585.3 430.0 L4281.3 430.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M3585.3 596.0 L4281.3 596.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-						</g>
-						<g transform="translate(3585.25, 399)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3585.25, 430)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3585.25, 596)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="1647.5" y="71.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M1647.5 102.0 L1905.5 102.0" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M1647.5 193.0 L1905.5 193.0" fill="none" data-name="ConsentItemFormData"></path>
-						</g>
-						<g transform="translate(1647.5, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1647.5, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1647.5, 193)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="1727.5" y="0.0" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(1727.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignEnrollmentFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="1945.5" y="109.0" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M1945.5 140.0 L2394.5 140.0" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
-						</g>
-						<g transform="translate(1945.5, 109)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1945.5, 140)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="2064.0" y="0.0" height="31.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-						</g>
-						<g transform="translate(2064, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="511.5" y="908.0" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(511.5, 908)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="464.0" y="139.5" height="31.0" width="212.0" data-name="QuestionFormViewModel"></rect>
-						</g>
-						<g transform="translate(464, 139.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="2577.8" y="279.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M2577.8 310.0 L3479.8 310.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M2577.8 536.0 L3479.8 536.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-						</g>
-						<g transform="translate(2577.75, 279)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
-								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2577.75, 310)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2577.75, 536)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="1602.3" y="908.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(1602.25, 908)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="1703.3" y="908.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(1703.25, 908)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormConsentItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="4093.5" y="817.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M4093.5 848.0 L4893.5 848.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M4093.5 924.0 L4893.5 924.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-						</g>
-						<g transform="translate(4093.5, 817)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4093.5, 848)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4093.5, 924)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="3422.8" y="908.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(3422.75, 908)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="4124.8" y="1070.0" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
-						</g>
-						<g transform="translate(4124.75, 1070)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="3900.8" y="908.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(3900.75, 908)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="2434.5" y="139.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(2434.5, 139.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="2615.5" y="139.5" height="31.0" width="228.0" data-name="WithQuestionnaireControls"></rect>
-						</g>
-						<g transform="translate(2615.5, 139.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="106.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="3170.3" y="139.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-						</g>
-						<g transform="translate(3170.25, 139.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="3998.3" y="139.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(3998.25, 139.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="4613.8" y="139.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-						</g>
-						<g transform="translate(4613.75, 139.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="4246.8" y="139.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(4246.75, 139.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/info/uml.svg b/docs/uml/designer_v2/lib/features/design/info/uml.svg
deleted file mode 100644
index 580464fbd..000000000
--- a/docs/uml/designer_v2/lib/features/design/info/uml.svg
+++ /dev/null
@@ -1,319 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1559.5" height="878.0" viewbox="0 0 1559.5 878" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudyDesignInfoFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
-	
-	[StudyInfoFormViewModel
-	  |
-	  +study: Study;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +organizationControl: FormControl&lt;String&gt;;
-	  +reviewBoardControl: FormControl&lt;String&gt;;
-	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
-	  +researchersControl: FormControl&lt;String&gt;;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +websiteControl: FormControl&lt;String&gt;;
-	  +phoneControl: FormControl&lt;String&gt;;
-	  +additionalInfoControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +iconRequired: dynamic;
-	  +organizationRequired: dynamic;
-	  +reviewBoardRequired: dynamic;
-	  +reviewBoardNumberRequired: dynamic;
-	  +researchersRequired: dynamic;
-	  +emailRequired: dynamic;
-	  +phoneRequired: dynamic;
-	  +emailFormat: dynamic;
-	  +websiteFormat: dynamic
-	  |
-	  +void setControlsFrom();
-	  +StudyInfoFormData buildFormData()
-	]
-	
-	[StudyInfoFormViewModel]o-[Study]
-	[StudyInfoFormViewModel]o-[FormControl]
-	[StudyInfoFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
-	
-	[StudyInfoFormData
-	  |
-	  +title: String;
-	  +description: String?;
-	  +iconName: String;
-	  +contactInfoFormData: StudyContactInfoFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
-	]
-	
-	[StudyInfoFormData]o-[StudyContactInfoFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
-	
-	[StudyContactInfoFormData
-	  |
-	  +organization: String?;
-	  +institutionalReviewBoard: String?;
-	  +institutionalReviewBoardNumber: String?;
-	  +researchers: String?;
-	  +email: String?;
-	  +website: String?;
-	  +phone: String?;
-	  +additionalInfo: String?;
-	  +id: String
-	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="878.0" width="1559.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M111.5 44.3 L111.5 51 L111.5 281.5 L111.5 281.5 " fill="none"></path>
-					<path d="M116.8 44.3 L111.5 44.3 L106.2 44.3 L111.5 31.0 Z"></path>
-					<path d="M485.6 570.8 L484 574 L484 692.5 L484.0 692.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M494.4 564.7 L485.6 570.8 L484.8 560.1 L493.7 554.0 Z"></path>
-					</g>
-					<path d="M611.0 572.7 L611 574 L611 692.5 L611.0 692.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M616.3 563.3 L611.0 572.7 L605.7 563.3 L611.0 554.0 Z"></path>
-					</g>
-					<path d="M844.1 567.8 L849.75 574 L849.75 692.5 L849.8 692.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M841.7 557.3 L844.1 567.8 L833.8 564.5 L831.5 554.0 Z"></path>
-					</g>
-					<path d="M611.0 44.3 L611 51 L611 71 L611.0 71.0 " fill="none"></path>
-					<path d="M616.3 44.3 L611.0 44.3 L605.7 44.3 L611.0 31.0 Z"></path>
-					<path d="M1206.0 415.2 L1206 574 L1224.4328358208954 594 L1224.4 594.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1211.3 405.8 L1206.0 415.2 L1200.7 405.8 L1206.0 396.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1262.8 34.7 L1206 51 L1206 228.5 L1206.0 228.5 " fill="none"></path>
-					</g>
-					<path d="M1264.2 39.8 L1262.8 34.7 L1261.3 29.6 L1275.6 31.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1396.2 34.7 L1453 51 L1453 312.5 L1453 312.5 L1453 574 L1453 574 L1434.5671641791046 594 L1434.6 594.0 " fill="none"></path>
-					</g>
-					<path d="M1397.7 29.6 L1396.2 34.7 L1394.8 39.8 L1383.4 31.0 Z"></path>
-					<g data-name="StudyDesignInfoFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="0.0" y="281.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M0.0 312.5 L223.0 312.5" fill="none" data-name="StudyDesignInfoFormView"></path>
-						</g>
-						<g transform="translate(0, 281.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 312.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="5.5" y="0.0" height="31.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-						</g>
-						<g transform="translate(5.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="263.0" y="71.0" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M263.0 102.0 L959.0 102.0" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M263.0 508.0 L959.0 508.0" fill="none" data-name="StudyInfoFormViewModel"></path>
-						</g>
-						<g transform="translate(263, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(263, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(263, 508)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="453.5" y="692.5" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(453.5, 692.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="554.5" y="692.5" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(554.5, 692.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="797.3" y="692.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(797.25, 692.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="540.5" y="0.0" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(540.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="999.0" y="228.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M999.0 259.5 L1413.0 259.5" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M999.0 350.5 L1413.0 350.5" fill="none" data-name="StudyInfoFormData"></path>
-						</g>
-						<g transform="translate(999, 228.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(999, 259.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(999, 350.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyContactInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="1155.5" y="594.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M1155.5 625.0 L1503.5 625.0" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M1155.5 776.0 L1503.5 776.0" fill="none" data-name="StudyContactInfoFormData"></path>
-						</g>
-						<g transform="translate(1155.5, 594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
-								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1155.5, 625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1155.5, 776)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="1258.0" y="0.0" height="31.0" width="143.0" data-name="IStudyFormData"></rect>
-						</g>
-						<g transform="translate(1258, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/interventions/uml.svg b/docs/uml/designer_v2/lib/features/design/interventions/uml.svg
deleted file mode 100644
index 21200174f..000000000
--- a/docs/uml/designer_v2/lib/features/design/interventions/uml.svg
+++ /dev/null
@@ -1,1004 +0,0 @@
-<svg version="1.1" baseProfile="full" width="5173.0" height="1337.0" viewbox="0 0 5173 1337" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[InterventionsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +interventionsArray: FormArray&lt;dynamic&gt;;
-	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
-	  +form: FormGroup;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +interventionsRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestStudySchedule: bool
-	  |
-	  +void setControlsFrom();
-	  +InterventionsFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +InterventionFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +dynamic testStudySchedule()
-	]
-	
-	[InterventionsFormViewModel]o-[Study]
-	[InterventionsFormViewModel]o-[GoRouter]
-	[InterventionsFormViewModel]o-[FormArray]
-	[InterventionsFormViewModel]o-[FormViewModelCollection]
-	[InterventionsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
-	
-	[InterventionTaskFormViewModel
-	  |
-	  +taskIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +taskTitleControl: FormControl&lt;String&gt;;
-	  +taskDescriptionControl: FormControl&lt;String&gt;;
-	  +markAsCompletedControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +taskId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +InterventionTaskFormData buildFormData();
-	  +InterventionTaskFormViewModel createDuplicate()
-	]
-	
-	[InterventionTaskFormViewModel]o-[FormControl]
-	[InterventionTaskFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
-	
-	[InterventionPreview
-	  |
-	  +routeArgs: InterventionFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPreview]o-[InterventionFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
-	
-	[&lt;abstract&gt;StudyScheduleControls
-	  |
-	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
-	  &lt;static&gt;+defaultScheduleTypeSequence: String;
-	  &lt;static&gt;+defaultNumCycles: int;
-	  &lt;static&gt;+defaultPeriodLength: int;
-	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
-	  +phaseDurationControl: FormControl&lt;int&gt;;
-	  +numCyclesControl: FormControl&lt;int&gt;;
-	  +includeBaselineControl: FormControl&lt;bool&gt;;
-	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  &lt;static&gt;+kNumCyclesMin: int;
-	  &lt;static&gt;+kNumCyclesMax: int;
-	  &lt;static&gt;+kPhaseDurationMin: int;
-	  &lt;static&gt;+kPhaseDurationMax: int;
-	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +numCyclesRange: dynamic;
-	  +phaseDurationRange: dynamic;
-	  +customSequenceRequired: dynamic
-	  |
-	  +void setStudyScheduleControlsFrom();
-	  +StudyScheduleFormData buildStudyScheduleFormData();
-	  +bool isSequencingCustom()
-	]
-	
-	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
-	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
-	
-	[InterventionTaskFormView
-	  |
-	  +formViewModel: InterventionTaskFormViewModel
-	]
-	
-	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
-	
-	[InterventionsFormData
-	  |
-	  +interventionsData: List&lt;InterventionFormData&gt;;
-	  +studyScheduleData: StudyScheduleFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +InterventionsFormData copy()
-	]
-	
-	[InterventionsFormData]o-[StudyScheduleFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
-	
-	[InterventionTaskFormData
-	  |
-	  +taskId: String;
-	  +taskTitle: String;
-	  +taskDescription: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +CheckmarkTask toTask();
-	  +InterventionTaskFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
-	
-	[InterventionFormView
-	  |
-	  +formViewModel: InterventionFormViewModel
-	]
-	
-	[InterventionFormView]o-[InterventionFormViewModel]
-	
-	[StudyDesignInterventionsFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
-	
-	[InterventionFormData
-	  |
-	  +interventionId: String;
-	  +title: String;
-	  +description: String?;
-	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
-	  +iconName: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +Intervention toIntervention();
-	  +InterventionFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
-	
-	[StudyScheduleFormData
-	  |
-	  +sequenceType: PhaseSequence;
-	  +sequenceTypeCustom: String;
-	  +numCycles: int;
-	  +phaseDuration: int;
-	  +includeBaseline: bool;
-	  +id: String
-	  |
-	  +StudySchedule toStudySchedule();
-	  +Study apply();
-	  +StudyScheduleFormData copy()
-	]
-	
-	[StudyScheduleFormData]o-[PhaseSequence]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
-	
-	[StudyScheduleFormView
-	  |
-	  +formViewModel: StudyScheduleControls
-	  |
-	  -FormTableRow _renderCustomSequence();
-	  +Widget build()
-	]
-	
-	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
-	
-	[InterventionFormViewModel
-	  |
-	  +study: Study;
-	  +interventionIdControl: FormControl&lt;String&gt;;
-	  +interventionTitleControl: FormControl&lt;String&gt;;
-	  +interventionIconControl: FormControl&lt;IconOption&gt;;
-	  +interventionDescriptionControl: FormControl&lt;String&gt;;
-	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
-	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
-	  +form: FormGroup;
-	  +interventionId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneTask: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +InterventionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +InterventionTaskFormViewModel provide();
-	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
-	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
-	  +InterventionFormViewModel createDuplicate()
-	]
-	
-	[InterventionFormViewModel]o-[Study]
-	[InterventionFormViewModel]o-[FormControl]
-	[InterventionFormViewModel]o-[FormArray]
-	[InterventionFormViewModel]o-[FormViewModelCollection]
-	[InterventionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="1337.0" width="5173.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M558.7 1179.0 L513.75 1230 L525.0176056338028 1250 L525.0 1250.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M568.9 1175.5 L558.7 1179.0 L560.9 1168.5 L571.1 1165.0 Z"></path>
-					</g>
-					<path d="M666.6 1182.6 L650.25 1230 L650.25 1250 L650.3 1250.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M674.6 1175.6 L666.6 1182.6 L664.6 1172.1 L672.6 1165.0 Z"></path>
-					</g>
-					<path d="M737.8 1183.7 L737.75 1230 L764.5105633802817 1250 L764.5 1250.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M743.1 1174.3 L737.8 1183.7 L732.4 1174.3 L737.8 1165.0 Z"></path>
-					</g>
-					<path d="M1119.7 1173.6 L1228.75 1230 L1632.75 1257.9298928919181 L1632.8 1257.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1113.8 1164.6 L1119.7 1173.6 L1108.9 1174.0 L1103.1 1165.0 Z"></path>
-					</g>
-					<path d="M1175.7 1037.5 L2547.25 1230 L2592.8838028169016 1250 L2592.9 1250.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1167.2 1030.9 L1175.7 1037.5 L1165.8 1041.5 L1157.3 1034.9 Z"></path>
-					</g>
-					<path d="M70.5 534.3 L70.5 722 L318.25 816.3102285500188 L318.3 816.3 " fill="none"></path>
-					<path d="M75.8 534.3 L70.5 534.3 L65.2 534.3 L70.5 521.0 Z"></path>
-					<path d="M1490.8 565.7 L471.75 722 L539.8208661417323 787 L539.8 787.0 " fill="none"></path>
-					<path d="M1491.6 570.9 L1490.8 565.7 L1490.0 560.4 L1504.0 563.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M327.7 529.1 L581.25 722 L621.2992125984252 787 L621.3 787.0 " fill="none"></path>
-					</g>
-					<path d="M331.0 524.8 L327.7 529.1 L324.5 533.3 L317.1 521.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M953.8 533.3 L1032 722 L956.6998031496063 787 L956.7 787.0 " fill="none"></path>
-					</g>
-					<path d="M958.7 531.3 L953.8 533.3 L948.9 535.4 L948.7 521.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1160.8 534.3 L1161.25 722 L1052.8740157480315 787 L1052.9 787.0 " fill="none"></path>
-					</g>
-					<path d="M1166.1 534.3 L1160.8 534.3 L1155.5 534.3 L1160.8 521.0 Z"></path>
-					<path d="M4161.5 1079.2 L4696.5 1230 L4874 1256.9284188034187 L4874.0 1256.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4153.9 1071.5 L4161.5 1079.2 L4151.0 1081.8 L4143.5 1074.1 Z"></path>
-					</g>
-					<path d="M3429.2 1053.0 L2587.25 1230 L2610.3485915492956 1250 L2610.3 1250.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3439.5 1056.3 L3429.2 1053.0 L3437.3 1045.9 L3447.5 1049.2 Z"></path>
-					</g>
-					<path d="M2500.8 523.6 L3502.75 722 L3638.175688976378 839.5 L3638.2 839.5 " fill="none"></path>
-					<path d="M2501.9 518.4 L2500.8 523.6 L2499.8 528.8 L2487.8 521.0 Z"></path>
-					<path d="M4540.8 530.5 L4351.5 722 L4094.2952755905512 839.5 L4094.3 839.5 " fill="none"></path>
-					<path d="M4544.6 534.2 L4540.8 530.5 L4537.0 526.7 L4550.2 521.0 Z"></path>
-					<path d="M2673.5 235.2 L2673.5 289 L2673.5 490 L2673.5 490.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2678.8 225.8 L2673.5 235.2 L2668.2 225.8 L2673.5 216.5 Z"></path>
-					</g>
-					<path d="M2673.5 44.3 L2673.5 51 L2673.5 123.5 L2673.5 123.5 " fill="none"></path>
-					<path d="M2678.8 44.3 L2673.5 44.3 L2668.2 44.3 L2673.5 31.0 Z"></path>
-					<path d="M2278.6 708.9 L2304 722 L3163.632874015748 960.5 L3163.6 960.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2272.7 699.9 L2278.6 708.9 L2267.9 709.4 L2262.0 700.4 Z"></path>
-					</g>
-					<path d="M2280.6 533.9 L4910.5 722 L4910.5 976 L4910.5 976 L4910.5 1230 L4910.5 1230 L4921.767605633803 1250 L4921.8 1250.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2271.7 527.9 L2280.6 533.9 L2270.9 538.6 L2262.0 532.6 Z"></path>
-					</g>
-					<path d="M4866.7 549.8 L4696.5 722 L4143.5 877.8956714761376 L4143.5 877.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4877.1 546.9 L4866.7 549.8 L4869.5 539.4 L4879.9 536.5 Z"></path>
-					</g>
-					<path d="M4163.5 257.7 L4163.5 289 L4227.812933025404 406.5 L4227.8 406.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4168.8 248.3 L4163.5 257.7 L4158.2 248.3 L4163.5 239.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M4217.5 34.8 L4163.5 51 L4163.5 101 L4163.5 101.0 " fill="none"></path>
-					</g>
-					<path d="M4219.0 39.9 L4217.5 34.8 L4216.0 29.7 L4230.3 31.0 Z"></path>
-					<path d="M3023.5 44.3 L3023.5 51 L3023.5 86 L3023.5 86.0 " fill="none"></path>
-					<path d="M3028.8 44.3 L3023.5 44.3 L3018.2 44.3 L3023.5 31.0 Z"></path>
-					<path d="M731.6 543.1 L1201.25 722 L1334.75 782.4438502673797 L1334.8 782.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M724.8 534.8 L731.6 543.1 L721.0 544.8 L714.2 536.5 Z"></path>
-					</g>
-					<path d="M3356.5 44.3 L3356.5 51 L3356.5 139 L3356.5 139.0 " fill="none"></path>
-					<path d="M3361.8 44.3 L3356.5 44.3 L3351.2 44.3 L3356.5 31.0 Z"></path>
-					<path d="M3735.5 44.3 L3735.5 51 L3735.5 71 L3735.5 71.0 " fill="none"></path>
-					<path d="M3740.8 44.3 L3735.5 44.3 L3730.2 44.3 L3735.5 31.0 Z"></path>
-					<path d="M4116.0 549.4 L3462.75 722 L3234.343996062992 960.5 L3234.3 960.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4126.3 552.2 L4116.0 549.4 L4123.6 541.8 L4134.0 544.6 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M4346.5 34.8 L4400.5 51 L4400.5 170 L4400.5 170 L4400.5 289 L4400.5 289 L4336.187066974596 406.5 L4336.2 406.5 " fill="none"></path>
-					</g>
-					<path d="M4348.0 29.7 L4346.5 34.8 L4345.0 39.9 L4333.7 31.0 Z"></path>
-					<path d="M1883.0 242.7 L1883 289 L1883 309 L1883.0 309.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1888.3 233.3 L1883.0 242.7 L1877.7 233.3 L1883.0 224.0 Z"></path>
-					</g>
-					<path d="M1883.0 44.3 L1883 51 L1883 116 L1883.0 116.0 " fill="none"></path>
-					<path d="M1888.3 44.3 L1883.0 44.3 L1877.7 44.3 L1883.0 31.0 Z"></path>
-					<path d="M1316.5 1071.1 L572 1230 L550.4507042253521 1250 L550.5 1250.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1326.7 1074.4 L1316.5 1071.1 L1324.5 1064.0 L1334.8 1067.2 Z"></path>
-					</g>
-					<path d="M2208.4 1011.5 L4950.5 1230 L4939.232394366197 1250 L4939.2 1250.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2199.5 1005.5 L2208.4 1011.5 L2198.6 1016.1 L2189.8 1010.1 Z"></path>
-					</g>
-					<path d="M1317.7 1172.9 L1188.75 1230 L834.25 1261.1889714993804 L834.3 1261.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1328.4 1174.0 L1317.7 1172.9 L1324.1 1164.2 L1334.8 1165.3 Z"></path>
-					</g>
-					<path d="M1762.3 1228.7 L1762.25 1230 L1750.9823943661972 1250 L1751.0 1250.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1767.6 1219.3 L1762.3 1228.7 L1756.9 1219.3 L1762.3 1210.0 Z"></path>
-					</g>
-					<path d="M2208.2 1040.1 L3529.25 1230 L2680.75 1263.4314650388458 L2680.8 1263.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2199.7 1033.5 L2208.2 1040.1 L2198.2 1044.1 L2189.8 1037.5 Z"></path>
-					</g>
-					<path d="M2354.6 525.6 L1817 722 L1812.6889763779527 742 L1812.7 742.0 " fill="none"></path>
-					<path d="M2356.4 530.6 L2354.6 525.6 L2352.7 520.6 L2367.1 521.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M418.5 522.4 L1857 722 L1849.5393700787401 742 L1849.5 742.0 " fill="none"></path>
-					</g>
-					<path d="M419.2 517.1 L418.5 522.4 L417.7 527.7 L405.3 520.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1023.6 523.9 L1897 722 L1886.3897637795276 742 L1886.4 742.0 " fill="none"></path>
-					</g>
-					<path d="M1024.8 518.7 L1023.6 523.9 L1022.4 529.1 L1010.6 521.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1235.6 524.2 L2026.25 722 L2005.4625984251968 742 L2005.5 742.0 " fill="none"></path>
-					</g>
-					<path d="M1236.9 519.1 L1235.6 524.2 L1234.4 529.4 L1222.7 521.0 Z"></path>
-					<g data-name="InterventionsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="318.3" y="787.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M318.3 818.0 L1157.3 818.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M318.3 969.0 L1157.3 969.0" fill="none" data-name="InterventionsFormViewModel"></path>
-						</g>
-						<g transform="translate(318.25, 787)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
-								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(318.25, 818)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(318.25, 969)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="503.3" y="1250.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(503.25, 1250)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="604.3" y="1250.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(604.25, 1250)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="736.3" y="1250.0" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(736.25, 1250)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="1632.8" y="1250.0" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
-						</g>
-						<g transform="translate(1632.75, 1250)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="2575.8" y="1250.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(2575.75, 1250)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="0.0" y="490.0" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(0, 490)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="1504.0" y="309.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M1504.0 340.0 L2262.0 340.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M1504.0 641.0 L2262.0 641.0" fill="none" data-name="StudyScheduleControls"></path>
-						</g>
-						<g transform="translate(1504, 309)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
-								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1504, 340)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1504, 641)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="188.3" y="490.0" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-						</g>
-						<g transform="translate(188.25, 490)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="860.3" y="490.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(860.25, 490)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="1064.3" y="490.0" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-						</g>
-						<g transform="translate(1064.25, 490)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="3447.5" y="839.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M3447.5 870.5 L4143.5 870.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M3447.5 1051.5 L4143.5 1051.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-						</g>
-						<g transform="translate(3447.5, 839.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3447.5, 870.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3447.5, 1051.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="4874.0" y="1250.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(4874, 1250)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="2302.0" y="490.0" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(2302, 490)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="4470.0" y="490.0" height="31.0" width="191.0" data-name="WithScheduleControls"></rect>
-						</g>
-						<g transform="translate(4470, 490)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="2508.5" y="123.5" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M2508.5 154.5 L2838.5 154.5" fill="none" data-name="InterventionPreview"></path>
-							<path d="M2508.5 185.5 L2838.5 185.5" fill="none" data-name="InterventionPreview"></path>
-						</g>
-						<g transform="translate(2508.5, 123.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2508.5, 154.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2508.5, 185.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="2557.0" y="490.0" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(2557, 490)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="2597.5" y="0.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(2597.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PhaseSequence">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="3146.5" y="960.5" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
-						</g>
-						<g transform="translate(3146.5, 960.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
-								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="4704.0" y="474.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M4704.0 505.5 L5117.0 505.5" fill="none" data-name="InterventionTaskFormView"></path>
-						</g>
-						<g transform="translate(4704, 474.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4704, 505.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="3966.5" y="101.0" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M3966.5 132.0 L4360.5 132.0" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M3966.5 193.0 L4360.5 193.0" fill="none" data-name="InterventionsFormData"></path>
-						</g>
-						<g transform="translate(3966.5, 101)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3966.5, 132)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3966.5, 193)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="4134.0" y="406.5" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M4134.0 437.5 L4430.0 437.5" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M4134.0 543.5 L4430.0 543.5" fill="none" data-name="StudyScheduleFormData"></path>
-						</g>
-						<g transform="translate(4134, 406.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4134, 437.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4134, 543.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="4210.5" y="0.0" height="31.0" width="143.0" data-name="IStudyFormData"></rect>
-						</g>
-						<g transform="translate(4210.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="2878.5" y="86.0" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M2878.5 117.0 L3168.5 117.0" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M2878.5 208.0 L3168.5 208.0" fill="none" data-name="InterventionTaskFormData"></path>
-						</g>
-						<g transform="translate(2878.5, 86)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2878.5, 117)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2878.5, 208)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="2920.0" y="0.0" height="31.0" width="207.0" data-name="IFormDataWithSchedule"></rect>
-						</g>
-						<g transform="translate(2920, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="445.3" y="474.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M445.3 505.5 L820.3 505.5" fill="none" data-name="InterventionFormView"></path>
-						</g>
-						<g transform="translate(445.25, 474.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
-								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(445.25, 505.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="1334.8" y="742.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M1334.8 773.0 L2189.8 773.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M1334.8 999.0 L2189.8 999.0" fill="none" data-name="InterventionFormViewModel"></path>
-						</g>
-						<g transform="translate(1334.75, 742)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
-								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1334.75, 773)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1334.75, 999)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignInterventionsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="3208.5" y="139.0" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M3208.5 170.0 L3504.5 170.0" fill="none" data-name="StudyDesignInterventionsFormView"></path>
-						</g>
-						<g transform="translate(3208.5, 139)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3208.5, 170)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="3250.5" y="0.0" height="31.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-						</g>
-						<g transform="translate(3250.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="3544.5" y="71.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M3544.5 102.0 L3926.5 102.0" fill="none" data-name="InterventionFormData"></path>
-							<path d="M3544.5 223.0 L3926.5 223.0" fill="none" data-name="InterventionFormData"></path>
-						</g>
-						<g transform="translate(3544.5, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3544.5, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3544.5, 223)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="3686.5" y="0.0" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(3686.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="1703.5" y="116.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M1703.5 147.0 L2062.5 147.0" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M1703.5 178.0 L2062.5 178.0" fill="none" data-name="StudyScheduleFormView"></path>
-						</g>
-						<g transform="translate(1703.5, 116)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1703.5, 147)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1703.5, 178)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="1787.0" y="0.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
-						</g>
-						<g transform="translate(1787, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/measurements/survey/uml.svg b/docs/uml/designer_v2/lib/features/design/measurements/survey/uml.svg
deleted file mode 100644
index 4f64dc548..000000000
--- a/docs/uml/designer_v2/lib/features/design/measurements/survey/uml.svg
+++ /dev/null
@@ -1,398 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2680.0" height="652.0" viewbox="0 0 2680 652" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[MeasurementSurveyFormView
-	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
-	]
-	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
-	
-	[MeasurementSurveyFormData
-	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
-	]
-	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
-	
-	[MeasurementSurveyFormViewModel
-	  |
-	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
-	]
-	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
-	
-	[SurveyPreview
-	  |
-	  +routeArgs: MeasurementFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="652.0" width="2680.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M222.0 80.7 L222 82 L754.5 222.00425894378196 L754.5 222.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M227.3 71.3 L222.0 80.7 L216.7 71.3 L222.0 62.0 Z"></path>
-					</g>
-					<path d="M2035.5 431.2 L2035.5 545 L2035.5 565 L2035.5 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2040.8 421.8 L2035.5 431.2 L2030.2 421.8 L2035.5 412.5 Z"></path>
-					</g>
-					<path d="M2035.5 59.8 L2035.5 82 L2035.5 214.5 L2035.5 214.5 " fill="none"></path>
-					<path d="M2040.8 59.8 L2035.5 59.8 L2030.2 59.8 L2035.5 46.5 Z"></path>
-					<path d="M966.9 541.0 L964.5 545 L964.5 565 L964.5 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M976.2 535.7 L966.9 541.0 L967.1 530.3 L976.4 525.0 Z"></path>
-					</g>
-					<path d="M1197.1 542.2 L1198.25 545 L1198.25 565 L1198.3 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1198.5 531.6 L1197.1 542.2 L1188.6 535.7 L1190.0 525.0 Z"></path>
-					</g>
-					<path d="M1468.0 451.3 L1716.5 545 L1716.5 565 L1716.5 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1461.1 443.0 L1468.0 451.3 L1457.4 453.0 L1450.5 444.7 Z"></path>
-					</g>
-					<path d="M591.5 59.8 L591.5 82 L754.5 155.84442270058707 L754.5 155.8 " fill="none"></path>
-					<path d="M596.8 59.8 L591.5 59.8 L586.2 59.8 L591.5 46.5 Z"></path>
-					<path d="M853.0 59.8 L853 82 L874.5550755939526 102 L874.6 102.0 " fill="none"></path>
-					<path d="M858.3 59.8 L853.0 59.8 L847.7 59.8 L853.0 46.5 Z"></path>
-					<path d="M1102.5 59.8 L1102.5 82 L1102.5 102 L1102.5 102.0 " fill="none"></path>
-					<path d="M1107.8 59.8 L1102.5 59.8 L1097.2 59.8 L1102.5 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1346.5 59.8 L1346.5 82 L1325.4200863930885 102 L1325.4 102.0 " fill="none"></path>
-					</g>
-					<path d="M1351.8 59.8 L1346.5 59.8 L1341.2 59.8 L1346.5 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1577.0 59.8 L1577 82 L1450.5 143.71707060063224 L1450.5 143.7 " fill="none"></path>
-					</g>
-					<path d="M1582.3 59.8 L1577.0 59.8 L1571.7 59.8 L1577.0 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1795.5 59.8 L1795.5 82 L1450.5 197.24891774891773 L1450.5 197.2 " fill="none"></path>
-					</g>
-					<path d="M1800.8 59.8 L1795.5 59.8 L1790.2 59.8 L1795.5 46.5 Z"></path>
-					<path d="M2452.0 378.7 L2452 545 L2452 565 L2452.0 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2457.3 369.3 L2452.0 378.7 L2446.7 369.3 L2452.0 360.0 Z"></path>
-					</g>
-					<path d="M2452.0 59.8 L2452 82 L2452 267 L2452.0 267.0 " fill="none"></path>
-					<path d="M2457.3 59.8 L2452.0 59.8 L2446.7 59.8 L2452.0 46.5 Z"></path>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="0.0" y="0.0" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M0.0 31.0 L444.0 31.0" fill="none" data-name="MeasurementSurveyFormView"></path>
-						</g>
-						<g transform="translate(0, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="754.5" y="102.0" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M754.5 133.0 L1450.5 133.0" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M754.5 359.0 L1450.5 359.0" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-						</g>
-						<g transform="translate(754.5, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(754.5, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(754.5, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="1831.0" y="214.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M1831.0 245.5 L2240.0 245.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M1831.0 366.5 L2240.0 366.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-						</g>
-						<g transform="translate(1831, 214.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1831, 245.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1831, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="1933.5" y="565.0" height="31.0" width="204.0" data-name="QuestionnaireFormData"></rect>
-						</g>
-						<g transform="translate(1933.5, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="1932.0" y="15.5" height="31.0" width="207.0" data-name="IFormDataWithSchedule"></rect>
-						</g>
-						<g transform="translate(1932, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="934.0" y="565.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(934, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="1141.8" y="565.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(1141.75, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="1664.0" y="565.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(1664, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="484.0" y="15.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(484, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="739.0" y="15.5" height="31.0" width="228.0" data-name="WithQuestionnaireControls"></rect>
-						</g>
-						<g transform="translate(739, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="106.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="1007.0" y="15.5" height="31.0" width="191.0" data-name="WithScheduleControls"></rect>
-						</g>
-						<g transform="translate(1007, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="1238.0" y="15.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-						</g>
-						<g transform="translate(1238, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="1495.0" y="15.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(1495, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="1699.0" y="15.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-						</g>
-						<g transform="translate(1699, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="2280.0" y="267.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M2280.0 298.0 L2624.0 298.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M2280.0 329.0 L2624.0 329.0" fill="none" data-name="SurveyPreview"></path>
-						</g>
-						<g transform="translate(2280, 267)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2280, 298)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2280, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="2328.5" y="565.0" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(2328.5, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="2376.0" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(2376, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/measurements/uml.svg b/docs/uml/designer_v2/lib/features/design/measurements/uml.svg
deleted file mode 100644
index 11d537c95..000000000
--- a/docs/uml/designer_v2/lib/features/design/measurements/uml.svg
+++ /dev/null
@@ -1,645 +0,0 @@
-<svg version="1.1" baseProfile="full" width="4118.8" height="652.0" viewbox="0 0 4118.75 652" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[MeasurementsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +measurementsArray: FormArray&lt;dynamic&gt;;
-	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
-	  +form: FormGroup;
-	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +measurementRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +MeasurementsFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +MeasurementSurveyFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave()
-	]
-	
-	[MeasurementsFormViewModel]o-[Study]
-	[MeasurementsFormViewModel]o-[GoRouter]
-	[MeasurementsFormViewModel]o-[FormArray]
-	[MeasurementsFormViewModel]o-[FormViewModelCollection]
-	[MeasurementsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
-	
-	[StudyDesignMeasurementsFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
-	
-	[MeasurementsFormData
-	  |
-	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
-	  +id: String
-	  |
-	  +Study apply();
-	  +MeasurementsFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
-	
-	[MeasurementSurveyFormView
-	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
-	]
-	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
-	
-	[MeasurementSurveyFormData
-	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
-	]
-	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
-	
-	[MeasurementSurveyFormViewModel
-	  |
-	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
-	]
-	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
-	
-	[SurveyPreview
-	  |
-	  +routeArgs: MeasurementFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="652.0" width="4118.8" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M1434.1 511.0 L1413.75 545 L1628.75 576.0896130346232 L1628.8 576.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1443.4 505.7 L1434.1 511.0 L1434.3 500.3 L1443.7 495.0 Z"></path>
-					</g>
-					<path d="M1551.8 513.7 L1551.75 545 L1450.5 569.4100169779286 L1450.5 569.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1557.2 504.3 L1551.8 513.7 L1546.5 504.3 L1551.9 495.0 Z"></path>
-					</g>
-					<path d="M1627.0 512.5 L1639.25 545 L1583.0528169014085 565 L1583.1 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1628.7 501.9 L1627.0 512.5 L1618.8 505.6 L1620.5 495.0 Z"></path>
-					</g>
-					<path d="M1900.9 503.9 L1976 545 L2049.239436619718 565 L2049.2 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1895.2 494.8 L1900.9 503.9 L1890.1 504.2 L1884.5 495.0 Z"></path>
-					</g>
-					<path d="M1996.5 502.3 L2097 545 L2491.5 576.3305369127517 L2491.5 576.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1990.0 493.7 L1996.5 502.3 L1985.8 503.6 L1979.3 495.0 Z"></path>
-					</g>
-					<path d="M70.5 59.8 L70.5 82 L1006.25 228.19613632529104 L1006.3 228.2 " fill="none"></path>
-					<path d="M75.8 59.8 L70.5 59.8 L65.2 59.8 L70.5 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1216.5 53.1 L1165.5 82 L1249.0313174946004 132 L1249.0 132.0 " fill="none"></path>
-					</g>
-					<path d="M1219.2 57.7 L1216.5 53.1 L1213.9 48.4 L1228.1 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1941.4 55.1 L1909.5 82 L1832.3401727861772 132 L1832.3 132.0 " fill="none"></path>
-					</g>
-					<path d="M1944.9 59.2 L1941.4 55.1 L1938.0 51.0 L1951.6 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M2692.3 52.5 L2633.25 82 L2098.25 196.57215541165587 L2098.3 196.6 " fill="none"></path>
-					</g>
-					<path d="M2694.7 57.2 L2692.3 52.5 L2689.9 47.7 L2704.3 46.5 Z"></path>
-					<path d="M287.0 59.8 L287 82 L278.55561555075593 282.5 L278.6 282.5 " fill="none"></path>
-					<path d="M292.3 59.8 L287.0 59.8 L281.7 59.8 L287.0 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M729.0 59.8 L729 82 L721.840172786177 252 L721.8 252.0 " fill="none"></path>
-					</g>
-					<path d="M734.3 59.8 L729.0 59.8 L723.7 59.8 L729.0 46.5 Z"></path>
-					<path d="M1626.0 80.7 L1626 82 L2143.25 220.391649812193 L2143.3 220.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1631.3 71.3 L1626.0 80.7 L1620.7 71.3 L1626.0 62.0 Z"></path>
-					</g>
-					<path d="M3474.3 431.2 L3474.25 545 L3474.25 565 L3474.3 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3479.6 421.8 L3474.3 431.2 L3468.9 421.8 L3474.3 412.5 Z"></path>
-					</g>
-					<path d="M3474.3 59.8 L3474.25 82 L3474.25 214.5 L3474.3 214.5 " fill="none"></path>
-					<path d="M3479.6 59.8 L3474.3 59.8 L3468.9 59.8 L3474.3 46.5 Z"></path>
-					<path d="M2184.0 535.9 L2171.5 545 L1689.75 578.3862859931673 L1689.8 578.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2194.7 534.8 L2184.0 535.9 L2188.4 526.2 L2199.1 525.0 Z"></path>
-					</g>
-					<path d="M2597.1 541.9 L2598.5 545 L2651.739436619718 565 L2651.7 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2598.0 531.2 L2597.1 541.9 L2588.3 535.7 L2589.2 525.0 Z"></path>
-					</g>
-					<path d="M2856.4 472.1 L3024.25 545 L2596.5 576.6192087454451 L2596.5 576.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2849.9 463.5 L2856.4 472.1 L2845.7 473.3 L2839.3 464.6 Z"></path>
-					</g>
-					<path d="M2491.3 59.8 L2491.25 82 L2491.25 102 L2491.3 102.0 " fill="none"></path>
-					<path d="M2496.6 59.8 L2491.3 59.8 L2485.9 59.8 L2491.3 46.5 Z"></path>
-					<path d="M2985.8 59.8 L2985.75 82 L2839.25 150.58392315470172 L2839.3 150.6 " fill="none"></path>
-					<path d="M2991.1 59.8 L2985.8 59.8 L2980.4 59.8 L2985.8 46.5 Z"></path>
-					<path d="M3235.3 59.8 L3235.25 82 L2839.25 205.21774193548387 L2839.3 205.2 " fill="none"></path>
-					<path d="M3240.6 59.8 L3235.3 59.8 L3229.9 59.8 L3235.3 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1318.5 50.4 L1420.75 82 L2143.25 238.2435777673984 L2143.3 238.2 " fill="none"></path>
-					</g>
-					<path d="M1320.0 45.3 L1318.5 50.4 L1316.9 55.5 L1305.7 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M2010.5 52.8 L2064.75 82 L2143.25 124.60902696365767 L2143.3 124.6 " fill="none"></path>
-					</g>
-					<path d="M2013.1 48.1 L2010.5 52.8 L2008.0 57.5 L1998.8 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M2779.2 52.3 L2840.5 82 L2810.327213822894 102 L2810.3 102.0 " fill="none"></path>
-					</g>
-					<path d="M2781.6 47.5 L2779.2 52.3 L2776.9 57.1 L2767.2 46.5 Z"></path>
-					<path d="M3890.8 378.7 L3890.75 545 L3890.75 565 L3890.8 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3896.1 369.3 L3890.8 378.7 L3885.4 369.3 L3890.8 360.0 Z"></path>
-					</g>
-					<path d="M3890.8 59.8 L3890.75 82 L3890.75 267 L3890.8 267.0 " fill="none"></path>
-					<path d="M3896.1 59.8 L3890.8 59.8 L3885.4 59.8 L3890.8 46.5 Z"></path>
-					<g data-name="MeasurementsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="1006.3" y="132.0" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M1006.3 163.0 L2098.3 163.0" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M1006.3 314.0 L2098.3 314.0" fill="none" data-name="MeasurementsFormViewModel"></path>
-						</g>
-						<g transform="translate(1006.25, 132)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
-								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1006.25, 163)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1006.25, 314)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="1628.8" y="565.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(1628.75, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="1358.5" y="565.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(1358.5, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="1490.5" y="565.0" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(1490.5, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="1996.5" y="565.0" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
-						</g>
-						<g transform="translate(1996.5, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="2491.5" y="565.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(2491.5, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="0.0" y="15.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(0, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="1147.0" y="15.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-						</g>
-						<g transform="translate(1147, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="1888.0" y="15.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(1888, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="2638.8" y="15.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-						</g>
-						<g transform="translate(2638.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignMeasurementsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="122.3" y="282.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M122.3 313.5 L432.3 313.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
-						</g>
-						<g transform="translate(122.25, 282.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(122.25, 313.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="181.0" y="15.5" height="31.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-						</g>
-						<g transform="translate(181, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="472.3" y="252.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M472.3 283.0 L966.3 283.0" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M472.3 329.0 L966.3 329.0" fill="none" data-name="MeasurementsFormData"></path>
-						</g>
-						<g transform="translate(472.25, 252)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
-								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(472.25, 283)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(472.25, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="657.5" y="15.5" height="31.0" width="143.0" data-name="IStudyFormData"></rect>
-						</g>
-						<g transform="translate(657.5, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="1404.0" y="0.0" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M1404.0 31.0 L1848.0 31.0" fill="none" data-name="MeasurementSurveyFormView"></path>
-						</g>
-						<g transform="translate(1404, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1404, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="2143.3" y="102.0" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M2143.3 133.0 L2839.3 133.0" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M2143.3 359.0 L2839.3 359.0" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-						</g>
-						<g transform="translate(2143.25, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2143.25, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2143.25, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="3269.8" y="214.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M3269.8 245.5 L3678.8 245.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M3269.8 366.5 L3678.8 366.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-						</g>
-						<g transform="translate(3269.75, 214.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3269.75, 245.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3269.75, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="3372.3" y="565.0" height="31.0" width="204.0" data-name="QuestionnaireFormData"></rect>
-						</g>
-						<g transform="translate(3372.25, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="3370.8" y="15.5" height="31.0" width="207.0" data-name="IFormDataWithSchedule"></rect>
-						</g>
-						<g transform="translate(3370.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="2636.5" y="565.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(2636.5, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="2383.8" y="15.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(2383.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="2871.8" y="15.5" height="31.0" width="228.0" data-name="WithQuestionnaireControls"></rect>
-						</g>
-						<g transform="translate(2871.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="106.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="3139.8" y="15.5" height="31.0" width="191.0" data-name="WithScheduleControls"></rect>
-						</g>
-						<g transform="translate(3139.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="3718.8" y="267.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M3718.8 298.0 L4062.8 298.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M3718.8 329.0 L4062.8 329.0" fill="none" data-name="SurveyPreview"></path>
-						</g>
-						<g transform="translate(3718.75, 267)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3718.75, 298)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3718.75, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="3767.3" y="565.0" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(3767.25, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="3814.8" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(3814.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/reports/section/types/uml.svg b/docs/uml/designer_v2/lib/features/design/reports/section/types/uml.svg
deleted file mode 100644
index 023bcc555..000000000
--- a/docs/uml/designer_v2/lib/features/design/reports/section/types/uml.svg
+++ /dev/null
@@ -1,446 +0,0 @@
-<svg version="1.1" baseProfile="full" width="3199.5" height="503.0" viewbox="0 0 3199.5 503" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[TemporalAggregationFormatted
-	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
-	]
-	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
-	
-	[ImprovementDirectionFormatted
-	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
-	]
-	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
-	
-	[ReportSectionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
-	]
-	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
-	
-	[DataReferenceIdentifier
-	  |
-	  +hashCode: int
-	  |
-	  +bool ==()
-	]
-	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
-	
-	[DataReferenceEditor
-	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
-	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
-	]
-	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
-	
-	[AverageSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
-	
-	[LinearRegressionSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="503.0" width="3199.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M204.2 231.4 L204 233 L204 299 L204.0 299.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M211.0 223.1 L204.2 231.4 L200.4 221.4 L207.2 213.0 Z"></path>
-					</g>
-					<path d="M387.1 223.9 L399.75 233 L455.01993865030676 299 L455.0 299.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M382.7 214.1 L387.1 223.9 L376.4 222.8 L372.0 213.0 Z"></path>
-					</g>
-					<path d="M733.3 231.4 L733.5 233 L733.5 299 L733.5 299.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M737.1 221.4 L733.3 231.4 L726.5 223.1 L730.3 213.0 Z"></path>
-					</g>
-					<path d="M549.7 223.9 L537 233 L481.1226993865031 299 L481.1 299.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M560.4 222.8 L549.7 223.9 L554.2 214.1 L564.9 213.0 Z"></path>
-					</g>
-					<path d="M1269.1 263.9 L1281 261 L1288.5 261 L1288.5 261 L1296 314.5 L1296 314.5 L1288.5 368 L1288.5 368 L1281 368 L1281 368 L1251 360.7539503386005 L1251.0 360.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1258.8 260.9 L1269.1 263.9 L1261.3 271.2 L1251.0 268.2 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1059.5 135.3 L1059.5 233 L1059.5 261 L1059.5 261.0 " fill="none"></path>
-					</g>
-					<path d="M1064.8 135.3 L1059.5 135.3 L1054.2 135.3 L1059.5 122.0 Z"></path>
-					<path d="M1443.0 135.3 L1443 233 L1443 268 L1443.0 268.0 " fill="none"></path>
-					<path d="M1448.3 135.3 L1443.0 135.3 L1437.7 135.3 L1443.0 122.0 Z"></path>
-					<path d="M1819.7 188.4 L1773.25 233 L1773.25 299 L1773.3 299.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1830.1 185.8 L1819.7 188.4 L1822.7 178.1 L1833.1 175.5 Z"></path>
-					</g>
-					<path d="M1970.5 190.2 L2004 233 L2004 299 L2004.0 299.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1969.0 179.6 L1970.5 190.2 L1960.6 186.1 L1959.0 175.5 Z"></path>
-					</g>
-					<path d="M2385.0 394.7 L2385 396 L2531.1971830985917 416 L2531.2 416.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2390.3 385.3 L2385.0 394.7 L2379.7 385.3 L2385.0 376.0 Z"></path>
-					</g>
-					<path d="M2600.7 127.8 L2385 233 L2385 253 L2385.0 253.0 " fill="none"></path>
-					<path d="M2603.1 132.6 L2600.7 127.8 L2598.4 123.0 L2612.7 122.0 Z"></path>
-					<path d="M2904.0 394.7 L2904 396 L2757.8028169014083 416 L2757.8 416.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2909.3 385.3 L2904.0 394.7 L2898.7 385.3 L2904.0 376.0 Z"></path>
-					</g>
-					<path d="M2688.3 127.8 L2904 233 L2904 253 L2904.0 253.0 " fill="none"></path>
-					<path d="M2690.6 123.0 L2688.3 127.8 L2685.9 132.6 L2676.3 122.0 Z"></path>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="0.0" y="0.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M0.0 31.0 L448.0 31.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M0.0 137.0 L448.0 137.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-						</g>
-						<g transform="translate(0, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="111.0" y="299.0" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
-						</g>
-						<g transform="translate(111, 299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="424.5" y="299.0" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(424.5, 299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="488.0" y="0.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M488.0 31.0 L939.0 31.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M488.0 137.0 L939.0 137.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-						</g>
-						<g transform="translate(488, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(488, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(488, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="639.0" y="299.0" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
-						</g>
-						<g transform="translate(639, 299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="868.0" y="261.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M868.0 292.0 L1251.0 292.0" fill="none" data-name="ReportSectionType"></path>
-						</g>
-						<g transform="translate(868, 261)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(868, 292)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="1029.0" y="91.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(1029, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="1341.0" y="268.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M1341.0 299.0 L1545.0 299.0" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M1341.0 330.0 L1545.0 330.0" fill="none" data-name="DataReferenceIdentifier"></path>
-						</g>
-						<g transform="translate(1341, 268)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1341, 299)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1341, 330)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="1375.5" y="91.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(1375.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="1550.5" y="37.5" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M1550.5 68.5 L2259.5 68.5" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M1550.5 129.5 L2259.5 129.5" fill="none" data-name="DataReferenceEditor"></path>
-						</g>
-						<g transform="translate(1550.5, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1550.5, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1550.5, 129.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="1716.8" y="299.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(1716.75, 299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="1902.5" y="299.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
-						</g>
-						<g transform="translate(1902.5, 299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="2145.5" y="253.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M2145.5 284.0 L2624.5 284.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M2145.5 345.0 L2624.5 345.0" fill="none" data-name="AverageSectionFormView"></path>
-						</g>
-						<g transform="translate(2145.5, 253)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2145.5, 284)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2145.5, 345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="2530.5" y="416.0" height="31.0" width="228.0" data-name="ReportItemFormViewModel"></rect>
-						</g>
-						<g transform="translate(2530.5, 416)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
-								<text x="106.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="2568.5" y="91.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(2568.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="2664.5" y="253.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M2664.5 284.0 L3143.5 284.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M2664.5 345.0 L3143.5 345.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-						</g>
-						<g transform="translate(2664.5, 253)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2664.5, 284)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2664.5, 345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/reports/section/uml.svg b/docs/uml/designer_v2/lib/features/design/reports/section/uml.svg
deleted file mode 100644
index 61458f4da..000000000
--- a/docs/uml/designer_v2/lib/features/design/reports/section/uml.svg
+++ /dev/null
@@ -1,705 +0,0 @@
-<svg version="1.1" baseProfile="full" width="3731.5" height="1237.0" viewbox="0 0 3731.5 1237" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[ReportItemFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
-	  |
-	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
-	]
-	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
-	
-	[TemporalAggregationFormatted
-	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
-	]
-	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
-	
-	[ImprovementDirectionFormatted
-	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
-	]
-	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
-	
-	[ReportSectionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
-	]
-	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
-	
-	[DataReferenceIdentifier
-	  |
-	  +hashCode: int
-	  |
-	  +bool ==()
-	]
-	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
-	
-	[DataReferenceEditor
-	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
-	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
-	]
-	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
-	
-	[AverageSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
-	
-	[LinearRegressionSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
-	
-	[ReportItemFormData
-	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
-	  +id: String
-	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
-	]
-	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
-	
-	[ReportItemFormViewModel
-	  |
-	  &lt;static&gt;+defaultSectionType: ReportSectionType;
-	  +sectionIdControl: FormControl&lt;String&gt;;
-	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +sectionControl: FormControl&lt;ReportSection&gt;;
-	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
-	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
-	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
-	  +alphaControl: FormControl&lt;double&gt;;
-	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +form: FormGroup;
-	  +sectionId: String;
-	  +sectionType: ReportSectionType;
-	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
-	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
-	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +dataReferenceRequired: dynamic;
-	  +aggregationRequired: dynamic;
-	  +improvementDirectionRequired: dynamic;
-	  +alphaConfidenceRequired: dynamic
-	  |
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +ReportItemFormData buildFormData();
-	  +ReportItemFormViewModel createDuplicate();
-	  +dynamic onSectionTypeChanged();
-	  -void _updateFormControls();
-	  +void setControlsFrom()
-	]
-	
-	[ReportItemFormViewModel]o-[ReportSectionType]
-	[ReportItemFormViewModel]o-[FormControl]
-	[ReportItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="1237.0" width="3731.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M642.0 373.5 L1107.25 441 L1678.5 605.4405963841277 L1678.5 605.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M633.5 366.9 L642.0 373.5 L632.0 377.5 L623.5 370.9 Z"></path>
-					</g>
-					<path d="M370.3 439.3 L370 441 L370 732 L370.0 732.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M377.3 431.2 L370.3 439.3 L366.8 429.2 L373.8 421.0 Z"></path>
-					</g>
-					<path d="M756.7 231.4 L756.5 233 L756.5 321.5 L756.5 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M763.5 223.1 L756.7 231.4 L752.9 221.4 L759.7 213.0 Z"></path>
-					</g>
-					<path d="M964.1 222.8 L980.5 233 L1038.578125 321.5 L1038.6 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M959.0 213.4 L964.1 222.8 L953.4 222.5 L948.2 213.0 Z"></path>
-					</g>
-					<path d="M1313.3 230.4 L1314.25 233 L1314.25 321.5 L1314.3 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1314.9 219.8 L1313.3 230.4 L1305.0 223.6 L1306.6 213.0 Z"></path>
-					</g>
-					<path d="M1102.2 223.9 L1089.5 233 L1054.8233173076924 321.5 L1054.8 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1112.9 222.8 L1102.2 223.9 L1106.7 214.1 L1117.4 213.0 Z"></path>
-					</g>
-					<path d="M401.6 1109.9 L831.3333333333333 1074 L943.4166666666666 1074 L943.4166666666666 1074 L1055.5 1127.5 L1055.5 1127.5 L943.4166666666666 1181 L943.4166666666666 1181 L831.3333333333333 1181 L831.3333333333333 1181 L383 1143.5123730138057 L383.0 1143.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M391.9 1105.4 L401.6 1109.9 L392.7 1116.0 L383.0 1111.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M171.5 776.3 L171.5 1054 L176.9421768707483 1074 L176.9 1074.0 " fill="none"></path>
-					</g>
-					<path d="M176.8 776.3 L171.5 776.3 L166.2 776.3 L171.5 763.0 Z"></path>
-					<path d="M1599.0 135.3 L1599 233 L1599 290.5 L1599.0 290.5 " fill="none"></path>
-					<path d="M1604.3 135.3 L1599.0 135.3 L1593.7 135.3 L1599.0 122.0 Z"></path>
-					<path d="M2687.0 803.2 L1008 1054 L2095.5 1123.8699737762238 L2095.5 1123.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2697.1 807.1 L2687.0 803.2 L2695.5 796.6 L2705.5 800.5 Z"></path>
-					</g>
-					<path d="M3060.0 835.2 L3060 1054 L3060 1112 L3060.0 1112.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3065.3 825.8 L3060.0 835.2 L3054.7 825.8 L3060.0 816.5 Z"></path>
-					</g>
-					<path d="M1980.5 417.2 L1980.5 441 L1992.9959216965742 461 L1993.0 461.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1985.8 407.8 L1980.5 417.2 L1975.2 407.8 L1980.5 398.5 Z"></path>
-					</g>
-					<path d="M2196.2 127.8 L1980.5 233 L1980.5 275.5 L1980.5 275.5 " fill="none"></path>
-					<path d="M2198.6 132.6 L2196.2 127.8 L2193.9 123.0 L2208.2 122.0 Z"></path>
-					<path d="M2499.5 417.2 L2499.5 441 L2478.1296900489397 461 L2478.1 461.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2504.8 407.8 L2499.5 417.2 L2494.2 407.8 L2499.5 398.5 Z"></path>
-					</g>
-					<path d="M2283.8 127.8 L2499.5 233 L2499.5 275.5 L2499.5 275.5 " fill="none"></path>
-					<path d="M2286.1 123.0 L2283.8 127.8 L2281.4 132.6 L2271.8 122.0 Z"></path>
-					<path d="M3518.5 424.7 L3518.5 441 L3518.5 732 L3518.5 732.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3523.8 415.3 L3518.5 424.7 L3513.2 415.3 L3518.5 406.0 Z"></path>
-					</g>
-					<path d="M3518.5 135.3 L3518.5 233 L3518.5 268 L3518.5 268.0 " fill="none"></path>
-					<path d="M3523.8 135.3 L3518.5 135.3 L3513.2 135.3 L3518.5 122.0 Z"></path>
-					<path d="M1660.4 877.7 L968 1054 L383 1109.3734707018673 L383.0 1109.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1670.8 880.6 L1660.4 877.7 L1668.1 870.3 L1678.5 873.1 Z"></path>
-					</g>
-					<path d="M2172.0 1052.7 L2172 1054 L2156.21768707483 1112 L2156.2 1112.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2177.3 1043.3 L2172.0 1052.7 L2166.7 1043.3 L2172.0 1034.0 Z"></path>
-					</g>
-					<path d="M2581.1 1045.0 L2593.5 1054 L2593.5 1112 L2593.5 1112.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2576.7 1035.2 L2581.1 1045.0 L2570.4 1043.8 L2566.0 1034.0 Z"></path>
-					</g>
-					<path d="M2886.5 365.8 L2886.5 441 L2665.5 535.8026592022393 L2665.5 535.8 " fill="none"></path>
-					<path d="M2891.8 365.8 L2886.5 365.8 L2881.2 365.8 L2886.5 352.5 Z"></path>
-					<g data-name="ReportItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="156.5" y="253.0" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M156.5 284.0 L623.5 284.0" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M156.5 360.0 L623.5 360.0" fill="none" data-name="ReportItemFormView"></path>
-						</g>
-						<g transform="translate(156.5, 253)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
-								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(156.5, 284)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(156.5, 360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="1678.5" y="461.0" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M1678.5 492.0 L2665.5 492.0" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M1678.5 928.0 L2665.5 928.0" fill="none" data-name="ReportItemFormViewModel"></path>
-						</g>
-						<g transform="translate(1678.5, 461)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
-								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1678.5, 492)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1678.5, 928)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="242.0" y="732.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
-						</g>
-						<g transform="translate(242, 732)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="552.5" y="0.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M552.5 31.0 L1000.5 31.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M552.5 137.0 L1000.5 137.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-						</g>
-						<g transform="translate(552.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(552.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(552.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="663.5" y="321.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
-						</g>
-						<g transform="translate(663.5, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="1005.3" y="321.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(1005.25, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="1040.5" y="0.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M1040.5 31.0 L1491.5 31.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M1040.5 137.0 L1491.5 137.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-						</g>
-						<g transform="translate(1040.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1040.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1040.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="1219.8" y="321.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
-						</g>
-						<g transform="translate(1219.75, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="0.0" y="1074.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M0.0 1105.0 L383.0 1105.0" fill="none" data-name="ReportSectionType"></path>
-						</g>
-						<g transform="translate(0, 1074)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 1105)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="141.0" y="732.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(141, 732)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="1497.0" y="290.5" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M1497.0 321.5 L1701.0 321.5" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M1497.0 352.5 L1701.0 352.5" fill="none" data-name="DataReferenceIdentifier"></path>
-						</g>
-						<g transform="translate(1497, 290.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1497, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1497, 352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="1531.5" y="91.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(1531.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="2705.5" y="678.5" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M2705.5 709.5 L3414.5 709.5" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M2705.5 770.5 L3414.5 770.5" fill="none" data-name="DataReferenceEditor"></path>
-						</g>
-						<g transform="translate(2705.5, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2705.5, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2705.5, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="2095.5" y="1112.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(2095.5, 1112)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="2958.5" y="1112.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
-						</g>
-						<g transform="translate(2958.5, 1112)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="1741.0" y="275.5" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M1741.0 306.5 L2220.0 306.5" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M1741.0 367.5 L2220.0 367.5" fill="none" data-name="AverageSectionFormView"></path>
-						</g>
-						<g transform="translate(1741, 275.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1741, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1741, 367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="2164.0" y="91.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(2164, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="2260.0" y="275.5" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M2260.0 306.5 L2739.0 306.5" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M2260.0 367.5 L2739.0 367.5" fill="none" data-name="LinearRegressionSectionFormView"></path>
-						</g>
-						<g transform="translate(2260, 275.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2260, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2260, 367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="3361.5" y="268.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M3361.5 299.0 L3675.5 299.0" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M3361.5 360.0 L3675.5 360.0" fill="none" data-name="ReportItemFormData"></path>
-						</g>
-						<g transform="translate(3361.5, 268)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3361.5, 299)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3361.5, 360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="3454.5" y="732.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(3454.5, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="3469.5" y="91.0" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(3469.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="2541.0" y="1112.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(2541, 1112)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="2779.0" y="321.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(2779, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/reports/uml.svg b/docs/uml/designer_v2/lib/features/design/reports/uml.svg
deleted file mode 100644
index c1d5b37ce..000000000
--- a/docs/uml/designer_v2/lib/features/design/reports/uml.svg
+++ /dev/null
@@ -1,1170 +0,0 @@
-<svg version="1.1" baseProfile="full" width="6781.0" height="1414.0" viewbox="0 0 6781 1414" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[ReportBadge
-	  |
-	  +status: ReportStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
-	  |
-	  +Widget build()
-	]
-	
-	[ReportBadge]o-[ReportStatus]
-	[ReportBadge]o-[BadgeType]
-	
-	[ReportsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +reportItemDelegate: ReportFormItemDelegate;
-	  +reportItemArray: FormArray&lt;dynamic&gt;;
-	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +form: FormGroup;
-	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestConsent: bool
-	  |
-	  +void setControlsFrom();
-	  +ReportsFormData buildFormData();
-	  +void read();
-	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
-	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
-	  +dynamic testReport();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide()
-	]
-	
-	[ReportsFormViewModel]o-[Study]
-	[ReportsFormViewModel]o-[GoRouter]
-	[ReportsFormViewModel]o-[ReportFormItemDelegate]
-	[ReportsFormViewModel]o-[FormArray]
-	[ReportsFormViewModel]o-[FormViewModelCollection]
-	[ReportsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
-	
-	[ReportFormItemDelegate
-	  |
-	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +owner: ReportsFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
-	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
-	]
-	
-	[ReportFormItemDelegate]o-[FormViewModelCollection]
-	[ReportFormItemDelegate]o-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
-	
-	[StudyDesignReportsFormView
-	  |
-	  +Widget build();
-	  -dynamic _showReportItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
-	
-	[ReportsFormData
-	  |
-	  +reportItems: List&lt;ReportItemFormData&gt;;
-	  +id: String
-	  |
-	  +Study apply();
-	  +ReportsFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
-	
-	[ReportStatus
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
-	  &lt;static&gt;+primary: ReportStatus;
-	  &lt;static&gt;+secondary: ReportStatus
-	]
-	
-	[ReportStatus]o-[ReportStatus]
-	[Enum]&lt;:--[ReportStatus]
-	
-	[ReportItemFormViewModel
-	  |
-	  &lt;static&gt;+defaultSectionType: ReportSectionType;
-	  +sectionIdControl: FormControl&lt;String&gt;;
-	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +sectionControl: FormControl&lt;ReportSection&gt;;
-	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
-	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
-	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
-	  +alphaControl: FormControl&lt;double&gt;;
-	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +form: FormGroup;
-	  +sectionId: String;
-	  +sectionType: ReportSectionType;
-	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
-	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
-	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +dataReferenceRequired: dynamic;
-	  +aggregationRequired: dynamic;
-	  +improvementDirectionRequired: dynamic;
-	  +alphaConfidenceRequired: dynamic
-	  |
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +ReportItemFormData buildFormData();
-	  +ReportItemFormViewModel createDuplicate();
-	  +dynamic onSectionTypeChanged();
-	  -void _updateFormControls();
-	  +void setControlsFrom()
-	]
-	
-	[ReportItemFormViewModel]o-[ReportSectionType]
-	[ReportItemFormViewModel]o-[FormControl]
-	[ReportItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
-	
-	[ReportItemFormData
-	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
-	  +id: String
-	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
-	]
-	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
-	
-	[ReportItemFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
-	  |
-	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
-	]
-	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
-	
-	[TemporalAggregationFormatted
-	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
-	]
-	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
-	
-	[ImprovementDirectionFormatted
-	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
-	]
-	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
-	
-	[ReportSectionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
-	]
-	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
-	
-	[DataReferenceIdentifier
-	  |
-	  +hashCode: int
-	  |
-	  +bool ==()
-	]
-	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
-	
-	[LinearRegressionSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
-	
-	[DataReferenceEditor
-	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
-	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
-	]
-	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
-	
-	[AverageSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="1414.0" width="6781.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M92.8 835.1 L78.5 1054 L424.5 1142.1550855991943 L424.5 1142.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M98.7 826.2 L92.8 835.1 L88.1 825.5 L94.0 816.5 Z"></path>
-					</g>
-					<path d="M159.6 831.6 L321 1054 L125.76284584980237 1165 L125.8 1165.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M158.4 820.9 L159.6 831.6 L149.8 827.2 L148.6 816.5 Z"></path>
-					</g>
-					<path d="M576.5 934.1 L444.5 1054 L249.26284584980237 1165 L249.3 1165.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M587.0 931.7 L576.5 934.1 L579.8 923.8 L590.3 921.5 Z"></path>
-					</g>
-					<path d="M645.5 936.6 L561 1054 L365.7628458498024 1165 L365.8 1165.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M655.3 932.2 L645.5 936.6 L646.6 926.0 L656.4 921.5 Z"></path>
-					</g>
-					<path d="M756.2 940.0 L741 1054 L1335.5 1128.0199311023623 L1335.5 1128.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M762.7 931.5 L756.2 940.0 L752.1 930.0 L758.6 921.5 Z"></path>
-					</g>
-					<path d="M918.9 936.6 L1004 1054 L1004 1165 L1004.0 1165.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M917.7 925.9 L918.9 936.6 L909.1 932.2 L907.9 921.5 Z"></path>
-					</g>
-					<path d="M971.7 934.6 L1093 1054 L1093 1180.5 L1093 1180.5 L1093 1307 L1093 1307 L1207.0845070422536 1327 L1207.1 1327.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M968.8 924.2 L971.7 934.6 L961.4 931.8 L958.4 921.5 Z"></path>
-					</g>
-					<path d="M1141.9 929.9 L1386.75 1054 L3061.75 1176.6555716353112 L3061.8 1176.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1135.9 921.0 L1141.9 929.9 L1131.1 930.5 L1125.2 921.5 Z"></path>
-					</g>
-					<path d="M741.8 365.8 L741.75 441 L759.0420065252855 573.5 L759.0 573.5 " fill="none"></path>
-					<path d="M747.1 365.8 L741.8 365.8 L736.4 365.8 L741.8 352.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1435.0 353.3 L781.75 441 L781.75 573.5 L781.8 573.5 " fill="none"></path>
-					</g>
-					<path d="M1435.7 358.6 L1435.0 353.3 L1434.3 348.0 L1448.3 351.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1983.9 362.0 L1906 441 L1211.75 630.2707360462531 L1211.8 630.3 " fill="none"></path>
-					</g>
-					<path d="M1987.7 365.7 L1983.9 362.0 L1980.1 358.3 L1993.2 352.5 Z"></path>
-					<path d="M1757.0 1305.7 L1757 1307 L1405 1334.076923076923 L1405.0 1334.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1762.3 1296.3 L1757.0 1305.7 L1751.7 1296.3 L1757.0 1287.0 Z"></path>
-					</g>
-					<path d="M1461.5 1067.3 L1426.75 1054 L1147.9163947797715 921.5 L1147.9 921.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1468.3 1075.6 L1461.5 1067.3 L1472.2 1065.7 L1479.0 1074.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1615.5 356.8 L1866 441 L1866 747.5 L1866 747.5 L1866 1054 L1866 1054 L1848.7667984189723 1074 L1848.8 1074.0 " fill="none"></path>
-					</g>
-					<path d="M1617.2 351.7 L1615.5 356.8 L1613.8 361.8 L1602.8 352.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1638.3 776.3 L1638.25 1054 L1657.0247035573123 1074 L1657.0 1074.0 " fill="none"></path>
-					</g>
-					<path d="M1643.6 776.3 L1638.3 776.3 L1632.9 776.3 L1638.3 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M2093.1 355.3 L2489 441 L2489 747.5 L2489 747.5 L2489 1054 L2489 1054 L2178.5 1107.65881147541 L2178.5 1107.7 " fill="none"></path>
-					</g>
-					<path d="M2094.3 350.1 L2093.1 355.3 L2092.0 360.5 L2080.1 352.5 Z"></path>
-					<path d="M2341.5 135.3 L2341.5 233 L2341.5 298.5 L2341.5 298.5 " fill="none"></path>
-					<path d="M2346.8 135.3 L2341.5 135.3 L2336.2 135.3 L2341.5 122.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M2747.0 135.3 L2747 233 L2747 275.5 L2747.0 275.5 " fill="none"></path>
-					</g>
-					<path d="M2752.3 135.3 L2747.0 135.3 L2741.7 135.3 L2747.0 122.0 Z"></path>
-					<path d="M743.8 1147.5 L848.5 1127 L879.25 1127 L879.25 1127 L910 1180.5 L910 1180.5 L879.25 1234 L879.25 1234 L848.5 1234 L848.5 1234 L725.5 1209.9396709323582 L725.5 1209.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M733.6 1144.0 L743.8 1147.5 L735.7 1154.5 L725.5 1151.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1785.5 776.1 L1734.5 1054 L725.5 1164.0806382061232 L725.5 1164.1 " fill="none"></path>
-					</g>
-					<path d="M1790.7 777.1 L1785.5 776.1 L1780.3 775.2 L1787.9 763.0 Z"></path>
-					<path d="M3179.5 915.1 L2755.75 1054 L3206.75 1142.7961089494163 L3206.8 1142.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3190.0 917.2 L3179.5 915.1 L3186.7 907.1 L3197.3 909.3 Z"></path>
-					</g>
-					<path d="M3802.8 1051.5 L3803.75 1054 L4094.1926877470355 1165 L4094.2 1165.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3804.6 1040.9 L3802.8 1051.5 L3794.6 1044.6 L3796.4 1034.0 Z"></path>
-					</g>
-					<path d="M4200.6 1028.1 L4247.75 1054 L3166.75 1174.6409351565947 L3166.8 1174.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4195.0 1018.9 L4200.6 1028.1 L4189.9 1028.2 L4184.3 1019.1 Z"></path>
-					</g>
-					<path d="M3063.5 365.8 L3063.5 441 L3197.25 506.3557194101236 L3197.3 506.4 " fill="none"></path>
-					<path d="M3068.8 365.8 L3063.5 365.8 L3058.2 365.8 L3063.5 352.5 Z"></path>
-					<path d="M6568.0 424.7 L6568 441 L6568 732 L6568.0 732.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6573.3 415.3 L6568.0 424.7 L6562.7 415.3 L6568.0 406.0 Z"></path>
-					</g>
-					<path d="M6568.0 135.3 L6568 233 L6568 268 L6568.0 268.0 " fill="none"></path>
-					<path d="M6573.3 135.3 L6568.0 135.3 L6562.7 135.3 L6568.0 122.0 Z"></path>
-					<path d="M3737.6 380.5 L3387 441 L3406.820554649266 461 L3406.8 461.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3747.7 384.1 L3737.6 380.5 L3745.9 373.6 L3756.0 377.3 Z"></path>
-					</g>
-					<path d="M4241.4 379.2 L4611 441 L5076.457585644372 732 L5076.5 732.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4233.1 372.4 L4241.4 379.2 L4231.3 382.9 L4223.0 376.1 Z"></path>
-					</g>
-					<path d="M3550.9 169.1 L3304 233 L3304 321.5 L3304.0 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3561.3 171.9 L3550.9 169.1 L3558.6 161.6 L3569.0 164.4 Z"></path>
-					</g>
-					<path d="M4035.6 129.8 L5112.75 233 L5195.931490384615 321.5 L5195.9 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4026.8 123.6 L4035.6 129.8 L4025.8 134.2 L4017.0 128.0 Z"></path>
-					</g>
-					<path d="M5660.7 231.4 L5660.5 233 L5877.920673076923 321.5 L5877.9 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5667.5 223.1 L5660.7 231.4 L5656.9 221.4 L5663.7 213.0 Z"></path>
-					</g>
-					<path d="M5700.3 231.4 L5700.5 233 L5254 327.7673469387755 L5254.0 327.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5704.1 221.4 L5700.3 231.4 L5693.5 223.1 L5697.3 213.0 Z"></path>
-					</g>
-					<path d="M3608.3 1157.4 L3885.4166666666665 1127 L3959.3333333333335 1127 L3959.3333333333335 1127 L4033.25 1180.5 L4033.25 1180.5 L3959.3333333333335 1234 L3959.3333333333335 1234 L3885.4166666666665 1234 L3885.4166666666665 1234 L3589.75 1201.5302771125555 L3589.8 1201.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3598.4 1153.1 L3608.3 1157.4 L3599.6 1163.8 L3589.8 1159.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1792.6 776.3 L1810.75 1054 L3206.75 1165.24031496063 L3206.8 1165.2 " fill="none"></path>
-					</g>
-					<path d="M1798.0 776.0 L1792.6 776.3 L1787.3 776.7 L1791.8 763.0 Z"></path>
-					<path d="M6269.0 135.3 L6269 233 L6269 290.5 L6269.0 290.5 " fill="none"></path>
-					<path d="M6274.3 135.3 L6269.0 135.3 L6263.7 135.3 L6269.0 122.0 Z"></path>
-					<path d="M4887.5 417.2 L4887.5 441 L4184.25 621.1095675788595 L4184.3 621.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4892.8 407.8 L4887.5 417.2 L4882.2 407.8 L4887.5 398.5 Z"></path>
-					</g>
-					<path d="M5274.2 130.6 L5152.75 233 L5044.354567307692 275.5 L5044.4 275.5 " fill="none"></path>
-					<path d="M5277.6 134.7 L5274.2 130.6 L5270.7 126.5 L5284.4 122.0 Z"></path>
-					<path d="M4578.8 835.2 L4578.75 1054 L4189.153162055336 1165 L4189.2 1165.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4584.1 825.8 L4578.8 835.2 L4573.4 825.8 L4578.8 816.5 Z"></path>
-					</g>
-					<path d="M4612.3 833.9 L4697.75 1054 L4697.75 1165 L4697.8 1165.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4613.9 823.3 L4612.3 833.9 L4603.9 827.1 L4605.5 816.5 Z"></path>
-					</g>
-					<path d="M5542.0 417.2 L5542 441 L4184.25 665.7942606347062 L4184.3 665.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5547.3 407.8 L5542.0 417.2 L5536.7 407.8 L5542.0 398.5 Z"></path>
-					</g>
-					<path d="M5331.4 130.6 L5453.5 233 L5489.665865384615 275.5 L5489.7 275.5 " fill="none"></path>
-					<path d="M5334.9 126.5 L5331.4 130.6 L5328.0 134.7 L5321.2 122.0 Z"></path>
-					<g data-name="ReportBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="0.0" y="678.5" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M0.0 709.5 L197.0 709.5" fill="none" data-name="ReportBadge"></path>
-							<path d="M0.0 785.5 L197.0 785.5" fill="none" data-name="ReportBadge"></path>
-						</g>
-						<g transform="translate(0, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="424.5" y="1127.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M424.5 1158.0 L725.5 1158.0" fill="none" data-name="ReportStatus"></path>
-						</g>
-						<g transform="translate(424.5, 1127)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
-								
-							</g>
-						</g>
-						<g transform="translate(424.5, 1158)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="45.5" y="1165.0" height="31.0" width="106.0" data-name="BadgeType"></rect>
-						</g>
-						<g transform="translate(45.5, 1165)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="351.8" y="573.5" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M351.8 604.5 L1211.8 604.5" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M351.8 770.5 L1211.8 770.5" fill="none" data-name="ReportsFormViewModel"></path>
-						</g>
-						<g transform="translate(351.75, 573.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
-								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(351.75, 604.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(351.75, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="191.5" y="1165.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(191.5, 1165)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="292.5" y="1165.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(292.5, 1165)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportFormItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="1335.5" y="1074.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M1335.5 1105.0 L2178.5 1105.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M1335.5 1181.0 L2178.5 1181.0" fill="none" data-name="ReportFormItemDelegate"></path>
-						</g>
-						<g transform="translate(1335.5, 1074)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
-								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1335.5, 1105)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1335.5, 1181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="955.0" y="1165.0" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(955, 1165)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="1186.0" y="1327.0" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
-						</g>
-						<g transform="translate(1186, 1327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="3061.8" y="1165.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(3061.75, 1165)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="671.3" y="321.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(671.25, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="1448.3" y="321.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-						</g>
-						<g transform="translate(1448.25, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="1912.0" y="321.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-						</g>
-						<g transform="translate(1912, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="1556.3" y="732.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(1556.25, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignReportsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="2145.0" y="298.5" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M2145.0 329.5 L2538.0 329.5" fill="none" data-name="StudyDesignReportsFormView"></path>
-						</g>
-						<g transform="translate(2145, 298.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2145, 329.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="2235.5" y="91.0" height="31.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-						</g>
-						<g transform="translate(2235.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="2578.0" y="275.5" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M2578.0 306.5 L2916.0 306.5" fill="none" data-name="ReportsFormData"></path>
-							<path d="M2578.0 352.5 L2916.0 352.5" fill="none" data-name="ReportsFormData"></path>
-						</g>
-						<g transform="translate(2578, 275.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2578, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2578, 352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="2675.5" y="91.0" height="31.0" width="143.0" data-name="IStudyFormData"></rect>
-						</g>
-						<g transform="translate(2675.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="1760.3" y="732.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(1760.25, 732)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="3197.3" y="461.0" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M3197.3 492.0 L4184.3 492.0" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M3197.3 928.0 L4184.3 928.0" fill="none" data-name="ReportItemFormViewModel"></path>
-						</g>
-						<g transform="translate(3197.25, 461)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
-								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3197.25, 492)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3197.25, 928)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="3206.8" y="1127.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M3206.8 1158.0 L3589.8 1158.0" fill="none" data-name="ReportSectionType"></path>
-						</g>
-						<g transform="translate(3206.75, 1127)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3206.75, 1158)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="4078.3" y="1165.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(4078.25, 1165)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="2956.0" y="321.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(2956, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="6411.0" y="268.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M6411.0 299.0 L6725.0 299.0" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M6411.0 360.0 L6725.0 360.0" fill="none" data-name="ReportItemFormData"></path>
-						</g>
-						<g transform="translate(6411, 268)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6411, 299)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6411, 360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="6504.0" y="732.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(6504, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="6519.0" y="91.0" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(6519, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="3756.0" y="253.0" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M3756.0 284.0 L4223.0 284.0" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M3756.0 360.0 L4223.0 360.0" fill="none" data-name="ReportItemFormView"></path>
-						</g>
-						<g transform="translate(3756, 253)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
-								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3756, 284)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3756, 360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="4973.3" y="732.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
-						</g>
-						<g transform="translate(4973.25, 732)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="3569.0" y="0.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M3569.0 31.0 L4017.0 31.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M3569.0 137.0 L4017.0 137.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-						</g>
-						<g transform="translate(3569, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3569, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3569, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="3211.0" y="321.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
-						</g>
-						<g transform="translate(3211, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="5167.0" y="321.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(5167, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="5455.0" y="0.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M5455.0 31.0 L5906.0 31.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M5455.0 137.0 L5906.0 137.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-						</g>
-						<g transform="translate(5455, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5455, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5455, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="5821.5" y="321.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
-						</g>
-						<g transform="translate(5821.5, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="6167.0" y="290.5" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M6167.0 321.5 L6371.0 321.5" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M6167.0 352.5 L6371.0 352.5" fill="none" data-name="DataReferenceIdentifier"></path>
-						</g>
-						<g transform="translate(6167, 290.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6167, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6167, 352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="6201.5" y="91.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(6201.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="4648.0" y="275.5" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M4648.0 306.5 L5127.0 306.5" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M4648.0 367.5 L5127.0 367.5" fill="none" data-name="LinearRegressionSectionFormView"></path>
-						</g>
-						<g transform="translate(4648, 275.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4648, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4648, 367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="5226.8" y="91.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(5226.75, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="4224.3" y="678.5" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M4224.3 709.5 L4933.3 709.5" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M4224.3 770.5 L4933.3 770.5" fill="none" data-name="DataReferenceEditor"></path>
-						</g>
-						<g transform="translate(4224.25, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4224.25, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4224.25, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="4596.3" y="1165.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
-						</g>
-						<g transform="translate(4596.25, 1165)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="5302.5" y="275.5" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M5302.5 306.5 L5781.5 306.5" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M5302.5 367.5 L5781.5 367.5" fill="none" data-name="AverageSectionFormView"></path>
-						</g>
-						<g transform="translate(5302.5, 275.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5302.5, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5302.5, 367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/types/uml.svg b/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/types/uml.svg
deleted file mode 100644
index 52be35c24..000000000
--- a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/types/uml.svg
+++ /dev/null
@@ -1,272 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2037.0" height="367.0" viewbox="0 0 2037 367" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[SurveyQuestionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
-	]
-	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	]
-	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
-	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
-	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
-	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
-	]
-	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="367.0" width="2037.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M380.8 106.5 L393 102.5 L400.5 102.5 L400.5 102.5 L408 171 L408 171 L400.5 239.5 L400.5 239.5 L393 239.5 L393 239.5 L363 229.7836879432624 L363.0 229.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M370.2 104.3 L380.8 106.5 L373.5 114.4 L363.0 112.2 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M181.5 59.8 L181.5 82 L181.5 102.5 L181.5 102.5 " fill="none"></path>
-					</g>
-					<path d="M186.8 59.8 L181.5 59.8 L176.2 59.8 L181.5 46.5 Z"></path>
-					<path d="M629.0 220.7 L629 260 L1111 289.1003401360544 L1111.0 289.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M634.3 211.3 L629.0 220.7 L623.7 211.3 L629.0 202.0 Z"></path>
-					</g>
-					<path d="M1021.0 236.2 L1021 260 L1131.4225352112676 280 L1131.4 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1026.3 226.8 L1021.0 236.2 L1015.7 226.8 L1021.0 217.5 Z"></path>
-					</g>
-					<path d="M1323.8 42.6 L1021 82 L1021 124.5 L1021.0 124.5 " fill="none"></path>
-					<path d="M1324.5 47.9 L1323.8 42.6 L1323.1 37.3 L1337.0 40.9 Z"></path>
-					<path d="M1413.0 236.2 L1413 260 L1302.5774647887324 280 L1302.6 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1418.3 226.8 L1413.0 236.2 L1407.7 226.8 L1413.0 217.5 Z"></path>
-					</g>
-					<path d="M1413.0 59.8 L1413 82 L1413 124.5 L1413.0 124.5 " fill="none"></path>
-					<path d="M1418.3 59.8 L1413.0 59.8 L1407.7 59.8 L1413.0 46.5 Z"></path>
-					<path d="M1805.0 258.7 L1805 260 L1323 289.1003401360544 L1323.0 289.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1810.3 249.3 L1805.0 258.7 L1799.7 249.3 L1805.0 240.0 Z"></path>
-					</g>
-					<path d="M1502.2 42.6 L1805 82 L1805 102 L1805.0 102.0 " fill="none"></path>
-					<path d="M1502.9 37.3 L1502.2 42.6 L1501.5 47.9 L1489.0 40.9 Z"></path>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="0.0" y="102.5" height="137.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M0.0 133.5 L363.0 133.5" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(0, 102.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 133.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="151.0" y="15.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(151, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="424.0" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M424.0 31.0 L733.0 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(424, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(424, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="453.0" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M453.0 171.0 L805.0 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
-						</g>
-						<g transform="translate(453, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(453, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="1111.0" y="280.0" height="31.0" width="212.0" data-name="QuestionFormViewModel"></rect>
-						</g>
-						<g transform="translate(1111, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="845.0" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M845.0 155.5 L1197.0 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M845.0 186.5 L1197.0 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-						</g>
-						<g transform="translate(845, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(845, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(845, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="1337.0" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(1337, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="1237.0" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M1237.0 155.5 L1589.0 155.5" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M1237.0 186.5 L1589.0 186.5" fill="none" data-name="BoolQuestionFormView"></path>
-						</g>
-						<g transform="translate(1237, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1237, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1237, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="1629.0" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M1629.0 133.0 L1981.0 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M1629.0 179.0 L1981.0 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-						</g>
-						<g transform="translate(1629, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1629, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1629, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/shared/schedule/uml.svg b/docs/uml/designer_v2/lib/features/design/shared/schedule/uml.svg
deleted file mode 100644
index 1808e476c..000000000
--- a/docs/uml/designer_v2/lib/features/design/shared/schedule/uml.svg
+++ /dev/null
@@ -1,236 +0,0 @@
-<svg version="1.1" baseProfile="full" width="857.5" height="709.0" viewbox="0 0 857.5 709" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[ScheduleControls
-	  |
-	  +formViewModel: WithScheduleControls
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
-	]
-	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
-	
-	[&lt;abstract&gt;WithScheduleControls
-	  |
-	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
-	  +instanceID: FormControl&lt;String&gt;;
-	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +hasReminderControl: FormControl&lt;bool&gt;;
-	  +reminderTimeControl: FormControl&lt;Time&gt;;
-	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
-	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
-	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  +hasReminder: bool;
-	  +isTimeRestricted: bool;
-	  +timeRestriction: List&lt;Time&gt;?
-	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
-	]
-	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule
-	  |
-	  +instanceId: String;
-	  +isTimeLocked: bool;
-	  +timeLockStart: StudyUTimeOfDay?;
-	  +timeLockEnd: StudyUTimeOfDay?;
-	  +hasReminder: bool;
-	  +reminderTime: StudyUTimeOfDay?
-	  |
-	  +Schedule toSchedule()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="709.0" width="857.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M247.5 227.7 L247.5 259 L247.5 279 L247.5 279.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M252.8 218.3 L247.5 227.7 L242.2 218.3 L247.5 209.0 Z"></path>
-					</g>
-					<path d="M247.5 44.3 L247.5 51 L247.5 101 L247.5 101.0 " fill="none"></path>
-					<path d="M252.8 44.3 L247.5 44.3 L242.2 44.3 L247.5 31.0 Z"></path>
-					<path d="M158.6 598.5 L156.75 602 L156.75 622 L156.8 622.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M167.7 592.7 L158.6 598.5 L158.3 587.8 L167.3 582.0 Z"></path>
-					</g>
-					<path d="M336.4 598.5 L338.25 602 L338.25 622 L338.3 622.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M336.7 587.8 L336.4 598.5 L327.3 592.7 L327.7 582.0 Z"></path>
-					</g>
-					<path d="M652.5 257.7 L652.5 259 L652.5 415 L652.5 415.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M657.8 248.3 L652.5 257.7 L647.2 248.3 L652.5 239.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M652.5 44.3 L652.5 51 L652.5 71 L652.5 71.0 " fill="none"></path>
-					</g>
-					<path d="M657.8 44.3 L652.5 44.3 L647.2 44.3 L652.5 31.0 Z"></path>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="31.5" y="101.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M31.5 132.0 L463.5 132.0" fill="none" data-name="ScheduleControls"></path>
-							<path d="M31.5 163.0 L463.5 163.0" fill="none" data-name="ScheduleControls"></path>
-						</g>
-						<g transform="translate(31.5, 101)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31.5, 132)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31.5, 163)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="0.0" y="279.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M0.0 310.0 L495.0 310.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M0.0 536.0 L495.0 536.0" fill="none" data-name="WithScheduleControls"></path>
-						</g>
-						<g transform="translate(0, 279)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 310)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 536)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="151.5" y="0.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
-						</g>
-						<g transform="translate(151.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="100.3" y="622.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(100.25, 622)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="253.3" y="622.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
-						</g>
-						<g transform="translate(253.25, 622)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="503.5" y="71.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M503.5 102.0 L801.5 102.0" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M503.5 208.0 L801.5 208.0" fill="none" data-name="IFormDataWithSchedule"></path>
-						</g>
-						<g transform="translate(503.5, 71)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
-								
-							</g>
-						</g>
-						<g transform="translate(503.5, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(503.5, 208)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="572.5" y="415.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
-						</g>
-						<g transform="translate(572.5, 415)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="603.5" y="0.0" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(603.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/forms/uml.svg b/docs/uml/designer_v2/lib/features/forms/uml.svg
deleted file mode 100644
index 7f58f6adb..000000000
--- a/docs/uml/designer_v2/lib/features/forms/uml.svg
+++ /dev/null
@@ -1,937 +0,0 @@
-<svg version="1.1" baseProfile="full" width="5433.8" height="1284.0" viewbox="0 0 5433.75 1284" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;ManagedFormViewModel
-	  |
-	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
-	]
-	
-	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
-	
-	[FormViewModelNotFoundException
-	]
-	
-	[Exception]&lt;:--[FormViewModelNotFoundException]
-	
-	[FormViewModelCollection
-	  |
-	  +formViewModels: List&lt;T&gt;;
-	  +formArray: FormArray&lt;dynamic&gt;;
-	  +stagedViewModels: List&lt;T&gt;;
-	  +retrievableViewModels: List&lt;T&gt;;
-	  +formData: List&lt;D&gt;
-	  |
-	  +void add();
-	  +T remove();
-	  +T? findWhere();
-	  +T? removeWhere();
-	  +bool contains();
-	  +void stage();
-	  +T commit();
-	  +void reset();
-	  +void read()
-	]
-	
-	[FormViewModelCollection]o-[FormArray]
-	
-	[CustomFormControl
-	  |
-	  -_onValueChangedDebouncer: Debouncer?;
-	  -_onStatusChangedDebouncer: Debouncer?;
-	  +onValueChanged: void Function(T?)?;
-	  +onStatusChanged: void Function(ControlStatus)?;
-	  +onStatusChangedDebounceTime: int?;
-	  +onValueChangedDebounceTime: int?
-	  |
-	  +void dispose()
-	]
-	
-	[CustomFormControl]o-[Debouncer]
-	[CustomFormControl]o-[void Function(T?)?]
-	[CustomFormControl]o-[void Function(ControlStatus)?]
-	[FormControl]&lt;:-[CustomFormControl]
-	
-	[FormArrayTable
-	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +items: List&lt;T&gt;;
-	  +onSelectItem: void Function(T);
-	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
-	  +onNewItem: void Function()?;
-	  +rowTitle: String Function(T);
-	  +onNewItemLabel: String;
-	  +sectionTitle: String?;
-	  +sectionDescription: String?;
-	  +emptyIcon: IconData?;
-	  +emptyTitle: String?;
-	  +emptyDescription: String?;
-	  +sectionTitleDivider: bool?;
-	  +rowPrefix: Widget Function(BuildContext, T, int)?;
-	  +rowSuffix: Widget Function(BuildContext, T, int)?;
-	  +leadingWidget: Widget?;
-	  +itemsSectionPadding: EdgeInsets?;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
-	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow();
-	  -Widget _newItemButton()
-	]
-	
-	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
-	[FormArrayTable]o-[void Function(T)]
-	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
-	[FormArrayTable]o-[void Function()?]
-	[FormArrayTable]o-[String Function(T)]
-	[FormArrayTable]o-[IconData]
-	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
-	[FormArrayTable]o-[&lt;abstract&gt;Widget]
-	[FormArrayTable]o-[EdgeInsets]
-	
-	[FormInvalidException
-	]
-	
-	[Exception]&lt;:--[FormInvalidException]
-	
-	[FormConfigException
-	  |
-	  +message: String?
-	]
-	
-	[Exception]&lt;:--[FormConfigException]
-	
-	[&lt;abstract&gt;IFormViewModelDelegate
-	  |
-	  +dynamic onSave();
-	  +void onCancel()
-	]
-	
-	[&lt;abstract&gt;IFormGroupController
-	  |
-	  +form: FormGroup
-	]
-	
-	[&lt;abstract&gt;IFormGroupController]o-[FormGroup]
-	
-	[FormControlOption
-	  |
-	  +value: T;
-	  +label: String;
-	  +description: String?;
-	  +props: List&lt;Object?&gt;
-	]
-	
-	[&lt;abstract&gt;Equatable]&lt;:-[FormControlOption]
-	
-	[&lt;abstract&gt;FormViewModel
-	  |
-	  -_formData: T?;
-	  -_formMode: FormMode;
-	  -_validationSet: FormValidationSetEnum?;
-	  +delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?;
-	  +autosave: bool;
-	  -_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;;
-	  -_immediateFormChildrenListenerDebouncer: Debouncer?;
-	  -_autosaveOperation: CancelableOperation&lt;dynamic&gt;?;
-	  -_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  +prevFormValue: Map&lt;String, dynamic&gt;?;
-	  &lt;static&gt;-_formKey: String;
-	  +formData: T?;
-	  +formMode: FormMode;
-	  +isReadonly: bool;
-	  +validationSet: FormValidationSetEnum?;
-	  +isDirty: bool;
-	  +title: String;
-	  +isValid: bool;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;
-	  |
-	  -dynamic _setFormData();
-	  -dynamic _rememberDefaultControlValidators();
-	  -Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators();
-	  -dynamic _disableAllControls();
-	  -dynamic _formModeUpdated();
-	  -dynamic _restoreControlsFromFormData();
-	  +void revalidate();
-	  -void _applyValidationSet();
-	  +void read();
-	  +dynamic save();
-	  +dynamic cancel();
-	  +void enableAutosave();
-	  +void listenToImmediateFormChildren();
-	  +dynamic markFormGroupChanged();
-	  +void dispose();
-	  +void setControlsFrom();
-	  +T buildFormData();
-	  +void initControls()
-	]
-	
-	[&lt;abstract&gt;FormViewModel]o-[FormMode]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;FormValidationSetEnum]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;IFormViewModelDelegate]
-	[&lt;abstract&gt;FormViewModel]o-[Debouncer]
-	[&lt;abstract&gt;FormViewModel]o-[CancelableOperation]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[&lt;abstract&gt;FormViewModel]
-	
-	[FormMode
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;FormMode&gt;;
-	  &lt;static&gt;+create: FormMode;
-	  &lt;static&gt;+readonly: FormMode;
-	  &lt;static&gt;+edit: FormMode
-	]
-	
-	[FormMode]o-[FormMode]
-	[Enum]&lt;:--[FormMode]
-	
-	[UnsavedChangesDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;FormValidationSetEnum
-	]
-	
-	[FormControlValidation
-	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
-	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
-	  +validationMessages: Map&lt;String, String Function(Object)&gt;
-	  |
-	  +FormControlValidation merge()
-	]
-	
-	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
-	
-	[&lt;abstract&gt;IFormData
-	  |
-	  +id: String
-	  |
-	  +IFormData copy()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="1284.0" width="5433.8" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M3073.3 860.8 L2164.5 1086 L913.5 1155.9316770186335 L913.5 1155.9 " fill="none"></path>
-					<path d="M3074.6 865.9 L3073.3 860.8 L3072.0 855.6 L3086.3 857.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M4371.2 220.7 L4146.25 413 L4146.25 734 L4146.3 734.0 " fill="none"></path>
-					</g>
-					<path d="M4374.7 224.7 L4371.2 220.7 L4367.8 216.6 L4381.4 212.0 Z"></path>
-					<path d="M502.0 351.7 L502 413 L502 734 L502.0 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M507.3 342.3 L502.0 351.7 L496.7 342.3 L502.0 333.0 Z"></path>
-					</g>
-					<path d="M188.2 851.9 L146.5 1086 L2104.5 1164.9241104752425 L2104.5 1164.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M195.1 843.6 L188.2 851.9 L184.6 841.8 L191.5 833.5 Z"></path>
-					</g>
-					<path d="M328.6 845.0 L636.75 1086 L186.5 1154.520901831846 L186.5 1154.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M324.5 835.0 L328.6 845.0 L318.0 843.5 L313.9 833.5 Z"></path>
-					</g>
-					<path d="M431.3 796.9 L1801 1086 L477.5 1159.9844720496894 L477.5 1160.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M423.2 789.8 L431.3 796.9 L421.0 800.2 L413.0 793.1 Z"></path>
-					</g>
-					<path d="M206.5 225.3 L206.5 413 L206.5 665.5 L206.5 665.5 " fill="none"></path>
-					<path d="M211.8 225.3 L206.5 225.3 L201.2 225.3 L206.5 212.0 Z"></path>
-					<path d="M2016.4 248.8 L1188.75 413 L975.3064635958395 734 L975.3 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2026.6 252.2 L2016.4 248.8 L2024.6 241.7 L2034.8 245.1 Z"></path>
-					</g>
-					<path d="M2016.5 254.6 L1299.25 413 L1299.25 734 L1299.3 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2026.8 257.8 L2016.5 254.6 L2024.5 247.4 L2034.8 250.6 Z"></path>
-					</g>
-					<path d="M2017.0 279.8 L1596.75 413 L1596.75 734 L1596.8 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2027.5 282.1 L2017.0 279.8 L2024.2 271.9 L2034.8 274.2 Z"></path>
-					</g>
-					<path d="M2018.5 343.2 L1894.25 413 L1894.25 734 L1894.3 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2029.2 343.3 L2018.5 343.2 L2024.0 334.0 L2034.8 334.1 Z"></path>
-					</g>
-					<path d="M2090.3 406.9 L2084.75 413 L2084.75 734 L2084.8 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2100.5 403.5 L2090.3 406.9 L2092.6 396.4 L2102.8 393.0 Z"></path>
-					</g>
-					<path d="M2247.0 411.5 L2246.75 413 L2246.75 734 L2246.8 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2253.7 403.0 L2247.0 411.5 L2243.1 401.4 L2249.8 393.0 Z"></path>
-					</g>
-					<path d="M2481.5 406.5 L2487.75 413 L2487.75 734 L2487.8 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2478.8 396.0 L2481.5 406.5 L2471.2 403.4 L2468.5 393.0 Z"></path>
-					</g>
-					<path d="M2541.5 325.0 L2720.75 413 L2720.75 734 L2720.8 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2535.5 316.1 L2541.5 325.0 L2530.8 325.7 L2524.8 316.8 Z"></path>
-					</g>
-					<path d="M2542.2 296.4 L2848.75 413 L2848.75 734 L2848.8 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2535.4 288.1 L2542.2 296.4 L2531.6 298.0 L2524.8 289.7 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M4403.2 225.2 L4427.25 413 L4427.25 734 L4427.3 734.0 " fill="none"></path>
-					</g>
-					<path d="M4408.5 224.5 L4403.2 225.2 L4397.9 225.9 L4401.5 212.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M4427.8 220.7 L4652.75 413 L4652.75 718.5 L4652.8 718.5 " fill="none"></path>
-					</g>
-					<path d="M4431.2 216.6 L4427.8 220.7 L4424.3 224.7 L4417.6 212.0 Z"></path>
-					<path d="M3299.1 236.8 L2993.75 413 L2993.75 734 L2993.8 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3309.9 236.8 L3299.1 236.8 L3304.5 227.5 L3315.3 227.5 Z"></path>
-					</g>
-					<path d="M4957.5 225.3 L4957.5 413 L4957.5 696 L4957.5 696.0 " fill="none"></path>
-					<path d="M4962.8 225.3 L4957.5 225.3 L4952.2 225.3 L4957.5 212.0 Z"></path>
-					<path d="M3068.6 902.6 L2525.25 1086 L4318 1161.0938590820945 L4318.0 1161.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3079.1 904.7 L3068.6 902.6 L3075.7 894.6 L3086.3 896.7 Z"></path>
-					</g>
-					<path d="M3068.6 909.0 L2565.25 1086 L3441.5 1158.5172413793102 L3441.5 1158.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3079.2 910.9 L3068.6 909.0 L3075.7 900.9 L3086.3 902.8 Z"></path>
-					</g>
-					<path d="M3809.6 1080.1 L3814.75 1086 L3804.3873456790125 1128.5 L3804.4 1128.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3807.5 1069.5 L3809.6 1080.1 L3799.5 1076.5 L3797.4 1066.0 Z"></path>
-					</g>
-					<path d="M3848.1 1079.3 L3854.75 1086 L2207.5 1164.544370860927 L2207.5 1164.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3845.3 1068.9 L3848.1 1079.3 L3837.8 1076.4 L3835.0 1066.0 Z"></path>
-					</g>
-					<path d="M3975.2 955.0 L4264 1086 L5194.75 1159.7498165810712 L5194.8 1159.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3969.0 946.3 L3975.2 955.0 L3964.5 956.0 L3958.3 947.3 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3398.6 238.4 L3522.25 413 L3522.25 433 L3522.3 433.0 " fill="none"></path>
-					</g>
-					<path d="M3403.0 235.3 L3398.6 238.4 L3394.3 241.5 L3390.9 227.5 Z"></path>
-					<path d="M4618.5 1147.8 L4966.5 1106 L5058.125 1106 L5058.125 1106 L5149.75 1167 L5149.75 1167 L5058.125 1228 L5058.125 1228 L4966.5 1228 L4966.5 1228 L4600 1183.9477832512316 L4600.0 1183.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4608.6 1143.6 L4618.5 1147.8 L4609.9 1154.2 L4600.0 1150.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M5123.0 778.3 L5123 1086 L4600 1149.7996987951808 L4600.0 1149.8 " fill="none"></path>
-					</g>
-					<path d="M5128.3 778.3 L5123.0 778.3 L5117.7 778.3 L5123.0 765.0 Z"></path>
-					<path d="M925.0 284.2 L925 413 L963.1575037147103 734 L963.2 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M930.3 274.8 L925.0 284.2 L919.7 274.8 L925.0 265.5 Z"></path>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="517.5" y="1136.0" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
-							<path d="M517.5 1167.0 L913.5 1167.0" fill="none" data-name="ManagedFormViewModel"></path>
-						</g>
-						<g transform="translate(517.5, 1136)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(517.5, 1167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="3086.3" y="433.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
-							<path d="M3086.3 464.0 L3958.3 464.0" fill="none" data-name="FormViewModel"></path>
-							<path d="M3086.3 780.0 L3958.3 780.0" fill="none" data-name="FormViewModel"></path>
-						</g>
-						<g transform="translate(3086.25, 433)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3086.25, 464)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3086.25, 780)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
-							<rect x="3998.3" y="734.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
-						</g>
-						<g transform="translate(3998.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Exception">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="4352.5" y="181.0" height="31.0" width="94.0" data-name="Exception"></rect>
-						</g>
-						<g transform="translate(4352.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="361.5" y="60.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
-							<path d="M361.5 91.0 L642.5 91.0" fill="none" data-name="FormViewModelCollection"></path>
-							<path d="M361.5 182.0 L642.5 182.0" fill="none" data-name="FormViewModelCollection"></path>
-						</g>
-						<g transform="translate(361.5, 60)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(361.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(361.5, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="453.0" y="734.0" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(453, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomFormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
-							<rect x="0.0" y="665.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
-							<path d="M0.0 696.5 L413.0 696.5" fill="none" data-name="CustomFormControl"></path>
-							<path d="M0.0 802.5 L413.0 802.5" fill="none" data-name="CustomFormControl"></path>
-						</g>
-						<g transform="translate(0, 665.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 696.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 802.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Debouncer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="2104.5" y="1151.5" height="31.0" width="103.0" data-name="Debouncer"></rect>
-						</g>
-						<g transform="translate(2104.5, 1151.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(T?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
-							<rect x="22.5" y="1151.5" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
-						</g>
-						<g transform="translate(22.5, 1151.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(ControlStatus)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
-							<rect x="226.5" y="1151.5" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
-						</g>
-						<g transform="translate(226.5, 1151.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="150.0" y="181.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(150, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArrayTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
-							<rect x="2034.8" y="0.0" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
-							<path d="M2034.8 31.0 L2524.8 31.0" fill="none" data-name="FormArrayTable"></path>
-							<path d="M2034.8 332.0 L2524.8 332.0" fill="none" data-name="FormArrayTable"></path>
-						</g>
-						<g transform="translate(2034.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
-								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2034.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2034.75, 332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="896.0" y="734.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(896, 734)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="1227.3" y="734.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
-						</g>
-						<g transform="translate(1227.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<rect x="1411.3" y="734.0" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
-						</g>
-						<g transform="translate(1411.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="1822.3" y="734.0" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(1822.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="String Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
-							<rect x="2006.3" y="734.0" height="31.0" width="157.0" data-name="String Function(T)"></rect>
-						</g>
-						<g transform="translate(2006.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="2203.3" y="734.0" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(2203.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
-							<rect x="2330.3" y="734.0" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
-						</g>
-						<g transform="translate(2330.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
-								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="2685.3" y="734.0" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(2685.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EdgeInsets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="2796.3" y="734.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
-						</g>
-						<g transform="translate(2796.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormInvalidException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
-							<rect x="4334.3" y="734.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
-						</g>
-						<g transform="translate(4334.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConfigException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
-							<rect x="4560.3" y="718.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
-							<path d="M4560.3 749.5 L4745.3 749.5" fill="none" data-name="FormConfigException"></path>
-						</g>
-						<g transform="translate(4560.25, 718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
-								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4560.25, 749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="3686.5" y="1128.5" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-							<path d="M3686.5 1159.5 L3903.5 1159.5" fill="none" data-name="IFormViewModelDelegate"></path>
-						</g>
-						<g transform="translate(3686.5, 1128.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3686.5, 1159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormGroupController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="3275.5" y="165.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
-							<path d="M3275.5 196.5 L3462.5 196.5" fill="none" data-name="IFormGroupController"></path>
-						</g>
-						<g transform="translate(3275.5, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
-								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3275.5, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="2941.3" y="734.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(2941.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControlOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
-							<rect x="4862.5" y="696.0" height="107.0" width="190.0" data-name="FormControlOption"></rect>
-							<path d="M4862.5 727.0 L5052.5 727.0" fill="none" data-name="FormControlOption"></path>
-						</g>
-						<g transform="translate(4862.5, 696)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4862.5, 727)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="4909.5" y="181.0" height="31.0" width="96.0" data-name="Equatable"></rect>
-						</g>
-						<g transform="translate(4909.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
-							<rect x="4318.0" y="1106.0" height="122.0" width="282.0" data-name="FormMode"></rect>
-							<path d="M4318.0 1137.0 L4600.0 1137.0" fill="none" data-name="FormMode"></path>
-						</g>
-						<g transform="translate(4318, 1106)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4318, 1137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormValidationSetEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
-							<rect x="3441.5" y="1151.5" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
-						</g>
-						<g transform="translate(3441.5, 1151.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
-								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CancelableOperation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="5194.8" y="1151.5" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
-						</g>
-						<g transform="translate(5194.75, 1151.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="5092.5" y="734.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(5092.5, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="UnsavedChangesDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
-							<rect x="4662.5" y="165.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
-							<path d="M4662.5 196.5 L4869.5 196.5" fill="none" data-name="UnsavedChangesDialog"></path>
-						</g>
-						<g transform="translate(4662.5, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4662.5, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControlValidation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
-							<rect x="682.5" y="127.5" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
-							<path d="M682.5 158.5 L1167.5 158.5" fill="none" data-name="FormControlValidation"></path>
-							<path d="M682.5 234.5 L1167.5 234.5" fill="none" data-name="FormControlValidation"></path>
-						</g>
-						<g transform="translate(682.5, 127.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
-								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(682.5, 158.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(682.5, 234.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="5045.5" y="150.0" height="93.0" width="163.0" data-name="IFormData"></rect>
-							<path d="M5045.5 181.0 L5208.5 181.0" fill="none" data-name="IFormData"></path>
-							<path d="M5045.5 212.0 L5208.5 212.0" fill="none" data-name="IFormData"></path>
-						</g>
-						<g transform="translate(5045.5, 150)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5045.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5045.5, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/monitor/uml.svg b/docs/uml/designer_v2/lib/features/monitor/uml.svg
deleted file mode 100644
index a3d10873a..000000000
--- a/docs/uml/designer_v2/lib/features/monitor/uml.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<svg version="1.1" baseProfile="full" width="232.0" height="189.0" viewbox="0 0 232 189" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudyMonitorScreen
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="189.0" width="232.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M88.0 44.3 L88 51 L88 71 L88.0 71.0 " fill="none"></path>
-					<path d="M93.3 44.3 L88.0 44.3 L82.7 44.3 L88.0 31.0 Z"></path>
-					<g data-name="StudyMonitorScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="0.0" y="71.0" height="62.0" width="176.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M0.0 102.0 L176.0 102.0" fill="none" data-name="StudyMonitorScreen"></path>
-						</g>
-						<g transform="translate(0, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="9.5" y="0.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
-						</g>
-						<g transform="translate(9.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/publish/uml.svg b/docs/uml/designer_v2/lib/features/publish/uml.svg
deleted file mode 100644
index d971c6a59..000000000
--- a/docs/uml/designer_v2/lib/features/publish/uml.svg
+++ /dev/null
@@ -1,106 +0,0 @@
-<svg version="1.1" baseProfile="full" width="687.0" height="189.0" viewbox="0 0 687 189" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[PublishConfirmationDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
-	
-	[PublishSuccessDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
-	
-	[PublishDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="189.0" width="687.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M267.8 28.7 L112 51 L112 71 L112.0 71.0 " fill="none"></path>
-					<path d="M268.6 33.9 L267.8 28.7 L267.0 23.4 L281.0 26.8 Z"></path>
-					<path d="M359.5 44.3 L359.5 51 L359.5 71 L359.5 71.0 " fill="none"></path>
-					<path d="M364.8 44.3 L359.5 44.3 L354.2 44.3 L359.5 31.0 Z"></path>
-					<path d="M451.1 31.5 L563 51 L563 71 L563.0 71.0 " fill="none"></path>
-					<path d="M452.1 26.2 L451.1 31.5 L450.2 36.7 L438.0 29.2 Z"></path>
-					<g data-name="PublishConfirmationDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
-							<rect x="0.0" y="71.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
-							<path d="M0.0 102.0 L224.0 102.0" fill="none" data-name="PublishConfirmationDialog"></path>
-						</g>
-						<g transform="translate(0, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="281.0" y="0.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
-						</g>
-						<g transform="translate(281, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PublishSuccessDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
-							<rect x="264.0" y="71.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
-							<path d="M264.0 102.0 L455.0 102.0" fill="none" data-name="PublishSuccessDialog"></path>
-						</g>
-						<g transform="translate(264, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(264, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PublishDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
-							<rect x="495.0" y="71.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
-							<path d="M495.0 102.0 L631.0 102.0" fill="none" data-name="PublishDialog"></path>
-						</g>
-						<g transform="translate(495, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(495, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/recruit/uml.svg b/docs/uml/designer_v2/lib/features/recruit/uml.svg
deleted file mode 100644
index cb4d698e7..000000000
--- a/docs/uml/designer_v2/lib/features/recruit/uml.svg
+++ /dev/null
@@ -1,498 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2855.0" height="876.0" viewbox="0 0 2855 876" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[EnrolledBadge
-	  |
-	  +enrolledCount: int
-	  |
-	  +Widget build()
-	]
-	
-	[StudyRecruitController
-	  |
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
-	  |
-	  -dynamic _subscribeInvites();
-	  +Intervention? getIntervention();
-	  +int getParticipantCountForInvite();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void dispose()
-	]
-	
-	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[StudyRecruitController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyRecruitController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
-	
-	[StudyRecruitScreen
-	  |
-	  +Widget build();
-	  -Widget _inviteCodesSectionHeader();
-	  -Widget _newInviteCodeButton();
-	  -dynamic _onSelectInvite()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
-	
-	[InviteCodeFormView
-	  |
-	  +formViewModel: InviteCodeFormViewModel
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
-	]
-	
-	[InviteCodeFormView]o-[InviteCodeFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
-	
-	[StudyInvitesTable
-	  |
-	  +invites: List&lt;StudyInvite&gt;;
-	  +onSelect: void Function(StudyInvite);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getIntervention: Intervention? Function(String);
-	  +getParticipantCountForInvite: int Function(StudyInvite)
-	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow()
-	]
-	
-	[StudyInvitesTable]o-[void Function(StudyInvite)]
-	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
-	[StudyInvitesTable]o-[Intervention? Function(String)]
-	[StudyInvitesTable]o-[int Function(StudyInvite)]
-	
-	[InviteCodeFormViewModel
-	  |
-	  +study: Study;
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  +codeControl: FormControl&lt;String&gt;;
-	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
-	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +interventionAControl: FormControl&lt;String&gt;;
-	  +interventionBControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
-	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +isPreconfiguredSchedule: bool;
-	  +preconfiguredSchedule: List&lt;String&gt;?
-	  |
-	  +void initControls();
-	  -dynamic _uniqueInviteCode();
-	  +void regenerateCode();
-	  -String _generateCode();
-	  +StudyInvite buildFormData();
-	  +void setControlsFrom();
-	  +dynamic save()
-	]
-	
-	[InviteCodeFormViewModel]o-[Study]
-	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[InviteCodeFormViewModel]o-[FormControl]
-	[InviteCodeFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="876.0" width="2855.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M523.3 659.9 L739.25 769 L703.7570422535211 789 L703.8 789.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M517.4 650.9 L523.3 659.9 L512.6 660.5 L506.6 651.5 Z"></path>
-					</g>
-					<path d="M268.5 668.0 L215.25 769 L215.25 789 L215.3 789.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M277.6 662.2 L268.5 668.0 L268.2 657.3 L277.2 651.5 Z"></path>
-					</g>
-					<path d="M436.0 305.8 L436 351 L373.8767942583732 468.5 L373.9 468.5 " fill="none"></path>
-					<path d="M441.3 305.8 L436.0 305.8 L430.7 305.8 L436.0 292.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M215.0 305.8 L215 351 L277.1232057416268 468.5 L277.1 468.5 " fill="none"></path>
-					</g>
-					<path d="M220.3 305.8 L215.0 305.8 L209.7 305.8 L215.0 292.5 Z"></path>
-					<path d="M722.0 120.3 L722 203 L722 223.5 L722.0 223.5 " fill="none"></path>
-					<path d="M727.3 120.3 L722.0 120.3 L716.7 120.3 L722.0 107.0 Z"></path>
-					<path d="M2580.0 349.7 L2580 351 L2118.25 472.3527192706696 L2118.3 472.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2585.3 340.3 L2580.0 349.7 L2574.7 340.3 L2580.0 331.0 Z"></path>
-					</g>
-					<path d="M2580.0 120.3 L2580 203 L2580 223 L2580.0 223.0 " fill="none"></path>
-					<path d="M2585.3 120.3 L2580.0 120.3 L2574.7 120.3 L2580.0 107.0 Z"></path>
-					<path d="M1458.5 152.7 L1211 203 L1211 261.5 L1211.0 261.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1468.7 156.1 L1458.5 152.7 L1466.5 145.6 L1476.8 149.0 Z"></path>
-					</g>
-					<path d="M1589.6 192.5 L1572 203 L1572 261.5 L1572.0 261.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1600.4 192.4 L1589.6 192.5 L1594.9 183.2 L1605.7 183.0 Z"></path>
-					</g>
-					<path d="M1929.9 192.5 L1947.5 203 L1947.5 261.5 L1947.5 261.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1924.6 183.2 L1929.9 192.5 L1919.1 192.4 L1913.8 183.0 Z"></path>
-					</g>
-					<path d="M2060.9 164.9 L2217 203 L2217 261.5 L2217.0 261.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2053.1 157.5 L2060.9 164.9 L2050.6 167.9 L2042.8 160.5 Z"></path>
-					</g>
-					<path d="M1433.0 638.0 L842.25 769 L842.25 789 L842.3 789.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1443.3 641.2 L1433.0 638.0 L1441.0 630.8 L1451.3 634.0 Z"></path>
-					</g>
-					<path d="M1432.9 621.4 L586 769 L636.8450704225352 789 L636.8 789.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1443.0 625.0 L1432.9 621.4 L1441.1 614.5 L1451.3 618.1 Z"></path>
-					</g>
-					<path d="M1433.7 685.4 L1199.5 769 L1199.5 789 L1199.5 789.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1444.3 687.3 L1433.7 685.4 L1440.7 677.2 L1451.3 679.1 Z"></path>
-					</g>
-					<path d="M2067.2 759.8 L2080.25 769 L2080.25 789 L2080.3 789.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2062.7 750.0 L2067.2 759.8 L2056.5 758.7 L2052.0 749.0 Z"></path>
-					</g>
-					<path d="M989.5 305.8 L989.5 351 L1451.25 472.3527192706696 L1451.3 472.4 " fill="none"></path>
-					<path d="M994.8 305.8 L989.5 305.8 L984.2 305.8 L989.5 292.5 Z"></path>
-					<g data-name="EnrolledBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="437.5" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M437.5 76.0 L603.5 76.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M437.5 107.0 L603.5 107.0" fill="none" data-name="EnrolledBadge"></path>
-						</g>
-						<g transform="translate(437.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(437.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(437.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRecruitController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="0.0" y="468.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M0.0 499.5 L651.0 499.5" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M0.0 545.5 L651.0 545.5" fill="none" data-name="StudyRecruitController"></path>
-						</g>
-						<g transform="translate(0, 468.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
-								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 499.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IInviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="580.8" y="789.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
-						</g>
-						<g transform="translate(580.75, 789)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="130.3" y="789.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
-						</g>
-						<g transform="translate(130.25, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyBaseController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="347.0" y="261.5" height="31.0" width="178.0" data-name="StudyBaseController"></rect>
-						</g>
-						<g transform="translate(347, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="123.0" y="261.5" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
-						</g>
-						<g transform="translate(123, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRecruitScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="565.0" y="223.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M565.0 254.5 L879.0 254.5" fill="none" data-name="StudyRecruitScreen"></path>
-						</g>
-						<g transform="translate(565, 223.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(565, 254.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="643.5" y="76.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
-						</g>
-						<g transform="translate(643.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
-							<rect x="2361.0" y="223.0" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
-							<path d="M2361.0 254.0 L2799.0 254.0" fill="none" data-name="InviteCodeFormView"></path>
-							<path d="M2361.0 285.0 L2799.0 285.0" fill="none" data-name="InviteCodeFormView"></path>
-						</g>
-						<g transform="translate(2361, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
-								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2361, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2361, 285)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="1451.3" y="371.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M1451.3 402.0 L2118.3 402.0" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M1451.3 628.0 L2118.3 628.0" fill="none" data-name="InviteCodeFormViewModel"></path>
-						</g>
-						<g transform="translate(1451.25, 371)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
-								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1451.25, 402)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1451.25, 628)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="2484.0" y="76.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
-						</g>
-						<g transform="translate(2484, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInvitesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="1476.8" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M1476.8 31.0 L2042.8 31.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M1476.8 137.0 L2042.8 137.0" fill="none" data-name="StudyInvitesTable"></path>
-						</g>
-						<g transform="translate(1476.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
-								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1476.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1476.75, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="1100.0" y="261.5" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(1100, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="1362.0" y="261.5" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(1362, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention? Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="1822.0" y="261.5" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
-						</g>
-						<g transform="translate(1822, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="int Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="2113.0" y="261.5" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(2113, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="811.8" y="789.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(811.75, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="1143.0" y="789.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(1143, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="2027.8" y="789.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(2027.75, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="919.0" y="261.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(919, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/study/settings/uml.svg b/docs/uml/designer_v2/lib/features/study/settings/uml.svg
deleted file mode 100644
index b6f45b2a3..000000000
--- a/docs/uml/designer_v2/lib/features/study/settings/uml.svg
+++ /dev/null
@@ -1,185 +0,0 @@
-<svg version="1.1" baseProfile="full" width="798.0" height="456.0" viewbox="0 0 798 456" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudySettingsDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
-	
-	[StudySettingsFormViewModel
-	  |
-	  +study: AsyncValue&lt;Study&gt;;
-	  +studyRepository: IStudyRepository;
-	  &lt;static&gt;+defaultPublishedToRegistry: bool;
-	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
-	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
-	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +dynamic keepControlsSynced();
-	  +dynamic save();
-	  +dynamic setLaunchDefaults()
-	]
-	
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudySettingsFormViewModel]o-[FormControl]
-	[StudySettingsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="456.0" width="798.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M87.5 44.3 L87.5 51 L87.5 169 L87.5 169.0 " fill="none"></path>
-					<path d="M92.8 44.3 L87.5 44.3 L82.2 44.3 L87.5 31.0 Z"></path>
-					<path d="M216.7 338.4 L198.5 349 L198.5 369 L198.5 369.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M227.5 338.3 L216.7 338.4 L222.1 329.1 L232.9 329.0 Z"></path>
-					</g>
-					<path d="M370.7 345.2 L368.5 349 L368.5 369 L368.5 369.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M380.0 339.7 L370.7 345.2 L370.8 334.4 L380.0 329.0 Z"></path>
-					</g>
-					<path d="M538.3 345.2 L540.5 349 L540.5 369 L540.5 369.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M538.2 334.4 L538.3 345.2 L529.0 339.7 L529.0 329.0 Z"></path>
-					</g>
-					<path d="M673.7 339.0 L689.5 349 L689.5 369 L689.5 369.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M668.7 329.5 L673.7 339.0 L663.0 338.5 L658.0 329.0 Z"></path>
-					</g>
-					<path d="M454.5 44.3 L454.5 51 L454.5 71 L454.5 71.0 " fill="none"></path>
-					<path d="M459.8 44.3 L454.5 44.3 L449.2 44.3 L454.5 31.0 Z"></path>
-					<g data-name="StudySettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="0.0" y="169.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M0.0 200.0 L175.0 200.0" fill="none" data-name="StudySettingsDialog"></path>
-						</g>
-						<g transform="translate(0, 169)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
-								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 200)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="9.0" y="0.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
-						</g>
-						<g transform="translate(9, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySettingsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="215.0" y="71.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M215.0 102.0 L694.0 102.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M215.0 238.0 L694.0 238.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-						</g>
-						<g transform="translate(215, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(215, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(215, 238)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="144.0" y="369.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
-						</g>
-						<g transform="translate(144, 369)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="293.0" y="369.0" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
-						</g>
-						<g transform="translate(293, 369)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="484.0" y="369.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(484, 369)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="637.0" y="369.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(637, 369)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="384.0" y="0.0" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(384, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/study/uml.svg b/docs/uml/designer_v2/lib/features/study/uml.svg
deleted file mode 100644
index d5afd8d04..000000000
--- a/docs/uml/designer_v2/lib/features/study/uml.svg
+++ /dev/null
@@ -1,1411 +0,0 @@
-<svg version="1.1" baseProfile="full" width="5569.5" height="951.0" viewbox="0 0 5569.5 951" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;IStudyNavViewModel
-	  |
-	  +isEditTabEnabled: bool;
-	  +isTestTabEnabled: bool;
-	  +isRecruitTabEnabled: bool;
-	  +isMonitorTabEnabled: bool;
-	  +isAnalyzeTabEnabled: bool;
-	  +isSettingsEnabled: bool
-	]
-	
-	[StudyNav
-	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic edit();
-	  &lt;static&gt;+dynamic test();
-	  &lt;static&gt;+dynamic recruit();
-	  &lt;static&gt;+dynamic monitor();
-	  &lt;static&gt;+dynamic analyze()
-	]
-	
-	[StudyDesignNav
-	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic info();
-	  &lt;static&gt;+dynamic enrollment();
-	  &lt;static&gt;+dynamic interventions();
-	  &lt;static&gt;+dynamic measurements();
-	  &lt;static&gt;+dynamic reports()
-	]
-	
-	[RouteInformation
-	  |
-	  +route: String?;
-	  +extra: String?;
-	  +cmd: String?;
-	  +data: String?
-	  |
-	  +String toString()
-	]
-	
-	[&lt;abstract&gt;PlatformController
-	  |
-	  +studyId: String;
-	  +baseSrc: String;
-	  +previewSrc: String;
-	  +routeInformation: RouteInformation;
-	  +frameWidget: Widget
-	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void listen();
-	  +void send();
-	  +void openNewPage()
-	]
-	
-	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
-	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
-	
-	[WebController
-	  |
-	  +iFrameElement: IFrameElement
-	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void openNewPage();
-	  +void listen();
-	  +void send()
-	]
-	
-	[WebController]o-[IFrameElement]
-	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
-	
-	[MobileController
-	  |
-	  +void openNewPage();
-	  +void refresh();
-	  +void registerViews();
-	  +void listen();
-	  +void send();
-	  +void navigate();
-	  +void activate();
-	  +void generateUrl()
-	]
-	
-	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
-	
-	[TestAppRoutes
-	  |
-	  &lt;static&gt;+studyOverview: String;
-	  &lt;static&gt;+eligibility: String;
-	  &lt;static&gt;+intervention: String;
-	  &lt;static&gt;+consent: String;
-	  &lt;static&gt;+journey: String;
-	  &lt;static&gt;+dashboard: String
-	]
-	
-	[StudySettingsFormViewModel
-	  |
-	  +study: AsyncValue&lt;Study&gt;;
-	  +studyRepository: IStudyRepository;
-	  &lt;static&gt;+defaultPublishedToRegistry: bool;
-	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
-	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
-	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +dynamic keepControlsSynced();
-	  +dynamic save();
-	  +dynamic setLaunchDefaults()
-	]
-	
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudySettingsFormViewModel]o-[FormControl]
-	[StudySettingsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
-	
-	[StudySettingsDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
-	
-	[FrameControlsWidget
-	  |
-	  +onRefresh: void Function()?;
-	  +onOpenNewTab: void Function()?;
-	  +enabled: bool
-	  |
-	  +Widget build()
-	]
-	
-	[FrameControlsWidget]o-[void Function()?]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
-	
-	[&lt;abstract&gt;StudyPageWidget
-	  |
-	  +studyId: String
-	  |
-	  +Widget? banner()
-	]
-	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
-	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
-	
-	[StudyTestScreen
-	  |
-	  +previewRoute: String?
-	  |
-	  +Widget build();
-	  +Widget? banner();
-	  +dynamic load();
-	  +dynamic save();
-	  +dynamic showHelp()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
-	
-	[StudyParticipationBadge
-	  |
-	  +participation: Participation;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +center: bool
-	  |
-	  +Widget build()
-	]
-	
-	[StudyParticipationBadge]o-[Participation]
-	[StudyParticipationBadge]o-[BadgeType]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel
-	  |
-	  +studyParticipation: Participation?;
-	  +studyStatus: StudyStatus?
-	]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
-	
-	[StudyStatusBadge
-	  |
-	  +participation: Participation?;
-	  +status: StudyStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
-	  |
-	  +Widget build()
-	]
-	
-	[StudyStatusBadge]o-[Participation]
-	[StudyStatusBadge]o-[StudyStatus]
-	[StudyStatusBadge]o-[BadgeType]
-	
-	[StudyController
-	  |
-	  +notificationService: INotificationService;
-	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
-	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
-	  |
-	  +dynamic syncStudyStatus();
-	  +dynamic onStudySubscriptionUpdate();
-	  -dynamic _redirectNewToActualStudyID();
-	  +dynamic publishStudy();
-	  +void onChangeStudyParticipation();
-	  +void onAddParticipants();
-	  +void onSettingsPressed();
-	  +void dispose()
-	]
-	
-	[StudyController]o-[&lt;abstract&gt;INotificationService]
-	[StudyController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyController]
-	
-	[PreviewFrame
-	  |
-	  +studyId: String;
-	  +routeArgs: StudyFormRouteArgs?;
-	  +route: String?
-	]
-	
-	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
-	
-	[StudyTestController
-	  |
-	  +authRepository: IAuthRepository;
-	  +languageCode: String
-	]
-	
-	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyBaseController]&lt;:-[StudyTestController]
-	
-	[&lt;abstract&gt;IStudyAppBarViewModel
-	  |
-	  +isSyncIndicatorVisible: bool;
-	  +isStatusBadgeVisible: bool;
-	  +isPublishVisible: bool
-	]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	
-	[StudyScaffold
-	  |
-	  +studyId: String;
-	  +tabs: List&lt;NavbarTab&gt;?;
-	  +tabsSubnav: List&lt;NavbarTab&gt;?;
-	  +selectedTab: NavbarTab?;
-	  +selectedTabSubnav: NavbarTab?;
-	  +body: StudyPageWidget;
-	  +drawer: Widget?;
-	  +disableActions: bool;
-	  +actionsSpacing: double;
-	  +actionsPadding: double;
-	  +layoutType: SingleColumnLayoutType?;
-	  +appbarHeight: double;
-	  +appbarSubnavHeight: double
-	]
-	
-	[StudyScaffold]o-[NavbarTab]
-	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
-	[StudyScaffold]o-[&lt;abstract&gt;Widget]
-	[StudyScaffold]o-[SingleColumnLayoutType]
-	
-	[WebFrame
-	  |
-	  +previewSrc: String;
-	  +studyId: String
-	  |
-	  +Widget build()
-	]
-	
-	[DisabledFrame
-	  |
-	  +Widget build()
-	]
-	
-	[PhoneContainer
-	  |
-	  &lt;static&gt;+defaultWidth: double;
-	  &lt;static&gt;+defaultHeight: double;
-	  +width: double;
-	  +height: double;
-	  +borderColor: Color;
-	  +borderWidth: double;
-	  +borderRadius: double;
-	  +innerContent: Widget;
-	  +innerContentBackgroundColor: Color?
-	  |
-	  +Widget build()
-	]
-	
-	[PhoneContainer]o-[Color]
-	[PhoneContainer]o-[&lt;abstract&gt;Widget]
-	
-	[MobileFrame
-	  |
-	  +Widget build()
-	]
-	
-	[DesktopFrame
-	  |
-	  +Widget build()
-	]
-	
-	[StudyBaseController
-	  |
-	  +studyId: String;
-	  +studyRepository: IStudyRepository;
-	  +router: GoRouter;
-	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
-	  |
-	  +dynamic subscribeStudy();
-	  +dynamic onStudySubscriptionUpdate();
-	  +dynamic onStudySubscriptionError();
-	  +void dispose()
-	]
-	
-	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyBaseController]o-[GoRouter]
-	[StudyBaseController]o-[StreamSubscription]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="951.0" width="5569.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M419.8 197.1 L620 278 L620 358 L620.0 358.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M413.2 188.6 L419.8 197.1 L409.2 198.5 L402.5 190.1 Z"></path>
-					</g>
-					<path d="M418.4 231.7 L493.75 278 L2046.25 423.66908060453403 L2046.3 423.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M413.2 222.2 L418.4 231.7 L407.7 231.3 L402.5 221.9 Z"></path>
-					</g>
-					<path d="M367.5 544.7 L367.5 576 L367.5 694.5 L367.5 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M372.8 535.3 L367.5 544.7 L362.2 535.3 L367.5 526.0 Z"></path>
-					</g>
-					<path d="M360.1 268.5 L367.5 278 L367.5 328 L367.5 328.0 " fill="none"></path>
-					<path d="M364.3 265.2 L360.1 268.5 L355.9 271.8 L351.9 258.0 Z"></path>
-					<path d="M106.8 267.2 L95.5 278 L95.5 343.5 L95.5 343.5 " fill="none"></path>
-					<path d="M110.5 271.1 L106.8 267.2 L103.1 263.4 L116.4 258.0 Z"></path>
-					<path d="M1350.6 565.3 L1369 576 L1235.6875 694.5 L1235.7 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1345.2 556.1 L1350.6 565.3 L1339.8 565.3 L1334.4 556.0 Z"></path>
-					</g>
-					<path d="M1315.2 566.5 L1329 576 L1880.1576492537313 694.5 L1880.2 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1310.5 556.9 L1315.2 566.5 L1304.5 565.7 L1299.8 556.0 Z"></path>
-					</g>
-					<path d="M855.5 560.6 L826 576 L826 694.5 L826.0 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M866.2 561.0 L855.5 560.6 L861.3 551.6 L872.0 552.0 Z"></path>
-					</g>
-					<path d="M854.3 515.2 L677 576 L677 694.5 L677.0 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M864.9 517.2 L854.3 515.2 L861.4 507.1 L872.0 509.1 Z"></path>
-					</g>
-					<path d="M1122.8 157.8 L1122.75 278 L1121.239932885906 298 L1121.2 298.0 " fill="none"></path>
-					<path d="M1128.1 157.8 L1122.8 157.8 L1117.4 157.8 L1122.8 144.5 Z"></path>
-					<path d="M2400.4 463.7 L2689.25 576 L2689.25 679 L2689.3 679.0 " fill="none"></path>
-					<path d="M2402.4 458.7 L2400.4 463.7 L2398.5 468.7 L2388.0 458.9 Z"></path>
-					<path d="M1675.5 507.2 L1675.5 576 L1542.1875 694.5 L1542.2 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1680.8 497.8 L1675.5 507.2 L1670.2 497.8 L1675.5 488.5 Z"></path>
-					</g>
-					<path d="M1621.6 156.7 L1675.5 278 L1675.5 365.5 L1675.5 365.5 " fill="none"></path>
-					<path d="M1626.4 154.5 L1621.6 156.7 L1616.7 158.9 L1616.1 144.5 Z"></path>
-					<path d="M1574.9 151.9 L1386 278 L2224 413.7195652173913 L2224.0 413.7 " fill="none"></path>
-					<path d="M1577.9 156.3 L1574.9 151.9 L1572.0 147.5 L1586.0 144.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1841.5 157.8 L1841.5 278 L2224 400.6964477933262 L2224.0 400.7 " fill="none"></path>
-					</g>
-					<path d="M1846.8 157.8 L1841.5 157.8 L1836.2 157.8 L1841.5 144.5 Z"></path>
-					<path d="M2212.1 474.3 L2010.25 576 L1836.75 661.0054844606947 L1836.8 661.0 " fill="none"></path>
-					<path d="M2214.5 479.1 L2212.1 474.3 L2209.7 469.5 L2224.0 468.3 Z"></path>
-					<path d="M3747.2 216.0 L3763.75 278 L3965.567953020134 411.5 L3965.6 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3750.0 205.6 L3747.2 216.0 L3739.7 208.4 L3742.4 198.0 Z"></path>
-					</g>
-					<path d="M3712.3 216.5 L3704 278 L3580.3557046979868 411.5 L3580.4 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3718.8 208.0 L3712.3 216.5 L3708.2 206.5 L3714.7 198.0 Z"></path>
-					</g>
-					<path d="M4094.4 178.0 L4242.25 278 L4015.344798657718 411.5 L4015.3 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4089.6 168.3 L4094.4 178.0 L4083.7 177.1 L4078.9 167.5 Z"></path>
-					</g>
-					<path d="M4066.0 181.8 L4146 278 L3865.5604026845635 411.5 L3865.6 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4064.1 171.3 L4066.0 181.8 L4055.9 178.1 L4054.0 167.5 Z"></path>
-					</g>
-					<path d="M3519.9 220.1 L3565.75 278 L3944.9706375838928 411.5 L3945.0 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3518.3 209.5 L3519.9 220.1 L3509.9 216.1 L3508.3 205.5 Z"></path>
-					</g>
-					<path d="M3496.5 222.0 L3525.75 278 L3801.037751677852 411.5 L3801.0 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3496.9 211.3 L3496.5 222.0 L3487.4 216.2 L3487.8 205.5 Z"></path>
-					</g>
-					<path d="M3389.4 221.3 L3353.5 278 L3543.8942953020132 411.5 L3543.9 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3398.9 216.2 L3389.4 221.3 L3389.9 210.5 L3399.4 205.5 Z"></path>
-					</g>
-					<path d="M3944.4 838.7 L3948.5 844 L3948.5 864 L3948.5 864.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3942.8 828.1 L3944.4 838.7 L3934.4 834.6 L3932.9 824.0 Z"></path>
-					</g>
-					<path d="M3715.2 837.1 L3708.25 844 L3662.193661971831 864 L3662.2 864.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3725.6 834.4 L3715.2 837.1 L3718.1 826.8 L3728.5 824.0 Z"></path>
-					</g>
-					<path d="M3486.0 493.2 L3844 576 L3844 596 L3844.0 596.0 " fill="none"></path>
-					<path d="M3487.2 488.0 L3486.0 493.2 L3484.8 498.4 L3473.0 490.2 Z"></path>
-					<path d="M4350.0 193.7 L4350 278 L4773.123322147651 411.5 L4773.1 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4355.3 184.3 L4350.0 193.7 L4344.7 184.3 L4350.0 175.0 Z"></path>
-					</g>
-					<path d="M3376.5 767.2 L3376.5 844 L3376.5 864 L3376.5 864.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3381.8 757.8 L3376.5 767.2 L3371.2 757.8 L3376.5 748.5 Z"></path>
-					</g>
-					<path d="M3318.6 527.1 L3376.5 576 L3376.5 671.5 L3376.5 671.5 " fill="none"></path>
-					<path d="M3322.0 523.0 L3318.6 527.1 L3315.1 531.2 L3308.4 518.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M4008.2 180.4 L3982 278 L4399.75 393.42837273991654 L4399.8 393.4 " fill="none"></path>
-					</g>
-					<path d="M4013.4 181.8 L4008.2 180.4 L4003.1 179.0 L4011.7 167.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M5041.0 210.8 L5041 278 L4642.75 392.16883116883116 L4642.8 392.2 " fill="none"></path>
-					</g>
-					<path d="M5046.3 210.8 L5041.0 210.8 L5035.7 210.8 L5041.0 197.5 Z"></path>
-					<path d="M2707.1 216.8 L2835.5 278 L2835.5 411.5 L2835.5 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2701.0 208.0 L2707.1 216.8 L2696.4 217.6 L2690.3 208.8 Z"></path>
-					</g>
-					<path d="M2548.9 268.3 L2550.75 278 L2382.381711409396 380.5 L2382.4 380.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2552.5 258.2 L2548.9 268.3 L2542.0 260.2 L2545.5 250.0 Z"></path>
-					</g>
-					<path d="M2504.0 268.5 L2502.75 278 L2117.25 414.43586698337293 L2117.3 414.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2510.6 260.0 L2504.0 268.5 L2500.0 258.5 L2506.5 250.0 Z"></path>
-					</g>
-					<path d="M2430.9 265.5 L2422.5 278 L2612.8942953020132 411.5 L2612.9 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2440.6 260.7 L2430.9 265.5 L2431.7 254.8 L2441.3 250.0 Z"></path>
-					</g>
-					<path d="M2216.6 249.0 L2244.5 278 L2434.8942953020132 411.5 L2434.9 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2214.0 238.5 L2216.6 249.0 L2206.3 245.9 L2203.7 235.5 Z"></path>
-					</g>
-					<path d="M2003.1 250.0 L1980.25 278 L2071.191275167785 411.5 L2071.2 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2013.1 246.1 L2003.1 250.0 L2004.8 239.4 L2014.8 235.5 Z"></path>
-					</g>
-					<path d="M3296.4 532.3 L3336.5 576 L2027.75 702.6913491060141 L2027.8 702.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3294.1 521.8 L3296.4 532.3 L3286.2 529.0 L3283.8 518.5 Z"></path>
-					</g>
-					<path d="M3000.8 526.9 L2902.75 576 L2902.75 694.5 L2902.8 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3011.5 527.5 L3000.8 526.9 L3006.7 517.9 L3017.5 518.5 Z"></path>
-					</g>
-					<path d="M2947.3 525.3 L2816.75 576 L2816.75 710 L2816.75 710 L2816.75 844 L2816.75 844 L3541.5 875.7735412164249 L3541.5 875.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2957.9 526.9 L2947.3 525.3 L2954.0 516.9 L2964.6 518.5 Z"></path>
-					</g>
-					<g data-name="IStudyNavViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
-							<rect x="4920.5" y="60.5" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
-							<path d="M4920.5 91.5 L5161.5 91.5" fill="none" data-name="IStudyNavViewModel"></path>
-						</g>
-						<g transform="translate(4920.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4920.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
-							<rect x="451.3" y="60.5" height="137.0" width="233.0" data-name="StudyNav"></rect>
-							<path d="M451.3 91.5 L684.3 91.5" fill="none" data-name="StudyNav"></path>
-						</g>
-						<g transform="translate(451.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
-								
-							</g>
-						</g>
-						<g transform="translate(451.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
-							<rect x="724.3" y="60.5" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
-							<path d="M724.3 91.5 L1012.3 91.5" fill="none" data-name="StudyDesignNav"></path>
-						</g>
-						<g transform="translate(724.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
-								
-							</g>
-						</g>
-						<g transform="translate(724.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RouteInformation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
-							<rect x="544.0" y="358.0" height="138.0" width="152.0" data-name="RouteInformation"></rect>
-							<path d="M544.0 389.0 L696.0 389.0" fill="none" data-name="RouteInformation"></path>
-							<path d="M544.0 465.0 L696.0 465.0" fill="none" data-name="RouteInformation"></path>
-						</g>
-						<g transform="translate(544, 358)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(544, 389)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(544, 465)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
-							<rect x="100.5" y="0.0" height="258.0" width="302.0" data-name="PlatformController"></rect>
-							<path d="M100.5 31.0 L402.5 31.0" fill="none" data-name="PlatformController"></path>
-							<path d="M100.5 122.0 L402.5 122.0" fill="none" data-name="PlatformController"></path>
-						</g>
-						<g transform="translate(100.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
-								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(100.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(100.5, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="2046.3" y="411.5" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(2046.25, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WebController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
-							<rect x="231.0" y="328.0" height="198.0" width="273.0" data-name="WebController"></rect>
-							<path d="M231.0 359.0 L504.0 359.0" fill="none" data-name="WebController"></path>
-							<path d="M231.0 390.0 L504.0 390.0" fill="none" data-name="WebController"></path>
-						</g>
-						<g transform="translate(231, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
-								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(231, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
-								
-							</g>
-						</g>
-						<g transform="translate(231, 390)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFrameElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
-							<rect x="300.0" y="694.5" height="31.0" width="135.0" data-name="IFrameElement"></rect>
-						</g>
-						<g transform="translate(300, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MobileController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
-							<rect x="0.0" y="343.5" height="167.0" width="191.0" data-name="MobileController"></rect>
-							<path d="M0.0 374.5 L191.0 374.5" fill="none" data-name="MobileController"></path>
-						</g>
-						<g transform="translate(0, 343.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 374.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TestAppRoutes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
-							<rect x="1233.3" y="60.5" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
-							<path d="M1233.3 91.5 L1493.3 91.5" fill="none" data-name="TestAppRoutes"></path>
-						</g>
-						<g transform="translate(1233.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1233.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
-								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySettingsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="872.0" y="298.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M872.0 329.0 L1351.0 329.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M872.0 465.0 L1351.0 465.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-						</g>
-						<g transform="translate(872, 298)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(872, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(872, 465)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="1163.8" y="694.5" height="31.0" width="109.0" data-name="AsyncValue"></rect>
-						</g>
-						<g transform="translate(1163.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="1876.8" y="694.5" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
-						</g>
-						<g transform="translate(1876.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="769.5" y="694.5" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(769.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="624.5" y="694.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(624.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="1052.3" y="113.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(1052.25, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="2601.8" y="679.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M2601.8 710.0 L2776.8 710.0" fill="none" data-name="StudySettingsDialog"></path>
-						</g>
-						<g transform="translate(2601.75, 679)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
-								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2601.75, 710)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="2224.0" y="380.5" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
-							<path d="M2224.0 411.5 L2388.0 411.5" fill="none" data-name="StudyPageWidget"></path>
-							<path d="M2224.0 442.5 L2388.0 442.5" fill="none" data-name="StudyPageWidget"></path>
-						</g>
-						<g transform="translate(2224, 380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2224, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2224, 442.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FrameControlsWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
-							<rect x="1530.0" y="365.5" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
-							<path d="M1530.0 396.5 L1821.0 396.5" fill="none" data-name="FrameControlsWidget"></path>
-							<path d="M1530.0 457.5 L1821.0 457.5" fill="none" data-name="FrameControlsWidget"></path>
-						</g>
-						<g transform="translate(1530, 365.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1530, 396.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1530, 457.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="1452.8" y="694.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(1452.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="1533.3" y="113.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(1533.25, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IWithBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="1785.0" y="113.5" height="31.0" width="113.0" data-name="IWithBanner"></rect>
-						</g>
-						<g transform="translate(1785, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTestScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
-							<rect x="1636.8" y="633.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
-							<path d="M1636.8 664.5 L1836.8 664.5" fill="none" data-name="StudyTestScreen"></path>
-							<path d="M1636.8 695.5 L1836.8 695.5" fill="none" data-name="StudyTestScreen"></path>
-						</g>
-						<g transform="translate(1636.75, 633.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
-								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1636.75, 664.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1636.75, 695.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyParticipationBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
-							<rect x="3608.5" y="60.0" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
-							<path d="M3608.5 91.0 L3839.5 91.0" fill="none" data-name="StudyParticipationBadge"></path>
-							<path d="M3608.5 167.0 L3839.5 167.0" fill="none" data-name="StudyParticipationBadge"></path>
-						</g>
-						<g transform="translate(3608.5, 60)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3608.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3608.5, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="3932.0" y="411.5" height="31.0" width="114.0" data-name="Participation"></rect>
-						</g>
-						<g transform="translate(3932, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="3513.0" y="411.5" height="31.0" width="106.0" data-name="BadgeType"></rect>
-						</g>
-						<g transform="translate(3513, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyStatusBadgeViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
-							<rect x="3879.5" y="90.5" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
-							<path d="M3879.5 121.5 L4164.5 121.5" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
-						</g>
-						<g transform="translate(3879.5, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3879.5, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
-							<rect x="3777.5" y="411.5" height="31.0" width="111.0" data-name="StudyStatus"></rect>
-						</g>
-						<g transform="translate(3777.5, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
-								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyStatusBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
-							<rect x="3327.3" y="52.5" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
-							<path d="M3327.3 83.5 L3568.3 83.5" fill="none" data-name="StudyStatusBadge"></path>
-							<path d="M3327.3 174.5 L3568.3 174.5" fill="none" data-name="StudyStatusBadge"></path>
-						</g>
-						<g transform="translate(3327.25, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3327.25, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3327.25, 174.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
-							<rect x="3557.5" y="596.0" height="228.0" width="573.0" data-name="StudyController"></rect>
-							<path d="M3557.5 627.0 L4130.5 627.0" fill="none" data-name="StudyController"></path>
-							<path d="M3557.5 688.0 L4130.5 688.0" fill="none" data-name="StudyController"></path>
-						</g>
-						<g transform="translate(3557.5, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
-								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3557.5, 627)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3557.5, 688)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="INotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="3864.5" y="864.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
-						</g>
-						<g transform="translate(3864.5, 864)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="3541.5" y="864.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
-						</g>
-						<g transform="translate(3541.5, 864)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyBaseController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="2927.0" y="335.5" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
-							<path d="M2927.0 366.5 L3473.0 366.5" fill="none" data-name="StudyBaseController"></path>
-							<path d="M2927.0 442.5 L3473.0 442.5" fill="none" data-name="StudyBaseController"></path>
-						</g>
-						<g transform="translate(2927, 335.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
-								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2927, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2927, 442.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PreviewFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
-							<rect x="4204.5" y="83.0" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
-							<path d="M4204.5 114.0 L4495.5 114.0" fill="none" data-name="PreviewFrame"></path>
-						</g>
-						<g transform="translate(4204.5, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4204.5, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="4730.3" y="411.5" height="31.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(4730.25, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTestController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
-							<rect x="3235.5" y="671.5" height="77.0" width="282.0" data-name="StudyTestController"></rect>
-							<path d="M3235.5 702.5 L3517.5 702.5" fill="none" data-name="StudyTestController"></path>
-						</g>
-						<g transform="translate(3235.5, 671.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3235.5, 702.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="3305.5" y="864.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
-						</g>
-						<g transform="translate(3305.5, 864)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyAppBarViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
-							<rect x="4399.8" y="381.0" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
-							<path d="M4399.8 412.0 L4642.8 412.0" fill="none" data-name="IStudyAppBarViewModel"></path>
-						</g>
-						<g transform="translate(4399.75, 381)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4399.75, 412)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
-							<rect x="2355.3" y="8.0" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
-							<path d="M2355.3 39.0 L2690.3 39.0" fill="none" data-name="StudyScaffold"></path>
-						</g>
-						<g transform="translate(2355.25, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
-								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2355.25, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NavbarTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="2784.0" y="411.5" height="31.0" width="103.0" data-name="NavbarTab"></rect>
-						</g>
-						<g transform="translate(2784, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SingleColumnLayoutType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="2526.0" y="411.5" height="31.0" width="218.0" data-name="SingleColumnLayoutType"></rect>
-						</g>
-						<g transform="translate(2526, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WebFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
-							<rect x="4535.5" y="75.0" height="108.0" width="169.0" data-name="WebFrame"></rect>
-							<path d="M4535.5 106.0 L4704.5 106.0" fill="none" data-name="WebFrame"></path>
-							<path d="M4535.5 152.0 L4704.5 152.0" fill="none" data-name="WebFrame"></path>
-						</g>
-						<g transform="translate(4535.5, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4535.5, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4535.5, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DisabledFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
-							<rect x="4744.5" y="98.0" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
-							<path d="M4744.5 129.0 L4880.5 129.0" fill="none" data-name="DisabledFrame"></path>
-						</g>
-						<g transform="translate(4744.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4744.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PhoneContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
-							<rect x="1938.0" y="22.5" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
-							<path d="M1938.0 53.5 L2265.0 53.5" fill="none" data-name="PhoneContainer"></path>
-							<path d="M1938.0 204.5 L2265.0 204.5" fill="none" data-name="PhoneContainer"></path>
-						</g>
-						<g transform="translate(1938, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
-								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1938, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1938, 204.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="2428.0" y="411.5" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(2428, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MobileFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
-							<rect x="5201.5" y="98.0" height="62.0" width="136.0" data-name="MobileFrame"></rect>
-							<path d="M5201.5 129.0 L5337.5 129.0" fill="none" data-name="MobileFrame"></path>
-						</g>
-						<g transform="translate(5201.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5201.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DesktopFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
-							<rect x="5377.5" y="98.0" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
-							<path d="M5377.5 129.0 L5513.5 129.0" fill="none" data-name="DesktopFrame"></path>
-						</g>
-						<g transform="translate(5377.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5377.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="2856.8" y="694.5" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(2856.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/uml.svg b/docs/uml/designer_v2/lib/features/uml.svg
deleted file mode 100644
index d85f16001..000000000
--- a/docs/uml/designer_v2/lib/features/uml.svg
+++ /dev/null
@@ -1,8823 +0,0 @@
-<svg version="1.1" baseProfile="full" width="48837.5" height="3778.0" viewbox="0 0 48837.5 3778" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;IAppDelegate
-	  |
-	  +dynamic onAppStart()
-	]
-	
-	[AppController
-	  |
-	  +appDelegates: List&lt;IAppDelegate&gt;;
-	  -_delayedFuture: dynamic;
-	  +isInitialized: dynamic
-	  |
-	  +dynamic onAppStart();
-	  -dynamic _callDelegates()
-	]
-	
-	[StudyMonitorScreen
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
-	
-	[LoginForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build()
-	]
-	
-	[LoginForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
-	
-	[PasswordRecoveryForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build()
-	]
-	
-	[PasswordRecoveryForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
-	
-	[PasswordForgotForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build()
-	]
-	
-	[PasswordForgotForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
-	
-	[SignupForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build();
-	  -dynamic _onClickTermsOfUse();
-	  -dynamic _onClickPrivacyPolicy()
-	]
-	
-	[SignupForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
-	
-	[AuthScaffold
-	  |
-	  +body: Widget;
-	  +formKey: AuthFormKey;
-	  +leftContentMinWidth: double;
-	  +leftPanelMinWidth: double;
-	  +leftPanelPadding: EdgeInsets
-	]
-	
-	[AuthScaffold]o-[&lt;abstract&gt;Widget]
-	[AuthScaffold]o-[AuthFormKey]
-	[AuthScaffold]o-[EdgeInsets]
-	
-	[EmailTextField
-	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
-	]
-	
-	[EmailTextField]o-[FormControl]
-	
-	[PasswordTextField
-	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
-	]
-	
-	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
-	[PasswordTextField]o-[FormControl]
-	
-	[StudyUJobsToBeDone
-	  |
-	  +Widget build()
-	]
-	
-	[AuthFormController
-	  |
-	  +authRepository: IAuthRepository;
-	  +notificationService: INotificationService;
-	  +router: GoRouter;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +passwordControl: FormControl&lt;String&gt;;
-	  +passwordConfirmationControl: FormControl&lt;String&gt;;
-	  +termsOfServiceControl: FormControl&lt;bool&gt;;
-	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +loginForm: FormGroup;
-	  +signupForm: FormGroup;
-	  +passwordForgotForm: FormGroup;
-	  +passwordRecoveryForm: FormGroup;
-	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  -_formKey: AuthFormKey;
-	  +formKey: AuthFormKey;
-	  +form: FormGroup
-	  |
-	  -dynamic _getFormFor();
-	  -dynamic _onChangeFormKey();
-	  +dynamic resetControlsFor();
-	  -dynamic _forceValidationMessages();
-	  +dynamic signUp();
-	  -dynamic _signUp();
-	  +dynamic signIn();
-	  -dynamic _signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic sendPasswordResetLink();
-	  +dynamic recoverPassword();
-	  +dynamic updateUser();
-	  -dynamic _readDebugUser()
-	]
-	
-	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
-	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
-	[AuthFormController]o-[GoRouter]
-	[AuthFormController]o-[FormControl]
-	[AuthFormController]o-[FormGroup]
-	[AuthFormController]o-[AuthFormKey]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[AuthFormController]
-	
-	[AuthFormKey
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AuthFormKey&gt;;
-	  &lt;static&gt;+login: AuthFormKey;
-	  &lt;static&gt;+signup: AuthFormKey;
-	  &lt;static&gt;+passwordForgot: AuthFormKey;
-	  &lt;static&gt;+passwordRecovery: AuthFormKey;
-	  &lt;static&gt;-_loginSubmit: AuthFormKey;
-	  &lt;static&gt;-_signupSubmit: AuthFormKey
-	]
-	
-	[AuthFormKey]o-[AuthFormKey]
-	[Enum]&lt;:--[AuthFormKey]
-	
-	[AppStatus
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
-	  &lt;static&gt;+initializing: AppStatus;
-	  &lt;static&gt;+initialized: AppStatus
-	]
-	
-	[AppStatus]o-[AppStatus]
-	[Enum]&lt;:--[AppStatus]
-	
-	[FormArrayTable
-	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +items: List&lt;T&gt;;
-	  +onSelectItem: void Function(T);
-	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
-	  +onNewItem: void Function()?;
-	  +rowTitle: String Function(T);
-	  +onNewItemLabel: String;
-	  +sectionTitle: String?;
-	  +sectionDescription: String?;
-	  +emptyIcon: IconData?;
-	  +emptyTitle: String?;
-	  +emptyDescription: String?;
-	  +sectionTitleDivider: bool?;
-	  +rowPrefix: Widget Function(BuildContext, T, int)?;
-	  +rowSuffix: Widget Function(BuildContext, T, int)?;
-	  +leadingWidget: Widget?;
-	  +itemsSectionPadding: EdgeInsets?;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
-	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow();
-	  -Widget _newItemButton()
-	]
-	
-	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
-	[FormArrayTable]o-[void Function(T)]
-	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
-	[FormArrayTable]o-[void Function()?]
-	[FormArrayTable]o-[String Function(T)]
-	[FormArrayTable]o-[IconData]
-	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
-	[FormArrayTable]o-[&lt;abstract&gt;Widget]
-	[FormArrayTable]o-[EdgeInsets]
-	
-	[&lt;abstract&gt;ManagedFormViewModel
-	  |
-	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
-	]
-	
-	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
-	
-	[FormViewModelNotFoundException
-	]
-	
-	[Exception]&lt;:--[FormViewModelNotFoundException]
-	
-	[FormViewModelCollection
-	  |
-	  +formViewModels: List&lt;T&gt;;
-	  +formArray: FormArray&lt;dynamic&gt;;
-	  +stagedViewModels: List&lt;T&gt;;
-	  +retrievableViewModels: List&lt;T&gt;;
-	  +formData: List&lt;D&gt;
-	  |
-	  +void add();
-	  +T remove();
-	  +T? findWhere();
-	  +T? removeWhere();
-	  +bool contains();
-	  +void stage();
-	  +T commit();
-	  +void reset();
-	  +void read()
-	]
-	
-	[FormViewModelCollection]o-[FormArray]
-	
-	[CustomFormControl
-	  |
-	  -_onValueChangedDebouncer: Debouncer?;
-	  -_onStatusChangedDebouncer: Debouncer?;
-	  +onValueChanged: void Function(T?)?;
-	  +onStatusChanged: void Function(ControlStatus)?;
-	  +onStatusChangedDebounceTime: int?;
-	  +onValueChangedDebounceTime: int?
-	  |
-	  +void dispose()
-	]
-	
-	[CustomFormControl]o-[Debouncer]
-	[CustomFormControl]o-[void Function(T?)?]
-	[CustomFormControl]o-[void Function(ControlStatus)?]
-	[FormControl]&lt;:-[CustomFormControl]
-	
-	[UnsavedChangesDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;FormValidationSetEnum
-	]
-	
-	[FormControlValidation
-	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
-	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
-	  +validationMessages: Map&lt;String, String Function(Object)&gt;
-	  |
-	  +FormControlValidation merge()
-	]
-	
-	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
-	
-	[&lt;abstract&gt;IFormData
-	  |
-	  +id: String
-	  |
-	  +IFormData copy()
-	]
-	
-	[FormInvalidException
-	]
-	
-	[Exception]&lt;:--[FormInvalidException]
-	
-	[FormConfigException
-	  |
-	  +message: String?
-	]
-	
-	[Exception]&lt;:--[FormConfigException]
-	
-	[&lt;abstract&gt;IFormViewModelDelegate
-	  |
-	  +dynamic onSave();
-	  +void onCancel()
-	]
-	
-	[&lt;abstract&gt;IFormGroupController
-	  |
-	  +form: FormGroup
-	]
-	
-	[&lt;abstract&gt;IFormGroupController]o-[FormGroup]
-	
-	[FormControlOption
-	  |
-	  +value: T;
-	  +label: String;
-	  +description: String?;
-	  +props: List&lt;Object?&gt;
-	]
-	
-	[&lt;abstract&gt;Equatable]&lt;:-[FormControlOption]
-	
-	[&lt;abstract&gt;FormViewModel
-	  |
-	  -_formData: T?;
-	  -_formMode: FormMode;
-	  -_validationSet: FormValidationSetEnum?;
-	  +delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?;
-	  +autosave: bool;
-	  -_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;;
-	  -_immediateFormChildrenListenerDebouncer: Debouncer?;
-	  -_autosaveOperation: CancelableOperation&lt;dynamic&gt;?;
-	  -_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  +prevFormValue: Map&lt;String, dynamic&gt;?;
-	  &lt;static&gt;-_formKey: String;
-	  +formData: T?;
-	  +formMode: FormMode;
-	  +isReadonly: bool;
-	  +validationSet: FormValidationSetEnum?;
-	  +isDirty: bool;
-	  +title: String;
-	  +isValid: bool;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;
-	  |
-	  -dynamic _setFormData();
-	  -dynamic _rememberDefaultControlValidators();
-	  -Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators();
-	  -dynamic _disableAllControls();
-	  -dynamic _formModeUpdated();
-	  -dynamic _restoreControlsFromFormData();
-	  +void revalidate();
-	  -void _applyValidationSet();
-	  +void read();
-	  +dynamic save();
-	  +dynamic cancel();
-	  +void enableAutosave();
-	  +void listenToImmediateFormChildren();
-	  +dynamic markFormGroupChanged();
-	  +void dispose();
-	  +void setControlsFrom();
-	  +T buildFormData();
-	  +void initControls()
-	]
-	
-	[&lt;abstract&gt;FormViewModel]o-[FormMode]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;FormValidationSetEnum]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;IFormViewModelDelegate]
-	[&lt;abstract&gt;FormViewModel]o-[Debouncer]
-	[&lt;abstract&gt;FormViewModel]o-[CancelableOperation]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[&lt;abstract&gt;FormViewModel]
-	
-	[FormMode
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;FormMode&gt;;
-	  &lt;static&gt;+create: FormMode;
-	  &lt;static&gt;+readonly: FormMode;
-	  &lt;static&gt;+edit: FormMode
-	]
-	
-	[FormMode]o-[FormMode]
-	[Enum]&lt;:--[FormMode]
-	
-	[EnrolledBadge
-	  |
-	  +enrolledCount: int
-	  |
-	  +Widget build()
-	]
-	
-	[StudyRecruitController
-	  |
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
-	  |
-	  -dynamic _subscribeInvites();
-	  +Intervention? getIntervention();
-	  +int getParticipantCountForInvite();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void dispose()
-	]
-	
-	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[StudyRecruitController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyRecruitController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
-	
-	[StudyRecruitScreen
-	  |
-	  +Widget build();
-	  -Widget _inviteCodesSectionHeader();
-	  -Widget _newInviteCodeButton();
-	  -dynamic _onSelectInvite()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
-	
-	[InviteCodeFormView
-	  |
-	  +formViewModel: InviteCodeFormViewModel
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
-	]
-	
-	[InviteCodeFormView]o-[InviteCodeFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
-	
-	[StudyInvitesTable
-	  |
-	  +invites: List&lt;StudyInvite&gt;;
-	  +onSelect: void Function(StudyInvite);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getIntervention: Intervention? Function(String);
-	  +getParticipantCountForInvite: int Function(StudyInvite)
-	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow()
-	]
-	
-	[StudyInvitesTable]o-[void Function(StudyInvite)]
-	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
-	[StudyInvitesTable]o-[Intervention? Function(String)]
-	[StudyInvitesTable]o-[int Function(StudyInvite)]
-	
-	[InviteCodeFormViewModel
-	  |
-	  +study: Study;
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  +codeControl: FormControl&lt;String&gt;;
-	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
-	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +interventionAControl: FormControl&lt;String&gt;;
-	  +interventionBControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
-	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +isPreconfiguredSchedule: bool;
-	  +preconfiguredSchedule: List&lt;String&gt;?
-	  |
-	  +void initControls();
-	  -dynamic _uniqueInviteCode();
-	  +void regenerateCode();
-	  -String _generateCode();
-	  +StudyInvite buildFormData();
-	  +void setControlsFrom();
-	  +dynamic save()
-	]
-	
-	[InviteCodeFormViewModel]o-[Study]
-	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[InviteCodeFormViewModel]o-[FormControl]
-	[InviteCodeFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
-	
-	[PublishSuccessDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
-	
-	[PublishDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
-	
-	[PublishConfirmationDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
-	
-	[FrameControlsWidget
-	  |
-	  +onRefresh: void Function()?;
-	  +onOpenNewTab: void Function()?;
-	  +enabled: bool
-	  |
-	  +Widget build()
-	]
-	
-	[FrameControlsWidget]o-[void Function()?]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel
-	  |
-	  +studyParticipation: Participation?;
-	  +studyStatus: StudyStatus?
-	]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
-	
-	[StudyStatusBadge
-	  |
-	  +participation: Participation?;
-	  +status: StudyStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
-	  |
-	  +Widget build()
-	]
-	
-	[StudyStatusBadge]o-[Participation]
-	[StudyStatusBadge]o-[StudyStatus]
-	[StudyStatusBadge]o-[BadgeType]
-	
-	[RouteInformation
-	  |
-	  +route: String?;
-	  +extra: String?;
-	  +cmd: String?;
-	  +data: String?
-	  |
-	  +String toString()
-	]
-	
-	[&lt;abstract&gt;PlatformController
-	  |
-	  +studyId: String;
-	  +baseSrc: String;
-	  +previewSrc: String;
-	  +routeInformation: RouteInformation;
-	  +frameWidget: Widget
-	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void listen();
-	  +void send();
-	  +void openNewPage()
-	]
-	
-	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
-	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
-	
-	[WebController
-	  |
-	  +iFrameElement: IFrameElement
-	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void openNewPage();
-	  +void listen();
-	  +void send()
-	]
-	
-	[WebController]o-[IFrameElement]
-	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
-	
-	[MobileController
-	  |
-	  +void openNewPage();
-	  +void refresh();
-	  +void registerViews();
-	  +void listen();
-	  +void send();
-	  +void navigate();
-	  +void activate();
-	  +void generateUrl()
-	]
-	
-	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
-	
-	[StudyController
-	  |
-	  +notificationService: INotificationService;
-	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
-	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
-	  |
-	  +dynamic syncStudyStatus();
-	  +dynamic onStudySubscriptionUpdate();
-	  -dynamic _redirectNewToActualStudyID();
-	  +dynamic publishStudy();
-	  +void onChangeStudyParticipation();
-	  +void onAddParticipants();
-	  +void onSettingsPressed();
-	  +void dispose()
-	]
-	
-	[StudyController]o-[&lt;abstract&gt;INotificationService]
-	[StudyController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyController]
-	
-	[&lt;abstract&gt;IStudyNavViewModel
-	  |
-	  +isEditTabEnabled: bool;
-	  +isTestTabEnabled: bool;
-	  +isRecruitTabEnabled: bool;
-	  +isMonitorTabEnabled: bool;
-	  +isAnalyzeTabEnabled: bool;
-	  +isSettingsEnabled: bool
-	]
-	
-	[StudyNav
-	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic edit();
-	  &lt;static&gt;+dynamic test();
-	  &lt;static&gt;+dynamic recruit();
-	  &lt;static&gt;+dynamic monitor();
-	  &lt;static&gt;+dynamic analyze()
-	]
-	
-	[StudyDesignNav
-	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic info();
-	  &lt;static&gt;+dynamic enrollment();
-	  &lt;static&gt;+dynamic interventions();
-	  &lt;static&gt;+dynamic measurements();
-	  &lt;static&gt;+dynamic reports()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget
-	  |
-	  +studyId: String
-	  |
-	  +Widget? banner()
-	]
-	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
-	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
-	
-	[StudyParticipationBadge
-	  |
-	  +participation: Participation;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +center: bool
-	  |
-	  +Widget build()
-	]
-	
-	[StudyParticipationBadge]o-[Participation]
-	[StudyParticipationBadge]o-[BadgeType]
-	
-	[StudyBaseController
-	  |
-	  +studyId: String;
-	  +studyRepository: IStudyRepository;
-	  +router: GoRouter;
-	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
-	  |
-	  +dynamic subscribeStudy();
-	  +dynamic onStudySubscriptionUpdate();
-	  +dynamic onStudySubscriptionError();
-	  +void dispose()
-	]
-	
-	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyBaseController]o-[GoRouter]
-	[StudyBaseController]o-[StreamSubscription]
-	
-	[PreviewFrame
-	  |
-	  +studyId: String;
-	  +routeArgs: StudyFormRouteArgs?;
-	  +route: String?
-	]
-	
-	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
-	
-	[&lt;abstract&gt;IStudyAppBarViewModel
-	  |
-	  +isSyncIndicatorVisible: bool;
-	  +isStatusBadgeVisible: bool;
-	  +isPublishVisible: bool
-	]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	
-	[StudyScaffold
-	  |
-	  +studyId: String;
-	  +tabs: List&lt;NavbarTab&gt;?;
-	  +tabsSubnav: List&lt;NavbarTab&gt;?;
-	  +selectedTab: NavbarTab?;
-	  +selectedTabSubnav: NavbarTab?;
-	  +body: StudyPageWidget;
-	  +drawer: Widget?;
-	  +disableActions: bool;
-	  +actionsSpacing: double;
-	  +actionsPadding: double;
-	  +layoutType: SingleColumnLayoutType?;
-	  +appbarHeight: double;
-	  +appbarSubnavHeight: double
-	]
-	
-	[StudyScaffold]o-[NavbarTab]
-	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
-	[StudyScaffold]o-[&lt;abstract&gt;Widget]
-	[StudyScaffold]o-[SingleColumnLayoutType]
-	
-	[WebFrame
-	  |
-	  +previewSrc: String;
-	  +studyId: String
-	  |
-	  +Widget build()
-	]
-	
-	[DisabledFrame
-	  |
-	  +Widget build()
-	]
-	
-	[PhoneContainer
-	  |
-	  &lt;static&gt;+defaultWidth: double;
-	  &lt;static&gt;+defaultHeight: double;
-	  +width: double;
-	  +height: double;
-	  +borderColor: Color;
-	  +borderWidth: double;
-	  +borderRadius: double;
-	  +innerContent: Widget;
-	  +innerContentBackgroundColor: Color?
-	  |
-	  +Widget build()
-	]
-	
-	[PhoneContainer]o-[Color]
-	[PhoneContainer]o-[&lt;abstract&gt;Widget]
-	
-	[MobileFrame
-	  |
-	  +Widget build()
-	]
-	
-	[DesktopFrame
-	  |
-	  +Widget build()
-	]
-	
-	[StudyTestScreen
-	  |
-	  +previewRoute: String?
-	  |
-	  +Widget build();
-	  +Widget? banner();
-	  +dynamic load();
-	  +dynamic save();
-	  +dynamic showHelp()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
-	
-	[StudySettingsFormViewModel
-	  |
-	  +study: AsyncValue&lt;Study&gt;;
-	  +studyRepository: IStudyRepository;
-	  &lt;static&gt;+defaultPublishedToRegistry: bool;
-	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
-	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
-	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +dynamic keepControlsSynced();
-	  +dynamic save();
-	  +dynamic setLaunchDefaults()
-	]
-	
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudySettingsFormViewModel]o-[FormControl]
-	[StudySettingsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
-	
-	[StudySettingsDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
-	
-	[StudyTestController
-	  |
-	  +authRepository: IAuthRepository;
-	  +languageCode: String
-	]
-	
-	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyBaseController]&lt;:-[StudyTestController]
-	
-	[TestAppRoutes
-	  |
-	  &lt;static&gt;+studyOverview: String;
-	  &lt;static&gt;+eligibility: String;
-	  &lt;static&gt;+intervention: String;
-	  &lt;static&gt;+consent: String;
-	  &lt;static&gt;+journey: String;
-	  &lt;static&gt;+dashboard: String
-	]
-	
-	[DrawerEntry
-	  |
-	  +localizedTitle: String Function();
-	  +icon: IconData?;
-	  +localizedHelpText: String Function()?;
-	  +enabled: bool;
-	  +onSelected: void Function(BuildContext, WidgetRef)?;
-	  +autoCloseDrawer: bool;
-	  +title: String;
-	  +helpText: String?
-	  |
-	  +void onClick()
-	]
-	
-	[DrawerEntry]o-[String Function()]
-	[DrawerEntry]o-[IconData]
-	[DrawerEntry]o-[String Function()?]
-	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
-	
-	[GoRouterDrawerEntry
-	  |
-	  +intent: RoutingIntent;
-	  +onNavigated: void Function()?
-	  |
-	  +void onClick()
-	]
-	
-	[GoRouterDrawerEntry]o-[RoutingIntent]
-	[GoRouterDrawerEntry]o-[void Function()?]
-	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
-	
-	[AppDrawer
-	  |
-	  +width: int;
-	  +autoCloseDrawer: bool;
-	  +leftPaddingEntries: double;
-	  +logoPaddingVertical: double;
-	  +logoPaddingHorizontal: double;
-	  +logoMaxHeight: double;
-	  +logoSectionMinHeight: double;
-	  +logoSectionMaxHeight: double
-	]
-	
-	[StudyAnalyzeScreen
-	  |
-	  +Widget? banner();
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
-	
-	[StudyAnalyzeController
-	  |
-	  +dynamic onExport()
-	]
-	
-	[StudyBaseController]&lt;:-[StudyAnalyzeController]
-	
-	[StudyDesignInterventionsFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
-	
-	[InterventionFormView
-	  |
-	  +formViewModel: InterventionFormViewModel
-	]
-	
-	[InterventionFormView]o-[InterventionFormViewModel]
-	
-	[InterventionPreview
-	  |
-	  +routeArgs: InterventionFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPreview]o-[InterventionFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
-	
-	[StudyScheduleFormView
-	  |
-	  +formViewModel: StudyScheduleControls
-	  |
-	  -FormTableRow _renderCustomSequence();
-	  +Widget build()
-	]
-	
-	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
-	
-	[InterventionTaskFormData
-	  |
-	  +taskId: String;
-	  +taskTitle: String;
-	  +taskDescription: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +CheckmarkTask toTask();
-	  +InterventionTaskFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
-	
-	[InterventionsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +interventionsArray: FormArray&lt;dynamic&gt;;
-	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
-	  +form: FormGroup;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +interventionsRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestStudySchedule: bool
-	  |
-	  +void setControlsFrom();
-	  +InterventionsFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +InterventionFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +dynamic testStudySchedule()
-	]
-	
-	[InterventionsFormViewModel]o-[Study]
-	[InterventionsFormViewModel]o-[GoRouter]
-	[InterventionsFormViewModel]o-[FormArray]
-	[InterventionsFormViewModel]o-[FormViewModelCollection]
-	[InterventionsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
-	
-	[InterventionTaskFormViewModel
-	  |
-	  +taskIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +taskTitleControl: FormControl&lt;String&gt;;
-	  +taskDescriptionControl: FormControl&lt;String&gt;;
-	  +markAsCompletedControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +taskId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +InterventionTaskFormData buildFormData();
-	  +InterventionTaskFormViewModel createDuplicate()
-	]
-	
-	[InterventionTaskFormViewModel]o-[FormControl]
-	[InterventionTaskFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
-	
-	[&lt;abstract&gt;StudyScheduleControls
-	  |
-	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
-	  &lt;static&gt;+defaultScheduleTypeSequence: String;
-	  &lt;static&gt;+defaultNumCycles: int;
-	  &lt;static&gt;+defaultPeriodLength: int;
-	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
-	  +phaseDurationControl: FormControl&lt;int&gt;;
-	  +numCyclesControl: FormControl&lt;int&gt;;
-	  +includeBaselineControl: FormControl&lt;bool&gt;;
-	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  &lt;static&gt;+kNumCyclesMin: int;
-	  &lt;static&gt;+kNumCyclesMax: int;
-	  &lt;static&gt;+kPhaseDurationMin: int;
-	  &lt;static&gt;+kPhaseDurationMax: int;
-	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +numCyclesRange: dynamic;
-	  +phaseDurationRange: dynamic;
-	  +customSequenceRequired: dynamic
-	  |
-	  +void setStudyScheduleControlsFrom();
-	  +StudyScheduleFormData buildStudyScheduleFormData();
-	  +bool isSequencingCustom()
-	]
-	
-	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
-	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
-	
-	[InterventionFormData
-	  |
-	  +interventionId: String;
-	  +title: String;
-	  +description: String?;
-	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
-	  +iconName: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +Intervention toIntervention();
-	  +InterventionFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
-	
-	[StudyScheduleFormData
-	  |
-	  +sequenceType: PhaseSequence;
-	  +sequenceTypeCustom: String;
-	  +numCycles: int;
-	  +phaseDuration: int;
-	  +includeBaseline: bool;
-	  +id: String
-	  |
-	  +StudySchedule toStudySchedule();
-	  +Study apply();
-	  +StudyScheduleFormData copy()
-	]
-	
-	[StudyScheduleFormData]o-[PhaseSequence]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
-	
-	[InterventionTaskFormView
-	  |
-	  +formViewModel: InterventionTaskFormViewModel
-	]
-	
-	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
-	
-	[InterventionsFormData
-	  |
-	  +interventionsData: List&lt;InterventionFormData&gt;;
-	  +studyScheduleData: StudyScheduleFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +InterventionsFormData copy()
-	]
-	
-	[InterventionsFormData]o-[StudyScheduleFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
-	
-	[InterventionFormViewModel
-	  |
-	  +study: Study;
-	  +interventionIdControl: FormControl&lt;String&gt;;
-	  +interventionTitleControl: FormControl&lt;String&gt;;
-	  +interventionIconControl: FormControl&lt;IconOption&gt;;
-	  +interventionDescriptionControl: FormControl&lt;String&gt;;
-	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
-	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
-	  +form: FormGroup;
-	  +interventionId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneTask: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +InterventionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +InterventionTaskFormViewModel provide();
-	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
-	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
-	  +InterventionFormViewModel createDuplicate()
-	]
-	
-	[InterventionFormViewModel]o-[Study]
-	[InterventionFormViewModel]o-[FormControl]
-	[InterventionFormViewModel]o-[FormArray]
-	[InterventionFormViewModel]o-[FormViewModelCollection]
-	[InterventionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
-	
-	[StudyDesignReportsFormView
-	  |
-	  +Widget build();
-	  -dynamic _showReportItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
-	
-	[ReportItemFormData
-	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
-	  +id: String
-	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
-	]
-	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
-	
-	[DataReferenceEditor
-	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
-	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
-	]
-	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
-	
-	[TemporalAggregationFormatted
-	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
-	]
-	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
-	
-	[ImprovementDirectionFormatted
-	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
-	]
-	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
-	
-	[ReportSectionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
-	]
-	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
-	
-	[AverageSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
-	
-	[DataReferenceIdentifier
-	  |
-	  +hashCode: int
-	  |
-	  +bool ==()
-	]
-	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
-	
-	[LinearRegressionSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
-	
-	[ReportItemFormViewModel
-	  |
-	  &lt;static&gt;+defaultSectionType: ReportSectionType;
-	  +sectionIdControl: FormControl&lt;String&gt;;
-	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +sectionControl: FormControl&lt;ReportSection&gt;;
-	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
-	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
-	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
-	  +alphaControl: FormControl&lt;double&gt;;
-	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +form: FormGroup;
-	  +sectionId: String;
-	  +sectionType: ReportSectionType;
-	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
-	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
-	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +dataReferenceRequired: dynamic;
-	  +aggregationRequired: dynamic;
-	  +improvementDirectionRequired: dynamic;
-	  +alphaConfidenceRequired: dynamic
-	  |
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +ReportItemFormData buildFormData();
-	  +ReportItemFormViewModel createDuplicate();
-	  +dynamic onSectionTypeChanged();
-	  -void _updateFormControls();
-	  +void setControlsFrom()
-	]
-	
-	[ReportItemFormViewModel]o-[ReportSectionType]
-	[ReportItemFormViewModel]o-[FormControl]
-	[ReportItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
-	
-	[ReportItemFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
-	  |
-	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
-	]
-	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
-	
-	[ReportsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +reportItemDelegate: ReportFormItemDelegate;
-	  +reportItemArray: FormArray&lt;dynamic&gt;;
-	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +form: FormGroup;
-	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestConsent: bool
-	  |
-	  +void setControlsFrom();
-	  +ReportsFormData buildFormData();
-	  +void read();
-	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
-	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
-	  +dynamic testReport();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide()
-	]
-	
-	[ReportsFormViewModel]o-[Study]
-	[ReportsFormViewModel]o-[GoRouter]
-	[ReportsFormViewModel]o-[ReportFormItemDelegate]
-	[ReportsFormViewModel]o-[FormArray]
-	[ReportsFormViewModel]o-[FormViewModelCollection]
-	[ReportsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
-	
-	[ReportFormItemDelegate
-	  |
-	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +owner: ReportsFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
-	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
-	]
-	
-	[ReportFormItemDelegate]o-[FormViewModelCollection]
-	[ReportFormItemDelegate]o-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
-	
-	[ReportBadge
-	  |
-	  +status: ReportStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
-	  |
-	  +Widget build()
-	]
-	
-	[ReportBadge]o-[ReportStatus]
-	[ReportBadge]o-[BadgeType]
-	
-	[ReportsFormData
-	  |
-	  +reportItems: List&lt;ReportItemFormData&gt;;
-	  +id: String
-	  |
-	  +Study apply();
-	  +ReportsFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
-	
-	[ReportStatus
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
-	  &lt;static&gt;+primary: ReportStatus;
-	  &lt;static&gt;+secondary: ReportStatus
-	]
-	
-	[ReportStatus]o-[ReportStatus]
-	[Enum]&lt;:--[ReportStatus]
-	
-	[&lt;abstract&gt;IStudyFormData
-	  |
-	  +Study apply()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
-	
-	[StudyInfoFormViewModel
-	  |
-	  +study: Study;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +organizationControl: FormControl&lt;String&gt;;
-	  +reviewBoardControl: FormControl&lt;String&gt;;
-	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
-	  +researchersControl: FormControl&lt;String&gt;;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +websiteControl: FormControl&lt;String&gt;;
-	  +phoneControl: FormControl&lt;String&gt;;
-	  +additionalInfoControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +iconRequired: dynamic;
-	  +organizationRequired: dynamic;
-	  +reviewBoardRequired: dynamic;
-	  +reviewBoardNumberRequired: dynamic;
-	  +researchersRequired: dynamic;
-	  +emailRequired: dynamic;
-	  +phoneRequired: dynamic;
-	  +emailFormat: dynamic;
-	  +websiteFormat: dynamic
-	  |
-	  +void setControlsFrom();
-	  +StudyInfoFormData buildFormData()
-	]
-	
-	[StudyInfoFormViewModel]o-[Study]
-	[StudyInfoFormViewModel]o-[FormControl]
-	[StudyInfoFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
-	
-	[StudyDesignInfoFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
-	
-	[StudyInfoFormData
-	  |
-	  +title: String;
-	  +description: String?;
-	  +iconName: String;
-	  +contactInfoFormData: StudyContactInfoFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
-	]
-	
-	[StudyInfoFormData]o-[StudyContactInfoFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
-	
-	[StudyContactInfoFormData
-	  |
-	  +organization: String?;
-	  +institutionalReviewBoard: String?;
-	  +institutionalReviewBoardNumber: String?;
-	  +researchers: String?;
-	  +email: String?;
-	  +website: String?;
-	  +phone: String?;
-	  +additionalInfo: String?;
-	  +id: String
-	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
-	
-	[StudyFormValidationSet
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
-	]
-	
-	[Enum]&lt;:--[StudyFormValidationSet]
-	
-	[MeasurementsFormData
-	  |
-	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
-	  +id: String
-	  |
-	  +Study apply();
-	  +MeasurementsFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
-	
-	[MeasurementSurveyFormView
-	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
-	]
-	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
-	
-	[SurveyPreview
-	  |
-	  +routeArgs: MeasurementFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
-	
-	[MeasurementSurveyFormData
-	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
-	]
-	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
-	
-	[MeasurementSurveyFormViewModel
-	  |
-	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
-	]
-	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
-	
-	[StudyDesignMeasurementsFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
-	
-	[MeasurementsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +measurementsArray: FormArray&lt;dynamic&gt;;
-	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
-	  +form: FormGroup;
-	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +measurementRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +MeasurementsFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +MeasurementSurveyFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave()
-	]
-	
-	[MeasurementsFormViewModel]o-[Study]
-	[MeasurementsFormViewModel]o-[GoRouter]
-	[MeasurementsFormViewModel]o-[FormArray]
-	[MeasurementsFormViewModel]o-[FormViewModelCollection]
-	[MeasurementsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
-	
-	[StudyFormScaffold
-	  |
-	  +studyId: String;
-	  +formViewModelBuilder: T Function(WidgetRef);
-	  +formViewBuilder: Widget Function(T)
-	  |
-	  +Widget build()
-	]
-	
-	[StudyFormScaffold]o-[T Function(WidgetRef)]
-	[StudyFormScaffold]o-[Widget Function(T)]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
-	
-	[ConsentItemFormViewModel
-	  |
-	  +consentIdControl: FormControl&lt;String&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +form: FormGroup;
-	  +consentId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +ConsentItemFormData buildFormData();
-	  +ConsentItemFormViewModel createDuplicate()
-	]
-	
-	[ConsentItemFormViewModel]o-[FormControl]
-	[ConsentItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
-	
-	[StudyDesignEnrollmentFormView
-	  |
-	  +Widget build();
-	  -dynamic _showScreenerQuestionSidesheetWithArgs();
-	  -dynamic _showConsentItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
-	
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
-	  |
-	  +isDirtyOptionsBannerVisible: bool
-	]
-	
-	[ScreenerQuestionLogicFormView
-	  |
-	  +formViewModel: ScreenerQuestionFormViewModel
-	  |
-	  +Widget build();
-	  -dynamic _buildInfoBanner();
-	  -dynamic _buildAnswerOptionsLogicControls();
-	  -List&lt;Widget&gt; _buildOptionLogicRow()
-	]
-	
-	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
-	
-	[ConsentItemFormData
-	  |
-	  +consentId: String;
-	  +title: String;
-	  +description: String;
-	  +iconName: String?;
-	  +id: String
-	  |
-	  +ConsentItem toConsentItem();
-	  +ConsentItemFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
-	
-	[ConsentItemFormView
-	  |
-	  +formViewModel: ConsentItemFormViewModel
-	]
-	
-	[ConsentItemFormView]o-[ConsentItemFormViewModel]
-	
-	[EnrollmentFormData
-	  |
-	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
-	  +enrollmentType: Participation;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
-	  +id: String
-	  |
-	  +Study apply();
-	  +EnrollmentFormData copy()
-	]
-	
-	[EnrollmentFormData]o-[Participation]
-	[EnrollmentFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
-	
-	[ScreenerQuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultResponseOptionValidity: bool;
-	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
-	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
-	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
-	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionValues: List&lt;dynamic&gt;;
-	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isDirtyOptionsBannerVisible: bool
-	  |
-	  +dynamic onResponseOptionsChanged();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
-	  +ScreenerQuestionFormViewModel createDuplicate()
-	]
-	
-	[ScreenerQuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
-	
-	[EnrollmentFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
-	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
-	  +consentItemArray: FormArray&lt;dynamic&gt;;
-	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +form: FormGroup;
-	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
-	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestScreener: bool;
-	  +canTestConsent: bool;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setControlsFrom();
-	  +EnrollmentFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
-	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
-	  +dynamic testScreener();
-	  +dynamic testConsent();
-	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
-	]
-	
-	[EnrollmentFormViewModel]o-[Study]
-	[EnrollmentFormViewModel]o-[GoRouter]
-	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
-	[EnrollmentFormViewModel]o-[FormControl]
-	[EnrollmentFormViewModel]o-[FormArray]
-	[EnrollmentFormViewModel]o-[FormViewModelCollection]
-	[EnrollmentFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
-	
-	[EnrollmentFormConsentItemDelegate
-	  |
-	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +owner: EnrollmentFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
-	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ConsentItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
-	]
-	
-	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
-	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
-	
-	[StudyFormViewModel
-	  |
-	  +studyDirtyCopy: Study?;
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +router: GoRouter;
-	  +studyInfoFormViewModel: StudyInfoFormViewModel;
-	  +enrollmentFormViewModel: EnrollmentFormViewModel;
-	  +measurementsFormViewModel: MeasurementsFormViewModel;
-	  +reportsFormViewModel: ReportsFormViewModel;
-	  +interventionsFormViewModel: InterventionsFormViewModel;
-	  +form: FormGroup;
-	  +isStudyReadonly: bool;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +void dispose();
-	  +void onCancel();
-	  +dynamic onSave();
-	  -dynamic _applyAndSaveSubform()
-	]
-	
-	[StudyFormViewModel]o-[Study]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyFormViewModel]o-[GoRouter]
-	[StudyFormViewModel]o-[StudyInfoFormViewModel]
-	[StudyFormViewModel]o-[EnrollmentFormViewModel]
-	[StudyFormViewModel]o-[MeasurementsFormViewModel]
-	[StudyFormViewModel]o-[ReportsFormViewModel]
-	[StudyFormViewModel]o-[InterventionsFormViewModel]
-	[StudyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls
-	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
-	  +void read();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
-	]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	
-	[QuestionnaireFormData
-	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
-	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
-	
-	[&lt;abstract&gt;QuestionFormData
-	  |
-	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
-	  +questionId: String;
-	  +questionText: String;
-	  +questionInfoText: String?;
-	  +questionType: SurveyQuestionType;
-	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
-	  +responseOptions: List&lt;dynamic&gt;;
-	  +id: String
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +EligibilityCriterion toEligibilityCriterion();
-	  +Answer&lt;dynamic&gt; constructAnswerFor();
-	  +dynamic setResponseOptionsValidityFrom();
-	  +QuestionFormData copy()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
-	
-	[ChoiceQuestionFormData
-	  |
-	  +isMultipleChoice: bool;
-	  +answerOptions: List&lt;String&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +QuestionFormData copy();
-	  -Choice _buildChoiceForValue();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
-	
-	[BoolQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +BoolQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
-	
-	[ImageQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +ImageQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
-	
-	[AudioQuestionFormData
-	  |
-	  +maxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +AudioQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
-	
-	[ScaleQuestionFormData
-	  |
-	  +minValue: double;
-	  +maxValue: double;
-	  +minLabel: String?;
-	  +maxLabel: String?;
-	  +midValues: List&lt;double?&gt;;
-	  +midLabels: List&lt;String?&gt;;
-	  +stepSize: double;
-	  +initialValue: double?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +responseOptions: List&lt;double&gt;;
-	  +midAnnotations: List&lt;Annotation&gt;
-	  |
-	  +ScaleQuestion toQuestion();
-	  +QuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[ScaleQuestionFormData]o-[Color]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
-	
-	[FreeTextQuestionFormData
-	  |
-	  +textLengthRange: List&lt;int&gt;;
-	  +textType: FreeTextQuestionType;
-	  +textTypeExpression: String?;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +FreeTextQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
-	
-	[AudioRecordingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
-	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
-	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
-	]
-	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
-	
-	[SurveyQuestionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
-	]
-	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[ImageCapturingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	]
-	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
-	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
-	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
-	[QuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
-	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
-	]
-	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
-	
-	[SurveyQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
-	]
-	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule
-	  |
-	  +instanceId: String;
-	  +isTimeLocked: bool;
-	  +timeLockStart: StudyUTimeOfDay?;
-	  +timeLockEnd: StudyUTimeOfDay?;
-	  +hasReminder: bool;
-	  +reminderTime: StudyUTimeOfDay?
-	  |
-	  +Schedule toSchedule()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
-	
-	[ScheduleControls
-	  |
-	  +formViewModel: WithScheduleControls
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
-	]
-	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
-	
-	[&lt;abstract&gt;WithScheduleControls
-	  |
-	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
-	  +instanceID: FormControl&lt;String&gt;;
-	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +hasReminderControl: FormControl&lt;bool&gt;;
-	  +reminderTimeControl: FormControl&lt;Time&gt;;
-	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
-	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
-	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  +hasReminder: bool;
-	  +isTimeRestricted: bool;
-	  +timeRestriction: List&lt;Time&gt;?
-	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
-	]
-	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget
-	  |
-	  +Widget? banner()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
-	
-	[StudiesTableColumnHeader
-	  |
-	  +title: String;
-	  +sortable: bool;
-	  +sortAscending: bool;
-	  +sortingActive: bool;
-	  +onSort: void Function()?
-	]
-	
-	[StudiesTableColumnHeader]o-[void Function()?]
-	
-	[DashboardScreen
-	  |
-	  +filter: StudiesFilter?
-	]
-	
-	[DashboardScreen]o-[StudiesFilter]
-	
-	[DashboardScaffold
-	  |
-	  &lt;static&gt;+compactWidthThreshold: double;
-	  +body: Widget
-	  |
-	  +Widget build()
-	]
-	
-	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
-	
-	[DashboardController
-	  |
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +userRepository: IUserRepository;
-	  +router: GoRouter;
-	  -_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?;
-	  +searchController: SearchController;
-	  +isSortAscending: bool
-	  |
-	  -dynamic _subscribeStudies();
-	  +dynamic setSearchText();
-	  +dynamic setStudiesFilter();
-	  +dynamic onSelectStudy();
-	  +dynamic onClickNewStudy();
-	  +dynamic pinStudy();
-	  +dynamic pinOffStudy();
-	  +void setSorting();
-	  +void filterStudies();
-	  +void sortStudies();
-	  +bool isSortingActiveForColumn();
-	  +bool isPinned();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void dispose()
-	]
-	
-	[DashboardController]o-[&lt;abstract&gt;IStudyRepository]
-	[DashboardController]o-[&lt;abstract&gt;IAuthRepository]
-	[DashboardController]o-[&lt;abstract&gt;IUserRepository]
-	[DashboardController]o-[GoRouter]
-	[DashboardController]o-[StreamSubscription]
-	[DashboardController]o-[SearchController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
-	
-	[StudiesFilter
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
-	]
-	
-	[Enum]&lt;:--[StudiesFilter]
-	
-	[StudiesTableColumnSize
-	  |
-	  +collapsed: bool;
-	  +flex: int?;
-	  +width: double?
-	  |
-	  +Widget createContainer()
-	]
-	
-	[StudiesTable
-	  |
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +compactWidthThreshold: double;
-	  +superCompactWidthThreshold: double;
-	  +compactStatTitleThreshold: double;
-	  +studies: List&lt;Study&gt;;
-	  +onSelect: void Function(Study);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study);
-	  +emptyWidget: Widget;
-	  +pinnedStudies: Iterable&lt;String&gt;;
-	  +dashboardController: DashboardController
-	  |
-	  +Widget build();
-	  -Widget _buildColumnHeader()
-	]
-	
-	[StudiesTable]o-[void Function(Study)]
-	[StudiesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)]
-	[StudiesTable]o-[&lt;abstract&gt;Widget]
-	[StudiesTable]o-[DashboardController]
-	
-	[StudiesTableColumn
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesTableColumn&gt;;
-	  &lt;static&gt;+pin: StudiesTableColumn;
-	  &lt;static&gt;+title: StudiesTableColumn;
-	  &lt;static&gt;+status: StudiesTableColumn;
-	  &lt;static&gt;+participation: StudiesTableColumn;
-	  &lt;static&gt;+createdAt: StudiesTableColumn;
-	  &lt;static&gt;+enrolled: StudiesTableColumn;
-	  &lt;static&gt;+active: StudiesTableColumn;
-	  &lt;static&gt;+completed: StudiesTableColumn;
-	  &lt;static&gt;+action: StudiesTableColumn
-	]
-	
-	[StudiesTableColumn]o-[StudiesTableColumn]
-	[Enum]&lt;:--[StudiesTableColumn]
-	
-	[StudiesTableItem
-	  |
-	  +study: Study;
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
-	  +isPinned: bool;
-	  +onPinnedChanged: void Function(Study, bool)?;
-	  +onTap: void Function(Study)?
-	]
-	
-	[StudiesTableItem]o-[Study]
-	[StudiesTableItem]o-[void Function(Study, bool)?]
-	[StudiesTableItem]o-[void Function(Study)?]
-	
-	[App
-	]
-	
-	[AppContent
-	]
-	
-	[AccountSettingsDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AccountSettingsDialog]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="3778.0" width="48837.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M19716.9 1408.0 L18636.75 1607 L18636.75 2265 L18636.8 2265.0 " fill="none"></path>
-					<path d="M19717.9 1413.3 L19716.9 1408.0 L19715.9 1402.8 L19730.0 1405.6 Z"></path>
-					<path d="M103.5 2361.2 L103.5 2985 L1100 3143.302597955707 L1100.0 3143.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M108.8 2351.8 L103.5 2361.2 L98.2 2351.8 L103.5 2342.5 Z"></path>
-					</g>
-					<path d="M737.6 1410.0 L103.5 1607 L103.5 2249.5 L103.5 2249.5 " fill="none"></path>
-					<path d="M739.2 1415.0 L737.6 1410.0 L736.1 1404.9 L750.4 1406.0 Z"></path>
-					<path d="M676.5 2361.2 L676.5 2985 L1100 3116.4188851913477 L1100.0 3116.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M681.8 2351.8 L676.5 2361.2 L671.2 2351.8 L676.5 2342.5 Z"></path>
-					</g>
-					<path d="M784.8 1417.6 L676.5 1607 L676.5 2249.5 L676.5 2249.5 " fill="none"></path>
-					<path d="M789.4 1420.2 L784.8 1417.6 L780.1 1414.9 L791.4 1406.0 Z"></path>
-					<path d="M924.0 2361.2 L924 2985 L1119.230563002681 3088 L1119.2 3088.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M929.3 2351.8 L924.0 2361.2 L918.7 2351.8 L924.0 2342.5 Z"></path>
-					</g>
-					<path d="M815.7 1417.6 L924 1607 L924 2249.5 L924.0 2249.5 " fill="none"></path>
-					<path d="M820.4 1414.9 L815.7 1417.6 L811.1 1420.2 L809.1 1406.0 Z"></path>
-					<path d="M1206.5 2376.2 L1206.5 2985 L1245.7117962466489 3088 L1245.7 3088.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1211.8 2366.8 L1206.5 2376.2 L1201.2 2366.8 L1206.5 2357.5 Z"></path>
-					</g>
-					<path d="M841.1 1412.3 L1206.5 1607 L1206.5 2234.5 L1206.5 2234.5 " fill="none"></path>
-					<path d="M843.6 1407.6 L841.1 1412.3 L838.6 1417.0 L829.3 1406.0 Z"></path>
-					<path d="M1353.2 1468.8 L1296 1607 L14216.25 2294.11207378963 L14216.3 2294.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1361.6 1462.2 L1353.2 1468.8 L1351.8 1458.1 L1360.3 1451.5 Z"></path>
-					</g>
-					<path d="M1385.5 1470.2 L1385.5 1607 L1385.5 2296 L1385.5 2296 L1385.5 2985 L1385.5 2985 L1325.8538873994637 3088 L1325.9 3088.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1390.8 1460.8 L1385.5 1470.2 L1380.2 1460.8 L1385.5 1451.5 Z"></path>
-					</g>
-					<path d="M1400.2 1469.9 L1425.5 1607 L3556.7022859216254 2280.5 L3556.7 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1403.7 1459.7 L1400.2 1469.9 L1393.2 1461.6 L1396.8 1451.5 Z"></path>
-					</g>
-					<path d="M1850.0 2368.2 L1850 2985 L32856 3171.1607726358147 L32856.0 3171.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1855.3 2358.8 L1850.0 2368.2 L1844.7 2358.8 L1850.0 2349.5 Z"></path>
-					</g>
-					<path d="M2267.1 2374.9 L2090 2985 L586.9879356568365 3156 L587.0 3156.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2274.8 2367.5 L2267.1 2374.9 L2264.6 2364.5 L2272.3 2357.0 Z"></path>
-					</g>
-					<path d="M2319.7 2374.5 L2550.5 2985 L32856 3171.1529461168566 L32856.0 3171.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2321.4 2363.8 L2319.7 2374.5 L2311.4 2367.6 L2313.1 2357.0 Z"></path>
-					</g>
-					<path d="M35524.8 2562.7 L34876.75 2985 L31289.5 3167.8803731292282 L31289.5 3167.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35535.5 2562.1 L35524.8 2562.7 L35529.7 2553.1 L35540.4 2552.5 Z"></path>
-					</g>
-					<path d="M35582.3 2563.8 L35029.25 2985 L16485.5 3170.6589966582114 L16485.5 3170.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35593.0 2562.4 L35582.3 2563.8 L35586.5 2553.9 L35597.2 2552.5 Z"></path>
-					</g>
-					<path d="M35597.5 2564.1 L35069.25 2985 L34499.75 3157.5617384240454 L34499.8 3157.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35608.1 2562.5 L35597.5 2564.1 L35601.4 2554.1 L35612.1 2552.5 Z"></path>
-					</g>
-					<path d="M36002.8 2570.6 L36106.5 2985 L32969 3168.200923606763 L32969.0 3168.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36005.7 2560.3 L36002.8 2570.6 L35995.3 2562.8 L35998.2 2552.5 Z"></path>
-					</g>
-					<path d="M36018.6 2570.3 L36146.5 2985 L39344.75 3168.4880027685917 L39344.8 3168.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36021.0 2559.8 L36018.6 2570.3 L36010.8 2563.0 L36013.1 2552.5 Z"></path>
-					</g>
-					<path d="M36034.4 2570.0 L36186.5 2985 L1455 3170.5517130252942 L1455.0 3170.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36036.2 2559.4 L36034.4 2570.0 L36026.2 2563.1 L36028.0 2552.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M38020.2 96.9 L35934 203 L35934 539.5 L35934 539.5 L35934 876 L35934 876 L35934 1025 L35934 1025 L35934 1174 L35934 1174 L35934 1390.5 L35934 1390.5 L35934 1607 L35934 1607 L35934 2039.5 L35934.0 2039.5 " fill="none"></path>
-					</g>
-					<path d="M38020.5 102.3 L38020.2 96.9 L38019.9 91.6 L38033.5 96.3 Z"></path>
-					<path d="M1472.3 3093.1 L1485 3088 L1492.5 3088 L1492.5 3088 L1500 3171.5 L1500 3171.5 L1492.5 3255 L1492.5 3255 L1485 3255 L1485 3255 L1455 3242.9277108433735 L1455.0 3242.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1461.7 3091.6 L1472.3 3093.1 L1465.6 3101.5 L1455.0 3100.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2994.6 2322.9 L2590.5 2985 L1455 3146.2876999238383 L1455.0 3146.3 " fill="none"></path>
-					</g>
-					<path d="M2999.1 2325.7 L2994.6 2322.9 L2990.0 2320.1 L3001.5 2311.5 Z"></path>
-					<path d="M1027.8 3121.9 L1040 3118 L1047.5 3118 L1047.5 3118 L1055 3171.5 L1055 3171.5 L1047.5 3225 L1047.5 3225 L1040 3225 L1040 3225 L1010 3215.5309734513276 L1010.0 3215.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1017.3 3119.6 L1027.8 3121.9 L1020.5 3129.7 L1010.0 3127.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2996.0 2323.2 L2630.5 2985 L1010 3156.7177556818183 L1010.0 3156.7 " fill="none"></path>
-					</g>
-					<path d="M3000.7 2325.8 L2996.0 2323.2 L2991.3 2320.6 L3002.4 2311.5 Z"></path>
-					<path d="M2204.8 1447.4 L1465.5 1607 L1465.5 2296 L1465.5 2296 L1465.5 2985 L1465.5 2985 L10354.25 3170.0634227345035 L10354.3 3170.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2215.0 1450.6 L2204.8 1447.4 L2212.8 1440.2 L2223.0 1443.4 Z"></path>
-					</g>
-					<path d="M2204.9 1454.5 L1577.5 1607 L1577.5 2280.5 L1577.5 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2215.2 1457.5 L2204.9 1454.5 L2212.7 1447.1 L2223.0 1450.1 Z"></path>
-					</g>
-					<path d="M2727.9 1586.6 L2755 1607 L2755 2280.5 L2755.0 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2723.7 1576.7 L2727.9 1586.6 L2717.2 1585.2 L2713.0 1575.3 Z"></path>
-					</g>
-					<path d="M2731.1 1456.1 L3336.25 1607 L16997.25 2292.3876793126046 L16997.3 2292.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2723.3 1448.7 L2731.1 1456.1 L2720.8 1459.0 L2713.0 1451.6 Z"></path>
-					</g>
-					<path d="M2731.2 1453.2 L3376.25 1607 L3767.7402031930333 2280.5 L3767.7 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2723.3 1445.9 L2731.2 1453.2 L2720.8 1456.3 L2713.0 1448.9 Z"></path>
-					</g>
-					<path d="M2731.2 1450.6 L3416.25 1607 L16431.25 2293.7048282727724 L16431.3 2293.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2723.3 1443.3 L2731.2 1450.6 L2720.9 1453.7 L2713.0 1446.4 Z"></path>
-					</g>
-					<path d="M2731.2 1448.2 L3456.25 1607 L4039.33091436865 2280.5 L4039.3 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2723.3 1441.0 L2731.2 1448.2 L2721.0 1451.4 L2713.0 1444.2 Z"></path>
-					</g>
-					<path d="M2731.3 1445.9 L3496.25 1607 L14216.25 2293.7258611872994 L14216.3 2293.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2723.2 1438.8 L2731.3 1445.9 L2721.0 1449.2 L2713.0 1442.1 Z"></path>
-					</g>
-					<path d="M2731.3 1440.6 L3605.75 1607 L3605.75 2280.5 L3605.8 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2723.2 1433.6 L2731.3 1440.6 L2721.2 1444.1 L2713.0 1437.1 Z"></path>
-					</g>
-					<path d="M43309.8 688.9 L42748 876 L42748 1025 L42748 1025 L42748 1174 L42748 1174 L42748 1359.5 L42748.0 1359.5 " fill="none"></path>
-					<path d="M43311.5 694.0 L43309.8 688.9 L43308.2 683.8 L43322.5 684.7 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M27040.0 111.9 L26810.5 203 L26810.5 524 L26810.5 524.0 " fill="none"></path>
-					</g>
-					<path d="M27042.0 116.9 L27040.0 111.9 L27038.1 107.0 L27052.4 107.0 Z"></path>
-					<path d="M39850.3 3669.7 L39850.25 3671 L38651.25 3705.106169871795 L38651.3 3705.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39855.6 3660.3 L39850.3 3669.7 L39844.9 3660.3 L39850.3 3651.0 Z"></path>
-					</g>
-					<path d="M32687.7 3561.7 L32166.75 3671 L41462.5 3706.3044077134987 L41462.5 3706.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32698.0 3565.0 L32687.7 3561.7 L32695.8 3554.5 L32706.0 3557.8 Z"></path>
-					</g>
-					<path d="M32912.5 3617.2 L32912.5 3671 L31752.25 3704.156671362447 L31752.3 3704.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32917.8 3607.8 L32912.5 3617.2 L32907.2 3607.8 L32912.5 3598.5 Z"></path>
-					</g>
-					<path d="M33137.7 3522.5 L37301.5 3671 L32043.25 3705.672463431623 L32043.3 3705.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M33128.5 3516.9 L33137.7 3522.5 L33128.1 3527.5 L33119.0 3521.9 Z"></path>
-					</g>
-					<path d="M32912.5 3200.3 L32912.5 3358 L32912.5 3430.5 L32912.5 3430.5 " fill="none"></path>
-					<path d="M32917.8 3200.3 L32912.5 3200.3 L32907.2 3200.3 L32912.5 3187.0 Z"></path>
-					<path d="M5185.8 2383.7 L5185.75 2985 L10354.25 3169.0430071599044 L10354.3 3169.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5191.1 2374.3 L5185.8 2383.7 L5180.4 2374.3 L5185.8 2365.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M27091.5 120.3 L27091.5 203 L27091.5 524 L27091.5 524.0 " fill="none"></path>
-					</g>
-					<path d="M27096.8 120.3 L27091.5 120.3 L27086.2 120.3 L27091.5 107.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M27151.8 92.4 L34765.75 203 L34765.75 508.5 L34765.8 508.5 " fill="none"></path>
-					</g>
-					<path d="M27151.9 87.0 L27151.8 92.4 L27151.8 97.7 L27138.5 92.2 Z"></path>
-					<path d="M38014.9 98.7 L36399 203 L36399 539.5 L36399 539.5 L36399 876 L36399 876 L36399 1025 L36399 1025 L36399 1174 L36399 1174 L36399 1390.5 L36399 1390.5 L36399 1607 L36399 1607 L36399 2296 L36399 2296 L36399 2985 L36399 2985 L39344.75 3168.2343450346034 L39344.8 3168.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38024.5 103.5 L38014.9 98.7 L38023.8 92.8 L38033.5 97.5 Z"></path>
-					</g>
-					<path d="M44329.5 120.3 L44329.5 203 L44329.5 486 L44329.5 486.0 " fill="none"></path>
-					<path d="M44334.8 120.3 L44329.5 120.3 L44324.2 120.3 L44329.5 107.0 Z"></path>
-					<path d="M43305.5 745.3 L43017.75 876 L43017.75 1025 L43017.75 1025 L43017.75 1174 L43017.75 1174 L43017.75 1390.5 L43017.75 1390.5 L43017.75 1607 L43017.75 1607 L43017.75 2296 L43017.75 2296 L43017.75 2985 L43017.75 2985 L28810.25 3169.6672997177407 L28810.3 3169.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43316.2 746.3 L43305.5 745.3 L43311.8 736.6 L43322.5 737.6 Z"></path>
-					</g>
-					<path d="M43341.0 867.5 L43330.25 876 L43330.25 1009.5 L43330.3 1009.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43351.7 866.0 L43341.0 867.5 L43345.1 857.6 L43355.7 856.0 Z"></path>
-					</g>
-					<path d="M43893.4 873.3 L43894.5 876 L43894.5 986.5 L43894.5 986.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43894.9 862.7 L43893.4 873.3 L43885.0 866.7 L43886.4 856.0 Z"></path>
-					</g>
-					<path d="M44209.8 856.4 L44237.75 876 L44237.75 1025 L44237.75 1025 L44237.75 1174 L44237.75 1174 L44237.75 1390.5 L44237.75 1390.5 L44237.75 1607 L44237.75 1607 L44237.75 2296 L44237.75 2296 L44237.75 2985 L44237.75 2985 L44237.75 3171.5 L44237.75 3171.5 L44237.75 3358 L44237.75 3358 L44237.75 3514.5 L44237.75 3514.5 L44237.75 3671 L44237.75 3671 L41565.5 3705.8287746672786 L41565.5 3705.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44205.2 846.6 L44209.8 856.4 L44199.1 855.4 L44194.5 845.6 Z"></path>
-					</g>
-					<path d="M44210.8 788.7 L44369.25 876 L44369.25 1009.5 L44369.3 1009.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44205.2 779.6 L44210.8 788.7 L44200.1 788.9 L44194.5 779.7 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M38233.8 93.6 L43758.5 203 L43758.5 223 L43758.5 223.0 " fill="none"></path>
-					</g>
-					<path d="M38233.9 88.3 L38233.8 93.6 L38233.7 98.9 L38220.5 93.4 Z"></path>
-					<path d="M28827.8 3114.9 L28840.25 3110.5 L28847.75 3110.5 L28847.75 3110.5 L28855.25 3171.5 L28855.25 3171.5 L28847.75 3232.5 L28847.75 3232.5 L28840.25 3232.5 L28840.25 3232.5 L28810.25 3221.7982456140353 L28810.3 3221.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28817.2 3113.0 L28827.8 3114.9 L28820.8 3123.1 L28810.3 3121.2 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2997.4 2323.5 L2670.5 2985 L28528.25 3170.4885475263236 L28528.3 3170.5 " fill="none"></path>
-					</g>
-					<path d="M3002.2 2325.8 L2997.4 2323.5 L2992.7 2321.1 L3003.3 2311.5 Z"></path>
-					<path d="M5748.9 2404.8 L5509.75 2985 L31329.5 3170.8127309209826 L31329.5 3170.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5757.4 2398.2 L5748.9 2404.8 L5747.5 2394.1 L5756.0 2387.5 Z"></path>
-					</g>
-					<path d="M5831.3 2405.2 L6030.5 2985 L13783.5 3169.477481500383 L13783.5 3169.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5833.3 2394.6 L5831.3 2405.2 L5823.2 2398.1 L5825.2 2387.5 Z"></path>
-					</g>
-					<path d="M4960.9 1444.1 L4091.25 1607 L5567.656023222061 2204.5 L5567.7 2204.5 " fill="none"></path>
-					<path d="M4961.9 1449.3 L4960.9 1444.1 L4959.9 1438.9 L4974.0 1441.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M7015.1 1419.3 L6997.75 1607 L5953.64259796807 2204.5 L5953.6 2204.5 " fill="none"></path>
-					</g>
-					<path d="M7020.4 1419.8 L7015.1 1419.3 L7009.8 1418.8 L7016.3 1406.0 Z"></path>
-					<path d="M19717.0 1413.6 L18921.75 1607 L18921.75 2242.5 L18921.8 2242.5 " fill="none"></path>
-					<path d="M19718.3 1418.8 L19717.0 1413.6 L19715.8 1408.4 L19730.0 1410.4 Z"></path>
-					<path d="M36658.0 1463.2 L36658 1607 L42310.75 2257.615117978701 L42310.8 2257.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36663.3 1453.8 L36658.0 1463.2 L36652.7 1453.8 L36658.0 1444.5 Z"></path>
-					</g>
-					<path d="M38906.6 555.1 L36658 876 L36658 1025 L36658 1025 L36658 1174 L36658 1174 L36658 1336.5 L36658.0 1336.5 " fill="none"></path>
-					<path d="M38907.3 560.4 L38906.6 555.1 L38905.8 549.8 L38919.8 553.2 Z"></path>
-					<path d="M44808.4 182.6 L44741 203 L44741 524 L44741.0 524.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44818.9 185.0 L44808.4 182.6 L44815.8 174.8 L44826.3 177.2 Z"></path>
-					</g>
-					<path d="M45102.1 201.6 L45102 203 L45102 524 L45102.0 524.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45108.0 192.7 L45102.1 201.6 L45097.4 192.0 L45103.3 183.0 Z"></path>
-					</g>
-					<path d="M45410.1 182.6 L45477.5 203 L45477.5 524 L45477.5 524.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45402.7 174.8 L45410.1 182.6 L45399.6 185.0 L45392.3 177.2 Z"></path>
-					</g>
-					<path d="M45410.6 144.2 L45747 203 L45747 524 L45747.0 524.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45402.4 137.3 L45410.6 144.2 L45400.5 147.8 L45392.3 141.0 Z"></path>
-					</g>
-					<path d="M42588.1 2503.0 L42457.5 2985 L40692.25 3168.3323820130863 L40692.3 3168.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42595.7 2495.4 L42588.1 2503.0 L42585.4 2492.6 L42593.0 2485.0 Z"></path>
-					</g>
-					<path d="M42600.1 2503.3 L42497.5 2985 L31520.5 3169.8914427636037 L31520.5 3169.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42607.3 2495.2 L42600.1 2503.3 L42596.8 2493.0 L42604.0 2485.0 Z"></path>
-					</g>
-					<path d="M42688.4 2503.3 L42791 2985 L32969 3170.43331477451 L32969.0 3170.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42691.7 2493.0 L42688.4 2503.3 L42681.2 2495.2 L42684.5 2485.0 Z"></path>
-					</g>
-					<path d="M42700.4 2503.0 L42831 2985 L39449.75 3168.648525664361 L39449.8 3168.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42703.1 2492.6 L42700.4 2503.0 L42692.8 2495.4 L42695.5 2485.0 Z"></path>
-					</g>
-					<path d="M44206.6 742.7 L44500.75 876 L44500.75 1025 L44500.75 1025 L44500.75 1174 L44500.75 1174 L44500.75 1390.5 L44500.75 1390.5 L44500.75 1607 L44500.75 1607 L42977.75 2172.228656073256 L42977.8 2172.2 " fill="none"></path>
-					<path d="M44208.8 737.8 L44206.6 742.7 L44204.4 747.5 L44194.5 737.2 Z"></path>
-					<path d="M19717.5 1424.7 L19214.25 1607 L19214.25 2265 L19214.3 2265.0 " fill="none"></path>
-					<path d="M19719.3 1429.8 L19717.5 1424.7 L19715.6 1419.7 L19730.0 1420.2 Z"></path>
-					<path d="M19899.6 1443.9 L20166.75 1607 L20166.75 2265 L20166.8 2265.0 " fill="none"></path>
-					<path d="M19902.4 1439.4 L19899.6 1443.9 L19896.8 1448.5 L19888.2 1437.0 Z"></path>
-					<path d="M19906.5 1426.1 L20386.75 1607 L20386.75 2265 L20386.8 2265.0 " fill="none"></path>
-					<path d="M19908.4 1421.1 L19906.5 1426.1 L19904.6 1431.1 L19894.0 1421.4 Z"></path>
-					<path d="M11722.5 1470.7 L11722.5 1607 L16997.25 2286.721840370318 L16997.3 2286.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11727.8 1461.3 L11722.5 1470.7 L11717.2 1461.3 L11722.5 1452.0 Z"></path>
-					</g>
-					<path d="M17400.9 1027.3 L11722.5 1174 L11722.5 1329 L11722.5 1329.0 " fill="none"></path>
-					<path d="M17401.1 1032.6 L17400.9 1027.3 L17400.8 1022.0 L17414.3 1027.0 Z"></path>
-					<path d="M8024.5 1438.6 L7745.5 1607 L9688.044085631349 2280.5 L9688.0 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8035.2 1438.4 L8024.5 1438.6 L8029.7 1429.3 L8040.5 1429.0 Z"></path>
-					</g>
-					<path d="M8132.6 1445.6 L8215.75 1607 L8363.841799709724 2280.5 L8363.8 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8133.1 1434.9 L8132.6 1445.6 L8123.6 1439.7 L8124.1 1429.0 Z"></path>
-					</g>
-					<path d="M8359.3 1483.6 L8295.75 1607 L9700.422714078375 2280.5 L9700.4 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8368.3 1477.7 L8359.3 1483.6 L8358.8 1472.9 L8367.9 1467.0 Z"></path>
-					</g>
-					<path d="M8457.0 1483.5 L8523 1607 L8370.753809869377 2280.5 L8370.8 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8457.3 1472.7 L8457.0 1483.5 L8447.8 1477.7 L8448.2 1467.0 Z"></path>
-					</g>
-					<path d="M8473.2 1482.2 L8563 1607 L11459.25 2283.618208018988 L11459.3 2283.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8472.1 1471.5 L8473.2 1482.2 L8463.4 1477.7 L8462.3 1467.0 Z"></path>
-					</g>
-					<path d="M8671.3 1537.3 L8648.75 1607 L8648.75 2227 L8648.8 2227.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8679.2 1530.0 L8671.3 1537.3 L8669.1 1526.7 L8677.0 1519.5 Z"></path>
-					</g>
-					<path d="M8749.9 1537.8 L8764.5 1607 L14216.25 2291.542484851246 L14216.3 2291.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8753.2 1527.5 L8749.9 1537.8 L8742.7 1529.7 L8746.0 1519.5 Z"></path>
-					</g>
-					<path d="M9966.3 2413.7 L9966.25 2985 L11087.75 3160.912321278385 L11087.8 3160.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9971.6 2404.3 L9966.3 2413.7 L9960.9 2404.3 L9966.3 2395.0 Z"></path>
-					</g>
-					<path d="M8794.0 1531.3 L8834.5 1607 L9829.75 2212.899933730948 L9829.8 2212.9 " fill="none"></path>
-					<path d="M8798.7 1528.7 L8794.0 1531.3 L8789.3 1533.8 L8787.7 1519.5 Z"></path>
-					<path d="M8819.3 1530.3 L8874.5 1607 L10142.75 2247.7510540788267 L10142.8 2247.8 " fill="none"></path>
-					<path d="M8823.7 1527.2 L8819.3 1530.3 L8815.0 1533.4 L8811.6 1519.5 Z"></path>
-					<path d="M4501.0 2428.0 L4350.25 2985 L16317.5 3170.20005186184 L16317.5 3170.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4508.6 2420.4 L4501.0 2428.0 L4498.3 2417.6 L4505.9 2410.0 Z"></path>
-					</g>
-					<path d="M4564.3 2428.3 L4680 2985 L13783.5 3169.7747456059205 L13783.5 3169.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4567.6 2418.1 L4564.3 2428.3 L4557.1 2420.2 L4560.5 2410.0 Z"></path>
-					</g>
-					<path d="M4961.2 1477.6 L4536.75 1607 L4536.75 2182 L4536.8 2182.0 " fill="none"></path>
-					<path d="M4962.8 1482.7 L4961.2 1477.6 L4959.7 1472.5 L4974.0 1473.7 Z"></path>
-					<path d="M17400.9 1027.4 L11897.75 1174 L19730 1388.256831032631 L19730.0 1388.3 " fill="none"></path>
-					<path d="M17401.1 1032.7 L17400.9 1027.4 L17400.8 1022.0 L17414.3 1027.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M20989.8 1053.8 L20989.75 1174 L19894 1375.42634260242 L19894.0 1375.4 " fill="none"></path>
-					</g>
-					<path d="M20995.1 1053.8 L20989.8 1053.8 L20984.4 1053.8 L20989.8 1040.5 Z"></path>
-					<path d="M9259.7 1475.9 L9188.25 1607 L9720.500725689404 2280.5 L9720.5 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9268.9 1470.2 L9259.7 1475.9 L9259.5 1465.1 L9268.6 1459.5 Z"></path>
-					</g>
-					<path d="M9438.0 1464.1 L9693.75 1607 L11471.340348330914 2280.5 L11471.3 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9432.5 1454.9 L9438.0 1464.1 L9427.3 1464.2 L9421.8 1455.0 Z"></path>
-					</g>
-					<path d="M5068.6 1491.2 L4863.25 1607 L4863.25 2296 L4863.25 2296 L4863.25 2985 L4863.25 2985 L33238 3171.00507464785 L33238.0 3171.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5079.3 1491.2 L5068.6 1491.2 L5074.1 1481.9 L5084.8 1482.0 Z"></path>
-					</g>
-					<path d="M5085.9 1491.9 L4903.25 1607 L4903.25 2296 L4903.25 2296 L4903.25 2985 L4903.25 2985 L34407.75 3171.2096834232925 L34407.8 3171.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5096.7 1491.5 L5085.9 1491.9 L5091.0 1482.5 L5101.7 1482.0 Z"></path>
-					</g>
-					<path d="M5538.4 1441.0 L6495.25 1607 L6495.25 2296 L6495.25 2296 L6495.25 2985 L6495.25 2985 L13783.5 3169.3499983046827 L13783.5 3169.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5530.1 1434.2 L5538.4 1441.0 L5528.3 1444.7 L5520.0 1437.8 Z"></path>
-					</g>
-					<path d="M46265.0 156.2 L46265 203 L46265 524 L46265.0 524.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46270.3 146.8 L46265.0 156.2 L46259.7 146.8 L46265.0 137.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M8138.8 1439.9 L8255.75 1607 L8978.541727140784 2250 L8978.5 2250.0 " fill="none"></path>
-					</g>
-					<path d="M8143.2 1436.9 L8138.8 1439.9 L8134.5 1443.0 L8131.2 1429.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M9030.3 1472.3 L9030.25 1607 L9030.25 2250 L9030.3 2250.0 " fill="none"></path>
-					</g>
-					<path d="M9035.6 1472.3 L9030.3 1472.3 L9024.9 1472.3 L9030.3 1459.0 Z"></path>
-					<path d="M24541.1 1078.6 L24210.75 1174 L24647.10103926097 1375 L24647.1 1375.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24551.5 1081.1 L24541.1 1078.6 L24548.6 1070.9 L24559.0 1073.4 Z"></path>
-					</g>
-					<path d="M24541.2 1083.7 L24256.5 1174 L19894 1386.5056249296883 L19894.0 1386.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24551.7 1086.0 L24541.2 1083.7 L24548.5 1075.8 L24559.0 1078.1 Z"></path>
-					</g>
-					<path d="M24769.1 1163.8 L24772.25 1174 L24772.25 1390.5 L24772.25 1390.5 L24772.25 1607 L24772.25 1607 L14287.25 2293.6750629722924 L14287.3 2293.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24771.5 1153.4 L24769.1 1163.8 L24761.3 1156.5 L24763.7 1146.0 Z"></path>
-					</g>
-					<path d="M24899.5 1157.3 L24921.25 1174 L24921.25 1375 L24921.3 1375.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24895.3 1147.4 L24899.5 1157.3 L24888.8 1155.9 L24884.7 1146.0 Z"></path>
-					</g>
-					<path d="M10298.7 1514.5 L10263.75 1607 L20778.75 2294.10498861912 L20778.8 2294.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10307.0 1507.6 L10298.7 1514.5 L10297.0 1503.8 L10305.3 1497.0 Z"></path>
-					</g>
-					<path d="M10525.9 1475.0 L10807.75 1607 L14216.25 2288.8979384436702 L14216.3 2288.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10519.7 1466.2 L10525.9 1475.0 L10515.2 1475.9 L10509.0 1467.1 Z"></path>
-					</g>
-					<path d="M19906.9 1415.4 L20638.75 1607 L20638.75 2219.5 L20638.8 2219.5 " fill="none"></path>
-					<path d="M19908.2 1410.2 L19906.9 1415.4 L19905.5 1420.5 L19894.0 1412.0 Z"></path>
-					<path d="M44514.2 2443.4 L44416.5 2985 L44416.5 3156 L44416.5 3156.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44521.1 2435.1 L44514.2 2443.4 L44510.6 2433.2 L44517.5 2425.0 Z"></path>
-					</g>
-					<path d="M44522.7 2443.5 L44456.5 2985 L33389 3170.2363591492417 L33389.0 3170.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44529.1 2434.9 L44522.7 2443.5 L44518.5 2433.6 L44525.0 2425.0 Z"></path>
-					</g>
-					<path d="M44562.1 2443.5 L44640.5 2985 L32969 3170.6015305252386 L32969.0 3170.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44566.0 2433.5 L44562.1 2443.5 L44555.5 2435.0 L44559.4 2425.0 Z"></path>
-					</g>
-					<path d="M44570.6 2443.3 L44680.5 2985 L39449.75 3169.6467373302416 L39449.8 3169.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44574.0 2433.1 L44570.6 2443.3 L44563.5 2435.2 L44566.9 2425.0 Z"></path>
-					</g>
-					<path d="M44206.7 732.3 L44540.75 876 L44540.75 1025 L44540.75 1025 L44540.75 1174 L44540.75 1174 L44540.75 1390.5 L44540.75 1390.5 L44540.75 1607 L44540.75 1607 L44540.75 2167 L44540.8 2167.0 " fill="none"></path>
-					<path d="M44208.9 727.4 L44206.7 732.3 L44204.6 737.2 L44194.5 727.1 Z"></path>
-					<path d="M19907.1 1408.4 L20964.25 1607 L20964.25 2265 L20964.3 2265.0 " fill="none"></path>
-					<path d="M19908.1 1403.1 L19907.1 1408.4 L19906.1 1413.6 L19894.0 1405.9 Z"></path>
-					<path d="M6676.3 2353.2 L6676.25 2985 L31147.5 3170.960461041673 L31147.5 3171.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6681.6 2343.8 L6676.3 2353.2 L6670.9 2343.8 L6676.3 2334.5 Z"></path>
-					</g>
-					<path d="M5533.2 1433.9 L6676.25 1607 L6676.25 2257.5 L6676.3 2257.5 " fill="none"></path>
-					<path d="M5534.0 1428.6 L5533.2 1433.9 L5532.4 1439.1 L5520.0 1431.9 Z"></path>
-					<path d="M25236.3 1131.7 L25143.75 1174 L25143.75 1375 L25143.8 1375.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25247.0 1132.7 L25236.3 1131.7 L25242.6 1123.0 L25253.3 1124.0 Z"></path>
-					</g>
-					<path d="M25623.6 1134.9 L25678.25 1174 L25678.25 1390.5 L25678.25 1390.5 L25678.25 1607 L25678.25 1607 L16518.25 2292.7434671592328 L16518.3 2292.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25619.1 1125.1 L25623.6 1134.9 L25612.9 1133.8 L25608.5 1124.0 Z"></path>
-					</g>
-					<path d="M25704.2 1131.7 L25796.75 1174 L25796.75 1375 L25796.8 1375.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25697.9 1123.0 L25704.2 1131.7 L25693.5 1132.7 L25687.2 1124.0 Z"></path>
-					</g>
-					<path d="M25710.9 1083.5 L26083.25 1174 L26083.25 1375 L26083.3 1375.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25703.1 1076.1 L25710.9 1083.5 L25700.6 1086.5 L25692.8 1079.1 Z"></path>
-					</g>
-					<path d="M26319.4 1454.3 L26070.75 1607 L27878.15420899855 2280.5 L27878.2 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26330.2 1453.9 L26319.4 1454.3 L26324.6 1444.8 L26335.3 1444.5 Z"></path>
-					</g>
-					<path d="M26445.2 1462.4 L26489.25 1607 L17141.25 2290.7337579617833 L17141.3 2290.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26447.5 1451.9 L26445.2 1462.4 L26437.3 1455.0 L26439.7 1444.5 Z"></path>
-					</g>
-					<path d="M25705.9 1061.8 L26423.25 1174 L26423.25 1336.5 L26423.3 1336.5 " fill="none"></path>
-					<path d="M25706.7 1056.6 L25705.9 1061.8 L25705.1 1067.1 L25692.8 1059.8 Z"></path>
-					<path d="M19907.2 1404.8 L21254.75 1607 L22155.44230769231 2257.5 L22155.4 2257.5 " fill="none"></path>
-					<path d="M19908.0 1399.5 L19907.2 1404.8 L19906.4 1410.1 L19894.0 1402.8 Z"></path>
-					<path d="M5533.2 1426.7 L6957.75 1607 L6957.75 2265 L6957.8 2265.0 " fill="none"></path>
-					<path d="M5533.9 1421.4 L5533.2 1426.7 L5532.6 1432.0 L5520.0 1425.0 Z"></path>
-					<path d="M22420.6 2338.6 L22055 2985 L14289.5 3168.012036393505 L14289.5 3168.0 " fill="none"></path>
-					<path d="M22425.3 2341.2 L22420.6 2338.6 L22416.0 2336.0 L22427.2 2327.0 Z"></path>
-					<path d="M12465.5 1440.2 L12465.5 1607 L28020.75 2277.5709123899205 L28020.8 2277.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12470.8 1430.8 L12465.5 1440.2 L12460.2 1430.8 L12465.5 1421.5 Z"></path>
-					</g>
-					<path d="M12073.0 1455.7 L12073 1607 L11320.077830188678 2280.5 L11320.1 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12078.3 1446.3 L12073.0 1455.7 L12067.7 1446.3 L12073.0 1437.0 Z"></path>
-					</g>
-					<path d="M17400.9 1027.5 L12073 1174 L12073 1344 L12073.0 1344.0 " fill="none"></path>
-					<path d="M17401.1 1032.8 L17400.9 1027.5 L17400.8 1022.1 L17414.3 1027.1 Z"></path>
-					<path d="M37296.0 1097.7 L37296 1174 L37296 1194 L37296.0 1194.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37301.3 1088.3 L37296.0 1097.7 L37290.7 1088.3 L37296.0 1079.0 Z"></path>
-					</g>
-					<path d="M38923.4 557.6 L37296 876 L37296 971 L37296.0 971.0 " fill="none"></path>
-					<path d="M38924.5 562.8 L38923.4 557.6 L38922.4 552.3 L38936.5 555.0 Z"></path>
-					<path d="M35174.4 1117.1 L35100 1174 L35100 1306.5 L35100.0 1306.5 " fill="none"></path>
-					<path d="M35177.6 1121.3 L35174.4 1117.1 L35171.1 1112.9 L35185.0 1109.0 Z"></path>
-					<path d="M37905.5 2500.3 L37565.75 2985 L40631.25 3169.6627099483203 L40631.3 3169.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37915.3 2495.7 L37905.5 2500.3 L37906.5 2489.6 L37916.3 2485.0 Z"></path>
-					</g>
-					<path d="M37917.1 2500.7 L37605.75 2985 L34499.75 3168.778236040609 L34499.8 3168.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37926.7 2495.7 L37917.1 2500.7 L37917.7 2490.0 L37927.2 2485.0 Z"></path>
-					</g>
-					<path d="M38148.2 2501.8 L38381.75 2985 L38381.75 3171.5 L38381.75 3171.5 L38381.75 3358 L38381.75 3358 L38381.75 3514.5 L38381.75 3514.5 L38381.75 3671 L38381.75 3671 L38553.25 3698.6111111111113 L38553.3 3698.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38149.0 2491.1 L38148.2 2501.8 L38139.4 2495.7 L38140.1 2485.0 Z"></path>
-					</g>
-					<path d="M38160.0 2501.4 L38421.75 2985 L38421.75 3171.5 L38421.75 3171.5 L38421.75 3358 L38421.75 3358 L39709.75 3499.1074553727685 L39709.8 3499.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38160.2 2490.7 L38160.0 2501.4 L38150.8 2495.7 L38151.1 2485.0 Z"></path>
-					</g>
-					<path d="M38435.3 2493.5 L39397.25 2985 L39397.25 3156 L39397.3 3156.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38429.4 2484.5 L38435.3 2493.5 L38424.5 2494.0 L38418.7 2485.0 Z"></path>
-					</g>
-					<path d="M44207.6 615.2 L45756.25 876 L45756.25 1025 L45756.25 1025 L45756.25 1174 L45756.25 1174 L45756.25 1390.5 L45756.25 1390.5 L45756.25 1607 L45756.25 1607 L38468.25 2258.4994485890365 L38468.3 2258.5 " fill="none"></path>
-					<path d="M44208.5 609.9 L44207.6 615.2 L44206.8 620.4 L44194.5 612.9 Z"></path>
-					<path d="M37013.8 1594.8 L36997 1607 L37760.24383164006 2107 L37760.2 2107.0 " fill="none"></path>
-					<path d="M37016.9 1599.1 L37013.8 1594.8 L37010.7 1590.5 L37024.6 1587.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M43773.0 1052.4 L43232.75 1174 L43232.75 1390.5 L43232.75 1390.5 L43232.75 1607 L43232.75 1607 L38468.25 2240.2446952160494 L38468.3 2240.2 " fill="none"></path>
-					</g>
-					<path d="M43774.2 1057.6 L43773.0 1052.4 L43771.8 1047.2 L43786.0 1049.4 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M14181.2 1417.5 L14070 1607 L37629.25 2283.946181514883 L37629.3 2283.9 " fill="none"></path>
-					</g>
-					<path d="M14185.8 1420.2 L14181.2 1417.5 L14176.6 1414.8 L14187.9 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29291.0 1033.7 L27515 1174 L27515 1390.5 L27515 1390.5 L27515 1607 L27515 1607 L37629.25 2268.5610062893084 L37629.3 2268.6 " fill="none"></path>
-					</g>
-					<path d="M29291.4 1039.0 L29291.0 1033.7 L29290.5 1028.4 L29304.3 1032.6 Z"></path>
-					<path d="M31153.5 2450.6 L31018.5 2985 L32856 3165.936510031679 L32856.0 3165.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31160.9 2442.9 L31153.5 2450.6 L31150.6 2440.2 L31158.0 2432.5 Z"></path>
-					</g>
-					<path d="M31241.4 2450.3 L31411 2985 L39344.75 3170.2739865393646 L39344.8 3170.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31243.7 2439.8 L31241.4 2450.3 L31233.5 2443.0 L31235.8 2432.5 Z"></path>
-					</g>
-					<path d="M42703.3 1430.4 L42505.25 1607 L31540.5 2274.8051534772712 L31540.5 2274.8 " fill="none"></path>
-					<path d="M42706.8 1434.4 L42703.3 1430.4 L42699.7 1426.4 L42713.2 1421.5 Z"></path>
-					<path d="M42102.8 1553.1 L42067 1607 L31540.5 2273.9509862522414 L31540.5 2274.0 " fill="none"></path>
-					<path d="M42107.2 1556.1 L42102.8 1553.1 L42098.3 1550.2 L42110.2 1542.0 Z"></path>
-					<path d="M37315.9 1605.6 L37316 1607 L37316 2296 L37316 2296 L37316 2985 L37316 2985 L27953.25 3170.057136422648 L27953.3 3170.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37320.3 1595.8 L37315.9 1605.6 L37309.7 1596.8 L37314.2 1587.0 Z"></path>
-					</g>
-					<path d="M37693.6 1430.7 L39437.25 1607 L39437.25 2296 L39437.25 2296 L39437.25 2985 L39437.25 2985 L32969 3169.885033909345 L32969.0 3169.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37684.8 1424.5 L37693.6 1430.7 L37683.7 1435.1 L37675.0 1428.8 Z"></path>
-					</g>
-					<path d="M27211.2 540.7 L198.75 876 L198.75 926 L198.8 926.0 " fill="none"></path>
-					<path d="M27211.2 546.0 L27211.2 540.7 L27211.1 535.3 L27224.5 540.5 Z"></path>
-					<path d="M6307.3 2413.7 L6307.25 2985 L27807.25 3170.8689102118387 L27807.3 3170.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6312.6 2404.3 L6307.3 2413.7 L6301.9 2404.3 L6307.3 2395.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M9052.2 1027.4 L3914.75 1174 L3914.75 1390.5 L3914.75 1390.5 L3914.75 1607 L3914.75 1607 L6159.25 2253.378474399164 L6159.3 2253.4 " fill="none"></path>
-					</g>
-					<path d="M9052.3 1032.8 L9052.2 1027.4 L9052.0 1022.1 L9065.5 1027.0 Z"></path>
-					<path d="M14955.5 1440.2 L14955.5 1607 L30844.5 2281.2329863891114 L30844.5 2281.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14960.8 1430.8 L14955.5 1440.2 L14950.2 1430.8 L14955.5 1421.5 Z"></path>
-					</g>
-					<path d="M7346.8 1478.2 L7346.75 1607 L6455.25 2197.9028379028377 L6455.3 2197.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7352.1 1468.8 L7346.8 1478.2 L7341.4 1468.8 L7346.8 1459.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M9052.2 1032.1 L7346.75 1174 L7346.75 1321.5 L7346.8 1321.5 " fill="none"></path>
-					</g>
-					<path d="M9052.7 1037.4 L9052.2 1032.1 L9051.8 1026.7 L9065.5 1031.0 Z"></path>
-					<path d="M28250.5 2544.6 L27900.25 2985 L40631.25 3171.054264780786 L40631.3 3171.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28260.5 2540.6 L28250.5 2544.6 L28252.2 2534.0 L28262.1 2530.0 Z"></path>
-					</g>
-					<path d="M28264.6 2545.0 L27940.25 2985 L32856 3169.380788375484 L32856.0 3169.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28274.5 2540.7 L28264.6 2545.0 L28265.9 2534.3 L28275.7 2530.0 Z"></path>
-					</g>
-					<path d="M28448.3 2548.7 L28448.25 2985 L28448.25 3171.5 L28448.25 3171.5 L28448.25 3358 L28448.25 3358 L28448.25 3514.5 L28448.25 3514.5 L28448.25 3671 L28448.25 3671 L38553.25 3706.3286882016937 L38553.3 3706.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28453.6 2539.3 L28448.3 2548.7 L28442.9 2539.3 L28448.3 2530.0 Z"></path>
-					</g>
-					<path d="M28462.9 2548.6 L28488.25 2985 L28488.25 3171.5 L28488.25 3171.5 L28488.25 3358 L28488.25 3358 L39709.75 3512.564755324767 L39709.8 3512.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28467.7 2539.0 L28462.9 2548.6 L28457.1 2539.6 L28461.8 2530.0 Z"></path>
-					</g>
-					<path d="M28661.8 2544.1 L29041.25 2985 L39344.75 3170.554533603708 L39344.8 3170.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28659.8 2533.6 L28661.8 2544.1 L28651.7 2540.6 L28649.6 2530.0 Z"></path>
-					</g>
-					<path d="M42709.9 1431.2 L42545.25 1607 L28875.75 2275.105660778889 L28875.8 2275.1 " fill="none"></path>
-					<path d="M42713.7 1434.9 L42709.9 1431.2 L42706.0 1427.6 L42719.0 1421.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M43773.0 1054.1 L43272.75 1174 L43272.75 1390.5 L43272.75 1390.5 L43272.75 1607 L43272.75 1607 L28875.75 2276.1310330871192 L28875.8 2276.1 " fill="none"></path>
-					</g>
-					<path d="M43774.3 1059.3 L43773.0 1054.1 L43771.8 1048.9 L43786.0 1051.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M14185.8 1418.4 L14110 1607 L28020.75 2275.457221069517 L28020.8 2275.5 " fill="none"></path>
-					</g>
-					<path d="M14190.7 1420.4 L14185.8 1418.4 L14180.9 1416.4 L14190.8 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29291.1 1042.2 L28448.25 1174 L28448.25 1390.5 L28448.25 1390.5 L28448.25 1607 L28448.25 1607 L28448.25 2062 L28448.3 2062.0 " fill="none"></path>
-					</g>
-					<path d="M29291.9 1047.4 L29291.1 1042.2 L29290.3 1036.9 L29304.3 1040.1 Z"></path>
-					<path d="M22430.3 2339.7 L22216 2985 L15175.5 3166.4361268481416 L15175.5 3166.4 " fill="none"></path>
-					<path d="M22435.3 2341.3 L22430.3 2339.7 L22425.2 2338.0 L22434.5 2327.0 Z"></path>
-					<path d="M586.8 1112.7 L586.75 1174 L586.75 1375 L586.8 1375.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M592.1 1103.3 L586.8 1112.7 L581.4 1103.3 L586.8 1094.0 Z"></path>
-					</g>
-					<path d="M27211.2 540.7 L586.75 876 L586.75 956 L586.8 956.0 " fill="none"></path>
-					<path d="M27211.2 546.0 L27211.2 540.7 L27211.1 535.4 L27224.5 540.5 Z"></path>
-					<path d="M19609.4 2377.1 L18898.5 2985 L32856 3170.74809119452 L32856.0 3170.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19619.9 2375.1 L19609.4 2377.1 L19613.0 2367.0 L19623.6 2365.0 Z"></path>
-					</g>
-					<path d="M19811.4 2376.2 L20624.75 2985 L13407.5 3168.9135269000853 L13407.5 3168.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19807.1 2366.3 L19811.4 2376.2 L19800.7 2374.9 L19796.4 2365.0 Z"></path>
-					</g>
-					<path d="M16099.0 1510.7 L16010 1607 L17245.80896226415 2280.5 L17245.8 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16109.2 1507.5 L16099.0 1510.7 L16101.4 1500.2 L16111.6 1497.0 Z"></path>
-					</g>
-					<path d="M16221.6 1515.6 L16230 1607 L16469.24401306241 2280.5 L16469.2 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16226.0 1505.8 L16221.6 1515.6 L16215.4 1506.8 L16219.8 1497.0 Z"></path>
-					</g>
-					<path d="M17293.5 1515.4 L17277.5 1607 L18135.9925616836 2280.5 L18136.0 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17300.3 1507.1 L17293.5 1515.4 L17289.8 1505.3 L17296.7 1497.0 Z"></path>
-					</g>
-					<path d="M17426.7 1510.7 L17516 1607 L16498.174346879536 2280.5 L16498.2 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17424.3 1500.2 L17426.7 1510.7 L17416.4 1507.5 L17414.0 1497.0 Z"></path>
-					</g>
-					<path d="M10282.4 3120.9 L10294.25 3118 L10301.75 3118 L10301.75 3118 L10309.25 3171.5 L10309.25 3171.5 L10301.75 3225 L10301.75 3225 L10294.25 3225 L10294.25 3225 L10264.25 3217.7539503386006 L10264.3 3217.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10272.1 3117.9 L10282.4 3120.9 L10274.6 3128.2 L10264.3 3125.2 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2998.9 2323.7 L2710.5 2985 L9881.25 3166.648935447723 L9881.3 3166.6 " fill="none"></path>
-					</g>
-					<path d="M3003.8 2325.9 L2998.9 2323.7 L2994.0 2321.6 L3004.2 2311.5 Z"></path>
-					<path d="M12932.5 1470.7 L12932.5 1607 L21091.75 2256.7036491288895 L21091.8 2256.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12937.8 1461.3 L12932.5 1470.7 L12927.2 1461.3 L12932.5 1452.0 Z"></path>
-					</g>
-					<path d="M17400.9 1027.9 L12932.5 1174 L12932.5 1329 L12932.5 1329.0 " fill="none"></path>
-					<path d="M17401.1 1033.3 L17400.9 1027.9 L17400.7 1022.6 L17414.3 1027.5 Z"></path>
-					<path d="M47864.0 120.3 L47864 203 L47864 493 L47864.0 493.0 " fill="none"></path>
-					<path d="M47869.3 120.3 L47864.0 120.3 L47858.7 120.3 L47864.0 107.0 Z"></path>
-					<path d="M13451.5 1470.7 L13451.5 1607 L21091.75 2254.1962194559705 L21091.8 2254.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13456.8 1461.3 L13451.5 1470.7 L13446.2 1461.3 L13451.5 1452.0 Z"></path>
-					</g>
-					<path d="M17400.9 1028.3 L13451.5 1174 L13451.5 1329 L13451.5 1329.0 " fill="none"></path>
-					<path d="M17401.1 1033.6 L17400.9 1028.3 L17400.7 1023.0 L17414.3 1027.8 Z"></path>
-					<path d="M21187.5 2593.7 L20664.75 2985 L10264.25 3168.128139161631 L10264.3 3168.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21198.2 2592.4 L21187.5 2593.7 L21191.8 2583.8 L21202.5 2582.5 Z"></path>
-					</g>
-					<path d="M21756.5 2598.7 L21975 2985 L32856 3170.5365942857143 L32856.0 3170.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21756.6 2588.0 L21756.5 2598.7 L21747.3 2593.2 L21747.3 2582.5 Z"></path>
-					</g>
-					<path d="M21773.8 2598.3 L22015 2985 L39344.75 3170.936709862072 L39344.8 3170.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21773.4 2587.6 L21773.8 2598.3 L21764.4 2593.2 L21763.9 2582.5 Z"></path>
-					</g>
-					<path d="M42716.7 1432.2 L42585.25 1607 L22078.75 2279.8085 L22078.8 2279.8 " fill="none"></path>
-					<path d="M42720.9 1435.4 L42716.7 1432.2 L42712.4 1429.0 L42724.7 1421.5 Z"></path>
-					<path d="M21914.7 1481.2 L21585.25 1607 L21585.25 2009.5 L21585.3 2009.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21925.3 1482.8 L21914.7 1481.2 L21921.5 1472.8 L21932.1 1474.5 Z"></path>
-					</g>
-					<path d="M22389.3 1481.2 L22718.75 1607 L22718.75 2280.5 L22718.8 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22382.5 1472.8 L22389.3 1481.2 L22378.7 1482.8 L22371.9 1474.5 Z"></path>
-					</g>
-					<path d="M43411.4 2487.3 L43212.75 2985 L40692.25 3169.2701881615053 L40692.3 3169.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43419.8 2480.6 L43411.4 2487.3 L43409.9 2476.7 L43418.3 2470.0 Z"></path>
-					</g>
-					<path d="M43422.4 2487.7 L43252.75 2985 L34499.75 3170.525002841232 L34499.8 3170.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43430.4 2480.6 L43422.4 2487.7 L43420.3 2477.1 L43428.4 2470.0 Z"></path>
-					</g>
-					<path d="M43433.4 2488.0 L43292.75 2985 L39304.75 3153.672638621159 L39304.8 3153.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43441.1 2480.4 L43433.4 2488.0 L43430.8 2477.5 L43438.5 2470.0 Z"></path>
-					</g>
-					<path d="M43487.8 2488.7 L43487.75 2985 L43487.75 3171.5 L43487.75 3171.5 L43487.75 3358 L43487.75 3358 L43487.75 3514.5 L43487.75 3514.5 L43487.75 3671 L43487.75 3671 L38651.25 3706.143946371917 L38651.3 3706.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43493.1 2479.3 L43487.8 2488.7 L43482.4 2479.3 L43487.8 2470.0 Z"></path>
-					</g>
-					<path d="M43542.1 2488.0 L43682.75 2985 L43682.75 3171.5 L43682.75 3171.5 L43682.75 3358 L43682.75 3358 L39990.75 3508.7626875407695 L39990.8 3508.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43544.7 2477.5 L43542.1 2488.0 L43534.4 2480.4 L43537.0 2470.0 Z"></path>
-					</g>
-					<path d="M43553.1 2487.7 L43722.75 2985 L39449.75 3169.2363888567797 L39449.8 3169.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43555.2 2477.1 L43553.1 2487.7 L43545.1 2480.6 L43547.1 2470.0 Z"></path>
-					</g>
-					<path d="M44207.7 613.7 L45796.25 876 L45796.25 1025 L45796.25 1025 L45796.25 1174 L45796.25 1174 L45796.25 1390.5 L45796.25 1390.5 L45796.25 1607 L45796.25 1607 L43917.75 2167.66125189517 L43917.8 2167.7 " fill="none"></path>
-					<path d="M44208.5 608.4 L44207.7 613.7 L44206.8 618.9 L44194.5 611.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M43776.9 1068.1 L43487.75 1174 L43487.75 1390.5 L43487.75 1390.5 L43487.75 1607 L43487.75 1607 L43487.75 2122 L43487.8 2122.0 " fill="none"></path>
-					</g>
-					<path d="M43778.7 1073.1 L43776.9 1068.1 L43775.0 1063.1 L43789.4 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29400.8 1053.8 L29400.75 1174 L29400.75 1390.5 L29400.75 1390.5 L29400.75 1607 L29400.75 1607 L43057.75 2274.9685525661957 L43057.8 2275.0 " fill="none"></path>
-					</g>
-					<path d="M29406.1 1053.8 L29400.8 1053.8 L29395.4 1053.8 L29400.8 1040.5 Z"></path>
-					<path d="M38883.3 3296.7 L38883.25 3358 L39709.75 3491.761375387797 L39709.8 3491.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38888.6 3287.3 L38883.3 3296.7 L38877.9 3287.3 L38883.3 3278.0 Z"></path>
-					</g>
-					<path d="M39323.4 3154.7 L43762.75 2985 L43557.19847605225 2470 L43557.2 2470.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39313.9 3149.7 L39323.4 3154.7 L39314.3 3160.4 L39304.8 3155.4 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M43916.1 1075.8 L43957.75 1174 L43957.75 1390.5 L43957.75 1390.5 L43957.75 1607 L43957.75 1607 L43957.75 2296 L43957.75 2296 L43957.75 2985 L43957.75 2985 L39304.75 3156.0088678687557 L39304.8 3156.0 " fill="none"></path>
-					</g>
-					<path d="M43921.0 1073.7 L43916.1 1075.8 L43911.1 1077.9 L43910.8 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M14193.6 1419.2 L14171.75 1607 L14171.75 2296 L14171.75 2296 L14171.75 2985 L14171.75 2985 L38461.75 3168.3189001072374 L38461.8 3168.3 " fill="none"></path>
-					</g>
-					<path d="M14198.9 1419.9 L14193.6 1419.2 L14188.4 1418.6 L14195.2 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29457.0 1045.0 L29820.5 1174 L29820.5 1390.5 L29820.5 1390.5 L29820.5 1607 L29820.5 1607 L29820.5 2296 L29820.5 2296 L29820.5 2985 L29820.5 2985 L38461.75 3162.8260599707596 L38461.8 3162.8 " fill="none"></path>
-					</g>
-					<path d="M29458.8 1039.9 L29457.0 1045.0 L29455.2 1050.0 L29444.4 1040.5 Z"></path>
-					<path d="M22948.3 1476.4 L22886.75 1607 L22886.75 2296 L22886.75 2296 L22886.75 2985 L22886.75 2985 L12742.5 3168.7735374826975 L12742.5 3168.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22957.1 1470.2 L22948.3 1476.4 L22947.4 1465.7 L22956.2 1459.5 Z"></path>
-					</g>
-					<path d="M23042.5 1475.3 L23126 1607 L11565.25 2292.8557098267142 L11565.3 2292.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23042.0 1464.5 L23042.5 1475.3 L23033.0 1470.2 L23032.5 1459.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M9052.2 1034.1 L7752.75 1174 L7752.75 1329 L7752.8 1329.0 " fill="none"></path>
-					</g>
-					<path d="M9052.8 1039.4 L9052.2 1034.1 L9051.7 1028.8 L9065.5 1032.7 Z"></path>
-					<path d="M12760.4 3121.6 L12772.5 3118 L12780 3118 L12780 3118 L12787.5 3171.5 L12787.5 3171.5 L12780 3225 L12780 3225 L12772.5 3225 L12772.5 3225 L12742.5 3216.1080332409974 L12742.5 3216.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12749.9 3119.1 L12760.4 3121.6 L12753.0 3129.4 L12742.5 3126.9 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3011.0 2324.8 L3011 2985 L12441.5 3168.570425842814 L12441.5 3168.6 " fill="none"></path>
-					</g>
-					<path d="M3016.3 2324.8 L3011.0 2324.8 L3005.7 2324.8 L3011.0 2311.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M27211.2 541.3 L9137 876 L9137 994 L9137.0 994.0 " fill="none"></path>
-					</g>
-					<path d="M27211.3 546.6 L27211.2 541.3 L27211.1 535.9 L27224.5 541.0 Z"></path>
-					<path d="M45255.2 2555.5 L45134.25 2985 L40692.25 3170.22817216322 L40692.3 3170.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45262.9 2547.9 L45255.2 2555.5 L45252.6 2545.0 L45260.3 2537.5 Z"></path>
-					</g>
-					<path d="M45328.3 2556.2 L45328.25 2985 L32969 3170.651299760385 L32969.0 3170.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45333.6 2546.8 L45328.3 2556.2 L45322.9 2546.8 L45328.3 2537.5 Z"></path>
-					</g>
-					<path d="M45401.3 2555.5 L45522.25 2985 L39449.75 3169.9014285714284 L39449.8 3169.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45403.9 2545.0 L45401.3 2555.5 L45393.6 2547.9 L45396.2 2537.5 Z"></path>
-					</g>
-					<path d="M44207.7 612.2 L45836.25 876 L45836.25 1025 L45836.25 1025 L45836.25 1174 L45836.25 1174 L45836.25 1390.5 L45836.25 1390.5 L45836.25 1607 L45836.25 1607 L45506.308055152396 2054.5 L45506.3 2054.5 " fill="none"></path>
-					<path d="M44208.5 607.0 L44207.7 612.2 L44206.8 617.5 L44194.5 610.1 Z"></path>
-					<path d="M22455.0 2340.0 L22605.75 2985 L15438.5 3168.6430877554526 L15438.5 3168.6 " fill="none"></path>
-					<path d="M22460.2 2338.8 L22455.0 2340.0 L22449.8 2341.2 L22452.0 2327.0 Z"></path>
-					<path d="M9895.0 1493.2 L9895 1607 L10439.747822931786 2182 L10439.7 2182.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9900.3 1483.8 L9895.0 1493.2 L9889.7 1483.8 L9895.0 1474.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M9221.6 1041.6 L9895 1174 L9895 1306.5 L9895.0 1306.5 " fill="none"></path>
-					</g>
-					<path d="M9222.6 1036.4 L9221.6 1041.6 L9220.6 1046.9 L9208.5 1039.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M9221.7 1037.6 L10142 1174 L10142 1390.5 L10142 1390.5 L10142 1607 L10142 1607 L10480.615747460088 2182 L10480.6 2182.0 " fill="none"></path>
-					</g>
-					<path d="M9222.5 1032.3 L9221.7 1037.6 L9220.9 1042.8 L9208.5 1035.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3041.4 2319.7 L3896.25 2985 L1932 3154.7752867570384 L1932.0 3154.8 " fill="none"></path>
-					</g>
-					<path d="M3044.7 2315.5 L3041.4 2319.7 L3038.2 2323.9 L3030.9 2311.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M9221.8 1032.6 L10796 1174 L10796 1329 L10796.0 1329.0 " fill="none"></path>
-					</g>
-					<path d="M9222.3 1027.3 L9221.8 1032.6 L9221.3 1037.9 L9208.5 1031.4 Z"></path>
-					<path d="M24367.3 1440.2 L24367.25 1607 L32494.25 2267.7083185840706 L32494.3 2267.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24372.6 1430.8 L24367.3 1440.2 L24361.9 1430.8 L24367.3 1421.5 Z"></path>
-					</g>
-					<path d="M13903.0 1455.7 L13903 1607 L13903 2280.5 L13903.0 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13908.3 1446.3 L13903.0 1455.7 L13897.7 1446.3 L13903.0 1437.0 Z"></path>
-					</g>
-					<path d="M17400.9 1028.7 L13903 1174 L13903 1344 L13903.0 1344.0 " fill="none"></path>
-					<path d="M17401.1 1034.0 L17400.9 1028.7 L17400.7 1023.4 L17414.3 1028.2 Z"></path>
-					<path d="M35489.5 1508.2 L35489.5 1607 L25509.5 2283.526957890594 L25509.5 2283.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35494.8 1498.8 L35489.5 1508.2 L35484.2 1498.8 L35489.5 1489.5 Z"></path>
-					</g>
-					<path d="M35415.1 1117.1 L35489.5 1174 L35489.5 1291.5 L35489.5 1291.5 " fill="none"></path>
-					<path d="M35418.4 1112.9 L35415.1 1117.1 L35411.9 1121.3 L35404.5 1109.0 Z"></path>
-					<path d="M32666.1 2522.2 L32305.75 2985 L40631.25 3170.819261608425 L40631.3 3170.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32676.0 2518.1 L32666.1 2522.2 L32667.6 2511.6 L32677.6 2507.5 Z"></path>
-					</g>
-					<path d="M32926.7 2525.0 L33096.25 2985 L32927.77144772118 3156 L32927.8 3156.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32928.5 2514.4 L32926.7 2525.0 L32918.4 2518.1 L32920.2 2507.5 Z"></path>
-					</g>
-					<path d="M32939.8 2524.7 L33136.25 2985 L39344.75 3169.9361523718258 L39344.8 3169.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32941.1 2514.0 L32939.8 2524.7 L32931.3 2518.2 L32932.5 2507.5 Z"></path>
-					</g>
-					<path d="M42760.0 1434.4 L42807 1607 L33190.25 2271.93798138438 L33190.3 2271.9 " fill="none"></path>
-					<path d="M42765.1 1433.0 L42760.0 1434.4 L42754.8 1435.8 L42756.4 1421.5 Z"></path>
-					<path d="M39497.9 1532.3 L39477.25 1607 L33190.25 2259.862547098719 L33190.3 2259.9 " fill="none"></path>
-					<path d="M39503.1 1533.8 L39497.9 1532.3 L39492.8 1530.9 L39501.5 1519.5 Z"></path>
-					<path d="M42132.4 1554.0 L42107 1607 L33190.25 2270.1199708572817 L33190.3 2270.1 " fill="none"></path>
-					<path d="M42137.2 1556.3 L42132.4 1554.0 L42127.6 1551.7 L42138.1 1542.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M43928.8 1074.5 L43997.75 1174 L43997.75 1390.5 L43997.75 1390.5 L43997.75 1607 L43997.75 1607 L33190.25 2274.5063869839987 L33190.3 2274.5 " fill="none"></path>
-					</g>
-					<path d="M43933.2 1071.4 L43928.8 1074.5 L43924.4 1077.5 L43921.2 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M14199.0 1419.3 L14211.75 1607 L32494.25 2283.1301360672014 L32494.3 2283.1 " fill="none"></path>
-					</g>
-					<path d="M14204.3 1418.9 L14199.0 1419.3 L14193.6 1419.7 L14198.1 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29461.3 1044.6 L29860.5 1174 L29860.5 1390.5 L29860.5 1390.5 L29860.5 1607 L29860.5 1607 L32494.25 2215.5868198205753 L32494.3 2215.6 " fill="none"></path>
-					</g>
-					<path d="M29462.9 1039.5 L29461.3 1044.6 L29459.6 1049.7 L29448.6 1040.5 Z"></path>
-					<path d="M22457.5 2339.8 L22645.75 2985 L15788.5 3167.3775713929194 L15788.5 3167.4 " fill="none"></path>
-					<path d="M22462.6 2338.3 L22457.5 2339.8 L22452.4 2341.3 L22453.8 2327.0 Z"></path>
-					<path d="M40053.1 2494.5 L39830.25 2985 L40631.25 3164.6590499098015 L40631.3 3164.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40061.8 2488.2 L40053.1 2494.5 L40052.1 2483.8 L40060.8 2477.5 Z"></path>
-					</g>
-					<path d="M40064.5 2494.9 L39870.25 2985 L34499.75 3169.916135881104 L34499.8 3169.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40072.9 2488.1 L40064.5 2494.9 L40062.9 2484.2 L40071.3 2477.5 Z"></path>
-					</g>
-					<path d="M40143.3 2496.2 L40143.25 2985 L40143.25 3171.5 L40143.25 3171.5 L40143.25 3358 L40143.25 3358 L40143.25 3514.5 L40143.25 3514.5 L40143.25 3671 L40143.25 3671 L38651.25 3705.371187540558 L38651.3 3705.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40148.6 2486.8 L40143.3 2496.2 L40137.9 2486.8 L40143.3 2477.5 Z"></path>
-					</g>
-					<path d="M40268.8 2493.2 L40581.75 2985 L40581.75 3171.5 L40581.75 3171.5 L40581.75 3358 L40581.75 3358 L39990.75 3484.440874914559 L39990.8 3484.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40268.3 2482.5 L40268.8 2493.2 L40259.3 2488.2 L40258.8 2477.5 Z"></path>
-					</g>
-					<path d="M40279.9 2492.8 L40621.75 2985 L39449.75 3163.5038791343404 L39449.8 3163.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40279.0 2482.1 L40279.9 2492.8 L40270.2 2488.2 L40269.3 2477.5 Z"></path>
-					</g>
-					<path d="M44207.7 610.9 L45876.25 876 L45876.25 1025 L45876.25 1025 L45876.25 1174 L45876.25 1174 L45876.25 1390.5 L45876.25 1390.5 L45876.25 1607 L45876.25 1607 L40689.25 2230.3809523809523 L40689.3 2230.4 " fill="none"></path>
-					<path d="M44208.5 605.6 L44207.7 610.9 L44206.8 616.1 L44194.5 608.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M43940.8 1073.1 L44037.75 1174 L44037.75 1390.5 L44037.75 1390.5 L44037.75 1607 L44037.75 1607 L40689.25 2199.403774553858 L40689.3 2199.4 " fill="none"></path>
-					</g>
-					<path d="M43944.6 1069.4 L43940.8 1073.1 L43936.9 1076.8 L43931.5 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M14207.3 1418.5 L14277 1607 L39597.25 2281.4561832503746 L39597.3 2281.5 " fill="none"></path>
-					</g>
-					<path d="M14212.4 1416.7 L14207.3 1418.5 L14202.3 1420.4 L14202.7 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29465.5 1044.3 L29900.5 1174 L29900.5 1390.5 L29900.5 1390.5 L29900.5 1607 L29900.5 1607 L39597.25 2259.272168118913 L39597.3 2259.3 " fill="none"></path>
-					</g>
-					<path d="M29467.0 1039.2 L29465.5 1044.3 L29464.0 1049.4 L29452.7 1040.5 Z"></path>
-					<path d="M14486.5 1469.6 L14437 1607 L16604.85867198839 2280.5 L16604.9 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14494.7 1462.6 L14486.5 1469.6 L14484.7 1459.0 L14492.8 1452.0 Z"></path>
-					</g>
-					<path d="M14584.6 1465.7 L14715.25 1607 L16825.680333817127 2280.5 L16825.7 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14582.1 1455.2 L14584.6 1465.7 L14574.3 1462.5 L14571.9 1452.0 Z"></path>
-					</g>
-					<path d="M17400.9 1029.5 L14515 1174 L14515 1329 L14515.0 1329.0 " fill="none"></path>
-					<path d="M17401.2 1034.8 L17400.9 1029.5 L17400.7 1024.1 L17414.3 1028.8 Z"></path>
-					<path d="M33964.2 2442.5 L33764.25 2985 L32969 3159.128705606105 L32969.0 3159.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M33972.5 2435.6 L33964.2 2442.5 L33962.5 2431.9 L33970.7 2425.0 Z"></path>
-					</g>
-					<path d="M34185.8 2437.0 L34836.75 2985 L39344.75 3169.353031465848 L39344.8 3169.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M34182.1 2426.9 L34185.8 2437.0 L34175.2 2435.1 L34171.5 2425.0 Z"></path>
-					</g>
-					<path d="M42767.7 1433.6 L42847 1607 L34366.25 2268.8419085374485 L34366.3 2268.8 " fill="none"></path>
-					<path d="M42772.6 1431.4 L42767.7 1433.6 L42762.9 1435.8 L42762.2 1421.5 Z"></path>
-					<path d="M22460.0 2339.6 L22685.75 2985 L16277.5 3165.187497644265 L16277.5 3165.2 " fill="none"></path>
-					<path d="M22465.0 2337.8 L22460.0 2339.6 L22455.0 2341.3 L22455.6 2327.0 Z"></path>
-					<path d="M41923.3 2383.7 L41923.25 2985 L32122.5 3166.301844917797 L32122.5 3166.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41928.6 2374.3 L41923.3 2383.7 L41917.9 2374.3 L41923.3 2365.0 Z"></path>
-					</g>
-					<path d="M39125.0 552.1 L41923.25 876 L41923.25 1025 L41923.25 1025 L41923.25 1174 L41923.25 1174 L41923.25 1390.5 L41923.25 1390.5 L41923.25 1607 L41923.25 1607 L41923.25 2227 L41923.3 2227.0 " fill="none"></path>
-					<path d="M39125.6 546.8 L39125.0 552.1 L39124.4 557.4 L39111.8 550.6 Z"></path>
-					<path d="M27212.0 575.4 L26426.25 876 L26426.25 941 L26426.3 941.0 " fill="none"></path>
-					<path d="M27214.0 580.4 L27212.0 575.4 L27210.1 570.5 L27224.5 570.7 Z"></path>
-					<path d="M25447.8 1440.2 L25447.75 1607 L33670.25 2268.023569219999 L33670.3 2268.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25453.1 1430.8 L25447.8 1440.2 L25442.4 1430.8 L25447.8 1421.5 Z"></path>
-					</g>
-					<path d="M11113.7 1482.4 L10847.75 1607 L9757.833454281568 2280.5 L9757.8 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11124.5 1483.3 L11113.7 1482.4 L11119.9 1473.6 L11130.7 1474.5 Z"></path>
-					</g>
-					<path d="M11394.4 1488.7 L11496.25 1607 L25141.5 2286.8327638881356 L25141.5 2286.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11392.4 1478.1 L11394.4 1488.7 L11384.3 1485.1 L11382.3 1474.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M9221.8 1030.8 L11310 1174 L11310 1306.5 L11310.0 1306.5 " fill="none"></path>
-					</g>
-					<path d="M9222.2 1025.5 L9221.8 1030.8 L9221.4 1036.1 L9208.5 1029.9 Z"></path>
-					<path d="M31841.5 3356.7 L31841.5 3358 L31841.5 3514.5 L31841.5 3514.5 L31841.5 3671 L31841.5 3671 L38553.25 3706.2427060607183 L38553.3 3706.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31846.8 3347.3 L31841.5 3356.7 L31836.2 3347.3 L31841.5 3338.0 Z"></path>
-					</g>
-					<path d="M25536.7 2452.2 L23765.5 2985 L31560.5 3165.0108345715703 L31560.5 3165.0 " fill="none"></path>
-					<path d="M25538.3 2457.3 L25536.7 2452.2 L25535.2 2447.1 L25549.5 2448.4 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29338.0 2340.3 L29338 2985 L31560.5 3150.566706610745 L31560.5 3150.6 " fill="none"></path>
-					</g>
-					<path d="M29343.3 2340.3 L29338.0 2340.3 L29332.7 2340.3 L29338.0 2327.0 Z"></path>
-					<path d="M40981.6 2559.9 L40661.75 2985 L40661.75 3156 L40661.8 3156.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40991.5 2555.7 L40981.6 2559.9 L40983.0 2549.3 L40992.9 2545.0 Z"></path>
-					</g>
-					<path d="M40996.7 2560.3 L40701.75 2985 L34499.75 3170.1269206145967 L34499.8 3170.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41006.4 2555.7 L40996.7 2560.3 L40997.6 2549.6 L41007.3 2545.0 Z"></path>
-					</g>
-					<path d="M41011.8 2560.7 L40741.75 2985 L35339.75 3158.642364701827 L35339.8 3158.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41021.3 2555.7 L41011.8 2560.7 L41012.3 2550.0 L41021.8 2545.0 Z"></path>
-					</g>
-					<path d="M41026.9 2561.2 L40781.75 2985 L32969 3170.1609587953108 L32969.0 3170.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41036.2 2555.7 L41026.9 2561.2 L41026.9 2550.4 L41036.2 2545.0 Z"></path>
-					</g>
-					<path d="M41244.4 2563.2 L41345.75 2985 L41345.75 3171.5 L41345.75 3171.5 L41345.75 3358 L41345.75 3358 L41345.75 3514.5 L41345.75 3514.5 L41345.75 3671 L41345.75 3671 L38651.25 3705.865955895754 L38651.3 3705.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41247.4 2552.8 L41244.4 2563.2 L41237.1 2555.3 L41240.1 2545.0 Z"></path>
-					</g>
-					<path d="M41259.9 2562.9 L41385.75 2985 L41385.75 3171.5 L41385.75 3171.5 L41385.75 3358 L41385.75 3358 L39990.75 3500.180071637903 L39990.8 3500.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41262.3 2552.4 L41259.9 2562.9 L41252.1 2555.5 L41254.5 2545.0 Z"></path>
-					</g>
-					<path d="M41275.2 2562.6 L41425.75 2985 L39449.75 3166.673157505546 L39449.8 3166.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41277.1 2552.0 L41275.2 2562.6 L41267.1 2555.6 L41269.0 2545.0 Z"></path>
-					</g>
-					<path d="M44207.7 609.5 L45916.25 876 L45916.25 1025 L45916.25 1025 L45916.25 1174 L45916.25 1174 L45916.25 1390.5 L45916.25 1390.5 L45916.25 1607 L45916.25 1607 L41631.25 2230.3878800675675 L41631.3 2230.4 " fill="none"></path>
-					<path d="M44208.5 604.3 L44207.7 609.5 L44206.9 614.8 L44194.5 607.5 Z"></path>
-					<path d="M39524.1 1532.8 L39517.25 1607 L40729.25 2109.1455201443173 L40729.3 2109.1 " fill="none"></path>
-					<path d="M39529.4 1533.3 L39524.1 1532.8 L39518.8 1532.3 L39525.3 1519.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M43952.2 1071.9 L44077.75 1174 L44077.75 1390.5 L44077.75 1390.5 L44077.75 1607 L44077.75 1607 L41631.25 2188.756169111303 L41631.3 2188.8 " fill="none"></path>
-					</g>
-					<path d="M43955.6 1067.8 L43952.2 1071.9 L43948.8 1076.0 L43941.8 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M14212.1 1417.7 L14317 1607 L40729.25 2284.432561212809 L40729.3 2284.4 " fill="none"></path>
-					</g>
-					<path d="M14216.7 1415.1 L14212.1 1417.7 L14207.4 1420.2 L14205.6 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29510.4 1042.5 L30332.5 1174 L30332.5 1390.5 L30332.5 1390.5 L30332.5 1607 L30332.5 1607 L40729.25 2267.354520522689 L40729.3 2267.4 " fill="none"></path>
-					</g>
-					<path d="M29511.3 1037.3 L29510.4 1042.5 L29509.6 1047.8 L29497.3 1040.4 Z"></path>
-					<path d="M34939.8 3296.7 L34939.75 3358 L39709.75 3510.0221973322473 L39709.8 3510.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M34945.1 3287.3 L34939.8 3296.7 L34934.4 3287.3 L34939.8 3278.0 Z"></path>
-					</g>
-					<path d="M35358.4 3159.5 L41465.75 2985 L41283.42779390421 2545 L41283.4 2545.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35348.9 3154.5 L35358.4 3159.5 L35349.2 3165.1 L35339.8 3160.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M43963.3 1070.9 L44117.75 1174 L44117.75 1390.5 L44117.75 1390.5 L44117.75 1607 L44117.75 1607 L44117.75 2296 L44117.75 2296 L44117.75 2985 L44117.75 2985 L35339.75 3163.3718675092614 L35339.8 3163.4 " fill="none"></path>
-					</g>
-					<path d="M43966.2 1066.5 L43963.3 1070.9 L43960.3 1075.3 L43952.2 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M14216.4 1416.7 L14357 1607 L14357 2296 L14357 2296 L14357 2985 L14357 2985 L34539.75 3167.875605786399 L34539.8 3167.9 " fill="none"></path>
-					</g>
-					<path d="M14220.7 1413.6 L14216.4 1416.7 L14212.1 1419.9 L14208.5 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29510.4 1041.8 L30372.5 1174 L30372.5 1390.5 L30372.5 1390.5 L30372.5 1607 L30372.5 1607 L30372.5 2296 L30372.5 2296 L30372.5 2985 L30372.5 2985 L34539.75 3155.166319995621 L34539.8 3155.2 " fill="none"></path>
-					</g>
-					<path d="M29511.2 1036.5 L29510.4 1041.8 L29509.6 1047.1 L29497.3 1039.8 Z"></path>
-					<path d="M44955.1 1548.6 L44820.25 1607 L44820.25 2296 L44820.25 2296 L44820.25 2985 L44820.25 2985 L40692.25 3170.132138992425 L40692.3 3170.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44965.8 1549.8 L44955.1 1548.6 L44961.6 1540.0 L44972.3 1541.2 Z"></path>
-					</g>
-					<path d="M44955.4 1562.2 L44860.25 1607 L44860.25 2296 L44860.25 2296 L44860.25 2985 L44860.25 2985 L33389 3170.2805443090047 L33389.0 3170.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44966.1 1563.1 L44955.4 1562.2 L44961.5 1553.4 L44972.3 1554.3 Z"></path>
-					</g>
-					<path d="M44955.7 1578.4 L44900.25 1607 L44900.25 2296 L44900.25 2296 L44900.25 2985 L44900.25 2985 L31289.5 3170.532177901219 L31289.5 3170.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44966.4 1578.9 L44955.7 1578.4 L44961.5 1569.4 L44972.3 1569.9 Z"></path>
-					</g>
-					<path d="M44985.5 1581.2 L44940.25 1607 L44940.25 2296 L44940.25 2296 L44940.25 2985 L44940.25 2985 L34499.75 3170.681900538788 L34499.8 3170.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44996.2 1581.3 L44985.5 1581.2 L44990.9 1572.0 L45001.7 1572.0 Z"></path>
-					</g>
-					<path d="M45327.6 1590.7 L45328.25 1607 L45328.25 2054.5 L45328.3 2054.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45332.6 1581.1 L45327.6 1590.7 L45322.0 1581.5 L45327.0 1572.0 Z"></path>
-					</g>
-					<path d="M45449.5 1587.6 L45462.25 1607 L41631.25 2223.431340495096 L41631.3 2223.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45448.9 1576.9 L45449.5 1587.6 L45440.0 1582.7 L45439.3 1572.0 Z"></path>
-					</g>
-					<path d="M45484.8 1586.3 L45502.25 1607 L40689.25 2225.8014554954284 L40689.3 2225.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45482.9 1575.7 L45484.8 1586.3 L45474.8 1582.6 L45472.8 1572.0 Z"></path>
-					</g>
-					<path d="M45519.7 1585.0 L45542.25 1607 L43917.75 2151.7945972256025 L43917.8 2151.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45516.8 1574.7 L45519.7 1585.0 L45509.3 1582.3 L45506.4 1572.0 Z"></path>
-					</g>
-					<path d="M45554.3 1583.9 L45582.25 1607 L38468.25 2257.6333045729075 L38468.3 2257.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45550.5 1573.8 L45554.3 1583.9 L45543.7 1582.1 L45539.9 1572.0 Z"></path>
-					</g>
-					<path d="M45668.6 1581.0 L45716.25 1607 L45716.25 2296 L45716.25 2296 L45716.25 2985 L45716.25 2985 L39449.75 3169.950506409242 L39449.8 3170.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45663.0 1571.8 L45668.6 1581.0 L45657.9 1581.2 L45652.2 1572.0 Z"></path>
-					</g>
-					<path d="M44207.7 608.3 L45956.25 876 L45956.25 1025 L45956.25 1025 L45956.25 1174 L45956.25 1174 L45668.25 1272.0377358490566 L45668.3 1272.0 " fill="none"></path>
-					<path d="M44208.5 603.0 L44207.7 608.3 L44206.9 613.5 L44194.5 606.3 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M43974.1 1070.1 L44157.75 1174 L44972.25 1325.689677419355 L44972.3 1325.7 " fill="none"></path>
-					</g>
-					<path d="M43976.8 1065.4 L43974.1 1070.1 L43971.5 1074.7 L43962.5 1063.5 Z"></path>
-					<path d="M39550.9 1538.1 L39557.25 1607 L39557.25 2296 L39557.25 2296 L39557.25 2985 L39557.25 2985 L39557.25 3171.5 L39557.25 3171.5 L39557.25 3358 L39557.25 3358 L39557.25 3514.5 L39557.25 3514.5 L39557.25 3671 L39557.25 3671 L38651.25 3704.6785340314136 L38651.3 3704.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39555.3 1528.3 L39550.9 1538.1 L39544.7 1529.3 L39549.2 1519.5 Z"></path>
-					</g>
-					<path d="M39871.8 1424.4 L41671.25 1607 L41671.25 2296 L41671.25 2296 L41671.25 2985 L41671.25 2985 L41671.25 3171.5 L41671.25 3171.5 L41671.25 3358 L41671.25 3358 L39990.75 3502.4251784733665 L39990.8 3502.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39863.1 1418.2 L39871.8 1424.4 L39862.0 1428.8 L39853.3 1422.6 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M43984.8 1069.4 L44197.75 1174 L39853.25 1375.8204591781998 L39853.3 1375.8 " fill="none"></path>
-					</g>
-					<path d="M43987.2 1064.6 L43984.8 1069.4 L43982.5 1074.2 L43972.9 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29510.5 1038.8 L30588.5 1174 L39221.25 1382.854909903618 L39221.3 1382.9 " fill="none"></path>
-					</g>
-					<path d="M29511.1 1033.5 L29510.5 1038.8 L29509.8 1044.1 L29497.3 1037.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M27212.4 583.8 L26595.25 876 L26595.25 1025 L26595.25 1025 L26595.25 1174 L26595.25 1174 L26595.25 1390.5 L26595.25 1390.5 L26595.25 1607 L26595.25 1607 L25452.659288824383 2227 L25452.7 2227.0 " fill="none"></path>
-					</g>
-					<path d="M27214.7 588.6 L27212.4 583.8 L27210.2 579.0 L27224.5 578.1 Z"></path>
-					<path d="M31588.7 1089.7 L30804.5 1174 L30804.5 1390.5 L30804.5 1390.5 L30804.5 1607 L30804.5 1607 L30804.5 2296 L30804.5 2296 L30804.5 2985 L30804.5 2985 L14692.5 3169.422499769847 L14692.5 3169.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31598.5 1094.0 L31588.7 1089.7 L31597.4 1083.4 L31607.3 1087.7 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M27400.8 546.0 L32191.25 876 L32191.25 896 L32191.3 896.0 " fill="none"></path>
-					</g>
-					<path d="M27401.2 540.7 L27400.8 546.0 L27400.4 551.4 L27387.5 545.1 Z"></path>
-					<path d="M32487.1 1159.5 L32519 1174 L32519 1306.5 L32519.0 1306.5 " fill="none"></path>
-					<path d="M32489.4 1154.7 L32487.1 1159.5 L32484.9 1164.4 L32475.0 1154.0 Z"></path>
-					<path d="M32788.3 1145.9 L32927 1174 L32927 1321.5 L32927.0 1321.5 " fill="none"></path>
-					<path d="M32789.4 1140.7 L32788.3 1145.9 L32787.3 1151.1 L32775.3 1143.3 Z"></path>
-					<path d="M32788.5 1098.7 L33399 1174 L33399 1321.5 L33399.0 1321.5 " fill="none"></path>
-					<path d="M32789.1 1093.4 L32788.5 1098.7 L32787.8 1104.0 L32775.3 1097.0 Z"></path>
-					<path d="M32788.5 1076.7 L33911 1174 L33911 1314 L33911.0 1314.0 " fill="none"></path>
-					<path d="M32789.0 1071.4 L32788.5 1076.7 L32788.1 1082.1 L32775.3 1075.6 Z"></path>
-					<path d="M34359.0 1553.2 L34359 1607 L20836.75 2294.525523475694 L20836.8 2294.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M34364.3 1543.8 L34359.0 1553.2 L34353.7 1543.8 L34359.0 1534.5 Z"></path>
-					</g>
-					<path d="M32788.6 1066.1 L34359 1174 L34359 1246.5 L34359.0 1246.5 " fill="none"></path>
-					<path d="M32788.9 1060.7 L32788.6 1066.1 L32788.2 1071.4 L32775.3 1065.1 Z"></path>
-					<path d="M34743.0 1493.2 L34743 1607 L34743 2280.5 L34743.0 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M34748.3 1483.8 L34743.0 1493.2 L34737.7 1483.8 L34743.0 1474.5 Z"></path>
-					</g>
-					<path d="M32788.6 1059.9 L34743 1174 L34743 1306.5 L34743.0 1306.5 " fill="none"></path>
-					<path d="M32788.9 1054.6 L32788.6 1059.9 L32788.2 1065.2 L32775.3 1059.1 Z"></path>
-					<path d="M15378.0 1455.7 L15378 1607 L25549.5 2263.3179902603483 L25549.5 2263.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15383.3 1446.3 L15378.0 1455.7 L15372.7 1446.3 L15378.0 1437.0 Z"></path>
-					</g>
-					<path d="M17400.9 1031.3 L15378 1174 L15378 1344 L15378.0 1344.0 " fill="none"></path>
-					<path d="M17401.3 1036.6 L17400.9 1031.3 L17400.6 1026.0 L17414.3 1030.4 Z"></path>
-					<path d="M15770.0 1478.2 L15770 1607 L25549.5 2262.0724771534124 L25549.5 2262.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15775.3 1468.8 L15770.0 1478.2 L15764.7 1468.8 L15770.0 1459.5 Z"></path>
-					</g>
-					<path d="M17401.0 1032.7 L15770 1174 L15770 1321.5 L15770.0 1321.5 " fill="none"></path>
-					<path d="M17401.4 1038.0 L17401.0 1032.7 L17400.5 1027.4 L17414.3 1031.6 Z"></path>
-					<path d="M14709.9 3093.0 L14722.5 3088 L14730 3088 L14730 3088 L14737.5 3171.5 L14737.5 3171.5 L14730 3255 L14730 3255 L14722.5 3255 L14722.5 3255 L14692.5 3243.1560283687945 L14692.5 3243.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14699.2 3091.5 L14709.9 3093.0 L14703.1 3101.4 L14692.5 3099.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3046.3 2318.7 L4083.25 2985 L14329.5 3168.253877873942 L14329.5 3168.3 " fill="none"></path>
-					</g>
-					<path d="M3049.2 2314.2 L3046.3 2318.7 L3043.5 2323.2 L3035.1 2311.5 Z"></path>
-					<path d="M17756.8 1455.7 L17756.75 1607 L25549.5 2253.9505979455976 L25549.5 2254.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17762.1 1446.3 L17756.8 1455.7 L17751.4 1446.3 L17756.8 1437.0 Z"></path>
-					</g>
-					<path d="M17529.6 1047.0 L17756.75 1174 L17756.75 1344 L17756.8 1344.0 " fill="none"></path>
-					<path d="M17532.2 1042.4 L17529.6 1047.0 L17527.0 1051.7 L17518.0 1040.5 Z"></path>
-					<path d="M30116.5 1440.2 L30116.5 1607 L26562.5 2210.0552887575423 L26562.5 2210.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M30121.8 1430.8 L30116.5 1440.2 L30111.2 1430.8 L30116.5 1421.5 Z"></path>
-					</g>
-					<path d="M23303.3 1455.7 L23303.25 1607 L25549.5 2169.2255017709563 L25549.5 2169.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23308.6 1446.3 L23303.3 1455.7 L23297.9 1446.3 L23303.3 1437.0 Z"></path>
-					</g>
-					<path d="M17579.6 1029.4 L20491 1174 L23127.25 1376.9507067294871 L23127.3 1377.0 " fill="none"></path>
-					<path d="M17579.8 1024.1 L17579.6 1029.4 L17579.3 1034.8 L17566.3 1028.8 Z"></path>
-					<path d="M23695.3 1455.7 L23695.25 1607 L25549.5 2148.174732606163 L25549.5 2148.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23700.6 1446.3 L23695.3 1455.7 L23689.9 1446.3 L23695.3 1437.0 Z"></path>
-					</g>
-					<path d="M17579.6 1029.1 L20707 1174 L23519.25 1377.7487241696645 L23519.3 1377.7 " fill="none"></path>
-					<path d="M17579.8 1023.8 L17579.6 1029.1 L17579.3 1034.5 L17566.3 1028.5 Z"></path>
-					<path d="M25532.9 2566.8 L24725 2985 L14692.5 3168.1859457607206 L14692.5 3168.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25543.7 2567.2 L25532.9 2566.8 L25538.8 2557.7 L25549.5 2558.2 Z"></path>
-					</g>
-					<path d="M25533.0 2575.1 L24765 2985 L32856 3170.2066891684567 L32856.0 3170.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25543.8 2575.4 L25533.0 2575.1 L25538.8 2566.0 L25549.5 2566.3 Z"></path>
-					</g>
-					<path d="M26579.8 2506.9 L27767.25 2985 L27767.25 3171.5 L27767.25 3171.5 L27767.25 3358 L27767.25 3358 L27767.25 3514.5 L27767.25 3514.5 L27767.25 3671 L27767.25 3671 L38553.25 3706.3394554683896 L38553.3 3706.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26573.1 2498.5 L26579.8 2506.9 L26569.2 2508.4 L26562.5 2499.9 Z"></path>
-					</g>
-					<path d="M26579.9 2500.6 L27820.25 2985 L10492.25 3170.7603035006036 L10492.3 3170.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26573.1 2492.2 L26579.9 2500.6 L26569.3 2502.2 L26562.5 2493.8 Z"></path>
-					</g>
-					<path d="M26579.9 2496.1 L27860.25 2985 L39344.75 3170.651317500217 L39344.8 3170.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26573.1 2487.8 L26579.9 2496.1 L26569.3 2497.7 L26562.5 2489.4 Z"></path>
-					</g>
-					<path d="M42775.1 1432.7 L42887 1607 L26562.5 2275.265729903155 L26562.5 2275.3 " fill="none"></path>
-					<path d="M42779.6 1429.8 L42775.1 1432.7 L42770.6 1435.6 L42767.9 1421.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M14220.4 1415.8 L14397 1607 L25549.5 2266.0678874689083 L25549.5 2266.1 " fill="none"></path>
-					</g>
-					<path d="M14224.3 1412.2 L14220.4 1415.8 L14216.4 1419.4 L14211.3 1406.0 Z"></path>
-					<path d="M30588.5 1447.7 L30588.5 1607 L26562.5 2219.0052950910094 L26562.5 2219.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M30593.8 1438.3 L30588.5 1447.7 L30583.2 1438.3 L30588.5 1429.0 Z"></path>
-					</g>
-					<path d="M35461.7 1072.9 L35814 1174 L35814 1375 L35814.0 1375.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35454.2 1065.2 L35461.7 1072.9 L35451.3 1075.5 L35443.8 1067.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M27400.8 543.5 L35294.75 876 L35294.75 941 L35294.8 941.0 " fill="none"></path>
-					</g>
-					<path d="M27401.0 538.2 L27400.8 543.5 L27400.6 548.8 L27387.5 542.9 Z"></path>
-					<path d="M42210.8 1097.7 L42210.75 1174 L42210.75 1239 L42210.8 1239.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42216.1 1088.3 L42210.8 1097.7 L42205.4 1088.3 L42210.8 1079.0 Z"></path>
-					</g>
-					<path d="M39125.0 551.0 L42210.75 876 L42210.75 971 L42210.8 971.0 " fill="none"></path>
-					<path d="M39125.6 545.7 L39125.0 551.0 L39124.5 556.3 L39111.8 549.6 Z"></path>
-					<path d="M42226.5 1560.6 L42230.75 1607 L42230.75 2296 L42230.75 2296 L42230.75 2985 L42230.75 2985 L32969 3170.369181445014 L32969.0 3170.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42230.9 1550.8 L42226.5 1560.6 L42220.3 1551.8 L42224.7 1542.0 Z"></path>
-					</g>
-					<path d="M42257.7 1560.0 L42270.75 1607 L42270.75 2296 L42270.75 2296 L42270.75 2985 L42270.75 2985 L13953.5 3170.94185759931 L13953.5 3170.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42260.4 1549.6 L42257.7 1560.0 L42250.1 1552.4 L42252.7 1542.0 Z"></path>
-					</g>
-					<path d="M19907.2 1404.4 L21294.75 1607 L22393.008345428156 2265 L22393.0 2265.0 " fill="none"></path>
-					<path d="M19908.0 1399.1 L19907.2 1404.4 L19906.4 1409.7 L19894.0 1402.5 Z"></path>
-					<path d="M31034.8 1470.2 L31034.75 1607 L17141.25 2292.447817836812 L17141.3 2292.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31040.1 1460.8 L31034.8 1470.2 L31029.4 1460.8 L31034.8 1451.5 Z"></path>
-					</g>
-					<path d="M31669.5 2345.7 L31669.5 2985 L13743.5 3169.972833905057 L13743.5 3170.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31674.8 2336.3 L31669.5 2345.7 L31664.2 2336.3 L31669.5 2327.0 Z"></path>
-					</g>
-					<path d="M31364.8 1463.2 L31364.75 1607 L14287.25 2294.5707064804533 L14287.3 2294.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31370.1 1453.8 L31364.8 1463.2 L31359.4 1453.8 L31364.8 1444.5 Z"></path>
-					</g>
-					<path d="M17389.8 2419.5 L15904.25 2985 L33238 3170.691191464308 L33238.0 3170.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17400.4 2421.2 L17389.8 2419.5 L17396.6 2411.2 L17407.3 2412.9 Z"></path>
-					</g>
-					<path d="M17390.9 2472.9 L16454.75 2985 L31147.5 3170.603107272881 L31147.5 3170.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17401.6 2473.1 L17390.9 2472.9 L17396.5 2463.7 L17407.3 2463.9 Z"></path>
-					</g>
-					<path d="M17391.0 2478.6 L16494.75 2985 L12975.5 3167.7863607881363 L12975.5 3167.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17401.7 2478.7 L17391.0 2478.6 L17396.5 2469.4 L17407.3 2469.5 Z"></path>
-					</g>
-					<path d="M18021.9 2495.1 L18778.5 2985 L34407.75 3170.9527041036026 L34407.8 3171.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18016.9 2485.6 L18021.9 2495.1 L18011.1 2494.5 L18006.2 2485.0 Z"></path>
-					</g>
-					<path d="M18033.0 2494.9 L18818.5 2985 L13953.5 3168.2974747474746 L13953.5 3168.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18027.9 2485.4 L18033.0 2494.9 L18022.3 2494.5 L18017.2 2485.0 Z"></path>
-					</g>
-					<path d="M18037.2 2490.5 L18858.5 2985 L13164.5 3169.09135823871 L13164.5 3169.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18032.0 2481.1 L18037.2 2490.5 L18026.5 2490.2 L18021.3 2480.9 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M7035.5 1417.1 L7162.25 1607 L17407.25 2275.954226686884 L17407.3 2276.0 " fill="none"></path>
-					</g>
-					<path d="M7039.9 1414.1 L7035.5 1417.1 L7031.1 1420.1 L7028.1 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3047.4 2318.5 L4123.25 2985 L13447.5 3168.586014410515 L13447.5 3168.6 " fill="none"></path>
-					</g>
-					<path d="M3050.2 2314.0 L3047.4 2318.5 L3044.5 2323.1 L3036.0 2311.5 Z"></path>
-					<path d="M31936.0 1548.9 L31888 1607 L31888 2280.5 L31888.0 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31946.1 1545.1 L31936.0 1548.9 L31937.9 1538.3 L31947.9 1534.5 Z"></path>
-					</g>
-					<path d="M32211.8 1548.3 L32265.75 1607 L32265.75 2280.5 L32265.8 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32209.4 1537.8 L32211.8 1548.3 L32201.6 1545.0 L32199.2 1534.5 Z"></path>
-					</g>
-					<path d="M32325.3 1441.1 L33173 1607 L14287.25 2294.7072999933935 L14287.3 2294.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32317.2 1434.0 L32325.3 1441.1 L32315.1 1444.5 L32307.0 1437.5 Z"></path>
-					</g>
-					<path d="M32325.3 1439.3 L33213 1607 L18021.25 2282.3522542140495 L18021.3 2282.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32317.2 1432.3 L32325.3 1439.3 L32315.2 1442.8 L32307.0 1435.8 Z"></path>
-					</g>
-					<path d="M2349.7 3072.2 L2363 3065.5 L2370.5 3065.5 L2370.5 3065.5 L2378 3171.5 L2378 3171.5 L2370.5 3277.5 L2370.5 3277.5 L2363 3277.5 L2363 3277.5 L2333 3262.393111638955 L2333.0 3262.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2338.9 3071.6 L2349.7 3072.2 L2343.7 3081.2 L2333.0 3080.6 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3052.0 2317.7 L4310.25 2985 L2333 3155.8989109025606 L2333.0 3155.9 " fill="none"></path>
-					</g>
-					<path d="M3054.5 2313.0 L3052.0 2317.7 L3049.5 2322.5 L3040.2 2311.5 Z"></path>
-					<path d="M33387.5 2412.0 L33176.25 2985 L40631.25 3170.7400975218757 L40631.3 3170.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M33395.7 2405.1 L33387.5 2412.0 L33385.7 2401.4 L33393.9 2394.5 Z"></path>
-					</g>
-					<path d="M33473.0 2412.0 L33684.25 2985 L32395.5 3156.0385162782422 L32395.5 3156.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M33474.8 2401.4 L33473.0 2412.0 L33464.8 2405.1 L33466.6 2394.5 Z"></path>
-					</g>
-					<path d="M33479.6 2411.7 L33724.25 2985 L33155.09048257372 3156 L33155.1 3156.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M33480.8 2401.0 L33479.6 2411.7 L33471.0 2405.2 L33472.3 2394.5 Z"></path>
-					</g>
-					<path d="M17579.6 1028.9 L20883.5 1174 L23911.25 1383.7793023441875 L23911.3 1383.8 " fill="none"></path>
-					<path d="M17579.8 1023.6 L17579.6 1028.9 L17579.3 1034.3 L17566.3 1028.3 Z"></path>
-					<g data-name="IAppDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
-							<rect x="26232.5" y="60.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
-							<path d="M26232.5 91.5 L26429.5 91.5" fill="none" data-name="IAppDelegate"></path>
-						</g>
-						<g transform="translate(26232.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26232.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
-							<rect x="26469.5" y="22.5" height="138.0" width="301.0" data-name="AppController"></rect>
-							<path d="M26469.5 53.5 L26770.5 53.5" fill="none" data-name="AppController"></path>
-							<path d="M26469.5 114.5 L26770.5 114.5" fill="none" data-name="AppController"></path>
-						</g>
-						<g transform="translate(26469.5, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26469.5, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26469.5, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyMonitorScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="18548.8" y="2265.0" height="62.0" width="176.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M18548.8 2296.0 L18724.8 2296.0" fill="none" data-name="StudyMonitorScreen"></path>
-						</g>
-						<g transform="translate(18548.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18548.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="19730.0" y="1344.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
-							<path d="M19730.0 1375.0 L19894.0 1375.0" fill="none" data-name="StudyPageWidget"></path>
-							<path d="M19730.0 1406.0 L19894.0 1406.0" fill="none" data-name="StudyPageWidget"></path>
-						</g>
-						<g transform="translate(19730, 1344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19730, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19730, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LoginForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
-							<rect x="0.0" y="2249.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
-							<path d="M0.0 2280.5 L207.0 2280.5" fill="none" data-name="LoginForm"></path>
-							<path d="M0.0 2311.5 L207.0 2311.5" fill="none" data-name="LoginForm"></path>
-						</g>
-						<g transform="translate(0, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthFormKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
-							<rect x="1100.0" y="3088.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
-							<path d="M1100.0 3119.0 L1455.0 3119.0" fill="none" data-name="AuthFormKey"></path>
-						</g>
-						<g transform="translate(1100, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
-								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1100, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerRefWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="690.8" y="1375.0" height="31.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
-						</g>
-						<g transform="translate(690.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordRecoveryForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
-							<rect x="572.5" y="2249.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
-							<path d="M572.5 2280.5 L780.5 2280.5" fill="none" data-name="PasswordRecoveryForm"></path>
-							<path d="M572.5 2311.5 L780.5 2311.5" fill="none" data-name="PasswordRecoveryForm"></path>
-						</g>
-						<g transform="translate(572.5, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(572.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(572.5, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordForgotForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
-							<rect x="820.5" y="2249.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
-							<path d="M820.5 2280.5 L1027.5 2280.5" fill="none" data-name="PasswordForgotForm"></path>
-							<path d="M820.5 2311.5 L1027.5 2311.5" fill="none" data-name="PasswordForgotForm"></path>
-						</g>
-						<g transform="translate(820.5, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(820.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(820.5, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SignupForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
-							<rect x="1067.5" y="2234.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
-							<path d="M1067.5 2265.5 L1345.5 2265.5" fill="none" data-name="SignupForm"></path>
-							<path d="M1067.5 2296.5 L1345.5 2296.5" fill="none" data-name="SignupForm"></path>
-						</g>
-						<g transform="translate(1067.5, 2234.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
-								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1067.5, 2265.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1067.5, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
-							<rect x="1256.0" y="1329.5" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
-							<path d="M1256.0 1360.5 L1515.0 1360.5" fill="none" data-name="AuthScaffold"></path>
-						</g>
-						<g transform="translate(1256, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1256, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="14216.3" y="2280.5" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(14216.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EdgeInsets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="3553.3" y="2280.5" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
-						</g>
-						<g transform="translate(3553.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EmailTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
-							<rect x="1689.5" y="2242.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
-							<path d="M1689.5 2273.5 L2010.5 2273.5" fill="none" data-name="EmailTextField"></path>
-						</g>
-						<g transform="translate(1689.5, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1689.5, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="32856.0" y="3156.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(32856, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
-							<rect x="2050.5" y="2235.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
-							<path d="M2050.5 2266.0 L2529.5 2266.0" fill="none" data-name="PasswordTextField"></path>
-						</g>
-						<g transform="translate(2050.5, 2235)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2050.5, 2266)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<rect x="270.8" y="3156.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(270.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUJobsToBeDone">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
-							<rect x="26810.5" y="60.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
-							<path d="M26810.5 91.5 L27004.5 91.5" fill="none" data-name="StudyUJobsToBeDone"></path>
-						</g>
-						<g transform="translate(26810.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26810.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthFormController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
-							<rect x="35509.0" y="2039.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
-							<path d="M35509.0 2070.5 L36359.0 2070.5" fill="none" data-name="AuthFormController"></path>
-							<path d="M35509.0 2326.5 L36359.0 2326.5" fill="none" data-name="AuthFormController"></path>
-						</g>
-						<g transform="translate(35509, 2039.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
-								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35509, 2070.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35509, 2326.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="31147.5" y="3156.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
-						</g>
-						<g transform="translate(31147.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="INotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="16317.5" y="3156.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
-						</g>
-						<g transform="translate(16317.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="34407.8" y="3156.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(34407.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="39344.8" y="3156.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(39344.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormGroupController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="38033.5" y="60.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
-							<path d="M38033.5 91.5 L38220.5 91.5" fill="none" data-name="IFormGroupController"></path>
-						</g>
-						<g transform="translate(38033.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
-								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38033.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="2980.5" y="2280.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(2980.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
-							<rect x="731.0" y="3118.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
-							<path d="M731.0 3149.0 L1010.0 3149.0" fill="none" data-name="AppStatus"></path>
-						</g>
-						<g transform="translate(731, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
-								
-							</g>
-						</g>
-						<g transform="translate(731, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArrayTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
-							<rect x="2223.0" y="1194.0" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
-							<path d="M2223.0 1225.0 L2713.0 1225.0" fill="none" data-name="FormArrayTable"></path>
-							<path d="M2223.0 1526.0 L2713.0 1526.0" fill="none" data-name="FormArrayTable"></path>
-						</g>
-						<g transform="translate(2223, 1194)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
-								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2223, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2223, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="10354.3" y="3156.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(10354.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="1505.5" y="2280.5" height="31.0" width="144.0" data-name="void Function(T)"></rect>
-						</g>
-						<g transform="translate(1505.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<rect x="2569.5" y="2280.5" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
-						</g>
-						<g transform="translate(2569.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="16997.3" y="2280.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(16997.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="String Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
-							<rect x="3698.3" y="2280.5" height="31.0" width="157.0" data-name="String Function(T)"></rect>
-						</g>
-						<g transform="translate(3698.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="16431.3" y="2280.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(16431.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
-							<rect x="3895.3" y="2280.5" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
-						</g>
-						<g transform="translate(3895.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
-								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="42550.0" y="1359.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
-							<path d="M42550.0 1390.5 L42946.0 1390.5" fill="none" data-name="ManagedFormViewModel"></path>
-						</g>
-						<g transform="translate(42550, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(42550, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="43322.5" y="223.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
-							<path d="M43322.5 254.0 L44194.5 254.0" fill="none" data-name="FormViewModel"></path>
-							<path d="M43322.5 570.0 L44194.5 570.0" fill="none" data-name="FormViewModel"></path>
-						</g>
-						<g transform="translate(43322.5, 223)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43322.5, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43322.5, 570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
-							<rect x="26662.5" y="524.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
-						</g>
-						<g transform="translate(26662.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Exception">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="27044.5" y="76.0" height="31.0" width="94.0" data-name="Exception"></rect>
-						</g>
-						<g transform="translate(27044.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="39709.8" y="3378.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
-							<path d="M39709.8 3409.0 L39990.8 3409.0" fill="none" data-name="FormViewModelCollection"></path>
-							<path d="M39709.8 3500.0 L39990.8 3500.0" fill="none" data-name="FormViewModelCollection"></path>
-						</g>
-						<g transform="translate(39709.75, 3378)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39709.75, 3409)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39709.75, 3500)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="38553.3" y="3691.0" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(38553.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomFormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
-							<rect x="32706.0" y="3430.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
-							<path d="M32706.0 3461.5 L33119.0 3461.5" fill="none" data-name="CustomFormControl"></path>
-							<path d="M32706.0 3567.5 L33119.0 3567.5" fill="none" data-name="CustomFormControl"></path>
-						</g>
-						<g transform="translate(32706, 3430.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32706, 3461.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32706, 3567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Debouncer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="41462.5" y="3691.0" height="31.0" width="103.0" data-name="Debouncer"></rect>
-						</g>
-						<g transform="translate(41462.5, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(T?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
-							<rect x="31588.3" y="3691.0" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
-						</g>
-						<g transform="translate(31588.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(ControlStatus)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
-							<rect x="31792.3" y="3691.0" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
-						</g>
-						<g transform="translate(31792.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="UnsavedChangesDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
-							<rect x="43828.5" y="60.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
-							<path d="M43828.5 91.5 L44035.5 91.5" fill="none" data-name="UnsavedChangesDialog"></path>
-						</g>
-						<g transform="translate(43828.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43828.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormValidationSetEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
-							<rect x="43227.8" y="1009.5" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
-						</g>
-						<g transform="translate(43227.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
-								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControlValidation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
-							<rect x="4943.3" y="2227.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
-							<path d="M4943.3 2258.0 L5428.3 2258.0" fill="none" data-name="FormControlValidation"></path>
-							<path d="M4943.3 2334.0 L5428.3 2334.0" fill="none" data-name="FormControlValidation"></path>
-						</g>
-						<g transform="translate(4943.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
-								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4943.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4943.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="27224.5" y="493.0" height="93.0" width="163.0" data-name="IFormData"></rect>
-							<path d="M27224.5 524.0 L27387.5 524.0" fill="none" data-name="IFormData"></path>
-							<path d="M27224.5 555.0 L27387.5 555.0" fill="none" data-name="IFormData"></path>
-						</g>
-						<g transform="translate(27224.5, 493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27224.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27224.5, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormInvalidException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
-							<rect x="26998.5" y="524.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
-						</g>
-						<g transform="translate(26998.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConfigException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
-							<rect x="34673.3" y="508.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
-							<path d="M34673.3 539.5 L34858.3 539.5" fill="none" data-name="FormConfigException"></path>
-						</g>
-						<g transform="translate(34673.25, 508.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
-								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34673.25, 539.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="43786.0" y="986.5" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-							<path d="M43786.0 1017.5 L44003.0 1017.5" fill="none" data-name="IFormViewModelDelegate"></path>
-						</g>
-						<g transform="translate(43786, 986.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43786, 1017.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControlOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
-							<rect x="44234.5" y="486.0" height="107.0" width="190.0" data-name="FormControlOption"></rect>
-							<path d="M44234.5 517.0 L44424.5 517.0" fill="none" data-name="FormControlOption"></path>
-						</g>
-						<g transform="translate(44234.5, 486)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44234.5, 517)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="44281.5" y="76.0" height="31.0" width="96.0" data-name="Equatable"></rect>
-						</g>
-						<g transform="translate(44281.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
-							<rect x="28528.3" y="3110.5" height="122.0" width="282.0" data-name="FormMode"></rect>
-							<path d="M28528.3 3141.5 L28810.3 3141.5" fill="none" data-name="FormMode"></path>
-						</g>
-						<g transform="translate(28528.25, 3110.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28528.25, 3141.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CancelableOperation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="44277.8" y="1009.5" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
-						</g>
-						<g transform="translate(44277.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrolledBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="44417.5" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M44417.5 76.0 L44583.5 76.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M44417.5 107.0 L44583.5 107.0" fill="none" data-name="EnrolledBadge"></path>
-						</g>
-						<g transform="translate(44417.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44417.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44417.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRecruitController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="5468.3" y="2204.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M5468.3 2235.5 L6119.3 2235.5" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M5468.3 2281.5 L6119.3 2281.5" fill="none" data-name="StudyRecruitController"></path>
-						</g>
-						<g transform="translate(5468.25, 2204.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
-								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5468.25, 2235.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5468.25, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IInviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="31329.5" y="3156.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
-						</g>
-						<g transform="translate(31329.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="13783.5" y="3156.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
-						</g>
-						<g transform="translate(13783.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyBaseController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="4974.0" y="1299.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
-							<path d="M4974.0 1330.0 L5520.0 1330.0" fill="none" data-name="StudyBaseController"></path>
-							<path d="M4974.0 1406.0 L5520.0 1406.0" fill="none" data-name="StudyBaseController"></path>
-						</g>
-						<g transform="translate(4974, 1299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
-								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4974, 1330)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4974, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="6925.8" y="1375.0" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
-						</g>
-						<g transform="translate(6925.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRecruitScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="18764.8" y="2242.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M18764.8 2273.5 L19078.8 2273.5" fill="none" data-name="StudyRecruitScreen"></path>
-						</g>
-						<g transform="translate(18764.75, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18764.75, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
-							<rect x="36439.0" y="1336.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
-							<path d="M36439.0 1367.5 L36877.0 1367.5" fill="none" data-name="InviteCodeFormView"></path>
-							<path d="M36439.0 1398.5 L36877.0 1398.5" fill="none" data-name="InviteCodeFormView"></path>
-						</g>
-						<g transform="translate(36439, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
-								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36439, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36439, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="42310.8" y="2107.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M42310.8 2138.0 L42977.8 2138.0" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M42310.8 2364.0 L42977.8 2364.0" fill="none" data-name="InviteCodeFormViewModel"></path>
-						</g>
-						<g transform="translate(42310.75, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
-								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(42310.75, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(42310.75, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="38919.8" y="524.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
-						</g>
-						<g transform="translate(38919.75, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInvitesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="44826.3" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M44826.3 31.0 L45392.3 31.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M44826.3 137.0 L45392.3 137.0" fill="none" data-name="StudyInvitesTable"></path>
-						</g>
-						<g transform="translate(44826.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
-								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44826.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44826.25, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="44630.0" y="524.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(44630, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="44892.0" y="524.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(44892, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention? Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="45352.0" y="524.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
-						</g>
-						<g transform="translate(45352, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="int Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="45643.0" y="524.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(45643, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="40631.3" y="3156.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(40631.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PublishSuccessDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
-							<rect x="19118.8" y="2265.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
-							<path d="M19118.8 2296.0 L19309.8 2296.0" fill="none" data-name="PublishSuccessDialog"></path>
-						</g>
-						<g transform="translate(19118.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19118.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PublishDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
-							<rect x="20098.8" y="2265.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
-							<path d="M20098.8 2296.0 L20234.8 2296.0" fill="none" data-name="PublishDialog"></path>
-						</g>
-						<g transform="translate(20098.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20098.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PublishConfirmationDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
-							<rect x="20274.8" y="2265.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
-							<path d="M20274.8 2296.0 L20498.8 2296.0" fill="none" data-name="PublishConfirmationDialog"></path>
-						</g>
-						<g transform="translate(20274.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20274.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FrameControlsWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
-							<rect x="11577.0" y="1329.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
-							<path d="M11577.0 1360.0 L11868.0 1360.0" fill="none" data-name="FrameControlsWidget"></path>
-							<path d="M11577.0 1421.0 L11868.0 1421.0" fill="none" data-name="FrameControlsWidget"></path>
-						</g>
-						<g transform="translate(11577, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11577, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11577, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="17414.3" y="1009.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(17414.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyStatusBadgeViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
-							<rect x="7961.8" y="1352.0" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
-							<path d="M7961.8 1383.0 L8246.8 1383.0" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
-						</g>
-						<g transform="translate(7961.75, 1352)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7961.75, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="9675.8" y="2280.5" height="31.0" width="114.0" data-name="Participation"></rect>
-						</g>
-						<g transform="translate(9675.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
-							<rect x="8311.8" y="2280.5" height="31.0" width="111.0" data-name="StudyStatus"></rect>
-						</g>
-						<g transform="translate(8311.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
-								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyStatusBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
-							<rect x="8286.8" y="1314.0" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
-							<path d="M8286.8 1345.0 L8527.8 1345.0" fill="none" data-name="StudyStatusBadge"></path>
-							<path d="M8286.8 1436.0 L8527.8 1436.0" fill="none" data-name="StudyStatusBadge"></path>
-						</g>
-						<g transform="translate(8286.75, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8286.75, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8286.75, 1436)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="11459.3" y="2280.5" height="31.0" width="106.0" data-name="BadgeType"></rect>
-						</g>
-						<g transform="translate(11459.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RouteInformation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
-							<rect x="8572.8" y="2227.0" height="138.0" width="152.0" data-name="RouteInformation"></rect>
-							<path d="M8572.8 2258.0 L8724.8 2258.0" fill="none" data-name="RouteInformation"></path>
-							<path d="M8572.8 2334.0 L8724.8 2334.0" fill="none" data-name="RouteInformation"></path>
-						</g>
-						<g transform="translate(8572.75, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8572.75, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8572.75, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
-							<rect x="8567.8" y="1261.5" height="258.0" width="302.0" data-name="PlatformController"></rect>
-							<path d="M8567.8 1292.5 L8869.8 1292.5" fill="none" data-name="PlatformController"></path>
-							<path d="M8567.8 1383.5 L8869.8 1383.5" fill="none" data-name="PlatformController"></path>
-						</g>
-						<g transform="translate(8567.75, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
-								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8567.75, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8567.75, 1383.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WebController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
-							<rect x="9829.8" y="2197.0" height="198.0" width="273.0" data-name="WebController"></rect>
-							<path d="M9829.8 2228.0 L10102.8 2228.0" fill="none" data-name="WebController"></path>
-							<path d="M9829.8 2259.0 L10102.8 2259.0" fill="none" data-name="WebController"></path>
-						</g>
-						<g transform="translate(9829.75, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
-								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9829.75, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9829.75, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFrameElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
-							<rect x="11087.8" y="3156.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
-						</g>
-						<g transform="translate(11087.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MobileController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
-							<rect x="10142.8" y="2212.5" height="167.0" width="191.0" data-name="MobileController"></rect>
-							<path d="M10142.8 2243.5 L10333.8 2243.5" fill="none" data-name="MobileController"></path>
-						</g>
-						<g transform="translate(10142.75, 2212.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10142.75, 2243.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
-							<rect x="4250.3" y="2182.0" height="228.0" width="573.0" data-name="StudyController"></rect>
-							<path d="M4250.3 2213.0 L4823.3 2213.0" fill="none" data-name="StudyController"></path>
-							<path d="M4250.3 2274.0 L4823.3 2274.0" fill="none" data-name="StudyController"></path>
-						</g>
-						<g transform="translate(4250.25, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
-								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4250.25, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4250.25, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyNavViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
-							<rect x="8909.8" y="1322.0" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
-							<path d="M8909.8 1353.0 L9150.8 1353.0" fill="none" data-name="IStudyNavViewModel"></path>
-						</g>
-						<g transform="translate(8909.75, 1322)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8909.75, 1353)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
-							<rect x="45518.5" y="23.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
-							<path d="M45518.5 54.0 L45751.5 54.0" fill="none" data-name="StudyNav"></path>
-						</g>
-						<g transform="translate(45518.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45518.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
-							<rect x="45791.5" y="23.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
-							<path d="M45791.5 54.0 L46079.5 54.0" fill="none" data-name="StudyDesignNav"></path>
-						</g>
-						<g transform="translate(45791.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45791.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IWithBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="20933.3" y="1009.5" height="31.0" width="113.0" data-name="IWithBanner"></rect>
-						</g>
-						<g transform="translate(20933.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyParticipationBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
-							<rect x="9190.8" y="1321.5" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
-							<path d="M9190.8 1352.5 L9421.8 1352.5" fill="none" data-name="StudyParticipationBadge"></path>
-							<path d="M9190.8 1428.5 L9421.8 1428.5" fill="none" data-name="StudyParticipationBadge"></path>
-						</g>
-						<g transform="translate(9190.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9190.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9190.75, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="33238.0" y="3156.0" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
-						</g>
-						<g transform="translate(33238, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PreviewFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
-							<rect x="46119.5" y="45.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
-							<path d="M46119.5 76.5 L46410.5 76.5" fill="none" data-name="PreviewFrame"></path>
-						</g>
-						<g transform="translate(46119.5, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(46119.5, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="46173.0" y="524.0" height="31.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(46173, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyAppBarViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
-							<rect x="8908.8" y="2250.0" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
-							<path d="M8908.8 2281.0 L9151.8 2281.0" fill="none" data-name="IStudyAppBarViewModel"></path>
-						</g>
-						<g transform="translate(8908.75, 2250)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8908.75, 2281)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
-							<rect x="24559.0" y="904.0" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
-							<path d="M24559.0 935.0 L24894.0 935.0" fill="none" data-name="StudyScaffold"></path>
-						</g>
-						<g transform="translate(24559, 904)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
-								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24559, 935)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NavbarTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="24629.3" y="1375.0" height="31.0" width="103.0" data-name="NavbarTab"></rect>
-						</g>
-						<g transform="translate(24629.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SingleColumnLayoutType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="24812.3" y="1375.0" height="31.0" width="218.0" data-name="SingleColumnLayoutType"></rect>
-						</g>
-						<g transform="translate(24812.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WebFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
-							<rect x="46450.5" y="37.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
-							<path d="M46450.5 68.5 L46619.5 68.5" fill="none" data-name="WebFrame"></path>
-							<path d="M46450.5 114.5 L46619.5 114.5" fill="none" data-name="WebFrame"></path>
-						</g>
-						<g transform="translate(46450.5, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(46450.5, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(46450.5, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DisabledFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
-							<rect x="46659.5" y="60.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
-							<path d="M46659.5 91.5 L46795.5 91.5" fill="none" data-name="DisabledFrame"></path>
-						</g>
-						<g transform="translate(46659.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(46659.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PhoneContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
-							<rect x="10182.0" y="1284.0" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
-							<path d="M10182.0 1315.0 L10509.0 1315.0" fill="none" data-name="PhoneContainer"></path>
-							<path d="M10182.0 1466.0 L10509.0 1466.0" fill="none" data-name="PhoneContainer"></path>
-						</g>
-						<g transform="translate(10182, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
-								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10182, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10182, 1466)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="20778.8" y="2280.5" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(20778.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MobileFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
-							<rect x="46835.5" y="60.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
-							<path d="M46835.5 91.5 L46971.5 91.5" fill="none" data-name="MobileFrame"></path>
-						</g>
-						<g transform="translate(46835.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(46835.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DesktopFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
-							<rect x="47011.5" y="60.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
-							<path d="M47011.5 91.5 L47147.5 91.5" fill="none" data-name="DesktopFrame"></path>
-						</g>
-						<g transform="translate(47011.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47011.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTestScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
-							<rect x="20538.8" y="2219.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
-							<path d="M20538.8 2250.5 L20738.8 2250.5" fill="none" data-name="StudyTestScreen"></path>
-							<path d="M20538.8 2281.5 L20738.8 2281.5" fill="none" data-name="StudyTestScreen"></path>
-						</g>
-						<g transform="translate(20538.75, 2219.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
-								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20538.75, 2250.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20538.75, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySettingsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="44301.3" y="2167.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M44301.3 2198.0 L44780.3 2198.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M44301.3 2334.0 L44780.3 2334.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-						</g>
-						<g transform="translate(44301.25, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44301.25, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44301.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="44362.0" y="3156.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
-						</g>
-						<g transform="translate(44362, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="20876.8" y="2265.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M20876.8 2296.0 L21051.8 2296.0" fill="none" data-name="StudySettingsDialog"></path>
-						</g>
-						<g transform="translate(20876.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
-								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20876.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTestController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
-							<rect x="6535.3" y="2257.5" height="77.0" width="282.0" data-name="StudyTestController"></rect>
-							<path d="M6535.3 2288.5 L6817.3 2288.5" fill="none" data-name="StudyTestController"></path>
-						</g>
-						<g transform="translate(6535.25, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6535.25, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TestAppRoutes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
-							<rect x="47187.5" y="23.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
-							<path d="M47187.5 54.0 L47447.5 54.0" fill="none" data-name="TestAppRoutes"></path>
-						</g>
-						<g transform="translate(47187.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47187.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
-								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
-							<rect x="25247.8" y="926.0" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
-							<path d="M25247.8 957.0 L25692.8 957.0" fill="none" data-name="DrawerEntry"></path>
-							<path d="M25247.8 1093.0 L25692.8 1093.0" fill="none" data-name="DrawerEntry"></path>
-						</g>
-						<g transform="translate(25247.75, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
-								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25247.75, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DrawerEntry">+localizedHelpText: String Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DrawerEntry">+enabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DrawerEntry">+onSelected: void Function(BuildContext, WidgetRef)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DrawerEntry">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DrawerEntry">+title: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DrawerEntry">+helpText: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25247.75, 1093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="String Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
-							<rect x="25070.3" y="1375.0" height="31.0" width="147.0" data-name="String Function()"></rect>
-						</g>
-						<g transform="translate(25070.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
-								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="String Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
-							<rect x="25718.3" y="1375.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
-						</g>
-						<g transform="translate(25718.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(BuildContext, WidgetRef)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
-							<rect x="25915.3" y="1375.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
-						</g>
-						<g transform="translate(25915.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
-								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouterDrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
-							<rect x="26291.3" y="1336.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
-							<path d="M26291.3 1367.5 L26555.3 1367.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-							<path d="M26291.3 1413.5 L26555.3 1413.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-						</g>
-						<g transform="translate(26291.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26291.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26291.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="27858.8" y="2280.5" height="31.0" width="122.0" data-name="RoutingIntent"></rect>
-						</g>
-						<g transform="translate(27858.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppDrawer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
-							<rect x="47487.5" y="8.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
-							<path d="M47487.5 39.0 L47756.5 39.0" fill="none" data-name="AppDrawer"></path>
-						</g>
-						<g transform="translate(47487.5, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
-								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47487.5, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppDrawer">+leftPaddingEntries: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppDrawer">+logoPaddingVertical: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppDrawer">+logoPaddingHorizontal: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AppDrawer">+logoMaxHeight: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AppDrawer">+logoSectionMinHeight: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AppDrawer">+logoSectionMaxHeight: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyAnalyzeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
-							<rect x="22118.8" y="2257.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
-							<path d="M22118.8 2288.5 L22298.8 2288.5" fill="none" data-name="StudyAnalyzeScreen"></path>
-						</g>
-						<g transform="translate(22118.75, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22118.75, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyAnalyzeController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
-							<rect x="6857.3" y="2265.0" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
-							<path d="M6857.3 2296.0 L7058.3 2296.0" fill="none" data-name="StudyAnalyzeController"></path>
-						</g>
-						<g transform="translate(6857.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
-								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6857.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignInterventionsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="13993.5" y="3140.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M13993.5 3171.5 L14289.5 3171.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
-						</g>
-						<g transform="translate(13993.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13993.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="22338.8" y="2265.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M22338.8 2296.0 L22550.8 2296.0" fill="none" data-name="StudyDesignPageWidget"></path>
-						</g>
-						<g transform="translate(22338.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22338.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="12278.0" y="1359.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M12278.0 1390.5 L12653.0 1390.5" fill="none" data-name="InterventionFormView"></path>
-						</g>
-						<g transform="translate(12278, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
-								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12278, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="28020.8" y="2062.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M28020.8 2093.0 L28875.8 2093.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M28020.8 2319.0 L28875.8 2319.0" fill="none" data-name="InterventionFormViewModel"></path>
-						</g>
-						<g transform="translate(28020.75, 2062)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
-								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28020.75, 2093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28020.75, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="11908.0" y="1344.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M11908.0 1375.0 L12238.0 1375.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M11908.0 1406.0 L12238.0 1406.0" fill="none" data-name="InterventionPreview"></path>
-						</g>
-						<g transform="translate(11908, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11908, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11908, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="11186.3" y="2280.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(11186.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="37116.5" y="971.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M37116.5 1002.0 L37475.5 1002.0" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M37116.5 1033.0 L37475.5 1033.0" fill="none" data-name="StudyScheduleFormView"></path>
-						</g>
-						<g transform="translate(37116.5, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37116.5, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37116.5, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="36917.0" y="1194.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M36917.0 1225.0 L37675.0 1225.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M36917.0 1526.0 L37675.0 1526.0" fill="none" data-name="StudyScheduleControls"></path>
-						</g>
-						<g transform="translate(36917, 1194)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
-								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36917, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36917, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="34955.0" y="1306.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M34955.0 1337.5 L35245.0 1337.5" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M34955.0 1428.5 L35245.0 1428.5" fill="none" data-name="InterventionTaskFormData"></path>
-						</g>
-						<g transform="translate(34955, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34955, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34955, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="35145.8" y="941.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M35145.8 972.0 L35443.8 972.0" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M35145.8 1078.0 L35443.8 1078.0" fill="none" data-name="IFormDataWithSchedule"></path>
-						</g>
-						<g transform="translate(35145.75, 941)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35145.75, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35145.75, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="37629.3" y="2107.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M37629.3 2138.0 L38468.3 2138.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M37629.3 2289.0 L38468.3 2289.0" fill="none" data-name="InterventionsFormViewModel"></path>
-						</g>
-						<g transform="translate(37629.25, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
-								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37629.25, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37629.25, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="14115.0" y="1375.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(14115, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="29304.3" y="1009.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-						</g>
-						<g transform="translate(29304.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="30844.5" y="2159.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M30844.5 2190.5 L31540.5 2190.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M30844.5 2371.5 L31540.5 2371.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-						</g>
-						<g transform="translate(30844.5, 2159.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(30844.5, 2190.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(30844.5, 2371.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="41963.3" y="1239.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M41963.3 1270.0 L42458.3 1270.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M41963.3 1496.0 L42458.3 1496.0" fill="none" data-name="WithScheduleControls"></path>
-						</g>
-						<g transform="translate(41963.25, 1239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41963.25, 1270)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41963.25, 1496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PhaseSequence">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="27807.3" y="3156.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
-						</g>
-						<g transform="translate(27807.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
-								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="7.8" y="926.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M7.8 957.0 L389.8 957.0" fill="none" data-name="InterventionFormData"></path>
-							<path d="M7.8 1078.0 L389.8 1078.0" fill="none" data-name="InterventionFormData"></path>
-						</g>
-						<g transform="translate(7.75, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7.75, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7.75, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="6159.3" y="2197.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M6159.3 2228.0 L6455.3 2228.0" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M6159.3 2334.0 L6455.3 2334.0" fill="none" data-name="StudyScheduleFormData"></path>
-						</g>
-						<g transform="translate(6159.25, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6159.25, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6159.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="9065.5" y="994.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M9065.5 1025.0 L9208.5 1025.0" fill="none" data-name="IStudyFormData"></path>
-						</g>
-						<g transform="translate(9065.5, 994)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9065.5, 1025)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="14749.0" y="1359.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M14749.0 1390.5 L15162.0 1390.5" fill="none" data-name="InterventionTaskFormView"></path>
-						</g>
-						<g transform="translate(14749, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14749, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="7149.8" y="1321.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M7149.8 1352.5 L7543.8 1352.5" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M7149.8 1413.5 L7543.8 1413.5" fill="none" data-name="InterventionsFormData"></path>
-						</g>
-						<g transform="translate(7149.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7149.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7149.75, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignReportsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="14782.5" y="3133.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M14782.5 3164.0 L15175.5 3164.0" fill="none" data-name="StudyDesignReportsFormView"></path>
-						</g>
-						<g transform="translate(14782.5, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14782.5, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="429.8" y="956.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M429.8 987.0 L743.8 987.0" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M429.8 1048.0 L743.8 1048.0" fill="none" data-name="ReportItemFormData"></path>
-						</g>
-						<g transform="translate(429.75, 956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(429.75, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(429.75, 1048)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="522.8" y="1375.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(522.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="19349.8" y="2227.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M19349.8 2258.0 L20058.8 2258.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M19349.8 2319.0 L20058.8 2319.0" fill="none" data-name="DataReferenceEditor"></path>
-						</g>
-						<g transform="translate(19349.75, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19349.75, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19349.75, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="13204.5" y="3156.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
-						</g>
-						<g transform="translate(13204.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="15986.0" y="1284.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M15986.0 1315.0 L16434.0 1315.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M15986.0 1421.0 L16434.0 1421.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-						</g>
-						<g transform="translate(15986, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15986, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15986, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="17181.3" y="2280.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
-						</g>
-						<g transform="translate(17181.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="17089.8" y="1284.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M17089.8 1315.0 L17540.8 1315.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M17089.8 1421.0 L17540.8 1421.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-						</g>
-						<g transform="translate(17089.75, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17089.75, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17089.75, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="18061.3" y="2280.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
-						</g>
-						<g transform="translate(18061.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="9881.3" y="3118.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M9881.3 3149.0 L10264.3 3149.0" fill="none" data-name="ReportSectionType"></path>
-						</g>
-						<g transform="translate(9881.25, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9881.25, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="12693.0" y="1329.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M12693.0 1360.0 L13172.0 1360.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M12693.0 1421.0 L13172.0 1421.0" fill="none" data-name="AverageSectionFormView"></path>
-						</g>
-						<g transform="translate(12693, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12693, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12693, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="21091.8" y="2009.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M21091.8 2040.5 L22078.8 2040.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M21091.8 2476.5 L22078.8 2476.5" fill="none" data-name="ReportItemFormViewModel"></path>
-						</g>
-						<g transform="translate(21091.75, 2009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
-								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21091.75, 2040.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21091.75, 2476.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="47762.0" y="493.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M47762.0 524.0 L47966.0 524.0" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M47762.0 555.0 L47966.0 555.0" fill="none" data-name="DataReferenceIdentifier"></path>
-						</g>
-						<g transform="translate(47762, 493)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47762, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47762, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="47796.5" y="76.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(47796.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="13212.0" y="1329.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M13212.0 1360.0 L13691.0 1360.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M13212.0 1421.0 L13691.0 1421.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-						</g>
-						<g transform="translate(13212, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13212, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13212, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="21918.5" y="1306.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M21918.5 1337.5 L22385.5 1337.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M21918.5 1413.5 L22385.5 1413.5" fill="none" data-name="ReportItemFormView"></path>
-						</g>
-						<g transform="translate(21918.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
-								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21918.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21918.5, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="22590.8" y="2280.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
-						</g>
-						<g transform="translate(22590.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="43057.8" y="2122.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M43057.8 2153.0 L43917.8 2153.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M43057.8 2319.0 L43917.8 2319.0" fill="none" data-name="ReportsFormViewModel"></path>
-						</g>
-						<g transform="translate(43057.75, 2122)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
-								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43057.75, 2153)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43057.75, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportFormItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="38461.8" y="3065.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M38461.8 3096.0 L39304.8 3096.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M38461.8 3172.0 L39304.8 3172.0" fill="none" data-name="ReportFormItemDelegate"></path>
-						</g>
-						<g transform="translate(38461.75, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
-								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38461.75, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38461.75, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="22890.3" y="1321.5" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M22890.3 1352.5 L23087.3 1352.5" fill="none" data-name="ReportBadge"></path>
-							<path d="M22890.3 1428.5 L23087.3 1428.5" fill="none" data-name="ReportBadge"></path>
-						</g>
-						<g transform="translate(22890.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22890.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22890.25, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="12441.5" y="3118.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M12441.5 3149.0 L12742.5 3149.0" fill="none" data-name="ReportStatus"></path>
-						</g>
-						<g transform="translate(12441.5, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12441.5, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="7583.8" y="1329.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M7583.8 1360.0 L7921.8 1360.0" fill="none" data-name="ReportsFormData"></path>
-							<path d="M7583.8 1406.0 L7921.8 1406.0" fill="none" data-name="ReportsFormData"></path>
-						</g>
-						<g transform="translate(7583.75, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7583.75, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7583.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="44980.3" y="2054.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M44980.3 2085.5 L45676.3 2085.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M44980.3 2491.5 L45676.3 2491.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-						</g>
-						<g transform="translate(44980.25, 2054.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44980.25, 2085.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44980.25, 2491.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignInfoFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="15215.5" y="3140.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M15215.5 3171.5 L15438.5 3171.5" fill="none" data-name="StudyDesignInfoFormView"></path>
-						</g>
-						<g transform="translate(15215.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15215.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="9688.0" y="1306.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M9688.0 1337.5 L10102.0 1337.5" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M9688.0 1428.5 L10102.0 1428.5" fill="none" data-name="StudyInfoFormData"></path>
-						</g>
-						<g transform="translate(9688, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9688, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9688, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyContactInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="10373.8" y="2182.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M10373.8 2213.0 L10721.8 2213.0" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M10373.8 2364.0 L10721.8 2364.0" fill="none" data-name="StudyContactInfoFormData"></path>
-						</g>
-						<g transform="translate(10373.75, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
-								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10373.75, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10373.75, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormValidationSet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="1545.0" y="3133.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M1545.0 3164.0 L1932.0 3164.0" fill="none" data-name="StudyFormValidationSet"></path>
-						</g>
-						<g transform="translate(1545, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
-								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1545, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="10549.0" y="1329.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M10549.0 1360.0 L11043.0 1360.0" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M10549.0 1406.0 L11043.0 1406.0" fill="none" data-name="MeasurementsFormData"></path>
-						</g>
-						<g transform="translate(10549, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
-								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10549, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10549, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="24145.3" y="1359.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M24145.3 1390.5 L24589.3 1390.5" fill="none" data-name="MeasurementSurveyFormView"></path>
-						</g>
-						<g transform="translate(24145.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24145.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="32494.3" y="2084.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M32494.3 2115.5 L33190.3 2115.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M32494.3 2341.5 L33190.3 2341.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-						</g>
-						<g transform="translate(32494.25, 2084.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32494.25, 2115.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32494.25, 2341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="13731.0" y="1344.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M13731.0 1375.0 L14075.0 1375.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M13731.0 1406.0 L14075.0 1406.0" fill="none" data-name="SurveyPreview"></path>
-						</g>
-						<g transform="translate(13731, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13731, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13731, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="13779.5" y="2280.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(13779.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="35285.0" y="1291.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M35285.0 1322.5 L35694.0 1322.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M35285.0 1443.5 L35694.0 1443.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-						</g>
-						<g transform="translate(35285, 1291.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35285, 1322.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35285, 1443.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="25141.5" y="2227.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M25141.5 2258.0 L25509.5 2258.0" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M25141.5 2304.0 L25509.5 2304.0" fill="none" data-name="QuestionnaireFormData"></path>
-						</g>
-						<g transform="translate(25141.5, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25141.5, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25141.5, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="39221.3" y="1261.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M39221.3 1292.5 L39853.3 1292.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M39221.3 1398.5 L39853.3 1398.5" fill="none" data-name="WithQuestionnaireControls"></path>
-						</g>
-						<g transform="translate(39221.25, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39221.25, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39221.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignMeasurementsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="15478.5" y="3140.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M15478.5 3171.5 L15788.5 3171.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
-						</g>
-						<g transform="translate(15478.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15478.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="39597.3" y="2114.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M39597.3 2145.5 L40689.3 2145.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M39597.3 2296.5 L40689.3 2296.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-						</g>
-						<g transform="translate(39597.25, 2114.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
-								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39597.25, 2145.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39597.25, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="14321.0" y="1329.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M14321.0 1360.0 L14709.0 1360.0" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M14321.0 1421.0 L14709.0 1421.0" fill="none" data-name="StudyFormScaffold"></path>
-						</g>
-						<g transform="translate(14321, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14321, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14321, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="T Function(WidgetRef)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="16558.3" y="2280.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
-						</g>
-						<g transform="translate(16558.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="16791.3" y="2280.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
-						</g>
-						<g transform="translate(16791.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="33670.3" y="2167.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M33670.3 2198.0 L34366.3 2198.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M33670.3 2364.0 L34366.3 2364.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-						</g>
-						<g transform="translate(33670.25, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33670.25, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33670.25, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignEnrollmentFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="15828.5" y="3125.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M15828.5 3156.5 L16277.5 3156.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
-						</g>
-						<g transform="translate(15828.5, 3125.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15828.5, 3156.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScreenerQuestionLogicFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="29172.0" y="2265.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M29172.0 2296.0 L29504.0 2296.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
-						</g>
-						<g transform="translate(29172, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29172, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionLogicFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="41711.3" y="2227.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M41711.3 2258.0 L42135.3 2258.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M41711.3 2289.0 L42135.3 2289.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-						</g>
-						<g transform="translate(41711.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
-								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41711.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41711.25, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="31560.5" y="3005.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M31560.5 3036.0 L32122.5 3036.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M31560.5 3217.0 L32122.5 3217.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(31560.5, 3005)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
-								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31560.5, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31560.5, 3217)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="26297.3" y="941.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M26297.3 972.0 L26555.3 972.0" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M26297.3 1063.0 L26555.3 1063.0" fill="none" data-name="ConsentItemFormData"></path>
-						</g>
-						<g transform="translate(26297.25, 941)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26297.25, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26297.25, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="25257.3" y="1359.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M25257.3 1390.5 L25638.3 1390.5" fill="none" data-name="ConsentItemFormView"></path>
-						</g>
-						<g transform="translate(25257.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25257.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="11083.0" y="1306.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M11083.0 1337.5 L11537.0 1337.5" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M11083.0 1428.5 L11537.0 1428.5" fill="none" data-name="EnrollmentFormData"></path>
-						</g>
-						<g transform="translate(11083, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
-								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11083, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11083, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="25549.5" y="1627.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M25549.5 1658.0 L26562.5 1658.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M25549.5 2679.0 L26562.5 2679.0" fill="none" data-name="QuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(25549.5, 1627)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25549.5, 1658)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25549.5, 2679)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="40729.3" y="2047.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M40729.3 2078.0 L41631.3 2078.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M40729.3 2304.0 L41631.3 2304.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-						</g>
-						<g transform="translate(40729.25, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
-								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(40729.25, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(40729.25, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormConsentItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="34539.8" y="3065.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M34539.8 3096.0 L35339.8 3096.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M34539.8 3172.0 L35339.8 3172.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-						</g>
-						<g transform="translate(34539.75, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34539.75, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34539.75, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="44972.3" y="1209.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M44972.3 1240.0 L45668.3 1240.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M44972.3 1451.0 L45668.3 1451.0" fill="none" data-name="StudyFormViewModel"></path>
-						</g>
-						<g transform="translate(44972.25, 1209)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44972.25, 1240)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44972.25, 1451)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="31607.3" y="896.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M31607.3 927.0 L32775.3 927.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M31607.3 1063.0 L32775.3 1063.0" fill="none" data-name="QuestionFormData"></path>
-						</g>
-						<g transform="translate(31607.25, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31607.25, 927)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31607.25, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="14329.5" y="3088.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M14329.5 3119.0 L14692.5 3119.0" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(14329.5, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14329.5, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="32347.0" y="1306.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M32347.0 1337.5 L32691.0 1337.5" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M32347.0 1398.5 L32691.0 1398.5" fill="none" data-name="ChoiceQuestionFormData"></path>
-						</g>
-						<g transform="translate(32347, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32347, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32347, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="32731.0" y="1321.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M32731.0 1352.5 L33123.0 1352.5" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M32731.0 1398.5 L33123.0 1398.5" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(32731, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32731, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32731, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="33163.0" y="1321.5" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M33163.0 1352.5 L33635.0 1352.5" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M33163.0 1398.5 L33635.0 1398.5" fill="none" data-name="ImageQuestionFormData"></path>
-						</g>
-						<g transform="translate(33163, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33163, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33163, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="33675.0" y="1314.0" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M33675.0 1345.0 L34147.0 1345.0" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M33675.0 1406.0 L34147.0 1406.0" fill="none" data-name="AudioQuestionFormData"></path>
-						</g>
-						<g transform="translate(33675, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33675, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33675, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="34187.0" y="1246.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M34187.0 1277.5 L34531.0 1277.5" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M34187.0 1473.5 L34531.0 1473.5" fill="none" data-name="ScaleQuestionFormData"></path>
-						</g>
-						<g transform="translate(34187, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34187, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34187, 1473.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="34571.0" y="1306.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M34571.0 1337.5 L34915.0 1337.5" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M34571.0 1413.5 L34915.0 1413.5" fill="none" data-name="FreeTextQuestionFormData"></path>
-						</g>
-						<g transform="translate(34571, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34571, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34571, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="34645.0" y="2280.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
-						</g>
-						<g transform="translate(34645, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="15202.0" y="1344.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M15202.0 1375.0 L15554.0 1375.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M15202.0 1406.0 L15554.0 1406.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(15202, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15202, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15202, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="15594.0" y="1321.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M15594.0 1352.5 L15946.0 1352.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M15594.0 1398.5 L15946.0 1398.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-						</g>
-						<g transform="translate(15594, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15594, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15594, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="17580.8" y="1344.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M17580.8 1375.0 L17932.8 1375.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M17580.8 1406.0 L17932.8 1406.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-						</g>
-						<g transform="translate(17580.75, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17580.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17580.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="47971.5" y="60.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M47971.5 91.5 L48280.5 91.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(47971.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47971.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="29940.5" y="1359.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M29940.5 1390.5 L30292.5 1390.5" fill="none" data-name="ScaleQuestionFormView"></path>
-						</g>
-						<g transform="translate(29940.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29940.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="23127.3" y="1344.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M23127.3 1375.0 L23479.3 1375.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M23127.3 1406.0 L23479.3 1406.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-						</g>
-						<g transform="translate(23127.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23127.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23127.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="23519.3" y="1344.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M23519.3 1375.0 L23871.3 1375.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M23519.3 1406.0 L23871.3 1406.0" fill="none" data-name="BoolQuestionFormView"></path>
-						</g>
-						<g transform="translate(23519.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23519.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23519.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="30412.5" y="1352.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M30412.5 1383.0 L30764.5 1383.0" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(30412.5, 1352)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(30412.5, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="35734.0" y="1375.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
-						</g>
-						<g transform="translate(35734, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="41994.8" y="971.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M41994.8 1002.0 L42426.8 1002.0" fill="none" data-name="ScheduleControls"></path>
-							<path d="M41994.8 1033.0 L42426.8 1033.0" fill="none" data-name="ScheduleControls"></path>
-						</g>
-						<g transform="translate(41994.75, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41994.75, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41994.75, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableColumnHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
-							<rect x="30916.3" y="1329.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
-							<path d="M30916.3 1360.5 L31153.3 1360.5" fill="none" data-name="StudiesTableColumnHeader"></path>
-						</g>
-						<g transform="translate(30916.25, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
-								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(30916.25, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="31580.5" y="2265.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
-							<path d="M31580.5 2296.0 L31758.5 2296.0" fill="none" data-name="DashboardScreen"></path>
-						</g>
-						<g transform="translate(31580.5, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31580.5, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesFilter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
-							<rect x="13447.5" y="3133.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
-							<path d="M13447.5 3164.0 L13743.5 3164.0" fill="none" data-name="StudiesFilter"></path>
-						</g>
-						<g transform="translate(13447.5, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13447.5, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
-							<rect x="31193.3" y="1336.5" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
-							<path d="M31193.3 1367.5 L31536.3 1367.5" fill="none" data-name="DashboardScaffold"></path>
-							<path d="M31193.3 1413.5 L31536.3 1413.5" fill="none" data-name="DashboardScaffold"></path>
-						</g>
-						<g transform="translate(31193.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
-								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31193.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31193.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
-							<rect x="17407.3" y="2107.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
-							<path d="M17407.3 2138.0 L18021.3 2138.0" fill="none" data-name="DashboardController"></path>
-							<path d="M17407.3 2259.0 L18021.3 2259.0" fill="none" data-name="DashboardController"></path>
-						</g>
-						<g transform="translate(17407.25, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
-								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17407.25, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17407.25, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IUserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="12832.5" y="3156.0" height="31.0" width="143.0" data-name="IUserRepository"></rect>
-						</g>
-						<g transform="translate(12832.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SearchController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="13015.5" y="3156.0" height="31.0" width="149.0" data-name="SearchController"></rect>
-						</g>
-						<g transform="translate(13015.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableColumnSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
-							<rect x="48320.5" y="30.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
-							<path d="M48320.5 61.0 L48545.5 61.0" fill="none" data-name="StudiesTableColumnSize"></path>
-							<path d="M48320.5 122.0 L48545.5 122.0" fill="none" data-name="StudiesTableColumnSize"></path>
-						</g>
-						<g transform="translate(48320.5, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
-								
-							</g>
-						</g>
-						<g transform="translate(48320.5, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(48320.5, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
-							<rect x="31827.0" y="1246.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
-							<path d="M31827.0 1277.5 L32307.0 1277.5" fill="none" data-name="StudiesTable"></path>
-							<path d="M31827.0 1488.5 L32307.0 1488.5" fill="none" data-name="StudiesTable"></path>
-						</g>
-						<g transform="translate(31827, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
-								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31827, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31827, 1488.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
-							<rect x="31798.5" y="2280.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
-						</g>
-						<g transform="translate(31798.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<rect x="32077.3" y="2280.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
-						</g>
-						<g transform="translate(32077.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
-							<rect x="1972.0" y="3065.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
-							<path d="M1972.0 3096.5 L2333.0 3096.5" fill="none" data-name="StudiesTableColumn"></path>
-						</g>
-						<g transform="translate(1972, 3065.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
-								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1972, 3096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
-							<rect x="33230.3" y="2197.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
-							<path d="M33230.3 2228.5 L33630.3 2228.5" fill="none" data-name="StudiesTableItem"></path>
-						</g>
-						<g transform="translate(33230.25, 2197.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
-								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33230.25, 2228.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Study, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
-							<rect x="32162.5" y="3156.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
-						</g>
-						<g transform="translate(32162.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Study)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
-							<rect x="33009.0" y="3156.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
-						</g>
-						<g transform="translate(33009, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="App">
-						<g fill="#eee8d5" stroke="#33322E" data-name="App">
-							<rect x="48585.5" y="76.0" height="31.0" width="47.0" data-name="App"></rect>
-						</g>
-						<g transform="translate(48585.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
-								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppContent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
-							<rect x="48672.5" y="76.0" height="31.0" width="109.0" data-name="AppContent"></rect>
-						</g>
-						<g transform="translate(48672.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AccountSettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
-							<rect x="23911.3" y="1359.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
-							<path d="M23911.3 1390.5 L24105.3 1390.5" fill="none" data-name="AccountSettingsDialog"></path>
-						</g>
-						<g transform="translate(23911.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23911.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/localization/platform_locale/uml.svg b/docs/uml/designer_v2/lib/localization/platform_locale/uml.svg
deleted file mode 100644
index d262765fc..000000000
--- a/docs/uml/designer_v2/lib/localization/platform_locale/uml.svg
+++ /dev/null
@@ -1,95 +0,0 @@
-<svg version="1.1" baseProfile="full" width="574.0" height="220.0" viewbox="0 0 574 220" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[PlatformLocaleWeb
-	  |
-	  +Locale getPlatformLocale()
-	]
-	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleWeb]
-	
-	[&lt;abstract&gt;PlatformLocale
-	  |
-	  +Locale getPlatformLocale()
-	]
-	
-	[PlatformLocaleMobile
-	  |
-	  +Locale getPlatformLocale()
-	]
-	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleMobile]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="220.0" width="574.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<g stroke-dasharray="6 6">
-						<path d="M161.7 66.6 L119.5 82 L119.5 102 L119.5 102.0 " fill="none"></path>
-					</g>
-					<path d="M163.5 71.6 L161.7 66.6 L159.9 61.6 L174.2 62.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M356.3 66.6 L398.5 82 L398.5 102 L398.5 102.0 " fill="none"></path>
-					</g>
-					<path d="M358.1 61.6 L356.3 66.6 L354.5 71.6 L343.8 62.0 Z"></path>
-					<g data-name="PlatformLocaleWeb">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleWeb">
-							<rect x="0.0" y="102.0" height="62.0" width="239.0" data-name="PlatformLocaleWeb"></rect>
-							<path d="M0.0 133.0 L239.0 133.0" fill="none" data-name="PlatformLocaleWeb"></path>
-						</g>
-						<g transform="translate(0, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleWeb">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleWeb">PlatformLocaleWeb</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleWeb">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleWeb">+Locale getPlatformLocale()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformLocale">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocale">
-							<rect x="139.5" y="0.0" height="62.0" width="239.0" data-name="PlatformLocale"></rect>
-							<path d="M139.5 31.0 L378.5 31.0" fill="none" data-name="PlatformLocale"></path>
-						</g>
-						<g transform="translate(139.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocale">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocale">PlatformLocale</text>
-								
-							</g>
-						</g>
-						<g transform="translate(139.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocale">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocale">+Locale getPlatformLocale()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformLocaleMobile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleMobile">
-							<rect x="279.0" y="102.0" height="62.0" width="239.0" data-name="PlatformLocaleMobile"></rect>
-							<path d="M279.0 133.0 L518.0 133.0" fill="none" data-name="PlatformLocaleMobile"></path>
-						</g>
-						<g transform="translate(279, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleMobile">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleMobile">PlatformLocaleMobile</text>
-								
-							</g>
-						</g>
-						<g transform="translate(279, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleMobile">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleMobile">+Locale getPlatformLocale()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/localization/uml.svg b/docs/uml/designer_v2/lib/localization/uml.svg
deleted file mode 100644
index 8f5009747..000000000
--- a/docs/uml/designer_v2/lib/localization/uml.svg
+++ /dev/null
@@ -1,234 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1338.0" height="295.0" viewbox="0 0 1338 295" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[LanguagePicker
-	  |
-	  +languagePickerType: LanguagePickerType;
-	  +iconColor: Color?;
-	  +offset: Offset?
-	]
-	
-	[LanguagePicker]o-[LanguagePickerType]
-	[LanguagePicker]o-[Color]
-	[LanguagePicker]o-[Offset]
-	
-	[LanguagePickerType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;LanguagePickerType&gt;;
-	  &lt;static&gt;+field: LanguagePickerType;
-	  &lt;static&gt;+icon: LanguagePickerType
-	]
-	
-	[LanguagePickerType]o-[LanguagePickerType]
-	[Enum]&lt;:--[LanguagePickerType]
-	
-	[PlatformLocaleMobile
-	  |
-	  +Locale getPlatformLocale()
-	]
-	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleMobile]
-	
-	[&lt;abstract&gt;PlatformLocale
-	  |
-	  +Locale getPlatformLocale()
-	]
-	
-	[PlatformLocaleWeb
-	  |
-	  +Locale getPlatformLocale()
-	]
-	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleWeb]
-	
-	[AppTranslation
-	  |
-	  &lt;static&gt;+dynamic init()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="295.0" width="1338.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M353.0 97.8 L309.75 112 L275.26020408163265 132 L275.3 132.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M363.5 100.0 L353.0 97.8 L360.2 89.8 L370.7 92.0 Z"></path>
-					</g>
-					<path d="M486.0 109.4 L485 112 L485 170 L485.0 170.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M494.4 102.6 L486.0 109.4 L484.5 98.7 L492.9 92.0 Z"></path>
-					</g>
-					<path d="M577.9 104.3 L586.75 112 L586.75 170 L586.8 170.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M574.3 94.1 L577.9 104.3 L567.3 102.2 L563.8 92.0 Z"></path>
-					</g>
-					<path d="M384.1 135.0 L396 132 L403.5 132 L403.5 132 L411 185.5 L411 185.5 L403.5 239 L403.5 239 L396 239 L396 239 L366 231.46478873239437 L366.0 231.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M373.8 132.1 L384.1 135.0 L376.4 142.4 L366.0 139.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M163.0 74.8 L163 112 L168.4421768707483 132 L168.4 132.0 " fill="none"></path>
-					</g>
-					<path d="M168.3 74.8 L163.0 74.8 L157.7 74.8 L163.0 61.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M845.5 82.3 L777.75 112 L777.75 154.5 L777.8 154.5 " fill="none"></path>
-					</g>
-					<path d="M847.6 87.2 L845.5 82.3 L843.3 77.5 L857.7 77.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1000.6 83.1 L1056.75 112 L1056.75 154.5 L1056.8 154.5 " fill="none"></path>
-					</g>
-					<path d="M1003.0 78.4 L1000.6 83.1 L998.2 87.8 L988.7 77.0 Z"></path>
-					<g data-name="LanguagePicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePicker">
-							<rect x="328.0" y="0.0" height="92.0" width="366.0" data-name="LanguagePicker"></rect>
-							<path d="M328.0 31.0 L694.0 31.0" fill="none" data-name="LanguagePicker"></path>
-						</g>
-						<g transform="translate(328, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePicker">
-								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePicker">LanguagePicker</text>
-								
-							</g>
-						</g>
-						<g transform="translate(328, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePicker">+languagePickerType: LanguagePickerType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePicker">+iconColor: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePicker">+offset: Offset?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LanguagePickerType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePickerType">
-							<rect x="0.0" y="132.0" height="107.0" width="366.0" data-name="LanguagePickerType"></rect>
-							<path d="M0.0 163.0 L366.0 163.0" fill="none" data-name="LanguagePickerType"></path>
-						</g>
-						<g transform="translate(0, 132)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePickerType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePickerType">
-								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePickerType">LanguagePickerType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 163)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePickerType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePickerType">
-								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePickerType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+values: List&lt;LanguagePickerType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+field: LanguagePickerType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+icon: LanguagePickerType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="456.0" y="170.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(456, 170)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Offset">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Offset">
-							<rect x="555.3" y="170.0" height="31.0" width="63.0" data-name="Offset"></rect>
-						</g>
-						<g transform="translate(555.25, 170)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Offset">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Offset">
-								<text x="23.5" y="13.5" stroke="none" text-anchor="middle" data-name="Offset">Offset</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="132.5" y="30.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(132.5, 30.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformLocaleMobile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleMobile">
-							<rect x="658.3" y="154.5" height="62.0" width="239.0" data-name="PlatformLocaleMobile"></rect>
-							<path d="M658.3 185.5 L897.3 185.5" fill="none" data-name="PlatformLocaleMobile"></path>
-						</g>
-						<g transform="translate(658.25, 154.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleMobile">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleMobile">PlatformLocaleMobile</text>
-								
-							</g>
-						</g>
-						<g transform="translate(658.25, 185.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleMobile">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleMobile">+Locale getPlatformLocale()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformLocale">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocale">
-							<rect x="809.0" y="15.0" height="62.0" width="239.0" data-name="PlatformLocale"></rect>
-							<path d="M809.0 46.0 L1048.0 46.0" fill="none" data-name="PlatformLocale"></path>
-						</g>
-						<g transform="translate(809, 15)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocale">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocale">PlatformLocale</text>
-								
-							</g>
-						</g>
-						<g transform="translate(809, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocale">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocale">+Locale getPlatformLocale()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformLocaleWeb">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleWeb">
-							<rect x="937.3" y="154.5" height="62.0" width="239.0" data-name="PlatformLocaleWeb"></rect>
-							<path d="M937.3 185.5 L1176.3 185.5" fill="none" data-name="PlatformLocaleWeb"></path>
-						</g>
-						<g transform="translate(937.25, 154.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleWeb">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleWeb">PlatformLocaleWeb</text>
-								
-							</g>
-						</g>
-						<g transform="translate(937.25, 185.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleWeb">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleWeb">+Locale getPlatformLocale()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppTranslation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppTranslation">
-							<rect x="1088.0" y="15.0" height="62.0" width="194.0" data-name="AppTranslation"></rect>
-							<path d="M1088.0 46.0 L1282.0 46.0" fill="none" data-name="AppTranslation"></path>
-						</g>
-						<g transform="translate(1088, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppTranslation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppTranslation">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppTranslation">AppTranslation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1088, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppTranslation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppTranslation">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppTranslation">&lt;static&gt;+dynamic init()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/repositories/uml.svg b/docs/uml/designer_v2/lib/repositories/uml.svg
deleted file mode 100644
index 0274e227c..000000000
--- a/docs/uml/designer_v2/lib/repositories/uml.svg
+++ /dev/null
@@ -1,1725 +0,0 @@
-<svg version="1.1" baseProfile="full" width="5267.0" height="2662.0" viewbox="0 0 5267 2662" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;StudyUApi
-	  |
-	  +dynamic saveStudy();
-	  +dynamic fetchStudy();
-	  +dynamic getUserStudies();
-	  +dynamic deleteStudy();
-	  +dynamic saveStudyInvite();
-	  +dynamic fetchStudyInvite();
-	  +dynamic deleteStudyInvite();
-	  +dynamic deleteParticipants();
-	  +dynamic fetchAppConfig();
-	  +dynamic fetchUser();
-	  +dynamic saveUser()
-	]
-	
-	[APIException
-	]
-	
-	[Exception]&lt;:--[APIException]
-	
-	[StudyNotFoundException
-	]
-	
-	[APIException]&lt;:-[StudyNotFoundException]
-	
-	[MeasurementNotFoundException
-	]
-	
-	[APIException]&lt;:-[MeasurementNotFoundException]
-	
-	[QuestionNotFoundException
-	]
-	
-	[APIException]&lt;:-[QuestionNotFoundException]
-	
-	[ConsentItemNotFoundException
-	]
-	
-	[APIException]&lt;:-[ConsentItemNotFoundException]
-	
-	[InterventionNotFoundException
-	]
-	
-	[APIException]&lt;:-[InterventionNotFoundException]
-	
-	[InterventionTaskNotFoundException
-	]
-	
-	[APIException]&lt;:-[InterventionTaskNotFoundException]
-	
-	[ReportNotFoundException
-	]
-	
-	[APIException]&lt;:-[ReportNotFoundException]
-	
-	[ReportSectionNotFoundException
-	]
-	
-	[APIException]&lt;:-[ReportSectionNotFoundException]
-	
-	[StudyInviteNotFoundException
-	]
-	
-	[APIException]&lt;:-[StudyInviteNotFoundException]
-	
-	[UserNotFoundException
-	]
-	
-	[APIException]&lt;:-[UserNotFoundException]
-	
-	[StudyUApiClient
-	  |
-	  +supabaseClient: SupabaseClient;
-	  &lt;static&gt;+studyColumns: List&lt;String&gt;;
-	  &lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;;
-	  +testDelayMilliseconds: int
-	  |
-	  +dynamic deleteParticipants();
-	  +dynamic getUserStudies();
-	  +dynamic fetchStudy();
-	  +dynamic deleteStudy();
-	  +dynamic saveStudy();
-	  +dynamic fetchStudyInvite();
-	  +dynamic saveStudyInvite();
-	  +dynamic deleteStudyInvite();
-	  +dynamic fetchAppConfig();
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  -dynamic _awaitGuarded();
-	  -dynamic _apiException();
-	  -dynamic _testDelay()
-	]
-	
-	[StudyUApiClient]o-[SupabaseClient]
-	[&lt;abstract&gt;SupabaseClientDependant]&lt;:-[StudyUApiClient]
-	[&lt;abstract&gt;SupabaseQueryMixin]&lt;:-[StudyUApiClient]
-	[&lt;abstract&gt;StudyUApi]&lt;:--[StudyUApiClient]
-	
-	[&lt;abstract&gt;IStudyRepository
-	  |
-	  +dynamic launch();
-	  +dynamic deleteParticipants()
-	]
-	
-	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IStudyRepository]
-	
-	[StudyRepository
-	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +ref: ProviderRef&lt;dynamic&gt;;
-	  +sortCallback: void Function()?
-	  |
-	  +String getKey();
-	  +dynamic deleteParticipants();
-	  +dynamic launch();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
-	]
-	
-	[StudyRepository]o-[&lt;abstract&gt;StudyUApi]
-	[StudyRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyRepository]o-[&lt;abstract&gt;ProviderRef]
-	[StudyRepository]o-[void Function()?]
-	[&lt;abstract&gt;ModelRepository]&lt;:-[StudyRepository]
-	[&lt;abstract&gt;IStudyRepository]&lt;:--[StudyRepository]
-	
-	[StudyRepositoryDelegate
-	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository
-	  |
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic onError();
-	  +Study createNewInstance();
-	  +Study createDuplicate()
-	]
-	
-	[StudyRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
-	[StudyRepositoryDelegate]o-[&lt;abstract&gt;IAuthRepository]
-	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[StudyRepositoryDelegate]
-	
-	[&lt;abstract&gt;IAppRepository
-	  |
-	  +dynamic fetchAppConfig();
-	  +void dispose()
-	]
-	
-	[AppRepository
-	  |
-	  +apiClient: StudyUApi
-	  |
-	  +dynamic fetchAppConfig();
-	  +void dispose()
-	]
-	
-	[AppRepository]o-[&lt;abstract&gt;StudyUApi]
-	[&lt;abstract&gt;IAppRepository]&lt;:--[AppRepository]
-	
-	[WrappedModel
-	  |
-	  -_model: T;
-	  +asyncValue: AsyncValue&lt;T&gt;;
-	  +isLocalOnly: bool;
-	  +isDirty: bool;
-	  +isDeleted: bool;
-	  +lastSaved: DateTime?;
-	  +lastFetched: DateTime?;
-	  +lastUpdated: DateTime?;
-	  +model: T
-	  |
-	  +dynamic markWithError();
-	  +dynamic markAsLoading();
-	  +dynamic markAsFetched();
-	  +dynamic markAsSaved()
-	]
-	
-	[WrappedModel]o-[&lt;abstract&gt;AsyncValue]
-	
-	[ModelRepositoryException
-	]
-	
-	[Exception]&lt;:--[ModelRepositoryException]
-	
-	[ModelNotFoundException
-	]
-	
-	[ModelRepositoryException]&lt;:--[ModelNotFoundException]
-	
-	[&lt;abstract&gt;IModelRepository
-	  |
-	  +String getKey();
-	  +WrappedModel&lt;T&gt;? get();
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic duplicateAndSave();
-	  +dynamic duplicateAndSaveFromRemote();
-	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
-	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
-	  +dynamic ensurePersisted();
-	  +void dispose()
-	]
-	
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[&lt;abstract&gt;IModelRepository]
-	
-	[&lt;abstract&gt;IModelRepositoryDelegate
-	  |
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +T createNewInstance();
-	  +T createDuplicate();
-	  +dynamic onError()
-	]
-	
-	[&lt;abstract&gt;ModelRepository
-	  |
-	  +delegate: IModelRepositoryDelegate&lt;T&gt;;
-	  -_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;;
-	  -_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;;
-	  +modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;;
-	  +modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;;
-	  -_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;
-	  |
-	  +WrappedModel&lt;T&gt;? get();
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic duplicateAndSave();
-	  +dynamic duplicateAndSaveFromRemote();
-	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
-	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
-	  -dynamic _buildModelSpecificController();
-	  +dynamic ensurePersisted();
-	  +WrappedModel&lt;T&gt; upsertLocally();
-	  +List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally();
-	  +dynamic emitUpdate();
-	  +dynamic emitModelEvent();
-	  +dynamic emitError();
-	  +void dispose();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
-	]
-	
-	[&lt;abstract&gt;ModelRepository]o-[&lt;abstract&gt;IModelRepositoryDelegate]
-	[&lt;abstract&gt;ModelRepository]o-[BehaviorSubject]
-	[&lt;abstract&gt;IModelRepository]&lt;:-[&lt;abstract&gt;ModelRepository]
-	
-	[StudyLaunched
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[StudyLaunched]
-	
-	[&lt;abstract&gt;IInviteCodeRepository
-	  |
-	  +dynamic isCodeAlreadyUsed()
-	]
-	
-	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IInviteCodeRepository]
-	
-	[InviteCodeRepository
-	  |
-	  +studyId: String;
-	  +ref: ProviderRef&lt;dynamic&gt;;
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +studyRepository: IStudyRepository;
-	  +study: Study
-	  |
-	  +String getKey();
-	  +dynamic isCodeAlreadyUsed();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +dynamic emitUpdate()
-	]
-	
-	[InviteCodeRepository]o-[&lt;abstract&gt;ProviderRef]
-	[InviteCodeRepository]o-[&lt;abstract&gt;StudyUApi]
-	[InviteCodeRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[InviteCodeRepository]o-[&lt;abstract&gt;IStudyRepository]
-	[InviteCodeRepository]o-[Study]
-	[&lt;abstract&gt;ModelRepository]&lt;:-[InviteCodeRepository]
-	[&lt;abstract&gt;IInviteCodeRepository]&lt;:--[InviteCodeRepository]
-	
-	[InviteCodeRepositoryDelegate
-	  |
-	  +study: Study;
-	  +apiClient: StudyUApi;
-	  +studyRepository: IStudyRepository
-	  |
-	  +dynamic fetch();
-	  +dynamic fetchAll();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic onError();
-	  +StudyInvite createDuplicate();
-	  +StudyInvite createNewInstance()
-	]
-	
-	[InviteCodeRepositoryDelegate]o-[Study]
-	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
-	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;IStudyRepository]
-	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[InviteCodeRepositoryDelegate]
-	
-	[&lt;abstract&gt;IAuthRepository
-	  |
-	  +allowPasswordReset: bool;
-	  +currentUser: User?;
-	  +isLoggedIn: bool;
-	  +session: Session?;
-	  +serializedSession: String?
-	  |
-	  +dynamic signUp();
-	  +dynamic signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic updateUser();
-	  +void dispose()
-	]
-	
-	[&lt;abstract&gt;IAuthRepository]o-[User]
-	[&lt;abstract&gt;IAuthRepository]o-[Session]
-	[&lt;abstract&gt;IAppDelegate]&lt;:-[&lt;abstract&gt;IAuthRepository]
-	
-	[AuthRepository
-	  |
-	  +supabaseClient: SupabaseClient;
-	  +sharedPreferences: SharedPreferences;
-	  +allowPasswordReset: bool;
-	  +authClient: GoTrueClient;
-	  +session: Session?;
-	  +serializedSession: String?;
-	  +currentUser: User?;
-	  +isLoggedIn: bool
-	  |
-	  -void _registerAuthListener();
-	  +dynamic signUp();
-	  +dynamic signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic updateUser();
-	  +void dispose();
-	  +dynamic onAppStart()
-	]
-	
-	[AuthRepository]o-[SupabaseClient]
-	[AuthRepository]o-[SharedPreferences]
-	[AuthRepository]o-[GoTrueClient]
-	[AuthRepository]o-[Session]
-	[AuthRepository]o-[User]
-	[&lt;abstract&gt;IAuthRepository]&lt;:--[AuthRepository]
-	
-	[&lt;abstract&gt;IUserRepository
-	  |
-	  +user: StudyUUser
-	  |
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  +dynamic updatePreferences()
-	]
-	
-	[&lt;abstract&gt;IUserRepository]o-[StudyUUser]
-	
-	[UserRepository
-	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +ref: Ref&lt;Object?&gt;;
-	  +user: StudyUUser
-	  |
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  +dynamic updatePreferences()
-	]
-	
-	[UserRepository]o-[&lt;abstract&gt;StudyUApi]
-	[UserRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[UserRepository]o-[&lt;abstract&gt;Ref]
-	[UserRepository]o-[StudyUUser]
-	[&lt;abstract&gt;IUserRepository]&lt;:--[UserRepository]
-	
-	[PreferenceAction
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;PreferenceAction&gt;;
-	  &lt;static&gt;+pin: PreferenceAction;
-	  &lt;static&gt;+pinOff: PreferenceAction
-	]
-	
-	[PreferenceAction]o-[PreferenceAction]
-	[Enum]&lt;:--[PreferenceAction]
-	
-	[&lt;abstract&gt;ModelEvent
-	  |
-	  +modelId: String;
-	  +model: T
-	]
-	
-	[IsFetched
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsFetched]
-	
-	[IsSaving
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaving]
-	
-	[IsSaved
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaved]
-	
-	[IsDeleted
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsDeleted]
-	
-	[&lt;abstract&gt;SupabaseClientDependant
-	  |
-	  +supabaseClient: SupabaseClient
-	]
-	
-	[&lt;abstract&gt;SupabaseClientDependant]o-[SupabaseClient]
-	
-	[SupabaseQueryError
-	  |
-	  +statusCode: String?;
-	  +message: String;
-	  +details: dynamic
-	]
-	
-	[Exception]&lt;:--[SupabaseQueryError]
-	
-	[&lt;abstract&gt;SupabaseQueryMixin
-	  |
-	  +dynamic deleteAll();
-	  +dynamic getAll();
-	  +dynamic getById();
-	  +dynamic getByColumn();
-	  +List&lt;T&gt; deserializeList();
-	  +T deserializeObject()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="2662.0" width="5267.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<g stroke-dasharray="6 6">
-						<path d="M3701.2 132.9 L1462.5 278 L1462.5 411 L1462.5 411.0 " fill="none"></path>
-					</g>
-					<path d="M3701.5 138.2 L3701.2 132.9 L3700.8 127.6 L3714.5 132.0 Z"></path>
-					<path d="M1388.7 434.6 L108 575 L108 806 L108.0 806.0 " fill="none"></path>
-					<path d="M1389.3 439.9 L1388.7 434.6 L1388.2 429.3 L1402.0 433.1 Z"></path>
-					<path d="M1388.8 436.8 L395.5 575 L395.5 806 L395.5 806.0 " fill="none"></path>
-					<path d="M1389.5 442.0 L1388.8 436.8 L1388.1 431.5 L1402.0 434.9 Z"></path>
-					<path d="M1388.9 440.8 L696 575 L696 806 L696.0 806.0 " fill="none"></path>
-					<path d="M1389.9 446.0 L1388.9 440.8 L1387.9 435.5 L1402.0 438.2 Z"></path>
-					<path d="M1400.7 446.0 L992.5 575 L992.5 806 L992.5 806.0 " fill="none"></path>
-					<path d="M1402.3 451.1 L1400.7 446.0 L1399.1 440.9 L1413.4 442.0 Z"></path>
-					<path d="M1435.8 451.0 L1300.5 575 L1300.5 806 L1300.5 806.0 " fill="none"></path>
-					<path d="M1439.4 454.9 L1435.8 451.0 L1432.2 447.1 L1445.6 442.0 Z"></path>
-					<path d="M1489.2 451.0 L1624.5 575 L1624.5 806 L1624.5 806.0 " fill="none"></path>
-					<path d="M1492.8 447.1 L1489.2 451.0 L1485.6 454.9 L1479.4 442.0 Z"></path>
-					<path d="M1523.8 446.1 L1928 575 L1928 806 L1928.0 806.0 " fill="none"></path>
-					<path d="M1525.4 441.0 L1523.8 446.1 L1522.2 451.1 L1511.1 442.0 Z"></path>
-					<path d="M1536.1 440.9 L2221.5 575 L2221.5 806 L2221.5 806.0 " fill="none"></path>
-					<path d="M1537.1 435.7 L1536.1 440.9 L1535.1 446.1 L1523.0 438.3 Z"></path>
-					<path d="M1536.2 436.7 L2532.5 575 L2532.5 806 L2532.5 806.0 " fill="none"></path>
-					<path d="M1536.9 431.4 L1536.2 436.7 L1535.5 442.0 L1523.0 434.9 Z"></path>
-					<path d="M1536.3 434.7 L2806 575 L2806 806 L2806.0 806.0 " fill="none"></path>
-					<path d="M1536.8 429.4 L1536.3 434.7 L1535.7 440.0 L1523.0 433.2 Z"></path>
-					<path d="M2536.5 2553.7 L2536.5 2555 L2469.0352112676055 2575 L2469.0 2575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2541.8 2544.3 L2536.5 2553.7 L2531.2 2544.3 L2536.5 2535.0 Z"></path>
-					</g>
-					<path d="M2477.7 2087.4 L2594 2182 L2587.8337801608577 2202 L2587.8 2202.0 " fill="none"></path>
-					<path d="M2481.1 2083.3 L2477.7 2087.4 L2474.3 2091.6 L2467.4 2079.0 Z"></path>
-					<path d="M2604.2 2123.9 L2516.5 2182 L2518.6447721179625 2202 L2518.6 2202.0 " fill="none"></path>
-					<path d="M2607.2 2128.3 L2604.2 2123.9 L2601.3 2119.4 L2615.4 2116.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M2257.8 2152.9 L2295.5 2182 L2321.344504021448 2202 L2321.3 2202.0 " fill="none"></path>
-					</g>
-					<path d="M2261.1 2148.7 L2257.8 2152.9 L2254.6 2157.2 L2247.3 2144.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3623.8 1003.1 L3746.25 1068 L3746.25 1164 L3746.25 1164 L3746.25 1260 L3746.25 1260 L3746.25 1386.5 L3746.25 1386.5 L3746.25 1513 L3746.25 1513 L3713.14263803681 1556 L3713.1 1556.0 " fill="none"></path>
-					</g>
-					<path d="M3626.3 998.4 L3623.8 1003.1 L3621.3 1007.8 L3612.0 996.9 Z"></path>
-					<path d="M3624.4 1811.8 L2289.75 1914 L2247.25 1947.8988095238096 L2247.3 1947.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3634.1 1816.5 L3624.4 1811.8 L3633.3 1805.8 L3643.0 1810.4 Z"></path>
-					</g>
-					<path d="M3844.5 1905.2 L3844.5 1914 L3298.25 2019.50990990991 L3298.3 2019.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3849.8 1895.8 L3844.5 1905.2 L3839.2 1895.8 L3844.5 1886.5 Z"></path>
-					</g>
-					<path d="M4064.2 1846.7 L4350.5 1914 L4294.566231343284 2032.5 L4294.6 2032.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4056.3 1839.3 L4064.2 1846.7 L4053.9 1849.7 L4046.0 1842.4 Z"></path>
-					</g>
-					<path d="M4064.3 1837.9 L4453.75 1914 L4453.75 2032.5 L4453.8 2032.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4056.2 1830.9 L4064.3 1837.9 L4054.1 1841.4 L4046.0 1834.4 Z"></path>
-					</g>
-					<path d="M3624.5 952.5 L3927.25 1068 L3927.25 1164 L3927.25 1164 L3927.25 1260 L3927.25 1260 L3927.25 1386.5 L3927.25 1386.5 L3927.25 1513 L3927.25 1513 L3927.25 1594.5 L3927.25 1594.5 L3927.25 1676 L3927.25 1676 L3908.127100840336 1703.5 L3908.1 1703.5 " fill="none"></path>
-					<path d="M3626.4 947.5 L3624.5 952.5 L3622.6 957.5 L3612.0 947.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3683.5 1646.3 L3683.5 1676 L3720.705882352941 1703.5 L3720.7 1703.5 " fill="none"></path>
-					</g>
-					<path d="M3688.8 1646.3 L3683.5 1646.3 L3678.2 1646.3 L3683.5 1633.0 Z"></path>
-					<path d="M2249.8 1912.7 L2249.75 1914 L2223.0037313432836 1942 L2223.0 1942.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2255.1 1903.3 L2249.8 1912.7 L2244.4 1903.3 L2249.8 1894.0 Z"></path>
-					</g>
-					<path d="M2409.3 1809.5 L3562.75 1914 L3298.25 2000.0266990291261 L3298.3 2000.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2400.5 1803.3 L2409.3 1809.5 L2399.6 1813.9 L2390.8 1807.8 Z"></path>
-					</g>
-					<path d="M2249.8 1253.3 L2249.75 1260 L2249.75 1386.5 L2249.75 1386.5 L2249.75 1513 L2249.75 1513 L2249.75 1594.5 L2249.75 1594.5 L2249.75 1676 L2249.75 1676 L2249.75 1696 L2249.8 1696.0 " fill="none"></path>
-					<path d="M2255.1 1253.3 L2249.8 1253.3 L2244.4 1253.3 L2249.8 1240.0 Z"></path>
-					<path d="M1953.8 1867.7 L1953.75 1914 L1996.25 1947.8988095238096 L1996.3 1947.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1959.1 1858.3 L1953.8 1867.7 L1948.4 1858.3 L1953.8 1849.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1953.8 1646.3 L1953.75 1676 L1953.75 1741 L1953.8 1741.0 " fill="none"></path>
-					</g>
-					<path d="M1959.1 1646.3 L1953.8 1646.3 L1948.4 1646.3 L1953.8 1633.0 Z"></path>
-					<path d="M2383.6 164.2 L2848 278 L2848 411 L2848.0 411.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2375.8 156.8 L2383.6 164.2 L2373.3 167.2 L2365.5 159.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3761.5 157.8 L3761.5 278 L3761.5 411 L3761.5 411.0 " fill="none"></path>
-					</g>
-					<path d="M3766.8 157.8 L3761.5 157.8 L3756.2 157.8 L3761.5 144.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3761.5 455.3 L3761.5 575 L3761.5 806 L3761.5 806.0 " fill="none"></path>
-					</g>
-					<path d="M3766.8 455.3 L3761.5 455.3 L3756.2 455.3 L3761.5 442.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3173.1 154.5 L3281 278 L3281 298 L3281.0 298.0 " fill="none"></path>
-					</g>
-					<path d="M3177.1 151.0 L3173.1 154.5 L3169.1 158.0 L3164.3 144.5 Z"></path>
-					<path d="M2931.8 905.0 L2249.75 1068 L2249.75 1088 L2249.8 1088.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2942.2 908.0 L2931.8 905.0 L2939.7 897.6 L2950.0 900.6 Z"></path>
-					</g>
-					<path d="M2961.7 1059.1 L2949.75 1068 L2949.75 1148.5 L2949.8 1148.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2972.3 1057.9 L2961.7 1059.1 L2966.0 1049.3 L2976.6 1048.0 Z"></path>
-					</g>
-					<path d="M3281.0 568.3 L3281 575 L3281 595 L3281.0 595.0 " fill="none"></path>
-					<path d="M3286.3 568.3 L3281.0 568.3 L3275.7 568.3 L3281.0 555.0 Z"></path>
-					<path d="M4609.5 147.0 L3985 278 L3985 411 L3985.0 411.0 " fill="none"></path>
-					<path d="M4610.5 152.2 L4609.5 147.0 L4608.4 141.7 L4622.5 144.2 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3197.3 1060.6 L3194.75 1068 L3194.75 1133 L3194.8 1133.0 " fill="none"></path>
-					</g>
-					<path d="M3202.4 1062.3 L3197.3 1060.6 L3192.3 1058.8 L3201.7 1048.0 Z"></path>
-					<path d="M3501.0 1414.7 L4267.25 1513 L4267.25 1594.5 L4267.25 1594.5 L4267.25 1676 L4267.25 1676 L4267.25 1795 L4267.25 1795 L4267.25 1914 L4267.25 1914 L4284.936567164179 2032.5 L4284.9 2032.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3492.4 1408.2 L3501.0 1414.7 L3491.1 1418.8 L3482.5 1412.3 Z"></path>
-					</g>
-					<path d="M3060.9 1404.0 L1688.25 1513 L1688.25 1594.5 L1688.25 1594.5 L1688.25 1676 L1688.25 1676 L1688.25 1795 L1688.25 1795 L1688.25 1914 L1688.25 1914 L1996.25 2009.20645905421 L1996.3 2009.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3070.6 1408.6 L3060.9 1404.0 L3069.8 1397.9 L3079.5 1402.5 Z"></path>
-					</g>
-					<path d="M3281.0 1511.7 L3281 1513 L3281 1594.5 L3281 1594.5 L3281 1676 L3281 1676 L3281 1795 L3281 1795 L3281 1914 L3281 1914 L3261.5597014925374 1934 L3261.6 1934.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3286.3 1502.3 L3281.0 1511.7 L3275.7 1502.3 L3281.0 1493.0 Z"></path>
-					</g>
-					<path d="M3500.1 1462.6 L3645.5 1513 L3665.5490797546013 1556 L3665.5 1556.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3493.1 1454.5 L3500.1 1462.6 L3489.6 1464.5 L3482.5 1456.4 Z"></path>
-					</g>
-					<path d="M3060.9 1404.9 L1768.25 1513 L1768.25 1579 L1768.3 1579.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3070.6 1409.4 L3060.9 1404.9 L3069.8 1398.8 L3079.5 1403.3 Z"></path>
-					</g>
-					<path d="M3589.8 1056.1 L3605.5 1068 L3605.5 1164 L3605.5 1164 L3605.5 1260 L3605.5 1260 L3482.5 1307.949152542373 L3482.5 1307.9 " fill="none"></path>
-					<path d="M3593.0 1051.8 L3589.8 1056.1 L3586.6 1060.3 L3579.2 1048.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3194.8 1208.3 L3194.75 1260 L3208.3863636363635 1280 L3208.4 1280.0 " fill="none"></path>
-					</g>
-					<path d="M3200.1 1208.3 L3194.8 1208.3 L3189.4 1208.3 L3194.8 1195.0 Z"></path>
-					<path d="M1728.3 1511.7 L1728.25 1513 L1760.6426380368098 1579 L1760.6 1579.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1733.6 1502.3 L1728.3 1511.7 L1722.9 1502.3 L1728.3 1493.0 Z"></path>
-					</g>
-					<path d="M1650.9 1508.8 L1648.25 1513 L1648.25 1594.5 L1648.25 1594.5 L1648.25 1676 L1648.25 1676 L1648.25 1795 L1648.25 1795 L1648.25 1914 L1648.25 1914 L1996.25 2012.4836325237593 L1996.3 2012.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1660.4 1503.7 L1650.9 1508.8 L1651.4 1498.0 L1660.9 1493.0 Z"></path>
-					</g>
-					<path d="M1896.4 1398.0 L3582.75 1513 L3635.9064417177915 1556 L3635.9 1556.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1887.4 1392.0 L1896.4 1398.0 L1886.7 1402.7 L1877.8 1396.7 Z"></path>
-					</g>
-					<path d="M2124.1 1187.1 L1728.25 1260 L1728.25 1280 L1728.3 1280.0 " fill="none"></path>
-					<path d="M2125.1 1192.4 L2124.1 1187.1 L2123.2 1181.9 L2137.3 1184.7 Z"></path>
-					<path d="M2985.9 2114.0 L2816 2182 L2816 2368.5 L2816 2368.5 L2816 2555 L2816 2555 L2816 2575 L2816.0 2575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2996.6 2115.5 L2985.9 2114.0 L2992.6 2105.6 L3003.3 2107.0 Z"></path>
-					</g>
-					<path d="M3251.6 2176.7 L3255.75 2182 L3255.75 2368.5 L3255.75 2368.5 L3255.75 2555 L3255.75 2555 L3255.75 2575 L3255.8 2575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3250.0 2166.1 L3251.6 2176.7 L3241.6 2172.6 L3240.1 2162.0 Z"></path>
-					</g>
-					<path d="M3030.3 1823.8 L3030.25 1914 L3048.2350746268658 1934 L3048.2 1934.0 " fill="none"></path>
-					<path d="M3035.6 1823.8 L3030.3 1823.8 L3024.9 1823.8 L3030.3 1810.5 Z"></path>
-					<path d="M2857.6 2413.8 L2272 2555 L2353.549295774648 2575 L2353.5 2575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2867.9 2416.8 L2857.6 2413.8 L2865.4 2406.5 L2875.8 2409.5 Z"></path>
-					</g>
-					<path d="M3232.5 2461.6 L3419.75 2555 L3419.75 2575 L3419.8 2575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3226.5 2452.7 L3232.5 2461.6 L3221.7 2462.2 L3215.8 2453.3 Z"></path>
-					</g>
-					<path d="M3233.5 2431.2 L3604.25 2555 L3604.25 2575 L3604.3 2575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3226.3 2423.2 L3233.5 2431.2 L3222.9 2433.3 L3215.8 2425.3 Z"></path>
-					</g>
-					<path d="M3045.8 2538.7 L3045.75 2555 L3216.25 2583.822619047619 L3216.3 2583.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3051.1 2529.3 L3045.8 2538.7 L3040.4 2529.3 L3045.8 2520.0 Z"></path>
-					</g>
-					<path d="M2858.4 2443.0 L2576.5 2555 L2789.5 2586.572025052192 L2789.5 2586.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2869.0 2444.5 L2858.4 2443.0 L2865.1 2434.6 L2875.8 2436.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3053.2 2172.5 L3045.75 2182 L3045.75 2217 L3045.8 2217.0 " fill="none"></path>
-					</g>
-					<path d="M3057.4 2175.8 L3053.2 2172.5 L3049.0 2169.2 L3061.4 2162.0 Z"></path>
-					<path d="M4245.7 1616.0 L4659 1676 L4659 1795 L4659 1795 L4659 1914 L4659 1914 L4625.174440298508 2032.5 L4625.2 2032.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4237.3 1609.4 L4245.7 1616.0 L4235.7 1620.0 L4227.3 1613.4 Z"></path>
-					</g>
-					<path d="M3302.4 1805.2 L1608.25 1914 L1996.25 2015.2502434274586 L1996.3 2015.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3312.0 1810.0 L3302.4 1805.2 L3311.3 1799.3 L3321.0 1804.1 Z"></path>
-					</g>
-					<path d="M3302.4 1811.8 L2329.75 1914 L3003.25 2023.9257003654081 L3003.3 2023.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3312.3 1816.1 L3302.4 1811.8 L3311.2 1805.5 L3321.0 1809.8 Z"></path>
-					</g>
-					<path d="M3621.6 1809.9 L4737.25 1914 L4737.25 2032.5 L4737.3 2032.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3612.8 1803.7 L3621.6 1809.9 L3611.8 1814.3 L3603.0 1808.2 Z"></path>
-					</g>
-					<path d="M3621.6 1812.3 L4557.25 1914 L4613.4048507462685 2032.5 L4613.4 2032.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3612.9 1806.0 L3621.6 1812.3 L3611.7 1816.6 L3603.0 1810.3 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3954.0 1612.9 L3462 1676 L3462 1711 L3462.0 1711.0 " fill="none"></path>
-					</g>
-					<path d="M3954.7 1618.2 L3954.0 1612.9 L3953.3 1607.6 L3967.3 1611.2 Z"></path>
-					<path d="M4447.0 376.3 L4459 373 L4466.5 373 L4466.5 373 L4474 426.5 L4474 426.5 L4466.5 480 L4466.5 480 L4459 480 L4459 480 L4429 471.8527918781726 L4429.0 471.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4436.6 373.6 L4447.0 376.3 L4439.4 383.8 L4429.0 381.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M4268.7 157.8 L4262 278 L4262 373 L4262.0 373.0 " fill="none"></path>
-					</g>
-					<path d="M4274.0 158.1 L4268.7 157.8 L4263.3 157.5 L4269.4 144.5 Z"></path>
-					<path d="M4652.9 177.6 L4566 278 L4566 411 L4566.0 411.0 " fill="none"></path>
-					<path d="M4657.0 181.1 L4652.9 177.6 L4648.9 174.1 L4661.7 167.5 Z"></path>
-					<path d="M4695.0 180.8 L4695 278 L4695 411 L4695.0 411.0 " fill="none"></path>
-					<path d="M4700.3 180.8 L4695.0 180.8 L4689.7 180.8 L4695.0 167.5 Z"></path>
-					<path d="M4735.0 177.8 L4817 278 L4817 411 L4817.0 411.0 " fill="none"></path>
-					<path d="M4739.1 174.4 L4735.0 177.8 L4730.8 181.2 L4726.5 167.5 Z"></path>
-					<path d="M4770.4 174.4 L4942.5 278 L4942.5 411 L4942.5 411.0 " fill="none"></path>
-					<path d="M4773.1 169.8 L4770.4 174.4 L4767.6 178.9 L4759.0 167.5 Z"></path>
-					<path d="M2368.2 2089.5 L2232 2182 L2232 2368.5 L2232 2368.5 L2232 2555 L2232 2555 L2346.25 2576.953315290934 L2346.3 2577.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2378.9 2088.7 L2368.2 2089.5 L2372.9 2079.8 L2383.6 2079.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3821.8 135.6 L5119.5 278 L5119.5 380.5 L5119.5 380.5 " fill="none"></path>
-					</g>
-					<path d="M3822.3 130.3 L3821.8 135.6 L3821.2 140.9 L3808.5 134.2 Z"></path>
-					<g data-name="StudyUApi">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApi">
-							<rect x="1996.3" y="1942.0" height="212.0" width="251.0" data-name="StudyUApi"></rect>
-							<path d="M1996.3 1973.0 L2247.3 1973.0" fill="none" data-name="StudyUApi"></path>
-						</g>
-						<g transform="translate(1996.25, 1942)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyUApi">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApi">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApi">StudyUApi</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1996.25, 1973)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApi">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApi">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApi">+dynamic saveStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApi">+dynamic getUserStudies()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApi">+dynamic saveStudyInvite()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudyInvite()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudyInvite()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApi">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApi">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApi">+dynamic fetchUser()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApi">+dynamic saveUser()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="APIException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="APIException">
-							<rect x="1402.0" y="411.0" height="31.0" width="121.0" data-name="APIException"></rect>
-						</g>
-						<g transform="translate(1402, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="APIException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="APIException">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="APIException">APIException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Exception">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="3714.5" y="113.5" height="31.0" width="94.0" data-name="Exception"></rect>
-						</g>
-						<g transform="translate(3714.5, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotFoundException">
-							<rect x="0.0" y="806.0" height="31.0" width="216.0" data-name="StudyNotFoundException"></rect>
-						</g>
-						<g transform="translate(0, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotFoundException">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotFoundException">StudyNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementNotFoundException">
-							<rect x="256.0" y="806.0" height="31.0" width="279.0" data-name="MeasurementNotFoundException"></rect>
-						</g>
-						<g transform="translate(256, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementNotFoundException">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementNotFoundException">MeasurementNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionNotFoundException">
-							<rect x="575.0" y="806.0" height="31.0" width="242.0" data-name="QuestionNotFoundException"></rect>
-						</g>
-						<g transform="translate(575, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionNotFoundException">
-								<text x="113.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionNotFoundException">QuestionNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemNotFoundException">
-							<rect x="857.0" y="806.0" height="31.0" width="271.0" data-name="ConsentItemNotFoundException"></rect>
-						</g>
-						<g transform="translate(857, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemNotFoundException">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemNotFoundException">ConsentItemNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionNotFoundException">
-							<rect x="1168.0" y="806.0" height="31.0" width="265.0" data-name="InterventionNotFoundException"></rect>
-						</g>
-						<g transform="translate(1168, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionNotFoundException">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionNotFoundException">InterventionNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskNotFoundException">
-							<rect x="1473.0" y="806.0" height="31.0" width="303.0" data-name="InterventionTaskNotFoundException"></rect>
-						</g>
-						<g transform="translate(1473, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskNotFoundException">
-								<text x="143.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskNotFoundException">InterventionTaskNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportNotFoundException">
-							<rect x="1816.0" y="806.0" height="31.0" width="224.0" data-name="ReportNotFoundException"></rect>
-						</g>
-						<g transform="translate(1816, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportNotFoundException">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportNotFoundException">ReportNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionNotFoundException">
-							<rect x="2080.0" y="806.0" height="31.0" width="283.0" data-name="ReportSectionNotFoundException"></rect>
-						</g>
-						<g transform="translate(2080, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionNotFoundException">
-								<text x="133.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionNotFoundException">ReportSectionNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInviteNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInviteNotFoundException">
-							<rect x="2403.0" y="806.0" height="31.0" width="259.0" data-name="StudyInviteNotFoundException"></rect>
-						</g>
-						<g transform="translate(2403, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInviteNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInviteNotFoundException">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInviteNotFoundException">StudyInviteNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="UserNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UserNotFoundException">
-							<rect x="2702.0" y="806.0" height="31.0" width="208.0" data-name="UserNotFoundException"></rect>
-						</g>
-						<g transform="translate(2702, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserNotFoundException">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserNotFoundException">UserNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUApiClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApiClient">
-							<rect x="2297.0" y="2202.0" height="333.0" width="479.0" data-name="StudyUApiClient"></rect>
-							<path d="M2297.0 2233.0 L2776.0 2233.0" fill="none" data-name="StudyUApiClient"></path>
-							<path d="M2297.0 2309.0 L2776.0 2309.0" fill="none" data-name="StudyUApiClient"></path>
-						</g>
-						<g transform="translate(2297, 2202)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApiClient">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApiClient">StudyUApiClient</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2297, 2233)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+supabaseClient: SupabaseClient</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyColumns: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+testDelayMilliseconds: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2297, 2309)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">+dynamic getUserStudies()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudy()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudyInvite()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudyInvite()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudyInvite()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchUser()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApiClient">+dynamic saveUser()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyUApiClient">-dynamic _awaitGuarded()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyUApiClient">-dynamic _apiException()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyUApiClient">-dynamic _testDelay()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClient">
-							<rect x="2346.3" y="2575.0" height="31.0" width="141.0" data-name="SupabaseClient"></rect>
-						</g>
-						<g transform="translate(2346.25, 2575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClient">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClient">SupabaseClient</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseClientDependant">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClientDependant">
-							<rect x="2287.3" y="2017.0" height="62.0" width="284.0" data-name="SupabaseClientDependant"></rect>
-							<path d="M2287.3 2048.0 L2571.3 2048.0" fill="none" data-name="SupabaseClientDependant"></path>
-						</g>
-						<g transform="translate(2287.25, 2017)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseClientDependant">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClientDependant">
-								<text x="134.0" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClientDependant">SupabaseClientDependant</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2287.25, 2048)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseClientDependant">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseClientDependant">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseClientDependant">+supabaseClient: SupabaseClient</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseQueryMixin">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryMixin">
-							<rect x="2611.3" y="1979.5" height="137.0" width="215.0" data-name="SupabaseQueryMixin"></rect>
-							<path d="M2611.3 2010.5 L2826.3 2010.5" fill="none" data-name="SupabaseQueryMixin"></path>
-						</g>
-						<g transform="translate(2611.25, 1979.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseQueryMixin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryMixin">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryMixin">SupabaseQueryMixin</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2611.25, 2010.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryMixin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryMixin">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic deleteAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getById()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getByColumn()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseQueryMixin">+List&lt;T&gt; deserializeList()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SupabaseQueryMixin">+T deserializeObject()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="3558.0" y="1556.0" height="77.0" width="251.0" data-name="IStudyRepository"></rect>
-							<path d="M3558.0 1587.0 L3809.0 1587.0" fill="none" data-name="IStudyRepository"></path>
-						</g>
-						<g transform="translate(3558, 1556)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3558, 1587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyRepository">+dynamic launch()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyRepository">+dynamic deleteParticipants()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepository">
-							<rect x="2950.0" y="595.0" height="453.0" width="662.0" data-name="ModelRepository"></rect>
-							<path d="M2950.0 626.0 L3612.0 626.0" fill="none" data-name="ModelRepository"></path>
-							<path d="M2950.0 732.0 L3612.0 732.0" fill="none" data-name="ModelRepository"></path>
-						</g>
-						<g transform="translate(2950, 595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepository">
-								<text x="323.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepository">ModelRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2950, 626)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+delegate: IModelRepositoryDelegate&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">-_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">-_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">-_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2950, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt;? get()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">+dynamic fetchAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">+dynamic fetch()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ModelRepository">-dynamic _buildModelSpecificController()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ModelRepository">+dynamic ensurePersisted()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt; upsertLocally()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ModelRepository">+List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ModelRepository">+dynamic emitUpdate()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ModelRepository">+dynamic emitModelEvent()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ModelRepository">+dynamic emitError()</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ModelRepository">+void dispose()</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ModelRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepository">
-							<rect x="3643.0" y="1703.5" height="183.0" width="403.0" data-name="StudyRepository"></rect>
-							<path d="M3643.0 1734.5 L4046.0 1734.5" fill="none" data-name="StudyRepository"></path>
-							<path d="M3643.0 1810.5 L4046.0 1810.5" fill="none" data-name="StudyRepository"></path>
-						</g>
-						<g transform="translate(3643, 1703.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepository">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepository">StudyRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3643, 1734.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+sortCallback: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3643, 1810.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+dynamic launch()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="3003.3" y="1934.0" height="228.0" width="295.0" data-name="IAuthRepository"></rect>
-							<path d="M3003.3 1965.0 L3298.3 1965.0" fill="none" data-name="IAuthRepository"></path>
-							<path d="M3003.3 2056.0 L3298.3 2056.0" fill="none" data-name="IAuthRepository"></path>
-						</g>
-						<g transform="translate(3003.25, 1934)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3003.25, 1965)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+allowPasswordReset: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+currentUser: User?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+isLoggedIn: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+session: Session?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+serializedSession: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3003.25, 2056)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+dynamic signUp()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+dynamic signInWith()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+dynamic signOut()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+dynamic updateUser()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IAuthRepository">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ProviderRef">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ProviderRef">
-							<rect x="4232.8" y="2032.5" height="31.0" width="109.0" data-name="ProviderRef"></rect>
-						</g>
-						<g transform="translate(4232.75, 2032.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ProviderRef">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProviderRef">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProviderRef">ProviderRef</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="4381.8" y="2032.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(4381.75, 2032.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepositoryDelegate">
-							<rect x="2108.8" y="1696.0" height="198.0" width="282.0" data-name="StudyRepositoryDelegate"></rect>
-							<path d="M2108.8 1727.0 L2390.8 1727.0" fill="none" data-name="StudyRepositoryDelegate"></path>
-							<path d="M2108.8 1773.0 L2390.8 1773.0" fill="none" data-name="StudyRepositoryDelegate"></path>
-						</g>
-						<g transform="translate(2108.75, 1696)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepositoryDelegate">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepositoryDelegate">StudyRepositoryDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2108.75, 1727)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+authRepository: IAuthRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2108.75, 1773)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic onError()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createNewInstance()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepositoryDelegate">
-							<rect x="2137.3" y="1088.0" height="152.0" width="225.0" data-name="IModelRepositoryDelegate"></rect>
-							<path d="M2137.3 1119.0 L2362.3 1119.0" fill="none" data-name="IModelRepositoryDelegate"></path>
-						</g>
-						<g transform="translate(2137.25, 1088)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepositoryDelegate">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepositoryDelegate">IModelRepositoryDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2137.25, 1119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepositoryDelegate">+T createNewInstance()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepositoryDelegate">+T createDuplicate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic onError()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAppRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppRepository">
-							<rect x="1838.8" y="1556.0" height="77.0" width="230.0" data-name="IAppRepository"></rect>
-							<path d="M1838.8 1587.0 L2068.8 1587.0" fill="none" data-name="IAppRepository"></path>
-						</g>
-						<g transform="translate(1838.75, 1556)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppRepository">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAppRepository">IAppRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1838.75, 1587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppRepository">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAppRepository">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppRepository">
-							<rect x="1838.8" y="1741.0" height="108.0" width="230.0" data-name="AppRepository"></rect>
-							<path d="M1838.8 1772.0 L2068.8 1772.0" fill="none" data-name="AppRepository"></path>
-							<path d="M1838.8 1803.0 L2068.8 1803.0" fill="none" data-name="AppRepository"></path>
-						</g>
-						<g transform="translate(1838.75, 1741)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppRepository">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppRepository">AppRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1838.75, 1772)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+apiClient: StudyUApi</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1838.75, 1803)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppRepository">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WrappedModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WrappedModel">
-							<rect x="2114.5" y="0.0" height="258.0" width="251.0" data-name="WrappedModel"></rect>
-							<path d="M2114.5 31.0 L2365.5 31.0" fill="none" data-name="WrappedModel"></path>
-							<path d="M2114.5 182.0 L2365.5 182.0" fill="none" data-name="WrappedModel"></path>
-						</g>
-						<g transform="translate(2114.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WrappedModel">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="WrappedModel">WrappedModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2114.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">-_model: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+asyncValue: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+isLocalOnly: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+isDirty: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WrappedModel">+isDeleted: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WrappedModel">+lastSaved: DateTime?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WrappedModel">+lastFetched: DateTime?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WrappedModel">+lastUpdated: DateTime?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WrappedModel">+model: T</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2114.5, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">+dynamic markWithError()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+dynamic markAsLoading()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+dynamic markAsFetched()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+dynamic markAsSaved()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="2793.5" y="411.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
-						</g>
-						<g transform="translate(2793.5, 411)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelRepositoryException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepositoryException">
-							<rect x="3648.0" y="411.0" height="31.0" width="227.0" data-name="ModelRepositoryException"></rect>
-						</g>
-						<g transform="translate(3648, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelRepositoryException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepositoryException">
-								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepositoryException">ModelRepositoryException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelNotFoundException">
-							<rect x="3652.0" y="806.0" height="31.0" width="219.0" data-name="ModelNotFoundException"></rect>
-						</g>
-						<g transform="translate(3652, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelNotFoundException">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelNotFoundException">ModelNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepository">
-							<rect x="3090.0" y="298.0" height="257.0" width="382.0" data-name="IModelRepository"></rect>
-							<path d="M3090.0 329.0 L3472.0 329.0" fill="none" data-name="IModelRepository"></path>
-						</g>
-						<g transform="translate(3090, 298)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepository">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepository">IModelRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3090, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepository">+WrappedModel&lt;T&gt;? get()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepository">+dynamic fetchAll()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepository">+dynamic fetch()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepository">+dynamic save()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepository">+dynamic delete()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSave()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="IModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="IModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="IModelRepository">+dynamic ensurePersisted()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="IModelRepository">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="3058.8" y="113.5" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
-						</g>
-						<g transform="translate(3058.75, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BehaviorSubject">
-							<rect x="2877.3" y="1148.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
-						</g>
-						<g transform="translate(2877.25, 1148.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BehaviorSubject">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="BehaviorSubject">BehaviorSubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyLaunched">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyLaunched">
-							<rect x="3915.0" y="411.0" height="31.0" width="140.0" data-name="StudyLaunched"></rect>
-						</g>
-						<g transform="translate(3915, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyLaunched">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyLaunched">
-								<text x="62.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyLaunched">StudyLaunched</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelEvent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelEvent">
-							<rect x="4622.5" y="90.5" height="77.0" width="145.0" data-name="ModelEvent"></rect>
-							<path d="M4622.5 121.5 L4767.5 121.5" fill="none" data-name="ModelEvent"></path>
-						</g>
-						<g transform="translate(4622.5, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelEvent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelEvent">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelEvent">ModelEvent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4622.5, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelEvent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelEvent">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelEvent">+modelId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelEvent">+model: T</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IInviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="3062.3" y="1133.0" height="62.0" width="265.0" data-name="IInviteCodeRepository"></rect>
-							<path d="M3062.3 1164.0 L3327.3 1164.0" fill="none" data-name="IInviteCodeRepository"></path>
-						</g>
-						<g transform="translate(3062.25, 1133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3062.25, 1164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IInviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IInviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepository">
-							<rect x="3079.5" y="1280.0" height="213.0" width="403.0" data-name="InviteCodeRepository"></rect>
-							<path d="M3079.5 1311.0 L3482.5 1311.0" fill="none" data-name="InviteCodeRepository"></path>
-							<path d="M3079.5 1417.0 L3482.5 1417.0" fill="none" data-name="InviteCodeRepository"></path>
-						</g>
-						<g transform="translate(3079.5, 1280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepository">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepository">InviteCodeRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3079.5, 1311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepository">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepository">+study: Study</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3079.5, 1417)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+dynamic emitUpdate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="1737.8" y="1579.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(1737.75, 1579)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepositoryDelegate">
-							<rect x="1578.8" y="1280.0" height="213.0" width="299.0" data-name="InviteCodeRepositoryDelegate"></rect>
-							<path d="M1578.8 1311.0 L1877.8 1311.0" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
-							<path d="M1578.8 1372.0 L1877.8 1372.0" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
-						</g>
-						<g transform="translate(1578.75, 1280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepositoryDelegate">
-								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepositoryDelegate">InviteCodeRepositoryDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1578.75, 1311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+apiClient: StudyUApi</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+studyRepository: IStudyRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1578.75, 1372)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic onError()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createDuplicate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createNewInstance()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="User">
-						<g fill="#eee8d5" stroke="#33322E" data-name="User">
-							<rect x="2789.5" y="2575.0" height="31.0" width="53.0" data-name="User"></rect>
-						</g>
-						<g transform="translate(2789.5, 2575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="User">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="User">
-								<text x="18.5" y="13.5" stroke="none" text-anchor="middle" data-name="User">User</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Session">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Session">
-							<rect x="3216.3" y="2575.0" height="31.0" width="79.0" data-name="Session"></rect>
-						</g>
-						<g transform="translate(3216.25, 2575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Session">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Session">
-								<text x="31.5" y="13.5" stroke="none" text-anchor="middle" data-name="Session">Session</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAppDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
-							<rect x="2968.8" y="1779.5" height="31.0" width="123.0" data-name="IAppDelegate"></rect>
-						</g>
-						<g transform="translate(2968.75, 1779.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
-								<text x="53.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthRepository">
-							<rect x="2875.8" y="2217.0" height="303.0" width="340.0" data-name="AuthRepository"></rect>
-							<path d="M2875.8 2248.0 L3215.8 2248.0" fill="none" data-name="AuthRepository"></path>
-							<path d="M2875.8 2384.0 L3215.8 2384.0" fill="none" data-name="AuthRepository"></path>
-						</g>
-						<g transform="translate(2875.75, 2217)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthRepository">
-								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthRepository">AuthRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2875.75, 2248)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">+supabaseClient: SupabaseClient</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+sharedPreferences: SharedPreferences</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+allowPasswordReset: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+authClient: GoTrueClient</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+session: Session?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+serializedSession: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+currentUser: User?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthRepository">+isLoggedIn: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2875.75, 2384)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">-void _registerAuthListener()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+dynamic signUp()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+dynamic signInWith()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+dynamic signOut()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+dynamic updateUser()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+void dispose()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthRepository">+dynamic onAppStart()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SharedPreferences">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SharedPreferences">
-							<rect x="3335.3" y="2575.0" height="31.0" width="169.0" data-name="SharedPreferences"></rect>
-						</g>
-						<g transform="translate(3335.25, 2575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SharedPreferences">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SharedPreferences">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="SharedPreferences">SharedPreferences</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoTrueClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoTrueClient">
-							<rect x="3544.3" y="2575.0" height="31.0" width="120.0" data-name="GoTrueClient"></rect>
-						</g>
-						<g transform="translate(3544.25, 2575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoTrueClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoTrueClient">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoTrueClient">GoTrueClient</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IUserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="3967.3" y="1533.0" height="123.0" width="260.0" data-name="IUserRepository"></rect>
-							<path d="M3967.3 1564.0 L4227.3 1564.0" fill="none" data-name="IUserRepository"></path>
-							<path d="M3967.3 1595.0 L4227.3 1595.0" fill="none" data-name="IUserRepository"></path>
-						</g>
-						<g transform="translate(3967.25, 1533)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3967.25, 1564)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+user: StudyUUser</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3967.25, 1595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+dynamic fetchUser()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IUserRepository">+dynamic saveUser()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IUserRepository">+dynamic updatePreferences()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUUser">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUUser">
-							<rect x="4565.8" y="2032.5" height="31.0" width="110.0" data-name="StudyUUser"></rect>
-						</g>
-						<g transform="translate(4565.75, 2032.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUUser">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUUser">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUUser">StudyUUser</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="UserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UserRepository">
-							<rect x="3321.0" y="1711.0" height="168.0" width="282.0" data-name="UserRepository"></rect>
-							<path d="M3321.0 1742.0 L3603.0 1742.0" fill="none" data-name="UserRepository"></path>
-							<path d="M3321.0 1818.0 L3603.0 1818.0" fill="none" data-name="UserRepository"></path>
-						</g>
-						<g transform="translate(3321, 1711)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserRepository">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserRepository">UserRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3321, 1742)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+ref: Ref&lt;Object?&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="UserRepository">+user: StudyUUser</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3321, 1818)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+dynamic fetchUser()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+dynamic saveUser()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+dynamic updatePreferences()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Ref">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Ref">
-							<rect x="4715.8" y="2032.5" height="31.0" width="43.0" data-name="Ref"></rect>
-						</g>
-						<g transform="translate(4715.75, 2032.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Ref">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Ref">
-								<text x="13.5" y="13.5" stroke="none" text-anchor="middle" data-name="Ref">Ref</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PreferenceAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreferenceAction">
-							<rect x="4095.0" y="373.0" height="107.0" width="334.0" data-name="PreferenceAction"></rect>
-							<path d="M4095.0 404.0 L4429.0 404.0" fill="none" data-name="PreferenceAction"></path>
-						</g>
-						<g transform="translate(4095, 373)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreferenceAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreferenceAction">
-								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="PreferenceAction">PreferenceAction</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4095, 404)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreferenceAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreferenceAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreferenceAction">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+values: List&lt;PreferenceAction&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pin: PreferenceAction</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pinOff: PreferenceAction</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="4239.8" y="113.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(4239.75, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IsFetched">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsFetched">
-							<rect x="4519.0" y="411.0" height="31.0" width="94.0" data-name="IsFetched"></rect>
-						</g>
-						<g transform="translate(4519, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsFetched">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsFetched">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsFetched">IsFetched</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IsSaving">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaving">
-							<rect x="4653.0" y="411.0" height="31.0" width="84.0" data-name="IsSaving"></rect>
-						</g>
-						<g transform="translate(4653, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaving">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaving">
-								<text x="34.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaving">IsSaving</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IsSaved">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaved">
-							<rect x="4777.0" y="411.0" height="31.0" width="80.0" data-name="IsSaved"></rect>
-						</g>
-						<g transform="translate(4777, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaved">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaved">
-								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaved">IsSaved</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IsDeleted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsDeleted">
-							<rect x="4897.0" y="411.0" height="31.0" width="91.0" data-name="IsDeleted"></rect>
-						</g>
-						<g transform="translate(4897, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsDeleted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsDeleted">
-								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="IsDeleted">IsDeleted</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseQueryError">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryError">
-							<rect x="5028.0" y="380.5" height="92.0" width="183.0" data-name="SupabaseQueryError"></rect>
-							<path d="M5028.0 411.5 L5211.0 411.5" fill="none" data-name="SupabaseQueryError"></path>
-						</g>
-						<g transform="translate(5028, 380.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseQueryError">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryError">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryError">SupabaseQueryError</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5028, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryError">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryError">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryError">+statusCode: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryError">+message: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryError">+details: dynamic</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/routing/uml.svg b/docs/uml/designer_v2/lib/routing/uml.svg
deleted file mode 100644
index 956bf0220..000000000
--- a/docs/uml/designer_v2/lib/routing/uml.svg
+++ /dev/null
@@ -1,680 +0,0 @@
-<svg version="1.1" baseProfile="full" width="4151.0" height="893.0" viewbox="0 0 4151 893" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[RouterKeys
-	  |
-	  &lt;static&gt;+studyKey: ValueKey&lt;String&gt;;
-	  &lt;static&gt;+authKey: ValueKey&lt;String&gt;
-	]
-	
-	[RouterKeys]o-[ValueKey]
-	
-	[RouteParams
-	  |
-	  &lt;static&gt;+studiesFilter: String;
-	  &lt;static&gt;+studyId: String;
-	  &lt;static&gt;+measurementId: String;
-	  &lt;static&gt;+interventionId: String;
-	  &lt;static&gt;+testAppRoute: String
-	]
-	
-	[RouterConf
-	  |
-	  &lt;static&gt;+router: GoRouter;
-	  &lt;static&gt;+routes: List&lt;GoRoute&gt;;
-	  &lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;;
-	  &lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;
-	  |
-	  &lt;static&gt;+GoRoute route()
-	]
-	
-	[RouterConf]o-[GoRouter]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs
-	  |
-	  +studyId: String
-	]
-	
-	[&lt;abstract&gt;QuestionFormRouteArgs
-	  |
-	  +questionId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[&lt;abstract&gt;QuestionFormRouteArgs]
-	
-	[ScreenerQuestionFormRouteArgs
-	]
-	
-	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:-[ScreenerQuestionFormRouteArgs]
-	
-	[ConsentItemFormRouteArgs
-	  |
-	  +consentId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ConsentItemFormRouteArgs]
-	
-	[MeasurementFormRouteArgs
-	  |
-	  +measurementId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[MeasurementFormRouteArgs]
-	
-	[SurveyQuestionFormRouteArgs
-	  |
-	  +questionId: String
-	]
-	
-	[MeasurementFormRouteArgs]&lt;:-[SurveyQuestionFormRouteArgs]
-	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:--[SurveyQuestionFormRouteArgs]
-	
-	[InterventionFormRouteArgs
-	  |
-	  +interventionId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[InterventionFormRouteArgs]
-	
-	[InterventionTaskFormRouteArgs
-	  |
-	  +taskId: String
-	]
-	
-	[InterventionFormRouteArgs]&lt;:-[InterventionTaskFormRouteArgs]
-	
-	[ReportItemFormRouteArgs
-	  |
-	  +sectionId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ReportItemFormRouteArgs]
-	
-	[&lt;abstract&gt;GoRouteParamEnum
-	  |
-	  +String toRouteParam();
-	  +String toShortString()
-	]
-	
-	[RoutingIntents
-	  |
-	  &lt;static&gt;+root: RoutingIntent;
-	  &lt;static&gt;+studies: RoutingIntent;
-	  &lt;static&gt;+studiesShared: RoutingIntent;
-	  &lt;static&gt;+publicRegistry: RoutingIntent;
-	  &lt;static&gt;+study: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEdit: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditInfo: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditInterventions: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String);
-	  &lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditReports: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String);
-	  &lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute});
-	  &lt;static&gt;+studyRecruit: RoutingIntent Function(String);
-	  &lt;static&gt;+studyMonitor: RoutingIntent Function(String);
-	  &lt;static&gt;+studyAnalyze: RoutingIntent Function(String);
-	  &lt;static&gt;+studySettings: RoutingIntent Function(String);
-	  &lt;static&gt;+accountSettings: RoutingIntent;
-	  &lt;static&gt;+studyNew: RoutingIntent;
-	  &lt;static&gt;+login: RoutingIntent;
-	  &lt;static&gt;+signup: RoutingIntent;
-	  &lt;static&gt;+passwordForgot: RoutingIntent;
-	  &lt;static&gt;+passwordForgot2: RoutingIntent Function(String);
-	  &lt;static&gt;+passwordRecovery: RoutingIntent;
-	  &lt;static&gt;+error: RoutingIntent Function(Exception)
-	]
-	
-	[RoutingIntents]o-[RoutingIntent]
-	[RoutingIntents]o-[RoutingIntent Function(String)]
-	[RoutingIntents]o-[RoutingIntent Function(String, String)]
-	[RoutingIntents]o-[RoutingIntent Function(String, {String? appRoute})]
-	[RoutingIntents]o-[RoutingIntent Function(Exception)]
-	
-	[RoutingIntent
-	  |
-	  +route: GoRoute;
-	  +params: Map&lt;String, String&gt;;
-	  +queryParams: Map&lt;String, String&gt;;
-	  +dispatch: RoutingIntentDispatch?;
-	  +extra: Object?;
-	  +routeName: String;
-	  +arguments: Map&lt;String, String&gt;;
-	  +props: List&lt;Object?&gt;
-	  |
-	  -dynamic _validateRoute();
-	  +bool matches()
-	]
-	
-	[RoutingIntent]o-[GoRoute]
-	[RoutingIntent]o-[RoutingIntentDispatch]
-	[&lt;abstract&gt;Equatable]&lt;:-[RoutingIntent]
-	
-	[RoutingIntentDispatch
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;;
-	  &lt;static&gt;+go: RoutingIntentDispatch;
-	  &lt;static&gt;+push: RoutingIntentDispatch
-	]
-	
-	[RoutingIntentDispatch]o-[RoutingIntentDispatch]
-	[Enum]&lt;:--[RoutingIntentDispatch]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="893.0" width="4151.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M156.0 275.7 L156 457 L156 568 L156.0 568.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M161.3 266.3 L156.0 275.7 L150.7 266.3 L156.0 257.0 Z"></path>
-					</g>
-					<path d="M822.0 306.2 L822 457 L822 568 L822.0 568.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M827.3 296.8 L822.0 306.2 L816.7 296.8 L822.0 287.5 Z"></path>
-					</g>
-					<path d="M1477.1 254.8 L1013 457 L1013 552.5 L1013.0 552.5 " fill="none"></path>
-					<path d="M1479.2 259.7 L1477.1 254.8 L1475.0 249.9 L1489.3 249.5 Z"></path>
-					<path d="M1006.0 627.7 L993 710 L993 768 L993.0 768.0 " fill="none"></path>
-					<path d="M1011.3 628.5 L1006.0 627.7 L1000.7 626.8 L1008.1 614.5 Z"></path>
-					<path d="M1513.5 258.1 L1277.5 457 L1277.5 552.5 L1277.5 552.5 " fill="none"></path>
-					<path d="M1517.0 262.2 L1513.5 258.1 L1510.1 254.0 L1523.7 249.5 Z"></path>
-					<path d="M1560.5 262.8 L1560.5 457 L1560.5 552.5 L1560.5 552.5 " fill="none"></path>
-					<path d="M1565.8 262.8 L1560.5 262.8 L1555.2 262.8 L1560.5 249.5 Z"></path>
-					<path d="M1560.5 627.8 L1560.5 710 L1548.9353741496598 752.5 L1548.9 752.5 " fill="none"></path>
-					<path d="M1565.8 627.8 L1560.5 627.8 L1555.2 627.8 L1560.5 614.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1087.1 620.4 L1266.75 710 L1425.0408163265306 752.5 L1425.0 752.5 " fill="none"></path>
-					</g>
-					<path d="M1089.5 615.7 L1087.1 620.4 L1084.7 625.2 L1075.2 614.5 Z"></path>
-					<path d="M1609.1 257.9 L1854.5 457 L1854.5 552.5 L1854.5 552.5 " fill="none"></path>
-					<path d="M1612.4 253.8 L1609.1 257.9 L1605.7 262.0 L1598.7 249.5 Z"></path>
-					<path d="M1854.5 627.8 L1854.5 710 L1854.5 752.5 L1854.5 752.5 " fill="none"></path>
-					<path d="M1859.8 627.8 L1854.5 627.8 L1849.2 627.8 L1854.5 614.5 Z"></path>
-					<path d="M1646.0 254.7 L2124 457 L2124 552.5 L2124.0 552.5 " fill="none"></path>
-					<path d="M1648.1 249.8 L1646.0 254.7 L1643.9 259.6 L1633.7 249.5 Z"></path>
-					<path d="M2795.2 353.5 L2563 457 L2541.2608695652175 477 L2541.3 477.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2805.9 354.6 L2795.2 353.5 L2801.6 344.9 L2812.3 345.9 Z"></path>
-					</g>
-					<path d="M2796.7 419.5 L2740.5 457 L2740.5 568 L2740.5 568.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2807.4 418.8 L2796.7 419.5 L2801.5 409.9 L2812.3 409.2 Z"></path>
-					</g>
-					<path d="M3061.7 455.4 L3061.5 457 L3061.5 568 L3061.5 568.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3068.4 447.0 L3061.7 455.4 L3057.9 445.4 L3064.6 437.0 Z"></path>
-					</g>
-					<path d="M3399.9 416.0 L3462.5 457 L3462.5 568 L3462.5 568.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3395.0 406.4 L3399.9 416.0 L3389.1 415.3 L3384.3 405.8 Z"></path>
-					</g>
-					<path d="M3402.0 314.7 L3851.5 457 L3851.5 568 L3851.5 568.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3394.8 306.8 L3402.0 314.7 L3391.5 317.0 L3384.3 309.1 Z"></path>
-					</g>
-					<path d="M2262.0 700.9 L2249.25 710 L2249.25 768 L2249.3 768.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2272.6 699.8 L2262.0 700.9 L2266.4 691.1 L2277.1 690.0 Z"></path>
-					</g>
-					<path d="M2552.6 702.8 L2560.25 710 L3245.25 767.7710843373494 L3245.3 767.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2549.4 692.5 L2552.6 702.8 L2542.1 700.3 L2538.9 690.0 Z"></path>
-					</g>
-					<path d="M2405.5 247.3 L2405.5 457 L2408.6620553359685 477 L2408.7 477.0 " fill="none"></path>
-					<path d="M2410.8 247.3 L2405.5 247.3 L2400.2 247.3 L2405.5 234.0 Z"></path>
-					<path d="M3636.4 732.9 L3648.25 730 L3655.75 730 L3655.75 730 L3663.25 783.5 L3663.25 783.5 L3655.75 837 L3655.75 837 L3648.25 837 L3648.25 837 L3618.25 829.5866050808314 L3618.3 829.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3626.0 730.0 L3636.4 732.9 L3628.6 740.4 L3618.3 737.4 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M4064.5 612.3 L4064.5 710 L3618.25 761.8362307388384 L3618.3 761.8 " fill="none"></path>
-					</g>
-					<path d="M4069.8 612.3 L4064.5 612.3 L4059.2 612.3 L4064.5 599.0 Z"></path>
-					<g data-name="RouterKeys">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouterKeys">
-							<rect x="0.0" y="180.0" height="77.0" width="312.0" data-name="RouterKeys"></rect>
-							<path d="M0.0 211.0 L312.0 211.0" fill="none" data-name="RouterKeys"></path>
-						</g>
-						<g transform="translate(0, 180)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterKeys">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterKeys">
-								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterKeys">RouterKeys</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 211)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterKeys">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterKeys">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+studyKey: ValueKey&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+authKey: ValueKey&lt;String&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ValueKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ValueKey">
-							<rect x="110.5" y="568.0" height="31.0" width="91.0" data-name="ValueKey"></rect>
-						</g>
-						<g transform="translate(110.5, 568)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueKey">
-								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueKey">ValueKey</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RouteParams">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteParams">
-							<rect x="352.0" y="157.5" height="122.0" width="267.0" data-name="RouteParams"></rect>
-							<path d="M352.0 188.5 L619.0 188.5" fill="none" data-name="RouteParams"></path>
-						</g>
-						<g transform="translate(352, 157.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteParams">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteParams">
-								<text x="125.5" y="13.5" stroke="none" text-anchor="middle" data-name="RouteParams">RouteParams</text>
-								
-							</g>
-						</g>
-						<g transform="translate(352, 188.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteParams">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteParams">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studiesFilter: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteParams">&lt;static&gt;+measurementId: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteParams">&lt;static&gt;+interventionId: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RouteParams">&lt;static&gt;+testAppRoute: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RouterConf">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouterConf">
-							<rect x="659.0" y="149.5" height="138.0" width="326.0" data-name="RouterConf"></rect>
-							<path d="M659.0 180.5 L985.0 180.5" fill="none" data-name="RouterConf"></path>
-							<path d="M659.0 256.5 L985.0 256.5" fill="none" data-name="RouterConf"></path>
-						</g>
-						<g transform="translate(659, 149.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterConf">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterConf">RouterConf</text>
-								
-							</g>
-						</g>
-						<g transform="translate(659, 180.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+router: GoRouter</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouterConf">&lt;static&gt;+routes: List&lt;GoRoute&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouterConf">&lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouterConf">&lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(659, 256.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+GoRoute route()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="776.0" y="568.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(776, 568)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="1468.5" y="187.5" height="62.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
-							<path d="M1468.5 218.5 L1652.5 218.5" fill="none" data-name="StudyFormRouteArgs"></path>
-						</g>
-						<g transform="translate(1468.5, 187.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1468.5, 218.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormRouteArgs">+studyId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormRouteArgs">
-							<rect x="908.0" y="552.5" height="62.0" width="210.0" data-name="QuestionFormRouteArgs"></rect>
-							<path d="M908.0 583.5 L1118.0 583.5" fill="none" data-name="QuestionFormRouteArgs"></path>
-						</g>
-						<g transform="translate(908, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormRouteArgs">
-								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormRouteArgs">QuestionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(908, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormRouteArgs">+questionId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormRouteArgs">
-							<rect x="852.0" y="768.0" height="31.0" width="282.0" data-name="ScreenerQuestionFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(852, 768)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormRouteArgs">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormRouteArgs">ScreenerQuestionFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormRouteArgs">
-							<rect x="1158.0" y="552.5" height="62.0" width="239.0" data-name="ConsentItemFormRouteArgs"></rect>
-							<path d="M1158.0 583.5 L1397.0 583.5" fill="none" data-name="ConsentItemFormRouteArgs"></path>
-						</g>
-						<g transform="translate(1158, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormRouteArgs">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormRouteArgs">ConsentItemFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1158, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormRouteArgs">+consentId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="1437.0" y="552.5" height="62.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
-							<path d="M1437.0 583.5 L1684.0 583.5" fill="none" data-name="MeasurementFormRouteArgs"></path>
-						</g>
-						<g transform="translate(1437, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1437, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementFormRouteArgs">+measurementId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormRouteArgs">
-							<rect x="1408.0" y="752.5" height="62.0" width="265.0" data-name="SurveyQuestionFormRouteArgs"></rect>
-							<path d="M1408.0 783.5 L1673.0 783.5" fill="none" data-name="SurveyQuestionFormRouteArgs"></path>
-						</g>
-						<g transform="translate(1408, 752.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormRouteArgs">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormRouteArgs">SurveyQuestionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1408, 783.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormRouteArgs">+questionId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="1738.0" y="552.5" height="62.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
-							<path d="M1738.0 583.5 L1971.0 583.5" fill="none" data-name="InterventionFormRouteArgs"></path>
-						</g>
-						<g transform="translate(1738, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1738, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormRouteArgs">+interventionId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormRouteArgs">
-							<rect x="1719.0" y="752.5" height="62.0" width="271.0" data-name="InterventionTaskFormRouteArgs"></rect>
-							<path d="M1719.0 783.5 L1990.0 783.5" fill="none" data-name="InterventionTaskFormRouteArgs"></path>
-						</g>
-						<g transform="translate(1719, 752.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormRouteArgs">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormRouteArgs">InterventionTaskFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1719, 783.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormRouteArgs">+taskId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormRouteArgs">
-							<rect x="2011.0" y="552.5" height="62.0" width="226.0" data-name="ReportItemFormRouteArgs"></rect>
-							<path d="M2011.0 583.5 L2237.0 583.5" fill="none" data-name="ReportItemFormRouteArgs"></path>
-						</g>
-						<g transform="translate(2011, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormRouteArgs">
-								<text x="105.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormRouteArgs">ReportItemFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2011, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormRouteArgs">+sectionId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouteParamEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouteParamEnum">
-							<rect x="2115.5" y="180.0" height="77.0" width="202.0" data-name="GoRouteParamEnum"></rect>
-							<path d="M2115.5 211.0 L2317.5 211.0" fill="none" data-name="GoRouteParamEnum"></path>
-						</g>
-						<g transform="translate(2115.5, 180)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GoRouteParamEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouteParamEnum">
-								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouteParamEnum">GoRouteParamEnum</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2115.5, 211)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouteParamEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouteParamEnum">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouteParamEnum">+String toRouteParam()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GoRouteParamEnum">+String toShortString()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntents">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntents">
-							<rect x="2812.3" y="0.0" height="437.0" width="572.0" data-name="RoutingIntents"></rect>
-							<path d="M2812.3 31.0 L3384.3 31.0" fill="none" data-name="RoutingIntents"></path>
-						</g>
-						<g transform="translate(2812.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntents">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntents">
-								<text x="278.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntents">RoutingIntents</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2812.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntents">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntents">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+root: RoutingIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studies: RoutingIntent</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studiesShared: RoutingIntent</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+publicRegistry: RoutingIntent</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+study: RoutingIntent Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEdit: RoutingIntent Function(String)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInfo: RoutingIntent Function(String)</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String)</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInterventions: RoutingIntent Function(String)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String)</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditReports: RoutingIntent Function(String)</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String)</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute})</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyRecruit: RoutingIntent Function(String)</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyMonitor: RoutingIntent Function(String)</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyAnalyze: RoutingIntent Function(String)</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studySettings: RoutingIntent Function(String)</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+accountSettings: RoutingIntent</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyNew: RoutingIntent</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+login: RoutingIntent</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+signup: RoutingIntent</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot: RoutingIntent</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot2: RoutingIntent Function(String)</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordRecovery: RoutingIntent</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+error: RoutingIntent Function(Exception)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="2277.0" y="477.0" height="213.0" width="297.0" data-name="RoutingIntent"></rect>
-							<path d="M2277.0 508.0 L2574.0 508.0" fill="none" data-name="RoutingIntent"></path>
-							<path d="M2277.0 644.0 L2574.0 644.0" fill="none" data-name="RoutingIntent"></path>
-						</g>
-						<g transform="translate(2277, 477)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2277, 508)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">+route: GoRoute</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+params: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntent">+queryParams: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntent">+dispatch: RoutingIntentDispatch?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntent">+extra: Object?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntent">+routeName: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntent">+arguments: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntent">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2277, 644)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">-dynamic _validateRoute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+bool matches()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String)">
-							<rect x="2614.0" y="568.0" height="31.0" width="253.0" data-name="RoutingIntent Function(String)"></rect>
-						</g>
-						<g transform="translate(2614, 568)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String)">
-								<text x="118.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String)">RoutingIntent Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(String, String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, String)">
-							<rect x="2907.0" y="568.0" height="31.0" width="309.0" data-name="RoutingIntent Function(String, String)"></rect>
-						</g>
-						<g transform="translate(2907, 568)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, String)">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, String)">RoutingIntent Function(String, String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(String, {String? appRoute})">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, {String? appRoute})">
-							<rect x="3256.0" y="568.0" height="31.0" width="413.0" data-name="RoutingIntent Function(String, {String? appRoute})"></rect>
-						</g>
-						<g transform="translate(3256, 568)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, {String? appRoute})">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, {String? appRoute})">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, {String? appRoute})">RoutingIntent Function(String, {String? appRoute})</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(Exception)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(Exception)">
-							<rect x="3709.0" y="568.0" height="31.0" width="285.0" data-name="RoutingIntent Function(Exception)"></rect>
-						</g>
-						<g transform="translate(3709, 568)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(Exception)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(Exception)">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(Exception)">RoutingIntent Function(Exception)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRoute">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRoute">
-							<rect x="2206.3" y="768.0" height="31.0" width="86.0" data-name="GoRoute"></rect>
-						</g>
-						<g transform="translate(2206.25, 768)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRoute">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRoute">
-								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRoute">GoRoute</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntentDispatch">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntentDispatch">
-							<rect x="3245.3" y="730.0" height="107.0" width="373.0" data-name="RoutingIntentDispatch"></rect>
-							<path d="M3245.3 761.0 L3618.3 761.0" fill="none" data-name="RoutingIntentDispatch"></path>
-						</g>
-						<g transform="translate(3245.25, 730)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntentDispatch">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntentDispatch">
-								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntentDispatch">RoutingIntentDispatch</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3245.25, 761)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntentDispatch">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntentDispatch">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntentDispatch">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+go: RoutingIntentDispatch</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+push: RoutingIntentDispatch</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="2357.5" y="203.0" height="31.0" width="96.0" data-name="Equatable"></rect>
-						</g>
-						<g transform="translate(2357.5, 203)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="4034.0" y="568.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(4034, 568)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/services/uml.svg b/docs/uml/designer_v2/lib/services/uml.svg
deleted file mode 100644
index 49812d478..000000000
--- a/docs/uml/designer_v2/lib/services/uml.svg
+++ /dev/null
@@ -1,518 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2988.8" height="472.0" viewbox="0 0 2988.75 472" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;IClipboardService
-	  |
-	  +dynamic copy()
-	]
-	
-	[ClipboardService
-	  |
-	  +dynamic copy()
-	]
-	
-	[&lt;abstract&gt;IClipboardService]&lt;:--[ClipboardService]
-	
-	[&lt;abstract&gt;NotificationIntent
-	  |
-	  +message: String?;
-	  +customContent: Widget?;
-	  +icon: IconData?;
-	  +actions: List&lt;NotificationAction&gt;?;
-	  +type: NotificationType
-	  |
-	  +void register()
-	]
-	
-	[&lt;abstract&gt;NotificationIntent]o-[&lt;abstract&gt;Widget]
-	[&lt;abstract&gt;NotificationIntent]o-[IconData]
-	[&lt;abstract&gt;NotificationIntent]o-[NotificationType]
-	
-	[NotificationAction
-	  |
-	  +label: String;
-	  +onSelect: dynamic Function();
-	  +isDestructive: bool
-	]
-	
-	[NotificationAction]o-[dynamic Function()]
-	
-	[SnackbarIntent
-	  |
-	  +duration: int?
-	]
-	
-	[&lt;abstract&gt;NotificationIntent]&lt;:-[SnackbarIntent]
-	
-	[AlertIntent
-	  |
-	  +title: String;
-	  +dismissOnAction: bool;
-	  +isDestructive: dynamic
-	]
-	
-	[&lt;abstract&gt;NotificationIntent]&lt;:-[AlertIntent]
-	
-	[NotificationType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;NotificationType&gt;;
-	  &lt;static&gt;+snackbar: NotificationType;
-	  &lt;static&gt;+alert: NotificationType;
-	  &lt;static&gt;+custom: NotificationType
-	]
-	
-	[NotificationType]o-[NotificationType]
-	[Enum]&lt;:--[NotificationType]
-	
-	[NotificationDispatcher
-	  |
-	  +child: Widget?;
-	  +snackbarInnerPadding: double;
-	  +snackbarWidth: double?;
-	  +snackbarBehavior: SnackBarBehavior;
-	  +snackbarDefaultDuration: int
-	]
-	
-	[NotificationDispatcher]o-[&lt;abstract&gt;Widget]
-	[NotificationDispatcher]o-[SnackBarBehavior]
-	
-	[Notifications
-	  |
-	  &lt;static&gt;+credentialsInvalid: SnackbarIntent;
-	  &lt;static&gt;+userAlreadyRegistered: SnackbarIntent;
-	  &lt;static&gt;+passwordReset: SnackbarIntent;
-	  &lt;static&gt;+passwordResetSuccess: SnackbarIntent;
-	  &lt;static&gt;+studyDeleted: SnackbarIntent;
-	  &lt;static&gt;+inviteCodeDeleted: SnackbarIntent;
-	  &lt;static&gt;+inviteCodeClipped: SnackbarIntent;
-	  &lt;static&gt;+studyDeleteConfirmation: AlertIntent
-	]
-	
-	[Notifications]o-[SnackbarIntent]
-	[Notifications]o-[AlertIntent]
-	
-	[NotificationDefaultActions
-	  |
-	  &lt;static&gt;+cancel: NotificationAction
-	]
-	
-	[NotificationDefaultActions]o-[NotificationAction]
-	
-	[&lt;abstract&gt;INotificationService
-	  |
-	  +void showMessage();
-	  +void show();
-	  +Stream&lt;NotificationIntent&gt; watchNotifications();
-	  +void dispose()
-	]
-	
-	[NotificationService
-	  |
-	  -_streamController: BehaviorSubject&lt;NotificationIntent&gt;
-	  |
-	  +Stream&lt;NotificationIntent&gt; watchNotifications();
-	  +void showMessage();
-	  +void show();
-	  +void dispose()
-	]
-	
-	[NotificationService]o-[BehaviorSubject]
-	[&lt;abstract&gt;INotificationService]&lt;:--[NotificationService]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="472.0" width="2988.8" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<g stroke-dasharray="6 6">
-						<path d="M78.0 127.8 L78 187 L78 245 L78.0 245.0 " fill="none"></path>
-					</g>
-					<path d="M83.3 127.8 L78.0 127.8 L72.7 127.8 L78.0 114.5 Z"></path>
-					<path d="M471.5 120.0 L173.5 187 L415.75 264.6246624662466 L415.8 264.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M481.8 123.1 L471.5 120.0 L479.5 112.7 L489.8 115.9 Z"></path>
-					</g>
-					<path d="M763.3 170.4 L788 187 L788 260.5 L788.0 260.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M758.5 160.8 L763.3 170.4 L752.5 169.6 L747.8 160.0 Z"></path>
-					</g>
-					<path d="M795.4 139.8 L931 187 L963.4044943820224 215 L963.4 215.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M788.3 131.7 L795.4 139.8 L784.8 141.7 L777.8 133.6 Z"></path>
-					</g>
-					<path d="M1438.5 340.7 L1438.5 365 L1438.5 385 L1438.5 385.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1443.8 331.3 L1438.5 340.7 L1433.2 331.3 L1438.5 322.0 Z"></path>
-					</g>
-					<path d="M791.0 100.8 L1576.5 187 L1640.3651685393259 245 L1640.4 245.0 " fill="none"></path>
-					<path d="M791.6 95.5 L791.0 100.8 L790.4 106.1 L777.8 99.3 Z"></path>
-					<path d="M791.0 97.5 L1799.5 187 L1840.5674157303372 230 L1840.6 230.0 " fill="none"></path>
-					<path d="M791.5 92.2 L791.0 97.5 L790.6 102.8 L777.8 96.3 Z"></path>
-					<path d="M1214.4 223.2 L1242.5 215 L1254 215 L1254 215 L1265.5 276 L1265.5 276 L1254 337 L1254 337 L1242.5 337 L1242.5 337 L1196.5 323.5419664268585 L1196.5 323.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1204.0 220.7 L1214.4 223.2 L1207.0 231.0 L1196.5 228.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M891.3 98.7 L1141.25 187 L1107.508426966292 215 L1107.5 215.0 " fill="none"></path>
-					</g>
-					<path d="M893.1 93.7 L891.3 98.7 L889.5 103.7 L878.8 94.3 Z"></path>
-					<path d="M1388.7 105.3 L708.5 187 L486.75 263.7181729834791 L486.8 263.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1398.6 109.4 L1388.7 105.3 L1397.3 98.8 L1407.3 103.0 Z"></path>
-					</g>
-					<path d="M1750.6 118.3 L2107.5 187 L2107.5 260.5 L2107.5 260.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1742.4 111.3 L1750.6 118.3 L1740.4 121.8 L1732.3 114.8 Z"></path>
-					</g>
-					<path d="M2042.5 129.0 L1759.5 187 L1704.1067415730338 245 L1704.1 245.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2052.7 132.3 L2042.5 129.0 L2050.5 121.9 L2060.8 125.2 Z"></path>
-					</g>
-					<path d="M2043.2 162.9 L1976 187 L1931.7921348314608 230 L1931.8 230.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2053.8 164.7 L2043.2 162.9 L2050.2 154.7 L2060.8 156.6 Z"></path>
-					</g>
-					<path d="M1192.9 119.5 L1438.5 187 L1438.5 230 L1438.5 230.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1185.4 111.8 L1192.9 119.5 L1182.5 122.1 L1174.9 114.5 Z"></path>
-					</g>
-					<path d="M2705.3 363.7 L2705.25 365 L2705.25 385 L2705.3 385.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2710.6 354.3 L2705.3 363.7 L2699.9 354.3 L2705.3 345.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2705.3 150.3 L2705.25 187 L2705.25 207 L2705.3 207.0 " fill="none"></path>
-					</g>
-					<path d="M2710.6 150.3 L2705.3 150.3 L2699.9 150.3 L2705.3 137.0 Z"></path>
-					<g data-name="IClipboardService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IClipboardService">
-							<rect x="0.0" y="52.5" height="62.0" width="156.0" data-name="IClipboardService"></rect>
-							<path d="M0.0 83.5 L156.0 83.5" fill="none" data-name="IClipboardService"></path>
-						</g>
-						<g transform="translate(0, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IClipboardService">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="IClipboardService">IClipboardService</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IClipboardService">
-								<text x="0.0" y="13.5" stroke="none" data-name="IClipboardService">+dynamic copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ClipboardService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ClipboardService">
-							<rect x="2.5" y="245.0" height="62.0" width="151.0" data-name="ClipboardService"></rect>
-							<path d="M2.5 276.0 L153.5 276.0" fill="none" data-name="ClipboardService"></path>
-						</g>
-						<g transform="translate(2.5, 245)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ClipboardService">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="ClipboardService">ClipboardService</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2.5, 276)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ClipboardService">
-								<text x="0.0" y="13.5" stroke="none" data-name="ClipboardService">+dynamic copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationIntent">
-							<rect x="489.8" y="7.0" height="153.0" width="288.0" data-name="NotificationIntent"></rect>
-							<path d="M489.8 38.0 L777.8 38.0" fill="none" data-name="NotificationIntent"></path>
-							<path d="M489.8 129.0 L777.8 129.0" fill="none" data-name="NotificationIntent"></path>
-						</g>
-						<g transform="translate(489.75, 7)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationIntent">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationIntent">NotificationIntent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(489.75, 38)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+message: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationIntent">+customContent: Widget?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationIntent">+icon: IconData?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationIntent">+actions: List&lt;NotificationAction&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationIntent">+type: NotificationType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(489.75, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+void register()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="415.8" y="260.5" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(415.75, 260.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="744.5" y="260.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(744.5, 260.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationType">
-							<rect x="871.5" y="215.0" height="122.0" width="325.0" data-name="NotificationType"></rect>
-							<path d="M871.5 246.0 L1196.5 246.0" fill="none" data-name="NotificationType"></path>
-						</g>
-						<g transform="translate(871.5, 215)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationType">
-								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationType">NotificationType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(871.5, 246)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationType">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationType">&lt;static&gt;+values: List&lt;NotificationType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationType">&lt;static&gt;+snackbar: NotificationType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationType">&lt;static&gt;+alert: NotificationType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationType">&lt;static&gt;+custom: NotificationType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationAction">
-							<rect x="1310.5" y="230.0" height="92.0" width="256.0" data-name="NotificationAction"></rect>
-							<path d="M1310.5 261.0 L1566.5 261.0" fill="none" data-name="NotificationAction"></path>
-						</g>
-						<g transform="translate(1310.5, 230)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationAction">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationAction">NotificationAction</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1310.5, 261)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationAction">+label: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationAction">+onSelect: dynamic Function()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationAction">+isDestructive: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="1355.0" y="385.0" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(1355, 385)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SnackbarIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SnackbarIntent">
-							<rect x="1606.5" y="245.0" height="62.0" width="136.0" data-name="SnackbarIntent"></rect>
-							<path d="M1606.5 276.0 L1742.5 276.0" fill="none" data-name="SnackbarIntent"></path>
-						</g>
-						<g transform="translate(1606.5, 245)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackbarIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackbarIntent">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackbarIntent">SnackbarIntent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1606.5, 276)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SnackbarIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SnackbarIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="SnackbarIntent">+duration: int?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AlertIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AlertIntent">
-							<rect x="1782.5" y="230.0" height="92.0" width="204.0" data-name="AlertIntent"></rect>
-							<path d="M1782.5 261.0 L1986.5 261.0" fill="none" data-name="AlertIntent"></path>
-						</g>
-						<g transform="translate(1782.5, 230)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AlertIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AlertIntent">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="AlertIntent">AlertIntent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1782.5, 261)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AlertIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AlertIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="AlertIntent">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AlertIntent">+dismissOnAction: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AlertIntent">+isDestructive: dynamic</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="817.8" y="68.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(817.75, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationDispatcher">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDispatcher">
-							<rect x="1407.3" y="22.5" height="122.0" width="325.0" data-name="NotificationDispatcher"></rect>
-							<path d="M1407.3 53.5 L1732.3 53.5" fill="none" data-name="NotificationDispatcher"></path>
-						</g>
-						<g transform="translate(1407.25, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDispatcher">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDispatcher">
-								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDispatcher">NotificationDispatcher</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1407.25, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDispatcher">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDispatcher">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDispatcher">+child: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationDispatcher">+snackbarInnerPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationDispatcher">+snackbarWidth: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationDispatcher">+snackbarBehavior: SnackBarBehavior</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationDispatcher">+snackbarDefaultDuration: int</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SnackBarBehavior">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SnackBarBehavior">
-							<rect x="2026.5" y="260.5" height="31.0" width="162.0" data-name="SnackBarBehavior"></rect>
-						</g>
-						<g transform="translate(2026.5, 260.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackBarBehavior">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackBarBehavior">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackBarBehavior">SnackBarBehavior</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Notifications">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Notifications">
-							<rect x="2060.8" y="0.0" height="167.0" width="407.0" data-name="Notifications"></rect>
-							<path d="M2060.8 31.0 L2467.8 31.0" fill="none" data-name="Notifications"></path>
-						</g>
-						<g transform="translate(2060.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Notifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notifications">
-								<text x="195.5" y="13.5" stroke="none" text-anchor="middle" data-name="Notifications">Notifications</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2060.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Notifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Notifications">
-								<text x="0.0" y="13.5" stroke="none" data-name="Notifications">&lt;static&gt;+credentialsInvalid: SnackbarIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Notifications">&lt;static&gt;+userAlreadyRegistered: SnackbarIntent</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordReset: SnackbarIntent</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordResetSuccess: SnackbarIntent</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleted: SnackbarIntent</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeDeleted: SnackbarIntent</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeClipped: SnackbarIntent</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleteConfirmation: AlertIntent</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationDefaultActions">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDefaultActions">
-							<rect x="918.8" y="52.5" height="62.0" width="287.0" data-name="NotificationDefaultActions"></rect>
-							<path d="M918.8 83.5 L1205.8 83.5" fill="none" data-name="NotificationDefaultActions"></path>
-						</g>
-						<g transform="translate(918.75, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDefaultActions">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDefaultActions">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDefaultActions">NotificationDefaultActions</text>
-								
-							</g>
-						</g>
-						<g transform="translate(918.75, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDefaultActions">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDefaultActions">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDefaultActions">&lt;static&gt;+cancel: NotificationAction</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="INotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="2507.8" y="30.0" height="107.0" width="395.0" data-name="INotificationService"></rect>
-							<path d="M2507.8 61.0 L2902.8 61.0" fill="none" data-name="INotificationService"></path>
-						</g>
-						<g transform="translate(2507.75, 30)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
-								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2507.75, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="INotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="INotificationService">+void showMessage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="INotificationService">+void show()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="INotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="INotificationService">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationService">
-							<rect x="2477.8" y="207.0" height="138.0" width="455.0" data-name="NotificationService"></rect>
-							<path d="M2477.8 238.0 L2932.8 238.0" fill="none" data-name="NotificationService"></path>
-							<path d="M2477.8 269.0 L2932.8 269.0" fill="none" data-name="NotificationService"></path>
-						</g>
-						<g transform="translate(2477.75, 207)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationService">
-								<text x="219.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationService">NotificationService</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2477.75, 238)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">-_streamController: BehaviorSubject&lt;NotificationIntent&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2477.75, 269)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationService">+void showMessage()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationService">+void show()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationService">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BehaviorSubject">
-							<rect x="2632.8" y="385.0" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
-						</g>
-						<g transform="translate(2632.75, 385)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BehaviorSubject">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="BehaviorSubject">BehaviorSubject</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/uml.svg b/docs/uml/designer_v2/lib/uml.svg
deleted file mode 100644
index 880ed2de2..000000000
--- a/docs/uml/designer_v2/lib/uml.svg
+++ /dev/null
@@ -1,16246 +0,0 @@
-<svg version="1.1" baseProfile="full" width="84279.3" height="4748.0" viewbox="0 0 84279.25 4748" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[Config
-	  |
-	  &lt;static&gt;+isDebugMode: bool;
-	  &lt;static&gt;+defaultLocale: Set&lt;String&gt;;
-	  &lt;static&gt;+supportedLocales: Map&lt;String, String&gt;;
-	  &lt;static&gt;+newStudyId: String;
-	  &lt;static&gt;+newModelId: String;
-	  &lt;static&gt;+minSplashTime: int;
-	  &lt;static&gt;+formAutosaveDebounce: int
-	]
-	
-	[&lt;abstract&gt;ResultTypes
-	]
-	
-	[MeasurementResultTypes
-	  |
-	  &lt;static&gt;+questionnaire: String;
-	  &lt;static&gt;+values: List&lt;String&gt;
-	]
-	
-	[&lt;abstract&gt;ResultTypes]&lt;:-[MeasurementResultTypes]
-	
-	[InterventionResultTypes
-	  |
-	  &lt;static&gt;+checkmarkTask: String;
-	  &lt;static&gt;+values: List&lt;String&gt;
-	]
-	
-	[&lt;abstract&gt;ResultTypes]&lt;:-[InterventionResultTypes]
-	
-	[StudyExportData
-	  |
-	  +study: Study;
-	  +measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
-	  +interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
-	  +mediaData: List&lt;String&gt;;
-	  +isEmpty: bool
-	]
-	
-	[StudyExportData]o-[Study]
-	
-	[StudyTemplates
-	  |
-	  &lt;static&gt;+kUnnamedStudyTitle: String
-	  |
-	  &lt;static&gt;+Study emptyDraft()
-	]
-	
-	[StudyActionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyActionType&gt;;
-	  &lt;static&gt;+pin: StudyActionType;
-	  &lt;static&gt;+pinoff: StudyActionType;
-	  &lt;static&gt;+edit: StudyActionType;
-	  &lt;static&gt;+duplicate: StudyActionType;
-	  &lt;static&gt;+duplicateDraft: StudyActionType;
-	  &lt;static&gt;+addCollaborator: StudyActionType;
-	  &lt;static&gt;+export: StudyActionType;
-	  &lt;static&gt;+delete: StudyActionType
-	]
-	
-	[StudyActionType]o-[StudyActionType]
-	[Enum]&lt;:--[StudyActionType]
-	
-	[Notifications
-	  |
-	  &lt;static&gt;+credentialsInvalid: SnackbarIntent;
-	  &lt;static&gt;+userAlreadyRegistered: SnackbarIntent;
-	  &lt;static&gt;+passwordReset: SnackbarIntent;
-	  &lt;static&gt;+passwordResetSuccess: SnackbarIntent;
-	  &lt;static&gt;+studyDeleted: SnackbarIntent;
-	  &lt;static&gt;+inviteCodeDeleted: SnackbarIntent;
-	  &lt;static&gt;+inviteCodeClipped: SnackbarIntent;
-	  &lt;static&gt;+studyDeleteConfirmation: AlertIntent
-	]
-	
-	[Notifications]o-[SnackbarIntent]
-	[Notifications]o-[AlertIntent]
-	
-	[NotificationDefaultActions
-	  |
-	  &lt;static&gt;+cancel: NotificationAction
-	]
-	
-	[NotificationDefaultActions]o-[NotificationAction]
-	
-	[&lt;abstract&gt;INotificationService
-	  |
-	  +void showMessage();
-	  +void show();
-	  +Stream&lt;NotificationIntent&gt; watchNotifications();
-	  +void dispose()
-	]
-	
-	[NotificationService
-	  |
-	  -_streamController: BehaviorSubject&lt;NotificationIntent&gt;
-	  |
-	  +Stream&lt;NotificationIntent&gt; watchNotifications();
-	  +void showMessage();
-	  +void show();
-	  +void dispose()
-	]
-	
-	[NotificationService]o-[BehaviorSubject]
-	[&lt;abstract&gt;INotificationService]&lt;:--[NotificationService]
-	
-	[&lt;abstract&gt;NotificationIntent
-	  |
-	  +message: String?;
-	  +customContent: Widget?;
-	  +icon: IconData?;
-	  +actions: List&lt;NotificationAction&gt;?;
-	  +type: NotificationType
-	  |
-	  +void register()
-	]
-	
-	[&lt;abstract&gt;NotificationIntent]o-[&lt;abstract&gt;Widget]
-	[&lt;abstract&gt;NotificationIntent]o-[IconData]
-	[&lt;abstract&gt;NotificationIntent]o-[NotificationType]
-	
-	[NotificationAction
-	  |
-	  +label: String;
-	  +onSelect: dynamic Function();
-	  +isDestructive: bool
-	]
-	
-	[NotificationAction]o-[dynamic Function()]
-	
-	[SnackbarIntent
-	  |
-	  +duration: int?
-	]
-	
-	[&lt;abstract&gt;NotificationIntent]&lt;:-[SnackbarIntent]
-	
-	[AlertIntent
-	  |
-	  +title: String;
-	  +dismissOnAction: bool;
-	  +isDestructive: dynamic
-	]
-	
-	[&lt;abstract&gt;NotificationIntent]&lt;:-[AlertIntent]
-	
-	[NotificationType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;NotificationType&gt;;
-	  &lt;static&gt;+snackbar: NotificationType;
-	  &lt;static&gt;+alert: NotificationType;
-	  &lt;static&gt;+custom: NotificationType
-	]
-	
-	[NotificationType]o-[NotificationType]
-	[Enum]&lt;:--[NotificationType]
-	
-	[&lt;abstract&gt;IClipboardService
-	  |
-	  +dynamic copy()
-	]
-	
-	[ClipboardService
-	  |
-	  +dynamic copy()
-	]
-	
-	[&lt;abstract&gt;IClipboardService]&lt;:--[ClipboardService]
-	
-	[NotificationDispatcher
-	  |
-	  +child: Widget?;
-	  +snackbarInnerPadding: double;
-	  +snackbarWidth: double?;
-	  +snackbarBehavior: SnackBarBehavior;
-	  +snackbarDefaultDuration: int
-	]
-	
-	[NotificationDispatcher]o-[&lt;abstract&gt;Widget]
-	[NotificationDispatcher]o-[SnackBarBehavior]
-	
-	[Assets
-	  |
-	  &lt;static&gt;+logoWide: String
-	]
-	
-	[AsyncValueWidget
-	  |
-	  +value: AsyncValue&lt;T&gt;;
-	  +data: Widget Function(T);
-	  +error: Widget Function(Object, StackTrace?)?;
-	  +loading: Widget Function()?;
-	  +empty: Widget Function()?
-	  |
-	  +Widget build();
-	  -Widget _buildDataOrEmptyWidget();
-	  -Widget _defaultError();
-	  -Widget _defaultLoad()
-	]
-	
-	[AsyncValueWidget]o-[&lt;abstract&gt;AsyncValue]
-	[AsyncValueWidget]o-[Widget Function(T)]
-	[AsyncValueWidget]o-[Widget Function(Object, StackTrace?)?]
-	[AsyncValueWidget]o-[Widget Function()?]
-	
-	[FormControlLabel
-	  |
-	  +formControl: AbstractControl&lt;dynamic&gt;;
-	  +text: String;
-	  +isClickable: bool;
-	  +textStyle: TextStyle?;
-	  +onClick: void Function(AbstractControl&lt;dynamic&gt;)?
-	  |
-	  +Widget build()
-	]
-	
-	[FormControlLabel]o-[&lt;abstract&gt;AbstractControl]
-	[FormControlLabel]o-[TextStyle]
-	[FormControlLabel]o-[void Function(AbstractControl&lt;dynamic&gt;)?]
-	
-	[ActionPopUpMenuButton
-	  |
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +triggerIconColor: Color?;
-	  +triggerIconColorHover: Color?;
-	  +triggerIconSize: double;
-	  +disableSplashEffect: bool;
-	  +hideOnEmpty: bool;
-	  +orientation: Axis;
-	  +elevation: double?;
-	  +splashRadius: double?;
-	  +enabled: bool;
-	  +position: PopupMenuPosition
-	  |
-	  +Widget build();
-	  -Widget _buildPopupMenu()
-	]
-	
-	[ActionPopUpMenuButton]o-[Color]
-	[ActionPopUpMenuButton]o-[Axis]
-	[ActionPopUpMenuButton]o-[PopupMenuPosition]
-	
-	[Search
-	  |
-	  +onQueryChanged: dynamic Function(String);
-	  +searchController: SearchController?;
-	  +hintText: String?;
-	  +initialText: String?
-	]
-	
-	[Search]o-[dynamic Function(String)]
-	[Search]o-[SearchController]
-	
-	[SearchController
-	  |
-	  +setText: void Function(String)
-	]
-	
-	[SearchController]o-[void Function(String)]
-	
-	[FormScaffold
-	  |
-	  +formViewModel: T;
-	  +actions: List&lt;Widget&gt;?;
-	  +body: Widget;
-	  +drawer: Widget?;
-	  +actionsSpacing: double;
-	  +actionsPadding: double
-	]
-	
-	[FormScaffold]o-[&lt;abstract&gt;Widget]
-	
-	[ConstrainedWidthFlexible
-	  |
-	  +minWidth: double;
-	  +maxWidth: double;
-	  +flex: int;
-	  +flexSum: int;
-	  +child: Widget;
-	  +outerConstraints: BoxConstraints
-	  |
-	  +Widget build();
-	  -double _getWidth()
-	]
-	
-	[ConstrainedWidthFlexible]o-[&lt;abstract&gt;Widget]
-	[ConstrainedWidthFlexible]o-[BoxConstraints]
-	
-	[PrimaryButton
-	  |
-	  +text: String;
-	  +icon: IconData?;
-	  +isLoading: bool;
-	  +showLoadingEarliestAfterMs: int;
-	  +onPressed: void Function()?;
-	  +tooltip: String;
-	  +tooltipDisabled: String;
-	  +enabled: bool;
-	  +onPressedFuture: dynamic Function()?;
-	  +innerPadding: EdgeInsets;
-	  +minimumSize: Size?;
-	  +isDisabled: bool
-	]
-	
-	[PrimaryButton]o-[IconData]
-	[PrimaryButton]o-[void Function()?]
-	[PrimaryButton]o-[dynamic Function()?]
-	[PrimaryButton]o-[EdgeInsets]
-	[PrimaryButton]o-[Size]
-	
-	[FormTableRow
-	  |
-	  +label: String?;
-	  +labelBuilder: Widget Function(BuildContext)?;
-	  +labelStyle: TextStyle?;
-	  +labelHelpText: String?;
-	  +input: Widget;
-	  +control: AbstractControl&lt;dynamic&gt;?;
-	  +layout: FormTableRowLayout?
-	]
-	
-	[FormTableRow]o-[Widget Function(BuildContext)?]
-	[FormTableRow]o-[TextStyle]
-	[FormTableRow]o-[&lt;abstract&gt;Widget]
-	[FormTableRow]o-[&lt;abstract&gt;AbstractControl]
-	[FormTableRow]o-[FormTableRowLayout]
-	
-	[FormTableLayout
-	  |
-	  +rows: List&lt;FormTableRow&gt;;
-	  +columnWidths: Map&lt;int, TableColumnWidth&gt;;
-	  +rowDivider: Widget?;
-	  +rowLayout: FormTableRowLayout?;
-	  +rowLabelStyle: TextStyle?
-	  |
-	  +Widget build()
-	]
-	
-	[FormTableLayout]o-[&lt;abstract&gt;Widget]
-	[FormTableLayout]o-[FormTableRowLayout]
-	[FormTableLayout]o-[TextStyle]
-	
-	[FormSectionHeader
-	  |
-	  +title: String;
-	  +titleTextStyle: TextStyle?;
-	  +helpText: String?;
-	  +divider: bool;
-	  +helpTextDisabled: bool
-	  |
-	  +Widget build()
-	]
-	
-	[FormSectionHeader]o-[TextStyle]
-	
-	[FormLabel
-	  |
-	  +labelText: String?;
-	  +helpText: String?;
-	  +labelTextStyle: TextStyle?;
-	  +layout: FormTableRowLayout?
-	  |
-	  +Widget build()
-	]
-	
-	[FormLabel]o-[TextStyle]
-	[FormLabel]o-[FormTableRowLayout]
-	
-	[FormTableRowLayout
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;FormTableRowLayout&gt;;
-	  &lt;static&gt;+vertical: FormTableRowLayout;
-	  &lt;static&gt;+horizontal: FormTableRowLayout
-	]
-	
-	[FormTableRowLayout]o-[FormTableRowLayout]
-	[Enum]&lt;:--[FormTableRowLayout]
-	
-	[DismissButton
-	  |
-	  +onPressed: void Function()?;
-	  +text: String?
-	  |
-	  +Widget build()
-	]
-	
-	[DismissButton]o-[void Function()?]
-	
-	[Badge
-	  |
-	  +icon: IconData?;
-	  +color: Color?;
-	  +borderRadius: double;
-	  +label: String;
-	  +type: BadgeType;
-	  +padding: EdgeInsets;
-	  +iconSize: double?;
-	  +labelStyle: TextStyle?;
-	  +center: bool
-	  |
-	  +Widget build();
-	  -Color? _getBackgroundColor();
-	  -Color _getBorderColor();
-	  -Color? _getLabelColor()
-	]
-	
-	[Badge]o-[IconData]
-	[Badge]o-[Color]
-	[Badge]o-[BadgeType]
-	[Badge]o-[EdgeInsets]
-	[Badge]o-[TextStyle]
-	
-	[BadgeType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;BadgeType&gt;;
-	  &lt;static&gt;+filled: BadgeType;
-	  &lt;static&gt;+outlined: BadgeType;
-	  &lt;static&gt;+outlineFill: BadgeType;
-	  &lt;static&gt;+plain: BadgeType
-	]
-	
-	[BadgeType]o-[BadgeType]
-	[Enum]&lt;:--[BadgeType]
-	
-	[StandardDialog
-	  |
-	  +title: Widget?;
-	  +titleText: String?;
-	  +body: Widget;
-	  +actionButtons: List&lt;Widget&gt;;
-	  +backgroundColor: Color?;
-	  +borderRadius: double?;
-	  +width: double?;
-	  +height: double?;
-	  +minWidth: double;
-	  +minHeight: double;
-	  +maxWidth: double?;
-	  +maxHeight: double?;
-	  +padding: EdgeInsets
-	  |
-	  +Widget build()
-	]
-	
-	[StandardDialog]o-[&lt;abstract&gt;Widget]
-	[StandardDialog]o-[Color]
-	[StandardDialog]o-[EdgeInsets]
-	
-	[&lt;abstract&gt;ISyncIndicatorViewModel
-	  |
-	  +isDirty: bool;
-	  +lastSynced: DateTime?
-	]
-	
-	[SyncIndicator
-	  |
-	  +state: AsyncValue&lt;T&gt;;
-	  +lastSynced: DateTime?;
-	  +isDirty: bool;
-	  +animationDuration: int;
-	  +iconSize: double
-	]
-	
-	[SyncIndicator]o-[&lt;abstract&gt;AsyncValue]
-	
-	[&lt;abstract&gt;IWithBanner
-	  |
-	  +Widget? banner()
-	]
-	
-	[BannerBox
-	  |
-	  +prefixIcon: Widget?;
-	  +body: Widget;
-	  +style: BannerStyle;
-	  +padding: EdgeInsets?;
-	  +noPrefix: bool;
-	  +dismissable: bool;
-	  +isDismissed: bool?;
-	  +onDismissed: dynamic Function()?;
-	  +dismissIconSize: double
-	]
-	
-	[BannerBox]o-[&lt;abstract&gt;Widget]
-	[BannerBox]o-[BannerStyle]
-	[BannerBox]o-[EdgeInsets]
-	[BannerBox]o-[dynamic Function()?]
-	
-	[BannerStyle
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;BannerStyle&gt;;
-	  &lt;static&gt;+warning: BannerStyle;
-	  &lt;static&gt;+info: BannerStyle;
-	  &lt;static&gt;+error: BannerStyle
-	]
-	
-	[BannerStyle]o-[BannerStyle]
-	[Enum]&lt;:--[BannerStyle]
-	
-	[ActionMenuInline
-	  |
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +iconSize: double?;
-	  +visible: bool;
-	  +splashRadius: double?;
-	  +paddingVertical: double?;
-	  +paddingHorizontal: double?
-	  |
-	  +Widget build()
-	]
-	
-	[Collapsible
-	  |
-	  +contentBuilder: Widget Function(BuildContext, bool);
-	  +headerBuilder: Widget Function(BuildContext, bool)?;
-	  +title: String?;
-	  +isCollapsed: bool
-	]
-	
-	[Collapsible]o-[Widget Function(BuildContext, bool)]
-	[Collapsible]o-[Widget Function(BuildContext, bool)?]
-	
-	[NavbarTab
-	  |
-	  +title: String;
-	  +intent: RoutingIntent?;
-	  +index: int;
-	  +enabled: bool
-	]
-	
-	[NavbarTab]o-[RoutingIntent]
-	
-	[TabbedNavbar
-	  |
-	  +tabs: List&lt;T&gt;;
-	  +selectedTab: T?;
-	  +indicator: BoxDecoration?;
-	  +height: double?;
-	  +disabledBackgroundColor: Color?;
-	  +disabledTooltipText: String?;
-	  +onSelect: void Function(int, T)?;
-	  +labelPadding: EdgeInsets?;
-	  +labelSpacing: double?;
-	  +indicatorSize: TabBarIndicatorSize?;
-	  +isScrollable: bool;
-	  +backgroundColor: Color?;
-	  +labelColorHover: Color?;
-	  +unselectedLabelColorHover: Color?
-	]
-	
-	[TabbedNavbar]o-[BoxDecoration]
-	[TabbedNavbar]o-[Color]
-	[TabbedNavbar]o-[void Function(int, T)?]
-	[TabbedNavbar]o-[EdgeInsets]
-	[TabbedNavbar]o-[TabBarIndicatorSize]
-	
-	[SidesheetTab
-	  |
-	  +builder: Widget Function(BuildContext)
-	]
-	
-	[SidesheetTab]o-[Widget Function(BuildContext)]
-	[NavbarTab]&lt;:-[SidesheetTab]
-	
-	[Sidesheet
-	  |
-	  &lt;static&gt;+kDefaultWidth: double;
-	  +titleText: String;
-	  +body: Widget?;
-	  +tabs: List&lt;SidesheetTab&gt;?;
-	  +actionButtons: List&lt;Widget&gt;?;
-	  +width: double?;
-	  +withCloseButton: bool;
-	  +ignoreAppBar: bool;
-	  +collapseSingleTab: bool;
-	  +bodyPadding: EdgeInsets?;
-	  +wrapContent: Widget Function(Widget)?
-	]
-	
-	[Sidesheet]o-[&lt;abstract&gt;Widget]
-	[Sidesheet]o-[EdgeInsets]
-	[Sidesheet]o-[Widget Function(Widget)?]
-	
-	[FormSideSheetTab
-	  |
-	  +formViewBuilder: Widget Function(T)
-	]
-	
-	[FormSideSheetTab]o-[Widget Function(T)]
-	[NavbarTab]&lt;:-[FormSideSheetTab]
-	
-	[HelpIcon
-	  |
-	  +tooltipText: String?
-	  |
-	  +Widget build()
-	]
-	
-	[EmptyBody
-	  |
-	  +icon: IconData?;
-	  +leading: Widget?;
-	  +leadingSpacing: double?;
-	  +title: String?;
-	  +description: String?;
-	  +button: Widget?
-	  |
-	  +Widget build()
-	]
-	
-	[EmptyBody]o-[IconData]
-	[EmptyBody]o-[&lt;abstract&gt;Widget]
-	
-	[IndicatorRangeSliderThumbShape
-	  |
-	  +buildContext: BuildContext;
-	  +start: T;
-	  +end: T
-	  |
-	  +Size getPreferredSize();
-	  +void paint()
-	]
-	
-	[IndicatorRangeSliderThumbShape]o-[&lt;abstract&gt;BuildContext]
-	[&lt;abstract&gt;RangeSliderThumbShape]&lt;:-[IndicatorRangeSliderThumbShape]
-	
-	[MouseEventsRegion
-	  |
-	  +onTap: void Function()?;
-	  +onHover: void Function(PointerHoverEvent)?;
-	  +onEnter: void Function(PointerEnterEvent)?;
-	  +onExit: void Function(PointerExitEvent)?;
-	  +autoselectCursor: bool;
-	  +cursor: SystemMouseCursor;
-	  &lt;static&gt;+defaultCursor: SystemMouseCursor;
-	  +autoCursor: SystemMouseCursor
-	]
-	
-	[MouseEventsRegion]o-[void Function()?]
-	[MouseEventsRegion]o-[void Function(PointerHoverEvent)?]
-	[MouseEventsRegion]o-[void Function(PointerEnterEvent)?]
-	[MouseEventsRegion]o-[void Function(PointerExitEvent)?]
-	[MouseEventsRegion]o-[SystemMouseCursor]
-	
-	[ReactiveCustomColorPicker
-	]
-	
-	[ReactiveFormField]&lt;:-[ReactiveCustomColorPicker]
-	
-	[TextParagraph
-	  |
-	  +text: String?;
-	  +style: TextStyle?;
-	  +selectable: bool;
-	  +span: List&lt;TextSpan&gt;?
-	  |
-	  +Widget build()
-	]
-	
-	[TextParagraph]o-[TextStyle]
-	
-	[UnderConstruction
-	  |
-	  +Widget build()
-	]
-	
-	[NullHelperDecoration
-	]
-	
-	[InputDecoration]&lt;:-[NullHelperDecoration]
-	
-	[ActionMenuType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ActionMenuType&gt;;
-	  &lt;static&gt;+inline: ActionMenuType;
-	  &lt;static&gt;+popup: ActionMenuType
-	]
-	
-	[ActionMenuType]o-[ActionMenuType]
-	[Enum]&lt;:--[ActionMenuType]
-	
-	[HtmlStylingBanner
-	  |
-	  +isDismissed: bool;
-	  +onDismissed: dynamic Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[HtmlStylingBanner]o-[dynamic Function()?]
-	
-	[&lt;abstract&gt;FormConsumerWidget
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;FormConsumerRefWidget
-	  |
-	  +Widget build()
-	]
-	
-	[SplashPage
-	  |
-	  +Widget build()
-	]
-	
-	[ErrorPage
-	  |
-	  +error: Exception?
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ErrorPage]
-	
-	[StudyULogo
-	  |
-	  +onTap: void Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[StudyULogo]o-[void Function()?]
-	
-	[SingleColumnLayout
-	  |
-	  &lt;static&gt;+defaultConstraints: BoxConstraints;
-	  &lt;static&gt;+defaultConstraintsNarrow: BoxConstraints;
-	  +body: Widget;
-	  +header: Widget?;
-	  +stickyHeader: bool;
-	  +constraints: BoxConstraints?;
-	  +scroll: bool;
-	  +padding: EdgeInsets?
-	  |
-	  &lt;static&gt;+dynamic fromType()
-	]
-	
-	[SingleColumnLayout]o-[BoxConstraints]
-	[SingleColumnLayout]o-[&lt;abstract&gt;Widget]
-	[SingleColumnLayout]o-[EdgeInsets]
-	
-	[SingleColumnLayoutType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;;
-	  &lt;static&gt;+boundedWide: SingleColumnLayoutType;
-	  &lt;static&gt;+boundedNarrow: SingleColumnLayoutType;
-	  &lt;static&gt;+stretched: SingleColumnLayoutType;
-	  &lt;static&gt;+split: SingleColumnLayoutType
-	]
-	
-	[SingleColumnLayoutType]o-[SingleColumnLayoutType]
-	[Enum]&lt;:--[SingleColumnLayoutType]
-	
-	[Hyperlink
-	  |
-	  +text: String;
-	  +url: String?;
-	  +onClick: void Function()?;
-	  +linkColor: Color;
-	  +hoverColor: Color?;
-	  +visitedColor: Color?;
-	  +style: TextStyle?;
-	  +hoverStyle: TextStyle?;
-	  +visitedStyle: TextStyle?;
-	  +icon: IconData?;
-	  +iconSize: double?
-	]
-	
-	[Hyperlink]o-[void Function()?]
-	[Hyperlink]o-[Color]
-	[Hyperlink]o-[TextStyle]
-	[Hyperlink]o-[IconData]
-	
-	[StandardTableColumn
-	  |
-	  +label: String;
-	  +tooltip: String?;
-	  +columnWidth: TableColumnWidth;
-	  +sortable: bool;
-	  +sortAscending: bool?;
-	  +sortableIcon: Widget?
-	]
-	
-	[StandardTableColumn]o-[&lt;abstract&gt;TableColumnWidth]
-	[StandardTableColumn]o-[&lt;abstract&gt;Widget]
-	
-	[StandardTable
-	  |
-	  +items: List&lt;T&gt;;
-	  +inputColumns: List&lt;StandardTableColumn&gt;;
-	  +onSelectItem: void Function(T);
-	  +trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?;
-	  +trailingActionsMenuType: ActionMenuType?;
-	  +sortColumnPredicates: List&lt;int Function(T, T)?&gt;?;
-	  +pinnedPredicates: int Function(T, T)?;
-	  +headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
-	  +dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
-	  +inputTrailingActionsColumn: StandardTableColumn;
-	  +tableWrapper: Widget Function(Widget)?;
-	  +cellSpacing: double;
-	  +rowSpacing: double;
-	  +minRowHeight: double?;
-	  +showTableHeader: bool;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  +leadingWidget: Widget?;
-	  +trailingWidget: Widget?;
-	  +leadingWidgetSpacing: double?;
-	  +trailingWidgetSpacing: double?;
-	  +emptyWidget: Widget?;
-	  +rowStyle: StandardTableStyle;
-	  +disableRowInteractions: bool
-	]
-	
-	[StandardTable]o-[void Function(T)]
-	[StandardTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?]
-	[StandardTable]o-[ActionMenuType]
-	[StandardTable]o-[int Function(T, T)?]
-	[StandardTable]o-[TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?]
-	[StandardTable]o-[StandardTableColumn]
-	[StandardTable]o-[Widget Function(Widget)?]
-	[StandardTable]o-[&lt;abstract&gt;Widget]
-	[StandardTable]o-[StandardTableStyle]
-	
-	[StandardTableStyle
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StandardTableStyle&gt;;
-	  &lt;static&gt;+plain: StandardTableStyle;
-	  &lt;static&gt;+material: StandardTableStyle
-	]
-	
-	[StandardTableStyle]o-[StandardTableStyle]
-	[Enum]&lt;:--[StandardTableStyle]
-	
-	[IconPack
-	  |
-	  &lt;static&gt;+defaultPack: List&lt;IconOption&gt;;
-	  &lt;static&gt;+material: List&lt;IconOption&gt;
-	  |
-	  &lt;static&gt;+IconOption? resolveIconByName()
-	]
-	
-	[IconOption
-	  |
-	  +name: String;
-	  +icon: IconData?;
-	  +isEmpty: bool;
-	  +props: List&lt;Object?&gt;
-	  |
-	  +String toJson();
-	  &lt;static&gt;+IconOption fromJson()
-	]
-	
-	[IconOption]o-[IconData]
-	[&lt;abstract&gt;Equatable]&lt;:-[IconOption]
-	
-	[ReactiveIconPicker
-	]
-	
-	[ReactiveFocusableFormField]&lt;:-[ReactiveIconPicker]
-	
-	[IconPicker
-	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +selectedOption: IconOption?;
-	  +onSelect: void Function(IconOption)?;
-	  +galleryIconSize: double?;
-	  +selectedIconSize: double?;
-	  +focusNode: FocusNode?;
-	  +isDisabled: bool
-	  |
-	  +Widget build()
-	]
-	
-	[IconPicker]o-[IconOption]
-	[IconPicker]o-[void Function(IconOption)?]
-	[IconPicker]o-[FocusNode]
-	
-	[IconPickerField
-	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +selectedOption: IconOption?;
-	  +selectedIconSize: double?;
-	  +galleryIconSize: double?;
-	  +onSelect: void Function(IconOption)?;
-	  +focusNode: FocusNode?;
-	  +isDisabled: bool
-	  |
-	  +Widget build()
-	]
-	
-	[IconPickerField]o-[IconOption]
-	[IconPickerField]o-[void Function(IconOption)?]
-	[IconPickerField]o-[FocusNode]
-	
-	[IconPickerGallery
-	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +onSelect: void Function(IconOption)?;
-	  +iconSize: double
-	  |
-	  +Widget build()
-	]
-	
-	[IconPickerGallery]o-[void Function(IconOption)?]
-	
-	[SecondaryButton
-	  |
-	  +text: String;
-	  +icon: IconData?;
-	  +isLoading: bool;
-	  +onPressed: void Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[SecondaryButton]o-[IconData]
-	[SecondaryButton]o-[void Function()?]
-	
-	[TwoColumnLayout
-	  |
-	  &lt;static&gt;+defaultDivider: VerticalDivider;
-	  &lt;static&gt;+defaultContentPadding: EdgeInsets;
-	  &lt;static&gt;+slimContentPadding: EdgeInsets;
-	  +leftWidget: Widget;
-	  +rightWidget: Widget;
-	  +dividerWidget: Widget?;
-	  +headerWidget: Widget?;
-	  +flexLeft: int?;
-	  +flexRight: int?;
-	  +constraintsLeft: BoxConstraints?;
-	  +constraintsRight: BoxConstraints?;
-	  +scrollLeft: bool;
-	  +scrollRight: bool;
-	  +paddingLeft: EdgeInsets?;
-	  +paddingRight: EdgeInsets?;
-	  +backgroundColorLeft: Color?;
-	  +backgroundColorRight: Color?;
-	  +stretchHeight: bool
-	]
-	
-	[TwoColumnLayout]o-[VerticalDivider]
-	[TwoColumnLayout]o-[EdgeInsets]
-	[TwoColumnLayout]o-[&lt;abstract&gt;Widget]
-	[TwoColumnLayout]o-[BoxConstraints]
-	[TwoColumnLayout]o-[Color]
-	
-	[AppTranslation
-	  |
-	  &lt;static&gt;+dynamic init()
-	]
-	
-	[&lt;abstract&gt;PlatformLocale
-	  |
-	  +Locale getPlatformLocale()
-	]
-	
-	[PlatformLocaleWeb
-	  |
-	  +Locale getPlatformLocale()
-	]
-	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleWeb]
-	
-	[PlatformLocaleMobile
-	  |
-	  +Locale getPlatformLocale()
-	]
-	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleMobile]
-	
-	[LanguagePicker
-	  |
-	  +languagePickerType: LanguagePickerType;
-	  +iconColor: Color?;
-	  +offset: Offset?
-	]
-	
-	[LanguagePicker]o-[LanguagePickerType]
-	[LanguagePicker]o-[Color]
-	[LanguagePicker]o-[Offset]
-	
-	[LanguagePickerType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;LanguagePickerType&gt;;
-	  &lt;static&gt;+field: LanguagePickerType;
-	  &lt;static&gt;+icon: LanguagePickerType
-	]
-	
-	[LanguagePickerType]o-[LanguagePickerType]
-	[Enum]&lt;:--[LanguagePickerType]
-	
-	[&lt;abstract&gt;GoRouteParamEnum
-	  |
-	  +String toRouteParam();
-	  +String toShortString()
-	]
-	
-	[RoutingIntents
-	  |
-	  &lt;static&gt;+root: RoutingIntent;
-	  &lt;static&gt;+studies: RoutingIntent;
-	  &lt;static&gt;+studiesShared: RoutingIntent;
-	  &lt;static&gt;+publicRegistry: RoutingIntent;
-	  &lt;static&gt;+study: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEdit: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditInfo: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditInterventions: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String);
-	  &lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditReports: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String);
-	  &lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute});
-	  &lt;static&gt;+studyRecruit: RoutingIntent Function(String);
-	  &lt;static&gt;+studyMonitor: RoutingIntent Function(String);
-	  &lt;static&gt;+studyAnalyze: RoutingIntent Function(String);
-	  &lt;static&gt;+studySettings: RoutingIntent Function(String);
-	  &lt;static&gt;+accountSettings: RoutingIntent;
-	  &lt;static&gt;+studyNew: RoutingIntent;
-	  &lt;static&gt;+login: RoutingIntent;
-	  &lt;static&gt;+signup: RoutingIntent;
-	  &lt;static&gt;+passwordForgot: RoutingIntent;
-	  &lt;static&gt;+passwordForgot2: RoutingIntent Function(String);
-	  &lt;static&gt;+passwordRecovery: RoutingIntent;
-	  &lt;static&gt;+error: RoutingIntent Function(Exception)
-	]
-	
-	[RoutingIntents]o-[RoutingIntent]
-	[RoutingIntents]o-[RoutingIntent Function(String)]
-	[RoutingIntents]o-[RoutingIntent Function(String, String)]
-	[RoutingIntents]o-[RoutingIntent Function(String, {String? appRoute})]
-	[RoutingIntents]o-[RoutingIntent Function(Exception)]
-	
-	[RoutingIntent
-	  |
-	  +route: GoRoute;
-	  +params: Map&lt;String, String&gt;;
-	  +queryParams: Map&lt;String, String&gt;;
-	  +dispatch: RoutingIntentDispatch?;
-	  +extra: Object?;
-	  +routeName: String;
-	  +arguments: Map&lt;String, String&gt;;
-	  +props: List&lt;Object?&gt;
-	  |
-	  -dynamic _validateRoute();
-	  +bool matches()
-	]
-	
-	[RoutingIntent]o-[GoRoute]
-	[RoutingIntent]o-[RoutingIntentDispatch]
-	[&lt;abstract&gt;Equatable]&lt;:-[RoutingIntent]
-	
-	[RoutingIntentDispatch
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;;
-	  &lt;static&gt;+go: RoutingIntentDispatch;
-	  &lt;static&gt;+push: RoutingIntentDispatch
-	]
-	
-	[RoutingIntentDispatch]o-[RoutingIntentDispatch]
-	[Enum]&lt;:--[RoutingIntentDispatch]
-	
-	[RouterKeys
-	  |
-	  &lt;static&gt;+studyKey: ValueKey&lt;String&gt;;
-	  &lt;static&gt;+authKey: ValueKey&lt;String&gt;
-	]
-	
-	[RouterKeys]o-[ValueKey]
-	
-	[RouteParams
-	  |
-	  &lt;static&gt;+studiesFilter: String;
-	  &lt;static&gt;+studyId: String;
-	  &lt;static&gt;+measurementId: String;
-	  &lt;static&gt;+interventionId: String;
-	  &lt;static&gt;+testAppRoute: String
-	]
-	
-	[RouterConf
-	  |
-	  &lt;static&gt;+router: GoRouter;
-	  &lt;static&gt;+routes: List&lt;GoRoute&gt;;
-	  &lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;;
-	  &lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;
-	  |
-	  &lt;static&gt;+GoRoute route()
-	]
-	
-	[RouterConf]o-[GoRouter]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs
-	  |
-	  +studyId: String
-	]
-	
-	[&lt;abstract&gt;QuestionFormRouteArgs
-	  |
-	  +questionId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[&lt;abstract&gt;QuestionFormRouteArgs]
-	
-	[ScreenerQuestionFormRouteArgs
-	]
-	
-	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:-[ScreenerQuestionFormRouteArgs]
-	
-	[ConsentItemFormRouteArgs
-	  |
-	  +consentId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ConsentItemFormRouteArgs]
-	
-	[MeasurementFormRouteArgs
-	  |
-	  +measurementId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[MeasurementFormRouteArgs]
-	
-	[SurveyQuestionFormRouteArgs
-	  |
-	  +questionId: String
-	]
-	
-	[MeasurementFormRouteArgs]&lt;:-[SurveyQuestionFormRouteArgs]
-	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:--[SurveyQuestionFormRouteArgs]
-	
-	[InterventionFormRouteArgs
-	  |
-	  +interventionId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[InterventionFormRouteArgs]
-	
-	[InterventionTaskFormRouteArgs
-	  |
-	  +taskId: String
-	]
-	
-	[InterventionFormRouteArgs]&lt;:-[InterventionTaskFormRouteArgs]
-	
-	[ReportItemFormRouteArgs
-	  |
-	  +sectionId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ReportItemFormRouteArgs]
-	
-	[DropdownMenuItemTheme
-	  |
-	  +iconTheme: IconThemeData?
-	]
-	
-	[DropdownMenuItemTheme]o-[IconThemeData]
-	[&lt;abstract&gt;Diagnosticable]&lt;:-[DropdownMenuItemTheme]
-	
-	[ThemeConfig
-	  |
-	  &lt;static&gt;+kMinContentWidth: double;
-	  &lt;static&gt;+kMaxContentWidth: double;
-	  &lt;static&gt;+kHoverFadeFactor: double;
-	  &lt;static&gt;+kMuteFadeFactor: double
-	  |
-	  &lt;static&gt;+dynamic bodyBackgroundColor();
-	  &lt;static&gt;+Color modalBarrierColor();
-	  &lt;static&gt;+Color containerColor();
-	  &lt;static&gt;+Color colorPickerInitialColor();
-	  &lt;static&gt;+TextStyle bodyTextMuted();
-	  &lt;static&gt;+TextStyle bodyTextBackground();
-	  &lt;static&gt;+double iconSplashRadius();
-	  &lt;static&gt;+Color sidesheetBackgroundColor();
-	  &lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme();
-	  &lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()
-	]
-	
-	[NoAnimationPageTransitionsBuilder
-	  |
-	  +Widget buildTransitions()
-	]
-	
-	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[NoAnimationPageTransitionsBuilder]
-	
-	[WebTransitionBuilder
-	  |
-	  +Widget buildTransitions()
-	]
-	
-	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[WebTransitionBuilder]
-	
-	[ThemeSettingChange
-	  |
-	  +settings: ThemeSettings
-	]
-	
-	[ThemeSettingChange]o-[ThemeSettings]
-	[&lt;abstract&gt;Notification]&lt;:-[ThemeSettingChange]
-	
-	[ThemeProvider
-	  |
-	  +settings: ValueNotifier&lt;ThemeSettings&gt;;
-	  +lightDynamic: ColorScheme?;
-	  +darkDynamic: ColorScheme?;
-	  +pageTransitionsTheme: PageTransitionsTheme;
-	  +shapeMedium: ShapeBorder
-	  |
-	  +Color custom();
-	  +Color blend();
-	  +Color source();
-	  +ColorScheme colors();
-	  +CardTheme cardTheme();
-	  +ListTileThemeData listTileTheme();
-	  +AppBarTheme appBarTheme();
-	  +SnackBarThemeData snackBarThemeData();
-	  +TabBarTheme tabBarTheme();
-	  +BottomAppBarTheme bottomAppBarTheme();
-	  +BottomNavigationBarThemeData bottomNavigationBarTheme();
-	  +SwitchThemeData switchTheme();
-	  +InputDecorationTheme inputDecorationTheme();
-	  +TextTheme textTheme();
-	  +DividerThemeData dividerTheme();
-	  +NavigationRailThemeData navigationRailTheme();
-	  +DrawerThemeData drawerTheme();
-	  +IconThemeData iconTheme();
-	  +CheckboxThemeData checkboxTheme();
-	  +RadioThemeData radioTheme();
-	  +TooltipThemeData tooltipTheme();
-	  +ThemeData light();
-	  +ThemeData dark();
-	  +ThemeMode themeMode();
-	  +ThemeData theme();
-	  &lt;static&gt;+ThemeProvider of();
-	  +bool updateShouldNotify()
-	]
-	
-	[ThemeProvider]o-[ValueNotifier]
-	[ThemeProvider]o-[ColorScheme]
-	[ThemeProvider]o-[PageTransitionsTheme]
-	[ThemeProvider]o-[&lt;abstract&gt;ShapeBorder]
-	[&lt;abstract&gt;InheritedWidget]&lt;:-[ThemeProvider]
-	
-	[ThemeSettings
-	  |
-	  +sourceColor: Color;
-	  +themeMode: ThemeMode
-	]
-	
-	[ThemeSettings]o-[Color]
-	[ThemeSettings]o-[ThemeMode]
-	
-	[CustomColor
-	  |
-	  +name: String;
-	  +color: Color;
-	  +blend: bool
-	  |
-	  +Color value()
-	]
-	
-	[CustomColor]o-[Color]
-	
-	[SuppressedBehaviorSubject
-	  |
-	  +subject: BehaviorSubject&lt;T&gt;;
-	  +didSuppressInitialEvent: bool;
-	  -_controller: StreamController&lt;T&gt;
-	  |
-	  -StreamController&lt;T&gt; _buildDerivedController();
-	  +dynamic close()
-	]
-	
-	[SuppressedBehaviorSubject]o-[BehaviorSubject]
-	[SuppressedBehaviorSubject]o-[StreamController]
-	
-	[Time
-	  |
-	  &lt;static&gt;+dynamic fromTimeOfDay();
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+Time fromJson()
-	]
-	
-	[TimeOfDay]&lt;:-[Time]
-	
-	[TimeValueAccessor
-	  |
-	  +String modelToViewValue();
-	  +Time? viewToModelValue();
-	  -String _addLeadingZeroIfNeeded()
-	]
-	
-	[&lt;abstract&gt;ControlValueAccessor]&lt;:-[TimeValueAccessor]
-	
-	[ModelAction
-	  |
-	  +type: T;
-	  +label: String;
-	  +icon: IconData?;
-	  +onExecute: Function;
-	  +isAvailable: bool;
-	  +isDestructive: bool
-	]
-	
-	[ModelAction]o-[IconData]
-	
-	[&lt;abstract&gt;IModelActionProvider
-	  |
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
-	]
-	
-	[&lt;abstract&gt;IListActionProvider
-	  |
-	  +void onSelectItem();
-	  +void onNewItem()
-	]
-	
-	[&lt;abstract&gt;IModelActionProvider]&lt;:-[&lt;abstract&gt;IListActionProvider]
-	
-	[ModelActionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ModelActionType&gt;;
-	  &lt;static&gt;+edit: ModelActionType;
-	  &lt;static&gt;+delete: ModelActionType;
-	  &lt;static&gt;+remove: ModelActionType;
-	  &lt;static&gt;+duplicate: ModelActionType;
-	  &lt;static&gt;+clipboard: ModelActionType;
-	  &lt;static&gt;+primary: ModelActionType
-	]
-	
-	[ModelActionType]o-[ModelActionType]
-	[Enum]&lt;:--[ModelActionType]
-	
-	[OptimisticUpdate
-	  |
-	  +applyOptimistic: void Function();
-	  +apply: dynamic Function();
-	  +rollback: void Function();
-	  +onUpdate: void Function()?;
-	  +onError: void Function(Object, StackTrace?)?;
-	  +rethrowErrors: bool;
-	  +runOptimistically: bool;
-	  +completeFutureOptimistically: bool
-	  |
-	  +dynamic execute();
-	  -void _runUpdateHandlerIfAny()
-	]
-	
-	[OptimisticUpdate]o-[void Function()]
-	[OptimisticUpdate]o-[dynamic Function()]
-	[OptimisticUpdate]o-[void Function()?]
-	[OptimisticUpdate]o-[void Function(Object, StackTrace?)?]
-	
-	[&lt;abstract&gt;FileFormatEncoder
-	  |
-	  +dynamic encodeAsync();
-	  +String encode();
-	  +dynamic call()
-	]
-	
-	[CSVStringEncoder
-	  |
-	  +String encode()
-	]
-	
-	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[CSVStringEncoder]
-	
-	[JsonStringEncoder
-	  |
-	  +String encode()
-	]
-	
-	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[JsonStringEncoder]
-	
-	[&lt;abstract&gt;ExecutionLimiter
-	  |
-	  +milliseconds: int;
-	  &lt;static&gt;-_timer: Timer?
-	  |
-	  +void dispose()
-	]
-	
-	[&lt;abstract&gt;ExecutionLimiter]o-[Timer]
-	
-	[Debouncer
-	  |
-	  +leading: bool;
-	  +cancelUncompleted: bool;
-	  -_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?
-	  |
-	  +dynamic call()
-	]
-	
-	[Debouncer]o-[CancelableOperation]
-	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Debouncer]
-	
-	[Throttler
-	  |
-	  +dynamic call()
-	]
-	
-	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Throttler]
-	
-	[SerializableColor
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+SerializableColor fromJson()
-	]
-	
-	[Color]&lt;:-[SerializableColor]
-	
-	[&lt;abstract&gt;IProviderArgsResolver
-	  |
-	  +R provide()
-	]
-	
-	[CombinedStreamNotifier
-	  |
-	  -_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;
-	  |
-	  +void dispose()
-	]
-	
-	[ChangeNotifier]&lt;:-[CombinedStreamNotifier]
-	
-	[CountWhereValidator
-	  |
-	  +predicate: bool Function(T?);
-	  +minCount: int?;
-	  +maxCount: int?;
-	  &lt;static&gt;+kValidationMessageMinCount: String;
-	  &lt;static&gt;+kValidationMessageMaxCount: String
-	  |
-	  +Map&lt;String, dynamic&gt;? validate()
-	]
-	
-	[CountWhereValidator]o-[bool Function(T?)]
-	[&lt;abstract&gt;Validator]&lt;:-[CountWhereValidator]
-	
-	[Patterns
-	  |
-	  &lt;static&gt;+timeFormatString: String;
-	  &lt;static&gt;+emailFormatString: String;
-	  &lt;static&gt;+url: String
-	]
-	
-	[NumericalRangeFormatter
-	  |
-	  +min: int?;
-	  +max: int?
-	  |
-	  +TextEditingValue formatEditUpdate()
-	]
-	
-	[&lt;abstract&gt;TextInputFormatter]&lt;:-[NumericalRangeFormatter]
-	
-	[StudySequenceFormatter
-	  |
-	  +TextEditingValue formatEditUpdate()
-	]
-	
-	[&lt;abstract&gt;TextInputFormatter]&lt;:-[StudySequenceFormatter]
-	
-	[Tuple
-	  |
-	  +first: T1;
-	  +second: T2;
-	  +props: List&lt;Object?&gt;
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson();
-	  +Tuple&lt;T1, T2&gt; copy();
-	  +Tuple&lt;T1, T2&gt; copyWith()
-	]
-	
-	[&lt;abstract&gt;Equatable]&lt;:-[Tuple]
-	
-	[&lt;abstract&gt;JsonFileLoader
-	  |
-	  +jsonAssetsPath: String
-	  |
-	  +dynamic loadJson();
-	  +dynamic parseJsonMapFromAssets();
-	  +dynamic parseJsonListFromAssets()
-	]
-	
-	[&lt;abstract&gt;IAppDelegate
-	  |
-	  +dynamic onAppStart()
-	]
-	
-	[AppController
-	  |
-	  +appDelegates: List&lt;IAppDelegate&gt;;
-	  -_delayedFuture: dynamic;
-	  +isInitialized: dynamic
-	  |
-	  +dynamic onAppStart();
-	  -dynamic _callDelegates()
-	]
-	
-	[StudyMonitorScreen
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
-	
-	[LoginForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build()
-	]
-	
-	[LoginForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
-	
-	[PasswordRecoveryForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build()
-	]
-	
-	[PasswordRecoveryForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
-	
-	[PasswordForgotForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build()
-	]
-	
-	[PasswordForgotForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
-	
-	[SignupForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build();
-	  -dynamic _onClickTermsOfUse();
-	  -dynamic _onClickPrivacyPolicy()
-	]
-	
-	[SignupForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
-	
-	[AuthScaffold
-	  |
-	  +body: Widget;
-	  +formKey: AuthFormKey;
-	  +leftContentMinWidth: double;
-	  +leftPanelMinWidth: double;
-	  +leftPanelPadding: EdgeInsets
-	]
-	
-	[AuthScaffold]o-[&lt;abstract&gt;Widget]
-	[AuthScaffold]o-[AuthFormKey]
-	[AuthScaffold]o-[EdgeInsets]
-	
-	[EmailTextField
-	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
-	]
-	
-	[EmailTextField]o-[FormControl]
-	
-	[PasswordTextField
-	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
-	]
-	
-	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
-	[PasswordTextField]o-[FormControl]
-	
-	[StudyUJobsToBeDone
-	  |
-	  +Widget build()
-	]
-	
-	[AuthFormController
-	  |
-	  +authRepository: IAuthRepository;
-	  +notificationService: INotificationService;
-	  +router: GoRouter;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +passwordControl: FormControl&lt;String&gt;;
-	  +passwordConfirmationControl: FormControl&lt;String&gt;;
-	  +termsOfServiceControl: FormControl&lt;bool&gt;;
-	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +loginForm: FormGroup;
-	  +signupForm: FormGroup;
-	  +passwordForgotForm: FormGroup;
-	  +passwordRecoveryForm: FormGroup;
-	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  -_formKey: AuthFormKey;
-	  +formKey: AuthFormKey;
-	  +form: FormGroup
-	  |
-	  -dynamic _getFormFor();
-	  -dynamic _onChangeFormKey();
-	  +dynamic resetControlsFor();
-	  -dynamic _forceValidationMessages();
-	  +dynamic signUp();
-	  -dynamic _signUp();
-	  +dynamic signIn();
-	  -dynamic _signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic sendPasswordResetLink();
-	  +dynamic recoverPassword();
-	  +dynamic updateUser();
-	  -dynamic _readDebugUser()
-	]
-	
-	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
-	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
-	[AuthFormController]o-[GoRouter]
-	[AuthFormController]o-[FormControl]
-	[AuthFormController]o-[FormGroup]
-	[AuthFormController]o-[AuthFormKey]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[AuthFormController]
-	
-	[AuthFormKey
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AuthFormKey&gt;;
-	  &lt;static&gt;+login: AuthFormKey;
-	  &lt;static&gt;+signup: AuthFormKey;
-	  &lt;static&gt;+passwordForgot: AuthFormKey;
-	  &lt;static&gt;+passwordRecovery: AuthFormKey;
-	  &lt;static&gt;-_loginSubmit: AuthFormKey;
-	  &lt;static&gt;-_signupSubmit: AuthFormKey
-	]
-	
-	[AuthFormKey]o-[AuthFormKey]
-	[Enum]&lt;:--[AuthFormKey]
-	
-	[AppStatus
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
-	  &lt;static&gt;+initializing: AppStatus;
-	  &lt;static&gt;+initialized: AppStatus
-	]
-	
-	[AppStatus]o-[AppStatus]
-	[Enum]&lt;:--[AppStatus]
-	
-	[FormArrayTable
-	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +items: List&lt;T&gt;;
-	  +onSelectItem: void Function(T);
-	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
-	  +onNewItem: void Function()?;
-	  +rowTitle: String Function(T);
-	  +onNewItemLabel: String;
-	  +sectionTitle: String?;
-	  +sectionDescription: String?;
-	  +emptyIcon: IconData?;
-	  +emptyTitle: String?;
-	  +emptyDescription: String?;
-	  +sectionTitleDivider: bool?;
-	  +rowPrefix: Widget Function(BuildContext, T, int)?;
-	  +rowSuffix: Widget Function(BuildContext, T, int)?;
-	  +leadingWidget: Widget?;
-	  +itemsSectionPadding: EdgeInsets?;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
-	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow();
-	  -Widget _newItemButton()
-	]
-	
-	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
-	[FormArrayTable]o-[void Function(T)]
-	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
-	[FormArrayTable]o-[void Function()?]
-	[FormArrayTable]o-[String Function(T)]
-	[FormArrayTable]o-[IconData]
-	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
-	[FormArrayTable]o-[&lt;abstract&gt;Widget]
-	[FormArrayTable]o-[EdgeInsets]
-	
-	[&lt;abstract&gt;ManagedFormViewModel
-	  |
-	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
-	]
-	
-	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
-	
-	[FormViewModelNotFoundException
-	]
-	
-	[Exception]&lt;:--[FormViewModelNotFoundException]
-	
-	[FormViewModelCollection
-	  |
-	  +formViewModels: List&lt;T&gt;;
-	  +formArray: FormArray&lt;dynamic&gt;;
-	  +stagedViewModels: List&lt;T&gt;;
-	  +retrievableViewModels: List&lt;T&gt;;
-	  +formData: List&lt;D&gt;
-	  |
-	  +void add();
-	  +T remove();
-	  +T? findWhere();
-	  +T? removeWhere();
-	  +bool contains();
-	  +void stage();
-	  +T commit();
-	  +void reset();
-	  +void read()
-	]
-	
-	[FormViewModelCollection]o-[FormArray]
-	
-	[CustomFormControl
-	  |
-	  -_onValueChangedDebouncer: Debouncer?;
-	  -_onStatusChangedDebouncer: Debouncer?;
-	  +onValueChanged: void Function(T?)?;
-	  +onStatusChanged: void Function(ControlStatus)?;
-	  +onStatusChangedDebounceTime: int?;
-	  +onValueChangedDebounceTime: int?
-	  |
-	  +void dispose()
-	]
-	
-	[CustomFormControl]o-[Debouncer]
-	[CustomFormControl]o-[void Function(T?)?]
-	[CustomFormControl]o-[void Function(ControlStatus)?]
-	[FormControl]&lt;:-[CustomFormControl]
-	
-	[UnsavedChangesDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;FormValidationSetEnum
-	]
-	
-	[FormControlValidation
-	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
-	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
-	  +validationMessages: Map&lt;String, String Function(Object)&gt;
-	  |
-	  +FormControlValidation merge()
-	]
-	
-	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
-	
-	[&lt;abstract&gt;IFormData
-	  |
-	  +id: String
-	  |
-	  +IFormData copy()
-	]
-	
-	[FormInvalidException
-	]
-	
-	[Exception]&lt;:--[FormInvalidException]
-	
-	[FormConfigException
-	  |
-	  +message: String?
-	]
-	
-	[Exception]&lt;:--[FormConfigException]
-	
-	[&lt;abstract&gt;IFormViewModelDelegate
-	  |
-	  +dynamic onSave();
-	  +void onCancel()
-	]
-	
-	[&lt;abstract&gt;IFormGroupController
-	  |
-	  +form: FormGroup
-	]
-	
-	[&lt;abstract&gt;IFormGroupController]o-[FormGroup]
-	
-	[FormControlOption
-	  |
-	  +value: T;
-	  +label: String;
-	  +description: String?;
-	  +props: List&lt;Object?&gt;
-	]
-	
-	[&lt;abstract&gt;Equatable]&lt;:-[FormControlOption]
-	
-	[&lt;abstract&gt;FormViewModel
-	  |
-	  -_formData: T?;
-	  -_formMode: FormMode;
-	  -_validationSet: FormValidationSetEnum?;
-	  +delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?;
-	  +autosave: bool;
-	  -_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;;
-	  -_immediateFormChildrenListenerDebouncer: Debouncer?;
-	  -_autosaveOperation: CancelableOperation&lt;dynamic&gt;?;
-	  -_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  +prevFormValue: Map&lt;String, dynamic&gt;?;
-	  &lt;static&gt;-_formKey: String;
-	  +formData: T?;
-	  +formMode: FormMode;
-	  +isReadonly: bool;
-	  +validationSet: FormValidationSetEnum?;
-	  +isDirty: bool;
-	  +title: String;
-	  +isValid: bool;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;
-	  |
-	  -dynamic _setFormData();
-	  -dynamic _rememberDefaultControlValidators();
-	  -Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators();
-	  -dynamic _disableAllControls();
-	  -dynamic _formModeUpdated();
-	  -dynamic _restoreControlsFromFormData();
-	  +void revalidate();
-	  -void _applyValidationSet();
-	  +void read();
-	  +dynamic save();
-	  +dynamic cancel();
-	  +void enableAutosave();
-	  +void listenToImmediateFormChildren();
-	  +dynamic markFormGroupChanged();
-	  +void dispose();
-	  +void setControlsFrom();
-	  +T buildFormData();
-	  +void initControls()
-	]
-	
-	[&lt;abstract&gt;FormViewModel]o-[FormMode]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;FormValidationSetEnum]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;IFormViewModelDelegate]
-	[&lt;abstract&gt;FormViewModel]o-[Debouncer]
-	[&lt;abstract&gt;FormViewModel]o-[CancelableOperation]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[&lt;abstract&gt;FormViewModel]
-	
-	[FormMode
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;FormMode&gt;;
-	  &lt;static&gt;+create: FormMode;
-	  &lt;static&gt;+readonly: FormMode;
-	  &lt;static&gt;+edit: FormMode
-	]
-	
-	[FormMode]o-[FormMode]
-	[Enum]&lt;:--[FormMode]
-	
-	[EnrolledBadge
-	  |
-	  +enrolledCount: int
-	  |
-	  +Widget build()
-	]
-	
-	[StudyRecruitController
-	  |
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
-	  |
-	  -dynamic _subscribeInvites();
-	  +Intervention? getIntervention();
-	  +int getParticipantCountForInvite();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void dispose()
-	]
-	
-	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[StudyRecruitController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyRecruitController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
-	
-	[StudyRecruitScreen
-	  |
-	  +Widget build();
-	  -Widget _inviteCodesSectionHeader();
-	  -Widget _newInviteCodeButton();
-	  -dynamic _onSelectInvite()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
-	
-	[InviteCodeFormView
-	  |
-	  +formViewModel: InviteCodeFormViewModel
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
-	]
-	
-	[InviteCodeFormView]o-[InviteCodeFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
-	
-	[StudyInvitesTable
-	  |
-	  +invites: List&lt;StudyInvite&gt;;
-	  +onSelect: void Function(StudyInvite);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getIntervention: Intervention? Function(String);
-	  +getParticipantCountForInvite: int Function(StudyInvite)
-	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow()
-	]
-	
-	[StudyInvitesTable]o-[void Function(StudyInvite)]
-	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
-	[StudyInvitesTable]o-[Intervention? Function(String)]
-	[StudyInvitesTable]o-[int Function(StudyInvite)]
-	
-	[InviteCodeFormViewModel
-	  |
-	  +study: Study;
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  +codeControl: FormControl&lt;String&gt;;
-	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
-	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +interventionAControl: FormControl&lt;String&gt;;
-	  +interventionBControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
-	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +isPreconfiguredSchedule: bool;
-	  +preconfiguredSchedule: List&lt;String&gt;?
-	  |
-	  +void initControls();
-	  -dynamic _uniqueInviteCode();
-	  +void regenerateCode();
-	  -String _generateCode();
-	  +StudyInvite buildFormData();
-	  +void setControlsFrom();
-	  +dynamic save()
-	]
-	
-	[InviteCodeFormViewModel]o-[Study]
-	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[InviteCodeFormViewModel]o-[FormControl]
-	[InviteCodeFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
-	
-	[PublishSuccessDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
-	
-	[PublishDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
-	
-	[PublishConfirmationDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
-	
-	[FrameControlsWidget
-	  |
-	  +onRefresh: void Function()?;
-	  +onOpenNewTab: void Function()?;
-	  +enabled: bool
-	  |
-	  +Widget build()
-	]
-	
-	[FrameControlsWidget]o-[void Function()?]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel
-	  |
-	  +studyParticipation: Participation?;
-	  +studyStatus: StudyStatus?
-	]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
-	
-	[StudyStatusBadge
-	  |
-	  +participation: Participation?;
-	  +status: StudyStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
-	  |
-	  +Widget build()
-	]
-	
-	[StudyStatusBadge]o-[Participation]
-	[StudyStatusBadge]o-[StudyStatus]
-	[StudyStatusBadge]o-[BadgeType]
-	
-	[RouteInformation
-	  |
-	  +route: String?;
-	  +extra: String?;
-	  +cmd: String?;
-	  +data: String?
-	  |
-	  +String toString()
-	]
-	
-	[&lt;abstract&gt;PlatformController
-	  |
-	  +studyId: String;
-	  +baseSrc: String;
-	  +previewSrc: String;
-	  +routeInformation: RouteInformation;
-	  +frameWidget: Widget
-	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void listen();
-	  +void send();
-	  +void openNewPage()
-	]
-	
-	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
-	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
-	
-	[WebController
-	  |
-	  +iFrameElement: IFrameElement
-	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void openNewPage();
-	  +void listen();
-	  +void send()
-	]
-	
-	[WebController]o-[IFrameElement]
-	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
-	
-	[MobileController
-	  |
-	  +void openNewPage();
-	  +void refresh();
-	  +void registerViews();
-	  +void listen();
-	  +void send();
-	  +void navigate();
-	  +void activate();
-	  +void generateUrl()
-	]
-	
-	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
-	
-	[StudyController
-	  |
-	  +notificationService: INotificationService;
-	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
-	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
-	  |
-	  +dynamic syncStudyStatus();
-	  +dynamic onStudySubscriptionUpdate();
-	  -dynamic _redirectNewToActualStudyID();
-	  +dynamic publishStudy();
-	  +void onChangeStudyParticipation();
-	  +void onAddParticipants();
-	  +void onSettingsPressed();
-	  +void dispose()
-	]
-	
-	[StudyController]o-[&lt;abstract&gt;INotificationService]
-	[StudyController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyController]
-	
-	[&lt;abstract&gt;IStudyNavViewModel
-	  |
-	  +isEditTabEnabled: bool;
-	  +isTestTabEnabled: bool;
-	  +isRecruitTabEnabled: bool;
-	  +isMonitorTabEnabled: bool;
-	  +isAnalyzeTabEnabled: bool;
-	  +isSettingsEnabled: bool
-	]
-	
-	[StudyNav
-	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic edit();
-	  &lt;static&gt;+dynamic test();
-	  &lt;static&gt;+dynamic recruit();
-	  &lt;static&gt;+dynamic monitor();
-	  &lt;static&gt;+dynamic analyze()
-	]
-	
-	[StudyDesignNav
-	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic info();
-	  &lt;static&gt;+dynamic enrollment();
-	  &lt;static&gt;+dynamic interventions();
-	  &lt;static&gt;+dynamic measurements();
-	  &lt;static&gt;+dynamic reports()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget
-	  |
-	  +studyId: String
-	  |
-	  +Widget? banner()
-	]
-	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
-	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
-	
-	[StudyParticipationBadge
-	  |
-	  +participation: Participation;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +center: bool
-	  |
-	  +Widget build()
-	]
-	
-	[StudyParticipationBadge]o-[Participation]
-	[StudyParticipationBadge]o-[BadgeType]
-	
-	[StudyBaseController
-	  |
-	  +studyId: String;
-	  +studyRepository: IStudyRepository;
-	  +router: GoRouter;
-	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
-	  |
-	  +dynamic subscribeStudy();
-	  +dynamic onStudySubscriptionUpdate();
-	  +dynamic onStudySubscriptionError();
-	  +void dispose()
-	]
-	
-	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyBaseController]o-[GoRouter]
-	[StudyBaseController]o-[StreamSubscription]
-	
-	[PreviewFrame
-	  |
-	  +studyId: String;
-	  +routeArgs: StudyFormRouteArgs?;
-	  +route: String?
-	]
-	
-	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
-	
-	[&lt;abstract&gt;IStudyAppBarViewModel
-	  |
-	  +isSyncIndicatorVisible: bool;
-	  +isStatusBadgeVisible: bool;
-	  +isPublishVisible: bool
-	]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	
-	[StudyScaffold
-	  |
-	  +studyId: String;
-	  +tabs: List&lt;NavbarTab&gt;?;
-	  +tabsSubnav: List&lt;NavbarTab&gt;?;
-	  +selectedTab: NavbarTab?;
-	  +selectedTabSubnav: NavbarTab?;
-	  +body: StudyPageWidget;
-	  +drawer: Widget?;
-	  +disableActions: bool;
-	  +actionsSpacing: double;
-	  +actionsPadding: double;
-	  +layoutType: SingleColumnLayoutType?;
-	  +appbarHeight: double;
-	  +appbarSubnavHeight: double
-	]
-	
-	[StudyScaffold]o-[NavbarTab]
-	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
-	[StudyScaffold]o-[&lt;abstract&gt;Widget]
-	[StudyScaffold]o-[SingleColumnLayoutType]
-	
-	[WebFrame
-	  |
-	  +previewSrc: String;
-	  +studyId: String
-	  |
-	  +Widget build()
-	]
-	
-	[DisabledFrame
-	  |
-	  +Widget build()
-	]
-	
-	[PhoneContainer
-	  |
-	  &lt;static&gt;+defaultWidth: double;
-	  &lt;static&gt;+defaultHeight: double;
-	  +width: double;
-	  +height: double;
-	  +borderColor: Color;
-	  +borderWidth: double;
-	  +borderRadius: double;
-	  +innerContent: Widget;
-	  +innerContentBackgroundColor: Color?
-	  |
-	  +Widget build()
-	]
-	
-	[PhoneContainer]o-[Color]
-	[PhoneContainer]o-[&lt;abstract&gt;Widget]
-	
-	[MobileFrame
-	  |
-	  +Widget build()
-	]
-	
-	[DesktopFrame
-	  |
-	  +Widget build()
-	]
-	
-	[StudyTestScreen
-	  |
-	  +previewRoute: String?
-	  |
-	  +Widget build();
-	  +Widget? banner();
-	  +dynamic load();
-	  +dynamic save();
-	  +dynamic showHelp()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
-	
-	[StudySettingsFormViewModel
-	  |
-	  +study: AsyncValue&lt;Study&gt;;
-	  +studyRepository: IStudyRepository;
-	  &lt;static&gt;+defaultPublishedToRegistry: bool;
-	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
-	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
-	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +dynamic keepControlsSynced();
-	  +dynamic save();
-	  +dynamic setLaunchDefaults()
-	]
-	
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudySettingsFormViewModel]o-[FormControl]
-	[StudySettingsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
-	
-	[StudySettingsDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
-	
-	[StudyTestController
-	  |
-	  +authRepository: IAuthRepository;
-	  +languageCode: String
-	]
-	
-	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyBaseController]&lt;:-[StudyTestController]
-	
-	[TestAppRoutes
-	  |
-	  &lt;static&gt;+studyOverview: String;
-	  &lt;static&gt;+eligibility: String;
-	  &lt;static&gt;+intervention: String;
-	  &lt;static&gt;+consent: String;
-	  &lt;static&gt;+journey: String;
-	  &lt;static&gt;+dashboard: String
-	]
-	
-	[DrawerEntry
-	  |
-	  +localizedTitle: String Function();
-	  +icon: IconData?;
-	  +localizedHelpText: String Function()?;
-	  +enabled: bool;
-	  +onSelected: void Function(BuildContext, WidgetRef)?;
-	  +autoCloseDrawer: bool;
-	  +title: String;
-	  +helpText: String?
-	  |
-	  +void onClick()
-	]
-	
-	[DrawerEntry]o-[String Function()]
-	[DrawerEntry]o-[IconData]
-	[DrawerEntry]o-[String Function()?]
-	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
-	
-	[GoRouterDrawerEntry
-	  |
-	  +intent: RoutingIntent;
-	  +onNavigated: void Function()?
-	  |
-	  +void onClick()
-	]
-	
-	[GoRouterDrawerEntry]o-[RoutingIntent]
-	[GoRouterDrawerEntry]o-[void Function()?]
-	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
-	
-	[AppDrawer
-	  |
-	  +width: int;
-	  +autoCloseDrawer: bool;
-	  +leftPaddingEntries: double;
-	  +logoPaddingVertical: double;
-	  +logoPaddingHorizontal: double;
-	  +logoMaxHeight: double;
-	  +logoSectionMinHeight: double;
-	  +logoSectionMaxHeight: double
-	]
-	
-	[StudyAnalyzeScreen
-	  |
-	  +Widget? banner();
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
-	
-	[StudyAnalyzeController
-	  |
-	  +dynamic onExport()
-	]
-	
-	[StudyBaseController]&lt;:-[StudyAnalyzeController]
-	
-	[StudyDesignInterventionsFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
-	
-	[InterventionFormView
-	  |
-	  +formViewModel: InterventionFormViewModel
-	]
-	
-	[InterventionFormView]o-[InterventionFormViewModel]
-	
-	[InterventionPreview
-	  |
-	  +routeArgs: InterventionFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPreview]o-[InterventionFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
-	
-	[StudyScheduleFormView
-	  |
-	  +formViewModel: StudyScheduleControls
-	  |
-	  -FormTableRow _renderCustomSequence();
-	  +Widget build()
-	]
-	
-	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
-	
-	[InterventionTaskFormData
-	  |
-	  +taskId: String;
-	  +taskTitle: String;
-	  +taskDescription: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +CheckmarkTask toTask();
-	  +InterventionTaskFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
-	
-	[InterventionsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +interventionsArray: FormArray&lt;dynamic&gt;;
-	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
-	  +form: FormGroup;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +interventionsRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestStudySchedule: bool
-	  |
-	  +void setControlsFrom();
-	  +InterventionsFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +InterventionFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +dynamic testStudySchedule()
-	]
-	
-	[InterventionsFormViewModel]o-[Study]
-	[InterventionsFormViewModel]o-[GoRouter]
-	[InterventionsFormViewModel]o-[FormArray]
-	[InterventionsFormViewModel]o-[FormViewModelCollection]
-	[InterventionsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
-	
-	[InterventionTaskFormViewModel
-	  |
-	  +taskIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +taskTitleControl: FormControl&lt;String&gt;;
-	  +taskDescriptionControl: FormControl&lt;String&gt;;
-	  +markAsCompletedControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +taskId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +InterventionTaskFormData buildFormData();
-	  +InterventionTaskFormViewModel createDuplicate()
-	]
-	
-	[InterventionTaskFormViewModel]o-[FormControl]
-	[InterventionTaskFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
-	
-	[&lt;abstract&gt;StudyScheduleControls
-	  |
-	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
-	  &lt;static&gt;+defaultScheduleTypeSequence: String;
-	  &lt;static&gt;+defaultNumCycles: int;
-	  &lt;static&gt;+defaultPeriodLength: int;
-	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
-	  +phaseDurationControl: FormControl&lt;int&gt;;
-	  +numCyclesControl: FormControl&lt;int&gt;;
-	  +includeBaselineControl: FormControl&lt;bool&gt;;
-	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  &lt;static&gt;+kNumCyclesMin: int;
-	  &lt;static&gt;+kNumCyclesMax: int;
-	  &lt;static&gt;+kPhaseDurationMin: int;
-	  &lt;static&gt;+kPhaseDurationMax: int;
-	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +numCyclesRange: dynamic;
-	  +phaseDurationRange: dynamic;
-	  +customSequenceRequired: dynamic
-	  |
-	  +void setStudyScheduleControlsFrom();
-	  +StudyScheduleFormData buildStudyScheduleFormData();
-	  +bool isSequencingCustom()
-	]
-	
-	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
-	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
-	
-	[InterventionFormData
-	  |
-	  +interventionId: String;
-	  +title: String;
-	  +description: String?;
-	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
-	  +iconName: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +Intervention toIntervention();
-	  +InterventionFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
-	
-	[StudyScheduleFormData
-	  |
-	  +sequenceType: PhaseSequence;
-	  +sequenceTypeCustom: String;
-	  +numCycles: int;
-	  +phaseDuration: int;
-	  +includeBaseline: bool;
-	  +id: String
-	  |
-	  +StudySchedule toStudySchedule();
-	  +Study apply();
-	  +StudyScheduleFormData copy()
-	]
-	
-	[StudyScheduleFormData]o-[PhaseSequence]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
-	
-	[InterventionTaskFormView
-	  |
-	  +formViewModel: InterventionTaskFormViewModel
-	]
-	
-	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
-	
-	[InterventionsFormData
-	  |
-	  +interventionsData: List&lt;InterventionFormData&gt;;
-	  +studyScheduleData: StudyScheduleFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +InterventionsFormData copy()
-	]
-	
-	[InterventionsFormData]o-[StudyScheduleFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
-	
-	[InterventionFormViewModel
-	  |
-	  +study: Study;
-	  +interventionIdControl: FormControl&lt;String&gt;;
-	  +interventionTitleControl: FormControl&lt;String&gt;;
-	  +interventionIconControl: FormControl&lt;IconOption&gt;;
-	  +interventionDescriptionControl: FormControl&lt;String&gt;;
-	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
-	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
-	  +form: FormGroup;
-	  +interventionId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneTask: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +InterventionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +InterventionTaskFormViewModel provide();
-	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
-	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
-	  +InterventionFormViewModel createDuplicate()
-	]
-	
-	[InterventionFormViewModel]o-[Study]
-	[InterventionFormViewModel]o-[FormControl]
-	[InterventionFormViewModel]o-[FormArray]
-	[InterventionFormViewModel]o-[FormViewModelCollection]
-	[InterventionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
-	
-	[StudyDesignReportsFormView
-	  |
-	  +Widget build();
-	  -dynamic _showReportItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
-	
-	[ReportItemFormData
-	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
-	  +id: String
-	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
-	]
-	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
-	
-	[DataReferenceEditor
-	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
-	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
-	]
-	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
-	
-	[TemporalAggregationFormatted
-	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
-	]
-	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
-	
-	[ImprovementDirectionFormatted
-	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
-	]
-	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
-	
-	[ReportSectionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
-	]
-	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
-	
-	[AverageSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
-	
-	[DataReferenceIdentifier
-	  |
-	  +hashCode: int
-	  |
-	  +bool ==()
-	]
-	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
-	
-	[LinearRegressionSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
-	
-	[ReportItemFormViewModel
-	  |
-	  &lt;static&gt;+defaultSectionType: ReportSectionType;
-	  +sectionIdControl: FormControl&lt;String&gt;;
-	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +sectionControl: FormControl&lt;ReportSection&gt;;
-	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
-	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
-	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
-	  +alphaControl: FormControl&lt;double&gt;;
-	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +form: FormGroup;
-	  +sectionId: String;
-	  +sectionType: ReportSectionType;
-	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
-	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
-	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +dataReferenceRequired: dynamic;
-	  +aggregationRequired: dynamic;
-	  +improvementDirectionRequired: dynamic;
-	  +alphaConfidenceRequired: dynamic
-	  |
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +ReportItemFormData buildFormData();
-	  +ReportItemFormViewModel createDuplicate();
-	  +dynamic onSectionTypeChanged();
-	  -void _updateFormControls();
-	  +void setControlsFrom()
-	]
-	
-	[ReportItemFormViewModel]o-[ReportSectionType]
-	[ReportItemFormViewModel]o-[FormControl]
-	[ReportItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
-	
-	[ReportItemFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
-	  |
-	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
-	]
-	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
-	
-	[ReportsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +reportItemDelegate: ReportFormItemDelegate;
-	  +reportItemArray: FormArray&lt;dynamic&gt;;
-	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +form: FormGroup;
-	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestConsent: bool
-	  |
-	  +void setControlsFrom();
-	  +ReportsFormData buildFormData();
-	  +void read();
-	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
-	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
-	  +dynamic testReport();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide()
-	]
-	
-	[ReportsFormViewModel]o-[Study]
-	[ReportsFormViewModel]o-[GoRouter]
-	[ReportsFormViewModel]o-[ReportFormItemDelegate]
-	[ReportsFormViewModel]o-[FormArray]
-	[ReportsFormViewModel]o-[FormViewModelCollection]
-	[ReportsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
-	
-	[ReportFormItemDelegate
-	  |
-	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +owner: ReportsFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
-	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
-	]
-	
-	[ReportFormItemDelegate]o-[FormViewModelCollection]
-	[ReportFormItemDelegate]o-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
-	
-	[ReportBadge
-	  |
-	  +status: ReportStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
-	  |
-	  +Widget build()
-	]
-	
-	[ReportBadge]o-[ReportStatus]
-	[ReportBadge]o-[BadgeType]
-	
-	[ReportsFormData
-	  |
-	  +reportItems: List&lt;ReportItemFormData&gt;;
-	  +id: String
-	  |
-	  +Study apply();
-	  +ReportsFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
-	
-	[ReportStatus
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
-	  &lt;static&gt;+primary: ReportStatus;
-	  &lt;static&gt;+secondary: ReportStatus
-	]
-	
-	[ReportStatus]o-[ReportStatus]
-	[Enum]&lt;:--[ReportStatus]
-	
-	[&lt;abstract&gt;IStudyFormData
-	  |
-	  +Study apply()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
-	
-	[StudyInfoFormViewModel
-	  |
-	  +study: Study;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +organizationControl: FormControl&lt;String&gt;;
-	  +reviewBoardControl: FormControl&lt;String&gt;;
-	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
-	  +researchersControl: FormControl&lt;String&gt;;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +websiteControl: FormControl&lt;String&gt;;
-	  +phoneControl: FormControl&lt;String&gt;;
-	  +additionalInfoControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +iconRequired: dynamic;
-	  +organizationRequired: dynamic;
-	  +reviewBoardRequired: dynamic;
-	  +reviewBoardNumberRequired: dynamic;
-	  +researchersRequired: dynamic;
-	  +emailRequired: dynamic;
-	  +phoneRequired: dynamic;
-	  +emailFormat: dynamic;
-	  +websiteFormat: dynamic
-	  |
-	  +void setControlsFrom();
-	  +StudyInfoFormData buildFormData()
-	]
-	
-	[StudyInfoFormViewModel]o-[Study]
-	[StudyInfoFormViewModel]o-[FormControl]
-	[StudyInfoFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
-	
-	[StudyDesignInfoFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
-	
-	[StudyInfoFormData
-	  |
-	  +title: String;
-	  +description: String?;
-	  +iconName: String;
-	  +contactInfoFormData: StudyContactInfoFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
-	]
-	
-	[StudyInfoFormData]o-[StudyContactInfoFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
-	
-	[StudyContactInfoFormData
-	  |
-	  +organization: String?;
-	  +institutionalReviewBoard: String?;
-	  +institutionalReviewBoardNumber: String?;
-	  +researchers: String?;
-	  +email: String?;
-	  +website: String?;
-	  +phone: String?;
-	  +additionalInfo: String?;
-	  +id: String
-	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
-	
-	[StudyFormValidationSet
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
-	]
-	
-	[Enum]&lt;:--[StudyFormValidationSet]
-	
-	[MeasurementsFormData
-	  |
-	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
-	  +id: String
-	  |
-	  +Study apply();
-	  +MeasurementsFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
-	
-	[MeasurementSurveyFormView
-	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
-	]
-	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
-	
-	[SurveyPreview
-	  |
-	  +routeArgs: MeasurementFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
-	
-	[MeasurementSurveyFormData
-	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
-	]
-	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
-	
-	[MeasurementSurveyFormViewModel
-	  |
-	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
-	]
-	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
-	
-	[StudyDesignMeasurementsFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
-	
-	[MeasurementsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +measurementsArray: FormArray&lt;dynamic&gt;;
-	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
-	  +form: FormGroup;
-	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +measurementRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +MeasurementsFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +MeasurementSurveyFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave()
-	]
-	
-	[MeasurementsFormViewModel]o-[Study]
-	[MeasurementsFormViewModel]o-[GoRouter]
-	[MeasurementsFormViewModel]o-[FormArray]
-	[MeasurementsFormViewModel]o-[FormViewModelCollection]
-	[MeasurementsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
-	
-	[StudyFormScaffold
-	  |
-	  +studyId: String;
-	  +formViewModelBuilder: T Function(WidgetRef);
-	  +formViewBuilder: Widget Function(T)
-	  |
-	  +Widget build()
-	]
-	
-	[StudyFormScaffold]o-[T Function(WidgetRef)]
-	[StudyFormScaffold]o-[Widget Function(T)]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
-	
-	[ConsentItemFormViewModel
-	  |
-	  +consentIdControl: FormControl&lt;String&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +form: FormGroup;
-	  +consentId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +ConsentItemFormData buildFormData();
-	  +ConsentItemFormViewModel createDuplicate()
-	]
-	
-	[ConsentItemFormViewModel]o-[FormControl]
-	[ConsentItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
-	
-	[StudyDesignEnrollmentFormView
-	  |
-	  +Widget build();
-	  -dynamic _showScreenerQuestionSidesheetWithArgs();
-	  -dynamic _showConsentItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
-	
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
-	  |
-	  +isDirtyOptionsBannerVisible: bool
-	]
-	
-	[ScreenerQuestionLogicFormView
-	  |
-	  +formViewModel: ScreenerQuestionFormViewModel
-	  |
-	  +Widget build();
-	  -dynamic _buildInfoBanner();
-	  -dynamic _buildAnswerOptionsLogicControls();
-	  -List&lt;Widget&gt; _buildOptionLogicRow()
-	]
-	
-	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
-	
-	[ConsentItemFormData
-	  |
-	  +consentId: String;
-	  +title: String;
-	  +description: String;
-	  +iconName: String?;
-	  +id: String
-	  |
-	  +ConsentItem toConsentItem();
-	  +ConsentItemFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
-	
-	[ConsentItemFormView
-	  |
-	  +formViewModel: ConsentItemFormViewModel
-	]
-	
-	[ConsentItemFormView]o-[ConsentItemFormViewModel]
-	
-	[EnrollmentFormData
-	  |
-	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
-	  +enrollmentType: Participation;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
-	  +id: String
-	  |
-	  +Study apply();
-	  +EnrollmentFormData copy()
-	]
-	
-	[EnrollmentFormData]o-[Participation]
-	[EnrollmentFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
-	
-	[ScreenerQuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultResponseOptionValidity: bool;
-	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
-	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
-	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
-	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionValues: List&lt;dynamic&gt;;
-	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isDirtyOptionsBannerVisible: bool
-	  |
-	  +dynamic onResponseOptionsChanged();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
-	  +ScreenerQuestionFormViewModel createDuplicate()
-	]
-	
-	[ScreenerQuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
-	
-	[EnrollmentFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
-	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
-	  +consentItemArray: FormArray&lt;dynamic&gt;;
-	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +form: FormGroup;
-	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
-	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestScreener: bool;
-	  +canTestConsent: bool;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setControlsFrom();
-	  +EnrollmentFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
-	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
-	  +dynamic testScreener();
-	  +dynamic testConsent();
-	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
-	]
-	
-	[EnrollmentFormViewModel]o-[Study]
-	[EnrollmentFormViewModel]o-[GoRouter]
-	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
-	[EnrollmentFormViewModel]o-[FormControl]
-	[EnrollmentFormViewModel]o-[FormArray]
-	[EnrollmentFormViewModel]o-[FormViewModelCollection]
-	[EnrollmentFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
-	
-	[EnrollmentFormConsentItemDelegate
-	  |
-	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +owner: EnrollmentFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
-	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ConsentItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
-	]
-	
-	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
-	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
-	
-	[StudyFormViewModel
-	  |
-	  +studyDirtyCopy: Study?;
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +router: GoRouter;
-	  +studyInfoFormViewModel: StudyInfoFormViewModel;
-	  +enrollmentFormViewModel: EnrollmentFormViewModel;
-	  +measurementsFormViewModel: MeasurementsFormViewModel;
-	  +reportsFormViewModel: ReportsFormViewModel;
-	  +interventionsFormViewModel: InterventionsFormViewModel;
-	  +form: FormGroup;
-	  +isStudyReadonly: bool;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +void dispose();
-	  +void onCancel();
-	  +dynamic onSave();
-	  -dynamic _applyAndSaveSubform()
-	]
-	
-	[StudyFormViewModel]o-[Study]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyFormViewModel]o-[GoRouter]
-	[StudyFormViewModel]o-[StudyInfoFormViewModel]
-	[StudyFormViewModel]o-[EnrollmentFormViewModel]
-	[StudyFormViewModel]o-[MeasurementsFormViewModel]
-	[StudyFormViewModel]o-[ReportsFormViewModel]
-	[StudyFormViewModel]o-[InterventionsFormViewModel]
-	[StudyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls
-	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
-	  +void read();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
-	]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	
-	[QuestionnaireFormData
-	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
-	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
-	
-	[&lt;abstract&gt;QuestionFormData
-	  |
-	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
-	  +questionId: String;
-	  +questionText: String;
-	  +questionInfoText: String?;
-	  +questionType: SurveyQuestionType;
-	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
-	  +responseOptions: List&lt;dynamic&gt;;
-	  +id: String
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +EligibilityCriterion toEligibilityCriterion();
-	  +Answer&lt;dynamic&gt; constructAnswerFor();
-	  +dynamic setResponseOptionsValidityFrom();
-	  +QuestionFormData copy()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
-	
-	[ChoiceQuestionFormData
-	  |
-	  +isMultipleChoice: bool;
-	  +answerOptions: List&lt;String&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +QuestionFormData copy();
-	  -Choice _buildChoiceForValue();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
-	
-	[BoolQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +BoolQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
-	
-	[ImageQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +ImageQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
-	
-	[AudioQuestionFormData
-	  |
-	  +maxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +AudioQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
-	
-	[ScaleQuestionFormData
-	  |
-	  +minValue: double;
-	  +maxValue: double;
-	  +minLabel: String?;
-	  +maxLabel: String?;
-	  +midValues: List&lt;double?&gt;;
-	  +midLabels: List&lt;String?&gt;;
-	  +stepSize: double;
-	  +initialValue: double?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +responseOptions: List&lt;double&gt;;
-	  +midAnnotations: List&lt;Annotation&gt;
-	  |
-	  +ScaleQuestion toQuestion();
-	  +QuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[ScaleQuestionFormData]o-[Color]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
-	
-	[FreeTextQuestionFormData
-	  |
-	  +textLengthRange: List&lt;int&gt;;
-	  +textType: FreeTextQuestionType;
-	  +textTypeExpression: String?;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +FreeTextQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
-	
-	[AudioRecordingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
-	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
-	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
-	]
-	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
-	
-	[SurveyQuestionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
-	]
-	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[ImageCapturingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	]
-	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
-	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
-	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
-	[QuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
-	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
-	]
-	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
-	
-	[SurveyQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
-	]
-	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule
-	  |
-	  +instanceId: String;
-	  +isTimeLocked: bool;
-	  +timeLockStart: StudyUTimeOfDay?;
-	  +timeLockEnd: StudyUTimeOfDay?;
-	  +hasReminder: bool;
-	  +reminderTime: StudyUTimeOfDay?
-	  |
-	  +Schedule toSchedule()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
-	
-	[ScheduleControls
-	  |
-	  +formViewModel: WithScheduleControls
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
-	]
-	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
-	
-	[&lt;abstract&gt;WithScheduleControls
-	  |
-	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
-	  +instanceID: FormControl&lt;String&gt;;
-	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +hasReminderControl: FormControl&lt;bool&gt;;
-	  +reminderTimeControl: FormControl&lt;Time&gt;;
-	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
-	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
-	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  +hasReminder: bool;
-	  +isTimeRestricted: bool;
-	  +timeRestriction: List&lt;Time&gt;?
-	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
-	]
-	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget
-	  |
-	  +Widget? banner()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
-	
-	[StudiesTableColumnHeader
-	  |
-	  +title: String;
-	  +sortable: bool;
-	  +sortAscending: bool;
-	  +sortingActive: bool;
-	  +onSort: void Function()?
-	]
-	
-	[StudiesTableColumnHeader]o-[void Function()?]
-	
-	[DashboardScreen
-	  |
-	  +filter: StudiesFilter?
-	]
-	
-	[DashboardScreen]o-[StudiesFilter]
-	
-	[DashboardScaffold
-	  |
-	  &lt;static&gt;+compactWidthThreshold: double;
-	  +body: Widget
-	  |
-	  +Widget build()
-	]
-	
-	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
-	
-	[DashboardController
-	  |
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +userRepository: IUserRepository;
-	  +router: GoRouter;
-	  -_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?;
-	  +searchController: SearchController;
-	  +isSortAscending: bool
-	  |
-	  -dynamic _subscribeStudies();
-	  +dynamic setSearchText();
-	  +dynamic setStudiesFilter();
-	  +dynamic onSelectStudy();
-	  +dynamic onClickNewStudy();
-	  +dynamic pinStudy();
-	  +dynamic pinOffStudy();
-	  +void setSorting();
-	  +void filterStudies();
-	  +void sortStudies();
-	  +bool isSortingActiveForColumn();
-	  +bool isPinned();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void dispose()
-	]
-	
-	[DashboardController]o-[&lt;abstract&gt;IStudyRepository]
-	[DashboardController]o-[&lt;abstract&gt;IAuthRepository]
-	[DashboardController]o-[&lt;abstract&gt;IUserRepository]
-	[DashboardController]o-[GoRouter]
-	[DashboardController]o-[StreamSubscription]
-	[DashboardController]o-[SearchController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
-	
-	[StudiesFilter
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
-	]
-	
-	[Enum]&lt;:--[StudiesFilter]
-	
-	[StudiesTableColumnSize
-	  |
-	  +collapsed: bool;
-	  +flex: int?;
-	  +width: double?
-	  |
-	  +Widget createContainer()
-	]
-	
-	[StudiesTable
-	  |
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +compactWidthThreshold: double;
-	  +superCompactWidthThreshold: double;
-	  +compactStatTitleThreshold: double;
-	  +studies: List&lt;Study&gt;;
-	  +onSelect: void Function(Study);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study);
-	  +emptyWidget: Widget;
-	  +pinnedStudies: Iterable&lt;String&gt;;
-	  +dashboardController: DashboardController
-	  |
-	  +Widget build();
-	  -Widget _buildColumnHeader()
-	]
-	
-	[StudiesTable]o-[void Function(Study)]
-	[StudiesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)]
-	[StudiesTable]o-[&lt;abstract&gt;Widget]
-	[StudiesTable]o-[DashboardController]
-	
-	[StudiesTableColumn
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesTableColumn&gt;;
-	  &lt;static&gt;+pin: StudiesTableColumn;
-	  &lt;static&gt;+title: StudiesTableColumn;
-	  &lt;static&gt;+status: StudiesTableColumn;
-	  &lt;static&gt;+participation: StudiesTableColumn;
-	  &lt;static&gt;+createdAt: StudiesTableColumn;
-	  &lt;static&gt;+enrolled: StudiesTableColumn;
-	  &lt;static&gt;+active: StudiesTableColumn;
-	  &lt;static&gt;+completed: StudiesTableColumn;
-	  &lt;static&gt;+action: StudiesTableColumn
-	]
-	
-	[StudiesTableColumn]o-[StudiesTableColumn]
-	[Enum]&lt;:--[StudiesTableColumn]
-	
-	[StudiesTableItem
-	  |
-	  +study: Study;
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
-	  +isPinned: bool;
-	  +onPinnedChanged: void Function(Study, bool)?;
-	  +onTap: void Function(Study)?
-	]
-	
-	[StudiesTableItem]o-[Study]
-	[StudiesTableItem]o-[void Function(Study, bool)?]
-	[StudiesTableItem]o-[void Function(Study)?]
-	
-	[App
-	]
-	
-	[AppContent
-	]
-	
-	[AccountSettingsDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AccountSettingsDialog]
-	
-	[&lt;abstract&gt;IInviteCodeRepository
-	  |
-	  +dynamic isCodeAlreadyUsed()
-	]
-	
-	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IInviteCodeRepository]
-	
-	[InviteCodeRepository
-	  |
-	  +studyId: String;
-	  +ref: ProviderRef&lt;dynamic&gt;;
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +studyRepository: IStudyRepository;
-	  +study: Study
-	  |
-	  +String getKey();
-	  +dynamic isCodeAlreadyUsed();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +dynamic emitUpdate()
-	]
-	
-	[InviteCodeRepository]o-[&lt;abstract&gt;ProviderRef]
-	[InviteCodeRepository]o-[&lt;abstract&gt;StudyUApi]
-	[InviteCodeRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[InviteCodeRepository]o-[&lt;abstract&gt;IStudyRepository]
-	[InviteCodeRepository]o-[Study]
-	[&lt;abstract&gt;ModelRepository]&lt;:-[InviteCodeRepository]
-	[&lt;abstract&gt;IInviteCodeRepository]&lt;:--[InviteCodeRepository]
-	
-	[InviteCodeRepositoryDelegate
-	  |
-	  +study: Study;
-	  +apiClient: StudyUApi;
-	  +studyRepository: IStudyRepository
-	  |
-	  +dynamic fetch();
-	  +dynamic fetchAll();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic onError();
-	  +StudyInvite createDuplicate();
-	  +StudyInvite createNewInstance()
-	]
-	
-	[InviteCodeRepositoryDelegate]o-[Study]
-	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
-	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;IStudyRepository]
-	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[InviteCodeRepositoryDelegate]
-	
-	[&lt;abstract&gt;IStudyRepository
-	  |
-	  +dynamic launch();
-	  +dynamic deleteParticipants()
-	]
-	
-	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IStudyRepository]
-	
-	[StudyRepository
-	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +ref: ProviderRef&lt;dynamic&gt;;
-	  +sortCallback: void Function()?
-	  |
-	  +String getKey();
-	  +dynamic deleteParticipants();
-	  +dynamic launch();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
-	]
-	
-	[StudyRepository]o-[&lt;abstract&gt;StudyUApi]
-	[StudyRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyRepository]o-[&lt;abstract&gt;ProviderRef]
-	[StudyRepository]o-[void Function()?]
-	[&lt;abstract&gt;ModelRepository]&lt;:-[StudyRepository]
-	[&lt;abstract&gt;IStudyRepository]&lt;:--[StudyRepository]
-	
-	[StudyRepositoryDelegate
-	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository
-	  |
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic onError();
-	  +Study createNewInstance();
-	  +Study createDuplicate()
-	]
-	
-	[StudyRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
-	[StudyRepositoryDelegate]o-[&lt;abstract&gt;IAuthRepository]
-	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[StudyRepositoryDelegate]
-	
-	[&lt;abstract&gt;StudyUApi
-	  |
-	  +dynamic saveStudy();
-	  +dynamic fetchStudy();
-	  +dynamic getUserStudies();
-	  +dynamic deleteStudy();
-	  +dynamic saveStudyInvite();
-	  +dynamic fetchStudyInvite();
-	  +dynamic deleteStudyInvite();
-	  +dynamic deleteParticipants();
-	  +dynamic fetchAppConfig();
-	  +dynamic fetchUser();
-	  +dynamic saveUser()
-	]
-	
-	[APIException
-	]
-	
-	[Exception]&lt;:--[APIException]
-	
-	[StudyNotFoundException
-	]
-	
-	[APIException]&lt;:-[StudyNotFoundException]
-	
-	[MeasurementNotFoundException
-	]
-	
-	[APIException]&lt;:-[MeasurementNotFoundException]
-	
-	[QuestionNotFoundException
-	]
-	
-	[APIException]&lt;:-[QuestionNotFoundException]
-	
-	[ConsentItemNotFoundException
-	]
-	
-	[APIException]&lt;:-[ConsentItemNotFoundException]
-	
-	[InterventionNotFoundException
-	]
-	
-	[APIException]&lt;:-[InterventionNotFoundException]
-	
-	[InterventionTaskNotFoundException
-	]
-	
-	[APIException]&lt;:-[InterventionTaskNotFoundException]
-	
-	[ReportNotFoundException
-	]
-	
-	[APIException]&lt;:-[ReportNotFoundException]
-	
-	[ReportSectionNotFoundException
-	]
-	
-	[APIException]&lt;:-[ReportSectionNotFoundException]
-	
-	[StudyInviteNotFoundException
-	]
-	
-	[APIException]&lt;:-[StudyInviteNotFoundException]
-	
-	[UserNotFoundException
-	]
-	
-	[APIException]&lt;:-[UserNotFoundException]
-	
-	[StudyUApiClient
-	  |
-	  +supabaseClient: SupabaseClient;
-	  &lt;static&gt;+studyColumns: List&lt;String&gt;;
-	  &lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;;
-	  +testDelayMilliseconds: int
-	  |
-	  +dynamic deleteParticipants();
-	  +dynamic getUserStudies();
-	  +dynamic fetchStudy();
-	  +dynamic deleteStudy();
-	  +dynamic saveStudy();
-	  +dynamic fetchStudyInvite();
-	  +dynamic saveStudyInvite();
-	  +dynamic deleteStudyInvite();
-	  +dynamic fetchAppConfig();
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  -dynamic _awaitGuarded();
-	  -dynamic _apiException();
-	  -dynamic _testDelay()
-	]
-	
-	[StudyUApiClient]o-[SupabaseClient]
-	[&lt;abstract&gt;SupabaseClientDependant]&lt;:-[StudyUApiClient]
-	[&lt;abstract&gt;SupabaseQueryMixin]&lt;:-[StudyUApiClient]
-	[&lt;abstract&gt;StudyUApi]&lt;:--[StudyUApiClient]
-	
-	[&lt;abstract&gt;IAppRepository
-	  |
-	  +dynamic fetchAppConfig();
-	  +void dispose()
-	]
-	
-	[AppRepository
-	  |
-	  +apiClient: StudyUApi
-	  |
-	  +dynamic fetchAppConfig();
-	  +void dispose()
-	]
-	
-	[AppRepository]o-[&lt;abstract&gt;StudyUApi]
-	[&lt;abstract&gt;IAppRepository]&lt;:--[AppRepository]
-	
-	[&lt;abstract&gt;IUserRepository
-	  |
-	  +user: StudyUUser
-	  |
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  +dynamic updatePreferences()
-	]
-	
-	[&lt;abstract&gt;IUserRepository]o-[StudyUUser]
-	
-	[UserRepository
-	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +ref: Ref&lt;Object?&gt;;
-	  +user: StudyUUser
-	  |
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  +dynamic updatePreferences()
-	]
-	
-	[UserRepository]o-[&lt;abstract&gt;StudyUApi]
-	[UserRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[UserRepository]o-[&lt;abstract&gt;Ref]
-	[UserRepository]o-[StudyUUser]
-	[&lt;abstract&gt;IUserRepository]&lt;:--[UserRepository]
-	
-	[PreferenceAction
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;PreferenceAction&gt;;
-	  &lt;static&gt;+pin: PreferenceAction;
-	  &lt;static&gt;+pinOff: PreferenceAction
-	]
-	
-	[PreferenceAction]o-[PreferenceAction]
-	[Enum]&lt;:--[PreferenceAction]
-	
-	[&lt;abstract&gt;IAuthRepository
-	  |
-	  +allowPasswordReset: bool;
-	  +currentUser: User?;
-	  +isLoggedIn: bool;
-	  +session: Session?;
-	  +serializedSession: String?
-	  |
-	  +dynamic signUp();
-	  +dynamic signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic updateUser();
-	  +void dispose()
-	]
-	
-	[&lt;abstract&gt;IAuthRepository]o-[User]
-	[&lt;abstract&gt;IAuthRepository]o-[Session]
-	[&lt;abstract&gt;IAppDelegate]&lt;:-[&lt;abstract&gt;IAuthRepository]
-	
-	[AuthRepository
-	  |
-	  +supabaseClient: SupabaseClient;
-	  +allowPasswordReset: bool;
-	  +authClient: GoTrueClient;
-	  +session: Session?;
-	  +serializedSession: String?;
-	  +currentUser: User?;
-	  +isLoggedIn: bool
-	  |
-	  -void _registerAuthListener();
-	  +dynamic signUp();
-	  +dynamic signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic updateUser();
-	  +void dispose();
-	  +dynamic onAppStart()
-	]
-	
-	[AuthRepository]o-[SupabaseClient]
-	[AuthRepository]o-[GoTrueClient]
-	[AuthRepository]o-[Session]
-	[AuthRepository]o-[User]
-	[&lt;abstract&gt;IAuthRepository]&lt;:--[AuthRepository]
-	
-	[StudyLaunched
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[StudyLaunched]
-	
-	[&lt;abstract&gt;SupabaseClientDependant
-	  |
-	  +supabaseClient: SupabaseClient
-	]
-	
-	[&lt;abstract&gt;SupabaseClientDependant]o-[SupabaseClient]
-	
-	[SupabaseQueryError
-	  |
-	  +statusCode: String?;
-	  +message: String;
-	  +details: dynamic
-	]
-	
-	[Exception]&lt;:--[SupabaseQueryError]
-	
-	[&lt;abstract&gt;SupabaseQueryMixin
-	  |
-	  +dynamic deleteAll();
-	  +dynamic getAll();
-	  +dynamic getById();
-	  +dynamic getByColumn();
-	  +List&lt;T&gt; deserializeList();
-	  +T deserializeObject()
-	]
-	
-	[WrappedModel
-	  |
-	  -_model: T;
-	  +asyncValue: AsyncValue&lt;T&gt;;
-	  +isLocalOnly: bool;
-	  +isDirty: bool;
-	  +isDeleted: bool;
-	  +lastSaved: DateTime?;
-	  +lastFetched: DateTime?;
-	  +lastUpdated: DateTime?;
-	  +model: T
-	  |
-	  +dynamic markWithError();
-	  +dynamic markAsLoading();
-	  +dynamic markAsFetched();
-	  +dynamic markAsSaved()
-	]
-	
-	[WrappedModel]o-[&lt;abstract&gt;AsyncValue]
-	
-	[ModelRepositoryException
-	]
-	
-	[Exception]&lt;:--[ModelRepositoryException]
-	
-	[ModelNotFoundException
-	]
-	
-	[ModelRepositoryException]&lt;:--[ModelNotFoundException]
-	
-	[&lt;abstract&gt;IModelRepository
-	  |
-	  +String getKey();
-	  +WrappedModel&lt;T&gt;? get();
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic duplicateAndSave();
-	  +dynamic duplicateAndSaveFromRemote();
-	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
-	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
-	  +dynamic ensurePersisted();
-	  +void dispose()
-	]
-	
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[&lt;abstract&gt;IModelRepository]
-	
-	[&lt;abstract&gt;IModelRepositoryDelegate
-	  |
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +T createNewInstance();
-	  +T createDuplicate();
-	  +dynamic onError()
-	]
-	
-	[&lt;abstract&gt;ModelRepository
-	  |
-	  +delegate: IModelRepositoryDelegate&lt;T&gt;;
-	  -_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;;
-	  -_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;;
-	  +modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;;
-	  +modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;;
-	  -_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;
-	  |
-	  +WrappedModel&lt;T&gt;? get();
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic duplicateAndSave();
-	  +dynamic duplicateAndSaveFromRemote();
-	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
-	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
-	  -dynamic _buildModelSpecificController();
-	  +dynamic ensurePersisted();
-	  +WrappedModel&lt;T&gt; upsertLocally();
-	  +List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally();
-	  +dynamic emitUpdate();
-	  +dynamic emitModelEvent();
-	  +dynamic emitError();
-	  +void dispose();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
-	]
-	
-	[&lt;abstract&gt;ModelRepository]o-[&lt;abstract&gt;IModelRepositoryDelegate]
-	[&lt;abstract&gt;ModelRepository]o-[BehaviorSubject]
-	[&lt;abstract&gt;IModelRepository]&lt;:-[&lt;abstract&gt;ModelRepository]
-	
-	[&lt;abstract&gt;ModelEvent
-	  |
-	  +modelId: String;
-	  +model: T
-	]
-	
-	[IsFetched
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsFetched]
-	
-	[IsSaving
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaving]
-	
-	[IsSaved
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaved]
-	
-	[IsDeleted
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsDeleted]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="4748.0" width="84279.3" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M25639.0 158.2 L25380.5 293 L25380.5 591 L25380.5 591.0 " fill="none"></path>
-					<path d="M25641.4 162.9 L25639.0 158.2 L25636.5 153.4 L25650.8 152.0 Z"></path>
-					<path d="M25680.5 165.3 L25680.5 293 L25680.5 591 L25680.5 591.0 " fill="none"></path>
-					<path d="M25685.8 165.3 L25680.5 165.3 L25675.2 165.3 L25680.5 152.0 Z"></path>
-					<path d="M207.0 2704.7 L207 3314 L64938 3500.41216617898 L64938.0 3500.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M212.3 2695.3 L207.0 2704.7 L201.7 2695.3 L207.0 2686.0 Z"></path>
-					</g>
-					<path d="M442.9 3408.2 L456 3402 L463.5 3402 L463.5 3402 L471 3500.5 L471 3500.5 L463.5 3599 L463.5 3599 L456 3599 L456 3599 L426 3584.8612440191387 L426.0 3584.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M432.2 3407.3 L442.9 3408.2 L436.7 3417.0 L426.0 3416.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3061.8 2635.5 L247 3314 L247 3402 L247.0 3402.0 " fill="none"></path>
-					</g>
-					<path d="M3063.0 2640.7 L3061.8 2635.5 L3060.5 2630.3 L3074.8 2632.4 Z"></path>
-					<path d="M3821.2 2726.9 L3721.5 3314 L3470.9490616621983 3469.5 L3470.9 3469.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3828.0 2718.6 L3821.2 2726.9 L3817.5 2716.8 L3824.3 2708.5 Z"></path>
-					</g>
-					<path d="M3864.1 2726.6 L4012.25 3314 L3725.0348525469167 3454.5 L3725.0 3454.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3867.0 2716.2 L3864.1 2726.6 L3856.7 2718.9 L3859.6 2708.5 Z"></path>
-					</g>
-					<path d="M1867.5 3550.2 L1867.5 3687 L1867.5 3797.5 L1867.5 3797.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1872.8 3540.8 L1867.5 3550.2 L1862.2 3540.8 L1867.5 3531.5 Z"></path>
-					</g>
-					<path d="M60380.8 3931.2 L60380.75 4000 L62172 4128.787391012743 L62172.0 4128.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M60386.1 3921.8 L60380.8 3931.2 L60375.4 3921.8 L60380.8 3912.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M60380.8 3567.3 L60380.75 3687 L60380.75 3774.5 L60380.8 3774.5 " fill="none"></path>
-					</g>
-					<path d="M60386.1 3567.3 L60380.8 3567.3 L60375.4 3567.3 L60380.8 3554.0 Z"></path>
-					<path d="M4202.1 2719.6 L4052.25 3314 L21428.75 3500.11975936136 L21428.8 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4209.6 2711.9 L4202.1 2719.6 L4199.3 2709.2 L4206.7 2701.5 Z"></path>
-					</g>
-					<path d="M4207.6 2719.8 L4092.25 3314 L25696 3500.1252295326194 L25696.0 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4214.6 2711.7 L4207.6 2719.8 L4204.1 2709.6 L4211.1 2701.5 Z"></path>
-					</g>
-					<path d="M4213.1 2720.0 L4132.25 3314 L1634 3489.1098844310814 L1634.0 3489.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4219.6 2711.5 L4213.1 2720.0 L4209.0 2710.0 L4215.6 2701.5 Z"></path>
-					</g>
-					<path d="M1867.5 3908.2 L1867.5 4000 L6731 4131.738225186982 L6731.0 4131.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1872.8 3898.8 L1867.5 3908.2 L1862.2 3898.8 L1867.5 3889.5 Z"></path>
-					</g>
-					<path d="M4336.6 2709.6 L5127 3314 L3489 3493.0662368112544 L3489.0 3493.1 " fill="none"></path>
-					<path d="M4339.9 2705.4 L4336.6 2709.6 L4333.4 2713.8 L4326.0 2701.5 Z"></path>
-					<path d="M4361.7 2708.5 L5345.75 3314 L3733 3489.406254556058 L3733.0 3489.4 " fill="none"></path>
-					<path d="M4364.5 2703.9 L4361.7 2708.5 L4358.9 2713.0 L4350.3 2701.5 Z"></path>
-					<path d="M1651.8 3443.4 L1664 3439.5 L1671.5 3439.5 L1671.5 3439.5 L1679 3500.5 L1679 3500.5 L1671.5 3561.5 L1671.5 3561.5 L1664 3561.5 L1664 3561.5 L1634 3551.9935064935066 L1634.0 3552.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1641.3 3441.1 L1651.8 3443.4 L1644.5 3451.3 L1634.0 3449.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3062.1 2639.2 L1016 3314 L1322.5160857908847 3439.5 L1322.5 3439.5 " fill="none"></path>
-					</g>
-					<path d="M3063.8 2644.3 L3062.1 2639.2 L3060.4 2634.2 L3074.8 2635.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M26202.5 180.8 L26202.5 293 L26202.5 598.5 L26202.5 598.5 " fill="none"></path>
-					</g>
-					<path d="M26207.8 180.8 L26202.5 180.8 L26197.2 180.8 L26202.5 167.5 Z"></path>
-					<path d="M5521.4 2704.2 L5385.75 3314 L21428.75 3500.0882234039245 L21428.8 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5528.6 2696.3 L5521.4 2704.2 L5518.2 2694.0 L5525.4 2686.0 Z"></path>
-					</g>
-					<path d="M5550.0 2704.5 L5634.25 3314 L3935 3492.01439404578 L3935.0 3492.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5554.0 2694.5 L5550.0 2704.5 L5543.4 2696.0 L5547.4 2686.0 Z"></path>
-					</g>
-					<path d="M5903.4 2742.1 L5756.25 3314 L32617.5 3500.1223679444192 L32617.5 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5910.9 2734.4 L5903.4 2742.1 L5900.5 2731.7 L5908.0 2724.0 Z"></path>
-					</g>
-					<path d="M5910.1 2742.3 L5796.25 3314 L28098.25 3499.8084878266695 L28098.3 3499.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5917.2 2734.2 L5910.1 2742.3 L5906.7 2732.1 L5913.8 2724.0 Z"></path>
-					</g>
-					<path d="M5916.9 2742.5 L5836.25 3314 L4279.141420911528 3485 L4279.1 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5923.5 2734.0 L5916.9 2742.5 L5912.9 2732.5 L5919.5 2724.0 Z"></path>
-					</g>
-					<path d="M5964.6 2742.0 L6116.5 3314 L4507 3491.3540620384047 L4507.0 3491.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5967.3 2731.7 L5964.6 2742.0 L5957.0 2734.4 L5959.8 2724.0 Z"></path>
-					</g>
-					<path d="M6421.6 2719.4 L6246 3314 L23930.25 3499.7751468041065 L23930.3 3499.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6429.4 2712.0 L6421.6 2719.4 L6419.1 2708.9 L6426.9 2701.5 Z"></path>
-					</g>
-					<path d="M6427.0 2719.7 L6286 3314 L10158 3498.3809523809523 L10158.0 3498.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6434.4 2711.8 L6427.0 2719.7 L6424.0 2709.3 L6431.3 2701.5 Z"></path>
-					</g>
-					<path d="M6455.0 2720.1 L6489.5 3314 L4869.813672922252 3485 L4869.8 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6459.8 2710.5 L6455.0 2720.1 L6449.2 2711.1 L6453.9 2701.5 Z"></path>
-					</g>
-					<path d="M6950.0 2772.0 L6801.75 3314 L21539.75 3500.133744159274 L21539.8 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6957.6 2764.4 L6950.0 2772.0 L6947.4 2761.6 L6955.0 2754.0 Z"></path>
-					</g>
-					<path d="M6958.5 2772.2 L6841.75 3314 L5712.25 3496.5405112651647 L5712.3 3496.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6965.7 2764.2 L6958.5 2772.2 L6955.3 2762.0 L6962.4 2754.0 Z"></path>
-					</g>
-					<path d="M7010.7 2772.5 L7086 3314 L5926.25 3487.485762983758 L5926.3 3487.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7014.7 2762.5 L7010.7 2772.5 L7004.2 2764.0 L7008.2 2754.0 Z"></path>
-					</g>
-					<path d="M7388.9 2697.0 L7319.5 3314 L6176.367292225201 3485 L6176.4 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7395.2 2688.4 L7388.9 2697.0 L7384.6 2687.2 L7391.0 2678.5 Z"></path>
-					</g>
-					<path d="M7412.2 2696.8 L7543.25 3314 L36070.5 3499.6604449291167 L36070.5 3499.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7415.5 2686.5 L7412.2 2696.8 L7405.1 2688.7 L7408.4 2678.5 Z"></path>
-					</g>
-					<path d="M36199.5 3550.2 L36199.5 3687 L36199.5 3828 L36199.5 3828.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36204.8 3540.8 L36199.5 3550.2 L36194.2 3540.8 L36199.5 3531.5 Z"></path>
-					</g>
-					<path d="M7729.5 2712.2 L7729.5 3314 L21428.75 3500.017956278782 L21428.8 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7734.8 2702.8 L7729.5 2712.2 L7724.2 2702.8 L7729.5 2693.5 Z"></path>
-					</g>
-					<path d="M7999.1 2734.9 L7894.25 3314 L21428.75 3500.0121039056744 L21428.8 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8006.0 2726.6 L7999.1 2734.9 L7995.5 2724.7 L8002.4 2716.5 Z"></path>
-					</g>
-					<path d="M8043.7 2734.7 L8174 3314 L12912 3497.861215147732 L12912.0 3497.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8046.8 2724.4 L8043.7 2734.7 L8036.4 2726.8 L8039.6 2716.5 Z"></path>
-					</g>
-					<path d="M8339.4 2756.7 L8214 3314 L25696 3500.0370888134435 L25696.0 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8346.6 2748.8 L8339.4 2756.7 L8336.2 2746.4 L8343.5 2738.5 Z"></path>
-					</g>
-					<path d="M8350.6 2757.0 L8273 3314 L8273 3500.5 L8273 3500.5 L8273 3687 L8273 3687 L8273 3843.5 L8273 3843.5 L8273 4000 L8273 4000 L18277.25 4133.042500930405 L18277.3 4133.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8357.2 2748.5 L8350.6 2757.0 L8346.6 2747.0 L8353.2 2738.5 Z"></path>
-					</g>
-					<path d="M8358.3 2757.1 L8313 3314 L11377.75 3495.2656386268136 L11377.8 3495.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8364.3 2748.2 L8358.3 2757.1 L8353.7 2747.4 L8359.8 2738.5 Z"></path>
-					</g>
-					<path d="M8365.9 2757.2 L8353 3314 L13098.75 3498.4594122857293 L13098.8 3498.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8371.5 2748.0 L8365.9 2757.2 L8360.8 2747.7 L8366.4 2738.5 Z"></path>
-					</g>
-					<path d="M8388.0 2757.0 L8468 3314 L8468 3485 L8468.0 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8391.9 2747.0 L8388.0 2757.0 L8381.4 2748.5 L8385.3 2738.5 Z"></path>
-					</g>
-					<path d="M8751.4 2719.5 L8666 3314 L8666 3485 L8666.0 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8758.0 2711.0 L8751.4 2719.5 L8747.5 2709.5 L8754.1 2701.0 Z"></path>
-					</g>
-					<path d="M8823.5 2716.7 L9204.5 3314 L10158 3492.184118236473 L10158.0 3492.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8823.0 2706.0 L8823.5 2716.7 L8814.0 2711.7 L8813.5 2701.0 Z"></path>
-					</g>
-					<path d="M8828.6 2716.3 L9244.5 3314 L21428.75 3499.958192679883 L21428.8 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8827.6 2705.6 L8828.6 2716.3 L8818.8 2711.7 L8817.9 2701.0 Z"></path>
-					</g>
-					<path d="M8833.5 2715.9 L9284.5 3314 L23930.25 3499.625469341987 L23930.3 3499.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8832.2 2705.2 L8833.5 2715.9 L8823.7 2711.7 L8822.3 2701.0 Z"></path>
-					</g>
-					<path d="M8840.8 2715.3 L9343.5 3314 L6811 3487.8035878564856 L6811.0 3487.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8838.9 2704.7 L8840.8 2715.3 L8830.7 2711.6 L8828.8 2701.0 Z"></path>
-					</g>
-					<path d="M9547.0 2719.5 L9383.5 3314 L21428.75 3499.9519586946176 L21428.8 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9554.6 2711.9 L9547.0 2719.5 L9544.3 2709.1 L9552.0 2701.5 Z"></path>
-					</g>
-					<path d="M9567.5 2720.1 L9533.25 3314 L6811 3488.6322555679767 L6811.0 3488.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9573.4 2711.1 L9567.5 2720.1 L9562.7 2710.5 L9568.6 2701.5 Z"></path>
-					</g>
-					<path d="M9593.6 2719.7 L9722.75 3314 L10162.628016085791 3485 L10162.6 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9596.8 2709.5 L9593.6 2719.7 L9586.4 2711.8 L9589.6 2701.5 Z"></path>
-					</g>
-					<path d="M9912.5 2720.2 L9912.5 3314 L10178.398123324398 3485 L10178.4 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9917.8 2710.8 L9912.5 2720.2 L9907.2 2710.8 L9912.5 2701.5 Z"></path>
-					</g>
-					<path d="M10361.5 2712.7 L10344 3314 L10214.260053619302 3485 L10214.3 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10367.1 2703.5 L10361.5 2712.7 L10356.4 2703.2 L10362.0 2694.0 Z"></path>
-					</g>
-					<path d="M10380.8 2712.3 L10496.25 3314 L6811 3491.585201214392 L6811.0 3491.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10384.2 2702.2 L10380.8 2712.3 L10373.8 2704.2 L10377.2 2694.0 Z"></path>
-					</g>
-					<path d="M6829.6 3490.1 L7672.1666666666715 3447 L7887.4583333333285 3447 L7887.4583333333285 3447 L8102.75 3500.5 L8102.75 3500.5 L7887.4583333333285 3554 L7887.4583333333285 3554 L7672.1666666666715 3554 L7672.1666666666715 3554 L6811 3509.9607296479207 L6811.0 3510.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6820.0 3485.2 L6829.6 3490.1 L6820.6 3495.9 L6811.0 3491.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3062.1 2639.5 L1056 3314 L6441 3494.30565529623 L6441.0 3494.3 " fill="none"></path>
-					</g>
-					<path d="M3063.8 2644.6 L3062.1 2639.5 L3060.4 2634.4 L3074.8 2635.3 Z"></path>
-					<path d="M15730.5 3916.2 L15730.5 4000 L18277.25 4130.315799522673 L18277.3 4130.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15735.8 3906.8 L15730.5 3916.2 L15725.2 3906.8 L15730.5 3897.5 Z"></path>
-					</g>
-					<path d="M10640.2 2772.3 L10536.25 3314 L25696 3499.966380543634 L25696.0 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10647.2 2764.2 L10640.2 2772.3 L10636.7 2762.2 L10643.7 2754.0 Z"></path>
-					</g>
-					<path d="M10658.9 2772.6 L10623.75 3314 L21539.75 3500.0058474189127 L21539.8 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10664.8 2763.7 L10658.9 2772.6 L10654.2 2763.0 L10660.1 2754.0 Z"></path>
-					</g>
-					<path d="M10667.5 2772.7 L10663.75 3314 L24426 3498.568782022472 L24426.0 3498.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10672.9 2763.4 L10667.5 2772.7 L10662.2 2763.3 L10667.6 2754.0 Z"></path>
-					</g>
-					<path d="M10676.1 2772.6 L10703.75 3314 L13098.75 3496.49948927477 L13098.8 3496.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10680.9 2763.0 L10676.1 2772.6 L10670.3 2763.6 L10675.1 2754.0 Z"></path>
-					</g>
-					<path d="M10695.8 2772.4 L10796 3314 L10247 3486.5164279696714 L10247.0 3486.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10699.3 2762.2 L10695.8 2772.4 L10688.8 2764.1 L10692.4 2754.0 Z"></path>
-					</g>
-					<path d="M24731.4 3437.0 L24744 3432 L24751.5 3432 L24751.5 3432 L24759 3500.5 L24759 3500.5 L24751.5 3569 L24751.5 3569 L24744 3569 L24744 3569 L24714 3557.189655172414 L24714.0 3557.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24720.7 3435.4 L24731.4 3437.0 L24724.6 3445.4 L24714.0 3443.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3062.1 2639.8 L1096 3314 L24426 3499.355925705035 L24426.0 3499.4 " fill="none"></path>
-					</g>
-					<path d="M3063.9 2644.8 L3062.1 2639.8 L3060.4 2634.7 L3074.8 2635.5 Z"></path>
-					<path d="M10934.8 2779.9 L10836 3314 L21428.75 3499.877061134241 L21428.8 3499.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10941.8 2771.6 L10934.8 2779.9 L10931.3 2769.7 L10938.2 2761.5 Z"></path>
-					</g>
-					<path d="M10960.4 2780.2 L10949.75 3314 L21539.75 3499.990677088238 L21539.8 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10965.9 2770.9 L10960.4 2780.2 L10955.3 2770.7 L10960.8 2761.5 Z"></path>
-					</g>
-					<path d="M10989.1 2779.9 L11077.25 3314 L13098.75 3495.779050144648 L13098.8 3495.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10992.8 2769.8 L10989.1 2779.9 L10982.3 2771.6 L10986.0 2761.5 Z"></path>
-					</g>
-					<path d="M11231.0 2704.7 L11231 3314 L32617.5 3500.025943286227 L32617.5 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11236.3 2695.3 L11231.0 2704.7 L11225.7 2695.3 L11231.0 2686.0 Z"></path>
-					</g>
-					<path d="M11503.9 2734.4 L11397.5 3314 L21428.75 3499.8423150470608 L21428.8 3499.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11510.9 2726.1 L11503.9 2734.4 L11500.4 2724.2 L11507.3 2716.0 Z"></path>
-					</g>
-					<path d="M11520.8 2734.7 L11503.75 3314 L5233 3496.2281757625337 L5233.0 3496.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11526.4 2725.5 L11520.8 2734.7 L11515.7 2725.2 L11521.3 2716.0 Z"></path>
-					</g>
-					<path d="M11527.1 2734.7 L11543.75 3314 L13098.75 3494.4090202177294 L13098.8 3494.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11532.2 2725.2 L11527.1 2734.7 L11521.5 2725.5 L11526.6 2716.0 Z"></path>
-					</g>
-					<path d="M11544.0 2734.4 L11650.25 3314 L11481.542225201072 3485 L11481.5 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11547.6 2724.2 L11544.0 2734.4 L11537.1 2726.1 L11540.7 2716.0 Z"></path>
-					</g>
-					<path d="M5250.6 3443.8 L5263 3439.5 L5270.5 3439.5 L5270.5 3439.5 L5278 3500.5 L5278 3500.5 L5270.5 3561.5 L5270.5 3561.5 L5263 3561.5 L5263 3561.5 L5233 3551.1610169491523 L5233.0 3551.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5240.1 3441.8 L5250.6 3443.8 L5243.6 3451.8 L5233.0 3449.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3096.2 2653.2 L2883.25 3314 L4939 3488.0539666326185 L4939.0 3488.1 " fill="none"></path>
-					</g>
-					<path d="M3101.2 2654.8 L3096.2 2653.2 L3091.1 2651.6 L3100.3 2640.5 Z"></path>
-					<path d="M27178.1 175.9 L26468 293 L26468 614 L26468.0 614.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M27188.2 179.6 L27178.1 175.9 L27186.4 169.1 L27196.5 172.9 Z"></path>
-					</g>
-					<path d="M27417.0 208.7 L27417 293 L27417 614 L27417.0 614.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M27422.3 199.3 L27417.0 208.7 L27411.7 199.3 L27417.0 190.0 Z"></path>
-					</g>
-					<path d="M62263.5 1761.7 L62015.25 1936 L44706.5 2619.1390253333143 L44706.5 2619.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M62274.2 1760.7 L62263.5 1761.7 L62268.1 1752.0 L62278.8 1751.0 Z"></path>
-					</g>
-					<path d="M12149.5 2771.4 L11985.25 3314 L11753.276809651474 3485 L11753.3 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12157.3 2764.0 L12149.5 2771.4 L12147.1 2760.9 L12154.9 2753.5 Z"></path>
-					</g>
-					<path d="M12170.3 2771.9 L12084 3314 L21539.75 3499.9297688394527 L21539.8 3499.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12177.1 2763.6 L12170.3 2771.9 L12166.5 2761.9 L12173.3 2753.5 Z"></path>
-					</g>
-					<path d="M12191.4 2772.2 L12182.75 3314 L11950.776809651474 3485 L11950.8 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12196.9 2762.9 L12191.4 2772.2 L12186.2 2762.7 L12191.7 2753.5 Z"></path>
-					</g>
-					<path d="M12214.8 2772.0 L12292.5 3314 L13098.75 3489.098253275109 L13098.8 3489.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12218.8 2762.0 L12214.8 2772.0 L12208.2 2763.5 L12212.2 2753.5 Z"></path>
-					</g>
-					<path d="M12238.0 2771.4 L12402.25 3314 L12170.276809651474 3485 L12170.3 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12240.4 2760.9 L12238.0 2771.4 L12230.2 2764.0 L12232.6 2753.5 Z"></path>
-					</g>
-					<path d="M62174.3 2674.7 L62174.25 3314 L48870 3498.722784715889 L48870.0 3498.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M62179.6 2665.3 L62174.3 2674.7 L62168.9 2665.3 L62174.3 2656.0 Z"></path>
-					</g>
-					<path d="M62306.4 1761.6 L62174.25 1936 L62174.25 2594 L62174.3 2594.0 " fill="none"></path>
-					<path d="M62310.7 1764.8 L62306.4 1761.6 L62302.2 1758.4 L62314.5 1751.0 Z"></path>
-					<path d="M12861.0 2749.3 L12748.5 3314 L21428.75 3499.7403694461177 L21428.8 3499.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12868.0 2741.2 L12861.0 2749.3 L12857.6 2739.1 L12864.6 2731.0 Z"></path>
-					</g>
-					<path d="M12885.7 2749.7 L12885.5 3314 L13129.163538873994 3485 L13129.2 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12891.0 2740.3 L12885.7 2749.7 L12880.4 2740.3 L12885.7 2731.0 Z"></path>
-					</g>
-					<path d="M12910.5 2749.3 L13022.75 3314 L19573.75 3497.4063649328227 L19573.8 3497.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12913.9 2739.1 L12910.5 2749.3 L12903.4 2741.2 L12906.8 2731.0 Z"></path>
-					</g>
-					<path d="M62535.8 2674.7 L62535.75 3314 L28264.25 3500.0494185623425 L28264.3 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M62541.1 2665.3 L62535.8 2674.7 L62530.4 2665.3 L62535.8 2656.0 Z"></path>
-					</g>
-					<path d="M62403.6 1761.6 L62535.75 1936 L62535.75 2594 L62535.8 2594.0 " fill="none"></path>
-					<path d="M62407.8 1758.4 L62403.6 1761.6 L62399.3 1764.8 L62395.5 1751.0 Z"></path>
-					<path d="M13767.1 2727.4 L13675.75 3314 L25696 3499.82751010258 L25696.0 3499.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13773.8 2719.0 L13767.1 2727.4 L13763.2 2717.4 L13769.9 2709.0 Z"></path>
-					</g>
-					<path d="M13799.0 2727.4 L13890.5 3314 L21428.75 3499.6258293447763 L21428.8 3499.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13802.8 2717.4 L13799.0 2727.4 L13792.3 2719.0 L13796.1 2709.0 Z"></path>
-					</g>
-					<path d="M28000.5 717.2 L28000.5 966 L28000.5 1197 L28000.5 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28005.8 707.8 L28000.5 717.2 L27995.2 707.8 L28000.5 698.5 Z"></path>
-					</g>
-					<path d="M28000.5 165.3 L28000.5 293 L28000.5 560.5 L28000.5 560.5 " fill="none"></path>
-					<path d="M28005.8 165.3 L28000.5 165.3 L27995.2 165.3 L28000.5 152.0 Z"></path>
-					<path d="M16003.2 3938.7 L15927.5 4000 L18277.25 4130.016104056984 L18277.3 4130.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16013.9 3937.0 L16003.2 3938.7 L16007.1 3928.7 L16017.8 3927.0 Z"></path>
-					</g>
-					<path d="M16026.0 3940.3 L15967.5 4000 L6118.75 4132.042572350484 L6118.8 4132.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16036.4 3937.4 L16026.0 3940.3 L16028.8 3929.9 L16039.1 3927.0 Z"></path>
-					</g>
-					<path d="M16141.3 3945.3 L16152.25 4000 L6445.75 4132.047817258884 L6445.8 4132.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16144.7 3935.1 L16141.3 3945.3 L16134.3 3937.2 L16137.7 3927.0 Z"></path>
-					</g>
-					<path d="M16166.7 3944.0 L16192.25 4000 L14241 4125.208906979528 L14241.0 4125.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16167.7 3933.3 L16166.7 3944.0 L16158.0 3937.7 L16159.0 3927.0 Z"></path>
-					</g>
-					<path d="M16256.2 3937.7 L16345.75 4000 L14461 4127.892897835169 L14461.0 4127.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16251.6 3928.0 L16256.2 3937.7 L16245.5 3936.7 L16240.9 3927.0 Z"></path>
-					</g>
-					<path d="M36524.0 165.3 L36524 293 L36524 614 L36524.0 614.0 " fill="none"></path>
-					<path d="M36529.3 165.3 L36524.0 165.3 L36518.7 165.3 L36524.0 152.0 Z"></path>
-					<path d="M14038.0 2712.7 L14038 3314 L10247 3498.3362012775387 L10247.0 3498.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14043.3 2703.3 L14038.0 2712.7 L14032.7 2703.3 L14038.0 2694.0 Z"></path>
-					</g>
-					<path d="M36920.5 165.3 L36920.5 293 L36920.5 614 L36920.5 614.0 " fill="none"></path>
-					<path d="M36925.8 165.3 L36920.5 165.3 L36915.2 165.3 L36920.5 152.0 Z"></path>
-					<path d="M9187.0 3450.3 L9199 3447 L9206.5 3447 L9206.5 3447 L9214 3500.5 L9214 3500.5 L9206.5 3554 L9206.5 3554 L9199 3554 L9199 3554 L9169 3545.769230769231 L9169.0 3545.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9176.6 3447.6 L9187.0 3450.3 L9179.4 3457.9 L9169.0 3455.2 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3097.8 2653.4 L2923.25 3314 L8839 3495.439357809481 L8839.0 3495.4 " fill="none"></path>
-					</g>
-					<path d="M3102.9 2654.8 L3097.8 2653.4 L3092.6 2652.0 L3101.2 2640.5 Z"></path>
-					<path d="M14331.0 2697.7 L14331 3314 L11554.75 3494.7385024871282 L11554.8 3494.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14336.3 2688.3 L14331.0 2697.7 L14325.7 2688.3 L14331.0 2679.0 Z"></path>
-					</g>
-					<path d="M29232.9 1213.9 L13364.5 1459 L13364.5 1651 L13364.5 1651.0 " fill="none"></path>
-					<path d="M29233.0 1219.2 L29232.9 1213.9 L29232.8 1208.5 L29246.3 1213.7 Z"></path>
-					<path d="M16534.0 3908.7 L16534 4000 L18277.25 4128.685029610247 L18277.3 4128.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16539.3 3899.3 L16534.0 3908.7 L16528.7 3899.3 L16534.0 3890.0 Z"></path>
-					</g>
-					<path d="M14698.6 2742.1 L14550 3314 L13048 3492.4222929936304 L13048.0 3492.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14706.1 2734.4 L14698.6 2742.1 L14695.8 2731.7 L14703.3 2724.0 Z"></path>
-					</g>
-					<path d="M14830.3 2737.9 L15347 3314 L21428.75 3499.4176917732643 L21428.8 3499.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14828.0 2727.4 L14830.3 2737.9 L14820.1 2734.5 L14817.8 2724.0 Z"></path>
-					</g>
-					<path d="M14857.6 2736.2 L15526 3314 L13203.75 3496.3769344141488 L13203.8 3496.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14854.1 2726.1 L14857.6 2736.2 L14847.1 2734.1 L14843.5 2724.0 Z"></path>
-					</g>
-					<path d="M27476.2 3435.4 L27488.25 3432 L27495.75 3432 L27495.75 3432 L27503.25 3500.5 L27503.25 3500.5 L27495.75 3569 L27495.75 3569 L27488.25 3569 L27488.25 3569 L27458.25 3560.543209876543 L27458.3 3560.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M27465.8 3432.8 L27476.2 3435.4 L27468.7 3443.1 L27458.3 3440.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3099.4 2653.6 L2963.25 3314 L27032.25 3498.8640350877195 L27032.3 3498.9 " fill="none"></path>
-					</g>
-					<path d="M3104.6 2654.6 L3099.4 2653.6 L3094.1 2652.5 L3102.1 2640.5 Z"></path>
-					<path d="M15697.2 2749.2 L15566 3314 L15566 3500.5 L15566 3500.5 L15566 3687 L15566 3687 L15566 3843.5 L15566 3843.5 L15566 4000 L15566 4000 L18277.25 4130.53354890865 L18277.3 4130.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15704.5 2741.3 L15697.2 2749.2 L15694.1 2738.9 L15701.4 2731.0 Z"></path>
-					</g>
-					<path d="M15853.9 2685.5 L17183 3314 L21539.75 3499.266801573277 L21539.8 3499.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15847.7 2676.7 L15853.9 2685.5 L15843.2 2686.3 L15837.0 2677.5 Z"></path>
-					</g>
-					<path d="M15854.0 2683.9 L17223 3314 L10247 3499.317854853643 L10247.0 3499.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15847.7 2675.1 L15854.0 2683.9 L15843.2 2684.8 L15837.0 2676.1 Z"></path>
-					</g>
-					<path d="M15854.2 2679.0 L17363 3314 L25696 3499.531486897869 L25696.0 3499.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15847.7 2670.4 L15854.2 2679.0 L15843.5 2680.3 L15837.0 2671.7 Z"></path>
-					</g>
-					<path d="M21716.1 2711.9 L21623.25 3314 L24211.25 3494.738438494664 L24211.3 3494.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21722.8 2703.5 L21716.1 2711.9 L21712.2 2701.9 L21718.9 2693.5 Z"></path>
-					</g>
-					<path d="M21738.6 2712.1 L21801.25 3314 L21492.258042895442 3485 L21492.3 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21742.9 2702.2 L21738.6 2712.1 L21732.3 2703.3 L21736.6 2693.5 Z"></path>
-					</g>
-					<path d="M19853.4 1762.6 L18888.25 1936 L18888.25 2625 L18888.25 2625 L18888.25 3314 L18888.25 3314 L25512 3498.494548780943 L25512.0 3498.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19863.5 1766.2 L19853.4 1762.6 L19861.6 1755.7 L19871.8 1759.3 Z"></path>
-					</g>
-					<path d="M19853.5 1776.3 L19118.75 1936 L19118.75 2609.5 L19118.8 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19863.8 1779.5 L19853.5 1776.3 L19861.5 1769.1 L19871.8 1772.3 Z"></path>
-					</g>
-					<path d="M19853.8 1797.1 L19349.25 1936 L19349.25 2625 L19349.25 2625 L19349.25 3314 L19349.25 3314 L9169 3497.525446460936 L9169.0 3497.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19864.2 1799.8 L19853.8 1797.1 L19861.3 1789.5 L19871.8 1792.2 Z"></path>
-					</g>
-					<path d="M19854.0 1813.1 L19469.25 1936 L19469.25 2609.5 L19469.3 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19864.5 1815.3 L19854.0 1813.1 L19861.2 1805.2 L19871.8 1807.4 Z"></path>
-					</g>
-					<path d="M19900.2 1903.7 L19850.75 1936 L19850.75 2609.5 L19850.8 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19910.9 1903.1 L19900.2 1903.7 L19905.1 1894.1 L19915.8 1893.5 Z"></path>
-					</g>
-					<path d="M20578.2 1754.6 L21729.5 1936 L21729.5 2556.5 L21729.5 2556.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20569.8 1747.9 L20578.2 1754.6 L20568.1 1758.4 L20559.8 1751.7 Z"></path>
-					</g>
-					<path d="M20578.2 1748.4 L21913 1936 L21913 2625 L21913 2625 L21913 3314 L21913 3314 L19794.75 3491.253449242849 L19794.8 3491.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20569.7 1741.9 L20578.2 1748.4 L20568.3 1752.4 L20559.8 1745.8 Z"></path>
-					</g>
-					<path d="M20578.2 1747.3 L21953 1936 L21953 2625 L21953 2625 L21953 3314 L21953 3314 L21499.75 3486.9537084398976 L21499.8 3487.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20569.7 1740.7 L20578.2 1747.3 L20568.3 1751.3 L20559.8 1744.7 Z"></path>
-					</g>
-					<path d="M20578.3 1746.1 L21993 1936 L21993 2625 L21993 2625 L21993 3314 L21993 3314 L10068 3497.7799033177707 L10068.0 3497.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20569.7 1739.6 L20578.3 1746.1 L20568.3 1750.2 L20559.8 1743.7 Z"></path>
-					</g>
-					<path d="M10086.1 3450.1 L10098 3447 L10105.5 3447 L10105.5 3447 L10113 3500.5 L10113 3500.5 L10105.5 3554 L10105.5 3554 L10098 3554 L10098 3554 L10068 3546.227602905569 L10068.0 3546.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10075.7 3447.3 L10086.1 3450.1 L10078.4 3457.6 L10068.0 3454.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3101.0 2653.7 L3003.25 3314 L9715 3495.721246325264 L9715.0 3495.7 " fill="none"></path>
-					</g>
-					<path d="M3106.3 2654.5 L3101.0 2653.7 L3095.7 2652.9 L3103.0 2640.5 Z"></path>
-					<path d="M23185.0 2720.2 L23185 3314 L25696 3497.324133881386 L25696.0 3497.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23190.3 2710.8 L23185.0 2720.2 L23179.7 2710.8 L23185.0 2701.5 Z"></path>
-					</g>
-					<path d="M22674.0 1719.3 L22272 1936 L23083.629172714078 2548.5 L23083.6 2548.5 " fill="none"></path>
-					<path d="M22676.5 1724.0 L22674.0 1719.3 L22671.5 1714.6 L22685.7 1713.0 Z"></path>
-					<path d="M37154.0 165.3 L37154 293 L37154 614 L37154.0 614.0 " fill="none"></path>
-					<path d="M37159.3 165.3 L37154.0 165.3 L37148.7 165.3 L37154.0 152.0 Z"></path>
-					<path d="M23246.4 1805.9 L23185 1936 L23185 2548.5 L23185.0 2548.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23255.2 1799.7 L23246.4 1805.9 L23245.5 1795.2 L23254.3 1789.0 Z"></path>
-					</g>
-					<path d="M23319.1 1807.3 L23344.5 1936 L23712.04136429608 2609.5 L23712.0 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23322.6 1797.1 L23319.1 1807.3 L23312.1 1799.2 L23315.5 1789.0 Z"></path>
-					</g>
-					<path d="M23369.1 1804.5 L23457 1936 L23457 2609.5 L23457.0 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23368.3 1793.8 L23369.1 1804.5 L23359.4 1799.7 L23358.7 1789.0 Z"></path>
-					</g>
-					<path d="M23584.9 1804.5 L23497 1936 L23219.64150943396 2548.5 L23219.6 2548.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23594.6 1799.7 L23584.9 1804.5 L23585.7 1793.8 L23595.3 1789.0 Z"></path>
-					</g>
-					<path d="M23685.9 1807.0 L23720.5 1936 L23720.5 2609.5 L23720.5 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23688.6 1796.6 L23685.9 1807.0 L23678.3 1799.4 L23681.1 1789.0 Z"></path>
-					</g>
-					<path d="M23728.1 1804.5 L23816 1936 L23465.07619738752 2609.5 L23465.1 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23727.3 1793.8 L23728.1 1804.5 L23718.4 1799.7 L23717.7 1789.0 Z"></path>
-					</g>
-					<path d="M24015.5 1777.7 L24015.5 1936 L23727.136429608126 2609.5 L23727.1 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24020.8 1768.3 L24015.5 1777.7 L24010.2 1768.3 L24015.5 1759.0 Z"></path>
-					</g>
-					<path d="M20222.2 2709.7 L19833 3314 L25696 3499.126470837213 L25696.0 3499.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20231.7 2704.7 L20222.2 2709.7 L20222.8 2699.0 L20232.3 2694.0 Z"></path>
-					</g>
-					<path d="M20292.2 2712.4 L20398.5 3314 L20398.5 3500.5 L20398.5 3500.5 L20398.5 3687 L20398.5 3687 L20398.5 3843.5 L20398.5 3843.5 L20398.5 4000 L20398.5 4000 L18421.25 4129.2919360741735 L18421.3 4129.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20295.8 2702.3 L20292.2 2712.4 L20285.3 2704.1 L20288.9 2694.0 Z"></path>
-					</g>
-					<path d="M20740.5 2800.4 L20503.5 3314 L20503.5 3485 L20503.5 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20749.3 2794.2 L20740.5 2800.4 L20739.6 2789.7 L20748.3 2783.5 Z"></path>
-					</g>
-					<path d="M20811.2 2802.1 L20781.5 3314 L13203.75 3499.216785164313 L13203.8 3499.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20817.1 2793.1 L20811.2 2802.1 L20806.4 2792.5 L20812.3 2783.5 Z"></path>
-					</g>
-					<path d="M20821.5 2802.2 L20821.5 3314 L21428.75 3490.199338778685 L21428.8 3490.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20826.8 2792.8 L20821.5 2802.2 L20816.2 2792.8 L20821.5 2783.5 Z"></path>
-					</g>
-					<path d="M20831.8 2802.1 L20861.5 3314 L13048 3498.890915434879 L13048.0 3498.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20836.6 2792.5 L20831.8 2802.1 L20825.9 2793.1 L20830.7 2783.5 Z"></path>
-					</g>
-					<path d="M20902.5 2800.4 L21139.5 3314 L21539.75 3487.9001164822366 L21539.8 3487.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20903.4 2789.7 L20902.5 2800.4 L20893.7 2794.2 L20894.7 2783.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M37938.4 173.6 L37704.25 293 L37704.25 598.5 L37704.3 598.5 " fill="none"></path>
-					</g>
-					<path d="M37940.8 178.3 L37938.4 173.6 L37935.9 168.8 L37950.2 167.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M38055.0 176.5 L38183.25 293 L38183.25 598.5 L38183.3 598.5 " fill="none"></path>
-					</g>
-					<path d="M38058.6 172.5 L38055.0 176.5 L38051.4 180.4 L38045.1 167.5 Z"></path>
-					<path d="M21345.9 2689.0 L21179.5 3314 L9625 3497.592268370607 L9625.0 3497.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21353.5 2681.4 L21345.9 2689.0 L21343.2 2678.6 L21350.7 2671.0 Z"></path>
-					</g>
-					<path d="M21361.1 2689.7 L21342.75 3314 L21549.967158176943 3485 L21550.0 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21366.7 2680.5 L21361.1 2689.7 L21356.0 2680.2 L21361.6 2671.0 Z"></path>
-					</g>
-					<path d="M21378.2 2689.2 L21526.25 3314 L24108.25 3498.252152286206 L24108.3 3498.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21381.2 2678.9 L21378.2 2689.2 L21370.9 2681.3 L21373.9 2671.0 Z"></path>
-					</g>
-					<path d="M9643.1 3450.0 L9655 3447 L9662.5 3447 L9662.5 3447 L9670 3500.5 L9670 3500.5 L9662.5 3554 L9662.5 3554 L9655 3554 L9655 3554 L9625 3546.4647887323945 L9625.0 3546.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9632.8 3447.1 L9643.1 3450.0 L9635.4 3457.4 L9625.0 3454.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3102.7 2653.8 L3043.25 3314 L9259 3495.16622387185 L9259.0 3495.2 " fill="none"></path>
-					</g>
-					<path d="M3108.0 2654.3 L3102.7 2653.8 L3097.3 2653.3 L3103.9 2640.5 Z"></path>
-					<path d="M24747.9 1791.2 L24278.25 1936 L44409.5 2619.954745497356 L44409.5 2620.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24758.4 1793.5 L24747.9 1791.2 L24755.3 1783.3 L24765.8 1785.7 Z"></path>
-					</g>
-					<path d="M24748.0 1796.3 L24318.25 1936 L24318.25 2609.5 L24318.3 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24758.5 1798.5 L24748.0 1796.3 L24755.2 1788.3 L24765.8 1790.5 Z"></path>
-					</g>
-					<path d="M25035.3 1934.6 L25035.25 1936 L25035.25 2609.5 L25035.3 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25041.3 1925.7 L25035.3 1934.6 L25030.7 1924.9 L25036.6 1916.0 Z"></path>
-					</g>
-					<path d="M25353.6 1884.7 L25436.25 1936 L25436.25 2609.5 L25436.3 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25348.5 1875.3 L25353.6 1884.7 L25342.9 1884.4 L25337.8 1874.9 Z"></path>
-					</g>
-					<path d="M25355.6 1791.2 L25825.25 1936 L25825.25 2609.5 L25825.3 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25348.2 1783.3 L25355.6 1791.2 L25345.1 1793.5 L25337.8 1785.7 Z"></path>
-					</g>
-					<path d="M44544.5 2750.1 L44483.75 3314 L44483.75 3485 L44483.8 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44550.8 2741.4 L44544.5 2750.1 L44540.2 2740.2 L44546.5 2731.5 Z"></path>
-					</g>
-					<path d="M44582.0 2749.8 L44690.5 3314 L14544.5 3499.3533009148605 L14544.5 3499.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44585.5 2739.7 L44582.0 2749.8 L44575.0 2741.7 L44578.5 2731.5 Z"></path>
-					</g>
-					<path d="M22676.9 1719.8 L22312 1936 L44409.5 2620.400678773712 L44409.5 2620.4 " fill="none"></path>
-					<path d="M22679.6 1724.4 L22676.9 1719.8 L22674.2 1715.2 L22688.3 1713.0 Z"></path>
-					<path d="M14562.6 3449.9 L14574.5 3447 L14582 3447 L14582 3447 L14589.5 3500.5 L14589.5 3500.5 L14582 3554 L14582 3554 L14574.5 3554 L14574.5 3554 L14544.5 3546.5866050808313 L14544.5 3546.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14552.3 3447.0 L14562.6 3449.9 L14554.8 3457.4 L14544.5 3454.4 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3104.3 2653.8 L3083.25 3314 L14171.5 3497.4150313754185 L14171.5 3497.4 " fill="none"></path>
-					</g>
-					<path d="M3109.7 2654.0 L3104.3 2653.8 L3099.0 2653.7 L3104.8 2640.5 Z"></path>
-					<path d="M38560.5 193.7 L38560.5 293 L38560.5 614 L38560.5 614.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38565.8 184.3 L38560.5 193.7 L38555.2 184.3 L38560.5 175.0 Z"></path>
-					</g>
-					<path d="M22196.0 2712.7 L22196 3314 L64028.25 3500.295144257461 L64028.3 3500.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22201.3 2703.3 L22196.0 2712.7 L22190.7 2703.3 L22196.0 2694.0 Z"></path>
-					</g>
-					<path d="M61576.0 1709.5 L59591.5 1936 L59591.5 2594 L59591.5 2594.0 " fill="none"></path>
-					<path d="M61576.6 1714.8 L61576.0 1709.5 L61575.4 1704.2 L61589.3 1708.0 Z"></path>
-					<path d="M59588.1 2669.3 L59539 3314 L58447.671581769435 3485 L58447.7 3485.0 " fill="none"></path>
-					<path d="M59593.4 2669.7 L59588.1 2669.3 L59582.8 2668.9 L59589.1 2656.0 Z"></path>
-					<path d="M61576.2 1719.8 L60556.75 1936 L60556.75 2594 L60556.8 2594.0 " fill="none"></path>
-					<path d="M61577.3 1725.0 L61576.2 1719.8 L61575.1 1714.6 L61589.3 1717.0 Z"></path>
-					<path d="M61604.9 1734.3 L61186.5 1936 L45688 2619.553098194853 L45688.0 2619.6 " fill="none"></path>
-					<path d="M61607.2 1739.1 L61604.9 1734.3 L61602.6 1729.5 L61616.9 1728.5 Z"></path>
-					<path d="M45564.5 2669.3 L45564.5 3314 L50428.5 3495.554288001601 L50428.5 3495.6 " fill="none"></path>
-					<path d="M45569.8 2669.3 L45564.5 2669.3 L45559.2 2669.3 L45564.5 2656.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M59600.0 2669.1 L59724 3314 L50693.5 3497.8031485321403 L50693.5 3497.8 " fill="none"></path>
-					</g>
-					<path d="M59605.2 2668.1 L59600.0 2669.1 L59594.7 2670.1 L59597.5 2656.0 Z"></path>
-					<path d="M61610.3 1734.7 L61226.5 1936 L44979.5 2620.09466189996 L44979.5 2620.1 " fill="none"></path>
-					<path d="M61612.8 1739.4 L61610.3 1734.7 L61607.9 1730.0 L61622.1 1728.5 Z"></path>
-					<path d="M44863.0 2669.3 L44863 3314 L44863 3469.5 L44863.0 3469.5 " fill="none"></path>
-					<path d="M44868.3 2669.3 L44863.0 2669.3 L44857.7 2669.3 L44863.0 2656.0 Z"></path>
-					<path d="M61711.9 1739.2 L61856.25 1936 L61856.25 2594 L61856.3 2594.0 " fill="none"></path>
-					<path d="M61716.2 1736.1 L61711.9 1739.2 L61707.6 1742.4 L61704.0 1728.5 Z"></path>
-					<path d="M39065.0 679.2 L39065 966 L39065 1197 L39065.0 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39070.3 669.8 L39065.0 679.2 L39059.7 669.8 L39065.0 660.5 Z"></path>
-					</g>
-					<path d="M39065.0 165.3 L39065 293 L39065 598.5 L39065.0 598.5 " fill="none"></path>
-					<path d="M39070.3 165.3 L39065.0 165.3 L39059.7 165.3 L39065.0 152.0 Z"></path>
-					<path d="M39607.1 161.6 L39480.75 293 L39480.75 598.5 L39480.8 598.5 " fill="none"></path>
-					<path d="M39610.9 165.3 L39607.1 161.6 L39603.3 157.9 L39616.3 152.0 Z"></path>
-					<path d="M39660.5 160.5 L39822.25 293 L39822.25 598.5 L39822.3 598.5 " fill="none"></path>
-					<path d="M39663.9 156.3 L39660.5 160.5 L39657.1 164.6 L39650.2 152.0 Z"></path>
-					<path d="M39914.8 1747.2 L39914.75 1936 L37633 2592.3514246947084 L37633.0 2592.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39920.1 1737.8 L39914.8 1747.2 L39909.4 1737.8 L39914.8 1728.5 Z"></path>
-					</g>
-					<path d="M39914.8 1241.3 L39914.75 1459 L39914.75 1666.5 L39914.8 1666.5 " fill="none"></path>
-					<path d="M39920.1 1241.3 L39914.8 1241.3 L39909.4 1241.3 L39914.8 1228.0 Z"></path>
-					<path d="M40151.1 885.5 L40065.25 966 L40065.25 1197 L40065.3 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40161.6 883.0 L40151.1 885.5 L40154.3 875.2 L40164.8 872.7 Z"></path>
-					</g>
-					<path d="M40253.8 917.1 L40224.75 966 L40224.75 1197 L40224.8 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40263.1 911.7 L40253.8 917.1 L40253.9 906.3 L40263.3 901.0 Z"></path>
-					</g>
-					<path d="M40700.7 756.2 L41158.5 966 L41158.5 1197 L41158.5 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40694.5 747.5 L40700.7 756.2 L40690.0 757.2 L40683.8 748.4 Z"></path>
-					</g>
-					<path d="M40701.3 729.4 L41357.5 966 L41357.5 1197 L41357.5 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40694.3 721.2 L40701.3 729.4 L40690.7 731.3 L40683.8 723.1 Z"></path>
-					</g>
-					<path d="M40424.3 165.3 L40424.25 293 L40424.25 358 L40424.3 358.0 " fill="none"></path>
-					<path d="M40429.6 165.3 L40424.3 165.3 L40418.9 165.3 L40424.3 152.0 Z"></path>
-					<path d="M37508.1 2681.8 L37381 3314 L21597.75 3500.1579550664833 L21597.8 3500.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37515.2 2673.7 L37508.1 2681.8 L37504.7 2671.6 L37511.8 2663.5 Z"></path>
-					</g>
-					<path d="M37542.4 2680.8 L37803 3314 L37803 3485 L37803.0 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37543.8 2670.1 L37542.4 2680.8 L37534.0 2674.2 L37535.3 2663.5 Z"></path>
-					</g>
-					<path d="M24548.8 2705.2 L24548.75 3314 L21597.75 3498.685067114094 L21597.8 3498.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24554.1 2695.8 L24548.8 2705.2 L24543.4 2695.8 L24548.8 2686.5 Z"></path>
-					</g>
-					<path d="M16795.7 3926.0 L16724.5 4000 L62172 4133.786577328647 L62172.0 4133.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16806.0 3922.9 L16795.7 3926.0 L16798.3 3915.5 L16808.6 3912.5 Z"></path>
-					</g>
-					<path d="M16974.5 3924.3 L17067.75 4000 L14886.5 4129.574420924305 L14886.5 4129.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16970.6 3914.2 L16974.5 3924.3 L16963.9 3922.5 L16960.0 3912.5 Z"></path>
-					</g>
-					<path d="M40870.3 165.3 L40870.25 293 L40870.25 583.5 L40870.3 583.5 " fill="none"></path>
-					<path d="M40875.6 165.3 L40870.3 165.3 L40864.9 165.3 L40870.3 152.0 Z"></path>
-					<path d="M41205.3 165.3 L41205.25 293 L41205.25 583.5 L41205.3 583.5 " fill="none"></path>
-					<path d="M41210.6 165.3 L41205.3 165.3 L41199.9 165.3 L41205.3 152.0 Z"></path>
-					<path d="M24746.8 2712.2 L24746.75 3314 L25696 3492.328003021909 L25696.0 3492.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24752.1 2702.8 L24746.8 2712.2 L24741.4 2702.8 L24746.8 2693.5 Z"></path>
-					</g>
-					<path d="M83574.0 171.4 L83182 293 L83182 629.5 L83182 629.5 L83182 966 L83182 966 L83182 1174 L83182.0 1174.0 " fill="none"></path>
-					<path d="M83575.6 176.5 L83574.0 171.4 L83572.5 166.4 L83586.8 167.5 Z"></path>
-					<path d="M867.2 3422.4 L880 3417 L887.5 3417 L887.5 3417 L895 3500.5 L895 3500.5 L887.5 3584 L887.5 3584 L880 3584 L880 3584 L850 3571.284263959391 L850.0 3571.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M856.5 3421.2 L867.2 3422.4 L860.7 3431.0 L850.0 3429.7 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3106.0 2653.8 L3123.25 3314 L850 3487.7367585288393 L850.0 3487.7 " fill="none"></path>
-					</g>
-					<path d="M3111.3 2653.7 L3106.0 2653.8 L3100.7 2654.0 L3105.7 2640.5 Z"></path>
-					<path d="M17301.6 3941.9 L17178.5 4000 L15060.5 4129.8910755148745 L15060.5 4129.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17312.3 3942.7 L17301.6 3941.9 L17307.8 3933.1 L17318.5 3933.9 Z"></path>
-					</g>
-					<path d="M17302.1 3955.1 L17218.5 4000 L6898 4132.924548250673 L6898.0 4132.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17312.8 3955.4 L17302.1 3955.1 L17307.8 3946.0 L17318.5 3946.3 Z"></path>
-					</g>
-					<path d="M17719.5 3901.4 L18076.25 4000 L18317.671641791047 4118.5 L18317.7 4118.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17711.9 3893.8 L17719.5 3901.4 L17709.1 3904.1 L17701.5 3896.4 Z"></path>
-					</g>
-					<path d="M17719.6 3897.6 L18116.25 4000 L15404.5 4126.887647315582 L15404.5 4126.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17711.9 3890.1 L17719.6 3897.6 L17709.2 3900.4 L17701.5 3892.9 Z"></path>
-					</g>
-					<path d="M41539.5 193.7 L41474.75 293 L41474.75 598.5 L41474.8 598.5 " fill="none"></path>
-					<path d="M41544.0 196.6 L41539.5 193.7 L41535.0 190.8 L41546.8 182.5 Z"></path>
-					<path d="M41614.0 193.7 L41678.75 293 L41678.75 598.5 L41678.8 598.5 " fill="none"></path>
-					<path d="M41618.5 190.8 L41614.0 193.7 L41609.5 196.6 L41606.7 182.5 Z"></path>
-					<path d="M18329.5 3911.2 L18247.25 4000 L15504.5 4132.550175818231 L15504.5 4132.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18339.8 3908.0 L18329.5 3911.2 L18332.0 3900.7 L18342.2 3897.5 Z"></path>
-					</g>
-					<path d="M60478.8 4214.2 L60478.75 4268 L65854.25 4451.378589720139 L65854.3 4451.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M60484.1 4204.8 L60478.8 4214.2 L60473.4 4204.8 L60478.8 4195.5 Z"></path>
-					</g>
-					<path d="M18382.4 3910.7 L18369.25 4000 L60210.75 4133.147175815434 L60210.8 4133.1 " fill="none"></path>
-					<path d="M18387.7 3911.5 L18382.4 3910.7 L18377.1 3909.9 L18384.3 3897.5 Z"></path>
-					<path d="M18442.5 3908.0 L18514.25 4000 L40095 4133.579098100352 L40095.0 4133.6 " fill="none"></path>
-					<path d="M18446.7 3904.7 L18442.5 3908.0 L18438.3 3911.3 L18434.3 3897.5 Z"></path>
-					<path d="M21568.8 3529.3 L21568.75 3687 L21568.75 3805 L21568.8 3805.0 " fill="none"></path>
-					<path d="M21574.1 3529.3 L21568.8 3529.3 L21563.4 3529.3 L21568.8 3516.0 Z"></path>
-					<path d="M42019.3 165.3 L42019.25 293 L42019.25 583 L42019.3 583.0 " fill="none"></path>
-					<path d="M42024.6 165.3 L42019.3 165.3 L42013.9 165.3 L42019.3 152.0 Z"></path>
-					<path d="M42468.3 724.7 L42468.25 966 L42468.25 1197 L42468.3 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42473.6 715.3 L42468.3 724.7 L42462.9 715.3 L42468.3 706.0 Z"></path>
-					</g>
-					<path d="M42468.3 165.3 L42468.25 293 L42468.25 553 L42468.3 553.0 " fill="none"></path>
-					<path d="M42473.6 165.3 L42468.3 165.3 L42462.9 165.3 L42468.3 152.0 Z"></path>
-					<path d="M43431.5 160.8 L43282.5 293 L43282.5 575.5 L43282.5 575.5 " fill="none"></path>
-					<path d="M43435.1 164.8 L43431.5 160.8 L43428.0 156.9 L43441.5 152.0 Z"></path>
-					<path d="M43486.5 160.8 L43635.5 293 L43635.5 598.5 L43635.5 598.5 " fill="none"></path>
-					<path d="M43490.0 156.9 L43486.5 160.8 L43482.9 164.8 L43476.5 152.0 Z"></path>
-					<path d="M22700.3 1724.8 L22591 1936 L22591 2541 L22591.0 2541.0 " fill="none"></path>
-					<path d="M22705.1 1727.3 L22700.3 1724.8 L22695.6 1722.4 L22706.5 1713.0 Z"></path>
-					<path d="M33529.7 1703.9 L30085.75 1936 L29013.75435413643 2594 L29013.8 2594.0 " fill="none"></path>
-					<path d="M33530.1 1709.2 L33529.7 1703.9 L33529.3 1698.6 L33543.0 1703.0 Z"></path>
-					<path d="M11816.5 2690.2 L11816.5 3314 L14634.5 3489.4488399265565 L14634.5 3489.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11821.8 2680.8 L11816.5 2690.2 L11811.2 2680.8 L11816.5 2671.5 Z"></path>
-					</g>
-					<path d="M13472.3 1714.0 L11816.5 1936 L11816.5 2578.5 L11816.5 2578.5 " fill="none"></path>
-					<path d="M13473.0 1719.2 L13472.3 1714.0 L13471.6 1708.7 L13485.5 1712.2 Z"></path>
-					<path d="M12571.3 2690.2 L12571.25 3314 L14634.5 3485.7264866674104 L14634.5 3485.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12576.6 2680.8 L12571.3 2690.2 L12565.9 2680.8 L12571.3 2671.5 Z"></path>
-					</g>
-					<path d="M13472.5 1726.0 L12571.25 1936 L12571.25 2578.5 L12571.3 2578.5 " fill="none"></path>
-					<path d="M13473.7 1731.2 L13472.5 1726.0 L13471.3 1720.8 L13485.5 1723.0 Z"></path>
-					<path d="M13528.5 2690.2 L13528.5 3314 L14634.5 3474.7082197117256 L14634.5 3474.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13533.8 2680.8 L13528.5 2690.2 L13523.2 2680.8 L13528.5 2671.5 Z"></path>
-					</g>
-					<path d="M13582.8 1741.3 L13528.5 1936 L13528.5 2578.5 L13528.5 2578.5 " fill="none"></path>
-					<path d="M13587.9 1742.8 L13582.8 1741.3 L13577.6 1739.9 L13586.4 1728.5 Z"></path>
-					<path d="M18497.3 2705.2 L18497.25 3314 L14989.5 3491.5172308527235 L14989.5 3491.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18502.6 2695.8 L18497.3 2705.2 L18491.9 2695.8 L18497.3 2686.5 Z"></path>
-					</g>
-					<path d="M13717.8 1703.5 L18497.25 1936 L18497.25 2563.5 L18497.3 2563.5 " fill="none"></path>
-					<path d="M13718.1 1698.1 L13717.8 1703.5 L13717.6 1708.8 L13704.5 1702.8 Z"></path>
-					<path d="M29431.8 2694.1 L28149.5 3314 L21499.75 3499.509648105905 L21499.8 3499.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M29442.5 2694.9 L29431.8 2694.1 L29437.8 2685.3 L29448.6 2686.0 Z"></path>
-					</g>
-					<path d="M29435.4 2694.3 L28189.5 3314 L14989.5 3498.025415810129 L14989.5 3498.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M29446.1 2694.9 L29435.4 2694.3 L29441.4 2685.4 L29452.1 2686.0 Z"></path>
-					</g>
-					<path d="M29591.4 2704.3 L29719.75 3314 L13203.75 3499.9090442707547 L13203.8 3499.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M29594.7 2694.0 L29591.4 2704.3 L29584.3 2696.2 L29587.6 2686.0 Z"></path>
-					</g>
-					<path d="M29904.8 2697.2 L29904.75 3314 L59258.25 3500.14171200272 L59258.3 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M29910.1 2687.8 L29904.8 2697.2 L29899.4 2687.8 L29904.8 2678.5 Z"></path>
-					</g>
-					<path d="M30321.8 2703.9 L30144.75 3314 L30144.75 3485 L30144.8 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M30329.6 2696.5 L30321.8 2703.9 L30319.3 2693.5 L30327.0 2686.0 Z"></path>
-					</g>
-					<path d="M30361.5 2704.3 L30490.5 3314 L59258.25 3500.1344310779987 L59258.3 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M30364.8 2694.0 L30361.5 2704.3 L30354.4 2696.2 L30357.7 2686.0 Z"></path>
-					</g>
-					<path d="M43527.9 2893.9 L43052.75 3314 L43052.75 3500.5 L43052.75 3500.5 L43052.75 3687 L43052.75 3687 L43052.75 3843.5 L43052.75 3843.5 L43052.75 4000 L43052.75 4000 L72971.75 4133.342623850464 L72971.8 4133.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43538.4 2891.7 L43527.9 2893.9 L43531.4 2883.7 L43541.9 2881.5 Z"></path>
-					</g>
-					<path d="M43543.1 2894.2 L43092.75 3314 L60183.25 3498.3694036325774 L60183.3 3498.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43553.6 2891.8 L43543.1 2894.2 L43546.3 2884.0 L43556.8 2881.5 Z"></path>
-					</g>
-					<path d="M43558.4 2894.6 L43132.75 3314 L64028.25 3500.09033498078 L64028.3 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43568.8 2891.8 L43558.4 2894.6 L43561.3 2884.3 L43571.7 2881.5 Z"></path>
-					</g>
-					<path d="M43635.8 2896.6 L43334.25 3314 L59258.25 3499.8406182534964 L59258.3 3499.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43645.6 2892.2 L43635.8 2896.6 L43636.9 2885.9 L43646.7 2881.5 Z"></path>
-					</g>
-					<path d="M43651.3 2897.0 L43374.25 3314 L61341.25 3499.9566303171564 L61341.3 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43660.9 2892.2 L43651.3 2897.0 L43652.0 2886.3 L43661.6 2881.5 Z"></path>
-					</g>
-					<path d="M43916.6 2899.3 L44044.5 3314 L14989.5 3499.36757034123 L14989.5 3499.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43919.0 2888.8 L43916.6 2899.3 L43908.8 2892.0 L43911.1 2881.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M47006.2 141.6 L43832 293 L43832 629.5 L43832 629.5 L43832 966 L43832 966 L43832 1212.5 L43832 1212.5 L43832 1459 L43832 1459 L43832 1697.5 L43832 1697.5 L43832 1936 L43832 1936 L43832 2368.5 L43832.0 2368.5 " fill="none"></path>
-					</g>
-					<path d="M47006.4 146.9 L47006.2 141.6 L47005.9 136.3 L47019.5 141.0 Z"></path>
-					<path d="M15006.8 3422.1 L15019.5 3417 L15027 3417 L15027 3417 L15034.5 3500.5 L15034.5 3500.5 L15027 3584 L15027 3584 L15019.5 3584 L15019.5 3584 L14989.5 3571.9277108433735 L14989.5 3571.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14996.2 3420.6 L15006.8 3422.1 L15000.1 3430.5 L14989.5 3429.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3114.1 2653.2 L3321.5 3314 L14634.5 3497.6190331143116 L14634.5 3497.6 " fill="none"></path>
-					</g>
-					<path d="M3119.2 2651.6 L3114.1 2653.2 L3109.0 2654.8 L3110.1 2640.5 Z"></path>
-					<path d="M1236.8 3450.9 L1249 3447 L1256.5 3447 L1256.5 3447 L1264 3500.5 L1264 3500.5 L1256.5 3554 L1256.5 3554 L1249 3554 L1249 3554 L1219 3544.5309734513276 L1219.0 3544.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1226.3 3448.6 L1236.8 3450.9 L1229.5 3458.7 L1219.0 3456.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3115.7 2653.0 L3361.5 3314 L1219 3489.0991454864156 L1219.0 3489.1 " fill="none"></path>
-					</g>
-					<path d="M3120.7 2651.1 L3115.7 2653.0 L3110.7 2654.9 L3111.0 2640.5 Z"></path>
-					<path d="M31074.8 2833.8 L30530.5 3314 L24068.25 3498.5297033492825 L24068.3 3498.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31085.3 2831.7 L31074.8 2833.8 L31078.2 2823.7 L31088.8 2821.5 Z"></path>
-					</g>
-					<path d="M31086.5 2834.2 L30570.5 3314 L25656 3497.807129248972 L25656.0 3497.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31097.0 2831.8 L31086.5 2834.2 L31089.7 2823.9 L31100.2 2821.5 Z"></path>
-					</g>
-					<path d="M31098.3 2834.6 L30610.5 3314 L30610.5 3485 L30610.5 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31108.7 2831.8 L31098.3 2834.6 L31101.2 2824.2 L31111.6 2821.5 Z"></path>
-					</g>
-					<path d="M31165.3 2836.9 L30836 3314 L30836 3500.5 L30836 3500.5 L30836 3687 L30836 3687 L30836 3843.5 L30836 3843.5 L30836 4000 L30836 4000 L18421.25 4133.227340981441 L18421.3 4133.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31175.0 2832.2 L31165.3 2836.9 L31166.2 2826.2 L31175.9 2821.5 Z"></path>
-					</g>
-					<path d="M31201.1 2838.1 L30954.5 3314 L30954.5 3485 L30954.5 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31210.1 2832.2 L31201.1 2838.1 L31200.7 2827.3 L31209.7 2821.5 Z"></path>
-					</g>
-					<path d="M31313.8 2840.2 L31319 3314 L25783 3499.045971861278 L25783.0 3499.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31319.1 2830.8 L31313.8 2840.2 L31308.4 2830.9 L31313.6 2821.5 Z"></path>
-					</g>
-					<path d="M31426.5 2837.9 L31683.5 3314 L31683.5 3485 L31683.5 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31426.7 2827.2 L31426.5 2837.9 L31417.3 2832.2 L31417.6 2821.5 Z"></path>
-					</g>
-					<path d="M31573.4 2747.5 L32784.75 3314 L21499.75 3499.9151539242966 L21499.8 3499.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31567.2 2738.7 L31573.4 2747.5 L31562.7 2748.4 L31556.5 2739.6 Z"></path>
-					</g>
-					<path d="M31573.5 2744.3 L32824.75 3314 L13203.75 3500.0023127557374 L13203.8 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31567.2 2735.6 L31573.5 2744.3 L31562.8 2745.3 L31556.5 2736.6 Z"></path>
-					</g>
-					<path d="M68285.7 645.3 L59173.75 966 L59173.75 1212.5 L59173.75 1212.5 L59173.75 1459 L59173.75 1459 L59173.75 1666.5 L59173.8 1666.5 " fill="none"></path>
-					<path d="M68285.9 650.6 L68285.7 645.3 L68285.5 640.0 L68299.0 644.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M75443.2 139.8 L72668.75 293 L72668.75 614 L72668.8 614.0 " fill="none"></path>
-					</g>
-					<path d="M75443.5 145.2 L75443.2 139.8 L75442.9 134.5 L75456.5 139.1 Z"></path>
-					<path d="M65858.3 3998.7 L65858.25 4000 L61787 4132.406407378193 L61787.0 4132.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65863.6 3989.3 L65858.3 3998.7 L65852.9 3989.3 L65858.3 3980.0 Z"></path>
-					</g>
-					<path d="M59089.7 3869.4 L57954.25 4000 L60210.75 4119.7746088334325 L60210.8 4119.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M59099.6 3873.6 L59089.7 3869.4 L59098.4 3863.0 L59108.3 3867.3 Z"></path>
-					</g>
-					<path d="M59314.8 3946.2 L59314.75 4000 L60887 4127.357714976575 L60887.0 4127.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M59320.1 3936.8 L59314.8 3946.2 L59309.4 3936.8 L59314.8 3927.5 Z"></path>
-					</g>
-					<path d="M59460.5 3937.6 L59557 4000 L61384.25 4125.388042504161 L61384.3 4125.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M59455.5 3928.1 L59460.5 3937.6 L59449.7 3937.0 L59444.8 3927.5 Z"></path>
-					</g>
-					<path d="M59314.8 3529.3 L59314.75 3687 L59314.75 3759.5 L59314.8 3759.5 " fill="none"></path>
-					<path d="M59320.1 3529.3 L59314.8 3529.3 L59309.4 3529.3 L59314.8 3516.0 Z"></path>
-					<path d="M33108.5 2712.7 L33108.5 3314 L24068.25 3499.0873150918023 L24068.3 3499.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M33113.8 2703.3 L33108.5 2712.7 L33103.2 2703.3 L33108.5 2694.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M75443.3 145.5 L74452.25 293 L74452.25 614 L74452.3 614.0 " fill="none"></path>
-					</g>
-					<path d="M75444.1 150.7 L75443.3 145.5 L75442.5 140.2 L75456.5 143.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M75443.4 147.9 L74677.75 293 L74677.75 598.5 L74677.8 598.5 " fill="none"></path>
-					</g>
-					<path d="M75444.4 153.1 L75443.4 147.9 L75442.4 142.7 L75456.5 145.4 Z"></path>
-					<path d="M47000.9 142.7 L44297 293 L44297 629.5 L44297 629.5 L44297 966 L44297 966 L44297 1212.5 L44297 1212.5 L44297 1459 L44297 1459 L44297 1697.5 L44297 1697.5 L44297 1936 L44297 1936 L44297 2625 L44297 2625 L44297 3314 L44297 3314 L61341.25 3499.9273034348635 L61341.3 3499.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M47010.5 147.5 L47000.9 142.7 L47009.9 136.9 L47019.5 141.7 Z"></path>
-					</g>
-					<path d="M22736.4 1723.1 L22918 1936 L22918 2571.5 L22918.0 2571.5 " fill="none"></path>
-					<path d="M22740.4 1719.7 L22736.4 1723.1 L22732.3 1726.6 L22727.7 1713.0 Z"></path>
-					<path d="M68280.3 646.0 L59446.5 966 L59446.5 1212.5 L59446.5 1212.5 L59446.5 1459 L59446.5 1459 L59446.5 1697.5 L59446.5 1697.5 L59446.5 1936 L59446.5 1936 L59446.5 2625 L59446.5 2625 L59446.5 3314 L59446.5 3314 L25422 3499.7303200597094 L25422.0 3499.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68289.9 651.0 L68280.3 646.0 L68289.5 640.3 L68299.0 645.3 Z"></path>
-					</g>
-					<path d="M68280.3 647.6 L60273.25 966 L60273.25 1197 L60273.3 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68289.9 652.5 L68280.3 647.6 L68289.5 641.9 L68299.0 646.8 Z"></path>
-					</g>
-					<path d="M68281.1 762.4 L67586 966 L67586 1174 L67586.0 1174.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68291.5 764.9 L68281.1 762.4 L68288.5 754.7 L68299.0 757.2 Z"></path>
-					</g>
-					<path d="M68283.4 925.2 L68221 966 L68221 1212.5 L68221 1212.5 L68221 1459 L68221 1459 L68221 1697.5 L68221 1697.5 L68221 1936 L68221 1936 L68221 2625 L68221 2625 L68221 3314 L68221 3314 L68221 3500.5 L68221 3500.5 L68221 3687 L68221 3687 L68221 3843.5 L68221 3843.5 L68221 4000 L68221 4000 L60746.75 4129.361555103491 L60746.8 4129.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68294.1 924.5 L68283.4 925.2 L68288.3 915.6 L68299.0 914.9 Z"></path>
-					</g>
-					<path d="M69130.3 957.9 L69140 966 L69140 1212.5 L69140 1212.5 L69140 1459 L69140 1459 L69140 1697.5 L69140 1697.5 L69140 1936 L69140 1936 L69140 2625 L69140 2625 L69140 3314 L69140 3314 L69140 3500.5 L69140 3500.5 L69140 3687 L69140 3687 L69140 3843.5 L69140 3843.5 L69140 4000 L69140 4000 L69140 4134 L69140 4134 L69140 4268 L69140 4268 L66037.25 4449.157666118807 L66037.3 4449.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M69126.5 947.9 L69130.3 957.9 L69119.7 956.1 L69115.9 946.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M47219.8 137.3 L68735 293 L68735 313 L68735.0 313.0 " fill="none"></path>
-					</g>
-					<path d="M47219.9 131.9 L47219.8 137.3 L47219.8 142.6 L47206.5 137.2 Z"></path>
-					<path d="M25439.6 3443.9 L25452 3439.5 L25459.5 3439.5 L25459.5 3439.5 L25467 3500.5 L25467 3500.5 L25459.5 3561.5 L25459.5 3561.5 L25452 3561.5 L25452 3561.5 L25422 3550.7982456140353 L25422.0 3550.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25429.0 3442.0 L25439.6 3443.9 L25432.6 3452.1 L25422.0 3450.2 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3117.2 2652.7 L3401.5 3314 L25140 3499.2981215292853 L25140.0 3499.3 " fill="none"></path>
-					</g>
-					<path d="M3122.1 2650.6 L3117.2 2652.7 L3112.3 2654.9 L3111.9 2640.5 Z"></path>
-					<path d="M75333.4 1295.6 L74657.25 1459 L81834 1693.176540000684 L81834.0 1693.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M75343.7 1298.6 L75333.4 1295.6 L75341.2 1288.2 L75351.5 1291.2 Z"></path>
-					</g>
-					<path d="M76021.1 1241.6 L78596 1459 L78596 1697.5 L78596 1697.5 L78596 1936 L78596 1936 L78596 2625 L78596 2625 L78596 3314 L78596 3314 L72068.25 3498.102737136592 L72068.3 3498.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M76012.2 1235.5 L76021.1 1241.6 L76011.4 1246.1 L76002.5 1240.0 Z"></path>
-					</g>
-					<path d="M73025.2 725.8 L72404 966 L75351.5 1187.9855637030248 L75351.5 1188.0 " fill="none"></path>
-					<path d="M73027.1 730.8 L73025.2 725.8 L73023.3 720.8 L73037.6 721.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83594.1 172.3 L83282 293 L83282 629.5 L83282 629.5 L83282 966 L83282 966 L76002.5 1201.9496055226825 L76002.5 1201.9 " fill="none"></path>
-					</g>
-					<path d="M83596.1 177.3 L83594.1 172.3 L83592.2 167.3 L83606.6 167.5 Z"></path>
-					<path d="M33529.7 1704.5 L30370.75 1936 L29335.41074020319 2571.5 L29335.4 2571.5 " fill="none"></path>
-					<path d="M33530.1 1709.8 L33529.7 1704.5 L33529.3 1699.2 L33543.0 1703.5 Z"></path>
-					<path d="M81116.0 702.2 L81116 966 L73557.5 1202.083407247846 L73557.5 1202.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M81121.3 692.8 L81116.0 702.2 L81110.7 692.8 L81116.0 683.5 Z"></path>
-					</g>
-					<path d="M82061.8 152.7 L81116 293 L81116 575.5 L81116.0 575.5 " fill="none"></path>
-					<path d="M82062.6 158.0 L82061.8 152.7 L82061.0 147.4 L82075.0 150.7 Z"></path>
-					<path d="M78384.3 203.8 L77985.25 293 L77985.25 614 L77985.3 614.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M78394.6 207.0 L78384.3 203.8 L78392.2 196.6 L78402.5 199.7 Z"></path>
-					</g>
-					<path d="M78470.2 235.8 L78346.25 293 L78346.25 614 L78346.3 614.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M78480.9 236.8 L78470.2 235.8 L78476.4 227.1 L78487.2 228.0 Z"></path>
-					</g>
-					<path d="M78710.9 246.2 L78721.75 293 L78721.75 614 L78721.8 614.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M78714.0 235.9 L78710.9 246.2 L78703.6 238.3 L78706.7 228.0 Z"></path>
-					</g>
-					<path d="M78890.8 236.1 L79008 293 L79008 614 L79008.0 614.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M78884.8 227.3 L78890.8 236.1 L78880.1 236.9 L78874.1 228.0 Z"></path>
-					</g>
-					<path d="M73069.5 1416.4 L73037.25 1459 L73037.25 1697.5 L73037.25 1697.5 L73037.25 1936 L73037.25 1936 L73037.25 2625 L73037.25 2625 L73037.25 3314 L73037.25 3314 L64999 3499.795027110767 L64999.0 3499.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73079.4 1412.2 L73069.5 1416.4 L73070.9 1405.7 L73080.8 1401.5 Z"></path>
-					</g>
-					<path d="M73101.9 1417.5 L73077.25 1459 L81834 1693.9450037967208 L81834.0 1693.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73111.3 1412.2 L73101.9 1417.5 L73102.1 1406.8 L73111.5 1401.5 Z"></path>
-					</g>
-					<path d="M73240.8 1420.1 L73244 1459 L73244 1697.5 L73244 1697.5 L73244 1936 L73244 1936 L73244 2625 L73244 2625 L73244 3314 L73244 3314 L59371.25 3499.7435163415116 L59371.3 3499.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73245.4 1410.4 L73240.8 1420.1 L73234.8 1411.2 L73239.3 1401.5 Z"></path>
-					</g>
-					<path d="M73362.3 1417.0 L73390.75 1459 L73390.75 1697.5 L73390.75 1697.5 L73390.75 1936 L73390.75 1936 L73390.75 2625 L73390.75 2625 L73390.75 3314 L73390.75 3314 L61446.25 3499.683858464616 L61446.3 3499.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73361.5 1406.2 L73362.3 1417.0 L73352.7 1412.2 L73351.9 1401.5 Z"></path>
-					</g>
-					<path d="M69182.3 905.8 L69279.75 966 L72890.5 1191.6575711478736 L72890.5 1191.7 " fill="none"></path>
-					<path d="M69185.1 901.3 L69182.3 905.8 L69179.5 910.4 L69171.0 898.8 Z"></path>
-					<path d="M33529.8 1710.2 L31842.25 1936 L30770.25435413643 2594 L30770.3 2594.0 " fill="none"></path>
-					<path d="M33530.5 1715.5 L33529.8 1710.2 L33529.1 1705.0 L33543.0 1708.5 Z"></path>
-					<path d="M33720.2 1710.5 L35369.5 1936 L33527 2600.476576812353 L33527.0 2600.5 " fill="none"></path>
-					<path d="M33720.9 1705.2 L33720.2 1710.5 L33719.5 1715.8 L33707.0 1708.7 Z"></path>
-					<path d="M33720.2 1709.1 L35589.5 1936 L33764.958635703915 2594 L33765.0 2594.0 " fill="none"></path>
-					<path d="M33720.9 1703.8 L33720.2 1709.1 L33719.6 1714.4 L33707.0 1707.5 Z"></path>
-					<path d="M18676.3 3923.7 L18676.25 4000 L18387.074626865673 4118.5 L18387.1 4118.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18681.6 3914.3 L18676.3 3923.7 L18670.9 3914.3 L18676.3 3905.0 Z"></path>
-					</g>
-					<path d="M29232.9 1214.6 L18676.25 1459 L18676.25 1697.5 L18676.25 1697.5 L18676.25 1936 L18676.25 1936 L18676.25 2625 L18676.25 2625 L18676.25 3314 L18676.25 3314 L18676.25 3500.5 L18676.25 3500.5 L18676.25 3687 L18676.25 3687 L18676.25 3782 L18676.3 3782.0 " fill="none"></path>
-					<path d="M29233.0 1219.9 L29232.9 1214.6 L29232.8 1209.2 L29246.3 1214.3 Z"></path>
-					<path d="M34591.6 2675.9 L33878.5 3314 L36368.5 3496.326266195524 L36368.5 3496.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M34602.1 2673.7 L34591.6 2675.9 L34595.0 2665.7 L34605.5 2663.5 Z"></path>
-					</g>
-					<path d="M34594.1 2676.3 L33918.5 3314 L32385.5 3493.9839471199243 L32385.5 3494.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M34604.6 2673.8 L34594.1 2676.3 L34597.3 2666.0 L34607.7 2663.5 Z"></path>
-					</g>
-					<path d="M34930.7 2719.7 L34800 3314 L36368.5 3493.9601661027377 L36368.5 3494.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M34937.9 2711.8 L34930.7 2719.7 L34927.5 2709.5 L34934.7 2701.5 Z"></path>
-					</g>
-					<path d="M34936.1 2719.9 L34840 3314 L32385.5 3496.3761952191235 L32385.5 3496.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M34942.9 2711.6 L34936.1 2719.9 L34932.4 2709.9 L34939.1 2701.5 Z"></path>
-					</g>
-					<path d="M34967.4 2719.9 L35067.25 3314 L24714 3497.9416156612447 L24714.0 3497.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M34971.2 2709.8 L34967.4 2719.9 L34960.6 2711.6 L34964.4 2701.5 Z"></path>
-					</g>
-					<path d="M35229.7 2772.2 L35107.25 3314 L32577.5 3495.0604912213375 L32577.5 3495.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35237.0 2764.3 L35229.7 2772.2 L35226.6 2761.9 L35233.8 2754.0 Z"></path>
-					</g>
-					<path d="M35238.2 2772.4 L35147.25 3314 L21499.75 3500.0161331579334 L21499.8 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35245.0 2764.1 L35238.2 2772.4 L35234.5 2762.3 L35241.3 2754.0 Z"></path>
-					</g>
-					<path d="M32903.0 3618.2 L32903 3687 L32903 3828 L32903.0 3828.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32908.3 3608.8 L32903.0 3618.2 L32897.7 3608.8 L32903.0 3599.5 Z"></path>
-					</g>
-					<path d="M35257.4 2767.3 L35235.75 3314 L33039.5 3489.587021755439 L33039.5 3489.6 " fill="none"></path>
-					<path d="M35262.7 2767.5 L35257.4 2767.3 L35252.0 2767.1 L35257.9 2754.0 Z"></path>
-					<path d="M35281.3 2767.2 L35351.5 3314 L34159.5 3486.6664077669902 L34159.5 3486.7 " fill="none"></path>
-					<path d="M35286.6 2766.5 L35281.3 2767.2 L35276.0 2767.9 L35279.6 2754.0 Z"></path>
-					<path d="M72384.3 2756.0 L72130 3314 L60578.25 3497.3650126603825 L60578.3 3497.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72393.0 2749.7 L72384.3 2756.0 L72383.3 2745.3 L72392.0 2739.0 Z"></path>
-					</g>
-					<path d="M72451.3 2757.6 L72482 3314 L72024.70107238606 3485 L72024.7 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72456.1 2748.0 L72451.3 2757.6 L72445.5 2748.6 L72450.3 2739.0 Z"></path>
-					</g>
-					<path d="M73036.1 726.0 L72444 966 L72444 1212.5 L72444 1212.5 L72444 1459 L72444 1459 L72444 1697.5 L72444 1697.5 L72444 1936 L72444 1936 L72444 2511 L72444.0 2511.0 " fill="none"></path>
-					<path d="M73038.1 731.0 L73036.1 726.0 L73034.1 721.1 L73048.5 721.0 Z"></path>
-					<path d="M29232.9 1215.7 L22381 1459 L33543 1695.7606723585911 L33543.0 1695.8 " fill="none"></path>
-					<path d="M29233.1 1221.0 L29232.9 1215.7 L29232.7 1210.3 L29246.3 1215.2 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M13167.5 1256.8 L13167.5 1459 L33543 1696.5440180862765 L33543.0 1696.5 " fill="none"></path>
-					</g>
-					<path d="M13172.8 1256.8 L13167.5 1256.8 L13162.2 1256.8 L13167.5 1243.5 Z"></path>
-					<path d="M36881.0 2712.7 L36863.5 3314 L36461.90214477212 3485 L36461.9 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36886.6 2703.5 L36881.0 2712.7 L36875.9 2703.2 L36881.5 2694.0 Z"></path>
-					</g>
-					<path d="M36901.2 2712.3 L37023 3314 L24714 3498.3434112262107 L24714.0 3498.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36904.5 2702.1 L36901.2 2712.3 L36894.1 2704.2 L36897.5 2694.0 Z"></path>
-					</g>
-					<path d="M73121.7 731.4 L72770.5 966 L72770.5 1212.5 L72770.5 1212.5 L72770.5 1459 L72770.5 1459 L72770.5 1697.5 L72770.5 1697.5 L72770.5 1936 L72770.5 1936 L72770.5 2625 L72770.5 2625 L72770.5 3314 L72770.5 3314 L72770.5 3462 L72770.5 3462.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73132.5 730.6 L73121.7 731.4 L73126.5 721.7 L73137.3 721.0 Z"></path>
-					</g>
-					<path d="M73133.0 732.0 L72810.5 966 L72810.5 1212.5 L72810.5 1212.5 L72810.5 1459 L72810.5 1459 L72810.5 1697.5 L72810.5 1697.5 L72810.5 1936 L72810.5 1936 L72810.5 2625 L72810.5 2625 L72810.5 3314 L72810.5 3314 L64120.25 3499.517999713836 L64120.3 3499.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73143.7 730.8 L73133.0 732.0 L73137.5 722.2 L73148.1 721.0 Z"></path>
-					</g>
-					<path d="M73144.4 732.6 L72850.5 966 L72850.5 1212.5 L72850.5 1212.5 L72850.5 1459 L72850.5 1459 L72850.5 1697.5 L72850.5 1697.5 L72850.5 1936 L72850.5 1936 L72850.5 2625 L72850.5 2625 L72850.5 3314 L72850.5 3314 L72055.32707774799 3485 L72055.3 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73155.0 731.0 L73144.4 732.6 L73148.4 722.6 L73159.0 721.0 Z"></path>
-					</g>
-					<path d="M61681.3 1277.2 L61681.25 1459 L61681.25 1666.5 L61681.3 1666.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M61686.6 1267.8 L61681.3 1277.2 L61675.9 1267.8 L61681.3 1258.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M34656.9 2676.7 L34760 3314 L33749.75 3480.478131212724 L33749.8 3480.5 " fill="none"></path>
-					</g>
-					<path d="M34662.1 2675.8 L34656.9 2676.7 L34651.6 2677.5 L34654.7 2663.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M36549.0 2706.8 L36549 3314 L33749.75 3492.7418043310795 L33749.8 3492.7 " fill="none"></path>
-					</g>
-					<path d="M36554.3 2706.8 L36549.0 2706.8 L36543.7 2706.8 L36549.0 2693.5 Z"></path>
-					<path d="M63112.7 1261.0 L62355 1459 L62355 1644 L62355.0 1644.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M63123.1 1263.8 L63112.7 1261.0 L63120.4 1253.5 L63130.8 1256.3 Z"></path>
-					</g>
-					<path d="M63113.2 1281.2 L62634 1459 L33707 1696.825829914854 L33707.0 1696.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M63123.9 1282.9 L63113.2 1281.2 L63120.1 1272.9 L63130.8 1274.7 Z"></path>
-					</g>
-					<path d="M63113.6 1292.9 L62732.25 1459 L62732.25 1697.5 L62732.25 1697.5 L62732.25 1936 L62732.25 1936 L62732.25 2625 L62732.25 2625 L62732.25 3314 L62732.25 3314 L21499.75 3500.3395669768342 L21499.8 3500.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M63124.3 1294.1 L63113.6 1292.9 L63120.1 1284.3 L63130.8 1285.4 Z"></path>
-					</g>
-					<path d="M63482.1 1313.7 L63746.25 1459 L63746.25 1697.5 L63746.25 1697.5 L63746.25 1936 L63746.25 1936 L63746.25 2625 L63746.25 2625 L63746.25 3314 L63746.25 3314 L27458.25 3499.4116873510316 L27458.3 3499.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M63476.5 1304.5 L63482.1 1313.7 L63471.4 1313.8 L63465.8 1304.7 Z"></path>
-					</g>
-					<path d="M37177.2 2749.8 L37063 3314 L21597.75 3500.150935024283 L21597.8 3500.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37184.3 2741.7 L37177.2 2749.8 L37173.9 2739.6 L37180.9 2731.5 Z"></path>
-					</g>
-					<path d="M37227.6 2749.8 L37341 3314 L21499.75 3500.0829908514024 L21499.8 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37231.0 2739.6 L37227.6 2749.8 L37220.5 2741.7 L37223.9 2731.5 Z"></path>
-					</g>
-					<path d="M33720.3 1707.7 L35841.5 1936 L34031 2588.936142371107 L34031.0 2588.9 " fill="none"></path>
-					<path d="M33720.8 1702.4 L33720.3 1707.7 L33719.7 1713.1 L33707.0 1706.3 Z"></path>
-					<path d="M69389.6 2772.3 L69279.75 3314 L32726.5 3500.2223470440003 L32726.5 3500.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M69396.7 2764.2 L69389.6 2772.3 L69386.3 2762.1 L69393.3 2754.0 Z"></path>
-					</g>
-					<path d="M69398.1 2772.5 L69319.75 3314 L72645 3493.717199159603 L72645.0 3493.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M69404.8 2764.0 L69398.1 2772.5 L69394.2 2762.5 L69400.8 2754.0 Z"></path>
-					</g>
-					<path d="M69423.8 2772.7 L69439.5 3314 L59371.25 3499.45925825329 L59371.3 3499.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M69428.8 2763.2 L69423.8 2772.7 L69418.2 2763.5 L69423.2 2754.0 Z"></path>
-					</g>
-					<path d="M69445.1 2772.4 L69539.25 3314 L61446.25 3499.297955926585 L61446.3 3499.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M69448.8 2762.3 L69445.1 2772.4 L69438.3 2764.1 L69441.9 2754.0 Z"></path>
-					</g>
-					<path d="M69183.0 849.7 L69419.5 966 L69419.5 1212.5 L69419.5 1212.5 L69419.5 1459 L69419.5 1459 L69419.5 1697.5 L69419.5 1697.5 L69419.5 1936 L69419.5 1936 L69419.5 2496 L69419.5 2496.0 " fill="none"></path>
-					<path d="M69185.3 844.9 L69183.0 849.7 L69180.6 854.5 L69171.0 843.8 Z"></path>
-					<path d="M33720.3 1706.8 L36069 1936 L34244.458635703915 2594 L34244.5 2594.0 " fill="none"></path>
-					<path d="M33720.8 1701.5 L33720.3 1706.8 L33719.8 1712.1 L33707.0 1705.5 Z"></path>
-					<path d="M72290.8 3900.7 L72290.75 4000 L72971.75 4110.143633071816 L72971.8 4110.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72296.1 3891.3 L72290.8 3900.7 L72285.4 3891.3 L72290.8 3882.0 Z"></path>
-					</g>
-					<path d="M73371.4 730.6 L73597.5 966 L73597.5 1212.5 L73597.5 1212.5 L73597.5 1459 L73597.5 1459 L73597.5 1697.5 L73597.5 1697.5 L73597.5 1936 L73597.5 1936 L73597.5 2625 L73597.5 2625 L73597.5 3314 L73597.5 3314 L73597.5 3500.5 L73597.5 3500.5 L73597.5 3687 L73597.5 3687 L72431.75 3826.61344939736 L72431.8 3826.6 " fill="none"></path>
-					<path d="M73375.2 726.9 L73371.4 730.6 L73367.5 734.3 L73362.1 721.0 Z"></path>
-					<path d="M64169.0 1319.2 L63859.75 1459 L63859.75 1682 L63859.8 1682.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M64179.7 1320.2 L64169.0 1319.2 L64175.3 1310.5 L64186.0 1311.5 Z"></path>
-					</g>
-					<path d="M64215.4 1320.8 L63973.25 1459 L63973.25 1697.5 L63973.25 1697.5 L63973.25 1936 L63973.25 1936 L63973.25 2625 L63973.25 2625 L63973.25 3314 L63973.25 3314 L25783 3500.287811815477 L25783.0 3500.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M64226.1 1320.8 L64215.4 1320.8 L64220.8 1311.5 L64231.6 1311.5 Z"></path>
-					</g>
-					<path d="M64264.5 1323.0 L64091.75 1459 L64091.75 1682 L64091.8 1682.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M64275.2 1321.5 L64264.5 1323.0 L64268.6 1313.1 L64279.2 1311.5 Z"></path>
-					</g>
-					<path d="M64392.2 1330.1 L64378.25 1459 L64378.25 1682 L64378.3 1682.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M64398.6 1321.4 L64392.2 1330.1 L64387.9 1320.2 L64394.3 1311.5 Z"></path>
-					</g>
-					<path d="M64623.0 1762.0 L64365.75 1936 L44706.5 2619.8345218411987 L44706.5 2619.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M64633.7 1761.1 L64623.0 1762.0 L64627.7 1752.3 L64638.4 1751.5 Z"></path>
-					</g>
-					<path d="M64724.3 1770.1 L64738.25 1936 L64738.25 2625 L64738.25 2625 L64738.25 3314 L64738.25 3314 L64738.25 3500.5 L64738.25 3500.5 L64738.25 3687 L64738.25 3687 L64738.25 3843.5 L64738.25 3843.5 L64738.25 4000 L64738.25 4000 L18421.25 4133.792019659833 L18421.3 4133.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M64728.9 1760.4 L64724.3 1770.1 L64718.2 1761.2 L64722.8 1751.5 Z"></path>
-					</g>
-					<path d="M64541.3 1319.7 L64718.25 1459 L64718.25 1643.5 L64718.3 1643.5 " fill="none"></path>
-					<path d="M64544.6 1315.6 L64541.3 1319.7 L64538.0 1323.9 L64530.8 1311.5 Z"></path>
-					<path d="M33720.3 1706.0 L36286.5 1936 L34466 2592.5425281339963 L34466.0 2592.5 " fill="none"></path>
-					<path d="M33720.8 1700.7 L33720.3 1706.0 L33719.8 1711.4 L33707.0 1704.8 Z"></path>
-					<path d="M73411.1 728.8 L73738 966 L73738 1181.5 L73738.0 1181.5 " fill="none"></path>
-					<path d="M73414.3 724.5 L73411.1 728.8 L73408.0 733.1 L73400.4 721.0 Z"></path>
-					<path d="M36238.0 2664.9 L35513.25 3314 L34495.5 3476.822539137894 L34495.5 3476.8 " fill="none"></path>
-					<path d="M36241.5 2668.9 L36238.0 2664.9 L36234.4 2660.9 L36247.9 2656.0 Z"></path>
-					<path d="M29513.3 1747.2 L29513.25 1936 L57557 2614.6545638143743 L57557.0 2614.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M29518.6 1737.8 L29513.3 1747.2 L29507.9 1737.8 L29513.3 1728.5 Z"></path>
-					</g>
-					<path d="M26090.8 1762.7 L26090.75 1936 L44746.5 2620.7240874162662 L44746.5 2620.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26096.1 1753.3 L26090.8 1762.7 L26085.4 1753.3 L26090.8 1744.0 Z"></path>
-					</g>
-					<path d="M29233.0 1219.3 L26090.75 1459 L26090.75 1651 L26090.8 1651.0 " fill="none"></path>
-					<path d="M29233.4 1224.6 L29233.0 1219.3 L29232.5 1214.0 L29246.3 1218.3 Z"></path>
-					<path d="M81375.0 1285.2 L81375 1459 L81375 1501 L81375.0 1501.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M81380.3 1275.8 L81375.0 1285.2 L81369.7 1275.8 L81375.0 1266.5 Z"></path>
-					</g>
-					<path d="M82061.9 157.9 L81375 293 L81375 629.5 L81375 629.5 L81375 966 L81375 966 L81375 1158.5 L81375.0 1158.5 " fill="none"></path>
-					<path d="M82062.9 163.2 L82061.9 157.9 L82060.9 152.7 L82075.0 155.4 Z"></path>
-					<path d="M55738.8 1767.2 L55348.25 1936 L55348.25 2541 L55348.3 2541.0 " fill="none"></path>
-					<path d="M55740.9 1772.1 L55738.8 1767.2 L55736.6 1762.3 L55751.0 1761.9 Z"></path>
-					<path d="M68605.6 2831.5 L68430.75 3314 L64999 3498.857065492093 L64999.0 3498.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68613.8 2824.6 L68605.6 2831.5 L68603.8 2821.0 L68612.0 2814.0 Z"></path>
-					</g>
-					<path d="M68617.5 2831.9 L68470.75 3314 L64120.25 3498.548675082452 L64120.3 3498.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68625.3 2824.5 L68617.5 2831.9 L68615.1 2821.4 L68623.0 2814.0 Z"></path>
-					</g>
-					<path d="M68629.5 2832.1 L68510.75 3314 L68510.75 3500.5 L68510.75 3500.5 L68510.75 3687 L68510.75 3687 L68510.75 3843.5 L68510.75 3843.5 L68510.75 4000 L68510.75 4000 L61787 4133.030526743199 L61787.0 4133.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68636.9 2824.3 L68629.5 2832.1 L68626.5 2821.8 L68633.9 2814.0 Z"></path>
-					</g>
-					<path d="M68692.6 2832.6 L68720.5 3314 L68720.5 3500.5 L68720.5 3500.5 L68720.5 3687 L68720.5 3687 L65998.75 3835.817844353219 L65998.8 3835.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68697.3 2823.0 L68692.6 2832.6 L68686.7 2823.6 L68691.5 2814.0 Z"></path>
-					</g>
-					<path d="M68743.5 2831.9 L68890.25 3314 L61446.25 3499.193890482225 L61446.3 3499.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68745.9 2821.4 L68743.5 2831.9 L68735.7 2824.5 L68738.0 2814.0 Z"></path>
-					</g>
-					<path d="M69184.3 673.6 L72164 966 L72164 1212.5 L72164 1212.5 L72164 1459 L72164 1459 L72164 1697.5 L72164 1697.5 L72164 1936 L72164 1936 L69100 2542.02727142242 L69100.0 2542.0 " fill="none"></path>
-					<path d="M69184.8 668.3 L69184.3 673.6 L69183.7 678.9 L69171.0 672.3 Z"></path>
-					<path d="M80982.7 1733.9 L78805.5 1936 L69100 2596.4532839506173 L69100.0 2596.5 " fill="none"></path>
-					<path d="M80983.2 1739.2 L80982.7 1733.9 L80982.2 1728.6 L80996.0 1732.7 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M67464.2 1224.2 L65019.25 1459 L65019.25 1697.5 L65019.25 1697.5 L65019.25 1936 L65019.25 1936 L68261 2546.055513827245 L68261.0 2546.1 " fill="none"></path>
-					</g>
-					<path d="M67464.7 1229.5 L67464.2 1224.2 L67463.7 1218.9 L67477.5 1222.9 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83142.4 1261.4 L82982 1459 L82982 1697.5 L82982 1697.5 L82982 1936 L82982 1936 L69100 2604.789847218823 L69100.0 2604.8 " fill="none"></path>
-					</g>
-					<path d="M83146.5 1264.7 L83142.4 1261.4 L83138.2 1258.0 L83150.8 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42572.6 1228.3 L40966.25 1459 L40966.25 1697.5 L40966.25 1697.5 L40966.25 1936 L40966.25 1936 L68261 2614.570870581019 L68261.0 2614.6 " fill="none"></path>
-					</g>
-					<path d="M42573.3 1233.5 L42572.6 1228.3 L42571.8 1223.0 L42585.8 1226.4 Z"></path>
-					<path d="M60972.7 2777.5 L60650.75 3314 L59371.25 3492.612836826347 L59371.3 3492.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M60982.1 2772.2 L60972.7 2777.5 L60973.0 2766.8 L60982.3 2761.5 Z"></path>
-					</g>
-					<path d="M61117.2 2779.2 L61301 3314 L61386.04155495978 3485 L61386.0 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M61119.2 2768.6 L61117.2 2779.2 L61109.1 2772.1 L61111.2 2761.5 Z"></path>
-					</g>
-					<path d="M58962.5 1727.1 L57470.25 1936 L60716.25 2558.285475792988 L60716.3 2558.3 " fill="none"></path>
-					<path d="M58963.3 1732.4 L58962.5 1727.1 L58961.8 1721.8 L58975.8 1725.2 Z"></path>
-					<path d="M82417.2 1821.2 L82176.5 1936 L61412.25 2613.642991628083 L61412.3 2613.6 " fill="none"></path>
-					<path d="M82419.5 1826.1 L82417.2 1821.2 L82414.9 1816.4 L82429.3 1815.5 Z"></path>
-					<path d="M80978.1 1813.6 L80559.75 1936 L80559.75 2625 L80559.75 2625 L80559.75 3314 L80559.75 3314 L80559.75 3500.5 L80559.75 3500.5 L80559.75 3687 L80559.75 3687 L66685.5 3842.6808779508506 L66685.5 3842.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M80988.5 1816.1 L80978.1 1813.6 L80985.5 1805.9 L80996.0 1808.4 Z"></path>
-					</g>
-					<path d="M81450.0 1911.6 L81458.5 1936 L81458.5 2625 L81458.5 2625 L81458.5 3314 L81458.5 3314 L59371.25 3500.0241433813153 L59371.3 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M81451.9 1901.0 L81450.0 1911.6 L81441.8 1904.6 L81443.8 1894.0 Z"></path>
-					</g>
-					<path d="M50903.7 1216.4 L44949 1459 L44949 1598.5 L44949.0 1598.5 " fill="none"></path>
-					<path d="M50903.9 1221.7 L50903.7 1216.4 L50903.5 1211.0 L50917.0 1215.8 Z"></path>
-					<path d="M46040.3 3618.2 L46040.25 3687 L66539.5 3842.944664535965 L66539.5 3842.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46045.6 3608.8 L46040.3 3618.2 L46034.9 3608.8 L46040.3 3599.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M49361.2 1702.9 L45728 1936 L45728 2625 L45728 2625 L45728 3314 L45728 3314 L45892.25 3412.1028823058446 L45892.3 3412.1 " fill="none"></path>
-					</g>
-					<path d="M49361.5 1708.3 L49361.2 1702.9 L49360.9 1697.6 L49374.5 1702.1 Z"></path>
-					<path d="M41252.8 1747.2 L41252.75 1936 L60716.25 2612.897332357469 L60716.3 2612.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41258.1 1737.8 L41252.8 1747.2 L41247.4 1737.8 L41252.8 1728.5 Z"></path>
-					</g>
-					<path d="M47693.0 2712.7 L47693 3314 L46188.25 3483.7993495689 L46188.3 3483.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M47698.3 2703.3 L47693.0 2712.7 L47687.7 2703.3 L47693.0 2694.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M49361.3 1709.0 L47693 1936 L47693 2556 L47693.0 2556.0 " fill="none"></path>
-					</g>
-					<path d="M49362.0 1714.3 L49361.3 1709.0 L49360.6 1703.7 L49374.5 1707.2 Z"></path>
-					<path d="M57860.9 2875.7 L57645 3314 L64938 3499.7232880453334 L64938.0 3499.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M57869.9 2869.7 L57860.9 2875.7 L57860.3 2865.0 L57869.2 2859.0 Z"></path>
-					</g>
-					<path d="M57875.3 2876.1 L57685 3314 L59258.25 3494.0344377972083 L59258.3 3494.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M57884.0 2869.7 L57875.3 2876.1 L57874.2 2865.4 L57882.8 2859.0 Z"></path>
-					</g>
-					<path d="M57889.8 2876.5 L57725 3314 L57725 3500.5 L57725 3500.5 L57725 3687 L57725 3687 L57725 3843.5 L57725 3843.5 L57725 4000 L57725 4000 L61689 4132.363817592824 L61689.0 4132.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M57898.1 2869.6 L57889.8 2876.5 L57888.1 2865.9 L57896.4 2859.0 Z"></path>
-					</g>
-					<path d="M57904.3 2876.8 L57765 3314 L57765 3500.5 L57765 3500.5 L57765 3687 L57765 3687 L65717.75 3840.78313718222 L65717.8 3840.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M57912.2 2869.5 L57904.3 2876.8 L57902.0 2866.3 L57910.0 2859.0 Z"></path>
-					</g>
-					<path d="M58411.1 2868.2 L59192.75 3314 L61341.25 3496.051453884598 L61341.3 3496.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M58405.6 2859.0 L58411.1 2868.2 L58400.3 2868.3 L58394.8 2859.0 Z"></path>
-					</g>
-					<path d="M59006.1 1731.1 L57984.5 1936 L57984.5 2391 L57984.5 2391.0 " fill="none"></path>
-					<path d="M59007.1 1736.4 L59006.1 1731.1 L59005.1 1725.9 L59019.2 1728.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M67464.2 1224.4 L65059.25 1459 L65059.25 1697.5 L65059.25 1697.5 L65059.25 1936 L65059.25 1936 L58412 2583.3663733700837 L58412.0 2583.4 " fill="none"></path>
-					</g>
-					<path d="M67464.7 1229.7 L67464.2 1224.4 L67463.7 1219.1 L67477.5 1223.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83149.8 1262.2 L83022 1459 L83022 1697.5 L83022 1697.5 L83022 1936 L83022 1936 L58412 2613.235746380429 L58412.0 2613.2 " fill="none"></path>
-					</g>
-					<path d="M83154.2 1265.1 L83149.8 1262.2 L83145.3 1259.3 L83157.0 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42572.6 1228.6 L41006.25 1459 L41006.25 1697.5 L41006.25 1697.5 L41006.25 1936 L41006.25 1936 L57557 2607.65148057073 L57557.0 2607.7 " fill="none"></path>
-					</g>
-					<path d="M42573.3 1233.9 L42572.6 1228.6 L42571.8 1223.4 L42585.8 1226.7 Z"></path>
-					<path d="M36249.1 2666.4 L35725.5 3314 L34928.5 3463.612984398591 L34928.5 3463.6 " fill="none"></path>
-					<path d="M36253.2 2669.7 L36249.1 2666.4 L36244.9 2663.0 L36257.4 2656.0 Z"></path>
-					<path d="M45337.0 1785.2 L45337 1936 L45337 2609.5 L45337.0 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45342.3 1775.8 L45337.0 1785.2 L45331.7 1775.8 L45337.0 1766.5 Z"></path>
-					</g>
-					<path d="M50903.7 1216.6 L45337 1459 L45337 1628.5 L45337.0 1628.5 " fill="none"></path>
-					<path d="M50903.9 1222.0 L50903.7 1216.6 L50903.4 1211.3 L50917.0 1216.0 Z"></path>
-					<path d="M46100.1 2712.1 L45945.25 3314 L59258.25 3499.7118441228167 L59258.3 3499.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46107.6 2704.4 L46100.1 2712.1 L46097.3 2701.7 L46104.7 2694.0 Z"></path>
-					</g>
-					<path d="M46158.7 2711.2 L46411.75 3314 L45241.5 3485.615195596619 L45241.5 3485.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46160.0 2700.5 L46158.7 2711.2 L46150.2 2704.7 L46151.5 2694.0 Z"></path>
-					</g>
-					<path d="M46689.1 2748.7 L46451.75 3314 L45464.03016085791 3485 L45464.0 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46697.6 2742.2 L46689.1 2748.7 L46687.8 2738.0 L46696.3 2731.5 Z"></path>
-					</g>
-					<path d="M46781.5 2749.2 L46965.75 3314 L25783 3500.1177963606383 L25783.0 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46783.7 2738.7 L46781.5 2749.2 L46773.6 2742.0 L46775.7 2731.5 Z"></path>
-					</g>
-					<path d="M47190.0 2749.2 L47005.75 3314 L47005.75 3485 L47005.8 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M47197.9 2742.0 L47190.0 2749.2 L47187.8 2738.7 L47195.8 2731.5 Z"></path>
-					</g>
-					<path d="M47268.6 2749.3 L47441.75 3314 L25783 3500.126179313205 L25783.0 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M47271.0 2738.9 L47268.6 2749.3 L47260.8 2742.0 L47263.2 2731.5 Z"></path>
-					</g>
-					<path d="M14099.6 3449.9 L14111.5 3447 L14119 3447 L14119 3447 L14126.5 3500.5 L14126.5 3500.5 L14119 3554 L14119 3554 L14111.5 3554 L14111.5 3554 L14081.5 3546.7539503386006 L14081.5 3546.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14089.3 3446.9 L14099.6 3449.9 L14091.8 3457.2 L14081.5 3454.2 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3118.7 2652.5 L3441.5 3314 L13698.5 3497.0818299277407 L13698.5 3497.1 " fill="none"></path>
-					</g>
-					<path d="M3123.5 2650.1 L3118.7 2652.5 L3113.9 2654.8 L3112.8 2640.5 Z"></path>
-					<path d="M26535.3 1777.7 L26535.25 1936 L38452.5 2597.6026630139195 L38452.5 2597.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26540.6 1768.3 L26535.3 1777.7 L26529.9 1768.3 L26535.3 1759.0 Z"></path>
-					</g>
-					<path d="M29233.0 1220.4 L26535.25 1459 L26535.25 1636 L26535.3 1636.0 " fill="none"></path>
-					<path d="M29233.4 1225.7 L29233.0 1220.4 L29232.5 1215.1 L29246.3 1219.2 Z"></path>
-					<path d="M79326.3 165.3 L79326.25 293 L79326.25 583 L79326.3 583.0 " fill="none"></path>
-					<path d="M79331.6 165.3 L79326.3 165.3 L79320.9 165.3 L79326.3 152.0 Z"></path>
-					<path d="M27054.3 1777.7 L27054.25 1936 L38452.5 2596.4069417873734 L38452.5 2596.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M27059.6 1768.3 L27054.3 1777.7 L27048.9 1768.3 L27054.3 1759.0 Z"></path>
-					</g>
-					<path d="M29233.0 1222.2 L27054.25 1459 L27054.25 1636 L27054.3 1636.0 " fill="none"></path>
-					<path d="M29233.6 1227.5 L29233.0 1222.2 L29232.4 1216.9 L29246.3 1220.8 Z"></path>
-					<path d="M38471.5 2921.4 L37843 3314 L14081.5 3499.008965474053 L14081.5 3499.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38482.3 2921.0 L38471.5 2921.4 L38476.6 2911.9 L38487.4 2911.5 Z"></path>
-					</g>
-					<path d="M38778.8 2927.8 L38565.5 3314 L59258.25 3499.9921623673144 L59258.3 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38787.9 2922.2 L38778.8 2927.8 L38778.6 2917.1 L38787.8 2911.5 Z"></path>
-					</g>
-					<path d="M39457.7 2745.5 L41872.75 3314 L61341.25 3499.998424773321 L61341.3 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39449.8 2738.1 L39457.7 2745.5 L39447.4 2748.5 L39439.5 2741.2 Z"></path>
-					</g>
-					<path d="M59162.7 1741.4 L59113.75 1936 L39439.5 2608.140335436526 L39439.5 2608.1 " fill="none"></path>
-					<path d="M59167.9 1742.7 L59162.7 1741.4 L59157.5 1740.1 L59166.0 1728.5 Z"></path>
-					<path d="M41934.9 1793.9 L41776 1936 L39439.5 2504.8510600706713 L39439.5 2504.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41945.4 1791.7 L41934.9 1793.9 L41938.3 1783.7 L41948.8 1781.5 Z"></path>
-					</g>
-					<path d="M42092.1 1798.3 L42159.5 1936 L42159.5 2625 L42159.5 2625 L42159.5 3314 L42159.5 3314 L48614 3496.873414356248 L48614.0 3496.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42092.8 1787.5 L42092.1 1798.3 L42083.2 1792.2 L42083.9 1781.5 Z"></path>
-					</g>
-					<path d="M65137.4 2816.5 L64953.25 3314 L64967.23257372654 3485 L64967.2 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65145.6 2809.6 L65137.4 2816.5 L65135.6 2805.9 L65143.9 2799.0 Z"></path>
-					</g>
-					<path d="M65148.4 2816.8 L64993.25 3314 L64120.25 3491.164853101197 L64120.3 3491.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65156.3 2809.5 L65148.4 2816.8 L65146.1 2806.3 L65154.0 2799.0 Z"></path>
-					</g>
-					<path d="M65536.2 2441.9 L66442.25 1936 L66325.60849056604 1804 L66325.6 1804.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65525.4 2441.8 L65536.2 2441.9 L65530.6 2451.1 L65519.9 2451.0 Z"></path>
-					</g>
-					<path d="M65162.4 2817.2 L65043.75 3314 L65043.75 3500.5 L65043.75 3500.5 L65043.75 3687 L65043.75 3687 L65043.75 3843.5 L65043.75 3843.5 L65043.75 4000 L65043.75 4000 L61787 4132.0137638962415 L61787.0 4132.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65169.7 2809.3 L65162.4 2817.2 L65159.4 2806.8 L65166.7 2799.0 Z"></path>
-					</g>
-					<path d="M65222.4 2817.6 L65258.75 3314 L65258.75 3500.5 L65258.75 3500.5 L65258.75 3687 L65258.75 3687 L65717.75 3806.8223519599665 L65717.8 3806.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65227.0 2807.9 L65222.4 2817.6 L65216.4 2808.7 L65221.0 2799.0 Z"></path>
-					</g>
-					<path d="M65268.1 2816.8 L65423.25 3314 L61446.25 3498.0701079538403 L61446.3 3498.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65270.4 2806.3 L65268.1 2816.8 L65260.2 2809.5 L65262.5 2799.0 Z"></path>
-					</g>
-					<path d="M69184.3 673.1 L72204 966 L72204 1212.5 L72204 1212.5 L72204 1459 L72204 1459 L72204 1697.5 L72204 1697.5 L72204 1936 L72204 1936 L65638.25 2582.6500017867993 L65638.3 2582.7 " fill="none"></path>
-					<path d="M69184.8 667.8 L69184.3 673.1 L69183.8 678.4 L69171.0 671.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M67464.2 1224.6 L65099.25 1459 L65099.25 1697.5 L65099.25 1697.5 L65099.25 1936 L65099.25 1936 L65180.72314949202 2451 L65180.7 2451.0 " fill="none"></path>
-					</g>
-					<path d="M67464.8 1229.9 L67464.2 1224.6 L67463.7 1219.3 L67477.5 1223.3 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42572.7 1235.3 L41499.25 1459 L41499.25 1697.5 L41499.25 1697.5 L41499.25 1936 L41499.25 1936 L64778.25 2612.503901472015 L64778.3 2612.5 " fill="none"></path>
-					</g>
-					<path d="M42573.8 1240.5 L42572.7 1235.3 L42571.6 1230.1 L42585.8 1232.6 Z"></path>
-					<path d="M65967.3 1811.4 L65678.25 1936 L65678.25 2625 L65678.25 2625 L65678.25 3314 L65678.25 3314 L65678.25 3500.5 L65678.25 3500.5 L65678.25 3687 L65678.25 3687 L65717.75 3721.3430555555556 L65717.8 3721.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65978.0 1812.6 L65967.3 1811.4 L65973.8 1802.8 L65984.5 1804.0 Z"></path>
-					</g>
-					<path d="M66221.0 1822.6 L66211.5 1936 L65461.61066763425 2451 L65461.6 2451.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M66227.1 1813.7 L66221.0 1822.6 L66216.5 1812.9 L66222.6 1804.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M67464.4 1234.6 L66231.5 1459 L66231.5 1591 L66231.5 1591.0 " fill="none"></path>
-					</g>
-					<path d="M67465.3 1239.9 L67464.4 1234.6 L67463.4 1229.4 L67477.5 1232.2 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83157.4 1263.0 L83062 1459 L66653 1691.5270491072754 L66653.0 1691.5 " fill="none"></path>
-					</g>
-					<path d="M83162.2 1265.3 L83157.4 1263.0 L83152.6 1260.7 L83163.3 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42572.7 1236.1 L41539.25 1459 L65810 1693.4287731980683 L65810.0 1693.4 " fill="none"></path>
-					</g>
-					<path d="M42573.8 1241.3 L42572.7 1236.1 L42571.6 1230.9 L42585.8 1233.3 Z"></path>
-					<path d="M49043.7 2711.1 L48779 3314 L20909.5 3499.498278015703 L20909.5 3499.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M49052.3 2704.7 L49043.7 2711.1 L49042.6 2700.4 L49051.2 2694.0 Z"></path>
-					</g>
-					<path d="M49124.0 2710.7 L49423.25 3314 L24714 3499.419416977659 L24714.0 3499.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M49124.6 2700.0 L49124.0 2710.7 L49115.1 2704.7 L49115.7 2694.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M49435.5 1741.5 L49389 1936 L49389 2563.5 L49389.0 2563.5 " fill="none"></path>
-					</g>
-					<path d="M49440.7 1742.7 L49435.5 1741.5 L49430.3 1740.2 L49438.6 1728.5 Z"></path>
-					<path d="M20927.4 3450.6 L20939.5 3447 L20947 3447 L20947 3447 L20954.5 3500.5 L20954.5 3500.5 L20947 3554 L20947 3554 L20939.5 3554 L20939.5 3554 L20909.5 3545.1080332409974 L20909.5 3545.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20916.9 3448.1 L20927.4 3450.6 L20920.0 3458.4 L20909.5 3455.9 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3120.1 2652.2 L3481.5 3314 L20608.5 3498.8754449428448 L20608.5 3498.9 " fill="none"></path>
-					</g>
-					<path d="M3124.8 2649.6 L3120.1 2652.2 L3115.4 2654.8 L3113.7 2640.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M50903.8 1227.5 L49446 1459 L49446 1666.5 L49446.0 1666.5 " fill="none"></path>
-					</g>
-					<path d="M50904.7 1232.8 L50903.8 1227.5 L50903.0 1222.3 L50917.0 1225.4 Z"></path>
-					<path d="M71485.7 2884.5 L71364.75 3314 L64999 3499.6106898573385 L64999.0 3499.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71493.4 2876.9 L71485.7 2884.5 L71483.1 2874.0 L71490.8 2866.5 Z"></path>
-					</g>
-					<path d="M71500.7 2884.7 L71404.75 3314 L59371.25 3499.6284325889164 L59371.3 3499.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71507.9 2876.8 L71500.7 2884.7 L71497.5 2874.4 L71504.8 2866.5 Z"></path>
-					</g>
-					<path d="M71624.3 2884.6 L71732.75 3314 L61446.25 3499.5529790115097 L61446.3 3499.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71627.2 2874.2 L71624.3 2884.6 L71616.9 2876.9 L71619.7 2866.5 Z"></path>
-					</g>
-					<path d="M69184.3 672.6 L72244 966 L72244 1212.5 L72244 1212.5 L72244 1459 L72244 1459 L72244 1697.5 L72244 1697.5 L72244 1936 L72244 1936 L71798.93559506531 2383.5 L71798.9 2383.5 " fill="none"></path>
-					<path d="M69184.8 667.3 L69184.3 672.6 L69183.8 677.9 L69171.0 671.3 Z"></path>
-					<path d="M36260.0 2667.8 L35919.5 3314 L35191.5 3475.729600952948 L35191.5 3475.7 " fill="none"></path>
-					<path d="M36264.7 2670.3 L36260.0 2667.8 L36255.2 2665.3 L36266.2 2656.0 Z"></path>
-					<path d="M49805.0 2727.7 L49805 3314 L49853.00938337802 3386.5 L49853.0 3386.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M49810.3 2718.3 L49805.0 2727.7 L49799.7 2718.3 L49805.0 2709.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M49503.8 1735.9 L49805 1936 L49805 2541 L49805.0 2541.0 " fill="none"></path>
-					</g>
-					<path d="M49506.7 1731.4 L49503.8 1735.9 L49500.8 1740.3 L49492.7 1728.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M49529.9 1730.5 L50052 1936 L50052 2625 L50052 2625 L50052 3314 L50052 3314 L50003.99061662198 3386.5 L50004.0 3386.5 " fill="none"></path>
-					</g>
-					<path d="M49531.9 1725.6 L49529.9 1730.5 L49528.0 1735.5 L49517.5 1725.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3121.5 2651.9 L3521.5 3314 L2438 3472.240211433046 L2438.0 3472.2 " fill="none"></path>
-					</g>
-					<path d="M3126.1 2649.2 L3121.5 2651.9 L3116.9 2654.7 L3114.6 2640.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M49530.4 1720.0 L50339 1936 L50339 2563.5 L50339.0 2563.5 " fill="none"></path>
-					</g>
-					<path d="M49531.8 1714.9 L49530.4 1720.0 L49529.0 1725.2 L49517.5 1716.6 Z"></path>
-					<path d="M42578.3 1747.2 L42578.25 1936 L62772.25 2613.3277188199786 L62772.3 2613.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42583.6 1737.8 L42578.3 1747.2 L42572.9 1737.8 L42578.3 1728.5 Z"></path>
-					</g>
-					<path d="M27505.8 1762.7 L27505.75 1936 L45441 2620.2880736485085 L45441.0 2620.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M27511.1 1753.3 L27505.8 1762.7 L27500.4 1753.3 L27505.8 1744.0 Z"></path>
-					</g>
-					<path d="M29233.0 1224.6 L27505.75 1459 L27505.75 1651 L27505.8 1651.0 " fill="none"></path>
-					<path d="M29233.8 1229.9 L29233.0 1224.6 L29232.3 1219.3 L29246.3 1222.8 Z"></path>
-					<path d="M55737.8 2742.7 L55737.75 3314 L52887 3489.1923140291624 L52887.0 3489.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M55743.1 2733.3 L55737.8 2742.7 L55732.4 2733.3 L55737.8 2724.0 Z"></path>
-					</g>
-					<path d="M55835.4 1792.5 L55737.75 1936 L55737.75 2526 L55737.8 2526.0 " fill="none"></path>
-					<path d="M55839.8 1795.5 L55835.4 1792.5 L55830.9 1789.5 L55842.9 1781.5 Z"></path>
-					<path d="M63055.6 2854.5 L62926.25 3314 L64938 3497.7147141633004 L64938.0 3497.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M63063.3 2846.9 L63055.6 2854.5 L63053.0 2844.0 L63060.7 2836.5 Z"></path>
-					</g>
-					<path d="M63068.9 2854.7 L62966.25 3314 L59371.25 3497.6142681089964 L59371.3 3497.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M63076.1 2846.8 L63068.9 2854.7 L63065.7 2844.4 L63073.0 2836.5 Z"></path>
-					</g>
-					<path d="M63178.2 2854.6 L63294.25 3314 L61446.25 3495.3480662983425 L61446.3 3495.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M63181.1 2844.2 L63178.2 2854.6 L63170.8 2846.9 L63173.7 2836.5 Z"></path>
-					</g>
-					<path d="M59177.3 1741.8 L59192.75 1936 L62772.25 2563.9504774029283 L62772.3 2564.0 " fill="none"></path>
-					<path d="M59182.6 1741.4 L59177.3 1741.8 L59172.0 1742.2 L59176.2 1728.5 Z"></path>
-					<path d="M63234.2 1835.3 L63120.25 1936 L63120.25 2413.5 L63120.3 2413.5 " fill="none"></path>
-					<path d="M63237.8 1839.3 L63234.2 1835.3 L63230.7 1831.3 L63244.2 1826.5 Z"></path>
-					<path d="M82417.4 1831.9 L82216.5 1936 L63468.25 2612.4440269686456 L63468.3 2612.4 " fill="none"></path>
-					<path d="M82419.9 1836.6 L82417.4 1831.9 L82415.0 1827.2 L82429.3 1825.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M67464.6 1246.0 L66693 1459 L66693 1697.5 L66693 1697.5 L66693 1936 L66693 1936 L63468.25 2557.888671191659 L63468.3 2557.9 " fill="none"></path>
-					</g>
-					<path d="M67466.1 1251.1 L67464.6 1246.0 L67463.2 1240.9 L67477.5 1242.4 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83165.4 1263.7 L83102 1459 L83102 1697.5 L83102 1697.5 L83102 1936 L83102 1936 L63468.25 2613.000450411 L63468.3 2613.0 " fill="none"></path>
-					</g>
-					<path d="M83170.5 1265.3 L83165.4 1263.7 L83160.3 1262.0 L83169.5 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42572.7 1237.0 L41579.25 1459 L41579.25 1697.5 L41579.25 1697.5 L41579.25 1936 L41579.25 1936 L62772.25 2613.8690404345202 L62772.3 2613.9 " fill="none"></path>
-					</g>
-					<path d="M42573.9 1242.2 L42572.7 1237.0 L42571.6 1231.8 L42585.8 1234.1 Z"></path>
-					<path d="M36275.0 2669.1 L36166 3314 L35516.06836461126 3469.5 L35516.1 3469.5 " fill="none"></path>
-					<path d="M36280.3 2670.0 L36275.0 2669.1 L36269.8 2668.3 L36277.3 2656.0 Z"></path>
-					<path d="M67307.4 2821.2 L66922.25 3314 L64999 3497.5885476647472 L64999.0 3497.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M67317.4 2817.1 L67307.4 2821.2 L67308.9 2810.6 L67318.9 2806.5 Z"></path>
-					</g>
-					<path d="M67318.5 2821.6 L66962.25 3314 L64120.25 3497.529432132964 L64120.3 3497.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M67328.3 2817.2 L67318.5 2821.6 L67319.6 2810.9 L67329.4 2806.5 Z"></path>
-					</g>
-					<path d="M67360.5 2823.2 L67112 3314 L67112 3500.5 L67112 3500.5 L67112 3687 L67112 3687 L67112 3843.5 L67112 3843.5 L67112 4000 L67112 4000 L61787 4132.778191291403 L61787.0 4132.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M67369.4 2817.2 L67360.5 2823.2 L67359.9 2812.4 L67368.9 2806.5 Z"></path>
-					</g>
-					<path d="M67438.8 2825.1 L67385 3314 L67385 3500.5 L67385 3500.5 L67385 3687 L67385 3687 L65998.75 3829.0980022924514 L65998.8 3829.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M67445.1 2816.4 L67438.8 2825.1 L67434.5 2815.2 L67440.8 2806.5 Z"></path>
-					</g>
-					<path d="M67539.5 2823.9 L67733.75 3314 L61446.25 3498.955638801262 L61446.3 3499.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M67541.1 2813.2 L67539.5 2823.9 L67531.1 2817.1 L67532.7 2806.5 Z"></path>
-					</g>
-					<path d="M69184.3 672.1 L72284 966 L72284 1212.5 L72284 1212.5 L72284 1459 L72284 1459 L72284 1697.5 L72284 1697.5 L72284 1936 L72284 1936 L68006.75 2547.0040429171204 L68006.8 2547.0 " fill="none"></path>
-					<path d="M69184.8 666.8 L69184.3 672.1 L69183.8 677.4 L69171.0 670.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M67464.7 1247.6 L66733 1459 L66733 1697.5 L66733 1697.5 L66733 1936 L66733 1936 L67269.04227140783 2443.5 L67269.0 2443.5 " fill="none"></path>
-					</g>
-					<path d="M67466.2 1252.7 L67464.7 1247.6 L67463.2 1242.4 L67477.5 1243.9 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83173.6 1264.2 L83142 1459 L83142 1697.5 L83142 1697.5 L83142 1936 L83142 1936 L68006.75 2601.0099481865286 L68006.8 2601.0 " fill="none"></path>
-					</g>
-					<path d="M83178.9 1265.0 L83173.6 1264.2 L83168.4 1263.3 L83175.8 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42572.8 1237.9 L41619.25 1459 L41619.25 1697.5 L41619.25 1697.5 L41619.25 1936 L41619.25 1936 L66914.75 2610.4422537391406 L66914.8 2610.4 " fill="none"></path>
-					</g>
-					<path d="M42574.0 1243.1 L42572.8 1237.9 L42571.6 1232.7 L42585.8 1234.9 Z"></path>
-					<path d="M27524.8 2694.0 L26104.5 3314 L27548.25 3488.8153708813506 L27548.3 3488.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M27535.5 2695.1 L27524.8 2694.0 L27531.2 2685.3 L27541.9 2686.5 Z"></path>
-					</g>
-					<path d="M27730.7 2702.4 L28109.5 3314 L28175.286863270776 3485 L28175.3 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M27730.3 2691.6 L27730.7 2702.4 L27721.2 2697.2 L27720.8 2686.5 Z"></path>
-					</g>
-					<path d="M29233.1 1226.2 L27717.75 1459 L27717.75 1697.5 L27717.75 1697.5 L27717.75 1936 L27717.75 1936 L27685.874092888243 2563.5 L27685.9 2563.5 " fill="none"></path>
-					<path d="M29233.9 1231.5 L29233.1 1226.2 L29232.3 1220.9 L29246.3 1224.2 Z"></path>
-					<path d="M53428.1 2769.0 L53022.25 3314 L59258.25 3498.825427095749 L59258.3 3498.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M53437.9 2764.7 L53428.1 2769.0 L53429.4 2758.3 L53439.2 2754.0 Z"></path>
-					</g>
-					<path d="M53643.0 2768.9 L54051.25 3314 L61341.25 3499.1664964249235 L61341.3 3499.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M53641.7 2758.3 L53643.0 2768.9 L53633.2 2764.7 L53631.9 2754.0 Z"></path>
-					</g>
-					<path d="M59184.6 1741.4 L59232.75 1936 L53883.25 2582.9162790697674 L53883.3 2582.9 " fill="none"></path>
-					<path d="M59189.8 1740.2 L59184.6 1741.4 L59179.4 1742.7 L59181.4 1728.5 Z"></path>
-					<path d="M36289.8 2669.2 L36395.75 3314 L35951.461126005364 3454.5 L35951.5 3454.5 " fill="none"></path>
-					<path d="M36295.0 2668.3 L36289.8 2669.2 L36284.5 2670.0 L36287.6 2656.0 Z"></path>
-					<path d="M81794.0 2712.7 L81794 3314 L61180.25 3497.991881932064 L61180.3 3498.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M81799.3 2703.3 L81794.0 2712.7 L81788.7 2703.3 L81794.0 2694.0 Z"></path>
-					</g>
-					<path d="M82084.0 172.6 L81794 293 L81794 629.5 L81794 629.5 L81794 966 L81794 966 L81794 1212.5 L81794 1212.5 L81794 1459 L81794 1459 L81794 1697.5 L81794 1697.5 L81794 1936 L81794 1936 L81794 2556 L81794.0 2556.0 " fill="none"></path>
-					<path d="M82086.1 177.5 L82084.0 172.6 L82082.0 167.7 L82096.3 167.5 Z"></path>
-					<path d="M51004.3 1272.3 L51022.25 1459 L51022.25 1613.5 L51022.3 1613.5 " fill="none"></path>
-					<path d="M51009.6 1271.8 L51004.3 1272.3 L50999.0 1272.8 L51003.0 1259.0 Z"></path>
-					<path d="M44527.5 1747.2 L44527.5 1936 L53187.25 2598.381588076934 L53187.3 2598.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44532.8 1737.8 L44527.5 1747.2 L44522.2 1737.8 L44527.5 1728.5 Z"></path>
-					</g>
-					<path d="M50797.6 2725.3 L50472.5 3314 L36482.5 3499.74321919271 L36482.5 3499.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M50806.8 2719.7 L50797.6 2725.3 L50797.4 2714.6 L50806.6 2709.0 Z"></path>
-					</g>
-					<path d="M50869.9 2727.4 L50966.5 3314 L52519 3480.7384105960264 L52519.0 3480.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M50873.6 2717.3 L50869.9 2727.4 L50863.1 2719.1 L50866.8 2709.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M49530.6 1711.8 L50853 1936 L50853 2541 L50853.0 2541.0 " fill="none"></path>
-					</g>
-					<path d="M49531.5 1706.6 L49530.6 1711.8 L49529.8 1717.1 L49517.5 1709.6 Z"></path>
-					<path d="M60899.3 3685.7 L60899.25 3687 L60899.25 3843.5 L60899.25 3843.5 L60899.25 4000 L60899.25 4000 L61689 4126.171684053651 L61689.0 4126.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M60904.6 3676.3 L60899.3 3685.7 L60893.9 3676.3 L60899.3 3667.0 Z"></path>
-					</g>
-					<path d="M48049.5 3305.6 L48044.75 3314 L60618.25 3496.423100859621 L60618.3 3496.4 " fill="none"></path>
-					<path d="M48054.2 3308.2 L48049.5 3305.6 L48044.9 3303.0 L48056.1 3294.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M52469.3 2669.3 L52469.25 3314 L60618.25 3494.2833333333333 L60618.3 3494.3 " fill="none"></path>
-					</g>
-					<path d="M52474.6 2669.3 L52469.3 2669.3 L52463.9 2669.3 L52469.3 2656.0 Z"></path>
-					<path d="M66217.1 2888.7 L65883.75 3314 L64999 3494.2850314121824 L64999.0 3494.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M66227.0 2884.6 L66217.1 2888.7 L66218.6 2878.1 L66228.6 2874.0 Z"></path>
-					</g>
-					<path d="M66232.1 2889.1 L65923.75 3314 L64120.25 3495.861449040281 L64120.3 3495.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M66241.9 2884.7 L66232.1 2889.1 L66233.3 2878.4 L66243.1 2874.0 Z"></path>
-					</g>
-					<path d="M66247.1 2889.5 L65963.75 3314 L66032.3827077748 3394 L66032.4 3394.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M66256.8 2884.7 L66247.1 2889.5 L66247.9 2878.8 L66257.5 2874.0 Z"></path>
-					</g>
-					<path d="M66262.2 2889.9 L66003.75 3314 L59371.25 3498.9246897892062 L59371.3 3498.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M66271.7 2884.7 L66262.2 2889.9 L66262.6 2879.2 L66272.0 2874.0 Z"></path>
-					</g>
-					<path d="M66554.3 2890.8 L66762.25 3314 L66762.25 3500.5 L66762.25 3500.5 L66762.25 3687 L66762.25 3687 L66762.25 3843.5 L66762.25 3843.5 L66762.25 4000 L66762.25 4000 L61787 4132.6931382793455 L61787.0 4132.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M66555.0 2880.0 L66554.3 2890.8 L66545.4 2884.7 L66546.1 2874.0 Z"></path>
-					</g>
-					<path d="M66569.5 2890.4 L66802.25 3314 L66802.25 3500.5 L66802.25 3500.5 L66802.25 3687 L66802.25 3687 L65998.75 3820.2073622881358 L65998.8 3820.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M66569.7 2879.6 L66569.5 2890.4 L66560.4 2884.7 L66560.5 2874.0 Z"></path>
-					</g>
-					<path d="M66584.7 2890.0 L66842.25 3314 L61446.25 3498.7029457648896 L61446.3 3498.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M66584.4 2879.2 L66584.7 2890.0 L66575.3 2884.7 L66575.0 2874.0 Z"></path>
-					</g>
-					<path d="M69184.3 671.6 L72324 966 L72324 1212.5 L72324 1212.5 L72324 1459 L72324 1459 L72324 1697.5 L72324 1697.5 L72324 1936 L72324 1936 L66874.75 2572.3346044659124 L66874.8 2572.3 " fill="none"></path>
-					<path d="M69184.8 666.3 L69184.3 671.6 L69183.8 676.9 L69171.0 670.4 Z"></path>
-					<path d="M63276.9 1836.8 L63196.25 1936 L65972.75 2528.7214562354766 L65972.8 2528.7 " fill="none"></path>
-					<path d="M63281.0 1840.2 L63276.9 1836.8 L63272.8 1833.5 L63285.3 1826.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M67517.0 1258.4 L67215.25 1459 L67215.25 1697.5 L67215.25 1697.5 L67215.25 1936 L67215.25 1936 L66709.7928156749 2376 L66709.8 2376.0 " fill="none"></path>
-					</g>
-					<path d="M67519.9 1262.8 L67517.0 1258.4 L67514.0 1253.9 L67528.1 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83182.0 1264.3 L83182 1459 L83182 1697.5 L83182 1697.5 L83182 1936 L83182 1936 L66874.75 2606.4575507585814 L66874.8 2606.5 " fill="none"></path>
-					</g>
-					<path d="M83187.3 1264.3 L83182.0 1264.3 L83176.7 1264.3 L83182.0 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42625.2 1250.9 L42316.25 1459 L42316.25 1697.5 L42316.25 1697.5 L42316.25 1936 L42316.25 1936 L65972.75 2612.110276884787 L65972.8 2612.1 " fill="none"></path>
-					</g>
-					<path d="M42628.1 1255.4 L42625.2 1250.9 L42622.2 1246.5 L42636.2 1243.5 Z"></path>
-					<path d="M66123.8 3625.7 L66123.75 3687 L65998.75 3760.6817325800375 L65998.8 3760.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M66129.1 3616.3 L66123.8 3625.7 L66118.4 3616.3 L66123.8 3607.0 Z"></path>
-					</g>
-					<path d="M66541.9 3397.7 L66882.25 3314 L66589.44883889695 2874 L66589.4 2874.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M66531.5 3394.7 L66541.9 3397.7 L66534.1 3405.1 L66523.8 3402.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M67669.7 1257.3 L68046.75 1459 L68046.75 1697.5 L68046.75 1697.5 L68046.75 1936 L68046.75 1936 L68046.75 2625 L68046.75 2625 L68046.75 3314 L68046.75 3314 L66523.75 3461.7064482579303 L66523.8 3461.7 " fill="none"></path>
-					</g>
-					<path d="M67672.2 1252.6 L67669.7 1257.3 L67667.2 1262.0 L67658.0 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83190.4 1264.2 L83222 1459 L83222 1697.5 L83222 1697.5 L83222 1936 L83222 1936 L83222 2625 L83222 2625 L83222 3314 L83222 3314 L66523.75 3496.13698039273 L66523.8 3496.1 " fill="none"></path>
-					</g>
-					<path d="M83195.6 1263.3 L83190.4 1264.2 L83185.1 1265.0 L83188.2 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42709.3 1254.7 L42840.25 1459 L42840.25 1697.5 L42840.25 1697.5 L42840.25 1936 L42840.25 1936 L42840.25 2625 L42840.25 2625 L42840.25 3314 L42840.25 3314 L65723.75 3497.2960143449222 L65723.8 3497.3 " fill="none"></path>
-					</g>
-					<path d="M42713.8 1251.8 L42709.3 1254.7 L42704.8 1257.6 L42702.1 1243.5 Z"></path>
-					<path d="M71338.5 1741.1 L69699 1936 L69699 2625 L69699 2625 L69699 3314 L69699 3314 L64999 3499.2975372582177 L64999.0 3499.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71348.4 1745.3 L71338.5 1741.1 L71347.1 1734.7 L71357.0 1738.9 Z"></path>
-					</g>
-					<path d="M71339.6 1839.4 L71090.75 1936 L71090.75 2625 L71090.75 2625 L71090.75 3314 L71090.75 3314 L72645 3486.565932430421 L72645.0 3486.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71350.2 1841.0 L71339.6 1839.4 L71346.4 1831.0 L71357.0 1832.6 Z"></path>
-					</g>
-					<path d="M71339.8 1849.2 L71130.75 1936 L71130.75 2625 L71130.75 2625 L71130.75 3314 L71130.75 3314 L71130.75 3500.5 L71130.75 3500.5 L71130.75 3687 L71130.75 3687 L71130.75 3843.5 L71130.75 3843.5 L71130.75 4000 L71130.75 4000 L72971.75 4124.060346995223 L72971.8 4124.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71350.4 1850.5 L71339.8 1849.2 L71346.3 1840.7 L71357.0 1842.0 Z"></path>
-					</g>
-					<path d="M71340.0 1860.5 L71170.75 1936 L71170.75 2625 L71170.75 2625 L71170.75 3314 L71170.75 3314 L64120.25 3499.291094201367 L64120.3 3499.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71350.7 1861.5 L71340.0 1860.5 L71346.3 1851.8 L71357.0 1852.9 Z"></path>
-					</g>
-					<path d="M71583.9 1894.9 L71558.75 1936 L71558.75 2383.5 L71558.8 2383.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71593.4 1889.7 L71583.9 1894.9 L71584.3 1884.2 L71593.7 1879.0 Z"></path>
-					</g>
-					<path d="M71694.7 1897.6 L71692.75 1936 L66874.75 2566.0250521920666 L66874.8 2566.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71700.5 1888.6 L71694.7 1897.6 L71689.9 1888.0 L71695.7 1879.0 Z"></path>
-					</g>
-					<path d="M71728.3 1897.5 L71732.75 1936 L68006.75 2536.9396067415732 L68006.8 2536.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71732.5 1887.7 L71728.3 1897.5 L71721.9 1888.9 L71726.1 1879.0 Z"></path>
-					</g>
-					<path d="M71761.7 1897.0 L71772.75 1936 L65638.25 2579.867849798157 L65638.3 2579.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71764.2 1886.5 L71761.7 1897.0 L71754.0 1889.4 L71756.6 1879.0 Z"></path>
-					</g>
-					<path d="M71794.7 1896.0 L71812.75 1936 L69100 2532.722723281986 L69100.0 2532.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71795.7 1885.3 L71794.7 1896.0 L71786.0 1889.7 L71787.0 1879.0 Z"></path>
-					</g>
-					<path d="M71902.3 1892.1 L71946.75 1936 L71946.75 2625 L71946.75 2625 L71946.75 3314 L71946.75 3314 L61446.25 3499.572183265422 L61446.3 3499.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71899.4 1881.8 L71902.3 1892.1 L71891.9 1889.4 L71889.0 1879.0 Z"></path>
-					</g>
-					<path d="M69184.3 671.2 L72364 966 L72364 1212.5 L72364 1212.5 L72364 1459 L72364 1459 L72053 1571.5546282245828 L72053.0 1571.6 " fill="none"></path>
-					<path d="M69184.8 665.8 L69184.3 671.2 L69183.8 676.5 L69171.0 669.9 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M67676.2 1256.9 L68086.75 1459 L71357 1674.5612865335452 L71357.0 1674.6 " fill="none"></path>
-					</g>
-					<path d="M67678.5 1252.1 L67676.2 1256.9 L67673.8 1261.7 L67664.2 1251.0 Z"></path>
-					<path d="M63462.4 1843.2 L63508.25 1936 L63508.25 2625 L63508.25 2625 L63508.25 3314 L63508.25 3314 L63508.25 3500.5 L63508.25 3500.5 L63508.25 3687 L63508.25 3687 L63508.25 3843.5 L63508.25 3843.5 L63508.25 4000 L63508.25 4000 L61787 4130.290919361672 L61787.0 4130.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M63463.0 1832.5 L63462.4 1843.2 L63453.4 1837.2 L63454.1 1826.5 Z"></path>
-					</g>
-					<path d="M63486.0 1842.1 L63548.25 1936 L63548.25 2625 L63548.25 2625 L63548.25 3314 L63548.25 3314 L63548.25 3500.5 L63548.25 3500.5 L63548.25 3687 L63548.25 3687 L65717.75 3833.981277056277 L65717.8 3834.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M63485.3 1831.3 L63486.0 1842.1 L63476.4 1837.2 L63475.7 1826.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M67682.6 1256.5 L68126.75 1459 L63706.25 1681.5882508181146 L63706.3 1681.6 " fill="none"></path>
-					</g>
-					<path d="M67684.8 1251.7 L67682.6 1256.5 L67680.4 1261.4 L67670.5 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42791.4 1247.5 L43450.25 1459 L63074.25 1693.7203610832498 L63074.3 1693.7 " fill="none"></path>
-					</g>
-					<path d="M42793.1 1242.5 L42791.4 1247.5 L42789.8 1252.6 L42778.8 1243.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M51043.1 1269.5 L51191.25 1459 L51191.25 1697.5 L51191.25 1697.5 L51191.25 1936 L51191.25 1936 L51191.25 2625 L51191.25 2625 L51191.25 3314 L51191.25 3314 L52519 3477.8004795766496 L52519.0 3477.8 " fill="none"></path>
-					</g>
-					<path d="M51047.3 1266.2 L51043.1 1269.5 L51038.9 1272.8 L51034.9 1259.0 Z"></path>
-					<path d="M53348.7 1754.9 L51447.25 1936 L51447.25 2625 L51447.25 2625 L51447.25 3314 L51447.25 3314 L31436 3498.8236681482217 L31436.0 3498.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M53358.5 1759.3 L53348.7 1754.9 L53357.5 1748.7 L53367.3 1753.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M51093.3 1220.4 L53951.25 1459 L53951.25 1568.5 L53951.3 1568.5 " fill="none"></path>
-					</g>
-					<path d="M51093.7 1215.1 L51093.3 1220.4 L51092.8 1225.7 L51080.0 1219.3 Z"></path>
-					<path d="M53354.0 1759.6 L51659.25 1936 L51659.25 2541 L51659.3 2541.0 " fill="none"></path>
-					<path d="M53354.5 1765.0 L53354.0 1759.6 L53353.4 1754.3 L53367.3 1758.3 Z"></path>
-					<path d="M53354.0 1773.1 L52067.25 1936 L52067.25 2556 L52067.3 2556.0 " fill="none"></path>
-					<path d="M53354.7 1778.4 L53354.0 1773.1 L53353.4 1767.8 L53367.3 1771.4 Z"></path>
-					<path d="M53375.7 1829.5 L52911.25 1936 L52911.25 2556 L52911.3 2556.0 " fill="none"></path>
-					<path d="M53376.9 1834.7 L53375.7 1829.5 L53374.5 1824.3 L53388.7 1826.5 Z"></path>
-					<path d="M54072.5 1836.5 L54159.25 1936 L54159.25 2548.5 L54159.3 2548.5 " fill="none"></path>
-					<path d="M54076.5 1833.0 L54072.5 1836.5 L54068.5 1840.1 L54063.8 1826.5 Z"></path>
-					<path d="M54607.3 2787.7 L54607.25 3314 L21597.75 3500.336297047384 L21597.8 3500.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M54612.6 2778.3 L54607.3 2787.7 L54601.9 2778.3 L54607.3 2769.0 Z"></path>
-					</g>
-					<path d="M54318.6 1831.1 L54607.25 1936 L54607.25 2481 L54607.3 2481.0 " fill="none"></path>
-					<path d="M54320.4 1826.0 L54318.6 1831.1 L54316.8 1836.1 L54306.1 1826.5 Z"></path>
-					<path d="M54991.3 2727.7 L54991.25 3314 L54991.25 3485 L54991.3 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M54996.6 2718.3 L54991.3 2727.7 L54985.9 2718.3 L54991.3 2709.0 Z"></path>
-					</g>
-					<path d="M54526.8 1829.5 L54991.25 1936 L54991.25 2541 L54991.3 2541.0 " fill="none"></path>
-					<path d="M54528.0 1824.3 L54526.8 1829.5 L54525.6 1834.7 L54513.8 1826.5 Z"></path>
-					<path d="M27933.8 1762.7 L27933.75 1936 L47930 2607.978941849264 L47930.0 2608.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M27939.1 1753.3 L27933.8 1762.7 L27928.4 1753.3 L27933.8 1744.0 Z"></path>
-					</g>
-					<path d="M29233.1 1228.3 L27933.75 1459 L27933.75 1651 L27933.8 1651.0 " fill="none"></path>
-					<path d="M29234.1 1233.6 L29233.1 1228.3 L29232.2 1223.1 L29246.3 1226.0 Z"></path>
-					<path d="M28325.8 1785.2 L28325.75 1936 L47930 2607.647166316522 L47930.0 2607.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28331.1 1775.8 L28325.8 1785.2 L28320.4 1775.8 L28325.8 1766.5 Z"></path>
-					</g>
-					<path d="M29246.6 1231.2 L28325.75 1459 L28325.75 1628.5 L28325.8 1628.5 " fill="none"></path>
-					<path d="M29247.9 1236.4 L29246.6 1231.2 L29245.4 1226.0 L29259.6 1228.0 Z"></path>
-					<path d="M31453.4 3422.0 L31466 3417 L31473.5 3417 L31473.5 3417 L31481 3500.5 L31481 3500.5 L31473.5 3584 L31473.5 3584 L31466 3584 L31466 3584 L31436 3572.1560283687945 L31436.0 3572.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31442.7 3420.5 L31453.4 3422.0 L31446.6 3430.4 L31436.0 3428.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3122.9 2651.6 L3561.5 3314 L31073 3499.2776784747048 L31073.0 3499.3 " fill="none"></path>
-					</g>
-					<path d="M3127.3 2648.7 L3122.9 2651.6 L3118.4 2654.6 L3115.5 2640.5 Z"></path>
-					<path d="M28717.8 1762.7 L28717.75 1936 L47930 2607.302199683043 L47930.0 2607.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28723.1 1753.3 L28717.8 1762.7 L28712.4 1753.3 L28717.8 1744.0 Z"></path>
-					</g>
-					<path d="M29271.9 1233.0 L28717.75 1459 L28717.75 1651 L28717.8 1651.0 " fill="none"></path>
-					<path d="M29273.9 1238.0 L29271.9 1233.0 L29269.9 1228.1 L29284.2 1228.0 Z"></path>
-					<path d="M51407.3 1747.2 L51407.25 1936 L48943 2507.5284860725405 L48943.0 2507.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M51412.6 1737.8 L51407.3 1747.2 L51401.9 1737.8 L51407.3 1728.5 Z"></path>
-					</g>
-					<path d="M29109.8 1762.7 L29109.75 1936 L47930 2606.94323929269 L47930.0 2606.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M29115.1 1753.3 L29109.8 1762.7 L29104.4 1753.3 L29109.8 1744.0 Z"></path>
-					</g>
-					<path d="M29300.2 1238.1 L29109.75 1459 L29109.75 1651 L29109.8 1651.0 " fill="none"></path>
-					<path d="M29304.2 1241.6 L29300.2 1238.1 L29296.1 1234.6 L29308.9 1228.0 Z"></path>
-					<path d="M29916.8 1762.7 L29916.75 1936 L47930 2606.1564140984624 L47930.0 2606.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M29922.1 1753.3 L29916.8 1762.7 L29911.4 1753.3 L29916.8 1744.0 Z"></path>
-					</g>
-					<path d="M29371.9 1233.1 L29916.75 1459 L29916.75 1651 L29916.8 1651.0 " fill="none"></path>
-					<path d="M29374.0 1228.2 L29371.9 1233.1 L29369.9 1238.0 L29359.6 1228.0 Z"></path>
-					<path d="M48086.5 3310.6 L48084.75 3314 L31436 3498.488755366082 L31436.0 3498.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M48095.5 3304.7 L48086.5 3310.6 L48086.0 3299.9 L48095.0 3294.0 Z"></path>
-					</g>
-					<path d="M48126.1 3311.0 L48124.75 3314 L59258.25 3499.5583333333334 L59258.3 3499.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M48134.8 3304.7 L48126.1 3311.0 L48125.1 3300.3 L48133.8 3294.0 Z"></path>
-					</g>
-					<path d="M48407.3 3312.6 L48407.25 3314 L48407.25 3500.5 L48407.25 3500.5 L48407.25 3687 L48407.25 3687 L48407.25 3843.5 L48407.25 3843.5 L48407.25 4000 L48407.25 4000 L61689 4133.507454569322 L61689.0 4133.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M48413.0 3303.6 L48407.3 3312.6 L48402.4 3303.1 L48408.1 3294.0 Z"></path>
-					</g>
-					<path d="M48447.2 3312.7 L48447.25 3314 L24068.25 3499.9736379253927 L24068.3 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M48452.4 3303.2 L48447.2 3312.7 L48441.8 3303.4 L48446.9 3294.0 Z"></path>
-					</g>
-					<path d="M48737.7 3311.1 L48739 3314 L61341.25 3499.7262786700644 L61341.3 3499.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M48738.9 3300.4 L48737.7 3311.1 L48729.1 3304.7 L48730.2 3294.0 Z"></path>
-					</g>
-					<path d="M59191.7 1740.8 L59272.75 1936 L48943 2592.7952705040952 L48943.0 2592.8 " fill="none"></path>
-					<path d="M59196.7 1738.8 L59191.7 1740.8 L59186.8 1742.9 L59186.6 1728.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83198.6 1263.7 L83262 1459 L83262 1697.5 L83262 1697.5 L83262 1936 L83262 1936 L48943 2614.97922499318 L48943.0 2615.0 " fill="none"></path>
-					</g>
-					<path d="M83203.7 1262.0 L83198.6 1263.7 L83193.5 1265.3 L83194.5 1251.0 Z"></path>
-					<path d="M56280.5 1754.7 L56280.5 1936 L48943 2580.510135135135 L48943.0 2580.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M56285.8 1745.3 L56280.5 1754.7 L56275.2 1745.3 L56280.5 1736.0 Z"></path>
-					</g>
-					<path d="M55967.6 1796.9 L56062.25 1936 L56062.25 2609.5 L56062.3 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M55966.8 1786.2 L55967.6 1796.9 L55958.0 1792.2 L55957.1 1781.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M51093.3 1217.3 L55900 1459 L55900 1613.5 L55900.0 1613.5 " fill="none"></path>
-					</g>
-					<path d="M51093.6 1211.9 L51093.3 1217.3 L51093.0 1222.6 L51080.0 1216.6 Z"></path>
-					<path d="M82676.8 1285.2 L82676.75 1459 L82676.75 1546 L82676.8 1546.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M82682.1 1275.8 L82676.8 1285.2 L82671.4 1275.8 L82676.8 1266.5 Z"></path>
-					</g>
-					<path d="M82279.7 170.1 L82676.75 293 L82676.75 629.5 L82676.75 629.5 L82676.75 966 L82676.75 966 L82676.75 1158.5 L82676.8 1158.5 " fill="none"></path>
-					<path d="M82281.3 165.1 L82279.7 170.1 L82278.2 175.2 L82267.0 166.2 Z"></path>
-					<path d="M82413.0 1847.2 L82256.5 1936 L82256.5 2625 L82256.5 2625 L82256.5 3314 L82256.5 3314 L59371.25 3500.0406954569726 L59371.3 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M82423.8 1847.2 L82413.0 1847.2 L82418.5 1837.9 L82429.3 1838.0 Z"></path>
-					</g>
-					<path d="M82705.2 1867.4 L82716.75 1936 L82716.75 2625 L82716.75 2625 L82716.75 3314 L82716.75 3314 L72068.25 3499.0230819397216 L72068.3 3499.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M82709.0 1857.3 L82705.2 1867.4 L82698.4 1859.1 L82702.2 1849.0 Z"></path>
-					</g>
-					<path d="M33720.3 1702.4 L38285.25 1936 L36372.60921625544 2594 L36372.6 2594.0 " fill="none"></path>
-					<path d="M33720.6 1697.1 L33720.3 1702.4 L33720.0 1707.7 L33707.0 1701.7 Z"></path>
-					<path d="M45657.5 3923.2 L45657.5 4000 L18421.25 4133.646700173024 L18421.3 4133.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45662.8 3913.8 L45657.5 3923.2 L45652.2 3913.8 L45657.5 3904.5 Z"></path>
-					</g>
-					<path d="M57045.0 2674.7 L57045 3314 L25100 3499.639937057925 L25100.0 3499.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M57050.3 2665.3 L57045.0 2674.7 L57039.7 2665.3 L57045.0 2656.0 Z"></path>
-					</g>
-					<path d="M57345.5 2697.7 L57345.5 3314 L21499.75 3500.3154816234105 L21499.8 3500.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M57350.8 2688.3 L57345.5 2697.7 L57340.2 2688.3 L57345.5 2679.0 Z"></path>
-					</g>
-					<path d="M70185.6 2827.8 L69742.25 3314 L72645 3492.770866011723 L72645.0 3492.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M70195.8 2824.5 L70185.6 2827.8 L70187.9 2817.3 L70198.2 2814.0 Z"></path>
-					</g>
-					<path d="M70197.0 2828.2 L69782.25 3314 L69782.25 3500.5 L69782.25 3500.5 L69782.25 3687 L69782.25 3687 L69782.25 3843.5 L69782.25 3843.5 L69782.25 4000 L69782.25 4000 L72971.75 4128.077015283188 L72971.8 4128.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M70207.1 2824.6 L70197.0 2828.2 L70199.0 2817.6 L70209.1 2814.0 Z"></path>
-					</g>
-					<path d="M70352.4 2832.6 L70310.5 3314 L70310.5 3439 L70310.5 3439.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M70358.5 2823.8 L70352.4 2832.6 L70347.9 2822.8 L70354.0 2814.0 Z"></path>
-					</g>
-					<path d="M70503.2 2829.7 L70817.25 3314 L64120.25 3499.227717633101 L64120.3 3499.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M70502.6 2818.9 L70503.2 2829.7 L70493.7 2824.7 L70493.0 2814.0 Z"></path>
-					</g>
-					<path d="M70514.8 2829.2 L70857.25 3314 L71898.25 3486.4214031971583 L71898.3 3486.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M70513.8 2818.5 L70514.8 2829.2 L70505.1 2824.7 L70504.0 2814.0 Z"></path>
-					</g>
-					<path d="M70526.3 2828.8 L70897.25 3314 L36328.5 3499.8066265103644 L36328.5 3499.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M70524.9 2818.2 L70526.3 2828.8 L70516.4 2824.7 L70515.0 2814.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M83607.3 173.1 L83346.75 293 L83346.75 629.5 L83346.75 629.5 L83346.75 966 L83346.75 966 L83346.75 1212.5 L83346.75 1212.5 L83346.75 1459 L83346.75 1459 L83346.75 1697.5 L83346.75 1697.5 L83346.75 1936 L83346.75 1936 L70677.5 2608.69921972835 L70677.5 2608.7 " fill="none"></path>
-					</g>
-					<path d="M83609.5 177.9 L83607.3 173.1 L83605.1 168.2 L83619.4 167.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3124.2 2651.3 L3601.5 3314 L24804 3499.207196552774 L24804.0 3499.2 " fill="none"></path>
-					</g>
-					<path d="M3128.5 2648.2 L3124.2 2651.3 L3119.9 2654.4 L3116.4 2640.5 Z"></path>
-					<path d="M56565.2 1832.8 L56369.5 1936 L56369.5 2609.5 L56369.5 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M56576.0 1833.1 L56565.2 1832.8 L56571.0 1823.7 L56581.8 1824.1 Z"></path>
-					</g>
-					<path d="M56731.5 1857.8 L56687.5 1936 L56687.5 2609.5 L56687.5 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M56740.8 1852.2 L56731.5 1857.8 L56731.5 1847.0 L56740.7 1841.5 Z"></path>
-					</g>
-					<path d="M56885.5 1858.9 L56916 1936 L56916 2625 L56916 2625 L56916 3314 L56916 3314 L21499.75 3500.313246172615 L21499.8 3500.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M56887.0 1848.2 L56885.5 1858.9 L56877.1 1852.1 L56878.7 1841.5 Z"></path>
-					</g>
-					<path d="M57079.1 1798.4 L57430.25 1936 L70063.5 2608.6538706748324 L70063.5 2608.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M57072.4 1790.0 L57079.1 1798.4 L57068.5 1799.9 L57061.8 1791.6 Z"></path>
-					</g>
-					<path d="M2855.7 3401.2 L2869 3394.5 L2876.5 3394.5 L2876.5 3394.5 L2884 3500.5 L2884 3500.5 L2876.5 3606.5 L2876.5 3606.5 L2869 3606.5 L2869 3606.5 L2839 3591.393111638955 L2839.0 3591.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2844.9 3400.6 L2855.7 3401.2 L2849.7 3410.2 L2839.0 3409.6 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3125.5 2651.0 L3641.5 3314 L2839 3466.254577822991 L2839.0 3466.3 " fill="none"></path>
-					</g>
-					<path d="M3129.7 2647.7 L3125.5 2651.0 L3121.3 2654.3 L3117.3 2640.5 Z"></path>
-					<path d="M60125.4 2739.3 L59764 3314 L64938 3499.4070515899703 L64938.0 3499.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M60134.9 2734.2 L60125.4 2739.3 L60125.8 2728.6 L60135.3 2723.5 Z"></path>
-					</g>
-					<path d="M60153.4 2741.0 L59936.75 3314 L59561.74195710456 3485 L59561.7 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M60161.7 2734.1 L60153.4 2741.0 L60151.7 2730.3 L60160.0 2723.5 Z"></path>
-					</g>
-					<path d="M60266.0 2739.5 L60610.75 3314 L60095.457774798924 3485 L60095.5 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M60265.7 2728.8 L60266.0 2739.5 L60256.6 2734.2 L60256.4 2723.5 Z"></path>
-					</g>
-					<path d="M29411.6 1214.7 L39254 1459 L39254 1666.5 L39254.0 1666.5 " fill="none"></path>
-					<path d="M29411.7 1209.4 L29411.6 1214.7 L29411.4 1220.0 L29398.3 1214.4 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83550.1 1434.5 L83512.25 1459 L82099 1677.0560407569142 L82099.0 1677.1 " fill="none"></path>
-					</g>
-					<path d="M83553.0 1438.9 L83550.1 1434.5 L83547.2 1430.0 L83561.3 1427.2 Z"></path>
-					<path d="M82932.8 2749.8 L82817.5 3314 L82817.5 3500.5 L82817.5 3500.5 L82817.5 3687 L82817.5 3687 L82817.5 3843.5 L82817.5 3843.5 L82817.5 4000 L82817.5 4000 L83411.5 4122.738627602159 L83411.5 4122.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M82939.9 2741.7 L82932.8 2749.8 L82929.4 2739.6 L82936.5 2731.5 Z"></path>
-					</g>
-					<path d="M82940.0 2750.0 L82857.5 3314 L82857.5 3500.5 L82857.5 3500.5 L82857.5 3687 L82857.5 3687 L82857.5 3843.5 L82857.5 3843.5 L82857.5 4000 L82857.5 4000 L77468.25 4130.950541728999 L77468.3 4131.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M82946.6 2741.5 L82940.0 2750.0 L82936.0 2740.0 L82942.7 2731.5 Z"></path>
-					</g>
-					<path d="M82947.2 2750.1 L82897.5 3314 L82897.5 3500.5 L82897.5 3500.5 L82897.5 3687 L82897.5 3687 L82897.5 3843.5 L82897.5 3843.5 L82897.5 4000 L82897.5 4000 L73266.75 4131.978677166159 L73266.8 4132.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M82953.4 2741.3 L82947.2 2750.1 L82942.7 2740.3 L82948.9 2731.5 Z"></path>
-					</g>
-					<path d="M82965.5 2750.1 L82998.25 3314 L72896 3498.2115445723643 L72896.0 3498.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M82970.3 2740.5 L82965.5 2750.1 L82959.6 2741.1 L82964.4 2731.5 Z"></path>
-					</g>
-					<path d="M82976.5 2750.0 L83059 3314 L64999 3500.185567010309 L64999.0 3500.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M82980.5 2740.0 L82976.5 2750.0 L82969.9 2741.5 L82973.8 2731.5 Z"></path>
-					</g>
-					<path d="M83569.0 1446.8 L83552.25 1459 L83552.25 1697.5 L83552.25 1697.5 L83552.25 1936 L83552.25 1936 L83050.06567489114 2518.5 L83050.1 2518.5 " fill="none"></path>
-					<path d="M83572.2 1451.1 L83569.0 1446.8 L83565.9 1442.5 L83579.8 1439.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M81966.5 1741.8 L81966.5 1936 L82804.95337445573 2518.5 L82805.0 2518.5 " fill="none"></path>
-					</g>
-					<path d="M81971.8 1741.8 L81966.5 1741.8 L81961.2 1741.8 L81966.5 1728.5 Z"></path>
-					<path d="M83804.6 2750.0 L83727 3314 L64999 3500.1967641335928 L64999.0 3500.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M83811.1 2741.5 L83804.6 2750.0 L83800.5 2740.0 L83807.1 2731.5 Z"></path>
-					</g>
-					<path d="M83811.8 2750.1 L83767 3314 L83767 3500.5 L83767 3500.5 L83767 3687 L83767 3687 L83767 3843.5 L83767 3843.5 L83767 4000 L83767 4000 L77468.25 4131.382262520917 L77468.3 4131.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M83817.9 2741.2 L83811.8 2750.1 L83807.2 2740.4 L83813.3 2731.5 Z"></path>
-					</g>
-					<path d="M83835.3 2750.1 L83896.5 3314 L72896 3498.396301456049 L72896.0 3498.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M83839.6 2740.2 L83835.3 2750.1 L83829.0 2741.4 L83833.3 2731.5 Z"></path>
-					</g>
-					<path d="M83881.4 1785.9 L83821.75 1936 L83821.75 2518.5 L83821.8 2518.5 " fill="none"></path>
-					<path d="M83886.3 1787.9 L83881.4 1785.9 L83876.4 1783.9 L83886.3 1773.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83606.3 1447.5 L83592.25 1459 L83592.25 1697.5 L83592.25 1697.5 L83592.25 1936 L83592.25 1936 L83592.25 2625 L83592.25 2625 L83592.25 3314 L83592.25 3314 L72896 3498.3371566521128 L72896.0 3498.3 " fill="none"></path>
-					</g>
-					<path d="M83609.7 1451.6 L83606.3 1447.5 L83602.9 1443.3 L83616.6 1439.0 Z"></path>
-					<path d="M72585.4 3943.9 L72482 4000 L77217.25 4130.540245846834 L77217.3 4130.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72596.2 3944.1 L72585.4 3943.9 L72591.1 3934.8 L72601.8 3935.0 Z"></path>
-					</g>
-					<path d="M72609.4 3944.9 L72522 4000 L72971.75 4100.9066555043955 L72971.8 4100.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72620.2 3944.5 L72609.4 3944.9 L72614.5 3935.5 L72625.2 3935.0 Z"></path>
-					</g>
-					<path d="M72990.7 3850.3 L77841.5 4000 L83411.5 4132.701573473198 L83411.5 4132.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72981.5 3844.7 L72990.7 3850.3 L72981.2 3855.3 L72972.0 3849.7 Z"></path>
-					</g>
-					<path d="M72990.7 3850.1 L77958.75 4000 L18421.25 4133.838146604148 L18421.3 4133.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72981.5 3844.5 L72990.7 3850.1 L72981.2 3855.2 L72972.0 3849.6 Z"></path>
-					</g>
-					<path d="M83643.7 1448.2 L83632.25 1459 L83632.25 1697.5 L83632.25 1697.5 L83632.25 1936 L83632.25 1936 L83632.25 2625 L83632.25 2625 L83632.25 3314 L83632.25 3314 L83632.25 3500.5 L83632.25 3500.5 L83632.25 3687 L83632.25 3687 L72972 3840.5967155384724 L72972.0 3840.6 " fill="none"></path>
-					<path d="M83647.3 1452.0 L83643.7 1448.2 L83640.0 1444.3 L83653.3 1439.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M72770.5 3552.3 L72770.5 3687 L72770.5 3752 L72770.5 3752.0 " fill="none"></path>
-					</g>
-					<path d="M72775.8 3552.3 L72770.5 3552.3 L72765.2 3552.3 L72770.5 3539.0 Z"></path>
-					<path d="M83917.4 3956.9 L83881.75 4000 L77468.25 4131.428200030586 L77468.3 4131.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M83927.5 3953.1 L83917.4 3956.9 L83919.3 3946.3 L83929.3 3942.5 Z"></path>
-					</g>
-					<path d="M84063.5 3959.5 L84081.75 4000 L73266.75 4132.197035347776 L73266.8 4132.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M84064.5 3948.8 L84063.5 3959.5 L84054.8 3953.2 L84055.8 3942.5 Z"></path>
-					</g>
-					<path d="M83951.6 1785.9 L84011.25 1936 L84011.25 2625 L84011.25 2625 L84011.25 3314 L84011.25 3314 L84011.25 3500.5 L84011.25 3500.5 L84011.25 3687 L84011.25 3687 L84011.25 3744.5 L84011.3 3744.5 " fill="none"></path>
-					<path d="M83956.6 1783.9 L83951.6 1785.9 L83946.7 1787.9 L83946.7 1773.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M75563.6 148.6 L76277.25 293 L76277.25 614 L76277.3 614.0 " fill="none"></path>
-					</g>
-					<path d="M75564.6 143.4 L75563.6 148.6 L75562.5 153.9 L75550.5 146.0 Z"></path>
-					<path d="M76203.6 640.3 L73986.5 966 L73986.5 1197 L73986.5 1197.0 " fill="none"></path>
-					<path d="M76204.3 645.6 L76203.6 640.3 L76202.8 635.0 L76216.8 638.4 Z"></path>
-					<path d="M76203.6 641.9 L74274 966 L74274 1197 L74274.0 1197.0 " fill="none"></path>
-					<path d="M76204.5 647.1 L76203.6 641.9 L76202.7 636.6 L76216.8 639.7 Z"></path>
-					<path d="M76203.7 644.0 L74574.5 966 L74574.5 1197 L74574.5 1197.0 " fill="none"></path>
-					<path d="M76204.7 649.3 L76203.7 644.0 L76202.6 638.8 L76216.8 641.5 Z"></path>
-					<path d="M76203.8 647.1 L74871 966 L74871 1197 L74871.0 1197.0 " fill="none"></path>
-					<path d="M76205.0 652.3 L76203.8 647.1 L76202.5 641.9 L76216.8 644.0 Z"></path>
-					<path d="M76213.9 648.9 L75179 966 L75179 1197 L75179.0 1197.0 " fill="none"></path>
-					<path d="M76215.5 654.0 L76213.9 648.9 L76212.4 643.8 L76226.7 645.0 Z"></path>
-					<path d="M76270.2 657.9 L76194 966 L76194 1197 L76194.0 1197.0 " fill="none"></path>
-					<path d="M76275.4 659.2 L76270.2 657.9 L76265.0 656.7 L76273.4 645.0 Z"></path>
-					<path d="M76294.7 656.2 L76497.5 966 L76497.5 1197 L76497.5 1197.0 " fill="none"></path>
-					<path d="M76299.2 653.2 L76294.7 656.2 L76290.2 659.1 L76287.4 645.0 Z"></path>
-					<path d="M76312.1 652.3 L76791 966 L76791 1197 L76791.0 1197.0 " fill="none"></path>
-					<path d="M76315.0 647.8 L76312.1 652.3 L76309.1 656.8 L76300.9 645.0 Z"></path>
-					<path d="M76327.6 650.0 L77102 966 L77102 1197 L77102.0 1197.0 " fill="none"></path>
-					<path d="M76329.6 645.1 L76327.6 650.0 L76325.6 655.0 L76315.2 645.0 Z"></path>
-					<path d="M76340.6 648.9 L77375.5 966 L77375.5 1197 L77375.5 1197.0 " fill="none"></path>
-					<path d="M76342.1 643.8 L76340.6 648.9 L76339.0 654.0 L76327.8 645.0 Z"></path>
-					<path d="M77164.8 4639.7 L77164.75 4641 L76981.75 4666.627218934911 L76981.8 4666.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M77170.1 4630.3 L77164.8 4639.7 L77159.4 4630.3 L77164.8 4621.0 Z"></path>
-					</g>
-					<path d="M76644.0 4174.7 L76556.25 4268 L76925.25 4381.095316351684 L76925.3 4381.1 " fill="none"></path>
-					<path d="M76647.9 4178.4 L76644.0 4174.7 L76640.1 4171.1 L76653.1 4165.0 Z"></path>
-					<path d="M76986.8 4215.8 L76986.75 4268 L77005.83847184987 4288 L77005.8 4288.0 " fill="none"></path>
-					<path d="M76992.1 4215.8 L76986.8 4215.8 L76981.4 4215.8 L76986.8 4202.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M77342.8 4253.3 L77342.75 4268 L77323.66152815013 4288 L77323.7 4288.0 " fill="none"></path>
-					</g>
-					<path d="M77348.1 4253.3 L77342.8 4253.3 L77337.4 4253.3 L77342.8 4240.0 Z"></path>
-					<path d="M59799.3 3916.2 L59799.25 4000 L77217.25 4133.041411348932 L77217.3 4133.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M59804.6 3906.8 L59799.3 3916.2 L59793.9 3906.8 L59799.3 3897.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M59799.3 3552.3 L59799.25 3687 L59799.25 3789.5 L59799.3 3789.5 " fill="none"></path>
-					</g>
-					<path d="M59804.6 3552.3 L59799.3 3552.3 L59793.9 3552.3 L59799.3 3539.0 Z"></path>
-					<path d="M70172.6 3570.4 L69942.75 3687 L69942.75 3843.5 L69942.75 3843.5 L69942.75 4000 L69942.75 4000 L76390.25 4132.866589773164 L76390.3 4132.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M70183.3 3571.0 L70172.6 3570.4 L70178.5 3561.5 L70189.2 3562.0 Z"></path>
-					</g>
-					<path d="M70628.6 3910.8 L70419 4000 L77217.25 4131.57111391948 L77217.3 4131.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M70639.3 3912.1 L70628.6 3910.8 L70635.1 3902.3 L70645.8 3903.5 Z"></path>
-					</g>
-					<path d="M70628.9 3918.9 L70459 4000 L72971.75 4126.570247157222 L72971.8 4126.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M70639.6 3919.7 L70628.9 3918.9 L70635.0 3910.0 L70645.8 3910.8 Z"></path>
-					</g>
-					<path d="M70806.7 3945.8 L70817.25 4000 L77134.25 4133.545476059005 L77134.3 4133.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M70810.1 3935.6 L70806.7 3945.8 L70799.7 3937.7 L70803.1 3927.5 Z"></path>
-					</g>
-					<path d="M70832.3 3944.5 L70857.25 4000 L76390.25 4132.681102362205 L76390.3 4132.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M70833.3 3933.8 L70832.3 3944.5 L70823.6 3938.2 L70824.6 3927.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M70452.9 3556.3 L70786.75 3687 L70786.75 3759.5 L70786.8 3759.5 " fill="none"></path>
-					</g>
-					<path d="M70454.9 3551.3 L70452.9 3556.3 L70451.0 3561.2 L70440.5 3551.4 Z"></path>
-					<path d="M3281.0 3450.3 L3293 3447 L3300.5 3447 L3300.5 3447 L3308 3500.5 L3308 3500.5 L3300.5 3554 L3300.5 3554 L3293 3554 L3293 3554 L3263 3545.8527918781724 L3263.0 3545.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3270.6 3447.6 L3281.0 3450.3 L3273.4 3457.8 L3263.0 3455.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3126.8 2650.7 L3681.5 3314 L3263 3447.3052946199828 L3263.0 3447.3 " fill="none"></path>
-					</g>
-					<path d="M3130.9 2647.3 L3126.8 2650.7 L3122.7 2654.1 L3118.2 2640.5 Z"></path>
-					<path d="M72953.1 4140.1 L69475.5 4268 L69475.5 4454.5 L69475.5 4454.5 L69475.5 4641 L69475.5 4641 L73039.75 4676.238007380074 L73039.8 4676.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72962.6 4145.1 L72953.1 4140.1 L72962.2 4134.4 L72971.8 4139.4 Z"></path>
-					</g>
-					<path d="M73285.4 4141.2 L76193.75 4268 L76193.75 4454.5 L76193.75 4454.5 L76193.75 4641 L76193.75 4641 L76321 4668.090704647676 L76321.0 4668.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73276.3 4135.5 L73285.4 4141.2 L73275.8 4146.2 L73266.8 4140.4 Z"></path>
-					</g>
-					<path d="M19757.0 3887.8 L19757 4000 L72971.75 4133.629607072416 L72971.8 4133.6 " fill="none"></path>
-					<path d="M19762.3 3887.8 L19757.0 3887.8 L19751.7 3887.8 L19757.0 3874.5 Z"></path>
-					<path d="M76381.7 4615.2 L76368.75 4641 L76840.75 4671.8866359447 L76840.8 4671.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M76390.7 4609.2 L76381.7 4615.2 L76381.2 4604.4 L76390.1 4598.5 Z"></path>
-					</g>
-					<path d="M76415.8 4616.4 L76408.75 4641 L76460.15845070423 4661 L76460.2 4661.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M76423.5 4608.9 L76415.8 4616.4 L76413.3 4606.0 L76421.0 4598.5 Z"></path>
-					</g>
-					<path d="M76509.2 4616.4 L76516.25 4641 L76400 4667.496789727127 L76400.0 4667.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M76511.7 4606.0 L76509.2 4616.4 L76501.5 4608.9 L76504.0 4598.5 Z"></path>
-					</g>
-					<path d="M76543.3 4615.2 L76556.25 4641 L73092.75 4676.230444126075 L73092.8 4676.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M76543.8 4604.4 L76543.3 4615.2 L76534.3 4609.2 L76534.9 4598.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M73280.1 4140.4 L76462.5 4268 L76462.5 4310.5 L76462.5 4310.5 " fill="none"></path>
-					</g>
-					<path d="M73280.3 4135.1 L73280.1 4140.4 L73279.9 4145.8 L73266.8 4139.9 Z"></path>
-					<path d="M79930.5 168.9 L79605.75 293 L79605.75 614 L79605.8 614.0 " fill="none"></path>
-					<path d="M79932.4 173.9 L79930.5 168.9 L79928.6 164.0 L79943.0 164.2 Z"></path>
-					<path d="M76689.6 4183.5 L76702.25 4268 L76702.25 4454.5 L76702.25 4454.5 L76702.25 4641 L76702.25 4641 L76840.75 4664.525119617225 L76840.8 4664.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M76693.5 4173.4 L76689.6 4183.5 L76683.0 4175.0 L76686.9 4165.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M75563.8 141.3 L77475.75 293 L77475.75 583.5 L77475.8 583.5 " fill="none"></path>
-					</g>
-					<path d="M75564.2 136.0 L75563.8 141.3 L75563.4 146.6 L75550.5 140.2 Z"></path>
-					<path d="M61577.8 2772.7 L61577.75 3314 L32726.5 3500.148365809571 L32726.5 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M61583.1 2763.3 L61577.8 2772.7 L61572.4 2763.3 L61577.8 2754.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M75563.8 140.8 L77720.75 293 L77720.75 614 L77720.8 614.0 " fill="none"></path>
-					</g>
-					<path d="M75564.2 135.4 L75563.8 140.8 L75563.4 146.1 L75550.5 139.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M77720.8 658.3 L77720.75 966 L77720.75 1197 L77720.8 1197.0 " fill="none"></path>
-					</g>
-					<path d="M77726.1 658.3 L77720.8 658.3 L77715.4 658.3 L77720.8 645.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83738.1 175.6 L83892.25 293 L83892.25 501 L83892.3 501.0 " fill="none"></path>
-					</g>
-					<path d="M83741.3 171.3 L83738.1 175.6 L83734.8 179.8 L83727.5 167.5 Z"></path>
-					<path d="M83916.4 1457.6 L83916.5 1459 L83916.5 1621.5 L83916.5 1621.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M83920.8 1447.8 L83916.4 1457.6 L83910.1 1448.8 L83914.5 1439.0 Z"></path>
-					</g>
-					<path d="M84182.3 1450.9 L84192.25 1459 L84192.25 1697.5 L84192.25 1697.5 L84192.25 1936 L84192.25 1936 L84192.25 2625 L84192.25 2625 L84192.25 3314 L84192.25 3314 L84192.25 3500.5 L84192.25 3500.5 L84192.25 3687 L84192.25 3687 L84192.25 3843.5 L84192.25 3843.5 L84192.25 4000 L84192.25 4000 L62317 4133.557357815722 L62317.0 4133.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M84178.5 1440.8 L84182.3 1450.9 L84171.7 1449.0 L84167.9 1439.0 Z"></path>
-					</g>
-					<path d="M83892.3 771.3 L83892.25 966 L83892.25 986 L83892.3 986.0 " fill="none"></path>
-					<path d="M83897.6 771.3 L83892.3 771.3 L83886.9 771.3 L83892.3 758.0 Z"></path>
-					<path d="M79942.0 182.0 L79762.75 293 L79762.75 614 L79762.8 614.0 " fill="none"></path>
-					<path d="M79944.8 186.6 L79942.0 182.0 L79939.2 177.5 L79953.3 175.0 Z"></path>
-					<path d="M79976.8 185.5 L79891.75 293 L79891.75 614 L79891.8 614.0 " fill="none"></path>
-					<path d="M79981.0 188.8 L79976.8 185.5 L79972.6 182.2 L79985.1 175.0 Z"></path>
-					<path d="M80101.0 156.5 L80686 293 L80686 614 L80686.0 614.0 " fill="none"></path>
-					<path d="M80102.2 151.3 L80101.0 156.5 L80099.8 161.6 L80088.0 153.4 Z"></path>
-					<path d="M80101.1 153.3 L80811.5 293 L80811.5 614 L80811.5 614.0 " fill="none"></path>
-					<path d="M80102.1 148.1 L80101.1 153.3 L80100.1 158.6 L80088.0 150.8 Z"></path>
-					<g data-name="Config">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Config">
-							<rect x="25187.5" y="60.5" height="152.0" width="396.0" data-name="Config"></rect>
-							<path d="M25187.5 91.5 L25583.5 91.5" fill="none" data-name="Config"></path>
-						</g>
-						<g transform="translate(25187.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Config">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Config">
-								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="Config">Config</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25187.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Config">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Config">
-								<text x="0.0" y="13.5" stroke="none" data-name="Config">&lt;static&gt;+isDebugMode: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Config">&lt;static&gt;+defaultLocale: Set&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Config">&lt;static&gt;+supportedLocales: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Config">&lt;static&gt;+newStudyId: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Config">&lt;static&gt;+newModelId: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Config">&lt;static&gt;+minSplashTime: int</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Config">&lt;static&gt;+formAutosaveDebounce: int</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ResultTypes">
-							<rect x="25623.5" y="121.0" height="31.0" width="114.0" data-name="ResultTypes"></rect>
-						</g>
-						<g transform="translate(25623.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ResultTypes">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ResultTypes">ResultTypes</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementResultTypes">
-							<rect x="25254.5" y="591.0" height="77.0" width="252.0" data-name="MeasurementResultTypes"></rect>
-							<path d="M25254.5 622.0 L25506.5 622.0" fill="none" data-name="MeasurementResultTypes"></path>
-						</g>
-						<g transform="translate(25254.5, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementResultTypes">
-								<text x="118.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementResultTypes">MeasurementResultTypes</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25254.5, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementResultTypes">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+questionnaire: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionResultTypes">
-							<rect x="25546.5" y="591.0" height="77.0" width="268.0" data-name="InterventionResultTypes"></rect>
-							<path d="M25546.5 622.0 L25814.5 622.0" fill="none" data-name="InterventionResultTypes"></path>
-						</g>
-						<g transform="translate(25546.5, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionResultTypes">
-								<text x="126.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionResultTypes">InterventionResultTypes</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25546.5, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResultTypes">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+checkmarkTask: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyExportData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyExportData">
-							<rect x="0.0" y="2564.0" height="122.0" width="414.0" data-name="StudyExportData"></rect>
-							<path d="M0.0 2595.0 L414.0 2595.0" fill="none" data-name="StudyExportData"></path>
-						</g>
-						<g transform="translate(0, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyExportData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyExportData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyExportData">StudyExportData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyExportData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyExportData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyExportData">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyExportData">+measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyExportData">+interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyExportData">+mediaData: List&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyExportData">+isEmpty: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="64938.0" y="3485.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(64938, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTemplates">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTemplates">
-							<rect x="25777.5" y="90.0" height="93.0" width="307.0" data-name="StudyTemplates"></rect>
-							<path d="M25777.5 121.0 L26084.5 121.0" fill="none" data-name="StudyTemplates"></path>
-							<path d="M25777.5 152.0 L26084.5 152.0" fill="none" data-name="StudyTemplates"></path>
-						</g>
-						<g transform="translate(25777.5, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTemplates">
-								<text x="145.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTemplates">StudyTemplates</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25777.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+kUnnamedStudyTitle: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25777.5, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+Study emptyDraft()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyActionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyActionType">
-							<rect x="68.0" y="3402.0" height="197.0" width="358.0" data-name="StudyActionType"></rect>
-							<path d="M68.0 3433.0 L426.0 3433.0" fill="none" data-name="StudyActionType"></path>
-						</g>
-						<g transform="translate(68, 3402)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyActionType">
-								<text x="171.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyActionType">StudyActionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(68, 3433)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyActionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyActionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+values: List&lt;StudyActionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pin: StudyActionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pinoff: StudyActionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+edit: StudyActionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicate: StudyActionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicateDraft: StudyActionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+addCollaborator: StudyActionType</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+export: StudyActionType</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+delete: StudyActionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="3074.8" y="2609.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(3074.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Notifications">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Notifications">
-							<rect x="3635.0" y="2541.5" height="167.0" width="407.0" data-name="Notifications"></rect>
-							<path d="M3635.0 2572.5 L4042.0 2572.5" fill="none" data-name="Notifications"></path>
-						</g>
-						<g transform="translate(3635, 2541.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Notifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notifications">
-								<text x="195.5" y="13.5" stroke="none" text-anchor="middle" data-name="Notifications">Notifications</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3635, 2572.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Notifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Notifications">
-								<text x="0.0" y="13.5" stroke="none" data-name="Notifications">&lt;static&gt;+credentialsInvalid: SnackbarIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Notifications">&lt;static&gt;+userAlreadyRegistered: SnackbarIntent</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordReset: SnackbarIntent</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordResetSuccess: SnackbarIntent</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleted: SnackbarIntent</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeDeleted: SnackbarIntent</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeClipped: SnackbarIntent</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleteConfirmation: AlertIntent</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SnackbarIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SnackbarIntent">
-							<rect x="3353.0" y="3469.5" height="62.0" width="136.0" data-name="SnackbarIntent"></rect>
-							<path d="M3353.0 3500.5 L3489.0 3500.5" fill="none" data-name="SnackbarIntent"></path>
-						</g>
-						<g transform="translate(3353, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackbarIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackbarIntent">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackbarIntent">SnackbarIntent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3353, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SnackbarIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SnackbarIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="SnackbarIntent">+duration: int?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AlertIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AlertIntent">
-							<rect x="3529.0" y="3454.5" height="92.0" width="204.0" data-name="AlertIntent"></rect>
-							<path d="M3529.0 3485.5 L3733.0 3485.5" fill="none" data-name="AlertIntent"></path>
-						</g>
-						<g transform="translate(3529, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AlertIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AlertIntent">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="AlertIntent">AlertIntent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3529, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AlertIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AlertIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="AlertIntent">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AlertIntent">+dismissOnAction: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AlertIntent">+isDestructive: dynamic</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationDefaultActions">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDefaultActions">
-							<rect x="1724.0" y="3469.5" height="62.0" width="287.0" data-name="NotificationDefaultActions"></rect>
-							<path d="M1724.0 3500.5 L2011.0 3500.5" fill="none" data-name="NotificationDefaultActions"></path>
-						</g>
-						<g transform="translate(1724, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDefaultActions">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDefaultActions">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDefaultActions">NotificationDefaultActions</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1724, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDefaultActions">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDefaultActions">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDefaultActions">&lt;static&gt;+cancel: NotificationAction</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationAction">
-							<rect x="1739.5" y="3797.5" height="92.0" width="256.0" data-name="NotificationAction"></rect>
-							<path d="M1739.5 3828.5 L1995.5 3828.5" fill="none" data-name="NotificationAction"></path>
-						</g>
-						<g transform="translate(1739.5, 3797.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationAction">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationAction">NotificationAction</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1739.5, 3828.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationAction">+label: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationAction">+onSelect: dynamic Function()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationAction">+isDestructive: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="INotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="60183.3" y="3447.0" height="107.0" width="395.0" data-name="INotificationService"></rect>
-							<path d="M60183.3 3478.0 L60578.3 3478.0" fill="none" data-name="INotificationService"></path>
-						</g>
-						<g transform="translate(60183.25, 3447)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
-								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
-								
-							</g>
-						</g>
-						<g transform="translate(60183.25, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="INotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="INotificationService">+void showMessage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="INotificationService">+void show()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="INotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="INotificationService">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationService">
-							<rect x="60153.3" y="3774.5" height="138.0" width="455.0" data-name="NotificationService"></rect>
-							<path d="M60153.3 3805.5 L60608.3 3805.5" fill="none" data-name="NotificationService"></path>
-							<path d="M60153.3 3836.5 L60608.3 3836.5" fill="none" data-name="NotificationService"></path>
-						</g>
-						<g transform="translate(60153.25, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationService">
-								<text x="219.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationService">NotificationService</text>
-								
-							</g>
-						</g>
-						<g transform="translate(60153.25, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">-_streamController: BehaviorSubject&lt;NotificationIntent&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(60153.25, 3836.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationService">+void showMessage()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationService">+void show()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationService">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BehaviorSubject">
-							<rect x="62172.0" y="4118.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
-						</g>
-						<g transform="translate(62172, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BehaviorSubject">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="BehaviorSubject">BehaviorSubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationIntent">
-							<rect x="4082.0" y="2548.5" height="153.0" width="288.0" data-name="NotificationIntent"></rect>
-							<path d="M4082.0 2579.5 L4370.0 2579.5" fill="none" data-name="NotificationIntent"></path>
-							<path d="M4082.0 2670.5 L4370.0 2670.5" fill="none" data-name="NotificationIntent"></path>
-						</g>
-						<g transform="translate(4082, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationIntent">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationIntent">NotificationIntent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4082, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+message: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationIntent">+customContent: Widget?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationIntent">+icon: IconData?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationIntent">+actions: List&lt;NotificationAction&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationIntent">+type: NotificationType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4082, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+void register()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="21428.8" y="3485.0" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(21428.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="25696.0" y="3485.0" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(25696, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationType">
-							<rect x="1309.0" y="3439.5" height="122.0" width="325.0" data-name="NotificationType"></rect>
-							<path d="M1309.0 3470.5 L1634.0 3470.5" fill="none" data-name="NotificationType"></path>
-						</g>
-						<g transform="translate(1309, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationType">
-								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationType">NotificationType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1309, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationType">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationType">&lt;static&gt;+values: List&lt;NotificationType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationType">&lt;static&gt;+snackbar: NotificationType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationType">&lt;static&gt;+alert: NotificationType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationType">&lt;static&gt;+custom: NotificationType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="6731.0" y="4118.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(6731, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IClipboardService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IClipboardService">
-							<rect x="26124.5" y="105.5" height="62.0" width="156.0" data-name="IClipboardService"></rect>
-							<path d="M26124.5 136.5 L26280.5 136.5" fill="none" data-name="IClipboardService"></path>
-						</g>
-						<g transform="translate(26124.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IClipboardService">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="IClipboardService">IClipboardService</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26124.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IClipboardService">
-								<text x="0.0" y="13.5" stroke="none" data-name="IClipboardService">+dynamic copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ClipboardService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ClipboardService">
-							<rect x="26127.0" y="598.5" height="62.0" width="151.0" data-name="ClipboardService"></rect>
-							<path d="M26127.0 629.5 L26278.0 629.5" fill="none" data-name="ClipboardService"></path>
-						</g>
-						<g transform="translate(26127, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ClipboardService">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="ClipboardService">ClipboardService</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26127, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ClipboardService">
-								<text x="0.0" y="13.5" stroke="none" data-name="ClipboardService">+dynamic copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationDispatcher">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDispatcher">
-							<rect x="5376.5" y="2564.0" height="122.0" width="325.0" data-name="NotificationDispatcher"></rect>
-							<path d="M5376.5 2595.0 L5701.5 2595.0" fill="none" data-name="NotificationDispatcher"></path>
-						</g>
-						<g transform="translate(5376.5, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDispatcher">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDispatcher">
-								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDispatcher">NotificationDispatcher</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5376.5, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDispatcher">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDispatcher">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDispatcher">+child: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationDispatcher">+snackbarInnerPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationDispatcher">+snackbarWidth: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationDispatcher">+snackbarBehavior: SnackBarBehavior</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationDispatcher">+snackbarDefaultDuration: int</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SnackBarBehavior">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SnackBarBehavior">
-							<rect x="3773.0" y="3485.0" height="31.0" width="162.0" data-name="SnackBarBehavior"></rect>
-						</g>
-						<g transform="translate(3773, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackBarBehavior">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackBarBehavior">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackBarBehavior">SnackBarBehavior</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Assets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Assets">
-							<rect x="26320.5" y="105.5" height="62.0" width="218.0" data-name="Assets"></rect>
-							<path d="M26320.5 136.5 L26538.5 136.5" fill="none" data-name="Assets"></path>
-						</g>
-						<g transform="translate(26320.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Assets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Assets">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="Assets">Assets</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26320.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Assets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Assets">
-								<text x="0.0" y="13.5" stroke="none" data-name="Assets">&lt;static&gt;+logoWide: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AsyncValueWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValueWidget">
-							<rect x="5741.5" y="2526.0" height="198.0" width="384.0" data-name="AsyncValueWidget"></rect>
-							<path d="M5741.5 2557.0 L6125.5 2557.0" fill="none" data-name="AsyncValueWidget"></path>
-							<path d="M5741.5 2648.0 L6125.5 2648.0" fill="none" data-name="AsyncValueWidget"></path>
-						</g>
-						<g transform="translate(5741.5, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValueWidget">
-								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValueWidget">AsyncValueWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5741.5, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+value: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">+data: Widget Function(T)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">+error: Widget Function(Object, StackTrace?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">+loading: Widget Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AsyncValueWidget">+empty: Widget Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5741.5, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">-Widget _buildDataOrEmptyWidget()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultLoad()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="32617.5" y="3485.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
-						</g>
-						<g transform="translate(32617.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="28098.3" y="3485.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
-						</g>
-						<g transform="translate(28098.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(Object, StackTrace?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Object, StackTrace?)?">
-							<rect x="3975.0" y="3485.0" height="31.0" width="326.0" data-name="Widget Function(Object, StackTrace?)?"></rect>
-						</g>
-						<g transform="translate(3975, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Object, StackTrace?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Object, StackTrace?)?">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Object, StackTrace?)?">Widget Function(Object, StackTrace?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function()?">
-							<rect x="4341.0" y="3485.0" height="31.0" width="166.0" data-name="Widget Function()?"></rect>
-						</g>
-						<g transform="translate(4341, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function()?">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function()?">Widget Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControlLabel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlLabel">
-							<rect x="6234.5" y="2548.5" height="153.0" width="430.0" data-name="FormControlLabel"></rect>
-							<path d="M6234.5 2579.5 L6664.5 2579.5" fill="none" data-name="FormControlLabel"></path>
-							<path d="M6234.5 2670.5 L6664.5 2670.5" fill="none" data-name="FormControlLabel"></path>
-						</g>
-						<g transform="translate(6234.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlLabel">
-								<text x="207.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlLabel">FormControlLabel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6234.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+formControl: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlLabel">+text: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlLabel">+isClickable: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlLabel">+textStyle: TextStyle?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormControlLabel">+onClick: void Function(AbstractControl&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6234.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="23930.3" y="3485.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(23930.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TextStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
-							<rect x="10158.0" y="3485.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
-						</g>
-						<g transform="translate(10158, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
-								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<rect x="4547.0" y="3485.0" height="31.0" width="352.0" data-name="void Function(AbstractControl&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(4547, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">void Function(AbstractControl&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ActionPopUpMenuButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionPopUpMenuButton">
-							<rect x="6828.3" y="2496.0" height="258.0" width="324.0" data-name="ActionPopUpMenuButton"></rect>
-							<path d="M6828.3 2527.0 L7152.3 2527.0" fill="none" data-name="ActionPopUpMenuButton"></path>
-							<path d="M6828.3 2708.0 L7152.3 2708.0" fill="none" data-name="ActionPopUpMenuButton"></path>
-						</g>
-						<g transform="translate(6828.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionPopUpMenuButton">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionPopUpMenuButton">ActionPopUpMenuButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6828.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColor: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColorHover: Color?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconSize: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ActionPopUpMenuButton">+disableSplashEffect: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ActionPopUpMenuButton">+hideOnEmpty: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ActionPopUpMenuButton">+orientation: Axis</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ActionPopUpMenuButton">+elevation: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ActionPopUpMenuButton">+splashRadius: double?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ActionPopUpMenuButton">+enabled: bool</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ActionPopUpMenuButton">+position: PopupMenuPosition</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6828.25, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">-Widget _buildPopupMenu()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="21539.8" y="3485.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(21539.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Axis">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Axis">
-							<rect x="5663.3" y="3485.0" height="31.0" width="49.0" data-name="Axis"></rect>
-						</g>
-						<g transform="translate(5663.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Axis">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Axis">
-								<text x="16.5" y="13.5" stroke="none" text-anchor="middle" data-name="Axis">Axis</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PopupMenuPosition">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PopupMenuPosition">
-							<rect x="5752.3" y="3485.0" height="31.0" width="174.0" data-name="PopupMenuPosition"></rect>
-						</g>
-						<g transform="translate(5752.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PopupMenuPosition">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PopupMenuPosition">
-								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="PopupMenuPosition">PopupMenuPosition</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Search">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Search">
-							<rect x="7210.5" y="2571.5" height="107.0" width="373.0" data-name="Search"></rect>
-							<path d="M7210.5 2602.5 L7583.5 2602.5" fill="none" data-name="Search"></path>
-						</g>
-						<g transform="translate(7210.5, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Search">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Search">
-								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="Search">Search</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7210.5, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Search">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Search">
-								<text x="0.0" y="13.5" stroke="none" data-name="Search">+onQueryChanged: dynamic Function(String)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Search">+searchController: SearchController?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Search">+hintText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Search">+initialText: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(String)">
-							<rect x="5966.3" y="3485.0" height="31.0" width="213.0" data-name="dynamic Function(String)"></rect>
-						</g>
-						<g transform="translate(5966.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(String)">
-								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(String)">dynamic Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SearchController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="36070.5" y="3469.5" height="62.0" width="258.0" data-name="SearchController"></rect>
-							<path d="M36070.5 3500.5 L36328.5 3500.5" fill="none" data-name="SearchController"></path>
-						</g>
-						<g transform="translate(36070.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36070.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SearchController">
-								<text x="0.0" y="13.5" stroke="none" data-name="SearchController">+setText: void Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(String)">
-							<rect x="36109.5" y="3828.0" height="31.0" width="180.0" data-name="void Function(String)"></rect>
-						</g>
-						<g transform="translate(36109.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(String)">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(String)">void Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormScaffold">
-							<rect x="7623.5" y="2556.5" height="137.0" width="212.0" data-name="FormScaffold"></rect>
-							<path d="M7623.5 2587.5 L7835.5 2587.5" fill="none" data-name="FormScaffold"></path>
-						</g>
-						<g transform="translate(7623.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormScaffold">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormScaffold">FormScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7623.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormScaffold">+formViewModel: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormScaffold">+actions: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormScaffold">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormScaffold">+actionsPadding: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConstrainedWidthFlexible">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConstrainedWidthFlexible">
-							<rect x="7875.5" y="2533.5" height="183.0" width="287.0" data-name="ConstrainedWidthFlexible"></rect>
-							<path d="M7875.5 2564.5 L8162.5 2564.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
-							<path d="M7875.5 2670.5 L8162.5 2670.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
-						</g>
-						<g transform="translate(7875.5, 2533.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConstrainedWidthFlexible">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConstrainedWidthFlexible">ConstrainedWidthFlexible</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7875.5, 2564.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+minWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">+maxWidth: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConstrainedWidthFlexible">+flex: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConstrainedWidthFlexible">+flexSum: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConstrainedWidthFlexible">+child: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConstrainedWidthFlexible">+outerConstraints: BoxConstraints</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7875.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">-double _getWidth()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoxConstraints">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoxConstraints">
-							<rect x="12912.0" y="3485.0" height="31.0" width="136.0" data-name="BoxConstraints"></rect>
-						</g>
-						<g transform="translate(12912, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxConstraints">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxConstraints">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxConstraints">BoxConstraints</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PrimaryButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PrimaryButton">
-							<rect x="8202.5" y="2511.5" height="227.0" width="333.0" data-name="PrimaryButton"></rect>
-							<path d="M8202.5 2542.5 L8535.5 2542.5" fill="none" data-name="PrimaryButton"></path>
-						</g>
-						<g transform="translate(8202.5, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PrimaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PrimaryButton">
-								<text x="158.5" y="13.5" stroke="none" text-anchor="middle" data-name="PrimaryButton">PrimaryButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8202.5, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PrimaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PrimaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="PrimaryButton">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PrimaryButton">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PrimaryButton">+isLoading: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PrimaryButton">+showLoadingEarliestAfterMs: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PrimaryButton">+onPressed: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PrimaryButton">+tooltip: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PrimaryButton">+tooltipDisabled: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PrimaryButton">+enabled: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PrimaryButton">+onPressedFuture: dynamic Function()?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="PrimaryButton">+innerPadding: EdgeInsets</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="PrimaryButton">+minimumSize: Size?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="PrimaryButton">+isDisabled: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="18277.3" y="4118.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(18277.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="11377.8" y="3485.0" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
-						</g>
-						<g transform="translate(11377.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
-								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EdgeInsets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="13098.8" y="3485.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
-						</g>
-						<g transform="translate(13098.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Size">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Size">
-							<rect x="8443.0" y="3485.0" height="31.0" width="50.0" data-name="Size"></rect>
-						</g>
-						<g transform="translate(8443, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Size">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Size">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Size">Size</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormTableRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRow">
-							<rect x="8575.5" y="2549.0" height="152.0" width="379.0" data-name="FormTableRow"></rect>
-							<path d="M8575.5 2580.0 L8954.5 2580.0" fill="none" data-name="FormTableRow"></path>
-						</g>
-						<g transform="translate(8575.5, 2549)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRow">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRow">FormTableRow</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8575.5, 2580)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRow">+label: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRow">+labelBuilder: Widget Function(BuildContext)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRow">+labelStyle: TextStyle?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRow">+labelHelpText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormTableRow">+input: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormTableRow">+control: AbstractControl&lt;dynamic&gt;?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormTableRow">+layout: FormTableRowLayout?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
-							<rect x="8533.0" y="3485.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
-						</g>
-						<g transform="translate(8533, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormTableRowLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRowLayout">
-							<rect x="6441.0" y="3447.0" height="107.0" width="370.0" data-name="FormTableRowLayout"></rect>
-							<path d="M6441.0 3478.0 L6811.0 3478.0" fill="none" data-name="FormTableRowLayout"></path>
-						</g>
-						<g transform="translate(6441, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRowLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRowLayout">
-								<text x="177.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRowLayout">FormTableRowLayout</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6441, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRowLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRowLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRowLayout">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+values: List&lt;FormTableRowLayout&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+vertical: FormTableRowLayout</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+horizontal: FormTableRowLayout</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormTableLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableLayout">
-							<rect x="9383.5" y="2548.5" height="153.0" width="379.0" data-name="FormTableLayout"></rect>
-							<path d="M9383.5 2579.5 L9762.5 2579.5" fill="none" data-name="FormTableLayout"></path>
-							<path d="M9383.5 2670.5 L9762.5 2670.5" fill="none" data-name="FormTableLayout"></path>
-						</g>
-						<g transform="translate(9383.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableLayout">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableLayout">FormTableLayout</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9383.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+rows: List&lt;FormTableRow&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableLayout">+columnWidths: Map&lt;int, TableColumnWidth&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableLayout">+rowDivider: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableLayout">+rowLayout: FormTableRowLayout?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormTableLayout">+rowLabelStyle: TextStyle?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9383.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormSectionHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSectionHeader">
-							<rect x="9802.5" y="2548.5" height="153.0" width="220.0" data-name="FormSectionHeader"></rect>
-							<path d="M9802.5 2579.5 L10022.5 2579.5" fill="none" data-name="FormSectionHeader"></path>
-							<path d="M9802.5 2670.5 L10022.5 2670.5" fill="none" data-name="FormSectionHeader"></path>
-						</g>
-						<g transform="translate(9802.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSectionHeader">
-								<text x="102.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormSectionHeader">FormSectionHeader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9802.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormSectionHeader">+titleTextStyle: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormSectionHeader">+helpText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormSectionHeader">+divider: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormSectionHeader">+helpTextDisabled: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9802.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormLabel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormLabel">
-							<rect x="10231.0" y="2556.0" height="138.0" width="266.0" data-name="FormLabel"></rect>
-							<path d="M10231.0 2587.0 L10497.0 2587.0" fill="none" data-name="FormLabel"></path>
-							<path d="M10231.0 2663.0 L10497.0 2663.0" fill="none" data-name="FormLabel"></path>
-						</g>
-						<g transform="translate(10231, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormLabel">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormLabel">FormLabel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10231, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+labelText: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormLabel">+helpText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormLabel">+labelTextStyle: TextStyle?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormLabel">+layout: FormTableRowLayout?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10231, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DismissButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DismissButton">
-							<rect x="15606.0" y="3789.5" height="108.0" width="249.0" data-name="DismissButton"></rect>
-							<path d="M15606.0 3820.5 L15855.0 3820.5" fill="none" data-name="DismissButton"></path>
-							<path d="M15606.0 3866.5 L15855.0 3866.5" fill="none" data-name="DismissButton"></path>
-						</g>
-						<g transform="translate(15606, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DismissButton">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="DismissButton">DismissButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15606, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+onPressed: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DismissButton">+text: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15606, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Badge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Badge">
-							<rect x="10537.0" y="2496.0" height="258.0" width="263.0" data-name="Badge"></rect>
-							<path d="M10537.0 2527.0 L10800.0 2527.0" fill="none" data-name="Badge"></path>
-							<path d="M10537.0 2678.0 L10800.0 2678.0" fill="none" data-name="Badge"></path>
-						</g>
-						<g transform="translate(10537, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Badge">
-								<text x="123.5" y="13.5" stroke="none" text-anchor="middle" data-name="Badge">Badge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10537, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
-								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+icon: IconData?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Badge">+color: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Badge">+borderRadius: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Badge">+label: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Badge">+type: BadgeType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Badge">+padding: EdgeInsets</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Badge">+iconSize: double?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Badge">+labelStyle: TextStyle?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Badge">+center: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10537, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
-								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Badge">-Color? _getBackgroundColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Badge">-Color _getBorderColor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Badge">-Color? _getLabelColor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="24426.0" y="3432.0" height="137.0" width="288.0" data-name="BadgeType"></rect>
-							<path d="M24426.0 3463.0 L24714.0 3463.0" fill="none" data-name="BadgeType"></path>
-						</g>
-						<g transform="translate(24426, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24426, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BadgeType">
-								<text x="0.0" y="13.5" stroke="none" data-name="BadgeType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BadgeType">&lt;static&gt;+values: List&lt;BadgeType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BadgeType">&lt;static&gt;+filled: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlined: BadgeType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlineFill: BadgeType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BadgeType">&lt;static&gt;+plain: BadgeType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StandardDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardDialog">
-							<rect x="10840.0" y="2488.5" height="273.0" width="247.0" data-name="StandardDialog"></rect>
-							<path d="M10840.0 2519.5 L11087.0 2519.5" fill="none" data-name="StandardDialog"></path>
-							<path d="M10840.0 2730.5 L11087.0 2730.5" fill="none" data-name="StandardDialog"></path>
-						</g>
-						<g transform="translate(10840, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardDialog">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardDialog">StandardDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10840, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+title: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardDialog">+titleText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardDialog">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardDialog">+actionButtons: List&lt;Widget&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardDialog">+backgroundColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardDialog">+borderRadius: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StandardDialog">+width: double?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StandardDialog">+height: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StandardDialog">+minWidth: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StandardDialog">+minHeight: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StandardDialog">+maxWidth: double?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StandardDialog">+maxHeight: double?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StandardDialog">+padding: EdgeInsets</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10840, 2730.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ISyncIndicatorViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ISyncIndicatorViewModel">
-							<rect x="26578.5" y="98.0" height="77.0" width="214.0" data-name="ISyncIndicatorViewModel"></rect>
-							<path d="M26578.5 129.0 L26792.5 129.0" fill="none" data-name="ISyncIndicatorViewModel"></path>
-						</g>
-						<g transform="translate(26578.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ISyncIndicatorViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ISyncIndicatorViewModel">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="ISyncIndicatorViewModel">ISyncIndicatorViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26578.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ISyncIndicatorViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ISyncIndicatorViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ISyncIndicatorViewModel">+isDirty: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ISyncIndicatorViewModel">+lastSynced: DateTime?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SyncIndicator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SyncIndicator">
-							<rect x="11127.0" y="2564.0" height="122.0" width="208.0" data-name="SyncIndicator"></rect>
-							<path d="M11127.0 2595.0 L11335.0 2595.0" fill="none" data-name="SyncIndicator"></path>
-						</g>
-						<g transform="translate(11127, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SyncIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SyncIndicator">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="SyncIndicator">SyncIndicator</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11127, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SyncIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SyncIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="SyncIndicator">+state: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SyncIndicator">+lastSynced: DateTime?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SyncIndicator">+isDirty: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SyncIndicator">+animationDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SyncIndicator">+iconSize: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IWithBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="13085.5" y="1181.5" height="62.0" width="164.0" data-name="IWithBanner"></rect>
-							<path d="M13085.5 1212.5 L13249.5 1212.5" fill="none" data-name="IWithBanner"></path>
-						</g>
-						<g transform="translate(13085.5, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13085.5, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IWithBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="IWithBanner">+Widget? banner()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BannerBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BannerBox">
-							<rect x="11375.0" y="2534.0" height="182.0" width="298.0" data-name="BannerBox"></rect>
-							<path d="M11375.0 2565.0 L11673.0 2565.0" fill="none" data-name="BannerBox"></path>
-						</g>
-						<g transform="translate(11375, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerBox">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerBox">BannerBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11375, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="BannerBox">+prefixIcon: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BannerBox">+body: Widget</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BannerBox">+style: BannerStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BannerBox">+padding: EdgeInsets?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BannerBox">+noPrefix: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BannerBox">+dismissable: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="BannerBox">+isDismissed: bool?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="BannerBox">+onDismissed: dynamic Function()?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="BannerBox">+dismissIconSize: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BannerStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BannerStyle">
-							<rect x="4939.0" y="3439.5" height="122.0" width="294.0" data-name="BannerStyle"></rect>
-							<path d="M4939.0 3470.5 L5233.0 3470.5" fill="none" data-name="BannerStyle"></path>
-						</g>
-						<g transform="translate(4939, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerStyle">
-								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerStyle">BannerStyle</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4939, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerStyle">
-								<text x="0.0" y="13.5" stroke="none" data-name="BannerStyle">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+values: List&lt;BannerStyle&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+warning: BannerStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+info: BannerStyle</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+error: BannerStyle</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ActionMenuInline">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuInline">
-							<rect x="26832.5" y="52.5" height="168.0" width="324.0" data-name="ActionMenuInline"></rect>
-							<path d="M26832.5 83.5 L27156.5 83.5" fill="none" data-name="ActionMenuInline"></path>
-							<path d="M26832.5 189.5 L27156.5 189.5" fill="none" data-name="ActionMenuInline"></path>
-						</g>
-						<g transform="translate(26832.5, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuInline">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuInline">ActionMenuInline</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26832.5, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuInline">+iconSize: double?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuInline">+visible: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuInline">+splashRadius: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ActionMenuInline">+paddingVertical: double?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ActionMenuInline">+paddingHorizontal: double?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26832.5, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Collapsible">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Collapsible">
-							<rect x="27196.5" y="83.0" height="107.0" width="441.0" data-name="Collapsible"></rect>
-							<path d="M27196.5 114.0 L27637.5 114.0" fill="none" data-name="Collapsible"></path>
-						</g>
-						<g transform="translate(27196.5, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Collapsible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Collapsible">
-								<text x="212.5" y="13.5" stroke="none" text-anchor="middle" data-name="Collapsible">Collapsible</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27196.5, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Collapsible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Collapsible">
-								<text x="0.0" y="13.5" stroke="none" data-name="Collapsible">+contentBuilder: Widget Function(BuildContext, bool)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Collapsible">+headerBuilder: Widget Function(BuildContext, bool)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Collapsible">+title: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Collapsible">+isCollapsed: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, bool)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)">
-							<rect x="26318.0" y="614.0" height="31.0" width="300.0" data-name="Widget Function(BuildContext, bool)"></rect>
-						</g>
-						<g transform="translate(26318, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)">
-								<text x="142.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)">Widget Function(BuildContext, bool)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)?">
-							<rect x="27262.0" y="614.0" height="31.0" width="310.0" data-name="Widget Function(BuildContext, bool)?"></rect>
-						</g>
-						<g transform="translate(27262, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)?">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)?">Widget Function(BuildContext, bool)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NavbarTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="62257.0" y="1644.0" height="107.0" width="196.0" data-name="NavbarTab"></rect>
-							<path d="M62257.0 1675.0 L62453.0 1675.0" fill="none" data-name="NavbarTab"></path>
-						</g>
-						<g transform="translate(62257, 1644)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
-								
-							</g>
-						</g>
-						<g transform="translate(62257, 1675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NavbarTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="NavbarTab">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NavbarTab">+intent: RoutingIntent?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NavbarTab">+index: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NavbarTab">+enabled: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="44409.5" y="2518.5" height="213.0" width="297.0" data-name="RoutingIntent"></rect>
-							<path d="M44409.5 2549.5 L44706.5 2549.5" fill="none" data-name="RoutingIntent"></path>
-							<path d="M44409.5 2685.5 L44706.5 2685.5" fill="none" data-name="RoutingIntent"></path>
-						</g>
-						<g transform="translate(44409.5, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44409.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">+route: GoRoute</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+params: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntent">+queryParams: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntent">+dispatch: RoutingIntentDispatch?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntent">+extra: Object?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntent">+routeName: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntent">+arguments: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntent">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44409.5, 2685.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">-dynamic _validateRoute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+bool matches()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TabbedNavbar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TabbedNavbar">
-							<rect x="12039.8" y="2496.5" height="257.0" width="308.0" data-name="TabbedNavbar"></rect>
-							<path d="M12039.8 2527.5 L12347.8 2527.5" fill="none" data-name="TabbedNavbar"></path>
-						</g>
-						<g transform="translate(12039.75, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabbedNavbar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabbedNavbar">
-								<text x="146.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabbedNavbar">TabbedNavbar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12039.75, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TabbedNavbar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TabbedNavbar">
-								<text x="0.0" y="13.5" stroke="none" data-name="TabbedNavbar">+tabs: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TabbedNavbar">+selectedTab: T?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TabbedNavbar">+indicator: BoxDecoration?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TabbedNavbar">+height: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TabbedNavbar">+disabledBackgroundColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TabbedNavbar">+disabledTooltipText: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TabbedNavbar">+onSelect: void Function(int, T)?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TabbedNavbar">+labelPadding: EdgeInsets?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="TabbedNavbar">+labelSpacing: double?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="TabbedNavbar">+indicatorSize: TabBarIndicatorSize?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="TabbedNavbar">+isScrollable: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="TabbedNavbar">+backgroundColor: Color?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="TabbedNavbar">+labelColorHover: Color?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="TabbedNavbar">+unselectedLabelColorHover: Color?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoxDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoxDecoration">
-							<rect x="11666.3" y="3485.0" height="31.0" width="132.0" data-name="BoxDecoration"></rect>
-						</g>
-						<g transform="translate(11666.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxDecoration">
-								<text x="58.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxDecoration">BoxDecoration</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(int, T)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(int, T)?">
-							<rect x="11838.3" y="3485.0" height="31.0" width="183.0" data-name="void Function(int, T)?"></rect>
-						</g>
-						<g transform="translate(11838.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(int, T)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(int, T)?">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(int, T)?">void Function(int, T)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TabBarIndicatorSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TabBarIndicatorSize">
-							<rect x="12061.3" y="3485.0" height="31.0" width="176.0" data-name="TabBarIndicatorSize"></rect>
-						</g>
-						<g transform="translate(12061.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabBarIndicatorSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabBarIndicatorSize">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabBarIndicatorSize">TabBarIndicatorSize</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SidesheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SidesheetTab">
-							<rect x="62009.3" y="2594.0" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
-							<path d="M62009.3 2625.0 L62339.3 2625.0" fill="none" data-name="SidesheetTab"></path>
-						</g>
-						<g transform="translate(62009.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SidesheetTab">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="SidesheetTab">SidesheetTab</text>
-								
-							</g>
-						</g>
-						<g transform="translate(62009.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SidesheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="SidesheetTab">+builder: Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="48614.0" y="3485.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
-						</g>
-						<g transform="translate(48614, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Sidesheet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Sidesheet">
-							<rect x="12715.3" y="2519.0" height="212.0" width="341.0" data-name="Sidesheet"></rect>
-							<path d="M12715.3 2550.0 L13056.3 2550.0" fill="none" data-name="Sidesheet"></path>
-						</g>
-						<g transform="translate(12715.25, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Sidesheet">
-								<text x="162.5" y="13.5" stroke="none" text-anchor="middle" data-name="Sidesheet">Sidesheet</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12715.25, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Sidesheet">
-								<text x="0.0" y="13.5" stroke="none" data-name="Sidesheet">&lt;static&gt;+kDefaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Sidesheet">+titleText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Sidesheet">+body: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Sidesheet">+tabs: List&lt;SidesheetTab&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Sidesheet">+actionButtons: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Sidesheet">+width: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Sidesheet">+withCloseButton: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Sidesheet">+ignoreAppBar: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Sidesheet">+collapseSingleTab: bool</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Sidesheet">+bodyPadding: EdgeInsets?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Sidesheet">+wrapContent: Widget Function(Widget)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(Widget)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Widget)?">
-							<rect x="19573.8" y="3485.0" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
-						</g>
-						<g transform="translate(19573.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Widget)?">
-								<text x="102.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Widget)?">Widget Function(Widget)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormSideSheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSideSheetTab">
-							<rect x="62379.3" y="2594.0" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
-							<path d="M62379.3 2625.0 L62692.3 2625.0" fill="none" data-name="FormSideSheetTab"></path>
-						</g>
-						<g transform="translate(62379.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSideSheetTab">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormSideSheetTab">FormSideSheetTab</text>
-								
-							</g>
-						</g>
-						<g transform="translate(62379.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSideSheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSideSheetTab">+formViewBuilder: Widget Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="HelpIcon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HelpIcon">
-							<rect x="27677.5" y="90.0" height="93.0" width="174.0" data-name="HelpIcon"></rect>
-							<path d="M27677.5 121.0 L27851.5 121.0" fill="none" data-name="HelpIcon"></path>
-							<path d="M27677.5 152.0 L27851.5 152.0" fill="none" data-name="HelpIcon"></path>
-						</g>
-						<g transform="translate(27677.5, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HelpIcon">
-								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="HelpIcon">HelpIcon</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27677.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
-								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+tooltipText: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27677.5, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
-								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EmptyBody">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmptyBody">
-							<rect x="13672.0" y="2541.0" height="168.0" width="222.0" data-name="EmptyBody"></rect>
-							<path d="M13672.0 2572.0 L13894.0 2572.0" fill="none" data-name="EmptyBody"></path>
-							<path d="M13672.0 2678.0 L13894.0 2678.0" fill="none" data-name="EmptyBody"></path>
-						</g>
-						<g transform="translate(13672, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmptyBody">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="EmptyBody">EmptyBody</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13672, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+icon: IconData?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmptyBody">+leading: Widget?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmptyBody">+leadingSpacing: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmptyBody">+title: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EmptyBody">+description: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EmptyBody">+button: Widget?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13672, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IndicatorRangeSliderThumbShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IndicatorRangeSliderThumbShape">
-							<rect x="27857.0" y="560.5" height="138.0" width="287.0" data-name="IndicatorRangeSliderThumbShape"></rect>
-							<path d="M27857.0 591.5 L28144.0 591.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
-							<path d="M27857.0 652.5 L28144.0 652.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
-						</g>
-						<g transform="translate(27857, 560.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IndicatorRangeSliderThumbShape">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="IndicatorRangeSliderThumbShape">IndicatorRangeSliderThumbShape</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27857, 591.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+buildContext: BuildContext</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+start: T</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+end: T</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27857, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+Size getPreferredSize()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+void paint()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BuildContext">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
-							<rect x="27942.5" y="1197.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
-						</g>
-						<g transform="translate(27942.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RangeSliderThumbShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RangeSliderThumbShape">
-							<rect x="27891.5" y="121.0" height="31.0" width="218.0" data-name="RangeSliderThumbShape"></rect>
-						</g>
-						<g transform="translate(27891.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="RangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RangeSliderThumbShape">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="RangeSliderThumbShape">RangeSliderThumbShape</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MouseEventsRegion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MouseEventsRegion">
-							<rect x="15931.5" y="3760.0" height="167.0" width="379.0" data-name="MouseEventsRegion"></rect>
-							<path d="M15931.5 3791.0 L16310.5 3791.0" fill="none" data-name="MouseEventsRegion"></path>
-						</g>
-						<g transform="translate(15931.5, 3760)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MouseEventsRegion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MouseEventsRegion">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="MouseEventsRegion">MouseEventsRegion</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15931.5, 3791)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MouseEventsRegion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MouseEventsRegion">
-								<text x="0.0" y="13.5" stroke="none" data-name="MouseEventsRegion">+onTap: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MouseEventsRegion">+onHover: void Function(PointerHoverEvent)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MouseEventsRegion">+onEnter: void Function(PointerEnterEvent)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MouseEventsRegion">+onExit: void Function(PointerExitEvent)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MouseEventsRegion">+autoselectCursor: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MouseEventsRegion">+cursor: SystemMouseCursor</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MouseEventsRegion">&lt;static&gt;+defaultCursor: SystemMouseCursor</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MouseEventsRegion">+autoCursor: SystemMouseCursor</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(PointerHoverEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerHoverEvent)?">
-							<rect x="5826.8" y="4118.5" height="31.0" width="292.0" data-name="void Function(PointerHoverEvent)?"></rect>
-						</g>
-						<g transform="translate(5826.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerHoverEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerHoverEvent)?">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerHoverEvent)?">void Function(PointerHoverEvent)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(PointerEnterEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerEnterEvent)?">
-							<rect x="6158.8" y="4118.5" height="31.0" width="287.0" data-name="void Function(PointerEnterEvent)?"></rect>
-						</g>
-						<g transform="translate(6158.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerEnterEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerEnterEvent)?">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerEnterEvent)?">void Function(PointerEnterEvent)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(PointerExitEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerExitEvent)?">
-							<rect x="13967.0" y="4118.5" height="31.0" width="274.0" data-name="void Function(PointerExitEvent)?"></rect>
-						</g>
-						<g transform="translate(13967, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerExitEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerExitEvent)?">
-								<text x="129.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerExitEvent)?">void Function(PointerExitEvent)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SystemMouseCursor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SystemMouseCursor">
-							<rect x="14281.0" y="4118.5" height="31.0" width="180.0" data-name="SystemMouseCursor"></rect>
-						</g>
-						<g transform="translate(14281, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SystemMouseCursor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SystemMouseCursor">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="SystemMouseCursor">SystemMouseCursor</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveCustomColorPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveCustomColorPicker">
-							<rect x="36406.0" y="614.0" height="31.0" width="236.0" data-name="ReactiveCustomColorPicker"></rect>
-						</g>
-						<g transform="translate(36406, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveCustomColorPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveCustomColorPicker">
-								<text x="110.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveCustomColorPicker">ReactiveCustomColorPicker</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveFormField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFormField">
-							<rect x="36442.5" y="121.0" height="31.0" width="163.0" data-name="ReactiveFormField"></rect>
-						</g>
-						<g transform="translate(36442.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFormField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFormField">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFormField">ReactiveFormField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TextParagraph">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextParagraph">
-							<rect x="13934.0" y="2556.0" height="138.0" width="208.0" data-name="TextParagraph"></rect>
-							<path d="M13934.0 2587.0 L14142.0 2587.0" fill="none" data-name="TextParagraph"></path>
-							<path d="M13934.0 2663.0 L14142.0 2663.0" fill="none" data-name="TextParagraph"></path>
-						</g>
-						<g transform="translate(13934, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextParagraph">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextParagraph">TextParagraph</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13934, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
-								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+text: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TextParagraph">+style: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TextParagraph">+selectable: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TextParagraph">+span: List&lt;TextSpan&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13934, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
-								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="UnderConstruction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnderConstruction">
-							<rect x="36645.5" y="105.5" height="62.0" width="164.0" data-name="UnderConstruction"></rect>
-							<path d="M36645.5 136.5 L36809.5 136.5" fill="none" data-name="UnderConstruction"></path>
-						</g>
-						<g transform="translate(36645.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnderConstruction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnderConstruction">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="UnderConstruction">UnderConstruction</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36645.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnderConstruction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnderConstruction">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnderConstruction">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NullHelperDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NullHelperDecoration">
-							<rect x="36828.5" y="614.0" height="31.0" width="184.0" data-name="NullHelperDecoration"></rect>
-						</g>
-						<g transform="translate(36828.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NullHelperDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NullHelperDecoration">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="NullHelperDecoration">NullHelperDecoration</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InputDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InputDecoration">
-							<rect x="36849.5" y="121.0" height="31.0" width="142.0" data-name="InputDecoration"></rect>
-						</g>
-						<g transform="translate(36849.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InputDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InputDecoration">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="InputDecoration">InputDecoration</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ActionMenuType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuType">
-							<rect x="8839.0" y="3447.0" height="107.0" width="330.0" data-name="ActionMenuType"></rect>
-							<path d="M8839.0 3478.0 L9169.0 3478.0" fill="none" data-name="ActionMenuType"></path>
-						</g>
-						<g transform="translate(8839, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuType">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuType">ActionMenuType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8839, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+values: List&lt;ActionMenuType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+inline: ActionMenuType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+popup: ActionMenuType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="HtmlStylingBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlStylingBanner">
-							<rect x="14182.0" y="2571.0" height="108.0" width="298.0" data-name="HtmlStylingBanner"></rect>
-							<path d="M14182.0 2602.0 L14480.0 2602.0" fill="none" data-name="HtmlStylingBanner"></path>
-							<path d="M14182.0 2648.0 L14480.0 2648.0" fill="none" data-name="HtmlStylingBanner"></path>
-						</g>
-						<g transform="translate(14182, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlStylingBanner">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlStylingBanner">HtmlStylingBanner</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14182, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+isDismissed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="HtmlStylingBanner">+onDismissed: dynamic Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14182, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="82075.0" y="105.5" height="62.0" width="192.0" data-name="FormConsumerWidget"></rect>
-							<path d="M82075.0 136.5 L82267.0 136.5" fill="none" data-name="FormConsumerWidget"></path>
-						</g>
-						<g transform="translate(82075, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82075, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerRefWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="13485.5" y="1666.5" height="62.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
-							<path d="M13485.5 1697.5 L13704.5 1697.5" fill="none" data-name="FormConsumerRefWidget"></path>
-						</g>
-						<g transform="translate(13485.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13485.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerRefWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerRefWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SplashPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SplashPage">
-							<rect x="37316.5" y="105.5" height="62.0" width="136.0" data-name="SplashPage"></rect>
-							<path d="M37316.5 136.5 L37452.5 136.5" fill="none" data-name="SplashPage"></path>
-						</g>
-						<g transform="translate(37316.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SplashPage">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SplashPage">SplashPage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37316.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SplashPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SplashPage">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ErrorPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ErrorPage">
-							<rect x="13283.5" y="1651.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
-							<path d="M13283.5 1682.0 L13445.5 1682.0" fill="none" data-name="ErrorPage"></path>
-							<path d="M13283.5 1713.0 L13445.5 1713.0" fill="none" data-name="ErrorPage"></path>
-						</g>
-						<g transform="translate(13283.5, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ErrorPage">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="ErrorPage">ErrorPage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13283.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+error: Exception?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13283.5, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="29246.3" y="1197.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(29246.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyULogo">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyULogo">
-							<rect x="16427.0" y="3797.0" height="93.0" width="214.0" data-name="StudyULogo"></rect>
-							<path d="M16427.0 3828.0 L16641.0 3828.0" fill="none" data-name="StudyULogo"></path>
-							<path d="M16427.0 3859.0 L16641.0 3859.0" fill="none" data-name="StudyULogo"></path>
-						</g>
-						<g transform="translate(16427, 3797)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyULogo">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyULogo">StudyULogo</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16427, 3828)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16427, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SingleColumnLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayout">
-							<rect x="14520.0" y="2526.0" height="198.0" width="418.0" data-name="SingleColumnLayout"></rect>
-							<path d="M14520.0 2557.0 L14938.0 2557.0" fill="none" data-name="SingleColumnLayout"></path>
-							<path d="M14520.0 2693.0 L14938.0 2693.0" fill="none" data-name="SingleColumnLayout"></path>
-						</g>
-						<g transform="translate(14520, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayout">
-								<text x="201.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayout">SingleColumnLayout</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14520, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraints: BoxConstraints</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraintsNarrow: BoxConstraints</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayout">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayout">+header: Widget?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayout">+stickyHeader: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayout">+constraints: BoxConstraints?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SingleColumnLayout">+scroll: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SingleColumnLayout">+padding: EdgeInsets?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14520, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+dynamic fromType()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SingleColumnLayoutType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="27032.3" y="3432.0" height="137.0" width="426.0" data-name="SingleColumnLayoutType"></rect>
-							<path d="M27032.3 3463.0 L27458.3 3463.0" fill="none" data-name="SingleColumnLayoutType"></path>
-						</g>
-						<g transform="translate(27032.25, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
-								<text x="205.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27032.25, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayoutType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayoutType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedWide: SingleColumnLayoutType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedNarrow: SingleColumnLayoutType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+stretched: SingleColumnLayoutType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+split: SingleColumnLayoutType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Hyperlink">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Hyperlink">
-							<rect x="15615.0" y="2519.0" height="212.0" width="222.0" data-name="Hyperlink"></rect>
-							<path d="M15615.0 2550.0 L15837.0 2550.0" fill="none" data-name="Hyperlink"></path>
-						</g>
-						<g transform="translate(15615, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Hyperlink">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Hyperlink">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="Hyperlink">Hyperlink</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15615, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Hyperlink">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Hyperlink">
-								<text x="0.0" y="13.5" stroke="none" data-name="Hyperlink">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Hyperlink">+url: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Hyperlink">+onClick: void Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Hyperlink">+linkColor: Color</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Hyperlink">+hoverColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Hyperlink">+visitedColor: Color?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Hyperlink">+style: TextStyle?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Hyperlink">+hoverStyle: TextStyle?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Hyperlink">+visitedStyle: TextStyle?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Hyperlink">+icon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Hyperlink">+iconSize: double?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StandardTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableColumn">
-							<rect x="21586.0" y="2556.5" height="137.0" width="287.0" data-name="StandardTableColumn"></rect>
-							<path d="M21586.0 2587.5 L21873.0 2587.5" fill="none" data-name="StandardTableColumn"></path>
-						</g>
-						<g transform="translate(21586, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableColumn">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableColumn">StandardTableColumn</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21586, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableColumn">+label: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableColumn">+tooltip: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableColumn">+columnWidth: TableColumnWidth</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableColumn">+sortable: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardTableColumn">+sortAscending: bool?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardTableColumn">+sortableIcon: Widget?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TableColumnWidth">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TableColumnWidth">
-							<rect x="24211.3" y="3485.0" height="31.0" width="165.0" data-name="TableColumnWidth"></rect>
-						</g>
-						<g transform="translate(24211.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TableColumnWidth">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableColumnWidth">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableColumnWidth">TableColumnWidth</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StandardTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTable">
-							<rect x="19871.8" y="1501.5" height="392.0" width="688.0" data-name="StandardTable"></rect>
-							<path d="M19871.8 1532.5 L20559.8 1532.5" fill="none" data-name="StandardTable"></path>
-						</g>
-						<g transform="translate(19871.75, 1501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTable">
-								<text x="336.0" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTable">StandardTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19871.75, 1532.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTable">+inputColumns: List&lt;StandardTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTable">+trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardTable">+trailingActionsMenuType: ActionMenuType?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardTable">+sortColumnPredicates: List&lt;int Function(T, T)?&gt;?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StandardTable">+pinnedPredicates: int Function(T, T)?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StandardTable">+headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StandardTable">+dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StandardTable">+inputTrailingActionsColumn: StandardTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StandardTable">+tableWrapper: Widget Function(Widget)?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StandardTable">+cellSpacing: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StandardTable">+rowSpacing: double</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StandardTable">+minRowHeight: double?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StandardTable">+showTableHeader: bool</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StandardTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StandardTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StandardTable">+trailingWidget: Widget?</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StandardTable">+leadingWidgetSpacing: double?</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StandardTable">+trailingWidgetSpacing: double?</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StandardTable">+emptyWidget: Widget?</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StandardTable">+rowStyle: StandardTableStyle</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StandardTable">+disableRowInteractions: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="25512.0" y="3485.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
-						</g>
-						<g transform="translate(25512, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-							<rect x="18928.3" y="2609.5" height="31.0" width="381.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?"></rect>
-						</g>
-						<g transform="translate(18928.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="int Function(T, T)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(T, T)?">
-							<rect x="19389.3" y="2609.5" height="31.0" width="160.0" data-name="int Function(T, T)?"></rect>
-						</g>
-						<g transform="translate(19389.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(T, T)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(T, T)?">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(T, T)?">int Function(T, T)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<rect x="19589.3" y="2609.5" height="31.0" width="523.0" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?"></rect>
-						</g>
-						<g transform="translate(19589.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-								<text x="253.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StandardTableStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableStyle">
-							<rect x="9715.0" y="3447.0" height="107.0" width="353.0" data-name="StandardTableStyle"></rect>
-							<path d="M9715.0 3478.0 L10068.0 3478.0" fill="none" data-name="StandardTableStyle"></path>
-						</g>
-						<g transform="translate(9715, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableStyle">
-								<text x="168.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableStyle">StandardTableStyle</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9715, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableStyle">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableStyle">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+values: List&lt;StandardTableStyle&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+plain: StandardTableStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+material: StandardTableStyle</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconPack">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPack">
-							<rect x="37492.5" y="82.5" height="108.0" width="359.0" data-name="IconPack"></rect>
-							<path d="M37492.5 113.5 L37851.5 113.5" fill="none" data-name="IconPack"></path>
-							<path d="M37492.5 159.5 L37851.5 159.5" fill="none" data-name="IconPack"></path>
-						</g>
-						<g transform="translate(37492.5, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPack">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPack">IconPack</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37492.5, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+defaultPack: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPack">&lt;static&gt;+material: List&lt;IconOption&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37492.5, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+IconOption? resolveIconByName()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconOption">
-							<rect x="23053.0" y="2548.5" height="153.0" width="264.0" data-name="IconOption"></rect>
-							<path d="M23053.0 2579.5 L23317.0 2579.5" fill="none" data-name="IconOption"></path>
-							<path d="M23053.0 2655.5 L23317.0 2655.5" fill="none" data-name="IconOption"></path>
-						</g>
-						<g transform="translate(23053, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconOption">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="IconOption">IconOption</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23053, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconOption">+isEmpty: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconOption">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23053, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+String toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">&lt;static&gt;+IconOption fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="22666.5" y="1682.0" height="31.0" width="96.0" data-name="Equatable"></rect>
-						</g>
-						<g transform="translate(22666.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveIconPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveIconPicker">
-							<rect x="37070.0" y="614.0" height="31.0" width="168.0" data-name="ReactiveIconPicker"></rect>
-						</g>
-						<g transform="translate(37070, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveIconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveIconPicker">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveIconPicker">ReactiveIconPicker</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveFocusableFormField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFocusableFormField">
-							<rect x="37031.5" y="121.0" height="31.0" width="245.0" data-name="ReactiveFocusableFormField"></rect>
-						</g>
-						<g transform="translate(37031.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFocusableFormField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFocusableFormField">
-								<text x="114.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFocusableFormField">ReactiveFocusableFormField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPicker">
-							<rect x="23138.0" y="1606.0" height="183.0" width="319.0" data-name="IconPicker"></rect>
-							<path d="M23138.0 1637.0 L23457.0 1637.0" fill="none" data-name="IconPicker"></path>
-							<path d="M23138.0 1758.0 L23457.0 1758.0" fill="none" data-name="IconPicker"></path>
-						</g>
-						<g transform="translate(23138, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPicker">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPicker">IconPicker</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23138, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPicker">+selectedOption: IconOption?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPicker">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconPicker">+galleryIconSize: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IconPicker">+selectedIconSize: double?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IconPicker">+focusNode: FocusNode?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IconPicker">+isDisabled: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23138, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(IconOption)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(IconOption)?">
-							<rect x="23605.5" y="2609.5" height="31.0" width="230.0" data-name="void Function(IconOption)?"></rect>
-						</g>
-						<g transform="translate(23605.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(IconOption)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(IconOption)?">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(IconOption)?">void Function(IconOption)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FocusNode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FocusNode">
-							<rect x="23404.0" y="2609.5" height="31.0" width="106.0" data-name="FocusNode"></rect>
-						</g>
-						<g transform="translate(23404, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FocusNode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FocusNode">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="FocusNode">FocusNode</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconPickerField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerField">
-							<rect x="23497.0" y="1606.0" height="183.0" width="319.0" data-name="IconPickerField"></rect>
-							<path d="M23497.0 1637.0 L23816.0 1637.0" fill="none" data-name="IconPickerField"></path>
-							<path d="M23497.0 1758.0 L23816.0 1758.0" fill="none" data-name="IconPickerField"></path>
-						</g>
-						<g transform="translate(23497, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerField">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerField">IconPickerField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23497, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerField">+selectedOption: IconOption?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerField">+selectedIconSize: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconPickerField">+galleryIconSize: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IconPickerField">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IconPickerField">+focusNode: FocusNode?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IconPickerField">+isDisabled: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23497, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconPickerGallery">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerGallery">
-							<rect x="23856.0" y="1636.0" height="123.0" width="319.0" data-name="IconPickerGallery"></rect>
-							<path d="M23856.0 1667.0 L24175.0 1667.0" fill="none" data-name="IconPickerGallery"></path>
-							<path d="M23856.0 1728.0 L24175.0 1728.0" fill="none" data-name="IconPickerGallery"></path>
-						</g>
-						<g transform="translate(23856, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerGallery">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerGallery">IconPickerGallery</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23856, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerGallery">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerGallery">+iconSize: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23856, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SecondaryButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SecondaryButton">
-							<rect x="20152.3" y="2556.0" height="138.0" width="249.0" data-name="SecondaryButton"></rect>
-							<path d="M20152.3 2587.0 L20401.3 2587.0" fill="none" data-name="SecondaryButton"></path>
-							<path d="M20152.3 2663.0 L20401.3 2663.0" fill="none" data-name="SecondaryButton"></path>
-						</g>
-						<g transform="translate(20152.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecondaryButton">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecondaryButton">SecondaryButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20152.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SecondaryButton">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SecondaryButton">+isLoading: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SecondaryButton">+onPressed: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20152.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TwoColumnLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TwoColumnLayout">
-							<rect x="20637.5" y="2466.5" height="317.0" width="368.0" data-name="TwoColumnLayout"></rect>
-							<path d="M20637.5 2497.5 L21005.5 2497.5" fill="none" data-name="TwoColumnLayout"></path>
-						</g>
-						<g transform="translate(20637.5, 2466.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TwoColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TwoColumnLayout">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="TwoColumnLayout">TwoColumnLayout</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20637.5, 2497.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TwoColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TwoColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultDivider: VerticalDivider</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultContentPadding: EdgeInsets</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+slimContentPadding: EdgeInsets</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TwoColumnLayout">+leftWidget: Widget</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TwoColumnLayout">+rightWidget: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TwoColumnLayout">+dividerWidget: Widget?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TwoColumnLayout">+headerWidget: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TwoColumnLayout">+flexLeft: int?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="TwoColumnLayout">+flexRight: int?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="TwoColumnLayout">+constraintsLeft: BoxConstraints?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="TwoColumnLayout">+constraintsRight: BoxConstraints?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="TwoColumnLayout">+scrollLeft: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="TwoColumnLayout">+scrollRight: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="TwoColumnLayout">+paddingLeft: EdgeInsets?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="TwoColumnLayout">+paddingRight: EdgeInsets?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorLeft: Color?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorRight: Color?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="TwoColumnLayout">+stretchHeight: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VerticalDivider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VerticalDivider">
-							<rect x="20438.5" y="3485.0" height="31.0" width="130.0" data-name="VerticalDivider"></rect>
-						</g>
-						<g transform="translate(20438.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VerticalDivider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VerticalDivider">
-								<text x="57.0" y="13.5" stroke="none" text-anchor="middle" data-name="VerticalDivider">VerticalDivider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppTranslation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppTranslation">
-							<rect x="38170.5" y="105.5" height="62.0" width="194.0" data-name="AppTranslation"></rect>
-							<path d="M38170.5 136.5 L38364.5 136.5" fill="none" data-name="AppTranslation"></path>
-						</g>
-						<g transform="translate(38170.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppTranslation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppTranslation">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppTranslation">AppTranslation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38170.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppTranslation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppTranslation">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppTranslation">&lt;static&gt;+dynamic init()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformLocale">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocale">
-							<rect x="37891.5" y="105.5" height="62.0" width="239.0" data-name="PlatformLocale"></rect>
-							<path d="M37891.5 136.5 L38130.5 136.5" fill="none" data-name="PlatformLocale"></path>
-						</g>
-						<g transform="translate(37891.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocale">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocale">PlatformLocale</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37891.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocale">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocale">+Locale getPlatformLocale()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformLocaleWeb">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleWeb">
-							<rect x="37584.8" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleWeb"></rect>
-							<path d="M37584.8 629.5 L37823.8 629.5" fill="none" data-name="PlatformLocaleWeb"></path>
-						</g>
-						<g transform="translate(37584.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleWeb">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleWeb">PlatformLocaleWeb</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37584.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleWeb">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleWeb">+Locale getPlatformLocale()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformLocaleMobile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleMobile">
-							<rect x="38063.8" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleMobile"></rect>
-							<path d="M38063.8 629.5 L38302.8 629.5" fill="none" data-name="PlatformLocaleMobile"></path>
-						</g>
-						<g transform="translate(38063.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleMobile">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleMobile">PlatformLocaleMobile</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38063.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleMobile">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleMobile">+Locale getPlatformLocale()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LanguagePicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePicker">
-							<rect x="21180.0" y="2579.0" height="92.0" width="366.0" data-name="LanguagePicker"></rect>
-							<path d="M21180.0 2610.0 L21546.0 2610.0" fill="none" data-name="LanguagePicker"></path>
-						</g>
-						<g transform="translate(21180, 2579)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePicker">
-								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePicker">LanguagePicker</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21180, 2610)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePicker">+languagePickerType: LanguagePickerType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePicker">+iconColor: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePicker">+offset: Offset?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LanguagePickerType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePickerType">
-							<rect x="9259.0" y="3447.0" height="107.0" width="366.0" data-name="LanguagePickerType"></rect>
-							<path d="M9259.0 3478.0 L9625.0 3478.0" fill="none" data-name="LanguagePickerType"></path>
-						</g>
-						<g transform="translate(9259, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePickerType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePickerType">
-								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePickerType">LanguagePickerType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9259, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePickerType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePickerType">
-								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePickerType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+values: List&lt;LanguagePickerType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+field: LanguagePickerType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+icon: LanguagePickerType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Offset">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Offset">
-							<rect x="24108.3" y="3485.0" height="31.0" width="63.0" data-name="Offset"></rect>
-						</g>
-						<g transform="translate(24108.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Offset">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Offset">
-								<text x="23.5" y="13.5" stroke="none" text-anchor="middle" data-name="Offset">Offset</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouteParamEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouteParamEnum">
-							<rect x="38756.5" y="98.0" height="77.0" width="202.0" data-name="GoRouteParamEnum"></rect>
-							<path d="M38756.5 129.0 L38958.5 129.0" fill="none" data-name="GoRouteParamEnum"></path>
-						</g>
-						<g transform="translate(38756.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GoRouteParamEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouteParamEnum">
-								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouteParamEnum">GoRouteParamEnum</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38756.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouteParamEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouteParamEnum">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouteParamEnum">+String toRouteParam()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GoRouteParamEnum">+String toShortString()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntents">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntents">
-							<rect x="24765.8" y="1479.0" height="437.0" width="572.0" data-name="RoutingIntents"></rect>
-							<path d="M24765.8 1510.0 L25337.8 1510.0" fill="none" data-name="RoutingIntents"></path>
-						</g>
-						<g transform="translate(24765.75, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntents">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntents">
-								<text x="278.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntents">RoutingIntents</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24765.75, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntents">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntents">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+root: RoutingIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studies: RoutingIntent</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studiesShared: RoutingIntent</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+publicRegistry: RoutingIntent</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+study: RoutingIntent Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEdit: RoutingIntent Function(String)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInfo: RoutingIntent Function(String)</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String)</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInterventions: RoutingIntent Function(String)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String)</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditReports: RoutingIntent Function(String)</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String)</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute})</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyRecruit: RoutingIntent Function(String)</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyMonitor: RoutingIntent Function(String)</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyAnalyze: RoutingIntent Function(String)</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studySettings: RoutingIntent Function(String)</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+accountSettings: RoutingIntent</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyNew: RoutingIntent</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+login: RoutingIntent</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+signup: RoutingIntent</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot: RoutingIntent</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot2: RoutingIntent Function(String)</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordRecovery: RoutingIntent</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+error: RoutingIntent Function(Exception)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String)">
-							<rect x="24191.8" y="2609.5" height="31.0" width="253.0" data-name="RoutingIntent Function(String)"></rect>
-						</g>
-						<g transform="translate(24191.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String)">
-								<text x="118.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String)">RoutingIntent Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(String, String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, String)">
-							<rect x="24880.8" y="2609.5" height="31.0" width="309.0" data-name="RoutingIntent Function(String, String)"></rect>
-						</g>
-						<g transform="translate(24880.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, String)">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, String)">RoutingIntent Function(String, String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(String, {String? appRoute})">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, {String? appRoute})">
-							<rect x="25229.8" y="2609.5" height="31.0" width="413.0" data-name="RoutingIntent Function(String, {String? appRoute})"></rect>
-						</g>
-						<g transform="translate(25229.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, {String? appRoute})">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, {String? appRoute})">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, {String? appRoute})">RoutingIntent Function(String, {String? appRoute})</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(Exception)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(Exception)">
-							<rect x="25682.8" y="2609.5" height="31.0" width="285.0" data-name="RoutingIntent Function(Exception)"></rect>
-						</g>
-						<g transform="translate(25682.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(Exception)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(Exception)">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(Exception)">RoutingIntent Function(Exception)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRoute">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRoute">
-							<rect x="44440.8" y="3485.0" height="31.0" width="86.0" data-name="GoRoute"></rect>
-						</g>
-						<g transform="translate(44440.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRoute">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRoute">
-								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRoute">GoRoute</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntentDispatch">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntentDispatch">
-							<rect x="14171.5" y="3447.0" height="107.0" width="373.0" data-name="RoutingIntentDispatch"></rect>
-							<path d="M14171.5 3478.0 L14544.5 3478.0" fill="none" data-name="RoutingIntentDispatch"></path>
-						</g>
-						<g transform="translate(14171.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntentDispatch">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntentDispatch">
-								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntentDispatch">RoutingIntentDispatch</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14171.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntentDispatch">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntentDispatch">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntentDispatch">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+go: RoutingIntentDispatch</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+push: RoutingIntentDispatch</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RouterKeys">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouterKeys">
-							<rect x="38404.5" y="98.0" height="77.0" width="312.0" data-name="RouterKeys"></rect>
-							<path d="M38404.5 129.0 L38716.5 129.0" fill="none" data-name="RouterKeys"></path>
-						</g>
-						<g transform="translate(38404.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterKeys">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterKeys">
-								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterKeys">RouterKeys</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38404.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterKeys">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterKeys">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+studyKey: ValueKey&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+authKey: ValueKey&lt;String&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ValueKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ValueKey">
-							<rect x="38515.0" y="614.0" height="31.0" width="91.0" data-name="ValueKey"></rect>
-						</g>
-						<g transform="translate(38515, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueKey">
-								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueKey">ValueKey</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RouteParams">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteParams">
-							<rect x="39171.5" y="75.5" height="122.0" width="267.0" data-name="RouteParams"></rect>
-							<path d="M39171.5 106.5 L39438.5 106.5" fill="none" data-name="RouteParams"></path>
-						</g>
-						<g transform="translate(39171.5, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteParams">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteParams">
-								<text x="125.5" y="13.5" stroke="none" text-anchor="middle" data-name="RouteParams">RouteParams</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39171.5, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteParams">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteParams">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studiesFilter: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteParams">&lt;static&gt;+measurementId: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteParams">&lt;static&gt;+interventionId: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RouteParams">&lt;static&gt;+testAppRoute: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RouterConf">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouterConf">
-							<rect x="22033.0" y="2556.0" height="138.0" width="326.0" data-name="RouterConf"></rect>
-							<path d="M22033.0 2587.0 L22359.0 2587.0" fill="none" data-name="RouterConf"></path>
-							<path d="M22033.0 2663.0 L22359.0 2663.0" fill="none" data-name="RouterConf"></path>
-						</g>
-						<g transform="translate(22033, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterConf">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterConf">RouterConf</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22033, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+router: GoRouter</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouterConf">&lt;static&gt;+routes: List&lt;GoRoute&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouterConf">&lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouterConf">&lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22033, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+GoRoute route()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="64028.3" y="3485.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(64028.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="61589.3" y="1666.5" height="62.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
-							<path d="M61589.3 1697.5 L61773.3 1697.5" fill="none" data-name="StudyFormRouteArgs"></path>
-						</g>
-						<g transform="translate(61589.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(61589.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormRouteArgs">+studyId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormRouteArgs">
-							<rect x="59486.5" y="2594.0" height="62.0" width="210.0" data-name="QuestionFormRouteArgs"></rect>
-							<path d="M59486.5 2625.0 L59696.5 2625.0" fill="none" data-name="QuestionFormRouteArgs"></path>
-						</g>
-						<g transform="translate(59486.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormRouteArgs">
-								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormRouteArgs">QuestionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(59486.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormRouteArgs">+questionId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormRouteArgs">
-							<rect x="58207.8" y="3485.0" height="31.0" width="282.0" data-name="ScreenerQuestionFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(58207.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormRouteArgs">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormRouteArgs">ScreenerQuestionFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormRouteArgs">
-							<rect x="60437.3" y="2594.0" height="62.0" width="239.0" data-name="ConsentItemFormRouteArgs"></rect>
-							<path d="M60437.3 2625.0 L60676.3 2625.0" fill="none" data-name="ConsentItemFormRouteArgs"></path>
-						</g>
-						<g transform="translate(60437.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormRouteArgs">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormRouteArgs">ConsentItemFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(60437.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormRouteArgs">+consentId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="45441.0" y="2594.0" height="62.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
-							<path d="M45441.0 2625.0 L45688.0 2625.0" fill="none" data-name="MeasurementFormRouteArgs"></path>
-						</g>
-						<g transform="translate(45441, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45441, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementFormRouteArgs">+measurementId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormRouteArgs">
-							<rect x="50428.5" y="3469.5" height="62.0" width="265.0" data-name="SurveyQuestionFormRouteArgs"></rect>
-							<path d="M50428.5 3500.5 L50693.5 3500.5" fill="none" data-name="SurveyQuestionFormRouteArgs"></path>
-						</g>
-						<g transform="translate(50428.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormRouteArgs">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormRouteArgs">SurveyQuestionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(50428.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormRouteArgs">+questionId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="44746.5" y="2594.0" height="62.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
-							<path d="M44746.5 2625.0 L44979.5 2625.0" fill="none" data-name="InterventionFormRouteArgs"></path>
-						</g>
-						<g transform="translate(44746.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44746.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormRouteArgs">+interventionId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormRouteArgs">
-							<rect x="44727.5" y="3469.5" height="62.0" width="271.0" data-name="InterventionTaskFormRouteArgs"></rect>
-							<path d="M44727.5 3500.5 L44998.5 3500.5" fill="none" data-name="InterventionTaskFormRouteArgs"></path>
-						</g>
-						<g transform="translate(44727.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormRouteArgs">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormRouteArgs">InterventionTaskFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44727.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormRouteArgs">+taskId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormRouteArgs">
-							<rect x="61743.3" y="2594.0" height="62.0" width="226.0" data-name="ReportItemFormRouteArgs"></rect>
-							<path d="M61743.3 2625.0 L61969.3 2625.0" fill="none" data-name="ReportItemFormRouteArgs"></path>
-						</g>
-						<g transform="translate(61743.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormRouteArgs">
-								<text x="105.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormRouteArgs">ReportItemFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(61743.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormRouteArgs">+sectionId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DropdownMenuItemTheme">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DropdownMenuItemTheme">
-							<rect x="38936.0" y="598.5" height="62.0" width="258.0" data-name="DropdownMenuItemTheme"></rect>
-							<path d="M38936.0 629.5 L39194.0 629.5" fill="none" data-name="DropdownMenuItemTheme"></path>
-						</g>
-						<g transform="translate(38936, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DropdownMenuItemTheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DropdownMenuItemTheme">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="DropdownMenuItemTheme">DropdownMenuItemTheme</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38936, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DropdownMenuItemTheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DropdownMenuItemTheme">
-								<text x="0.0" y="13.5" stroke="none" data-name="DropdownMenuItemTheme">+iconTheme: IconThemeData?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconThemeData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconThemeData">
-							<rect x="38994.5" y="1197.0" height="31.0" width="141.0" data-name="IconThemeData"></rect>
-						</g>
-						<g transform="translate(38994.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconThemeData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconThemeData">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconThemeData">IconThemeData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Diagnosticable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Diagnosticable">
-							<rect x="38998.5" y="121.0" height="31.0" width="133.0" data-name="Diagnosticable"></rect>
-						</g>
-						<g transform="translate(38998.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Diagnosticable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Diagnosticable">
-								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="Diagnosticable">Diagnosticable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ThemeConfig">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeConfig">
-							<rect x="39770.8" y="0.0" height="273.0" width="543.0" data-name="ThemeConfig"></rect>
-							<path d="M39770.8 31.0 L40313.8 31.0" fill="none" data-name="ThemeConfig"></path>
-							<path d="M39770.8 107.0 L40313.8 107.0" fill="none" data-name="ThemeConfig"></path>
-						</g>
-						<g transform="translate(39770.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeConfig">
-								<text x="263.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeConfig">ThemeConfig</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39770.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMinContentWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMaxContentWidth: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kHoverFadeFactor: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMuteFadeFactor: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39770.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+dynamic bodyBackgroundColor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color modalBarrierColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color containerColor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color colorPickerInitialColor()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextMuted()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextBackground()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+double iconSplashRadius()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color sidesheetBackgroundColor()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NoAnimationPageTransitionsBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NoAnimationPageTransitionsBuilder">
-							<rect x="39331.3" y="598.5" height="62.0" width="299.0" data-name="NoAnimationPageTransitionsBuilder"></rect>
-							<path d="M39331.3 629.5 L39630.3 629.5" fill="none" data-name="NoAnimationPageTransitionsBuilder"></path>
-						</g>
-						<g transform="translate(39331.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NoAnimationPageTransitionsBuilder">
-								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="NoAnimationPageTransitionsBuilder">NoAnimationPageTransitionsBuilder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39331.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NoAnimationPageTransitionsBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="NoAnimationPageTransitionsBuilder">+Widget buildTransitions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PageTransitionsBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsBuilder">
-							<rect x="39531.8" y="121.0" height="31.0" width="199.0" data-name="PageTransitionsBuilder"></rect>
-						</g>
-						<g transform="translate(39531.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PageTransitionsBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsBuilder">
-								<text x="91.5" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsBuilder">PageTransitionsBuilder</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WebTransitionBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebTransitionBuilder">
-							<rect x="39710.8" y="598.5" height="62.0" width="223.0" data-name="WebTransitionBuilder"></rect>
-							<path d="M39710.8 629.5 L39933.8 629.5" fill="none" data-name="WebTransitionBuilder"></path>
-						</g>
-						<g transform="translate(39710.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebTransitionBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebTransitionBuilder">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebTransitionBuilder">WebTransitionBuilder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39710.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebTransitionBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebTransitionBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebTransitionBuilder">+Widget buildTransitions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ThemeSettingChange">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettingChange">
-							<rect x="39806.8" y="1666.5" height="62.0" width="216.0" data-name="ThemeSettingChange"></rect>
-							<path d="M39806.8 1697.5 L40022.8 1697.5" fill="none" data-name="ThemeSettingChange"></path>
-						</g>
-						<g transform="translate(39806.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettingChange">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettingChange">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettingChange">ThemeSettingChange</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39806.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettingChange">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettingChange">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettingChange">+settings: ThemeSettings</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ThemeSettings">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettings">
-							<rect x="37406.0" y="2586.5" height="77.0" width="227.0" data-name="ThemeSettings"></rect>
-							<path d="M37406.0 2617.5 L37633.0 2617.5" fill="none" data-name="ThemeSettings"></path>
-						</g>
-						<g transform="translate(37406, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettings">
-								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettings">ThemeSettings</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37406, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettings">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettings">+sourceColor: Color</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeSettings">+themeMode: ThemeMode</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Notification">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Notification">
-							<rect x="39862.8" y="1197.0" height="31.0" width="104.0" data-name="Notification"></rect>
-						</g>
-						<g transform="translate(39862.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Notification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notification">
-								<text x="44.0" y="13.5" stroke="none" text-anchor="middle" data-name="Notification">Notification</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ThemeProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeProvider">
-							<rect x="40164.8" y="358.0" height="543.0" width="519.0" data-name="ThemeProvider"></rect>
-							<path d="M40164.8 389.0 L40683.8 389.0" fill="none" data-name="ThemeProvider"></path>
-							<path d="M40164.8 480.0 L40683.8 480.0" fill="none" data-name="ThemeProvider"></path>
-						</g>
-						<g transform="translate(40164.75, 358)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeProvider">
-								<text x="251.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeProvider">ThemeProvider</text>
-								
-							</g>
-						</g>
-						<g transform="translate(40164.75, 389)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+settings: ValueNotifier&lt;ThemeSettings&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+lightDynamic: ColorScheme?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+darkDynamic: ColorScheme?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+pageTransitionsTheme: PageTransitionsTheme</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+shapeMedium: ShapeBorder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(40164.75, 480)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+Color custom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+Color blend()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+Color source()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+ColorScheme colors()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+CardTheme cardTheme()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ThemeProvider">+ListTileThemeData listTileTheme()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ThemeProvider">+AppBarTheme appBarTheme()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ThemeProvider">+SnackBarThemeData snackBarThemeData()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ThemeProvider">+TabBarTheme tabBarTheme()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ThemeProvider">+BottomAppBarTheme bottomAppBarTheme()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ThemeProvider">+BottomNavigationBarThemeData bottomNavigationBarTheme()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ThemeProvider">+SwitchThemeData switchTheme()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ThemeProvider">+InputDecorationTheme inputDecorationTheme()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ThemeProvider">+TextTheme textTheme()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ThemeProvider">+DividerThemeData dividerTheme()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ThemeProvider">+NavigationRailThemeData navigationRailTheme()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ThemeProvider">+DrawerThemeData drawerTheme()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ThemeProvider">+IconThemeData iconTheme()</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ThemeProvider">+CheckboxThemeData checkboxTheme()</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ThemeProvider">+RadioThemeData radioTheme()</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ThemeProvider">+TooltipThemeData tooltipTheme()</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ThemeProvider">+ThemeData light()</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ThemeProvider">+ThemeData dark()</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ThemeProvider">+ThemeMode themeMode()</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ThemeProvider">+ThemeData theme()</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ThemeProvider">&lt;static&gt;+ThemeProvider of()</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ThemeProvider">+bool updateShouldNotify()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ValueNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ValueNotifier">
-							<rect x="40006.8" y="1197.0" height="31.0" width="117.0" data-name="ValueNotifier"></rect>
-						</g>
-						<g transform="translate(40006.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueNotifier">
-								<text x="50.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueNotifier">ValueNotifier</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ColorScheme">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ColorScheme">
-							<rect x="40163.8" y="1197.0" height="31.0" width="122.0" data-name="ColorScheme"></rect>
-						</g>
-						<g transform="translate(40163.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ColorScheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ColorScheme">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="ColorScheme">ColorScheme</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PageTransitionsTheme">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsTheme">
-							<rect x="41059.5" y="1197.0" height="31.0" width="198.0" data-name="PageTransitionsTheme"></rect>
-						</g>
-						<g transform="translate(41059.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PageTransitionsTheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsTheme">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsTheme">PageTransitionsTheme</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ShapeBorder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ShapeBorder">
-							<rect x="41297.5" y="1197.0" height="31.0" width="120.0" data-name="ShapeBorder"></rect>
-						</g>
-						<g transform="translate(41297.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ShapeBorder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ShapeBorder">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="ShapeBorder">ShapeBorder</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InheritedWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InheritedWidget">
-							<rect x="40353.8" y="121.0" height="31.0" width="141.0" data-name="InheritedWidget"></rect>
-						</g>
-						<g transform="translate(40353.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="InheritedWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InheritedWidget">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="InheritedWidget">InheritedWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ThemeMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeMode">
-							<rect x="37746.0" y="3485.0" height="31.0" width="114.0" data-name="ThemeMode"></rect>
-						</g>
-						<g transform="translate(37746, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeMode">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeMode">ThemeMode</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomColor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomColor">
-							<rect x="24484.8" y="2563.5" height="123.0" width="128.0" data-name="CustomColor"></rect>
-							<path d="M24484.8 2594.5 L24612.8 2594.5" fill="none" data-name="CustomColor"></path>
-							<path d="M24484.8 2655.5 L24612.8 2655.5" fill="none" data-name="CustomColor"></path>
-						</g>
-						<g transform="translate(24484.75, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomColor">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomColor">CustomColor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24484.75, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomColor">+color: Color</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomColor">+blend: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24484.75, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+Color value()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SuppressedBehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SuppressedBehaviorSubject">
-							<rect x="16681.0" y="3774.5" height="138.0" width="388.0" data-name="SuppressedBehaviorSubject"></rect>
-							<path d="M16681.0 3805.5 L17069.0 3805.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
-							<path d="M16681.0 3866.5 L17069.0 3866.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
-						</g>
-						<g transform="translate(16681, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SuppressedBehaviorSubject">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="SuppressedBehaviorSubject">SuppressedBehaviorSubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16681, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
-								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">+subject: BehaviorSubject&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+didSuppressInitialEvent: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SuppressedBehaviorSubject">-_controller: StreamController&lt;T&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16681, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
-								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">-StreamController&lt;T&gt; _buildDerivedController()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+dynamic close()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
-							<rect x="14737.5" y="4118.5" height="31.0" width="149.0" data-name="StreamController"></rect>
-						</g>
-						<g transform="translate(14737.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Time">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Time">
-							<rect x="40723.8" y="583.5" height="92.0" width="293.0" data-name="Time"></rect>
-							<path d="M40723.8 614.5 L41016.8 614.5" fill="none" data-name="Time"></path>
-						</g>
-						<g transform="translate(40723.75, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Time">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Time">
-								<text x="138.5" y="13.5" stroke="none" text-anchor="middle" data-name="Time">Time</text>
-								
-							</g>
-						</g>
-						<g transform="translate(40723.75, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Time">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Time">
-								<text x="0.0" y="13.5" stroke="none" data-name="Time">&lt;static&gt;+dynamic fromTimeOfDay()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Time">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Time">&lt;static&gt;+Time fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimeOfDay">
-							<rect x="40818.8" y="121.0" height="31.0" width="103.0" data-name="TimeOfDay"></rect>
-						</g>
-						<g transform="translate(40818.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeOfDay">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeOfDay">TimeOfDay</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TimeValueAccessor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimeValueAccessor">
-							<rect x="41056.8" y="583.5" height="92.0" width="297.0" data-name="TimeValueAccessor"></rect>
-							<path d="M41056.8 614.5 L41353.8 614.5" fill="none" data-name="TimeValueAccessor"></path>
-						</g>
-						<g transform="translate(41056.75, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeValueAccessor">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeValueAccessor">TimeValueAccessor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41056.75, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimeValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimeValueAccessor">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimeValueAccessor">+String modelToViewValue()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TimeValueAccessor">+Time? viewToModelValue()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TimeValueAccessor">-String _addLeadingZeroIfNeeded()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ControlValueAccessor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ControlValueAccessor">
-							<rect x="41109.8" y="121.0" height="31.0" width="191.0" data-name="ControlValueAccessor"></rect>
-						</g>
-						<g transform="translate(41109.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ControlValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ControlValueAccessor">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="ControlValueAccessor">ControlValueAccessor</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelAction">
-							<rect x="24652.8" y="2556.5" height="137.0" width="188.0" data-name="ModelAction"></rect>
-							<path d="M24652.8 2587.5 L24840.8 2587.5" fill="none" data-name="ModelAction"></path>
-						</g>
-						<g transform="translate(24652.75, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelAction">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelAction">ModelAction</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24652.75, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelAction">+type: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelAction">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelAction">+icon: IconData?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelAction">+onExecute: Function</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelAction">+isAvailable: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelAction">+isDestructive: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="83485.3" y="105.5" height="62.0" width="403.0" data-name="IModelActionProvider"></rect>
-							<path d="M83485.3 136.5 L83888.3 136.5" fill="none" data-name="IModelActionProvider"></path>
-						</g>
-						<g transform="translate(83485.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
-								
-							</g>
-						</g>
-						<g transform="translate(83485.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelActionProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelActionProvider">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="83092.5" y="1174.0" height="77.0" width="179.0" data-name="IListActionProvider"></rect>
-							<path d="M83092.5 1205.0 L83271.5 1205.0" fill="none" data-name="IListActionProvider"></path>
-						</g>
-						<g transform="translate(83092.5, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-						<g transform="translate(83092.5, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IListActionProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="IListActionProvider">+void onSelectItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IListActionProvider">+void onNewItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelActionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelActionType">
-							<rect x="516.0" y="3417.0" height="167.0" width="334.0" data-name="ModelActionType"></rect>
-							<path d="M516.0 3448.0 L850.0 3448.0" fill="none" data-name="ModelActionType"></path>
-						</g>
-						<g transform="translate(516, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelActionType">
-								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelActionType">ModelActionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(516, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelActionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelActionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+values: List&lt;ModelActionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+edit: ModelActionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+delete: ModelActionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+remove: ModelActionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+duplicate: ModelActionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+clipboard: ModelActionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+primary: ModelActionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OptimisticUpdate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OptimisticUpdate">
-							<rect x="17318.5" y="3737.0" height="213.0" width="383.0" data-name="OptimisticUpdate"></rect>
-							<path d="M17318.5 3768.0 L17701.5 3768.0" fill="none" data-name="OptimisticUpdate"></path>
-							<path d="M17318.5 3904.0 L17701.5 3904.0" fill="none" data-name="OptimisticUpdate"></path>
-						</g>
-						<g transform="translate(17318.5, 3737)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptimisticUpdate">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptimisticUpdate">OptimisticUpdate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17318.5, 3768)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+applyOptimistic: void Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">+apply: dynamic Function()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="OptimisticUpdate">+rollback: void Function()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="OptimisticUpdate">+onUpdate: void Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="OptimisticUpdate">+onError: void Function(Object, StackTrace?)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="OptimisticUpdate">+rethrowErrors: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="OptimisticUpdate">+runOptimistically: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="OptimisticUpdate">+completeFutureOptimistically: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17318.5, 3904)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+dynamic execute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">-void _runUpdateHandlerIfAny()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()">
-							<rect x="14926.5" y="4118.5" height="31.0" width="134.0" data-name="void Function()"></rect>
-						</g>
-						<g transform="translate(14926.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()">void Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Object, StackTrace?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Object, StackTrace?)?">
-							<rect x="15100.5" y="4118.5" height="31.0" width="304.0" data-name="void Function(Object, StackTrace?)?"></rect>
-						</g>
-						<g transform="translate(15100.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Object, StackTrace?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Object, StackTrace?)?">
-								<text x="144.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Object, StackTrace?)?">void Function(Object, StackTrace?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FileFormatEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FileFormatEncoder">
-							<rect x="41468.8" y="90.5" height="92.0" width="216.0" data-name="FileFormatEncoder"></rect>
-							<path d="M41468.8 121.5 L41684.8 121.5" fill="none" data-name="FileFormatEncoder"></path>
-						</g>
-						<g transform="translate(41468.75, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FileFormatEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FileFormatEncoder">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="FileFormatEncoder">FileFormatEncoder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41468.75, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FileFormatEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FileFormatEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="FileFormatEncoder">+dynamic encodeAsync()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FileFormatEncoder">+String encode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FileFormatEncoder">+dynamic call()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CSVStringEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CSVStringEncoder">
-							<rect x="41393.8" y="598.5" height="62.0" width="162.0" data-name="CSVStringEncoder"></rect>
-							<path d="M41393.8 629.5 L41555.8 629.5" fill="none" data-name="CSVStringEncoder"></path>
-						</g>
-						<g transform="translate(41393.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CSVStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CSVStringEncoder">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="CSVStringEncoder">CSVStringEncoder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41393.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CSVStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CSVStringEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="CSVStringEncoder">+String encode()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="JsonStringEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JsonStringEncoder">
-							<rect x="41595.8" y="598.5" height="62.0" width="166.0" data-name="JsonStringEncoder"></rect>
-							<path d="M41595.8 629.5 L41761.8 629.5" fill="none" data-name="JsonStringEncoder"></path>
-						</g>
-						<g transform="translate(41595.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JsonStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonStringEncoder">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="JsonStringEncoder">JsonStringEncoder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41595.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonStringEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonStringEncoder">+String encode()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ExecutionLimiter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ExecutionLimiter">
-							<rect x="18293.8" y="3789.5" height="108.0" width="197.0" data-name="ExecutionLimiter"></rect>
-							<path d="M18293.8 3820.5 L18490.8 3820.5" fill="none" data-name="ExecutionLimiter"></path>
-							<path d="M18293.8 3866.5 L18490.8 3866.5" fill="none" data-name="ExecutionLimiter"></path>
-						</g>
-						<g transform="translate(18293.75, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ExecutionLimiter">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ExecutionLimiter">ExecutionLimiter</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18293.75, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
-								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+milliseconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ExecutionLimiter">&lt;static&gt;-_timer: Timer?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18293.75, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
-								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Timer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Timer">
-							<rect x="15444.5" y="4118.5" height="31.0" width="60.0" data-name="Timer"></rect>
-						</g>
-						<g transform="translate(15444.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timer">
-								<text x="22.0" y="13.5" stroke="none" text-anchor="middle" data-name="Timer">Timer</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Debouncer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="60210.8" y="4072.5" height="123.0" width="536.0" data-name="Debouncer"></rect>
-							<path d="M60210.8 4103.5 L60746.8 4103.5" fill="none" data-name="Debouncer"></path>
-							<path d="M60210.8 4164.5 L60746.8 4164.5" fill="none" data-name="Debouncer"></path>
-						</g>
-						<g transform="translate(60210.75, 4072.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
-								<text x="260.0" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(60210.75, 4103.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
-								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+leading: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Debouncer">+cancelUncompleted: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Debouncer">-_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(60210.75, 4164.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
-								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+dynamic call()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CancelableOperation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="65854.3" y="4439.0" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
-						</g>
-						<g transform="translate(65854.25, 4439)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Throttler">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Throttler">
-							<rect x="40095.0" y="4103.0" height="62.0" width="136.0" data-name="Throttler"></rect>
-							<path d="M40095.0 4134.0 L40231.0 4134.0" fill="none" data-name="Throttler"></path>
-						</g>
-						<g transform="translate(40095, 4103)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Throttler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Throttler">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="Throttler">Throttler</text>
-								
-							</g>
-						</g>
-						<g transform="translate(40095, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Throttler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Throttler">
-								<text x="0.0" y="13.5" stroke="none" data-name="Throttler">+dynamic call()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SerializableColor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SerializableColor">
-							<rect x="21412.8" y="3805.0" height="77.0" width="312.0" data-name="SerializableColor"></rect>
-							<path d="M21412.8 3836.0 L21724.8 3836.0" fill="none" data-name="SerializableColor"></path>
-						</g>
-						<g transform="translate(21412.75, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SerializableColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SerializableColor">
-								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="SerializableColor">SerializableColor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21412.75, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SerializableColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SerializableColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="SerializableColor">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SerializableColor">&lt;static&gt;+SerializableColor fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="42585.8" y="1181.5" height="62.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-							<path d="M42585.8 1212.5 L42778.8 1212.5" fill="none" data-name="IProviderArgsResolver"></path>
-						</g>
-						<g transform="translate(42585.75, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-						<g transform="translate(42585.75, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IProviderArgsResolver">
-								<text x="0.0" y="13.5" stroke="none" data-name="IProviderArgsResolver">+R provide()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CombinedStreamNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CombinedStreamNotifier">
-							<rect x="41801.8" y="583.0" height="93.0" width="435.0" data-name="CombinedStreamNotifier"></rect>
-							<path d="M41801.8 614.0 L42236.8 614.0" fill="none" data-name="CombinedStreamNotifier"></path>
-							<path d="M41801.8 645.0 L42236.8 645.0" fill="none" data-name="CombinedStreamNotifier"></path>
-						</g>
-						<g transform="translate(41801.75, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CombinedStreamNotifier">
-								<text x="209.5" y="13.5" stroke="none" text-anchor="middle" data-name="CombinedStreamNotifier">CombinedStreamNotifier</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41801.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">-_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41801.75, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChangeNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
-							<rect x="41952.3" y="121.0" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
-						</g>
-						<g transform="translate(41952.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CountWhereValidator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CountWhereValidator">
-							<rect x="42276.8" y="553.0" height="153.0" width="383.0" data-name="CountWhereValidator"></rect>
-							<path d="M42276.8 584.0 L42659.8 584.0" fill="none" data-name="CountWhereValidator"></path>
-							<path d="M42276.8 675.0 L42659.8 675.0" fill="none" data-name="CountWhereValidator"></path>
-						</g>
-						<g transform="translate(42276.75, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CountWhereValidator">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="CountWhereValidator">CountWhereValidator</text>
-								
-							</g>
-						</g>
-						<g transform="translate(42276.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
-								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+predicate: bool Function(T?)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CountWhereValidator">+minCount: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CountWhereValidator">+maxCount: int?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMinCount: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMaxCount: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(42276.75, 675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
-								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+Map&lt;String, dynamic&gt;? validate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="bool Function(T?)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="bool Function(T?)">
-							<rect x="42390.8" y="1197.0" height="31.0" width="155.0" data-name="bool Function(T?)"></rect>
-						</g>
-						<g transform="translate(42390.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="bool Function(T?)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="bool Function(T?)">
-								<text x="69.5" y="13.5" stroke="none" text-anchor="middle" data-name="bool Function(T?)">bool Function(T?)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Validator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Validator">
-							<rect x="42425.3" y="121.0" height="31.0" width="86.0" data-name="Validator"></rect>
-						</g>
-						<g transform="translate(42425.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Validator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Validator">
-								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="Validator">Validator</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Patterns">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Patterns">
-							<rect x="72659.0" y="90.5" height="92.0" width="287.0" data-name="Patterns"></rect>
-							<path d="M72659.0 121.5 L72946.0 121.5" fill="none" data-name="Patterns"></path>
-						</g>
-						<g transform="translate(72659, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Patterns">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Patterns">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="Patterns">Patterns</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72659, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Patterns">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Patterns">
-								<text x="0.0" y="13.5" stroke="none" data-name="Patterns">&lt;static&gt;+timeFormatString: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Patterns">&lt;static&gt;+emailFormatString: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Patterns">&lt;static&gt;+url: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NumericalRangeFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NumericalRangeFormatter">
-							<rect x="43126.0" y="575.5" height="108.0" width="313.0" data-name="NumericalRangeFormatter"></rect>
-							<path d="M43126.0 606.5 L43439.0 606.5" fill="none" data-name="NumericalRangeFormatter"></path>
-							<path d="M43126.0 652.5 L43439.0 652.5" fill="none" data-name="NumericalRangeFormatter"></path>
-						</g>
-						<g transform="translate(43126, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NumericalRangeFormatter">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="NumericalRangeFormatter">NumericalRangeFormatter</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43126, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+min: int?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NumericalRangeFormatter">+max: int?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43126, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+TextEditingValue formatEditUpdate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TextInputFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextInputFormatter">
-							<rect x="43376.0" y="121.0" height="31.0" width="166.0" data-name="TextInputFormatter"></rect>
-						</g>
-						<g transform="translate(43376, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TextInputFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextInputFormatter">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextInputFormatter">TextInputFormatter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySequenceFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySequenceFormatter">
-							<rect x="43479.0" y="598.5" height="62.0" width="313.0" data-name="StudySequenceFormatter"></rect>
-							<path d="M43479.0 629.5 L43792.0 629.5" fill="none" data-name="StudySequenceFormatter"></path>
-						</g>
-						<g transform="translate(43479, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySequenceFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySequenceFormatter">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySequenceFormatter">StudySequenceFormatter</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43479, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySequenceFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySequenceFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySequenceFormatter">+TextEditingValue formatEditUpdate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Tuple">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Tuple">
-							<rect x="22399.0" y="2541.0" height="168.0" width="384.0" data-name="Tuple"></rect>
-							<path d="M22399.0 2572.0 L22783.0 2572.0" fill="none" data-name="Tuple"></path>
-							<path d="M22399.0 2633.0 L22783.0 2633.0" fill="none" data-name="Tuple"></path>
-						</g>
-						<g transform="translate(22399, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Tuple">
-								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="Tuple">Tuple</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22399, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
-								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+first: T1</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">+second: T2</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22399, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
-								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">&lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copy()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copyWith()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="JsonFileLoader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JsonFileLoader">
-							<rect x="77468.5" y="75.0" height="123.0" width="319.0" data-name="JsonFileLoader"></rect>
-							<path d="M77468.5 106.0 L77787.5 106.0" fill="none" data-name="JsonFileLoader"></path>
-							<path d="M77468.5 137.0 L77787.5 137.0" fill="none" data-name="JsonFileLoader"></path>
-						</g>
-						<g transform="translate(77468.5, 75)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonFileLoader">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="JsonFileLoader">JsonFileLoader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(77468.5, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+jsonAssetsPath: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(77468.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+dynamic loadJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonMapFromAssets()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonListFromAssets()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAppDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
-							<rect x="19658.5" y="3812.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
-							<path d="M19658.5 3843.5 L19855.5 3843.5" fill="none" data-name="IAppDelegate"></path>
-						</g>
-						<g transform="translate(19658.5, 3812.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19658.5, 3843.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
-							<rect x="77827.5" y="67.5" height="138.0" width="301.0" data-name="AppController"></rect>
-							<path d="M77827.5 98.5 L78128.5 98.5" fill="none" data-name="AppController"></path>
-							<path d="M77827.5 159.5 L78128.5 159.5" fill="none" data-name="AppController"></path>
-						</g>
-						<g transform="translate(77827.5, 67.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(77827.5, 98.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(77827.5, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyMonitorScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="28875.3" y="2594.0" height="62.0" width="176.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M28875.3 2625.0 L29051.3 2625.0" fill="none" data-name="StudyMonitorScreen"></path>
-						</g>
-						<g transform="translate(28875.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28875.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="33543.0" y="1651.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
-							<path d="M33543.0 1682.0 L33707.0 1682.0" fill="none" data-name="StudyPageWidget"></path>
-							<path d="M33543.0 1713.0 L33707.0 1713.0" fill="none" data-name="StudyPageWidget"></path>
-						</g>
-						<g transform="translate(33543, 1651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33543, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33543, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LoginForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
-							<rect x="11713.0" y="2578.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
-							<path d="M11713.0 2609.5 L11920.0 2609.5" fill="none" data-name="LoginForm"></path>
-							<path d="M11713.0 2640.5 L11920.0 2640.5" fill="none" data-name="LoginForm"></path>
-						</g>
-						<g transform="translate(11713, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11713, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11713, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthFormKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
-							<rect x="14634.5" y="3417.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
-							<path d="M14634.5 3448.0 L14989.5 3448.0" fill="none" data-name="AuthFormKey"></path>
-						</g>
-						<g transform="translate(14634.5, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
-								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14634.5, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordRecoveryForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
-							<rect x="12467.3" y="2578.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
-							<path d="M12467.3 2609.5 L12675.3 2609.5" fill="none" data-name="PasswordRecoveryForm"></path>
-							<path d="M12467.3 2640.5 L12675.3 2640.5" fill="none" data-name="PasswordRecoveryForm"></path>
-						</g>
-						<g transform="translate(12467.25, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12467.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12467.25, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordForgotForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
-							<rect x="13425.0" y="2578.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
-							<path d="M13425.0 2609.5 L13632.0 2609.5" fill="none" data-name="PasswordForgotForm"></path>
-							<path d="M13425.0 2640.5 L13632.0 2640.5" fill="none" data-name="PasswordForgotForm"></path>
-						</g>
-						<g transform="translate(13425, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13425, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13425, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SignupForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
-							<rect x="18358.3" y="2563.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
-							<path d="M18358.3 2594.5 L18636.3 2594.5" fill="none" data-name="SignupForm"></path>
-							<path d="M18358.3 2625.5 L18636.3 2625.5" fill="none" data-name="SignupForm"></path>
-						</g>
-						<g transform="translate(18358.25, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
-								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18358.25, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18358.25, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
-							<rect x="29445.3" y="2564.0" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
-							<path d="M29445.3 2595.0 L29704.3 2595.0" fill="none" data-name="AuthScaffold"></path>
-						</g>
-						<g transform="translate(29445.25, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29445.25, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EmailTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
-							<rect x="29744.3" y="2571.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
-							<path d="M29744.3 2602.5 L30065.3 2602.5" fill="none" data-name="EmailTextField"></path>
-						</g>
-						<g transform="translate(29744.25, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29744.25, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="59258.3" y="3485.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(59258.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
-							<rect x="30105.3" y="2564.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
-							<path d="M30105.3 2595.0 L30584.3 2595.0" fill="none" data-name="PasswordTextField"></path>
-						</g>
-						<g transform="translate(30105.25, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(30105.25, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<rect x="29964.8" y="3485.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(29964.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUJobsToBeDone">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
-							<rect x="78168.5" y="105.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
-							<path d="M78168.5 136.5 L78362.5 136.5" fill="none" data-name="StudyUJobsToBeDone"></path>
-						</g>
-						<g transform="translate(78168.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
-								
-							</g>
-						</g>
-						<g transform="translate(78168.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthFormController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
-							<rect x="43407.0" y="2368.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
-							<path d="M43407.0 2399.5 L44257.0 2399.5" fill="none" data-name="AuthFormController"></path>
-							<path d="M43407.0 2655.5 L44257.0 2655.5" fill="none" data-name="AuthFormController"></path>
-						</g>
-						<g transform="translate(43407, 2368.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
-								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43407, 2399.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43407, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="72971.8" y="4020.0" height="228.0" width="295.0" data-name="IAuthRepository"></rect>
-							<path d="M72971.8 4051.0 L73266.8 4051.0" fill="none" data-name="IAuthRepository"></path>
-							<path d="M72971.8 4142.0 L73266.8 4142.0" fill="none" data-name="IAuthRepository"></path>
-						</g>
-						<g transform="translate(72971.75, 4020)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72971.75, 4051)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+allowPasswordReset: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+currentUser: User?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+isLoggedIn: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+session: Session?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+serializedSession: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72971.75, 4142)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+dynamic signUp()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+dynamic signInWith()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+dynamic signOut()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+dynamic updateUser()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IAuthRepository">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="61341.3" y="3485.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(61341.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormGroupController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="47019.5" y="105.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
-							<path d="M47019.5 136.5 L47206.5 136.5" fill="none" data-name="IFormGroupController"></path>
-						</g>
-						<g transform="translate(47019.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
-								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47019.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
-							<rect x="940.0" y="3447.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
-							<path d="M940.0 3478.0 L1219.0 3478.0" fill="none" data-name="AppStatus"></path>
-						</g>
-						<g transform="translate(940, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
-								
-							</g>
-						</g>
-						<g transform="translate(940, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArrayTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
-							<rect x="31066.5" y="2428.5" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
-							<path d="M31066.5 2459.5 L31556.5 2459.5" fill="none" data-name="FormArrayTable"></path>
-							<path d="M31066.5 2760.5 L31556.5 2760.5" fill="none" data-name="FormArrayTable"></path>
-						</g>
-						<g transform="translate(31066.5, 2428.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
-								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31066.5, 2459.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31066.5, 2760.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<rect x="30425.0" y="3485.0" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
-						</g>
-						<g transform="translate(30425, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="String Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
-							<rect x="30876.0" y="3485.0" height="31.0" width="157.0" data-name="String Function(T)"></rect>
-						</g>
-						<g transform="translate(30876, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
-							<rect x="31526.0" y="3485.0" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
-						</g>
-						<g transform="translate(31526, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
-								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="58975.8" y="1666.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
-							<path d="M58975.8 1697.5 L59371.8 1697.5" fill="none" data-name="ManagedFormViewModel"></path>
-						</g>
-						<g transform="translate(58975.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(58975.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="68299.0" y="313.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
-							<path d="M68299.0 344.0 L69171.0 344.0" fill="none" data-name="FormViewModel"></path>
-							<path d="M68299.0 660.0 L69171.0 660.0" fill="none" data-name="FormViewModel"></path>
-						</g>
-						<g transform="translate(68299, 313)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(68299, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(68299, 660)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
-							<rect x="72520.8" y="614.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
-						</g>
-						<g transform="translate(72520.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Exception">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="75456.5" y="121.0" height="31.0" width="94.0" data-name="Exception"></rect>
-						</g>
-						<g transform="translate(75456.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="65717.8" y="3707.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
-							<path d="M65717.8 3738.0 L65998.8 3738.0" fill="none" data-name="FormViewModelCollection"></path>
-							<path d="M65717.8 3829.0 L65998.8 3829.0" fill="none" data-name="FormViewModelCollection"></path>
-						</g>
-						<g transform="translate(65717.75, 3707)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(65717.75, 3738)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(65717.75, 3829)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="61689.0" y="4118.5" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(61689, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomFormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
-							<rect x="59108.3" y="3759.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
-							<path d="M59108.3 3790.5 L59521.3 3790.5" fill="none" data-name="CustomFormControl"></path>
-							<path d="M59108.3 3896.5 L59521.3 3896.5" fill="none" data-name="CustomFormControl"></path>
-						</g>
-						<g transform="translate(59108.25, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
-								
-							</g>
-						</g>
-						<g transform="translate(59108.25, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(59108.25, 3896.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(T?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
-							<rect x="60887.0" y="4118.5" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
-						</g>
-						<g transform="translate(60887, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(ControlStatus)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
-							<rect x="61384.3" y="4118.5" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
-						</g>
-						<g transform="translate(61384.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="UnsavedChangesDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
-							<rect x="79433.8" y="105.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
-							<path d="M79433.8 136.5 L79640.8 136.5" fill="none" data-name="UnsavedChangesDialog"></path>
-						</g>
-						<g transform="translate(79433.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(79433.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormValidationSetEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
-							<rect x="60170.8" y="1197.0" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
-						</g>
-						<g transform="translate(60170.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
-								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControlValidation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
-							<rect x="32866.0" y="2556.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
-							<path d="M32866.0 2587.0 L33351.0 2587.0" fill="none" data-name="FormControlValidation"></path>
-							<path d="M32866.0 2663.0 L33351.0 2663.0" fill="none" data-name="FormControlValidation"></path>
-						</g>
-						<g transform="translate(32866, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
-								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32866, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32866, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="50917.0" y="1166.0" height="93.0" width="163.0" data-name="IFormData"></rect>
-							<path d="M50917.0 1197.0 L51080.0 1197.0" fill="none" data-name="IFormData"></path>
-							<path d="M50917.0 1228.0 L51080.0 1228.0" fill="none" data-name="IFormData"></path>
-						</g>
-						<g transform="translate(50917, 1166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(50917, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(50917, 1228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormInvalidException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
-							<rect x="74359.3" y="614.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
-						</g>
-						<g transform="translate(74359.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConfigException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
-							<rect x="74585.3" y="598.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
-							<path d="M74585.3 629.5 L74770.3 629.5" fill="none" data-name="FormConfigException"></path>
-						</g>
-						<g transform="translate(74585.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
-								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
-								
-							</g>
-						</g>
-						<g transform="translate(74585.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="67477.5" y="1174.0" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-							<path d="M67477.5 1205.0 L67694.5 1205.0" fill="none" data-name="IFormViewModelDelegate"></path>
-						</g>
-						<g transform="translate(67477.5, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(67477.5, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControlOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
-							<rect x="22823.0" y="2571.5" height="107.0" width="190.0" data-name="FormControlOption"></rect>
-							<path d="M22823.0 2602.5 L23013.0 2602.5" fill="none" data-name="FormControlOption"></path>
-						</g>
-						<g transform="translate(22823, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22823, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
-							<rect x="25140.0" y="3439.5" height="122.0" width="282.0" data-name="FormMode"></rect>
-							<path d="M25140.0 3470.5 L25422.0 3470.5" fill="none" data-name="FormMode"></path>
-						</g>
-						<g transform="translate(25140, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25140, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrolledBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="79680.8" y="90.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M79680.8 121.0 L79846.8 121.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M79680.8 152.0 L79846.8 152.0" fill="none" data-name="EnrolledBadge"></path>
-						</g>
-						<g transform="translate(79680.75, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(79680.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(79680.75, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRecruitController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="75351.5" y="1121.0" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M75351.5 1152.0 L76002.5 1152.0" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M75351.5 1198.0 L76002.5 1198.0" fill="none" data-name="StudyRecruitController"></path>
-						</g>
-						<g transform="translate(75351.5, 1121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
-								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(75351.5, 1152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(75351.5, 1198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IInviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="81834.0" y="1666.5" height="62.0" width="265.0" data-name="IInviteCodeRepository"></rect>
-							<path d="M81834.0 1697.5 L82099.0 1697.5" fill="none" data-name="IInviteCodeRepository"></path>
-						</g>
-						<g transform="translate(81834, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(81834, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IInviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IInviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="71898.3" y="3485.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
-						</g>
-						<g transform="translate(71898.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyBaseController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="73001.3" y="538.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
-							<path d="M73001.3 569.0 L73547.3 569.0" fill="none" data-name="StudyBaseController"></path>
-							<path d="M73001.3 645.0 L73547.3 645.0" fill="none" data-name="StudyBaseController"></path>
-						</g>
-						<g transform="translate(73001.25, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
-								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(73001.25, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(73001.25, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRecruitScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="29091.3" y="2571.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M29091.3 2602.5 L29405.3 2602.5" fill="none" data-name="StudyRecruitScreen"></path>
-						</g>
-						<g transform="translate(29091.25, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29091.25, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
-							<rect x="80897.0" y="575.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
-							<path d="M80897.0 606.5 L81335.0 606.5" fill="none" data-name="InviteCodeFormView"></path>
-							<path d="M80897.0 637.5 L81335.0 637.5" fill="none" data-name="InviteCodeFormView"></path>
-						</g>
-						<g transform="translate(80897, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
-								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(80897, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(80897, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="72890.5" y="1023.5" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M72890.5 1054.5 L73557.5 1054.5" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M72890.5 1280.5 L73557.5 1280.5" fill="none" data-name="InviteCodeFormViewModel"></path>
-						</g>
-						<g transform="translate(72890.5, 1023.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
-								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72890.5, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72890.5, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInvitesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="78402.5" y="45.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M78402.5 76.0 L78968.5 76.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M78402.5 182.0 L78968.5 182.0" fill="none" data-name="StudyInvitesTable"></path>
-						</g>
-						<g transform="translate(78402.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
-								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(78402.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(78402.5, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="77874.3" y="614.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(77874.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="78136.3" y="614.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(78136.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention? Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="78596.3" y="614.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
-						</g>
-						<g transform="translate(78596.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="int Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="78904.0" y="614.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(78904, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PublishSuccessDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
-							<rect x="30624.3" y="2594.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
-							<path d="M30624.3 2625.0 L30815.3 2625.0" fill="none" data-name="PublishSuccessDialog"></path>
-						</g>
-						<g transform="translate(30624.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(30624.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PublishDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
-							<rect x="33391.0" y="2594.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
-							<path d="M33391.0 2625.0 L33527.0 2625.0" fill="none" data-name="PublishDialog"></path>
-						</g>
-						<g transform="translate(33391, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33391, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PublishConfirmationDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
-							<rect x="33567.0" y="2594.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
-							<path d="M33567.0 2625.0 L33791.0 2625.0" fill="none" data-name="PublishConfirmationDialog"></path>
-						</g>
-						<g transform="translate(33567, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33567, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FrameControlsWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
-							<rect x="18530.8" y="3782.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
-							<path d="M18530.8 3813.0 L18821.8 3813.0" fill="none" data-name="FrameControlsWidget"></path>
-							<path d="M18530.8 3874.0 L18821.8 3874.0" fill="none" data-name="FrameControlsWidget"></path>
-						</g>
-						<g transform="translate(18530.75, 3782)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18530.75, 3813)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18530.75, 3874)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyStatusBadgeViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
-							<rect x="34506.0" y="2586.5" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
-							<path d="M34506.0 2617.5 L34791.0 2617.5" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
-						</g>
-						<g transform="translate(34506, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34506, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="36368.5" y="3485.0" height="31.0" width="114.0" data-name="Participation"></rect>
-						</g>
-						<g transform="translate(36368.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
-							<rect x="32274.5" y="3485.0" height="31.0" width="111.0" data-name="StudyStatus"></rect>
-						</g>
-						<g transform="translate(32274.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
-								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyStatusBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
-							<rect x="34831.0" y="2548.5" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
-							<path d="M34831.0 2579.5 L35072.0 2579.5" fill="none" data-name="StudyStatusBadge"></path>
-							<path d="M34831.0 2670.5 L35072.0 2670.5" fill="none" data-name="StudyStatusBadge"></path>
-						</g>
-						<g transform="translate(34831, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34831, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34831, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RouteInformation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
-							<rect x="32425.5" y="3431.5" height="138.0" width="152.0" data-name="RouteInformation"></rect>
-							<path d="M32425.5 3462.5 L32577.5 3462.5" fill="none" data-name="RouteInformation"></path>
-							<path d="M32425.5 3538.5 L32577.5 3538.5" fill="none" data-name="RouteInformation"></path>
-						</g>
-						<g transform="translate(32425.5, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32425.5, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32425.5, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
-							<rect x="35112.0" y="2496.0" height="258.0" width="302.0" data-name="PlatformController"></rect>
-							<path d="M35112.0 2527.0 L35414.0 2527.0" fill="none" data-name="PlatformController"></path>
-							<path d="M35112.0 2618.0 L35414.0 2618.0" fill="none" data-name="PlatformController"></path>
-						</g>
-						<g transform="translate(35112, 2496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
-								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35112, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35112, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WebController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
-							<rect x="32766.5" y="3401.5" height="198.0" width="273.0" data-name="WebController"></rect>
-							<path d="M32766.5 3432.5 L33039.5 3432.5" fill="none" data-name="WebController"></path>
-							<path d="M32766.5 3463.5 L33039.5 3463.5" fill="none" data-name="WebController"></path>
-						</g>
-						<g transform="translate(32766.5, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
-								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32766.5, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32766.5, 3463.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFrameElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
-							<rect x="32835.5" y="3828.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
-						</g>
-						<g transform="translate(32835.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MobileController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
-							<rect x="33968.5" y="3417.0" height="167.0" width="191.0" data-name="MobileController"></rect>
-							<path d="M33968.5 3448.0 L34159.5 3448.0" fill="none" data-name="MobileController"></path>
-						</g>
-						<g transform="translate(33968.5, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33968.5, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
-							<rect x="72157.5" y="2511.0" height="228.0" width="573.0" data-name="StudyController"></rect>
-							<path d="M72157.5 2542.0 L72730.5 2542.0" fill="none" data-name="StudyController"></path>
-							<path d="M72157.5 2603.0 L72730.5 2603.0" fill="none" data-name="StudyController"></path>
-						</g>
-						<g transform="translate(72157.5, 2511)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
-								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72157.5, 2542)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72157.5, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyNavViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
-							<rect x="36428.5" y="2556.5" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
-							<path d="M36428.5 2587.5 L36669.5 2587.5" fill="none" data-name="IStudyNavViewModel"></path>
-						</g>
-						<g transform="translate(36428.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36428.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
-							<rect x="80128.0" y="68.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
-							<path d="M80128.0 99.0 L80361.0 99.0" fill="none" data-name="StudyNav"></path>
-						</g>
-						<g transform="translate(80128, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
-								
-							</g>
-						</g>
-						<g transform="translate(80128, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
-							<rect x="80401.0" y="68.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
-							<path d="M80401.0 99.0 L80689.0 99.0" fill="none" data-name="StudyDesignNav"></path>
-						</g>
-						<g transform="translate(80401, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
-								
-							</g>
-						</g>
-						<g transform="translate(80401, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyParticipationBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
-							<rect x="36768.0" y="2556.0" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
-							<path d="M36768.0 2587.0 L36999.0 2587.0" fill="none" data-name="StudyParticipationBadge"></path>
-							<path d="M36768.0 2663.0 L36999.0 2663.0" fill="none" data-name="StudyParticipationBadge"></path>
-						</g>
-						<g transform="translate(36768, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36768, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36768, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="72645.0" y="3462.0" height="77.0" width="251.0" data-name="IStudyRepository"></rect>
-							<path d="M72645.0 3493.0 L72896.0 3493.0" fill="none" data-name="IStudyRepository"></path>
-						</g>
-						<g transform="translate(72645, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72645, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyRepository">+dynamic launch()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyRepository">+dynamic deleteParticipants()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PreviewFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
-							<rect x="61535.8" y="1166.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
-							<path d="M61535.8 1197.5 L61826.8 1197.5" fill="none" data-name="PreviewFrame"></path>
-						</g>
-						<g transform="translate(61535.75, 1166.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(61535.75, 1197.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyAppBarViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
-							<rect x="33506.8" y="3454.5" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
-							<path d="M33506.8 3485.5 L33749.8 3485.5" fill="none" data-name="IStudyAppBarViewModel"></path>
-						</g>
-						<g transform="translate(33506.75, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33506.75, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
-							<rect x="63130.8" y="1091.5" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
-							<path d="M63130.8 1122.5 L63465.8 1122.5" fill="none" data-name="StudyScaffold"></path>
-						</g>
-						<g transform="translate(63130.75, 1091.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
-								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(63130.75, 1122.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WebFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
-							<rect x="80729.0" y="82.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
-							<path d="M80729.0 113.5 L80898.0 113.5" fill="none" data-name="WebFrame"></path>
-							<path d="M80729.0 159.5 L80898.0 159.5" fill="none" data-name="WebFrame"></path>
-						</g>
-						<g transform="translate(80729, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(80729, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(80729, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DisabledFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
-							<rect x="80938.0" y="105.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
-							<path d="M80938.0 136.5 L81074.0 136.5" fill="none" data-name="DisabledFrame"></path>
-						</g>
-						<g transform="translate(80938, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(80938, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PhoneContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
-							<rect x="37039.0" y="2518.5" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
-							<path d="M37039.0 2549.5 L37366.0 2549.5" fill="none" data-name="PhoneContainer"></path>
-							<path d="M37039.0 2700.5 L37366.0 2700.5" fill="none" data-name="PhoneContainer"></path>
-						</g>
-						<g transform="translate(37039, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
-								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37039, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37039, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MobileFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
-							<rect x="81114.0" y="105.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
-							<path d="M81114.0 136.5 L81250.0 136.5" fill="none" data-name="MobileFrame"></path>
-						</g>
-						<g transform="translate(81114, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(81114, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DesktopFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
-							<rect x="81290.0" y="105.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
-							<path d="M81290.0 136.5 L81426.0 136.5" fill="none" data-name="DesktopFrame"></path>
-						</g>
-						<g transform="translate(81290, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(81290, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTestScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
-							<rect x="33831.0" y="2548.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
-							<path d="M33831.0 2579.5 L34031.0 2579.5" fill="none" data-name="StudyTestScreen"></path>
-							<path d="M33831.0 2610.5 L34031.0 2610.5" fill="none" data-name="StudyTestScreen"></path>
-						</g>
-						<g transform="translate(33831, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
-								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33831, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33831, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySettingsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="69180.0" y="2496.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M69180.0 2527.0 L69659.0 2527.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M69180.0 2663.0 L69659.0 2663.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-						</g>
-						<g transform="translate(69180, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(69180, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(69180, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="34071.0" y="2594.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M34071.0 2625.0 L34246.0 2625.0" fill="none" data-name="StudySettingsDialog"></path>
-						</g>
-						<g transform="translate(34071, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
-								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34071, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTestController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
-							<rect x="72149.8" y="3805.0" height="77.0" width="282.0" data-name="StudyTestController"></rect>
-							<path d="M72149.8 3836.0 L72431.8 3836.0" fill="none" data-name="StudyTestController"></path>
-						</g>
-						<g transform="translate(72149.75, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72149.75, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TestAppRoutes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
-							<rect x="81466.0" y="68.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
-							<path d="M81466.0 99.0 L81726.0 99.0" fill="none" data-name="TestAppRoutes"></path>
-						</g>
-						<g transform="translate(81466, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
-								
-							</g>
-						</g>
-						<g transform="translate(81466, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
-								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
-							<rect x="64182.5" y="1113.5" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
-							<path d="M64182.5 1144.5 L64627.5 1144.5" fill="none" data-name="DrawerEntry"></path>
-							<path d="M64182.5 1280.5 L64627.5 1280.5" fill="none" data-name="DrawerEntry"></path>
-						</g>
-						<g transform="translate(64182.5, 1113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
-								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(64182.5, 1144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DrawerEntry">+localizedHelpText: String Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DrawerEntry">+enabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DrawerEntry">+onSelected: void Function(BuildContext, WidgetRef)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DrawerEntry">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DrawerEntry">+title: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DrawerEntry">+helpText: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(64182.5, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="String Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
-							<rect x="63786.3" y="1682.0" height="31.0" width="147.0" data-name="String Function()"></rect>
-						</g>
-						<g transform="translate(63786.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
-								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="String Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
-							<rect x="64013.3" y="1682.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
-						</g>
-						<g transform="translate(64013.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(BuildContext, WidgetRef)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
-							<rect x="64210.3" y="1682.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
-						</g>
-						<g transform="translate(64210.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
-								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouterDrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
-							<rect x="64586.3" y="1643.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
-							<path d="M64586.3 1674.5 L64850.3 1674.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-							<path d="M64586.3 1720.5 L64850.3 1720.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-						</g>
-						<g transform="translate(64586.25, 1643.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(64586.25, 1674.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(64586.25, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppDrawer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
-							<rect x="81766.0" y="53.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
-							<path d="M81766.0 84.0 L82035.0 84.0" fill="none" data-name="AppDrawer"></path>
-						</g>
-						<g transform="translate(81766, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
-								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(81766, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppDrawer">+leftPaddingEntries: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppDrawer">+logoPaddingVertical: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppDrawer">+logoPaddingHorizontal: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AppDrawer">+logoMaxHeight: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AppDrawer">+logoSectionMinHeight: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AppDrawer">+logoSectionMaxHeight: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyAnalyzeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
-							<rect x="34286.0" y="2586.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
-							<path d="M34286.0 2617.5 L34466.0 2617.5" fill="none" data-name="StudyAnalyzeScreen"></path>
-						</g>
-						<g transform="translate(34286, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34286, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyAnalyzeController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
-							<rect x="73637.5" y="1181.5" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
-							<path d="M73637.5 1212.5 L73838.5 1212.5" fill="none" data-name="StudyAnalyzeController"></path>
-						</g>
-						<g transform="translate(73637.5, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
-								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(73637.5, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignInterventionsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="34199.5" y="3469.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M34199.5 3500.5 L34495.5 3500.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
-						</g>
-						<g transform="translate(34199.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34199.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="36176.5" y="2594.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M36176.5 2625.0 L36388.5 2625.0" fill="none" data-name="StudyDesignPageWidget"></path>
-						</g>
-						<g transform="translate(36176.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36176.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="29325.8" y="1666.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M29325.8 1697.5 L29700.8 1697.5" fill="none" data-name="InterventionFormView"></path>
-						</g>
-						<g transform="translate(29325.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
-								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29325.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="57557.0" y="2391.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M57557.0 2422.0 L58412.0 2422.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M57557.0 2648.0 L58412.0 2648.0" fill="none" data-name="InterventionFormViewModel"></path>
-						</g>
-						<g transform="translate(57557, 2391)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
-								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(57557, 2422)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(57557, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="25925.8" y="1651.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M25925.8 1682.0 L26255.8 1682.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M25925.8 1713.0 L26255.8 1713.0" fill="none" data-name="InterventionPreview"></path>
-						</g>
-						<g transform="translate(25925.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25925.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25925.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="81195.5" y="1158.5" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M81195.5 1189.5 L81554.5 1189.5" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M81195.5 1220.5 L81554.5 1220.5" fill="none" data-name="StudyScheduleFormView"></path>
-						</g>
-						<g transform="translate(81195.5, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(81195.5, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(81195.5, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="80996.0" y="1501.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M80996.0 1532.0 L81754.0 1532.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M80996.0 1833.0 L81754.0 1833.0" fill="none" data-name="StudyScheduleControls"></path>
-						</g>
-						<g transform="translate(80996, 1501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
-								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(80996, 1532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(80996, 1833)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="55203.3" y="2541.0" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M55203.3 2572.0 L55493.3 2572.0" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M55203.3 2663.0 L55493.3 2663.0" fill="none" data-name="InterventionTaskFormData"></path>
-						</g>
-						<g transform="translate(55203.25, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(55203.25, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(55203.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="55751.0" y="1613.5" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M55751.0 1644.5 L56049.0 1644.5" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M55751.0 1750.5 L56049.0 1750.5" fill="none" data-name="IFormDataWithSchedule"></path>
-						</g>
-						<g transform="translate(55751, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
-								
-							</g>
-						</g>
-						<g transform="translate(55751, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(55751, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="68261.0" y="2436.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M68261.0 2467.0 L69100.0 2467.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M68261.0 2618.0 L69100.0 2618.0" fill="none" data-name="InterventionsFormViewModel"></path>
-						</g>
-						<g transform="translate(68261, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
-								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(68261, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(68261, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="60716.3" y="2488.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M60716.3 2519.5 L61412.3 2519.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M60716.3 2700.5 L61412.3 2700.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-						</g>
-						<g transform="translate(60716.25, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(60716.25, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(60716.25, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="82429.3" y="1546.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M82429.3 1577.0 L82924.3 1577.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M82429.3 1803.0 L82924.3 1803.0" fill="none" data-name="WithScheduleControls"></path>
-						</g>
-						<g transform="translate(82429.25, 1546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82429.25, 1577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82429.25, 1803)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PhaseSequence">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="66539.5" y="3828.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
-						</g>
-						<g transform="translate(66539.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
-								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="44758.0" y="1598.5" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M44758.0 1629.5 L45140.0 1629.5" fill="none" data-name="InterventionFormData"></path>
-							<path d="M44758.0 1750.5 L45140.0 1750.5" fill="none" data-name="InterventionFormData"></path>
-						</g>
-						<g transform="translate(44758, 1598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44758, 1629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44758, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="45892.3" y="3401.5" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M45892.3 3432.5 L46188.3 3432.5" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M45892.3 3538.5 L46188.3 3538.5" fill="none" data-name="StudyScheduleFormData"></path>
-						</g>
-						<g transform="translate(45892.25, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45892.25, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45892.25, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="49374.5" y="1666.5" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M49374.5 1697.5 L49517.5 1697.5" fill="none" data-name="IStudyFormData"></path>
-						</g>
-						<g transform="translate(49374.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(49374.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="41046.3" y="1666.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M41046.3 1697.5 L41459.3 1697.5" fill="none" data-name="InterventionTaskFormView"></path>
-						</g>
-						<g transform="translate(41046.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41046.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="47496.0" y="2556.0" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M47496.0 2587.0 L47890.0 2587.0" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M47496.0 2648.0 L47890.0 2648.0" fill="none" data-name="InterventionsFormData"></path>
-						</g>
-						<g transform="translate(47496, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47496, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47496, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignReportsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="34535.5" y="3462.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M34535.5 3493.0 L34928.5 3493.0" fill="none" data-name="StudyDesignReportsFormView"></path>
-						</g>
-						<g transform="translate(34535.5, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34535.5, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="45180.0" y="1628.5" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M45180.0 1659.5 L45494.0 1659.5" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M45180.0 1720.5 L45494.0 1720.5" fill="none" data-name="ReportItemFormData"></path>
-						</g>
-						<g transform="translate(45180, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45180, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45180, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="45273.0" y="2609.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(45273, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="45768.0" y="2556.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M45768.0 2587.0 L46477.0 2587.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M45768.0 2648.0 L46477.0 2648.0" fill="none" data-name="DataReferenceEditor"></path>
-						</g>
-						<g transform="translate(45768, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45768, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45768, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="45038.5" y="3485.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
-						</g>
-						<g transform="translate(45038.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="46517.0" y="2518.5" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M46517.0 2549.5 L46965.0 2549.5" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M46517.0 2655.5 L46965.0 2655.5" fill="none" data-name="TemporalAggregationFormatted"></path>
-						</g>
-						<g transform="translate(46517, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(46517, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(46517, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="45281.5" y="3485.0" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
-						</g>
-						<g transform="translate(45281.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="47005.0" y="2518.5" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M47005.0 2549.5 L47456.0 2549.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M47005.0 2655.5 L47456.0 2655.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
-						</g>
-						<g transform="translate(47005, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47005, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47005, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="46911.3" y="3485.0" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
-						</g>
-						<g transform="translate(46911.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="13698.5" y="3447.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M13698.5 3478.0 L14081.5 3478.0" fill="none" data-name="ReportSectionType"></path>
-						</g>
-						<g transform="translate(13698.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13698.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="26295.8" y="1636.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M26295.8 1667.0 L26774.8 1667.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M26295.8 1728.0 L26774.8 1728.0" fill="none" data-name="AverageSectionFormView"></path>
-						</g>
-						<g transform="translate(26295.75, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26295.75, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26295.75, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="38452.5" y="2338.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M38452.5 2369.5 L39439.5 2369.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M38452.5 2805.5 L39439.5 2805.5" fill="none" data-name="ReportItemFormViewModel"></path>
-						</g>
-						<g transform="translate(38452.5, 2338.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
-								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38452.5, 2369.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38452.5, 2805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="79224.3" y="583.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M79224.3 614.0 L79428.3 614.0" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M79224.3 645.0 L79428.3 645.0" fill="none" data-name="DataReferenceIdentifier"></path>
-						</g>
-						<g transform="translate(79224.25, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
-								
-							</g>
-						</g>
-						<g transform="translate(79224.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(79224.25, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="79258.8" y="121.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(79258.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="26814.8" y="1636.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M26814.8 1667.0 L27293.8 1667.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M26814.8 1728.0 L27293.8 1728.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-						</g>
-						<g transform="translate(26814.75, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26814.75, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26814.75, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="41809.3" y="1613.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M41809.3 1644.5 L42276.3 1644.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M41809.3 1720.5 L42276.3 1720.5" fill="none" data-name="ReportItemFormView"></path>
-						</g>
-						<g transform="translate(41809.25, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
-								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41809.25, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41809.25, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="64778.3" y="2451.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M64778.3 2482.0 L65638.3 2482.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M64778.3 2648.0 L65638.3 2648.0" fill="none" data-name="ReportsFormViewModel"></path>
-						</g>
-						<g transform="translate(64778.25, 2451)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
-								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(64778.25, 2482)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(64778.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportFormItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="65810.0" y="1591.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M65810.0 1622.0 L66653.0 1622.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M65810.0 1698.0 L66653.0 1698.0" fill="none" data-name="ReportFormItemDelegate"></path>
-						</g>
-						<g transform="translate(65810, 1591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
-								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(65810, 1622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(65810, 1698)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="48983.0" y="2556.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M48983.0 2587.0 L49180.0 2587.0" fill="none" data-name="ReportBadge"></path>
-							<path d="M48983.0 2663.0 L49180.0 2663.0" fill="none" data-name="ReportBadge"></path>
-						</g>
-						<g transform="translate(48983, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(48983, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(48983, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="20608.5" y="3447.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M20608.5 3478.0 L20909.5 3478.0" fill="none" data-name="ReportStatus"></path>
-						</g>
-						<g transform="translate(20608.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20608.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="49220.0" y="2563.5" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M49220.0 2594.5 L49558.0 2594.5" fill="none" data-name="ReportsFormData"></path>
-							<path d="M49220.0 2640.5 L49558.0 2640.5" fill="none" data-name="ReportsFormData"></path>
-						</g>
-						<g transform="translate(49220, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(49220, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(49220, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="71210.8" y="2383.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M71210.8 2414.5 L71906.8 2414.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M71210.8 2820.5 L71906.8 2820.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-						</g>
-						<g transform="translate(71210.75, 2383.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(71210.75, 2414.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(71210.75, 2820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignInfoFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="34968.5" y="3469.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M34968.5 3500.5 L35191.5 3500.5" fill="none" data-name="StudyDesignInfoFormView"></path>
-						</g>
-						<g transform="translate(34968.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34968.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="49598.0" y="2541.0" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M49598.0 2572.0 L50012.0 2572.0" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M49598.0 2663.0 L50012.0 2663.0" fill="none" data-name="StudyInfoFormData"></path>
-						</g>
-						<g transform="translate(49598, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(49598, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(49598, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyContactInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="49754.5" y="3386.5" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M49754.5 3417.5 L50102.5 3417.5" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M49754.5 3568.5 L50102.5 3568.5" fill="none" data-name="StudyContactInfoFormData"></path>
-						</g>
-						<g transform="translate(49754.5, 3386.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
-								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(49754.5, 3417.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(49754.5, 3568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormValidationSet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="2051.0" y="3462.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M2051.0 3493.0 L2438.0 3493.0" fill="none" data-name="StudyFormValidationSet"></path>
-						</g>
-						<g transform="translate(2051, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
-								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2051, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="50092.0" y="2563.5" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M50092.0 2594.5 L50586.0 2594.5" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M50092.0 2640.5 L50586.0 2640.5" fill="none" data-name="MeasurementsFormData"></path>
-						</g>
-						<g transform="translate(50092, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
-								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(50092, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(50092, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="42356.3" y="1666.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M42356.3 1697.5 L42800.3 1697.5" fill="none" data-name="MeasurementSurveyFormView"></path>
-						</g>
-						<g transform="translate(42356.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(42356.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="62772.3" y="2413.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M62772.3 2444.5 L63468.3 2444.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M62772.3 2670.5 L63468.3 2670.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-						</g>
-						<g transform="translate(62772.25, 2413.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(62772.25, 2444.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(62772.25, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="27333.8" y="1651.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M27333.8 1682.0 L27677.8 1682.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M27333.8 1713.0 L27677.8 1713.0" fill="none" data-name="SurveyPreview"></path>
-						</g>
-						<g transform="translate(27333.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27333.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27333.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="55533.3" y="2526.0" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M55533.3 2557.0 L55942.3 2557.0" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M55533.3 2678.0 L55942.3 2678.0" fill="none" data-name="MeasurementSurveyFormData"></path>
-						</g>
-						<g transform="translate(55533.25, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(55533.25, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(55533.25, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="52519.0" y="3431.5" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M52519.0 3462.5 L52887.0 3462.5" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M52519.0 3508.5 L52887.0 3508.5" fill="none" data-name="QuestionnaireFormData"></path>
-						</g>
-						<g transform="translate(52519, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(52519, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(52519, 3508.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="63074.3" y="1568.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M63074.3 1599.5 L63706.3 1599.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M63074.3 1705.5 L63706.3 1705.5" fill="none" data-name="WithQuestionnaireControls"></path>
-						</g>
-						<g transform="translate(63074.25, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(63074.25, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(63074.25, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignMeasurementsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="35231.5" y="3469.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M35231.5 3500.5 L35541.5 3500.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
-						</g>
-						<g transform="translate(35231.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35231.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="66914.8" y="2443.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M66914.8 2474.5 L68006.8 2474.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M66914.8 2625.5 L68006.8 2625.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-						</g>
-						<g transform="translate(66914.75, 2443.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
-								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(66914.75, 2474.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(66914.75, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="27488.8" y="2563.5" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M27488.8 2594.5 L27876.8 2594.5" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M27488.8 2655.5 L27876.8 2655.5" fill="none" data-name="StudyFormScaffold"></path>
-						</g>
-						<g transform="translate(27488.75, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27488.75, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27488.75, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="T Function(WidgetRef)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="27548.3" y="3485.0" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
-						</g>
-						<g transform="translate(27548.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="53187.3" y="2496.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M53187.3 2527.0 L53883.3 2527.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M53187.3 2693.0 L53883.3 2693.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-						</g>
-						<g transform="translate(53187.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(53187.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(53187.25, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignEnrollmentFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="35581.5" y="3454.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M35581.5 3485.5 L36030.5 3485.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
-						</g>
-						<g transform="translate(35581.5, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35581.5, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScreenerQuestionLogicFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="52303.3" y="2594.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M52303.3 2625.0 L52635.3 2625.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
-						</g>
-						<g transform="translate(52303.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(52303.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionLogicFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="81582.0" y="2556.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M81582.0 2587.0 L82006.0 2587.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M81582.0 2618.0 L82006.0 2618.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-						</g>
-						<g transform="translate(81582, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
-								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(81582, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(81582, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="60618.3" y="3334.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M60618.3 3365.0 L61180.3 3365.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M60618.3 3546.0 L61180.3 3546.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(60618.25, 3334)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
-								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(60618.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(60618.25, 3546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="50893.3" y="1613.5" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M50893.3 1644.5 L51151.3 1644.5" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M50893.3 1735.5 L51151.3 1735.5" fill="none" data-name="ConsentItemFormData"></path>
-						</g>
-						<g transform="translate(50893.25, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(50893.25, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(50893.25, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="44337.0" y="1666.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M44337.0 1697.5 L44718.0 1697.5" fill="none" data-name="ConsentItemFormView"></path>
-						</g>
-						<g transform="translate(44337, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44337, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="50626.0" y="2541.0" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M50626.0 2572.0 L51080.0 2572.0" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M50626.0 2663.0 L51080.0 2663.0" fill="none" data-name="EnrollmentFormData"></path>
-						</g>
-						<g transform="translate(50626, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
-								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(50626, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(50626, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="47930.0" y="1956.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M47930.0 1987.0 L48943.0 1987.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M47930.0 3008.0 L48943.0 3008.0" fill="none" data-name="QuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(47930, 1956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47930, 1987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47930, 3008)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="65972.8" y="2376.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M65972.8 2407.0 L66874.8 2407.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M65972.8 2633.0 L66874.8 2633.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-						</g>
-						<g transform="translate(65972.75, 2376)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
-								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(65972.75, 2407)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(65972.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormConsentItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="65723.8" y="3394.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M65723.8 3425.0 L66523.8 3425.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M65723.8 3501.0 L66523.8 3501.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-						</g>
-						<g transform="translate(65723.75, 3394)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(65723.75, 3425)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(65723.75, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="71357.0" y="1516.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M71357.0 1547.0 L72053.0 1547.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M71357.0 1758.0 L72053.0 1758.0" fill="none" data-name="StudyFormViewModel"></path>
-						</g>
-						<g transform="translate(71357, 1516)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(71357, 1547)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(71357, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="53367.3" y="1568.5" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M53367.3 1599.5 L54535.3 1599.5" fill="none" data-name="QuestionFormData"></path>
-							<path d="M53367.3 1735.5 L54535.3 1735.5" fill="none" data-name="QuestionFormData"></path>
-						</g>
-						<g transform="translate(53367.25, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(53367.25, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(53367.25, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="31073.0" y="3417.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M31073.0 3448.0 L31436.0 3448.0" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(31073, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31073, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="51487.3" y="2541.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M51487.3 2572.0 L51831.3 2572.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M51487.3 2633.0 L51831.3 2633.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-						</g>
-						<g transform="translate(51487.25, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(51487.25, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(51487.25, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="51871.3" y="2556.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M51871.3 2587.0 L52263.3 2587.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M51871.3 2633.0 L52263.3 2633.0" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(51871.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(51871.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(51871.25, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="52675.3" y="2556.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M52675.3 2587.0 L53147.3 2587.0" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M52675.3 2633.0 L53147.3 2633.0" fill="none" data-name="ImageQuestionFormData"></path>
-						</g>
-						<g transform="translate(52675.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(52675.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(52675.25, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="53923.3" y="2548.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M53923.3 2579.5 L54395.3 2579.5" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M53923.3 2640.5 L54395.3 2640.5" fill="none" data-name="AudioQuestionFormData"></path>
-						</g>
-						<g transform="translate(53923.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(53923.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(53923.25, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="54435.3" y="2481.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M54435.3 2512.0 L54779.3 2512.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M54435.3 2708.0 L54779.3 2708.0" fill="none" data-name="ScaleQuestionFormData"></path>
-						</g>
-						<g transform="translate(54435.25, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(54435.25, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(54435.25, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="54819.3" y="2541.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M54819.3 2572.0 L55163.3 2572.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M54819.3 2648.0 L55163.3 2648.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-						</g>
-						<g transform="translate(54819.25, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(54819.25, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(54819.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="54893.3" y="3485.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
-						</g>
-						<g transform="translate(54893.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="27757.8" y="1651.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M27757.8 1682.0 L28109.8 1682.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M27757.8 1713.0 L28109.8 1713.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(27757.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27757.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27757.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="28149.8" y="1628.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M28149.8 1659.5 L28501.8 1659.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M28149.8 1705.5 L28501.8 1705.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-						</g>
-						<g transform="translate(28149.75, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28149.75, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28149.75, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="28541.8" y="1651.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M28541.8 1682.0 L28893.8 1682.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M28541.8 1713.0 L28893.8 1713.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-						</g>
-						<g transform="translate(28541.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28541.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28541.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="82520.5" y="105.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M82520.5 136.5 L82829.5 136.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(82520.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82520.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="51231.3" y="1666.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M51231.3 1697.5 L51583.3 1697.5" fill="none" data-name="ScaleQuestionFormView"></path>
-						</g>
-						<g transform="translate(51231.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(51231.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="28933.8" y="1651.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M28933.8 1682.0 L29285.8 1682.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M28933.8 1713.0 L29285.8 1713.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-						</g>
-						<g transform="translate(28933.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28933.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28933.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="29740.8" y="1651.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M29740.8 1682.0 L30092.8 1682.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M29740.8 1713.0 L30092.8 1713.0" fill="none" data-name="BoolQuestionFormView"></path>
-						</g>
-						<g transform="translate(29740.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29740.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29740.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="56104.5" y="1659.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M56104.5 1690.0 L56456.5 1690.0" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(56104.5, 1659)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(56104.5, 1690)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="55982.3" y="2609.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
-						</g>
-						<g transform="translate(55982.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="82460.8" y="1158.5" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M82460.8 1189.5 L82892.8 1189.5" fill="none" data-name="ScheduleControls"></path>
-							<path d="M82460.8 1220.5 L82892.8 1220.5" fill="none" data-name="ScheduleControls"></path>
-						</g>
-						<g transform="translate(82460.75, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82460.75, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82460.75, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableColumnHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
-							<rect x="45539.0" y="3782.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
-							<path d="M45539.0 3813.5 L45776.0 3813.5" fill="none" data-name="StudiesTableColumnHeader"></path>
-						</g>
-						<g transform="translate(45539, 3782.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
-								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45539, 3813.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="56956.0" y="2594.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
-							<path d="M56956.0 2625.0 L57134.0 2625.0" fill="none" data-name="DashboardScreen"></path>
-						</g>
-						<g transform="translate(56956, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(56956, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesFilter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
-							<rect x="24804.0" y="3462.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
-							<path d="M24804.0 3493.0 L25100.0 3493.0" fill="none" data-name="StudiesFilter"></path>
-						</g>
-						<g transform="translate(24804, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24804, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
-							<rect x="57174.0" y="2571.0" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
-							<path d="M57174.0 2602.0 L57517.0 2602.0" fill="none" data-name="DashboardScaffold"></path>
-							<path d="M57174.0 2648.0 L57517.0 2648.0" fill="none" data-name="DashboardScaffold"></path>
-						</g>
-						<g transform="translate(57174, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
-								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(57174, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(57174, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
-							<rect x="70063.5" y="2436.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
-							<path d="M70063.5 2467.0 L70677.5 2467.0" fill="none" data-name="DashboardController"></path>
-							<path d="M70063.5 2588.0 L70677.5 2588.0" fill="none" data-name="DashboardController"></path>
-						</g>
-						<g transform="translate(70063.5, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
-								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(70063.5, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(70063.5, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IUserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="70180.5" y="3439.0" height="123.0" width="260.0" data-name="IUserRepository"></rect>
-							<path d="M70180.5 3470.0 L70440.5 3470.0" fill="none" data-name="IUserRepository"></path>
-							<path d="M70180.5 3501.0 L70440.5 3501.0" fill="none" data-name="IUserRepository"></path>
-						</g>
-						<g transform="translate(70180.5, 3439)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(70180.5, 3470)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+user: StudyUUser</text>
-								
-							</g>
-						</g>
-						<g transform="translate(70180.5, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+dynamic fetchUser()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IUserRepository">+dynamic saveUser()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IUserRepository">+dynamic updatePreferences()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableColumnSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
-							<rect x="82869.5" y="75.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
-							<path d="M82869.5 106.0 L83094.5 106.0" fill="none" data-name="StudiesTableColumnSize"></path>
-							<path d="M82869.5 167.0 L83094.5 167.0" fill="none" data-name="StudiesTableColumnSize"></path>
-						</g>
-						<g transform="translate(82869.5, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82869.5, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82869.5, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
-							<rect x="56581.8" y="1553.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
-							<path d="M56581.8 1584.5 L57061.8 1584.5" fill="none" data-name="StudiesTable"></path>
-							<path d="M56581.8 1795.5 L57061.8 1795.5" fill="none" data-name="StudiesTable"></path>
-						</g>
-						<g transform="translate(56581.75, 1553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
-								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(56581.75, 1584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(56581.75, 1795.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
-							<rect x="56280.0" y="2609.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
-						</g>
-						<g transform="translate(56280, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<rect x="56499.0" y="2609.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
-						</g>
-						<g transform="translate(56499, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
-							<rect x="2478.0" y="3394.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
-							<path d="M2478.0 3425.5 L2839.0 3425.5" fill="none" data-name="StudiesTableColumn"></path>
-						</g>
-						<g transform="translate(2478, 3394.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
-								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2478, 3425.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
-							<rect x="59997.3" y="2526.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
-							<path d="M59997.3 2557.5 L60397.3 2557.5" fill="none" data-name="StudiesTableItem"></path>
-						</g>
-						<g transform="translate(59997.25, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
-								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(59997.25, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Study, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
-							<rect x="59411.3" y="3485.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
-						</g>
-						<g transform="translate(59411.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Study)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
-							<rect x="59954.3" y="3485.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
-						</g>
-						<g transform="translate(59954.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="App">
-						<g fill="#eee8d5" stroke="#33322E" data-name="App">
-							<rect x="83134.5" y="121.0" height="31.0" width="47.0" data-name="App"></rect>
-						</g>
-						<g transform="translate(83134.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
-								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppContent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
-							<rect x="83221.5" y="121.0" height="31.0" width="109.0" data-name="AppContent"></rect>
-						</g>
-						<g transform="translate(83221.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AccountSettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
-							<rect x="39157.0" y="1666.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
-							<path d="M39157.0 1697.5 L39351.0 1697.5" fill="none" data-name="AccountSettingsDialog"></path>
-						</g>
-						<g transform="translate(39157, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39157, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepository">
-							<rect x="83561.3" y="986.0" height="453.0" width="662.0" data-name="ModelRepository"></rect>
-							<path d="M83561.3 1017.0 L84223.3 1017.0" fill="none" data-name="ModelRepository"></path>
-							<path d="M83561.3 1123.0 L84223.3 1123.0" fill="none" data-name="ModelRepository"></path>
-						</g>
-						<g transform="translate(83561.25, 986)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepository">
-								<text x="323.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepository">ModelRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(83561.25, 1017)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+delegate: IModelRepositoryDelegate&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">-_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">-_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">-_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(83561.25, 1123)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt;? get()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">+dynamic fetchAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">+dynamic fetch()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ModelRepository">-dynamic _buildModelSpecificController()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ModelRepository">+dynamic ensurePersisted()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt; upsertLocally()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ModelRepository">+List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ModelRepository">+dynamic emitUpdate()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ModelRepository">+dynamic emitModelEvent()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ModelRepository">+dynamic emitError()</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ModelRepository">+void dispose()</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ModelRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepository">
-							<rect x="82756.8" y="2518.5" height="213.0" width="403.0" data-name="InviteCodeRepository"></rect>
-							<path d="M82756.8 2549.5 L83159.8 2549.5" fill="none" data-name="InviteCodeRepository"></path>
-							<path d="M82756.8 2655.5 L83159.8 2655.5" fill="none" data-name="InviteCodeRepository"></path>
-						</g>
-						<g transform="translate(82756.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepository">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepository">InviteCodeRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82756.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepository">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepository">+study: Study</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82756.75, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+dynamic emitUpdate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ProviderRef">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ProviderRef">
-							<rect x="83411.5" y="4118.5" height="31.0" width="109.0" data-name="ProviderRef"></rect>
-						</g>
-						<g transform="translate(83411.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ProviderRef">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProviderRef">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProviderRef">ProviderRef</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUApi">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApi">
-							<rect x="77217.3" y="4028.0" height="212.0" width="251.0" data-name="StudyUApi"></rect>
-							<path d="M77217.3 4059.0 L77468.3 4059.0" fill="none" data-name="StudyUApi"></path>
-						</g>
-						<g transform="translate(77217.25, 4028)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyUApi">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApi">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApi">StudyUApi</text>
-								
-							</g>
-						</g>
-						<g transform="translate(77217.25, 4059)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApi">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApi">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApi">+dynamic saveStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApi">+dynamic getUserStudies()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApi">+dynamic saveStudyInvite()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudyInvite()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudyInvite()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApi">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApi">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApi">+dynamic fetchUser()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApi">+dynamic saveUser()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepositoryDelegate">
-							<rect x="83672.3" y="2518.5" height="213.0" width="299.0" data-name="InviteCodeRepositoryDelegate"></rect>
-							<path d="M83672.3 2549.5 L83971.3 2549.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
-							<path d="M83672.3 2610.5 L83971.3 2610.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
-						</g>
-						<g transform="translate(83672.25, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepositoryDelegate">
-								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepositoryDelegate">InviteCodeRepositoryDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(83672.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+apiClient: StudyUApi</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+studyRepository: IStudyRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(83672.25, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic onError()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createDuplicate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createNewInstance()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepositoryDelegate">
-							<rect x="83804.0" y="1621.5" height="152.0" width="225.0" data-name="IModelRepositoryDelegate"></rect>
-							<path d="M83804.0 1652.5 L84029.0 1652.5" fill="none" data-name="IModelRepositoryDelegate"></path>
-						</g>
-						<g transform="translate(83804, 1621.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepositoryDelegate">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepositoryDelegate">IModelRepositoryDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(83804, 1652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepositoryDelegate">+T createNewInstance()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepositoryDelegate">+T createDuplicate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic onError()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepository">
-							<rect x="72569.0" y="3752.0" height="183.0" width="403.0" data-name="StudyRepository"></rect>
-							<path d="M72569.0 3783.0 L72972.0 3783.0" fill="none" data-name="StudyRepository"></path>
-							<path d="M72569.0 3859.0 L72972.0 3859.0" fill="none" data-name="StudyRepository"></path>
-						</g>
-						<g transform="translate(72569, 3752)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepository">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepository">StudyRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72569, 3783)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+sortCallback: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72569, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+dynamic launch()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepositoryDelegate">
-							<rect x="83870.3" y="3744.5" height="198.0" width="282.0" data-name="StudyRepositoryDelegate"></rect>
-							<path d="M83870.3 3775.5 L84152.3 3775.5" fill="none" data-name="StudyRepositoryDelegate"></path>
-							<path d="M83870.3 3821.5 L84152.3 3821.5" fill="none" data-name="StudyRepositoryDelegate"></path>
-						</g>
-						<g transform="translate(83870.25, 3744.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepositoryDelegate">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepositoryDelegate">StudyRepositoryDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(83870.25, 3775.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+authRepository: IAuthRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(83870.25, 3821.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic onError()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createNewInstance()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="APIException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="APIException">
-							<rect x="76216.8" y="614.0" height="31.0" width="121.0" data-name="APIException"></rect>
-						</g>
-						<g transform="translate(76216.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="APIException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="APIException">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="APIException">APIException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotFoundException">
-							<rect x="73878.5" y="1197.0" height="31.0" width="216.0" data-name="StudyNotFoundException"></rect>
-						</g>
-						<g transform="translate(73878.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotFoundException">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotFoundException">StudyNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementNotFoundException">
-							<rect x="74134.5" y="1197.0" height="31.0" width="279.0" data-name="MeasurementNotFoundException"></rect>
-						</g>
-						<g transform="translate(74134.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementNotFoundException">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementNotFoundException">MeasurementNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionNotFoundException">
-							<rect x="74453.5" y="1197.0" height="31.0" width="242.0" data-name="QuestionNotFoundException"></rect>
-						</g>
-						<g transform="translate(74453.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionNotFoundException">
-								<text x="113.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionNotFoundException">QuestionNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemNotFoundException">
-							<rect x="74735.5" y="1197.0" height="31.0" width="271.0" data-name="ConsentItemNotFoundException"></rect>
-						</g>
-						<g transform="translate(74735.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemNotFoundException">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemNotFoundException">ConsentItemNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionNotFoundException">
-							<rect x="75046.5" y="1197.0" height="31.0" width="265.0" data-name="InterventionNotFoundException"></rect>
-						</g>
-						<g transform="translate(75046.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionNotFoundException">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionNotFoundException">InterventionNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskNotFoundException">
-							<rect x="76042.5" y="1197.0" height="31.0" width="303.0" data-name="InterventionTaskNotFoundException"></rect>
-						</g>
-						<g transform="translate(76042.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskNotFoundException">
-								<text x="143.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskNotFoundException">InterventionTaskNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportNotFoundException">
-							<rect x="76385.5" y="1197.0" height="31.0" width="224.0" data-name="ReportNotFoundException"></rect>
-						</g>
-						<g transform="translate(76385.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportNotFoundException">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportNotFoundException">ReportNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionNotFoundException">
-							<rect x="76649.5" y="1197.0" height="31.0" width="283.0" data-name="ReportSectionNotFoundException"></rect>
-						</g>
-						<g transform="translate(76649.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionNotFoundException">
-								<text x="133.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionNotFoundException">ReportSectionNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInviteNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInviteNotFoundException">
-							<rect x="76972.5" y="1197.0" height="31.0" width="259.0" data-name="StudyInviteNotFoundException"></rect>
-						</g>
-						<g transform="translate(76972.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInviteNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInviteNotFoundException">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInviteNotFoundException">StudyInviteNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="UserNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UserNotFoundException">
-							<rect x="77271.5" y="1197.0" height="31.0" width="208.0" data-name="UserNotFoundException"></rect>
-						</g>
-						<g transform="translate(77271.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserNotFoundException">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserNotFoundException">UserNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUApiClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApiClient">
-							<rect x="76925.3" y="4288.0" height="333.0" width="479.0" data-name="StudyUApiClient"></rect>
-							<path d="M76925.3 4319.0 L77404.3 4319.0" fill="none" data-name="StudyUApiClient"></path>
-							<path d="M76925.3 4395.0 L77404.3 4395.0" fill="none" data-name="StudyUApiClient"></path>
-						</g>
-						<g transform="translate(76925.25, 4288)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApiClient">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApiClient">StudyUApiClient</text>
-								
-							</g>
-						</g>
-						<g transform="translate(76925.25, 4319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+supabaseClient: SupabaseClient</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyColumns: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+testDelayMilliseconds: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(76925.25, 4395)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">+dynamic getUserStudies()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudy()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudyInvite()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudyInvite()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudyInvite()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchUser()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApiClient">+dynamic saveUser()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyUApiClient">-dynamic _awaitGuarded()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyUApiClient">-dynamic _apiException()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyUApiClient">-dynamic _testDelay()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClient">
-							<rect x="76840.8" y="4661.0" height="31.0" width="141.0" data-name="SupabaseClient"></rect>
-						</g>
-						<g transform="translate(76840.75, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClient">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClient">SupabaseClient</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseClientDependant">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClientDependant">
-							<rect x="76540.3" y="4103.0" height="62.0" width="284.0" data-name="SupabaseClientDependant"></rect>
-							<path d="M76540.3 4134.0 L76824.3 4134.0" fill="none" data-name="SupabaseClientDependant"></path>
-						</g>
-						<g transform="translate(76540.25, 4103)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseClientDependant">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClientDependant">
-								<text x="134.0" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClientDependant">SupabaseClientDependant</text>
-								
-							</g>
-						</g>
-						<g transform="translate(76540.25, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseClientDependant">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseClientDependant">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseClientDependant">+supabaseClient: SupabaseClient</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseQueryMixin">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryMixin">
-							<rect x="76879.3" y="4065.5" height="137.0" width="215.0" data-name="SupabaseQueryMixin"></rect>
-							<path d="M76879.3 4096.5 L77094.3 4096.5" fill="none" data-name="SupabaseQueryMixin"></path>
-						</g>
-						<g transform="translate(76879.25, 4065.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseQueryMixin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryMixin">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryMixin">SupabaseQueryMixin</text>
-								
-							</g>
-						</g>
-						<g transform="translate(76879.25, 4096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryMixin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryMixin">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic deleteAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getById()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getByColumn()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseQueryMixin">+List&lt;T&gt; deserializeList()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SupabaseQueryMixin">+T deserializeObject()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAppRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppRepository">
-							<rect x="59684.3" y="3462.0" height="77.0" width="230.0" data-name="IAppRepository"></rect>
-							<path d="M59684.3 3493.0 L59914.3 3493.0" fill="none" data-name="IAppRepository"></path>
-						</g>
-						<g transform="translate(59684.25, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppRepository">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAppRepository">IAppRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(59684.25, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppRepository">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAppRepository">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppRepository">
-							<rect x="59684.3" y="3789.5" height="108.0" width="230.0" data-name="AppRepository"></rect>
-							<path d="M59684.3 3820.5 L59914.3 3820.5" fill="none" data-name="AppRepository"></path>
-							<path d="M59684.3 3851.5 L59914.3 3851.5" fill="none" data-name="AppRepository"></path>
-						</g>
-						<g transform="translate(59684.25, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppRepository">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppRepository">AppRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(59684.25, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+apiClient: StudyUApi</text>
-								
-							</g>
-						</g>
-						<g transform="translate(59684.25, 3851.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppRepository">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUUser">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUUser">
-							<rect x="76390.3" y="4118.5" height="31.0" width="110.0" data-name="StudyUUser"></rect>
-						</g>
-						<g transform="translate(76390.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUUser">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUUser">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUUser">StudyUUser</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="UserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UserRepository">
-							<rect x="70645.8" y="3759.5" height="168.0" width="282.0" data-name="UserRepository"></rect>
-							<path d="M70645.8 3790.5 L70927.8 3790.5" fill="none" data-name="UserRepository"></path>
-							<path d="M70645.8 3866.5 L70927.8 3866.5" fill="none" data-name="UserRepository"></path>
-						</g>
-						<g transform="translate(70645.75, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserRepository">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserRepository">UserRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(70645.75, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+ref: Ref&lt;Object?&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="UserRepository">+user: StudyUUser</text>
-								
-							</g>
-						</g>
-						<g transform="translate(70645.75, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+dynamic fetchUser()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+dynamic saveUser()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+dynamic updatePreferences()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Ref">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Ref">
-							<rect x="77134.3" y="4118.5" height="31.0" width="43.0" data-name="Ref"></rect>
-						</g>
-						<g transform="translate(77134.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Ref">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Ref">
-								<text x="13.5" y="13.5" stroke="none" text-anchor="middle" data-name="Ref">Ref</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PreferenceAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreferenceAction">
-							<rect x="2929.0" y="3447.0" height="107.0" width="334.0" data-name="PreferenceAction"></rect>
-							<path d="M2929.0 3478.0 L3263.0 3478.0" fill="none" data-name="PreferenceAction"></path>
-						</g>
-						<g transform="translate(2929, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreferenceAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreferenceAction">
-								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="PreferenceAction">PreferenceAction</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2929, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreferenceAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreferenceAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreferenceAction">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+values: List&lt;PreferenceAction&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pin: PreferenceAction</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pinOff: PreferenceAction</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="User">
-						<g fill="#eee8d5" stroke="#33322E" data-name="User">
-							<rect x="73039.8" y="4661.0" height="31.0" width="53.0" data-name="User"></rect>
-						</g>
-						<g transform="translate(73039.75, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="User">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="User">
-								<text x="18.5" y="13.5" stroke="none" text-anchor="middle" data-name="User">User</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Session">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Session">
-							<rect x="76321.0" y="4661.0" height="31.0" width="79.0" data-name="Session"></rect>
-						</g>
-						<g transform="translate(76321, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Session">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Session">
-								<text x="31.5" y="13.5" stroke="none" text-anchor="middle" data-name="Session">Session</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthRepository">
-							<rect x="76315.0" y="4310.5" height="288.0" width="295.0" data-name="AuthRepository"></rect>
-							<path d="M76315.0 4341.5 L76610.0 4341.5" fill="none" data-name="AuthRepository"></path>
-							<path d="M76315.0 4462.5 L76610.0 4462.5" fill="none" data-name="AuthRepository"></path>
-						</g>
-						<g transform="translate(76315, 4310.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthRepository">
-								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthRepository">AuthRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(76315, 4341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">+supabaseClient: SupabaseClient</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+allowPasswordReset: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+authClient: GoTrueClient</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+session: Session?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+serializedSession: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+currentUser: User?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+isLoggedIn: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(76315, 4462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">-void _registerAuthListener()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+dynamic signUp()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+dynamic signInWith()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+dynamic signOut()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+dynamic updateUser()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+void dispose()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthRepository">+dynamic onAppStart()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoTrueClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoTrueClient">
-							<rect x="76440.0" y="4661.0" height="31.0" width="120.0" data-name="GoTrueClient"></rect>
-						</g>
-						<g transform="translate(76440, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoTrueClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoTrueClient">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoTrueClient">GoTrueClient</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyLaunched">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyLaunched">
-							<rect x="79535.8" y="614.0" height="31.0" width="140.0" data-name="StudyLaunched"></rect>
-						</g>
-						<g transform="translate(79535.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyLaunched">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyLaunched">
-								<text x="62.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyLaunched">StudyLaunched</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelEvent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelEvent">
-							<rect x="79943.0" y="98.0" height="77.0" width="145.0" data-name="ModelEvent"></rect>
-							<path d="M79943.0 129.0 L80088.0 129.0" fill="none" data-name="ModelEvent"></path>
-						</g>
-						<g transform="translate(79943, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelEvent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelEvent">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelEvent">ModelEvent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(79943, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelEvent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelEvent">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelEvent">+modelId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelEvent">+model: T</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseQueryError">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryError">
-							<rect x="77384.3" y="583.5" height="92.0" width="183.0" data-name="SupabaseQueryError"></rect>
-							<path d="M77384.3 614.5 L77567.3 614.5" fill="none" data-name="SupabaseQueryError"></path>
-						</g>
-						<g transform="translate(77384.25, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseQueryError">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryError">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryError">SupabaseQueryError</text>
-								
-							</g>
-						</g>
-						<g transform="translate(77384.25, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryError">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryError">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryError">+statusCode: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryError">+message: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryError">+details: dynamic</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WrappedModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WrappedModel">
-							<rect x="61452.3" y="2496.0" height="258.0" width="251.0" data-name="WrappedModel"></rect>
-							<path d="M61452.3 2527.0 L61703.3 2527.0" fill="none" data-name="WrappedModel"></path>
-							<path d="M61452.3 2678.0 L61703.3 2678.0" fill="none" data-name="WrappedModel"></path>
-						</g>
-						<g transform="translate(61452.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WrappedModel">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="WrappedModel">WrappedModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(61452.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">-_model: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+asyncValue: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+isLocalOnly: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+isDirty: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WrappedModel">+isDeleted: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WrappedModel">+lastSaved: DateTime?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WrappedModel">+lastFetched: DateTime?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WrappedModel">+lastUpdated: DateTime?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WrappedModel">+model: T</text>
-								
-							</g>
-						</g>
-						<g transform="translate(61452.25, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">+dynamic markWithError()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+dynamic markAsLoading()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+dynamic markAsFetched()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+dynamic markAsSaved()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelRepositoryException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepositoryException">
-							<rect x="77607.3" y="614.0" height="31.0" width="227.0" data-name="ModelRepositoryException"></rect>
-						</g>
-						<g transform="translate(77607.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelRepositoryException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepositoryException">
-								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepositoryException">ModelRepositoryException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelNotFoundException">
-							<rect x="77611.3" y="1197.0" height="31.0" width="219.0" data-name="ModelNotFoundException"></rect>
-						</g>
-						<g transform="translate(77611.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelNotFoundException">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelNotFoundException">ModelNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepository">
-							<rect x="83701.3" y="501.0" height="257.0" width="382.0" data-name="IModelRepository"></rect>
-							<path d="M83701.3 532.0 L84083.3 532.0" fill="none" data-name="IModelRepository"></path>
-						</g>
-						<g transform="translate(83701.25, 501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepository">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepository">IModelRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(83701.25, 532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepository">+WrappedModel&lt;T&gt;? get()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepository">+dynamic fetchAll()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepository">+dynamic fetch()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepository">+dynamic save()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepository">+dynamic delete()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSave()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="IModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="IModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="IModelRepository">+dynamic ensurePersisted()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="IModelRepository">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IsFetched">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsFetched">
-							<rect x="79715.8" y="614.0" height="31.0" width="94.0" data-name="IsFetched"></rect>
-						</g>
-						<g transform="translate(79715.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsFetched">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsFetched">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsFetched">IsFetched</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IsSaving">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaving">
-							<rect x="79849.8" y="614.0" height="31.0" width="84.0" data-name="IsSaving"></rect>
-						</g>
-						<g transform="translate(79849.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaving">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaving">
-								<text x="34.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaving">IsSaving</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IsSaved">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaved">
-							<rect x="80646.0" y="614.0" height="31.0" width="80.0" data-name="IsSaved"></rect>
-						</g>
-						<g transform="translate(80646, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaved">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaved">
-								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaved">IsSaved</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IsDeleted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsDeleted">
-							<rect x="80766.0" y="614.0" height="31.0" width="91.0" data-name="IsDeleted"></rect>
-						</g>
-						<g transform="translate(80766, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsDeleted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsDeleted">
-								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="IsDeleted">IsDeleted</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/utils/uml.svg b/docs/uml/designer_v2/lib/utils/uml.svg
deleted file mode 100644
index 69a23ca7f..000000000
--- a/docs/uml/designer_v2/lib/utils/uml.svg
+++ /dev/null
@@ -1,1035 +0,0 @@
-<svg version="1.1" baseProfile="full" width="7005.0" height="548.0" viewbox="0 0 7005 548" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[SerializableColor
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+SerializableColor fromJson()
-	]
-	
-	[Color]&lt;:-[SerializableColor]
-	
-	[&lt;abstract&gt;FileFormatEncoder
-	  |
-	  +dynamic encodeAsync();
-	  +String encode();
-	  +dynamic call()
-	]
-	
-	[CSVStringEncoder
-	  |
-	  +String encode()
-	]
-	
-	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[CSVStringEncoder]
-	
-	[JsonStringEncoder
-	  |
-	  +String encode()
-	]
-	
-	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[JsonStringEncoder]
-	
-	[&lt;abstract&gt;ExecutionLimiter
-	  |
-	  +milliseconds: int;
-	  &lt;static&gt;-_timer: Timer?
-	  |
-	  +void dispose()
-	]
-	
-	[&lt;abstract&gt;ExecutionLimiter]o-[Timer]
-	
-	[Debouncer
-	  |
-	  +leading: bool;
-	  +cancelUncompleted: bool;
-	  -_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?
-	  |
-	  +dynamic call()
-	]
-	
-	[Debouncer]o-[CancelableOperation]
-	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Debouncer]
-	
-	[Throttler
-	  |
-	  +dynamic call()
-	]
-	
-	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Throttler]
-	
-	[OptimisticUpdate
-	  |
-	  +applyOptimistic: void Function();
-	  +apply: dynamic Function();
-	  +rollback: void Function();
-	  +onUpdate: void Function()?;
-	  +onError: void Function(Object, StackTrace?)?;
-	  +rethrowErrors: bool;
-	  +runOptimistically: bool;
-	  +completeFutureOptimistically: bool
-	  |
-	  +dynamic execute();
-	  -void _runUpdateHandlerIfAny()
-	]
-	
-	[OptimisticUpdate]o-[void Function()]
-	[OptimisticUpdate]o-[dynamic Function()]
-	[OptimisticUpdate]o-[void Function()?]
-	[OptimisticUpdate]o-[void Function(Object, StackTrace?)?]
-	
-	[CountWhereValidator
-	  |
-	  +predicate: bool Function(T?);
-	  +minCount: int?;
-	  +maxCount: int?;
-	  &lt;static&gt;+kValidationMessageMinCount: String;
-	  &lt;static&gt;+kValidationMessageMaxCount: String
-	  |
-	  +Map&lt;String, dynamic&gt;? validate()
-	]
-	
-	[CountWhereValidator]o-[bool Function(T?)]
-	[&lt;abstract&gt;Validator]&lt;:-[CountWhereValidator]
-	
-	[Patterns
-	  |
-	  &lt;static&gt;+timeFormatString: String;
-	  &lt;static&gt;+emailFormatString: String;
-	  &lt;static&gt;+url: String
-	]
-	
-	[ModelAction
-	  |
-	  +type: T;
-	  +label: String;
-	  +icon: IconData?;
-	  +onExecute: Function;
-	  +isAvailable: bool;
-	  +isDestructive: bool
-	]
-	
-	[ModelAction]o-[IconData]
-	
-	[&lt;abstract&gt;IModelActionProvider
-	  |
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
-	]
-	
-	[&lt;abstract&gt;IListActionProvider
-	  |
-	  +void onSelectItem();
-	  +void onNewItem()
-	]
-	
-	[&lt;abstract&gt;IModelActionProvider]&lt;:-[&lt;abstract&gt;IListActionProvider]
-	
-	[ModelActionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ModelActionType&gt;;
-	  &lt;static&gt;+edit: ModelActionType;
-	  &lt;static&gt;+delete: ModelActionType;
-	  &lt;static&gt;+remove: ModelActionType;
-	  &lt;static&gt;+duplicate: ModelActionType;
-	  &lt;static&gt;+clipboard: ModelActionType;
-	  &lt;static&gt;+primary: ModelActionType
-	]
-	
-	[ModelActionType]o-[ModelActionType]
-	[Enum]&lt;:--[ModelActionType]
-	
-	[&lt;abstract&gt;IProviderArgsResolver
-	  |
-	  +R provide()
-	]
-	
-	[Tuple
-	  |
-	  +first: T1;
-	  +second: T2;
-	  +props: List&lt;Object?&gt;
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson();
-	  +Tuple&lt;T1, T2&gt; copy();
-	  +Tuple&lt;T1, T2&gt; copyWith()
-	]
-	
-	[&lt;abstract&gt;Equatable]&lt;:-[Tuple]
-	
-	[SuppressedBehaviorSubject
-	  |
-	  +subject: BehaviorSubject&lt;T&gt;;
-	  +didSuppressInitialEvent: bool;
-	  -_controller: StreamController&lt;T&gt;
-	  |
-	  -StreamController&lt;T&gt; _buildDerivedController();
-	  +dynamic close()
-	]
-	
-	[SuppressedBehaviorSubject]o-[BehaviorSubject]
-	[SuppressedBehaviorSubject]o-[StreamController]
-	
-	[&lt;abstract&gt;JsonFileLoader
-	  |
-	  +jsonAssetsPath: String
-	  |
-	  +dynamic loadJson();
-	  +dynamic parseJsonMapFromAssets();
-	  +dynamic parseJsonListFromAssets()
-	]
-	
-	[CombinedStreamNotifier
-	  |
-	  -_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;
-	  |
-	  +void dispose()
-	]
-	
-	[ChangeNotifier]&lt;:-[CombinedStreamNotifier]
-	
-	[Time
-	  |
-	  &lt;static&gt;+dynamic fromTimeOfDay();
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+Time fromJson()
-	]
-	
-	[TimeOfDay]&lt;:-[Time]
-	
-	[TimeValueAccessor
-	  |
-	  +String modelToViewValue();
-	  +Time? viewToModelValue();
-	  -String _addLeadingZeroIfNeeded()
-	]
-	
-	[&lt;abstract&gt;ControlValueAccessor]&lt;:-[TimeValueAccessor]
-	
-	[NumericalRangeFormatter
-	  |
-	  +min: int?;
-	  +max: int?
-	  |
-	  +TextEditingValue formatEditUpdate()
-	]
-	
-	[&lt;abstract&gt;TextInputFormatter]&lt;:-[NumericalRangeFormatter]
-	
-	[StudySequenceFormatter
-	  |
-	  +TextEditingValue formatEditUpdate()
-	]
-	
-	[&lt;abstract&gt;TextInputFormatter]&lt;:-[StudySequenceFormatter]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="548.0" width="7005.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M156.0 135.3 L156 233 L156 298.5 L156.0 298.5 " fill="none"></path>
-					<path d="M161.3 135.3 L156.0 135.3 L150.7 135.3 L156.0 122.0 Z"></path>
-					<path d="M489.5 162.9 L433 233 L433 306 L433.0 306.0 " fill="none"></path>
-					<path d="M493.7 166.2 L489.5 162.9 L485.4 159.5 L497.9 152.5 Z"></path>
-					<path d="M580.5 162.9 L637 233 L637 306 L637.0 306.0 " fill="none"></path>
-					<path d="M584.6 159.5 L580.5 162.9 L576.3 166.2 L572.1 152.5 Z"></path>
-					<path d="M1012.0 149.9 L790 233 L790 321.5 L790.0 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1022.6 151.6 L1012.0 149.9 L1018.9 141.6 L1029.5 143.4 Z"></path>
-					</g>
-					<path d="M1128.0 417.2 L1128 441 L1128 461 L1128.0 461.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1133.3 407.8 L1128.0 417.2 L1122.7 407.8 L1128.0 398.5 Z"></path>
-					</g>
-					<path d="M1128.0 173.8 L1128 233 L1128 275.5 L1128.0 275.5 " fill="none"></path>
-					<path d="M1133.3 173.8 L1128.0 173.8 L1122.7 173.8 L1128.0 160.5 Z"></path>
-					<path d="M1239.1 143.9 L1504 233 L1504 306 L1504.0 306.0 " fill="none"></path>
-					<path d="M1240.8 138.8 L1239.1 143.9 L1237.4 148.9 L1226.5 139.6 Z"></path>
-					<path d="M1758.7 198.0 L1679 233 L1679 321.5 L1679.0 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1769.3 199.2 L1758.7 198.0 L1765.1 189.4 L1775.8 190.5 Z"></path>
-					</g>
-					<path d="M1873.5 227.8 L1869.5 233 L1869.5 321.5 L1869.5 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1883.5 223.6 L1873.5 227.8 L1875.0 217.1 L1885.0 213.0 Z"></path>
-					</g>
-					<path d="M2061.0 227.8 L2065 233 L2065 321.5 L2065.0 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2059.5 217.1 L2061.0 227.8 L2051.0 223.6 L2049.5 213.0 Z"></path>
-					</g>
-					<path d="M2176.4 179.6 L2329 233 L2329 321.5 L2329.0 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2169.3 171.5 L2176.4 179.6 L2165.8 181.6 L2158.8 173.5 Z"></path>
-					</g>
-					<path d="M2712.5 432.2 L2712.5 441 L2712.5 461 L2712.5 461.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2717.8 422.8 L2712.5 432.2 L2707.2 422.8 L2712.5 413.5 Z"></path>
-					</g>
-					<path d="M2712.5 135.3 L2712.5 233 L2712.5 260.5 L2712.5 260.5 " fill="none"></path>
-					<path d="M2717.8 135.3 L2712.5 135.3 L2707.2 135.3 L2712.5 122.0 Z"></path>
-					<path d="M3216.5 193.7 L3216.5 233 L3216.5 321.5 L3216.5 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3221.8 184.3 L3216.5 193.7 L3211.2 184.3 L3216.5 175.0 Z"></path>
-					</g>
-					<path d="M3552.0 150.8 L3552 233 L3552 298.5 L3552.0 298.5 " fill="none"></path>
-					<path d="M3557.3 150.8 L3552.0 150.8 L3546.7 150.8 L3552.0 137.5 Z"></path>
-					<path d="M4032.7 258.9 L4045.5 253.5 L4053 253.5 L4053 253.5 L4060.5 337 L4060.5 337 L4053 420.5 L4053 420.5 L4045.5 420.5 L4045.5 420.5 L4015.5 407.78426395939084 L4015.5 407.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4022.0 257.7 L4032.7 258.9 L4026.2 267.5 L4015.5 266.2 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3848.5 135.3 L3848.5 233 L3848.5 253.5 L3848.5 253.5 " fill="none"></path>
-					</g>
-					<path d="M3853.8 135.3 L3848.5 135.3 L3843.2 135.3 L3848.5 122.0 Z"></path>
-					<path d="M4297.5 135.3 L4297.5 233 L4297.5 253 L4297.5 253.0 " fill="none"></path>
-					<path d="M4302.8 135.3 L4297.5 135.3 L4292.2 135.3 L4297.5 122.0 Z"></path>
-					<path d="M4633.4 190.5 L4602 233 L4602 321.5 L4602.0 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4643.2 186.2 L4633.4 190.5 L4634.7 179.8 L4644.5 175.5 Z"></path>
-					</g>
-					<path d="M4799.7 186.9 L4859.5 233 L4859.5 321.5 L4859.5 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4795.6 177.0 L4799.7 186.9 L4789.1 185.4 L4785.0 175.5 Z"></path>
-					</g>
-					<path d="M5355.5 135.3 L5355.5 233 L5355.5 290.5 L5355.5 290.5 " fill="none"></path>
-					<path d="M5360.8 135.3 L5355.5 135.3 L5350.2 135.3 L5355.5 122.0 Z"></path>
-					<path d="M5759.5 135.3 L5759.5 233 L5759.5 291 L5759.5 291.0 " fill="none"></path>
-					<path d="M5764.8 135.3 L5759.5 135.3 L5754.2 135.3 L5759.5 122.0 Z"></path>
-					<path d="M6094.5 135.3 L6094.5 233 L6094.5 291 L6094.5 291.0 " fill="none"></path>
-					<path d="M6099.8 135.3 L6094.5 135.3 L6089.2 135.3 L6094.5 122.0 Z"></path>
-					<path d="M6583.5 129.8 L6439.5 233 L6439.5 283 L6439.5 283.0 " fill="none"></path>
-					<path d="M6586.6 134.1 L6583.5 129.8 L6580.4 125.4 L6594.4 122.0 Z"></path>
-					<path d="M6648.5 129.8 L6792.5 233 L6792.5 306 L6792.5 306.0 " fill="none"></path>
-					<path d="M6651.6 125.4 L6648.5 129.8 L6645.4 134.1 L6637.6 122.0 Z"></path>
-					<g data-name="SerializableColor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SerializableColor">
-							<rect x="0.0" y="298.5" height="77.0" width="312.0" data-name="SerializableColor"></rect>
-							<path d="M0.0 329.5 L312.0 329.5" fill="none" data-name="SerializableColor"></path>
-						</g>
-						<g transform="translate(0, 298.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SerializableColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SerializableColor">
-								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="SerializableColor">SerializableColor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 329.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SerializableColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SerializableColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="SerializableColor">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SerializableColor">&lt;static&gt;+SerializableColor fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="127.0" y="91.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(127, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FileFormatEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FileFormatEncoder">
-							<rect x="427.0" y="60.5" height="92.0" width="216.0" data-name="FileFormatEncoder"></rect>
-							<path d="M427.0 91.5 L643.0 91.5" fill="none" data-name="FileFormatEncoder"></path>
-						</g>
-						<g transform="translate(427, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FileFormatEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FileFormatEncoder">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="FileFormatEncoder">FileFormatEncoder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(427, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FileFormatEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FileFormatEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="FileFormatEncoder">+dynamic encodeAsync()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FileFormatEncoder">+String encode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FileFormatEncoder">+dynamic call()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CSVStringEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CSVStringEncoder">
-							<rect x="352.0" y="306.0" height="62.0" width="162.0" data-name="CSVStringEncoder"></rect>
-							<path d="M352.0 337.0 L514.0 337.0" fill="none" data-name="CSVStringEncoder"></path>
-						</g>
-						<g transform="translate(352, 306)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CSVStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CSVStringEncoder">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="CSVStringEncoder">CSVStringEncoder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(352, 337)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CSVStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CSVStringEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="CSVStringEncoder">+String encode()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="JsonStringEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JsonStringEncoder">
-							<rect x="554.0" y="306.0" height="62.0" width="166.0" data-name="JsonStringEncoder"></rect>
-							<path d="M554.0 337.0 L720.0 337.0" fill="none" data-name="JsonStringEncoder"></path>
-						</g>
-						<g transform="translate(554, 306)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JsonStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonStringEncoder">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="JsonStringEncoder">JsonStringEncoder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(554, 337)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonStringEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonStringEncoder">+String encode()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ExecutionLimiter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ExecutionLimiter">
-							<rect x="1029.5" y="52.5" height="108.0" width="197.0" data-name="ExecutionLimiter"></rect>
-							<path d="M1029.5 83.5 L1226.5 83.5" fill="none" data-name="ExecutionLimiter"></path>
-							<path d="M1029.5 129.5 L1226.5 129.5" fill="none" data-name="ExecutionLimiter"></path>
-						</g>
-						<g transform="translate(1029.5, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ExecutionLimiter">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ExecutionLimiter">ExecutionLimiter</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1029.5, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
-								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+milliseconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ExecutionLimiter">&lt;static&gt;-_timer: Timer?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1029.5, 129.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
-								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Timer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Timer">
-							<rect x="760.0" y="321.5" height="31.0" width="60.0" data-name="Timer"></rect>
-						</g>
-						<g transform="translate(760, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timer">
-								<text x="22.0" y="13.5" stroke="none" text-anchor="middle" data-name="Timer">Timer</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Debouncer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="860.0" y="275.5" height="123.0" width="536.0" data-name="Debouncer"></rect>
-							<path d="M860.0 306.5 L1396.0 306.5" fill="none" data-name="Debouncer"></path>
-							<path d="M860.0 367.5 L1396.0 367.5" fill="none" data-name="Debouncer"></path>
-						</g>
-						<g transform="translate(860, 275.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
-								<text x="260.0" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(860, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
-								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+leading: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Debouncer">+cancelUncompleted: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Debouncer">-_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(860, 367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
-								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+dynamic call()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CancelableOperation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="1036.5" y="461.0" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
-						</g>
-						<g transform="translate(1036.5, 461)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Throttler">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Throttler">
-							<rect x="1436.0" y="306.0" height="62.0" width="136.0" data-name="Throttler"></rect>
-							<path d="M1436.0 337.0 L1572.0 337.0" fill="none" data-name="Throttler"></path>
-						</g>
-						<g transform="translate(1436, 306)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Throttler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Throttler">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="Throttler">Throttler</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1436, 337)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Throttler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Throttler">
-								<text x="0.0" y="13.5" stroke="none" data-name="Throttler">+dynamic call()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OptimisticUpdate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OptimisticUpdate">
-							<rect x="1775.8" y="0.0" height="213.0" width="383.0" data-name="OptimisticUpdate"></rect>
-							<path d="M1775.8 31.0 L2158.8 31.0" fill="none" data-name="OptimisticUpdate"></path>
-							<path d="M1775.8 167.0 L2158.8 167.0" fill="none" data-name="OptimisticUpdate"></path>
-						</g>
-						<g transform="translate(1775.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptimisticUpdate">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptimisticUpdate">OptimisticUpdate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1775.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+applyOptimistic: void Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">+apply: dynamic Function()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="OptimisticUpdate">+rollback: void Function()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="OptimisticUpdate">+onUpdate: void Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="OptimisticUpdate">+onError: void Function(Object, StackTrace?)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="OptimisticUpdate">+rethrowErrors: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="OptimisticUpdate">+runOptimistically: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="OptimisticUpdate">+completeFutureOptimistically: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1775.75, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+dynamic execute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">-void _runUpdateHandlerIfAny()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()">
-							<rect x="1612.0" y="321.5" height="31.0" width="134.0" data-name="void Function()"></rect>
-						</g>
-						<g transform="translate(1612, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()">void Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="1786.0" y="321.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(1786, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="1993.0" y="321.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(1993, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Object, StackTrace?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Object, StackTrace?)?">
-							<rect x="2177.0" y="321.5" height="31.0" width="304.0" data-name="void Function(Object, StackTrace?)?"></rect>
-						</g>
-						<g transform="translate(2177, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Object, StackTrace?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Object, StackTrace?)?">
-								<text x="144.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Object, StackTrace?)?">void Function(Object, StackTrace?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CountWhereValidator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CountWhereValidator">
-							<rect x="2521.0" y="260.5" height="153.0" width="383.0" data-name="CountWhereValidator"></rect>
-							<path d="M2521.0 291.5 L2904.0 291.5" fill="none" data-name="CountWhereValidator"></path>
-							<path d="M2521.0 382.5 L2904.0 382.5" fill="none" data-name="CountWhereValidator"></path>
-						</g>
-						<g transform="translate(2521, 260.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CountWhereValidator">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="CountWhereValidator">CountWhereValidator</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2521, 291.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
-								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+predicate: bool Function(T?)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CountWhereValidator">+minCount: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CountWhereValidator">+maxCount: int?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMinCount: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMaxCount: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2521, 382.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
-								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+Map&lt;String, dynamic&gt;? validate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="bool Function(T?)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="bool Function(T?)">
-							<rect x="2635.0" y="461.0" height="31.0" width="155.0" data-name="bool Function(T?)"></rect>
-						</g>
-						<g transform="translate(2635, 461)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="bool Function(T?)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="bool Function(T?)">
-								<text x="69.5" y="13.5" stroke="none" text-anchor="middle" data-name="bool Function(T?)">bool Function(T?)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Validator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Validator">
-							<rect x="2669.5" y="91.0" height="31.0" width="86.0" data-name="Validator"></rect>
-						</g>
-						<g transform="translate(2669.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Validator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Validator">
-								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="Validator">Validator</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Patterns">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Patterns">
-							<rect x="2795.5" y="60.5" height="92.0" width="287.0" data-name="Patterns"></rect>
-							<path d="M2795.5 91.5 L3082.5 91.5" fill="none" data-name="Patterns"></path>
-						</g>
-						<g transform="translate(2795.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Patterns">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Patterns">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="Patterns">Patterns</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2795.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Patterns">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Patterns">
-								<text x="0.0" y="13.5" stroke="none" data-name="Patterns">&lt;static&gt;+timeFormatString: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Patterns">&lt;static&gt;+emailFormatString: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Patterns">&lt;static&gt;+url: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelAction">
-							<rect x="3122.5" y="38.0" height="137.0" width="188.0" data-name="ModelAction"></rect>
-							<path d="M3122.5 69.0 L3310.5 69.0" fill="none" data-name="ModelAction"></path>
-						</g>
-						<g transform="translate(3122.5, 38)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelAction">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelAction">ModelAction</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3122.5, 69)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelAction">+type: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelAction">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelAction">+icon: IconData?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelAction">+onExecute: Function</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelAction">+isAvailable: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelAction">+isDestructive: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="3173.0" y="321.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(3173, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="3350.5" y="75.5" height="62.0" width="403.0" data-name="IModelActionProvider"></rect>
-							<path d="M3350.5 106.5 L3753.5 106.5" fill="none" data-name="IModelActionProvider"></path>
-						</g>
-						<g transform="translate(3350.5, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3350.5, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelActionProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelActionProvider">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="3462.5" y="298.5" height="77.0" width="179.0" data-name="IListActionProvider"></rect>
-							<path d="M3462.5 329.5 L3641.5 329.5" fill="none" data-name="IListActionProvider"></path>
-						</g>
-						<g transform="translate(3462.5, 298.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3462.5, 329.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IListActionProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="IListActionProvider">+void onSelectItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IListActionProvider">+void onNewItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelActionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelActionType">
-							<rect x="3681.5" y="253.5" height="167.0" width="334.0" data-name="ModelActionType"></rect>
-							<path d="M3681.5 284.5 L4015.5 284.5" fill="none" data-name="ModelActionType"></path>
-						</g>
-						<g transform="translate(3681.5, 253.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelActionType">
-								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelActionType">ModelActionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3681.5, 284.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelActionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelActionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+values: List&lt;ModelActionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+edit: ModelActionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+delete: ModelActionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+remove: ModelActionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+duplicate: ModelActionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+clipboard: ModelActionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+primary: ModelActionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="3818.0" y="91.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(3818, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="3967.8" y="75.5" height="62.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-							<path d="M3967.8 106.5 L4160.8 106.5" fill="none" data-name="IProviderArgsResolver"></path>
-						</g>
-						<g transform="translate(3967.75, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3967.75, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IProviderArgsResolver">
-								<text x="0.0" y="13.5" stroke="none" data-name="IProviderArgsResolver">+R provide()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Tuple">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Tuple">
-							<rect x="4105.5" y="253.0" height="168.0" width="384.0" data-name="Tuple"></rect>
-							<path d="M4105.5 284.0 L4489.5 284.0" fill="none" data-name="Tuple"></path>
-							<path d="M4105.5 345.0 L4489.5 345.0" fill="none" data-name="Tuple"></path>
-						</g>
-						<g transform="translate(4105.5, 253)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Tuple">
-								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="Tuple">Tuple</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4105.5, 284)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
-								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+first: T1</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">+second: T2</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4105.5, 345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
-								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">&lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copy()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copyWith()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="4249.5" y="91.0" height="31.0" width="96.0" data-name="Equatable"></rect>
-						</g>
-						<g transform="translate(4249.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SuppressedBehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SuppressedBehaviorSubject">
-							<rect x="4501.5" y="37.5" height="138.0" width="388.0" data-name="SuppressedBehaviorSubject"></rect>
-							<path d="M4501.5 68.5 L4889.5 68.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
-							<path d="M4501.5 129.5 L4889.5 129.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
-						</g>
-						<g transform="translate(4501.5, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SuppressedBehaviorSubject">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="SuppressedBehaviorSubject">SuppressedBehaviorSubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4501.5, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
-								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">+subject: BehaviorSubject&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+didSuppressInitialEvent: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SuppressedBehaviorSubject">-_controller: StreamController&lt;T&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4501.5, 129.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
-								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">-StreamController&lt;T&gt; _buildDerivedController()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+dynamic close()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BehaviorSubject">
-							<rect x="4529.5" y="321.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
-						</g>
-						<g transform="translate(4529.5, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BehaviorSubject">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="BehaviorSubject">BehaviorSubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
-							<rect x="4785.0" y="321.5" height="31.0" width="149.0" data-name="StreamController"></rect>
-						</g>
-						<g transform="translate(4785, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="JsonFileLoader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JsonFileLoader">
-							<rect x="4929.5" y="45.0" height="123.0" width="319.0" data-name="JsonFileLoader"></rect>
-							<path d="M4929.5 76.0 L5248.5 76.0" fill="none" data-name="JsonFileLoader"></path>
-							<path d="M4929.5 107.0 L5248.5 107.0" fill="none" data-name="JsonFileLoader"></path>
-						</g>
-						<g transform="translate(4929.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonFileLoader">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="JsonFileLoader">JsonFileLoader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4929.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+jsonAssetsPath: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4929.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+dynamic loadJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonMapFromAssets()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonListFromAssets()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CombinedStreamNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CombinedStreamNotifier">
-							<rect x="5138.0" y="290.5" height="93.0" width="435.0" data-name="CombinedStreamNotifier"></rect>
-							<path d="M5138.0 321.5 L5573.0 321.5" fill="none" data-name="CombinedStreamNotifier"></path>
-							<path d="M5138.0 352.5 L5573.0 352.5" fill="none" data-name="CombinedStreamNotifier"></path>
-						</g>
-						<g transform="translate(5138, 290.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CombinedStreamNotifier">
-								<text x="209.5" y="13.5" stroke="none" text-anchor="middle" data-name="CombinedStreamNotifier">CombinedStreamNotifier</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5138, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">-_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5138, 352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChangeNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
-							<rect x="5288.5" y="91.0" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
-						</g>
-						<g transform="translate(5288.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Time">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Time">
-							<rect x="5613.0" y="291.0" height="92.0" width="293.0" data-name="Time"></rect>
-							<path d="M5613.0 322.0 L5906.0 322.0" fill="none" data-name="Time"></path>
-						</g>
-						<g transform="translate(5613, 291)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Time">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Time">
-								<text x="138.5" y="13.5" stroke="none" text-anchor="middle" data-name="Time">Time</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5613, 322)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Time">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Time">
-								<text x="0.0" y="13.5" stroke="none" data-name="Time">&lt;static&gt;+dynamic fromTimeOfDay()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Time">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Time">&lt;static&gt;+Time fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimeOfDay">
-							<rect x="5708.0" y="91.0" height="31.0" width="103.0" data-name="TimeOfDay"></rect>
-						</g>
-						<g transform="translate(5708, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeOfDay">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeOfDay">TimeOfDay</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TimeValueAccessor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimeValueAccessor">
-							<rect x="5946.0" y="291.0" height="92.0" width="297.0" data-name="TimeValueAccessor"></rect>
-							<path d="M5946.0 322.0 L6243.0 322.0" fill="none" data-name="TimeValueAccessor"></path>
-						</g>
-						<g transform="translate(5946, 291)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeValueAccessor">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeValueAccessor">TimeValueAccessor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5946, 322)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimeValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimeValueAccessor">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimeValueAccessor">+String modelToViewValue()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TimeValueAccessor">+Time? viewToModelValue()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TimeValueAccessor">-String _addLeadingZeroIfNeeded()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ControlValueAccessor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ControlValueAccessor">
-							<rect x="5999.0" y="91.0" height="31.0" width="191.0" data-name="ControlValueAccessor"></rect>
-						</g>
-						<g transform="translate(5999, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ControlValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ControlValueAccessor">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="ControlValueAccessor">ControlValueAccessor</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NumericalRangeFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NumericalRangeFormatter">
-							<rect x="6283.0" y="283.0" height="108.0" width="313.0" data-name="NumericalRangeFormatter"></rect>
-							<path d="M6283.0 314.0 L6596.0 314.0" fill="none" data-name="NumericalRangeFormatter"></path>
-							<path d="M6283.0 360.0 L6596.0 360.0" fill="none" data-name="NumericalRangeFormatter"></path>
-						</g>
-						<g transform="translate(6283, 283)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NumericalRangeFormatter">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="NumericalRangeFormatter">NumericalRangeFormatter</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6283, 314)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+min: int?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NumericalRangeFormatter">+max: int?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6283, 360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+TextEditingValue formatEditUpdate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TextInputFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextInputFormatter">
-							<rect x="6533.0" y="91.0" height="31.0" width="166.0" data-name="TextInputFormatter"></rect>
-						</g>
-						<g transform="translate(6533, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TextInputFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextInputFormatter">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextInputFormatter">TextInputFormatter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySequenceFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySequenceFormatter">
-							<rect x="6636.0" y="306.0" height="62.0" width="313.0" data-name="StudySequenceFormatter"></rect>
-							<path d="M6636.0 337.0 L6949.0 337.0" fill="none" data-name="StudySequenceFormatter"></path>
-						</g>
-						<g transform="translate(6636, 306)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySequenceFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySequenceFormatter">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySequenceFormatter">StudySequenceFormatter</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6636, 337)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySequenceFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySequenceFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySequenceFormatter">+TextEditingValue formatEditUpdate()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/flutter_common/lib/src/uml.svg b/docs/uml/flutter_common/lib/src/uml.svg
deleted file mode 100644
index df7946745..000000000
--- a/docs/uml/flutter_common/lib/src/uml.svg
+++ /dev/null
@@ -1,299 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2513.0" height="503.0" viewbox="0 0 2513 503" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[AppLanguage
-	  |
-	  &lt;static&gt;+keyLanguageCode: String;
-	  +supportedLocales: List&lt;Locale&gt;;
-	  -_appLocale: Locale?;
-	  +appLocal: Locale?
-	  |
-	  +dynamic fetchLocale();
-	  +dynamic changeLanguage()
-	]
-	
-	[AppLanguage]o-[Locale]
-	[ChangeNotifier]&lt;:-[AppLanguage]
-	
-	[RetryFutureBuilder
-	  |
-	  +tryFunction: dynamic Function();
-	  +successBuilder: Widget Function(BuildContext, T?);
-	  +initialData: T?;
-	  +loadingBuilder: Widget Function(BuildContext)?;
-	  +errorWidgetBuilder: Widget Function(BuildContext, dynamic, void Function())?;
-	  +extraWidgets: List&lt;Widget&gt;
-	  |
-	  &lt;static&gt;+RetryFutureBuilderState&lt;dynamic&gt;? of()
-	]
-	
-	[RetryFutureBuilder]o-[dynamic Function()]
-	[RetryFutureBuilder]o-[Widget Function(BuildContext, T?)]
-	[RetryFutureBuilder]o-[Widget Function(BuildContext)?]
-	[RetryFutureBuilder]o-[Widget Function(BuildContext, dynamic, void Function())?]
-	
-	[SupabaseStorage
-	  |
-	  +dynamic initialize();
-	  +dynamic hasAccessToken();
-	  +dynamic accessToken();
-	  +dynamic persistSession();
-	  +dynamic removePersistedSession()
-	]
-	
-	[&lt;abstract&gt;LocalStorage]&lt;:-[SupabaseStorage]
-	
-	[SecureStorage
-	  |
-	  &lt;static&gt;+storage: FlutterSecureStorage
-	  |
-	  &lt;static&gt;+dynamic containsKey();
-	  &lt;static&gt;+dynamic write();
-	  &lt;static&gt;+dynamic read();
-	  &lt;static&gt;+dynamic readBool();
-	  &lt;static&gt;+dynamic delete();
-	  &lt;static&gt;+dynamic deleteAll();
-	  &lt;static&gt;+dynamic migrateSharedPreferencesToSecureStorage()
-	]
-	
-	[SecureStorage]o-[FlutterSecureStorage]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="503.0" width="2513.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M147.0 394.7 L147 396 L147 416 L147.0 416.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M152.3 385.3 L147.0 394.7 L141.7 385.3 L147.0 376.0 Z"></path>
-					</g>
-					<path d="M147.0 120.3 L147 203 L147 223 L147.0 223.0 " fill="none"></path>
-					<path d="M152.3 120.3 L147.0 120.3 L141.7 120.3 L147.0 107.0 Z"></path>
-					<path d="M504.9 180.0 L417.5 203 L417.5 284 L417.5 284.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M515.3 182.8 L504.9 180.0 L512.6 172.5 L523.0 175.3 Z"></path>
-					</g>
-					<path d="M707.7 186.3 L684 203 L684 284 L684.0 284.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M718.4 185.2 L707.7 186.3 L712.3 176.5 L723.0 175.5 Z"></path>
-					</g>
-					<path d="M976.3 186.3 L1000 203 L1000 284 L1000.0 284.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M971.7 176.5 L976.3 186.3 L965.6 185.2 L961.0 175.5 Z"></path>
-					</g>
-					<path d="M1179.3 157.9 L1408 203 L1408 284 L1408.0 284.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1171.2 150.9 L1179.3 157.9 L1169.1 161.4 L1161.0 154.3 Z"></path>
-					</g>
-					<path d="M1835.5 120.3 L1835.5 203 L1835.5 238.5 L1835.5 238.5 " fill="none"></path>
-					<path d="M1840.8 120.3 L1835.5 120.3 L1830.2 120.3 L1835.5 107.0 Z"></path>
-					<path d="M2196.5 201.7 L2196.5 203 L2196.5 284 L2196.5 284.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2201.8 192.3 L2196.5 201.7 L2191.2 192.3 L2196.5 183.0 Z"></path>
-					</g>
-					<g data-name="AppLanguage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppLanguage">
-							<rect x="0.0" y="223.0" height="153.0" width="294.0" data-name="AppLanguage"></rect>
-							<path d="M0.0 254.0 L294.0 254.0" fill="none" data-name="AppLanguage"></path>
-							<path d="M0.0 330.0 L294.0 330.0" fill="none" data-name="AppLanguage"></path>
-						</g>
-						<g transform="translate(0, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppLanguage">
-								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppLanguage">AppLanguage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppLanguage">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppLanguage">&lt;static&gt;+keyLanguageCode: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppLanguage">+supportedLocales: List&lt;Locale&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppLanguage">-_appLocale: Locale?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppLanguage">+appLocal: Locale?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 330)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppLanguage">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppLanguage">+dynamic fetchLocale()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppLanguage">+dynamic changeLanguage()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Locale">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Locale">
-							<rect x="112.5" y="416.0" height="31.0" width="69.0" data-name="Locale"></rect>
-						</g>
-						<g transform="translate(112.5, 416)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Locale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Locale">
-								<text x="26.5" y="13.5" stroke="none" text-anchor="middle" data-name="Locale">Locale</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChangeNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
-							<rect x="80.0" y="76.0" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
-						</g>
-						<g transform="translate(80, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RetryFutureBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RetryFutureBuilder">
-							<rect x="523.0" y="7.5" height="168.0" width="638.0" data-name="RetryFutureBuilder"></rect>
-							<path d="M523.0 38.5 L1161.0 38.5" fill="none" data-name="RetryFutureBuilder"></path>
-							<path d="M523.0 144.5 L1161.0 144.5" fill="none" data-name="RetryFutureBuilder"></path>
-						</g>
-						<g transform="translate(523, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RetryFutureBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RetryFutureBuilder">
-								<text x="311.0" y="13.5" stroke="none" text-anchor="middle" data-name="RetryFutureBuilder">RetryFutureBuilder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(523, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RetryFutureBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RetryFutureBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="RetryFutureBuilder">+tryFunction: dynamic Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RetryFutureBuilder">+successBuilder: Widget Function(BuildContext, T?)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RetryFutureBuilder">+initialData: T?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RetryFutureBuilder">+loadingBuilder: Widget Function(BuildContext)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RetryFutureBuilder">+errorWidgetBuilder: Widget Function(BuildContext, dynamic, void Function())?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RetryFutureBuilder">+extraWidgets: List&lt;Widget&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(523, 144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RetryFutureBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RetryFutureBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="RetryFutureBuilder">&lt;static&gt;+RetryFutureBuilderState&lt;dynamic&gt;? of()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="334.0" y="284.0" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(334, 284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, T?)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T?)">
-							<rect x="541.0" y="284.0" height="31.0" width="286.0" data-name="Widget Function(BuildContext, T?)"></rect>
-						</g>
-						<g transform="translate(541, 284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T?)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T?)">
-								<text x="135.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T?)">Widget Function(BuildContext, T?)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
-							<rect x="867.0" y="284.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
-						</g>
-						<g transform="translate(867, 284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, dynamic, void Function())?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, dynamic, void Function())?">
-							<rect x="1173.0" y="284.0" height="31.0" width="470.0" data-name="Widget Function(BuildContext, dynamic, void Function())?"></rect>
-						</g>
-						<g transform="translate(1173, 284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, dynamic, void Function())?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, dynamic, void Function())?">
-								<text x="227.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, dynamic, void Function())?">Widget Function(BuildContext, dynamic, void Function())?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseStorage">
-							<rect x="1683.0" y="238.5" height="122.0" width="305.0" data-name="SupabaseStorage"></rect>
-							<path d="M1683.0 269.5 L1988.0 269.5" fill="none" data-name="SupabaseStorage"></path>
-						</g>
-						<g transform="translate(1683, 238.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseStorage">
-								<text x="144.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseStorage">SupabaseStorage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1683, 269.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseStorage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseStorage">+dynamic initialize()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseStorage">+dynamic hasAccessToken()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseStorage">+dynamic accessToken()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseStorage">+dynamic persistSession()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseStorage">+dynamic removePersistedSession()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LocalStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LocalStorage">
-							<rect x="1775.0" y="76.0" height="31.0" width="121.0" data-name="LocalStorage"></rect>
-						</g>
-						<g transform="translate(1775, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="LocalStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LocalStorage">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="LocalStorage">LocalStorage</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SecureStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SecureStorage">
-							<rect x="1936.0" y="0.0" height="183.0" width="521.0" data-name="SecureStorage"></rect>
-							<path d="M1936.0 31.0 L2457.0 31.0" fill="none" data-name="SecureStorage"></path>
-							<path d="M1936.0 62.0 L2457.0 62.0" fill="none" data-name="SecureStorage"></path>
-						</g>
-						<g transform="translate(1936, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecureStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecureStorage">
-								<text x="252.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecureStorage">SecureStorage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1936, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecureStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecureStorage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+storage: FlutterSecureStorage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1936, 62)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecureStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecureStorage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic containsKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic write()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic readBool()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic deleteAll()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic migrateSharedPreferencesToSecureStorage()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FlutterSecureStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FlutterSecureStorage">
-							<rect x="2104.5" y="284.0" height="31.0" width="184.0" data-name="FlutterSecureStorage"></rect>
-						</g>
-						<g transform="translate(2104.5, 284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FlutterSecureStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FlutterSecureStorage">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="FlutterSecureStorage">FlutterSecureStorage</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/flutter_common/lib/src/utils/uml.svg b/docs/uml/flutter_common/lib/src/utils/uml.svg
deleted file mode 100644
index df7946745..000000000
--- a/docs/uml/flutter_common/lib/src/utils/uml.svg
+++ /dev/null
@@ -1,299 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2513.0" height="503.0" viewbox="0 0 2513 503" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[AppLanguage
-	  |
-	  &lt;static&gt;+keyLanguageCode: String;
-	  +supportedLocales: List&lt;Locale&gt;;
-	  -_appLocale: Locale?;
-	  +appLocal: Locale?
-	  |
-	  +dynamic fetchLocale();
-	  +dynamic changeLanguage()
-	]
-	
-	[AppLanguage]o-[Locale]
-	[ChangeNotifier]&lt;:-[AppLanguage]
-	
-	[RetryFutureBuilder
-	  |
-	  +tryFunction: dynamic Function();
-	  +successBuilder: Widget Function(BuildContext, T?);
-	  +initialData: T?;
-	  +loadingBuilder: Widget Function(BuildContext)?;
-	  +errorWidgetBuilder: Widget Function(BuildContext, dynamic, void Function())?;
-	  +extraWidgets: List&lt;Widget&gt;
-	  |
-	  &lt;static&gt;+RetryFutureBuilderState&lt;dynamic&gt;? of()
-	]
-	
-	[RetryFutureBuilder]o-[dynamic Function()]
-	[RetryFutureBuilder]o-[Widget Function(BuildContext, T?)]
-	[RetryFutureBuilder]o-[Widget Function(BuildContext)?]
-	[RetryFutureBuilder]o-[Widget Function(BuildContext, dynamic, void Function())?]
-	
-	[SupabaseStorage
-	  |
-	  +dynamic initialize();
-	  +dynamic hasAccessToken();
-	  +dynamic accessToken();
-	  +dynamic persistSession();
-	  +dynamic removePersistedSession()
-	]
-	
-	[&lt;abstract&gt;LocalStorage]&lt;:-[SupabaseStorage]
-	
-	[SecureStorage
-	  |
-	  &lt;static&gt;+storage: FlutterSecureStorage
-	  |
-	  &lt;static&gt;+dynamic containsKey();
-	  &lt;static&gt;+dynamic write();
-	  &lt;static&gt;+dynamic read();
-	  &lt;static&gt;+dynamic readBool();
-	  &lt;static&gt;+dynamic delete();
-	  &lt;static&gt;+dynamic deleteAll();
-	  &lt;static&gt;+dynamic migrateSharedPreferencesToSecureStorage()
-	]
-	
-	[SecureStorage]o-[FlutterSecureStorage]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="503.0" width="2513.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M147.0 394.7 L147 396 L147 416 L147.0 416.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M152.3 385.3 L147.0 394.7 L141.7 385.3 L147.0 376.0 Z"></path>
-					</g>
-					<path d="M147.0 120.3 L147 203 L147 223 L147.0 223.0 " fill="none"></path>
-					<path d="M152.3 120.3 L147.0 120.3 L141.7 120.3 L147.0 107.0 Z"></path>
-					<path d="M504.9 180.0 L417.5 203 L417.5 284 L417.5 284.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M515.3 182.8 L504.9 180.0 L512.6 172.5 L523.0 175.3 Z"></path>
-					</g>
-					<path d="M707.7 186.3 L684 203 L684 284 L684.0 284.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M718.4 185.2 L707.7 186.3 L712.3 176.5 L723.0 175.5 Z"></path>
-					</g>
-					<path d="M976.3 186.3 L1000 203 L1000 284 L1000.0 284.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M971.7 176.5 L976.3 186.3 L965.6 185.2 L961.0 175.5 Z"></path>
-					</g>
-					<path d="M1179.3 157.9 L1408 203 L1408 284 L1408.0 284.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1171.2 150.9 L1179.3 157.9 L1169.1 161.4 L1161.0 154.3 Z"></path>
-					</g>
-					<path d="M1835.5 120.3 L1835.5 203 L1835.5 238.5 L1835.5 238.5 " fill="none"></path>
-					<path d="M1840.8 120.3 L1835.5 120.3 L1830.2 120.3 L1835.5 107.0 Z"></path>
-					<path d="M2196.5 201.7 L2196.5 203 L2196.5 284 L2196.5 284.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2201.8 192.3 L2196.5 201.7 L2191.2 192.3 L2196.5 183.0 Z"></path>
-					</g>
-					<g data-name="AppLanguage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppLanguage">
-							<rect x="0.0" y="223.0" height="153.0" width="294.0" data-name="AppLanguage"></rect>
-							<path d="M0.0 254.0 L294.0 254.0" fill="none" data-name="AppLanguage"></path>
-							<path d="M0.0 330.0 L294.0 330.0" fill="none" data-name="AppLanguage"></path>
-						</g>
-						<g transform="translate(0, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppLanguage">
-								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppLanguage">AppLanguage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppLanguage">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppLanguage">&lt;static&gt;+keyLanguageCode: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppLanguage">+supportedLocales: List&lt;Locale&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppLanguage">-_appLocale: Locale?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppLanguage">+appLocal: Locale?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 330)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppLanguage">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppLanguage">+dynamic fetchLocale()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppLanguage">+dynamic changeLanguage()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Locale">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Locale">
-							<rect x="112.5" y="416.0" height="31.0" width="69.0" data-name="Locale"></rect>
-						</g>
-						<g transform="translate(112.5, 416)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Locale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Locale">
-								<text x="26.5" y="13.5" stroke="none" text-anchor="middle" data-name="Locale">Locale</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChangeNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
-							<rect x="80.0" y="76.0" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
-						</g>
-						<g transform="translate(80, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RetryFutureBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RetryFutureBuilder">
-							<rect x="523.0" y="7.5" height="168.0" width="638.0" data-name="RetryFutureBuilder"></rect>
-							<path d="M523.0 38.5 L1161.0 38.5" fill="none" data-name="RetryFutureBuilder"></path>
-							<path d="M523.0 144.5 L1161.0 144.5" fill="none" data-name="RetryFutureBuilder"></path>
-						</g>
-						<g transform="translate(523, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RetryFutureBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RetryFutureBuilder">
-								<text x="311.0" y="13.5" stroke="none" text-anchor="middle" data-name="RetryFutureBuilder">RetryFutureBuilder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(523, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RetryFutureBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RetryFutureBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="RetryFutureBuilder">+tryFunction: dynamic Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RetryFutureBuilder">+successBuilder: Widget Function(BuildContext, T?)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RetryFutureBuilder">+initialData: T?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RetryFutureBuilder">+loadingBuilder: Widget Function(BuildContext)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RetryFutureBuilder">+errorWidgetBuilder: Widget Function(BuildContext, dynamic, void Function())?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RetryFutureBuilder">+extraWidgets: List&lt;Widget&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(523, 144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RetryFutureBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RetryFutureBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="RetryFutureBuilder">&lt;static&gt;+RetryFutureBuilderState&lt;dynamic&gt;? of()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="334.0" y="284.0" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(334, 284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, T?)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T?)">
-							<rect x="541.0" y="284.0" height="31.0" width="286.0" data-name="Widget Function(BuildContext, T?)"></rect>
-						</g>
-						<g transform="translate(541, 284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T?)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T?)">
-								<text x="135.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T?)">Widget Function(BuildContext, T?)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
-							<rect x="867.0" y="284.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
-						</g>
-						<g transform="translate(867, 284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, dynamic, void Function())?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, dynamic, void Function())?">
-							<rect x="1173.0" y="284.0" height="31.0" width="470.0" data-name="Widget Function(BuildContext, dynamic, void Function())?"></rect>
-						</g>
-						<g transform="translate(1173, 284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, dynamic, void Function())?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, dynamic, void Function())?">
-								<text x="227.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, dynamic, void Function())?">Widget Function(BuildContext, dynamic, void Function())?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseStorage">
-							<rect x="1683.0" y="238.5" height="122.0" width="305.0" data-name="SupabaseStorage"></rect>
-							<path d="M1683.0 269.5 L1988.0 269.5" fill="none" data-name="SupabaseStorage"></path>
-						</g>
-						<g transform="translate(1683, 238.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseStorage">
-								<text x="144.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseStorage">SupabaseStorage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1683, 269.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseStorage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseStorage">+dynamic initialize()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseStorage">+dynamic hasAccessToken()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseStorage">+dynamic accessToken()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseStorage">+dynamic persistSession()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseStorage">+dynamic removePersistedSession()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LocalStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LocalStorage">
-							<rect x="1775.0" y="76.0" height="31.0" width="121.0" data-name="LocalStorage"></rect>
-						</g>
-						<g transform="translate(1775, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="LocalStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LocalStorage">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="LocalStorage">LocalStorage</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SecureStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SecureStorage">
-							<rect x="1936.0" y="0.0" height="183.0" width="521.0" data-name="SecureStorage"></rect>
-							<path d="M1936.0 31.0 L2457.0 31.0" fill="none" data-name="SecureStorage"></path>
-							<path d="M1936.0 62.0 L2457.0 62.0" fill="none" data-name="SecureStorage"></path>
-						</g>
-						<g transform="translate(1936, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecureStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecureStorage">
-								<text x="252.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecureStorage">SecureStorage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1936, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecureStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecureStorage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+storage: FlutterSecureStorage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1936, 62)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecureStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecureStorage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic containsKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic write()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic readBool()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic deleteAll()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic migrateSharedPreferencesToSecureStorage()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FlutterSecureStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FlutterSecureStorage">
-							<rect x="2104.5" y="284.0" height="31.0" width="184.0" data-name="FlutterSecureStorage"></rect>
-						</g>
-						<g transform="translate(2104.5, 284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FlutterSecureStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FlutterSecureStorage">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="FlutterSecureStorage">FlutterSecureStorage</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/flutter_common/lib/uml.svg b/docs/uml/flutter_common/lib/uml.svg
deleted file mode 100644
index df7946745..000000000
--- a/docs/uml/flutter_common/lib/uml.svg
+++ /dev/null
@@ -1,299 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2513.0" height="503.0" viewbox="0 0 2513 503" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[AppLanguage
-	  |
-	  &lt;static&gt;+keyLanguageCode: String;
-	  +supportedLocales: List&lt;Locale&gt;;
-	  -_appLocale: Locale?;
-	  +appLocal: Locale?
-	  |
-	  +dynamic fetchLocale();
-	  +dynamic changeLanguage()
-	]
-	
-	[AppLanguage]o-[Locale]
-	[ChangeNotifier]&lt;:-[AppLanguage]
-	
-	[RetryFutureBuilder
-	  |
-	  +tryFunction: dynamic Function();
-	  +successBuilder: Widget Function(BuildContext, T?);
-	  +initialData: T?;
-	  +loadingBuilder: Widget Function(BuildContext)?;
-	  +errorWidgetBuilder: Widget Function(BuildContext, dynamic, void Function())?;
-	  +extraWidgets: List&lt;Widget&gt;
-	  |
-	  &lt;static&gt;+RetryFutureBuilderState&lt;dynamic&gt;? of()
-	]
-	
-	[RetryFutureBuilder]o-[dynamic Function()]
-	[RetryFutureBuilder]o-[Widget Function(BuildContext, T?)]
-	[RetryFutureBuilder]o-[Widget Function(BuildContext)?]
-	[RetryFutureBuilder]o-[Widget Function(BuildContext, dynamic, void Function())?]
-	
-	[SupabaseStorage
-	  |
-	  +dynamic initialize();
-	  +dynamic hasAccessToken();
-	  +dynamic accessToken();
-	  +dynamic persistSession();
-	  +dynamic removePersistedSession()
-	]
-	
-	[&lt;abstract&gt;LocalStorage]&lt;:-[SupabaseStorage]
-	
-	[SecureStorage
-	  |
-	  &lt;static&gt;+storage: FlutterSecureStorage
-	  |
-	  &lt;static&gt;+dynamic containsKey();
-	  &lt;static&gt;+dynamic write();
-	  &lt;static&gt;+dynamic read();
-	  &lt;static&gt;+dynamic readBool();
-	  &lt;static&gt;+dynamic delete();
-	  &lt;static&gt;+dynamic deleteAll();
-	  &lt;static&gt;+dynamic migrateSharedPreferencesToSecureStorage()
-	]
-	
-	[SecureStorage]o-[FlutterSecureStorage]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="503.0" width="2513.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M147.0 394.7 L147 396 L147 416 L147.0 416.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M152.3 385.3 L147.0 394.7 L141.7 385.3 L147.0 376.0 Z"></path>
-					</g>
-					<path d="M147.0 120.3 L147 203 L147 223 L147.0 223.0 " fill="none"></path>
-					<path d="M152.3 120.3 L147.0 120.3 L141.7 120.3 L147.0 107.0 Z"></path>
-					<path d="M504.9 180.0 L417.5 203 L417.5 284 L417.5 284.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M515.3 182.8 L504.9 180.0 L512.6 172.5 L523.0 175.3 Z"></path>
-					</g>
-					<path d="M707.7 186.3 L684 203 L684 284 L684.0 284.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M718.4 185.2 L707.7 186.3 L712.3 176.5 L723.0 175.5 Z"></path>
-					</g>
-					<path d="M976.3 186.3 L1000 203 L1000 284 L1000.0 284.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M971.7 176.5 L976.3 186.3 L965.6 185.2 L961.0 175.5 Z"></path>
-					</g>
-					<path d="M1179.3 157.9 L1408 203 L1408 284 L1408.0 284.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1171.2 150.9 L1179.3 157.9 L1169.1 161.4 L1161.0 154.3 Z"></path>
-					</g>
-					<path d="M1835.5 120.3 L1835.5 203 L1835.5 238.5 L1835.5 238.5 " fill="none"></path>
-					<path d="M1840.8 120.3 L1835.5 120.3 L1830.2 120.3 L1835.5 107.0 Z"></path>
-					<path d="M2196.5 201.7 L2196.5 203 L2196.5 284 L2196.5 284.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2201.8 192.3 L2196.5 201.7 L2191.2 192.3 L2196.5 183.0 Z"></path>
-					</g>
-					<g data-name="AppLanguage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppLanguage">
-							<rect x="0.0" y="223.0" height="153.0" width="294.0" data-name="AppLanguage"></rect>
-							<path d="M0.0 254.0 L294.0 254.0" fill="none" data-name="AppLanguage"></path>
-							<path d="M0.0 330.0 L294.0 330.0" fill="none" data-name="AppLanguage"></path>
-						</g>
-						<g transform="translate(0, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppLanguage">
-								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppLanguage">AppLanguage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppLanguage">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppLanguage">&lt;static&gt;+keyLanguageCode: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppLanguage">+supportedLocales: List&lt;Locale&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppLanguage">-_appLocale: Locale?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppLanguage">+appLocal: Locale?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 330)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppLanguage">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppLanguage">+dynamic fetchLocale()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppLanguage">+dynamic changeLanguage()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Locale">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Locale">
-							<rect x="112.5" y="416.0" height="31.0" width="69.0" data-name="Locale"></rect>
-						</g>
-						<g transform="translate(112.5, 416)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Locale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Locale">
-								<text x="26.5" y="13.5" stroke="none" text-anchor="middle" data-name="Locale">Locale</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChangeNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
-							<rect x="80.0" y="76.0" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
-						</g>
-						<g transform="translate(80, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RetryFutureBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RetryFutureBuilder">
-							<rect x="523.0" y="7.5" height="168.0" width="638.0" data-name="RetryFutureBuilder"></rect>
-							<path d="M523.0 38.5 L1161.0 38.5" fill="none" data-name="RetryFutureBuilder"></path>
-							<path d="M523.0 144.5 L1161.0 144.5" fill="none" data-name="RetryFutureBuilder"></path>
-						</g>
-						<g transform="translate(523, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RetryFutureBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RetryFutureBuilder">
-								<text x="311.0" y="13.5" stroke="none" text-anchor="middle" data-name="RetryFutureBuilder">RetryFutureBuilder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(523, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RetryFutureBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RetryFutureBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="RetryFutureBuilder">+tryFunction: dynamic Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RetryFutureBuilder">+successBuilder: Widget Function(BuildContext, T?)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RetryFutureBuilder">+initialData: T?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RetryFutureBuilder">+loadingBuilder: Widget Function(BuildContext)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RetryFutureBuilder">+errorWidgetBuilder: Widget Function(BuildContext, dynamic, void Function())?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RetryFutureBuilder">+extraWidgets: List&lt;Widget&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(523, 144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RetryFutureBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RetryFutureBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="RetryFutureBuilder">&lt;static&gt;+RetryFutureBuilderState&lt;dynamic&gt;? of()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="334.0" y="284.0" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(334, 284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, T?)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T?)">
-							<rect x="541.0" y="284.0" height="31.0" width="286.0" data-name="Widget Function(BuildContext, T?)"></rect>
-						</g>
-						<g transform="translate(541, 284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T?)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T?)">
-								<text x="135.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T?)">Widget Function(BuildContext, T?)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
-							<rect x="867.0" y="284.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
-						</g>
-						<g transform="translate(867, 284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, dynamic, void Function())?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, dynamic, void Function())?">
-							<rect x="1173.0" y="284.0" height="31.0" width="470.0" data-name="Widget Function(BuildContext, dynamic, void Function())?"></rect>
-						</g>
-						<g transform="translate(1173, 284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, dynamic, void Function())?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, dynamic, void Function())?">
-								<text x="227.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, dynamic, void Function())?">Widget Function(BuildContext, dynamic, void Function())?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseStorage">
-							<rect x="1683.0" y="238.5" height="122.0" width="305.0" data-name="SupabaseStorage"></rect>
-							<path d="M1683.0 269.5 L1988.0 269.5" fill="none" data-name="SupabaseStorage"></path>
-						</g>
-						<g transform="translate(1683, 238.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseStorage">
-								<text x="144.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseStorage">SupabaseStorage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1683, 269.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseStorage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseStorage">+dynamic initialize()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseStorage">+dynamic hasAccessToken()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseStorage">+dynamic accessToken()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseStorage">+dynamic persistSession()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseStorage">+dynamic removePersistedSession()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LocalStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LocalStorage">
-							<rect x="1775.0" y="76.0" height="31.0" width="121.0" data-name="LocalStorage"></rect>
-						</g>
-						<g transform="translate(1775, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="LocalStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LocalStorage">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="LocalStorage">LocalStorage</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SecureStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SecureStorage">
-							<rect x="1936.0" y="0.0" height="183.0" width="521.0" data-name="SecureStorage"></rect>
-							<path d="M1936.0 31.0 L2457.0 31.0" fill="none" data-name="SecureStorage"></path>
-							<path d="M1936.0 62.0 L2457.0 62.0" fill="none" data-name="SecureStorage"></path>
-						</g>
-						<g transform="translate(1936, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecureStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecureStorage">
-								<text x="252.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecureStorage">SecureStorage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1936, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecureStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecureStorage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+storage: FlutterSecureStorage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1936, 62)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecureStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecureStorage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic containsKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic write()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic readBool()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic deleteAll()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic migrateSharedPreferencesToSecureStorage()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FlutterSecureStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FlutterSecureStorage">
-							<rect x="2104.5" y="284.0" height="31.0" width="184.0" data-name="FlutterSecureStorage"></rect>
-						</g>
-						<g transform="translate(2104.5, 284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FlutterSecureStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FlutterSecureStorage">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="FlutterSecureStorage">FlutterSecureStorage</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file

From b33c518e92dc81f1892bb3decc77634acb787150 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 10:39:52 +0200
Subject: [PATCH 044/314] chore: remove docs from ci

---
 .github/workflows/mega-linter.yml    | 3 ---
 .github/workflows/ready_to_merge.yml | 1 -
 2 files changed, 4 deletions(-)

diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml
index 68b464354..231402212 100644
--- a/.github/workflows/mega-linter.yml
+++ b/.github/workflows/mega-linter.yml
@@ -9,9 +9,6 @@ on:
   # Comment this line to trigger action only on pull-requests
   # (not recommended if you don't pay for GH Actions)
   push:
-    paths-ignore:
-      - 'docs/database/**'
-      - 'docs/uml/**'
   workflow_dispatch:
 
 # Comment env block if you do not want to apply fixes
diff --git a/.github/workflows/ready_to_merge.yml b/.github/workflows/ready_to_merge.yml
index 6e2cf9133..9da546d6f 100644
--- a/.github/workflows/ready_to_merge.yml
+++ b/.github/workflows/ready_to_merge.yml
@@ -22,7 +22,6 @@ jobs:
               "mega-linter.yml",
               "e2e_tests.yml",
               "supabase-test.yml",
-              "uml-docs.yml",
             ];
             console.log("Initializing with workflows to check: " + workflows_to_check);
             const { owner, repo } = context.repo;

From 0e0a098dded9d7620127ba312bd18e3e006a7ce6 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 10:40:53 +0200
Subject: [PATCH 045/314] chore: remove docs directory

---
 docs/uml/app/lib/uml.svg                      | 4439 ---------------
 docs/uml/app/lib/util/uml.svg                 |  448 --
 .../shared/questionnaire/question/uml.svg     | 1066 ----
 .../design/shared/questionnaire/uml.svg       | 1218 -----
 .../lib/features/design/shared/uml.svg        | 1418 -----
 .../designer_v2/lib/features/design/uml.svg   | 4822 -----------------
 6 files changed, 13411 deletions(-)
 delete mode 100644 docs/uml/app/lib/uml.svg
 delete mode 100644 docs/uml/app/lib/util/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/shared/questionnaire/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/shared/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/uml.svg

diff --git a/docs/uml/app/lib/uml.svg b/docs/uml/app/lib/uml.svg
deleted file mode 100644
index befab00ad..000000000
--- a/docs/uml/app/lib/uml.svg
+++ /dev/null
@@ -1,4439 +0,0 @@
-<svg version="1.1" baseProfile="full" width="23935.3" height="1221.0" viewbox="0 0 23935.25 1221" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[AboutScreen
-	  |
-	  +Widget build()
-	]
-	
-	[WelcomeScreen
-	  |
-	  +Widget build()
-	]
-	
-	[Preview
-	  |
-	  +queryParameters: Map&lt;String, String&gt;?;
-	  +appLanguage: AppLanguage;
-	  +selectedRoute: String?;
-	  +extra: String?;
-	  +study: Study?;
-	  +selectedStudyObjectId: String?;
-	  +subject: StudySubject?
-	  |
-	  +bool hasRoute();
-	  +void handleQueries();
-	  +dynamic init();
-	  +dynamic handleAuthorization();
-	  +dynamic runCommands();
-	  +String? getSelectedRoute();
-	  +bool containsQuery();
-	  +bool containsQueryPair();
-	  +dynamic getStudySubject();
-	  -dynamic _createFakeSubject();
-	  +List&lt;String&gt; getInterventionIds()
-	]
-	
-	[Preview]o-[AppLanguage]
-	[Preview]o-[Study]
-	[Preview]o-[StudySubject]
-	
-	[IFrameHelper
-	  |
-	  +void postRouteFinished();
-	  +void listen()
-	]
-	
-	[TermsScreen
-	]
-	
-	[LegalSection
-	  |
-	  +title: String?;
-	  +description: String?;
-	  +icon: Icon?;
-	  +pdfUrl: String?;
-	  +pdfUrlLabel: String?;
-	  +acknowledgment: String?;
-	  +isChecked: bool?;
-	  +onChange: void Function(bool?)?
-	  |
-	  +Widget build()
-	]
-	
-	[LegalSection]o-[Icon]
-	[LegalSection]o-[void Function(bool?)?]
-	
-	[AppOutdatedScreen
-	  |
-	  +Widget build()
-	]
-	
-	[LoadingScreen
-	  |
-	  +sessionString: String?;
-	  +queryParameters: Map&lt;String, String&gt;?
-	]
-	
-	[QuestionnaireTaskWidget
-	  |
-	  +task: QuestionnaireTask;
-	  +completionPeriod: CompletionPeriod
-	]
-	
-	[QuestionnaireTaskWidget]o-[QuestionnaireTask]
-	[QuestionnaireTaskWidget]o-[CompletionPeriod]
-	
-	[TaskScreen
-	  |
-	  +taskInstance: TaskInstance
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()
-	]
-	
-	[TaskScreen]o-[TaskInstance]
-	
-	[CheckmarkTaskWidget
-	  |
-	  +task: CheckmarkTask?;
-	  +completionPeriod: CompletionPeriod?
-	]
-	
-	[CheckmarkTaskWidget]o-[CheckmarkTask]
-	[CheckmarkTaskWidget]o-[CompletionPeriod]
-	
-	[CapturePictureScreen
-	  |
-	  +userId: String;
-	  +studyId: String
-	]
-	
-	[EligibilityResult
-	  |
-	  +eligible: bool;
-	  +firstFailed: EligibilityCriterion?
-	]
-	
-	[EligibilityResult]o-[EligibilityCriterion]
-	
-	[EligibilityScreen
-	  |
-	  +study: Study?
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;EligibilityResult&gt; routeFor()
-	]
-	
-	[EligibilityScreen]o-[Study]
-	
-	[InterventionSelectionScreen
-	]
-	
-	[StudyOverviewScreen
-	]
-	
-	[_StudyOverviewScreen
-	  |
-	  +study: Study?
-	  |
-	  +dynamic navigateToJourney();
-	  +dynamic navigateToEligibilityCheck();
-	  +Widget build()
-	]
-	
-	[_StudyOverviewScreen]o-[Study]
-	
-	[StudyDetailsView
-	  |
-	  +study: Study?;
-	  +iconSize: double
-	  |
-	  +Widget build()
-	]
-	
-	[StudyDetailsView]o-[Study]
-	
-	[JourneyOverviewScreen
-	]
-	
-	[_JourneyOverviewScreen
-	  |
-	  +subject: StudySubject?
-	  |
-	  +dynamic getConsentAndNavigateToDashboard();
-	  +Widget build()
-	]
-	
-	[_JourneyOverviewScreen]o-[StudySubject]
-	
-	[Timeline
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[Timeline]o-[StudySubject]
-	
-	[InterventionTile
-	  |
-	  +title: String?;
-	  +iconName: String;
-	  +date: DateTime;
-	  +color: Color?;
-	  +isFirst: bool;
-	  +isLast: bool
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionTile]o-[Color]
-	
-	[IconIndicator
-	  |
-	  +iconName: String;
-	  +color: Color?
-	  |
-	  +Widget build()
-	]
-	
-	[IconIndicator]o-[Color]
-	
-	[TimelineChild
-	  |
-	  +child: Widget?
-	  |
-	  +Widget build()
-	]
-	
-	[TimelineChild]o-[&lt;abstract&gt;Widget]
-	
-	[KickoffScreen
-	]
-	
-	[_KickoffScreen
-	  |
-	  +subject: StudySubject?;
-	  +ready: bool
-	  |
-	  -dynamic _storeUserStudy();
-	  -Widget _constructStatusIcon();
-	  -String _getStatusText();
-	  +Widget build()
-	]
-	
-	[_KickoffScreen]o-[StudySubject]
-	
-	[ConsentScreen
-	]
-	
-	[ConsentCard
-	  |
-	  +consent: ConsentItem?;
-	  +index: int?;
-	  +onTapped: dynamic Function(int);
-	  +isChecked: bool?
-	  |
-	  +Widget build()
-	]
-	
-	[ConsentCard]o-[ConsentItem]
-	[ConsentCard]o-[dynamic Function(int)]
-	
-	[ConsentElement
-	  |
-	  +title: String;
-	  +descriptionText: String;
-	  +acknowledgmentText: String;
-	  +icon: IconData
-	]
-	
-	[ConsentElement]o-[IconData]
-	
-	[StudySelectionScreen
-	]
-	
-	[InviteCodeDialog
-	]
-	
-	[OnboardingProgress
-	  |
-	  +stage: int;
-	  +progress: double
-	  |
-	  -double _getProgressForStage();
-	  +Widget build()
-	]
-	
-	[ReportDetailsScreen
-	  |
-	  +subject: StudySubject
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor();
-	  +Widget build()
-	]
-	
-	[ReportDetailsScreen]o-[StudySubject]
-	
-	[GeneralDetailsSection
-	  |
-	  +Widget buildContent()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[GeneralDetailsSection]
-	
-	[ReportHistoryScreen
-	  |
-	  +Widget build()
-	]
-	
-	[ReportHistoryItem
-	  |
-	  +subject: StudySubject
-	  |
-	  +Widget build()
-	]
-	
-	[ReportHistoryItem]o-[StudySubject]
-	
-	[LegendWidget
-	  |
-	  +name: String;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[LegendWidget]o-[Color]
-	
-	[LegendsListWidget
-	  |
-	  +legends: List&lt;Legend&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[Legend
-	  |
-	  +name: String;
-	  +color: Color
-	]
-	
-	[Legend]o-[Color]
-	
-	[PerformanceDetailsScreen
-	  |
-	  +reportSubject: StudySubject?
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor();
-	  +Widget build()
-	]
-	
-	[PerformanceDetailsScreen]o-[StudySubject]
-	
-	[InterventionPerformanceBar
-	  |
-	  +intervention: Intervention;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPerformanceBar]o-[Intervention]
-	[InterventionPerformanceBar]o-[StudySubject]
-	
-	[ObservationPerformanceBar
-	  |
-	  +observation: Observation;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[ObservationPerformanceBar]o-[&lt;abstract&gt;Observation]
-	[ObservationPerformanceBar]o-[StudySubject]
-	
-	[PerformanceBar
-	  |
-	  +task: Task;
-	  +completed: int;
-	  +total: int
-	  |
-	  +Widget build()
-	]
-	
-	[PerformanceBar]o-[&lt;abstract&gt;Task]
-	
-	[PerformanceSection
-	  |
-	  +minimumRatio: double;
-	  +maximum: double
-	  |
-	  +Widget buildContent();
-	  +String getPowerLevelDescription();
-	  +int getCountableObservationAmount()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[PerformanceSection]
-	
-	[PerformanceBar
-	  |
-	  +progress: double;
-	  +minimum: double?
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;ReportSectionWidget
-	  |
-	  +subject: StudySubject
-	]
-	
-	[&lt;abstract&gt;ReportSectionWidget]o-[StudySubject]
-	
-	[&lt;abstract&gt;GenericSection
-	  |
-	  +subject: StudySubject?;
-	  +onTap: void Function()?
-	  |
-	  +Widget buildContent();
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;GenericSection]o-[StudySubject]
-	[&lt;abstract&gt;GenericSection]o-[void Function()?]
-	
-	[AverageSectionWidget
-	  |
-	  +section: AverageSection;
-	  +titlePos: List&lt;int&gt;;
-	  +phasePos: List&lt;int&gt;
-	  |
-	  +Widget build();
-	  +Widget getLegend();
-	  +Widget getDiagram();
-	  +BarChartData getChartData();
-	  +Widget getTitles();
-	  +Widget getValues();
-	  +List&lt;BarChartGroupData&gt; getBarGroups();
-	  +FlGridData getGridData();
-	  +MaterialColor getColor();
-	  +int getDayIndex();
-	  +Iterable&lt;DiagramDatum&gt; getAggregatedData();
-	  +Map&lt;String, String?&gt; getInterventionNames()
-	]
-	
-	[AverageSectionWidget]o-[AverageSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[AverageSectionWidget]
-	
-	[DiagramDatum
-	  |
-	  +x: num;
-	  +value: num;
-	  +timestamp: DateTime?;
-	  +intervention: String
-	]
-	
-	[LinearRegressionSectionWidget
-	  |
-	  +section: LinearRegressionSection
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionWidget]o-[LinearRegressionSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[LinearRegressionSectionWidget]
-	
-	[ReportSectionContainer
-	  |
-	  +section: ReportSection;
-	  +subject: StudySubject;
-	  +primary: bool;
-	  +onTap: void Function()?
-	  |
-	  +ReportSectionWidget buildContents();
-	  +dynamic ();
-	  +List&lt;Widget&gt; buildPrimaryHeader();
-	  +Widget build()
-	]
-	
-	[ReportSectionContainer]o-[&lt;abstract&gt;ReportSection]
-	[ReportSectionContainer]o-[StudySubject]
-	[ReportSectionContainer]o-[void Function()?]
-	
-	[DisclaimerSection
-	  |
-	  +Widget buildContent()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[DisclaimerSection]
-	
-	[Settings
-	]
-	
-	[OptOutAlertDialog
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[OptOutAlertDialog]o-[StudySubject]
-	
-	[DeleteAlertDialog
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[DeleteAlertDialog]o-[StudySubject]
-	
-	[FAQ
-	  |
-	  +Widget build()
-	]
-	
-	[Entry
-	  |
-	  +title: String;
-	  +children: List&lt;Entry&gt;
-	]
-	
-	[EntryItem
-	  |
-	  +entry: Entry
-	  |
-	  -Widget _buildTiles();
-	  +Widget build()
-	]
-	
-	[EntryItem]o-[Entry]
-	
-	[ContactScreen
-	]
-	
-	[ContactWidget
-	  |
-	  +contact: Contact?;
-	  +title: String;
-	  +subtitle: String?;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[ContactWidget]o-[Contact]
-	[ContactWidget]o-[Color]
-	
-	[ContactItem
-	  |
-	  +iconData: IconData;
-	  +itemName: String;
-	  +itemValue: String?;
-	  +type: ContactItemType?;
-	  +iconColor: Color?
-	  |
-	  +dynamic launchContact();
-	  +Widget build()
-	]
-	
-	[ContactItem]o-[IconData]
-	[ContactItem]o-[ContactItemType]
-	[ContactItem]o-[Color]
-	
-	[ContactItemType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ContactItemType&gt;;
-	  &lt;static&gt;+website: ContactItemType;
-	  &lt;static&gt;+email: ContactItemType;
-	  &lt;static&gt;+phone: ContactItemType
-	]
-	
-	[ContactItemType]o-[ContactItemType]
-	[Enum]&lt;:--[ContactItemType]
-	
-	[DashboardScreen
-	  |
-	  +error: String?
-	]
-	
-	[OverflowMenuItem
-	  |
-	  +name: String;
-	  +icon: IconData;
-	  +routeName: String?;
-	  +onTap: dynamic Function()?
-	]
-	
-	[OverflowMenuItem]o-[IconData]
-	[OverflowMenuItem]o-[dynamic Function()?]
-	
-	[StudyFinishedPlaceholder
-	  |
-	  &lt;static&gt;+space: SizedBox
-	  |
-	  +Widget build()
-	]
-	
-	[StudyFinishedPlaceholder]o-[SizedBox]
-	
-	[TaskOverview
-	  |
-	  +subject: StudySubject?;
-	  +scheduleToday: List&lt;TaskInstance&gt;?;
-	  +interventionIcon: String?
-	]
-	
-	[TaskOverview]o-[StudySubject]
-	
-	[ProgressRow
-	  |
-	  +subject: StudySubject?
-	]
-	
-	[ProgressRow]o-[StudySubject]
-	
-	[InterventionSegment
-	  |
-	  +intervention: Intervention;
-	  +percentCompleted: double;
-	  +percentMissed: double;
-	  +isCurrent: bool;
-	  +isFuture: bool;
-	  +phaseDuration: int
-	  |
-	  +List&lt;Widget&gt; buildSeparators();
-	  +Widget build()
-	]
-	
-	[InterventionSegment]o-[Intervention]
-	
-	[TaskBox
-	  |
-	  +taskInstance: TaskInstance;
-	  +icon: Icon;
-	  +onCompleted: dynamic Function()
-	]
-	
-	[TaskBox]o-[TaskInstance]
-	[TaskBox]o-[Icon]
-	[TaskBox]o-[dynamic Function()]
-	
-	[Routes
-	  |
-	  &lt;static&gt;+loading: String;
-	  &lt;static&gt;+preview: String;
-	  &lt;static&gt;+appOutdated: String;
-	  &lt;static&gt;+dashboard: String;
-	  &lt;static&gt;+welcome: String;
-	  &lt;static&gt;+about: String;
-	  &lt;static&gt;+terms: String;
-	  &lt;static&gt;+studySelection: String;
-	  &lt;static&gt;+studyOverview: String;
-	  &lt;static&gt;+interventionSelection: String;
-	  &lt;static&gt;+journey: String;
-	  &lt;static&gt;+consent: String;
-	  &lt;static&gt;+kickoff: String;
-	  &lt;static&gt;+contact: String;
-	  &lt;static&gt;+faq: String;
-	  &lt;static&gt;+appSettings: String;
-	  &lt;static&gt;+questionnaire: String;
-	  &lt;static&gt;+reportHistory: String;
-	  &lt;static&gt;+reportDetails: String;
-	  &lt;static&gt;+performanceDetails: String
-	  |
-	  &lt;static&gt;+Route&lt;dynamic&gt; unknownRoute();
-	  &lt;static&gt;+Route&lt;dynamic&gt;? generateRoute()
-	]
-	
-	[NotificationValidators
-	  |
-	  +didNotificationLaunchApp: bool;
-	  +wasNotificationActionHandled: bool;
-	  +wasNotificationActionCompleted: bool
-	]
-	
-	[StudyNotifications
-	  |
-	  +subject: StudySubject?;
-	  +flutterLocalNotificationsPlugin: FlutterLocalNotificationsPlugin;
-	  +context: BuildContext;
-	  +didReceiveLocalNotificationStream: StreamController&lt;ReceivedNotification&gt;;
-	  +selectNotificationStream: StreamController&lt;String?&gt;;
-	  &lt;static&gt;+validator: NotificationValidators;
-	  &lt;static&gt;+debug: bool;
-	  &lt;static&gt;+scheduledNotificationsDebug: String?
-	  |
-	  &lt;static&gt;+dynamic create();
-	  -dynamic _isAndroidPermissionGranted();
-	  -dynamic _requestPermissions();
-	  -void _configureDidReceiveLocalNotificationSubject();
-	  -void _configureSelectNotificationSubject();
-	  -void _initNotificationsPlugin();
-	  +dynamic handleNotificationResponse()
-	]
-	
-	[StudyNotifications]o-[StudySubject]
-	[StudyNotifications]o-[FlutterLocalNotificationsPlugin]
-	[StudyNotifications]o-[&lt;abstract&gt;BuildContext]
-	[StudyNotifications]o-[StreamController]
-	[StudyNotifications]o-[NotificationValidators]
-	
-	[ReceivedNotification
-	  |
-	  +id: int?;
-	  +title: String?;
-	  +body: String?;
-	  +payload: String?
-	]
-	
-	[StudyNotification
-	  |
-	  +taskInstance: TaskInstance;
-	  +date: DateTime
-	]
-	
-	[StudyNotification]o-[TaskInstance]
-	
-	[TemporaryStorageHandler
-	  |
-	  &lt;static&gt;-_stagingBaseNamePrefix: String;
-	  &lt;static&gt;-_audioFileType: String;
-	  &lt;static&gt;-_imageFileType: String;
-	  -_userId: String;
-	  -_studyId: String
-	  |
-	  -String _buildFileName();
-	  &lt;static&gt;-dynamic _getMultimodalTempDirectory();
-	  &lt;static&gt;-dynamic _getMultimodalUploadDirectory();
-	  &lt;static&gt;+dynamic moveStagingFileToUploadDirectory();
-	  &lt;static&gt;+dynamic getFutureBlobFiles();
-	  +dynamic getStagingAudio();
-	  +dynamic getStagingImage();
-	  &lt;static&gt;+dynamic deleteAllStagingFiles()
-	]
-	
-	[GroupedIterable
-	  |
-	  +data: Map&lt;K, Iterable&lt;V&gt;&gt;;
-	  +iterator: Iterator&lt;MapEntry&lt;K, Iterable&lt;V&gt;&gt;&gt;
-	  |
-	  +Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregate();
-	  +Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregateWithKey()
-	]
-	
-	[Iterable]&lt;:-[GroupedIterable]
-	
-	[Cache
-	  |
-	  &lt;static&gt;+isSynchronizing: bool
-	  |
-	  &lt;static&gt;+dynamic storeSubject();
-	  &lt;static&gt;+dynamic loadSubject();
-	  &lt;static&gt;+dynamic storeAnalytics();
-	  &lt;static&gt;+dynamic loadAnalytics();
-	  &lt;static&gt;+dynamic delete();
-	  &lt;static&gt;+dynamic uploadBlobFiles();
-	  &lt;static&gt;+dynamic synchronize()
-	]
-	
-	[AppAnalytics
-	  |
-	  &lt;static&gt;-_userEnabled: bool?;
-	  &lt;static&gt;+keyAnalyticsUserEnable: String;
-	  +context: BuildContext;
-	  +subject: StudySubject?;
-	  &lt;static&gt;+isUserEnabled: dynamic
-	  |
-	  &lt;static&gt;+dynamic init();
-	  &lt;static&gt;+dynamic start();
-	  &lt;static&gt;+void setEnabled();
-	  +dynamic initBasic();
-	  +void initAdvanced()
-	]
-	
-	[AppAnalytics]o-[&lt;abstract&gt;BuildContext]
-	[AppAnalytics]o-[StudySubject]
-	
-	[ThemeConfig
-	  |
-	  &lt;static&gt;+SliderThemeData coloredSliderTheme()
-	]
-	
-	[ScaleQuestionWidget
-	  |
-	  +question: ScaleQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[ScaleQuestionWidget]o-[ScaleQuestion]
-	[ScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ScaleQuestionWidget]
-	
-	[VisualAnalogueQuestionWidget
-	  |
-	  +question: VisualAnalogueQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[VisualAnalogueQuestionWidget]o-[VisualAnalogueQuestion]
-	[VisualAnalogueQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[VisualAnalogueQuestionWidget]
-	
-	[AnnotatedScaleQuestionWidget
-	  |
-	  +question: AnnotatedScaleQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[AnnotatedScaleQuestionWidget]o-[AnnotatedScaleQuestion]
-	[AnnotatedScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[AnnotatedScaleQuestionWidget]
-	
-	[BooleanQuestionWidget
-	  |
-	  +question: BooleanQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[BooleanQuestionWidget]o-[BooleanQuestion]
-	[BooleanQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[BooleanQuestionWidget]
-	
-	[FreeTextQuestionWidget
-	  |
-	  +question: FreeTextQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[FreeTextQuestionWidget]o-[FreeTextQuestion]
-	[FreeTextQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[FreeTextQuestionWidget]
-	
-	[&lt;abstract&gt;QuestionWidget
-	  |
-	  +subtitle: String?
-	]
-	
-	[ChoiceQuestionWidget
-	  |
-	  +question: ChoiceQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;);
-	  +multiSelectionText: String;
-	  +subtitle: String?
-	]
-	
-	[ChoiceQuestionWidget]o-[ChoiceQuestion]
-	[ChoiceQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ChoiceQuestionWidget]
-	
-	[AudioRecordingQuestionWidget
-	  |
-	  +question: AudioRecordingQuestion;
-	  +onDone: dynamic Function(Answer&lt;FutureBlobFile&gt;)?
-	]
-	
-	[AudioRecordingQuestionWidget]o-[AudioRecordingQuestion]
-	[AudioRecordingQuestionWidget]o-[dynamic Function(Answer&lt;FutureBlobFile&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[AudioRecordingQuestionWidget]
-	
-	[QuestionnaireWidget
-	  |
-	  +title: String?;
-	  +header: String?;
-	  +footer: String?;
-	  +questions: List&lt;Question&lt;dynamic&gt;&gt;
-	]
-	
-	[HtmlTextBox
-	  |
-	  +text: String?
-	  |
-	  +Widget build()
-	]
-	
-	[ImageCapturingQuestionWidget
-	  |
-	  +question: ImageCapturingQuestion;
-	  +onDone: dynamic Function(Answer&lt;FutureBlobFile&gt;)?
-	]
-	
-	[ImageCapturingQuestionWidget]o-[ImageCapturingQuestion]
-	[ImageCapturingQuestionWidget]o-[dynamic Function(Answer&lt;FutureBlobFile&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ImageCapturingQuestionWidget]
-	
-	[QuestionContainer
-	  |
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;, int);
-	  +question: Question&lt;dynamic&gt;;
-	  +index: int
-	]
-	
-	[QuestionContainer]o-[dynamic Function(Answer&lt;dynamic&gt;, int)]
-	[QuestionContainer]o-[&lt;abstract&gt;Question]
-	
-	[QuestionHeader
-	  |
-	  +prompt: String?;
-	  +subtitle: String?;
-	  +rationale: String?
-	  |
-	  -List&lt;Widget&gt; _buildSubtitle();
-	  -List&lt;Widget&gt; _buildRationaleButton();
-	  +Widget build()
-	]
-	
-	[CustomSlider
-	  |
-	  +value: double?;
-	  +minValue: double?;
-	  +maxValue: double?;
-	  +minorTick: int?;
-	  +onChanged: dynamic Function(double)?;
-	  +onChangeEnd: dynamic Function(double)?;
-	  +activeColor: Color?;
-	  +inactiveColor: Color?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +thumbColor: Color?;
-	  +isColored: bool;
-	  +labelValuePrecision: int;
-	  +tickValuePrecision: int;
-	  +linearStep: bool;
-	  +steps: AnnotatedScaleQuestion?
-	  |
-	  +Widget build()
-	]
-	
-	[CustomSlider]o-[dynamic Function(double)?]
-	[CustomSlider]o-[Color]
-	[CustomSlider]o-[AnnotatedScaleQuestion]
-	
-	[CustomTrackShape
-	  |
-	  +Rect getPreferredRect()
-	]
-	
-	[RoundedRectSliderTrackShape]&lt;:-[CustomTrackShape]
-	
-	[BottomOnboardingNavigation
-	  |
-	  +onBack: void Function()?;
-	  +onNext: void Function()?;
-	  +backLabel: String?;
-	  +nextLabel: String?;
-	  +hideNext: bool;
-	  +nextIcon: Icon?;
-	  +backIcon: Icon?;
-	  +progress: Widget?
-	  |
-	  +Widget build()
-	]
-	
-	[BottomOnboardingNavigation]o-[void Function()?]
-	[BottomOnboardingNavigation]o-[Icon]
-	[BottomOnboardingNavigation]o-[&lt;abstract&gt;Widget]
-	
-	[InterventionCard
-	  |
-	  +intervention: Intervention;
-	  +selected: bool;
-	  +showCheckbox: bool;
-	  +showTasks: bool;
-	  +showDescription: bool;
-	  +onTap: dynamic Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionCard]o-[Intervention]
-	[InterventionCard]o-[dynamic Function()?]
-	
-	[InterventionCardTitle
-	  |
-	  +intervention: Intervention?;
-	  +selected: bool;
-	  +showCheckbox: bool;
-	  +showDescriptionButton: bool;
-	  +onTap: dynamic Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionCardTitle]o-[Intervention]
-	[InterventionCardTitle]o-[dynamic Function()?]
-	
-	[InterventionCardDescription
-	  |
-	  +intervention: Intervention
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionCardDescription]o-[Intervention]
-	
-	[_TaskList
-	  |
-	  +tasks: List&lt;InterventionTask&gt;
-	  |
-	  +String scheduleString();
-	  +Widget build()
-	]
-	
-	[StudyTile
-	  |
-	  +title: String?;
-	  +description: String?;
-	  +iconName: String;
-	  +onTap: dynamic Function()?;
-	  +contentPadding: EdgeInsetsGeometry
-	  |
-	  +Widget build()
-	]
-	
-	[StudyTile]o-[dynamic Function()?]
-	[StudyTile]o-[&lt;abstract&gt;EdgeInsetsGeometry]
-	
-	[RoundCheckbox
-	  |
-	  +onChanged: dynamic Function(bool)?;
-	  +value: bool?
-	  |
-	  +Widget build()
-	]
-	
-	[RoundCheckbox]o-[dynamic Function(bool)?]
-	
-	[SelectableButton
-	  |
-	  +child: Widget;
-	  +selected: bool;
-	  +onTap: dynamic Function()?
-	  |
-	  -Color _getFillColor();
-	  -Color _getTextColor();
-	  +Widget build()
-	]
-	
-	[SelectableButton]o-[&lt;abstract&gt;Widget]
-	[SelectableButton]o-[dynamic Function()?]
-	
-	[HtmlText
-	  |
-	  +text: String?;
-	  +style: TextStyle?;
-	  +centered: bool
-	  |
-	  +Widget build()
-	]
-	
-	[HtmlText]o-[TextStyle]
-	
-	[MyApp
-	  |
-	  +queryParameters: Map&lt;String, String&gt;;
-	  +appConfig: AppConfig?;
-	  +initialRoute: String
-	]
-	
-	[MyApp]o-[AppConfig]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="1221.0" width="23935.3" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M577.2 782.9 L575.75 786 L575.75 934.5 L575.8 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M586.0 776.7 L577.2 782.9 L576.3 772.2 L585.1 766.0 Z"></path>
-					</g>
-					<path d="M662.8 784.7 L662.75 786 L1779.75 945.6409586056645 L1779.8 945.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M668.1 775.3 L662.8 784.7 L657.4 775.3 L662.8 766.0 Z"></path>
-					</g>
-					<path d="M850.4 614.9 L2932.25 786 L6618.75 947.3735486454024 L6618.8 947.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M841.5 608.8 L850.4 614.9 L840.6 619.5 L831.8 613.4 Z"></path>
-					</g>
-					<path d="M6813.1 610.5 L9430.75 786 L9469.233231707318 934.5 L9469.2 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6804.2 604.5 L6813.1 610.5 L6803.5 615.2 L6794.5 609.2 Z"></path>
-					</g>
-					<path d="M6813.1 609.7 L9642 786 L9642 934.5 L9642.0 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6804.1 603.8 L6813.1 609.7 L6803.5 614.4 L6794.5 608.5 Z"></path>
-					</g>
-					<path d="M1515.7 252.5 L1456.25 413 L1456.25 584 L1456.3 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1524.0 245.6 L1515.7 252.5 L1514.0 241.9 L1522.2 235.0 Z"></path>
-					</g>
-					<path d="M1562.2 251.9 L1636.75 413 L1655.0878016085792 584 L1655.1 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1563.1 241.2 L1562.2 251.9 L1553.4 245.7 L1554.3 235.0 Z"></path>
-					</g>
-					<path d="M7230.1 613.6 L9759.5 786 L9829.675304878048 934.5 L9829.7 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7221.2 607.7 L7230.1 613.6 L7220.4 618.3 L7211.5 612.3 Z"></path>
-					</g>
-					<path d="M2060.9 249.1 L2202.25 413 L2202.25 584 L2202.3 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2058.8 238.6 L2060.9 249.1 L2050.8 245.6 L2048.7 235.0 Z"></path>
-					</g>
-					<path d="M1952.4 246.6 L1742.75 413 L1663.89745308311 584 L1663.9 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1963.0 245.0 L1952.4 246.6 L1956.4 236.6 L1967.0 235.0 Z"></path>
-					</g>
-					<path d="M2576.5 253.7 L2576.5 413 L2576.5 584 L2576.5 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2581.8 244.3 L2576.5 253.7 L2571.2 244.3 L2576.5 235.0 Z"></path>
-					</g>
-					<path d="M1102.8 664.7 L1102.75 786 L1779.75 942.930035335689 L1779.8 942.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1108.1 655.3 L1102.8 664.7 L1097.4 655.3 L1102.8 646.0 Z"></path>
-					</g>
-					<path d="M1932.8 679.7 L1932.75 786 L1821.8277439024391 934.5 L1821.8 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1938.1 670.3 L1932.8 679.7 L1927.4 670.3 L1932.8 661.0 Z"></path>
-					</g>
-					<path d="M2771.0 672.2 L2771 786 L1840.75 944.7936507936508 L1840.8 944.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2776.3 662.8 L2771.0 672.2 L2765.7 662.8 L2771.0 653.5 Z"></path>
-					</g>
-					<path d="M3093.5 672.2 L3093.5 786 L6618.75 947.2554215187225 L6618.8 947.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3098.8 662.8 L3093.5 672.2 L3088.2 662.8 L3093.5 653.5 Z"></path>
-					</g>
-					<path d="M3441.0 664.7 L3441 786 L6618.75 946.9608524438268 L6618.8 947.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3446.3 655.3 L3441.0 664.7 L3435.7 655.3 L3441.0 646.0 Z"></path>
-					</g>
-					<path d="M7992.1 608.6 L9922 786 L10030.658536585366 934.5 L10030.7 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7983.3 602.4 L7992.1 608.6 L7982.3 613.1 L7973.5 606.9 Z"></path>
-					</g>
-					<path d="M8193.1 609.4 L9962 786 L10034.439024390244 934.5 L10034.4 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8184.3 603.2 L8193.1 609.4 L8183.3 613.8 L8174.5 607.5 Z"></path>
-					</g>
-					<path d="M9086.9 613.1 L10202 786 L10443.3125 934.5 L10443.3 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9078.5 606.4 L9086.9 613.1 L9076.9 616.9 L9068.5 610.2 Z"></path>
-					</g>
-					<path d="M3715.0 694.7 L3715 786 L6618.75 946.6798819063686 L6618.8 946.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3720.3 685.3 L3715.0 694.7 L3709.7 685.3 L3715.0 676.0 Z"></path>
-					</g>
-					<path d="M5630.0 282.6 L5572.5 413 L5572.5 584 L5572.5 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5638.7 276.2 L5630.0 282.6 L5628.9 271.9 L5637.6 265.5 Z"></path>
-					</g>
-					<path d="M5706.0 282.6 L5763.5 413 L5763.5 584 L5763.5 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5707.1 271.9 L5706.0 282.6 L5697.3 276.2 L5698.4 265.5 Z"></path>
-					</g>
-					<path d="M10460.5 668.0 L10548.5 786 L10584.719512195123 934.5 L10584.7 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10459.2 657.3 L10460.5 668.0 L10450.7 663.7 L10449.4 653.0 Z"></path>
-					</g>
-					<path d="M4090.0 672.2 L4090 786 L6618.75 946.1989377112506 L6618.8 946.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4095.3 662.8 L4090.0 672.2 L4084.7 662.8 L4090.0 653.5 Z"></path>
-					</g>
-					<path d="M11287.2 634.6 L10771 786 L10771 919 L10771.0 919.0 " fill="none"></path>
-					<path d="M11288.7 639.7 L11287.2 634.6 L11285.7 629.5 L11300.0 630.9 Z"></path>
-					<path d="M4433.0 664.7 L4433 786 L6618.75 945.6183902927752 L6618.8 945.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4438.3 655.3 L4433.0 664.7 L4427.7 655.3 L4433.0 646.0 Z"></path>
-					</g>
-					<path d="M8743.0 611.5 L10002 786 L10038.219512195123 934.5 L10038.2 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8734.5 604.9 L8743.0 611.5 L8733.0 615.5 L8724.5 608.9 Z"></path>
-					</g>
-					<path d="M8909.0 612.0 L10042 786 L10042 934.5 L10042.0 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8900.5 605.3 L8909.0 612.0 L8898.9 615.9 L8890.5 609.2 Z"></path>
-					</g>
-					<path d="M4776.0 672.2 L4776 786 L6618.75 944.8285376428853 L6618.8 944.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4781.3 662.8 L4776.0 672.2 L4770.7 662.8 L4776.0 653.5 Z"></path>
-					</g>
-					<path d="M7508.1 606.8 L10888 786 L11073.172256097561 934.5 L11073.2 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7499.1 601.0 L7508.1 606.8 L7498.5 611.6 L7489.5 605.8 Z"></path>
-					</g>
-					<path d="M7233.0 620.5 L6147.25 786 L6628.516768292683 934.5 L6628.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7243.1 624.3 L7233.0 620.5 L7241.5 613.8 L7251.5 617.6 Z"></path>
-					</g>
-					<path d="M8473.1 607.3 L11650 786 L11650 934.5 L11650.0 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8464.1 601.4 L8473.1 607.3 L8463.5 612.1 L8454.5 606.3 Z"></path>
-					</g>
-					<path d="M8195.9 614.8 L6649.25 786 L6675.961890243902 934.5 L6676.0 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8205.8 619.1 L8195.9 614.8 L8204.6 608.5 L8214.5 612.8 Z"></path>
-					</g>
-					<path d="M8521.5 276.7 L8521.5 413 L8521.5 584 L8521.5 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8526.8 267.3 L8521.5 276.7 L8516.2 267.3 L8521.5 258.0 Z"></path>
-					</g>
-					<path d="M11527.1 620.1 L12492.25 786 L12492.25 881 L12492.3 881.0 " fill="none"></path>
-					<path d="M11528.0 614.9 L11527.1 620.1 L11526.2 625.4 L11514.0 617.9 Z"></path>
-					<path d="M10555.4 605.0 L6689.25 786 L6679.742378048781 934.5 L6679.7 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10564.9 609.9 L10555.4 605.0 L10564.4 599.2 L10574.0 604.1 Z"></path>
-					</g>
-					<path d="M11281.3 604.5 L6729.25 786 L6683.522865853659 934.5 L6683.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11290.9 609.5 L11281.3 604.5 L11290.5 598.8 L11300.0 603.8 Z"></path>
-					</g>
-					<path d="M11532.5 618.3 L12649.25 786 L12755.192073170732 934.5 L12755.2 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11524.0 611.7 L11532.5 618.3 L11522.4 622.2 L11514.0 615.6 Z"></path>
-					</g>
-					<path d="M13075.3 1112.7 L13075.25 1114 L13075.25 1134 L13075.3 1134.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13080.6 1103.3 L13075.3 1112.7 L13069.9 1103.3 L13075.3 1094.0 Z"></path>
-					</g>
-					<path d="M10784.3 608.2 L13075.25 786 L13075.25 806 L13075.3 806.0 " fill="none"></path>
-					<path d="M10784.7 602.9 L10784.3 608.2 L10783.9 613.5 L10771.0 607.1 Z"></path>
-					<path d="M13720.5 1015.2 L13720.5 1114 L13720.5 1134 L13720.5 1134.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13725.8 1005.8 L13720.5 1015.2 L13715.2 1005.8 L13720.5 996.5 Z"></path>
-					</g>
-					<path d="M10784.3 606.3 L13720.5 786 L13720.5 903.5 L13720.5 903.5 " fill="none"></path>
-					<path d="M10784.6 601.0 L10784.3 606.3 L10784.0 611.7 L10771.0 605.5 Z"></path>
-					<path d="M11148.6 610.6 L13970.5 786 L13970.5 934.5 L13970.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11139.6 604.7 L11148.6 610.6 L11139.0 615.3 L11130.0 609.4 Z"></path>
-					</g>
-					<path d="M10792.4 607.4 L6769.25 786 L6687.303353658536 934.5 L6687.3 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10801.9 612.3 L10792.4 607.4 L10801.4 601.7 L10811.0 606.6 Z"></path>
-					</g>
-					<path d="M11148.6 617.8 L12783.75 786 L12767.903963414634 934.5 L12767.9 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11139.8 611.6 L11148.6 617.8 L11138.7 622.2 L11130.0 615.9 Z"></path>
-					</g>
-					<path d="M11527.3 607.6 L14173.5 786 L14173.5 919 L14173.5 919.0 " fill="none"></path>
-					<path d="M11527.7 602.3 L11527.3 607.6 L11526.9 612.9 L11514.0 606.7 Z"></path>
-					<path d="M5246.1 613.0 L6809.25 786 L6691.0838414634145 934.5 L6691.1 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5237.4 606.7 L5246.1 613.0 L5236.2 617.3 L5227.5 611.0 Z"></path>
-					</g>
-					<path d="M5493.0 613.9 L6952.75 786 L6704.6463414634145 934.5 L6704.6 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5484.4 607.5 L5493.0 613.9 L5483.1 618.1 L5474.5 611.7 Z"></path>
-					</g>
-					<path d="M9490.5 269.2 L9490.5 413 L9490.5 561 L9490.5 561.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9495.8 259.8 L9490.5 269.2 L9485.2 259.8 L9490.5 250.5 Z"></path>
-					</g>
-					<path d="M12311.6 608.3 L14351 786 L14351 934.5 L14351.0 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12302.8 602.2 L12311.6 608.3 L12301.8 612.8 L12293.0 606.7 Z"></path>
-					</g>
-					<path d="M12109.4 608.4 L10082 786 L10045.780487804877 934.5 L10045.8 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12119.2 612.9 L12109.4 608.4 L12118.2 602.2 L12128.0 606.7 Z"></path>
-					</g>
-					<path d="M11535.6 622.7 L10619.75 786 L10591.453506097561 934.5 L10591.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11545.7 626.3 L11535.6 622.7 L11543.9 615.8 L11554.0 619.4 Z"></path>
-					</g>
-					<path d="M11795.6 608.1 L14493.25 786 L14557.467987804877 889 L14557.5 889.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11786.7 602.1 L11795.6 608.1 L11786.0 612.8 L11777.0 606.9 Z"></path>
-					</g>
-					<path d="M11535.5 615.2 L10122 786 L10049.560975609756 934.5 L10049.6 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11545.4 619.4 L11535.5 615.2 L11544.1 608.8 L11554.0 613.0 Z"></path>
-					</g>
-					<path d="M14779.3 892.8 L14791.5 889 L14799 889 L14799 889 L14806.5 950 L14806.5 950 L14799 1011 L14799 1011 L14791.5 1011 L14791.5 1011 L14761.5 1001.6632653061224 L14761.5 1001.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14768.8 890.5 L14779.3 892.8 L14772.0 900.7 L14761.5 898.3 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M15759.1 607.2 L14747.75 786 L14652.129573170732 889 L14652.1 889.0 " fill="none"></path>
-					</g>
-					<path d="M15760.0 612.5 L15759.1 607.2 L15758.2 602.0 L15772.3 604.9 Z"></path>
-					<path d="M13403.4 608.7 L10659.75 786 L10595.233993902439 934.5 L10595.2 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13413.0 613.4 L13403.4 608.7 L13412.3 602.8 L13422.0 607.5 Z"></path>
-					</g>
-					<path d="M13687.5 620.8 L14787.75 786 L16204.75 940.3593490534706 L16204.8 940.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13679.0 614.2 L13687.5 620.8 L13677.4 624.7 L13669.0 618.0 Z"></path>
-					</g>
-					<path d="M11215.0 261.7 L11215 413 L11215 584 L11215.0 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11220.3 252.3 L11215.0 261.7 L11209.7 252.3 L11215.0 243.0 Z"></path>
-					</g>
-					<path d="M6236.0 626.0 L7315.75 786 L6738.75 934.552590266876 L6738.8 934.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6227.5 619.4 L6236.0 626.0 L6226.0 629.9 L6217.5 623.3 Z"></path>
-					</g>
-					<path d="M6482.9 619.7 L7487.75 786 L6738.75 937.8368355995055 L6738.8 937.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6474.6 612.9 L6482.9 619.7 L6472.8 623.4 L6464.5 616.6 Z"></path>
-					</g>
-					<path d="M11799.1 644.0 L11310 786 L11113.056402439024 934.5 L11113.1 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11809.5 646.6 L11799.1 644.0 L11806.5 636.3 L11817.0 638.8 Z"></path>
-					</g>
-					<path d="M10010.6 655.5 L9804.5 786 L9833.928353658537 934.5 L9833.9 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10021.3 655.0 L10010.6 655.5 L10015.6 646.0 L10026.4 645.5 Z"></path>
-					</g>
-					<path d="M9935.2 650.5 L9500 786 L9475.778201219513 934.5 L9475.8 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9945.7 652.8 L9935.2 650.5 L9942.5 642.6 L9953.0 645.0 Z"></path>
-					</g>
-					<path d="M10263.7 604.3 L16505.25 786 L16505.25 934.5 L16505.3 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10254.5 598.7 L10263.7 604.3 L10254.2 609.4 L10245.0 603.8 Z"></path>
-					</g>
-					<path d="M14555.3 608.0 L7612 786 L6738.75 939.4562014465578 L6738.8 939.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14564.8 613.1 L14555.3 608.0 L14564.5 602.4 L14574.0 607.5 Z"></path>
-					</g>
-					<path d="M15218.6 627.2 L17119.25 786 L17119.25 934.5 L17119.3 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15209.7 621.1 L15218.6 627.2 L15208.9 631.7 L15200.0 625.7 Z"></path>
-					</g>
-					<path d="M15218.6 625.7 L17252 786 L17335.98399390244 934.5 L17336.0 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15209.7 619.6 L15218.6 625.7 L15208.9 630.2 L15200.0 624.2 Z"></path>
-					</g>
-					<path d="M15218.6 616.9 L18441 786 L18441 934.5 L18441.0 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15209.6 611.1 L15218.6 616.9 L15209.0 621.7 L15200.0 615.9 Z"></path>
-					</g>
-					<path d="M15218.6 632.0 L16790.25 786 L16790.25 904 L16790.3 904.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15209.8 625.8 L15218.6 632.0 L15208.8 636.4 L15200.0 630.2 Z"></path>
-					</g>
-					<path d="M7791.1 611.2 L9882 786 L9841.253048780487 934.5 L9841.3 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7782.2 605.1 L7791.1 611.2 L7781.4 615.7 L7772.5 609.7 Z"></path>
-					</g>
-					<path d="M13183.5 225.3 L13183.5 413 L13183.5 538 L13183.5 538.0 " fill="none"></path>
-					<path d="M13188.8 225.3 L13183.5 225.3 L13178.2 225.3 L13183.5 212.0 Z"></path>
-					<path d="M12686.7 606.6 L17364.75 786 L17346.64024390244 934.5 L17346.6 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12677.5 601.0 L12686.7 606.6 L12677.1 611.6 L12668.0 605.9 Z"></path>
-					</g>
-					<path d="M12314.4 610.7 L9390.75 786 L6738.75 946.3716814159292 L6738.8 946.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12324.0 615.4 L12314.4 610.7 L12323.4 604.8 L12333.0 609.5 Z"></path>
-					</g>
-					<path d="M17886.2 641.6 L18621 786 L18621 934.5 L18621.0 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17878.1 634.6 L17886.2 641.6 L17876.0 645.0 L17867.9 638.0 Z"></path>
-					</g>
-					<path d="M17891.9 636.7 L18774 786 L18876.32012195122 934.5 L18876.3 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17883.6 629.9 L17891.9 636.7 L17881.8 640.4 L17873.5 633.6 Z"></path>
-					</g>
-					<path d="M21162.9 201.8 L17672 413 L17672 561 L17672.0 561.0 " fill="none"></path>
-					<path d="M21163.3 207.1 L21162.9 201.8 L21162.6 196.5 L21176.3 201.0 Z"></path>
-					<path d="M18334.9 637.6 L19192.5 786 L19192.5 934.5 L19192.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18326.6 630.7 L18334.9 637.6 L18324.8 641.2 L18316.5 634.4 Z"></path>
-					</g>
-					<path d="M18288.3 642.5 L18866.75 786 L18885.08612804878 934.5 L18885.1 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18280.5 635.1 L18288.3 642.5 L18278.0 645.4 L18270.2 638.0 Z"></path>
-					</g>
-					<path d="M21162.9 202.6 L18115 413 L18115 561 L18115.0 561.0 " fill="none"></path>
-					<path d="M21163.3 207.9 L21162.9 202.6 L21162.6 197.2 L21176.3 201.6 Z"></path>
-					<path d="M19136.8 648.5 L19338 786 L19433.528963414636 934.5 L19433.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19132.1 638.9 L19136.8 648.5 L19126.1 647.7 L19121.4 638.0 Z"></path>
-					</g>
-					<path d="M19020.3 652.2 L18906.75 786 L18888.866615853658 934.5 L18888.9 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19030.4 648.6 L19020.3 652.2 L19022.2 641.7 L19032.3 638.0 Z"></path>
-					</g>
-					<path d="M21163.0 205.2 L19065 413 L19065 561 L19065.0 561.0 " fill="none"></path>
-					<path d="M21163.5 210.5 L21163.0 205.2 L21162.5 199.9 L21176.3 203.9 Z"></path>
-					<path d="M20809.3 632.0 L19765.5 786 L19765.5 934.5 L19765.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20819.3 635.9 L20809.3 632.0 L20817.7 625.3 L20827.8 629.2 Z"></path>
-					</g>
-					<path d="M20809.2 619.2 L18946.75 786 L18892.647103658535 934.5 L18892.6 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20818.9 623.7 L20809.2 619.2 L20818.0 613.1 L20827.8 617.5 Z"></path>
-					</g>
-					<path d="M21209.5 236.8 L21029.25 413 L21029.25 561 L21029.3 561.0 " fill="none"></path>
-					<path d="M21213.2 240.6 L21209.5 236.8 L21205.8 233.0 L21219.0 227.5 Z"></path>
-					<path d="M21252.2 629.1 L20084.25 786 L20084.25 934.5 L20084.3 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21262.2 633.1 L21252.2 629.1 L21260.8 622.5 L21270.8 626.6 Z"></path>
-					</g>
-					<path d="M21252.1 616.2 L19019.75 786 L18899.54649390244 934.5 L18899.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21261.8 620.8 L21252.1 616.2 L21261.0 610.2 L21270.8 614.8 Z"></path>
-					</g>
-					<path d="M21292.0 236.8 L21472.25 413 L21472.25 561 L21472.3 561.0 " fill="none"></path>
-					<path d="M21295.7 233.0 L21292.0 236.8 L21288.3 240.6 L21282.5 227.5 Z"></path>
-					<path d="M21704.2 623.9 L20273.75 786 L20273.75 934.5 L20273.8 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21714.1 628.1 L21704.2 623.9 L21712.9 617.5 L21722.8 621.8 Z"></path>
-					</g>
-					<path d="M21704.3 628.6 L20540.25 786 L20540.25 934.5 L20540.3 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21714.2 632.6 L21704.3 628.6 L21712.8 622.0 L21722.8 626.1 Z"></path>
-					</g>
-					<path d="M21337.9 224.7 L21919.25 413 L21919.25 546 L21919.3 546.0 " fill="none"></path>
-					<path d="M21339.6 219.7 L21337.9 224.7 L21336.3 229.8 L21325.3 220.6 Z"></path>
-					<path d="M22137.2 629.1 L20842.25 786 L20842.25 934.5 L20842.3 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22147.1 633.2 L22137.2 629.1 L22145.8 622.7 L22155.8 626.8 Z"></path>
-					</g>
-					<path d="M22137.3 634.7 L21087.75 786 L21165.169207317074 934.5 L21165.2 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22147.3 638.6 L22137.3 634.7 L22145.8 628.1 L22155.8 632.0 Z"></path>
-					</g>
-					<path d="M21338.3 213.3 L22381.25 413 L22381.25 561 L22381.3 561.0 " fill="none"></path>
-					<path d="M21339.3 208.0 L21338.3 213.3 L21337.3 218.5 L21325.3 210.8 Z"></path>
-					<path d="M22879.2 629.9 L21624.25 786 L21624.25 934.5 L21624.3 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22889.1 634.0 L22879.2 629.9 L22887.8 623.4 L22897.8 627.6 Z"></path>
-					</g>
-					<path d="M22879.2 624.7 L21318.75 786 L21187.001524390245 934.5 L21187.0 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22889.0 629.1 L22879.2 624.7 L22887.9 618.5 L22897.8 622.8 Z"></path>
-					</g>
-					<path d="M21338.5 206.6 L23123.25 413 L23123.25 561 L23123.3 561.0 " fill="none"></path>
-					<path d="M21339.1 201.3 L21338.5 206.6 L21337.9 211.9 L21325.3 205.1 Z"></path>
-					<path d="M18194.8 250.7 L18526.5 413 L18526.5 584 L18526.5 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18188.7 241.8 L18194.8 250.7 L18184.1 251.4 L18178.0 242.5 Z"></path>
-					</g>
-					<path d="M18249.7 248.0 L18780 413 L18780 584 L18780.0 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18242.4 240.2 L18249.7 248.0 L18239.2 250.4 L18231.9 242.5 Z"></path>
-					</g>
-					<path d="M17035.2 606.9 L21886.25 786 L21886.25 934.5 L21886.3 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17026.0 601.2 L17035.2 606.9 L17025.6 611.9 L17016.5 606.2 Z"></path>
-					</g>
-					<path d="M16633.8 605.1 L10162 786 L10053.341463414634 934.5 L10053.3 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16643.3 610.2 L16633.8 605.1 L16643.0 599.5 L16652.5 604.6 Z"></path>
-					</g>
-					<path d="M17035.1 613.7 L19463.5 786 L19445.39024390244 934.5 L19445.4 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17026.2 607.8 L17035.1 613.7 L17025.4 618.4 L17016.5 612.4 Z"></path>
-					</g>
-					<path d="M19053.1 216.9 L19555.25 413 L19555.25 568.5 L19555.3 568.5 " fill="none"></path>
-					<path d="M19055.0 211.9 L19053.1 216.9 L19051.2 221.8 L19040.7 212.0 Z"></path>
-					<path d="M9375.1 606.8 L12900.75 786 L12778.961890243903 934.5 L12779.0 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9366.1 601.0 L9375.1 606.8 L9365.6 611.6 L9356.5 605.8 Z"></path>
-					</g>
-					<path d="M9372.5 683.7 L9542.5 786 L9479.794969512195 934.5 L9479.8 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9367.2 674.3 L9372.5 683.7 L9361.7 683.5 L9356.5 674.1 Z"></path>
-					</g>
-					<path d="M9374.9 625.8 L10242 786 L10447.092987804877 934.5 L10447.1 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9366.6 618.9 L9374.9 625.8 L9364.7 629.3 L9356.5 622.4 Z"></path>
-					</g>
-					<path d="M13977.4 609.1 L11350 786 L11116.836890243903 934.5 L11116.8 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13987.0 613.8 L13977.4 609.1 L13986.3 603.1 L13996.0 607.8 Z"></path>
-					</g>
-					<path d="M14261.1 636.5 L14833.75 786 L16204.75 940.0554984583762 L16204.8 940.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14253.4 628.9 L14261.1 636.5 L14250.7 639.3 L14243.0 631.7 Z"></path>
-					</g>
-					<path d="M14264.4 608.8 L11514.5 786 L11132.384146341463 934.5 L11132.4 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14274.0 613.5 L14264.4 608.8 L14273.3 602.9 L14283.0 607.6 Z"></path>
-					</g>
-					<path d="M14551.3 656.8 L14873.75 786 L16204.75 939.7752729834449 L16204.8 939.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14544.6 648.3 L14551.3 656.8 L14540.7 658.2 L14534.0 649.8 Z"></path>
-					</g>
-					<path d="M12689.5 619.6 L11554.5 786 L11136.164634146342 934.5 L11136.2 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12699.5 623.5 L12689.5 619.6 L12698.0 613.0 L12708.0 616.9 Z"></path>
-					</g>
-					<path d="M19683.6 609.1 L16339.25 786 L16297.59756097561 934.5 L16297.6 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19693.2 613.9 L19683.6 609.1 L19692.6 603.3 L19702.3 608.1 Z"></path>
-					</g>
-					<path d="M20046.9 614.4 L22132.75 786 L22132.75 934.5 L22132.8 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20038.0 608.4 L20046.9 614.4 L20037.1 619.0 L20028.3 612.9 Z"></path>
-					</g>
-					<path d="M22890.2 264.2 L22752.25 413 L22752.25 584 L22752.3 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22900.5 261.0 L22890.2 264.2 L22892.7 253.7 L22902.9 250.5 Z"></path>
-					</g>
-					<path d="M13690.4 607.5 L10508.5 786 L10472.280487804877 934.5 L10472.3 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13700.0 612.3 L13690.4 607.5 L13699.4 601.6 L13709.0 606.4 Z"></path>
-					</g>
-					<path d="M13974.6 609.9 L16379.25 786 L16301.378048780487 934.5 L16301.4 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13965.7 603.9 L13974.6 609.9 L13964.9 614.5 L13956.0 608.5 Z"></path>
-					</g>
-					<path d="M23433.3 276.7 L23433.25 413 L23433.25 584 L23433.3 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23438.6 267.3 L23433.3 276.7 L23427.9 267.3 L23433.3 258.0 Z"></path>
-					</g>
-					<path d="M23715.3 261.2 L23715.25 413 L23715.25 584 L23715.3 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23720.6 251.8 L23715.3 261.2 L23709.9 251.8 L23715.3 242.5 Z"></path>
-					</g>
-					<g data-name="AboutScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AboutScreen">
-							<rect x="0.0" y="165.5" height="62.0" width="136.0" data-name="AboutScreen"></rect>
-							<path d="M0.0 196.5 L136.0 196.5" fill="none" data-name="AboutScreen"></path>
-						</g>
-						<g transform="translate(0, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AboutScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AboutScreen">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="AboutScreen">AboutScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AboutScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AboutScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="AboutScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WelcomeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WelcomeScreen">
-							<rect x="176.0" y="165.5" height="62.0" width="145.0" data-name="WelcomeScreen"></rect>
-							<path d="M176.0 196.5 L321.0 196.5" fill="none" data-name="WelcomeScreen"></path>
-						</g>
-						<g transform="translate(176, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WelcomeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WelcomeScreen">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="WelcomeScreen">WelcomeScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(176, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WelcomeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WelcomeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="WelcomeScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Preview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Preview">
-							<rect x="493.8" y="433.0" height="333.0" width="338.0" data-name="Preview"></rect>
-							<path d="M493.8 464.0 L831.8 464.0" fill="none" data-name="Preview"></path>
-							<path d="M493.8 585.0 L831.8 585.0" fill="none" data-name="Preview"></path>
-						</g>
-						<g transform="translate(493.75, 433)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Preview">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="Preview">Preview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(493.75, 464)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Preview">
-								<text x="0.0" y="13.5" stroke="none" data-name="Preview">+queryParameters: Map&lt;String, String&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Preview">+appLanguage: AppLanguage</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Preview">+selectedRoute: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Preview">+extra: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Preview">+study: Study?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Preview">+selectedStudyObjectId: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Preview">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(493.75, 585)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Preview">
-								<text x="0.0" y="13.5" stroke="none" data-name="Preview">+bool hasRoute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Preview">+void handleQueries()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Preview">+dynamic init()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Preview">+dynamic handleAuthorization()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Preview">+dynamic runCommands()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Preview">+String? getSelectedRoute()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Preview">+bool containsQuery()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Preview">+bool containsQueryPair()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Preview">+dynamic getStudySubject()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Preview">-dynamic _createFakeSubject()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Preview">+List&lt;String&gt; getInterventionIds()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppLanguage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppLanguage">
-							<rect x="512.3" y="934.5" height="31.0" width="127.0" data-name="AppLanguage"></rect>
-						</g>
-						<g transform="translate(512.25, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppLanguage">
-								<text x="55.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppLanguage">AppLanguage</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="1779.8" y="934.5" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(1779.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="6618.8" y="934.5" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(6618.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFrameHelper">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameHelper">
-							<rect x="361.0" y="158.0" height="77.0" width="224.0" data-name="IFrameHelper"></rect>
-							<path d="M361.0 189.0 L585.0 189.0" fill="none" data-name="IFrameHelper"></path>
-						</g>
-						<g transform="translate(361, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameHelper">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameHelper">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameHelper">IFrameHelper</text>
-								
-							</g>
-						</g>
-						<g transform="translate(361, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFrameHelper">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFrameHelper">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFrameHelper">+void postRouteFinished()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFrameHelper">+void listen()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TermsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TermsScreen">
-							<rect x="625.0" y="181.0" height="31.0" width="121.0" data-name="TermsScreen"></rect>
-						</g>
-						<g transform="translate(625, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TermsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TermsScreen">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="TermsScreen">TermsScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegalSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegalSection">
-							<rect x="6504.5" y="500.5" height="198.0" width="290.0" data-name="LegalSection"></rect>
-							<path d="M6504.5 531.5 L6794.5 531.5" fill="none" data-name="LegalSection"></path>
-							<path d="M6504.5 667.5 L6794.5 667.5" fill="none" data-name="LegalSection"></path>
-						</g>
-						<g transform="translate(6504.5, 500.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegalSection">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="LegalSection">LegalSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6504.5, 531.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegalSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegalSection">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LegalSection">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LegalSection">+icon: Icon?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="LegalSection">+pdfUrl: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="LegalSection">+pdfUrlLabel: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="LegalSection">+acknowledgment: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="LegalSection">+isChecked: bool?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="LegalSection">+onChange: void Function(bool?)?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6504.5, 667.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegalSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegalSection">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Icon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Icon">
-							<rect x="9448.3" y="934.5" height="31.0" width="50.0" data-name="Icon"></rect>
-						</g>
-						<g transform="translate(9448.25, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Icon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Icon">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Icon">Icon</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(bool?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(bool?)?">
-							<rect x="9548.0" y="934.5" height="31.0" width="188.0" data-name="void Function(bool?)?"></rect>
-						</g>
-						<g transform="translate(9548, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(bool?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(bool?)?">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(bool?)?">void Function(bool?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppOutdatedScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppOutdatedScreen">
-							<rect x="786.0" y="165.5" height="62.0" width="176.0" data-name="AppOutdatedScreen"></rect>
-							<path d="M786.0 196.5 L962.0 196.5" fill="none" data-name="AppOutdatedScreen"></path>
-						</g>
-						<g transform="translate(786, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppOutdatedScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppOutdatedScreen">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppOutdatedScreen">AppOutdatedScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(786, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppOutdatedScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppOutdatedScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppOutdatedScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LoadingScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoadingScreen">
-							<rect x="1002.0" y="158.0" height="77.0" width="338.0" data-name="LoadingScreen"></rect>
-							<path d="M1002.0 189.0 L1340.0 189.0" fill="none" data-name="LoadingScreen"></path>
-						</g>
-						<g transform="translate(1002, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoadingScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoadingScreen">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="LoadingScreen">LoadingScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1002, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoadingScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoadingScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoadingScreen">+sessionString: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LoadingScreen">+queryParameters: Map&lt;String, String&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTaskWidget">
-							<rect x="1380.0" y="158.0" height="77.0" width="313.0" data-name="QuestionnaireTaskWidget"></rect>
-							<path d="M1380.0 189.0 L1693.0 189.0" fill="none" data-name="QuestionnaireTaskWidget"></path>
-						</g>
-						<g transform="translate(1380, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTaskWidget">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTaskWidget">QuestionnaireTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1380, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireTaskWidget">+task: QuestionnaireTask</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireTaskWidget">+completionPeriod: CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTask">
-							<rect x="1373.8" y="584.0" height="31.0" width="165.0" data-name="QuestionnaireTask"></rect>
-						</g>
-						<g transform="translate(1373.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTask">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTask">QuestionnaireTask</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CompletionPeriod">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CompletionPeriod">
-							<rect x="1578.8" y="584.0" height="31.0" width="156.0" data-name="CompletionPeriod"></rect>
-						</g>
-						<g transform="translate(1578.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CompletionPeriod">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CompletionPeriod">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="CompletionPeriod">CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskScreen">
-							<rect x="6834.5" y="553.0" height="93.0" width="377.0" data-name="TaskScreen"></rect>
-							<path d="M6834.5 584.0 L7211.5 584.0" fill="none" data-name="TaskScreen"></path>
-							<path d="M6834.5 615.0 L7211.5 615.0" fill="none" data-name="TaskScreen"></path>
-						</g>
-						<g transform="translate(6834.5, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskScreen">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskScreen">TaskScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6834.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">+taskInstance: TaskInstance</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6834.5, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">&lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskInstance">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskInstance">
-							<rect x="9776.0" y="934.5" height="31.0" width="122.0" data-name="TaskInstance"></rect>
-						</g>
-						<g transform="translate(9776, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskInstance">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskInstance">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskInstance">TaskInstance</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CheckmarkTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTaskWidget">
-							<rect x="1854.0" y="158.0" height="77.0" width="323.0" data-name="CheckmarkTaskWidget"></rect>
-							<path d="M1854.0 189.0 L2177.0 189.0" fill="none" data-name="CheckmarkTaskWidget"></path>
-						</g>
-						<g transform="translate(1854, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTaskWidget">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTaskWidget">CheckmarkTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1854, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CheckmarkTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="CheckmarkTaskWidget">+task: CheckmarkTask?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CheckmarkTaskWidget">+completionPeriod: CompletionPeriod?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CheckmarkTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTask">
-							<rect x="2130.8" y="584.0" height="31.0" width="143.0" data-name="CheckmarkTask"></rect>
-						</g>
-						<g transform="translate(2130.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTask">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTask">CheckmarkTask</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CapturePictureScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CapturePictureScreen">
-							<rect x="2217.0" y="158.0" height="77.0" width="190.0" data-name="CapturePictureScreen"></rect>
-							<path d="M2217.0 189.0 L2407.0 189.0" fill="none" data-name="CapturePictureScreen"></path>
-						</g>
-						<g transform="translate(2217, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CapturePictureScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CapturePictureScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="CapturePictureScreen">CapturePictureScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2217, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CapturePictureScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CapturePictureScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="CapturePictureScreen">+userId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CapturePictureScreen">+studyId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityResult">
-							<rect x="2447.0" y="158.0" height="77.0" width="259.0" data-name="EligibilityResult"></rect>
-							<path d="M2447.0 189.0 L2706.0 189.0" fill="none" data-name="EligibilityResult"></path>
-						</g>
-						<g transform="translate(2447, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityResult">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityResult">EligibilityResult</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2447, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityResult">+eligible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EligibilityResult">+firstFailed: EligibilityCriterion?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityCriterion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityCriterion">
-							<rect x="2500.5" y="584.0" height="31.0" width="152.0" data-name="EligibilityCriterion"></rect>
-						</g>
-						<g transform="translate(2500.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityCriterion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityCriterion">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityCriterion">EligibilityCriterion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityScreen">
-							<rect x="871.8" y="553.0" height="93.0" width="462.0" data-name="EligibilityScreen"></rect>
-							<path d="M871.8 584.0 L1333.8 584.0" fill="none" data-name="EligibilityScreen"></path>
-							<path d="M871.8 615.0 L1333.8 615.0" fill="none" data-name="EligibilityScreen"></path>
-						</g>
-						<g transform="translate(871.75, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityScreen">
-								<text x="223.0" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityScreen">EligibilityScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(871.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityScreen">+study: Study?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(871.75, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityScreen">&lt;static&gt;+MaterialPageRoute&lt;EligibilityResult&gt; routeFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionSelectionScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSelectionScreen">
-							<rect x="3537.3" y="181.0" height="31.0" width="239.0" data-name="InterventionSelectionScreen"></rect>
-						</g>
-						<g transform="translate(3537.25, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSelectionScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSelectionScreen">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSelectionScreen">InterventionSelectionScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyOverviewScreen">
-							<rect x="3816.3" y="181.0" height="31.0" width="190.0" data-name="StudyOverviewScreen"></rect>
-						</g>
-						<g transform="translate(3816.25, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyOverviewScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyOverviewScreen">StudyOverviewScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_StudyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_StudyOverviewScreen">
-							<rect x="1774.8" y="538.0" height="123.0" width="316.0" data-name="_StudyOverviewScreen"></rect>
-							<path d="M1774.8 569.0 L2090.8 569.0" fill="none" data-name="_StudyOverviewScreen"></path>
-							<path d="M1774.8 600.0 L2090.8 600.0" fill="none" data-name="_StudyOverviewScreen"></path>
-						</g>
-						<g transform="translate(1774.75, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_StudyOverviewScreen">
-								<text x="150.0" y="13.5" stroke="none" text-anchor="middle" data-name="_StudyOverviewScreen">_StudyOverviewScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1774.75, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+study: Study?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1774.75, 600)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToJourney()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToEligibilityCheck()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="_StudyOverviewScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDetailsView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDetailsView">
-							<rect x="2692.5" y="545.5" height="108.0" width="157.0" data-name="StudyDetailsView"></rect>
-							<path d="M2692.5 576.5 L2849.5 576.5" fill="none" data-name="StudyDetailsView"></path>
-							<path d="M2692.5 622.5 L2849.5 622.5" fill="none" data-name="StudyDetailsView"></path>
-						</g>
-						<g transform="translate(2692.5, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDetailsView">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDetailsView">StudyDetailsView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2692.5, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+study: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDetailsView">+iconSize: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2692.5, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="JourneyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JourneyOverviewScreen">
-							<rect x="4046.3" y="181.0" height="31.0" width="209.0" data-name="JourneyOverviewScreen"></rect>
-						</g>
-						<g transform="translate(4046.25, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JourneyOverviewScreen">
-								<text x="96.5" y="13.5" stroke="none" text-anchor="middle" data-name="JourneyOverviewScreen">JourneyOverviewScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_JourneyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_JourneyOverviewScreen">
-							<rect x="2889.5" y="545.5" height="108.0" width="408.0" data-name="_JourneyOverviewScreen"></rect>
-							<path d="M2889.5 576.5 L3297.5 576.5" fill="none" data-name="_JourneyOverviewScreen"></path>
-							<path d="M2889.5 607.5 L3297.5 607.5" fill="none" data-name="_JourneyOverviewScreen"></path>
-						</g>
-						<g transform="translate(2889.5, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_JourneyOverviewScreen">
-								<text x="196.0" y="13.5" stroke="none" text-anchor="middle" data-name="_JourneyOverviewScreen">_JourneyOverviewScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2889.5, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_JourneyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_JourneyOverviewScreen">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2889.5, 607.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_JourneyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_JourneyOverviewScreen">+dynamic getConsentAndNavigateToDashboard()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_JourneyOverviewScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Timeline">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Timeline">
-							<rect x="3337.5" y="553.0" height="93.0" width="207.0" data-name="Timeline"></rect>
-							<path d="M3337.5 584.0 L3544.5 584.0" fill="none" data-name="Timeline"></path>
-							<path d="M3337.5 615.0 L3544.5 615.0" fill="none" data-name="Timeline"></path>
-						</g>
-						<g transform="translate(3337.5, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timeline">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="Timeline">Timeline</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3337.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Timeline">
-								<text x="0.0" y="13.5" stroke="none" data-name="Timeline">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3337.5, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Timeline">
-								<text x="0.0" y="13.5" stroke="none" data-name="Timeline">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTile">
-							<rect x="7812.5" y="515.5" height="168.0" width="161.0" data-name="InterventionTile"></rect>
-							<path d="M7812.5 546.5 L7973.5 546.5" fill="none" data-name="InterventionTile"></path>
-							<path d="M7812.5 652.5 L7973.5 652.5" fill="none" data-name="InterventionTile"></path>
-						</g>
-						<g transform="translate(7812.5, 515.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTile">
-								<text x="72.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTile">InterventionTile</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7812.5, 546.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTile">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTile">+iconName: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTile">+date: DateTime</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTile">+color: Color?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTile">+isFirst: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTile">+isLast: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7812.5, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTile">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="10013.0" y="934.5" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(10013, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconIndicator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconIndicator">
-							<rect x="8013.5" y="545.5" height="108.0" width="161.0" data-name="IconIndicator"></rect>
-							<path d="M8013.5 576.5 L8174.5 576.5" fill="none" data-name="IconIndicator"></path>
-							<path d="M8013.5 622.5 L8174.5 622.5" fill="none" data-name="IconIndicator"></path>
-						</g>
-						<g transform="translate(8013.5, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconIndicator">
-								<text x="72.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconIndicator">IconIndicator</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8013.5, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconIndicator">+iconName: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconIndicator">+color: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8013.5, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconIndicator">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TimelineChild">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimelineChild">
-							<rect x="8930.5" y="553.0" height="93.0" width="138.0" data-name="TimelineChild"></rect>
-							<path d="M8930.5 584.0 L9068.5 584.0" fill="none" data-name="TimelineChild"></path>
-							<path d="M8930.5 615.0 L9068.5 615.0" fill="none" data-name="TimelineChild"></path>
-						</g>
-						<g transform="translate(8930.5, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimelineChild">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="TimelineChild">TimelineChild</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8930.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimelineChild">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimelineChild">+child: Widget?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8930.5, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimelineChild">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimelineChild">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="10433.0" y="934.5" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(10433, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="KickoffScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="KickoffScreen">
-							<rect x="4295.3" y="181.0" height="31.0" width="125.0" data-name="KickoffScreen"></rect>
-						</g>
-						<g transform="translate(4295.25, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="KickoffScreen">
-								<text x="54.5" y="13.5" stroke="none" text-anchor="middle" data-name="KickoffScreen">KickoffScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_KickoffScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_KickoffScreen">
-							<rect x="3584.5" y="523.0" height="153.0" width="261.0" data-name="_KickoffScreen"></rect>
-							<path d="M3584.5 554.0 L3845.5 554.0" fill="none" data-name="_KickoffScreen"></path>
-							<path d="M3584.5 600.0 L3845.5 600.0" fill="none" data-name="_KickoffScreen"></path>
-						</g>
-						<g transform="translate(3584.5, 523)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_KickoffScreen">
-								<text x="122.5" y="13.5" stroke="none" text-anchor="middle" data-name="_KickoffScreen">_KickoffScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3584.5, 554)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">+ready: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3584.5, 600)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">-dynamic _storeUserStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">-Widget _constructStatusIcon()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="_KickoffScreen">-String _getStatusText()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="_KickoffScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentScreen">
-							<rect x="4460.3" y="181.0" height="31.0" width="138.0" data-name="ConsentScreen"></rect>
-						</g>
-						<g transform="translate(4460.25, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentScreen">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentScreen">ConsentScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentCard">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentCard">
-							<rect x="5525.0" y="127.5" height="138.0" width="286.0" data-name="ConsentCard"></rect>
-							<path d="M5525.0 158.5 L5811.0 158.5" fill="none" data-name="ConsentCard"></path>
-							<path d="M5525.0 234.5 L5811.0 234.5" fill="none" data-name="ConsentCard"></path>
-						</g>
-						<g transform="translate(5525, 127.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentCard">
-								<text x="135.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentCard">ConsentCard</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5525, 158.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+consent: ConsentItem?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentCard">+index: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentCard">+onTapped: dynamic Function(int)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentCard">+isChecked: bool?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5525, 234.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItem">
-							<rect x="5514.5" y="584.0" height="31.0" width="116.0" data-name="ConsentItem"></rect>
-						</g>
-						<g transform="translate(5514.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItem">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItem">ConsentItem</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(int)">
-							<rect x="5670.5" y="584.0" height="31.0" width="186.0" data-name="dynamic Function(int)"></rect>
-						</g>
-						<g transform="translate(5670.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(int)">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(int)">dynamic Function(int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentElement">
-							<rect x="10285.0" y="546.0" height="107.0" width="249.0" data-name="ConsentElement"></rect>
-							<path d="M10285.0 577.0 L10534.0 577.0" fill="none" data-name="ConsentElement"></path>
-						</g>
-						<g transform="translate(10285, 546)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentElement">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentElement">ConsentElement</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10285, 577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentElement">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentElement">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentElement">+descriptionText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentElement">+acknowledgmentText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentElement">+icon: IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="10545.0" y="934.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(10545, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySelectionScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySelectionScreen">
-							<rect x="6598.5" y="181.0" height="31.0" width="190.0" data-name="StudySelectionScreen"></rect>
-						</g>
-						<g transform="translate(6598.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySelectionScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySelectionScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySelectionScreen">StudySelectionScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeDialog">
-							<rect x="6828.5" y="181.0" height="31.0" width="151.0" data-name="InviteCodeDialog"></rect>
-						</g>
-						<g transform="translate(6828.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeDialog">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeDialog">InviteCodeDialog</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OnboardingProgress">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OnboardingProgress">
-							<rect x="7019.5" y="135.0" height="123.0" width="271.0" data-name="OnboardingProgress"></rect>
-							<path d="M7019.5 166.0 L7290.5 166.0" fill="none" data-name="OnboardingProgress"></path>
-							<path d="M7019.5 212.0 L7290.5 212.0" fill="none" data-name="OnboardingProgress"></path>
-						</g>
-						<g transform="translate(7019.5, 135)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OnboardingProgress">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="OnboardingProgress">OnboardingProgress</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7019.5, 166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
-								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">+stage: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+progress: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7019.5, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
-								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">-double _getProgressForStage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportDetailsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportDetailsScreen">
-							<rect x="3885.5" y="545.5" height="108.0" width="409.0" data-name="ReportDetailsScreen"></rect>
-							<path d="M3885.5 576.5 L4294.5 576.5" fill="none" data-name="ReportDetailsScreen"></path>
-							<path d="M3885.5 607.5 L4294.5 607.5" fill="none" data-name="ReportDetailsScreen"></path>
-						</g>
-						<g transform="translate(3885.5, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportDetailsScreen">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportDetailsScreen">ReportDetailsScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3885.5, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportDetailsScreen">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3885.5, 607.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportDetailsScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GeneralDetailsSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GeneralDetailsSection">
-							<rect x="10672.0" y="919.0" height="62.0" width="198.0" data-name="GeneralDetailsSection"></rect>
-							<path d="M10672.0 950.0 L10870.0 950.0" fill="none" data-name="GeneralDetailsSection"></path>
-						</g>
-						<g transform="translate(10672, 919)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GeneralDetailsSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GeneralDetailsSection">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="GeneralDetailsSection">GeneralDetailsSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10672, 950)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GeneralDetailsSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GeneralDetailsSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GeneralDetailsSection">+Widget buildContent()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GenericSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GenericSection">
-							<rect x="11300.0" y="538.0" height="123.0" width="214.0" data-name="GenericSection"></rect>
-							<path d="M11300.0 569.0 L11514.0 569.0" fill="none" data-name="GenericSection"></path>
-							<path d="M11300.0 615.0 L11514.0 615.0" fill="none" data-name="GenericSection"></path>
-						</g>
-						<g transform="translate(11300, 538)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GenericSection">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="GenericSection">GenericSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11300, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GenericSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GenericSection">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GenericSection">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11300, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GenericSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GenericSection">+Widget buildContent()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GenericSection">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportHistoryScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryScreen">
-							<rect x="7330.5" y="165.5" height="62.0" width="180.0" data-name="ReportHistoryScreen"></rect>
-							<path d="M7330.5 196.5 L7510.5 196.5" fill="none" data-name="ReportHistoryScreen"></path>
-						</g>
-						<g transform="translate(7330.5, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryScreen">ReportHistoryScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7330.5, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportHistoryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryItem">
-							<rect x="4334.5" y="553.0" height="93.0" width="197.0" data-name="ReportHistoryItem"></rect>
-							<path d="M4334.5 584.0 L4531.5 584.0" fill="none" data-name="ReportHistoryItem"></path>
-							<path d="M4334.5 615.0 L4531.5 615.0" fill="none" data-name="ReportHistoryItem"></path>
-						</g>
-						<g transform="translate(4334.5, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryItem">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryItem">ReportHistoryItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4334.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4334.5, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegendWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendWidget">
-							<rect x="8588.5" y="545.5" height="108.0" width="136.0" data-name="LegendWidget"></rect>
-							<path d="M8588.5 576.5 L8724.5 576.5" fill="none" data-name="LegendWidget"></path>
-							<path d="M8588.5 622.5 L8724.5 622.5" fill="none" data-name="LegendWidget"></path>
-						</g>
-						<g transform="translate(8588.5, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendWidget">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="LegendWidget">LegendWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8588.5, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LegendWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8588.5, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegendsListWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendsListWidget">
-							<rect x="7550.5" y="150.0" height="93.0" width="207.0" data-name="LegendsListWidget"></rect>
-							<path d="M7550.5 181.0 L7757.5 181.0" fill="none" data-name="LegendsListWidget"></path>
-							<path d="M7550.5 212.0 L7757.5 212.0" fill="none" data-name="LegendsListWidget"></path>
-						</g>
-						<g transform="translate(7550.5, 150)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendsListWidget">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LegendsListWidget">LegendsListWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7550.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+legends: List&lt;Legend&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7550.5, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Legend">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Legend">
-							<rect x="8764.5" y="561.0" height="77.0" width="126.0" data-name="Legend"></rect>
-							<path d="M8764.5 592.0 L8890.5 592.0" fill="none" data-name="Legend"></path>
-						</g>
-						<g transform="translate(8764.5, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Legend">
-								<text x="55.0" y="13.5" stroke="none" text-anchor="middle" data-name="Legend">Legend</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8764.5, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Legend">
-								<text x="0.0" y="13.5" stroke="none" data-name="Legend">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Legend">+color: Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceDetailsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceDetailsScreen">
-							<rect x="4571.5" y="545.5" height="108.0" width="409.0" data-name="PerformanceDetailsScreen"></rect>
-							<path d="M4571.5 576.5 L4980.5 576.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-							<path d="M4571.5 607.5 L4980.5 607.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-						</g>
-						<g transform="translate(4571.5, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceDetailsScreen">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceDetailsScreen">PerformanceDetailsScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4571.5, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">+reportSubject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4571.5, 607.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceDetailsScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPerformanceBar">
-							<rect x="7251.5" y="545.5" height="108.0" width="238.0" data-name="InterventionPerformanceBar"></rect>
-							<path d="M7251.5 576.5 L7489.5 576.5" fill="none" data-name="InterventionPerformanceBar"></path>
-							<path d="M7251.5 622.5 L7489.5 622.5" fill="none" data-name="InterventionPerformanceBar"></path>
-						</g>
-						<g transform="translate(7251.5, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPerformanceBar">
-								<text x="111.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPerformanceBar">InterventionPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7251.5, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7251.5, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention">
-							<rect x="11037.5" y="934.5" height="31.0" width="110.0" data-name="Intervention"></rect>
-						</g>
-						<g transform="translate(11037.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention">Intervention</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ObservationPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ObservationPerformanceBar">
-							<rect x="8214.5" y="545.5" height="108.0" width="240.0" data-name="ObservationPerformanceBar"></rect>
-							<path d="M8214.5 576.5 L8454.5 576.5" fill="none" data-name="ObservationPerformanceBar"></path>
-							<path d="M8214.5 622.5 L8454.5 622.5" fill="none" data-name="ObservationPerformanceBar"></path>
-						</g>
-						<g transform="translate(8214.5, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ObservationPerformanceBar">
-								<text x="112.0" y="13.5" stroke="none" text-anchor="middle" data-name="ObservationPerformanceBar">ObservationPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8214.5, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+observation: Observation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ObservationPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8214.5, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Observation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Observation">
-							<rect x="11594.0" y="934.5" height="31.0" width="112.0" data-name="Observation"></rect>
-						</g>
-						<g transform="translate(11594, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Observation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Observation">
-								<text x="48.0" y="13.5" stroke="none" text-anchor="middle" data-name="Observation">Observation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceBar">
-							<rect x="8449.5" y="135.0" height="123.0" width="144.0" data-name="PerformanceBar"></rect>
-							<path d="M8449.5 166.0 L8593.5 166.0" fill="none" data-name="PerformanceBar"></path>
-							<path d="M8449.5 227.0 L8593.5 227.0" fill="none" data-name="PerformanceBar"></path>
-						</g>
-						<g transform="translate(8449.5, 135)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceBar">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceBar">PerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8449.5, 166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+task: Task</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceBar">+completed: int</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PerformanceBar">+total: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8449.5, 227)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Task">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Task">
-							<rect x="8494.5" y="584.0" height="31.0" width="54.0" data-name="Task"></rect>
-						</g>
-						<g transform="translate(8494.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Task">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Task">
-								<text x="19.0" y="13.5" stroke="none" text-anchor="middle" data-name="Task">Task</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceSection">
-							<rect x="12330.3" y="881.0" height="138.0" width="324.0" data-name="PerformanceSection"></rect>
-							<path d="M12330.3 912.0 L12654.3 912.0" fill="none" data-name="PerformanceSection"></path>
-							<path d="M12330.3 958.0 L12654.3 958.0" fill="none" data-name="PerformanceSection"></path>
-						</g>
-						<g transform="translate(12330.25, 881)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceSection">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceSection">PerformanceSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12330.25, 912)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+minimumRatio: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+maximum: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12330.25, 958)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+Widget buildContent()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+String getPowerLevelDescription()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PerformanceSection">+int getCountableObservationAmount()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionWidget">
-							<rect x="10574.0" y="568.5" height="62.0" width="197.0" data-name="ReportSectionWidget"></rect>
-							<path d="M10574.0 599.5 L10771.0 599.5" fill="none" data-name="ReportSectionWidget"></path>
-						</g>
-						<g transform="translate(10574, 568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionWidget">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionWidget">ReportSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10574, 599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionWidget">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="12694.3" y="934.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(12694.25, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionWidget">
-							<rect x="12878.3" y="806.0" height="288.0" width="394.0" data-name="AverageSectionWidget"></rect>
-							<path d="M12878.3 837.0 L13272.3 837.0" fill="none" data-name="AverageSectionWidget"></path>
-							<path d="M12878.3 898.0 L13272.3 898.0" fill="none" data-name="AverageSectionWidget"></path>
-						</g>
-						<g transform="translate(12878.25, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionWidget">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionWidget">AverageSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12878.25, 837)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+section: AverageSection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+titlePos: List&lt;int&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+phasePos: List&lt;int&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12878.25, 898)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+Widget getLegend()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+Widget getDiagram()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AverageSectionWidget">+BarChartData getChartData()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AverageSectionWidget">+Widget getTitles()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AverageSectionWidget">+Widget getValues()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AverageSectionWidget">+List&lt;BarChartGroupData&gt; getBarGroups()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AverageSectionWidget">+FlGridData getGridData()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AverageSectionWidget">+MaterialColor getColor()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AverageSectionWidget">+int getDayIndex()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AverageSectionWidget">+Iterable&lt;DiagramDatum&gt; getAggregatedData()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AverageSectionWidget">+Map&lt;String, String?&gt; getInterventionNames()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSection">
-							<rect x="13004.8" y="1134.0" height="31.0" width="141.0" data-name="AverageSection"></rect>
-						</g>
-						<g transform="translate(13004.75, 1134)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSection">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSection">AverageSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DiagramDatum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DiagramDatum">
-							<rect x="8748.3" y="143.0" height="107.0" width="202.0" data-name="DiagramDatum"></rect>
-							<path d="M8748.3 174.0 L8950.3 174.0" fill="none" data-name="DiagramDatum"></path>
-						</g>
-						<g transform="translate(8748.25, 143)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DiagramDatum">
-								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="DiagramDatum">DiagramDatum</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8748.25, 174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DiagramDatum">
-								<text x="0.0" y="13.5" stroke="none" data-name="DiagramDatum">+x: num</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DiagramDatum">+value: num</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DiagramDatum">+timestamp: DateTime?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DiagramDatum">+intervention: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionWidget">
-							<rect x="13574.5" y="903.5" height="93.0" width="292.0" data-name="LinearRegressionSectionWidget"></rect>
-							<path d="M13574.5 934.5 L13866.5 934.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-							<path d="M13574.5 965.5 L13866.5 965.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-						</g>
-						<g transform="translate(13574.5, 903.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionWidget">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionWidget">LinearRegressionSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13574.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+section: LinearRegressionSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13574.5, 965.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSection">
-							<rect x="13613.0" y="1134.0" height="31.0" width="215.0" data-name="LinearRegressionSection"></rect>
-						</g>
-						<g transform="translate(13613, 1134)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSection">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSection">LinearRegressionSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionContainer">
-							<rect x="10811.0" y="508.0" height="183.0" width="319.0" data-name="ReportSectionContainer"></rect>
-							<path d="M10811.0 539.0 L11130.0 539.0" fill="none" data-name="ReportSectionContainer"></path>
-							<path d="M10811.0 615.0 L11130.0 615.0" fill="none" data-name="ReportSectionContainer"></path>
-						</g>
-						<g transform="translate(10811, 508)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionContainer">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionContainer">ReportSectionContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10811, 539)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionContainer">+section: ReportSection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionContainer">+subject: StudySubject</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionContainer">+primary: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionContainer">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10811, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionContainer">+ReportSectionWidget buildContents()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionContainer">+dynamic ()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionContainer">+List&lt;Widget&gt; buildPrimaryHeader()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionContainer">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="13906.5" y="934.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(13906.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DisclaimerSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisclaimerSection">
-							<rect x="14074.5" y="919.0" height="62.0" width="198.0" data-name="DisclaimerSection"></rect>
-							<path d="M14074.5 950.0 L14272.5 950.0" fill="none" data-name="DisclaimerSection"></path>
-						</g>
-						<g transform="translate(14074.5, 919)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisclaimerSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisclaimerSection">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisclaimerSection">DisclaimerSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14074.5, 950)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisclaimerSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisclaimerSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisclaimerSection">+Widget buildContent()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Settings">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Settings">
-							<rect x="8990.3" y="181.0" height="31.0" width="80.0" data-name="Settings"></rect>
-						</g>
-						<g transform="translate(8990.25, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Settings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Settings">
-								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="Settings">Settings</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OptOutAlertDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OptOutAlertDialog">
-							<rect x="5020.5" y="553.0" height="93.0" width="207.0" data-name="OptOutAlertDialog"></rect>
-							<path d="M5020.5 584.0 L5227.5 584.0" fill="none" data-name="OptOutAlertDialog"></path>
-							<path d="M5020.5 615.0 L5227.5 615.0" fill="none" data-name="OptOutAlertDialog"></path>
-						</g>
-						<g transform="translate(5020.5, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptOutAlertDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptOutAlertDialog">OptOutAlertDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5020.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptOutAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptOutAlertDialog">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5020.5, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptOutAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptOutAlertDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DeleteAlertDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DeleteAlertDialog">
-							<rect x="5267.5" y="553.0" height="93.0" width="207.0" data-name="DeleteAlertDialog"></rect>
-							<path d="M5267.5 584.0 L5474.5 584.0" fill="none" data-name="DeleteAlertDialog"></path>
-							<path d="M5267.5 615.0 L5474.5 615.0" fill="none" data-name="DeleteAlertDialog"></path>
-						</g>
-						<g transform="translate(5267.5, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DeleteAlertDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="DeleteAlertDialog">DeleteAlertDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5267.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DeleteAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="DeleteAlertDialog">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5267.5, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DeleteAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="DeleteAlertDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FAQ">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FAQ">
-							<rect x="9110.3" y="165.5" height="62.0" width="136.0" data-name="FAQ"></rect>
-							<path d="M9110.3 196.5 L9246.3 196.5" fill="none" data-name="FAQ"></path>
-						</g>
-						<g transform="translate(9110.25, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FAQ">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="FAQ">FAQ</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9110.25, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FAQ">
-								<text x="0.0" y="13.5" stroke="none" data-name="FAQ">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Entry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Entry">
-							<rect x="9396.5" y="561.0" height="77.0" width="188.0" data-name="Entry"></rect>
-							<path d="M9396.5 592.0 L9584.5 592.0" fill="none" data-name="Entry"></path>
-						</g>
-						<g transform="translate(9396.5, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Entry">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="Entry">Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9396.5, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Entry">
-								<text x="0.0" y="13.5" stroke="none" data-name="Entry">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Entry">+children: List&lt;Entry&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EntryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EntryItem">
-							<rect x="9401.0" y="142.5" height="108.0" width="179.0" data-name="EntryItem"></rect>
-							<path d="M9401.0 173.5 L9580.0 173.5" fill="none" data-name="EntryItem"></path>
-							<path d="M9401.0 204.5 L9580.0 204.5" fill="none" data-name="EntryItem"></path>
-						</g>
-						<g transform="translate(9401, 142.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EntryItem">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="EntryItem">EntryItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9401, 173.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">+entry: Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9401, 204.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">-Widget _buildTiles()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EntryItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactScreen">
-							<rect x="10011.8" y="181.0" height="31.0" width="133.0" data-name="ContactScreen"></rect>
-						</g>
-						<g transform="translate(10011.75, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactScreen">
-								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactScreen">ContactScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactWidget">
-							<rect x="12128.0" y="530.5" height="138.0" width="165.0" data-name="ContactWidget"></rect>
-							<path d="M12128.0 561.5 L12293.0 561.5" fill="none" data-name="ContactWidget"></path>
-							<path d="M12128.0 637.5 L12293.0 637.5" fill="none" data-name="ContactWidget"></path>
-						</g>
-						<g transform="translate(12128, 530.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactWidget">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactWidget">ContactWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12128, 561.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+contact: Contact?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactWidget">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactWidget">+subtitle: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12128, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Contact">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Contact">
-							<rect x="14312.5" y="934.5" height="31.0" width="77.0" data-name="Contact"></rect>
-						</g>
-						<g transform="translate(14312.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Contact">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Contact">
-								<text x="30.5" y="13.5" stroke="none" text-anchor="middle" data-name="Contact">Contact</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItem">
-							<rect x="11554.0" y="515.5" height="168.0" width="223.0" data-name="ContactItem"></rect>
-							<path d="M11554.0 546.5 L11777.0 546.5" fill="none" data-name="ContactItem"></path>
-							<path d="M11554.0 637.5 L11777.0 637.5" fill="none" data-name="ContactItem"></path>
-						</g>
-						<g transform="translate(11554, 515.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItem">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItem">ContactItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11554, 546.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+iconData: IconData</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+itemName: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItem">+itemValue: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItem">+type: ContactItemType?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItem">+iconColor: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11554, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+dynamic launchContact()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItemType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItemType">
-							<rect x="14429.5" y="889.0" height="122.0" width="332.0" data-name="ContactItemType"></rect>
-							<path d="M14429.5 920.0 L14761.5 920.0" fill="none" data-name="ContactItemType"></path>
-						</g>
-						<g transform="translate(14429.5, 889)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItemType">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItemType">ContactItemType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14429.5, 920)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItemType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItemType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+values: List&lt;ContactItemType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+website: ContactItemType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+email: ContactItemType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+phone: ContactItemType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="15772.3" y="584.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(15772.25, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="10184.8" y="165.5" height="62.0" width="159.0" data-name="DashboardScreen"></rect>
-							<path d="M10184.8 196.5 L10343.8 196.5" fill="none" data-name="DashboardScreen"></path>
-						</g>
-						<g transform="translate(10184.75, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="71.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10184.75, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+error: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OverflowMenuItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OverflowMenuItem">
-							<rect x="13422.0" y="546.0" height="107.0" width="247.0" data-name="OverflowMenuItem"></rect>
-							<path d="M13422.0 577.0 L13669.0 577.0" fill="none" data-name="OverflowMenuItem"></path>
-						</g>
-						<g transform="translate(13422, 546)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OverflowMenuItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OverflowMenuItem">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="OverflowMenuItem">OverflowMenuItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13422, 577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OverflowMenuItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OverflowMenuItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="OverflowMenuItem">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OverflowMenuItem">+icon: IconData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="OverflowMenuItem">+routeName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="OverflowMenuItem">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="16204.8" y="934.5" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
-						</g>
-						<g transform="translate(16204.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
-								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFinishedPlaceholder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFinishedPlaceholder">
-							<rect x="11104.0" y="150.0" height="93.0" width="222.0" data-name="StudyFinishedPlaceholder"></rect>
-							<path d="M11104.0 181.0 L11326.0 181.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
-							<path d="M11104.0 212.0 L11326.0 212.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
-						</g>
-						<g transform="translate(11104, 150)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFinishedPlaceholder">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFinishedPlaceholder">StudyFinishedPlaceholder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11104, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">&lt;static&gt;+space: SizedBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11104, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SizedBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SizedBox">
-							<rect x="11170.0" y="584.0" height="31.0" width="90.0" data-name="SizedBox"></rect>
-						</g>
-						<g transform="translate(11170, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SizedBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SizedBox">
-								<text x="37.0" y="13.5" stroke="none" text-anchor="middle" data-name="SizedBox">SizedBox</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskOverview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskOverview">
-							<rect x="5896.5" y="553.5" height="92.0" width="321.0" data-name="TaskOverview"></rect>
-							<path d="M5896.5 584.5 L6217.5 584.5" fill="none" data-name="TaskOverview"></path>
-						</g>
-						<g transform="translate(5896.5, 553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskOverview">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskOverview">TaskOverview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5896.5, 584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskOverview">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskOverview">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskOverview">+scheduleToday: List&lt;TaskInstance&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskOverview">+interventionIcon: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ProgressRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ProgressRow">
-							<rect x="6257.5" y="568.5" height="62.0" width="207.0" data-name="ProgressRow"></rect>
-							<path d="M6257.5 599.5 L6464.5 599.5" fill="none" data-name="ProgressRow"></path>
-						</g>
-						<g transform="translate(6257.5, 568.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProgressRow">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProgressRow">ProgressRow</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6257.5, 599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ProgressRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="ProgressRow">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionSegment">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSegment">
-							<rect x="11817.0" y="508.0" height="183.0" width="271.0" data-name="InterventionSegment"></rect>
-							<path d="M11817.0 539.0 L12088.0 539.0" fill="none" data-name="InterventionSegment"></path>
-							<path d="M11817.0 645.0 L12088.0 645.0" fill="none" data-name="InterventionSegment"></path>
-						</g>
-						<g transform="translate(11817, 508)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSegment">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSegment">InterventionSegment</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11817, 539)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+percentCompleted: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionSegment">+percentMissed: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionSegment">+isCurrent: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionSegment">+isFuture: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionSegment">+phaseDuration: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11817, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+List&lt;Widget&gt; buildSeparators()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskBox">
-							<rect x="9953.0" y="553.5" height="92.0" width="292.0" data-name="TaskBox"></rect>
-							<path d="M9953.0 584.5 L10245.0 584.5" fill="none" data-name="TaskBox"></path>
-						</g>
-						<g transform="translate(9953, 553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskBox">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskBox">TaskBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9953, 584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskBox">+taskInstance: TaskInstance</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskBox">+icon: Icon</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskBox">+onCompleted: dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="16421.8" y="934.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(16421.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Routes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Routes">
-							<rect x="11699.3" y="0.0" height="393.0" width="366.0" data-name="Routes"></rect>
-							<path d="M11699.3 31.0 L12065.3 31.0" fill="none" data-name="Routes"></path>
-							<path d="M11699.3 347.0 L12065.3 347.0" fill="none" data-name="Routes"></path>
-						</g>
-						<g transform="translate(11699.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Routes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Routes">
-								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="Routes">Routes</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11699.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Routes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Routes">
-								<text x="0.0" y="13.5" stroke="none" data-name="Routes">&lt;static&gt;+loading: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Routes">&lt;static&gt;+preview: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Routes">&lt;static&gt;+appOutdated: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Routes">&lt;static&gt;+dashboard: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Routes">&lt;static&gt;+welcome: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Routes">&lt;static&gt;+about: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Routes">&lt;static&gt;+terms: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Routes">&lt;static&gt;+studySelection: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Routes">&lt;static&gt;+studyOverview: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Routes">&lt;static&gt;+interventionSelection: String</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Routes">&lt;static&gt;+journey: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="Routes">&lt;static&gt;+consent: String</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="Routes">&lt;static&gt;+kickoff: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="Routes">&lt;static&gt;+contact: String</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="Routes">&lt;static&gt;+faq: String</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="Routes">&lt;static&gt;+appSettings: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="Routes">&lt;static&gt;+questionnaire: String</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="Routes">&lt;static&gt;+reportHistory: String</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="Routes">&lt;static&gt;+reportDetails: String</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="Routes">&lt;static&gt;+performanceDetails: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11699.25, 347)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Routes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Routes">
-								<text x="0.0" y="13.5" stroke="none" data-name="Routes">&lt;static&gt;+Route&lt;dynamic&gt; unknownRoute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Routes">&lt;static&gt;+Route&lt;dynamic&gt;? generateRoute()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationValidators">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationValidators">
-							<rect x="16628.8" y="904.0" height="92.0" width="323.0" data-name="NotificationValidators"></rect>
-							<path d="M16628.8 935.0 L16951.8 935.0" fill="none" data-name="NotificationValidators"></path>
-						</g>
-						<g transform="translate(16628.75, 904)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationValidators">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationValidators">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationValidators">NotificationValidators</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16628.75, 935)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationValidators">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationValidators">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationValidators">+didNotificationLaunchApp: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationValidators">+wasNotificationActionHandled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationValidators">+wasNotificationActionCompleted: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyNotifications">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotifications">
-							<rect x="14574.0" y="455.5" height="288.0" width="626.0" data-name="StudyNotifications"></rect>
-							<path d="M14574.0 486.5 L15200.0 486.5" fill="none" data-name="StudyNotifications"></path>
-							<path d="M14574.0 622.5 L15200.0 622.5" fill="none" data-name="StudyNotifications"></path>
-						</g>
-						<g transform="translate(14574, 455.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotifications">
-								<text x="305.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotifications">StudyNotifications</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14574, 486.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotifications">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotifications">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotifications">+flutterLocalNotificationsPlugin: FlutterLocalNotificationsPlugin</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNotifications">+context: BuildContext</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNotifications">+didReceiveLocalNotificationStream: StreamController&lt;ReceivedNotification&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNotifications">+selectNotificationStream: StreamController&lt;String?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+validator: NotificationValidators</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+debug: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+scheduledNotificationsDebug: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14574, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotifications">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+dynamic create()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotifications">-dynamic _isAndroidPermissionGranted()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNotifications">-dynamic _requestPermissions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNotifications">-void _configureDidReceiveLocalNotificationSubject()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNotifications">-void _configureSelectNotificationSubject()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNotifications">-void _initNotificationsPlugin()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyNotifications">+dynamic handleNotificationResponse()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FlutterLocalNotificationsPlugin">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FlutterLocalNotificationsPlugin">
-							<rect x="16991.8" y="934.5" height="31.0" width="255.0" data-name="FlutterLocalNotificationsPlugin"></rect>
-						</g>
-						<g transform="translate(16991.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FlutterLocalNotificationsPlugin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FlutterLocalNotificationsPlugin">
-								<text x="119.5" y="13.5" stroke="none" text-anchor="middle" data-name="FlutterLocalNotificationsPlugin">FlutterLocalNotificationsPlugin</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BuildContext">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
-							<rect x="17286.8" y="934.5" height="31.0" width="116.0" data-name="BuildContext"></rect>
-						</g>
-						<g transform="translate(17286.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
-							<rect x="18366.5" y="934.5" height="31.0" width="149.0" data-name="StreamController"></rect>
-						</g>
-						<g transform="translate(18366.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReceivedNotification">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReceivedNotification">
-							<rect x="12105.3" y="143.0" height="107.0" width="178.0" data-name="ReceivedNotification"></rect>
-							<path d="M12105.3 174.0 L12283.3 174.0" fill="none" data-name="ReceivedNotification"></path>
-						</g>
-						<g transform="translate(12105.25, 143)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReceivedNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReceivedNotification">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReceivedNotification">ReceivedNotification</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12105.25, 174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReceivedNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReceivedNotification">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReceivedNotification">+id: int?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReceivedNotification">+title: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReceivedNotification">+body: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReceivedNotification">+payload: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyNotification">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotification">
-							<rect x="7529.5" y="561.0" height="77.0" width="243.0" data-name="StudyNotification"></rect>
-							<path d="M7529.5 592.0 L7772.5 592.0" fill="none" data-name="StudyNotification"></path>
-						</g>
-						<g transform="translate(7529.5, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotification">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotification">StudyNotification</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7529.5, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotification">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotification">+taskInstance: TaskInstance</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotification">+date: DateTime</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporaryStorageHandler">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporaryStorageHandler">
-							<rect x="12323.3" y="67.5" height="258.0" width="449.0" data-name="TemporaryStorageHandler"></rect>
-							<path d="M12323.3 98.5 L12772.3 98.5" fill="none" data-name="TemporaryStorageHandler"></path>
-							<path d="M12323.3 189.5 L12772.3 189.5" fill="none" data-name="TemporaryStorageHandler"></path>
-						</g>
-						<g transform="translate(12323.25, 67.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporaryStorageHandler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporaryStorageHandler">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="TemporaryStorageHandler">TemporaryStorageHandler</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12323.25, 98.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporaryStorageHandler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporaryStorageHandler">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-_stagingBaseNamePrefix: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-_audioFileType: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-_imageFileType: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporaryStorageHandler">-_userId: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporaryStorageHandler">-_studyId: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12323.25, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporaryStorageHandler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporaryStorageHandler">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporaryStorageHandler">-String _buildFileName()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-dynamic _getMultimodalTempDirectory()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-dynamic _getMultimodalUploadDirectory()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;+dynamic moveStagingFileToUploadDirectory()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;+dynamic getFutureBlobFiles()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporaryStorageHandler">+dynamic getStagingAudio()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TemporaryStorageHandler">+dynamic getStagingImage()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;+dynamic deleteAllStagingFiles()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GroupedIterable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GroupedIterable">
-							<rect x="12985.0" y="538.0" height="123.0" width="397.0" data-name="GroupedIterable"></rect>
-							<path d="M12985.0 569.0 L13382.0 569.0" fill="none" data-name="GroupedIterable"></path>
-							<path d="M12985.0 615.0 L13382.0 615.0" fill="none" data-name="GroupedIterable"></path>
-						</g>
-						<g transform="translate(12985, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GroupedIterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GroupedIterable">
-								<text x="190.5" y="13.5" stroke="none" text-anchor="middle" data-name="GroupedIterable">GroupedIterable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12985, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GroupedIterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GroupedIterable">
-								<text x="0.0" y="13.5" stroke="none" data-name="GroupedIterable">+data: Map&lt;K, Iterable&lt;V&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GroupedIterable">+iterator: Iterator&lt;MapEntry&lt;K, Iterable&lt;V&gt;&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12985, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GroupedIterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GroupedIterable">
-								<text x="0.0" y="13.5" stroke="none" data-name="GroupedIterable">+Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GroupedIterable">+Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregateWithKey()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Iterable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Iterable">
-							<rect x="13145.5" y="181.0" height="31.0" width="76.0" data-name="Iterable"></rect>
-						</g>
-						<g transform="translate(13145.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Iterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Iterable">
-								<text x="30.0" y="13.5" stroke="none" text-anchor="middle" data-name="Iterable">Iterable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Cache">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Cache">
-							<rect x="13843.8" y="105.0" height="183.0" width="297.0" data-name="Cache"></rect>
-							<path d="M13843.8 136.0 L14140.8 136.0" fill="none" data-name="Cache"></path>
-							<path d="M13843.8 167.0 L14140.8 167.0" fill="none" data-name="Cache"></path>
-						</g>
-						<g transform="translate(13843.75, 105)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Cache">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Cache">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="Cache">Cache</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13843.75, 136)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Cache">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Cache">
-								<text x="0.0" y="13.5" stroke="none" data-name="Cache">&lt;static&gt;+isSynchronizing: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13843.75, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Cache">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Cache">
-								<text x="0.0" y="13.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic storeSubject()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic loadSubject()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic storeAnalytics()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic loadAnalytics()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic uploadBlobFiles()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic synchronize()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppAnalytics">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppAnalytics">
-							<rect x="12333.0" y="493.0" height="213.0" width="335.0" data-name="AppAnalytics"></rect>
-							<path d="M12333.0 524.0 L12668.0 524.0" fill="none" data-name="AppAnalytics"></path>
-							<path d="M12333.0 615.0 L12668.0 615.0" fill="none" data-name="AppAnalytics"></path>
-						</g>
-						<g transform="translate(12333, 493)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppAnalytics">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppAnalytics">
-								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppAnalytics">AppAnalytics</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12333, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppAnalytics">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppAnalytics">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;-_userEnabled: bool?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+keyAnalyticsUserEnable: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppAnalytics">+context: BuildContext</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppAnalytics">+subject: StudySubject?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+isUserEnabled: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12333, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppAnalytics">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppAnalytics">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+dynamic init()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+dynamic start()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+void setEnabled()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppAnalytics">+dynamic initBasic()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppAnalytics">+void initAdvanced()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ThemeConfig">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeConfig">
-							<rect x="14180.8" y="165.5" height="62.0" width="399.0" data-name="ThemeConfig"></rect>
-							<path d="M14180.8 196.5 L14579.8 196.5" fill="none" data-name="ThemeConfig"></path>
-						</g>
-						<g transform="translate(14180.75, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeConfig">
-								<text x="191.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeConfig">ThemeConfig</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14180.75, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+SliderThemeData coloredSliderTheme()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionWidget">
-							<rect x="17470.5" y="561.0" height="77.0" width="403.0" data-name="ScaleQuestionWidget"></rect>
-							<path d="M17470.5 592.0 L17873.5 592.0" fill="none" data-name="ScaleQuestionWidget"></path>
-						</g>
-						<g transform="translate(17470.5, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionWidget">ScaleQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17470.5, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionWidget">+question: ScaleQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestion">
-							<rect x="18555.5" y="934.5" height="31.0" width="131.0" data-name="ScaleQuestion"></rect>
-						</g>
-						<g transform="translate(18555.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestion">
-								<text x="57.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestion">ScaleQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-							<rect x="18726.5" y="934.5" height="31.0" width="321.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(18726.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionWidget">
-							<rect x="21176.3" y="165.5" height="62.0" width="149.0" data-name="QuestionWidget"></rect>
-							<path d="M21176.3 196.5 L21325.3 196.5" fill="none" data-name="QuestionWidget"></path>
-						</g>
-						<g transform="translate(21176.25, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionWidget">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionWidget">QuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21176.25, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionWidget">+subtitle: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VisualAnalogueQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestionWidget">
-							<rect x="17913.5" y="561.0" height="77.0" width="403.0" data-name="VisualAnalogueQuestionWidget"></rect>
-							<path d="M17913.5 592.0 L18316.5 592.0" fill="none" data-name="VisualAnalogueQuestionWidget"></path>
-						</g>
-						<g transform="translate(17913.5, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestionWidget">VisualAnalogueQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17913.5, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="VisualAnalogueQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="VisualAnalogueQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+question: VisualAnalogueQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VisualAnalogueQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestion">
-							<rect x="19087.5" y="934.5" height="31.0" width="210.0" data-name="VisualAnalogueQuestion"></rect>
-						</g>
-						<g transform="translate(19087.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestion">
-								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestion">VisualAnalogueQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AnnotatedScaleQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestionWidget">
-							<rect x="18863.5" y="561.0" height="77.0" width="403.0" data-name="AnnotatedScaleQuestionWidget"></rect>
-							<path d="M18863.5 592.0 L19266.5 592.0" fill="none" data-name="AnnotatedScaleQuestionWidget"></path>
-						</g>
-						<g transform="translate(18863.5, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestionWidget">AnnotatedScaleQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18863.5, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AnnotatedScaleQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+question: AnnotatedScaleQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AnnotatedScaleQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestion">
-							<rect x="19337.5" y="934.5" height="31.0" width="212.0" data-name="AnnotatedScaleQuestion"></rect>
-						</g>
-						<g transform="translate(19337.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestion">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestion">AnnotatedScaleQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BooleanQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestionWidget">
-							<rect x="20827.8" y="561.0" height="77.0" width="403.0" data-name="BooleanQuestionWidget"></rect>
-							<path d="M20827.8 592.0 L21230.8 592.0" fill="none" data-name="BooleanQuestionWidget"></path>
-						</g>
-						<g transform="translate(20827.75, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestionWidget">BooleanQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20827.75, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BooleanQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BooleanQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="BooleanQuestionWidget">+question: BooleanQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BooleanQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BooleanQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestion">
-							<rect x="19689.5" y="934.5" height="31.0" width="152.0" data-name="BooleanQuestion"></rect>
-						</g>
-						<g transform="translate(19689.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestion">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestion">BooleanQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionWidget">
-							<rect x="21270.8" y="561.0" height="77.0" width="403.0" data-name="FreeTextQuestionWidget"></rect>
-							<path d="M21270.8 592.0 L21673.8 592.0" fill="none" data-name="FreeTextQuestionWidget"></path>
-						</g>
-						<g transform="translate(21270.75, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionWidget">FreeTextQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21270.75, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionWidget">+question: FreeTextQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestion">
-							<rect x="20005.8" y="934.5" height="31.0" width="157.0" data-name="FreeTextQuestion"></rect>
-						</g>
-						<g transform="translate(20005.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestion">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestion">FreeTextQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionWidget">
-							<rect x="21722.8" y="546.0" height="107.0" width="393.0" data-name="ChoiceQuestionWidget"></rect>
-							<path d="M21722.8 577.0 L22115.8 577.0" fill="none" data-name="ChoiceQuestionWidget"></path>
-						</g>
-						<g transform="translate(21722.75, 546)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionWidget">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionWidget">ChoiceQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21722.75, 577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionWidget">+question: ChoiceQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionWidget">+multiSelectionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionWidget">+subtitle: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestion">
-							<rect x="20202.8" y="934.5" height="31.0" width="142.0" data-name="ChoiceQuestion"></rect>
-						</g>
-						<g transform="translate(20202.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestion">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestion">ChoiceQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-							<rect x="20384.8" y="934.5" height="31.0" width="311.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)"></rect>
-						</g>
-						<g transform="translate(20384.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-								<text x="147.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)">dynamic Function(Answer&lt;dynamic&gt;)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionWidget">
-							<rect x="22155.8" y="561.0" height="77.0" width="451.0" data-name="AudioRecordingQuestionWidget"></rect>
-							<path d="M22155.8 592.0 L22606.8 592.0" fill="none" data-name="AudioRecordingQuestionWidget"></path>
-						</g>
-						<g transform="translate(22155.75, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionWidget">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionWidget">AudioRecordingQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22155.75, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionWidget">+question: AudioRecordingQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioRecordingQuestionWidget">+onDone: dynamic Function(Answer&lt;FutureBlobFile&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioRecordingQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestion">
-							<rect x="20735.8" y="934.5" height="31.0" width="213.0" data-name="AudioRecordingQuestion"></rect>
-						</g>
-						<g transform="translate(20735.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestion">
-								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestion">AudioRecordingQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">
-							<rect x="20988.8" y="934.5" height="31.0" width="369.0" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?"></rect>
-						</g>
-						<g transform="translate(20988.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">
-								<text x="176.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">dynamic Function(Answer&lt;FutureBlobFile&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireWidget">
-							<rect x="18335.0" y="143.0" height="107.0" width="318.0" data-name="QuestionnaireWidget"></rect>
-							<path d="M18335.0 174.0 L18653.0 174.0" fill="none" data-name="QuestionnaireWidget"></path>
-						</g>
-						<g transform="translate(18335, 143)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireWidget">
-								<text x="151.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireWidget">QuestionnaireWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18335, 174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireWidget">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireWidget">+header: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireWidget">+footer: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionnaireWidget">+questions: List&lt;Question&lt;dynamic&gt;&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="HtmlTextBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlTextBox">
-							<rect x="18693.0" y="150.0" height="93.0" width="136.0" data-name="HtmlTextBox"></rect>
-							<path d="M18693.0 181.0 L18829.0 181.0" fill="none" data-name="HtmlTextBox"></path>
-							<path d="M18693.0 212.0 L18829.0 212.0" fill="none" data-name="HtmlTextBox"></path>
-						</g>
-						<g transform="translate(18693, 150)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlTextBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlTextBox">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlTextBox">HtmlTextBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18693, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlTextBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlTextBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlTextBox">+text: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18693, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlTextBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlTextBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlTextBox">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageCapturingQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionWidget">
-							<rect x="22897.8" y="561.0" height="77.0" width="451.0" data-name="ImageCapturingQuestionWidget"></rect>
-							<path d="M22897.8 592.0 L23348.8 592.0" fill="none" data-name="ImageCapturingQuestionWidget"></path>
-						</g>
-						<g transform="translate(22897.75, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionWidget">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionWidget">ImageCapturingQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22897.75, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionWidget">+question: ImageCapturingQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageCapturingQuestionWidget">+onDone: dynamic Function(Answer&lt;FutureBlobFile&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageCapturingQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestion">
-							<rect x="21517.8" y="934.5" height="31.0" width="213.0" data-name="ImageCapturingQuestion"></rect>
-						</g>
-						<g transform="translate(21517.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestion">
-								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestion">ImageCapturingQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionContainer">
-							<rect x="17873.0" y="150.5" height="92.0" width="422.0" data-name="QuestionContainer"></rect>
-							<path d="M17873.0 181.5 L18295.0 181.5" fill="none" data-name="QuestionContainer"></path>
-						</g>
-						<g transform="translate(17873, 150.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionContainer">
-								<text x="203.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionContainer">QuestionContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17873, 181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionContainer">+onDone: dynamic Function(Answer&lt;dynamic&gt;, int)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionContainer">+question: Question&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionContainer">+index: int</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-							<rect x="18356.5" y="584.0" height="31.0" width="340.0" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)"></rect>
-						</g>
-						<g transform="translate(18356.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">dynamic Function(Answer&lt;dynamic&gt;, int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Question">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Question">
-							<rect x="18736.5" y="584.0" height="31.0" width="87.0" data-name="Question"></rect>
-						</g>
-						<g transform="translate(18736.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Question">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Question">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="Question">Question</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionHeader">
-							<rect x="19173.0" y="120.0" height="153.0" width="316.0" data-name="QuestionHeader"></rect>
-							<path d="M19173.0 151.0 L19489.0 151.0" fill="none" data-name="QuestionHeader"></path>
-							<path d="M19173.0 212.0 L19489.0 212.0" fill="none" data-name="QuestionHeader"></path>
-						</g>
-						<g transform="translate(19173, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionHeader">
-								<text x="150.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionHeader">QuestionHeader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19173, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionHeader">+prompt: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionHeader">+subtitle: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionHeader">+rationale: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19173, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionHeader">-List&lt;Widget&gt; _buildSubtitle()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionHeader">-List&lt;Widget&gt; _buildRationaleButton()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionHeader">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomSlider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomSlider">
-							<rect x="16652.5" y="440.5" height="318.0" width="364.0" data-name="CustomSlider"></rect>
-							<path d="M16652.5 471.5 L17016.5 471.5" fill="none" data-name="CustomSlider"></path>
-							<path d="M16652.5 727.5 L17016.5 727.5" fill="none" data-name="CustomSlider"></path>
-						</g>
-						<g transform="translate(16652.5, 440.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomSlider">
-								<text x="174.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomSlider">CustomSlider</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16652.5, 471.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomSlider">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomSlider">+value: double?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomSlider">+minValue: double?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomSlider">+maxValue: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomSlider">+minorTick: int?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomSlider">+onChanged: dynamic Function(double)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomSlider">+onChangeEnd: dynamic Function(double)?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="CustomSlider">+activeColor: Color?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="CustomSlider">+inactiveColor: Color?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="CustomSlider">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="CustomSlider">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="CustomSlider">+thumbColor: Color?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="CustomSlider">+isColored: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="CustomSlider">+labelValuePrecision: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="CustomSlider">+tickValuePrecision: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="CustomSlider">+linearStep: bool</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="CustomSlider">+steps: AnnotatedScaleQuestion?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16652.5, 727.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomSlider">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomSlider">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(double)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(double)?">
-							<rect x="21770.8" y="934.5" height="31.0" width="231.0" data-name="dynamic Function(double)?"></rect>
-						</g>
-						<g transform="translate(21770.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(double)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(double)?">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(double)?">dynamic Function(double)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomTrackShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomTrackShape">
-							<rect x="19448.3" y="568.5" height="62.0" width="214.0" data-name="CustomTrackShape"></rect>
-							<path d="M19448.3 599.5 L19662.3 599.5" fill="none" data-name="CustomTrackShape"></path>
-						</g>
-						<g transform="translate(19448.25, 568.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomTrackShape">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomTrackShape">CustomTrackShape</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19448.25, 599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomTrackShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomTrackShape">+Rect getPreferredRect()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoundedRectSliderTrackShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoundedRectSliderTrackShape">
-							<rect x="18869.0" y="181.0" height="31.0" width="264.0" data-name="RoundedRectSliderTrackShape"></rect>
-						</g>
-						<g transform="translate(18869, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoundedRectSliderTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoundedRectSliderTrackShape">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoundedRectSliderTrackShape">RoundedRectSliderTrackShape</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BottomOnboardingNavigation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BottomOnboardingNavigation">
-							<rect x="9108.5" y="500.5" height="198.0" width="248.0" data-name="BottomOnboardingNavigation"></rect>
-							<path d="M9108.5 531.5 L9356.5 531.5" fill="none" data-name="BottomOnboardingNavigation"></path>
-							<path d="M9108.5 667.5 L9356.5 667.5" fill="none" data-name="BottomOnboardingNavigation"></path>
-						</g>
-						<g transform="translate(9108.5, 500.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BottomOnboardingNavigation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BottomOnboardingNavigation">
-								<text x="116.0" y="13.5" stroke="none" text-anchor="middle" data-name="BottomOnboardingNavigation">BottomOnboardingNavigation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9108.5, 531.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BottomOnboardingNavigation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BottomOnboardingNavigation">
-								<text x="0.0" y="13.5" stroke="none" data-name="BottomOnboardingNavigation">+onBack: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BottomOnboardingNavigation">+onNext: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BottomOnboardingNavigation">+backLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BottomOnboardingNavigation">+nextLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BottomOnboardingNavigation">+hideNext: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BottomOnboardingNavigation">+nextIcon: Icon?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="BottomOnboardingNavigation">+backIcon: Icon?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="BottomOnboardingNavigation">+progress: Widget?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9108.5, 667.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BottomOnboardingNavigation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BottomOnboardingNavigation">
-								<text x="0.0" y="13.5" stroke="none" data-name="BottomOnboardingNavigation">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionCard">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionCard">
-							<rect x="13996.0" y="515.5" height="168.0" width="247.0" data-name="InterventionCard"></rect>
-							<path d="M13996.0 546.5 L14243.0 546.5" fill="none" data-name="InterventionCard"></path>
-							<path d="M13996.0 652.5 L14243.0 652.5" fill="none" data-name="InterventionCard"></path>
-						</g>
-						<g transform="translate(13996, 515.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionCard">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionCard">InterventionCard</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13996, 546.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCard">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionCard">+selected: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionCard">+showCheckbox: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionCard">+showTasks: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionCard">+showDescription: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionCard">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13996, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCard">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionCardTitle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionCardTitle">
-							<rect x="14283.0" y="523.0" height="153.0" width="251.0" data-name="InterventionCardTitle"></rect>
-							<path d="M14283.0 554.0 L14534.0 554.0" fill="none" data-name="InterventionCardTitle"></path>
-							<path d="M14283.0 645.0 L14534.0 645.0" fill="none" data-name="InterventionCardTitle"></path>
-						</g>
-						<g transform="translate(14283, 523)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionCardTitle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionCardTitle">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionCardTitle">InterventionCardTitle</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14283, 554)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardTitle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardTitle">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardTitle">+intervention: Intervention?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionCardTitle">+selected: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionCardTitle">+showCheckbox: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionCardTitle">+showDescriptionButton: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionCardTitle">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14283, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardTitle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardTitle">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardTitle">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionCardDescription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionCardDescription">
-							<rect x="12708.0" y="553.0" height="93.0" width="237.0" data-name="InterventionCardDescription"></rect>
-							<path d="M12708.0 584.0 L12945.0 584.0" fill="none" data-name="InterventionCardDescription"></path>
-							<path d="M12708.0 615.0 L12945.0 615.0" fill="none" data-name="InterventionCardDescription"></path>
-						</g>
-						<g transform="translate(12708, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionCardDescription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionCardDescription">
-								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionCardDescription">InterventionCardDescription</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12708, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardDescription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardDescription">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardDescription">+intervention: Intervention</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12708, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardDescription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardDescription">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardDescription">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_TaskList">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_TaskList">
-							<rect x="22493.5" y="142.5" height="108.0" width="258.0" data-name="_TaskList"></rect>
-							<path d="M22493.5 173.5 L22751.5 173.5" fill="none" data-name="_TaskList"></path>
-							<path d="M22493.5 204.5 L22751.5 204.5" fill="none" data-name="_TaskList"></path>
-						</g>
-						<g transform="translate(22493.5, 142.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_TaskList">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_TaskList">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="_TaskList">_TaskList</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22493.5, 173.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_TaskList">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_TaskList">
-								<text x="0.0" y="13.5" stroke="none" data-name="_TaskList">+tasks: List&lt;InterventionTask&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22493.5, 204.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_TaskList">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_TaskList">
-								<text x="0.0" y="13.5" stroke="none" data-name="_TaskList">+String scheduleString()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_TaskList">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTile">
-							<rect x="19702.3" y="523.0" height="153.0" width="326.0" data-name="StudyTile"></rect>
-							<path d="M19702.3 554.0 L20028.3 554.0" fill="none" data-name="StudyTile"></path>
-							<path d="M19702.3 645.0 L20028.3 645.0" fill="none" data-name="StudyTile"></path>
-						</g>
-						<g transform="translate(19702.25, 523)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTile">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTile">StudyTile</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19702.25, 554)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTile">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTile">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyTile">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyTile">+onTap: dynamic Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyTile">+contentPadding: EdgeInsetsGeometry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19702.25, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTile">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EdgeInsetsGeometry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsetsGeometry">
-							<rect x="22041.8" y="934.5" height="31.0" width="182.0" data-name="EdgeInsetsGeometry"></rect>
-						</g>
-						<g transform="translate(22041.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="EdgeInsetsGeometry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsetsGeometry">
-								<text x="83.0" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsetsGeometry">EdgeInsetsGeometry</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoundCheckbox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoundCheckbox">
-							<rect x="22791.5" y="142.5" height="108.0" width="323.0" data-name="RoundCheckbox"></rect>
-							<path d="M22791.5 173.5 L23114.5 173.5" fill="none" data-name="RoundCheckbox"></path>
-							<path d="M22791.5 219.5 L23114.5 219.5" fill="none" data-name="RoundCheckbox"></path>
-						</g>
-						<g transform="translate(22791.5, 142.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoundCheckbox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoundCheckbox">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoundCheckbox">RoundCheckbox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22791.5, 173.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoundCheckbox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoundCheckbox">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoundCheckbox">+onChanged: dynamic Function(bool)?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoundCheckbox">+value: bool?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22791.5, 219.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoundCheckbox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoundCheckbox">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoundCheckbox">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(bool)?">
-							<rect x="22646.8" y="584.0" height="31.0" width="211.0" data-name="dynamic Function(bool)?"></rect>
-						</g>
-						<g transform="translate(22646.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(bool)?">
-								<text x="97.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(bool)?">dynamic Function(bool)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SelectableButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SelectableButton">
-							<rect x="13709.0" y="523.0" height="153.0" width="247.0" data-name="SelectableButton"></rect>
-							<path d="M13709.0 554.0 L13956.0 554.0" fill="none" data-name="SelectableButton"></path>
-							<path d="M13709.0 615.0 L13956.0 615.0" fill="none" data-name="SelectableButton"></path>
-						</g>
-						<g transform="translate(13709, 523)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SelectableButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SelectableButton">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="SelectableButton">SelectableButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13709, 554)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SelectableButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SelectableButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SelectableButton">+child: Widget</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SelectableButton">+selected: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SelectableButton">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13709, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SelectableButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SelectableButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SelectableButton">-Color _getFillColor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SelectableButton">-Color _getTextColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SelectableButton">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="HtmlText">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlText">
-							<rect x="23355.3" y="135.0" height="123.0" width="156.0" data-name="HtmlText"></rect>
-							<path d="M23355.3 166.0 L23511.3 166.0" fill="none" data-name="HtmlText"></path>
-							<path d="M23355.3 227.0 L23511.3 227.0" fill="none" data-name="HtmlText"></path>
-						</g>
-						<g transform="translate(23355.25, 135)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlText">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlText">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlText">HtmlText</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23355.25, 166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlText">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlText">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlText">+text: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="HtmlText">+style: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="HtmlText">+centered: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23355.25, 227)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlText">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlText">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlText">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TextStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
-							<rect x="23388.8" y="584.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
-						</g>
-						<g transform="translate(23388.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
-								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MyApp">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MyApp">
-							<rect x="23551.3" y="150.5" height="92.0" width="328.0" data-name="MyApp"></rect>
-							<path d="M23551.3 181.5 L23879.3 181.5" fill="none" data-name="MyApp"></path>
-						</g>
-						<g transform="translate(23551.25, 150.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MyApp">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MyApp">
-								<text x="156.0" y="13.5" stroke="none" text-anchor="middle" data-name="MyApp">MyApp</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23551.25, 181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MyApp">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MyApp">
-								<text x="0.0" y="13.5" stroke="none" data-name="MyApp">+queryParameters: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MyApp">+appConfig: AppConfig?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MyApp">+initialRoute: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppConfig">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppConfig">
-							<rect x="23666.3" y="584.0" height="31.0" width="98.0" data-name="AppConfig"></rect>
-						</g>
-						<g transform="translate(23666.25, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppConfig">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppConfig">AppConfig</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/util/uml.svg b/docs/uml/app/lib/util/uml.svg
deleted file mode 100644
index d4be4e904..000000000
--- a/docs/uml/app/lib/util/uml.svg
+++ /dev/null
@@ -1,448 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2660.5" height="507.0" viewbox="0 0 2660.5 507" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[NotificationValidators
-	  |
-	  +didNotificationLaunchApp: bool;
-	  +wasNotificationActionHandled: bool;
-	  +wasNotificationActionCompleted: bool
-	]
-	
-	[StudyNotifications
-	  |
-	  +subject: StudySubject?;
-	  +flutterLocalNotificationsPlugin: FlutterLocalNotificationsPlugin;
-	  +context: BuildContext;
-	  +didReceiveLocalNotificationStream: StreamController&lt;ReceivedNotification&gt;;
-	  +selectNotificationStream: StreamController&lt;String?&gt;;
-	  &lt;static&gt;+validator: NotificationValidators;
-	  &lt;static&gt;+debug: bool;
-	  &lt;static&gt;+scheduledNotificationsDebug: String?
-	  |
-	  &lt;static&gt;+dynamic create();
-	  -dynamic _isAndroidPermissionGranted();
-	  -dynamic _requestPermissions();
-	  -void _configureDidReceiveLocalNotificationSubject();
-	  -void _configureSelectNotificationSubject();
-	  -void _initNotificationsPlugin();
-	  +dynamic handleNotificationResponse()
-	]
-	
-	[StudyNotifications]o-[StudySubject]
-	[StudyNotifications]o-[FlutterLocalNotificationsPlugin]
-	[StudyNotifications]o-[&lt;abstract&gt;BuildContext]
-	[StudyNotifications]o-[StreamController]
-	[StudyNotifications]o-[NotificationValidators]
-	
-	[ReceivedNotification
-	  |
-	  +id: int?;
-	  +title: String?;
-	  +body: String?;
-	  +payload: String?
-	]
-	
-	[StudyNotification
-	  |
-	  +taskInstance: TaskInstance;
-	  +date: DateTime
-	]
-	
-	[StudyNotification]o-[TaskInstance]
-	
-	[TemporaryStorageHandler
-	  |
-	  &lt;static&gt;-_stagingBaseNamePrefix: String;
-	  &lt;static&gt;-_audioFileType: String;
-	  &lt;static&gt;-_imageFileType: String;
-	  -_userId: String;
-	  -_studyId: String
-	  |
-	  -String _buildFileName();
-	  &lt;static&gt;-dynamic _getMultimodalTempDirectory();
-	  &lt;static&gt;-dynamic _getMultimodalUploadDirectory();
-	  &lt;static&gt;+dynamic moveStagingFileToUploadDirectory();
-	  &lt;static&gt;+dynamic getFutureBlobFiles();
-	  +dynamic getStagingAudio();
-	  +dynamic getStagingImage();
-	  &lt;static&gt;+dynamic deleteAllStagingFiles()
-	]
-	
-	[GroupedIterable
-	  |
-	  +data: Map&lt;K, Iterable&lt;V&gt;&gt;;
-	  +iterator: Iterator&lt;MapEntry&lt;K, Iterable&lt;V&gt;&gt;&gt;
-	  |
-	  +Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregate();
-	  +Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregateWithKey()
-	]
-	
-	[Iterable]&lt;:-[GroupedIterable]
-	
-	[Cache
-	  |
-	  &lt;static&gt;+isSynchronizing: bool
-	  |
-	  &lt;static&gt;+dynamic storeSubject();
-	  &lt;static&gt;+dynamic loadSubject();
-	  &lt;static&gt;+dynamic storeAnalytics();
-	  &lt;static&gt;+dynamic loadAnalytics();
-	  &lt;static&gt;+dynamic delete();
-	  &lt;static&gt;+dynamic uploadBlobFiles();
-	  &lt;static&gt;+dynamic synchronize()
-	]
-	
-	[AppAnalytics
-	  |
-	  &lt;static&gt;-_userEnabled: bool?;
-	  &lt;static&gt;+keyAnalyticsUserEnable: String;
-	  +context: BuildContext;
-	  +subject: StudySubject?;
-	  &lt;static&gt;+isUserEnabled: dynamic
-	  |
-	  &lt;static&gt;+dynamic init();
-	  &lt;static&gt;+dynamic start();
-	  &lt;static&gt;+void setEnabled();
-	  +dynamic initBasic();
-	  +void initAdvanced()
-	]
-	
-	[AppAnalytics]o-[&lt;abstract&gt;BuildContext]
-	[AppAnalytics]o-[StudySubject]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="507.0" width="2660.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M575.2 247.9 L384 308 L192.47852760736197 374 L192.5 374.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M585.7 250.2 L575.2 247.9 L582.5 240.0 L593.0 242.3 Z"></path>
-					</g>
-					<path d="M906.0 306.7 L906 308 L906 374 L906.0 374.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M911.3 297.3 L906.0 306.7 L900.7 297.3 L906.0 288.0 Z"></path>
-					</g>
-					<path d="M599.3 296.3 L575.75 308 L500.63957055214723 374 L500.6 374.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M610.0 296.9 L599.3 296.3 L605.3 287.4 L616.0 288.0 Z"></path>
-					</g>
-					<path d="M1215.6 296.2 L1239.5 308 L1239.5 374 L1239.5 374.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1209.6 287.3 L1215.6 296.2 L1204.9 296.9 L1198.8 288.0 Z"></path>
-					</g>
-					<path d="M1237.0 233.1 L1515.5 308 L1515.5 343.5 L1515.5 343.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1229.4 225.5 L1237.0 233.1 L1226.6 235.8 L1219.0 228.2 Z"></path>
-					</g>
-					<path d="M1869.5 201.2 L1869.5 308 L1869.5 374 L1869.5 374.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1874.8 191.8 L1869.5 201.2 L1864.2 191.8 L1869.5 182.5 Z"></path>
-					</g>
-					<path d="M2406.0 172.8 L2406 308 L2406 328 L2406.0 328.0 " fill="none"></path>
-					<path d="M2411.3 172.8 L2406.0 172.8 L2400.7 172.8 L2406.0 159.5 Z"></path>
-					<path d="M349.8 260.6 L424 308 L471.77914110429447 374 L471.8 374.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M344.8 251.0 L349.8 260.6 L339.1 260.0 L334.1 250.5 Z"></path>
-					</g>
-					<path d="M137.1 268.6 L127.5 308 L143.69631901840492 374 L143.7 374.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M144.5 260.8 L137.1 268.6 L134.1 258.3 L141.5 250.5 Z"></path>
-					</g>
-					<g data-name="NotificationValidators">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationValidators">
-							<rect x="1354.0" y="343.5" height="92.0" width="323.0" data-name="NotificationValidators"></rect>
-							<path d="M1354.0 374.5 L1677.0 374.5" fill="none" data-name="NotificationValidators"></path>
-						</g>
-						<g transform="translate(1354, 343.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationValidators">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationValidators">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationValidators">NotificationValidators</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1354, 374.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationValidators">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationValidators">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationValidators">+didNotificationLaunchApp: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationValidators">+wasNotificationActionHandled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationValidators">+wasNotificationActionCompleted: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyNotifications">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotifications">
-							<rect x="593.0" y="0.0" height="288.0" width="626.0" data-name="StudyNotifications"></rect>
-							<path d="M593.0 31.0 L1219.0 31.0" fill="none" data-name="StudyNotifications"></path>
-							<path d="M593.0 167.0 L1219.0 167.0" fill="none" data-name="StudyNotifications"></path>
-						</g>
-						<g transform="translate(593, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotifications">
-								<text x="305.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotifications">StudyNotifications</text>
-								
-							</g>
-						</g>
-						<g transform="translate(593, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotifications">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotifications">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotifications">+flutterLocalNotificationsPlugin: FlutterLocalNotificationsPlugin</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNotifications">+context: BuildContext</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNotifications">+didReceiveLocalNotificationStream: StreamController&lt;ReceivedNotification&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNotifications">+selectNotificationStream: StreamController&lt;String?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+validator: NotificationValidators</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+debug: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+scheduledNotificationsDebug: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(593, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotifications">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+dynamic create()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotifications">-dynamic _isAndroidPermissionGranted()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNotifications">-dynamic _requestPermissions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNotifications">-void _configureDidReceiveLocalNotificationSubject()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNotifications">-void _configureSelectNotificationSubject()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNotifications">-void _initNotificationsPlugin()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyNotifications">+dynamic handleNotificationResponse()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="87.5" y="374.0" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(87.5, 374)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FlutterLocalNotificationsPlugin">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FlutterLocalNotificationsPlugin">
-							<rect x="778.5" y="374.0" height="31.0" width="255.0" data-name="FlutterLocalNotificationsPlugin"></rect>
-						</g>
-						<g transform="translate(778.5, 374)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FlutterLocalNotificationsPlugin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FlutterLocalNotificationsPlugin">
-								<text x="119.5" y="13.5" stroke="none" text-anchor="middle" data-name="FlutterLocalNotificationsPlugin">FlutterLocalNotificationsPlugin</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BuildContext">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
-							<rect x="425.0" y="374.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
-						</g>
-						<g transform="translate(425, 374)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
-							<rect x="1165.0" y="374.0" height="31.0" width="149.0" data-name="StreamController"></rect>
-						</g>
-						<g transform="translate(1165, 374)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReceivedNotification">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReceivedNotification">
-							<rect x="375.0" y="90.5" height="107.0" width="178.0" data-name="ReceivedNotification"></rect>
-							<path d="M375.0 121.5 L553.0 121.5" fill="none" data-name="ReceivedNotification"></path>
-						</g>
-						<g transform="translate(375, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReceivedNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReceivedNotification">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReceivedNotification">ReceivedNotification</text>
-								
-							</g>
-						</g>
-						<g transform="translate(375, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReceivedNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReceivedNotification">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReceivedNotification">+id: int?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReceivedNotification">+title: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReceivedNotification">+body: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReceivedNotification">+payload: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyNotification">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotification">
-							<rect x="1748.0" y="105.5" height="77.0" width="243.0" data-name="StudyNotification"></rect>
-							<path d="M1748.0 136.5 L1991.0 136.5" fill="none" data-name="StudyNotification"></path>
-						</g>
-						<g transform="translate(1748, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotification">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotification">StudyNotification</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1748, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotification">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotification">+taskInstance: TaskInstance</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotification">+date: DateTime</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskInstance">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskInstance">
-							<rect x="1808.5" y="374.0" height="31.0" width="122.0" data-name="TaskInstance"></rect>
-						</g>
-						<g transform="translate(1808.5, 374)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskInstance">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskInstance">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskInstance">TaskInstance</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporaryStorageHandler">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporaryStorageHandler">
-							<rect x="1259.0" y="15.0" height="258.0" width="449.0" data-name="TemporaryStorageHandler"></rect>
-							<path d="M1259.0 46.0 L1708.0 46.0" fill="none" data-name="TemporaryStorageHandler"></path>
-							<path d="M1259.0 137.0 L1708.0 137.0" fill="none" data-name="TemporaryStorageHandler"></path>
-						</g>
-						<g transform="translate(1259, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporaryStorageHandler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporaryStorageHandler">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="TemporaryStorageHandler">TemporaryStorageHandler</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1259, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporaryStorageHandler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporaryStorageHandler">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-_stagingBaseNamePrefix: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-_audioFileType: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-_imageFileType: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporaryStorageHandler">-_userId: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporaryStorageHandler">-_studyId: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1259, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporaryStorageHandler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporaryStorageHandler">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporaryStorageHandler">-String _buildFileName()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-dynamic _getMultimodalTempDirectory()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-dynamic _getMultimodalUploadDirectory()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;+dynamic moveStagingFileToUploadDirectory()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;+dynamic getFutureBlobFiles()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporaryStorageHandler">+dynamic getStagingAudio()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TemporaryStorageHandler">+dynamic getStagingImage()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;+dynamic deleteAllStagingFiles()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GroupedIterable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GroupedIterable">
-							<rect x="2207.5" y="328.0" height="123.0" width="397.0" data-name="GroupedIterable"></rect>
-							<path d="M2207.5 359.0 L2604.5 359.0" fill="none" data-name="GroupedIterable"></path>
-							<path d="M2207.5 405.0 L2604.5 405.0" fill="none" data-name="GroupedIterable"></path>
-						</g>
-						<g transform="translate(2207.5, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GroupedIterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GroupedIterable">
-								<text x="190.5" y="13.5" stroke="none" text-anchor="middle" data-name="GroupedIterable">GroupedIterable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2207.5, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GroupedIterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GroupedIterable">
-								<text x="0.0" y="13.5" stroke="none" data-name="GroupedIterable">+data: Map&lt;K, Iterable&lt;V&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GroupedIterable">+iterator: Iterator&lt;MapEntry&lt;K, Iterable&lt;V&gt;&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2207.5, 405)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GroupedIterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GroupedIterable">
-								<text x="0.0" y="13.5" stroke="none" data-name="GroupedIterable">+Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GroupedIterable">+Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregateWithKey()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Iterable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Iterable">
-							<rect x="2368.0" y="128.5" height="31.0" width="76.0" data-name="Iterable"></rect>
-						</g>
-						<g transform="translate(2368, 128.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Iterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Iterable">
-								<text x="30.0" y="13.5" stroke="none" text-anchor="middle" data-name="Iterable">Iterable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Cache">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Cache">
-							<rect x="2031.0" y="52.5" height="183.0" width="297.0" data-name="Cache"></rect>
-							<path d="M2031.0 83.5 L2328.0 83.5" fill="none" data-name="Cache"></path>
-							<path d="M2031.0 114.5 L2328.0 114.5" fill="none" data-name="Cache"></path>
-						</g>
-						<g transform="translate(2031, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Cache">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Cache">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="Cache">Cache</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2031, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Cache">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Cache">
-								<text x="0.0" y="13.5" stroke="none" data-name="Cache">&lt;static&gt;+isSynchronizing: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2031, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Cache">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Cache">
-								<text x="0.0" y="13.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic storeSubject()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic loadSubject()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic storeAnalytics()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic loadAnalytics()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic uploadBlobFiles()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic synchronize()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppAnalytics">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppAnalytics">
-							<rect x="0.0" y="37.5" height="213.0" width="335.0" data-name="AppAnalytics"></rect>
-							<path d="M0.0 68.5 L335.0 68.5" fill="none" data-name="AppAnalytics"></path>
-							<path d="M0.0 159.5 L335.0 159.5" fill="none" data-name="AppAnalytics"></path>
-						</g>
-						<g transform="translate(0, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppAnalytics">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppAnalytics">
-								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppAnalytics">AppAnalytics</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppAnalytics">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppAnalytics">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;-_userEnabled: bool?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+keyAnalyticsUserEnable: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppAnalytics">+context: BuildContext</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppAnalytics">+subject: StudySubject?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+isUserEnabled: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppAnalytics">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppAnalytics">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+dynamic init()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+dynamic start()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+void setEnabled()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppAnalytics">+dynamic initBasic()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppAnalytics">+void initAdvanced()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/uml.svg b/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/uml.svg
deleted file mode 100644
index 557598554..000000000
--- a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/uml.svg
+++ /dev/null
@@ -1,1066 +0,0 @@
-<svg version="1.1" baseProfile="full" width="4932.3" height="2073.0" viewbox="0 0 4932.25 2073" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;QuestionFormData
-	  |
-	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
-	  +questionId: String;
-	  +questionText: String;
-	  +questionInfoText: String?;
-	  +questionType: SurveyQuestionType;
-	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
-	  +responseOptions: List&lt;dynamic&gt;;
-	  +id: String
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +EligibilityCriterion toEligibilityCriterion();
-	  +Answer&lt;dynamic&gt; constructAnswerFor();
-	  +dynamic setResponseOptionsValidityFrom();
-	  +QuestionFormData copy()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
-	
-	[ChoiceQuestionFormData
-	  |
-	  +isMultipleChoice: bool;
-	  +answerOptions: List&lt;String&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +QuestionFormData copy();
-	  -Choice _buildChoiceForValue();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
-	
-	[BoolQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +BoolQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
-	
-	[ImageQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +ImageQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
-	
-	[AudioQuestionFormData
-	  |
-	  +maxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +AudioQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
-	
-	[ScaleQuestionFormData
-	  |
-	  +minValue: double;
-	  +maxValue: double;
-	  +minLabel: String?;
-	  +maxLabel: String?;
-	  +midValues: List&lt;double?&gt;;
-	  +midLabels: List&lt;String?&gt;;
-	  +stepSize: double;
-	  +initialValue: double?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +responseOptions: List&lt;double&gt;;
-	  +midAnnotations: List&lt;Annotation&gt;
-	  |
-	  +ScaleQuestion toQuestion();
-	  +QuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[ScaleQuestionFormData]o-[Color]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
-	
-	[FreeTextQuestionFormData
-	  |
-	  +textLengthRange: List&lt;int&gt;;
-	  +textType: FreeTextQuestionType;
-	  +textTypeExpression: String?;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +FreeTextQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
-	
-	[AudioRecordingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
-	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
-	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
-	]
-	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
-	
-	[SurveyQuestionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
-	]
-	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[ImageCapturingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	]
-	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
-	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
-	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
-	[QuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
-	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
-	]
-	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
-	
-	[SurveyQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
-	]
-	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="2073.0" width="4932.3" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M1543.4 1087.1 L2528.25 1638 L3865.75 1782.4042132982224 L3865.8 1782.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1537.9 1077.9 L1543.4 1087.1 L1532.7 1087.2 L1527.1 1078.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1296.5 199.8 L1296.5 260 L1296.5 820 L1296.5 820.0 " fill="none"></path>
-					</g>
-					<path d="M1301.8 199.8 L1296.5 199.8 L1291.2 199.8 L1296.5 186.5 Z"></path>
-					<path d="M1513.7 1085.1 L2396 1638 L2396 1718 L2396.0 1718.0 " fill="none"></path>
-					<path d="M1516.5 1080.6 L1513.7 1085.1 L1510.8 1089.6 L1502.4 1078.0 Z"></path>
-					<path d="M1435.4 1087.4 L1988 1638 L1988 1733 L1988.0 1733.0 " fill="none"></path>
-					<path d="M1439.2 1083.6 L1435.4 1087.4 L1431.6 1091.2 L1426.0 1078.0 Z"></path>
-					<path d="M1341.6 1090.7 L1516 1638 L1516 1733 L1516.0 1733.0 " fill="none"></path>
-					<path d="M1346.7 1089.1 L1341.6 1090.7 L1336.6 1092.3 L1337.6 1078.0 Z"></path>
-					<path d="M1236.5 1090.3 L1004 1638 L1004 1725.5 L1004.0 1725.5 " fill="none"></path>
-					<path d="M1241.4 1092.4 L1236.5 1090.3 L1231.6 1088.2 L1241.7 1078.0 Z"></path>
-					<path d="M556.0 1964.7 L556 1966 L556 1986 L556.0 1986.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M561.3 1955.3 L556.0 1964.7 L550.7 1955.3 L556.0 1946.0 Z"></path>
-					</g>
-					<path d="M1148.1 1087.1 L556 1638 L556 1658 L556.0 1658.0 " fill="none"></path>
-					<path d="M1151.7 1091.0 L1148.1 1087.1 L1144.5 1083.2 L1157.9 1078.0 Z"></path>
-					<path d="M172.0 1904.7 L172 1966 L172 1986 L172.0 1986.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M177.3 1895.3 L172.0 1904.7 L166.7 1895.3 L172.0 1886.0 Z"></path>
-					</g>
-					<path d="M1074.6 1085.0 L172 1638 L172 1718 L172.0 1718.0 " fill="none"></path>
-					<path d="M1077.4 1089.5 L1074.6 1085.0 L1071.8 1080.4 L1086.0 1078.0 Z"></path>
-					<path d="M3849.3 236.2 L3849.25 260 L3842.7768505079825 280 L3842.8 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3854.6 226.8 L3849.3 236.2 L3843.9 226.8 L3849.3 217.5 Z"></path>
-					</g>
-					<path d="M2898.1 35.4 L3849.25 82 L3849.25 124.5 L3849.3 124.5 " fill="none"></path>
-					<path d="M2898.3 30.1 L2898.1 35.4 L2897.8 40.7 L2884.8 34.7 Z"></path>
-					<path d="M3457.3 258.7 L3457.25 260 L3462.1556603773583 280 L3462.2 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3462.6 249.3 L3457.3 258.7 L3451.9 249.3 L3457.3 240.0 Z"></path>
-					</g>
-					<path d="M2898.0 38.0 L3457.25 82 L3457.25 102 L3457.3 102.0 " fill="none"></path>
-					<path d="M2898.5 32.7 L2898.0 38.0 L2897.6 43.3 L2884.8 37.0 Z"></path>
-					<path d="M4246.8 1747.9 L4355.083333333334 1718.5 L4386.666666666666 1718.5 L4386.666666666666 1718.5 L4418.25 1802 L4418.25 1802 L4386.666666666666 1885.5 L4386.666666666666 1885.5 L4355.083333333334 1885.5 L4355.083333333334 1885.5 L4228.75 1851.2319978343257 L4228.8 1851.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4236.4 1745.2 L4246.8 1747.9 L4239.2 1755.5 L4228.8 1752.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M4229.8 977.8 L4229.75 1638 L4140.169207317073 1718.5 L4140.2 1718.5 " fill="none"></path>
-					</g>
-					<path d="M4235.1 977.8 L4229.8 977.8 L4224.4 977.8 L4229.8 964.5 Z"></path>
-					<path d="M2673.3 236.2 L2673.25 260 L3119.75 582.8105981112277 L3119.8 582.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2678.6 226.8 L2673.3 236.2 L2667.9 226.8 L2673.3 217.5 Z"></path>
-					</g>
-					<path d="M2755.1 51.2 L2673.25 82 L2673.25 124.5 L2673.3 124.5 " fill="none"></path>
-					<path d="M2757.0 56.2 L2755.1 51.2 L2753.2 46.2 L2767.6 46.5 Z"></path>
-					<path d="M3065.3 220.7 L3065.25 260 L3119.75 326.93493761140815 L3119.8 326.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3070.6 211.3 L3065.3 220.7 L3059.9 211.3 L3065.3 202.0 Z"></path>
-					</g>
-					<path d="M2281.3 236.2 L2281.25 260 L3119.75 689.5364312267658 L3119.8 689.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2286.6 226.8 L2281.3 236.2 L2275.9 226.8 L2281.3 217.5 Z"></path>
-					</g>
-					<path d="M2719.5 39.6 L2281.25 82 L2281.25 124.5 L2281.3 124.5 " fill="none"></path>
-					<path d="M2720.0 44.9 L2719.5 39.6 L2719.0 34.3 L2732.8 38.3 Z"></path>
-					<path d="M1561.5 236.2 L1561.5 260 L3119.75 779.982685555152 L3119.8 780.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1566.8 226.8 L1561.5 236.2 L1556.2 226.8 L1561.5 217.5 Z"></path>
-					</g>
-					<path d="M2719.4 34.7 L1561.5 82 L1561.5 124.5 L1561.5 124.5 " fill="none"></path>
-					<path d="M2719.6 40.0 L2719.4 34.7 L2719.2 29.3 L2732.8 34.1 Z"></path>
-					<path d="M3959.7 1634.8 L3961.25 1638 L4003.4634146341464 1718.5 L4003.5 1718.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3960.4 1624.1 L3959.7 1634.8 L3950.8 1628.7 L3951.5 1618.0 Z"></path>
-					</g>
-					<path d="M3920.0 1635.2 L3921.25 1638 L4463.25 1786.5179615705931 L4463.3 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3921.3 1624.5 L3920.0 1635.2 L3911.5 1628.7 L3912.7 1618.0 Z"></path>
-					</g>
-					<path d="M3785.6 1636.2 L3786 1638 L3777.6242378048782 1786.5 L3777.6 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3788.7 1625.9 L3785.6 1636.2 L3778.3 1628.3 L3781.4 1618.0 Z"></path>
-					</g>
-					<path d="M3105.6 1395.1 L2822 1638 L2822 1786.5 L2822.0 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3116.1 1393.0 L3105.6 1395.1 L3109.2 1384.9 L3119.8 1382.9 Z"></path>
-					</g>
-					<path d="M3104.6 1321.2 L2660.5 1638 L2660.5 1786.5 L2660.5 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3115.2 1320.1 L3104.6 1321.2 L3109.1 1311.4 L3119.8 1310.4 Z"></path>
-					</g>
-					<path d="M4172.8 199.8 L4172.75 260 L4132.75 310.4300091491308 L4132.8 310.4 " fill="none"></path>
-					<path d="M4178.1 199.8 L4172.8 199.8 L4167.4 199.8 L4172.8 186.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M4402.3 199.8 L4402.25 260 L4132.75 499.2854381443299 L4132.8 499.3 " fill="none"></path>
-					</g>
-					<path d="M4407.6 199.8 L4402.3 199.8 L4396.9 199.8 L4402.3 186.5 Z"></path>
-					<path d="M4700.3 228.2 L4700.25 260 L4132.75 624.066573556797 L4132.8 624.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4705.6 218.8 L4700.3 228.2 L4694.9 218.8 L4700.3 209.5 Z"></path>
-					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="712.5" y="820.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M712.5 851.0 L1880.5 851.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M712.5 987.0 L1880.5 987.0" fill="none" data-name="QuestionFormData"></path>
-						</g>
-						<g transform="translate(712.5, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(712.5, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(712.5, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="3865.8" y="1718.5" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M3865.8 1749.5 L4228.8 1749.5" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(3865.75, 1718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3865.75, 1749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="1247.5" y="155.5" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(1247.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="2224.0" y="1718.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M2224.0 1749.0 L2568.0 1749.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M2224.0 1810.0 L2568.0 1810.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-						</g>
-						<g transform="translate(2224, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2224, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2224, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="1792.0" y="1733.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M1792.0 1764.0 L2184.0 1764.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M1792.0 1810.0 L2184.0 1810.0" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(1792, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1792, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1792, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="1280.0" y="1733.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M1280.0 1764.0 L1752.0 1764.0" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M1280.0 1810.0 L1752.0 1810.0" fill="none" data-name="ImageQuestionFormData"></path>
-						</g>
-						<g transform="translate(1280, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1280, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1280, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="768.0" y="1725.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M768.0 1756.5 L1240.0 1756.5" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M768.0 1817.5 L1240.0 1817.5" fill="none" data-name="AudioQuestionFormData"></path>
-						</g>
-						<g transform="translate(768, 1725.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(768, 1756.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(768, 1817.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="384.0" y="1658.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M384.0 1689.0 L728.0 1689.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M384.0 1885.0 L728.0 1885.0" fill="none" data-name="ScaleQuestionFormData"></path>
-						</g>
-						<g transform="translate(384, 1658)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(384, 1689)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(384, 1885)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="527.0" y="1986.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(527, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="0.0" y="1718.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M0.0 1749.0 L344.0 1749.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M0.0 1825.0 L344.0 1825.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-						</g>
-						<g transform="translate(0, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 1825)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="74.0" y="1986.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
-						</g>
-						<g transform="translate(74, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="3673.3" y="124.5" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M3673.3 155.5 L4025.3 155.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M3673.3 186.5 L4025.3 186.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(3673.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3673.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3673.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="3119.8" y="280.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M3119.8 311.0 L4132.8 311.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M3119.8 1332.0 L4132.8 1332.0" fill="none" data-name="QuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(3119.75, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3119.75, 311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3119.75, 1332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="2732.8" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(2732.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="3281.3" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M3281.3 133.0 L3633.3 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M3281.3 179.0 L3633.3 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-						</g>
-						<g transform="translate(3281.25, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3281.25, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3281.25, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="4199.3" y="933.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(4199.25, 933.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="2497.3" y="124.5" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M2497.3 155.5 L2849.3 155.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M2497.3 186.5 L2849.3 186.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-						</g>
-						<g transform="translate(2497.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2497.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2497.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="2924.8" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M2924.8 31.0 L3233.8 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(2924.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2924.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="2889.3" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M2889.3 171.0 L3241.3 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
-						</g>
-						<g transform="translate(2889.25, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2889.25, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="2105.3" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M2105.3 155.5 L2457.3 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M2105.3 186.5 L2457.3 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-						</g>
-						<g transform="translate(2105.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2105.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2105.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="1385.5" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M1385.5 155.5 L1737.5 155.5" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M1385.5 186.5 L1737.5 186.5" fill="none" data-name="BoolQuestionFormView"></path>
-						</g>
-						<g transform="translate(1385.5, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1385.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1385.5, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="4463.3" y="1786.5" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(4463.25, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="3727.8" y="1786.5" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(3727.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="2753.0" y="1786.5" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(2753, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="2608.0" y="1786.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(2608, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="4065.3" y="155.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(4065.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="4320.3" y="155.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(4320.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="4524.3" y="132.5" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M4524.3 163.5 L4876.3 163.5" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(4524.25, 132.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4524.25, 163.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/uml.svg b/docs/uml/designer_v2/lib/features/design/shared/questionnaire/uml.svg
deleted file mode 100644
index c2db0b180..000000000
--- a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/uml.svg
+++ /dev/null
@@ -1,1218 +0,0 @@
-<svg version="1.1" baseProfile="full" width="6068.5" height="2073.0" viewbox="0 0 6068.5 2073" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;WithQuestionnaireControls
-	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
-	  +void read();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
-	]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	
-	[QuestionnaireFormData
-	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
-	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
-	
-	[&lt;abstract&gt;QuestionFormData
-	  |
-	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
-	  +questionId: String;
-	  +questionText: String;
-	  +questionInfoText: String?;
-	  +questionType: SurveyQuestionType;
-	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
-	  +responseOptions: List&lt;dynamic&gt;;
-	  +id: String
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +EligibilityCriterion toEligibilityCriterion();
-	  +Answer&lt;dynamic&gt; constructAnswerFor();
-	  +dynamic setResponseOptionsValidityFrom();
-	  +QuestionFormData copy()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
-	
-	[ChoiceQuestionFormData
-	  |
-	  +isMultipleChoice: bool;
-	  +answerOptions: List&lt;String&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +QuestionFormData copy();
-	  -Choice _buildChoiceForValue();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
-	
-	[BoolQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +BoolQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
-	
-	[ImageQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +ImageQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
-	
-	[AudioQuestionFormData
-	  |
-	  +maxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +AudioQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
-	
-	[ScaleQuestionFormData
-	  |
-	  +minValue: double;
-	  +maxValue: double;
-	  +minLabel: String?;
-	  +maxLabel: String?;
-	  +midValues: List&lt;double?&gt;;
-	  +midLabels: List&lt;String?&gt;;
-	  +stepSize: double;
-	  +initialValue: double?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +responseOptions: List&lt;double&gt;;
-	  +midAnnotations: List&lt;Annotation&gt;
-	  |
-	  +ScaleQuestion toQuestion();
-	  +QuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[ScaleQuestionFormData]o-[Color]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
-	
-	[FreeTextQuestionFormData
-	  |
-	  +textLengthRange: List&lt;int&gt;;
-	  +textType: FreeTextQuestionType;
-	  +textTypeExpression: String?;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +FreeTextQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
-	
-	[AudioRecordingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
-	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
-	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
-	]
-	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
-	
-	[SurveyQuestionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
-	]
-	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[ImageCapturingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	]
-	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
-	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
-	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
-	[QuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
-	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
-	]
-	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
-	
-	[SurveyQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
-	]
-	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="2073.0" width="6068.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M1219.5 1093.6 L1575 1638 L4046.5 1798.8117437016465 L4046.5 1798.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1218.8 1082.9 L1219.5 1093.6 L1209.9 1088.7 L1209.3 1078.0 Z"></path>
-					</g>
-					<path d="M919.4 1088.5 L109.5 1638 L109.5 1786.5 L109.5 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M930.1 1087.7 L919.4 1088.5 L924.2 1078.8 L934.9 1078.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1002.5 199.8 L1002.5 260 L1102.0645863570392 820 L1102.1 820.0 " fill="none"></path>
-					</g>
-					<path d="M1007.8 199.8 L1002.5 199.8 L997.2 199.8 L1002.5 186.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1502.3 199.8 L1502.25 260 L1195.6317126269957 820 L1195.6 820.0 " fill="none"></path>
-					</g>
-					<path d="M1507.6 199.8 L1502.3 199.8 L1496.9 199.8 L1502.3 186.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M2531.0 184.7 L2873 260 L2873 880 L2873.0 880.0 " fill="none"></path>
-					</g>
-					<path d="M2532.2 179.5 L2531.0 184.7 L2529.9 189.9 L2518.0 181.8 Z"></path>
-					<path d="M2303.6 1087.4 L3253 1638 L5192 1787.9627446356992 L5192.0 1788.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2298.2 1078.1 L2303.6 1087.4 L2292.8 1087.3 L2287.4 1078.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2407.0 184.7 L2065 260 L2065 820 L2065.0 820.0 " fill="none"></path>
-					</g>
-					<path d="M2408.1 189.9 L2407.0 184.7 L2405.8 179.5 L2420.0 181.8 Z"></path>
-					<path d="M2230.4 1086.5 L2893.5 1638 L4485 1786.0045364332293 L4485.0 1786.0 " fill="none"></path>
-					<path d="M2233.8 1082.4 L2230.4 1086.5 L2227.0 1090.6 L2220.1 1078.0 Z"></path>
-					<path d="M2212.4 1087.1 L2800.5 1638 L2443 1743.9259259259259 L2443.0 1743.9 " fill="none"></path>
-					<path d="M2216.1 1083.2 L2212.4 1087.1 L2208.8 1091.0 L2202.7 1078.0 Z"></path>
-					<path d="M2152.8 1089.3 L2496.25 1638 L2011 1748.3376083188907 L2011.0 1748.3 " fill="none"></path>
-					<path d="M2157.3 1086.5 L2152.8 1089.3 L2148.3 1092.1 L2145.7 1078.0 Z"></path>
-					<path d="M2106.9 1090.8 L2268.5 1638 L1499 1763.5077076081552 L1499.0 1763.5 " fill="none"></path>
-					<path d="M2112.0 1089.3 L2106.9 1090.8 L2101.8 1092.3 L2103.1 1078.0 Z"></path>
-					<path d="M815.0 1964.7 L815 1966 L815 1986 L815.0 1986.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M820.3 1955.3 L815.0 1964.7 L809.7 1955.3 L815.0 1946.0 Z"></path>
-					</g>
-					<path d="M2056.6 1091.3 L2024.5 1638 L987 1778.677966101695 L987.0 1778.7 " fill="none"></path>
-					<path d="M2062.0 1091.6 L2056.6 1091.3 L2051.3 1091.0 L2057.4 1078.0 Z"></path>
-					<path d="M431.0 1904.7 L431 1966 L431 1986 L431.0 1986.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M436.3 1895.3 L431.0 1904.7 L425.7 1895.3 L431.0 1886.0 Z"></path>
-					</g>
-					<path d="M1973.5 1089.2 L1615 1638 L603 1778.1756756756756 L603.0 1778.2 " fill="none"></path>
-					<path d="M1977.9 1092.1 L1973.5 1089.2 L1969.0 1086.2 L1980.7 1078.0 Z"></path>
-					<path d="M4985.5 236.2 L4985.5 260 L4975.2822931785195 280 L4975.3 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4990.8 226.8 L4985.5 236.2 L4980.2 226.8 L4985.5 217.5 Z"></path>
-					</g>
-					<path d="M4094.8 35.6 L4985.5 82 L4985.5 124.5 L4985.5 124.5 " fill="none"></path>
-					<path d="M4095.1 30.3 L4094.8 35.6 L4094.5 41.0 L4081.5 35.0 Z"></path>
-					<path d="M4593.5 258.7 L4593.5 260 L4594.661103047895 280 L4594.7 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4598.8 249.3 L4593.5 258.7 L4588.2 249.3 L4593.5 240.0 Z"></path>
-					</g>
-					<path d="M4094.8 38.7 L4593.5 82 L4593.5 102 L4593.5 102.0 " fill="none"></path>
-					<path d="M4095.2 33.4 L4094.8 38.7 L4094.3 44.1 L4081.5 37.6 Z"></path>
-					<path d="M5573.0 1747.9 L5681.333333333333 1718.5 L5712.916666666667 1718.5 L5712.916666666667 1718.5 L5744.5 1802 L5744.5 1802 L5712.916666666667 1885.5 L5712.916666666667 1885.5 L5681.333333333333 1885.5 L5681.333333333333 1885.5 L5555 1851.231997834326 L5555.0 1851.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5562.6 1745.2 L5573.0 1747.9 L5565.4 1755.5 L5555.0 1752.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M5599.8 977.8 L5599.75 1638 L5488.694359756098 1718.5 L5488.7 1718.5 " fill="none"></path>
-					</g>
-					<path d="M5605.1 977.8 L5599.8 977.8 L5594.4 977.8 L5599.8 964.5 Z"></path>
-					<path d="M3809.5 236.2 L3809.5 260 L4127 525.4824029126214 L4127.0 525.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3814.8 226.8 L3809.5 236.2 L3804.2 226.8 L3809.5 217.5 Z"></path>
-					</g>
-					<path d="M3933.0 49.9 L3809.5 82 L3809.5 124.5 L3809.5 124.5 " fill="none"></path>
-					<path d="M3934.4 55.0 L3933.0 49.9 L3931.7 44.7 L3945.9 46.5 Z"></path>
-					<path d="M4201.5 220.7 L4201.5 260 L4214.039912917271 280 L4214.0 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4206.8 211.3 L4201.5 220.7 L4196.2 211.3 L4201.5 202.0 Z"></path>
-					</g>
-					<path d="M3417.5 236.2 L3417.5 260 L4127 662.0111019736842 L4127.0 662.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3422.8 226.8 L3417.5 236.2 L3412.2 226.8 L3417.5 217.5 Z"></path>
-					</g>
-					<path d="M3916.2 38.7 L3417.5 82 L3417.5 124.5 L3417.5 124.5 " fill="none"></path>
-					<path d="M3916.7 44.1 L3916.2 38.7 L3915.8 33.4 L3929.5 37.6 Z"></path>
-					<path d="M3025.5 236.2 L3025.5 260 L4127 731.9735696517413 L4127.0 732.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3030.8 226.8 L3025.5 236.2 L3020.2 226.8 L3025.5 217.5 Z"></path>
-					</g>
-					<path d="M3916.2 35.6 L3025.5 82 L3025.5 124.5 L3025.5 124.5 " fill="none"></path>
-					<path d="M3916.5 41.0 L3916.2 35.6 L3915.9 30.3 L3929.5 35.0 Z"></path>
-					<path d="M5127.5 1633.1 L5131 1638 L5250.032012195122 1718.5 L5250.0 1718.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5126.3 1622.4 L5127.5 1633.1 L5117.7 1628.7 L5116.6 1618.0 Z"></path>
-					</g>
-					<path d="M5088.0 1633.6 L5091 1638 L5789.5 1789.7271523178808 L5789.5 1789.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5087.3 1622.8 L5088.0 1633.6 L5078.4 1628.7 L5077.7 1618.0 Z"></path>
-					</g>
-					<path d="M4602.3 1636.6 L4602.25 1638 L4143.394054878048 1786.5 L4143.4 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4608.1 1627.6 L4602.3 1636.6 L4597.4 1627.1 L4603.2 1618.0 Z"></path>
-					</g>
-					<path d="M4110.7 1239.6 L3393.75 1638 L5014 1795.3011691579104 L5014.0 1795.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4121.4 1239.7 L4110.7 1239.6 L4116.3 1230.4 L4127.0 1230.5 Z"></path>
-					</g>
-					<path d="M4110.4 1217.9 L3293 1638 L4869 1796.7129260055265 L4869.0 1796.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4121.1 1218.3 L4110.4 1217.9 L4116.3 1208.9 L4127.0 1209.3 Z"></path>
-					</g>
-					<path d="M5309.0 199.8 L5309 260 L5140 432.37749814951883 L5140.0 432.4 " fill="none"></path>
-					<path d="M5314.3 199.8 L5309.0 199.8 L5303.7 199.8 L5309.0 186.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M5538.5 199.8 L5538.5 260 L5140 563.3883977900553 L5140.0 563.4 " fill="none"></path>
-					</g>
-					<path d="M5543.8 199.8 L5538.5 199.8 L5533.2 199.8 L5538.5 186.5 Z"></path>
-					<path d="M5836.5 228.2 L5836.5 260 L5140 658.9098088113051 L5140.0 658.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5841.8 218.8 L5836.5 228.2 L5831.2 218.8 L5836.5 209.5 Z"></path>
-					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="809.0" y="820.0" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M809.0 851.0 L1441.0 851.0" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M809.0 957.0 L1441.0 957.0" fill="none" data-name="WithQuestionnaireControls"></path>
-						</g>
-						<g transform="translate(809, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(809, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(809, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="4046.5" y="1786.5" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(4046.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="0.0" y="1786.5" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
-						</g>
-						<g transform="translate(0, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="894.0" y="155.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-						</g>
-						<g transform="translate(894, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="1405.8" y="155.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-						</g>
-						<g transform="translate(1405.75, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="2689.0" y="880.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M2689.0 911.0 L3057.0 911.0" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M2689.0 957.0 L3057.0 957.0" fill="none" data-name="QuestionnaireFormData"></path>
-						</g>
-						<g transform="translate(2689, 880)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2689, 911)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2689, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="2420.0" y="155.5" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(2420, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="1481.0" y="820.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M1481.0 851.0 L2649.0 851.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M1481.0 987.0 L2649.0 987.0" fill="none" data-name="QuestionFormData"></path>
-						</g>
-						<g transform="translate(1481, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1481, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1481, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="5192.0" y="1718.5" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M5192.0 1749.5 L5555.0 1749.5" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(5192, 1718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5192, 1749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="4485.0" y="1718.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M4485.0 1749.0 L4829.0 1749.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M4485.0 1810.0 L4829.0 1810.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-						</g>
-						<g transform="translate(4485, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4485, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4485, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="2051.0" y="1733.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M2051.0 1764.0 L2443.0 1764.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M2051.0 1810.0 L2443.0 1810.0" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(2051, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2051, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2051, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="1539.0" y="1733.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M1539.0 1764.0 L2011.0 1764.0" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M1539.0 1810.0 L2011.0 1810.0" fill="none" data-name="ImageQuestionFormData"></path>
-						</g>
-						<g transform="translate(1539, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1539, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1539, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="1027.0" y="1725.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M1027.0 1756.5 L1499.0 1756.5" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M1027.0 1817.5 L1499.0 1817.5" fill="none" data-name="AudioQuestionFormData"></path>
-						</g>
-						<g transform="translate(1027, 1725.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1027, 1756.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1027, 1817.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="643.0" y="1658.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M643.0 1689.0 L987.0 1689.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M643.0 1885.0 L987.0 1885.0" fill="none" data-name="ScaleQuestionFormData"></path>
-						</g>
-						<g transform="translate(643, 1658)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(643, 1689)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(643, 1885)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="786.0" y="1986.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(786, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="259.0" y="1718.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M259.0 1749.0 L603.0 1749.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M259.0 1825.0 L603.0 1825.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-						</g>
-						<g transform="translate(259, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(259, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(259, 1825)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="333.0" y="1986.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
-						</g>
-						<g transform="translate(333, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="4809.5" y="124.5" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M4809.5 155.5 L5161.5 155.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M4809.5 186.5 L5161.5 186.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(4809.5, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4809.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4809.5, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="4127.0" y="280.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M4127.0 311.0 L5140.0 311.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M4127.0 1332.0 L5140.0 1332.0" fill="none" data-name="QuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(4127, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4127, 311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4127, 1332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="3929.5" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(3929.5, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="4417.5" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M4417.5 133.0 L4769.5 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M4417.5 179.0 L4769.5 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-						</g>
-						<g transform="translate(4417.5, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4417.5, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4417.5, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="5569.3" y="933.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(5569.25, 933.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="3633.5" y="124.5" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M3633.5 155.5 L3985.5 155.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M3633.5 186.5 L3985.5 186.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-						</g>
-						<g transform="translate(3633.5, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3633.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3633.5, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="4121.5" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M4121.5 31.0 L4430.5 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(4121.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4121.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="4025.5" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M4025.5 171.0 L4377.5 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
-						</g>
-						<g transform="translate(4025.5, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4025.5, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="3241.5" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M3241.5 155.5 L3593.5 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M3241.5 186.5 L3593.5 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-						</g>
-						<g transform="translate(3241.5, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3241.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3241.5, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="2849.5" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M2849.5 155.5 L3201.5 155.5" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M2849.5 186.5 L3201.5 186.5" fill="none" data-name="BoolQuestionFormView"></path>
-						</g>
-						<g transform="translate(2849.5, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2849.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2849.5, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="5789.5" y="1786.5" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(5789.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="5014.0" y="1786.5" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(5014, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="4869.0" y="1786.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(4869, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="5201.5" y="155.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(5201.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="5456.5" y="155.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(5456.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="5660.5" y="132.5" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M5660.5 163.5 L6012.5 163.5" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(5660.5, 132.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5660.5, 163.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/shared/uml.svg b/docs/uml/designer_v2/lib/features/design/shared/uml.svg
deleted file mode 100644
index cb3e53617..000000000
--- a/docs/uml/designer_v2/lib/features/design/shared/uml.svg
+++ /dev/null
@@ -1,1418 +0,0 @@
-<svg version="1.1" baseProfile="full" width="6809.5" height="2073.0" viewbox="0 0 6809.5 2073" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;WithQuestionnaireControls
-	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
-	  +void read();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
-	]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	
-	[QuestionnaireFormData
-	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
-	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
-	
-	[&lt;abstract&gt;QuestionFormData
-	  |
-	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
-	  +questionId: String;
-	  +questionText: String;
-	  +questionInfoText: String?;
-	  +questionType: SurveyQuestionType;
-	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
-	  +responseOptions: List&lt;dynamic&gt;;
-	  +id: String
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +EligibilityCriterion toEligibilityCriterion();
-	  +Answer&lt;dynamic&gt; constructAnswerFor();
-	  +dynamic setResponseOptionsValidityFrom();
-	  +QuestionFormData copy()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
-	
-	[ChoiceQuestionFormData
-	  |
-	  +isMultipleChoice: bool;
-	  +answerOptions: List&lt;String&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +QuestionFormData copy();
-	  -Choice _buildChoiceForValue();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
-	
-	[BoolQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +BoolQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
-	
-	[ImageQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +ImageQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
-	
-	[AudioQuestionFormData
-	  |
-	  +maxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +AudioQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
-	
-	[ScaleQuestionFormData
-	  |
-	  +minValue: double;
-	  +maxValue: double;
-	  +minLabel: String?;
-	  +maxLabel: String?;
-	  +midValues: List&lt;double?&gt;;
-	  +midLabels: List&lt;String?&gt;;
-	  +stepSize: double;
-	  +initialValue: double?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +responseOptions: List&lt;double&gt;;
-	  +midAnnotations: List&lt;Annotation&gt;
-	  |
-	  +ScaleQuestion toQuestion();
-	  +QuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[ScaleQuestionFormData]o-[Color]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
-	
-	[FreeTextQuestionFormData
-	  |
-	  +textLengthRange: List&lt;int&gt;;
-	  +textType: FreeTextQuestionType;
-	  +textTypeExpression: String?;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +FreeTextQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
-	
-	[AudioRecordingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
-	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
-	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
-	]
-	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
-	
-	[SurveyQuestionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
-	]
-	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[ImageCapturingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	]
-	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
-	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
-	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
-	[QuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
-	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
-	]
-	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
-	
-	[SurveyQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
-	]
-	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule
-	  |
-	  +instanceId: String;
-	  +isTimeLocked: bool;
-	  +timeLockStart: StudyUTimeOfDay?;
-	  +timeLockEnd: StudyUTimeOfDay?;
-	  +hasReminder: bool;
-	  +reminderTime: StudyUTimeOfDay?
-	  |
-	  +Schedule toSchedule()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
-	
-	[ScheduleControls
-	  |
-	  +formViewModel: WithScheduleControls
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
-	]
-	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
-	
-	[&lt;abstract&gt;WithScheduleControls
-	  |
-	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
-	  +instanceID: FormControl&lt;String&gt;;
-	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +hasReminderControl: FormControl&lt;bool&gt;;
-	  +reminderTimeControl: FormControl&lt;Time&gt;;
-	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
-	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
-	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  +hasReminder: bool;
-	  +isTimeRestricted: bool;
-	  +timeRestriction: List&lt;Time&gt;?
-	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
-	]
-	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="2073.0" width="6809.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M1025.5 1095.7 L1208.5 1638 L4271.75 1799.4179452164833 L4271.8 1799.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1027.6 1085.1 L1025.5 1095.7 L1017.5 1088.5 L1019.5 1078.0 Z"></path>
-					</g>
-					<path d="M799.2 1089.6 L109.5 1638 L109.5 1786.5 L109.5 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M809.8 1088.0 L799.2 1089.6 L803.1 1079.6 L813.8 1078.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M853.5 199.8 L853.5 260 L953.0645863570392 820 L953.1 820.0 " fill="none"></path>
-					</g>
-					<path d="M858.8 199.8 L853.5 199.8 L848.2 199.8 L853.5 186.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1135.8 199.8 L1135.75 260 L1005.9096516690856 820 L1005.9 820.0 " fill="none"></path>
-					</g>
-					<path d="M1141.1 199.8 L1135.8 199.8 L1130.4 199.8 L1135.8 186.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M2333.8 177.6 L3110.5 260 L3110.5 880 L3110.5 880.0 " fill="none"></path>
-					</g>
-					<path d="M2334.3 172.3 L2333.8 177.6 L2333.2 182.9 L2320.5 176.2 Z"></path>
-					<path d="M2446.6 1089.0 L3202 1638 L5456.75 1789.7820420728578 L5456.8 1789.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2442.2 1079.2 L2446.6 1089.0 L2435.9 1087.8 L2431.5 1078.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2265.9 199.6 L2254 260 L2254 820 L2254.0 820.0 " fill="none"></path>
-					</g>
-					<path d="M2271.1 200.6 L2265.9 199.6 L2260.6 198.6 L2268.5 186.5 Z"></path>
-					<path d="M2407.9 1086.9 L3023 1638 L4927.75 1788.4172384735764 L4927.8 1788.4 " fill="none"></path>
-					<path d="M2411.5 1082.9 L2407.9 1086.9 L2404.3 1090.9 L2398.0 1078.0 Z"></path>
-					<path d="M2400.2 1087.2 L2983 1638 L2763.891768292683 1733 L2763.9 1733.0 " fill="none"></path>
-					<path d="M2403.8 1083.3 L2400.2 1087.2 L2396.5 1091.0 L2390.5 1078.0 Z"></path>
-					<path d="M2328.7 1089.8 L2619.5 1638 L2337.5411585365855 1733 L2337.5 1733.0 " fill="none"></path>
-					<path d="M2333.4 1087.3 L2328.7 1089.8 L2324.0 1092.3 L2322.4 1078.0 Z"></path>
-					<path d="M2272.5 1091.2 L2343.5 1638 L1856.75 1748.4489795918366 L1856.8 1748.4 " fill="none"></path>
-					<path d="M2277.8 1090.5 L2272.5 1091.2 L2267.2 1091.9 L2270.8 1078.0 Z"></path>
-					<path d="M1172.8 1964.7 L1172.75 1966 L1172.75 1986 L1172.8 1986.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1178.1 1955.3 L1172.8 1964.7 L1167.4 1955.3 L1172.8 1946.0 Z"></path>
-					</g>
-					<path d="M2222.2 1091.0 L2099.5 1638 L1344.75 1771.5624494200163 L1344.8 1771.6 " fill="none"></path>
-					<path d="M2227.4 1092.2 L2222.2 1091.0 L2217.0 1089.8 L2225.1 1078.0 Z"></path>
-					<path d="M788.8 1904.7 L788.75 1966 L788.75 1986 L788.8 1986.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M794.1 1895.3 L788.8 1904.7 L783.4 1895.3 L788.8 1886.0 Z"></path>
-					</g>
-					<path d="M2179.1 1089.8 L1887.5 1638 L960.75 1776.3271899886233 L960.8 1776.3 " fill="none"></path>
-					<path d="M2183.8 1092.3 L2179.1 1089.8 L2174.4 1087.3 L2185.4 1078.0 Z"></path>
-					<path d="M5223.0 236.2 L5223 260 L5214.930333817127 280 L5214.9 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5228.3 226.8 L5223.0 236.2 L5217.7 226.8 L5223.0 217.5 Z"></path>
-					</g>
-					<path d="M4332.3 35.6 L5223 82 L5223 124.5 L5223.0 124.5 " fill="none"></path>
-					<path d="M4332.6 30.3 L4332.3 35.6 L4332.0 41.0 L4319.0 35.0 Z"></path>
-					<path d="M4831.0 258.7 L4831 260 L4834.3091436865025 280 L4834.3 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4836.3 249.3 L4831.0 258.7 L4825.7 249.3 L4831.0 240.0 Z"></path>
-					</g>
-					<path d="M4332.3 38.7 L4831 82 L4831 102 L4831.0 102.0 " fill="none"></path>
-					<path d="M4332.7 33.4 L4332.3 38.7 L4331.8 44.1 L4319.0 37.6 Z"></path>
-					<path d="M5837.7 1744.6 L5928.583333333333 1718.5 L5955.791666666667 1718.5 L5955.791666666667 1718.5 L5983 1802 L5983 1802 L5955.791666666667 1885.5 L5955.791666666667 1885.5 L5928.583333333333 1885.5 L5928.583333333333 1885.5 L5819.75 1854.1994833524684 L5819.8 1854.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5827.2 1742.1 L5837.7 1744.6 L5830.2 1752.3 L5819.8 1749.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3753.3 977.8 L3753.25 1638 L5456.75 1786.2090185676393 L5456.8 1786.2 " fill="none"></path>
-					</g>
-					<path d="M3758.6 977.8 L3753.3 977.8 L3747.9 977.8 L3753.3 964.5 Z"></path>
-					<path d="M4047.0 236.2 L4047 260 L4438.5 560.3825167037862 L4438.5 560.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4052.3 226.8 L4047.0 236.2 L4041.7 226.8 L4047.0 217.5 Z"></path>
-					</g>
-					<path d="M4170.5 49.9 L4047 82 L4047 124.5 L4047.0 124.5 " fill="none"></path>
-					<path d="M4171.9 55.0 L4170.5 49.9 L4169.2 44.7 L4183.4 46.5 Z"></path>
-					<path d="M4439.0 220.7 L4439 260 L4453.687953555878 280 L4453.7 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4444.3 211.3 L4439.0 220.7 L4433.7 211.3 L4439.0 202.0 Z"></path>
-					</g>
-					<path d="M3655.0 236.2 L3655 260 L4438.5 678.4740310077519 L4438.5 678.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3660.3 226.8 L3655.0 236.2 L3649.7 226.8 L3655.0 217.5 Z"></path>
-					</g>
-					<path d="M4153.7 38.7 L3655 82 L3655 124.5 L3655.0 124.5 " fill="none"></path>
-					<path d="M4154.2 44.1 L4153.7 38.7 L4153.3 33.4 L4167.0 37.6 Z"></path>
-					<path d="M3263.0 236.2 L3263 260 L4438.5 741.5217003567182 L4438.5 741.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3268.3 226.8 L3263.0 236.2 L3257.7 226.8 L3263.0 217.5 Z"></path>
-					</g>
-					<path d="M4153.7 35.6 L3263 82 L3263 124.5 L3263.0 124.5 " fill="none"></path>
-					<path d="M4154.0 41.0 L4153.7 35.6 L4153.4 30.3 L4167.0 35.0 Z"></path>
-					<path d="M5467.7 1249.8 L6142.25 1638 L5819.75 1742.9404761904761 L5819.8 1742.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5462.2 1240.5 L5467.7 1249.8 L5456.9 1249.8 L5451.5 1240.5 Z"></path>
-					</g>
-					<path d="M5465.2 1429.0 L5691.75 1638 L6268 1787.355985776373 L6268.0 1787.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5462.0 1418.7 L5465.2 1429.0 L5454.7 1426.6 L5451.5 1416.3 Z"></path>
-					</g>
-					<path d="M5018.8 1636.6 L5019 1638 L4369.75 1790.4912280701753 L4369.8 1790.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5023.2 1626.7 L5018.8 1636.6 L5012.5 1627.8 L5016.9 1618.0 Z"></path>
-					</g>
-					<path d="M4425.6 1492.0 L4286 1638 L6028 1795.7515184980673 L6028.0 1795.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4435.9 1489.0 L4425.6 1492.0 L4428.2 1481.6 L4438.5 1478.6 Z"></path>
-					</g>
-					<path d="M4423.8 1355.6 L4061.75 1638 L5311.75 1795.3896353166986 L5311.8 1795.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4434.4 1354.1 L4423.8 1355.6 L4427.9 1345.6 L4438.5 1344.1 Z"></path>
-					</g>
-					<path d="M5546.5 199.8 L5546.5 260 L5451.5 368.81961762261017 L5451.5 368.8 " fill="none"></path>
-					<path d="M5551.8 199.8 L5546.5 199.8 L5541.2 199.8 L5546.5 186.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M5776.0 199.8 L5776 260 L5451.5 529.0499398315283 L5451.5 529.0 " fill="none"></path>
-					</g>
-					<path d="M5781.3 199.8 L5776.0 199.8 L5770.7 199.8 L5776.0 186.5 Z"></path>
-					<path d="M6074.0 228.2 L6074 260 L5451.5 639.8959255978742 L5451.5 639.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6079.3 218.8 L6074.0 228.2 L6068.7 218.8 L6074.0 209.5 Z"></path>
-					</g>
-					<path d="M1481.0 1051.7 L1481 1638 L576.75 1788.6700533401067 L576.8 1788.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1486.3 1042.3 L1481.0 1051.7 L1475.7 1042.3 L1481.0 1033.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2209.3 178.0 L1481 260 L1481 865 L1481.0 865.0 " fill="none"></path>
-					</g>
-					<path d="M2209.8 183.3 L2209.3 178.0 L2208.7 172.7 L2222.5 176.5 Z"></path>
-					<path d="M6506.0 243.7 L6506 260 L6506 797.5 L6506.0 797.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6511.3 234.3 L6506.0 243.7 L6500.7 234.3 L6506.0 225.0 Z"></path>
-					</g>
-					<path d="M6506.0 59.8 L6506 82 L6506 117 L6506.0 117.0 " fill="none"></path>
-					<path d="M6511.3 59.8 L6506.0 59.8 L6500.7 59.8 L6506.0 46.5 Z"></path>
-					<path d="M6510.9 1119.2 L6526 1638 L6343.544207317073 1786.5 L6343.5 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6516.0 1109.7 L6510.9 1119.2 L6505.3 1110.0 L6510.4 1100.5 Z"></path>
-					</g>
-					<path d="M6426.9 1117.4 L6182.25 1638 L6475.401676829269 1786.5 L6475.4 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6435.7 1111.2 L6426.9 1117.4 L6426.0 1106.7 L6434.8 1100.5 Z"></path>
-					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="660.0" y="820.0" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M660.0 851.0 L1292.0 851.0" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M660.0 957.0 L1292.0 957.0" fill="none" data-name="WithQuestionnaireControls"></path>
-						</g>
-						<g transform="translate(660, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(660, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(660, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="4271.8" y="1786.5" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(4271.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="0.0" y="1786.5" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
-						</g>
-						<g transform="translate(0, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="745.0" y="155.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-						</g>
-						<g transform="translate(745, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="1039.3" y="155.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-						</g>
-						<g transform="translate(1039.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="2926.5" y="880.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M2926.5 911.0 L3294.5 911.0" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M2926.5 957.0 L3294.5 957.0" fill="none" data-name="QuestionnaireFormData"></path>
-						</g>
-						<g transform="translate(2926.5, 880)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2926.5, 911)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2926.5, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="2222.5" y="155.5" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(2222.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="1670.0" y="820.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M1670.0 851.0 L2838.0 851.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M1670.0 987.0 L2838.0 987.0" fill="none" data-name="QuestionFormData"></path>
-						</g>
-						<g transform="translate(1670, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1670, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1670, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="5456.8" y="1718.5" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M5456.8 1749.5 L5819.8 1749.5" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(5456.75, 1718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5456.75, 1749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="4927.8" y="1718.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M4927.8 1749.0 L5271.8 1749.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M4927.8 1810.0 L5271.8 1810.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-						</g>
-						<g transform="translate(4927.75, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4927.75, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4927.75, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="2408.8" y="1733.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M2408.8 1764.0 L2800.8 1764.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M2408.8 1810.0 L2800.8 1810.0" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(2408.75, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2408.75, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2408.75, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="1896.8" y="1733.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M1896.8 1764.0 L2368.8 1764.0" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M1896.8 1810.0 L2368.8 1810.0" fill="none" data-name="ImageQuestionFormData"></path>
-						</g>
-						<g transform="translate(1896.75, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1896.75, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1896.75, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="1384.8" y="1725.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M1384.8 1756.5 L1856.8 1756.5" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M1384.8 1817.5 L1856.8 1817.5" fill="none" data-name="AudioQuestionFormData"></path>
-						</g>
-						<g transform="translate(1384.75, 1725.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1384.75, 1756.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1384.75, 1817.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="1000.8" y="1658.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M1000.8 1689.0 L1344.8 1689.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M1000.8 1885.0 L1344.8 1885.0" fill="none" data-name="ScaleQuestionFormData"></path>
-						</g>
-						<g transform="translate(1000.75, 1658)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1000.75, 1689)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1000.75, 1885)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="1143.8" y="1986.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(1143.75, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="616.8" y="1718.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M616.8 1749.0 L960.8 1749.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M616.8 1825.0 L960.8 1825.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-						</g>
-						<g transform="translate(616.75, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(616.75, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(616.75, 1825)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="690.8" y="1986.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
-						</g>
-						<g transform="translate(690.75, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="5047.0" y="124.5" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M5047.0 155.5 L5399.0 155.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M5047.0 186.5 L5399.0 186.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(5047, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5047, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5047, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="4438.5" y="280.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M4438.5 311.0 L5451.5 311.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M4438.5 1332.0 L5451.5 1332.0" fill="none" data-name="QuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(4438.5, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4438.5, 311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4438.5, 1332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="4167.0" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(4167, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="4655.0" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M4655.0 133.0 L5007.0 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M4655.0 179.0 L5007.0 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-						</g>
-						<g transform="translate(4655, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4655, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4655, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="3722.8" y="933.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(3722.75, 933.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="3871.0" y="124.5" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M3871.0 155.5 L4223.0 155.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M3871.0 186.5 L4223.0 186.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-						</g>
-						<g transform="translate(3871, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3871, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3871, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="5700.0" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M5700.0 31.0 L6009.0 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(5700, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5700, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="4263.0" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M4263.0 171.0 L4615.0 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
-						</g>
-						<g transform="translate(4263, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4263, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="3479.0" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M3479.0 155.5 L3831.0 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M3479.0 186.5 L3831.0 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-						</g>
-						<g transform="translate(3479, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3479, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3479, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="3087.0" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M3087.0 155.5 L3439.0 155.5" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M3087.0 186.5 L3439.0 186.5" fill="none" data-name="BoolQuestionFormView"></path>
-						</g>
-						<g transform="translate(3087, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3087, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3087, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="6268.0" y="1786.5" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(6268, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="6028.0" y="1786.5" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(6028, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="5311.8" y="1786.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(5311.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="5439.0" y="155.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(5439, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="5694.0" y="155.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(5694, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="5898.0" y="132.5" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M5898.0 163.5 L6250.0 163.5" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(5898, 132.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5898, 163.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="1332.0" y="865.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M1332.0 896.0 L1630.0 896.0" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M1332.0 1002.0 L1630.0 1002.0" fill="none" data-name="IFormDataWithSchedule"></path>
-						</g>
-						<g transform="translate(1332, 865)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1332, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1332, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="416.8" y="1786.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
-						</g>
-						<g transform="translate(416.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="6290.0" y="117.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M6290.0 148.0 L6722.0 148.0" fill="none" data-name="ScheduleControls"></path>
-							<path d="M6290.0 179.0 L6722.0 179.0" fill="none" data-name="ScheduleControls"></path>
-						</g>
-						<g transform="translate(6290, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6290, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6290, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="6258.5" y="797.5" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M6258.5 828.5 L6753.5 828.5" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M6258.5 1054.5 L6753.5 1054.5" fill="none" data-name="WithScheduleControls"></path>
-						</g>
-						<g transform="translate(6258.5, 797.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6258.5, 828.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6258.5, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="6410.0" y="15.5" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
-						</g>
-						<g transform="translate(6410, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="6421.0" y="1786.5" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
-						</g>
-						<g transform="translate(6421, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/uml.svg b/docs/uml/designer_v2/lib/features/design/uml.svg
deleted file mode 100644
index e752ee322..000000000
--- a/docs/uml/designer_v2/lib/features/design/uml.svg
+++ /dev/null
@@ -1,4822 +0,0 @@
-<svg version="1.1" baseProfile="full" width="30192.8" height="2822.0" viewbox="0 0 30192.75 2822" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudyDesignInterventionsFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
-	
-	[InterventionFormView
-	  |
-	  +formViewModel: InterventionFormViewModel
-	]
-	
-	[InterventionFormView]o-[InterventionFormViewModel]
-	
-	[InterventionPreview
-	  |
-	  +routeArgs: InterventionFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPreview]o-[InterventionFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
-	
-	[StudyScheduleFormView
-	  |
-	  +formViewModel: StudyScheduleControls
-	  |
-	  -FormTableRow _renderCustomSequence();
-	  +Widget build()
-	]
-	
-	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
-	
-	[InterventionTaskFormData
-	  |
-	  +taskId: String;
-	  +taskTitle: String;
-	  +taskDescription: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +CheckmarkTask toTask();
-	  +InterventionTaskFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
-	
-	[InterventionsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +interventionsArray: FormArray&lt;dynamic&gt;;
-	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
-	  +form: FormGroup;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +interventionsRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestStudySchedule: bool
-	  |
-	  +void setControlsFrom();
-	  +InterventionsFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +InterventionFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +dynamic testStudySchedule()
-	]
-	
-	[InterventionsFormViewModel]o-[Study]
-	[InterventionsFormViewModel]o-[GoRouter]
-	[InterventionsFormViewModel]o-[FormArray]
-	[InterventionsFormViewModel]o-[FormViewModelCollection]
-	[InterventionsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
-	
-	[InterventionTaskFormViewModel
-	  |
-	  +taskIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +taskTitleControl: FormControl&lt;String&gt;;
-	  +taskDescriptionControl: FormControl&lt;String&gt;;
-	  +markAsCompletedControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +taskId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +InterventionTaskFormData buildFormData();
-	  +InterventionTaskFormViewModel createDuplicate()
-	]
-	
-	[InterventionTaskFormViewModel]o-[FormControl]
-	[InterventionTaskFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
-	
-	[&lt;abstract&gt;StudyScheduleControls
-	  |
-	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
-	  &lt;static&gt;+defaultScheduleTypeSequence: String;
-	  &lt;static&gt;+defaultNumCycles: int;
-	  &lt;static&gt;+defaultPeriodLength: int;
-	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
-	  +phaseDurationControl: FormControl&lt;int&gt;;
-	  +numCyclesControl: FormControl&lt;int&gt;;
-	  +includeBaselineControl: FormControl&lt;bool&gt;;
-	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  &lt;static&gt;+kNumCyclesMin: int;
-	  &lt;static&gt;+kNumCyclesMax: int;
-	  &lt;static&gt;+kPhaseDurationMin: int;
-	  &lt;static&gt;+kPhaseDurationMax: int;
-	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +numCyclesRange: dynamic;
-	  +phaseDurationRange: dynamic;
-	  +customSequenceRequired: dynamic
-	  |
-	  +void setStudyScheduleControlsFrom();
-	  +StudyScheduleFormData buildStudyScheduleFormData();
-	  +bool isSequencingCustom()
-	]
-	
-	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
-	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
-	
-	[InterventionFormData
-	  |
-	  +interventionId: String;
-	  +title: String;
-	  +description: String?;
-	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
-	  +iconName: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +Intervention toIntervention();
-	  +InterventionFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
-	
-	[StudyScheduleFormData
-	  |
-	  +sequenceType: PhaseSequence;
-	  +sequenceTypeCustom: String;
-	  +numCycles: int;
-	  +phaseDuration: int;
-	  +includeBaseline: bool;
-	  +id: String
-	  |
-	  +StudySchedule toStudySchedule();
-	  +Study apply();
-	  +StudyScheduleFormData copy()
-	]
-	
-	[StudyScheduleFormData]o-[PhaseSequence]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
-	
-	[InterventionTaskFormView
-	  |
-	  +formViewModel: InterventionTaskFormViewModel
-	]
-	
-	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
-	
-	[InterventionsFormData
-	  |
-	  +interventionsData: List&lt;InterventionFormData&gt;;
-	  +studyScheduleData: StudyScheduleFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +InterventionsFormData copy()
-	]
-	
-	[InterventionsFormData]o-[StudyScheduleFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
-	
-	[InterventionFormViewModel
-	  |
-	  +study: Study;
-	  +interventionIdControl: FormControl&lt;String&gt;;
-	  +interventionTitleControl: FormControl&lt;String&gt;;
-	  +interventionIconControl: FormControl&lt;IconOption&gt;;
-	  +interventionDescriptionControl: FormControl&lt;String&gt;;
-	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
-	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
-	  +form: FormGroup;
-	  +interventionId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneTask: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +InterventionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +InterventionTaskFormViewModel provide();
-	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
-	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
-	  +InterventionFormViewModel createDuplicate()
-	]
-	
-	[InterventionFormViewModel]o-[Study]
-	[InterventionFormViewModel]o-[FormControl]
-	[InterventionFormViewModel]o-[FormArray]
-	[InterventionFormViewModel]o-[FormViewModelCollection]
-	[InterventionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
-	
-	[StudyDesignReportsFormView
-	  |
-	  +Widget build();
-	  -dynamic _showReportItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
-	
-	[ReportItemFormData
-	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
-	  +id: String
-	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
-	]
-	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
-	
-	[DataReferenceEditor
-	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
-	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
-	]
-	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
-	
-	[TemporalAggregationFormatted
-	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
-	]
-	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
-	
-	[ImprovementDirectionFormatted
-	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
-	]
-	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
-	
-	[ReportSectionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
-	]
-	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
-	
-	[AverageSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
-	
-	[DataReferenceIdentifier
-	  |
-	  +hashCode: int
-	  |
-	  +bool ==()
-	]
-	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
-	
-	[LinearRegressionSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
-	
-	[ReportItemFormViewModel
-	  |
-	  &lt;static&gt;+defaultSectionType: ReportSectionType;
-	  +sectionIdControl: FormControl&lt;String&gt;;
-	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +sectionControl: FormControl&lt;ReportSection&gt;;
-	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
-	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
-	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
-	  +alphaControl: FormControl&lt;double&gt;;
-	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +form: FormGroup;
-	  +sectionId: String;
-	  +sectionType: ReportSectionType;
-	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
-	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
-	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +dataReferenceRequired: dynamic;
-	  +aggregationRequired: dynamic;
-	  +improvementDirectionRequired: dynamic;
-	  +alphaConfidenceRequired: dynamic
-	  |
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +ReportItemFormData buildFormData();
-	  +ReportItemFormViewModel createDuplicate();
-	  +dynamic onSectionTypeChanged();
-	  -void _updateFormControls();
-	  +void setControlsFrom()
-	]
-	
-	[ReportItemFormViewModel]o-[ReportSectionType]
-	[ReportItemFormViewModel]o-[FormControl]
-	[ReportItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
-	
-	[ReportItemFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
-	  |
-	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
-	]
-	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
-	
-	[ReportsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +reportItemDelegate: ReportFormItemDelegate;
-	  +reportItemArray: FormArray&lt;dynamic&gt;;
-	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +form: FormGroup;
-	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestConsent: bool
-	  |
-	  +void setControlsFrom();
-	  +ReportsFormData buildFormData();
-	  +void read();
-	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
-	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
-	  +dynamic testReport();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide()
-	]
-	
-	[ReportsFormViewModel]o-[Study]
-	[ReportsFormViewModel]o-[GoRouter]
-	[ReportsFormViewModel]o-[ReportFormItemDelegate]
-	[ReportsFormViewModel]o-[FormArray]
-	[ReportsFormViewModel]o-[FormViewModelCollection]
-	[ReportsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
-	
-	[ReportFormItemDelegate
-	  |
-	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +owner: ReportsFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
-	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
-	]
-	
-	[ReportFormItemDelegate]o-[FormViewModelCollection]
-	[ReportFormItemDelegate]o-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
-	
-	[ReportBadge
-	  |
-	  +status: ReportStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
-	  |
-	  +Widget build()
-	]
-	
-	[ReportBadge]o-[ReportStatus]
-	[ReportBadge]o-[BadgeType]
-	
-	[ReportsFormData
-	  |
-	  +reportItems: List&lt;ReportItemFormData&gt;;
-	  +id: String
-	  |
-	  +Study apply();
-	  +ReportsFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
-	
-	[ReportStatus
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
-	  &lt;static&gt;+primary: ReportStatus;
-	  &lt;static&gt;+secondary: ReportStatus
-	]
-	
-	[ReportStatus]o-[ReportStatus]
-	[Enum]&lt;:--[ReportStatus]
-	
-	[&lt;abstract&gt;IStudyFormData
-	  |
-	  +Study apply()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
-	
-	[StudyInfoFormViewModel
-	  |
-	  +study: Study;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +organizationControl: FormControl&lt;String&gt;;
-	  +reviewBoardControl: FormControl&lt;String&gt;;
-	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
-	  +researchersControl: FormControl&lt;String&gt;;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +websiteControl: FormControl&lt;String&gt;;
-	  +phoneControl: FormControl&lt;String&gt;;
-	  +additionalInfoControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +iconRequired: dynamic;
-	  +organizationRequired: dynamic;
-	  +reviewBoardRequired: dynamic;
-	  +reviewBoardNumberRequired: dynamic;
-	  +researchersRequired: dynamic;
-	  +emailRequired: dynamic;
-	  +phoneRequired: dynamic;
-	  +emailFormat: dynamic;
-	  +websiteFormat: dynamic
-	  |
-	  +void setControlsFrom();
-	  +StudyInfoFormData buildFormData()
-	]
-	
-	[StudyInfoFormViewModel]o-[Study]
-	[StudyInfoFormViewModel]o-[FormControl]
-	[StudyInfoFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
-	
-	[StudyDesignInfoFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
-	
-	[StudyInfoFormData
-	  |
-	  +title: String;
-	  +description: String?;
-	  +iconName: String;
-	  +contactInfoFormData: StudyContactInfoFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
-	]
-	
-	[StudyInfoFormData]o-[StudyContactInfoFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
-	
-	[StudyContactInfoFormData
-	  |
-	  +organization: String?;
-	  +institutionalReviewBoard: String?;
-	  +institutionalReviewBoardNumber: String?;
-	  +researchers: String?;
-	  +email: String?;
-	  +website: String?;
-	  +phone: String?;
-	  +additionalInfo: String?;
-	  +id: String
-	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
-	
-	[StudyFormValidationSet
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
-	]
-	
-	[Enum]&lt;:--[StudyFormValidationSet]
-	
-	[MeasurementsFormData
-	  |
-	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
-	  +id: String
-	  |
-	  +Study apply();
-	  +MeasurementsFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
-	
-	[MeasurementSurveyFormView
-	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
-	]
-	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
-	
-	[SurveyPreview
-	  |
-	  +routeArgs: MeasurementFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
-	
-	[MeasurementSurveyFormData
-	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
-	]
-	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
-	
-	[MeasurementSurveyFormViewModel
-	  |
-	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
-	]
-	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
-	
-	[StudyDesignMeasurementsFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
-	
-	[MeasurementsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +measurementsArray: FormArray&lt;dynamic&gt;;
-	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
-	  +form: FormGroup;
-	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +measurementRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +MeasurementsFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +MeasurementSurveyFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave()
-	]
-	
-	[MeasurementsFormViewModel]o-[Study]
-	[MeasurementsFormViewModel]o-[GoRouter]
-	[MeasurementsFormViewModel]o-[FormArray]
-	[MeasurementsFormViewModel]o-[FormViewModelCollection]
-	[MeasurementsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
-	
-	[StudyFormScaffold
-	  |
-	  +studyId: String;
-	  +formViewModelBuilder: T Function(WidgetRef);
-	  +formViewBuilder: Widget Function(T)
-	  |
-	  +Widget build()
-	]
-	
-	[StudyFormScaffold]o-[T Function(WidgetRef)]
-	[StudyFormScaffold]o-[Widget Function(T)]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
-	
-	[ConsentItemFormViewModel
-	  |
-	  +consentIdControl: FormControl&lt;String&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +form: FormGroup;
-	  +consentId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +ConsentItemFormData buildFormData();
-	  +ConsentItemFormViewModel createDuplicate()
-	]
-	
-	[ConsentItemFormViewModel]o-[FormControl]
-	[ConsentItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
-	
-	[StudyDesignEnrollmentFormView
-	  |
-	  +Widget build();
-	  -dynamic _showScreenerQuestionSidesheetWithArgs();
-	  -dynamic _showConsentItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
-	
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
-	  |
-	  +isDirtyOptionsBannerVisible: bool
-	]
-	
-	[ScreenerQuestionLogicFormView
-	  |
-	  +formViewModel: ScreenerQuestionFormViewModel
-	  |
-	  +Widget build();
-	  -dynamic _buildInfoBanner();
-	  -dynamic _buildAnswerOptionsLogicControls();
-	  -List&lt;Widget&gt; _buildOptionLogicRow()
-	]
-	
-	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
-	
-	[ConsentItemFormData
-	  |
-	  +consentId: String;
-	  +title: String;
-	  +description: String;
-	  +iconName: String?;
-	  +id: String
-	  |
-	  +ConsentItem toConsentItem();
-	  +ConsentItemFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
-	
-	[ConsentItemFormView
-	  |
-	  +formViewModel: ConsentItemFormViewModel
-	]
-	
-	[ConsentItemFormView]o-[ConsentItemFormViewModel]
-	
-	[EnrollmentFormData
-	  |
-	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
-	  +enrollmentType: Participation;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
-	  +id: String
-	  |
-	  +Study apply();
-	  +EnrollmentFormData copy()
-	]
-	
-	[EnrollmentFormData]o-[Participation]
-	[EnrollmentFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
-	
-	[ScreenerQuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultResponseOptionValidity: bool;
-	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
-	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
-	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
-	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionValues: List&lt;dynamic&gt;;
-	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isDirtyOptionsBannerVisible: bool
-	  |
-	  +dynamic onResponseOptionsChanged();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
-	  +ScreenerQuestionFormViewModel createDuplicate()
-	]
-	
-	[ScreenerQuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
-	
-	[EnrollmentFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
-	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
-	  +consentItemArray: FormArray&lt;dynamic&gt;;
-	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +form: FormGroup;
-	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
-	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestScreener: bool;
-	  +canTestConsent: bool;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setControlsFrom();
-	  +EnrollmentFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
-	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
-	  +dynamic testScreener();
-	  +dynamic testConsent();
-	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
-	]
-	
-	[EnrollmentFormViewModel]o-[Study]
-	[EnrollmentFormViewModel]o-[GoRouter]
-	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
-	[EnrollmentFormViewModel]o-[FormControl]
-	[EnrollmentFormViewModel]o-[FormArray]
-	[EnrollmentFormViewModel]o-[FormViewModelCollection]
-	[EnrollmentFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
-	
-	[EnrollmentFormConsentItemDelegate
-	  |
-	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +owner: EnrollmentFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
-	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ConsentItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
-	]
-	
-	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
-	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
-	
-	[StudyFormViewModel
-	  |
-	  +studyDirtyCopy: Study?;
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +router: GoRouter;
-	  +studyInfoFormViewModel: StudyInfoFormViewModel;
-	  +enrollmentFormViewModel: EnrollmentFormViewModel;
-	  +measurementsFormViewModel: MeasurementsFormViewModel;
-	  +reportsFormViewModel: ReportsFormViewModel;
-	  +interventionsFormViewModel: InterventionsFormViewModel;
-	  +form: FormGroup;
-	  +isStudyReadonly: bool;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +void dispose();
-	  +void onCancel();
-	  +dynamic onSave();
-	  -dynamic _applyAndSaveSubform()
-	]
-	
-	[StudyFormViewModel]o-[Study]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyFormViewModel]o-[GoRouter]
-	[StudyFormViewModel]o-[StudyInfoFormViewModel]
-	[StudyFormViewModel]o-[EnrollmentFormViewModel]
-	[StudyFormViewModel]o-[MeasurementsFormViewModel]
-	[StudyFormViewModel]o-[ReportsFormViewModel]
-	[StudyFormViewModel]o-[InterventionsFormViewModel]
-	[StudyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls
-	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
-	  +void read();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
-	]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	
-	[QuestionnaireFormData
-	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
-	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
-	
-	[&lt;abstract&gt;QuestionFormData
-	  |
-	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
-	  +questionId: String;
-	  +questionText: String;
-	  +questionInfoText: String?;
-	  +questionType: SurveyQuestionType;
-	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
-	  +responseOptions: List&lt;dynamic&gt;;
-	  +id: String
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +EligibilityCriterion toEligibilityCriterion();
-	  +Answer&lt;dynamic&gt; constructAnswerFor();
-	  +dynamic setResponseOptionsValidityFrom();
-	  +QuestionFormData copy()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
-	
-	[ChoiceQuestionFormData
-	  |
-	  +isMultipleChoice: bool;
-	  +answerOptions: List&lt;String&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +QuestionFormData copy();
-	  -Choice _buildChoiceForValue();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
-	
-	[BoolQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +BoolQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
-	
-	[ImageQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +ImageQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
-	
-	[AudioQuestionFormData
-	  |
-	  +maxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +AudioQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
-	
-	[ScaleQuestionFormData
-	  |
-	  +minValue: double;
-	  +maxValue: double;
-	  +minLabel: String?;
-	  +maxLabel: String?;
-	  +midValues: List&lt;double?&gt;;
-	  +midLabels: List&lt;String?&gt;;
-	  +stepSize: double;
-	  +initialValue: double?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +responseOptions: List&lt;double&gt;;
-	  +midAnnotations: List&lt;Annotation&gt;
-	  |
-	  +ScaleQuestion toQuestion();
-	  +QuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[ScaleQuestionFormData]o-[Color]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
-	
-	[FreeTextQuestionFormData
-	  |
-	  +textLengthRange: List&lt;int&gt;;
-	  +textType: FreeTextQuestionType;
-	  +textTypeExpression: String?;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +FreeTextQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
-	
-	[AudioRecordingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
-	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
-	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
-	]
-	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
-	
-	[SurveyQuestionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
-	]
-	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[ImageCapturingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	]
-	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
-	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
-	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
-	[QuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
-	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
-	]
-	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
-	
-	[SurveyQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
-	]
-	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule
-	  |
-	  +instanceId: String;
-	  +isTimeLocked: bool;
-	  +timeLockStart: StudyUTimeOfDay?;
-	  +timeLockEnd: StudyUTimeOfDay?;
-	  +hasReminder: bool;
-	  +reminderTime: StudyUTimeOfDay?
-	  |
-	  +Schedule toSchedule()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
-	
-	[ScheduleControls
-	  |
-	  +formViewModel: WithScheduleControls
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
-	]
-	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
-	
-	[&lt;abstract&gt;WithScheduleControls
-	  |
-	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
-	  +instanceID: FormControl&lt;String&gt;;
-	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +hasReminderControl: FormControl&lt;bool&gt;;
-	  +reminderTimeControl: FormControl&lt;Time&gt;;
-	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
-	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
-	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  +hasReminder: bool;
-	  +isTimeRestricted: bool;
-	  +timeRestriction: List&lt;Time&gt;?
-	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
-	]
-	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget
-	  |
-	  +Widget? banner()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="2822.0" width="30192.8" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M1481.7 394.2 L148 531 L148 716.5 L148.0 716.5 " fill="none"></path>
-					<path d="M1482.3 399.5 L1481.7 394.2 L1481.2 388.9 L1495.0 392.9 Z"></path>
-					<path d="M523.5 797.2 L523.5 964 L6483 1606.8832785345232 L6483.0 1606.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M528.8 787.8 L523.5 797.2 L518.2 787.8 L523.5 778.5 Z"></path>
-					</g>
-					<path d="M4733.0 812.7 L4733 964 L2828.3341799709724 1637.5 L2828.3 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4738.3 803.3 L4733.0 812.7 L4727.7 803.3 L4733.0 794.0 Z"></path>
-					</g>
-					<path d="M9145.9 385.0 L4733 531 L4733 701 L4733.0 701.0 " fill="none"></path>
-					<path d="M9146.1 390.3 L9145.9 385.0 L9145.7 379.6 L9159.3 384.5 Z"></path>
-					<path d="M11566.8 454.7 L11566.75 531 L11566.75 551 L11566.8 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11572.1 445.3 L11566.8 454.7 L11561.4 445.3 L11566.8 436.0 Z"></path>
-					</g>
-					<path d="M14294.9 111.4 L11566.75 233 L11566.75 328 L11566.8 328.0 " fill="none"></path>
-					<path d="M14295.2 116.7 L14294.9 111.4 L14294.7 106.0 L14308.3 110.8 Z"></path>
-					<path d="M28440.9 474.1 L28366.5 531 L28366.5 663.5 L28366.5 663.5 " fill="none"></path>
-					<path d="M28444.1 478.3 L28440.9 474.1 L28437.6 469.9 L28451.5 466.0 Z"></path>
-					<path d="M13202.3 1858.8 L12970.5 2342 L15307.5 2526.0973600844773 L15307.5 2526.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13211.1 1852.7 L13202.3 1858.8 L13201.5 1848.1 L13210.3 1842.0 Z"></path>
-					</g>
-					<path d="M13229.2 1859.6 L13061.5 2342 L17274.75 2526.485795621295 L17274.8 2526.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13237.3 1852.6 L13229.2 1859.6 L13227.2 1849.1 L13235.3 1842.0 Z"></path>
-					</g>
-					<path d="M13328.4 1860.5 L13392 2342 L13392 2528.5 L13392 2528.5 L13392 2715 L13392 2715 L14290.75 2748.664600369296 L14290.8 2748.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13332.5 1850.6 L13328.4 1860.5 L13321.9 1852.0 L13326.0 1842.0 Z"></path>
-					</g>
-					<path d="M13340.4 1860.3 L13432 2342 L13432 2528.5 L13432 2528.5 L13432 2715 L13432 2715 L16712.5 2749.3533185840706 L16712.5 2749.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13343.9 1850.2 L13340.4 1860.3 L13333.4 1852.2 L13336.9 1842.0 Z"></path>
-					</g>
-					<path d="M13427.0 1857.9 L13724.75 2342 L14630 2518.2768206734536 L14630.0 2518.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13426.7 1847.2 L13427.0 1857.9 L13417.6 1852.7 L13417.2 1842.0 Z"></path>
-					</g>
-					<path d="M13386.0 401.5 L12970.5 531 L12970.5 747.5 L12970.5 747.5 L12970.5 964 L12970.5 964 L13210.340348330914 1464 L13210.3 1464.0 " fill="none"></path>
-					<path d="M13387.6 406.6 L13386.0 401.5 L13384.5 396.4 L13398.8 397.5 Z"></path>
-					<path d="M11304.4 952.2 L11289.25 964 L12881.5 1509.3263327948303 L12881.5 1509.3 " fill="none"></path>
-					<path d="M11307.7 956.4 L11304.4 952.2 L11301.1 948.0 L11314.9 944.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M19282.2 385.5 L14192.25 531 L14192.25 747.5 L14192.25 747.5 L14192.25 964 L14192.25 964 L13545.47931785196 1464 L13545.5 1464.0 " fill="none"></path>
-					</g>
-					<path d="M19282.3 390.8 L19282.2 385.5 L19282.0 380.2 L19295.5 385.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1814.8 766.9 L1161.25 964 L12881.5 1629.1909841635947 L12881.5 1629.2 " fill="none"></path>
-					</g>
-					<path d="M1816.4 772.0 L1814.8 766.9 L1813.3 761.7 L1827.6 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M21030.3 398.0 L20115.75 531 L20115.75 747.5 L20115.75 747.5 L20115.75 964 L20115.75 964 L13720.5 1610.5867786786016 L13720.5 1610.6 " fill="none"></path>
-					</g>
-					<path d="M21031.1 403.2 L21030.3 398.0 L21029.5 392.7 L21043.5 396.0 Z"></path>
-					<path d="M11935.7 1807.6 L11800.75 2342 L13125.5 2520.871221719457 L13125.5 2520.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11943.2 1799.9 L11935.7 1807.6 L11932.8 1797.2 L11940.3 1789.5 Z"></path>
-					</g>
-					<path d="M12013.8 1807.6 L12148.75 2342 L14630 2524.6356684755797 L14630.0 2524.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12016.7 1797.2 L12013.8 1807.6 L12006.3 1799.9 L12009.2 1789.5 Z"></path>
-					</g>
-					<path d="M3368.0 765.1 L2119 964 L11626.75 1628.6718666768131 L11626.8 1628.7 " fill="none"></path>
-					<path d="M3368.8 770.4 L3368.0 765.1 L3367.2 759.8 L3381.2 763.0 Z"></path>
-					<path d="M21654.0 910.6 L21623.5 964 L12322.75 1628.149941702293 L12322.8 1628.1 " fill="none"></path>
-					<path d="M21658.7 913.2 L21654.0 910.6 L21649.4 907.9 L21660.7 899.0 Z"></path>
-					<path d="M11586.6 962.6 L11586.75 964 L11586.75 1653 L11586.75 1653 L11586.75 2342 L11586.75 2342 L17466.25 2526.2128097438053 L17466.3 2526.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11591.1 952.8 L11586.6 962.6 L11580.5 953.8 L11584.9 944.0 Z"></path>
-					</g>
-					<path d="M11963.8 855.5 L12362.75 964 L12362.75 1653 L12362.75 1653 L12362.75 2342 L12362.75 2342 L13125.5 2515.637931034483 L13125.5 2515.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11956.2 847.9 L11963.8 855.5 L11953.4 858.2 L11945.8 850.6 Z"></path>
-					</g>
-					<path d="M26170.2 108.5 L22194.25 233 L22194.25 283 L22194.3 283.0 " fill="none"></path>
-					<path d="M26170.3 113.8 L26170.2 108.5 L26170.0 103.1 L26183.5 108.0 Z"></path>
-					<path d="M22887.0 1770.7 L22887 2342 L17612.25 2525.9541629657333 L17612.3 2526.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22892.3 1761.3 L22887.0 1770.7 L22881.7 1761.3 L22887.0 1752.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M23957.3 391.9 L22768.5 531 L22768.5 747.5 L22768.5 747.5 L22768.5 964 L22768.5 964 L22869.973149492016 1554 L22870.0 1554.0 " fill="none"></path>
-					</g>
-					<path d="M23957.9 397.2 L23957.3 391.9 L23956.6 386.6 L23970.5 390.4 Z"></path>
-					<path d="M4321.5 797.2 L4321.5 964 L11626.75 1621.6705647927351 L11626.8 1621.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4326.8 787.8 L4321.5 797.2 L4316.2 787.8 L4321.5 778.5 Z"></path>
-					</g>
-					<path d="M23005.5 835.2 L23005.5 964 L22904.026850507984 1554 L22904.0 1554.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23010.8 825.8 L23005.5 835.2 L23000.2 825.8 L23005.5 816.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M23957.3 394.2 L23005.5 531 L23005.5 678.5 L23005.5 678.5 " fill="none"></path>
-					</g>
-					<path d="M23958.1 399.5 L23957.3 394.2 L23956.5 388.9 L23970.5 392.3 Z"></path>
-					<path d="M6740.9 1902.4 L6442 2342 L15307.5 2527.860583408273 L15307.5 2527.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6750.5 1897.7 L6740.9 1902.4 L6741.7 1891.7 L6751.4 1887.0 Z"></path>
-					</g>
-					<path d="M6755.1 1902.9 L6482 2342 L13125.5 2526.927276119403 L13125.5 2526.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6764.6 1897.7 L6755.1 1902.9 L6755.5 1892.1 L6765.0 1887.0 Z"></path>
-					</g>
-					<path d="M6910.5 1905.7 L6910.5 2342 L6910.5 2528.5 L6910.5 2528.5 L6910.5 2715 L6910.5 2715 L14290.75 2750.2658579264394 L14290.8 2750.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6915.8 1896.3 L6910.5 1905.7 L6905.2 1896.3 L6910.5 1887.0 Z"></path>
-					</g>
-					<path d="M7006.5 1904.4 L7173.5 2342 L7173.5 2528.5 L7173.5 2528.5 L7173.5 2715 L7173.5 2715 L16712.5 2750.097113540965 L16712.5 2750.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7008.1 1893.8 L7006.5 1904.4 L6998.2 1897.6 L6999.8 1887.0 Z"></path>
-					</g>
-					<path d="M7020.9 1904.1 L7213.5 2342 L14630 2527.18908153702 L14630.0 2527.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7022.0 1893.4 L7020.9 1904.1 L7012.3 1897.7 L7013.4 1887.0 Z"></path>
-					</g>
-					<path d="M3440.3 769.7 L3105.75 964 L6483 1575.5842696629213 L6483.0 1575.6 " fill="none"></path>
-					<path d="M3443.0 774.3 L3440.3 769.7 L3437.6 765.1 L3451.8 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M19282.2 385.5 L14232.25 531 L14232.25 747.5 L14232.25 747.5 L14232.25 964 L14232.25 964 L7338 1612.7708881073513 L7338.0 1612.8 " fill="none"></path>
-					</g>
-					<path d="M19282.3 390.8 L19282.2 385.5 L19282.0 380.2 L19295.5 385.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1817.8 767.1 L1201.25 964 L6483 1601.4087226868678 L6483.0 1601.4 " fill="none"></path>
-					</g>
-					<path d="M1819.4 772.1 L1817.8 767.1 L1816.2 762.0 L1830.5 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M21030.3 398.6 L20155.75 531 L20155.75 747.5 L20155.75 747.5 L20155.75 964 L20155.75 964 L7338 1630.7620278967931 L7338.0 1630.8 " fill="none"></path>
-					</g>
-					<path d="M21031.1 403.9 L21030.3 398.6 L21029.5 393.3 L21043.5 396.6 Z"></path>
-					<path d="M1482.0 409.1 L947.5 531 L947.5 709 L947.5 709.0 " fill="none"></path>
-					<path d="M1483.2 414.3 L1482.0 409.1 L1480.8 403.9 L1495.0 406.2 Z"></path>
-					<path d="M22582.3 469.7 L22582.25 531 L22582.25 732 L22582.3 732.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22587.6 460.3 L22582.3 469.7 L22576.9 460.3 L22582.3 451.0 Z"></path>
-					</g>
-					<path d="M26170.2 108.7 L22582.25 233 L22582.25 313 L22582.3 313.0 " fill="none"></path>
-					<path d="M26170.4 114.0 L26170.2 108.7 L26170.0 103.3 L26183.5 108.2 Z"></path>
-					<path d="M5148.6 1736.6 L4667.5 2342 L13125.5 2527.2624346702682 L13125.5 2527.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5158.5 1732.6 L5148.6 1736.6 L5150.2 1726.0 L5160.2 1722.0 Z"></path>
-					</g>
-					<path d="M5217.5 1740.7 L5235 2342 L5428.922252010724 2513 L5428.9 2513.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5222.6 1731.2 L5217.5 1740.7 L5211.9 1731.5 L5217.0 1722.0 Z"></path>
-					</g>
-					<path d="M28843.5 231.4 L28843.25 233 L28843.25 366.5 L28843.3 366.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28850.2 223.1 L28843.5 231.4 L28839.7 221.4 L28846.4 213.0 Z"></path>
-					</g>
-					<path d="M29008.9 224.8 L29019 233 L29238.289429530203 366.5 L29238.3 366.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M29005.0 214.7 L29008.9 224.8 L28998.3 223.0 L28994.4 213.0 Z"></path>
-					</g>
-					<path d="M29207.1 224.8 L29197 233 L29416.289429530203 366.5 L29416.3 366.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M29217.7 223.0 L29207.1 224.8 L29211.0 214.7 L29221.6 213.0 Z"></path>
-					</g>
-					<path d="M29595.6 202.2 L29673.75 233 L29306.40100671141 366.5 L29306.4 366.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M29588.9 193.8 L29595.6 202.2 L29585.0 203.7 L29578.3 195.4 Z"></path>
-					</g>
-					<path d="M4523.9 2512.9 L5035.083333333334 2475 L5167.541666666667 2475 L5167.541666666667 2475 L5300 2528.5 L5300 2528.5 L5167.541666666667 2582 L5167.541666666667 2582 L5035.083333333334 2582 L5035.083333333334 2582 L4505.25 2542.703211645102 L4505.3 2542.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4514.2 2508.3 L4523.9 2512.9 L4515.0 2518.9 L4505.3 2514.3 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M5958.5 1680.2 L5594.5 2342 L4505.25 2500.6141909037674 L4505.3 2500.6 " fill="none"></path>
-					</g>
-					<path d="M5963.2 1682.8 L5958.5 1680.2 L5953.9 1677.6 L5965.0 1668.5 Z"></path>
-					<path d="M5280.3 827.7 L5280.25 964 L4533.5 1378.8443862124573 L4533.5 1378.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5285.6 818.3 L5280.3 827.7 L5274.9 818.3 L5280.3 809.0 Z"></path>
-					</g>
-					<path d="M9145.9 385.4 L5280.25 531 L5280.25 686 L5280.3 686.0 " fill="none"></path>
-					<path d="M9146.1 390.7 L9145.9 385.4 L9145.7 380.0 L9159.3 384.9 Z"></path>
-					<path d="M30034.8 135.3 L30034.75 233 L30034.75 335.5 L30034.8 335.5 " fill="none"></path>
-					<path d="M30040.1 135.3 L30034.8 135.3 L30029.4 135.3 L30034.8 122.0 Z"></path>
-					<path d="M5799.3 827.7 L5799.25 964 L4533.5 1459.723603808441 L4533.5 1459.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5804.6 818.3 L5799.3 827.7 L5793.9 818.3 L5799.3 809.0 Z"></path>
-					</g>
-					<path d="M9145.9 385.9 L5799.25 531 L5799.25 686 L5799.3 686.0 " fill="none"></path>
-					<path d="M9146.2 391.2 L9145.9 385.9 L9145.7 380.5 L9159.3 385.3 Z"></path>
-					<path d="M3529.3 1865.3 L2382.25 2342 L4122.25 2510.009319181983 L4122.3 2510.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3539.9 1866.6 L3529.3 1865.3 L3535.8 1856.8 L3546.5 1858.1 Z"></path>
-					</g>
-					<path d="M4040.0 1958.2 L4040 2342 L13125.5 2527.347380223146 L13125.5 2527.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4045.3 1948.8 L4040.0 1958.2 L4034.7 1948.8 L4040.0 1939.5 Z"></path>
-					</g>
-					<path d="M4296.4 1953.7 L4627.5 2342 L14630 2527.5262307309795 L14630.0 2527.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4294.4 1943.1 L4296.4 1953.7 L4286.3 1950.1 L4284.3 1939.5 Z"></path>
-					</g>
-					<path d="M3443.5 770.3 L3145.75 964 L3668.15293904209 1366.5 L3668.2 1366.5 " fill="none"></path>
-					<path d="M3446.4 774.7 L3443.5 770.3 L3440.6 765.8 L3454.7 763.0 Z"></path>
-					<path d="M8130.3 838.3 L7810 964 L4533.5 1562.808620689655 L4533.5 1562.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8140.9 839.9 L8130.3 838.3 L8137.0 829.9 L8147.7 831.5 Z"></path>
-					</g>
-					<path d="M8371.2 850.1 L8381.75 964 L7757.369557329463 1637.5 L7757.4 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8375.7 840.3 L8371.2 850.1 L8365.1 841.3 L8369.5 831.5 Z"></path>
-					</g>
-					<path d="M17954.3 1841.3 L17535.75 2342 L15368.5 2525.9117847798884 L15368.5 2525.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17964.4 1837.6 L17954.3 1841.3 L17956.2 1830.7 L17966.3 1827.0 Z"></path>
-					</g>
-					<path d="M18051.8 1844.8 L17896.25 2342 L17366.75 2513.5929626411817 L17366.8 2513.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18059.6 1837.5 L18051.8 1844.8 L18049.5 1834.3 L18057.3 1827.0 Z"></path>
-					</g>
-					<path d="M18062.8 1845.1 L17936.25 2342 L16474.75 2486.7529208709507 L16474.8 2486.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18070.3 1837.4 L18062.8 1845.1 L18060.0 1834.7 L18067.4 1827.0 Z"></path>
-					</g>
-					<path d="M18216.9 1843.3 L18492.25 2342 L18492.25 2528.5 L18492.25 2528.5 L18492.25 2715 L18492.25 2715 L14388.75 2750.0810957254666 L14388.8 2750.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18217.0 1832.6 L18216.9 1843.3 L18207.7 1837.7 L18207.8 1827.0 Z"></path>
-					</g>
-					<path d="M18227.7 1842.9 L18532.25 2342 L18532.25 2528.5 L18532.25 2528.5 L18532.25 2715 L18532.25 2715 L16931.5 2748.2270866832337 L16931.5 2748.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18227.4 1832.2 L18227.7 1842.9 L18218.3 1837.7 L18217.9 1827.0 Z"></path>
-					</g>
-					<path d="M18238.4 1842.5 L18572.25 2342 L14735 2525.982807378366 L14735.0 2526.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18237.7 1831.8 L18238.4 1842.5 L18228.8 1837.7 L18228.0 1827.0 Z"></path>
-					</g>
-					<path d="M13434.8 409.4 L13374.25 531 L13374.25 747.5 L13374.25 747.5 L13374.25 964 L13374.25 964 L17681.75 1590.4627968337732 L17681.8 1590.5 " fill="none"></path>
-					<path d="M13439.6 411.8 L13434.8 409.4 L13430.1 407.1 L13440.8 397.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M19282.2 385.5 L14272.25 531 L14272.25 747.5 L14272.25 747.5 L14272.25 964 L14272.25 964 L17681.75 1575.8363068107826 L17681.8 1575.8 " fill="none"></path>
-					</g>
-					<path d="M19282.3 390.9 L19282.2 385.5 L19282.0 380.2 L19295.5 385.2 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M21069.7 401.0 L20587.75 531 L20587.75 747.5 L20587.75 747.5 L20587.75 964 L20587.75 964 L18541.75 1533.343295638126 L18541.8 1533.3 " fill="none"></path>
-					</g>
-					<path d="M21071.1 406.1 L21069.7 401.0 L21068.3 395.8 L21082.6 397.5 Z"></path>
-					<path d="M16053.3 2653.7 L16053.25 2715 L16712.5 2745.4434146341464 L16712.5 2745.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16058.6 2644.3 L16053.3 2653.7 L16047.9 2644.3 L16053.3 2635.0 Z"></path>
-					</g>
-					<path d="M16493.4 2496.4 L18612.25 2342 L18238.146226415094 1827 L18238.1 1827.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16483.7 2491.8 L16493.4 2496.4 L16484.4 2502.4 L16474.8 2497.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M19282.2 386.0 L14868.5 531 L14868.5 747.5 L14868.5 747.5 L14868.5 964 L14868.5 964 L14868.5 1653 L14868.5 1653 L14868.5 2342 L14868.5 2342 L15631.75 2462.1486600548637 L15631.8 2462.1 " fill="none"></path>
-					</g>
-					<path d="M19282.3 391.3 L19282.2 386.0 L19282.0 380.7 L19295.5 385.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1820.7 767.3 L1241.25 964 L1241.25 1653 L1241.25 1653 L1241.25 2342 L1241.25 2342 L15631.75 2523.1928335133675 L15631.8 2523.2 " fill="none"></path>
-					</g>
-					<path d="M1822.4 772.3 L1820.7 767.3 L1819.0 762.2 L1833.3 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M21073.9 401.2 L20627.75 531 L20627.75 747.5 L20627.75 747.5 L20627.75 964 L20627.75 964 L20627.75 1653 L20627.75 1653 L20627.75 2342 L20627.75 2342 L16474.75 2511.31566291398 L16474.8 2511.3 " fill="none"></path>
-					</g>
-					<path d="M21075.4 406.3 L21073.9 401.2 L21072.4 396.1 L21086.7 397.5 Z"></path>
-					<path d="M7448.4 1739.8 L7253.5 2342 L6316 2502.701976102941 L6316.0 2502.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7456.4 1732.5 L7448.4 1739.8 L7446.2 1729.2 L7454.2 1722.0 Z"></path>
-					</g>
-					<path d="M7522.5 1738.4 L7847.75 2342 L7847.75 2513 L7847.8 2513.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7522.8 1727.7 L7522.5 1738.4 L7513.4 1732.7 L7513.7 1722.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M23957.5 402.0 L23411.5 531 L23411.5 686 L23411.5 686.0 " fill="none"></path>
-					</g>
-					<path d="M23958.8 407.2 L23957.5 402.0 L23956.3 396.8 L23970.5 398.9 Z"></path>
-					<path d="M6334.5 2506.6 L6578.166666666667 2475 L6643.708333333333 2475 L6643.708333333333 2475 L6709.25 2528.5 L6709.25 2528.5 L6643.708333333333 2582 L6643.708333333333 2582 L6578.166666666667 2582 L6578.166666666667 2582 L6316 2548.0115105008076 L6316.0 2548.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6324.6 2502.5 L6334.5 2506.6 L6325.9 2513.1 L6316.0 2509.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M5960.0 1680.5 L5634.5 2342 L6015 2475.6407721280602 L6015.0 2475.6 " fill="none"></path>
-					</g>
-					<path d="M5964.8 1682.8 L5960.0 1680.5 L5955.2 1678.1 L5965.9 1668.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M26170.2 110.1 L24042 233 L24042 351 L24042.0 351.0 " fill="none"></path>
-					</g>
-					<path d="M26170.5 115.4 L26170.2 110.1 L26169.9 104.8 L26183.5 109.3 Z"></path>
-					<path d="M13979.7 1911.2 L13764.75 2342 L15307.5 2524.884395359924 L15307.5 2524.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13988.6 1905.2 L13979.7 1911.2 L13979.1 1900.5 L13988.0 1894.5 Z"></path>
-					</g>
-					<path d="M14197.6 1912.2 L14345.5 2342 L13238.5 2519.4434894714223 L13238.5 2519.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14199.6 1901.6 L14197.6 1912.2 L14189.6 1905.1 L14191.6 1894.5 Z"></path>
-					</g>
-					<path d="M14212.6 1911.8 L14385.5 2342 L14657.8163538874 2513 L14657.8 2513.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14214.0 1901.2 L14212.6 1911.8 L14204.1 1905.1 L14205.6 1894.5 Z"></path>
-					</g>
-					<path d="M13471.2 407.4 L13581.75 531 L13581.75 747.5 L13581.75 747.5 L13581.75 964 L13581.75 964 L13923.869920174166 1411.5 L13923.9 1411.5 " fill="none"></path>
-					<path d="M13475.2 403.9 L13471.2 407.4 L13467.3 411.0 L13462.4 397.5 Z"></path>
-					<path d="M1525.5 418.8 L1295.5 531 L1295.5 716.5 L1295.5 716.5 " fill="none"></path>
-					<path d="M1527.8 423.6 L1525.5 418.8 L1523.1 414.1 L1537.4 413.0 Z"></path>
-					<path d="M23827.5 850.2 L23827.5 964 L23930.56603773585 1539 L23930.6 1539.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23832.8 840.8 L23827.5 850.2 L23822.2 840.8 L23827.5 831.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M23986.4 420.6 L23827.5 531 L23827.5 663.5 L23827.5 663.5 " fill="none"></path>
-					</g>
-					<path d="M23989.5 425.0 L23986.4 420.6 L23983.4 416.2 L23997.4 413.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M24051.6 426.0 L24074.5 531 L24074.5 747.5 L24074.5 747.5 L24074.5 964 L24074.5 964 L23971.43396226415 1539 L23971.4 1539.0 " fill="none"></path>
-					</g>
-					<path d="M24056.8 424.9 L24051.6 426.0 L24046.4 427.2 L24048.8 413.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M5988.8 1680.1 L6362 2342 L5901.335120643432 2490 L5901.3 2490.0 " fill="none"></path>
-					</g>
-					<path d="M5993.4 1677.5 L5988.8 1680.1 L5984.1 1682.7 L5982.2 1668.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M24120.6 418.6 L24361.5 531 L24361.5 686 L24361.5 686.0 " fill="none"></path>
-					</g>
-					<path d="M24122.8 413.8 L24120.6 418.6 L24118.3 423.5 L24108.5 413.0 Z"></path>
-					<path d="M10533.8 797.2 L10533.75 964 L14908.5 1602.2304271875496 L14908.5 1602.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10539.1 787.8 L10533.8 797.2 L10528.4 787.8 L10533.8 778.5 Z"></path>
-					</g>
-					<path d="M6250.8 812.7 L6250.75 964 L4731.953737300435 1637.5 L4732.0 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6256.1 803.3 L6250.8 812.7 L6245.4 803.3 L6250.8 794.0 Z"></path>
-					</g>
-					<path d="M9145.9 386.5 L6250.75 531 L6250.75 701 L6250.8 701.0 " fill="none"></path>
-					<path d="M9146.2 391.8 L9145.9 386.5 L9145.7 381.1 L9159.3 385.8 Z"></path>
-					<path d="M28756.0 865.2 L28756 964 L25333.5 1617.8479134895329 L25333.5 1617.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28761.3 855.8 L28756.0 865.2 L28750.7 855.8 L28756.0 846.5 Z"></path>
-					</g>
-					<path d="M28681.6 474.1 L28756 531 L28756 648.5 L28756.0 648.5 " fill="none"></path>
-					<path d="M28684.9 469.9 L28681.6 474.1 L28678.4 478.3 L28671.0 466.0 Z"></path>
-					<path d="M15198.5 1882.6 L15082.5 2342 L15316.765415549598 2513 L15316.8 2513.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15206.0 1874.9 L15198.5 1882.6 L15195.6 1872.2 L15203.1 1864.5 Z"></path>
-					</g>
-					<path d="M15397.4 1880.4 L15683.5 2342 L13238.5 2524.287627423546 L13238.5 2524.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15397.0 1869.6 L15397.4 1880.4 L15388.0 1875.2 L15387.6 1864.5 Z"></path>
-					</g>
-					<path d="M15410.3 1880.0 L15723.5 2342 L14735 2519.094380403458 L14735.0 2519.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15409.5 1869.2 L15410.3 1880.0 L15400.7 1875.2 L15399.9 1864.5 Z"></path>
-					</g>
-					<path d="M3446.8 770.9 L3185.75 964 L14908.5 1633.1361141602633 L14908.5 1633.1 " fill="none"></path>
-					<path d="M3450.0 775.2 L3446.8 770.9 L3443.6 766.6 L3457.5 763.0 Z"></path>
-					<path d="M20881.7 887.3 L20825.75 964 L15604.5 1609.9471652376892 L15604.5 1609.9 " fill="none"></path>
-					<path d="M20886.1 890.4 L20881.7 887.3 L20877.4 884.1 L20889.6 876.5 Z"></path>
-					<path d="M21917.2 908.2 L21976.25 964 L15604.5 1617.31831541352 L15604.5 1617.3 " fill="none"></path>
-					<path d="M21920.8 904.3 L21917.2 908.2 L21913.5 912.0 L21907.5 899.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M19430.4 406.6 L19563.75 531 L19563.75 747.5 L19563.75 747.5 L19563.75 964 L19563.75 964 L15604.5 1597.332927041616 L15604.5 1597.3 " fill="none"></path>
-					</g>
-					<path d="M19434.0 402.7 L19430.4 406.6 L19426.7 410.5 L19420.6 397.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1823.7 767.5 L1281.25 964 L14908.5 1635.843097619005 L14908.5 1635.8 " fill="none"></path>
-					</g>
-					<path d="M1825.5 772.6 L1823.7 767.5 L1821.9 762.5 L1836.2 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M21171.5 405.5 L21339.75 531 L21339.75 747.5 L21339.75 747.5 L21339.75 964 L21339.75 964 L15604.5 1613.5848847244483 L15604.5 1613.6 " fill="none"></path>
-					</g>
-					<path d="M21174.7 401.2 L21171.5 405.5 L21168.3 409.7 L21160.8 397.5 Z"></path>
-					<path d="M1601.3 426.3 L1602 531 L1602 716.5 L1602.0 716.5 " fill="none"></path>
-					<path d="M1606.6 426.3 L1601.3 426.3 L1596.0 426.4 L1601.2 413.0 Z"></path>
-					<path d="M16145.5 1849.9 L15805 2342 L15368.5 2516.3195931477517 L15368.5 2516.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16155.2 1845.2 L16145.5 1849.9 L16146.5 1839.1 L16156.2 1834.5 Z"></path>
-					</g>
-					<path d="M16211.3 1852.1 L16038 2342 L17274.75 2521.812024946404 L17274.8 2521.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16219.5 1845.1 L16211.3 1852.1 L16209.4 1841.5 L16217.5 1834.5 Z"></path>
-					</g>
-					<path d="M16349.1 1852.2 L16514.75 2342 L16514.75 2528.5 L16514.75 2528.5 L16514.75 2715 L16514.75 2715 L14388.75 2749.7002298850575 L14388.8 2749.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16351.2 1841.6 L16349.1 1852.2 L16341.1 1845.0 L16343.1 1834.5 Z"></path>
-					</g>
-					<path d="M16360.5 1851.9 L16554.75 2342 L16554.75 2528.5 L16554.75 2528.5 L16554.75 2715 L16554.75 2715 L16712.5 2735.9546304957903 L16712.5 2736.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16362.1 1841.2 L16360.5 1851.9 L16352.1 1845.1 L16353.7 1834.5 Z"></path>
-					</g>
-					<path d="M16371.9 1851.5 L16594.75 2342 L14735 2523.379722839587 L14735.0 2523.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16372.9 1840.8 L16371.9 1851.5 L16363.2 1845.2 L16364.2 1834.5 Z"></path>
-					</g>
-					<path d="M13526.4 400.6 L14072.25 531 L14072.25 747.5 L14072.25 747.5 L14072.25 964 L14072.25 964 L15735.75 1482.7379497623897 L15735.8 1482.7 " fill="none"></path>
-					<path d="M13527.6 395.4 L13526.4 400.6 L13525.1 405.8 L13513.4 397.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M19435.5 405.5 L19603.75 531 L19603.75 747.5 L19603.75 747.5 L19603.75 964 L19603.75 964 L16827.75 1539.7567730282963 L16827.8 1539.8 " fill="none"></path>
-					</g>
-					<path d="M19438.7 401.2 L19435.5 405.5 L19432.3 409.7 L19424.8 397.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1881.7 776.3 L1899 964 L15735.75 1626.844084059029 L15735.8 1626.8 " fill="none"></path>
-					</g>
-					<path d="M1887.0 775.8 L1881.7 776.3 L1876.3 776.8 L1880.4 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M21176.3 404.5 L21379.75 531 L21379.75 747.5 L21379.75 747.5 L21379.75 964 L21379.75 964 L16827.75 1579.2075323656336 L16827.8 1579.2 " fill="none"></path>
-					</g>
-					<path d="M21179.1 400.0 L21176.3 404.5 L21173.4 409.1 L21164.9 397.5 Z"></path>
-					<path d="M6944.7 823.3 L6825.75 964 L6155.915638606676 1637.5 L6155.9 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6954.8 819.6 L6944.7 823.3 L6946.7 812.7 L6956.8 809.0 Z"></path>
-					</g>
-					<path d="M7048.4 825.6 L7118.5 964 L6377.063497822932 1637.5 L6377.1 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7048.9 814.9 L7048.4 825.6 L7039.4 819.7 L7039.9 809.0 Z"></path>
-					</g>
-					<path d="M9145.9 388.0 L7008.75 531 L7008.75 686 L7008.8 686.0 " fill="none"></path>
-					<path d="M9146.3 393.3 L9145.9 388.0 L9145.6 382.7 L9159.3 387.1 Z"></path>
-					<path d="M8180.6 1798.4 L7887.75 2342 L13125.5 2526.5096803135475 L13125.5 2526.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8189.8 1792.7 L8180.6 1798.4 L8180.4 1787.7 L8189.5 1782.0 Z"></path>
-					</g>
-					<path d="M8340.6 1798.3 L8646.25 2342 L14630 2526.8779250362395 L14630.0 2526.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8340.7 1787.5 L8340.6 1798.3 L8331.4 1792.7 L8331.5 1782.0 Z"></path>
-					</g>
-					<path d="M3515.8 769.9 L3840 964 L7911 1598.7406653088933 L7911.0 1598.7 " fill="none"></path>
-					<path d="M3518.6 765.3 L3515.8 769.9 L3513.1 774.4 L3504.4 763.0 Z"></path>
-					<path d="M1720.3 389.9 L3850.5 531 L3850.5 701.5 L3850.5 701.5 " fill="none"></path>
-					<path d="M1720.7 384.6 L1720.3 389.9 L1720.0 395.2 L1707.0 389.0 Z"></path>
-					<path d="M12614.8 1740.7 L12614.75 2342 L12614.75 2362 L12614.8 2362.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12620.1 1731.3 L12614.8 1740.7 L12609.4 1731.3 L12614.8 1722.0 Z"></path>
-					</g>
-					<path d="M14294.9 114.2 L12614.75 233 L12614.75 382 L12614.75 382 L12614.75 531 L12614.75 531 L12614.75 747.5 L12614.75 747.5 L12614.75 964 L12614.75 964 L12614.75 1584 L12614.8 1584.0 " fill="none"></path>
-					<path d="M14295.3 119.5 L14294.9 114.2 L14294.6 108.9 L14308.3 113.3 Z"></path>
-					<path d="M26170.2 111.8 L24750 233 L24750 298 L24750.0 298.0 " fill="none"></path>
-					<path d="M26170.7 117.1 L26170.2 111.8 L26169.8 106.5 L26183.5 110.7 Z"></path>
-					<path d="M13841.8 797.2 L13841.75 964 L8607 1610.0512740137028 L8607.0 1610.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13847.1 787.8 L13841.8 797.2 L13836.4 787.8 L13841.8 778.5 Z"></path>
-					</g>
-					<path d="M24758.2 843.3 L24610.5 964 L24610.5 1637.5 L24610.5 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24768.8 841.5 L24758.2 843.3 L24762.1 833.3 L24772.7 831.5 Z"></path>
-					</g>
-					<path d="M24931.3 847.8 L24996 964 L25134.12772133527 1584 L25134.1 1584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24931.5 837.1 L24931.3 847.8 L24922.1 842.2 L24922.3 831.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M24126.6 397.1 L24875.5 531 L24875.5 663.5 L24875.5 663.5 " fill="none"></path>
-					</g>
-					<path d="M24127.6 391.9 L24126.6 397.1 L24125.7 402.4 L24113.5 394.8 Z"></path>
-					<path d="M12614.8 2713.7 L12614.75 2715 L14290.75 2749.4915942028983 L14290.8 2749.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12620.1 2704.3 L12614.8 2713.7 L12609.4 2704.3 L12614.8 2695.0 Z"></path>
-					</g>
-					<path d="M8921.2 2126.5 L8686.25 2342 L12333.75 2515.159921089474 L12333.8 2515.2 " fill="none"></path>
-					<path d="M8924.8 2130.5 L8921.2 2126.5 L8917.6 2122.6 L8931.0 2117.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M14662.5 1697.3 L14662.5 2342 L12895.75 2502.9077646197047 L12895.8 2502.9 " fill="none"></path>
-					</g>
-					<path d="M14667.8 1697.3 L14662.5 1697.3 L14657.2 1697.3 L14662.5 1684.0 Z"></path>
-					<path d="M18886.2 1918.3 L18652.25 2342 L15368.5 2526.7836991777926 L15368.5 2526.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18895.4 1912.7 L18886.2 1918.3 L18886.1 1907.6 L18895.2 1902.0 Z"></path>
-					</g>
-					<path d="M18934.1 1919.5 L18777.75 2342 L17366.75 2522.611873713109 L17366.8 2522.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18942.4 1912.6 L18934.1 1919.5 L18932.4 1908.9 L18940.6 1902.0 Z"></path>
-					</g>
-					<path d="M18949.5 1919.8 L18817.75 2342 L18452.25 2431.04735467015 L18452.3 2431.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18957.4 1912.5 L18949.5 1919.8 L18947.2 1909.3 L18955.1 1902.0 Z"></path>
-					</g>
-					<path d="M18964.9 1920.1 L18857.75 2342 L13238.5 2526.6434612165795 L13238.5 2526.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18972.4 1912.4 L18964.9 1920.1 L18962.0 1909.7 L18969.5 1902.0 Z"></path>
-					</g>
-					<path d="M19096.9 1920.2 L19198.25 2342 L19198.25 2528.5 L19198.25 2528.5 L19198.25 2715 L19198.25 2715 L14388.75 2750.1419676855 L14388.8 2750.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19099.9 1909.8 L19096.9 1920.2 L19089.6 1912.3 L19092.6 1902.0 Z"></path>
-					</g>
-					<path d="M19112.4 1919.9 L19238.25 2342 L19238.25 2528.5 L19238.25 2528.5 L19238.25 2715 L19238.25 2715 L16931.5 2748.891205380238 L16931.5 2748.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19114.8 1909.4 L19112.4 1919.9 L19104.6 1912.5 L19107.0 1902.0 Z"></path>
-					</g>
-					<path d="M19127.7 1919.6 L19278.25 2342 L14735 2526.3694989936353 L14735.0 2526.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19129.6 1909.0 L19127.7 1919.6 L19119.6 1912.6 L19121.5 1902.0 Z"></path>
-					</g>
-					<path d="M13530.6 400.4 L14112.25 531 L14112.25 747.5 L14112.25 747.5 L14112.25 964 L14112.25 964 L18581.75 1589.8480845442537 L18581.8 1589.8 " fill="none"></path>
-					<path d="M13531.7 395.2 L13530.6 400.4 L13529.4 405.6 L13517.5 397.5 Z"></path>
-					<path d="M20970.6 889.8 L20963.75 964 L19483.75 1492.0787156913516 L19483.8 1492.1 " fill="none"></path>
-					<path d="M20975.9 890.3 L20970.6 889.8 L20965.3 889.3 L20971.8 876.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M19440.3 404.5 L19643.75 531 L19643.75 747.5 L19643.75 747.5 L19643.75 964 L19643.75 964 L19253.561320754718 1404 L19253.6 1404.0 " fill="none"></path>
-					</g>
-					<path d="M19443.1 400.0 L19440.3 404.5 L19437.4 409.1 L19428.9 397.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1886.9 775.8 L1939 964 L18581.75 1634.8214844606946 L18581.8 1634.8 " fill="none"></path>
-					</g>
-					<path d="M1892.0 774.4 L1886.9 775.8 L1881.7 777.3 L1883.3 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M21180.9 403.8 L21419.75 531 L21419.75 747.5 L21419.75 747.5 L21419.75 964 L21419.75 964 L19483.75 1522.8202764976959 L19483.8 1522.8 " fill="none"></path>
-					</g>
-					<path d="M21183.4 399.1 L21180.9 403.8 L21178.4 408.5 L21169.1 397.5 Z"></path>
-					<path d="M18052.3 2653.7 L18052.25 2715 L16931.5 2747.340276366592 L16931.5 2747.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18057.6 2644.3 L18052.3 2653.7 L18046.9 2644.3 L18052.3 2635.0 Z"></path>
-					</g>
-					<path d="M18470.7 2466.9 L19318.25 2342 L19135.927793904208 1902 L19135.9 1902.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18460.7 2462.9 L18470.7 2466.9 L18462.3 2473.5 L18452.3 2469.6 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M19444.9 403.8 L19683.75 531 L19683.75 747.5 L19683.75 747.5 L19683.75 964 L19683.75 964 L19683.75 1653 L19683.75 1653 L19683.75 2342 L19683.75 2342 L18452.25 2482.7752068648483 L18452.3 2482.8 " fill="none"></path>
-					</g>
-					<path d="M19447.4 399.1 L19444.9 403.8 L19442.4 408.5 L19433.1 397.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1891.8 775.1 L1979 964 L1979 1653 L1979 1653 L1979 2342 L1979 2342 L17652.25 2523.858748230756 L17652.3 2523.9 " fill="none"></path>
-					</g>
-					<path d="M1896.6 772.9 L1891.8 775.1 L1886.9 777.3 L1886.2 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M21185.3 403.1 L21459.75 531 L21459.75 747.5 L21459.75 747.5 L21459.75 964 L21459.75 964 L21459.75 1653 L21459.75 1653 L21459.75 2342 L21459.75 2342 L18452.25 2506.607116654439 L18452.3 2506.6 " fill="none"></path>
-					</g>
-					<path d="M21187.6 398.3 L21185.3 403.1 L21183.1 408.0 L21173.3 397.5 Z"></path>
-					<path d="M17481.8 828.4 L16867.75 964 L16867.75 1653 L16867.75 1653 L16867.75 2342 L16867.75 2342 L15368.5 2524.7815819578364 L15368.5 2524.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17492.0 831.6 L17481.8 828.4 L17489.7 821.2 L17500.0 824.4 Z"></path>
-					</g>
-					<path d="M17481.9 839.2 L16983.25 964 L16983.25 1637.5 L16983.3 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17492.2 842.1 L17481.9 839.2 L17489.7 831.7 L17500.0 834.6 Z"></path>
-					</g>
-					<path d="M17482.2 864.3 L17169.75 964 L17169.75 1637.5 L17169.8 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17492.7 866.5 L17482.2 864.3 L17489.5 856.3 L17500.0 858.6 Z"></path>
-					</g>
-					<path d="M17482.6 887.0 L17280.75 964 L17280.75 1653 L17280.75 1653 L17280.75 2342 L17280.75 2342 L17317.425603217158 2513 L17317.4 2513.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17493.2 888.6 L17482.6 887.0 L17489.4 878.7 L17500.0 880.3 Z"></path>
-					</g>
-					<path d="M17519.8 938.4 L17475.75 964 L14456.5 1581.792931917737 L14456.5 1581.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17530.5 938.3 L17519.8 938.4 L17525.2 929.1 L17535.9 929.0 Z"></path>
-					</g>
-					<path d="M17989.7 944.1 L18004 964 L18660.966618287373 1404 L18661.0 1404.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17988.6 933.5 L17989.7 944.1 L17979.9 939.7 L17978.8 929.0 Z"></path>
-					</g>
-					<path d="M18024.8 942.8 L18044 964 L16745.971153846152 1471.5 L16746.0 1471.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18022.5 932.3 L18024.8 942.8 L18014.6 939.5 L18012.3 929.0 Z"></path>
-					</g>
-					<path d="M18123.6 939.7 L18158.5 964 L18123.556240928883 1479 L18123.6 1479.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18119.0 930.0 L18123.6 939.7 L18112.9 938.7 L18108.3 929.0 Z"></path>
-					</g>
-					<path d="M18214.2 829.3 L18817.75 964 L13720.5 1600.6076494312774 L13720.5 1600.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18206.3 822.0 L18214.2 829.3 L18203.9 832.4 L18196.0 825.2 Z"></path>
-					</g>
-					<path d="M18214.5 794.9 L19523.75 964 L19523.75 1653 L19523.75 1653 L19523.75 2342 L19523.75 2342 L14735 2526.4775367931834 L14735.0 2526.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18205.9 788.4 L18214.5 794.9 L18204.6 798.9 L18196.0 792.5 Z"></path>
-					</g>
-					<path d="M13532.0 399.7 L14152.25 531 L17500 727.1138808090374 L17500.0 727.1 " fill="none"></path>
-					<path d="M13533.1 394.5 L13532.0 399.7 L13530.9 404.9 L13519.0 396.9 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M19466.2 401.5 L19879.75 531 L18196 710.4176818014028 L18196.0 710.4 " fill="none"></path>
-					</g>
-					<path d="M19467.8 396.4 L19466.2 401.5 L19464.6 406.6 L19453.5 397.5 Z"></path>
-					<path d="M21076.0 892.2 L21121.75 964 L21121.75 1653 L21121.75 1653 L21121.75 2342 L21121.75 2342 L21121.75 2528.5 L21121.75 2528.5 L21121.75 2715 L21121.75 2715 L14388.75 2750.2435122382776 L14388.8 2750.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21075.5 881.5 L21076.0 892.2 L21066.5 887.2 L21066.0 876.5 Z"></path>
-					</g>
-					<path d="M21151.3 888.5 L21241 964 L21241 1653 L21241 1653 L21241 2342 L21241 2342 L21241 2528.5 L21241 2528.5 L21241 2715 L21241 2715 L16931.5 2749.620332654447 L16931.5 2749.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21147.6 878.4 L21151.3 888.5 L21140.7 886.6 L21137.0 876.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M19470.5 401.2 L19919.75 531 L20667.75 683.2011278195489 L20667.8 683.2 " fill="none"></path>
-					</g>
-					<path d="M19471.9 396.1 L19470.5 401.2 L19469.0 406.3 L19457.7 397.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M21200.9 401.6 L21603.5 531 L21299.75 637.1103267446551 L21299.8 637.1 " fill="none"></path>
-					</g>
-					<path d="M21202.5 396.5 L21200.9 401.6 L21199.3 406.7 L21188.2 397.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M26170.3 113.8 L25149.5 233 L25149.5 382 L25149.5 382 L25149.5 531 L25149.5 531 L25149.5 747.5 L25149.5 747.5 L25149.5 964 L25149.5 964 L25149.5 1584 L25149.5 1584.0 " fill="none"></path>
-					</g>
-					<path d="M26170.9 119.1 L26170.3 113.8 L26169.6 108.5 L26183.5 112.2 Z"></path>
-					<path d="M26289.7 450.1 L25573.5 531 L25573.5 747.5 L25573.5 747.5 L25573.5 964 L25573.5 964 L25573.5 1653 L25573.5 1653 L25573.5 2342 L25573.5 2342 L13835 2525.660255872483 L13835.0 2525.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26299.6 454.3 L26289.7 450.1 L26298.4 443.7 L26308.3 448.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M26294.6 118.4 L26892.25 233 L26892.25 253 L26892.3 253.0 " fill="none"></path>
-					</g>
-					<path d="M26295.6 113.2 L26294.6 118.4 L26293.6 123.6 L26281.5 115.9 Z"></path>
-					<path d="M26295.0 462.4 L25785.5 531 L25785.5 663.5 L25785.5 663.5 " fill="none"></path>
-					<path d="M26295.7 467.7 L26295.0 462.4 L26294.3 457.1 L26308.3 460.6 Z"></path>
-					<path d="M26295.2 509.3 L26193.5 531 L26193.5 678.5 L26193.5 678.5 " fill="none"></path>
-					<path d="M26296.3 514.5 L26295.2 509.3 L26294.1 504.1 L26308.3 506.5 Z"></path>
-					<path d="M26684.8 518.3 L26665.5 531 L26665.5 678.5 L26665.5 678.5 " fill="none"></path>
-					<path d="M26687.7 522.8 L26684.8 518.3 L26681.9 513.9 L26695.9 511.0 Z"></path>
-					<path d="M27151.0 517.2 L27177.5 531 L27177.5 671 L27177.5 671.0 " fill="none"></path>
-					<path d="M27153.5 512.4 L27151.0 517.2 L27148.6 521.9 L27139.2 511.0 Z"></path>
-					<path d="M27625.5 910.2 L27625.5 964 L27625.5 1637.5 L27625.5 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M27630.8 900.8 L27625.5 910.2 L27620.2 900.8 L27625.5 891.5 Z"></path>
-					</g>
-					<path d="M27489.3 503.3 L27625.5 531 L27625.5 603.5 L27625.5 603.5 " fill="none"></path>
-					<path d="M27490.4 498.1 L27489.3 503.3 L27488.3 508.6 L27476.3 500.7 Z"></path>
-					<path d="M28009.5 850.2 L28009.5 964 L28009.5 1637.5 L28009.5 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28014.8 840.8 L28009.5 850.2 L28004.2 840.8 L28009.5 831.5 Z"></path>
-					</g>
-					<path d="M27489.5 461.6 L28009.5 531 L28009.5 663.5 L28009.5 663.5 " fill="none"></path>
-					<path d="M27490.2 456.4 L27489.5 461.6 L27488.8 466.9 L27476.3 459.9 Z"></path>
-					<path d="M8919.8 812.7 L8919.75 964 L8934.779027576198 984 L8934.8 984.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8925.1 803.3 L8919.8 812.7 L8914.4 803.3 L8919.8 794.0 Z"></path>
-					</g>
-					<path d="M9190.4 403.2 L8919.75 531 L8919.75 701 L8919.8 701.0 " fill="none"></path>
-					<path d="M9192.7 408.0 L9190.4 403.2 L9188.1 398.4 L9202.4 397.5 Z"></path>
-					<path d="M9311.8 835.2 L9311.75 964 L9315.400217706821 984 L9315.4 984.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9317.1 825.8 L9311.8 835.2 L9306.4 825.8 L9311.8 816.5 Z"></path>
-					</g>
-					<path d="M9249.3 409.4 L9311.75 531 L9311.75 678.5 L9311.8 678.5 " fill="none"></path>
-					<path d="M9254.0 406.9 L9249.3 409.4 L9244.6 411.8 L9243.2 397.5 Z"></path>
-					<path d="M13852.4 2450.0 L13865 2445 L13872.5 2445 L13872.5 2445 L13880 2528.5 L13880 2528.5 L13872.5 2612 L13872.5 2612 L13865 2612 L13865 2612 L13835 2600.1560283687945 L13835.0 2600.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13841.7 2448.5 L13852.4 2450.0 L13845.6 2458.4 L13835.0 2456.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M5990.2 1679.8 L6402 2342 L13472 2523.832034751431 L13472.0 2523.8 " fill="none"></path>
-					</g>
-					<path d="M5994.7 1677.0 L5990.2 1679.8 L5985.7 1682.6 L5983.1 1668.5 Z"></path>
-					<path d="M9703.8 812.7 L9703.75 964 L9696.021407837445 984 L9696.0 984.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9709.1 803.3 L9703.8 812.7 L9698.4 803.3 L9703.8 794.0 Z"></path>
-					</g>
-					<path d="M9296.7 401.5 L9703.75 531 L9703.75 701 L9703.8 701.0 " fill="none"></path>
-					<path d="M9298.3 396.5 L9296.7 401.5 L9295.1 406.6 L9284.0 397.5 Z"></path>
-					<path d="M19899.8 797.2 L19899.75 964 L9944 1619.6440297259194 L9944.0 1619.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19905.1 787.8 L19899.8 797.2 L19894.4 787.8 L19899.8 778.5 Z"></path>
-					</g>
-					<path d="M10095.8 812.7 L10095.75 964 L9944 1122.8389669578428 L9944.0 1122.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10101.1 803.3 L10095.8 812.7 L10090.4 803.3 L10095.8 794.0 Z"></path>
-					</g>
-					<path d="M9324.4 397.4 L10095.75 531 L10095.75 701 L10095.8 701.0 " fill="none"></path>
-					<path d="M9325.3 392.2 L9324.4 397.4 L9323.5 402.7 L9311.3 395.2 Z"></path>
-					<path d="M10971.8 812.7 L10971.75 964 L9944 1425.5413068274402 L9944.0 1425.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10977.1 803.3 L10971.8 812.7 L10966.4 803.3 L10971.8 794.0 Z"></path>
-					</g>
-					<path d="M9324.5 389.7 L10971.75 531 L10971.75 701 L10971.8 701.0 " fill="none"></path>
-					<path d="M9325.0 384.3 L9324.5 389.7 L9324.1 395.0 L9311.3 388.5 Z"></path>
-					<path d="M8917.6 2156.6 L8726.25 2342 L13472 2521.630092850982 L13472.0 2521.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8928.0 2154.0 L8917.6 2156.6 L8920.6 2146.3 L8931.0 2143.7 Z"></path>
-					</g>
-					<path d="M8918.0 2186.3 L8766.25 2342 L13125.5 2526.1137122799073 L13125.5 2526.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8928.3 2183.3 L8918.0 2186.3 L8920.7 2175.9 L8931.0 2172.9 Z"></path>
-					</g>
-					<path d="M9961.4 1858.4 L11194.75 2342 L11194.75 2528.5 L11194.75 2528.5 L11194.75 2715 L11194.75 2715 L14290.75 2749.9468998410175 L14290.8 2749.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9954.6 1850.0 L9961.4 1858.4 L9950.7 1860.0 L9944.0 1851.6 Z"></path>
-					</g>
-					<path d="M9961.5 1846.5 L11303.75 2342 L11303.75 2513 L11303.8 2513.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9954.6 1838.2 L9961.5 1846.5 L9950.9 1848.2 L9944.0 1840.0 Z"></path>
-					</g>
-					<path d="M9961.6 1842.4 L11343.75 2342 L14630 2525.567390490453 L14630.0 2525.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9954.6 1834.2 L9961.6 1842.4 L9951.0 1844.3 L9944.0 1836.1 Z"></path>
-					</g>
-					<path d="M3519.0 769.3 L3880 964 L8931 1590.2058479532163 L8931.0 1590.2 " fill="none"></path>
-					<path d="M3521.5 764.6 L3519.0 769.3 L3516.4 774.0 L3507.2 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1902.4 772.8 L2079 964 L8931 1605.574777468234 L8931.0 1605.6 " fill="none"></path>
-					</g>
-					<path d="M1906.3 769.2 L1902.4 772.8 L1898.4 776.4 L1893.3 763.0 Z"></path>
-					<path d="M20371.8 804.7 L20371.75 964 L9944 1621.0839106477354 L9944.0 1621.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20377.1 795.3 L20371.8 804.7 L20366.4 795.3 L20371.8 786.0 Z"></path>
-					</g>
-					<path d="M28728.2 429.9 L29080.5 531 L29080.5 732 L29080.5 732.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28720.7 422.2 L28728.2 429.9 L28717.8 432.5 L28710.3 424.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M26294.8 109.9 L28561.25 233 L28561.25 298 L28561.3 298.0 " fill="none"></path>
-					</g>
-					<path d="M26295.1 104.6 L26294.8 109.9 L26294.5 115.2 L26281.5 109.2 Z"></path>
-					<path d="M21747.3 454.7 L21747.25 531 L21747.25 596 L21747.3 596.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21752.6 445.3 L21747.3 454.7 L21741.9 445.3 L21747.3 436.0 Z"></path>
-					</g>
-					<path d="M14513.6 108.4 L21747.25 233 L21747.25 328 L21747.3 328.0 " fill="none"></path>
-					<path d="M14513.7 103.1 L14513.6 108.4 L14513.5 113.7 L14500.3 108.2 Z"></path>
-					<path d="M22010.0 908.8 L22100 964 L22100 1653 L22100 1653 L22100 2342 L22100 2342 L13238.5 2527.3184290199597 L13238.5 2527.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22004.8 899.3 L22010.0 908.8 L21999.3 908.4 L21994.1 899.0 Z"></path>
-					</g>
-					<path d="M22011.8 867.4 L22225 964 L22225 1637.5 L22225.0 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22005.5 858.7 L22011.8 867.4 L22001.0 868.4 L21994.8 859.7 Z"></path>
-					</g>
-					<path d="M1601.0 135.3 L1601 233 L1601 351 L1601.0 351.0 " fill="none"></path>
-					<path d="M1606.3 135.3 L1601.0 135.3 L1595.7 135.3 L1601.0 122.0 Z"></path>
-					<g data-name="StudyDesignInterventionsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="0.0" y="716.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M0.0 747.5 L296.0 747.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
-						</g>
-						<g transform="translate(0, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="1495.0" y="351.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M1495.0 382.0 L1707.0 382.0" fill="none" data-name="StudyDesignPageWidget"></path>
-						</g>
-						<g transform="translate(1495, 351)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1495, 382)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="336.0" y="716.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M336.0 747.5 L711.0 747.5" fill="none" data-name="InterventionFormView"></path>
-						</g>
-						<g transform="translate(336, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
-								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(336, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="6483.0" y="1419.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M6483.0 1450.0 L7338.0 1450.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M6483.0 1676.0 L7338.0 1676.0" fill="none" data-name="InterventionFormViewModel"></path>
-						</g>
-						<g transform="translate(6483, 1419)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
-								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6483, 1450)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6483, 1676)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="4568.0" y="701.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M4568.0 732.0 L4898.0 732.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M4568.0 763.0 L4898.0 763.0" fill="none" data-name="InterventionPreview"></path>
-						</g>
-						<g transform="translate(4568, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4568, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4568, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="2668.0" y="1637.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(2668, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="9159.3" y="366.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(9159.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="11387.3" y="328.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M11387.3 359.0 L11746.3 359.0" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M11387.3 390.0 L11746.3 390.0" fill="none" data-name="StudyScheduleFormView"></path>
-						</g>
-						<g transform="translate(11387.25, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11387.25, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11387.25, 390)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="11187.8" y="551.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M11187.8 582.0 L11945.8 582.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M11187.8 883.0 L11945.8 883.0" fill="none" data-name="StudyScheduleControls"></path>
-						</g>
-						<g transform="translate(11187.75, 551)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
-								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11187.75, 582)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11187.75, 883)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="14308.3" y="91.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
-						</g>
-						<g transform="translate(14308.25, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="28221.5" y="663.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M28221.5 694.5 L28511.5 694.5" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M28221.5 785.5 L28511.5 785.5" fill="none" data-name="InterventionTaskFormData"></path>
-						</g>
-						<g transform="translate(28221.5, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28221.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28221.5, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="28412.3" y="298.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M28412.3 329.0 L28710.3 329.0" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M28412.3 435.0 L28710.3 435.0" fill="none" data-name="IFormDataWithSchedule"></path>
-						</g>
-						<g transform="translate(28412.25, 298)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28412.25, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28412.25, 435)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="12881.5" y="1464.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M12881.5 1495.0 L13720.5 1495.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M12881.5 1646.0 L13720.5 1646.0" fill="none" data-name="InterventionsFormViewModel"></path>
-						</g>
-						<g transform="translate(12881.5, 1464)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
-								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12881.5, 1495)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12881.5, 1646)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="15307.5" y="2513.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(15307.5, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="17274.8" y="2513.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(17274.75, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="14290.8" y="2735.0" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(14290.75, 2735)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="16712.5" y="2735.0" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
-						</g>
-						<g transform="translate(16712.5, 2735)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="14630.0" y="2513.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(14630, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="13378.0" y="366.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(13378, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="19295.5" y="366.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-						</g>
-						<g transform="translate(19295.5, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="1797.0" y="732.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(1797, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="21043.5" y="366.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-						</g>
-						<g transform="translate(21043.5, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="11626.8" y="1516.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M11626.8 1547.5 L12322.8 1547.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M11626.8 1728.5 L12322.8 1728.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-						</g>
-						<g transform="translate(11626.75, 1516.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11626.75, 1547.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11626.75, 1728.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="13125.5" y="2513.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(13125.5, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="3371.0" y="732.0" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(3371, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="21499.8" y="596.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M21499.8 627.0 L21994.8 627.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M21499.8 853.0 L21994.8 853.0" fill="none" data-name="WithScheduleControls"></path>
-						</g>
-						<g transform="translate(21499.75, 596)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21499.75, 627)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21499.75, 853)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PhaseSequence">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="17466.3" y="2513.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
-						</g>
-						<g transform="translate(17466.25, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
-								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="22003.3" y="283.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M22003.3 314.0 L22385.3 314.0" fill="none" data-name="InterventionFormData"></path>
-							<path d="M22003.3 435.0 L22385.3 435.0" fill="none" data-name="InterventionFormData"></path>
-						</g>
-						<g transform="translate(22003.25, 283)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22003.25, 314)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22003.25, 435)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="26183.5" y="91.0" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(26183.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="22739.0" y="1554.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M22739.0 1585.0 L23035.0 1585.0" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M22739.0 1691.0 L23035.0 1691.0" fill="none" data-name="StudyScheduleFormData"></path>
-						</g>
-						<g transform="translate(22739, 1554)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22739, 1585)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22739, 1691)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="23970.5" y="351.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M23970.5 382.0 L24113.5 382.0" fill="none" data-name="IStudyFormData"></path>
-						</g>
-						<g transform="translate(23970.5, 351)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23970.5, 382)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="4115.0" y="716.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M4115.0 747.5 L4528.0 747.5" fill="none" data-name="InterventionTaskFormView"></path>
-						</g>
-						<g transform="translate(4115, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4115, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="22808.5" y="678.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M22808.5 709.5 L23202.5 709.5" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M22808.5 770.5 L23202.5 770.5" fill="none" data-name="InterventionsFormData"></path>
-						</g>
-						<g transform="translate(22808.5, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22808.5, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22808.5, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignReportsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="751.0" y="709.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M751.0 740.0 L1144.0 740.0" fill="none" data-name="StudyDesignReportsFormView"></path>
-						</g>
-						<g transform="translate(751, 709)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(751, 740)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="22425.3" y="313.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M22425.3 344.0 L22739.3 344.0" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M22425.3 405.0 L22739.3 405.0" fill="none" data-name="ReportItemFormData"></path>
-						</g>
-						<g transform="translate(22425.25, 313)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22425.25, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22425.25, 405)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="22518.3" y="732.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(22518.25, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="4860.5" y="1584.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M4860.5 1615.0 L5569.5 1615.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M4860.5 1676.0 L5569.5 1676.0" fill="none" data-name="DataReferenceEditor"></path>
-						</g>
-						<g transform="translate(4860.5, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4860.5, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4860.5, 1676)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="5345.0" y="2513.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
-						</g>
-						<g transform="translate(5345, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="28639.3" y="0.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M28639.3 31.0 L29087.3 31.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M28639.3 137.0 L29087.3 137.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-						</g>
-						<g transform="translate(28639.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28639.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28639.25, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="28750.3" y="366.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
-						</g>
-						<g transform="translate(28750.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="29220.3" y="366.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(29220.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="29127.3" y="0.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M29127.3 31.0 L29578.3 31.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M29127.3 137.0 L29578.3 137.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-						</g>
-						<g transform="translate(29127.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29127.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29127.25, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="29347.3" y="366.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
-						</g>
-						<g transform="translate(29347.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="4122.3" y="2475.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M4122.3 2506.0 L4505.3 2506.0" fill="none" data-name="ReportSectionType"></path>
-						</g>
-						<g transform="translate(4122.25, 2475)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4122.25, 2506)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="5943.0" y="1637.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(5943, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="5040.8" y="686.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M5040.8 717.0 L5519.8 717.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M5040.8 778.0 L5519.8 778.0" fill="none" data-name="AverageSectionFormView"></path>
-						</g>
-						<g transform="translate(5040.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5040.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5040.75, 778)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="3546.5" y="1366.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M3546.5 1397.5 L4533.5 1397.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M3546.5 1833.5 L4533.5 1833.5" fill="none" data-name="ReportItemFormViewModel"></path>
-						</g>
-						<g transform="translate(3546.5, 1366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
-								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3546.5, 1397.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3546.5, 1833.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="29932.8" y="335.5" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M29932.8 366.5 L30136.8 366.5" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M29932.8 397.5 L30136.8 397.5" fill="none" data-name="DataReferenceIdentifier"></path>
-						</g>
-						<g transform="translate(29932.75, 335.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29932.75, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29932.75, 397.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="29967.3" y="91.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(29967.25, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="5559.8" y="686.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M5559.8 717.0 L6038.8 717.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M5559.8 778.0 L6038.8 778.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-						</g>
-						<g transform="translate(5559.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5559.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5559.75, 778)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="8128.3" y="663.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M8128.3 694.5 L8595.3 694.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M8128.3 770.5 L8595.3 770.5" fill="none" data-name="ReportItemFormView"></path>
-						</g>
-						<g transform="translate(8128.25, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
-								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8128.25, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8128.25, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="7615.0" y="1637.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
-						</g>
-						<g transform="translate(7615, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="17681.8" y="1479.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M17681.8 1510.0 L18541.8 1510.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M17681.8 1676.0 L18541.8 1676.0" fill="none" data-name="ReportsFormViewModel"></path>
-						</g>
-						<g transform="translate(17681.75, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
-								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17681.75, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17681.75, 1676)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportFormItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="15631.8" y="2422.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M15631.8 2453.0 L16474.8 2453.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M15631.8 2529.0 L16474.8 2529.0" fill="none" data-name="ReportFormItemDelegate"></path>
-						</g>
-						<g transform="translate(15631.75, 2422)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
-								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15631.75, 2453)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15631.75, 2529)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="7378.0" y="1584.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M7378.0 1615.0 L7575.0 1615.0" fill="none" data-name="ReportBadge"></path>
-							<path d="M7378.0 1691.0 L7575.0 1691.0" fill="none" data-name="ReportBadge"></path>
-						</g>
-						<g transform="translate(7378, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7378, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7378, 1691)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="6015.0" y="2475.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M6015.0 2506.0 L6316.0 2506.0" fill="none" data-name="ReportStatus"></path>
-						</g>
-						<g transform="translate(6015, 2475)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6015, 2506)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="7794.8" y="2513.0" height="31.0" width="106.0" data-name="BadgeType"></rect>
-						</g>
-						<g transform="translate(7794.75, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="23242.5" y="686.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M23242.5 717.0 L23580.5 717.0" fill="none" data-name="ReportsFormData"></path>
-							<path d="M23242.5 763.0 L23580.5 763.0" fill="none" data-name="ReportsFormData"></path>
-						</g>
-						<g transform="translate(23242.5, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23242.5, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23242.5, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="13760.5" y="1411.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M13760.5 1442.5 L14456.5 1442.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M13760.5 1848.5 L14456.5 1848.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-						</g>
-						<g transform="translate(13760.5, 1411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13760.5, 1442.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13760.5, 1848.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignInfoFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="1184.0" y="716.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M1184.0 747.5 L1407.0 747.5" fill="none" data-name="StudyDesignInfoFormView"></path>
-						</g>
-						<g transform="translate(1184, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1184, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="23620.5" y="663.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M23620.5 694.5 L24034.5 694.5" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M23620.5 785.5 L24034.5 785.5" fill="none" data-name="StudyInfoFormData"></path>
-						</g>
-						<g transform="translate(23620.5, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23620.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23620.5, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyContactInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="23777.0" y="1539.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M23777.0 1570.0 L24125.0 1570.0" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M23777.0 1721.0 L24125.0 1721.0" fill="none" data-name="StudyContactInfoFormData"></path>
-						</g>
-						<g transform="translate(23777, 1539)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
-								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23777, 1570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23777, 1721)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormValidationSet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="5588.0" y="2490.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M5588.0 2521.0 L5975.0 2521.0" fill="none" data-name="StudyFormValidationSet"></path>
-						</g>
-						<g transform="translate(5588, 2490)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
-								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5588, 2521)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="24114.5" y="686.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M24114.5 717.0 L24608.5 717.0" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M24114.5 763.0 L24608.5 763.0" fill="none" data-name="MeasurementsFormData"></path>
-						</g>
-						<g transform="translate(24114.5, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
-								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24114.5, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24114.5, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="10311.8" y="716.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M10311.8 747.5 L10755.8 747.5" fill="none" data-name="MeasurementSurveyFormView"></path>
-						</g>
-						<g transform="translate(10311.75, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10311.75, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="14908.5" y="1441.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M14908.5 1472.5 L15604.5 1472.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M14908.5 1698.5 L15604.5 1698.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-						</g>
-						<g transform="translate(14908.5, 1441.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14908.5, 1472.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14908.5, 1698.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="6078.8" y="701.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M6078.8 732.0 L6422.8 732.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M6078.8 763.0 L6422.8 763.0" fill="none" data-name="SurveyPreview"></path>
-						</g>
-						<g transform="translate(6078.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6078.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6078.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="4573.5" y="1637.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(4573.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="28551.5" y="648.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M28551.5 679.5 L28960.5 679.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M28551.5 800.5 L28960.5 800.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-						</g>
-						<g transform="translate(28551.5, 648.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28551.5, 679.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28551.5, 800.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="24965.5" y="1584.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M24965.5 1615.0 L25333.5 1615.0" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M24965.5 1661.0 L25333.5 1661.0" fill="none" data-name="QuestionnaireFormData"></path>
-						</g>
-						<g transform="translate(24965.5, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24965.5, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24965.5, 1661)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="20667.8" y="618.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M20667.8 649.5 L21299.8 649.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M20667.8 755.5 L21299.8 755.5" fill="none" data-name="WithQuestionnaireControls"></path>
-						</g>
-						<g transform="translate(20667.75, 618.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20667.75, 649.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20667.75, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignMeasurementsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="1447.0" y="716.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M1447.0 747.5 L1757.0 747.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
-						</g>
-						<g transform="translate(1447, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1447, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="15735.8" y="1471.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M15735.8 1502.5 L16827.8 1502.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M15735.8 1653.5 L16827.8 1653.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-						</g>
-						<g transform="translate(15735.75, 1471.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
-								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15735.75, 1502.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15735.75, 1653.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="6814.8" y="686.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M6814.8 717.0 L7202.8 717.0" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M6814.8 778.0 L7202.8 778.0" fill="none" data-name="StudyFormScaffold"></path>
-						</g>
-						<g transform="translate(6814.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6814.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6814.75, 778)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="T Function(WidgetRef)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="6044.0" y="1637.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
-						</g>
-						<g transform="translate(6044, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="6277.0" y="1637.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
-						</g>
-						<g transform="translate(6277, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="7911.0" y="1524.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M7911.0 1555.0 L8607.0 1555.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M7911.0 1721.0 L8607.0 1721.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-						</g>
-						<g transform="translate(7911, 1524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7911, 1555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7911, 1721)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignEnrollmentFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="3626.0" y="701.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M3626.0 732.5 L4075.0 732.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
-						</g>
-						<g transform="translate(3626, 701.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3626, 732.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScreenerQuestionLogicFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="14496.5" y="1622.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M14496.5 1653.0 L14828.5 1653.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
-						</g>
-						<g transform="translate(14496.5, 1622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14496.5, 1653)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionLogicFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="12402.8" y="1584.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M12402.8 1615.0 L12826.8 1615.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M12402.8 1646.0 L12826.8 1646.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-						</g>
-						<g transform="translate(12402.75, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
-								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12402.75, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12402.75, 1646)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="12333.8" y="2362.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M12333.8 2393.0 L12895.8 2393.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M12333.8 2574.0 L12895.8 2574.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(12333.75, 2362)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
-								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12333.75, 2393)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12333.75, 2574)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="24621.0" y="298.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M24621.0 329.0 L24879.0 329.0" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M24621.0 420.0 L24879.0 420.0" fill="none" data-name="ConsentItemFormData"></path>
-						</g>
-						<g transform="translate(24621, 298)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24621, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24621, 420)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="13651.3" y="716.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M13651.3 747.5 L14032.3 747.5" fill="none" data-name="ConsentItemFormView"></path>
-						</g>
-						<g transform="translate(13651.25, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13651.25, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="24648.5" y="663.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M24648.5 694.5 L25102.5 694.5" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M24648.5 785.5 L25102.5 785.5" fill="none" data-name="EnrollmentFormData"></path>
-						</g>
-						<g transform="translate(24648.5, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
-								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24648.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24648.5, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="24553.5" y="1637.5" height="31.0" width="114.0" data-name="Participation"></rect>
-						</g>
-						<g transform="translate(24553.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="8931.0" y="984.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M8931.0 1015.0 L9944.0 1015.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M8931.0 2036.0 L9944.0 2036.0" fill="none" data-name="QuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(8931, 984)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8931, 1015)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8931, 2036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="18581.8" y="1404.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M18581.8 1435.0 L19483.8 1435.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M18581.8 1661.0 L19483.8 1661.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-						</g>
-						<g transform="translate(18581.75, 1404)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
-								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18581.75, 1435)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18581.75, 1661)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormConsentItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="17652.3" y="2422.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M17652.3 2453.0 L18452.3 2453.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M17652.3 2529.0 L18452.3 2529.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-						</g>
-						<g transform="translate(17652.25, 2422)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17652.25, 2453)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17652.25, 2529)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="17500.0" y="566.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M17500.0 597.0 L18196.0 597.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M17500.0 808.0 L18196.0 808.0" fill="none" data-name="StudyFormViewModel"></path>
-						</g>
-						<g transform="translate(17500, 566)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17500, 597)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17500, 808)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="16907.8" y="1637.5" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
-						</g>
-						<g transform="translate(16907.75, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="17098.8" y="1637.5" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
-						</g>
-						<g transform="translate(17098.75, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="26308.3" y="253.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M26308.3 284.0 L27476.3 284.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M26308.3 420.0 L27476.3 420.0" fill="none" data-name="QuestionFormData"></path>
-						</g>
-						<g transform="translate(26308.25, 253)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26308.25, 284)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26308.25, 420)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="13472.0" y="2445.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M13472.0 2476.0 L13835.0 2476.0" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(13472, 2445)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13472, 2476)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="25613.5" y="663.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M25613.5 694.5 L25957.5 694.5" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M25613.5 755.5 L25957.5 755.5" fill="none" data-name="ChoiceQuestionFormData"></path>
-						</g>
-						<g transform="translate(25613.5, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25613.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25613.5, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="25997.5" y="678.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M25997.5 709.5 L26389.5 709.5" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M25997.5 755.5 L26389.5 755.5" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(25997.5, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25997.5, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25997.5, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="26429.5" y="678.5" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M26429.5 709.5 L26901.5 709.5" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M26429.5 755.5 L26901.5 755.5" fill="none" data-name="ImageQuestionFormData"></path>
-						</g>
-						<g transform="translate(26429.5, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26429.5, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26429.5, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="26941.5" y="671.0" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M26941.5 702.0 L27413.5 702.0" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M26941.5 763.0 L27413.5 763.0" fill="none" data-name="AudioQuestionFormData"></path>
-						</g>
-						<g transform="translate(26941.5, 671)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26941.5, 702)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26941.5, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="27453.5" y="603.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M27453.5 634.5 L27797.5 634.5" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M27453.5 830.5 L27797.5 830.5" fill="none" data-name="ScaleQuestionFormData"></path>
-						</g>
-						<g transform="translate(27453.5, 603.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27453.5, 634.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27453.5, 830.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="27596.5" y="1637.5" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(27596.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="27837.5" y="663.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M27837.5 694.5 L28181.5 694.5" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M27837.5 770.5 L28181.5 770.5" fill="none" data-name="FreeTextQuestionFormData"></path>
-						</g>
-						<g transform="translate(27837.5, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27837.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27837.5, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="27911.5" y="1637.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
-						</g>
-						<g transform="translate(27911.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="8743.8" y="701.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M8743.8 732.0 L9095.8 732.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M8743.8 763.0 L9095.8 763.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(8743.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8743.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8743.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="9135.8" y="678.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M9135.8 709.5 L9487.8 709.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M9135.8 755.5 L9487.8 755.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-						</g>
-						<g transform="translate(9135.75, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9135.75, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9135.75, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="9527.8" y="701.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M9527.8 732.0 L9879.8 732.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M9527.8 763.0 L9879.8 763.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-						</g>
-						<g transform="translate(9527.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9527.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9527.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="29618.3" y="75.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M29618.3 106.5 L29927.3 106.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(29618.25, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29618.25, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="19723.8" y="716.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M19723.8 747.5 L20075.8 747.5" fill="none" data-name="ScaleQuestionFormView"></path>
-						</g>
-						<g transform="translate(19723.75, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19723.75, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="9919.8" y="701.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M9919.8 732.0 L10271.8 732.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M9919.8 763.0 L10271.8 763.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-						</g>
-						<g transform="translate(9919.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9919.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9919.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="10795.8" y="701.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M10795.8 732.0 L11147.8 732.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M10795.8 763.0 L11147.8 763.0" fill="none" data-name="BoolQuestionFormView"></path>
-						</g>
-						<g transform="translate(10795.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10795.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10795.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="11234.8" y="2513.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(11234.75, 2513)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="20195.8" y="709.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M20195.8 740.0 L20547.8 740.0" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(20195.75, 709)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20195.75, 740)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="29000.5" y="732.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
-						</g>
-						<g transform="translate(29000.5, 732)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="21531.3" y="328.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M21531.3 359.0 L21963.3 359.0" fill="none" data-name="ScheduleControls"></path>
-							<path d="M21531.3 390.0 L21963.3 390.0" fill="none" data-name="ScheduleControls"></path>
-						</g>
-						<g transform="translate(21531.25, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21531.25, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21531.25, 390)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="22140.0" y="1637.5" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
-						</g>
-						<g transform="translate(22140, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="1522.5" y="91.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
-						</g>
-						<g transform="translate(1522.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file

From b241d3788fa8ab9ea4f4500d95ee7ff4602444f3 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 13 May 2024 14:37:12 +0200
Subject: [PATCH 046/314] chore: remove outdated cli

---
 .gitignore                                    |   2 -
 CONTRIBUTING.md                               |   3 -
 docker/.gitignore                             |   3 -
 docker/README.md                              | 118 ------
 docker/load-test/k6.js                        |  27 --
 docker/manual_config_instructions.md          | 252 -------------
 docker/nginx/proxy/01_common.conf.template    |   8 -
 .../proxy/02_common_location.conf.template    |   6 -
 docker/nginx/proxy/03_supabase.conf.template  | 121 ------
 docker/nginx/proxy/04_studyu.conf.template    |  40 --
 docker/nginx/proxy/ssl.conf.example.template  |   9 -
 docker/nginx/studyu/component.conf.template   |  28 --
 docker/proxy/.env.example                     |  10 -
 docker/proxy/docker-compose-proxy.yml         |  21 --
 docker/studyu/Dockerfile                      |  41 --
 docker/studyu/docker-compose-app.yml          |  23 --
 docker/studyu/docker-compose-designer.yml     |  23 --
 docker/studyu/init_studyu.sh                  |   7 -
 docker/supabase/.env.example                  | 104 ------
 docker/supabase/.gitignore                    |   5 -
 docker/supabase/README.md                     |   6 -
 docker/supabase/config.toml                   | 108 ------
 docker/supabase/docker-compose-db.yml         |  50 ---
 docker/supabase/docker-compose.yml            | 268 --------------
 docker/supabase/scripts/.gitignore            |   2 -
 docker/supabase/scripts/dump_data.sh          |  38 --
 docker/supabase/scripts/dump_schema.sh        |  56 ---
 docker/supabase/scripts/execute_sql.sh        |  46 ---
 .../tests/000-supabase_test_helpers.sql       | 267 -------------
 .../tests/001_generic_test_helpers.sql        |  45 ---
 docker/supabase/tests/010-study.sql           | 350 ------------------
 docker/supabase/volumes/api/kong.yml          | 223 -----------
 docker/supabase/volumes/db/init/data.sql      |   0
 docker/supabase/volumes/db/jwt.sql            |   5 -
 docker/supabase/volumes/db/logs.sql           |   4 -
 docker/supabase/volumes/db/realtime.sql       |   4 -
 docker/supabase/volumes/db/roles.sql          |   8 -
 docker/supabase/volumes/db/webhooks.sql       | 208 -----------
 .../supabase/volumes/functions/hello/index.ts |  16 -
 .../supabase/volumes/functions/main/index.ts  |  94 -----
 docker/supabase/volumes/logs/vector.yml       | 232 ------------
 41 files changed, 2881 deletions(-)
 delete mode 100644 docker/.gitignore
 delete mode 100644 docker/README.md
 delete mode 100644 docker/load-test/k6.js
 delete mode 100644 docker/manual_config_instructions.md
 delete mode 100644 docker/nginx/proxy/01_common.conf.template
 delete mode 100644 docker/nginx/proxy/02_common_location.conf.template
 delete mode 100644 docker/nginx/proxy/03_supabase.conf.template
 delete mode 100644 docker/nginx/proxy/04_studyu.conf.template
 delete mode 100644 docker/nginx/proxy/ssl.conf.example.template
 delete mode 100644 docker/nginx/studyu/component.conf.template
 delete mode 100644 docker/proxy/.env.example
 delete mode 100644 docker/proxy/docker-compose-proxy.yml
 delete mode 100644 docker/studyu/Dockerfile
 delete mode 100644 docker/studyu/docker-compose-app.yml
 delete mode 100644 docker/studyu/docker-compose-designer.yml
 delete mode 100644 docker/studyu/init_studyu.sh
 delete mode 100644 docker/supabase/.env.example
 delete mode 100644 docker/supabase/.gitignore
 delete mode 100644 docker/supabase/README.md
 delete mode 100644 docker/supabase/config.toml
 delete mode 100644 docker/supabase/docker-compose-db.yml
 delete mode 100644 docker/supabase/docker-compose.yml
 delete mode 100644 docker/supabase/scripts/.gitignore
 delete mode 100755 docker/supabase/scripts/dump_data.sh
 delete mode 100755 docker/supabase/scripts/dump_schema.sh
 delete mode 100755 docker/supabase/scripts/execute_sql.sh
 delete mode 100644 docker/supabase/tests/000-supabase_test_helpers.sql
 delete mode 100644 docker/supabase/tests/001_generic_test_helpers.sql
 delete mode 100644 docker/supabase/tests/010-study.sql
 delete mode 100644 docker/supabase/volumes/api/kong.yml
 delete mode 100644 docker/supabase/volumes/db/init/data.sql
 delete mode 100644 docker/supabase/volumes/db/jwt.sql
 delete mode 100644 docker/supabase/volumes/db/logs.sql
 delete mode 100644 docker/supabase/volumes/db/realtime.sql
 delete mode 100644 docker/supabase/volumes/db/roles.sql
 delete mode 100644 docker/supabase/volumes/db/webhooks.sql
 delete mode 100644 docker/supabase/volumes/functions/hello/index.ts
 delete mode 100644 docker/supabase/volumes/functions/main/index.ts
 delete mode 100644 docker/supabase/volumes/logs/vector.yml

diff --git a/.gitignore b/.gitignore
index 31b83767e..be6206318 100644
--- a/.gitignore
+++ b/.gitignore
@@ -144,8 +144,6 @@ app.*.symbols
 pubspec_overrides.yaml
 
 # Selfhost
-backup/
-.cli_config
 flutter_common/lib/envs/.env.local
 
 # generated git project files
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fe7f35f17..b14ab8853 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,9 +21,6 @@ executing Melos scripts. Use `melos <script>` to run scripts from the
 [`melos.yaml` file](melos.yaml). You can find more information about Melos in
 the [Melos documentation](https://melos.invertase.dev/)
 
-When developing locally, you might need to host your own Supabase instance. For
-this, follow the instructions [here](docker/README.md).
-
 ## Repository Overview
 
 We have different Flutter/Dart packages all contained in this monorepo. The
diff --git a/docker/.gitignore b/docker/.gitignore
deleted file mode 100644
index 668b540b0..000000000
--- a/docker/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-**/.env
-**/test.http
-**/docker-compose.override.yml
diff --git a/docker/README.md b/docker/README.md
deleted file mode 100644
index 08c7cbcd2..000000000
--- a/docker/README.md
+++ /dev/null
@@ -1,118 +0,0 @@
-# Run StudyU with the StudyU CLI
-
-The StudyU modules can be run with Docker allowing StudyU to be very easy to
-operate. This makes it possible to quickly deploy code changes to your own
-instance or to store data in a self-hosted Supabase instance data, rather
-than relying on a public cloud service.
-
-Supabase can be [self-hosted](https://supabase.com/docs/guides/self-hosting/docker)
-by design, since they are open source. We provide a modified version of their
-docker setup, specifically optimized to work with StudyU.
-
-You will need to install Docker to be able to run the StudyU CLI.
-Make sure you have [Docker](https://docker.com) installed and configured by
-running `docker -v`.
-
-For HPI VMs,
-[this script](https://gist.github.com/johannesvedder/0fafcbeabe8e069f96085bfedaebd9d0)
-can be used to install and setup docker.
-
-All the following commands are meant to be run from the root of this repository,
-unless otherwise specified.
-
-## Quickstart with the StudyU CLI
-
-To get started quickly, run the StudyU CLI. It will interactively guide you
-through the setup process. The CLI is a wrapper around the docker-compose
-commands described in the following sections. It is located in the root
-directory of the repository and can be run with `./studyu`.
-
-The CLI offers multiple commands to manage your StudyU instance. Run
-`./studyu --help` to see all available commands.
-
-### Configure
-
-Create a configuration file with `./studyu config` and choose the components you
-want to run. The following components are available:
-
-- `supabase`: A self-hosted Supabase instance
-- `studyu-app`: A self-hosted instance of the StudyU App
-- `studyu-designer`: A self-hosted instance of the StudyU Designer
-
-Have a look into the use cases below for more details on the different
-configurations.
-
-There are two components that are added automatically to the list of default
-components:
-
-- `supabase-db`: The PostgreSQL database for Supabase
-- `proxy`: Nginx reverse proxy to access the frontend of the components
-
-### Start
-
-Start the components with `./studyu start`. On the first run, you will need
-to configure the components. For this just follow the instructions.
-
-After making changes to environment files such as `supabase/.env` or
-`flutter_common/lib/envs/.env.*`, a rebuild of the StudyU components might be
-necessary. You can run `./studyu delete` for this. Be sure to only remove
-the containers and images and not the volumes.
-
-### Add the StudyU CLI to your PATH
-
-The StudyU CLI can be added to your PATH to make it easier to run. This can be
-done by adding the following line to your `.bashrc` or `.zshrc` file:
-
-```shell
-export PATH=$PATH:<path-to-studyu-repo>
-```
-
-Reload your shell with `source ~/.bashrc` or `source ~/.zshrc` and you can
-run the StudyU CLI from anywhere with `studyu`.
-
-## Overview
-
-The StudyU CLI setup is designed to be flexible and easily adoptable for various
-setups. Here we describe the most common use-cases. When running `./studyu config`,
-you can choose which components you want to run, depending on your use-case.
-
-### Use Case #1: Run a self-hosted Supabase instance together with StudyU
-
-Choose this method if you want to run StudyU together with your own Supabase instance.
-This might be useful if you want to run StudyU after you made changes to the
-codebase and the database schema.
-
-Choose the following components:
-
-- `supabase`
-- `studyu-app`
-- `studyu-designer`
-
-### Use Case #2: Run StudyU only
-
-Choose this method if you made changes to the StudyU codebase that are not
-related to the database schema. In this case the self-hosted StudyU instances
-will use the default StudyU Supabase instance.
-
-Choose the following components:
-
-- `studyu-app`
-- `studyu-designer`
-
-## Backup the Database
-
-StudyU stores its data with Supabase as a backend that in turn stores its data
-in a PostgreSQL database. The data for this database is stored in a docker
-volume and is persisted between restarts. All data related to Supabase Storage
-is stored in a different docker volume.
-
-For backup purposes you should not create a backup of the StudyU data volume,
-but rather use specific postgres backup tools such as `pg_dump`.
-
-Run the StudyU CLI with `./studyu backup` to backup the StudyU database.
-
-**Backing up the Supabase Storage data is not yet supported.**
-
-## Update
-
-Run the StudyU CLI with `./studyu update` to update the repository.
diff --git a/docker/load-test/k6.js b/docker/load-test/k6.js
deleted file mode 100644
index c2b1e622f..000000000
--- a/docker/load-test/k6.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Basic load-testing script for Supabase
-// Meant to be run with https://github.com/grafana/k6
-
-import http from "k6/http";
-import { check, sleep } from "k6";
-
-// Test configuration
-export const options = {
-  thresholds: {
-    // Assert that 99% of requests finish within 3000ms.
-    http_req_duration: ["p(99) < 3000"],
-  },
-  // Ramp the number of virtual users up and down
-  stages: [
-    { duration: "30s", target: 15 },
-    { duration: "1m", target: 15 },
-    { duration: "20s", target: 0 },
-  ],
-};
-
-// Simulated user behavior
-export default function () {
-  let res = http.get("http://localhost:8082/rest/v1/study");
-  // Validate response status
-  check(res, { "status was 200": (r) => r.status == 200 });
-  sleep(1);
-}
diff --git a/docker/manual_config_instructions.md b/docker/manual_config_instructions.md
deleted file mode 100644
index 9d5a749d3..000000000
--- a/docker/manual_config_instructions.md
+++ /dev/null
@@ -1,252 +0,0 @@
-# Overview
-
-The following sections describe how to run StudyU manually without the StudyU CLI.
-Be aware that this is more complicated and error-prone than using the CLI. If you
-want to use the CLI, refer to [StudyU CLI](README.md) instead.
-
-Since the StudyU CLI is the recommended way to run StudyU, the following sections
-might be outdated. If you find any errors, please open an issue or a pull request.
-
-All the following commands are meant to be run from the `docker` directory of
-this repository, unless otherwise specified.
-
-## Use Case #1: Dockerize the StudyU platform only
-
-Choose this method if you do not want to setup your own Supabase instance, but
-only launch StudyU applications with docker. This might be useful if you want to
-run StudyU after you made changes to the codebase.
-
-To start both the StudyU App and the StudyU Designer, simply run `docker compose
--f studyu/docker-compose.yml up`.
-
-If you only want to start a single StudyU application run `docker compose -f
-studyu/docker-compose-{module} up`. Make sure to replace `{module}` with one of
-the following:
-
-- `app`: Start the StudyU App
-- `designer`: Start the StudyU Designer
-
-### Further customize the setup
-
-The default ports are 8080 for the [StudyU App](http://localhost:8080) and 8081
-for the [StudyU Designer](http://localhost:8081).
-
-By default the main StudyU database will be used. If you want to use a different
-database, more steps are necessary. You can start a managed Supabase project at
-[supabase.com](https://supabase.com) and link it with your StudyU instance by
-replacing the values for `STUDYU_SUPABASE_URL` and
-`STUDYU_SUPABASE_PUBLIC_ANON_KEY` in the file `flutter_common/lib/envs/.env.local`.
-Alternatively, you can self-host Supabase on your own as explained in
-[Use Case #2](#use-case-2-run-a-self-hosted-supabase-instance-together-with-studyu).
-
-In order to run your StudyU instance under a custom domain or a different port,
-refer to [Change hostname or ports](#change-hostname-or-ports).
-
-## Use Case #2: Run a self-hosted Supabase instance together with StudyU
-
-Supabase can be
-[self-hosted](https://supabase.com/docs/guides/self-hosting/docker) by design,
-since they are open source. We provide a modified version of their docker setup,
-specifically optimized to work with StudyU. Everything for this is located in
-the [supabase directory](supabase).
-
-Supabase consists out of [several
-tools](https://supabase.com/docs/guides/getting-started/architecture) with
-PostgreSQL database as the core. To make it easy to perform changes to the
-Supabase middleware independently to the database, we have decoupled the
-database to `supabase/docker-compose-db.yml`. The database will also hold
-StudyU's data. All the other Supabase components are located in the
-`supabase/docker-compose.yml` file.
-
-### Configure
-
-Before your own Supabase instance can be started, the default Supabase secrets
-need to be changed and assigned to Supabase and StudyU.
-
-1. Create a copy of the example Supabase configuration `cp supabase/.env.example
-   supabase/.env`
-2. Choose a password for the postgres database (`POSTGRES_PASSWORD`) and a
-   `JWT_SECRET` for [Supabase
-   Auth](https://supabase.com/docs/learn/auth-deep-dive/auth-deep-dive-jwts)
-   with at least 32 characters. Then
-   [generate](https://supabase.com/docs/guides/self-hosting/docker#generate-api-keys)
-   the corresponding `ANON_KEY` and the `SERVICE_ROLE_KEY` for the API.
-3. Replace the default secrets with your newly generated ones in the following
-   files:
-    - `supabase/.env`
-    - `flutter_common/lib/envs/.env.local` (needs to be copied from .env.local.example)
-4. Configure the other Supabase settings in `supabase/.env` and StudyU settings
-   in `flutter_common/lib/envs/.env.local` according to your wishes.
-
-Otherwise, if a custom domain or port should be used, refer to [Change hostname
-or ports](#change-hostname-or-ports).
-
-**BE AWARE THAT SUPABASE IS NOT SECURE BY DEFAULT. READ MORE AT [Advanced
-Configuration](#advanced-configuration)**
-
-### Run Supabase and StudyU
-
-Make sure that you thoughtfully completed all the previous steps. Then, start
-the components in the following order:
-
-- `docker compose -f supabase/docker-compose-db.yml up` (Start PostgreSQL)
-- `docker compose -f supabase/docker-compose.yml up` (Start Supabase)
-- `docker compose -f studyu/docker-compose-app.yml up` (Start StudyU App)
-- `docker compose -f studyu/docker-compose-designer.yml up` (Start StudyU Designer)
-
-How to start:
-
-Open your local Supabase Studio instance on
-[http://localhost:8082](http://localhost:8082)
-(username: studyu, password: studyu). The StudyU database scheme is
-automatically applied. The app_config table needs to be filled with basic information
-describing the StudyU instance. Refer to the `app_config` data in the `/database`
-directory.
-
-The default ports are as follows:
-
-- 8080 for [StudyU App](http://localhost:8080)
-- 8081 for [StudyU Designer](http://localhost:8081).
-- 8082 for [Supabase Studio](http://localhost:8082) (**INSECURE** Username:
-  studyu, Password: studyu)
-
-## Use Case #3: Run Supabase and StudyU on different machines
-
-Supabase and StudyU can be deployed on different machines, e.g. for
-load-balancing reasons. A mix of the previous use cases will be applied for
-configuration purposes.
-
-This set up can also be used for local development by following the instructions
-in *Supabase Machine* and running StudyU locally with Flutter.
-
-### Supabase Machine
-
-On the machine where Supabase and PostgreSQL should be run, perform all the
-Supabase related configuration steps described in [Configure](#configure) of Use
-Case #2 (for local development, it is sufficient to copy the `supabase/.env.example`
-to `supabase/.env` and leave everything else as is). However, this will not be
-sufficient to access Supabase. Additionally, to the Supabase backend, a nginx
-reverse proxy, will need to be started. This is further explained in
-[Some words about nginx](#access-the-components-with-nginx).
-
-**BE AWARE THAT SUPABASE IS NOT SECURE BY DEFAULT. READ MORE AT [Advanced
-Configuration](#advanced-configuration)**
-
-Run the following services:
-
-- `docker compose -f supabase/docker-compose-db.yml up` (Start PostgreSQL)
-- `docker compose -f supabase/docker-compose.yml up` (Start Supabase)
-- `docker compose -f nginx/docker-compose-proxy.yml up` (Start the nginx reverse
-  proxy)
-
-Operation:
-
-The default ports are as follows:
-
-- 8082 for [Supabase Studio](http://localhost:8082) (**INSECURE** username:
-  studyu, password: studyu)
-
-### StudyU Machine
-
-On the second machine where StudyU should be run, replace the default Supabase
-values with your custom ones in the file
-`flutter_common/lib/envs/.env.local`. Make sure to set `STUDYU_SUPABASE_URL`
-to the correct URL of the Supabase instace of your first machine.
-
-- `docker compose -f studyu/docker-compose.yml up` (Start StudyU App and StudyU Designer)
-
-Operation:
-
-The default ports are as follows:
-
-- 8080 for [StudyU App](http://localhost:8080)
-- 8081 for [StudyU Designer](http://localhost:8081).
-
-## Advanced Configuration
-
-Some more modifications can be done to customize and secure the setup.
-
-### Secure the Supabase backend
-
-By default, the Supabase backend is not secure if you deploy it, since it can be
-accessed by anyone. Supabase itself offers basic authentication access control.
-However, the defaults credentials need to be changed in the `supabase/.env` file.
-
-Additional security measures can be added by allowing only certain IP ranges to
-access the nginx reverse proxy. Have a look at the
-`nginx/conf.d/03_supabase.conf` file on how to enable this.
-
-### Access the components with Nginx
-
-To run flutter apps like StudyU in a web browser, a web server is necessary. We
-have chosen to use nginx alpine for this task, since it features a very small
-file size and can furthermore act as a reverse proxy. The configuration files
-in the `nginx/conf.d/` directory are shipped together with each docker compose
-file in the `studyu/` directory. The nginx server serves various purposes.
-
-For the StudyU App and Designer (`nginx/conf.d/01_app.conf` and
-`nginx/conf.d/02_designer.conf`), nginx makes sure that all requests to these
-flutter apps are forwarded to the index.html which is the entrypoint for flutter
-on the web.
-
-When running a self-hosted Supabase instance with our setup, all external ports
-are closed by default. Thus, a separate nginx container needs to be started
-additionally, serving as a reverse proxy for advanced configuration and security
-purposes. All external requests to Supabase outside of docker are tunneled
-through the proxy at `nginx/conf.d/03_supabase.conf`. This allows to restrict
-access as explained in [Secure the Supabase
-backend](#secure-the-supabase-backend). Any changes to the hostname or ports in
-any Supabase configuration files must therefore also be applied to the nginx
-configuration.
-
-### Change hostname or ports
-
-In order to change the hostname from localhost to a custom domain for StudyU,
-the configuration file at `supabase/.env` has to be adapted. Changes also need
-to be made to the nginx proxy by modifying the respective `nginx/conf.d/` files
-(`01_app.conf`, `02_designer.conf`, `03_supabase.conf`) and replacing `localhost`
-with the designated hostname.
-
-The default ports can be changed by replacing the old port with the new one in
-the same files as above. Additionally, the `docker-compose-*.yml` files have to
-be modified.
-
-### SSL
-
-Since all requests to StudyU and Supabase are going through the nginx server,
-SSL can be implemented by adding port 443 to the `docker-compose-*.yml` files,
-listening on port 443 in the nginx configuration, and enabling the
-`nginx/conf.d/ssl.conf.example` file. Moreover, the ports inside the
-`nginx/conf.d/` files should be adapted.
-
-As a next step, SSL certificates can be mounted via a docker volume, or obtained
-without cost by using [certbot](https://certbot.eff.org/). There are a variety
-of methods on how to make certbot work with nginx available on the web.
-
-## Good to know
-
-- Use `-d` to run containers in the background.
-- After making changes to nginx configuration scripts, it is necessary to reload
-  nginx. For this, get the name of the docker container with `docker ps`, and
-  then `sh` into the container with `docker exec -it <container name> sh` and
-  run `/usr/sbin/nginx -s reload` inside the container.
-- After making changes to `docker-compose*.yml` files in the `studyu/`
-  directory, a rebuild of studyu is necessary. Run `docker compose up --build`.
-- In order to stop docker containers from running press CTRL+C or run `docker
-  compose -p 'studyu' down --remove-orphans` and `docker compose -p 'supabase'
-  down --remove-orphans`.
-- When experimenting with Docker setups, it might be necessary
-  to [remove previous resources](https://docs.docker.com/engine/reference/commandline/system_prune/)
-  in order to make changes visible.
-- Moreover, it often helps to clear the cache of your web browser when making
-  changes to environment files.
-
-## Automatic install and update script
-
-Currently not usable.
-
-~~The following steps describe the manual installation process. However, in
-order to install and update StudyU and a self-hosted Supabase instance
-automatically, [this gist
-script](https://gist.github.com/johannesvedder/29a384f82e761527fc7acce1d06f78b9)
-can also be used.~~
diff --git a/docker/nginx/proxy/01_common.conf.template b/docker/nginx/proxy/01_common.conf.template
deleted file mode 100644
index 94474e211..000000000
--- a/docker/nginx/proxy/01_common.conf.template
+++ /dev/null
@@ -1,8 +0,0 @@
-add_header Strict-Transport-Security    "max-age=31536000; includeSubDomains" always;
-add_header X-Frame-Options              SAMEORIGIN;
-add_header X-Content-Type-Options       nosniff;
-add_header X-XSS-Protection             "1; mode=block";
-
-# ssl_certificate /etc/letsencrypt/live/example.com/fullchain.pem;
-# ssl_certificate_key /etc/letsencrypt/live/example.com/privkey.pem;
-# include /etc/nginx/conf.d/ssl.conf;
diff --git a/docker/nginx/proxy/02_common_location.conf.template b/docker/nginx/proxy/02_common_location.conf.template
deleted file mode 100644
index 89e088a0b..000000000
--- a/docker/nginx/proxy/02_common_location.conf.template
+++ /dev/null
@@ -1,6 +0,0 @@
-proxy_set_header    X-Real-IP           $remote_addr;
-proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
-proxy_set_header    X-Forwarded-Proto   $scheme;
-proxy_set_header    Host                $host;
-proxy_set_header    X-Forwarded-Host    $host;
-proxy_set_header    X-Forwarded-Port    $server_port;
diff --git a/docker/nginx/proxy/03_supabase.conf.template b/docker/nginx/proxy/03_supabase.conf.template
deleted file mode 100644
index 65f2bcde3..000000000
--- a/docker/nginx/proxy/03_supabase.conf.template
+++ /dev/null
@@ -1,121 +0,0 @@
-# Force SSL
-# server {
-#     listen 80;
-#     server_name app.example.com;
-#     return 301 https://$server_name$request_uri;
-# }
-
-map $http_upgrade $connection_upgrade {
-    default upgrade;
-    ''      close;
-}
-
-tcp_nopush on;
-tcp_nodelay on;
-types_hash_max_size 2048;
-server_tokens off;
-gzip on;
-gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
-gzip_vary on;
-gzip_proxied any;
-gzip_comp_level 6;
-gzip_buffers 16 8k;
-gzip_http_version 1.1;
-
-client_max_body_size 100m;
-
-# internal Docker DNS, cache for 30s
-resolver 127.0.0.11 valid=30s;
-
-server {
-    listen 8082;
-    # listen 443 ssl;
-    server_name ${STUDYU_SUPABASE_HOST}; # db.example.com
-
-    # access_log /var/log/nginx/db.access.log main;
-    error_log /var/log/nginx/db.error.log;
-
-    include /etc/nginx/conf.d/01_common.conf;
-
-    set $studio http://studio:3000;
-    set $kong http://kong:8000;
-
-    # REST API
-    location ~ ^/rest/v1/(.*)$ {
-        proxy_pass $kong;
-        include     /etc/nginx/conf.d/02_common_location.conf;
-    }
-
-    # GraphQL
-    location ~ ^/graphql/v1/(.*)$ {
-        proxy_pass $kong;
-        include     /etc/nginx/conf.d/02_common_location.conf;
-    }
-
-    # Realtime
-    location ~ ^/realtime/v1/(.*)$ {
-        proxy_pass $kong;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        include     /etc/nginx/conf.d/02_common_location.conf;
-    }
-
-    # Authentication
-    location ~ ^/auth/v1/(.*)$ {
-        proxy_pass $kong;
-        include     /etc/nginx/conf.d/02_common_location.conf;
-    }
-
-    # Storage
-    location ~ ^/storage/v1/(.*)$ {
-        proxy_pass $kong;
-        include     /etc/nginx/conf.d/02_common_location.conf;
-    }
-
-    # Studio
-    location / {
-        proxy_pass $kong;
-        include     /etc/nginx/conf.d/02_common_location.conf;
-
-        # Enable both IP and basic auth conditions have to be satisfied
-        # satisfy all;
-
-        # Enable IP range that should be allowed or blocked
-        # deny  192.168.1.2;
-        # allow 192.168.1.1/24;
-        # allow 127.0.0.1;
-        # deny  all;
-
-        # Basic authentication for supabase studio backend
-        # No need for this anymore since it is internally supported by Supabase from now on
-        # auth_basic "Restricted Access";
-        # auth_basic_user_file /etc/nginx/.htpasswd;
-    }
-    
-    # Edge Functions (example)
-    # location /my-edge-function {
-      # proxy_pass http://localhost:9000;
-      # proxy_set_header Host $host;
-      # proxy_set_header X-Real-IP $remote_addr;
-      # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    # }
-}
-
-# Analytics
-# server {
-#     listen 4000;
-#     server_name localhost;
-
-    # access_log /var/log/nginx/analytics.access.log main;
-#     error_log /var/log/nginx/analytics.error.log;
-
-#     include /etc/nginx/conf.d/01_common.conf;
-
-#     set $analytics http://analytics:4000;
-
-#     location / {
-#         proxy_pass $analytics;
-#         include    /etc/nginx/conf.d/02_common_location.conf;
-#     }
-# }
diff --git a/docker/nginx/proxy/04_studyu.conf.template b/docker/nginx/proxy/04_studyu.conf.template
deleted file mode 100644
index 54beb4976..000000000
--- a/docker/nginx/proxy/04_studyu.conf.template
+++ /dev/null
@@ -1,40 +0,0 @@
-# Force SSL
-# server {
-#     listen 80;
-#     server_name app.example.com;
-#     return 301 https://$server_name$request_uri;
-# }
-
-server {
-    listen       8080;
-    # listen       443 ssl;
-    server_name  ${STUDYU_APP_HOST};
-
-    # access_log /var/log/nginx/app.access.log main;
-    error_log /var/log/nginx/app.error.log;
-
-    include /etc/nginx/conf.d/01_common.conf;
-
-    location / {
-      set $upstream http://studyu-app:80;
-      proxy_pass $upstream;
-      include    /etc/nginx/conf.d/02_common_location.conf;
-    }
-}
-
-server {
-    listen       8081;
-    # listen       443 ssl;
-    server_name  ${STUDYU_DESIGNER_HOST};
-
-    # access_log /var/log/nginx/designer.access.log main;
-    error_log /var/log/nginx/designer.error.log;
-
-    include /etc/nginx/conf.d/01_common.conf;
-
-    location / {
-      set $upstream http://studyu-designer:80;
-      proxy_pass $upstream;
-      include    /etc/nginx/conf.d/02_common_location.conf;
-    }
-}
\ No newline at end of file
diff --git a/docker/nginx/proxy/ssl.conf.example.template b/docker/nginx/proxy/ssl.conf.example.template
deleted file mode 100644
index f0cae310b..000000000
--- a/docker/nginx/proxy/ssl.conf.example.template
+++ /dev/null
@@ -1,9 +0,0 @@
-ssl_certificate /etc/letsencrypt/live/$DOMAIN/fullchain.pem;
-ssl_certificate_key /etc/letsencrypt/live/$DOMAIN/privkey.pem;
-include /etc/letsencrypt/options-ssl-nginx.conf;
-ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-
-location ~ /.well-known/acme-challenge {
-    allow all;
-    root /var/www/html;
-}
diff --git a/docker/nginx/studyu/component.conf.template b/docker/nginx/studyu/component.conf.template
deleted file mode 100644
index 2722c8987..000000000
--- a/docker/nginx/studyu/component.conf.template
+++ /dev/null
@@ -1,28 +0,0 @@
-server {
-    listen       80;
-    server_name  localhost;
-
-    # access_log /var/log/nginx/studyu-${STUDYU_COMPONENT}.access.log main;
-    error_log /var/log/nginx/studyu-${STUDYU_COMPONENT}.error.log;
-
-    location / { 
-      if ($request_method = 'OPTIONS') {
-        add_header 'Access-Control-Allow-Origin' '*';
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-        add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
-        add_header 'Access-Control-Max-Age' 1728000;
-        add_header 'Content-Type' 'text/plain; charset=utf-8';
-        add_header 'Content-Length' 0;
-        return 204;
-      }
-    
-      add_header 'Access-Control-Allow-Origin' '*' always;
-      add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
-      add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always;
-      add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
-
-      root   /usr/share/nginx/html/${STUDYU_COMPONENT};
-      index  index.html index.htm;
-      try_files $uri $uri/ /index.html;
-    }
-}
diff --git a/docker/proxy/.env.example b/docker/proxy/.env.example
deleted file mode 100644
index 5b46ff24b..000000000
--- a/docker/proxy/.env.example
+++ /dev/null
@@ -1,10 +0,0 @@
-# Modify for remote deployment
-
-STUDYU_APP_HOST=localhost
-STUDYU_APP_PORT=8080
-
-STUDYU_DESIGNER_HOST=localhost
-STUDYU_DESIGNER_PORT=8081
-
-STUDYU_SUPABASE_HOST=localhost
-STUDYU_SUPABASE_PORT=8082
diff --git a/docker/proxy/docker-compose-proxy.yml b/docker/proxy/docker-compose-proxy.yml
deleted file mode 100644
index d7c109672..000000000
--- a/docker/proxy/docker-compose-proxy.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-version: '3.8'
-name: 'studyu_proxy'
-
-networks:
-  default:
-    name: studyu_network
-    external: true
-
-services:
-  nginx:
-    container_name: studyu-proxy
-    image: nginx:stable-alpine
-    restart: unless-stopped
-    ports:
-      - "${STUDYU_APP_PORT}:8080"
-      - "${STUDYU_DESIGNER_PORT}:8081"
-      - "${STUDYU_SUPABASE_PORT}:8082"
-    volumes:
-      - ../nginx/proxy:/etc/nginx/templates:ro
-    env_file:
-      - .env
diff --git a/docker/studyu/Dockerfile b/docker/studyu/Dockerfile
deleted file mode 100644
index f7b868cac..000000000
--- a/docker/studyu/Dockerfile
+++ /dev/null
@@ -1,41 +0,0 @@
-FROM ghcr.io/cirruslabs/flutter:stable as builder
-
-ARG FLUTTER_APP_FOLDER
-
-ENV PATH ${PATH}:/root/.pub-cache/bin/
-
-# Create workdir
-WORKDIR /src/
-
-# Install melos
-RUN dart pub global activate melos
-
-# Copy repository files
-COPY ./ ./
-
-# Clean repository without failing
-RUN melos clean
-
-# Setup workspace
-RUN dart pub get
-RUN melos bootstrap
-
-# Build app
-RUN melos run build:web:$FLUTTER_APP_FOLDER
-
-# Configure webserver
-FROM nginx:stable-alpine
-
-ARG FLUTTER_APP_FOLDER
-
-# Copy web builds from the builder image to the webserver
-COPY --from=builder /src/$FLUTTER_APP_FOLDER/build/web /usr/share/nginx/html/$FLUTTER_APP_FOLDER
-
-# Copy init script from the builder image to the entrypoint
-COPY --from=builder /src/docker/studyu/init_studyu.sh /docker-entrypoint.d/init_studyu.sh
-RUN chmod +x /docker-entrypoint.d/init_studyu.sh
-
-# Set environment variables
-ENV FLUTTER_APP_FOLDER=$FLUTTER_APP_FOLDER
-
-
diff --git a/docker/studyu/docker-compose-app.yml b/docker/studyu/docker-compose-app.yml
deleted file mode 100644
index 9d6a4ac44..000000000
--- a/docker/studyu/docker-compose-app.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-version: '3.8'
-name: 'studyu_app'
-
-networks:
-  default:
-    name: studyu_network
-    external: true
-
-services:
-  web:
-    container_name: studyu-app
-    restart: unless-stopped
-    build:
-      context: ../../
-      dockerfile: ./docker/studyu/Dockerfile
-      args:
-        FLUTTER_APP_FOLDER: app
-    environment:
-      - STUDYU_COMPONENT=app
-    volumes:
-      - ../nginx/studyu:/etc/nginx/templates:ro
-    env_file:
-      - ../../flutter_common/lib/envs/.env.local
diff --git a/docker/studyu/docker-compose-designer.yml b/docker/studyu/docker-compose-designer.yml
deleted file mode 100644
index ef71aa4c7..000000000
--- a/docker/studyu/docker-compose-designer.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-version: '3.8'
-name: 'studyu_designer'
-
-networks:
-  default:
-    name: studyu_network
-    external: true
-
-services:
-  web:
-    container_name: studyu-designer
-    restart: unless-stopped
-    build:
-      context: ../../
-      dockerfile: ./docker/studyu/Dockerfile
-      args:
-        FLUTTER_APP_FOLDER: designer_v2
-    environment:
-      - STUDYU_COMPONENT=designer_v2
-    volumes:
-      - ../nginx/studyu:/etc/nginx/templates:ro
-    env_file:
-      - ../../flutter_common/lib/envs/.env.local
diff --git a/docker/studyu/init_studyu.sh b/docker/studyu/init_studyu.sh
deleted file mode 100644
index f55b80a4b..000000000
--- a/docker/studyu/init_studyu.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Loads all env vars starting with "STUDYU" into the .env file
-printenv | grep "^STUDYU_" > /usr/share/nginx/html/"${FLUTTER_APP_FOLDER}"/assets/packages/studyu_flutter_common/envs/.env
-
-# Start Nginx
-# nginx -g 'daemon off;'
diff --git a/docker/supabase/.env.example b/docker/supabase/.env.example
deleted file mode 100644
index 639478c94..000000000
--- a/docker/supabase/.env.example
+++ /dev/null
@@ -1,104 +0,0 @@
-############
-# Secrets
-# YOU MUST CHANGE THESE BEFORE GOING INTO PRODUCTION
-############
-
-POSTGRES_PASSWORD=your-super-secret-and-long-postgres-password
-JWT_SECRET=your-super-secret-jwt-token-with-at-least-32-characters-long
-ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJhbm9uIiwKICAgICJpc3MiOiAic3VwYWJhc2UtZGVtbyIsCiAgICAiaWF0IjogMTY0MTc2OTIwMCwKICAgICJleHAiOiAxNzk5NTM1NjAwCn0.dc_X5iR_VP_qT0zsiyj_I_OZ2T9FtRU2BBNWN8Bu4GE
-SERVICE_ROLE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJzZXJ2aWNlX3JvbGUiLAogICAgImlzcyI6ICJzdXBhYmFzZS1kZW1vIiwKICAgICJpYXQiOiAxNjQxNzY5MjAwLAogICAgImV4cCI6IDE3OTk1MzU2MDAKfQ.DaYlNEoUrrEn2Ig7tqibS-PHK5vgusbcbo7X36XVt4Q
-DASHBOARD_USERNAME=studyu
-DASHBOARD_PASSWORD=studyu
-
-############
-# Database - You can change these to any PostgreSQL database that has logical replication enabled.
-############
-
-POSTGRES_HOST=supabase-db
-POSTGRES_DB=postgres
-POSTGRES_PORT=5432
-# default user is postgres
-
-############
-# API Proxy - Configuration for the Kong Reverse proxy.
-############
-
-KONG_HTTP_PORT=8000
-KONG_HTTPS_PORT=8443
-
-
-############
-# API - Configuration for PostgREST.
-############
-
-PGRST_DB_SCHEMAS=public,storage,graphql_public
-
-
-############
-# Auth - Configuration for the GoTrue authentication server.
-############
-
-## General
-SITE_URL=http://localhost:3000
-ADDITIONAL_REDIRECT_URLS=
-JWT_EXPIRY=604800
-DISABLE_SIGNUP=false
-API_EXTERNAL_URL=http://localhost:8000
-
-## Mailer Config
-MAILER_URLPATHS_CONFIRMATION="/auth/v1/verify"
-MAILER_URLPATHS_INVITE="/auth/v1/verify"
-MAILER_URLPATHS_RECOVERY="/auth/v1/verify"
-MAILER_URLPATHS_EMAIL_CHANGE="/auth/v1/verify"
-
-## Email auth
-ENABLE_EMAIL_SIGNUP=true
-ENABLE_EMAIL_AUTOCONFIRM=true
-SMTP_ADMIN_EMAIL=admin@example.com
-SMTP_HOST=supabase-mail
-SMTP_PORT=2500
-SMTP_USER=fake_mail_user
-SMTP_PASS=fake_mail_password
-SMTP_SENDER_NAME=fake_sender
-
-## Phone auth
-ENABLE_PHONE_SIGNUP=false
-ENABLE_PHONE_AUTOCONFIRM=true
-
-
-############
-# Studio - Configuration for the Dashboard
-############
-
-STUDIO_DEFAULT_ORGANIZATION=StudyU
-STUDIO_DEFAULT_PROJECT=production
-
-STUDIO_PORT=3000
-# replace if you intend to use Studio outside of localhost
-SUPABASE_PUBLIC_URL=http://localhost:8000
-
-# Enable webp support
-IMGPROXY_ENABLE_WEBP_DETECTION=true
-
-############
-# Functions - Configuration for Functions
-############
-# NOTE: VERIFY_JWT applies to all functions. Per-function VERIFY_JWT is not supported yet.
-FUNCTIONS_VERIFY_JWT=false
-
-############
-# Logs - Configuration for Logflare
-# Please refer to https://supabase.com/docs/reference/self-hosting-analytics/introduction
-############
-
-LOGFLARE_LOGGER_BACKEND_API_KEY=your-super-secret-and-long-logflare-key
-
-# Change vector.toml sinks to reflect this change
-LOGFLARE_API_KEY=your-super-secret-and-long-logflare-key
-
-# Docker socket location - this value will differ depending on your OS
-DOCKER_SOCKET_LOCATION=/var/run/docker.sock
-
-# Google Cloud Project details
-GOOGLE_PROJECT_ID=GOOGLE_PROJECT_ID
-GOOGLE_PROJECT_NUMBER=GOOGLE_PROJECT_NUMBER
diff --git a/docker/supabase/.gitignore b/docker/supabase/.gitignore
deleted file mode 100644
index da11732f6..000000000
--- a/docker/supabase/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# Supabase
-.branches
-.temp
-dump.sql
-seed.sql
diff --git a/docker/supabase/README.md b/docker/supabase/README.md
deleted file mode 100644
index a7aa25858..000000000
--- a/docker/supabase/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Supabase Docker
-
-This is a Docker Compose setup for self-hosting Supabase modified for StudyU.
-Follow the README of the parent directory to get started or have a look into
-the Supabase tutorial
-[here](https://supabase.com/docs/guides/hosting/docker) for advanced usage.
diff --git a/docker/supabase/config.toml b/docker/supabase/config.toml
deleted file mode 100644
index 8bf28cf61..000000000
--- a/docker/supabase/config.toml
+++ /dev/null
@@ -1,108 +0,0 @@
-# A string used to distinguish different Supabase projects on the same host. Defaults to the
-# working directory name when running `supabase init`.
-project_id = "studyu_supabase_test"
-
-[api]
-# Port to use for the API URL.
-port = 54321
-# Schemas to expose in your API. Tables, views and stored procedures in this schema will get API
-# endpoints. public and storage are always included.
-schemas = ["public", "storage", "graphql_public"]
-# Extra schemas to add to the search_path of every request. public is always included.
-extra_search_path = ["public", "extensions"]
-# The maximum number of rows returns from a view, table, or stored procedure. Limits payload size
-# for accidental or malicious requests.
-max_rows = 1000
-
-[db]
-# Port to use for the local database URL.
-port = 54322
-# Port used by db diff command to initialise the shadow database.
-shadow_port = 54320
-# The database major version to use. This has to be the same as your remote database's. Run `SHOW
-# server_version;` on the remote database to check.
-major_version = 15
-
-[studio]
-enabled = true
-# Port to use for Supabase Studio.
-port = 54323
-# External URL of the API server that frontend connects to.
-api_url = "http://localhost"
-
-# Email testing server. Emails sent with the local dev setup are not actually sent - rather, they
-# are monitored, and you can view the emails that would have been sent from the web interface.
-[inbucket]
-enabled = true
-# Port to use for the email testing server web interface.
-port = 54324
-# Uncomment to expose additional ports for testing user applications that send emails.
-# smtp_port = 54325
-# pop3_port = 54326
-
-[storage]
-# The maximum file size allowed (e.g. "5MB", "500KB").
-file_size_limit = "50MiB"
-
-[auth]
-# The base URL of your website. Used as an allow-list for redirects and for constructing URLs used
-# in emails.
-site_url = "http://localhost:3000"
-# A list of *exact* URLs that auth providers are permitted to redirect to post authentication.
-additional_redirect_urls = ["https://localhost:3000"]
-# How long tokens are valid for, in seconds. Defaults to 3600 (1 hour), maximum 604,800 (1 week).
-jwt_expiry = 3600
-# If disabled, the refresh token will never expire.
-enable_refresh_token_rotation = true
-# Allows refresh tokens to be reused after expiry, up to the specified interval in seconds.
-# Requires enable_refresh_token_rotation = true.
-refresh_token_reuse_interval = 10
-# Allow/disallow new user signups to your project.
-enable_signup = true
-
-[auth.email]
-# Allow/disallow new user signups via email to your project.
-enable_signup = true
-# If enabled, a user will be required to confirm any email change on both the old, and new email
-# addresses. If disabled, only the new email is required to confirm.
-double_confirm_changes = true
-# If enabled, users need to confirm their email address before signing in.
-enable_confirmations = false
-
-[auth.sms]
-# Allow/disallow new user signups via SMS to your project.
-enable_signup = true
-# If enabled, users need to confirm their phone number before signing in.
-enable_confirmations = false
-
-# Configure one of the supported SMS providers: `twilio`, `messagebird`, `textlocal`, `vonage`.
-[auth.sms.twilio]
-enabled = false
-account_sid = ""
-message_service_sid = ""
-# DO NOT commit your Twilio auth token to git. Use environment variable substitution instead:
-auth_token = "env(SUPABASE_AUTH_SMS_TWILIO_AUTH_TOKEN)"
-
-# Use an external OAuth provider. The full list of providers are: `apple`, `azure`, `bitbucket`,
-# `discord`, `facebook`, `github`, `gitlab`, `google`, `keycloak`, `linkedin`, `notion`, `twitch`,
-# `twitter`, `slack`, `spotify`, `workos`, `zoom`.
-[auth.external.apple]
-enabled = false
-client_id = ""
-# DO NOT commit your OAuth provider secret to git. Use environment variable substitution instead:
-secret = "env(SUPABASE_AUTH_EXTERNAL_APPLE_SECRET)"
-# Overrides the default auth redirectUrl.
-redirect_uri = ""
-# Overrides the default auth provider URL. Used to support self-hosted gitlab, single-tenant Azure,
-# or any other third-party OIDC providers.
-url = ""
-
-[analytics]
-enabled = false
-port = 54327
-vector_port = 54328
-# Setup BigQuery project to enable log viewer on local development stack.
-# See: https://supabase.com/docs/guides/getting-started/local-development#enabling-local-logging
-gcp_project_id = ""
-gcp_project_number = ""
-gcp_jwt_path = "supabase/gcloud.json"
diff --git a/docker/supabase/docker-compose-db.yml b/docker/supabase/docker-compose-db.yml
deleted file mode 100644
index 32bceff07..000000000
--- a/docker/supabase/docker-compose-db.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-version: '3.8'
-name: 'studyu_database'
-
-networks:
-  default:
-    name: studyu_network
-    external: true
-
-services:
-  db:
-    container_name: supabase-db
-    image: supabase/postgres:15.1.0.117
-    healthcheck:
-      test: pg_isready -U postgres -h localhost
-      interval: 5s
-      timeout: 5s
-      retries: 10
-    command:
-      - postgres
-      - -c
-      - config_file=/etc/postgresql/postgresql.conf
-      - -c
-      - log_min_messages=fatal # prevents Realtime polling queries from appearing in logs
-    restart: unless-stopped
-    # ports:
-      # Pass down internal port because it's set dynamically by other services
-      # - 127.0.0.1:${POSTGRES_PORT}:${POSTGRES_PORT}
-    environment:
-      POSTGRES_HOST: /var/run/postgresql
-      PGPORT: ${POSTGRES_PORT}
-      POSTGRES_PORT: ${POSTGRES_PORT}
-      PGPASSWORD: ${POSTGRES_PASSWORD}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      PGDATABASE: ${POSTGRES_DB}
-      POSTGRES_DB: ${POSTGRES_DB}
-    volumes:
-      - ./volumes/db/realtime.sql:/docker-entrypoint-initdb.d/migrations/99-realtime.sql:Z
-      # Must be superuser to create event trigger
-      - ./volumes/db/webhooks.sql:/docker-entrypoint-initdb.d/init-scripts/98-webhooks.sql:Z
-      # Must be superuser to alter reserved role
-      - ./volumes/db/roles.sql:/docker-entrypoint-initdb.d/init-scripts/99-roles.sql:Z
-      # PGDATA directory is persisted between restarts
-      - data:/var/lib/postgresql/data
-      # Changes required for Analytics support
-      - ./volumes/db/logs.sql:/docker-entrypoint-initdb.d/migrations/99-logs.sql:Z
-      # Init sql data
-      - ../../database/studyu-schema.sql:/docker-entrypoint-initdb.d/init-scripts/99-data.sql:Z
-
-volumes:
-  data:
diff --git a/docker/supabase/docker-compose.yml b/docker/supabase/docker-compose.yml
deleted file mode 100644
index 92578051d..000000000
--- a/docker/supabase/docker-compose.yml
+++ /dev/null
@@ -1,268 +0,0 @@
-# Usage
-#   Start:          docker compose up
-#   With helpers:   docker compose -f docker-compose.yml -f ./dev/docker-compose.dev.yml up
-#   Stop:           docker compose down
-#   Destroy:        docker compose -f docker-compose.yml -f ./dev/docker-compose.dev.yml down -v --remove-orphans
-
-version: '3.8'
-name: 'studyu_supabase'
-
-volumes:
-  blob:
-
-networks:
-  default:
-    name: studyu_network
-    external: true
-
-services:
-
-  studio:
-    container_name: supabase-studio
-    image: supabase/studio:20231023-7e2cd92
-    restart: unless-stopped
-    healthcheck:
-      test:
-        [
-          "CMD",
-          "node",
-          "-e",
-          "require('http').get('http://localhost:3000/api/profile', (r) => {if (r.statusCode !== 200) throw new Error(r.statusCode)})"
-        ]
-      timeout: 5s
-      interval: 5s
-      retries: 3
-    environment:
-      STUDIO_PG_META_URL: http://meta:8080
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-
-      DEFAULT_ORGANIZATION_NAME: ${STUDIO_DEFAULT_ORGANIZATION}
-      DEFAULT_PROJECT_NAME: ${STUDIO_DEFAULT_PROJECT}
-
-      SUPABASE_URL: http://kong:8000
-      SUPABASE_PUBLIC_URL: ${SUPABASE_PUBLIC_URL}
-      SUPABASE_ANON_KEY: ${ANON_KEY}
-      SUPABASE_SERVICE_KEY: ${SERVICE_ROLE_KEY}
-
-      LOGFLARE_API_KEY: ${LOGFLARE_API_KEY}
-      LOGFLARE_URL: http://analytics:4000
-      NEXT_PUBLIC_ENABLE_LOGS: true
-      # Comment to use Big Query backend for analytics
-      NEXT_ANALYTICS_BACKEND_PROVIDER: postgres
-      # Uncomment to use Big Query backend for analytics
-      # NEXT_ANALYTICS_BACKEND_PROVIDER: bigquery
-
-  kong:
-    container_name: supabase-kong
-    image: kong:2.8.1
-    restart: unless-stopped
-    # https://unix.stackexchange.com/a/294837
-    entrypoint: bash -c 'eval "echo \"$$(cat ~/temp.yml)\"" > ~/kong.yml && /docker-entrypoint.sh kong docker-start'
-    # ports:
-    #  - ${KONG_HTTP_PORT}:8000/tcp
-    #  - ${KONG_HTTPS_PORT}:8443/tcp
-    environment:
-      KONG_DATABASE: "off"
-      KONG_DECLARATIVE_CONFIG: /home/kong/kong.yml
-      # https://github.com/supabase/cli/issues/14
-      KONG_DNS_ORDER: LAST,A,CNAME
-      KONG_PLUGINS: request-transformer,cors,key-auth,acl,basic-auth
-      KONG_NGINX_PROXY_PROXY_BUFFER_SIZE: 160k
-      KONG_NGINX_PROXY_PROXY_BUFFERS: 64 160k
-      SUPABASE_ANON_KEY: ${ANON_KEY}
-      SUPABASE_SERVICE_KEY: ${SERVICE_ROLE_KEY}
-      DASHBOARD_USERNAME: ${DASHBOARD_USERNAME}
-      DASHBOARD_PASSWORD: ${DASHBOARD_PASSWORD}
-    volumes:
-      # https://github.com/supabase/supabase/issues/12661
-      - ./volumes/api/kong.yml:/home/kong/temp.yml:ro
-
-  auth:
-    container_name: supabase-auth
-    image: supabase/gotrue:v2.99.0
-    healthcheck:
-      test:
-        [
-          "CMD",
-          "wget",
-          "--no-verbose",
-          "--tries=1",
-          "--spider",
-          "http://localhost:9999/health"
-        ]
-      timeout: 5s
-      interval: 5s
-      retries: 3
-    restart: unless-stopped
-    environment:
-      GOTRUE_API_HOST: 0.0.0.0
-      GOTRUE_API_PORT: 9999
-      API_EXTERNAL_URL: ${API_EXTERNAL_URL}
-
-      GOTRUE_DB_DRIVER: postgres
-      GOTRUE_DB_DATABASE_URL: postgres://supabase_auth_admin:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
-
-      GOTRUE_SITE_URL: ${SITE_URL}
-      GOTRUE_URI_ALLOW_LIST: ${ADDITIONAL_REDIRECT_URLS}
-      GOTRUE_DISABLE_SIGNUP: ${DISABLE_SIGNUP}
-
-      GOTRUE_JWT_ADMIN_ROLES: service_role
-      GOTRUE_JWT_AUD: authenticated
-      GOTRUE_JWT_DEFAULT_GROUP_NAME: authenticated
-      GOTRUE_JWT_EXP: ${JWT_EXPIRY}
-      GOTRUE_JWT_SECRET: ${JWT_SECRET}
-
-      GOTRUE_EXTERNAL_EMAIL_ENABLED: ${ENABLE_EMAIL_SIGNUP}
-      GOTRUE_MAILER_AUTOCONFIRM: ${ENABLE_EMAIL_AUTOCONFIRM}
-      # GOTRUE_MAILER_SECURE_EMAIL_CHANGE_ENABLED: true
-      # GOTRUE_SMTP_MAX_FREQUENCY: 1s
-      GOTRUE_SMTP_ADMIN_EMAIL: ${SMTP_ADMIN_EMAIL}
-      GOTRUE_SMTP_HOST: ${SMTP_HOST}
-      GOTRUE_SMTP_PORT: ${SMTP_PORT}
-      GOTRUE_SMTP_USER: ${SMTP_USER}
-      GOTRUE_SMTP_PASS: ${SMTP_PASS}
-      GOTRUE_SMTP_SENDER_NAME: ${SMTP_SENDER_NAME}
-      GOTRUE_MAILER_URLPATHS_INVITE: ${MAILER_URLPATHS_INVITE}
-      GOTRUE_MAILER_URLPATHS_CONFIRMATION: ${MAILER_URLPATHS_CONFIRMATION}
-      GOTRUE_MAILER_URLPATHS_RECOVERY: ${MAILER_URLPATHS_RECOVERY}
-      GOTRUE_MAILER_URLPATHS_EMAIL_CHANGE: ${MAILER_URLPATHS_EMAIL_CHANGE}
-
-      GOTRUE_EXTERNAL_PHONE_ENABLED: ${ENABLE_PHONE_SIGNUP}
-      GOTRUE_SMS_AUTOCONFIRM: ${ENABLE_PHONE_AUTOCONFIRM}
-
-  rest:
-    container_name: supabase-rest
-    image: postgrest/postgrest:v11.2.0
-    restart: unless-stopped
-    environment:
-      PGRST_DB_URI: postgres://authenticator:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
-      PGRST_DB_SCHEMAS: ${PGRST_DB_SCHEMAS}
-      PGRST_DB_ANON_ROLE: anon
-      PGRST_JWT_SECRET: ${JWT_SECRET}
-      PGRST_DB_USE_LEGACY_GUCS: "false"
-      PGRST_APP_SETTINGS_JWT_SECRET: ${JWT_SECRET}
-      PGRST_APP_SETTINGS_JWT_EXP: ${JWT_EXPIRY}
-    command: "postgrest"
-
-  realtime:
-    container_name: realtime-dev.supabase-realtime
-    image: supabase/realtime:v2.25.27
-    healthcheck:
-      test:
-        [
-          "CMD",
-          "bash",
-          "-c",
-          "printf \\0 > /dev/tcp/localhost/4000"
-        ]
-      timeout: 5s
-      interval: 5s
-      retries: 3
-    restart: unless-stopped
-    environment:
-      PORT: 4000
-      DB_HOST: ${POSTGRES_HOST}
-      DB_PORT: ${POSTGRES_PORT}
-      DB_USER: supabase_admin
-      DB_PASSWORD: ${POSTGRES_PASSWORD}
-      DB_NAME: ${POSTGRES_DB}
-      DB_AFTER_CONNECT_QUERY: 'SET search_path TO _realtime'
-      DB_ENC_KEY: supabaserealtime
-      API_JWT_SECRET: ${JWT_SECRET}
-      FLY_ALLOC_ID: fly123
-      FLY_APP_NAME: realtime
-      SECRET_KEY_BASE: UpNVntn3cDxHJpq99YMc1T1AQgQpc8kfYTuRgBiYa15BLrx8etQoXz3gZv1/u2oq
-      ERL_AFLAGS: -proto_dist inet_tcp
-      ENABLE_TAILSCALE: "false"
-      DNS_NODES: "''"
-    command: >
-      sh -c "/app/bin/migrate && /app/bin/realtime eval 'Realtime.Release.seeds(Realtime.Repo)' && /app/bin/server"
-
-  storage:
-    container_name: supabase-storage
-    image: supabase/storage-api:v0.40.4
-    depends_on:
-      rest:
-        condition: service_started
-      imgproxy:
-        condition: service_started
-    healthcheck:
-      test:
-        [
-          "CMD",
-          "wget",
-          "--no-verbose",
-          "--tries=1",
-          "--spider",
-          "http://localhost:5000/status"
-        ]
-      timeout: 5s
-      interval: 5s
-      retries: 3
-    restart: unless-stopped
-    environment:
-      ANON_KEY: ${ANON_KEY}
-      SERVICE_KEY: ${SERVICE_ROLE_KEY}
-      POSTGREST_URL: http://rest:3000
-      PGRST_JWT_SECRET: ${JWT_SECRET}
-      DATABASE_URL: postgres://supabase_storage_admin:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
-      FILE_SIZE_LIMIT: 52428800
-      STORAGE_BACKEND: file
-      FILE_STORAGE_BACKEND_PATH: /var/lib/storage
-      TENANT_ID: stub
-      # TODO: https://github.com/supabase/storage-api/issues/55
-      REGION: stub
-      GLOBAL_S3_BUCKET: stub
-      ENABLE_IMAGE_TRANSFORMATION: "true"
-      IMGPROXY_URL: http://imgproxy:5001
-    volumes:
-      - blob:/var/lib/storage
-
-  imgproxy:
-    container_name: supabase-imgproxy
-    image: darthsim/imgproxy:v3.8.0
-    healthcheck:
-      test: [ "CMD", "imgproxy", "health" ]
-      timeout: 5s
-      interval: 5s
-      retries: 3
-    environment:
-      IMGPROXY_BIND: ":5001"
-      IMGPROXY_LOCAL_FILESYSTEM_ROOT: /
-      IMGPROXY_USE_ETAG: "true"
-      IMGPROXY_ENABLE_WEBP_DETECTION: ${IMGPROXY_ENABLE_WEBP_DETECTION}
-    volumes:
-      - blob:/var/lib/storage
-
-  meta:
-    container_name: supabase-meta
-    image: supabase/postgres-meta:v0.68.0
-    restart: unless-stopped
-    environment:
-      PG_META_PORT: 8080
-      PG_META_DB_HOST: ${POSTGRES_HOST}
-      PG_META_DB_PORT: ${POSTGRES_PORT}
-      PG_META_DB_NAME: ${POSTGRES_DB}
-      PG_META_DB_USER: supabase_admin
-      PG_META_DB_PASSWORD: ${POSTGRES_PASSWORD}
-
-  functions:
-    container_name: supabase-edge-functions
-    image: supabase/edge-runtime:v1.22.3
-    restart: unless-stopped
-    environment:
-      JWT_SECRET: ${JWT_SECRET}
-      SUPABASE_URL: http://kong:8000
-      SUPABASE_ANON_KEY: ${ANON_KEY}
-      SUPABASE_SERVICE_ROLE_KEY: ${SERVICE_ROLE_KEY}
-      SUPABASE_DB_URL: postgresql://postgres:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
-      # TODO: Allow configuring VERIFY_JWT per function. This PR might help: https://github.com/supabase/cli/pull/786
-      VERIFY_JWT: "${FUNCTIONS_VERIFY_JWT}"
-    volumes:
-      - ./volumes/functions:/home/deno/functions:Z
-    command:
-      - start
-      - --main-service
-      - /home/deno/functions/main
-
-  # TODO: For analytics check guidelines at: https://supabase.com/docs/reference/self-hosting-analytics/introduction#production-recommendations
diff --git a/docker/supabase/scripts/.gitignore b/docker/supabase/scripts/.gitignore
deleted file mode 100644
index 5a87a4a35..000000000
--- a/docker/supabase/scripts/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.sql
-*.txt
\ No newline at end of file
diff --git a/docker/supabase/scripts/dump_data.sh b/docker/supabase/scripts/dump_data.sh
deleted file mode 100755
index 889fbb063..000000000
--- a/docker/supabase/scripts/dump_data.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-dump_file="studyu_data_dump.sql"
-default_username="postgres"
-env_file="../.env"
-
-# Check if the .env file exists
-if [ -f "$env_file" ]; then
-  # Source the .env file to set environment variables
-  set -a
-  # shellcheck disable=SC1090
-  . "$env_file"
-  set +a
-else
-  echo "Error: .env file not found."
-  exit 1
-fi
-
-db_username="${POSTGRES_USERNAME:-$default_username}"
-# todo include option to connect to external db via host and password specified in this file
-# todo same for dump_schema.sh
-
-
-# Check if the Docker container is running
-if ! docker ps -a --format '{{.Names}}' | grep -q "^$POSTGRES_HOST$"; then
-  echo "Docker container '$POSTGRES_HOST' is not running."
-  exit 1
-fi
-
-# Dump database to file
-# Specify certain schema to dump with pg_dump by using -n <schema_name> e.g. -n "public"
-pg_dump postgres://"$db_username":"$POSTGRES_PASSWORD"@"$POSTGRES_HOST":"$POSTGRES_PORT"/"$POSTGRES_DB" --column-inserts --data-only > "$dump_file"
-
-echo "SET session_replication_role = replica;" | cat - "$dump_file" > temp_file && mv temp_file "$dump_file"
-echo "SET session_replication_role = DEFAULT;" >> "$dump_file"
-
-# If necessary, migration code can be manually inserted into the dump at the beginning of the file
-# after the SET options
diff --git a/docker/supabase/scripts/dump_schema.sh b/docker/supabase/scripts/dump_schema.sh
deleted file mode 100755
index 2e2a04762..000000000
--- a/docker/supabase/scripts/dump_schema.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env bash
-
-# Ensure that postgres db docker container is accessible from host and ports are forwarded
-# before running this script.
-
-# Issues that have to be manually corrected after running this script:
-# - extension is not included
-# - create schema public should not be included
-# - TRIGGER on_auth_user_created is not included
-# - Policies are sorted alphabetically, which does not make sense
-
-dump_file="studyu_schema_dump.sql"
-dump_schema_name="public"
-default_username="postgres"
-env_file="../.env"
-
-# Check if the .env file exists
-if [ -f "$env_file" ]; then
-  # Source the .env file to set environment variables
-  set -a
-  # shellcheck disable=SC1090
-  . "$env_file"
-  set +a
-else
-  echo "Error: .env file not found."
-  exit 1
-fi
-
-db_username="${POSTGRES_USERNAME:-$default_username}"
-
-# Check if the Docker container is running
-if ! docker ps -a --format '{{.Names}}' | grep -q "^$POSTGRES_HOST$"; then
-  echo "Docker container '$POSTGRES_HOST' is not running."
-  exit 1
-fi
-
-# Default case for Linux sed, just use "-i"
-#sedi=(-i)
-#case "$(uname)" in
-#  # For macOS, use two parameters
-#  Darwin*) sedi=(-i "")
-#esac
-
-pg_dump postgres://"$db_username":"$POSTGRES_PASSWORD"@"$POSTGRES_HOST":"$POSTGRES_PORT"/"$POSTGRES_DB" \
-  --schema "$dump_schema_name" \
-  --schema-only \
-  --no-privileges \
-  > "$dump_file"
-
-# We could use sed in the future to correct some of the issues automatically
-
-#sed "${sedi[@]}" -e 's/^DROP SCHEMA IF EXISTS "auth";$/-- DROP SCHEMA IF EXISTS "auth";/' dump.sql
-#sed "${sedi[@]}" -e's/^DROP SCHEMA IF EXISTS "storage";$/-- DROP SCHEMA IF EXISTS "storage";/' dump.sql
-#sed "${sedi[@]}" -e 's/^CREATE SCHEMA "auth";$/-- CREATE SCHEMA "auth";/' dump.sql
-#sed "${sedi[@]}" -e 's/^CREATE SCHEMA "storage";$/-- CREATE SCHEMA "storage";/' dump.sql
-#sed "${sedi[@]}" -e 's/^ALTER DEFAULT PRIVILEGES FOR ROLE "supabase_admin"/-- ALTER DEFAULT PRIVILEGES FOR ROLE "supabase_admin"/' dump.sql
diff --git a/docker/supabase/scripts/execute_sql.sh b/docker/supabase/scripts/execute_sql.sh
deleted file mode 100755
index 7fc2b0629..000000000
--- a/docker/supabase/scripts/execute_sql.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-
-default_username="postgres"
-env_file="../.env"
-
-# Check if the .env file exists
-if [ -f "$env_file" ]; then
-  # Source the .env file to set environment variables
-  set -a
-  # shellcheck disable=SC1090
-  . "$env_file"
-  set +a
-else
-  echo "Error: .env file not found."
-  exit 1
-fi
-
-db_username="${POSTGRES_USERNAME:-$default_username}"
-
-# Check if the Docker container is running
-if ! docker ps -a --format '{{.Names}}' | grep -q "^$POSTGRES_HOST$"; then
-  echo "Docker container '$POSTGRES_HOST' is not running."
-  exit 1
-fi
-
-# Get the container's IP address
-container_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$POSTGRES_HOST")
-
-# Extract the SQL file from the script argument
-if [ "$#" -ne 1 ]; then
-  echo "Usage: $0 /path/to/your/sqlfile.sql"
-  exit 1
-fi
-
-sql_file="$1"
-
-# Copy the SQL file to the container
-docker cp "$sql_file" "$POSTGRES_HOST:/tmp/"
-
-# Connect to the PostgreSQL database and execute the SQL file from within the container
-if docker exec -i "$POSTGRES_HOST" psql -h "$container_ip" -U "$db_username" -d "$POSTGRES_DB" -c "\i /tmp/$(basename "$sql_file")" > execute_supabase_sql_output.txt 2>&1; then
-  echo "SQL script executed successfully."
-else
-  echo "SQL script execution failed."
-  exit 1
-fi
diff --git a/docker/supabase/tests/000-supabase_test_helpers.sql b/docker/supabase/tests/000-supabase_test_helpers.sql
deleted file mode 100644
index 52ab1f1b3..000000000
--- a/docker/supabase/tests/000-supabase_test_helpers.sql
+++ /dev/null
@@ -1,267 +0,0 @@
--------
--- Adapted from: https://github.com/usebasejump/supabase-test-helpers
--- SHA: b381f23182595d98fdbcfe941dfacf6b3afdae59
--------
-
--- Enable pgTAP if it's not already enabled
-create extension if not exists pgtap with schema extensions;
-
--- We want to store all of this in the tests schema to keep it
--- separate from any application data
-CREATE SCHEMA IF NOT EXISTS tests;
-
--- anon and authenticated should have access to tests schema
-GRANT USAGE ON SCHEMA tests TO anon, authenticated;
--- Don't allow public to execute any functions in the tests schema
-ALTER DEFAULT PRIVILEGES IN SCHEMA tests REVOKE EXECUTE ON FUNCTIONS FROM public;
--- Grant execute to anon and authenticated for testing purposes
-ALTER DEFAULT PRIVILEGES IN SCHEMA tests GRANT EXECUTE ON FUNCTIONS TO anon, authenticated;
-
-/**
-    * ### tests.create_supabase_user(identifier text, email text, phone text)
-    *
-    * Creates a new user in the `auth.users` table.
-    * You can recall a user's info by using `tests.get_supabase_user(identifier text)`.
-    *
-    * Parameters:
-    * - `identifier` - A unique identifier for the user. We recommend you keep it memorable like "test_owner" or "test_member"
-    * - `email` - (Optional) The email address of the user
-    * - `phone` - (Optional) The phone number of the user
-    * - `metadata` - (Optional) Additional metadata to be added to the user
-    *
-    * Returns:
-    * - `user_id` - The UUID of the user in the `auth.users` table
-    *
-    * Example:
-    * ```sql
-    *   SELECT tests.create_supabase_user('test_owner');
-    *   SELECT tests.create_supabase_user('test_member', 'member@test.com', '555-555-5555');
-    *   SELECT tests.create_supabase_user('test_member', 'member@test.com', '555-555-5555', '{"key": "value"}'::jsonb);
-    * ```
- */
-CREATE OR REPLACE FUNCTION tests.create_supabase_user(identifier text, email text default null, phone text default null, metadata jsonb default null)
-RETURNS uuid
-    SECURITY DEFINER
-    SET search_path = auth, pg_temp
-AS $$
-DECLARE
-    user_id uuid;
-BEGIN
-
-    -- create the user
-    user_id := extensions.uuid_generate_v4();
-    INSERT INTO auth.users (id, email, phone, raw_user_meta_data)
-    VALUES (user_id, coalesce(email, concat(user_id, '@test.com')), phone, jsonb_build_object('test_identifier', identifier) || coalesce(metadata, '{}'::jsonb))
-    RETURNING id INTO user_id;
-
-    RETURN user_id;
-END;
-$$ LANGUAGE plpgsql;
-
-/**
-    * ### tests.get_supabase_user(identifier text)
-    *
-    * Returns the user info for a user created with `tests.create_supabase_user`.
-    *
-    * Parameters:
-    * - `identifier` - The unique identifier for the user
-    *
-    * Returns:
-    * - `user_id` - The UUID of the user in the `auth.users` table
-    *
-    * Example:
-    * ```sql
-    *   SELECT posts where posts.user_id = tests.get_supabase_user('test_owner') -> 'id';
-    * ```
- */
-CREATE OR REPLACE FUNCTION tests.get_supabase_user(identifier text)
-RETURNS json
-SECURITY DEFINER
-SET search_path = auth, pg_temp
-AS $$
-    DECLARE
-        supabase_user json;
-    BEGIN
-        SELECT json_build_object('id', id, 'email', email, 'phone', phone, 'raw_user_meta_data', raw_user_meta_data) into supabase_user FROM auth.users WHERE raw_user_meta_data ->> 'test_identifier' = identifier limit 1;
-        if supabase_user is null OR supabase_user -> 'id' IS NULL then
-            RAISE EXCEPTION 'User with identifier % not found', identifier;
-        end if;
-        RETURN supabase_user;
-    END;
-$$ LANGUAGE plpgsql;
-
-/**
-    * ### tests.get_supabase_uid(identifier text)
-    *
-    * Returns the user UUID for a user created with `tests.create_supabase_user`.
-    *
-    * Parameters:
-    * - `identifier` - The unique identifier for the user
-    *
-    * Returns:
-    * - `user_id` - The UUID of the user in the `auth.users` table
-    *
-    * Example:
-    * ```sql
-    *   SELECT posts where posts.user_id = tests.get_supabase_uid('test_owner') -> 'id';
-    * ```
- */
-CREATE OR REPLACE FUNCTION tests.get_supabase_uid(identifier text)
-    RETURNS uuid
-    SECURITY DEFINER
-    SET search_path = auth, pg_temp
-AS $$
-DECLARE
-    supabase_user uuid;
-BEGIN
-    SELECT id into supabase_user FROM auth.users WHERE raw_user_meta_data ->> 'test_identifier' = identifier limit 1;
-    if supabase_user is null then
-        RAISE EXCEPTION 'User with identifier % not found', identifier;
-    end if;
-    RETURN supabase_user;
-END;
-$$ LANGUAGE plpgsql;
-
-/**
-    * ### tests.authenticate_as(identifier text)
-    *   Authenticates as a user created with `tests.create_supabase_user`.
-    *
-    * Parameters:
-    * - `identifier` - The unique identifier for the user
-    *
-    * Returns:
-    * - `void`
-    *
-    * Example:
-    * ```sql
-    *   SELECT tests.create_supabase_user('test_owner');
-    *   SELECT tests.authenticate_as('test_owner');
-    * ```
- */
-CREATE OR REPLACE FUNCTION tests.authenticate_as (identifier text)
-    RETURNS void
-    AS $$
-        DECLARE
-                user_data json;
-                original_auth_data text;
-        BEGIN
-            -- store the request.jwt.claims in a variable in case we need it
-            original_auth_data := current_setting('request.jwt.claims', true);
-            user_data := tests.get_supabase_user(identifier);
-
-            if user_data is null OR user_data ->> 'id' IS NULL then
-                RAISE EXCEPTION 'User with identifier % not found', identifier;
-            end if;
-
-
-            perform set_config('role', 'authenticated', true);
-            perform set_config('request.jwt.claims', json_build_object('sub', user_data ->> 'id', 'email', user_data ->> 'email', 'phone', user_data ->> 'phone')::text, true);
-
-        EXCEPTION
-            -- revert back to original auth data
-            WHEN OTHERS THEN
-                set local role authenticated;
-                set local "request.jwt.claims" to original_auth_data;
-                RAISE;
-        END
-    $$ LANGUAGE plpgsql;
-
-/**
-    * ### tests.clear_authentication()
-    *   Clears out the authentication and sets role to anon
-    *
-    * Returns:
-    * - `void`
-    *
-    * Example:
-    * ```sql
-    *   SELECT tests.create_supabase_user('test_owner');
-    *   SELECT tests.authenticate_as('test_owner');
-    *   SELECT tests.clear_authentication();
-    * ```
- */
-CREATE OR REPLACE FUNCTION tests.clear_authentication()
-    RETURNS void AS $$
-BEGIN
-    perform set_config('role', 'anon', true);
-    perform set_config('request.jwt.claims', null, true);
-END
-$$ LANGUAGE plpgsql;
-
-/**
-* ### tests.rls_enabled(testing_schema text)
-* pgTAP function to check if RLS is enabled on all tables in a provided schema
-*
-* Parameters:
-* - schema_name text - The name of the schema to check
-*
-* Example:
-* ```sql
-*   BEGIN;
-*       select plan(1);
-*       select tests.rls_enabled('public');
-*       SELECT * FROM finish();
-*   ROLLBACK;
-* ```
-*/
-CREATE OR REPLACE FUNCTION tests.rls_enabled (testing_schema text)
-RETURNS text AS $$
-    select is(
-        (select
-           	count(pc.relname)::integer
-           from pg_class pc
-           join pg_namespace pn on pn.oid = pc.relnamespace and pn.nspname = rls_enabled.testing_schema
-           join pg_type pt on pt.oid = pc.reltype
-           -- only check for: r = ordinary table
-          where relrowsecurity = FALSE AND relkind = 'r')
-        ,
-        0,
-        'All tables in the' || testing_schema || ' schema should have row level security enabled');
-$$ LANGUAGE sql;
-
-/**
-* ### tests.rls_enabled(testing_schema text, testing_table text)
-* pgTAP function to check if RLS is enabled on a specific table
-*
-* Parameters:
-* - schema_name text - The name of the schema to check
-* - testing_table text - The name of the table to check
-*
-* Example:
-* ```sql
-*    BEGIN;
-*        select plan(1);
-*        select tests.rls_enabled('public', 'accounts');
-*        SELECT * FROM finish();
-*    ROLLBACK;
-* ```
-*/
-CREATE OR REPLACE FUNCTION tests.rls_enabled (testing_schema text, testing_table text)
-RETURNS TEXT AS $$
-    select is(
-        (select
-           	count(*)::integer
-           from pg_class pc
-           join pg_namespace pn on pn.oid = pc.relnamespace and pn.nspname = rls_enabled.testing_schema and pc.relname = rls_enabled.testing_table
-           join pg_type pt on pt.oid = pc.reltype
-           where relrowsecurity = TRUE),
-        1,
-        testing_table || 'table in the ' || testing_schema || ' schema should have row level security enabled'
-    );
-$$ LANGUAGE sql;
-
--- we have to run some tests to get this to pass as the first test file.
--- investigating options to make this better.  Maybe a dedicated test harness
--- but we dont' want these functions to always exist on the database.
-BEGIN;
-
-    select plan(7);
-    select function_returns('tests', 'create_supabase_user', Array['text', 'text', 'text', 'jsonb'], 'uuid');
-    select function_returns('tests', 'get_supabase_uid', Array['text'], 'uuid');
-    select function_returns('tests', 'get_supabase_user', Array['text'], 'json');
-    select function_returns('tests', 'authenticate_as', Array['text'], 'void');
-    select function_returns('tests', 'clear_authentication', Array[null], 'void');
-    select function_returns('tests', 'rls_enabled', Array['text', 'text'], 'text');
-    select function_returns('tests', 'rls_enabled', Array['text'], 'text');
-    select * from finish();
-ROLLBACK;
diff --git a/docker/supabase/tests/001_generic_test_helpers.sql b/docker/supabase/tests/001_generic_test_helpers.sql
deleted file mode 100644
index 48d9e7699..000000000
--- a/docker/supabase/tests/001_generic_test_helpers.sql
+++ /dev/null
@@ -1,45 +0,0 @@
-SELECT plan(0);
-
--- Either one of the results must be true for the test to complete successfully
-CREATE OR REPLACE FUNCTION tests.is_either_true(
-    description text,
-    VARIADIC results boolean[]
-)
-RETURNS TEXT AS $$
-DECLARE
-    result BOOLEAN;
-    output TEXT;
-    result_details TEXT;
-BEGIN
-    result := false;
-
-    -- Check if any of the results is true
-    FOR i IN 1..array_length(results, 1) LOOP
-        IF results[i] = true THEN
-            result := true;
-            EXIT; -- Exit the loop once a true result is found
-        END IF;
-    END LOOP;
-
-    output := ok(result, description);
-
-    -- Build the result details only if there are false results
-    IF NOT result THEN
-        FOR i IN 1..array_length(results, 1) LOOP
-            result_details := result_details || E'\nTest ' || i || ': ' || results[i];
-        END LOOP;
-    END IF;
-
-    RETURN output || CASE result WHEN TRUE THEN '' ELSE E'\n' || diag(result_details) END;
-END;
-$$ LANGUAGE plpgsql;
-
--- Create a polymorphic function that checks if two input elements are not distinct from each other
-CREATE OR REPLACE FUNCTION tests.is_equal(value1 anyelement, value2 anyelement)
-RETURNS BOOLEAN
-AS $$
-BEGIN
-  -- would prefer IS NOT DISTINCT FROM, but that is not supported in plpgsql
-  RETURN NOT value1 IS DISTINCT FROM value2;
-END;
-$$ LANGUAGE plpgsql;
diff --git a/docker/supabase/tests/010-study.sql b/docker/supabase/tests/010-study.sql
deleted file mode 100644
index 2c276bec9..000000000
--- a/docker/supabase/tests/010-study.sql
+++ /dev/null
@@ -1,350 +0,0 @@
--- begin the transaction, allows to rollback any changes made during the test
-BEGIN;
-
---
--- seed
---
-
--- TODO create variables
-select tests.create_supabase_user('test_creator_1', 'test_creator_1@studyu.health');
-select tests.create_supabase_user('test_creator_2', 'test_creator_2@studyu.health');
-select tests.create_supabase_user('test_consumer', 'test_consumer@studyu.health');
-
-INSERT INTO public.app_config (id, app_min_version, app_privacy, app_terms, designer_privacy, designer_terms, imprint, contact, analytics)
-VALUES (
-    'prod',
-    '2.6.0',
-    '{ "de": "example.com", "en": "example.com" }',
-    '{ "de": "example.com", "en": "example.com" }',
-    '{ "de": "example.com", "en": "example.com" }',
-    '{ "de": "example.com", "en": "example.com" }',
-    '{ "de": "example.com", "en": "example.com" }',
-    '{ "email": "email@example.com", "phone": "1235678", "website": "example.com", "organization": "example" }',
-    '{ "dsn": "example", "enabled": false, "samplingRate": 0 }'
-);
-
---
--- Creator 1
--- Description: Studies should be visible to consumer
---
-
-INSERT INTO public.study (
-  contact,
-  title,
-  description,
-  icon_name,
-  published,
-  registry_published,
-  questionnaire,
-  eligibility_criteria,
-  observations,
-  interventions,
-  consent,
-  schedule,
-  report_specification,
-  results,
-  created_at,
-  updated_at,
-  user_id,
-  participation,
-  result_sharing,
-  collaborator_emails
-) VALUES(
-  '{"email":"example@example.com","phone":"0123456789","website":"https://studyu.health","researchers":"StudyU Researcher","organization":"StudyU","institutionalReviewBoard":"This study has not been submitted to the IRB Board. It is for illustration purposes of StudyU only.","institutionalReviewBoardNumber":"N/A"}',
-  'Study: published=true, registry_published=true, participation=open, result_sharing=public',
-  'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
-  'accountHeart',
-  -- published
-  true,
-  -- registry_published
-  true,
-  '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
-  '[]',
-  '2021-04-13 18:19:49.000',
-  '2023-05-11 12:46:06.018',
-  -- user_id
-  (tests.get_supabase_user('test_creator_1') ->> 'id')::uuid,
-  -- participation ('open', 'invite')
-  'open',
-  -- result_sharing ('public', 'organization', 'private')
-  'public',
-  '{}'
-);
-
-INSERT INTO public.study (
-  contact,
-  title,
-  description,
-  icon_name,
-  published,
-  registry_published,
-  questionnaire,
-  eligibility_criteria,
-  observations,
-  interventions,
-  consent,
-  schedule,
-  report_specification,
-  results,
-  created_at,
-  updated_at,
-  user_id,
-  participation,
-  result_sharing,
-  collaborator_emails
-) VALUES(
-  '{"email":"example@example.com","phone":"0123456789","website":"https://studyu.health","researchers":"StudyU Researcher","organization":"StudyU","institutionalReviewBoard":"This study has not been submitted to the IRB Board. It is for illustration purposes of StudyU only.","institutionalReviewBoardNumber":"N/A"}',
-  'Study: published=true, registry_published=false, participation=open, result_sharing=public',
-  'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
-  'accountHeart',
-  -- published
-  true,
-  -- registry_published
-  false,
-  '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
-  '[]',
-  '2021-04-13 18:19:49.000',
-  '2023-05-11 12:46:06.018',
-  -- user_id
-  (tests.get_supabase_user('test_creator_1') ->> 'id')::uuid,
-  -- participation ('open', 'invite')
-  'open',
-  -- result_sharing ('public', 'organization', 'private')
-  'public',
-  '{}'
-);
-
-INSERT INTO public.study (
-  contact,
-  title,
-  description,
-  icon_name,
-  published,
-  registry_published,
-  questionnaire,
-  eligibility_criteria,
-  observations,
-  interventions,
-  consent,
-  schedule,
-  report_specification,
-  results,
-  created_at,
-  updated_at,
-  user_id,
-  participation,
-  result_sharing,
-  collaborator_emails
-) VALUES(
-  '{"email":"example@example.com","phone":"0123456789","website":"https://studyu.health","researchers":"StudyU Researcher","organization":"StudyU","institutionalReviewBoard":"This study has not been submitted to the IRB Board. It is for illustration purposes of StudyU only.","institutionalReviewBoardNumber":"N/A"}',
-  'Study: published=true, registry_published=false, participation=invite, result_sharing=public',
-  'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
-  'accountHeart',
-  -- published
-  true,
-  -- registry_published
-  false,
-  '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
-  '[]',
-  '2021-04-13 18:19:49.000',
-  '2023-05-11 12:46:06.018',
-  -- user_id
-  (tests.get_supabase_user('test_creator_1') ->> 'id')::uuid,
-  -- participation ('open', 'invite')
-  'invite',
-  -- result_sharing ('public', 'organization', 'private')
-  'public',
-  '{}'
-);
-
--- only accessible with invite
-INSERT INTO public.study (
-  contact,
-  title,
-  description,
-  icon_name,
-  published,
-  registry_published,
-  questionnaire,
-  eligibility_criteria,
-  observations,
-  interventions,
-  consent,
-  schedule,
-  report_specification,
-  results,
-  created_at,
-  updated_at,
-  user_id,
-  participation,
-  result_sharing,
-  collaborator_emails
-) VALUES(
-  '{"email":"example@example.com","phone":"0123456789","website":"https://studyu.health","researchers":"StudyU Researcher","organization":"StudyU","institutionalReviewBoard":"This study has not been submitted to the IRB Board. It is for illustration purposes of StudyU only.","institutionalReviewBoardNumber":"N/A"}',
-  'Study: published=true, registry_published=false, participation=invite, result_sharing=private',
-  'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
-  'accountHeart',
-  -- published
-  true,
-  -- registry_published
-  false,
-  '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
-  '[]',
-  '2021-04-13 18:19:49.000',
-  '2023-05-11 12:46:06.018',
-  -- user_id
-  (tests.get_supabase_user('test_creator_1') ->> 'id')::uuid,
-  -- participation ('open', 'invite')
-  'invite',
-  -- result_sharing ('public', 'organization', 'private')
-  'private',
-  '{}'
-);
-
---
--- Creator 2
--- Description: Studies should not be visible to consumer
---
-
-INSERT INTO public.study (
-  contact,
-  title,
-  description,
-  icon_name,
-  published,
-  registry_published,
-  questionnaire,
-  eligibility_criteria,
-  observations,
-  interventions,
-  consent,
-  schedule,
-  report_specification,
-  results,
-  created_at,
-  updated_at,
-  user_id,
-  participation,
-  result_sharing,
-  collaborator_emails
-) VALUES(
-  '{"email":"example@example.com","phone":"0123456789","website":"https://studyu.health","researchers":"StudyU Researcher","organization":"StudyU","institutionalReviewBoard":"This study has not been submitted to the IRB Board. It is for illustration purposes of StudyU only.","institutionalReviewBoardNumber":"N/A"}',
-  'Study: published=false, registry_published=true, participation=open, result_sharing=public',
-  'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
-  'accountHeart',
-  -- published
-  false,
-  -- registry_published
-  true,
-  '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
-  '[]',
-  '2021-04-13 18:19:49.000',
-  '2023-05-11 12:46:06.018',
-  -- user_id
-  (tests.get_supabase_user('test_creator_2') ->> 'id')::uuid,
-  -- participation ('open', 'invite')
-  'open',
-  -- result_sharing ('public', 'organization', 'private')
-  'public',
-  '{}'
-);
-
-INSERT INTO public.study (
-  contact,
-  title,
-  description,
-  icon_name,
-  published,
-  registry_published,
-  questionnaire,
-  eligibility_criteria,
-  observations,
-  interventions,
-  consent,
-  schedule,
-  report_specification,
-  results,
-  created_at,
-  updated_at,
-  user_id,
-  participation,
-  result_sharing,
-  collaborator_emails
-) VALUES(
-  '{"email":"example@example.com","phone":"0123456789","website":"https://studyu.health","researchers":"StudyU Researcher","organization":"StudyU","institutionalReviewBoard":"This study has not been submitted to the IRB Board. It is for illustration purposes of StudyU only.","institutionalReviewBoardNumber":"N/A"}',
-  'Study: published=false, registry_published=false, participation=invite, result_sharing=private',
-  'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
-  'accountHeart',
-  -- published
-  false,
-  -- registry_published
-  false,
-  '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
-  '[]',
-  '2021-04-13 18:19:49.000',
-  '2023-05-11 12:46:06.018',
-  -- user_id
-  (tests.get_supabase_user('test_creator_2') ->> 'id')::uuid,
-  -- participation ('open', 'invite')
-  'invite',
-  -- result_sharing ('public', 'organization', 'private')
-  'private',
-  '{}'
-);
-
---
--- start tests
---
-
--- plan tests in advance, this ensures the proper number of tests have been run.
-SELECT plan(19);
-
--- UNRESTRICTED TESTS
-
-SELECT is(count(*)::int, 1, 'Check if app_config was seeded') FROM public.app_config;
-
--- check if RLS is enabled on all tables in the public schema
-SELECT tests.rls_enabled('public');
-
-SELECT is(count(*)::int, 3, 'Check if users were created and can be accessed') FROM public.user;
-
--- ANONYMOUS TESTS
-
-SELECT tests.clear_authentication();
-SELECT is(count(*)::int, 0, 'Check if users cannot be accessed anonymously') FROM public.user;
-SELECT is(published, true, 'Check if all anonymously accessed studies are published') FROM public.study;
-
--- CREATOR 1 TESTS
-
-SELECT tests.authenticate_as('test_creator_1');
-SELECT is(email, 'test_creator_1@studyu.health', 'Check if a user can only retrieve his user') FROM public.user;
-
--- CREATOR 2 TESTS
-
-SELECT tests.authenticate_as('test_creator_2');
-SELECT is(email, 'test_creator_2@studyu.health', 'Check if a user can only retrieve his user') FROM public.user;
-
--- CONSUMER TESTS
-
-SELECT tests.authenticate_as('test_consumer');
-
--- test specific: all published studies are created by test_creator_1
-SELECT is(user_id, (tests.get_supabase_user('test_creator_1') ->> 'id')::uuid, 'All published studies are created by test_creator_1') FROM public.study;
-SELECT is(count(*)::int, 3, 'Verify number of accessible studies') FROM public.study;
-
--- check if the consumer can only access designated published studies
-SELECT is(published, true, 'Check if test_consumer can only access studies that are published') FROM public.study;
-SELECT tests.is_either_true(
-      'Check if test_consumer can only retrieve designated studies',
-      tests.is_equal(registry_published, true),
-      tests.is_equal(participation, 'open'::public.participation),
-      tests.is_equal(result_sharing, 'public'::public.result_sharing)
-  )
-  FROM
-    public.study;
-
--- check the results of your test
-select * from finish();
-
--- rollback the transaction, completing the test scenario
-ROLLBACK;
diff --git a/docker/supabase/volumes/api/kong.yml b/docker/supabase/volumes/api/kong.yml
deleted file mode 100644
index 4a0799503..000000000
--- a/docker/supabase/volumes/api/kong.yml
+++ /dev/null
@@ -1,223 +0,0 @@
-_format_version: '2.1'
-_transform: true
-
-###
-### Consumers / Users
-###
-consumers:
-  - username: DASHBOARD
-  - username: anon
-    keyauth_credentials:
-      - key: $SUPABASE_ANON_KEY
-  - username: service_role
-    keyauth_credentials:
-      - key: $SUPABASE_SERVICE_KEY
-
-###
-### Access Control List
-###
-acls:
-  - consumer: anon
-    group: anon
-  - consumer: service_role
-    group: admin
-
-###
-### Dashboard credentials
-###
-basicauth_credentials:
-- consumer: DASHBOARD
-  username: $DASHBOARD_USERNAME
-  password: $DASHBOARD_PASSWORD
-
-
-###
-### API Routes
-###
-services:
-
-  ## Open Auth routes
-  - name: auth-v1-open
-    url: http://auth:9999/verify
-    routes:
-      - name: auth-v1-open
-        strip_path: true
-        paths:
-          - /auth/v1/verify
-    plugins:
-      - name: cors
-  - name: auth-v1-open-callback
-    url: http://auth:9999/callback
-    routes:
-      - name: auth-v1-open-callback
-        strip_path: true
-        paths:
-          - /auth/v1/callback
-    plugins:
-      - name: cors
-  - name: auth-v1-open-authorize
-    url: http://auth:9999/authorize
-    routes:
-      - name: auth-v1-open-authorize
-        strip_path: true
-        paths:
-          - /auth/v1/authorize
-    plugins:
-      - name: cors
-
-  ## Secure Auth routes
-  - name: auth-v1
-    _comment: 'GoTrue: /auth/v1/* -> http://auth:9999/*'
-    url: http://auth:9999/
-    routes:
-      - name: auth-v1-all
-        strip_path: true
-        paths:
-          - /auth/v1/
-    plugins:
-      - name: cors
-      - name: key-auth
-        config:
-          hide_credentials: false
-      - name: acl
-        config:
-          hide_groups_header: true
-          allow:
-            - admin
-            - anon
-
-  ## Secure REST routes
-  - name: rest-v1
-    _comment: 'PostgREST: /rest/v1/* -> http://rest:3000/*'
-    url: http://rest:3000/
-    routes:
-      - name: rest-v1-all
-        strip_path: true
-        paths:
-          - /rest/v1/
-    plugins:
-      - name: cors
-      - name: key-auth
-        config:
-          hide_credentials: true
-      - name: acl
-        config:
-          hide_groups_header: true
-          allow:
-            - admin
-            - anon
-
-  ## Secure GraphQL routes
-  - name: graphql-v1
-    _comment: 'PostgREST: /graphql/v1/* -> http://rest:3000/rpc/graphql'
-    url: http://rest:3000/rpc/graphql
-    routes:
-      - name: graphql-v1-all
-        strip_path: true
-        paths:
-          - /graphql/v1
-    plugins:
-      - name: cors
-      - name: key-auth
-        config:
-          hide_credentials: true
-      - name: request-transformer
-        config:
-          add:
-            headers:
-              - Content-Profile:graphql_public
-      - name: acl
-        config:
-          hide_groups_header: true
-          allow:
-            - admin
-            - anon
-
-  ## Secure Realtime routes
-  - name: realtime-v1
-    _comment: 'Realtime: /realtime/v1/* -> ws://realtime:4000/socket/*'
-    url: http://realtime-dev.supabase-realtime:4000/socket/
-    routes:
-      - name: realtime-v1-all
-        strip_path: true
-        paths:
-          - /realtime/v1/
-    plugins:
-      - name: cors
-      - name: key-auth
-        config:
-          hide_credentials: false
-      - name: acl
-        config:
-          hide_groups_header: true
-          allow:
-            - admin
-            - anon
-
-  ## Storage routes: the storage server manages its own auth
-  - name: storage-v1
-    _comment: 'Storage: /storage/v1/* -> http://storage:5000/*'
-    url: http://storage:5000/
-    routes:
-      - name: storage-v1-all
-        strip_path: true
-        paths:
-          - /storage/v1/
-    plugins:
-      - name: cors
-
-  ## Edge Functions routes
-  - name: functions-v1
-    _comment: 'Edge Functions: /functions/v1/* -> http://functions:9000/*'
-    url: http://functions:9000/
-    routes:
-      - name: functions-v1-all
-        strip_path: true
-        paths:
-          - /functions/v1/
-    plugins:
-      - name: cors
-
-  ## Analytics routes
-  - name: analytics-v1
-    _comment: 'Analytics: /analytics/v1/* -> http://logflare:4000/*'
-    url: http://analytics:4000/
-    routes:
-      - name: analytics-v1-all
-        strip_path: true
-        paths:
-          - /analytics/v1/
-
-  ## Secure Database routes
-  - name: meta
-    _comment: 'pg-meta: /pg/* -> http://pg-meta:8080/*'
-    url: http://meta:8080/
-    routes:
-      - name: meta-all
-        strip_path: true
-        paths:
-          - /pg/
-    plugins:
-      - name: key-auth
-        config:
-          hide_credentials: false
-      - name: acl
-        config:
-          hide_groups_header: true
-          allow:
-            - admin
-
-  ## Protected Dashboard - catch all remaining routes
-  - name: dashboard
-    _comment: 'Studio: /* -> http://studio:3000/*'
-    url: http://studio:3000/
-    routes:
-      - name: dashboard-all
-        strip_path: true
-        paths:
-          - /
-    plugins:
-      - name: cors
-      - name: basic-auth
-        config:
-          hide_credentials: true
diff --git a/docker/supabase/volumes/db/init/data.sql b/docker/supabase/volumes/db/init/data.sql
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/supabase/volumes/db/jwt.sql b/docker/supabase/volumes/db/jwt.sql
deleted file mode 100644
index cfd3b1602..000000000
--- a/docker/supabase/volumes/db/jwt.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-\set jwt_secret `echo "$JWT_SECRET"`
-\set jwt_exp `echo "$JWT_EXP"`
-
-ALTER DATABASE postgres SET "app.settings.jwt_secret" TO :'jwt_secret';
-ALTER DATABASE postgres SET "app.settings.jwt_exp" TO :'jwt_exp';
diff --git a/docker/supabase/volumes/db/logs.sql b/docker/supabase/volumes/db/logs.sql
deleted file mode 100644
index 22fc2479e..000000000
--- a/docker/supabase/volumes/db/logs.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-\set pguser `echo "$POSTGRES_USER"`
-
-create schema if not exists _analytics;
-alter schema _analytics owner to :pguser;
diff --git a/docker/supabase/volumes/db/realtime.sql b/docker/supabase/volumes/db/realtime.sql
deleted file mode 100644
index 4d4b9ffb9..000000000
--- a/docker/supabase/volumes/db/realtime.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-\set pguser `echo "$POSTGRES_USER"`
-
-create schema if not exists _realtime;
-alter schema _realtime owner to :pguser;
diff --git a/docker/supabase/volumes/db/roles.sql b/docker/supabase/volumes/db/roles.sql
deleted file mode 100644
index 8f7161a6d..000000000
--- a/docker/supabase/volumes/db/roles.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- NOTE: change to your own passwords for production environments
-\set pgpass `echo "$POSTGRES_PASSWORD"`
-
-ALTER USER authenticator WITH PASSWORD :'pgpass';
-ALTER USER pgbouncer WITH PASSWORD :'pgpass';
-ALTER USER supabase_auth_admin WITH PASSWORD :'pgpass';
-ALTER USER supabase_functions_admin WITH PASSWORD :'pgpass';
-ALTER USER supabase_storage_admin WITH PASSWORD :'pgpass';
diff --git a/docker/supabase/volumes/db/webhooks.sql b/docker/supabase/volumes/db/webhooks.sql
deleted file mode 100644
index 5837b8618..000000000
--- a/docker/supabase/volumes/db/webhooks.sql
+++ /dev/null
@@ -1,208 +0,0 @@
-BEGIN;
-  -- Create pg_net extension
-  CREATE EXTENSION IF NOT EXISTS pg_net SCHEMA extensions;
-  -- Create supabase_functions schema
-  CREATE SCHEMA supabase_functions AUTHORIZATION supabase_admin;
-  GRANT USAGE ON SCHEMA supabase_functions TO postgres, anon, authenticated, service_role;
-  ALTER DEFAULT PRIVILEGES IN SCHEMA supabase_functions GRANT ALL ON TABLES TO postgres, anon, authenticated, service_role;
-  ALTER DEFAULT PRIVILEGES IN SCHEMA supabase_functions GRANT ALL ON FUNCTIONS TO postgres, anon, authenticated, service_role;
-  ALTER DEFAULT PRIVILEGES IN SCHEMA supabase_functions GRANT ALL ON SEQUENCES TO postgres, anon, authenticated, service_role;
-  -- supabase_functions.migrations definition
-  CREATE TABLE supabase_functions.migrations (
-    version text PRIMARY KEY,
-    inserted_at timestamptz NOT NULL DEFAULT NOW()
-  );
-  -- Initial supabase_functions migration
-  INSERT INTO supabase_functions.migrations (version) VALUES ('initial');
-  -- supabase_functions.hooks definition
-  CREATE TABLE supabase_functions.hooks (
-    id bigserial PRIMARY KEY,
-    hook_table_id integer NOT NULL,
-    hook_name text NOT NULL,
-    created_at timestamptz NOT NULL DEFAULT NOW(),
-    request_id bigint
-  );
-  CREATE INDEX supabase_functions_hooks_request_id_idx ON supabase_functions.hooks USING btree (request_id);
-  CREATE INDEX supabase_functions_hooks_h_table_id_h_name_idx ON supabase_functions.hooks USING btree (hook_table_id, hook_name);
-  COMMENT ON TABLE supabase_functions.hooks IS 'Supabase Functions Hooks: Audit trail for triggered hooks.';
-  CREATE FUNCTION supabase_functions.http_request()
-    RETURNS trigger
-    LANGUAGE plpgsql
-    AS $function$
-    DECLARE
-      request_id bigint;
-      payload jsonb;
-      url text := TG_ARGV[0]::text;
-      method text := TG_ARGV[1]::text;
-      headers jsonb DEFAULT '{}'::jsonb;
-      params jsonb DEFAULT '{}'::jsonb;
-      timeout_ms integer DEFAULT 1000;
-    BEGIN
-      IF url IS NULL OR url = 'null' THEN
-        RAISE EXCEPTION 'url argument is missing';
-      END IF;
-
-      IF method IS NULL OR method = 'null' THEN
-        RAISE EXCEPTION 'method argument is missing';
-      END IF;
-
-      IF TG_ARGV[2] IS NULL OR TG_ARGV[2] = 'null' THEN
-        headers = '{"Content-Type": "application/json"}'::jsonb;
-      ELSE
-        headers = TG_ARGV[2]::jsonb;
-      END IF;
-
-      IF TG_ARGV[3] IS NULL OR TG_ARGV[3] = 'null' THEN
-        params = '{}'::jsonb;
-      ELSE
-        params = TG_ARGV[3]::jsonb;
-      END IF;
-
-      IF TG_ARGV[4] IS NULL OR TG_ARGV[4] = 'null' THEN
-        timeout_ms = 1000;
-      ELSE
-        timeout_ms = TG_ARGV[4]::integer;
-      END IF;
-
-      CASE
-        WHEN method = 'GET' THEN
-          SELECT http_get INTO request_id FROM net.http_get(
-            url,
-            params,
-            headers,
-            timeout_ms
-          );
-        WHEN method = 'POST' THEN
-          payload = jsonb_build_object(
-            'old_record', OLD,
-            'record', NEW,
-            'type', TG_OP,
-            'table', TG_TABLE_NAME,
-            'schema', TG_TABLE_SCHEMA
-          );
-
-          SELECT http_post INTO request_id FROM net.http_post(
-            url,
-            payload,
-            params,
-            headers,
-            timeout_ms
-          );
-        ELSE
-          RAISE EXCEPTION 'method argument % is invalid', method;
-      END CASE;
-
-      INSERT INTO supabase_functions.hooks
-        (hook_table_id, hook_name, request_id)
-      VALUES
-        (TG_RELID, TG_NAME, request_id);
-
-      RETURN NEW;
-    END
-  $function$;
-  -- Supabase super admin
-  DO
-  $$
-  BEGIN
-    IF NOT EXISTS (
-      SELECT 1
-      FROM pg_roles
-      WHERE rolname = 'supabase_functions_admin'
-    )
-    THEN
-      CREATE USER supabase_functions_admin NOINHERIT CREATEROLE LOGIN NOREPLICATION;
-    END IF;
-  END
-  $$;
-  GRANT ALL PRIVILEGES ON SCHEMA supabase_functions TO supabase_functions_admin;
-  GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA supabase_functions TO supabase_functions_admin;
-  GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA supabase_functions TO supabase_functions_admin;
-  ALTER USER supabase_functions_admin SET search_path = "supabase_functions";
-  ALTER table "supabase_functions".migrations OWNER TO supabase_functions_admin;
-  ALTER table "supabase_functions".hooks OWNER TO supabase_functions_admin;
-  ALTER function "supabase_functions".http_request() OWNER TO supabase_functions_admin;
-  GRANT supabase_functions_admin TO postgres;
-  -- Remove unused supabase_pg_net_admin role
-  DO
-  $$
-  BEGIN
-    IF EXISTS (
-      SELECT 1
-      FROM pg_roles
-      WHERE rolname = 'supabase_pg_net_admin'
-    )
-    THEN
-      REASSIGN OWNED BY supabase_pg_net_admin TO supabase_admin;
-      DROP OWNED BY supabase_pg_net_admin;
-      DROP ROLE supabase_pg_net_admin;
-    END IF;
-  END
-  $$;
-  -- pg_net grants when extension is already enabled
-  DO
-  $$
-  BEGIN
-    IF EXISTS (
-      SELECT 1
-      FROM pg_extension
-      WHERE extname = 'pg_net'
-    )
-    THEN
-      GRANT USAGE ON SCHEMA net TO supabase_functions_admin, postgres, anon, authenticated, service_role;
-      ALTER function net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) SECURITY DEFINER;
-      ALTER function net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) SECURITY DEFINER;
-      ALTER function net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) SET search_path = net;
-      ALTER function net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) SET search_path = net;
-      REVOKE ALL ON FUNCTION net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) FROM PUBLIC;
-      REVOKE ALL ON FUNCTION net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) FROM PUBLIC;
-      GRANT EXECUTE ON FUNCTION net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) TO supabase_functions_admin, postgres, anon, authenticated, service_role;
-      GRANT EXECUTE ON FUNCTION net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) TO supabase_functions_admin, postgres, anon, authenticated, service_role;
-    END IF;
-  END
-  $$;
-  -- Event trigger for pg_net
-  CREATE OR REPLACE FUNCTION extensions.grant_pg_net_access()
-  RETURNS event_trigger
-  LANGUAGE plpgsql
-  AS $$
-  BEGIN
-    IF EXISTS (
-      SELECT 1
-      FROM pg_event_trigger_ddl_commands() AS ev
-      JOIN pg_extension AS ext
-      ON ev.objid = ext.oid
-      WHERE ext.extname = 'pg_net'
-    )
-    THEN
-      GRANT USAGE ON SCHEMA net TO supabase_functions_admin, postgres, anon, authenticated, service_role;
-      ALTER function net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) SECURITY DEFINER;
-      ALTER function net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) SECURITY DEFINER;
-      ALTER function net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) SET search_path = net;
-      ALTER function net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) SET search_path = net;
-      REVOKE ALL ON FUNCTION net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) FROM PUBLIC;
-      REVOKE ALL ON FUNCTION net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) FROM PUBLIC;
-      GRANT EXECUTE ON FUNCTION net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) TO supabase_functions_admin, postgres, anon, authenticated, service_role;
-      GRANT EXECUTE ON FUNCTION net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) TO supabase_functions_admin, postgres, anon, authenticated, service_role;
-    END IF;
-  END;
-  $$;
-  COMMENT ON FUNCTION extensions.grant_pg_net_access IS 'Grants access to pg_net';
-  DO
-  $$
-  BEGIN
-    IF NOT EXISTS (
-      SELECT 1
-      FROM pg_event_trigger
-      WHERE evtname = 'issue_pg_net_access'
-    ) THEN
-      CREATE EVENT TRIGGER issue_pg_net_access ON ddl_command_end WHEN TAG IN ('CREATE EXTENSION')
-      EXECUTE PROCEDURE extensions.grant_pg_net_access();
-    END IF;
-  END
-  $$;
-  INSERT INTO supabase_functions.migrations (version) VALUES ('20210809183423_update_grants');
-  ALTER function supabase_functions.http_request() SECURITY DEFINER;
-  ALTER function supabase_functions.http_request() SET search_path = supabase_functions;
-  REVOKE ALL ON FUNCTION supabase_functions.http_request() FROM PUBLIC;
-  GRANT EXECUTE ON FUNCTION supabase_functions.http_request() TO postgres, anon, authenticated, service_role;
-COMMIT;
diff --git a/docker/supabase/volumes/functions/hello/index.ts b/docker/supabase/volumes/functions/hello/index.ts
deleted file mode 100644
index f1e20b90e..000000000
--- a/docker/supabase/volumes/functions/hello/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Follow this setup guide to integrate the Deno language server with your editor:
-// https://deno.land/manual/getting_started/setup_your_environment
-// This enables autocomplete, go to definition, etc.
-
-import { serve } from "https://deno.land/std@0.177.1/http/server.ts"
-
-serve(async () => {
-  return new Response(
-    `"Hello from Edge Functions!"`,
-    { headers: { "Content-Type": "application/json" } },
-  )
-})
-
-// To invoke:
-// curl 'http://localhost:<KONG_HTTP_PORT>/functions/v1/hello' \
-//   --header 'Authorization: Bearer <anon/service_role API key>'
diff --git a/docker/supabase/volumes/functions/main/index.ts b/docker/supabase/volumes/functions/main/index.ts
deleted file mode 100644
index a094010b9..000000000
--- a/docker/supabase/volumes/functions/main/index.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { serve } from 'https://deno.land/std@0.131.0/http/server.ts'
-import * as jose from 'https://deno.land/x/jose@v4.14.4/index.ts'
-
-console.log('main function started')
-
-const JWT_SECRET = Deno.env.get('JWT_SECRET')
-const VERIFY_JWT = Deno.env.get('VERIFY_JWT') === 'true'
-
-function getAuthToken(req: Request) {
-  const authHeader = req.headers.get('authorization')
-  if (!authHeader) {
-    throw new Error('Missing authorization header')
-  }
-  const [bearer, token] = authHeader.split(' ')
-  if (bearer !== 'Bearer') {
-    throw new Error(`Auth header is not 'Bearer {token}'`)
-  }
-  return token
-}
-
-async function verifyJWT(jwt: string): Promise<boolean> {
-  const encoder = new TextEncoder()
-  const secretKey = encoder.encode(JWT_SECRET)
-  try {
-    await jose.jwtVerify(jwt, secretKey)
-  } catch (err) {
-    console.error(err)
-    return false
-  }
-  return true
-}
-
-serve(async (req: Request) => {
-  if (req.method !== 'OPTIONS' && VERIFY_JWT) {
-    try {
-      const token = getAuthToken(req)
-      const isValidJWT = await verifyJWT(token)
-
-      if (!isValidJWT) {
-        return new Response(JSON.stringify({ msg: 'Invalid JWT' }), {
-          status: 401,
-          headers: { 'Content-Type': 'application/json' },
-        })
-      }
-    } catch (e) {
-      console.error(e)
-      return new Response(JSON.stringify({ msg: e.toString() }), {
-        status: 401,
-        headers: { 'Content-Type': 'application/json' },
-      })
-    }
-  }
-
-  const url = new URL(req.url)
-  const { pathname } = url
-  const path_parts = pathname.split('/')
-  const service_name = path_parts[1]
-
-  if (!service_name || service_name === '') {
-    const error = { msg: 'missing function name in request' }
-    return new Response(JSON.stringify(error), {
-      status: 400,
-      headers: { 'Content-Type': 'application/json' },
-    })
-  }
-
-  const servicePath = `/home/deno/functions/${service_name}`
-  console.error(`serving the request with ${servicePath}`)
-
-  const memoryLimitMb = 150
-  const workerTimeoutMs = 1 * 60 * 1000
-  const noModuleCache = false
-  const importMapPath = null
-  const envVarsObj = Deno.env.toObject()
-  const envVars = Object.keys(envVarsObj).map((k) => [k, envVarsObj[k]])
-
-  try {
-    const worker = await EdgeRuntime.userWorkers.create({
-      servicePath,
-      memoryLimitMb,
-      workerTimeoutMs,
-      noModuleCache,
-      importMapPath,
-      envVars,
-    })
-    return await worker.fetch(req)
-  } catch (e) {
-    const error = { msg: e.toString() }
-    return new Response(JSON.stringify(error), {
-      status: 500,
-      headers: { 'Content-Type': 'application/json' },
-    })
-  }
-})
diff --git a/docker/supabase/volumes/logs/vector.yml b/docker/supabase/volumes/logs/vector.yml
deleted file mode 100644
index 39a007729..000000000
--- a/docker/supabase/volumes/logs/vector.yml
+++ /dev/null
@@ -1,232 +0,0 @@
-api:
-  enabled: true
-  address: 0.0.0.0:9001
-
-sources:
-  docker_host:
-    type: docker_logs
-    exclude_containers:
-      - supabase-vector
-
-transforms:
-  project_logs:
-    type: remap
-    inputs:
-      - docker_host
-    source: |-
-      .project = "default"
-      .event_message = del(.message)
-      .appname = del(.container_name)
-      del(.container_created_at)
-      del(.container_id)
-      del(.source_type)
-      del(.stream)
-      del(.label)
-      del(.image)
-      del(.host)
-      del(.stream)
-  router:
-    type: route
-    inputs:
-      - project_logs
-    route:
-      kong: '.appname == "supabase-kong"'
-      auth: '.appname == "supabase-auth"'
-      rest: '.appname == "supabase-rest"'
-      realtime: '.appname == "supabase-realtime"'
-      storage: '.appname == "supabase-storage"'
-      functions: '.appname == "supabase-functions"'
-      db: '.appname == "supabase-db"'
-  # Ignores non nginx errors since they are related with kong booting up
-  kong_logs:
-    type: remap
-    inputs:
-      - router.kong
-    source: |-
-      req, err = parse_nginx_log(.event_message, "combined")
-      if err == null {
-          .timestamp = req.timestamp
-          .metadata.request.headers.referer = req.referer
-          .metadata.request.headers.user_agent = req.agent
-          .metadata.request.headers.cf_connecting_ip = req.client
-          .metadata.request.method = req.method
-          .metadata.request.path = req.path
-          .metadata.request.protocol = req.protocol
-          .metadata.response.status_code = req.status
-      }
-      if err != null {
-        abort
-      }
-  # Ignores non nginx errors since they are related with kong booting up
-  kong_err:
-    type: remap
-    inputs:
-      - router.kong
-    source: |-
-      .metadata.request.method = "GET"
-      .metadata.response.status_code = 200
-      parsed, err = parse_nginx_log(.event_message, "error")
-      if err == null {
-          .timestamp = parsed.timestamp
-          .severity = parsed.severity
-          .metadata.request.host = parsed.host
-          .metadata.request.headers.cf_connecting_ip = parsed.client
-          url, err = split(parsed.request, " ")
-          if err == null {
-              .metadata.request.method = url[0]
-              .metadata.request.path = url[1]
-              .metadata.request.protocol = url[2]
-          }
-      }
-      if err != null {
-        abort
-      }
-  # Gotrue logs are structured json strings which frontend parses directly. But we keep metadata for consistency.
-  auth_logs:
-    type: remap
-    inputs:
-      - router.auth
-    source: |-
-      parsed, err = parse_json(.event_message)
-      if err == null {
-          .metadata.timestamp = parsed.time
-          .metadata = merge!(.metadata, parsed)
-      }
-  # PostgREST logs are structured so we separate timestamp from message using regex
-  rest_logs:
-    type: remap
-    inputs:
-      - router.rest
-    source: |-
-      parsed, err = parse_regex(.event_message, r'^(?P<time>.*): (?P<msg>.*)$')
-      if err == null {
-          .event_message = parsed.msg
-          .timestamp = to_timestamp!(parsed.time)
-          .metadata.host = .project
-      }
-  # Realtime logs are structured so we parse the severity level using regex (ignore time because it has no date)
-  realtime_logs:
-    type: remap
-    inputs:
-      - router.realtime
-    source: |-
-      .metadata.project = del(.project)
-      .metadata.external_id = .metadata.project
-      parsed, err = parse_regex(.event_message, r'^(?P<time>\d+:\d+:\d+\.\d+) \[(?P<level>\w+)\] (?P<msg>.*)$')
-      if err == null {
-          .event_message = parsed.msg
-          .metadata.level = parsed.level
-      }
-  # Storage logs may contain json objects so we parse them for completeness
-  storage_logs:
-    type: remap
-    inputs:
-      - router.storage
-    source: |-
-      .metadata.project = del(.project)
-      .metadata.tenantId = .metadata.project
-      parsed, err = parse_json(.event_message)
-      if err == null {
-          .event_message = parsed.msg
-          .metadata.level = parsed.level
-          .metadata.timestamp = parsed.time
-          .metadata.context[0].host = parsed.hostname
-          .metadata.context[0].pid = parsed.pid
-      }
-  # Postgres logs some messages to stderr which we map to warning severity level
-  db_logs:
-    type: remap
-    inputs:
-      - router.db
-    source: |-
-      .metadata.host = "db-default"
-      .metadata.parsed.timestamp = .timestamp
-      
-      parsed, err = parse_regex(.event_message, r'.*(?P<level>INFO|NOTICE|WARNING|ERROR|LOG|FATAL|PANIC?):.*', numeric_groups: true)
-
-      if err != null || parsed == null {
-        .metadata.parsed.error_severity = "info"
-      }
-      if parsed != null {
-       .metadata.parsed.error_severity = parsed.level
-      }
-      if .metadata.parsed.error_severity == "info" {
-          .metadata.parsed.error_severity = "log"
-      }
-      .metadata.parsed.error_severity = upcase!(.metadata.parsed.error_severity)
-
-sinks:
-  logflare_auth:
-    type: 'http'
-    inputs:
-      - auth_logs
-    encoding:
-      codec: 'json'
-    method: 'post'
-    request:
-      retry_max_duration_secs: 10
-    uri: 'http://analytics:4000/api/logs?source_name=gotrue.logs.prod&api_key=your-super-secret-and-long-logflare-key'
-  logflare_realtime:
-    type: 'http'
-    inputs:
-      - realtime_logs
-    encoding:
-      codec: 'json'
-    method: 'post'
-    request:
-      retry_max_duration_secs: 10
-    uri: 'http://analytics:4000/api/logs?source_name=realtime.logs.prod&api_key=your-super-secret-and-long-logflare-key'
-  logflare_rest:
-    type: 'http'
-    inputs:
-      - rest_logs
-    encoding:
-      codec: 'json'
-    method: 'post'
-    request:
-      retry_max_duration_secs: 10
-    uri: 'http://analytics:4000/api/logs?source_name=postgREST.logs.prod&api_key=your-super-secret-and-long-logflare-key'
-  logflare_db:
-    type: 'http'
-    inputs:
-      - db_logs
-    encoding:
-      codec: 'json'
-    method: 'post'
-    request:
-      retry_max_duration_secs: 10
-    # We must route the sink through kong because ingesting logs before logflare is fully initialised will
-    # lead to broken queries from studio. This works by the assumption that containers are started in the
-    # following order: vector > db > logflare > kong
-    uri: 'http://kong:8000/analytics/v1/api/logs?source_name=postgres.logs&api_key=your-super-secret-and-long-logflare-key'
-  logflare_functions:
-    type: 'http'
-    inputs:
-      - router.functions
-    encoding:
-      codec: 'json'
-    method: 'post'
-    request:
-      retry_max_duration_secs: 10
-    uri: 'http://analytics:4000/api/logs?source_name=deno-relay-logs&api_key=your-super-secret-and-long-logflare-key'
-  logflare_storage:
-    type: 'http'
-    inputs:
-      - storage_logs
-    encoding:
-      codec: 'json'
-    method: 'post'
-    request:
-      retry_max_duration_secs: 10
-    uri: 'http://analytics:4000/api/logs?source_name=storage.logs.prod.2&api_key=your-super-secret-and-long-logflare-key'
-  logflare_kong:
-    type: 'http'
-    inputs:
-      - kong_logs
-      - kong_err
-    encoding:
-      codec: 'json'
-    method: 'post'
-    request:
-      retry_max_duration_secs: 10
-    uri: 'http://analytics:4000/api/logs?source_name=cloudflare.logs.prod&api_key=your-super-secret-and-long-logflare-key'

From 742f6b5177d7f1b0a04238559b2c9edf6e1c6f71 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 11:05:13 +0200
Subject: [PATCH 047/314] ci: add supabase cli env for e2e tests

---
 .github/workflows/e2e_tests.yml |  31 ++++--
 docker/supabase/.gitignore      |   4 +
 docker/supabase/config.toml     | 167 ++++++++++++++++++++++++++++++++
 3 files changed, 194 insertions(+), 8 deletions(-)
 create mode 100644 docker/supabase/.gitignore
 create mode 100644 docker/supabase/config.toml

diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
index 5deaab252..862d36ca2 100644
--- a/.github/workflows/e2e_tests.yml
+++ b/.github/workflows/e2e_tests.yml
@@ -20,35 +20,50 @@ jobs:
         uses: johannesvedder/await-workflow@v1
         with:
           workflowId: 'publish_pubdev.yml'
+
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+
       - name: Init workspace
         uses: ./.github/workflows/init-workspace
+
       - name: Setup ChromeDriver
         uses: nanasess/setup-chromedriver@v2
+
       - name: Enable web support
         run: flutter config --enable-web
-      - name: Initialize Supabase
+
+      - name: Prepare environment
         run: |
           dart pub global activate melos
           melos bootstrap
           dart pub get
-          docker network create studyu_network || true
           cp docker/supabase/.env.example docker/supabase/.env
-          cp docker/proxy/.env.example docker/proxy/.env
           cp flutter_common/lib/envs/.env.local.example flutter_common/lib/envs/.env.local
-          docker compose -f docker/supabase/docker-compose-db.yml up -d
-          docker compose -f docker/supabase/docker-compose.yml up -d
-          docker compose -f docker/proxy/docker-compose-proxy.yml up -d
-          while [ "$(docker inspect --format='{{.State.Health.Status}}' supabase-db)" != "healthy" ]; do sleep 1; done
-          docker exec -i supabase-db psql -U postgres -d postgres < ./database/app_config.sql.example
+
+      - name: Set up Supabase CLI
+        uses: supabase/setup-cli@v1
+        with:
+          version: latest
+
+      - name: Prepare database seed
+        run: |
+          cat database/studyu-schema.sql > docker/supabase/seed.sql
+          cat database/app_config.sql.example >> docker/supabase/seed.sql
+
+      - name: Start Supabase database
+        working-directory: docker
+        run: |
+          supabase db start
+
       - name: Start Chrome Driver
         run: |
           export DISPLAY=:99
           chromedriver --port=4444 &
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
+
       - name: Run Flutter E2E tests
         working-directory: ./designer_v2
         run: |
diff --git a/docker/supabase/.gitignore b/docker/supabase/.gitignore
new file mode 100644
index 000000000..a3ad88055
--- /dev/null
+++ b/docker/supabase/.gitignore
@@ -0,0 +1,4 @@
+# Supabase
+.branches
+.temp
+.env
diff --git a/docker/supabase/config.toml b/docker/supabase/config.toml
new file mode 100644
index 000000000..8bf9a731d
--- /dev/null
+++ b/docker/supabase/config.toml
@@ -0,0 +1,167 @@
+# A string used to distinguish different Supabase projects on the same host. Defaults to the
+# working directory name when running `supabase init`.
+project_id = "studyu-test"
+
+[api]
+enabled = true
+# Port to use for the API URL.
+port = 54321
+# Schemas to expose in your API. Tables, views and stored procedures in this schema will get API
+# endpoints. `public` is always included.
+schemas = ["public", "graphql_public"]
+# Extra schemas to add to the search_path of every request. `public` is always included.
+extra_search_path = ["public", "extensions"]
+# The maximum number of rows returns from a view, table, or stored procedure. Limits payload size
+# for accidental or malicious requests.
+max_rows = 1000
+
+[db]
+# Port to use for the local database URL.
+port = 54322
+# Port used by db diff command to initialize the shadow database.
+shadow_port = 54320
+# The database major version to use. This has to be the same as your remote database's. Run `SHOW
+# server_version;` on the remote database to check.
+major_version = 15
+
+[db.pooler]
+enabled = false
+# Port to use for the local connection pooler.
+port = 54329
+# Specifies when a server connection can be reused by other clients.
+# Configure one of the supported pooler modes: `transaction`, `session`.
+pool_mode = "transaction"
+# How many server connections to allow per user/database pair.
+default_pool_size = 20
+# Maximum number of client connections allowed.
+max_client_conn = 100
+
+[realtime]
+enabled = true
+# Bind realtime via either IPv4 or IPv6. (default: IPv4)
+# ip_version = "IPv6"
+# The maximum length in bytes of HTTP request headers. (default: 4096)
+# max_header_length = 4096
+
+[studio]
+enabled = true
+# Port to use for Supabase Studio.
+port = 54323
+# External URL of the API server that frontend connects to.
+api_url = "http://127.0.0.1"
+# OpenAI API Key to use for Supabase AI in the Supabase Studio.
+openai_api_key = "env(OPENAI_API_KEY)"
+
+# Email testing server. Emails sent with the local dev setup are not actually sent - rather, they
+# are monitored, and you can view the emails that would have been sent from the web interface.
+[inbucket]
+enabled = true
+# Port to use for the email testing server web interface.
+port = 54324
+# Uncomment to expose additional ports for testing user applications that send emails.
+# smtp_port = 54325
+# pop3_port = 54326
+
+[storage]
+enabled = true
+# The maximum file size allowed (e.g. "5MB", "500KB").
+file_size_limit = "50MiB"
+
+[storage.image_transformation]
+enabled = true
+
+[auth]
+enabled = true
+# The base URL of your website. Used as an allow-list for redirects and for constructing URLs used
+# in emails.
+site_url = "http://127.0.0.1:3000"
+# A list of *exact* URLs that auth providers are permitted to redirect to post authentication.
+additional_redirect_urls = ["https://127.0.0.1:3000"]
+# How long tokens are valid for, in seconds. Defaults to 3600 (1 hour), maximum 604,800 (1 week).
+jwt_expiry = 3600
+# If disabled, the refresh token will never expire.
+enable_refresh_token_rotation = true
+# Allows refresh tokens to be reused after expiry, up to the specified interval in seconds.
+# Requires enable_refresh_token_rotation = true.
+refresh_token_reuse_interval = 10
+# Allow/disallow new user signups to your project.
+enable_signup = true
+# Allow/disallow anonymous sign-ins to your project.
+enable_anonymous_sign_ins = false
+# Allow/disallow testing manual linking of accounts
+enable_manual_linking = false
+
+[auth.email]
+# Allow/disallow new user signups via email to your project.
+enable_signup = true
+# If enabled, a user will be required to confirm any email change on both the old, and new email
+# addresses. If disabled, only the new email is required to confirm.
+double_confirm_changes = true
+# If enabled, users need to confirm their email address before signing in.
+enable_confirmations = false
+
+# Uncomment to customize email template
+# [auth.email.template.invite]
+# subject = "You have been invited"
+# content_path = "./supabase/templates/invite.html"
+
+[auth.sms]
+# Allow/disallow new user signups via SMS to your project.
+enable_signup = true
+# If enabled, users need to confirm their phone number before signing in.
+enable_confirmations = false
+# Template for sending OTP to users
+template = "Your code is {{ .Code }} ."
+
+# Use pre-defined map of phone number to OTP for testing.
+# [auth.sms.test_otp]
+# 4152127777 = "123456"
+
+# This hook runs before a token is issued and allows you to add additional claims based on the authentication method used.
+# [auth.hook.custom_access_token]
+# enabled = true
+# uri = "pg-functions://<database>/<schema>/<hook_name>"
+
+# Configure one of the supported SMS providers: `twilio`, `twilio_verify`, `messagebird`, `textlocal`, `vonage`.
+[auth.sms.twilio]
+enabled = false
+account_sid = ""
+message_service_sid = ""
+# DO NOT commit your Twilio auth token to git. Use environment variable substitution instead:
+auth_token = "env(SUPABASE_AUTH_SMS_TWILIO_AUTH_TOKEN)"
+
+# Use an external OAuth provider. The full list of providers are: `apple`, `azure`, `bitbucket`,
+# `discord`, `facebook`, `github`, `gitlab`, `google`, `keycloak`, `linkedin_oidc`, `notion`, `twitch`,
+# `twitter`, `slack`, `spotify`, `workos`, `zoom`.
+[auth.external.apple]
+enabled = false
+client_id = ""
+# DO NOT commit your OAuth provider secret to git. Use environment variable substitution instead:
+secret = "env(SUPABASE_AUTH_EXTERNAL_APPLE_SECRET)"
+# Overrides the default auth redirectUrl.
+redirect_uri = ""
+# Overrides the default auth provider URL. Used to support self-hosted gitlab, single-tenant Azure,
+# or any other third-party OIDC providers.
+url = ""
+# If enabled, the nonce check will be skipped. Required for local sign in with Google auth.
+skip_nonce_check = false
+
+[analytics]
+enabled = false
+port = 54327
+vector_port = 54328
+# Configure one of the supported backends: `postgres`, `bigquery`.
+backend = "postgres"
+
+# Experimental features may be deprecated any time
+[experimental]
+# Configures Postgres storage engine to use OrioleDB (S3)
+orioledb_version = ""
+# Configures S3 bucket URL, eg. <bucket_name>.s3-<region>.amazonaws.com
+s3_host = "env(S3_HOST)"
+# Configures S3 bucket region, eg. us-east-1
+s3_region = "env(S3_REGION)"
+# Configures AWS_ACCESS_KEY_ID for S3 bucket
+s3_access_key = "env(S3_ACCESS_KEY)"
+# Configures AWS_SECRET_ACCESS_KEY for S3 bucket
+s3_secret_key = "env(S3_SECRET_KEY)"

From 7e8bd5532f63bcf53d9711ef157614e4803ade1e Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 11:20:42 +0200
Subject: [PATCH 048/314] chore: .env.local gitignore

---
 .gitignore                | 1 -
 flutter_common/.gitignore | 3 +++
 flutter_common/.pubignore | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 31b83767e..281657cd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -146,7 +146,6 @@ pubspec_overrides.yaml
 # Selfhost
 backup/
 .cli_config
-flutter_common/lib/envs/.env.local
 
 # generated git project files
 generated/
diff --git a/flutter_common/.gitignore b/flutter_common/.gitignore
index f4c20d328..5c0ffeb33 100644
--- a/flutter_common/.gitignore
+++ b/flutter_common/.gitignore
@@ -140,3 +140,6 @@ app.*.symbols
 # +++ CUSTOM ADDITIONS +++
 
 !*.lock
+
+# Selfhost
+lib/envs/.env.local
diff --git a/flutter_common/.pubignore b/flutter_common/.pubignore
index 5146cc77c..0943dab83 100644
--- a/flutter_common/.pubignore
+++ b/flutter_common/.pubignore
@@ -1,3 +1,4 @@
 !.env
 !.env.dev
 !.env.local
+!.env.local.example

From 4a2c518fe0a20dcaec798e6ebda733e01d7e48fb Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 11:37:21 +0200
Subject: [PATCH 049/314] ci: e2e supabase fix

---
 .github/workflows/e2e_tests.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
index 862d36ca2..33b9a7920 100644
--- a/.github/workflows/e2e_tests.yml
+++ b/.github/workflows/e2e_tests.yml
@@ -37,10 +37,9 @@ jobs:
 
       - name: Prepare environment
         run: |
+          dart pub get
           dart pub global activate melos
           melos bootstrap
-          dart pub get
-          cp docker/supabase/.env.example docker/supabase/.env
           cp flutter_common/lib/envs/.env.local.example flutter_common/lib/envs/.env.local
 
       - name: Set up Supabase CLI

From b27d9c6fae13b22fcd4907ca7a69685c3c698474 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 11:46:51 +0200
Subject: [PATCH 050/314] ci: lock flutter version

---
 .github/workflows/init-workspace/action.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/init-workspace/action.yml b/.github/workflows/init-workspace/action.yml
index 063a853c1..42d8c8d42 100644
--- a/.github/workflows/init-workspace/action.yml
+++ b/.github/workflows/init-workspace/action.yml
@@ -9,12 +9,17 @@ runs:
       uses: subosito/flutter-action@v2
       with:
         channel: stable
+        # Increase this version manually when we add support for a new Flutter release
+        version: '3.19.6'
+
     - name: Install melos
       run: dart pub global activate melos
       shell: bash
+
     - name: Bootstrap workspace
       run: melos bootstrap
       shell: bash
+
     - name: Dart pub root project
       run: dart pub get
       shell: bash

From 06ac1d3251d3acb325530a5a01769b10c7ea7b47 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 11:51:26 +0200
Subject: [PATCH 051/314] asd

---
 .github/workflows/e2e_tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
index 33b9a7920..fdae9210c 100644
--- a/.github/workflows/e2e_tests.yml
+++ b/.github/workflows/e2e_tests.yml
@@ -50,12 +50,13 @@ jobs:
       - name: Prepare database seed
         run: |
           cat database/studyu-schema.sql > docker/supabase/seed.sql
-          cat database/app_config.sql.example >> docker/supabase/seed.sql
+          mv database/app_config.sql.example docker/supabase/migrations/0000000000001_app_config_mockup.sql
 
       - name: Start Supabase database
         working-directory: docker
         run: |
           supabase db start
+          supabase migration up
 
       - name: Start Chrome Driver
         run: |

From db69df825e70c4b7aedad60574aa1c33363edd81 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 15:51:55 +0200
Subject: [PATCH 052/314] asd

---
 .github/workflows/e2e_tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
index fdae9210c..8224123bc 100644
--- a/.github/workflows/e2e_tests.yml
+++ b/.github/workflows/e2e_tests.yml
@@ -50,6 +50,7 @@ jobs:
       - name: Prepare database seed
         run: |
           cat database/studyu-schema.sql > docker/supabase/seed.sql
+          mkdir -p docker/supabase/migrations
           mv database/app_config.sql.example docker/supabase/migrations/0000000000001_app_config_mockup.sql
 
       - name: Start Supabase database

From 84b59eadfc0863700d3dc37cd60361ca5f0bf62e Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 15:52:45 +0200
Subject: [PATCH 053/314] asd

---
 .github/workflows/init-workspace/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/init-workspace/action.yml b/.github/workflows/init-workspace/action.yml
index 42d8c8d42..5b4d32b82 100644
--- a/.github/workflows/init-workspace/action.yml
+++ b/.github/workflows/init-workspace/action.yml
@@ -10,7 +10,7 @@ runs:
       with:
         channel: stable
         # Increase this version manually when we add support for a new Flutter release
-        version: '3.19.6'
+        flutter-version: '3.19.6'
 
     - name: Install melos
       run: dart pub global activate melos

From 1c10082c704077b7f958154a47902e6fa41f7b68 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 16:11:21 +0200
Subject: [PATCH 054/314] schema migration

---
 .github/workflows/e2e_tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
index 8224123bc..303eaf74c 100644
--- a/.github/workflows/e2e_tests.yml
+++ b/.github/workflows/e2e_tests.yml
@@ -51,7 +51,8 @@ jobs:
         run: |
           cat database/studyu-schema.sql > docker/supabase/seed.sql
           mkdir -p docker/supabase/migrations
-          mv database/app_config.sql.example docker/supabase/migrations/0000000000001_app_config_mockup.sql
+          mv database/studyu-schema.sql docker/supabase/migrations/0000000000001_studyu-schema.sql
+          mv database/app_config.sql.example docker/supabase/migrations/0000000000002_app_config_mockup.sql
 
       - name: Start Supabase database
         working-directory: docker

From 9361d990dda1d0fd8e3efc33775cd01c245d8128 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 16:55:56 +0200
Subject: [PATCH 055/314] schema migration

---
 .github/workflows/e2e_tests.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
index 303eaf74c..b437cb29e 100644
--- a/.github/workflows/e2e_tests.yml
+++ b/.github/workflows/e2e_tests.yml
@@ -47,9 +47,8 @@ jobs:
         with:
           version: latest
 
-      - name: Prepare database seed
+      - name: Prepare database migrations
         run: |
-          cat database/studyu-schema.sql > docker/supabase/seed.sql
           mkdir -p docker/supabase/migrations
           mv database/studyu-schema.sql docker/supabase/migrations/0000000000001_studyu-schema.sql
           mv database/app_config.sql.example docker/supabase/migrations/0000000000002_app_config_mockup.sql

From c65b8006e9d0a1ca923b50e455913f06a8098eea Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 23:36:09 +0200
Subject: [PATCH 056/314] chore: remove cli

---
 studyu | 1919 --------------------------------------------------------
 1 file changed, 1919 deletions(-)
 delete mode 100755 studyu

diff --git a/studyu b/studyu
deleted file mode 100755
index a8db389c8..000000000
--- a/studyu
+++ /dev/null
@@ -1,1919 +0,0 @@
-#!/usr/bin/env bash
-
-# This script is a CLI for the StudyU project and wraps the Docker Compose commands.
-# It can be used to start and stop the StudyU components and to configure the deployment settings.
-# It also provides a way to create a configuration file to store the deployment settings.
-# The configuration file is located at .cli_config in the same directory as this script.
-
-# multiselect does not work with "set -e"
-set -o pipefail
-
-if [[ "$(head -c 1 <<< "$BASH_VERSION")" -lt 4 ]]; then
-    echo "Bash version equal or larger than 4 is required to run this script."
-    exit 1
-fi
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-# Color codes for better output
-red='\e[0;31m'
-green='\e[0;32m'
-yellow='\e[1;33m'
-blue='\e[1;34m'
-purple='\e[0;35m'
-bold='\e[1m'
-reset='\e[0m'
-
-# Configuration file path
-# Check if the STUDYU_CONFIG_FILE environment variable is set
-if [ -n "$STUDYU_CONFIG_FILE" ]; then
-    CONFIG_FILE="$STUDYU_CONFIG_FILE"
-else
-    # Otherwise, fallback to the hardcoded path
-    CONFIG_FILE="$SCRIPT_DIR/.cli_config"
-fi
-
-# Dictionary to map components to Docker Compose files
-declare -A compose_files=(
-  ["supabase-db"]="supabase/docker-compose-db.yml"
-  ["supabase"]="supabase/docker-compose.yml"
-  ["studyu-app"]="studyu/docker-compose-app.yml"
-  ["studyu-designer"]="studyu/docker-compose-designer.yml"
-  ["studyu-proxy"]="proxy/docker-compose-proxy.yml"
-)
-
-declare -A component_descriptions=(
-  #["studyu-proxy"]="Necessary to access the components"
-  #["supabase-db"]="Database storing the Supabase data"
-  ["supabase"]="Supabase provides authentication and storage capabilities for StudyU"
-  ["studyu-app"]="StudyU App (partake in digital studies)"
-  ["studyu-designer"]="StudyU Designer (create and manage studies)"
-)
-
-declare -A default_component_values=(
-  #["studyu-proxy"]="true"
-  #["supabase-db"]="true"
-  ["supabase"]="true"
-  ["studyu-app"]="true"
-  ["studyu-designer"]="true"
-)
-
-postgres_container_name="supabase-db"
-postgres_username="postgres"
-#database_name="your_database_name"
-
-# Calculate the maximum length of the keys for formatting
-max_length=0
-for key in "${!component_descriptions[@]}"; do
-  length=${#key}
-  if ((length > max_length)); then
-    max_length=$length
-  fi
-done
-
-selectable_components="${bold}Selectable components:${reset}\n"
-for key in "${!component_descriptions[@]}"; do
-  value="${component_descriptions[$key]}"
-  spaces=$(printf "%*s" $((max_length - ${#key})) "")
-  formatted_component="  $key$spaces   $value\n"
-  selectable_components+="$formatted_component"
-done
-selectable_components+="All components should be specified as a space-separated list. If no components are specified, the default components will be used."
-
-
-# Function to generate a JWT token for Supabase
-# Usage: generate_supabase_jwt <role> <secret>
-generate_supabase_jwt() {
-  local role="${1}"
-  local secret="${2}"
-  # Number of seconds for token to expire. Defaults to 5 years (in seconds) as per Supabase docs
-  local expire_seconds="${3:-31536000}"
-
-  local header_base64
-  local payload_base64
-  local signed_content
-  local signature
-
-  if [ -z "$role" ] || [ -z "$secret" ]; then
-    echo -e "${red}Error: Role and secret must be specified.${reset}"
-    exit 1
-  fi
-
-  # pass JWT_SECRET_BASE64_ENCODED as true if secret is base64 encoded
-  ${JWT_SECRET_BASE64_ENCODED:-false} && \
-    JWT_SECRET=$(printf %s "$JWT_SECRET" | base64 --decode)
-
-  header='{
-    "alg": "HS256",
-    "typ": "JWT"
-  }'
-
-  payload="{
-    \"role\": \"$role\",
-    \"iss\": \"supabase\",
-    \"iat\": $(date +%s),
-    \"exp\": $(($(date +%s) + expire_seconds))
-  }"
-
-  header_base64=$(printf %s "$header" | base64_urlencode)
-  payload_base64=$(printf %s "$payload" | base64_urlencode)
-  signed_content="${header_base64}.${payload_base64}"
-  signature=$(printf %s "$signed_content" | openssl dgst -binary -sha256 -hmac "$secret" | base64_urlencode)
-
-  echo "${signed_content}.${signature}"
-}
-
-base64_urlencode() { openssl enc -base64 -A | tr '+/' '-_' | tr -d '='; }
-
-
-# https://unix.stackexchange.com/questions/146570/arrow-key-enter-menu/673436#673436
-function multiselect {
-  # little helpers for terminal print control and key input
-  ESC=$( printf "\033")
-  cursor_blink_on()   { printf "%s" "${ESC}[?25h"; }
-  cursor_blink_off()  { printf "%s" "${ESC}[?25l"; }
-  cursor_to()         { printf "%s" "${ESC}[$1;${2:-1}H"; }
-  # shellcheck disable=SC2059
-  print_inactive()    { printf "$2   $1 "; }
-  # shellcheck disable=SC2059
-  print_active()      { printf "$2  ${ESC}[7m $1 ${ESC}[27m"; }
-  # shellcheck disable=SC2034
-  get_cursor_row()    { IFS=';' read -srdR -p $'\E[6n' ROW COL; echo "${ROW#*[}"; }
-
-  local return_value=$1
-  local -n options=$2
-  local -n defaults=$3
-
-  local selected=()
-  for ((i=0; i<${#options[@]}; i++)); do
-      if [[ ${defaults[i]} = "true" ]]; then
-        selected+=("true")
-      else
-          selected+=("false")
-      fi
-      printf "\n"
-  done
-
-  # determine current screen position for overwriting the options
-  local lastrow
-  lastrow=$(get_cursor_row)
-  local startrow
-  startrow=$((lastrow - ${#options[@]}))
-
-  # ensure cursor and input echoing back on upon a ctrl+c during read -s
-  trap "cursor_blink_on; stty echo; printf '\n'; exit" 2
-  cursor_blink_off
-
-  key_input() {
-      local key
-      IFS= read -rsn1 key 2>/dev/null >&2
-      if [[ $key = ""      ]]; then echo enter; fi;
-      if [[ $key = $'\x20' ]]; then echo space; fi;
-      if [[ $key = "k" ]]; then echo up; fi;
-      if [[ $key = "j" ]]; then echo down; fi;
-      if [[ $key = $'\x1b' ]]; then
-          read -rsn2 key
-          if [[ $key = [A || $key = k ]]; then echo up;    fi;
-          if [[ $key = [B || $key = j ]]; then echo down;  fi;
-      fi
-  }
-
-  toggle_option() {
-      local option=$1
-      if [[ ${selected[option]} == true ]]; then
-          selected[option]=false
-      else
-          selected[option]=true
-      fi
-  }
-
-  print_options() {
-      # print options by overwriting the last lines
-      local idx=0
-      for option in "${options[@]}"; do
-          local prefix="[ ]"
-          if [[ ${selected[idx]} == true ]]; then
-            prefix="[\e[38;5;46m✔\e[0m]"
-          fi
-
-          cursor_to $((startrow + idx))
-          if [ $idx -eq "$1" ]; then
-              print_active "$option" "$prefix"
-          else
-              print_inactive "$option" "$prefix"
-          fi
-          ((idx++))
-      done
-  }
-
-  local active=0
-  while true; do
-      print_options $active
-
-      # user key control
-      case $(key_input) in
-          space)  toggle_option $active;;
-          enter)  print_options -1; break;;
-          up)     ((active--));
-                  if [ $active -lt 0 ]; then active=$((${#options[@]} - 1)); fi;;
-          down)   ((active++));
-                  if [ "$active" -ge ${#options[@]} ]; then active=0; fi;;
-      esac
-  done
-
-  # cursor position back to normal
-  cursor_to "$lastrow"
-  printf "\n"
-  cursor_blink_on
-
-  eval "$return_value"='("${selected[@]}")'
-}
-
-
-remove_studyu_docker_images() {
-  local studyu_images
-  studyu_images=$(docker images -q 'studyu*')
-  if [ -n "$studyu_images" ]; then
-      for image in $studyu_images; do
-          docker rmi "$image" > /dev/null 2>&1
-      done
-  fi
-}
-
-
-source_env() {
-  env_path=$1
-  if [ ! -f "$env_path" ]; then
-    echo -e "${red}Error: File $env_path does not exist.${reset}"
-    exit 1
-  fi
-  # shellcheck disable=SC1090
-  source <(grep -vE '^\s*$|^\s*#' "$env_path")
-}
-
-
-# Function to prompt user with a yes/no question
-prompt_yes_no() {
-  local prompt_text="$1"
-  local response
-
-  while true; do
-    read -rp "$(echo -e "${purple}$prompt_text${reset} (y/n) ")" response
-    case $response in
-      [Yy]* ) return 0;; # Return true for yes
-      [Nn]* ) return 1;; # Return false for no
-      * ) echo "Please answer yes or no.";;
-    esac
-  done
-}
-
-
-prompt_remove() {
-read -rp "$(echo -e "${purple}Enter 'remove' to confirm your choice: ${reset}")" input
-  if [ "$input" == "remove" ]; then
-    return 0;
-  else
-    return 1;
-  fi
-}
-
-
-# Define regex patterns for validation
-# email_pattern="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$"
-# phone_pattern="^\+?[0-9]+$"
-# url_pattern="^[a-zA-Z0-9.-]+(.[a-zA-Z]{2,})?(:[0-9]{1,5})?(/.*)?$"
-# text_pattern="^[a-zA-Z]+$"
-number_pattern="^[0-9]+$"
-
-
-# Function to validate if a string matches a regex pattern
-is_valid_input() {
-  local input="$1"
-  local regex_pattern="$2"
-
-  if [[ $input =~ $regex_pattern ]]; then
-    return 0  # Valid input
-  else
-    return 1  # Invalid input
-  fi
-}
-
-
-# Function to update an environment variable in a file using sed
-update_env_variable() {
-  local file_path="$1"
-  local variable_name="$2"
-  local new_value="$3"
-  local pattern="$4"
-
-  if [ -z "$new_value" ] || { [ -n "$pattern" ] && ! is_valid_input "$new_value" "$pattern"; }; then
-    echo -e "${red}Error: Invalid new value for $variable_name.${reset}"
-    exit 1
-  fi
-
-  # Enclose the new value in double quotes if it's not already
-  if [[ "$new_value" != \"*\" ]]; then
-    new_value=\""$new_value"\"
-  fi
-
-  if [ -f "$file_path" ] && grep -q "^$variable_name=" "$file_path"; then
-    sed -i "/^$variable_name=/s|.*|$variable_name=$new_value|" "$file_path"
-  else
-    echo "$variable_name=$new_value" >> "$file_path"
-  fi
-}
-
-
-# Function to get an environment variable from a file
-get_env_variable() {
-  local file_path="$1"
-  local variable_name="$2"
-
-  if [ -f "$file_path" ] && grep -q "^$variable_name=" "$file_path"; then
-    local value
-    value=$(grep "^$variable_name=" "$file_path" | cut -d '=' -f2- | sed 's/^"\|"$//g')
-    echo "$value"
-  fi
-}
-
-
-# Function to generate a random string of variable length
-generate_random_string() {
-  local length="$1"
-  tr -dc 'a-z0-9' </dev/urandom | head -c "$length"
-  echo
-}
-
-
-# Function to prompt the user for input with validation
-prompt_with_validation() {
-  local prompt_text="$1"
-  local input_variable="$2"
-  local regex_pattern="$3"
-
-  while true; do
-    read -e -rp "$prompt_text: " -i "$input_variable" input_variable
-
-    # Check if input is not empty
-    if [[ -n "$input_variable" ]]; then
-      # If a regex pattern is provided, check for valid input
-      if [ -z "$regex_pattern" ] || is_valid_input "$input_variable" "$regex_pattern"; then
-        echo "$input_variable"
-        break
-      fi
-    fi
-  done
-}
-
-
-create_specific_env_file() {
-  local env_path="$1"
-  if [ ! -f "$env_path" ]; then
-    cp "$env_path.example" "$env_path"
-  fi
-  source_env "$env_path"
-  #else
-  #  echo -e "${red}Environment file already exists at $env_path${reset}"
-}
-
-
-generate_multilangual_json() {
-  local -n input_array="$1"
-  echo '{ "de": "'"${input_array[de]}"'", "en": "'"${input_array[en]}"'" }'
-}
-
-
-generate_contact_json() {
-  local -n input_array="$1"
-  echo '{ "email": "'"${input_array[email]}"'", "phone": "'"${input_array[phone]}"'", "website": "'"${input_array[website]}"'", "organization": "'"${input_array[organization]}"'" }'
-}
-
-
-prompt_multilingual() {
-  local prompt_text="$1"
-  local -n input_array="$2"
-
-  input_array["de"]=$(prompt_with_validation "$prompt_text (German)" "${input_array[de]}")
-  input_array["en"]=$(prompt_with_validation "$prompt_text (English)" "${input_array[en]}")
-}
-
-
-# Function to prompt user for contact information fields separately
-prompt_contact() {
-  local -n input_array_contact="$1"
-
-  input_array_contact["email"]=$(prompt_with_validation "Enter contact email" "${input_array_contact[email]}")
-  input_array_contact["phone"]=$(prompt_with_validation "Enter contact phone" "${input_array_contact[phone]}")
-  input_array_contact["website"]=$(prompt_with_validation "Enter contact website" "${input_array_contact[website]}")
-  input_array_contact["organization"]=$(prompt_with_validation "Enter contact organization" "${input_array_contact[organization]}")
-}
-
-# Function to read configuration values from the file
-read_config() {
-  local failOnError="${1:-true}"
-
-  # Check if the configuration file does not exist
-  if [[ ! -f "$CONFIG_FILE" ]]; then
-    if [[ "$failOnError" == false ]]; then
-      return 0
-    else
-      echo -e "${red}Error: Configuration file not found. Run '$0 config' to create one.${reset}"
-      exit 1
-    fi
-  fi
-
-  # Read the configuration file
-  source_env "$CONFIG_FILE"
-
-  # Check if the required variables are present
-  if [ "$failOnError" = true ] && { [ -z "$STUDYU_DEFAULT_COMPONENTS" ] || [ -z "$STUDYU_PATH" ] || [ -z "$STUDYU_BASE_BRANCH" ]; }; then
-    echo -e "${red}Error: Configuration file $CONFIG_FILE is missing some entries.${reset}"
-    echo "Run '$0 config' to set the required options."
-    exit 1
-  fi
-
-  studyu_env_path="$STUDYU_PATH/flutter_common/lib/envs/.env.local"
-  supabase_env_path="$STUDYU_PATH/docker/supabase/.env"
-  proxy_env_path="$STUDYU_PATH/docker/proxy/.env"
-
-  if [ "$failOnError" = true ]; then
-      cd "$STUDYU_PATH/docker/" || exit 1
-  else
-      cd "$STUDYU_PATH/docker/" 2>/dev/null || true
-  fi
-}
-
-
-# Print CLI configuration file
-# shellcheck disable=SC2120
-print_config() {
-  local failOnError="${1:-true}"
-  read_config "$failOnError"
-
-  # If the config file exists, display the current configuration
-  if [ -f "$CONFIG_FILE" ]; then
-    echo -e "${bold}Content of the StudyU CLI configuration file${reset}\n"
-    local tmp_file
-    tmp_file=$(mktemp)
-    for var in "${!STUDYU@}"; do
-      echo "$var:${!var}" >> "$tmp_file"
-    done
-    column -t -s ':' -c 2 "$tmp_file"
-    rm "$tmp_file"
-    echo ""
-    echo -e "Config file is located at $CONFIG_FILE"
-  fi
-}
-
-
-# Check if a component is running
-component_is_running() {
-  local component_name="$1"
-
-  if ! docker info &>/dev/null; then
-    echo "Docker daemon is not running."
-    exit 1
-  fi
-
-  # Check if the container is running using Docker ps command
-  local container_id
-  container_id=$(docker ps -q -f name="$component_name")
-
-  if [ -z "$container_id" ]; then
-    # The container is not running
-    return 1
-  else
-    # The container is running
-    return 0
-  fi
-}
-
-set_default_components() {
-  local default_components=("${!1}")
-
-  # Validate selected components
-  for component in "${default_components[@]}"; do
-    if [ ! ${compose_files[$component]+_} ]; then
-        echo -e "${red}Error: '$component' is not a valid component.${reset}"
-        exit 1
-    fi
-
-    # Check if component is "supabase" and add "supabase-db"
-    if [ "$component" == "supabase" ]; then
-      default_components+=("supabase-db")
-    fi
-
-    # Check if component matches "studyu*" and add "studyu-proxy"
-    if [[ "$component" == "supabase" || "$component" == "studyu"* ]]; then
-      default_components+=("studyu-proxy")
-    fi
-  done
-
-  # Remove duplicates from the array
-  mapfile -t default_components < <(printf "%s\n" "${default_components[@]}" | sort -u)
-
-  # echo "STUDYU_DEFAULT_COMPONENTS=\"${default_components[*]}\"" > "$CONFIG_FILE"
-  update_env_variable "$CONFIG_FILE" "STUDYU_DEFAULT_COMPONENTS" "${default_components[*]}"
-}
-
-set_studyu_path() {
-  local studyu_path="$1"
-  # Validate the existence of the path
-  if [ ! -d "$studyu_path" ]; then
-    echo -e "${red}Error: The specified path does not exist.${reset}"
-    exit 1
-  fi
-  #echo "STUDYU_PATH=\"$studyu_path\"" >> "$CONFIG_FILE"
-  update_env_variable "$CONFIG_FILE" "STUDYU_PATH" "$studyu_path"
-}
-
-set_studyu_base_branch() {
-  local base_branch="$1"
-  #echo "STUDYU_BASE_BRANCH=\"$base_branch\"" >> "$CONFIG_FILE"
-  update_env_variable "$CONFIG_FILE" "STUDYU_BASE_BRANCH" "$base_branch"
-}
-
-set_studyu_secrets_manager() {
-  local secrets_manager="$1"
-  # Set the secrets_manager in the configuration file only if it is not empty
-  if [ -n "$secrets_manager" ]; then
-    #echo "STUDYU_SECRETS_MANAGER=\"$secrets_manager\"" >> "$CONFIG_FILE"
-    update_env_variable "$CONFIG_FILE" "STUDYU_SECRETS_MANAGER" "$secrets_manager"
-  fi
-}
-
-declare -A supabase_secrets
-create_supabase_secrets() {
-  postgres_password=$(generate_random_string 40)
-  jwt_secret=$(generate_random_string 40)
-  dashboard_username=$(generate_random_string 20)
-  dashboard_password=$(generate_random_string 20)
-
-  anon_key=$(generate_supabase_jwt 'anon' "$jwt_secret")
-  service_role_key=$(generate_supabase_jwt 'service_role' "$jwt_secret")
-
-  supabase_secrets["POSTGRES_PASSWORD"]=$postgres_password
-  supabase_secrets["JWT_SECRET"]=$jwt_secret
-  supabase_secrets["DASHBOARD_USERNAME"]=$dashboard_username
-  supabase_secrets["DASHBOARD_PASSWORD"]=$dashboard_password
-  supabase_secrets["ANON_KEY"]=$anon_key
-  supabase_secrets["SERVICE_ROLE_KEY"]=$service_role_key
-}
-
-create_and_set_supabase_secrets() {
-  create_supabase_secrets
-  update_env_variable "$supabase_env_path" "POSTGRES_PASSWORD" "${supabase_secrets[POSTGRES_PASSWORD]}"
-  update_env_variable "$supabase_env_path" "JWT_SECRET" "${supabase_secrets[JWT_SECRET]}"
-  update_env_variable "$supabase_env_path" "ANON_KEY" "${supabase_secrets[ANON_KEY]}"
-  update_env_variable "$supabase_env_path" "SERVICE_ROLE_KEY" "${supabase_secrets[SERVICE_ROLE_KEY]}"
-  update_env_variable "$supabase_env_path" "DASHBOARD_USERNAME" "${supabase_secrets[DASHBOARD_USERNAME]}"
-  update_env_variable "$supabase_env_path" "DASHBOARD_PASSWORD" "${supabase_secrets[DASHBOARD_PASSWORD]}"
-}
-
-execute_sql_query() {
-  local sql_query="$1"
-  local result
-
-  if result=$(docker exec -i "$postgres_container_name" psql -U "$postgres_username" -tAc "$sql_query" | tr -d '\r'); then
-    return 0
-  else
-    echo -e "${red}Error executing SQL query.${reset}"
-    return 1
-  fi
-}
-
-check_app_config_empty() {
-  # Execute the query to count rows in the public.app_config table
-  local result
-  # we do not want to use execute_sql_query here because we need to check the exit status
-  result=$(docker exec -t "$postgres_container_name" psql -U "$postgres_username" -tAc "SELECT COUNT(*) FROM public.app_config;" | tr -d '\r')
-  if ! [[ "$result" =~ ^[0-9]+$ ]]; then
-    echo -e "${red}Error: Could not execute SQL query.${reset}"
-    exit 1
-  fi
-  if [ "$result" -eq 0 ]; then
-    echo 0  # Table is empty
-  else
-    echo 1  # Table is not empty
-  fi
-}
-
-
-configure_proxy_env() {
-  local force_reconfiguration="$1"
-  if [ -f "$proxy_env_path" ]; then
-    source_env "$proxy_env_path"
-    if [ "$force_reconfiguration" != true ]; then
-      return 0
-    fi
-  fi
-
-  if component_is_running 'studyu-proxy'; then
-    if prompt_yes_no "The proxy component needs to be stopped in order to configure it. Do you want to stop and remove it?"; then
-      down 'studyu-proxy'
-    else
-      echo -e "${red}Error: Cannot configure proxy while it is running.${reset}"
-      exit 1
-    fi
-  fi
-
-  create_specific_env_file "$proxy_env_path"
-  while true; do
-    echo -e "${purple}The StudyU components need a reverse proxy to be accessible. Which hostnames and ports do you want to use?${reset}"
-    echo "Hostnames only include the domain name, e.g. 'example.com' without 'https://'"
-    echo "Changing the default settings is only necessary if you want to use a custom hostname or port."
-    echo "If you do not plan to deploy one of the components, just leave the default settings."
-    STUDYU_APP_HOST=$(prompt_with_validation "Enter STUDYU_APP_HOST (hostname of the StudyU App)" "$STUDYU_APP_HOST")
-    STUDYU_APP_PORT=$(prompt_with_validation "Enter STUDYU_APP_PORT (port of the StudyU App)" "$STUDYU_APP_PORT" "$number_pattern")
-    STUDYU_DESIGNER_HOST=$(prompt_with_validation "Enter STUDYU_DESIGNER_HOST (hostname of the StudyU Designer)" "$STUDYU_DESIGNER_HOST")
-    STUDYU_DESIGNER_PORT=$(prompt_with_validation "Enter STUDYU_DESIGNER_PORT (port of the StudyU Designer)" "$STUDYU_DESIGNER_PORT" "$number_pattern")
-    STUDYU_SUPABASE_HOST=$(prompt_with_validation "Enter STUDYU_SUPABASE_HOST (hostname of the Supabase frontend)" "$STUDYU_SUPABASE_HOST")
-    STUDYU_SUPABASE_PORT=$(prompt_with_validation "Enter STUDYU_SUPABASE_PORT (port of the Supabase frontend)" "$STUDYU_SUPABASE_PORT" "$number_pattern")
-    echo -e "The StudyU deployment settings will be set as following:"
-    echo -e "  ${bold}STUDYU_APP_HOST=$STUDYU_APP_HOST${reset}"
-    echo -e "  ${bold}STUDYU_APP_PORT=$STUDYU_APP_PORT${reset}"
-    echo -e "  ${bold}STUDYU_DESIGNER_HOST=$STUDYU_DESIGNER_HOST${reset}"
-    echo -e "  ${bold}STUDYU_DESIGNER_PORT=$STUDYU_DESIGNER_PORT${reset}"
-    echo -e "  ${bold}STUDYU_SUPABASE_HOST=$STUDYU_SUPABASE_HOST${reset}"
-    echo -e "  ${bold}STUDYU_SUPABASE_PORT=$STUDYU_SUPABASE_PORT${reset}"
-    if prompt_yes_no "Do you want to apply these changes?"; then
-      update_env_variable "$proxy_env_path" "STUDYU_APP_HOST" "$STUDYU_APP_HOST"
-      update_env_variable "$proxy_env_path" "STUDYU_APP_PORT" "$STUDYU_APP_PORT"
-      update_env_variable "$proxy_env_path" "STUDYU_DESIGNER_HOST" "$STUDYU_DESIGNER_HOST"
-      update_env_variable "$proxy_env_path" "STUDYU_DESIGNER_PORT" "$STUDYU_DESIGNER_PORT"
-      update_env_variable "$proxy_env_path" "STUDYU_SUPABASE_HOST" "$STUDYU_SUPABASE_HOST"
-      update_env_variable "$proxy_env_path" "STUDYU_SUPABASE_PORT" "$STUDYU_SUPABASE_PORT"
-      echo -e "${green}Proxy settings have been stored at $proxy_env_path${reset}"
-      break
-    fi
-  done
-}
-
-
-configure_studyu_env() {
-  local force_reconfiguration="$1"
-  # this function depends on values from the proxy env
-  configure_proxy_env
-  if [ -f "$studyu_env_path" ]; then
-    source_env "$studyu_env_path"
-    if [ "$force_reconfiguration" != true ]; then
-      return 0
-    fi
-  fi
-
-  # If the StudyU components are running, ask the user if they want to down them
-  if component_is_running "studyu-app" || component_is_running "studyu-designer"; then
-    if prompt_yes_no "The StudyU components need to be stopped in order to configure them. Do you want to stop and remove them?"; then
-      local studyu_components=("studyu-app" "studyu-designer")
-      down "${studyu_components[@]}"
-    else
-      echo -e "${red}Error: Cannot configure Studyu components while they are running.${reset}"
-      exit 1
-    fi
-  fi
-
-  while true; do
-    echo -e "${purple}StudyU needs to connect to a Supabase instance for authentication and storage. Which Supabase instance do you want to use?${reset}"
-    PS3='Select an option: '
-    options=("Self-hosted Supabase (using this CLI)" "Default StudyU Supabase" "Use an external StudyU Supabase instance" "Exit")
-    select opt in "${options[@]}"
-    do
-      case $opt in
-        "${options[0]}")
-          if [ -f "$supabase_env_path" ]; then
-            source_env "$supabase_env_path"
-            anon_key="$ANON_KEY"
-          fi
-          if [ -z "$anon_key" ]; then
-           echo -e "${yellow}You need to configure the 'supabase' component first. Run '$0 config' and add 'supabase' to the list of default components. Afterwards run '$0 start'.${reset}"
-           continue
-          fi
-          local supabase_protocol
-          echo -e "${purple}Which protocol should be used to access ${reset}${bold}Supabase${reset}${purple}? Please note that using http is highly insecure in a production environment. If you do not deploy your own SSL reverse proxy, just select http as a default.${reset}"
-          PS3='Select a protocol for Supabase: '
-          options=("http" "https")
-          select opt in "${options[@]}"
-          do
-            case $opt in
-              "${options[0]}")
-                supabase_protocol='http'
-                break
-                ;;
-              "${options[1]}")
-                supabase_protocol='https'
-                break
-                ;;
-              *) echo "Invalid option \"$REPLY\". Please enter the number of your option.";;
-            esac
-          done
-          studyu_supabase_url="$supabase_protocol://$STUDYU_SUPABASE_HOST:$STUDYU_SUPABASE_PORT"
-          break
-          ;;
-        "${options[1]}")
-          default_default_env_path="$SCRIPT_DIR/flutter_common/lib/envs/.env"
-          source_env "$default_default_env_path"
-          # shellcheck disable=SC2153
-          studyu_supabase_url="$STUDYU_SUPABASE_URL"
-          anon_key="$STUDYU_SUPABASE_PUBLIC_ANON_KEY"
-          break
-          ;;
-        "${options[2]}")
-          studyu_supabase_url=$(prompt_with_validation "Enter STUDYU_SUPABASE_URL" "$studyu_supabase_url")
-          anon_key=$(prompt_with_validation "Enter ANON_KEY" "$anon_key")
-          break
-          ;;
-        "${options[3]}")
-          exit 0
-          ;;
-        *) echo "Invalid option \"$REPLY\". Please enter the number of your option.";;
-      esac
-    done
-
-    local studyu_protocol
-    echo -e "${purple}Which protocol should be used to access ${reset}${bold}StudyU${reset}${purple}? Please note that using http is highly insecure in a production environment. If you do not deploy your own SSL reverse proxy, just select http as a default.${reset}"
-    PS3='Select a protocol for StudyU: '
-    options=("http" "https")
-    select opt in "${options[@]}"
-    do
-      case $opt in
-        "${options[0]}")
-          studyu_protocol='http'
-          break
-          ;;
-        "${options[1]}")
-          studyu_protocol='https'
-          break
-          ;;
-        *) echo "Invalid option \"$REPLY\". Please enter the number of your option.";;
-      esac
-    done
-
-    studyu_app_url="$studyu_protocol://$STUDYU_APP_HOST:$STUDYU_APP_PORT"
-    studyu_designer_url="$studyu_protocol://$STUDYU_DESIGNER_HOST:$STUDYU_DESIGNER_PORT"
-
-    echo -e "The StudyU settings will be set as following:"
-    echo -e "  ${bold}STUDYU_SUPABASE_URL${reset}=$studyu_supabase_url"
-    echo -e "  ${bold}STUDYU_SUPABASE_PUBLIC_ANON_KEY${reset}=$anon_key"
-    echo -e "  ${bold}STUDYU_APP_URL${reset}=$studyu_app_url"
-    echo -e "  ${bold}STUDYU_DESIGNER_URL${reset}=$studyu_designer_url"
-    if prompt_yes_no "Do you want to apply these changes?"; then
-      create_specific_env_file "$studyu_env_path"
-      update_env_variable "$studyu_env_path" "STUDYU_SUPABASE_URL" "$studyu_supabase_url"
-      update_env_variable "$studyu_env_path" "STUDYU_SUPABASE_PUBLIC_ANON_KEY" "$anon_key"
-      update_env_variable "$studyu_env_path" "STUDYU_APP_URL" "$studyu_app_url"
-      update_env_variable "$studyu_env_path" "STUDYU_DESIGNER_URL" "$studyu_designer_url"
-      echo -e "${green}StudyU settings have been stored at $studyu_env_path${reset}"
-      source_env "$studyu_env_path"
-      break;
-    fi
-  done
-}
-
-
-# Function to set configuration options
-configure() {
-  read_config false
-
-  # Start the interactive configuration process
-  echo -e "${bold}StudyU CLI Configurator${reset}"
-  echo -e "Leave fields blank to use default settings.\n"
-
-  # STUDYU_DEFAULT_COMPONENTS
-  echo -e "${purple}Select the components that should be managed when none are explicitly defined.${reset}"
-  echo -e "Multiselect help:"
-  echo -e "  j or ↓ => Go down";
-  echo -e "  k or ↑ => Go up";
-  echo -e "  ␣ (Space) => Toggle selection";
-  echo -e "  ↵ (Enter) => Confirm selection\n";
-  local key_array=("${!component_descriptions[@]}")
-  #for key in "${!component_descriptions[@]}"; do
-  #  multi_options+=("${bold}$key${reset} - ${component_descriptions[$key]}")
-  #done
-
-  # Set default components to all components if STUDYU_DEFAULT_COMPONENTS is empty
-  # else use STUDYU_DEFAULT_COMPONENTS
-  local user_selected_components=("${default_component_values[@]}")
-  if [ -n "$STUDYU_DEFAULT_COMPONENTS" ]; then
-    user_selected_components=()
-    for key in "${!component_descriptions[@]}"; do
-      if [[ " ${STUDYU_DEFAULT_COMPONENTS[*]} " =~ $key ]]; then
-        user_selected_components+=("true")
-      else
-        user_selected_components+=("false")
-      fi
-    done
-  fi
-
-  multiselect result key_array user_selected_components
-
-  # Set default components to the selected components
-  for ((index=0; index<${#key_array[@]}; index++)); do
-    key=${key_array[$index]}
-    if [[ "${result[index]}" == true ]]; then
-        default_components+=("$key")
-    fi
-  done
-
-  set_default_components default_components[@]
-
-  # STUDYU_PATH
-  studyu_path=${STUDYU_PATH:-$SCRIPT_DIR}
-  read -i "$studyu_path" -e -rp "$(echo -e "${purple}Enter the path to the StudyU directory${reset} (default: $SCRIPT_DIR): ")" studyu_path
-  studyu_path=${studyu_path:-$SCRIPT_DIR}
-
-  set_studyu_path "$studyu_path"
-
-  # STUDYU_BASE_BRANCH
-  # Set base branch to STUDYU_BASE_BRANCH, if empty to current branch, if empty to main
-  current_branch=$(cd "$studyu_path" && git rev-parse --abbrev-ref HEAD)
-  base_branch=${STUDYU_BASE_BRANCH:-$current_branch}
-  base_branch=${base_branch:-'main'}
-  read -i "$base_branch" -e -rp "$(echo -e "${purple}Enter the StudyU repository base branch for updating${reset} (default: main): ")" base_branch
-  base_branch=${base_branch:-'main'}
-
-  set_studyu_base_branch "$base_branch"
-
-  # STUDYU_SECRETS_MANAGER
-  secrets_manager=${STUDYU_SECRETS_MANAGER:-''}
-  read -i "$secrets_manager" -e -rp "$(echo -e "${purple}Enter an optional secrets manager to run with "\''docker compose'\'"${reset} (default: empty): ")" secrets_manager
-  secrets_manager=${secrets_manager:-''}
-
-  set_studyu_secrets_manager "$secrets_manager"
-
-  echo -e "${green}Configuration written to $CONFIG_FILE${reset}"
-}
-
-
-# Run docker compose command with optional secrets manager prefix
-run_docker_compose() {
-  local file="$1"
-  local action="$2"
-  # todo support this
-  # local verbose="$3"
-
-  # If STUDYU_SECRETS_MANAGER is not empty, use it as the prefix for the Docker Compose command
-  local compose_command="docker compose -f $file $action"
-  if [ -n "$STUDYU_SECRETS_MANAGER" ]; then
-    compose_command="$STUDYU_SECRETS_MANAGER $compose_command"
-  fi
-
-  # Execute the Docker Compose command
-  # if [ "$verbose" == "--verbose" ]; then
-  $compose_command
-  # else
-  #  $compose_command >/dev/null 2>&1
-  # fi
-
-  # Check the exit status of the Docker Compose command and return an error if it failed
-  local exit_status=$?
-  if [ "$exit_status" -ne 0 ]; then
-    echo -e "${red}Error: Docker Compose command failed with exit status $exit_status.${reset}"
-    # echo -e "Run with --verbose for more information."
-    exit "$exit_status"
-  fi
-}
-
-clean_flag=false
-build_flag=false
-init_database_flag=false
-init_custom_database_path=''
-
-# Run given docker compose commands such as start/restart/stop
-manage_components() {
-  local action=$1
-  shift
-  components=$*
-
-  local supabase_installation_success=false
-
-  if [ "$clean_flag" = true ]; then
-    echo -e "${yellow}Option -c detected. Orphan containers will be cleaned up.${reset}"
-    action+=' --remove-orphans'
-  fi
-
-  # If no components are specified, use the default components
-  if [ -z "${components[*]}" ]; then
-    components=("$STUDYU_DEFAULT_COMPONENTS")
-  fi
-
-  # Check if the components are valid
-  for component in ${components[*]}; do
-    local compose_file="${compose_files[$component]}"
-    if [ -z "$compose_file" ]; then
-      echo -e "${red}Error: Invalid component '$component'${reset}"
-      echo -e "$selectable_components"
-      exit 1;
-    fi
-  done
-
-  # Sort components by their order in the compose_files array
-  sorted_components=()
-  for key in "${!compose_files[@]}"; do
-    if [[ " ${components[*]} " =~ $key ]]; then
-      sorted_components+=("$key")
-    fi
-  done
-  components=("${sorted_components[@]}")
-
-  # Loop through the components and run the Docker Compose command
-  for component in ${components[*]}; do
-    local component_specific_action=''
-    compose_file="${compose_files[$component]}"
-
-    echo -e "${blue}Action: $action${reset}"
-    echo -e "${blue}Component: $component${reset}"
-
-    case "$action" in
-      "up"* )
-        case "$component" in
-          "supabase"*)
-            if [ ! -f "$supabase_env_path" ]; then
-              echo -e "${green}Created a default Supabase env at $supabase_env_path${reset}"
-              echo -e "Supabase needs some secrets to ensure a secure usage. Read more about it here: https://supabase.com/docs/guides/functions/secrets"
-              if prompt_yes_no "Do you want to create these secrets automatically?"; then
-                create_specific_env_file "$supabase_env_path"
-                create_and_set_supabase_secrets
-                echo -e "${green}Generated secrets have been stored in $supabase_env_path${reset}"
-                supabase_installation_success=true
-              else
-                create_specific_env_file "$supabase_env_path"
-                echo -e "Please open the Supabase env file and modify the default secrets by yourself."
-                echo -e "The file is located at $supabase_env_path"
-                echo -e "Have a look at the Supabase documentation if you need any help: https://supabase.com/docs/guides/self-hosting/docker#securing-your-services"
-                echo -e "Afterwards start the components again."
-                exit 0
-              fi
-            fi
-            ;;
-          "studyu-proxy")
-            configure_proxy_env
-          ;;
-          "studyu-app" | "studyu-designer")
-            if [ "$build_flag" = true ]; then
-              echo -e "${yellow}Option -b detected. StudyU components will be built.${reset}"
-              component_specific_action+=' --build'
-            fi
-            configure_studyu_env
-          ;;
-        esac
-        ;;
-      "restart" )
-        ;;
-      "stop" )
-        ;;
-      "down"* )
-        ;;
-      * )
-        echo -e "${red}Error: Invalid action '$action'${reset}"
-        exit 1
-        ;;
-    esac
-
-    run_docker_compose "$compose_file" "$action""$component_specific_action"
-  done
-  # if action is up or restart, wait for components to be running
-  if [[ "$action" == "up"* ]] || [[ "$action" == "restart" ]]; then
-    for component in ${components[*]}; do
-      #until docker inspect --format '{{json .State.Status }}' "$component" | grep -q "running"; do
-      #  echo "Waiting for $component to be running..."
-      #  sleep 3
-      #done
-
-      run_msg="🎉 $component is running"
-      case "$component" in
-        "studyu-proxy")
-          ;;
-        "supabase-db")
-          # check if container is healthy
-          until docker inspect --format '{{json .State.Health.Status }}' "$component" | grep -q "healthy"; do
-            echo "Waiting for $component to be healthy..."
-            sleep 3
-          done
-
-          # Check if the result is zero (table is empty)
-          if [ "$(check_app_config_empty)" -eq 0 ]; then
-            if [ "$init_database_flag" = true ]; then
-              if [ -n "$init_custom_database_path" ]; then
-                app_config_sql_path="$init_custom_database_path"
-              else
-                app_config_sql_path="$STUDYU_PATH/database/app_config.sql.example"
-              fi
-              if [ -f "$app_config_sql_path" ]; then
-                if result=$(execute_sql_query "$(cat "$app_config_sql_path")"); then
-                  echo -e "${green}Successfully initialized the database with $app_config_sql_path${reset}"
-                  break
-                else
-                  echo -e "${red}Error: Failed to initialize the database with $app_config_sql_path${reset}"
-                  echo "$result"
-                  echo -e "Here is the SQL query for you to insert it manually:"
-                  cat "$app_config_sql_path"
-                  break
-                fi
-              else
-                echo -e "${red}Error: Could not locate the database file at $app_config_sql_path${reset}"
-                exit 1
-              fi
-            else
-              echo -e "Some basic information must be obtained in order to identify this StudyU instance. The information will be visible to all users of the StudyU App and StudyU Designer within this instance."
-
-              # shellcheck disable=SC2034
-              local -A app_privacy
-              # shellcheck disable=SC2034
-              local -A app_terms
-              # shellcheck disable=SC2034
-              local -A designer_privacy
-              # shellcheck disable=SC2034
-              local -A designer_terms
-              # shellcheck disable=SC2034
-              local -A imprint
-              # shellcheck disable=SC2034
-              local -A contact
-
-              while true; do
-                # Prompt for values with basic validation
-                id='prod'
-
-                prompt_multilingual "Enter a URL to the privacy policy for the StudyU App" app_privacy
-                prompt_multilingual "Enter a URL to the terms of use for the StudyU App" app_terms
-                prompt_multilingual "Enter a URL to the privacy policy for the StudyU Designer" designer_privacy
-                prompt_multilingual "Enter a URL to the terms of use for the StudyU Designer" designer_terms
-                prompt_multilingual "Enter a URL to the legal notice for StudyU" imprint
-                prompt_contact contact
-
-                analytics='{ "dsn": "example", "enabled": false, "samplingRate": 0 }'
-
-                app_privacy_json=$(generate_multilangual_json app_privacy)
-                app_terms_json=$(generate_multilangual_json app_terms)
-                designer_privacy_json=$(generate_multilangual_json designer_privacy)
-                designer_terms_json=$(generate_multilangual_json designer_terms)
-                imprint_json=$(generate_multilangual_json imprint)
-                contact_json=$(generate_contact_json contact)
-
-                # Construct the SQL query
-                sql_query=("  INSERT INTO public.app_config (id, app_privacy, app_terms, designer_privacy, designer_terms, imprint, contact, analytics)"
-                  "  VALUES ("
-                  "    '$id',"
-                  "    '$app_privacy_json',"
-                  "    '$app_terms_json',"
-                  "    '$designer_privacy_json',"
-                  "    '$designer_terms_json',"
-                  "    '$imprint_json',"
-                  "    '$contact_json',"
-                  "    '$analytics'"
-                  "  );"
-                )
-                echo -e "The following SQL query will be executed to insert the app_config:"
-                printf "%s\n" "${sql_query[@]}"
-
-                # Prompt user to confirm the generated SQL query
-                if prompt_yes_no "Are you happy with your inputs to insert them into the database?"; then
-                  if result=$(execute_sql_query "${sql_query[*]}"); then
-                    # Success
-                    break
-                  else
-                    echo -e "${red}Error: Failed to insert app_config.${reset}"
-                    echo "$result"
-                    echo -e "Here is the generated SQL query for you again to insert it manually by running '$0 env supabase --init-database <path>'"
-                    echo "${sql_query[*]}"
-                    break
-                  fi
-                fi
-              done
-            fi
-          fi
-          if [ -f "$studyu_env_path" ] && [ -f "$supabase_env_path" ]; then
-            source_env "$studyu_env_path"
-            source_env "$supabase_env_path"
-            if [ "$STUDYU_SUPABASE_PUBLIC_ANON_KEY" != "$ANON_KEY" ]; then
-              echo -e "${yellow}StudyU is not set up correctly to connect with the local Supabase instance. You can fix this by running '$0 env studyu --configure'. You might also want to reconfigure the proxy settings by running '$0 env proxy --configure' ${reset}"
-            fi
-          fi
-          ;;
-        "supabase")
-          source_env "$proxy_env_path"
-          supabase_url="$STUDYU_SUPABASE_HOST:$STUDYU_SUPABASE_PORT"
-          supabase_msg="$run_msg at $supabase_url"
-          echo -e "${green}$supabase_msg${reset}"
-          ;;
-        "studyu-app")
-          source_env "$proxy_env_path"
-          studyu_app_url="$STUDYU_APP_HOST:$STUDYU_APP_PORT"
-          studyu_app_msg="$run_msg at $studyu_app_url"
-          echo -e "${green}$studyu_app_msg${reset}"
-          ;;
-        "studyu-designer")
-          source_env "$proxy_env_path"
-          studyu_designer_url="$STUDYU_DESIGNER_HOST:$STUDYU_DESIGNER_PORT"
-          studyu_designer_msg="$run_msg at $studyu_designer_url"
-          echo -e "${green}$studyu_designer_msg${reset}"
-          ;;
-        *)
-          echo -e "${red}Error: Invalid component '$component'${reset}"
-          exit 1
-          ;;
-      esac
-    done
-  fi
-
-  if [ "$supabase_installation_success" == true ]; then
-    echo -e "${blue}The following credentials are needed to log into Supabase:${reset}"
-    echo -e "${bold}DASHBOARD_USERNAME:${reset} $dashboard_username"
-    echo -e "${bold}DASHBOARD_PASSWORD:${reset} $dashboard_password"
-    echo -e "${yellow}Store these secrets in a safe place as they provide access to all data stored in Supabase.${reset}"
-    echo -e "You can also retrieve these and other secrets later from $supabase_env_path"
-  fi
-}
-
-# Check if components are running
-status() {
-  container_names=$(docker ps --filter "name=supabase" --filter "name=studyu" --format "{{.Names}}")
-
-  if [ -z "$container_names" ]; then
-    echo -e "No components are currently running."
-    exit 2
-  fi
-
-  all_containers_running=true
-  for name in $container_names; do
-    # todo also check for health status if available
-    # until docker inspect --format "{{json .State.Health.Status }}" "$component" | grep -q healthy; do
-    running_status=$(docker inspect --format='{{.State.Running}}' "$name")
-
-    if [ "$running_status" = true ]; then
-      echo -e "$name (${green}running${reset})"
-    else
-      echo -e "$name (${red}not running${reset})"
-      all_containers_running=false
-    fi
-  done
-  echo ""
-  if [ "$all_containers_running" = false ]; then
-    echo -e "${red}Some components are not running. Check 'docker-compose ps' for troubleshooting and try to restart the components with '$0 restart'.${reset}"
-  else
-    echo -e "${green}All components are running.${reset}"
-  fi
-}
-
-# Start given components with docker compose
-start() {
-  # Check if studyu_network exists, otherwise create it
-  docker network inspect studyu_network >/dev/null 2>&1 || \
-      docker network create --driver bridge studyu_network >/dev/null 2>&1
-  manage_components 'up -d' "${@}"
-}
-
-restart() {
-  manage_components "restart" "${@}"
-}
-
-stop() {
-  manage_components "stop" "${@}"
-}
-
-down() {
-  manage_components "down" "${@}"
-}
-
-
-# Update the StudyU repository
-update() {
-  if prompt_yes_no "Do you want to create a backup of the StudyU database?"; then
-    backup
-  fi
-
-  # Check if any of the components are running.
-  local components_running=()
-  for component in "${!compose_files[@]}"; do
-    if component_is_running "$component"; then
-      components_running+=("$component")
-    fi
-  done
-
-  # If any components are running, ask the user if they want to stop and remove them before updating.
-  if [ ${#components_running[@]} -gt 0 ]; then
-    if prompt_yes_no "The following components '${components_running[*]}' are still running. Do you want to stop and remove them now before updating?"; then
-      manage_components "down" "${components_running[@]}"
-    else
-      echo -e "${red}Please stop the containers for components '${components_running[*]}' before updating.${reset}"
-      exit 1
-    fi
-  fi
-
-  # Check if there are modified files and ask the user if they should be stashed; else, stop.
-  if ! git diff-index --quiet HEAD --; then
-    if prompt_yes_no "There are modified files. Do you want to stash them?"; then
-      git stash
-    else
-      echo "Please stash the changes before updating."
-      exit 1
-    fi
-  fi
-
-  # Check if we are in $STUDYU_BASE_BRANCH; if not, ask the user if the branch should be switched; else, stop.
-  CURRENT_BRANCH=$(cd "$STUDYU_PATH" && git rev-parse --abbrev-ref HEAD)
-  if [ "$CURRENT_BRANCH" != "$STUDYU_BASE_BRANCH" ]; then
-    if prompt_yes_no "You are on branch '$CURRENT_BRANCH'. Do you want to switch to '$STUDYU_BASE_BRANCH'?"; then
-      git checkout "$STUDYU_BASE_BRANCH"
-    else
-      echo "Please switch to the '$STUDYU_BASE_BRANCH' branch before updating."
-      exit 1
-    fi
-  fi
-
-  git pull
-
-  # If we had stashed files before, then try to restore them now.
-  if [[ "$STASH_FILES" =~ ^[Yy]$ ]]; then
-    git stash pop
-  fi
-
-  if prompt_yes_no "Update completed. Do you want to start the components again?"; then
-    start
-  fi
-  echo -e "${green}StudyU update finished.${reset}"
-}
-
-
-# Delete docker container, images, and volumes
-delete() {
-  local down_cmd=""
-  local delete_images=false
-
-  if prompt_yes_no "Do you want to create a backup of the StudyU database?"; then
-    backup
-  fi
-
-  if prompt_yes_no "Do you want to remove all containers and images of the StudyU components? This does not affect any volumes."; then
-    delete_images=true
-    down_cmd+="--remove-orphans"
-    echo -e "${yellow}Containers and images will be deleted.${reset}"
-  fi
-
-  if prompt_yes_no "Do you want to delete the StudyU Supabase volumes and the storage data?"; then
-    if prompt_yes_no "Are you REALLY sure you want to delete all data? This includes all created studies, users, and their data."; then
-      if prompt_remove; then
-        down_cmd+=" --volumes"
-        echo -e "${yellow}Volumes will be deleted.${reset}"
-      else
-        echo -e "Volumes will not be deleted."
-      fi
-    fi
-  fi
-
-  if [ -n "$down_cmd" ]; then
-    manage_components "down $down_cmd"
-    if [ "$delete_images" = true ]; then
-      remove_studyu_docker_images
-    fi
-    echo -e "${green}Selected data has been deleted.${reset}"
-  else
-    echo -e "No action taken. No data has been deleted."
-  fi
-}
-
-
-# Permanently remove all configuration files
-reset() {
-  local files_to_remove=("$CONFIG_FILE" "$STUDYU_PATH/docker/supabase/.env" "$STUDYU_PATH/docker/proxy/.env" "$STUDYU_PATH/flutter_common/lib/envs/.env.local")
-
-  for component in "${!compose_files[@]}"; do
-    if component_is_running "$component"; then
-      echo -e "${red}Error: Components are still running. Please stop them before resetting.${reset}"
-      exit 1
-    fi
-  done
-
-  echo -e "${yellow}WARNING: This will permanently remove the following configuration files:${reset}"
-  for file in "${files_to_remove[@]}"; do
-    echo -e "  $file"
-  done
-  if prompt_yes_no "Are you REALLY sure you want to remove all those files?"; then
-    if prompt_remove; then
-      for file in "${files_to_remove[@]}"; do
-        if [ -f "$file" ]; then
-          rm "$file"
-        fi
-      done
-      echo -e "${green}All configuration files have been removed.${reset}"
-    fi
-  fi
-  echo -e "No action taken."
-}
-
-# Function to backup StudyU components
-backup() {
-  # todo also backup supabase storage
-  CURRENT_DATE=$(date +%Y-%m-%d)
-  BACKUP_DIR="$STUDYU_PATH/backup"
-  mkdir -p "$BACKUP_DIR"
-  BACKUP_FILE="$BACKUP_DIR/pg_public_${CURRENT_DATE}.sql.gz"
-  local is_running=true
-
-  # Check if the supabase-db component is running
-  if ! component_is_running "$postgres_container_name"; then
-    is_running=false
-    start supabase-db
-    until docker inspect --format "{{json .State.Health.Status }}" "$postgres_container_name" | grep -q healthy; do
-      echo "Waiting for supabase-db to be healthy..."
-      sleep 3
-    done
-  fi
-
-  # Execute pg_dump command inside the Docker container
-  docker exec $postgres_container_name pg_dump -U "$postgres_username" -t "public.*" | gzip > "$BACKUP_FILE"
-
-  # Stop the container if it was not running before
-  if [ "$is_running" = false ]; then
-    stop supabase-db
-  fi
-
-  echo -e "${green}StudyU database backup created at $BACKUP_FILE${reset}"
-  echo "It is advisable to schedule regular backups e.g. with 'crontab'."
-}
-
-
-# Function to display general help
-print_general_help() {
-  echo -e "${bold}Welcome to the StudyU CLI${reset}"
-  echo "Usage: $0 [options] [-h]"
-  echo "Options:"
-  echo "  config                            Configure StudyU CLI settings"
-  echo "  start <components>                Start components"
-  echo "  restart <components>              Restart components"
-  echo "  stop <components>                 Stop components"
-  echo "  down <components>                 Stop and remove components"
-  echo "  status                            Check if components are running healthy"
-  echo "  env                               Read and write environment settings"
-  echo "  update                            Fetch and merge the latest StudyU changes from the StudyU repository"
-  echo "  backup                            Dump StudyU data"
-  echo "  delete                            Delete components and data (use with caution!)"
-  echo "  reset                             Permanently removes all configuration files (use with EXTREME caution!)"
-  echo "  help                              Display this help message"
-  echo -e "Use -h for each command or visit the StudyU website for advanced usage options: https://studyu.health"
-  echo -e "$selectable_components"
-}
-
-# Function to display help for 'config' command
-print_config_help() {
-  echo "Usage: $0 config [options]"
-  echo "Options:"
-  echo "  -l, --list                       Print current configuration"
-  echo "  -c, --set-default-components     Set default components"
-  echo "  -p, --set-studyu-path            Set the StudyU path"
-  echo "  -b, --set-studyu-base-branch     Set the base branch for StudyU"
-  echo "  -s, --set-studyu-secrets-manager Set the secrets manager for StudyU"
-  echo "  -d  --get-default-components     Get default components"
-  echo "  -e  --get-studyu-path            Get the StudyU path"
-  echo "  -f  --get-studyu-base-branch     Get the base branch for StudyU"
-  echo "  -g  --get-studyu-secrets-manager Get the secrets manager for StudyU"
-}
-
-# Function to display help for 'start' command
-print_start_help() {
-  echo "Usage: $0 start <components> [options]"
-  echo "Options:"
-  echo "  -c, --clean                      Clean up orphaned containers"
-  echo "  -b, --build                      Force rebuild of StudyU components (if components are selected)"
-  echo "  -i, --init-default-database      Initialize the StudyU database with the app_config.sql.example file"
-  echo "  -d, --init-database <path>       Initialize the StudyU database with a custom SQL file"
-}
-
-# Function to display help for 'restart' command
-print_restart_help() {
-  echo "Usage: $0 restart <components> [options]"
-  echo "Options:"
-  echo "  -c, --clean                      Clean up orphaned containers"
-  echo "  -b, --build                      Force rebuild of StudyU components"
-}
-
-# Function to display help for 'env' command
-print_env_edit_help() {
-  echo "Usage: $0 env <subcommand> [options] [-h]"
-  echo "Subcommands:"
-  echo "  proxy                                        Edit proxy environment variables"
-  echo "    -i, --init                                 Initialize the proxy environment file"
-  echo "    -c, --configure                            Configure proxy environment variables"
-  echo "    -a, --set-app-host <value>                 Set the StudyU App host"
-  echo "    -p, --set-app-port <value>                 Set the Studyu App port"
-  echo "    -d, --set-designer-host <value>            Set the StudyU Designer host"
-  echo "    -q, --set-designer-port <value>            Set the StudyU Designer port"
-  echo "    -s, --set-supabase-host <value>            Set the Supabase host"
-  echo "    -u, --set-supabase-port <value>            Set the Supabase port"
-  echo "    -j  --get-app-host                         Get the StudyU App host"
-  echo "    -k  --get-app-port                         Get the StudyU App port"
-  echo "    -l  --get-designer-host                    Get the StudyU Designer host"
-  echo "    -m  --get-designer-port                    Get the StudyU Designer port"
-  echo "    -n  --get-supabase-host                    Get the Supabase host"
-  echo "    -o  --get-supabase-port                    Get the Supabase port"
-
-  echo ""
-
-  echo "  supabase                                     Edit Supabase environment variables"
-  echo "    -i, --init                                 Initialize Supabase environment file"
-  echo "    -c, --create-supabase-secrets              Create and set Supabase secrets"
-  echo "    -p, --set-postgres-password <value>        Set the Supabase Postgres password"
-  echo "    -j, --set-jwt-secret <value>               Set the Supabase JWT secret"
-  echo "    -a, --set-anon-key <value>                 Set the Supabase ANON_KEY"
-  echo "    -s, --set-service-role-key <value>         Set the Supabase SERVICE_ROLE_KEY"
-  echo "    -u, --set-dashboard-username <value>       Set the Supabase dashboard username"
-  echo "    -w, --set-dashboard-password <value>       Set the Supabase dashboard password"
-  echo "    -g, --get-postgres-password                Get the Supabase Postgres password"
-  echo "    -k, --get-jwt-secret                       Get the Supabase JWT secret"
-  echo "    -b, --get-anon-key                         Get the Supabase ANON_KEY"
-  echo "    -r, --get-service-role-key                 Get the Supabase SERVICE_ROLE_KEY"
-  echo "    -n, --get-dashboard-username               Get the Supabase dashboard username"
-  echo "    -o, --get-dashboard-password               Get the Supabase dashboard password"
-
-  echo ""
-
-  echo "  studyu                                       Edit StudyU environment variables"
-  echo "    -i, --init                                 Initialize StudyU environment file"
-  echo "    -c, --configure                            Configure StudyU environment variables"
-  echo "    -s, --import-supabase-key                  Import Supabase public key to StudyU"
-  echo "    -b, --set-supabase-url <value>             Set the Supabase URL"
-  echo "    -k, --set-supabase-public-anon-key <value> Set the Supabase key"
-  echo "    -g, --set-project-generator-url <value>    Set the StudyU project generator URL"
-  echo "    -a, --set-app-url <value>                  Set the StudyU App URL"
-  echo "    -d, --set-designer-url <value>             Set the StudyU Designer URL"
-  echo "    -l, --get-supabase-url                     Get the Supabase URL"
-  echo "    -m, --get-supabase-public-anon-key         Get the Supabase key"
-  echo "    -n, --get-project-generator-url            Get the StudyU project generator URL"
-  echo "    -o, --get-app-url                          Get the StudyU App URL"
-  echo "    -p, --get-designer-url                     Get the StudyU Designer URL"
-
-  echo ""
-
-  echo -e "${yellow}After making changes to the StudyU environment, be sure to also update the proxy settings by running '$0 env proxy --configure'${reset}"
-  echo -e "${yellow}After making changes to the proxy environment, be sure to also update the StudyU settings by running '$0 env studyu --configure'${reset}"
-}
-
-
-# Main script
-if [ $# -lt 1 ]; then
-  print_general_help
-  exit 1
-fi
-
-POSITIONAL_ARGS=()
-
-case "$1" in
-  config)
-    shift
-    # check if no options are given
-    if [ $# -eq 0 ]; then
-      configure
-      exit 0
-    fi
-    while [[ $# -gt 0 ]]; do
-      case $1 in
-        -h | --help)
-          print_config_help
-          exit 0
-          ;;
-        -l | --list)
-          print_config
-          exit 0
-          ;;
-        -c | --set-default-components)
-          shift
-          components=()
-          while [[ $# -gt 0 && $1 != -* ]]; do
-            components+=("$1")
-            shift
-          done
-          echo -e "${green}Setting default components to ${components[*]}${reset}"
-          set_default_components components[@]
-          ;;
-        -p | --set-studyu-path)
-          echo -e "${green}Setting StudyU path to $2${reset}"
-          set_studyu_path "$2"
-          shift 2
-          ;;
-        -b | --set-studyu-base-branch)
-          echo -e "${green}Setting StudyU base branch to $2${reset}"
-          set_studyu_base_branch "$2"
-          shift 2
-          ;;
-        -s | --set-studyu-secrets-manager)
-          echo -e "${green}Setting StudyU secrets manager to $2${reset}"
-          set_studyu_secrets_manager "$2"
-          shift 2
-          ;;
-        -d | --get-default-components)
-          read_config
-          echo -e "${green}Default components: ${STUDYU_DEFAULT_COMPONENTS[*]}${reset}"
-          exit 0
-          ;;
-        -e | --get-studyu-path)
-          read_config
-          echo -e "${green}StudyU path: $STUDYU_PATH${reset}"
-          exit 0
-          ;;
-        -f | --get-studyu-base-branch)
-          read_config
-          echo -e "${green}StudyU base branch: $STUDYU_BASE_BRANCH${reset}"
-          exit 0
-          ;;
-        -g | --get-studyu-secrets-manager)
-          read_config
-          echo -e "${green}StudyU secrets manager: $STUDYU_SECRETS_MANAGER${reset}"
-          exit 0
-          ;;
-        -*)
-          echo -e "${red}Unknown option $1. Use '$0 config --help' to see available options.${reset}"
-          exit 1
-          ;;
-        *)
-          POSITIONAL_ARGS+=("$1") # save positional arg
-          shift # past argument
-          ;;
-      esac
-    done
-    if [ ${#POSITIONAL_ARGS[@]} -gt 0 ]; then
-      echo -e "${red}Unknown option ${POSITIONAL_ARGS[0]}. Use '$0 config --help' to see available options.${reset}"
-      exit 1
-    fi
-    ;;
-  status)
-    read_config
-    status "$@"
-    ;;
-  start)
-    read_config
-    shift
-    while [[ $# -gt 0 ]]; do
-      case $1 in
-        -h | --help)
-          print_start_help
-          exit 0
-          ;;
-        -c | --clean)
-          clean_flag=true
-          shift
-          ;;
-        -b | --build)
-          build_flag=true
-          shift
-          ;;
-        -i|--init-default-database)
-          init_database_flag=true
-          shift
-          ;;
-        -d|--init-database)
-          init_database_flag=true
-          init_custom_database_path=$2
-          # Check if the path is already absolute
-          if [[ $init_custom_database_path == /* ]]; then
-            # The path is absolute
-            init_custom_database_path="$init_custom_database_path"
-          else
-            # The path is relative
-            init_custom_database_path="$SCRIPT_DIR/$init_custom_database_path"
-          fi
-          if [ -z "$init_custom_database_path" ]; then
-            echo -e "${red}Error: No path to custom database file specified.${reset}"
-            exit 1
-          fi
-          shift 2
-          ;;
-        -*)
-          echo -e "${red}Unknown option $1. Use '$0 start --help' to see available options.${reset}"
-          exit 1
-          ;;
-        *)
-          POSITIONAL_ARGS+=("$1") # save positional arg
-          shift # past argument
-          ;;
-      esac
-    done
-    start "${POSITIONAL_ARGS[@]}"
-    ;;
-  restart)
-    read_config
-    shift
-    while [[ $# -gt 0 ]]; do
-      case $1 in
-        -h | --help)
-          print_restart_help
-          exit 0
-          ;;
-        -c | --clean)
-          clean_flag=true
-          shift
-          ;;
-        -b | --build)
-          build_flag=true
-          shift
-          ;;
-        -*)
-          echo -e "${red}Unknown option $1. Use '$0 restart --help' to see available options.${reset}"
-          exit 1
-          ;;
-        *)
-          POSITIONAL_ARGS+=("$1") # save positional arg
-          shift # past argument
-          ;;
-      esac
-    done
-    start "${POSITIONAL_ARGS[@]}"
-    ;;
-  stop)
-    read_config
-    shift
-    stop "$@"
-    ;;
-  down)
-    read_config
-    shift
-    down "$@"
-    ;;
-  env)
-    read_config
-    case "$2" in
-      proxy)
-        shift 2
-        if [ $# -eq 0 ]; then
-          print_env_edit_help
-          exit 0
-        fi
-        while [[ $# -gt 0 ]]; do
-          case $1 in
-            -h | --help)
-              print_env_edit_help
-              exit 0
-              ;;
-            -i | --init)
-              echo -e "${green}Creating a default proxy env at $proxy_env_path${reset}"
-              create_specific_env_file "$proxy_env_path"
-              shift
-              ;;
-            -c | --configure)
-              configure_proxy_env true
-              shift
-              ;;
-            -a | --set-app-host)
-              echo -e "${green}Setting STUDYU_APP_HOST to $2${reset}"
-              update_env_variable "$proxy_env_path" "STUDYU_APP_HOST" "$2"
-              shift 2
-              ;;
-            -p | --set-app-port)
-              echo -e "${green}Setting STUDYU_APP_PORT to $2${reset}"
-              update_env_variable "$proxy_env_path" "STUDYU_APP_PORT" "$2" "$number_pattern"
-              shift 2
-              ;;
-            -d | --set-designer-host)
-              echo -e "${green}Setting STUDYU_DESIGNER_HOST to $2${reset}"
-              update_env_variable "$proxy_env_path" "STUDYU_DESIGNER_HOST" "$2"
-              shift 2
-              ;;
-            -q | --set-designer-port)
-              echo -e "${green}Setting STUDYU_DESIGNER_PORT to $2${reset}"
-              update_env_variable "$proxy_env_path" "STUDYU_DESIGNER_PORT" "$2" "$number_pattern"
-              shift 2
-              ;;
-            -s | --set-supabase-host)
-              echo -e "${green}Setting STUDYU_SUPABASE_HOST to $2${reset}"
-              update_env_variable "$proxy_env_path" "STUDYU_SUPABASE_HOST" "$2"
-              shift 2
-              ;;
-            -u | --set-supabase-port)
-              echo -e "${green}Setting STUDYU_SUPABASE_PORT to $2${reset}"
-              update_env_variable "$proxy_env_path" "STUDYU_SUPABASE_PORT" "$2" "$number_pattern"
-              shift 2
-              ;;
-            -j | --get-app-host)
-              get_env_variable "$proxy_env_path" "STUDYU_APP_HOST"
-              shift 1
-              ;;
-            -k | --get-app-port)
-              get_env_variable "$proxy_env_path" "STUDYU_APP_PORT"
-              shift 1
-              ;;
-            -l | --get-designer-host)
-              get_env_variable "$proxy_env_path" "STUDYU_DESIGNER_HOST"
-              shift 1
-              ;;
-            -m | --get-designer-port)
-              get_env_variable "$proxy_env_path" "STUDYU_DESIGNER_PORT"
-              shift 1
-              ;;
-            -n | --get-supabase-host)
-              get_env_variable "$proxy_env_path" "STUDYU_SUPABASE_HOST"
-              shift 1
-              ;;
-            -o | --get-supabase-port)
-              get_env_variable "$proxy_env_path" "STUDYU_SUPABASE_PORT"
-              shift 1
-              ;;
-            *)
-              echo -e "${red}Unknown option $1. Use '$0 env proxy --help' to see available options.${reset}"
-              exit 1
-              ;;
-          esac
-        done
-        ;;
-      supabase)
-        shift 2
-        if [ $# -eq 0 ]; then
-          print_env_edit_help
-          exit 0
-        fi
-        while [[ $# -gt 0 ]]; do
-          case $1 in
-            -h | --help)
-              print_env_edit_help
-              exit 0
-              ;;
-            -i | --init)
-              echo -e "${green}Creating a default supabase env at $supabase_env_path${reset}"
-              create_specific_env_file "$supabase_env_path"
-              shift
-              ;;
-            -c | --create-supabase-secrets)
-              echo -e "${green}Creating and setting Supabase secrets...${reset}"
-              create_and_set_supabase_secrets
-              shift
-              ;;
-            -p | --set-postgres_password)
-              echo -e "${green}Setting POSTGRES_PASSWORD to $2${reset}"
-              update_env_variable "$supabase_env_path" "POSTGRES_PASSWORD" "$2"
-              shift 2
-              ;;
-            -j | --set-jwt-secret)
-              echo -e "${green}Setting JWT_SECRET to $2${reset}"
-              update_env_variable "$supabase_env_path" "JWT_SECRET" "$2"
-              shift 2
-              ;;
-            -a | --set-anon-key)
-              echo -e "${green}Setting ANON_KEY to $2${reset}"
-              update_env_variable "$supabase_env_path" "ANON_KEY" "$2"
-              shift 2
-              ;;
-            -s | --set-service-role-key)
-              echo -e "${green}Setting SERVICE_ROLE_KEY to $2${reset}"
-              update_env_variable "$supabase_env_path" "SERVICE_ROLE_KEY" "$2"
-              shift 2
-              ;;
-            -u | --set-dashboard-username)
-              echo -e "${green}Setting DASHBOARD_USERNAME to $2${reset}"
-              update_env_variable "$supabase_env_path" "DASHBOARD_USERNAME" "$2"
-              shift 2
-              ;;
-            -w | --set-dashboard-password)
-            echo -e "${green}Setting DASHBOARD_PASSWORD to $2${reset}"
-              update_env_variable "$supabase_env_path" "DASHBOARD_PASSWORD" "$2"
-              shift 2
-              ;;
-            -g | --get-postgres-password)
-              get_env_variable "$supabase_env_path" "POSTGRES_PASSWORD"
-              shift 1
-              ;;
-            -k | --get-jwt-secret)
-              get_env_variable "$supabase_env_path" "JWT_SECRET"
-              shift 1
-              ;;
-            -b | --get-anon-key)
-              get_env_variable "$supabase_env_path" "ANON_KEY"
-              shift 1
-              ;;
-            -r | --get-service-role-key)
-              get_env_variable "$supabase_env_path" "SERVICE_ROLE_KEY"
-              shift 1
-              ;;
-            -n | --get-dashboard-username)
-              get_env_variable "$supabase_env_path" "DASHBOARD_USERNAME"
-              shift 1
-              ;;
-            -o | --get-dashboard-password)
-              get_env_variable "$supabase_env_path" "DASHBOARD_PASSWORD"
-              shift 1
-              ;;
-            *)
-              echo -e "${red}Unknown option $1. Use '$0 env supabase --help' to see available options.${reset}"
-              exit 1
-              ;;
-          esac
-        done
-        ;;
-      studyu)
-        shift 2
-        if [ $# -eq 0 ]; then
-          print_env_edit_help
-          exit 0
-        fi
-        while [[ $# -gt 0 ]]; do
-          case $1 in
-            -h | --help)
-              print_env_edit_help
-              exit 0
-              ;;
-            -i | --init)
-              echo -e "${yellow}Creating a default studyu env at $studyu_env_path${reset}"
-              create_specific_env_file "$studyu_env_path"
-              shift
-              ;;
-            -c | --configure)
-              configure_studyu_env true
-              shift
-              ;;
-            -s | --import-supabase-key)
-              if [ ! -f "$studyu_env_path" ]; then
-                echo -e "${red}Error: Create a default StudyU env first with '$0 env studyu --init'${reset}"
-                exit 1
-              fi
-              anon_key=$(grep "^ANON_KEY=" "$supabase_env_path" | cut -d'=' -f2)
-              if [ -z "$anon_key" ]; then
-                echo -e "${red}Error: Could not find ANON_KEY in $supabase_env_path${reset}"
-                exit 1
-              fi
-              echo -e "${green}Importing Supabase key into StudyU env file.${reset}"
-              update_env_variable "$studyu_env_path" "STUDYU_SUPABASE_PUBLIC_ANON_KEY" "$anon_key"
-              shift
-              ;;
-            -b | --set-supabase-url)
-              echo -e "${green}Setting STUDYU_SUPABASE_URL to $2${reset}"
-              update_env_variable "$studyu_env_path" "STUDYU_SUPABASE_URL" "$2"
-              shift 2
-              ;;
-            -k | --set-supabase-public-anon-key)
-              echo -e "${green}Setting STUDYU_SUPABASE_PUBLIC_ANON_KEY to $2${reset}"
-              update_env_variable "$studyu_env_path" "STUDYU_SUPABASE_PUBLIC_ANON_KEY" "$2"
-              shift 2
-              ;;
-            -g | --set-project-generator-url)
-              echo -e "${green}Setting STUDYU_PROJECT_GENERATOR_URL to $2${reset}"
-              update_env_variable "$studyu_env_path" "STUDYU_PROJECT_GENERATOR_URL" "$2"
-              shift 2
-              ;;
-            -a | --set-app-url)
-              echo -e "${green}Setting STUDYU_APP_URL to $2${reset}"
-              update_env_variable "$studyu_env_path" "STUDYU_APP_URL" "$2"
-              shift 2
-              ;;
-            -d | --set-designer-url)
-              echo -e "${green}Setting STUDYU_DESIGNER_URL to $2${reset}"
-              update_env_variable "$studyu_env_path" "STUDYU_DESIGNER_URL" "$2"
-              shift 2
-              ;;
-            -l | --get-supabase-url)
-              get_env_variable "$studyu_env_path" "STUDYU_SUPABASE_URL"
-              shift 1
-              ;;
-            -m | --get-supabase-public-anon-key)
-              get_env_variable "$studyu_env_path" "STUDYU_SUPABASE_PUBLIC_ANON_KEY"
-              shift 1
-              ;;
-            -n | --get-project-generator-url)
-              get_env_variable "$studyu_env_path" "STUDYU_PROJECT_GENERATOR_URL"
-              shift 1
-              ;;
-            -o | --get-app-url)
-              get_env_variable "$studyu_env_path" "STUDYU_APP_URL"
-              shift 1
-              ;;
-            -p | --get-designer-url)
-              get_env_variable "$studyu_env_path" "STUDYU_DESIGNER_URL"
-              shift 1
-              ;;
-            *)
-              echo -e "${red}Unknown option $1. Use '$0 env studyu --help' to see available options.${reset}"
-              exit 1
-              ;;
-          esac
-        done
-        ;;
-      --help | -h)
-        print_env_edit_help
-        exit 1
-        ;;
-      *)
-        echo -e "${red}Error: Invalid argument.${reset}"
-        print_env_edit_help
-        exit 1
-        ;;
-    esac
-    ;;
-  update)
-    read_config
-    update
-    ;;
-   backup)
-    read_config
-    backup
-    ;;
-  delete)
-    read_config
-    delete
-    ;;
-  reset)
-    read_config
-    reset
-    ;;
-  help | --help | -h)
-    print_general_help
-    ;;
-  *)
-    echo -e "${red}Error: Invalid argument. Use '$0 --help' to see available options.${reset}"
-    exit 1
-    ;;
-esac

From ef49e01cfb356f7d92faf6b3fe017a82d272f6b7 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 23:36:24 +0200
Subject: [PATCH 057/314] chore: remove docker dir

---
 .github/labeler.yml                       | 2 --
 .github/workflows/e2e_tests.yml           | 6 +++---
 .github/workflows/supabase-test.yml       | 3 +--
 {docker/supabase => supabase}/.gitignore  | 0
 {docker/supabase => supabase}/config.toml | 0
 5 files changed, 4 insertions(+), 7 deletions(-)
 rename {docker/supabase => supabase}/.gitignore (100%)
 rename {docker/supabase => supabase}/config.toml (100%)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 2fd805fc2..19f3e179c 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -12,5 +12,3 @@
 'documentation':
   - 'docs/**/*'
   - '**/*.md'
-'docker':
-  - 'docker/**/*'
diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
index b437cb29e..db784a509 100644
--- a/.github/workflows/e2e_tests.yml
+++ b/.github/workflows/e2e_tests.yml
@@ -49,9 +49,9 @@ jobs:
 
       - name: Prepare database migrations
         run: |
-          mkdir -p docker/supabase/migrations
-          mv database/studyu-schema.sql docker/supabase/migrations/0000000000001_studyu-schema.sql
-          mv database/app_config.sql.example docker/supabase/migrations/0000000000002_app_config_mockup.sql
+          mkdir -p supabase/migrations
+          mv database/studyu-schema.sql supabase/migrations/0000000000001_studyu-schema.sql
+          mv database/app_config.sql.example supabase/migrations/0000000000002_app_config_mockup.sql
 
       - name: Start Supabase database
         working-directory: docker
diff --git a/.github/workflows/supabase-test.yml b/.github/workflows/supabase-test.yml
index 7d9479ba5..2e48c7ff7 100644
--- a/.github/workflows/supabase-test.yml
+++ b/.github/workflows/supabase-test.yml
@@ -3,7 +3,6 @@ on:
   push:
     paths:
       - "database/**"
-      - "docker/**"
   workflow_dispatch:
 
 jobs:
@@ -27,7 +26,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Seed database
-        run: cp database/studyu-schema.sql docker/supabase/seed.sql
+        run: cp database/studyu-schema.sql supabase/seed.sql
 
       - name: Set up Supabase CLI
         uses: supabase/setup-cli@v1
diff --git a/docker/supabase/.gitignore b/supabase/.gitignore
similarity index 100%
rename from docker/supabase/.gitignore
rename to supabase/.gitignore
diff --git a/docker/supabase/config.toml b/supabase/config.toml
similarity index 100%
rename from docker/supabase/config.toml
rename to supabase/config.toml

From 9a4faf3736babb154ac2d53e311a4f9caa635aea Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 24 May 2024 09:31:16 +0200
Subject: [PATCH 058/314] chore: fix path

---
 .github/workflows/e2e_tests.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
index db784a509..495e89e77 100644
--- a/.github/workflows/e2e_tests.yml
+++ b/.github/workflows/e2e_tests.yml
@@ -54,7 +54,6 @@ jobs:
           mv database/app_config.sql.example supabase/migrations/0000000000002_app_config_mockup.sql
 
       - name: Start Supabase database
-        working-directory: docker
         run: |
           supabase db start
           supabase migration up

From 545fcb001eb969cae6815bac254e37cf863baccc Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 24 May 2024 09:34:19 +0200
Subject: [PATCH 059/314] chore: fix path

---
 .github/workflows/supabase-test.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/supabase-test.yml b/.github/workflows/supabase-test.yml
index 2e48c7ff7..165e00a8d 100644
--- a/.github/workflows/supabase-test.yml
+++ b/.github/workflows/supabase-test.yml
@@ -34,11 +34,9 @@ jobs:
           version: latest
 
       - name: Initialize Supabase
-        working-directory: docker
         run: |
           supabase db start
 
       - name: Run Supabase Tests
-        working-directory: docker
         run: |
           supabase test db

From aaf947b2903efcdbd7ae70b7450dbf498f64c280 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 24 May 2024 09:49:37 +0200
Subject: [PATCH 060/314] chore: add supabase tests

---
 .github/workflows/supabase-test.yml          |   8 +-
 supabase/tests/000-supabase_test_helpers.sql | 267 +++++++++++++++
 supabase/tests/001_generic_test_helpers.sql  |  45 +++
 supabase/tests/010-study.sql                 | 337 +++++++++++++++++++
 4 files changed, 655 insertions(+), 2 deletions(-)
 create mode 100644 supabase/tests/000-supabase_test_helpers.sql
 create mode 100644 supabase/tests/001_generic_test_helpers.sql
 create mode 100644 supabase/tests/010-study.sql

diff --git a/.github/workflows/supabase-test.yml b/.github/workflows/supabase-test.yml
index 165e00a8d..0b6e197b4 100644
--- a/.github/workflows/supabase-test.yml
+++ b/.github/workflows/supabase-test.yml
@@ -25,8 +25,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Seed database
-        run: cp database/studyu-schema.sql supabase/seed.sql
+      - name: Prepare database migrations
+        run: |
+          mkdir -p supabase/migrations
+          mv database/studyu-schema.sql supabase/migrations/0000000000001_studyu-schema.sql
+          mv database/app_config.sql.example supabase/migrations/0000000000002_app_config_mockup.sql
 
       - name: Set up Supabase CLI
         uses: supabase/setup-cli@v1
@@ -36,6 +39,7 @@ jobs:
       - name: Initialize Supabase
         run: |
           supabase db start
+          supabase migration up
 
       - name: Run Supabase Tests
         run: |
diff --git a/supabase/tests/000-supabase_test_helpers.sql b/supabase/tests/000-supabase_test_helpers.sql
new file mode 100644
index 000000000..52ab1f1b3
--- /dev/null
+++ b/supabase/tests/000-supabase_test_helpers.sql
@@ -0,0 +1,267 @@
+-------
+-- Adapted from: https://github.com/usebasejump/supabase-test-helpers
+-- SHA: b381f23182595d98fdbcfe941dfacf6b3afdae59
+-------
+
+-- Enable pgTAP if it's not already enabled
+create extension if not exists pgtap with schema extensions;
+
+-- We want to store all of this in the tests schema to keep it
+-- separate from any application data
+CREATE SCHEMA IF NOT EXISTS tests;
+
+-- anon and authenticated should have access to tests schema
+GRANT USAGE ON SCHEMA tests TO anon, authenticated;
+-- Don't allow public to execute any functions in the tests schema
+ALTER DEFAULT PRIVILEGES IN SCHEMA tests REVOKE EXECUTE ON FUNCTIONS FROM public;
+-- Grant execute to anon and authenticated for testing purposes
+ALTER DEFAULT PRIVILEGES IN SCHEMA tests GRANT EXECUTE ON FUNCTIONS TO anon, authenticated;
+
+/**
+    * ### tests.create_supabase_user(identifier text, email text, phone text)
+    *
+    * Creates a new user in the `auth.users` table.
+    * You can recall a user's info by using `tests.get_supabase_user(identifier text)`.
+    *
+    * Parameters:
+    * - `identifier` - A unique identifier for the user. We recommend you keep it memorable like "test_owner" or "test_member"
+    * - `email` - (Optional) The email address of the user
+    * - `phone` - (Optional) The phone number of the user
+    * - `metadata` - (Optional) Additional metadata to be added to the user
+    *
+    * Returns:
+    * - `user_id` - The UUID of the user in the `auth.users` table
+    *
+    * Example:
+    * ```sql
+    *   SELECT tests.create_supabase_user('test_owner');
+    *   SELECT tests.create_supabase_user('test_member', 'member@test.com', '555-555-5555');
+    *   SELECT tests.create_supabase_user('test_member', 'member@test.com', '555-555-5555', '{"key": "value"}'::jsonb);
+    * ```
+ */
+CREATE OR REPLACE FUNCTION tests.create_supabase_user(identifier text, email text default null, phone text default null, metadata jsonb default null)
+RETURNS uuid
+    SECURITY DEFINER
+    SET search_path = auth, pg_temp
+AS $$
+DECLARE
+    user_id uuid;
+BEGIN
+
+    -- create the user
+    user_id := extensions.uuid_generate_v4();
+    INSERT INTO auth.users (id, email, phone, raw_user_meta_data)
+    VALUES (user_id, coalesce(email, concat(user_id, '@test.com')), phone, jsonb_build_object('test_identifier', identifier) || coalesce(metadata, '{}'::jsonb))
+    RETURNING id INTO user_id;
+
+    RETURN user_id;
+END;
+$$ LANGUAGE plpgsql;
+
+/**
+    * ### tests.get_supabase_user(identifier text)
+    *
+    * Returns the user info for a user created with `tests.create_supabase_user`.
+    *
+    * Parameters:
+    * - `identifier` - The unique identifier for the user
+    *
+    * Returns:
+    * - `user_id` - The UUID of the user in the `auth.users` table
+    *
+    * Example:
+    * ```sql
+    *   SELECT posts where posts.user_id = tests.get_supabase_user('test_owner') -> 'id';
+    * ```
+ */
+CREATE OR REPLACE FUNCTION tests.get_supabase_user(identifier text)
+RETURNS json
+SECURITY DEFINER
+SET search_path = auth, pg_temp
+AS $$
+    DECLARE
+        supabase_user json;
+    BEGIN
+        SELECT json_build_object('id', id, 'email', email, 'phone', phone, 'raw_user_meta_data', raw_user_meta_data) into supabase_user FROM auth.users WHERE raw_user_meta_data ->> 'test_identifier' = identifier limit 1;
+        if supabase_user is null OR supabase_user -> 'id' IS NULL then
+            RAISE EXCEPTION 'User with identifier % not found', identifier;
+        end if;
+        RETURN supabase_user;
+    END;
+$$ LANGUAGE plpgsql;
+
+/**
+    * ### tests.get_supabase_uid(identifier text)
+    *
+    * Returns the user UUID for a user created with `tests.create_supabase_user`.
+    *
+    * Parameters:
+    * - `identifier` - The unique identifier for the user
+    *
+    * Returns:
+    * - `user_id` - The UUID of the user in the `auth.users` table
+    *
+    * Example:
+    * ```sql
+    *   SELECT posts where posts.user_id = tests.get_supabase_uid('test_owner') -> 'id';
+    * ```
+ */
+CREATE OR REPLACE FUNCTION tests.get_supabase_uid(identifier text)
+    RETURNS uuid
+    SECURITY DEFINER
+    SET search_path = auth, pg_temp
+AS $$
+DECLARE
+    supabase_user uuid;
+BEGIN
+    SELECT id into supabase_user FROM auth.users WHERE raw_user_meta_data ->> 'test_identifier' = identifier limit 1;
+    if supabase_user is null then
+        RAISE EXCEPTION 'User with identifier % not found', identifier;
+    end if;
+    RETURN supabase_user;
+END;
+$$ LANGUAGE plpgsql;
+
+/**
+    * ### tests.authenticate_as(identifier text)
+    *   Authenticates as a user created with `tests.create_supabase_user`.
+    *
+    * Parameters:
+    * - `identifier` - The unique identifier for the user
+    *
+    * Returns:
+    * - `void`
+    *
+    * Example:
+    * ```sql
+    *   SELECT tests.create_supabase_user('test_owner');
+    *   SELECT tests.authenticate_as('test_owner');
+    * ```
+ */
+CREATE OR REPLACE FUNCTION tests.authenticate_as (identifier text)
+    RETURNS void
+    AS $$
+        DECLARE
+                user_data json;
+                original_auth_data text;
+        BEGIN
+            -- store the request.jwt.claims in a variable in case we need it
+            original_auth_data := current_setting('request.jwt.claims', true);
+            user_data := tests.get_supabase_user(identifier);
+
+            if user_data is null OR user_data ->> 'id' IS NULL then
+                RAISE EXCEPTION 'User with identifier % not found', identifier;
+            end if;
+
+
+            perform set_config('role', 'authenticated', true);
+            perform set_config('request.jwt.claims', json_build_object('sub', user_data ->> 'id', 'email', user_data ->> 'email', 'phone', user_data ->> 'phone')::text, true);
+
+        EXCEPTION
+            -- revert back to original auth data
+            WHEN OTHERS THEN
+                set local role authenticated;
+                set local "request.jwt.claims" to original_auth_data;
+                RAISE;
+        END
+    $$ LANGUAGE plpgsql;
+
+/**
+    * ### tests.clear_authentication()
+    *   Clears out the authentication and sets role to anon
+    *
+    * Returns:
+    * - `void`
+    *
+    * Example:
+    * ```sql
+    *   SELECT tests.create_supabase_user('test_owner');
+    *   SELECT tests.authenticate_as('test_owner');
+    *   SELECT tests.clear_authentication();
+    * ```
+ */
+CREATE OR REPLACE FUNCTION tests.clear_authentication()
+    RETURNS void AS $$
+BEGIN
+    perform set_config('role', 'anon', true);
+    perform set_config('request.jwt.claims', null, true);
+END
+$$ LANGUAGE plpgsql;
+
+/**
+* ### tests.rls_enabled(testing_schema text)
+* pgTAP function to check if RLS is enabled on all tables in a provided schema
+*
+* Parameters:
+* - schema_name text - The name of the schema to check
+*
+* Example:
+* ```sql
+*   BEGIN;
+*       select plan(1);
+*       select tests.rls_enabled('public');
+*       SELECT * FROM finish();
+*   ROLLBACK;
+* ```
+*/
+CREATE OR REPLACE FUNCTION tests.rls_enabled (testing_schema text)
+RETURNS text AS $$
+    select is(
+        (select
+           	count(pc.relname)::integer
+           from pg_class pc
+           join pg_namespace pn on pn.oid = pc.relnamespace and pn.nspname = rls_enabled.testing_schema
+           join pg_type pt on pt.oid = pc.reltype
+           -- only check for: r = ordinary table
+          where relrowsecurity = FALSE AND relkind = 'r')
+        ,
+        0,
+        'All tables in the' || testing_schema || ' schema should have row level security enabled');
+$$ LANGUAGE sql;
+
+/**
+* ### tests.rls_enabled(testing_schema text, testing_table text)
+* pgTAP function to check if RLS is enabled on a specific table
+*
+* Parameters:
+* - schema_name text - The name of the schema to check
+* - testing_table text - The name of the table to check
+*
+* Example:
+* ```sql
+*    BEGIN;
+*        select plan(1);
+*        select tests.rls_enabled('public', 'accounts');
+*        SELECT * FROM finish();
+*    ROLLBACK;
+* ```
+*/
+CREATE OR REPLACE FUNCTION tests.rls_enabled (testing_schema text, testing_table text)
+RETURNS TEXT AS $$
+    select is(
+        (select
+           	count(*)::integer
+           from pg_class pc
+           join pg_namespace pn on pn.oid = pc.relnamespace and pn.nspname = rls_enabled.testing_schema and pc.relname = rls_enabled.testing_table
+           join pg_type pt on pt.oid = pc.reltype
+           where relrowsecurity = TRUE),
+        1,
+        testing_table || 'table in the ' || testing_schema || ' schema should have row level security enabled'
+    );
+$$ LANGUAGE sql;
+
+-- we have to run some tests to get this to pass as the first test file.
+-- investigating options to make this better.  Maybe a dedicated test harness
+-- but we dont' want these functions to always exist on the database.
+BEGIN;
+
+    select plan(7);
+    select function_returns('tests', 'create_supabase_user', Array['text', 'text', 'text', 'jsonb'], 'uuid');
+    select function_returns('tests', 'get_supabase_uid', Array['text'], 'uuid');
+    select function_returns('tests', 'get_supabase_user', Array['text'], 'json');
+    select function_returns('tests', 'authenticate_as', Array['text'], 'void');
+    select function_returns('tests', 'clear_authentication', Array[null], 'void');
+    select function_returns('tests', 'rls_enabled', Array['text', 'text'], 'text');
+    select function_returns('tests', 'rls_enabled', Array['text'], 'text');
+    select * from finish();
+ROLLBACK;
diff --git a/supabase/tests/001_generic_test_helpers.sql b/supabase/tests/001_generic_test_helpers.sql
new file mode 100644
index 000000000..48d9e7699
--- /dev/null
+++ b/supabase/tests/001_generic_test_helpers.sql
@@ -0,0 +1,45 @@
+SELECT plan(0);
+
+-- Either one of the results must be true for the test to complete successfully
+CREATE OR REPLACE FUNCTION tests.is_either_true(
+    description text,
+    VARIADIC results boolean[]
+)
+RETURNS TEXT AS $$
+DECLARE
+    result BOOLEAN;
+    output TEXT;
+    result_details TEXT;
+BEGIN
+    result := false;
+
+    -- Check if any of the results is true
+    FOR i IN 1..array_length(results, 1) LOOP
+        IF results[i] = true THEN
+            result := true;
+            EXIT; -- Exit the loop once a true result is found
+        END IF;
+    END LOOP;
+
+    output := ok(result, description);
+
+    -- Build the result details only if there are false results
+    IF NOT result THEN
+        FOR i IN 1..array_length(results, 1) LOOP
+            result_details := result_details || E'\nTest ' || i || ': ' || results[i];
+        END LOOP;
+    END IF;
+
+    RETURN output || CASE result WHEN TRUE THEN '' ELSE E'\n' || diag(result_details) END;
+END;
+$$ LANGUAGE plpgsql;
+
+-- Create a polymorphic function that checks if two input elements are not distinct from each other
+CREATE OR REPLACE FUNCTION tests.is_equal(value1 anyelement, value2 anyelement)
+RETURNS BOOLEAN
+AS $$
+BEGIN
+  -- would prefer IS NOT DISTINCT FROM, but that is not supported in plpgsql
+  RETURN NOT value1 IS DISTINCT FROM value2;
+END;
+$$ LANGUAGE plpgsql;
diff --git a/supabase/tests/010-study.sql b/supabase/tests/010-study.sql
new file mode 100644
index 000000000..b7e9ee6ae
--- /dev/null
+++ b/supabase/tests/010-study.sql
@@ -0,0 +1,337 @@
+-- begin the transaction, allows to rollback any changes made during the test
+BEGIN;
+
+--
+-- seed
+--
+
+-- TODO create variables
+select tests.create_supabase_user('test_creator_1', 'test_creator_1@studyu.health');
+select tests.create_supabase_user('test_creator_2', 'test_creator_2@studyu.health');
+select tests.create_supabase_user('test_consumer', 'test_consumer@studyu.health');
+
+--
+-- Creator 1
+-- Description: Studies should be visible to consumer
+--
+
+INSERT INTO public.study (
+  contact,
+  title,
+  description,
+  icon_name,
+  published,
+  registry_published,
+  questionnaire,
+  eligibility_criteria,
+  observations,
+  interventions,
+  consent,
+  schedule,
+  report_specification,
+  results,
+  created_at,
+  updated_at,
+  user_id,
+  participation,
+  result_sharing,
+  collaborator_emails
+) VALUES(
+  '{"email":"example@example.com","phone":"0123456789","website":"https://studyu.health","researchers":"StudyU Researcher","organization":"StudyU","institutionalReviewBoard":"This study has not been submitted to the IRB Board. It is for illustration purposes of StudyU only.","institutionalReviewBoardNumber":"N/A"}',
+  'Study: published=true, registry_published=true, participation=open, result_sharing=public',
+  'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
+  'accountHeart',
+  -- published
+  true,
+  -- registry_published
+  true,
+  '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
+  '[]',
+  '2021-04-13 18:19:49.000',
+  '2023-05-11 12:46:06.018',
+  -- user_id
+  (tests.get_supabase_user('test_creator_1') ->> 'id')::uuid,
+  -- participation ('open', 'invite')
+  'open',
+  -- result_sharing ('public', 'organization', 'private')
+  'public',
+  '{}'
+);
+
+INSERT INTO public.study (
+  contact,
+  title,
+  description,
+  icon_name,
+  published,
+  registry_published,
+  questionnaire,
+  eligibility_criteria,
+  observations,
+  interventions,
+  consent,
+  schedule,
+  report_specification,
+  results,
+  created_at,
+  updated_at,
+  user_id,
+  participation,
+  result_sharing,
+  collaborator_emails
+) VALUES(
+  '{"email":"example@example.com","phone":"0123456789","website":"https://studyu.health","researchers":"StudyU Researcher","organization":"StudyU","institutionalReviewBoard":"This study has not been submitted to the IRB Board. It is for illustration purposes of StudyU only.","institutionalReviewBoardNumber":"N/A"}',
+  'Study: published=true, registry_published=false, participation=open, result_sharing=public',
+  'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
+  'accountHeart',
+  -- published
+  true,
+  -- registry_published
+  false,
+  '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
+  '[]',
+  '2021-04-13 18:19:49.000',
+  '2023-05-11 12:46:06.018',
+  -- user_id
+  (tests.get_supabase_user('test_creator_1') ->> 'id')::uuid,
+  -- participation ('open', 'invite')
+  'open',
+  -- result_sharing ('public', 'organization', 'private')
+  'public',
+  '{}'
+);
+
+INSERT INTO public.study (
+  contact,
+  title,
+  description,
+  icon_name,
+  published,
+  registry_published,
+  questionnaire,
+  eligibility_criteria,
+  observations,
+  interventions,
+  consent,
+  schedule,
+  report_specification,
+  results,
+  created_at,
+  updated_at,
+  user_id,
+  participation,
+  result_sharing,
+  collaborator_emails
+) VALUES(
+  '{"email":"example@example.com","phone":"0123456789","website":"https://studyu.health","researchers":"StudyU Researcher","organization":"StudyU","institutionalReviewBoard":"This study has not been submitted to the IRB Board. It is for illustration purposes of StudyU only.","institutionalReviewBoardNumber":"N/A"}',
+  'Study: published=true, registry_published=false, participation=invite, result_sharing=public',
+  'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
+  'accountHeart',
+  -- published
+  true,
+  -- registry_published
+  false,
+  '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
+  '[]',
+  '2021-04-13 18:19:49.000',
+  '2023-05-11 12:46:06.018',
+  -- user_id
+  (tests.get_supabase_user('test_creator_1') ->> 'id')::uuid,
+  -- participation ('open', 'invite')
+  'invite',
+  -- result_sharing ('public', 'organization', 'private')
+  'public',
+  '{}'
+);
+
+-- only accessible with invite
+INSERT INTO public.study (
+  contact,
+  title,
+  description,
+  icon_name,
+  published,
+  registry_published,
+  questionnaire,
+  eligibility_criteria,
+  observations,
+  interventions,
+  consent,
+  schedule,
+  report_specification,
+  results,
+  created_at,
+  updated_at,
+  user_id,
+  participation,
+  result_sharing,
+  collaborator_emails
+) VALUES(
+  '{"email":"example@example.com","phone":"0123456789","website":"https://studyu.health","researchers":"StudyU Researcher","organization":"StudyU","institutionalReviewBoard":"This study has not been submitted to the IRB Board. It is for illustration purposes of StudyU only.","institutionalReviewBoardNumber":"N/A"}',
+  'Study: published=true, registry_published=false, participation=invite, result_sharing=private',
+  'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
+  'accountHeart',
+  -- published
+  true,
+  -- registry_published
+  false,
+  '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
+  '[]',
+  '2021-04-13 18:19:49.000',
+  '2023-05-11 12:46:06.018',
+  -- user_id
+  (tests.get_supabase_user('test_creator_1') ->> 'id')::uuid,
+  -- participation ('open', 'invite')
+  'invite',
+  -- result_sharing ('public', 'organization', 'private')
+  'private',
+  '{}'
+);
+
+--
+-- Creator 2
+-- Description: Studies should not be visible to consumer
+--
+
+INSERT INTO public.study (
+  contact,
+  title,
+  description,
+  icon_name,
+  published,
+  registry_published,
+  questionnaire,
+  eligibility_criteria,
+  observations,
+  interventions,
+  consent,
+  schedule,
+  report_specification,
+  results,
+  created_at,
+  updated_at,
+  user_id,
+  participation,
+  result_sharing,
+  collaborator_emails
+) VALUES(
+  '{"email":"example@example.com","phone":"0123456789","website":"https://studyu.health","researchers":"StudyU Researcher","organization":"StudyU","institutionalReviewBoard":"This study has not been submitted to the IRB Board. It is for illustration purposes of StudyU only.","institutionalReviewBoardNumber":"N/A"}',
+  'Study: published=false, registry_published=true, participation=open, result_sharing=public',
+  'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
+  'accountHeart',
+  -- published
+  false,
+  -- registry_published
+  true,
+  '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
+  '[]',
+  '2021-04-13 18:19:49.000',
+  '2023-05-11 12:46:06.018',
+  -- user_id
+  (tests.get_supabase_user('test_creator_2') ->> 'id')::uuid,
+  -- participation ('open', 'invite')
+  'open',
+  -- result_sharing ('public', 'organization', 'private')
+  'public',
+  '{}'
+);
+
+INSERT INTO public.study (
+  contact,
+  title,
+  description,
+  icon_name,
+  published,
+  registry_published,
+  questionnaire,
+  eligibility_criteria,
+  observations,
+  interventions,
+  consent,
+  schedule,
+  report_specification,
+  results,
+  created_at,
+  updated_at,
+  user_id,
+  participation,
+  result_sharing,
+  collaborator_emails
+) VALUES(
+  '{"email":"example@example.com","phone":"0123456789","website":"https://studyu.health","researchers":"StudyU Researcher","organization":"StudyU","institutionalReviewBoard":"This study has not been submitted to the IRB Board. It is for illustration purposes of StudyU only.","institutionalReviewBoardNumber":"N/A"}',
+  'Study: published=false, registry_published=false, participation=invite, result_sharing=private',
+  'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
+  'accountHeart',
+  -- published
+  false,
+  -- registry_published
+  false,
+  '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
+  '[]',
+  '2021-04-13 18:19:49.000',
+  '2023-05-11 12:46:06.018',
+  -- user_id
+  (tests.get_supabase_user('test_creator_2') ->> 'id')::uuid,
+  -- participation ('open', 'invite')
+  'invite',
+  -- result_sharing ('public', 'organization', 'private')
+  'private',
+  '{}'
+);
+
+--
+-- start tests
+--
+
+-- plan tests in advance, this ensures the proper number of tests have been run.
+SELECT plan(19);
+
+-- UNRESTRICTED TESTS
+
+SELECT is(count(*)::int, 1, 'Check if app_config was seeded') FROM public.app_config;
+
+-- check if RLS is enabled on all tables in the public schema
+SELECT tests.rls_enabled('public');
+
+SELECT is(count(*)::int, 3, 'Check if users were created and can be accessed') FROM public.user;
+
+-- ANONYMOUS TESTS
+
+SELECT tests.clear_authentication();
+SELECT is(count(*)::int, 0, 'Check if users cannot be accessed anonymously') FROM public.user;
+SELECT is(published, true, 'Check if all anonymously accessed studies are published') FROM public.study;
+
+-- CREATOR 1 TESTS
+
+SELECT tests.authenticate_as('test_creator_1');
+SELECT is(email, 'test_creator_1@studyu.health', 'Check if a user can only retrieve his user') FROM public.user;
+
+-- CREATOR 2 TESTS
+
+SELECT tests.authenticate_as('test_creator_2');
+SELECT is(email, 'test_creator_2@studyu.health', 'Check if a user can only retrieve his user') FROM public.user;
+
+-- CONSUMER TESTS
+
+SELECT tests.authenticate_as('test_consumer');
+
+-- test specific: all published studies are created by test_creator_1
+SELECT is(user_id, (tests.get_supabase_user('test_creator_1') ->> 'id')::uuid, 'All published studies are created by test_creator_1') FROM public.study;
+SELECT is(count(*)::int, 3, 'Verify number of accessible studies') FROM public.study;
+
+-- check if the consumer can only access designated published studies
+SELECT is(published, true, 'Check if test_consumer can only access studies that are published') FROM public.study;
+SELECT tests.is_either_true(
+      'Check if test_consumer can only retrieve designated studies',
+      tests.is_equal(registry_published, true),
+      tests.is_equal(participation, 'open'::public.participation),
+      tests.is_equal(result_sharing, 'public'::public.result_sharing)
+  )
+  FROM
+    public.study;
+
+-- check the results of your test
+select * from finish();
+
+-- rollback the transaction, completing the test scenario
+ROLLBACK;

From 22a958c67cfe78fdb5f43f2d08a2ae22251a3d1c Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahim.ozkn@outlook.com>
Date: Tue, 14 May 2024 23:53:28 +0200
Subject: [PATCH 061/314] fix: UI overflows

---
 app/lib/screens/study/dashboard/dashboard.dart         |  2 +-
 .../dashboard/task_overview_tab/task_overview.dart     |  3 ++-
 app/lib/screens/study/report/report_history.dart       | 10 +++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/lib/screens/study/dashboard/dashboard.dart b/app/lib/screens/study/dashboard/dashboard.dart
index 341c3dd32..90041fc96 100644
--- a/app/lib/screens/study/dashboard/dashboard.dart
+++ b/app/lib/screens/study/dashboard/dashboard.dart
@@ -312,7 +312,7 @@ class StudyFinishedPlaceholder extends StatelessWidget {
     const fontSize = 30.0;
     const textStyle = TextStyle(fontSize: fontSize);
     final theme = Theme.of(context);
-    return Center(
+    return SingleChildScrollView(
       child: Padding(
         padding: const EdgeInsets.fromLTRB(32, 32, 32, 32),
         child: Column(
diff --git a/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart b/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart
index 8a5667ec6..d07550b54 100644
--- a/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart
+++ b/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
@@ -79,7 +80,7 @@ class _TaskOverviewState extends State<TaskOverview> {
               const SizedBox(height: 16),
               Row(
                 children: [
-                  Text(AppLocalizations.of(context)!.intervention_current, style: theme.textTheme.titleLarge),
+                  Expanded(child: Text(AppLocalizations.of(context)!.intervention_current, style: theme.textTheme.titleLarge)),
                   const Spacer(),
                   Text(
                     '${widget.subject!.daysLeftForPhase(widget.subject!.getInterventionIndexForDate(DateTime.now()))} ${AppLocalizations.of(context)!.days_left}',
diff --git a/app/lib/screens/study/report/report_history.dart b/app/lib/screens/study/report/report_history.dart
index b10183ca4..24f265f90 100644
--- a/app/lib/screens/study/report/report_history.dart
+++ b/app/lib/screens/study/report/report_history.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
@@ -61,9 +62,12 @@ class ReportHistoryItem extends StatelessWidget {
                   MdiIcons.fromString(subject.study.iconName) ?? MdiIcons.accountHeart,
                   color: isActiveStudy ? Colors.white : Colors.black,
                 ),
-                Text(
-                  subject.study.title!,
-                  style: theme.textTheme.headlineSmall!.copyWith(color: isActiveStudy ? Colors.white : Colors.black),
+                const SizedBox(width: 16),
+                Expanded(
+                  child: Text(
+                    subject.study.title!,
+                    style: theme.textTheme.headlineSmall!.copyWith(color: isActiveStudy ? Colors.white : Colors.black),
+                  ),
                 ),
               ],
             ),

From db8fff949bddde0ac67b996c6ecf166cafdd0aac Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 24 May 2024 19:33:44 +0200
Subject: [PATCH 062/314] chore: add default melos run scripts

---
 melos.yaml | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/melos.yaml b/melos.yaml
index 76d734fa3..6c15189ad 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -74,21 +74,37 @@ scripts:
       melos bootstrap
     description: Reset the workspace to a pristine checkout status.
 
+  app:
+    run: |
+      melos exec -c 1 -- \
+        "flutter run -d chrome --web-port 8080"
+    packageFilters:
+        scope: studyu_app
+    description: Runs StudyU App with default environment
+
+  designer_v2:
+    run: |
+      melos exec -c 1 -- \
+        "flutter run -d chrome --web-port 8081"
+    packageFilters:
+        scope: studyu_designer_v2
+    description: Runs StudyU Designer with default environment
+
   dev:app:
     run: |
       melos exec -c 1 -- \
         "flutter run -d chrome --web-port 8080 --dart-define=STUDYU_ENV=.env.local"
     packageFilters:
       scope: studyu_app
-    description: Runs app for local development
+    description: Runs StudyU App with default environment
 
-  dev:designer:
+  dev:designer_v2:
     run: |
       melos exec -c 1 -- \
         "flutter run -d chrome --web-port 8081 --dart-define=STUDYU_ENV=.env.local"
     packageFilters:
       scope: studyu_designer_v2
-    description: Runs designer for local development
+    description: Runs StudyU Designer for local development
 
   build:android:
     run: |

From fb80696f579b07b11ce876aa8926845a4458598a Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 24 May 2024 19:59:05 +0200
Subject: [PATCH 063/314] chore: add default line length todo

---
 melos.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/melos.yaml b/melos.yaml
index 6c15189ad..c4f4dd3f9 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -23,14 +23,14 @@ scripts:
         "dart fix --apply"
     description: Fix auto-fixable lint errors
 
-  # todo exclude *.g.dart files in a platform agnostic way
-  # dart format sadly does not support this yet: https://github.com/dart-lang/dart_style/issues/864
+  # todo revert to default line length
   format:
     run: |
       melos exec -c 6 -- \
         "dart format -l 120 ."
     description: Format all code and markdown files
 
+  # todo do not exclude files anymore when line length is set to default
   format:ci:
     run: |
       melos exec -c 6 -- \

From e41400c2cfa52fe006a6daf9164b60014fe0003d Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 24 May 2024 20:34:02 +0200
Subject: [PATCH 064/314] chore: disable mega linter reporter

---
 .mega-linter.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mega-linter.yml b/.mega-linter.yml
index ac3f5a1ff..3cb974b9e 100644
--- a/.mega-linter.yml
+++ b/.mega-linter.yml
@@ -58,3 +58,5 @@ MARKDOWN_MARKDOWN_LINK_CHECK_CONFIG_FILE: .markdown_link_check.yml
 # todo deploy-apps.yml can be removed from the excluded list after actionlint#393 is released
 ACTION_ACTIONLINT_FILTER_REGEX_EXCLUDE: (.*\/.github\/workflows\/init-workspace\/action\.yml|.*\/.github\/workflows\/deploy-apps\.yml)
 # SQL_SQLFLUFF_CONFIG_FILE: .sqlfluff
+
+GITHUB_COMMENT_REPORTER: false

From 96774828331bed056e91e903dee387fed17d333a Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 24 May 2024 21:49:03 +0200
Subject: [PATCH 065/314] ci: fix supabase tests

---
 .github/workflows/e2e_tests.yml     | 16 ++++++++++------
 .github/workflows/supabase-test.yml |  5 ++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
index 495e89e77..e17c2df45 100644
--- a/.github/workflows/e2e_tests.yml
+++ b/.github/workflows/e2e_tests.yml
@@ -40,7 +40,6 @@ jobs:
           dart pub get
           dart pub global activate melos
           melos bootstrap
-          cp flutter_common/lib/envs/.env.local.example flutter_common/lib/envs/.env.local
 
       - name: Set up Supabase CLI
         uses: supabase/setup-cli@v1
@@ -50,13 +49,18 @@ jobs:
       - name: Prepare database migrations
         run: |
           mkdir -p supabase/migrations
-          mv database/studyu-schema.sql supabase/migrations/0000000000001_studyu-schema.sql
-          mv database/app_config.sql.example supabase/migrations/0000000000002_app_config_mockup.sql
+          cp database/studyu-schema.sql supabase/migrations/0000000000001_studyu-schema.sql
+          cp database/app_config.sql.example supabase/migrations/0000000000002_app_config_mockup.sql
+
+      - name: Start Supabase
+        run: |
+          supabase start -x studio,imgproxy
 
-      - name: Start Supabase database
+      - name: Configure local StudyU environment
         run: |
-          supabase db start
-          supabase migration up
+          cp flutter_common/lib/envs/.env.local.example flutter_common/lib/envs/.env.local
+          LC_ALL=C sed -i.bak '/STUDYU_SUPABASE_PUBLIC_ANON_KEY/d' flutter_common/lib/envs/.env.local
+          echo "STUDYU_SUPABASE_PUBLIC_ANON_KEY=$(supabase status -o env | grep ANON_KEY | cut -d'=' -f2)" >> flutter_common/lib/envs/.env.local
 
       - name: Start Chrome Driver
         run: |
diff --git a/.github/workflows/supabase-test.yml b/.github/workflows/supabase-test.yml
index 0b6e197b4..efb21ec38 100644
--- a/.github/workflows/supabase-test.yml
+++ b/.github/workflows/supabase-test.yml
@@ -28,8 +28,8 @@ jobs:
       - name: Prepare database migrations
         run: |
           mkdir -p supabase/migrations
-          mv database/studyu-schema.sql supabase/migrations/0000000000001_studyu-schema.sql
-          mv database/app_config.sql.example supabase/migrations/0000000000002_app_config_mockup.sql
+          cp database/studyu-schema.sql supabase/migrations/0000000000001_studyu-schema.sql
+          cp database/app_config.sql.example supabase/migrations/0000000000002_app_config_mockup.sql
 
       - name: Set up Supabase CLI
         uses: supabase/setup-cli@v1
@@ -39,7 +39,6 @@ jobs:
       - name: Initialize Supabase
         run: |
           supabase db start
-          supabase migration up
 
       - name: Run Supabase Tests
         run: |

From f57075f9d7cefbba6e591fb1d9d51da2f51d9ccd Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 24 May 2024 22:10:56 +0200
Subject: [PATCH 066/314] ci: change url

---
 .github/workflows/e2e_tests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
index e17c2df45..6af344cfe 100644
--- a/.github/workflows/e2e_tests.yml
+++ b/.github/workflows/e2e_tests.yml
@@ -61,6 +61,8 @@ jobs:
           cp flutter_common/lib/envs/.env.local.example flutter_common/lib/envs/.env.local
           LC_ALL=C sed -i.bak '/STUDYU_SUPABASE_PUBLIC_ANON_KEY/d' flutter_common/lib/envs/.env.local
           echo "STUDYU_SUPABASE_PUBLIC_ANON_KEY=$(supabase status -o env | grep ANON_KEY | cut -d'=' -f2)" >> flutter_common/lib/envs/.env.local
+          LC_ALL=C sed -i.bak '/STUDYU_SUPABASE_URL/d' flutter_common/lib/envs/.env.local
+          echo "STUDYU_SUPABASE_URL=http://localhost:54321" >> flutter_common/lib/envs/.env.local
 
       - name: Start Chrome Driver
         run: |

From da22b22e73d0da072fa2c50ecfa2c51acc2cdaba Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sat, 25 May 2024 11:30:26 +0200
Subject: [PATCH 067/314] chore: seed data to supabase cli

---
 .github/workflows/e2e_tests.yml               |  5 +-
 .github/workflows/supabase-test.yml           |  1 -
 database/app_config.sql.example               | 12 ----
 supabase/config.toml                          |  2 +-
 .../0000000000001_studyu-schema.sql           |  1 +
 .../0000000000002_mockup-schema.sql           | 67 ++++++++++++++++++
 supabase/seed.sql                             | 70 +++++++++++++++++++
 ..._test_helpers.sql => 000-tests_schema.sql} |  0
 8 files changed, 141 insertions(+), 17 deletions(-)
 delete mode 100644 database/app_config.sql.example
 create mode 120000 supabase/migrations/0000000000001_studyu-schema.sql
 create mode 100644 supabase/migrations/0000000000002_mockup-schema.sql
 create mode 100644 supabase/seed.sql
 rename supabase/tests/{000-supabase_test_helpers.sql => 000-tests_schema.sql} (100%)

diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
index 6af344cfe..c6404a498 100644
--- a/.github/workflows/e2e_tests.yml
+++ b/.github/workflows/e2e_tests.yml
@@ -50,7 +50,6 @@ jobs:
         run: |
           mkdir -p supabase/migrations
           cp database/studyu-schema.sql supabase/migrations/0000000000001_studyu-schema.sql
-          cp database/app_config.sql.example supabase/migrations/0000000000002_app_config_mockup.sql
 
       - name: Start Supabase
         run: |
@@ -61,8 +60,8 @@ jobs:
           cp flutter_common/lib/envs/.env.local.example flutter_common/lib/envs/.env.local
           LC_ALL=C sed -i.bak '/STUDYU_SUPABASE_PUBLIC_ANON_KEY/d' flutter_common/lib/envs/.env.local
           echo "STUDYU_SUPABASE_PUBLIC_ANON_KEY=$(supabase status -o env | grep ANON_KEY | cut -d'=' -f2)" >> flutter_common/lib/envs/.env.local
-          LC_ALL=C sed -i.bak '/STUDYU_SUPABASE_URL/d' flutter_common/lib/envs/.env.local
-          echo "STUDYU_SUPABASE_URL=http://localhost:54321" >> flutter_common/lib/envs/.env.local
+          # LC_ALL=C sed -i.bak '/STUDYU_SUPABASE_URL/d' flutter_common/lib/envs/.env.local
+          # echo "STUDYU_SUPABASE_URL=http://localhost:54321" >> flutter_common/lib/envs/.env.local
 
       - name: Start Chrome Driver
         run: |
diff --git a/.github/workflows/supabase-test.yml b/.github/workflows/supabase-test.yml
index efb21ec38..09472d1a9 100644
--- a/.github/workflows/supabase-test.yml
+++ b/.github/workflows/supabase-test.yml
@@ -29,7 +29,6 @@ jobs:
         run: |
           mkdir -p supabase/migrations
           cp database/studyu-schema.sql supabase/migrations/0000000000001_studyu-schema.sql
-          cp database/app_config.sql.example supabase/migrations/0000000000002_app_config_mockup.sql
 
       - name: Set up Supabase CLI
         uses: supabase/setup-cli@v1
diff --git a/database/app_config.sql.example b/database/app_config.sql.example
deleted file mode 100644
index 9f3977277..000000000
--- a/database/app_config.sql.example
+++ /dev/null
@@ -1,12 +0,0 @@
-INSERT INTO public.app_config (id, app_min_version, app_privacy, app_terms, designer_privacy, designer_terms, imprint, contact, analytics)
-VALUES (
-    'prod',
-    '2.6.0',
-    '{ "de": "example.com", "en": "example.com" }',
-    '{ "de": "example.com", "en": "example.com" }',
-    '{ "de": "example.com", "en": "example.com" }',
-    '{ "de": "example.com", "en": "example.com" }',
-    '{ "de": "example.com", "en": "example.com" }',
-    '{ "email": "email@example.com", "phone": "1235678", "website": "example.com", "organization": "example" }',
-    '{ "dsn": "example", "enabled": false, "samplingRate": 0 }'
-);
diff --git a/supabase/config.toml b/supabase/config.toml
index 8bf9a731d..cc90c6de9 100644
--- a/supabase/config.toml
+++ b/supabase/config.toml
@@ -5,7 +5,7 @@ project_id = "studyu-test"
 [api]
 enabled = true
 # Port to use for the API URL.
-port = 54321
+port = 8082
 # Schemas to expose in your API. Tables, views and stored procedures in this schema will get API
 # endpoints. `public` is always included.
 schemas = ["public", "graphql_public"]
diff --git a/supabase/migrations/0000000000001_studyu-schema.sql b/supabase/migrations/0000000000001_studyu-schema.sql
new file mode 120000
index 000000000..6220d8b8f
--- /dev/null
+++ b/supabase/migrations/0000000000001_studyu-schema.sql
@@ -0,0 +1 @@
+../../database/studyu-schema.sql
\ No newline at end of file
diff --git a/supabase/migrations/0000000000002_mockup-schema.sql b/supabase/migrations/0000000000002_mockup-schema.sql
new file mode 100644
index 000000000..45f83c08a
--- /dev/null
+++ b/supabase/migrations/0000000000002_mockup-schema.sql
@@ -0,0 +1,67 @@
+BEGIN;
+
+-- We want to store all of this in the mockup schema to keep it
+-- separate from any application data
+CREATE SCHEMA IF NOT EXISTS mockup;
+
+-- anon and authenticated should have access to mockup schema
+GRANT USAGE ON SCHEMA mockup TO anon, authenticated;
+-- Don't allow public to execute any functions in the mockup schema
+ALTER DEFAULT PRIVILEGES IN SCHEMA mockup REVOKE EXECUTE ON FUNCTIONS FROM public;
+-- Grant execute to anon and authenticated for mockup
+ALTER DEFAULT PRIVILEGES IN SCHEMA mockup GRANT EXECUTE ON FUNCTIONS TO anon, authenticated;
+
+/*
+    * This function is used to create a user in the `auth.users` table.
+    *
+    * @param email - The email address of the user
+    * @param password - The password of the user
+    *
+    * @returns user_id - The UUID of the user in the `auth.users` table
+*/
+CREATE OR REPLACE FUNCTION mockup.create_user(
+    email text,
+    password text
+) RETURNS uuid AS $$
+  declare
+  user_id uuid;
+  encrypted_pw text;
+BEGIN
+  user_id := gen_random_uuid();
+  encrypted_pw := extensions.crypt(password, extensions.gen_salt('bf', 12));
+
+  INSERT INTO auth.users
+    (instance_id, id, aud, role, email, encrypted_password, email_confirmed_at, recovery_sent_at, last_sign_in_at, raw_app_meta_data, raw_user_meta_data, created_at, updated_at, confirmation_token, email_change, email_change_token_new, recovery_token)
+  VALUES
+    ('00000000-0000-0000-0000-000000000000', user_id, 'authenticated', 'authenticated', email, encrypted_pw, now() at time zone 'utc', now() at time zone 'utc', now() at time zone 'utc', '{"provider":"email","providers":["email"]}', '{}', now() at time zone 'utc', now() at time zone 'utc', '', '', '', '');
+
+  INSERT INTO auth.identities (id, user_id, provider_id, identity_data, provider, last_sign_in_at, created_at, updated_at)
+  VALUES
+    (gen_random_uuid(), user_id, user_id, format('{"sub":"%s","email":"%s"}', user_id::text, email)::jsonb, 'email', now() at time zone 'utc', now() at time zone 'utc', now() at time zone 'utc');
+
+  RETURN user_id;
+END;
+$$ LANGUAGE plpgsql;
+
+/*
+    * This function is used to get a user by their email address.
+    *
+    * @param email_needle - The email of the user to get
+    *
+    * @returns user - The user object
+*/
+CREATE OR REPLACE FUNCTION mockup.get_user(
+    email_needle text
+) RETURNS json AS $$
+     DECLARE
+         supabase_user json;
+     BEGIN
+         SELECT json_build_object('id', id, 'email', email, 'phone', phone, 'raw_user_meta_data', raw_user_meta_data) into supabase_user FROM auth.users WHERE email = email_needle LIMIT 1;
+         if supabase_user is null OR supabase_user -> 'id' IS NULL then
+             RAISE EXCEPTION 'User with email % not found', identifier;
+         end if;
+         RETURN supabase_user;
+     END;
+ $$ LANGUAGE plpgsql;
+
+COMMIT;
diff --git a/supabase/seed.sql b/supabase/seed.sql
new file mode 100644
index 000000000..672244d29
--- /dev/null
+++ b/supabase/seed.sql
@@ -0,0 +1,70 @@
+BEGIN;
+
+INSERT INTO public.app_config (id, app_min_version, app_privacy, app_terms, designer_privacy, designer_terms, imprint, contact, analytics)
+VALUES (
+    'prod',
+    '2.6.0',
+    '{ "de": "example.com", "en": "example.com" }',
+    '{ "de": "example.com", "en": "example.com" }',
+    '{ "de": "example.com", "en": "example.com" }',
+    '{ "de": "example.com", "en": "example.com" }',
+    '{ "de": "example.com", "en": "example.com" }',
+    '{ "email": "email@example.com", "phone": "1235678", "website": "example.com", "organization": "example" }',
+    '{ "dsn": "example", "enabled": false, "samplingRate": 0 }'
+);
+
+-- Seed data
+
+DO $$
+DECLARE
+    email text := 'user1@studyu.health';
+    password text := 'user1pass';
+    user_id UUID;
+BEGIN
+    user_id := mockup.create_user(email, password);
+
+    INSERT INTO public.study (
+      contact,
+      title,
+      description,
+      icon_name,
+      published,
+      registry_published,
+      questionnaire,
+      eligibility_criteria,
+      observations,
+      interventions,
+      consent,
+      schedule,
+      report_specification,
+      results,
+      created_at,
+      updated_at,
+      user_id,
+      participation,
+      result_sharing,
+      collaborator_emails
+    ) VALUES(
+      '{"email":"example@example.com","phone":"0123456789","website":"https://studyu.health","researchers":"StudyU Researcher","organization":"StudyU","institutionalReviewBoard":"This study has not been submitted to the IRB Board. It is for illustration purposes of StudyU only.","institutionalReviewBoardNumber":"N/A"}',
+      'Public demo study of user1',
+      'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
+      'accountHeart',
+      -- published
+      true,
+      -- registry_published
+      true,
+      '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
+      '[]',
+      '2021-04-13 18:19:49.000',
+      '2023-05-11 12:46:06.018',
+      -- user_id
+      user_id,
+      -- participation ('open', 'invite')
+      'open',
+      -- result_sharing ('public', 'organization', 'private')
+      'public',
+      '{}'
+    );
+END $$;
+
+COMMIT;
diff --git a/supabase/tests/000-supabase_test_helpers.sql b/supabase/tests/000-tests_schema.sql
similarity index 100%
rename from supabase/tests/000-supabase_test_helpers.sql
rename to supabase/tests/000-tests_schema.sql

From 64a0563cf9751bc4d060790b73f414a20a2189ce Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sat, 25 May 2024 11:56:01 +0200
Subject: [PATCH 068/314] chore: rename migrations

---
 .../migration/{migrate-v1_v2.sql => 20220822_migrate-v1_v2.sql}   | 0
 .../migration/{migrate-v2_6.sql => 20230630_migrate-v2_6.sql}     | 0
 ...user_preferences.sql => 20230705_migrate-user_preferences.sql} | 0
 database/migration/{migrate_db.sql => 20231011_migrate_db.sql}    | 0
 .../{migrate_multimodal.sql => 20231114_migrate_multimodal.sql}   | 0
 ...v2_result_export.sql => 20231207_migrate-v2_result_export.sql} | 0
 ...e-app_min_version.sql => 20240205_migrate-app_min_version.sql} | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 rename database/migration/{migrate-v1_v2.sql => 20220822_migrate-v1_v2.sql} (100%)
 rename database/migration/{migrate-v2_6.sql => 20230630_migrate-v2_6.sql} (100%)
 rename database/migration/{migrate-user_preferences.sql => 20230705_migrate-user_preferences.sql} (100%)
 rename database/migration/{migrate_db.sql => 20231011_migrate_db.sql} (100%)
 rename database/migration/{migrate_multimodal.sql => 20231114_migrate_multimodal.sql} (100%)
 rename database/migration/{migrate-v2_result_export.sql => 20231207_migrate-v2_result_export.sql} (100%)
 rename database/migration/{migrate-app_min_version.sql => 20240205_migrate-app_min_version.sql} (100%)

diff --git a/database/migration/migrate-v1_v2.sql b/database/migration/20220822_migrate-v1_v2.sql
similarity index 100%
rename from database/migration/migrate-v1_v2.sql
rename to database/migration/20220822_migrate-v1_v2.sql
diff --git a/database/migration/migrate-v2_6.sql b/database/migration/20230630_migrate-v2_6.sql
similarity index 100%
rename from database/migration/migrate-v2_6.sql
rename to database/migration/20230630_migrate-v2_6.sql
diff --git a/database/migration/migrate-user_preferences.sql b/database/migration/20230705_migrate-user_preferences.sql
similarity index 100%
rename from database/migration/migrate-user_preferences.sql
rename to database/migration/20230705_migrate-user_preferences.sql
diff --git a/database/migration/migrate_db.sql b/database/migration/20231011_migrate_db.sql
similarity index 100%
rename from database/migration/migrate_db.sql
rename to database/migration/20231011_migrate_db.sql
diff --git a/database/migration/migrate_multimodal.sql b/database/migration/20231114_migrate_multimodal.sql
similarity index 100%
rename from database/migration/migrate_multimodal.sql
rename to database/migration/20231114_migrate_multimodal.sql
diff --git a/database/migration/migrate-v2_result_export.sql b/database/migration/20231207_migrate-v2_result_export.sql
similarity index 100%
rename from database/migration/migrate-v2_result_export.sql
rename to database/migration/20231207_migrate-v2_result_export.sql
diff --git a/database/migration/migrate-app_min_version.sql b/database/migration/20240205_migrate-app_min_version.sql
similarity index 100%
rename from database/migration/migrate-app_min_version.sql
rename to database/migration/20240205_migrate-app_min_version.sql

From 7edd862b4bf37157dc38d959ab73997f5335d975 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sat, 25 May 2024 12:00:55 +0200
Subject: [PATCH 069/314] ci: fix supabase migration

---
 .github/workflows/e2e_tests.yml     | 5 -----
 .github/workflows/supabase-test.yml | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
index c6404a498..661d394f5 100644
--- a/.github/workflows/e2e_tests.yml
+++ b/.github/workflows/e2e_tests.yml
@@ -46,11 +46,6 @@ jobs:
         with:
           version: latest
 
-      - name: Prepare database migrations
-        run: |
-          mkdir -p supabase/migrations
-          cp database/studyu-schema.sql supabase/migrations/0000000000001_studyu-schema.sql
-
       - name: Start Supabase
         run: |
           supabase start -x studio,imgproxy
diff --git a/.github/workflows/supabase-test.yml b/.github/workflows/supabase-test.yml
index 09472d1a9..3cf946023 100644
--- a/.github/workflows/supabase-test.yml
+++ b/.github/workflows/supabase-test.yml
@@ -25,11 +25,6 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Prepare database migrations
-        run: |
-          mkdir -p supabase/migrations
-          cp database/studyu-schema.sql supabase/migrations/0000000000001_studyu-schema.sql
-
       - name: Set up Supabase CLI
         uses: supabase/setup-cli@v1
         with:

From f921601dec4d39b6829ccb8e93e63c9b548db2fe Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sat, 25 May 2024 12:03:24 +0200
Subject: [PATCH 070/314] ci: run on change

---
 .github/workflows/e2e_tests.yml     | 1 +
 .github/workflows/supabase-test.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
index 661d394f5..59fa42b61 100644
--- a/.github/workflows/e2e_tests.yml
+++ b/.github/workflows/e2e_tests.yml
@@ -3,6 +3,7 @@ name: E2E tests
 on:
   push:
     paths:
+      - ".github/workflows/e2e_tests.yml"
       - 'designer_v2/**'
       - 'core/**'
       - 'flutter_common/**'
diff --git a/.github/workflows/supabase-test.yml b/.github/workflows/supabase-test.yml
index 3cf946023..6faee1507 100644
--- a/.github/workflows/supabase-test.yml
+++ b/.github/workflows/supabase-test.yml
@@ -2,6 +2,7 @@ name: Test Supabase
 on:
   push:
     paths:
+      - ".github/workflows/supabase-test.yml"
       - "database/**"
   workflow_dispatch:
 

From 078485a2d9a39b0eaa0db21a0596005a52e94cf1 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sat, 25 May 2024 13:36:44 +0200
Subject: [PATCH 071/314] ci: create supabase ci seed

---
 .github/workflows/e2e_tests.yml     |  8 ++++----
 .github/workflows/supabase-test.yml |  4 ++++
 supabase/seed-ci.sql                | 18 ++++++++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 supabase/seed-ci.sql

diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
index 59fa42b61..0a7a02f92 100644
--- a/.github/workflows/e2e_tests.yml
+++ b/.github/workflows/e2e_tests.yml
@@ -9,10 +9,6 @@ on:
       - 'flutter_common/**'
   workflow_dispatch:
 
-concurrency:
-  group: ${{ github.ref }}-e2e-tests
-  cancel-in-progress: true
-
 jobs:
   drive_web:
     runs-on: ubuntu-latest
@@ -42,6 +38,10 @@ jobs:
           dart pub global activate melos
           melos bootstrap
 
+      - name: Prepare Supabase CI Seed
+        run: |
+          cp supabase/seed-ci.sql supabase/seed.sql
+
       - name: Set up Supabase CLI
         uses: supabase/setup-cli@v1
         with:
diff --git a/.github/workflows/supabase-test.yml b/.github/workflows/supabase-test.yml
index 6faee1507..f128983db 100644
--- a/.github/workflows/supabase-test.yml
+++ b/.github/workflows/supabase-test.yml
@@ -26,6 +26,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Prepare Supabase CI Seed
+        run: |
+          cp supabase/seed-ci.sql supabase/seed.sql
+
       - name: Set up Supabase CLI
         uses: supabase/setup-cli@v1
         with:
diff --git a/supabase/seed-ci.sql b/supabase/seed-ci.sql
new file mode 100644
index 000000000..3e5284f15
--- /dev/null
+++ b/supabase/seed-ci.sql
@@ -0,0 +1,18 @@
+-- Seed for CI environment to create a clean test environment
+
+BEGIN;
+
+INSERT INTO public.app_config (id, app_min_version, app_privacy, app_terms, designer_privacy, designer_terms, imprint, contact, analytics)
+VALUES (
+    'prod',
+    '2.6.0',
+    '{ "de": "example.com", "en": "example.com" }',
+    '{ "de": "example.com", "en": "example.com" }',
+    '{ "de": "example.com", "en": "example.com" }',
+    '{ "de": "example.com", "en": "example.com" }',
+    '{ "de": "example.com", "en": "example.com" }',
+    '{ "email": "email@example.com", "phone": "1235678", "website": "example.com", "organization": "example" }',
+    '{ "dsn": "example", "enabled": false, "samplingRate": 0 }'
+);
+
+COMMIT;

From fef0e3723a4fdb45ba03836ab9538d36bb411f83 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sat, 25 May 2024 13:42:34 +0200
Subject: [PATCH 072/314] ci: rename step

---
 .github/workflows/supabase-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/supabase-test.yml b/.github/workflows/supabase-test.yml
index f128983db..54eccfa7a 100644
--- a/.github/workflows/supabase-test.yml
+++ b/.github/workflows/supabase-test.yml
@@ -35,7 +35,7 @@ jobs:
         with:
           version: latest
 
-      - name: Initialize Supabase
+      - name: Start Supabase database
         run: |
           supabase db start
 

From 1d62ea3c47209ef25ec18c77be7068401723d82e Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sat, 25 May 2024 13:45:51 +0200
Subject: [PATCH 073/314] ci: remove studyu supabase url change

---
 .github/workflows/e2e_tests.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
index 0a7a02f92..a6f2c9094 100644
--- a/.github/workflows/e2e_tests.yml
+++ b/.github/workflows/e2e_tests.yml
@@ -56,8 +56,6 @@ jobs:
           cp flutter_common/lib/envs/.env.local.example flutter_common/lib/envs/.env.local
           LC_ALL=C sed -i.bak '/STUDYU_SUPABASE_PUBLIC_ANON_KEY/d' flutter_common/lib/envs/.env.local
           echo "STUDYU_SUPABASE_PUBLIC_ANON_KEY=$(supabase status -o env | grep ANON_KEY | cut -d'=' -f2)" >> flutter_common/lib/envs/.env.local
-          # LC_ALL=C sed -i.bak '/STUDYU_SUPABASE_URL/d' flutter_common/lib/envs/.env.local
-          # echo "STUDYU_SUPABASE_URL=http://localhost:54321" >> flutter_common/lib/envs/.env.local
 
       - name: Start Chrome Driver
         run: |

From 0c9013c590d1a93afc593b00e558323ddac3fc98 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sat, 25 May 2024 16:34:22 +0200
Subject: [PATCH 074/314] fix: put supabase cli default anon key in
 env.local.example

---
 flutter_common/lib/envs/.env.local.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flutter_common/lib/envs/.env.local.example b/flutter_common/lib/envs/.env.local.example
index 392b60a75..c797de031 100644
--- a/flutter_common/lib/envs/.env.local.example
+++ b/flutter_common/lib/envs/.env.local.example
@@ -1,5 +1,5 @@
 STUDYU_SUPABASE_URL=http://localhost:8082
-STUDYU_SUPABASE_PUBLIC_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJhbm9uIiwKICAgICJpc3MiOiAic3VwYWJhc2UtZGVtbyIsCiAgICAiaWF0IjogMTY0MTc2OTIwMCwKICAgICJleHAiOiAxNzk5NTM1NjAwCn0.dc_X5iR_VP_qT0zsiyj_I_OZ2T9FtRU2BBNWN8Bu4GE
+STUDYU_SUPABASE_PUBLIC_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0
 STUDYU_PROJECT_GENERATOR_URL=
 STUDYU_APP_URL=http://localhost:8080
 STUDYU_DESIGNER_URL=http://localhost:8081

From 3c32dd6dddcbb23a7d11d500d49a14c2010d90f7 Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahim.ozkn@outlook.com>
Date: Sun, 26 May 2024 21:34:05 +0200
Subject: [PATCH 075/314] perf: improve dashboard study fetching

---
 core/lib/src/models/tables/study.dart        | 69 ++++++++++++++++++--
 core/lib/src/models/tables/study.g.dart      | 58 ++++++++--------
 designer_v2/lib/repositories/api_client.dart | 51 ++++++++++++---
 3 files changed, 135 insertions(+), 43 deletions(-)

diff --git a/core/lib/src/models/tables/study.dart b/core/lib/src/models/tables/study.dart
index a168737c4..55bbc7e6e 100644
--- a/core/lib/src/models/tables/study.dart
+++ b/core/lib/src/models/tables/study.dart
@@ -50,23 +50,31 @@ class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study>
   Participation participation = Participation.invite;
   @JsonKey(name: 'result_sharing')
   ResultSharing resultSharing = ResultSharing.private;
+  @JsonKey(fromJson: _contactFromJson)
   late Contact contact = Contact();
-  @JsonKey(name: 'icon_name')
+  @JsonKey(name: 'icon_name', defaultValue: 'accountHeart')
   late String iconName = 'accountHeart';
+  @JsonKey(defaultValue: false)
   late bool published = false;
+  @JsonKey(fromJson: _questionnaireFromJson)
   late StudyUQuestionnaire questionnaire = StudyUQuestionnaire();
-  @JsonKey(name: 'eligibility_criteria')
+  @JsonKey(name: 'eligibility_criteria', fromJson: _eligibilityCriteriaFromJson)
   late List<EligibilityCriterion> eligibilityCriteria = [];
+  @JsonKey(defaultValue: [])
   late List<ConsentItem> consent = [];
+  @JsonKey(defaultValue: [])
   late List<Intervention> interventions = [];
+  @JsonKey(defaultValue: [])
   late List<Observation> observations = [];
+  @JsonKey(fromJson: _studyScheduleFromJson)
   late StudySchedule schedule = StudySchedule();
-  @JsonKey(name: 'report_specification')
+  @JsonKey(name: 'report_specification', fromJson: _reportSpecificationFromJson)
   late ReportSpecification reportSpecification = ReportSpecification();
+  @JsonKey(defaultValue: [])
   late List<StudyResult> results = [];
-  @JsonKey(name: 'collaborator_emails')
+  @JsonKey(name: 'collaborator_emails', defaultValue: [])
   late List<String> collaboratorEmails = [];
-  @JsonKey(name: 'registry_published')
+  @JsonKey(name: 'registry_published', defaultValue: false)
   late bool registryPublished = false;
 
   @JsonKey(includeToJson: false, includeFromJson: false)
@@ -97,6 +105,41 @@ class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study>
 
   Study.withId(this.userId) : id = const Uuid().v4();
 
+  static List<EligibilityCriterion> _eligibilityCriteriaFromJson(dynamic json) {
+    if (json == null) {
+      return [];
+    }
+    return (json as List).map((e) => EligibilityCriterion.fromJson(e as Map<String, dynamic>)).toList();
+  }
+
+  static Contact _contactFromJson(dynamic json) {
+    if (json is Map<String, dynamic>) {
+      return Contact.fromJson(json);
+    }
+    return Contact();
+  }
+
+  static StudySchedule _studyScheduleFromJson(dynamic json) {
+    if (json is Map<String, dynamic>) {
+      return StudySchedule.fromJson(json);
+    }
+    return StudySchedule();
+  }
+
+  static StudyUQuestionnaire _questionnaireFromJson(dynamic json) {
+    if (json is List<dynamic>) {
+      return StudyUQuestionnaire.fromJson(json);
+    }
+    return StudyUQuestionnaire();
+  }
+
+  static ReportSpecification _reportSpecificationFromJson(dynamic json) {
+    if (json is Map<String, dynamic>) {
+      return ReportSpecification.fromJson(json);
+    }
+    return ReportSpecification();
+  }
+
   factory Study.fromJson(Map<String, dynamic> json) {
     final study = _$StudyFromJson(json);
 
@@ -166,6 +209,22 @@ class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study>
         ],
       );
 
+  /*static Future<List<Study>> getDashboardDisplayStudies() async => SupabaseQuery.getAll<Study>(
+    selectedColumns: [
+      'id',
+      'title',
+      'description',
+      'user_id',
+      'participation',
+      'result_sharing',
+      'published',
+      'registry_published',
+      'study_participant_count',
+      'study_ended_count',
+      'active_subject_count',
+    ],
+  );*/
+
   // ['id', 'title', 'description', 'published', 'icon_name', 'results', 'schedule']
   static Future<ExtractionResult<Study>> publishedPublicStudies() async {
     ExtractionResult<Study> result;
diff --git a/core/lib/src/models/tables/study.g.dart b/core/lib/src/models/tables/study.g.dart
index bc1917f4d..e1b6daece 100644
--- a/core/lib/src/models/tables/study.g.dart
+++ b/core/lib/src/models/tables/study.g.dart
@@ -16,34 +16,36 @@ Study _$StudyFromJson(Map<String, dynamic> json) => Study(
           $enumDecode(_$ParticipationEnumMap, json['participation'])
       ..resultSharing =
           $enumDecode(_$ResultSharingEnumMap, json['result_sharing'])
-      ..contact = Contact.fromJson(json['contact'] as Map<String, dynamic>)
-      ..iconName = json['icon_name'] as String
-      ..published = json['published'] as bool
-      ..questionnaire =
-          StudyUQuestionnaire.fromJson(json['questionnaire'] as List<dynamic>)
-      ..eligibilityCriteria = (json['eligibility_criteria'] as List<dynamic>)
-          .map((e) => EligibilityCriterion.fromJson(e as Map<String, dynamic>))
-          .toList()
-      ..consent = (json['consent'] as List<dynamic>)
-          .map((e) => ConsentItem.fromJson(e as Map<String, dynamic>))
-          .toList()
-      ..interventions = (json['interventions'] as List<dynamic>)
-          .map((e) => Intervention.fromJson(e as Map<String, dynamic>))
-          .toList()
-      ..observations = (json['observations'] as List<dynamic>)
-          .map((e) => Observation.fromJson(e as Map<String, dynamic>))
-          .toList()
-      ..schedule =
-          StudySchedule.fromJson(json['schedule'] as Map<String, dynamic>)
-      ..reportSpecification = ReportSpecification.fromJson(
-          json['report_specification'] as Map<String, dynamic>)
-      ..results = (json['results'] as List<dynamic>)
-          .map((e) => StudyResult.fromJson(e as Map<String, dynamic>))
-          .toList()
-      ..collaboratorEmails = (json['collaborator_emails'] as List<dynamic>)
-          .map((e) => e as String)
-          .toList()
-      ..registryPublished = json['registry_published'] as bool;
+      ..contact = Study._contactFromJson(json['contact'])
+      ..iconName = json['icon_name'] as String? ?? 'accountHeart'
+      ..published = json['published'] as bool? ?? false
+      ..questionnaire = Study._questionnaireFromJson(json['questionnaire'])
+      ..eligibilityCriteria =
+          Study._eligibilityCriteriaFromJson(json['eligibility_criteria'])
+      ..consent = (json['consent'] as List<dynamic>?)
+              ?.map((e) => ConsentItem.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          []
+      ..interventions = (json['interventions'] as List<dynamic>?)
+              ?.map((e) => Intervention.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          []
+      ..observations = (json['observations'] as List<dynamic>?)
+              ?.map((e) => Observation.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          []
+      ..schedule = Study._studyScheduleFromJson(json['schedule'])
+      ..reportSpecification =
+          Study._reportSpecificationFromJson(json['report_specification'])
+      ..results = (json['results'] as List<dynamic>?)
+              ?.map((e) => StudyResult.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          []
+      ..collaboratorEmails = (json['collaborator_emails'] as List<dynamic>?)
+              ?.map((e) => e as String)
+              .toList() ??
+          []
+      ..registryPublished = json['registry_published'] as bool? ?? false;
 
 Map<String, dynamic> _$StudyToJson(Study instance) {
   final val = <String, dynamic>{
diff --git a/designer_v2/lib/repositories/api_client.dart b/designer_v2/lib/repositories/api_client.dart
index 5f82534c8..2e0299cb1 100644
--- a/designer_v2/lib/repositories/api_client.dart
+++ b/designer_v2/lib/repositories/api_client.dart
@@ -16,7 +16,8 @@ abstract class StudyUApi {
   Future<StudyInvite> saveStudyInvite(StudyInvite invite);
   Future<StudyInvite> fetchStudyInvite(String code);
   Future<void> deleteStudyInvite(StudyInvite invite);
-  Future<List<StudySubject>> deleteParticipants(Study study, List<StudySubject> participants);
+  Future<List<StudySubject>> deleteParticipants(
+      Study study, List<StudySubject> participants);
   /*
   Future<List<SubjectProgress>> deleteStudyProgress(
       Study study, List<SubjectProgress> records);
@@ -51,7 +52,9 @@ class StudyInviteNotFoundException extends APIException {}
 
 class UserNotFoundException extends APIException {}
 
-class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin implements StudyUApi {
+class StudyUApiClient extends SupabaseClientDependant
+    with SupabaseQueryMixin
+    implements StudyUApi {
   StudyUApiClient({
     required this.supabaseClient,
     this.testDelayMilliseconds = 0,
@@ -71,6 +74,21 @@ class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin im
     'study_missed_days',
   ];
 
+  static final studyDisplayColumns = [
+    'id',
+    'title',
+    'description',
+    'user_id',
+    'participation',
+    'result_sharing',
+    'published',
+    'registry_published',
+    'study_participant_count',
+    'study_ended_count',
+    'active_subject_count',
+    'contact',
+  ];
+
   static final studyWithParticipantActivityColumns = [
     ...studyColumns,
     'study_subject!study_subject_studyId_fkey(*)',
@@ -80,7 +98,8 @@ class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin im
   final int testDelayMilliseconds;
 
   @override
-  Future<List<StudySubject>> deleteParticipants(Study study, List<StudySubject> participants) async {
+  Future<List<StudySubject>> deleteParticipants(
+      Study study, List<StudySubject> participants) async {
     await _testDelay();
     if (participants.isEmpty) {
       return Future.value([]);
@@ -108,18 +127,27 @@ class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin im
    */
 
   @override
-  Future<List<Study>> getUserStudies({withParticipantActivity = true}) async {
+  Future<List<Study>> getUserStudies(
+      {withParticipantActivity = false, forDashboardDisplay = true}) async {
     await _testDelay();
     // TODO: fix Postgres policy for proper multi-tenancy
-    final columns = (withParticipantActivity) ? studyWithParticipantActivityColumns : studyColumns;
+    final columns = (withParticipantActivity)
+        ? studyWithParticipantActivityColumns
+        : (forDashboardDisplay)
+            ? studyDisplayColumns
+            : studyColumns;
+
     final request = getAll<Study>(selectedColumns: columns);
     return _awaitGuarded(request);
   }
 
   @override
-  Future<Study> fetchStudy(StudyID studyId, {withParticipantActivity = true}) async {
+  Future<Study> fetchStudy(StudyID studyId,
+      {withParticipantActivity = true}) async {
     await _testDelay();
-    final columns = (withParticipantActivity) ? studyWithParticipantActivityColumns : studyColumns;
+    final columns = (withParticipantActivity)
+        ? studyWithParticipantActivityColumns
+        : studyColumns;
     final request = getById<Study>(studyId, selectedColumns: columns);
     return _awaitGuarded(request, onError: {
       HttpStatus.notAcceptable: (e) => throw StudyNotFoundException(),
@@ -198,7 +226,8 @@ class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin im
   /// domain-specific exception that bubbles up to the data layer.
   ///
   /// Raises a generic [APIException] for errors that cannot be handled.
-  Future<T> _awaitGuarded<T>(Future<T> future, {Map<int, SupabaseQueryExceptionHandler>? onError}) async {
+  Future<T> _awaitGuarded<T>(Future<T> future,
+      {Map<int, SupabaseQueryExceptionHandler>? onError}) async {
     try {
       final result = await future;
       return result;
@@ -206,7 +235,8 @@ class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin im
       if (onError == null) {
         throw _apiException(error: e);
       }
-      if (e.statusCode == null || !onError.containsKey(int.parse(e.statusCode!))) {
+      if (e.statusCode == null ||
+          !onError.containsKey(int.parse(e.statusCode!))) {
         throw _apiException(error: e);
       }
       final errorHandler = onError[int.parse(e.statusCode!)]!;
@@ -228,7 +258,8 @@ class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin im
   }
 
   _testDelay() async {
-    await Future.delayed(Duration(milliseconds: testDelayMilliseconds), () => null);
+    await Future.delayed(
+        Duration(milliseconds: testDelayMilliseconds), () => null);
   }
 }
 

From e5f10083da81cf7ebaa4dde528cd88d211363670 Mon Sep 17 00:00:00 2001
From: StudyU Documenter <studyu-documenter>
Date: Sun, 26 May 2024 19:38:51 +0000
Subject: [PATCH 076/314] docs: update UML documentation

---
 .../shared/questionnaire/question/uml.svg     |  1098 +-
 .../design/shared/questionnaire/uml.svg       |  1082 +-
 .../lib/features/design/shared/uml.svg        |  1478 +-
 .../designer_v2/lib/features/design/uml.svg   |  5558 ++--
 docs/uml/designer_v2/lib/features/uml.svg     | 11432 ++++----
 docs/uml/designer_v2/lib/repositories/uml.svg |  1492 +-
 docs/uml/designer_v2/lib/uml.svg              | 21530 ++++++++--------
 7 files changed, 21828 insertions(+), 21842 deletions(-)

diff --git a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/uml.svg b/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/uml.svg
index 557598554..83fd238a2 100644
--- a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/uml.svg
+++ b/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/uml.svg
@@ -1,5 +1,93 @@
-<svg version="1.1" baseProfile="full" width="4932.3" height="2073.0" viewbox="0 0 4932.25 2073" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;QuestionFormData
+<svg version="1.1" baseProfile="full" width="5090.5" height="2073.0" viewbox="0 0 5090.5 2073" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[SurveyQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel;
+	  +isHtmlStyleable: bool
+	]
+	
+	[SurveyQuestionFormView]o-[QuestionFormViewModel]
+	
+	[AudioRecordingQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
+	
+	[FreeTextQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel;
+	  +generateLabelHelpTextMap: dynamic
+	  |
+	  +Widget build();
+	  +Widget disableOnReadonly();
+	  +Widget generateRow()
+	]
+	
+	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
+	
+	[ChoiceQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
+	
+	[ImageCapturingQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
+	
+	[BoolQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[BoolQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
+	
+	[SurveyQuestionType
+	  |
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
+	  &lt;static&gt;+choice: SurveyQuestionType;
+	  &lt;static&gt;+bool: SurveyQuestionType;
+	  &lt;static&gt;+scale: SurveyQuestionType;
+	  &lt;static&gt;+image: SurveyQuestionType;
+	  &lt;static&gt;+audio: SurveyQuestionType;
+	  &lt;static&gt;+freeText: SurveyQuestionType
+	]
+	
+	[SurveyQuestionType]o-[SurveyQuestionType]
+	[Enum]&lt;:--[SurveyQuestionType]
+	
+	[&lt;abstract&gt;IScaleQuestionFormViewModel
+	  |
+	  +isMidValuesClearedInfoVisible: bool
+	]
+	
+	[ScaleQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	]
+	
+	[ScaleQuestionFormView]o-[QuestionFormViewModel]
+	
+	[&lt;abstract&gt;QuestionFormData
 	  |
 	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
 	  +questionId: String;
@@ -109,86 +197,6 @@
 	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
 	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
 	
-	[AudioRecordingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
-	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
-	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
-	]
-	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
-	
-	[SurveyQuestionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
-	]
-	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[ImageCapturingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	]
-	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
-	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
-	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
 	[QuestionFormViewModel
 	  |
 	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
@@ -287,437 +295,146 @@
 	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
 	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
 	
-	[SurveyQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
-	]
-	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
-	
 	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
+	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="2073.0" width="4932.3" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="2073.0" width="5090.5" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M1543.4 1087.1 L2528.25 1638 L3865.75 1782.4042132982224 L3865.8 1782.4 " fill="none"></path>
+				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
+					<path d="M1969.8 228.2 L1969.75 260 L2953.75 714.8648104662865 L2953.8 714.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1537.9 1077.9 L1543.4 1087.1 L1532.7 1087.2 L1527.1 1078.0 Z"></path>
+						<path d="M1975.1 218.8 L1969.8 228.2 L1964.4 218.8 L1969.8 209.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1296.5 199.8 L1296.5 260 L1296.5 820 L1296.5 820.0 " fill="none"></path>
+					<path d="M2361.8 236.2 L2361.75 260 L2953.75 631.3136094674556 L2953.8 631.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M2367.1 226.8 L2361.8 236.2 L2356.4 226.8 L2361.8 217.5 Z"></path>
 					</g>
-					<path d="M1301.8 199.8 L1296.5 199.8 L1291.2 199.8 L1296.5 186.5 Z"></path>
-					<path d="M1513.7 1085.1 L2396 1638 L2396 1718 L2396.0 1718.0 " fill="none"></path>
-					<path d="M1516.5 1080.6 L1513.7 1085.1 L1510.8 1089.6 L1502.4 1078.0 Z"></path>
-					<path d="M1435.4 1087.4 L1988 1638 L1988 1733 L1988.0 1733.0 " fill="none"></path>
-					<path d="M1439.2 1083.6 L1435.4 1087.4 L1431.6 1091.2 L1426.0 1078.0 Z"></path>
-					<path d="M1341.6 1090.7 L1516 1638 L1516 1733 L1516.0 1733.0 " fill="none"></path>
-					<path d="M1346.7 1089.1 L1341.6 1090.7 L1336.6 1092.3 L1337.6 1078.0 Z"></path>
-					<path d="M1236.5 1090.3 L1004 1638 L1004 1725.5 L1004.0 1725.5 " fill="none"></path>
-					<path d="M1241.4 1092.4 L1236.5 1090.3 L1231.6 1088.2 L1241.7 1078.0 Z"></path>
-					<path d="M556.0 1964.7 L556 1966 L556 1986 L556.0 1986.0 " fill="none"></path>
+					<path d="M3448.4 34.9 L2361.75 82 L2361.75 124.5 L2361.8 124.5 " fill="none"></path>
+					<path d="M3448.7 40.2 L3448.4 34.9 L3448.2 29.5 L3461.8 34.3 Z"></path>
+					<path d="M2753.8 258.7 L2753.75 260 L2953.75 455.0460014154282 L2953.8 455.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M561.3 1955.3 L556.0 1964.7 L550.7 1955.3 L556.0 1946.0 Z"></path>
+						<path d="M2759.1 249.3 L2753.8 258.7 L2748.4 249.3 L2753.8 240.0 Z"></path>
 					</g>
-					<path d="M1148.1 1087.1 L556 1638 L556 1658 L556.0 1658.0 " fill="none"></path>
-					<path d="M1151.7 1091.0 L1148.1 1087.1 L1144.5 1083.2 L1157.9 1078.0 Z"></path>
-					<path d="M172.0 1904.7 L172 1966 L172 1986 L172.0 1986.0 " fill="none"></path>
+					<path d="M3448.4 36.8 L2753.75 82 L2753.75 102 L2753.8 102.0 " fill="none"></path>
+					<path d="M3448.8 42.1 L3448.4 36.8 L3448.1 31.5 L3461.8 35.9 Z"></path>
+					<path d="M3145.8 236.2 L3145.75 260 L3154.8791727140783 280 L3154.9 280.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M177.3 1895.3 L172.0 1904.7 L166.7 1895.3 L172.0 1886.0 Z"></path>
+						<path d="M3151.1 226.8 L3145.8 236.2 L3140.4 226.8 L3145.8 217.5 Z"></path>
 					</g>
-					<path d="M1074.6 1085.0 L172 1638 L172 1718 L172.0 1718.0 " fill="none"></path>
-					<path d="M1077.4 1089.5 L1074.6 1085.0 L1071.8 1080.4 L1086.0 1078.0 Z"></path>
-					<path d="M3849.3 236.2 L3849.25 260 L3842.7768505079825 280 L3842.8 280.0 " fill="none"></path>
+					<path d="M3448.5 42.6 L3145.75 82 L3145.75 124.5 L3145.8 124.5 " fill="none"></path>
+					<path d="M3449.2 47.9 L3448.5 42.6 L3447.8 37.3 L3461.8 40.9 Z"></path>
+					<path d="M3537.8 236.2 L3537.75 260 L3535.5003628447025 280 L3535.5 280.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3854.6 226.8 L3849.3 236.2 L3843.9 226.8 L3849.3 217.5 Z"></path>
+						<path d="M3543.1 226.8 L3537.8 236.2 L3532.4 226.8 L3537.8 217.5 Z"></path>
 					</g>
-					<path d="M2898.1 35.4 L3849.25 82 L3849.25 124.5 L3849.3 124.5 " fill="none"></path>
-					<path d="M2898.3 30.1 L2898.1 35.4 L2897.8 40.7 L2884.8 34.7 Z"></path>
-					<path d="M3457.3 258.7 L3457.25 260 L3462.1556603773583 280 L3462.2 280.0 " fill="none"></path>
+					<path d="M3537.8 59.8 L3537.75 82 L3537.75 124.5 L3537.8 124.5 " fill="none"></path>
+					<path d="M3543.1 59.8 L3537.8 59.8 L3532.4 59.8 L3537.8 46.5 Z"></path>
+					<path d="M3929.8 236.2 L3929.75 260 L3916.1215529753267 280 L3916.1 280.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3462.6 249.3 L3457.3 258.7 L3451.9 249.3 L3457.3 240.0 Z"></path>
+						<path d="M3935.1 226.8 L3929.8 236.2 L3924.4 226.8 L3929.8 217.5 Z"></path>
 					</g>
-					<path d="M2898.0 38.0 L3457.25 82 L3457.25 102 L3457.3 102.0 " fill="none"></path>
-					<path d="M2898.5 32.7 L2898.0 38.0 L2897.6 43.3 L2884.8 37.0 Z"></path>
-					<path d="M4246.8 1747.9 L4355.083333333334 1718.5 L4386.666666666666 1718.5 L4386.666666666666 1718.5 L4418.25 1802 L4418.25 1802 L4386.666666666666 1885.5 L4386.666666666666 1885.5 L4355.083333333334 1885.5 L4355.083333333334 1885.5 L4228.75 1851.2319978343257 L4228.8 1851.2 " fill="none"></path>
+					<path d="M3627.0 42.6 L3929.75 82 L3929.75 124.5 L3929.8 124.5 " fill="none"></path>
+					<path d="M3627.7 37.3 L3627.0 42.6 L3626.3 47.9 L3613.8 40.9 Z"></path>
+					<path d="M380.4 1723.5 L393 1718.5 L400.5 1718.5 L400.5 1718.5 L408 1802 L408 1802 L400.5 1885.5 L400.5 1885.5 L393 1885.5 L393 1885.5 L363 1873.6560283687943 L363.0 1873.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4236.4 1745.2 L4246.8 1747.9 L4239.2 1755.5 L4228.8 1752.8 Z"></path>
+						<path d="M369.7 1722.0 L380.4 1723.5 L373.6 1731.9 L363.0 1730.3 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M4229.8 977.8 L4229.75 1638 L4140.169207317073 1718.5 L4140.2 1718.5 " fill="none"></path>
+						<path d="M141.5 977.8 L141.5 1638 L161.1341463414634 1718.5 L161.1 1718.5 " fill="none"></path>
 					</g>
-					<path d="M4235.1 977.8 L4229.8 977.8 L4224.4 977.8 L4229.8 964.5 Z"></path>
-					<path d="M2673.3 236.2 L2673.25 260 L3119.75 582.8105981112277 L3119.8 582.8 " fill="none"></path>
+					<path d="M146.8 977.8 L141.5 977.8 L136.2 977.8 L141.5 964.5 Z"></path>
+					<path d="M4321.8 220.7 L4321.75 260 L3966.75 543.9175856065003 L3966.8 543.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2678.6 226.8 L2673.3 236.2 L2667.9 226.8 L2673.3 217.5 Z"></path>
+						<path d="M4327.1 211.3 L4321.8 220.7 L4316.4 211.3 L4321.8 202.0 Z"></path>
 					</g>
-					<path d="M2755.1 51.2 L2673.25 82 L2673.25 124.5 L2673.3 124.5 " fill="none"></path>
-					<path d="M2757.0 56.2 L2755.1 51.2 L2753.2 46.2 L2767.6 46.5 Z"></path>
-					<path d="M3065.3 220.7 L3065.25 260 L3119.75 326.93493761140815 L3119.8 326.9 " fill="none"></path>
+					<path d="M1271.4 1087.5 L343.25 1638 L263.8544207317073 1718.5 L263.9 1718.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3070.6 211.3 L3065.3 220.7 L3059.9 211.3 L3065.3 202.0 Z"></path>
+						<path d="M1282.2 1087.3 L1271.4 1087.5 L1276.7 1078.2 L1287.5 1078.0 Z"></path>
 					</g>
-					<path d="M2281.3 236.2 L2281.25 260 L3119.75 689.5364312267658 L3119.8 689.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2286.6 226.8 L2281.3 236.2 L2275.9 226.8 L2281.3 217.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M1505.0 199.8 L1505 260 L1505 820 L1505.0 820.0 " fill="none"></path>
 					</g>
-					<path d="M2719.5 39.6 L2281.25 82 L2281.25 124.5 L2281.3 124.5 " fill="none"></path>
-					<path d="M2720.0 44.9 L2719.5 39.6 L2719.0 34.3 L2732.8 38.3 Z"></path>
-					<path d="M1561.5 236.2 L1561.5 260 L3119.75 779.982685555152 L3119.8 780.0 " fill="none"></path>
+					<path d="M1510.3 199.8 L1505.0 199.8 L1499.7 199.8 L1505.0 186.5 Z"></path>
+					<path d="M1329.7 1086.2 L625 1638 L625 1718 L625.0 1718.0 " fill="none"></path>
+					<path d="M1333.0 1090.4 L1329.7 1086.2 L1326.5 1082.0 L1340.2 1078.0 Z"></path>
+					<path d="M1409.1 1089.0 L1033 1638 L1033 1733 L1033.0 1733.0 " fill="none"></path>
+					<path d="M1413.5 1092.0 L1409.1 1089.0 L1404.7 1086.0 L1416.6 1078.0 Z"></path>
+					<path d="M1505.0 1091.3 L1505 1638 L1505 1733 L1505.0 1733.0 " fill="none"></path>
+					<path d="M1510.3 1091.3 L1505.0 1091.3 L1499.7 1091.3 L1505.0 1078.0 Z"></path>
+					<path d="M1608.8 1088.7 L2017 1638 L2017 1725.5 L2017.0 1725.5 " fill="none"></path>
+					<path d="M1613.1 1085.5 L1608.8 1088.7 L1604.5 1091.9 L1600.9 1078.0 Z"></path>
+					<path d="M2465.0 1964.7 L2465 1966 L2465 1986 L2465.0 1986.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1566.8 226.8 L1561.5 236.2 L1556.2 226.8 L1561.5 217.5 Z"></path>
+						<path d="M2470.3 1955.3 L2465.0 1964.7 L2459.7 1955.3 L2465.0 1946.0 Z"></path>
 					</g>
-					<path d="M2719.4 34.7 L1561.5 82 L1561.5 124.5 L1561.5 124.5 " fill="none"></path>
-					<path d="M2719.6 40.0 L2719.4 34.7 L2719.2 29.3 L2732.8 34.1 Z"></path>
-					<path d="M3959.7 1634.8 L3961.25 1638 L4003.4634146341464 1718.5 L4003.5 1718.5 " fill="none"></path>
+					<path d="M1695.6 1085.8 L2465 1638 L2465 1658 L2465.0 1658.0 " fill="none"></path>
+					<path d="M1698.7 1081.4 L1695.6 1085.8 L1692.5 1090.1 L1684.7 1078.0 Z"></path>
+					<path d="M2849.0 1904.7 L2849 1966 L2849 1986 L2849.0 1986.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3960.4 1624.1 L3959.7 1634.8 L3950.8 1628.7 L3951.5 1618.0 Z"></path>
+						<path d="M2854.3 1895.3 L2849.0 1904.7 L2843.7 1895.3 L2849.0 1886.0 Z"></path>
 					</g>
-					<path d="M3920.0 1635.2 L3921.25 1638 L4463.25 1786.5179615705931 L4463.3 1786.5 " fill="none"></path>
+					<path d="M1768.5 1084.1 L2849 1638 L2849 1718 L2849.0 1718.0 " fill="none"></path>
+					<path d="M1770.9 1079.3 L1768.5 1084.1 L1766.1 1088.8 L1756.6 1078.0 Z"></path>
+					<path d="M2935.5 1066.5 L383.25 1638 L284.2202743902439 1718.5 L284.2 1718.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3921.3 1624.5 L3920.0 1635.2 L3911.5 1628.7 L3912.7 1618.0 Z"></path>
+						<path d="M2945.8 1069.7 L2935.5 1066.5 L2943.5 1059.3 L2953.8 1062.4 Z"></path>
 					</g>
-					<path d="M3785.6 1636.2 L3786 1638 L3777.6242378048782 1786.5 L3777.6 1786.5 " fill="none"></path>
+					<path d="M3119.1 1634.7 L3117.5 1638 L3117.5 1786.5 L3117.5 1786.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3788.7 1625.9 L3785.6 1636.2 L3778.3 1628.3 L3781.4 1618.0 Z"></path>
+						<path d="M3128.1 1628.7 L3119.1 1634.7 L3118.5 1624.0 L3127.4 1618.0 Z"></path>
 					</g>
-					<path d="M3105.6 1395.1 L2822 1638 L2822 1786.5 L2822.0 1786.5 " fill="none"></path>
+					<path d="M3965.3 1633.0 L3969 1638 L3969 1786.5 L3969.0 1786.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3116.1 1393.0 L3105.6 1395.1 L3109.2 1384.9 L3119.8 1382.9 Z"></path>
+						<path d="M3964.1 1622.3 L3965.3 1633.0 L3955.5 1628.7 L3954.2 1618.0 Z"></path>
 					</g>
-					<path d="M3104.6 1321.2 L2660.5 1638 L2660.5 1786.5 L2660.5 1786.5 " fill="none"></path>
+					<path d="M3979.7 1485.8 L4127 1638 L4127 1786.5 L4127.0 1786.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3115.2 1320.1 L3104.6 1321.2 L3109.1 1311.4 L3119.8 1310.4 Z"></path>
-					</g>
-					<path d="M4172.8 199.8 L4172.75 260 L4132.75 310.4300091491308 L4132.8 310.4 " fill="none"></path>
-					<path d="M4178.1 199.8 L4172.8 199.8 L4167.4 199.8 L4172.8 186.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M4402.3 199.8 L4402.25 260 L4132.75 499.2854381443299 L4132.8 499.3 " fill="none"></path>
+						<path d="M3977.1 1475.4 L3979.7 1485.8 L3969.4 1482.8 L3966.8 1472.4 Z"></path>
 					</g>
-					<path d="M4407.6 199.8 L4402.3 199.8 L4396.9 199.8 L4402.3 186.5 Z"></path>
-					<path d="M4700.3 228.2 L4700.25 260 L4132.75 624.066573556797 L4132.8 624.1 " fill="none"></path>
+					<path d="M3981.6 1345.6 L4366 1638 L4366 1786.5 L4366.0 1786.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4705.6 218.8 L4700.3 228.2 L4694.9 218.8 L4700.3 209.5 Z"></path>
+						<path d="M3977.4 1335.7 L3981.6 1345.6 L3970.9 1344.2 L3966.8 1334.3 Z"></path>
 					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="712.5" y="820.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M712.5 851.0 L1880.5 851.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M712.5 987.0 L1880.5 987.0" fill="none" data-name="QuestionFormData"></path>
-						</g>
-						<g transform="translate(712.5, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(712.5, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(712.5, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
-								
-							</g>
-						</g>
+					<path d="M4645.3 199.8 L4645.25 260 L3966.75 654.5033755274262 L3966.8 654.5 " fill="none"></path>
+					<path d="M4650.6 199.8 L4645.3 199.8 L4639.9 199.8 L4645.3 186.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M4874.8 199.8 L4874.75 260 L3966.75 702.2849063273242 L3966.8 702.3 " fill="none"></path>
 					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="3865.8" y="1718.5" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M3865.8 1749.5 L4228.8 1749.5" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(3865.75, 1718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
-								
-							</g>
+					<path d="M4880.1 199.8 L4874.8 199.8 L4869.4 199.8 L4874.8 186.5 Z"></path>
+					<g data-name="SurveyQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
+							<rect x="1793.8" y="132.5" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M1793.8 163.5 L2145.8 163.5" fill="none" data-name="SurveyQuestionFormView"></path>
 						</g>
-						<g transform="translate(3865.75, 1749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
+						<g transform="translate(1793.75, 132.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="1247.5" y="155.5" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(1247.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
+						<g transform="translate(1793.75, 163.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="2224.0" y="1718.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M2224.0 1749.0 L2568.0 1749.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M2224.0 1810.0 L2568.0 1810.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-						</g>
-						<g transform="translate(2224, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
-								
-							</g>
+					<g data-name="QuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
+							<rect x="2953.8" y="280.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M2953.8 311.0 L3966.8 311.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M2953.8 1332.0 L3966.8 1332.0" fill="none" data-name="QuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(2224, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(2953.75, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
+								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2224, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="1792.0" y="1733.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M1792.0 1764.0 L2184.0 1764.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M1792.0 1810.0 L2184.0 1810.0" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(1792, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1792, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1792, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="1280.0" y="1733.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M1280.0 1764.0 L1752.0 1764.0" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M1280.0 1810.0 L1752.0 1810.0" fill="none" data-name="ImageQuestionFormData"></path>
-						</g>
-						<g transform="translate(1280, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1280, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1280, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="768.0" y="1725.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M768.0 1756.5 L1240.0 1756.5" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M768.0 1817.5 L1240.0 1817.5" fill="none" data-name="AudioQuestionFormData"></path>
-						</g>
-						<g transform="translate(768, 1725.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(768, 1756.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(768, 1817.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="384.0" y="1658.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M384.0 1689.0 L728.0 1689.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M384.0 1885.0 L728.0 1885.0" fill="none" data-name="ScaleQuestionFormData"></path>
-						</g>
-						<g transform="translate(384, 1658)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(384, 1689)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(384, 1885)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="527.0" y="1986.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(527, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="0.0" y="1718.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M0.0 1749.0 L344.0 1749.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M0.0 1825.0 L344.0 1825.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-						</g>
-						<g transform="translate(0, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 1825)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="74.0" y="1986.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
-						</g>
-						<g transform="translate(74, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="3673.3" y="124.5" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M3673.3 155.5 L4025.3 155.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M3673.3 186.5 L4025.3 186.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(3673.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3673.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3673.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="3119.8" y="280.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M3119.8 311.0 L4132.8 311.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M3119.8 1332.0 L4132.8 1332.0" fill="none" data-name="QuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(3119.75, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3119.75, 311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+						<g transform="translate(2953.75, 311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
@@ -789,7 +506,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(3119.75, 1332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+						<g transform="translate(2953.75, 1332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
@@ -813,11 +530,36 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="AudioRecordingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
+							<rect x="2185.8" y="124.5" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
+							<path d="M2185.8 155.5 L2537.8 155.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<path d="M2185.8 186.5 L2537.8 186.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+						</g>
+						<g transform="translate(2185.75, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2185.75, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2185.75, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="ConsumerWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="2732.8" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+							<rect x="3461.8" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
 						</g>
-						<g transform="translate(2732.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+						<g transform="translate(3461.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
 								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
@@ -826,24 +568,24 @@
 					</g>
 					<g data-name="FreeTextQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="3281.3" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M3281.3 133.0 L3633.3 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M3281.3 179.0 L3633.3 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<rect x="2577.8" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M2577.8 133.0 L2929.8 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M2577.8 179.0 L2929.8 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
 						</g>
-						<g transform="translate(3281.25, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(2577.75, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3281.25, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(2577.75, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3281.25, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(2577.75, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
@@ -852,54 +594,129 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="4199.3" y="933.5" height="31.0" width="61.0" data-name="Enum"></rect>
+					<g data-name="ChoiceQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
+							<rect x="2969.8" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M2969.8 155.5 L3321.8 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M2969.8 186.5 L3321.8 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(4199.25, 933.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
+						<g transform="translate(2969.75, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2969.75, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2969.75, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ImageCapturingQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="2497.3" y="124.5" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M2497.3 155.5 L2849.3 155.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M2497.3 186.5 L2849.3 186.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<rect x="3361.8" y="124.5" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
+							<path d="M3361.8 155.5 L3713.8 155.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<path d="M3361.8 186.5 L3713.8 186.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
 						</g>
-						<g transform="translate(2497.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
+						<g transform="translate(3361.75, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2497.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+						<g transform="translate(3361.75, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2497.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+						<g transform="translate(3361.75, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
+					<g data-name="BoolQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
+							<rect x="3753.8" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M3753.8 155.5 L4105.8 155.5" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M3753.8 186.5 L4105.8 186.5" fill="none" data-name="BoolQuestionFormView"></path>
+						</g>
+						<g transform="translate(3753.75, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(3753.75, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(3753.75, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="SurveyQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
+							<rect x="0.0" y="1718.5" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M0.0 1749.5 L363.0 1749.5" fill="none" data-name="SurveyQuestionType"></path>
+						</g>
+						<g transform="translate(0, 1718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
+								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
+								
+							</g>
+						</g>
+						<g transform="translate(0, 1749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="Enum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
+							<rect x="111.0" y="933.5" height="31.0" width="61.0" data-name="Enum"></rect>
+						</g>
+						<g transform="translate(111, 933.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="IScaleQuestionFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="2924.8" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M2924.8 31.0 L3233.8 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
+							<rect x="3653.8" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M3653.8 31.0 L3962.8 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(2924.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+						<g transform="translate(3653.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
 								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2924.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+						<g transform="translate(3653.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
@@ -908,77 +725,279 @@
 					</g>
 					<g data-name="ScaleQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="2889.3" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M2889.3 171.0 L3241.3 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
+							<rect x="4145.8" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M4145.8 171.0 L4497.8 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
 						</g>
-						<g transform="translate(2889.25, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+						<g transform="translate(4145.75, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2889.25, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+						<g transform="translate(4145.75, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="2105.3" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M2105.3 155.5 L2457.3 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M2105.3 186.5 L2457.3 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
+					<g data-name="QuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
+							<rect x="921.0" y="820.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M921.0 851.0 L2089.0 851.0" fill="none" data-name="QuestionFormData"></path>
+							<path d="M921.0 987.0 L2089.0 987.0" fill="none" data-name="QuestionFormData"></path>
 						</g>
-						<g transform="translate(2105.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
+						<g transform="translate(921, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
+								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2105.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(921, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2105.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
+						<g transform="translate(921, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="1385.5" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M1385.5 155.5 L1737.5 155.5" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M1385.5 186.5 L1737.5 186.5" fill="none" data-name="BoolQuestionFormView"></path>
+					<g data-name="IFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
+							<rect x="1456.0" y="155.5" height="31.0" width="98.0" data-name="IFormData"></rect>
 						</g>
-						<g transform="translate(1385.5, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
+						<g transform="translate(1456, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1385.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+					</g>
+					<g data-name="ChoiceQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
+							<rect x="453.0" y="1718.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M453.0 1749.0 L797.0 1749.0" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M453.0 1810.0 L797.0 1810.0" fill="none" data-name="ChoiceQuestionFormData"></path>
+						</g>
+						<g transform="translate(453, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1385.5, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+						<g transform="translate(453, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(453, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="BoolQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
+							<rect x="837.0" y="1733.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M837.0 1764.0 L1229.0 1764.0" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M837.0 1810.0 L1229.0 1810.0" fill="none" data-name="BoolQuestionFormData"></path>
+						</g>
+						<g transform="translate(837, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
+								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(837, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(837, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ImageQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
+							<rect x="1269.0" y="1733.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
+							<path d="M1269.0 1764.0 L1741.0 1764.0" fill="none" data-name="ImageQuestionFormData"></path>
+							<path d="M1269.0 1810.0 L1741.0 1810.0" fill="none" data-name="ImageQuestionFormData"></path>
+						</g>
+						<g transform="translate(1269, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1269, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1269, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="AudioQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
+							<rect x="1781.0" y="1725.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
+							<path d="M1781.0 1756.5 L2253.0 1756.5" fill="none" data-name="AudioQuestionFormData"></path>
+							<path d="M1781.0 1817.5 L2253.0 1817.5" fill="none" data-name="AudioQuestionFormData"></path>
+						</g>
+						<g transform="translate(1781, 1725.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1781, 1756.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1781, 1817.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ScaleQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
+							<rect x="2293.0" y="1658.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M2293.0 1689.0 L2637.0 1689.0" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M2293.0 1885.0 L2637.0 1885.0" fill="none" data-name="ScaleQuestionFormData"></path>
+						</g>
+						<g transform="translate(2293, 1658)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2293, 1689)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2293, 1885)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="Color">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
+							<rect x="2436.0" y="1986.0" height="31.0" width="58.0" data-name="Color"></rect>
+						</g>
+						<g transform="translate(2436, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
+								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FreeTextQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
+							<rect x="2677.0" y="1718.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M2677.0 1749.0 L3021.0 1749.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M2677.0 1825.0 L3021.0 1825.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+						</g>
+						<g transform="translate(2677, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2677, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2677, 1825)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FreeTextQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
+							<rect x="2751.0" y="1986.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+						</g>
+						<g transform="translate(2751, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
+								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="FormControl">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="4463.3" y="1786.5" height="31.0" width="113.0" data-name="FormControl"></rect>
+							<rect x="3061.0" y="1786.5" height="31.0" width="113.0" data-name="FormControl"></rect>
 						</g>
-						<g transform="translate(4463.25, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+						<g transform="translate(3061, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
 								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
 								
@@ -987,9 +1006,9 @@
 					</g>
 					<g data-name="FormArray">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="3727.8" y="1786.5" height="31.0" width="98.0" data-name="FormArray"></rect>
+							<rect x="3920.0" y="1786.5" height="31.0" width="98.0" data-name="FormArray"></rect>
 						</g>
-						<g transform="translate(3727.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+						<g transform="translate(3920, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
 								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
 								
@@ -998,9 +1017,9 @@
 					</g>
 					<g data-name="AbstractControl">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="2753.0" y="1786.5" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+							<rect x="4058.0" y="1786.5" height="31.0" width="138.0" data-name="AbstractControl"></rect>
 						</g>
-						<g transform="translate(2753, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+						<g transform="translate(4058, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
 								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
@@ -1009,9 +1028,9 @@
 					</g>
 					<g data-name="FormGroup">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="2608.0" y="1786.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
+							<rect x="4313.5" y="1786.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
 						</g>
-						<g transform="translate(2608, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+						<g transform="translate(4313.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
 								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
 								
@@ -1020,9 +1039,9 @@
 					</g>
 					<g data-name="ManagedFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="4065.3" y="155.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
+							<rect x="4537.8" y="155.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
 						</g>
-						<g transform="translate(4065.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+						<g transform="translate(4537.75, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
 								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
 								
@@ -1031,34 +1050,15 @@
 					</g>
 					<g data-name="IListActionProvider">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="4320.3" y="155.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
+							<rect x="4792.8" y="155.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
 						</g>
-						<g transform="translate(4320.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+						<g transform="translate(4792.75, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
 								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="4524.3" y="132.5" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M4524.3 163.5 L4876.3 163.5" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(4524.25, 132.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4524.25, 163.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
-								
-							</g>
-						</g>
-					</g>
 				</g>
 			</g>
 		</g>
diff --git a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/uml.svg b/docs/uml/designer_v2/lib/features/design/shared/questionnaire/uml.svg
index c2db0b180..53f17a815 100644
--- a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/uml.svg
+++ b/docs/uml/designer_v2/lib/features/design/shared/questionnaire/uml.svg
@@ -1,4 +1,4 @@
-<svg version="1.1" baseProfile="full" width="6068.5" height="2073.0" viewbox="0 0 6068.5 2073" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+<svg version="1.1" baseProfile="full" width="6117.0" height="2073.0" viewbox="0 0 6117 2073" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
 	<desc >[&lt;abstract&gt;WithQuestionnaireControls
 	  |
 	  +questionsArray: FormArray&lt;dynamic&gt;;
@@ -34,6 +34,94 @@
 	
 	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
 	
+	[SurveyQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel;
+	  +isHtmlStyleable: bool
+	]
+	
+	[SurveyQuestionFormView]o-[QuestionFormViewModel]
+	
+	[AudioRecordingQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
+	
+	[FreeTextQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel;
+	  +generateLabelHelpTextMap: dynamic
+	  |
+	  +Widget build();
+	  +Widget disableOnReadonly();
+	  +Widget generateRow()
+	]
+	
+	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
+	
+	[ChoiceQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
+	
+	[ImageCapturingQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
+	
+	[BoolQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[BoolQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
+	
+	[SurveyQuestionType
+	  |
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
+	  &lt;static&gt;+choice: SurveyQuestionType;
+	  &lt;static&gt;+bool: SurveyQuestionType;
+	  &lt;static&gt;+scale: SurveyQuestionType;
+	  &lt;static&gt;+image: SurveyQuestionType;
+	  &lt;static&gt;+audio: SurveyQuestionType;
+	  &lt;static&gt;+freeText: SurveyQuestionType
+	]
+	
+	[SurveyQuestionType]o-[SurveyQuestionType]
+	[Enum]&lt;:--[SurveyQuestionType]
+	
+	[&lt;abstract&gt;IScaleQuestionFormViewModel
+	  |
+	  +isMidValuesClearedInfoVisible: bool
+	]
+	
+	[ScaleQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	]
+	
+	[ScaleQuestionFormView]o-[QuestionFormViewModel]
+	
 	[&lt;abstract&gt;QuestionFormData
 	  |
 	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
@@ -144,86 +232,6 @@
 	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
 	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
 	
-	[AudioRecordingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
-	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
-	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
-	]
-	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
-	
-	[SurveyQuestionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
-	]
-	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[ImageCapturingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	]
-	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
-	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
-	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
 	[QuestionFormViewModel
 	  |
 	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
@@ -322,23 +330,15 @@
 	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
 	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
 	
-	[SurveyQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
-	]
-	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
-	
 	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
+	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="2073.0" width="6068.5" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="2073.0" width="6117.0" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M1219.5 1093.6 L1575 1638 L4046.5 1798.8117437016465 L4046.5 1798.8 " fill="none"></path>
+				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
+					<path d="M1219.5 1093.6 L1575 1638 L4073.5 1798.8455348380764 L4073.5 1798.8 " fill="none"></path>
 					<g fill="#eee8d5">
 						<path d="M1218.8 1082.9 L1219.5 1093.6 L1209.9 1088.7 L1209.3 1078.0 Z"></path>
 					</g>
@@ -358,106 +358,106 @@
 						<path d="M2531.0 184.7 L2873 260 L2873 880 L2873.0 880.0 " fill="none"></path>
 					</g>
 					<path d="M2532.2 179.5 L2531.0 184.7 L2529.9 189.9 L2518.0 181.8 Z"></path>
-					<path d="M2303.6 1087.4 L3253 1638 L5192 1787.9627446356992 L5192.0 1788.0 " fill="none"></path>
+					<path d="M3025.5 228.2 L3025.5 260 L4195.5 740.8410378765285 L4195.5 740.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2298.2 1078.1 L2303.6 1087.4 L2292.8 1087.3 L2287.4 1078.0 Z"></path>
+						<path d="M3030.8 218.8 L3025.5 228.2 L3020.2 218.8 L3025.5 209.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2407.0 184.7 L2065 260 L2065 820 L2065.0 820.0 " fill="none"></path>
+					<path d="M5034.0 236.2 L5034 260 L5024.362844702468 280 L5024.4 280.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M5039.3 226.8 L5034.0 236.2 L5028.7 226.8 L5034.0 217.5 Z"></path>
 					</g>
-					<path d="M2408.1 189.9 L2407.0 184.7 L2405.8 179.5 L2420.0 181.8 Z"></path>
-					<path d="M2230.4 1086.5 L2893.5 1638 L4485 1786.0045364332293 L4485.0 1786.0 " fill="none"></path>
-					<path d="M2233.8 1082.4 L2230.4 1086.5 L2227.0 1090.6 L2220.1 1078.0 Z"></path>
-					<path d="M2212.4 1087.1 L2800.5 1638 L2443 1743.9259259259259 L2443.0 1743.9 " fill="none"></path>
-					<path d="M2216.1 1083.2 L2212.4 1087.1 L2208.8 1091.0 L2202.7 1078.0 Z"></path>
-					<path d="M2152.8 1089.3 L2496.25 1638 L2011 1748.3376083188907 L2011.0 1748.3 " fill="none"></path>
-					<path d="M2157.3 1086.5 L2152.8 1089.3 L2148.3 1092.1 L2145.7 1078.0 Z"></path>
-					<path d="M2106.9 1090.8 L2268.5 1638 L1499 1763.5077076081552 L1499.0 1763.5 " fill="none"></path>
-					<path d="M2112.0 1089.3 L2106.9 1090.8 L2101.8 1092.3 L2103.1 1078.0 Z"></path>
-					<path d="M815.0 1964.7 L815 1966 L815 1986 L815.0 1986.0 " fill="none"></path>
+					<path d="M4290.8 36.5 L5034 82 L5034 124.5 L5034.0 124.5 " fill="none"></path>
+					<path d="M4291.1 31.1 L4290.8 36.5 L4290.5 41.8 L4277.5 35.7 Z"></path>
+					<path d="M4642.0 258.7 L4642 260 L4643.741654571843 280 L4643.7 280.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M820.3 1955.3 L815.0 1964.7 L809.7 1955.3 L815.0 1946.0 Z"></path>
+						<path d="M4647.3 249.3 L4642.0 258.7 L4636.7 249.3 L4642.0 240.0 Z"></path>
 					</g>
-					<path d="M2056.6 1091.3 L2024.5 1638 L987 1778.677966101695 L987.0 1778.7 " fill="none"></path>
-					<path d="M2062.0 1091.6 L2056.6 1091.3 L2051.3 1091.0 L2057.4 1078.0 Z"></path>
-					<path d="M431.0 1904.7 L431 1966 L431 1986 L431.0 1986.0 " fill="none"></path>
+					<path d="M4290.7 41.3 L4642 82 L4642 102 L4642.0 102.0 " fill="none"></path>
+					<path d="M4291.4 36.0 L4290.7 41.3 L4290.1 46.6 L4277.5 39.8 Z"></path>
+					<path d="M4250.0 236.2 L4250 260 L4263.120464441219 280 L4263.1 280.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M436.3 1895.3 L431.0 1904.7 L425.7 1895.3 L431.0 1886.0 Z"></path>
+						<path d="M4255.3 226.8 L4250.0 236.2 L4244.7 226.8 L4250.0 217.5 Z"></path>
 					</g>
-					<path d="M1973.5 1089.2 L1615 1638 L603 1778.1756756756756 L603.0 1778.2 " fill="none"></path>
-					<path d="M1977.9 1092.1 L1973.5 1089.2 L1969.0 1086.2 L1980.7 1078.0 Z"></path>
-					<path d="M4985.5 236.2 L4985.5 260 L4975.2822931785195 280 L4975.3 280.0 " fill="none"></path>
+					<path d="M4225.4 56.2 L4250 82 L4250 124.5 L4250.0 124.5 " fill="none"></path>
+					<path d="M4229.3 52.5 L4225.4 56.2 L4221.6 59.8 L4216.2 46.5 Z"></path>
+					<path d="M3858.0 236.2 L3858 260 L4195.5 535.5183649289099 L4195.5 535.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4990.8 226.8 L4985.5 236.2 L4980.2 226.8 L4985.5 217.5 Z"></path>
+						<path d="M3863.3 226.8 L3858.0 236.2 L3852.7 226.8 L3858.0 217.5 Z"></path>
 					</g>
-					<path d="M4094.8 35.6 L4985.5 82 L4985.5 124.5 L4985.5 124.5 " fill="none"></path>
-					<path d="M4095.1 30.3 L4094.8 35.6 L4094.5 41.0 L4081.5 35.0 Z"></path>
-					<path d="M4593.5 258.7 L4593.5 260 L4594.661103047895 280 L4594.7 280.0 " fill="none"></path>
+					<path d="M4112.3 44.2 L3858 82 L3858 124.5 L3858.0 124.5 " fill="none"></path>
+					<path d="M4113.1 49.5 L4112.3 44.2 L4111.5 39.0 L4125.5 42.3 Z"></path>
+					<path d="M3417.5 236.2 L3417.5 260 L4195.5 677.3156870377579 L4195.5 677.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4598.8 249.3 L4593.5 258.7 L4588.2 249.3 L4593.5 240.0 Z"></path>
+						<path d="M3422.8 226.8 L3417.5 236.2 L3412.2 226.8 L3417.5 217.5 Z"></path>
 					</g>
-					<path d="M4094.8 38.7 L4593.5 82 L4593.5 102 L4593.5 102.0 " fill="none"></path>
-					<path d="M4095.2 33.4 L4094.8 38.7 L4094.3 44.1 L4081.5 37.6 Z"></path>
-					<path d="M5573.0 1747.9 L5681.333333333333 1718.5 L5712.916666666667 1718.5 L5712.916666666667 1718.5 L5744.5 1802 L5744.5 1802 L5712.916666666667 1885.5 L5712.916666666667 1885.5 L5681.333333333333 1885.5 L5681.333333333333 1885.5 L5555 1851.231997834326 L5555.0 1851.2 " fill="none"></path>
+					<path d="M4112.2 36.8 L3417.5 82 L3417.5 124.5 L3417.5 124.5 " fill="none"></path>
+					<path d="M4112.5 42.1 L4112.2 36.8 L4111.8 31.5 L4125.5 35.9 Z"></path>
+					<path d="M5312.8 1738.4 L5375.333333333333 1718.5 L5395.416666666667 1718.5 L5395.416666666667 1718.5 L5415.5 1802 L5415.5 1802 L5395.416666666667 1885.5 L5395.416666666667 1885.5 L5375.333333333333 1885.5 L5375.333333333333 1885.5 L5295 1859.8812858052197 L5295.0 1859.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5562.6 1745.2 L5573.0 1747.9 L5565.4 1755.5 L5555.0 1752.8 Z"></path>
+						<path d="M5302.3 1736.2 L5312.8 1738.4 L5305.5 1746.4 L5295.0 1744.1 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M5599.8 977.8 L5599.75 1638 L5488.694359756098 1718.5 L5488.7 1718.5 " fill="none"></path>
+						<path d="M3564.3 977.8 L3564.25 1638 L4932 1782.7868323382281 L4932.0 1782.8 " fill="none"></path>
 					</g>
-					<path d="M5605.1 977.8 L5599.8 977.8 L5594.4 977.8 L5599.8 964.5 Z"></path>
-					<path d="M3809.5 236.2 L3809.5 260 L4127 525.4824029126214 L4127.0 525.5 " fill="none"></path>
+					<path d="M3569.6 977.8 L3564.3 977.8 L3558.9 977.8 L3564.3 964.5 Z"></path>
+					<path d="M5426.0 220.7 L5426 260 L5208.5 466.98549723756906 L5208.5 467.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3814.8 226.8 L3809.5 236.2 L3804.2 226.8 L3809.5 217.5 Z"></path>
+						<path d="M5431.3 211.3 L5426.0 220.7 L5420.7 211.3 L5426.0 202.0 Z"></path>
 					</g>
-					<path d="M3933.0 49.9 L3809.5 82 L3809.5 124.5 L3809.5 124.5 " fill="none"></path>
-					<path d="M3934.4 55.0 L3933.0 49.9 L3931.7 44.7 L3945.9 46.5 Z"></path>
-					<path d="M4201.5 220.7 L4201.5 260 L4214.039912917271 280 L4214.0 280.0 " fill="none"></path>
+					<path d="M2257.6 1089.0 L3013 1638 L4932 1787.8290883123066 L4932.0 1787.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4206.8 211.3 L4201.5 220.7 L4196.2 211.3 L4201.5 202.0 Z"></path>
+						<path d="M2253.2 1079.2 L2257.6 1089.0 L2246.9 1087.8 L2242.5 1078.0 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M2407.0 184.7 L2065 260 L2065 820 L2065.0 820.0 " fill="none"></path>
 					</g>
-					<path d="M3417.5 236.2 L3417.5 260 L4127 662.0111019736842 L4127.0 662.0 " fill="none"></path>
+					<path d="M2408.1 189.9 L2407.0 184.7 L2405.8 179.5 L2420.0 181.8 Z"></path>
+					<path d="M2183.8 1088.1 L2653.5 1638 L4403 1787.3198022378351 L4403.0 1787.3 " fill="none"></path>
+					<path d="M2187.9 1084.7 L2183.8 1088.1 L2179.8 1091.6 L2175.2 1078.0 Z"></path>
+					<path d="M2173.9 1088.5 L2603 1638 L2396.7804878048782 1733 L2396.8 1733.0 " fill="none"></path>
+					<path d="M2178.1 1085.2 L2173.9 1088.5 L2169.7 1091.8 L2165.7 1078.0 Z"></path>
+					<path d="M2122.8 1090.3 L2347 1638 L2011 1734.3356643356644 L2011.0 1734.3 " fill="none"></path>
+					<path d="M2127.8 1088.3 L2122.8 1090.3 L2117.9 1092.4 L2117.8 1078.0 Z"></path>
+					<path d="M2066.2 1091.3 L2071 1638 L1499 1754.09900990099 L1499.0 1754.1 " fill="none"></path>
+					<path d="M2071.6 1091.3 L2066.2 1091.3 L2060.9 1091.4 L2066.1 1078.0 Z"></path>
+					<path d="M815.0 1964.7 L815 1966 L815 1986 L815.0 1986.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3422.8 226.8 L3417.5 236.2 L3412.2 226.8 L3417.5 217.5 Z"></path>
+						<path d="M820.3 1955.3 L815.0 1964.7 L809.7 1955.3 L815.0 1946.0 Z"></path>
 					</g>
-					<path d="M3916.2 38.7 L3417.5 82 L3417.5 124.5 L3417.5 124.5 " fill="none"></path>
-					<path d="M3916.7 44.1 L3916.2 38.7 L3915.8 33.4 L3929.5 37.6 Z"></path>
-					<path d="M3025.5 236.2 L3025.5 260 L4127 731.9735696517413 L4127.0 732.0 " fill="none"></path>
+					<path d="M2016.1 1090.6 L1827 1638 L987 1774.1264822134387 L987.0 1774.1 " fill="none"></path>
+					<path d="M2021.1 1092.3 L2016.1 1090.6 L2011.0 1088.9 L2020.4 1078.0 Z"></path>
+					<path d="M431.0 1904.7 L431 1966 L431 1986 L431.0 1986.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3030.8 226.8 L3025.5 236.2 L3020.2 226.8 L3025.5 217.5 Z"></path>
+						<path d="M436.3 1895.3 L431.0 1904.7 L425.7 1895.3 L431.0 1886.0 Z"></path>
 					</g>
-					<path d="M3916.2 35.6 L3025.5 82 L3025.5 124.5 L3025.5 124.5 " fill="none"></path>
-					<path d="M3916.5 41.0 L3916.2 35.6 L3915.9 30.3 L3929.5 35.0 Z"></path>
-					<path d="M5127.5 1633.1 L5131 1638 L5250.032012195122 1718.5 L5250.0 1718.5 " fill="none"></path>
+					<path d="M1973.5 1089.2 L1615 1638 L603 1778.1756756756756 L603.0 1778.2 " fill="none"></path>
+					<path d="M1977.9 1092.1 L1973.5 1089.2 L1969.0 1086.2 L1980.7 1078.0 Z"></path>
+					<path d="M5222.5 1408.8 L5482 1638 L5295 1721.2238805970148 L5295.0 1721.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5126.3 1622.4 L5127.5 1633.1 L5117.7 1628.7 L5116.6 1618.0 Z"></path>
+						<path d="M5219.0 1398.6 L5222.5 1408.8 L5212.0 1406.6 L5208.5 1396.4 Z"></path>
 					</g>
-					<path d="M5088.0 1633.6 L5091 1638 L5789.5 1789.7271523178808 L5789.5 1789.7 " fill="none"></path>
+					<path d="M5080.2 1634.3 L5082.25 1638 L5638.5 1786.8780089759282 L5638.5 1786.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5087.3 1622.8 L5088.0 1633.6 L5078.4 1628.7 L5077.7 1618.0 Z"></path>
+						<path d="M5080.4 1623.6 L5080.2 1634.3 L5071.1 1628.7 L5071.2 1618.0 Z"></path>
 					</g>
-					<path d="M4602.3 1636.6 L4602.25 1638 L4143.394054878048 1786.5 L4143.4 1786.5 " fill="none"></path>
+					<path d="M4697.8 1636.7 L4697.75 1638 L4171.5 1788.0304215558454 L4171.5 1788.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4608.1 1627.6 L4602.3 1636.6 L4597.4 1627.1 L4603.2 1618.0 Z"></path>
+						<path d="M4703.1 1627.4 L4697.8 1636.7 L4692.5 1627.3 L4697.9 1618.0 Z"></path>
 					</g>
-					<path d="M4110.7 1239.6 L3393.75 1638 L5014 1795.3011691579104 L5014.0 1795.3 " fill="none"></path>
+					<path d="M4182.6 1492.0 L4043 1638 L5460.5 1794.3874873864784 L5460.5 1794.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4121.4 1239.7 L4110.7 1239.6 L4116.3 1230.4 L4127.0 1230.5 Z"></path>
+						<path d="M4192.9 1489.0 L4182.6 1492.0 L4185.2 1481.6 L4195.5 1478.6 Z"></path>
 					</g>
-					<path d="M4110.4 1217.9 L3293 1638 L4869 1796.7129260055265 L4869.0 1796.7 " fill="none"></path>
+					<path d="M4181.1 1381.8 L3872.75 1638 L4787 1793.0938712179984 L4787.0 1793.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4121.1 1218.3 L4110.4 1217.9 L4116.3 1208.9 L4127.0 1209.3 Z"></path>
+						<path d="M4191.7 1379.9 L4181.1 1381.8 L4184.9 1371.7 L4195.5 1369.8 Z"></path>
 					</g>
-					<path d="M5309.0 199.8 L5309 260 L5140 432.37749814951883 L5140.0 432.4 " fill="none"></path>
-					<path d="M5314.3 199.8 L5309.0 199.8 L5303.7 199.8 L5309.0 186.5 Z"></path>
+					<path d="M5749.5 199.8 L5749.5 260 L5208.5 615.8463007159905 L5208.5 615.8 " fill="none"></path>
+					<path d="M5754.8 199.8 L5749.5 199.8 L5744.2 199.8 L5749.5 186.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M5538.5 199.8 L5538.5 260 L5140 563.3883977900553 L5140.0 563.4 " fill="none"></path>
-					</g>
-					<path d="M5543.8 199.8 L5538.5 199.8 L5533.2 199.8 L5538.5 186.5 Z"></path>
-					<path d="M5836.5 228.2 L5836.5 260 L5140 658.9098088113051 L5140.0 658.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5841.8 218.8 L5836.5 228.2 L5831.2 218.8 L5836.5 209.5 Z"></path>
+						<path d="M5979.0 199.8 L5979 260 L5208.5 675.7200469851214 L5208.5 675.7 " fill="none"></path>
 					</g>
+					<path d="M5984.3 199.8 L5979.0 199.8 L5973.7 199.8 L5979.0 186.5 Z"></path>
 					<g data-name="WithQuestionnaireControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
 							<rect x="809.0" y="820.0" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
@@ -496,9 +496,9 @@
 					</g>
 					<g data-name="FormArray">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="4046.5" y="1786.5" height="31.0" width="98.0" data-name="FormArray"></rect>
+							<rect x="4073.5" y="1786.5" height="31.0" width="98.0" data-name="FormArray"></rect>
 						</g>
-						<g transform="translate(4046.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+						<g transform="translate(4073.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
 								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
 								
@@ -577,310 +577,38 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="1481.0" y="820.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M1481.0 851.0 L2649.0 851.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M1481.0 987.0 L2649.0 987.0" fill="none" data-name="QuestionFormData"></path>
-						</g>
-						<g transform="translate(1481, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
-								
-							</g>
+					<g data-name="SurveyQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
+							<rect x="2849.5" y="132.5" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M2849.5 163.5 L3201.5 163.5" fill="none" data-name="SurveyQuestionFormView"></path>
 						</g>
-						<g transform="translate(1481, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
+						<g transform="translate(2849.5, 132.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1481, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
+						<g transform="translate(2849.5, 163.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="5192.0" y="1718.5" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M5192.0 1749.5 L5555.0 1749.5" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(5192, 1718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
-								
-							</g>
+					<g data-name="QuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
+							<rect x="4195.5" y="280.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M4195.5 311.0 L5208.5 311.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M4195.5 1332.0 L5208.5 1332.0" fill="none" data-name="QuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(5192, 1749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
+						<g transform="translate(4195.5, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
+								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="4485.0" y="1718.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M4485.0 1749.0 L4829.0 1749.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M4485.0 1810.0 L4829.0 1810.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-						</g>
-						<g transform="translate(4485, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4485, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4485, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="2051.0" y="1733.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M2051.0 1764.0 L2443.0 1764.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M2051.0 1810.0 L2443.0 1810.0" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(2051, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2051, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2051, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="1539.0" y="1733.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M1539.0 1764.0 L2011.0 1764.0" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M1539.0 1810.0 L2011.0 1810.0" fill="none" data-name="ImageQuestionFormData"></path>
-						</g>
-						<g transform="translate(1539, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1539, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1539, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="1027.0" y="1725.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M1027.0 1756.5 L1499.0 1756.5" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M1027.0 1817.5 L1499.0 1817.5" fill="none" data-name="AudioQuestionFormData"></path>
-						</g>
-						<g transform="translate(1027, 1725.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1027, 1756.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1027, 1817.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="643.0" y="1658.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M643.0 1689.0 L987.0 1689.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M643.0 1885.0 L987.0 1885.0" fill="none" data-name="ScaleQuestionFormData"></path>
-						</g>
-						<g transform="translate(643, 1658)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(643, 1689)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(643, 1885)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="786.0" y="1986.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(786, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="259.0" y="1718.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M259.0 1749.0 L603.0 1749.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M259.0 1825.0 L603.0 1825.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-						</g>
-						<g transform="translate(259, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(259, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(259, 1825)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="333.0" y="1986.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
-						</g>
-						<g transform="translate(333, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="4809.5" y="124.5" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M4809.5 155.5 L5161.5 155.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M4809.5 186.5 L5161.5 186.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(4809.5, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4809.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4809.5, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="4127.0" y="280.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M4127.0 311.0 L5140.0 311.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M4127.0 1332.0 L5140.0 1332.0" fill="none" data-name="QuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(4127, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4127, 311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+						<g transform="translate(4195.5, 311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
@@ -952,7 +680,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(4127, 1332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+						<g transform="translate(4195.5, 1332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
@@ -976,11 +704,36 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="AudioRecordingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
+							<rect x="4858.0" y="124.5" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
+							<path d="M4858.0 155.5 L5210.0 155.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<path d="M4858.0 186.5 L5210.0 186.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+						</g>
+						<g transform="translate(4858, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4858, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4858, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="ConsumerWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="3929.5" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+							<rect x="4125.5" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
 						</g>
-						<g transform="translate(3929.5, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+						<g transform="translate(4125.5, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
 								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
@@ -989,24 +742,24 @@
 					</g>
 					<g data-name="FreeTextQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="4417.5" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M4417.5 133.0 L4769.5 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M4417.5 179.0 L4769.5 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<rect x="4466.0" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M4466.0 133.0 L4818.0 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M4466.0 179.0 L4818.0 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
 						</g>
-						<g transform="translate(4417.5, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(4466, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4417.5, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(4466, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4417.5, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(4466, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
@@ -1015,54 +768,129 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="5569.3" y="933.5" height="31.0" width="61.0" data-name="Enum"></rect>
+					<g data-name="ChoiceQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
+							<rect x="4074.0" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M4074.0 155.5 L4426.0 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M4074.0 186.5 L4426.0 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(5569.25, 933.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
+						<g transform="translate(4074, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="3633.5" y="124.5" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M3633.5 155.5 L3985.5 155.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M3633.5 186.5 L3985.5 186.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+						<g transform="translate(4074, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4074, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ImageCapturingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
+							<rect x="3682.0" y="124.5" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
+							<path d="M3682.0 155.5 L4034.0 155.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<path d="M3682.0 186.5 L4034.0 186.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
 						</g>
-						<g transform="translate(3633.5, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
+						<g transform="translate(3682, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3633.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+						<g transform="translate(3682, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3633.5, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+						<g transform="translate(3682, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
+					<g data-name="BoolQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
+							<rect x="3241.5" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M3241.5 155.5 L3593.5 155.5" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M3241.5 186.5 L3593.5 186.5" fill="none" data-name="BoolQuestionFormView"></path>
+						</g>
+						<g transform="translate(3241.5, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(3241.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(3241.5, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="SurveyQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
+							<rect x="4932.0" y="1718.5" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M4932.0 1749.5 L5295.0 1749.5" fill="none" data-name="SurveyQuestionType"></path>
+						</g>
+						<g transform="translate(4932, 1718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
+								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4932, 1749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="Enum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
+							<rect x="3533.8" y="933.5" height="31.0" width="61.0" data-name="Enum"></rect>
+						</g>
+						<g transform="translate(3533.75, 933.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="IScaleQuestionFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="4121.5" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M4121.5 31.0 L4430.5 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
+							<rect x="4317.5" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M4317.5 31.0 L4626.5 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(4121.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+						<g transform="translate(4317.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
 								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4121.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+						<g transform="translate(4317.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
@@ -1071,77 +899,268 @@
 					</g>
 					<g data-name="ScaleQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="4025.5" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M4025.5 171.0 L4377.5 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
+							<rect x="5250.0" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M5250.0 171.0 L5602.0 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
 						</g>
-						<g transform="translate(4025.5, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+						<g transform="translate(5250, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4025.5, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+						<g transform="translate(5250, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="3241.5" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M3241.5 155.5 L3593.5 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M3241.5 186.5 L3593.5 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
+					<g data-name="QuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
+							<rect x="1481.0" y="820.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M1481.0 851.0 L2649.0 851.0" fill="none" data-name="QuestionFormData"></path>
+							<path d="M1481.0 987.0 L2649.0 987.0" fill="none" data-name="QuestionFormData"></path>
 						</g>
-						<g transform="translate(3241.5, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
+						<g transform="translate(1481, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
+								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3241.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(1481, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3241.5, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
+						<g transform="translate(1481, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="2849.5" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M2849.5 155.5 L3201.5 155.5" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M2849.5 186.5 L3201.5 186.5" fill="none" data-name="BoolQuestionFormView"></path>
+					<g data-name="ChoiceQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
+							<rect x="4403.0" y="1718.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M4403.0 1749.0 L4747.0 1749.0" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M4403.0 1810.0 L4747.0 1810.0" fill="none" data-name="ChoiceQuestionFormData"></path>
 						</g>
-						<g transform="translate(2849.5, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
+						<g transform="translate(4403, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2849.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(4403, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2849.5, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+						<g transform="translate(4403, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="BoolQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
+							<rect x="2051.0" y="1733.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M2051.0 1764.0 L2443.0 1764.0" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M2051.0 1810.0 L2443.0 1810.0" fill="none" data-name="BoolQuestionFormData"></path>
+						</g>
+						<g transform="translate(2051, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
+								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2051, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2051, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ImageQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
+							<rect x="1539.0" y="1733.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
+							<path d="M1539.0 1764.0 L2011.0 1764.0" fill="none" data-name="ImageQuestionFormData"></path>
+							<path d="M1539.0 1810.0 L2011.0 1810.0" fill="none" data-name="ImageQuestionFormData"></path>
+						</g>
+						<g transform="translate(1539, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1539, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1539, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="AudioQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
+							<rect x="1027.0" y="1725.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
+							<path d="M1027.0 1756.5 L1499.0 1756.5" fill="none" data-name="AudioQuestionFormData"></path>
+							<path d="M1027.0 1817.5 L1499.0 1817.5" fill="none" data-name="AudioQuestionFormData"></path>
+						</g>
+						<g transform="translate(1027, 1725.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1027, 1756.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1027, 1817.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ScaleQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
+							<rect x="643.0" y="1658.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M643.0 1689.0 L987.0 1689.0" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M643.0 1885.0 L987.0 1885.0" fill="none" data-name="ScaleQuestionFormData"></path>
+						</g>
+						<g transform="translate(643, 1658)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(643, 1689)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(643, 1885)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="Color">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
+							<rect x="786.0" y="1986.0" height="31.0" width="58.0" data-name="Color"></rect>
+						</g>
+						<g transform="translate(786, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
+								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FreeTextQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
+							<rect x="259.0" y="1718.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M259.0 1749.0 L603.0 1749.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M259.0 1825.0 L603.0 1825.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+						</g>
+						<g transform="translate(259, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(259, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(259, 1825)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FreeTextQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
+							<rect x="333.0" y="1986.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+						</g>
+						<g transform="translate(333, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
+								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="FormControl">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="5789.5" y="1786.5" height="31.0" width="113.0" data-name="FormControl"></rect>
+							<rect x="5638.5" y="1786.5" height="31.0" width="113.0" data-name="FormControl"></rect>
 						</g>
-						<g transform="translate(5789.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+						<g transform="translate(5638.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
 								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
 								
@@ -1150,9 +1169,9 @@
 					</g>
 					<g data-name="AbstractControl">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="5014.0" y="1786.5" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+							<rect x="5460.5" y="1786.5" height="31.0" width="138.0" data-name="AbstractControl"></rect>
 						</g>
-						<g transform="translate(5014, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+						<g transform="translate(5460.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
 								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
@@ -1161,9 +1180,9 @@
 					</g>
 					<g data-name="FormGroup">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="4869.0" y="1786.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
+							<rect x="4787.0" y="1786.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
 						</g>
-						<g transform="translate(4869, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+						<g transform="translate(4787, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
 								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
 								
@@ -1172,9 +1191,9 @@
 					</g>
 					<g data-name="ManagedFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="5201.5" y="155.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
+							<rect x="5642.0" y="155.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
 						</g>
-						<g transform="translate(5201.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+						<g transform="translate(5642, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
 								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
 								
@@ -1183,34 +1202,15 @@
 					</g>
 					<g data-name="IListActionProvider">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="5456.5" y="155.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
+							<rect x="5897.0" y="155.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
 						</g>
-						<g transform="translate(5456.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+						<g transform="translate(5897, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
 								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="5660.5" y="132.5" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M5660.5 163.5 L6012.5 163.5" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(5660.5, 132.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5660.5, 163.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
-								
-							</g>
-						</g>
-					</g>
 				</g>
 			</g>
 		</g>
diff --git a/docs/uml/designer_v2/lib/features/design/shared/uml.svg b/docs/uml/designer_v2/lib/features/design/shared/uml.svg
index cb3e53617..1e5e8b0d1 100644
--- a/docs/uml/designer_v2/lib/features/design/shared/uml.svg
+++ b/docs/uml/designer_v2/lib/features/design/shared/uml.svg
@@ -1,5 +1,55 @@
-<svg version="1.1" baseProfile="full" width="6809.5" height="2073.0" viewbox="0 0 6809.5 2073" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;WithQuestionnaireControls
+<svg version="1.1" baseProfile="full" width="7767.0" height="2073.0" viewbox="0 0 7767 2073" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[ScheduleControls
+	  |
+	  +formViewModel: WithScheduleControls
+	  |
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
+	]
+	
+	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
+	
+	[&lt;abstract&gt;WithScheduleControls
+	  |
+	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
+	  +instanceID: FormControl&lt;String&gt;;
+	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
+	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
+	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
+	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
+	  +hasReminderControl: FormControl&lt;bool&gt;;
+	  +reminderTimeControl: FormControl&lt;Time&gt;;
+	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
+	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
+	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
+	  +hasReminder: bool;
+	  +isTimeRestricted: bool;
+	  +timeRestriction: List&lt;Time&gt;?
+	  |
+	  +void setScheduleControlsFrom();
+	  -dynamic _initReminderControl()
+	]
+	
+	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
+	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
+	
+	[&lt;abstract&gt;IFormDataWithSchedule
+	  |
+	  +instanceId: String;
+	  +isTimeLocked: bool;
+	  +timeLockStart: StudyUTimeOfDay?;
+	  +timeLockEnd: StudyUTimeOfDay?;
+	  +hasReminder: bool;
+	  +reminderTime: StudyUTimeOfDay?
+	  |
+	  +Schedule toSchedule()
+	]
+	
+	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
+	
+	[&lt;abstract&gt;WithQuestionnaireControls
 	  |
 	  +questionsArray: FormArray&lt;dynamic&gt;;
 	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
@@ -34,6 +84,94 @@
 	
 	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
 	
+	[SurveyQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel;
+	  +isHtmlStyleable: bool
+	]
+	
+	[SurveyQuestionFormView]o-[QuestionFormViewModel]
+	
+	[AudioRecordingQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
+	
+	[FreeTextQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel;
+	  +generateLabelHelpTextMap: dynamic
+	  |
+	  +Widget build();
+	  +Widget disableOnReadonly();
+	  +Widget generateRow()
+	]
+	
+	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
+	
+	[ChoiceQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
+	
+	[ImageCapturingQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
+	
+	[BoolQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[BoolQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
+	
+	[SurveyQuestionType
+	  |
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
+	  &lt;static&gt;+choice: SurveyQuestionType;
+	  &lt;static&gt;+bool: SurveyQuestionType;
+	  &lt;static&gt;+scale: SurveyQuestionType;
+	  &lt;static&gt;+image: SurveyQuestionType;
+	  &lt;static&gt;+audio: SurveyQuestionType;
+	  &lt;static&gt;+freeText: SurveyQuestionType
+	]
+	
+	[SurveyQuestionType]o-[SurveyQuestionType]
+	[Enum]&lt;:--[SurveyQuestionType]
+	
+	[&lt;abstract&gt;IScaleQuestionFormViewModel
+	  |
+	  +isMidValuesClearedInfoVisible: bool
+	]
+	
+	[ScaleQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	]
+	
+	[ScaleQuestionFormView]o-[QuestionFormViewModel]
+	
 	[&lt;abstract&gt;QuestionFormData
 	  |
 	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
@@ -144,86 +282,6 @@
 	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
 	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
 	
-	[AudioRecordingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
-	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
-	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
-	]
-	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
-	
-	[SurveyQuestionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
-	]
-	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[ImageCapturingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	]
-	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
-	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
-	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
 	[QuestionFormViewModel
 	  |
 	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
@@ -322,227 +380,319 @@
 	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
 	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
 	
-	[SurveyQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
-	]
-	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule
-	  |
-	  +instanceId: String;
-	  +isTimeLocked: bool;
-	  +timeLockStart: StudyUTimeOfDay?;
-	  +timeLockEnd: StudyUTimeOfDay?;
-	  +hasReminder: bool;
-	  +reminderTime: StudyUTimeOfDay?
-	  |
-	  +Schedule toSchedule()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
-	
-	[ScheduleControls
-	  |
-	  +formViewModel: WithScheduleControls
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
-	]
-	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
-	
-	[&lt;abstract&gt;WithScheduleControls
-	  |
-	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
-	  +instanceID: FormControl&lt;String&gt;;
-	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +hasReminderControl: FormControl&lt;bool&gt;;
-	  +reminderTimeControl: FormControl&lt;Time&gt;;
-	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
-	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
-	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  +hasReminder: bool;
-	  +isTimeRestricted: bool;
-	  +timeRestriction: List&lt;Time&gt;?
-	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
-	]
-	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
-	
 	</desc>
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="2073.0" width="6809.5" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="2073.0" width="7767.0" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M1025.5 1095.7 L1208.5 1638 L4271.75 1799.4179452164833 L4271.8 1799.4 " fill="none"></path>
+				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
+					<path d="M414.3 243.7 L414.25 260 L414.25 797.5 L414.3 797.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M419.6 234.3 L414.3 243.7 L408.9 234.3 L414.3 225.0 Z"></path>
+					</g>
+					<path d="M414.3 59.8 L414.25 82 L414.25 117 L414.3 117.0 " fill="none"></path>
+					<path d="M419.6 59.8 L414.3 59.8 L408.9 59.8 L414.3 46.5 Z"></path>
+					<path d="M629.5 1111.8 L1325.25 1638 L4715.5 1799.3116704141582 L4715.5 1799.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M625.2 1101.9 L629.5 1111.8 L618.8 1110.4 L614.6 1100.5 Z"></path>
+					</g>
+					<path d="M333.8 1117.3 L85 1638 L85 1786.5 L85.0 1786.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M342.6 1111.2 L333.8 1117.3 L333.0 1106.6 L341.9 1100.5 Z"></path>
+					</g>
+					<path d="M3523.5 1051.7 L3523.5 1638 L5150.5 1794.3140011716462 L5150.5 1794.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1027.6 1085.1 L1025.5 1095.7 L1017.5 1088.5 L1019.5 1078.0 Z"></path>
+						<path d="M3528.8 1042.3 L3523.5 1051.7 L3518.2 1042.3 L3523.5 1033.0 Z"></path>
 					</g>
-					<path d="M799.2 1089.6 L109.5 1638 L109.5 1786.5 L109.5 1786.5 " fill="none"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M2893.2 179.0 L3523.5 260 L3523.5 865 L3523.5 865.0 " fill="none"></path>
+					</g>
+					<path d="M2893.9 173.7 L2893.2 179.0 L2892.5 184.3 L2880.0 177.3 Z"></path>
+					<path d="M4423.7 1091.6 L4939.75 1638 L6420.5 1796.7468540611212 L6420.5 1796.7 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M4421.1 1081.1 L4423.7 1091.6 L4413.4 1088.4 L4410.8 1078.0 Z"></path>
+					</g>
+					<path d="M4205.1 1094.2 L3890.75 1638 L5350.5 1790.556316711805 L5350.5 1790.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M809.8 1088.0 L799.2 1089.6 L803.1 1079.6 L813.8 1078.0 Z"></path>
+						<path d="M4214.4 1088.7 L4205.1 1094.2 L4205.1 1083.4 L4214.4 1078.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M853.5 199.8 L853.5 260 L953.0645863570392 820 L953.1 820.0 " fill="none"></path>
+						<path d="M3874.8 199.8 L3874.75 260 L4211.4408563134975 820 L4211.4 820.0 " fill="none"></path>
 					</g>
-					<path d="M858.8 199.8 L853.5 199.8 L848.2 199.8 L853.5 186.5 Z"></path>
+					<path d="M3880.1 199.8 L3874.8 199.8 L3869.4 199.8 L3874.8 186.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M1135.8 199.8 L1135.75 260 L1005.9096516690856 820 L1005.9 820.0 " fill="none"></path>
+						<path d="M4411.5 199.8 L4411.5 260 L4311.935413642961 820 L4311.9 820.0 " fill="none"></path>
 					</g>
-					<path d="M1141.1 199.8 L1135.8 199.8 L1130.4 199.8 L1135.8 186.5 Z"></path>
+					<path d="M4416.8 199.8 L4411.5 199.8 L4406.2 199.8 L4411.5 186.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M2333.8 177.6 L3110.5 260 L3110.5 880 L3110.5 880.0 " fill="none"></path>
+						<path d="M2892.8 188.2 L3150.5 260 L3150.5 880 L3150.5 880.0 " fill="none"></path>
 					</g>
-					<path d="M2334.3 172.3 L2333.8 177.6 L2333.2 182.9 L2320.5 176.2 Z"></path>
-					<path d="M2446.6 1089.0 L3202 1638 L5456.75 1789.7820420728578 L5456.8 1789.8 " fill="none"></path>
+					<path d="M2894.3 183.1 L2892.8 188.2 L2891.4 193.4 L2880.0 184.6 Z"></path>
+					<path d="M4724.0 228.2 L4724 260 L5753.75 721.8374288039056 L5753.8 721.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2442.2 1079.2 L2446.6 1089.0 L2435.9 1087.8 L2431.5 1078.0 Z"></path>
+						<path d="M4729.3 218.8 L4724.0 228.2 L4718.7 218.8 L4724.0 209.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2265.9 199.6 L2254 260 L2254 820 L2254.0 820.0 " fill="none"></path>
-					</g>
-					<path d="M2271.1 200.6 L2265.9 199.6 L2260.6 198.6 L2268.5 186.5 Z"></path>
-					<path d="M2407.9 1086.9 L3023 1638 L4927.75 1788.4172384735764 L4927.8 1788.4 " fill="none"></path>
-					<path d="M2411.5 1082.9 L2407.9 1086.9 L2404.3 1090.9 L2398.0 1078.0 Z"></path>
-					<path d="M2400.2 1087.2 L2983 1638 L2763.891768292683 1733 L2763.9 1733.0 " fill="none"></path>
-					<path d="M2403.8 1083.3 L2400.2 1087.2 L2396.5 1091.0 L2390.5 1078.0 Z"></path>
-					<path d="M2328.7 1089.8 L2619.5 1638 L2337.5411585365855 1733 L2337.5 1733.0 " fill="none"></path>
-					<path d="M2333.4 1087.3 L2328.7 1089.8 L2324.0 1092.3 L2322.4 1078.0 Z"></path>
-					<path d="M2272.5 1091.2 L2343.5 1638 L1856.75 1748.4489795918366 L1856.8 1748.4 " fill="none"></path>
-					<path d="M2277.8 1090.5 L2272.5 1091.2 L2267.2 1091.9 L2270.8 1078.0 Z"></path>
-					<path d="M1172.8 1964.7 L1172.75 1966 L1172.75 1986 L1172.8 1986.0 " fill="none"></path>
+					<path d="M6684.0 236.2 L6684 260 L6671.699564586357 280 L6671.7 280.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M6689.3 226.8 L6684.0 236.2 L6678.7 226.8 L6684.0 217.5 Z"></path>
+					</g>
+					<path d="M5989.3 36.8 L6684 82 L6684 124.5 L6684.0 124.5 " fill="none"></path>
+					<path d="M5989.7 31.5 L5989.3 36.8 L5989.0 42.1 L5976.0 35.9 Z"></path>
+					<path d="M6292.0 258.7 L6292 260 L6291.078374455733 280 L6291.1 280.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1178.1 1955.3 L1172.8 1964.7 L1167.4 1955.3 L1172.8 1946.0 Z"></path>
+						<path d="M6297.3 249.3 L6292.0 258.7 L6286.7 249.3 L6292.0 240.0 Z"></path>
 					</g>
-					<path d="M2222.2 1091.0 L2099.5 1638 L1344.75 1771.5624494200163 L1344.8 1771.6 " fill="none"></path>
-					<path d="M2227.4 1092.2 L2222.2 1091.0 L2217.0 1089.8 L2225.1 1078.0 Z"></path>
-					<path d="M788.8 1904.7 L788.75 1966 L788.75 1986 L788.8 1986.0 " fill="none"></path>
+					<path d="M5989.2 42.6 L6292 82 L6292 102 L6292.0 102.0 " fill="none"></path>
+					<path d="M5989.9 37.3 L5989.2 42.6 L5988.5 47.9 L5976.0 40.9 Z"></path>
+					<path d="M5900.0 236.2 L5900 260 L5910.457184325109 280 L5910.5 280.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M794.1 1895.3 L788.8 1904.7 L783.4 1895.3 L788.8 1886.0 Z"></path>
+						<path d="M5905.3 226.8 L5900.0 236.2 L5894.7 226.8 L5900.0 217.5 Z"></path>
 					</g>
-					<path d="M2179.1 1089.8 L1887.5 1638 L960.75 1776.3271899886233 L960.8 1776.3 " fill="none"></path>
-					<path d="M2183.8 1092.3 L2179.1 1089.8 L2174.4 1087.3 L2185.4 1078.0 Z"></path>
-					<path d="M5223.0 236.2 L5223 260 L5214.930333817127 280 L5214.9 280.0 " fill="none"></path>
+					<path d="M5900.0 59.8 L5900 82 L5900 124.5 L5900.0 124.5 " fill="none"></path>
+					<path d="M5905.3 59.8 L5900.0 59.8 L5894.7 59.8 L5900.0 46.5 Z"></path>
+					<path d="M5508.0 236.2 L5508 260 L5753.75 485.08707211698237 L5753.8 485.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5228.3 226.8 L5223.0 236.2 L5217.7 226.8 L5223.0 217.5 Z"></path>
+						<path d="M5513.3 226.8 L5508.0 236.2 L5502.7 226.8 L5508.0 217.5 Z"></path>
 					</g>
-					<path d="M4332.3 35.6 L5223 82 L5223 124.5 L5223.0 124.5 " fill="none"></path>
-					<path d="M4332.6 30.3 L4332.3 35.6 L4332.0 41.0 L4319.0 35.0 Z"></path>
-					<path d="M4831.0 258.7 L4831 260 L4834.3091436865025 280 L4834.3 280.0 " fill="none"></path>
+					<path d="M5810.8 42.6 L5508 82 L5508 124.5 L5508.0 124.5 " fill="none"></path>
+					<path d="M5811.5 47.9 L5810.8 42.6 L5810.1 37.3 L5824.0 40.9 Z"></path>
+					<path d="M5116.0 236.2 L5116 260 L5753.75 644.0155123443303 L5753.8 644.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4836.3 249.3 L4831.0 258.7 L4825.7 249.3 L4831.0 240.0 Z"></path>
+						<path d="M5121.3 226.8 L5116.0 236.2 L5110.7 226.8 L5116.0 217.5 Z"></path>
 					</g>
-					<path d="M4332.3 38.7 L4831 82 L4831 102 L4831.0 102.0 " fill="none"></path>
-					<path d="M4332.7 33.4 L4332.3 38.7 L4331.8 44.1 L4319.0 37.6 Z"></path>
-					<path d="M5837.7 1744.6 L5928.583333333333 1718.5 L5955.791666666667 1718.5 L5955.791666666667 1718.5 L5983 1802 L5983 1802 L5955.791666666667 1885.5 L5955.791666666667 1885.5 L5928.583333333333 1885.5 L5928.583333333333 1885.5 L5819.75 1854.1994833524684 L5819.8 1854.2 " fill="none"></path>
+					<path d="M5810.7 36.8 L5116 82 L5116 124.5 L5116.0 124.5 " fill="none"></path>
+					<path d="M5811.0 42.1 L5810.7 36.8 L5810.3 31.5 L5824.0 35.9 Z"></path>
+					<path d="M5990.7 1754.8 L6144.5 1718.5 L6187.5 1718.5 L6187.5 1718.5 L6230.5 1802 L6230.5 1802 L6187.5 1885.5 L6187.5 1885.5 L6144.5 1885.5 L6144.5 1885.5 L5972.5 1844.8719943422914 L5972.5 1844.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5827.2 1742.1 L5837.7 1744.6 L5830.2 1752.3 L5819.8 1749.8 Z"></path>
+						<path d="M5980.4 1751.8 L5990.7 1754.8 L5982.8 1762.2 L5972.5 1759.1 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3753.3 977.8 L3753.25 1638 L5456.75 1786.2090185676393 L5456.8 1786.2 " fill="none"></path>
+						<path d="M5153.0 977.8 L5153 1638 L5609.5 1755.344827586207 L5609.5 1755.3 " fill="none"></path>
 					</g>
-					<path d="M3758.6 977.8 L3753.3 977.8 L3747.9 977.8 L3753.3 964.5 Z"></path>
-					<path d="M4047.0 236.2 L4047 260 L4438.5 560.3825167037862 L4438.5 560.4 " fill="none"></path>
+					<path d="M5158.3 977.8 L5153.0 977.8 L5147.7 977.8 L5153.0 964.5 Z"></path>
+					<path d="M7076.0 220.7 L7076 260 L6766.75 521.199203187251 L6766.8 521.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4052.3 226.8 L4047.0 236.2 L4041.7 226.8 L4047.0 217.5 Z"></path>
+						<path d="M7081.3 211.3 L7076.0 220.7 L7070.7 211.3 L7076.0 202.0 Z"></path>
 					</g>
-					<path d="M4170.5 49.9 L4047 82 L4047 124.5 L4047.0 124.5 " fill="none"></path>
-					<path d="M4171.9 55.0 L4170.5 49.9 L4169.2 44.7 L4183.4 46.5 Z"></path>
-					<path d="M4439.0 220.7 L4439 260 L4453.687953555878 280 L4453.7 280.0 " fill="none"></path>
+					<path d="M2057.6 1087.9 L2933.25 1638 L5609.5 1791.5841133759077 L5609.5 1791.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4444.3 211.3 L4439.0 220.7 L4433.7 211.3 L4439.0 202.0 Z"></path>
+						<path d="M2052.6 1078.4 L2057.6 1087.9 L2046.9 1087.5 L2041.8 1078.0 Z"></path>
 					</g>
-					<path d="M3655.0 236.2 L3655 260 L4438.5 678.4740310077519 L4438.5 678.5 " fill="none"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M2768.7 176.6 L1836.5 260 L1836.5 820 L1836.5 820.0 " fill="none"></path>
+					</g>
+					<path d="M2769.2 181.9 L2768.7 176.6 L2768.2 171.3 L2782.0 175.4 Z"></path>
+					<path d="M2045.5 1085.3 L2893.25 1638 L2753.128048780488 1718 L2753.1 1718.0 " fill="none"></path>
+					<path d="M2048.4 1080.8 L2045.5 1085.3 L2042.6 1089.7 L2034.4 1078.0 Z"></path>
+					<path d="M1967.1 1087.7 L2485.25 1638 L2318.8551829268295 1733 L2318.9 1733.0 " fill="none"></path>
+					<path d="M1971.0 1084.1 L1967.1 1087.7 L1963.2 1091.4 L1958.0 1078.0 Z"></path>
+					<path d="M1890.0 1090.5 L2097.25 1638 L1882.1966463414633 1733 L1882.2 1733.0 " fill="none"></path>
+					<path d="M1895.0 1088.6 L1890.0 1090.5 L1885.1 1092.4 L1885.3 1078.0 Z"></path>
+					<path d="M1833.3 1091.3 L1821.25 1638 L1450 1738.2634829147798 L1450.0 1738.3 " fill="none"></path>
+					<path d="M1838.7 1091.4 L1833.3 1091.3 L1828.0 1091.2 L1833.6 1078.0 Z"></path>
+					<path d="M766.0 1964.7 L766 1966 L766 1986 L766.0 1986.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3660.3 226.8 L3655.0 236.2 L3649.7 226.8 L3655.0 217.5 Z"></path>
+						<path d="M771.3 1955.3 L766.0 1964.7 L760.7 1955.3 L766.0 1946.0 Z"></path>
 					</g>
-					<path d="M4153.7 38.7 L3655 82 L3655 124.5 L3655.0 124.5 " fill="none"></path>
-					<path d="M4154.2 44.1 L4153.7 38.7 L4153.3 33.4 L4167.0 37.6 Z"></path>
-					<path d="M3263.0 236.2 L3263 260 L4438.5 741.5217003567182 L4438.5 741.5 " fill="none"></path>
+					<path d="M1783.3 1090.5 L1577.25 1638 L938 1767.2289676425269 L938.0 1767.2 " fill="none"></path>
+					<path d="M1788.3 1092.4 L1783.3 1090.5 L1778.3 1088.6 L1788.0 1078.0 Z"></path>
+					<path d="M382.0 1904.7 L382 1966 L382 1986 L382.0 1986.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3268.3 226.8 L3263.0 236.2 L3257.7 226.8 L3263.0 217.5 Z"></path>
+						<path d="M387.3 1895.3 L382.0 1904.7 L376.7 1895.3 L382.0 1886.0 Z"></path>
 					</g>
-					<path d="M4153.7 35.6 L3263 82 L3263 124.5 L3263.0 124.5 " fill="none"></path>
-					<path d="M4154.0 41.0 L4153.7 35.6 L4153.4 30.3 L4167.0 35.0 Z"></path>
-					<path d="M5467.7 1249.8 L6142.25 1638 L5819.75 1742.9404761904761 L5819.8 1742.9 " fill="none"></path>
+					<path d="M1740.7 1089.0 L1365.25 1638 L554 1773.3114670734808 L554.0 1773.3 " fill="none"></path>
+					<path d="M1745.1 1092.0 L1740.7 1089.0 L1736.3 1086.0 L1748.3 1078.0 Z"></path>
+					<path d="M6371.7 1636.4 L6372 1638 L5972.5 1750.7676419965576 L5972.5 1750.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5462.2 1240.5 L5467.7 1249.8 L5456.9 1249.8 L5451.5 1240.5 Z"></path>
+						<path d="M6375.5 1626.4 L6371.7 1636.4 L6365.0 1628.1 L6368.8 1618.0 Z"></path>
 					</g>
-					<path d="M5465.2 1429.0 L5691.75 1638 L6268 1787.355985776373 L6268.0 1787.4 " fill="none"></path>
+					<path d="M6196.9 1636.6 L6196.75 1638 L4828.5 1795.4964028776978 L4828.5 1795.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5462.0 1418.7 L5465.2 1429.0 L5454.7 1426.6 L5451.5 1416.3 Z"></path>
+						<path d="M6203.0 1627.8 L6196.9 1636.6 L6192.4 1626.8 L6198.6 1618.0 Z"></path>
 					</g>
-					<path d="M5018.8 1636.6 L5019 1638 L4369.75 1790.4912280701753 L4369.8 1790.5 " fill="none"></path>
+					<path d="M6157.0 1636.5 L6156.75 1638 L6439.94131097561 1786.5 L6439.9 1786.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5023.2 1626.7 L5018.8 1636.6 L5012.5 1627.8 L5016.9 1618.0 Z"></path>
+						<path d="M6163.6 1628.0 L6157.0 1636.5 L6153.1 1626.4 L6159.8 1618.0 Z"></path>
 					</g>
-					<path d="M4425.6 1492.0 L4286 1638 L6028 1795.7515184980673 L6028.0 1795.8 " fill="none"></path>
+					<path d="M5739.6 1398.1 L5461.5 1638 L6768 1793.773173391494 L6768.0 1793.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4435.9 1489.0 L4425.6 1492.0 L4428.2 1481.6 L4438.5 1478.6 Z"></path>
+						<path d="M5750.2 1396.0 L5739.6 1398.1 L5743.2 1388.0 L5753.8 1385.9 Z"></path>
 					</g>
-					<path d="M4423.8 1355.6 L4061.75 1638 L5311.75 1795.3896353166986 L5311.8 1795.4 " fill="none"></path>
+					<path d="M5739.3 1376.9 L5421.5 1638 L6275.5 1792.5019305019305 L6275.5 1792.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4434.4 1354.1 L4423.8 1355.6 L4427.9 1345.6 L4438.5 1344.1 Z"></path>
+						<path d="M5749.9 1375.1 L5739.3 1376.9 L5743.2 1366.9 L5753.8 1365.1 Z"></path>
 					</g>
-					<path d="M5546.5 199.8 L5546.5 260 L5451.5 368.81961762261017 L5451.5 368.8 " fill="none"></path>
-					<path d="M5551.8 199.8 L5546.5 199.8 L5541.2 199.8 L5546.5 186.5 Z"></path>
+					<path d="M7399.5 199.8 L7399.5 260 L6766.75 642.6769804696072 L6766.8 642.7 " fill="none"></path>
+					<path d="M7404.8 199.8 L7399.5 199.8 L7394.2 199.8 L7399.5 186.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M5776.0 199.8 L5776 260 L5451.5 529.0499398315283 L5451.5 529.0 " fill="none"></path>
+						<path d="M7629.0 199.8 L7629 260 L6766.75 694.0385388127854 L6766.8 694.0 " fill="none"></path>
 					</g>
-					<path d="M5781.3 199.8 L5776.0 199.8 L5770.7 199.8 L5776.0 186.5 Z"></path>
-					<path d="M6074.0 228.2 L6074 260 L5451.5 639.8959255978742 L5451.5 639.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6079.3 218.8 L6074.0 228.2 L6068.7 218.8 L6074.0 209.5 Z"></path>
+					<path d="M7634.3 199.8 L7629.0 199.8 L7623.7 199.8 L7629.0 186.5 Z"></path>
+					<g data-name="ScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
+							<rect x="198.3" y="117.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
+							<path d="M198.3 148.0 L630.3 148.0" fill="none" data-name="ScheduleControls"></path>
+							<path d="M198.3 179.0 L630.3 179.0" fill="none" data-name="ScheduleControls"></path>
+						</g>
+						<g transform="translate(198.25, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
+								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
+								
+							</g>
+						</g>
+						<g transform="translate(198.25, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
+								
+							</g>
+						</g>
+						<g transform="translate(198.25, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
+								
+							</g>
+						</g>
 					</g>
-					<path d="M1481.0 1051.7 L1481 1638 L576.75 1788.6700533401067 L576.8 1788.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1486.3 1042.3 L1481.0 1051.7 L1475.7 1042.3 L1481.0 1033.0 Z"></path>
+					<g data-name="WithScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
+							<rect x="166.8" y="797.5" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
+							<path d="M166.8 828.5 L661.8 828.5" fill="none" data-name="WithScheduleControls"></path>
+							<path d="M166.8 1054.5 L661.8 1054.5" fill="none" data-name="WithScheduleControls"></path>
+						</g>
+						<g transform="translate(166.75, 797.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
+								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
+								
+							</g>
+						</g>
+						<g transform="translate(166.75, 828.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(166.75, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
+								
+							</g>
+						</g>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2209.3 178.0 L1481 260 L1481 865 L1481.0 865.0 " fill="none"></path>
+					<g data-name="FormConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
+							<rect x="318.3" y="15.5" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
+						</g>
+						<g transform="translate(318.25, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
+								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
+								
+							</g>
+						</g>
 					</g>
-					<path d="M2209.8 183.3 L2209.3 178.0 L2208.7 172.7 L2222.5 176.5 Z"></path>
-					<path d="M6506.0 243.7 L6506 260 L6506 797.5 L6506.0 797.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6511.3 234.3 L6506.0 243.7 L6500.7 234.3 L6506.0 225.0 Z"></path>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="4715.5" y="1786.5" height="31.0" width="113.0" data-name="FormControl"></rect>
+						</g>
+						<g transform="translate(4715.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+								
+							</g>
+						</g>
 					</g>
-					<path d="M6506.0 59.8 L6506 82 L6506 117 L6506.0 117.0 " fill="none"></path>
-					<path d="M6511.3 59.8 L6506.0 59.8 L6500.7 59.8 L6506.0 46.5 Z"></path>
-					<path d="M6510.9 1119.2 L6526 1638 L6343.544207317073 1786.5 L6343.5 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6516.0 1109.7 L6510.9 1119.2 L6505.3 1110.0 L6510.4 1100.5 Z"></path>
+					<g data-name="StreamSubscription">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
+							<rect x="0.0" y="1786.5" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+						</g>
+						<g transform="translate(0, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
+								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
+								
+							</g>
+						</g>
 					</g>
-					<path d="M6426.9 1117.4 L6182.25 1638 L6475.401676829269 1786.5 L6475.4 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6435.7 1111.2 L6426.9 1117.4 L6426.0 1106.7 L6434.8 1100.5 Z"></path>
+					<g data-name="IFormDataWithSchedule">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
+							<rect x="3374.5" y="865.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
+							<path d="M3374.5 896.0 L3672.5 896.0" fill="none" data-name="IFormDataWithSchedule"></path>
+							<path d="M3374.5 1002.0 L3672.5 1002.0" fill="none" data-name="IFormDataWithSchedule"></path>
+						</g>
+						<g transform="translate(3374.5, 865)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
+								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
+								
+							</g>
+						</g>
+						<g transform="translate(3374.5, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(3374.5, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StudyUTimeOfDay">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
+							<rect x="5150.5" y="1786.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
+						</g>
+						<g transform="translate(5150.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
+								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="IFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
+							<rect x="2782.0" y="155.5" height="31.0" width="98.0" data-name="IFormData"></rect>
+						</g>
+						<g transform="translate(2782, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
+								
+							</g>
+						</g>
 					</g>
 					<g data-name="WithQuestionnaireControls">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="660.0" y="820.0" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M660.0 851.0 L1292.0 851.0" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M660.0 957.0 L1292.0 957.0" fill="none" data-name="WithQuestionnaireControls"></path>
+							<rect x="3973.0" y="820.0" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
+							<path d="M3973.0 851.0 L4605.0 851.0" fill="none" data-name="WithQuestionnaireControls"></path>
+							<path d="M3973.0 957.0 L4605.0 957.0" fill="none" data-name="WithQuestionnaireControls"></path>
 						</g>
-						<g transform="translate(660, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
+						<g transform="translate(3973, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
 								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(660, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+						<g transform="translate(3973, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
@@ -553,7 +703,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(660, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+						<g transform="translate(3973, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
 								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
@@ -568,9 +718,9 @@
 					</g>
 					<g data-name="FormArray">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="4271.8" y="1786.5" height="31.0" width="98.0" data-name="FormArray"></rect>
+							<rect x="6420.5" y="1786.5" height="31.0" width="98.0" data-name="FormArray"></rect>
 						</g>
-						<g transform="translate(4271.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+						<g transform="translate(6420.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
 								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
 								
@@ -579,9 +729,9 @@
 					</g>
 					<g data-name="FormViewModelCollection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="0.0" y="1786.5" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
+							<rect x="5350.5" y="1786.5" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
 						</g>
-						<g transform="translate(0, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
+						<g transform="translate(5350.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
 								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
 								
@@ -590,9 +740,9 @@
 					</g>
 					<g data-name="IFormViewModelDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="745.0" y="155.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
+							<rect x="3766.3" y="155.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
 						</g>
-						<g transform="translate(745, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
+						<g transform="translate(3766.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
 								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
 								
@@ -601,9 +751,9 @@
 					</g>
 					<g data-name="IProviderArgsResolver">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="1039.3" y="155.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
+							<rect x="4315.0" y="155.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
 						</g>
-						<g transform="translate(1039.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
+						<g transform="translate(4315, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
 								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
 								
@@ -612,24 +762,24 @@
 					</g>
 					<g data-name="QuestionnaireFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="2926.5" y="880.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M2926.5 911.0 L3294.5 911.0" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M2926.5 957.0 L3294.5 957.0" fill="none" data-name="QuestionnaireFormData"></path>
+							<rect x="2966.5" y="880.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
+							<path d="M2966.5 911.0 L3334.5 911.0" fill="none" data-name="QuestionnaireFormData"></path>
+							<path d="M2966.5 957.0 L3334.5 957.0" fill="none" data-name="QuestionnaireFormData"></path>
 						</g>
-						<g transform="translate(2926.5, 880)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
+						<g transform="translate(2966.5, 880)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
 								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2926.5, 911)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+						<g transform="translate(2966.5, 911)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2926.5, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+						<g transform="translate(2966.5, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
@@ -638,321 +788,38 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="2222.5" y="155.5" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(2222.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="1670.0" y="820.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M1670.0 851.0 L2838.0 851.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M1670.0 987.0 L2838.0 987.0" fill="none" data-name="QuestionFormData"></path>
-						</g>
-						<g transform="translate(1670, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1670, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1670, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="5456.8" y="1718.5" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M5456.8 1749.5 L5819.8 1749.5" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(5456.75, 1718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5456.75, 1749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="4927.8" y="1718.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M4927.8 1749.0 L5271.8 1749.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M4927.8 1810.0 L5271.8 1810.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-						</g>
-						<g transform="translate(4927.75, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
-								
-							</g>
+					<g data-name="SurveyQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
+							<rect x="4548.0" y="132.5" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M4548.0 163.5 L4900.0 163.5" fill="none" data-name="SurveyQuestionFormView"></path>
 						</g>
-						<g transform="translate(4927.75, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(4548, 132.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4927.75, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(4548, 163.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="2408.8" y="1733.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M2408.8 1764.0 L2800.8 1764.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M2408.8 1810.0 L2800.8 1810.0" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(2408.75, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
+					<g data-name="QuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
+							<rect x="5753.8" y="280.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M5753.8 311.0 L6766.8 311.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M5753.8 1332.0 L6766.8 1332.0" fill="none" data-name="QuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(2408.75, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(5753.75, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
+								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2408.75, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="1896.8" y="1733.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M1896.8 1764.0 L2368.8 1764.0" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M1896.8 1810.0 L2368.8 1810.0" fill="none" data-name="ImageQuestionFormData"></path>
-						</g>
-						<g transform="translate(1896.75, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1896.75, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1896.75, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="1384.8" y="1725.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M1384.8 1756.5 L1856.8 1756.5" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M1384.8 1817.5 L1856.8 1817.5" fill="none" data-name="AudioQuestionFormData"></path>
-						</g>
-						<g transform="translate(1384.75, 1725.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1384.75, 1756.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1384.75, 1817.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="1000.8" y="1658.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M1000.8 1689.0 L1344.8 1689.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M1000.8 1885.0 L1344.8 1885.0" fill="none" data-name="ScaleQuestionFormData"></path>
-						</g>
-						<g transform="translate(1000.75, 1658)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1000.75, 1689)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1000.75, 1885)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="1143.8" y="1986.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(1143.75, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="616.8" y="1718.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M616.8 1749.0 L960.8 1749.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M616.8 1825.0 L960.8 1825.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-						</g>
-						<g transform="translate(616.75, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(616.75, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(616.75, 1825)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="690.8" y="1986.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
-						</g>
-						<g transform="translate(690.75, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="5047.0" y="124.5" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M5047.0 155.5 L5399.0 155.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M5047.0 186.5 L5399.0 186.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(5047, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5047, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5047, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="4438.5" y="280.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M4438.5 311.0 L5451.5 311.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M4438.5 1332.0 L5451.5 1332.0" fill="none" data-name="QuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(4438.5, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4438.5, 311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+						<g transform="translate(5753.75, 311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
@@ -1024,7 +891,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(4438.5, 1332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+						<g transform="translate(5753.75, 1332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
@@ -1048,11 +915,36 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="AudioRecordingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
+							<rect x="6508.0" y="124.5" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
+							<path d="M6508.0 155.5 L6860.0 155.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<path d="M6508.0 186.5 L6860.0 186.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+						</g>
+						<g transform="translate(6508, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(6508, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(6508, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="ConsumerWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="4167.0" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+							<rect x="5824.0" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
 						</g>
-						<g transform="translate(4167, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+						<g transform="translate(5824, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
 								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
@@ -1061,24 +953,24 @@
 					</g>
 					<g data-name="FreeTextQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="4655.0" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M4655.0 133.0 L5007.0 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M4655.0 179.0 L5007.0 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<rect x="6116.0" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M6116.0 133.0 L6468.0 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M6116.0 179.0 L6468.0 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
 						</g>
-						<g transform="translate(4655, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(6116, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4655, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(6116, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4655, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+						<g transform="translate(6116, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
@@ -1087,54 +979,129 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="3722.8" y="933.5" height="31.0" width="61.0" data-name="Enum"></rect>
+					<g data-name="ChoiceQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
+							<rect x="5724.0" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M5724.0 155.5 L6076.0 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M5724.0 186.5 L6076.0 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(3722.75, 933.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
+						<g transform="translate(5724, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5724, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5724, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ImageCapturingQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="3871.0" y="124.5" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M3871.0 155.5 L4223.0 155.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M3871.0 186.5 L4223.0 186.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<rect x="5332.0" y="124.5" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
+							<path d="M5332.0 155.5 L5684.0 155.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<path d="M5332.0 186.5 L5684.0 186.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
 						</g>
-						<g transform="translate(3871, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
+						<g transform="translate(5332, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3871, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+						<g transform="translate(5332, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3871, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+						<g transform="translate(5332, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
+					<g data-name="BoolQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
+							<rect x="4940.0" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M4940.0 155.5 L5292.0 155.5" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M4940.0 186.5 L5292.0 186.5" fill="none" data-name="BoolQuestionFormView"></path>
+						</g>
+						<g transform="translate(4940, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4940, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4940, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="SurveyQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
+							<rect x="5609.5" y="1718.5" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M5609.5 1749.5 L5972.5 1749.5" fill="none" data-name="SurveyQuestionType"></path>
+						</g>
+						<g transform="translate(5609.5, 1718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
+								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5609.5, 1749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="Enum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
+							<rect x="5122.5" y="933.5" height="31.0" width="61.0" data-name="Enum"></rect>
+						</g>
+						<g transform="translate(5122.5, 933.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="IScaleQuestionFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="5700.0" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M5700.0 31.0 L6009.0 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
+							<rect x="6016.0" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M6016.0 31.0 L6325.0 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(5700, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+						<g transform="translate(6016, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
 								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5700, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+						<g transform="translate(6016, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
@@ -1143,270 +1110,303 @@
 					</g>
 					<g data-name="ScaleQuestionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="4263.0" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M4263.0 171.0 L4615.0 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
+							<rect x="6900.0" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M6900.0 171.0 L7252.0 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
 						</g>
-						<g transform="translate(4263, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+						<g transform="translate(6900, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
 								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4263, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+						<g transform="translate(6900, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="3479.0" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M3479.0 155.5 L3831.0 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M3479.0 186.5 L3831.0 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
+					<g data-name="QuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
+							<rect x="1252.5" y="820.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M1252.5 851.0 L2420.5 851.0" fill="none" data-name="QuestionFormData"></path>
+							<path d="M1252.5 987.0 L2420.5 987.0" fill="none" data-name="QuestionFormData"></path>
 						</g>
-						<g transform="translate(3479, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
+						<g transform="translate(1252.5, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
+								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3479, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(1252.5, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3479, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
+						<g transform="translate(1252.5, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="3087.0" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M3087.0 155.5 L3439.0 155.5" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M3087.0 186.5 L3439.0 186.5" fill="none" data-name="BoolQuestionFormView"></path>
+					<g data-name="ChoiceQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
+							<rect x="2434.0" y="1718.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M2434.0 1749.0 L2778.0 1749.0" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M2434.0 1810.0 L2778.0 1810.0" fill="none" data-name="ChoiceQuestionFormData"></path>
 						</g>
-						<g transform="translate(3087, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
+						<g transform="translate(2434, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3087, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(2434, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3087, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+						<g transform="translate(2434, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="6268.0" y="1786.5" height="31.0" width="113.0" data-name="FormControl"></rect>
+					<g data-name="BoolQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
+							<rect x="2002.0" y="1733.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M2002.0 1764.0 L2394.0 1764.0" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M2002.0 1810.0 L2394.0 1810.0" fill="none" data-name="BoolQuestionFormData"></path>
 						</g>
-						<g transform="translate(6268, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+						<g transform="translate(2002, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
+								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="6028.0" y="1786.5" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+						<g transform="translate(2002, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(6028, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
+						<g transform="translate(2002, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="5311.8" y="1786.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
+					<g data-name="ImageQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
+							<rect x="1490.0" y="1733.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
+							<path d="M1490.0 1764.0 L1962.0 1764.0" fill="none" data-name="ImageQuestionFormData"></path>
+							<path d="M1490.0 1810.0 L1962.0 1810.0" fill="none" data-name="ImageQuestionFormData"></path>
 						</g>
-						<g transform="translate(5311.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+						<g transform="translate(1490, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="5439.0" y="155.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
+						<g transform="translate(1490, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(5439, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
+						<g transform="translate(1490, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="5694.0" y="155.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
+					<g data-name="AudioQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
+							<rect x="978.0" y="1725.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
+							<path d="M978.0 1756.5 L1450.0 1756.5" fill="none" data-name="AudioQuestionFormData"></path>
+							<path d="M978.0 1817.5 L1450.0 1817.5" fill="none" data-name="AudioQuestionFormData"></path>
 						</g>
-						<g transform="translate(5694, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
+						<g transform="translate(978, 1725.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="5898.0" y="132.5" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M5898.0 163.5 L6250.0 163.5" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(5898, 132.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
+						<g transform="translate(978, 1756.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5898, 163.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
+						<g transform="translate(978, 1817.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="1332.0" y="865.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M1332.0 896.0 L1630.0 896.0" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M1332.0 1002.0 L1630.0 1002.0" fill="none" data-name="IFormDataWithSchedule"></path>
+					<g data-name="ScaleQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
+							<rect x="594.0" y="1658.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M594.0 1689.0 L938.0 1689.0" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M594.0 1885.0 L938.0 1885.0" fill="none" data-name="ScaleQuestionFormData"></path>
 						</g>
-						<g transform="translate(1332, 865)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
+						<g transform="translate(594, 1658)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1332, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
+						<g transform="translate(594, 1689)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1332, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
+						<g transform="translate(594, 1885)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="416.8" y="1786.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
+					<g data-name="Color">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
+							<rect x="737.0" y="1986.0" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(416.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
+						<g transform="translate(737, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
+								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="6290.0" y="117.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M6290.0 148.0 L6722.0 148.0" fill="none" data-name="ScheduleControls"></path>
-							<path d="M6290.0 179.0 L6722.0 179.0" fill="none" data-name="ScheduleControls"></path>
+					<g data-name="FreeTextQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
+							<rect x="210.0" y="1718.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M210.0 1749.0 L554.0 1749.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M210.0 1825.0 L554.0 1825.0" fill="none" data-name="FreeTextQuestionFormData"></path>
 						</g>
-						<g transform="translate(6290, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
+						<g transform="translate(210, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6290, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
+						<g transform="translate(210, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6290, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
+						<g transform="translate(210, 1825)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="6258.5" y="797.5" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M6258.5 828.5 L6753.5 828.5" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M6258.5 1054.5 L6753.5 1054.5" fill="none" data-name="WithScheduleControls"></path>
+					<g data-name="FreeTextQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
+							<rect x="284.0" y="1986.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
 						</g>
-						<g transform="translate(6258.5, 797.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
+						<g transform="translate(284, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
+								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6258.5, 828.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
+					</g>
+					<g data-name="AbstractControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
+							<rect x="6768.0" y="1786.5" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+						</g>
+						<g transform="translate(6768, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
+								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6258.5, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
+					</g>
+					<g data-name="FormGroup">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
+							<rect x="6275.5" y="1786.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
+						</g>
+						<g transform="translate(6275.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="6410.0" y="15.5" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
+					<g data-name="ManagedFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
+							<rect x="7292.0" y="155.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
 						</g>
-						<g transform="translate(6410, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
+						<g transform="translate(7292, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
+								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="6421.0" y="1786.5" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+					<g data-name="IListActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
+							<rect x="7547.0" y="155.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
 						</g>
-						<g transform="translate(6421, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
+						<g transform="translate(7547, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
 								
 							</g>
 						</g>
diff --git a/docs/uml/designer_v2/lib/features/design/uml.svg b/docs/uml/designer_v2/lib/features/design/uml.svg
index e752ee322..011db54a7 100644
--- a/docs/uml/designer_v2/lib/features/design/uml.svg
+++ b/docs/uml/designer_v2/lib/features/design/uml.svg
@@ -1,272 +1,226 @@
-<svg version="1.1" baseProfile="full" width="30192.8" height="2822.0" viewbox="0 0 30192.75 2822" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudyDesignInterventionsFormView
+<svg version="1.1" baseProfile="full" width="30129.5" height="2822.0" viewbox="0 0 30129.5 2822" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[StudyFormValidationSet
 	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
-	
-	[InterventionFormView
-	  |
-	  +formViewModel: InterventionFormViewModel
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
 	]
 	
-	[InterventionFormView]o-[InterventionFormViewModel]
+	[Enum]&lt;:--[StudyFormValidationSet]
 	
-	[InterventionPreview
+	[StudyFormScaffold
 	  |
-	  +routeArgs: InterventionFormRouteArgs
+	  +studyId: String;
+	  +formViewModelBuilder: T Function(WidgetRef);
+	  +formViewBuilder: Widget Function(T)
 	  |
 	  +Widget build()
 	]
 	
-	[InterventionPreview]o-[InterventionFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
+	[StudyFormScaffold]o-[T Function(WidgetRef)]
+	[StudyFormScaffold]o-[Widget Function(T)]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
 	
-	[StudyScheduleFormView
-	  |
-	  +formViewModel: StudyScheduleControls
+	[StudyDesignEnrollmentFormView
 	  |
-	  -FormTableRow _renderCustomSequence();
-	  +Widget build()
+	  +Widget build();
+	  -dynamic _showScreenerQuestionSidesheetWithArgs();
+	  -dynamic _showConsentItemSidesheetWithArgs()
 	]
 	
-	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
 	
-	[InterventionTaskFormData
+	[EnrollmentFormData
 	  |
-	  +taskId: String;
-	  +taskTitle: String;
-	  +taskDescription: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
+	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
+	  +enrollmentType: Participation;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
 	  +id: String
 	  |
-	  +CheckmarkTask toTask();
-	  +InterventionTaskFormData copy()
+	  +Study apply();
+	  +EnrollmentFormData copy()
 	]
 	
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
+	[EnrollmentFormData]o-[Participation]
+	[EnrollmentFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
 	
-	[InterventionsFormViewModel
+	[EnrollmentFormViewModel
 	  |
 	  +study: Study;
 	  +router: GoRouter;
-	  +interventionsArray: FormArray&lt;dynamic&gt;;
-	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
+	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
+	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
+	  +consentItemArray: FormArray&lt;dynamic&gt;;
+	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
 	  +form: FormGroup;
+	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
+	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
 	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +interventionsRequired: dynamic;
 	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestStudySchedule: bool
+	  +canTestScreener: bool;
+	  +canTestConsent: bool;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
 	  |
 	  +void setControlsFrom();
-	  +InterventionsFormData buildFormData();
+	  +EnrollmentFormData buildFormData();
 	  +void read();
 	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
 	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
 	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
 	  +void onSelectItem();
 	  +void onNewItem();
-	  +InterventionFormViewModel provide();
+	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
+	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
+	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
+	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
+	  +dynamic testScreener();
+	  +dynamic testConsent();
+	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
+	]
+	
+	[EnrollmentFormViewModel]o-[Study]
+	[EnrollmentFormViewModel]o-[GoRouter]
+	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
+	[EnrollmentFormViewModel]o-[FormControl]
+	[EnrollmentFormViewModel]o-[FormArray]
+	[EnrollmentFormViewModel]o-[FormViewModelCollection]
+	[EnrollmentFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
+	
+	[EnrollmentFormConsentItemDelegate
+	  |
+	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
+	  +owner: EnrollmentFormViewModel;
+	  +propagateOnSave: bool;
+	  +validationSet: dynamic
+	  |
 	  +void onCancel();
 	  +dynamic onSave();
-	  +dynamic testStudySchedule()
+	  +ConsentItemFormViewModel provide();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem()
 	]
 	
-	[InterventionsFormViewModel]o-[Study]
-	[InterventionsFormViewModel]o-[GoRouter]
-	[InterventionsFormViewModel]o-[FormArray]
-	[InterventionsFormViewModel]o-[FormViewModelCollection]
-	[InterventionsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
+	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
+	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
 	
-	[InterventionTaskFormViewModel
+	[ConsentItemFormData
 	  |
-	  +taskIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +taskTitleControl: FormControl&lt;String&gt;;
-	  +taskDescriptionControl: FormControl&lt;String&gt;;
-	  +markAsCompletedControl: FormControl&lt;bool&gt;;
+	  +consentId: String;
+	  +title: String;
+	  +description: String;
+	  +iconName: String?;
+	  +id: String
+	  |
+	  +ConsentItem toConsentItem();
+	  +ConsentItemFormData copy()
+	]
+	
+	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
+	
+	[ConsentItemFormViewModel
+	  |
+	  +consentIdControl: FormControl&lt;String&gt;;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +iconControl: FormControl&lt;IconOption&gt;;
 	  +form: FormGroup;
-	  +taskId: String;
-	  +instanceId: String;
+	  +consentId: String;
 	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
 	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
 	  +titles: Map&lt;FormMode, String&gt;
 	  |
 	  +void setControlsFrom();
-	  +InterventionTaskFormData buildFormData();
-	  +InterventionTaskFormViewModel createDuplicate()
+	  +ConsentItemFormData buildFormData();
+	  +ConsentItemFormViewModel createDuplicate()
 	]
 	
-	[InterventionTaskFormViewModel]o-[FormControl]
-	[InterventionTaskFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
+	[ConsentItemFormViewModel]o-[FormControl]
+	[ConsentItemFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
 	
-	[&lt;abstract&gt;StudyScheduleControls
-	  |
-	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
-	  &lt;static&gt;+defaultScheduleTypeSequence: String;
-	  &lt;static&gt;+defaultNumCycles: int;
-	  &lt;static&gt;+defaultPeriodLength: int;
-	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
-	  +phaseDurationControl: FormControl&lt;int&gt;;
-	  +numCyclesControl: FormControl&lt;int&gt;;
-	  +includeBaselineControl: FormControl&lt;bool&gt;;
-	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  &lt;static&gt;+kNumCyclesMin: int;
-	  &lt;static&gt;+kNumCyclesMax: int;
-	  &lt;static&gt;+kPhaseDurationMin: int;
-	  &lt;static&gt;+kPhaseDurationMax: int;
-	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +numCyclesRange: dynamic;
-	  +phaseDurationRange: dynamic;
-	  +customSequenceRequired: dynamic
+	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
 	  |
-	  +void setStudyScheduleControlsFrom();
-	  +StudyScheduleFormData buildStudyScheduleFormData();
-	  +bool isSequencingCustom()
+	  +isDirtyOptionsBannerVisible: bool
 	]
 	
-	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
-	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
-	
-	[InterventionFormData
+	[ScreenerQuestionLogicFormView
 	  |
-	  +interventionId: String;
-	  +title: String;
-	  +description: String?;
-	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
-	  +iconName: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
+	  +formViewModel: ScreenerQuestionFormViewModel
 	  |
-	  +Intervention toIntervention();
-	  +InterventionFormData copy()
+	  +Widget build();
+	  -dynamic _buildInfoBanner();
+	  -dynamic _buildAnswerOptionsLogicControls();
+	  -List&lt;Widget&gt; _buildOptionLogicRow()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
+	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
 	
-	[StudyScheduleFormData
+	[ScreenerQuestionFormViewModel
 	  |
-	  +sequenceType: PhaseSequence;
-	  +sequenceTypeCustom: String;
-	  +numCycles: int;
-	  +phaseDuration: int;
-	  +includeBaseline: bool;
-	  +id: String
+	  &lt;static&gt;+defaultResponseOptionValidity: bool;
+	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
+	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
+	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
+	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +prevResponseOptionValues: List&lt;dynamic&gt;;
+	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isDirtyOptionsBannerVisible: bool
 	  |
-	  +StudySchedule toStudySchedule();
-	  +Study apply();
-	  +StudyScheduleFormData copy()
+	  +dynamic onResponseOptionsChanged();
+	  +void setControlsFrom();
+	  +QuestionFormData buildFormData();
+	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
+	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
+	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
+	  +ScreenerQuestionFormViewModel createDuplicate()
 	]
 	
-	[StudyScheduleFormData]o-[PhaseSequence]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
+	[ScreenerQuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
+	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
 	
-	[InterventionTaskFormView
+	[ConsentItemFormView
 	  |
-	  +formViewModel: InterventionTaskFormViewModel
+	  +formViewModel: ConsentItemFormViewModel
 	]
 	
-	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
+	[ConsentItemFormView]o-[ConsentItemFormViewModel]
 	
-	[InterventionsFormData
+	[DataReferenceIdentifier
 	  |
-	  +interventionsData: List&lt;InterventionFormData&gt;;
-	  +studyScheduleData: StudyScheduleFormData;
-	  +id: String
+	  +hashCode: int
 	  |
-	  +Study apply();
-	  +InterventionsFormData copy()
-	]
-	
-	[InterventionsFormData]o-[StudyScheduleFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
-	
-	[InterventionFormViewModel
-	  |
-	  +study: Study;
-	  +interventionIdControl: FormControl&lt;String&gt;;
-	  +interventionTitleControl: FormControl&lt;String&gt;;
-	  +interventionIconControl: FormControl&lt;IconOption&gt;;
-	  +interventionDescriptionControl: FormControl&lt;String&gt;;
-	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
-	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
-	  +form: FormGroup;
-	  +interventionId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneTask: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +InterventionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +InterventionTaskFormViewModel provide();
-	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
-	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
-	  +InterventionFormViewModel createDuplicate()
-	]
-	
-	[InterventionFormViewModel]o-[Study]
-	[InterventionFormViewModel]o-[FormControl]
-	[InterventionFormViewModel]o-[FormArray]
-	[InterventionFormViewModel]o-[FormViewModelCollection]
-	[InterventionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
-	
-	[StudyDesignReportsFormView
-	  |
-	  +Widget build();
-	  -dynamic _showReportItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
-	
-	[ReportItemFormData
-	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
-	  +id: String
-	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
+	  +bool ==()
 	]
 	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
+	[DataReference]&lt;:-[DataReferenceIdentifier]
 	
-	[DataReferenceEditor
+	[AverageSectionFormView
 	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
 	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
+	  +Widget build()
 	]
 	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
+	[AverageSectionFormView]o-[ReportItemFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
 	
 	[TemporalAggregationFormatted
 	  |
@@ -315,26 +269,18 @@
 	[ReportSectionType]o-[ReportSectionType]
 	[Enum]&lt;:--[ReportSectionType]
 	
-	[AverageSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
-	
-	[DataReferenceIdentifier
+	[DataReferenceEditor
 	  |
-	  +hashCode: int
+	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
+	  +availableTasks: List&lt;Task&gt;;
+	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
 	  |
-	  +bool ==()
+	  +FormTableRow buildFormTableRow();
+	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
 	]
 	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
+	[DataReferenceEditor]o-[FormControl]
+	[DataReferenceEditor]o-[ReactiveDropdownField]
 	
 	[LinearRegressionSectionFormView
 	  |
@@ -348,6 +294,21 @@
 	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
 	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
 	
+	[ReportItemFormView
+	  |
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: dynamic;
+	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
+	  |
+	  +Widget build();
+	  -dynamic _buildSectionText();
+	  -dynamic _buildSectionTypeHeader()
+	]
+	
+	[ReportItemFormView]o-[ReportItemFormViewModel]
+	[ReportItemFormView]o-[Widget Function(BuildContext)]
+	
 	[ReportItemFormViewModel
 	  |
 	  &lt;static&gt;+defaultSectionType: ReportSectionType;
@@ -392,20 +353,18 @@
 	[ReportItemFormViewModel]o-[FormGroup]
 	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
 	
-	[ReportItemFormView
+	[ReportItemFormData
 	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
+	  +isPrimary: bool;
+	  +section: ReportSection;
+	  +id: String
 	  |
-	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
+	  &lt;static&gt;+dynamic fromDomainModel();
+	  +ReportItemFormData copy()
 	]
 	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
+	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
+	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
 	
 	[ReportsFormViewModel
 	  |
@@ -475,6 +434,14 @@
 	[ReportBadge]o-[ReportStatus]
 	[ReportBadge]o-[BadgeType]
 	
+	[StudyDesignReportsFormView
+	  |
+	  +Widget build();
+	  -dynamic _showReportItemSidesheetWithArgs()
+	]
+	
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
+	
 	[ReportsFormData
 	  |
 	  +reportItems: List&lt;ReportItemFormData&gt;;
@@ -497,456 +464,375 @@
 	[ReportStatus]o-[ReportStatus]
 	[Enum]&lt;:--[ReportStatus]
 	
-	[&lt;abstract&gt;IStudyFormData
+	[StudyDesignInterventionsFormView
 	  |
-	  +Study apply()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
 	
-	[StudyInfoFormViewModel
+	[&lt;abstract&gt;StudyScheduleControls
 	  |
-	  +study: Study;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +organizationControl: FormControl&lt;String&gt;;
-	  +reviewBoardControl: FormControl&lt;String&gt;;
-	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
-	  +researchersControl: FormControl&lt;String&gt;;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +websiteControl: FormControl&lt;String&gt;;
-	  +phoneControl: FormControl&lt;String&gt;;
-	  +additionalInfoControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +iconRequired: dynamic;
-	  +organizationRequired: dynamic;
-	  +reviewBoardRequired: dynamic;
-	  +reviewBoardNumberRequired: dynamic;
-	  +researchersRequired: dynamic;
-	  +emailRequired: dynamic;
-	  +phoneRequired: dynamic;
-	  +emailFormat: dynamic;
-	  +websiteFormat: dynamic
+	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
+	  &lt;static&gt;+defaultScheduleTypeSequence: String;
+	  &lt;static&gt;+defaultNumCycles: int;
+	  &lt;static&gt;+defaultPeriodLength: int;
+	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
+	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
+	  +phaseDurationControl: FormControl&lt;int&gt;;
+	  +numCyclesControl: FormControl&lt;int&gt;;
+	  +includeBaselineControl: FormControl&lt;bool&gt;;
+	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
+	  &lt;static&gt;+kNumCyclesMin: int;
+	  &lt;static&gt;+kNumCyclesMax: int;
+	  &lt;static&gt;+kPhaseDurationMin: int;
+	  &lt;static&gt;+kPhaseDurationMax: int;
+	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
+	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +numCyclesRange: dynamic;
+	  +phaseDurationRange: dynamic;
+	  +customSequenceRequired: dynamic
 	  |
-	  +void setControlsFrom();
-	  +StudyInfoFormData buildFormData()
+	  +void setStudyScheduleControlsFrom();
+	  +StudyScheduleFormData buildStudyScheduleFormData();
+	  +bool isSequencingCustom()
 	]
 	
-	[StudyInfoFormViewModel]o-[Study]
-	[StudyInfoFormViewModel]o-[FormControl]
-	[StudyInfoFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
+	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
+	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
 	
-	[StudyDesignInfoFormView
+	[InterventionFormView
+	  |
+	  +formViewModel: InterventionFormViewModel
+	]
+	
+	[InterventionFormView]o-[InterventionFormViewModel]
+	
+	[InterventionPreview
+	  |
+	  +routeArgs: InterventionFormRouteArgs
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
+	[InterventionPreview]o-[InterventionFormRouteArgs]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
 	
-	[StudyInfoFormData
+	[StudyScheduleFormView
 	  |
-	  +title: String;
-	  +description: String?;
-	  +iconName: String;
-	  +contactInfoFormData: StudyContactInfoFormData;
-	  +id: String
+	  +formViewModel: StudyScheduleControls
 	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
+	  -FormTableRow _renderCustomSequence();
+	  +Widget build()
 	]
 	
-	[StudyInfoFormData]o-[StudyContactInfoFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
+	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
 	
-	[StudyContactInfoFormData
+	[InterventionsFormData
 	  |
-	  +organization: String?;
-	  +institutionalReviewBoard: String?;
-	  +institutionalReviewBoardNumber: String?;
-	  +researchers: String?;
-	  +email: String?;
-	  +website: String?;
-	  +phone: String?;
-	  +additionalInfo: String?;
+	  +interventionsData: List&lt;InterventionFormData&gt;;
+	  +studyScheduleData: StudyScheduleFormData;
 	  +id: String
 	  |
 	  +Study apply();
-	  +StudyInfoFormData copy()
+	  +InterventionsFormData copy()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
-	
-	[StudyFormValidationSet
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
-	]
-	
-	[Enum]&lt;:--[StudyFormValidationSet]
+	[InterventionsFormData]o-[StudyScheduleFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
 	
-	[MeasurementsFormData
+	[InterventionTaskFormViewModel
 	  |
-	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
-	  +id: String
+	  +taskIdControl: FormControl&lt;String&gt;;
+	  +instanceIdControl: FormControl&lt;String&gt;;
+	  +taskTitleControl: FormControl&lt;String&gt;;
+	  +taskDescriptionControl: FormControl&lt;String&gt;;
+	  +markAsCompletedControl: FormControl&lt;bool&gt;;
+	  +form: FormGroup;
+	  +taskId: String;
+	  +instanceId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +Study apply();
-	  +MeasurementsFormData copy()
+	  +void setControlsFrom();
+	  +InterventionTaskFormData buildFormData();
+	  +InterventionTaskFormViewModel createDuplicate()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
+	[InterventionTaskFormViewModel]o-[FormControl]
+	[InterventionTaskFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
+	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
 	
-	[MeasurementSurveyFormView
+	[InterventionTaskFormData
 	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
+	  +taskId: String;
+	  +taskTitle: String;
+	  +taskDescription: String?;
+	  &lt;static&gt;+kDefaultTitle: String;
+	  +id: String
+	  |
+	  +CheckmarkTask toTask();
+	  +InterventionTaskFormData copy()
 	]
 	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
 	
-	[SurveyPreview
+	[InterventionFormData
 	  |
-	  +routeArgs: MeasurementFormRouteArgs
+	  +interventionId: String;
+	  +title: String;
+	  +description: String?;
+	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
+	  +iconName: String?;
+	  &lt;static&gt;+kDefaultTitle: String;
+	  +id: String
 	  |
-	  +Widget build()
+	  +Intervention toIntervention();
+	  +InterventionFormData copy()
 	]
 	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
+	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
 	
-	[MeasurementSurveyFormData
+	[StudyScheduleFormData
 	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
+	  +sequenceType: PhaseSequence;
+	  +sequenceTypeCustom: String;
+	  +numCycles: int;
+	  +phaseDuration: int;
+	  +includeBaseline: bool;
 	  +id: String
 	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
+	  +StudySchedule toStudySchedule();
+	  +Study apply();
+	  +StudyScheduleFormData copy()
 	]
 	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
+	[StudyScheduleFormData]o-[PhaseSequence]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
 	
-	[MeasurementSurveyFormViewModel
+	[InterventionsFormViewModel
 	  |
 	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
+	  +router: GoRouter;
+	  +interventionsArray: FormArray&lt;dynamic&gt;;
+	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
 	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
 	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +interventionsRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestStudySchedule: bool
 	  |
 	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
+	  +InterventionsFormData buildFormData();
+	  +void read();
 	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
 	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
 	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
 	  +void onSelectItem();
 	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
+	  +InterventionFormViewModel provide();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +dynamic testStudySchedule()
 	]
 	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
+	[InterventionsFormViewModel]o-[Study]
+	[InterventionsFormViewModel]o-[GoRouter]
+	[InterventionsFormViewModel]o-[FormArray]
+	[InterventionsFormViewModel]o-[FormViewModelCollection]
+	[InterventionsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
+	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
 	
-	[StudyDesignMeasurementsFormView
+	[InterventionTaskFormView
 	  |
-	  +Widget build()
+	  +formViewModel: InterventionTaskFormViewModel
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
+	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
 	
-	[MeasurementsFormViewModel
+	[InterventionFormViewModel
 	  |
 	  +study: Study;
-	  +router: GoRouter;
-	  +measurementsArray: FormArray&lt;dynamic&gt;;
-	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
+	  +interventionIdControl: FormControl&lt;String&gt;;
+	  +interventionTitleControl: FormControl&lt;String&gt;;
+	  +interventionIconControl: FormControl&lt;IconOption&gt;;
+	  +interventionDescriptionControl: FormControl&lt;String&gt;;
+	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
+	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
 	  +form: FormGroup;
-	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
+	  +interventionId: String;
 	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +measurementRequired: dynamic;
+	  +titleRequired: dynamic;
+	  +atLeastOneTask: dynamic;
+	  +breadcrumbsTitle: String;
 	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +void read();
 	  +void setControlsFrom();
-	  +MeasurementsFormData buildFormData();
+	  +InterventionFormData buildFormData();
 	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
 	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
 	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
 	  +void onSelectItem();
 	  +void onNewItem();
-	  +MeasurementSurveyFormViewModel provide();
 	  +void onCancel();
-	  +dynamic onSave()
+	  +dynamic onSave();
+	  +InterventionTaskFormViewModel provide();
+	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
+	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
+	  +InterventionFormViewModel createDuplicate()
 	]
 	
-	[MeasurementsFormViewModel]o-[Study]
-	[MeasurementsFormViewModel]o-[GoRouter]
-	[MeasurementsFormViewModel]o-[FormArray]
-	[MeasurementsFormViewModel]o-[FormViewModelCollection]
-	[MeasurementsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
+	[InterventionFormViewModel]o-[Study]
+	[InterventionFormViewModel]o-[FormControl]
+	[InterventionFormViewModel]o-[FormArray]
+	[InterventionFormViewModel]o-[FormViewModelCollection]
+	[InterventionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
 	
-	[StudyFormScaffold
-	  |
-	  +studyId: String;
-	  +formViewModelBuilder: T Function(WidgetRef);
-	  +formViewBuilder: Widget Function(T)
+	[&lt;abstract&gt;StudyDesignPageWidget
 	  |
-	  +Widget build()
+	  +Widget? banner()
 	]
 	
-	[StudyFormScaffold]o-[T Function(WidgetRef)]
-	[StudyFormScaffold]o-[Widget Function(T)]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
 	
-	[ConsentItemFormViewModel
-	  |
-	  +consentIdControl: FormControl&lt;String&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +form: FormGroup;
-	  +consentId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
+	[StudyDesignInfoFormView
 	  |
-	  +void setControlsFrom();
-	  +ConsentItemFormData buildFormData();
-	  +ConsentItemFormViewModel createDuplicate()
+	  +Widget build()
 	]
 	
-	[ConsentItemFormViewModel]o-[FormControl]
-	[ConsentItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
 	
-	[StudyDesignEnrollmentFormView
+	[StudyInfoFormData
 	  |
-	  +Widget build();
-	  -dynamic _showScreenerQuestionSidesheetWithArgs();
-	  -dynamic _showConsentItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
-	
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
+	  +title: String;
+	  +description: String?;
+	  +iconName: String;
+	  +contactInfoFormData: StudyContactInfoFormData;
+	  +id: String
 	  |
-	  +isDirtyOptionsBannerVisible: bool
+	  +Study apply();
+	  +StudyInfoFormData copy()
 	]
 	
-	[ScreenerQuestionLogicFormView
+	[StudyInfoFormData]o-[StudyContactInfoFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
+	
+	[StudyContactInfoFormData
 	  |
-	  +formViewModel: ScreenerQuestionFormViewModel
+	  +organization: String?;
+	  +institutionalReviewBoard: String?;
+	  +institutionalReviewBoardNumber: String?;
+	  +researchers: String?;
+	  +email: String?;
+	  +website: String?;
+	  +phone: String?;
+	  +additionalInfo: String?;
+	  +id: String
 	  |
-	  +Widget build();
-	  -dynamic _buildInfoBanner();
-	  -dynamic _buildAnswerOptionsLogicControls();
-	  -List&lt;Widget&gt; _buildOptionLogicRow()
+	  +Study apply();
+	  +StudyInfoFormData copy()
 	]
 	
-	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
-	
-	[ConsentItemFormData
-	  |
-	  +consentId: String;
-	  +title: String;
-	  +description: String;
-	  +iconName: String?;
-	  +id: String
-	  |
-	  +ConsentItem toConsentItem();
-	  +ConsentItemFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
-	
-	[ConsentItemFormView
-	  |
-	  +formViewModel: ConsentItemFormViewModel
-	]
-	
-	[ConsentItemFormView]o-[ConsentItemFormViewModel]
-	
-	[EnrollmentFormData
-	  |
-	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
-	  +enrollmentType: Participation;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
-	  +id: String
-	  |
-	  +Study apply();
-	  +EnrollmentFormData copy()
-	]
-	
-	[EnrollmentFormData]o-[Participation]
-	[EnrollmentFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
 	
-	[ScreenerQuestionFormViewModel
+	[StudyInfoFormViewModel
 	  |
-	  &lt;static&gt;+defaultResponseOptionValidity: bool;
-	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
-	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
-	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
-	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionValues: List&lt;dynamic&gt;;
-	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isDirtyOptionsBannerVisible: bool
+	  +study: Study;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +iconControl: FormControl&lt;IconOption&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +organizationControl: FormControl&lt;String&gt;;
+	  +reviewBoardControl: FormControl&lt;String&gt;;
+	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
+	  +researchersControl: FormControl&lt;String&gt;;
+	  +emailControl: FormControl&lt;String&gt;;
+	  +websiteControl: FormControl&lt;String&gt;;
+	  +phoneControl: FormControl&lt;String&gt;;
+	  +additionalInfoControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +iconRequired: dynamic;
+	  +organizationRequired: dynamic;
+	  +reviewBoardRequired: dynamic;
+	  +reviewBoardNumberRequired: dynamic;
+	  +researchersRequired: dynamic;
+	  +emailRequired: dynamic;
+	  +phoneRequired: dynamic;
+	  +emailFormat: dynamic;
+	  +websiteFormat: dynamic
 	  |
-	  +dynamic onResponseOptionsChanged();
 	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
-	  +ScreenerQuestionFormViewModel createDuplicate()
+	  +StudyInfoFormData buildFormData()
 	]
 	
-	[ScreenerQuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
+	[StudyInfoFormViewModel]o-[Study]
+	[StudyInfoFormViewModel]o-[FormControl]
+	[StudyInfoFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
 	
-	[EnrollmentFormViewModel
+	[ScheduleControls
 	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
-	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
-	  +consentItemArray: FormArray&lt;dynamic&gt;;
-	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +form: FormGroup;
-	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
-	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestScreener: bool;
-	  +canTestConsent: bool;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  +formViewModel: WithScheduleControls
 	  |
-	  +void setControlsFrom();
-	  +EnrollmentFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
-	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
-	  +dynamic testScreener();
-	  +dynamic testConsent();
-	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
 	]
 	
-	[EnrollmentFormViewModel]o-[Study]
-	[EnrollmentFormViewModel]o-[GoRouter]
-	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
-	[EnrollmentFormViewModel]o-[FormControl]
-	[EnrollmentFormViewModel]o-[FormArray]
-	[EnrollmentFormViewModel]o-[FormViewModelCollection]
-	[EnrollmentFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
+	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
 	
-	[EnrollmentFormConsentItemDelegate
+	[&lt;abstract&gt;WithScheduleControls
 	  |
-	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +owner: EnrollmentFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
+	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
+	  +instanceID: FormControl&lt;String&gt;;
+	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
+	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
+	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
+	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
+	  +hasReminderControl: FormControl&lt;bool&gt;;
+	  +reminderTimeControl: FormControl&lt;Time&gt;;
+	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
+	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
+	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
+	  +hasReminder: bool;
+	  +isTimeRestricted: bool;
+	  +timeRestriction: List&lt;Time&gt;?
 	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ConsentItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
+	  +void setScheduleControlsFrom();
+	  -dynamic _initReminderControl()
 	]
 	
-	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
-	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
+	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
 	
-	[StudyFormViewModel
+	[&lt;abstract&gt;IFormDataWithSchedule
 	  |
-	  +studyDirtyCopy: Study?;
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +router: GoRouter;
-	  +studyInfoFormViewModel: StudyInfoFormViewModel;
-	  +enrollmentFormViewModel: EnrollmentFormViewModel;
-	  +measurementsFormViewModel: MeasurementsFormViewModel;
-	  +reportsFormViewModel: ReportsFormViewModel;
-	  +interventionsFormViewModel: InterventionsFormViewModel;
-	  +form: FormGroup;
-	  +isStudyReadonly: bool;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +instanceId: String;
+	  +isTimeLocked: bool;
+	  +timeLockStart: StudyUTimeOfDay?;
+	  +timeLockEnd: StudyUTimeOfDay?;
+	  +hasReminder: bool;
+	  +reminderTime: StudyUTimeOfDay?
 	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +void dispose();
-	  +void onCancel();
-	  +dynamic onSave();
-	  -dynamic _applyAndSaveSubform()
+	  +Schedule toSchedule()
 	]
 	
-	[StudyFormViewModel]o-[Study]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyFormViewModel]o-[GoRouter]
-	[StudyFormViewModel]o-[StudyInfoFormViewModel]
-	[StudyFormViewModel]o-[EnrollmentFormViewModel]
-	[StudyFormViewModel]o-[MeasurementsFormViewModel]
-	[StudyFormViewModel]o-[ReportsFormViewModel]
-	[StudyFormViewModel]o-[InterventionsFormViewModel]
-	[StudyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
+	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
 	
 	[&lt;abstract&gt;WithQuestionnaireControls
 	  |
@@ -983,44 +869,132 @@
 	
 	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
 	
-	[&lt;abstract&gt;QuestionFormData
-	  |
-	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
-	  +questionId: String;
-	  +questionText: String;
-	  +questionInfoText: String?;
-	  +questionType: SurveyQuestionType;
-	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
-	  +responseOptions: List&lt;dynamic&gt;;
-	  +id: String
+	[SurveyQuestionFormView
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +EligibilityCriterion toEligibilityCriterion();
-	  +Answer&lt;dynamic&gt; constructAnswerFor();
-	  +dynamic setResponseOptionsValidityFrom();
-	  +QuestionFormData copy()
+	  +formViewModel: QuestionFormViewModel;
+	  +isHtmlStyleable: bool
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
+	[SurveyQuestionFormView]o-[QuestionFormViewModel]
 	
-	[ChoiceQuestionFormData
+	[AudioRecordingQuestionFormView
 	  |
-	  +isMultipleChoice: bool;
-	  +answerOptions: List&lt;String&gt;;
-	  +responseOptions: List&lt;String&gt;
+	  +formViewModel: QuestionFormViewModel
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +QuestionFormData copy();
-	  -Choice _buildChoiceForValue();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
+	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
 	
-	[BoolQuestionFormData
+	[FreeTextQuestionFormView
 	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
+	  +formViewModel: QuestionFormViewModel;
+	  +generateLabelHelpTextMap: dynamic
+	  |
+	  +Widget build();
+	  +Widget disableOnReadonly();
+	  +Widget generateRow()
+	]
+	
+	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
+	
+	[ChoiceQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
+	
+	[ImageCapturingQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
+	
+	[BoolQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
+	]
+	
+	[BoolQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
+	
+	[SurveyQuestionType
+	  |
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
+	  &lt;static&gt;+choice: SurveyQuestionType;
+	  &lt;static&gt;+bool: SurveyQuestionType;
+	  &lt;static&gt;+scale: SurveyQuestionType;
+	  &lt;static&gt;+image: SurveyQuestionType;
+	  &lt;static&gt;+audio: SurveyQuestionType;
+	  &lt;static&gt;+freeText: SurveyQuestionType
+	]
+	
+	[SurveyQuestionType]o-[SurveyQuestionType]
+	[Enum]&lt;:--[SurveyQuestionType]
+	
+	[&lt;abstract&gt;IScaleQuestionFormViewModel
+	  |
+	  +isMidValuesClearedInfoVisible: bool
+	]
+	
+	[ScaleQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
+	]
+	
+	[ScaleQuestionFormView]o-[QuestionFormViewModel]
+	
+	[&lt;abstract&gt;QuestionFormData
+	  |
+	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
+	  +questionId: String;
+	  +questionText: String;
+	  +questionInfoText: String?;
+	  +questionType: SurveyQuestionType;
+	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
+	  +responseOptions: List&lt;dynamic&gt;;
+	  +id: String
+	  |
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +EligibilityCriterion toEligibilityCriterion();
+	  +Answer&lt;dynamic&gt; constructAnswerFor();
+	  +dynamic setResponseOptionsValidityFrom();
+	  +QuestionFormData copy()
+	]
+	
+	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
+	
+	[ChoiceQuestionFormData
+	  |
+	  +isMultipleChoice: bool;
+	  +answerOptions: List&lt;String&gt;;
+	  +responseOptions: List&lt;String&gt;
+	  |
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +QuestionFormData copy();
+	  -Choice _buildChoiceForValue();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	]
+	
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
+	
+	[BoolQuestionFormData
+	  |
+	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
 	  +responseOptions: List&lt;String&gt;
 	  |
 	  +Question&lt;dynamic&gt; toQuestion();
@@ -1093,86 +1067,6 @@
 	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
 	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
 	
-	[AudioRecordingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
-	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
-	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
-	]
-	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
-	
-	[SurveyQuestionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
-	]
-	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[ImageCapturingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	]
-	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
-	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
-	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
 	[QuestionFormViewModel
 	  |
 	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
@@ -1271,1135 +1165,1171 @@
 	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
 	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
 	
-	[SurveyQuestionFormView
+	[StudyFormViewModel
 	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
+	  +studyDirtyCopy: Study?;
+	  +studyRepository: IStudyRepository;
+	  +authRepository: IAuthRepository;
+	  +router: GoRouter;
+	  +studyInfoFormViewModel: StudyInfoFormViewModel;
+	  +enrollmentFormViewModel: EnrollmentFormViewModel;
+	  +measurementsFormViewModel: MeasurementsFormViewModel;
+	  +reportsFormViewModel: ReportsFormViewModel;
+	  +interventionsFormViewModel: InterventionsFormViewModel;
+	  +form: FormGroup;
+	  +isStudyReadonly: bool;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void read();
+	  +void setControlsFrom();
+	  +Study buildFormData();
+	  +void dispose();
+	  +void onCancel();
+	  +dynamic onSave();
+	  -dynamic _applyAndSaveSubform()
 	]
 	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
+	[StudyFormViewModel]o-[Study]
+	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
+	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyFormViewModel]o-[GoRouter]
+	[StudyFormViewModel]o-[StudyInfoFormViewModel]
+	[StudyFormViewModel]o-[EnrollmentFormViewModel]
+	[StudyFormViewModel]o-[MeasurementsFormViewModel]
+	[StudyFormViewModel]o-[ReportsFormViewModel]
+	[StudyFormViewModel]o-[InterventionsFormViewModel]
+	[StudyFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
 	
-	[&lt;abstract&gt;IFormDataWithSchedule
-	  |
-	  +instanceId: String;
-	  +isTimeLocked: bool;
-	  +timeLockStart: StudyUTimeOfDay?;
-	  +timeLockEnd: StudyUTimeOfDay?;
-	  +hasReminder: bool;
-	  +reminderTime: StudyUTimeOfDay?
+	[StudyDesignMeasurementsFormView
 	  |
-	  +Schedule toSchedule()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
 	
-	[ScheduleControls
+	[MeasurementsFormData
 	  |
-	  +formViewModel: WithScheduleControls
+	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
+	  +id: String
 	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
+	  +Study apply();
+	  +MeasurementsFormData copy()
 	]
 	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
 	
-	[&lt;abstract&gt;WithScheduleControls
+	[MeasurementsFormViewModel
 	  |
-	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
-	  +instanceID: FormControl&lt;String&gt;;
-	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +hasReminderControl: FormControl&lt;bool&gt;;
-	  +reminderTimeControl: FormControl&lt;Time&gt;;
-	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
-	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
-	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  +hasReminder: bool;
-	  +isTimeRestricted: bool;
-	  +timeRestriction: List&lt;Time&gt;?
+	  +study: Study;
+	  +router: GoRouter;
+	  +measurementsArray: FormArray&lt;dynamic&gt;;
+	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
+	  +form: FormGroup;
+	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +measurementRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
+	  +void read();
+	  +void setControlsFrom();
+	  +MeasurementsFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +MeasurementSurveyFormViewModel provide();
+	  +void onCancel();
+	  +dynamic onSave()
 	]
 	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
+	[MeasurementsFormViewModel]o-[Study]
+	[MeasurementsFormViewModel]o-[GoRouter]
+	[MeasurementsFormViewModel]o-[FormArray]
+	[MeasurementsFormViewModel]o-[FormViewModelCollection]
+	[MeasurementsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget
+	[SurveyPreview
 	  |
-	  +Widget? banner()
+	  +routeArgs: MeasurementFormRouteArgs
+	  |
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
+	[SurveyPreview]o-[MeasurementFormRouteArgs]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
+	
+	[MeasurementSurveyFormViewModel
+	  |
+	  +study: Study;
+	  +measurementIdControl: FormControl&lt;String&gt;;
+	  +instanceIdControl: FormControl&lt;String&gt;;
+	  +surveyTitleControl: FormControl&lt;String&gt;;
+	  +surveyIntroTextControl: FormControl&lt;String&gt;;
+	  +surveyOutroTextControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +measurementId: String;
+	  +instanceId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +atLeastOneQuestion: dynamic;
+	  +breadcrumbsTitle: String;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void setControlsFrom();
+	  +MeasurementSurveyFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
+	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
+	  +MeasurementSurveyFormViewModel createDuplicate()
+	]
+	
+	[MeasurementSurveyFormViewModel]o-[Study]
+	[MeasurementSurveyFormViewModel]o-[FormControl]
+	[MeasurementSurveyFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
+	
+	[MeasurementSurveyFormData
+	  |
+	  +measurementId: String;
+	  +title: String;
+	  +introText: String?;
+	  +outroText: String?;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  &lt;static&gt;+kDefaultTitle: String;
+	  +id: String
+	  |
+	  +QuestionnaireTask toQuestionnaireTask();
+	  +MeasurementSurveyFormData copy()
+	]
+	
+	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
+	
+	[MeasurementSurveyFormView
+	  |
+	  +formViewModel: MeasurementSurveyFormViewModel
+	]
+	
+	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
+	
+	[&lt;abstract&gt;IStudyFormData
+	  |
+	  +Study apply()
+	]
+	
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
 	
 	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
+	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="2822.0" width="30192.8" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="2822.0" width="30129.5" stroke="none"></rect>
 			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
+			<g transform="translate(37.5, 8)" fill="#33322E">
 				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M1481.7 394.2 L148 531 L148 716.5 L148.0 716.5 " fill="none"></path>
-					<path d="M1482.3 399.5 L1481.7 394.2 L1481.2 388.9 L1495.0 392.9 Z"></path>
-					<path d="M523.5 797.2 L523.5 964 L6483 1606.8832785345232 L6483.0 1606.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M528.8 787.8 L523.5 797.2 L518.2 787.8 L523.5 778.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M60.6 1676.8 L902.5 2342 L902.5 2490 L902.5 2490.0 " fill="none"></path>
 					</g>
-					<path d="M4733.0 812.7 L4733 964 L2828.3341799709724 1637.5 L2828.3 1637.5 " fill="none"></path>
+					<path d="M63.9 1672.6 L60.6 1676.8 L57.3 1681.0 L50.1 1668.5 Z"></path>
+					<path d="M7852.3 816.6 L8182 964 L8182 1637.5 L8182.0 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4738.3 803.3 L4733.0 812.7 L4727.7 803.3 L4733.0 794.0 Z"></path>
+						<path d="M7846.0 807.9 L7852.3 816.6 L7841.7 817.7 L7835.3 809.0 Z"></path>
 					</g>
-					<path d="M9145.9 385.0 L4733 531 L4733 701 L4733.0 701.0 " fill="none"></path>
-					<path d="M9146.1 390.3 L9145.9 385.0 L9145.7 379.6 L9159.3 384.5 Z"></path>
-					<path d="M11566.8 454.7 L11566.75 531 L11566.75 551 L11566.8 551.0 " fill="none"></path>
+					<path d="M7543.2 816.6 L7213.5 964 L7213.5 1637.5 L7213.5 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11572.1 445.3 L11566.8 454.7 L11561.4 445.3 L11566.8 436.0 Z"></path>
+						<path d="M7553.8 817.7 L7543.2 816.6 L7549.5 807.9 L7560.2 809.0 Z"></path>
 					</g>
-					<path d="M14294.9 111.4 L11566.75 233 L11566.75 328 L11566.8 328.0 " fill="none"></path>
-					<path d="M14295.2 116.7 L14294.9 111.4 L14294.7 106.0 L14308.3 110.8 Z"></path>
-					<path d="M28440.9 474.1 L28366.5 531 L28366.5 663.5 L28366.5 663.5 " fill="none"></path>
-					<path d="M28444.1 478.3 L28440.9 474.1 L28437.6 469.9 L28451.5 466.0 Z"></path>
-					<path d="M13202.3 1858.8 L12970.5 2342 L15307.5 2526.0973600844773 L15307.5 2526.1 " fill="none"></path>
+					<path d="M4117.1 385.6 L7697.75 531 L7697.75 686 L7697.8 686.0 " fill="none"></path>
+					<path d="M4117.3 380.3 L4117.1 385.6 L4116.9 391.0 L4103.8 385.1 Z"></path>
+					<path d="M9519.7 401.0 L10333.75 531 L10333.75 701.5 L10333.8 701.5 " fill="none"></path>
+					<path d="M9520.5 395.8 L9519.7 401.0 L9518.8 406.3 L9506.5 398.9 Z"></path>
+					<path d="M23351.7 847.8 L23417.25 964 L23417.25 1637.5 L23417.3 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13211.1 1852.7 L13202.3 1858.8 L13201.5 1848.1 L13210.3 1842.0 Z"></path>
+						<path d="M23351.8 837.0 L23351.7 847.8 L23342.5 842.2 L23342.6 831.5 Z"></path>
 					</g>
-					<path d="M13229.2 1859.6 L13061.5 2342 L17274.75 2526.485795621295 L17274.8 2526.5 " fill="none"></path>
+					<path d="M23123.2 840.4 L22894.25 964 L24974.75 1597.0158975491279 L24974.8 1597.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13237.3 1852.6 L13229.2 1859.6 L13227.2 1849.1 L13235.3 1842.0 Z"></path>
+						<path d="M23134.0 840.6 L23123.2 840.4 L23128.9 831.2 L23139.7 831.5 Z"></path>
 					</g>
-					<path d="M13328.4 1860.5 L13392 2342 L13392 2528.5 L13392 2528.5 L13392 2715 L13392 2715 L14290.75 2748.664600369296 L14290.8 2748.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13332.5 1850.6 L13328.4 1860.5 L13321.9 1852.0 L13326.0 1842.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M22075.5 391.7 L23295.25 531 L23295.25 663.5 L23295.3 663.5 " fill="none"></path>
 					</g>
-					<path d="M13340.4 1860.3 L13432 2342 L13432 2528.5 L13432 2528.5 L13432 2715 L13432 2715 L16712.5 2749.3533185840706 L16712.5 2749.4 " fill="none"></path>
+					<path d="M22076.1 386.4 L22075.5 391.7 L22074.9 397.0 L22062.3 390.2 Z"></path>
+					<path d="M18224.8 1915.7 L18621.75 2342 L15579.25 2526.6489586723073 L15579.3 2526.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13343.9 1850.2 L13340.4 1860.3 L13333.4 1852.2 L13336.9 1842.0 Z"></path>
+						<path d="M18222.3 1905.2 L18224.8 1915.7 L18214.5 1912.5 L18212.1 1902.0 Z"></path>
 					</g>
-					<path d="M13427.0 1857.9 L13724.75 2342 L14630 2518.2768206734536 L14630.0 2518.3 " fill="none"></path>
+					<path d="M18209.9 1916.1 L18581.75 2342 L16658.75 2524.142965972575 L16658.8 2524.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13426.7 1847.2 L13427.0 1857.9 L13417.6 1852.7 L13417.2 1842.0 Z"></path>
-					</g>
-					<path d="M13386.0 401.5 L12970.5 531 L12970.5 747.5 L12970.5 747.5 L12970.5 964 L12970.5 964 L13210.340348330914 1464 L13210.3 1464.0 " fill="none"></path>
-					<path d="M13387.6 406.6 L13386.0 401.5 L13384.5 396.4 L13398.8 397.5 Z"></path>
-					<path d="M11304.4 952.2 L11289.25 964 L12881.5 1509.3263327948303 L12881.5 1509.3 " fill="none"></path>
-					<path d="M11307.7 956.4 L11304.4 952.2 L11301.1 948.0 L11314.9 944.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M19282.2 385.5 L14192.25 531 L14192.25 747.5 L14192.25 747.5 L14192.25 964 L14192.25 964 L13545.47931785196 1464 L13545.5 1464.0 " fill="none"></path>
+						<path d="M18207.8 1905.5 L18209.9 1916.1 L18199.7 1912.5 L18197.6 1902.0 Z"></path>
 					</g>
-					<path d="M19282.3 390.8 L19282.2 385.5 L19282.0 380.2 L19295.5 385.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1814.8 766.9 L1161.25 964 L12881.5 1629.1909841635947 L12881.5 1629.2 " fill="none"></path>
-					</g>
-					<path d="M1816.4 772.0 L1814.8 766.9 L1813.3 761.7 L1827.6 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M21030.3 398.0 L20115.75 531 L20115.75 747.5 L20115.75 747.5 L20115.75 964 L20115.75 964 L13720.5 1610.5867786786016 L13720.5 1610.6 " fill="none"></path>
-					</g>
-					<path d="M21031.1 403.2 L21030.3 398.0 L21029.5 392.7 L21043.5 396.0 Z"></path>
-					<path d="M11935.7 1807.6 L11800.75 2342 L13125.5 2520.871221719457 L13125.5 2520.9 " fill="none"></path>
+					<path d="M18195.0 1916.5 L18541.75 2342 L17498.75 2476.8021483021485 L17498.8 2476.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11943.2 1799.9 L11935.7 1807.6 L11932.8 1797.2 L11940.3 1789.5 Z"></path>
+						<path d="M18193.2 1905.9 L18195.0 1916.5 L18184.9 1912.6 L18183.2 1902.0 Z"></path>
 					</g>
-					<path d="M12013.8 1807.6 L12148.75 2342 L14630 2524.6356684755797 L14630.0 2524.6 " fill="none"></path>
+					<path d="M18180.0 1916.9 L18501.75 2342 L15478.25 2525.078814935065 L15478.3 2525.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12016.7 1797.2 L12013.8 1807.6 L12006.3 1799.9 L12009.2 1789.5 Z"></path>
+						<path d="M18178.6 1906.2 L18180.0 1916.9 L18170.1 1912.7 L18168.7 1902.0 Z"></path>
 					</g>
-					<path d="M3368.0 765.1 L2119 964 L11626.75 1628.6718666768131 L11626.8 1628.7 " fill="none"></path>
-					<path d="M3368.8 770.4 L3368.0 765.1 L3367.2 759.8 L3381.2 763.0 Z"></path>
-					<path d="M21654.0 910.6 L21623.5 964 L12322.75 1628.149941702293 L12322.8 1628.1 " fill="none"></path>
-					<path d="M21658.7 913.2 L21654.0 910.6 L21649.4 907.9 L21660.7 899.0 Z"></path>
-					<path d="M11586.6 962.6 L11586.75 964 L11586.75 1653 L11586.75 1653 L11586.75 2342 L11586.75 2342 L17466.25 2526.2128097438053 L17466.3 2526.2 " fill="none"></path>
+					<path d="M18165.0 1917.3 L18461.75 2342 L18461.75 2528.5 L18461.75 2528.5 L18461.75 2715 L18461.75 2715 L14925 2750.014885309907 L14925.0 2750.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11591.1 952.8 L11586.6 962.6 L11580.5 953.8 L11584.9 944.0 Z"></path>
+						<path d="M18164.0 1906.6 L18165.0 1917.3 L18155.2 1912.7 L18154.3 1902.0 Z"></path>
 					</g>
-					<path d="M11963.8 855.5 L12362.75 964 L12362.75 1653 L12362.75 1653 L12362.75 2342 L12362.75 2342 L13125.5 2515.637931034483 L13125.5 2515.6 " fill="none"></path>
+					<path d="M17810.6 1917.7 L17538.75 2342 L17538.75 2528.5 L17538.75 2528.5 L17538.75 2715 L17538.75 2715 L16667.5 2746.5364516951313 L16667.5 2746.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11956.2 847.9 L11963.8 855.5 L11953.4 858.2 L11945.8 850.6 Z"></path>
+						<path d="M17820.1 1912.7 L17810.6 1917.7 L17811.2 1907.0 L17820.7 1902.0 Z"></path>
 					</g>
-					<path d="M26170.2 108.5 L22194.25 233 L22194.25 283 L22194.3 283.0 " fill="none"></path>
-					<path d="M26170.3 113.8 L26170.2 108.5 L26170.0 103.1 L26183.5 108.0 Z"></path>
-					<path d="M22887.0 1770.7 L22887 2342 L17612.25 2525.9541629657333 L17612.3 2526.0 " fill="none"></path>
+					<path d="M17728.3 1915.5 L17318.75 2342 L12714.75 2526.3972941050147 L12714.8 2526.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22892.3 1761.3 L22887.0 1770.7 L22881.7 1761.3 L22887.0 1752.0 Z"></path>
+						<path d="M17738.6 1912.4 L17728.3 1915.5 L17730.9 1905.0 L17741.2 1902.0 Z"></path>
+					</g>
+					<path d="M12914.6 385.4 L16497.5 531 L16497.5 747.5 L16497.5 747.5 L16497.5 964 L16497.5 964 L17529.25 1443.4306187826674 L17529.3 1443.4 " fill="none"></path>
+					<path d="M12914.8 380.1 L12914.6 385.4 L12914.4 390.7 L12901.3 384.9 Z"></path>
+					<path d="M20022.8 886.8 L20086.25 964 L18431.25 1505.4506172839506 L18431.3 1505.5 " fill="none"></path>
+					<path d="M20026.9 883.4 L20022.8 886.8 L20018.7 890.2 L20014.3 876.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M17730.8 388.7 L20304.25 531 L20304.25 747.5 L20304.25 747.5 L20304.25 964 L20304.25 964 L18431.25 1519.291308089501 L18431.3 1519.3 " fill="none"></path>
+					</g>
+					<path d="M17731.1 383.4 L17730.8 388.7 L17730.5 394.1 L17717.5 388.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M1738.9 770.6 L2018.75 964 L17529.25 1633.5319675469098 L17529.3 1633.5 " fill="none"></path>
 					</g>
+					<path d="M1741.9 766.2 L1738.9 770.6 L1735.9 775.0 L1727.9 763.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M23957.3 391.9 L22768.5 531 L22768.5 747.5 L22768.5 747.5 L22768.5 964 L22768.5 964 L22869.973149492016 1554 L22870.0 1554.0 " fill="none"></path>
+						<path d="M20512.6 400.2 L21148.25 531 L21148.25 747.5 L21148.25 747.5 L21148.25 964 L21148.25 964 L18431.25 1554.9131944444443 L18431.3 1554.9 " fill="none"></path>
 					</g>
-					<path d="M23957.9 397.2 L23957.3 391.9 L23956.6 386.6 L23970.5 390.4 Z"></path>
-					<path d="M4321.5 797.2 L4321.5 964 L11626.75 1621.6705647927351 L11626.8 1621.7 " fill="none"></path>
+					<path d="M20513.7 395.0 L20512.6 400.2 L20511.5 405.4 L20499.6 397.5 Z"></path>
+					<path d="M17098.8 2653.7 L17098.75 2715 L16667.5 2743.3113730929267 L16667.5 2743.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4326.8 787.8 L4321.5 797.2 L4316.2 787.8 L4321.5 778.5 Z"></path>
+						<path d="M17104.1 2644.3 L17098.8 2653.7 L17093.4 2644.3 L17098.8 2635.0 Z"></path>
 					</g>
-					<path d="M23005.5 835.2 L23005.5 964 L22904.026850507984 1554 L22904.0 1554.0 " fill="none"></path>
+					<path d="M17214.5 2408.6 L17278.75 2342 L17726.732583454283 1902 L17726.7 1902.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23010.8 825.8 L23005.5 835.2 L23000.2 825.8 L23005.5 816.5 Z"></path>
+						<path d="M17204.2 2411.6 L17214.5 2408.6 L17211.9 2419.0 L17201.5 2422.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M23957.3 394.2 L23005.5 531 L23005.5 678.5 L23005.5 678.5 " fill="none"></path>
+						<path d="M17730.8 388.8 L20264.25 531 L20264.25 747.5 L20264.25 747.5 L20264.25 964 L20264.25 964 L20264.25 1653 L20264.25 1653 L20264.25 2342 L20264.25 2342 L17498.75 2504.933422839994 L17498.8 2504.9 " fill="none"></path>
 					</g>
-					<path d="M23958.1 399.5 L23957.3 394.2 L23956.5 388.9 L23970.5 392.3 Z"></path>
-					<path d="M6740.9 1902.4 L6442 2342 L15307.5 2527.860583408273 L15307.5 2527.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6750.5 1897.7 L6740.9 1902.4 L6741.7 1891.7 L6751.4 1887.0 Z"></path>
+					<path d="M17731.1 383.5 L17730.8 388.8 L17730.5 394.2 L17717.5 388.1 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M1713.4 775.8 L1765.5 964 L1765.5 1653 L1765.5 1653 L1765.5 2342 L1765.5 2342 L16698.75 2523.6347561671532 L16698.8 2523.6 " fill="none"></path>
 					</g>
-					<path d="M6755.1 1902.9 L6482 2342 L13125.5 2526.927276119403 L13125.5 2526.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6764.6 1897.7 L6755.1 1902.9 L6755.5 1892.1 L6765.0 1887.0 Z"></path>
+					<path d="M1718.5 774.4 L1713.4 775.8 L1708.2 777.3 L1709.8 763.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M20508.4 400.3 L21108.25 531 L21108.25 747.5 L21108.25 747.5 L21108.25 964 L21108.25 964 L21108.25 1653 L21108.25 1653 L21108.25 2342 L21108.25 2342 L17498.75 2509.894188801596 L17498.8 2509.9 " fill="none"></path>
 					</g>
-					<path d="M6910.5 1905.7 L6910.5 2342 L6910.5 2528.5 L6910.5 2528.5 L6910.5 2715 L6910.5 2715 L14290.75 2750.2658579264394 L14290.8 2750.3 " fill="none"></path>
+					<path d="M20509.6 395.1 L20508.4 400.3 L20507.3 405.5 L20495.4 397.5 Z"></path>
+					<path d="M27047.9 116.8 L27746.25 233 L27746.25 298 L27746.3 298.0 " fill="none"></path>
+					<path d="M27048.8 111.6 L27047.9 116.8 L27047.0 122.1 L27034.8 114.7 Z"></path>
+					<path d="M3756.6 1791.3 L4712.5 2342 L15365.25 2527.516060881948 L15365.3 2527.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6915.8 1896.3 L6910.5 1905.7 L6905.2 1896.3 L6910.5 1887.0 Z"></path>
+						<path d="M3751.2 1782.0 L3756.6 1791.3 L3745.8 1791.3 L3740.4 1782.0 Z"></path>
 					</g>
-					<path d="M7006.5 1904.4 L7173.5 2342 L7173.5 2528.5 L7173.5 2528.5 L7173.5 2715 L7173.5 2715 L16712.5 2750.097113540965 L16712.5 2750.1 " fill="none"></path>
+					<path d="M3516.5 1800.7 L3516.5 2342 L12609.75 2527.4294207692096 L12609.8 2527.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7008.1 1893.8 L7006.5 1904.4 L6998.2 1897.6 L6999.8 1887.0 Z"></path>
+						<path d="M3521.8 1791.3 L3516.5 1800.7 L3511.2 1791.3 L3516.5 1782.0 Z"></path>
 					</g>
-					<path d="M7020.9 1904.1 L7213.5 2342 L14630 2527.18908153702 L14630.0 2527.2 " fill="none"></path>
+					<path d="M2457.5 768.6 L2879.25 964 L3397.1890420899854 1524 L3397.2 1524.0 " fill="none"></path>
+					<path d="M2459.8 763.8 L2457.5 768.6 L2455.3 773.4 L2445.5 763.0 Z"></path>
+					<path d="M29861.5 1740.7 L29861.5 2342 L14613 2525.125358189253 L14613.0 2525.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7022.0 1893.4 L7020.9 1904.1 L7012.3 1897.7 L7013.4 1887.0 Z"></path>
+						<path d="M29866.8 1731.3 L29861.5 1740.7 L29856.2 1731.3 L29861.5 1722.0 Z"></path>
 					</g>
-					<path d="M3440.3 769.7 L3105.75 964 L6483 1575.5842696629213 L6483.0 1575.6 " fill="none"></path>
-					<path d="M3443.0 774.3 L3440.3 769.7 L3437.6 765.1 L3451.8 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M19282.2 385.5 L14232.25 531 L14232.25 747.5 L14232.25 747.5 L14232.25 964 L14232.25 964 L7338 1612.7708881073513 L7338.0 1612.8 " fill="none"></path>
-					</g>
-					<path d="M19282.3 390.8 L19282.2 385.5 L19282.0 380.2 L19295.5 385.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1817.8 767.1 L1201.25 964 L6483 1601.4087226868678 L6483.0 1601.4 " fill="none"></path>
+					<path d="M29562.8 126.5 L29861.5 233 L29861.5 382 L29861.5 382 L29861.5 531 L29861.5 531 L29861.5 747.5 L29861.5 747.5 L29861.5 964 L29861.5 964 L29861.5 1584 L29861.5 1584.0 " fill="none"></path>
+					<path d="M29564.6 121.5 L29562.8 126.5 L29561.0 131.5 L29550.2 122.0 Z"></path>
+					<path d="M14332.0 2713.7 L14332 2715 L14827 2747.3023897058824 L14827.0 2747.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M14337.3 2704.3 L14332.0 2713.7 L14326.7 2704.3 L14332.0 2695.0 Z"></path>
 					</g>
-					<path d="M1819.4 772.1 L1817.8 767.1 L1816.2 762.0 L1830.5 763.0 Z"></path>
+					<path d="M3138.9 2069.8 L3476.5 2342 L14051 2523.6723550274055 L14051.0 2523.7 " fill="none"></path>
+					<path d="M3142.2 2065.6 L3138.9 2069.8 L3135.5 2073.9 L3128.5 2061.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M21030.3 398.6 L20155.75 531 L20155.75 747.5 L20155.75 747.5 L20155.75 964 L20155.75 964 L7338 1630.7620278967931 L7338.0 1630.8 " fill="none"></path>
+						<path d="M4752.5 1697.3 L4752.5 2342 L14051 2523.029307375124 L14051.0 2523.0 " fill="none"></path>
 					</g>
-					<path d="M21031.1 403.9 L21030.3 398.6 L21029.5 393.3 L21043.5 396.6 Z"></path>
-					<path d="M1482.0 409.1 L947.5 531 L947.5 709 L947.5 709.0 " fill="none"></path>
-					<path d="M1483.2 414.3 L1482.0 409.1 L1480.8 403.9 L1495.0 406.2 Z"></path>
-					<path d="M22582.3 469.7 L22582.25 531 L22582.25 732 L22582.3 732.0 " fill="none"></path>
+					<path d="M4757.8 1697.3 L4752.5 1697.3 L4747.2 1697.3 L4752.5 1684.0 Z"></path>
+					<path d="M3266.5 797.2 L3266.5 964 L3469.6930333817127 1524 L3469.7 1524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22587.6 460.3 L22582.3 469.7 L22576.9 460.3 L22582.3 451.0 Z"></path>
+						<path d="M3271.8 787.8 L3266.5 797.2 L3261.2 787.8 L3266.5 778.5 Z"></path>
 					</g>
-					<path d="M26170.2 108.7 L22582.25 233 L22582.25 313 L22582.3 313.0 " fill="none"></path>
-					<path d="M26170.4 114.0 L26170.2 108.7 L26170.0 103.3 L26183.5 108.2 Z"></path>
-					<path d="M5148.6 1736.6 L4667.5 2342 L13125.5 2527.2624346702682 L13125.5 2527.3 " fill="none"></path>
+					<path d="M10710.3 135.3 L10710.25 233 L10710.25 335.5 L10710.3 335.5 " fill="none"></path>
+					<path d="M10715.6 135.3 L10710.3 135.3 L10704.9 135.3 L10710.3 122.0 Z"></path>
+					<path d="M6956.8 827.7 L6956.75 964 L5945.5 1427.0345572354213 L5945.5 1427.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5158.5 1732.6 L5148.6 1736.6 L5150.2 1726.0 L5160.2 1722.0 Z"></path>
+						<path d="M6962.1 818.3 L6956.8 827.7 L6951.4 818.3 L6956.8 809.0 Z"></path>
 					</g>
-					<path d="M5217.5 1740.7 L5235 2342 L5428.922252010724 2513 L5428.9 2513.0 " fill="none"></path>
+					<path d="M4117.1 386.5 L6956.75 531 L6956.75 686 L6956.8 686.0 " fill="none"></path>
+					<path d="M4117.3 381.2 L4117.1 386.5 L4116.8 391.9 L4103.8 385.9 Z"></path>
+					<path d="M28033.9 225.0 L28043.5 233 L28181.927852348992 366.5 L28181.9 366.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5222.6 1731.2 L5217.5 1740.7 L5211.9 1731.5 L5217.0 1722.0 Z"></path>
+						<path d="M28030.2 214.9 L28033.9 225.0 L28023.4 223.1 L28019.6 213.0 Z"></path>
 					</g>
-					<path d="M28843.5 231.4 L28843.25 233 L28843.25 366.5 L28843.3 366.5 " fill="none"></path>
+					<path d="M27872.7 231.4 L27872.5 233 L27949.77768456376 366.5 L27949.8 366.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28850.2 223.1 L28843.5 231.4 L28839.7 221.4 L28846.4 213.0 Z"></path>
+						<path d="M27879.5 223.1 L27872.7 231.4 L27868.9 221.4 L27875.7 213.0 Z"></path>
 					</g>
-					<path d="M29008.9 224.8 L29019 233 L29238.289429530203 366.5 L29238.3 366.5 " fill="none"></path>
+					<path d="M28425.3 231.4 L28425.5 233 L28425.5 366.5 L28425.5 366.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29005.0 214.7 L29008.9 224.8 L28998.3 223.0 L28994.4 213.0 Z"></path>
+						<path d="M28429.1 221.4 L28425.3 231.4 L28418.5 223.1 L28422.3 213.0 Z"></path>
 					</g>
-					<path d="M29207.1 224.8 L29197 233 L29416.289429530203 366.5 L29416.3 366.5 " fill="none"></path>
+					<path d="M28219.6 222.9 L28203.5 233 L27984.210570469797 366.5 L27984.2 366.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29217.7 223.0 L29207.1 224.8 L29211.0 214.7 L29221.6 213.0 Z"></path>
+						<path d="M28230.4 222.5 L28219.6 222.9 L28224.7 213.4 L28235.4 213.0 Z"></path>
 					</g>
-					<path d="M29595.6 202.2 L29673.75 233 L29306.40100671141 366.5 L29306.4 366.5 " fill="none"></path>
+					<path d="M6853.4 2477.9 L6865.25 2475 L6872.75 2475 L6872.75 2475 L6880.25 2528.5 L6880.25 2528.5 L6872.75 2582 L6872.75 2582 L6865.25 2582 L6865.25 2582 L6835.25 2574.7539503386006 L6835.3 2574.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29588.9 193.8 L29595.6 202.2 L29585.0 203.7 L29578.3 195.4 Z"></path>
+						<path d="M6843.1 2474.9 L6853.4 2477.9 L6845.6 2485.2 L6835.3 2482.2 Z"></path>
 					</g>
-					<path d="M4523.9 2512.9 L5035.083333333334 2475 L5167.541666666667 2475 L5167.541666666667 2475 L5300 2528.5 L5300 2528.5 L5167.541666666667 2582 L5167.541666666667 2582 L5035.083333333334 2582 L5035.083333333334 2582 L4505.25 2542.703211645102 L4505.3 2542.7 " fill="none"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M59.5 1677.0 L862.5 2342 L6452.25 2522.3223135135136 L6452.3 2522.3 " fill="none"></path>
+					</g>
+					<path d="M62.9 1672.9 L59.5 1677.0 L56.1 1681.1 L49.2 1668.5 Z"></path>
+					<path d="M7774.6 1735.1 L8392.75 2342 L15365.25 2527.000889173424 L15365.3 2527.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4514.2 2508.3 L4523.9 2512.9 L4515.0 2518.9 L4505.3 2514.3 Z"></path>
+						<path d="M7771.7 1724.7 L7774.6 1735.1 L7764.2 1732.3 L7761.3 1722.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M5958.5 1680.2 L5594.5 2342 L4505.25 2500.6141909037674 L4505.3 2500.6 " fill="none"></path>
+					<path d="M7656.8 1739.4 L7417.75 2342 L7417.75 2513 L7417.8 2513.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M7665.2 1732.6 L7656.8 1739.4 L7655.2 1728.7 L7663.6 1722.0 Z"></path>
 					</g>
-					<path d="M5963.2 1682.8 L5958.5 1680.2 L5953.9 1677.6 L5965.0 1668.5 Z"></path>
-					<path d="M5280.3 827.7 L5280.25 964 L4533.5 1378.8443862124573 L4533.5 1378.8 " fill="none"></path>
+					<path d="M6437.8 827.7 L6437.75 964 L5861.8945936139335 1366.5 L5861.9 1366.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5285.6 818.3 L5280.3 827.7 L5274.9 818.3 L5280.3 809.0 Z"></path>
+						<path d="M6443.1 818.3 L6437.8 827.7 L6432.4 818.3 L6437.8 809.0 Z"></path>
 					</g>
-					<path d="M9145.9 385.4 L5280.25 531 L5280.25 686 L5280.3 686.0 " fill="none"></path>
-					<path d="M9146.1 390.7 L9145.9 385.4 L9145.7 380.0 L9159.3 384.9 Z"></path>
-					<path d="M30034.8 135.3 L30034.75 233 L30034.75 335.5 L30034.8 335.5 " fill="none"></path>
-					<path d="M30040.1 135.3 L30034.8 135.3 L30029.4 135.3 L30034.8 122.0 Z"></path>
-					<path d="M5799.3 827.7 L5799.25 964 L4533.5 1459.723603808441 L4533.5 1459.7 " fill="none"></path>
+					<path d="M4117.1 387.5 L6437.75 531 L6437.75 686 L6437.8 686.0 " fill="none"></path>
+					<path d="M4117.4 382.2 L4117.1 387.5 L4116.7 392.8 L4103.8 386.7 Z"></path>
+					<path d="M5044.2 838.7 L5343.25 964 L5406.779571843251 1366.5 L5406.8 1366.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5804.6 818.3 L5799.3 827.7 L5793.9 818.3 L5799.3 809.0 Z"></path>
+						<path d="M5037.7 830.2 L5044.2 838.7 L5033.5 840.0 L5027.0 831.5 Z"></path>
 					</g>
-					<path d="M9145.9 385.9 L5799.25 531 L5799.25 686 L5799.3 686.0 " fill="none"></path>
-					<path d="M9146.2 391.2 L9145.9 385.9 L9145.7 380.5 L9159.3 385.3 Z"></path>
-					<path d="M3529.3 1865.3 L2382.25 2342 L4122.25 2510.009319181983 L4122.3 2510.0 " fill="none"></path>
+					<path d="M4608.8 838.7 L4309.75 964 L4416.053519593614 1637.5 L4416.1 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3539.9 1866.6 L3529.3 1865.3 L3535.8 1856.8 L3546.5 1858.1 Z"></path>
+						<path d="M4619.5 840.0 L4608.8 838.7 L4615.3 830.2 L4626.0 831.5 Z"></path>
 					</g>
-					<path d="M4040.0 1958.2 L4040 2342 L13125.5 2527.347380223146 L13125.5 2527.3 " fill="none"></path>
+					<path d="M5961.7 1947.7 L6643.75 2342 L6643.75 2475 L6643.8 2475.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4045.3 1948.8 L4040.0 1958.2 L4034.7 1948.8 L4040.0 1939.5 Z"></path>
+						<path d="M5956.2 1938.4 L5961.7 1947.7 L5950.9 1947.6 L5945.5 1938.3 Z"></path>
 					</g>
-					<path d="M4296.4 1953.7 L4627.5 2342 L14630 2527.5262307309795 L14630.0 2527.5 " fill="none"></path>
+					<path d="M5830.6 1951.0 L6327.25 2342 L15365.25 2527.341360162736 L15365.3 2527.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4294.4 1943.1 L4296.4 1953.7 L4286.3 1950.1 L4284.3 1939.5 Z"></path>
+						<path d="M5826.6 1941.1 L5830.6 1951.0 L5820.0 1949.5 L5815.9 1939.5 Z"></path>
 					</g>
-					<path d="M3443.5 770.3 L3145.75 964 L3668.15293904209 1366.5 L3668.2 1366.5 " fill="none"></path>
-					<path d="M3446.4 774.7 L3443.5 770.3 L3440.6 765.8 L3454.7 763.0 Z"></path>
-					<path d="M8130.3 838.3 L7810 964 L4533.5 1562.808620689655 L4533.5 1562.8 " fill="none"></path>
+					<path d="M5443.1 1958.2 L5432 2342 L12609.75 2527.1457937139103 L12609.8 2527.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8140.9 839.9 L8130.3 838.3 L8137.0 829.9 L8147.7 831.5 Z"></path>
+						<path d="M5448.7 1949.0 L5443.1 1958.2 L5438.1 1948.7 L5443.7 1939.5 Z"></path>
 					</g>
-					<path d="M8371.2 850.1 L8381.75 964 L7757.369557329463 1637.5 L7757.4 1637.5 " fill="none"></path>
+					<path d="M2454.5 769.0 L2839.25 964 L4958.5 1522.8606831882116 L4958.5 1522.9 " fill="none"></path>
+					<path d="M2456.9 764.3 L2454.5 769.0 L2452.1 773.8 L2442.6 763.0 Z"></path>
+					<path d="M27420.3 469.7 L27420.25 531 L27420.25 732 L27420.3 732.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8375.7 840.3 L8371.2 850.1 L8365.1 841.3 L8369.5 831.5 Z"></path>
+						<path d="M27425.6 460.3 L27420.3 469.7 L27414.9 460.3 L27420.3 451.0 Z"></path>
 					</g>
-					<path d="M17954.3 1841.3 L17535.75 2342 L15368.5 2525.9117847798884 L15368.5 2525.9 " fill="none"></path>
+					<path d="M27047.6 124.5 L27420.25 233 L27420.25 313 L27420.3 313.0 " fill="none"></path>
+					<path d="M27049.0 119.4 L27047.6 124.5 L27046.1 129.6 L27034.8 120.8 Z"></path>
+					<path d="M19118.6 1844.3 L19317.25 2342 L15579.25 2526.990579806289 L15579.3 2527.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17964.4 1837.6 L17954.3 1841.3 L17956.2 1830.7 L17966.3 1827.0 Z"></path>
+						<path d="M19120.1 1833.7 L19118.6 1844.3 L19110.2 1837.6 L19111.7 1827.0 Z"></path>
 					</g>
-					<path d="M18051.8 1844.8 L17896.25 2342 L17366.75 2513.5929626411817 L17366.8 2513.6 " fill="none"></path>
+					<path d="M19107.6 1844.7 L19277.25 2342 L16658.75 2525.2802589604053 L16658.8 2525.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18059.6 1837.5 L18051.8 1844.8 L18049.5 1834.3 L18057.3 1827.0 Z"></path>
+						<path d="M19109.7 1834.1 L19107.6 1844.7 L19099.6 1837.6 L19101.6 1827.0 Z"></path>
 					</g>
-					<path d="M18062.8 1845.1 L17936.25 2342 L16474.75 2486.7529208709507 L16474.8 2486.8 " fill="none"></path>
+					<path d="M19096.6 1845.0 L19237.25 2342 L18421.75 2464.9512934519 L18421.8 2465.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18070.3 1837.4 L18062.8 1845.1 L18060.0 1834.7 L18067.4 1827.0 Z"></path>
+						<path d="M19099.2 1834.5 L19096.6 1845.0 L19088.9 1837.4 L19091.5 1827.0 Z"></path>
 					</g>
-					<path d="M18216.9 1843.3 L18492.25 2342 L18492.25 2528.5 L18492.25 2528.5 L18492.25 2715 L18492.25 2715 L14388.75 2750.0810957254666 L14388.8 2750.1 " fill="none"></path>
+					<path d="M19085.5 1845.2 L19197.25 2342 L19197.25 2528.5 L19197.25 2528.5 L19197.25 2715 L19197.25 2715 L14925 2750.097454440266 L14925.0 2750.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18217.0 1832.6 L18216.9 1843.3 L18207.7 1837.7 L18207.8 1827.0 Z"></path>
+						<path d="M19088.6 1834.9 L19085.5 1845.2 L19078.2 1837.3 L19081.4 1827.0 Z"></path>
 					</g>
-					<path d="M18227.7 1842.9 L18532.25 2342 L18532.25 2528.5 L18532.25 2528.5 L18532.25 2715 L18532.25 2715 L16931.5 2748.2270866832337 L16931.5 2748.2 " fill="none"></path>
+					<path d="M18985.0 1844.9 L18836.75 2342 L18836.75 2528.5 L18836.75 2528.5 L18836.75 2715 L18836.75 2715 L16667.5 2748.7941305540317 L16667.5 2748.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18227.4 1832.2 L18227.7 1842.9 L18218.3 1837.7 L18217.9 1827.0 Z"></path>
+						<path d="M18992.8 1837.5 L18985.0 1844.9 L18982.6 1834.4 L18990.4 1827.0 Z"></path>
 					</g>
-					<path d="M18238.4 1842.5 L18572.25 2342 L14735 2525.982807378366 L14735.0 2526.0 " fill="none"></path>
+					<path d="M18974.0 1844.6 L18796.75 2342 L12714.75 2526.903904148667 L12714.8 2526.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18237.7 1831.8 L18238.4 1842.5 L18228.8 1837.7 L18228.0 1827.0 Z"></path>
+						<path d="M18982.1 1837.6 L18974.0 1844.6 L18972.1 1834.0 L18980.3 1827.0 Z"></path>
 					</g>
-					<path d="M13434.8 409.4 L13374.25 531 L13374.25 747.5 L13374.25 747.5 L13374.25 964 L13374.25 964 L17681.75 1590.4627968337732 L17681.8 1590.5 " fill="none"></path>
-					<path d="M13439.6 411.8 L13434.8 409.4 L13430.1 407.1 L13440.8 397.5 Z"></path>
+					<path d="M12747.0 392.2 L11603.25 531 L11603.25 747.5 L11603.25 747.5 L11603.25 964 L11603.25 964 L18612.25 1613.1734104046243 L18612.3 1613.2 " fill="none"></path>
+					<path d="M12747.7 397.5 L12747.0 392.2 L12746.4 386.9 L12760.3 390.6 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M19282.2 385.5 L14272.25 531 L14272.25 747.5 L14272.25 747.5 L14272.25 964 L14272.25 964 L17681.75 1575.8363068107826 L17681.8 1575.8 " fill="none"></path>
+						<path d="M17730.8 391.3 L19552.25 531 L19552.25 747.5 L19552.25 747.5 L19552.25 964 L19552.25 964 L19171.04535558781 1479 L19171.0 1479.0 " fill="none"></path>
 					</g>
-					<path d="M19282.3 390.9 L19282.2 385.5 L19282.0 380.2 L19295.5 385.2 Z"></path>
+					<path d="M17731.2 386.0 L17730.8 391.3 L17730.4 396.7 L17717.5 390.3 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M21069.7 401.0 L20587.75 531 L20587.75 747.5 L20587.75 747.5 L20587.75 964 L20587.75 964 L18541.75 1533.343295638126 L18541.8 1533.3 " fill="none"></path>
+						<path d="M20504.2 400.5 L21068.25 531 L21068.25 747.5 L21068.25 747.5 L21068.25 964 L21068.25 964 L19472.25 1506.7660414610068 L19472.3 1506.8 " fill="none"></path>
 					</g>
-					<path d="M21071.1 406.1 L21069.7 401.0 L21068.3 395.8 L21082.6 397.5 Z"></path>
-					<path d="M16053.3 2653.7 L16053.25 2715 L16712.5 2745.4434146341464 L16712.5 2745.4 " fill="none"></path>
+					<path d="M20505.4 395.3 L20504.2 400.5 L20503.0 405.7 L20491.2 397.5 Z"></path>
+					<path d="M18000.3 2653.7 L18000.25 2715 L16667.5 2747.8047321892877 L16667.5 2747.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16058.6 2644.3 L16053.3 2653.7 L16047.9 2644.3 L16053.3 2635.0 Z"></path>
+						<path d="M18005.6 2644.3 L18000.3 2653.7 L17994.9 2644.3 L18000.3 2635.0 Z"></path>
 					</g>
-					<path d="M16493.4 2496.4 L18612.25 2342 L18238.146226415094 1827 L18238.1 1827.0 " fill="none"></path>
+					<path d="M18396.0 2416.9 L18661.75 2342 L18946.158563134977 1827 L18946.2 1827.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16483.7 2491.8 L16493.4 2496.4 L16484.4 2502.4 L16474.8 2497.8 Z"></path>
+						<path d="M18385.5 2414.3 L18396.0 2416.9 L18388.4 2424.6 L18378.0 2422.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M19282.2 386.0 L14868.5 531 L14868.5 747.5 L14868.5 747.5 L14868.5 964 L14868.5 964 L14868.5 1653 L14868.5 1653 L14868.5 2342 L14868.5 2342 L15631.75 2462.1486600548637 L15631.8 2462.1 " fill="none"></path>
+						<path d="M17730.8 391.5 L19512.25 531 L19512.25 747.5 L19512.25 747.5 L19512.25 964 L19512.25 964 L19512.25 1653 L19512.25 1653 L19512.25 2342 L19512.25 2342 L18421.75 2476.5094246031745 L18421.8 2476.5 " fill="none"></path>
 					</g>
-					<path d="M19282.3 391.3 L19282.2 386.0 L19282.0 380.7 L19295.5 385.6 Z"></path>
+					<path d="M17731.2 386.2 L17730.8 391.5 L17730.4 396.9 L17717.5 390.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M1820.7 767.3 L1241.25 964 L1241.25 1653 L1241.25 1653 L1241.25 2342 L1241.25 2342 L15631.75 2523.1928335133675 L15631.8 2523.2 " fill="none"></path>
+						<path d="M1708.2 776.3 L1725.5 964 L1725.5 1653 L1725.5 1653 L1725.5 2342 L1725.5 2342 L17578.75 2523.6698336379977 L17578.8 2523.7 " fill="none"></path>
 					</g>
-					<path d="M1822.4 772.3 L1820.7 767.3 L1819.0 762.2 L1833.3 763.0 Z"></path>
+					<path d="M1713.5 775.8 L1708.2 776.3 L1702.8 776.8 L1706.9 763.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M21073.9 401.2 L20627.75 531 L20627.75 747.5 L20627.75 747.5 L20627.75 964 L20627.75 964 L20627.75 1653 L20627.75 1653 L20627.75 2342 L20627.75 2342 L16474.75 2511.31566291398 L16474.8 2511.3 " fill="none"></path>
+						<path d="M20500.0 400.7 L21028.25 531 L21028.25 747.5 L21028.25 747.5 L21028.25 964 L21028.25 964 L21028.25 1653 L21028.25 1653 L21028.25 2342 L21028.25 2342 L18421.75 2502.5390521796567 L18421.8 2502.5 " fill="none"></path>
 					</g>
-					<path d="M21075.4 406.3 L21073.9 401.2 L21072.4 396.1 L21086.7 397.5 Z"></path>
-					<path d="M7448.4 1739.8 L7253.5 2342 L6316 2502.701976102941 L6316.0 2502.7 " fill="none"></path>
+					<path d="M20501.3 395.5 L20500.0 400.7 L20498.8 405.9 L20487.1 397.5 Z"></path>
+					<path d="M12070.6 1740.5 L12145 2342 L7226.25 2522.963036938403 L7226.3 2523.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7456.4 1732.5 L7448.4 1739.8 L7446.2 1729.2 L7454.2 1722.0 Z"></path>
+						<path d="M12074.7 1730.6 L12070.6 1740.5 L12064.1 1731.9 L12068.3 1722.0 Z"></path>
 					</g>
-					<path d="M7522.5 1738.4 L7847.75 2342 L7847.75 2513 L7847.8 2513.0 " fill="none"></path>
+					<path d="M12031.7 1739.8 L11836.75 2342 L11836.75 2513 L11836.8 2513.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7522.8 1727.7 L7522.5 1738.4 L7513.4 1732.7 L7513.7 1722.0 Z"></path>
+						<path d="M12039.6 1732.5 L12031.7 1739.8 L12029.5 1729.2 L12037.4 1722.0 Z"></path>
 					</g>
+					<path d="M9511.5 417.0 L9872.75 531 L9872.75 709 L9872.8 709.0 " fill="none"></path>
+					<path d="M9513.1 411.9 L9511.5 417.0 L9509.9 422.1 L9498.8 413.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M23957.5 402.0 L23411.5 531 L23411.5 686 L23411.5 686.0 " fill="none"></path>
+						<path d="M22075.4 396.5 L22859.25 531 L22859.25 686 L22859.3 686.0 " fill="none"></path>
 					</g>
-					<path d="M23958.8 407.2 L23957.5 402.0 L23956.3 396.8 L23970.5 398.9 Z"></path>
-					<path d="M6334.5 2506.6 L6578.166666666667 2475 L6643.708333333333 2475 L6643.708333333333 2475 L6709.25 2528.5 L6709.25 2528.5 L6643.708333333333 2582 L6643.708333333333 2582 L6578.166666666667 2582 L6578.166666666667 2582 L6316 2548.0115105008076 L6316.0 2548.0 " fill="none"></path>
+					<path d="M22076.3 391.3 L22075.4 396.5 L22074.5 401.8 L22062.3 394.3 Z"></path>
+					<path d="M7244.1 2478.6 L7256.25 2475 L7263.75 2475 L7263.75 2475 L7271.25 2528.5 L7271.25 2528.5 L7263.75 2582 L7263.75 2582 L7256.25 2582 L7256.25 2582 L7226.25 2573.1080332409974 L7226.3 2573.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6324.6 2502.5 L6334.5 2506.6 L6325.9 2513.1 L6316.0 2509.0 Z"></path>
+						<path d="M7233.7 2476.1 L7244.1 2478.6 L7236.7 2486.4 L7226.3 2483.9 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M5960.0 1680.5 L5634.5 2342 L6015 2475.6407721280602 L6015.0 2475.6 " fill="none"></path>
+						<path d="M29.7 1681.8 L10.5 2342 L6925.25 2524.5272814125474 L6925.3 2524.5 " fill="none"></path>
 					</g>
-					<path d="M5964.8 1682.8 L5960.0 1680.5 L5955.2 1678.1 L5965.9 1668.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M26170.2 110.1 L24042 233 L24042 351 L24042.0 351.0 " fill="none"></path>
-					</g>
-					<path d="M26170.5 115.4 L26170.2 110.1 L26169.9 104.8 L26183.5 109.3 Z"></path>
-					<path d="M13979.7 1911.2 L13764.75 2342 L15307.5 2524.884395359924 L15307.5 2524.9 " fill="none"></path>
+					<path d="M35.0 1682.0 L29.7 1681.8 L24.3 1681.7 L30.1 1668.5 Z"></path>
+					<path d="M9425.5 424.5 L9488.25 531 L9488.25 716.5 L9488.3 716.5 " fill="none"></path>
+					<path d="M9430.1 421.8 L9425.5 424.5 L9420.9 427.2 L9418.8 413.0 Z"></path>
+					<path d="M29544.5 960.8 L29546 964 L29546 1653 L29546 1653 L29546 2342 L29546 2342 L27167.25 2522.947027633323 L27167.3 2522.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13988.6 1905.2 L13979.7 1911.2 L13979.1 1900.5 L13988.0 1894.5 Z"></path>
+						<path d="M29545.3 950.1 L29544.5 960.8 L29535.7 954.7 L29536.4 944.0 Z"></path>
 					</g>
-					<path d="M14197.6 1912.2 L14345.5 2342 L13238.5 2519.4434894714223 L13238.5 2519.4 " fill="none"></path>
+					<path d="M29505.4 961.9 L29506 964 L29506 1653 L29506 1653 L29506 2342 L29506 2342 L15478.25 2527.751841596109 L15478.3 2527.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14199.6 1901.6 L14197.6 1912.2 L14189.6 1905.1 L14191.6 1894.5 Z"></path>
+						<path d="M29507.9 951.5 L29505.4 961.9 L29497.6 954.5 L29500.1 944.0 Z"></path>
 					</g>
-					<path d="M14212.6 1911.8 L14385.5 2342 L14657.8163538874 2513 L14657.8 2513.0 " fill="none"></path>
+					<path d="M8849.8 797.2 L8849.75 964 L8849.75 1419 L8849.8 1419.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14214.0 1901.2 L14212.6 1911.8 L14204.1 1905.1 L14205.6 1894.5 Z"></path>
+						<path d="M8855.1 787.8 L8849.8 797.2 L8844.4 787.8 L8849.8 778.5 Z"></path>
 					</g>
-					<path d="M13471.2 407.4 L13581.75 531 L13581.75 747.5 L13581.75 747.5 L13581.75 964 L13581.75 964 L13923.869920174166 1411.5 L13923.9 1411.5 " fill="none"></path>
-					<path d="M13475.2 403.9 L13471.2 407.4 L13467.3 411.0 L13462.4 397.5 Z"></path>
-					<path d="M1525.5 418.8 L1295.5 531 L1295.5 716.5 L1295.5 716.5 " fill="none"></path>
-					<path d="M1527.8 423.6 L1525.5 418.8 L1523.1 414.1 L1537.4 413.0 Z"></path>
-					<path d="M23827.5 850.2 L23827.5 964 L23930.56603773585 1539 L23930.6 1539.0 " fill="none"></path>
+					<path d="M5993.3 812.7 L5993.25 964 L6099.553519593614 1637.5 L6099.6 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23832.8 840.8 L23827.5 850.2 L23822.2 840.8 L23827.5 831.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M23986.4 420.6 L23827.5 531 L23827.5 663.5 L23827.5 663.5 " fill="none"></path>
+						<path d="M5998.6 803.3 L5993.3 812.7 L5987.9 803.3 L5993.3 794.0 Z"></path>
 					</g>
-					<path d="M23989.5 425.0 L23986.4 420.6 L23983.4 416.2 L23997.4 413.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M24051.6 426.0 L24074.5 531 L24074.5 747.5 L24074.5 747.5 L24074.5 964 L24074.5 964 L23971.43396226415 1539 L23971.4 1539.0 " fill="none"></path>
-					</g>
-					<path d="M24056.8 424.9 L24051.6 426.0 L24046.4 427.2 L24048.8 413.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M5988.8 1680.1 L6362 2342 L5901.335120643432 2490 L5901.3 2490.0 " fill="none"></path>
-					</g>
-					<path d="M5993.4 1677.5 L5988.8 1680.1 L5984.1 1682.7 L5982.2 1668.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M24120.6 418.6 L24361.5 531 L24361.5 686 L24361.5 686.0 " fill="none"></path>
-					</g>
-					<path d="M24122.8 413.8 L24120.6 418.6 L24118.3 423.5 L24108.5 413.0 Z"></path>
-					<path d="M10533.8 797.2 L10533.75 964 L14908.5 1602.2304271875496 L14908.5 1602.2 " fill="none"></path>
+					<path d="M4117.0 388.8 L5993.25 531 L5993.25 701 L5993.3 701.0 " fill="none"></path>
+					<path d="M4117.4 383.5 L4117.0 388.8 L4116.6 394.1 L4103.8 387.8 Z"></path>
+					<path d="M29442.5 454.7 L29442.5 531 L29442.5 551 L29442.5 551.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10539.1 787.8 L10533.8 797.2 L10528.4 787.8 L10533.8 778.5 Z"></path>
+						<path d="M29447.8 445.3 L29442.5 454.7 L29437.2 445.3 L29442.5 436.0 Z"></path>
 					</g>
-					<path d="M6250.8 812.7 L6250.75 964 L4731.953737300435 1637.5 L4732.0 1637.5 " fill="none"></path>
+					<path d="M29492.8 133.9 L29442.5 233 L29442.5 328 L29442.5 328.0 " fill="none"></path>
+					<path d="M29497.6 136.3 L29492.8 133.9 L29488.1 131.5 L29498.9 122.0 Z"></path>
+					<path d="M22453.3 835.2 L22453.25 964 L22351.776850507984 1554 L22351.8 1554.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6256.1 803.3 L6250.8 812.7 L6245.4 803.3 L6250.8 794.0 Z"></path>
+						<path d="M22458.6 825.8 L22453.3 835.2 L22447.9 825.8 L22453.3 816.5 Z"></path>
 					</g>
-					<path d="M9145.9 386.5 L6250.75 531 L6250.75 701 L6250.8 701.0 " fill="none"></path>
-					<path d="M9146.2 391.8 L9145.9 386.5 L9145.7 381.1 L9159.3 385.8 Z"></path>
-					<path d="M28756.0 865.2 L28756 964 L25333.5 1617.8479134895329 L25333.5 1617.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28761.3 855.8 L28756.0 865.2 L28750.7 855.8 L28756.0 846.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M22074.9 409.1 L22453.25 531 L22453.25 678.5 L22453.3 678.5 " fill="none"></path>
 					</g>
-					<path d="M28681.6 474.1 L28756 531 L28756 648.5 L28756.0 648.5 " fill="none"></path>
-					<path d="M28684.9 469.9 L28681.6 474.1 L28678.4 478.3 L28671.0 466.0 Z"></path>
-					<path d="M15198.5 1882.6 L15082.5 2342 L15316.765415549598 2513 L15316.8 2513.0 " fill="none"></path>
+					<path d="M22076.6 404.0 L22074.9 409.1 L22073.3 414.2 L22062.3 405.0 Z"></path>
+					<path d="M14772.4 1806.9 L14981.75 2342 L15385.18163538874 2513 L15385.2 2513.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15206.0 1874.9 L15198.5 1882.6 L15195.6 1872.2 L15203.1 1864.5 Z"></path>
+						<path d="M14774.0 1796.2 L14772.4 1806.9 L14764.1 1800.1 L14765.6 1789.5 Z"></path>
 					</g>
-					<path d="M15397.4 1880.4 L15683.5 2342 L13238.5 2524.287627423546 L13238.5 2524.3 " fill="none"></path>
+					<path d="M14653.0 1806.9 L14447.25 2342 L12714.75 2523.014705882353 L12714.8 2523.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15397.0 1869.6 L15397.4 1880.4 L15388.0 1875.2 L15387.6 1864.5 Z"></path>
-					</g>
-					<path d="M15410.3 1880.0 L15723.5 2342 L14735 2519.094380403458 L14735.0 2519.1 " fill="none"></path>
+						<path d="M14661.4 1800.1 L14653.0 1806.9 L14651.4 1796.3 L14659.8 1789.5 Z"></path>
+					</g>
+					<path d="M2451.4 769.5 L2799.25 964 L14364.25 1632.8730798287586 L14364.3 1632.9 " fill="none"></path>
+					<path d="M2454.0 764.9 L2451.4 769.5 L2448.8 774.2 L2439.7 763.0 Z"></path>
+					<path d="M29020.4 906.3 L29109.25 964 L15060.25 1636.3456970202126 L15060.3 1636.3 " fill="none"></path>
+					<path d="M29023.3 901.8 L29020.4 906.3 L29017.5 910.7 L29009.2 899.0 Z"></path>
+					<path d="M26778.6 438.4 L27044.25 531 L27044.25 663.5 L27044.3 663.5 " fill="none"></path>
+					<path d="M26780.3 433.3 L26778.6 438.4 L26776.8 443.4 L26766.0 434.0 Z"></path>
+					<path d="M26996.0 134.5 L27032.25 233 L27032.25 283 L27032.3 283.0 " fill="none"></path>
+					<path d="M27001.1 132.7 L26996.0 134.5 L26991.0 136.4 L26991.4 122.0 Z"></path>
+					<path d="M22334.8 1770.7 L22334.75 2342 L27021.25 2525.6395104527787 L27021.3 2525.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15409.5 1869.2 L15410.3 1880.0 L15400.7 1875.2 L15399.9 1864.5 Z"></path>
-					</g>
-					<path d="M3446.8 770.9 L3185.75 964 L14908.5 1633.1361141602633 L14908.5 1633.1 " fill="none"></path>
-					<path d="M3450.0 775.2 L3446.8 770.9 L3443.6 766.6 L3457.5 763.0 Z"></path>
-					<path d="M20881.7 887.3 L20825.75 964 L15604.5 1609.9471652376892 L15604.5 1609.9 " fill="none"></path>
-					<path d="M20886.1 890.4 L20881.7 887.3 L20877.4 884.1 L20889.6 876.5 Z"></path>
-					<path d="M21917.2 908.2 L21976.25 964 L15604.5 1617.31831541352 L15604.5 1617.3 " fill="none"></path>
-					<path d="M21920.8 904.3 L21917.2 908.2 L21913.5 912.0 L21907.5 899.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M19430.4 406.6 L19563.75 531 L19563.75 747.5 L19563.75 747.5 L19563.75 964 L19563.75 964 L15604.5 1597.332927041616 L15604.5 1597.3 " fill="none"></path>
-					</g>
-					<path d="M19434.0 402.7 L19430.4 406.6 L19426.7 410.5 L19420.6 397.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1823.7 767.5 L1281.25 964 L14908.5 1635.843097619005 L14908.5 1635.8 " fill="none"></path>
+						<path d="M22340.1 1761.3 L22334.8 1770.7 L22329.4 1761.3 L22334.8 1752.0 Z"></path>
 					</g>
-					<path d="M1825.5 772.6 L1823.7 767.5 L1821.9 762.5 L1836.2 763.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M21171.5 405.5 L21339.75 531 L21339.75 747.5 L21339.75 747.5 L21339.75 964 L21339.75 964 L15604.5 1613.5848847244483 L15604.5 1613.6 " fill="none"></path>
+						<path d="M22048.8 420.4 L22216.25 531 L22216.25 747.5 L22216.25 747.5 L22216.25 964 L22216.25 964 L22317.723149492016 1554 L22317.7 1554.0 " fill="none"></path>
 					</g>
-					<path d="M21174.7 401.2 L21171.5 405.5 L21168.3 409.7 L21160.8 397.5 Z"></path>
-					<path d="M1601.3 426.3 L1602 531 L1602 716.5 L1602.0 716.5 " fill="none"></path>
-					<path d="M1606.6 426.3 L1601.3 426.3 L1596.0 426.4 L1601.2 413.0 Z"></path>
-					<path d="M16145.5 1849.9 L15805 2342 L15368.5 2516.3195931477517 L15368.5 2516.3 " fill="none"></path>
+					<path d="M22051.7 415.9 L22048.8 420.4 L22045.9 424.8 L22037.7 413.0 Z"></path>
+					<path d="M16649.0 1856.6 L17035.75 2342 L15579.25 2524.674680564896 L15579.3 2524.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16155.2 1845.2 L16145.5 1849.9 L16146.5 1839.1 L16156.2 1834.5 Z"></path>
+						<path d="M16647.3 1846.0 L16649.0 1856.6 L16639.0 1852.6 L16637.3 1842.0 Z"></path>
 					</g>
-					<path d="M16211.3 1852.1 L16038 2342 L17274.75 2521.812024946404 L17274.8 2521.8 " fill="none"></path>
+					<path d="M16524.7 1860.4 L16612.75 2342 L16612.75 2513 L16612.8 2513.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16219.5 1845.1 L16211.3 1852.1 L16209.4 1841.5 L16217.5 1834.5 Z"></path>
+						<path d="M16528.2 1850.2 L16524.7 1860.4 L16517.7 1852.1 L16521.3 1842.0 Z"></path>
 					</g>
-					<path d="M16349.1 1852.2 L16514.75 2342 L16514.75 2528.5 L16514.75 2528.5 L16514.75 2715 L16514.75 2715 L14388.75 2749.7002298850575 L14388.8 2749.7 " fill="none"></path>
+					<path d="M16498.8 1860.6 L16526.75 2342 L16526.75 2528.5 L16526.75 2528.5 L16526.75 2715 L16526.75 2715 L14925 2749.44623655914 L14925.0 2749.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16351.2 1841.6 L16349.1 1852.2 L16341.1 1845.0 L16343.1 1834.5 Z"></path>
+						<path d="M16503.6 1851.0 L16498.8 1860.6 L16492.9 1851.6 L16497.7 1842.0 Z"></path>
 					</g>
-					<path d="M16360.5 1851.9 L16554.75 2342 L16554.75 2528.5 L16554.75 2528.5 L16554.75 2715 L16554.75 2715 L16712.5 2735.9546304957903 L16712.5 2736.0 " fill="none"></path>
+					<path d="M16402.8 1859.3 L16206.5 2342 L16206.5 2528.5 L16206.5 2528.5 L16206.5 2715 L16206.5 2715 L16448.5 2739.4409672830725 L16448.5 2739.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16362.1 1841.2 L16360.5 1851.9 L16352.1 1845.1 L16353.7 1834.5 Z"></path>
+						<path d="M16411.3 1852.7 L16402.8 1859.3 L16401.4 1848.6 L16409.9 1842.0 Z"></path>
 					</g>
-					<path d="M16371.9 1851.5 L16594.75 2342 L14735 2523.379722839587 L14735.0 2523.4 " fill="none"></path>
+					<path d="M16391.0 1858.9 L16166.5 2342 L12714.75 2525.705892844403 L12714.8 2525.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16372.9 1840.8 L16371.9 1851.5 L16363.2 1845.2 L16364.2 1834.5 Z"></path>
+						<path d="M16399.8 1852.7 L16391.0 1858.9 L16390.1 1848.2 L16398.9 1842.0 Z"></path>
 					</g>
-					<path d="M13526.4 400.6 L14072.25 531 L14072.25 747.5 L14072.25 747.5 L14072.25 964 L14072.25 964 L15735.75 1482.7379497623897 L15735.8 1482.7 " fill="none"></path>
-					<path d="M13527.6 395.4 L13526.4 400.6 L13525.1 405.8 L13513.4 397.5 Z"></path>
+					<path d="M12747.0 389.5 L11171.25 531 L11171.25 747.5 L11171.25 747.5 L11171.25 964 L11171.25 964 L16067.25 1598.6240240805191 L16067.3 1598.6 " fill="none"></path>
+					<path d="M12747.4 394.8 L12747.0 389.5 L12746.5 384.2 L12760.3 388.3 Z"></path>
+					<path d="M29165.6 951.9 L29149.25 964 L16906.25 1630.1738993089832 L16906.3 1630.2 " fill="none"></path>
+					<path d="M29168.8 956.2 L29165.6 951.9 L29162.4 947.6 L29176.3 944.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M19435.5 405.5 L19603.75 531 L19603.75 747.5 L19603.75 747.5 L19603.75 964 L19603.75 964 L16827.75 1539.7567730282963 L16827.8 1539.8 " fill="none"></path>
+						<path d="M17537.9 400.9 L17049.5 531 L17049.5 747.5 L17049.5 747.5 L17049.5 964 L17049.5 964 L16641.118287373003 1464 L16641.1 1464.0 " fill="none"></path>
 					</g>
-					<path d="M19438.7 401.2 L19435.5 405.5 L19432.3 409.7 L19424.8 397.5 Z"></path>
+					<path d="M17539.3 406.1 L17537.9 400.9 L17536.5 395.8 L17550.8 397.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M1881.7 776.3 L1899 964 L15735.75 1626.844084059029 L15735.8 1626.8 " fill="none"></path>
+						<path d="M1702.8 776.3 L1685.5 964 L16067.25 1633.472223629761 L16067.3 1633.5 " fill="none"></path>
 					</g>
-					<path d="M1887.0 775.8 L1881.7 776.3 L1876.3 776.8 L1880.4 763.0 Z"></path>
+					<path d="M1708.2 776.8 L1702.8 776.3 L1697.5 775.8 L1704.1 763.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M21176.3 404.5 L21379.75 531 L21379.75 747.5 L21379.75 747.5 L21379.75 964 L21379.75 964 L16827.75 1579.2075323656336 L16827.8 1579.2 " fill="none"></path>
+						<path d="M20438.9 409.2 L20504.25 531 L20504.25 747.5 L20504.25 747.5 L20504.25 964 L20504.25 964 L16906.25 1581.055880522713 L16906.3 1581.1 " fill="none"></path>
 					</g>
-					<path d="M21179.1 400.0 L21176.3 404.5 L21173.4 409.1 L21164.9 397.5 Z"></path>
-					<path d="M6944.7 823.3 L6825.75 964 L6155.915638606676 1637.5 L6155.9 1637.5 " fill="none"></path>
+					<path d="M20443.6 406.7 L20438.9 409.2 L20434.2 411.8 L20432.6 397.5 Z"></path>
+					<path d="M10804.8 797.2 L10804.75 964 L14364.25 1591.6380038387715 L14364.3 1591.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6954.8 819.6 L6944.7 823.3 L6946.7 812.7 L6956.8 809.0 Z"></path>
+						<path d="M10810.1 787.8 L10804.8 797.2 L10799.4 787.8 L10804.8 778.5 Z"></path>
 					</g>
-					<path d="M7048.4 825.6 L7118.5 964 L6377.063497822932 1637.5 L6377.1 1637.5 " fill="none"></path>
+					<path d="M9295.4 1757.2 L11796.75 2342 L15518.25 2526.9839418976544 L15518.3 2527.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7048.9 814.9 L7048.4 825.6 L7039.4 819.7 L7039.9 809.0 Z"></path>
+						<path d="M9287.6 1749.9 L9295.4 1757.2 L9285.1 1760.3 L9277.3 1752.9 Z"></path>
 					</g>
-					<path d="M9145.9 388.0 L7008.75 531 L7008.75 686 L7008.8 686.0 " fill="none"></path>
-					<path d="M9146.3 393.3 L9145.9 388.0 L9145.6 382.7 L9159.3 387.1 Z"></path>
-					<path d="M8180.6 1798.4 L7887.75 2342 L13125.5 2526.5096803135475 L13125.5 2526.5 " fill="none"></path>
+					<path d="M9295.4 1758.6 L11756.75 2342 L15365.25 2525.624897680764 L15365.3 2525.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8189.8 1792.7 L8180.6 1798.4 L8180.4 1787.7 L8189.5 1782.0 Z"></path>
+						<path d="M9287.6 1751.3 L9295.4 1758.6 L9285.1 1761.7 L9277.3 1754.3 Z"></path>
 					</g>
-					<path d="M8340.6 1798.3 L8646.25 2342 L14630 2526.8779250362395 L14630.0 2526.9 " fill="none"></path>
+					<path d="M9008.1 1902.8 L9286.5 2342 L9286.5 2528.5 L9286.5 2528.5 L9286.5 2715 L9286.5 2715 L14827 2750.1887914840327 L14827.0 2750.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8340.7 1787.5 L8340.6 1798.3 L8331.4 1792.7 L8331.5 1782.0 Z"></path>
+						<path d="M9007.6 1892.0 L9008.1 1902.8 L8998.6 1897.7 L8998.1 1887.0 Z"></path>
 					</g>
-					<path d="M3515.8 769.9 L3840 964 L7911 1598.7406653088933 L7911.0 1598.7 " fill="none"></path>
-					<path d="M3518.6 765.3 L3515.8 769.9 L3513.1 774.4 L3504.4 763.0 Z"></path>
-					<path d="M1720.3 389.9 L3850.5 531 L3850.5 701.5 L3850.5 701.5 " fill="none"></path>
-					<path d="M1720.7 384.6 L1720.3 389.9 L1720.0 395.2 L1707.0 389.0 Z"></path>
-					<path d="M12614.8 1740.7 L12614.75 2342 L12614.75 2362 L12614.8 2362.0 " fill="none"></path>
+					<path d="M8823.8 1905.6 L8779 2342 L8779 2528.5 L8779 2528.5 L8779 2715 L8779 2715 L16448.5 2750.000289240262 L16448.5 2750.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12620.1 1731.3 L12614.8 1740.7 L12609.4 1731.3 L12614.8 1722.0 Z"></path>
+						<path d="M8830.1 1896.8 L8823.8 1905.6 L8819.5 1895.7 L8825.7 1887.0 Z"></path>
 					</g>
-					<path d="M14294.9 114.2 L12614.75 233 L12614.75 382 L12614.75 382 L12614.75 531 L12614.75 531 L12614.75 747.5 L12614.75 747.5 L12614.75 964 L12614.75 964 L12614.75 1584 L12614.8 1584.0 " fill="none"></path>
-					<path d="M14295.3 119.5 L14294.9 114.2 L14294.6 108.9 L14308.3 113.3 Z"></path>
-					<path d="M26170.2 111.8 L24750 233 L24750 298 L24750.0 298.0 " fill="none"></path>
-					<path d="M26170.7 117.1 L26170.2 111.8 L26169.8 106.5 L26183.5 110.7 Z"></path>
-					<path d="M13841.8 797.2 L13841.75 964 L8607 1610.0512740137028 L8607.0 1610.1 " fill="none"></path>
+					<path d="M8698.5 1903.0 L8432.75 2342 L12609.75 2526.185010048469 L12609.8 2526.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13847.1 787.8 L13841.8 797.2 L13836.4 787.8 L13841.8 778.5 Z"></path>
+						<path d="M8707.9 1897.7 L8698.5 1903.0 L8698.7 1892.2 L8708.1 1887.0 Z"></path>
 					</g>
-					<path d="M24758.2 843.3 L24610.5 964 L24610.5 1637.5 L24610.5 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24768.8 841.5 L24758.2 843.3 L24762.1 833.3 L24772.7 831.5 Z"></path>
-					</g>
-					<path d="M24931.3 847.8 L24996 964 L25134.12772133527 1584 L25134.1 1584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24931.5 837.1 L24931.3 847.8 L24922.1 842.2 L24922.3 831.5 Z"></path>
+					<path d="M2448.2 770.1 L2759.25 964 L8422.25 1604.6382070437567 L8422.3 1604.6 " fill="none"></path>
+					<path d="M2451.0 765.5 L2448.2 770.1 L2445.4 774.6 L2436.9 763.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M17533.7 400.7 L17009.5 531 L17009.5 747.5 L17009.5 747.5 L17009.5 964 L17009.5 964 L9277.25 1616.9023867152794 L9277.3 1616.9 " fill="none"></path>
 					</g>
+					<path d="M17535.0 405.9 L17533.7 400.7 L17532.4 395.5 L17546.6 397.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M24126.6 397.1 L24875.5 531 L24875.5 663.5 L24875.5 663.5 " fill="none"></path>
+						<path d="M1697.6 775.8 L1645.5 964 L8422.25 1612.1147586494083 L8422.3 1612.1 " fill="none"></path>
 					</g>
-					<path d="M24127.6 391.9 L24126.6 397.1 L24125.7 402.4 L24113.5 394.8 Z"></path>
-					<path d="M12614.8 2713.7 L12614.75 2715 L14290.75 2749.4915942028983 L14290.8 2749.5 " fill="none"></path>
+					<path d="M1702.8 777.3 L1697.6 775.8 L1692.5 774.4 L1701.2 763.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M20431.9 410.4 L20464.25 531 L20464.25 747.5 L20464.25 747.5 L20464.25 964 L20464.25 964 L9277.25 1627.63967454475 L9277.3 1627.6 " fill="none"></path>
+					</g>
+					<path d="M20437.0 409.0 L20431.9 410.4 L20426.7 411.8 L20428.4 397.5 Z"></path>
+					<path d="M9400.5 135.3 L9400.5 233 L9400.5 351 L9400.5 351.0 " fill="none"></path>
+					<path d="M9405.8 135.3 L9400.5 135.3 L9395.2 135.3 L9400.5 122.0 Z"></path>
+					<path d="M9345.5 420.7 L9188.75 531 L9188.75 716.5 L9188.8 716.5 " fill="none"></path>
+					<path d="M9348.6 425.0 L9345.5 420.7 L9342.5 416.3 L9356.4 413.0 Z"></path>
+					<path d="M21969.3 850.2 L21969.25 964 L21866.18396226415 1539 L21866.2 1539.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12620.1 2704.3 L12614.8 2713.7 L12609.4 2704.3 L12614.8 2695.0 Z"></path>
+						<path d="M21974.6 840.8 L21969.3 850.2 L21963.9 840.8 L21969.3 831.5 Z"></path>
 					</g>
-					<path d="M8921.2 2126.5 L8686.25 2342 L12333.75 2515.159921089474 L12333.8 2515.2 " fill="none"></path>
-					<path d="M8924.8 2130.5 L8921.2 2126.5 L8917.6 2122.6 L8931.0 2117.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M14662.5 1697.3 L14662.5 2342 L12895.75 2502.9077646197047 L12895.8 2502.9 " fill="none"></path>
+						<path d="M21984.4 426.2 L21969.25 531 L21969.25 663.5 L21969.3 663.5 " fill="none"></path>
 					</g>
-					<path d="M14667.8 1697.3 L14662.5 1697.3 L14657.2 1697.3 L14662.5 1684.0 Z"></path>
-					<path d="M18886.2 1918.3 L18652.25 2342 L15368.5 2526.7836991777926 L15368.5 2526.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18895.4 1912.7 L18886.2 1918.3 L18886.1 1907.6 L18895.2 1902.0 Z"></path>
+					<path d="M21989.7 427.0 L21984.4 426.2 L21979.1 425.4 L21986.3 413.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M21923.2 419.5 L21722.25 531 L21722.25 747.5 L21722.25 747.5 L21722.25 964 L21722.25 964 L21825.31603773585 1539 L21825.3 1539.0 " fill="none"></path>
 					</g>
-					<path d="M18934.1 1919.5 L18777.75 2342 L17366.75 2522.611873713109 L17366.8 2522.6 " fill="none"></path>
+					<path d="M21925.8 424.1 L21923.2 419.5 L21920.6 414.8 L21934.9 413.0 Z"></path>
+					<path d="M12796.4 1910.0 L13089.25 2342 L15518.25 2526.1872331774753 L15518.3 2526.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18942.4 1912.6 L18934.1 1919.5 L18932.4 1908.9 L18940.6 1902.0 Z"></path>
+						<path d="M12795.6 1899.2 L12796.4 1910.0 L12786.8 1905.2 L12785.9 1894.5 Z"></path>
 					</g>
-					<path d="M18949.5 1919.8 L18817.75 2342 L18452.25 2431.04735467015 L18452.3 2431.0 " fill="none"></path>
+					<path d="M12781.8 1910.4 L13049.25 2342 L15365.25 2524.058587987355 L15365.3 2524.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18957.4 1912.5 L18949.5 1919.8 L18947.2 1909.3 L18955.1 1902.0 Z"></path>
+						<path d="M12781.4 1899.6 L12781.8 1910.4 L12772.3 1905.2 L12771.9 1894.5 Z"></path>
 					</g>
-					<path d="M18964.9 1920.1 L18857.75 2342 L13238.5 2526.6434612165795 L13238.5 2526.6 " fill="none"></path>
+					<path d="M12556.7 1912.6 L12448.25 2342 L12644.464477211795 2513 L12644.5 2513.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18972.4 1912.4 L18964.9 1920.1 L18962.0 1909.7 L18969.5 1902.0 Z"></path>
+						<path d="M12564.1 1904.9 L12556.7 1912.6 L12553.8 1902.2 L12561.3 1894.5 Z"></path>
 					</g>
-					<path d="M19096.9 1920.2 L19198.25 2342 L19198.25 2528.5 L19198.25 2528.5 L19198.25 2715 L19198.25 2715 L14388.75 2750.1419676855 L14388.8 2750.1 " fill="none"></path>
+					<path d="M12747.0 389.3 L11131.25 531 L11131.25 747.5 L11131.25 747.5 L11131.25 964 L11131.25 964 L12274.25 1492.1871227364186 L12274.3 1492.2 " fill="none"></path>
+					<path d="M12747.4 394.7 L12747.0 389.3 L12746.5 384.0 L12760.3 388.2 Z"></path>
+					<path d="M28776.0 454.7 L28776 531 L28776 596 L28776.0 596.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19099.9 1909.8 L19096.9 1920.2 L19089.6 1912.3 L19092.6 1902.0 Z"></path>
+						<path d="M28781.3 445.3 L28776.0 454.7 L28770.7 445.3 L28776.0 436.0 Z"></path>
 					</g>
-					<path d="M19112.4 1919.9 L19238.25 2342 L19238.25 2528.5 L19238.25 2528.5 L19238.25 2715 L19238.25 2715 L16931.5 2748.891205380238 L16931.5 2748.9 " fill="none"></path>
+					<path d="M29404.1 124.3 L28776 233 L28776 328 L28776.0 328.0 " fill="none"></path>
+					<path d="M29405.0 129.5 L29404.1 124.3 L29403.2 119.0 L29417.2 122.0 Z"></path>
+					<path d="M28996.2 910.1 L29069.25 964 L29069.25 1653 L29069.25 1653 L29069.25 2342 L29069.25 2342 L15478.25 2527.727898882579 L15478.3 2527.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19114.8 1909.4 L19112.4 1919.9 L19104.6 1912.5 L19107.0 1902.0 Z"></path>
+						<path d="M28991.9 900.3 L28996.2 910.1 L28985.5 908.8 L28981.2 899.0 Z"></path>
 					</g>
-					<path d="M19127.7 1919.6 L19278.25 2342 L14735 2526.3694989936353 L14735.0 2526.4 " fill="none"></path>
+					<path d="M28510.3 809.9 L27854 964 L27854 1637.5 L27854.0 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19129.6 1909.0 L19127.7 1919.6 L19119.6 1912.6 L19121.5 1902.0 Z"></path>
-					</g>
-					<path d="M13530.6 400.4 L14112.25 531 L14112.25 747.5 L14112.25 747.5 L14112.25 964 L14112.25 964 L18581.75 1589.8480845442537 L18581.8 1589.8 " fill="none"></path>
-					<path d="M13531.7 395.2 L13530.6 400.4 L13529.4 405.6 L13517.5 397.5 Z"></path>
-					<path d="M20970.6 889.8 L20963.75 964 L19483.75 1492.0787156913516 L19483.8 1492.1 " fill="none"></path>
-					<path d="M20975.9 890.3 L20970.6 889.8 L20965.3 889.3 L20971.8 876.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M19440.3 404.5 L19643.75 531 L19643.75 747.5 L19643.75 747.5 L19643.75 964 L19643.75 964 L19253.561320754718 1404 L19253.6 1404.0 " fill="none"></path>
+						<path d="M28520.6 812.9 L28510.3 809.9 L28518.2 802.6 L28528.5 805.6 Z"></path>
 					</g>
-					<path d="M19443.1 400.0 L19440.3 404.5 L19437.4 409.1 L19428.9 397.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1886.9 775.8 L1939 964 L18581.75 1634.8214844606946 L18581.8 1634.8 " fill="none"></path>
+					<path d="M26722.2 478.6 L26779.25 531 L26779.25 732 L26779.3 732.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M26719.0 468.4 L26722.2 478.6 L26711.7 476.2 L26708.5 466.0 Z"></path>
 					</g>
-					<path d="M1892.0 774.4 L1886.9 775.8 L1881.7 777.3 L1883.3 763.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M21180.9 403.8 L21419.75 531 L21419.75 747.5 L21419.75 747.5 L21419.75 964 L21419.75 964 L19483.75 1522.8202764976959 L19483.8 1522.8 " fill="none"></path>
+						<path d="M26928.0 126.3 L26617 233 L26617 298 L26617.0 298.0 " fill="none"></path>
 					</g>
-					<path d="M21183.4 399.1 L21180.9 403.8 L21178.4 408.5 L21169.1 397.5 Z"></path>
-					<path d="M18052.3 2653.7 L18052.25 2715 L16931.5 2747.340276366592 L16931.5 2747.3 " fill="none"></path>
+					<path d="M26929.7 131.4 L26928.0 126.3 L26926.2 121.3 L26940.6 122.0 Z"></path>
+					<path d="M20000.5 892.2 L20046.25 964 L20046.25 1653 L20046.25 1653 L20046.25 2342 L20046.25 2342 L20046.25 2528.5 L20046.25 2528.5 L20046.25 2715 L20046.25 2715 L14925 2750.1635559208935 L14925.0 2750.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18057.6 2644.3 L18052.3 2653.7 L18046.9 2644.3 L18052.3 2635.0 Z"></path>
+						<path d="M20000.0 881.5 L20000.5 892.2 L19991.0 887.2 L19990.5 876.5 Z"></path>
 					</g>
-					<path d="M18470.7 2466.9 L19318.25 2342 L19135.927793904208 1902 L19135.9 1902.0 " fill="none"></path>
+					<path d="M19894.6 895.1 L19888.25 964 L19888.25 1653 L19888.25 1653 L19888.25 2342 L19888.25 2342 L19888.25 2528.5 L19888.25 2528.5 L19888.25 2715 L19888.25 2715 L16667.5 2749.3327452893927 L16667.5 2749.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18460.7 2462.9 L18470.7 2466.9 L18462.3 2473.5 L18452.3 2469.6 Z"></path>
+						<path d="M19900.8 886.3 L19894.6 895.1 L19890.2 885.3 L19896.3 876.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M19444.9 403.8 L19683.75 531 L19683.75 747.5 L19683.75 747.5 L19683.75 964 L19683.75 964 L19683.75 1653 L19683.75 1653 L19683.75 2342 L19683.75 2342 L18452.25 2482.7752068648483 L18452.3 2482.8 " fill="none"></path>
+						<path d="M17513.1 400.0 L16813.5 531 L19592.25 725.3935293642459 L19592.3 725.4 " fill="none"></path>
 					</g>
-					<path d="M19447.4 399.1 L19444.9 403.8 L19442.4 408.5 L19433.1 397.5 Z"></path>
+					<path d="M17514.1 405.2 L17513.1 400.0 L17512.2 394.7 L17526.2 397.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M1891.8 775.1 L1979 964 L1979 1653 L1979 1653 L1979 2342 L1979 2342 L17652.25 2523.858748230756 L17652.3 2523.9 " fill="none"></path>
+						<path d="M20424.3 410.8 L20424.25 531 L20215.704965357967 618.5 L20215.7 618.5 " fill="none"></path>
 					</g>
-					<path d="M1896.6 772.9 L1891.8 775.1 L1886.9 777.3 L1886.2 763.0 Z"></path>
+					<path d="M20429.6 410.8 L20424.3 410.8 L20418.9 410.8 L20424.3 397.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M21185.3 403.1 L21459.75 531 L21459.75 747.5 L21459.75 747.5 L21459.75 964 L21459.75 964 L21459.75 1653 L21459.75 1653 L21459.75 2342 L21459.75 2342 L18452.25 2506.607116654439 L18452.3 2506.6 " fill="none"></path>
+						<path d="M26923.6 116.6 L26210.25 233 L26210.25 382 L26210.25 382 L26210.25 531 L26210.25 531 L26210.25 747.5 L26210.25 747.5 L26210.25 964 L26210.25 964 L25264.052612481857 1584 L25264.1 1584.0 " fill="none"></path>
 					</g>
-					<path d="M21187.6 398.3 L21185.3 403.1 L21183.1 408.0 L21173.3 397.5 Z"></path>
-					<path d="M17481.8 828.4 L16867.75 964 L16867.75 1653 L16867.75 1653 L16867.75 2342 L16867.75 2342 L15368.5 2524.7815819578364 L15368.5 2524.8 " fill="none"></path>
+					<path d="M26924.4 121.9 L26923.6 116.6 L26922.7 111.4 L26936.8 114.5 Z"></path>
+					<path d="M11387.3 804.7 L11387.25 964 L3128.5 1613.1861327400816 L3128.5 1613.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17492.0 831.6 L17481.8 828.4 L17489.7 821.2 L17500.0 824.4 Z"></path>
+						<path d="M11392.6 795.3 L11387.3 804.7 L11381.9 795.3 L11387.3 786.0 Z"></path>
 					</g>
-					<path d="M17481.9 839.2 L16983.25 964 L16983.25 1637.5 L16983.3 1637.5 " fill="none"></path>
+					<path d="M4065.0 812.7 L4065 964 L3128.5 1411.1576576576576 L3128.5 1411.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17492.2 842.1 L17481.9 839.2 L17489.7 831.7 L17500.0 834.6 Z"></path>
+						<path d="M4070.3 803.3 L4065.0 812.7 L4059.7 803.3 L4065.0 794.0 Z"></path>
 					</g>
-					<path d="M17482.2 864.3 L17169.75 964 L17169.75 1637.5 L17169.8 1637.5 " fill="none"></path>
+					<path d="M4034.9 410.4 L4065 531 L4065 701 L4065.0 701.0 " fill="none"></path>
+					<path d="M4040.0 409.1 L4034.9 410.4 L4029.7 411.7 L4031.6 397.5 Z"></path>
+					<path d="M3673.0 835.2 L3673 964 L3128.5 1320.9557564224547 L3128.5 1321.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17492.7 866.5 L17482.2 864.3 L17489.5 856.3 L17500.0 858.6 Z"></path>
+						<path d="M3678.3 825.8 L3673.0 835.2 L3667.7 825.8 L3673.0 816.5 Z"></path>
 					</g>
-					<path d="M17482.6 887.0 L17280.75 964 L17280.75 1653 L17280.75 1653 L17280.75 2342 L17280.75 2342 L17317.425603217158 2513 L17317.4 2513.0 " fill="none"></path>
+					<path d="M3978.6 402.7 L3673 531 L3673 678.5 L3673.0 678.5 " fill="none"></path>
+					<path d="M3980.6 407.6 L3978.6 402.7 L3976.5 397.7 L3990.8 397.5 Z"></path>
+					<path d="M1396.5 812.7 L1396.5 964 L2115.5 1368.2358221134232 L2115.5 1368.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17493.2 888.6 L17482.6 887.0 L17489.4 878.7 L17500.0 880.3 Z"></path>
+						<path d="M1401.8 803.3 L1396.5 812.7 L1391.2 803.3 L1396.5 794.0 Z"></path>
 					</g>
-					<path d="M17519.8 938.4 L17475.75 964 L14456.5 1581.792931917737 L14456.5 1581.8 " fill="none"></path>
+					<path d="M3938.4 387.1 L1396.5 531 L1396.5 701 L1396.5 701.0 " fill="none"></path>
+					<path d="M3938.7 392.4 L3938.4 387.1 L3938.1 381.7 L3951.8 386.3 Z"></path>
+					<path d="M1004.5 812.7 L1004.5 964 L2115.5 1437.2482225656877 L2115.5 1437.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17530.5 938.3 L17519.8 938.4 L17525.2 929.1 L17535.9 929.0 Z"></path>
+						<path d="M1009.8 803.3 L1004.5 812.7 L999.2 803.3 L1004.5 794.0 Z"></path>
 					</g>
-					<path d="M17989.7 944.1 L18004 964 L18660.966618287373 1404 L18661.0 1404.0 " fill="none"></path>
+					<path d="M3938.4 386.4 L1004.5 531 L1004.5 701 L1004.5 701.0 " fill="none"></path>
+					<path d="M3938.7 391.7 L3938.4 386.4 L3938.2 381.1 L3951.8 385.7 Z"></path>
+					<path d="M612.5 812.7 L612.5 964 L2115.5 1479.3356556357303 L2115.5 1479.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17988.6 933.5 L17989.7 944.1 L17979.9 939.7 L17978.8 929.0 Z"></path>
+						<path d="M617.8 803.3 L612.5 812.7 L607.2 803.3 L612.5 794.0 Z"></path>
 					</g>
-					<path d="M18024.8 942.8 L18044 964 L16745.971153846152 1471.5 L16746.0 1471.5 " fill="none"></path>
+					<path d="M3938.4 385.9 L612.5 531 L612.5 701 L612.5 701.0 " fill="none"></path>
+					<path d="M3938.7 391.2 L3938.4 385.9 L3938.2 380.6 L3951.8 385.3 Z"></path>
+					<path d="M12310.1 2450.0 L12322.75 2445 L12330.25 2445 L12330.25 2445 L12337.75 2528.5 L12337.75 2528.5 L12330.25 2612 L12330.25 2612 L12322.75 2612 L12322.75 2612 L12292.75 2600.1560283687945 L12292.8 2600.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18022.5 932.3 L18024.8 942.8 L18014.6 939.5 L18012.3 929.0 Z"></path>
+						<path d="M12299.5 2448.5 L12310.1 2450.0 L12303.4 2458.4 L12292.8 2456.8 Z"></path>
 					</g>
-					<path d="M18123.6 939.7 L18158.5 964 L18123.556240928883 1479 L18123.6 1479.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18119.0 930.0 L18123.6 939.7 L18112.9 938.7 L18108.3 929.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M28.0 1681.8 L-29.5 2342 L11929.75 2525.711889710273 L11929.8 2525.7 " fill="none"></path>
 					</g>
-					<path d="M18214.2 829.3 L18817.75 964 L13720.5 1600.6076494312774 L13720.5 1600.6 " fill="none"></path>
+					<path d="M33.3 1682.2 L28.0 1681.8 L22.7 1681.3 L29.2 1668.5 Z"></path>
+					<path d="M16793.5 797.2 L16793.5 964 L3128.5 1628.3746251278976 L3128.5 1628.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18206.3 822.0 L18214.2 829.3 L18203.9 832.4 L18196.0 825.2 Z"></path>
+						<path d="M16798.8 787.8 L16793.5 797.2 L16788.2 787.8 L16793.5 778.5 Z"></path>
 					</g>
-					<path d="M18214.5 794.9 L19523.75 964 L19523.75 1653 L19523.75 1653 L19523.75 2342 L19523.75 2342 L14735 2526.4775367931834 L14735.0 2526.5 " fill="none"></path>
+					<path d="M25461.8 450.5 L26170.25 531 L26170.25 747.5 L26170.25 747.5 L26170.25 964 L26170.25 964 L26170.25 1653 L26170.25 1653 L26170.25 2342 L26170.25 2342 L12292.75 2526.0923074187353 L12292.8 2526.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18205.9 788.4 L18214.5 794.9 L18204.6 798.9 L18196.0 792.5 Z"></path>
+						<path d="M25453.1 444.1 L25461.8 450.5 L25451.9 454.7 L25443.3 448.4 Z"></path>
 					</g>
-					<path d="M13532.0 399.7 L14152.25 531 L17500 727.1138808090374 L17500.0 727.1 " fill="none"></path>
-					<path d="M13533.1 394.5 L13532.0 399.7 L13530.9 404.9 L13519.0 396.9 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M19466.2 401.5 L19879.75 531 L18196 710.4176818014028 L18196.0 710.4 " fill="none"></path>
+						<path d="M26923.4 110.2 L24859.25 233 L24859.25 253 L24859.3 253.0 " fill="none"></path>
+					</g>
+					<path d="M26923.8 115.5 L26923.4 110.2 L26923.1 104.9 L26936.8 109.4 Z"></path>
+					<path d="M25456.5 463.0 L25958.25 531 L25958.25 663.5 L25958.3 663.5 " fill="none"></path>
+					<path d="M25457.2 457.7 L25456.5 463.0 L25455.7 468.3 L25443.3 461.2 Z"></path>
+					<path d="M25456.3 510.7 L25550.25 531 L25550.25 678.5 L25550.3 678.5 " fill="none"></path>
+					<path d="M25457.4 505.5 L25456.3 510.7 L25455.2 516.0 L25443.3 507.9 Z"></path>
+					<path d="M25059.9 518.5 L25078.25 531 L25078.25 678.5 L25078.3 678.5 " fill="none"></path>
+					<path d="M25062.9 514.1 L25059.9 518.5 L25056.9 522.9 L25048.9 511.0 Z"></path>
+					<path d="M24593.7 517.0 L24566.25 531 L24566.25 671 L24566.3 671.0 " fill="none"></path>
+					<path d="M24596.1 521.8 L24593.7 517.0 L24591.3 512.3 L24605.6 511.0 Z"></path>
+					<path d="M24118.3 910.2 L24118.25 964 L24118.25 1637.5 L24118.3 1637.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M24123.6 900.8 L24118.3 910.2 L24112.9 900.8 L24118.3 891.5 Z"></path>
 					</g>
-					<path d="M19467.8 396.4 L19466.2 401.5 L19464.6 406.6 L19453.5 397.5 Z"></path>
-					<path d="M21076.0 892.2 L21121.75 964 L21121.75 1653 L21121.75 1653 L21121.75 2342 L21121.75 2342 L21121.75 2528.5 L21121.75 2528.5 L21121.75 2715 L21121.75 2715 L14388.75 2750.2435122382776 L14388.8 2750.2 " fill="none"></path>
+					<path d="M24262.2 502.1 L24118.25 531 L24118.25 603.5 L24118.3 603.5 " fill="none"></path>
+					<path d="M24263.2 507.3 L24262.2 502.1 L24261.1 496.8 L24275.3 499.4 Z"></path>
+					<path d="M23734.3 850.2 L23734.25 964 L23734.25 1637.5 L23734.3 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21075.5 881.5 L21076.0 892.2 L21066.5 887.2 L21066.0 876.5 Z"></path>
+						<path d="M23739.6 840.8 L23734.3 850.2 L23728.9 840.8 L23734.3 831.5 Z"></path>
 					</g>
-					<path d="M21151.3 888.5 L21241 964 L21241 1653 L21241 1653 L21241 2342 L21241 2342 L21241 2528.5 L21241 2528.5 L21241 2715 L21241 2715 L16931.5 2749.620332654447 L16931.5 2749.6 " fill="none"></path>
+					<path d="M24262.0 461.1 L23734.25 531 L23734.25 663.5 L23734.3 663.5 " fill="none"></path>
+					<path d="M24262.7 466.4 L24262.0 461.1 L24261.3 455.8 L24275.3 459.3 Z"></path>
+					<path d="M3142.8 2093.5 L3436.5 2342 L11929.75 2524.5978990749013 L11929.8 2524.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21147.6 878.4 L21151.3 888.5 L21140.7 886.6 L21137.0 876.5 Z"></path>
+						<path d="M3139.1 2083.4 L3142.8 2093.5 L3132.2 2091.6 L3128.5 2081.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M19470.5 401.2 L19919.75 531 L20667.75 683.2011278195489 L20667.8 683.2 " fill="none"></path>
+					<path d="M3142.4 2116.0 L3396.5 2342 L15365.25 2527.6237396311926 L15365.3 2527.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M3139.0 2105.8 L3142.4 2116.0 L3131.9 2113.8 L3128.5 2103.6 Z"></path>
 					</g>
-					<path d="M19471.9 396.1 L19470.5 401.2 L19469.0 406.3 L19457.7 397.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M21200.9 401.6 L21603.5 531 L21299.75 637.1103267446551 L21299.8 637.1 " fill="none"></path>
+					<path d="M2136.6 2337.2 L2133.25 2342 L2133.25 2528.5 L2133.25 2528.5 L2133.25 2715 L2133.25 2715 L14827 2750.363491004689 L14827.0 2750.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M2146.4 2332.7 L2136.6 2337.2 L2137.7 2326.5 L2147.4 2322.0 Z"></path>
 					</g>
-					<path d="M21202.5 396.5 L21200.9 401.6 L21199.3 406.7 L21188.2 397.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M26170.3 113.8 L25149.5 233 L25149.5 382 L25149.5 382 L25149.5 531 L25149.5 531 L25149.5 747.5 L25149.5 747.5 L25149.5 964 L25149.5 964 L25149.5 1584 L25149.5 1584.0 " fill="none"></path>
+					<path d="M2103.3 2250.9 L2024.25 2342 L2024.25 2513 L2024.3 2513.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M2113.4 2247.4 L2103.3 2250.9 L2105.4 2240.4 L2115.5 2236.8 Z"></path>
 					</g>
-					<path d="M26170.9 119.1 L26170.3 113.8 L26169.6 108.5 L26183.5 112.2 Z"></path>
-					<path d="M26289.7 450.1 L25573.5 531 L25573.5 747.5 L25573.5 747.5 L25573.5 964 L25573.5 964 L25573.5 1653 L25573.5 1653 L25573.5 2342 L25573.5 2342 L13835 2525.660255872483 L13835.0 2525.7 " fill="none"></path>
+					<path d="M2102.8 2213.9 L1984.25 2342 L12609.75 2527.5830445776364 L12609.8 2527.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26299.6 454.3 L26289.7 450.1 L26298.4 443.7 L26308.3 448.0 Z"></path>
+						<path d="M2113.1 2210.7 L2102.8 2213.9 L2105.2 2203.4 L2115.5 2200.2 Z"></path>
 					</g>
+					<path d="M2399.2 775.1 L2312 964 L2320.99854862119 984 L2321.0 984.0 " fill="none"></path>
+					<path d="M2404.1 777.3 L2399.2 775.1 L2394.4 772.9 L2404.8 763.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M26294.6 118.4 L26892.25 233 L26892.25 253 L26892.3 253.0 " fill="none"></path>
-					</g>
-					<path d="M26295.6 113.2 L26294.6 118.4 L26293.6 123.6 L26281.5 115.9 Z"></path>
-					<path d="M26295.0 462.4 L25785.5 531 L25785.5 663.5 L25785.5 663.5 " fill="none"></path>
-					<path d="M26295.7 467.7 L26295.0 462.4 L26294.3 457.1 L26308.3 460.6 Z"></path>
-					<path d="M26295.2 509.3 L26193.5 531 L26193.5 678.5 L26193.5 678.5 " fill="none"></path>
-					<path d="M26296.3 514.5 L26295.2 509.3 L26294.1 504.1 L26308.3 506.5 Z"></path>
-					<path d="M26684.8 518.3 L26665.5 531 L26665.5 678.5 L26665.5 678.5 " fill="none"></path>
-					<path d="M26687.7 522.8 L26684.8 518.3 L26681.9 513.9 L26695.9 511.0 Z"></path>
-					<path d="M27151.0 517.2 L27177.5 531 L27177.5 671 L27177.5 671.0 " fill="none"></path>
-					<path d="M27153.5 512.4 L27151.0 517.2 L27148.6 521.9 L27139.2 511.0 Z"></path>
-					<path d="M27625.5 910.2 L27625.5 964 L27625.5 1637.5 L27625.5 1637.5 " fill="none"></path>
+						<path d="M1692.7 775.1 L1605.5 964 L2115.5 1309.6861780619774 L2115.5 1309.7 " fill="none"></path>
+					</g>
+					<path d="M1697.6 777.3 L1692.7 775.1 L1687.9 772.9 L1698.3 763.0 Z"></path>
+					<path d="M13712.3 788.3 L15291.25 964 L15291.25 1653 L15291.25 1653 L15291.25 2342 L15291.25 2342 L15527.349195710456 2513 L15527.3 2513.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27630.8 900.8 L27625.5 910.2 L27620.2 900.8 L27625.5 891.5 Z"></path>
+						<path d="M13703.6 782.0 L13712.3 788.3 L13702.4 792.6 L13693.8 786.2 Z"></path>
 					</g>
-					<path d="M27489.3 503.3 L27625.5 531 L27625.5 603.5 L27625.5 603.5 " fill="none"></path>
-					<path d="M27490.4 498.1 L27489.3 503.3 L27488.3 508.6 L27476.3 500.7 Z"></path>
-					<path d="M28009.5 850.2 L28009.5 964 L28009.5 1637.5 L28009.5 1637.5 " fill="none"></path>
+					<path d="M13712.3 790.9 L15175.75 964 L15175.75 1637.5 L15175.8 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28014.8 840.8 L28009.5 850.2 L28004.2 840.8 L28009.5 831.5 Z"></path>
+						<path d="M13703.6 784.5 L13712.3 790.9 L13702.4 795.1 L13693.8 788.7 Z"></path>
 					</g>
-					<path d="M27489.5 461.6 L28009.5 531 L28009.5 663.5 L28009.5 663.5 " fill="none"></path>
-					<path d="M27490.2 456.4 L27489.5 461.6 L27488.8 466.9 L27476.3 459.9 Z"></path>
-					<path d="M8919.8 812.7 L8919.75 964 L8934.779027576198 984 L8934.8 984.0 " fill="none"></path>
+					<path d="M13711.9 834.9 L14253.25 964 L14253.25 1637.5 L14253.3 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8925.1 803.3 L8919.8 812.7 L8914.4 803.3 L8919.8 794.0 Z"></path>
+						<path d="M13704.1 827.5 L13711.9 834.9 L13701.6 837.9 L13693.8 830.5 Z"></path>
 					</g>
-					<path d="M9190.4 403.2 L8919.75 531 L8919.75 701 L8919.8 701.0 " fill="none"></path>
-					<path d="M9192.7 408.0 L9190.4 403.2 L9188.1 398.4 L9202.4 397.5 Z"></path>
-					<path d="M9311.8 835.2 L9311.75 964 L9315.400217706821 984 L9315.4 984.0 " fill="none"></path>
+					<path d="M13711.8 847.0 L14142.25 964 L14142.25 1653 L14142.25 1653 L14142.25 2342 L14142.25 2342 L16566.75 2525.027423598462 L16566.8 2525.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9317.1 825.8 L9311.8 835.2 L9306.4 825.8 L9311.8 816.5 Z"></path>
+						<path d="M13704.2 839.4 L13711.8 847.0 L13701.4 849.7 L13693.8 842.1 Z"></path>
 					</g>
-					<path d="M9249.3 409.4 L9311.75 531 L9311.75 678.5 L9311.8 678.5 " fill="none"></path>
-					<path d="M9254.0 406.9 L9249.3 409.4 L9244.6 411.8 L9243.2 397.5 Z"></path>
-					<path d="M13852.4 2450.0 L13865 2445 L13872.5 2445 L13872.5 2445 L13880 2528.5 L13880 2528.5 L13872.5 2612 L13872.5 2612 L13865 2612 L13865 2612 L13835 2600.1560283687945 L13835.0 2600.2 " fill="none"></path>
+					<path d="M12980.1 872.5 L12712.25 964 L12653.795718432511 1411.5 L12653.8 1411.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13841.7 2448.5 L13852.4 2450.0 L13845.6 2458.4 L13835.0 2456.8 Z"></path>
+						<path d="M12990.6 874.5 L12980.1 872.5 L12987.2 864.4 L12997.8 866.4 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M5990.2 1679.8 L6402 2342 L13472 2523.832034751431 L13472.0 2523.8 " fill="none"></path>
+					<path d="M12980.0 865.1 L12672.25 964 L17529.25 1594.4583647324794 L17529.3 1594.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M12990.5 867.3 L12980.0 865.1 L12987.2 857.1 L12997.8 859.4 Z"></path>
 					</g>
-					<path d="M5994.7 1677.0 L5990.2 1679.8 L5985.7 1682.6 L5983.1 1668.5 Z"></path>
-					<path d="M9703.8 812.7 L9703.75 964 L9696.021407837445 984 L9696.0 984.0 " fill="none"></path>
+					<path d="M12979.9 858.5 L12632.25 964 L13312.845065312047 1471.5 L13312.8 1471.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9709.1 803.3 L9703.8 812.7 L9698.4 803.3 L9703.8 794.0 Z"></path>
+						<path d="M12990.4 860.9 L12979.9 858.5 L12987.3 850.7 L12997.8 853.1 Z"></path>
 					</g>
-					<path d="M9296.7 401.5 L9703.75 531 L9703.75 701 L9703.8 701.0 " fill="none"></path>
-					<path d="M9298.3 396.5 L9296.7 401.5 L9295.1 406.6 L9284.0 397.5 Z"></path>
-					<path d="M19899.8 797.2 L19899.75 964 L9944 1619.6440297259194 L9944.0 1619.6 " fill="none"></path>
+					<path d="M12979.6 832.1 L12408.25 964 L18612.25 1608.3406692794695 L18612.3 1608.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19905.1 787.8 L19899.8 797.2 L19894.4 787.8 L19899.8 778.5 Z"></path>
+						<path d="M12989.9 835.2 L12979.6 832.1 L12987.5 824.8 L12997.8 827.9 Z"></path>
 					</g>
-					<path d="M10095.8 812.7 L10095.75 964 L9944 1122.8389669578428 L9944.0 1122.8 " fill="none"></path>
+					<path d="M12979.5 828.6 L12368.25 964 L16067.25 1582.8202015296831 L16067.3 1582.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10101.1 803.3 L10095.8 812.7 L10090.4 803.3 L10095.8 794.0 Z"></path>
+						<path d="M12989.8 831.8 L12979.5 828.6 L12987.5 821.4 L12997.8 824.6 Z"></path>
 					</g>
-					<path d="M9324.4 397.4 L10095.75 531 L10095.75 701 L10095.8 701.0 " fill="none"></path>
-					<path d="M9325.3 392.2 L9324.4 397.4 L9323.5 402.7 L9311.3 395.2 Z"></path>
-					<path d="M10971.8 812.7 L10971.75 964 L9944 1425.5413068274402 L9944.0 1425.5 " fill="none"></path>
+					<path d="M12979.4 818.9 L12234.25 964 L12234.25 1653 L12234.25 1653 L12234.25 2342 L12234.25 2342 L12626.678954423593 2513 L12626.7 2513.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10977.1 803.3 L10971.8 812.7 L10966.4 803.3 L10971.8 794.0 Z"></path>
+						<path d="M12989.6 822.3 L12979.4 818.9 L12987.6 811.8 L12997.8 815.3 Z"></path>
+					</g>
+					<path d="M12747.0 389.2 L11091.25 531 L12997.75 714.081503659348 L12997.8 714.1 " fill="none"></path>
+					<path d="M12747.4 394.5 L12747.0 389.2 L12746.5 383.9 L12760.3 388.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M17509.0 399.8 L16773.5 531 L13693.75 725.5199839544891 L13693.8 725.5 " fill="none"></path>
+					</g>
+					<path d="M17509.9 405.1 L17509.0 399.8 L17508.0 394.6 L17522.1 397.5 Z"></path>
+					<path d="M9281.3 401.0 L8467.25 531 L8467.25 716.5 L8467.3 716.5 " fill="none"></path>
+					<path d="M9282.2 406.3 L9281.3 401.0 L9280.5 395.8 L9294.5 398.9 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M21906.4 404.6 L21435.25 531 L21435.25 686 L21435.3 686.0 " fill="none"></path>
 					</g>
-					<path d="M9324.5 389.7 L10971.75 531 L10971.75 701 L10971.8 701.0 " fill="none"></path>
-					<path d="M9325.0 384.3 L9324.5 389.7 L9324.1 395.0 L9311.3 388.5 Z"></path>
-					<path d="M8917.6 2156.6 L8726.25 2342 L13472 2521.630092850982 L13472.0 2521.6 " fill="none"></path>
+					<path d="M21907.8 409.8 L21906.4 404.6 L21905.0 399.5 L21919.3 401.2 Z"></path>
+					<path d="M13646.4 1851.5 L13869.25 2342 L15518.25 2525.113128907413 L15518.3 2525.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8928.0 2154.0 L8917.6 2156.6 L8920.6 2146.3 L8931.0 2143.7 Z"></path>
+						<path d="M13647.4 1840.8 L13646.4 1851.5 L13637.7 1845.2 L13638.7 1834.5 Z"></path>
 					</g>
-					<path d="M8918.0 2186.3 L8766.25 2342 L13125.5 2526.1137122799073 L13125.5 2526.1 " fill="none"></path>
+					<path d="M13635.0 1851.9 L13829.25 2342 L16566.75 2525.417909107239 L16566.8 2525.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8928.3 2183.3 L8918.0 2186.3 L8920.7 2175.9 L8931.0 2172.9 Z"></path>
+						<path d="M13636.6 1841.2 L13635.0 1851.9 L13626.6 1845.1 L13628.2 1834.5 Z"></path>
 					</g>
-					<path d="M9961.4 1858.4 L11194.75 2342 L11194.75 2528.5 L11194.75 2528.5 L11194.75 2715 L11194.75 2715 L14290.75 2749.9468998410175 L14290.8 2749.9 " fill="none"></path>
+					<path d="M13623.6 1852.2 L13789.25 2342 L13789.25 2528.5 L13789.25 2528.5 L13789.25 2715 L13789.25 2715 L14827 2748.899355877617 L14827.0 2748.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9954.6 1850.0 L9961.4 1858.4 L9950.7 1860.0 L9944.0 1851.6 Z"></path>
+						<path d="M13625.7 1841.6 L13623.6 1852.2 L13615.6 1845.0 L13617.6 1834.5 Z"></path>
 					</g>
-					<path d="M9961.5 1846.5 L11303.75 2342 L11303.75 2513 L11303.8 2513.0 " fill="none"></path>
+					<path d="M13507.6 1852.6 L13388.5 2342 L13388.5 2528.5 L13388.5 2528.5 L13388.5 2715 L13388.5 2715 L16448.5 2749.2735447231425 L16448.5 2749.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9954.6 1838.2 L9961.5 1846.5 L9950.9 1848.2 L9944.0 1840.0 Z"></path>
+						<path d="M13515.0 1844.8 L13507.6 1852.6 L13504.7 1842.3 L13512.1 1834.5 Z"></path>
 					</g>
-					<path d="M9961.6 1842.4 L11343.75 2342 L14630 2525.567390490453 L14630.0 2525.6 " fill="none"></path>
+					<path d="M13433.9 1850.4 L13129.25 2342 L12701.062332439678 2513 L12701.1 2513.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9954.6 1834.2 L9961.6 1842.4 L9951.0 1844.3 L9944.0 1836.1 Z"></path>
+						<path d="M13443.4 1845.2 L13433.9 1850.4 L13434.3 1839.6 L13443.8 1834.5 Z"></path>
+					</g>
+					<path d="M12747.0 389.0 L11051.25 531 L11051.25 747.5 L11051.25 747.5 L11051.25 964 L11051.25 964 L13010.25 1502.822754491018 L13010.3 1502.8 " fill="none"></path>
+					<path d="M12747.4 394.3 L12747.0 389.0 L12746.5 383.7 L12760.3 387.9 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M17488.5 399.4 L16577.5 531 L16577.5 747.5 L16577.5 747.5 L16577.5 964 L16577.5 964 L14102.25 1528.483988415391 L14102.3 1528.5 " fill="none"></path>
+					</g>
+					<path d="M17489.3 404.7 L17488.5 399.4 L17487.7 394.1 L17501.7 397.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M1688.2 774.2 L1565.5 964 L13010.25 1621.6263161186748 L13010.3 1621.6 " fill="none"></path>
 					</g>
-					<path d="M3519.0 769.3 L3880 964 L8931 1590.2058479532163 L8931.0 1590.2 " fill="none"></path>
-					<path d="M3521.5 764.6 L3519.0 769.3 L3516.4 774.0 L3507.2 763.0 Z"></path>
+					<path d="M1692.7 777.1 L1688.2 774.2 L1683.8 771.3 L1695.5 763.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M1902.4 772.8 L2079 964 L8931 1605.574777468234 L8931.0 1605.6 " fill="none"></path>
+						<path d="M20416.6 410.4 L20384.25 531 L20384.25 747.5 L20384.25 747.5 L20384.25 964 L20384.25 964 L14102.25 1597.9042179261862 L14102.3 1597.9 " fill="none"></path>
 					</g>
-					<path d="M1906.3 769.2 L1902.4 772.8 L1898.4 776.4 L1893.3 763.0 Z"></path>
-					<path d="M20371.8 804.7 L20371.75 964 L9944 1621.0839106477354 L9944.0 1621.1 " fill="none"></path>
+					<path d="M20421.8 411.8 L20416.6 410.4 L20411.5 409.0 L20420.1 397.5 Z"></path>
+					<path d="M224.5 812.7 L224.5 964 L224.5 1637.5 L224.5 1637.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20377.1 795.3 L20371.8 804.7 L20366.4 795.3 L20371.8 786.0 Z"></path>
+						<path d="M229.8 803.3 L224.5 812.7 L219.2 803.3 L224.5 794.0 Z"></path>
 					</g>
-					<path d="M28728.2 429.9 L29080.5 531 L29080.5 732 L29080.5 732.0 " fill="none"></path>
+					<path d="M3938.4 385.5 L224.5 531 L224.5 701 L224.5 701.0 " fill="none"></path>
+					<path d="M3938.6 390.8 L3938.4 385.5 L3938.2 380.2 L3951.8 385.0 Z"></path>
+					<path d="M15826.7 1880.2 L16126.5 2342 L15579.25 2518.654478580701 L15579.3 2518.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28720.7 422.2 L28728.2 429.9 L28717.8 432.5 L28710.3 424.8 Z"></path>
+						<path d="M15826.1 1869.4 L15826.7 1880.2 L15817.1 1875.2 L15816.5 1864.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M26294.8 109.9 L28561.25 233 L28561.25 298 L28561.3 298.0 " fill="none"></path>
+					<path d="M15799.6 1881.0 L16043 2342 L15473.382037533513 2513 L15473.4 2513.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M15800.0 1870.3 L15799.6 1881.0 L15790.6 1875.2 L15790.9 1864.5 Z"></path>
 					</g>
-					<path d="M26295.1 104.6 L26294.8 109.9 L26294.5 115.2 L26281.5 109.2 Z"></path>
-					<path d="M21747.3 454.7 L21747.25 531 L21747.25 596 L21747.3 596.0 " fill="none"></path>
+					<path d="M15621.3 1882.6 L15505.25 2342 L12714.75 2525.056014773127 L12714.8 2525.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21752.6 445.3 L21747.3 454.7 L21741.9 445.3 L21747.3 436.0 Z"></path>
+						<path d="M15628.7 1874.9 L15621.3 1882.6 L15618.4 1872.2 L15625.8 1864.5 Z"></path>
+					</g>
+					<path d="M2375.3 770.0 L2058.75 964 L15331.25 1635.396240960317 L15331.3 1635.4 " fill="none"></path>
+					<path d="M2378.1 774.5 L2375.3 770.0 L2372.6 765.4 L2386.7 763.0 Z"></path>
+					<path d="M19806.2 887.3 L19750.25 964 L16027.25 1594.10243183493 L16027.3 1594.1 " fill="none"></path>
+					<path d="M19810.6 890.4 L19806.2 887.3 L19801.9 884.1 L19814.1 876.5 Z"></path>
+					<path d="M28515.4 795.6 L27603.25 964 L16027.25 1632.8916470982892 L16027.3 1632.9 " fill="none"></path>
+					<path d="M28516.4 800.9 L28515.4 795.6 L28514.4 790.4 L28528.5 793.2 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M17487.3 398.9 L16537.5 531 L16537.5 747.5 L16537.5 747.5 L16537.5 964 L16537.5 964 L15942.704100145138 1441.5 L15942.7 1441.5 " fill="none"></path>
+					</g>
+					<path d="M17488.0 404.2 L17487.3 398.9 L17486.6 393.6 L17500.5 397.1 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M1684.1 773.3 L1525.5 964 L15331.25 1636.0594718714121 L15331.3 1636.1 " fill="none"></path>
 					</g>
-					<path d="M14513.6 108.4 L21747.25 233 L21747.25 328 L21747.3 328.0 " fill="none"></path>
-					<path d="M14513.7 103.1 L14513.6 108.4 L14513.5 113.7 L14500.3 108.2 Z"></path>
-					<path d="M22010.0 908.8 L22100 964 L22100 1653 L22100 1653 L22100 2342 L22100 2342 L13238.5 2527.3184290199597 L13238.5 2527.3 " fill="none"></path>
+					<path d="M1688.2 776.7 L1684.1 773.3 L1680.0 769.8 L1692.6 763.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M20409.6 409.2 L20344.25 531 L20344.25 747.5 L20344.25 747.5 L20344.25 964 L20344.25 964 L16027.25 1601.60192926045 L16027.3 1601.6 " fill="none"></path>
+					</g>
+					<path d="M20414.3 411.8 L20409.6 409.2 L20404.9 406.7 L20415.9 397.5 Z"></path>
+					<path d="M26454.8 865.2 L26454.75 964 L25288.53809869376 1584 L25288.5 1584.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22004.8 899.3 L22010.0 908.8 L21999.3 908.4 L21994.1 899.0 Z"></path>
+						<path d="M26460.1 855.8 L26454.8 865.2 L26449.4 855.8 L26454.8 846.5 Z"></path>
 					</g>
-					<path d="M22011.8 867.4 L22225 964 L22225 1637.5 L22225.0 1637.5 " fill="none"></path>
+					<path d="M26515.7 475.0 L26454.75 531 L26454.75 648.5 L26454.8 648.5 " fill="none"></path>
+					<path d="M26519.3 478.9 L26515.7 475.0 L26512.1 471.1 L26525.5 466.0 Z"></path>
+					<path d="M20766.3 797.2 L20766.25 964 L16027.25 1605.865736190289 L16027.3 1605.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22005.5 858.7 L22011.8 867.4 L22001.0 868.4 L21994.8 859.7 Z"></path>
+						<path d="M20771.6 787.8 L20766.3 797.2 L20760.9 787.8 L20766.3 778.5 Z"></path>
 					</g>
-					<path d="M1601.0 135.3 L1601 233 L1601 351 L1601.0 351.0 " fill="none"></path>
-					<path d="M1606.3 135.3 L1601.0 135.3 L1595.7 135.3 L1601.0 122.0 Z"></path>
-					<g data-name="StudyDesignInterventionsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="0.0" y="716.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M0.0 747.5 L296.0 747.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M26923.4 108.1 L21990.75 233 L21990.75 351 L21990.8 351.0 " fill="none"></path>
+					</g>
+					<path d="M26923.6 113.4 L26923.4 108.1 L26923.3 102.7 L26936.8 107.7 Z"></path>
+					<g data-name="StudyFormValidationSet">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
+							<rect x="709.0" y="2490.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
+							<path d="M709.0 2521.0 L1096.0 2521.0" fill="none" data-name="StudyFormValidationSet"></path>
 						</g>
-						<g transform="translate(0, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
+						<g transform="translate(709, 2490)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
+								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
+						<g transform="translate(709, 2521)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="1495.0" y="351.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M1495.0 382.0 L1707.0 382.0" fill="none" data-name="StudyDesignPageWidget"></path>
+					<g data-name="Enum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
+							<rect x="0.0" y="1637.5" height="31.0" width="61.0" data-name="Enum"></rect>
 						</g>
-						<g transform="translate(1495, 351)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
+						<g transform="translate(0, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1495, 382)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
+					</g>
+					<g data-name="StudyFormScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
+							<rect x="7503.8" y="686.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
+							<path d="M7503.8 717.0 L7891.8 717.0" fill="none" data-name="StudyFormScaffold"></path>
+							<path d="M7503.8 778.0 L7891.8 778.0" fill="none" data-name="StudyFormScaffold"></path>
+						</g>
+						<g transform="translate(7503.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
+								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InterventionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="336.0" y="716.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M336.0 747.5 L711.0 747.5" fill="none" data-name="InterventionFormView"></path>
-						</g>
-						<g transform="translate(336, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
-								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
+						<g transform="translate(7503.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(336, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
+						<g transform="translate(7503.75, 778)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="6483.0" y="1419.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M6483.0 1450.0 L7338.0 1450.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M6483.0 1676.0 L7338.0 1676.0" fill="none" data-name="InterventionFormViewModel"></path>
+					<g data-name="T Function(WidgetRef)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
+							<rect x="8085.5" y="1637.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
 						</g>
-						<g transform="translate(6483, 1419)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
-								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6483, 1450)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6483, 1676)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="4568.0" y="701.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M4568.0 732.0 L4898.0 732.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M4568.0 763.0 L4898.0 763.0" fill="none" data-name="InterventionPreview"></path>
-						</g>
-						<g transform="translate(4568, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4568, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4568, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
+						<g transform="translate(8085.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="2668.0" y="1637.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
+					<g data-name="Widget Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
+							<rect x="7130.5" y="1637.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
 						</g>
-						<g transform="translate(2668, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
+						<g transform="translate(7130.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ConsumerWidget">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="9159.3" y="366.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+							<rect x="3951.8" y="366.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
 						</g>
-						<g transform="translate(9159.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+						<g transform="translate(3951.75, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
 								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="11387.3" y="328.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M11387.3 359.0 L11746.3 359.0" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M11387.3 390.0 L11746.3 390.0" fill="none" data-name="StudyScheduleFormView"></path>
+					<g data-name="StudyDesignEnrollmentFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
+							<rect x="10109.3" y="701.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
+							<path d="M10109.3 732.5 L10558.3 732.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
 						</g>
-						<g transform="translate(11387.25, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
+						<g transform="translate(10109.25, 701.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
+								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11387.25, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
+						<g transform="translate(10109.25, 732.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11387.25, 390)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
+					</g>
+					<g data-name="StudyDesignPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
+							<rect x="9294.5" y="351.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
+							<path d="M9294.5 382.0 L9506.5 382.0" fill="none" data-name="StudyDesignPageWidget"></path>
+						</g>
+						<g transform="translate(9294.5, 351)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
+								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
+								
+							</g>
+						</g>
+						<g transform="translate(9294.5, 382)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="11187.8" y="551.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M11187.8 582.0 L11945.8 582.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M11187.8 883.0 L11945.8 883.0" fill="none" data-name="StudyScheduleControls"></path>
+					<g data-name="EnrollmentFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
+							<rect x="23068.3" y="663.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
+							<path d="M23068.3 694.5 L23522.3 694.5" fill="none" data-name="EnrollmentFormData"></path>
+							<path d="M23068.3 785.5 L23522.3 785.5" fill="none" data-name="EnrollmentFormData"></path>
 						</g>
-						<g transform="translate(11187.75, 551)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
-								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
+						<g transform="translate(23068.25, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
+								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11187.75, 582)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
+						<g transform="translate(23068.25, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11187.75, 883)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
+						<g transform="translate(23068.25, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="14308.3" y="91.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
+					<g data-name="Participation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
+							<rect x="23360.3" y="1637.5" height="31.0" width="114.0" data-name="Participation"></rect>
 						</g>
-						<g transform="translate(14308.25, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
+						<g transform="translate(23360.25, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
+								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="28221.5" y="663.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M28221.5 694.5 L28511.5 694.5" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M28221.5 785.5 L28511.5 785.5" fill="none" data-name="InterventionTaskFormData"></path>
+					<g data-name="QuestionnaireFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
+							<rect x="24974.8" y="1584.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
+							<path d="M24974.8 1615.0 L25342.8 1615.0" fill="none" data-name="QuestionnaireFormData"></path>
+							<path d="M24974.8 1661.0 L25342.8 1661.0" fill="none" data-name="QuestionnaireFormData"></path>
 						</g>
-						<g transform="translate(28221.5, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
+						<g transform="translate(24974.75, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
+								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28221.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
+						<g transform="translate(24974.75, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28221.5, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
+						<g transform="translate(24974.75, 1661)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="28412.3" y="298.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M28412.3 329.0 L28710.3 329.0" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M28412.3 435.0 L28710.3 435.0" fill="none" data-name="IFormDataWithSchedule"></path>
-						</g>
-						<g transform="translate(28412.25, 298)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
-								
-							</g>
+					<g data-name="IStudyFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
+							<rect x="21919.3" y="351.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
+							<path d="M21919.3 382.0 L22062.3 382.0" fill="none" data-name="IStudyFormData"></path>
 						</g>
-						<g transform="translate(28412.25, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
+						<g transform="translate(21919.25, 351)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
+								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28412.25, 435)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
+						<g transform="translate(21919.25, 382)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="12881.5" y="1464.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M12881.5 1495.0 L13720.5 1495.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M12881.5 1646.0 L13720.5 1646.0" fill="none" data-name="InterventionsFormViewModel"></path>
+					<g data-name="EnrollmentFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
+							<rect x="17529.3" y="1404.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
+							<path d="M17529.3 1435.0 L18431.3 1435.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+							<path d="M17529.3 1661.0 L18431.3 1661.0" fill="none" data-name="EnrollmentFormViewModel"></path>
 						</g>
-						<g transform="translate(12881.5, 1464)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
-								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
+						<g transform="translate(17529.25, 1404)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
+								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12881.5, 1495)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
+						<g transform="translate(17529.25, 1435)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12881.5, 1646)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
+						<g transform="translate(17529.25, 1661)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="Study">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="15307.5" y="2513.0" height="31.0" width="61.0" data-name="Study"></rect>
+							<rect x="15518.3" y="2513.0" height="31.0" width="61.0" data-name="Study"></rect>
 						</g>
-						<g transform="translate(15307.5, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
+						<g transform="translate(15518.25, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
 								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
 								
@@ -2408,31 +2338,75 @@
 					</g>
 					<g data-name="GoRouter">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="17274.8" y="2513.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
+							<rect x="16566.8" y="2513.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
 						</g>
-						<g transform="translate(17274.75, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
+						<g transform="translate(16566.75, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
 								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="14290.8" y="2735.0" height="31.0" width="98.0" data-name="FormArray"></rect>
+					<g data-name="EnrollmentFormConsentItemDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
+							<rect x="16698.8" y="2422.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
+							<path d="M16698.8 2453.0 L17498.8 2453.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+							<path d="M16698.8 2529.0 L17498.8 2529.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
 						</g>
-						<g transform="translate(14290.75, 2735)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
+						<g transform="translate(16698.75, 2422)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
+						<g transform="translate(16698.75, 2453)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
+								
+							</g>
+						</g>
+						<g transform="translate(16698.75, 2529)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="15365.3" y="2513.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+						</g>
+						<g transform="translate(15365.25, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormArray">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
+							<rect x="14827.0" y="2735.0" height="31.0" width="98.0" data-name="FormArray"></rect>
+						</g>
+						<g transform="translate(14827, 2735)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="FormViewModelCollection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="16712.5" y="2735.0" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
+							<rect x="16448.5" y="2735.0" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
 						</g>
-						<g transform="translate(16712.5, 2735)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
+						<g transform="translate(16448.5, 2735)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
 								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
 								
@@ -2441,9 +2415,9 @@
 					</g>
 					<g data-name="FormGroup">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="14630.0" y="2513.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
+							<rect x="12609.8" y="2513.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
 						</g>
-						<g transform="translate(14630, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+						<g transform="translate(12609.75, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
 								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
 								
@@ -2452,20 +2426,56 @@
 					</g>
 					<g data-name="FormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="13378.0" y="366.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
+							<rect x="12760.3" y="366.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
 						</g>
-						<g transform="translate(13378, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
+						<g transform="translate(12760.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
 								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
+					<g data-name="WithQuestionnaireControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
+							<rect x="19592.3" y="618.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
+							<path d="M19592.3 649.5 L20224.3 649.5" fill="none" data-name="WithQuestionnaireControls"></path>
+							<path d="M19592.3 755.5 L20224.3 755.5" fill="none" data-name="WithQuestionnaireControls"></path>
+						</g>
+						<g transform="translate(19592.25, 618.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
+								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
+								
+							</g>
+						</g>
+						<g transform="translate(19592.25, 649.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(19592.25, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="IFormViewModelDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="19295.5" y="366.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
+							<rect x="17500.5" y="366.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
 						</g>
-						<g transform="translate(19295.5, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
+						<g transform="translate(17500.5, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
 								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
 								
@@ -2474,9 +2484,9 @@
 					</g>
 					<g data-name="IListActionProvider">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="1797.0" y="732.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
+							<rect x="1623.5" y="732.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
 						</g>
-						<g transform="translate(1797, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+						<g transform="translate(1623.5, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
 								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
 								
@@ -2485,373 +2495,460 @@
 					</g>
 					<g data-name="IProviderArgsResolver">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="21043.5" y="366.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
+							<rect x="20327.8" y="366.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
 						</g>
-						<g transform="translate(21043.5, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
+						<g transform="translate(20327.75, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
 								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="11626.8" y="1516.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M11626.8 1547.5 L12322.8 1547.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M11626.8 1728.5 L12322.8 1728.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-						</g>
-						<g transform="translate(11626.75, 1516.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
-								
-							</g>
+					<g data-name="ConsentItemFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
+							<rect x="27617.3" y="298.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
+							<path d="M27617.3 329.0 L27875.3 329.0" fill="none" data-name="ConsentItemFormData"></path>
+							<path d="M27617.3 420.0 L27875.3 420.0" fill="none" data-name="ConsentItemFormData"></path>
 						</g>
-						<g transform="translate(11626.75, 1547.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(27617.25, 298)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
+								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11626.75, 1728.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
+						<g transform="translate(27617.25, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="13125.5" y="2513.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(13125.5, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+						<g transform="translate(27617.25, 420)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="3371.0" y="732.0" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
+					<g data-name="IFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
+							<rect x="26936.8" y="91.0" height="31.0" width="98.0" data-name="IFormData"></rect>
 						</g>
-						<g transform="translate(3371, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
+						<g transform="translate(26936.75, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="21499.8" y="596.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M21499.8 627.0 L21994.8 627.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M21499.8 853.0 L21994.8 853.0" fill="none" data-name="WithScheduleControls"></path>
+					<g data-name="ConsentItemFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
+							<rect x="3168.5" y="1524.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
+							<path d="M3168.5 1555.0 L3864.5 1555.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+							<path d="M3168.5 1721.0 L3864.5 1721.0" fill="none" data-name="ConsentItemFormViewModel"></path>
 						</g>
-						<g transform="translate(21499.75, 596)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
+						<g transform="translate(3168.5, 1524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21499.75, 627)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
+						<g transform="translate(3168.5, 1555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21499.75, 853)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
+						<g transform="translate(3168.5, 1721)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PhaseSequence">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="17466.3" y="2513.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
+					<g data-name="ManagedFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
+							<rect x="2304.5" y="732.0" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
 						</g>
-						<g transform="translate(17466.25, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
-								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
+						<g transform="translate(2304.5, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
+								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="22003.3" y="283.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M22003.3 314.0 L22385.3 314.0" fill="none" data-name="InterventionFormData"></path>
-							<path d="M22003.3 435.0 L22385.3 435.0" fill="none" data-name="InterventionFormData"></path>
+					<g data-name="IScreenerQuestionLogicFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
+							<rect x="4586.5" y="1622.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
+							<path d="M4586.5 1653.0 L4918.5 1653.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
 						</g>
-						<g transform="translate(22003.25, 283)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
+						<g transform="translate(4586.5, 1622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
+								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22003.25, 314)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
+						<g transform="translate(4586.5, 1653)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22003.25, 435)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
+					</g>
+					<g data-name="ScreenerQuestionLogicFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
+							<rect x="29649.5" y="1584.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
+							<path d="M29649.5 1615.0 L30073.5 1615.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+							<path d="M29649.5 1646.0 L30073.5 1646.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+						</g>
+						<g transform="translate(29649.5, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
+								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="26183.5" y="91.0" height="31.0" width="98.0" data-name="IFormData"></rect>
+						<g transform="translate(29649.5, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
+								
+							</g>
 						</g>
-						<g transform="translate(26183.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
+						<g transform="translate(29649.5, 1646)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="22739.0" y="1554.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M22739.0 1585.0 L23035.0 1585.0" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M22739.0 1691.0 L23035.0 1691.0" fill="none" data-name="StudyScheduleFormData"></path>
+					<g data-name="ScreenerQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
+							<rect x="14051.0" y="2362.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
+							<path d="M14051.0 2393.0 L14613.0 2393.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+							<path d="M14051.0 2574.0 L14613.0 2574.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(22739, 1554)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
+						<g transform="translate(14051, 2362)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
+								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22739, 1585)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
+						<g transform="translate(14051, 2393)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22739, 1691)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
+						<g transform="translate(14051, 2574)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="23970.5" y="351.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M23970.5 382.0 L24113.5 382.0" fill="none" data-name="IStudyFormData"></path>
+					<g data-name="FormConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
+							<rect x="29410.8" y="91.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
 						</g>
-						<g transform="translate(23970.5, 351)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23970.5, 382)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="4115.0" y="716.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M4115.0 747.5 L4528.0 747.5" fill="none" data-name="InterventionTaskFormView"></path>
-						</g>
-						<g transform="translate(4115, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4115, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
+						<g transform="translate(29410.75, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
+								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="22808.5" y="678.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M22808.5 709.5 L23202.5 709.5" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M22808.5 770.5 L23202.5 770.5" fill="none" data-name="InterventionsFormData"></path>
+					<g data-name="QuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
+							<rect x="2115.5" y="984.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M2115.5 1015.0 L3128.5 1015.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M2115.5 2036.0 L3128.5 2036.0" fill="none" data-name="QuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(22808.5, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
+						<g transform="translate(2115.5, 984)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
+								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22808.5, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
+						<g transform="translate(2115.5, 1015)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
+								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
+								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
+								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
+								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
+								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
+								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
+								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
+								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
+								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
+								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
+								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
+								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
+								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
+								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
+								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
+								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
+								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
+								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22808.5, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
+						<g transform="translate(2115.5, 2036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignReportsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="751.0" y="709.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M751.0 740.0 L1144.0 740.0" fill="none" data-name="StudyDesignReportsFormView"></path>
+					<g data-name="ConsentItemFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
+							<rect x="3076.0" y="716.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
+							<path d="M3076.0 747.5 L3457.0 747.5" fill="none" data-name="ConsentItemFormView"></path>
 						</g>
-						<g transform="translate(751, 709)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
+						<g transform="translate(3076, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
+								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(751, 740)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
+						<g transform="translate(3076, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="22425.3" y="313.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M22425.3 344.0 L22739.3 344.0" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M22425.3 405.0 L22739.3 405.0" fill="none" data-name="ReportItemFormData"></path>
+					<g data-name="DataReferenceIdentifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
+							<rect x="10608.3" y="335.5" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
+							<path d="M10608.3 366.5 L10812.3 366.5" fill="none" data-name="DataReferenceIdentifier"></path>
+							<path d="M10608.3 397.5 L10812.3 397.5" fill="none" data-name="DataReferenceIdentifier"></path>
 						</g>
-						<g transform="translate(22425.25, 313)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
+						<g transform="translate(10608.25, 335.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
+								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22425.25, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
+						<g transform="translate(10608.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22425.25, 405)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
+						<g transform="translate(10608.25, 397.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="22518.3" y="732.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
+					<g data-name="DataReference">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
+							<rect x="10642.8" y="91.0" height="31.0" width="135.0" data-name="DataReference"></rect>
 						</g>
-						<g transform="translate(22518.25, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
+						<g transform="translate(10642.75, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
+								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="4860.5" y="1584.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M4860.5 1615.0 L5569.5 1615.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M4860.5 1676.0 L5569.5 1676.0" fill="none" data-name="DataReferenceEditor"></path>
+					<g data-name="AverageSectionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
+							<rect x="6717.3" y="686.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
+							<path d="M6717.3 717.0 L7196.3 717.0" fill="none" data-name="AverageSectionFormView"></path>
+							<path d="M6717.3 778.0 L7196.3 778.0" fill="none" data-name="AverageSectionFormView"></path>
 						</g>
-						<g transform="translate(4860.5, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
+						<g transform="translate(6717.25, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4860.5, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
+						<g transform="translate(6717.25, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4860.5, 1676)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
+						<g transform="translate(6717.25, 778)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="5345.0" y="2513.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
+					<g data-name="ReportItemFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
+							<rect x="4958.5" y="1366.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
+							<path d="M4958.5 1397.5 L5945.5 1397.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<path d="M4958.5 1833.5 L5945.5 1833.5" fill="none" data-name="ReportItemFormViewModel"></path>
 						</g>
-						<g transform="translate(5345, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
+						<g transform="translate(4958.5, 1366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
+								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4958.5, 1397.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
+								
+							</g>
+						</g>
+						<g transform="translate(4958.5, 1833.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="TemporalAggregationFormatted">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="28639.3" y="0.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M28639.3 31.0 L29087.3 31.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M28639.3 137.0 L29087.3 137.0" fill="none" data-name="TemporalAggregationFormatted"></path>
+							<rect x="27668.5" y="0.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
+							<path d="M27668.5 31.0 L28116.5 31.0" fill="none" data-name="TemporalAggregationFormatted"></path>
+							<path d="M27668.5 137.0 L28116.5 137.0" fill="none" data-name="TemporalAggregationFormatted"></path>
 						</g>
-						<g transform="translate(28639.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
+						<g transform="translate(27668.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
 								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28639.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+						<g transform="translate(27668.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
@@ -2862,7 +2959,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(28639.25, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+						<g transform="translate(27668.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
@@ -2874,9 +2971,9 @@
 					</g>
 					<g data-name="TemporalAggregation">
 						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="28750.3" y="366.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
+							<rect x="28105.0" y="366.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
 						</g>
-						<g transform="translate(28750.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
+						<g transform="translate(28105, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
 								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
 								
@@ -2885,9 +2982,9 @@
 					</g>
 					<g data-name="IconData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="29220.3" y="366.5" height="31.0" width="87.0" data-name="IconData"></rect>
+							<rect x="27915.3" y="366.5" height="31.0" width="87.0" data-name="IconData"></rect>
 						</g>
-						<g transform="translate(29220.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
+						<g transform="translate(27915.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
 								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
 								
@@ -2896,17 +2993,17 @@
 					</g>
 					<g data-name="ImprovementDirectionFormatted">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="29127.3" y="0.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M29127.3 31.0 L29578.3 31.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M29127.3 137.0 L29578.3 137.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
+							<rect x="28180.0" y="0.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
+							<path d="M28180.0 31.0 L28631.0 31.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
+							<path d="M28180.0 137.0 L28631.0 137.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
 						</g>
-						<g transform="translate(29127.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
+						<g transform="translate(28180, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
 								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29127.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+						<g transform="translate(28180, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
@@ -2917,7 +3014,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(29127.25, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+						<g transform="translate(28180, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
@@ -2929,9 +3026,9 @@
 					</g>
 					<g data-name="ImprovementDirection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="29347.3" y="366.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
+							<rect x="28331.0" y="366.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
 						</g>
-						<g transform="translate(29347.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
+						<g transform="translate(28331, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
 								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
 								
@@ -2940,16 +3037,16 @@
 					</g>
 					<g data-name="ReportSectionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="4122.3" y="2475.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M4122.3 2506.0 L4505.3 2506.0" fill="none" data-name="ReportSectionType"></path>
+							<rect x="6452.3" y="2475.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
+							<path d="M6452.3 2506.0 L6835.3 2506.0" fill="none" data-name="ReportSectionType"></path>
 						</g>
-						<g transform="translate(4122.25, 2475)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
+						<g transform="translate(6452.25, 2475)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
 								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4122.25, 2506)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
+						<g transform="translate(6452.25, 2506)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
@@ -2959,150 +3056,58 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="5943.0" y="1637.5" height="31.0" width="61.0" data-name="Enum"></rect>
+					<g data-name="DataReferenceEditor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
+							<rect x="7336.5" y="1584.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
+							<path d="M7336.5 1615.0 L8045.5 1615.0" fill="none" data-name="DataReferenceEditor"></path>
+							<path d="M7336.5 1676.0 L8045.5 1676.0" fill="none" data-name="DataReferenceEditor"></path>
 						</g>
-						<g transform="translate(5943, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
+						<g transform="translate(7336.5, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
+								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="5040.8" y="686.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M5040.8 717.0 L5519.8 717.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M5040.8 778.0 L5519.8 778.0" fill="none" data-name="AverageSectionFormView"></path>
-						</g>
-						<g transform="translate(5040.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
+						<g transform="translate(7336.5, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5040.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5040.75, 778)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="3546.5" y="1366.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M3546.5 1397.5 L4533.5 1397.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M3546.5 1833.5 L4533.5 1833.5" fill="none" data-name="ReportItemFormViewModel"></path>
-						</g>
-						<g transform="translate(3546.5, 1366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
-								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3546.5, 1397.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3546.5, 1833.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="29932.8" y="335.5" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M29932.8 366.5 L30136.8 366.5" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M29932.8 397.5 L30136.8 397.5" fill="none" data-name="DataReferenceIdentifier"></path>
-						</g>
-						<g transform="translate(29932.75, 335.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29932.75, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29932.75, 397.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
+						<g transform="translate(7336.5, 1676)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="29967.3" y="91.0" height="31.0" width="135.0" data-name="DataReference"></rect>
+					<g data-name="ReactiveDropdownField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
+							<rect x="7316.3" y="2513.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
 						</g>
-						<g transform="translate(29967.25, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
+						<g transform="translate(7316.25, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
+								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="LinearRegressionSectionFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="5559.8" y="686.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M5559.8 717.0 L6038.8 717.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M5559.8 778.0 L6038.8 778.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<rect x="6198.3" y="686.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
+							<path d="M6198.3 717.0 L6677.3 717.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<path d="M6198.3 778.0 L6677.3 778.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
 						</g>
-						<g transform="translate(5559.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
+						<g transform="translate(6198.25, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5559.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+						<g transform="translate(6198.25, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
@@ -3110,7 +3115,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(5559.75, 778)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+						<g transform="translate(6198.25, 778)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
 								
@@ -3119,17 +3124,17 @@
 					</g>
 					<g data-name="ReportItemFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="8128.3" y="663.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M8128.3 694.5 L8595.3 694.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M8128.3 770.5 L8595.3 770.5" fill="none" data-name="ReportItemFormView"></path>
+							<rect x="4593.0" y="663.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
+							<path d="M4593.0 694.5 L5060.0 694.5" fill="none" data-name="ReportItemFormView"></path>
+							<path d="M4593.0 770.5 L5060.0 770.5" fill="none" data-name="ReportItemFormView"></path>
 						</g>
-						<g transform="translate(8128.25, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
+						<g transform="translate(4593, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
 								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8128.25, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+						<g transform="translate(4593, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
@@ -3138,7 +3143,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(8128.25, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+						<g transform="translate(4593, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
@@ -3149,28 +3154,67 @@
 					</g>
 					<g data-name="Widget Function(BuildContext)">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="7615.0" y="1637.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
+							<rect x="4290.5" y="1637.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
 						</g>
-						<g transform="translate(7615, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
+						<g transform="translate(4290.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
 								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
 					</g>
+					<g data-name="ReportItemFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
+							<rect x="27263.3" y="313.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
+							<path d="M27263.3 344.0 L27577.3 344.0" fill="none" data-name="ReportItemFormData"></path>
+							<path d="M27263.3 405.0 L27577.3 405.0" fill="none" data-name="ReportItemFormData"></path>
+						</g>
+						<g transform="translate(27263.25, 313)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
+								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(27263.25, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(27263.25, 405)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ReportSection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
+							<rect x="27356.3" y="732.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
+						</g>
+						<g transform="translate(27356.25, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
+								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="ReportsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="17681.8" y="1479.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M17681.8 1510.0 L18541.8 1510.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M17681.8 1676.0 L18541.8 1676.0" fill="none" data-name="ReportsFormViewModel"></path>
+							<rect x="18612.3" y="1479.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
+							<path d="M18612.3 1510.0 L19472.3 1510.0" fill="none" data-name="ReportsFormViewModel"></path>
+							<path d="M18612.3 1676.0 L19472.3 1676.0" fill="none" data-name="ReportsFormViewModel"></path>
 						</g>
-						<g transform="translate(17681.75, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
+						<g transform="translate(18612.25, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
 								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17681.75, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+						<g transform="translate(18612.25, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
@@ -3185,7 +3229,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(17681.75, 1676)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+						<g transform="translate(18612.25, 1676)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
@@ -3202,17 +3246,17 @@
 					</g>
 					<g data-name="ReportFormItemDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="15631.8" y="2422.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M15631.8 2453.0 L16474.8 2453.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M15631.8 2529.0 L16474.8 2529.0" fill="none" data-name="ReportFormItemDelegate"></path>
+							<rect x="17578.8" y="2422.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
+							<path d="M17578.8 2453.0 L18421.8 2453.0" fill="none" data-name="ReportFormItemDelegate"></path>
+							<path d="M17578.8 2529.0 L18421.8 2529.0" fill="none" data-name="ReportFormItemDelegate"></path>
 						</g>
-						<g transform="translate(15631.75, 2422)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
+						<g transform="translate(17578.75, 2422)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
 								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15631.75, 2453)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+						<g transform="translate(17578.75, 2453)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
@@ -3221,7 +3265,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(15631.75, 2529)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+						<g transform="translate(17578.75, 2529)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
@@ -3235,17 +3279,17 @@
 					</g>
 					<g data-name="ReportBadge">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="7378.0" y="1584.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M7378.0 1615.0 L7575.0 1615.0" fill="none" data-name="ReportBadge"></path>
-							<path d="M7378.0 1691.0 L7575.0 1691.0" fill="none" data-name="ReportBadge"></path>
+							<rect x="11961.3" y="1584.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
+							<path d="M11961.3 1615.0 L12158.3 1615.0" fill="none" data-name="ReportBadge"></path>
+							<path d="M11961.3 1691.0 L12158.3 1691.0" fill="none" data-name="ReportBadge"></path>
 						</g>
-						<g transform="translate(7378, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
+						<g transform="translate(11961.25, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
 								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7378, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+						<g transform="translate(11961.25, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
@@ -3254,7 +3298,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(7378, 1691)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+						<g transform="translate(11961.25, 1691)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
 								
@@ -3263,16 +3307,16 @@
 					</g>
 					<g data-name="ReportStatus">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="6015.0" y="2475.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M6015.0 2506.0 L6316.0 2506.0" fill="none" data-name="ReportStatus"></path>
+							<rect x="6925.3" y="2475.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
+							<path d="M6925.3 2506.0 L7226.3 2506.0" fill="none" data-name="ReportStatus"></path>
 						</g>
-						<g transform="translate(6015, 2475)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
+						<g transform="translate(6925.25, 2475)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
 								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6015, 2506)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
+						<g transform="translate(6925.25, 2506)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
@@ -3284,35 +3328,54 @@
 					</g>
 					<g data-name="BadgeType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="7794.8" y="2513.0" height="31.0" width="106.0" data-name="BadgeType"></rect>
+							<rect x="11783.8" y="2513.0" height="31.0" width="106.0" data-name="BadgeType"></rect>
 						</g>
-						<g transform="translate(7794.75, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
+						<g transform="translate(11783.75, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
 								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
 								
 							</g>
 						</g>
 					</g>
+					<g data-name="StudyDesignReportsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
+							<rect x="9676.3" y="709.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
+							<path d="M9676.3 740.0 L10069.3 740.0" fill="none" data-name="StudyDesignReportsFormView"></path>
+						</g>
+						<g transform="translate(9676.25, 709)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
+								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(9676.25, 740)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="ReportsFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="23242.5" y="686.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M23242.5 717.0 L23580.5 717.0" fill="none" data-name="ReportsFormData"></path>
-							<path d="M23242.5 763.0 L23580.5 763.0" fill="none" data-name="ReportsFormData"></path>
+							<rect x="22690.3" y="686.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
+							<path d="M22690.3 717.0 L23028.3 717.0" fill="none" data-name="ReportsFormData"></path>
+							<path d="M22690.3 763.0 L23028.3 763.0" fill="none" data-name="ReportsFormData"></path>
 						</g>
-						<g transform="translate(23242.5, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
+						<g transform="translate(22690.25, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
 								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23242.5, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+						<g transform="translate(22690.25, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23242.5, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+						<g transform="translate(22690.25, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
@@ -3320,1030 +3383,851 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInfoFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="13760.5" y="1411.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M13760.5 1442.5 L14456.5 1442.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M13760.5 1848.5 L14456.5 1848.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+					<g data-name="StudyDesignInterventionsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
+							<rect x="9340.3" y="716.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
+							<path d="M9340.3 747.5 L9636.3 747.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
 						</g>
-						<g transform="translate(13760.5, 1411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
+						<g transform="translate(9340.25, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13760.5, 1442.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
+						<g transform="translate(9340.25, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13760.5, 1848.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
+					</g>
+					<g data-name="StudyScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
+							<rect x="29063.5" y="551.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
+							<path d="M29063.5 582.0 L29821.5 582.0" fill="none" data-name="StudyScheduleControls"></path>
+							<path d="M29063.5 883.0 L29821.5 883.0" fill="none" data-name="StudyScheduleControls"></path>
+						</g>
+						<g transform="translate(29063.5, 551)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
+								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyDesignInfoFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="1184.0" y="716.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M1184.0 747.5 L1407.0 747.5" fill="none" data-name="StudyDesignInfoFormView"></path>
-						</g>
-						<g transform="translate(1184, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
+						<g transform="translate(29063.5, 582)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1184, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
+						<g transform="translate(29063.5, 883)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="23620.5" y="663.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M23620.5 694.5 L24034.5 694.5" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M23620.5 785.5 L24034.5 785.5" fill="none" data-name="StudyInfoFormData"></path>
+					<g data-name="PhaseSequence">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
+							<rect x="27021.3" y="2513.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
 						</g>
-						<g transform="translate(23620.5, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
+						<g transform="translate(27021.25, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
+								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23620.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
+					</g>
+					<g data-name="InterventionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
+							<rect x="8662.3" y="716.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
+							<path d="M8662.3 747.5 L9037.3 747.5" fill="none" data-name="InterventionFormView"></path>
+						</g>
+						<g transform="translate(8662.25, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
+								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23620.5, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
+						<g transform="translate(8662.25, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyContactInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="23777.0" y="1539.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M23777.0 1570.0 L24125.0 1570.0" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M23777.0 1721.0 L24125.0 1721.0" fill="none" data-name="StudyContactInfoFormData"></path>
-						</g>
-						<g transform="translate(23777, 1539)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
-								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
-								
-							</g>
+					<g data-name="InterventionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
+							<rect x="8422.3" y="1419.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
+							<path d="M8422.3 1450.0 L9277.3 1450.0" fill="none" data-name="InterventionFormViewModel"></path>
+							<path d="M8422.3 1676.0 L9277.3 1676.0" fill="none" data-name="InterventionFormViewModel"></path>
 						</g>
-						<g transform="translate(23777, 1570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
+						<g transform="translate(8422.25, 1419)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
+								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23777, 1721)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormValidationSet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="5588.0" y="2490.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M5588.0 2521.0 L5975.0 2521.0" fill="none" data-name="StudyFormValidationSet"></path>
-						</g>
-						<g transform="translate(5588, 2490)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
-								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
+						<g transform="translate(8422.25, 1450)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5588, 2521)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
+						<g transform="translate(8422.25, 1676)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="24114.5" y="686.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M24114.5 717.0 L24608.5 717.0" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M24114.5 763.0 L24608.5 763.0" fill="none" data-name="MeasurementsFormData"></path>
+					<g data-name="InterventionPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
+							<rect x="5828.3" y="701.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
+							<path d="M5828.3 732.0 L6158.3 732.0" fill="none" data-name="InterventionPreview"></path>
+							<path d="M5828.3 763.0 L6158.3 763.0" fill="none" data-name="InterventionPreview"></path>
 						</g>
-						<g transform="translate(24114.5, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
-								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
+						<g transform="translate(5828.25, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24114.5, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
+						<g transform="translate(5828.25, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24114.5, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
+						<g transform="translate(5828.25, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="10311.8" y="716.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M10311.8 747.5 L10755.8 747.5" fill="none" data-name="MeasurementSurveyFormView"></path>
-						</g>
-						<g transform="translate(10311.75, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
-								
-							</g>
+					<g data-name="InterventionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
+							<rect x="5985.5" y="1637.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(10311.75, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
+						<g transform="translate(5985.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="14908.5" y="1441.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M14908.5 1472.5 L15604.5 1472.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M14908.5 1698.5 L15604.5 1698.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+					<g data-name="StudyScheduleFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
+							<rect x="29263.0" y="328.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
+							<path d="M29263.0 359.0 L29622.0 359.0" fill="none" data-name="StudyScheduleFormView"></path>
+							<path d="M29263.0 390.0 L29622.0 390.0" fill="none" data-name="StudyScheduleFormView"></path>
 						</g>
-						<g transform="translate(14908.5, 1441.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
+						<g transform="translate(29263, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
+								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14908.5, 1472.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(29263, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14908.5, 1698.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
+						<g transform="translate(29263, 390)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="6078.8" y="701.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M6078.8 732.0 L6422.8 732.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M6078.8 763.0 L6422.8 763.0" fill="none" data-name="SurveyPreview"></path>
+					<g data-name="InterventionsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
+							<rect x="22256.3" y="678.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
+							<path d="M22256.3 709.5 L22650.3 709.5" fill="none" data-name="InterventionsFormData"></path>
+							<path d="M22256.3 770.5 L22650.3 770.5" fill="none" data-name="InterventionsFormData"></path>
 						</g>
-						<g transform="translate(6078.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
+						<g transform="translate(22256.25, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
+								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6078.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
+						<g transform="translate(22256.25, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6078.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
+						<g transform="translate(22256.25, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="4573.5" y="1637.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
+					<g data-name="StudyScheduleFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
+							<rect x="22186.8" y="1554.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
+							<path d="M22186.8 1585.0 L22482.8 1585.0" fill="none" data-name="StudyScheduleFormData"></path>
+							<path d="M22186.8 1691.0 L22482.8 1691.0" fill="none" data-name="StudyScheduleFormData"></path>
 						</g>
-						<g transform="translate(4573.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
+						<g transform="translate(22186.75, 1554)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(22186.75, 1585)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(22186.75, 1691)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="28551.5" y="648.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M28551.5 679.5 L28960.5 679.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M28551.5 800.5 L28960.5 800.5" fill="none" data-name="MeasurementSurveyFormData"></path>
+					<g data-name="InterventionTaskFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
+							<rect x="14364.3" y="1516.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
+							<path d="M14364.3 1547.5 L15060.3 1547.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<path d="M14364.3 1728.5 L15060.3 1728.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
 						</g>
-						<g transform="translate(28551.5, 648.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
+						<g transform="translate(14364.25, 1516.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28551.5, 679.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
+						<g transform="translate(14364.25, 1547.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28551.5, 800.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
+						<g transform="translate(14364.25, 1728.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="24965.5" y="1584.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M24965.5 1615.0 L25333.5 1615.0" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M24965.5 1661.0 L25333.5 1661.0" fill="none" data-name="QuestionnaireFormData"></path>
+					<g data-name="WithScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
+							<rect x="28528.5" y="596.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
+							<path d="M28528.5 627.0 L29023.5 627.0" fill="none" data-name="WithScheduleControls"></path>
+							<path d="M28528.5 853.0 L29023.5 853.0" fill="none" data-name="WithScheduleControls"></path>
 						</g>
-						<g transform="translate(24965.5, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
+						<g transform="translate(28528.5, 596)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
+								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24965.5, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
+						<g transform="translate(28528.5, 627)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24965.5, 1661)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
+						<g transform="translate(28528.5, 853)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="20667.8" y="618.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M20667.8 649.5 L21299.8 649.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M20667.8 755.5 L21299.8 755.5" fill="none" data-name="WithQuestionnaireControls"></path>
+					<g data-name="InterventionTaskFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
+							<rect x="26899.3" y="663.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
+							<path d="M26899.3 694.5 L27189.3 694.5" fill="none" data-name="InterventionTaskFormData"></path>
+							<path d="M26899.3 785.5 L27189.3 785.5" fill="none" data-name="InterventionTaskFormData"></path>
 						</g>
-						<g transform="translate(20667.75, 618.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
+						<g transform="translate(26899.25, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
+								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20667.75, 649.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
+						<g transform="translate(26899.25, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20667.75, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
+						<g transform="translate(26899.25, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignMeasurementsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="1447.0" y="716.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M1447.0 747.5 L1757.0 747.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
-						</g>
-						<g transform="translate(1447, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1447, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="15735.8" y="1471.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M15735.8 1502.5 L16827.8 1502.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M15735.8 1653.5 L16827.8 1653.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+					<g data-name="IFormDataWithSchedule">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
+							<rect x="26468.0" y="298.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
+							<path d="M26468.0 329.0 L26766.0 329.0" fill="none" data-name="IFormDataWithSchedule"></path>
+							<path d="M26468.0 435.0 L26766.0 435.0" fill="none" data-name="IFormDataWithSchedule"></path>
 						</g>
-						<g transform="translate(15735.75, 1471.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
-								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
+						<g transform="translate(26468, 298)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
+								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15735.75, 1502.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(26468, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15735.75, 1653.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
+						<g transform="translate(26468, 435)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="6814.8" y="686.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M6814.8 717.0 L7202.8 717.0" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M6814.8 778.0 L7202.8 778.0" fill="none" data-name="StudyFormScaffold"></path>
-						</g>
-						<g transform="translate(6814.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6814.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
-								
-							</g>
+					<g data-name="InterventionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
+							<rect x="26841.3" y="283.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
+							<path d="M26841.3 314.0 L27223.3 314.0" fill="none" data-name="InterventionFormData"></path>
+							<path d="M26841.3 435.0 L27223.3 435.0" fill="none" data-name="InterventionFormData"></path>
 						</g>
-						<g transform="translate(6814.75, 778)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
+						<g transform="translate(26841.25, 283)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
+								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="T Function(WidgetRef)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="6044.0" y="1637.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
-						</g>
-						<g transform="translate(6044, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
+						<g transform="translate(26841.25, 314)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="6277.0" y="1637.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
-						</g>
-						<g transform="translate(6277, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
+						<g transform="translate(26841.25, 435)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="7911.0" y="1524.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M7911.0 1555.0 L8607.0 1555.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M7911.0 1721.0 L8607.0 1721.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+					<g data-name="InterventionsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
+							<rect x="16067.3" y="1464.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
+							<path d="M16067.3 1495.0 L16906.3 1495.0" fill="none" data-name="InterventionsFormViewModel"></path>
+							<path d="M16067.3 1646.0 L16906.3 1646.0" fill="none" data-name="InterventionsFormViewModel"></path>
 						</g>
-						<g transform="translate(7911, 1524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
+						<g transform="translate(16067.25, 1464)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
+								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7911, 1555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(16067.25, 1495)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7911, 1721)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
+						<g transform="translate(16067.25, 1646)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignEnrollmentFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="3626.0" y="701.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M3626.0 732.5 L4075.0 732.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
+					<g data-name="InterventionTaskFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
+							<rect x="10598.3" y="716.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
+							<path d="M10598.3 747.5 L11011.3 747.5" fill="none" data-name="InterventionTaskFormView"></path>
 						</g>
-						<g transform="translate(3626, 701.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
+						<g transform="translate(10598.25, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3626, 732.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
+						<g transform="translate(10598.25, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IScreenerQuestionLogicFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="14496.5" y="1622.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M14496.5 1653.0 L14828.5 1653.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
-						</g>
-						<g transform="translate(14496.5, 1622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
-								
-							</g>
+					<g data-name="StudyPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
+							<rect x="9322.0" y="91.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
 						</g>
-						<g transform="translate(14496.5, 1653)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+						<g transform="translate(9322, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
+								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionLogicFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="12402.8" y="1584.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M12402.8 1615.0 L12826.8 1615.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M12402.8 1646.0 L12826.8 1646.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-						</g>
-						<g transform="translate(12402.75, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
-								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
-								
-							</g>
+					<g data-name="StudyDesignInfoFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
+							<rect x="9077.3" y="716.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
+							<path d="M9077.3 747.5 L9300.3 747.5" fill="none" data-name="StudyDesignInfoFormView"></path>
 						</g>
-						<g transform="translate(12402.75, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
+						<g transform="translate(9077.25, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
+								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12402.75, 1646)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
+						<g transform="translate(9077.25, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="12333.8" y="2362.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M12333.8 2393.0 L12895.8 2393.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M12333.8 2574.0 L12895.8 2574.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+					<g data-name="StudyInfoFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
+							<rect x="21762.3" y="663.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
+							<path d="M21762.3 694.5 L22176.3 694.5" fill="none" data-name="StudyInfoFormData"></path>
+							<path d="M21762.3 785.5 L22176.3 785.5" fill="none" data-name="StudyInfoFormData"></path>
 						</g>
-						<g transform="translate(12333.75, 2362)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
-								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
+						<g transform="translate(21762.25, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
+								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12333.75, 2393)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+						<g transform="translate(21762.25, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12333.75, 2574)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
+						<g transform="translate(21762.25, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="24621.0" y="298.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M24621.0 329.0 L24879.0 329.0" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M24621.0 420.0 L24879.0 420.0" fill="none" data-name="ConsentItemFormData"></path>
-						</g>
-						<g transform="translate(24621, 298)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24621, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
-								
-							</g>
+					<g data-name="StudyContactInfoFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
+							<rect x="21671.8" y="1539.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
+							<path d="M21671.8 1570.0 L22019.8 1570.0" fill="none" data-name="StudyContactInfoFormData"></path>
+							<path d="M21671.8 1721.0 L22019.8 1721.0" fill="none" data-name="StudyContactInfoFormData"></path>
 						</g>
-						<g transform="translate(24621, 420)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
+						<g transform="translate(21671.75, 1539)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
+								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ConsentItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="13651.3" y="716.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M13651.3 747.5 L14032.3 747.5" fill="none" data-name="ConsentItemFormView"></path>
-						</g>
-						<g transform="translate(13651.25, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
+						<g transform="translate(21671.75, 1570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13651.25, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
+						<g transform="translate(21671.75, 1721)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="24648.5" y="663.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M24648.5 694.5 L25102.5 694.5" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M24648.5 785.5 L25102.5 785.5" fill="none" data-name="EnrollmentFormData"></path>
-						</g>
-						<g transform="translate(24648.5, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
-								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
-								
-							</g>
+					<g data-name="StudyInfoFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
+							<rect x="12274.3" y="1411.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
+							<path d="M12274.3 1442.5 L12970.3 1442.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+							<path d="M12274.3 1848.5 L12970.3 1848.5" fill="none" data-name="StudyInfoFormViewModel"></path>
 						</g>
-						<g transform="translate(24648.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
+						<g transform="translate(12274.25, 1411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24648.5, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
+						<g transform="translate(12274.25, 1442.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="24553.5" y="1637.5" height="31.0" width="114.0" data-name="Participation"></rect>
-						</g>
-						<g transform="translate(24553.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
+						<g transform="translate(12274.25, 1848.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="8931.0" y="984.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M8931.0 1015.0 L9944.0 1015.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M8931.0 2036.0 L9944.0 2036.0" fill="none" data-name="QuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(8931, 984)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
+					<g data-name="ScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
+							<rect x="28560.0" y="328.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
+							<path d="M28560.0 359.0 L28992.0 359.0" fill="none" data-name="ScheduleControls"></path>
+							<path d="M28560.0 390.0 L28992.0 390.0" fill="none" data-name="ScheduleControls"></path>
 						</g>
-						<g transform="translate(8931, 1015)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(28560, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
+								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8931, 2036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
+						<g transform="translate(28560, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
+								
+							</g>
+						</g>
+						<g transform="translate(28560, 390)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="18581.8" y="1404.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M18581.8 1435.0 L19483.8 1435.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M18581.8 1661.0 L19483.8 1661.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+					<g data-name="StreamSubscription">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
+							<rect x="27769.0" y="1637.5" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
 						</g>
-						<g transform="translate(18581.75, 1404)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
-								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
+						<g transform="translate(27769, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
+								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18581.75, 1435)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
+					</g>
+					<g data-name="StudyUTimeOfDay">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
+							<rect x="26699.3" y="732.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
+						</g>
+						<g transform="translate(26699.25, 732)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
+								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18581.75, 1661)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
+					</g>
+					<g data-name="SurveyQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
+							<rect x="11211.3" y="709.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M11211.3 740.0 L11563.3 740.0" fill="none" data-name="SurveyQuestionFormView"></path>
+						</g>
+						<g transform="translate(11211.25, 709)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(11211.25, 740)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormConsentItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="17652.3" y="2422.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M17652.3 2453.0 L18452.3 2453.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M17652.3 2529.0 L18452.3 2529.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+					<g data-name="AudioRecordingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
+							<rect x="3889.0" y="701.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
+							<path d="M3889.0 732.0 L4241.0 732.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<path d="M3889.0 763.0 L4241.0 763.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
 						</g>
-						<g transform="translate(17652.25, 2422)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
+						<g transform="translate(3889, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17652.25, 2453)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
+						<g transform="translate(3889, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17652.25, 2529)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
+						<g transform="translate(3889, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="17500.0" y="566.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M17500.0 597.0 L18196.0 597.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M17500.0 808.0 L18196.0 808.0" fill="none" data-name="StudyFormViewModel"></path>
+					<g data-name="FreeTextQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
+							<rect x="3497.0" y="678.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M3497.0 709.5 L3849.0 709.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M3497.0 755.5 L3849.0 755.5" fill="none" data-name="FreeTextQuestionFormView"></path>
 						</g>
-						<g transform="translate(17500, 566)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
+						<g transform="translate(3497, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17500, 597)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(3497, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17500, 808)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
+						<g transform="translate(3497, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="16907.8" y="1637.5" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
+					<g data-name="ChoiceQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
+							<rect x="1220.5" y="701.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M1220.5 732.0 L1572.5 732.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M1220.5 763.0 L1572.5 763.0" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(16907.75, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
+						<g transform="translate(1220.5, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1220.5, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1220.5, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="17098.8" y="1637.5" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
+					<g data-name="ImageCapturingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
+							<rect x="828.5" y="701.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
+							<path d="M828.5 732.0 L1180.5 732.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<path d="M828.5 763.0 L1180.5 763.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
 						</g>
-						<g transform="translate(17098.75, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
+						<g transform="translate(828.5, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(828.5, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(828.5, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="26308.3" y="253.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M26308.3 284.0 L27476.3 284.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M26308.3 420.0 L27476.3 420.0" fill="none" data-name="QuestionFormData"></path>
+					<g data-name="BoolQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
+							<rect x="436.5" y="701.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M436.5 732.0 L788.5 732.0" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M436.5 763.0 L788.5 763.0" fill="none" data-name="BoolQuestionFormView"></path>
 						</g>
-						<g transform="translate(26308.25, 253)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
+						<g transform="translate(436.5, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26308.25, 284)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
+						<g transform="translate(436.5, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26308.25, 420)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
+						<g transform="translate(436.5, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="SurveyQuestionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="13472.0" y="2445.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M13472.0 2476.0 L13835.0 2476.0" fill="none" data-name="SurveyQuestionType"></path>
+							<rect x="11929.8" y="2445.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M11929.8 2476.0 L12292.8 2476.0" fill="none" data-name="SurveyQuestionType"></path>
 						</g>
-						<g transform="translate(13472, 2445)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+						<g transform="translate(11929.75, 2445)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
 								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13472, 2476)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+						<g transform="translate(11929.75, 2476)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
 								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
@@ -4357,19 +4241,91 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="IScaleQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
+							<rect x="29642.8" y="75.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M29642.8 106.5 L29951.8 106.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
+						</g>
+						<g transform="translate(29642.75, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
+								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(29642.75, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ScaleQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
+							<rect x="16617.5" y="716.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M16617.5 747.5 L16969.5 747.5" fill="none" data-name="ScaleQuestionFormView"></path>
+						</g>
+						<g transform="translate(16617.5, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(16617.5, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="QuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
+							<rect x="24275.3" y="253.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M24275.3 284.0 L25443.3 284.0" fill="none" data-name="QuestionFormData"></path>
+							<path d="M24275.3 420.0 L25443.3 420.0" fill="none" data-name="QuestionFormData"></path>
+						</g>
+						<g transform="translate(24275.25, 253)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
+								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(24275.25, 284)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(24275.25, 420)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="ChoiceQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="25613.5" y="663.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M25613.5 694.5 L25957.5 694.5" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M25613.5 755.5 L25957.5 755.5" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<rect x="25786.3" y="663.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M25786.3 694.5 L26130.3 694.5" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M25786.3 755.5 L26130.3 755.5" fill="none" data-name="ChoiceQuestionFormData"></path>
 						</g>
-						<g transform="translate(25613.5, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(25786.25, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25613.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(25786.25, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
@@ -4377,7 +4333,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(25613.5, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+						<g transform="translate(25786.25, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
@@ -4389,24 +4345,24 @@
 					</g>
 					<g data-name="BoolQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="25997.5" y="678.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M25997.5 709.5 L26389.5 709.5" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M25997.5 755.5 L26389.5 755.5" fill="none" data-name="BoolQuestionFormData"></path>
+							<rect x="25354.3" y="678.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M25354.3 709.5 L25746.3 709.5" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M25354.3 755.5 L25746.3 755.5" fill="none" data-name="BoolQuestionFormData"></path>
 						</g>
-						<g transform="translate(25997.5, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(25354.25, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
 								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25997.5, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(25354.25, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25997.5, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+						<g transform="translate(25354.25, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
@@ -4417,24 +4373,24 @@
 					</g>
 					<g data-name="ImageQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="26429.5" y="678.5" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M26429.5 709.5 L26901.5 709.5" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M26429.5 755.5 L26901.5 755.5" fill="none" data-name="ImageQuestionFormData"></path>
+							<rect x="24842.3" y="678.5" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
+							<path d="M24842.3 709.5 L25314.3 709.5" fill="none" data-name="ImageQuestionFormData"></path>
+							<path d="M24842.3 755.5 L25314.3 755.5" fill="none" data-name="ImageQuestionFormData"></path>
 						</g>
-						<g transform="translate(26429.5, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(24842.25, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
 								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26429.5, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(24842.25, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26429.5, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+						<g transform="translate(24842.25, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
@@ -4445,17 +4401,17 @@
 					</g>
 					<g data-name="AudioQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="26941.5" y="671.0" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M26941.5 702.0 L27413.5 702.0" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M26941.5 763.0 L27413.5 763.0" fill="none" data-name="AudioQuestionFormData"></path>
+							<rect x="24330.3" y="671.0" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
+							<path d="M24330.3 702.0 L24802.3 702.0" fill="none" data-name="AudioQuestionFormData"></path>
+							<path d="M24330.3 763.0 L24802.3 763.0" fill="none" data-name="AudioQuestionFormData"></path>
 						</g>
-						<g transform="translate(26941.5, 671)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(24330.25, 671)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
 								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26941.5, 702)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(24330.25, 702)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
@@ -4463,7 +4419,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(26941.5, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+						<g transform="translate(24330.25, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
@@ -4474,17 +4430,17 @@
 					</g>
 					<g data-name="ScaleQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="27453.5" y="603.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M27453.5 634.5 L27797.5 634.5" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M27453.5 830.5 L27797.5 830.5" fill="none" data-name="ScaleQuestionFormData"></path>
+							<rect x="23946.3" y="603.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M23946.3 634.5 L24290.3 634.5" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M23946.3 830.5 L24290.3 830.5" fill="none" data-name="ScaleQuestionFormData"></path>
 						</g>
-						<g transform="translate(27453.5, 603.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(23946.25, 603.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27453.5, 634.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(23946.25, 634.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
@@ -4501,7 +4457,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(27453.5, 830.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+						<g transform="translate(23946.25, 830.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
@@ -4512,9 +4468,9 @@
 					</g>
 					<g data-name="Color">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="27596.5" y="1637.5" height="31.0" width="58.0" data-name="Color"></rect>
+							<rect x="24089.3" y="1637.5" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(27596.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+						<g transform="translate(24089.25, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
 								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
@@ -4523,17 +4479,17 @@
 					</g>
 					<g data-name="FreeTextQuestionFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="27837.5" y="663.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M27837.5 694.5 L28181.5 694.5" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M27837.5 770.5 L28181.5 770.5" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<rect x="23562.3" y="663.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M23562.3 694.5 L23906.3 694.5" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M23562.3 770.5 L23906.3 770.5" fill="none" data-name="FreeTextQuestionFormData"></path>
 						</g>
-						<g transform="translate(27837.5, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(23562.25, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
 								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27837.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(23562.25, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
@@ -4542,7 +4498,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(27837.5, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+						<g transform="translate(23562.25, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
@@ -4553,264 +4509,308 @@
 					</g>
 					<g data-name="FreeTextQuestionType">
 						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="27911.5" y="1637.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+							<rect x="23636.3" y="1637.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
 						</g>
-						<g transform="translate(27911.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+						<g transform="translate(23636.25, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
 								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="8743.8" y="701.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M8743.8 732.0 L9095.8 732.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M8743.8 763.0 L9095.8 763.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(8743.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8743.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
+					<g data-name="AbstractControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
+							<rect x="1955.3" y="2513.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
 						</g>
-						<g transform="translate(8743.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
+						<g transform="translate(1955.25, 2513)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
+								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="9135.8" y="678.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M9135.8 709.5 L9487.8 709.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M9135.8 755.5 L9487.8 755.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+					<g data-name="StudyFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
+							<rect x="12997.8" y="566.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
+							<path d="M12997.8 597.0 L13693.8 597.0" fill="none" data-name="StudyFormViewModel"></path>
+							<path d="M12997.8 808.0 L13693.8 808.0" fill="none" data-name="StudyFormViewModel"></path>
 						</g>
-						<g transform="translate(9135.75, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
+						<g transform="translate(12997.75, 566)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9135.75, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
+						<g transform="translate(12997.75, 597)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9135.75, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
+						<g transform="translate(12997.75, 808)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="9527.8" y="701.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M9527.8 732.0 L9879.8 732.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M9527.8 763.0 L9879.8 763.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+					<g data-name="IStudyRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
+							<rect x="15100.3" y="1637.5" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
 						</g>
-						<g transform="translate(9527.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
+						<g transform="translate(15100.25, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
+								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9527.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
+					</g>
+					<g data-name="IAuthRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
+							<rect x="14182.3" y="1637.5" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
 						</g>
-						<g transform="translate(9527.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
+						<g transform="translate(14182.25, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
+								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="29618.3" y="75.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M29618.3 106.5 L29927.3 106.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
+					<g data-name="MeasurementsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
+							<rect x="13010.3" y="1471.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
+							<path d="M13010.3 1502.5 L14102.3 1502.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+							<path d="M13010.3 1653.5 L14102.3 1653.5" fill="none" data-name="MeasurementsFormViewModel"></path>
 						</g>
-						<g transform="translate(29618.25, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
+						<g transform="translate(13010.25, 1471.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
+								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29618.25, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(13010.25, 1502.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(13010.25, 1653.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="19723.8" y="716.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M19723.8 747.5 L20075.8 747.5" fill="none" data-name="ScaleQuestionFormView"></path>
+					<g data-name="StudyDesignMeasurementsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
+							<rect x="8312.3" y="716.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
+							<path d="M8312.3 747.5 L8622.3 747.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
 						</g>
-						<g transform="translate(19723.75, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
+						<g transform="translate(8312.25, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
+								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19723.75, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(8312.25, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="9919.8" y="701.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M9919.8 732.0 L10271.8 732.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M9919.8 763.0 L10271.8 763.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+					<g data-name="MeasurementsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
+							<rect x="21188.3" y="686.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
+							<path d="M21188.3 717.0 L21682.3 717.0" fill="none" data-name="MeasurementsFormData"></path>
+							<path d="M21188.3 763.0 L21682.3 763.0" fill="none" data-name="MeasurementsFormData"></path>
 						</g>
-						<g transform="translate(9919.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
+						<g transform="translate(21188.25, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
+								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9919.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(21188.25, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9919.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
+						<g transform="translate(21188.25, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="10795.8" y="701.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M10795.8 732.0 L11147.8 732.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M10795.8 763.0 L11147.8 763.0" fill="none" data-name="BoolQuestionFormView"></path>
+					<g data-name="SurveyPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
+							<rect x="52.5" y="701.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
+							<path d="M52.5 732.0 L396.5 732.0" fill="none" data-name="SurveyPreview"></path>
+							<path d="M52.5 763.0 L396.5 763.0" fill="none" data-name="SurveyPreview"></path>
 						</g>
-						<g transform="translate(10795.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
+						<g transform="translate(52.5, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10795.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(52.5, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10795.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+						<g transform="translate(52.5, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="11234.8" y="2513.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+					<g data-name="MeasurementFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
+							<rect x="101.0" y="1637.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(11234.75, 2513)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
+						<g transform="translate(101, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
+								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="20195.8" y="709.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M20195.8 740.0 L20547.8 740.0" fill="none" data-name="SurveyQuestionFormView"></path>
+					<g data-name="MeasurementSurveyFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
+							<rect x="15331.3" y="1441.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
+							<path d="M15331.3 1472.5 L16027.3 1472.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+							<path d="M15331.3 1698.5 L16027.3 1698.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
 						</g>
-						<g transform="translate(20195.75, 709)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
+						<g transform="translate(15331.25, 1441.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20195.75, 740)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
+						<g transform="translate(15331.25, 1472.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="29000.5" y="732.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
-						</g>
-						<g transform="translate(29000.5, 732)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
+						<g transform="translate(15331.25, 1698.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="21531.3" y="328.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M21531.3 359.0 L21963.3 359.0" fill="none" data-name="ScheduleControls"></path>
-							<path d="M21531.3 390.0 L21963.3 390.0" fill="none" data-name="ScheduleControls"></path>
+					<g data-name="MeasurementSurveyFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
+							<rect x="26250.3" y="648.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
+							<path d="M26250.3 679.5 L26659.3 679.5" fill="none" data-name="MeasurementSurveyFormData"></path>
+							<path d="M26250.3 800.5 L26659.3 800.5" fill="none" data-name="MeasurementSurveyFormData"></path>
 						</g>
-						<g transform="translate(21531.25, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
+						<g transform="translate(26250.25, 648.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
+								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21531.25, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
+						<g transform="translate(26250.25, 679.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21531.25, 390)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
+						<g transform="translate(26250.25, 800.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="22140.0" y="1637.5" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+					<g data-name="MeasurementSurveyFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
+							<rect x="20544.3" y="716.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
+							<path d="M20544.3 747.5 L20988.3 747.5" fill="none" data-name="MeasurementSurveyFormView"></path>
 						</g>
-						<g transform="translate(22140, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
+						<g transform="translate(20544.25, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
+								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="1522.5" y="91.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
-						</g>
-						<g transform="translate(1522.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
+						<g transform="translate(20544.25, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
diff --git a/docs/uml/designer_v2/lib/features/uml.svg b/docs/uml/designer_v2/lib/features/uml.svg
index d85f16001..6867bc9ae 100644
--- a/docs/uml/designer_v2/lib/features/uml.svg
+++ b/docs/uml/designer_v2/lib/features/uml.svg
@@ -1,108 +1,144 @@
-<svg version="1.1" baseProfile="full" width="48837.5" height="3778.0" viewbox="0 0 48837.5 3778" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;IAppDelegate
+<svg version="1.1" baseProfile="full" width="45026.8" height="3778.0" viewbox="0 0 45026.75 3778" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[StudiesTableColumnSize
 	  |
-	  +dynamic onAppStart()
-	]
-	
-	[AppController
-	  |
-	  +appDelegates: List&lt;IAppDelegate&gt;;
-	  -_delayedFuture: dynamic;
-	  +isInitialized: dynamic
+	  +collapsed: bool;
+	  +flex: int?;
+	  +width: double?
 	  |
-	  +dynamic onAppStart();
-	  -dynamic _callDelegates()
+	  +Widget createContainer()
 	]
 	
-	[StudyMonitorScreen
+	[StudiesTable
 	  |
-	  +Widget build()
+	  +itemHeight: double;
+	  +itemPadding: double;
+	  +rowSpacing: double;
+	  +columnSpacing: double;
+	  +compactWidthThreshold: double;
+	  +superCompactWidthThreshold: double;
+	  +compactStatTitleThreshold: double;
+	  +studies: List&lt;Study&gt;;
+	  +onSelect: void Function(Study);
+	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study);
+	  +emptyWidget: Widget;
+	  +pinnedStudies: Iterable&lt;String&gt;;
+	  +dashboardController: DashboardController
+	  |
+	  +Widget build();
+	  -Widget _buildColumnHeader()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
+	[StudiesTable]o-[void Function(Study)]
+	[StudiesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)]
+	[StudiesTable]o-[&lt;abstract&gt;Widget]
+	[StudiesTable]o-[DashboardController]
 	
-	[LoginForm
-	  |
-	  +formKey: AuthFormKey
+	[StudiesTableColumn
 	  |
-	  +Widget build()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudiesTableColumn&gt;;
+	  &lt;static&gt;+pin: StudiesTableColumn;
+	  &lt;static&gt;+title: StudiesTableColumn;
+	  &lt;static&gt;+status: StudiesTableColumn;
+	  &lt;static&gt;+participation: StudiesTableColumn;
+	  &lt;static&gt;+createdAt: StudiesTableColumn;
+	  &lt;static&gt;+enrolled: StudiesTableColumn;
+	  &lt;static&gt;+active: StudiesTableColumn;
+	  &lt;static&gt;+completed: StudiesTableColumn;
+	  &lt;static&gt;+action: StudiesTableColumn
 	]
 	
-	[LoginForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
+	[StudiesTableColumn]o-[StudiesTableColumn]
+	[Enum]&lt;:--[StudiesTableColumn]
 	
-	[PasswordRecoveryForm
-	  |
-	  +formKey: AuthFormKey
+	[StudiesTableItem
 	  |
-	  +Widget build()
+	  +study: Study;
+	  +itemHeight: double;
+	  +itemPadding: double;
+	  +rowSpacing: double;
+	  +columnSpacing: double;
+	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
+	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
+	  +isPinned: bool;
+	  +onPinnedChanged: void Function(Study, bool)?;
+	  +onTap: void Function(Study)?
 	]
 	
-	[PasswordRecoveryForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
+	[StudiesTableItem]o-[Study]
+	[StudiesTableItem]o-[void Function(Study, bool)?]
+	[StudiesTableItem]o-[void Function(Study)?]
 	
-	[PasswordForgotForm
+	[DashboardScaffold
 	  |
-	  +formKey: AuthFormKey
+	  &lt;static&gt;+compactWidthThreshold: double;
+	  +body: Widget
 	  |
 	  +Widget build()
 	]
 	
-	[PasswordForgotForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
+	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
 	
-	[SignupForm
-	  |
-	  +formKey: AuthFormKey
+	[StudiesTableColumnHeader
 	  |
-	  +Widget build();
-	  -dynamic _onClickTermsOfUse();
-	  -dynamic _onClickPrivacyPolicy()
+	  +title: String;
+	  +sortable: bool;
+	  +sortAscending: bool;
+	  +sortingActive: bool;
+	  +onSort: void Function()?
 	]
 	
-	[SignupForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
+	[StudiesTableColumnHeader]o-[void Function()?]
 	
-	[AuthScaffold
+	[StudiesFilter
 	  |
-	  +body: Widget;
-	  +formKey: AuthFormKey;
-	  +leftContentMinWidth: double;
-	  +leftPanelMinWidth: double;
-	  +leftPanelPadding: EdgeInsets
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
 	]
 	
-	[AuthScaffold]o-[&lt;abstract&gt;Widget]
-	[AuthScaffold]o-[AuthFormKey]
-	[AuthScaffold]o-[EdgeInsets]
+	[Enum]&lt;:--[StudiesFilter]
 	
-	[EmailTextField
+	[DashboardController
 	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
-	]
-	
-	[EmailTextField]o-[FormControl]
-	
-	[PasswordTextField
+	  +studyRepository: IStudyRepository;
+	  +authRepository: IAuthRepository;
+	  +userRepository: IUserRepository;
+	  +router: GoRouter;
+	  -_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?;
+	  +searchController: SearchController;
+	  +isSortAscending: bool
 	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
+	  -dynamic _subscribeStudies();
+	  +dynamic setSearchText();
+	  +dynamic setStudiesFilter();
+	  +dynamic onSelectStudy();
+	  +dynamic onClickNewStudy();
+	  +dynamic pinStudy();
+	  +dynamic pinOffStudy();
+	  +void setSorting();
+	  +void filterStudies();
+	  +void sortStudies();
+	  +bool isSortingActiveForColumn();
+	  +bool isPinned();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void dispose()
 	]
 	
-	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
-	[PasswordTextField]o-[FormControl]
+	[DashboardController]o-[&lt;abstract&gt;IStudyRepository]
+	[DashboardController]o-[&lt;abstract&gt;IAuthRepository]
+	[DashboardController]o-[&lt;abstract&gt;IUserRepository]
+	[DashboardController]o-[GoRouter]
+	[DashboardController]o-[StreamSubscription]
+	[DashboardController]o-[SearchController]
+	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
 	
-	[StudyUJobsToBeDone
+	[DashboardScreen
 	  |
-	  +Widget build()
+	  +filter: StudiesFilter?
 	]
 	
+	[DashboardScreen]o-[StudiesFilter]
+	
 	[AuthFormController
 	  |
 	  +authRepository: IAuthRepository;
@@ -161,131 +197,249 @@
 	[AuthFormKey]o-[AuthFormKey]
 	[Enum]&lt;:--[AuthFormKey]
 	
-	[AppStatus
+	[PasswordRecoveryForm
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
-	  &lt;static&gt;+initializing: AppStatus;
-	  &lt;static&gt;+initialized: AppStatus
+	  +formKey: AuthFormKey
+	  |
+	  +Widget build()
 	]
 	
-	[AppStatus]o-[AppStatus]
-	[Enum]&lt;:--[AppStatus]
+	[PasswordRecoveryForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
 	
-	[FormArrayTable
+	[PasswordForgotForm
 	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +items: List&lt;T&gt;;
-	  +onSelectItem: void Function(T);
-	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
-	  +onNewItem: void Function()?;
-	  +rowTitle: String Function(T);
-	  +onNewItemLabel: String;
-	  +sectionTitle: String?;
-	  +sectionDescription: String?;
-	  +emptyIcon: IconData?;
-	  +emptyTitle: String?;
-	  +emptyDescription: String?;
-	  +sectionTitleDivider: bool?;
-	  +rowPrefix: Widget Function(BuildContext, T, int)?;
-	  +rowSuffix: Widget Function(BuildContext, T, int)?;
-	  +leadingWidget: Widget?;
-	  +itemsSectionPadding: EdgeInsets?;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
+	  +formKey: AuthFormKey
 	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow();
-	  -Widget _newItemButton()
+	  +Widget build()
 	]
 	
-	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
-	[FormArrayTable]o-[void Function(T)]
-	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
-	[FormArrayTable]o-[void Function()?]
-	[FormArrayTable]o-[String Function(T)]
-	[FormArrayTable]o-[IconData]
-	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
-	[FormArrayTable]o-[&lt;abstract&gt;Widget]
-	[FormArrayTable]o-[EdgeInsets]
+	[PasswordForgotForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
 	
-	[&lt;abstract&gt;ManagedFormViewModel
+	[LoginForm
 	  |
-	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
+	  +formKey: AuthFormKey
+	  |
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
+	[LoginForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
 	
-	[FormViewModelNotFoundException
+	[EmailTextField
+	  |
+	  +labelText: String;
+	  +hintText: String?;
+	  +formControlName: String?;
+	  +formControl: FormControl&lt;dynamic&gt;?
 	]
 	
-	[Exception]&lt;:--[FormViewModelNotFoundException]
+	[EmailTextField]o-[FormControl]
 	
-	[FormViewModelCollection
-	  |
-	  +formViewModels: List&lt;T&gt;;
-	  +formArray: FormArray&lt;dynamic&gt;;
-	  +stagedViewModels: List&lt;T&gt;;
-	  +retrievableViewModels: List&lt;T&gt;;
-	  +formData: List&lt;D&gt;
+	[PasswordTextField
 	  |
-	  +void add();
-	  +T remove();
-	  +T? findWhere();
-	  +T? removeWhere();
-	  +bool contains();
-	  +void stage();
-	  +T commit();
-	  +void reset();
-	  +void read()
+	  +labelText: String;
+	  +hintText: String?;
+	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
+	  +formControlName: String?;
+	  +formControl: FormControl&lt;dynamic&gt;?
 	]
 	
-	[FormViewModelCollection]o-[FormArray]
+	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
+	[PasswordTextField]o-[FormControl]
 	
-	[CustomFormControl
+	[AuthScaffold
 	  |
-	  -_onValueChangedDebouncer: Debouncer?;
-	  -_onStatusChangedDebouncer: Debouncer?;
-	  +onValueChanged: void Function(T?)?;
-	  +onStatusChanged: void Function(ControlStatus)?;
-	  +onStatusChangedDebounceTime: int?;
-	  +onValueChangedDebounceTime: int?
+	  +body: Widget;
+	  +formKey: AuthFormKey;
+	  +leftContentMinWidth: double;
+	  +leftPanelMinWidth: double;
+	  +leftPanelPadding: EdgeInsets
+	]
+	
+	[AuthScaffold]o-[&lt;abstract&gt;Widget]
+	[AuthScaffold]o-[AuthFormKey]
+	[AuthScaffold]o-[EdgeInsets]
+	
+	[StudyUJobsToBeDone
+	  |
+	  +Widget build()
+	]
+	
+	[SignupForm
+	  |
+	  +formKey: AuthFormKey
+	  |
+	  +Widget build();
+	  -dynamic _onClickTermsOfUse();
+	  -dynamic _onClickPrivacyPolicy()
+	]
+	
+	[SignupForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
+	
+	[StudyInvitesTable
+	  |
+	  +invites: List&lt;StudyInvite&gt;;
+	  +onSelect: void Function(StudyInvite);
+	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
+	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
+	  +getIntervention: Intervention? Function(String);
+	  +getParticipantCountForInvite: int Function(StudyInvite)
+	  |
+	  +Widget build();
+	  -List&lt;Widget&gt; _buildRow()
+	]
+	
+	[StudyInvitesTable]o-[void Function(StudyInvite)]
+	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
+	[StudyInvitesTable]o-[Intervention? Function(String)]
+	[StudyInvitesTable]o-[int Function(StudyInvite)]
+	
+	[EnrolledBadge
+	  |
+	  +enrolledCount: int
+	  |
+	  +Widget build()
+	]
+	
+	[StudyRecruitScreen
+	  |
+	  +Widget build();
+	  -Widget _inviteCodesSectionHeader();
+	  -Widget _newInviteCodeButton();
+	  -dynamic _onSelectInvite()
+	]
+	
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
+	
+	[InviteCodeFormViewModel
+	  |
+	  +study: Study;
+	  +inviteCodeRepository: IInviteCodeRepository;
+	  +codeControl: FormControl&lt;String&gt;;
+	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
+	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
+	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
+	  +interventionAControl: FormControl&lt;String&gt;;
+	  +interventionBControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
+	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
+	  +isPreconfiguredSchedule: bool;
+	  +preconfiguredSchedule: List&lt;String&gt;?
+	  |
+	  +void initControls();
+	  -dynamic _uniqueInviteCode();
+	  +void regenerateCode();
+	  -String _generateCode();
+	  +StudyInvite buildFormData();
+	  +void setControlsFrom();
+	  +dynamic save()
+	]
+	
+	[InviteCodeFormViewModel]o-[Study]
+	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
+	[InviteCodeFormViewModel]o-[FormControl]
+	[InviteCodeFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
+	
+	[InviteCodeFormView
+	  |
+	  +formViewModel: InviteCodeFormViewModel
+	  |
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
+	]
+	
+	[InviteCodeFormView]o-[InviteCodeFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
+	
+	[StudyRecruitController
+	  |
+	  +inviteCodeRepository: IInviteCodeRepository;
+	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
 	  |
+	  -dynamic _subscribeInvites();
+	  +Intervention? getIntervention();
+	  +int getParticipantCountForInvite();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
 	  +void dispose()
 	]
 	
-	[CustomFormControl]o-[Debouncer]
-	[CustomFormControl]o-[void Function(T?)?]
-	[CustomFormControl]o-[void Function(ControlStatus)?]
-	[FormControl]&lt;:-[CustomFormControl]
+	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
+	[StudyRecruitController]o-[StreamSubscription]
+	[StudyBaseController]&lt;:-[StudyRecruitController]
+	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
 	
-	[UnsavedChangesDialog
+	[App
+	]
+	
+	[AppContent
+	]
+	
+	[StudyAnalyzeScreen
 	  |
+	  +Widget? banner();
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;FormValidationSetEnum
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
+	
+	[StudyAnalyzeController
+	  |
+	  +dynamic onExport()
 	]
 	
-	[FormControlValidation
+	[StudyBaseController]&lt;:-[StudyAnalyzeController]
+	
+	[AppStatus
 	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
-	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
-	  +validationMessages: Map&lt;String, String Function(Object)&gt;
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
+	  &lt;static&gt;+initializing: AppStatus;
+	  &lt;static&gt;+initialized: AppStatus
+	]
+	
+	[AppStatus]o-[AppStatus]
+	[Enum]&lt;:--[AppStatus]
+	
+	[&lt;abstract&gt;ManagedFormViewModel
 	  |
-	  +FormControlValidation merge()
+	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
 	]
 	
-	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
 	
-	[&lt;abstract&gt;IFormData
+	[FormViewModelNotFoundException
+	]
+	
+	[Exception]&lt;:--[FormViewModelNotFoundException]
+	
+	[FormViewModelCollection
 	  |
-	  +id: String
+	  +formViewModels: List&lt;T&gt;;
+	  +formArray: FormArray&lt;dynamic&gt;;
+	  +stagedViewModels: List&lt;T&gt;;
+	  +retrievableViewModels: List&lt;T&gt;;
+	  +formData: List&lt;D&gt;
 	  |
-	  +IFormData copy()
+	  +void add();
+	  +T remove();
+	  +T? findWhere();
+	  +T? removeWhere();
+	  +bool contains();
+	  +void stage();
+	  +T commit();
+	  +void reset();
+	  +void read()
 	]
 	
+	[FormViewModelCollection]o-[FormArray]
+	
 	[FormInvalidException
 	]
 	
@@ -383,513 +537,594 @@
 	[FormMode]o-[FormMode]
 	[Enum]&lt;:--[FormMode]
 	
-	[EnrolledBadge
-	  |
-	  +enrolledCount: int
+	[UnsavedChangesDialog
 	  |
 	  +Widget build()
 	]
 	
-	[StudyRecruitController
+	[FormArrayTable
 	  |
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
+	  +control: AbstractControl&lt;dynamic&gt;;
+	  +items: List&lt;T&gt;;
+	  +onSelectItem: void Function(T);
+	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
+	  +onNewItem: void Function()?;
+	  +rowTitle: String Function(T);
+	  +onNewItemLabel: String;
+	  +sectionTitle: String?;
+	  +sectionDescription: String?;
+	  +emptyIcon: IconData?;
+	  +emptyTitle: String?;
+	  +emptyDescription: String?;
+	  +sectionTitleDivider: bool?;
+	  +rowPrefix: Widget Function(BuildContext, T, int)?;
+	  +rowSuffix: Widget Function(BuildContext, T, int)?;
+	  +leadingWidget: Widget?;
+	  +itemsSectionPadding: EdgeInsets?;
+	  +hideLeadingTrailingWhenEmpty: bool;
+	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
 	  |
-	  -dynamic _subscribeInvites();
-	  +Intervention? getIntervention();
-	  +int getParticipantCountForInvite();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void dispose()
+	  +Widget build();
+	  -List&lt;Widget&gt; _buildRow();
+	  -Widget _newItemButton()
 	]
 	
-	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[StudyRecruitController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyRecruitController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
+	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
+	[FormArrayTable]o-[void Function(T)]
+	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
+	[FormArrayTable]o-[void Function()?]
+	[FormArrayTable]o-[String Function(T)]
+	[FormArrayTable]o-[IconData]
+	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
+	[FormArrayTable]o-[&lt;abstract&gt;Widget]
+	[FormArrayTable]o-[EdgeInsets]
 	
-	[StudyRecruitScreen
+	[&lt;abstract&gt;IFormData
 	  |
-	  +Widget build();
-	  -Widget _inviteCodesSectionHeader();
-	  -Widget _newInviteCodeButton();
-	  -dynamic _onSelectInvite()
+	  +id: String
+	  |
+	  +IFormData copy()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
-	
-	[InviteCodeFormView
+	[CustomFormControl
 	  |
-	  +formViewModel: InviteCodeFormViewModel
+	  -_onValueChangedDebouncer: Debouncer?;
+	  -_onStatusChangedDebouncer: Debouncer?;
+	  +onValueChanged: void Function(T?)?;
+	  +onStatusChanged: void Function(ControlStatus)?;
+	  +onStatusChangedDebounceTime: int?;
+	  +onValueChangedDebounceTime: int?
 	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
+	  +void dispose()
 	]
 	
-	[InviteCodeFormView]o-[InviteCodeFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
+	[CustomFormControl]o-[Debouncer]
+	[CustomFormControl]o-[void Function(T?)?]
+	[CustomFormControl]o-[void Function(ControlStatus)?]
+	[FormControl]&lt;:-[CustomFormControl]
 	
-	[StudyInvitesTable
+	[&lt;abstract&gt;FormValidationSetEnum
+	]
+	
+	[FormControlValidation
 	  |
-	  +invites: List&lt;StudyInvite&gt;;
-	  +onSelect: void Function(StudyInvite);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getIntervention: Intervention? Function(String);
-	  +getParticipantCountForInvite: int Function(StudyInvite)
+	  +control: AbstractControl&lt;dynamic&gt;;
+	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
+	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
+	  +validationMessages: Map&lt;String, String Function(Object)&gt;
 	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow()
+	  +FormControlValidation merge()
 	]
 	
-	[StudyInvitesTable]o-[void Function(StudyInvite)]
-	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
-	[StudyInvitesTable]o-[Intervention? Function(String)]
-	[StudyInvitesTable]o-[int Function(StudyInvite)]
+	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
 	
-	[InviteCodeFormViewModel
+	[DrawerEntry
 	  |
-	  +study: Study;
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  +codeControl: FormControl&lt;String&gt;;
-	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
-	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +interventionAControl: FormControl&lt;String&gt;;
-	  +interventionBControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
-	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +isPreconfiguredSchedule: bool;
-	  +preconfiguredSchedule: List&lt;String&gt;?
+	  +localizedTitle: String Function();
+	  +icon: IconData?;
+	  +localizedHelpText: String Function()?;
+	  +enabled: bool;
+	  +onSelected: void Function(BuildContext, WidgetRef)?;
+	  +autoCloseDrawer: bool;
+	  +title: String;
+	  +helpText: String?
 	  |
-	  +void initControls();
-	  -dynamic _uniqueInviteCode();
-	  +void regenerateCode();
-	  -String _generateCode();
-	  +StudyInvite buildFormData();
-	  +void setControlsFrom();
-	  +dynamic save()
+	  +void onClick()
 	]
 	
-	[InviteCodeFormViewModel]o-[Study]
-	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[InviteCodeFormViewModel]o-[FormControl]
-	[InviteCodeFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
+	[DrawerEntry]o-[String Function()]
+	[DrawerEntry]o-[IconData]
+	[DrawerEntry]o-[String Function()?]
+	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
 	
-	[PublishSuccessDialog
+	[GoRouterDrawerEntry
 	  |
-	  +Widget build()
+	  +intent: RoutingIntent;
+	  +onNavigated: void Function()?
+	  |
+	  +void onClick()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
+	[GoRouterDrawerEntry]o-[RoutingIntent]
+	[GoRouterDrawerEntry]o-[void Function()?]
+	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
 	
-	[PublishDialog
+	[AppDrawer
 	  |
-	  +Widget build()
+	  +width: int;
+	  +autoCloseDrawer: bool;
+	  +leftPaddingEntries: double;
+	  +logoPaddingVertical: double;
+	  +logoPaddingHorizontal: double;
+	  +logoMaxHeight: double;
+	  +logoSectionMinHeight: double;
+	  +logoSectionMaxHeight: double
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
-	
-	[PublishConfirmationDialog
+	[StudyFormValidationSet
 	  |
-	  +Widget build()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
+	[Enum]&lt;:--[StudyFormValidationSet]
 	
-	[FrameControlsWidget
+	[StudyFormScaffold
 	  |
-	  +onRefresh: void Function()?;
-	  +onOpenNewTab: void Function()?;
-	  +enabled: bool
+	  +studyId: String;
+	  +formViewModelBuilder: T Function(WidgetRef);
+	  +formViewBuilder: Widget Function(T)
 	  |
 	  +Widget build()
 	]
 	
-	[FrameControlsWidget]o-[void Function()?]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
+	[StudyFormScaffold]o-[T Function(WidgetRef)]
+	[StudyFormScaffold]o-[Widget Function(T)]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel
+	[StudyDesignEnrollmentFormView
 	  |
-	  +studyParticipation: Participation?;
-	  +studyStatus: StudyStatus?
+	  +Widget build();
+	  -dynamic _showScreenerQuestionSidesheetWithArgs();
+	  -dynamic _showConsentItemSidesheetWithArgs()
 	]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
 	
-	[StudyStatusBadge
+	[EnrollmentFormData
 	  |
-	  +participation: Participation?;
-	  +status: StudyStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
+	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
+	  +enrollmentType: Participation;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
+	  +id: String
 	  |
-	  +Widget build()
+	  +Study apply();
+	  +EnrollmentFormData copy()
 	]
 	
-	[StudyStatusBadge]o-[Participation]
-	[StudyStatusBadge]o-[StudyStatus]
-	[StudyStatusBadge]o-[BadgeType]
+	[EnrollmentFormData]o-[Participation]
+	[EnrollmentFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
 	
-	[RouteInformation
+	[EnrollmentFormViewModel
 	  |
-	  +route: String?;
-	  +extra: String?;
-	  +cmd: String?;
-	  +data: String?
+	  +study: Study;
+	  +router: GoRouter;
+	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
+	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
+	  +consentItemArray: FormArray&lt;dynamic&gt;;
+	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
+	  +form: FormGroup;
+	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
+	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestScreener: bool;
+	  +canTestConsent: bool;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
 	  |
-	  +String toString()
+	  +void setControlsFrom();
+	  +EnrollmentFormData buildFormData();
+	  +void read();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
+	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
+	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
+	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
+	  +dynamic testScreener();
+	  +dynamic testConsent();
+	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
 	]
 	
-	[&lt;abstract&gt;PlatformController
+	[EnrollmentFormViewModel]o-[Study]
+	[EnrollmentFormViewModel]o-[GoRouter]
+	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
+	[EnrollmentFormViewModel]o-[FormControl]
+	[EnrollmentFormViewModel]o-[FormArray]
+	[EnrollmentFormViewModel]o-[FormViewModelCollection]
+	[EnrollmentFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
+	
+	[EnrollmentFormConsentItemDelegate
 	  |
-	  +studyId: String;
-	  +baseSrc: String;
-	  +previewSrc: String;
-	  +routeInformation: RouteInformation;
-	  +frameWidget: Widget
+	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
+	  +owner: EnrollmentFormViewModel;
+	  +propagateOnSave: bool;
+	  +validationSet: dynamic
 	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void listen();
-	  +void send();
-	  +void openNewPage()
+	  +void onCancel();
+	  +dynamic onSave();
+	  +ConsentItemFormViewModel provide();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem()
 	]
 	
-	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
-	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
+	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
+	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
 	
-	[WebController
+	[ConsentItemFormData
 	  |
-	  +iFrameElement: IFrameElement
+	  +consentId: String;
+	  +title: String;
+	  +description: String;
+	  +iconName: String?;
+	  +id: String
 	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void openNewPage();
-	  +void listen();
-	  +void send()
+	  +ConsentItem toConsentItem();
+	  +ConsentItemFormData copy()
 	]
 	
-	[WebController]o-[IFrameElement]
-	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
-	
-	[MobileController
-	  |
-	  +void openNewPage();
-	  +void refresh();
-	  +void registerViews();
-	  +void listen();
-	  +void send();
-	  +void navigate();
-	  +void activate();
-	  +void generateUrl()
-	]
-	
-	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
+	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
 	
-	[StudyController
+	[ConsentItemFormViewModel
 	  |
-	  +notificationService: INotificationService;
-	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
-	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
+	  +consentIdControl: FormControl&lt;String&gt;;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +iconControl: FormControl&lt;IconOption&gt;;
+	  +form: FormGroup;
+	  +consentId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +dynamic syncStudyStatus();
-	  +dynamic onStudySubscriptionUpdate();
-	  -dynamic _redirectNewToActualStudyID();
-	  +dynamic publishStudy();
-	  +void onChangeStudyParticipation();
-	  +void onAddParticipants();
-	  +void onSettingsPressed();
-	  +void dispose()
+	  +void setControlsFrom();
+	  +ConsentItemFormData buildFormData();
+	  +ConsentItemFormViewModel createDuplicate()
 	]
 	
-	[StudyController]o-[&lt;abstract&gt;INotificationService]
-	[StudyController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyController]
+	[ConsentItemFormViewModel]o-[FormControl]
+	[ConsentItemFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
 	
-	[&lt;abstract&gt;IStudyNavViewModel
+	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
 	  |
-	  +isEditTabEnabled: bool;
-	  +isTestTabEnabled: bool;
-	  +isRecruitTabEnabled: bool;
-	  +isMonitorTabEnabled: bool;
-	  +isAnalyzeTabEnabled: bool;
-	  +isSettingsEnabled: bool
+	  +isDirtyOptionsBannerVisible: bool
 	]
 	
-	[StudyNav
+	[ScreenerQuestionLogicFormView
 	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic edit();
-	  &lt;static&gt;+dynamic test();
-	  &lt;static&gt;+dynamic recruit();
-	  &lt;static&gt;+dynamic monitor();
-	  &lt;static&gt;+dynamic analyze()
+	  +formViewModel: ScreenerQuestionFormViewModel
+	  |
+	  +Widget build();
+	  -dynamic _buildInfoBanner();
+	  -dynamic _buildAnswerOptionsLogicControls();
+	  -List&lt;Widget&gt; _buildOptionLogicRow()
 	]
 	
-	[StudyDesignNav
+	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
+	
+	[ScreenerQuestionFormViewModel
 	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic info();
-	  &lt;static&gt;+dynamic enrollment();
-	  &lt;static&gt;+dynamic interventions();
-	  &lt;static&gt;+dynamic measurements();
-	  &lt;static&gt;+dynamic reports()
+	  &lt;static&gt;+defaultResponseOptionValidity: bool;
+	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
+	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
+	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
+	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +prevResponseOptionValues: List&lt;dynamic&gt;;
+	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isDirtyOptionsBannerVisible: bool
+	  |
+	  +dynamic onResponseOptionsChanged();
+	  +void setControlsFrom();
+	  +QuestionFormData buildFormData();
+	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
+	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
+	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
+	  +ScreenerQuestionFormViewModel createDuplicate()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget
-	  |
-	  +studyId: String
+	[ScreenerQuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
+	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
+	
+	[ConsentItemFormView
 	  |
-	  +Widget? banner()
+	  +formViewModel: ConsentItemFormViewModel
 	]
 	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
-	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
+	[ConsentItemFormView]o-[ConsentItemFormViewModel]
 	
-	[StudyParticipationBadge
+	[DataReferenceIdentifier
 	  |
-	  +participation: Participation;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +center: bool
+	  +hashCode: int
 	  |
-	  +Widget build()
+	  +bool ==()
 	]
 	
-	[StudyParticipationBadge]o-[Participation]
-	[StudyParticipationBadge]o-[BadgeType]
+	[DataReference]&lt;:-[DataReferenceIdentifier]
 	
-	[StudyBaseController
+	[AverageSectionFormView
 	  |
+	  +formViewModel: ReportItemFormViewModel;
 	  +studyId: String;
-	  +studyRepository: IStudyRepository;
-	  +router: GoRouter;
-	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
+	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
 	  |
-	  +dynamic subscribeStudy();
-	  +dynamic onStudySubscriptionUpdate();
-	  +dynamic onStudySubscriptionError();
-	  +void dispose()
+	  +Widget build()
 	]
 	
-	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyBaseController]o-[GoRouter]
-	[StudyBaseController]o-[StreamSubscription]
+	[AverageSectionFormView]o-[ReportItemFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
 	
-	[PreviewFrame
+	[TemporalAggregationFormatted
 	  |
-	  +studyId: String;
-	  +routeArgs: StudyFormRouteArgs?;
-	  +route: String?
+	  -_value: TemporalAggregation;
+	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
+	  +value: TemporalAggregation;
+	  +string: String;
+	  +icon: IconData?;
+	  +hashCode: int
+	  |
+	  +bool ==();
+	  +String toString();
+	  +String toJson();
+	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
 	]
 	
-	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
+	[TemporalAggregationFormatted]o-[TemporalAggregation]
+	[TemporalAggregationFormatted]o-[IconData]
 	
-	[&lt;abstract&gt;IStudyAppBarViewModel
+	[ImprovementDirectionFormatted
 	  |
-	  +isSyncIndicatorVisible: bool;
-	  +isStatusBadgeVisible: bool;
-	  +isPublishVisible: bool
+	  -_value: ImprovementDirection;
+	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
+	  +value: ImprovementDirection;
+	  +string: String;
+	  +icon: IconData?;
+	  +hashCode: int
+	  |
+	  +bool ==();
+	  +String toString();
+	  +String toJson();
+	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
 	]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
+	[ImprovementDirectionFormatted]o-[ImprovementDirection]
+	[ImprovementDirectionFormatted]o-[IconData]
 	
-	[StudyScaffold
+	[ReportSectionType
 	  |
-	  +studyId: String;
-	  +tabs: List&lt;NavbarTab&gt;?;
-	  +tabsSubnav: List&lt;NavbarTab&gt;?;
-	  +selectedTab: NavbarTab?;
-	  +selectedTabSubnav: NavbarTab?;
-	  +body: StudyPageWidget;
-	  +drawer: Widget?;
-	  +disableActions: bool;
-	  +actionsSpacing: double;
-	  +actionsPadding: double;
-	  +layoutType: SingleColumnLayoutType?;
-	  +appbarHeight: double;
-	  +appbarSubnavHeight: double
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
+	  &lt;static&gt;+average: ReportSectionType;
+	  &lt;static&gt;+linearRegression: ReportSectionType
 	]
 	
-	[StudyScaffold]o-[NavbarTab]
-	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
-	[StudyScaffold]o-[&lt;abstract&gt;Widget]
-	[StudyScaffold]o-[SingleColumnLayoutType]
+	[ReportSectionType]o-[ReportSectionType]
+	[Enum]&lt;:--[ReportSectionType]
 	
-	[WebFrame
+	[DataReferenceEditor
 	  |
-	  +previewSrc: String;
-	  +studyId: String
+	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
+	  +availableTasks: List&lt;Task&gt;;
+	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
 	  |
-	  +Widget build()
+	  +FormTableRow buildFormTableRow();
+	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
 	]
 	
-	[DisabledFrame
-	  |
-	  +Widget build()
-	]
+	[DataReferenceEditor]o-[FormControl]
+	[DataReferenceEditor]o-[ReactiveDropdownField]
 	
-	[PhoneContainer
+	[LinearRegressionSectionFormView
 	  |
-	  &lt;static&gt;+defaultWidth: double;
-	  &lt;static&gt;+defaultHeight: double;
-	  +width: double;
-	  +height: double;
-	  +borderColor: Color;
-	  +borderWidth: double;
-	  +borderRadius: double;
-	  +innerContent: Widget;
-	  +innerContentBackgroundColor: Color?
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
 	  |
 	  +Widget build()
 	]
 	
-	[PhoneContainer]o-[Color]
-	[PhoneContainer]o-[&lt;abstract&gt;Widget]
+	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
 	
-	[MobileFrame
+	[ReportItemFormView
 	  |
-	  +Widget build()
-	]
-	
-	[DesktopFrame
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: dynamic;
+	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
 	  |
-	  +Widget build()
+	  +Widget build();
+	  -dynamic _buildSectionText();
+	  -dynamic _buildSectionTypeHeader()
 	]
 	
-	[StudyTestScreen
-	  |
-	  +previewRoute: String?
-	  |
-	  +Widget build();
-	  +Widget? banner();
-	  +dynamic load();
-	  +dynamic save();
-	  +dynamic showHelp()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
+	[ReportItemFormView]o-[ReportItemFormViewModel]
+	[ReportItemFormView]o-[Widget Function(BuildContext)]
 	
-	[StudySettingsFormViewModel
+	[ReportItemFormViewModel
 	  |
-	  +study: AsyncValue&lt;Study&gt;;
-	  +studyRepository: IStudyRepository;
-	  &lt;static&gt;+defaultPublishedToRegistry: bool;
-	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
-	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
-	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
+	  &lt;static&gt;+defaultSectionType: ReportSectionType;
+	  +sectionIdControl: FormControl&lt;String&gt;;
+	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +sectionControl: FormControl&lt;ReportSection&gt;;
+	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
+	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
+	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
+	  +alphaControl: FormControl&lt;double&gt;;
+	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
 	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +sectionId: String;
+	  +sectionType: ReportSectionType;
+	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
+	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
+	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +dataReferenceRequired: dynamic;
+	  +aggregationRequired: dynamic;
+	  +improvementDirectionRequired: dynamic;
+	  +alphaConfidenceRequired: dynamic
 	  |
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +dynamic keepControlsSynced();
-	  +dynamic save();
-	  +dynamic setLaunchDefaults()
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +ReportItemFormData buildFormData();
+	  +ReportItemFormViewModel createDuplicate();
+	  +dynamic onSectionTypeChanged();
+	  -void _updateFormControls();
+	  +void setControlsFrom()
 	]
 	
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudySettingsFormViewModel]o-[FormControl]
-	[StudySettingsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
+	[ReportItemFormViewModel]o-[ReportSectionType]
+	[ReportItemFormViewModel]o-[FormControl]
+	[ReportItemFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
 	
-	[StudySettingsDialog
+	[ReportItemFormData
 	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
-	
-	[StudyTestController
+	  +isPrimary: bool;
+	  +section: ReportSection;
+	  +id: String
 	  |
-	  +authRepository: IAuthRepository;
-	  +languageCode: String
+	  &lt;static&gt;+dynamic fromDomainModel();
+	  +ReportItemFormData copy()
 	]
 	
-	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyBaseController]&lt;:-[StudyTestController]
+	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
+	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
 	
-	[TestAppRoutes
+	[ReportsFormViewModel
 	  |
-	  &lt;static&gt;+studyOverview: String;
-	  &lt;static&gt;+eligibility: String;
-	  &lt;static&gt;+intervention: String;
-	  &lt;static&gt;+consent: String;
-	  &lt;static&gt;+journey: String;
-	  &lt;static&gt;+dashboard: String
+	  +study: Study;
+	  +router: GoRouter;
+	  +reportItemDelegate: ReportFormItemDelegate;
+	  +reportItemArray: FormArray&lt;dynamic&gt;;
+	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
+	  +form: FormGroup;
+	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestConsent: bool
+	  |
+	  +void setControlsFrom();
+	  +ReportsFormData buildFormData();
+	  +void read();
+	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
+	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
+	  +dynamic testReport();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +ReportItemFormViewModel provide()
 	]
 	
-	[DrawerEntry
+	[ReportsFormViewModel]o-[Study]
+	[ReportsFormViewModel]o-[GoRouter]
+	[ReportsFormViewModel]o-[ReportFormItemDelegate]
+	[ReportsFormViewModel]o-[FormArray]
+	[ReportsFormViewModel]o-[FormViewModelCollection]
+	[ReportsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
+	
+	[ReportFormItemDelegate
 	  |
-	  +localizedTitle: String Function();
-	  +icon: IconData?;
-	  +localizedHelpText: String Function()?;
-	  +enabled: bool;
-	  +onSelected: void Function(BuildContext, WidgetRef)?;
-	  +autoCloseDrawer: bool;
-	  +title: String;
-	  +helpText: String?
+	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
+	  +owner: ReportsFormViewModel;
+	  +propagateOnSave: bool;
+	  +validationSet: dynamic
 	  |
-	  +void onClick()
+	  +void onCancel();
+	  +dynamic onSave();
+	  +ReportItemFormViewModel provide();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem()
 	]
 	
-	[DrawerEntry]o-[String Function()]
-	[DrawerEntry]o-[IconData]
-	[DrawerEntry]o-[String Function()?]
-	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
+	[ReportFormItemDelegate]o-[FormViewModelCollection]
+	[ReportFormItemDelegate]o-[ReportsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
 	
-	[GoRouterDrawerEntry
+	[ReportBadge
 	  |
-	  +intent: RoutingIntent;
-	  +onNavigated: void Function()?
+	  +status: ReportStatus?;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +showTooltip: bool
 	  |
-	  +void onClick()
+	  +Widget build()
 	]
 	
-	[GoRouterDrawerEntry]o-[RoutingIntent]
-	[GoRouterDrawerEntry]o-[void Function()?]
-	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
+	[ReportBadge]o-[ReportStatus]
+	[ReportBadge]o-[BadgeType]
 	
-	[AppDrawer
+	[StudyDesignReportsFormView
 	  |
-	  +width: int;
-	  +autoCloseDrawer: bool;
-	  +leftPaddingEntries: double;
-	  +logoPaddingVertical: double;
-	  +logoPaddingHorizontal: double;
-	  +logoMaxHeight: double;
-	  +logoSectionMinHeight: double;
-	  +logoSectionMaxHeight: double
+	  +Widget build();
+	  -dynamic _showReportItemSidesheetWithArgs()
 	]
 	
-	[StudyAnalyzeScreen
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
+	
+	[ReportsFormData
 	  |
-	  +Widget? banner();
-	  +Widget build()
+	  +reportItems: List&lt;ReportItemFormData&gt;;
+	  +id: String
+	  |
+	  +Study apply();
+	  +ReportsFormData copy()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
 	
-	[StudyAnalyzeController
+	[ReportStatus
 	  |
-	  +dynamic onExport()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
+	  &lt;static&gt;+primary: ReportStatus;
+	  &lt;static&gt;+secondary: ReportStatus
 	]
 	
-	[StudyBaseController]&lt;:-[StudyAnalyzeController]
+	[ReportStatus]o-[ReportStatus]
+	[Enum]&lt;:--[ReportStatus]
 	
 	[StudyDesignInterventionsFormView
 	  |
@@ -898,6 +1133,36 @@
 	
 	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
 	
+	[&lt;abstract&gt;StudyScheduleControls
+	  |
+	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
+	  &lt;static&gt;+defaultScheduleTypeSequence: String;
+	  &lt;static&gt;+defaultNumCycles: int;
+	  &lt;static&gt;+defaultPeriodLength: int;
+	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
+	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
+	  +phaseDurationControl: FormControl&lt;int&gt;;
+	  +numCyclesControl: FormControl&lt;int&gt;;
+	  +includeBaselineControl: FormControl&lt;bool&gt;;
+	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
+	  &lt;static&gt;+kNumCyclesMin: int;
+	  &lt;static&gt;+kNumCyclesMax: int;
+	  &lt;static&gt;+kPhaseDurationMin: int;
+	  &lt;static&gt;+kPhaseDurationMax: int;
+	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
+	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +numCyclesRange: dynamic;
+	  +phaseDurationRange: dynamic;
+	  +customSequenceRequired: dynamic
+	  |
+	  +void setStudyScheduleControlsFrom();
+	  +StudyScheduleFormData buildStudyScheduleFormData();
+	  +bool isSequencingCustom()
+	]
+	
+	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
+	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
+	
 	[InterventionFormView
 	  |
 	  +formViewModel: InterventionFormViewModel
@@ -926,58 +1191,20 @@
 	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
 	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
 	
-	[InterventionTaskFormData
+	[InterventionsFormData
 	  |
-	  +taskId: String;
-	  +taskTitle: String;
-	  +taskDescription: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
+	  +interventionsData: List&lt;InterventionFormData&gt;;
+	  +studyScheduleData: StudyScheduleFormData;
 	  +id: String
 	  |
-	  +CheckmarkTask toTask();
-	  +InterventionTaskFormData copy()
+	  +Study apply();
+	  +InterventionsFormData copy()
 	]
 	
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
+	[InterventionsFormData]o-[StudyScheduleFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
 	
-	[InterventionsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +interventionsArray: FormArray&lt;dynamic&gt;;
-	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
-	  +form: FormGroup;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +interventionsRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestStudySchedule: bool
-	  |
-	  +void setControlsFrom();
-	  +InterventionsFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +InterventionFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +dynamic testStudySchedule()
-	]
-	
-	[InterventionsFormViewModel]o-[Study]
-	[InterventionsFormViewModel]o-[GoRouter]
-	[InterventionsFormViewModel]o-[FormArray]
-	[InterventionsFormViewModel]o-[FormViewModelCollection]
-	[InterventionsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
-	
-	[InterventionTaskFormViewModel
+	[InterventionTaskFormViewModel
 	  |
 	  +taskIdControl: FormControl&lt;String&gt;;
 	  +instanceIdControl: FormControl&lt;String&gt;;
@@ -1001,35 +1228,19 @@
 	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
 	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
 	
-	[&lt;abstract&gt;StudyScheduleControls
+	[InterventionTaskFormData
 	  |
-	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
-	  &lt;static&gt;+defaultScheduleTypeSequence: String;
-	  &lt;static&gt;+defaultNumCycles: int;
-	  &lt;static&gt;+defaultPeriodLength: int;
-	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
-	  +phaseDurationControl: FormControl&lt;int&gt;;
-	  +numCyclesControl: FormControl&lt;int&gt;;
-	  +includeBaselineControl: FormControl&lt;bool&gt;;
-	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  &lt;static&gt;+kNumCyclesMin: int;
-	  &lt;static&gt;+kNumCyclesMax: int;
-	  &lt;static&gt;+kPhaseDurationMin: int;
-	  &lt;static&gt;+kPhaseDurationMax: int;
-	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +numCyclesRange: dynamic;
-	  +phaseDurationRange: dynamic;
-	  +customSequenceRequired: dynamic
+	  +taskId: String;
+	  +taskTitle: String;
+	  +taskDescription: String?;
+	  &lt;static&gt;+kDefaultTitle: String;
+	  +id: String
 	  |
-	  +void setStudyScheduleControlsFrom();
-	  +StudyScheduleFormData buildStudyScheduleFormData();
-	  +bool isSequencingCustom()
+	  +CheckmarkTask toTask();
+	  +InterventionTaskFormData copy()
 	]
 	
-	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
-	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
+	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
 	
 	[InterventionFormData
 	  |
@@ -1064,25 +1275,49 @@
 	[StudyScheduleFormData]o-[PhaseSequence]
 	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
 	
-	[InterventionTaskFormView
+	[InterventionsFormViewModel
 	  |
-	  +formViewModel: InterventionTaskFormViewModel
+	  +study: Study;
+	  +router: GoRouter;
+	  +interventionsArray: FormArray&lt;dynamic&gt;;
+	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
+	  +form: FormGroup;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +interventionsRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestStudySchedule: bool
+	  |
+	  +void setControlsFrom();
+	  +InterventionsFormData buildFormData();
+	  +void read();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +InterventionFormViewModel provide();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +dynamic testStudySchedule()
 	]
 	
-	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
+	[InterventionsFormViewModel]o-[Study]
+	[InterventionsFormViewModel]o-[GoRouter]
+	[InterventionsFormViewModel]o-[FormArray]
+	[InterventionsFormViewModel]o-[FormViewModelCollection]
+	[InterventionsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
+	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
 	
-	[InterventionsFormData
-	  |
-	  +interventionsData: List&lt;InterventionFormData&gt;;
-	  +studyScheduleData: StudyScheduleFormData;
-	  +id: String
+	[InterventionTaskFormView
 	  |
-	  +Study apply();
-	  +InterventionsFormData copy()
+	  +formViewModel: InterventionTaskFormViewModel
 	]
 	
-	[InterventionsFormData]o-[StudyScheduleFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
+	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
 	
 	[InterventionFormViewModel
 	  |
@@ -1126,681 +1361,471 @@
 	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
 	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
 	
-	[StudyDesignReportsFormView
+	[&lt;abstract&gt;StudyDesignPageWidget
 	  |
-	  +Widget build();
-	  -dynamic _showReportItemSidesheetWithArgs()
+	  +Widget? banner()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
 	
-	[ReportItemFormData
-	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
-	  +id: String
+	[StudyDesignInfoFormView
 	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
+	  +Widget build()
 	]
 	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
 	
-	[DataReferenceEditor
+	[StudyInfoFormData
 	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
+	  +title: String;
+	  +description: String?;
+	  +iconName: String;
+	  +contactInfoFormData: StudyContactInfoFormData;
+	  +id: String
 	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
+	  +Study apply();
+	  +StudyInfoFormData copy()
 	]
 	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
+	[StudyInfoFormData]o-[StudyContactInfoFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
 	
-	[TemporalAggregationFormatted
+	[StudyContactInfoFormData
 	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
+	  +organization: String?;
+	  +institutionalReviewBoard: String?;
+	  +institutionalReviewBoardNumber: String?;
+	  +researchers: String?;
+	  +email: String?;
+	  +website: String?;
+	  +phone: String?;
+	  +additionalInfo: String?;
+	  +id: String
 	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
+	  +Study apply();
+	  +StudyInfoFormData copy()
 	]
 	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
 	
-	[ImprovementDirectionFormatted
-	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
+	[StudyInfoFormViewModel
 	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
-	]
-	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
-	
-	[ReportSectionType
+	  +study: Study;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +iconControl: FormControl&lt;IconOption&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +organizationControl: FormControl&lt;String&gt;;
+	  +reviewBoardControl: FormControl&lt;String&gt;;
+	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
+	  +researchersControl: FormControl&lt;String&gt;;
+	  +emailControl: FormControl&lt;String&gt;;
+	  +websiteControl: FormControl&lt;String&gt;;
+	  +phoneControl: FormControl&lt;String&gt;;
+	  +additionalInfoControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +iconRequired: dynamic;
+	  +organizationRequired: dynamic;
+	  +reviewBoardRequired: dynamic;
+	  +reviewBoardNumberRequired: dynamic;
+	  +researchersRequired: dynamic;
+	  +emailRequired: dynamic;
+	  +phoneRequired: dynamic;
+	  +emailFormat: dynamic;
+	  +websiteFormat: dynamic
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
+	  +void setControlsFrom();
+	  +StudyInfoFormData buildFormData()
 	]
 	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
+	[StudyInfoFormViewModel]o-[Study]
+	[StudyInfoFormViewModel]o-[FormControl]
+	[StudyInfoFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
 	
-	[AverageSectionFormView
+	[ScheduleControls
 	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
+	  +formViewModel: WithScheduleControls
 	  |
-	  +Widget build()
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
 	]
 	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
+	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
 	
-	[DataReferenceIdentifier
-	  |
-	  +hashCode: int
+	[&lt;abstract&gt;WithScheduleControls
 	  |
-	  +bool ==()
-	]
-	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
-	
-	[LinearRegressionSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
-	
-	[ReportItemFormViewModel
-	  |
-	  &lt;static&gt;+defaultSectionType: ReportSectionType;
-	  +sectionIdControl: FormControl&lt;String&gt;;
-	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +sectionControl: FormControl&lt;ReportSection&gt;;
-	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
-	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
-	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
-	  +alphaControl: FormControl&lt;double&gt;;
-	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +form: FormGroup;
-	  +sectionId: String;
-	  +sectionType: ReportSectionType;
-	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
-	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
-	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +dataReferenceRequired: dynamic;
-	  +aggregationRequired: dynamic;
-	  +improvementDirectionRequired: dynamic;
-	  +alphaConfidenceRequired: dynamic
+	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
+	  +instanceID: FormControl&lt;String&gt;;
+	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
+	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
+	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
+	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
+	  +hasReminderControl: FormControl&lt;bool&gt;;
+	  +reminderTimeControl: FormControl&lt;Time&gt;;
+	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
+	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
+	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
+	  +hasReminder: bool;
+	  +isTimeRestricted: bool;
+	  +timeRestriction: List&lt;Time&gt;?
 	  |
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +ReportItemFormData buildFormData();
-	  +ReportItemFormViewModel createDuplicate();
-	  +dynamic onSectionTypeChanged();
-	  -void _updateFormControls();
-	  +void setControlsFrom()
+	  +void setScheduleControlsFrom();
+	  -dynamic _initReminderControl()
 	]
 	
-	[ReportItemFormViewModel]o-[ReportSectionType]
-	[ReportItemFormViewModel]o-[FormControl]
-	[ReportItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
+	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
+	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
 	
-	[ReportItemFormView
+	[&lt;abstract&gt;IFormDataWithSchedule
 	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
+	  +instanceId: String;
+	  +isTimeLocked: bool;
+	  +timeLockStart: StudyUTimeOfDay?;
+	  +timeLockEnd: StudyUTimeOfDay?;
+	  +hasReminder: bool;
+	  +reminderTime: StudyUTimeOfDay?
 	  |
-	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
+	  +Schedule toSchedule()
 	]
 	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
+	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
 	
-	[ReportsFormViewModel
+	[&lt;abstract&gt;WithQuestionnaireControls
 	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +reportItemDelegate: ReportFormItemDelegate;
-	  +reportItemArray: FormArray&lt;dynamic&gt;;
-	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +form: FormGroup;
-	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestConsent: bool
+	  +questionsArray: FormArray&lt;dynamic&gt;;
+	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
+	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
+	  +propagateOnSave: bool;
+	  +questionModels: List&lt;Q&gt;;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
 	  |
-	  +void setControlsFrom();
-	  +ReportsFormData buildFormData();
+	  +void setQuestionnaireControlsFrom();
+	  +QuestionnaireFormData buildQuestionnaireFormData();
 	  +void read();
-	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
-	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
-	  +dynamic testReport();
 	  +void onCancel();
 	  +dynamic onSave();
-	  +ReportItemFormViewModel provide()
+	  +Q provide();
+	  +Q provideQuestionFormViewModel()
 	]
 	
-	[ReportsFormViewModel]o-[Study]
-	[ReportsFormViewModel]o-[GoRouter]
-	[ReportsFormViewModel]o-[ReportFormItemDelegate]
-	[ReportsFormViewModel]o-[FormArray]
-	[ReportsFormViewModel]o-[FormViewModelCollection]
-	[ReportsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
 	
-	[ReportFormItemDelegate
+	[QuestionnaireFormData
 	  |
-	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +owner: ReportsFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
+	  +questionsData: List&lt;QuestionFormData&gt;?;
+	  +id: String
 	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
+	  +StudyUQuestionnaire toQuestionnaire();
+	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
+	  +QuestionnaireFormData copy()
 	]
 	
-	[ReportFormItemDelegate]o-[FormViewModelCollection]
-	[ReportFormItemDelegate]o-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
+	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
 	
-	[ReportBadge
-	  |
-	  +status: ReportStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
+	[SurveyQuestionFormView
 	  |
-	  +Widget build()
+	  +formViewModel: QuestionFormViewModel;
+	  +isHtmlStyleable: bool
 	]
 	
-	[ReportBadge]o-[ReportStatus]
-	[ReportBadge]o-[BadgeType]
+	[SurveyQuestionFormView]o-[QuestionFormViewModel]
 	
-	[ReportsFormData
+	[AudioRecordingQuestionFormView
 	  |
-	  +reportItems: List&lt;ReportItemFormData&gt;;
-	  +id: String
+	  +formViewModel: QuestionFormViewModel
 	  |
-	  +Study apply();
-	  +ReportsFormData copy()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
+	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
 	
-	[ReportStatus
+	[FreeTextQuestionFormView
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
-	  &lt;static&gt;+primary: ReportStatus;
-	  &lt;static&gt;+secondary: ReportStatus
+	  +formViewModel: QuestionFormViewModel;
+	  +generateLabelHelpTextMap: dynamic
+	  |
+	  +Widget build();
+	  +Widget disableOnReadonly();
+	  +Widget generateRow()
 	]
 	
-	[ReportStatus]o-[ReportStatus]
-	[Enum]&lt;:--[ReportStatus]
+	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
 	
-	[&lt;abstract&gt;IStudyFormData
+	[ChoiceQuestionFormView
 	  |
-	  +Study apply()
+	  +formViewModel: QuestionFormViewModel
+	  |
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
+	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
 	
-	[StudyInfoFormViewModel
+	[ImageCapturingQuestionFormView
 	  |
-	  +study: Study;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +organizationControl: FormControl&lt;String&gt;;
-	  +reviewBoardControl: FormControl&lt;String&gt;;
-	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
-	  +researchersControl: FormControl&lt;String&gt;;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +websiteControl: FormControl&lt;String&gt;;
-	  +phoneControl: FormControl&lt;String&gt;;
-	  +additionalInfoControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +iconRequired: dynamic;
-	  +organizationRequired: dynamic;
-	  +reviewBoardRequired: dynamic;
-	  +reviewBoardNumberRequired: dynamic;
-	  +researchersRequired: dynamic;
-	  +emailRequired: dynamic;
-	  +phoneRequired: dynamic;
-	  +emailFormat: dynamic;
-	  +websiteFormat: dynamic
+	  +formViewModel: QuestionFormViewModel
 	  |
-	  +void setControlsFrom();
-	  +StudyInfoFormData buildFormData()
+	  +Widget build()
 	]
 	
-	[StudyInfoFormViewModel]o-[Study]
-	[StudyInfoFormViewModel]o-[FormControl]
-	[StudyInfoFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
+	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
 	
-	[StudyDesignInfoFormView
+	[BoolQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
+	[BoolQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
 	
-	[StudyInfoFormData
-	  |
-	  +title: String;
-	  +description: String?;
-	  +iconName: String;
-	  +contactInfoFormData: StudyContactInfoFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
-	]
-	
-	[StudyInfoFormData]o-[StudyContactInfoFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
-	
-	[StudyContactInfoFormData
-	  |
-	  +organization: String?;
-	  +institutionalReviewBoard: String?;
-	  +institutionalReviewBoardNumber: String?;
-	  +researchers: String?;
-	  +email: String?;
-	  +website: String?;
-	  +phone: String?;
-	  +additionalInfo: String?;
-	  +id: String
-	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
-	
-	[StudyFormValidationSet
+	[SurveyQuestionType
 	  |
 	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
-	]
-	
-	[Enum]&lt;:--[StudyFormValidationSet]
-	
-	[MeasurementsFormData
-	  |
-	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
-	  +id: String
-	  |
-	  +Study apply();
-	  +MeasurementsFormData copy()
+	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
+	  &lt;static&gt;+choice: SurveyQuestionType;
+	  &lt;static&gt;+bool: SurveyQuestionType;
+	  &lt;static&gt;+scale: SurveyQuestionType;
+	  &lt;static&gt;+image: SurveyQuestionType;
+	  &lt;static&gt;+audio: SurveyQuestionType;
+	  &lt;static&gt;+freeText: SurveyQuestionType
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
+	[SurveyQuestionType]o-[SurveyQuestionType]
+	[Enum]&lt;:--[SurveyQuestionType]
 	
-	[MeasurementSurveyFormView
+	[&lt;abstract&gt;IScaleQuestionFormViewModel
 	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
+	  +isMidValuesClearedInfoVisible: bool
 	]
 	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
-	
-	[SurveyPreview
-	  |
-	  +routeArgs: MeasurementFormRouteArgs
+	[ScaleQuestionFormView
 	  |
-	  +Widget build()
+	  +formViewModel: QuestionFormViewModel
 	]
 	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
+	[ScaleQuestionFormView]o-[QuestionFormViewModel]
 	
-	[MeasurementSurveyFormData
+	[&lt;abstract&gt;QuestionFormData
 	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
+	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
+	  +questionId: String;
+	  +questionText: String;
+	  +questionInfoText: String?;
+	  +questionType: SurveyQuestionType;
+	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
+	  +responseOptions: List&lt;dynamic&gt;;
 	  +id: String
 	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
-	]
-	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
-	
-	[MeasurementSurveyFormViewModel
-	  |
-	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
-	]
-	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
-	
-	[StudyDesignMeasurementsFormView
-	  |
-	  +Widget build()
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +EligibilityCriterion toEligibilityCriterion();
+	  +Answer&lt;dynamic&gt; constructAnswerFor();
+	  +dynamic setResponseOptionsValidityFrom();
+	  +QuestionFormData copy()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
+	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
 	
-	[MeasurementsFormViewModel
+	[ChoiceQuestionFormData
 	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +measurementsArray: FormArray&lt;dynamic&gt;;
-	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
-	  +form: FormGroup;
-	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +measurementRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +isMultipleChoice: bool;
+	  +answerOptions: List&lt;String&gt;;
+	  +responseOptions: List&lt;String&gt;
 	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +MeasurementsFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +MeasurementSurveyFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave()
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +QuestionFormData copy();
+	  -Choice _buildChoiceForValue();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[MeasurementsFormViewModel]o-[Study]
-	[MeasurementsFormViewModel]o-[GoRouter]
-	[MeasurementsFormViewModel]o-[FormArray]
-	[MeasurementsFormViewModel]o-[FormViewModelCollection]
-	[MeasurementsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
 	
-	[StudyFormScaffold
+	[BoolQuestionFormData
 	  |
-	  +studyId: String;
-	  +formViewModelBuilder: T Function(WidgetRef);
-	  +formViewBuilder: Widget Function(T)
+	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
+	  +responseOptions: List&lt;String&gt;
 	  |
-	  +Widget build()
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +BoolQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[StudyFormScaffold]o-[T Function(WidgetRef)]
-	[StudyFormScaffold]o-[Widget Function(T)]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
 	
-	[ConsentItemFormViewModel
-	  |
-	  +consentIdControl: FormControl&lt;String&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +form: FormGroup;
-	  +consentId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
+	[ImageQuestionFormData
 	  |
-	  +void setControlsFrom();
-	  +ConsentItemFormData buildFormData();
-	  +ConsentItemFormViewModel createDuplicate()
-	]
-	
-	[ConsentItemFormViewModel]o-[FormControl]
-	[ConsentItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
-	
-	[StudyDesignEnrollmentFormView
+	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
+	  +responseOptions: List&lt;String&gt;
 	  |
-	  +Widget build();
-	  -dynamic _showScreenerQuestionSidesheetWithArgs();
-	  -dynamic _showConsentItemSidesheetWithArgs()
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +ImageQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
-	
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
-	  |
-	  +isDirtyOptionsBannerVisible: bool
-	]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
 	
-	[ScreenerQuestionLogicFormView
+	[AudioQuestionFormData
 	  |
-	  +formViewModel: ScreenerQuestionFormViewModel
+	  +maxRecordingDurationSeconds: int;
+	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
+	  +responseOptions: List&lt;String&gt;
 	  |
-	  +Widget build();
-	  -dynamic _buildInfoBanner();
-	  -dynamic _buildAnswerOptionsLogicControls();
-	  -List&lt;Widget&gt; _buildOptionLogicRow()
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +AudioQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
 	
-	[ConsentItemFormData
-	  |
-	  +consentId: String;
-	  +title: String;
-	  +description: String;
-	  +iconName: String?;
-	  +id: String
+	[ScaleQuestionFormData
 	  |
-	  +ConsentItem toConsentItem();
-	  +ConsentItemFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
-	
-	[ConsentItemFormView
+	  +minValue: double;
+	  +maxValue: double;
+	  +minLabel: String?;
+	  +maxLabel: String?;
+	  +midValues: List&lt;double?&gt;;
+	  +midLabels: List&lt;String?&gt;;
+	  +stepSize: double;
+	  +initialValue: double?;
+	  +minColor: Color?;
+	  +maxColor: Color?;
+	  +responseOptions: List&lt;double&gt;;
+	  +midAnnotations: List&lt;Annotation&gt;
 	  |
-	  +formViewModel: ConsentItemFormViewModel
+	  +ScaleQuestion toQuestion();
+	  +QuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[ConsentItemFormView]o-[ConsentItemFormViewModel]
+	[ScaleQuestionFormData]o-[Color]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
 	
-	[EnrollmentFormData
+	[FreeTextQuestionFormData
 	  |
-	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
-	  +enrollmentType: Participation;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
-	  +id: String
+	  +textLengthRange: List&lt;int&gt;;
+	  +textType: FreeTextQuestionType;
+	  +textTypeExpression: String?;
+	  +responseOptions: List&lt;String&gt;
 	  |
-	  +Study apply();
-	  +EnrollmentFormData copy()
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +FreeTextQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[EnrollmentFormData]o-[Participation]
-	[EnrollmentFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
+	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
 	
-	[ScreenerQuestionFormViewModel
+	[QuestionFormViewModel
 	  |
-	  &lt;static&gt;+defaultResponseOptionValidity: bool;
-	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
-	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
-	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
-	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionValues: List&lt;dynamic&gt;;
-	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
+	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
+	  -_titles: Map&lt;FormMode, String Function()&gt;?;
+	  +questionIdControl: FormControl&lt;String&gt;;
+	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
+	  +questionTextControl: FormControl&lt;String&gt;;
+	  +questionInfoTextControl: FormControl&lt;String&gt;;
 	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isDirtyOptionsBannerVisible: bool
-	  |
-	  +dynamic onResponseOptionsChanged();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
-	  +ScreenerQuestionFormViewModel createDuplicate()
-	]
-	
-	[ScreenerQuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
-	
-	[EnrollmentFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
-	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
-	  +consentItemArray: FormArray&lt;dynamic&gt;;
-	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
+	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
+	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +customOptionsMin: int;
+	  +customOptionsMax: int;
+	  +customOptionsInitial: int;
+	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
+	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
+	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
+	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
+	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
+	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
+	  &lt;static&gt;+kDefaultScaleMinValue: int;
+	  &lt;static&gt;+kDefaultScaleMaxValue: int;
+	  &lt;static&gt;+kNumMidValueControls: int;
+	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
+	  +scaleMinValueControl: FormControl&lt;int&gt;;
+	  +scaleMaxValueControl: FormControl&lt;int&gt;;
+	  -_scaleRangeControl: FormControl&lt;int&gt;;
+	  +scaleMinLabelControl: FormControl&lt;String&gt;;
+	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
+	  +scaleMidValueControls: FormArray&lt;int&gt;;
+	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
+	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
+	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
+	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
+	  +prevMidValues: List&lt;int?&gt;?;
+	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
+	  +customRegexControl: FormControl&lt;String&gt;;
+	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
+	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
+	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
+	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
+	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
+	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
+	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
 	  +form: FormGroup;
-	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
-	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
+	  +questionId: String;
+	  +questionType: SurveyQuestionType;
+	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
+	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
+	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +validAnswerOptions: List&lt;String&gt;;
+	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +scaleMinValue: int;
+	  +scaleMaxValue: int;
+	  +scaleRange: int;
+	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
 	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestScreener: bool;
-	  +canTestConsent: bool;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setControlsFrom();
-	  +EnrollmentFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
-	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
-	  +dynamic testScreener();
-	  +dynamic testConsent();
-	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
-	]
-	
-	[EnrollmentFormViewModel]o-[Study]
-	[EnrollmentFormViewModel]o-[GoRouter]
-	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
-	[EnrollmentFormViewModel]o-[FormControl]
-	[EnrollmentFormViewModel]o-[FormArray]
-	[EnrollmentFormViewModel]o-[FormViewModelCollection]
-	[EnrollmentFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
-	
-	[EnrollmentFormConsentItemDelegate
-	  |
-	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +owner: EnrollmentFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
+	  +questionTextRequired: dynamic;
+	  +numValidChoiceOptions: dynamic;
+	  +scaleRangeValid: dynamic;
+	  +maxRecordingDurationValid: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +isAddOptionButtonVisible: bool;
+	  +isMidValuesClearedInfoVisible: bool
 	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ConsentItemFormViewModel provide();
+	  +String? scaleMidLabelAt();
+	  -dynamic _onScaleRangeChanged();
+	  -dynamic _applyInputFormatters();
+	  -dynamic _updateScaleMidValueControls();
+	  -Map&lt;String, dynamic&gt;? _validateFreeText();
+	  -dynamic _onFreeTextLengthChanged();
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +dynamic onQuestionTypeChanged();
+	  +dynamic onResponseOptionsChanged();
+	  -void _updateFormControls();
+	  +void initControls();
+	  +void setControlsFrom();
+	  +QuestionFormData buildFormData();
 	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
 	  +void onNewItem();
-	  +void onSelectItem()
+	  +void onSelectItem();
+	  +dynamic save();
+	  +QuestionFormViewModel createDuplicate()
 	]
 	
-	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
-	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[QuestionFormViewModel]o-[SurveyQuestionType]
+	[QuestionFormViewModel]o-[FormControl]
+	[QuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
+	[QuestionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
 	
 	[StudyFormViewModel
 	  |
@@ -1840,2951 +1865,2637 @@
 	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
 	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
 	
-	[&lt;abstract&gt;WithQuestionnaireControls
+	[StudyDesignMeasurementsFormView
 	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  +Widget build()
+	]
+	
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
+	
+	[MeasurementsFormData
+	  |
+	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
+	  +id: String
+	  |
+	  +Study apply();
+	  +MeasurementsFormData copy()
+	]
+	
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
+	
+	[MeasurementsFormViewModel
+	  |
+	  +study: Study;
+	  +router: GoRouter;
+	  +measurementsArray: FormArray&lt;dynamic&gt;;
+	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
+	  +form: FormGroup;
+	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +measurementRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
 	  +void read();
+	  +void setControlsFrom();
+	  +MeasurementsFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +MeasurementSurveyFormViewModel provide();
 	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
+	  +dynamic onSave()
 	]
 	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[MeasurementsFormViewModel]o-[Study]
+	[MeasurementsFormViewModel]o-[GoRouter]
+	[MeasurementsFormViewModel]o-[FormArray]
+	[MeasurementsFormViewModel]o-[FormViewModelCollection]
+	[MeasurementsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
 	
-	[QuestionnaireFormData
+	[SurveyPreview
 	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
+	  +routeArgs: MeasurementFormRouteArgs
 	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
+	[SurveyPreview]o-[MeasurementFormRouteArgs]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
 	
-	[&lt;abstract&gt;QuestionFormData
+	[MeasurementSurveyFormViewModel
 	  |
-	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
-	  +questionId: String;
-	  +questionText: String;
-	  +questionInfoText: String?;
-	  +questionType: SurveyQuestionType;
-	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
-	  +responseOptions: List&lt;dynamic&gt;;
+	  +study: Study;
+	  +measurementIdControl: FormControl&lt;String&gt;;
+	  +instanceIdControl: FormControl&lt;String&gt;;
+	  +surveyTitleControl: FormControl&lt;String&gt;;
+	  +surveyIntroTextControl: FormControl&lt;String&gt;;
+	  +surveyOutroTextControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +measurementId: String;
+	  +instanceId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +atLeastOneQuestion: dynamic;
+	  +breadcrumbsTitle: String;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void setControlsFrom();
+	  +MeasurementSurveyFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
+	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
+	  +MeasurementSurveyFormViewModel createDuplicate()
+	]
+	
+	[MeasurementSurveyFormViewModel]o-[Study]
+	[MeasurementSurveyFormViewModel]o-[FormControl]
+	[MeasurementSurveyFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
+	
+	[MeasurementSurveyFormData
+	  |
+	  +measurementId: String;
+	  +title: String;
+	  +introText: String?;
+	  +outroText: String?;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  &lt;static&gt;+kDefaultTitle: String;
 	  +id: String
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +EligibilityCriterion toEligibilityCriterion();
-	  +Answer&lt;dynamic&gt; constructAnswerFor();
-	  +dynamic setResponseOptionsValidityFrom();
-	  +QuestionFormData copy()
+	  +QuestionnaireTask toQuestionnaireTask();
+	  +MeasurementSurveyFormData copy()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
+	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
 	
-	[ChoiceQuestionFormData
+	[MeasurementSurveyFormView
 	  |
-	  +isMultipleChoice: bool;
-	  +answerOptions: List&lt;String&gt;;
-	  +responseOptions: List&lt;String&gt;
+	  +formViewModel: MeasurementSurveyFormViewModel
+	]
+	
+	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
+	
+	[&lt;abstract&gt;IStudyFormData
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +QuestionFormData copy();
-	  -Choice _buildChoiceForValue();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +Study apply()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
 	
-	[BoolQuestionFormData
+	[&lt;abstract&gt;IStudyAppBarViewModel
 	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
-	  +responseOptions: List&lt;String&gt;
+	  +isSyncIndicatorVisible: bool;
+	  +isStatusBadgeVisible: bool;
+	  +isPublishVisible: bool
+	]
+	
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
+	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
+	
+	[StudyScaffold
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +BoolQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +studyId: String;
+	  +tabs: List&lt;NavbarTab&gt;?;
+	  +tabsSubnav: List&lt;NavbarTab&gt;?;
+	  +selectedTab: NavbarTab?;
+	  +selectedTabSubnav: NavbarTab?;
+	  +body: StudyPageWidget;
+	  +drawer: Widget?;
+	  +disableActions: bool;
+	  +actionsSpacing: double;
+	  +actionsPadding: double;
+	  +layoutType: SingleColumnLayoutType?;
+	  +appbarHeight: double;
+	  +appbarSubnavHeight: double
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
+	[StudyScaffold]o-[NavbarTab]
+	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
+	[StudyScaffold]o-[&lt;abstract&gt;Widget]
+	[StudyScaffold]o-[SingleColumnLayoutType]
 	
-	[ImageQuestionFormData
+	[&lt;abstract&gt;IStudyNavViewModel
 	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
+	  +isEditTabEnabled: bool;
+	  +isTestTabEnabled: bool;
+	  +isRecruitTabEnabled: bool;
+	  +isMonitorTabEnabled: bool;
+	  +isAnalyzeTabEnabled: bool;
+	  +isSettingsEnabled: bool
+	]
+	
+	[StudyNav
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +ImageQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  &lt;static&gt;+dynamic tabs();
+	  &lt;static&gt;+dynamic edit();
+	  &lt;static&gt;+dynamic test();
+	  &lt;static&gt;+dynamic recruit();
+	  &lt;static&gt;+dynamic monitor();
+	  &lt;static&gt;+dynamic analyze()
+	]
+	
+	[StudyDesignNav
+	  |
+	  &lt;static&gt;+dynamic tabs();
+	  &lt;static&gt;+dynamic info();
+	  &lt;static&gt;+dynamic enrollment();
+	  &lt;static&gt;+dynamic interventions();
+	  &lt;static&gt;+dynamic measurements();
+	  &lt;static&gt;+dynamic reports()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
-	
-	[AudioQuestionFormData
+	[&lt;abstract&gt;StudyPageWidget
 	  |
-	  +maxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
+	  +studyId: String
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +AudioQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +Widget? banner()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
+	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
 	
-	[ScaleQuestionFormData
+	[StudyController
 	  |
-	  +minValue: double;
-	  +maxValue: double;
-	  +minLabel: String?;
-	  +maxLabel: String?;
-	  +midValues: List&lt;double?&gt;;
-	  +midLabels: List&lt;String?&gt;;
-	  +stepSize: double;
-	  +initialValue: double?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +responseOptions: List&lt;double&gt;;
-	  +midAnnotations: List&lt;Annotation&gt;
+	  +notificationService: INotificationService;
+	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
+	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
 	  |
-	  +ScaleQuestion toQuestion();
-	  +QuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +dynamic syncStudyStatus();
+	  +dynamic onStudySubscriptionUpdate();
+	  -dynamic _redirectNewToActualStudyID();
+	  +dynamic publishStudy();
+	  +void onChangeStudyParticipation();
+	  +void onAddParticipants();
+	  +void onSettingsPressed();
+	  +void dispose()
 	]
 	
-	[ScaleQuestionFormData]o-[Color]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
+	[StudyController]o-[&lt;abstract&gt;INotificationService]
+	[StudyController]o-[StreamSubscription]
+	[StudyBaseController]&lt;:-[StudyController]
 	
-	[FreeTextQuestionFormData
+	[WebFrame
 	  |
-	  +textLengthRange: List&lt;int&gt;;
-	  +textType: FreeTextQuestionType;
-	  +textTypeExpression: String?;
-	  +responseOptions: List&lt;String&gt;
+	  +previewSrc: String;
+	  +studyId: String
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +FreeTextQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +Widget build()
 	]
 	
-	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
-	
-	[AudioRecordingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
+	[DisabledFrame
 	  |
 	  +Widget build()
 	]
 	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
-	
-	[FreeTextQuestionFormView
+	[PhoneContainer
 	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
+	  &lt;static&gt;+defaultWidth: double;
+	  &lt;static&gt;+defaultHeight: double;
+	  +width: double;
+	  +height: double;
+	  +borderColor: Color;
+	  +borderWidth: double;
+	  +borderRadius: double;
+	  +innerContent: Widget;
+	  +innerContentBackgroundColor: Color?
 	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
+	  +Widget build()
 	]
 	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
+	[PhoneContainer]o-[Color]
+	[PhoneContainer]o-[&lt;abstract&gt;Widget]
 	
-	[SurveyQuestionType
+	[MobileFrame
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
+	  +Widget build()
 	]
 	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[ImageCapturingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
+	[DesktopFrame
 	  |
 	  +Widget build()
 	]
 	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
+	[StudyTestScreen
 	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
+	  +previewRoute: String?
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  +Widget build();
+	  +Widget? banner();
+	  +dynamic load();
+	  +dynamic save();
+	  +dynamic showHelp()
 	]
 	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
 	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel
 	  |
-	  +Widget build()
+	  +studyParticipation: Participation?;
+	  +studyStatus: StudyStatus?
 	]
 	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
 	
-	[BoolQuestionFormView
+	[StudyStatusBadge
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  +participation: Participation?;
+	  +status: StudyStatus?;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +showTooltip: bool
 	  |
 	  +Widget build()
 	]
 	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
+	[StudyStatusBadge]o-[Participation]
+	[StudyStatusBadge]o-[StudyStatus]
+	[StudyStatusBadge]o-[BadgeType]
 	
-	[QuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
+	[TestAppRoutes
 	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
-	]
-	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
+	  &lt;static&gt;+studyOverview: String;
+	  &lt;static&gt;+eligibility: String;
+	  &lt;static&gt;+intervention: String;
+	  &lt;static&gt;+consent: String;
+	  &lt;static&gt;+journey: String;
+	  &lt;static&gt;+dashboard: String
+	]
 	
-	[SurveyQuestionFormView
+	[PreviewFrame
 	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
+	  +studyId: String;
+	  +routeArgs: StudyFormRouteArgs?;
+	  +route: String?
 	]
 	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
+	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
 	
-	[&lt;abstract&gt;IFormDataWithSchedule
-	  |
-	  +instanceId: String;
-	  +isTimeLocked: bool;
-	  +timeLockStart: StudyUTimeOfDay?;
-	  +timeLockEnd: StudyUTimeOfDay?;
-	  +hasReminder: bool;
-	  +reminderTime: StudyUTimeOfDay?
+	[StudyTestController
 	  |
-	  +Schedule toSchedule()
+	  +authRepository: IAuthRepository;
+	  +languageCode: String
 	]
 	
-	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
+	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyBaseController]&lt;:-[StudyTestController]
 	
-	[ScheduleControls
+	[RouteInformation
 	  |
-	  +formViewModel: WithScheduleControls
+	  +route: String?;
+	  +extra: String?;
+	  +cmd: String?;
+	  +data: String?
 	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
+	  +String toString()
 	]
 	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
-	
-	[&lt;abstract&gt;WithScheduleControls
+	[&lt;abstract&gt;PlatformController
 	  |
-	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
-	  +instanceID: FormControl&lt;String&gt;;
-	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +hasReminderControl: FormControl&lt;bool&gt;;
-	  +reminderTimeControl: FormControl&lt;Time&gt;;
-	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
-	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
-	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  +hasReminder: bool;
-	  +isTimeRestricted: bool;
-	  +timeRestriction: List&lt;Time&gt;?
+	  +studyId: String;
+	  +baseSrc: String;
+	  +previewSrc: String;
+	  +routeInformation: RouteInformation;
+	  +frameWidget: Widget
 	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
+	  +void activate();
+	  +void registerViews();
+	  +void generateUrl();
+	  +void navigate();
+	  +void refresh();
+	  +void listen();
+	  +void send();
+	  +void openNewPage()
 	]
 	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
+	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
+	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget
+	[WebController
 	  |
-	  +Widget? banner()
+	  +iFrameElement: IFrameElement
+	  |
+	  +void activate();
+	  +void registerViews();
+	  +void generateUrl();
+	  +void navigate();
+	  +void refresh();
+	  +void openNewPage();
+	  +void listen();
+	  +void send()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
+	[WebController]o-[IFrameElement]
+	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
 	
-	[StudiesTableColumnHeader
+	[MobileController
 	  |
-	  +title: String;
-	  +sortable: bool;
-	  +sortAscending: bool;
-	  +sortingActive: bool;
-	  +onSort: void Function()?
+	  +void openNewPage();
+	  +void refresh();
+	  +void registerViews();
+	  +void listen();
+	  +void send();
+	  +void navigate();
+	  +void activate();
+	  +void generateUrl()
 	]
 	
-	[StudiesTableColumnHeader]o-[void Function()?]
+	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
 	
-	[DashboardScreen
+	[FrameControlsWidget
 	  |
-	  +filter: StudiesFilter?
+	  +onRefresh: void Function()?;
+	  +onOpenNewTab: void Function()?;
+	  +enabled: bool
+	  |
+	  +Widget build()
 	]
 	
-	[DashboardScreen]o-[StudiesFilter]
+	[FrameControlsWidget]o-[void Function()?]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
 	
-	[DashboardScaffold
+	[StudyParticipationBadge
 	  |
-	  &lt;static&gt;+compactWidthThreshold: double;
-	  +body: Widget
+	  +participation: Participation;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +center: bool
 	  |
 	  +Widget build()
 	]
 	
-	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
+	[StudyParticipationBadge]o-[Participation]
+	[StudyParticipationBadge]o-[BadgeType]
 	
-	[DashboardController
+	[StudyBaseController
 	  |
+	  +studyId: String;
 	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +userRepository: IUserRepository;
 	  +router: GoRouter;
-	  -_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?;
-	  +searchController: SearchController;
-	  +isSortAscending: bool
+	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
 	  |
-	  -dynamic _subscribeStudies();
-	  +dynamic setSearchText();
-	  +dynamic setStudiesFilter();
-	  +dynamic onSelectStudy();
-	  +dynamic onClickNewStudy();
-	  +dynamic pinStudy();
-	  +dynamic pinOffStudy();
-	  +void setSorting();
-	  +void filterStudies();
-	  +void sortStudies();
-	  +bool isSortingActiveForColumn();
-	  +bool isPinned();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +dynamic subscribeStudy();
+	  +dynamic onStudySubscriptionUpdate();
+	  +dynamic onStudySubscriptionError();
 	  +void dispose()
 	]
 	
-	[DashboardController]o-[&lt;abstract&gt;IStudyRepository]
-	[DashboardController]o-[&lt;abstract&gt;IAuthRepository]
-	[DashboardController]o-[&lt;abstract&gt;IUserRepository]
-	[DashboardController]o-[GoRouter]
-	[DashboardController]o-[StreamSubscription]
-	[DashboardController]o-[SearchController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
+	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
+	[StudyBaseController]o-[GoRouter]
+	[StudyBaseController]o-[StreamSubscription]
 	
-	[StudiesFilter
+	[StudySettingsFormViewModel
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
+	  +study: AsyncValue&lt;Study&gt;;
+	  +studyRepository: IStudyRepository;
+	  &lt;static&gt;+defaultPublishedToRegistry: bool;
+	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
+	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
+	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void setControlsFrom();
+	  +Study buildFormData();
+	  +dynamic keepControlsSynced();
+	  +dynamic save();
+	  +dynamic setLaunchDefaults()
 	]
 	
-	[Enum]&lt;:--[StudiesFilter]
+	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
+	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
+	[StudySettingsFormViewModel]o-[FormControl]
+	[StudySettingsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
 	
-	[StudiesTableColumnSize
-	  |
-	  +collapsed: bool;
-	  +flex: int?;
-	  +width: double?
+	[StudySettingsDialog
 	  |
-	  +Widget createContainer()
+	  +Widget build()
 	]
 	
-	[StudiesTable
-	  |
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +compactWidthThreshold: double;
-	  +superCompactWidthThreshold: double;
-	  +compactStatTitleThreshold: double;
-	  +studies: List&lt;Study&gt;;
-	  +onSelect: void Function(Study);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study);
-	  +emptyWidget: Widget;
-	  +pinnedStudies: Iterable&lt;String&gt;;
-	  +dashboardController: DashboardController
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
+	
+	[AccountSettingsDialog
 	  |
-	  +Widget build();
-	  -Widget _buildColumnHeader()
+	  +Widget build()
 	]
 	
-	[StudiesTable]o-[void Function(Study)]
-	[StudiesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)]
-	[StudiesTable]o-[&lt;abstract&gt;Widget]
-	[StudiesTable]o-[DashboardController]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AccountSettingsDialog]
 	
-	[StudiesTableColumn
+	[PublishDialog
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesTableColumn&gt;;
-	  &lt;static&gt;+pin: StudiesTableColumn;
-	  &lt;static&gt;+title: StudiesTableColumn;
-	  &lt;static&gt;+status: StudiesTableColumn;
-	  &lt;static&gt;+participation: StudiesTableColumn;
-	  &lt;static&gt;+createdAt: StudiesTableColumn;
-	  &lt;static&gt;+enrolled: StudiesTableColumn;
-	  &lt;static&gt;+active: StudiesTableColumn;
-	  &lt;static&gt;+completed: StudiesTableColumn;
-	  &lt;static&gt;+action: StudiesTableColumn
+	  +Widget build()
 	]
 	
-	[StudiesTableColumn]o-[StudiesTableColumn]
-	[Enum]&lt;:--[StudiesTableColumn]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
 	
-	[StudiesTableItem
+	[PublishSuccessDialog
 	  |
-	  +study: Study;
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
-	  +isPinned: bool;
-	  +onPinnedChanged: void Function(Study, bool)?;
-	  +onTap: void Function(Study)?
+	  +Widget build()
+	]
+	
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
+	
+	[PublishConfirmationDialog
+	  |
+	  +Widget build()
 	]
 	
-	[StudiesTableItem]o-[Study]
-	[StudiesTableItem]o-[void Function(Study, bool)?]
-	[StudiesTableItem]o-[void Function(Study)?]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
 	
-	[App
+	[StudyMonitorScreen
+	  |
+	  +Widget build()
 	]
 	
-	[AppContent
-	]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
 	
-	[AccountSettingsDialog
+	[&lt;abstract&gt;IAppDelegate
 	  |
-	  +Widget build()
+	  +dynamic onAppStart()
 	]
 	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AccountSettingsDialog]
+	[AppController
+	  |
+	  +appDelegates: List&lt;IAppDelegate&gt;;
+	  -_delayedFuture: dynamic;
+	  +isInitialized: dynamic
+	  |
+	  +dynamic onAppStart();
+	  -dynamic _callDelegates()
+	]
 	
 	</desc>
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="3778.0" width="48837.5" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="3778.0" width="45026.8" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
 				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M19716.9 1408.0 L18636.75 1607 L18636.75 2265 L18636.8 2265.0 " fill="none"></path>
-					<path d="M19717.9 1413.3 L19716.9 1408.0 L19715.9 1402.8 L19730.0 1405.6 Z"></path>
-					<path d="M103.5 2361.2 L103.5 2985 L1100 3143.302597955707 L1100.0 3143.3 " fill="none"></path>
+					<path d="M137.5 1548.9 L89.5 1607 L89.5 2280.5 L89.5 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M108.8 2351.8 L103.5 2361.2 L98.2 2351.8 L103.5 2342.5 Z"></path>
+						<path d="M147.6 1545.1 L137.5 1548.9 L139.4 1538.3 L149.4 1534.5 Z"></path>
 					</g>
-					<path d="M737.6 1410.0 L103.5 1607 L103.5 2249.5 L103.5 2249.5 " fill="none"></path>
-					<path d="M739.2 1415.0 L737.6 1410.0 L736.1 1404.9 L750.4 1406.0 Z"></path>
-					<path d="M676.5 2361.2 L676.5 2985 L1100 3116.4188851913477 L1100.0 3116.4 " fill="none"></path>
+					<path d="M371.0 1550.2 L407.5 1607 L407.5 2280.5 L407.5 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M681.8 2351.8 L676.5 2361.2 L671.2 2351.8 L676.5 2342.5 Z"></path>
+						<path d="M370.5 1539.5 L371.0 1550.2 L361.5 1545.2 L361.0 1534.5 Z"></path>
 					</g>
-					<path d="M784.8 1417.6 L676.5 1607 L676.5 2249.5 L676.5 2249.5 " fill="none"></path>
-					<path d="M789.4 1420.2 L784.8 1417.6 L780.1 1414.9 L791.4 1406.0 Z"></path>
-					<path d="M924.0 2361.2 L924 2985 L1119.230563002681 3088 L1119.2 3088.0 " fill="none"></path>
+					<path d="M525.0 1527.0 L675.25 1607 L16841 2294.4902708124373 L16841.0 2294.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M929.3 2351.8 L924.0 2361.2 L918.7 2351.8 L924.0 2342.5 Z"></path>
+						<path d="M519.2 1517.9 L525.0 1527.0 L514.2 1527.3 L508.5 1518.2 Z"></path>
 					</g>
-					<path d="M815.7 1417.6 L924 1607 L924 2249.5 L924.0 2249.5 " fill="none"></path>
-					<path d="M820.4 1414.9 L815.7 1417.6 L811.1 1420.2 L809.1 1406.0 Z"></path>
-					<path d="M1206.5 2376.2 L1206.5 2985 L1245.7117962466489 3088 L1245.7 3088.0 " fill="none"></path>
+					<path d="M525.3 1514.9 L715.25 1607 L998.8131349782293 2107 L998.8 2107.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1211.8 2366.8 L1206.5 2376.2 L1201.2 2366.8 L1206.5 2357.5 Z"></path>
+						<path d="M519.2 1506.1 L525.3 1514.9 L514.6 1515.7 L508.5 1506.8 Z"></path>
 					</g>
-					<path d="M841.1 1412.3 L1206.5 1607 L1206.5 2234.5 L1206.5 2234.5 " fill="none"></path>
-					<path d="M843.6 1407.6 L841.1 1412.3 L838.6 1417.0 L829.3 1406.0 Z"></path>
-					<path d="M1353.2 1468.8 L1296 1607 L14216.25 2294.11207378963 L14216.3 2294.1 " fill="none"></path>
+					<path d="M1362.4 3072.2 L1375.75 3065.5 L1383.25 3065.5 L1383.25 3065.5 L1390.75 3171.5 L1390.75 3171.5 L1383.25 3277.5 L1383.25 3277.5 L1375.75 3277.5 L1375.75 3277.5 L1345.75 3262.393111638955 L1345.8 3262.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1361.6 1462.2 L1353.2 1468.8 L1351.8 1458.1 L1360.3 1451.5 Z"></path>
+						<path d="M1351.7 3071.6 L1362.4 3072.2 L1356.5 3081.2 L1345.8 3080.6 Z"></path>
 					</g>
-					<path d="M1385.5 1470.2 L1385.5 1607 L1385.5 2296 L1385.5 2296 L1385.5 2985 L1385.5 2985 L1325.8538873994637 3088 L1325.9 3088.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1390.8 1460.8 L1385.5 1470.2 L1380.2 1460.8 L1385.5 1451.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M2085.5 2324.2 L1869.75 2985 L1345.75 3123.716820440028 L1345.8 3123.7 " fill="none"></path>
 					</g>
-					<path d="M1400.2 1469.9 L1425.5 1607 L3556.7022859216254 2280.5 L3556.7 2280.5 " fill="none"></path>
+					<path d="M2090.6 2325.8 L2085.5 2324.2 L2080.5 2322.5 L2089.7 2311.5 Z"></path>
+					<path d="M2879.3 2413.2 L2862.75 2985 L27168 3171.266259515322 L27168.0 3171.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1403.7 1459.7 L1400.2 1469.9 L1393.2 1461.6 L1396.8 1451.5 Z"></path>
+						<path d="M2885.0 2404.0 L2879.3 2413.2 L2874.3 2403.7 L2879.9 2394.5 Z"></path>
 					</g>
-					<path d="M1850.0 2368.2 L1850 2985 L32856 3171.1607726358147 L32856.0 3171.2 " fill="none"></path>
+					<path d="M2905.1 2412.8 L3014.5 2985 L2892.553619302949 3156 L2892.6 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1855.3 2358.8 L1850.0 2368.2 L1844.7 2358.8 L1850.0 2349.5 Z"></path>
+						<path d="M2908.6 2402.7 L2905.1 2412.8 L2898.1 2404.7 L2901.6 2394.5 Z"></path>
 					</g>
-					<path d="M2267.1 2374.9 L2090 2985 L586.9879356568365 3156 L587.0 3156.0 " fill="none"></path>
+					<path d="M2911.8 2412.6 L3054.5 2985 L3126.0174262734586 3156 L3126.0 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2274.8 2367.5 L2267.1 2374.9 L2264.6 2364.5 L2272.3 2357.0 Z"></path>
+						<path d="M2914.7 2402.3 L2911.8 2412.6 L2904.4 2404.8 L2907.3 2394.5 Z"></path>
 					</g>
-					<path d="M2319.7 2374.5 L2550.5 2985 L32856 3171.1529461168566 L32856.0 3171.2 " fill="none"></path>
+					<path d="M941.0 1463.2 L941 1607 L16841 2294.4650936588123 L16841.0 2294.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2321.4 2363.8 L2319.7 2374.5 L2311.4 2367.6 L2313.1 2357.0 Z"></path>
+						<path d="M946.3 1453.8 L941.0 1463.2 L935.7 1453.8 L941.0 1444.5 Z"></path>
 					</g>
-					<path d="M35524.8 2562.7 L34876.75 2985 L31289.5 3167.8803731292282 L31289.5 3167.9 " fill="none"></path>
+					<path d="M1271.0 1470.2 L1271 1607 L11391 2291.1326530612246 L11391.0 2291.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35535.5 2562.1 L35524.8 2562.7 L35529.7 2553.1 L35540.4 2552.5 Z"></path>
+						<path d="M1276.3 1460.8 L1271.0 1470.2 L1265.7 1460.8 L1271.0 1451.5 Z"></path>
 					</g>
-					<path d="M35582.3 2563.8 L35029.25 2985 L16485.5 3170.6589966582114 L16485.5 3170.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35593.0 2562.4 L35582.3 2563.8 L35586.5 2553.9 L35597.2 2552.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M2093.1 2324.8 L2054.75 2985 L2469.1896782841823 3133 L2469.2 3133.0 " fill="none"></path>
 					</g>
-					<path d="M35597.5 2564.1 L35069.25 2985 L34499.75 3157.5617384240454 L34499.8 3157.6 " fill="none"></path>
+					<path d="M2098.4 2325.1 L2093.1 2324.8 L2087.8 2324.5 L2093.9 2311.5 Z"></path>
+					<path d="M1087.9 2503.6 L1046 2985 L24686.5 3170.9062763535167 L24686.5 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35608.1 2562.5 L35597.5 2564.1 L35601.4 2554.1 L35612.1 2552.5 Z"></path>
+						<path d="M1094.0 2494.8 L1087.9 2503.6 L1083.4 2493.8 L1089.5 2485.0 Z"></path>
 					</g>
-					<path d="M36002.8 2570.6 L36106.5 2985 L32969 3168.200923606763 L32969.0 3168.2 " fill="none"></path>
+					<path d="M1171.4 2502.8 L1323.75 2985 L11384.25 3170.193036569116 L11384.3 3170.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36005.7 2560.3 L36002.8 2570.6 L35995.3 2562.8 L35998.2 2552.5 Z"></path>
+						<path d="M1173.6 2492.3 L1171.4 2502.8 L1163.5 2495.5 L1165.7 2485.0 Z"></path>
 					</g>
-					<path d="M36018.6 2570.3 L36146.5 2985 L39344.75 3168.4880027685917 L39344.8 3168.5 " fill="none"></path>
+					<path d="M1183.2 2502.5 L1363.75 2985 L717.8009383378017 3156 L717.8 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36021.0 2559.8 L36018.6 2570.3 L36010.8 2563.0 L36013.1 2552.5 Z"></path>
+						<path d="M1185.0 2491.9 L1183.2 2502.5 L1175.0 2495.6 L1176.7 2485.0 Z"></path>
 					</g>
-					<path d="M36034.4 2570.0 L36186.5 2985 L1455 3170.5517130252942 L1455.0 3170.6 " fill="none"></path>
+					<path d="M1204.8 2501.8 L1436.75 2985 L24877.5 3171.1347302202307 L24877.5 3171.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36036.2 2559.4 L36034.4 2570.0 L36026.2 2563.1 L36028.0 2552.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M38020.2 96.9 L35934 203 L35934 539.5 L35934 539.5 L35934 876 L35934 876 L35934 1025 L35934 1025 L35934 1174 L35934 1174 L35934 1390.5 L35934 1390.5 L35934 1607 L35934 1607 L35934 2039.5 L35934.0 2039.5 " fill="none"></path>
+						<path d="M1205.6 2491.1 L1204.8 2501.8 L1196.0 2495.7 L1196.7 2485.0 Z"></path>
 					</g>
-					<path d="M38020.5 102.3 L38020.2 96.9 L38019.9 91.6 L38033.5 96.3 Z"></path>
-					<path d="M1472.3 3093.1 L1485 3088 L1492.5 3088 L1492.5 3088 L1500 3171.5 L1500 3171.5 L1492.5 3255 L1492.5 3255 L1485 3255 L1485 3255 L1455 3242.9277108433735 L1455.0 3242.9 " fill="none"></path>
+					<path d="M1216.5 2501.4 L1476.75 2985 L11174.25 3169.8795042167135 L11174.3 3169.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1461.7 3091.6 L1472.3 3093.1 L1465.6 3101.5 L1455.0 3100.1 Z"></path>
+						<path d="M1216.8 2490.7 L1216.5 2501.4 L1207.4 2495.7 L1207.7 2485.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2994.6 2322.9 L2590.5 2985 L1455 3146.2876999238383 L1455.0 3146.3 " fill="none"></path>
-					</g>
-					<path d="M2999.1 2325.7 L2994.6 2322.9 L2990.0 2320.1 L3001.5 2311.5 Z"></path>
-					<path d="M1027.8 3121.9 L1040 3118 L1047.5 3118 L1047.5 3118 L1055 3171.5 L1055 3171.5 L1047.5 3225 L1047.5 3225 L1040 3225 L1040 3225 L1010 3215.5309734513276 L1010.0 3215.5 " fill="none"></path>
+					<path d="M1237.8 2500.7 L1549.75 2985 L903.8009383378017 3156 L903.8 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1017.3 3119.6 L1027.8 3121.9 L1020.5 3129.7 L1010.0 3127.5 Z"></path>
+						<path d="M1237.3 2490.0 L1237.8 2500.7 L1228.3 2495.7 L1227.7 2485.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M2996.0 2323.2 L2630.5 2985 L1010 3156.7177556818183 L1010.0 3156.7 " fill="none"></path>
+						<path d="M1508.1 1418.0 L1416.25 1607 L1191.104862119013 2107 L1191.1 2107.0 " fill="none"></path>
 					</g>
-					<path d="M3000.7 2325.8 L2996.0 2323.2 L2991.3 2320.6 L3002.4 2311.5 Z"></path>
-					<path d="M2204.8 1447.4 L1465.5 1607 L1465.5 2296 L1465.5 2296 L1465.5 2985 L1465.5 2985 L10354.25 3170.0634227345035 L10354.3 3170.1 " fill="none"></path>
+					<path d="M1512.9 1420.3 L1508.1 1418.0 L1503.3 1415.7 L1514.0 1406.0 Z"></path>
+					<path d="M3458.8 2345.7 L3458.75 2985 L2725 3140.196342500709 L2725.0 3140.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2215.0 1450.6 L2204.8 1447.4 L2212.8 1440.2 L2223.0 1443.4 Z"></path>
+						<path d="M3464.1 2336.3 L3458.8 2345.7 L3453.4 2336.3 L3458.8 2327.0 Z"></path>
 					</g>
-					<path d="M2204.9 1454.5 L1577.5 1607 L1577.5 2280.5 L1577.5 2280.5 " fill="none"></path>
+					<path d="M6374.5 2569.3 L6174 2985 L11384.25 3168.9927337278104 L11384.3 3169.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2215.2 1457.5 L2204.9 1454.5 L2212.7 1447.1 L2223.0 1450.1 Z"></path>
+						<path d="M6383.3 2563.2 L6374.5 2569.3 L6373.7 2558.6 L6382.6 2552.5 Z"></path>
 					</g>
-					<path d="M2727.9 1586.6 L2755 1607 L2755 2280.5 L2755.0 2280.5 " fill="none"></path>
+					<path d="M6592.5 2570.3 L6723 2985 L5251.25 3161.4302587176603 L5251.3 3161.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2723.7 1576.7 L2727.9 1586.6 L2717.2 1585.2 L2713.0 1575.3 Z"></path>
+						<path d="M6594.8 2559.8 L6592.5 2570.3 L6584.7 2563.0 L6586.9 2552.5 Z"></path>
 					</g>
-					<path d="M2731.1 1456.1 L3336.25 1607 L16997.25 2292.3876793126046 L16997.3 2292.4 " fill="none"></path>
+					<path d="M6608.4 2570.0 L6763 2985 L24877.5 3171.027601112304 L24877.5 3171.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2723.3 1448.7 L2731.1 1456.1 L2720.8 1459.0 L2713.0 1451.6 Z"></path>
+						<path d="M6610.1 2559.4 L6608.4 2570.0 L6600.1 2563.1 L6601.8 2552.5 Z"></path>
 					</g>
-					<path d="M2731.2 1453.2 L3376.25 1607 L3767.7402031930333 2280.5 L3767.7 2280.5 " fill="none"></path>
+					<path d="M6730.0 2566.9 L7075.25 2985 L22836 3170.833812767706 L22836.0 3170.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2723.3 1445.9 L2731.2 1453.2 L2720.8 1456.3 L2713.0 1448.9 Z"></path>
+						<path d="M6728.1 2556.3 L6730.0 2566.9 L6719.9 2563.1 L6718.1 2552.5 Z"></path>
 					</g>
-					<path d="M2731.2 1450.6 L3416.25 1607 L16431.25 2293.7048282727724 L16431.3 2293.7 " fill="none"></path>
+					<path d="M6745.3 2566.5 L7115.25 2985 L27269 3171.0154345808846 L27269.0 3171.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2723.3 1443.3 L2731.2 1450.6 L2720.9 1453.7 L2713.0 1446.4 Z"></path>
+						<path d="M6743.1 2556.0 L6745.3 2566.5 L6735.2 2563.0 L6733.0 2552.5 Z"></path>
 					</g>
-					<path d="M2731.2 1448.2 L3456.25 1607 L4039.33091436865 2280.5 L4039.3 2280.5 " fill="none"></path>
+					<path d="M6760.7 2566.1 L7155.25 2985 L3711.75 3162.357843137255 L3711.8 3162.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2723.3 1441.0 L2731.2 1448.2 L2721.0 1451.4 L2713.0 1444.2 Z"></path>
+						<path d="M6758.1 2555.6 L6760.7 2566.1 L6750.4 2563.0 L6747.9 2552.5 Z"></path>
 					</g>
-					<path d="M2731.3 1445.9 L3496.25 1607 L14216.25 2293.7258611872994 L14216.3 2293.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2723.2 1438.8 L2731.3 1445.9 L2721.0 1449.2 L2713.0 1442.1 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M26958.7 92.1 L6506.25 203 L6506.25 539.5 L6506.25 539.5 L6506.25 876 L6506.25 876 L6506.25 1025 L6506.25 1025 L6506.25 1174 L6506.25 1174 L6506.25 1390.5 L6506.25 1390.5 L6506.25 1607 L6506.25 1607 L6506.25 2039.5 L6506.3 2039.5 " fill="none"></path>
 					</g>
-					<path d="M2731.3 1440.6 L3605.75 1607 L3605.75 2280.5 L3605.8 2280.5 " fill="none"></path>
+					<path d="M26958.7 97.4 L26958.7 92.1 L26958.6 86.7 L26972.0 92.0 Z"></path>
+					<path d="M3730.3 3146.5 L4190.25 3088 L4309.875 3088 L4309.875 3088 L4429.5 3171.5 L4429.5 3171.5 L4309.875 3255 L4309.875 3255 L4190.25 3255 L4190.25 3255 L3711.75 3194.093368902439 L3711.8 3194.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2723.2 1433.6 L2731.3 1440.6 L2721.2 1444.1 L2713.0 1437.1 Z"></path>
+						<path d="M3720.3 3142.4 L3730.3 3146.5 L3721.7 3153.0 L3711.8 3148.9 Z"></path>
 					</g>
-					<path d="M43309.8 688.9 L42748 876 L42748 1025 L42748 1025 L42748 1174 L42748 1174 L42748 1359.5 L42748.0 1359.5 " fill="none"></path>
-					<path d="M43311.5 694.0 L43309.8 688.9 L43308.2 683.8 L43322.5 684.7 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M27040.0 111.9 L26810.5 203 L26810.5 524 L26810.5 524.0 " fill="none"></path>
+						<path d="M2094.8 2324.8 L2094.75 2985 L3356.75 3148.50329975686 L3356.8 3148.5 " fill="none"></path>
 					</g>
-					<path d="M27042.0 116.9 L27040.0 111.9 L27038.1 107.0 L27052.4 107.0 Z"></path>
-					<path d="M39850.3 3669.7 L39850.25 3671 L38651.25 3705.106169871795 L38651.3 3705.1 " fill="none"></path>
+					<path d="M2100.1 2324.8 L2094.8 2324.8 L2089.4 2324.8 L2094.8 2311.5 Z"></path>
+					<path d="M1762.5 2361.2 L1762.5 2985 L3356.75 3152.815789473684 L3356.8 3152.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39855.6 3660.3 L39850.3 3669.7 L39844.9 3660.3 L39850.3 3651.0 Z"></path>
+						<path d="M1767.8 2351.8 L1762.5 2361.2 L1757.2 2351.8 L1762.5 2342.5 Z"></path>
 					</g>
-					<path d="M32687.7 3561.7 L32166.75 3671 L41462.5 3706.3044077134987 L41462.5 3706.3 " fill="none"></path>
+					<path d="M2622.9 1409.0 L1762.5 1607 L1762.5 2249.5 L1762.5 2249.5 " fill="none"></path>
+					<path d="M2624.1 1414.2 L2622.9 1409.0 L2621.7 1403.8 L2635.9 1406.0 Z"></path>
+					<path d="M3226.3 2361.2 L3226.25 2985 L3396.3518766756033 3088 L3396.4 3088.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32698.0 3565.0 L32687.7 3561.7 L32695.8 3554.5 L32706.0 3557.8 Z"></path>
+						<path d="M3231.6 2351.8 L3226.3 2361.2 L3220.9 2351.8 L3226.3 2342.5 Z"></path>
 					</g>
-					<path d="M32912.5 3617.2 L32912.5 3671 L31752.25 3704.156671362447 L31752.3 3704.2 " fill="none"></path>
+					<path d="M2753.0 1411.1 L3226.25 1607 L3226.25 2249.5 L3226.3 2249.5 " fill="none"></path>
+					<path d="M2755.1 1406.2 L2753.0 1411.1 L2751.0 1416.0 L2740.7 1406.0 Z"></path>
+					<path d="M4008.8 2361.2 L4008.75 2985 L3711.75 3101.7344573234986 L3711.8 3101.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32917.8 3607.8 L32912.5 3617.2 L32907.2 3607.8 L32912.5 3598.5 Z"></path>
+						<path d="M4014.1 2351.8 L4008.8 2361.2 L4003.4 2351.8 L4008.8 2342.5 Z"></path>
 					</g>
-					<path d="M33137.7 3522.5 L37301.5 3671 L32043.25 3705.672463431623 L32043.3 3705.7 " fill="none"></path>
+					<path d="M2809.9 1408.2 L4008.75 1607 L4008.75 2249.5 L4008.8 2249.5 " fill="none"></path>
+					<path d="M2810.7 1402.9 L2809.9 1408.2 L2809.0 1413.4 L2796.7 1406.0 Z"></path>
+					<path d="M5361.8 2368.2 L5361.75 2985 L22836 3170.8989275986482 L22836.0 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33128.5 3516.9 L33137.7 3522.5 L33128.1 3527.5 L33119.0 3521.9 Z"></path>
+						<path d="M5367.1 2358.8 L5361.8 2368.2 L5356.4 2358.8 L5361.8 2349.5 Z"></path>
 					</g>
-					<path d="M32912.5 3200.3 L32912.5 3358 L32912.5 3430.5 L32912.5 3430.5 " fill="none"></path>
-					<path d="M32917.8 3200.3 L32912.5 3200.3 L32907.2 3200.3 L32912.5 3187.0 Z"></path>
-					<path d="M5185.8 2383.7 L5185.75 2985 L10354.25 3169.0430071599044 L10354.3 3169.0 " fill="none"></path>
+					<path d="M5778.8 2374.9 L5601.75 2985 L4733.2258713136725 3156 L4733.2 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5191.1 2374.3 L5185.8 2383.7 L5180.4 2374.3 L5185.8 2365.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M27091.5 120.3 L27091.5 203 L27091.5 524 L27091.5 524.0 " fill="none"></path>
-					</g>
-					<path d="M27096.8 120.3 L27091.5 120.3 L27086.2 120.3 L27091.5 107.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M27151.8 92.4 L34765.75 203 L34765.75 508.5 L34765.8 508.5 " fill="none"></path>
+						<path d="M5786.6 2367.5 L5778.8 2374.9 L5776.3 2364.5 L5784.0 2357.0 Z"></path>
 					</g>
-					<path d="M27151.9 87.0 L27151.8 92.4 L27151.8 97.7 L27138.5 92.2 Z"></path>
-					<path d="M38014.9 98.7 L36399 203 L36399 539.5 L36399 539.5 L36399 876 L36399 876 L36399 1025 L36399 1025 L36399 1174 L36399 1174 L36399 1390.5 L36399 1390.5 L36399 1607 L36399 1607 L36399 2296 L36399 2296 L36399 2985 L36399 2985 L39344.75 3168.2343450346034 L39344.8 3168.2 " fill="none"></path>
+					<path d="M5839.3 2373.8 L6134 2985 L22836 3170.8712295253154 L22836.0 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38024.5 103.5 L38014.9 98.7 L38023.8 92.8 L38033.5 97.5 Z"></path>
+						<path d="M5840.0 2363.1 L5839.3 2373.8 L5830.4 2367.7 L5831.2 2357.0 Z"></path>
 					</g>
-					<path d="M44329.5 120.3 L44329.5 203 L44329.5 486 L44329.5 486.0 " fill="none"></path>
-					<path d="M44334.8 120.3 L44329.5 120.3 L44324.2 120.3 L44329.5 107.0 Z"></path>
-					<path d="M43305.5 745.3 L43017.75 876 L43017.75 1025 L43017.75 1025 L43017.75 1174 L43017.75 1174 L43017.75 1390.5 L43017.75 1390.5 L43017.75 1607 L43017.75 1607 L43017.75 2296 L43017.75 2296 L43017.75 2985 L43017.75 2985 L28810.25 3169.6672997177407 L28810.3 3169.7 " fill="none"></path>
+					<path d="M5007.8 1460.1 L4726.25 1607 L16841 2293.986913849509 L16841.0 2294.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43316.2 746.3 L43305.5 745.3 L43311.8 736.6 L43322.5 737.6 Z"></path>
+						<path d="M5018.5 1460.5 L5007.8 1460.1 L5013.6 1451.1 L5024.3 1451.5 Z"></path>
 					</g>
-					<path d="M43341.0 867.5 L43330.25 876 L43330.25 1009.5 L43330.3 1009.5 " fill="none"></path>
+					<path d="M5148.6 1470.1 L5161.25 1607 L5161.25 2296 L5161.25 2296 L5161.25 2985 L5161.25 2985 L3711.75 3151.153503380455 L3711.8 3151.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43351.7 866.0 L43341.0 867.5 L43345.1 857.6 L43355.7 856.0 Z"></path>
+						<path d="M5153.1 1460.3 L5148.6 1470.1 L5142.4 1461.3 L5146.9 1451.5 Z"></path>
 					</g>
-					<path d="M43893.4 873.3 L43894.5 876 L43894.5 986.5 L43894.5 986.5 " fill="none"></path>
+					<path d="M5288.6 1436.6 L5833.75 1607 L8400 2282.1871121718377 L8400.0 2282.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43894.9 862.7 L43893.4 873.3 L43885.0 866.7 L43886.4 856.0 Z"></path>
+						<path d="M5281.2 1428.7 L5288.6 1436.6 L5278.1 1438.9 L5270.8 1431.0 Z"></path>
 					</g>
-					<path d="M44209.8 856.4 L44237.75 876 L44237.75 1025 L44237.75 1025 L44237.75 1174 L44237.75 1174 L44237.75 1390.5 L44237.75 1390.5 L44237.75 1607 L44237.75 1607 L44237.75 2296 L44237.75 2296 L44237.75 2985 L44237.75 2985 L44237.75 3171.5 L44237.75 3171.5 L44237.75 3358 L44237.75 3358 L44237.75 3514.5 L44237.75 3514.5 L44237.75 3671 L44237.75 3671 L41565.5 3705.8287746672786 L41565.5 3705.8 " fill="none"></path>
+					<path d="M4291.3 2376.2 L4291.25 2985 L3711.75 3127.769815059445 L3711.8 3127.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44205.2 846.6 L44209.8 856.4 L44199.1 855.4 L44194.5 845.6 Z"></path>
+						<path d="M4296.6 2366.8 L4291.3 2376.2 L4285.9 2366.8 L4291.3 2357.5 Z"></path>
 					</g>
-					<path d="M44210.8 788.7 L44369.25 876 L44369.25 1009.5 L44369.3 1009.5 " fill="none"></path>
+					<path d="M2826.0 1407.2 L4291.25 1607 L4291.25 2234.5 L4291.3 2234.5 " fill="none"></path>
+					<path d="M2826.7 1401.9 L2826.0 1407.2 L2825.2 1412.5 L2812.8 1405.4 Z"></path>
+					<path d="M5423.6 182.6 L5356.25 203 L5356.25 524 L5356.3 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44205.2 779.6 L44210.8 788.7 L44200.1 788.9 L44194.5 779.7 Z"></path>
+						<path d="M5434.1 185.0 L5423.6 182.6 L5431.0 174.8 L5441.5 177.2 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M38233.8 93.6 L43758.5 203 L43758.5 223 L43758.5 223.0 " fill="none"></path>
-					</g>
-					<path d="M38233.9 88.3 L38233.8 93.6 L38233.7 98.9 L38220.5 93.4 Z"></path>
-					<path d="M28827.8 3114.9 L28840.25 3110.5 L28847.75 3110.5 L28847.75 3110.5 L28855.25 3171.5 L28855.25 3171.5 L28847.75 3232.5 L28847.75 3232.5 L28840.25 3232.5 L28840.25 3232.5 L28810.25 3221.7982456140353 L28810.3 3221.8 " fill="none"></path>
+					<path d="M5717.3 201.6 L5717.25 203 L5717.25 524 L5717.3 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28817.2 3113.0 L28827.8 3114.9 L28820.8 3123.1 L28810.3 3121.2 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2997.4 2323.5 L2670.5 2985 L28528.25 3170.4885475263236 L28528.3 3170.5 " fill="none"></path>
+						<path d="M5723.3 192.7 L5717.3 201.6 L5712.6 192.0 L5718.6 183.0 Z"></path>
 					</g>
-					<path d="M3002.2 2325.8 L2997.4 2323.5 L2992.7 2321.1 L3003.3 2311.5 Z"></path>
-					<path d="M5748.9 2404.8 L5509.75 2985 L31329.5 3170.8127309209826 L31329.5 3170.8 " fill="none"></path>
+					<path d="M6025.4 182.6 L6092.75 203 L6092.75 524 L6092.8 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5757.4 2398.2 L5748.9 2404.8 L5747.5 2394.1 L5756.0 2387.5 Z"></path>
+						<path d="M6018.0 174.8 L6025.4 182.6 L6014.9 185.0 L6007.5 177.2 Z"></path>
 					</g>
-					<path d="M5831.3 2405.2 L6030.5 2985 L13783.5 3169.477481500383 L13783.5 3169.5 " fill="none"></path>
+					<path d="M6025.9 144.2 L6362.25 203 L6362.25 524 L6362.3 524.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5833.3 2394.6 L5831.3 2405.2 L5823.2 2398.1 L5825.2 2387.5 Z"></path>
+						<path d="M6017.6 137.3 L6025.9 144.2 L6015.8 147.8 L6007.5 141.0 Z"></path>
 					</g>
-					<path d="M4960.9 1444.1 L4091.25 1607 L5567.656023222061 2204.5 L5567.7 2204.5 " fill="none"></path>
-					<path d="M4961.9 1449.3 L4960.9 1444.1 L4959.9 1438.9 L4974.0 1441.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M7015.1 1419.3 L6997.75 1607 L5953.64259796807 2204.5 L5953.6 2204.5 " fill="none"></path>
-					</g>
-					<path d="M7020.4 1419.8 L7015.1 1419.3 L7009.8 1418.8 L7016.3 1406.0 Z"></path>
-					<path d="M19717.0 1413.6 L18921.75 1607 L18921.75 2242.5 L18921.8 2242.5 " fill="none"></path>
-					<path d="M19718.3 1418.8 L19717.0 1413.6 L19715.8 1408.4 L19730.0 1410.4 Z"></path>
-					<path d="M36658.0 1463.2 L36658 1607 L42310.75 2257.615117978701 L42310.8 2257.6 " fill="none"></path>
+					<path d="M33246.4 1408.8 L32216.25 1607 L32216.25 2242.5 L32216.3 2242.5 " fill="none"></path>
+					<path d="M33247.4 1414.0 L33246.4 1408.8 L33245.4 1403.6 L33259.5 1406.3 Z"></path>
+					<path d="M14525.8 2498.4 L14056.5 2985 L27168 3171.067170141531 L27168.0 3171.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36663.3 1453.8 L36658.0 1463.2 L36652.7 1453.8 L36658.0 1444.5 Z"></path>
+						<path d="M14536.1 2495.4 L14525.8 2498.4 L14528.4 2488.0 L14538.7 2485.0 Z"></path>
 					</g>
-					<path d="M38906.6 555.1 L36658 876 L36658 1025 L36658 1025 L36658 1174 L36658 1174 L36658 1336.5 L36658.0 1336.5 " fill="none"></path>
-					<path d="M38907.3 560.4 L38906.6 555.1 L38905.8 549.8 L38919.8 553.2 Z"></path>
-					<path d="M44808.4 182.6 L44741 203 L44741 524 L44741.0 524.0 " fill="none"></path>
+					<path d="M14721.1 2503.7 L14721.25 2985 L11134.25 3166.663408010862 L11134.3 3166.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44818.9 185.0 L44808.4 182.6 L44815.8 174.8 L44826.3 177.2 Z"></path>
+						<path d="M14726.4 2494.3 L14721.1 2503.7 L14715.7 2494.3 L14721.1 2485.0 Z"></path>
 					</g>
-					<path d="M45102.1 201.6 L45102 203 L45102 524 L45102.0 524.0 " fill="none"></path>
+					<path d="M14916.3 2498.4 L15385.75 2985 L22836 3170.0962966663337 L22836.0 3170.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45108.0 192.7 L45102.1 201.6 L45097.4 192.0 L45103.3 183.0 Z"></path>
+						<path d="M14913.7 2488.0 L14916.3 2498.4 L14906.0 2495.4 L14903.3 2485.0 Z"></path>
 					</g>
-					<path d="M45410.1 182.6 L45477.5 203 L45477.5 524 L45477.5 524.0 " fill="none"></path>
+					<path d="M14927.7 2498.0 L15425.75 2985 L27269 3170.6769119223254 L27269.0 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45402.7 174.8 L45410.1 182.6 L45399.6 185.0 L45392.3 177.2 Z"></path>
+						<path d="M14924.7 2487.7 L14927.7 2498.0 L14917.3 2495.3 L14914.3 2485.0 Z"></path>
 					</g>
-					<path d="M45410.6 144.2 L45747 203 L45747 524 L45747.0 524.0 " fill="none"></path>
+					<path d="M34076.7 556.8 L25785 876 L25785 1025 L25785 1025 L25785 1174 L25785 1174 L25785 1390.5 L25785 1390.5 L25785 1607 L25785 1607 L15054.5 2275.231607013738 L15054.5 2275.2 " fill="none"></path>
+					<path d="M34076.9 562.1 L34076.7 556.8 L34076.5 551.5 L34090.0 556.3 Z"></path>
+					<path d="M6765.3 1463.2 L6765.25 1607 L14387.5 2267.117556484304 L14387.5 2267.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45402.4 137.3 L45410.6 144.2 L45400.5 147.8 L45392.3 141.0 Z"></path>
+						<path d="M6770.6 1453.8 L6765.3 1463.2 L6759.9 1453.8 L6765.3 1444.5 Z"></path>
 					</g>
-					<path d="M42588.1 2503.0 L42457.5 2985 L40692.25 3168.3323820130863 L40692.3 3168.3 " fill="none"></path>
+					<path d="M15111.9 543.9 L6765.25 876 L6765.25 1025 L6765.25 1025 L6765.25 1174 L6765.25 1174 L6765.25 1336.5 L6765.3 1336.5 " fill="none"></path>
+					<path d="M15112.1 549.2 L15111.9 543.9 L15111.7 538.5 L15125.3 543.3 Z"></path>
+					<path d="M4758.9 2405.2 L4563.5 2985 L10943.25 3168.749411219644 L10943.3 3168.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42595.7 2495.4 L42588.1 2503.0 L42585.4 2492.6 L42593.0 2485.0 Z"></path>
+						<path d="M4767.0 2398.0 L4758.9 2405.2 L4756.9 2394.6 L4764.9 2387.5 Z"></path>
 					</g>
-					<path d="M42600.1 2503.3 L42497.5 2985 L31520.5 3169.8914427636037 L31520.5 3169.9 " fill="none"></path>
+					<path d="M4821.7 2405.7 L4958.5 2985 L11174.25 3168.9840296790067 L11174.3 3169.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42607.3 2495.2 L42600.1 2503.3 L42596.8 2493.0 L42604.0 2485.0 Z"></path>
+						<path d="M4824.7 2395.4 L4821.7 2405.7 L4814.3 2397.8 L4817.4 2387.5 Z"></path>
 					</g>
-					<path d="M42688.4 2503.3 L42791 2985 L32969 3170.43331477451 L32969.0 3170.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42691.7 2493.0 L42688.4 2503.3 L42681.2 2495.2 L42684.5 2485.0 Z"></path>
+					<path d="M7373.9 1486.7 L7051.25 1607 L5095.2830188679245 2204.5 L5095.3 2204.5 " fill="none"></path>
+					<path d="M7375.8 1491.7 L7373.9 1486.7 L7372.1 1481.7 L7386.4 1482.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M1534.3 1418.1 L1622.25 1607 L4470.25 2225.3305498660784 L4470.3 2225.3 " fill="none"></path>
 					</g>
-					<path d="M42700.4 2503.0 L42831 2985 L39449.75 3168.648525664361 L39449.8 3168.6 " fill="none"></path>
+					<path d="M1539.2 1415.8 L1534.3 1418.1 L1529.5 1420.3 L1528.7 1406.0 Z"></path>
+					<path d="M33358.4 1449.8 L33403.25 1607 L33403.25 2257.5 L33403.3 2257.5 " fill="none"></path>
+					<path d="M33363.5 1448.4 L33358.4 1449.8 L33353.3 1451.3 L33354.8 1437.0 Z"></path>
+					<path d="M7439.3 1488.0 L7204.5 1607 L7204.5 2265 L7204.5 2265.0 " fill="none"></path>
+					<path d="M7441.7 1492.8 L7439.3 1488.0 L7436.9 1483.3 L7451.2 1482.0 Z"></path>
+					<path d="M1732.6 3121.9 L1744.75 3118 L1752.25 3118 L1752.25 3118 L1759.75 3171.5 L1759.75 3171.5 L1752.25 3225 L1752.25 3225 L1744.75 3225 L1744.75 3225 L1714.75 3215.5309734513276 L1714.8 3215.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42703.1 2492.6 L42700.4 2503.0 L42692.8 2495.4 L42695.5 2485.0 Z"></path>
+						<path d="M1722.0 3119.6 L1732.6 3121.9 L1725.3 3129.7 L1714.8 3127.5 Z"></path>
 					</g>
-					<path d="M44206.6 742.7 L44500.75 876 L44500.75 1025 L44500.75 1025 L44500.75 1174 L44500.75 1174 L44500.75 1390.5 L44500.75 1390.5 L44500.75 1607 L44500.75 1607 L42977.75 2172.228656073256 L42977.8 2172.2 " fill="none"></path>
-					<path d="M44208.8 737.8 L44206.6 742.7 L44204.4 747.5 L44194.5 737.2 Z"></path>
-					<path d="M19717.5 1424.7 L19214.25 1607 L19214.25 2265 L19214.3 2265.0 " fill="none"></path>
-					<path d="M19719.3 1429.8 L19717.5 1424.7 L19715.6 1419.7 L19730.0 1420.2 Z"></path>
-					<path d="M19899.6 1443.9 L20166.75 1607 L20166.75 2265 L20166.8 2265.0 " fill="none"></path>
-					<path d="M19902.4 1439.4 L19899.6 1443.9 L19896.8 1448.5 L19888.2 1437.0 Z"></path>
-					<path d="M19906.5 1426.1 L20386.75 1607 L20386.75 2265 L20386.8 2265.0 " fill="none"></path>
-					<path d="M19908.4 1421.1 L19906.5 1426.1 L19904.6 1431.1 L19894.0 1421.4 Z"></path>
-					<path d="M11722.5 1470.7 L11722.5 1607 L16997.25 2286.721840370318 L16997.3 2286.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11727.8 1461.3 L11722.5 1470.7 L11717.2 1461.3 L11722.5 1452.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M2102.4 2324.4 L2279.75 2985 L1714.75 3134.570617459191 L1714.8 3134.6 " fill="none"></path>
 					</g>
-					<path d="M17400.9 1027.3 L11722.5 1174 L11722.5 1329 L11722.5 1329.0 " fill="none"></path>
-					<path d="M17401.1 1032.6 L17400.9 1027.3 L17400.8 1022.0 L17414.3 1027.0 Z"></path>
-					<path d="M8024.5 1438.6 L7745.5 1607 L9688.044085631349 2280.5 L9688.0 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8035.2 1438.4 L8024.5 1438.6 L8029.7 1429.3 L8040.5 1429.0 Z"></path>
+					<path d="M2107.5 2323.0 L2102.4 2324.4 L2097.2 2325.8 L2098.9 2311.5 Z"></path>
+					<path d="M34076.7 557.3 L26023 876 L26023 1025 L26023 1025 L26023 1174 L26023 1174 L26023 1359.5 L26023.0 1359.5 " fill="none"></path>
+					<path d="M34076.9 562.6 L34076.7 557.3 L34076.5 552.0 L34090.0 556.8 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M38896.2 96.9 L37721 203 L37721 524 L37721.0 524.0 " fill="none"></path>
 					</g>
-					<path d="M8132.6 1445.6 L8215.75 1607 L8363.841799709724 2280.5 L8363.8 2280.5 " fill="none"></path>
+					<path d="M38896.7 102.3 L38896.2 96.9 L38895.7 91.6 L38909.5 95.7 Z"></path>
+					<path d="M28224.0 3669.7 L28224 3671 L24793 3706.000143678161 L24793.0 3706.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8133.1 1434.9 L8132.6 1445.6 L8123.6 1439.7 L8124.1 1429.0 Z"></path>
+						<path d="M28229.3 3660.3 L28224.0 3669.7 L28218.7 3660.3 L28224.0 3651.0 Z"></path>
 					</g>
-					<path d="M8359.3 1483.6 L8295.75 1607 L9700.422714078375 2280.5 L9700.4 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8368.3 1477.7 L8359.3 1483.6 L8358.8 1472.9 L8367.9 1467.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M38896.3 98.5 L38002 203 L38002 524 L38002.0 524.0 " fill="none"></path>
 					</g>
-					<path d="M8457.0 1483.5 L8523 1607 L8370.753809869377 2280.5 L8370.8 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8457.3 1472.7 L8457.0 1483.5 L8447.8 1477.7 L8448.2 1467.0 Z"></path>
+					<path d="M38896.9 103.8 L38896.3 98.5 L38895.6 93.2 L38909.5 97.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M39016.2 110.3 L39311.25 203 L39311.25 508.5 L39311.3 508.5 " fill="none"></path>
 					</g>
-					<path d="M8473.2 1482.2 L8563 1607 L11459.25 2283.618208018988 L11459.3 2283.6 " fill="none"></path>
+					<path d="M39017.8 105.2 L39016.2 110.3 L39014.6 115.4 L39003.5 106.3 Z"></path>
+					<path d="M26953.4 99.6 L25527 203 L25527 539.5 L25527 539.5 L25527 876 L25527 876 L25527 1025 L25527 1025 L25527 1174 L25527 1174 L25527 1390.5 L25527 1390.5 L25527 1607 L25527 1607 L25527 2296 L25527 2296 L25527 2985 L25527 2985 L27269 3166.0437447757035 L27269.0 3166.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8472.1 1471.5 L8473.2 1482.2 L8463.4 1477.7 L8462.3 1467.0 Z"></path>
+						<path d="M26963.1 104.3 L26953.4 99.6 L26962.3 93.6 L26972.0 98.3 Z"></path>
 					</g>
-					<path d="M8671.3 1537.3 L8648.75 1607 L8648.75 2227 L8648.8 2227.0 " fill="none"></path>
+					<path d="M39538.8 120.3 L39538.75 203 L39538.75 486 L39538.8 486.0 " fill="none"></path>
+					<path d="M39544.1 120.3 L39538.8 120.3 L39533.4 120.3 L39538.8 107.0 Z"></path>
+					<path d="M34071.4 559.6 L26933 876 L26933 1025 L26933 1025 L26933 1174 L26933 1174 L26933 1390.5 L26933 1390.5 L26933 1607 L26933 1607 L26933 2296 L26933 2296 L26933 2985 L26933 2985 L12067.75 3169.7476301541024 L12067.8 3169.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8679.2 1530.0 L8671.3 1537.3 L8669.1 1526.7 L8677.0 1519.5 Z"></path>
+						<path d="M34080.9 564.6 L34071.4 559.6 L34080.4 553.9 L34090.0 558.8 Z"></path>
 					</g>
-					<path d="M8749.9 1537.8 L8764.5 1607 L14216.25 2291.542484851246 L14216.3 2291.5 " fill="none"></path>
+					<path d="M34071.4 560.2 L27124.25 876 L27124.25 1009.5 L27124.3 1009.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8753.2 1527.5 L8749.9 1537.8 L8742.7 1529.7 L8746.0 1519.5 Z"></path>
+						<path d="M34080.9 565.1 L34071.4 560.2 L34080.4 554.4 L34090.0 559.3 Z"></path>
 					</g>
-					<path d="M9966.3 2413.7 L9966.25 2985 L11087.75 3160.912321278385 L11087.8 3160.9 " fill="none"></path>
+					<path d="M34071.6 623.3 L32701 876 L32701 986.5 L32701.0 986.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9971.6 2404.3 L9966.3 2413.7 L9960.9 2404.3 L9966.3 2395.0 Z"></path>
+						<path d="M34081.8 626.8 L34071.6 623.3 L34079.9 616.3 L34090.0 619.9 Z"></path>
 					</g>
-					<path d="M8794.0 1531.3 L8834.5 1607 L9829.75 2212.899933730948 L9829.8 2212.9 " fill="none"></path>
-					<path d="M8798.7 1528.7 L8794.0 1531.3 L8789.3 1533.8 L8787.7 1519.5 Z"></path>
-					<path d="M8819.3 1530.3 L8874.5 1607 L10142.75 2247.7510540788267 L10142.8 2247.8 " fill="none"></path>
-					<path d="M8823.7 1527.2 L8819.3 1530.3 L8815.0 1533.4 L8811.6 1519.5 Z"></path>
-					<path d="M4501.0 2428.0 L4350.25 2985 L16317.5 3170.20005186184 L16317.5 3170.2 " fill="none"></path>
+					<path d="M34980.5 596.9 L37189.25 876 L37189.25 1025 L37189.25 1025 L37189.25 1174 L37189.25 1174 L37189.25 1390.5 L37189.25 1390.5 L37189.25 1607 L37189.25 1607 L37189.25 2296 L37189.25 2296 L37189.25 2985 L37189.25 2985 L37189.25 3171.5 L37189.25 3171.5 L37189.25 3358 L37189.25 3358 L37189.25 3514.5 L37189.25 3514.5 L37189.25 3671 L37189.25 3671 L34194.5 3705.899835863767 L34194.5 3705.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4508.6 2420.4 L4501.0 2428.0 L4498.3 2417.6 L4505.9 2410.0 Z"></path>
+						<path d="M34971.9 590.5 L34980.5 596.9 L34970.6 601.0 L34962.0 594.6 Z"></path>
 					</g>
-					<path d="M4564.3 2428.3 L4680 2985 L13783.5 3169.7747456059205 L13783.5 3169.8 " fill="none"></path>
+					<path d="M34980.5 594.2 L37320.75 876 L37320.75 1009.5 L37320.8 1009.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4567.6 2418.1 L4564.3 2428.3 L4557.1 2420.2 L4560.5 2410.0 Z"></path>
+						<path d="M34971.9 587.8 L34980.5 594.2 L34970.6 598.4 L34962.0 592.0 Z"></path>
 					</g>
-					<path d="M4961.2 1477.6 L4536.75 1607 L4536.75 2182 L4536.8 2182.0 " fill="none"></path>
-					<path d="M4962.8 1482.7 L4961.2 1477.6 L4959.7 1472.5 L4974.0 1473.7 Z"></path>
-					<path d="M17400.9 1027.4 L11897.75 1174 L19730 1388.256831032631 L19730.0 1388.3 " fill="none"></path>
-					<path d="M17401.1 1032.7 L17400.9 1027.4 L17400.8 1022.0 L17414.3 1027.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M20989.8 1053.8 L20989.75 1174 L19894 1375.42634260242 L19894.0 1375.4 " fill="none"></path>
+						<path d="M27172.3 93.1 L34526 203 L34526 223 L34526.0 223.0 " fill="none"></path>
 					</g>
-					<path d="M20995.1 1053.8 L20989.8 1053.8 L20984.4 1053.8 L20989.8 1040.5 Z"></path>
-					<path d="M9259.7 1475.9 L9188.25 1607 L9720.500725689404 2280.5 L9720.5 2280.5 " fill="none"></path>
+					<path d="M27172.4 87.8 L27172.3 93.1 L27172.3 98.4 L27159.0 92.9 Z"></path>
+					<path d="M12086.4 3166.4 L13825.25 3110.5 L14264.625 3110.5 L14264.625 3110.5 L14704 3171.5 L14704 3171.5 L14264.625 3232.5 L14264.625 3232.5 L13825.25 3232.5 L13825.25 3232.5 L12067.75 3176.030418751646 L12067.8 3176.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9268.9 1470.2 L9259.7 1475.9 L9259.5 1465.1 L9268.6 1459.5 Z"></path>
+						<path d="M12076.9 3161.3 L12086.4 3166.4 L12077.2 3172.0 L12067.8 3167.0 Z"></path>
 					</g>
-					<path d="M9438.0 1464.1 L9693.75 1607 L11471.340348330914 2280.5 L11471.3 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9432.5 1454.9 L9438.0 1464.1 L9427.3 1464.2 L9421.8 1455.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M2110.3 2323.1 L2491.25 2985 L11785.75 3168.7130252768798 L11785.8 3168.7 " fill="none"></path>
 					</g>
-					<path d="M5068.6 1491.2 L4863.25 1607 L4863.25 2296 L4863.25 2296 L4863.25 2985 L4863.25 2985 L33238 3171.00507464785 L33238.0 3171.0 " fill="none"></path>
+					<path d="M2114.9 2320.4 L2110.3 2323.1 L2105.7 2325.7 L2103.7 2311.5 Z"></path>
+					<path d="M9382.1 1482.3 L9025.5 1607 L9025.5 2296 L9025.5 2296 L9025.5 2985 L9025.5 2985 L15351 3169.4875674407695 L15351.0 3169.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5079.3 1491.2 L5068.6 1491.2 L5074.1 1481.9 L5084.8 1482.0 Z"></path>
+						<path d="M9392.7 1484.3 L9382.1 1482.3 L9389.2 1474.2 L9399.8 1476.2 Z"></path>
 					</g>
-					<path d="M5085.9 1491.9 L4903.25 1607 L4903.25 2296 L4903.25 2296 L4903.25 2985 L4903.25 2985 L34407.75 3171.2096834232925 L34407.8 3171.2 " fill="none"></path>
+					<path d="M9382.6 1502.4 L9137.5 1607 L9137.5 2280.5 L9137.5 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5096.7 1491.5 L5085.9 1491.9 L5091.0 1482.5 L5101.7 1482.0 Z"></path>
+						<path d="M9393.3 1503.6 L9382.6 1502.4 L9389.1 1493.8 L9399.8 1495.1 Z"></path>
 					</g>
-					<path d="M5538.4 1441.0 L6495.25 1607 L6495.25 2296 L6495.25 2296 L6495.25 2985 L6495.25 2985 L13783.5 3169.3499983046827 L13783.5 3169.3 " fill="none"></path>
+					<path d="M9441.4 1600.4 L9435 1607 L9435 2280.5 L9435.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5530.1 1434.2 L5538.4 1441.0 L5528.3 1444.7 L5520.0 1437.8 Z"></path>
+						<path d="M9451.7 1597.4 L9441.4 1600.4 L9444.1 1590.0 L9454.4 1587.0 Z"></path>
 					</g>
-					<path d="M46265.0 156.2 L46265 203 L46265 524 L46265.0 524.0 " fill="none"></path>
+					<path d="M9843.4 1600.6 L9849.5 1607 L11426.702104499274 2280.5 L11426.7 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M46270.3 146.8 L46265.0 156.2 L46259.7 146.8 L46265.0 137.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M8138.8 1439.9 L8255.75 1607 L8978.541727140784 2250 L8978.5 2250.0 " fill="none"></path>
+						<path d="M9840.9 1590.1 L9843.4 1600.6 L9833.1 1597.4 L9830.6 1587.0 Z"></path>
 					</g>
-					<path d="M8143.2 1436.9 L8138.8 1439.9 L8134.5 1443.0 L8131.2 1429.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M9030.3 1472.3 L9030.25 1607 L9030.25 2250 L9030.3 2250.0 " fill="none"></path>
+					<path d="M9907.4 1482.3 L10264 1607 L10264 2280.5 L10264.0 2280.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M9900.3 1474.2 L9907.4 1482.3 L9896.8 1484.3 L9889.8 1476.2 Z"></path>
 					</g>
-					<path d="M9035.6 1472.3 L9030.3 1472.3 L9024.9 1472.3 L9030.3 1459.0 Z"></path>
-					<path d="M24541.1 1078.6 L24210.75 1174 L24647.10103926097 1375 L24647.1 1375.0 " fill="none"></path>
+					<path d="M9907.7 1465.7 L10402 1607 L12697.5 2283.1861906797776 L12697.5 2283.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24551.5 1081.1 L24541.1 1078.6 L24548.6 1070.9 L24559.0 1073.4 Z"></path>
+						<path d="M9900.2 1458.0 L9907.7 1465.7 L9897.3 1468.2 L9889.8 1460.5 Z"></path>
 					</g>
-					<path d="M24541.2 1083.7 L24256.5 1174 L19894 1386.5056249296883 L19894.0 1386.5 " fill="none"></path>
+					<path d="M9907.9 1454.1 L10540 1607 L10540 2280.5 L10540.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24551.7 1086.0 L24541.2 1083.7 L24548.5 1075.8 L24559.0 1078.1 Z"></path>
+						<path d="M9900.1 1446.8 L9907.9 1454.1 L9897.6 1457.1 L9889.8 1449.7 Z"></path>
 					</g>
-					<path d="M24769.1 1163.8 L24772.25 1174 L24772.25 1390.5 L24772.25 1390.5 L24772.25 1607 L24772.25 1607 L14287.25 2293.6750629722924 L14287.3 2293.7 " fill="none"></path>
+					<path d="M9907.9 1451.4 L10580 1607 L16841 2292.1153815611847 L16841.0 2292.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24771.5 1153.4 L24769.1 1163.8 L24761.3 1156.5 L24763.7 1146.0 Z"></path>
+						<path d="M9900.0 1444.1 L9907.9 1451.4 L9897.6 1454.5 L9889.8 1447.2 Z"></path>
 					</g>
-					<path d="M24899.5 1157.3 L24921.25 1174 L24921.25 1375 L24921.3 1375.0 " fill="none"></path>
+					<path d="M9908.0 1448.9 L10620 1607 L8501.260885341075 2280.5 L8501.3 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24895.3 1147.4 L24899.5 1157.3 L24888.8 1155.9 L24884.7 1146.0 Z"></path>
+						<path d="M9900.0 1441.7 L9908.0 1448.9 L9897.7 1452.1 L9889.8 1444.9 Z"></path>
 					</g>
-					<path d="M10298.7 1514.5 L10263.75 1607 L20778.75 2294.10498861912 L20778.8 2294.1 " fill="none"></path>
+					<path d="M22667.4 3538.6 L21429.75 3671 L34091.5 3706.3561933415926 L34091.5 3706.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10307.0 1507.6 L10298.7 1514.5 L10297.0 1503.8 L10305.3 1497.0 Z"></path>
+						<path d="M22677.3 3542.9 L22667.4 3538.6 L22676.2 3532.3 L22686.0 3536.6 Z"></path>
 					</g>
-					<path d="M10525.9 1475.0 L10807.75 1607 L14216.25 2288.8979384436702 L14216.3 2288.9 " fill="none"></path>
+					<path d="M23117.6 3537.4 L24429.5 3671 L17962.5 3706.0555046571994 L17962.5 3706.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10519.7 1466.2 L10525.9 1475.0 L10515.2 1475.9 L10509.0 1467.1 Z"></path>
+						<path d="M23108.8 3531.2 L23117.6 3537.4 L23107.7 3541.8 L23099.0 3535.5 Z"></path>
 					</g>
-					<path d="M19906.9 1415.4 L20638.75 1607 L20638.75 2219.5 L20638.8 2219.5 " fill="none"></path>
-					<path d="M19908.2 1410.2 L19906.9 1415.4 L19905.5 1420.5 L19894.0 1412.0 Z"></path>
-					<path d="M44514.2 2443.4 L44416.5 2985 L44416.5 3156 L44416.5 3156.0 " fill="none"></path>
+					<path d="M23117.6 3534.2 L24677 3671 L19706.5 3705.6257358712714 L19706.5 3705.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44521.1 2435.1 L44514.2 2443.4 L44510.6 2433.2 L44517.5 2425.0 Z"></path>
+						<path d="M23108.8 3528.1 L23117.6 3534.2 L23107.8 3538.7 L23099.0 3532.6 Z"></path>
 					</g>
-					<path d="M44522.7 2443.5 L44456.5 2985 L33389 3170.2363591492417 L33389.0 3170.2 " fill="none"></path>
+					<path d="M22892.5 3200.3 L22892.5 3358 L22892.5 3430.5 L22892.5 3430.5 " fill="none"></path>
+					<path d="M22897.8 3200.3 L22892.5 3200.3 L22887.2 3200.3 L22892.5 3187.0 Z"></path>
+					<path d="M9903.0 2383.7 L9903 2985 L15351 3169.167482327352 L15351.0 3169.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44529.1 2434.9 L44522.7 2443.5 L44518.5 2433.6 L44525.0 2425.0 Z"></path>
+						<path d="M9908.3 2374.3 L9903.0 2383.7 L9897.7 2374.3 L9903.0 2365.0 Z"></path>
 					</g>
-					<path d="M44562.1 2443.5 L44640.5 2985 L32969 3170.6015305252386 L32969.0 3170.6 " fill="none"></path>
+					<path d="M10612.0 1138.7 L10584.5 1174 L10584.5 1375 L10584.5 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44566.0 2433.5 L44562.1 2443.5 L44555.5 2435.0 L44559.4 2425.0 Z"></path>
+						<path d="M10621.9 1134.6 L10612.0 1138.7 L10613.5 1128.1 L10623.4 1124.0 Z"></path>
 					</g>
-					<path d="M44570.6 2443.3 L44680.5 2985 L39449.75 3169.6467373302416 L39449.8 3169.6 " fill="none"></path>
+					<path d="M10698.5 1142.7 L10698 1174 L10698 1390.5 L10698 1390.5 L10698 1607 L10698 1607 L12697.5 2281.3296622613802 L12697.5 2281.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44574.0 2433.1 L44570.6 2443.3 L44563.5 2435.2 L44566.9 2425.0 Z"></path>
+						<path d="M10704.0 1133.4 L10698.5 1142.7 L10693.3 1133.2 L10698.8 1124.0 Z"></path>
 					</g>
-					<path d="M44206.7 732.3 L44540.75 876 L44540.75 1025 L44540.75 1025 L44540.75 1174 L44540.75 1174 L44540.75 1390.5 L44540.75 1390.5 L44540.75 1607 L44540.75 1607 L44540.75 2167 L44540.8 2167.0 " fill="none"></path>
-					<path d="M44208.9 727.4 L44206.7 732.3 L44204.6 737.2 L44194.5 727.1 Z"></path>
-					<path d="M19907.1 1408.4 L20964.25 1607 L20964.25 2265 L20964.3 2265.0 " fill="none"></path>
-					<path d="M19908.1 1403.1 L19907.1 1408.4 L19906.1 1413.6 L19894.0 1405.9 Z"></path>
-					<path d="M6676.3 2353.2 L6676.25 2985 L31147.5 3170.960461041673 L31147.5 3171.0 " fill="none"></path>
+					<path d="M10789.0 1138.7 L10816.5 1174 L10816.5 1375 L10816.5 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6681.6 2343.8 L6676.3 2353.2 L6670.9 2343.8 L6676.3 2334.5 Z"></path>
+						<path d="M10787.5 1128.1 L10789.0 1138.7 L10779.1 1134.6 L10777.6 1124.0 Z"></path>
 					</g>
-					<path d="M5533.2 1433.9 L6676.25 1607 L6676.25 2257.5 L6676.3 2257.5 " fill="none"></path>
-					<path d="M5534.0 1428.6 L5533.2 1433.9 L5532.4 1439.1 L5520.0 1431.9 Z"></path>
-					<path d="M25236.3 1131.7 L25143.75 1174 L25143.75 1375 L25143.8 1375.0 " fill="none"></path>
+					<path d="M10940.5 1113.8 L11103 1174 L11103 1375 L11103.0 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25247.0 1132.7 L25236.3 1131.7 L25242.6 1123.0 L25253.3 1124.0 Z"></path>
+						<path d="M10933.6 1105.6 L10940.5 1113.8 L10929.9 1115.6 L10923.0 1107.4 Z"></path>
 					</g>
-					<path d="M25623.6 1134.9 L25678.25 1174 L25678.25 1390.5 L25678.25 1390.5 L25678.25 1607 L25678.25 1607 L16518.25 2292.7434671592328 L16518.3 2292.7 " fill="none"></path>
+					<path d="M11339.2 1454.3 L11090.5 1607 L11623.728229317852 2280.5 L11623.7 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25619.1 1125.1 L25623.6 1134.9 L25612.9 1133.8 L25608.5 1124.0 Z"></path>
+						<path d="M11349.9 1453.9 L11339.2 1454.3 L11344.3 1444.8 L11355.1 1444.5 Z"></path>
 					</g>
-					<path d="M25704.2 1131.7 L25796.75 1174 L25796.75 1375 L25796.8 1375.0 " fill="none"></path>
+					<path d="M11449.7 1463.1 L11463 1607 L11463 2280.5 L11463.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25697.9 1123.0 L25704.2 1131.7 L25693.5 1132.7 L25687.2 1124.0 Z"></path>
+						<path d="M11454.2 1453.3 L11449.7 1463.1 L11443.5 1454.3 L11448.0 1444.5 Z"></path>
+					</g>
+					<path d="M10936.1 1072.3 L11443 1174 L11443 1336.5 L11443.0 1336.5 " fill="none"></path>
+					<path d="M10937.1 1067.0 L10936.1 1072.3 L10935.0 1077.5 L10923.0 1069.6 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M2117.2 2321.5 L2702.75 2985 L2143.682975871314 3133 L2143.7 3133.0 " fill="none"></path>
 					</g>
-					<path d="M25710.9 1083.5 L26083.25 1174 L26083.25 1375 L26083.3 1375.0 " fill="none"></path>
+					<path d="M2121.2 2318.0 L2117.2 2321.5 L2113.3 2325.0 L2108.4 2311.5 Z"></path>
+					<path d="M11903.6 1468.6 L11833.5 1607 L11833.5 2280.5 L11833.5 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25703.1 1076.1 L25710.9 1083.5 L25700.6 1086.5 L25692.8 1079.1 Z"></path>
+						<path d="M11912.6 1462.7 L11903.6 1468.6 L11903.1 1457.9 L11912.1 1452.0 Z"></path>
 					</g>
-					<path d="M26319.4 1454.3 L26070.75 1607 L27878.15420899855 2280.5 L27878.2 2280.5 " fill="none"></path>
+					<path d="M12018.0 1465.2 L12160 1607 L12160 2280.5 L12160.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26330.2 1453.9 L26319.4 1454.3 L26324.6 1444.8 L26335.3 1444.5 Z"></path>
+						<path d="M12015.2 1454.8 L12018.0 1465.2 L12007.7 1462.4 L12004.8 1452.0 Z"></path>
 					</g>
-					<path d="M26445.2 1462.4 L26489.25 1607 L17141.25 2290.7337579617833 L17141.3 2290.7 " fill="none"></path>
+					<path d="M16888.4 1027.6 L11943.25 1174 L11943.25 1329 L11943.3 1329.0 " fill="none"></path>
+					<path d="M16888.6 1033.0 L16888.4 1027.6 L16888.3 1022.3 L16901.8 1027.2 Z"></path>
+					<path d="M33790.3 2338.4 L33393.5 2985 L33393.5 3125.5 L33393.5 3125.5 " fill="none"></path>
+					<path d="M33794.8 2341.2 L33790.3 2338.4 L33785.7 2335.6 L33797.2 2327.0 Z"></path>
+					<path d="M42773.7 1488.2 L42664.25 1607 L34938.25 2290.954002312733 L34938.3 2291.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26447.5 1451.9 L26445.2 1462.4 L26437.3 1455.0 L26439.7 1444.5 Z"></path>
+						<path d="M42783.9 1485.0 L42773.7 1488.2 L42776.1 1477.7 L42786.3 1474.5 Z"></path>
 					</g>
-					<path d="M25705.9 1061.8 L26423.25 1174 L26423.25 1336.5 L26423.3 1336.5 " fill="none"></path>
-					<path d="M25706.7 1056.6 L25705.9 1061.8 L25705.1 1067.1 L25692.8 1059.8 Z"></path>
-					<path d="M19907.2 1404.8 L21254.75 1607 L22155.44230769231 2257.5 L22155.4 2257.5 " fill="none"></path>
-					<path d="M19908.0 1399.5 L19907.2 1404.8 L19906.4 1410.1 L19894.0 1402.8 Z"></path>
-					<path d="M5533.2 1426.7 L6957.75 1607 L6957.75 2265 L6957.8 2265.0 " fill="none"></path>
-					<path d="M5533.9 1421.4 L5533.2 1426.7 L5532.6 1432.0 L5520.0 1425.0 Z"></path>
-					<path d="M22420.6 2338.6 L22055 2985 L14289.5 3168.012036393505 L14289.5 3168.0 " fill="none"></path>
-					<path d="M22425.3 2341.2 L22420.6 2338.6 L22416.0 2336.0 L22427.2 2327.0 Z"></path>
-					<path d="M12465.5 1440.2 L12465.5 1607 L28020.75 2277.5709123899205 L28020.8 2277.6 " fill="none"></path>
+					<path d="M43035.8 1483.4 L43264.75 1607 L42561.513425253994 2227 L42561.5 2227.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12470.8 1430.8 L12465.5 1440.2 L12460.2 1430.8 L12465.5 1421.5 Z"></path>
+						<path d="M43030.1 1474.2 L43035.8 1483.4 L43025.0 1483.6 L43019.3 1474.5 Z"></path>
 					</g>
-					<path d="M12073.0 1455.7 L12073 1607 L11320.077830188678 2280.5 L11320.1 2280.5 " fill="none"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M43318.9 1048.3 L42863.75 1174 L42863.75 1306.5 L42863.8 1306.5 " fill="none"></path>
+					</g>
+					<path d="M43320.3 1053.4 L43318.9 1048.3 L43317.5 1043.2 L43331.8 1044.7 Z"></path>
+					<path d="M27336.7 2562.7 L27198.5 2985 L27198.5 3156 L27198.5 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12078.3 1446.3 L12073.0 1455.7 L12067.7 1446.3 L12073.0 1437.0 Z"></path>
+						<path d="M27344.7 2555.5 L27336.7 2562.7 L27334.5 2552.2 L27342.5 2545.0 Z"></path>
 					</g>
-					<path d="M17400.9 1027.5 L12073 1174 L12073 1344 L12073.0 1344.0 " fill="none"></path>
-					<path d="M17401.1 1032.8 L17400.9 1027.5 L17400.8 1022.1 L17414.3 1027.1 Z"></path>
-					<path d="M37296.0 1097.7 L37296 1174 L37296 1194 L37296.0 1194.0 " fill="none"></path>
+					<path d="M27362.8 2563.2 L27266.25 2985 L24969.5 3167.838064240743 L24969.5 3167.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37301.3 1088.3 L37296.0 1097.7 L37290.7 1088.3 L37296.0 1079.0 Z"></path>
+						<path d="M27370.1 2555.3 L27362.8 2563.2 L27359.7 2552.9 L27367.0 2545.0 Z"></path>
 					</g>
-					<path d="M38923.4 557.6 L37296 876 L37296 971 L37296.0 971.0 " fill="none"></path>
-					<path d="M38924.5 562.8 L38923.4 557.6 L38922.4 552.3 L38936.5 555.0 Z"></path>
-					<path d="M35174.4 1117.1 L35100 1174 L35100 1306.5 L35100.0 1306.5 " fill="none"></path>
-					<path d="M35177.6 1121.3 L35174.4 1117.1 L35171.1 1112.9 L35185.0 1109.0 Z"></path>
-					<path d="M37905.5 2500.3 L37565.75 2985 L40631.25 3169.6627099483203 L40631.3 3169.7 " fill="none"></path>
+					<path d="M27378.3 2563.4 L27306.25 2985 L26301.5 3118.3944652073324 L26301.5 3118.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37915.3 2495.7 L37905.5 2500.3 L37906.5 2489.6 L37916.3 2485.0 Z"></path>
+						<path d="M27385.1 2555.1 L27378.3 2563.4 L27374.6 2553.3 L27381.4 2545.0 Z"></path>
 					</g>
-					<path d="M37917.1 2500.7 L37605.75 2985 L34499.75 3168.778236040609 L34499.8 3168.8 " fill="none"></path>
+					<path d="M27393.8 2563.5 L27346.25 2985 L22949 3169.1340724108895 L22949.0 3169.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37926.7 2495.7 L37917.1 2500.7 L37917.7 2490.0 L37927.2 2485.0 Z"></path>
+						<path d="M27400.2 2554.9 L27393.8 2563.5 L27389.6 2553.7 L27395.9 2545.0 Z"></path>
 					</g>
-					<path d="M38148.2 2501.8 L38381.75 2985 L38381.75 3171.5 L38381.75 3171.5 L38381.75 3358 L38381.75 3358 L38381.75 3514.5 L38381.75 3514.5 L38381.75 3671 L38381.75 3671 L38553.25 3698.6111111111113 L38553.3 3698.6 " fill="none"></path>
+					<path d="M27465.8 2563.4 L27531.75 2985 L27531.75 3171.5 L27531.75 3171.5 L27531.75 3358 L27531.75 3358 L27531.75 3514.5 L27531.75 3514.5 L27531.75 3671 L27531.75 3671 L24793 3705.8760200878846 L24793.0 3705.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38149.0 2491.1 L38148.2 2501.8 L38139.4 2495.7 L38140.1 2485.0 Z"></path>
+						<path d="M27469.7 2553.4 L27465.8 2563.4 L27459.1 2555.0 L27462.9 2545.0 Z"></path>
 					</g>
-					<path d="M38160.0 2501.4 L38421.75 2985 L38421.75 3171.5 L38421.75 3171.5 L38421.75 3358 L38421.75 3358 L39709.75 3499.1074553727685 L39709.8 3499.1 " fill="none"></path>
+					<path d="M27812.0 2555.4 L28454.75 2985 L28454.75 3171.5 L28454.75 3171.5 L28454.75 3358 L28454.75 3358 L28364.5 3419.209642470206 L28364.5 3419.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38160.2 2490.7 L38160.0 2501.4 L38150.8 2495.7 L38151.1 2485.0 Z"></path>
+						<path d="M27807.2 2545.8 L27812.0 2555.4 L27801.3 2554.6 L27796.5 2545.0 Z"></path>
 					</g>
-					<path d="M38435.3 2493.5 L39397.25 2985 L39397.25 3156 L39397.3 3156.0 " fill="none"></path>
+					<path d="M27826.7 2555.1 L28494.75 2985 L27374 3163.1545919454506 L27374.0 3163.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38429.4 2484.5 L38435.3 2493.5 L38424.5 2494.0 L38418.7 2485.0 Z"></path>
+						<path d="M27821.7 2545.6 L27826.7 2555.1 L27815.9 2554.5 L27811.0 2545.0 Z"></path>
 					</g>
-					<path d="M44207.6 615.2 L45756.25 876 L45756.25 1025 L45756.25 1025 L45756.25 1174 L45756.25 1174 L45756.25 1390.5 L45756.25 1390.5 L45756.25 1607 L45756.25 1607 L38468.25 2258.4994485890365 L38468.3 2258.5 " fill="none"></path>
-					<path d="M44208.5 609.9 L44207.6 615.2 L44206.8 620.4 L44194.5 612.9 Z"></path>
-					<path d="M37013.8 1594.8 L36997 1607 L37760.24383164006 2107 L37760.2 2107.0 " fill="none"></path>
-					<path d="M37016.9 1599.1 L37013.8 1594.8 L37010.7 1590.5 L37024.6 1587.0 Z"></path>
+					<path d="M34975.2 591.2 L37452.25 876 L37452.25 1025 L37452.25 1025 L37452.25 1174 L37452.25 1174 L37452.25 1390.5 L37452.25 1390.5 L37452.25 1607 L37452.25 1607 L27875 2265.013636476953 L27875.0 2265.0 " fill="none"></path>
+					<path d="M34975.9 585.9 L34975.2 591.2 L34974.6 596.5 L34962.0 589.6 Z"></path>
+					<path d="M26447.5 1529.2 L26375 1607 L27044.89840348331 2047 L27044.9 2047.0 " fill="none"></path>
+					<path d="M26451.4 1532.9 L26447.5 1529.2 L26443.6 1525.6 L26456.6 1519.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M43773.0 1052.4 L43232.75 1174 L43232.75 1390.5 L43232.75 1390.5 L43232.75 1607 L43232.75 1607 L38468.25 2240.2446952160494 L38468.3 2240.2 " fill="none"></path>
+						<path d="M32579.2 1028.4 L27424 1174 L27424 1390.5 L27424 1390.5 L27424 1607 L27424 1607 L27424 2047 L27424.0 2047.0 " fill="none"></path>
 					</g>
-					<path d="M43774.2 1057.6 L43773.0 1052.4 L43771.8 1047.2 L43786.0 1049.4 Z"></path>
+					<path d="M32579.3 1033.8 L32579.2 1028.4 L32579.0 1023.1 L32592.5 1028.1 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M14181.2 1417.5 L14070 1607 L37629.25 2283.946181514883 L37629.3 2283.9 " fill="none"></path>
+						<path d="M12912.3 1413.3 L12617.5 1607 L26973 2275.0133387363658 L26973.0 2275.0 " fill="none"></path>
 					</g>
-					<path d="M14185.8 1420.2 L14181.2 1417.5 L14176.6 1414.8 L14187.9 1406.0 Z"></path>
+					<path d="M12915.2 1417.8 L12912.3 1413.3 L12909.3 1408.9 L12923.4 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M29291.0 1033.7 L27515 1174 L27515 1390.5 L27515 1390.5 L27515 1607 L27515 1607 L37629.25 2268.5610062893084 L37629.3 2268.6 " fill="none"></path>
-					</g>
-					<path d="M29291.4 1039.0 L29291.0 1033.7 L29290.5 1028.4 L29304.3 1032.6 Z"></path>
-					<path d="M31153.5 2450.6 L31018.5 2985 L32856 3165.936510031679 L32856.0 3165.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31160.9 2442.9 L31153.5 2450.6 L31150.6 2440.2 L31158.0 2432.5 Z"></path>
-					</g>
-					<path d="M31241.4 2450.3 L31411 2985 L39344.75 3170.2739865393646 L39344.8 3170.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31243.7 2439.8 L31241.4 2450.3 L31233.5 2443.0 L31235.8 2432.5 Z"></path>
-					</g>
-					<path d="M42703.3 1430.4 L42505.25 1607 L31540.5 2274.8051534772712 L31540.5 2274.8 " fill="none"></path>
-					<path d="M42706.8 1434.4 L42703.3 1430.4 L42699.7 1426.4 L42713.2 1421.5 Z"></path>
-					<path d="M42102.8 1553.1 L42067 1607 L31540.5 2273.9509862522414 L31540.5 2274.0 " fill="none"></path>
-					<path d="M42107.2 1556.1 L42102.8 1553.1 L42098.3 1550.2 L42110.2 1542.0 Z"></path>
-					<path d="M37315.9 1605.6 L37316 1607 L37316 2296 L37316 2296 L37316 2985 L37316 2985 L27953.25 3170.057136422648 L27953.3 3170.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37320.3 1595.8 L37315.9 1605.6 L37309.7 1596.8 L37314.2 1587.0 Z"></path>
+						<path d="M23141.4 1052.2 L23076 1174 L23076 1390.5 L23076 1390.5 L23076 1607 L23076 1607 L26973 2224.5328886844527 L26973.0 2224.5 " fill="none"></path>
 					</g>
-					<path d="M37693.6 1430.7 L39437.25 1607 L39437.25 2296 L39437.25 2296 L39437.25 2985 L39437.25 2985 L32969 3169.885033909345 L32969.0 3169.9 " fill="none"></path>
+					<path d="M23146.1 1054.8 L23141.4 1052.2 L23136.7 1049.7 L23147.7 1040.5 Z"></path>
+					<path d="M25901.5 3296.7 L25901.5 3358 L28083.5 3505.032508073197 L28083.5 3505.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37684.8 1424.5 L37693.6 1430.7 L37683.7 1435.1 L37675.0 1428.8 Z"></path>
+						<path d="M25906.8 3287.3 L25901.5 3296.7 L25896.2 3287.3 L25901.5 3278.0 Z"></path>
 					</g>
-					<path d="M27211.2 540.7 L198.75 876 L198.75 926 L198.8 926.0 " fill="none"></path>
-					<path d="M27211.2 546.0 L27211.2 540.7 L27211.1 535.3 L27224.5 540.5 Z"></path>
-					<path d="M6307.3 2413.7 L6307.25 2985 L27807.25 3170.8689102118387 L27807.3 3170.9 " fill="none"></path>
+					<path d="M26320.1 3141.9 L28534.75 2985 L27825.41763425254 2545 L27825.4 2545.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6312.6 2404.3 L6307.3 2413.7 L6301.9 2404.3 L6307.3 2395.0 Z"></path>
+						<path d="M26310.4 3137.2 L26320.1 3141.9 L26311.2 3147.8 L26301.5 3143.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M9052.2 1027.4 L3914.75 1174 L3914.75 1390.5 L3914.75 1390.5 L3914.75 1607 L3914.75 1607 L6159.25 2253.378474399164 L6159.3 2253.4 " fill="none"></path>
-					</g>
-					<path d="M9052.3 1032.8 L9052.2 1027.4 L9052.0 1022.1 L9065.5 1027.0 Z"></path>
-					<path d="M14955.5 1440.2 L14955.5 1607 L30844.5 2281.2329863891114 L30844.5 2281.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14960.8 1430.8 L14955.5 1440.2 L14950.2 1430.8 L14955.5 1421.5 Z"></path>
-					</g>
-					<path d="M7346.8 1478.2 L7346.75 1607 L6455.25 2197.9028379028377 L6455.3 2197.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7352.1 1468.8 L7346.8 1478.2 L7341.4 1468.8 L7346.8 1459.5 Z"></path>
+						<path d="M32579.2 1030.7 L29508.25 1174 L29508.25 1390.5 L29508.25 1390.5 L29508.25 1607 L29508.25 1607 L29508.25 2296 L29508.25 2296 L29508.25 2985 L29508.25 2985 L26301.5 3150.816559229223 L26301.5 3150.8 " fill="none"></path>
 					</g>
+					<path d="M32579.4 1036.0 L32579.2 1030.7 L32578.9 1025.4 L32592.5 1030.1 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M9052.2 1032.1 L7346.75 1174 L7346.75 1321.5 L7346.8 1321.5 " fill="none"></path>
+						<path d="M12915.6 1414.0 L12657.5 1607 L12657.5 2296 L12657.5 2296 L12657.5 2985 L12657.5 2985 L25501.5 3165.8672606463306 L25501.5 3165.9 " fill="none"></path>
 					</g>
-					<path d="M9052.7 1037.4 L9052.2 1032.1 L9051.8 1026.7 L9065.5 1031.0 Z"></path>
-					<path d="M28250.5 2544.6 L27900.25 2985 L40631.25 3171.054264780786 L40631.3 3171.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28260.5 2540.6 L28250.5 2544.6 L28252.2 2534.0 L28262.1 2530.0 Z"></path>
+					<path d="M12918.8 1418.3 L12915.6 1414.0 L12912.4 1409.7 L12926.3 1406.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M23148.4 1053.4 L23116 1174 L23116 1390.5 L23116 1390.5 L23116 1607 L23116 1607 L23116 2296 L23116 2296 L23116 2985 L23116 2985 L25501.5 3144.7184527014897 L25501.5 3144.7 " fill="none"></path>
 					</g>
-					<path d="M28264.6 2545.0 L27940.25 2985 L32856 3169.380788375484 L32856.0 3169.4 " fill="none"></path>
+					<path d="M23153.5 1054.8 L23148.4 1053.4 L23143.2 1052.0 L23151.8 1040.5 Z"></path>
+					<path d="M39002.9 565.2 L37861.25 876 L37861.25 941 L37861.3 941.0 " fill="none"></path>
+					<path d="M39004.3 570.3 L39002.9 565.2 L39001.5 560.0 L39015.8 561.7 Z"></path>
+					<path d="M21775.4 2441.3 L21469.75 2985 L22836 3164.0937445088734 L22836.0 3164.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28274.5 2540.7 L28264.6 2545.0 L28265.9 2534.3 L28275.7 2530.0 Z"></path>
+						<path d="M21784.6 2435.7 L21775.4 2441.3 L21775.3 2430.5 L21784.5 2425.0 Z"></path>
 					</g>
-					<path d="M28448.3 2548.7 L28448.25 2985 L28448.25 3171.5 L28448.25 3171.5 L28448.25 3358 L28448.25 3358 L28448.25 3514.5 L28448.25 3514.5 L28448.25 3671 L28448.25 3671 L38553.25 3706.3286882016937 L38553.3 3706.3 " fill="none"></path>
+					<path d="M21894.1 2443.1 L22031 2985 L27269 3169.649277005954 L27269.0 3169.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28453.6 2539.3 L28448.3 2548.7 L28442.9 2539.3 L28448.3 2530.0 Z"></path>
+						<path d="M21897.0 2432.7 L21894.1 2443.1 L21886.7 2435.4 L21889.6 2425.0 Z"></path>
 					</g>
-					<path d="M28462.9 2548.6 L28488.25 2985 L28488.25 3171.5 L28488.25 3171.5 L28488.25 3358 L28488.25 3358 L39709.75 3512.564755324767 L39709.8 3512.6 " fill="none"></path>
+					<path d="M26003.3 1433.6 L25924 1607 L22205 2237.0445045488073 L22205.0 2237.0 " fill="none"></path>
+					<path d="M26008.1 1435.8 L26003.3 1433.6 L25998.4 1431.4 L26008.8 1421.5 Z"></path>
+					<path d="M8757.0 2383.7 L8757 2985 L14749 3163.1457038099793 L14749.0 3163.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28467.7 2539.0 L28462.9 2548.6 L28457.1 2539.6 L28461.8 2530.0 Z"></path>
+						<path d="M8762.3 2374.3 L8757.0 2383.7 L8751.7 2374.3 L8757.0 2365.0 Z"></path>
 					</g>
-					<path d="M28661.8 2544.1 L29041.25 2985 L39344.75 3170.554533603708 L39344.8 3170.6 " fill="none"></path>
+					<path d="M15111.9 545.2 L8757 876 L8757 1025 L8757 1025 L8757 1174 L8757 1174 L8757 1390.5 L8757 1390.5 L8757 1607 L8757 1607 L8757 2227 L8757.0 2227.0 " fill="none"></path>
+					<path d="M15112.2 550.5 L15111.9 545.2 L15111.7 539.9 L15125.3 544.5 Z"></path>
+					<path d="M15030.0 3356.7 L15030 3358 L15030 3514.5 L15030 3514.5 L15030 3671 L15030 3671 L24695 3706.3209285567223 L24695.0 3706.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28659.8 2533.6 L28661.8 2544.1 L28651.7 2540.6 L28649.6 2530.0 Z"></path>
-					</g>
-					<path d="M42709.9 1431.2 L42545.25 1607 L28875.75 2275.105660778889 L28875.8 2275.1 " fill="none"></path>
-					<path d="M42713.7 1434.9 L42709.9 1431.2 L42706.0 1427.6 L42719.0 1421.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M43773.0 1054.1 L43272.75 1174 L43272.75 1390.5 L43272.75 1390.5 L43272.75 1607 L43272.75 1607 L28875.75 2276.1310330871192 L28875.8 2276.1 " fill="none"></path>
+						<path d="M15035.3 3347.3 L15030.0 3356.7 L15024.7 3347.3 L15030.0 3338.0 Z"></path>
 					</g>
-					<path d="M43774.3 1059.3 L43773.0 1054.1 L43771.8 1048.9 L43786.0 1051.0 Z"></path>
+					<path d="M20446.2 2774.4 L20219 2985 L15311 3161.4004625168627 L15311.0 3161.4 " fill="none"></path>
+					<path d="M20449.8 2778.3 L20446.2 2774.4 L20442.6 2770.5 L20456.0 2765.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M14185.8 1418.4 L14110 1607 L28020.75 2275.457221069517 L28020.8 2275.5 " fill="none"></path>
+						<path d="M12990.5 2340.3 L12990.5 2985 L14749 3145.804241235597 L14749.0 3145.8 " fill="none"></path>
 					</g>
-					<path d="M14190.7 1420.4 L14185.8 1418.4 L14180.9 1416.4 L14190.8 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29291.1 1042.2 L28448.25 1174 L28448.25 1390.5 L28448.25 1390.5 L28448.25 1607 L28448.25 1607 L28448.25 2062 L28448.3 2062.0 " fill="none"></path>
-					</g>
-					<path d="M29291.9 1047.4 L29291.1 1042.2 L29290.3 1036.9 L29304.3 1040.1 Z"></path>
-					<path d="M22430.3 2339.7 L22216 2985 L15175.5 3166.4361268481416 L15175.5 3166.4 " fill="none"></path>
-					<path d="M22435.3 2341.3 L22430.3 2339.7 L22425.2 2338.0 L22434.5 2327.0 Z"></path>
-					<path d="M586.8 1112.7 L586.75 1174 L586.75 1375 L586.8 1375.0 " fill="none"></path>
+					<path d="M12995.8 2340.3 L12990.5 2340.3 L12985.2 2340.3 L12990.5 2327.0 Z"></path>
+					<path d="M13512.8 1440.2 L13512.75 1607 L21509 2267.2650028462713 L21509.0 2267.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M592.1 1103.3 L586.8 1112.7 L581.4 1103.3 L586.8 1094.0 Z"></path>
+						<path d="M13518.1 1430.8 L13512.8 1440.2 L13507.4 1430.8 L13512.8 1421.5 Z"></path>
 					</g>
-					<path d="M27211.2 540.7 L586.75 876 L586.75 956 L586.8 956.0 " fill="none"></path>
-					<path d="M27211.2 546.0 L27211.2 540.7 L27211.1 535.4 L27224.5 540.5 Z"></path>
-					<path d="M19609.4 2377.1 L18898.5 2985 L32856 3170.74809119452 L32856.0 3170.7 " fill="none"></path>
+					<path d="M40250.3 120.3 L40250.25 203 L40250.25 493 L40250.3 493.0 " fill="none"></path>
+					<path d="M40255.6 120.3 L40250.3 120.3 L40244.9 120.3 L40250.3 107.0 Z"></path>
+					<path d="M12416.8 1470.7 L12416.75 1607 L16952 2228.3844891871736 L16952.0 2228.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19619.9 2375.1 L19609.4 2377.1 L19613.0 2367.0 L19623.6 2365.0 Z"></path>
+						<path d="M12422.1 1461.3 L12416.8 1470.7 L12411.4 1461.3 L12416.8 1452.0 Z"></path>
 					</g>
-					<path d="M19811.4 2376.2 L20624.75 2985 L13407.5 3168.9135269000853 L13407.5 3168.9 " fill="none"></path>
+					<path d="M16888.4 1027.9 L12416.75 1174 L12416.75 1329 L12416.8 1329.0 " fill="none"></path>
+					<path d="M16888.6 1033.2 L16888.4 1027.9 L16888.2 1022.6 L16901.8 1027.5 Z"></path>
+					<path d="M14358.6 1509.7 L14254.5 1607 L14254.5 2280.5 L14254.5 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19807.1 2366.3 L19811.4 2376.2 L19800.7 2374.9 L19796.4 2365.0 Z"></path>
+						<path d="M14369.1 1507.3 L14358.6 1509.7 L14361.8 1499.5 L14372.2 1497.0 Z"></path>
 					</g>
-					<path d="M16099.0 1510.7 L16010 1607 L17245.80896226415 2280.5 L17245.8 2280.5 " fill="none"></path>
+					<path d="M14723.1 1505.1 L14933.5 1607 L12784.5 2282.3299885974916 L12784.5 2282.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16109.2 1507.5 L16099.0 1510.7 L16101.4 1500.2 L16111.6 1497.0 Z"></path>
+						<path d="M14717.0 1496.3 L14723.1 1505.1 L14712.3 1505.9 L14706.3 1497.0 Z"></path>
 					</g>
-					<path d="M16221.6 1515.6 L16230 1607 L16469.24401306241 2280.5 L16469.2 2280.5 " fill="none"></path>
+					<path d="M15197.4 1515.6 L15189 1607 L15189 2280.5 L15189.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16226.0 1505.8 L16221.6 1515.6 L16215.4 1506.8 L16219.8 1497.0 Z"></path>
+						<path d="M15203.6 1506.8 L15197.4 1515.6 L15193.0 1505.8 L15199.2 1497.0 Z"></path>
 					</g>
-					<path d="M17293.5 1515.4 L17277.5 1607 L18135.9925616836 2280.5 L18136.0 2280.5 " fill="none"></path>
+					<path d="M15317.5 1510.9 L15404.25 1607 L12784.5 2284.7462686567164 L12784.5 2284.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17300.3 1507.1 L17293.5 1515.4 L17289.8 1505.3 L17296.7 1497.0 Z"></path>
+						<path d="M15315.3 1500.4 L15317.5 1510.9 L15307.3 1507.5 L15305.0 1497.0 Z"></path>
 					</g>
-					<path d="M17426.7 1510.7 L17516 1607 L16498.174346879536 2280.5 L16498.2 2280.5 " fill="none"></path>
+					<path d="M9802.1 3120.9 L9814 3118 L9821.5 3118 L9821.5 3118 L9829 3171.5 L9829 3171.5 L9821.5 3225 L9821.5 3225 L9814 3225 L9814 3225 L9784 3217.7539503386006 L9784.0 3217.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17424.3 1500.2 L17426.7 1510.7 L17416.4 1507.5 L17414.0 1497.0 Z"></path>
+						<path d="M9791.8 3117.9 L9802.1 3120.9 L9794.3 3128.2 L9784.0 3125.2 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M2118.5 2321.2 L2742.75 2985 L9401 3166.285977590423 L9401.0 3166.3 " fill="none"></path>
 					</g>
-					<path d="M10282.4 3120.9 L10294.25 3118 L10301.75 3118 L10301.75 3118 L10309.25 3171.5 L10309.25 3171.5 L10301.75 3225 L10301.75 3225 L10294.25 3225 L10294.25 3225 L10264.25 3217.7539503386006 L10264.3 3217.8 " fill="none"></path>
+					<path d="M2122.3 2317.6 L2118.5 2321.2 L2114.6 2324.9 L2109.3 2311.5 Z"></path>
+					<path d="M16068.8 2378.2 L15465.75 2985 L22836 3170.0811761537684 L22836.0 3170.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10272.1 3117.9 L10282.4 3120.9 L10274.6 3128.2 L10264.3 3125.2 Z"></path>
+						<path d="M16079.1 2375.4 L16068.8 2378.2 L16071.6 2367.9 L16081.9 2365.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2998.9 2323.7 L2710.5 2985 L9881.25 3166.648935447723 L9881.3 3166.6 " fill="none"></path>
+					<path d="M16225.9 2378.8 L16778 2985 L19195.75 3163.9859581224573 L19195.8 3164.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M16223.6 2368.3 L16225.9 2378.8 L16215.7 2375.5 L16213.3 2365.0 Z"></path>
 					</g>
-					<path d="M3003.8 2325.9 L2998.9 2323.7 L2994.0 2321.6 L3004.2 2311.5 Z"></path>
-					<path d="M12932.5 1470.7 L12932.5 1607 L21091.75 2256.7036491288895 L21091.8 2256.7 " fill="none"></path>
+					<path d="M13982.8 1470.7 L13982.75 1607 L16952 2197.8059345895604 L16952.0 2197.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12937.8 1461.3 L12932.5 1470.7 L12927.2 1461.3 L12932.5 1452.0 Z"></path>
+						<path d="M13988.1 1461.3 L13982.8 1470.7 L13977.4 1461.3 L13982.8 1452.0 Z"></path>
 					</g>
-					<path d="M17400.9 1027.9 L12932.5 1174 L12932.5 1329 L12932.5 1329.0 " fill="none"></path>
-					<path d="M17401.1 1033.3 L17400.9 1027.9 L17400.7 1022.6 L17414.3 1027.5 Z"></path>
-					<path d="M47864.0 120.3 L47864 203 L47864 493 L47864.0 493.0 " fill="none"></path>
-					<path d="M47869.3 120.3 L47864.0 120.3 L47858.7 120.3 L47864.0 107.0 Z"></path>
-					<path d="M13451.5 1470.7 L13451.5 1607 L21091.75 2254.1962194559705 L21091.8 2254.2 " fill="none"></path>
+					<path d="M16888.4 1029.4 L13982.75 1174 L13982.75 1329 L13982.8 1329.0 " fill="none"></path>
+					<path d="M16888.7 1034.8 L16888.4 1029.4 L16888.2 1024.1 L16901.8 1028.8 Z"></path>
+					<path d="M16443.2 1482.0 L16156.25 1607 L16952 2032.2641070389761 L16952.0 2032.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13456.8 1461.3 L13451.5 1470.7 L13446.2 1461.3 L13451.5 1452.0 Z"></path>
+						<path d="M16453.8 1483.1 L16443.2 1482.0 L16449.6 1473.3 L16460.3 1474.5 Z"></path>
 					</g>
-					<path d="M17400.9 1028.3 L13451.5 1174 L13451.5 1329 L13451.5 1329.0 " fill="none"></path>
-					<path d="M17401.1 1033.6 L17400.9 1028.3 L17400.7 1023.0 L17414.3 1027.8 Z"></path>
-					<path d="M21187.5 2593.7 L20664.75 2985 L10264.25 3168.128139161631 L10264.3 3168.1 " fill="none"></path>
+					<path d="M16662.5 1493.1 L16673 1607 L16673 2280.5 L16673.0 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21198.2 2592.4 L21187.5 2593.7 L21191.8 2583.8 L21202.5 2582.5 Z"></path>
+						<path d="M16666.9 1483.3 L16662.5 1493.1 L16656.3 1484.3 L16660.8 1474.5 Z"></path>
 					</g>
-					<path d="M21756.5 2598.7 L21975 2985 L32856 3170.5365942857143 L32856.0 3170.5 " fill="none"></path>
+					<path d="M17172.0 2596.3 L16818 2985 L9784 3166.5571240744584 L9784.0 3166.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21756.6 2588.0 L21756.5 2598.7 L21747.3 2593.2 L21747.3 2582.5 Z"></path>
+						<path d="M17182.2 2593.0 L17172.0 2596.3 L17174.3 2585.8 L17184.6 2582.5 Z"></path>
 					</g>
-					<path d="M21773.8 2598.3 L22015 2985 L39344.75 3170.936709862072 L39344.8 3170.9 " fill="none"></path>
+					<path d="M17545.6 2600.2 L17672.25 2985 L22836 3169.481466404866 L22836.0 3169.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21773.4 2587.6 L21773.8 2598.3 L21764.4 2593.2 L21763.9 2582.5 Z"></path>
+						<path d="M17547.8 2589.7 L17545.6 2600.2 L17537.6 2593.0 L17539.8 2582.5 Z"></path>
 					</g>
-					<path d="M42716.7 1432.2 L42585.25 1607 L22078.75 2279.8085 L22078.8 2279.8 " fill="none"></path>
-					<path d="M42720.9 1435.4 L42716.7 1432.2 L42712.4 1429.0 L42724.7 1421.5 Z"></path>
-					<path d="M21914.7 1481.2 L21585.25 1607 L21585.25 2009.5 L21585.3 2009.5 " fill="none"></path>
+					<path d="M17563.2 2599.9 L17712.25 2985 L27269 3170.4810599162265 L27269.0 3170.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21925.3 1482.8 L21914.7 1481.2 L21921.5 1472.8 L21932.1 1474.5 Z"></path>
+						<path d="M17564.8 2589.3 L17563.2 2599.9 L17554.8 2593.1 L17556.4 2582.5 Z"></path>
 					</g>
-					<path d="M22389.3 1481.2 L22718.75 1607 L22718.75 2280.5 L22718.8 2280.5 " fill="none"></path>
+					<path d="M26031.6 1434.6 L26065 1607 L17939 2256.5520621845817 L17939.0 2256.6 " fill="none"></path>
+					<path d="M26036.8 1433.6 L26031.6 1434.6 L26026.3 1435.6 L26029.0 1421.5 Z"></path>
+					<path d="M38187.3 1112.7 L38187.25 1174 L38187.25 1375 L38187.3 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22382.5 1472.8 L22389.3 1481.2 L22378.7 1482.8 L22371.9 1474.5 Z"></path>
+						<path d="M38192.6 1103.3 L38187.3 1112.7 L38181.9 1103.3 L38187.3 1094.0 Z"></path>
 					</g>
-					<path d="M43411.4 2487.3 L43212.75 2985 L40692.25 3169.2701881615053 L40692.3 3169.3 " fill="none"></path>
+					<path d="M39003.2 574.3 L38187.25 876 L38187.25 956 L38187.3 956.0 " fill="none"></path>
+					<path d="M39005.1 579.3 L39003.2 574.3 L39001.4 569.3 L39015.8 569.6 Z"></path>
+					<path d="M32685.9 2484.3 L32267.5 2985 L27229 3170.377835865062 L27229.0 3170.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43419.8 2480.6 L43411.4 2487.3 L43409.9 2476.7 L43418.3 2470.0 Z"></path>
+						<path d="M32696.0 2480.6 L32685.9 2484.3 L32687.8 2473.7 L32697.9 2470.0 Z"></path>
 					</g>
-					<path d="M43422.4 2487.7 L43252.75 2985 L34499.75 3170.525002841232 L34499.8 3170.5 " fill="none"></path>
+					<path d="M32746.4 2486.6 L32493.25 2985 L24969.5 3170.366673271905 L24969.5 3170.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43430.4 2480.6 L43422.4 2487.7 L43420.3 2477.1 L43428.4 2470.0 Z"></path>
+						<path d="M32755.4 2480.7 L32746.4 2486.6 L32745.9 2475.9 L32754.9 2470.0 Z"></path>
 					</g>
-					<path d="M43433.4 2488.0 L43292.75 2985 L39304.75 3153.672638621159 L39304.8 3153.7 " fill="none"></path>
+					<path d="M32757.3 2487.0 L32533.25 2985 L28414.75 3154.185077092511 L28414.8 3154.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43441.1 2480.4 L43433.4 2488.0 L43430.8 2477.5 L43438.5 2470.0 Z"></path>
+						<path d="M32766.0 2480.7 L32757.3 2487.0 L32756.3 2476.3 L32765.0 2470.0 Z"></path>
 					</g>
-					<path d="M43487.8 2488.7 L43487.75 2985 L43487.75 3171.5 L43487.75 3171.5 L43487.75 3358 L43487.75 3358 L43487.75 3514.5 L43487.75 3514.5 L43487.75 3671 L43487.75 3671 L38651.25 3706.143946371917 L38651.3 3706.1 " fill="none"></path>
+					<path d="M32911.6 2487.6 L33089 2985 L33089 3171.5 L33089 3171.5 L33089 3358 L33089 3358 L33089 3514.5 L33089 3514.5 L33089 3671 L33089 3671 L24793 3706.2915518274417 L24793.0 3706.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43493.1 2479.3 L43487.8 2488.7 L43482.4 2479.3 L43487.8 2470.0 Z"></path>
+						<path d="M32913.5 2477.0 L32911.6 2487.6 L32903.4 2480.6 L32905.3 2470.0 Z"></path>
 					</g>
-					<path d="M43542.1 2488.0 L43682.75 2985 L43682.75 3171.5 L43682.75 3171.5 L43682.75 3358 L43682.75 3358 L39990.75 3508.7626875407695 L39990.8 3508.8 " fill="none"></path>
+					<path d="M32922.6 2487.2 L33129 2985 L33129 3171.5 L33129 3171.5 L33129 3358 L33129 3358 L28364.5 3510.017176350663 L28364.5 3510.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43544.7 2477.5 L43542.1 2488.0 L43534.4 2480.4 L43537.0 2470.0 Z"></path>
+						<path d="M32923.9 2476.6 L32922.6 2487.2 L32914.1 2480.7 L32915.4 2470.0 Z"></path>
 					</g>
-					<path d="M43553.1 2487.7 L43722.75 2985 L39449.75 3169.2363888567797 L39449.8 3169.2 " fill="none"></path>
+					<path d="M32953.1 2486.2 L33241.25 2985 L27374 3169.8460027872798 L27374.0 3169.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43555.2 2477.1 L43553.1 2487.7 L43545.1 2480.6 L43547.1 2470.0 Z"></path>
+						<path d="M32953.0 2475.4 L32953.1 2486.2 L32943.8 2480.7 L32943.8 2470.0 Z"></path>
 					</g>
-					<path d="M44207.7 613.7 L45796.25 876 L45796.25 1025 L45796.25 1025 L45796.25 1174 L45796.25 1174 L45796.25 1390.5 L45796.25 1390.5 L45796.25 1607 L45796.25 1607 L43917.75 2167.66125189517 L43917.8 2167.7 " fill="none"></path>
-					<path d="M44208.5 608.4 L44207.7 613.7 L44206.8 618.9 L44194.5 611.5 Z"></path>
+					<path d="M34975.2 590.5 L37492.25 876 L37492.25 1025 L37492.25 1025 L37492.25 1174 L37492.25 1174 L37492.25 1390.5 L37492.25 1390.5 L37492.25 1607 L37492.25 1607 L33273.25 2232.2723166272317 L33273.3 2232.3 " fill="none"></path>
+					<path d="M34975.8 585.2 L34975.2 590.5 L34974.6 595.8 L34962.0 589.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M43776.9 1068.1 L43487.75 1174 L43487.75 1390.5 L43487.75 1390.5 L43487.75 1607 L43487.75 1607 L43487.75 2122 L43487.8 2122.0 " fill="none"></path>
+						<path d="M32579.2 1030.8 L29548.25 1174 L29548.25 1390.5 L29548.25 1390.5 L29548.25 1607 L29548.25 1607 L32413.25 2206.08497723824 L32413.3 2206.1 " fill="none"></path>
 					</g>
-					<path d="M43778.7 1073.1 L43776.9 1068.1 L43775.0 1063.1 L43789.4 1063.5 Z"></path>
+					<path d="M32579.4 1036.1 L32579.2 1030.8 L32578.9 1025.4 L32592.5 1030.1 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M29400.8 1053.8 L29400.75 1174 L29400.75 1390.5 L29400.75 1390.5 L29400.75 1607 L29400.75 1607 L43057.75 2274.9685525661957 L43057.8 2275.0 " fill="none"></path>
+						<path d="M23156.0 1053.8 L23156 1174 L23156 1390.5 L23156 1390.5 L23156 1607 L23156 1607 L32413.25 2265.4165010709953 L32413.3 2265.4 " fill="none"></path>
 					</g>
-					<path d="M29406.1 1053.8 L29400.8 1053.8 L29395.4 1053.8 L29400.8 1040.5 Z"></path>
-					<path d="M38883.3 3296.7 L38883.25 3358 L39709.75 3491.761375387797 L39709.8 3491.8 " fill="none"></path>
+					<path d="M23161.3 1053.8 L23156.0 1053.8 L23150.7 1053.8 L23156.0 1040.5 Z"></path>
+					<path d="M27993.3 3296.7 L27993.25 3358 L28083.5 3419.209642470206 L28083.5 3419.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38888.6 3287.3 L38883.3 3296.7 L38877.9 3287.3 L38883.3 3278.0 Z"></path>
+						<path d="M27998.6 3287.3 L27993.3 3296.7 L27987.9 3287.3 L27993.3 3278.0 Z"></path>
 					</g>
-					<path d="M39323.4 3154.7 L43762.75 2985 L43557.19847605225 2470 L43557.2 2470.0 " fill="none"></path>
+					<path d="M28433.4 3156.0 L33281.25 2985 L32953.86248185777 2470 L32953.9 2470.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39313.9 3149.7 L39323.4 3154.7 L39314.3 3160.4 L39304.8 3155.4 Z"></path>
+						<path d="M28423.9 3151.0 L28433.4 3156.0 L28424.3 3161.6 L28414.8 3156.6 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M43916.1 1075.8 L43957.75 1174 L43957.75 1390.5 L43957.75 1390.5 L43957.75 1607 L43957.75 1607 L43957.75 2296 L43957.75 2296 L43957.75 2985 L43957.75 2985 L39304.75 3156.0088678687557 L39304.8 3156.0 " fill="none"></path>
+						<path d="M32822.8 1031.6 L35458.25 1174 L35458.25 1390.5 L35458.25 1390.5 L35458.25 1607 L35458.25 1607 L35458.25 2296 L35458.25 2296 L35458.25 2985 L35458.25 2985 L28414.75 3160.9695579370396 L28414.8 3161.0 " fill="none"></path>
 					</g>
-					<path d="M43921.0 1073.7 L43916.1 1075.8 L43911.1 1077.9 L43910.8 1063.5 Z"></path>
+					<path d="M32823.1 1026.3 L32822.8 1031.6 L32822.5 1036.9 L32809.5 1030.9 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M14193.6 1419.2 L14171.75 1607 L14171.75 2296 L14171.75 2296 L14171.75 2985 L14171.75 2985 L38461.75 3168.3189001072374 L38461.8 3168.3 " fill="none"></path>
+						<path d="M12974.9 1414.7 L13196.5 1607 L13196.5 2296 L13196.5 2296 L13196.5 2985 L13196.5 2985 L27571.75 3166.187363779208 L27571.8 3166.2 " fill="none"></path>
 					</g>
-					<path d="M14198.9 1419.9 L14193.6 1419.2 L14188.4 1418.6 L14195.2 1406.0 Z"></path>
+					<path d="M12978.4 1410.7 L12974.9 1414.7 L12971.4 1418.8 L12964.9 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M29457.0 1045.0 L29820.5 1174 L29820.5 1390.5 L29820.5 1390.5 L29820.5 1607 L29820.5 1607 L29820.5 2296 L29820.5 2296 L29820.5 2985 L29820.5 2985 L38461.75 3162.8260599707596 L38461.8 3162.8 " fill="none"></path>
+						<path d="M23163.6 1053.4 L23196 1174 L23196 1390.5 L23196 1390.5 L23196 1607 L23196 1607 L23196 2296 L23196 2296 L23196 2985 L23196 2985 L27571.75 3155.1135806972743 L27571.8 3155.1 " fill="none"></path>
 					</g>
-					<path d="M29458.8 1039.9 L29457.0 1045.0 L29455.2 1050.0 L29444.4 1040.5 Z"></path>
-					<path d="M22948.3 1476.4 L22886.75 1607 L22886.75 2296 L22886.75 2296 L22886.75 2985 L22886.75 2985 L12742.5 3168.7735374826975 L12742.5 3168.8 " fill="none"></path>
+					<path d="M23168.8 1052.0 L23163.6 1053.4 L23158.5 1054.8 L23160.2 1040.5 Z"></path>
+					<path d="M17990.9 1478.1 L17979 1607 L17979 2296 L17979 2296 L17979 2985 L17979 2985 L10853.25 3167.6424841092594 L10853.3 3167.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22957.1 1470.2 L22948.3 1476.4 L22947.4 1465.7 L22956.2 1459.5 Z"></path>
+						<path d="M17997.1 1469.3 L17990.9 1478.1 L17986.5 1468.3 L17992.6 1459.5 Z"></path>
 					</g>
-					<path d="M23042.5 1475.3 L23126 1607 L11565.25 2292.8557098267142 L11565.3 2292.9 " fill="none"></path>
+					<path d="M18052.7 1475.3 L18136.25 1607 L28016 2292.323576048929 L28016.0 2292.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23042.0 1464.5 L23042.5 1475.3 L23033.0 1470.2 L23032.5 1459.5 Z"></path>
+						<path d="M18052.2 1464.5 L18052.7 1475.3 L18043.2 1470.2 L18042.7 1459.5 Z"></path>
 					</g>
+					<path d="M33823.5 2340.2 L33929.75 2985 L33929.75 3133 L33929.8 3133.0 " fill="none"></path>
+					<path d="M33828.8 2339.3 L33823.5 2340.2 L33818.3 2341.0 L33821.4 2327.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M9052.2 1034.1 L7752.75 1174 L7752.75 1329 L7752.8 1329.0 " fill="none"></path>
+						<path d="M43374.1 1067.0 L43299.75 1174 L43299.75 1329 L43299.8 1329.0 " fill="none"></path>
 					</g>
-					<path d="M9052.8 1039.4 L9052.2 1034.1 L9051.7 1028.8 L9065.5 1032.7 Z"></path>
-					<path d="M12760.4 3121.6 L12772.5 3118 L12780 3118 L12780 3118 L12787.5 3171.5 L12787.5 3171.5 L12780 3225 L12780 3225 L12772.5 3225 L12772.5 3225 L12742.5 3216.1080332409974 L12742.5 3216.1 " fill="none"></path>
+					<path d="M43378.5 1070.0 L43374.1 1067.0 L43369.7 1063.9 L43381.7 1056.0 Z"></path>
+					<path d="M10871.1 3121.6 L10883.25 3118 L10890.75 3118 L10890.75 3118 L10898.25 3171.5 L10898.25 3171.5 L10890.75 3225 L10890.75 3225 L10883.25 3225 L10883.25 3225 L10853.25 3216.1080332409974 L10853.3 3216.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12749.9 3119.1 L12760.4 3121.6 L12753.0 3129.4 L12742.5 3126.9 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3011.0 2324.8 L3011 2985 L12441.5 3168.570425842814 L12441.5 3168.6 " fill="none"></path>
+						<path d="M10860.7 3119.1 L10871.1 3121.6 L10863.7 3129.4 L10853.3 3126.9 Z"></path>
 					</g>
-					<path d="M3016.3 2324.8 L3011.0 2324.8 L3005.7 2324.8 L3011.0 2311.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M27211.2 541.3 L9137 876 L9137 994 L9137.0 994.0 " fill="none"></path>
+						<path d="M2119.6 2320.9 L2782.75 2985 L10552.25 3167.9560290404042 L10552.3 3168.0 " fill="none"></path>
 					</g>
-					<path d="M27211.3 546.6 L27211.2 541.3 L27211.1 535.9 L27224.5 541.0 Z"></path>
-					<path d="M45255.2 2555.5 L45134.25 2985 L40692.25 3170.22817216322 L40692.3 3170.2 " fill="none"></path>
+					<path d="M2123.4 2317.2 L2119.6 2320.9 L2115.9 2324.7 L2110.2 2311.5 Z"></path>
+					<path d="M33846.5 2337.8 L34314.25 2985 L34314.25 3140.5 L34314.3 3140.5 " fill="none"></path>
+					<path d="M33850.8 2334.7 L33846.5 2337.8 L33842.1 2340.9 L33838.7 2327.0 Z"></path>
+					<path d="M22245.1 1605.6 L22245 1607 L22245 2296 L22245 2296 L22245 2985 L22245 2985 L30092 3169.7809974747474 L30092.0 3169.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45262.9 2547.9 L45255.2 2555.5 L45252.6 2545.0 L45260.3 2537.5 Z"></path>
+						<path d="M22251.3 1596.8 L22245.1 1605.6 L22240.7 1595.8 L22246.8 1587.0 Z"></path>
 					</g>
-					<path d="M45328.3 2556.2 L45328.25 2985 L32969 3170.651299760385 L32969.0 3170.7 " fill="none"></path>
+					<path d="M22513.0 1599.0 L22522.5 1607 L22522.5 2296 L22522.5 2296 L22522.5 2985 L22522.5 2985 L22861.749329758713 3156 L22861.7 3156.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45333.6 2546.8 L45328.3 2556.2 L45322.9 2546.8 L45328.3 2537.5 Z"></path>
+						<path d="M22509.3 1588.9 L22513.0 1599.0 L22502.4 1597.1 L22498.7 1587.0 Z"></path>
 					</g>
-					<path d="M45401.3 2555.5 L45522.25 2985 L39449.75 3169.9014285714284 L39449.8 3169.9 " fill="none"></path>
+					<path d="M19109.0 1440.2 L19109 1607 L24408.25 2244.5663770899723 L24408.3 2244.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45403.9 2545.0 L45401.3 2555.5 L45393.6 2547.9 L45396.2 2537.5 Z"></path>
+						<path d="M19114.3 1430.8 L19109.0 1440.2 L19103.7 1430.8 L19109.0 1421.5 Z"></path>
 					</g>
-					<path d="M44207.7 612.2 L45836.25 876 L45836.25 1025 L45836.25 1025 L45836.25 1174 L45836.25 1174 L45836.25 1390.5 L45836.25 1390.5 L45836.25 1607 L45836.25 1607 L45506.308055152396 2054.5 L45506.3 2054.5 " fill="none"></path>
-					<path d="M44208.5 607.0 L44207.7 612.2 L44206.8 617.5 L44194.5 610.1 Z"></path>
-					<path d="M22455.0 2340.0 L22605.75 2985 L15438.5 3168.6430877554526 L15438.5 3168.6 " fill="none"></path>
-					<path d="M22460.2 2338.8 L22455.0 2340.0 L22449.8 2341.2 L22452.0 2327.0 Z"></path>
-					<path d="M9895.0 1493.2 L9895 1607 L10439.747822931786 2182 L10439.7 2182.0 " fill="none"></path>
+					<path d="M15639.5 1455.7 L15639.5 1607 L15639.5 2280.5 L15639.5 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9900.3 1483.8 L9895.0 1493.2 L9889.7 1483.8 L9895.0 1474.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M9221.6 1041.6 L9895 1174 L9895 1306.5 L9895.0 1306.5 " fill="none"></path>
-					</g>
-					<path d="M9222.6 1036.4 L9221.6 1041.6 L9220.6 1046.9 L9208.5 1039.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M9221.7 1037.6 L10142 1174 L10142 1390.5 L10142 1390.5 L10142 1607 L10142 1607 L10480.615747460088 2182 L10480.6 2182.0 " fill="none"></path>
-					</g>
-					<path d="M9222.5 1032.3 L9221.7 1037.6 L9220.9 1042.8 L9208.5 1035.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3041.4 2319.7 L3896.25 2985 L1932 3154.7752867570384 L1932.0 3154.8 " fill="none"></path>
-					</g>
-					<path d="M3044.7 2315.5 L3041.4 2319.7 L3038.2 2323.9 L3030.9 2311.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M9221.8 1032.6 L10796 1174 L10796 1329 L10796.0 1329.0 " fill="none"></path>
+						<path d="M15644.8 1446.3 L15639.5 1455.7 L15634.2 1446.3 L15639.5 1437.0 Z"></path>
 					</g>
-					<path d="M9222.3 1027.3 L9221.8 1032.6 L9221.3 1037.9 L9208.5 1031.4 Z"></path>
-					<path d="M24367.3 1440.2 L24367.25 1607 L32494.25 2267.7083185840706 L32494.3 2267.7 " fill="none"></path>
+					<path d="M16888.5 1034.9 L15639.5 1174 L15639.5 1344 L15639.5 1344.0 " fill="none"></path>
+					<path d="M16889.1 1040.2 L16888.5 1034.9 L16887.9 1029.6 L16901.8 1033.5 Z"></path>
+					<path d="M22265.0 1097.7 L22265 1174 L22265 1194 L22265.0 1194.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24372.6 1430.8 L24367.3 1440.2 L24361.9 1430.8 L24367.3 1421.5 Z"></path>
+						<path d="M22270.3 1088.3 L22265.0 1097.7 L22259.7 1088.3 L22265.0 1079.0 Z"></path>
 					</g>
-					<path d="M13903.0 1455.7 L13903 1607 L13903 2280.5 L13903.0 2280.5 " fill="none"></path>
+					<path d="M15330.6 544.7 L22265 876 L22265 971 L22265.0 971.0 " fill="none"></path>
+					<path d="M15330.8 539.4 L15330.6 544.7 L15330.3 550.0 L15317.3 544.1 Z"></path>
+					<path d="M43705.8 1478.2 L43705.75 1607 L43807.22314949202 2197 L43807.2 2197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13908.3 1446.3 L13903.0 1455.7 L13897.7 1446.3 L13903.0 1437.0 Z"></path>
+						<path d="M43711.1 1468.8 L43705.8 1478.2 L43700.4 1468.8 L43705.8 1459.5 Z"></path>
 					</g>
-					<path d="M17400.9 1028.7 L13903 1174 L13903 1344 L13903.0 1344.0 " fill="none"></path>
-					<path d="M17401.1 1034.0 L17400.9 1028.7 L17400.7 1023.4 L17414.3 1028.2 Z"></path>
-					<path d="M35489.5 1508.2 L35489.5 1607 L25509.5 2283.526957890594 L25509.5 2283.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35494.8 1498.8 L35489.5 1508.2 L35484.2 1498.8 L35489.5 1489.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M43478.1 1061.9 L43705.75 1174 L43705.75 1321.5 L43705.8 1321.5 " fill="none"></path>
 					</g>
-					<path d="M35415.1 1117.1 L35489.5 1174 L35489.5 1291.5 L35489.5 1291.5 " fill="none"></path>
-					<path d="M35418.4 1112.9 L35415.1 1117.1 L35411.9 1121.3 L35404.5 1109.0 Z"></path>
-					<path d="M32666.1 2522.2 L32305.75 2985 L40631.25 3170.819261608425 L40631.3 3170.8 " fill="none"></path>
+					<path d="M43480.5 1057.1 L43478.1 1061.9 L43475.8 1066.7 L43466.2 1056.0 Z"></path>
+					<path d="M23885.7 2449.7 L23655.75 2985 L22949 3157.694235178513 L22949.0 3157.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32676.0 2518.1 L32666.1 2522.2 L32667.6 2511.6 L32677.6 2507.5 Z"></path>
+						<path d="M23894.3 2443.2 L23885.7 2449.7 L23884.5 2439.0 L23893.1 2432.5 Z"></path>
 					</g>
-					<path d="M32926.7 2525.0 L33096.25 2985 L32927.77144772118 3156 L32927.8 3156.0 " fill="none"></path>
+					<path d="M24037.7 2448.8 L24339.5 2985 L27269 3168.2165492957747 L27269.0 3168.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32928.5 2514.4 L32926.7 2525.0 L32918.4 2518.1 L32920.2 2507.5 Z"></path>
+						<path d="M24037.8 2438.0 L24037.7 2448.8 L24028.5 2443.2 L24028.6 2432.5 Z"></path>
 					</g>
-					<path d="M32939.8 2524.7 L33136.25 2985 L39344.75 3169.9361523718258 L39344.8 3169.9 " fill="none"></path>
+					<path d="M26039.5 1434.0 L26105 1607 L24299.75 2184.6464646464647 L24299.8 2184.6 " fill="none"></path>
+					<path d="M26044.5 1432.1 L26039.5 1434.0 L26034.5 1435.9 L26034.7 1421.5 Z"></path>
+					<path d="M24421.5 1467.7 L23951.75 1607 L23951.75 2159.5 L23951.8 2159.5 " fill="none"></path>
+					<path d="M24423.0 1472.8 L24421.5 1467.7 L24420.0 1462.6 L24434.3 1463.9 Z"></path>
+					<path d="M38797.4 1115.6 L38695.75 1174 L38695.75 1306.5 L38695.8 1306.5 " fill="none"></path>
+					<path d="M38800.0 1120.3 L38797.4 1115.6 L38794.7 1111.0 L38809.0 1109.0 Z"></path>
+					<path d="M39013.9 593.2 L38575.25 876 L38575.25 926 L38575.3 926.0 " fill="none"></path>
+					<path d="M39016.8 597.7 L39013.9 593.2 L39011.0 588.7 L39025.1 586.0 Z"></path>
+					<path d="M43824.3 2413.7 L43824.25 2985 L30238 3170.5032761681646 L30238.0 3170.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32941.1 2514.0 L32939.8 2524.7 L32931.3 2518.2 L32932.5 2507.5 Z"></path>
-					</g>
-					<path d="M42760.0 1434.4 L42807 1607 L33190.25 2271.93798138438 L33190.3 2271.9 " fill="none"></path>
-					<path d="M42765.1 1433.0 L42760.0 1434.4 L42754.8 1435.8 L42756.4 1421.5 Z"></path>
-					<path d="M39497.9 1532.3 L39477.25 1607 L33190.25 2259.862547098719 L33190.3 2259.9 " fill="none"></path>
-					<path d="M39503.1 1533.8 L39497.9 1532.3 L39492.8 1530.9 L39501.5 1519.5 Z"></path>
-					<path d="M42132.4 1554.0 L42107 1607 L33190.25 2270.1199708572817 L33190.3 2270.1 " fill="none"></path>
-					<path d="M42137.2 1556.3 L42132.4 1554.0 L42127.6 1551.7 L42138.1 1542.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M43928.8 1074.5 L43997.75 1174 L43997.75 1390.5 L43997.75 1390.5 L43997.75 1607 L43997.75 1607 L33190.25 2274.5063869839987 L33190.3 2274.5 " fill="none"></path>
+						<path d="M43829.6 2404.3 L43824.3 2413.7 L43818.9 2404.3 L43824.3 2395.0 Z"></path>
 					</g>
-					<path d="M43933.2 1071.4 L43928.8 1074.5 L43924.4 1077.5 L43921.2 1063.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M14199.0 1419.3 L14211.75 1607 L32494.25 2283.1301360672014 L32494.3 2283.1 " fill="none"></path>
+						<path d="M43487.6 1048.3 L43942.75 1174 L43942.75 1390.5 L43942.75 1390.5 L43942.75 1607 L43942.75 1607 L43841.27685050798 2197 L43841.3 2197.0 " fill="none"></path>
 					</g>
-					<path d="M14204.3 1418.9 L14199.0 1419.3 L14193.6 1419.7 L14198.1 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29461.3 1044.6 L29860.5 1174 L29860.5 1390.5 L29860.5 1390.5 L29860.5 1607 L29860.5 1607 L32494.25 2215.5868198205753 L32494.3 2215.6 " fill="none"></path>
-					</g>
-					<path d="M29462.9 1039.5 L29461.3 1044.6 L29459.6 1049.7 L29448.6 1040.5 Z"></path>
-					<path d="M22457.5 2339.8 L22645.75 2985 L15788.5 3167.3775713929194 L15788.5 3167.4 " fill="none"></path>
-					<path d="M22462.6 2338.3 L22457.5 2339.8 L22452.4 2341.3 L22453.8 2327.0 Z"></path>
-					<path d="M40053.1 2494.5 L39830.25 2985 L40631.25 3164.6590499098015 L40631.3 3164.7 " fill="none"></path>
+					<path d="M43489.0 1043.2 L43487.6 1048.3 L43486.2 1053.4 L43474.8 1044.7 Z"></path>
+					<path d="M28602.7 2503.6 L28574.75 2985 L27229 3167.3668483197093 L27229.0 3167.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40061.8 2488.2 L40053.1 2494.5 L40052.1 2483.8 L40060.8 2477.5 Z"></path>
+						<path d="M28608.6 2494.6 L28602.7 2503.6 L28597.9 2494.0 L28603.8 2485.0 Z"></path>
 					</g>
-					<path d="M40064.5 2494.9 L39870.25 2985 L34499.75 3169.916135881104 L34499.8 3169.9 " fill="none"></path>
+					<path d="M28740.3 2500.9 L29037 2985 L24969.5 3169.414428102589 L24969.5 3169.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40072.9 2488.1 L40064.5 2494.9 L40062.9 2484.2 L40071.3 2477.5 Z"></path>
+						<path d="M28740.0 2490.2 L28740.3 2500.9 L28730.9 2495.7 L28730.6 2485.0 Z"></path>
 					</g>
-					<path d="M40143.3 2496.2 L40143.25 2985 L40143.25 3171.5 L40143.25 3171.5 L40143.25 3358 L40143.25 3358 L40143.25 3514.5 L40143.25 3514.5 L40143.25 3671 L40143.25 3671 L38651.25 3705.371187540558 L38651.3 3705.4 " fill="none"></path>
+					<path d="M28751.9 2500.5 L29077 2985 L29077 3171.5 L29077 3171.5 L29077 3358 L29077 3358 L29077 3514.5 L29077 3514.5 L29077 3671 L29077 3671 L24793 3706.0985460420034 L24793.0 3706.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40148.6 2486.8 L40143.3 2496.2 L40137.9 2486.8 L40143.3 2477.5 Z"></path>
+						<path d="M28751.2 2489.8 L28751.9 2500.5 L28742.3 2495.7 L28741.6 2485.0 Z"></path>
 					</g>
-					<path d="M40268.8 2493.2 L40581.75 2985 L40581.75 3171.5 L40581.75 3171.5 L40581.75 3358 L40581.75 3358 L39990.75 3484.440874914559 L39990.8 3484.4 " fill="none"></path>
+					<path d="M28763.5 2500.1 L29117 2985 L29117 3171.5 L29117 3171.5 L29117 3358 L29117 3358 L28364.5 3489.8770996640537 L28364.5 3489.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40268.3 2482.5 L40268.8 2493.2 L40259.3 2488.2 L40258.8 2477.5 Z"></path>
+						<path d="M28762.3 2489.4 L28763.5 2500.1 L28753.7 2495.7 L28752.5 2485.0 Z"></path>
 					</g>
-					<path d="M40279.9 2492.8 L40621.75 2985 L39449.75 3163.5038791343404 L39449.8 3163.5 " fill="none"></path>
+					<path d="M28775.0 2499.7 L29157 2985 L27374 3166.1656224462 L27374.0 3166.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40279.0 2482.1 L40279.9 2492.8 L40270.2 2488.2 L40269.3 2477.5 Z"></path>
+						<path d="M28773.5 2489.0 L28775.0 2499.7 L28765.1 2495.6 L28763.5 2485.0 Z"></path>
 					</g>
-					<path d="M44207.7 610.9 L45876.25 876 L45876.25 1025 L45876.25 1025 L45876.25 1174 L45876.25 1174 L45876.25 1390.5 L45876.25 1390.5 L45876.25 1607 L45876.25 1607 L40689.25 2230.3809523809523 L40689.3 2230.4 " fill="none"></path>
-					<path d="M44208.5 605.6 L44207.7 610.9 L44206.8 616.1 L44194.5 608.8 Z"></path>
+					<path d="M34975.3 589.8 L37532.25 876 L37532.25 1025 L37532.25 1025 L37532.25 1174 L37532.25 1174 L37532.25 1390.5 L37532.25 1390.5 L37532.25 1607 L37532.25 1607 L29034.25 2263.587832912812 L29034.3 2263.6 " fill="none"></path>
+					<path d="M34975.8 584.5 L34975.3 589.8 L34974.7 595.1 L34962.0 588.3 Z"></path>
+					<path d="M22545.8 1594.8 L22562.5 1607 L28195.25 2248.2432979470445 L28195.3 2248.2 " fill="none"></path>
+					<path d="M22548.9 1590.5 L22545.8 1594.8 L22542.7 1599.2 L22535.0 1587.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M43940.8 1073.1 L44037.75 1174 L44037.75 1390.5 L44037.75 1390.5 L44037.75 1607 L44037.75 1607 L40689.25 2199.403774553858 L40689.3 2199.4 " fill="none"></path>
+						<path d="M32822.8 1031.5 L35498.25 1174 L35498.25 1390.5 L35498.25 1390.5 L35498.25 1607 L35498.25 1607 L29034.25 2254.0103871576957 L29034.3 2254.0 " fill="none"></path>
 					</g>
-					<path d="M43944.6 1069.4 L43940.8 1073.1 L43936.9 1076.8 L43931.5 1063.5 Z"></path>
+					<path d="M32823.1 1026.2 L32822.8 1031.5 L32822.5 1036.8 L32809.5 1030.8 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M14207.3 1418.5 L14277 1607 L39597.25 2281.4561832503746 L39597.3 2281.5 " fill="none"></path>
+						<path d="M12978.4 1414.0 L13236.5 1607 L28195.25 2277.204916034009 L28195.3 2277.2 " fill="none"></path>
 					</g>
-					<path d="M14212.4 1416.7 L14207.3 1418.5 L14202.3 1420.4 L14202.7 1406.0 Z"></path>
+					<path d="M12981.6 1409.7 L12978.4 1414.0 L12975.2 1418.3 L12967.7 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M29465.5 1044.3 L29900.5 1174 L29900.5 1390.5 L29900.5 1390.5 L29900.5 1607 L29900.5 1607 L39597.25 2259.272168118913 L39597.3 2259.3 " fill="none"></path>
+						<path d="M23170.6 1052.2 L23236 1174 L23236 1390.5 L23236 1390.5 L23236 1607 L23236 1607 L28195.25 2242.263444108761 L28195.3 2242.3 " fill="none"></path>
 					</g>
-					<path d="M29467.0 1039.2 L29465.5 1044.3 L29464.0 1049.4 L29452.7 1040.5 Z"></path>
-					<path d="M14486.5 1469.6 L14437 1607 L16604.85867198839 2280.5 L16604.9 2280.5 " fill="none"></path>
+					<path d="M23175.3 1049.7 L23170.6 1052.2 L23165.9 1054.8 L23164.3 1040.5 Z"></path>
+					<path d="M21213.8 1440.2 L21213.75 1607 L23603.75 2208.4280496712927 L23603.8 2208.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14494.7 1462.6 L14486.5 1469.6 L14484.7 1459.0 L14492.8 1452.0 Z"></path>
+						<path d="M21219.1 1430.8 L21213.8 1440.2 L21208.4 1430.8 L21213.8 1421.5 Z"></path>
 					</g>
-					<path d="M14584.6 1465.7 L14715.25 1607 L16825.680333817127 2280.5 L16825.7 2280.5 " fill="none"></path>
+					<path d="M24670.5 2545.6 L24379.5 2985 L27168 3169.482174529975 L27168.0 3169.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14582.1 1455.2 L14584.6 1465.7 L14574.3 1462.5 L14571.9 1452.0 Z"></path>
+						<path d="M24680.1 2540.7 L24670.5 2545.6 L24671.2 2534.8 L24680.8 2530.0 Z"></path>
 					</g>
-					<path d="M17400.9 1029.5 L14515 1174 L14515 1329 L14515.0 1329.0 " fill="none"></path>
-					<path d="M17401.2 1034.8 L17400.9 1029.5 L17400.7 1024.1 L17414.3 1028.8 Z"></path>
-					<path d="M33964.2 2442.5 L33764.25 2985 L32969 3159.128705606105 L32969.0 3159.1 " fill="none"></path>
+					<path d="M24732.7 2547.3 L24553.25 2985 L22949 3165.1551256962216 L22949.0 3165.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33972.5 2435.6 L33964.2 2442.5 L33962.5 2431.9 L33970.7 2425.0 Z"></path>
+						<path d="M24741.2 2540.7 L24732.7 2547.3 L24731.3 2536.6 L24739.8 2530.0 Z"></path>
 					</g>
-					<path d="M34185.8 2437.0 L34836.75 2985 L39344.75 3169.353031465848 L39344.8 3169.4 " fill="none"></path>
+					<path d="M24899.3 2548.1 L25009.5 2985 L25009.5 3171.5 L25009.5 3171.5 L25009.5 3358 L25009.5 3358 L25009.5 3514.5 L25009.5 3514.5 L25009.5 3671 L25009.5 3671 L24793 3699.948210922787 L24793.0 3699.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34182.1 2426.9 L34185.8 2437.0 L34175.2 2435.1 L34171.5 2425.0 Z"></path>
+						<path d="M24902.2 2537.7 L24899.3 2548.1 L24891.9 2540.4 L24894.8 2530.0 Z"></path>
 					</g>
-					<path d="M42767.7 1433.6 L42847 1607 L34366.25 2268.8419085374485 L34366.3 2268.8 " fill="none"></path>
-					<path d="M42772.6 1431.4 L42767.7 1433.6 L42762.9 1435.8 L42762.2 1421.5 Z"></path>
-					<path d="M22460.0 2339.6 L22685.75 2985 L16277.5 3165.187497644265 L16277.5 3165.2 " fill="none"></path>
-					<path d="M22465.0 2337.8 L22460.0 2339.6 L22455.0 2341.3 L22455.6 2327.0 Z"></path>
-					<path d="M41923.3 2383.7 L41923.25 2985 L32122.5 3166.301844917797 L32122.5 3166.3 " fill="none"></path>
+					<path d="M24913.9 2547.8 L25049.5 2985 L25049.5 3171.5 L25049.5 3171.5 L25049.5 3358 L25049.5 3358 L28083.5 3507.5734761379745 L28083.5 3507.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41928.6 2374.3 L41923.3 2383.7 L41917.9 2374.3 L41923.3 2365.0 Z"></path>
+						<path d="M24916.2 2537.3 L24913.9 2547.8 L24906.0 2540.5 L24908.3 2530.0 Z"></path>
 					</g>
-					<path d="M39125.0 552.1 L41923.25 876 L41923.25 1025 L41923.25 1025 L41923.25 1174 L41923.25 1174 L41923.25 1390.5 L41923.25 1390.5 L41923.25 1607 L41923.25 1607 L41923.25 2227 L41923.3 2227.0 " fill="none"></path>
-					<path d="M39125.6 546.8 L39125.0 552.1 L39124.4 557.4 L39111.8 550.6 Z"></path>
-					<path d="M27212.0 575.4 L26426.25 876 L26426.25 941 L26426.3 941.0 " fill="none"></path>
-					<path d="M27214.0 580.4 L27212.0 575.4 L27210.1 570.5 L27224.5 570.7 Z"></path>
-					<path d="M25447.8 1440.2 L25447.75 1607 L33670.25 2268.023569219999 L33670.3 2268.0 " fill="none"></path>
+					<path d="M24928.4 2547.5 L25089.5 2985 L27269 3167.113239247312 L27269.0 3167.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25453.1 1430.8 L25447.8 1440.2 L25442.4 1430.8 L25447.8 1421.5 Z"></path>
+						<path d="M24930.2 2536.9 L24928.4 2547.5 L24920.2 2540.6 L24921.9 2530.0 Z"></path>
 					</g>
-					<path d="M11113.7 1482.4 L10847.75 1607 L9757.833454281568 2280.5 L9757.8 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11124.5 1483.3 L11113.7 1482.4 L11119.9 1473.6 L11130.7 1474.5 Z"></path>
+					<path d="M26054.0 1432.2 L26184 1607 L25263.25 2077.5334693120712 L25263.3 2077.5 " fill="none"></path>
+					<path d="M26058.3 1429.0 L26054.0 1432.2 L26049.7 1435.4 L26046.1 1421.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M32822.8 1031.4 L35538.25 1174 L35538.25 1390.5 L35538.25 1390.5 L35538.25 1607 L35538.25 1607 L25263.25 2268.478626489138 L25263.3 2268.5 " fill="none"></path>
 					</g>
-					<path d="M11394.4 1488.7 L11496.25 1607 L25141.5 2286.8327638881356 L25141.5 2286.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11392.4 1478.1 L11394.4 1488.7 L11384.3 1485.1 L11382.3 1474.5 Z"></path>
+					<path d="M32823.1 1026.1 L32822.8 1031.4 L32822.5 1036.7 L32809.5 1030.7 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M12981.7 1413.3 L13276.5 1607 L24408.25 2270.518459242598 L24408.3 2270.5 " fill="none"></path>
 					</g>
+					<path d="M12984.7 1408.9 L12981.7 1413.3 L12978.8 1417.8 L12970.6 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M9221.8 1030.8 L11310 1174 L11310 1306.5 L11310.0 1306.5 " fill="none"></path>
+						<path d="M23222.1 1044.2 L23668 1174 L23668 1390.5 L23668 1390.5 L23668 1607 L23668 1607 L24439.155660377357 2062 L24439.2 2062.0 " fill="none"></path>
 					</g>
-					<path d="M9222.2 1025.5 L9221.8 1030.8 L9221.4 1036.1 L9208.5 1029.9 Z"></path>
-					<path d="M31841.5 3356.7 L31841.5 3358 L31841.5 3514.5 L31841.5 3514.5 L31841.5 3671 L31841.5 3671 L38553.25 3706.2427060607183 L38553.3 3706.2 " fill="none"></path>
+					<path d="M23223.6 1039.1 L23222.1 1044.2 L23220.6 1049.3 L23209.3 1040.5 Z"></path>
+					<path d="M33435.6 1433.4 L33816.25 1607 L33816.25 2265 L33816.3 2265.0 " fill="none"></path>
+					<path d="M33437.8 1428.6 L33435.6 1433.4 L33433.4 1438.3 L33423.5 1427.9 Z"></path>
+					<path d="M33862.2 2335.7 L34613.75 2985 L34613.75 3140.5 L34613.8 3140.5 " fill="none"></path>
+					<path d="M33865.7 2331.7 L33862.2 2335.7 L33858.7 2339.8 L33852.1 2327.0 Z"></path>
+					<path d="M44189.8 1493.2 L44189.75 1607 L44292.81603773585 2182 L44292.8 2182.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31846.8 3347.3 L31841.5 3356.7 L31836.2 3347.3 L31841.5 3338.0 Z"></path>
+						<path d="M44195.1 1483.8 L44189.8 1493.2 L44184.4 1483.8 L44189.8 1474.5 Z"></path>
 					</g>
-					<path d="M25536.7 2452.2 L23765.5 2985 L31560.5 3165.0108345715703 L31560.5 3165.0 " fill="none"></path>
-					<path d="M25538.3 2457.3 L25536.7 2452.2 L25535.2 2447.1 L25549.5 2448.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M29338.0 2340.3 L29338 2985 L31560.5 3150.566706610745 L31560.5 3150.6 " fill="none"></path>
+						<path d="M43487.9 1041.0 L44189.75 1174 L44189.75 1306.5 L44189.8 1306.5 " fill="none"></path>
 					</g>
-					<path d="M29343.3 2340.3 L29338.0 2340.3 L29332.7 2340.3 L29338.0 2327.0 Z"></path>
-					<path d="M40981.6 2559.9 L40661.75 2985 L40661.75 3156 L40661.8 3156.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40991.5 2555.7 L40981.6 2559.9 L40983.0 2549.3 L40992.9 2545.0 Z"></path>
+					<path d="M43488.8 1035.8 L43487.9 1041.0 L43486.9 1046.3 L43474.8 1038.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M43487.9 1037.2 L44436.75 1174 L44436.75 1390.5 L44436.75 1390.5 L44436.75 1607 L44436.75 1607 L44333.68396226415 2182 L44333.7 2182.0 " fill="none"></path>
 					</g>
-					<path d="M40996.7 2560.3 L40701.75 2985 L34499.75 3170.1269206145967 L34499.8 3170.1 " fill="none"></path>
+					<path d="M43488.7 1031.9 L43487.9 1037.2 L43487.2 1042.5 L43474.8 1035.3 Z"></path>
+					<path d="M36666.7 2555.6 L36558.25 2985 L27229 3170.892264750661 L27229.0 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41006.4 2555.7 L40996.7 2560.3 L40997.6 2549.6 L41007.3 2545.0 Z"></path>
+						<path d="M36674.1 2547.9 L36666.7 2555.6 L36663.8 2545.2 L36671.3 2537.5 Z"></path>
 					</g>
-					<path d="M41011.8 2560.7 L40741.75 2985 L35339.75 3158.642364701827 L35339.8 3158.6 " fill="none"></path>
+					<path d="M36790.3 2555.7 L36886.25 2985 L22949 3170.7470031263956 L22949.0 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41021.3 2555.7 L41011.8 2560.7 L41012.3 2550.0 L41021.8 2545.0 Z"></path>
+						<path d="M36793.5 2545.4 L36790.3 2555.7 L36783.1 2547.8 L36786.2 2537.5 Z"></path>
 					</g>
-					<path d="M41026.9 2561.2 L40781.75 2985 L32969 3170.1609587953108 L32969.0 3170.2 " fill="none"></path>
+					<path d="M36805.3 2555.5 L36926.25 2985 L27374 3170.480582524272 L27374.0 3170.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41036.2 2555.7 L41026.9 2561.2 L41026.9 2550.4 L41036.2 2545.0 Z"></path>
+						<path d="M36807.9 2545.0 L36805.3 2555.5 L36797.6 2547.9 L36800.2 2537.5 Z"></path>
 					</g>
-					<path d="M41244.4 2563.2 L41345.75 2985 L41345.75 3171.5 L41345.75 3171.5 L41345.75 3358 L41345.75 3358 L41345.75 3514.5 L41345.75 3514.5 L41345.75 3671 L41345.75 3671 L38651.25 3705.865955895754 L38651.3 3705.9 " fill="none"></path>
+					<path d="M34975.3 589.1 L37572.25 876 L37572.25 1025 L37572.25 1025 L37572.25 1174 L37572.25 1174 L37572.25 1390.5 L37572.25 1390.5 L37572.25 1607 L37572.25 1607 L37026.676705370104 2054.5 L37026.7 2054.5 " fill="none"></path>
+					<path d="M34975.8 583.8 L34975.3 589.1 L34974.7 594.4 L34962.0 587.7 Z"></path>
+					<path d="M24681.8 1097.7 L24681.75 1174 L24681.75 1239 L24681.8 1239.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41247.4 2552.8 L41244.4 2563.2 L41237.1 2555.3 L41240.1 2545.0 Z"></path>
+						<path d="M24687.1 1088.3 L24681.8 1097.7 L24676.4 1088.3 L24681.8 1079.0 Z"></path>
 					</g>
-					<path d="M41259.9 2562.9 L41385.75 2985 L41385.75 3171.5 L41385.75 3171.5 L41385.75 3358 L41385.75 3358 L39990.75 3500.180071637903 L39990.8 3500.2 " fill="none"></path>
+					<path d="M15330.6 543.4 L24681.75 876 L24681.75 971 L24681.8 971.0 " fill="none"></path>
+					<path d="M15330.8 538.1 L15330.6 543.4 L15330.4 548.7 L15317.3 542.9 Z"></path>
+					<path d="M24946.9 1482.9 L25303.25 1607 L25303.25 2296 L25303.25 2296 L25303.25 2985 L25303.25 2985 L22949 3167.1290573472984 L22949.0 3167.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41262.3 2552.4 L41259.9 2562.9 L41252.1 2555.5 L41254.5 2545.0 Z"></path>
+						<path d="M24939.8 1474.8 L24946.9 1482.9 L24936.3 1484.8 L24929.3 1476.7 Z"></path>
 					</g>
-					<path d="M41275.2 2562.6 L41425.75 2985 L39449.75 3166.673157505546 L39449.8 3166.7 " fill="none"></path>
+					<path d="M24947.0 1477.3 L25343.25 1607 L25343.25 2296 L25343.25 2296 L25343.25 2985 L25343.25 2985 L11344.25 3170.3744319795514 L11344.3 3170.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41277.1 2552.0 L41275.2 2562.6 L41267.1 2555.6 L41269.0 2545.0 Z"></path>
+						<path d="M24939.8 1469.3 L24947.0 1477.3 L24936.5 1479.5 L24929.3 1471.5 Z"></path>
 					</g>
-					<path d="M44207.7 609.5 L45916.25 876 L45916.25 1025 L45916.25 1025 L45916.25 1174 L45916.25 1174 L45916.25 1390.5 L45916.25 1390.5 L45916.25 1607 L45916.25 1607 L41631.25 2230.3878800675675 L41631.3 2230.4 " fill="none"></path>
-					<path d="M44208.5 604.3 L44207.7 609.5 L44206.9 614.8 L44194.5 607.5 Z"></path>
-					<path d="M39524.1 1532.8 L39517.25 1607 L40729.25 2109.1455201443173 L40729.3 2109.1 " fill="none"></path>
-					<path d="M39529.4 1533.3 L39524.1 1532.8 L39518.8 1532.3 L39525.3 1519.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M43952.2 1071.9 L44077.75 1174 L44077.75 1390.5 L44077.75 1390.5 L44077.75 1607 L44077.75 1607 L41631.25 2188.756169111303 L41631.3 2188.8 " fill="none"></path>
-					</g>
-					<path d="M43955.6 1067.8 L43952.2 1071.9 L43948.8 1076.0 L43941.8 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M14212.1 1417.7 L14317 1607 L40729.25 2284.432561212809 L40729.3 2284.4 " fill="none"></path>
+					<path d="M39042.4 1122.9 L39087.75 1174 L39087.75 1375 L39087.8 1375.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M39040.1 1112.4 L39042.4 1122.9 L39032.2 1119.5 L39029.9 1109.0 Z"></path>
 					</g>
-					<path d="M14216.7 1415.1 L14212.1 1417.7 L14207.4 1420.2 L14205.6 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M29510.4 1042.5 L30332.5 1174 L30332.5 1390.5 L30332.5 1390.5 L30332.5 1607 L30332.5 1607 L40729.25 2267.354520522689 L40729.3 2267.4 " fill="none"></path>
+						<path d="M39072.4 598.3 L38955.25 876 L38955.25 941 L38955.3 941.0 " fill="none"></path>
 					</g>
-					<path d="M29511.3 1037.3 L29510.4 1042.5 L29509.6 1047.8 L29497.3 1040.4 Z"></path>
-					<path d="M34939.8 3296.7 L34939.75 3358 L39709.75 3510.0221973322473 L39709.8 3510.0 " fill="none"></path>
+					<path d="M39077.4 600.4 L39072.4 598.3 L39067.5 596.2 L39077.6 586.0 Z"></path>
+					<path d="M26637.8 1536.7 L26667 1607 L26667 2296 L26667 2296 L26667 2985 L26667 2985 L26667 3171.5 L26667 3171.5 L26667 3358 L26667 3358 L26667 3514.5 L26667 3514.5 L26667 3671 L26667 3671 L24793 3705.5954238169525 L24793.0 3705.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34945.1 3287.3 L34939.8 3296.7 L34934.4 3287.3 L34939.8 3278.0 Z"></path>
+						<path d="M26639.1 1526.1 L26637.8 1536.7 L26629.3 1530.2 L26630.6 1519.5 Z"></path>
 					</g>
-					<path d="M35358.4 3159.5 L41465.75 2985 L41283.42779390421 2545 L41283.4 2545.0 " fill="none"></path>
+					<path d="M26669.3 1535.2 L26715 1607 L26715 2296 L26715 2296 L26715 2985 L26715 2985 L26715 3171.5 L26715 3171.5 L26715 3358 L26715 3358 L28083.5 3499.9285950960902 L28083.5 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35348.9 3154.5 L35358.4 3159.5 L35349.2 3165.1 L35339.8 3160.1 Z"></path>
+						<path d="M26668.7 1524.5 L26669.3 1535.2 L26659.7 1530.2 L26659.2 1519.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M43963.3 1070.9 L44117.75 1174 L44117.75 1390.5 L44117.75 1390.5 L44117.75 1607 L44117.75 1607 L44117.75 2296 L44117.75 2296 L44117.75 2985 L44117.75 2985 L35339.75 3163.3718675092614 L35339.8 3163.4 " fill="none"></path>
+						<path d="M32822.8 1031.3 L35578.25 1174 L26893 1382.899500069435 L26893.0 1382.9 " fill="none"></path>
 					</g>
-					<path d="M43966.2 1066.5 L43963.3 1070.9 L43960.3 1075.3 L43952.2 1063.5 Z"></path>
+					<path d="M32823.1 1026.0 L32822.8 1031.3 L32822.5 1036.6 L32809.5 1030.6 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M14216.4 1416.7 L14357 1607 L14357 2296 L14357 2296 L14357 2985 L14357 2985 L34539.75 3167.875605786399 L34539.8 3167.9 " fill="none"></path>
+						<path d="M23226.3 1044.0 L23708 1174 L26261 1366.6540606483095 L26261.0 1366.7 " fill="none"></path>
 					</g>
-					<path d="M14220.7 1413.6 L14216.4 1416.7 L14212.1 1419.9 L14208.5 1406.0 Z"></path>
+					<path d="M23227.7 1038.8 L23226.3 1044.0 L23224.9 1049.1 L23213.4 1040.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M29510.4 1041.8 L30372.5 1174 L30372.5 1390.5 L30372.5 1390.5 L30372.5 1607 L30372.5 1607 L30372.5 2296 L30372.5 2296 L30372.5 2985 L30372.5 2985 L34539.75 3155.166319995621 L34539.8 3155.2 " fill="none"></path>
+						<path d="M39186.0 592.9 L39656.75 876 L39656.75 1025 L39656.75 1025 L39656.75 1174 L39656.75 1174 L39656.75 1390.5 L39656.75 1390.5 L39656.75 1607 L39656.75 1607 L42299.25 2251.1473553865203 L42299.3 2251.1 " fill="none"></path>
 					</g>
-					<path d="M29511.2 1036.5 L29510.4 1041.8 L29509.6 1047.1 L29497.3 1039.8 Z"></path>
-					<path d="M44955.1 1548.6 L44820.25 1607 L44820.25 2296 L44820.25 2296 L44820.25 2985 L44820.25 2985 L40692.25 3170.132138992425 L40692.3 3170.1 " fill="none"></path>
+					<path d="M39188.7 588.3 L39186.0 592.9 L39183.2 597.4 L39174.6 586.0 Z"></path>
+					<path d="M22860.0 1447.7 L22860 1607 L21469 2112.0851119894596 L21469.0 2112.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44965.8 1549.8 L44955.1 1548.6 L44961.6 1540.0 L44972.3 1541.2 Z"></path>
+						<path d="M22865.3 1438.3 L22860.0 1447.7 L22854.7 1438.3 L22860.0 1429.0 Z"></path>
 					</g>
-					<path d="M44955.4 1562.2 L44860.25 1607 L44860.25 2296 L44860.25 2296 L44860.25 2985 L44860.25 2985 L33389 3170.2805443090047 L33389.0 3170.3 " fill="none"></path>
+					<path d="M17393.5 1455.7 L17393.5 1607 L20456 2198.21952927991 L20456.0 2198.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44966.1 1563.1 L44955.4 1562.2 L44961.5 1553.4 L44972.3 1554.3 Z"></path>
+						<path d="M17398.8 1446.3 L17393.5 1455.7 L17388.2 1446.3 L17393.5 1437.0 Z"></path>
 					</g>
-					<path d="M44955.7 1578.4 L44900.25 1607 L44900.25 2296 L44900.25 2296 L44900.25 2985 L44900.25 2985 L31289.5 3170.532177901219 L31289.5 3170.5 " fill="none"></path>
+					<path d="M17033.6 1045.0 L17393.5 1174 L17393.5 1344 L17393.5 1344.0 " fill="none"></path>
+					<path d="M17035.4 1040.0 L17033.6 1045.0 L17031.8 1050.0 L17021.0 1040.5 Z"></path>
+					<path d="M18313.5 1478.2 L18313.5 1607 L20456 2164.2602869007173 L20456.0 2164.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44966.4 1578.9 L44955.7 1578.4 L44961.5 1569.4 L44972.3 1569.9 Z"></path>
+						<path d="M18318.8 1468.8 L18313.5 1478.2 L18308.2 1468.8 L18313.5 1459.5 Z"></path>
 					</g>
-					<path d="M44985.5 1581.2 L44940.25 1607 L44940.25 2296 L44940.25 2296 L44940.25 2985 L44940.25 2985 L34499.75 3170.681900538788 L34499.8 3170.7 " fill="none"></path>
+					<path d="M17067.0 1035.0 L18313.5 1174 L18313.5 1321.5 L18313.5 1321.5 " fill="none"></path>
+					<path d="M17067.6 1029.7 L17067.0 1035.0 L17066.4 1040.3 L17053.8 1033.5 Z"></path>
+					<path d="M18705.5 1455.7 L18705.5 1607 L20456 2141.3794860434205 L20456.0 2141.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44996.2 1581.3 L44985.5 1581.2 L44990.9 1572.0 L45001.7 1572.0 Z"></path>
+						<path d="M18710.8 1446.3 L18705.5 1455.7 L18700.2 1446.3 L18705.5 1437.0 Z"></path>
 					</g>
-					<path d="M45327.6 1590.7 L45328.25 1607 L45328.25 2054.5 L45328.3 2054.5 " fill="none"></path>
+					<path d="M17067.0 1032.7 L18705.5 1174 L18705.5 1344 L18705.5 1344.0 " fill="none"></path>
+					<path d="M17067.5 1027.4 L17067.0 1032.7 L17066.6 1038.0 L17053.8 1031.6 Z"></path>
+					<path d="M19512.5 1455.7 L19512.5 1607 L20456 2055.325172413793 L20456.0 2055.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45332.6 1581.1 L45327.6 1590.7 L45322.0 1581.5 L45327.0 1572.0 Z"></path>
+						<path d="M19517.8 1446.3 L19512.5 1455.7 L19507.2 1446.3 L19512.5 1437.0 Z"></path>
 					</g>
-					<path d="M45449.5 1587.6 L45462.25 1607 L41631.25 2223.431340495096 L41631.3 2223.4 " fill="none"></path>
+					<path d="M17067.1 1030.2 L19512.5 1174 L19512.5 1344 L19512.5 1344.0 " fill="none"></path>
+					<path d="M17067.4 1024.9 L17067.1 1030.2 L17066.7 1035.6 L17053.8 1029.5 Z"></path>
+					<path d="M19904.5 1455.7 L19904.5 1607 L20456 1966.1526465028355 L20456.0 1966.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45448.9 1576.9 L45449.5 1587.6 L45440.0 1582.7 L45439.3 1572.0 Z"></path>
+						<path d="M19909.8 1446.3 L19904.5 1455.7 L19899.2 1446.3 L19904.5 1437.0 Z"></path>
 					</g>
-					<path d="M45484.8 1586.3 L45502.25 1607 L40689.25 2225.8014554954284 L40689.3 2225.8 " fill="none"></path>
+					<path d="M17067.1 1029.5 L19904.5 1174 L19904.5 1344 L19904.5 1344.0 " fill="none"></path>
+					<path d="M17067.3 1024.2 L17067.1 1029.5 L17066.8 1034.9 L17053.8 1028.9 Z"></path>
+					<path d="M24613.9 3093.0 L24626.5 3088 L24634 3088 L24634 3088 L24641.5 3171.5 L24641.5 3171.5 L24634 3255 L24634 3255 L24626.5 3255 L24626.5 3255 L24596.5 3243.1560283687945 L24596.5 3243.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45482.9 1575.7 L45484.8 1586.3 L45474.8 1582.6 L45472.8 1572.0 Z"></path>
+						<path d="M24603.2 3091.5 L24613.9 3093.0 L24607.1 3101.4 L24596.5 3099.8 Z"></path>
 					</g>
-					<path d="M45519.7 1585.0 L45542.25 1607 L43917.75 2151.7945972256025 L43917.8 2151.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45516.8 1574.7 L45519.7 1585.0 L45509.3 1582.3 L45506.4 1572.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M2120.8 2320.7 L2822.75 2985 L24233.5 3169.9323194664753 L24233.5 3169.9 " fill="none"></path>
 					</g>
-					<path d="M45554.3 1583.9 L45582.25 1607 L38468.25 2257.6333045729075 L38468.3 2257.6 " fill="none"></path>
+					<path d="M2124.5 2316.8 L2120.8 2320.7 L2117.1 2324.5 L2111.1 2311.5 Z"></path>
+					<path d="M23452.0 1440.2 L23452 1607 L21469 2155.8198433420366 L21469.0 2155.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45550.5 1573.8 L45554.3 1583.9 L45543.7 1582.1 L45539.9 1572.0 Z"></path>
+						<path d="M23457.3 1430.8 L23452.0 1440.2 L23446.7 1430.8 L23452.0 1421.5 Z"></path>
 					</g>
-					<path d="M45668.6 1581.0 L45716.25 1607 L45716.25 2296 L45716.25 2296 L45716.25 2985 L45716.25 2985 L39449.75 3169.950506409242 L39449.8 3170.0 " fill="none"></path>
+					<path d="M40044.0 1158.9 L39988.75 1174 L39988.75 1390.5 L39988.75 1390.5 L39988.75 1607 L39988.75 1607 L39988.75 2296 L39988.75 2296 L39988.75 2985 L39988.75 2985 L24596.5 3169.3264868769566 L24596.5 3169.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45663.0 1571.8 L45668.6 1581.0 L45657.9 1581.2 L45652.2 1572.0 Z"></path>
+						<path d="M40054.4 1161.6 L40044.0 1158.9 L40051.6 1151.3 L40062.0 1154.0 Z"></path>
 					</g>
-					<path d="M44207.7 608.3 L45956.25 876 L45956.25 1025 L45956.25 1025 L45956.25 1174 L45956.25 1174 L45668.25 1272.0377358490566 L45668.3 1272.0 " fill="none"></path>
-					<path d="M44208.5 603.0 L44207.7 608.3 L44206.9 613.5 L44194.5 606.3 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M43974.1 1070.1 L44157.75 1174 L44972.25 1325.689677419355 L44972.3 1325.7 " fill="none"></path>
+						<path d="M39191.7 561.6 L40534.75 876 L40534.75 896 L40534.8 896.0 " fill="none"></path>
 					</g>
-					<path d="M43976.8 1065.4 L43974.1 1070.1 L43971.5 1074.7 L43962.5 1063.5 Z"></path>
-					<path d="M39550.9 1538.1 L39557.25 1607 L39557.25 2296 L39557.25 2296 L39557.25 2985 L39557.25 2985 L39557.25 3171.5 L39557.25 3171.5 L39557.25 3358 L39557.25 3358 L39557.25 3514.5 L39557.25 3514.5 L39557.25 3671 L39557.25 3671 L38651.25 3704.6785340314136 L38651.3 3704.7 " fill="none"></path>
+					<path d="M39192.9 556.4 L39191.7 561.6 L39190.5 566.8 L39178.8 558.6 Z"></path>
+					<path d="M40233.4 1159.4 L40200.75 1174 L40200.75 1306.5 L40200.8 1306.5 " fill="none"></path>
+					<path d="M40235.6 1164.3 L40233.4 1159.4 L40231.2 1154.6 L40245.6 1154.0 Z"></path>
+					<path d="M40604.7 1165.9 L40608.75 1174 L40608.75 1321.5 L40608.8 1321.5 " fill="none"></path>
+					<path d="M40609.5 1163.6 L40604.7 1165.9 L40600.0 1168.3 L40598.8 1154.0 Z"></path>
+					<path d="M41020.3 1157.5 L41080.75 1174 L41080.75 1321.5 L41080.8 1321.5 " fill="none"></path>
+					<path d="M41021.7 1152.4 L41020.3 1157.5 L41018.9 1162.7 L41007.5 1154.0 Z"></path>
+					<path d="M41132.0 1109.1 L41592.75 1174 L41592.75 1314 L41592.8 1314.0 " fill="none"></path>
+					<path d="M41132.7 1103.8 L41132.0 1109.1 L41131.2 1114.4 L41118.8 1107.2 Z"></path>
+					<path d="M42040.8 1553.2 L42040.75 1607 L36021.75 2292.696263227513 L36021.8 2292.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39555.3 1528.3 L39550.9 1538.1 L39544.7 1529.3 L39549.2 1519.5 Z"></path>
+						<path d="M42046.1 1543.8 L42040.8 1553.2 L42035.4 1543.8 L42040.8 1534.5 Z"></path>
 					</g>
-					<path d="M39871.8 1424.4 L41671.25 1607 L41671.25 2296 L41671.25 2296 L41671.25 2985 L41671.25 2985 L41671.25 3171.5 L41671.25 3171.5 L41671.25 3358 L41671.25 3358 L39990.75 3502.4251784733665 L39990.8 3502.4 " fill="none"></path>
+					<path d="M41132.0 1084.1 L42040.75 1174 L42040.75 1246.5 L42040.8 1246.5 " fill="none"></path>
+					<path d="M41132.5 1078.8 L41132.0 1084.1 L41131.5 1089.4 L41118.8 1082.8 Z"></path>
+					<path d="M42424.8 1493.2 L42424.75 1607 L42796.69013062409 2280.5 L42796.7 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39863.1 1418.2 L39871.8 1424.4 L39862.0 1428.8 L39853.3 1422.6 Z"></path>
+						<path d="M42430.1 1483.8 L42424.8 1493.2 L42419.4 1483.8 L42424.8 1474.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M43984.8 1069.4 L44197.75 1174 L39853.25 1375.8204591781998 L39853.3 1375.8 " fill="none"></path>
+					<path d="M41132.0 1072.1 L42424.75 1174 L42424.75 1306.5 L42424.8 1306.5 " fill="none"></path>
+					<path d="M41132.5 1066.8 L41132.0 1072.1 L41131.6 1077.4 L41118.8 1071.0 Z"></path>
+					<path d="M20525.7 2980.7 L20523 2985 L24233.5 3162.8027363823226 L24233.5 3162.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M20535.2 2975.7 L20525.7 2980.7 L20526.2 2970.0 L20535.8 2965.0 Z"></path>
 					</g>
-					<path d="M43987.2 1064.6 L43984.8 1069.4 L43982.5 1074.2 L43972.9 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29510.5 1038.8 L30588.5 1174 L39221.25 1382.854909903618 L39221.3 1382.9 " fill="none"></path>
+					<path d="M20565.2 2981.1 L20563 2985 L22836 3166.97660442155 L22836.0 3167.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M20574.5 2975.7 L20565.2 2981.1 L20565.3 2970.4 L20574.6 2965.0 Z"></path>
 					</g>
-					<path d="M29511.1 1033.5 L29510.5 1038.8 L29509.8 1044.1 L29497.3 1037.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M27212.4 583.8 L26595.25 876 L26595.25 1025 L26595.25 1025 L26595.25 1174 L26595.25 1174 L26595.25 1390.5 L26595.25 1390.5 L26595.25 1607 L26595.25 1607 L25452.659288824383 2227 L25452.7 2227.0 " fill="none"></path>
+					<path d="M21285.0 2981.9 L21286.5 2985 L21286.5 3171.5 L21286.5 3171.5 L21286.5 3358 L21286.5 3358 L21286.5 3514.5 L21286.5 3514.5 L21286.5 3671 L21286.5 3671 L24695 3705.9968908170645 L24695.0 3706.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M21285.9 2971.2 L21285.0 2981.9 L21276.2 2975.7 L21277.1 2965.0 Z"></path>
 					</g>
-					<path d="M27214.7 588.6 L27212.4 583.8 L27210.2 579.0 L27224.5 578.1 Z"></path>
-					<path d="M31588.7 1089.7 L30804.5 1174 L30804.5 1390.5 L30804.5 1390.5 L30804.5 1607 L30804.5 1607 L30804.5 2296 L30804.5 2296 L30804.5 2985 L30804.5 2985 L14692.5 3169.422499769847 L14692.5 3169.4 " fill="none"></path>
+					<path d="M21387.2 2980.9 L21389.75 2985 L15489 3169.3443820930524 L15489.0 3169.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31598.5 1094.0 L31588.7 1089.7 L31597.4 1083.4 L31607.3 1087.7 Z"></path>
+						<path d="M21386.8 2970.1 L21387.2 2980.9 L21377.7 2975.7 L21377.3 2965.0 Z"></path>
 					</g>
+					<path d="M21426.7 2980.4 L21429.75 2985 L27269 3169.8381423176475 L27269.0 3169.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M21425.8 2969.7 L21426.7 2980.4 L21417.0 2975.7 L21416.2 2965.0 Z"></path>
+					</g>
+					<path d="M26060.9 1431.3 L26224 1607 L21469 2229.6731920554976 L21469.0 2229.7 " fill="none"></path>
+					<path d="M26064.8 1427.6 L26060.9 1431.3 L26056.9 1434.9 L26051.8 1421.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M27400.8 546.0 L32191.25 876 L32191.25 896 L32191.3 896.0 " fill="none"></path>
+						<path d="M12985.0 1412.7 L13316.5 1607 L20456 2250.358030342663 L20456.0 2250.4 " fill="none"></path>
 					</g>
-					<path d="M27401.2 540.7 L27400.8 546.0 L27400.4 551.4 L27387.5 545.1 Z"></path>
-					<path d="M32487.1 1159.5 L32519 1174 L32519 1306.5 L32519.0 1306.5 " fill="none"></path>
-					<path d="M32489.4 1154.7 L32487.1 1159.5 L32484.9 1164.4 L32475.0 1154.0 Z"></path>
-					<path d="M32788.3 1145.9 L32927 1174 L32927 1321.5 L32927.0 1321.5 " fill="none"></path>
-					<path d="M32789.4 1140.7 L32788.3 1145.9 L32787.3 1151.1 L32775.3 1143.3 Z"></path>
-					<path d="M32788.5 1098.7 L33399 1174 L33399 1321.5 L33399.0 1321.5 " fill="none"></path>
-					<path d="M32789.1 1093.4 L32788.5 1098.7 L32787.8 1104.0 L32775.3 1097.0 Z"></path>
-					<path d="M32788.5 1076.7 L33911 1174 L33911 1314 L33911.0 1314.0 " fill="none"></path>
-					<path d="M32789.0 1071.4 L32788.5 1076.7 L32788.1 1082.1 L32775.3 1075.6 Z"></path>
-					<path d="M34359.0 1553.2 L34359 1607 L20836.75 2294.525523475694 L20836.8 2294.5 " fill="none"></path>
+					<path d="M12987.7 1408.1 L12985.0 1412.7 L12982.3 1417.3 L12973.5 1406.0 Z"></path>
+					<path d="M36258.0 1582.9 L36224.25 1607 L36224.25 2296 L36224.25 2296 L36224.25 2985 L36224.25 2985 L27229 3170.869775364928 L27229.0 3170.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34364.3 1543.8 L34359.0 1553.2 L34353.7 1543.8 L34359.0 1534.5 Z"></path>
+						<path d="M36268.7 1581.8 L36258.0 1582.9 L36262.5 1573.1 L36273.2 1572.0 Z"></path>
 					</g>
-					<path d="M32788.6 1066.1 L34359 1174 L34359 1246.5 L34359.0 1246.5 " fill="none"></path>
-					<path d="M32788.9 1060.7 L32788.6 1066.1 L32788.2 1071.4 L32775.3 1065.1 Z"></path>
-					<path d="M34743.0 1493.2 L34743 1607 L34743 2280.5 L34743.0 2280.5 " fill="none"></path>
+					<path d="M36292.4 1583.9 L36264.25 1607 L36264.25 2296 L36264.25 2296 L36264.25 2985 L36264.25 2985 L24837.5 3170.2758264687345 L24837.5 3170.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34748.3 1483.8 L34743.0 1493.2 L34737.7 1483.8 L34743.0 1474.5 Z"></path>
+						<path d="M36303.0 1582.0 L36292.4 1583.9 L36296.2 1573.8 L36306.8 1572.0 Z"></path>
 					</g>
-					<path d="M32788.6 1059.9 L34743 1174 L34743 1306.5 L34743.0 1306.5 " fill="none"></path>
-					<path d="M32788.9 1054.6 L32788.6 1059.9 L32788.2 1065.2 L32775.3 1059.1 Z"></path>
-					<path d="M15378.0 1455.7 L15378 1607 L25549.5 2263.3179902603483 L25549.5 2263.3 " fill="none"></path>
+					<path d="M36326.9 1585.0 L36304.25 1607 L36304.25 2296 L36304.25 2296 L36304.25 2985 L36304.25 2985 L11526.25 3170.9671214133364 L11526.3 3171.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15383.3 1446.3 L15378.0 1455.7 L15372.7 1446.3 L15378.0 1437.0 Z"></path>
+						<path d="M36337.3 1582.3 L36326.9 1585.0 L36329.9 1574.7 L36340.3 1572.0 Z"></path>
 					</g>
-					<path d="M17400.9 1031.3 L15378 1174 L15378 1344 L15378.0 1344.0 " fill="none"></path>
-					<path d="M17401.3 1036.6 L17400.9 1031.3 L17400.6 1026.0 L17414.3 1030.4 Z"></path>
-					<path d="M15770.0 1478.2 L15770 1607 L25549.5 2262.0724771534124 L25549.5 2262.1 " fill="none"></path>
+					<path d="M36361.8 1586.3 L36344.25 1607 L36344.25 2296 L36344.25 2296 L36344.25 2985 L36344.25 2985 L24969.5 3170.7488234135235 L24969.5 3170.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15775.3 1468.8 L15770.0 1478.2 L15764.7 1468.8 L15770.0 1459.5 Z"></path>
+						<path d="M36371.9 1582.6 L36361.8 1586.3 L36363.7 1575.7 L36373.8 1572.0 Z"></path>
 					</g>
-					<path d="M17401.0 1032.7 L15770 1174 L15770 1321.5 L15770.0 1321.5 " fill="none"></path>
-					<path d="M17401.4 1038.0 L17401.0 1032.7 L17400.5 1027.4 L17414.3 1031.6 Z"></path>
-					<path d="M14709.9 3093.0 L14722.5 3088 L14730 3088 L14730 3088 L14737.5 3171.5 L14737.5 3171.5 L14730 3255 L14730 3255 L14722.5 3255 L14722.5 3255 L14692.5 3243.1560283687945 L14692.5 3243.2 " fill="none"></path>
+					<path d="M36711.9 1585.6 L36732.25 1607 L36732.25 2054.5 L36732.3 2054.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14699.2 3091.5 L14709.9 3093.0 L14703.1 3101.4 L14692.5 3099.8 Z"></path>
+						<path d="M36709.4 1575.1 L36711.9 1585.6 L36701.7 1582.4 L36699.1 1572.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3046.3 2318.7 L4083.25 2985 L14329.5 3168.253877873942 L14329.5 3168.3 " fill="none"></path>
+					<path d="M36851.8 1581.5 L36895.25 1607 L27875 2263.191342219876 L27875.0 2263.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M36846.5 1572.1 L36851.8 1581.5 L36841.1 1581.3 L36835.8 1572.0 Z"></path>
 					</g>
-					<path d="M3049.2 2314.2 L3046.3 2318.7 L3043.5 2323.2 L3035.1 2311.5 Z"></path>
-					<path d="M17756.8 1455.7 L17756.75 1607 L25549.5 2253.9505979455976 L25549.5 2254.0 " fill="none"></path>
+					<path d="M36885.8 1580.7 L36935.25 1607 L31283.25 2235.3039690222654 L31283.3 2235.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17762.1 1446.3 L17756.8 1455.7 L17751.4 1446.3 L17756.8 1437.0 Z"></path>
+						<path d="M36880.0 1571.7 L36885.8 1580.7 L36875.0 1581.1 L36869.3 1572.0 Z"></path>
 					</g>
-					<path d="M17529.6 1047.0 L17756.75 1174 L17756.75 1344 L17756.8 1344.0 " fill="none"></path>
-					<path d="M17532.2 1042.4 L17529.6 1047.0 L17527.0 1051.7 L17518.0 1040.5 Z"></path>
-					<path d="M30116.5 1440.2 L30116.5 1607 L26562.5 2210.0552887575423 L26562.5 2210.1 " fill="none"></path>
+					<path d="M36892.1 1566.8 L36975.25 1607 L33273.25 2224.2986447241046 L33273.3 2224.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M30121.8 1430.8 L30116.5 1440.2 L30111.2 1430.8 L30116.5 1421.5 Z"></path>
+						<path d="M36886.0 1557.9 L36892.1 1566.8 L36881.3 1567.5 L36875.3 1558.7 Z"></path>
 					</g>
-					<path d="M23303.3 1455.7 L23303.25 1607 L25549.5 2169.2255017709563 L25549.5 2169.2 " fill="none"></path>
+					<path d="M36892.3 1552.5 L37015.25 1607 L29034.25 2261.5930599369085 L29034.3 2261.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23308.6 1446.3 L23303.3 1455.7 L23297.9 1446.3 L23303.3 1437.0 Z"></path>
+						<path d="M36885.9 1543.8 L36892.3 1552.5 L36881.6 1553.5 L36875.3 1544.9 Z"></path>
 					</g>
-					<path d="M17579.6 1029.4 L20491 1174 L23127.25 1376.9507067294871 L23127.3 1377.0 " fill="none"></path>
-					<path d="M17579.8 1024.1 L17579.6 1029.4 L17579.3 1034.8 L17566.3 1028.8 Z"></path>
-					<path d="M23695.3 1455.7 L23695.25 1607 L25549.5 2148.174732606163 L25549.5 2148.2 " fill="none"></path>
+					<path d="M36892.8 1524.0 L37120.25 1607 L37120.25 2296 L37120.25 2296 L37120.25 2985 L37120.25 2985 L27374 3170.5007654037504 L27374.0 3170.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23700.6 1446.3 L23695.3 1455.7 L23689.9 1446.3 L23695.3 1437.0 Z"></path>
+						<path d="M36885.8 1515.7 L36892.8 1524.0 L36882.2 1525.8 L36875.3 1517.6 Z"></path>
+					</g>
+					<path d="M34975.3 588.5 L37612.25 876 L37612.25 1025 L37612.25 1025 L37612.25 1174 L37612.25 1174 L36875.25 1321.0603686635945 L36875.3 1321.1 " fill="none"></path>
+					<path d="M34975.8 583.2 L34975.3 588.5 L34974.7 593.8 L34962.0 587.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M32822.8 1031.2 L35618.25 1174 L36179.25 1307.6155115511551 L36179.3 1307.6 " fill="none"></path>
+					</g>
+					<path d="M32823.1 1025.9 L32822.8 1031.2 L32822.5 1036.5 L32809.5 1030.5 Z"></path>
+					<path d="M33877.2 2334.1 L34920.25 2985 L34920.25 3140.5 L34920.3 3140.5 " fill="none"></path>
+					<path d="M33880.1 2329.5 L33877.2 2334.1 L33874.4 2338.6 L33865.9 2327.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M43488.0 1034.6 L44723.75 1174 L44723.75 1329 L44723.8 1329.0 " fill="none"></path>
 					</g>
-					<path d="M17579.6 1029.1 L20707 1174 L23519.25 1377.7487241696645 L23519.3 1377.7 " fill="none"></path>
-					<path d="M17579.8 1023.8 L17579.6 1029.1 L17579.3 1034.5 L17566.3 1028.5 Z"></path>
-					<path d="M25532.9 2566.8 L24725 2985 L14692.5 3168.1859457607206 L14692.5 3168.2 " fill="none"></path>
+					<path d="M43488.6 1029.3 L43488.0 1034.6 L43487.4 1039.9 L43474.8 1033.1 Z"></path>
+					<path d="M30571.2 2491.7 L30152.75 2985 L27229 3169.574553609207 L27229.0 3169.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25543.7 2567.2 L25532.9 2566.8 L25538.8 2557.7 L25549.5 2558.2 Z"></path>
+						<path d="M30581.3 2488.1 L30571.2 2491.7 L30573.2 2481.2 L30583.3 2477.5 Z"></path>
 					</g>
-					<path d="M25533.0 2575.1 L24765 2985 L32856 3170.2066891684567 L32856.0 3170.2 " fill="none"></path>
+					<path d="M30679.1 2495.4 L30536.25 2985 L24969.5 3169.971515745401 L24969.5 3170.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25543.8 2575.4 L25533.0 2575.1 L25538.8 2566.0 L25549.5 2566.3 Z"></path>
+						<path d="M30686.8 2488.0 L30679.1 2495.4 L30676.6 2485.0 L30684.3 2477.5 Z"></path>
 					</g>
-					<path d="M26579.8 2506.9 L27767.25 2985 L27767.25 3171.5 L27767.25 3171.5 L27767.25 3358 L27767.25 3358 L27767.25 3514.5 L27767.25 3514.5 L27767.25 3671 L27767.25 3671 L38553.25 3706.3394554683896 L38553.3 3706.3 " fill="none"></path>
+					<path d="M30847.4 2493.8 L31120.75 2985 L31120.75 3171.5 L31120.75 3171.5 L31120.75 3358 L31120.75 3358 L31120.75 3514.5 L31120.75 3514.5 L31120.75 3671 L31120.75 3671 L24793 3706.2272121378446 L24793.0 3706.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26573.1 2498.5 L26579.8 2506.9 L26569.2 2508.4 L26562.5 2499.9 Z"></path>
+						<path d="M30847.5 2483.1 L30847.4 2493.8 L30838.2 2488.2 L30838.3 2477.5 Z"></path>
 					</g>
-					<path d="M26579.9 2500.6 L27820.25 2985 L10492.25 3170.7603035006036 L10492.3 3170.8 " fill="none"></path>
+					<path d="M30858.6 2493.4 L31160.75 2985 L31160.75 3171.5 L31160.75 3171.5 L31160.75 3358 L31160.75 3358 L28364.5 3507.0127266536138 L28364.5 3507.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26573.1 2492.2 L26579.9 2500.6 L26569.3 2502.2 L26562.5 2493.8 Z"></path>
+						<path d="M30858.2 2482.7 L30858.6 2493.4 L30849.2 2488.2 L30848.8 2477.5 Z"></path>
 					</g>
-					<path d="M26579.9 2496.1 L27860.25 2985 L39344.75 3170.651317500217 L39344.8 3170.7 " fill="none"></path>
+					<path d="M30873.6 2492.8 L31214.5 2985 L27374 3168.9849088106857 L27374.0 3169.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26573.1 2487.8 L26579.9 2496.1 L26569.3 2497.7 L26562.5 2489.4 Z"></path>
+						<path d="M30872.7 2482.1 L30873.6 2492.8 L30863.9 2488.2 L30863.0 2477.5 Z"></path>
 					</g>
-					<path d="M42775.1 1432.7 L42887 1607 L26562.5 2275.265729903155 L26562.5 2275.3 " fill="none"></path>
-					<path d="M42779.6 1429.8 L42775.1 1432.7 L42770.6 1435.6 L42767.9 1421.5 Z"></path>
+					<path d="M34975.3 587.9 L37652.25 876 L37652.25 1025 L37652.25 1025 L37652.25 1174 L37652.25 1174 L37652.25 1390.5 L37652.25 1390.5 L37652.25 1607 L37652.25 1607 L31283.25 2241.5973969631236 L31283.3 2241.6 " fill="none"></path>
+					<path d="M34975.8 582.6 L34975.3 587.9 L34974.7 593.2 L34962.0 586.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M14220.4 1415.8 L14397 1607 L25549.5 2266.0678874689083 L25549.5 2266.1 " fill="none"></path>
+						<path d="M32822.8 1031.1 L35658.25 1174 L35658.25 1390.5 L35658.25 1390.5 L35658.25 1607 L35658.25 1607 L31283.25 2219.553342816501 L31283.3 2219.6 " fill="none"></path>
 					</g>
-					<path d="M14224.3 1412.2 L14220.4 1415.8 L14216.4 1419.4 L14211.3 1406.0 Z"></path>
-					<path d="M30588.5 1447.7 L30588.5 1607 L26562.5 2219.0052950910094 L26562.5 2219.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M30593.8 1438.3 L30588.5 1447.7 L30583.2 1438.3 L30588.5 1429.0 Z"></path>
-					</g>
-					<path d="M35461.7 1072.9 L35814 1174 L35814 1375 L35814.0 1375.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35454.2 1065.2 L35461.7 1072.9 L35451.3 1075.5 L35443.8 1067.8 Z"></path>
+					<path d="M32823.1 1025.8 L32822.8 1031.1 L32822.5 1036.5 L32809.5 1030.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M12988.1 1412.2 L13356.5 1607 L30191.25 2274.355709621276 L30191.3 2274.4 " fill="none"></path>
 					</g>
+					<path d="M12990.6 1407.5 L12988.1 1412.2 L12985.6 1416.9 L12976.3 1406.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M27400.8 543.5 L35294.75 876 L35294.75 941 L35294.8 941.0 " fill="none"></path>
+						<path d="M23230.5 1043.8 L23748 1174 L23748 1390.5 L23748 1390.5 L23748 1607 L23748 1607 L30191.25 2242.1753407017923 L30191.3 2242.2 " fill="none"></path>
 					</g>
-					<path d="M27401.0 538.2 L27400.8 543.5 L27400.6 548.8 L27387.5 542.9 Z"></path>
-					<path d="M42210.8 1097.7 L42210.75 1174 L42210.75 1239 L42210.8 1239.0 " fill="none"></path>
+					<path d="M23231.8 1038.6 L23230.5 1043.8 L23229.2 1048.9 L23217.6 1040.5 Z"></path>
+					<path d="M20292.5 1455.7 L20292.5 1607 L20292.5 2280.5 L20292.5 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42216.1 1088.3 L42210.8 1097.7 L42205.4 1088.3 L42210.8 1079.0 Z"></path>
+						<path d="M20297.8 1446.3 L20292.5 1455.7 L20287.2 1446.3 L20292.5 1437.0 Z"></path>
 					</g>
-					<path d="M39125.0 551.0 L42210.75 876 L42210.75 971 L42210.8 971.0 " fill="none"></path>
-					<path d="M39125.6 545.7 L39125.0 551.0 L39124.5 556.3 L39111.8 549.6 Z"></path>
-					<path d="M42226.5 1560.6 L42230.75 1607 L42230.75 2296 L42230.75 2296 L42230.75 2985 L42230.75 2985 L32969 3170.369181445014 L32969.0 3170.4 " fill="none"></path>
+					<path d="M17067.1 1029.0 L20292.5 1174 L20292.5 1344 L20292.5 1344.0 " fill="none"></path>
+					<path d="M17067.3 1023.7 L17067.1 1029.0 L17066.8 1034.3 L17053.8 1028.4 Z"></path>
+					<path d="M26221.0 2525.6 L26105 2985 L27168 3166.2981252857794 L27168.0 3166.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42230.9 1550.8 L42226.5 1560.6 L42220.3 1551.8 L42224.7 1542.0 Z"></path>
+						<path d="M26228.5 2517.9 L26221.0 2525.6 L26218.1 2515.2 L26225.6 2507.5 Z"></path>
 					</g>
-					<path d="M42257.7 1560.0 L42270.75 1607 L42270.75 2296 L42270.75 2296 L42270.75 2985 L42270.75 2985 L13953.5 3170.94185759931 L13953.5 3170.9 " fill="none"></path>
+					<path d="M26330.3 2525.7 L26433 2985 L22949 3168.523796074001 L22949.0 3168.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42260.4 1549.6 L42257.7 1560.0 L42250.1 1552.4 L42252.7 1542.0 Z"></path>
+						<path d="M26333.5 2515.4 L26330.3 2525.7 L26323.1 2517.8 L26326.3 2507.5 Z"></path>
 					</g>
-					<path d="M19907.2 1404.4 L21294.75 1607 L22393.008345428156 2265 L22393.0 2265.0 " fill="none"></path>
-					<path d="M19908.0 1399.1 L19907.2 1404.4 L19906.4 1409.7 L19894.0 1402.5 Z"></path>
-					<path d="M31034.8 1470.2 L31034.75 1607 L17141.25 2292.447817836812 L17141.3 2292.4 " fill="none"></path>
+					<path d="M26343.6 2525.5 L26473 2985 L27269 3159.9605185621685 L27269.0 3160.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31040.1 1460.8 L31034.8 1470.2 L31029.4 1460.8 L31034.8 1451.5 Z"></path>
+						<path d="M26346.2 2515.0 L26343.6 2525.5 L26335.9 2517.9 L26338.6 2507.5 Z"></path>
 					</g>
-					<path d="M31669.5 2345.7 L31669.5 2985 L13743.5 3169.972833905057 L13743.5 3170.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31674.8 2336.3 L31669.5 2345.7 L31664.2 2336.3 L31669.5 2327.0 Z"></path>
+					<path d="M26069.8 1430.1 L26279 1607 L26279 2084.5 L26279.0 2084.5 " fill="none"></path>
+					<path d="M26073.3 1426.0 L26069.8 1430.1 L26066.4 1434.2 L26059.7 1421.5 Z"></path>
+					<path d="M26691.5 1529.8 L26755 1607 L26425.11611030479 2084.5 L26425.1 2084.5 " fill="none"></path>
+					<path d="M26695.6 1526.4 L26691.5 1529.8 L26687.4 1533.2 L26683.1 1519.5 Z"></path>
+					<path d="M24942.0 1470.8 L25383.25 1607 L26004.034651669084 2084.5 L26004.0 2084.5 " fill="none"></path>
+					<path d="M24943.6 1465.7 L24942.0 1470.8 L24940.4 1475.9 L24929.3 1466.9 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M32822.8 1031.1 L35698.25 1174 L35698.25 1390.5 L35698.25 1390.5 L35698.25 1607 L35698.25 1607 L26627 2270.544470101123 L26627.0 2270.5 " fill="none"></path>
 					</g>
-					<path d="M31364.8 1463.2 L31364.75 1607 L14287.25 2294.5707064804533 L14287.3 2294.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31370.1 1453.8 L31364.8 1463.2 L31359.4 1453.8 L31364.8 1444.5 Z"></path>
+					<path d="M32823.1 1025.7 L32822.8 1031.1 L32822.6 1036.4 L32809.5 1030.4 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M12991.2 1411.8 L13396.5 1607 L25931 2277.387774112168 L25931.0 2277.4 " fill="none"></path>
 					</g>
-					<path d="M17389.8 2419.5 L15904.25 2985 L33238 3170.691191464308 L33238.0 3170.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17400.4 2421.2 L17389.8 2419.5 L17396.6 2411.2 L17407.3 2412.9 Z"></path>
+					<path d="M12993.5 1407.0 L12991.2 1411.8 L12988.9 1416.6 L12979.2 1406.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M23234.7 1043.6 L23788 1174 L23788 1390.5 L23788 1390.5 L23788 1607 L23788 1607 L25931 2199.744680851064 L25931.0 2199.7 " fill="none"></path>
 					</g>
-					<path d="M17390.9 2472.9 L16454.75 2985 L31147.5 3170.603107272881 L31147.5 3170.6 " fill="none"></path>
+					<path d="M23235.9 1038.4 L23234.7 1043.6 L23233.5 1048.8 L23221.7 1040.5 Z"></path>
+					<path d="M39412.3 1508.2 L39412.25 1607 L42299.25 2254.718332790622 L42299.3 2254.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17401.6 2473.1 L17390.9 2472.9 L17396.5 2463.7 L17407.3 2463.9 Z"></path>
+						<path d="M39417.6 1498.8 L39412.3 1508.2 L39406.9 1498.8 L39412.3 1489.5 Z"></path>
 					</g>
-					<path d="M17391.0 2478.6 L16494.75 2985 L12975.5 3167.7863607881363 L12975.5 3167.8 " fill="none"></path>
+					<path d="M39116.9 1077.7 L39412.25 1174 L39412.25 1291.5 L39412.3 1291.5 " fill="none"></path>
+					<path d="M39118.6 1072.6 L39116.9 1077.7 L39115.3 1082.8 L39104.3 1073.6 Z"></path>
+					<path d="M28272.5 1440.2 L28272.5 1607 L26627 2175.7231000752445 L26627.0 2175.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17401.7 2478.7 L17391.0 2478.6 L17396.5 2469.4 L17407.3 2469.5 Z"></path>
+						<path d="M28277.8 1430.8 L28272.5 1440.2 L28267.2 1430.8 L28272.5 1421.5 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M39192.0 546.9 L43403.25 876 L43403.25 994 L43403.3 994.0 " fill="none"></path>
+					</g>
+					<path d="M39192.5 541.6 L39192.0 546.9 L39191.6 552.2 L39178.8 545.9 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M28636.0 1439.2 L28494.75 1607 L29148.94883889695 2250 L29148.9 2250.0 " fill="none"></path>
+					</g>
+					<path d="M28640.1 1442.6 L28636.0 1439.2 L28631.9 1435.8 L28644.6 1429.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M29347.3 1472.3 L29347.25 1607 L29205.86465892598 2250 L29205.9 2250.0 " fill="none"></path>
 					</g>
-					<path d="M18021.9 2495.1 L18778.5 2985 L34407.75 3170.9527041036026 L34407.8 3171.0 " fill="none"></path>
+					<path d="M29352.6 1472.3 L29347.3 1472.3 L29341.9 1472.3 L29347.3 1459.0 Z"></path>
+					<path d="M35792.9 1163.8 L35789.75 1174 L35789.75 1375 L35789.8 1375.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18016.9 2485.6 L18021.9 2495.1 L18011.1 2494.5 L18006.2 2485.0 Z"></path>
+						<path d="M35800.7 1156.5 L35792.9 1163.8 L35790.5 1153.4 L35798.3 1146.0 Z"></path>
 					</g>
-					<path d="M18033.0 2494.9 L18818.5 2985 L13953.5 3168.2974747474746 L13953.5 3168.3 " fill="none"></path>
+					<path d="M35835.5 1164.7 L35835.5 1174 L33423.5 1383.3817161186848 L33423.5 1383.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18027.9 2485.4 L18033.0 2494.9 L18022.3 2494.5 L18017.2 2485.0 Z"></path>
+						<path d="M35840.8 1155.3 L35835.5 1164.7 L35830.2 1155.3 L35835.5 1146.0 Z"></path>
 					</g>
-					<path d="M18037.2 2490.5 L18858.5 2985 L13164.5 3169.09135823871 L13164.5 3169.1 " fill="none"></path>
+					<path d="M35878.1 1163.8 L35881.25 1174 L35881.25 1390.5 L35881.25 1390.5 L35881.25 1607 L35881.25 1607 L16912 2294.7129796498243 L16912.0 2294.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18032.0 2481.1 L18037.2 2490.5 L18026.5 2490.2 L18021.3 2480.9 Z"></path>
+						<path d="M35880.5 1153.4 L35878.1 1163.8 L35870.3 1156.5 L35872.7 1146.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M7035.5 1417.1 L7162.25 1607 L17407.25 2275.954226686884 L17407.3 2276.0 " fill="none"></path>
+					<path d="M36008.5 1157.3 L36030.25 1174 L36030.25 1375 L36030.3 1375.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M36004.3 1147.4 L36008.5 1157.3 L35997.8 1155.9 L35993.7 1146.0 Z"></path>
 					</g>
-					<path d="M7039.9 1414.1 L7035.5 1417.1 L7031.1 1420.1 L7028.1 1406.0 Z"></path>
+					<path d="M17067.1 1028.6 L20643 1174 L33259.5 1389.101960861519 L33259.5 1389.1 " fill="none"></path>
+					<path d="M17067.3 1023.3 L17067.1 1028.6 L17066.9 1034.0 L17053.8 1028.1 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3047.4 2318.5 L4123.25 2985 L13447.5 3168.586014410515 L13447.5 3168.6 " fill="none"></path>
+						<path d="M36756.0 1053.8 L36756 1174 L33423.5 1385.3007028847562 L33423.5 1385.3 " fill="none"></path>
 					</g>
-					<path d="M3050.2 2314.0 L3047.4 2318.5 L3044.5 2323.1 L3036.0 2311.5 Z"></path>
-					<path d="M31936.0 1548.9 L31888 1607 L31888 2280.5 L31888.0 2280.5 " fill="none"></path>
+					<path d="M36761.3 1053.8 L36756.0 1053.8 L36750.7 1053.8 L36756.0 1040.5 Z"></path>
+					<path d="M7616.0 2428.5 L7551 2985 L5251.25 3164.928002097535 L5251.3 3164.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31946.1 1545.1 L31936.0 1548.9 L31937.9 1538.3 L31947.9 1534.5 Z"></path>
+						<path d="M7622.4 2419.9 L7616.0 2428.5 L7611.8 2418.7 L7618.2 2410.0 Z"></path>
 					</g>
-					<path d="M32211.8 1548.3 L32265.75 1607 L32265.75 2280.5 L32265.8 2280.5 " fill="none"></path>
+					<path d="M7672.4 2427.8 L7845.25 2985 L11174.25 3166.85661980082 L11174.3 3166.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32209.4 1537.8 L32211.8 1548.3 L32201.6 1545.0 L32199.2 1534.5 Z"></path>
+						<path d="M7674.7 2417.3 L7672.4 2427.8 L7664.5 2420.5 L7666.9 2410.0 Z"></path>
 					</g>
-					<path d="M32325.3 1441.1 L33173 1607 L14287.25 2294.7072999933935 L14287.3 2294.7 " fill="none"></path>
+					<path d="M7631.6 1495.3 L7631.5 1607 L7631.5 2182 L7631.5 2182.0 " fill="none"></path>
+					<path d="M7637.0 1495.3 L7631.6 1495.3 L7626.3 1495.3 L7631.6 1482.0 Z"></path>
+					<path d="M29704.9 1514.5 L29670 1607 L35963.75 2292.839824443478 L35963.8 2292.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32317.2 1434.0 L32325.3 1441.1 L32315.1 1444.5 L32307.0 1437.5 Z"></path>
+						<path d="M29713.2 1507.6 L29704.9 1514.5 L29703.2 1503.8 L29711.5 1497.0 Z"></path>
 					</g>
-					<path d="M32325.3 1439.3 L33213 1607 L18021.25 2282.3522542140495 L18021.3 2282.4 " fill="none"></path>
+					<path d="M29831.8 1512.6 L29893.75 1607 L16912 2294.1209932973557 L16912.0 2294.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32317.2 1432.3 L32325.3 1439.3 L32315.2 1442.8 L32307.0 1435.8 Z"></path>
+						<path d="M29831.2 1501.9 L29831.8 1512.6 L29822.3 1507.7 L29821.6 1497.0 Z"></path>
 					</g>
-					<path d="M2349.7 3072.2 L2363 3065.5 L2370.5 3065.5 L2370.5 3065.5 L2378 3171.5 L2378 3171.5 L2370.5 3277.5 L2370.5 3277.5 L2363 3277.5 L2363 3277.5 L2333 3262.393111638955 L2333.0 3262.4 " fill="none"></path>
+					<path d="M33436.3 1419.0 L34062.25 1607 L34062.25 2219.5 L34062.3 2219.5 " fill="none"></path>
+					<path d="M33437.8 1413.9 L33436.3 1419.0 L33434.7 1424.1 L33423.5 1415.1 Z"></path>
+					<path d="M28705.4 1445.6 L28788.5 1607 L34824.25 2289.55414221821 L34824.3 2289.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2338.9 3071.6 L2349.7 3072.2 L2343.7 3081.2 L2333.0 3080.6 Z"></path>
+						<path d="M28705.8 1434.9 L28705.4 1445.6 L28696.4 1439.7 L28696.8 1429.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3052.0 2317.7 L4310.25 2985 L2333 3155.8989109025606 L2333.0 3155.9 " fill="none"></path>
+					<path d="M28714.6 1444.3 L28828.5 1607 L30067.241473149494 2280.5 L30067.2 2280.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M28713.7 1433.6 L28714.6 1444.3 L28704.9 1439.7 L28703.9 1429.0 Z"></path>
 					</g>
-					<path d="M3054.5 2313.0 L3052.0 2317.7 L3049.5 2322.5 L3040.2 2311.5 Z"></path>
-					<path d="M33387.5 2412.0 L33176.25 2985 L40631.25 3170.7400975218757 L40631.3 3170.7 " fill="none"></path>
+					<path d="M30194.7 1485.4 L30172.25 1607 L34824.25 2287.6600127415586 L34824.3 2287.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33395.7 2405.1 L33387.5 2412.0 L33385.7 2401.4 L33393.9 2394.5 Z"></path>
+						<path d="M30201.7 1477.1 L30194.7 1485.4 L30191.2 1475.2 L30198.1 1467.0 Z"></path>
 					</g>
-					<path d="M33473.0 2412.0 L33684.25 2985 L32395.5 3156.0385162782422 L32395.5 3156.0 " fill="none"></path>
+					<path d="M30212.3 1485.7 L30212.25 1607 L30098.370827285922 2280.5 L30098.4 2280.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33474.8 2401.4 L33473.0 2412.0 L33464.8 2405.1 L33466.6 2394.5 Z"></path>
+						<path d="M30217.6 1476.3 L30212.3 1485.7 L30206.9 1476.3 L30212.3 1467.0 Z"></path>
 					</g>
-					<path d="M33479.6 2411.7 L33724.25 2985 L33155.09048257372 3156 L33155.1 3156.0 " fill="none"></path>
+					<path d="M30350.5 1436.4 L30864 1607 L28122 2282.9348837209304 L28122.0 2282.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33480.8 2401.0 L33479.6 2411.7 L33471.0 2405.2 L33472.3 2394.5 Z"></path>
+						<path d="M30343.3 1428.4 L30350.5 1436.4 L30339.9 1438.5 L30332.8 1430.5 Z"></path>
 					</g>
-					<path d="M17579.6 1028.9 L20883.5 1174 L23911.25 1383.7793023441875 L23911.3 1383.8 " fill="none"></path>
-					<path d="M17579.8 1023.6 L17579.6 1028.9 L17579.3 1034.3 L17566.3 1028.3 Z"></path>
-					<g data-name="IAppDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
-							<rect x="26232.5" y="60.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
-							<path d="M26232.5 91.5 L26429.5 91.5" fill="none" data-name="IAppDelegate"></path>
-						</g>
-						<g transform="translate(26232.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26232.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
-								
-							</g>
-						</g>
+					<path d="M42490.3 156.2 L42490.25 203 L42490.25 524 L42490.3 524.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M42495.6 146.8 L42490.3 156.2 L42484.9 146.8 L42490.3 137.5 Z"></path>
 					</g>
-					<g data-name="AppController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
-							<rect x="26469.5" y="22.5" height="138.0" width="301.0" data-name="AppController"></rect>
-							<path d="M26469.5 53.5 L26770.5 53.5" fill="none" data-name="AppController"></path>
-							<path d="M26469.5 114.5 L26770.5 114.5" fill="none" data-name="AppController"></path>
-						</g>
-						<g transform="translate(26469.5, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26469.5, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26469.5, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
-								
-							</g>
-						</g>
+					<path d="M8099.0 2353.2 L8099 2985 L11384.25 3167.5546741154562 L11384.3 3167.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M8104.3 2343.8 L8099.0 2353.2 L8093.7 2343.8 L8099.0 2334.5 Z"></path>
 					</g>
-					<g data-name="StudyMonitorScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="18548.8" y="2265.0" height="62.0" width="176.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M18548.8 2296.0 L18724.8 2296.0" fill="none" data-name="StudyMonitorScreen"></path>
-						</g>
-						<g transform="translate(18548.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18548.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
-								
-							</g>
-						</g>
+					<path d="M7841.3 1487.6 L8099 1607 L8099 2257.5 L8099.0 2257.5 " fill="none"></path>
+					<path d="M7843.6 1482.8 L7841.3 1487.6 L7839.1 1492.4 L7829.2 1482.0 Z"></path>
+					<path d="M31440.9 1535.6 L31399.25 1607 L31399.25 2227 L31399.3 2227.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M31450.2 1530.2 L31440.9 1535.6 L31441.0 1524.9 L31450.3 1519.5 Z"></path>
 					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="19730.0" y="1344.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
-							<path d="M19730.0 1375.0 L19894.0 1375.0" fill="none" data-name="StudyPageWidget"></path>
-							<path d="M19730.0 1406.0 L19894.0 1406.0" fill="none" data-name="StudyPageWidget"></path>
-						</g>
-						<g transform="translate(19730, 1344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19730, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19730, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
-								
-							</g>
-						</g>
+					<path d="M31525.5 1538.2 L31525.5 1607 L16912 2294.3302955833165 L16912.0 2294.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M31530.8 1528.8 L31525.5 1538.2 L31520.2 1528.8 L31525.5 1519.5 Z"></path>
 					</g>
-					<g data-name="LoginForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
-							<rect x="0.0" y="2249.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
-							<path d="M0.0 2280.5 L207.0 2280.5" fill="none" data-name="LoginForm"></path>
-							<path d="M0.0 2311.5 L207.0 2311.5" fill="none" data-name="LoginForm"></path>
-						</g>
-						<g transform="translate(0, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
-								
-							</g>
-						</g>
+					<path d="M31651.8 2413.7 L31651.75 2985 L31651.75 3156 L31651.8 3156.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M31657.1 2404.3 L31651.8 2413.7 L31646.4 2404.3 L31651.8 2395.0 Z"></path>
 					</g>
-					<g data-name="AuthFormKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
-							<rect x="1100.0" y="3088.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
-							<path d="M1100.0 3119.0 L1455.0 3119.0" fill="none" data-name="AuthFormKey"></path>
-						</g>
-						<g transform="translate(1100, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
-								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1100, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
-								
-							</g>
-						</g>
+					<path d="M31607.4 1531.0 L31651.75 1607 L31651.75 2197 L31651.8 2197.0 " fill="none"></path>
+					<path d="M31612.0 1528.3 L31607.4 1531.0 L31602.8 1533.7 L31600.7 1519.5 Z"></path>
+					<path d="M31688.2 1479.0 L31923.75 1607 L31923.75 2212.5 L31923.8 2212.5 " fill="none"></path>
+					<path d="M31690.8 1474.3 L31688.2 1479.0 L31685.7 1483.6 L31676.5 1472.6 Z"></path>
+					<path d="M20821.8 1470.7 L20821.75 1607 L11535 2290.6992921063174 L11535.0 2290.7 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M20827.1 1461.3 L20821.8 1470.7 L20816.4 1461.3 L20821.8 1452.0 Z"></path>
 					</g>
-					<g data-name="FormConsumerRefWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="690.8" y="1375.0" height="31.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
-						</g>
-						<g transform="translate(690.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
-								
-							</g>
-						</g>
+					<path d="M17067.1 1028.5 L20821.75 1174 L20821.75 1329 L20821.8 1329.0 " fill="none"></path>
+					<path d="M17067.3 1023.1 L17067.1 1028.5 L17066.9 1033.8 L17053.8 1027.9 Z"></path>
+					<path d="M34893.2 1478.1 L34881.25 1607 L34881.25 2280.5 L34881.3 2280.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M34899.3 1469.3 L34893.2 1478.1 L34888.7 1468.3 L34894.9 1459.5 Z"></path>
 					</g>
-					<g data-name="PasswordRecoveryForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
-							<rect x="572.5" y="2249.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
-							<path d="M572.5 2280.5 L780.5 2280.5" fill="none" data-name="PasswordRecoveryForm"></path>
-							<path d="M572.5 2311.5 L780.5 2311.5" fill="none" data-name="PasswordRecoveryForm"></path>
-						</g>
-						<g transform="translate(572.5, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(572.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(572.5, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
-								
-							</g>
-						</g>
+					<path d="M35001.4 1471.2 L35169.75 1607 L28122 2290.8573038059358 L28122.0 2290.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M34997.4 1461.2 L35001.4 1471.2 L34990.7 1469.5 L34986.8 1459.5 Z"></path>
 					</g>
-					<g data-name="PasswordForgotForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
-							<rect x="820.5" y="2249.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
-							<path d="M820.5 2280.5 L1027.5 2280.5" fill="none" data-name="PasswordForgotForm"></path>
-							<path d="M820.5 2311.5 L1027.5 2311.5" fill="none" data-name="PasswordForgotForm"></path>
-						</g>
-						<g transform="translate(820.5, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(820.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(820.5, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
-								
-							</g>
-						</g>
+					<path d="M7922.5 1487.6 L8280 1607 L8280 2296 L8280 2296 L8280 2985 L8280 2985 L24686.5 3170.6456892367432 L24686.5 3170.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M7915.3 1479.6 L7922.5 1487.6 L7911.9 1489.7 L7904.8 1481.7 Z"></path>
 					</g>
-					<g data-name="SignupForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
-							<rect x="1067.5" y="2234.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
-							<path d="M1067.5 2265.5 L1345.5 2265.5" fill="none" data-name="SignupForm"></path>
-							<path d="M1067.5 2296.5 L1345.5 2296.5" fill="none" data-name="SignupForm"></path>
-						</g>
-						<g transform="translate(1067.5, 2234.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
-								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1067.5, 2265.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1067.5, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
-								
-							</g>
-						</g>
+					<path d="M7922.6 1482.0 L8320 1607 L8320 2296 L8320 2296 L8320 2985 L8320 2985 L24877.5 3170.9833017134943 L24877.5 3171.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M7915.3 1474.1 L7922.6 1482.0 L7912.1 1484.3 L7904.8 1476.4 Z"></path>
 					</g>
-					<g data-name="AuthScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
-							<rect x="1256.0" y="1329.5" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
-							<path d="M1256.0 1360.5 L1515.0 1360.5" fill="none" data-name="AuthScaffold"></path>
-						</g>
-						<g transform="translate(1256, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1256, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
-								
-							</g>
-						</g>
+					<path d="M7922.6 1477.0 L8360 1607 L8360 2296 L8360 2296 L8360 2985 L8360 2985 L11174.25 3166.0322066051567 L11174.3 3166.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M7915.2 1469.2 L7922.6 1477.0 L7912.2 1479.4 L7904.8 1471.7 Z"></path>
 					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="14216.3" y="2280.5" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(14216.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
+					<path d="M37648.7 2442.9 L37488 2985 L37488 3156 L37488.0 3156.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M37656.5 2435.5 L37648.7 2442.9 L37646.2 2432.4 L37654.0 2425.0 Z"></path>
 					</g>
-					<g data-name="EdgeInsets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="3553.3" y="2280.5" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
-						</g>
-						<g transform="translate(3553.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
-								
-							</g>
-						</g>
+					<path d="M37910.3 2435.0 L38772.75 2985 L24837.5 3170.49500383634 L24837.5 3170.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M37905.3 2425.5 L37910.3 2435.0 L37899.6 2434.5 L37894.5 2425.0 Z"></path>
 					</g>
-					<g data-name="EmailTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
-							<rect x="1689.5" y="2242.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
-							<path d="M1689.5 2273.5 L2010.5 2273.5" fill="none" data-name="EmailTextField"></path>
-						</g>
-						<g transform="translate(1689.5, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1689.5, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
-								
-							</g>
-						</g>
+					<path d="M37948.3 2429.6 L39012.75 2985 L22949 3170.8463345791783 L22949.0 3170.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M37942.5 2420.6 L37948.3 2429.6 L37937.6 2430.0 L37931.8 2421.0 Z"></path>
 					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="32856.0" y="3156.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+					<path d="M37948.4 2425.7 L39052.75 2985 L27374 3170.6653702717103 L27374.0 3170.7 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M37942.5 2416.7 L37948.4 2425.7 L37937.7 2426.3 L37931.8 2417.3 Z"></path>
+					</g>
+					<path d="M34975.3 587.2 L37692.25 876 L37692.25 1025 L37692.25 1025 L37692.25 1174 L37692.25 1174 L37692.25 1390.5 L37692.25 1390.5 L37692.25 1607 L37692.25 1607 L37692.25 2167 L37692.3 2167.0 " fill="none"></path>
+					<path d="M34975.8 581.9 L34975.3 587.2 L34974.7 592.5 L34962.0 585.8 Z"></path>
+					<path d="M33436.5 1412.2 L34289.75 1607 L34289.75 2265 L34289.8 2265.0 " fill="none"></path>
+					<path d="M33437.7 1407.0 L33436.5 1412.2 L33435.3 1417.4 L33423.5 1409.2 Z"></path>
+					<path d="M17067.1 1027.9 L21557.25 1174 L21557.25 1359.5 L21557.3 1359.5 " fill="none"></path>
+					<path d="M17067.2 1022.6 L17067.1 1027.9 L17066.9 1033.2 L17053.8 1027.5 Z"></path>
+					<path d="M33436.6 1408.5 L34485.25 1607 L34485.25 2265 L34485.3 2265.0 " fill="none"></path>
+					<path d="M33437.6 1403.3 L33436.6 1408.5 L33435.6 1413.7 L33423.5 1406.0 Z"></path>
+					<path d="M33436.7 1405.8 L34688.75 1607 L34688.75 2265 L34688.8 2265.0 " fill="none"></path>
+					<path d="M33437.5 1400.5 L33436.7 1405.8 L33435.8 1411.1 L33423.5 1403.7 Z"></path>
+					<path d="M33436.7 1405.0 L34765 1607 L35075.61611030479 2265 L35075.6 2265.0 " fill="none"></path>
+					<path d="M33437.5 1399.7 L33436.7 1405.0 L33435.9 1410.2 L33423.5 1403.0 Z"></path>
+					<path d="M33436.7 1404.6 L34805 1607 L35306.6175616836 2265 L35306.6 2265.0 " fill="none"></path>
+					<path d="M33437.5 1399.3 L33436.7 1404.6 L33435.9 1409.9 L33423.5 1402.6 Z"></path>
+					<g data-name="StudiesTableColumnSize">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
+							<rect x="5176.5" y="30.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
+							<path d="M5176.5 61.0 L5401.5 61.0" fill="none" data-name="StudiesTableColumnSize"></path>
+							<path d="M5176.5 122.0 L5401.5 122.0" fill="none" data-name="StudiesTableColumnSize"></path>
 						</g>
-						<g transform="translate(32856, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+						<g transform="translate(5176.5, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
+								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PasswordTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
-							<rect x="2050.5" y="2235.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
-							<path d="M2050.5 2266.0 L2529.5 2266.0" fill="none" data-name="PasswordTextField"></path>
-						</g>
-						<g transform="translate(2050.5, 2235)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
+						<g transform="translate(5176.5, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2050.5, 2266)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
+						<g transform="translate(5176.5, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<rect x="270.8" y="3156.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
+					<g data-name="StudiesTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
+							<rect x="28.5" y="1246.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
+							<path d="M28.5 1277.5 L508.5 1277.5" fill="none" data-name="StudiesTable"></path>
+							<path d="M28.5 1488.5 L508.5 1488.5" fill="none" data-name="StudiesTable"></path>
 						</g>
-						<g transform="translate(270.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
+						<g transform="translate(28.5, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
+								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyUJobsToBeDone">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
-							<rect x="26810.5" y="60.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
-							<path d="M26810.5 91.5 L27004.5 91.5" fill="none" data-name="StudyUJobsToBeDone"></path>
-						</g>
-						<g transform="translate(26810.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
+						<g transform="translate(28.5, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26810.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
+						<g transform="translate(28.5, 1488.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthFormController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
-							<rect x="35509.0" y="2039.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
-							<path d="M35509.0 2070.5 L36359.0 2070.5" fill="none" data-name="AuthFormController"></path>
-							<path d="M35509.0 2326.5 L36359.0 2326.5" fill="none" data-name="AuthFormController"></path>
+					<g data-name="void Function(Study)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
+							<rect x="0.0" y="2280.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
 						</g>
-						<g transform="translate(35509, 2039.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
-								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
+						<g transform="translate(0, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
+								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35509, 2070.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
-								
-							</g>
+					</g>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+							<rect x="219.0" y="2280.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
 						</g>
-						<g transform="translate(35509, 2326.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
+						<g transform="translate(219, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="31147.5" y="3156.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
+					<g data-name="Widget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
+							<rect x="16841.0" y="2280.5" height="31.0" width="71.0" data-name="Widget"></rect>
 						</g>
-						<g transform="translate(31147.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
+						<g transform="translate(16841, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
+								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="INotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="16317.5" y="3156.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
+					<g data-name="DashboardController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
+							<rect x="799.0" y="2107.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
+							<path d="M799.0 2138.0 L1413.0 2138.0" fill="none" data-name="DashboardController"></path>
+							<path d="M799.0 2259.0 L1413.0 2259.0" fill="none" data-name="DashboardController"></path>
 						</g>
-						<g transform="translate(16317.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
+						<g transform="translate(799, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
+								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="34407.8" y="3156.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(34407.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
+						<g transform="translate(799, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="39344.8" y="3156.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(39344.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+						<g transform="translate(799, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormGroupController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="38033.5" y="60.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
-							<path d="M38033.5 91.5 L38220.5 91.5" fill="none" data-name="IFormGroupController"></path>
+					<g data-name="StudiesTableColumn">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
+							<rect x="984.8" y="3065.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
+							<path d="M984.8 3096.5 L1345.8 3096.5" fill="none" data-name="StudiesTableColumn"></path>
 						</g>
-						<g transform="translate(38033.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
-								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
+						<g transform="translate(984.75, 3065.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
+								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38033.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
+						<g transform="translate(984.75, 3096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="Enum">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="2980.5" y="2280.5" height="31.0" width="61.0" data-name="Enum"></rect>
+							<rect x="2064.3" y="2280.5" height="31.0" width="61.0" data-name="Enum"></rect>
 						</g>
-						<g transform="translate(2980.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+						<g transform="translate(2064.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
 								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
-							<rect x="731.0" y="3118.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
-							<path d="M731.0 3149.0 L1010.0 3149.0" fill="none" data-name="AppStatus"></path>
+					<g data-name="StudiesTableItem">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
+							<rect x="2682.8" y="2197.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
+							<path d="M2682.8 2228.5 L3082.8 2228.5" fill="none" data-name="StudiesTableItem"></path>
 						</g>
-						<g transform="translate(731, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
+						<g transform="translate(2682.75, 2197.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
+								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
 								
 							</g>
 						</g>
-						<g transform="translate(731, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
+						<g transform="translate(2682.75, 2228.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormArrayTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
-							<rect x="2223.0" y="1194.0" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
-							<path d="M2223.0 1225.0 L2713.0 1225.0" fill="none" data-name="FormArrayTable"></path>
-							<path d="M2223.0 1526.0 L2713.0 1526.0" fill="none" data-name="FormArrayTable"></path>
+					<g data-name="Study">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
+							<rect x="27168.0" y="3156.0" height="31.0" width="61.0" data-name="Study"></rect>
 						</g>
-						<g transform="translate(2223, 1194)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
-								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
+						<g transform="translate(27168, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2223, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
+					</g>
+					<g data-name="void Function(Study, bool)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
+							<rect x="2765.0" y="3156.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
+						</g>
+						<g transform="translate(2765, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2223, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
+					</g>
+					<g data-name="void Function(Study)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
+							<rect x="3038.0" y="3156.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
+						</g>
+						<g transform="translate(3038, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
+								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="10354.3" y="3156.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+					<g data-name="DashboardScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
+							<rect x="769.5" y="1336.5" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
+							<path d="M769.5 1367.5 L1112.5 1367.5" fill="none" data-name="DashboardScaffold"></path>
+							<path d="M769.5 1413.5 L1112.5 1413.5" fill="none" data-name="DashboardScaffold"></path>
 						</g>
-						<g transform="translate(10354.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
+						<g transform="translate(769.5, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
+								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="1505.5" y="2280.5" height="31.0" width="144.0" data-name="void Function(T)"></rect>
+						<g transform="translate(769.5, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
+								
+							</g>
 						</g>
-						<g transform="translate(1505.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
+						<g transform="translate(769.5, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<rect x="2569.5" y="2280.5" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
+					<g data-name="StudiesTableColumnHeader">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
+							<rect x="1152.5" y="1329.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
+							<path d="M1152.5 1360.5 L1389.5 1360.5" fill="none" data-name="StudiesTableColumnHeader"></path>
 						</g>
-						<g transform="translate(2569.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
+						<g transform="translate(1152.5, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
+								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1152.5, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="void Function()?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="16997.3" y="2280.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
+							<rect x="11391.0" y="2280.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
 						</g>
-						<g transform="translate(16997.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
+						<g transform="translate(11391, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
 								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="String Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
-							<rect x="3698.3" y="2280.5" height="31.0" width="157.0" data-name="String Function(T)"></rect>
+					<g data-name="StudiesFilter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
+							<rect x="2429.0" y="3133.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
+							<path d="M2429.0 3164.0 L2725.0 3164.0" fill="none" data-name="StudiesFilter"></path>
 						</g>
-						<g transform="translate(3698.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
+						<g transform="translate(2429, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2429, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="16431.3" y="2280.5" height="31.0" width="87.0" data-name="IconData"></rect>
+					<g data-name="IStudyRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
+							<rect x="24686.5" y="3156.0" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
 						</g>
-						<g transform="translate(16431.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
+						<g transform="translate(24686.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
+								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext, T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
-							<rect x="3895.3" y="2280.5" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
+					<g data-name="IAuthRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
+							<rect x="11384.3" y="3156.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
 						</g>
-						<g transform="translate(3895.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
-								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
+						<g transform="translate(11384.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
+								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="42550.0" y="1359.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
-							<path d="M42550.0 1390.5 L42946.0 1390.5" fill="none" data-name="ManagedFormViewModel"></path>
+					<g data-name="IUserRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
+							<rect x="587.8" y="3156.0" height="31.0" width="143.0" data-name="IUserRepository"></rect>
 						</g>
-						<g transform="translate(42550, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
+						<g transform="translate(587.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
+								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42550, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
+					</g>
+					<g data-name="GoRouter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
+							<rect x="24877.5" y="3156.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
+						</g>
+						<g transform="translate(24877.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
+								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="43322.5" y="223.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
-							<path d="M43322.5 254.0 L44194.5 254.0" fill="none" data-name="FormViewModel"></path>
-							<path d="M43322.5 570.0 L44194.5 570.0" fill="none" data-name="FormViewModel"></path>
+					<g data-name="StreamSubscription">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
+							<rect x="11174.3" y="3156.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
 						</g>
-						<g transform="translate(43322.5, 223)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+						<g transform="translate(11174.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
+								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43322.5, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+					</g>
+					<g data-name="SearchController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
+							<rect x="770.8" y="3156.0" height="31.0" width="149.0" data-name="SearchController"></rect>
+						</g>
+						<g transform="translate(770.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
+								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43322.5, 570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
+					</g>
+					<g data-name="IModelActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
+							<rect x="1429.5" y="1375.0" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
+						</g>
+						<g transform="translate(1429.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
+								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
-							<rect x="26662.5" y="524.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
+					<g data-name="DashboardScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
+							<rect x="3369.8" y="2265.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
+							<path d="M3369.8 2296.0 L3547.8 2296.0" fill="none" data-name="DashboardScreen"></path>
 						</g>
-						<g transform="translate(26662.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
+						<g transform="translate(3369.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
+								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Exception">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="27044.5" y="76.0" height="31.0" width="94.0" data-name="Exception"></rect>
-						</g>
-						<g transform="translate(27044.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
+						<g transform="translate(3369.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="39709.8" y="3378.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
-							<path d="M39709.8 3409.0 L39990.8 3409.0" fill="none" data-name="FormViewModelCollection"></path>
-							<path d="M39709.8 3500.0 L39990.8 3500.0" fill="none" data-name="FormViewModelCollection"></path>
+					<g data-name="AuthFormController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
+							<rect x="6081.3" y="2039.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
+							<path d="M6081.3 2070.5 L6931.3 2070.5" fill="none" data-name="AuthFormController"></path>
+							<path d="M6081.3 2326.5 L6931.3 2326.5" fill="none" data-name="AuthFormController"></path>
 						</g>
-						<g transform="translate(39709.75, 3378)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
+						<g transform="translate(6081.25, 2039.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
+								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39709.75, 3409)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
+						<g transform="translate(6081.25, 2070.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39709.75, 3500)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
+						<g transform="translate(6081.25, 2326.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="38553.3" y="3691.0" height="31.0" width="98.0" data-name="FormArray"></rect>
+					<g data-name="INotificationService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
+							<rect x="5083.3" y="3156.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
 						</g>
-						<g transform="translate(38553.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
+						<g transform="translate(5083.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
+								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CustomFormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
-							<rect x="32706.0" y="3430.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
-							<path d="M32706.0 3461.5 L33119.0 3461.5" fill="none" data-name="CustomFormControl"></path>
-							<path d="M32706.0 3567.5 L33119.0 3567.5" fill="none" data-name="CustomFormControl"></path>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="22836.0" y="3156.0" height="31.0" width="113.0" data-name="FormControl"></rect>
 						</g>
-						<g transform="translate(32706, 3430.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
+						<g transform="translate(22836, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32706, 3461.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
-								
-							</g>
+					</g>
+					<g data-name="FormGroup">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
+							<rect x="27269.0" y="3156.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
 						</g>
-						<g transform="translate(32706, 3567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
+						<g transform="translate(27269, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Debouncer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="41462.5" y="3691.0" height="31.0" width="103.0" data-name="Debouncer"></rect>
+					<g data-name="AuthFormKey">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
+							<rect x="3356.8" y="3088.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
+							<path d="M3356.8 3119.0 L3711.8 3119.0" fill="none" data-name="AuthFormKey"></path>
 						</g>
-						<g transform="translate(41462.5, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
+						<g transform="translate(3356.75, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
+								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(T?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
-							<rect x="31588.3" y="3691.0" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
-						</g>
-						<g transform="translate(31588.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
+						<g transform="translate(3356.75, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(ControlStatus)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
-							<rect x="31792.3" y="3691.0" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
+					<g data-name="IFormGroupController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
+							<rect x="26972.0" y="60.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
+							<path d="M26972.0 91.5 L27159.0 91.5" fill="none" data-name="IFormGroupController"></path>
 						</g>
-						<g transform="translate(31792.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
+						<g transform="translate(26972, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
+								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
+								
+							</g>
+						</g>
+						<g transform="translate(26972, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="UnsavedChangesDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
-							<rect x="43828.5" y="60.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
-							<path d="M43828.5 91.5 L44035.5 91.5" fill="none" data-name="UnsavedChangesDialog"></path>
+					<g data-name="PasswordRecoveryForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
+							<rect x="1658.5" y="2249.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
+							<path d="M1658.5 2280.5 L1866.5 2280.5" fill="none" data-name="PasswordRecoveryForm"></path>
+							<path d="M1658.5 2311.5 L1866.5 2311.5" fill="none" data-name="PasswordRecoveryForm"></path>
 						</g>
-						<g transform="translate(43828.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
+						<g transform="translate(1658.5, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43828.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
+						<g transform="translate(1658.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1658.5, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormValidationSetEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
-							<rect x="43227.8" y="1009.5" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
+					<g data-name="FormConsumerRefWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
+							<rect x="2593.8" y="1375.0" height="31.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
 						</g>
-						<g transform="translate(43227.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
-								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
+						<g transform="translate(2593.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
+								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControlValidation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
-							<rect x="4943.3" y="2227.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
-							<path d="M4943.3 2258.0 L5428.3 2258.0" fill="none" data-name="FormControlValidation"></path>
-							<path d="M4943.3 2334.0 L5428.3 2334.0" fill="none" data-name="FormControlValidation"></path>
+					<g data-name="PasswordForgotForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
+							<rect x="3122.8" y="2249.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
+							<path d="M3122.8 2280.5 L3329.8 2280.5" fill="none" data-name="PasswordForgotForm"></path>
+							<path d="M3122.8 2311.5 L3329.8 2311.5" fill="none" data-name="PasswordForgotForm"></path>
 						</g>
-						<g transform="translate(4943.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
-								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
+						<g transform="translate(3122.75, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4943.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
+						<g transform="translate(3122.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4943.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
+						<g transform="translate(3122.75, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="27224.5" y="493.0" height="93.0" width="163.0" data-name="IFormData"></rect>
-							<path d="M27224.5 524.0 L27387.5 524.0" fill="none" data-name="IFormData"></path>
-							<path d="M27224.5 555.0 L27387.5 555.0" fill="none" data-name="IFormData"></path>
+					<g data-name="LoginForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
+							<rect x="3905.3" y="2249.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
+							<path d="M3905.3 2280.5 L4112.3 2280.5" fill="none" data-name="LoginForm"></path>
+							<path d="M3905.3 2311.5 L4112.3 2311.5" fill="none" data-name="LoginForm"></path>
 						</g>
-						<g transform="translate(27224.5, 493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
+						<g transform="translate(3905.25, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27224.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
+						<g transform="translate(3905.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27224.5, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
+						<g transform="translate(3905.25, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormInvalidException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
-							<rect x="26998.5" y="524.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
+					<g data-name="EmailTextField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
+							<rect x="5201.3" y="2242.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
+							<path d="M5201.3 2273.5 L5522.3 2273.5" fill="none" data-name="EmailTextField"></path>
 						</g>
-						<g transform="translate(26998.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
+						<g transform="translate(5201.25, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
+								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5201.25, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
+								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConfigException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
-							<rect x="34673.3" y="508.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
-							<path d="M34673.3 539.5 L34858.3 539.5" fill="none" data-name="FormConfigException"></path>
+					<g data-name="PasswordTextField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
+							<rect x="5562.3" y="2235.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
+							<path d="M5562.3 2266.0 L6041.3 2266.0" fill="none" data-name="PasswordTextField"></path>
 						</g>
-						<g transform="translate(34673.25, 508.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
-								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
+						<g transform="translate(5562.25, 2235)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34673.25, 539.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
+						<g transform="translate(5562.25, 2266)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="43786.0" y="986.5" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-							<path d="M43786.0 1017.5 L44003.0 1017.5" fill="none" data-name="IFormViewModelDelegate"></path>
-						</g>
-						<g transform="translate(43786, 986.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
+					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+							<rect x="4474.5" y="3156.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
 						</g>
-						<g transform="translate(43786, 1017.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
+						<g transform="translate(4474.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControlOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
-							<rect x="44234.5" y="486.0" height="107.0" width="190.0" data-name="FormControlOption"></rect>
-							<path d="M44234.5 517.0 L44424.5 517.0" fill="none" data-name="FormControlOption"></path>
+					<g data-name="AuthScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
+							<rect x="5011.8" y="1329.5" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
+							<path d="M5011.8 1360.5 L5270.8 1360.5" fill="none" data-name="AuthScaffold"></path>
 						</g>
-						<g transform="translate(44234.5, 486)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
+						<g transform="translate(5011.75, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
+								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44234.5, 517)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
+						<g transform="translate(5011.75, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="44281.5" y="76.0" height="31.0" width="96.0" data-name="Equatable"></rect>
+					<g data-name="EdgeInsets">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
+							<rect x="8400.0" y="2280.5" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
 						</g>
-						<g transform="translate(44281.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
+						<g transform="translate(8400, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
-							<rect x="28528.3" y="3110.5" height="122.0" width="282.0" data-name="FormMode"></rect>
-							<path d="M28528.3 3141.5 L28810.3 3141.5" fill="none" data-name="FormMode"></path>
-						</g>
-						<g transform="translate(28528.25, 3110.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
-								
-							</g>
+					<g data-name="StudyUJobsToBeDone">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
+							<rect x="6297.3" y="60.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
+							<path d="M6297.3 91.5 L6491.3 91.5" fill="none" data-name="StudyUJobsToBeDone"></path>
 						</g>
-						<g transform="translate(28528.25, 3141.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
+						<g transform="translate(6297.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
+								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="CancelableOperation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="44277.8" y="1009.5" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
-						</g>
-						<g transform="translate(44277.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
+						<g transform="translate(6297.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrolledBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="44417.5" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M44417.5 76.0 L44583.5 76.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M44417.5 107.0 L44583.5 107.0" fill="none" data-name="EnrolledBadge"></path>
+					<g data-name="SignupForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
+							<rect x="4152.3" y="2234.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
+							<path d="M4152.3 2265.5 L4430.3 2265.5" fill="none" data-name="SignupForm"></path>
+							<path d="M4152.3 2296.5 L4430.3 2296.5" fill="none" data-name="SignupForm"></path>
 						</g>
-						<g transform="translate(44417.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
+						<g transform="translate(4152.25, 2234.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
+								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44417.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
+						<g transform="translate(4152.25, 2265.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44417.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
+						<g transform="translate(4152.25, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRecruitController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="5468.3" y="2204.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M5468.3 2235.5 L6119.3 2235.5" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M5468.3 2281.5 L6119.3 2281.5" fill="none" data-name="StudyRecruitController"></path>
+					<g data-name="StudyInvitesTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
+							<rect x="5441.5" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
+							<path d="M5441.5 31.0 L6007.5 31.0" fill="none" data-name="StudyInvitesTable"></path>
+							<path d="M5441.5 137.0 L6007.5 137.0" fill="none" data-name="StudyInvitesTable"></path>
 						</g>
-						<g transform="translate(5468.25, 2204.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
-								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
+						<g transform="translate(5441.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
+								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5468.25, 2235.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
+						<g transform="translate(5441.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5468.25, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
+						<g transform="translate(5441.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IInviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="31329.5" y="3156.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
+					<g data-name="void Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
+							<rect x="5245.3" y="524.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(31329.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
+						<g transform="translate(5245.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
+								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="13783.5" y="3156.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+							<rect x="5507.3" y="524.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(13783.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
+						<g transform="translate(5507.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyBaseController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="4974.0" y="1299.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
-							<path d="M4974.0 1330.0 L5520.0 1330.0" fill="none" data-name="StudyBaseController"></path>
-							<path d="M4974.0 1406.0 L5520.0 1406.0" fill="none" data-name="StudyBaseController"></path>
+					<g data-name="Intervention? Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
+							<rect x="5967.3" y="524.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
 						</g>
-						<g transform="translate(4974, 1299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
-								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
+						<g transform="translate(5967.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4974, 1330)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
+					</g>
+					<g data-name="int Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
+							<rect x="6258.3" y="524.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
+						</g>
+						<g transform="translate(6258.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4974, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
+					</g>
+					<g data-name="EnrolledBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
+							<rect x="35495.3" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
+							<path d="M35495.3 76.0 L35661.3 76.0" fill="none" data-name="EnrolledBadge"></path>
+							<path d="M35495.3 107.0 L35661.3 107.0" fill="none" data-name="EnrolledBadge"></path>
+						</g>
+						<g transform="translate(35495.25, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="6925.8" y="1375.0" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
+						<g transform="translate(35495.25, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
+								
+							</g>
 						</g>
-						<g transform="translate(6925.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
+						<g transform="translate(35495.25, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="StudyRecruitScreen">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="18764.8" y="2242.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M18764.8 2273.5 L19078.8 2273.5" fill="none" data-name="StudyRecruitScreen"></path>
+							<rect x="32059.3" y="2242.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
+							<path d="M32059.3 2273.5 L32373.3 2273.5" fill="none" data-name="StudyRecruitScreen"></path>
 						</g>
-						<g transform="translate(18764.75, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
+						<g transform="translate(32059.25, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
 								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18764.75, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
+						<g transform="translate(32059.25, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
@@ -4794,45 +4505,44 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
-							<rect x="36439.0" y="1336.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
-							<path d="M36439.0 1367.5 L36877.0 1367.5" fill="none" data-name="InviteCodeFormView"></path>
-							<path d="M36439.0 1398.5 L36877.0 1398.5" fill="none" data-name="InviteCodeFormView"></path>
+					<g data-name="StudyPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
+							<rect x="33259.5" y="1344.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
+							<path d="M33259.5 1375.0 L33423.5 1375.0" fill="none" data-name="StudyPageWidget"></path>
+							<path d="M33259.5 1406.0 L33423.5 1406.0" fill="none" data-name="StudyPageWidget"></path>
 						</g>
-						<g transform="translate(36439, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
-								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
+						<g transform="translate(33259.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36439, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
+						<g transform="translate(33259.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36439, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
+						<g transform="translate(33259.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="InviteCodeFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="42310.8" y="2107.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M42310.8 2138.0 L42977.8 2138.0" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M42310.8 2364.0 L42977.8 2364.0" fill="none" data-name="InviteCodeFormViewModel"></path>
+							<rect x="14387.5" y="2107.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
+							<path d="M14387.5 2138.0 L15054.5 2138.0" fill="none" data-name="InviteCodeFormViewModel"></path>
+							<path d="M14387.5 2364.0 L15054.5 2364.0" fill="none" data-name="InviteCodeFormViewModel"></path>
 						</g>
-						<g transform="translate(42310.75, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
+						<g transform="translate(14387.5, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
 								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42310.75, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+						<g transform="translate(14387.5, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
@@ -4851,7 +4561,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(42310.75, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+						<g transform="translate(14387.5, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
@@ -4864,1672 +4574,1816 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="38919.8" y="524.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
+					<g data-name="IInviteCodeRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
+							<rect x="10943.3" y="3156.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
 						</g>
-						<g transform="translate(38919.75, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
+						<g transform="translate(10943.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInvitesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="44826.3" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M44826.3 31.0 L45392.3 31.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M44826.3 137.0 L45392.3 137.0" fill="none" data-name="StudyInvitesTable"></path>
+					<g data-name="FormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
+							<rect x="34090.0" y="223.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
+							<path d="M34090.0 254.0 L34962.0 254.0" fill="none" data-name="FormViewModel"></path>
+							<path d="M34090.0 570.0 L34962.0 570.0" fill="none" data-name="FormViewModel"></path>
 						</g>
-						<g transform="translate(44826.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
-								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
+						<g transform="translate(34090, 223)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
+								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44826.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
+						<g transform="translate(34090, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44826.25, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
+						<g transform="translate(34090, 570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="44630.0" y="524.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
+					<g data-name="InviteCodeFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
+							<rect x="6546.3" y="1336.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
+							<path d="M6546.3 1367.5 L6984.3 1367.5" fill="none" data-name="InviteCodeFormView"></path>
+							<path d="M6546.3 1398.5 L6984.3 1398.5" fill="none" data-name="InviteCodeFormView"></path>
 						</g>
-						<g transform="translate(44630, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
+						<g transform="translate(6546.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
+								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="44892.0" y="524.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
+						<g transform="translate(6546.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
+								
+							</g>
 						</g>
-						<g transform="translate(44892, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+						<g transform="translate(6546.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Intervention? Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="45352.0" y="524.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
+					<g data-name="FormConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
+							<rect x="15125.3" y="524.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
 						</g>
-						<g transform="translate(45352, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
+						<g transform="translate(15125.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
+								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="int Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="45643.0" y="524.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
+					<g data-name="StudyRecruitController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
+							<rect x="4470.3" y="2204.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
+							<path d="M4470.3 2235.5 L5121.3 2235.5" fill="none" data-name="StudyRecruitController"></path>
+							<path d="M4470.3 2281.5 L5121.3 2281.5" fill="none" data-name="StudyRecruitController"></path>
 						</g>
-						<g transform="translate(45643, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
+						<g transform="translate(4470.25, 2204.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
+								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="40631.3" y="3156.0" height="31.0" width="61.0" data-name="Study"></rect>
+						<g transform="translate(4470.25, 2235.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
+								
+							</g>
 						</g>
-						<g transform="translate(40631.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
+						<g transform="translate(4470.25, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PublishSuccessDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
-							<rect x="19118.8" y="2265.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
-							<path d="M19118.8 2296.0 L19309.8 2296.0" fill="none" data-name="PublishSuccessDialog"></path>
+					<g data-name="StudyBaseController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
+							<rect x="7358.8" y="1299.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
+							<path d="M7358.8 1330.0 L7904.8 1330.0" fill="none" data-name="StudyBaseController"></path>
+							<path d="M7358.8 1406.0 L7904.8 1406.0" fill="none" data-name="StudyBaseController"></path>
 						</g>
-						<g transform="translate(19118.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
+						<g transform="translate(7358.75, 1299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
+								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19118.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
+						<g transform="translate(7358.75, 1330)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(7358.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PublishDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
-							<rect x="20098.8" y="2265.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
-							<path d="M20098.8 2296.0 L20234.8 2296.0" fill="none" data-name="PublishDialog"></path>
+					<g data-name="App">
+						<g fill="#eee8d5" stroke="#33322E" data-name="App">
+							<rect x="35701.3" y="76.0" height="31.0" width="47.0" data-name="App"></rect>
 						</g>
-						<g transform="translate(20098.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
+						<g transform="translate(35701.25, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
+								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20098.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
+					</g>
+					<g data-name="AppContent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
+							<rect x="35788.3" y="76.0" height="31.0" width="109.0" data-name="AppContent"></rect>
+						</g>
+						<g transform="translate(35788.25, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PublishConfirmationDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
-							<rect x="20274.8" y="2265.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
-							<path d="M20274.8 2296.0 L20498.8 2296.0" fill="none" data-name="PublishConfirmationDialog"></path>
+					<g data-name="StudyAnalyzeScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
+							<rect x="33313.3" y="2257.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
+							<path d="M33313.3 2288.5 L33493.3 2288.5" fill="none" data-name="StudyAnalyzeScreen"></path>
 						</g>
-						<g transform="translate(20274.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
+						<g transform="translate(33313.25, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
+								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20274.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
+						<g transform="translate(33313.25, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FrameControlsWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
-							<rect x="11577.0" y="1329.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
-							<path d="M11577.0 1360.0 L11868.0 1360.0" fill="none" data-name="FrameControlsWidget"></path>
-							<path d="M11577.0 1421.0 L11868.0 1421.0" fill="none" data-name="FrameControlsWidget"></path>
+					<g data-name="StudyAnalyzeController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
+							<rect x="7104.0" y="2265.0" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
+							<path d="M7104.0 2296.0 L7305.0 2296.0" fill="none" data-name="StudyAnalyzeController"></path>
 						</g>
-						<g transform="translate(11577, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
+						<g transform="translate(7104, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
+								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11577, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
+						<g transform="translate(7104, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11577, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
+					</g>
+					<g data-name="AppStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
+							<rect x="1435.8" y="3118.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
+							<path d="M1435.8 3149.0 L1714.8 3149.0" fill="none" data-name="AppStatus"></path>
+						</g>
+						<g transform="translate(1435.75, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
+								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="17414.3" y="1009.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(17414.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
+						<g transform="translate(1435.75, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyStatusBadgeViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
-							<rect x="7961.8" y="1352.0" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
-							<path d="M7961.8 1383.0 L8246.8 1383.0" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
+					<g data-name="ManagedFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
+							<rect x="25825.0" y="1359.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
+							<path d="M25825.0 1390.5 L26221.0 1390.5" fill="none" data-name="ManagedFormViewModel"></path>
 						</g>
-						<g transform="translate(7961.75, 1352)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
+						<g transform="translate(25825, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
+								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7961.75, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
+						<g transform="translate(25825, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="9675.8" y="2280.5" height="31.0" width="114.0" data-name="Participation"></rect>
+					<g data-name="FormViewModelNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
+							<rect x="37573.0" y="524.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
 						</g>
-						<g transform="translate(9675.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
+						<g transform="translate(37573, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
-							<rect x="8311.8" y="2280.5" height="31.0" width="111.0" data-name="StudyStatus"></rect>
+					<g data-name="Exception">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
+							<rect x="38909.5" y="76.0" height="31.0" width="94.0" data-name="Exception"></rect>
 						</g>
-						<g transform="translate(8311.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
-								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
+						<g transform="translate(38909.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
+								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyStatusBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
-							<rect x="8286.8" y="1314.0" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
-							<path d="M8286.8 1345.0 L8527.8 1345.0" fill="none" data-name="StudyStatusBadge"></path>
-							<path d="M8286.8 1436.0 L8527.8 1436.0" fill="none" data-name="StudyStatusBadge"></path>
+					<g data-name="FormViewModelCollection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
+							<rect x="28083.5" y="3378.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
+							<path d="M28083.5 3409.0 L28364.5 3409.0" fill="none" data-name="FormViewModelCollection"></path>
+							<path d="M28083.5 3500.0 L28364.5 3500.0" fill="none" data-name="FormViewModelCollection"></path>
 						</g>
-						<g transform="translate(8286.75, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
+						<g transform="translate(28083.5, 3378)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
+								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8286.75, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
+						<g transform="translate(28083.5, 3409)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8286.75, 1436)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
+						<g transform="translate(28083.5, 3500)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="11459.3" y="2280.5" height="31.0" width="106.0" data-name="BadgeType"></rect>
+					<g data-name="FormArray">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
+							<rect x="24695.0" y="3691.0" height="31.0" width="98.0" data-name="FormArray"></rect>
 						</g>
-						<g transform="translate(11459.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
+						<g transform="translate(24695, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RouteInformation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
-							<rect x="8572.8" y="2227.0" height="138.0" width="152.0" data-name="RouteInformation"></rect>
-							<path d="M8572.8 2258.0 L8724.8 2258.0" fill="none" data-name="RouteInformation"></path>
-							<path d="M8572.8 2334.0 L8724.8 2334.0" fill="none" data-name="RouteInformation"></path>
+					<g data-name="FormInvalidException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
+							<rect x="37909.0" y="524.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
 						</g>
-						<g transform="translate(8572.75, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
+						<g transform="translate(37909, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
+								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8572.75, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
+					</g>
+					<g data-name="FormConfigException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
+							<rect x="39218.8" y="508.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
+							<path d="M39218.8 539.5 L39403.8 539.5" fill="none" data-name="FormConfigException"></path>
+						</g>
+						<g transform="translate(39218.75, 508.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
+								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8572.75, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
+						<g transform="translate(39218.75, 539.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
-							<rect x="8567.8" y="1261.5" height="258.0" width="302.0" data-name="PlatformController"></rect>
-							<path d="M8567.8 1292.5 L8869.8 1292.5" fill="none" data-name="PlatformController"></path>
-							<path d="M8567.8 1383.5 L8869.8 1383.5" fill="none" data-name="PlatformController"></path>
-						</g>
-						<g transform="translate(8567.75, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
-								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
-								
-							</g>
+					<g data-name="IFormViewModelDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
+							<rect x="32592.5" y="986.5" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
+							<path d="M32592.5 1017.5 L32809.5 1017.5" fill="none" data-name="IFormViewModelDelegate"></path>
 						</g>
-						<g transform="translate(8567.75, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
+						<g transform="translate(32592.5, 986.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
+								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8567.75, 1383.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
+						<g transform="translate(32592.5, 1017.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WebController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
-							<rect x="9829.8" y="2197.0" height="198.0" width="273.0" data-name="WebController"></rect>
-							<path d="M9829.8 2228.0 L10102.8 2228.0" fill="none" data-name="WebController"></path>
-							<path d="M9829.8 2259.0 L10102.8 2259.0" fill="none" data-name="WebController"></path>
-						</g>
-						<g transform="translate(9829.75, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
-								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
-								
-							</g>
+					<g data-name="FormControlOption">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
+							<rect x="39443.8" y="486.0" height="107.0" width="190.0" data-name="FormControlOption"></rect>
+							<path d="M39443.8 517.0 L39633.8 517.0" fill="none" data-name="FormControlOption"></path>
 						</g>
-						<g transform="translate(9829.75, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
+						<g transform="translate(39443.75, 486)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
+								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
 								
 							</g>
-						</g>
-						<g transform="translate(9829.75, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
+						</g>
+						<g transform="translate(39443.75, 517)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFrameElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
-							<rect x="11087.8" y="3156.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
+					<g data-name="Equatable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
+							<rect x="39490.8" y="76.0" height="31.0" width="96.0" data-name="Equatable"></rect>
 						</g>
-						<g transform="translate(11087.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
+						<g transform="translate(39490.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
+								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MobileController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
-							<rect x="10142.8" y="2212.5" height="167.0" width="191.0" data-name="MobileController"></rect>
-							<path d="M10142.8 2243.5 L10333.8 2243.5" fill="none" data-name="MobileController"></path>
+					<g data-name="FormMode">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
+							<rect x="11785.8" y="3110.5" height="122.0" width="282.0" data-name="FormMode"></rect>
+							<path d="M11785.8 3141.5 L12067.8 3141.5" fill="none" data-name="FormMode"></path>
 						</g>
-						<g transform="translate(10142.75, 2212.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
+						<g transform="translate(11785.75, 3110.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10142.75, 2243.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
+						<g transform="translate(11785.75, 3141.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
-							<rect x="4250.3" y="2182.0" height="228.0" width="573.0" data-name="StudyController"></rect>
-							<path d="M4250.3 2213.0 L4823.3 2213.0" fill="none" data-name="StudyController"></path>
-							<path d="M4250.3 2274.0 L4823.3 2274.0" fill="none" data-name="StudyController"></path>
+					<g data-name="FormValidationSetEnum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
+							<rect x="27021.8" y="1009.5" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
 						</g>
-						<g transform="translate(4250.25, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
-								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
+						<g transform="translate(27021.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
+								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4250.25, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+					</g>
+					<g data-name="Debouncer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
+							<rect x="34091.5" y="3691.0" height="31.0" width="103.0" data-name="Debouncer"></rect>
+						</g>
+						<g transform="translate(34091.5, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
+								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4250.25, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
+					</g>
+					<g data-name="CancelableOperation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
+							<rect x="37229.3" y="1009.5" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
+						</g>
+						<g transform="translate(37229.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
+								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyNavViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
-							<rect x="8909.8" y="1322.0" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
-							<path d="M8909.8 1353.0 L9150.8 1353.0" fill="none" data-name="IStudyNavViewModel"></path>
+					<g data-name="UnsavedChangesDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
+							<rect x="39626.8" y="60.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
+							<path d="M39626.8 91.5 L39833.8 91.5" fill="none" data-name="UnsavedChangesDialog"></path>
 						</g>
-						<g transform="translate(8909.75, 1322)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
+						<g transform="translate(39626.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8909.75, 1353)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
+						<g transform="translate(39626.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
-							<rect x="45518.5" y="23.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
-							<path d="M45518.5 54.0 L45751.5 54.0" fill="none" data-name="StudyNav"></path>
+					<g data-name="FormArrayTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
+							<rect x="9399.8" y="1194.0" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
+							<path d="M9399.8 1225.0 L9889.8 1225.0" fill="none" data-name="FormArrayTable"></path>
+							<path d="M9399.8 1526.0 L9889.8 1526.0" fill="none" data-name="FormArrayTable"></path>
 						</g>
-						<g transform="translate(45518.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
+						<g transform="translate(9399.75, 1194)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
+								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45518.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
+						<g transform="translate(9399.75, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyDesignNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
-							<rect x="45791.5" y="23.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
-							<path d="M45791.5 54.0 L46079.5 54.0" fill="none" data-name="StudyDesignNav"></path>
-						</g>
-						<g transform="translate(45791.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
+						<g transform="translate(9399.75, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45791.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
+					</g>
+					<g data-name="AbstractControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
+							<rect x="15351.0" y="3156.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+						</g>
+						<g transform="translate(15351, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
+								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IWithBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="20933.3" y="1009.5" height="31.0" width="113.0" data-name="IWithBanner"></rect>
+					<g data-name="void Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
+							<rect x="9065.5" y="2280.5" height="31.0" width="144.0" data-name="void Function(T)"></rect>
 						</g>
-						<g transform="translate(20933.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
+						<g transform="translate(9065.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
+								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyParticipationBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
-							<rect x="9190.8" y="1321.5" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
-							<path d="M9190.8 1352.5 L9421.8 1352.5" fill="none" data-name="StudyParticipationBadge"></path>
-							<path d="M9190.8 1428.5 L9421.8 1428.5" fill="none" data-name="StudyParticipationBadge"></path>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+							<rect x="9249.5" y="2280.5" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
 						</g>
-						<g transform="translate(9190.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
+						<g transform="translate(9249.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9190.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
+					</g>
+					<g data-name="String Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
+							<rect x="10185.5" y="2280.5" height="31.0" width="157.0" data-name="String Function(T)"></rect>
+						</g>
+						<g transform="translate(10185.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
+								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9190.75, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
+					</g>
+					<g data-name="IconData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
+							<rect x="12697.5" y="2280.5" height="31.0" width="87.0" data-name="IconData"></rect>
+						</g>
+						<g transform="translate(12697.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
+								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="33238.0" y="3156.0" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
+					<g data-name="Widget Function(BuildContext, T, int)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
+							<rect x="10382.5" y="2280.5" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
 						</g>
-						<g transform="translate(33238, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
+						<g transform="translate(10382.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
+								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PreviewFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
-							<rect x="46119.5" y="45.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
-							<path d="M46119.5 76.5 L46410.5 76.5" fill="none" data-name="PreviewFrame"></path>
+					<g data-name="IFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
+							<rect x="39015.8" y="493.0" height="93.0" width="163.0" data-name="IFormData"></rect>
+							<path d="M39015.8 524.0 L39178.8 524.0" fill="none" data-name="IFormData"></path>
+							<path d="M39015.8 555.0 L39178.8 555.0" fill="none" data-name="IFormData"></path>
 						</g>
-						<g transform="translate(46119.5, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
+						<g transform="translate(39015.75, 493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
+								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46119.5, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
+						<g transform="translate(39015.75, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="46173.0" y="524.0" height="31.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(46173, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
+						<g transform="translate(39015.75, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyAppBarViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
-							<rect x="8908.8" y="2250.0" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
-							<path d="M8908.8 2281.0 L9151.8 2281.0" fill="none" data-name="IStudyAppBarViewModel"></path>
+					<g data-name="CustomFormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
+							<rect x="22686.0" y="3430.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
+							<path d="M22686.0 3461.5 L23099.0 3461.5" fill="none" data-name="CustomFormControl"></path>
+							<path d="M22686.0 3567.5 L23099.0 3567.5" fill="none" data-name="CustomFormControl"></path>
 						</g>
-						<g transform="translate(8908.75, 2250)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
+						<g transform="translate(22686, 3430.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8908.75, 2281)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
+						<g transform="translate(22686, 3461.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
-							<rect x="24559.0" y="904.0" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
-							<path d="M24559.0 935.0 L24894.0 935.0" fill="none" data-name="StudyScaffold"></path>
-						</g>
-						<g transform="translate(24559, 904)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
-								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
+						<g transform="translate(22686, 3567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24559, 935)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
+					</g>
+					<g data-name="void Function(T?)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
+							<rect x="17798.5" y="3691.0" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
+						</g>
+						<g transform="translate(17798.5, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NavbarTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="24629.3" y="1375.0" height="31.0" width="103.0" data-name="NavbarTab"></rect>
+					<g data-name="void Function(ControlStatus)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
+							<rect x="19455.5" y="3691.0" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
 						</g>
-						<g transform="translate(24629.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
+						<g transform="translate(19455.5, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SingleColumnLayoutType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="24812.3" y="1375.0" height="31.0" width="218.0" data-name="SingleColumnLayoutType"></rect>
+					<g data-name="FormControlValidation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
+							<rect x="9660.5" y="2227.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
+							<path d="M9660.5 2258.0 L10145.5 2258.0" fill="none" data-name="FormControlValidation"></path>
+							<path d="M9660.5 2334.0 L10145.5 2334.0" fill="none" data-name="FormControlValidation"></path>
 						</g>
-						<g transform="translate(24812.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
+						<g transform="translate(9660.5, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
+								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
+								
+							</g>
+						</g>
+						<g transform="translate(9660.5, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(9660.5, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WebFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
-							<rect x="46450.5" y="37.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
-							<path d="M46450.5 68.5 L46619.5 68.5" fill="none" data-name="WebFrame"></path>
-							<path d="M46450.5 114.5 L46619.5 114.5" fill="none" data-name="WebFrame"></path>
+					<g data-name="DrawerEntry">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
+							<rect x="10478.0" y="926.0" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
+							<path d="M10478.0 957.0 L10923.0 957.0" fill="none" data-name="DrawerEntry"></path>
+							<path d="M10478.0 1093.0 L10923.0 1093.0" fill="none" data-name="DrawerEntry"></path>
 						</g>
-						<g transform="translate(46450.5, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
+						<g transform="translate(10478, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
+								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46450.5, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
+						<g transform="translate(10478, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DrawerEntry">+localizedHelpText: String Function()?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DrawerEntry">+enabled: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DrawerEntry">+onSelected: void Function(BuildContext, WidgetRef)?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DrawerEntry">+autoCloseDrawer: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DrawerEntry">+title: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="DrawerEntry">+helpText: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46450.5, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
+						<g transform="translate(10478, 1093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DisabledFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
-							<rect x="46659.5" y="60.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
-							<path d="M46659.5 91.5 L46795.5 91.5" fill="none" data-name="DisabledFrame"></path>
+					<g data-name="String Function()">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
+							<rect x="10511.0" y="1375.0" height="31.0" width="147.0" data-name="String Function()"></rect>
 						</g>
-						<g transform="translate(46659.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
+						<g transform="translate(10511, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
+								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46659.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
+					</g>
+					<g data-name="String Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
+							<rect x="10738.0" y="1375.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
+						</g>
+						<g transform="translate(10738, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
+								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PhoneContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
-							<rect x="10182.0" y="1284.0" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
-							<path d="M10182.0 1315.0 L10509.0 1315.0" fill="none" data-name="PhoneContainer"></path>
-							<path d="M10182.0 1466.0 L10509.0 1466.0" fill="none" data-name="PhoneContainer"></path>
+					<g data-name="void Function(BuildContext, WidgetRef)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
+							<rect x="10935.0" y="1375.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
 						</g>
-						<g transform="translate(10182, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
-								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
+						<g transform="translate(10935, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
+								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10182, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
+					</g>
+					<g data-name="GoRouterDrawerEntry">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
+							<rect x="11311.0" y="1336.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
+							<path d="M11311.0 1367.5 L11575.0 1367.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+							<path d="M11311.0 1413.5 L11575.0 1413.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+						</g>
+						<g transform="translate(11311, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
+								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10182, 1466)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
+						<g transform="translate(11311, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(11311, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="20778.8" y="2280.5" height="31.0" width="58.0" data-name="Color"></rect>
+					<g data-name="RoutingIntent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
+							<rect x="11575.0" y="2280.5" height="31.0" width="122.0" data-name="RoutingIntent"></rect>
 						</g>
-						<g transform="translate(20778.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
+						<g transform="translate(11575, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
+								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MobileFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
-							<rect x="46835.5" y="60.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
-							<path d="M46835.5 91.5 L46971.5 91.5" fill="none" data-name="MobileFrame"></path>
+					<g data-name="AppDrawer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
+							<rect x="39873.8" y="8.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
+							<path d="M39873.8 39.0 L40142.8 39.0" fill="none" data-name="AppDrawer"></path>
 						</g>
-						<g transform="translate(46835.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
+						<g transform="translate(39873.75, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
+								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46835.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
+						<g transform="translate(39873.75, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppDrawer">+leftPaddingEntries: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AppDrawer">+logoPaddingVertical: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AppDrawer">+logoPaddingHorizontal: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AppDrawer">+logoMaxHeight: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AppDrawer">+logoSectionMinHeight: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AppDrawer">+logoSectionMaxHeight: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DesktopFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
-							<rect x="47011.5" y="60.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
-							<path d="M47011.5 91.5 L47147.5 91.5" fill="none" data-name="DesktopFrame"></path>
+					<g data-name="StudyFormValidationSet">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
+							<rect x="1804.8" y="3133.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
+							<path d="M1804.8 3164.0 L2191.8 3164.0" fill="none" data-name="StudyFormValidationSet"></path>
 						</g>
-						<g transform="translate(47011.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
+						<g transform="translate(1804.75, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
+								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47011.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
+						<g transform="translate(1804.75, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTestScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
-							<rect x="20538.8" y="2219.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
-							<path d="M20538.8 2250.5 L20738.8 2250.5" fill="none" data-name="StudyTestScreen"></path>
-							<path d="M20538.8 2281.5 L20738.8 2281.5" fill="none" data-name="StudyTestScreen"></path>
+					<g data-name="StudyFormScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
+							<rect x="11749.3" y="1329.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
+							<path d="M11749.3 1360.0 L12137.3 1360.0" fill="none" data-name="StudyFormScaffold"></path>
+							<path d="M11749.3 1421.0 L12137.3 1421.0" fill="none" data-name="StudyFormScaffold"></path>
 						</g>
-						<g transform="translate(20538.75, 2219.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
-								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
+						<g transform="translate(11749.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
+								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20538.75, 2250.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
+						<g transform="translate(11749.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20538.75, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
+						<g transform="translate(11749.25, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudySettingsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="44301.3" y="2167.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M44301.3 2198.0 L44780.3 2198.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M44301.3 2334.0 L44780.3 2334.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+					<g data-name="T Function(WidgetRef)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
+							<rect x="11737.0" y="2280.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
 						</g>
-						<g transform="translate(44301.25, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
+						<g transform="translate(11737, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44301.25, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
+					</g>
+					<g data-name="Widget Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
+							<rect x="12077.0" y="2280.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
 						</g>
-						<g transform="translate(44301.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
+						<g transform="translate(12077, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="44362.0" y="3156.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
+					<g data-name="ConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
+							<rect x="16901.8" y="1009.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
 						</g>
-						<g transform="translate(44362, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
+						<g transform="translate(16901.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudySettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="20876.8" y="2265.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M20876.8 2296.0 L21051.8 2296.0" fill="none" data-name="StudySettingsDialog"></path>
+					<g data-name="StudyDesignEnrollmentFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
+							<rect x="33169.0" y="3125.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
+							<path d="M33169.0 3156.5 L33618.0 3156.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
 						</g>
-						<g transform="translate(20876.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
-								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
+						<g transform="translate(33169, 3125.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
+								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20876.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
+						<g transform="translate(33169, 3156.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTestController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
-							<rect x="6535.3" y="2257.5" height="77.0" width="282.0" data-name="StudyTestController"></rect>
-							<path d="M6535.3 2288.5 L6817.3 2288.5" fill="none" data-name="StudyTestController"></path>
+					<g data-name="StudyDesignPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
+							<rect x="33710.3" y="2265.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
+							<path d="M33710.3 2296.0 L33922.3 2296.0" fill="none" data-name="StudyDesignPageWidget"></path>
 						</g>
-						<g transform="translate(6535.25, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
+						<g transform="translate(33710.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
+								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6535.25, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
+						<g transform="translate(33710.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TestAppRoutes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
-							<rect x="47187.5" y="23.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
-							<path d="M47187.5 54.0 L47447.5 54.0" fill="none" data-name="TestAppRoutes"></path>
+					<g data-name="EnrollmentFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
+							<rect x="42636.8" y="1306.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
+							<path d="M42636.8 1337.5 L43090.8 1337.5" fill="none" data-name="EnrollmentFormData"></path>
+							<path d="M42636.8 1428.5 L43090.8 1428.5" fill="none" data-name="EnrollmentFormData"></path>
 						</g>
-						<g transform="translate(47187.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
+						<g transform="translate(42636.75, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
+								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47187.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
-								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
+						<g transform="translate(42636.75, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(42636.75, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
-							<rect x="25247.8" y="926.0" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
-							<path d="M25247.8 957.0 L25692.8 957.0" fill="none" data-name="DrawerEntry"></path>
-							<path d="M25247.8 1093.0 L25692.8 1093.0" fill="none" data-name="DrawerEntry"></path>
+					<g data-name="Participation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
+							<rect x="34824.3" y="2280.5" height="31.0" width="114.0" data-name="Participation"></rect>
 						</g>
-						<g transform="translate(25247.75, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
-								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
+						<g transform="translate(34824.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
+								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25247.75, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DrawerEntry">+localizedHelpText: String Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DrawerEntry">+enabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DrawerEntry">+onSelected: void Function(BuildContext, WidgetRef)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DrawerEntry">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DrawerEntry">+title: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DrawerEntry">+helpText: String?</text>
+					</g>
+					<g data-name="QuestionnaireFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
+							<rect x="42299.3" y="2227.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
+							<path d="M42299.3 2258.0 L42667.3 2258.0" fill="none" data-name="QuestionnaireFormData"></path>
+							<path d="M42299.3 2304.0 L42667.3 2304.0" fill="none" data-name="QuestionnaireFormData"></path>
+						</g>
+						<g transform="translate(42299.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
+								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25247.75, 1093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
+						<g transform="translate(42299.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="String Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
-							<rect x="25070.3" y="1375.0" height="31.0" width="147.0" data-name="String Function()"></rect>
-						</g>
-						<g transform="translate(25070.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
-								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
+						<g transform="translate(42299.25, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="String Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
-							<rect x="25718.3" y="1375.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
+					<g data-name="IStudyFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
+							<rect x="43331.8" y="994.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
+							<path d="M43331.8 1025.0 L43474.8 1025.0" fill="none" data-name="IStudyFormData"></path>
 						</g>
-						<g transform="translate(25718.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
+						<g transform="translate(43331.75, 994)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
+								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(BuildContext, WidgetRef)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
-							<rect x="25915.3" y="1375.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
-						</g>
-						<g transform="translate(25915.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
-								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
+						<g transform="translate(43331.75, 1025)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="GoRouterDrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
-							<rect x="26291.3" y="1336.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
-							<path d="M26291.3 1367.5 L26555.3 1367.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-							<path d="M26291.3 1413.5 L26555.3 1413.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+					<g data-name="EnrollmentFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
+							<rect x="26973.0" y="2047.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
+							<path d="M26973.0 2078.0 L27875.0 2078.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+							<path d="M26973.0 2304.0 L27875.0 2304.0" fill="none" data-name="EnrollmentFormViewModel"></path>
 						</g>
-						<g transform="translate(26291.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
+						<g transform="translate(26973, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
+								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26291.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
+						<g transform="translate(26973, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26291.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
+						<g transform="translate(26973, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RoutingIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="27858.8" y="2280.5" height="31.0" width="122.0" data-name="RoutingIntent"></rect>
+					<g data-name="EnrollmentFormConsentItemDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
+							<rect x="25501.5" y="3065.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
+							<path d="M25501.5 3096.0 L26301.5 3096.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+							<path d="M25501.5 3172.0 L26301.5 3172.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
 						</g>
-						<g transform="translate(27858.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
+						<g transform="translate(25501.5, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AppDrawer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
-							<rect x="47487.5" y="8.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
-							<path d="M47487.5 39.0 L47756.5 39.0" fill="none" data-name="AppDrawer"></path>
-						</g>
-						<g transform="translate(47487.5, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
-								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
+						<g transform="translate(25501.5, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47487.5, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppDrawer">+leftPaddingEntries: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppDrawer">+logoPaddingVertical: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppDrawer">+logoPaddingHorizontal: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AppDrawer">+logoMaxHeight: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AppDrawer">+logoSectionMinHeight: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AppDrawer">+logoSectionMaxHeight: double</text>
+						<g transform="translate(25501.5, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyAnalyzeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
-							<rect x="22118.8" y="2257.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
-							<path d="M22118.8 2288.5 L22298.8 2288.5" fill="none" data-name="StudyAnalyzeScreen"></path>
+					<g data-name="WithQuestionnaireControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
+							<rect x="26261.0" y="1261.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
+							<path d="M26261.0 1292.5 L26893.0 1292.5" fill="none" data-name="WithQuestionnaireControls"></path>
+							<path d="M26261.0 1398.5 L26893.0 1398.5" fill="none" data-name="WithQuestionnaireControls"></path>
 						</g>
-						<g transform="translate(22118.75, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
+						<g transform="translate(26261, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
+								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22118.75, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
+						<g transform="translate(26261, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyAnalyzeController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
-							<rect x="6857.3" y="2265.0" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
-							<path d="M6857.3 2296.0 L7058.3 2296.0" fill="none" data-name="StudyAnalyzeController"></path>
-						</g>
-						<g transform="translate(6857.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
-								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
+						<g transform="translate(26261, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6857.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
+					</g>
+					<g data-name="IListActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
+							<rect x="12865.0" y="1375.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
+						</g>
+						<g transform="translate(12865, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignInterventionsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="13993.5" y="3140.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M13993.5 3171.5 L14289.5 3171.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
+					<g data-name="IProviderArgsResolver">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
+							<rect x="23059.5" y="1009.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
 						</g>
-						<g transform="translate(13993.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
+						<g transform="translate(23059.5, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13993.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
+					</g>
+					<g data-name="ConsentItemFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
+							<rect x="37732.3" y="941.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
+							<path d="M37732.3 972.0 L37990.3 972.0" fill="none" data-name="ConsentItemFormData"></path>
+							<path d="M37732.3 1063.0 L37990.3 1063.0" fill="none" data-name="ConsentItemFormData"></path>
+						</g>
+						<g transform="translate(37732.25, 941)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
+								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="22338.8" y="2265.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M22338.8 2296.0 L22550.8 2296.0" fill="none" data-name="StudyDesignPageWidget"></path>
-						</g>
-						<g transform="translate(22338.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
+						<g transform="translate(37732.25, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22338.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
+						<g transform="translate(37732.25, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="12278.0" y="1359.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M12278.0 1390.5 L12653.0 1390.5" fill="none" data-name="InterventionFormView"></path>
+					<g data-name="ConsentItemFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
+							<rect x="21509.0" y="2167.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
+							<path d="M21509.0 2198.0 L22205.0 2198.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+							<path d="M21509.0 2364.0 L22205.0 2364.0" fill="none" data-name="ConsentItemFormViewModel"></path>
 						</g>
-						<g transform="translate(12278, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
-								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
+						<g transform="translate(21509, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12278, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
+						<g transform="translate(21509, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InterventionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="28020.8" y="2062.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M28020.8 2093.0 L28875.8 2093.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M28020.8 2319.0 L28875.8 2319.0" fill="none" data-name="InterventionFormViewModel"></path>
-						</g>
-						<g transform="translate(28020.75, 2062)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
-								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
+						<g transform="translate(21509, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28020.75, 2093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+					</g>
+					<g data-name="IScreenerQuestionLogicFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
+							<rect x="12824.5" y="2265.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
+							<path d="M12824.5 2296.0 L13156.5 2296.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
+						</g>
+						<g transform="translate(12824.5, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
+								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28020.75, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
+						<g transform="translate(12824.5, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="11908.0" y="1344.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M11908.0 1375.0 L12238.0 1375.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M11908.0 1406.0 L12238.0 1406.0" fill="none" data-name="InterventionPreview"></path>
+					<g data-name="ScreenerQuestionLogicFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
+							<rect x="8545.0" y="2227.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
+							<path d="M8545.0 2258.0 L8969.0 2258.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+							<path d="M8545.0 2289.0 L8969.0 2289.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
 						</g>
-						<g transform="translate(11908, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
+						<g transform="translate(8545, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
+								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11908, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
+						<g transform="translate(8545, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11908, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
+						<g transform="translate(8545, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="11186.3" y="2280.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
+					<g data-name="ScreenerQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
+							<rect x="14749.0" y="3005.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
+							<path d="M14749.0 3036.0 L15311.0 3036.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+							<path d="M14749.0 3217.0 L15311.0 3217.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(11186.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
+						<g transform="translate(14749, 3005)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
+								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(14749, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(14749, 3217)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="37116.5" y="971.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M37116.5 1002.0 L37475.5 1002.0" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M37116.5 1033.0 L37475.5 1033.0" fill="none" data-name="StudyScheduleFormView"></path>
+					<g data-name="QuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
+							<rect x="20456.0" y="1627.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M20456.0 1658.0 L21469.0 1658.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M20456.0 2679.0 L21469.0 2679.0" fill="none" data-name="QuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(37116.5, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
+						<g transform="translate(20456, 1627)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
+								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37116.5, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
+						<g transform="translate(20456, 1658)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
+								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
+								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
+								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
+								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
+								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
+								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
+								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
+								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
+								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
+								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
+								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
+								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
+								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
+								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
+								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
+								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
+								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
+								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37116.5, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
+						<g transform="translate(20456, 2679)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="36917.0" y="1194.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M36917.0 1225.0 L37675.0 1225.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M36917.0 1526.0 L37675.0 1526.0" fill="none" data-name="StudyScheduleControls"></path>
+					<g data-name="ConsentItemFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
+							<rect x="13322.3" y="1359.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
+							<path d="M13322.3 1390.5 L13703.3 1390.5" fill="none" data-name="ConsentItemFormView"></path>
 						</g>
-						<g transform="translate(36917, 1194)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
-								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
+						<g transform="translate(13322.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
+								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36917, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
+						<g transform="translate(13322.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36917, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
+					</g>
+					<g data-name="DataReferenceIdentifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
+							<rect x="40148.3" y="493.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
+							<path d="M40148.3 524.0 L40352.3 524.0" fill="none" data-name="DataReferenceIdentifier"></path>
+							<path d="M40148.3 555.0 L40352.3 555.0" fill="none" data-name="DataReferenceIdentifier"></path>
+						</g>
+						<g transform="translate(40148.25, 493)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
+								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InterventionTaskFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="34955.0" y="1306.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M34955.0 1337.5 L35245.0 1337.5" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M34955.0 1428.5 L35245.0 1428.5" fill="none" data-name="InterventionTaskFormData"></path>
-						</g>
-						<g transform="translate(34955, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
+						<g transform="translate(40148.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34955, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
+						<g transform="translate(40148.25, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34955, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
+					</g>
+					<g data-name="DataReference">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
+							<rect x="40182.8" y="76.0" height="31.0" width="135.0" data-name="DataReference"></rect>
+						</g>
+						<g transform="translate(40182.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
+								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="35145.8" y="941.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M35145.8 972.0 L35443.8 972.0" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M35145.8 1078.0 L35443.8 1078.0" fill="none" data-name="IFormDataWithSchedule"></path>
+					<g data-name="AverageSectionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
+							<rect x="12177.3" y="1329.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
+							<path d="M12177.3 1360.0 L12656.3 1360.0" fill="none" data-name="AverageSectionFormView"></path>
+							<path d="M12177.3 1421.0 L12656.3 1421.0" fill="none" data-name="AverageSectionFormView"></path>
 						</g>
-						<g transform="translate(35145.75, 941)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
+						<g transform="translate(12177.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35145.75, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
+						<g transform="translate(12177.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35145.75, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
+						<g transform="translate(12177.25, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="37629.3" y="2107.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M37629.3 2138.0 L38468.3 2138.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M37629.3 2289.0 L38468.3 2289.0" fill="none" data-name="InterventionsFormViewModel"></path>
+					<g data-name="ReportItemFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
+							<rect x="16952.0" y="2009.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
+							<path d="M16952.0 2040.5 L17939.0 2040.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<path d="M16952.0 2476.5 L17939.0 2476.5" fill="none" data-name="ReportItemFormViewModel"></path>
 						</g>
-						<g transform="translate(37629.25, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
-								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
+						<g transform="translate(16952, 2009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
+								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37629.25, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
+						<g transform="translate(16952, 2040.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37629.25, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
+						<g transform="translate(16952, 2476.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="14115.0" y="1375.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
+					<g data-name="TemporalAggregationFormatted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
+							<rect x="14262.3" y="1284.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
+							<path d="M14262.3 1315.0 L14710.3 1315.0" fill="none" data-name="TemporalAggregationFormatted"></path>
+							<path d="M14262.3 1421.0 L14710.3 1421.0" fill="none" data-name="TemporalAggregationFormatted"></path>
 						</g>
-						<g transform="translate(14115, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
+						<g transform="translate(14262.25, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
+								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="29304.3" y="1009.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-						</g>
-						<g transform="translate(29304.25, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
+						<g transform="translate(14262.25, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InterventionTaskFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="30844.5" y="2159.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M30844.5 2190.5 L31540.5 2190.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M30844.5 2371.5 L31540.5 2371.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-						</g>
-						<g transform="translate(30844.5, 2159.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
+						<g transform="translate(14262.25, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30844.5, 2190.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
+					</g>
+					<g data-name="TemporalAggregation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
+							<rect x="14161.5" y="2280.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
 						</g>
-						<g transform="translate(30844.5, 2371.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
+						<g transform="translate(14161.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
+								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="41963.3" y="1239.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M41963.3 1270.0 L42458.3 1270.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M41963.3 1496.0 L42458.3 1496.0" fill="none" data-name="WithScheduleControls"></path>
+					<g data-name="ImprovementDirectionFormatted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
+							<rect x="14983.5" y="1284.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
+							<path d="M14983.5 1315.0 L15434.5 1315.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
+							<path d="M14983.5 1421.0 L15434.5 1421.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
 						</g>
-						<g transform="translate(41963.25, 1239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
+						<g transform="translate(14983.5, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
+								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41963.25, 1270)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
+						<g transform="translate(14983.5, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41963.25, 1496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
+						<g transform="translate(14983.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PhaseSequence">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="27807.3" y="3156.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
+					<g data-name="ImprovementDirection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
+							<rect x="15094.5" y="2280.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
 						</g>
-						<g transform="translate(27807.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
-								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
+						<g transform="translate(15094.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
+								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="7.8" y="926.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M7.8 957.0 L389.8 957.0" fill="none" data-name="InterventionFormData"></path>
-							<path d="M7.8 1078.0 L389.8 1078.0" fill="none" data-name="InterventionFormData"></path>
-						</g>
-						<g transform="translate(7.75, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
-								
-							</g>
+					<g data-name="ReportSectionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
+							<rect x="9401.0" y="3118.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
+							<path d="M9401.0 3149.0 L9784.0 3149.0" fill="none" data-name="ReportSectionType"></path>
 						</g>
-						<g transform="translate(7.75, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
+						<g transform="translate(9401, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
+								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7.75, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
+						<g transform="translate(9401, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="6159.3" y="2197.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M6159.3 2228.0 L6455.3 2228.0" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M6159.3 2334.0 L6455.3 2334.0" fill="none" data-name="StudyScheduleFormData"></path>
+					<g data-name="DataReferenceEditor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
+							<rect x="15796.0" y="2227.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
+							<path d="M15796.0 2258.0 L16505.0 2258.0" fill="none" data-name="DataReferenceEditor"></path>
+							<path d="M15796.0 2319.0 L16505.0 2319.0" fill="none" data-name="DataReferenceEditor"></path>
 						</g>
-						<g transform="translate(6159.25, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
+						<g transform="translate(15796, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
+								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6159.25, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
+						<g transform="translate(15796, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6159.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
+						<g transform="translate(15796, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="9065.5" y="994.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M9065.5 1025.0 L9208.5 1025.0" fill="none" data-name="IStudyFormData"></path>
+					<g data-name="ReactiveDropdownField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
+							<rect x="19195.8" y="3156.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
 						</g>
-						<g transform="translate(9065.5, 994)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
+						<g transform="translate(19195.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
+								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9065.5, 1025)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
+					</g>
+					<g data-name="LinearRegressionSectionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
+							<rect x="13743.3" y="1329.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
+							<path d="M13743.3 1360.0 L14222.3 1360.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<path d="M13743.3 1421.0 L14222.3 1421.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+						</g>
+						<g transform="translate(13743.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InterventionTaskFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="14749.0" y="1359.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M14749.0 1390.5 L15162.0 1390.5" fill="none" data-name="InterventionTaskFormView"></path>
-						</g>
-						<g transform="translate(14749, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
+						<g transform="translate(13743.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14749, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
+						<g transform="translate(13743.25, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="7149.8" y="1321.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M7149.8 1352.5 L7543.8 1352.5" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M7149.8 1413.5 L7543.8 1413.5" fill="none" data-name="InterventionsFormData"></path>
+					<g data-name="ReportItemFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
+							<rect x="16419.5" y="1306.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
+							<path d="M16419.5 1337.5 L16886.5 1337.5" fill="none" data-name="ReportItemFormView"></path>
+							<path d="M16419.5 1413.5 L16886.5 1413.5" fill="none" data-name="ReportItemFormView"></path>
 						</g>
-						<g transform="translate(7149.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
+						<g transform="translate(16419.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
+								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7149.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
+						<g transform="translate(16419.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7149.75, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
+						<g transform="translate(16419.5, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignReportsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="14782.5" y="3133.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M14782.5 3164.0 L15175.5 3164.0" fill="none" data-name="StudyDesignReportsFormView"></path>
-						</g>
-						<g transform="translate(14782.5, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
-								
-							</g>
+					<g data-name="Widget Function(BuildContext)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
+							<rect x="16545.0" y="2280.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
 						</g>
-						<g transform="translate(14782.5, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
+						<g transform="translate(16545, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
+								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="ReportItemFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="429.8" y="956.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M429.8 987.0 L743.8 987.0" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M429.8 1048.0 L743.8 1048.0" fill="none" data-name="ReportItemFormData"></path>
+							<rect x="38030.3" y="956.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
+							<path d="M38030.3 987.0 L38344.3 987.0" fill="none" data-name="ReportItemFormData"></path>
+							<path d="M38030.3 1048.0 L38344.3 1048.0" fill="none" data-name="ReportItemFormData"></path>
 						</g>
-						<g transform="translate(429.75, 956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
+						<g transform="translate(38030.25, 956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
 								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(429.75, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+						<g transform="translate(38030.25, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
@@ -6537,7 +6391,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(429.75, 1048)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+						<g transform="translate(38030.25, 1048)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
@@ -6547,565 +6401,702 @@
 					</g>
 					<g data-name="ReportSection">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="522.8" y="1375.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
+							<rect x="38123.3" y="1375.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
 						</g>
-						<g transform="translate(522.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
+						<g transform="translate(38123.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
 								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="19349.8" y="2227.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M19349.8 2258.0 L20058.8 2258.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M19349.8 2319.0 L20058.8 2319.0" fill="none" data-name="DataReferenceEditor"></path>
+					<g data-name="ReportsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
+							<rect x="32413.3" y="2122.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
+							<path d="M32413.3 2153.0 L33273.3 2153.0" fill="none" data-name="ReportsFormViewModel"></path>
+							<path d="M32413.3 2319.0 L33273.3 2319.0" fill="none" data-name="ReportsFormViewModel"></path>
 						</g>
-						<g transform="translate(19349.75, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
+						<g transform="translate(32413.25, 2122)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
+								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19349.75, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
+						<g transform="translate(32413.25, 2153)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19349.75, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
+						<g transform="translate(32413.25, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="13204.5" y="3156.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
+					<g data-name="ReportFormItemDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
+							<rect x="27571.8" y="3065.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
+							<path d="M27571.8 3096.0 L28414.8 3096.0" fill="none" data-name="ReportFormItemDelegate"></path>
+							<path d="M27571.8 3172.0 L28414.8 3172.0" fill="none" data-name="ReportFormItemDelegate"></path>
 						</g>
-						<g transform="translate(13204.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
+						<g transform="translate(27571.75, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
+								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
+								
+							</g>
+						</g>
+						<g transform="translate(27571.75, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
+								
+							</g>
+						</g>
+						<g transform="translate(27571.75, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="15986.0" y="1284.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M15986.0 1315.0 L16434.0 1315.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M15986.0 1421.0 L16434.0 1421.0" fill="none" data-name="TemporalAggregationFormatted"></path>
+					<g data-name="ReportBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
+							<rect x="17900.5" y="1321.5" height="138.0" width="197.0" data-name="ReportBadge"></rect>
+							<path d="M17900.5 1352.5 L18097.5 1352.5" fill="none" data-name="ReportBadge"></path>
+							<path d="M17900.5 1428.5 L18097.5 1428.5" fill="none" data-name="ReportBadge"></path>
 						</g>
-						<g transform="translate(15986, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
+						<g transform="translate(17900.5, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15986, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
+						<g transform="translate(17900.5, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15986, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
+						<g transform="translate(17900.5, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="17181.3" y="2280.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
+					<g data-name="ReportStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
+							<rect x="10552.3" y="3118.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
+							<path d="M10552.3 3149.0 L10853.3 3149.0" fill="none" data-name="ReportStatus"></path>
 						</g>
-						<g transform="translate(17181.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
+						<g transform="translate(10552.25, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
+								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
+								
+							</g>
+						</g>
+						<g transform="translate(10552.25, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="17089.8" y="1284.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M17089.8 1315.0 L17540.8 1315.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M17089.8 1421.0 L17540.8 1421.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
+					<g data-name="BadgeType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
+							<rect x="28016.0" y="2280.5" height="31.0" width="106.0" data-name="BadgeType"></rect>
 						</g>
-						<g transform="translate(17089.75, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
+						<g transform="translate(28016, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
+								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17089.75, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
+					</g>
+					<g data-name="StudyDesignReportsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
+							<rect x="33733.3" y="3133.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
+							<path d="M33733.3 3164.0 L34126.3 3164.0" fill="none" data-name="StudyDesignReportsFormView"></path>
+						</g>
+						<g transform="translate(33733.25, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
+								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17089.75, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
+						<g transform="translate(33733.25, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="18061.3" y="2280.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
+					<g data-name="ReportsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
+							<rect x="43130.8" y="1329.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
+							<path d="M43130.8 1360.0 L43468.8 1360.0" fill="none" data-name="ReportsFormData"></path>
+							<path d="M43130.8 1406.0 L43468.8 1406.0" fill="none" data-name="ReportsFormData"></path>
 						</g>
-						<g transform="translate(18061.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
+						<g transform="translate(43130.75, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
+								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(43130.75, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(43130.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="9881.3" y="3118.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M9881.3 3149.0 L10264.3 3149.0" fill="none" data-name="ReportSectionType"></path>
+					<g data-name="StudyDesignInterventionsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
+							<rect x="34166.3" y="3140.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
+							<path d="M34166.3 3171.5 L34462.3 3171.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
+						</g>
+						<g transform="translate(34166.25, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(34166.25, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StudyScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
+							<rect x="21886.0" y="1194.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
+							<path d="M21886.0 1225.0 L22644.0 1225.0" fill="none" data-name="StudyScheduleControls"></path>
+							<path d="M21886.0 1526.0 L22644.0 1526.0" fill="none" data-name="StudyScheduleControls"></path>
+						</g>
+						<g transform="translate(21886, 1194)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
+								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
+								
+							</g>
+						</g>
+						<g transform="translate(21886, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
+								
+							</g>
+						</g>
+						<g transform="translate(21886, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="PhaseSequence">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
+							<rect x="30092.0" y="3156.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
+						</g>
+						<g transform="translate(30092, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
+								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="InterventionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
+							<rect x="18921.5" y="1359.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
+							<path d="M18921.5 1390.5 L19296.5 1390.5" fill="none" data-name="InterventionFormView"></path>
 						</g>
-						<g transform="translate(9881.25, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
+						<g transform="translate(18921.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
+								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9881.25, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
+						<g transform="translate(18921.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="12693.0" y="1329.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M12693.0 1360.0 L13172.0 1360.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M12693.0 1421.0 L13172.0 1421.0" fill="none" data-name="AverageSectionFormView"></path>
+					<g data-name="InterventionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
+							<rect x="24408.3" y="2062.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
+							<path d="M24408.3 2093.0 L25263.3 2093.0" fill="none" data-name="InterventionFormViewModel"></path>
+							<path d="M24408.3 2319.0 L25263.3 2319.0" fill="none" data-name="InterventionFormViewModel"></path>
 						</g>
-						<g transform="translate(12693, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
+						<g transform="translate(24408.25, 2062)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
+								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12693, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+						<g transform="translate(24408.25, 2093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12693, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
+						<g transform="translate(24408.25, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="21091.8" y="2009.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M21091.8 2040.5 L22078.8 2040.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M21091.8 2476.5 L22078.8 2476.5" fill="none" data-name="ReportItemFormViewModel"></path>
+					<g data-name="InterventionPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
+							<rect x="15474.5" y="1344.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
+							<path d="M15474.5 1375.0 L15804.5 1375.0" fill="none" data-name="InterventionPreview"></path>
+							<path d="M15474.5 1406.0 L15804.5 1406.0" fill="none" data-name="InterventionPreview"></path>
 						</g>
-						<g transform="translate(21091.75, 2009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
-								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
+						<g transform="translate(15474.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21091.75, 2040.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
+						<g transform="translate(15474.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21091.75, 2476.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
+						<g transform="translate(15474.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="47762.0" y="493.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M47762.0 524.0 L47966.0 524.0" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M47762.0 555.0 L47966.0 555.0" fill="none" data-name="DataReferenceIdentifier"></path>
+					<g data-name="InterventionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
+							<rect x="15523.0" y="2280.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(47762, 493)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
+						<g transform="translate(15523, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47762, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
+					</g>
+					<g data-name="StudyScheduleFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
+							<rect x="22085.5" y="971.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
+							<path d="M22085.5 1002.0 L22444.5 1002.0" fill="none" data-name="StudyScheduleFormView"></path>
+							<path d="M22085.5 1033.0 L22444.5 1033.0" fill="none" data-name="StudyScheduleFormView"></path>
+						</g>
+						<g transform="translate(22085.5, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
+								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47762, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
+						<g transform="translate(22085.5, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="47796.5" y="76.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(47796.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
+						<g transform="translate(22085.5, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="13212.0" y="1329.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M13212.0 1360.0 L13691.0 1360.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M13212.0 1421.0 L13691.0 1421.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+					<g data-name="InterventionsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
+							<rect x="43508.8" y="1321.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
+							<path d="M43508.8 1352.5 L43902.8 1352.5" fill="none" data-name="InterventionsFormData"></path>
+							<path d="M43508.8 1413.5 L43902.8 1413.5" fill="none" data-name="InterventionsFormData"></path>
 						</g>
-						<g transform="translate(13212, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
+						<g transform="translate(43508.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
+								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13212, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+						<g transform="translate(43508.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13212, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
+						<g transform="translate(43508.75, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="21918.5" y="1306.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M21918.5 1337.5 L22385.5 1337.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M21918.5 1413.5 L22385.5 1413.5" fill="none" data-name="ReportItemFormView"></path>
+					<g data-name="StudyScheduleFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
+							<rect x="43676.3" y="2197.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
+							<path d="M43676.3 2228.0 L43972.3 2228.0" fill="none" data-name="StudyScheduleFormData"></path>
+							<path d="M43676.3 2334.0 L43972.3 2334.0" fill="none" data-name="StudyScheduleFormData"></path>
 						</g>
-						<g transform="translate(21918.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
-								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
+						<g transform="translate(43676.25, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21918.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
+						<g transform="translate(43676.25, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21918.5, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
+						<g transform="translate(43676.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="22590.8" y="2280.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
+					<g data-name="InterventionTaskFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
+							<rect x="23603.8" y="2159.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
+							<path d="M23603.8 2190.5 L24299.8 2190.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<path d="M23603.8 2371.5 L24299.8 2371.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
 						</g>
-						<g transform="translate(22590.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
+						<g transform="translate(23603.75, 2159.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(23603.75, 2190.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(23603.75, 2371.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="43057.8" y="2122.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M43057.8 2153.0 L43917.8 2153.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M43057.8 2319.0 L43917.8 2319.0" fill="none" data-name="ReportsFormViewModel"></path>
+					<g data-name="WithScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
+							<rect x="24434.3" y="1239.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
+							<path d="M24434.3 1270.0 L24929.3 1270.0" fill="none" data-name="WithScheduleControls"></path>
+							<path d="M24434.3 1496.0 L24929.3 1496.0" fill="none" data-name="WithScheduleControls"></path>
 						</g>
-						<g transform="translate(43057.75, 2122)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
-								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
+						<g transform="translate(24434.25, 1239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
+								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43057.75, 2153)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
+						<g transform="translate(24434.25, 1270)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43057.75, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
+						<g transform="translate(24434.25, 1496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportFormItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="38461.8" y="3065.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M38461.8 3096.0 L39304.8 3096.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M38461.8 3172.0 L39304.8 3172.0" fill="none" data-name="ReportFormItemDelegate"></path>
+					<g data-name="InterventionTaskFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
+							<rect x="38550.8" y="1306.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
+							<path d="M38550.8 1337.5 L38840.8 1337.5" fill="none" data-name="InterventionTaskFormData"></path>
+							<path d="M38550.8 1428.5 L38840.8 1428.5" fill="none" data-name="InterventionTaskFormData"></path>
 						</g>
-						<g transform="translate(38461.75, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
-								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
+						<g transform="translate(38550.75, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
+								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38461.75, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
+						<g transform="translate(38550.75, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38461.75, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
+						<g transform="translate(38550.75, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="22890.3" y="1321.5" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M22890.3 1352.5 L23087.3 1352.5" fill="none" data-name="ReportBadge"></path>
-							<path d="M22890.3 1428.5 L23087.3 1428.5" fill="none" data-name="ReportBadge"></path>
+					<g data-name="IFormDataWithSchedule">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
+							<rect x="38806.3" y="941.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
+							<path d="M38806.3 972.0 L39104.3 972.0" fill="none" data-name="IFormDataWithSchedule"></path>
+							<path d="M38806.3 1078.0 L39104.3 1078.0" fill="none" data-name="IFormDataWithSchedule"></path>
 						</g>
-						<g transform="translate(22890.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
+						<g transform="translate(38806.25, 941)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
+								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22890.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
+						<g transform="translate(38806.25, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22890.25, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
+						<g transform="translate(38806.25, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="12441.5" y="3118.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M12441.5 3149.0 L12742.5 3149.0" fill="none" data-name="ReportStatus"></path>
+					<g data-name="InterventionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
+							<rect x="38384.3" y="926.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
+							<path d="M38384.3 957.0 L38766.3 957.0" fill="none" data-name="InterventionFormData"></path>
+							<path d="M38384.3 1078.0 L38766.3 1078.0" fill="none" data-name="InterventionFormData"></path>
 						</g>
-						<g transform="translate(12441.5, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
+						<g transform="translate(38384.25, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
+								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12441.5, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
+						<g transform="translate(38384.25, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(38384.25, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="7583.8" y="1329.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M7583.8 1360.0 L7921.8 1360.0" fill="none" data-name="ReportsFormData"></path>
-							<path d="M7583.8 1406.0 L7921.8 1406.0" fill="none" data-name="ReportsFormData"></path>
+					<g data-name="InterventionsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
+							<rect x="28195.3" y="2107.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
+							<path d="M28195.3 2138.0 L29034.3 2138.0" fill="none" data-name="InterventionsFormViewModel"></path>
+							<path d="M28195.3 2289.0 L29034.3 2289.0" fill="none" data-name="InterventionsFormViewModel"></path>
 						</g>
-						<g transform="translate(7583.75, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
+						<g transform="translate(28195.25, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
+								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7583.75, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
+						<g transform="translate(28195.25, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7583.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
+						<g transform="translate(28195.25, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInfoFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="44980.3" y="2054.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M44980.3 2085.5 L45676.3 2085.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M44980.3 2491.5 L45676.3 2491.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-						</g>
-						<g transform="translate(44980.25, 2054.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
-								
-							</g>
+					<g data-name="InterventionTaskFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
+							<rect x="21007.3" y="1359.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
+							<path d="M21007.3 1390.5 L21420.3 1390.5" fill="none" data-name="InterventionTaskFormView"></path>
 						</g>
-						<g transform="translate(44980.25, 2085.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
+						<g transform="translate(21007.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44980.25, 2491.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
+						<g transform="translate(21007.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="StudyDesignInfoFormView">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="15215.5" y="3140.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M15215.5 3171.5 L15438.5 3171.5" fill="none" data-name="StudyDesignInfoFormView"></path>
+							<rect x="34502.3" y="3140.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
+							<path d="M34502.3 3171.5 L34725.3 3171.5" fill="none" data-name="StudyDesignInfoFormView"></path>
 						</g>
-						<g transform="translate(15215.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
+						<g transform="translate(34502.25, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
 								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15215.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
+						<g transform="translate(34502.25, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
 								
@@ -7114,17 +7105,17 @@
 					</g>
 					<g data-name="StudyInfoFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="9688.0" y="1306.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M9688.0 1337.5 L10102.0 1337.5" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M9688.0 1428.5 L10102.0 1428.5" fill="none" data-name="StudyInfoFormData"></path>
+							<rect x="43982.8" y="1306.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
+							<path d="M43982.8 1337.5 L44396.8 1337.5" fill="none" data-name="StudyInfoFormData"></path>
+							<path d="M43982.8 1428.5 L44396.8 1428.5" fill="none" data-name="StudyInfoFormData"></path>
 						</g>
-						<g transform="translate(9688, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
+						<g transform="translate(43982.75, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
 								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9688, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+						<g transform="translate(43982.75, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
@@ -7134,7 +7125,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(9688, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+						<g transform="translate(43982.75, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
@@ -7144,17 +7135,17 @@
 					</g>
 					<g data-name="StudyContactInfoFormData">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="10373.8" y="2182.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M10373.8 2213.0 L10721.8 2213.0" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M10373.8 2364.0 L10721.8 2364.0" fill="none" data-name="StudyContactInfoFormData"></path>
+							<rect x="44139.3" y="2182.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
+							<path d="M44139.3 2213.0 L44487.3 2213.0" fill="none" data-name="StudyContactInfoFormData"></path>
+							<path d="M44139.3 2364.0 L44487.3 2364.0" fill="none" data-name="StudyContactInfoFormData"></path>
 						</g>
-						<g transform="translate(10373.75, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
+						<g transform="translate(44139.25, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
 								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10373.75, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+						<g transform="translate(44139.25, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
@@ -7168,7 +7159,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(10373.75, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+						<g transform="translate(44139.25, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
@@ -7176,786 +7167,556 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormValidationSet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="1545.0" y="3133.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M1545.0 3164.0 L1932.0 3164.0" fill="none" data-name="StudyFormValidationSet"></path>
-						</g>
-						<g transform="translate(1545, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
-								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1545, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="10549.0" y="1329.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M10549.0 1360.0 L11043.0 1360.0" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M10549.0 1406.0 L11043.0 1406.0" fill="none" data-name="MeasurementsFormData"></path>
-						</g>
-						<g transform="translate(10549, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
-								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10549, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10549, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="24145.3" y="1359.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M24145.3 1390.5 L24589.3 1390.5" fill="none" data-name="MeasurementSurveyFormView"></path>
-						</g>
-						<g transform="translate(24145.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24145.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="32494.3" y="2084.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M32494.3 2115.5 L33190.3 2115.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M32494.3 2341.5 L33190.3 2341.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+					<g data-name="StudyInfoFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
+							<rect x="36384.3" y="2054.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
+							<path d="M36384.3 2085.5 L37080.3 2085.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+							<path d="M36384.3 2491.5 L37080.3 2491.5" fill="none" data-name="StudyInfoFormViewModel"></path>
 						</g>
-						<g transform="translate(32494.25, 2084.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
+						<g transform="translate(36384.25, 2054.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32494.25, 2115.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(36384.25, 2085.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32494.25, 2341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
+						<g transform="translate(36384.25, 2491.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="13731.0" y="1344.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M13731.0 1375.0 L14075.0 1375.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M13731.0 1406.0 L14075.0 1406.0" fill="none" data-name="SurveyPreview"></path>
+					<g data-name="ScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
+							<rect x="24465.8" y="971.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
+							<path d="M24465.8 1002.0 L24897.8 1002.0" fill="none" data-name="ScheduleControls"></path>
+							<path d="M24465.8 1033.0 L24897.8 1033.0" fill="none" data-name="ScheduleControls"></path>
 						</g>
-						<g transform="translate(13731, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
+						<g transform="translate(24465.75, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
+								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13731, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
+						<g transform="translate(24465.75, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13731, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
+						<g transform="translate(24465.75, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="13779.5" y="2280.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
+					<g data-name="StudyUTimeOfDay">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
+							<rect x="39007.8" y="1375.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
 						</g>
-						<g transform="translate(13779.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
+						<g transform="translate(39007.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
+								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="35285.0" y="1291.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M35285.0 1322.5 L35694.0 1322.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M35285.0 1443.5 L35694.0 1443.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-						</g>
-						<g transform="translate(35285, 1291.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
-								
-							</g>
+					<g data-name="SurveyQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
+							<rect x="22684.0" y="1352.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M22684.0 1383.0 L23036.0 1383.0" fill="none" data-name="SurveyQuestionFormView"></path>
 						</g>
-						<g transform="translate(35285, 1322.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
+						<g transform="translate(22684, 1352)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35285, 1443.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
+						<g transform="translate(22684, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="25141.5" y="2227.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M25141.5 2258.0 L25509.5 2258.0" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M25141.5 2304.0 L25509.5 2304.0" fill="none" data-name="QuestionnaireFormData"></path>
+					<g data-name="AudioRecordingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
+							<rect x="17217.5" y="1344.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
+							<path d="M17217.5 1375.0 L17569.5 1375.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<path d="M17217.5 1406.0 L17569.5 1406.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
 						</g>
-						<g transform="translate(25141.5, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
+						<g transform="translate(17217.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25141.5, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
+						<g transform="translate(17217.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25141.5, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
+						<g transform="translate(17217.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="39221.3" y="1261.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M39221.3 1292.5 L39853.3 1292.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M39221.3 1398.5 L39853.3 1398.5" fill="none" data-name="WithQuestionnaireControls"></path>
-						</g>
-						<g transform="translate(39221.25, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39221.25, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
+					<g data-name="FreeTextQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
+							<rect x="18137.5" y="1321.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M18137.5 1352.5 L18489.5 1352.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M18137.5 1398.5 L18489.5 1398.5" fill="none" data-name="FreeTextQuestionFormView"></path>
 						</g>
-						<g transform="translate(39221.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
+						<g transform="translate(18137.5, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyDesignMeasurementsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="15478.5" y="3140.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M15478.5 3171.5 L15788.5 3171.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
-						</g>
-						<g transform="translate(15478.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
+						<g transform="translate(18137.5, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15478.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
+						<g transform="translate(18137.5, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="39597.3" y="2114.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M39597.3 2145.5 L40689.3 2145.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M39597.3 2296.5 L40689.3 2296.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+					<g data-name="ChoiceQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
+							<rect x="18529.5" y="1344.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M18529.5 1375.0 L18881.5 1375.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M18529.5 1406.0 L18881.5 1406.0" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(39597.25, 2114.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
-								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
+						<g transform="translate(18529.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39597.25, 2145.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(18529.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39597.25, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
+						<g transform="translate(18529.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="14321.0" y="1329.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M14321.0 1360.0 L14709.0 1360.0" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M14321.0 1421.0 L14709.0 1421.0" fill="none" data-name="StudyFormScaffold"></path>
+					<g data-name="ImageCapturingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
+							<rect x="19336.5" y="1344.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
+							<path d="M19336.5 1375.0 L19688.5 1375.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<path d="M19336.5 1406.0 L19688.5 1406.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
 						</g>
-						<g transform="translate(14321, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
+						<g transform="translate(19336.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14321, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
+						<g transform="translate(19336.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14321, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
+						<g transform="translate(19336.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="T Function(WidgetRef)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="16558.3" y="2280.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
+					<g data-name="BoolQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
+							<rect x="19728.5" y="1344.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M19728.5 1375.0 L20080.5 1375.0" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M19728.5 1406.0 L20080.5 1406.0" fill="none" data-name="BoolQuestionFormView"></path>
 						</g>
-						<g transform="translate(16558.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
+						<g transform="translate(19728.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="16791.3" y="2280.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
-						</g>
-						<g transform="translate(16791.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
+						<g transform="translate(19728.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ConsentItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="33670.3" y="2167.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M33670.3 2198.0 L34366.3 2198.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M33670.3 2364.0 L34366.3 2364.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-						</g>
-						<g transform="translate(33670.25, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
+						<g transform="translate(19728.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33670.25, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+					</g>
+					<g data-name="SurveyQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
+							<rect x="24233.5" y="3088.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M24233.5 3119.0 L24596.5 3119.0" fill="none" data-name="SurveyQuestionType"></path>
+						</g>
+						<g transform="translate(24233.5, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
+								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33670.25, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
+						<g transform="translate(24233.5, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignEnrollmentFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="15828.5" y="3125.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M15828.5 3156.5 L16277.5 3156.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
+					<g data-name="IScaleQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
+							<rect x="40357.8" y="60.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M40357.8 91.5 L40666.8 91.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(15828.5, 3125.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
+						<g transform="translate(40357.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
+								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15828.5, 3156.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
+						<g transform="translate(40357.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IScreenerQuestionLogicFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="29172.0" y="2265.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M29172.0 2296.0 L29504.0 2296.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
+					<g data-name="ScaleQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
+							<rect x="23276.0" y="1359.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M23276.0 1390.5 L23628.0 1390.5" fill="none" data-name="ScaleQuestionFormView"></path>
 						</g>
-						<g transform="translate(29172, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
+						<g transform="translate(23276, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29172, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+						<g transform="translate(23276, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionLogicFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="41711.3" y="2227.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M41711.3 2258.0 L42135.3 2258.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M41711.3 2289.0 L42135.3 2289.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+					<g data-name="QuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
+							<rect x="39950.8" y="896.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M39950.8 927.0 L41118.8 927.0" fill="none" data-name="QuestionFormData"></path>
+							<path d="M39950.8 1063.0 L41118.8 1063.0" fill="none" data-name="QuestionFormData"></path>
 						</g>
-						<g transform="translate(41711.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
-								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
+						<g transform="translate(39950.75, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
+								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41711.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
+						<g transform="translate(39950.75, 927)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41711.25, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
+						<g transform="translate(39950.75, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="31560.5" y="3005.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M31560.5 3036.0 L32122.5 3036.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M31560.5 3217.0 L32122.5 3217.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+					<g data-name="ChoiceQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
+							<rect x="40028.8" y="1306.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M40028.8 1337.5 L40372.8 1337.5" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M40028.8 1398.5 L40372.8 1398.5" fill="none" data-name="ChoiceQuestionFormData"></path>
 						</g>
-						<g transform="translate(31560.5, 3005)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
-								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
+						<g transform="translate(40028.75, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31560.5, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+						<g transform="translate(40028.75, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31560.5, 3217)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
+						<g transform="translate(40028.75, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="26297.3" y="941.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M26297.3 972.0 L26555.3 972.0" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M26297.3 1063.0 L26555.3 1063.0" fill="none" data-name="ConsentItemFormData"></path>
+					<g data-name="BoolQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
+							<rect x="40412.8" y="1321.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M40412.8 1352.5 L40804.8 1352.5" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M40412.8 1398.5 L40804.8 1398.5" fill="none" data-name="BoolQuestionFormData"></path>
 						</g>
-						<g transform="translate(26297.25, 941)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
+						<g transform="translate(40412.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
+								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26297.25, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
+						<g transform="translate(40412.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26297.25, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
+						<g transform="translate(40412.75, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="25257.3" y="1359.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M25257.3 1390.5 L25638.3 1390.5" fill="none" data-name="ConsentItemFormView"></path>
+					<g data-name="ImageQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
+							<rect x="40844.8" y="1321.5" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
+							<path d="M40844.8 1352.5 L41316.8 1352.5" fill="none" data-name="ImageQuestionFormData"></path>
+							<path d="M40844.8 1398.5 L41316.8 1398.5" fill="none" data-name="ImageQuestionFormData"></path>
 						</g>
-						<g transform="translate(25257.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
+						<g transform="translate(40844.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25257.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
+						<g transform="translate(40844.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(40844.75, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="11083.0" y="1306.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M11083.0 1337.5 L11537.0 1337.5" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M11083.0 1428.5 L11537.0 1428.5" fill="none" data-name="EnrollmentFormData"></path>
+					<g data-name="AudioQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
+							<rect x="41356.8" y="1314.0" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
+							<path d="M41356.8 1345.0 L41828.8 1345.0" fill="none" data-name="AudioQuestionFormData"></path>
+							<path d="M41356.8 1406.0 L41828.8 1406.0" fill="none" data-name="AudioQuestionFormData"></path>
 						</g>
-						<g transform="translate(11083, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
-								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
+						<g transform="translate(41356.75, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11083, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
+						<g transform="translate(41356.75, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11083, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
+						<g transform="translate(41356.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="25549.5" y="1627.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M25549.5 1658.0 L26562.5 1658.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M25549.5 2679.0 L26562.5 2679.0" fill="none" data-name="QuestionFormViewModel"></path>
+					<g data-name="ScaleQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
+							<rect x="41868.8" y="1246.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M41868.8 1277.5 L42212.8 1277.5" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M41868.8 1473.5 L42212.8 1473.5" fill="none" data-name="ScaleQuestionFormData"></path>
 						</g>
-						<g transform="translate(25549.5, 1627)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
+						<g transform="translate(41868.75, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25549.5, 1658)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(41868.75, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25549.5, 2679)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
+						<g transform="translate(41868.75, 1473.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="40729.3" y="2047.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M40729.3 2078.0 L41631.3 2078.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M40729.3 2304.0 L41631.3 2304.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+					<g data-name="Color">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
+							<rect x="35963.8" y="2280.5" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(40729.25, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
-								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
+						<g transform="translate(35963.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
+								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40729.25, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
+					</g>
+					<g data-name="FreeTextQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
+							<rect x="42252.8" y="1306.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M42252.8 1337.5 L42596.8 1337.5" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M42252.8 1413.5 L42596.8 1413.5" fill="none" data-name="FreeTextQuestionFormData"></path>
 						</g>
-						<g transform="translate(40729.25, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
+						<g transform="translate(42252.75, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="EnrollmentFormConsentItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="34539.8" y="3065.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M34539.8 3096.0 L35339.8 3096.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M34539.8 3172.0 L35339.8 3172.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-						</g>
-						<g transform="translate(34539.75, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
+						<g transform="translate(42252.75, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34539.75, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
+						<g transform="translate(42252.75, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34539.75, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
+					</g>
+					<g data-name="FreeTextQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
+							<rect x="42707.3" y="2280.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+						</g>
+						<g transform="translate(42707.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
+								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="StudyFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="44972.3" y="1209.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M44972.3 1240.0 L45668.3 1240.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M44972.3 1451.0 L45668.3 1451.0" fill="none" data-name="StudyFormViewModel"></path>
+							<rect x="36179.3" y="1209.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
+							<path d="M36179.3 1240.0 L36875.3 1240.0" fill="none" data-name="StudyFormViewModel"></path>
+							<path d="M36179.3 1451.0 L36875.3 1451.0" fill="none" data-name="StudyFormViewModel"></path>
 						</g>
-						<g transform="translate(44972.25, 1209)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(36179.25, 1209)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
 								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44972.25, 1240)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(36179.25, 1240)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
@@ -7973,7 +7734,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(44972.25, 1451)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+						<g transform="translate(36179.25, 1451)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
@@ -7986,832 +7747,1071 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="31607.3" y="896.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M31607.3 927.0 L32775.3 927.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M31607.3 1063.0 L32775.3 1063.0" fill="none" data-name="QuestionFormData"></path>
+					<g data-name="MeasurementsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
+							<rect x="30191.3" y="2114.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
+							<path d="M30191.3 2145.5 L31283.3 2145.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+							<path d="M30191.3 2296.5 L31283.3 2296.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+						</g>
+						<g transform="translate(30191.25, 2114.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
+								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(30191.25, 2145.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(30191.25, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StudyDesignMeasurementsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
+							<rect x="34765.3" y="3140.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
+							<path d="M34765.3 3171.5 L35075.3 3171.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
+						</g>
+						<g transform="translate(34765.25, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
+								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(34765.25, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="MeasurementsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
+							<rect x="44476.8" y="1329.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
+							<path d="M44476.8 1360.0 L44970.8 1360.0" fill="none" data-name="MeasurementsFormData"></path>
+							<path d="M44476.8 1406.0 L44970.8 1406.0" fill="none" data-name="MeasurementsFormData"></path>
+						</g>
+						<g transform="translate(44476.75, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
+								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(44476.75, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(44476.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="SurveyPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
+							<rect x="20120.5" y="1344.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
+							<path d="M20120.5 1375.0 L20464.5 1375.0" fill="none" data-name="SurveyPreview"></path>
+							<path d="M20120.5 1406.0 L20464.5 1406.0" fill="none" data-name="SurveyPreview"></path>
+						</g>
+						<g transform="translate(20120.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
+								
+							</g>
+						</g>
+						<g transform="translate(20120.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
+								
+							</g>
+						</g>
+						<g transform="translate(20120.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="MeasurementFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
+							<rect x="20169.0" y="2280.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
+						</g>
+						<g transform="translate(20169, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
+								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="MeasurementSurveyFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
+							<rect x="25931.0" y="2084.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
+							<path d="M25931.0 2115.5 L26627.0 2115.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+							<path d="M25931.0 2341.5 L26627.0 2341.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+						</g>
+						<g transform="translate(25931, 2084.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(25931, 2115.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(25931, 2341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="MeasurementSurveyFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
+							<rect x="39207.8" y="1291.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
+							<path d="M39207.8 1322.5 L39616.8 1322.5" fill="none" data-name="MeasurementSurveyFormData"></path>
+							<path d="M39207.8 1443.5 L39616.8 1443.5" fill="none" data-name="MeasurementSurveyFormData"></path>
+						</g>
+						<g transform="translate(39207.75, 1291.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
+								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(39207.75, 1322.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(39207.75, 1443.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="MeasurementSurveyFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
+							<rect x="28050.5" y="1359.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
+							<path d="M28050.5 1390.5 L28494.5 1390.5" fill="none" data-name="MeasurementSurveyFormView"></path>
+						</g>
+						<g transform="translate(28050.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
+								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(28050.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="IStudyAppBarViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
+							<rect x="29074.3" y="2250.0" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
+							<path d="M29074.3 2281.0 L29317.3 2281.0" fill="none" data-name="IStudyAppBarViewModel"></path>
 						</g>
-						<g transform="translate(31607.25, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
+						<g transform="translate(29074.25, 2250)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
+								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31607.25, 927)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
+						<g transform="translate(29074.25, 2281)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31607.25, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
+					</g>
+					<g data-name="IStudyStatusBadgeViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
+							<rect x="28534.5" y="1352.0" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
+							<path d="M28534.5 1383.0 L28819.5 1383.0" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
+						</g>
+						<g transform="translate(28534.5, 1352)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
+								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(28534.5, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="14329.5" y="3088.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M14329.5 3119.0 L14692.5 3119.0" fill="none" data-name="SurveyQuestionType"></path>
+					<g data-name="IStudyNavViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
+							<rect x="29226.8" y="1322.0" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
+							<path d="M29226.8 1353.0 L29467.8 1353.0" fill="none" data-name="IStudyNavViewModel"></path>
 						</g>
-						<g transform="translate(14329.5, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
+						<g transform="translate(29226.75, 1322)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
+								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14329.5, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
+						<g transform="translate(29226.75, 1353)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="32347.0" y="1306.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M32347.0 1337.5 L32691.0 1337.5" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M32347.0 1398.5 L32691.0 1398.5" fill="none" data-name="ChoiceQuestionFormData"></path>
+					<g data-name="StudyScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
+							<rect x="35668.0" y="904.0" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
+							<path d="M35668.0 935.0 L36003.0 935.0" fill="none" data-name="StudyScaffold"></path>
 						</g>
-						<g transform="translate(32347, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
+						<g transform="translate(35668, 904)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
+								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32347, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(35668, 935)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32347, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+					</g>
+					<g data-name="NavbarTab">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
+							<rect x="35738.3" y="1375.0" height="31.0" width="103.0" data-name="NavbarTab"></rect>
+						</g>
+						<g transform="translate(35738.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
+								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="32731.0" y="1321.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M32731.0 1352.5 L33123.0 1352.5" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M32731.0 1398.5 L33123.0 1398.5" fill="none" data-name="BoolQuestionFormData"></path>
+					<g data-name="SingleColumnLayoutType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
+							<rect x="35921.3" y="1375.0" height="31.0" width="218.0" data-name="SingleColumnLayoutType"></rect>
 						</g>
-						<g transform="translate(32731, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
+						<g transform="translate(35921.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
+								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32731, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+					</g>
+					<g data-name="StudyNav">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
+							<rect x="40706.8" y="23.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
+							<path d="M40706.8 54.0 L40939.8 54.0" fill="none" data-name="StudyNav"></path>
+						</g>
+						<g transform="translate(40706.75, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32731, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(40706.75, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="33163.0" y="1321.5" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M33163.0 1352.5 L33635.0 1352.5" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M33163.0 1398.5 L33635.0 1398.5" fill="none" data-name="ImageQuestionFormData"></path>
+					<g data-name="StudyDesignNav">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
+							<rect x="40979.8" y="23.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
+							<path d="M40979.8 54.0 L41267.8 54.0" fill="none" data-name="StudyDesignNav"></path>
 						</g>
-						<g transform="translate(33163, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
+						<g transform="translate(40979.75, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
+								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33163, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(40979.75, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33163, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+					</g>
+					<g data-name="IWithBanner">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
+							<rect x="36699.5" y="1009.5" height="31.0" width="113.0" data-name="IWithBanner"></rect>
+						</g>
+						<g transform="translate(36699.5, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="33675.0" y="1314.0" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M33675.0 1345.0 L34147.0 1345.0" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M33675.0 1406.0 L34147.0 1406.0" fill="none" data-name="AudioQuestionFormData"></path>
+					<g data-name="StudyController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
+							<rect x="7345.0" y="2182.0" height="228.0" width="573.0" data-name="StudyController"></rect>
+							<path d="M7345.0 2213.0 L7918.0 2213.0" fill="none" data-name="StudyController"></path>
+							<path d="M7345.0 2274.0 L7918.0 2274.0" fill="none" data-name="StudyController"></path>
 						</g>
-						<g transform="translate(33675, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
+						<g transform="translate(7345, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
+								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33675, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(7345, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33675, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(7345, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="34187.0" y="1246.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M34187.0 1277.5 L34531.0 1277.5" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M34187.0 1473.5 L34531.0 1473.5" fill="none" data-name="ScaleQuestionFormData"></path>
+					<g data-name="WebFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
+							<rect x="41307.8" y="37.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
+							<path d="M41307.8 68.5 L41476.8 68.5" fill="none" data-name="WebFrame"></path>
+							<path d="M41307.8 114.5 L41476.8 114.5" fill="none" data-name="WebFrame"></path>
 						</g>
-						<g transform="translate(34187, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
+						<g transform="translate(41307.75, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
+								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34187, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
+						<g transform="translate(41307.75, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34187, 1473.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(41307.75, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="34571.0" y="1306.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M34571.0 1337.5 L34915.0 1337.5" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M34571.0 1413.5 L34915.0 1413.5" fill="none" data-name="FreeTextQuestionFormData"></path>
+					<g data-name="DisabledFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
+							<rect x="41516.8" y="60.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
+							<path d="M41516.8 91.5 L41652.8 91.5" fill="none" data-name="DisabledFrame"></path>
 						</g>
-						<g transform="translate(34571, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
+						<g transform="translate(41516.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34571, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(41516.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="PhoneContainer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
+							<rect x="29588.3" y="1284.0" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
+							<path d="M29588.3 1315.0 L29915.3 1315.0" fill="none" data-name="PhoneContainer"></path>
+							<path d="M29588.3 1466.0 L29915.3 1466.0" fill="none" data-name="PhoneContainer"></path>
+						</g>
+						<g transform="translate(29588.25, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
+								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
+								
+							</g>
+						</g>
+						<g transform="translate(29588.25, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
+								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34571, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(29588.25, 1466)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
+								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="34645.0" y="2280.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+					<g data-name="MobileFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
+							<rect x="41692.8" y="60.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
+							<path d="M41692.8 91.5 L41828.8 91.5" fill="none" data-name="MobileFrame"></path>
 						</g>
-						<g transform="translate(34645, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
+						<g transform="translate(41692.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="15202.0" y="1344.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M15202.0 1375.0 L15554.0 1375.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M15202.0 1406.0 L15554.0 1406.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(15202, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
+						<g transform="translate(41692.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15202, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+					</g>
+					<g data-name="DesktopFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
+							<rect x="41868.8" y="60.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
+							<path d="M41868.8 91.5 L42004.8 91.5" fill="none" data-name="DesktopFrame"></path>
+						</g>
+						<g transform="translate(41868.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15202, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
+						<g transform="translate(41868.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="15594.0" y="1321.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M15594.0 1352.5 L15946.0 1352.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M15594.0 1398.5 L15946.0 1398.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+					<g data-name="StudyTestScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
+							<rect x="33962.3" y="2219.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
+							<path d="M33962.3 2250.5 L34162.3 2250.5" fill="none" data-name="StudyTestScreen"></path>
+							<path d="M33962.3 2281.5 L34162.3 2281.5" fill="none" data-name="StudyTestScreen"></path>
 						</g>
-						<g transform="translate(15594, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
+						<g transform="translate(33962.25, 2219.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
+								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15594, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
+						<g transform="translate(33962.25, 2250.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15594, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
+						<g transform="translate(33962.25, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="17580.8" y="1344.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M17580.8 1375.0 L17932.8 1375.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M17580.8 1406.0 L17932.8 1406.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+					<g data-name="StudyStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
+							<rect x="30040.3" y="2280.5" height="31.0" width="111.0" data-name="StudyStatus"></rect>
 						</g>
-						<g transform="translate(17580.75, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
+						<g transform="translate(30040.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
+								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17580.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
+					</g>
+					<g data-name="StudyStatusBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
+							<rect x="30091.8" y="1314.0" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
+							<path d="M30091.8 1345.0 L30332.8 1345.0" fill="none" data-name="StudyStatusBadge"></path>
+							<path d="M30091.8 1436.0 L30332.8 1436.0" fill="none" data-name="StudyStatusBadge"></path>
 						</g>
-						<g transform="translate(17580.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
+						<g transform="translate(30091.75, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
+								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="47971.5" y="60.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M47971.5 91.5 L48280.5 91.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(47971.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
+						<g transform="translate(30091.75, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47971.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(30091.75, 1436)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="29940.5" y="1359.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M29940.5 1390.5 L30292.5 1390.5" fill="none" data-name="ScaleQuestionFormView"></path>
+					<g data-name="TestAppRoutes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
+							<rect x="42044.8" y="23.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
+							<path d="M42044.8 54.0 L42304.8 54.0" fill="none" data-name="TestAppRoutes"></path>
 						</g>
-						<g transform="translate(29940.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
+						<g transform="translate(42044.75, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
+								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29940.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(42044.75, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
+								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="23127.3" y="1344.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M23127.3 1375.0 L23479.3 1375.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M23127.3 1406.0 L23479.3 1406.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-						</g>
-						<g transform="translate(23127.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
-								
-							</g>
+					<g data-name="PreviewFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
+							<rect x="42344.8" y="45.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
+							<path d="M42344.8 76.5 L42635.8 76.5" fill="none" data-name="PreviewFrame"></path>
 						</g>
-						<g transform="translate(23127.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(42344.75, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
+								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23127.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
+						<g transform="translate(42344.75, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="23519.3" y="1344.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M23519.3 1375.0 L23871.3 1375.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M23519.3 1406.0 L23871.3 1406.0" fill="none" data-name="BoolQuestionFormView"></path>
+					<g data-name="StudyFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
+							<rect x="42398.3" y="524.0" height="31.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(23519.25, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
+						<g transform="translate(42398.25, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
+								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23519.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+					</g>
+					<g data-name="StudyTestController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
+							<rect x="7958.0" y="2257.5" height="77.0" width="282.0" data-name="StudyTestController"></rect>
+							<path d="M7958.0 2288.5 L8240.0 2288.5" fill="none" data-name="StudyTestController"></path>
+						</g>
+						<g transform="translate(7958, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23519.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+						<g transform="translate(7958, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="30412.5" y="1352.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M30412.5 1383.0 L30764.5 1383.0" fill="none" data-name="SurveyQuestionFormView"></path>
+					<g data-name="RouteInformation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
+							<rect x="31323.3" y="2227.0" height="138.0" width="152.0" data-name="RouteInformation"></rect>
+							<path d="M31323.3 2258.0 L31475.3 2258.0" fill="none" data-name="RouteInformation"></path>
+							<path d="M31323.3 2334.0 L31475.3 2334.0" fill="none" data-name="RouteInformation"></path>
 						</g>
-						<g transform="translate(30412.5, 1352)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
+						<g transform="translate(31323.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30412.5, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
+						<g transform="translate(31323.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="35734.0" y="1375.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
-						</g>
-						<g transform="translate(35734, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
+						<g transform="translate(31323.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="41994.8" y="971.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M41994.8 1002.0 L42426.8 1002.0" fill="none" data-name="ScheduleControls"></path>
-							<path d="M41994.8 1033.0 L42426.8 1033.0" fill="none" data-name="ScheduleControls"></path>
+					<g data-name="PlatformController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
+							<rect x="31374.5" y="1261.5" height="258.0" width="302.0" data-name="PlatformController"></rect>
+							<path d="M31374.5 1292.5 L31676.5 1292.5" fill="none" data-name="PlatformController"></path>
+							<path d="M31374.5 1383.5 L31676.5 1383.5" fill="none" data-name="PlatformController"></path>
 						</g>
-						<g transform="translate(41994.75, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
+						<g transform="translate(31374.5, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
+								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41994.75, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
+						<g transform="translate(31374.5, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41994.75, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
+						<g transform="translate(31374.5, 1383.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumnHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
-							<rect x="30916.3" y="1329.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
-							<path d="M30916.3 1360.5 L31153.3 1360.5" fill="none" data-name="StudiesTableColumnHeader"></path>
+					<g data-name="WebController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
+							<rect x="31515.3" y="2197.0" height="198.0" width="273.0" data-name="WebController"></rect>
+							<path d="M31515.3 2228.0 L31788.3 2228.0" fill="none" data-name="WebController"></path>
+							<path d="M31515.3 2259.0 L31788.3 2259.0" fill="none" data-name="WebController"></path>
 						</g>
-						<g transform="translate(30916.25, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
-								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
+						<g transform="translate(31515.25, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
+								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30916.25, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
+						<g transform="translate(31515.25, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="31580.5" y="2265.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
-							<path d="M31580.5 2296.0 L31758.5 2296.0" fill="none" data-name="DashboardScreen"></path>
-						</g>
-						<g transform="translate(31580.5, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
+						<g transform="translate(31515.25, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31580.5, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
+					</g>
+					<g data-name="IFrameElement">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
+							<rect x="31584.3" y="3156.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
+						</g>
+						<g transform="translate(31584.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
+								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesFilter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
-							<rect x="13447.5" y="3133.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
-							<path d="M13447.5 3164.0 L13743.5 3164.0" fill="none" data-name="StudiesFilter"></path>
+					<g data-name="MobileController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
+							<rect x="31828.3" y="2212.5" height="167.0" width="191.0" data-name="MobileController"></rect>
+							<path d="M31828.3 2243.5 L32019.3 2243.5" fill="none" data-name="MobileController"></path>
 						</g>
-						<g transform="translate(13447.5, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
+						<g transform="translate(31828.25, 2212.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13447.5, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
+						<g transform="translate(31828.25, 2243.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
+								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
-							<rect x="31193.3" y="1336.5" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
-							<path d="M31193.3 1367.5 L31536.3 1367.5" fill="none" data-name="DashboardScaffold"></path>
-							<path d="M31193.3 1413.5 L31536.3 1413.5" fill="none" data-name="DashboardScaffold"></path>
+					<g data-name="FrameControlsWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
+							<rect x="20676.3" y="1329.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
+							<path d="M20676.3 1360.0 L20967.3 1360.0" fill="none" data-name="FrameControlsWidget"></path>
+							<path d="M20676.3 1421.0 L20967.3 1421.0" fill="none" data-name="FrameControlsWidget"></path>
 						</g>
-						<g transform="translate(31193.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
-								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
+						<g transform="translate(20676.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
+								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31193.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
+						<g transform="translate(20676.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31193.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
+						<g transform="translate(20676.25, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
-							<rect x="17407.3" y="2107.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
-							<path d="M17407.3 2138.0 L18021.3 2138.0" fill="none" data-name="DashboardController"></path>
-							<path d="M17407.3 2259.0 L18021.3 2259.0" fill="none" data-name="DashboardController"></path>
+					<g data-name="StudyParticipationBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
+							<rect x="34785.8" y="1321.5" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
+							<path d="M34785.8 1352.5 L35016.8 1352.5" fill="none" data-name="StudyParticipationBadge"></path>
+							<path d="M34785.8 1428.5 L35016.8 1428.5" fill="none" data-name="StudyParticipationBadge"></path>
 						</g>
-						<g transform="translate(17407.25, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
-								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
+						<g transform="translate(34785.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
+								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17407.25, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
+						<g transform="translate(34785.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17407.25, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
+						<g transform="translate(34785.75, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IUserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="12832.5" y="3156.0" height="31.0" width="143.0" data-name="IUserRepository"></rect>
+					<g data-name="StudySettingsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
+							<rect x="37452.8" y="2167.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
+							<path d="M37452.8 2198.0 L37931.8 2198.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+							<path d="M37452.8 2334.0 L37931.8 2334.0" fill="none" data-name="StudySettingsFormViewModel"></path>
 						</g>
-						<g transform="translate(12832.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
+						<g transform="translate(37452.75, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SearchController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="13015.5" y="3156.0" height="31.0" width="149.0" data-name="SearchController"></rect>
+						<g transform="translate(37452.75, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(13015.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
+						<g transform="translate(37452.75, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumnSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
-							<rect x="48320.5" y="30.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
-							<path d="M48320.5 61.0 L48545.5 61.0" fill="none" data-name="StudiesTableColumnSize"></path>
-							<path d="M48320.5 122.0 L48545.5 122.0" fill="none" data-name="StudiesTableColumnSize"></path>
+					<g data-name="AsyncValue">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
+							<rect x="37433.5" y="3156.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
 						</g>
-						<g transform="translate(48320.5, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
+						<g transform="translate(37433.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
 								
 							</g>
 						</g>
-						<g transform="translate(48320.5, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
+					</g>
+					<g data-name="StudySettingsDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
+							<rect x="34202.3" y="2265.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
+							<path d="M34202.3 2296.0 L34377.3 2296.0" fill="none" data-name="StudySettingsDialog"></path>
+						</g>
+						<g transform="translate(34202.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
+								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(48320.5, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
+						<g transform="translate(34202.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
-							<rect x="31827.0" y="1246.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
-							<path d="M31827.0 1277.5 L32307.0 1277.5" fill="none" data-name="StudiesTable"></path>
-							<path d="M31827.0 1488.5 L32307.0 1488.5" fill="none" data-name="StudiesTable"></path>
-						</g>
-						<g transform="translate(31827, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
-								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
-								
-							</g>
+					<g data-name="AccountSettingsDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
+							<rect x="21460.3" y="1359.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
+							<path d="M21460.3 1390.5 L21654.3 1390.5" fill="none" data-name="AccountSettingsDialog"></path>
 						</g>
-						<g transform="translate(31827, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
+						<g transform="translate(21460.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
+								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31827, 1488.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
+						<g transform="translate(21460.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
-							<rect x="31798.5" y="2280.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
+					<g data-name="PublishDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
+							<rect x="34417.3" y="2265.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
+							<path d="M34417.3 2296.0 L34553.3 2296.0" fill="none" data-name="PublishDialog"></path>
 						</g>
-						<g transform="translate(31798.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
+						<g transform="translate(34417.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<rect x="32077.3" y="2280.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
-						</g>
-						<g transform="translate(32077.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
+						<g transform="translate(34417.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
-							<rect x="1972.0" y="3065.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
-							<path d="M1972.0 3096.5 L2333.0 3096.5" fill="none" data-name="StudiesTableColumn"></path>
+					<g data-name="PublishSuccessDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
+							<rect x="34593.3" y="2265.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
+							<path d="M34593.3 2296.0 L34784.3 2296.0" fill="none" data-name="PublishSuccessDialog"></path>
 						</g>
-						<g transform="translate(1972, 3065.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
-								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
+						<g transform="translate(34593.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1972, 3096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
+						<g transform="translate(34593.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
-							<rect x="33230.3" y="2197.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
-							<path d="M33230.3 2228.5 L33630.3 2228.5" fill="none" data-name="StudiesTableItem"></path>
+					<g data-name="PublishConfirmationDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
+							<rect x="34978.3" y="2265.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
+							<path d="M34978.3 2296.0 L35202.3 2296.0" fill="none" data-name="PublishConfirmationDialog"></path>
 						</g>
-						<g transform="translate(33230.25, 2197.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
-								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
+						<g transform="translate(34978.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
+								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33230.25, 2228.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
+						<g transform="translate(34978.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(Study, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
-							<rect x="32162.5" y="3156.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
+					<g data-name="StudyMonitorScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
+							<rect x="35242.3" y="2265.0" height="62.0" width="176.0" data-name="StudyMonitorScreen"></rect>
+							<path d="M35242.3 2296.0 L35418.3 2296.0" fill="none" data-name="StudyMonitorScreen"></path>
 						</g>
-						<g transform="translate(32162.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
+						<g transform="translate(35242.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
+								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(Study)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
-							<rect x="33009.0" y="3156.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
-						</g>
-						<g transform="translate(33009, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
+						<g transform="translate(35242.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="App">
-						<g fill="#eee8d5" stroke="#33322E" data-name="App">
-							<rect x="48585.5" y="76.0" height="31.0" width="47.0" data-name="App"></rect>
+					<g data-name="IAppDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
+							<rect x="42675.8" y="60.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
+							<path d="M42675.8 91.5 L42872.8 91.5" fill="none" data-name="IAppDelegate"></path>
 						</g>
-						<g transform="translate(48585.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
-								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
+						<g transform="translate(42675.75, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AppContent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
-							<rect x="48672.5" y="76.0" height="31.0" width="109.0" data-name="AppContent"></rect>
-						</g>
-						<g transform="translate(48672.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
+						<g transform="translate(42675.75, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AccountSettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
-							<rect x="23911.3" y="1359.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
-							<path d="M23911.3 1390.5 L24105.3 1390.5" fill="none" data-name="AccountSettingsDialog"></path>
+					<g data-name="AppController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
+							<rect x="42912.8" y="22.5" height="138.0" width="301.0" data-name="AppController"></rect>
+							<path d="M42912.8 53.5 L43213.8 53.5" fill="none" data-name="AppController"></path>
+							<path d="M42912.8 114.5 L43213.8 114.5" fill="none" data-name="AppController"></path>
 						</g>
-						<g transform="translate(23911.25, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
+						<g transform="translate(42912.75, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
+								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23911.25, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
+						<g transform="translate(42912.75, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
+								
+							</g>
+						</g>
+						<g transform="translate(42912.75, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
 								
 							</g>
 						</g>
diff --git a/docs/uml/designer_v2/lib/repositories/uml.svg b/docs/uml/designer_v2/lib/repositories/uml.svg
index 0274e227c..ccd75f31b 100644
--- a/docs/uml/designer_v2/lib/repositories/uml.svg
+++ b/docs/uml/designer_v2/lib/repositories/uml.svg
@@ -1,103 +1,5 @@
-<svg version="1.1" baseProfile="full" width="5267.0" height="2662.0" viewbox="0 0 5267 2662" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;StudyUApi
-	  |
-	  +dynamic saveStudy();
-	  +dynamic fetchStudy();
-	  +dynamic getUserStudies();
-	  +dynamic deleteStudy();
-	  +dynamic saveStudyInvite();
-	  +dynamic fetchStudyInvite();
-	  +dynamic deleteStudyInvite();
-	  +dynamic deleteParticipants();
-	  +dynamic fetchAppConfig();
-	  +dynamic fetchUser();
-	  +dynamic saveUser()
-	]
-	
-	[APIException
-	]
-	
-	[Exception]&lt;:--[APIException]
-	
-	[StudyNotFoundException
-	]
-	
-	[APIException]&lt;:-[StudyNotFoundException]
-	
-	[MeasurementNotFoundException
-	]
-	
-	[APIException]&lt;:-[MeasurementNotFoundException]
-	
-	[QuestionNotFoundException
-	]
-	
-	[APIException]&lt;:-[QuestionNotFoundException]
-	
-	[ConsentItemNotFoundException
-	]
-	
-	[APIException]&lt;:-[ConsentItemNotFoundException]
-	
-	[InterventionNotFoundException
-	]
-	
-	[APIException]&lt;:-[InterventionNotFoundException]
-	
-	[InterventionTaskNotFoundException
-	]
-	
-	[APIException]&lt;:-[InterventionTaskNotFoundException]
-	
-	[ReportNotFoundException
-	]
-	
-	[APIException]&lt;:-[ReportNotFoundException]
-	
-	[ReportSectionNotFoundException
-	]
-	
-	[APIException]&lt;:-[ReportSectionNotFoundException]
-	
-	[StudyInviteNotFoundException
-	]
-	
-	[APIException]&lt;:-[StudyInviteNotFoundException]
-	
-	[UserNotFoundException
-	]
-	
-	[APIException]&lt;:-[UserNotFoundException]
-	
-	[StudyUApiClient
-	  |
-	  +supabaseClient: SupabaseClient;
-	  &lt;static&gt;+studyColumns: List&lt;String&gt;;
-	  &lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;;
-	  +testDelayMilliseconds: int
-	  |
-	  +dynamic deleteParticipants();
-	  +dynamic getUserStudies();
-	  +dynamic fetchStudy();
-	  +dynamic deleteStudy();
-	  +dynamic saveStudy();
-	  +dynamic fetchStudyInvite();
-	  +dynamic saveStudyInvite();
-	  +dynamic deleteStudyInvite();
-	  +dynamic fetchAppConfig();
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  -dynamic _awaitGuarded();
-	  -dynamic _apiException();
-	  -dynamic _testDelay()
-	]
-	
-	[StudyUApiClient]o-[SupabaseClient]
-	[&lt;abstract&gt;SupabaseClientDependant]&lt;:-[StudyUApiClient]
-	[&lt;abstract&gt;SupabaseQueryMixin]&lt;:-[StudyUApiClient]
-	[&lt;abstract&gt;StudyUApi]&lt;:--[StudyUApiClient]
-	
-	[&lt;abstract&gt;IStudyRepository
+<svg version="1.1" baseProfile="full" width="4676.5" height="2677.0" viewbox="0 0 4676.5 2677" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[&lt;abstract&gt;IStudyRepository
 	  |
 	  +dynamic launch();
 	  +dynamic deleteParticipants()
@@ -160,6 +62,32 @@
 	[AppRepository]o-[&lt;abstract&gt;StudyUApi]
 	[&lt;abstract&gt;IAppRepository]&lt;:--[AppRepository]
 	
+	[&lt;abstract&gt;ModelEvent
+	  |
+	  +modelId: String;
+	  +model: T
+	]
+	
+	[IsFetched
+	]
+	
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsFetched]
+	
+	[IsSaving
+	]
+	
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaving]
+	
+	[IsSaved
+	]
+	
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaved]
+	
+	[IsDeleted
+	]
+	
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsDeleted]
+	
 	[WrappedModel
 	  |
 	  -_model: T;
@@ -256,11 +184,6 @@
 	[&lt;abstract&gt;ModelRepository]o-[BehaviorSubject]
 	[&lt;abstract&gt;IModelRepository]&lt;:-[&lt;abstract&gt;ModelRepository]
 	
-	[StudyLaunched
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[StudyLaunched]
-	
 	[&lt;abstract&gt;IInviteCodeRepository
 	  |
 	  +dynamic isCodeAlreadyUsed()
@@ -311,6 +234,37 @@
 	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;IStudyRepository]
 	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[InviteCodeRepositoryDelegate]
 	
+	[StudyLaunched
+	]
+	
+	[&lt;abstract&gt;ModelEvent]&lt;:-[StudyLaunched]
+	
+	[&lt;abstract&gt;SupabaseClientDependant
+	  |
+	  +supabaseClient: SupabaseClient
+	]
+	
+	[&lt;abstract&gt;SupabaseClientDependant]o-[SupabaseClient]
+	
+	[SupabaseQueryError
+	  |
+	  +statusCode: String?;
+	  +message: String;
+	  +details: dynamic
+	]
+	
+	[Exception]&lt;:--[SupabaseQueryError]
+	
+	[&lt;abstract&gt;SupabaseQueryMixin
+	  |
+	  +dynamic deleteAll();
+	  +dynamic getAll();
+	  +dynamic getById();
+	  +dynamic getByColumn();
+	  +List&lt;T&gt; deserializeList();
+	  +T deserializeObject()
+	]
+	
 	[&lt;abstract&gt;IAuthRepository
 	  |
 	  +allowPasswordReset: bool;
@@ -334,7 +288,6 @@
 	[AuthRepository
 	  |
 	  +supabaseClient: SupabaseClient;
-	  +sharedPreferences: SharedPreferences;
 	  +allowPasswordReset: bool;
 	  +authClient: GoTrueClient;
 	  +session: Session?;
@@ -353,7 +306,6 @@
 	]
 	
 	[AuthRepository]o-[SupabaseClient]
-	[AuthRepository]o-[SharedPreferences]
 	[AuthRepository]o-[GoTrueClient]
 	[AuthRepository]o-[Session]
 	[AuthRepository]o-[User]
@@ -399,565 +351,355 @@
 	[PreferenceAction]o-[PreferenceAction]
 	[Enum]&lt;:--[PreferenceAction]
 	
-	[&lt;abstract&gt;ModelEvent
+	[&lt;abstract&gt;StudyUApi
 	  |
-	  +modelId: String;
-	  +model: T
+	  +dynamic saveStudy();
+	  +dynamic fetchStudy();
+	  +dynamic getUserStudies();
+	  +dynamic deleteStudy();
+	  +dynamic saveStudyInvite();
+	  +dynamic fetchStudyInvite();
+	  +dynamic deleteStudyInvite();
+	  +dynamic deleteParticipants();
+	  +dynamic fetchAppConfig();
+	  +dynamic fetchUser();
+	  +dynamic saveUser()
 	]
 	
-	[IsFetched
+	[APIException
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsFetched]
+	[Exception]&lt;:--[APIException]
 	
-	[IsSaving
+	[StudyNotFoundException
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaving]
+	[APIException]&lt;:-[StudyNotFoundException]
 	
-	[IsSaved
+	[MeasurementNotFoundException
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaved]
+	[APIException]&lt;:-[MeasurementNotFoundException]
 	
-	[IsDeleted
+	[QuestionNotFoundException
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsDeleted]
+	[APIException]&lt;:-[QuestionNotFoundException]
 	
-	[&lt;abstract&gt;SupabaseClientDependant
-	  |
-	  +supabaseClient: SupabaseClient
+	[ConsentItemNotFoundException
 	]
 	
-	[&lt;abstract&gt;SupabaseClientDependant]o-[SupabaseClient]
+	[APIException]&lt;:-[ConsentItemNotFoundException]
 	
-	[SupabaseQueryError
-	  |
-	  +statusCode: String?;
-	  +message: String;
-	  +details: dynamic
+	[InterventionNotFoundException
 	]
 	
-	[Exception]&lt;:--[SupabaseQueryError]
+	[APIException]&lt;:-[InterventionNotFoundException]
 	
-	[&lt;abstract&gt;SupabaseQueryMixin
+	[InterventionTaskNotFoundException
+	]
+	
+	[APIException]&lt;:-[InterventionTaskNotFoundException]
+	
+	[ReportNotFoundException
+	]
+	
+	[APIException]&lt;:-[ReportNotFoundException]
+	
+	[ReportSectionNotFoundException
+	]
+	
+	[APIException]&lt;:-[ReportSectionNotFoundException]
+	
+	[StudyInviteNotFoundException
+	]
+	
+	[APIException]&lt;:-[StudyInviteNotFoundException]
+	
+	[UserNotFoundException
+	]
+	
+	[APIException]&lt;:-[UserNotFoundException]
+	
+	[StudyUApiClient
 	  |
-	  +dynamic deleteAll();
-	  +dynamic getAll();
-	  +dynamic getById();
-	  +dynamic getByColumn();
-	  +List&lt;T&gt; deserializeList();
-	  +T deserializeObject()
+	  +supabaseClient: SupabaseClient;
+	  &lt;static&gt;+studyColumns: List&lt;String&gt;;
+	  &lt;static&gt;+studyDisplayColumns: List&lt;String&gt;;
+	  &lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;;
+	  +testDelayMilliseconds: int
+	  |
+	  +dynamic deleteParticipants();
+	  +dynamic getUserStudies();
+	  +dynamic fetchStudy();
+	  +dynamic deleteStudy();
+	  +dynamic saveStudy();
+	  +dynamic fetchStudyInvite();
+	  +dynamic saveStudyInvite();
+	  +dynamic deleteStudyInvite();
+	  +dynamic fetchAppConfig();
+	  +dynamic fetchUser();
+	  +dynamic saveUser();
+	  -dynamic _awaitGuarded();
+	  -dynamic _apiException();
+	  -dynamic _testDelay()
 	]
 	
-	</desc>
+	[StudyUApiClient]o-[SupabaseClient]
+	[&lt;abstract&gt;SupabaseClientDependant]&lt;:-[StudyUApiClient]
+	[&lt;abstract&gt;SupabaseQueryMixin]&lt;:-[StudyUApiClient]
+	[&lt;abstract&gt;StudyUApi]&lt;:--[StudyUApiClient]
+	
+	</desc>
 	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="2662.0" width="5267.0" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="2677.0" width="4676.5" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
 				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
 					<g stroke-dasharray="6 6">
-						<path d="M3701.2 132.9 L1462.5 278 L1462.5 411 L1462.5 411.0 " fill="none"></path>
-					</g>
-					<path d="M3701.5 138.2 L3701.2 132.9 L3700.8 127.6 L3714.5 132.0 Z"></path>
-					<path d="M1388.7 434.6 L108 575 L108 806 L108.0 806.0 " fill="none"></path>
-					<path d="M1389.3 439.9 L1388.7 434.6 L1388.2 429.3 L1402.0 433.1 Z"></path>
-					<path d="M1388.8 436.8 L395.5 575 L395.5 806 L395.5 806.0 " fill="none"></path>
-					<path d="M1389.5 442.0 L1388.8 436.8 L1388.1 431.5 L1402.0 434.9 Z"></path>
-					<path d="M1388.9 440.8 L696 575 L696 806 L696.0 806.0 " fill="none"></path>
-					<path d="M1389.9 446.0 L1388.9 440.8 L1387.9 435.5 L1402.0 438.2 Z"></path>
-					<path d="M1400.7 446.0 L992.5 575 L992.5 806 L992.5 806.0 " fill="none"></path>
-					<path d="M1402.3 451.1 L1400.7 446.0 L1399.1 440.9 L1413.4 442.0 Z"></path>
-					<path d="M1435.8 451.0 L1300.5 575 L1300.5 806 L1300.5 806.0 " fill="none"></path>
-					<path d="M1439.4 454.9 L1435.8 451.0 L1432.2 447.1 L1445.6 442.0 Z"></path>
-					<path d="M1489.2 451.0 L1624.5 575 L1624.5 806 L1624.5 806.0 " fill="none"></path>
-					<path d="M1492.8 447.1 L1489.2 451.0 L1485.6 454.9 L1479.4 442.0 Z"></path>
-					<path d="M1523.8 446.1 L1928 575 L1928 806 L1928.0 806.0 " fill="none"></path>
-					<path d="M1525.4 441.0 L1523.8 446.1 L1522.2 451.1 L1511.1 442.0 Z"></path>
-					<path d="M1536.1 440.9 L2221.5 575 L2221.5 806 L2221.5 806.0 " fill="none"></path>
-					<path d="M1537.1 435.7 L1536.1 440.9 L1535.1 446.1 L1523.0 438.3 Z"></path>
-					<path d="M1536.2 436.7 L2532.5 575 L2532.5 806 L2532.5 806.0 " fill="none"></path>
-					<path d="M1536.9 431.4 L1536.2 436.7 L1535.5 442.0 L1523.0 434.9 Z"></path>
-					<path d="M1536.3 434.7 L2806 575 L2806 806 L2806.0 806.0 " fill="none"></path>
-					<path d="M1536.8 429.4 L1536.3 434.7 L1535.7 440.0 L1523.0 433.2 Z"></path>
-					<path d="M2536.5 2553.7 L2536.5 2555 L2469.0352112676055 2575 L2469.0 2575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2541.8 2544.3 L2536.5 2553.7 L2531.2 2544.3 L2536.5 2535.0 Z"></path>
+						<path d="M1036.4 1060.5 L1039.25 1068 L1039.25 1164 L1039.25 1164 L1039.25 1260 L1039.25 1260 L1039.25 1386.5 L1039.25 1386.5 L1039.25 1513 L1039.25 1513 L1174.9769938650306 1556 L1175.0 1556.0 " fill="none"></path>
 					</g>
-					<path d="M2477.7 2087.4 L2594 2182 L2587.8337801608577 2202 L2587.8 2202.0 " fill="none"></path>
-					<path d="M2481.1 2083.3 L2477.7 2087.4 L2474.3 2091.6 L2467.4 2079.0 Z"></path>
-					<path d="M2604.2 2123.9 L2516.5 2182 L2518.6447721179625 2202 L2518.6 2202.0 " fill="none"></path>
-					<path d="M2607.2 2128.3 L2604.2 2123.9 L2601.3 2119.4 L2615.4 2116.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M2257.8 2152.9 L2295.5 2182 L2321.344504021448 2202 L2321.3 2202.0 " fill="none"></path>
-					</g>
-					<path d="M2261.1 2148.7 L2257.8 2152.9 L2254.6 2157.2 L2247.3 2144.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3623.8 1003.1 L3746.25 1068 L3746.25 1164 L3746.25 1164 L3746.25 1260 L3746.25 1260 L3746.25 1386.5 L3746.25 1386.5 L3746.25 1513 L3746.25 1513 L3713.14263803681 1556 L3713.1 1556.0 " fill="none"></path>
-					</g>
-					<path d="M3626.3 998.4 L3623.8 1003.1 L3621.3 1007.8 L3612.0 996.9 Z"></path>
-					<path d="M3624.4 1811.8 L2289.75 1914 L2247.25 1947.8988095238096 L2247.3 1947.9 " fill="none"></path>
+					<path d="M1041.4 1058.6 L1036.4 1060.5 L1031.4 1062.4 L1031.7 1048.0 Z"></path>
+					<path d="M1149.9 1833.6 L1607.5 1914 L1630.955223880597 1942 L1631.0 1942.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3634.1 1816.5 L3624.4 1811.8 L3633.3 1805.8 L3643.0 1810.4 Z"></path>
+						<path d="M1141.6 1826.8 L1149.9 1833.6 L1139.8 1837.3 L1131.5 1830.4 Z"></path>
 					</g>
-					<path d="M3844.5 1905.2 L3844.5 1914 L3298.25 2019.50990990991 L3298.3 2019.5 " fill="none"></path>
+					<path d="M1150.1 1813.4 L2356.75 1914 L2362.7201492537315 1934 L2362.7 1934.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3849.8 1895.8 L3844.5 1905.2 L3839.2 1895.8 L3844.5 1886.5 Z"></path>
+						<path d="M1141.2 1807.3 L1150.1 1813.4 L1140.4 1817.9 L1131.5 1811.8 Z"></path>
 					</g>
-					<path d="M4064.2 1846.7 L4350.5 1914 L4294.566231343284 2032.5 L4294.6 2032.5 " fill="none"></path>
+					<path d="M711.2 1882.8 L633.5 1914 L646.7649253731344 2032.5 L646.8 2032.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4056.3 1839.3 L4064.2 1846.7 L4053.9 1849.7 L4046.0 1842.4 Z"></path>
+						<path d="M721.8 1884.3 L711.2 1882.8 L717.9 1874.4 L728.5 1875.9 Z"></path>
 					</g>
-					<path d="M4064.3 1837.9 L4453.75 1914 L4453.75 2032.5 L4453.8 2032.5 " fill="none"></path>
+					<path d="M882.1 1903.6 L877.5 1914 L877.5 2032.5 L877.5 2032.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4056.2 1830.9 L4064.3 1837.9 L4054.1 1841.4 L4046.0 1834.4 Z"></path>
+						<path d="M890.7 1897.2 L882.1 1903.6 L881.0 1892.9 L889.6 1886.5 Z"></path>
 					</g>
-					<path d="M3624.5 952.5 L3927.25 1068 L3927.25 1164 L3927.25 1164 L3927.25 1260 L3927.25 1260 L3927.25 1386.5 L3927.25 1386.5 L3927.25 1513 L3927.25 1513 L3927.25 1594.5 L3927.25 1594.5 L3927.25 1676 L3927.25 1676 L3908.127100840336 1703.5 L3908.1 1703.5 " fill="none"></path>
-					<path d="M3626.4 947.5 L3624.5 952.5 L3622.6 957.5 L3612.0 947.8 Z"></path>
+					<path d="M818.7 1059.7 L814.25 1068 L814.25 1164 L814.25 1164 L814.25 1260 L814.25 1260 L814.25 1386.5 L814.25 1386.5 L814.25 1513 L814.25 1513 L814.25 1594.5 L814.25 1594.5 L814.25 1676 L814.25 1676 L840.9989495798319 1703.5 L841.0 1703.5 " fill="none"></path>
+					<path d="M823.4 1062.3 L818.7 1059.7 L814.0 1057.2 L825.0 1048.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3683.5 1646.3 L3683.5 1676 L3720.705882352941 1703.5 L3720.7 1703.5 " fill="none"></path>
+						<path d="M1296.5 1646.3 L1296.5 1676 L1131.5 1729.574351978172 L1131.5 1729.6 " fill="none"></path>
 					</g>
-					<path d="M3688.8 1646.3 L3683.5 1646.3 L3678.2 1646.3 L3683.5 1633.0 Z"></path>
-					<path d="M2249.8 1912.7 L2249.75 1914 L2223.0037313432836 1942 L2223.0 1942.0 " fill="none"></path>
+					<path d="M1301.8 1646.3 L1296.5 1646.3 L1291.2 1646.3 L1296.5 1633.0 Z"></path>
+					<path d="M1936.7 1837.2 L1647.5 1914 L1662.597014925373 1942 L1662.6 1942.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2255.1 1903.3 L2249.8 1912.7 L2244.4 1903.3 L2249.8 1894.0 Z"></path>
+						<path d="M1947.1 1840.0 L1936.7 1837.2 L1944.4 1829.7 L1954.8 1832.4 Z"></path>
 					</g>
-					<path d="M2409.3 1809.5 L3562.75 1914 L3298.25 2000.0266990291261 L3298.3 2000.0 " fill="none"></path>
+					<path d="M2254.1 1857.6 L2396.75 1914 L2396.75 1934 L2396.8 1934.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2400.5 1803.3 L2409.3 1809.5 L2399.6 1813.9 L2390.8 1807.8 Z"></path>
+						<path d="M2247.4 1849.2 L2254.1 1857.6 L2243.5 1859.1 L2236.8 1850.7 Z"></path>
 					</g>
-					<path d="M2249.8 1253.3 L2249.75 1260 L2249.75 1386.5 L2249.75 1386.5 L2249.75 1513 L2249.75 1513 L2249.75 1594.5 L2249.75 1594.5 L2249.75 1676 L2249.75 1676 L2249.75 1696 L2249.8 1696.0 " fill="none"></path>
-					<path d="M2255.1 1253.3 L2249.8 1253.3 L2244.4 1253.3 L2249.8 1240.0 Z"></path>
-					<path d="M1953.8 1867.7 L1953.75 1914 L1996.25 1947.8988095238096 L1996.3 1947.9 " fill="none"></path>
+					<path d="M1999.5 1218.2 L2095.75 1260 L2095.75 1386.5 L2095.75 1386.5 L2095.75 1513 L2095.75 1513 L2095.75 1594.5 L2095.75 1594.5 L2095.75 1676 L2095.75 1676 L2095.75 1696 L2095.8 1696.0 " fill="none"></path>
+					<path d="M2001.6 1213.3 L1999.5 1218.2 L1997.4 1223.1 L1987.3 1212.9 Z"></path>
+					<path d="M1759.8 1867.7 L1759.75 1914 L1751.391791044776 1942 L1751.4 1942.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1959.1 1858.3 L1953.8 1867.7 L1948.4 1858.3 L1953.8 1849.0 Z"></path>
+						<path d="M1765.1 1858.3 L1759.8 1867.7 L1754.4 1858.3 L1759.8 1849.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M1953.8 1646.3 L1953.75 1676 L1953.75 1741 L1953.8 1741.0 " fill="none"></path>
-					</g>
-					<path d="M1959.1 1646.3 L1953.8 1646.3 L1948.4 1646.3 L1953.8 1633.0 Z"></path>
-					<path d="M2383.6 164.2 L2848 278 L2848 411 L2848.0 411.0 " fill="none"></path>
+						<path d="M1759.8 1646.3 L1759.75 1676 L1759.75 1741 L1759.8 1741.0 " fill="none"></path>
+					</g>
+					<path d="M1765.1 1646.3 L1759.8 1646.3 L1754.4 1646.3 L1759.8 1633.0 Z"></path>
+					<path d="M444.6 161.9 L144.75 278 L144.75 411 L144.8 411.0 " fill="none"></path>
+					<path d="M446.5 166.9 L444.6 161.9 L442.6 156.9 L457.0 157.1 Z"></path>
+					<path d="M451.9 174.2 L273.75 278 L273.75 411 L273.8 411.0 " fill="none"></path>
+					<path d="M454.6 178.8 L451.9 174.2 L449.2 169.6 L463.4 167.5 Z"></path>
+					<path d="M486.0 177.4 L395.75 278 L395.75 411 L395.8 411.0 " fill="none"></path>
+					<path d="M490.0 181.0 L486.0 177.4 L482.1 173.9 L494.9 167.5 Z"></path>
+					<path d="M526.6 180.8 L521.25 278 L521.25 411 L521.3 411.0 " fill="none"></path>
+					<path d="M532.0 181.1 L526.6 180.8 L521.3 180.5 L527.4 167.5 Z"></path>
+					<path d="M666.7 271.9 L661.25 278 L661.25 411 L661.3 411.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2375.8 156.8 L2383.6 164.2 L2373.3 167.2 L2365.5 159.8 Z"></path>
+						<path d="M676.9 268.5 L666.7 271.9 L669.0 261.4 L679.2 258.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3761.5 157.8 L3761.5 278 L3761.5 411 L3761.5 411.0 " fill="none"></path>
+						<path d="M2130.4 140.7 L1427.25 278 L1427.25 411 L1427.3 411.0 " fill="none"></path>
 					</g>
-					<path d="M3766.8 157.8 L3761.5 157.8 L3756.2 157.8 L3761.5 144.5 Z"></path>
+					<path d="M2131.4 146.0 L2130.4 140.7 L2129.4 135.5 L2143.5 138.2 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3761.5 455.3 L3761.5 575 L3761.5 806 L3761.5 806.0 " fill="none"></path>
+						<path d="M1427.3 455.3 L1427.25 575 L1427.25 806 L1427.3 806.0 " fill="none"></path>
 					</g>
-					<path d="M3766.8 455.3 L3761.5 455.3 L3756.2 455.3 L3761.5 442.0 Z"></path>
+					<path d="M1432.6 455.3 L1427.3 455.3 L1421.9 455.3 L1427.3 442.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3173.1 154.5 L3281 278 L3281 298 L3281.0 298.0 " fill="none"></path>
+						<path d="M1057.7 154.4 L946.75 278 L946.75 298 L946.8 298.0 " fill="none"></path>
 					</g>
-					<path d="M3177.1 151.0 L3173.1 154.5 L3169.1 158.0 L3164.3 144.5 Z"></path>
-					<path d="M2931.8 905.0 L2249.75 1068 L2249.75 1088 L2249.8 1088.0 " fill="none"></path>
+					<path d="M1061.6 158.0 L1057.7 154.4 L1053.7 150.9 L1066.6 144.5 Z"></path>
+					<path d="M1295.8 914.2 L1874.75 1068 L1874.75 1088 L1874.8 1088.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2942.2 908.0 L2931.8 905.0 L2939.7 897.6 L2950.0 900.6 Z"></path>
+						<path d="M1288.1 906.7 L1295.8 914.2 L1285.4 917.0 L1277.8 909.4 Z"></path>
 					</g>
-					<path d="M2961.7 1059.1 L2949.75 1068 L2949.75 1148.5 L2949.8 1148.5 " fill="none"></path>
+					<path d="M926.9 1066.6 L926.75 1068 L926.75 1148.5 L926.8 1148.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2972.3 1057.9 L2961.7 1059.1 L2966.0 1049.3 L2976.6 1048.0 Z"></path>
+						<path d="M932.9 1057.7 L926.9 1066.6 L922.3 1056.9 L928.4 1048.0 Z"></path>
 					</g>
-					<path d="M3281.0 568.3 L3281 575 L3281 595 L3281.0 595.0 " fill="none"></path>
-					<path d="M3286.3 568.3 L3281.0 568.3 L3275.7 568.3 L3281.0 555.0 Z"></path>
-					<path d="M4609.5 147.0 L3985 278 L3985 411 L3985.0 411.0 " fill="none"></path>
-					<path d="M4610.5 152.2 L4609.5 147.0 L4608.4 141.7 L4622.5 144.2 Z"></path>
+					<path d="M946.8 568.3 L946.75 575 L946.75 595 L946.8 595.0 " fill="none"></path>
+					<path d="M952.1 568.3 L946.8 568.3 L941.4 568.3 L946.8 555.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3197.3 1060.6 L3194.75 1068 L3194.75 1133 L3194.8 1133.0 " fill="none"></path>
+						<path d="M1289.3 1022.4 L1367 1068 L1367 1133 L1367.0 1133.0 " fill="none"></path>
 					</g>
-					<path d="M3202.4 1062.3 L3197.3 1060.6 L3192.3 1058.8 L3201.7 1048.0 Z"></path>
-					<path d="M3501.0 1414.7 L4267.25 1513 L4267.25 1594.5 L4267.25 1594.5 L4267.25 1676 L4267.25 1676 L4267.25 1795 L4267.25 1795 L4267.25 1914 L4267.25 1914 L4284.936567164179 2032.5 L4284.9 2032.5 " fill="none"></path>
+					<path d="M1291.9 1017.8 L1289.3 1022.4 L1286.6 1027.0 L1277.8 1015.6 Z"></path>
+					<path d="M1061.0 1432.3 L673.5 1513 L673.5 1594.5 L673.5 1594.5 L673.5 1676 L673.5 1676 L673.5 1795 L673.5 1795 L673.5 1914 L673.5 1914 L651.3917910447761 2032.5 L651.4 2032.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3492.4 1408.2 L3501.0 1414.7 L3491.1 1418.8 L3482.5 1412.3 Z"></path>
+						<path d="M1071.2 1435.6 L1061.0 1432.3 L1069.0 1425.2 L1079.3 1428.5 Z"></path>
 					</g>
-					<path d="M3060.9 1404.0 L1688.25 1513 L1688.25 1594.5 L1688.25 1594.5 L1688.25 1676 L1688.25 1676 L1688.25 1795 L1688.25 1795 L1688.25 1914 L1688.25 1914 L1996.25 2009.20645905421 L1996.3 2009.2 " fill="none"></path>
+					<path d="M1500.6 1430.4 L1914.75 1513 L1914.75 1594.5 L1914.75 1594.5 L1914.75 1676 L1914.75 1676 L1914.75 1795 L1914.75 1795 L1914.75 1914 L1914.75 1914 L1845.25 1961.7589743589745 L1845.3 1961.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3070.6 1408.6 L3060.9 1404.0 L3069.8 1397.9 L3079.5 1402.5 Z"></path>
+						<path d="M1492.4 1423.3 L1500.6 1430.4 L1490.4 1433.8 L1482.3 1426.7 Z"></path>
 					</g>
-					<path d="M3281.0 1511.7 L3281 1513 L3281 1594.5 L3281 1594.5 L3281 1676 L3281 1676 L3281 1795 L3281 1795 L3281 1914 L3281 1914 L3261.5597014925374 1934 L3261.6 1934.0 " fill="none"></path>
+					<path d="M1500.8 1410.6 L2436.75 1513 L2436.75 1594.5 L2436.75 1594.5 L2436.75 1676 L2436.75 1676 L2436.75 1795 L2436.75 1795 L2436.75 1914 L2436.75 1914 L2430.7798507462685 1934 L2430.8 1934.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3286.3 1502.3 L3281.0 1511.7 L3275.7 1502.3 L3281.0 1493.0 Z"></path>
+						<path d="M1492.1 1404.3 L1500.8 1410.6 L1490.9 1414.9 L1482.3 1408.5 Z"></path>
 					</g>
-					<path d="M3500.1 1462.6 L3645.5 1513 L3665.5490797546013 1556 L3665.5 1556.0 " fill="none"></path>
+					<path d="M1280.8 1511.7 L1280.75 1513 L1289.0598159509202 1556 L1289.1 1556.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3493.1 1454.5 L3500.1 1462.6 L3489.6 1464.5 L3482.5 1456.4 Z"></path>
+						<path d="M1286.1 1502.3 L1280.8 1511.7 L1275.4 1502.3 L1280.8 1493.0 Z"></path>
 					</g>
-					<path d="M3060.9 1404.9 L1768.25 1513 L1768.25 1579 L1768.3 1579.0 " fill="none"></path>
+					<path d="M1061.4 1454.1 L870 1513 L886.1963190184049 1579 L886.2 1579.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3070.6 1409.4 L3060.9 1404.9 L3069.8 1398.8 L3079.5 1403.3 Z"></path>
+						<path d="M1071.9 1456.4 L1061.4 1454.1 L1068.8 1446.2 L1079.3 1448.6 Z"></path>
 					</g>
-					<path d="M3589.8 1056.1 L3605.5 1068 L3605.5 1164 L3605.5 1164 L3605.5 1260 L3605.5 1260 L3482.5 1307.949152542373 L3482.5 1307.9 " fill="none"></path>
-					<path d="M3593.0 1051.8 L3589.8 1056.1 L3586.6 1060.3 L3579.2 1048.0 Z"></path>
+					<path d="M1170.2 1057.7 L1180 1068 L1180 1164 L1180 1164 L1180 1260 L1180 1260 L1195.9288537549407 1280 L1195.9 1280.0 " fill="none"></path>
+					<path d="M1174.1 1054.0 L1170.2 1057.7 L1166.4 1061.4 L1161.1 1048.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3194.8 1208.3 L3194.75 1260 L3208.3863636363635 1280 L3208.4 1280.0 " fill="none"></path>
+						<path d="M1367.0 1208.3 L1367 1260 L1353.3636363636363 1280 L1353.4 1280.0 " fill="none"></path>
 					</g>
-					<path d="M3200.1 1208.3 L3194.8 1208.3 L3189.4 1208.3 L3194.8 1195.0 Z"></path>
-					<path d="M1728.3 1511.7 L1728.25 1513 L1760.6426380368098 1579 L1760.6 1579.0 " fill="none"></path>
+					<path d="M1372.3 1208.3 L1367.0 1208.3 L1361.7 1208.3 L1367.0 1195.0 Z"></path>
+					<path d="M1537.1 1414.5 L946.75 1513 L900.7929447852761 1579 L900.8 1579.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1733.6 1502.3 L1728.3 1511.7 L1722.9 1502.3 L1728.3 1493.0 Z"></path>
+						<path d="M1547.2 1418.2 L1537.1 1414.5 L1545.4 1407.7 L1555.5 1411.4 Z"></path>
 					</g>
-					<path d="M1650.9 1508.8 L1648.25 1513 L1648.25 1594.5 L1648.25 1594.5 L1648.25 1676 L1648.25 1676 L1648.25 1795 L1648.25 1795 L1648.25 1914 L1648.25 1914 L1996.25 2012.4836325237593 L1996.3 2012.5 " fill="none"></path>
+					<path d="M1872.7 1423.6 L2276.75 1513 L2276.75 1594.5 L2276.75 1594.5 L2276.75 1676 L2276.75 1676 L2276.75 1795 L2276.75 1795 L2276.75 1914 L2276.75 1914 L1845.25 2017.8078994614004 L1845.3 2017.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1660.4 1503.7 L1650.9 1508.8 L1651.4 1498.0 L1660.9 1493.0 Z"></path>
+						<path d="M1864.8 1416.4 L1872.7 1423.6 L1862.5 1426.8 L1854.5 1419.6 Z"></path>
 					</g>
-					<path d="M1896.4 1398.0 L3582.75 1513 L3635.9064417177915 1556 L3635.9 1556.0 " fill="none"></path>
+					<path d="M1705.0 1511.7 L1705 1513 L1422 1569.4614443084456 L1422.0 1569.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1887.4 1392.0 L1896.4 1398.0 L1886.7 1402.7 L1877.8 1396.7 Z"></path>
+						<path d="M1710.3 1502.3 L1705.0 1511.7 L1699.7 1502.3 L1705.0 1493.0 Z"></path>
 					</g>
-					<path d="M2124.1 1187.1 L1728.25 1260 L1728.25 1280 L1728.3 1280.0 " fill="none"></path>
-					<path d="M2125.1 1192.4 L2124.1 1187.1 L2123.2 1181.9 L2137.3 1184.7 Z"></path>
-					<path d="M2985.9 2114.0 L2816 2182 L2816 2368.5 L2816 2368.5 L2816 2555 L2816 2555 L2816 2575 L2816.0 2575.0 " fill="none"></path>
+					<path d="M1750.6 1234.2 L1705 1260 L1705 1280 L1705.0 1280.0 " fill="none"></path>
+					<path d="M1753.3 1238.8 L1750.6 1234.2 L1748.0 1229.5 L1762.3 1227.6 Z"></path>
+					<path d="M615.2 140.4 L1650.75 278 L1650.75 411 L1650.8 411.0 " fill="none"></path>
+					<path d="M615.9 135.1 L615.2 140.4 L614.5 145.7 L602.0 138.6 Z"></path>
+					<path d="M136.6 2097.6 L127.5 2182 L127.5 2376 L127.5 2376 L127.5 2570 L127.5 2570 L205.95070422535213 2590 L206.0 2590.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2996.6 2115.5 L2985.9 2114.0 L2992.6 2105.6 L3003.3 2107.0 Z"></path>
+						<path d="M142.9 2088.9 L136.6 2097.6 L132.3 2087.7 L138.6 2079.0 Z"></path>
 					</g>
-					<path d="M3251.6 2176.7 L3255.75 2182 L3255.75 2368.5 L3255.75 2368.5 L3255.75 2555 L3255.75 2555 L3255.75 2575 L3255.8 2575.0 " fill="none"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M2143.1 149.9 L1852.25 278 L1852.25 380.5 L1852.3 380.5 " fill="none"></path>
+					</g>
+					<path d="M2145.3 154.8 L2143.1 149.9 L2141.0 145.0 L2155.3 144.5 Z"></path>
+					<path d="M2306.3 2177.3 L2303 2182 L2303 2376 L2303 2376 L2303 2570 L2303 2570 L2303 2590 L2303.0 2590.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3250.0 2166.1 L3251.6 2176.7 L3241.6 2172.6 L3240.1 2162.0 Z"></path>
+						<path d="M2316.0 2172.7 L2306.3 2177.3 L2307.3 2166.6 L2317.0 2162.0 Z"></path>
 					</g>
-					<path d="M3030.3 1823.8 L3030.25 1914 L3048.2350746268658 1934 L3048.2 1934.0 " fill="none"></path>
-					<path d="M3035.6 1823.8 L3030.3 1823.8 L3024.9 1823.8 L3030.3 1810.5 Z"></path>
-					<path d="M2857.6 2413.8 L2272 2555 L2353.549295774648 2575 L2353.5 2575.0 " fill="none"></path>
+					<path d="M2561.1 2126.3 L2678 2182 L2678 2376 L2678 2376 L2678 2570 L2678 2570 L2678 2590 L2678.0 2590.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2867.9 2416.8 L2857.6 2413.8 L2865.4 2406.5 L2875.8 2409.5 Z"></path>
+						<path d="M2555.0 2117.5 L2561.1 2126.3 L2550.4 2127.1 L2544.3 2118.3 Z"></path>
 					</g>
-					<path d="M3232.5 2461.6 L3419.75 2555 L3419.75 2575 L3419.8 2575.0 " fill="none"></path>
+					<path d="M2538.3 1823.8 L2538.25 1914 L2517.1305970149256 1934 L2517.1 1934.0 " fill="none"></path>
+					<path d="M2543.6 1823.8 L2538.3 1823.8 L2532.9 1823.8 L2538.3 1810.5 Z"></path>
+					<path d="M2324.4 2390.5 L267.25 2570 L266.96830985915494 2590 L267.0 2590.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3226.5 2452.7 L3232.5 2461.6 L3221.7 2462.2 L3215.8 2453.3 Z"></path>
+						<path d="M2334.2 2395.0 L2324.4 2390.5 L2333.2 2384.4 L2343.0 2388.9 Z"></path>
 					</g>
-					<path d="M3233.5 2431.2 L3604.25 2555 L3604.25 2575 L3604.3 2575.0 " fill="none"></path>
+					<path d="M2654.1 2473.0 L2817.5 2570 L2817.5 2590 L2817.5 2590.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3226.3 2423.2 L3233.5 2431.2 L3222.9 2433.3 L3215.8 2425.3 Z"></path>
+						<path d="M2648.7 2463.7 L2654.1 2473.0 L2643.3 2472.9 L2638.0 2463.5 Z"></path>
 					</g>
-					<path d="M3045.8 2538.7 L3045.75 2555 L3216.25 2583.822619047619 L3216.3 2583.8 " fill="none"></path>
+					<path d="M2653.5 2486.2 L2777.5 2570 L2717.5 2591.407035175879 L2717.5 2591.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3051.1 2529.3 L3045.8 2538.7 L3040.4 2529.3 L3045.8 2520.0 Z"></path>
+						<path d="M2648.7 2476.5 L2653.5 2486.2 L2642.7 2485.3 L2638.0 2475.7 Z"></path>
 					</g>
-					<path d="M2858.4 2443.0 L2576.5 2555 L2789.5 2586.572025052192 L2789.5 2586.6 " fill="none"></path>
+					<path d="M2490.5 2538.7 L2490.5 2570 L2329.5 2600.482666666667 L2329.5 2600.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2869.0 2444.5 L2858.4 2443.0 L2865.1 2434.6 L2875.8 2436.1 Z"></path>
+						<path d="M2495.8 2529.3 L2490.5 2538.7 L2485.2 2529.3 L2490.5 2520.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3053.2 2172.5 L3045.75 2182 L3045.75 2217 L3045.8 2217.0 " fill="none"></path>
+						<path d="M2484.2 2172.9 L2490.5 2182 L2490.5 2232 L2490.5 2232.0 " fill="none"></path>
 					</g>
-					<path d="M3057.4 2175.8 L3053.2 2172.5 L3049.0 2169.2 L3061.4 2162.0 Z"></path>
-					<path d="M4245.7 1616.0 L4659 1676 L4659 1795 L4659 1795 L4659 1914 L4659 1914 L4625.174440298508 2032.5 L4625.2 2032.5 " fill="none"></path>
+					<path d="M2488.5 2169.9 L2484.2 2172.9 L2479.8 2176.0 L2476.5 2162.0 Z"></path>
+					<path d="M2927.8 1660.7 L2961.75 1676 L2961.75 1795 L2961.75 1795 L2961.75 1914 L2961.75 1914 L2961.75 2032.5 L2961.8 2032.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4237.3 1609.4 L4245.7 1616.0 L4235.7 1620.0 L4227.3 1613.4 Z"></path>
+						<path d="M2921.5 1652.0 L2927.8 1660.7 L2917.1 1661.7 L2910.8 1653.0 Z"></path>
 					</g>
-					<path d="M3302.4 1805.2 L1608.25 1914 L1996.25 2015.2502434274586 L1996.3 2015.3 " fill="none"></path>
+					<path d="M2621.7 1835.8 L2316.75 1914 L1845.25 2019.8308207705193 L1845.3 2019.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3312.0 1810.0 L3302.4 1805.2 L3311.3 1799.3 L3321.0 1804.1 Z"></path>
+						<path d="M2632.0 1838.6 L2621.7 1835.8 L2629.4 1828.3 L2639.8 1831.2 Z"></path>
 					</g>
-					<path d="M3302.4 1811.8 L2329.75 1914 L3003.25 2023.9257003654081 L3003.3 2023.9 " fill="none"></path>
+					<path d="M2780.8 1897.7 L2780.75 1914 L2544.25 1996.5286458333333 L2544.3 1996.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3312.3 1816.1 L3302.4 1811.8 L3311.2 1805.5 L3321.0 1809.8 Z"></path>
+						<path d="M2786.1 1888.3 L2780.8 1897.7 L2775.4 1888.3 L2780.8 1879.0 Z"></path>
 					</g>
-					<path d="M3621.6 1809.9 L4737.25 1914 L4737.25 2032.5 L4737.3 2032.5 " fill="none"></path>
+					<path d="M2939.1 1858.3 L3078.25 1914 L3078.25 2032.5 L3078.3 2032.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3612.8 1803.7 L3621.6 1809.9 L3611.8 1814.3 L3603.0 1808.2 Z"></path>
+						<path d="M2932.4 1849.9 L2939.1 1858.3 L2928.4 1859.8 L2921.8 1851.4 Z"></path>
 					</g>
-					<path d="M3621.6 1812.3 L4557.25 1914 L4613.4048507462685 2032.5 L4613.4 2032.5 " fill="none"></path>
+					<path d="M2938.7 1868.0 L3038.25 1914 L2970.598880597015 2032.5 L2970.6 2032.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3612.9 1806.0 L3621.6 1812.3 L3611.7 1816.6 L3603.0 1810.3 Z"></path>
+						<path d="M2932.5 1859.2 L2938.7 1868.0 L2928.0 1868.9 L2921.8 1860.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3954.0 1612.9 L3462 1676 L3462 1711 L3462.0 1711.0 " fill="none"></path>
+						<path d="M2780.8 1669.3 L2780.75 1676 L2780.75 1711 L2780.8 1711.0 " fill="none"></path>
 					</g>
-					<path d="M3954.7 1618.2 L3954.0 1612.9 L3953.3 1607.6 L3967.3 1611.2 Z"></path>
-					<path d="M4447.0 376.3 L4459 373 L4466.5 373 L4466.5 373 L4474 426.5 L4474 426.5 L4466.5 480 L4466.5 480 L4459 480 L4459 480 L4429 471.8527918781726 L4429.0 471.9 " fill="none"></path>
+					<path d="M2786.1 1669.3 L2780.8 1669.3 L2775.4 1669.3 L2780.8 1656.0 Z"></path>
+					<path d="M2335.8 376.3 L2347.75 373 L2355.25 373 L2355.25 373 L2362.75 426.5 L2362.75 426.5 L2355.25 480 L2355.25 480 L2347.75 480 L2347.75 480 L2317.75 471.8527918781726 L2317.8 471.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4436.6 373.6 L4447.0 376.3 L4439.4 383.8 L4429.0 381.1 Z"></path>
+						<path d="M2325.4 373.6 L2335.8 376.3 L2328.2 383.8 L2317.8 381.1 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M4268.7 157.8 L4262 278 L4262 373 L4262.0 373.0 " fill="none"></path>
-					</g>
-					<path d="M4274.0 158.1 L4268.7 157.8 L4263.3 157.5 L4269.4 144.5 Z"></path>
-					<path d="M4652.9 177.6 L4566 278 L4566 411 L4566.0 411.0 " fill="none"></path>
-					<path d="M4657.0 181.1 L4652.9 177.6 L4648.9 174.1 L4661.7 167.5 Z"></path>
-					<path d="M4695.0 180.8 L4695 278 L4695 411 L4695.0 411.0 " fill="none"></path>
-					<path d="M4700.3 180.8 L4695.0 180.8 L4689.7 180.8 L4695.0 167.5 Z"></path>
-					<path d="M4735.0 177.8 L4817 278 L4817 411 L4817.0 411.0 " fill="none"></path>
-					<path d="M4739.1 174.4 L4735.0 177.8 L4730.8 181.2 L4726.5 167.5 Z"></path>
-					<path d="M4770.4 174.4 L4942.5 278 L4942.5 411 L4942.5 411.0 " fill="none"></path>
-					<path d="M4773.1 169.8 L4770.4 174.4 L4767.6 178.9 L4759.0 167.5 Z"></path>
-					<path d="M2368.2 2089.5 L2232 2182 L2232 2368.5 L2232 2368.5 L2232 2555 L2232 2555 L2346.25 2576.953315290934 L2346.3 2577.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2378.9 2088.7 L2368.2 2089.5 L2372.9 2079.8 L2383.6 2079.0 Z"></path>
+						<path d="M2446.3 147.8 L2150.75 278 L2150.75 373 L2150.8 373.0 " fill="none"></path>
 					</g>
+					<path d="M2448.4 152.7 L2446.3 147.8 L2444.1 142.9 L2458.5 142.4 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3821.8 135.6 L5119.5 278 L5119.5 380.5 L5119.5 380.5 " fill="none"></path>
-					</g>
-					<path d="M3822.3 130.3 L3821.8 135.6 L3821.2 140.9 L3808.5 134.2 Z"></path>
-					<g data-name="StudyUApi">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApi">
-							<rect x="1996.3" y="1942.0" height="212.0" width="251.0" data-name="StudyUApi"></rect>
-							<path d="M1996.3 1973.0 L2247.3 1973.0" fill="none" data-name="StudyUApi"></path>
-						</g>
-						<g transform="translate(1996.25, 1942)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyUApi">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApi">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApi">StudyUApi</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1996.25, 1973)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApi">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApi">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApi">+dynamic saveStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApi">+dynamic getUserStudies()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApi">+dynamic saveStudyInvite()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudyInvite()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudyInvite()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApi">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApi">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApi">+dynamic fetchUser()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApi">+dynamic saveUser()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="APIException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="APIException">
-							<rect x="1402.0" y="411.0" height="31.0" width="121.0" data-name="APIException"></rect>
-						</g>
-						<g transform="translate(1402, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="APIException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="APIException">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="APIException">APIException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Exception">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="3714.5" y="113.5" height="31.0" width="94.0" data-name="Exception"></rect>
-						</g>
-						<g transform="translate(3714.5, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotFoundException">
-							<rect x="0.0" y="806.0" height="31.0" width="216.0" data-name="StudyNotFoundException"></rect>
-						</g>
-						<g transform="translate(0, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotFoundException">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotFoundException">StudyNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementNotFoundException">
-							<rect x="256.0" y="806.0" height="31.0" width="279.0" data-name="MeasurementNotFoundException"></rect>
-						</g>
-						<g transform="translate(256, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementNotFoundException">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementNotFoundException">MeasurementNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionNotFoundException">
-							<rect x="575.0" y="806.0" height="31.0" width="242.0" data-name="QuestionNotFoundException"></rect>
-						</g>
-						<g transform="translate(575, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionNotFoundException">
-								<text x="113.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionNotFoundException">QuestionNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemNotFoundException">
-							<rect x="857.0" y="806.0" height="31.0" width="271.0" data-name="ConsentItemNotFoundException"></rect>
-						</g>
-						<g transform="translate(857, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemNotFoundException">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemNotFoundException">ConsentItemNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionNotFoundException">
-							<rect x="1168.0" y="806.0" height="31.0" width="265.0" data-name="InterventionNotFoundException"></rect>
-						</g>
-						<g transform="translate(1168, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionNotFoundException">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionNotFoundException">InterventionNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskNotFoundException">
-							<rect x="1473.0" y="806.0" height="31.0" width="303.0" data-name="InterventionTaskNotFoundException"></rect>
-						</g>
-						<g transform="translate(1473, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskNotFoundException">
-								<text x="143.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskNotFoundException">InterventionTaskNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportNotFoundException">
-							<rect x="1816.0" y="806.0" height="31.0" width="224.0" data-name="ReportNotFoundException"></rect>
-						</g>
-						<g transform="translate(1816, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportNotFoundException">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportNotFoundException">ReportNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionNotFoundException">
-							<rect x="2080.0" y="806.0" height="31.0" width="283.0" data-name="ReportSectionNotFoundException"></rect>
-						</g>
-						<g transform="translate(2080, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionNotFoundException">
-								<text x="133.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionNotFoundException">ReportSectionNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInviteNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInviteNotFoundException">
-							<rect x="2403.0" y="806.0" height="31.0" width="259.0" data-name="StudyInviteNotFoundException"></rect>
-						</g>
-						<g transform="translate(2403, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInviteNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInviteNotFoundException">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInviteNotFoundException">StudyInviteNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="UserNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UserNotFoundException">
-							<rect x="2702.0" y="806.0" height="31.0" width="208.0" data-name="UserNotFoundException"></rect>
-						</g>
-						<g transform="translate(2702, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserNotFoundException">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserNotFoundException">UserNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUApiClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApiClient">
-							<rect x="2297.0" y="2202.0" height="333.0" width="479.0" data-name="StudyUApiClient"></rect>
-							<path d="M2297.0 2233.0 L2776.0 2233.0" fill="none" data-name="StudyUApiClient"></path>
-							<path d="M2297.0 2309.0 L2776.0 2309.0" fill="none" data-name="StudyUApiClient"></path>
-						</g>
-						<g transform="translate(2297, 2202)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApiClient">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApiClient">StudyUApiClient</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2297, 2233)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+supabaseClient: SupabaseClient</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyColumns: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+testDelayMilliseconds: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2297, 2309)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">+dynamic getUserStudies()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudy()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudyInvite()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudyInvite()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudyInvite()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchUser()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApiClient">+dynamic saveUser()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyUApiClient">-dynamic _awaitGuarded()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyUApiClient">-dynamic _apiException()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyUApiClient">-dynamic _testDelay()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClient">
-							<rect x="2346.3" y="2575.0" height="31.0" width="141.0" data-name="SupabaseClient"></rect>
-						</g>
-						<g transform="translate(2346.25, 2575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClient">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClient">SupabaseClient</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseClientDependant">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClientDependant">
-							<rect x="2287.3" y="2017.0" height="62.0" width="284.0" data-name="SupabaseClientDependant"></rect>
-							<path d="M2287.3 2048.0 L2571.3 2048.0" fill="none" data-name="SupabaseClientDependant"></path>
-						</g>
-						<g transform="translate(2287.25, 2017)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseClientDependant">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClientDependant">
-								<text x="134.0" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClientDependant">SupabaseClientDependant</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2287.25, 2048)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseClientDependant">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseClientDependant">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseClientDependant">+supabaseClient: SupabaseClient</text>
-								
-							</g>
-						</g>
+						<path d="M2250.7 138.1 L3173 278 L3173 411 L3173.0 411.0 " fill="none"></path>
+					</g>
+					<path d="M2251.5 132.9 L2250.7 138.1 L2249.9 143.4 L2237.5 136.1 Z"></path>
+					<path d="M3099.2 434.6 L1818.5 575 L1818.5 806 L1818.5 806.0 " fill="none"></path>
+					<path d="M3099.8 439.9 L3099.2 434.6 L3098.7 429.3 L3112.5 433.1 Z"></path>
+					<path d="M3099.3 436.8 L2106 575 L2106 806 L2106.0 806.0 " fill="none"></path>
+					<path d="M3100.0 442.0 L3099.3 436.8 L3098.6 431.5 L3112.5 434.9 Z"></path>
+					<path d="M3099.4 440.8 L2406.5 575 L2406.5 806 L2406.5 806.0 " fill="none"></path>
+					<path d="M3100.4 446.0 L3099.4 440.8 L3098.4 435.5 L3112.5 438.2 Z"></path>
+					<path d="M3111.2 446.0 L2703 575 L2703 806 L2703.0 806.0 " fill="none"></path>
+					<path d="M3112.8 451.1 L3111.2 446.0 L3109.6 440.9 L3123.9 442.0 Z"></path>
+					<path d="M3146.3 451.0 L3011 575 L3011 806 L3011.0 806.0 " fill="none"></path>
+					<path d="M3149.9 454.9 L3146.3 451.0 L3142.7 447.1 L3156.1 442.0 Z"></path>
+					<path d="M3199.7 451.0 L3335 575 L3335 806 L3335.0 806.0 " fill="none"></path>
+					<path d="M3203.3 447.1 L3199.7 451.0 L3196.1 454.9 L3189.9 442.0 Z"></path>
+					<path d="M3234.3 446.1 L3638.5 575 L3638.5 806 L3638.5 806.0 " fill="none"></path>
+					<path d="M3235.9 441.0 L3234.3 446.1 L3232.7 451.1 L3221.6 442.0 Z"></path>
+					<path d="M3246.6 440.9 L3932 575 L3932 806 L3932.0 806.0 " fill="none"></path>
+					<path d="M3247.6 435.7 L3246.6 440.9 L3245.6 446.1 L3233.5 438.3 Z"></path>
+					<path d="M3246.7 436.7 L4243 575 L4243 806 L4243.0 806.0 " fill="none"></path>
+					<path d="M3247.4 431.4 L3246.7 436.7 L3246.0 442.0 L3233.5 434.9 Z"></path>
+					<path d="M3246.8 434.7 L4516.5 575 L4516.5 806 L4516.5 806.0 " fill="none"></path>
+					<path d="M3247.3 429.4 L3246.8 434.7 L3246.2 440.0 L3233.5 433.2 Z"></path>
+					<path d="M426.5 2568.7 L426.5 2570 L336.5 2590 L336.5 2590.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M431.8 2559.3 L426.5 2568.7 L421.2 2559.3 L426.5 2550.0 Z"></path>
 					</g>
-					<g data-name="SupabaseQueryMixin">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryMixin">
-							<rect x="2611.3" y="1979.5" height="137.0" width="215.0" data-name="SupabaseQueryMixin"></rect>
-							<path d="M2611.3 2010.5 L2826.3 2010.5" fill="none" data-name="SupabaseQueryMixin"></path>
-						</g>
-						<g transform="translate(2611.25, 1979.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseQueryMixin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryMixin">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryMixin">SupabaseQueryMixin</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2611.25, 2010.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryMixin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryMixin">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic deleteAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getById()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getByColumn()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseQueryMixin">+List&lt;T&gt; deserializeList()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SupabaseQueryMixin">+T deserializeObject()</text>
-								
-							</g>
-						</g>
+					<path d="M185.3 2088.1 L286.75 2182 L301.15721649484533 2202 L301.2 2202.0 " fill="none"></path>
+					<path d="M188.9 2084.1 L185.3 2088.1 L181.6 2092.0 L175.5 2079.0 Z"></path>
+					<path d="M446.5 2129.8 L446.5 2182 L444.4381443298969 2202 L444.4 2202.0 " fill="none"></path>
+					<path d="M451.8 2129.8 L446.5 2129.8 L441.2 2129.8 L446.5 2116.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M1719.8 2167.3 L1719.75 2182 L666 2340.072685095689 L666.0 2340.1 " fill="none"></path>
 					</g>
+					<path d="M1725.1 2167.3 L1719.8 2167.3 L1714.4 2167.3 L1719.8 2154.0 Z"></path>
 					<g data-name="IStudyRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="3558.0" y="1556.0" height="77.0" width="251.0" data-name="IStudyRepository"></rect>
-							<path d="M3558.0 1587.0 L3809.0 1587.0" fill="none" data-name="IStudyRepository"></path>
+							<rect x="1171.0" y="1556.0" height="77.0" width="251.0" data-name="IStudyRepository"></rect>
+							<path d="M1171.0 1587.0 L1422.0 1587.0" fill="none" data-name="IStudyRepository"></path>
 						</g>
-						<g transform="translate(3558, 1556)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
+						<g transform="translate(1171, 1556)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
 								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3558, 1587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyRepository">
+						<g transform="translate(1171, 1587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyRepository">+dynamic launch()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IStudyRepository">+dynamic deleteParticipants()</text>
@@ -967,17 +709,17 @@
 					</g>
 					<g data-name="ModelRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepository">
-							<rect x="2950.0" y="595.0" height="453.0" width="662.0" data-name="ModelRepository"></rect>
-							<path d="M2950.0 626.0 L3612.0 626.0" fill="none" data-name="ModelRepository"></path>
-							<path d="M2950.0 732.0 L3612.0 732.0" fill="none" data-name="ModelRepository"></path>
+							<rect x="615.8" y="595.0" height="453.0" width="662.0" data-name="ModelRepository"></rect>
+							<path d="M615.8 626.0 L1277.8 626.0" fill="none" data-name="ModelRepository"></path>
+							<path d="M615.8 732.0 L1277.8 732.0" fill="none" data-name="ModelRepository"></path>
 						</g>
-						<g transform="translate(2950, 595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelRepository">
+						<g transform="translate(615.75, 595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepository">
 								<text x="323.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepository">ModelRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2950, 626)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
+						<g transform="translate(615.75, 626)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+delegate: IModelRepositoryDelegate&lt;T&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">-_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
@@ -988,7 +730,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(2950, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
+						<g transform="translate(615.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt;? get()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">+dynamic fetchAll()</text>
@@ -1016,17 +758,17 @@
 					</g>
 					<g data-name="StudyRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepository">
-							<rect x="3643.0" y="1703.5" height="183.0" width="403.0" data-name="StudyRepository"></rect>
-							<path d="M3643.0 1734.5 L4046.0 1734.5" fill="none" data-name="StudyRepository"></path>
-							<path d="M3643.0 1810.5 L4046.0 1810.5" fill="none" data-name="StudyRepository"></path>
+							<rect x="728.5" y="1703.5" height="183.0" width="403.0" data-name="StudyRepository"></rect>
+							<path d="M728.5 1734.5 L1131.5 1734.5" fill="none" data-name="StudyRepository"></path>
+							<path d="M728.5 1810.5 L1131.5 1810.5" fill="none" data-name="StudyRepository"></path>
 						</g>
-						<g transform="translate(3643, 1703.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepository">
+						<g transform="translate(728.5, 1703.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepository">
 								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepository">StudyRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3643, 1734.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
+						<g transform="translate(728.5, 1734.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+apiClient: StudyUApi</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+authRepository: IAuthRepository</text>
@@ -1035,7 +777,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(3643, 1810.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
+						<g transform="translate(728.5, 1810.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+String getKey()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+dynamic deleteParticipants()</text>
@@ -1045,19 +787,47 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="StudyUApi">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApi">
+							<rect x="1594.3" y="1942.0" height="212.0" width="251.0" data-name="StudyUApi"></rect>
+							<path d="M1594.3 1973.0 L1845.3 1973.0" fill="none" data-name="StudyUApi"></path>
+						</g>
+						<g transform="translate(1594.25, 1942)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyUApi">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApi">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApi">StudyUApi</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1594.25, 1973)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApi">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApi">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApi">+dynamic saveStudy()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApi">+dynamic getUserStudies()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApi">+dynamic saveStudyInvite()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudyInvite()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudyInvite()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApi">+dynamic deleteParticipants()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApi">+dynamic fetchAppConfig()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApi">+dynamic fetchUser()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApi">+dynamic saveUser()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="IAuthRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="3003.3" y="1934.0" height="228.0" width="295.0" data-name="IAuthRepository"></rect>
-							<path d="M3003.3 1965.0 L3298.3 1965.0" fill="none" data-name="IAuthRepository"></path>
-							<path d="M3003.3 2056.0 L3298.3 2056.0" fill="none" data-name="IAuthRepository"></path>
+							<rect x="2249.3" y="1934.0" height="228.0" width="295.0" data-name="IAuthRepository"></rect>
+							<path d="M2249.3 1965.0 L2544.3 1965.0" fill="none" data-name="IAuthRepository"></path>
+							<path d="M2249.3 2056.0 L2544.3 2056.0" fill="none" data-name="IAuthRepository"></path>
 						</g>
-						<g transform="translate(3003.25, 1934)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
+						<g transform="translate(2249.25, 1934)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
 								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3003.25, 1965)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
+						<g transform="translate(2249.25, 1965)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+allowPasswordReset: bool</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+currentUser: User?</text>
@@ -1067,7 +837,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(3003.25, 2056)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
+						<g transform="translate(2249.25, 2056)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+dynamic signUp()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+dynamic signInWith()</text>
@@ -1081,9 +851,9 @@
 					</g>
 					<g data-name="ProviderRef">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ProviderRef">
-							<rect x="4232.8" y="2032.5" height="31.0" width="109.0" data-name="ProviderRef"></rect>
+							<rect x="594.0" y="2032.5" height="31.0" width="109.0" data-name="ProviderRef"></rect>
 						</g>
-						<g transform="translate(4232.75, 2032.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ProviderRef">
+						<g transform="translate(594, 2032.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ProviderRef">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProviderRef">
 								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProviderRef">ProviderRef</text>
 								
@@ -1092,9 +862,9 @@
 					</g>
 					<g data-name="void Function()?">
 						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="4381.8" y="2032.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
+							<rect x="805.5" y="2032.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
 						</g>
-						<g transform="translate(4381.75, 2032.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
+						<g transform="translate(805.5, 2032.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
 								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
 								
@@ -1103,24 +873,24 @@
 					</g>
 					<g data-name="StudyRepositoryDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepositoryDelegate">
-							<rect x="2108.8" y="1696.0" height="198.0" width="282.0" data-name="StudyRepositoryDelegate"></rect>
-							<path d="M2108.8 1727.0 L2390.8 1727.0" fill="none" data-name="StudyRepositoryDelegate"></path>
-							<path d="M2108.8 1773.0 L2390.8 1773.0" fill="none" data-name="StudyRepositoryDelegate"></path>
+							<rect x="1954.8" y="1696.0" height="198.0" width="282.0" data-name="StudyRepositoryDelegate"></rect>
+							<path d="M1954.8 1727.0 L2236.8 1727.0" fill="none" data-name="StudyRepositoryDelegate"></path>
+							<path d="M1954.8 1773.0 L2236.8 1773.0" fill="none" data-name="StudyRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(2108.75, 1696)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepositoryDelegate">
+						<g transform="translate(1954.75, 1696)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepositoryDelegate">
 								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepositoryDelegate">StudyRepositoryDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2108.75, 1727)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
+						<g transform="translate(1954.75, 1727)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+apiClient: StudyUApi</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+authRepository: IAuthRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2108.75, 1773)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
+						<g transform="translate(1954.75, 1773)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetchAll()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetch()</text>
@@ -1135,16 +905,16 @@
 					</g>
 					<g data-name="IModelRepositoryDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepositoryDelegate">
-							<rect x="2137.3" y="1088.0" height="152.0" width="225.0" data-name="IModelRepositoryDelegate"></rect>
-							<path d="M2137.3 1119.0 L2362.3 1119.0" fill="none" data-name="IModelRepositoryDelegate"></path>
+							<rect x="1762.3" y="1088.0" height="152.0" width="225.0" data-name="IModelRepositoryDelegate"></rect>
+							<path d="M1762.3 1119.0 L1987.3 1119.0" fill="none" data-name="IModelRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(2137.25, 1088)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepositoryDelegate">
+						<g transform="translate(1762.25, 1088)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepositoryDelegate">
 								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepositoryDelegate">IModelRepositoryDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2137.25, 1119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepositoryDelegate">
+						<g transform="translate(1762.25, 1119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepositoryDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetchAll()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetch()</text>
@@ -1159,16 +929,16 @@
 					</g>
 					<g data-name="IAppRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IAppRepository">
-							<rect x="1838.8" y="1556.0" height="77.0" width="230.0" data-name="IAppRepository"></rect>
-							<path d="M1838.8 1587.0 L2068.8 1587.0" fill="none" data-name="IAppRepository"></path>
+							<rect x="1644.8" y="1556.0" height="77.0" width="230.0" data-name="IAppRepository"></rect>
+							<path d="M1644.8 1587.0 L1874.8 1587.0" fill="none" data-name="IAppRepository"></path>
 						</g>
-						<g transform="translate(1838.75, 1556)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppRepository">
+						<g transform="translate(1644.75, 1556)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppRepository">
 								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAppRepository">IAppRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1838.75, 1587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppRepository">
+						<g transform="translate(1644.75, 1587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IAppRepository">+dynamic fetchAppConfig()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IAppRepository">+void dispose()</text>
@@ -1176,45 +946,108 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="AppRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppRepository">
-							<rect x="1838.8" y="1741.0" height="108.0" width="230.0" data-name="AppRepository"></rect>
-							<path d="M1838.8 1772.0 L2068.8 1772.0" fill="none" data-name="AppRepository"></path>
-							<path d="M1838.8 1803.0 L2068.8 1803.0" fill="none" data-name="AppRepository"></path>
+					<g data-name="AppRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppRepository">
+							<rect x="1644.8" y="1741.0" height="108.0" width="230.0" data-name="AppRepository"></rect>
+							<path d="M1644.8 1772.0 L1874.8 1772.0" fill="none" data-name="AppRepository"></path>
+							<path d="M1644.8 1803.0 L1874.8 1803.0" fill="none" data-name="AppRepository"></path>
+						</g>
+						<g transform="translate(1644.75, 1741)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppRepository">
+								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppRepository">AppRepository</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1644.75, 1772)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+apiClient: StudyUApi</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1644.75, 1803)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+dynamic fetchAppConfig()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppRepository">+void dispose()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ModelEvent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelEvent">
+							<rect x="457.0" y="90.5" height="77.0" width="145.0" data-name="ModelEvent"></rect>
+							<path d="M457.0 121.5 L602.0 121.5" fill="none" data-name="ModelEvent"></path>
+						</g>
+						<g transform="translate(457, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelEvent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelEvent">
+								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelEvent">ModelEvent</text>
+								
+							</g>
+						</g>
+						<g transform="translate(457, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelEvent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelEvent">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelEvent">+modelId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelEvent">+model: T</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="IsFetched">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsFetched">
+							<rect x="97.8" y="411.0" height="31.0" width="94.0" data-name="IsFetched"></rect>
+						</g>
+						<g transform="translate(97.75, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsFetched">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsFetched">
+								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsFetched">IsFetched</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="IsSaving">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaving">
+							<rect x="231.8" y="411.0" height="31.0" width="84.0" data-name="IsSaving"></rect>
+						</g>
+						<g transform="translate(231.75, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaving">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaving">
+								<text x="34.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaving">IsSaving</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="IsSaved">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaved">
+							<rect x="355.8" y="411.0" height="31.0" width="80.0" data-name="IsSaved"></rect>
 						</g>
-						<g transform="translate(1838.75, 1741)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppRepository">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppRepository">AppRepository</text>
+						<g transform="translate(355.75, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaved">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaved">
+								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaved">IsSaved</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1838.75, 1772)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+apiClient: StudyUApi</text>
-								
-							</g>
+					</g>
+					<g data-name="IsDeleted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsDeleted">
+							<rect x="475.8" y="411.0" height="31.0" width="91.0" data-name="IsDeleted"></rect>
 						</g>
-						<g transform="translate(1838.75, 1803)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppRepository">+void dispose()</text>
+						<g transform="translate(475.75, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsDeleted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsDeleted">
+								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="IsDeleted">IsDeleted</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="WrappedModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="WrappedModel">
-							<rect x="2114.5" y="0.0" height="258.0" width="251.0" data-name="WrappedModel"></rect>
-							<path d="M2114.5 31.0 L2365.5 31.0" fill="none" data-name="WrappedModel"></path>
-							<path d="M2114.5 182.0 L2365.5 182.0" fill="none" data-name="WrappedModel"></path>
+							<rect x="669.5" y="0.0" height="258.0" width="251.0" data-name="WrappedModel"></rect>
+							<path d="M669.5 31.0 L920.5 31.0" fill="none" data-name="WrappedModel"></path>
+							<path d="M669.5 182.0 L920.5 182.0" fill="none" data-name="WrappedModel"></path>
 						</g>
-						<g transform="translate(2114.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WrappedModel">
+						<g transform="translate(669.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WrappedModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WrappedModel">
 								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="WrappedModel">WrappedModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2114.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
+						<g transform="translate(669.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">-_model: T</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+asyncValue: AsyncValue&lt;T&gt;</text>
@@ -1228,7 +1061,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(2114.5, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
+						<g transform="translate(669.5, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">+dynamic markWithError()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+dynamic markAsLoading()</text>
@@ -1240,9 +1073,9 @@
 					</g>
 					<g data-name="AsyncValue">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="2793.5" y="411.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
+							<rect x="606.8" y="411.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
 						</g>
-						<g transform="translate(2793.5, 411)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
+						<g transform="translate(606.75, 411)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
 								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
 								
@@ -1251,20 +1084,31 @@
 					</g>
 					<g data-name="ModelRepositoryException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepositoryException">
-							<rect x="3648.0" y="411.0" height="31.0" width="227.0" data-name="ModelRepositoryException"></rect>
+							<rect x="1313.8" y="411.0" height="31.0" width="227.0" data-name="ModelRepositoryException"></rect>
 						</g>
-						<g transform="translate(3648, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelRepositoryException">
+						<g transform="translate(1313.75, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelRepositoryException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepositoryException">
 								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepositoryException">ModelRepositoryException</text>
 								
 							</g>
 						</g>
 					</g>
+					<g data-name="Exception">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
+							<rect x="2143.5" y="113.5" height="31.0" width="94.0" data-name="Exception"></rect>
+						</g>
+						<g transform="translate(2143.5, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
+								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="ModelNotFoundException">
 						<g fill="#eee8d5" stroke="#33322E" data-name="ModelNotFoundException">
-							<rect x="3652.0" y="806.0" height="31.0" width="219.0" data-name="ModelNotFoundException"></rect>
+							<rect x="1317.8" y="806.0" height="31.0" width="219.0" data-name="ModelNotFoundException"></rect>
 						</g>
-						<g transform="translate(3652, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelNotFoundException">
+						<g transform="translate(1317.75, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelNotFoundException">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelNotFoundException">
 								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelNotFoundException">ModelNotFoundException</text>
 								
@@ -1273,16 +1117,16 @@
 					</g>
 					<g data-name="IModelRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepository">
-							<rect x="3090.0" y="298.0" height="257.0" width="382.0" data-name="IModelRepository"></rect>
-							<path d="M3090.0 329.0 L3472.0 329.0" fill="none" data-name="IModelRepository"></path>
+							<rect x="755.8" y="298.0" height="257.0" width="382.0" data-name="IModelRepository"></rect>
+							<path d="M755.8 329.0 L1137.8 329.0" fill="none" data-name="IModelRepository"></path>
 						</g>
-						<g transform="translate(3090, 298)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepository">
+						<g transform="translate(755.75, 298)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepository">
 								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepository">IModelRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3090, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepository">
+						<g transform="translate(755.75, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepository">+String getKey()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepository">+WrappedModel&lt;T&gt;? get()</text>
@@ -1304,9 +1148,9 @@
 					</g>
 					<g data-name="IModelActionProvider">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="3058.8" y="113.5" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
+							<rect x="988.5" y="113.5" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
 						</g>
-						<g transform="translate(3058.75, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
+						<g transform="translate(988.5, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
 								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
 								
@@ -1315,57 +1159,27 @@
 					</g>
 					<g data-name="BehaviorSubject">
 						<g fill="#eee8d5" stroke="#33322E" data-name="BehaviorSubject">
-							<rect x="2877.3" y="1148.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
+							<rect x="854.3" y="1148.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
 						</g>
-						<g transform="translate(2877.25, 1148.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
+						<g transform="translate(854.25, 1148.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BehaviorSubject">
 								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="BehaviorSubject">BehaviorSubject</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyLaunched">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyLaunched">
-							<rect x="3915.0" y="411.0" height="31.0" width="140.0" data-name="StudyLaunched"></rect>
-						</g>
-						<g transform="translate(3915, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyLaunched">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyLaunched">
-								<text x="62.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyLaunched">StudyLaunched</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelEvent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelEvent">
-							<rect x="4622.5" y="90.5" height="77.0" width="145.0" data-name="ModelEvent"></rect>
-							<path d="M4622.5 121.5 L4767.5 121.5" fill="none" data-name="ModelEvent"></path>
-						</g>
-						<g transform="translate(4622.5, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelEvent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelEvent">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelEvent">ModelEvent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4622.5, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelEvent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelEvent">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelEvent">+modelId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelEvent">+model: T</text>
-								
-							</g>
-						</g>
-					</g>
 					<g data-name="IInviteCodeRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="3062.3" y="1133.0" height="62.0" width="265.0" data-name="IInviteCodeRepository"></rect>
-							<path d="M3062.3 1164.0 L3327.3 1164.0" fill="none" data-name="IInviteCodeRepository"></path>
+							<rect x="1234.5" y="1133.0" height="62.0" width="265.0" data-name="IInviteCodeRepository"></rect>
+							<path d="M1234.5 1164.0 L1499.5 1164.0" fill="none" data-name="IInviteCodeRepository"></path>
 						</g>
-						<g transform="translate(3062.25, 1133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
+						<g transform="translate(1234.5, 1133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
 								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3062.25, 1164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IInviteCodeRepository">
+						<g transform="translate(1234.5, 1164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IInviteCodeRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IInviteCodeRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IInviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
 								
@@ -1374,17 +1188,17 @@
 					</g>
 					<g data-name="InviteCodeRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepository">
-							<rect x="3079.5" y="1280.0" height="213.0" width="403.0" data-name="InviteCodeRepository"></rect>
-							<path d="M3079.5 1311.0 L3482.5 1311.0" fill="none" data-name="InviteCodeRepository"></path>
-							<path d="M3079.5 1417.0 L3482.5 1417.0" fill="none" data-name="InviteCodeRepository"></path>
+							<rect x="1079.3" y="1280.0" height="213.0" width="403.0" data-name="InviteCodeRepository"></rect>
+							<path d="M1079.3 1311.0 L1482.3 1311.0" fill="none" data-name="InviteCodeRepository"></path>
+							<path d="M1079.3 1417.0 L1482.3 1417.0" fill="none" data-name="InviteCodeRepository"></path>
 						</g>
-						<g transform="translate(3079.5, 1280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepository">
+						<g transform="translate(1079.25, 1280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepository">
 								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepository">InviteCodeRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3079.5, 1311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
+						<g transform="translate(1079.25, 1311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
@@ -1395,7 +1209,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(3079.5, 1417)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
+						<g transform="translate(1079.25, 1417)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+String getKey()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
@@ -1407,9 +1221,9 @@
 					</g>
 					<g data-name="Study">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="1737.8" y="1579.0" height="31.0" width="61.0" data-name="Study"></rect>
+							<rect x="859.5" y="1579.0" height="31.0" width="61.0" data-name="Study"></rect>
 						</g>
-						<g transform="translate(1737.75, 1579)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
+						<g transform="translate(859.5, 1579)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
 								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
 								
@@ -1418,17 +1232,17 @@
 					</g>
 					<g data-name="InviteCodeRepositoryDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepositoryDelegate">
-							<rect x="1578.8" y="1280.0" height="213.0" width="299.0" data-name="InviteCodeRepositoryDelegate"></rect>
-							<path d="M1578.8 1311.0 L1877.8 1311.0" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
-							<path d="M1578.8 1372.0 L1877.8 1372.0" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
+							<rect x="1555.5" y="1280.0" height="213.0" width="299.0" data-name="InviteCodeRepositoryDelegate"></rect>
+							<path d="M1555.5 1311.0 L1854.5 1311.0" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
+							<path d="M1555.5 1372.0 L1854.5 1372.0" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(1578.75, 1280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+						<g transform="translate(1555.5, 1280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepositoryDelegate">
 								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepositoryDelegate">InviteCodeRepositoryDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1578.75, 1311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+						<g transform="translate(1555.5, 1311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+study: Study</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+apiClient: StudyUApi</text>
@@ -1436,7 +1250,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(1578.75, 1372)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+						<g transform="translate(1555.5, 1372)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
 								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetch()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetchAll()</text>
@@ -1449,11 +1263,94 @@
 							</g>
 						</g>
 					</g>
+					<g data-name="StudyLaunched">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyLaunched">
+							<rect x="1580.8" y="411.0" height="31.0" width="140.0" data-name="StudyLaunched"></rect>
+						</g>
+						<g transform="translate(1580.75, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyLaunched">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyLaunched">
+								<text x="62.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyLaunched">StudyLaunched</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="SupabaseClientDependant">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClientDependant">
+							<rect x="0.0" y="2017.0" height="62.0" width="284.0" data-name="SupabaseClientDependant"></rect>
+							<path d="M0.0 2048.0 L284.0 2048.0" fill="none" data-name="SupabaseClientDependant"></path>
+						</g>
+						<g transform="translate(0, 2017)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseClientDependant">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClientDependant">
+								<text x="134.0" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClientDependant">SupabaseClientDependant</text>
+								
+							</g>
+						</g>
+						<g transform="translate(0, 2048)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseClientDependant">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseClientDependant">
+								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseClientDependant">+supabaseClient: SupabaseClient</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="SupabaseClient">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClient">
+							<rect x="196.3" y="2590.0" height="31.0" width="141.0" data-name="SupabaseClient"></rect>
+						</g>
+						<g transform="translate(196.25, 2590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClient">
+								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClient">SupabaseClient</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="SupabaseQueryError">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryError">
+							<rect x="1760.8" y="380.5" height="92.0" width="183.0" data-name="SupabaseQueryError"></rect>
+							<path d="M1760.8 411.5 L1943.8 411.5" fill="none" data-name="SupabaseQueryError"></path>
+						</g>
+						<g transform="translate(1760.75, 380.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseQueryError">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryError">
+								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryError">SupabaseQueryError</text>
+								
+							</g>
+						</g>
+						<g transform="translate(1760.75, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryError">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryError">
+								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryError">+statusCode: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryError">+message: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryError">+details: dynamic</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="SupabaseQueryMixin">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryMixin">
+							<rect x="339.0" y="1979.5" height="137.0" width="215.0" data-name="SupabaseQueryMixin"></rect>
+							<path d="M339.0 2010.5 L554.0 2010.5" fill="none" data-name="SupabaseQueryMixin"></path>
+						</g>
+						<g transform="translate(339, 1979.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseQueryMixin">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryMixin">
+								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryMixin">SupabaseQueryMixin</text>
+								
+							</g>
+						</g>
+						<g transform="translate(339, 2010.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryMixin">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryMixin">
+								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic deleteAll()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getAll()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getById()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getByColumn()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseQueryMixin">+List&lt;T&gt; deserializeList()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SupabaseQueryMixin">+T deserializeObject()</text>
+								
+							</g>
+						</g>
+					</g>
 					<g data-name="User">
 						<g fill="#eee8d5" stroke="#33322E" data-name="User">
-							<rect x="2789.5" y="2575.0" height="31.0" width="53.0" data-name="User"></rect>
+							<rect x="2276.5" y="2590.0" height="31.0" width="53.0" data-name="User"></rect>
 						</g>
-						<g transform="translate(2789.5, 2575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="User">
+						<g transform="translate(2276.5, 2590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="User">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="User">
 								<text x="18.5" y="13.5" stroke="none" text-anchor="middle" data-name="User">User</text>
 								
@@ -1462,9 +1359,9 @@
 					</g>
 					<g data-name="Session">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Session">
-							<rect x="3216.3" y="2575.0" height="31.0" width="79.0" data-name="Session"></rect>
+							<rect x="2638.5" y="2590.0" height="31.0" width="79.0" data-name="Session"></rect>
 						</g>
-						<g transform="translate(3216.25, 2575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Session">
+						<g transform="translate(2638.5, 2590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Session">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Session">
 								<text x="31.5" y="13.5" stroke="none" text-anchor="middle" data-name="Session">Session</text>
 								
@@ -1473,9 +1370,9 @@
 					</g>
 					<g data-name="IAppDelegate">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
-							<rect x="2968.8" y="1779.5" height="31.0" width="123.0" data-name="IAppDelegate"></rect>
+							<rect x="2476.8" y="1779.5" height="31.0" width="123.0" data-name="IAppDelegate"></rect>
 						</g>
-						<g transform="translate(2968.75, 1779.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
+						<g transform="translate(2476.75, 1779.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
 								<text x="53.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
 								
@@ -1484,30 +1381,29 @@
 					</g>
 					<g data-name="AuthRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="AuthRepository">
-							<rect x="2875.8" y="2217.0" height="303.0" width="340.0" data-name="AuthRepository"></rect>
-							<path d="M2875.8 2248.0 L3215.8 2248.0" fill="none" data-name="AuthRepository"></path>
-							<path d="M2875.8 2384.0 L3215.8 2384.0" fill="none" data-name="AuthRepository"></path>
+							<rect x="2343.0" y="2232.0" height="288.0" width="295.0" data-name="AuthRepository"></rect>
+							<path d="M2343.0 2263.0 L2638.0 2263.0" fill="none" data-name="AuthRepository"></path>
+							<path d="M2343.0 2384.0 L2638.0 2384.0" fill="none" data-name="AuthRepository"></path>
 						</g>
-						<g transform="translate(2875.75, 2217)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthRepository">
+						<g transform="translate(2343, 2232)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthRepository">
-								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthRepository">AuthRepository</text>
+								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthRepository">AuthRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2875.75, 2248)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
+						<g transform="translate(2343, 2263)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">+supabaseClient: SupabaseClient</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+sharedPreferences: SharedPreferences</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+allowPasswordReset: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+authClient: GoTrueClient</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+session: Session?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+serializedSession: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+currentUser: User?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthRepository">+isLoggedIn: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+allowPasswordReset: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+authClient: GoTrueClient</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+session: Session?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+serializedSession: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+currentUser: User?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+isLoggedIn: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2875.75, 2384)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
+						<g transform="translate(2343, 2384)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">-void _registerAuthListener()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+dynamic signUp()</text>
@@ -1521,22 +1417,11 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="SharedPreferences">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SharedPreferences">
-							<rect x="3335.3" y="2575.0" height="31.0" width="169.0" data-name="SharedPreferences"></rect>
-						</g>
-						<g transform="translate(3335.25, 2575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SharedPreferences">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SharedPreferences">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="SharedPreferences">SharedPreferences</text>
-								
-							</g>
-						</g>
-					</g>
 					<g data-name="GoTrueClient">
 						<g fill="#eee8d5" stroke="#33322E" data-name="GoTrueClient">
-							<rect x="3544.3" y="2575.0" height="31.0" width="120.0" data-name="GoTrueClient"></rect>
+							<rect x="2757.5" y="2590.0" height="31.0" width="120.0" data-name="GoTrueClient"></rect>
 						</g>
-						<g transform="translate(3544.25, 2575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoTrueClient">
+						<g transform="translate(2757.5, 2590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoTrueClient">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoTrueClient">
 								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoTrueClient">GoTrueClient</text>
 								
@@ -1545,23 +1430,23 @@
 					</g>
 					<g data-name="IUserRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="3967.3" y="1533.0" height="123.0" width="260.0" data-name="IUserRepository"></rect>
-							<path d="M3967.3 1564.0 L4227.3 1564.0" fill="none" data-name="IUserRepository"></path>
-							<path d="M3967.3 1595.0 L4227.3 1595.0" fill="none" data-name="IUserRepository"></path>
+							<rect x="2650.8" y="1533.0" height="123.0" width="260.0" data-name="IUserRepository"></rect>
+							<path d="M2650.8 1564.0 L2910.8 1564.0" fill="none" data-name="IUserRepository"></path>
+							<path d="M2650.8 1595.0 L2910.8 1595.0" fill="none" data-name="IUserRepository"></path>
 						</g>
-						<g transform="translate(3967.25, 1533)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
+						<g transform="translate(2650.75, 1533)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
 								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3967.25, 1564)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
+						<g transform="translate(2650.75, 1564)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+user: StudyUUser</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3967.25, 1595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
+						<g transform="translate(2650.75, 1595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+dynamic fetchUser()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IUserRepository">+dynamic saveUser()</text>
@@ -1572,9 +1457,9 @@
 					</g>
 					<g data-name="StudyUUser">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUUser">
-							<rect x="4565.8" y="2032.5" height="31.0" width="110.0" data-name="StudyUUser"></rect>
+							<rect x="2906.8" y="2032.5" height="31.0" width="110.0" data-name="StudyUUser"></rect>
 						</g>
-						<g transform="translate(4565.75, 2032.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUUser">
+						<g transform="translate(2906.75, 2032.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUUser">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUUser">
 								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUUser">StudyUUser</text>
 								
@@ -1583,17 +1468,17 @@
 					</g>
 					<g data-name="UserRepository">
 						<g fill="#eee8d5" stroke="#33322E" data-name="UserRepository">
-							<rect x="3321.0" y="1711.0" height="168.0" width="282.0" data-name="UserRepository"></rect>
-							<path d="M3321.0 1742.0 L3603.0 1742.0" fill="none" data-name="UserRepository"></path>
-							<path d="M3321.0 1818.0 L3603.0 1818.0" fill="none" data-name="UserRepository"></path>
+							<rect x="2639.8" y="1711.0" height="168.0" width="282.0" data-name="UserRepository"></rect>
+							<path d="M2639.8 1742.0 L2921.8 1742.0" fill="none" data-name="UserRepository"></path>
+							<path d="M2639.8 1818.0 L2921.8 1818.0" fill="none" data-name="UserRepository"></path>
 						</g>
-						<g transform="translate(3321, 1711)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserRepository">
+						<g transform="translate(2639.75, 1711)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserRepository">
 								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserRepository">UserRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3321, 1742)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
+						<g transform="translate(2639.75, 1742)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+apiClient: StudyUApi</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+authRepository: IAuthRepository</text>
@@ -1602,7 +1487,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(3321, 1818)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
+						<g transform="translate(2639.75, 1818)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
 								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+dynamic fetchUser()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+dynamic saveUser()</text>
@@ -1613,9 +1498,9 @@
 					</g>
 					<g data-name="Ref">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Ref">
-							<rect x="4715.8" y="2032.5" height="31.0" width="43.0" data-name="Ref"></rect>
+							<rect x="3056.8" y="2032.5" height="31.0" width="43.0" data-name="Ref"></rect>
 						</g>
-						<g transform="translate(4715.75, 2032.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Ref">
+						<g transform="translate(3056.75, 2032.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Ref">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Ref">
 								<text x="13.5" y="13.5" stroke="none" text-anchor="middle" data-name="Ref">Ref</text>
 								
@@ -1624,16 +1509,16 @@
 					</g>
 					<g data-name="PreferenceAction">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PreferenceAction">
-							<rect x="4095.0" y="373.0" height="107.0" width="334.0" data-name="PreferenceAction"></rect>
-							<path d="M4095.0 404.0 L4429.0 404.0" fill="none" data-name="PreferenceAction"></path>
+							<rect x="1983.8" y="373.0" height="107.0" width="334.0" data-name="PreferenceAction"></rect>
+							<path d="M1983.8 404.0 L2317.8 404.0" fill="none" data-name="PreferenceAction"></path>
 						</g>
-						<g transform="translate(4095, 373)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreferenceAction">
+						<g transform="translate(1983.75, 373)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreferenceAction">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreferenceAction">
 								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="PreferenceAction">PreferenceAction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4095, 404)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreferenceAction">
+						<g transform="translate(1983.75, 404)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreferenceAction">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreferenceAction">
 								<text x="0.0" y="13.5" stroke="none" data-name="PreferenceAction">+index: int</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+values: List&lt;PreferenceAction&gt;</text>
@@ -1645,75 +1530,174 @@
 					</g>
 					<g data-name="Enum">
 						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="4239.8" y="113.5" height="31.0" width="61.0" data-name="Enum"></rect>
+							<rect x="2458.5" y="113.5" height="31.0" width="61.0" data-name="Enum"></rect>
 						</g>
-						<g transform="translate(4239.75, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+						<g transform="translate(2458.5, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
 								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IsFetched">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsFetched">
-							<rect x="4519.0" y="411.0" height="31.0" width="94.0" data-name="IsFetched"></rect>
+					<g data-name="APIException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="APIException">
+							<rect x="3112.5" y="411.0" height="31.0" width="121.0" data-name="APIException"></rect>
 						</g>
-						<g transform="translate(4519, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsFetched">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsFetched">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsFetched">IsFetched</text>
+						<g transform="translate(3112.5, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="APIException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="APIException">
+								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="APIException">APIException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IsSaving">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaving">
-							<rect x="4653.0" y="411.0" height="31.0" width="84.0" data-name="IsSaving"></rect>
+					<g data-name="StudyNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotFoundException">
+							<rect x="1710.5" y="806.0" height="31.0" width="216.0" data-name="StudyNotFoundException"></rect>
 						</g>
-						<g transform="translate(4653, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaving">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaving">
-								<text x="34.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaving">IsSaving</text>
+						<g transform="translate(1710.5, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotFoundException">
+								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotFoundException">StudyNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IsSaved">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaved">
-							<rect x="4777.0" y="411.0" height="31.0" width="80.0" data-name="IsSaved"></rect>
+					<g data-name="MeasurementNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementNotFoundException">
+							<rect x="1966.5" y="806.0" height="31.0" width="279.0" data-name="MeasurementNotFoundException"></rect>
 						</g>
-						<g transform="translate(4777, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaved">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaved">
-								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaved">IsSaved</text>
+						<g transform="translate(1966.5, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementNotFoundException">
+								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementNotFoundException">MeasurementNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IsDeleted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsDeleted">
-							<rect x="4897.0" y="411.0" height="31.0" width="91.0" data-name="IsDeleted"></rect>
+					<g data-name="QuestionNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionNotFoundException">
+							<rect x="2285.5" y="806.0" height="31.0" width="242.0" data-name="QuestionNotFoundException"></rect>
 						</g>
-						<g transform="translate(4897, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsDeleted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsDeleted">
-								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="IsDeleted">IsDeleted</text>
+						<g transform="translate(2285.5, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionNotFoundException">
+								<text x="113.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionNotFoundException">QuestionNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SupabaseQueryError">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryError">
-							<rect x="5028.0" y="380.5" height="92.0" width="183.0" data-name="SupabaseQueryError"></rect>
-							<path d="M5028.0 411.5 L5211.0 411.5" fill="none" data-name="SupabaseQueryError"></path>
+					<g data-name="ConsentItemNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemNotFoundException">
+							<rect x="2567.5" y="806.0" height="31.0" width="271.0" data-name="ConsentItemNotFoundException"></rect>
 						</g>
-						<g transform="translate(5028, 380.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseQueryError">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryError">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryError">SupabaseQueryError</text>
+						<g transform="translate(2567.5, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemNotFoundException">
+								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemNotFoundException">ConsentItemNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5028, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryError">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryError">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryError">+statusCode: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryError">+message: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryError">+details: dynamic</text>
+					</g>
+					<g data-name="InterventionNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionNotFoundException">
+							<rect x="2878.5" y="806.0" height="31.0" width="265.0" data-name="InterventionNotFoundException"></rect>
+						</g>
+						<g transform="translate(2878.5, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionNotFoundException">
+								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionNotFoundException">InterventionNotFoundException</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="InterventionTaskNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskNotFoundException">
+							<rect x="3183.5" y="806.0" height="31.0" width="303.0" data-name="InterventionTaskNotFoundException"></rect>
+						</g>
+						<g transform="translate(3183.5, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskNotFoundException">
+								<text x="143.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskNotFoundException">InterventionTaskNotFoundException</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ReportNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportNotFoundException">
+							<rect x="3526.5" y="806.0" height="31.0" width="224.0" data-name="ReportNotFoundException"></rect>
+						</g>
+						<g transform="translate(3526.5, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportNotFoundException">
+								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportNotFoundException">ReportNotFoundException</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ReportSectionNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionNotFoundException">
+							<rect x="3790.5" y="806.0" height="31.0" width="283.0" data-name="ReportSectionNotFoundException"></rect>
+						</g>
+						<g transform="translate(3790.5, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionNotFoundException">
+								<text x="133.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionNotFoundException">ReportSectionNotFoundException</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StudyInviteNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInviteNotFoundException">
+							<rect x="4113.5" y="806.0" height="31.0" width="259.0" data-name="StudyInviteNotFoundException"></rect>
+						</g>
+						<g transform="translate(4113.5, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInviteNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInviteNotFoundException">
+								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInviteNotFoundException">StudyInviteNotFoundException</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="UserNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UserNotFoundException">
+							<rect x="4412.5" y="806.0" height="31.0" width="208.0" data-name="UserNotFoundException"></rect>
+						</g>
+						<g transform="translate(4412.5, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserNotFoundException">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserNotFoundException">UserNotFoundException</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="StudyUApiClient">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApiClient">
+							<rect x="187.0" y="2202.0" height="348.0" width="479.0" data-name="StudyUApiClient"></rect>
+							<path d="M187.0 2233.0 L666.0 2233.0" fill="none" data-name="StudyUApiClient"></path>
+							<path d="M187.0 2324.0 L666.0 2324.0" fill="none" data-name="StudyUApiClient"></path>
+						</g>
+						<g transform="translate(187, 2202)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUApiClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApiClient">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApiClient">StudyUApiClient</text>
+								
+							</g>
+						</g>
+						<g transform="translate(187, 2233)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+supabaseClient: SupabaseClient</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyColumns: List&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyDisplayColumns: List&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApiClient">+testDelayMilliseconds: int</text>
+								
+							</g>
+						</g>
+						<g transform="translate(187, 2324)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteParticipants()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">+dynamic getUserStudies()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudy()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudy()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudyInvite()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudyInvite()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudyInvite()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchAppConfig()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchUser()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApiClient">+dynamic saveUser()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyUApiClient">-dynamic _awaitGuarded()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyUApiClient">-dynamic _apiException()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyUApiClient">-dynamic _testDelay()</text>
 								
 							</g>
 						</g>
diff --git a/docs/uml/designer_v2/lib/uml.svg b/docs/uml/designer_v2/lib/uml.svg
index 880ed2de2..1d30acac2 100644
--- a/docs/uml/designer_v2/lib/uml.svg
+++ b/docs/uml/designer_v2/lib/uml.svg
@@ -1,2120 +1,2536 @@
-<svg version="1.1" baseProfile="full" width="84279.3" height="4748.0" viewbox="0 0 84279.25 4748" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[Config
+<svg version="1.1" baseProfile="full" width="78263.5" height="4763.0" viewbox="0 0 78263.5 4763" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+	<desc >[PlatformLocaleWeb
 	  |
-	  &lt;static&gt;+isDebugMode: bool;
-	  &lt;static&gt;+defaultLocale: Set&lt;String&gt;;
-	  &lt;static&gt;+supportedLocales: Map&lt;String, String&gt;;
-	  &lt;static&gt;+newStudyId: String;
-	  &lt;static&gt;+newModelId: String;
-	  &lt;static&gt;+minSplashTime: int;
-	  &lt;static&gt;+formAutosaveDebounce: int
+	  +Locale getPlatformLocale()
 	]
 	
-	[&lt;abstract&gt;ResultTypes
+	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleWeb]
+	
+	[&lt;abstract&gt;PlatformLocale
+	  |
+	  +Locale getPlatformLocale()
 	]
 	
-	[MeasurementResultTypes
+	[PlatformLocaleMobile
 	  |
-	  &lt;static&gt;+questionnaire: String;
-	  &lt;static&gt;+values: List&lt;String&gt;
+	  +Locale getPlatformLocale()
 	]
 	
-	[&lt;abstract&gt;ResultTypes]&lt;:-[MeasurementResultTypes]
+	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleMobile]
 	
-	[InterventionResultTypes
+	[AppTranslation
 	  |
-	  &lt;static&gt;+checkmarkTask: String;
-	  &lt;static&gt;+values: List&lt;String&gt;
+	  &lt;static&gt;+dynamic init()
 	]
 	
-	[&lt;abstract&gt;ResultTypes]&lt;:-[InterventionResultTypes]
-	
-	[StudyExportData
+	[LanguagePicker
 	  |
-	  +study: Study;
-	  +measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
-	  +interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
-	  +mediaData: List&lt;String&gt;;
-	  +isEmpty: bool
+	  +languagePickerType: LanguagePickerType;
+	  +iconColor: Color?;
+	  +offset: Offset?
 	]
 	
-	[StudyExportData]o-[Study]
+	[LanguagePicker]o-[LanguagePickerType]
+	[LanguagePicker]o-[Color]
+	[LanguagePicker]o-[Offset]
 	
-	[StudyTemplates
-	  |
-	  &lt;static&gt;+kUnnamedStudyTitle: String
+	[LanguagePickerType
 	  |
-	  &lt;static&gt;+Study emptyDraft()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;LanguagePickerType&gt;;
+	  &lt;static&gt;+field: LanguagePickerType;
+	  &lt;static&gt;+icon: LanguagePickerType
 	]
 	
-	[StudyActionType
+	[LanguagePickerType]o-[LanguagePickerType]
+	[Enum]&lt;:--[LanguagePickerType]
+	
+	[&lt;abstract&gt;IStudyRepository
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyActionType&gt;;
-	  &lt;static&gt;+pin: StudyActionType;
-	  &lt;static&gt;+pinoff: StudyActionType;
-	  &lt;static&gt;+edit: StudyActionType;
-	  &lt;static&gt;+duplicate: StudyActionType;
-	  &lt;static&gt;+duplicateDraft: StudyActionType;
-	  &lt;static&gt;+addCollaborator: StudyActionType;
-	  &lt;static&gt;+export: StudyActionType;
-	  &lt;static&gt;+delete: StudyActionType
+	  +dynamic launch();
+	  +dynamic deleteParticipants()
 	]
 	
-	[StudyActionType]o-[StudyActionType]
-	[Enum]&lt;:--[StudyActionType]
+	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IStudyRepository]
 	
-	[Notifications
+	[StudyRepository
 	  |
-	  &lt;static&gt;+credentialsInvalid: SnackbarIntent;
-	  &lt;static&gt;+userAlreadyRegistered: SnackbarIntent;
-	  &lt;static&gt;+passwordReset: SnackbarIntent;
-	  &lt;static&gt;+passwordResetSuccess: SnackbarIntent;
-	  &lt;static&gt;+studyDeleted: SnackbarIntent;
-	  &lt;static&gt;+inviteCodeDeleted: SnackbarIntent;
-	  &lt;static&gt;+inviteCodeClipped: SnackbarIntent;
-	  &lt;static&gt;+studyDeleteConfirmation: AlertIntent
+	  +apiClient: StudyUApi;
+	  +authRepository: IAuthRepository;
+	  +ref: ProviderRef&lt;dynamic&gt;;
+	  +sortCallback: void Function()?
+	  |
+	  +String getKey();
+	  +dynamic deleteParticipants();
+	  +dynamic launch();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
 	]
 	
-	[Notifications]o-[SnackbarIntent]
-	[Notifications]o-[AlertIntent]
+	[StudyRepository]o-[&lt;abstract&gt;StudyUApi]
+	[StudyRepository]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyRepository]o-[&lt;abstract&gt;ProviderRef]
+	[StudyRepository]o-[void Function()?]
+	[&lt;abstract&gt;ModelRepository]&lt;:-[StudyRepository]
+	[&lt;abstract&gt;IStudyRepository]&lt;:--[StudyRepository]
 	
-	[NotificationDefaultActions
+	[StudyRepositoryDelegate
 	  |
-	  &lt;static&gt;+cancel: NotificationAction
+	  +apiClient: StudyUApi;
+	  +authRepository: IAuthRepository
+	  |
+	  +dynamic fetchAll();
+	  +dynamic fetch();
+	  +dynamic save();
+	  +dynamic delete();
+	  +dynamic onError();
+	  +Study createNewInstance();
+	  +Study createDuplicate()
 	]
 	
-	[NotificationDefaultActions]o-[NotificationAction]
+	[StudyRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
+	[StudyRepositoryDelegate]o-[&lt;abstract&gt;IAuthRepository]
+	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[StudyRepositoryDelegate]
 	
-	[&lt;abstract&gt;INotificationService
+	[&lt;abstract&gt;IAppRepository
 	  |
-	  +void showMessage();
-	  +void show();
-	  +Stream&lt;NotificationIntent&gt; watchNotifications();
+	  +dynamic fetchAppConfig();
 	  +void dispose()
 	]
 	
-	[NotificationService
+	[AppRepository
 	  |
-	  -_streamController: BehaviorSubject&lt;NotificationIntent&gt;
+	  +apiClient: StudyUApi
 	  |
-	  +Stream&lt;NotificationIntent&gt; watchNotifications();
-	  +void showMessage();
-	  +void show();
+	  +dynamic fetchAppConfig();
 	  +void dispose()
 	]
 	
-	[NotificationService]o-[BehaviorSubject]
-	[&lt;abstract&gt;INotificationService]&lt;:--[NotificationService]
+	[AppRepository]o-[&lt;abstract&gt;StudyUApi]
+	[&lt;abstract&gt;IAppRepository]&lt;:--[AppRepository]
 	
-	[&lt;abstract&gt;NotificationIntent
-	  |
-	  +message: String?;
-	  +customContent: Widget?;
-	  +icon: IconData?;
-	  +actions: List&lt;NotificationAction&gt;?;
-	  +type: NotificationType
+	[&lt;abstract&gt;ModelEvent
 	  |
-	  +void register()
+	  +modelId: String;
+	  +model: T
 	]
 	
-	[&lt;abstract&gt;NotificationIntent]o-[&lt;abstract&gt;Widget]
-	[&lt;abstract&gt;NotificationIntent]o-[IconData]
-	[&lt;abstract&gt;NotificationIntent]o-[NotificationType]
+	[IsFetched
+	]
 	
-	[NotificationAction
-	  |
-	  +label: String;
-	  +onSelect: dynamic Function();
-	  +isDestructive: bool
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsFetched]
+	
+	[IsSaving
 	]
 	
-	[NotificationAction]o-[dynamic Function()]
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaving]
 	
-	[SnackbarIntent
-	  |
-	  +duration: int?
+	[IsSaved
 	]
 	
-	[&lt;abstract&gt;NotificationIntent]&lt;:-[SnackbarIntent]
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaved]
 	
-	[AlertIntent
-	  |
-	  +title: String;
-	  +dismissOnAction: bool;
-	  +isDestructive: dynamic
+	[IsDeleted
 	]
 	
-	[&lt;abstract&gt;NotificationIntent]&lt;:-[AlertIntent]
+	[&lt;abstract&gt;ModelEvent]&lt;:-[IsDeleted]
 	
-	[NotificationType
+	[WrappedModel
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;NotificationType&gt;;
-	  &lt;static&gt;+snackbar: NotificationType;
-	  &lt;static&gt;+alert: NotificationType;
-	  &lt;static&gt;+custom: NotificationType
+	  -_model: T;
+	  +asyncValue: AsyncValue&lt;T&gt;;
+	  +isLocalOnly: bool;
+	  +isDirty: bool;
+	  +isDeleted: bool;
+	  +lastSaved: DateTime?;
+	  +lastFetched: DateTime?;
+	  +lastUpdated: DateTime?;
+	  +model: T
+	  |
+	  +dynamic markWithError();
+	  +dynamic markAsLoading();
+	  +dynamic markAsFetched();
+	  +dynamic markAsSaved()
 	]
 	
-	[NotificationType]o-[NotificationType]
-	[Enum]&lt;:--[NotificationType]
+	[WrappedModel]o-[&lt;abstract&gt;AsyncValue]
 	
-	[&lt;abstract&gt;IClipboardService
-	  |
-	  +dynamic copy()
+	[ModelRepositoryException
 	]
 	
-	[ClipboardService
-	  |
-	  +dynamic copy()
+	[Exception]&lt;:--[ModelRepositoryException]
+	
+	[ModelNotFoundException
 	]
 	
-	[&lt;abstract&gt;IClipboardService]&lt;:--[ClipboardService]
+	[ModelRepositoryException]&lt;:--[ModelNotFoundException]
 	
-	[NotificationDispatcher
+	[&lt;abstract&gt;IModelRepository
 	  |
-	  +child: Widget?;
-	  +snackbarInnerPadding: double;
-	  +snackbarWidth: double?;
-	  +snackbarBehavior: SnackBarBehavior;
-	  +snackbarDefaultDuration: int
+	  +String getKey();
+	  +WrappedModel&lt;T&gt;? get();
+	  +dynamic fetchAll();
+	  +dynamic fetch();
+	  +dynamic save();
+	  +dynamic delete();
+	  +dynamic duplicateAndSave();
+	  +dynamic duplicateAndSaveFromRemote();
+	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
+	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
+	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
+	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
+	  +dynamic ensurePersisted();
+	  +void dispose()
 	]
 	
-	[NotificationDispatcher]o-[&lt;abstract&gt;Widget]
-	[NotificationDispatcher]o-[SnackBarBehavior]
+	[&lt;abstract&gt;IModelActionProvider]&lt;:--[&lt;abstract&gt;IModelRepository]
 	
-	[Assets
+	[&lt;abstract&gt;IModelRepositoryDelegate
 	  |
-	  &lt;static&gt;+logoWide: String
+	  +dynamic fetchAll();
+	  +dynamic fetch();
+	  +dynamic save();
+	  +dynamic delete();
+	  +T createNewInstance();
+	  +T createDuplicate();
+	  +dynamic onError()
 	]
 	
-	[AsyncValueWidget
+	[&lt;abstract&gt;ModelRepository
 	  |
-	  +value: AsyncValue&lt;T&gt;;
-	  +data: Widget Function(T);
-	  +error: Widget Function(Object, StackTrace?)?;
-	  +loading: Widget Function()?;
-	  +empty: Widget Function()?
+	  +delegate: IModelRepositoryDelegate&lt;T&gt;;
+	  -_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;;
+	  -_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;;
+	  +modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;;
+	  +modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;;
+	  -_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;
 	  |
-	  +Widget build();
-	  -Widget _buildDataOrEmptyWidget();
-	  -Widget _defaultError();
-	  -Widget _defaultLoad()
+	  +WrappedModel&lt;T&gt;? get();
+	  +dynamic fetchAll();
+	  +dynamic fetch();
+	  +dynamic save();
+	  +dynamic delete();
+	  +dynamic duplicateAndSave();
+	  +dynamic duplicateAndSaveFromRemote();
+	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
+	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
+	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
+	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
+	  -dynamic _buildModelSpecificController();
+	  +dynamic ensurePersisted();
+	  +WrappedModel&lt;T&gt; upsertLocally();
+	  +List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally();
+	  +dynamic emitUpdate();
+	  +dynamic emitModelEvent();
+	  +dynamic emitError();
+	  +void dispose();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
 	]
 	
-	[AsyncValueWidget]o-[&lt;abstract&gt;AsyncValue]
-	[AsyncValueWidget]o-[Widget Function(T)]
-	[AsyncValueWidget]o-[Widget Function(Object, StackTrace?)?]
-	[AsyncValueWidget]o-[Widget Function()?]
+	[&lt;abstract&gt;ModelRepository]o-[&lt;abstract&gt;IModelRepositoryDelegate]
+	[&lt;abstract&gt;ModelRepository]o-[BehaviorSubject]
+	[&lt;abstract&gt;IModelRepository]&lt;:-[&lt;abstract&gt;ModelRepository]
 	
-	[FormControlLabel
-	  |
-	  +formControl: AbstractControl&lt;dynamic&gt;;
-	  +text: String;
-	  +isClickable: bool;
-	  +textStyle: TextStyle?;
-	  +onClick: void Function(AbstractControl&lt;dynamic&gt;)?
+	[&lt;abstract&gt;IInviteCodeRepository
 	  |
-	  +Widget build()
+	  +dynamic isCodeAlreadyUsed()
 	]
 	
-	[FormControlLabel]o-[&lt;abstract&gt;AbstractControl]
-	[FormControlLabel]o-[TextStyle]
-	[FormControlLabel]o-[void Function(AbstractControl&lt;dynamic&gt;)?]
+	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IInviteCodeRepository]
 	
-	[ActionPopUpMenuButton
+	[InviteCodeRepository
 	  |
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +triggerIconColor: Color?;
-	  +triggerIconColorHover: Color?;
-	  +triggerIconSize: double;
-	  +disableSplashEffect: bool;
-	  +hideOnEmpty: bool;
-	  +orientation: Axis;
-	  +elevation: double?;
-	  +splashRadius: double?;
-	  +enabled: bool;
-	  +position: PopupMenuPosition
+	  +studyId: String;
+	  +ref: ProviderRef&lt;dynamic&gt;;
+	  +apiClient: StudyUApi;
+	  +authRepository: IAuthRepository;
+	  +studyRepository: IStudyRepository;
+	  +study: Study
 	  |
-	  +Widget build();
-	  -Widget _buildPopupMenu()
+	  +String getKey();
+	  +dynamic isCodeAlreadyUsed();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +dynamic emitUpdate()
 	]
 	
-	[ActionPopUpMenuButton]o-[Color]
-	[ActionPopUpMenuButton]o-[Axis]
-	[ActionPopUpMenuButton]o-[PopupMenuPosition]
+	[InviteCodeRepository]o-[&lt;abstract&gt;ProviderRef]
+	[InviteCodeRepository]o-[&lt;abstract&gt;StudyUApi]
+	[InviteCodeRepository]o-[&lt;abstract&gt;IAuthRepository]
+	[InviteCodeRepository]o-[&lt;abstract&gt;IStudyRepository]
+	[InviteCodeRepository]o-[Study]
+	[&lt;abstract&gt;ModelRepository]&lt;:-[InviteCodeRepository]
+	[&lt;abstract&gt;IInviteCodeRepository]&lt;:--[InviteCodeRepository]
 	
-	[Search
+	[InviteCodeRepositoryDelegate
 	  |
-	  +onQueryChanged: dynamic Function(String);
-	  +searchController: SearchController?;
-	  +hintText: String?;
-	  +initialText: String?
+	  +study: Study;
+	  +apiClient: StudyUApi;
+	  +studyRepository: IStudyRepository
+	  |
+	  +dynamic fetch();
+	  +dynamic fetchAll();
+	  +dynamic save();
+	  +dynamic delete();
+	  +dynamic onError();
+	  +StudyInvite createDuplicate();
+	  +StudyInvite createNewInstance()
 	]
 	
-	[Search]o-[dynamic Function(String)]
-	[Search]o-[SearchController]
+	[InviteCodeRepositoryDelegate]o-[Study]
+	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
+	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;IStudyRepository]
+	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[InviteCodeRepositoryDelegate]
 	
-	[SearchController
-	  |
-	  +setText: void Function(String)
+	[StudyLaunched
 	]
 	
-	[SearchController]o-[void Function(String)]
+	[&lt;abstract&gt;ModelEvent]&lt;:-[StudyLaunched]
 	
-	[FormScaffold
+	[&lt;abstract&gt;SupabaseClientDependant
 	  |
-	  +formViewModel: T;
-	  +actions: List&lt;Widget&gt;?;
-	  +body: Widget;
-	  +drawer: Widget?;
-	  +actionsSpacing: double;
-	  +actionsPadding: double
+	  +supabaseClient: SupabaseClient
 	]
 	
-	[FormScaffold]o-[&lt;abstract&gt;Widget]
+	[&lt;abstract&gt;SupabaseClientDependant]o-[SupabaseClient]
 	
-	[ConstrainedWidthFlexible
-	  |
-	  +minWidth: double;
-	  +maxWidth: double;
-	  +flex: int;
-	  +flexSum: int;
-	  +child: Widget;
-	  +outerConstraints: BoxConstraints
+	[SupabaseQueryError
 	  |
-	  +Widget build();
-	  -double _getWidth()
+	  +statusCode: String?;
+	  +message: String;
+	  +details: dynamic
 	]
 	
-	[ConstrainedWidthFlexible]o-[&lt;abstract&gt;Widget]
-	[ConstrainedWidthFlexible]o-[BoxConstraints]
+	[Exception]&lt;:--[SupabaseQueryError]
 	
-	[PrimaryButton
+	[&lt;abstract&gt;SupabaseQueryMixin
 	  |
-	  +text: String;
-	  +icon: IconData?;
-	  +isLoading: bool;
-	  +showLoadingEarliestAfterMs: int;
-	  +onPressed: void Function()?;
-	  +tooltip: String;
-	  +tooltipDisabled: String;
-	  +enabled: bool;
-	  +onPressedFuture: dynamic Function()?;
-	  +innerPadding: EdgeInsets;
-	  +minimumSize: Size?;
-	  +isDisabled: bool
+	  +dynamic deleteAll();
+	  +dynamic getAll();
+	  +dynamic getById();
+	  +dynamic getByColumn();
+	  +List&lt;T&gt; deserializeList();
+	  +T deserializeObject()
 	]
 	
-	[PrimaryButton]o-[IconData]
-	[PrimaryButton]o-[void Function()?]
-	[PrimaryButton]o-[dynamic Function()?]
-	[PrimaryButton]o-[EdgeInsets]
-	[PrimaryButton]o-[Size]
-	
-	[FormTableRow
+	[&lt;abstract&gt;IAuthRepository
 	  |
-	  +label: String?;
-	  +labelBuilder: Widget Function(BuildContext)?;
-	  +labelStyle: TextStyle?;
-	  +labelHelpText: String?;
-	  +input: Widget;
-	  +control: AbstractControl&lt;dynamic&gt;?;
-	  +layout: FormTableRowLayout?
+	  +allowPasswordReset: bool;
+	  +currentUser: User?;
+	  +isLoggedIn: bool;
+	  +session: Session?;
+	  +serializedSession: String?
+	  |
+	  +dynamic signUp();
+	  +dynamic signInWith();
+	  +dynamic signOut();
+	  +dynamic resetPasswordForEmail();
+	  +dynamic updateUser();
+	  +void dispose()
 	]
 	
-	[FormTableRow]o-[Widget Function(BuildContext)?]
-	[FormTableRow]o-[TextStyle]
-	[FormTableRow]o-[&lt;abstract&gt;Widget]
-	[FormTableRow]o-[&lt;abstract&gt;AbstractControl]
-	[FormTableRow]o-[FormTableRowLayout]
+	[&lt;abstract&gt;IAuthRepository]o-[User]
+	[&lt;abstract&gt;IAuthRepository]o-[Session]
+	[&lt;abstract&gt;IAppDelegate]&lt;:-[&lt;abstract&gt;IAuthRepository]
 	
-	[FormTableLayout
+	[AuthRepository
 	  |
-	  +rows: List&lt;FormTableRow&gt;;
-	  +columnWidths: Map&lt;int, TableColumnWidth&gt;;
-	  +rowDivider: Widget?;
-	  +rowLayout: FormTableRowLayout?;
-	  +rowLabelStyle: TextStyle?
+	  +supabaseClient: SupabaseClient;
+	  +allowPasswordReset: bool;
+	  +authClient: GoTrueClient;
+	  +session: Session?;
+	  +serializedSession: String?;
+	  +currentUser: User?;
+	  +isLoggedIn: bool
 	  |
-	  +Widget build()
+	  -void _registerAuthListener();
+	  +dynamic signUp();
+	  +dynamic signInWith();
+	  +dynamic signOut();
+	  +dynamic resetPasswordForEmail();
+	  +dynamic updateUser();
+	  +void dispose();
+	  +dynamic onAppStart()
 	]
 	
-	[FormTableLayout]o-[&lt;abstract&gt;Widget]
-	[FormTableLayout]o-[FormTableRowLayout]
-	[FormTableLayout]o-[TextStyle]
+	[AuthRepository]o-[SupabaseClient]
+	[AuthRepository]o-[GoTrueClient]
+	[AuthRepository]o-[Session]
+	[AuthRepository]o-[User]
+	[&lt;abstract&gt;IAuthRepository]&lt;:--[AuthRepository]
 	
-	[FormSectionHeader
+	[&lt;abstract&gt;IUserRepository
 	  |
-	  +title: String;
-	  +titleTextStyle: TextStyle?;
-	  +helpText: String?;
-	  +divider: bool;
-	  +helpTextDisabled: bool
+	  +user: StudyUUser
 	  |
-	  +Widget build()
+	  +dynamic fetchUser();
+	  +dynamic saveUser();
+	  +dynamic updatePreferences()
 	]
 	
-	[FormSectionHeader]o-[TextStyle]
+	[&lt;abstract&gt;IUserRepository]o-[StudyUUser]
 	
-	[FormLabel
+	[UserRepository
 	  |
-	  +labelText: String?;
-	  +helpText: String?;
-	  +labelTextStyle: TextStyle?;
-	  +layout: FormTableRowLayout?
+	  +apiClient: StudyUApi;
+	  +authRepository: IAuthRepository;
+	  +ref: Ref&lt;Object?&gt;;
+	  +user: StudyUUser
 	  |
-	  +Widget build()
+	  +dynamic fetchUser();
+	  +dynamic saveUser();
+	  +dynamic updatePreferences()
 	]
 	
-	[FormLabel]o-[TextStyle]
-	[FormLabel]o-[FormTableRowLayout]
-	
-	[FormTableRowLayout
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;FormTableRowLayout&gt;;
-	  &lt;static&gt;+vertical: FormTableRowLayout;
-	  &lt;static&gt;+horizontal: FormTableRowLayout
-	]
-	
-	[FormTableRowLayout]o-[FormTableRowLayout]
-	[Enum]&lt;:--[FormTableRowLayout]
+	[UserRepository]o-[&lt;abstract&gt;StudyUApi]
+	[UserRepository]o-[&lt;abstract&gt;IAuthRepository]
+	[UserRepository]o-[&lt;abstract&gt;Ref]
+	[UserRepository]o-[StudyUUser]
+	[&lt;abstract&gt;IUserRepository]&lt;:--[UserRepository]
 	
-	[DismissButton
-	  |
-	  +onPressed: void Function()?;
-	  +text: String?
+	[PreferenceAction
 	  |
-	  +Widget build()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;PreferenceAction&gt;;
+	  &lt;static&gt;+pin: PreferenceAction;
+	  &lt;static&gt;+pinOff: PreferenceAction
 	]
 	
-	[DismissButton]o-[void Function()?]
+	[PreferenceAction]o-[PreferenceAction]
+	[Enum]&lt;:--[PreferenceAction]
 	
-	[Badge
-	  |
-	  +icon: IconData?;
-	  +color: Color?;
-	  +borderRadius: double;
-	  +label: String;
-	  +type: BadgeType;
-	  +padding: EdgeInsets;
-	  +iconSize: double?;
-	  +labelStyle: TextStyle?;
-	  +center: bool
+	[&lt;abstract&gt;StudyUApi
 	  |
-	  +Widget build();
-	  -Color? _getBackgroundColor();
-	  -Color _getBorderColor();
-	  -Color? _getLabelColor()
+	  +dynamic saveStudy();
+	  +dynamic fetchStudy();
+	  +dynamic getUserStudies();
+	  +dynamic deleteStudy();
+	  +dynamic saveStudyInvite();
+	  +dynamic fetchStudyInvite();
+	  +dynamic deleteStudyInvite();
+	  +dynamic deleteParticipants();
+	  +dynamic fetchAppConfig();
+	  +dynamic fetchUser();
+	  +dynamic saveUser()
 	]
 	
-	[Badge]o-[IconData]
-	[Badge]o-[Color]
-	[Badge]o-[BadgeType]
-	[Badge]o-[EdgeInsets]
-	[Badge]o-[TextStyle]
-	
-	[BadgeType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;BadgeType&gt;;
-	  &lt;static&gt;+filled: BadgeType;
-	  &lt;static&gt;+outlined: BadgeType;
-	  &lt;static&gt;+outlineFill: BadgeType;
-	  &lt;static&gt;+plain: BadgeType
+	[APIException
 	]
 	
-	[BadgeType]o-[BadgeType]
-	[Enum]&lt;:--[BadgeType]
+	[Exception]&lt;:--[APIException]
 	
-	[StandardDialog
-	  |
-	  +title: Widget?;
-	  +titleText: String?;
-	  +body: Widget;
-	  +actionButtons: List&lt;Widget&gt;;
-	  +backgroundColor: Color?;
-	  +borderRadius: double?;
-	  +width: double?;
-	  +height: double?;
-	  +minWidth: double;
-	  +minHeight: double;
-	  +maxWidth: double?;
-	  +maxHeight: double?;
-	  +padding: EdgeInsets
-	  |
-	  +Widget build()
+	[StudyNotFoundException
 	]
 	
-	[StandardDialog]o-[&lt;abstract&gt;Widget]
-	[StandardDialog]o-[Color]
-	[StandardDialog]o-[EdgeInsets]
+	[APIException]&lt;:-[StudyNotFoundException]
 	
-	[&lt;abstract&gt;ISyncIndicatorViewModel
-	  |
-	  +isDirty: bool;
-	  +lastSynced: DateTime?
+	[MeasurementNotFoundException
 	]
 	
-	[SyncIndicator
-	  |
-	  +state: AsyncValue&lt;T&gt;;
-	  +lastSynced: DateTime?;
-	  +isDirty: bool;
-	  +animationDuration: int;
-	  +iconSize: double
+	[APIException]&lt;:-[MeasurementNotFoundException]
+	
+	[QuestionNotFoundException
 	]
 	
-	[SyncIndicator]o-[&lt;abstract&gt;AsyncValue]
+	[APIException]&lt;:-[QuestionNotFoundException]
 	
-	[&lt;abstract&gt;IWithBanner
-	  |
-	  +Widget? banner()
+	[ConsentItemNotFoundException
 	]
 	
-	[BannerBox
-	  |
-	  +prefixIcon: Widget?;
-	  +body: Widget;
-	  +style: BannerStyle;
-	  +padding: EdgeInsets?;
-	  +noPrefix: bool;
-	  +dismissable: bool;
-	  +isDismissed: bool?;
-	  +onDismissed: dynamic Function()?;
-	  +dismissIconSize: double
+	[APIException]&lt;:-[ConsentItemNotFoundException]
+	
+	[InterventionNotFoundException
 	]
 	
-	[BannerBox]o-[&lt;abstract&gt;Widget]
-	[BannerBox]o-[BannerStyle]
-	[BannerBox]o-[EdgeInsets]
-	[BannerBox]o-[dynamic Function()?]
+	[APIException]&lt;:-[InterventionNotFoundException]
 	
-	[BannerStyle
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;BannerStyle&gt;;
-	  &lt;static&gt;+warning: BannerStyle;
-	  &lt;static&gt;+info: BannerStyle;
-	  &lt;static&gt;+error: BannerStyle
+	[InterventionTaskNotFoundException
 	]
 	
-	[BannerStyle]o-[BannerStyle]
-	[Enum]&lt;:--[BannerStyle]
+	[APIException]&lt;:-[InterventionTaskNotFoundException]
 	
-	[ActionMenuInline
-	  |
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +iconSize: double?;
-	  +visible: bool;
-	  +splashRadius: double?;
-	  +paddingVertical: double?;
-	  +paddingHorizontal: double?
-	  |
-	  +Widget build()
+	[ReportNotFoundException
 	]
 	
-	[Collapsible
-	  |
-	  +contentBuilder: Widget Function(BuildContext, bool);
-	  +headerBuilder: Widget Function(BuildContext, bool)?;
-	  +title: String?;
-	  +isCollapsed: bool
+	[APIException]&lt;:-[ReportNotFoundException]
+	
+	[ReportSectionNotFoundException
 	]
 	
-	[Collapsible]o-[Widget Function(BuildContext, bool)]
-	[Collapsible]o-[Widget Function(BuildContext, bool)?]
+	[APIException]&lt;:-[ReportSectionNotFoundException]
 	
-	[NavbarTab
-	  |
-	  +title: String;
-	  +intent: RoutingIntent?;
-	  +index: int;
-	  +enabled: bool
+	[StudyInviteNotFoundException
 	]
 	
-	[NavbarTab]o-[RoutingIntent]
+	[APIException]&lt;:-[StudyInviteNotFoundException]
 	
-	[TabbedNavbar
-	  |
-	  +tabs: List&lt;T&gt;;
-	  +selectedTab: T?;
-	  +indicator: BoxDecoration?;
-	  +height: double?;
-	  +disabledBackgroundColor: Color?;
-	  +disabledTooltipText: String?;
-	  +onSelect: void Function(int, T)?;
-	  +labelPadding: EdgeInsets?;
-	  +labelSpacing: double?;
-	  +indicatorSize: TabBarIndicatorSize?;
-	  +isScrollable: bool;
-	  +backgroundColor: Color?;
-	  +labelColorHover: Color?;
-	  +unselectedLabelColorHover: Color?
+	[UserNotFoundException
 	]
 	
-	[TabbedNavbar]o-[BoxDecoration]
-	[TabbedNavbar]o-[Color]
-	[TabbedNavbar]o-[void Function(int, T)?]
-	[TabbedNavbar]o-[EdgeInsets]
-	[TabbedNavbar]o-[TabBarIndicatorSize]
+	[APIException]&lt;:-[UserNotFoundException]
 	
-	[SidesheetTab
+	[StudyUApiClient
 	  |
-	  +builder: Widget Function(BuildContext)
+	  +supabaseClient: SupabaseClient;
+	  &lt;static&gt;+studyColumns: List&lt;String&gt;;
+	  &lt;static&gt;+studyDisplayColumns: List&lt;String&gt;;
+	  &lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;;
+	  +testDelayMilliseconds: int
+	  |
+	  +dynamic deleteParticipants();
+	  +dynamic getUserStudies();
+	  +dynamic fetchStudy();
+	  +dynamic deleteStudy();
+	  +dynamic saveStudy();
+	  +dynamic fetchStudyInvite();
+	  +dynamic saveStudyInvite();
+	  +dynamic deleteStudyInvite();
+	  +dynamic fetchAppConfig();
+	  +dynamic fetchUser();
+	  +dynamic saveUser();
+	  -dynamic _awaitGuarded();
+	  -dynamic _apiException();
+	  -dynamic _testDelay()
 	]
 	
-	[SidesheetTab]o-[Widget Function(BuildContext)]
-	[NavbarTab]&lt;:-[SidesheetTab]
+	[StudyUApiClient]o-[SupabaseClient]
+	[&lt;abstract&gt;SupabaseClientDependant]&lt;:-[StudyUApiClient]
+	[&lt;abstract&gt;SupabaseQueryMixin]&lt;:-[StudyUApiClient]
+	[&lt;abstract&gt;StudyUApi]&lt;:--[StudyUApiClient]
 	
-	[Sidesheet
+	[Assets
 	  |
-	  &lt;static&gt;+kDefaultWidth: double;
-	  +titleText: String;
-	  +body: Widget?;
-	  +tabs: List&lt;SidesheetTab&gt;?;
-	  +actionButtons: List&lt;Widget&gt;?;
-	  +width: double?;
-	  +withCloseButton: bool;
-	  +ignoreAppBar: bool;
-	  +collapseSingleTab: bool;
-	  +bodyPadding: EdgeInsets?;
-	  +wrapContent: Widget Function(Widget)?
+	  &lt;static&gt;+logoWide: String
 	]
 	
-	[Sidesheet]o-[&lt;abstract&gt;Widget]
-	[Sidesheet]o-[EdgeInsets]
-	[Sidesheet]o-[Widget Function(Widget)?]
-	
-	[FormSideSheetTab
+	[StudiesTableColumnSize
 	  |
-	  +formViewBuilder: Widget Function(T)
+	  +collapsed: bool;
+	  +flex: int?;
+	  +width: double?
+	  |
+	  +Widget createContainer()
 	]
 	
-	[FormSideSheetTab]o-[Widget Function(T)]
-	[NavbarTab]&lt;:-[FormSideSheetTab]
-	
-	[HelpIcon
-	  |
-	  +tooltipText: String?
-	  |
-	  +Widget build()
-	]
-	
-	[EmptyBody
+	[StudiesTable
 	  |
-	  +icon: IconData?;
-	  +leading: Widget?;
-	  +leadingSpacing: double?;
-	  +title: String?;
-	  +description: String?;
-	  +button: Widget?
+	  +itemHeight: double;
+	  +itemPadding: double;
+	  +rowSpacing: double;
+	  +columnSpacing: double;
+	  +compactWidthThreshold: double;
+	  +superCompactWidthThreshold: double;
+	  +compactStatTitleThreshold: double;
+	  +studies: List&lt;Study&gt;;
+	  +onSelect: void Function(Study);
+	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study);
+	  +emptyWidget: Widget;
+	  +pinnedStudies: Iterable&lt;String&gt;;
+	  +dashboardController: DashboardController
 	  |
-	  +Widget build()
+	  +Widget build();
+	  -Widget _buildColumnHeader()
 	]
 	
-	[EmptyBody]o-[IconData]
-	[EmptyBody]o-[&lt;abstract&gt;Widget]
+	[StudiesTable]o-[void Function(Study)]
+	[StudiesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)]
+	[StudiesTable]o-[&lt;abstract&gt;Widget]
+	[StudiesTable]o-[DashboardController]
 	
-	[IndicatorRangeSliderThumbShape
-	  |
-	  +buildContext: BuildContext;
-	  +start: T;
-	  +end: T
+	[StudiesTableColumn
 	  |
-	  +Size getPreferredSize();
-	  +void paint()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudiesTableColumn&gt;;
+	  &lt;static&gt;+pin: StudiesTableColumn;
+	  &lt;static&gt;+title: StudiesTableColumn;
+	  &lt;static&gt;+status: StudiesTableColumn;
+	  &lt;static&gt;+participation: StudiesTableColumn;
+	  &lt;static&gt;+createdAt: StudiesTableColumn;
+	  &lt;static&gt;+enrolled: StudiesTableColumn;
+	  &lt;static&gt;+active: StudiesTableColumn;
+	  &lt;static&gt;+completed: StudiesTableColumn;
+	  &lt;static&gt;+action: StudiesTableColumn
 	]
 	
-	[IndicatorRangeSliderThumbShape]o-[&lt;abstract&gt;BuildContext]
-	[&lt;abstract&gt;RangeSliderThumbShape]&lt;:-[IndicatorRangeSliderThumbShape]
+	[StudiesTableColumn]o-[StudiesTableColumn]
+	[Enum]&lt;:--[StudiesTableColumn]
 	
-	[MouseEventsRegion
+	[StudiesTableItem
 	  |
-	  +onTap: void Function()?;
-	  +onHover: void Function(PointerHoverEvent)?;
-	  +onEnter: void Function(PointerEnterEvent)?;
-	  +onExit: void Function(PointerExitEvent)?;
-	  +autoselectCursor: bool;
-	  +cursor: SystemMouseCursor;
-	  &lt;static&gt;+defaultCursor: SystemMouseCursor;
-	  +autoCursor: SystemMouseCursor
-	]
-	
-	[MouseEventsRegion]o-[void Function()?]
-	[MouseEventsRegion]o-[void Function(PointerHoverEvent)?]
-	[MouseEventsRegion]o-[void Function(PointerEnterEvent)?]
-	[MouseEventsRegion]o-[void Function(PointerExitEvent)?]
-	[MouseEventsRegion]o-[SystemMouseCursor]
-	
-	[ReactiveCustomColorPicker
+	  +study: Study;
+	  +itemHeight: double;
+	  +itemPadding: double;
+	  +rowSpacing: double;
+	  +columnSpacing: double;
+	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
+	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
+	  +isPinned: bool;
+	  +onPinnedChanged: void Function(Study, bool)?;
+	  +onTap: void Function(Study)?
 	]
 	
-	[ReactiveFormField]&lt;:-[ReactiveCustomColorPicker]
+	[StudiesTableItem]o-[Study]
+	[StudiesTableItem]o-[void Function(Study, bool)?]
+	[StudiesTableItem]o-[void Function(Study)?]
 	
-	[TextParagraph
+	[DashboardScaffold
 	  |
-	  +text: String?;
-	  +style: TextStyle?;
-	  +selectable: bool;
-	  +span: List&lt;TextSpan&gt;?
+	  &lt;static&gt;+compactWidthThreshold: double;
+	  +body: Widget
 	  |
 	  +Widget build()
 	]
 	
-	[TextParagraph]o-[TextStyle]
+	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
 	
-	[UnderConstruction
+	[StudiesTableColumnHeader
 	  |
-	  +Widget build()
-	]
-	
-	[NullHelperDecoration
+	  +title: String;
+	  +sortable: bool;
+	  +sortAscending: bool;
+	  +sortingActive: bool;
+	  +onSort: void Function()?
 	]
 	
-	[InputDecoration]&lt;:-[NullHelperDecoration]
+	[StudiesTableColumnHeader]o-[void Function()?]
 	
-	[ActionMenuType
+	[StudiesFilter
 	  |
 	  +index: int;
-	  &lt;static&gt;+values: List&lt;ActionMenuType&gt;;
-	  &lt;static&gt;+inline: ActionMenuType;
-	  &lt;static&gt;+popup: ActionMenuType
+	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
 	]
 	
-	[ActionMenuType]o-[ActionMenuType]
-	[Enum]&lt;:--[ActionMenuType]
+	[Enum]&lt;:--[StudiesFilter]
 	
-	[HtmlStylingBanner
+	[DashboardController
 	  |
-	  +isDismissed: bool;
-	  +onDismissed: dynamic Function()?
+	  +studyRepository: IStudyRepository;
+	  +authRepository: IAuthRepository;
+	  +userRepository: IUserRepository;
+	  +router: GoRouter;
+	  -_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?;
+	  +searchController: SearchController;
+	  +isSortAscending: bool
 	  |
-	  +Widget build()
+	  -dynamic _subscribeStudies();
+	  +dynamic setSearchText();
+	  +dynamic setStudiesFilter();
+	  +dynamic onSelectStudy();
+	  +dynamic onClickNewStudy();
+	  +dynamic pinStudy();
+	  +dynamic pinOffStudy();
+	  +void setSorting();
+	  +void filterStudies();
+	  +void sortStudies();
+	  +bool isSortingActiveForColumn();
+	  +bool isPinned();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void dispose()
 	]
 	
-	[HtmlStylingBanner]o-[dynamic Function()?]
+	[DashboardController]o-[&lt;abstract&gt;IStudyRepository]
+	[DashboardController]o-[&lt;abstract&gt;IAuthRepository]
+	[DashboardController]o-[&lt;abstract&gt;IUserRepository]
+	[DashboardController]o-[GoRouter]
+	[DashboardController]o-[StreamSubscription]
+	[DashboardController]o-[SearchController]
+	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
 	
-	[&lt;abstract&gt;FormConsumerWidget
+	[DashboardScreen
 	  |
-	  +Widget build()
+	  +filter: StudiesFilter?
 	]
 	
-	[&lt;abstract&gt;FormConsumerRefWidget
+	[DashboardScreen]o-[StudiesFilter]
+	
+	[AuthFormController
 	  |
-	  +Widget build()
+	  +authRepository: IAuthRepository;
+	  +notificationService: INotificationService;
+	  +router: GoRouter;
+	  +emailControl: FormControl&lt;String&gt;;
+	  +passwordControl: FormControl&lt;String&gt;;
+	  +passwordConfirmationControl: FormControl&lt;String&gt;;
+	  +termsOfServiceControl: FormControl&lt;bool&gt;;
+	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
+	  +loginForm: FormGroup;
+	  +signupForm: FormGroup;
+	  +passwordForgotForm: FormGroup;
+	  +passwordRecoveryForm: FormGroup;
+	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
+	  -_formKey: AuthFormKey;
+	  +formKey: AuthFormKey;
+	  +form: FormGroup
+	  |
+	  -dynamic _getFormFor();
+	  -dynamic _onChangeFormKey();
+	  +dynamic resetControlsFor();
+	  -dynamic _forceValidationMessages();
+	  +dynamic signUp();
+	  -dynamic _signUp();
+	  +dynamic signIn();
+	  -dynamic _signInWith();
+	  +dynamic signOut();
+	  +dynamic resetPasswordForEmail();
+	  +dynamic sendPasswordResetLink();
+	  +dynamic recoverPassword();
+	  +dynamic updateUser();
+	  -dynamic _readDebugUser()
 	]
 	
-	[SplashPage
+	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
+	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
+	[AuthFormController]o-[GoRouter]
+	[AuthFormController]o-[FormControl]
+	[AuthFormController]o-[FormGroup]
+	[AuthFormController]o-[AuthFormKey]
+	[&lt;abstract&gt;IFormGroupController]&lt;:--[AuthFormController]
+	
+	[AuthFormKey
 	  |
-	  +Widget build()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;AuthFormKey&gt;;
+	  &lt;static&gt;+login: AuthFormKey;
+	  &lt;static&gt;+signup: AuthFormKey;
+	  &lt;static&gt;+passwordForgot: AuthFormKey;
+	  &lt;static&gt;+passwordRecovery: AuthFormKey;
+	  &lt;static&gt;-_loginSubmit: AuthFormKey;
+	  &lt;static&gt;-_signupSubmit: AuthFormKey
 	]
 	
-	[ErrorPage
+	[AuthFormKey]o-[AuthFormKey]
+	[Enum]&lt;:--[AuthFormKey]
+	
+	[PasswordRecoveryForm
 	  |
-	  +error: Exception?
+	  +formKey: AuthFormKey
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ErrorPage]
+	[PasswordRecoveryForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
 	
-	[StudyULogo
+	[PasswordForgotForm
 	  |
-	  +onTap: void Function()?
+	  +formKey: AuthFormKey
 	  |
 	  +Widget build()
 	]
 	
-	[StudyULogo]o-[void Function()?]
+	[PasswordForgotForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
 	
-	[SingleColumnLayout
+	[LoginForm
 	  |
-	  &lt;static&gt;+defaultConstraints: BoxConstraints;
-	  &lt;static&gt;+defaultConstraintsNarrow: BoxConstraints;
-	  +body: Widget;
-	  +header: Widget?;
-	  +stickyHeader: bool;
-	  +constraints: BoxConstraints?;
-	  +scroll: bool;
-	  +padding: EdgeInsets?
+	  +formKey: AuthFormKey
 	  |
-	  &lt;static&gt;+dynamic fromType()
+	  +Widget build()
 	]
 	
-	[SingleColumnLayout]o-[BoxConstraints]
-	[SingleColumnLayout]o-[&lt;abstract&gt;Widget]
-	[SingleColumnLayout]o-[EdgeInsets]
+	[LoginForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
 	
-	[SingleColumnLayoutType
+	[EmailTextField
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;;
-	  &lt;static&gt;+boundedWide: SingleColumnLayoutType;
-	  &lt;static&gt;+boundedNarrow: SingleColumnLayoutType;
-	  &lt;static&gt;+stretched: SingleColumnLayoutType;
-	  &lt;static&gt;+split: SingleColumnLayoutType
+	  +labelText: String;
+	  +hintText: String?;
+	  +formControlName: String?;
+	  +formControl: FormControl&lt;dynamic&gt;?
 	]
 	
-	[SingleColumnLayoutType]o-[SingleColumnLayoutType]
-	[Enum]&lt;:--[SingleColumnLayoutType]
+	[EmailTextField]o-[FormControl]
 	
-	[Hyperlink
+	[PasswordTextField
 	  |
-	  +text: String;
-	  +url: String?;
-	  +onClick: void Function()?;
-	  +linkColor: Color;
-	  +hoverColor: Color?;
-	  +visitedColor: Color?;
-	  +style: TextStyle?;
-	  +hoverStyle: TextStyle?;
-	  +visitedStyle: TextStyle?;
-	  +icon: IconData?;
-	  +iconSize: double?
+	  +labelText: String;
+	  +hintText: String?;
+	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
+	  +formControlName: String?;
+	  +formControl: FormControl&lt;dynamic&gt;?
 	]
 	
-	[Hyperlink]o-[void Function()?]
-	[Hyperlink]o-[Color]
-	[Hyperlink]o-[TextStyle]
-	[Hyperlink]o-[IconData]
+	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
+	[PasswordTextField]o-[FormControl]
 	
-	[StandardTableColumn
+	[AuthScaffold
 	  |
-	  +label: String;
-	  +tooltip: String?;
-	  +columnWidth: TableColumnWidth;
-	  +sortable: bool;
-	  +sortAscending: bool?;
-	  +sortableIcon: Widget?
+	  +body: Widget;
+	  +formKey: AuthFormKey;
+	  +leftContentMinWidth: double;
+	  +leftPanelMinWidth: double;
+	  +leftPanelPadding: EdgeInsets
 	]
 	
-	[StandardTableColumn]o-[&lt;abstract&gt;TableColumnWidth]
-	[StandardTableColumn]o-[&lt;abstract&gt;Widget]
+	[AuthScaffold]o-[&lt;abstract&gt;Widget]
+	[AuthScaffold]o-[AuthFormKey]
+	[AuthScaffold]o-[EdgeInsets]
 	
-	[StandardTable
+	[StudyUJobsToBeDone
 	  |
-	  +items: List&lt;T&gt;;
-	  +inputColumns: List&lt;StandardTableColumn&gt;;
-	  +onSelectItem: void Function(T);
-	  +trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?;
-	  +trailingActionsMenuType: ActionMenuType?;
-	  +sortColumnPredicates: List&lt;int Function(T, T)?&gt;?;
-	  +pinnedPredicates: int Function(T, T)?;
-	  +headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
-	  +dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
-	  +inputTrailingActionsColumn: StandardTableColumn;
-	  +tableWrapper: Widget Function(Widget)?;
-	  +cellSpacing: double;
-	  +rowSpacing: double;
-	  +minRowHeight: double?;
-	  +showTableHeader: bool;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  +leadingWidget: Widget?;
-	  +trailingWidget: Widget?;
-	  +leadingWidgetSpacing: double?;
-	  +trailingWidgetSpacing: double?;
-	  +emptyWidget: Widget?;
-	  +rowStyle: StandardTableStyle;
-	  +disableRowInteractions: bool
+	  +Widget build()
 	]
 	
-	[StandardTable]o-[void Function(T)]
-	[StandardTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?]
-	[StandardTable]o-[ActionMenuType]
-	[StandardTable]o-[int Function(T, T)?]
-	[StandardTable]o-[TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?]
-	[StandardTable]o-[StandardTableColumn]
-	[StandardTable]o-[Widget Function(Widget)?]
-	[StandardTable]o-[&lt;abstract&gt;Widget]
-	[StandardTable]o-[StandardTableStyle]
-	
-	[StandardTableStyle
+	[SignupForm
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StandardTableStyle&gt;;
-	  &lt;static&gt;+plain: StandardTableStyle;
-	  &lt;static&gt;+material: StandardTableStyle
+	  +formKey: AuthFormKey
+	  |
+	  +Widget build();
+	  -dynamic _onClickTermsOfUse();
+	  -dynamic _onClickPrivacyPolicy()
 	]
 	
-	[StandardTableStyle]o-[StandardTableStyle]
-	[Enum]&lt;:--[StandardTableStyle]
+	[SignupForm]o-[AuthFormKey]
+	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
 	
-	[IconPack
+	[StudyInvitesTable
 	  |
-	  &lt;static&gt;+defaultPack: List&lt;IconOption&gt;;
-	  &lt;static&gt;+material: List&lt;IconOption&gt;
+	  +invites: List&lt;StudyInvite&gt;;
+	  +onSelect: void Function(StudyInvite);
+	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
+	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
+	  +getIntervention: Intervention? Function(String);
+	  +getParticipantCountForInvite: int Function(StudyInvite)
 	  |
-	  &lt;static&gt;+IconOption? resolveIconByName()
+	  +Widget build();
+	  -List&lt;Widget&gt; _buildRow()
 	]
 	
-	[IconOption
+	[StudyInvitesTable]o-[void Function(StudyInvite)]
+	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
+	[StudyInvitesTable]o-[Intervention? Function(String)]
+	[StudyInvitesTable]o-[int Function(StudyInvite)]
+	
+	[EnrolledBadge
 	  |
-	  +name: String;
-	  +icon: IconData?;
-	  +isEmpty: bool;
-	  +props: List&lt;Object?&gt;
+	  +enrolledCount: int
 	  |
-	  +String toJson();
-	  &lt;static&gt;+IconOption fromJson()
+	  +Widget build()
 	]
 	
-	[IconOption]o-[IconData]
-	[&lt;abstract&gt;Equatable]&lt;:-[IconOption]
-	
-	[ReactiveIconPicker
+	[StudyRecruitScreen
+	  |
+	  +Widget build();
+	  -Widget _inviteCodesSectionHeader();
+	  -Widget _newInviteCodeButton();
+	  -dynamic _onSelectInvite()
 	]
 	
-	[ReactiveFocusableFormField]&lt;:-[ReactiveIconPicker]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
 	
-	[IconPicker
+	[InviteCodeFormViewModel
 	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +selectedOption: IconOption?;
-	  +onSelect: void Function(IconOption)?;
-	  +galleryIconSize: double?;
-	  +selectedIconSize: double?;
-	  +focusNode: FocusNode?;
-	  +isDisabled: bool
+	  +study: Study;
+	  +inviteCodeRepository: IInviteCodeRepository;
+	  +codeControl: FormControl&lt;String&gt;;
+	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
+	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
+	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
+	  +interventionAControl: FormControl&lt;String&gt;;
+	  +interventionBControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
+	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
+	  +isPreconfiguredSchedule: bool;
+	  +preconfiguredSchedule: List&lt;String&gt;?
 	  |
-	  +Widget build()
+	  +void initControls();
+	  -dynamic _uniqueInviteCode();
+	  +void regenerateCode();
+	  -String _generateCode();
+	  +StudyInvite buildFormData();
+	  +void setControlsFrom();
+	  +dynamic save()
 	]
 	
-	[IconPicker]o-[IconOption]
-	[IconPicker]o-[void Function(IconOption)?]
-	[IconPicker]o-[FocusNode]
+	[InviteCodeFormViewModel]o-[Study]
+	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
+	[InviteCodeFormViewModel]o-[FormControl]
+	[InviteCodeFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
 	
-	[IconPickerField
+	[InviteCodeFormView
 	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +selectedOption: IconOption?;
-	  +selectedIconSize: double?;
-	  +galleryIconSize: double?;
-	  +onSelect: void Function(IconOption)?;
-	  +focusNode: FocusNode?;
-	  +isDisabled: bool
+	  +formViewModel: InviteCodeFormViewModel
 	  |
-	  +Widget build()
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
 	]
 	
-	[IconPickerField]o-[IconOption]
-	[IconPickerField]o-[void Function(IconOption)?]
-	[IconPickerField]o-[FocusNode]
+	[InviteCodeFormView]o-[InviteCodeFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
 	
-	[IconPickerGallery
+	[StudyRecruitController
 	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +onSelect: void Function(IconOption)?;
-	  +iconSize: double
+	  +inviteCodeRepository: IInviteCodeRepository;
+	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
+	  |
+	  -dynamic _subscribeInvites();
+	  +Intervention? getIntervention();
+	  +int getParticipantCountForInvite();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void dispose()
+	]
+	
+	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
+	[StudyRecruitController]o-[StreamSubscription]
+	[StudyBaseController]&lt;:-[StudyRecruitController]
+	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
+	
+	[App
+	]
+	
+	[AppContent
+	]
+	
+	[StudyAnalyzeScreen
 	  |
+	  +Widget? banner();
 	  +Widget build()
 	]
 	
-	[IconPickerGallery]o-[void Function(IconOption)?]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
 	
-	[SecondaryButton
+	[StudyAnalyzeController
 	  |
-	  +text: String;
-	  +icon: IconData?;
-	  +isLoading: bool;
-	  +onPressed: void Function()?
+	  +dynamic onExport()
+	]
+	
+	[StudyBaseController]&lt;:-[StudyAnalyzeController]
+	
+	[AppStatus
 	  |
-	  +Widget build()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
+	  &lt;static&gt;+initializing: AppStatus;
+	  &lt;static&gt;+initialized: AppStatus
 	]
 	
-	[SecondaryButton]o-[IconData]
-	[SecondaryButton]o-[void Function()?]
+	[AppStatus]o-[AppStatus]
+	[Enum]&lt;:--[AppStatus]
 	
-	[TwoColumnLayout
+	[&lt;abstract&gt;ManagedFormViewModel
 	  |
-	  &lt;static&gt;+defaultDivider: VerticalDivider;
-	  &lt;static&gt;+defaultContentPadding: EdgeInsets;
-	  &lt;static&gt;+slimContentPadding: EdgeInsets;
-	  +leftWidget: Widget;
-	  +rightWidget: Widget;
-	  +dividerWidget: Widget?;
-	  +headerWidget: Widget?;
-	  +flexLeft: int?;
-	  +flexRight: int?;
-	  +constraintsLeft: BoxConstraints?;
-	  +constraintsRight: BoxConstraints?;
-	  +scrollLeft: bool;
-	  +scrollRight: bool;
-	  +paddingLeft: EdgeInsets?;
-	  +paddingRight: EdgeInsets?;
-	  +backgroundColorLeft: Color?;
-	  +backgroundColorRight: Color?;
-	  +stretchHeight: bool
+	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
 	]
 	
-	[TwoColumnLayout]o-[VerticalDivider]
-	[TwoColumnLayout]o-[EdgeInsets]
-	[TwoColumnLayout]o-[&lt;abstract&gt;Widget]
-	[TwoColumnLayout]o-[BoxConstraints]
-	[TwoColumnLayout]o-[Color]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
 	
-	[AppTranslation
-	  |
-	  &lt;static&gt;+dynamic init()
+	[FormViewModelNotFoundException
 	]
 	
-	[&lt;abstract&gt;PlatformLocale
-	  |
-	  +Locale getPlatformLocale()
-	]
+	[Exception]&lt;:--[FormViewModelNotFoundException]
 	
-	[PlatformLocaleWeb
+	[FormViewModelCollection
 	  |
-	  +Locale getPlatformLocale()
-	]
-	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleWeb]
-	
-	[PlatformLocaleMobile
+	  +formViewModels: List&lt;T&gt;;
+	  +formArray: FormArray&lt;dynamic&gt;;
+	  +stagedViewModels: List&lt;T&gt;;
+	  +retrievableViewModels: List&lt;T&gt;;
+	  +formData: List&lt;D&gt;
 	  |
-	  +Locale getPlatformLocale()
+	  +void add();
+	  +T remove();
+	  +T? findWhere();
+	  +T? removeWhere();
+	  +bool contains();
+	  +void stage();
+	  +T commit();
+	  +void reset();
+	  +void read()
 	]
 	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleMobile]
+	[FormViewModelCollection]o-[FormArray]
 	
-	[LanguagePicker
-	  |
-	  +languagePickerType: LanguagePickerType;
-	  +iconColor: Color?;
-	  +offset: Offset?
+	[FormInvalidException
 	]
 	
-	[LanguagePicker]o-[LanguagePickerType]
-	[LanguagePicker]o-[Color]
-	[LanguagePicker]o-[Offset]
+	[Exception]&lt;:--[FormInvalidException]
 	
-	[LanguagePickerType
+	[FormConfigException
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;LanguagePickerType&gt;;
-	  &lt;static&gt;+field: LanguagePickerType;
-	  &lt;static&gt;+icon: LanguagePickerType
+	  +message: String?
 	]
 	
-	[LanguagePickerType]o-[LanguagePickerType]
-	[Enum]&lt;:--[LanguagePickerType]
+	[Exception]&lt;:--[FormConfigException]
 	
-	[&lt;abstract&gt;GoRouteParamEnum
+	[&lt;abstract&gt;IFormViewModelDelegate
 	  |
-	  +String toRouteParam();
-	  +String toShortString()
+	  +dynamic onSave();
+	  +void onCancel()
 	]
 	
-	[RoutingIntents
+	[&lt;abstract&gt;IFormGroupController
 	  |
-	  &lt;static&gt;+root: RoutingIntent;
-	  &lt;static&gt;+studies: RoutingIntent;
-	  &lt;static&gt;+studiesShared: RoutingIntent;
-	  &lt;static&gt;+publicRegistry: RoutingIntent;
-	  &lt;static&gt;+study: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEdit: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditInfo: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditInterventions: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String);
-	  &lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditReports: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String);
-	  &lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute});
-	  &lt;static&gt;+studyRecruit: RoutingIntent Function(String);
-	  &lt;static&gt;+studyMonitor: RoutingIntent Function(String);
-	  &lt;static&gt;+studyAnalyze: RoutingIntent Function(String);
-	  &lt;static&gt;+studySettings: RoutingIntent Function(String);
-	  &lt;static&gt;+accountSettings: RoutingIntent;
-	  &lt;static&gt;+studyNew: RoutingIntent;
-	  &lt;static&gt;+login: RoutingIntent;
-	  &lt;static&gt;+signup: RoutingIntent;
-	  &lt;static&gt;+passwordForgot: RoutingIntent;
-	  &lt;static&gt;+passwordForgot2: RoutingIntent Function(String);
-	  &lt;static&gt;+passwordRecovery: RoutingIntent;
-	  &lt;static&gt;+error: RoutingIntent Function(Exception)
+	  +form: FormGroup
 	]
 	
-	[RoutingIntents]o-[RoutingIntent]
-	[RoutingIntents]o-[RoutingIntent Function(String)]
-	[RoutingIntents]o-[RoutingIntent Function(String, String)]
-	[RoutingIntents]o-[RoutingIntent Function(String, {String? appRoute})]
-	[RoutingIntents]o-[RoutingIntent Function(Exception)]
+	[&lt;abstract&gt;IFormGroupController]o-[FormGroup]
 	
-	[RoutingIntent
+	[FormControlOption
 	  |
-	  +route: GoRoute;
-	  +params: Map&lt;String, String&gt;;
-	  +queryParams: Map&lt;String, String&gt;;
-	  +dispatch: RoutingIntentDispatch?;
-	  +extra: Object?;
-	  +routeName: String;
-	  +arguments: Map&lt;String, String&gt;;
+	  +value: T;
+	  +label: String;
+	  +description: String?;
 	  +props: List&lt;Object?&gt;
-	  |
-	  -dynamic _validateRoute();
-	  +bool matches()
 	]
 	
-	[RoutingIntent]o-[GoRoute]
-	[RoutingIntent]o-[RoutingIntentDispatch]
-	[&lt;abstract&gt;Equatable]&lt;:-[RoutingIntent]
+	[&lt;abstract&gt;Equatable]&lt;:-[FormControlOption]
 	
-	[RoutingIntentDispatch
+	[&lt;abstract&gt;FormViewModel
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;;
-	  &lt;static&gt;+go: RoutingIntentDispatch;
-	  &lt;static&gt;+push: RoutingIntentDispatch
+	  -_formData: T?;
+	  -_formMode: FormMode;
+	  -_validationSet: FormValidationSetEnum?;
+	  +delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?;
+	  +autosave: bool;
+	  -_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;;
+	  -_immediateFormChildrenListenerDebouncer: Debouncer?;
+	  -_autosaveOperation: CancelableOperation&lt;dynamic&gt;?;
+	  -_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;;
+	  +prevFormValue: Map&lt;String, dynamic&gt;?;
+	  &lt;static&gt;-_formKey: String;
+	  +formData: T?;
+	  +formMode: FormMode;
+	  +isReadonly: bool;
+	  +validationSet: FormValidationSetEnum?;
+	  +isDirty: bool;
+	  +title: String;
+	  +isValid: bool;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;
+	  |
+	  -dynamic _setFormData();
+	  -dynamic _rememberDefaultControlValidators();
+	  -Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators();
+	  -dynamic _disableAllControls();
+	  -dynamic _formModeUpdated();
+	  -dynamic _restoreControlsFromFormData();
+	  +void revalidate();
+	  -void _applyValidationSet();
+	  +void read();
+	  +dynamic save();
+	  +dynamic cancel();
+	  +void enableAutosave();
+	  +void listenToImmediateFormChildren();
+	  +dynamic markFormGroupChanged();
+	  +void dispose();
+	  +void setControlsFrom();
+	  +T buildFormData();
+	  +void initControls()
 	]
 	
-	[RoutingIntentDispatch]o-[RoutingIntentDispatch]
-	[Enum]&lt;:--[RoutingIntentDispatch]
+	[&lt;abstract&gt;FormViewModel]o-[FormMode]
+	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;FormValidationSetEnum]
+	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;IFormViewModelDelegate]
+	[&lt;abstract&gt;FormViewModel]o-[Debouncer]
+	[&lt;abstract&gt;FormViewModel]o-[CancelableOperation]
+	[&lt;abstract&gt;IFormGroupController]&lt;:--[&lt;abstract&gt;FormViewModel]
 	
-	[RouterKeys
+	[FormMode
 	  |
-	  &lt;static&gt;+studyKey: ValueKey&lt;String&gt;;
-	  &lt;static&gt;+authKey: ValueKey&lt;String&gt;
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;FormMode&gt;;
+	  &lt;static&gt;+create: FormMode;
+	  &lt;static&gt;+readonly: FormMode;
+	  &lt;static&gt;+edit: FormMode
 	]
 	
-	[RouterKeys]o-[ValueKey]
+	[FormMode]o-[FormMode]
+	[Enum]&lt;:--[FormMode]
 	
-	[RouteParams
+	[UnsavedChangesDialog
 	  |
-	  &lt;static&gt;+studiesFilter: String;
-	  &lt;static&gt;+studyId: String;
-	  &lt;static&gt;+measurementId: String;
-	  &lt;static&gt;+interventionId: String;
-	  &lt;static&gt;+testAppRoute: String
+	  +Widget build()
 	]
 	
-	[RouterConf
+	[FormArrayTable
 	  |
-	  &lt;static&gt;+router: GoRouter;
-	  &lt;static&gt;+routes: List&lt;GoRoute&gt;;
-	  &lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;;
-	  &lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;
+	  +control: AbstractControl&lt;dynamic&gt;;
+	  +items: List&lt;T&gt;;
+	  +onSelectItem: void Function(T);
+	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
+	  +onNewItem: void Function()?;
+	  +rowTitle: String Function(T);
+	  +onNewItemLabel: String;
+	  +sectionTitle: String?;
+	  +sectionDescription: String?;
+	  +emptyIcon: IconData?;
+	  +emptyTitle: String?;
+	  +emptyDescription: String?;
+	  +sectionTitleDivider: bool?;
+	  +rowPrefix: Widget Function(BuildContext, T, int)?;
+	  +rowSuffix: Widget Function(BuildContext, T, int)?;
+	  +leadingWidget: Widget?;
+	  +itemsSectionPadding: EdgeInsets?;
+	  +hideLeadingTrailingWhenEmpty: bool;
+	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
 	  |
-	  &lt;static&gt;+GoRoute route()
+	  +Widget build();
+	  -List&lt;Widget&gt; _buildRow();
+	  -Widget _newItemButton()
 	]
 	
-	[RouterConf]o-[GoRouter]
+	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
+	[FormArrayTable]o-[void Function(T)]
+	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
+	[FormArrayTable]o-[void Function()?]
+	[FormArrayTable]o-[String Function(T)]
+	[FormArrayTable]o-[IconData]
+	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
+	[FormArrayTable]o-[&lt;abstract&gt;Widget]
+	[FormArrayTable]o-[EdgeInsets]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs
+	[&lt;abstract&gt;IFormData
 	  |
-	  +studyId: String
+	  +id: String
+	  |
+	  +IFormData copy()
 	]
 	
-	[&lt;abstract&gt;QuestionFormRouteArgs
+	[CustomFormControl
 	  |
-	  +questionId: String
+	  -_onValueChangedDebouncer: Debouncer?;
+	  -_onStatusChangedDebouncer: Debouncer?;
+	  +onValueChanged: void Function(T?)?;
+	  +onStatusChanged: void Function(ControlStatus)?;
+	  +onStatusChangedDebounceTime: int?;
+	  +onValueChangedDebounceTime: int?
+	  |
+	  +void dispose()
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[&lt;abstract&gt;QuestionFormRouteArgs]
+	[CustomFormControl]o-[Debouncer]
+	[CustomFormControl]o-[void Function(T?)?]
+	[CustomFormControl]o-[void Function(ControlStatus)?]
+	[FormControl]&lt;:-[CustomFormControl]
 	
-	[ScreenerQuestionFormRouteArgs
+	[&lt;abstract&gt;FormValidationSetEnum
 	]
 	
-	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:-[ScreenerQuestionFormRouteArgs]
-	
-	[ConsentItemFormRouteArgs
+	[FormControlValidation
 	  |
-	  +consentId: String
+	  +control: AbstractControl&lt;dynamic&gt;;
+	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
+	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
+	  +validationMessages: Map&lt;String, String Function(Object)&gt;
+	  |
+	  +FormControlValidation merge()
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ConsentItemFormRouteArgs]
+	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
 	
-	[MeasurementFormRouteArgs
+	[DrawerEntry
 	  |
-	  +measurementId: String
+	  +localizedTitle: String Function();
+	  +icon: IconData?;
+	  +localizedHelpText: String Function()?;
+	  +enabled: bool;
+	  +onSelected: void Function(BuildContext, WidgetRef)?;
+	  +autoCloseDrawer: bool;
+	  +title: String;
+	  +helpText: String?
+	  |
+	  +void onClick()
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[MeasurementFormRouteArgs]
+	[DrawerEntry]o-[String Function()]
+	[DrawerEntry]o-[IconData]
+	[DrawerEntry]o-[String Function()?]
+	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
 	
-	[SurveyQuestionFormRouteArgs
+	[GoRouterDrawerEntry
 	  |
-	  +questionId: String
+	  +intent: RoutingIntent;
+	  +onNavigated: void Function()?
+	  |
+	  +void onClick()
 	]
 	
-	[MeasurementFormRouteArgs]&lt;:-[SurveyQuestionFormRouteArgs]
-	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:--[SurveyQuestionFormRouteArgs]
+	[GoRouterDrawerEntry]o-[RoutingIntent]
+	[GoRouterDrawerEntry]o-[void Function()?]
+	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
 	
-	[InterventionFormRouteArgs
+	[AppDrawer
 	  |
-	  +interventionId: String
+	  +width: int;
+	  +autoCloseDrawer: bool;
+	  +leftPaddingEntries: double;
+	  +logoPaddingVertical: double;
+	  +logoPaddingHorizontal: double;
+	  +logoMaxHeight: double;
+	  +logoSectionMinHeight: double;
+	  +logoSectionMaxHeight: double
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[InterventionFormRouteArgs]
-	
-	[InterventionTaskFormRouteArgs
+	[StudyFormValidationSet
 	  |
-	  +taskId: String
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
 	]
 	
-	[InterventionFormRouteArgs]&lt;:-[InterventionTaskFormRouteArgs]
+	[Enum]&lt;:--[StudyFormValidationSet]
 	
-	[ReportItemFormRouteArgs
+	[StudyFormScaffold
 	  |
-	  +sectionId: String
+	  +studyId: String;
+	  +formViewModelBuilder: T Function(WidgetRef);
+	  +formViewBuilder: Widget Function(T)
+	  |
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ReportItemFormRouteArgs]
+	[StudyFormScaffold]o-[T Function(WidgetRef)]
+	[StudyFormScaffold]o-[Widget Function(T)]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
 	
-	[DropdownMenuItemTheme
+	[StudyDesignEnrollmentFormView
 	  |
-	  +iconTheme: IconThemeData?
+	  +Widget build();
+	  -dynamic _showScreenerQuestionSidesheetWithArgs();
+	  -dynamic _showConsentItemSidesheetWithArgs()
 	]
 	
-	[DropdownMenuItemTheme]o-[IconThemeData]
-	[&lt;abstract&gt;Diagnosticable]&lt;:-[DropdownMenuItemTheme]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
 	
-	[ThemeConfig
+	[EnrollmentFormData
 	  |
-	  &lt;static&gt;+kMinContentWidth: double;
-	  &lt;static&gt;+kMaxContentWidth: double;
-	  &lt;static&gt;+kHoverFadeFactor: double;
-	  &lt;static&gt;+kMuteFadeFactor: double
+	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
+	  +enrollmentType: Participation;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
+	  +id: String
 	  |
-	  &lt;static&gt;+dynamic bodyBackgroundColor();
-	  &lt;static&gt;+Color modalBarrierColor();
-	  &lt;static&gt;+Color containerColor();
-	  &lt;static&gt;+Color colorPickerInitialColor();
-	  &lt;static&gt;+TextStyle bodyTextMuted();
-	  &lt;static&gt;+TextStyle bodyTextBackground();
-	  &lt;static&gt;+double iconSplashRadius();
-	  &lt;static&gt;+Color sidesheetBackgroundColor();
-	  &lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme();
-	  &lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()
+	  +Study apply();
+	  +EnrollmentFormData copy()
 	]
 	
-	[NoAnimationPageTransitionsBuilder
+	[EnrollmentFormData]o-[Participation]
+	[EnrollmentFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
+	
+	[EnrollmentFormViewModel
 	  |
-	  +Widget buildTransitions()
+	  +study: Study;
+	  +router: GoRouter;
+	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
+	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
+	  +consentItemArray: FormArray&lt;dynamic&gt;;
+	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
+	  +form: FormGroup;
+	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
+	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestScreener: bool;
+	  +canTestConsent: bool;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  |
+	  +void setControlsFrom();
+	  +EnrollmentFormData buildFormData();
+	  +void read();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
+	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
+	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
+	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
+	  +dynamic testScreener();
+	  +dynamic testConsent();
+	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
 	]
 	
-	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[NoAnimationPageTransitionsBuilder]
+	[EnrollmentFormViewModel]o-[Study]
+	[EnrollmentFormViewModel]o-[GoRouter]
+	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
+	[EnrollmentFormViewModel]o-[FormControl]
+	[EnrollmentFormViewModel]o-[FormArray]
+	[EnrollmentFormViewModel]o-[FormViewModelCollection]
+	[EnrollmentFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
 	
-	[WebTransitionBuilder
+	[EnrollmentFormConsentItemDelegate
 	  |
-	  +Widget buildTransitions()
+	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
+	  +owner: EnrollmentFormViewModel;
+	  +propagateOnSave: bool;
+	  +validationSet: dynamic
+	  |
+	  +void onCancel();
+	  +dynamic onSave();
+	  +ConsentItemFormViewModel provide();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem()
 	]
 	
-	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[WebTransitionBuilder]
+	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
+	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
 	
-	[ThemeSettingChange
+	[ConsentItemFormData
 	  |
-	  +settings: ThemeSettings
+	  +consentId: String;
+	  +title: String;
+	  +description: String;
+	  +iconName: String?;
+	  +id: String
+	  |
+	  +ConsentItem toConsentItem();
+	  +ConsentItemFormData copy()
 	]
 	
-	[ThemeSettingChange]o-[ThemeSettings]
-	[&lt;abstract&gt;Notification]&lt;:-[ThemeSettingChange]
+	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
 	
-	[ThemeProvider
+	[ConsentItemFormViewModel
 	  |
-	  +settings: ValueNotifier&lt;ThemeSettings&gt;;
-	  +lightDynamic: ColorScheme?;
-	  +darkDynamic: ColorScheme?;
-	  +pageTransitionsTheme: PageTransitionsTheme;
-	  +shapeMedium: ShapeBorder
+	  +consentIdControl: FormControl&lt;String&gt;;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +iconControl: FormControl&lt;IconOption&gt;;
+	  +form: FormGroup;
+	  +consentId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +Color custom();
-	  +Color blend();
-	  +Color source();
-	  +ColorScheme colors();
-	  +CardTheme cardTheme();
-	  +ListTileThemeData listTileTheme();
-	  +AppBarTheme appBarTheme();
-	  +SnackBarThemeData snackBarThemeData();
-	  +TabBarTheme tabBarTheme();
-	  +BottomAppBarTheme bottomAppBarTheme();
-	  +BottomNavigationBarThemeData bottomNavigationBarTheme();
-	  +SwitchThemeData switchTheme();
-	  +InputDecorationTheme inputDecorationTheme();
-	  +TextTheme textTheme();
-	  +DividerThemeData dividerTheme();
-	  +NavigationRailThemeData navigationRailTheme();
-	  +DrawerThemeData drawerTheme();
-	  +IconThemeData iconTheme();
-	  +CheckboxThemeData checkboxTheme();
-	  +RadioThemeData radioTheme();
-	  +TooltipThemeData tooltipTheme();
-	  +ThemeData light();
-	  +ThemeData dark();
-	  +ThemeMode themeMode();
-	  +ThemeData theme();
-	  &lt;static&gt;+ThemeProvider of();
-	  +bool updateShouldNotify()
+	  +void setControlsFrom();
+	  +ConsentItemFormData buildFormData();
+	  +ConsentItemFormViewModel createDuplicate()
 	]
 	
-	[ThemeProvider]o-[ValueNotifier]
-	[ThemeProvider]o-[ColorScheme]
-	[ThemeProvider]o-[PageTransitionsTheme]
-	[ThemeProvider]o-[&lt;abstract&gt;ShapeBorder]
-	[&lt;abstract&gt;InheritedWidget]&lt;:-[ThemeProvider]
+	[ConsentItemFormViewModel]o-[FormControl]
+	[ConsentItemFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
 	
-	[ThemeSettings
+	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
 	  |
-	  +sourceColor: Color;
-	  +themeMode: ThemeMode
+	  +isDirtyOptionsBannerVisible: bool
 	]
 	
-	[ThemeSettings]o-[Color]
-	[ThemeSettings]o-[ThemeMode]
-	
-	[CustomColor
+	[ScreenerQuestionLogicFormView
 	  |
-	  +name: String;
-	  +color: Color;
-	  +blend: bool
+	  +formViewModel: ScreenerQuestionFormViewModel
 	  |
-	  +Color value()
+	  +Widget build();
+	  -dynamic _buildInfoBanner();
+	  -dynamic _buildAnswerOptionsLogicControls();
+	  -List&lt;Widget&gt; _buildOptionLogicRow()
 	]
 	
-	[CustomColor]o-[Color]
+	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
 	
-	[SuppressedBehaviorSubject
+	[ScreenerQuestionFormViewModel
 	  |
-	  +subject: BehaviorSubject&lt;T&gt;;
-	  +didSuppressInitialEvent: bool;
-	  -_controller: StreamController&lt;T&gt;
+	  &lt;static&gt;+defaultResponseOptionValidity: bool;
+	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
+	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
+	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
+	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +prevResponseOptionValues: List&lt;dynamic&gt;;
+	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isDirtyOptionsBannerVisible: bool
 	  |
-	  -StreamController&lt;T&gt; _buildDerivedController();
-	  +dynamic close()
+	  +dynamic onResponseOptionsChanged();
+	  +void setControlsFrom();
+	  +QuestionFormData buildFormData();
+	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
+	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
+	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
+	  +ScreenerQuestionFormViewModel createDuplicate()
 	]
 	
-	[SuppressedBehaviorSubject]o-[BehaviorSubject]
-	[SuppressedBehaviorSubject]o-[StreamController]
+	[ScreenerQuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
+	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
 	
-	[Time
+	[ConsentItemFormView
 	  |
-	  &lt;static&gt;+dynamic fromTimeOfDay();
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+Time fromJson()
+	  +formViewModel: ConsentItemFormViewModel
 	]
 	
-	[TimeOfDay]&lt;:-[Time]
+	[ConsentItemFormView]o-[ConsentItemFormViewModel]
 	
-	[TimeValueAccessor
+	[DataReferenceIdentifier
 	  |
-	  +String modelToViewValue();
-	  +Time? viewToModelValue();
-	  -String _addLeadingZeroIfNeeded()
+	  +hashCode: int
+	  |
+	  +bool ==()
 	]
 	
-	[&lt;abstract&gt;ControlValueAccessor]&lt;:-[TimeValueAccessor]
+	[DataReference]&lt;:-[DataReferenceIdentifier]
 	
-	[ModelAction
+	[AverageSectionFormView
 	  |
-	  +type: T;
-	  +label: String;
-	  +icon: IconData?;
-	  +onExecute: Function;
-	  +isAvailable: bool;
-	  +isDestructive: bool
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
+	  |
+	  +Widget build()
 	]
 	
-	[ModelAction]o-[IconData]
+	[AverageSectionFormView]o-[ReportItemFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
 	
-	[&lt;abstract&gt;IModelActionProvider
+	[TemporalAggregationFormatted
 	  |
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
+	  -_value: TemporalAggregation;
+	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
+	  +value: TemporalAggregation;
+	  +string: String;
+	  +icon: IconData?;
+	  +hashCode: int
+	  |
+	  +bool ==();
+	  +String toString();
+	  +String toJson();
+	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
 	]
 	
-	[&lt;abstract&gt;IListActionProvider
+	[TemporalAggregationFormatted]o-[TemporalAggregation]
+	[TemporalAggregationFormatted]o-[IconData]
+	
+	[ImprovementDirectionFormatted
 	  |
-	  +void onSelectItem();
-	  +void onNewItem()
+	  -_value: ImprovementDirection;
+	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
+	  +value: ImprovementDirection;
+	  +string: String;
+	  +icon: IconData?;
+	  +hashCode: int
+	  |
+	  +bool ==();
+	  +String toString();
+	  +String toJson();
+	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
 	]
 	
-	[&lt;abstract&gt;IModelActionProvider]&lt;:-[&lt;abstract&gt;IListActionProvider]
+	[ImprovementDirectionFormatted]o-[ImprovementDirection]
+	[ImprovementDirectionFormatted]o-[IconData]
 	
-	[ModelActionType
+	[ReportSectionType
 	  |
 	  +index: int;
-	  &lt;static&gt;+values: List&lt;ModelActionType&gt;;
-	  &lt;static&gt;+edit: ModelActionType;
-	  &lt;static&gt;+delete: ModelActionType;
-	  &lt;static&gt;+remove: ModelActionType;
-	  &lt;static&gt;+duplicate: ModelActionType;
-	  &lt;static&gt;+clipboard: ModelActionType;
-	  &lt;static&gt;+primary: ModelActionType
+	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
+	  &lt;static&gt;+average: ReportSectionType;
+	  &lt;static&gt;+linearRegression: ReportSectionType
 	]
 	
-	[ModelActionType]o-[ModelActionType]
-	[Enum]&lt;:--[ModelActionType]
+	[ReportSectionType]o-[ReportSectionType]
+	[Enum]&lt;:--[ReportSectionType]
 	
-	[OptimisticUpdate
+	[DataReferenceEditor
 	  |
-	  +applyOptimistic: void Function();
-	  +apply: dynamic Function();
-	  +rollback: void Function();
-	  +onUpdate: void Function()?;
-	  +onError: void Function(Object, StackTrace?)?;
-	  +rethrowErrors: bool;
-	  +runOptimistically: bool;
-	  +completeFutureOptimistically: bool
+	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
+	  +availableTasks: List&lt;Task&gt;;
+	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
 	  |
-	  +dynamic execute();
-	  -void _runUpdateHandlerIfAny()
+	  +FormTableRow buildFormTableRow();
+	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
 	]
 	
-	[OptimisticUpdate]o-[void Function()]
-	[OptimisticUpdate]o-[dynamic Function()]
-	[OptimisticUpdate]o-[void Function()?]
-	[OptimisticUpdate]o-[void Function(Object, StackTrace?)?]
+	[DataReferenceEditor]o-[FormControl]
+	[DataReferenceEditor]o-[ReactiveDropdownField]
 	
-	[&lt;abstract&gt;FileFormatEncoder
+	[LinearRegressionSectionFormView
 	  |
-	  +dynamic encodeAsync();
-	  +String encode();
-	  +dynamic call()
-	]
-	
-	[CSVStringEncoder
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
 	  |
-	  +String encode()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[CSVStringEncoder]
+	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
 	
-	[JsonStringEncoder
+	[ReportItemFormView
 	  |
-	  +String encode()
+	  +formViewModel: ReportItemFormViewModel;
+	  +studyId: String;
+	  +reportSectionColumnWidth: dynamic;
+	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
+	  |
+	  +Widget build();
+	  -dynamic _buildSectionText();
+	  -dynamic _buildSectionTypeHeader()
 	]
 	
-	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[JsonStringEncoder]
+	[ReportItemFormView]o-[ReportItemFormViewModel]
+	[ReportItemFormView]o-[Widget Function(BuildContext)]
 	
-	[&lt;abstract&gt;ExecutionLimiter
+	[ReportItemFormViewModel
 	  |
-	  +milliseconds: int;
-	  &lt;static&gt;-_timer: Timer?
+	  &lt;static&gt;+defaultSectionType: ReportSectionType;
+	  +sectionIdControl: FormControl&lt;String&gt;;
+	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +sectionControl: FormControl&lt;ReportSection&gt;;
+	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
+	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
+	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
+	  +alphaControl: FormControl&lt;double&gt;;
+	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
+	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +form: FormGroup;
+	  +sectionId: String;
+	  +sectionType: ReportSectionType;
+	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
+	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
+	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +dataReferenceRequired: dynamic;
+	  +aggregationRequired: dynamic;
+	  +improvementDirectionRequired: dynamic;
+	  +alphaConfidenceRequired: dynamic
 	  |
-	  +void dispose()
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +ReportItemFormData buildFormData();
+	  +ReportItemFormViewModel createDuplicate();
+	  +dynamic onSectionTypeChanged();
+	  -void _updateFormControls();
+	  +void setControlsFrom()
 	]
 	
-	[&lt;abstract&gt;ExecutionLimiter]o-[Timer]
+	[ReportItemFormViewModel]o-[ReportSectionType]
+	[ReportItemFormViewModel]o-[FormControl]
+	[ReportItemFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
 	
-	[Debouncer
+	[ReportItemFormData
 	  |
-	  +leading: bool;
-	  +cancelUncompleted: bool;
-	  -_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?
+	  +isPrimary: bool;
+	  +section: ReportSection;
+	  +id: String
 	  |
-	  +dynamic call()
+	  &lt;static&gt;+dynamic fromDomainModel();
+	  +ReportItemFormData copy()
 	]
 	
-	[Debouncer]o-[CancelableOperation]
-	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Debouncer]
-	
-	[Throttler
-	  |
-	  +dynamic call()
-	]
-	
-	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Throttler]
+	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
+	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
 	
-	[SerializableColor
+	[ReportsFormViewModel
 	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+SerializableColor fromJson()
-	]
-	
-	[Color]&lt;:-[SerializableColor]
-	
-	[&lt;abstract&gt;IProviderArgsResolver
+	  +study: Study;
+	  +router: GoRouter;
+	  +reportItemDelegate: ReportFormItemDelegate;
+	  +reportItemArray: FormArray&lt;dynamic&gt;;
+	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
+	  +form: FormGroup;
+	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestConsent: bool
 	  |
-	  +R provide()
+	  +void setControlsFrom();
+	  +ReportsFormData buildFormData();
+	  +void read();
+	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
+	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
+	  +dynamic testReport();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +ReportItemFormViewModel provide()
 	]
 	
-	[CombinedStreamNotifier
+	[ReportsFormViewModel]o-[Study]
+	[ReportsFormViewModel]o-[GoRouter]
+	[ReportsFormViewModel]o-[ReportFormItemDelegate]
+	[ReportsFormViewModel]o-[FormArray]
+	[ReportsFormViewModel]o-[FormViewModelCollection]
+	[ReportsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
+	
+	[ReportFormItemDelegate
 	  |
-	  -_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;
+	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
+	  +owner: ReportsFormViewModel;
+	  +propagateOnSave: bool;
+	  +validationSet: dynamic
 	  |
-	  +void dispose()
+	  +void onCancel();
+	  +dynamic onSave();
+	  +ReportItemFormViewModel provide();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem()
 	]
 	
-	[ChangeNotifier]&lt;:-[CombinedStreamNotifier]
+	[ReportFormItemDelegate]o-[FormViewModelCollection]
+	[ReportFormItemDelegate]o-[ReportsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
 	
-	[CountWhereValidator
+	[ReportBadge
 	  |
-	  +predicate: bool Function(T?);
-	  +minCount: int?;
-	  +maxCount: int?;
-	  &lt;static&gt;+kValidationMessageMinCount: String;
-	  &lt;static&gt;+kValidationMessageMaxCount: String
+	  +status: ReportStatus?;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +showTooltip: bool
 	  |
-	  +Map&lt;String, dynamic&gt;? validate()
+	  +Widget build()
 	]
 	
-	[CountWhereValidator]o-[bool Function(T?)]
-	[&lt;abstract&gt;Validator]&lt;:-[CountWhereValidator]
+	[ReportBadge]o-[ReportStatus]
+	[ReportBadge]o-[BadgeType]
 	
-	[Patterns
+	[StudyDesignReportsFormView
 	  |
-	  &lt;static&gt;+timeFormatString: String;
-	  &lt;static&gt;+emailFormatString: String;
-	  &lt;static&gt;+url: String
+	  +Widget build();
+	  -dynamic _showReportItemSidesheetWithArgs()
 	]
 	
-	[NumericalRangeFormatter
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
+	
+	[ReportsFormData
 	  |
-	  +min: int?;
-	  +max: int?
+	  +reportItems: List&lt;ReportItemFormData&gt;;
+	  +id: String
 	  |
-	  +TextEditingValue formatEditUpdate()
+	  +Study apply();
+	  +ReportsFormData copy()
 	]
 	
-	[&lt;abstract&gt;TextInputFormatter]&lt;:-[NumericalRangeFormatter]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
 	
-	[StudySequenceFormatter
+	[ReportStatus
 	  |
-	  +TextEditingValue formatEditUpdate()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
+	  &lt;static&gt;+primary: ReportStatus;
+	  &lt;static&gt;+secondary: ReportStatus
 	]
 	
-	[&lt;abstract&gt;TextInputFormatter]&lt;:-[StudySequenceFormatter]
+	[ReportStatus]o-[ReportStatus]
+	[Enum]&lt;:--[ReportStatus]
 	
-	[Tuple
-	  |
-	  +first: T1;
-	  +second: T2;
-	  +props: List&lt;Object?&gt;
+	[StudyDesignInterventionsFormView
 	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson();
-	  +Tuple&lt;T1, T2&gt; copy();
-	  +Tuple&lt;T1, T2&gt; copyWith()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;Equatable]&lt;:-[Tuple]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
 	
-	[&lt;abstract&gt;JsonFileLoader
+	[&lt;abstract&gt;StudyScheduleControls
 	  |
-	  +jsonAssetsPath: String
+	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
+	  &lt;static&gt;+defaultScheduleTypeSequence: String;
+	  &lt;static&gt;+defaultNumCycles: int;
+	  &lt;static&gt;+defaultPeriodLength: int;
+	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
+	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
+	  +phaseDurationControl: FormControl&lt;int&gt;;
+	  +numCyclesControl: FormControl&lt;int&gt;;
+	  +includeBaselineControl: FormControl&lt;bool&gt;;
+	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
+	  &lt;static&gt;+kNumCyclesMin: int;
+	  &lt;static&gt;+kNumCyclesMax: int;
+	  &lt;static&gt;+kPhaseDurationMin: int;
+	  &lt;static&gt;+kPhaseDurationMax: int;
+	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
+	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +numCyclesRange: dynamic;
+	  +phaseDurationRange: dynamic;
+	  +customSequenceRequired: dynamic
 	  |
-	  +dynamic loadJson();
-	  +dynamic parseJsonMapFromAssets();
-	  +dynamic parseJsonListFromAssets()
+	  +void setStudyScheduleControlsFrom();
+	  +StudyScheduleFormData buildStudyScheduleFormData();
+	  +bool isSequencingCustom()
 	]
 	
-	[&lt;abstract&gt;IAppDelegate
+	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
+	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
+	
+	[InterventionFormView
 	  |
-	  +dynamic onAppStart()
+	  +formViewModel: InterventionFormViewModel
 	]
 	
-	[AppController
+	[InterventionFormView]o-[InterventionFormViewModel]
+	
+	[InterventionPreview
 	  |
-	  +appDelegates: List&lt;IAppDelegate&gt;;
-	  -_delayedFuture: dynamic;
-	  +isInitialized: dynamic
+	  +routeArgs: InterventionFormRouteArgs
 	  |
-	  +dynamic onAppStart();
-	  -dynamic _callDelegates()
+	  +Widget build()
 	]
 	
-	[StudyMonitorScreen
+	[InterventionPreview]o-[InterventionFormRouteArgs]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
+	
+	[StudyScheduleFormView
+	  |
+	  +formViewModel: StudyScheduleControls
 	  |
+	  -FormTableRow _renderCustomSequence();
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
+	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
 	
-	[LoginForm
+	[InterventionsFormData
 	  |
-	  +formKey: AuthFormKey
+	  +interventionsData: List&lt;InterventionFormData&gt;;
+	  +studyScheduleData: StudyScheduleFormData;
+	  +id: String
 	  |
-	  +Widget build()
+	  +Study apply();
+	  +InterventionsFormData copy()
 	]
 	
-	[LoginForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
+	[InterventionsFormData]o-[StudyScheduleFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
 	
-	[PasswordRecoveryForm
+	[InterventionTaskFormViewModel
 	  |
-	  +formKey: AuthFormKey
+	  +taskIdControl: FormControl&lt;String&gt;;
+	  +instanceIdControl: FormControl&lt;String&gt;;
+	  +taskTitleControl: FormControl&lt;String&gt;;
+	  +taskDescriptionControl: FormControl&lt;String&gt;;
+	  +markAsCompletedControl: FormControl&lt;bool&gt;;
+	  +form: FormGroup;
+	  +taskId: String;
+	  +instanceId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +Widget build()
+	  +void setControlsFrom();
+	  +InterventionTaskFormData buildFormData();
+	  +InterventionTaskFormViewModel createDuplicate()
 	]
 	
-	[PasswordRecoveryForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
+	[InterventionTaskFormViewModel]o-[FormControl]
+	[InterventionTaskFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
+	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
 	
-	[PasswordForgotForm
+	[InterventionTaskFormData
 	  |
-	  +formKey: AuthFormKey
+	  +taskId: String;
+	  +taskTitle: String;
+	  +taskDescription: String?;
+	  &lt;static&gt;+kDefaultTitle: String;
+	  +id: String
 	  |
-	  +Widget build()
+	  +CheckmarkTask toTask();
+	  +InterventionTaskFormData copy()
 	]
 	
-	[PasswordForgotForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
+	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
 	
-	[SignupForm
+	[InterventionFormData
 	  |
-	  +formKey: AuthFormKey
+	  +interventionId: String;
+	  +title: String;
+	  +description: String?;
+	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
+	  +iconName: String?;
+	  &lt;static&gt;+kDefaultTitle: String;
+	  +id: String
 	  |
-	  +Widget build();
-	  -dynamic _onClickTermsOfUse();
-	  -dynamic _onClickPrivacyPolicy()
+	  +Intervention toIntervention();
+	  +InterventionFormData copy()
 	]
 	
-	[SignupForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
+	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
 	
-	[AuthScaffold
+	[StudyScheduleFormData
 	  |
-	  +body: Widget;
-	  +formKey: AuthFormKey;
-	  +leftContentMinWidth: double;
-	  +leftPanelMinWidth: double;
-	  +leftPanelPadding: EdgeInsets
+	  +sequenceType: PhaseSequence;
+	  +sequenceTypeCustom: String;
+	  +numCycles: int;
+	  +phaseDuration: int;
+	  +includeBaseline: bool;
+	  +id: String
+	  |
+	  +StudySchedule toStudySchedule();
+	  +Study apply();
+	  +StudyScheduleFormData copy()
 	]
 	
-	[AuthScaffold]o-[&lt;abstract&gt;Widget]
-	[AuthScaffold]o-[AuthFormKey]
-	[AuthScaffold]o-[EdgeInsets]
+	[StudyScheduleFormData]o-[PhaseSequence]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
 	
-	[EmailTextField
+	[InterventionsFormViewModel
 	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
+	  +study: Study;
+	  +router: GoRouter;
+	  +interventionsArray: FormArray&lt;dynamic&gt;;
+	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
+	  +form: FormGroup;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +interventionsRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +canTestStudySchedule: bool
+	  |
+	  +void setControlsFrom();
+	  +InterventionsFormData buildFormData();
+	  +void read();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +InterventionFormViewModel provide();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +dynamic testStudySchedule()
 	]
 	
-	[EmailTextField]o-[FormControl]
+	[InterventionsFormViewModel]o-[Study]
+	[InterventionsFormViewModel]o-[GoRouter]
+	[InterventionsFormViewModel]o-[FormArray]
+	[InterventionsFormViewModel]o-[FormViewModelCollection]
+	[InterventionsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
+	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
 	
-	[PasswordTextField
+	[InterventionTaskFormView
 	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
+	  +formViewModel: InterventionTaskFormViewModel
 	]
 	
-	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
-	[PasswordTextField]o-[FormControl]
+	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
 	
-	[StudyUJobsToBeDone
+	[InterventionFormViewModel
+	  |
+	  +study: Study;
+	  +interventionIdControl: FormControl&lt;String&gt;;
+	  +interventionTitleControl: FormControl&lt;String&gt;;
+	  +interventionIconControl: FormControl&lt;IconOption&gt;;
+	  +interventionDescriptionControl: FormControl&lt;String&gt;;
+	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
+	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
+	  +form: FormGroup;
+	  +interventionId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +atLeastOneTask: dynamic;
+	  +breadcrumbsTitle: String;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void setControlsFrom();
+	  +InterventionFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +InterventionTaskFormViewModel provide();
+	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
+	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
+	  +InterventionFormViewModel createDuplicate()
+	]
+	
+	[InterventionFormViewModel]o-[Study]
+	[InterventionFormViewModel]o-[FormControl]
+	[InterventionFormViewModel]o-[FormArray]
+	[InterventionFormViewModel]o-[FormViewModelCollection]
+	[InterventionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
+	
+	[&lt;abstract&gt;StudyDesignPageWidget
+	  |
+	  +Widget? banner()
+	]
+	
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
+	
+	[StudyDesignInfoFormView
 	  |
 	  +Widget build()
 	]
 	
-	[AuthFormController
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
+	
+	[StudyInfoFormData
 	  |
-	  +authRepository: IAuthRepository;
-	  +notificationService: INotificationService;
-	  +router: GoRouter;
+	  +title: String;
+	  +description: String?;
+	  +iconName: String;
+	  +contactInfoFormData: StudyContactInfoFormData;
+	  +id: String
+	  |
+	  +Study apply();
+	  +StudyInfoFormData copy()
+	]
+	
+	[StudyInfoFormData]o-[StudyContactInfoFormData]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
+	
+	[StudyContactInfoFormData
+	  |
+	  +organization: String?;
+	  +institutionalReviewBoard: String?;
+	  +institutionalReviewBoardNumber: String?;
+	  +researchers: String?;
+	  +email: String?;
+	  +website: String?;
+	  +phone: String?;
+	  +additionalInfo: String?;
+	  +id: String
+	  |
+	  +Study apply();
+	  +StudyInfoFormData copy()
+	]
+	
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
+	
+	[StudyInfoFormViewModel
+	  |
+	  +study: Study;
+	  +titleControl: FormControl&lt;String&gt;;
+	  +iconControl: FormControl&lt;IconOption&gt;;
+	  +descriptionControl: FormControl&lt;String&gt;;
+	  +organizationControl: FormControl&lt;String&gt;;
+	  +reviewBoardControl: FormControl&lt;String&gt;;
+	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
+	  +researchersControl: FormControl&lt;String&gt;;
 	  +emailControl: FormControl&lt;String&gt;;
-	  +passwordControl: FormControl&lt;String&gt;;
-	  +passwordConfirmationControl: FormControl&lt;String&gt;;
-	  +termsOfServiceControl: FormControl&lt;bool&gt;;
-	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +loginForm: FormGroup;
-	  +signupForm: FormGroup;
-	  +passwordForgotForm: FormGroup;
-	  +passwordRecoveryForm: FormGroup;
-	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  -_formKey: AuthFormKey;
-	  +formKey: AuthFormKey;
-	  +form: FormGroup
+	  +websiteControl: FormControl&lt;String&gt;;
+	  +phoneControl: FormControl&lt;String&gt;;
+	  +additionalInfoControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +titles: Map&lt;FormMode, String&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +descriptionRequired: dynamic;
+	  +iconRequired: dynamic;
+	  +organizationRequired: dynamic;
+	  +reviewBoardRequired: dynamic;
+	  +reviewBoardNumberRequired: dynamic;
+	  +researchersRequired: dynamic;
+	  +emailRequired: dynamic;
+	  +phoneRequired: dynamic;
+	  +emailFormat: dynamic;
+	  +websiteFormat: dynamic
 	  |
-	  -dynamic _getFormFor();
-	  -dynamic _onChangeFormKey();
-	  +dynamic resetControlsFor();
-	  -dynamic _forceValidationMessages();
-	  +dynamic signUp();
-	  -dynamic _signUp();
-	  +dynamic signIn();
-	  -dynamic _signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic sendPasswordResetLink();
-	  +dynamic recoverPassword();
-	  +dynamic updateUser();
-	  -dynamic _readDebugUser()
+	  +void setControlsFrom();
+	  +StudyInfoFormData buildFormData()
 	]
 	
-	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
-	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
-	[AuthFormController]o-[GoRouter]
-	[AuthFormController]o-[FormControl]
-	[AuthFormController]o-[FormGroup]
-	[AuthFormController]o-[AuthFormKey]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[AuthFormController]
+	[StudyInfoFormViewModel]o-[Study]
+	[StudyInfoFormViewModel]o-[FormControl]
+	[StudyInfoFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
 	
-	[AuthFormKey
+	[ScheduleControls
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AuthFormKey&gt;;
-	  &lt;static&gt;+login: AuthFormKey;
-	  &lt;static&gt;+signup: AuthFormKey;
-	  &lt;static&gt;+passwordForgot: AuthFormKey;
-	  &lt;static&gt;+passwordRecovery: AuthFormKey;
-	  &lt;static&gt;-_loginSubmit: AuthFormKey;
-	  &lt;static&gt;-_signupSubmit: AuthFormKey
+	  +formViewModel: WithScheduleControls
+	  |
+	  +Widget build();
+	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
 	]
 	
-	[AuthFormKey]o-[AuthFormKey]
-	[Enum]&lt;:--[AuthFormKey]
+	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
+	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
 	
-	[AppStatus
+	[&lt;abstract&gt;WithScheduleControls
+	  |
+	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
+	  +instanceID: FormControl&lt;String&gt;;
+	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
+	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
+	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
+	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
+	  +hasReminderControl: FormControl&lt;bool&gt;;
+	  +reminderTimeControl: FormControl&lt;Time&gt;;
+	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
+	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
+	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
+	  +hasReminder: bool;
+	  +isTimeRestricted: bool;
+	  +timeRestriction: List&lt;Time&gt;?
+	  |
+	  +void setScheduleControlsFrom();
+	  -dynamic _initReminderControl()
+	]
+	
+	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
+	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
+	
+	[&lt;abstract&gt;IFormDataWithSchedule
+	  |
+	  +instanceId: String;
+	  +isTimeLocked: bool;
+	  +timeLockStart: StudyUTimeOfDay?;
+	  +timeLockEnd: StudyUTimeOfDay?;
+	  +hasReminder: bool;
+	  +reminderTime: StudyUTimeOfDay?
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
-	  &lt;static&gt;+initializing: AppStatus;
-	  &lt;static&gt;+initialized: AppStatus
+	  +Schedule toSchedule()
 	]
 	
-	[AppStatus]o-[AppStatus]
-	[Enum]&lt;:--[AppStatus]
+	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
 	
-	[FormArrayTable
+	[&lt;abstract&gt;WithQuestionnaireControls
 	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +items: List&lt;T&gt;;
-	  +onSelectItem: void Function(T);
-	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
-	  +onNewItem: void Function()?;
-	  +rowTitle: String Function(T);
-	  +onNewItemLabel: String;
-	  +sectionTitle: String?;
-	  +sectionDescription: String?;
-	  +emptyIcon: IconData?;
-	  +emptyTitle: String?;
-	  +emptyDescription: String?;
-	  +sectionTitleDivider: bool?;
-	  +rowPrefix: Widget Function(BuildContext, T, int)?;
-	  +rowSuffix: Widget Function(BuildContext, T, int)?;
-	  +leadingWidget: Widget?;
-	  +itemsSectionPadding: EdgeInsets?;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
+	  +questionsArray: FormArray&lt;dynamic&gt;;
+	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
+	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
+	  +propagateOnSave: bool;
+	  +questionModels: List&lt;Q&gt;;
+	  +questionTitles: Map&lt;FormMode, String Function()&gt;
 	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow();
-	  -Widget _newItemButton()
+	  +void setQuestionnaireControlsFrom();
+	  +QuestionnaireFormData buildQuestionnaireFormData();
+	  +void read();
+	  +void onCancel();
+	  +dynamic onSave();
+	  +Q provide();
+	  +Q provideQuestionFormViewModel()
 	]
 	
-	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
-	[FormArrayTable]o-[void Function(T)]
-	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
-	[FormArrayTable]o-[void Function()?]
-	[FormArrayTable]o-[String Function(T)]
-	[FormArrayTable]o-[IconData]
-	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
-	[FormArrayTable]o-[&lt;abstract&gt;Widget]
-	[FormArrayTable]o-[EdgeInsets]
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
+	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
 	
-	[&lt;abstract&gt;ManagedFormViewModel
+	[QuestionnaireFormData
 	  |
-	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
+	  +questionsData: List&lt;QuestionFormData&gt;?;
+	  +id: String
+	  |
+	  +StudyUQuestionnaire toQuestionnaire();
+	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
+	  +QuestionnaireFormData copy()
 	]
 	
-	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
+	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
 	
-	[FormViewModelNotFoundException
+	[SurveyQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel;
+	  +isHtmlStyleable: bool
 	]
 	
-	[Exception]&lt;:--[FormViewModelNotFoundException]
+	[SurveyQuestionFormView]o-[QuestionFormViewModel]
 	
-	[FormViewModelCollection
+	[AudioRecordingQuestionFormView
 	  |
-	  +formViewModels: List&lt;T&gt;;
-	  +formArray: FormArray&lt;dynamic&gt;;
-	  +stagedViewModels: List&lt;T&gt;;
-	  +retrievableViewModels: List&lt;T&gt;;
-	  +formData: List&lt;D&gt;
+	  +formViewModel: QuestionFormViewModel
 	  |
-	  +void add();
-	  +T remove();
-	  +T? findWhere();
-	  +T? removeWhere();
-	  +bool contains();
-	  +void stage();
-	  +T commit();
-	  +void reset();
-	  +void read()
+	  +Widget build()
 	]
 	
-	[FormViewModelCollection]o-[FormArray]
+	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
 	
-	[CustomFormControl
+	[FreeTextQuestionFormView
 	  |
-	  -_onValueChangedDebouncer: Debouncer?;
-	  -_onStatusChangedDebouncer: Debouncer?;
-	  +onValueChanged: void Function(T?)?;
-	  +onStatusChanged: void Function(ControlStatus)?;
-	  +onStatusChangedDebounceTime: int?;
-	  +onValueChangedDebounceTime: int?
+	  +formViewModel: QuestionFormViewModel;
+	  +generateLabelHelpTextMap: dynamic
 	  |
-	  +void dispose()
+	  +Widget build();
+	  +Widget disableOnReadonly();
+	  +Widget generateRow()
 	]
 	
-	[CustomFormControl]o-[Debouncer]
-	[CustomFormControl]o-[void Function(T?)?]
-	[CustomFormControl]o-[void Function(ControlStatus)?]
-	[FormControl]&lt;:-[CustomFormControl]
+	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
 	
-	[UnsavedChangesDialog
+	[ChoiceQuestionFormView
+	  |
+	  +formViewModel: QuestionFormViewModel
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;FormValidationSetEnum
-	]
+	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
 	
-	[FormControlValidation
+	[ImageCapturingQuestionFormView
 	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
-	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
-	  +validationMessages: Map&lt;String, String Function(Object)&gt;
+	  +formViewModel: QuestionFormViewModel
 	  |
-	  +FormControlValidation merge()
+	  +Widget build()
 	]
 	
-	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
+	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
 	
-	[&lt;abstract&gt;IFormData
+	[BoolQuestionFormView
 	  |
-	  +id: String
+	  +formViewModel: QuestionFormViewModel
 	  |
-	  +IFormData copy()
-	]
-	
-	[FormInvalidException
+	  +Widget build()
 	]
 	
-	[Exception]&lt;:--[FormInvalidException]
+	[BoolQuestionFormView]o-[QuestionFormViewModel]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
 	
-	[FormConfigException
+	[SurveyQuestionType
 	  |
-	  +message: String?
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
+	  &lt;static&gt;+choice: SurveyQuestionType;
+	  &lt;static&gt;+bool: SurveyQuestionType;
+	  &lt;static&gt;+scale: SurveyQuestionType;
+	  &lt;static&gt;+image: SurveyQuestionType;
+	  &lt;static&gt;+audio: SurveyQuestionType;
+	  &lt;static&gt;+freeText: SurveyQuestionType
 	]
 	
-	[Exception]&lt;:--[FormConfigException]
-	
-	[&lt;abstract&gt;IFormViewModelDelegate
-	  |
-	  +dynamic onSave();
-	  +void onCancel()
-	]
+	[SurveyQuestionType]o-[SurveyQuestionType]
+	[Enum]&lt;:--[SurveyQuestionType]
 	
-	[&lt;abstract&gt;IFormGroupController
+	[&lt;abstract&gt;IScaleQuestionFormViewModel
 	  |
-	  +form: FormGroup
+	  +isMidValuesClearedInfoVisible: bool
 	]
 	
-	[&lt;abstract&gt;IFormGroupController]o-[FormGroup]
-	
-	[FormControlOption
+	[ScaleQuestionFormView
 	  |
-	  +value: T;
-	  +label: String;
-	  +description: String?;
-	  +props: List&lt;Object?&gt;
+	  +formViewModel: QuestionFormViewModel
 	]
 	
-	[&lt;abstract&gt;Equatable]&lt;:-[FormControlOption]
+	[ScaleQuestionFormView]o-[QuestionFormViewModel]
 	
-	[&lt;abstract&gt;FormViewModel
+	[&lt;abstract&gt;QuestionFormData
 	  |
-	  -_formData: T?;
-	  -_formMode: FormMode;
-	  -_validationSet: FormValidationSetEnum?;
-	  +delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?;
-	  +autosave: bool;
-	  -_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;;
-	  -_immediateFormChildrenListenerDebouncer: Debouncer?;
-	  -_autosaveOperation: CancelableOperation&lt;dynamic&gt;?;
-	  -_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  +prevFormValue: Map&lt;String, dynamic&gt;?;
-	  &lt;static&gt;-_formKey: String;
-	  +formData: T?;
-	  +formMode: FormMode;
-	  +isReadonly: bool;
-	  +validationSet: FormValidationSetEnum?;
-	  +isDirty: bool;
-	  +title: String;
-	  +isValid: bool;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;
+	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
+	  +questionId: String;
+	  +questionText: String;
+	  +questionInfoText: String?;
+	  +questionType: SurveyQuestionType;
+	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
+	  +responseOptions: List&lt;dynamic&gt;;
+	  +id: String
 	  |
-	  -dynamic _setFormData();
-	  -dynamic _rememberDefaultControlValidators();
-	  -Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators();
-	  -dynamic _disableAllControls();
-	  -dynamic _formModeUpdated();
-	  -dynamic _restoreControlsFromFormData();
-	  +void revalidate();
-	  -void _applyValidationSet();
-	  +void read();
-	  +dynamic save();
-	  +dynamic cancel();
-	  +void enableAutosave();
-	  +void listenToImmediateFormChildren();
-	  +dynamic markFormGroupChanged();
-	  +void dispose();
-	  +void setControlsFrom();
-	  +T buildFormData();
-	  +void initControls()
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +EligibilityCriterion toEligibilityCriterion();
+	  +Answer&lt;dynamic&gt; constructAnswerFor();
+	  +dynamic setResponseOptionsValidityFrom();
+	  +QuestionFormData copy()
 	]
 	
-	[&lt;abstract&gt;FormViewModel]o-[FormMode]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;FormValidationSetEnum]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;IFormViewModelDelegate]
-	[&lt;abstract&gt;FormViewModel]o-[Debouncer]
-	[&lt;abstract&gt;FormViewModel]o-[CancelableOperation]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[&lt;abstract&gt;FormViewModel]
+	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
 	
-	[FormMode
+	[ChoiceQuestionFormData
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;FormMode&gt;;
-	  &lt;static&gt;+create: FormMode;
-	  &lt;static&gt;+readonly: FormMode;
-	  &lt;static&gt;+edit: FormMode
+	  +isMultipleChoice: bool;
+	  +answerOptions: List&lt;String&gt;;
+	  +responseOptions: List&lt;String&gt;
+	  |
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +QuestionFormData copy();
+	  -Choice _buildChoiceForValue();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[FormMode]o-[FormMode]
-	[Enum]&lt;:--[FormMode]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
 	
-	[EnrolledBadge
+	[BoolQuestionFormData
 	  |
-	  +enrolledCount: int
+	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
+	  +responseOptions: List&lt;String&gt;
 	  |
-	  +Widget build()
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +BoolQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[StudyRecruitController
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
+	
+	[ImageQuestionFormData
 	  |
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
+	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
+	  +responseOptions: List&lt;String&gt;
 	  |
-	  -dynamic _subscribeInvites();
-	  +Intervention? getIntervention();
-	  +int getParticipantCountForInvite();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void dispose()
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +ImageQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[StudyRecruitController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyRecruitController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
 	
-	[StudyRecruitScreen
+	[AudioQuestionFormData
 	  |
-	  +Widget build();
-	  -Widget _inviteCodesSectionHeader();
-	  -Widget _newInviteCodeButton();
-	  -dynamic _onSelectInvite()
+	  +maxRecordingDurationSeconds: int;
+	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
+	  +responseOptions: List&lt;String&gt;
+	  |
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +AudioQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
 	
-	[InviteCodeFormView
+	[ScaleQuestionFormData
 	  |
-	  +formViewModel: InviteCodeFormViewModel
+	  +minValue: double;
+	  +maxValue: double;
+	  +minLabel: String?;
+	  +maxLabel: String?;
+	  +midValues: List&lt;double?&gt;;
+	  +midLabels: List&lt;String?&gt;;
+	  +stepSize: double;
+	  +initialValue: double?;
+	  +minColor: Color?;
+	  +maxColor: Color?;
+	  +responseOptions: List&lt;double&gt;;
+	  +midAnnotations: List&lt;Annotation&gt;
 	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
+	  +ScaleQuestion toQuestion();
+	  +QuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[InviteCodeFormView]o-[InviteCodeFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
+	[ScaleQuestionFormData]o-[Color]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
 	
-	[StudyInvitesTable
+	[FreeTextQuestionFormData
 	  |
-	  +invites: List&lt;StudyInvite&gt;;
-	  +onSelect: void Function(StudyInvite);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getIntervention: Intervention? Function(String);
-	  +getParticipantCountForInvite: int Function(StudyInvite)
+	  +textLengthRange: List&lt;int&gt;;
+	  +textType: FreeTextQuestionType;
+	  +textTypeExpression: String?;
+	  +responseOptions: List&lt;String&gt;
 	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow()
+	  +Question&lt;dynamic&gt; toQuestion();
+	  +FreeTextQuestionFormData copy();
+	  +Answer&lt;dynamic&gt; constructAnswerFor()
 	]
 	
-	[StudyInvitesTable]o-[void Function(StudyInvite)]
-	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
-	[StudyInvitesTable]o-[Intervention? Function(String)]
-	[StudyInvitesTable]o-[int Function(StudyInvite)]
+	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
+	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
 	
-	[InviteCodeFormViewModel
+	[QuestionFormViewModel
 	  |
-	  +study: Study;
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  +codeControl: FormControl&lt;String&gt;;
-	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
-	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +interventionAControl: FormControl&lt;String&gt;;
-	  +interventionBControl: FormControl&lt;String&gt;;
+	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
+	  -_titles: Map&lt;FormMode, String Function()&gt;?;
+	  +questionIdControl: FormControl&lt;String&gt;;
+	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
+	  +questionTextControl: FormControl&lt;String&gt;;
+	  +questionInfoTextControl: FormControl&lt;String&gt;;
+	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
+	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
+	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +customOptionsMin: int;
+	  +customOptionsMax: int;
+	  +customOptionsInitial: int;
+	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
+	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
+	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
+	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
+	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
+	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
+	  &lt;static&gt;+kDefaultScaleMinValue: int;
+	  &lt;static&gt;+kDefaultScaleMaxValue: int;
+	  &lt;static&gt;+kNumMidValueControls: int;
+	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
+	  +scaleMinValueControl: FormControl&lt;int&gt;;
+	  +scaleMaxValueControl: FormControl&lt;int&gt;;
+	  -_scaleRangeControl: FormControl&lt;int&gt;;
+	  +scaleMinLabelControl: FormControl&lt;String&gt;;
+	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
+	  +scaleMidValueControls: FormArray&lt;int&gt;;
+	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
+	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
+	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
+	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
+	  +prevMidValues: List&lt;int?&gt;?;
+	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
+	  +customRegexControl: FormControl&lt;String&gt;;
+	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
+	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
+	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
+	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
+	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
+	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
+	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
+	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
+	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
 	  +form: FormGroup;
+	  +questionId: String;
+	  +questionType: SurveyQuestionType;
+	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
+	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
+	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
+	  +validAnswerOptions: List&lt;String&gt;;
+	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
+	  +scaleMinValue: int;
+	  +scaleMaxValue: int;
+	  +scaleRange: int;
+	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +questionTextRequired: dynamic;
+	  +numValidChoiceOptions: dynamic;
+	  +scaleRangeValid: dynamic;
+	  +maxRecordingDurationValid: dynamic;
 	  +titles: Map&lt;FormMode, String&gt;;
-	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
-	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +isPreconfiguredSchedule: bool;
-	  +preconfiguredSchedule: List&lt;String&gt;?
+	  +isAddOptionButtonVisible: bool;
+	  +isMidValuesClearedInfoVisible: bool
 	  |
+	  +String? scaleMidLabelAt();
+	  -dynamic _onScaleRangeChanged();
+	  -dynamic _applyInputFormatters();
+	  -dynamic _updateScaleMidValueControls();
+	  -Map&lt;String, dynamic&gt;? _validateFreeText();
+	  -dynamic _onFreeTextLengthChanged();
+	  -List&lt;FormControlValidation&gt; _getValidationConfig();
+	  +dynamic onQuestionTypeChanged();
+	  +dynamic onResponseOptionsChanged();
+	  -void _updateFormControls();
 	  +void initControls();
-	  -dynamic _uniqueInviteCode();
-	  +void regenerateCode();
-	  -String _generateCode();
-	  +StudyInvite buildFormData();
 	  +void setControlsFrom();
-	  +dynamic save()
+	  +QuestionFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +void onNewItem();
+	  +void onSelectItem();
+	  +dynamic save();
+	  +QuestionFormViewModel createDuplicate()
 	]
 	
-	[InviteCodeFormViewModel]o-[Study]
-	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[InviteCodeFormViewModel]o-[FormControl]
-	[InviteCodeFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
+	[QuestionFormViewModel]o-[SurveyQuestionType]
+	[QuestionFormViewModel]o-[FormControl]
+	[QuestionFormViewModel]o-[FormArray]
+	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
+	[QuestionFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
 	
-	[PublishSuccessDialog
+	[StudyFormViewModel
 	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
-	
-	[PublishDialog
+	  +studyDirtyCopy: Study?;
+	  +studyRepository: IStudyRepository;
+	  +authRepository: IAuthRepository;
+	  +router: GoRouter;
+	  +studyInfoFormViewModel: StudyInfoFormViewModel;
+	  +enrollmentFormViewModel: EnrollmentFormViewModel;
+	  +measurementsFormViewModel: MeasurementsFormViewModel;
+	  +reportsFormViewModel: ReportsFormViewModel;
+	  +interventionsFormViewModel: InterventionsFormViewModel;
+	  +form: FormGroup;
+	  +isStudyReadonly: bool;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +Widget build()
+	  +void read();
+	  +void setControlsFrom();
+	  +Study buildFormData();
+	  +void dispose();
+	  +void onCancel();
+	  +dynamic onSave();
+	  -dynamic _applyAndSaveSubform()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
+	[StudyFormViewModel]o-[Study]
+	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
+	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyFormViewModel]o-[GoRouter]
+	[StudyFormViewModel]o-[StudyInfoFormViewModel]
+	[StudyFormViewModel]o-[EnrollmentFormViewModel]
+	[StudyFormViewModel]o-[MeasurementsFormViewModel]
+	[StudyFormViewModel]o-[ReportsFormViewModel]
+	[StudyFormViewModel]o-[InterventionsFormViewModel]
+	[StudyFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
 	
-	[PublishConfirmationDialog
+	[StudyDesignMeasurementsFormView
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
+	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
 	
-	[FrameControlsWidget
+	[MeasurementsFormData
 	  |
-	  +onRefresh: void Function()?;
-	  +onOpenNewTab: void Function()?;
-	  +enabled: bool
+	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
+	  +id: String
 	  |
-	  +Widget build()
+	  +Study apply();
+	  +MeasurementsFormData copy()
 	]
 	
-	[FrameControlsWidget]o-[void Function()?]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
+	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel
+	[MeasurementsFormViewModel
 	  |
-	  +studyParticipation: Participation?;
-	  +studyStatus: StudyStatus?
+	  +study: Study;
+	  +router: GoRouter;
+	  +measurementsArray: FormArray&lt;dynamic&gt;;
+	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
+	  +form: FormGroup;
+	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +measurementRequired: dynamic;
+	  +titles: Map&lt;FormMode, String&gt;
+	  |
+	  +void read();
+	  +void setControlsFrom();
+	  +MeasurementsFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +MeasurementSurveyFormViewModel provide();
+	  +void onCancel();
+	  +dynamic onSave()
 	]
 	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
+	[MeasurementsFormViewModel]o-[Study]
+	[MeasurementsFormViewModel]o-[GoRouter]
+	[MeasurementsFormViewModel]o-[FormArray]
+	[MeasurementsFormViewModel]o-[FormViewModelCollection]
+	[MeasurementsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
 	
-	[StudyStatusBadge
+	[SurveyPreview
 	  |
-	  +participation: Participation?;
-	  +status: StudyStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
+	  +routeArgs: MeasurementFormRouteArgs
 	  |
 	  +Widget build()
 	]
 	
-	[StudyStatusBadge]o-[Participation]
-	[StudyStatusBadge]o-[StudyStatus]
-	[StudyStatusBadge]o-[BadgeType]
+	[SurveyPreview]o-[MeasurementFormRouteArgs]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
 	
-	[RouteInformation
+	[MeasurementSurveyFormViewModel
 	  |
-	  +route: String?;
-	  +extra: String?;
-	  +cmd: String?;
-	  +data: String?
+	  +study: Study;
+	  +measurementIdControl: FormControl&lt;String&gt;;
+	  +instanceIdControl: FormControl&lt;String&gt;;
+	  +surveyTitleControl: FormControl&lt;String&gt;;
+	  +surveyIntroTextControl: FormControl&lt;String&gt;;
+	  +surveyOutroTextControl: FormControl&lt;String&gt;;
+	  +form: FormGroup;
+	  +measurementId: String;
+	  +instanceId: String;
+	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
+	  +titleRequired: dynamic;
+	  +atLeastOneQuestion: dynamic;
+	  +breadcrumbsTitle: String;
+	  +titles: Map&lt;FormMode, String&gt;
 	  |
-	  +String toString()
+	  +void setControlsFrom();
+	  +MeasurementSurveyFormData buildFormData();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
+	  +void onSelectItem();
+	  +void onNewItem();
+	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
+	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
+	  +MeasurementSurveyFormViewModel createDuplicate()
 	]
 	
-	[&lt;abstract&gt;PlatformController
+	[MeasurementSurveyFormViewModel]o-[Study]
+	[MeasurementSurveyFormViewModel]o-[FormControl]
+	[MeasurementSurveyFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
+	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
+	
+	[MeasurementSurveyFormData
 	  |
-	  +studyId: String;
-	  +baseSrc: String;
-	  +previewSrc: String;
-	  +routeInformation: RouteInformation;
-	  +frameWidget: Widget
+	  +measurementId: String;
+	  +title: String;
+	  +introText: String?;
+	  +outroText: String?;
+	  +questionnaireFormData: QuestionnaireFormData;
+	  &lt;static&gt;+kDefaultTitle: String;
+	  +id: String
 	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void listen();
-	  +void send();
-	  +void openNewPage()
+	  +QuestionnaireTask toQuestionnaireTask();
+	  +MeasurementSurveyFormData copy()
 	]
 	
-	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
-	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
+	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
+	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
 	
-	[WebController
-	  |
-	  +iFrameElement: IFrameElement
+	[MeasurementSurveyFormView
 	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void openNewPage();
-	  +void listen();
-	  +void send()
+	  +formViewModel: MeasurementSurveyFormViewModel
 	]
 	
-	[WebController]o-[IFrameElement]
-	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
+	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
 	
-	[MobileController
+	[&lt;abstract&gt;IStudyFormData
 	  |
-	  +void openNewPage();
-	  +void refresh();
-	  +void registerViews();
-	  +void listen();
-	  +void send();
-	  +void navigate();
-	  +void activate();
-	  +void generateUrl()
+	  +Study apply()
 	]
 	
-	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
+	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
 	
-	[StudyController
+	[&lt;abstract&gt;IStudyAppBarViewModel
 	  |
-	  +notificationService: INotificationService;
-	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
-	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
+	  +isSyncIndicatorVisible: bool;
+	  +isStatusBadgeVisible: bool;
+	  +isPublishVisible: bool
+	]
+	
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
+	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
+	
+	[StudyScaffold
 	  |
-	  +dynamic syncStudyStatus();
-	  +dynamic onStudySubscriptionUpdate();
-	  -dynamic _redirectNewToActualStudyID();
-	  +dynamic publishStudy();
-	  +void onChangeStudyParticipation();
-	  +void onAddParticipants();
-	  +void onSettingsPressed();
-	  +void dispose()
+	  +studyId: String;
+	  +tabs: List&lt;NavbarTab&gt;?;
+	  +tabsSubnav: List&lt;NavbarTab&gt;?;
+	  +selectedTab: NavbarTab?;
+	  +selectedTabSubnav: NavbarTab?;
+	  +body: StudyPageWidget;
+	  +drawer: Widget?;
+	  +disableActions: bool;
+	  +actionsSpacing: double;
+	  +actionsPadding: double;
+	  +layoutType: SingleColumnLayoutType?;
+	  +appbarHeight: double;
+	  +appbarSubnavHeight: double
 	]
 	
-	[StudyController]o-[&lt;abstract&gt;INotificationService]
-	[StudyController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyController]
+	[StudyScaffold]o-[NavbarTab]
+	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
+	[StudyScaffold]o-[&lt;abstract&gt;Widget]
+	[StudyScaffold]o-[SingleColumnLayoutType]
 	
 	[&lt;abstract&gt;IStudyNavViewModel
 	  |
@@ -2154,78 +2570,27 @@
 	]
 	
 	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
-	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
-	
-	[StudyParticipationBadge
-	  |
-	  +participation: Participation;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +center: bool
-	  |
-	  +Widget build()
-	]
-	
-	[StudyParticipationBadge]o-[Participation]
-	[StudyParticipationBadge]o-[BadgeType]
-	
-	[StudyBaseController
-	  |
-	  +studyId: String;
-	  +studyRepository: IStudyRepository;
-	  +router: GoRouter;
-	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
-	  |
-	  +dynamic subscribeStudy();
-	  +dynamic onStudySubscriptionUpdate();
-	  +dynamic onStudySubscriptionError();
-	  +void dispose()
-	]
-	
-	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyBaseController]o-[GoRouter]
-	[StudyBaseController]o-[StreamSubscription]
-	
-	[PreviewFrame
-	  |
-	  +studyId: String;
-	  +routeArgs: StudyFormRouteArgs?;
-	  +route: String?
-	]
-	
-	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
-	
-	[&lt;abstract&gt;IStudyAppBarViewModel
-	  |
-	  +isSyncIndicatorVisible: bool;
-	  +isStatusBadgeVisible: bool;
-	  +isPublishVisible: bool
-	]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
+	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
 	
-	[StudyScaffold
+	[StudyController
 	  |
-	  +studyId: String;
-	  +tabs: List&lt;NavbarTab&gt;?;
-	  +tabsSubnav: List&lt;NavbarTab&gt;?;
-	  +selectedTab: NavbarTab?;
-	  +selectedTabSubnav: NavbarTab?;
-	  +body: StudyPageWidget;
-	  +drawer: Widget?;
-	  +disableActions: bool;
-	  +actionsSpacing: double;
-	  +actionsPadding: double;
-	  +layoutType: SingleColumnLayoutType?;
-	  +appbarHeight: double;
-	  +appbarSubnavHeight: double
+	  +notificationService: INotificationService;
+	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
+	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
+	  |
+	  +dynamic syncStudyStatus();
+	  +dynamic onStudySubscriptionUpdate();
+	  -dynamic _redirectNewToActualStudyID();
+	  +dynamic publishStudy();
+	  +void onChangeStudyParticipation();
+	  +void onAddParticipants();
+	  +void onSettingsPressed();
+	  +void dispose()
 	]
 	
-	[StudyScaffold]o-[NavbarTab]
-	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
-	[StudyScaffold]o-[&lt;abstract&gt;Widget]
-	[StudyScaffold]o-[SingleColumnLayoutType]
+	[StudyController]o-[&lt;abstract&gt;INotificationService]
+	[StudyController]o-[StreamSubscription]
+	[StudyBaseController]&lt;:-[StudyController]
 	
 	[WebFrame
 	  |
@@ -2281,45 +2646,29 @@
 	
 	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
 	
-	[StudySettingsFormViewModel
-	  |
-	  +study: AsyncValue&lt;Study&gt;;
-	  +studyRepository: IStudyRepository;
-	  &lt;static&gt;+defaultPublishedToRegistry: bool;
-	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
-	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
-	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel
 	  |
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +dynamic keepControlsSynced();
-	  +dynamic save();
-	  +dynamic setLaunchDefaults()
+	  +studyParticipation: Participation?;
+	  +studyStatus: StudyStatus?
 	]
 	
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudySettingsFormViewModel]o-[FormControl]
-	[StudySettingsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
+	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
 	
-	[StudySettingsDialog
+	[StudyStatusBadge
 	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
-	
-	[StudyTestController
+	  +participation: Participation?;
+	  +status: StudyStatus?;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +showTooltip: bool
 	  |
-	  +authRepository: IAuthRepository;
-	  +languageCode: String
+	  +Widget build()
 	]
 	
-	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyBaseController]&lt;:-[StudyTestController]
+	[StudyStatusBadge]o-[Participation]
+	[StudyStatusBadge]o-[StudyStatus]
+	[StudyStatusBadge]o-[BadgeType]
 	
 	[TestAppRoutes
 	  |
@@ -2331,9477 +2680,9452 @@
 	  &lt;static&gt;+dashboard: String
 	]
 	
-	[DrawerEntry
-	  |
-	  +localizedTitle: String Function();
-	  +icon: IconData?;
-	  +localizedHelpText: String Function()?;
-	  +enabled: bool;
-	  +onSelected: void Function(BuildContext, WidgetRef)?;
-	  +autoCloseDrawer: bool;
-	  +title: String;
-	  +helpText: String?
-	  |
-	  +void onClick()
-	]
-	
-	[DrawerEntry]o-[String Function()]
-	[DrawerEntry]o-[IconData]
-	[DrawerEntry]o-[String Function()?]
-	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
-	
-	[GoRouterDrawerEntry
-	  |
-	  +intent: RoutingIntent;
-	  +onNavigated: void Function()?
-	  |
-	  +void onClick()
-	]
-	
-	[GoRouterDrawerEntry]o-[RoutingIntent]
-	[GoRouterDrawerEntry]o-[void Function()?]
-	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
-	
-	[AppDrawer
-	  |
-	  +width: int;
-	  +autoCloseDrawer: bool;
-	  +leftPaddingEntries: double;
-	  +logoPaddingVertical: double;
-	  +logoPaddingHorizontal: double;
-	  +logoMaxHeight: double;
-	  +logoSectionMinHeight: double;
-	  +logoSectionMaxHeight: double
-	]
-	
-	[StudyAnalyzeScreen
-	  |
-	  +Widget? banner();
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
-	
-	[StudyAnalyzeController
-	  |
-	  +dynamic onExport()
-	]
-	
-	[StudyBaseController]&lt;:-[StudyAnalyzeController]
-	
-	[StudyDesignInterventionsFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
-	
-	[InterventionFormView
-	  |
-	  +formViewModel: InterventionFormViewModel
-	]
-	
-	[InterventionFormView]o-[InterventionFormViewModel]
-	
-	[InterventionPreview
-	  |
-	  +routeArgs: InterventionFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPreview]o-[InterventionFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
-	
-	[StudyScheduleFormView
-	  |
-	  +formViewModel: StudyScheduleControls
+	[PreviewFrame
 	  |
-	  -FormTableRow _renderCustomSequence();
-	  +Widget build()
+	  +studyId: String;
+	  +routeArgs: StudyFormRouteArgs?;
+	  +route: String?
 	]
 	
-	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
+	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
 	
-	[InterventionTaskFormData
-	  |
-	  +taskId: String;
-	  +taskTitle: String;
-	  +taskDescription: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
+	[StudyTestController
 	  |
-	  +CheckmarkTask toTask();
-	  +InterventionTaskFormData copy()
+	  +authRepository: IAuthRepository;
+	  +languageCode: String
 	]
 	
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
+	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
+	[StudyBaseController]&lt;:-[StudyTestController]
 	
-	[InterventionsFormViewModel
+	[RouteInformation
 	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +interventionsArray: FormArray&lt;dynamic&gt;;
-	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
-	  +form: FormGroup;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +interventionsRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestStudySchedule: bool
+	  +route: String?;
+	  +extra: String?;
+	  +cmd: String?;
+	  +data: String?
 	  |
-	  +void setControlsFrom();
-	  +InterventionsFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +InterventionFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +dynamic testStudySchedule()
+	  +String toString()
 	]
 	
-	[InterventionsFormViewModel]o-[Study]
-	[InterventionsFormViewModel]o-[GoRouter]
-	[InterventionsFormViewModel]o-[FormArray]
-	[InterventionsFormViewModel]o-[FormViewModelCollection]
-	[InterventionsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
-	
-	[InterventionTaskFormViewModel
+	[&lt;abstract&gt;PlatformController
 	  |
-	  +taskIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +taskTitleControl: FormControl&lt;String&gt;;
-	  +taskDescriptionControl: FormControl&lt;String&gt;;
-	  +markAsCompletedControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +taskId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +studyId: String;
+	  +baseSrc: String;
+	  +previewSrc: String;
+	  +routeInformation: RouteInformation;
+	  +frameWidget: Widget
 	  |
-	  +void setControlsFrom();
-	  +InterventionTaskFormData buildFormData();
-	  +InterventionTaskFormViewModel createDuplicate()
+	  +void activate();
+	  +void registerViews();
+	  +void generateUrl();
+	  +void navigate();
+	  +void refresh();
+	  +void listen();
+	  +void send();
+	  +void openNewPage()
 	]
 	
-	[InterventionTaskFormViewModel]o-[FormControl]
-	[InterventionTaskFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
+	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
+	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
 	
-	[&lt;abstract&gt;StudyScheduleControls
+	[WebController
 	  |
-	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
-	  &lt;static&gt;+defaultScheduleTypeSequence: String;
-	  &lt;static&gt;+defaultNumCycles: int;
-	  &lt;static&gt;+defaultPeriodLength: int;
-	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
-	  +phaseDurationControl: FormControl&lt;int&gt;;
-	  +numCyclesControl: FormControl&lt;int&gt;;
-	  +includeBaselineControl: FormControl&lt;bool&gt;;
-	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  &lt;static&gt;+kNumCyclesMin: int;
-	  &lt;static&gt;+kNumCyclesMax: int;
-	  &lt;static&gt;+kPhaseDurationMin: int;
-	  &lt;static&gt;+kPhaseDurationMax: int;
-	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +numCyclesRange: dynamic;
-	  +phaseDurationRange: dynamic;
-	  +customSequenceRequired: dynamic
+	  +iFrameElement: IFrameElement
 	  |
-	  +void setStudyScheduleControlsFrom();
-	  +StudyScheduleFormData buildStudyScheduleFormData();
-	  +bool isSequencingCustom()
+	  +void activate();
+	  +void registerViews();
+	  +void generateUrl();
+	  +void navigate();
+	  +void refresh();
+	  +void openNewPage();
+	  +void listen();
+	  +void send()
 	]
 	
-	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
-	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
+	[WebController]o-[IFrameElement]
+	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
 	
-	[InterventionFormData
-	  |
-	  +interventionId: String;
-	  +title: String;
-	  +description: String?;
-	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
-	  +iconName: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
+	[MobileController
 	  |
-	  +Intervention toIntervention();
-	  +InterventionFormData copy()
+	  +void openNewPage();
+	  +void refresh();
+	  +void registerViews();
+	  +void listen();
+	  +void send();
+	  +void navigate();
+	  +void activate();
+	  +void generateUrl()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
+	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
 	
-	[StudyScheduleFormData
+	[FrameControlsWidget
 	  |
-	  +sequenceType: PhaseSequence;
-	  +sequenceTypeCustom: String;
-	  +numCycles: int;
-	  +phaseDuration: int;
-	  +includeBaseline: bool;
-	  +id: String
+	  +onRefresh: void Function()?;
+	  +onOpenNewTab: void Function()?;
+	  +enabled: bool
 	  |
-	  +StudySchedule toStudySchedule();
-	  +Study apply();
-	  +StudyScheduleFormData copy()
+	  +Widget build()
 	]
 	
-	[StudyScheduleFormData]o-[PhaseSequence]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
+	[FrameControlsWidget]o-[void Function()?]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
 	
-	[InterventionTaskFormView
+	[StudyParticipationBadge
 	  |
-	  +formViewModel: InterventionTaskFormViewModel
+	  +participation: Participation;
+	  +type: BadgeType;
+	  +showPrefixIcon: bool;
+	  +center: bool
+	  |
+	  +Widget build()
 	]
 	
-	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
+	[StudyParticipationBadge]o-[Participation]
+	[StudyParticipationBadge]o-[BadgeType]
 	
-	[InterventionsFormData
+	[StudyBaseController
 	  |
-	  +interventionsData: List&lt;InterventionFormData&gt;;
-	  +studyScheduleData: StudyScheduleFormData;
-	  +id: String
+	  +studyId: String;
+	  +studyRepository: IStudyRepository;
+	  +router: GoRouter;
+	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
 	  |
-	  +Study apply();
-	  +InterventionsFormData copy()
+	  +dynamic subscribeStudy();
+	  +dynamic onStudySubscriptionUpdate();
+	  +dynamic onStudySubscriptionError();
+	  +void dispose()
 	]
 	
-	[InterventionsFormData]o-[StudyScheduleFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
+	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
+	[StudyBaseController]o-[GoRouter]
+	[StudyBaseController]o-[StreamSubscription]
 	
-	[InterventionFormViewModel
+	[StudySettingsFormViewModel
 	  |
-	  +study: Study;
-	  +interventionIdControl: FormControl&lt;String&gt;;
-	  +interventionTitleControl: FormControl&lt;String&gt;;
-	  +interventionIconControl: FormControl&lt;IconOption&gt;;
-	  +interventionDescriptionControl: FormControl&lt;String&gt;;
-	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
-	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
+	  +study: AsyncValue&lt;Study&gt;;
+	  +studyRepository: IStudyRepository;
+	  &lt;static&gt;+defaultPublishedToRegistry: bool;
+	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
+	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
+	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
 	  +form: FormGroup;
-	  +interventionId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneTask: dynamic;
-	  +breadcrumbsTitle: String;
 	  +titles: Map&lt;FormMode, String&gt;
 	  |
 	  +void setControlsFrom();
-	  +InterventionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +InterventionTaskFormViewModel provide();
-	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
-	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
-	  +InterventionFormViewModel createDuplicate()
+	  +Study buildFormData();
+	  +dynamic keepControlsSynced();
+	  +dynamic save();
+	  +dynamic setLaunchDefaults()
 	]
 	
-	[InterventionFormViewModel]o-[Study]
-	[InterventionFormViewModel]o-[FormControl]
-	[InterventionFormViewModel]o-[FormArray]
-	[InterventionFormViewModel]o-[FormViewModelCollection]
-	[InterventionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
+	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
+	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
+	[StudySettingsFormViewModel]o-[FormControl]
+	[StudySettingsFormViewModel]o-[FormGroup]
+	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
 	
-	[StudyDesignReportsFormView
+	[StudySettingsDialog
 	  |
-	  +Widget build();
-	  -dynamic _showReportItemSidesheetWithArgs()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
 	
-	[ReportItemFormData
+	[AccountSettingsDialog
 	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
-	  +id: String
+	  +Widget build()
+	]
+	
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AccountSettingsDialog]
+	
+	[PublishDialog
 	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
+	  +Widget build()
 	]
 	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
 	
-	[DataReferenceEditor
+	[PublishSuccessDialog
 	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
+	  +Widget build()
+	]
+	
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
+	
+	[PublishConfirmationDialog
 	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
+	  +Widget build()
 	]
 	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
 	
-	[TemporalAggregationFormatted
+	[StudyMonitorScreen
 	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
+	  +Widget build()
+	]
+	
+	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
+	
+	[&lt;abstract&gt;IAppDelegate
 	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
+	  +dynamic onAppStart()
 	]
 	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
+	[AppController
+	  |
+	  +appDelegates: List&lt;IAppDelegate&gt;;
+	  -_delayedFuture: dynamic;
+	  +isInitialized: dynamic
+	  |
+	  +dynamic onAppStart();
+	  -dynamic _callDelegates()
+	]
 	
-	[ImprovementDirectionFormatted
+	[&lt;abstract&gt;FormConsumerWidget
 	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
+	  +Widget build()
+	]
+	
+	[&lt;abstract&gt;FormConsumerRefWidget
 	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
+	  +Widget build()
 	]
 	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
-	
-	[ReportSectionType
+	[FormSideSheetTab
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
+	  +formViewBuilder: Widget Function(T)
 	]
 	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
+	[FormSideSheetTab]o-[Widget Function(T)]
+	[NavbarTab]&lt;:-[FormSideSheetTab]
 	
-	[AverageSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
+	[SidesheetTab
 	  |
-	  +Widget build()
+	  +builder: Widget Function(BuildContext)
 	]
 	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
+	[SidesheetTab]o-[Widget Function(BuildContext)]
+	[NavbarTab]&lt;:-[SidesheetTab]
 	
-	[DataReferenceIdentifier
-	  |
-	  +hashCode: int
+	[Sidesheet
 	  |
-	  +bool ==()
+	  &lt;static&gt;+kDefaultWidth: double;
+	  +titleText: String;
+	  +body: Widget?;
+	  +tabs: List&lt;SidesheetTab&gt;?;
+	  +actionButtons: List&lt;Widget&gt;?;
+	  +width: double?;
+	  +withCloseButton: bool;
+	  +ignoreAppBar: bool;
+	  +collapseSingleTab: bool;
+	  +bodyPadding: EdgeInsets?;
+	  +wrapContent: Widget Function(Widget)?
 	]
 	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
+	[Sidesheet]o-[&lt;abstract&gt;Widget]
+	[Sidesheet]o-[EdgeInsets]
+	[Sidesheet]o-[Widget Function(Widget)?]
 	
-	[LinearRegressionSectionFormView
+	[ErrorPage
 	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
+	  +error: Exception?
 	  |
 	  +Widget build()
 	]
 	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
+	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ErrorPage]
 	
-	[ReportItemFormViewModel
+	[SplashPage
 	  |
-	  &lt;static&gt;+defaultSectionType: ReportSectionType;
-	  +sectionIdControl: FormControl&lt;String&gt;;
-	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +sectionControl: FormControl&lt;ReportSection&gt;;
-	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
-	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
-	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
-	  +alphaControl: FormControl&lt;double&gt;;
-	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +form: FormGroup;
-	  +sectionId: String;
-	  +sectionType: ReportSectionType;
-	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
-	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
-	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +dataReferenceRequired: dynamic;
-	  +aggregationRequired: dynamic;
-	  +improvementDirectionRequired: dynamic;
-	  +alphaConfidenceRequired: dynamic
+	  +Widget build()
+	]
+	
+	[StandardTableColumn
 	  |
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +ReportItemFormData buildFormData();
-	  +ReportItemFormViewModel createDuplicate();
-	  +dynamic onSectionTypeChanged();
-	  -void _updateFormControls();
-	  +void setControlsFrom()
+	  +label: String;
+	  +tooltip: String?;
+	  +columnWidth: TableColumnWidth;
+	  +sortable: bool;
+	  +sortAscending: bool?;
+	  +sortableIcon: Widget?
 	]
 	
-	[ReportItemFormViewModel]o-[ReportSectionType]
-	[ReportItemFormViewModel]o-[FormControl]
-	[ReportItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
+	[StandardTableColumn]o-[&lt;abstract&gt;TableColumnWidth]
+	[StandardTableColumn]o-[&lt;abstract&gt;Widget]
 	
-	[ReportItemFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
+	[StandardTable
 	  |
-	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
+	  +items: List&lt;T&gt;;
+	  +inputColumns: List&lt;StandardTableColumn&gt;;
+	  +onSelectItem: void Function(T);
+	  +trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?;
+	  +trailingActionsMenuType: ActionMenuType?;
+	  +sortColumnPredicates: List&lt;int Function(T, T)?&gt;?;
+	  +pinnedPredicates: int Function(T, T)?;
+	  +headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
+	  +dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
+	  +inputTrailingActionsColumn: StandardTableColumn;
+	  +tableWrapper: Widget Function(Widget)?;
+	  +cellSpacing: double;
+	  +rowSpacing: double;
+	  +minRowHeight: double?;
+	  +showTableHeader: bool;
+	  +hideLeadingTrailingWhenEmpty: bool;
+	  +leadingWidget: Widget?;
+	  +trailingWidget: Widget?;
+	  +leadingWidgetSpacing: double?;
+	  +trailingWidgetSpacing: double?;
+	  +emptyWidget: Widget?;
+	  +rowStyle: StandardTableStyle;
+	  +disableRowInteractions: bool
 	]
 	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
+	[StandardTable]o-[void Function(T)]
+	[StandardTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?]
+	[StandardTable]o-[ActionMenuType]
+	[StandardTable]o-[int Function(T, T)?]
+	[StandardTable]o-[TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?]
+	[StandardTable]o-[StandardTableColumn]
+	[StandardTable]o-[Widget Function(Widget)?]
+	[StandardTable]o-[&lt;abstract&gt;Widget]
+	[StandardTable]o-[StandardTableStyle]
 	
-	[ReportsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +reportItemDelegate: ReportFormItemDelegate;
-	  +reportItemArray: FormArray&lt;dynamic&gt;;
-	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +form: FormGroup;
-	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestConsent: bool
+	[StandardTableStyle
 	  |
-	  +void setControlsFrom();
-	  +ReportsFormData buildFormData();
-	  +void read();
-	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
-	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
-	  +dynamic testReport();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StandardTableStyle&gt;;
+	  &lt;static&gt;+plain: StandardTableStyle;
+	  &lt;static&gt;+material: StandardTableStyle
 	]
 	
-	[ReportsFormViewModel]o-[Study]
-	[ReportsFormViewModel]o-[GoRouter]
-	[ReportsFormViewModel]o-[ReportFormItemDelegate]
-	[ReportsFormViewModel]o-[FormArray]
-	[ReportsFormViewModel]o-[FormViewModelCollection]
-	[ReportsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
+	[StandardTableStyle]o-[StandardTableStyle]
+	[Enum]&lt;:--[StandardTableStyle]
 	
-	[ReportFormItemDelegate
-	  |
-	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +owner: ReportsFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
+	[PrimaryButton
 	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
+	  +text: String;
+	  +icon: IconData?;
+	  +isLoading: bool;
+	  +showLoadingEarliestAfterMs: int;
+	  +onPressed: void Function()?;
+	  +tooltip: String;
+	  +tooltipDisabled: String;
+	  +enabled: bool;
+	  +onPressedFuture: dynamic Function()?;
+	  +innerPadding: EdgeInsets;
+	  +minimumSize: Size?;
+	  +isDisabled: bool
 	]
 	
-	[ReportFormItemDelegate]o-[FormViewModelCollection]
-	[ReportFormItemDelegate]o-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
+	[PrimaryButton]o-[IconData]
+	[PrimaryButton]o-[void Function()?]
+	[PrimaryButton]o-[dynamic Function()?]
+	[PrimaryButton]o-[EdgeInsets]
+	[PrimaryButton]o-[Size]
 	
-	[ReportBadge
+	[DismissButton
 	  |
-	  +status: ReportStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
+	  +onPressed: void Function()?;
+	  +text: String?
 	  |
 	  +Widget build()
 	]
 	
-	[ReportBadge]o-[ReportStatus]
-	[ReportBadge]o-[BadgeType]
+	[DismissButton]o-[void Function()?]
 	
-	[ReportsFormData
-	  |
-	  +reportItems: List&lt;ReportItemFormData&gt;;
-	  +id: String
+	[TwoColumnLayout
 	  |
-	  +Study apply();
-	  +ReportsFormData copy()
+	  &lt;static&gt;+defaultDivider: VerticalDivider;
+	  &lt;static&gt;+defaultContentPadding: EdgeInsets;
+	  &lt;static&gt;+slimContentPadding: EdgeInsets;
+	  +leftWidget: Widget;
+	  +rightWidget: Widget;
+	  +dividerWidget: Widget?;
+	  +headerWidget: Widget?;
+	  +flexLeft: int?;
+	  +flexRight: int?;
+	  +constraintsLeft: BoxConstraints?;
+	  +constraintsRight: BoxConstraints?;
+	  +scrollLeft: bool;
+	  +scrollRight: bool;
+	  +paddingLeft: EdgeInsets?;
+	  +paddingRight: EdgeInsets?;
+	  +backgroundColorLeft: Color?;
+	  +backgroundColorRight: Color?;
+	  +stretchHeight: bool
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
+	[TwoColumnLayout]o-[VerticalDivider]
+	[TwoColumnLayout]o-[EdgeInsets]
+	[TwoColumnLayout]o-[&lt;abstract&gt;Widget]
+	[TwoColumnLayout]o-[BoxConstraints]
+	[TwoColumnLayout]o-[Color]
 	
-	[ReportStatus
+	[ActionPopUpMenuButton
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
-	  &lt;static&gt;+primary: ReportStatus;
-	  &lt;static&gt;+secondary: ReportStatus
-	]
-	
-	[ReportStatus]o-[ReportStatus]
-	[Enum]&lt;:--[ReportStatus]
-	
-	[&lt;abstract&gt;IStudyFormData
+	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
+	  +triggerIconColor: Color?;
+	  +triggerIconColorHover: Color?;
+	  +triggerIconSize: double;
+	  +disableSplashEffect: bool;
+	  +hideOnEmpty: bool;
+	  +orientation: Axis;
+	  +elevation: double?;
+	  +splashRadius: double?;
+	  +enabled: bool;
+	  +position: PopupMenuPosition
 	  |
-	  +Study apply()
+	  +Widget build();
+	  -Widget _buildPopupMenu()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
+	[ActionPopUpMenuButton]o-[Color]
+	[ActionPopUpMenuButton]o-[Axis]
+	[ActionPopUpMenuButton]o-[PopupMenuPosition]
 	
-	[StudyInfoFormViewModel
+	[FormControlLabel
 	  |
-	  +study: Study;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +organizationControl: FormControl&lt;String&gt;;
-	  +reviewBoardControl: FormControl&lt;String&gt;;
-	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
-	  +researchersControl: FormControl&lt;String&gt;;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +websiteControl: FormControl&lt;String&gt;;
-	  +phoneControl: FormControl&lt;String&gt;;
-	  +additionalInfoControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +iconRequired: dynamic;
-	  +organizationRequired: dynamic;
-	  +reviewBoardRequired: dynamic;
-	  +reviewBoardNumberRequired: dynamic;
-	  +researchersRequired: dynamic;
-	  +emailRequired: dynamic;
-	  +phoneRequired: dynamic;
-	  +emailFormat: dynamic;
-	  +websiteFormat: dynamic
+	  +formControl: AbstractControl&lt;dynamic&gt;;
+	  +text: String;
+	  +isClickable: bool;
+	  +textStyle: TextStyle?;
+	  +onClick: void Function(AbstractControl&lt;dynamic&gt;)?
 	  |
-	  +void setControlsFrom();
-	  +StudyInfoFormData buildFormData()
+	  +Widget build()
 	]
 	
-	[StudyInfoFormViewModel]o-[Study]
-	[StudyInfoFormViewModel]o-[FormControl]
-	[StudyInfoFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
+	[FormControlLabel]o-[&lt;abstract&gt;AbstractControl]
+	[FormControlLabel]o-[TextStyle]
+	[FormControlLabel]o-[void Function(AbstractControl&lt;dynamic&gt;)?]
 	
-	[StudyDesignInfoFormView
+	[MouseEventsRegion
 	  |
-	  +Widget build()
+	  +onTap: void Function()?;
+	  +onHover: void Function(PointerHoverEvent)?;
+	  +onEnter: void Function(PointerEnterEvent)?;
+	  +onExit: void Function(PointerExitEvent)?;
+	  +autoselectCursor: bool;
+	  +cursor: SystemMouseCursor;
+	  &lt;static&gt;+defaultCursor: SystemMouseCursor;
+	  +autoCursor: SystemMouseCursor
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
+	[MouseEventsRegion]o-[void Function()?]
+	[MouseEventsRegion]o-[void Function(PointerHoverEvent)?]
+	[MouseEventsRegion]o-[void Function(PointerEnterEvent)?]
+	[MouseEventsRegion]o-[void Function(PointerExitEvent)?]
+	[MouseEventsRegion]o-[SystemMouseCursor]
 	
-	[StudyInfoFormData
+	[&lt;abstract&gt;ISyncIndicatorViewModel
 	  |
-	  +title: String;
-	  +description: String?;
-	  +iconName: String;
-	  +contactInfoFormData: StudyContactInfoFormData;
-	  +id: String
+	  +isDirty: bool;
+	  +lastSynced: DateTime?
+	]
+	
+	[SyncIndicator
 	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
+	  +state: AsyncValue&lt;T&gt;;
+	  +lastSynced: DateTime?;
+	  +isDirty: bool;
+	  +animationDuration: int;
+	  +iconSize: double
 	]
 	
-	[StudyInfoFormData]o-[StudyContactInfoFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
+	[SyncIndicator]o-[&lt;abstract&gt;AsyncValue]
 	
-	[StudyContactInfoFormData
-	  |
-	  +organization: String?;
-	  +institutionalReviewBoard: String?;
-	  +institutionalReviewBoardNumber: String?;
-	  +researchers: String?;
-	  +email: String?;
-	  +website: String?;
-	  +phone: String?;
-	  +additionalInfo: String?;
-	  +id: String
+	[&lt;abstract&gt;IWithBanner
 	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
+	  +Widget? banner()
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
-	
-	[StudyFormValidationSet
+	[BannerBox
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
+	  +prefixIcon: Widget?;
+	  +body: Widget;
+	  +style: BannerStyle;
+	  +padding: EdgeInsets?;
+	  +noPrefix: bool;
+	  +dismissable: bool;
+	  +isDismissed: bool?;
+	  +onDismissed: dynamic Function()?;
+	  +dismissIconSize: double
 	]
 	
-	[Enum]&lt;:--[StudyFormValidationSet]
+	[BannerBox]o-[&lt;abstract&gt;Widget]
+	[BannerBox]o-[BannerStyle]
+	[BannerBox]o-[EdgeInsets]
+	[BannerBox]o-[dynamic Function()?]
 	
-	[MeasurementsFormData
-	  |
-	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
-	  +id: String
+	[BannerStyle
 	  |
-	  +Study apply();
-	  +MeasurementsFormData copy()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;BannerStyle&gt;;
+	  &lt;static&gt;+warning: BannerStyle;
+	  &lt;static&gt;+info: BannerStyle;
+	  &lt;static&gt;+error: BannerStyle
 	]
 	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
+	[BannerStyle]o-[BannerStyle]
+	[Enum]&lt;:--[BannerStyle]
 	
-	[MeasurementSurveyFormView
-	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
+	[ReactiveCustomColorPicker
 	]
 	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
+	[ReactiveFormField]&lt;:-[ReactiveCustomColorPicker]
 	
-	[SurveyPreview
+	[SingleColumnLayout
 	  |
-	  +routeArgs: MeasurementFormRouteArgs
+	  &lt;static&gt;+defaultConstraints: BoxConstraints;
+	  &lt;static&gt;+defaultConstraintsNarrow: BoxConstraints;
+	  +body: Widget;
+	  +header: Widget?;
+	  +stickyHeader: bool;
+	  +constraints: BoxConstraints?;
+	  +scroll: bool;
+	  +padding: EdgeInsets?
 	  |
-	  +Widget build()
+	  &lt;static&gt;+dynamic fromType()
 	]
 	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
+	[SingleColumnLayout]o-[BoxConstraints]
+	[SingleColumnLayout]o-[&lt;abstract&gt;Widget]
+	[SingleColumnLayout]o-[EdgeInsets]
 	
-	[MeasurementSurveyFormData
-	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
+	[SingleColumnLayoutType
 	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;;
+	  &lt;static&gt;+boundedWide: SingleColumnLayoutType;
+	  &lt;static&gt;+boundedNarrow: SingleColumnLayoutType;
+	  &lt;static&gt;+stretched: SingleColumnLayoutType;
+	  &lt;static&gt;+split: SingleColumnLayoutType
 	]
 	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
+	[SingleColumnLayoutType]o-[SingleColumnLayoutType]
+	[Enum]&lt;:--[SingleColumnLayoutType]
 	
-	[MeasurementSurveyFormViewModel
-	  |
-	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
+	[UnderConstruction
 	  |
-	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
+	  +Widget build()
 	]
 	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
+	[NullHelperDecoration
+	]
 	
-	[StudyDesignMeasurementsFormView
+	[InputDecoration]&lt;:-[NullHelperDecoration]
+	
+	[HelpIcon
+	  |
+	  +tooltipText: String?
 	  |
 	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
-	
-	[MeasurementsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +measurementsArray: FormArray&lt;dynamic&gt;;
-	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
-	  +form: FormGroup;
-	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +measurementRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
+	[Collapsible
 	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +MeasurementsFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +MeasurementSurveyFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave()
+	  +contentBuilder: Widget Function(BuildContext, bool);
+	  +headerBuilder: Widget Function(BuildContext, bool)?;
+	  +title: String?;
+	  +isCollapsed: bool
 	]
 	
-	[MeasurementsFormViewModel]o-[Study]
-	[MeasurementsFormViewModel]o-[GoRouter]
-	[MeasurementsFormViewModel]o-[FormArray]
-	[MeasurementsFormViewModel]o-[FormViewModelCollection]
-	[MeasurementsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
+	[Collapsible]o-[Widget Function(BuildContext, bool)]
+	[Collapsible]o-[Widget Function(BuildContext, bool)?]
 	
-	[StudyFormScaffold
+	[TextParagraph
 	  |
-	  +studyId: String;
-	  +formViewModelBuilder: T Function(WidgetRef);
-	  +formViewBuilder: Widget Function(T)
+	  +text: String?;
+	  +style: TextStyle?;
+	  +selectable: bool;
+	  +span: List&lt;TextSpan&gt;?
 	  |
 	  +Widget build()
 	]
 	
-	[StudyFormScaffold]o-[T Function(WidgetRef)]
-	[StudyFormScaffold]o-[Widget Function(T)]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
+	[TextParagraph]o-[TextStyle]
 	
-	[ConsentItemFormViewModel
+	[StudyULogo
 	  |
-	  +consentIdControl: FormControl&lt;String&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +form: FormGroup;
-	  +consentId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +onTap: void Function()?
 	  |
-	  +void setControlsFrom();
-	  +ConsentItemFormData buildFormData();
-	  +ConsentItemFormViewModel createDuplicate()
+	  +Widget build()
 	]
 	
-	[ConsentItemFormViewModel]o-[FormControl]
-	[ConsentItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
+	[StudyULogo]o-[void Function()?]
 	
-	[StudyDesignEnrollmentFormView
+	[Hyperlink
 	  |
-	  +Widget build();
-	  -dynamic _showScreenerQuestionSidesheetWithArgs();
-	  -dynamic _showConsentItemSidesheetWithArgs()
+	  +text: String;
+	  +url: String?;
+	  +onClick: void Function()?;
+	  +linkColor: Color;
+	  +hoverColor: Color?;
+	  +visitedColor: Color?;
+	  +style: TextStyle?;
+	  +hoverStyle: TextStyle?;
+	  +visitedStyle: TextStyle?;
+	  +icon: IconData?;
+	  +iconSize: double?
 	]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
-	
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
-	  |
-	  +isDirtyOptionsBannerVisible: bool
-	]
+	[Hyperlink]o-[void Function()?]
+	[Hyperlink]o-[Color]
+	[Hyperlink]o-[TextStyle]
+	[Hyperlink]o-[IconData]
 	
-	[ScreenerQuestionLogicFormView
+	[ConstrainedWidthFlexible
 	  |
-	  +formViewModel: ScreenerQuestionFormViewModel
+	  +minWidth: double;
+	  +maxWidth: double;
+	  +flex: int;
+	  +flexSum: int;
+	  +child: Widget;
+	  +outerConstraints: BoxConstraints
 	  |
 	  +Widget build();
-	  -dynamic _buildInfoBanner();
-	  -dynamic _buildAnswerOptionsLogicControls();
-	  -List&lt;Widget&gt; _buildOptionLogicRow()
+	  -double _getWidth()
 	]
 	
-	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
+	[ConstrainedWidthFlexible]o-[&lt;abstract&gt;Widget]
+	[ConstrainedWidthFlexible]o-[BoxConstraints]
 	
-	[ConsentItemFormData
+	[ActionMenuInline
 	  |
-	  +consentId: String;
-	  +title: String;
-	  +description: String;
-	  +iconName: String?;
-	  +id: String
+	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
+	  +iconSize: double?;
+	  +visible: bool;
+	  +splashRadius: double?;
+	  +paddingVertical: double?;
+	  +paddingHorizontal: double?
 	  |
-	  +ConsentItem toConsentItem();
-	  +ConsentItemFormData copy()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
-	
-	[ConsentItemFormView
+	[SecondaryButton
 	  |
-	  +formViewModel: ConsentItemFormViewModel
+	  +text: String;
+	  +icon: IconData?;
+	  +isLoading: bool;
+	  +onPressed: void Function()?
+	  |
+	  +Widget build()
 	]
 	
-	[ConsentItemFormView]o-[ConsentItemFormViewModel]
+	[SecondaryButton]o-[IconData]
+	[SecondaryButton]o-[void Function()?]
 	
-	[EnrollmentFormData
-	  |
-	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
-	  +enrollmentType: Participation;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
-	  +id: String
+	[NavbarTab
 	  |
-	  +Study apply();
-	  +EnrollmentFormData copy()
+	  +title: String;
+	  +intent: RoutingIntent?;
+	  +index: int;
+	  +enabled: bool
 	]
 	
-	[EnrollmentFormData]o-[Participation]
-	[EnrollmentFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
+	[NavbarTab]o-[RoutingIntent]
 	
-	[ScreenerQuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultResponseOptionValidity: bool;
-	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
-	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
-	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
-	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionValues: List&lt;dynamic&gt;;
-	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isDirtyOptionsBannerVisible: bool
+	[TabbedNavbar
 	  |
-	  +dynamic onResponseOptionsChanged();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
-	  +ScreenerQuestionFormViewModel createDuplicate()
+	  +tabs: List&lt;T&gt;;
+	  +selectedTab: T?;
+	  +indicator: BoxDecoration?;
+	  +height: double?;
+	  +disabledBackgroundColor: Color?;
+	  +disabledTooltipText: String?;
+	  +onSelect: void Function(int, T)?;
+	  +labelPadding: EdgeInsets?;
+	  +labelSpacing: double?;
+	  +indicatorSize: TabBarIndicatorSize?;
+	  +isScrollable: bool;
+	  +backgroundColor: Color?;
+	  +labelColorHover: Color?;
+	  +unselectedLabelColorHover: Color?
 	]
 	
-	[ScreenerQuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
+	[TabbedNavbar]o-[BoxDecoration]
+	[TabbedNavbar]o-[Color]
+	[TabbedNavbar]o-[void Function(int, T)?]
+	[TabbedNavbar]o-[EdgeInsets]
+	[TabbedNavbar]o-[TabBarIndicatorSize]
 	
-	[EnrollmentFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
-	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
-	  +consentItemArray: FormArray&lt;dynamic&gt;;
-	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +form: FormGroup;
-	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
-	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestScreener: bool;
-	  +canTestConsent: bool;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	[StandardDialog
 	  |
-	  +void setControlsFrom();
-	  +EnrollmentFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
-	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
-	  +dynamic testScreener();
-	  +dynamic testConsent();
-	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
+	  +title: Widget?;
+	  +titleText: String?;
+	  +body: Widget;
+	  +actionButtons: List&lt;Widget&gt;;
+	  +backgroundColor: Color?;
+	  +borderRadius: double?;
+	  +width: double?;
+	  +height: double?;
+	  +minWidth: double;
+	  +minHeight: double;
+	  +maxWidth: double?;
+	  +maxHeight: double?;
+	  +padding: EdgeInsets
+	  |
+	  +Widget build()
 	]
 	
-	[EnrollmentFormViewModel]o-[Study]
-	[EnrollmentFormViewModel]o-[GoRouter]
-	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
-	[EnrollmentFormViewModel]o-[FormControl]
-	[EnrollmentFormViewModel]o-[FormArray]
-	[EnrollmentFormViewModel]o-[FormViewModelCollection]
-	[EnrollmentFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
+	[StandardDialog]o-[&lt;abstract&gt;Widget]
+	[StandardDialog]o-[Color]
+	[StandardDialog]o-[EdgeInsets]
 	
-	[EnrollmentFormConsentItemDelegate
+	[ActionMenuType
 	  |
-	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +owner: EnrollmentFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ActionMenuType&gt;;
+	  &lt;static&gt;+inline: ActionMenuType;
+	  &lt;static&gt;+popup: ActionMenuType
+	]
+	
+	[ActionMenuType]o-[ActionMenuType]
+	[Enum]&lt;:--[ActionMenuType]
+	
+	[FormTableRow
 	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ConsentItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
+	  +label: String?;
+	  +labelBuilder: Widget Function(BuildContext)?;
+	  +labelStyle: TextStyle?;
+	  +labelHelpText: String?;
+	  +input: Widget;
+	  +control: AbstractControl&lt;dynamic&gt;?;
+	  +layout: FormTableRowLayout?
 	]
 	
-	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
-	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
+	[FormTableRow]o-[Widget Function(BuildContext)?]
+	[FormTableRow]o-[TextStyle]
+	[FormTableRow]o-[&lt;abstract&gt;Widget]
+	[FormTableRow]o-[&lt;abstract&gt;AbstractControl]
+	[FormTableRow]o-[FormTableRowLayout]
 	
-	[StudyFormViewModel
+	[FormTableLayout
 	  |
-	  +studyDirtyCopy: Study?;
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +router: GoRouter;
-	  +studyInfoFormViewModel: StudyInfoFormViewModel;
-	  +enrollmentFormViewModel: EnrollmentFormViewModel;
-	  +measurementsFormViewModel: MeasurementsFormViewModel;
-	  +reportsFormViewModel: ReportsFormViewModel;
-	  +interventionsFormViewModel: InterventionsFormViewModel;
-	  +form: FormGroup;
-	  +isStudyReadonly: bool;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;
+	  +rows: List&lt;FormTableRow&gt;;
+	  +columnWidths: Map&lt;int, TableColumnWidth&gt;;
+	  +rowDivider: Widget?;
+	  +rowLayout: FormTableRowLayout?;
+	  +rowLabelStyle: TextStyle?
 	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +void dispose();
-	  +void onCancel();
-	  +dynamic onSave();
-	  -dynamic _applyAndSaveSubform()
+	  +Widget build()
 	]
 	
-	[StudyFormViewModel]o-[Study]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyFormViewModel]o-[GoRouter]
-	[StudyFormViewModel]o-[StudyInfoFormViewModel]
-	[StudyFormViewModel]o-[EnrollmentFormViewModel]
-	[StudyFormViewModel]o-[MeasurementsFormViewModel]
-	[StudyFormViewModel]o-[ReportsFormViewModel]
-	[StudyFormViewModel]o-[InterventionsFormViewModel]
-	[StudyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
+	[FormTableLayout]o-[&lt;abstract&gt;Widget]
+	[FormTableLayout]o-[FormTableRowLayout]
+	[FormTableLayout]o-[TextStyle]
 	
-	[&lt;abstract&gt;WithQuestionnaireControls
+	[FormSectionHeader
 	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
+	  +title: String;
+	  +titleTextStyle: TextStyle?;
+	  +helpText: String?;
+	  +divider: bool;
+	  +helpTextDisabled: bool
 	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
-	  +void read();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
+	[FormSectionHeader]o-[TextStyle]
 	
-	[QuestionnaireFormData
+	[FormLabel
 	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
+	  +labelText: String?;
+	  +helpText: String?;
+	  +labelTextStyle: TextStyle?;
+	  +layout: FormTableRowLayout?
 	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
+	  +Widget build()
 	]
 	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
+	[FormLabel]o-[TextStyle]
+	[FormLabel]o-[FormTableRowLayout]
 	
-	[&lt;abstract&gt;QuestionFormData
-	  |
-	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
-	  +questionId: String;
-	  +questionText: String;
-	  +questionInfoText: String?;
-	  +questionType: SurveyQuestionType;
-	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
-	  +responseOptions: List&lt;dynamic&gt;;
-	  +id: String
+	[FormTableRowLayout
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +EligibilityCriterion toEligibilityCriterion();
-	  +Answer&lt;dynamic&gt; constructAnswerFor();
-	  +dynamic setResponseOptionsValidityFrom();
-	  +QuestionFormData copy()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;FormTableRowLayout&gt;;
+	  &lt;static&gt;+vertical: FormTableRowLayout;
+	  &lt;static&gt;+horizontal: FormTableRowLayout
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
+	[FormTableRowLayout]o-[FormTableRowLayout]
+	[Enum]&lt;:--[FormTableRowLayout]
 	
-	[ChoiceQuestionFormData
+	[Badge
 	  |
-	  +isMultipleChoice: bool;
-	  +answerOptions: List&lt;String&gt;;
-	  +responseOptions: List&lt;String&gt;
+	  +icon: IconData?;
+	  +color: Color?;
+	  +borderRadius: double;
+	  +label: String;
+	  +type: BadgeType;
+	  +padding: EdgeInsets;
+	  +iconSize: double?;
+	  +labelStyle: TextStyle?;
+	  +center: bool
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +QuestionFormData copy();
-	  -Choice _buildChoiceForValue();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +Widget build();
+	  -Color? _getBackgroundColor();
+	  -Color _getBorderColor();
+	  -Color? _getLabelColor()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
+	[Badge]o-[IconData]
+	[Badge]o-[Color]
+	[Badge]o-[BadgeType]
+	[Badge]o-[EdgeInsets]
+	[Badge]o-[TextStyle]
 	
-	[BoolQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
-	  +responseOptions: List&lt;String&gt;
+	[BadgeType
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +BoolQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;BadgeType&gt;;
+	  &lt;static&gt;+filled: BadgeType;
+	  &lt;static&gt;+outlined: BadgeType;
+	  &lt;static&gt;+outlineFill: BadgeType;
+	  &lt;static&gt;+plain: BadgeType
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
+	[BadgeType]o-[BadgeType]
+	[Enum]&lt;:--[BadgeType]
 	
-	[ImageQuestionFormData
+	[AsyncValueWidget
 	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
+	  +value: AsyncValue&lt;T&gt;;
+	  +data: Widget Function(T);
+	  +error: Widget Function(Object, StackTrace?)?;
+	  +loading: Widget Function()?;
+	  +empty: Widget Function()?
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +ImageQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +Widget build();
+	  -Widget _buildDataOrEmptyWidget();
+	  -Widget _defaultError();
+	  -Widget _defaultLoad()
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
+	[AsyncValueWidget]o-[&lt;abstract&gt;AsyncValue]
+	[AsyncValueWidget]o-[Widget Function(T)]
+	[AsyncValueWidget]o-[Widget Function(Object, StackTrace?)?]
+	[AsyncValueWidget]o-[Widget Function()?]
 	
-	[AudioQuestionFormData
+	[IconPack
 	  |
-	  +maxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
+	  &lt;static&gt;+defaultPack: List&lt;IconOption&gt;;
+	  &lt;static&gt;+material: List&lt;IconOption&gt;
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +AudioQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  &lt;static&gt;+IconOption? resolveIconByName()
+	]
+	
+	[IconOption
+	  |
+	  +name: String;
+	  +icon: IconData?;
+	  +isEmpty: bool;
+	  +props: List&lt;Object?&gt;
+	  |
+	  +String toJson();
+	  &lt;static&gt;+IconOption fromJson()
+	]
+	
+	[IconOption]o-[IconData]
+	[&lt;abstract&gt;Equatable]&lt;:-[IconOption]
+	
+	[ReactiveIconPicker
 	]
 	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
+	[ReactiveFocusableFormField]&lt;:-[ReactiveIconPicker]
 	
-	[ScaleQuestionFormData
+	[IconPicker
 	  |
-	  +minValue: double;
-	  +maxValue: double;
-	  +minLabel: String?;
-	  +maxLabel: String?;
-	  +midValues: List&lt;double?&gt;;
-	  +midLabels: List&lt;String?&gt;;
-	  +stepSize: double;
-	  +initialValue: double?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +responseOptions: List&lt;double&gt;;
-	  +midAnnotations: List&lt;Annotation&gt;
+	  +iconOptions: List&lt;IconOption&gt;;
+	  +selectedOption: IconOption?;
+	  +onSelect: void Function(IconOption)?;
+	  +galleryIconSize: double?;
+	  +selectedIconSize: double?;
+	  +focusNode: FocusNode?;
+	  +isDisabled: bool
 	  |
-	  +ScaleQuestion toQuestion();
-	  +QuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +Widget build()
 	]
 	
-	[ScaleQuestionFormData]o-[Color]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
+	[IconPicker]o-[IconOption]
+	[IconPicker]o-[void Function(IconOption)?]
+	[IconPicker]o-[FocusNode]
 	
-	[FreeTextQuestionFormData
+	[IconPickerField
 	  |
-	  +textLengthRange: List&lt;int&gt;;
-	  +textType: FreeTextQuestionType;
-	  +textTypeExpression: String?;
-	  +responseOptions: List&lt;String&gt;
+	  +iconOptions: List&lt;IconOption&gt;;
+	  +selectedOption: IconOption?;
+	  +selectedIconSize: double?;
+	  +galleryIconSize: double?;
+	  +onSelect: void Function(IconOption)?;
+	  +focusNode: FocusNode?;
+	  +isDisabled: bool
 	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +FreeTextQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
+	  +Widget build()
 	]
 	
-	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
+	[IconPickerField]o-[IconOption]
+	[IconPickerField]o-[void Function(IconOption)?]
+	[IconPickerField]o-[FocusNode]
 	
-	[AudioRecordingQuestionFormView
+	[IconPickerGallery
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  +iconOptions: List&lt;IconOption&gt;;
+	  +onSelect: void Function(IconOption)?;
+	  +iconSize: double
 	  |
 	  +Widget build()
 	]
 	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
+	[IconPickerGallery]o-[void Function(IconOption)?]
 	
-	[FreeTextQuestionFormView
+	[HtmlStylingBanner
 	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
+	  +isDismissed: bool;
+	  +onDismissed: dynamic Function()?
 	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
+	  +Widget build()
 	]
 	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
+	[HtmlStylingBanner]o-[dynamic Function()?]
 	
-	[SurveyQuestionType
+	[IndicatorRangeSliderThumbShape
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
+	  +buildContext: BuildContext;
+	  +start: T;
+	  +end: T
+	  |
+	  +Size getPreferredSize();
+	  +void paint()
 	]
 	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
+	[IndicatorRangeSliderThumbShape]o-[&lt;abstract&gt;BuildContext]
+	[&lt;abstract&gt;RangeSliderThumbShape]&lt;:-[IndicatorRangeSliderThumbShape]
 	
-	[ImageCapturingQuestionFormView
+	[EmptyBody
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  +icon: IconData?;
+	  +leading: Widget?;
+	  +leadingSpacing: double?;
+	  +title: String?;
+	  +description: String?;
+	  +button: Widget?
 	  |
 	  +Widget build()
 	]
 	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
+	[EmptyBody]o-[IconData]
+	[EmptyBody]o-[&lt;abstract&gt;Widget]
 	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
+	[FormScaffold
 	  |
-	  +isMidValuesClearedInfoVisible: bool
+	  +formViewModel: T;
+	  +actions: List&lt;Widget&gt;?;
+	  +body: Widget;
+	  +drawer: Widget?;
+	  +actionsSpacing: double;
+	  +actionsPadding: double
 	]
 	
-	[ScaleQuestionFormView
+	[FormScaffold]o-[&lt;abstract&gt;Widget]
+	
+	[Search
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  +onQueryChanged: dynamic Function(String);
+	  +searchController: SearchController?;
+	  +hintText: String?;
+	  +initialText: String?
 	]
 	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
+	[Search]o-[dynamic Function(String)]
+	[Search]o-[SearchController]
 	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
+	[SearchController
 	  |
-	  +Widget build()
+	  +setText: void Function(String)
 	]
 	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
+	[SearchController]o-[void Function(String)]
 	
-	[BoolQuestionFormView
+	[&lt;abstract&gt;IClipboardService
 	  |
-	  +formViewModel: QuestionFormViewModel
+	  +dynamic copy()
+	]
+	
+	[ClipboardService
 	  |
-	  +Widget build()
+	  +dynamic copy()
 	]
 	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
+	[&lt;abstract&gt;IClipboardService]&lt;:--[ClipboardService]
 	
-	[QuestionFormViewModel
+	[&lt;abstract&gt;NotificationIntent
 	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
+	  +message: String?;
+	  +customContent: Widget?;
+	  +icon: IconData?;
+	  +actions: List&lt;NotificationAction&gt;?;
+	  +type: NotificationType
 	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
+	  +void register()
 	]
 	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
+	[&lt;abstract&gt;NotificationIntent]o-[&lt;abstract&gt;Widget]
+	[&lt;abstract&gt;NotificationIntent]o-[IconData]
+	[&lt;abstract&gt;NotificationIntent]o-[NotificationType]
 	
-	[SurveyQuestionFormView
+	[NotificationAction
 	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
+	  +label: String;
+	  +onSelect: dynamic Function();
+	  +isDestructive: bool
 	]
 	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
+	[NotificationAction]o-[dynamic Function()]
 	
-	[&lt;abstract&gt;IFormDataWithSchedule
-	  |
-	  +instanceId: String;
-	  +isTimeLocked: bool;
-	  +timeLockStart: StudyUTimeOfDay?;
-	  +timeLockEnd: StudyUTimeOfDay?;
-	  +hasReminder: bool;
-	  +reminderTime: StudyUTimeOfDay?
+	[SnackbarIntent
 	  |
-	  +Schedule toSchedule()
+	  +duration: int?
 	]
 	
-	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
+	[&lt;abstract&gt;NotificationIntent]&lt;:-[SnackbarIntent]
 	
-	[ScheduleControls
-	  |
-	  +formViewModel: WithScheduleControls
+	[AlertIntent
 	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
+	  +title: String;
+	  +dismissOnAction: bool;
+	  +isDestructive: dynamic
 	]
 	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
+	[&lt;abstract&gt;NotificationIntent]&lt;:-[AlertIntent]
 	
-	[&lt;abstract&gt;WithScheduleControls
-	  |
-	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
-	  +instanceID: FormControl&lt;String&gt;;
-	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +hasReminderControl: FormControl&lt;bool&gt;;
-	  +reminderTimeControl: FormControl&lt;Time&gt;;
-	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
-	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
-	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  +hasReminder: bool;
-	  +isTimeRestricted: bool;
-	  +timeRestriction: List&lt;Time&gt;?
+	[NotificationType
 	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;NotificationType&gt;;
+	  &lt;static&gt;+snackbar: NotificationType;
+	  &lt;static&gt;+alert: NotificationType;
+	  &lt;static&gt;+custom: NotificationType
 	]
 	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
+	[NotificationType]o-[NotificationType]
+	[Enum]&lt;:--[NotificationType]
 	
-	[&lt;abstract&gt;StudyDesignPageWidget
+	[NotificationDispatcher
 	  |
-	  +Widget? banner()
+	  +child: Widget?;
+	  +snackbarInnerPadding: double;
+	  +snackbarWidth: double?;
+	  +snackbarBehavior: SnackBarBehavior;
+	  +snackbarDefaultDuration: int
 	]
 	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
+	[NotificationDispatcher]o-[&lt;abstract&gt;Widget]
+	[NotificationDispatcher]o-[SnackBarBehavior]
 	
-	[StudiesTableColumnHeader
+	[Notifications
 	  |
-	  +title: String;
-	  +sortable: bool;
-	  +sortAscending: bool;
-	  +sortingActive: bool;
-	  +onSort: void Function()?
+	  &lt;static&gt;+credentialsInvalid: SnackbarIntent;
+	  &lt;static&gt;+userAlreadyRegistered: SnackbarIntent;
+	  &lt;static&gt;+passwordReset: SnackbarIntent;
+	  &lt;static&gt;+passwordResetSuccess: SnackbarIntent;
+	  &lt;static&gt;+studyDeleted: SnackbarIntent;
+	  &lt;static&gt;+inviteCodeDeleted: SnackbarIntent;
+	  &lt;static&gt;+inviteCodeClipped: SnackbarIntent;
+	  &lt;static&gt;+studyDeleteConfirmation: AlertIntent
 	]
 	
-	[StudiesTableColumnHeader]o-[void Function()?]
+	[Notifications]o-[SnackbarIntent]
+	[Notifications]o-[AlertIntent]
 	
-	[DashboardScreen
+	[NotificationDefaultActions
 	  |
-	  +filter: StudiesFilter?
+	  &lt;static&gt;+cancel: NotificationAction
 	]
 	
-	[DashboardScreen]o-[StudiesFilter]
+	[NotificationDefaultActions]o-[NotificationAction]
 	
-	[DashboardScaffold
-	  |
-	  &lt;static&gt;+compactWidthThreshold: double;
-	  +body: Widget
+	[&lt;abstract&gt;INotificationService
 	  |
-	  +Widget build()
+	  +void showMessage();
+	  +void show();
+	  +Stream&lt;NotificationIntent&gt; watchNotifications();
+	  +void dispose()
 	]
 	
-	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
-	
-	[DashboardController
+	[NotificationService
 	  |
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +userRepository: IUserRepository;
-	  +router: GoRouter;
-	  -_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?;
-	  +searchController: SearchController;
-	  +isSortAscending: bool
+	  -_streamController: BehaviorSubject&lt;NotificationIntent&gt;
 	  |
-	  -dynamic _subscribeStudies();
-	  +dynamic setSearchText();
-	  +dynamic setStudiesFilter();
-	  +dynamic onSelectStudy();
-	  +dynamic onClickNewStudy();
-	  +dynamic pinStudy();
-	  +dynamic pinOffStudy();
-	  +void setSorting();
-	  +void filterStudies();
-	  +void sortStudies();
-	  +bool isSortingActiveForColumn();
-	  +bool isPinned();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
+	  +Stream&lt;NotificationIntent&gt; watchNotifications();
+	  +void showMessage();
+	  +void show();
 	  +void dispose()
 	]
 	
-	[DashboardController]o-[&lt;abstract&gt;IStudyRepository]
-	[DashboardController]o-[&lt;abstract&gt;IAuthRepository]
-	[DashboardController]o-[&lt;abstract&gt;IUserRepository]
-	[DashboardController]o-[GoRouter]
-	[DashboardController]o-[StreamSubscription]
-	[DashboardController]o-[SearchController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
+	[NotificationService]o-[BehaviorSubject]
+	[&lt;abstract&gt;INotificationService]&lt;:--[NotificationService]
 	
-	[StudiesFilter
+	[DropdownMenuItemTheme
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
+	  +iconTheme: IconThemeData?
 	]
 	
-	[Enum]&lt;:--[StudiesFilter]
+	[DropdownMenuItemTheme]o-[IconThemeData]
+	[&lt;abstract&gt;Diagnosticable]&lt;:-[DropdownMenuItemTheme]
 	
-	[StudiesTableColumnSize
+	[ThemeConfig
 	  |
-	  +collapsed: bool;
-	  +flex: int?;
-	  +width: double?
+	  &lt;static&gt;+kMinContentWidth: double;
+	  &lt;static&gt;+kMaxContentWidth: double;
+	  &lt;static&gt;+kHoverFadeFactor: double;
+	  &lt;static&gt;+kMuteFadeFactor: double
 	  |
-	  +Widget createContainer()
+	  &lt;static&gt;+dynamic bodyBackgroundColor();
+	  &lt;static&gt;+Color modalBarrierColor();
+	  &lt;static&gt;+Color containerColor();
+	  &lt;static&gt;+Color colorPickerInitialColor();
+	  &lt;static&gt;+TextStyle bodyTextMuted();
+	  &lt;static&gt;+TextStyle bodyTextBackground();
+	  &lt;static&gt;+double iconSplashRadius();
+	  &lt;static&gt;+Color sidesheetBackgroundColor();
+	  &lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme();
+	  &lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()
 	]
 	
-	[StudiesTable
+	[NoAnimationPageTransitionsBuilder
 	  |
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +compactWidthThreshold: double;
-	  +superCompactWidthThreshold: double;
-	  +compactStatTitleThreshold: double;
-	  +studies: List&lt;Study&gt;;
-	  +onSelect: void Function(Study);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study);
-	  +emptyWidget: Widget;
-	  +pinnedStudies: Iterable&lt;String&gt;;
-	  +dashboardController: DashboardController
+	  +Widget buildTransitions()
+	]
+	
+	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[NoAnimationPageTransitionsBuilder]
+	
+	[WebTransitionBuilder
 	  |
-	  +Widget build();
-	  -Widget _buildColumnHeader()
+	  +Widget buildTransitions()
 	]
 	
-	[StudiesTable]o-[void Function(Study)]
-	[StudiesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)]
-	[StudiesTable]o-[&lt;abstract&gt;Widget]
-	[StudiesTable]o-[DashboardController]
+	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[WebTransitionBuilder]
 	
-	[StudiesTableColumn
+	[ThemeSettingChange
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesTableColumn&gt;;
-	  &lt;static&gt;+pin: StudiesTableColumn;
-	  &lt;static&gt;+title: StudiesTableColumn;
-	  &lt;static&gt;+status: StudiesTableColumn;
-	  &lt;static&gt;+participation: StudiesTableColumn;
-	  &lt;static&gt;+createdAt: StudiesTableColumn;
-	  &lt;static&gt;+enrolled: StudiesTableColumn;
-	  &lt;static&gt;+active: StudiesTableColumn;
-	  &lt;static&gt;+completed: StudiesTableColumn;
-	  &lt;static&gt;+action: StudiesTableColumn
+	  +settings: ThemeSettings
+	]
+	
+	[ThemeSettingChange]o-[ThemeSettings]
+	[&lt;abstract&gt;Notification]&lt;:-[ThemeSettingChange]
+	
+	[ThemeProvider
+	  |
+	  +settings: ValueNotifier&lt;ThemeSettings&gt;;
+	  +lightDynamic: ColorScheme?;
+	  +darkDynamic: ColorScheme?;
+	  +pageTransitionsTheme: PageTransitionsTheme;
+	  +shapeMedium: ShapeBorder
+	  |
+	  +Color custom();
+	  +Color blend();
+	  +Color source();
+	  +ColorScheme colors();
+	  +CardTheme cardTheme();
+	  +ListTileThemeData listTileTheme();
+	  +AppBarTheme appBarTheme();
+	  +SnackBarThemeData snackBarThemeData();
+	  +TabBarTheme tabBarTheme();
+	  +BottomAppBarTheme bottomAppBarTheme();
+	  +BottomNavigationBarThemeData bottomNavigationBarTheme();
+	  +SwitchThemeData switchTheme();
+	  +InputDecorationTheme inputDecorationTheme();
+	  +TextTheme textTheme();
+	  +DividerThemeData dividerTheme();
+	  +NavigationRailThemeData navigationRailTheme();
+	  +DrawerThemeData drawerTheme();
+	  +IconThemeData iconTheme();
+	  +CheckboxThemeData checkboxTheme();
+	  +RadioThemeData radioTheme();
+	  +TooltipThemeData tooltipTheme();
+	  +ThemeData light();
+	  +ThemeData dark();
+	  +ThemeMode themeMode();
+	  +ThemeData theme();
+	  &lt;static&gt;+ThemeProvider of();
+	  +bool updateShouldNotify()
 	]
 	
-	[StudiesTableColumn]o-[StudiesTableColumn]
-	[Enum]&lt;:--[StudiesTableColumn]
+	[ThemeProvider]o-[ValueNotifier]
+	[ThemeProvider]o-[ColorScheme]
+	[ThemeProvider]o-[PageTransitionsTheme]
+	[ThemeProvider]o-[&lt;abstract&gt;ShapeBorder]
+	[&lt;abstract&gt;InheritedWidget]&lt;:-[ThemeProvider]
 	
-	[StudiesTableItem
+	[ThemeSettings
 	  |
-	  +study: Study;
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
-	  +isPinned: bool;
-	  +onPinnedChanged: void Function(Study, bool)?;
-	  +onTap: void Function(Study)?
+	  +sourceColor: Color;
+	  +themeMode: ThemeMode
 	]
 	
-	[StudiesTableItem]o-[Study]
-	[StudiesTableItem]o-[void Function(Study, bool)?]
-	[StudiesTableItem]o-[void Function(Study)?]
+	[ThemeSettings]o-[Color]
+	[ThemeSettings]o-[ThemeMode]
 	
-	[App
+	[CustomColor
+	  |
+	  +name: String;
+	  +color: Color;
+	  +blend: bool
+	  |
+	  +Color value()
 	]
 	
-	[AppContent
-	]
+	[CustomColor]o-[Color]
 	
-	[AccountSettingsDialog
+	[Time
 	  |
-	  +Widget build()
+	  &lt;static&gt;+dynamic fromTimeOfDay();
+	  +Map&lt;String, dynamic&gt; toJson();
+	  &lt;static&gt;+Time fromJson()
 	]
 	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AccountSettingsDialog]
+	[TimeOfDay]&lt;:-[Time]
 	
-	[&lt;abstract&gt;IInviteCodeRepository
+	[TimeValueAccessor
 	  |
-	  +dynamic isCodeAlreadyUsed()
+	  +String modelToViewValue();
+	  +Time? viewToModelValue();
+	  -String _addLeadingZeroIfNeeded()
 	]
 	
-	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IInviteCodeRepository]
+	[&lt;abstract&gt;ControlValueAccessor]&lt;:-[TimeValueAccessor]
 	
-	[InviteCodeRepository
-	  |
-	  +studyId: String;
-	  +ref: ProviderRef&lt;dynamic&gt;;
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +studyRepository: IStudyRepository;
-	  +study: Study
+	[&lt;abstract&gt;IProviderArgsResolver
 	  |
-	  +String getKey();
-	  +dynamic isCodeAlreadyUsed();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +dynamic emitUpdate()
+	  +R provide()
 	]
 	
-	[InviteCodeRepository]o-[&lt;abstract&gt;ProviderRef]
-	[InviteCodeRepository]o-[&lt;abstract&gt;StudyUApi]
-	[InviteCodeRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[InviteCodeRepository]o-[&lt;abstract&gt;IStudyRepository]
-	[InviteCodeRepository]o-[Study]
-	[&lt;abstract&gt;ModelRepository]&lt;:-[InviteCodeRepository]
-	[&lt;abstract&gt;IInviteCodeRepository]&lt;:--[InviteCodeRepository]
-	
-	[InviteCodeRepositoryDelegate
+	[NumericalRangeFormatter
 	  |
-	  +study: Study;
-	  +apiClient: StudyUApi;
-	  +studyRepository: IStudyRepository
+	  +min: int?;
+	  +max: int?
 	  |
-	  +dynamic fetch();
-	  +dynamic fetchAll();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic onError();
-	  +StudyInvite createDuplicate();
-	  +StudyInvite createNewInstance()
+	  +TextEditingValue formatEditUpdate()
 	]
 	
-	[InviteCodeRepositoryDelegate]o-[Study]
-	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
-	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;IStudyRepository]
-	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[InviteCodeRepositoryDelegate]
+	[&lt;abstract&gt;TextInputFormatter]&lt;:-[NumericalRangeFormatter]
 	
-	[&lt;abstract&gt;IStudyRepository
+	[StudySequenceFormatter
 	  |
-	  +dynamic launch();
-	  +dynamic deleteParticipants()
+	  +TextEditingValue formatEditUpdate()
 	]
 	
-	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IStudyRepository]
+	[&lt;abstract&gt;TextInputFormatter]&lt;:-[StudySequenceFormatter]
 	
-	[StudyRepository
+	[&lt;abstract&gt;JsonFileLoader
 	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +ref: ProviderRef&lt;dynamic&gt;;
-	  +sortCallback: void Function()?
+	  +jsonAssetsPath: String
 	  |
-	  +String getKey();
-	  +dynamic deleteParticipants();
-	  +dynamic launch();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
+	  +dynamic loadJson();
+	  +dynamic parseJsonMapFromAssets();
+	  +dynamic parseJsonListFromAssets()
 	]
 	
-	[StudyRepository]o-[&lt;abstract&gt;StudyUApi]
-	[StudyRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyRepository]o-[&lt;abstract&gt;ProviderRef]
-	[StudyRepository]o-[void Function()?]
-	[&lt;abstract&gt;ModelRepository]&lt;:-[StudyRepository]
-	[&lt;abstract&gt;IStudyRepository]&lt;:--[StudyRepository]
-	
-	[StudyRepositoryDelegate
-	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository
+	[&lt;abstract&gt;FileFormatEncoder
 	  |
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic onError();
-	  +Study createNewInstance();
-	  +Study createDuplicate()
+	  +dynamic encodeAsync();
+	  +String encode();
+	  +dynamic call()
 	]
 	
-	[StudyRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
-	[StudyRepositoryDelegate]o-[&lt;abstract&gt;IAuthRepository]
-	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[StudyRepositoryDelegate]
-	
-	[&lt;abstract&gt;StudyUApi
+	[CSVStringEncoder
 	  |
-	  +dynamic saveStudy();
-	  +dynamic fetchStudy();
-	  +dynamic getUserStudies();
-	  +dynamic deleteStudy();
-	  +dynamic saveStudyInvite();
-	  +dynamic fetchStudyInvite();
-	  +dynamic deleteStudyInvite();
-	  +dynamic deleteParticipants();
-	  +dynamic fetchAppConfig();
-	  +dynamic fetchUser();
-	  +dynamic saveUser()
-	]
-	
-	[APIException
+	  +String encode()
 	]
 	
-	[Exception]&lt;:--[APIException]
+	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[CSVStringEncoder]
 	
-	[StudyNotFoundException
+	[JsonStringEncoder
+	  |
+	  +String encode()
 	]
 	
-	[APIException]&lt;:-[StudyNotFoundException]
+	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[JsonStringEncoder]
 	
-	[MeasurementNotFoundException
+	[ModelAction
+	  |
+	  +type: T;
+	  +label: String;
+	  +icon: IconData?;
+	  +onExecute: Function;
+	  +isAvailable: bool;
+	  +isDestructive: bool
 	]
 	
-	[APIException]&lt;:-[MeasurementNotFoundException]
+	[ModelAction]o-[IconData]
 	
-	[QuestionNotFoundException
+	[&lt;abstract&gt;IModelActionProvider
+	  |
+	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
 	]
 	
-	[APIException]&lt;:-[QuestionNotFoundException]
-	
-	[ConsentItemNotFoundException
+	[&lt;abstract&gt;IListActionProvider
+	  |
+	  +void onSelectItem();
+	  +void onNewItem()
 	]
 	
-	[APIException]&lt;:-[ConsentItemNotFoundException]
+	[&lt;abstract&gt;IModelActionProvider]&lt;:-[&lt;abstract&gt;IListActionProvider]
 	
-	[InterventionNotFoundException
+	[ModelActionType
+	  |
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;ModelActionType&gt;;
+	  &lt;static&gt;+edit: ModelActionType;
+	  &lt;static&gt;+delete: ModelActionType;
+	  &lt;static&gt;+remove: ModelActionType;
+	  &lt;static&gt;+duplicate: ModelActionType;
+	  &lt;static&gt;+clipboard: ModelActionType;
+	  &lt;static&gt;+primary: ModelActionType
 	]
 	
-	[APIException]&lt;:-[InterventionNotFoundException]
+	[ModelActionType]o-[ModelActionType]
+	[Enum]&lt;:--[ModelActionType]
 	
-	[InterventionTaskNotFoundException
+	[CombinedStreamNotifier
+	  |
+	  -_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;
+	  |
+	  +void dispose()
 	]
 	
-	[APIException]&lt;:-[InterventionTaskNotFoundException]
+	[ChangeNotifier]&lt;:-[CombinedStreamNotifier]
 	
-	[ReportNotFoundException
+	[Tuple
+	  |
+	  +first: T1;
+	  +second: T2;
+	  +props: List&lt;Object?&gt;
+	  |
+	  +Map&lt;String, dynamic&gt; toJson();
+	  &lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson();
+	  +Tuple&lt;T1, T2&gt; copy();
+	  +Tuple&lt;T1, T2&gt; copyWith()
 	]
 	
-	[APIException]&lt;:-[ReportNotFoundException]
+	[&lt;abstract&gt;Equatable]&lt;:-[Tuple]
 	
-	[ReportSectionNotFoundException
+	[CountWhereValidator
+	  |
+	  +predicate: bool Function(T?);
+	  +minCount: int?;
+	  +maxCount: int?;
+	  &lt;static&gt;+kValidationMessageMinCount: String;
+	  &lt;static&gt;+kValidationMessageMaxCount: String
+	  |
+	  +Map&lt;String, dynamic&gt;? validate()
 	]
 	
-	[APIException]&lt;:-[ReportSectionNotFoundException]
+	[CountWhereValidator]o-[bool Function(T?)]
+	[&lt;abstract&gt;Validator]&lt;:-[CountWhereValidator]
 	
-	[StudyInviteNotFoundException
+	[Patterns
+	  |
+	  &lt;static&gt;+timeFormatString: String;
+	  &lt;static&gt;+emailFormatString: String;
+	  &lt;static&gt;+url: String
 	]
 	
-	[APIException]&lt;:-[StudyInviteNotFoundException]
-	
-	[UserNotFoundException
+	[SuppressedBehaviorSubject
+	  |
+	  +subject: BehaviorSubject&lt;T&gt;;
+	  +didSuppressInitialEvent: bool;
+	  -_controller: StreamController&lt;T&gt;
+	  |
+	  -StreamController&lt;T&gt; _buildDerivedController();
+	  +dynamic close()
 	]
 	
-	[APIException]&lt;:-[UserNotFoundException]
+	[SuppressedBehaviorSubject]o-[BehaviorSubject]
+	[SuppressedBehaviorSubject]o-[StreamController]
 	
-	[StudyUApiClient
+	[OptimisticUpdate
 	  |
-	  +supabaseClient: SupabaseClient;
-	  &lt;static&gt;+studyColumns: List&lt;String&gt;;
-	  &lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;;
-	  +testDelayMilliseconds: int
+	  +applyOptimistic: void Function();
+	  +apply: dynamic Function();
+	  +rollback: void Function();
+	  +onUpdate: void Function()?;
+	  +onError: void Function(Object, StackTrace?)?;
+	  +rethrowErrors: bool;
+	  +runOptimistically: bool;
+	  +completeFutureOptimistically: bool
 	  |
-	  +dynamic deleteParticipants();
-	  +dynamic getUserStudies();
-	  +dynamic fetchStudy();
-	  +dynamic deleteStudy();
-	  +dynamic saveStudy();
-	  +dynamic fetchStudyInvite();
-	  +dynamic saveStudyInvite();
-	  +dynamic deleteStudyInvite();
-	  +dynamic fetchAppConfig();
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  -dynamic _awaitGuarded();
-	  -dynamic _apiException();
-	  -dynamic _testDelay()
+	  +dynamic execute();
+	  -void _runUpdateHandlerIfAny()
 	]
 	
-	[StudyUApiClient]o-[SupabaseClient]
-	[&lt;abstract&gt;SupabaseClientDependant]&lt;:-[StudyUApiClient]
-	[&lt;abstract&gt;SupabaseQueryMixin]&lt;:-[StudyUApiClient]
-	[&lt;abstract&gt;StudyUApi]&lt;:--[StudyUApiClient]
+	[OptimisticUpdate]o-[void Function()]
+	[OptimisticUpdate]o-[dynamic Function()]
+	[OptimisticUpdate]o-[void Function()?]
+	[OptimisticUpdate]o-[void Function(Object, StackTrace?)?]
 	
-	[&lt;abstract&gt;IAppRepository
+	[&lt;abstract&gt;ExecutionLimiter
+	  |
+	  +milliseconds: int;
+	  &lt;static&gt;-_timer: Timer?
 	  |
-	  +dynamic fetchAppConfig();
 	  +void dispose()
 	]
 	
-	[AppRepository
+	[&lt;abstract&gt;ExecutionLimiter]o-[Timer]
+	
+	[Debouncer
 	  |
-	  +apiClient: StudyUApi
+	  +leading: bool;
+	  +cancelUncompleted: bool;
+	  -_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?
 	  |
-	  +dynamic fetchAppConfig();
-	  +void dispose()
+	  +dynamic call()
 	]
 	
-	[AppRepository]o-[&lt;abstract&gt;StudyUApi]
-	[&lt;abstract&gt;IAppRepository]&lt;:--[AppRepository]
+	[Debouncer]o-[CancelableOperation]
+	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Debouncer]
 	
-	[&lt;abstract&gt;IUserRepository
-	  |
-	  +user: StudyUUser
+	[Throttler
 	  |
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  +dynamic updatePreferences()
+	  +dynamic call()
 	]
 	
-	[&lt;abstract&gt;IUserRepository]o-[StudyUUser]
+	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Throttler]
 	
-	[UserRepository
-	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +ref: Ref&lt;Object?&gt;;
-	  +user: StudyUUser
+	[SerializableColor
 	  |
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  +dynamic updatePreferences()
+	  +Map&lt;String, dynamic&gt; toJson();
+	  &lt;static&gt;+SerializableColor fromJson()
 	]
 	
-	[UserRepository]o-[&lt;abstract&gt;StudyUApi]
-	[UserRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[UserRepository]o-[&lt;abstract&gt;Ref]
-	[UserRepository]o-[StudyUUser]
-	[&lt;abstract&gt;IUserRepository]&lt;:--[UserRepository]
+	[Color]&lt;:-[SerializableColor]
 	
-	[PreferenceAction
+	[RoutingIntents
 	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;PreferenceAction&gt;;
-	  &lt;static&gt;+pin: PreferenceAction;
-	  &lt;static&gt;+pinOff: PreferenceAction
+	  &lt;static&gt;+root: RoutingIntent;
+	  &lt;static&gt;+studies: RoutingIntent;
+	  &lt;static&gt;+studiesShared: RoutingIntent;
+	  &lt;static&gt;+publicRegistry: RoutingIntent;
+	  &lt;static&gt;+study: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEdit: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditInfo: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditInterventions: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String);
+	  &lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditReports: RoutingIntent Function(String);
+	  &lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String);
+	  &lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute});
+	  &lt;static&gt;+studyRecruit: RoutingIntent Function(String);
+	  &lt;static&gt;+studyMonitor: RoutingIntent Function(String);
+	  &lt;static&gt;+studyAnalyze: RoutingIntent Function(String);
+	  &lt;static&gt;+studySettings: RoutingIntent Function(String);
+	  &lt;static&gt;+accountSettings: RoutingIntent;
+	  &lt;static&gt;+studyNew: RoutingIntent;
+	  &lt;static&gt;+login: RoutingIntent;
+	  &lt;static&gt;+signup: RoutingIntent;
+	  &lt;static&gt;+passwordForgot: RoutingIntent;
+	  &lt;static&gt;+passwordForgot2: RoutingIntent Function(String);
+	  &lt;static&gt;+passwordRecovery: RoutingIntent;
+	  &lt;static&gt;+error: RoutingIntent Function(Exception)
 	]
 	
-	[PreferenceAction]o-[PreferenceAction]
-	[Enum]&lt;:--[PreferenceAction]
+	[RoutingIntents]o-[RoutingIntent]
+	[RoutingIntents]o-[RoutingIntent Function(String)]
+	[RoutingIntents]o-[RoutingIntent Function(String, String)]
+	[RoutingIntents]o-[RoutingIntent Function(String, {String? appRoute})]
+	[RoutingIntents]o-[RoutingIntent Function(Exception)]
 	
-	[&lt;abstract&gt;IAuthRepository
+	[RoutingIntent
 	  |
-	  +allowPasswordReset: bool;
-	  +currentUser: User?;
-	  +isLoggedIn: bool;
-	  +session: Session?;
-	  +serializedSession: String?
+	  +route: GoRoute;
+	  +params: Map&lt;String, String&gt;;
+	  +queryParams: Map&lt;String, String&gt;;
+	  +dispatch: RoutingIntentDispatch?;
+	  +extra: Object?;
+	  +routeName: String;
+	  +arguments: Map&lt;String, String&gt;;
+	  +props: List&lt;Object?&gt;
 	  |
-	  +dynamic signUp();
-	  +dynamic signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic updateUser();
-	  +void dispose()
+	  -dynamic _validateRoute();
+	  +bool matches()
 	]
 	
-	[&lt;abstract&gt;IAuthRepository]o-[User]
-	[&lt;abstract&gt;IAuthRepository]o-[Session]
-	[&lt;abstract&gt;IAppDelegate]&lt;:-[&lt;abstract&gt;IAuthRepository]
+	[RoutingIntent]o-[GoRoute]
+	[RoutingIntent]o-[RoutingIntentDispatch]
+	[&lt;abstract&gt;Equatable]&lt;:-[RoutingIntent]
 	
-	[AuthRepository
-	  |
-	  +supabaseClient: SupabaseClient;
-	  +allowPasswordReset: bool;
-	  +authClient: GoTrueClient;
-	  +session: Session?;
-	  +serializedSession: String?;
-	  +currentUser: User?;
-	  +isLoggedIn: bool
+	[RoutingIntentDispatch
 	  |
-	  -void _registerAuthListener();
-	  +dynamic signUp();
-	  +dynamic signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic updateUser();
-	  +void dispose();
-	  +dynamic onAppStart()
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;;
+	  &lt;static&gt;+go: RoutingIntentDispatch;
+	  &lt;static&gt;+push: RoutingIntentDispatch
 	]
 	
-	[AuthRepository]o-[SupabaseClient]
-	[AuthRepository]o-[GoTrueClient]
-	[AuthRepository]o-[Session]
-	[AuthRepository]o-[User]
-	[&lt;abstract&gt;IAuthRepository]&lt;:--[AuthRepository]
+	[RoutingIntentDispatch]o-[RoutingIntentDispatch]
+	[Enum]&lt;:--[RoutingIntentDispatch]
 	
-	[StudyLaunched
+	[RouterKeys
+	  |
+	  &lt;static&gt;+studyKey: ValueKey&lt;String&gt;;
+	  &lt;static&gt;+authKey: ValueKey&lt;String&gt;
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[StudyLaunched]
+	[RouterKeys]o-[ValueKey]
 	
-	[&lt;abstract&gt;SupabaseClientDependant
+	[RouteParams
 	  |
-	  +supabaseClient: SupabaseClient
+	  &lt;static&gt;+studiesFilter: String;
+	  &lt;static&gt;+studyId: String;
+	  &lt;static&gt;+measurementId: String;
+	  &lt;static&gt;+interventionId: String;
+	  &lt;static&gt;+testAppRoute: String
 	]
 	
-	[&lt;abstract&gt;SupabaseClientDependant]o-[SupabaseClient]
-	
-	[SupabaseQueryError
+	[RouterConf
 	  |
-	  +statusCode: String?;
-	  +message: String;
-	  +details: dynamic
+	  &lt;static&gt;+router: GoRouter;
+	  &lt;static&gt;+routes: List&lt;GoRoute&gt;;
+	  &lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;;
+	  &lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;
+	  |
+	  &lt;static&gt;+GoRoute route()
 	]
 	
-	[Exception]&lt;:--[SupabaseQueryError]
+	[RouterConf]o-[GoRouter]
 	
-	[&lt;abstract&gt;SupabaseQueryMixin
+	[&lt;abstract&gt;StudyFormRouteArgs
 	  |
-	  +dynamic deleteAll();
-	  +dynamic getAll();
-	  +dynamic getById();
-	  +dynamic getByColumn();
-	  +List&lt;T&gt; deserializeList();
-	  +T deserializeObject()
+	  +studyId: String
 	]
 	
-	[WrappedModel
-	  |
-	  -_model: T;
-	  +asyncValue: AsyncValue&lt;T&gt;;
-	  +isLocalOnly: bool;
-	  +isDirty: bool;
-	  +isDeleted: bool;
-	  +lastSaved: DateTime?;
-	  +lastFetched: DateTime?;
-	  +lastUpdated: DateTime?;
-	  +model: T
+	[&lt;abstract&gt;QuestionFormRouteArgs
 	  |
-	  +dynamic markWithError();
-	  +dynamic markAsLoading();
-	  +dynamic markAsFetched();
-	  +dynamic markAsSaved()
+	  +questionId: String
+	]
+	
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[&lt;abstract&gt;QuestionFormRouteArgs]
+	
+	[ScreenerQuestionFormRouteArgs
+	]
+	
+	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:-[ScreenerQuestionFormRouteArgs]
+	
+	[ConsentItemFormRouteArgs
+	  |
+	  +consentId: String
 	]
 	
-	[WrappedModel]o-[&lt;abstract&gt;AsyncValue]
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ConsentItemFormRouteArgs]
 	
-	[ModelRepositoryException
+	[MeasurementFormRouteArgs
+	  |
+	  +measurementId: String
 	]
 	
-	[Exception]&lt;:--[ModelRepositoryException]
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[MeasurementFormRouteArgs]
 	
-	[ModelNotFoundException
+	[SurveyQuestionFormRouteArgs
+	  |
+	  +questionId: String
 	]
 	
-	[ModelRepositoryException]&lt;:--[ModelNotFoundException]
+	[MeasurementFormRouteArgs]&lt;:-[SurveyQuestionFormRouteArgs]
+	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:--[SurveyQuestionFormRouteArgs]
 	
-	[&lt;abstract&gt;IModelRepository
+	[InterventionFormRouteArgs
 	  |
-	  +String getKey();
-	  +WrappedModel&lt;T&gt;? get();
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic duplicateAndSave();
-	  +dynamic duplicateAndSaveFromRemote();
-	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
-	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
-	  +dynamic ensurePersisted();
-	  +void dispose()
+	  +interventionId: String
 	]
 	
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[&lt;abstract&gt;IModelRepository]
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[InterventionFormRouteArgs]
 	
-	[&lt;abstract&gt;IModelRepositoryDelegate
+	[InterventionTaskFormRouteArgs
 	  |
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +T createNewInstance();
-	  +T createDuplicate();
-	  +dynamic onError()
+	  +taskId: String
 	]
 	
-	[&lt;abstract&gt;ModelRepository
+	[InterventionFormRouteArgs]&lt;:-[InterventionTaskFormRouteArgs]
+	
+	[ReportItemFormRouteArgs
 	  |
-	  +delegate: IModelRepositoryDelegate&lt;T&gt;;
-	  -_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;;
-	  -_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;;
-	  +modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;;
-	  +modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;;
-	  -_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;
+	  +sectionId: String
+	]
+	
+	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ReportItemFormRouteArgs]
+	
+	[&lt;abstract&gt;GoRouteParamEnum
 	  |
-	  +WrappedModel&lt;T&gt;? get();
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic duplicateAndSave();
-	  +dynamic duplicateAndSaveFromRemote();
-	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
-	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
-	  -dynamic _buildModelSpecificController();
-	  +dynamic ensurePersisted();
-	  +WrappedModel&lt;T&gt; upsertLocally();
-	  +List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally();
-	  +dynamic emitUpdate();
-	  +dynamic emitModelEvent();
-	  +dynamic emitError();
-	  +void dispose();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
+	  +String toRouteParam();
+	  +String toShortString()
 	]
 	
-	[&lt;abstract&gt;ModelRepository]o-[&lt;abstract&gt;IModelRepositoryDelegate]
-	[&lt;abstract&gt;ModelRepository]o-[BehaviorSubject]
-	[&lt;abstract&gt;IModelRepository]&lt;:-[&lt;abstract&gt;ModelRepository]
+	[Config
+	  |
+	  &lt;static&gt;+isDebugMode: bool;
+	  &lt;static&gt;+defaultLocale: Set&lt;String&gt;;
+	  &lt;static&gt;+supportedLocales: Map&lt;String, String&gt;;
+	  &lt;static&gt;+newStudyId: String;
+	  &lt;static&gt;+newModelId: String;
+	  &lt;static&gt;+minSplashTime: int;
+	  &lt;static&gt;+formAutosaveDebounce: int
+	]
 	
-	[&lt;abstract&gt;ModelEvent
+	[StudyTemplates
 	  |
-	  +modelId: String;
-	  +model: T
+	  &lt;static&gt;+kUnnamedStudyTitle: String
+	  |
+	  &lt;static&gt;+Study emptyDraft()
 	]
 	
-	[IsFetched
+	[StudyActionType
+	  |
+	  +index: int;
+	  &lt;static&gt;+values: List&lt;StudyActionType&gt;;
+	  &lt;static&gt;+pin: StudyActionType;
+	  &lt;static&gt;+pinoff: StudyActionType;
+	  &lt;static&gt;+edit: StudyActionType;
+	  &lt;static&gt;+duplicate: StudyActionType;
+	  &lt;static&gt;+duplicateDraft: StudyActionType;
+	  &lt;static&gt;+addCollaborator: StudyActionType;
+	  &lt;static&gt;+export: StudyActionType;
+	  &lt;static&gt;+delete: StudyActionType
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsFetched]
+	[StudyActionType]o-[StudyActionType]
+	[Enum]&lt;:--[StudyActionType]
 	
-	[IsSaving
+	[&lt;abstract&gt;ResultTypes
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaving]
+	[MeasurementResultTypes
+	  |
+	  &lt;static&gt;+questionnaire: String;
+	  &lt;static&gt;+values: List&lt;String&gt;
+	]
 	
-	[IsSaved
+	[&lt;abstract&gt;ResultTypes]&lt;:-[MeasurementResultTypes]
+	
+	[InterventionResultTypes
+	  |
+	  &lt;static&gt;+checkmarkTask: String;
+	  &lt;static&gt;+values: List&lt;String&gt;
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaved]
+	[&lt;abstract&gt;ResultTypes]&lt;:-[InterventionResultTypes]
 	
-	[IsDeleted
+	[StudyExportData
+	  |
+	  +study: Study;
+	  +measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
+	  +interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
+	  +mediaData: List&lt;String&gt;;
+	  +isEmpty: bool
 	]
 	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsDeleted]
+	[StudyExportData]o-[Study]
 	
 	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
+	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
 		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
 			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="4748.0" width="84279.3" stroke="none"></rect>
+				<rect x="0.0" y="0.0" height="4763.0" width="78263.5" stroke="none"></rect>
 			</g>
 			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M25639.0 158.2 L25380.5 293 L25380.5 591 L25380.5 591.0 " fill="none"></path>
-					<path d="M25641.4 162.9 L25639.0 158.2 L25636.5 153.4 L25650.8 152.0 Z"></path>
-					<path d="M25680.5 165.3 L25680.5 293 L25680.5 591 L25680.5 591.0 " fill="none"></path>
-					<path d="M25685.8 165.3 L25680.5 165.3 L25675.2 165.3 L25680.5 152.0 Z"></path>
-					<path d="M207.0 2704.7 L207 3314 L64938 3500.41216617898 L64938.0 3500.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M212.3 2695.3 L207.0 2704.7 L201.7 2695.3 L207.0 2686.0 Z"></path>
-					</g>
-					<path d="M442.9 3408.2 L456 3402 L463.5 3402 L463.5 3402 L471 3500.5 L471 3500.5 L463.5 3599 L463.5 3599 L456 3599 L456 3599 L426 3584.8612440191387 L426.0 3584.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M432.2 3407.3 L442.9 3408.2 L436.7 3417.0 L426.0 3416.1 Z"></path>
+				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
+					<g stroke-dasharray="6 6">
+						<path d="M222.5 177.5 L119.5 293 L119.5 598.5 L119.5 598.5 " fill="none"></path>
 					</g>
+					<path d="M226.5 181.0 L222.5 177.5 L218.5 173.9 L231.4 167.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3061.8 2635.5 L247 3314 L247 3402 L247.0 3402.0 " fill="none"></path>
+						<path d="M295.5 177.5 L398.5 293 L398.5 598.5 L398.5 598.5 " fill="none"></path>
 					</g>
-					<path d="M3063.0 2640.7 L3061.8 2635.5 L3060.5 2630.3 L3074.8 2632.4 Z"></path>
-					<path d="M3821.2 2726.9 L3721.5 3314 L3470.9490616621983 3469.5 L3470.9 3469.5 " fill="none"></path>
+					<path d="M299.5 173.9 L295.5 177.5 L291.5 181.0 L286.6 167.5 Z"></path>
+					<path d="M2241.3 2689.2 L2103.25 3314 L2103.25 3447 L2103.3 3447.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3828.0 2718.6 L3821.2 2726.9 L3817.5 2716.8 L3824.3 2708.5 Z"></path>
+						<path d="M2248.5 2681.3 L2241.3 2689.2 L2238.1 2679.0 L2245.3 2671.0 Z"></path>
 					</g>
-					<path d="M3864.1 2726.6 L4012.25 3314 L3725.0348525469167 3454.5 L3725.0 3454.5 " fill="none"></path>
+					<path d="M2255.5 2689.7 L2255.5 3314 L41377 3500.3618536161734 L41377.0 3500.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3867.0 2716.2 L3864.1 2726.6 L3856.7 2718.9 L3859.6 2708.5 Z"></path>
+						<path d="M2260.8 2680.3 L2255.5 2689.7 L2250.2 2680.3 L2255.5 2671.0 Z"></path>
 					</g>
-					<path d="M1867.5 3550.2 L1867.5 3687 L1867.5 3797.5 L1867.5 3797.5 " fill="none"></path>
+					<path d="M2269.7 2689.2 L2407.75 3314 L2407.75 3485 L2407.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1872.8 3540.8 L1867.5 3550.2 L1862.2 3540.8 L1867.5 3531.5 Z"></path>
+						<path d="M2272.9 2679.0 L2269.7 2689.2 L2262.5 2681.3 L2265.7 2671.0 Z"></path>
 					</g>
-					<path d="M60380.8 3931.2 L60380.75 4000 L62172 4128.787391012743 L62172.0 4128.8 " fill="none"></path>
+					<path d="M2304.4 3450.0 L2316.25 3447 L2323.75 3447 L2323.75 3447 L2331.25 3500.5 L2331.25 3500.5 L2323.75 3554 L2323.75 3554 L2316.25 3554 L2316.25 3554 L2286.25 3546.4647887323945 L2286.3 3546.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60386.1 3921.8 L60380.8 3931.2 L60375.4 3921.8 L60380.8 3912.5 Z"></path>
+						<path d="M2294.0 3447.1 L2304.4 3450.0 L2296.6 3457.4 L2286.3 3454.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M60380.8 3567.3 L60380.75 3687 L60380.75 3774.5 L60380.8 3774.5 " fill="none"></path>
+						<path d="M4062.5 2643.6 L2527 3314 L2224.808310991957 3447 L2224.8 3447.0 " fill="none"></path>
 					</g>
-					<path d="M60386.1 3567.3 L60380.8 3567.3 L60375.4 3567.3 L60380.8 3554.0 Z"></path>
-					<path d="M4202.1 2719.6 L4052.25 3314 L21428.75 3500.11975936136 L21428.8 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4209.6 2711.9 L4202.1 2719.6 L4199.3 2709.2 L4206.7 2701.5 Z"></path>
+					<path d="M4064.7 2648.5 L4062.5 2643.6 L4060.4 2638.8 L4074.8 2638.3 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M74768.2 1352.5 L74507 1459 L74507 1697.5 L74507 1697.5 L74507 1936 L74507 1936 L74507 2625 L74507 2625 L74507 3314 L74507 3314 L62792 3498.5232464845235 L62792.0 3498.5 " fill="none"></path>
 					</g>
-					<path d="M4207.6 2719.8 L4092.25 3314 L25696 3500.1252295326194 L25696.0 3500.1 " fill="none"></path>
+					<path d="M74770.2 1357.4 L74768.2 1352.5 L74766.1 1347.6 L74780.5 1347.5 Z"></path>
+					<path d="M67152.7 3949.8 L67114 4000 L63180 4129.857371597487 L63180.0 4129.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4214.6 2711.7 L4207.6 2719.8 L4204.1 2709.6 L4211.1 2701.5 Z"></path>
+						<path d="M67162.7 3945.6 L67152.7 3949.8 L67154.2 3939.1 L67164.2 3935.0 Z"></path>
 					</g>
-					<path d="M4213.1 2720.0 L4132.25 3314 L1634 3489.1098844310814 L1634.0 3489.1 " fill="none"></path>
+					<path d="M67179.0 3951.6 L67154 4000 L54090 4132.503954887788 L54090.0 4132.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M4219.6 2711.5 L4213.1 2720.0 L4209.0 2710.0 L4215.6 2701.5 Z"></path>
+						<path d="M67188.0 3945.7 L67179.0 3951.6 L67178.5 3940.8 L67187.5 3935.0 Z"></path>
 					</g>
-					<path d="M1867.5 3908.2 L1867.5 4000 L6731 4131.738225186982 L6731.0 4131.7 " fill="none"></path>
+					<path d="M67290.5 3951.6 L67315.5 4000 L71875.25 4132.417294251503 L71875.3 4132.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1872.8 3898.8 L1867.5 3908.2 L1862.2 3898.8 L1867.5 3889.5 Z"></path>
+						<path d="M67291.0 3940.8 L67290.5 3951.6 L67281.5 3945.7 L67282.0 3935.0 Z"></path>
 					</g>
-					<path d="M4336.6 2709.6 L5127 3314 L3489 3493.0662368112544 L3489.0 3493.1 " fill="none"></path>
-					<path d="M4339.9 2705.4 L4336.6 2709.6 L4333.4 2713.8 L4326.0 2701.5 Z"></path>
-					<path d="M4361.7 2708.5 L5345.75 3314 L3733 3489.406254556058 L3733.0 3489.4 " fill="none"></path>
-					<path d="M4364.5 2703.9 L4361.7 2708.5 L4358.9 2713.0 L4350.3 2701.5 Z"></path>
-					<path d="M1651.8 3443.4 L1664 3439.5 L1671.5 3439.5 L1671.5 3439.5 L1679 3500.5 L1679 3500.5 L1671.5 3561.5 L1671.5 3561.5 L1664 3561.5 L1664 3561.5 L1634 3551.9935064935066 L1634.0 3552.0 " fill="none"></path>
+					<path d="M67316.8 3949.8 L67355.5 4000 L41537.5 4133.627346465817 L41537.5 4133.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1641.3 3441.1 L1651.8 3443.4 L1644.5 3451.3 L1634.0 3449.0 Z"></path>
+						<path d="M67315.3 3939.1 L67316.8 3949.8 L67306.8 3945.6 L67305.3 3935.0 Z"></path>
 					</g>
+					<path d="M74768.3 1362.4 L74547 1459 L74547 1697.5 L74547 1697.5 L74547 1936 L74547 1936 L74547 2625 L74547 2625 L74547 3314 L74547 3314 L74547 3500.5 L74547 3500.5 L74547 3687 L74547 3687 L67436.25 3839.187408116517 L67436.3 3839.2 " fill="none"></path>
+					<path d="M74770.4 1367.3 L74768.3 1362.4 L74766.1 1357.5 L74780.5 1357.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3062.1 2639.2 L1016 3314 L1322.5160857908847 3439.5 L1322.5 3439.5 " fill="none"></path>
+						<path d="M62666.5 3552.3 L62666.5 3687 L67033.25 3836.59697367701 L67033.3 3836.6 " fill="none"></path>
 					</g>
-					<path d="M3063.8 2644.3 L3062.1 2639.2 L3060.4 2634.2 L3074.8 2635.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M26202.5 180.8 L26202.5 293 L26202.5 598.5 L26202.5 598.5 " fill="none"></path>
-					</g>
-					<path d="M26207.8 180.8 L26202.5 180.8 L26197.2 180.8 L26202.5 167.5 Z"></path>
-					<path d="M5521.4 2704.2 L5385.75 3314 L21428.75 3500.0882234039245 L21428.8 3500.1 " fill="none"></path>
+					<path d="M62671.8 3552.3 L62666.5 3552.3 L62661.2 3552.3 L62666.5 3539.0 Z"></path>
+					<path d="M74485.0 3909.3 L74267 4000 L63180 4132.500156075808 L63180.0 4132.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5528.6 2696.3 L5521.4 2704.2 L5518.2 2694.0 L5525.4 2686.0 Z"></path>
+						<path d="M74495.7 3910.7 L74485.0 3909.3 L74491.6 3900.8 L74502.3 3902.1 Z"></path>
 					</g>
-					<path d="M5550.0 2704.5 L5634.25 3314 L3935 3492.01439404578 L3935.0 3492.0 " fill="none"></path>
+					<path d="M74698.6 3959.3 L74718 4000 L54090 4133.048639021925 L54090.0 4133.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5554.0 2694.5 L5550.0 2704.5 L5543.4 2696.0 L5547.4 2686.0 Z"></path>
+						<path d="M74699.4 3948.6 L74698.6 3959.3 L74689.7 3953.2 L74690.5 3942.5 Z"></path>
 					</g>
-					<path d="M5903.4 2742.1 L5756.25 3314 L32617.5 3500.1223679444192 L32617.5 3500.1 " fill="none"></path>
+					<path d="M74702.9 1785.9 L74643.25 1936 L74643.25 2625 L74643.25 2625 L74643.25 3314 L74643.25 3314 L74643.25 3500.5 L74643.25 3500.5 L74643.25 3687 L74643.25 3687 L74643.25 3744.5 L74643.3 3744.5 " fill="none"></path>
+					<path d="M74707.8 1787.9 L74702.9 1785.9 L74697.9 1783.9 L74707.8 1773.5 Z"></path>
+					<path d="M3469.3 3916.2 L3469.25 4000 L62929 4133.717765722222 L62929.0 4133.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5910.9 2734.4 L5903.4 2742.1 L5900.5 2731.7 L5908.0 2724.0 Z"></path>
+						<path d="M3474.6 3906.8 L3469.3 3916.2 L3463.9 3906.8 L3469.3 3897.5 Z"></path>
 					</g>
-					<path d="M5910.1 2742.3 L5796.25 3314 L28098.25 3499.8084878266695 L28098.3 3499.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5917.2 2734.2 L5910.1 2742.3 L5906.7 2732.1 L5913.8 2724.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M3469.3 3552.3 L3469.25 3687 L3469.25 3789.5 L3469.3 3789.5 " fill="none"></path>
 					</g>
-					<path d="M5916.9 2742.5 L5836.25 3314 L4279.141420911528 3485 L4279.1 3485.0 " fill="none"></path>
+					<path d="M3474.6 3552.3 L3469.3 3552.3 L3463.9 3552.3 L3469.3 3539.0 Z"></path>
+					<path d="M794.1 181.8 L605 293 L605 614 L605.0 614.0 " fill="none"></path>
+					<path d="M796.8 186.4 L794.1 181.8 L791.4 177.2 L805.6 175.0 Z"></path>
+					<path d="M828.5 185.0 L734 293 L734 614 L734.0 614.0 " fill="none"></path>
+					<path d="M832.5 188.5 L828.5 185.0 L824.5 181.5 L837.3 175.0 Z"></path>
+					<path d="M866.0 188.3 L856 293 L856 614 L856.0 614.0 " fill="none"></path>
+					<path d="M871.3 188.8 L866.0 188.3 L860.7 187.8 L867.3 175.0 Z"></path>
+					<path d="M905.9 185.9 L981.5 293 L981.5 614 L981.5 614.0 " fill="none"></path>
+					<path d="M910.2 182.8 L905.9 185.9 L901.5 189.0 L898.2 175.0 Z"></path>
+					<path d="M5599.8 2772.7 L5599.75 3314 L45378.5 3500.2448300101046 L45378.5 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5923.5 2734.0 L5916.9 2742.5 L5912.9 2732.5 L5919.5 2724.0 Z"></path>
+						<path d="M5605.1 2763.3 L5599.8 2772.7 L5594.4 2763.3 L5599.8 2754.0 Z"></path>
 					</g>
-					<path d="M5964.6 2742.0 L6116.5 3314 L4507 3491.3540620384047 L4507.0 3491.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5967.3 2731.7 L5964.6 2742.0 L5957.0 2734.4 L5959.8 2724.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M4416.5 141.6 L2621.5 293 L2621.5 614 L2621.5 614.0 " fill="none"></path>
 					</g>
-					<path d="M6421.6 2719.4 L6246 3314 L23930.25 3499.7751468041065 L23930.3 3499.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6429.4 2712.0 L6421.6 2719.4 L6419.1 2708.9 L6426.9 2701.5 Z"></path>
+					<path d="M4416.9 146.9 L4416.5 141.6 L4416.0 136.3 L4429.8 140.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M2621.5 658.3 L2621.5 966 L2621.5 1197 L2621.5 1197.0 " fill="none"></path>
 					</g>
-					<path d="M6427.0 2719.7 L6286 3314 L10158 3498.3809523809523 L10158.0 3498.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6434.4 2711.8 L6427.0 2719.7 L6424.0 2709.3 L6431.3 2701.5 Z"></path>
+					<path d="M2626.8 658.3 L2621.5 658.3 L2616.2 658.3 L2621.5 645.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M75463.8 171.8 L75111.5 293 L75111.5 501 L75111.5 501.0 " fill="none"></path>
 					</g>
-					<path d="M6455.0 2720.1 L6489.5 3314 L4869.813672922252 3485 L4869.8 3485.0 " fill="none"></path>
+					<path d="M75465.5 176.9 L75463.8 171.8 L75462.0 166.8 L75476.4 167.5 Z"></path>
+					<path d="M74764.9 1441.2 L74738 1459 L74738 1621.5 L74738.0 1621.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6459.8 2710.5 L6455.0 2720.1 L6449.2 2711.1 L6453.9 2701.5 Z"></path>
+						<path d="M74775.6 1440.5 L74764.9 1441.2 L74769.8 1431.6 L74780.5 1431.0 Z"></path>
 					</g>
-					<path d="M6950.0 2772.0 L6801.75 3314 L21539.75 3500.133744159274 L21539.8 3500.1 " fill="none"></path>
+					<path d="M75297.0 1453.8 L75301 1459 L75301 1697.5 L75301 1697.5 L75301 1936 L75301 1936 L75301 2625 L75301 2625 L75301 3314 L75301 3314 L75301 3500.5 L75301 3500.5 L75301 3687 L75301 3687 L75301 3843.5 L75301 3843.5 L75301 4000 L75301 4000 L48381.5 4133.64007854179 L48381.5 4133.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6957.6 2764.4 L6950.0 2772.0 L6947.4 2761.6 L6955.0 2754.0 Z"></path>
+						<path d="M75295.5 1443.1 L75297.0 1453.8 L75287.1 1449.7 L75285.6 1439.0 Z"></path>
 					</g>
-					<path d="M6958.5 2772.2 L6841.75 3314 L5712.25 3496.5405112651647 L5712.3 3496.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6965.7 2764.2 L6958.5 2772.2 L6955.3 2762.0 L6962.4 2754.0 Z"></path>
+					<path d="M75111.5 771.3 L75111.5 966 L75111.5 986 L75111.5 986.0 " fill="none"></path>
+					<path d="M75116.8 771.3 L75111.5 771.3 L75106.2 771.3 L75111.5 758.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M75331.5 1448.8 L75341 1459 L70423.75 1691.2420169315312 L70423.8 1691.2 " fill="none"></path>
 					</g>
-					<path d="M7010.7 2772.5 L7086 3314 L5926.25 3487.485762983758 L5926.3 3487.5 " fill="none"></path>
+					<path d="M75335.4 1445.1 L75331.5 1448.8 L75327.6 1452.4 L75322.4 1439.0 Z"></path>
+					<path d="M73448.8 2749.8 L73333.5 3314 L73333.5 3500.5 L73333.5 3500.5 L73333.5 3687 L73333.5 3687 L73333.5 3843.5 L73333.5 3843.5 L73333.5 4000 L73333.5 4000 L71984.25 4128.797506678539 L71984.3 4128.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7014.7 2762.5 L7010.7 2772.5 L7004.2 2764.0 L7008.2 2754.0 Z"></path>
+						<path d="M73455.9 2741.7 L73448.8 2749.8 L73445.4 2739.6 L73452.5 2731.5 Z"></path>
 					</g>
-					<path d="M7388.9 2697.0 L7319.5 3314 L6176.367292225201 3485 L6176.4 3485.0 " fill="none"></path>
+					<path d="M73456.0 2750.0 L73373.5 3314 L73373.5 3500.5 L73373.5 3500.5 L73373.5 3687 L73373.5 3687 L73373.5 3843.5 L73373.5 3843.5 L73373.5 4000 L73373.5 4000 L63180 4132.370287818587 L63180.0 4132.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7395.2 2688.4 L7388.9 2697.0 L7384.6 2687.2 L7391.0 2678.5 Z"></path>
+						<path d="M73462.6 2741.5 L73456.0 2750.0 L73452.0 2740.0 L73458.7 2731.5 Z"></path>
 					</g>
-					<path d="M7412.2 2696.8 L7543.25 3314 L36070.5 3499.6604449291167 L36070.5 3499.7 " fill="none"></path>
+					<path d="M73474.3 2750.2 L73474.25 3314 L73474.25 3500.5 L73474.25 3500.5 L73474.25 3687 L73474.25 3687 L73474.25 3843.5 L73474.25 3843.5 L73474.25 4000 L73474.25 4000 L54090 4132.988057905718 L54090.0 4133.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7415.5 2686.5 L7412.2 2696.8 L7405.1 2688.7 L7408.4 2678.5 Z"></path>
+						<path d="M73479.6 2740.8 L73474.3 2750.2 L73468.9 2740.8 L73474.3 2731.5 Z"></path>
 					</g>
-					<path d="M36199.5 3550.2 L36199.5 3687 L36199.5 3828 L36199.5 3828.0 " fill="none"></path>
+					<path d="M73492.5 2750.0 L73575 3314 L62792 3498.354356694321 L62792.0 3498.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M36204.8 3540.8 L36199.5 3550.2 L36194.2 3540.8 L36199.5 3531.5 Z"></path>
+						<path d="M73496.5 2740.0 L73492.5 2750.0 L73485.9 2741.5 L73489.8 2731.5 Z"></path>
 					</g>
-					<path d="M7729.5 2712.2 L7729.5 3314 L21428.75 3500.017956278782 L21428.8 3500.0 " fill="none"></path>
+					<path d="M73499.7 2749.8 L73615 3314 L63068.5 3499.9622057294127 L63068.5 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M7734.8 2702.8 L7729.5 2712.2 L7724.2 2702.8 L7729.5 2693.5 Z"></path>
+						<path d="M73503.1 2739.6 L73499.7 2749.8 L73492.6 2741.7 L73496.0 2731.5 Z"></path>
 					</g>
-					<path d="M7999.1 2734.9 L7894.25 3314 L21428.75 3500.0121039056744 L21428.8 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8006.0 2726.6 L7999.1 2734.9 L7995.5 2724.7 L8002.4 2716.5 Z"></path>
+					<path d="M75369.0 1448.0 L75381 1459 L75381 1697.5 L75381 1697.5 L75381 1936 L75381 1936 L73675.75 2552.188409597483 L73675.8 2552.2 " fill="none"></path>
+					<path d="M75372.6 1444.1 L75369.0 1448.0 L75365.4 1451.9 L75359.1 1439.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M70291.3 1741.8 L70291.25 1936 L73272.75 2581.3828149544456 L73272.8 2581.4 " fill="none"></path>
 					</g>
-					<path d="M8043.7 2734.7 L8174 3314 L12912 3497.861215147732 L12912.0 3497.9 " fill="none"></path>
+					<path d="M70296.6 1741.8 L70291.3 1741.8 L70285.9 1741.8 L70291.3 1728.5 Z"></path>
+					<path d="M74815.6 2750.0 L74738 3314 L63068.5 3500.0138247863247 L63068.5 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8046.8 2724.4 L8043.7 2734.7 L8036.4 2726.8 L8039.6 2716.5 Z"></path>
+						<path d="M74822.1 2741.5 L74815.6 2750.0 L74811.5 2740.0 L74818.1 2731.5 Z"></path>
 					</g>
-					<path d="M8339.4 2756.7 L8214 3314 L25696 3500.0370888134435 L25696.0 3500.0 " fill="none"></path>
+					<path d="M74832.8 2750.2 L74832.75 3314 L74832.75 3500.5 L74832.75 3500.5 L74832.75 3687 L74832.75 3687 L74832.75 3843.5 L74832.75 3843.5 L74832.75 4000 L74832.75 4000 L63180 4132.572198756182 L63180.0 4132.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8346.6 2748.8 L8339.4 2756.7 L8336.2 2746.4 L8343.5 2738.5 Z"></path>
+						<path d="M74838.1 2740.8 L74832.8 2750.2 L74827.4 2740.8 L74832.8 2731.5 Z"></path>
 					</g>
-					<path d="M8350.6 2757.0 L8273 3314 L8273 3500.5 L8273 3500.5 L8273 3687 L8273 3687 L8273 3843.5 L8273 3843.5 L8273 4000 L8273 4000 L18277.25 4133.042500930405 L18277.3 4133.0 " fill="none"></path>
+					<path d="M74849.9 2750.0 L74927.5 3314 L62792 3498.5910406981484 L62792.0 3498.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8357.2 2748.5 L8350.6 2757.0 L8346.6 2747.0 L8353.2 2738.5 Z"></path>
+						<path d="M74854.0 2740.0 L74849.9 2750.0 L74843.4 2741.5 L74847.4 2731.5 Z"></path>
 					</g>
-					<path d="M8358.3 2757.1 L8313 3314 L11377.75 3495.2656386268136 L11377.8 3495.3 " fill="none"></path>
+					<path d="M74773.1 1785.9 L74832.75 1936 L74832.75 2518.5 L74832.8 2518.5 " fill="none"></path>
+					<path d="M74778.1 1783.9 L74773.1 1785.9 L74768.2 1787.9 L74768.2 1773.5 Z"></path>
+					<path d="M947.9 181.8 L1137 293 L1137 614 L1137.0 614.0 " fill="none"></path>
+					<path d="M950.6 177.2 L947.9 181.8 L945.2 186.4 L936.4 175.0 Z"></path>
+					<path d="M46271.2 4182.9 L46245.75 4268 L46245.75 4462 L46245.75 4462 L46245.75 4656 L46245.75 4656 L48734.75 4690.522172299277 L48734.8 4690.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8364.3 2748.2 L8358.3 2757.1 L8353.7 2747.4 L8359.8 2738.5 Z"></path>
+						<path d="M46278.9 4175.5 L46271.2 4182.9 L46268.7 4172.4 L46276.5 4165.0 Z"></path>
 					</g>
-					<path d="M8365.9 2757.2 L8353 3314 L13098.75 3498.4594122857293 L13098.8 3498.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8371.5 2748.0 L8365.9 2757.2 L8360.8 2747.7 L8366.4 2738.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M4416.5 142.4 L2866.5 293 L2866.5 583.5 L2866.5 583.5 " fill="none"></path>
 					</g>
-					<path d="M8388.0 2757.0 L8468 3314 L8468 3485 L8468.0 3485.0 " fill="none"></path>
+					<path d="M4417.0 147.7 L4416.5 142.4 L4416.0 137.0 L4429.8 141.1 Z"></path>
+					<path d="M53778.4 4219.1 L53684.25 4268 L53684.25 4462 L53684.25 4462 L53684.25 4656 L53684.25 4656 L53684.25 4676 L53684.3 4676.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8391.9 2747.0 L8388.0 2757.0 L8381.4 2748.5 L8385.3 2738.5 Z"></path>
+						<path d="M53789.2 4219.6 L53778.4 4219.1 L53784.3 4210.1 L53795.0 4210.5 Z"></path>
 					</g>
-					<path d="M8751.4 2719.5 L8666 3314 L8666 3485 L8666.0 3485.0 " fill="none"></path>
+					<path d="M54108.6 4146.9 L55671.5 4268 L55671.5 4462 L55671.5 4462 L55671.5 4656 L55671.5 4656 L56269.25 4689.299529227148 L56269.3 4689.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8758.0 2711.0 L8751.4 2719.5 L8747.5 2709.5 L8754.1 2701.0 Z"></path>
+						<path d="M54099.7 4140.8 L54108.6 4146.9 L54098.9 4151.5 L54090.0 4145.4 Z"></path>
 					</g>
-					<path d="M8823.5 2716.7 L9204.5 3314 L10158 3492.184118236473 L10158.0 3492.2 " fill="none"></path>
+					<path d="M17964.3 3887.8 L17964.25 4000 L53795 4133.450640317414 L53795.0 4133.5 " fill="none"></path>
+					<path d="M17969.6 3887.8 L17964.3 3887.8 L17958.9 3887.8 L17964.3 3874.5 Z"></path>
+					<path d="M56275.5 4506.0 L55711.5 4656 L48875.75 4691.137610859729 L48875.8 4691.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8823.0 2706.0 L8823.5 2716.7 L8814.0 2711.7 L8813.5 2701.0 Z"></path>
+						<path d="M56285.9 4508.8 L56275.5 4506.0 L56283.1 4498.5 L56293.5 4501.2 Z"></path>
 					</g>
-					<path d="M8828.6 2716.3 L9244.5 3314 L21428.75 3499.958192679883 L21428.8 3500.0 " fill="none"></path>
+					<path d="M56275.6 4510.6 L55781.25 4656 L56388.25 4688.306596701649 L56388.3 4688.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8827.6 2705.6 L8828.6 2716.3 L8818.8 2711.7 L8817.9 2701.0 Z"></path>
+						<path d="M56286.1 4513.1 L56275.6 4510.6 L56283.0 4502.9 L56293.5 4505.4 Z"></path>
 					</g>
-					<path d="M8833.5 2715.9 L9284.5 3314 L23930.25 3499.625469341987 L23930.3 3499.6 " fill="none"></path>
+					<path d="M56345.7 4622.0 L56325.5 4656 L56316.06338028169 4676 L56316.1 4676.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8832.2 2705.2 L8833.5 2715.9 L8823.7 2711.7 L8822.3 2701.0 Z"></path>
+						<path d="M56355.1 4616.7 L56345.7 4622.0 L56345.9 4611.3 L56355.3 4606.0 Z"></path>
 					</g>
-					<path d="M8840.8 2715.3 L9343.5 3314 L6811 3487.8035878564856 L6811.0 3487.8 " fill="none"></path>
+					<path d="M56457.8 4624.6 L56461 4656 L53710.75 4691.1612046457185 L53710.8 4691.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M8838.9 2704.7 L8840.8 2715.3 L8830.7 2711.6 L8828.8 2701.0 Z"></path>
+						<path d="M56462.1 4614.7 L56457.8 4624.6 L56451.5 4615.8 L56455.8 4606.0 Z"></path>
 					</g>
-					<path d="M9547.0 2719.5 L9383.5 3314 L21428.75 3499.9519586946176 L21428.8 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9554.6 2711.9 L9547.0 2719.5 L9544.3 2709.1 L9552.0 2701.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M54103.3 4145.0 L55896.75 4268 L56293.5 4409.423059255857 L56293.5 4409.4 " fill="none"></path>
 					</g>
-					<path d="M9567.5 2720.1 L9533.25 3314 L6811 3488.6322555679767 L6811.0 3488.6 " fill="none"></path>
+					<path d="M54103.7 4139.7 L54103.3 4145.0 L54102.9 4150.3 L54090.0 4144.1 Z"></path>
+					<path d="M53159.8 3578.8 L53107.25 3687 L53107.25 3843.5 L53107.25 3843.5 L53107.25 4000 L53107.25 4000 L57368.75 4132.292598169814 L57368.8 4132.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9573.4 2711.1 L9567.5 2720.1 L9562.7 2710.5 L9568.6 2701.5 Z"></path>
+						<path d="M53168.6 3572.7 L53159.8 3578.8 L53159.0 3568.1 L53167.9 3562.0 Z"></path>
 					</g>
-					<path d="M9593.6 2719.7 L9722.75 3314 L10162.628016085791 3485 L10162.6 3485.0 " fill="none"></path>
+					<path d="M54992.8 3943.7 L54960.25 4000 L62929 4131.922352287117 L62929.0 4131.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9596.8 2709.5 L9593.6 2719.7 L9586.4 2711.8 L9589.6 2701.5 Z"></path>
+						<path d="M55002.1 3938.2 L54992.8 3943.7 L54992.9 3932.9 L55002.2 3927.5 Z"></path>
 					</g>
-					<path d="M9912.5 2720.2 L9912.5 3314 L10178.398123324398 3485 L10178.4 3485.0 " fill="none"></path>
+					<path d="M55017.9 3945.3 L55000.25 4000 L54090 4115.314110139447 L54090.0 4115.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9917.8 2710.8 L9912.5 2720.2 L9907.2 2710.8 L9912.5 2701.5 Z"></path>
+						<path d="M55025.9 3938.0 L55017.9 3945.3 L55015.7 3934.7 L55023.6 3927.5 Z"></path>
 					</g>
-					<path d="M10361.5 2712.7 L10344 3314 L10214.260053619302 3485 L10214.3 3485.0 " fill="none"></path>
+					<path d="M55083.6 3945.3 L55101.25 4000 L57520.5 4132.819625115231 L57520.5 4132.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10367.1 2703.5 L10361.5 2712.7 L10356.4 2703.2 L10362.0 2694.0 Z"></path>
+						<path d="M55085.8 3934.7 L55083.6 3945.3 L55075.6 3938.0 L55077.9 3927.5 Z"></path>
 					</g>
-					<path d="M10380.8 2712.3 L10496.25 3314 L6811 3491.585201214392 L6811.0 3491.6 " fill="none"></path>
+					<path d="M55108.7 3943.7 L55141.25 4000 L57368.75 4130.77108433735 L57368.8 4130.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10384.2 2702.2 L10380.8 2712.3 L10373.8 2704.2 L10377.2 2694.0 Z"></path>
+						<path d="M55108.6 3932.9 L55108.7 3943.7 L55099.4 3938.2 L55099.3 3927.5 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M53341.0 3514.9 L55050.75 3687 L55050.75 3759.5 L55050.8 3759.5 " fill="none"></path>
 					</g>
-					<path d="M6829.6 3490.1 L7672.1666666666715 3447 L7887.4583333333285 3447 L7887.4583333333285 3447 L8102.75 3500.5 L8102.75 3500.5 L7887.4583333333285 3554 L7887.4583333333285 3554 L7672.1666666666715 3554 L7672.1666666666715 3554 L6811 3509.9607296479207 L6811.0 3510.0 " fill="none"></path>
+					<path d="M53341.6 3509.6 L53341.0 3514.9 L53340.5 3520.2 L53327.8 3513.6 Z"></path>
+					<path d="M2831.3 3450.3 L2843.25 3447 L2850.75 3447 L2850.75 3447 L2858.25 3500.5 L2858.25 3500.5 L2850.75 3554 L2850.75 3554 L2843.25 3554 L2843.25 3554 L2813.25 3545.8527918781724 L2813.3 3545.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M6820.0 3485.2 L6829.6 3490.1 L6820.6 3495.9 L6811.0 3491.0 Z"></path>
+						<path d="M2820.9 3447.6 L2831.3 3450.3 L2823.7 3457.8 L2813.3 3455.1 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3062.1 2639.5 L1056 3314 L6441 3494.30565529623 L6441.0 3494.3 " fill="none"></path>
+						<path d="M4062.7 2645.1 L2646.25 3314 L2646.25 3447 L2646.3 3447.0 " fill="none"></path>
 					</g>
-					<path d="M3063.8 2644.6 L3062.1 2639.5 L3060.4 2634.4 L3074.8 2635.3 Z"></path>
-					<path d="M15730.5 3916.2 L15730.5 4000 L18277.25 4130.315799522673 L18277.3 4130.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15735.8 3906.8 L15730.5 3916.2 L15725.2 3906.8 L15730.5 3897.5 Z"></path>
+					<path d="M4065.0 2649.9 L4062.7 2645.1 L4060.4 2640.3 L4074.8 2639.4 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M4451.5 161.4 L4317.75 293 L4317.75 614 L4317.8 614.0 " fill="none"></path>
+					</g>
+					<path d="M4455.2 165.2 L4451.5 161.4 L4447.8 157.6 L4461.0 152.0 Z"></path>
+					<path d="M4244.3 647.8 L2968.75 966 L2968.75 1197 L2968.8 1197.0 " fill="none"></path>
+					<path d="M4245.6 653.0 L4244.3 647.8 L4243.0 642.6 L4257.3 644.6 Z"></path>
+					<path d="M4256.1 649.0 L3256.25 966 L3256.25 1197 L3256.3 1197.0 " fill="none"></path>
+					<path d="M4257.8 654.1 L4256.1 649.0 L4254.5 643.9 L4268.9 645.0 Z"></path>
+					<path d="M4270.5 650.4 L3556.75 966 L3556.75 1197 L3556.8 1197.0 " fill="none"></path>
+					<path d="M4272.7 655.3 L4270.5 650.4 L4268.3 645.5 L4282.7 645.0 Z"></path>
+					<path d="M4285.6 652.8 L3853.25 966 L3853.25 1197 L3853.3 1197.0 " fill="none"></path>
+					<path d="M4288.7 657.1 L4285.6 652.8 L4282.4 648.5 L4296.4 645.0 Z"></path>
+					<path d="M4304.9 657.1 L4161.25 966 L4161.25 1197 L4161.3 1197.0 " fill="none"></path>
+					<path d="M4309.8 659.3 L4304.9 657.1 L4300.1 654.8 L4310.5 645.0 Z"></path>
+					<path d="M4331.4 656.9 L4485.25 966 L4485.25 1197 L4485.3 1197.0 " fill="none"></path>
+					<path d="M4336.2 654.6 L4331.4 656.9 L4326.6 659.3 L4325.5 645.0 Z"></path>
+					<path d="M4350.3 652.8 L4788.75 966 L4788.75 1197 L4788.8 1197.0 " fill="none"></path>
+					<path d="M4353.4 648.4 L4350.3 652.8 L4347.2 657.1 L4339.4 645.0 Z"></path>
+					<path d="M4365.2 650.4 L5082.25 966 L5082.25 1197 L5082.3 1197.0 " fill="none"></path>
+					<path d="M4367.3 645.5 L4365.2 650.4 L4363.0 655.3 L4353.0 645.0 Z"></path>
+					<path d="M4380.0 649.0 L5393.25 966 L5393.25 1197 L5393.3 1197.0 " fill="none"></path>
+					<path d="M4381.6 643.9 L4380.0 649.0 L4378.4 654.1 L4367.3 645.0 Z"></path>
+					<path d="M4391.2 647.8 L5666.75 966 L5666.75 1197 L5666.8 1197.0 " fill="none"></path>
+					<path d="M4392.5 642.6 L4391.2 647.8 L4389.9 653.0 L4378.3 644.6 Z"></path>
+					<path d="M46575.3 4654.7 L46575.25 4656 L48734.75 4690.37769058296 L48734.8 4690.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M46580.6 4645.3 L46575.3 4654.7 L46569.9 4645.3 L46575.3 4636.0 Z"></path>
+					</g>
+					<path d="M46285.8 4178.3 L46285.75 4268 L46335.75 4301.506044905009 L46335.8 4301.5 " fill="none"></path>
+					<path d="M46291.1 4178.3 L46285.8 4178.3 L46280.4 4178.3 L46285.8 4165.0 Z"></path>
+					<path d="M46575.3 4215.8 L46575.25 4268 L46575.25 4288 L46575.3 4288.0 " fill="none"></path>
+					<path d="M46580.6 4215.8 L46575.3 4215.8 L46569.9 4215.8 L46575.3 4202.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M63054.5 4253.3 L63054.5 4268 L46814.75 4459.1805148899375 L46814.8 4459.2 " fill="none"></path>
 					</g>
-					<path d="M10640.2 2772.3 L10536.25 3314 L25696 3499.966380543634 L25696.0 3500.0 " fill="none"></path>
+					<path d="M63059.8 4253.3 L63054.5 4253.3 L63049.2 4253.3 L63054.5 4240.0 Z"></path>
+					<path d="M6684.7 1853.3 L6583 1936 L6583 2609.5 L6583.0 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10647.2 2764.2 L10640.2 2772.3 L10636.7 2762.2 L10643.7 2754.0 Z"></path>
+						<path d="M6695.3 1851.5 L6684.7 1853.3 L6688.6 1843.3 L6699.2 1841.5 Z"></path>
 					</g>
-					<path d="M10658.9 2772.6 L10623.75 3314 L21539.75 3500.0058474189127 L21539.8 3500.0 " fill="none"></path>
+					<path d="M6893.1 1860.1 L6901 1936 L6901 2609.5 L6901.0 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10664.8 2763.7 L10658.9 2772.6 L10654.2 2763.0 L10660.1 2754.0 Z"></path>
+						<path d="M6897.5 1850.2 L6893.1 1860.1 L6886.9 1851.3 L6891.2 1841.5 Z"></path>
 					</g>
-					<path d="M10667.5 2772.7 L10663.75 3314 L24426 3498.568782022472 L24426.0 3498.6 " fill="none"></path>
+					<path d="M7042.7 1854.3 L7129.5 1936 L7129.5 2625 L7129.5 2625 L7129.5 3314 L7129.5 3314 L40503 3500.301827351911 L40503.0 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10672.9 2763.4 L10667.5 2772.7 L10662.2 2763.3 L10667.6 2754.0 Z"></path>
+						<path d="M7039.6 1844.0 L7042.7 1854.3 L7032.3 1851.8 L7029.2 1841.5 Z"></path>
 					</g>
-					<path d="M10676.1 2772.6 L10703.75 3314 L13098.75 3496.49948927477 L13098.8 3496.5 " fill="none"></path>
+					<path d="M7134.2 1770.2 L7722 1936 L52960.75 2620.3558125620943 L52960.8 2620.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10680.9 2763.0 L10676.1 2772.6 L10670.3 2763.6 L10675.1 2754.0 Z"></path>
+						<path d="M7126.7 1762.6 L7134.2 1770.2 L7123.8 1772.8 L7116.3 1765.2 Z"></path>
 					</g>
-					<path d="M10695.8 2772.4 L10796 3314 L10247 3486.5164279696714 L10247.0 3486.5 " fill="none"></path>
+					<path d="M3280.9 3401.2 L3294.25 3394.5 L3301.75 3394.5 L3301.75 3394.5 L3309.25 3500.5 L3309.25 3500.5 L3301.75 3606.5 L3301.75 3606.5 L3294.25 3606.5 L3294.25 3606.5 L3264.25 3591.393111638955 L3264.3 3591.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10699.3 2762.2 L10695.8 2772.4 L10688.8 2764.1 L10692.4 2754.0 Z"></path>
+						<path d="M3270.2 3400.6 L3280.9 3401.2 L3275.0 3410.2 L3264.3 3409.6 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M4071.2 2648.0 L3083.75 3314 L3083.75 3394.5 L3083.8 3394.5 " fill="none"></path>
 					</g>
-					<path d="M24731.4 3437.0 L24744 3432 L24751.5 3432 L24751.5 3432 L24759 3500.5 L24759 3500.5 L24751.5 3569 L24751.5 3569 L24744 3569 L24744 3569 L24714 3557.189655172414 L24714.0 3557.2 " fill="none"></path>
+					<path d="M4074.2 2652.4 L4071.2 2648.0 L4068.2 2643.5 L4082.3 2640.5 Z"></path>
+					<path d="M7390.3 2741.8 L7269.5 3314 L63007.5 3500.398002456584 L63007.5 3500.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24720.7 3435.4 L24731.4 3437.0 L24724.6 3445.4 L24714.0 3443.8 Z"></path>
+						<path d="M7397.5 2733.7 L7390.3 2741.8 L7387.1 2731.5 L7394.2 2723.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3062.1 2639.8 L1096 3314 L24426 3499.355925705035 L24426.0 3499.4 " fill="none"></path>
+					<path d="M7403.9 2742.1 L7349.75 3314 L7349.75 3485 L7349.8 3485.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M7410.1 2733.3 L7403.9 2742.1 L7399.5 2732.3 L7405.7 2723.5 Z"></path>
 					</g>
-					<path d="M3063.9 2644.8 L3062.1 2639.8 L3060.4 2634.7 L3074.8 2635.5 Z"></path>
-					<path d="M10934.8 2779.9 L10836 3314 L21428.75 3499.877061134241 L21428.8 3499.9 " fill="none"></path>
+					<path d="M7446.4 2741.5 L7600.75 3314 L7600.75 3485 L7600.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10941.8 2771.6 L10934.8 2779.9 L10931.3 2769.7 L10938.2 2761.5 Z"></path>
+						<path d="M7449.1 2731.1 L7446.4 2741.5 L7438.8 2733.9 L7441.6 2723.5 Z"></path>
 					</g>
-					<path d="M10960.4 2780.2 L10949.75 3314 L21539.75 3499.990677088238 L21539.8 3500.0 " fill="none"></path>
+					<path d="M7826.5 2697.7 L7826.5 3314 L40503 3500.297604854488 L40503.0 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10965.9 2770.9 L10960.4 2780.2 L10955.3 2770.7 L10960.8 2761.5 Z"></path>
+						<path d="M7831.8 2688.3 L7826.5 2697.7 L7821.2 2688.3 L7826.5 2679.0 Z"></path>
 					</g>
-					<path d="M10989.1 2779.9 L11077.25 3314 L13098.75 3495.779050144648 L13098.8 3495.8 " fill="none"></path>
+					<path d="M26919.0 3923.2 L26919 4000 L41393.5 4133.336747671261 L41393.5 4133.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10992.8 2769.8 L10989.1 2779.9 L10982.3 2771.6 L10986.0 2761.5 Z"></path>
+						<path d="M26924.3 3913.8 L26919.0 3923.2 L26913.7 3913.8 L26919.0 3904.5 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M4106.1 2653.8 L4126 3314 L4476.954423592493 3462 L4477.0 3462.0 " fill="none"></path>
 					</g>
-					<path d="M11231.0 2704.7 L11231 3314 L32617.5 3500.025943286227 L32617.5 3500.0 " fill="none"></path>
+					<path d="M4111.4 2653.7 L4106.1 2653.8 L4100.8 2654.0 L4105.7 2640.5 Z"></path>
+					<path d="M53176.4 2831.1 L52962.25 3314 L62541 3498.088092845918 L62541.0 3498.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11236.3 2695.3 L11231.0 2704.7 L11225.7 2695.3 L11231.0 2686.0 Z"></path>
+						<path d="M53185.0 2824.7 L53176.4 2831.1 L53175.3 2820.4 L53183.9 2814.0 Z"></path>
 					</g>
-					<path d="M11503.9 2734.4 L11397.5 3314 L21428.75 3499.8423150470608 L21428.8 3499.8 " fill="none"></path>
+					<path d="M53188.2 2831.4 L53002.25 3314 L53002.25 3500.5 L53002.25 3500.5 L53002.25 3687 L53002.25 3687 L53002.25 3843.5 L53002.25 3843.5 L53002.25 4000 L53002.25 4000 L53795 4112.978994948152 L53795.0 4113.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11510.9 2726.1 L11503.9 2734.4 L11500.4 2724.2 L11507.3 2716.0 Z"></path>
+						<path d="M53196.5 2824.6 L53188.2 2831.4 L53186.6 2820.8 L53194.9 2814.0 Z"></path>
 					</g>
-					<path d="M11520.8 2734.7 L11503.75 3314 L5233 3496.2281757625337 L5233.0 3496.2 " fill="none"></path>
+					<path d="M53246.7 2832.6 L53197.75 3314 L53197.75 3439 L53197.8 3439.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11526.4 2725.5 L11520.8 2734.7 L11515.7 2725.2 L11521.3 2716.0 Z"></path>
+						<path d="M53252.9 2823.8 L53246.7 2832.6 L53242.3 2822.7 L53248.5 2814.0 Z"></path>
 					</g>
-					<path d="M11527.1 2734.7 L11543.75 3314 L13098.75 3494.4090202177294 L13098.8 3494.4 " fill="none"></path>
+					<path d="M53309.0 2832.3 L53405 3314 L57029 3498.1623978201633 L57029.0 3498.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11532.2 2725.2 L11527.1 2734.7 L11521.5 2725.5 L11526.6 2716.0 Z"></path>
+						<path d="M53312.5 2822.1 L53309.0 2832.3 L53302.0 2824.2 L53305.4 2814.0 Z"></path>
 					</g>
-					<path d="M11544.0 2734.4 L11650.25 3314 L11481.542225201072 3485 L11481.5 3485.0 " fill="none"></path>
+					<path d="M53321.0 2832.1 L53445 3314 L48012.25 3497.6269992297584 L48012.3 3497.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11547.6 2724.2 L11544.0 2734.4 L11537.1 2726.1 L11540.7 2716.0 Z"></path>
+						<path d="M53323.9 2821.7 L53321.0 2832.1 L53313.5 2824.4 L53316.4 2814.0 Z"></path>
 					</g>
-					<path d="M5250.6 3443.8 L5263 3439.5 L5270.5 3439.5 L5270.5 3439.5 L5278 3500.5 L5278 3500.5 L5270.5 3561.5 L5270.5 3561.5 L5263 3561.5 L5263 3561.5 L5233 3551.1610169491523 L5233.0 3551.2 " fill="none"></path>
+					<path d="M53333.0 2831.8 L53485 3314 L52030.5 3485.3067571834545 L52030.5 3485.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M5240.1 3441.8 L5250.6 3443.8 L5243.6 3451.8 L5233.0 3449.8 Z"></path>
+						<path d="M53335.2 2821.3 L53333.0 2831.8 L53325.1 2824.5 L53327.3 2814.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3096.2 2653.2 L2883.25 3314 L4939 3488.0539666326185 L4939.0 3488.1 " fill="none"></path>
+						<path d="M75560.8 180.7 L75546.5 293 L75546.5 629.5 L75546.5 629.5 L75546.5 966 L75546.5 966 L75546.5 1212.5 L75546.5 1212.5 L75546.5 1459 L75546.5 1459 L75546.5 1697.5 L75546.5 1697.5 L75546.5 1936 L75546.5 1936 L53574.75 2615.5056163384393 L53574.8 2615.5 " fill="none"></path>
 					</g>
-					<path d="M3101.2 2654.8 L3096.2 2653.2 L3091.1 2651.6 L3100.3 2640.5 Z"></path>
-					<path d="M27178.1 175.9 L26468 293 L26468 614 L26468.0 614.0 " fill="none"></path>
+					<path d="M75566.1 181.4 L75560.8 180.7 L75555.6 180.0 L75562.5 167.5 Z"></path>
+					<path d="M8127.0 2674.7 L8127 3314 L4716.25 3492.7439058658238 L4716.3 3492.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27188.2 179.6 L27178.1 175.9 L27186.4 169.1 L27196.5 172.9 Z"></path>
+						<path d="M8132.3 2665.3 L8127.0 2674.7 L8121.7 2665.3 L8127.0 2656.0 Z"></path>
 					</g>
-					<path d="M27417.0 208.7 L27417 293 L27417 614 L27417.0 614.0 " fill="none"></path>
+					<path d="M57205.7 2898.1 L56989 3314 L56989 3500.5 L56989 3500.5 L56989 3687 L56989 3687 L56989 3843.5 L56989 3843.5 L56989 4000 L56989 4000 L54090 4127.512227145905 L54090.0 4127.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27422.3 199.3 L27417.0 208.7 L27411.7 199.3 L27417.0 190.0 Z"></path>
+						<path d="M57214.8 2892.2 L57205.7 2898.1 L57205.3 2887.3 L57214.4 2881.5 Z"></path>
 					</g>
-					<path d="M62263.5 1761.7 L62015.25 1936 L44706.5 2619.1390253333143 L44706.5 2619.1 " fill="none"></path>
+					<path d="M57222.6 2898.5 L57032 3314 L37924.5 3498.5920098420097 L37924.5 3498.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62274.2 1760.7 L62263.5 1761.7 L62268.1 1752.0 L62278.8 1751.0 Z"></path>
+						<path d="M57231.3 2892.2 L57222.6 2898.5 L57221.6 2887.8 L57230.4 2881.5 Z"></path>
 					</g>
-					<path d="M12149.5 2771.4 L11985.25 3314 L11753.276809651474 3485 L11753.3 3485.0 " fill="none"></path>
+					<path d="M57238.3 2898.8 L57072 3314 L57074.75067024129 3485 L57074.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12157.3 2764.0 L12149.5 2771.4 L12147.1 2760.9 L12154.9 2753.5 Z"></path>
+						<path d="M57246.7 2892.1 L57238.3 2898.8 L57236.8 2888.2 L57245.3 2881.5 Z"></path>
 					</g>
-					<path d="M12170.3 2771.9 L12084 3314 L21539.75 3499.9297688394527 L21539.8 3499.9 " fill="none"></path>
+					<path d="M57526.9 2897.1 L57801 3314 L50783.5 3499.0104255018377 L50783.5 3499.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12177.1 2763.6 L12170.3 2771.9 L12166.5 2761.9 L12173.3 2753.5 Z"></path>
+						<path d="M57526.2 2886.4 L57526.9 2897.1 L57517.3 2892.2 L57516.6 2881.5 Z"></path>
 					</g>
-					<path d="M12191.4 2772.2 L12182.75 3314 L11950.776809651474 3485 L11950.8 3485.0 " fill="none"></path>
+					<path d="M57542.4 2896.7 L57841 3314 L59116.5 3493.1270707831327 L59116.5 3493.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12196.9 2762.9 L12191.4 2772.2 L12186.2 2762.7 L12191.7 2753.5 Z"></path>
+						<path d="M57541.3 2886.0 L57542.4 2896.7 L57532.6 2892.2 L57531.5 2881.5 Z"></path>
 					</g>
-					<path d="M12214.8 2772.0 L12292.5 3314 L13098.75 3489.098253275109 L13098.8 3489.1 " fill="none"></path>
+					<path d="M57610.5 2894.9 L58018.25 3314 L14091.5 3499.7494204073305 L14091.5 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12218.8 2762.0 L12214.8 2772.0 L12208.2 2763.5 L12212.2 2753.5 Z"></path>
+						<path d="M57607.9 2884.5 L57610.5 2894.9 L57600.2 2891.9 L57597.5 2881.5 Z"></path>
 					</g>
-					<path d="M12238.0 2771.4 L12402.25 3314 L12170.276809651474 3485 L12170.3 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12240.4 2760.9 L12238.0 2771.4 L12230.2 2764.0 L12232.6 2753.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M61929.4 140.1 L57348 293 L57348 629.5 L57348 629.5 L57348 966 L57348 966 L57348 1212.5 L57348 1212.5 L57348 1459 L57348 1459 L57348 1697.5 L57348 1697.5 L57348 1936 L57348 1936 L57348 2368.5 L57348.0 2368.5 " fill="none"></path>
 					</g>
-					<path d="M62174.3 2674.7 L62174.25 3314 L48870 3498.722784715889 L48870.0 3498.7 " fill="none"></path>
+					<path d="M61929.6 145.4 L61929.4 140.1 L61929.2 134.7 L61942.8 139.6 Z"></path>
+					<path d="M14108.8 3422.1 L14121.5 3417 L14129 3417 L14129 3417 L14136.5 3500.5 L14136.5 3500.5 L14129 3584 L14129 3584 L14121.5 3584 L14121.5 3584 L14091.5 3571.9277108433735 L14091.5 3571.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62179.6 2665.3 L62174.3 2674.7 L62168.9 2665.3 L62174.3 2656.0 Z"></path>
+						<path d="M14098.2 3420.6 L14108.8 3422.1 L14102.1 3430.5 L14091.5 3429.1 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M4107.8 2653.8 L4166 3314 L13736.5 3497.104046983997 L13736.5 3497.1 " fill="none"></path>
 					</g>
-					<path d="M62306.4 1761.6 L62174.25 1936 L62174.25 2594 L62174.3 2594.0 " fill="none"></path>
-					<path d="M62310.7 1764.8 L62306.4 1761.6 L62302.2 1758.4 L62314.5 1751.0 Z"></path>
-					<path d="M12861.0 2749.3 L12748.5 3314 L21428.75 3499.7403694461177 L21428.8 3499.7 " fill="none"></path>
+					<path d="M4113.1 2653.3 L4107.8 2653.8 L4102.5 2654.3 L4106.6 2640.5 Z"></path>
+					<path d="M8360.0 2690.2 L8360 3314 L13736.5 3494.539656103709 L13736.5 3494.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12868.0 2741.2 L12861.0 2749.3 L12857.6 2739.1 L12864.6 2731.0 Z"></path>
+						<path d="M8365.3 2680.8 L8360.0 2690.2 L8354.7 2680.8 L8360.0 2671.5 Z"></path>
 					</g>
-					<path d="M12885.7 2749.7 L12885.5 3314 L13129.163538873994 3485 L13129.2 3485.0 " fill="none"></path>
+					<path d="M8686.6 1735.5 L8360 1936 L8360 2578.5 L8360.0 2578.5 " fill="none"></path>
+					<path d="M8689.4 1740.0 L8686.6 1735.5 L8683.8 1730.9 L8698.0 1728.5 Z"></path>
+					<path d="M8607.5 2690.2 L8607.5 3314 L13736.5 3494.2616602280223 L13736.5 3494.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12891.0 2740.3 L12885.7 2749.7 L12880.4 2740.3 L12885.7 2731.0 Z"></path>
+						<path d="M8612.8 2680.8 L8607.5 2690.2 L8602.2 2680.8 L8607.5 2671.5 Z"></path>
 					</g>
-					<path d="M12910.5 2749.3 L13022.75 3314 L19573.75 3497.4063649328227 L19573.8 3497.4 " fill="none"></path>
+					<path d="M8723.4 1740.0 L8607.5 1936 L8607.5 2578.5 L8607.5 2578.5 " fill="none"></path>
+					<path d="M8728.0 1742.7 L8723.4 1740.0 L8718.8 1737.3 L8730.2 1728.5 Z"></path>
+					<path d="M8854.5 2690.2 L8854.5 3314 L13736.5 3493.957110386402 L13736.5 3494.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12913.9 2739.1 L12910.5 2749.3 L12903.4 2741.2 L12906.8 2731.0 Z"></path>
+						<path d="M8859.8 2680.8 L8854.5 2690.2 L8849.2 2680.8 L8854.5 2671.5 Z"></path>
 					</g>
-					<path d="M62535.8 2674.7 L62535.75 3314 L28264.25 3500.0494185623425 L28264.3 3500.0 " fill="none"></path>
+					<path d="M8767.7 1740.7 L8854.5 1936 L8854.5 2578.5 L8854.5 2578.5 " fill="none"></path>
+					<path d="M8772.6 1738.5 L8767.7 1740.7 L8762.8 1742.9 L8762.3 1728.5 Z"></path>
+					<path d="M9476.5 2697.2 L9476.5 3314 L50670.5 3500.244554611459 L50670.5 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M62541.1 2665.3 L62535.8 2674.7 L62530.4 2665.3 L62535.8 2656.0 Z"></path>
+						<path d="M9481.8 2687.8 L9476.5 2697.2 L9471.2 2687.8 L9476.5 2678.5 Z"></path>
 					</g>
-					<path d="M62403.6 1761.6 L62535.75 1936 L62535.75 2594 L62535.8 2594.0 " fill="none"></path>
-					<path d="M62407.8 1758.4 L62403.6 1761.6 L62399.3 1764.8 L62395.5 1751.0 Z"></path>
-					<path d="M13767.1 2727.4 L13675.75 3314 L25696 3499.82751010258 L25696.0 3499.8 " fill="none"></path>
+					<path d="M9893.6 2703.9 L9716.5 3314 L9716.5 3485 L9716.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13773.8 2719.0 L13767.1 2727.4 L13763.2 2717.4 L13769.9 2709.0 Z"></path>
+						<path d="M9901.3 2696.5 L9893.6 2703.9 L9891.1 2693.5 L9898.8 2686.0 Z"></path>
 					</g>
-					<path d="M13799.0 2727.4 L13890.5 3314 L21428.75 3499.6258293447763 L21428.8 3499.6 " fill="none"></path>
+					<path d="M9937.7 2704.0 L10101 3314 L50670.5 3500.240627923005 L50670.5 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13802.8 2717.4 L13799.0 2727.4 L13792.3 2719.0 L13796.1 2709.0 Z"></path>
+						<path d="M9940.4 2693.6 L9937.7 2704.0 L9930.1 2696.4 L9932.8 2686.0 Z"></path>
 					</g>
-					<path d="M28000.5 717.2 L28000.5 966 L28000.5 1197 L28000.5 1197.0 " fill="none"></path>
+					<path d="M10304.3 2704.0 L10141 3314 L40503 3500.2821942593964 L40503.0 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28005.8 707.8 L28000.5 717.2 L27995.2 707.8 L28000.5 698.5 Z"></path>
+						<path d="M10311.9 2696.4 L10304.3 2704.0 L10301.6 2693.6 L10309.2 2686.0 Z"></path>
 					</g>
-					<path d="M28000.5 165.3 L28000.5 293 L28000.5 560.5 L28000.5 560.5 " fill="none"></path>
-					<path d="M28005.8 165.3 L28000.5 165.3 L27995.2 165.3 L28000.5 152.0 Z"></path>
-					<path d="M16003.2 3938.7 L15927.5 4000 L18277.25 4130.016104056984 L18277.3 4130.0 " fill="none"></path>
+					<path d="M10311.7 2704.4 L10205.75 3314 L13736.5 3491.5729454594484 L13736.5 3491.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16013.9 3937.0 L16003.2 3938.7 L16007.1 3928.7 L16017.8 3927.0 Z"></path>
+						<path d="M10318.6 2696.1 L10311.7 2704.4 L10308.0 2694.3 L10314.9 2686.0 Z"></path>
 					</g>
-					<path d="M16026.0 3940.3 L15967.5 4000 L6118.75 4132.042572350484 L6118.8 4132.0 " fill="none"></path>
+					<path d="M10333.0 2704.6 L10390.25 3314 L39971 3500.169585684999 L39971.0 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16036.4 3937.4 L16026.0 3940.3 L16028.8 3929.9 L16039.1 3927.0 Z"></path>
+						<path d="M10337.4 2694.8 L10333.0 2704.6 L10326.8 2695.8 L10331.2 2686.0 Z"></path>
 					</g>
-					<path d="M16141.3 3945.3 L16152.25 4000 L6445.75 4132.047817258884 L6445.8 4132.0 " fill="none"></path>
+					<path d="M9137.0 2705.2 L9137 3314 L13736.5 3493.5701800293073 L13736.5 3493.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16144.7 3935.1 L16141.3 3945.3 L16134.3 3937.2 L16137.7 3927.0 Z"></path>
+						<path d="M9142.3 2695.8 L9137.0 2705.2 L9131.7 2695.8 L9137.0 2686.5 Z"></path>
 					</g>
-					<path d="M16166.7 3944.0 L16192.25 4000 L14241 4125.208906979528 L14241.0 4125.2 " fill="none"></path>
+					<path d="M8810.4 1735.5 L9137 1936 L9137 2563.5 L9137.0 2563.5 " fill="none"></path>
+					<path d="M8813.2 1730.9 L8810.4 1735.5 L8807.6 1740.0 L8799.0 1728.5 Z"></path>
+					<path d="M1560.2 230.1 L1358 293 L1358 614 L1358.0 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16167.7 3933.3 L16166.7 3944.0 L16158.0 3937.7 L16159.0 3927.0 Z"></path>
+						<path d="M1570.7 232.4 L1560.2 230.1 L1567.5 222.2 L1578.0 224.6 Z"></path>
 					</g>
-					<path d="M16256.2 3937.7 L16345.75 4000 L14461 4127.892897835169 L14461.0 4127.9 " fill="none"></path>
+					<path d="M1765.4 241.8 L1719 293 L1719 614 L1719.0 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16251.6 3928.0 L16256.2 3937.7 L16245.5 3936.7 L16240.9 3927.0 Z"></path>
+						<path d="M1775.7 238.5 L1765.4 241.8 L1767.8 231.3 L1778.0 228.0 Z"></path>
 					</g>
-					<path d="M36524.0 165.3 L36524 293 L36524 614 L36524.0 614.0 " fill="none"></path>
-					<path d="M36529.3 165.3 L36524.0 165.3 L36518.7 165.3 L36524.0 152.0 Z"></path>
-					<path d="M14038.0 2712.7 L14038 3314 L10247 3498.3362012775387 L10247.0 3498.3 " fill="none"></path>
+					<path d="M2013.0 238.4 L2094.5 293 L2094.5 614 L2094.5 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14043.3 2703.3 L14038.0 2712.7 L14032.7 2703.3 L14038.0 2694.0 Z"></path>
+						<path d="M2008.2 228.8 L2013.0 238.4 L2002.3 237.6 L1997.5 228.0 Z"></path>
 					</g>
-					<path d="M36920.5 165.3 L36920.5 293 L36920.5 614 L36920.5 614.0 " fill="none"></path>
-					<path d="M36925.8 165.3 L36920.5 165.3 L36915.2 165.3 L36920.5 152.0 Z"></path>
-					<path d="M9187.0 3450.3 L9199 3447 L9206.5 3447 L9206.5 3447 L9214 3500.5 L9214 3500.5 L9206.5 3554 L9206.5 3554 L9199 3554 L9199 3554 L9169 3545.769230769231 L9169.0 3545.8 " fill="none"></path>
+					<path d="M2161.8 230.1 L2364 293 L2364 614 L2364.0 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9176.6 3447.6 L9187.0 3450.3 L9179.4 3457.9 L9169.0 3455.2 Z"></path>
+						<path d="M2154.5 222.2 L2161.8 230.1 L2151.3 232.4 L2144.0 224.6 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3097.8 2653.4 L2923.25 3314 L8839 3495.439357809481 L8839.0 3495.4 " fill="none"></path>
+					<path d="M53558.7 1702.5 L49093.75 1936 L49093.75 2571.5 L49093.8 2571.5 " fill="none"></path>
+					<path d="M53559.0 1707.8 L53558.7 1702.5 L53558.4 1697.2 L53572.0 1701.8 Z"></path>
+					<path d="M68383.2 1258.9 L66865 1459 L66865 1697.5 L66865 1697.5 L66865 1936 L66865 1936 L66865 2625 L66865 2625 L66865 3314 L66865 3314 L63068.5 3499.0136529918996 L63068.5 3499.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M68393.2 1263.0 L68383.2 1258.9 L68391.8 1252.4 L68401.8 1256.5 Z"></path>
 					</g>
-					<path d="M3102.9 2654.8 L3097.8 2653.4 L3092.6 2652.0 L3101.2 2640.5 Z"></path>
-					<path d="M14331.0 2697.7 L14331 3314 L11554.75 3494.7385024871282 L11554.8 3494.7 " fill="none"></path>
+					<path d="M68385.0 1384.0 L68231.75 1459 L70158.75 1682.1558630735615 L70158.8 1682.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14336.3 2688.3 L14331.0 2697.7 L14325.7 2688.3 L14331.0 2679.0 Z"></path>
+						<path d="M68395.7 1384.7 L68385.0 1384.0 L68391.0 1375.1 L68401.8 1375.8 Z"></path>
 					</g>
-					<path d="M29232.9 1213.9 L13364.5 1459 L13364.5 1651 L13364.5 1651.0 " fill="none"></path>
-					<path d="M29233.0 1219.2 L29232.9 1213.9 L29232.8 1208.5 L29246.3 1213.7 Z"></path>
-					<path d="M16534.0 3908.7 L16534 4000 L18277.25 4128.685029610247 L18277.3 4128.7 " fill="none"></path>
+					<path d="M69087.0 1290.1 L69852 1459 L69852 1697.5 L69852 1697.5 L69852 1936 L69852 1936 L69852 2625 L69852 2625 L69852 3314 L69852 3314 L50783.5 3499.9490326797386 L50783.5 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16539.3 3899.3 L16534.0 3908.7 L16528.7 3899.3 L16534.0 3890.0 Z"></path>
+						<path d="M69079.0 1282.9 L69087.0 1290.1 L69076.7 1293.3 L69068.8 1286.1 Z"></path>
 					</g>
-					<path d="M14698.6 2742.1 L14550 3314 L13048 3492.4222929936304 L13048.0 3492.4 " fill="none"></path>
+					<path d="M69087.0 1287.5 L69892 1459 L69892 1697.5 L69892 1697.5 L69892 1936 L69892 1936 L69892 2625 L69892 2625 L69892 3314 L69892 3314 L59221.5 3499.586892660636 L59221.5 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14706.1 2734.4 L14698.6 2742.1 L14695.8 2731.7 L14703.3 2724.0 Z"></path>
+						<path d="M69079.0 1280.3 L69087.0 1287.5 L69076.8 1290.7 L69068.8 1283.6 Z"></path>
 					</g>
-					<path d="M14830.3 2737.9 L15347 3314 L21428.75 3499.4176917732643 L21428.8 3499.4 " fill="none"></path>
+					<path d="M67703.4 653.8 L61936.5 966 L68401.75 1200.4084022798309 L68401.8 1200.4 " fill="none"></path>
+					<path d="M67703.7 659.1 L67703.4 653.8 L67703.1 648.5 L67716.8 653.1 Z"></path>
+					<path d="M72463.0 702.2 L72463 966 L69068.75 1190.4470860438603 L69068.8 1190.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14828.0 2727.4 L14830.3 2737.9 L14820.1 2734.5 L14817.8 2724.0 Z"></path>
+						<path d="M72468.3 692.8 L72463.0 702.2 L72457.7 692.8 L72463.0 683.5 Z"></path>
 					</g>
-					<path d="M14857.6 2736.2 L15526 3314 L13203.75 3496.3769344141488 L13203.8 3496.4 " fill="none"></path>
+					<path d="M73239.4 155.8 L72463 293 L72463 575.5 L72463.0 575.5 " fill="none"></path>
+					<path d="M73240.3 161.0 L73239.4 155.8 L73238.4 150.5 L73252.5 153.5 Z"></path>
+					<path d="M66734.3 1319.6 L66642.25 1459 L70158.75 1688.8397506166073 L70158.8 1688.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14854.1 2726.1 L14857.6 2736.2 L14847.1 2734.1 L14843.5 2724.0 Z"></path>
+						<path d="M66743.9 1314.7 L66734.3 1319.6 L66735.0 1308.9 L66744.6 1304.0 Z"></path>
 					</g>
-					<path d="M27476.2 3435.4 L27488.25 3432 L27495.75 3432 L27495.75 3432 L27503.25 3500.5 L27503.25 3500.5 L27495.75 3569 L27495.75 3569 L27488.25 3569 L27488.25 3569 L27458.25 3560.543209876543 L27458.3 3560.5 " fill="none"></path>
+					<path d="M66813.9 1322.6 L66825 1459 L66825 1697.5 L66825 1697.5 L66825 1936 L66825 1936 L66825 2625 L66825 2625 L66825 3314 L66825 3314 L48012.25 3499.661143522377 L48012.3 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27465.8 3432.8 L27476.2 3435.4 L27468.7 3443.1 L27458.3 3440.5 Z"></path>
+						<path d="M66818.5 1312.9 L66813.9 1322.6 L66807.9 1313.7 L66812.4 1304.0 Z"></path>
 					</g>
+					<path d="M8005.5 668.0 L5789 966 L66479.5 1211.1850047528517 L66479.5 1211.2 " fill="none"></path>
+					<path d="M8006.2 673.3 L8005.5 668.0 L8004.8 662.7 L8018.8 666.2 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3099.4 2653.6 L2963.25 3314 L27032.25 3498.8640350877195 L27032.3 3498.9 " fill="none"></path>
+						<path d="M75583.2 179.9 L75626.5 293 L75626.5 629.5 L75626.5 629.5 L75626.5 966 L75626.5 966 L67130.5 1203.4045230402992 L67130.5 1203.4 " fill="none"></path>
 					</g>
-					<path d="M3104.6 2654.6 L3099.4 2653.6 L3094.1 2652.5 L3102.1 2640.5 Z"></path>
-					<path d="M15697.2 2749.2 L15566 3314 L15566 3500.5 L15566 3500.5 L15566 3687 L15566 3687 L15566 3843.5 L15566 3843.5 L15566 4000 L15566 4000 L18277.25 4130.53354890865 L18277.3 4130.5 " fill="none"></path>
+					<path d="M75588.1 178.0 L75583.2 179.9 L75578.2 181.9 L75578.4 167.5 Z"></path>
+					<path d="M53558.9 1716.1 L52434.75 1936 L52434.75 2586.5 L52434.8 2586.5 " fill="none"></path>
+					<path d="M53559.9 1721.3 L53558.9 1716.1 L53557.9 1710.9 L53572.0 1713.5 Z"></path>
+					<path d="M8005.5 670.0 L5911.25 966 L5911.25 1181.5 L5911.3 1181.5 " fill="none"></path>
+					<path d="M8006.3 675.2 L8005.5 670.0 L8004.8 664.7 L8018.8 668.1 Z"></path>
+					<path d="M3921.1 3450.9 L3933.25 3447 L3940.75 3447 L3940.75 3447 L3948.25 3500.5 L3948.25 3500.5 L3940.75 3554 L3940.75 3554 L3933.25 3554 L3933.25 3554 L3903.25 3544.5309734513276 L3903.3 3544.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15704.5 2741.3 L15697.2 2749.2 L15694.1 2738.9 L15701.4 2731.0 Z"></path>
+						<path d="M3910.5 3448.6 L3921.1 3450.9 L3913.8 3458.7 L3903.3 3456.5 Z"></path>
 					</g>
-					<path d="M15853.9 2685.5 L17183 3314 L21539.75 3499.266801573277 L21539.8 3499.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15847.7 2676.7 L15853.9 2685.5 L15843.2 2686.3 L15837.0 2677.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M4109.4 2653.7 L4206 3314 L3890.6152815013406 3447 L3890.6 3447.0 " fill="none"></path>
 					</g>
-					<path d="M15854.0 2683.9 L17223 3314 L10247 3499.317854853643 L10247.0 3499.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15847.7 2675.1 L15854.0 2683.9 L15843.2 2684.8 L15837.0 2676.1 Z"></path>
+					<path d="M4114.7 2652.9 L4109.4 2653.7 L4104.2 2654.5 L4107.5 2640.5 Z"></path>
+					<path d="M67703.4 654.3 L62056.5 966 L62056.5 1212.5 L62056.5 1212.5 L62056.5 1459 L62056.5 1459 L62056.5 1666.5 L62056.5 1666.5 " fill="none"></path>
+					<path d="M67703.7 659.6 L67703.4 654.3 L67703.1 649.0 L67716.8 653.6 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M4536.9 146.3 L5437.25 293 L5437.25 614 L5437.3 614.0 " fill="none"></path>
 					</g>
-					<path d="M15854.2 2679.0 L17363 3314 L25696 3499.531486897869 L25696.0 3499.5 " fill="none"></path>
+					<path d="M4537.8 141.0 L4536.9 146.3 L4536.1 151.6 L4523.8 144.2 Z"></path>
+					<path d="M64173.8 3998.7 L64173.75 4000 L62889 4129.077038425492 L62889.0 4129.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M15847.7 2670.4 L15854.2 2679.0 L15843.5 2680.3 L15837.0 2671.7 Z"></path>
+						<path d="M64179.1 3989.3 L64173.8 3998.7 L64168.4 3989.3 L64173.8 3980.0 Z"></path>
 					</g>
-					<path d="M21716.1 2711.9 L21623.25 3314 L24211.25 3494.738438494664 L24211.3 3494.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21722.8 2703.5 L21716.1 2711.9 L21712.2 2701.9 L21718.9 2693.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M4537.0 144.1 L5718.25 293 L5718.25 614 L5718.3 614.0 " fill="none"></path>
 					</g>
-					<path d="M21738.6 2712.1 L21801.25 3314 L21492.258042895442 3485 L21492.3 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21742.9 2702.2 L21738.6 2712.1 L21732.3 2703.3 L21736.6 2693.5 Z"></path>
+					<path d="M4537.6 138.8 L4537.0 144.1 L4536.3 149.4 L4523.8 142.4 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M4537.0 142.9 L5943.75 293 L5943.75 598.5 L5943.8 598.5 " fill="none"></path>
 					</g>
-					<path d="M19853.4 1762.6 L18888.25 1936 L18888.25 2625 L18888.25 2625 L18888.25 3314 L18888.25 3314 L25512 3498.494548780943 L25512.0 3498.5 " fill="none"></path>
+					<path d="M4537.6 137.6 L4537.0 142.9 L4536.4 148.2 L4523.8 141.5 Z"></path>
+					<path d="M61974.2 177.9 L61801.5 293 L61801.5 629.5 L61801.5 629.5 L61801.5 966 L61801.5 966 L61801.5 1212.5 L61801.5 1212.5 L61801.5 1459 L61801.5 1459 L61801.5 1697.5 L61801.5 1697.5 L61801.5 1936 L61801.5 1936 L61801.5 2625 L61801.5 2625 L61801.5 3314 L61801.5 3314 L59221.5 3496.780626780627 L59221.5 3496.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19863.5 1766.2 L19853.4 1762.6 L19861.6 1755.7 L19871.8 1759.3 Z"></path>
+						<path d="M61984.9 177.1 L61974.2 177.9 L61979.0 168.2 L61989.8 167.5 Z"></path>
 					</g>
-					<path d="M19853.5 1776.3 L19118.75 1936 L19118.75 2609.5 L19118.8 2609.5 " fill="none"></path>
+					<path d="M10833.4 1723.6 L10670 1936 L10670 2571.5 L10670.0 2571.5 " fill="none"></path>
+					<path d="M10837.7 1726.8 L10833.4 1723.6 L10829.2 1720.3 L10841.6 1713.0 Z"></path>
+					<path d="M67698.1 656.8 L62556 966 L62556 1212.5 L62556 1212.5 L62556 1459 L62556 1459 L62556 1697.5 L62556 1697.5 L62556 1936 L62556 1936 L62556 2625 L62556 2625 L62556 3314 L62556 3314 L39417.5 3499.370400996585 L39417.5 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19863.8 1779.5 L19853.5 1776.3 L19861.5 1769.1 L19871.8 1772.3 Z"></path>
+						<path d="M67707.8 661.6 L67698.1 656.8 L67707.1 651.0 L67716.8 655.7 Z"></path>
 					</g>
-					<path d="M19853.8 1797.1 L19349.25 1936 L19349.25 2625 L19349.25 2625 L19349.25 3314 L19349.25 3314 L9169 3497.525446460936 L9169.0 3497.5 " fill="none"></path>
+					<path d="M67698.1 659.1 L62992.75 966 L62992.75 1197 L62992.8 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19864.2 1799.8 L19853.8 1797.1 L19861.3 1789.5 L19871.8 1792.2 Z"></path>
+						<path d="M67707.8 663.9 L67698.1 659.1 L67707.1 653.2 L67716.8 657.9 Z"></path>
 					</g>
-					<path d="M19854.0 1813.1 L19469.25 1936 L19469.25 2609.5 L19469.3 2609.5 " fill="none"></path>
+					<path d="M67698.2 673.4 L64666.75 966 L64666.75 1174 L64666.8 1174.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19864.5 1815.3 L19854.0 1813.1 L19861.2 1805.2 L19871.8 1807.4 Z"></path>
+						<path d="M67708.0 677.8 L67698.2 673.4 L67706.9 667.2 L67716.8 671.6 Z"></path>
 					</g>
-					<path d="M19900.2 1903.7 L19850.75 1936 L19850.75 2609.5 L19850.8 2609.5 " fill="none"></path>
+					<path d="M67698.3 697.6 L65905.5 966 L65905.5 1212.5 L65905.5 1212.5 L65905.5 1459 L65905.5 1459 L65905.5 1697.5 L65905.5 1697.5 L65905.5 1936 L65905.5 1936 L65905.5 2625 L65905.5 2625 L65905.5 3314 L65905.5 3314 L65905.5 3500.5 L65905.5 3500.5 L65905.5 3687 L65905.5 3687 L65905.5 3843.5 L65905.5 3843.5 L65905.5 4000 L65905.5 4000 L53704.5 4131.119897345417 L53704.5 4131.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M19910.9 1903.1 L19900.2 1903.7 L19905.1 1894.1 L19915.8 1893.5 Z"></path>
+						<path d="M67708.3 701.4 L67698.3 697.6 L67706.7 690.9 L67716.8 694.8 Z"></path>
 					</g>
-					<path d="M20578.2 1754.6 L21729.5 1936 L21729.5 2556.5 L21729.5 2556.5 " fill="none"></path>
+					<path d="M67698.4 718.7 L66439.5 966 L66439.5 1212.5 L66439.5 1212.5 L66439.5 1459 L66439.5 1459 L66439.5 1697.5 L66439.5 1697.5 L66439.5 1936 L66439.5 1936 L66439.5 2625 L66439.5 2625 L66439.5 3314 L66439.5 3314 L66439.5 3500.5 L66439.5 3500.5 L66439.5 3687 L66439.5 3687 L66439.5 3843.5 L66439.5 3843.5 L66439.5 4000 L66439.5 4000 L66439.5 4134 L66439.5 4134 L66439.5 4268 L66439.5 4268 L56253.5 4460.272828995378 L56253.5 4460.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20569.8 1747.9 L20578.2 1754.6 L20568.1 1758.4 L20559.8 1751.7 Z"></path>
+						<path d="M67708.6 722.2 L67698.4 718.7 L67706.6 711.7 L67716.8 715.1 Z"></path>
 					</g>
-					<path d="M20578.2 1748.4 L21913 1936 L21913 2625 L21913 2625 L21913 3314 L21913 3314 L19794.75 3491.253449242849 L19794.8 3491.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20569.7 1741.9 L20578.2 1748.4 L20568.3 1752.4 L20559.8 1745.8 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M62143.1 139.2 L68152.75 293 L68152.75 313 L68152.8 313.0 " fill="none"></path>
 					</g>
-					<path d="M20578.2 1747.3 L21953 1936 L21953 2625 L21953 2625 L21953 3314 L21953 3314 L21499.75 3486.9537084398976 L21499.8 3487.0 " fill="none"></path>
+					<path d="M62143.2 133.9 L62143.1 139.2 L62142.9 144.6 L62129.8 138.9 Z"></path>
+					<path d="M39435.1 3443.9 L39447.5 3439.5 L39455 3439.5 L39455 3439.5 L39462.5 3500.5 L39462.5 3500.5 L39455 3561.5 L39455 3561.5 L39447.5 3561.5 L39447.5 3561.5 L39417.5 3550.7982456140353 L39417.5 3550.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20569.7 1740.7 L20578.2 1747.3 L20568.3 1751.3 L20559.8 1744.7 Z"></path>
+						<path d="M39424.5 3442.0 L39435.1 3443.9 L39428.1 3452.1 L39417.5 3450.2 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M4117.8 2652.6 L4417.5 3314 L39135.5 3499.7456324048308 L39135.5 3499.7 " fill="none"></path>
 					</g>
-					<path d="M20578.3 1746.1 L21993 1936 L21993 2625 L21993 2625 L21993 3314 L21993 3314 L10068 3497.7799033177707 L10068.0 3497.8 " fill="none"></path>
+					<path d="M4122.6 2650.4 L4117.8 2652.6 L4112.9 2654.8 L4112.3 2640.5 Z"></path>
+					<path d="M11459.8 2835.3 L11024.5 3314 L34872 3499.9619405013277 L34872.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20569.7 1739.6 L20578.3 1746.1 L20568.3 1750.2 L20559.8 1743.7 Z"></path>
+						<path d="M11470.0 2832.0 L11459.8 2835.3 L11462.1 2824.8 L11472.3 2821.5 Z"></path>
 					</g>
-					<path d="M10086.1 3450.1 L10098 3447 L10105.5 3447 L10105.5 3447 L10113 3500.5 L10113 3500.5 L10105.5 3554 L10105.5 3554 L10098 3554 L10098 3554 L10068 3546.227602905569 L10068.0 3546.2 " fill="none"></path>
+					<path d="M11471.6 2835.7 L11064.5 3314 L19079 3498.8394546466334 L19079.0 3498.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M10075.7 3447.3 L10086.1 3450.1 L10078.4 3457.6 L10068.0 3454.8 Z"></path>
+						<path d="M11481.7 2832.1 L11471.6 2835.7 L11473.6 2825.2 L11483.7 2821.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3101.0 2653.7 L3003.25 3314 L9715 3495.721246325264 L9715.0 3495.7 " fill="none"></path>
+					<path d="M11483.5 2836.1 L11104.5 3314 L11104.5 3485 L11104.5 3485.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M11493.5 2832.1 L11483.5 2836.1 L11485.2 2825.5 L11495.1 2821.5 Z"></path>
 					</g>
-					<path d="M3106.3 2654.5 L3101.0 2653.7 L3095.7 2652.9 L3103.0 2640.5 Z"></path>
-					<path d="M23185.0 2720.2 L23185 3314 L25696 3497.324133881386 L25696.0 3497.3 " fill="none"></path>
+					<path d="M11698.4 2839.7 L11803 3314 L11803 3500.5 L11803 3500.5 L11803 3687 L11803 3687 L11803 3843.5 L11803 3843.5 L11803 4000 L11803 4000 L41393.5 4133.674740834387 L41393.5 4133.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23190.3 2710.8 L23185.0 2720.2 L23179.7 2710.8 L23185.0 2701.5 Z"></path>
+						<path d="M11701.6 2829.5 L11698.4 2839.7 L11691.2 2831.8 L11694.3 2821.5 Z"></path>
 					</g>
-					<path d="M22674.0 1719.3 L22272 1936 L23083.629172714078 2548.5 L23083.6 2548.5 " fill="none"></path>
-					<path d="M22676.5 1724.0 L22674.0 1719.3 L22671.5 1714.6 L22685.7 1713.0 Z"></path>
-					<path d="M37154.0 165.3 L37154 293 L37154 614 L37154.0 614.0 " fill="none"></path>
-					<path d="M37159.3 165.3 L37154.0 165.3 L37148.7 165.3 L37154.0 152.0 Z"></path>
-					<path d="M23246.4 1805.9 L23185 1936 L23185 2548.5 L23185.0 2548.5 " fill="none"></path>
+					<path d="M11735.0 2838.9 L11921.5 3314 L11921.5 3485 L11921.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23255.2 1799.7 L23246.4 1805.9 L23245.5 1795.2 L23254.3 1789.0 Z"></path>
+						<path d="M11736.5 2828.2 L11735.0 2838.9 L11726.6 2832.1 L11728.1 2821.5 Z"></path>
 					</g>
-					<path d="M23319.1 1807.3 L23344.5 1936 L23712.04136429608 2609.5 L23712.0 2609.5 " fill="none"></path>
+					<path d="M11777.0 2837.6 L12059.5 3314 L40116 3500.2112900355874 L40116.0 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23322.6 1797.1 L23319.1 1807.3 L23312.1 1799.2 L23315.5 1789.0 Z"></path>
+						<path d="M11776.9 2826.8 L11777.0 2837.6 L11767.7 2832.2 L11767.5 2821.5 Z"></path>
 					</g>
-					<path d="M23369.1 1804.5 L23457 1936 L23457 2609.5 L23457.0 2609.5 " fill="none"></path>
+					<path d="M11818.5 2836.1 L12197.5 3314 L12197.5 3485 L12197.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23368.3 1793.8 L23369.1 1804.5 L23359.4 1799.7 L23358.7 1789.0 Z"></path>
+						<path d="M11816.8 2825.5 L11818.5 2836.1 L11808.5 2832.1 L11806.9 2821.5 Z"></path>
 					</g>
-					<path d="M23584.9 1804.5 L23497 1936 L23219.64150943396 2548.5 L23219.6 2548.5 " fill="none"></path>
+					<path d="M11830.4 2835.7 L12237.5 3314 L40503 3500.266059503198 L40503.0 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23594.6 1799.7 L23584.9 1804.5 L23585.7 1793.8 L23595.3 1789.0 Z"></path>
+						<path d="M11828.4 2825.2 L11830.4 2835.7 L11820.3 2832.1 L11818.3 2821.5 Z"></path>
 					</g>
-					<path d="M23685.9 1807.0 L23720.5 1936 L23720.5 2609.5 L23720.5 2609.5 " fill="none"></path>
+					<path d="M11842.2 2835.3 L12277.5 3314 L39971 3500.147111295322 L39971.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23688.6 1796.6 L23685.9 1807.0 L23678.3 1799.4 L23681.1 1789.0 Z"></path>
+						<path d="M11839.9 2824.8 L11842.2 2835.3 L11832.0 2832.0 L11829.7 2821.5 Z"></path>
 					</g>
-					<path d="M23728.1 1804.5 L23816 1936 L23465.07619738752 2609.5 L23465.1 2609.5 " fill="none"></path>
+					<path d="M50632.1 3940.9 L50574.5 4000 L53168.5 4121.45213137666 L53168.5 4121.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M23727.3 1793.8 L23728.1 1804.5 L23718.4 1799.7 L23717.7 1789.0 Z"></path>
+						<path d="M50642.5 3937.9 L50632.1 3940.9 L50634.8 3930.5 L50645.1 3927.5 Z"></path>
 					</g>
-					<path d="M24015.5 1777.7 L24015.5 1936 L23727.136429608126 2609.5 L23727.1 2609.5 " fill="none"></path>
+					<path d="M50727.0 3946.2 L50727 4000 L48585.5 4129.058241511131 L48585.5 4129.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24020.8 1768.3 L24015.5 1777.7 L24010.2 1768.3 L24015.5 1759.0 Z"></path>
+						<path d="M50732.3 3936.8 L50727.0 3946.2 L50721.7 3936.8 L50727.0 3927.5 Z"></path>
 					</g>
-					<path d="M20222.2 2709.7 L19833 3314 L25696 3499.126470837213 L25696.0 3499.1 " fill="none"></path>
+					<path d="M50853.6 3938.7 L50935 4000 L48876.5 4126.299908424909 L48876.5 4126.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20231.7 2704.7 L20222.2 2709.7 L20222.8 2699.0 L20232.3 2694.0 Z"></path>
+						<path d="M50849.3 3928.8 L50853.6 3938.7 L50842.9 3937.4 L50838.6 3927.5 Z"></path>
 					</g>
-					<path d="M20292.2 2712.4 L20398.5 3314 L20398.5 3500.5 L20398.5 3500.5 L20398.5 3687 L20398.5 3687 L20398.5 3843.5 L20398.5 3843.5 L20398.5 4000 L20398.5 4000 L18421.25 4129.2919360741735 L18421.3 4129.3 " fill="none"></path>
+					<path d="M50727.0 3529.3 L50727 3687 L50727 3759.5 L50727.0 3759.5 " fill="none"></path>
+					<path d="M50732.3 3529.3 L50727.0 3529.3 L50721.7 3529.3 L50727.0 3516.0 Z"></path>
+					<path d="M12561.3 2712.7 L12561.25 3314 L34872 3499.9249935767825 L34872.0 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20295.8 2702.3 L20292.2 2712.4 L20285.3 2704.1 L20288.9 2694.0 Z"></path>
+						<path d="M12566.6 2703.3 L12561.3 2712.7 L12555.9 2703.3 L12561.3 2694.0 Z"></path>
 					</g>
-					<path d="M20740.5 2800.4 L20503.5 3314 L20503.5 3485 L20503.5 3485.0 " fill="none"></path>
+					<path d="M23441.5 1265.4 L22559.75 1459 L22559.75 1682 L22559.8 1682.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20749.3 2794.2 L20740.5 2800.4 L20739.6 2789.7 L20748.3 2783.5 Z"></path>
+						<path d="M23451.8 1268.6 L23441.5 1265.4 L23449.5 1258.2 L23459.8 1261.4 Z"></path>
 					</g>
-					<path d="M20811.2 2802.1 L20781.5 3314 L13203.75 3499.216785164313 L13203.8 3499.2 " fill="none"></path>
+					<path d="M23463.9 1319.7 L23180.25 1459 L23180.25 1697.5 L23180.25 1697.5 L23180.25 1936 L23180.25 1936 L23180.25 2625 L23180.25 2625 L23180.25 3314 L23180.25 3314 L40116 3500.02219621008 L40116.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20817.1 2793.1 L20811.2 2802.1 L20806.4 2792.5 L20812.3 2783.5 Z"></path>
+						<path d="M23474.6 1320.4 L23463.9 1319.7 L23469.9 1310.8 L23480.6 1311.5 Z"></path>
 					</g>
-					<path d="M20821.5 2802.2 L20821.5 3314 L21428.75 3490.199338778685 L21428.8 3490.2 " fill="none"></path>
+					<path d="M23512.5 1321.6 L23298.75 1459 L23298.75 1682 L23298.8 1682.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20826.8 2792.8 L20821.5 2802.2 L20816.2 2792.8 L20821.5 2783.5 Z"></path>
+						<path d="M23523.3 1321.0 L23512.5 1321.6 L23517.5 1312.1 L23528.2 1311.5 Z"></path>
 					</g>
-					<path d="M20831.8 2802.1 L20861.5 3314 L13048 3498.890915434879 L13048.0 3498.9 " fill="none"></path>
+					<path d="M23636.5 1328.9 L23585.25 1459 L23585.25 1682 L23585.3 1682.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20836.6 2792.5 L20831.8 2802.1 L20825.9 2793.1 L20830.7 2783.5 Z"></path>
+						<path d="M23644.8 1322.1 L23636.5 1328.9 L23634.9 1318.2 L23643.3 1311.5 Z"></path>
 					</g>
-					<path d="M20902.5 2800.4 L21139.5 3314 L21539.75 3487.9001164822366 L21539.8 3487.9 " fill="none"></path>
+					<path d="M24293.7 1767.0 L24180.5 1936 L29974.75 2607.7829708468303 L29974.8 2607.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20903.4 2789.7 L20902.5 2800.4 L20893.7 2794.2 L20894.7 2783.5 Z"></path>
+						<path d="M24303.3 1762.2 L24293.7 1767.0 L24294.5 1756.3 L24304.1 1751.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M37938.4 173.6 L37704.25 293 L37704.25 598.5 L37704.3 598.5 " fill="none"></path>
+					<path d="M24346.3 1770.1 L24360.25 1936 L24360.25 2625 L24360.25 2625 L24360.25 3314 L24360.25 3314 L24360.25 3500.5 L24360.25 3500.5 L24360.25 3687 L24360.25 3687 L24360.25 3843.5 L24360.25 3843.5 L24360.25 4000 L24360.25 4000 L41393.5 4133.435962643048 L41393.5 4133.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M24350.9 1760.4 L24346.3 1770.1 L24340.2 1761.2 L24344.8 1751.5 Z"></path>
 					</g>
-					<path d="M37940.8 178.3 L37938.4 173.6 L37935.9 168.8 L37950.2 167.5 Z"></path>
+					<path d="M23917.2 1300.5 L24340.25 1459 L24340.25 1643.5 L24340.3 1643.5 " fill="none"></path>
+					<path d="M23919.1 1295.5 L23917.2 1300.5 L23915.4 1305.5 L23904.8 1295.9 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M38055.0 176.5 L38183.25 293 L38183.25 598.5 L38183.3 598.5 " fill="none"></path>
+						<path d="M4119.2 2652.4 L4457.5 3314 L4242.642091152815 3462 L4242.6 3462.0 " fill="none"></path>
 					</g>
-					<path d="M38058.6 172.5 L38055.0 176.5 L38051.4 180.4 L38045.1 167.5 Z"></path>
-					<path d="M21345.9 2689.0 L21179.5 3314 L9625 3497.592268370607 L9625.0 3497.6 " fill="none"></path>
+					<path d="M4124.0 2649.9 L4119.2 2652.4 L4114.5 2654.8 L4113.2 2640.5 Z"></path>
+					<path d="M24588.6 2705.1 L24545.5 3314 L24545.5 3485 L24545.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21353.5 2681.4 L21345.9 2689.0 L21343.2 2678.6 L21350.7 2671.0 Z"></path>
+						<path d="M24594.6 2696.2 L24588.6 2705.1 L24583.9 2695.4 L24589.9 2686.5 Z"></path>
 					</g>
-					<path d="M21361.1 2689.7 L21342.75 3314 L21549.967158176943 3485 L21550.0 3485.0 " fill="none"></path>
+					<path d="M24806.2 2685.6 L27002.75 3314 L45922.5 3499.6854073752484 L45922.5 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21366.7 2680.5 L21361.1 2689.7 L21356.0 2680.2 L21361.6 2671.0 Z"></path>
+						<path d="M24798.7 2677.9 L24806.2 2685.6 L24795.8 2688.2 L24788.3 2680.5 Z"></path>
 					</g>
-					<path d="M21378.2 2689.2 L21526.25 3314 L24108.25 3498.252152286206 L24108.3 3498.3 " fill="none"></path>
+					<path d="M27671.2 1219.5 L24594.25 1459 L24594.25 1697.5 L24594.25 1697.5 L24594.25 1936 L24594.25 1936 L24594.25 2563.5 L24594.3 2563.5 " fill="none"></path>
+					<path d="M27671.6 1224.8 L27671.2 1219.5 L27670.8 1214.1 L27684.5 1218.4 Z"></path>
+					<path d="M54557.9 2663.4 L53592.25 3314 L53592.25 3454.5 L53592.3 3454.5 " fill="none"></path>
+					<path d="M54560.9 2667.9 L54557.9 2663.4 L54554.9 2659.0 L54569.0 2656.0 Z"></path>
+					<path d="M20694.9 2725.1 L20346.75 3314 L32045 3499.595680653325 L32045.0 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M21381.2 2678.9 L21378.2 2689.2 L21370.9 2681.3 L21373.9 2671.0 Z"></path>
+						<path d="M20704.2 2719.7 L20694.9 2725.1 L20695.0 2714.3 L20704.3 2709.0 Z"></path>
 					</g>
-					<path d="M9643.1 3450.0 L9655 3447 L9662.5 3447 L9662.5 3447 L9670 3500.5 L9670 3500.5 L9662.5 3554 L9662.5 3554 L9655 3554 L9655 3554 L9625 3546.4647887323945 L9625.0 3546.5 " fill="none"></path>
+					<path d="M20812.3 2725.1 L21155 3314 L15983.25 3494.092680763665 L15983.3 3494.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M9632.8 3447.1 L9643.1 3450.0 L9635.4 3457.4 L9625.0 3454.5 Z"></path>
+						<path d="M20812.2 2714.4 L20812.3 2725.1 L20803.0 2719.7 L20802.9 2709.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3102.7 2653.8 L3043.25 3314 L9259 3495.16622387185 L9259.0 3495.2 " fill="none"></path>
+						<path d="M21831.7 1714.9 L20754 1936 L20754 2541 L20754.0 2541.0 " fill="none"></path>
 					</g>
-					<path d="M3108.0 2654.3 L3102.7 2653.8 L3097.3 2653.3 L3103.9 2640.5 Z"></path>
-					<path d="M24747.9 1791.2 L24278.25 1936 L44409.5 2619.954745497356 L44409.5 2620.0 " fill="none"></path>
+					<path d="M21832.8 1720.1 L21831.7 1714.9 L21830.6 1709.6 L21844.8 1712.2 Z"></path>
+					<path d="M63712.7 2891.2 L63537.5 3314 L63068.5 3489.1121121121123 L63068.5 3489.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24758.4 1793.5 L24747.9 1791.2 L24755.3 1783.3 L24765.8 1785.7 Z"></path>
+						<path d="M63721.2 2884.7 L63712.7 2891.2 L63711.3 2880.6 L63719.8 2874.0 Z"></path>
 					</g>
-					<path d="M24748.0 1796.3 L24318.25 1936 L24318.25 2609.5 L24318.3 2609.5 " fill="none"></path>
+					<path d="M63728.0 2891.6 L63577.5 3314 L57121 3499.1806612841215 L57121.0 3499.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24758.5 1798.5 L24748.0 1796.3 L24755.2 1788.3 L24765.8 1790.5 Z"></path>
+						<path d="M63736.2 2884.6 L63728.0 2891.6 L63726.1 2881.0 L63734.3 2874.0 Z"></path>
 					</g>
-					<path d="M25035.3 1934.6 L25035.25 1936 L25035.25 2609.5 L25035.3 2609.5 " fill="none"></path>
+					<path d="M63743.4 2891.9 L63617.5 3314 L59076.5 3485.401841732443 L59076.5 3485.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25041.3 1925.7 L25035.3 1934.6 L25030.7 1924.9 L25036.6 1916.0 Z"></path>
+						<path d="M63751.2 2884.5 L63743.4 2891.9 L63741.0 2881.4 L63748.7 2874.0 Z"></path>
 					</g>
-					<path d="M25353.6 1884.7 L25436.25 1936 L25436.25 2609.5 L25436.3 2609.5 " fill="none"></path>
+					<path d="M63758.8 2892.2 L63657.5 3314 L50783.5 3499.685085650207 L50783.5 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25348.5 1875.3 L25353.6 1884.7 L25342.9 1884.4 L25337.8 1874.9 Z"></path>
+						<path d="M63766.2 2884.3 L63758.8 2892.2 L63755.8 2881.8 L63763.2 2874.0 Z"></path>
 					</g>
-					<path d="M25355.6 1791.2 L25825.25 1936 L25825.25 2609.5 L25825.3 2609.5 " fill="none"></path>
+					<path d="M63889.0 2892.1 L63993.25 3314 L63993.25 3500.5 L63993.25 3500.5 L63993.25 3687 L63993.25 3687 L63993.25 3843.5 L63993.25 3843.5 L63993.25 4000 L63993.25 4000 L62889 4128.306525037936 L62889.0 4128.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M25348.2 1783.3 L25355.6 1791.2 L25345.1 1793.5 L25337.8 1785.7 Z"></path>
+						<path d="M63891.9 2881.8 L63889.0 2892.1 L63881.6 2884.3 L63884.5 2874.0 Z"></path>
 					</g>
-					<path d="M44544.5 2750.1 L44483.75 3314 L44483.75 3485 L44483.8 3485.0 " fill="none"></path>
+					<path d="M63958.2 2890.6 L64173.75 3314 L64173.75 3500.5 L64173.75 3500.5 L64173.75 3687 L64173.75 3687 L64173.75 3707 L64173.8 3707.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44550.8 2741.4 L44544.5 2750.1 L44540.2 2740.2 L44546.5 2731.5 Z"></path>
+						<path d="M63958.7 2879.9 L63958.2 2890.6 L63949.2 2884.7 L63949.8 2874.0 Z"></path>
 					</g>
-					<path d="M44582.0 2749.8 L44690.5 3314 L14544.5 3499.3533009148605 L14544.5 3499.4 " fill="none"></path>
+					<path d="M63973.4 2890.2 L64213.75 3314 L59221.5 3498.5591208682295 L59221.5 3498.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44585.5 2739.7 L44582.0 2749.8 L44575.0 2741.7 L44578.5 2731.5 Z"></path>
+						<path d="M63973.5 2879.5 L63973.4 2890.2 L63964.2 2884.7 L63964.2 2874.0 Z"></path>
 					</g>
-					<path d="M22676.9 1719.8 L22312 1936 L44409.5 2620.400678773712 L44409.5 2620.4 " fill="none"></path>
-					<path d="M22679.6 1724.4 L22676.9 1719.8 L22674.2 1715.2 L22688.3 1713.0 Z"></path>
-					<path d="M14562.6 3449.9 L14574.5 3447 L14582 3447 L14582 3447 L14589.5 3500.5 L14589.5 3500.5 L14582 3554 L14582 3554 L14574.5 3554 L14574.5 3554 L14544.5 3546.5866050808313 L14544.5 3546.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14552.3 3447.0 L14562.6 3449.9 L14554.8 3457.4 L14544.5 3454.4 Z"></path>
+					<path d="M68601.9 708.0 L70078.75 966 L70078.75 1212.5 L70078.75 1212.5 L70078.75 1459 L70078.75 1459 L70078.75 1697.5 L70078.75 1697.5 L70078.75 1936 L70078.75 1936 L64274 2575.327458737961 L64274.0 2575.3 " fill="none"></path>
+					<path d="M68602.8 702.7 L68601.9 708.0 L68601.0 713.2 L68588.8 705.7 Z"></path>
+					<path d="M61136.9 1831.8 L60897.5 1936 L63372 2518.782601264741 L63372.0 2518.8 " fill="none"></path>
+					<path d="M61139.0 1836.7 L61136.9 1831.8 L61134.7 1826.9 L61149.1 1826.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M64545.1 1229.9 L62944 1459 L62944 1697.5 L62944 1697.5 L62944 1936 L62944 1936 L63505.33526850508 2376 L63505.3 2376.0 " fill="none"></path>
+					</g>
+					<path d="M64545.8 1235.2 L64545.1 1229.9 L64544.3 1224.6 L64558.3 1228.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M75698.0 1262.6 L75586.5 1459 L75586.5 1697.5 L75586.5 1697.5 L75586.5 1936 L75586.5 1936 L64274 2598.5844774089346 L64274.0 2598.6 " fill="none"></path>
 					</g>
+					<path d="M75702.7 1265.2 L75698.0 1262.6 L75693.4 1260.0 L75704.6 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3104.3 2653.8 L3083.25 3314 L14171.5 3497.4150313754185 L14171.5 3497.4 " fill="none"></path>
+						<path d="M48794.2 1214.0 L30583.25 1459 L30583.25 1697.5 L30583.25 1697.5 L30583.25 1936 L30583.25 1936 L63372 2615.6515843229868 L63372.0 2615.7 " fill="none"></path>
 					</g>
-					<path d="M3109.7 2654.0 L3104.3 2653.8 L3099.0 2653.7 L3104.8 2640.5 Z"></path>
-					<path d="M38560.5 193.7 L38560.5 293 L38560.5 614 L38560.5 614.0 " fill="none"></path>
+					<path d="M48794.2 1219.3 L48794.2 1214.0 L48794.1 1208.6 L48807.5 1213.8 Z"></path>
+					<path d="M58676.5 3625.7 L58676.5 3687 L64033.25 3839.5001364318523 L64033.3 3839.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38565.8 184.3 L38560.5 193.7 L38555.2 184.3 L38560.5 175.0 Z"></path>
+						<path d="M58681.8 3616.3 L58676.5 3625.7 L58671.2 3616.3 L58676.5 3607.0 Z"></path>
 					</g>
-					<path d="M22196.0 2712.7 L22196 3314 L64028.25 3500.295144257461 L64028.3 3500.3 " fill="none"></path>
+					<path d="M59095.2 3486.5 L64253.75 3314 L63978.670174165454 2874 L63978.7 2874.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M22201.3 2703.3 L22196.0 2712.7 L22190.7 2703.3 L22196.0 2694.0 Z"></path>
+						<path d="M59085.6 3481.5 L59095.2 3486.5 L59086.0 3492.1 L59076.5 3487.1 Z"></path>
 					</g>
-					<path d="M61576.0 1709.5 L59591.5 1936 L59591.5 2594 L59591.5 2594.0 " fill="none"></path>
-					<path d="M61576.6 1714.8 L61576.0 1709.5 L61575.4 1704.2 L61589.3 1708.0 Z"></path>
-					<path d="M59588.1 2669.3 L59539 3314 L58447.671581769435 3485 L58447.7 3485.0 " fill="none"></path>
-					<path d="M59593.4 2669.7 L59588.1 2669.3 L59582.8 2668.9 L59589.1 2656.0 Z"></path>
-					<path d="M61576.2 1719.8 L60556.75 1936 L60556.75 2594 L60556.8 2594.0 " fill="none"></path>
-					<path d="M61577.3 1725.0 L61576.2 1719.8 L61575.1 1714.6 L61589.3 1717.0 Z"></path>
-					<path d="M61604.9 1734.3 L61186.5 1936 L45688 2619.553098194853 L45688.0 2619.6 " fill="none"></path>
-					<path d="M61607.2 1739.1 L61604.9 1734.3 L61602.6 1729.5 L61616.9 1728.5 Z"></path>
-					<path d="M45564.5 2669.3 L45564.5 3314 L50428.5 3495.554288001601 L50428.5 3495.6 " fill="none"></path>
-					<path d="M45569.8 2669.3 L45564.5 2669.3 L45559.2 2669.3 L45564.5 2656.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M59600.0 2669.1 L59724 3314 L50693.5 3497.8031485321403 L50693.5 3497.8 " fill="none"></path>
+						<path d="M64545.1 1235.0 L63332 1459 L63332 1697.5 L63332 1697.5 L63332 1936 L63332 1936 L63332 2625 L63332 2625 L63332 3314 L63332 3314 L59076.5 3484.4759424336808 L59076.5 3484.5 " fill="none"></path>
 					</g>
-					<path d="M59605.2 2668.1 L59600.0 2669.1 L59594.7 2670.1 L59597.5 2656.0 Z"></path>
-					<path d="M61610.3 1734.7 L61226.5 1936 L44979.5 2620.09466189996 L44979.5 2620.1 " fill="none"></path>
-					<path d="M61612.8 1739.4 L61610.3 1734.7 L61607.9 1730.0 L61622.1 1728.5 Z"></path>
-					<path d="M44863.0 2669.3 L44863 3314 L44863 3469.5 L44863.0 3469.5 " fill="none"></path>
-					<path d="M44868.3 2669.3 L44863.0 2669.3 L44857.7 2669.3 L44863.0 2656.0 Z"></path>
-					<path d="M61711.9 1739.2 L61856.25 1936 L61856.25 2594 L61856.3 2594.0 " fill="none"></path>
-					<path d="M61716.2 1736.1 L61711.9 1739.2 L61707.6 1742.4 L61704.0 1728.5 Z"></path>
-					<path d="M39065.0 679.2 L39065 966 L39065 1197 L39065.0 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39070.3 669.8 L39065.0 679.2 L39059.7 669.8 L39065.0 660.5 Z"></path>
+					<path d="M64546.1 1240.2 L64545.1 1235.0 L64544.2 1229.7 L64558.3 1232.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M75705.9 1263.4 L75626.5 1459 L75626.5 1697.5 L75626.5 1697.5 L75626.5 1936 L75626.5 1936 L75626.5 2625 L75626.5 2625 L75626.5 3314 L75626.5 3314 L59076.5 3496.0988200589973 L59076.5 3496.1 " fill="none"></path>
 					</g>
-					<path d="M39065.0 165.3 L39065 293 L39065 598.5 L39065.0 598.5 " fill="none"></path>
-					<path d="M39070.3 165.3 L39065.0 165.3 L39059.7 165.3 L39065.0 152.0 Z"></path>
-					<path d="M39607.1 161.6 L39480.75 293 L39480.75 598.5 L39480.8 598.5 " fill="none"></path>
-					<path d="M39610.9 165.3 L39607.1 161.6 L39603.3 157.9 L39616.3 152.0 Z"></path>
-					<path d="M39660.5 160.5 L39822.25 293 L39822.25 598.5 L39822.3 598.5 " fill="none"></path>
-					<path d="M39663.9 156.3 L39660.5 160.5 L39657.1 164.6 L39650.2 152.0 Z"></path>
-					<path d="M39914.8 1747.2 L39914.75 1936 L37633 2592.3514246947084 L37633.0 2592.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39920.1 1737.8 L39914.8 1747.2 L39909.4 1737.8 L39914.8 1728.5 Z"></path>
+					<path d="M75710.8 1265.4 L75705.9 1263.4 L75700.9 1261.4 L75710.9 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M48794.2 1214.0 L30623.25 1459 L30623.25 1697.5 L30623.25 1697.5 L30623.25 1936 L30623.25 1936 L30623.25 2625 L30623.25 2625 L30623.25 3314 L30623.25 3314 L58276.5 3497.8407715683566 L58276.5 3497.8 " fill="none"></path>
 					</g>
-					<path d="M39914.8 1241.3 L39914.75 1459 L39914.75 1666.5 L39914.8 1666.5 " fill="none"></path>
-					<path d="M39920.1 1241.3 L39914.8 1241.3 L39909.4 1241.3 L39914.8 1228.0 Z"></path>
-					<path d="M40151.1 885.5 L40065.25 966 L40065.25 1197 L40065.3 1197.0 " fill="none"></path>
+					<path d="M48794.2 1219.3 L48794.2 1214.0 L48794.1 1208.6 L48807.5 1213.8 Z"></path>
+					<path d="M15437.5 1221.8 L13012.75 1459 L13012.75 1613.5 L13012.8 1613.5 " fill="none"></path>
+					<path d="M15438.0 1227.1 L15437.5 1221.8 L15437.0 1216.5 L15450.8 1220.5 Z"></path>
+					<path d="M36211.4 2772.1 L36074.5 3314 L50670.5 3499.780856509128 L50670.5 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40161.6 883.0 L40151.1 885.5 L40154.3 875.2 L40164.8 872.7 Z"></path>
+						<path d="M36218.8 2764.4 L36211.4 2772.1 L36208.5 2761.7 L36215.9 2754.0 Z"></path>
 					</g>
-					<path d="M40253.8 917.1 L40224.75 966 L40224.75 1197 L40224.8 1197.0 " fill="none"></path>
+					<path d="M36330.1 2770.3 L36635.75 3314 L59116.5 3500.0654754640364 L59116.5 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40263.1 911.7 L40253.8 917.1 L40253.9 906.3 L40263.3 901.0 Z"></path>
+						<path d="M36330.2 2759.5 L36330.1 2770.3 L36320.9 2764.7 L36321.0 2754.0 Z"></path>
 					</g>
-					<path d="M40700.7 756.2 L41158.5 966 L41158.5 1197 L41158.5 1197.0 " fill="none"></path>
+					<path d="M62031.6 1740.0 L61916.5 1936 L36596.5 2615.658719027583 L36596.5 2615.7 " fill="none"></path>
+					<path d="M62036.2 1742.7 L62031.6 1740.0 L62027.0 1737.3 L62038.3 1728.5 Z"></path>
+					<path d="M72722.0 2712.7 L72722 3314 L44118.25 3498.685668908334 L44118.3 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40694.5 747.5 L40700.7 756.2 L40690.0 757.2 L40683.8 748.4 Z"></path>
+						<path d="M72727.3 2703.3 L72722.0 2712.7 L72716.7 2703.3 L72722.0 2694.0 Z"></path>
 					</g>
-					<path d="M40701.3 729.4 L41357.5 966 L41357.5 1197 L41357.5 1197.0 " fill="none"></path>
+					<path d="M73239.6 163.7 L72722 293 L72722 629.5 L72722 629.5 L72722 966 L72722 966 L72722 1212.5 L72722 1212.5 L72722 1459 L72722 1459 L72722 1697.5 L72722 1697.5 L72722 1936 L72722 1936 L72722 2556 L72722.0 2556.0 " fill="none"></path>
+					<path d="M73240.9 168.9 L73239.6 163.7 L73238.3 158.5 L73252.5 160.5 Z"></path>
+					<path d="M43837.3 3685.7 L43837.25 3687 L43837.25 3843.5 L43837.25 3843.5 L43837.25 4000 L43837.25 4000 L62791 4133.654471063399 L62791.0 4133.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M40694.3 721.2 L40701.3 729.4 L40690.7 731.3 L40683.8 723.1 Z"></path>
+						<path d="M43842.6 3676.3 L43837.3 3685.7 L43831.9 3676.3 L43837.3 3667.0 Z"></path>
+					</g>
+					<path d="M36681.8 3305.0 L36675.75 3314 L43556.25 3493.182189485443 L43556.3 3493.2 " fill="none"></path>
+					<path d="M36686.2 3308.0 L36681.8 3305.0 L36677.4 3302.0 L36689.3 3294.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M14993.3 2669.3 L14993.25 3314 L43556.25 3498.68310567189 L43556.3 3498.7 " fill="none"></path>
 					</g>
-					<path d="M40424.3 165.3 L40424.25 293 L40424.25 358 L40424.3 358.0 " fill="none"></path>
-					<path d="M40429.6 165.3 L40424.3 165.3 L40418.9 165.3 L40424.3 152.0 Z"></path>
-					<path d="M37508.1 2681.8 L37381 3314 L21597.75 3500.1579550664833 L21597.8 3500.2 " fill="none"></path>
+					<path d="M14998.6 2669.3 L14993.3 2669.3 L14987.9 2669.3 L14993.3 2656.0 Z"></path>
+					<path d="M20714.0 1747.2 L20714 1936 L35900.5 2609.565193601339 L35900.5 2609.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37515.2 2673.7 L37508.1 2681.8 L37504.7 2671.6 L37511.8 2663.5 Z"></path>
+						<path d="M20719.3 1737.8 L20714.0 1747.2 L20708.7 1737.8 L20714.0 1728.5 Z"></path>
 					</g>
-					<path d="M37542.4 2680.8 L37803 3314 L37803 3485 L37803.0 3485.0 " fill="none"></path>
+					<path d="M19279.8 165.3 L19279.75 293 L19279.75 583 L19279.8 583.0 " fill="none"></path>
+					<path d="M19285.1 165.3 L19279.8 165.3 L19274.4 165.3 L19279.8 152.0 Z"></path>
+					<path d="M24873.8 1777.7 L24873.75 1936 L30663.25 2570.882301448353 L30663.3 2570.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37543.8 2670.1 L37542.4 2680.8 L37534.0 2674.2 L37535.3 2663.5 Z"></path>
+						<path d="M24879.1 1768.3 L24873.8 1777.7 L24868.4 1768.3 L24873.8 1759.0 Z"></path>
 					</g>
-					<path d="M24548.8 2705.2 L24548.75 3314 L21597.75 3498.685067114094 L21597.8 3498.7 " fill="none"></path>
+					<path d="M27671.2 1220.1 L24873.75 1459 L24873.75 1636 L24873.8 1636.0 " fill="none"></path>
+					<path d="M27671.7 1225.4 L27671.2 1220.1 L27670.8 1214.8 L27684.5 1219.0 Z"></path>
+					<path d="M16405.9 2746.4 L15977.5 3314 L14367.5 3490.3153258954785 L14367.5 3490.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24554.1 2695.8 L24548.8 2705.2 L24543.4 2695.8 L24548.8 2686.5 Z"></path>
+						<path d="M16415.8 2742.2 L16405.9 2746.4 L16407.2 2735.7 L16417.1 2731.5 Z"></path>
 					</g>
-					<path d="M16795.7 3926.0 L16724.5 4000 L62172 4133.786577328647 L62172.0 4133.8 " fill="none"></path>
+					<path d="M16588.0 2746.5 L17011 3314 L40116 3500.149534527075 L40116.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16806.0 3922.9 L16795.7 3926.0 L16798.3 3915.5 L16808.6 3912.5 Z"></path>
+						<path d="M16586.7 2735.8 L16588.0 2746.5 L16578.2 2742.2 L16576.9 2731.5 Z"></path>
 					</g>
-					<path d="M16974.5 3924.3 L17067.75 4000 L14886.5 4129.574420924305 L14886.5 4129.6 " fill="none"></path>
+					<path d="M17235.2 2749.2 L17051 3314 L17568.584450402144 3485 L17568.6 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M16970.6 3914.2 L16974.5 3924.3 L16963.9 3922.5 L16960.0 3912.5 Z"></path>
+						<path d="M17243.2 2742.0 L17235.2 2749.2 L17233.0 2738.7 L17241.0 2731.5 Z"></path>
 					</g>
-					<path d="M40870.3 165.3 L40870.25 293 L40870.25 583.5 L40870.3 583.5 " fill="none"></path>
-					<path d="M40875.6 165.3 L40870.3 165.3 L40864.9 165.3 L40870.3 152.0 Z"></path>
-					<path d="M41205.3 165.3 L41205.25 293 L41205.25 583.5 L41205.3 583.5 " fill="none"></path>
-					<path d="M41210.6 165.3 L41205.3 165.3 L41199.9 165.3 L41205.3 152.0 Z"></path>
-					<path d="M24746.8 2712.2 L24746.75 3314 L25696 3492.328003021909 L25696.0 3492.3 " fill="none"></path>
+					<path d="M17327.8 2748.7 L17565.75 3314 L40116 3500.140929460581 L40116.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M24752.1 2702.8 L24746.8 2712.2 L24741.4 2702.8 L24746.8 2693.5 Z"></path>
+						<path d="M17329.1 2738.0 L17327.8 2748.7 L17319.3 2742.2 L17320.6 2731.5 Z"></path>
 					</g>
-					<path d="M83574.0 171.4 L83182 293 L83182 629.5 L83182 629.5 L83182 966 L83182 966 L83182 1174 L83182.0 1174.0 " fill="none"></path>
-					<path d="M83575.6 176.5 L83574.0 171.4 L83572.5 166.4 L83586.8 167.5 Z"></path>
-					<path d="M867.2 3422.4 L880 3417 L887.5 3417 L887.5 3417 L895 3500.5 L895 3500.5 L887.5 3584 L887.5 3584 L880 3584 L880 3584 L850 3571.284263959391 L850.0 3571.3 " fill="none"></path>
+					<path d="M11731.1 3449.9 L11743 3447 L11750.5 3447 L11750.5 3447 L11758 3500.5 L11758 3500.5 L11750.5 3554 L11750.5 3554 L11743 3554 L11743 3554 L11713 3546.7539503386006 L11713.0 3546.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M856.5 3421.2 L867.2 3422.4 L860.7 3431.0 L850.0 3429.7 Z"></path>
+						<path d="M11720.8 3446.9 L11731.1 3449.9 L11723.3 3457.2 L11713.0 3454.2 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3106.0 2653.8 L3123.25 3314 L850 3487.7367585288393 L850.0 3487.7 " fill="none"></path>
+						<path d="M4125.6 2651.0 L4645.75 3314 L11330 3495.3056939242992 L11330.0 3495.3 " fill="none"></path>
 					</g>
-					<path d="M3111.3 2653.7 L3106.0 2653.8 L3100.7 2654.0 L3105.7 2640.5 Z"></path>
-					<path d="M17301.6 3941.9 L17178.5 4000 L15060.5 4129.8910755148745 L15060.5 4129.9 " fill="none"></path>
+					<path d="M4129.8 2647.7 L4125.6 2651.0 L4121.4 2654.3 L4117.4 2640.5 Z"></path>
+					<path d="M17859.5 2711.2 L17605.75 3314 L50670.5 3500.1818583235836 L50670.5 3500.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17312.3 3942.7 L17301.6 3941.9 L17307.8 3933.1 L17318.5 3933.9 Z"></path>
+						<path d="M17868.0 2704.7 L17859.5 2711.2 L17858.2 2700.5 L17866.7 2694.0 Z"></path>
 					</g>
-					<path d="M17302.1 3955.1 L17218.5 4000 L6898 4132.924548250673 L6898.0 4132.9 " fill="none"></path>
+					<path d="M17983.4 2706.7 L18634.25 3314 L18769.720509383376 3485 L18769.7 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17312.8 3955.4 L17302.1 3955.1 L17307.8 3946.0 L17318.5 3946.3 Z"></path>
+						<path d="M17980.2 2696.5 L17983.4 2706.7 L17972.9 2704.3 L17969.7 2694.0 Z"></path>
 					</g>
-					<path d="M17719.5 3901.4 L18076.25 4000 L18317.671641791047 4118.5 L18317.7 4118.5 " fill="none"></path>
+					<path d="M25392.8 1777.7 L25392.75 1936 L30663.25 2566.009455239417 L30663.3 2566.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17711.9 3893.8 L17719.5 3901.4 L17709.1 3904.1 L17701.5 3896.4 Z"></path>
+						<path d="M25398.1 1768.3 L25392.8 1777.7 L25387.4 1768.3 L25392.8 1759.0 Z"></path>
 					</g>
-					<path d="M17719.6 3897.6 L18116.25 4000 L15404.5 4126.887647315582 L15404.5 4126.9 " fill="none"></path>
+					<path d="M27671.2 1221.8 L25392.75 1459 L25392.75 1636 L25392.8 1636.0 " fill="none"></path>
+					<path d="M27671.8 1227.1 L27671.2 1221.8 L27670.7 1216.5 L27684.5 1220.4 Z"></path>
+					<path d="M22806.7 1794.5 L22660.75 1936 L30663.25 2584.97863700565 L30663.3 2585.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M17711.9 3890.1 L17719.6 3897.6 L17709.2 3900.4 L17701.5 3892.9 Z"></path>
+						<path d="M22817.1 1791.8 L22806.7 1794.5 L22809.7 1784.2 L22820.1 1781.5 Z"></path>
 					</g>
-					<path d="M41539.5 193.7 L41474.75 293 L41474.75 598.5 L41474.8 598.5 " fill="none"></path>
-					<path d="M41544.0 196.6 L41539.5 193.7 L41535.0 190.8 L41546.8 182.5 Z"></path>
-					<path d="M41614.0 193.7 L41678.75 293 L41678.75 598.5 L41678.8 598.5 " fill="none"></path>
-					<path d="M41618.5 190.8 L41614.0 193.7 L41609.5 196.6 L41606.7 182.5 Z"></path>
-					<path d="M18329.5 3911.2 L18247.25 4000 L15504.5 4132.550175818231 L15504.5 4132.6 " fill="none"></path>
+					<path d="M22956.1 1798.3 L23023.5 1936 L23023.5 2625 L23023.5 2625 L23023.5 3314 L23023.5 3314 L42831 3499.3025381856487 L42831.0 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18339.8 3908.0 L18329.5 3911.2 L18332.0 3900.7 L18342.2 3897.5 Z"></path>
+						<path d="M22956.8 1787.5 L22956.1 1798.3 L22947.2 1792.2 L22947.9 1781.5 Z"></path>
 					</g>
-					<path d="M60478.8 4214.2 L60478.75 4268 L65854.25 4451.378589720139 L65854.3 4451.4 " fill="none"></path>
+					<path d="M31039.1 2928.9 L30890 3314 L11713 3498.6560394454914 L11713.0 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60484.1 4204.8 L60478.8 4214.2 L60473.4 4204.8 L60478.8 4195.5 Z"></path>
+						<path d="M31047.4 2922.1 L31039.1 2928.9 L31037.5 2918.3 L31045.8 2911.5 Z"></path>
 					</g>
-					<path d="M18382.4 3910.7 L18369.25 4000 L60210.75 4133.147175815434 L60210.8 4133.1 " fill="none"></path>
-					<path d="M18387.7 3911.5 L18382.4 3910.7 L18377.1 3909.9 L18384.3 3897.5 Z"></path>
-					<path d="M18442.5 3908.0 L18514.25 4000 L40095 4133.579098100352 L40095.0 4133.6 " fill="none"></path>
-					<path d="M18446.7 3904.7 L18442.5 3908.0 L18438.3 3911.3 L18434.3 3897.5 Z"></path>
-					<path d="M21568.8 3529.3 L21568.75 3687 L21568.75 3805 L21568.8 3805.0 " fill="none"></path>
-					<path d="M21574.1 3529.3 L21568.8 3529.3 L21563.4 3529.3 L21568.8 3516.0 Z"></path>
-					<path d="M42019.3 165.3 L42019.25 293 L42019.25 583 L42019.3 583.0 " fill="none"></path>
-					<path d="M42024.6 165.3 L42019.3 165.3 L42013.9 165.3 L42019.3 152.0 Z"></path>
-					<path d="M42468.3 724.7 L42468.25 966 L42468.25 1197 L42468.3 1197.0 " fill="none"></path>
+					<path d="M31056.6 2929.2 L30930 3314 L50670.5 3499.967735010355 L50670.5 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42473.6 715.3 L42468.3 724.7 L42462.9 715.3 L42468.3 706.0 Z"></path>
+						<path d="M31064.6 2922.0 L31056.6 2929.2 L31054.5 2918.7 L31062.5 2911.5 Z"></path>
 					</g>
-					<path d="M42468.3 165.3 L42468.25 293 L42468.25 553 L42468.3 553.0 " fill="none"></path>
-					<path d="M42473.6 165.3 L42468.3 165.3 L42462.9 165.3 L42468.3 152.0 Z"></path>
-					<path d="M43431.5 160.8 L43282.5 293 L43282.5 575.5 L43282.5 575.5 " fill="none"></path>
-					<path d="M43435.1 164.8 L43431.5 160.8 L43428.0 156.9 L43441.5 152.0 Z"></path>
-					<path d="M43486.5 160.8 L43635.5 293 L43635.5 598.5 L43635.5 598.5 " fill="none"></path>
-					<path d="M43490.0 156.9 L43486.5 160.8 L43482.9 164.8 L43476.5 152.0 Z"></path>
-					<path d="M22700.3 1724.8 L22591 1936 L22591 2541 L22591.0 2541.0 " fill="none"></path>
-					<path d="M22705.1 1727.3 L22700.3 1724.8 L22695.6 1722.4 L22706.5 1713.0 Z"></path>
-					<path d="M33529.7 1703.9 L30085.75 1936 L29013.75435413643 2594 L29013.8 2594.0 " fill="none"></path>
-					<path d="M33530.1 1709.2 L33529.7 1703.9 L33529.3 1698.6 L33543.0 1703.0 Z"></path>
-					<path d="M11816.5 2690.2 L11816.5 3314 L14634.5 3489.4488399265565 L14634.5 3489.4 " fill="none"></path>
+					<path d="M31265.6 2929.1 L31403.5 3314 L59116.5 3500.1473591327367 L59116.5 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M11821.8 2680.8 L11816.5 2690.2 L11811.2 2680.8 L11816.5 2671.5 Z"></path>
+						<path d="M31267.5 2918.5 L31265.6 2929.1 L31257.5 2922.1 L31259.4 2911.5 Z"></path>
 					</g>
-					<path d="M13472.3 1714.0 L11816.5 1936 L11816.5 2578.5 L11816.5 2578.5 " fill="none"></path>
-					<path d="M13473.0 1719.2 L13472.3 1714.0 L13471.6 1708.7 L13485.5 1712.2 Z"></path>
-					<path d="M12571.3 2690.2 L12571.25 3314 L14634.5 3485.7264866674104 L14634.5 3485.7 " fill="none"></path>
+					<path d="M62038.3 1740.8 L61956.5 1936 L31650.25 2613.960251300741 L31650.3 2614.0 " fill="none"></path>
+					<path d="M62043.3 1742.9 L62038.3 1740.8 L62033.4 1738.7 L62043.5 1728.5 Z"></path>
+					<path d="M13338.8 1785.2 L13338.75 1936 L13338.75 2609.5 L13338.8 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M12576.6 2680.8 L12571.3 2690.2 L12565.9 2680.8 L12571.3 2671.5 Z"></path>
+						<path d="M13344.1 1775.8 L13338.8 1785.2 L13333.4 1775.8 L13338.8 1766.5 Z"></path>
 					</g>
-					<path d="M13472.5 1726.0 L12571.25 1936 L12571.25 2578.5 L12571.3 2578.5 " fill="none"></path>
-					<path d="M13473.7 1731.2 L13472.5 1726.0 L13471.3 1720.8 L13485.5 1723.0 Z"></path>
-					<path d="M13528.5 2690.2 L13528.5 3314 L14634.5 3474.7082197117256 L14634.5 3474.7 " fill="none"></path>
+					<path d="M15437.5 1223.1 L13338.75 1459 L13338.75 1628.5 L13338.8 1628.5 " fill="none"></path>
+					<path d="M15438.1 1228.4 L15437.5 1223.1 L15436.9 1217.8 L15450.8 1221.7 Z"></path>
+					<path d="M64620.1 2814.6 L64293.75 3314 L63068.5 3495.970236910213 L63068.5 3496.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M13533.8 2680.8 L13528.5 2690.2 L13523.2 2680.8 L13528.5 2671.5 Z"></path>
+						<path d="M64629.7 2809.7 L64620.1 2814.6 L64620.7 2803.9 L64630.3 2799.0 Z"></path>
 					</g>
-					<path d="M13582.8 1741.3 L13528.5 1936 L13528.5 2578.5 L13528.5 2578.5 " fill="none"></path>
-					<path d="M13587.9 1742.8 L13582.8 1741.3 L13577.6 1739.9 L13586.4 1728.5 Z"></path>
-					<path d="M18497.3 2705.2 L18497.25 3314 L14989.5 3491.5172308527235 L14989.5 3491.5 " fill="none"></path>
+					<path d="M64630.8 2815.0 L64333.75 3314 L57121 3499.318116066816 L57121.0 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18502.6 2695.8 L18497.3 2705.2 L18491.9 2695.8 L18497.3 2686.5 Z"></path>
+						<path d="M64640.2 2809.7 L64630.8 2815.0 L64631.0 2804.3 L64640.4 2799.0 Z"></path>
 					</g>
-					<path d="M13717.8 1703.5 L18497.25 1936 L18497.25 2563.5 L18497.3 2563.5 " fill="none"></path>
-					<path d="M13718.1 1698.1 L13717.8 1703.5 L13717.6 1708.8 L13704.5 1702.8 Z"></path>
-					<path d="M29431.8 2694.1 L28149.5 3314 L21499.75 3499.509648105905 L21499.8 3499.5 " fill="none"></path>
+					<path d="M64954.1 2438.6 L65520.5 1936 L65403.85849056604 1804 L65403.9 1804.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29442.5 2694.9 L29431.8 2694.1 L29437.8 2685.3 L29448.6 2686.0 Z"></path>
+						<path d="M64943.5 2440.8 L64954.1 2438.6 L64950.6 2448.8 L64940.1 2451.0 Z"></path>
 					</g>
-					<path d="M29435.4 2694.3 L28189.5 3314 L14989.5 3498.025415810129 L14989.5 3498.0 " fill="none"></path>
+					<path d="M64716.1 2817.5 L64644 3314 L64644 3500.5 L64644 3500.5 L64644 3687 L64644 3687 L64644 3843.5 L64644 3843.5 L64644 4000 L64644 4000 L62889 4130.360310421286 L62889.0 4130.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29446.1 2694.9 L29435.4 2694.3 L29441.4 2685.4 L29452.1 2686.0 Z"></path>
+						<path d="M64722.7 2809.0 L64716.1 2817.5 L64712.1 2807.5 L64718.7 2799.0 Z"></path>
 					</g>
-					<path d="M29591.4 2704.3 L29719.75 3314 L13203.75 3499.9090442707547 L13203.8 3499.9 " fill="none"></path>
+					<path d="M64786.1 2817.2 L64894.75 3314 L64894.75 3500.5 L64894.75 3500.5 L64894.75 3687 L64894.75 3687 L64314.25 3813.0031206657422 L64314.3 3813.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29594.7 2694.0 L29591.4 2704.3 L29584.3 2696.2 L29587.6 2686.0 Z"></path>
+						<path d="M64789.3 2807.0 L64786.1 2817.2 L64778.9 2809.3 L64782.1 2799.0 Z"></path>
 					</g>
-					<path d="M29904.8 2697.2 L29904.75 3314 L59258.25 3500.14171200272 L59258.3 3500.1 " fill="none"></path>
+					<path d="M64813.7 2816.5 L64994.75 3314 L59221.5 3498.8193151096425 L59221.5 3498.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29910.1 2687.8 L29904.8 2697.2 L29899.4 2687.8 L29904.8 2678.5 Z"></path>
+						<path d="M64815.5 2805.9 L64813.7 2816.5 L64805.5 2809.6 L64807.3 2799.0 Z"></path>
 					</g>
-					<path d="M30321.8 2703.9 L30144.75 3314 L30144.75 3485 L30144.8 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M30329.6 2696.5 L30321.8 2703.9 L30319.3 2693.5 L30327.0 2686.0 Z"></path>
+					<path d="M68601.9 706.4 L70118.75 966 L70118.75 1212.5 L70118.75 1212.5 L70118.75 1459 L70118.75 1459 L70118.75 1697.5 L70118.75 1697.5 L70118.75 1936 L70118.75 1936 L65174 2569.877436159821 L65174.0 2569.9 " fill="none"></path>
+					<path d="M68602.8 701.1 L68601.9 706.4 L68601.0 711.6 L68588.8 704.1 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M64662.0 1264.3 L64644 1459 L64644 1697.5 L64644 1697.5 L64644 1936 L64644 1936 L64718.74600870827 2451 L64718.7 2451.0 " fill="none"></path>
 					</g>
-					<path d="M30361.5 2704.3 L30490.5 3314 L59258.25 3500.1344310779987 L59258.3 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M30364.8 2694.0 L30361.5 2704.3 L30354.4 2696.2 L30357.7 2686.0 Z"></path>
+					<path d="M64667.3 1264.8 L64662.0 1264.3 L64656.7 1263.8 L64663.2 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M48794.2 1215.2 L38764 1459 L38764 1697.5 L38764 1697.5 L38764 1936 L38764 1936 L64314 2613.5962278675906 L64314.0 2613.6 " fill="none"></path>
 					</g>
-					<path d="M43527.9 2893.9 L43052.75 3314 L43052.75 3500.5 L43052.75 3500.5 L43052.75 3687 L43052.75 3687 L43052.75 3843.5 L43052.75 3843.5 L43052.75 4000 L43052.75 4000 L72971.75 4133.342623850464 L72971.8 4133.3 " fill="none"></path>
+					<path d="M48794.3 1220.5 L48794.2 1215.2 L48794.0 1209.8 L48807.5 1214.8 Z"></path>
+					<path d="M65278.4 1822.1 L65249.75 1936 L65249.75 2625 L65249.75 2625 L65249.75 3314 L65249.75 3314 L65249.75 3500.5 L65249.75 3500.5 L65249.75 3687 L65249.75 3687 L64314.25 3823.0648234200744 L64314.3 3823.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43538.4 2891.7 L43527.9 2893.9 L43531.4 2883.7 L43541.9 2881.5 Z"></path>
+						<path d="M65285.9 1814.4 L65278.4 1822.1 L65275.5 1811.8 L65283.0 1804.0 Z"></path>
 					</g>
-					<path d="M43543.1 2894.2 L43092.75 3314 L60183.25 3498.3694036325774 L60183.3 3498.4 " fill="none"></path>
+					<path d="M65299.3 1822.6 L65289.75 1936 L64881.823657474604 2451 L64881.8 2451.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43553.6 2891.8 L43543.1 2894.2 L43546.3 2884.0 L43556.8 2881.5 Z"></path>
+						<path d="M65305.4 1813.7 L65299.3 1822.6 L65294.7 1812.9 L65300.8 1804.0 Z"></path>
 					</g>
-					<path d="M43558.4 2894.6 L43132.75 3314 L64028.25 3500.09033498078 L64028.3 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43568.8 2891.8 L43558.4 2894.6 L43561.3 2884.3 L43571.7 2881.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M64670.4 1264.3 L64684 1459 L65030.32704402516 1591 L65030.3 1591.0 " fill="none"></path>
 					</g>
-					<path d="M43635.8 2896.6 L43334.25 3314 L59258.25 3499.8406182534964 L59258.3 3499.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43645.6 2892.2 L43635.8 2896.6 L43636.9 2885.9 L43646.7 2881.5 Z"></path>
+					<path d="M64675.7 1263.9 L64670.4 1264.3 L64665.1 1264.7 L64669.4 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M75714.0 1264.0 L75666.5 1459 L65731.25 1687.7935042363677 L65731.3 1687.8 " fill="none"></path>
 					</g>
-					<path d="M43651.3 2897.0 L43374.25 3314 L61341.25 3499.9566303171564 L61341.3 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43660.9 2892.2 L43651.3 2897.0 L43652.0 2886.3 L43661.6 2881.5 Z"></path>
+					<path d="M75719.2 1265.2 L75714.0 1264.0 L75708.8 1262.7 L75717.1 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M48794.2 1217.8 L43756 1459 L64888.25 1692.8359508206229 L64888.3 1692.8 " fill="none"></path>
 					</g>
-					<path d="M43916.6 2899.3 L44044.5 3314 L14989.5 3499.36757034123 L14989.5 3499.4 " fill="none"></path>
+					<path d="M48794.4 1223.1 L48794.2 1217.8 L48793.9 1212.4 L48807.5 1217.1 Z"></path>
+					<path d="M19325.1 2706.7 L18674.25 3314 L10658 3497.0631064989134 L10658.0 3497.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M43919.0 2888.8 L43916.6 2899.3 L43908.8 2892.0 L43911.1 2881.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M47006.2 141.6 L43832 293 L43832 629.5 L43832 629.5 L43832 966 L43832 966 L43832 1212.5 L43832 1212.5 L43832 1459 L43832 1459 L43832 1697.5 L43832 1697.5 L43832 1936 L43832 1936 L43832 2368.5 L43832.0 2368.5 " fill="none"></path>
+						<path d="M19335.6 2704.3 L19325.1 2706.7 L19328.3 2696.5 L19338.8 2694.0 Z"></path>
 					</g>
-					<path d="M47006.4 146.9 L47006.2 141.6 L47005.9 136.3 L47019.5 141.0 Z"></path>
-					<path d="M15006.8 3422.1 L15019.5 3417 L15027 3417 L15027 3417 L15034.5 3500.5 L15034.5 3500.5 L15027 3584 L15027 3584 L15019.5 3584 L15019.5 3584 L14989.5 3571.9277108433735 L14989.5 3571.9 " fill="none"></path>
+					<path d="M19429.9 2712.3 L19548 3314 L32575.5 3498.461052271951 L32575.5 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14996.2 3420.6 L15006.8 3422.1 L15000.1 3430.5 L14989.5 3429.1 Z"></path>
+						<path d="M19433.3 2702.1 L19429.9 2712.3 L19422.9 2704.2 L19426.3 2694.0 Z"></path>
 					</g>
+					<path d="M54581.3 2666.3 L54053.25 3314 L54053.25 3462 L54053.3 3462.0 " fill="none"></path>
+					<path d="M54585.4 2669.7 L54581.3 2666.3 L54577.2 2663.0 L54589.7 2656.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3114.1 2653.2 L3321.5 3314 L14634.5 3497.6190331143116 L14634.5 3497.6 " fill="none"></path>
+						<path d="M21832.1 1725.1 L21190 1936 L21190 2563.5 L21190.0 2563.5 " fill="none"></path>
 					</g>
-					<path d="M3119.2 2651.6 L3114.1 2653.2 L3109.0 2654.8 L3110.1 2640.5 Z"></path>
-					<path d="M1236.8 3450.9 L1249 3447 L1256.5 3447 L1256.5 3447 L1264 3500.5 L1264 3500.5 L1256.5 3554 L1256.5 3554 L1249 3554 L1249 3554 L1219 3544.5309734513276 L1219.0 3544.5 " fill="none"></path>
+					<path d="M21833.7 1730.2 L21832.1 1725.1 L21830.4 1720.1 L21844.8 1721.0 Z"></path>
+					<path d="M10675.9 3450.6 L10688 3447 L10695.5 3447 L10695.5 3447 L10703 3500.5 L10703 3500.5 L10695.5 3554 L10695.5 3554 L10688 3554 L10688 3554 L10658 3545.1080332409974 L10658.0 3545.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M1226.3 3448.6 L1236.8 3450.9 L1229.5 3458.7 L1219.0 3456.5 Z"></path>
+						<path d="M10665.4 3448.1 L10675.9 3450.6 L10668.5 3458.4 L10658.0 3455.9 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3115.7 2653.0 L3361.5 3314 L1219 3489.0991454864156 L1219.0 3489.1 " fill="none"></path>
+						<path d="M4126.9 2650.7 L4685.75 3314 L10357 3495.6787263279944 L10357.0 3495.7 " fill="none"></path>
 					</g>
-					<path d="M3120.7 2651.1 L3115.7 2653.0 L3110.7 2654.9 L3111.0 2640.5 Z"></path>
-					<path d="M31074.8 2833.8 L30530.5 3314 L24068.25 3498.5297033492825 L24068.3 3498.5 " fill="none"></path>
+					<path d="M4131.0 2647.3 L4126.9 2650.7 L4122.8 2654.1 L4118.3 2640.5 Z"></path>
+					<path d="M54603.7 2668.9 L54437.75 3314 L54437.75 3469.5 L54437.8 3469.5 " fill="none"></path>
+					<path d="M54608.9 2670.2 L54603.7 2668.9 L54598.5 2667.6 L54607.0 2656.0 Z"></path>
+					<path d="M73048.3 1911.1 L73037.5 1936 L73037.5 2625 L73037.5 2625 L73037.5 3314 L73037.5 3314 L73037.5 3500.5 L73037.5 3500.5 L73037.5 3687 L73037.5 3687 L59097.75 3842.684706784892 L59097.8 3842.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31085.3 2831.7 L31074.8 2833.8 L31078.2 2823.7 L31088.8 2821.5 Z"></path>
+						<path d="M73056.9 1904.7 L73048.3 1911.1 L73047.1 1900.4 L73055.7 1894.0 Z"></path>
 					</g>
-					<path d="M31086.5 2834.2 L30570.5 3314 L25656 3497.807129248972 L25656.0 3497.8 " fill="none"></path>
+					<path d="M73141.0 1912.7 L73141 1936 L73141 2625 L73141 2625 L73141 3314 L73141 3314 L50783.5 3500.0298808780226 L50783.5 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31097.0 2831.8 L31086.5 2834.2 L31089.7 2823.9 L31100.2 2821.5 Z"></path>
+						<path d="M73146.3 1903.3 L73141.0 1912.7 L73135.7 1903.3 L73141.0 1894.0 Z"></path>
 					</g>
-					<path d="M31098.3 2834.6 L30610.5 3314 L30610.5 3485 L30610.5 3485.0 " fill="none"></path>
+					<path d="M23980.8 1747.2 L23980.75 1936 L60526.5 2617.0334971905363 L60526.5 2617.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31108.7 2831.8 L31098.3 2834.6 L31101.2 2824.2 L31111.6 2821.5 Z"></path>
+						<path d="M23986.1 1737.8 L23980.8 1747.2 L23975.4 1737.8 L23980.8 1728.5 Z"></path>
 					</g>
-					<path d="M31165.3 2836.9 L30836 3314 L30836 3500.5 L30836 3500.5 L30836 3687 L30836 3687 L30836 3843.5 L30836 3843.5 L30836 4000 L30836 4000 L18421.25 4133.227340981441 L18421.3 4133.2 " fill="none"></path>
+					<path d="M26682.3 1762.7 L26682.25 1936 L38517.5 2618.2839542326437 L38517.5 2618.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31175.0 2832.2 L31165.3 2836.9 L31166.2 2826.2 L31175.9 2821.5 Z"></path>
+						<path d="M26687.6 1753.3 L26682.3 1762.7 L26676.9 1753.3 L26682.3 1744.0 Z"></path>
 					</g>
-					<path d="M31201.1 2838.1 L30954.5 3314 L30954.5 3485 L30954.5 3485.0 " fill="none"></path>
+					<path d="M27679.7 1231.0 L26682.25 1459 L26682.25 1651 L26682.3 1651.0 " fill="none"></path>
+					<path d="M27680.9 1236.2 L27679.7 1231.0 L27678.5 1225.8 L27692.7 1228.0 Z"></path>
+					<path d="M73141.0 1285.2 L73141 1459 L73141 1501 L73141.0 1501.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31210.1 2832.2 L31201.1 2838.1 L31200.7 2827.3 L31209.7 2821.5 Z"></path>
+						<path d="M73146.3 1275.8 L73141.0 1285.2 L73135.7 1275.8 L73141.0 1266.5 Z"></path>
 					</g>
-					<path d="M31313.8 2840.2 L31319 3314 L25783 3499.045971861278 L25783.0 3499.0 " fill="none"></path>
+					<path d="M73296.8 175.5 L73141 293 L73141 629.5 L73141 629.5 L73141 966 L73141 966 L73141 1158.5 L73141.0 1158.5 " fill="none"></path>
+					<path d="M73300.0 179.8 L73296.8 175.5 L73293.5 171.3 L73307.4 167.5 Z"></path>
+					<path d="M21596.0 2712.7 L21596 3314 L21651.59651474531 3401.5 L21651.6 3401.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31319.1 2830.8 L31313.8 2840.2 L31308.4 2830.9 L31313.6 2821.5 Z"></path>
+						<path d="M21601.3 2703.3 L21596.0 2712.7 L21590.7 2703.3 L21596.0 2694.0 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M21863.9 1736.5 L21596 1936 L21596 2556 L21596.0 2556.0 " fill="none"></path>
 					</g>
-					<path d="M31426.5 2837.9 L31683.5 3314 L31683.5 3485 L31683.5 3485.0 " fill="none"></path>
+					<path d="M21867.1 1740.7 L21863.9 1736.5 L21860.7 1732.2 L21874.6 1728.5 Z"></path>
+					<path d="M59791.2 2778.0 L59506.5 3314 L50783.5 3499.29978928185 L50783.5 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31426.7 2827.2 L31426.5 2837.9 L31417.3 2832.2 L31417.6 2821.5 Z"></path>
+						<path d="M59800.3 2772.2 L59791.2 2778.0 L59790.9 2767.2 L59800.0 2761.5 Z"></path>
 					</g>
-					<path d="M31573.4 2747.5 L32784.75 3314 L21499.75 3499.9151539242966 L21499.8 3499.9 " fill="none"></path>
+					<path d="M59978.4 2776.8 L60353.25 3314 L59221.5 3492.2321089297025 L59221.5 3492.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31567.2 2738.7 L31573.4 2747.5 L31562.7 2748.4 L31556.5 2739.6 Z"></path>
+						<path d="M59977.5 2766.1 L59978.4 2776.8 L59968.7 2772.2 L59967.7 2761.5 Z"></path>
 					</g>
-					<path d="M31573.5 2744.3 L32824.75 3314 L13203.75 3500.0023127557374 L13203.8 3500.0 " fill="none"></path>
+					<path d="M62045.4 1741.4 L61996.5 1936 L60220.5 2512.1129943502824 L60220.5 2512.1 " fill="none"></path>
+					<path d="M62050.6 1742.7 L62045.4 1741.4 L62040.3 1740.1 L62048.7 1728.5 Z"></path>
+					<path d="M73597.9 1857.1 L73494.25 1936 L60220.5 2607.397856369409 L60220.5 2607.4 " fill="none"></path>
+					<path d="M73601.1 1861.3 L73597.9 1857.1 L73594.7 1852.8 L73608.5 1849.0 Z"></path>
+					<path d="M14027.8 1789.9 L13847.25 1936 L13847.25 2541 L13847.3 2541.0 " fill="none"></path>
+					<path d="M14031.2 1794.0 L14027.8 1789.9 L14024.5 1785.7 L14038.2 1781.5 Z"></path>
+					<path d="M15437.5 1225.4 L13726.75 1459 L13726.75 1598.5 L13726.8 1598.5 " fill="none"></path>
+					<path d="M15438.3 1230.7 L15437.5 1225.4 L15436.8 1220.1 L15450.8 1223.6 Z"></path>
+					<path d="M21714.5 3618.2 L21714.5 3687 L58951.75 3843.1937972809083 L58951.8 3843.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31567.2 2735.6 L31573.5 2744.3 L31562.8 2745.3 L31556.5 2736.6 Z"></path>
+						<path d="M21719.8 3608.8 L21714.5 3618.2 L21709.2 3608.8 L21714.5 3599.5 Z"></path>
 					</g>
-					<path d="M68285.7 645.3 L59173.75 966 L59173.75 1212.5 L59173.75 1212.5 L59173.75 1459 L59173.75 1459 L59173.75 1666.5 L59173.8 1666.5 " fill="none"></path>
-					<path d="M68285.9 650.6 L68285.7 645.3 L68285.5 640.0 L68299.0 644.8 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M75443.2 139.8 L72668.75 293 L72668.75 614 L72668.8 614.0 " fill="none"></path>
+						<path d="M21901.0 1741.1 L21833 1936 L21833 2625 L21833 2625 L21833 3314 L21833 3314 L21777.40348525469 3401.5 L21777.4 3401.5 " fill="none"></path>
 					</g>
-					<path d="M75443.5 145.2 L75443.2 139.8 L75442.9 134.5 L75456.5 139.1 Z"></path>
-					<path d="M65858.3 3998.7 L65858.25 4000 L61787 4132.406407378193 L61787.0 4132.4 " fill="none"></path>
+					<path d="M21906.1 1742.8 L21901.0 1741.1 L21896.0 1739.3 L21905.4 1728.5 Z"></path>
+					<path d="M67409.6 2831.5 L67234.75 3314 L63068.5 3499.1446059450764 L63068.5 3499.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65863.6 3989.3 L65858.3 3998.7 L65852.9 3989.3 L65858.3 3980.0 Z"></path>
+						<path d="M67417.8 2824.6 L67409.6 2831.5 L67407.8 2821.0 L67416.0 2814.0 Z"></path>
 					</g>
-					<path d="M59089.7 3869.4 L57954.25 4000 L60210.75 4119.7746088334325 L60210.8 4119.8 " fill="none"></path>
+					<path d="M67421.5 2831.9 L67274.75 3314 L57121 3499.6589009534546 L57121.0 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59099.6 3873.6 L59089.7 3869.4 L59098.4 3863.0 L59108.3 3867.3 Z"></path>
+						<path d="M67429.3 2824.5 L67421.5 2831.9 L67419.1 2821.4 L67427.0 2814.0 Z"></path>
 					</g>
-					<path d="M59314.8 3946.2 L59314.75 4000 L60887 4127.357714976575 L60887.0 4127.4 " fill="none"></path>
+					<path d="M67484.5 2832.7 L67484.5 3314 L67484.5 3500.5 L67484.5 3500.5 L67484.5 3687 L67484.5 3687 L67484.5 3843.5 L67484.5 3843.5 L67484.5 4000 L67484.5 4000 L62889 4132.586284853052 L62889.0 4132.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59320.1 3936.8 L59314.8 3946.2 L59309.4 3936.8 L59314.8 3927.5 Z"></path>
+						<path d="M67489.8 2823.3 L67484.5 2832.7 L67479.2 2823.3 L67484.5 2814.0 Z"></path>
 					</g>
-					<path d="M59460.5 3937.6 L59557 4000 L61384.25 4125.388042504161 L61384.3 4125.4 " fill="none"></path>
+					<path d="M67616.0 2829.7 L67927.25 3314 L67927.25 3500.5 L67927.25 3500.5 L67927.25 3687 L67927.25 3687 L64314.25 3837.6419341947517 L64314.3 3837.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59455.5 3928.1 L59460.5 3937.6 L59449.7 3937.0 L59444.8 3927.5 Z"></path>
+						<path d="M67615.5 2819.0 L67616.0 2829.7 L67606.5 2824.7 L67606.0 2814.0 Z"></path>
 					</g>
-					<path d="M59314.8 3529.3 L59314.75 3687 L59314.75 3759.5 L59314.8 3759.5 " fill="none"></path>
-					<path d="M59320.1 3529.3 L59314.8 3529.3 L59309.4 3529.3 L59314.8 3516.0 Z"></path>
-					<path d="M33108.5 2712.7 L33108.5 3314 L24068.25 3499.0873150918023 L24068.3 3499.1 " fill="none"></path>
+					<path d="M67627.6 2829.3 L67967.25 3314 L59221.5 3499.3871366464923 L59221.5 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M33113.8 2703.3 L33108.5 2712.7 L33103.2 2703.3 L33108.5 2694.0 Z"></path>
+						<path d="M67626.6 2818.6 L67627.6 2829.3 L67617.9 2824.7 L67616.9 2814.0 Z"></path>
+					</g>
+					<path d="M68601.9 694.9 L70463.75 966 L70463.75 1212.5 L70463.75 1212.5 L70463.75 1459 L70463.75 1459 L70463.75 1697.5 L70463.75 1697.5 L70463.75 1936 L70463.75 1936 L67904 2527.983804648821 L67904.0 2528.0 " fill="none"></path>
+					<path d="M68602.7 689.6 L68601.9 694.9 L68601.2 700.2 L68588.8 693.0 Z"></path>
+					<path d="M73409.7 1902.1 L73454.25 1936 L67904 2576.5833158842497 L67904.0 2576.6 " fill="none"></path>
+					<path d="M73412.9 1897.8 L73409.7 1902.1 L73406.5 1906.3 L73399.1 1894.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M64678.7 1264.0 L64724 1459 L64724 1697.5 L64724 1697.5 L64724 1936 L64724 1936 L67065 2520.2959608766528 L67065.0 2520.3 " fill="none"></path>
 					</g>
+					<path d="M64683.9 1262.8 L64678.7 1264.0 L64673.5 1265.2 L64675.7 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M75443.3 145.5 L74452.25 293 L74452.25 614 L74452.3 614.0 " fill="none"></path>
+						<path d="M75722.3 1264.3 L75706.5 1459 L75706.5 1697.5 L75706.5 1697.5 L75706.5 1936 L75706.5 1936 L67904 2589.8460836779373 L67904.0 2589.8 " fill="none"></path>
 					</g>
-					<path d="M75444.1 150.7 L75443.3 145.5 L75442.5 140.2 L75456.5 143.5 Z"></path>
+					<path d="M75727.6 1264.7 L75722.3 1264.3 L75717.0 1263.9 L75723.4 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M75443.4 147.9 L74677.75 293 L74677.75 598.5 L74677.8 598.5 " fill="none"></path>
+						<path d="M48904.0 1256.8 L48904 1459 L48904 1697.5 L48904 1697.5 L48904 1936 L48904 1936 L67065 2609.4441484351873 L67065.0 2609.4 " fill="none"></path>
 					</g>
-					<path d="M75444.4 153.1 L75443.4 147.9 L75442.4 142.7 L75456.5 145.4 Z"></path>
-					<path d="M47000.9 142.7 L44297 293 L44297 629.5 L44297 629.5 L44297 966 L44297 966 L44297 1212.5 L44297 1212.5 L44297 1459 L44297 1459 L44297 1697.5 L44297 1697.5 L44297 1936 L44297 1936 L44297 2625 L44297 2625 L44297 3314 L44297 3314 L61341.25 3499.9273034348635 L61341.3 3499.9 " fill="none"></path>
+					<path d="M48909.3 1256.8 L48904.0 1256.8 L48898.7 1256.8 L48904.0 1243.5 Z"></path>
+					<path d="M25878.8 1747.2 L25878.75 1936 L59524.5 2617.946585769443 L59524.5 2617.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47010.5 147.5 L47000.9 142.7 L47009.9 136.9 L47019.5 141.7 Z"></path>
+						<path d="M25884.1 1737.8 L25878.8 1747.2 L25873.4 1737.8 L25878.8 1728.5 Z"></path>
 					</g>
-					<path d="M22736.4 1723.1 L22918 1936 L22918 2571.5 L22918.0 2571.5 " fill="none"></path>
-					<path d="M22740.4 1719.7 L22736.4 1723.1 L22732.3 1726.6 L22727.7 1713.0 Z"></path>
-					<path d="M68280.3 646.0 L59446.5 966 L59446.5 1212.5 L59446.5 1212.5 L59446.5 1459 L59446.5 1459 L59446.5 1697.5 L59446.5 1697.5 L59446.5 1936 L59446.5 1936 L59446.5 2625 L59446.5 2625 L59446.5 3314 L59446.5 3314 L25422 3499.7303200597094 L25422.0 3499.7 " fill="none"></path>
+					<path d="M60751.8 2873.5 L60393.25 3314 L63007.5 3498.349229605823 L63007.5 3498.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68289.9 651.0 L68280.3 646.0 L68289.5 640.3 L68299.0 645.3 Z"></path>
+						<path d="M60761.8 2869.6 L60751.8 2873.5 L60753.5 2862.9 L60763.6 2859.0 Z"></path>
 					</g>
-					<path d="M68280.3 647.6 L60273.25 966 L60273.25 1197 L60273.3 1197.0 " fill="none"></path>
+					<path d="M60765.9 2873.9 L60433.25 3314 L50783.5 3499.4143850611717 L50783.5 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68289.9 652.5 L68280.3 647.6 L68289.5 641.9 L68299.0 646.8 Z"></path>
+						<path d="M60775.8 2869.7 L60765.9 2873.9 L60767.3 2863.2 L60777.1 2859.0 Z"></path>
 					</g>
-					<path d="M68281.1 762.4 L67586 966 L67586 1174 L67586.0 1174.0 " fill="none"></path>
+					<path d="M60925.0 2877.5 L60875 3314 L60875 3500.5 L60875 3500.5 L60875 3687 L60875 3687 L60875 3843.5 L60875 3843.5 L60875 4000 L60875 4000 L62791 4130.658524173028 L62791.0 4130.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68291.5 764.9 L68281.1 762.4 L68288.5 754.7 L68299.0 757.2 Z"></path>
+						<path d="M60931.4 2868.9 L60925.0 2877.5 L60920.8 2867.7 L60927.2 2859.0 Z"></path>
 					</g>
-					<path d="M68283.4 925.2 L68221 966 L68221 1212.5 L68221 1212.5 L68221 1459 L68221 1459 L68221 1697.5 L68221 1697.5 L68221 1936 L68221 1936 L68221 2625 L68221 2625 L68221 3314 L68221 3314 L68221 3500.5 L68221 3500.5 L68221 3687 L68221 3687 L68221 3843.5 L68221 3843.5 L68221 4000 L68221 4000 L60746.75 4129.361555103491 L60746.8 4129.4 " fill="none"></path>
+					<path d="M61003.3 2877.3 L61088.75 3314 L61088.75 3500.5 L61088.75 3500.5 L61088.75 3687 L61088.75 3687 L64033.25 3836.372528363047 L64033.3 3836.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68294.1 924.5 L68283.4 925.2 L68288.3 915.6 L68299.0 914.9 Z"></path>
+						<path d="M61006.8 2867.1 L61003.3 2877.3 L60996.3 2869.2 L60999.8 2859.0 Z"></path>
 					</g>
-					<path d="M69130.3 957.9 L69140 966 L69140 1212.5 L69140 1212.5 L69140 1459 L69140 1459 L69140 1697.5 L69140 1697.5 L69140 1936 L69140 1936 L69140 2625 L69140 2625 L69140 3314 L69140 3314 L69140 3500.5 L69140 3500.5 L69140 3687 L69140 3687 L69140 3843.5 L69140 3843.5 L69140 4000 L69140 4000 L69140 4134 L69140 4134 L69140 4268 L69140 4268 L66037.25 4449.157666118807 L66037.3 4449.2 " fill="none"></path>
+					<path d="M61032.1 2876.8 L61167.75 3314 L59221.5 3495.6013133208257 L59221.5 3495.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69126.5 947.9 L69130.3 957.9 L69119.7 956.1 L69115.9 946.0 Z"></path>
+						<path d="M61034.5 2866.3 L61032.1 2876.8 L61024.3 2869.5 L61026.6 2859.0 Z"></path>
 					</g>
+					<path d="M62069.9 1741.2 L62129.5 1936 L61353.22641509434 2391 L61353.2 2391.0 " fill="none"></path>
+					<path d="M62075.0 1739.7 L62069.9 1741.2 L62064.8 1742.8 L62066.0 1728.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M47219.8 137.3 L68735 293 L68735 313 L68735.0 313.0 " fill="none"></path>
+						<path d="M64686.8 1263.4 L64764 1459 L64764 1697.5 L64764 1697.5 L64764 1936 L64764 1936 L61381.5 2547.6909448818897 L61381.5 2547.7 " fill="none"></path>
 					</g>
-					<path d="M47219.9 131.9 L47219.8 137.3 L47219.8 142.6 L47206.5 137.2 Z"></path>
-					<path d="M25439.6 3443.9 L25452 3439.5 L25459.5 3439.5 L25459.5 3439.5 L25467 3500.5 L25467 3500.5 L25459.5 3561.5 L25459.5 3561.5 L25452 3561.5 L25452 3561.5 L25422 3550.7982456140353 L25422.0 3550.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25429.0 3442.0 L25439.6 3443.9 L25432.6 3452.1 L25422.0 3450.2 Z"></path>
+					<path d="M64691.8 1261.4 L64686.8 1263.4 L64681.9 1265.4 L64681.9 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M75730.7 1264.3 L75746.5 1459 L75746.5 1697.5 L75746.5 1697.5 L75746.5 1936 L75746.5 1936 L61381.5 2605.0880513773873 L61381.5 2605.1 " fill="none"></path>
 					</g>
+					<path d="M75736.0 1263.9 L75730.7 1264.3 L75725.4 1264.7 L75729.6 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3117.2 2652.7 L3401.5 3314 L25140 3499.2981215292853 L25140.0 3499.3 " fill="none"></path>
+						<path d="M48911.2 1256.7 L48944 1459 L48944 1697.5 L48944 1697.5 L48944 1936 L48944 1936 L60526.5 2600.47481265612 L60526.5 2600.5 " fill="none"></path>
 					</g>
-					<path d="M3122.1 2650.6 L3117.2 2652.7 L3112.3 2654.9 L3111.9 2640.5 Z"></path>
-					<path d="M75333.4 1295.6 L74657.25 1459 L81834 1693.176540000684 L81834.0 1693.2 " fill="none"></path>
+					<path d="M48916.4 1255.8 L48911.2 1256.7 L48905.9 1257.5 L48909.0 1243.5 Z"></path>
+					<path d="M53748.9 1721.1 L54615 1936 L54615 2594 L54615.0 2594.0 " fill="none"></path>
+					<path d="M53750.2 1715.9 L53748.9 1721.1 L53747.7 1726.2 L53736.0 1717.9 Z"></path>
+					<path d="M54632.0 2668.4 L54884.25 3314 L54884.25 3469.5 L54884.3 3469.5 " fill="none"></path>
+					<path d="M54636.9 2666.5 L54632.0 2668.4 L54627.0 2670.4 L54627.1 2656.0 Z"></path>
+					<path d="M22080.0 2727.7 L22080 3314 L22128.009383378016 3386.5 L22128.0 3386.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M75343.7 1298.6 L75333.4 1295.6 L75341.2 1288.2 L75351.5 1291.2 Z"></path>
+						<path d="M22085.3 2718.3 L22080.0 2727.7 L22074.7 2718.3 L22080.0 2709.0 Z"></path>
 					</g>
-					<path d="M76021.1 1241.6 L78596 1459 L78596 1697.5 L78596 1697.5 L78596 1936 L78596 1936 L78596 2625 L78596 2625 L78596 3314 L78596 3314 L72068.25 3498.102737136592 L72068.3 3498.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M76012.2 1235.5 L76021.1 1241.6 L76011.4 1246.1 L76002.5 1240.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M21945.1 1739.5 L22080 1936 L22080 2541 L22080.0 2541.0 " fill="none"></path>
 					</g>
-					<path d="M73025.2 725.8 L72404 966 L75351.5 1187.9855637030248 L75351.5 1188.0 " fill="none"></path>
-					<path d="M73027.1 730.8 L73025.2 725.8 L73023.3 720.8 L73037.6 721.0 Z"></path>
+					<path d="M21949.5 1736.5 L21945.1 1739.5 L21940.7 1742.5 L21937.5 1728.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M83594.1 172.3 L83282 293 L83282 629.5 L83282 629.5 L83282 966 L83282 966 L76002.5 1201.9496055226825 L76002.5 1201.9 " fill="none"></path>
+						<path d="M21981.2 1735.2 L22327 1936 L22327 2625 L22327 2625 L22327 3314 L22327 3314 L22278.990616621984 3386.5 L22279.0 3386.5 " fill="none"></path>
 					</g>
-					<path d="M83596.1 177.3 L83594.1 172.3 L83592.2 167.3 L83606.6 167.5 Z"></path>
-					<path d="M33529.7 1704.5 L30370.75 1936 L29335.41074020319 2571.5 L29335.4 2571.5 " fill="none"></path>
-					<path d="M33530.1 1709.8 L33529.7 1704.5 L33529.3 1699.2 L33543.0 1703.5 Z"></path>
-					<path d="M81116.0 702.2 L81116 966 L73557.5 1202.083407247846 L73557.5 1202.1 " fill="none"></path>
+					<path d="M21983.8 1730.6 L21981.2 1735.2 L21978.5 1739.8 L21969.6 1728.5 Z"></path>
+					<path d="M69390.9 2884.5 L69270 3314 L63068.5 3499.5872512836972 L63068.5 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81121.3 692.8 L81116.0 702.2 L81110.7 692.8 L81116.0 683.5 Z"></path>
+						<path d="M69398.6 2876.9 L69390.9 2884.5 L69388.3 2874.0 L69396.0 2866.5 Z"></path>
 					</g>
-					<path d="M82061.8 152.7 L81116 293 L81116 575.5 L81116.0 575.5 " fill="none"></path>
-					<path d="M82062.6 158.0 L82061.8 152.7 L82061.0 147.4 L82075.0 150.7 Z"></path>
-					<path d="M78384.3 203.8 L77985.25 293 L77985.25 614 L77985.3 614.0 " fill="none"></path>
+					<path d="M69464.0 2885.2 L69464 3314 L50783.5 3499.937623418904 L50783.5 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M78394.6 207.0 L78384.3 203.8 L78392.2 196.6 L78402.5 199.7 Z"></path>
+						<path d="M69469.3 2875.8 L69464.0 2885.2 L69458.7 2875.8 L69464.0 2866.5 Z"></path>
 					</g>
-					<path d="M78470.2 235.8 L78346.25 293 L78346.25 614 L78346.3 614.0 " fill="none"></path>
+					<path d="M69537.1 2884.5 L69658 3314 L59221.5 3499.5665220707406 L59221.5 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M78480.9 236.8 L78470.2 235.8 L78476.4 227.1 L78487.2 228.0 Z"></path>
+						<path d="M69539.7 2874.0 L69537.1 2884.5 L69529.4 2876.9 L69532.0 2866.5 Z"></path>
 					</g>
-					<path d="M78710.9 246.2 L78721.75 293 L78721.75 614 L78721.8 614.0 " fill="none"></path>
+					<path d="M68601.9 693.8 L70503.75 966 L70503.75 1212.5 L70503.75 1212.5 L70503.75 1459 L70503.75 1459 L70503.75 1697.5 L70503.75 1697.5 L70503.75 1936 L70503.75 1936 L69812 2394.394566001443 L69812.0 2394.4 " fill="none"></path>
+					<path d="M68602.7 688.5 L68601.9 693.8 L68601.2 699.1 L68588.8 691.9 Z"></path>
+					<path d="M73807.5 1285.2 L73807.5 1459 L73807.5 1546 L73807.5 1546.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M78714.0 235.9 L78710.9 246.2 L78703.6 238.3 L78706.7 228.0 Z"></path>
+						<path d="M73812.8 1275.8 L73807.5 1285.2 L73802.2 1275.8 L73807.5 1266.5 Z"></path>
 					</g>
-					<path d="M78890.8 236.1 L79008 293 L79008 614 L79008.0 614.0 " fill="none"></path>
+					<path d="M73452.0 171.8 L73807.5 293 L73807.5 629.5 L73807.5 629.5 L73807.5 966 L73807.5 966 L73807.5 1158.5 L73807.5 1158.5 " fill="none"></path>
+					<path d="M73453.8 166.8 L73452.0 171.8 L73450.3 176.9 L73439.4 167.5 Z"></path>
+					<path d="M73742.5 1866.4 L73715.75 1936 L73715.75 2625 L73715.75 2625 L73715.75 3314 L73715.75 3314 L50783.5 3500.0416344951336 L50783.5 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M78884.8 227.3 L78890.8 236.1 L78880.1 236.9 L78874.1 228.0 Z"></path>
+						<path d="M73750.8 1859.6 L73742.5 1866.4 L73740.9 1855.8 L73749.2 1849.0 Z"></path>
 					</g>
-					<path d="M73069.5 1416.4 L73037.25 1459 L73037.25 1697.5 L73037.25 1697.5 L73037.25 1936 L73037.25 1936 L73037.25 2625 L73037.25 2625 L73037.25 3314 L73037.25 3314 L64999 3499.795027110767 L64999.0 3499.8 " fill="none"></path>
+					<path d="M74071.9 1819.8 L74323.25 1936 L74323.25 2625 L74323.25 2625 L74323.25 3314 L74323.25 3314 L48012.25 3499.899435520533 L48012.3 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73079.4 1412.2 L73069.5 1416.4 L73070.9 1405.7 L73080.8 1401.5 Z"></path>
+						<path d="M74065.7 1811.0 L74071.9 1819.8 L74061.2 1820.7 L74055.0 1812.0 Z"></path>
 					</g>
-					<path d="M73101.9 1417.5 L73077.25 1459 L81834 1693.9450037967208 L81834.0 1693.9 " fill="none"></path>
+					<path d="M14129.2 1800.0 L14112.25 1936 L14112.25 2609.5 L14112.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73111.3 1412.2 L73101.9 1417.5 L73102.1 1406.8 L73111.5 1401.5 Z"></path>
+						<path d="M14135.7 1791.4 L14129.2 1800.0 L14125.1 1790.1 L14131.5 1781.5 Z"></path>
 					</g>
-					<path d="M73240.8 1420.1 L73244 1459 L73244 1697.5 L73244 1697.5 L73244 1936 L73244 1936 L73244 2625 L73244 2625 L73244 3314 L73244 3314 L59371.25 3499.7435163415116 L59371.3 3499.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73245.4 1410.4 L73240.8 1420.1 L73234.8 1411.2 L73239.3 1401.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M15437.6 1229.3 L14142 1459 L14142 1613.5 L14142.0 1613.5 " fill="none"></path>
 					</g>
-					<path d="M73362.3 1417.0 L73390.75 1459 L73390.75 1697.5 L73390.75 1697.5 L73390.75 1936 L73390.75 1936 L73390.75 2625 L73390.75 2625 L73390.75 3314 L73390.75 3314 L61446.25 3499.683858464616 L61446.3 3499.7 " fill="none"></path>
+					<path d="M15438.6 1234.5 L15437.6 1229.3 L15436.7 1224.0 L15450.8 1227.0 Z"></path>
+					<path d="M61430.6 1845.1 L61421.5 1936 L61421.5 2625 L61421.5 2625 L61421.5 3314 L61421.5 3314 L61421.5 3500.5 L61421.5 3500.5 L61421.5 3687 L61421.5 3687 L61421.5 3843.5 L61421.5 3843.5 L61421.5 4000 L61421.5 4000 L62791 4129.371166725414 L62791.0 4129.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73361.5 1406.2 L73362.3 1417.0 L73352.7 1412.2 L73351.9 1401.5 Z"></path>
+						<path d="M61436.9 1836.3 L61430.6 1845.1 L61426.3 1835.3 L61432.5 1826.5 Z"></path>
 					</g>
-					<path d="M69182.3 905.8 L69279.75 966 L72890.5 1191.6575711478736 L72890.5 1191.7 " fill="none"></path>
-					<path d="M69185.1 901.3 L69182.3 905.8 L69179.5 910.4 L69171.0 898.8 Z"></path>
-					<path d="M33529.8 1710.2 L31842.25 1936 L30770.25435413643 2594 L30770.3 2594.0 " fill="none"></path>
-					<path d="M33530.5 1715.5 L33529.8 1710.2 L33529.1 1705.0 L33543.0 1708.5 Z"></path>
-					<path d="M33720.2 1710.5 L35369.5 1936 L33527 2600.476576812353 L33527.0 2600.5 " fill="none"></path>
-					<path d="M33720.9 1705.2 L33720.2 1710.5 L33719.5 1715.8 L33707.0 1708.7 Z"></path>
-					<path d="M33720.2 1709.1 L35589.5 1936 L33764.958635703915 2594 L33765.0 2594.0 " fill="none"></path>
-					<path d="M33720.9 1703.8 L33720.2 1709.1 L33719.6 1714.4 L33707.0 1707.5 Z"></path>
-					<path d="M18676.3 3923.7 L18676.25 4000 L18387.074626865673 4118.5 L18387.1 4118.5 " fill="none"></path>
+					<path d="M61517.6 1843.2 L61563.5 1936 L61563.5 2625 L61563.5 2625 L61563.5 3314 L61563.5 3314 L61563.5 3500.5 L61563.5 3500.5 L61563.5 3687 L61563.5 3687 L64033.25 3835.076190020113 L64033.3 3835.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M18681.6 3914.3 L18676.3 3923.7 L18670.9 3914.3 L18676.3 3905.0 Z"></path>
+						<path d="M61518.2 1832.5 L61517.6 1843.2 L61508.7 1837.2 L61509.3 1826.5 Z"></path>
 					</g>
-					<path d="M29232.9 1214.6 L18676.25 1459 L18676.25 1697.5 L18676.25 1697.5 L18676.25 1936 L18676.25 1936 L18676.25 2625 L18676.25 2625 L18676.25 3314 L18676.25 3314 L18676.25 3500.5 L18676.25 3500.5 L18676.25 3687 L18676.25 3687 L18676.25 3782 L18676.3 3782.0 " fill="none"></path>
-					<path d="M29233.0 1219.9 L29232.9 1214.6 L29232.8 1209.2 L29246.3 1214.3 Z"></path>
-					<path d="M34591.6 2675.9 L33878.5 3314 L36368.5 3496.326266195524 L36368.5 3496.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M34602.1 2673.7 L34591.6 2675.9 L34595.0 2665.7 L34605.5 2663.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M64763.0 1256.5 L65205.5 1459 L61761.5 1677.4558510638299 L61761.5 1677.5 " fill="none"></path>
 					</g>
-					<path d="M34594.1 2676.3 L33918.5 3314 L32385.5 3493.9839471199243 L32385.5 3494.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M34604.6 2673.8 L34594.1 2676.3 L34597.3 2666.0 L34607.7 2663.5 Z"></path>
+					<path d="M64765.2 1251.7 L64763.0 1256.5 L64760.8 1261.4 L64750.9 1251.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M49013.8 1218.7 L53236.5 1459 L61129.5 1688.3191009867219 L61129.5 1688.3 " fill="none"></path>
 					</g>
-					<path d="M34930.7 2719.7 L34800 3314 L36368.5 3493.9601661027377 L36368.5 3494.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M34937.9 2711.8 L34930.7 2719.7 L34927.5 2709.5 L34934.7 2701.5 Z"></path>
+					<path d="M49014.1 1213.4 L49013.8 1218.7 L49013.5 1224.1 L49000.5 1218.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M15437.9 1239.8 L14681.25 1459 L14681.25 1697.5 L14681.25 1697.5 L14681.25 1936 L14681.25 1936 L14681.25 2625 L14681.25 2625 L14681.25 3314 L14681.25 3314 L15615.25 3469.8059033989266 L15615.3 3469.8 " fill="none"></path>
 					</g>
-					<path d="M34936.1 2719.9 L34840 3314 L32385.5 3496.3761952191235 L32385.5 3496.4 " fill="none"></path>
+					<path d="M15439.4 1244.9 L15437.9 1239.8 L15436.5 1234.7 L15450.8 1236.1 Z"></path>
+					<path d="M26301.3 1754.7 L26301.25 1936 L36636.5 2592.811607904628 L36636.5 2592.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34942.9 2711.6 L34936.1 2719.9 L34932.4 2709.9 L34939.1 2701.5 Z"></path>
+						<path d="M26306.6 1745.3 L26301.3 1754.7 L26295.9 1745.3 L26301.3 1736.0 Z"></path>
 					</g>
-					<path d="M34967.4 2719.9 L35067.25 3314 L24714 3497.9416156612447 L24714.0 3497.9 " fill="none"></path>
+					<path d="M27063.3 1762.7 L27063.25 1936 L36636.5 2590.378258389345 L36636.5 2590.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M34971.2 2709.8 L34967.4 2719.9 L34960.6 2711.6 L34964.4 2701.5 Z"></path>
+						<path d="M27068.6 1753.3 L27063.3 1762.7 L27057.9 1753.3 L27063.3 1744.0 Z"></path>
 					</g>
-					<path d="M35229.7 2772.2 L35107.25 3314 L32577.5 3495.0604912213375 L32577.5 3495.1 " fill="none"></path>
+					<path d="M27704.1 1232.4 L27063.25 1459 L27063.25 1651 L27063.3 1651.0 " fill="none"></path>
+					<path d="M27705.9 1237.5 L27704.1 1232.4 L27702.3 1227.4 L27716.7 1228.0 Z"></path>
+					<path d="M27455.3 1785.2 L27455.25 1936 L36636.5 2588.977342520193 L36636.5 2589.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35237.0 2764.3 L35229.7 2772.2 L35226.6 2761.9 L35233.8 2754.0 Z"></path>
+						<path d="M27460.6 1775.8 L27455.3 1785.2 L27449.9 1775.8 L27455.3 1766.5 Z"></path>
 					</g>
-					<path d="M35238.2 2772.4 L35147.25 3314 L21499.75 3500.0161331579334 L21499.8 3500.0 " fill="none"></path>
+					<path d="M27730.9 1236.4 L27455.25 1459 L27455.25 1628.5 L27455.3 1628.5 " fill="none"></path>
+					<path d="M27734.3 1240.5 L27730.9 1236.4 L27727.6 1232.2 L27741.3 1228.0 Z"></path>
+					<path d="M27847.3 1762.7 L27847.25 1936 L36636.5 2587.458273942393 L36636.5 2587.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M35245.0 2764.1 L35238.2 2772.4 L35234.5 2762.3 L35241.3 2754.0 Z"></path>
+						<path d="M27852.6 1753.3 L27847.3 1762.7 L27841.9 1753.3 L27847.3 1744.0 Z"></path>
 					</g>
-					<path d="M32903.0 3618.2 L32903 3687 L32903 3828 L32903.0 3828.0 " fill="none"></path>
+					<path d="M27770.4 1240.6 L27847.25 1459 L27847.25 1651 L27847.3 1651.0 " fill="none"></path>
+					<path d="M27775.4 1238.8 L27770.4 1240.6 L27765.4 1242.3 L27766.0 1228.0 Z"></path>
+					<path d="M28239.3 1762.7 L28239.25 1936 L36636.5 2585.805447143058 L36636.5 2585.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M32908.3 3608.8 L32903.0 3618.2 L32897.7 3608.8 L32903.0 3599.5 Z"></path>
+						<path d="M28244.6 1753.3 L28239.3 1762.7 L28233.9 1753.3 L28239.3 1744.0 Z"></path>
 					</g>
-					<path d="M35257.4 2767.3 L35235.75 3314 L33039.5 3489.587021755439 L33039.5 3489.6 " fill="none"></path>
-					<path d="M35262.7 2767.5 L35257.4 2767.3 L35252.0 2767.1 L35257.9 2754.0 Z"></path>
-					<path d="M35281.3 2767.2 L35351.5 3314 L34159.5 3486.6664077669902 L34159.5 3486.7 " fill="none"></path>
-					<path d="M35286.6 2766.5 L35281.3 2767.2 L35276.0 2767.9 L35279.6 2754.0 Z"></path>
-					<path d="M72384.3 2756.0 L72130 3314 L60578.25 3497.3650126603825 L60578.3 3497.4 " fill="none"></path>
+					<path d="M27802.5 1234.1 L28239.25 1459 L28239.25 1651 L28239.3 1651.0 " fill="none"></path>
+					<path d="M27804.9 1229.4 L27802.5 1234.1 L27800.0 1238.8 L27790.6 1228.0 Z"></path>
+					<path d="M29023.3 1762.7 L29023.25 1936 L36636.5 2582.021028972567 L36636.5 2582.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72393.0 2749.7 L72384.3 2756.0 L72383.3 2745.3 L72392.0 2739.0 Z"></path>
+						<path d="M29028.6 1753.3 L29023.3 1762.7 L29017.9 1753.3 L29023.3 1744.0 Z"></path>
 					</g>
-					<path d="M72451.3 2757.6 L72482 3314 L72024.70107238606 3485 L72024.7 3485.0 " fill="none"></path>
+					<path d="M27849.6 1229.9 L29023.25 1459 L29023.25 1651 L29023.3 1651.0 " fill="none"></path>
+					<path d="M27850.6 1224.7 L27849.6 1229.9 L27848.6 1235.1 L27836.5 1227.3 Z"></path>
+					<path d="M16847.7 3473.2 L17260.416666666664 3417 L17368.208333333336 3417 L17368.208333333336 3417 L17476 3500.5 L17476 3500.5 L17368.208333333336 3584 L17368.208333333336 3584 L17260.416666666664 3584 L17260.416666666664 3584 L16829.25 3525.2365342763874 L16829.3 3525.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72456.1 2748.0 L72451.3 2757.6 L72445.5 2748.6 L72450.3 2739.0 Z"></path>
+						<path d="M16837.8 3469.2 L16847.7 3473.2 L16839.2 3479.8 L16829.3 3475.8 Z"></path>
 					</g>
-					<path d="M73036.1 726.0 L72444 966 L72444 1212.5 L72444 1212.5 L72444 1459 L72444 1459 L72444 1697.5 L72444 1697.5 L72444 1936 L72444 1936 L72444 2511 L72444.0 2511.0 " fill="none"></path>
-					<path d="M73038.1 731.0 L73036.1 726.0 L73034.1 721.1 L73048.5 721.0 Z"></path>
-					<path d="M29232.9 1215.7 L22381 1459 L33543 1695.7606723585911 L33543.0 1695.8 " fill="none"></path>
-					<path d="M29233.1 1221.0 L29232.9 1215.7 L29232.7 1210.3 L29246.3 1215.2 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M13167.5 1256.8 L13167.5 1459 L33543 1696.5440180862765 L33543.0 1696.5 " fill="none"></path>
-					</g>
-					<path d="M13172.8 1256.8 L13167.5 1256.8 L13162.2 1256.8 L13167.5 1243.5 Z"></path>
-					<path d="M36881.0 2712.7 L36863.5 3314 L36461.90214477212 3485 L36461.9 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36886.6 2703.5 L36881.0 2712.7 L36875.9 2703.2 L36881.5 2694.0 Z"></path>
-					</g>
-					<path d="M36901.2 2712.3 L37023 3314 L24714 3498.3434112262107 L24714.0 3498.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36904.5 2702.1 L36901.2 2712.3 L36894.1 2704.2 L36897.5 2694.0 Z"></path>
-					</g>
-					<path d="M73121.7 731.4 L72770.5 966 L72770.5 1212.5 L72770.5 1212.5 L72770.5 1459 L72770.5 1459 L72770.5 1697.5 L72770.5 1697.5 L72770.5 1936 L72770.5 1936 L72770.5 2625 L72770.5 2625 L72770.5 3314 L72770.5 3314 L72770.5 3462 L72770.5 3462.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73132.5 730.6 L73121.7 731.4 L73126.5 721.7 L73137.3 721.0 Z"></path>
-					</g>
-					<path d="M73133.0 732.0 L72810.5 966 L72810.5 1212.5 L72810.5 1212.5 L72810.5 1459 L72810.5 1459 L72810.5 1697.5 L72810.5 1697.5 L72810.5 1936 L72810.5 1936 L72810.5 2625 L72810.5 2625 L72810.5 3314 L72810.5 3314 L64120.25 3499.517999713836 L64120.3 3499.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73143.7 730.8 L73133.0 732.0 L73137.5 722.2 L73148.1 721.0 Z"></path>
+						<path d="M4128.1 2650.4 L4725.75 3314 L16466.25 3497.660732259688 L16466.3 3497.7 " fill="none"></path>
 					</g>
-					<path d="M73144.4 732.6 L72850.5 966 L72850.5 1212.5 L72850.5 1212.5 L72850.5 1459 L72850.5 1459 L72850.5 1697.5 L72850.5 1697.5 L72850.5 1936 L72850.5 1936 L72850.5 2625 L72850.5 2625 L72850.5 3314 L72850.5 3314 L72055.32707774799 3485 L72055.3 3485.0 " fill="none"></path>
+					<path d="M4132.1 2646.8 L4128.1 2650.4 L4124.2 2654.0 L4119.2 2640.5 Z"></path>
+					<path d="M28631.3 1747.2 L28631.25 1936 L36636.5 2584.000381825124 L36636.5 2584.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73155.0 731.0 L73144.4 732.6 L73148.4 722.6 L73159.0 721.0 Z"></path>
+						<path d="M28636.6 1737.8 L28631.3 1747.2 L28625.9 1737.8 L28631.3 1728.5 Z"></path>
 					</g>
-					<path d="M61681.3 1277.2 L61681.25 1459 L61681.25 1666.5 L61681.3 1666.5 " fill="none"></path>
+					<path d="M17015.4 1762.8 L15417.5 1936 L15417.5 2625 L15417.5 2625 L15417.5 3314 L15417.5 3314 L16466.25 3472.985470432839 L16466.3 3473.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M61686.6 1267.8 L61681.3 1277.2 L61675.9 1267.8 L61681.3 1258.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M34656.9 2676.7 L34760 3314 L33749.75 3480.478131212724 L33749.8 3480.5 " fill="none"></path>
+						<path d="M17025.3 1767.1 L17015.4 1762.8 L17024.1 1756.5 L17034.0 1760.8 Z"></path>
 					</g>
-					<path d="M34662.1 2675.8 L34656.9 2676.7 L34651.6 2677.5 L34654.7 2663.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M36549.0 2706.8 L36549 3314 L33749.75 3492.7418043310795 L33749.8 3492.7 " fill="none"></path>
+						<path d="M15627.0 1223.7 L17618 1459 L17618 1568.5 L17618.0 1568.5 " fill="none"></path>
 					</g>
-					<path d="M36554.3 2706.8 L36549.0 2706.8 L36543.7 2706.8 L36549.0 2693.5 Z"></path>
-					<path d="M63112.7 1261.0 L62355 1459 L62355 1644 L62355.0 1644.0 " fill="none"></path>
+					<path d="M15627.6 1218.4 L15627.0 1223.7 L15626.4 1229.0 L15613.8 1222.1 Z"></path>
+					<path d="M17020.8 1769.1 L15629.5 1936 L15629.5 2541 L15629.5 2541.0 " fill="none"></path>
+					<path d="M17021.4 1774.4 L17020.8 1769.1 L17020.1 1763.8 L17034.0 1767.5 Z"></path>
+					<path d="M17020.8 1787.6 L16037.5 1936 L16037.5 2556 L16037.5 2556.0 " fill="none"></path>
+					<path d="M17021.6 1792.9 L17020.8 1787.6 L17020.0 1782.3 L17034.0 1785.6 Z"></path>
+					<path d="M18122.2 1829.9 L18526.25 1936 L18526.25 2556 L18526.3 2556.0 " fill="none"></path>
+					<path d="M18123.5 1824.7 L18122.2 1829.9 L18120.8 1835.0 L18109.3 1826.5 Z"></path>
+					<path d="M18215.1 1797.8 L19038.25 1936 L19038.25 2548.5 L19038.3 2548.5 " fill="none"></path>
+					<path d="M18216.0 1792.5 L18215.1 1797.8 L18214.3 1803.0 L18202.0 1795.6 Z"></path>
+					<path d="M19723.3 2787.7 L19723.25 3314 L41377 3500.2505620827615 L41377.0 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63123.1 1263.8 L63112.7 1261.0 L63120.4 1253.5 L63130.8 1256.3 Z"></path>
+						<path d="M19728.6 2778.3 L19723.3 2787.7 L19717.9 2778.3 L19723.3 2769.0 Z"></path>
 					</g>
-					<path d="M63113.2 1281.2 L62634 1459 L33707 1696.825829914854 L33707.0 1696.8 " fill="none"></path>
+					<path d="M18215.2 1765.2 L19723.25 1936 L19723.25 2481 L19723.3 2481.0 " fill="none"></path>
+					<path d="M18215.8 1759.9 L18215.2 1765.2 L18214.6 1770.5 L18202.0 1763.7 Z"></path>
+					<path d="M20107.3 2727.7 L20107.25 3314 L20107.25 3485 L20107.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63123.9 1282.9 L63113.2 1281.2 L63120.1 1272.9 L63130.8 1274.7 Z"></path>
+						<path d="M20112.6 2718.3 L20107.3 2727.7 L20101.9 2718.3 L20107.3 2709.0 Z"></path>
 					</g>
-					<path d="M63113.6 1292.9 L62732.25 1459 L62732.25 1697.5 L62732.25 1697.5 L62732.25 1936 L62732.25 1936 L62732.25 2625 L62732.25 2625 L62732.25 3314 L62732.25 3314 L21499.75 3500.3395669768342 L21499.8 3500.3 " fill="none"></path>
+					<path d="M18215.3 1754.7 L20107.25 1936 L20107.25 2541 L20107.3 2541.0 " fill="none"></path>
+					<path d="M18215.8 1749.4 L18215.3 1754.7 L18214.8 1760.0 L18202.0 1753.5 Z"></path>
+					<path d="M36718.3 3309.9 L36715.75 3314 L16829.25 3498.8132474586405 L16829.3 3498.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63124.3 1294.1 L63113.6 1292.9 L63120.1 1284.3 L63130.8 1285.4 Z"></path>
+						<path d="M36727.8 3304.7 L36718.3 3309.9 L36718.7 3299.1 L36728.2 3294.0 Z"></path>
 					</g>
-					<path d="M63482.1 1313.7 L63746.25 1459 L63746.25 1697.5 L63746.25 1697.5 L63746.25 1936 L63746.25 1936 L63746.25 2625 L63746.25 2625 L63746.25 3314 L63746.25 3314 L27458.25 3499.4116873510316 L27458.3 3499.4 " fill="none"></path>
+					<path d="M36757.8 3310.3 L36755.75 3314 L50670.5 3499.745790462557 L50670.5 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63476.5 1304.5 L63482.1 1313.7 L63471.4 1313.8 L63465.8 1304.7 Z"></path>
+						<path d="M36767.1 3304.7 L36757.8 3310.3 L36757.8 3299.5 L36767.0 3294.0 Z"></path>
 					</g>
-					<path d="M37177.2 2749.8 L37063 3314 L21597.75 3500.150935024283 L21597.8 3500.2 " fill="none"></path>
+					<path d="M36974.0 3312.1 L36973.5 3314 L36973.5 3500.5 L36973.5 3500.5 L36973.5 3687 L36973.5 3687 L36973.5 3843.5 L36973.5 3843.5 L36973.5 4000 L36973.5 4000 L62791 4133.746158158236 L62791.0 4133.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37184.3 2741.7 L37177.2 2749.8 L37173.9 2739.6 L37180.9 2731.5 Z"></path>
+						<path d="M36981.4 3304.3 L36974.0 3312.1 L36971.0 3301.8 L36978.4 3294.0 Z"></path>
 					</g>
-					<path d="M37227.6 2749.8 L37341 3314 L21499.75 3500.0829908514024 L21499.8 3500.1 " fill="none"></path>
+					<path d="M37332.7 3312.0 L37333.25 3314 L35010 3495.1207545198035 L35010.0 3495.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M37231.0 2739.6 L37227.6 2749.8 L37220.5 2741.7 L37223.9 2731.5 Z"></path>
+						<path d="M37335.4 3301.6 L37332.7 3312.0 L37325.1 3304.4 L37327.7 3294.0 Z"></path>
 					</g>
-					<path d="M33720.3 1707.7 L35841.5 1936 L34031 2588.936142371107 L34031.0 2588.9 " fill="none"></path>
-					<path d="M33720.8 1702.4 L33720.3 1707.7 L33719.7 1713.1 L33707.0 1706.3 Z"></path>
-					<path d="M69389.6 2772.3 L69279.75 3314 L32726.5 3500.2223470440003 L32726.5 3500.2 " fill="none"></path>
+					<path d="M37661.2 3265.5 L37700.5 3314 L59116.5 3500.043924820085 L59116.5 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69396.7 2764.2 L69389.6 2772.3 L69386.3 2762.1 L69393.3 2754.0 Z"></path>
+						<path d="M37659.5 3254.9 L37661.2 3265.5 L37651.2 3261.6 L37649.5 3251.0 Z"></path>
 					</g>
-					<path d="M69398.1 2772.5 L69319.75 3314 L72645 3493.717199159603 L72645.0 3493.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M69404.8 2764.0 L69398.1 2772.5 L69394.2 2762.5 L69400.8 2754.0 Z"></path>
+					<path d="M62076.9 1740.5 L62169.5 1936 L37649.5 2611.055641020518 L37649.5 2611.1 " fill="none"></path>
+					<path d="M62081.7 1738.3 L62076.9 1740.5 L62072.1 1742.8 L62071.2 1728.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M75739.0 1264.0 L75786.5 1459 L75786.5 1697.5 L75786.5 1697.5 L75786.5 1936 L75786.5 1936 L37649.5 2615.96928332061 L37649.5 2616.0 " fill="none"></path>
 					</g>
-					<path d="M69423.8 2772.7 L69439.5 3314 L59371.25 3499.45925825329 L59371.3 3499.5 " fill="none"></path>
+					<path d="M75744.2 1262.7 L75739.0 1264.0 L75733.8 1265.2 L75735.9 1251.0 Z"></path>
+					<path d="M67712.7 1771.9 L66905 1936 L66905 2625 L66905 2625 L66905 3314 L66905 3314 L63068.5 3499.0290276700284 L63068.5 3499.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69428.8 2763.2 L69423.8 2772.7 L69418.2 2763.5 L69423.2 2754.0 Z"></path>
+						<path d="M67722.9 1775.3 L67712.7 1771.9 L67720.8 1764.8 L67731.0 1768.2 Z"></path>
 					</g>
-					<path d="M69445.1 2772.4 L69539.25 3314 L61446.25 3499.297955926585 L61446.3 3499.3 " fill="none"></path>
+					<path d="M67712.7 1774.5 L66945 1936 L66945 2625 L66945 2625 L66945 3314 L66945 3314 L62792 3495.029449573449 L62792.0 3495.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M69448.8 2762.3 L69445.1 2772.4 L69438.3 2764.1 L69441.9 2754.0 Z"></path>
+						<path d="M67723.0 1777.8 L67712.7 1774.5 L67720.8 1767.4 L67731.0 1770.7 Z"></path>
 					</g>
-					<path d="M69183.0 849.7 L69419.5 966 L69419.5 1212.5 L69419.5 1212.5 L69419.5 1459 L69419.5 1459 L69419.5 1697.5 L69419.5 1697.5 L69419.5 1936 L69419.5 1936 L69419.5 2496 L69419.5 2496.0 " fill="none"></path>
-					<path d="M69185.3 844.9 L69183.0 849.7 L69180.6 854.5 L69171.0 843.8 Z"></path>
-					<path d="M33720.3 1706.8 L36069 1936 L34244.458635703915 2594 L34244.5 2594.0 " fill="none"></path>
-					<path d="M33720.8 1701.5 L33720.3 1706.8 L33719.8 1712.1 L33707.0 1705.5 Z"></path>
-					<path d="M72290.8 3900.7 L72290.75 4000 L72971.75 4110.143633071816 L72971.8 4110.1 " fill="none"></path>
+					<path d="M67712.8 1777.3 L66985 1936 L66985 2625 L66985 2625 L66985 3314 L66985 3314 L66985 3500.5 L66985 3500.5 L66985 3687 L66985 3687 L66985 3843.5 L66985 3843.5 L66985 4000 L66985 4000 L54090 4132.484569676059 L54090.0 4132.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72296.1 3891.3 L72290.8 3900.7 L72285.4 3891.3 L72290.8 3882.0 Z"></path>
+						<path d="M67723.0 1780.6 L67712.8 1777.3 L67720.7 1770.1 L67731.0 1773.4 Z"></path>
 					</g>
-					<path d="M73371.4 730.6 L73597.5 966 L73597.5 1212.5 L73597.5 1212.5 L73597.5 1459 L73597.5 1459 L73597.5 1697.5 L73597.5 1697.5 L73597.5 1936 L73597.5 1936 L73597.5 2625 L73597.5 2625 L73597.5 3314 L73597.5 3314 L73597.5 3500.5 L73597.5 3500.5 L73597.5 3687 L73597.5 3687 L72431.75 3826.61344939736 L72431.8 3826.6 " fill="none"></path>
-					<path d="M73375.2 726.9 L73371.4 730.6 L73367.5 734.3 L73362.1 721.0 Z"></path>
-					<path d="M64169.0 1319.2 L63859.75 1459 L63859.75 1682 L63859.8 1682.0 " fill="none"></path>
+					<path d="M67712.8 1780.4 L67025 1936 L67025 2625 L67025 2625 L67025 3314 L67025 3314 L57121 3499.6377889447235 L57121.0 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64179.7 1320.2 L64169.0 1319.2 L64175.3 1310.5 L64186.0 1311.5 Z"></path>
+						<path d="M67723.1 1783.5 L67712.8 1780.4 L67720.7 1773.1 L67731.0 1776.2 Z"></path>
 					</g>
-					<path d="M64215.4 1320.8 L63973.25 1459 L63973.25 1697.5 L63973.25 1697.5 L63973.25 1936 L63973.25 1936 L63973.25 2625 L63973.25 2625 L63973.25 3314 L63973.25 3314 L25783 3500.287811815477 L25783.0 3500.3 " fill="none"></path>
+					<path d="M67803.8 1889.7 L67737.5 1936 L69116 2486.1225021720243 L69116.0 2486.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64226.1 1320.8 L64215.4 1320.8 L64220.8 1311.5 L64231.6 1311.5 Z"></path>
+						<path d="M67814.5 1888.7 L67803.8 1889.7 L67808.4 1880.0 L67819.1 1879.0 Z"></path>
 					</g>
-					<path d="M64264.5 1323.0 L64091.75 1459 L64091.75 1682 L64091.8 1682.0 " fill="none"></path>
+					<path d="M67893.0 1892.5 L67851.5 1936 L64274 2547.864838029043 L64274.0 2547.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64275.2 1321.5 L64264.5 1323.0 L64268.6 1313.1 L64279.2 1311.5 Z"></path>
+						<path d="M67903.3 1889.4 L67893.0 1892.5 L67895.6 1882.1 L67905.9 1879.0 Z"></path>
 					</g>
-					<path d="M64392.2 1330.1 L64378.25 1459 L64378.25 1682 L64378.3 1682.0 " fill="none"></path>
+					<path d="M68036.1 1897.3 L68027.75 1936 L68368.23167634252 2443.5 L68368.2 2443.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64398.6 1321.4 L64392.2 1330.1 L64387.9 1320.2 L64394.3 1311.5 Z"></path>
+						<path d="M68043.3 1889.2 L68036.1 1897.3 L68032.8 1887.0 L68040.0 1879.0 Z"></path>
 					</g>
-					<path d="M64623.0 1762.0 L64365.75 1936 L44706.5 2619.8345218411987 L44706.5 2619.8 " fill="none"></path>
+					<path d="M68076.3 1897.7 L68075.75 1936 L65174 2536.0767614616943 L65174.0 2536.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64633.7 1761.1 L64623.0 1762.0 L64627.7 1752.3 L64638.4 1751.5 Z"></path>
+						<path d="M68081.7 1888.4 L68076.3 1897.7 L68071.1 1888.3 L68076.5 1879.0 Z"></path>
 					</g>
-					<path d="M64724.3 1770.1 L64738.25 1936 L64738.25 2625 L64738.25 2625 L64738.25 3314 L64738.25 3314 L64738.25 3500.5 L64738.25 3500.5 L64738.25 3687 L64738.25 3687 L64738.25 3843.5 L64738.25 3843.5 L64738.25 4000 L64738.25 4000 L18421.25 4133.792019659833 L18421.3 4133.8 " fill="none"></path>
+					<path d="M68109.8 1897.4 L68115.75 1936 L67657.65856313497 2436 L67657.7 2436.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M64728.9 1760.4 L64724.3 1770.1 L64718.2 1761.2 L64722.8 1751.5 Z"></path>
+						<path d="M68113.7 1887.4 L68109.8 1897.4 L68103.1 1889.0 L68107.0 1879.0 Z"></path>
 					</g>
-					<path d="M64541.3 1319.7 L64718.25 1459 L64718.25 1643.5 L64718.3 1643.5 " fill="none"></path>
-					<path d="M64544.6 1315.6 L64541.3 1319.7 L64538.0 1323.9 L64530.8 1311.5 Z"></path>
-					<path d="M33720.3 1706.0 L36286.5 1936 L34466 2592.5425281339963 L34466.0 2592.5 " fill="none"></path>
-					<path d="M33720.8 1700.7 L33720.3 1706.0 L33719.8 1711.4 L33707.0 1704.8 Z"></path>
-					<path d="M73411.1 728.8 L73738 966 L73738 1181.5 L73738.0 1181.5 " fill="none"></path>
-					<path d="M73414.3 724.5 L73411.1 728.8 L73408.0 733.1 L73400.4 721.0 Z"></path>
-					<path d="M36238.0 2664.9 L35513.25 3314 L34495.5 3476.822539137894 L34495.5 3476.8 " fill="none"></path>
-					<path d="M36241.5 2668.9 L36238.0 2664.9 L36234.4 2660.9 L36247.9 2656.0 Z"></path>
-					<path d="M29513.3 1747.2 L29513.25 1936 L57557 2614.6545638143743 L57557.0 2614.7 " fill="none"></path>
+					<path d="M68445.2 1785.1 L69076 1936 L69076 2625 L69076 2625 L69076 3314 L69076 3314 L59221.5 3499.5116836580196 L59221.5 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29518.6 1737.8 L29513.3 1747.2 L29507.9 1737.8 L29513.3 1728.5 Z"></path>
+						<path d="M68437.3 1777.7 L68445.2 1785.1 L68434.8 1788.1 L68427.0 1780.7 Z"></path>
 					</g>
-					<path d="M26090.8 1762.7 L26090.75 1936 L44746.5 2620.7240874162662 L44746.5 2620.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26096.1 1753.3 L26090.8 1762.7 L26085.4 1753.3 L26090.8 1744.0 Z"></path>
+					<path d="M68602.0 692.7 L70543.75 966 L70543.75 1212.5 L70543.75 1212.5 L70543.75 1459 L70543.75 1459 L68427 1663.8259965513744 L68427.0 1663.8 " fill="none"></path>
+					<path d="M68602.7 687.4 L68602.0 692.7 L68601.2 698.0 L68588.8 690.9 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M64769.4 1256.2 L65245.5 1459 L67731 1668.2083112758073 L67731.0 1668.2 " fill="none"></path>
 					</g>
-					<path d="M29233.0 1219.3 L26090.75 1459 L26090.75 1651 L26090.8 1651.0 " fill="none"></path>
-					<path d="M29233.4 1224.6 L29233.0 1219.3 L29232.5 1214.0 L29246.3 1218.3 Z"></path>
-					<path d="M81375.0 1285.2 L81375 1459 L81375 1501 L81375.0 1501.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M81380.3 1275.8 L81375.0 1285.2 L81369.7 1275.8 L81375.0 1266.5 Z"></path>
+					<path d="M64771.5 1251.3 L64769.4 1256.2 L64767.3 1261.1 L64757.1 1251.0 Z"></path>
+					<path d="M54649.5 2666.2 L55190.75 3314 L55190.75 3469.5 L55190.8 3469.5 " fill="none"></path>
+					<path d="M54653.5 2662.8 L54649.5 2666.2 L54645.4 2669.7 L54640.9 2656.0 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M22000.4 1726.3 L22614 1936 L22614 2563.5 L22614.0 2563.5 " fill="none"></path>
 					</g>
-					<path d="M82061.9 157.9 L81375 293 L81375 629.5 L81375 629.5 L81375 966 L81375 966 L81375 1158.5 L81375.0 1158.5 " fill="none"></path>
-					<path d="M82062.9 163.2 L82061.9 157.9 L82060.9 152.7 L82075.0 155.4 Z"></path>
-					<path d="M55738.8 1767.2 L55348.25 1936 L55348.25 2541 L55348.3 2541.0 " fill="none"></path>
-					<path d="M55740.9 1772.1 L55738.8 1767.2 L55736.6 1762.3 L55751.0 1761.9 Z"></path>
-					<path d="M68605.6 2831.5 L68430.75 3314 L64999 3498.857065492093 L64999.0 3498.9 " fill="none"></path>
+					<path d="M22002.1 1721.2 L22000.4 1726.3 L21998.6 1731.3 L21987.8 1721.9 Z"></path>
+					<path d="M68352.1 2821.8 L68007.25 3314 L63068.5 3499.3553101574685 L63068.5 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68613.8 2824.6 L68605.6 2831.5 L68603.8 2821.0 L68612.0 2814.0 Z"></path>
+						<path d="M68361.8 2817.2 L68352.1 2821.8 L68353.1 2811.1 L68362.8 2806.5 Z"></path>
 					</g>
-					<path d="M68617.5 2831.9 L68470.75 3314 L64120.25 3498.548675082452 L64120.3 3498.5 " fill="none"></path>
+					<path d="M68363.3 2822.2 L68047.25 3314 L57121 3499.7181184351434 L57121.0 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68625.3 2824.5 L68617.5 2831.9 L68615.1 2821.4 L68623.0 2814.0 Z"></path>
+						<path d="M68372.8 2817.2 L68363.3 2822.2 L68363.8 2811.5 L68373.4 2806.5 Z"></path>
 					</g>
-					<path d="M68629.5 2832.1 L68510.75 3314 L68510.75 3500.5 L68510.75 3500.5 L68510.75 3687 L68510.75 3687 L68510.75 3843.5 L68510.75 3843.5 L68510.75 4000 L68510.75 4000 L61787 4133.030526743199 L61787.0 4133.0 " fill="none"></path>
+					<path d="M68490.0 2825.2 L68490 3314 L68490 3500.5 L68490 3500.5 L68490 3687 L68490 3687 L68490 3843.5 L68490 3843.5 L68490 4000 L68490 4000 L62889 4132.837876106195 L62889.0 4132.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68636.9 2824.3 L68629.5 2832.1 L68626.5 2821.8 L68633.9 2814.0 Z"></path>
+						<path d="M68495.3 2815.8 L68490.0 2825.2 L68484.7 2815.8 L68490.0 2806.5 Z"></path>
 					</g>
-					<path d="M68692.6 2832.6 L68720.5 3314 L68720.5 3500.5 L68720.5 3500.5 L68720.5 3687 L68720.5 3687 L65998.75 3835.817844353219 L65998.8 3835.8 " fill="none"></path>
+					<path d="M68568.8 2823.9 L68763 3314 L68763 3500.5 L68763 3500.5 L68763 3687 L68763 3687 L64314.25 3838.708748706216 L64314.3 3838.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68697.3 2823.0 L68692.6 2832.6 L68686.7 2823.6 L68691.5 2814.0 Z"></path>
+						<path d="M68570.3 2813.2 L68568.8 2823.9 L68560.4 2817.1 L68561.9 2806.5 Z"></path>
 					</g>
-					<path d="M68743.5 2831.9 L68890.25 3314 L61446.25 3499.193890482225 L61446.3 3499.2 " fill="none"></path>
+					<path d="M68580.2 2823.5 L68803 3314 L59221.5 3499.483677600166 L59221.5 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M68745.9 2821.4 L68743.5 2831.9 L68735.7 2824.5 L68738.0 2814.0 Z"></path>
+						<path d="M68581.2 2812.8 L68580.2 2823.5 L68571.5 2817.2 L68572.5 2806.5 Z"></path>
 					</g>
-					<path d="M69184.3 673.6 L72164 966 L72164 1212.5 L72164 1212.5 L72164 1459 L72164 1459 L72164 1697.5 L72164 1697.5 L72164 1936 L72164 1936 L69100 2542.02727142242 L69100.0 2542.0 " fill="none"></path>
-					<path d="M69184.8 668.3 L69184.3 673.6 L69183.7 678.9 L69171.0 672.3 Z"></path>
-					<path d="M80982.7 1733.9 L78805.5 1936 L69100 2596.4532839506173 L69100.0 2596.5 " fill="none"></path>
-					<path d="M80983.2 1739.2 L80982.7 1733.9 L80982.2 1728.6 L80996.0 1732.7 Z"></path>
+					<path d="M68602.0 691.7 L70583.75 966 L70583.75 1212.5 L70583.75 1212.5 L70583.75 1459 L70583.75 1459 L70583.75 1697.5 L70583.75 1697.5 L70583.75 1936 L70583.75 1936 L69036 2445.3252537313433 L69036.0 2445.3 " fill="none"></path>
+					<path d="M68602.7 686.4 L68602.0 691.7 L68601.2 697.0 L68588.8 689.9 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M67464.2 1224.2 L65019.25 1459 L65019.25 1697.5 L65019.25 1697.5 L65019.25 1936 L65019.25 1936 L68261 2546.055513827245 L68261.0 2546.1 " fill="none"></path>
+						<path d="M64788.3 1239.6 L65771.25 1459 L65771.25 1697.5 L65771.25 1697.5 L65771.25 1936 L65771.25 1936 L67944 2486.6297931034483 L67944.0 2486.6 " fill="none"></path>
 					</g>
-					<path d="M67464.7 1229.5 L67464.2 1224.2 L67463.7 1218.9 L67477.5 1222.9 Z"></path>
+					<path d="M64789.4 1234.4 L64788.3 1239.6 L64787.1 1244.8 L64775.3 1236.7 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M83142.4 1261.4 L82982 1459 L82982 1697.5 L82982 1697.5 L82982 1936 L82982 1936 L69100 2604.789847218823 L69100.0 2604.8 " fill="none"></path>
+						<path d="M75747.1 1263.4 L75826.5 1459 L75826.5 1697.5 L75826.5 1697.5 L75826.5 1936 L75826.5 1936 L69036 2573.722960539767 L69036.0 2573.7 " fill="none"></path>
 					</g>
-					<path d="M83146.5 1264.7 L83142.4 1261.4 L83138.2 1258.0 L83150.8 1251.0 Z"></path>
+					<path d="M75752.1 1261.4 L75747.1 1263.4 L75742.2 1265.4 L75742.1 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M42572.6 1228.3 L40966.25 1459 L40966.25 1697.5 L40966.25 1697.5 L40966.25 1936 L40966.25 1936 L68261 2614.570870581019 L68261.0 2614.6 " fill="none"></path>
+						<path d="M49013.8 1215.9 L56865.5 1459 L56865.5 1697.5 L56865.5 1697.5 L56865.5 1936 L56865.5 1936 L67944 2592.6378338853283 L67944.0 2592.6 " fill="none"></path>
 					</g>
-					<path d="M42573.3 1233.5 L42572.6 1228.3 L42571.8 1223.0 L42585.8 1226.4 Z"></path>
-					<path d="M60972.7 2777.5 L60650.75 3314 L59371.25 3492.612836826347 L59371.3 3492.6 " fill="none"></path>
+					<path d="M49014.0 1210.6 L49013.8 1215.9 L49013.7 1221.2 L49000.5 1215.5 Z"></path>
+					<path d="M29411.3 1762.7 L29411.25 1936 L39083.5 2616.313426741189 L39083.5 2616.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60982.1 2772.2 L60972.7 2777.5 L60973.0 2766.8 L60982.3 2761.5 Z"></path>
+						<path d="M29416.6 1753.3 L29411.3 1762.7 L29405.9 1753.3 L29411.3 1744.0 Z"></path>
 					</g>
-					<path d="M61117.2 2779.2 L61301 3314 L61386.04155495978 3485 L61386.0 3485.0 " fill="none"></path>
+					<path d="M27849.7 1225.8 L29411.25 1459 L29411.25 1651 L29411.3 1651.0 " fill="none"></path>
+					<path d="M27850.5 1220.5 L27849.7 1225.8 L27848.9 1231.1 L27836.5 1223.8 Z"></path>
+					<path d="M62879.4 2854.5 L62750 3314 L63014.06434316354 3485 L63014.1 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M61119.2 2768.6 L61117.2 2779.2 L61109.1 2772.1 L61111.2 2761.5 Z"></path>
+						<path d="M62887.1 2846.9 L62879.4 2854.5 L62876.8 2844.0 L62884.4 2836.5 Z"></path>
 					</g>
-					<path d="M58962.5 1727.1 L57470.25 1936 L60716.25 2558.285475792988 L60716.3 2558.3 " fill="none"></path>
-					<path d="M58963.3 1732.4 L58962.5 1727.1 L58961.8 1721.8 L58975.8 1725.2 Z"></path>
-					<path d="M82417.2 1821.2 L82176.5 1936 L61412.25 2613.642991628083 L61412.3 2613.6 " fill="none"></path>
-					<path d="M82419.5 1826.1 L82417.2 1821.2 L82414.9 1816.4 L82429.3 1815.5 Z"></path>
-					<path d="M80978.1 1813.6 L80559.75 1936 L80559.75 2625 L80559.75 2625 L80559.75 3314 L80559.75 3314 L80559.75 3500.5 L80559.75 3500.5 L80559.75 3687 L80559.75 3687 L66685.5 3842.6808779508506 L66685.5 3842.7 " fill="none"></path>
+					<path d="M62910.6 2855.0 L62844 3314 L50783.5 3499.6303746802014 L50783.5 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M80988.5 1816.1 L80978.1 1813.6 L80985.5 1805.9 L80996.0 1808.4 Z"></path>
+						<path d="M62917.2 2846.5 L62910.6 2855.0 L62906.7 2845.0 L62913.3 2836.5 Z"></path>
 					</g>
-					<path d="M81450.0 1911.6 L81458.5 1936 L81458.5 2625 L81458.5 2625 L81458.5 3314 L81458.5 3314 L59371.25 3500.0241433813153 L59371.3 3500.0 " fill="none"></path>
+					<path d="M63002.0 2854.6 L63118 3314 L59221.5 3498.0205748290705 L59221.5 3498.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81451.9 1901.0 L81450.0 1911.6 L81441.8 1904.6 L81443.8 1894.0 Z"></path>
+						<path d="M63004.9 2844.2 L63002.0 2854.6 L62994.5 2846.9 L62997.4 2836.5 Z"></path>
 					</g>
-					<path d="M50903.7 1216.4 L44949 1459 L44949 1598.5 L44949.0 1598.5 " fill="none"></path>
-					<path d="M50903.9 1221.7 L50903.7 1216.4 L50903.5 1211.0 L50917.0 1215.8 Z"></path>
-					<path d="M46040.3 3618.2 L46040.25 3687 L66539.5 3842.944664535965 L66539.5 3842.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46045.6 3608.8 L46040.3 3618.2 L46034.9 3608.8 L46040.3 3599.5 Z"></path>
+					<path d="M62083.6 1739.7 L62209.5 1936 L62718.53301886792 2413.5 L62718.5 2413.5 " fill="none"></path>
+					<path d="M62088.1 1736.8 L62083.6 1739.7 L62079.1 1742.6 L62076.4 1728.5 Z"></path>
+					<path d="M61538.3 1837.6 L61603.5 1936 L62596 2446.1324132786276 L62596.0 2446.1 " fill="none"></path>
+					<path d="M61542.8 1834.7 L61538.3 1837.6 L61533.9 1840.6 L61531.0 1826.5 Z"></path>
+					<path d="M74067.3 1809.0 L74363.25 1936 L63292 2604.0028241784707 L63292.0 2604.0 " fill="none"></path>
+					<path d="M74069.4 1804.1 L74067.3 1809.0 L74065.1 1813.9 L74055.0 1803.7 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M64788.3 1238.7 L65811.25 1459 L65811.25 1697.5 L65811.25 1697.5 L65811.25 1936 L65811.25 1936 L63292 2541.375621239864 L63292.0 2541.4 " fill="none"></path>
+					</g>
+					<path d="M64789.4 1233.5 L64788.3 1238.7 L64787.2 1243.9 L64775.3 1235.9 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M75755.0 1262.6 L75866.5 1459 L75866.5 1697.5 L75866.5 1697.5 L75866.5 1936 L75866.5 1936 L63292 2606.44538595473 L63292.0 2606.4 " fill="none"></path>
 					</g>
+					<path d="M75759.6 1260.0 L75755.0 1262.6 L75750.3 1265.2 L75748.4 1251.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M49361.2 1702.9 L45728 1936 L45728 2625 L45728 2625 L45728 3314 L45728 3314 L45892.25 3412.1028823058446 L45892.3 3412.1 " fill="none"></path>
+						<path d="M49013.8 1215.9 L56905.5 1459 L56905.5 1697.5 L56905.5 1697.5 L56905.5 1936 L56905.5 1936 L62596 2585.292787944026 L62596.0 2585.3 " fill="none"></path>
 					</g>
-					<path d="M49361.5 1708.3 L49361.2 1702.9 L49360.9 1697.6 L49374.5 1702.1 Z"></path>
-					<path d="M41252.8 1747.2 L41252.75 1936 L60716.25 2612.897332357469 L60716.3 2612.9 " fill="none"></path>
+					<path d="M49014.0 1210.6 L49013.8 1215.9 L49013.7 1221.2 L49000.5 1215.5 Z"></path>
+					<path d="M14436.8 2742.7 L14436.75 3314 L15615.25 3475.3139449541286 L15615.3 3475.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41258.1 1737.8 L41252.8 1747.2 L41247.4 1737.8 L41252.8 1728.5 Z"></path>
+						<path d="M14442.1 2733.3 L14436.8 2742.7 L14431.4 2733.3 L14436.8 2724.0 Z"></path>
 					</g>
-					<path d="M47693.0 2712.7 L47693 3314 L46188.25 3483.7993495689 L46188.3 3483.8 " fill="none"></path>
+					<path d="M14256.2 1789.9 L14436.75 1936 L14436.75 2526 L14436.8 2526.0 " fill="none"></path>
+					<path d="M14259.5 1785.7 L14256.2 1789.9 L14252.8 1794.0 L14245.8 1781.5 Z"></path>
+					<path d="M29885.3 1747.2 L29885.25 1936 L62596 2617.7470941883766 L62596.0 2617.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47698.3 2703.3 L47693.0 2712.7 L47687.7 2703.3 L47693.0 2694.0 Z"></path>
+						<path d="M29890.6 1737.8 L29885.3 1747.2 L29879.9 1737.8 L29885.3 1728.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M49361.3 1709.0 L47693 1936 L47693 2556 L47693.0 2556.0 " fill="none"></path>
+						<path d="M15627.1 1216.2 L21916.25 1459 L21916.25 1666.5 L21916.3 1666.5 " fill="none"></path>
 					</g>
-					<path d="M49362.0 1714.3 L49361.3 1709.0 L49360.6 1703.7 L49374.5 1707.2 Z"></path>
-					<path d="M57860.9 2875.7 L57645 3314 L64938 3499.7232880453334 L64938.0 3499.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M57869.9 2869.7 L57860.9 2875.7 L57860.3 2865.0 L57869.2 2859.0 Z"></path>
+					<path d="M15627.3 1210.8 L15627.1 1216.2 L15626.9 1221.5 L15613.8 1215.6 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M32410.9 2676.1 L32191.25 3314 L32359.058981233244 3454.5 L32359.1 3454.5 " fill="none"></path>
+					</g>
+					<path d="M32415.9 2677.8 L32410.9 2676.1 L32405.9 2674.4 L32415.2 2663.5 Z"></path>
+					<g stroke-dasharray="6 6">
+						<path d="M32731.5 2706.8 L32731.5 3314 L32492.310991957103 3454.5 L32492.3 3454.5 " fill="none"></path>
 					</g>
-					<path d="M57875.3 2876.1 L57685 3314 L59258.25 3494.0344377972083 L59258.3 3494.0 " fill="none"></path>
+					<path d="M32736.8 2706.8 L32731.5 2706.8 L32726.2 2706.8 L32731.5 2693.5 Z"></path>
+					<path d="M58615.5 1350.7 L58570.5 1459 L58570.5 1644 L58570.5 1644.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57884.0 2869.7 L57875.3 2876.1 L57874.2 2865.4 L57882.8 2859.0 Z"></path>
+						<path d="M58624.0 1344.2 L58615.5 1350.7 L58614.2 1340.1 L58622.7 1333.5 Z"></path>
 					</g>
-					<path d="M57889.8 2876.5 L57725 3314 L57725 3500.5 L57725 3500.5 L57725 3687 L57725 3687 L57725 3843.5 L57725 3843.5 L57725 4000 L57725 4000 L61689 4132.363817592824 L61689.0 4132.4 " fill="none"></path>
+					<path d="M58761.7 1349.2 L58833 1459 L53736 1693.7237883761343 L53736.0 1693.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57898.1 2869.6 L57889.8 2876.5 L57888.1 2865.9 L57896.4 2859.0 Z"></path>
+						<path d="M58761.1 1338.4 L58761.7 1349.2 L58752.1 1344.2 L58751.5 1333.5 Z"></path>
 					</g>
-					<path d="M57904.3 2876.8 L57765 3314 L57765 3500.5 L57765 3500.5 L57765 3687 L57765 3687 L65717.75 3840.78313718222 L65717.8 3840.8 " fill="none"></path>
+					<path d="M58805.1 1346.8 L58915.5 1459 L58915.5 1697.5 L58915.5 1697.5 L58915.5 1936 L58915.5 1936 L58915.5 2625 L58915.5 2625 L58915.5 3314 L58915.5 3314 L40574 3500.139726288295 L40574.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57912.2 2869.5 L57904.3 2876.8 L57902.0 2866.3 L57910.0 2859.0 Z"></path>
+						<path d="M58802.4 1336.4 L58805.1 1346.8 L58794.8 1343.9 L58792.0 1333.5 Z"></path>
 					</g>
-					<path d="M58411.1 2868.2 L59192.75 3314 L61341.25 3496.051453884598 L61341.3 3496.1 " fill="none"></path>
+					<path d="M58825.7 1345.8 L58955.5 1459 L58955.5 1697.5 L58955.5 1697.5 L58955.5 1936 L58955.5 1936 L58955.5 2625 L58955.5 2625 L58955.5 3314 L58955.5 3314 L37439.5 3498.671821068618 L37439.5 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M58405.6 2859.0 L58411.1 2868.2 L58400.3 2868.3 L58394.8 2859.0 Z"></path>
+						<path d="M58822.2 1335.6 L58825.7 1345.8 L58815.2 1343.7 L58811.7 1333.5 Z"></path>
 					</g>
-					<path d="M59006.1 1731.1 L57984.5 1936 L57984.5 2391 L57984.5 2391.0 " fill="none"></path>
-					<path d="M59007.1 1736.4 L59006.1 1731.1 L59005.1 1725.9 L59019.2 1728.5 Z"></path>
+					<path d="M27849.7 1225.0 L29517.25 1459 L53572 1696.6897417837945 L53572.0 1696.7 " fill="none"></path>
+					<path d="M27850.4 1219.7 L27849.7 1225.0 L27849.0 1230.3 L27836.5 1223.2 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M67464.2 1224.4 L65059.25 1459 L65059.25 1697.5 L65059.25 1697.5 L65059.25 1936 L65059.25 1936 L58412 2583.3663733700837 L58412.0 2583.4 " fill="none"></path>
+						<path d="M59141.0 1256.8 L59141 1459 L53736 1693.9357572443957 L53736.0 1693.9 " fill="none"></path>
 					</g>
-					<path d="M67464.7 1229.7 L67464.2 1224.4 L67463.7 1219.1 L67477.5 1223.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83149.8 1262.2 L83022 1459 L83022 1697.5 L83022 1697.5 L83022 1936 L83022 1936 L58412 2613.235746380429 L58412.0 2613.2 " fill="none"></path>
+					<path d="M59146.3 1256.8 L59141.0 1256.8 L59135.7 1256.8 L59141.0 1243.5 Z"></path>
+					<path d="M6012.3 2756.9 L5845.75 3314 L37529.5 3499.3446579102138 L37529.5 3499.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M6020.1 2749.5 L6012.3 2756.9 L6009.9 2746.4 L6017.7 2739.0 Z"></path>
 					</g>
-					<path d="M83154.2 1265.1 L83149.8 1262.2 L83145.3 1259.3 L83157.0 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42572.6 1228.6 L41006.25 1459 L41006.25 1697.5 L41006.25 1697.5 L41006.25 1936 L41006.25 1936 L57557 2607.65148057073 L57557.0 2607.7 " fill="none"></path>
+					<path d="M6079.3 2757.3 L6195 3314 L47842.25 3500.1201379029408 L47842.3 3500.1 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M6082.6 2747.1 L6079.3 2757.3 L6072.1 2749.2 L6075.5 2739.0 Z"></path>
 					</g>
-					<path d="M42573.3 1233.9 L42572.6 1228.6 L42571.8 1223.4 L42585.8 1226.7 Z"></path>
-					<path d="M36249.1 2666.4 L35725.5 3314 L34928.5 3463.612984398591 L34928.5 3463.6 " fill="none"></path>
-					<path d="M36253.2 2669.7 L36249.1 2666.4 L36244.9 2663.0 L36257.4 2656.0 Z"></path>
-					<path d="M45337.0 1785.2 L45337 1936 L45337 2609.5 L45337.0 2609.5 " fill="none"></path>
+					<path d="M8005.6 672.5 L6051.75 966 L6051.75 1212.5 L6051.75 1212.5 L6051.75 1459 L6051.75 1459 L6051.75 1697.5 L6051.75 1697.5 L6051.75 1936 L6051.75 1936 L6051.75 2511 L6051.8 2511.0 " fill="none"></path>
+					<path d="M8006.4 677.8 L8005.6 672.5 L8004.8 667.2 L8018.8 670.5 Z"></path>
+					<path d="M33211.9 2749.1 L33013.5 3314 L41377 3499.8555555555554 L41377.0 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45342.3 1775.8 L45337.0 1785.2 L45331.7 1775.8 L45337.0 1766.5 Z"></path>
+						<path d="M33220.0 2742.1 L33211.9 2749.1 L33210.0 2738.5 L33218.1 2731.5 Z"></path>
 					</g>
-					<path d="M50903.7 1216.6 L45337 1459 L45337 1628.5 L45337.0 1628.5 " fill="none"></path>
-					<path d="M50903.9 1222.0 L50903.7 1216.6 L50903.4 1211.3 L50917.0 1216.0 Z"></path>
-					<path d="M46100.1 2712.1 L45945.25 3314 L59258.25 3499.7118441228167 L59258.3 3499.7 " fill="none"></path>
+					<path d="M33327.3 2747.6 L33659 3314 L40503 3499.5376117450396 L40503.0 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M46107.6 2704.4 L46100.1 2712.1 L46097.3 2701.7 L46104.7 2694.0 Z"></path>
+						<path d="M33327.2 2736.9 L33327.3 2747.6 L33318.0 2742.2 L33317.9 2731.5 Z"></path>
 					</g>
-					<path d="M46158.7 2711.2 L46411.75 3314 L45241.5 3485.615195596619 L45241.5 3485.6 " fill="none"></path>
+					<path d="M53749.1 1716.3 L54861 1936 L54861 2548.5 L54861.0 2548.5 " fill="none"></path>
+					<path d="M53750.1 1711.1 L53749.1 1716.3 L53748.0 1721.5 L53736.0 1713.7 Z"></path>
+					<path d="M32424.3 2682.1 L32377.25 3314 L32124.87600536193 3485 L32124.9 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M46160.0 2700.5 L46158.7 2711.2 L46150.2 2704.7 L46151.5 2694.0 Z"></path>
+						<path d="M32430.3 2673.2 L32424.3 2682.1 L32419.6 2672.4 L32425.6 2663.5 Z"></path>
 					</g>
-					<path d="M46689.1 2748.7 L46451.75 3314 L45464.03016085791 3485 L45464.0 3485.0 " fill="none"></path>
+					<path d="M32439.3 2681.8 L32560 3314 L32975.809651474534 3485 L32975.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M46697.6 2742.2 L46689.1 2748.7 L46687.8 2738.0 L46696.3 2731.5 Z"></path>
+						<path d="M32442.8 2671.7 L32439.3 2681.8 L32432.4 2673.7 L32435.8 2663.5 Z"></path>
 					</g>
-					<path d="M46781.5 2749.2 L46965.75 3314 L25783 3500.1177963606383 L25783.0 3500.1 " fill="none"></path>
+					<path d="M34083.2 2717.2 L33699 3314 L32159 3493.8434564809018 L32159.0 3493.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M46783.7 2738.7 L46781.5 2749.2 L46773.6 2742.0 L46775.7 2731.5 Z"></path>
+						<path d="M34092.7 2712.2 L34083.2 2717.2 L34083.7 2706.5 L34093.3 2701.5 Z"></path>
 					</g>
-					<path d="M47190.0 2749.2 L47005.75 3314 L47005.75 3485 L47005.8 3485.0 " fill="none"></path>
+					<path d="M34088.3 2717.6 L33739 3314 L33069 3486.2329427980703 L33069.0 3486.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47197.9 2742.0 L47190.0 2749.2 L47187.8 2738.7 L47195.8 2731.5 Z"></path>
+						<path d="M34097.6 2712.2 L34088.3 2717.6 L34088.4 2706.9 L34097.7 2701.5 Z"></path>
 					</g>
-					<path d="M47268.6 2749.3 L47441.75 3314 L25783 3500.126179313205 L25783.0 3500.1 " fill="none"></path>
+					<path d="M34146.6 2720.1 L34172 3314 L32863.5 3482.0104991394146 L32863.5 3482.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M47271.0 2738.9 L47268.6 2749.3 L47260.8 2742.0 L47263.2 2731.5 Z"></path>
+						<path d="M34151.5 2710.6 L34146.6 2720.1 L34140.8 2711.1 L34145.8 2701.5 Z"></path>
 					</g>
-					<path d="M14099.6 3449.9 L14111.5 3447 L14119 3447 L14119 3447 L14126.5 3500.5 L14126.5 3500.5 L14119 3554 L14119 3554 L14111.5 3554 L14111.5 3554 L14081.5 3546.7539503386006 L14081.5 3546.8 " fill="none"></path>
+					<path d="M59839.0 1277.2 L59839 1459 L59839 1666.5 L59839.0 1666.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M14089.3 3446.9 L14099.6 3449.9 L14091.8 3457.2 L14081.5 3454.2 Z"></path>
+						<path d="M59844.3 1267.8 L59839.0 1277.2 L59833.7 1267.8 L59839.0 1258.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3118.7 2652.5 L3441.5 3314 L13698.5 3497.0818299277407 L13698.5 3497.1 " fill="none"></path>
+					<path d="M6378.3 3900.7 L6378.25 4000 L53795 4133.584456813678 L53795.0 4133.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M6383.6 3891.3 L6378.3 3900.7 L6372.9 3891.3 L6378.3 3882.0 Z"></path>
 					</g>
-					<path d="M3123.5 2650.1 L3118.7 2652.5 L3113.9 2654.8 L3112.8 2640.5 Z"></path>
-					<path d="M26535.3 1777.7 L26535.25 1936 L38452.5 2597.6026630139195 L38452.5 2597.6 " fill="none"></path>
+					<path d="M8005.6 679.8 L6378.25 966 L6378.25 1212.5 L6378.25 1212.5 L6378.25 1459 L6378.25 1459 L6378.25 1697.5 L6378.25 1697.5 L6378.25 1936 L6378.25 1936 L6378.25 2625 L6378.25 2625 L6378.25 3314 L6378.25 3314 L6378.25 3500.5 L6378.25 3500.5 L6378.25 3687 L6378.25 3687 L6378.25 3805 L6378.3 3805.0 " fill="none"></path>
+					<path d="M8006.5 685.1 L8005.6 679.8 L8004.7 674.6 L8018.8 677.5 Z"></path>
+					<path d="M34502.7 2770.5 L34212 3314 L34212 3431.5 L34212.0 3431.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M26540.6 1768.3 L26535.3 1777.7 L26529.9 1768.3 L26535.3 1759.0 Z"></path>
+						<path d="M34511.8 2764.7 L34502.7 2770.5 L34502.4 2759.7 L34511.5 2754.0 Z"></path>
 					</g>
-					<path d="M29233.0 1220.4 L26535.25 1459 L26535.25 1636 L26535.3 1636.0 " fill="none"></path>
-					<path d="M29233.4 1225.7 L29233.0 1220.4 L29232.5 1215.1 L29246.3 1219.2 Z"></path>
-					<path d="M79326.3 165.3 L79326.25 293 L79326.25 583 L79326.3 583.0 " fill="none"></path>
-					<path d="M79331.6 165.3 L79326.3 165.3 L79320.9 165.3 L79326.3 152.0 Z"></path>
-					<path d="M27054.3 1777.7 L27054.25 1936 L38452.5 2596.4069417873734 L38452.5 2596.4 " fill="none"></path>
+					<path d="M34529.0 2771.6 L34338.25 3314 L40503 3499.432180154026 L40503.0 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27059.6 1768.3 L27054.3 1777.7 L27048.9 1768.3 L27054.3 1759.0 Z"></path>
+						<path d="M34537.1 2764.6 L34529.0 2771.6 L34527.0 2761.0 L34535.1 2754.0 Z"></path>
 					</g>
-					<path d="M29233.0 1222.2 L27054.25 1459 L27054.25 1636 L27054.3 1636.0 " fill="none"></path>
-					<path d="M29233.6 1227.5 L29233.0 1222.2 L29232.4 1216.9 L29246.3 1220.8 Z"></path>
-					<path d="M38471.5 2921.4 L37843 3314 L14081.5 3499.008965474053 L14081.5 3499.0 " fill="none"></path>
+					<path d="M34464.5 3618.2 L34464.5 3687 L34464.5 3828 L34464.5 3828.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38482.3 2921.0 L38471.5 2921.4 L38476.6 2911.9 L38487.4 2911.5 Z"></path>
+						<path d="M34469.8 3608.8 L34464.5 3618.2 L34459.2 3608.8 L34464.5 3599.5 Z"></path>
 					</g>
-					<path d="M38778.8 2927.8 L38565.5 3314 L59258.25 3499.9921623673144 L59258.3 3500.0 " fill="none"></path>
+					<path d="M34556.6 2767.1 L34464.5 3314 L34464.5 3401.5 L34464.5 3401.5 " fill="none"></path>
+					<path d="M34561.8 2768.0 L34556.6 2767.1 L34551.3 2766.3 L34558.8 2754.0 Z"></path>
+					<path d="M34612.7 2767.0 L34736.5 3314 L34736.5 3417 L34736.5 3417.0 " fill="none"></path>
+					<path d="M34617.9 2765.8 L34612.7 2767.0 L34607.5 2768.2 L34609.7 2754.0 Z"></path>
+					<path d="M29623.3 3923.7 L29623.25 4000 L41393.5 4133.185289957567 L41393.5 4133.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M38787.9 2922.2 L38778.8 2927.8 L38778.6 2917.1 L38787.8 2911.5 Z"></path>
+						<path d="M29628.6 3914.3 L29623.3 3923.7 L29617.9 3914.3 L29623.3 3905.0 Z"></path>
 					</g>
-					<path d="M39457.7 2745.5 L41872.75 3314 L61341.25 3499.998424773321 L61341.3 3500.0 " fill="none"></path>
+					<path d="M27849.7 1224.3 L29623.25 1459 L29623.25 1697.5 L29623.25 1697.5 L29623.25 1936 L29623.25 1936 L29623.25 2625 L29623.25 2625 L29623.25 3314 L29623.25 3314 L29623.25 3500.5 L29623.25 3500.5 L29623.25 3687 L29623.25 3687 L29623.25 3782 L29623.3 3782.0 " fill="none"></path>
+					<path d="M27850.4 1219.0 L27849.7 1224.3 L27849.0 1229.6 L27836.5 1222.6 Z"></path>
+					<path d="M34921.4 2712.3 L34805 3314 L32159 3496.5671476137627 L32159.0 3496.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M39449.8 2738.1 L39457.7 2745.5 L39447.4 2748.5 L39439.5 2741.2 Z"></path>
+						<path d="M34928.4 2704.2 L34921.4 2712.3 L34917.9 2702.2 L34924.9 2694.0 Z"></path>
 					</g>
-					<path d="M59162.7 1741.4 L59113.75 1936 L39439.5 2608.140335436526 L39439.5 2608.1 " fill="none"></path>
-					<path d="M59167.9 1742.7 L59162.7 1741.4 L59157.5 1740.1 L59166.0 1728.5 Z"></path>
-					<path d="M41934.9 1793.9 L41776 1936 L39439.5 2504.8510600706713 L39439.5 2504.9 " fill="none"></path>
+					<path d="M34954.7 2712.3 L35067.75 3314 L32863.5 3489.0633982753116 L32863.5 3489.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M41945.4 1791.7 L41934.9 1793.9 L41938.3 1783.7 L41948.8 1781.5 Z"></path>
+						<path d="M34958.2 2702.2 L34954.7 2712.3 L34947.7 2704.2 L34951.2 2694.0 Z"></path>
 					</g>
-					<path d="M42092.1 1798.3 L42159.5 1936 L42159.5 2625 L42159.5 2625 L42159.5 3314 L42159.5 3314 L48614 3496.873414356248 L48614.0 3496.9 " fill="none"></path>
+					<path d="M8583.2 674.0 L10495 966 L10495 1212.5 L10495 1212.5 L10495 1459 L10495 1459 L10495 1697.5 L10495 1697.5 L10495 1936 L10495 1936 L10495 2625 L10495 2625 L10495 3314 L10495 3314 L62541 3500.051369042485 L62541.0 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42092.8 1787.5 L42092.1 1798.3 L42083.2 1792.2 L42083.9 1781.5 Z"></path>
+						<path d="M8574.8 667.3 L8583.2 674.0 L8573.2 677.9 L8564.8 671.2 Z"></path>
 					</g>
-					<path d="M65137.4 2816.5 L64953.25 3314 L64967.23257372654 3485 L64967.2 3485.0 " fill="none"></path>
+					<path d="M8583.2 673.2 L10535 966 L10535 1212.5 L10535 1212.5 L10535 1459 L10535 1459 L10535 1697.5 L10535 1697.5 L10535 1936 L10535 1936 L10535 2625 L10535 2625 L10535 3314 L10535 3314 L57029 3500.3156639449935 L57029.0 3500.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65145.6 2809.6 L65137.4 2816.5 L65135.6 2805.9 L65143.9 2799.0 Z"></path>
+						<path d="M8574.8 666.6 L8583.2 673.2 L8573.2 677.1 L8564.8 670.5 Z"></path>
 					</g>
-					<path d="M65148.4 2816.8 L64993.25 3314 L64120.25 3491.164853101197 L64120.3 3491.2 " fill="none"></path>
+					<path d="M8583.4 651.1 L12843.75 966 L12843.75 1212.5 L12843.75 1212.5 L12843.75 1459 L12843.75 1459 L12843.75 1697.5 L12843.75 1697.5 L12843.75 1936 L12843.75 1936 L12843.75 2625 L12843.75 2625 L12843.75 3314 L12843.75 3314 L47842.25 3500.048149414967 L47842.3 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65156.3 2809.5 L65148.4 2816.8 L65146.1 2806.3 L65154.0 2799.0 Z"></path>
+						<path d="M8574.5 645.1 L8583.4 651.1 L8573.7 655.7 L8564.8 649.7 Z"></path>
 					</g>
-					<path d="M65536.2 2441.9 L66442.25 1936 L66325.60849056604 1804 L66325.6 1804.0 " fill="none"></path>
+					<path d="M70531.5 2769.7 L70184.5 3314 L45487.5 3500.089348120316 L45487.5 3500.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65525.4 2441.8 L65536.2 2441.9 L65530.6 2451.1 L65519.9 2451.0 Z"></path>
+						<path d="M70541.0 2764.7 L70531.5 2769.7 L70532.0 2759.0 L70541.5 2754.0 Z"></path>
 					</g>
-					<path d="M65162.4 2817.2 L65043.75 3314 L65043.75 3500.5 L65043.75 3500.5 L65043.75 3687 L65043.75 3687 L65043.75 3843.5 L65043.75 3843.5 L65043.75 4000 L65043.75 4000 L61787 4132.0137638962415 L61787.0 4132.0 " fill="none"></path>
+					<path d="M70539.6 2770.2 L70224.5 3314 L62792 3497.4031820587456 L62792.0 3497.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65169.7 2809.3 L65162.4 2817.2 L65159.4 2806.8 L65166.7 2799.0 Z"></path>
+						<path d="M70548.9 2764.7 L70539.6 2770.2 L70539.7 2759.4 L70549.0 2754.0 Z"></path>
 					</g>
-					<path d="M65222.4 2817.6 L65258.75 3314 L65258.75 3500.5 L65258.75 3500.5 L65258.75 3687 L65258.75 3687 L65717.75 3806.8223519599665 L65717.8 3806.8 " fill="none"></path>
+					<path d="M70667.6 2771.9 L70829.5 3314 L50783.5 3499.9758239024995 L50783.5 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65227.0 2807.9 L65222.4 2817.6 L65216.4 2808.7 L65221.0 2799.0 Z"></path>
+						<path d="M70670.1 2761.4 L70667.6 2771.9 L70659.8 2764.5 L70662.3 2754.0 Z"></path>
 					</g>
-					<path d="M65268.1 2816.8 L65423.25 3314 L61446.25 3498.0701079538403 L61446.3 3498.1 " fill="none"></path>
+					<path d="M70676.0 2771.6 L70869.5 3314 L59221.5 3499.663176787317 L59221.5 3499.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65270.4 2806.3 L65268.1 2816.8 L65260.2 2809.5 L65262.5 2799.0 Z"></path>
+						<path d="M70677.9 2761.0 L70676.0 2771.6 L70667.9 2764.6 L70669.8 2754.0 Z"></path>
 					</g>
-					<path d="M69184.3 673.1 L72204 966 L72204 1212.5 L72204 1212.5 L72204 1459 L72204 1459 L72204 1697.5 L72204 1697.5 L72204 1936 L72204 1936 L65638.25 2582.6500017867993 L65638.3 2582.7 " fill="none"></path>
-					<path d="M69184.8 667.8 L69184.3 673.1 L69183.8 678.4 L69171.0 671.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M67464.2 1224.6 L65099.25 1459 L65099.25 1697.5 L65099.25 1697.5 L65099.25 1936 L65099.25 1936 L65180.72314949202 2451 L65180.7 2451.0 " fill="none"></path>
+					<path d="M68602.0 690.7 L70623.75 966 L70623.75 1212.5 L70623.75 1212.5 L70623.75 1459 L70623.75 1459 L70623.75 1697.5 L70623.75 1697.5 L70623.75 1936 L70623.75 1936 L70623.75 2496 L70623.8 2496.0 " fill="none"></path>
+					<path d="M68602.7 685.4 L68602.0 690.7 L68601.2 696.0 L68588.8 688.9 Z"></path>
+					<path d="M53749.2 1713.3 L55088.5 1936 L55088.5 2594 L55088.5 2594.0 " fill="none"></path>
+					<path d="M53750.0 1708.1 L53749.2 1713.3 L53748.3 1718.6 L53736.0 1711.1 Z"></path>
+					<path d="M27849.8 1221.4 L30244.25 1459 L30244.25 1666.5 L30244.3 1666.5 " fill="none"></path>
+					<path d="M27850.3 1216.1 L27849.8 1221.4 L27849.2 1226.7 L27836.5 1220.0 Z"></path>
+					<path d="M53749.2 1711.4 L55284 1936 L55284 2594 L55284.0 2594.0 " fill="none"></path>
+					<path d="M53750.0 1706.2 L53749.2 1711.4 L53748.4 1716.7 L53736.0 1709.5 Z"></path>
+					<path d="M53749.3 1707.8 L55853.5 1936 L55853.5 2594 L55853.5 2594.0 " fill="none"></path>
+					<path d="M53749.8 1702.5 L53749.3 1707.8 L53748.7 1713.1 L53736.0 1706.4 Z"></path>
+					<path d="M53749.3 1706.8 L56101 1936 L56101 2594 L56101.0 2594.0 " fill="none"></path>
+					<path d="M53749.8 1701.5 L53749.3 1706.8 L53748.8 1712.1 L53736.0 1705.5 Z"></path>
+					<path d="M53749.3 1706.0 L56341 1936 L56341 2594 L56341.0 2594.0 " fill="none"></path>
+					<path d="M53749.8 1700.6 L53749.3 1706.0 L53748.8 1711.3 L53736.0 1704.8 Z"></path>
+					<path d="M58349.0 2674.7 L58349 3314 L46088.5 3499.2459391582615 L46088.5 3499.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M58354.3 2665.3 L58349.0 2674.7 L58343.7 2665.3 L58349.0 2656.0 Z"></path>
 					</g>
-					<path d="M67464.8 1229.9 L67464.2 1224.6 L67463.7 1219.3 L67477.5 1223.3 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42572.7 1235.3 L41499.25 1459 L41499.25 1697.5 L41499.25 1697.5 L41499.25 1936 L41499.25 1936 L64778.25 2612.503901472015 L64778.3 2612.5 " fill="none"></path>
+					<path d="M58511.7 1760.8 L58349 1936 L58349 2594 L58349.0 2594.0 " fill="none"></path>
+					<path d="M58515.6 1764.4 L58511.7 1760.8 L58507.8 1757.1 L58520.8 1751.0 Z"></path>
+					<path d="M58710.5 2674.7 L58710.5 3314 L43087 3498.984461797289 L43087.0 3499.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M58715.8 2665.3 L58710.5 2674.7 L58705.2 2665.3 L58710.5 2656.0 Z"></path>
 					</g>
-					<path d="M42573.8 1240.5 L42572.7 1235.3 L42571.6 1230.1 L42585.8 1232.6 Z"></path>
-					<path d="M65967.3 1811.4 L65678.25 1936 L65678.25 2625 L65678.25 2625 L65678.25 3314 L65678.25 3314 L65678.25 3500.5 L65678.25 3500.5 L65678.25 3687 L65678.25 3687 L65717.75 3721.3430555555556 L65717.8 3721.3 " fill="none"></path>
+					<path d="M58608.7 1762.5 L58710.5 1936 L58710.5 2594 L58710.5 2594.0 " fill="none"></path>
+					<path d="M58613.3 1759.8 L58608.7 1762.5 L58604.1 1765.2 L58601.9 1751.0 Z"></path>
+					<path d="M38208.0 2745.4 L37740.5 3314 L40503 3498.1337562544677 L40503.0 3498.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M65978.0 1812.6 L65967.3 1811.4 L65973.8 1802.8 L65984.5 1804.0 Z"></path>
+						<path d="M38218.0 2741.6 L38208.0 2745.4 L38209.8 2734.8 L38219.8 2731.0 Z"></path>
 					</g>
-					<path d="M66221.0 1822.6 L66211.5 1936 L65461.61066763425 2451 L65461.6 2451.0 " fill="none"></path>
+					<path d="M38214.7 2745.8 L37780.5 3314 L39971 3496.134752563531 L39971.0 3496.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66227.1 1813.7 L66221.0 1822.6 L66216.5 1812.9 L66222.6 1804.0 Z"></path>
+						<path d="M38224.6 2741.7 L38214.7 2745.8 L38216.1 2735.2 L38226.0 2731.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M67464.4 1234.6 L66231.5 1459 L66231.5 1591 L66231.5 1591.0 " fill="none"></path>
+					<path d="M38332.9 2749.3 L38450.5 3314 L35891 3492.781554307116 L35891.0 3492.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M38336.2 2739.0 L38332.9 2749.3 L38325.8 2741.2 L38329.1 2731.0 Z"></path>
 					</g>
-					<path d="M67465.3 1239.9 L67464.4 1234.6 L67463.4 1229.4 L67477.5 1232.2 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83157.4 1263.0 L83062 1459 L66653 1691.5270491072754 L66653.0 1691.5 " fill="none"></path>
+					<path d="M27849.8 1220.6 L30462.25 1459 L30462.25 1651 L30462.3 1651.0 " fill="none"></path>
+					<path d="M27850.3 1215.3 L27849.8 1220.6 L27849.3 1226.0 L27836.5 1219.4 Z"></path>
+					<path d="M35224.0 2712.0 L35132.5 3314 L35132.5 3485 L35132.5 3485.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M35230.7 2703.5 L35224.0 2712.0 L35220.2 2701.9 L35226.8 2693.5 Z"></path>
 					</g>
-					<path d="M83162.2 1265.3 L83157.4 1263.0 L83152.6 1260.7 L83163.3 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42572.7 1236.1 L41539.25 1459 L65810 1693.4287731980683 L65810.0 1693.4 " fill="none"></path>
+					<path d="M35275.0 2710.6 L35541.25 3314 L40503 3499.175121316724 L40503.0 3499.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M35276.1 2699.9 L35275.0 2710.6 L35266.4 2704.2 L35267.5 2693.5 Z"></path>
 					</g>
-					<path d="M42573.8 1241.3 L42572.7 1236.1 L42571.6 1230.9 L42585.8 1233.3 Z"></path>
-					<path d="M49043.7 2711.1 L48779 3314 L20909.5 3499.498278015703 L20909.5 3499.5 " fill="none"></path>
+					<path d="M33582.9 1735.8 L31690.25 1936 L31690.25 2625 L31690.25 2625 L31690.25 3314 L31690.25 3314 L19223 3499.429122555177 L19223.0 3499.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49052.3 2704.7 L49043.7 2711.1 L49042.6 2700.4 L49051.2 2694.0 Z"></path>
+						<path d="M33592.8 1740.2 L33582.9 1735.8 L33591.7 1729.6 L33601.5 1733.9 Z"></path>
 					</g>
-					<path d="M49124.0 2710.7 L49423.25 3314 L24714 3499.419416977659 L24714.0 3499.4 " fill="none"></path>
+					<path d="M33583.0 1740.2 L31920.75 1936 L31920.75 2609.5 L31920.8 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49124.6 2700.0 L49124.0 2710.7 L49115.1 2704.7 L49115.7 2694.0 Z"></path>
+						<path d="M33592.9 1744.4 L33583.0 1740.2 L33591.6 1733.8 L33601.5 1738.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M49435.5 1741.5 L49389 1936 L49389 2563.5 L49389.0 2563.5 " fill="none"></path>
+					<path d="M33583.0 1745.7 L32151.25 1936 L32151.25 2625 L32151.25 2625 L32151.25 3314 L32151.25 3314 L13646.5 3498.8517454706143 L13646.5 3498.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M33593.0 1749.7 L33583.0 1745.7 L33591.5 1739.2 L33601.5 1743.2 Z"></path>
 					</g>
-					<path d="M49440.7 1742.7 L49435.5 1741.5 L49430.3 1740.2 L49438.6 1728.5 Z"></path>
-					<path d="M20927.4 3450.6 L20939.5 3447 L20947 3447 L20947 3447 L20954.5 3500.5 L20954.5 3500.5 L20947 3554 L20947 3554 L20939.5 3554 L20939.5 3554 L20909.5 3545.1080332409974 L20909.5 3545.1 " fill="none"></path>
+					<path d="M33583.4 1786.2 L32972 1936 L32972 2609.5 L32972.0 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M20916.9 3448.1 L20927.4 3450.6 L20920.0 3458.4 L20909.5 3455.9 Z"></path>
+						<path d="M33593.7 1789.2 L33583.4 1786.2 L33591.2 1778.8 L33601.5 1781.8 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3120.1 2652.2 L3481.5 3314 L20608.5 3498.8754449428448 L20608.5 3498.9 " fill="none"></path>
+					<path d="M33747.8 1907.1 L33720.5 1936 L33720.5 2609.5 L33720.5 2609.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M33758.1 1903.9 L33747.8 1907.1 L33750.3 1896.6 L33760.6 1893.5 Z"></path>
 					</g>
-					<path d="M3124.8 2649.6 L3120.1 2652.2 L3115.4 2654.8 L3113.7 2640.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M50903.8 1227.5 L49446 1459 L49446 1666.5 L49446.0 1666.5 " fill="none"></path>
+					<path d="M34307.9 1764.4 L35237.25 1936 L35237.25 2556.5 L35237.3 2556.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M34299.6 1757.5 L34307.9 1764.4 L34297.7 1768.0 L34289.5 1761.0 Z"></path>
 					</g>
-					<path d="M50904.7 1232.8 L50903.8 1227.5 L50903.0 1222.3 L50917.0 1225.4 Z"></path>
-					<path d="M71485.7 2884.5 L71364.75 3314 L64999 3499.6106898573385 L64999.0 3499.6 " fill="none"></path>
+					<path d="M34308.0 1744.6 L35780.5 1936 L35780.5 2625 L35780.5 2625 L35780.5 3314 L35780.5 3314 L35780.5 3485 L35780.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71493.4 2876.9 L71485.7 2884.5 L71483.1 2874.0 L71490.8 2866.5 Z"></path>
+						<path d="M34299.4 1738.1 L34308.0 1744.6 L34298.1 1748.7 L34289.5 1742.2 Z"></path>
 					</g>
-					<path d="M71500.7 2884.7 L71404.75 3314 L59371.25 3499.6284325889164 L59371.3 3499.6 " fill="none"></path>
+					<path d="M34308.0 1743.6 L35820.5 1936 L35820.5 2625 L35820.5 2625 L35820.5 3314 L35820.5 3314 L40503 3499.096704111912 L40503.0 3499.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71507.9 2876.8 L71500.7 2884.7 L71497.5 2874.4 L71504.8 2866.5 Z"></path>
+						<path d="M34299.4 1737.1 L34308.0 1743.6 L34298.1 1747.7 L34289.5 1741.3 Z"></path>
 					</g>
-					<path d="M71624.3 2884.6 L71732.75 3314 L61446.25 3499.5529790115097 L61446.3 3499.6 " fill="none"></path>
+					<path d="M34308.0 1742.6 L35860.5 1936 L35860.5 2625 L35860.5 2625 L35860.5 3314 L35860.5 3314 L16376.25 3498.825737827906 L16376.3 3498.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71627.2 2874.2 L71624.3 2884.6 L71616.9 2876.9 L71619.7 2866.5 Z"></path>
+						<path d="M34299.4 1736.2 L34308.0 1742.6 L34298.1 1746.8 L34289.5 1740.3 Z"></path>
 					</g>
-					<path d="M69184.3 672.6 L72244 966 L72244 1212.5 L72244 1212.5 L72244 1459 L72244 1459 L72244 1697.5 L72244 1697.5 L72244 1936 L72244 1936 L71798.93559506531 2383.5 L71798.9 2383.5 " fill="none"></path>
-					<path d="M69184.8 667.3 L69184.3 672.6 L69183.8 677.9 L69171.0 671.3 Z"></path>
-					<path d="M36260.0 2667.8 L35919.5 3314 L35191.5 3475.729600952948 L35191.5 3475.7 " fill="none"></path>
-					<path d="M36264.7 2670.3 L36260.0 2667.8 L36255.2 2665.3 L36266.2 2656.0 Z"></path>
-					<path d="M49805.0 2727.7 L49805 3314 L49853.00938337802 3386.5 L49853.0 3386.5 " fill="none"></path>
+					<path d="M16394.3 3450.1 L16406.25 3447 L16413.75 3447 L16413.75 3447 L16421.25 3500.5 L16421.25 3500.5 L16413.75 3554 L16413.75 3554 L16406.25 3554 L16406.25 3554 L16376.25 3546.227602905569 L16376.3 3546.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M49810.3 2718.3 L49805.0 2727.7 L49799.7 2718.3 L49805.0 2709.0 Z"></path>
+						<path d="M16383.9 3447.3 L16394.3 3450.1 L16386.6 3457.6 L16376.3 3454.8 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M49503.8 1735.9 L49805 1936 L49805 2541 L49805.0 2541.0 " fill="none"></path>
+						<path d="M4129.3 2650.1 L4765.75 3314 L16023.25 3497.621108098653 L16023.3 3497.6 " fill="none"></path>
 					</g>
-					<path d="M49506.7 1731.4 L49503.8 1735.9 L49500.8 1740.3 L49492.7 1728.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M49529.9 1730.5 L50052 1936 L50052 2625 L50052 2625 L50052 3314 L50052 3314 L50003.99061662198 3386.5 L50004.0 3386.5 " fill="none"></path>
+					<path d="M4133.2 2646.4 L4129.3 2650.1 L4125.5 2653.8 L4120.1 2640.5 Z"></path>
+					<path d="M39817.0 2755.0 L39520.25 3314 L40116 3487.808955807587 L40116.0 3487.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M39826.1 2749.2 L39817.0 2755.0 L39816.7 2744.2 L39825.7 2738.5 Z"></path>
 					</g>
-					<path d="M49531.9 1725.6 L49529.9 1730.5 L49528.0 1735.5 L49517.5 1725.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3121.5 2651.9 L3521.5 3314 L2438 3472.240211433046 L2438.0 3472.2 " fill="none"></path>
+					<path d="M39824.4 2755.4 L39560.25 3314 L39560.25 3500.5 L39560.25 3500.5 L39560.25 3687 L39560.25 3687 L39560.25 3843.5 L39560.25 3843.5 L39560.25 4000 L39560.25 4000 L41393.5 4128.936097624984 L41393.5 4128.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M39833.2 2749.2 L39824.4 2755.4 L39823.5 2744.7 L39832.3 2738.5 Z"></path>
 					</g>
-					<path d="M3126.1 2649.2 L3121.5 2651.9 L3116.9 2654.7 L3114.6 2640.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M49530.4 1720.0 L50339 1936 L50339 2563.5 L50339.0 2563.5 " fill="none"></path>
+					<path d="M39832.9 2755.8 L39606.5 3314 L43339.25 3496.180667320903 L43339.3 3496.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M39841.4 2749.2 L39832.9 2755.8 L39831.5 2745.1 L39840.0 2738.5 Z"></path>
 					</g>
-					<path d="M49531.8 1714.9 L49530.4 1720.0 L49529.0 1725.2 L49517.5 1716.6 Z"></path>
-					<path d="M42578.3 1747.2 L42578.25 1936 L62772.25 2613.3277188199786 L62772.3 2613.3 " fill="none"></path>
+					<path d="M39840.4 2756.1 L39646.5 3314 L39992.167560321715 3485 L39992.2 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M42583.6 1737.8 L42578.3 1747.2 L42572.9 1737.8 L42578.3 1728.5 Z"></path>
+						<path d="M39848.5 2749.1 L39840.4 2756.1 L39838.4 2745.6 L39846.5 2738.5 Z"></path>
 					</g>
-					<path d="M27505.8 1762.7 L27505.75 1936 L45441 2620.2880736485085 L45441.0 2620.3 " fill="none"></path>
+					<path d="M39913.2 2756.8 L40028.25 3314 L40248.07439678284 3485 L40248.1 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27511.1 1753.3 L27505.8 1762.7 L27500.4 1753.3 L27505.8 1744.0 Z"></path>
+						<path d="M39916.5 2746.6 L39913.2 2756.8 L39906.1 2748.7 L39909.4 2738.5 Z"></path>
 					</g>
-					<path d="M29233.0 1224.6 L27505.75 1459 L27505.75 1651 L27505.8 1651.0 " fill="none"></path>
-					<path d="M29233.8 1229.9 L29233.0 1224.6 L29232.3 1219.3 L29246.3 1222.8 Z"></path>
-					<path d="M55737.8 2742.7 L55737.75 3314 L52887 3489.1923140291624 L52887.0 3489.2 " fill="none"></path>
+					<path d="M42402.0 3916.2 L42402 4000 L41537.5 4123.697810998398 L41537.5 4123.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55743.1 2733.3 L55737.8 2742.7 L55732.4 2733.3 L55737.8 2724.0 Z"></path>
+						<path d="M42407.3 3906.8 L42402.0 3916.2 L42396.7 3906.8 L42402.0 3897.5 Z"></path>
 					</g>
-					<path d="M55835.4 1792.5 L55737.75 1936 L55737.75 2526 L55737.8 2526.0 " fill="none"></path>
-					<path d="M55839.8 1795.5 L55835.4 1792.5 L55830.9 1789.5 L55842.9 1781.5 Z"></path>
-					<path d="M63055.6 2854.5 L62926.25 3314 L64938 3497.7147141633004 L64938.0 3497.7 " fill="none"></path>
+					<path d="M40307.4 2801.4 L40158.25 3314 L40378.07439678284 3485 L40378.1 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63063.3 2846.9 L63055.6 2854.5 L63053.0 2844.0 L63060.7 2836.5 Z"></path>
+						<path d="M40315.1 2794.0 L40307.4 2801.4 L40304.9 2791.0 L40312.6 2783.5 Z"></path>
 					</g>
-					<path d="M63068.9 2854.7 L62966.25 3314 L59371.25 3497.6142681089964 L59371.3 3497.6 " fill="none"></path>
+					<path d="M40325.3 2801.8 L40228.5 3314 L40040.53753351206 3485 L40040.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63076.1 2846.8 L63068.9 2854.7 L63065.7 2844.4 L63073.0 2836.5 Z"></path>
+						<path d="M40332.3 2793.7 L40325.3 2801.8 L40321.8 2791.7 L40328.8 2783.5 Z"></path>
 					</g>
-					<path d="M63178.2 2854.6 L63294.25 3314 L61446.25 3495.3480662983425 L61446.3 3495.3 " fill="none"></path>
+					<path d="M40335.6 2802.0 L40268.5 3314 L40516.06032171582 3485 L40516.1 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63181.1 2844.2 L63178.2 2854.6 L63170.8 2846.9 L63173.7 2836.5 Z"></path>
+						<path d="M40342.1 2793.4 L40335.6 2802.0 L40331.5 2792.1 L40338.0 2783.5 Z"></path>
 					</g>
-					<path d="M59177.3 1741.8 L59192.75 1936 L62772.25 2563.9504774029283 L62772.3 2564.0 " fill="none"></path>
-					<path d="M59182.6 1741.4 L59177.3 1741.8 L59172.0 1742.2 L59176.2 1728.5 Z"></path>
-					<path d="M63234.2 1835.3 L63120.25 1936 L63120.25 2413.5 L63120.3 2413.5 " fill="none"></path>
-					<path d="M63237.8 1839.3 L63234.2 1835.3 L63230.7 1831.3 L63244.2 1826.5 Z"></path>
-					<path d="M82417.4 1831.9 L82216.5 1936 L63468.25 2612.4440269686456 L63468.3 2612.4 " fill="none"></path>
-					<path d="M82419.9 1836.6 L82417.4 1831.9 L82415.0 1827.2 L82429.3 1825.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M67464.6 1246.0 L66693 1459 L66693 1697.5 L66693 1697.5 L66693 1936 L66693 1936 L63468.25 2557.888671191659 L63468.3 2557.9 " fill="none"></path>
+					<path d="M40442.2 2800.4 L40686.75 3314 L41867 3490.3401762467456 L41867.0 3490.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M40443.0 2789.6 L40442.2 2800.4 L40433.4 2794.2 L40434.2 2783.5 Z"></path>
 					</g>
-					<path d="M67466.1 1251.1 L67464.6 1246.0 L67463.2 1240.9 L67477.5 1242.4 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83165.4 1263.7 L83102 1459 L83102 1697.5 L83102 1697.5 L83102 1936 L83102 1936 L63468.25 2613.000450411 L63468.3 2613.0 " fill="none"></path>
+					<path d="M40464.7 2799.5 L40777 3314 L41377 3491.901430842607 L41377.0 3491.9 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M40464.4 2788.7 L40464.7 2799.5 L40455.2 2794.2 L40455.0 2783.5 Z"></path>
 					</g>
-					<path d="M83170.5 1265.3 L83165.4 1263.7 L83160.3 1262.0 L83169.5 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42572.7 1237.0 L41579.25 1459 L41579.25 1697.5 L41579.25 1697.5 L41579.25 1936 L41579.25 1936 L62772.25 2613.8690404345202 L62772.3 2613.9 " fill="none"></path>
+					<path d="M41034.2 2771.3 L40817 3314 L41377 3491.3174872665536 L41377.0 3491.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M41042.6 2764.6 L41034.2 2771.3 L41032.7 2760.7 L41041.1 2754.0 Z"></path>
 					</g>
-					<path d="M42573.9 1242.2 L42572.7 1237.0 L42571.6 1231.8 L42585.8 1234.1 Z"></path>
-					<path d="M36275.0 2669.1 L36166 3314 L35516.06836461126 3469.5 L35516.1 3469.5 " fill="none"></path>
-					<path d="M36280.3 2670.0 L36275.0 2669.1 L36269.8 2668.3 L36277.3 2656.0 Z"></path>
-					<path d="M67307.4 2821.2 L66922.25 3314 L64999 3497.5885476647472 L64999.0 3497.6 " fill="none"></path>
+					<path d="M41112.6 2772.5 L41185.5 3314 L41105.73056300268 3485 L41105.7 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67317.4 2817.1 L67307.4 2821.2 L67308.9 2810.6 L67318.9 2806.5 Z"></path>
+						<path d="M41116.6 2762.5 L41112.6 2772.5 L41106.1 2764.0 L41110.1 2754.0 Z"></path>
 					</g>
-					<path d="M67318.5 2821.6 L66962.25 3314 L64120.25 3497.529432132964 L64120.3 3497.5 " fill="none"></path>
+					<path d="M41133.0 2772.0 L41281.25 3314 L41252.5971849866 3485 L41252.6 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67328.3 2817.2 L67318.5 2821.6 L67319.6 2810.9 L67329.4 2806.5 Z"></path>
+						<path d="M41135.6 2761.6 L41133.0 2772.0 L41125.4 2764.4 L41128.0 2754.0 Z"></path>
 					</g>
-					<path d="M67360.5 2823.2 L67112 3314 L67112 3500.5 L67112 3500.5 L67112 3687 L67112 3687 L67112 3843.5 L67112 3843.5 L67112 4000 L67112 4000 L61787 4132.778191291403 L61787.0 4132.8 " fill="none"></path>
+					<path d="M41483.9 2719.5 L41321.25 3314 L35010 3498.4830727636063 L35010.0 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67369.4 2817.2 L67360.5 2823.2 L67359.9 2812.4 L67368.9 2806.5 Z"></path>
+						<path d="M41491.5 2711.9 L41483.9 2719.5 L41481.2 2709.1 L41488.8 2701.5 Z"></path>
 					</g>
-					<path d="M67438.8 2825.1 L67385 3314 L67385 3500.5 L67385 3500.5 L67385 3687 L67385 3687 L65998.75 3829.0980022924514 L65998.8 3829.1 " fill="none"></path>
+					<path d="M41505.7 2720.2 L41480.75 3314 L46344.5 3498.809122395966 L46344.5 3498.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67445.1 2816.4 L67438.8 2825.1 L67434.5 2815.2 L67440.8 2806.5 Z"></path>
+						<path d="M41511.5 2711.0 L41505.7 2720.2 L41500.8 2710.6 L41506.5 2701.5 Z"></path>
 					</g>
-					<path d="M67539.5 2823.9 L67733.75 3314 L61446.25 3498.955638801262 L61446.3 3499.0 " fill="none"></path>
+					<path d="M41531.7 2719.7 L41669.25 3314 L41652.51675603217 3485 L41652.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M67541.1 2813.2 L67539.5 2823.9 L67531.1 2817.1 L67532.7 2806.5 Z"></path>
+						<path d="M41534.8 2709.4 L41531.7 2719.7 L41524.4 2711.8 L41527.5 2701.5 Z"></path>
 					</g>
-					<path d="M69184.3 672.1 L72284 966 L72284 1212.5 L72284 1212.5 L72284 1459 L72284 1459 L72284 1697.5 L72284 1697.5 L72284 1936 L72284 1936 L68006.75 2547.0040429171204 L68006.8 2547.0 " fill="none"></path>
-					<path d="M69184.8 666.8 L69184.3 672.1 L69183.8 677.4 L69171.0 670.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M67464.7 1247.6 L66733 1459 L66733 1697.5 L66733 1697.5 L66733 1936 L66733 1936 L67269.04227140783 2443.5 L67269.0 2443.5 " fill="none"></path>
+					<path d="M42701.5 3940.9 L42648.25 4000 L41537.5 4125.842739378567 L41537.5 4125.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M42711.7 3937.5 L42701.5 3940.9 L42703.8 3930.4 L42714.0 3927.0 Z"></path>
 					</g>
-					<path d="M67466.2 1252.7 L67464.7 1247.6 L67463.2 1242.4 L67477.5 1243.9 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83173.6 1264.2 L83142 1459 L83142 1697.5 L83142 1697.5 L83142 1936 L83142 1936 L68006.75 2601.0099481865286 L68006.8 2601.0 " fill="none"></path>
+					<path d="M42725.2 3942.7 L42688.25 4000 L39964.25 4127.183275261324 L39964.3 4127.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M42734.8 3937.7 L42725.2 3942.7 L42725.8 3932.0 L42735.4 3927.0 Z"></path>
 					</g>
-					<path d="M83178.9 1265.0 L83173.6 1264.2 L83168.4 1263.3 L83175.8 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42572.8 1237.9 L41619.25 1459 L41619.25 1697.5 L41619.25 1697.5 L41619.25 1936 L41619.25 1936 L66914.75 2610.4422537391406 L66914.8 2610.4 " fill="none"></path>
+					<path d="M42785.7 3945.7 L42783.75 4000 L40291.25 4126.705235204856 L40291.3 4126.7 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M42791.3 3936.5 L42785.7 3945.7 L42780.7 3936.1 L42786.3 3927.0 Z"></path>
 					</g>
-					<path d="M42574.0 1243.1 L42572.8 1237.9 L42571.6 1232.7 L42585.8 1234.9 Z"></path>
-					<path d="M27524.8 2694.0 L26104.5 3314 L27548.25 3488.8153708813506 L27548.3 3488.8 " fill="none"></path>
+					<path d="M42956.6 3936.0 L43072.25 4000 L40605.25 4126.950076804916 L40605.3 4127.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27535.5 2695.1 L27524.8 2694.0 L27531.2 2685.3 L27541.9 2686.5 Z"></path>
+						<path d="M42951.0 3926.8 L42956.6 3936.0 L42945.8 3936.2 L42940.2 3927.0 Z"></path>
 					</g>
-					<path d="M27730.7 2702.4 L28109.5 3314 L28175.286863270776 3485 L28175.3 3485.0 " fill="none"></path>
+					<path d="M42978.4 3935.1 L43112.25 4000 L41757.5 4125.652535040665 L41757.5 4125.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27730.3 2691.6 L27730.7 2702.4 L27721.2 2697.2 L27720.8 2686.5 Z"></path>
+						<path d="M42972.3 3926.3 L42978.4 3935.1 L42967.7 3935.9 L42961.6 3927.0 Z"></path>
 					</g>
-					<path d="M29233.1 1226.2 L27717.75 1459 L27717.75 1697.5 L27717.75 1697.5 L27717.75 1936 L27717.75 1936 L27685.874092888243 2563.5 L27685.9 2563.5 " fill="none"></path>
-					<path d="M29233.9 1231.5 L29233.1 1226.2 L29232.3 1220.9 L29246.3 1224.2 Z"></path>
-					<path d="M53428.1 2769.0 L53022.25 3314 L59258.25 3498.825427095749 L59258.3 3498.8 " fill="none"></path>
+					<path d="M41868.8 2704.7 L41868.75 3314 L45378.5 3497.6482780388583 L45378.5 3497.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53437.9 2764.7 L53428.1 2769.0 L53429.4 2758.3 L53439.2 2754.0 Z"></path>
+						<path d="M41874.1 2695.3 L41868.8 2704.7 L41863.4 2695.3 L41868.8 2686.0 Z"></path>
 					</g>
-					<path d="M53643.0 2768.9 L54051.25 3314 L61341.25 3499.1664964249235 L61341.3 3499.2 " fill="none"></path>
+					<path d="M42141.7 2734.4 L42035.25 3314 L40574 3496.0765825956237 L40574.0 3496.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53641.7 2758.3 L53643.0 2768.9 L53633.2 2764.7 L53631.9 2754.0 Z"></path>
+						<path d="M42148.6 2726.1 L42141.7 2734.4 L42138.1 2724.2 L42145.0 2716.0 Z"></path>
 					</g>
-					<path d="M59184.6 1741.4 L59232.75 1936 L53883.25 2582.9162790697674 L53883.3 2582.9 " fill="none"></path>
-					<path d="M59189.8 1740.2 L59184.6 1741.4 L59179.4 1742.7 L59181.4 1728.5 Z"></path>
-					<path d="M36289.8 2669.2 L36395.75 3314 L35951.461126005364 3454.5 L35951.5 3454.5 " fill="none"></path>
-					<path d="M36295.0 2668.3 L36289.8 2669.2 L36284.5 2670.0 L36287.6 2656.0 Z"></path>
-					<path d="M81794.0 2712.7 L81794 3314 L61180.25 3497.991881932064 L61180.3 3498.0 " fill="none"></path>
+					<path d="M42195.5 2733.8 L42375.25 3314 L23443 3499.0630724478165 L23443.0 3499.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M81799.3 2703.3 L81794.0 2712.7 L81788.7 2703.3 L81794.0 2694.0 Z"></path>
+						<path d="M42197.8 2723.3 L42195.5 2733.8 L42187.6 2726.5 L42189.9 2716.0 Z"></path>
 					</g>
-					<path d="M82084.0 172.6 L81794 293 L81794 629.5 L81794 629.5 L81794 966 L81794 966 L81794 1212.5 L81794 1212.5 L81794 1459 L81794 1459 L81794 1697.5 L81794 1697.5 L81794 1936 L81794 1936 L81794 2556 L81794.0 2556.0 " fill="none"></path>
-					<path d="M82086.1 177.5 L82084.0 172.6 L82082.0 167.7 L82096.3 167.5 Z"></path>
-					<path d="M51004.3 1272.3 L51022.25 1459 L51022.25 1613.5 L51022.3 1613.5 " fill="none"></path>
-					<path d="M51009.6 1271.8 L51004.3 1272.3 L50999.0 1272.8 L51003.0 1259.0 Z"></path>
-					<path d="M44527.5 1747.2 L44527.5 1936 L53187.25 2598.381588076934 L53187.3 2598.4 " fill="none"></path>
+					<path d="M42219.8 2732.4 L42534.25 3314 L40076 3496.6002688439708 L40076.0 3496.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M44532.8 1737.8 L44527.5 1747.2 L44522.2 1737.8 L44527.5 1728.5 Z"></path>
+						<path d="M42220.1 2721.7 L42219.8 2732.4 L42210.7 2726.7 L42210.9 2716.0 Z"></path>
 					</g>
-					<path d="M50797.6 2725.3 L50472.5 3314 L36482.5 3499.74321919271 L36482.5 3499.7 " fill="none"></path>
+					<path d="M42235.7 2731.3 L42640.75 3314 L43362.34249329759 3485 L43362.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M50806.8 2719.7 L50797.6 2725.3 L50797.4 2714.6 L50806.6 2709.0 Z"></path>
+						<path d="M42234.7 2720.6 L42235.7 2731.3 L42226.0 2726.7 L42225.0 2716.0 Z"></path>
 					</g>
-					<path d="M50869.9 2727.4 L50966.5 3314 L52519 3480.7384105960264 L52519.0 3480.7 " fill="none"></path>
+					<path d="M23460.6 3443.8 L23473 3439.5 L23480.5 3439.5 L23480.5 3439.5 L23488 3500.5 L23488 3500.5 L23480.5 3561.5 L23480.5 3561.5 L23473 3561.5 L23473 3561.5 L23443 3551.1610169491523 L23443.0 3551.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M50873.6 2717.3 L50869.9 2727.4 L50863.1 2719.1 L50866.8 2709.0 Z"></path>
+						<path d="M23450.1 3441.8 L23460.6 3443.8 L23453.6 3451.8 L23443.0 3449.8 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M49530.6 1711.8 L50853 1936 L50853 2541 L50853.0 2541.0 " fill="none"></path>
+						<path d="M4130.5 2649.8 L4805.75 3314 L23149 3499.0172996579277 L23149.0 3499.0 " fill="none"></path>
 					</g>
-					<path d="M49531.5 1706.6 L49530.6 1711.8 L49529.8 1717.1 L49517.5 1709.6 Z"></path>
-					<path d="M60899.3 3685.7 L60899.25 3687 L60899.25 3843.5 L60899.25 3843.5 L60899.25 4000 L60899.25 4000 L61689 4126.171684053651 L61689.0 4126.2 " fill="none"></path>
+					<path d="M4134.3 2646.0 L4130.5 2649.8 L4126.8 2653.7 L4121.0 2640.5 Z"></path>
+					<path d="M19702.8 165.3 L19702.75 293 L19702.75 614 L19702.8 614.0 " fill="none"></path>
+					<path d="M19708.1 165.3 L19702.8 165.3 L19697.4 165.3 L19702.8 152.0 Z"></path>
+					<path d="M42846.0 2741.9 L42680.75 3314 L41996.97922252011 3485 L41997.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60904.6 3676.3 L60899.3 3685.7 L60893.9 3676.3 L60899.3 3667.0 Z"></path>
-					</g>
-					<path d="M48049.5 3305.6 L48044.75 3314 L60618.25 3496.423100859621 L60618.3 3496.4 " fill="none"></path>
-					<path d="M48054.2 3308.2 L48049.5 3305.6 L48044.9 3303.0 L48056.1 3294.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M52469.3 2669.3 L52469.25 3314 L60618.25 3494.2833333333333 L60618.3 3494.3 " fill="none"></path>
+						<path d="M42853.7 2734.4 L42846.0 2741.9 L42843.4 2731.5 L42851.2 2724.0 Z"></path>
 					</g>
-					<path d="M52474.6 2669.3 L52469.3 2669.3 L52463.9 2669.3 L52469.3 2656.0 Z"></path>
-					<path d="M66217.1 2888.7 L65883.75 3314 L64999 3494.2850314121824 L64999.0 3494.3 " fill="none"></path>
+					<path d="M42852.7 2742.2 L42720.75 3314 L40574 3497.466090044679 L40574.0 3497.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66227.0 2884.6 L66217.1 2888.7 L66218.6 2878.1 L66228.6 2874.0 Z"></path>
+						<path d="M42860.0 2734.3 L42852.7 2742.2 L42849.6 2731.9 L42856.9 2724.0 Z"></path>
 					</g>
-					<path d="M66232.1 2889.1 L65923.75 3314 L64120.25 3495.861449040281 L64120.3 3495.9 " fill="none"></path>
+					<path d="M42906.4 2742.2 L43036.25 3314 L40076 3497.250062235499 L40076.0 3497.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66241.9 2884.7 L66232.1 2889.1 L66233.3 2878.4 L66243.1 2874.0 Z"></path>
+						<path d="M42909.5 2731.9 L42906.4 2742.2 L42899.1 2734.3 L42902.2 2724.0 Z"></path>
 					</g>
-					<path d="M66247.1 2889.5 L65963.75 3314 L66032.3827077748 3394 L66032.4 3394.0 " fill="none"></path>
+					<path d="M37457.5 3435.4 L37469.5 3432 L37477 3432 L37477 3432 L37484.5 3500.5 L37484.5 3500.5 L37477 3569 L37477 3569 L37469.5 3569 L37469.5 3569 L37439.5 3560.543209876543 L37439.5 3560.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66256.8 2884.7 L66247.1 2889.5 L66247.9 2878.8 L66257.5 2874.0 Z"></path>
+						<path d="M37447.0 3432.8 L37457.5 3435.4 L37449.9 3443.1 L37439.5 3440.5 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M4131.7 2649.6 L4845.75 3314 L37013.5 3499.2732063031276 L37013.5 3499.3 " fill="none"></path>
 					</g>
-					<path d="M66262.2 2889.9 L66003.75 3314 L59371.25 3498.9246897892062 L59371.3 3498.9 " fill="none"></path>
+					<path d="M4135.3 2645.7 L4131.7 2649.6 L4128.0 2653.5 L4121.9 2640.5 Z"></path>
+					<path d="M20101.3 165.3 L20101.25 293 L20101.25 614 L20101.3 614.0 " fill="none"></path>
+					<path d="M20106.6 165.3 L20101.3 165.3 L20095.9 165.3 L20101.3 152.0 Z"></path>
+					<path d="M21063.4 196.5 L20804 293 L20804 614 L20804.0 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66271.7 2884.7 L66262.2 2889.9 L66262.6 2879.2 L66272.0 2874.0 Z"></path>
+						<path d="M21074.0 198.3 L21063.4 196.5 L21070.3 188.3 L21080.9 190.0 Z"></path>
 					</g>
-					<path d="M66554.3 2890.8 L66762.25 3314 L66762.25 3500.5 L66762.25 3500.5 L66762.25 3687 L66762.25 3687 L66762.25 3843.5 L66762.25 3843.5 L66762.25 4000 L66762.25 4000 L61787 4132.6931382793455 L61787.0 4132.7 " fill="none"></path>
+					<path d="M21463.8 162.6 L22655.75 293 L22655.75 614 L22655.8 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66555.0 2880.0 L66554.3 2890.8 L66545.4 2884.7 L66546.1 2874.0 Z"></path>
+						<path d="M21455.1 156.3 L21463.8 162.6 L21453.9 166.9 L21445.3 160.6 Z"></path>
 					</g>
-					<path d="M66569.5 2890.4 L66802.25 3314 L66802.25 3500.5 L66802.25 3500.5 L66802.25 3687 L66802.25 3687 L65998.75 3820.2073622881358 L65998.8 3820.2 " fill="none"></path>
+					<path d="M43232.8 2712.7 L43232.75 3314 L46344.5 3497.8705346534653 L46344.5 3497.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66569.7 2879.6 L66569.5 2890.4 L66560.4 2884.7 L66560.5 2874.0 Z"></path>
+						<path d="M43238.1 2703.3 L43232.8 2712.7 L43227.4 2703.3 L43232.8 2694.0 Z"></path>
 					</g>
-					<path d="M66584.7 2890.0 L66842.25 3314 L61446.25 3498.7029457648896 L61446.3 3498.7 " fill="none"></path>
+					<path d="M43152.3 3908.7 L43152.25 4000 L41537.5 4128.280124499777 L41537.5 4128.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66584.4 2879.2 L66584.7 2890.0 L66575.3 2884.7 L66575.0 2874.0 Z"></path>
+						<path d="M43157.6 3899.3 L43152.3 3908.7 L43146.9 3899.3 L43152.3 3890.0 Z"></path>
 					</g>
-					<path d="M69184.3 671.6 L72324 966 L72324 1212.5 L72324 1212.5 L72324 1459 L72324 1459 L72324 1697.5 L72324 1697.5 L72324 1936 L72324 1936 L66874.75 2572.3346044659124 L66874.8 2572.3 " fill="none"></path>
-					<path d="M69184.8 666.3 L69184.3 671.6 L69183.8 676.9 L69171.0 670.4 Z"></path>
-					<path d="M63276.9 1836.8 L63196.25 1936 L65972.75 2528.7214562354766 L65972.8 2528.7 " fill="none"></path>
-					<path d="M63281.0 1840.2 L63276.9 1836.8 L63272.8 1833.5 L63285.3 1826.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M67517.0 1258.4 L67215.25 1459 L67215.25 1697.5 L67215.25 1697.5 L67215.25 1936 L67215.25 1936 L66709.7928156749 2376 L66709.8 2376.0 " fill="none"></path>
+					<path d="M43454.4 2749.0 L43299.25 3314 L43299.25 3500.5 L43299.25 3500.5 L43299.25 3687 L43299.25 3687 L43299.25 3843.5 L43299.25 3843.5 L43299.25 4000 L43299.25 4000 L41537.5 4128.738650306748 L41537.5 4128.7 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M43462.1 2741.4 L43454.4 2749.0 L43451.8 2738.6 L43459.4 2731.0 Z"></path>
 					</g>
-					<path d="M67519.9 1262.8 L67517.0 1258.4 L67514.0 1253.9 L67528.1 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83182.0 1264.3 L83182 1459 L83182 1697.5 L83182 1697.5 L83182 1936 L83182 1936 L66874.75 2606.4575507585814 L66874.8 2606.5 " fill="none"></path>
+					<path d="M43477.5 2749.6 L43427.5 3314 L41435 3497.8245115013606 L41435.0 3497.8 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M43483.6 2740.8 L43477.5 2749.6 L43473.0 2739.8 L43479.1 2731.0 Z"></path>
 					</g>
-					<path d="M83187.3 1264.3 L83182.0 1264.3 L83176.7 1264.3 L83182.0 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42625.2 1250.9 L42316.25 1459 L42316.25 1697.5 L42316.25 1697.5 L42316.25 1936 L42316.25 1936 L65972.75 2612.110276884787 L65972.8 2612.1 " fill="none"></path>
+					<path d="M43500.5 2749.6 L43554.75 3314 L46344.5 3497.571800299903 L46344.5 3497.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M43504.9 2739.8 L43500.5 2749.6 L43494.3 2740.8 L43498.7 2731.0 Z"></path>
 					</g>
-					<path d="M42628.1 1255.4 L42625.2 1250.9 L42622.2 1246.5 L42636.2 1243.5 Z"></path>
-					<path d="M66123.8 3625.7 L66123.75 3687 L65998.75 3760.6817325800375 L65998.8 3760.7 " fill="none"></path>
+					<path d="M43511.5 2749.4 L43615.75 3314 L40203 3498.1527305605787 L40203.0 3498.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66129.1 3616.3 L66123.8 3625.7 L66118.4 3616.3 L66123.8 3607.0 Z"></path>
+						<path d="M43515.0 2739.2 L43511.5 2749.4 L43504.5 2741.1 L43508.1 2731.0 Z"></path>
 					</g>
-					<path d="M66541.9 3397.7 L66882.25 3314 L66589.44883889695 2874 L66589.4 2874.0 " fill="none"></path>
+					<path d="M43762.7 2734.9 L43655.75 3314 L40574 3498.3760927099206 L40574.0 3498.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M66531.5 3394.7 L66541.9 3397.7 L66534.1 3405.1 L66523.8 3402.1 Z"></path>
+						<path d="M43769.7 2726.6 L43762.7 2734.9 L43759.2 2724.7 L43766.1 2716.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M67669.7 1257.3 L68046.75 1459 L68046.75 1697.5 L68046.75 1697.5 L68046.75 1936 L68046.75 1936 L68046.75 2625 L68046.75 2625 L68046.75 3314 L68046.75 3314 L66523.75 3461.7064482579303 L66523.8 3461.7 " fill="none"></path>
+					<path d="M43804.4 2734.8 L43917 3314 L42003 3494.10141271443 L42003.0 3494.1 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M43807.8 2724.6 L43804.4 2734.8 L43797.3 2726.7 L43800.8 2716.5 Z"></path>
 					</g>
-					<path d="M67672.2 1252.6 L67669.7 1257.3 L67667.2 1262.0 L67658.0 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83190.4 1264.2 L83222 1459 L83222 1697.5 L83222 1697.5 L83222 1936 L83222 1936 L83222 2625 L83222 2625 L83222 3314 L83222 3314 L66523.75 3496.13698039273 L66523.8 3496.1 " fill="none"></path>
+					<path d="M44115.3 2712.1 L43957 3314 L40203 3498.363660302831 L40203.0 3498.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M44122.9 2704.4 L44115.3 2712.1 L44112.6 2701.7 L44120.1 2694.0 Z"></path>
 					</g>
-					<path d="M83195.6 1263.3 L83190.4 1264.2 L83185.1 1265.0 L83188.2 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42709.3 1254.7 L42840.25 1459 L42840.25 1697.5 L42840.25 1697.5 L42840.25 1936 L42840.25 1936 L42840.25 2625 L42840.25 2625 L42840.25 3314 L42840.25 3314 L65723.75 3497.2960143449222 L65723.8 3497.3 " fill="none"></path>
+					<path d="M44140.8 2712.7 L44158.25 3314 L44158.25 3500.5 L44158.25 3500.5 L44158.25 3687 L44158.25 3687 L44158.25 3843.5 L44158.25 3843.5 L44158.25 4000 L44158.25 4000 L41537.5 4130.417045771052 L41537.5 4130.4 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M44145.9 2703.2 L44140.8 2712.7 L44135.2 2703.5 L44140.3 2694.0 Z"></path>
 					</g>
-					<path d="M42713.8 1251.8 L42709.3 1254.7 L42704.8 1257.6 L42702.1 1243.5 Z"></path>
-					<path d="M71338.5 1741.1 L69699 1936 L69699 2625 L69699 2625 L69699 3314 L69699 3314 L64999 3499.2975372582177 L64999.0 3499.3 " fill="none"></path>
+					<path d="M58638.2 1764.1 L58813 1936 L30271.75 2621.4336914751784 L30271.8 2621.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71348.4 1745.3 L71338.5 1741.1 L71347.1 1734.7 L71357.0 1738.9 Z"></path>
+						<path d="M58635.3 1753.7 L58638.2 1764.1 L58627.8 1761.3 L58624.9 1751.0 Z"></path>
 					</g>
-					<path d="M71339.6 1839.4 L71090.75 1936 L71090.75 2625 L71090.75 2625 L71090.75 3314 L71090.75 3314 L72645 3486.565932430421 L72645.0 3486.6 " fill="none"></path>
+					<path d="M44710.9 2769.5 L44386.75 3314 L45527.5 3490.299875699192 L45527.5 3490.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71350.2 1841.0 L71339.6 1839.4 L71346.4 1831.0 L71357.0 1832.6 Z"></path>
+						<path d="M44720.3 2764.2 L44710.9 2769.5 L44711.1 2758.8 L44720.5 2753.5 Z"></path>
 					</g>
-					<path d="M71339.8 1849.2 L71130.75 1936 L71130.75 2625 L71130.75 2625 L71130.75 3314 L71130.75 3314 L71130.75 3500.5 L71130.75 3500.5 L71130.75 3687 L71130.75 3687 L71130.75 3843.5 L71130.75 3843.5 L71130.75 4000 L71130.75 4000 L72971.75 4124.060346995223 L72971.8 4124.1 " fill="none"></path>
+					<path d="M44731.2 2770.5 L44485.5 3314 L41435 3498.74370839422 L41435.0 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71350.4 1850.5 L71339.8 1849.2 L71346.3 1840.7 L71357.0 1842.0 Z"></path>
+						<path d="M44739.9 2764.2 L44731.2 2770.5 L44730.2 2759.8 L44738.9 2753.5 Z"></path>
 					</g>
-					<path d="M71340.0 1860.5 L71170.75 1936 L71170.75 2625 L71170.75 2625 L71170.75 3314 L71170.75 3314 L64120.25 3499.291094201367 L64120.3 3499.3 " fill="none"></path>
+					<path d="M44751.8 2771.3 L44584.25 3314 L45699.5 3486.358918582971 L45699.5 3486.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71350.7 1861.5 L71340.0 1860.5 L71346.3 1851.8 L71357.0 1852.9 Z"></path>
+						<path d="M44759.7 2764.0 L44751.8 2771.3 L44749.5 2760.8 L44757.3 2753.5 Z"></path>
 					</g>
-					<path d="M71583.9 1894.9 L71558.75 1936 L71558.75 2383.5 L71558.8 2383.5 " fill="none"></path>
+					<path d="M44797.0 2772.2 L44797 3314 L40076 3498.4488320938513 L40076.0 3498.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71593.4 1889.7 L71583.9 1894.9 L71584.3 1884.2 L71593.7 1879.0 Z"></path>
+						<path d="M44802.3 2762.8 L44797.0 2772.2 L44791.7 2762.8 L44797.0 2753.5 Z"></path>
 					</g>
-					<path d="M71694.7 1897.6 L71692.75 1936 L66874.75 2566.0250521920666 L66874.8 2566.0 " fill="none"></path>
+					<path d="M44842.2 2771.3 L45009.75 3314 L46128.5 3486.8998342655896 L46128.5 3486.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71700.5 1888.6 L71694.7 1897.6 L71689.9 1888.0 L71695.7 1879.0 Z"></path>
+						<path d="M44844.5 2760.8 L44842.2 2771.3 L44834.3 2764.0 L44836.7 2753.5 Z"></path>
 					</g>
-					<path d="M71728.3 1897.5 L71732.75 1936 L68006.75 2536.9396067415732 L68006.8 2536.9 " fill="none"></path>
+					<path d="M45191.4 2779.7 L45068.25 3314 L40574 3499.0383851205916 L40574.0 3499.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71732.5 1887.7 L71728.3 1897.5 L71721.9 1888.9 L71726.1 1879.0 Z"></path>
+						<path d="M45198.7 2771.8 L45191.4 2779.7 L45188.3 2769.4 L45195.5 2761.5 Z"></path>
 					</g>
-					<path d="M71761.7 1897.0 L71772.75 1936 L65638.25 2579.867849798157 L65638.3 2579.9 " fill="none"></path>
+					<path d="M45200.3 2779.9 L45108.25 3314 L41435 3499.039131609157 L41435.0 3499.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71764.2 1886.5 L71761.7 1897.0 L71754.0 1889.4 L71756.6 1879.0 Z"></path>
+						<path d="M45207.1 2771.6 L45200.3 2779.9 L45196.6 2769.8 L45203.5 2761.5 Z"></path>
 					</g>
-					<path d="M71794.7 1896.0 L71812.75 1936 L69100 2532.722723281986 L69100.0 2532.7 " fill="none"></path>
+					<path d="M45253.2 2779.9 L45343.5 3314 L40076 3498.659539473684 L40076.0 3498.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71795.7 1885.3 L71794.7 1896.0 L71786.0 1889.7 L71787.0 1879.0 Z"></path>
+						<path d="M45256.9 2769.8 L45253.2 2779.9 L45246.4 2771.6 L45250.1 2761.5 Z"></path>
 					</g>
-					<path d="M71902.3 1892.1 L71946.75 1936 L71946.75 2625 L71946.75 2625 L71946.75 3314 L71946.75 3314 L61446.25 3499.572183265422 L61446.3 3499.6 " fill="none"></path>
+					<path d="M13664.5 3450.3 L13676.5 3447 L13684 3447 L13684 3447 L13691.5 3500.5 L13691.5 3500.5 L13684 3554 L13684 3554 L13676.5 3554 L13676.5 3554 L13646.5 3545.769230769231 L13646.5 3545.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M71899.4 1881.8 L71902.3 1892.1 L71891.9 1889.4 L71889.0 1879.0 Z"></path>
+						<path d="M13654.1 3447.6 L13664.5 3450.3 L13656.9 3457.9 L13646.5 3455.2 Z"></path>
 					</g>
-					<path d="M69184.3 671.2 L72364 966 L72364 1212.5 L72364 1212.5 L72364 1459 L72364 1459 L72053 1571.5546282245828 L72053.0 1571.6 " fill="none"></path>
-					<path d="M69184.8 665.8 L69184.3 671.2 L69183.8 676.5 L69171.0 669.9 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M67676.2 1256.9 L68086.75 1459 L71357 1674.5612865335452 L71357.0 1674.6 " fill="none"></path>
+						<path d="M4132.8 2649.3 L4885.75 3314 L13316.5 3496.92003315592 L13316.5 3496.9 " fill="none"></path>
 					</g>
-					<path d="M67678.5 1252.1 L67676.2 1256.9 L67673.8 1261.7 L67664.2 1251.0 Z"></path>
-					<path d="M63462.4 1843.2 L63508.25 1936 L63508.25 2625 L63508.25 2625 L63508.25 3314 L63508.25 3314 L63508.25 3500.5 L63508.25 3500.5 L63508.25 3687 L63508.25 3687 L63508.25 3843.5 L63508.25 3843.5 L63508.25 4000 L63508.25 4000 L61787 4130.290919361672 L61787.0 4130.3 " fill="none"></path>
+					<path d="M4136.3 2645.3 L4132.8 2649.3 L4129.3 2653.3 L4122.8 2640.5 Z"></path>
+					<path d="M45555.4 2719.1 L45399.75 3314 L46506.20710455764 3485 L46506.2 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63463.0 1832.5 L63462.4 1843.2 L63453.4 1837.2 L63454.1 1826.5 Z"></path>
+						<path d="M45562.9 2711.4 L45555.4 2719.1 L45552.6 2708.7 L45560.1 2701.0 Z"></path>
 					</g>
-					<path d="M63486.0 1842.1 L63548.25 1936 L63548.25 2625 L63548.25 2625 L63548.25 3314 L63548.25 3314 L63548.25 3500.5 L63548.25 3500.5 L63548.25 3687 L63548.25 3687 L65717.75 3833.981277056277 L65717.8 3834.0 " fill="none"></path>
+					<path d="M45560.8 2719.3 L45439.75 3314 L46344.5 3491.7570450355543 L46344.5 3491.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M63485.3 1831.3 L63486.0 1842.1 L63476.4 1837.2 L63475.7 1826.5 Z"></path>
+						<path d="M45567.9 2711.2 L45560.8 2719.3 L45557.4 2709.1 L45564.5 2701.0 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M67682.6 1256.5 L68126.75 1459 L63706.25 1681.5882508181146 L63706.3 1681.6 " fill="none"></path>
+					<path d="M45566.3 2719.5 L45479.75 3314 L40574 3499.1601062484187 L40574.0 3499.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M45572.9 2711.0 L45566.3 2719.5 L45562.3 2709.5 L45568.9 2701.0 Z"></path>
 					</g>
-					<path d="M67684.8 1251.7 L67682.6 1256.5 L67680.4 1261.4 L67670.5 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42791.4 1247.5 L43450.25 1459 L63074.25 1693.7203610832498 L63074.3 1693.7 " fill="none"></path>
+					<path d="M45589.5 2719.6 L45649.25 3314 L35010 3499.298263021502 L35010.0 3499.3 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M45593.9 2709.8 L45589.5 2719.6 L45583.3 2710.8 L45587.6 2701.0 Z"></path>
 					</g>
-					<path d="M42793.1 1242.5 L42791.4 1247.5 L42789.8 1252.6 L42778.8 1243.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M51043.1 1269.5 L51191.25 1459 L51191.25 1697.5 L51191.25 1697.5 L51191.25 1936 L51191.25 1936 L51191.25 2625 L51191.25 2625 L51191.25 3314 L51191.25 3314 L52519 3477.8004795766496 L52519.0 3477.8 " fill="none"></path>
+					<path d="M45603.2 2719.1 L45749.5 3314 L40984 3493.530501969498 L40984.0 3493.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M45606.1 2708.8 L45603.2 2719.1 L45595.7 2711.3 L45598.7 2701.0 Z"></path>
 					</g>
-					<path d="M51047.3 1266.2 L51043.1 1269.5 L51038.9 1272.8 L51034.9 1259.0 Z"></path>
-					<path d="M53348.7 1754.9 L51447.25 1936 L51447.25 2625 L51447.25 2625 L51447.25 3314 L51447.25 3314 L31436 3498.8236681482217 L31436.0 3498.8 " fill="none"></path>
+					<path d="M45970.3 2719.4 L45789.5 3314 L40574 3499.239144924776 L40574.0 3499.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M53358.5 1759.3 L53348.7 1754.9 L53357.5 1748.7 L53367.3 1753.1 Z"></path>
+						<path d="M45978.1 2712.0 L45970.3 2719.4 L45967.9 2708.9 L45975.7 2701.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M51093.3 1220.4 L53951.25 1459 L53951.25 1568.5 L53951.3 1568.5 " fill="none"></path>
+					<path d="M45975.7 2719.6 L45829.5 3314 L40984 3493.641337839181 L40984.0 3493.6 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M45983.1 2711.8 L45975.7 2719.6 L45972.8 2709.3 L45980.2 2701.5 Z"></path>
 					</g>
-					<path d="M51093.7 1215.1 L51093.3 1220.4 L51092.8 1225.7 L51080.0 1219.3 Z"></path>
-					<path d="M53354.0 1759.6 L51659.25 1936 L51659.25 2541 L51659.3 2541.0 " fill="none"></path>
-					<path d="M53354.5 1765.0 L53354.0 1759.6 L53353.4 1754.3 L53367.3 1758.3 Z"></path>
-					<path d="M53354.0 1773.1 L52067.25 1936 L52067.25 2556 L52067.3 2556.0 " fill="none"></path>
-					<path d="M53354.7 1778.4 L53354.0 1773.1 L53353.4 1767.8 L53367.3 1771.4 Z"></path>
-					<path d="M53375.7 1829.5 L52911.25 1936 L52911.25 2556 L52911.3 2556.0 " fill="none"></path>
-					<path d="M53376.9 1834.7 L53375.7 1829.5 L53374.5 1824.3 L53388.7 1826.5 Z"></path>
-					<path d="M54072.5 1836.5 L54159.25 1936 L54159.25 2548.5 L54159.3 2548.5 " fill="none"></path>
-					<path d="M54076.5 1833.0 L54072.5 1836.5 L54068.5 1840.1 L54063.8 1826.5 Z"></path>
-					<path d="M54607.3 2787.7 L54607.25 3314 L21597.75 3500.336297047384 L21597.8 3500.3 " fill="none"></path>
+					<path d="M46019.6 2719.7 L46148.75 3314 L46369.03284182306 3485 L46369.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54612.6 2778.3 L54607.3 2787.7 L54601.9 2778.3 L54607.3 2769.0 Z"></path>
+						<path d="M46022.8 2709.5 L46019.6 2719.7 L46012.4 2711.8 L46015.6 2701.5 Z"></path>
 					</g>
-					<path d="M54318.6 1831.1 L54607.25 1936 L54607.25 2481 L54607.3 2481.0 " fill="none"></path>
-					<path d="M54320.4 1826.0 L54318.6 1831.1 L54316.8 1836.1 L54306.1 1826.5 Z"></path>
-					<path d="M54991.3 2727.7 L54991.25 3314 L54991.25 3485 L54991.3 3485.0 " fill="none"></path>
+					<path d="M46338.5 2720.2 L46338.5 3314 L46384.80294906166 3485 L46384.8 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M54996.6 2718.3 L54991.3 2727.7 L54985.9 2718.3 L54991.3 2709.0 Z"></path>
+						<path d="M46343.8 2710.8 L46338.5 2720.2 L46333.2 2710.8 L46338.5 2701.5 Z"></path>
 					</g>
-					<path d="M54526.8 1829.5 L54991.25 1936 L54991.25 2541 L54991.3 2541.0 " fill="none"></path>
-					<path d="M54528.0 1824.3 L54526.8 1829.5 L54525.6 1834.7 L54513.8 1826.5 Z"></path>
-					<path d="M27933.8 1762.7 L27933.75 1936 L47930 2607.978941849264 L47930.0 2608.0 " fill="none"></path>
+					<path d="M46606.1 2712.4 L46500 3314 L46398.22520107239 3485 L46398.2 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M27939.1 1753.3 L27933.8 1762.7 L27928.4 1753.3 L27933.8 1744.0 Z"></path>
+						<path d="M46613.0 2704.1 L46606.1 2712.4 L46602.5 2702.3 L46609.3 2694.0 Z"></path>
 					</g>
-					<path d="M29233.1 1228.3 L27933.75 1459 L27933.75 1651 L27933.8 1651.0 " fill="none"></path>
-					<path d="M29234.1 1233.6 L29233.1 1228.3 L29232.2 1223.1 L29246.3 1226.0 Z"></path>
-					<path d="M28325.8 1785.2 L28325.75 1936 L47930 2607.647166316522 L47930.0 2607.6 " fill="none"></path>
+					<path d="M46633.2 2712.5 L46713.75 3314 L40984 3494.6667018893445 L40984.0 3494.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28331.1 1775.8 L28325.8 1785.2 L28320.4 1775.8 L28325.8 1766.5 Z"></path>
+						<path d="M46637.3 2702.5 L46633.2 2712.5 L46626.7 2704.0 L46630.7 2694.0 Z"></path>
 					</g>
-					<path d="M29246.6 1231.2 L28325.75 1459 L28325.75 1628.5 L28325.8 1628.5 " fill="none"></path>
-					<path d="M29247.9 1236.4 L29246.6 1231.2 L29245.4 1226.0 L29259.6 1228.0 Z"></path>
-					<path d="M31453.4 3422.0 L31466 3417 L31473.5 3417 L31473.5 3417 L31481 3500.5 L31481 3500.5 L31473.5 3584 L31473.5 3584 L31466 3584 L31466 3584 L31436 3572.1560283687945 L31436.0 3572.2 " fill="none"></path>
+					<path d="M41002.1 3450.0 L41014 3447 L41021.5 3447 L41021.5 3447 L41029 3500.5 L41029 3500.5 L41021.5 3554 L41021.5 3554 L41014 3554 L41014 3554 L40984 3546.5348837209303 L40984.0 3546.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M31442.7 3420.5 L31453.4 3422.0 L31446.6 3430.4 L31436.0 3428.8 Z"></path>
+						<path d="M40991.8 3447.0 L41002.1 3450.0 L40994.3 3457.4 L40984.0 3454.5 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3122.9 2651.6 L3561.5 3314 L31073 3499.2776784747048 L31073.0 3499.3 " fill="none"></path>
+						<path d="M4133.9 2649.1 L4925.75 3314 L40614 3499.538210923181 L40614.0 3499.5 " fill="none"></path>
 					</g>
-					<path d="M3127.3 2648.7 L3122.9 2651.6 L3118.4 2654.6 L3115.5 2640.5 Z"></path>
-					<path d="M28717.8 1762.7 L28717.75 1936 L47930 2607.302199683043 L47930.0 2607.3 " fill="none"></path>
+					<path d="M4137.3 2645.0 L4133.9 2649.1 L4130.5 2653.2 L4123.7 2640.5 Z"></path>
+					<path d="M46889.2 2772.1 L46753.75 3314 L40203 3499.2697236228532 L40203.0 3499.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M28723.1 1753.3 L28717.8 1762.7 L28712.4 1753.3 L28717.8 1744.0 Z"></path>
+						<path d="M46896.7 2764.3 L46889.2 2772.1 L46886.3 2761.8 L46893.8 2754.0 Z"></path>
 					</g>
-					<path d="M29271.9 1233.0 L28717.75 1459 L28717.75 1651 L28717.8 1651.0 " fill="none"></path>
-					<path d="M29273.9 1238.0 L29271.9 1233.0 L29269.9 1228.1 L29284.2 1228.0 Z"></path>
-					<path d="M51407.3 1747.2 L51407.25 1936 L48943 2507.5284860725405 L48943.0 2507.5 " fill="none"></path>
+					<path d="M46897.7 2772.3 L46793.75 3314 L41435 3499.496148670595 L41435.0 3499.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M51412.6 1737.8 L51407.3 1747.2 L51401.9 1737.8 L51407.3 1728.5 Z"></path>
+						<path d="M46904.7 2764.2 L46897.7 2772.3 L46894.2 2762.2 L46901.2 2754.0 Z"></path>
 					</g>
-					<path d="M29109.8 1762.7 L29109.75 1936 L47930 2606.94323929269 L47930.0 2606.9 " fill="none"></path>
+					<path d="M46906.3 2772.5 L46833.75 3314 L32863.5 3498.5972421488923 L32863.5 3498.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29115.1 1753.3 L29109.8 1762.7 L29104.4 1753.3 L29109.8 1744.0 Z"></path>
+						<path d="M46912.8 2764.0 L46906.3 2772.5 L46902.2 2762.5 L46908.7 2754.0 Z"></path>
 					</g>
-					<path d="M29300.2 1238.1 L29109.75 1459 L29109.75 1651 L29109.8 1651.0 " fill="none"></path>
-					<path d="M29304.2 1241.6 L29300.2 1238.1 L29296.1 1234.6 L29308.9 1228.0 Z"></path>
-					<path d="M29916.8 1762.7 L29916.75 1936 L47930 2606.1564140984624 L47930.0 2606.2 " fill="none"></path>
+					<path d="M46936.6 2772.6 L46975.5 3314 L40076 3499.091592347526 L40076.0 3499.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M29922.1 1753.3 L29916.8 1762.7 L29911.4 1753.3 L29916.8 1744.0 Z"></path>
+						<path d="M46941.3 2762.9 L46936.6 2772.6 L46930.6 2763.7 L46935.3 2754.0 Z"></path>
 					</g>
-					<path d="M29371.9 1233.1 L29916.75 1459 L29916.75 1651 L29916.8 1651.0 " fill="none"></path>
-					<path d="M29374.0 1228.2 L29371.9 1233.1 L29369.9 1238.0 L29359.6 1228.0 Z"></path>
-					<path d="M48086.5 3310.6 L48084.75 3314 L31436 3498.488755366082 L31436.0 3498.5 " fill="none"></path>
+					<path d="M46956.3 2772.3 L47067.75 3314 L46433.5 3488.272744014733 L46433.5 3488.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48095.5 3304.7 L48086.5 3310.6 L48086.0 3299.9 L48095.0 3294.0 Z"></path>
+						<path d="M46959.6 2762.1 L46956.3 2772.3 L46949.2 2764.2 L46952.5 2754.0 Z"></path>
 					</g>
-					<path d="M48126.1 3311.0 L48124.75 3314 L59258.25 3499.5583333333334 L59258.3 3499.6 " fill="none"></path>
+					<path d="M32880.9 3437.0 L32893.5 3432 L32901 3432 L32901 3432 L32908.5 3500.5 L32908.5 3500.5 L32901 3569 L32901 3569 L32893.5 3569 L32893.5 3569 L32863.5 3557.189655172414 L32863.5 3557.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48134.8 3304.7 L48126.1 3311.0 L48125.1 3300.3 L48133.8 3294.0 Z"></path>
+						<path d="M32870.2 3435.4 L32880.9 3437.0 L32874.1 3445.4 L32863.5 3443.8 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M4135.0 2648.8 L4965.75 3314 L32575.5 3499.532346980138 L32575.5 3499.5 " fill="none"></path>
 					</g>
-					<path d="M48407.3 3312.6 L48407.25 3314 L48407.25 3500.5 L48407.25 3500.5 L48407.25 3687 L48407.25 3687 L48407.25 3843.5 L48407.25 3843.5 L48407.25 4000 L48407.25 4000 L61689 4133.507454569322 L61689.0 4133.5 " fill="none"></path>
+					<path d="M4138.3 2644.7 L4135.0 2648.8 L4131.7 2653.0 L4124.6 2640.5 Z"></path>
+					<path d="M47794.8 2736.0 L47107.75 3314 L45487.5 3494.4308852067475 L45487.5 3494.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48413.0 3303.6 L48407.3 3312.6 L48402.4 3303.1 L48408.1 3294.0 Z"></path>
+						<path d="M47805.4 2734.1 L47794.8 2736.0 L47798.5 2725.9 L47809.1 2724.0 Z"></path>
 					</g>
-					<path d="M48447.2 3312.7 L48447.25 3314 L24068.25 3499.9736379253927 L24068.3 3500.0 " fill="none"></path>
+					<path d="M47808.9 2736.8 L47200.75 3314 L46088.5 3487.5491528968837 L46088.5 3487.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48452.4 3303.2 L48447.2 3312.7 L48441.8 3303.4 L48446.9 3294.0 Z"></path>
+						<path d="M47819.3 2734.3 L47808.9 2736.8 L47812.0 2726.6 L47822.4 2724.0 Z"></path>
 					</g>
-					<path d="M48737.7 3311.1 L48739 3314 L61341.25 3499.7262786700644 L61341.3 3499.7 " fill="none"></path>
+					<path d="M48024.2 2738.1 L48520.25 3314 L48520.25 3485 L48520.3 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M48738.9 3300.4 L48737.7 3311.1 L48729.1 3304.7 L48730.2 3294.0 Z"></path>
+						<path d="M48022.2 2727.6 L48024.2 2738.1 L48014.1 2734.6 L48012.0 2724.0 Z"></path>
 					</g>
-					<path d="M59191.7 1740.8 L59272.75 1936 L48943 2592.7952705040952 L48943.0 2592.8 " fill="none"></path>
-					<path d="M59196.7 1738.8 L59191.7 1740.8 L59186.8 1742.9 L59186.6 1728.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83198.6 1263.7 L83262 1459 L83262 1697.5 L83262 1697.5 L83262 1936 L83262 1936 L48943 2614.97922499318 L48943.0 2615.0 " fill="none"></path>
+					<path d="M48067.8 2735.5 L48806.25 3314 L48806.25 3485 L48806.3 3485.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M48063.8 2725.6 L48067.8 2735.5 L48057.2 2734.0 L48053.1 2724.0 Z"></path>
 					</g>
-					<path d="M83203.7 1262.0 L83198.6 1263.7 L83193.5 1265.3 L83194.5 1251.0 Z"></path>
-					<path d="M56280.5 1754.7 L56280.5 1936 L48943 2580.510135135135 L48943.0 2580.5 " fill="none"></path>
+					<path d="M27205.8 2720.2 L27205.75 3314 L40116 3499.873714175432 L40116.0 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56285.8 1745.3 L56280.5 1754.7 L56275.2 1745.3 L56280.5 1736.0 Z"></path>
+						<path d="M27211.1 2710.8 L27205.8 2720.2 L27200.4 2710.8 L27205.8 2701.5 Z"></path>
 					</g>
-					<path d="M55967.6 1796.9 L56062.25 1936 L56062.25 2609.5 L56062.3 2609.5 " fill="none"></path>
+					<path d="M10851.1 1726.3 L10833.5 1936 L27073.75 2619.4449907618073 L27073.8 2619.4 " fill="none"></path>
+					<path d="M10856.4 1726.7 L10851.1 1726.3 L10845.8 1725.8 L10852.2 1713.0 Z"></path>
+					<path d="M24365.8 165.3 L24365.75 293 L24365.75 614 L24365.8 614.0 " fill="none"></path>
+					<path d="M24371.1 165.3 L24365.8 165.3 L24360.4 165.3 L24365.8 152.0 Z"></path>
+					<path d="M37668.9 1742.5 L36905.5 1936 L27337.75 2615.6236758679347 L27337.8 2615.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M55966.8 1786.2 L55967.6 1796.9 L55958.0 1792.2 L55957.1 1781.5 Z"></path>
+						<path d="M37679.3 1745.4 L37668.9 1742.5 L37676.6 1735.0 L37687.0 1737.9 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M51093.3 1217.3 L55900 1459 L55900 1613.5 L55900.0 1613.5 " fill="none"></path>
+					<path d="M37669.0 1744.5 L36945.5 1936 L37927.89114658926 2609.5 L37927.9 2609.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M37679.3 1747.3 L37669.0 1744.5 L37676.6 1737.0 L37687.0 1739.7 Z"></path>
 					</g>
-					<path d="M51093.6 1211.9 L51093.3 1217.3 L51093.0 1222.6 L51080.0 1216.6 Z"></path>
-					<path d="M82676.8 1285.2 L82676.75 1459 L82676.75 1546 L82676.8 1546.0 " fill="none"></path>
+					<path d="M37909.4 1805.1 L37986 1936 L37747.97786647315 2609.5 L37748.0 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82682.1 1275.8 L82676.8 1285.2 L82671.4 1275.8 L82676.8 1266.5 Z"></path>
+						<path d="M37909.3 1794.4 L37909.4 1805.1 L37900.1 1799.7 L37900.0 1789.0 Z"></path>
 					</g>
-					<path d="M82279.7 170.1 L82676.75 293 L82676.75 629.5 L82676.75 629.5 L82676.75 966 L82676.75 966 L82676.75 1158.5 L82676.8 1158.5 " fill="none"></path>
-					<path d="M82281.3 165.1 L82279.7 170.1 L82278.2 175.2 L82267.0 166.2 Z"></path>
-					<path d="M82413.0 1847.2 L82256.5 1936 L82256.5 2625 L82256.5 2625 L82256.5 3314 L82256.5 3314 L59371.25 3500.0406954569726 L59371.3 3500.0 " fill="none"></path>
+					<path d="M38125.4 1803.9 L38026 1936 L27337.75 2616.5946489221596 L27337.8 2616.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82423.8 1847.2 L82413.0 1847.2 L82418.5 1837.9 L82429.3 1838.0 Z"></path>
+						<path d="M38135.3 1799.7 L38125.4 1803.9 L38126.8 1793.3 L38136.6 1789.0 Z"></path>
 					</g>
-					<path d="M82705.2 1867.4 L82716.75 1936 L82716.75 2625 L82716.75 2625 L82716.75 3314 L82716.75 3314 L72068.25 3499.0230819397216 L72068.3 3499.0 " fill="none"></path>
+					<path d="M38170.9 1806.8 L38130 1936 L37954.53809869376 2609.5 L37954.5 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82709.0 1857.3 L82705.2 1867.4 L82698.4 1859.1 L82702.2 1849.0 Z"></path>
+						<path d="M38178.8 1799.5 L38170.9 1806.8 L38168.6 1796.3 L38176.5 1789.0 Z"></path>
 					</g>
-					<path d="M33720.3 1702.4 L38285.25 1936 L36372.60921625544 2594 L36372.6 2594.0 " fill="none"></path>
-					<path d="M33720.6 1697.1 L33720.3 1702.4 L33720.0 1707.7 L33707.0 1701.7 Z"></path>
-					<path d="M45657.5 3923.2 L45657.5 4000 L18421.25 4133.646700173024 L18421.3 4133.6 " fill="none"></path>
+					<path d="M38277.1 1804.5 L38365 1936 L37756.50399129173 2609.5 L37756.5 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M45662.8 3913.8 L45657.5 3923.2 L45652.2 3913.8 L45657.5 3904.5 Z"></path>
+						<path d="M38276.3 1793.8 L38277.1 1804.5 L38267.4 1799.7 L38266.7 1789.0 Z"></path>
 					</g>
-					<path d="M57045.0 2674.7 L57045 3314 L25100 3499.639937057925 L25100.0 3499.6 " fill="none"></path>
+					<path d="M38564.5 1777.7 L38564.5 1936 L37964.312772133526 2609.5 L37964.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57050.3 2665.3 L57045.0 2674.7 L57039.7 2665.3 L57045.0 2656.0 Z"></path>
+						<path d="M38569.8 1768.3 L38564.5 1777.7 L38559.2 1768.3 L38564.5 1759.0 Z"></path>
 					</g>
-					<path d="M57345.5 2697.7 L57345.5 3314 L21499.75 3500.3154816234105 L21499.8 3500.3 " fill="none"></path>
+					<path d="M49439.8 2697.7 L49439.75 3314 L43516.25 3497.7546157684633 L43516.3 3497.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57350.8 2688.3 L57345.5 2697.7 L57340.2 2688.3 L57345.5 2679.0 Z"></path>
+						<path d="M49445.1 2688.3 L49439.8 2697.7 L49434.4 2688.3 L49439.8 2679.0 Z"></path>
 					</g>
-					<path d="M70185.6 2827.8 L69742.25 3314 L72645 3492.770866011723 L72645.0 3492.8 " fill="none"></path>
+					<path d="M30744.8 717.2 L30744.75 966 L30744.75 1197 L30744.8 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70195.8 2824.5 L70185.6 2827.8 L70187.9 2817.3 L70198.2 2814.0 Z"></path>
+						<path d="M30750.1 707.8 L30744.8 717.2 L30739.4 707.8 L30744.8 698.5 Z"></path>
 					</g>
-					<path d="M70197.0 2828.2 L69782.25 3314 L69782.25 3500.5 L69782.25 3500.5 L69782.25 3687 L69782.25 3687 L69782.25 3843.5 L69782.25 3843.5 L69782.25 4000 L69782.25 4000 L72971.75 4128.077015283188 L72971.8 4128.1 " fill="none"></path>
+					<path d="M30744.8 165.3 L30744.75 293 L30744.75 560.5 L30744.8 560.5 " fill="none"></path>
+					<path d="M30750.1 165.3 L30744.8 165.3 L30739.4 165.3 L30744.8 152.0 Z"></path>
+					<path d="M49720.4 2727.3 L49609.75 3314 L40203 3499.6415306473373 L40203.0 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70207.1 2824.6 L70197.0 2828.2 L70199.0 2817.6 L70209.1 2814.0 Z"></path>
+						<path d="M49727.4 2719.2 L49720.4 2727.3 L49716.9 2717.2 L49723.9 2709.0 Z"></path>
 					</g>
-					<path d="M70352.4 2832.6 L70310.5 3314 L70310.5 3439 L70310.5 3439.0 " fill="none"></path>
+					<path d="M49755.9 2727.4 L49848.25 3314 L40574 3499.7888369719917 L40574.0 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70358.5 2823.8 L70352.4 2832.6 L70347.9 2822.8 L70354.0 2814.0 Z"></path>
+						<path d="M49759.7 2717.4 L49755.9 2727.4 L49749.2 2719.0 L49753.0 2709.0 Z"></path>
 					</g>
-					<path d="M70503.2 2829.7 L70817.25 3314 L64120.25 3499.227717633101 L64120.3 3499.2 " fill="none"></path>
+					<path d="M49996.8 2712.2 L49996.75 3314 L40574 3499.800002643195 L40574.0 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70502.6 2818.9 L70503.2 2829.7 L70493.7 2824.7 L70493.0 2814.0 Z"></path>
+						<path d="M50002.1 2702.8 L49996.8 2712.2 L49991.4 2702.8 L49996.8 2693.5 Z"></path>
 					</g>
-					<path d="M70514.8 2829.2 L70857.25 3314 L71898.25 3486.4214031971583 L71898.3 3486.4 " fill="none"></path>
+					<path d="M50314.0 2696.8 L50183 3314 L50183 3485 L50183.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70513.8 2818.5 L70514.8 2829.2 L70505.1 2824.7 L70504.0 2814.0 Z"></path>
+						<path d="M50321.2 2688.7 L50314.0 2696.8 L50310.7 2686.5 L50317.9 2678.5 Z"></path>
 					</g>
-					<path d="M70526.3 2828.8 L70897.25 3314 L36328.5 3499.8066265103644 L36328.5 3499.8 " fill="none"></path>
+					<path d="M50395.9 2691.7 L51018 3314 L51772.5 3473.2691001697794 L51772.5 3473.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70524.9 2818.2 L70526.3 2828.8 L70516.4 2824.7 L70515.0 2814.0 Z"></path>
+						<path d="M50393.1 2681.3 L50395.9 2691.7 L50385.6 2688.9 L50382.7 2678.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M83607.3 173.1 L83346.75 293 L83346.75 629.5 L83346.75 629.5 L83346.75 966 L83346.75 966 L83346.75 1212.5 L83346.75 1212.5 L83346.75 1459 L83346.75 1459 L83346.75 1697.5 L83346.75 1697.5 L83346.75 1936 L83346.75 1936 L70677.5 2608.69921972835 L70677.5 2608.7 " fill="none"></path>
+					<path d="M51901.5 3550.2 L51901.5 3687 L51901.5 3828 L51901.5 3828.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M51906.8 3540.8 L51901.5 3550.2 L51896.2 3540.8 L51901.5 3531.5 Z"></path>
 					</g>
-					<path d="M83609.5 177.9 L83607.3 173.1 L83605.1 168.2 L83619.4 167.5 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M3124.2 2651.3 L3601.5 3314 L24804 3499.207196552774 L24804.0 3499.2 " fill="none"></path>
+						<path d="M43821.0 180.8 L43821 293 L43821 598.5 L43821.0 598.5 " fill="none"></path>
 					</g>
-					<path d="M3128.5 2648.2 L3124.2 2651.3 L3119.9 2654.4 L3116.4 2640.5 Z"></path>
-					<path d="M56565.2 1832.8 L56369.5 1936 L56369.5 2609.5 L56369.5 2609.5 " fill="none"></path>
+					<path d="M43826.3 180.8 L43821.0 180.8 L43815.7 180.8 L43821.0 167.5 Z"></path>
+					<path d="M51235.1 2719.4 L51058 3314 L40574 3499.8706212272446 L40574.0 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56576.0 1833.1 L56565.2 1832.8 L56571.0 1823.7 L56581.8 1824.1 Z"></path>
+						<path d="M51242.9 2712.0 L51235.1 2719.4 L51232.7 2708.9 L51240.5 2701.5 Z"></path>
 					</g>
-					<path d="M56731.5 1857.8 L56687.5 1936 L56687.5 2609.5 L56687.5 2609.5 " fill="none"></path>
+					<path d="M51240.5 2719.7 L51098 3314 L40203 3499.7583306669103 L40203.0 3499.8 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56740.8 1852.2 L56731.5 1857.8 L56731.5 1847.0 L56740.7 1841.5 Z"></path>
+						<path d="M51247.9 2711.8 L51240.5 2719.7 L51237.5 2709.3 L51244.9 2701.5 Z"></path>
 					</g>
-					<path d="M56885.5 1858.9 L56916 1936 L56916 2625 L56916 2625 L56916 3314 L56916 3314 L21499.75 3500.313246172615 L21499.8 3500.3 " fill="none"></path>
+					<path d="M51263.3 2720.2 L51263.25 3314 L35580 3498.5874209172807 L35580.0 3498.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M56887.0 1848.2 L56885.5 1858.9 L56877.1 1852.1 L56878.7 1841.5 Z"></path>
+						<path d="M51268.6 2710.8 L51263.3 2720.2 L51257.9 2710.8 L51263.3 2701.5 Z"></path>
 					</g>
-					<path d="M57079.1 1798.4 L57430.25 1936 L70063.5 2608.6538706748324 L70063.5 2608.7 " fill="none"></path>
+					<path d="M51143.0 3908.2 L51143 4000 L48020.5 4130.50998128509 L48020.5 4130.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M57072.4 1790.0 L57079.1 1798.4 L57068.5 1799.9 L57061.8 1791.6 Z"></path>
+						<path d="M51148.3 3898.8 L51143.0 3908.2 L51137.7 3898.8 L51143.0 3889.5 Z"></path>
 					</g>
-					<path d="M2855.7 3401.2 L2869 3394.5 L2876.5 3394.5 L2876.5 3394.5 L2884 3500.5 L2884 3500.5 L2876.5 3606.5 L2876.5 3606.5 L2869 3606.5 L2869 3606.5 L2839 3591.393111638955 L2839.0 3591.4 " fill="none"></path>
+					<path d="M51283.2 2714.5 L51416.5 3314 L50959.5 3476.3438095238093 L50959.5 3476.3 " fill="none"></path>
+					<path d="M51288.4 2713.4 L51283.2 2714.5 L51278.0 2715.7 L51280.3 2701.5 Z"></path>
+					<path d="M51288.3 2714.3 L51456.5 3314 L51435.40616621984 3454.5 L51435.4 3454.5 " fill="none"></path>
+					<path d="M51293.4 2712.9 L51288.3 2714.3 L51283.2 2715.8 L51284.7 2701.5 Z"></path>
+					<path d="M35597.8 3443.4 L35610 3439.5 L35617.5 3439.5 L35617.5 3439.5 L35625 3500.5 L35625 3500.5 L35617.5 3561.5 L35617.5 3561.5 L35610 3561.5 L35610 3561.5 L35580 3551.9935064935066 L35580.0 3552.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M2844.9 3400.6 L2855.7 3401.2 L2849.7 3410.2 L2839.0 3409.6 Z"></path>
+						<path d="M35587.3 3441.1 L35597.8 3443.4 L35590.5 3451.3 L35580.0 3449.0 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M3125.5 2651.0 L3641.5 3314 L2839 3466.254577822991 L2839.0 3466.3 " fill="none"></path>
+						<path d="M4136.1 2648.6 L5005.75 3314 L35255 3499.503469053902 L35255.0 3499.5 " fill="none"></path>
 					</g>
-					<path d="M3129.7 2647.7 L3125.5 2651.0 L3121.3 2654.3 L3117.3 2640.5 Z"></path>
-					<path d="M60125.4 2739.3 L59764 3314 L64938 3499.4070515899703 L64938.0 3499.4 " fill="none"></path>
+					<path d="M4139.3 2644.4 L4136.1 2648.6 L4132.9 2652.8 L4125.5 2640.5 Z"></path>
+					<path d="M51596.7 2704.4 L51496.5 3314 L40574 3499.895806716554 L40574.0 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60134.9 2734.2 L60125.4 2739.3 L60125.8 2728.6 L60135.3 2723.5 Z"></path>
+						<path d="M51603.5 2696.1 L51596.7 2704.4 L51592.9 2694.3 L51599.7 2686.0 Z"></path>
 					</g>
-					<path d="M60153.4 2741.0 L59936.75 3314 L59561.74195710456 3485 L59561.7 3485.0 " fill="none"></path>
+					<path d="M51630.7 2704.0 L51792.75 3314 L51663.23927613941 3485 L51663.2 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60161.7 2734.1 L60153.4 2741.0 L60151.7 2730.3 L60160.0 2723.5 Z"></path>
+						<path d="M51633.5 2693.7 L51630.7 2704.0 L51623.2 2696.4 L51626.0 2686.0 Z"></path>
 					</g>
-					<path d="M60266.0 2739.5 L60610.75 3314 L60095.457774798924 3485 L60095.5 3485.0 " fill="none"></path>
+					<path d="M52061.9 2725.9 L51832.75 3314 L50959.5 3487.0264276228418 L50959.5 3487.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M60265.7 2728.8 L60266.0 2739.5 L60256.6 2734.2 L60256.4 2723.5 Z"></path>
-					</g>
-					<path d="M29411.6 1214.7 L39254 1459 L39254 1666.5 L39254.0 1666.5 " fill="none"></path>
-					<path d="M29411.7 1209.4 L29411.6 1214.7 L29411.4 1220.0 L29398.3 1214.4 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83550.1 1434.5 L83512.25 1459 L82099 1677.0560407569142 L82099.0 1677.1 " fill="none"></path>
+						<path d="M52070.3 2719.1 L52061.9 2725.9 L52060.4 2715.3 L52068.7 2708.5 Z"></path>
 					</g>
-					<path d="M83553.0 1438.9 L83550.1 1434.5 L83547.2 1430.0 L83561.3 1427.2 Z"></path>
-					<path d="M82932.8 2749.8 L82817.5 3314 L82817.5 3500.5 L82817.5 3500.5 L82817.5 3687 L82817.5 3687 L82817.5 3843.5 L82817.5 3843.5 L82817.5 4000 L82817.5 4000 L83411.5 4122.738627602159 L83411.5 4122.7 " fill="none"></path>
+					<path d="M52137.0 2726.1 L52345 3314 L51530.5 3479.743862520458 L51530.5 3479.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82939.9 2741.7 L82932.8 2749.8 L82929.4 2739.6 L82936.5 2731.5 Z"></path>
+						<path d="M52138.9 2715.5 L52137.0 2726.1 L52128.9 2719.1 L52130.8 2708.5 Z"></path>
 					</g>
-					<path d="M82940.0 2750.0 L82857.5 3314 L82857.5 3500.5 L82857.5 3500.5 L82857.5 3687 L82857.5 3687 L82857.5 3843.5 L82857.5 3843.5 L82857.5 4000 L82857.5 4000 L77468.25 4130.950541728999 L77468.3 4131.0 " fill="none"></path>
+					<path d="M51143.0 3550.2 L51143 3687 L51143 3797.5 L51143.0 3797.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82946.6 2741.5 L82940.0 2750.0 L82936.0 2740.0 L82942.7 2731.5 Z"></path>
+						<path d="M51148.3 3540.8 L51143.0 3550.2 L51137.7 3540.8 L51143.0 3531.5 Z"></path>
 					</g>
-					<path d="M82947.2 2750.1 L82897.5 3314 L82897.5 3500.5 L82897.5 3500.5 L82897.5 3687 L82897.5 3687 L82897.5 3843.5 L82897.5 3843.5 L82897.5 4000 L82897.5 4000 L73266.75 4131.978677166159 L73266.8 4132.0 " fill="none"></path>
+					<path d="M37727.0 3931.2 L37727 4000 L48236.5 4133.081931581932 L48236.5 4133.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82953.4 2741.3 L82947.2 2750.1 L82942.7 2740.3 L82948.9 2731.5 Z"></path>
+						<path d="M37732.3 3921.8 L37727.0 3931.2 L37721.7 3921.8 L37727.0 3912.5 Z"></path>
+					</g>
+					<g stroke-dasharray="6 6">
+						<path d="M37727.0 3567.3 L37727 3687 L37727 3774.5 L37727.0 3774.5 " fill="none"></path>
 					</g>
-					<path d="M82965.5 2750.1 L82998.25 3314 L72896 3498.2115445723643 L72896.0 3498.2 " fill="none"></path>
+					<path d="M37732.3 3567.3 L37727.0 3567.3 L37721.7 3567.3 L37727.0 3554.0 Z"></path>
+					<path d="M56944.5 679.2 L56944.5 966 L56944.5 1197 L56944.5 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82970.3 2740.5 L82965.5 2750.1 L82959.6 2741.1 L82964.4 2731.5 Z"></path>
+						<path d="M56949.8 669.8 L56944.5 679.2 L56939.2 669.8 L56944.5 660.5 Z"></path>
 					</g>
-					<path d="M82976.5 2750.0 L83059 3314 L64999 3500.185567010309 L64999.0 3500.2 " fill="none"></path>
+					<path d="M56944.5 165.3 L56944.5 293 L56944.5 598.5 L56944.5 598.5 " fill="none"></path>
+					<path d="M56949.8 165.3 L56944.5 165.3 L56939.2 165.3 L56944.5 152.0 Z"></path>
+					<path d="M69245.4 160.9 L69097.5 293 L69097.5 598.5 L69097.5 598.5 " fill="none"></path>
+					<path d="M69249.0 164.9 L69245.4 160.9 L69241.9 156.9 L69255.4 152.0 Z"></path>
+					<path d="M69293.6 162.4 L69398.5 293 L69398.5 598.5 L69398.5 598.5 " fill="none"></path>
+					<path d="M69297.7 159.1 L69293.6 162.4 L69289.4 165.7 L69285.2 152.0 Z"></path>
+					<path d="M62402.5 1747.2 L62402.5 1936 L62402.5 2586.5 L62402.5 2586.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M82980.5 2740.0 L82976.5 2750.0 L82969.9 2741.5 L82973.8 2731.5 Z"></path>
+						<path d="M62407.8 1737.8 L62402.5 1747.2 L62397.2 1737.8 L62402.5 1728.5 Z"></path>
 					</g>
-					<path d="M83569.0 1446.8 L83552.25 1459 L83552.25 1697.5 L83552.25 1697.5 L83552.25 1936 L83552.25 1936 L83050.06567489114 2518.5 L83050.1 2518.5 " fill="none"></path>
-					<path d="M83572.2 1451.1 L83569.0 1446.8 L83565.9 1442.5 L83579.8 1439.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M81966.5 1741.8 L81966.5 1936 L82804.95337445573 2518.5 L82805.0 2518.5 " fill="none"></path>
+					<path d="M62402.5 1241.3 L62402.5 1459 L62402.5 1666.5 L62402.5 1666.5 " fill="none"></path>
+					<path d="M62407.8 1241.3 L62402.5 1241.3 L62397.2 1241.3 L62402.5 1228.0 Z"></path>
+					<path d="M74182.6 904.8 L74122 966 L74122 1197 L74122.0 1197.0 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M74193.0 901.9 L74182.6 904.8 L74185.4 894.4 L74195.8 891.5 Z"></path>
 					</g>
-					<path d="M81971.8 1741.8 L81966.5 1741.8 L81961.2 1741.8 L81966.5 1728.5 Z"></path>
-					<path d="M83804.6 2750.0 L83727 3314 L64999 3500.1967641335928 L64999.0 3500.2 " fill="none"></path>
+					<path d="M74306.5 917.6 L74281.5 966 L74281.5 1197 L74281.5 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M83811.1 2741.5 L83804.6 2750.0 L83800.5 2740.0 L83807.1 2731.5 Z"></path>
+						<path d="M74315.5 911.7 L74306.5 917.6 L74306.0 906.8 L74315.1 901.0 Z"></path>
 					</g>
-					<path d="M83811.8 2750.1 L83767 3314 L83767 3500.5 L83767 3500.5 L83767 3687 L83767 3687 L83767 3843.5 L83767 3843.5 L83767 4000 L83767 4000 L77468.25 4131.382262520917 L77468.3 4131.4 " fill="none"></path>
+					<path d="M74477.9 919.6 L74481.5 966 L74481.5 1197 L74481.5 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M83817.9 2741.2 L83811.8 2750.1 L83807.2 2740.4 L83813.3 2731.5 Z"></path>
+						<path d="M74482.5 909.9 L74477.9 919.6 L74471.8 910.7 L74476.4 901.0 Z"></path>
 					</g>
-					<path d="M83835.3 2750.1 L83896.5 3314 L72896 3498.396301456049 L72896.0 3498.4 " fill="none"></path>
+					<path d="M74647.4 916.5 L74680.5 966 L74680.5 1197 L74680.5 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M83839.6 2740.2 L83835.3 2750.1 L83829.0 2741.4 L83833.3 2731.5 Z"></path>
+						<path d="M74646.6 905.8 L74647.4 916.5 L74637.7 911.7 L74637.0 901.0 Z"></path>
 					</g>
-					<path d="M83881.4 1785.9 L83821.75 1936 L83821.75 2518.5 L83821.8 2518.5 " fill="none"></path>
-					<path d="M83886.3 1787.9 L83881.4 1785.9 L83876.4 1783.9 L83886.3 1773.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83606.3 1447.5 L83592.25 1459 L83592.25 1697.5 L83592.25 1697.5 L83592.25 1936 L83592.25 1936 L83592.25 2625 L83592.25 2625 L83592.25 3314 L83592.25 3314 L72896 3498.3371566521128 L72896.0 3498.3 " fill="none"></path>
+					<path d="M74455.3 165.3 L74455.25 293 L74455.25 358 L74455.3 358.0 " fill="none"></path>
+					<path d="M74460.6 165.3 L74455.3 165.3 L74449.9 165.3 L74455.3 152.0 Z"></path>
+					<path d="M62380.4 2680.9 L62129.5 3314 L41435 3500.2390160928417 L41435.0 3500.2 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M62388.8 2674.1 L62380.4 2680.9 L62378.8 2670.2 L62387.2 2663.5 Z"></path>
 					</g>
-					<path d="M83609.7 1451.6 L83606.3 1447.5 L83602.9 1443.3 L83616.6 1439.0 Z"></path>
-					<path d="M72585.4 3943.9 L72482 4000 L77217.25 4130.540245846834 L77217.3 4130.5 " fill="none"></path>
+					<path d="M62405.9 2682.1 L62444 3314 L62444 3485 L62444.0 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72596.2 3944.1 L72585.4 3943.9 L72591.1 3934.8 L72601.8 3935.0 Z"></path>
+						<path d="M62410.7 2672.5 L62405.9 2682.1 L62400.1 2673.1 L62404.8 2663.5 Z"></path>
 					</g>
-					<path d="M72609.4 3944.9 L72522 4000 L72971.75 4100.9066555043955 L72971.8 4100.9 " fill="none"></path>
+					<path d="M52628.8 2705.2 L52628.75 3314 L41435 3500.0180771201353 L41435.0 3500.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72620.2 3944.5 L72609.4 3944.9 L72614.5 3935.5 L72625.2 3935.0 Z"></path>
+						<path d="M52634.1 2695.8 L52628.8 2705.2 L52623.4 2695.8 L52628.8 2686.5 Z"></path>
 					</g>
-					<path d="M72990.7 3850.3 L77841.5 4000 L83411.5 4132.701573473198 L83411.5 4132.7 " fill="none"></path>
+					<path d="M69696.5 165.3 L69696.5 293 L69696.5 583.5 L69696.5 583.5 " fill="none"></path>
+					<path d="M69701.8 165.3 L69696.5 165.3 L69691.2 165.3 L69696.5 152.0 Z"></path>
+					<path d="M70466.5 165.3 L70466.5 293 L70466.5 583.5 L70466.5 583.5 " fill="none"></path>
+					<path d="M70471.8 165.3 L70466.5 165.3 L70461.2 165.3 L70466.5 152.0 Z"></path>
+					<path d="M71005.3 159.6 L70811.5 293 L70811.5 575.5 L70811.5 575.5 " fill="none"></path>
+					<path d="M71008.3 164.0 L71005.3 159.6 L71002.2 155.2 L71016.2 152.0 Z"></path>
+					<path d="M71059.6 162.4 L71164.5 293 L71164.5 598.5 L71164.5 598.5 " fill="none"></path>
+					<path d="M71063.7 159.1 L71059.6 162.4 L71055.4 165.7 L71051.2 152.0 Z"></path>
+					<path d="M71506.7 193.7 L71442 293 L71442 598.5 L71442.0 598.5 " fill="none"></path>
+					<path d="M71511.2 196.6 L71506.7 193.7 L71502.3 190.8 L71514.0 182.5 Z"></path>
+					<path d="M71581.3 193.7 L71646 293 L71646 598.5 L71646.0 598.5 " fill="none"></path>
+					<path d="M71585.7 190.8 L71581.3 193.7 L71576.8 196.6 L71574.0 182.5 Z"></path>
+					<path d="M52826.8 2712.2 L52826.75 3314 L40203 3499.859549231285 L40203.0 3499.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72981.5 3844.7 L72990.7 3850.3 L72981.2 3855.3 L72972.0 3849.7 Z"></path>
+						<path d="M52832.1 2702.8 L52826.8 2712.2 L52821.4 2702.8 L52826.8 2693.5 Z"></path>
 					</g>
-					<path d="M72990.7 3850.1 L77958.75 4000 L18421.25 4133.838146604148 L18421.3 4133.8 " fill="none"></path>
+					<path d="M75607.7 176.8 L75726.5 293 L75726.5 629.5 L75726.5 629.5 L75726.5 966 L75726.5 966 L75726.5 1174 L75726.5 1174.0 " fill="none"></path>
+					<path d="M75611.5 173.0 L75607.7 176.8 L75604.0 180.6 L75598.2 167.5 Z"></path>
+					<path d="M5229.9 3422.4 L5242.75 3417 L5250.25 3417 L5250.25 3417 L5257.75 3500.5 L5257.75 3500.5 L5250.25 3584 L5250.25 3584 L5242.75 3584 L5242.75 3584 L5212.75 3571.284263959391 L5212.8 3571.3 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72981.5 3844.5 L72990.7 3850.1 L72981.2 3855.2 L72972.0 3849.6 Z"></path>
+						<path d="M5219.3 3421.2 L5229.9 3422.4 L5223.4 3431.0 L5212.8 3429.7 Z"></path>
 					</g>
-					<path d="M83643.7 1448.2 L83632.25 1459 L83632.25 1697.5 L83632.25 1697.5 L83632.25 1936 L83632.25 1936 L83632.25 2625 L83632.25 2625 L83632.25 3314 L83632.25 3314 L83632.25 3500.5 L83632.25 3500.5 L83632.25 3687 L83632.25 3687 L72972 3840.5967155384724 L72972.0 3840.6 " fill="none"></path>
-					<path d="M83647.3 1452.0 L83643.7 1448.2 L83640.0 1444.3 L83653.3 1439.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M72770.5 3552.3 L72770.5 3687 L72770.5 3752 L72770.5 3752.0 " fill="none"></path>
+						<path d="M4137.2 2648.4 L5045.75 3314 L5045.75 3417 L5045.8 3417.0 " fill="none"></path>
 					</g>
-					<path d="M72775.8 3552.3 L72770.5 3552.3 L72765.2 3552.3 L72770.5 3539.0 Z"></path>
-					<path d="M83917.4 3956.9 L83881.75 4000 L77468.25 4131.428200030586 L77468.3 4131.4 " fill="none"></path>
+					<path d="M4140.3 2644.1 L4137.2 2648.4 L4134.0 2652.7 L4126.4 2640.5 Z"></path>
+					<path d="M71986.5 165.3 L71986.5 293 L71986.5 583 L71986.5 583.0 " fill="none"></path>
+					<path d="M71991.8 165.3 L71986.5 165.3 L71981.2 165.3 L71986.5 152.0 Z"></path>
+					<path d="M10869.7 1724.4 L10997 1936 L10997 2541 L10997.0 2541.0 " fill="none"></path>
+					<path d="M10874.3 1721.7 L10869.7 1724.4 L10865.1 1727.2 L10862.8 1713.0 Z"></path>
+					<path d="M78016.0 724.7 L78016 966 L78016 1197 L78016.0 1197.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M83927.5 3953.1 L83917.4 3956.9 L83919.3 3946.3 L83929.3 3942.5 Z"></path>
+						<path d="M78021.3 715.3 L78016.0 724.7 L78010.7 715.3 L78016.0 706.0 Z"></path>
 					</g>
-					<path d="M84063.5 3959.5 L84081.75 4000 L73266.75 4132.197035347776 L73266.8 4132.2 " fill="none"></path>
+					<path d="M78016.0 165.3 L78016 293 L78016 553 L78016.0 553.0 " fill="none"></path>
+					<path d="M78021.3 165.3 L78016.0 165.3 L78010.7 165.3 L78016.0 152.0 Z"></path>
+					<path d="M48691.6 3931.0 L48682.75 4000 L48352.2322761194 4118.5 L48352.2 4118.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M84064.5 3948.8 L84063.5 3959.5 L84054.8 3953.2 L84055.8 3942.5 Z"></path>
-					</g>
-					<path d="M83951.6 1785.9 L84011.25 1936 L84011.25 2625 L84011.25 2625 L84011.25 3314 L84011.25 3314 L84011.25 3500.5 L84011.25 3500.5 L84011.25 3687 L84011.25 3687 L84011.25 3744.5 L84011.3 3744.5 " fill="none"></path>
-					<path d="M83956.6 1783.9 L83951.6 1785.9 L83946.7 1787.9 L83946.7 1773.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M75563.6 148.6 L76277.25 293 L76277.25 614 L76277.3 614.0 " fill="none"></path>
-					</g>
-					<path d="M75564.6 143.4 L75563.6 148.6 L75562.5 153.9 L75550.5 146.0 Z"></path>
-					<path d="M76203.6 640.3 L73986.5 966 L73986.5 1197 L73986.5 1197.0 " fill="none"></path>
-					<path d="M76204.3 645.6 L76203.6 640.3 L76202.8 635.0 L76216.8 638.4 Z"></path>
-					<path d="M76203.6 641.9 L74274 966 L74274 1197 L74274.0 1197.0 " fill="none"></path>
-					<path d="M76204.5 647.1 L76203.6 641.9 L76202.7 636.6 L76216.8 639.7 Z"></path>
-					<path d="M76203.7 644.0 L74574.5 966 L74574.5 1197 L74574.5 1197.0 " fill="none"></path>
-					<path d="M76204.7 649.3 L76203.7 644.0 L76202.6 638.8 L76216.8 641.5 Z"></path>
-					<path d="M76203.8 647.1 L74871 966 L74871 1197 L74871.0 1197.0 " fill="none"></path>
-					<path d="M76205.0 652.3 L76203.8 647.1 L76202.5 641.9 L76216.8 644.0 Z"></path>
-					<path d="M76213.9 648.9 L75179 966 L75179 1197 L75179.0 1197.0 " fill="none"></path>
-					<path d="M76215.5 654.0 L76213.9 648.9 L76212.4 643.8 L76226.7 645.0 Z"></path>
-					<path d="M76270.2 657.9 L76194 966 L76194 1197 L76194.0 1197.0 " fill="none"></path>
-					<path d="M76275.4 659.2 L76270.2 657.9 L76265.0 656.7 L76273.4 645.0 Z"></path>
-					<path d="M76294.7 656.2 L76497.5 966 L76497.5 1197 L76497.5 1197.0 " fill="none"></path>
-					<path d="M76299.2 653.2 L76294.7 656.2 L76290.2 659.1 L76287.4 645.0 Z"></path>
-					<path d="M76312.1 652.3 L76791 966 L76791 1197 L76791.0 1197.0 " fill="none"></path>
-					<path d="M76315.0 647.8 L76312.1 652.3 L76309.1 656.8 L76300.9 645.0 Z"></path>
-					<path d="M76327.6 650.0 L77102 966 L77102 1197 L77102.0 1197.0 " fill="none"></path>
-					<path d="M76329.6 645.1 L76327.6 650.0 L76325.6 655.0 L76315.2 645.0 Z"></path>
-					<path d="M76340.6 648.9 L77375.5 966 L77375.5 1197 L77375.5 1197.0 " fill="none"></path>
-					<path d="M76342.1 643.8 L76340.6 648.9 L76339.0 654.0 L76327.8 645.0 Z"></path>
-					<path d="M77164.8 4639.7 L77164.75 4641 L76981.75 4666.627218934911 L76981.8 4666.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M77170.1 4630.3 L77164.8 4639.7 L77159.4 4630.3 L77164.8 4621.0 Z"></path>
-					</g>
-					<path d="M76644.0 4174.7 L76556.25 4268 L76925.25 4381.095316351684 L76925.3 4381.1 " fill="none"></path>
-					<path d="M76647.9 4178.4 L76644.0 4174.7 L76640.1 4171.1 L76653.1 4165.0 Z"></path>
-					<path d="M76986.8 4215.8 L76986.75 4268 L77005.83847184987 4288 L77005.8 4288.0 " fill="none"></path>
-					<path d="M76992.1 4215.8 L76986.8 4215.8 L76981.4 4215.8 L76986.8 4202.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M77342.8 4253.3 L77342.75 4268 L77323.66152815013 4288 L77323.7 4288.0 " fill="none"></path>
+						<path d="M48698.0 3922.4 L48691.6 3931.0 L48687.5 3921.1 L48693.9 3912.5 Z"></path>
 					</g>
-					<path d="M77348.1 4253.3 L77342.8 4253.3 L77337.4 4253.3 L77342.8 4240.0 Z"></path>
-					<path d="M59799.3 3916.2 L59799.25 4000 L77217.25 4133.041411348932 L77217.3 4133.0 " fill="none"></path>
+					<path d="M48792.7 3925.0 L48875.5 4000 L46871.75 4129.1964393119215 L46871.8 4129.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M59804.6 3906.8 L59799.3 3916.2 L59793.9 3906.8 L59799.3 3897.5 Z"></path>
+						<path d="M48789.4 3914.8 L48792.7 3925.0 L48782.3 3922.7 L48778.9 3912.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M59799.3 3552.3 L59799.25 3687 L59799.25 3789.5 L59799.3 3789.5 " fill="none"></path>
-					</g>
-					<path d="M59804.6 3552.3 L59799.3 3552.3 L59793.9 3552.3 L59799.3 3539.0 Z"></path>
-					<path d="M70172.6 3570.4 L69942.75 3687 L69942.75 3843.5 L69942.75 3843.5 L69942.75 4000 L69942.75 4000 L76390.25 4132.866589773164 L76390.3 4132.9 " fill="none"></path>
+					<path d="M48968.4 3961.1 L48915.5 4000 L47045.75 4129.364399122241 L47045.8 4129.4 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70183.3 3571.0 L70172.6 3570.4 L70178.5 3561.5 L70189.2 3562.0 Z"></path>
+						<path d="M48979.1 3959.8 L48968.4 3961.1 L48972.8 3951.2 L48983.5 3950.0 Z"></path>
 					</g>
-					<path d="M70628.6 3910.8 L70419 4000 L77217.25 4131.57111391948 L77217.3 4131.6 " fill="none"></path>
+					<path d="M48996.9 3962.5 L48955.5 4000 L48020.5 4123.014236622484 L48020.5 4123.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70639.3 3912.1 L70628.6 3910.8 L70635.1 3902.3 L70645.8 3903.5 Z"></path>
+						<path d="M49007.4 3960.2 L48996.9 3962.5 L49000.2 3952.3 L49010.7 3950.0 Z"></path>
 					</g>
-					<path d="M70628.9 3918.9 L70459 4000 L72971.75 4126.570247157222 L72971.8 4126.6 " fill="none"></path>
+					<path d="M49090.3 3967.9 L49080.5 4000 L41537.5 4132.733026920551 L41537.5 4132.7 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70639.6 3919.7 L70628.9 3918.9 L70635.0 3910.0 L70645.8 3910.8 Z"></path>
+						<path d="M49098.1 3960.5 L49090.3 3967.9 L49087.9 3957.4 L49095.8 3950.0 Z"></path>
 					</g>
-					<path d="M70806.7 3945.8 L70817.25 4000 L77134.25 4133.545476059005 L77134.3 4133.5 " fill="none"></path>
+					<path d="M49338.2 3873.8 L50211 4000 L47389.75 4127.149583788783 L47389.8 4127.1 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70810.1 3935.6 L70806.7 3945.8 L70799.7 3937.7 L70803.1 3927.5 Z"></path>
+						<path d="M49329.8 3867.2 L49338.2 3873.8 L49328.2 3877.8 L49319.8 3871.2 Z"></path>
 					</g>
-					<path d="M70832.3 3944.5 L70857.25 4000 L76390.25 4132.681102362205 L76390.3 4132.7 " fill="none"></path>
+					<path d="M50363.6 3915.6 L50342 4000 L47489.75 4132.605256310174 L47489.8 4132.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M70833.3 3933.8 L70832.3 3944.5 L70823.6 3938.2 L70824.6 3927.5 Z"></path>
+						<path d="M50371.1 3907.9 L50363.6 3915.6 L50360.7 3905.2 L50368.2 3897.5 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M70452.9 3556.3 L70786.75 3687 L70786.75 3759.5 L70786.8 3759.5 " fill="none"></path>
+					<path d="M53436.5 4214.2 L53436.5 4268 L56070.5 4455.487066593286 L56070.5 4455.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M53441.8 4204.8 L53436.5 4214.2 L53431.2 4204.8 L53436.5 4195.5 Z"></path>
 					</g>
-					<path d="M70454.9 3551.3 L70452.9 3556.3 L70451.0 3561.2 L70440.5 3551.4 Z"></path>
-					<path d="M3281.0 3450.3 L3293 3447 L3300.5 3447 L3300.5 3447 L3308 3500.5 L3308 3500.5 L3300.5 3554 L3300.5 3554 L3293 3554 L3293 3554 L3263 3545.8527918781724 L3263.0 3545.9 " fill="none"></path>
+					<path d="M50382.0 3910.8 L50382 4000 L53168.5 4122.242920281552 L53168.5 4122.2 " fill="none"></path>
+					<path d="M50387.3 3910.8 L50382.0 3910.8 L50376.7 3910.8 L50382.0 3897.5 Z"></path>
+					<path d="M50443.9 3907.0 L50534.5 4000 L48196.5 4130.212801330008 L48196.5 4130.2 " fill="none"></path>
+					<path d="M50447.7 3903.3 L50443.9 3907.0 L50440.1 3910.8 L50434.6 3897.5 Z"></path>
+					<path d="M41406.0 3529.3 L41406 3687 L41406 3805 L41406.0 3805.0 " fill="none"></path>
+					<path d="M41411.3 3529.3 L41406.0 3529.3 L41400.7 3529.3 L41406.0 3516.0 Z"></path>
+					<path d="M40929.4 1727.4 L38804 1936 L30271.75 2613.2134032197678 L30271.8 2613.2 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M3270.6 3447.6 L3281.0 3450.3 L3273.4 3457.8 L3263.0 3455.1 Z"></path>
+						<path d="M40939.2 1731.8 L40929.4 1727.4 L40938.2 1721.2 L40948.0 1725.6 Z"></path>
 					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3126.8 2650.7 L3681.5 3314 L3263 3447.3052946199828 L3263.0 3447.3 " fill="none"></path>
+					<path d="M40929.4 1728.9 L38917 1936 L38917 2609.5 L38917.0 2609.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M40939.3 1733.2 L40929.4 1728.9 L40938.2 1722.6 L40948.0 1726.9 Z"></path>
 					</g>
-					<path d="M3130.9 2647.3 L3126.8 2650.7 L3122.7 2654.1 L3118.2 2640.5 Z"></path>
-					<path d="M72953.1 4140.1 L69475.5 4268 L69475.5 4454.5 L69475.5 4454.5 L69475.5 4641 L69475.5 4641 L73039.75 4676.238007380074 L73039.8 4676.2 " fill="none"></path>
+					<path d="M40929.5 1740.0 L39525 1936 L39525 2609.5 L39525.0 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M72962.6 4145.1 L72953.1 4140.1 L72962.2 4134.4 L72971.8 4139.4 Z"></path>
+						<path d="M40939.5 1744.0 L40929.5 1740.0 L40938.0 1733.4 L40948.0 1737.4 Z"></path>
 					</g>
-					<path d="M73285.4 4141.2 L76193.75 4268 L76193.75 4454.5 L76193.75 4454.5 L76193.75 4641 L76193.75 4641 L76321 4668.090704647676 L76321.0 4668.1 " fill="none"></path>
+					<path d="M41538.7 1707.7 L48365.25 1936 L48365.25 2609.5 L48365.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M73276.3 4135.5 L73285.4 4141.2 L73275.8 4146.2 L73266.8 4140.4 Z"></path>
+						<path d="M41529.5 1702.0 L41538.7 1707.7 L41529.1 1712.7 L41520.0 1707.1 Z"></path>
 					</g>
-					<path d="M19757.0 3887.8 L19757 4000 L72971.75 4133.629607072416 L72971.8 4133.6 " fill="none"></path>
-					<path d="M19762.3 3887.8 L19757.0 3887.8 L19751.7 3887.8 L19757.0 3874.5 Z"></path>
-					<path d="M76381.7 4615.2 L76368.75 4641 L76840.75 4671.8866359447 L76840.8 4671.9 " fill="none"></path>
+					<path d="M41538.7 1707.2 L48754.25 1936 L48754.25 2609.5 L48754.3 2609.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M76390.7 4609.2 L76381.7 4615.2 L76381.2 4604.4 L76390.1 4598.5 Z"></path>
+						<path d="M41529.5 1701.5 L41538.7 1707.2 L41529.2 1712.2 L41520.0 1706.6 Z"></path>
 					</g>
-					<path d="M76415.8 4616.4 L76408.75 4641 L76460.15845070423 4661 L76460.2 4661.0 " fill="none"></path>
+					<path d="M30113.7 2750.1 L30070.5 3314 L30070.5 3485 L30070.5 3485.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M76423.5 4608.9 L76415.8 4616.4 L76413.3 4606.0 L76421.0 4598.5 Z"></path>
+						<path d="M30119.7 2741.2 L30113.7 2750.1 L30109.1 2740.4 L30115.1 2731.5 Z"></path>
 					</g>
-					<path d="M76509.2 4616.4 L76516.25 4641 L76400 4667.496789727127 L76400.0 4667.5 " fill="none"></path>
+					<path d="M30136.7 2750.1 L30197.5 3314 L13226.5 3498.472767011511 L13226.5 3498.5 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M76511.7 4606.0 L76509.2 4616.4 L76501.5 4608.9 L76504.0 4598.5 Z"></path>
+						<path d="M30141.0 2740.2 L30136.7 2750.1 L30130.4 2741.4 L30134.7 2731.5 Z"></path>
 					</g>
-					<path d="M76543.3 4615.2 L76556.25 4641 L73092.75 4676.230444126075 L73092.8 4676.2 " fill="none"></path>
+					<path d="M10914.6 1710.0 L12023.25 1936 L29974.75 2619.3471546961327 L29974.8 2619.3 " fill="none"></path>
+					<path d="M10915.6 1704.7 L10914.6 1710.0 L10913.5 1715.2 L10901.5 1707.3 Z"></path>
+					<path d="M13244.6 3449.9 L13256.5 3447 L13264 3447 L13264 3447 L13271.5 3500.5 L13271.5 3500.5 L13264 3554 L13264 3554 L13256.5 3554 L13256.5 3554 L13226.5 3546.5866050808313 L13226.5 3546.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M76543.8 4604.4 L76543.3 4615.2 L76534.3 4609.2 L76534.9 4598.5 Z"></path>
+						<path d="M13234.3 3447.0 L13244.6 3449.9 L13236.8 3457.4 L13226.5 3454.4 Z"></path>
 					</g>
 					<g stroke-dasharray="6 6">
-						<path d="M73280.1 4140.4 L76462.5 4268 L76462.5 4310.5 L76462.5 4310.5 " fill="none"></path>
+						<path d="M4142.8 2647.3 L5263.75 3314 L12853.5 3496.0271178267158 L12853.5 3496.0 " fill="none"></path>
 					</g>
-					<path d="M73280.3 4135.1 L73280.1 4140.4 L73279.9 4145.8 L73266.8 4139.9 Z"></path>
-					<path d="M79930.5 168.9 L79605.75 293 L79605.75 614 L79605.8 614.0 " fill="none"></path>
-					<path d="M79932.4 173.9 L79930.5 168.9 L79928.6 164.0 L79943.0 164.2 Z"></path>
-					<path d="M76689.6 4183.5 L76702.25 4268 L76702.25 4454.5 L76702.25 4454.5 L76702.25 4641 L76702.25 4641 L76840.75 4664.525119617225 L76840.8 4664.5 " fill="none"></path>
+					<path d="M4145.5 2642.7 L4142.8 2647.3 L4140.0 2651.9 L4131.3 2640.5 Z"></path>
+					<path d="M75964.0 193.7 L75964 293 L75964 614 L75964.0 614.0 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M76693.5 4173.4 L76689.6 4183.5 L76683.0 4175.0 L76686.9 4165.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M75563.8 141.3 L77475.75 293 L77475.75 583.5 L77475.8 583.5 " fill="none"></path>
+						<path d="M75969.3 184.3 L75964.0 193.7 L75958.7 184.3 L75964.0 175.0 Z"></path>
 					</g>
-					<path d="M75564.2 136.0 L75563.8 141.3 L75563.4 146.6 L75550.5 140.2 Z"></path>
-					<path d="M61577.8 2772.7 L61577.75 3314 L32726.5 3500.148365809571 L32726.5 3500.1 " fill="none"></path>
+					<path d="M55555.0 2712.7 L55555 3314 L57029 3494.8559210526314 L57029.0 3494.9 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M61583.1 2763.3 L61577.8 2772.7 L61572.4 2763.3 L61577.8 2754.0 Z"></path>
+						<path d="M55560.3 2703.3 L55555.0 2712.7 L55549.7 2703.3 L55555.0 2694.0 Z"></path>
 					</g>
+					<path d="M59734.3 1731.3 L59100.5 1936 L59100.5 2594 L59100.5 2594.0 " fill="none"></path>
+					<path d="M59736.0 1736.4 L59734.3 1731.3 L59732.7 1726.2 L59747.0 1727.2 Z"></path>
+					<path d="M59097.1 2669.3 L59048 3314 L58174.66219839142 3485 L58174.7 3485.0 " fill="none"></path>
+					<path d="M59102.4 2669.7 L59097.1 2669.3 L59091.8 2668.9 L59098.1 2656.0 Z"></path>
+					<path d="M59765.5 1734.5 L59365 1936 L59365 2594 L59365.0 2594.0 " fill="none"></path>
+					<path d="M59767.9 1739.3 L59765.5 1734.5 L59763.1 1729.7 L59777.4 1728.5 Z"></path>
+					<path d="M59840.9 1741.8 L59849.25 1936 L39330.5 2620.877799174024 L39330.5 2620.9 " fill="none"></path>
+					<path d="M59846.2 1741.6 L59840.9 1741.8 L59835.6 1742.1 L59840.3 1728.5 Z"></path>
+					<path d="M39207.0 2669.3 L39207 3314 L48052.25 3497.747500765782 L48052.3 3497.7 " fill="none"></path>
+					<path d="M39212.3 2669.3 L39207.0 2669.3 L39201.7 2669.3 L39207.0 2656.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M75563.8 140.8 L77720.75 293 L77720.75 614 L77720.8 614.0 " fill="none"></path>
+						<path d="M59123.2 2667.8 L59466.5 3314 L48317.25 3498.3096261661535 L48317.3 3498.3 " fill="none"></path>
 					</g>
-					<path d="M75564.2 135.4 L75563.8 140.8 L75563.4 146.1 L75550.5 139.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M77720.8 658.3 L77720.75 966 L77720.75 1197 L77720.8 1197.0 " fill="none"></path>
+					<path d="M59127.9 2665.3 L59123.2 2667.8 L59118.5 2670.3 L59117.0 2656.0 Z"></path>
+					<path d="M59848.3 1741.5 L59889.25 1936 L38750.5 2621.223591818492 L38750.5 2621.2 " fill="none"></path>
+					<path d="M59853.5 1740.4 L59848.3 1741.5 L59843.1 1742.6 L59845.5 1728.5 Z"></path>
+					<path d="M38634.0 2669.3 L38634 3314 L38634 3469.5 L38634.0 3469.5 " fill="none"></path>
+					<path d="M38639.3 2669.3 L38634.0 2669.3 L38628.7 2669.3 L38634.0 2656.0 Z"></path>
+					<path d="M59920.6 1733.9 L60373.5 1936 L60373.5 2594 L60373.5 2594.0 " fill="none"></path>
+					<path d="M59922.8 1729.1 L59920.6 1733.9 L59918.5 1738.8 L59908.5 1728.5 Z"></path>
+					<path d="M5678.9 3451.0 L5873.916666666667 3402 L5927.208333333333 3402 L5927.208333333333 3402 L5980.5 3500.5 L5980.5 3500.5 L5927.208333333333 3599 L5927.208333333333 3599 L5873.916666666667 3599 L5873.916666666667 3599 L5660.75 3545.4592010199744 L5660.8 3545.5 " fill="none"></path>
+					<g fill="#eee8d5">
+						<path d="M5668.5 3448.1 L5678.9 3451.0 L5671.1 3458.4 L5660.8 3455.5 Z"></path>
 					</g>
-					<path d="M77726.1 658.3 L77720.8 658.3 L77715.4 658.3 L77720.8 645.0 Z"></path>
 					<g stroke-dasharray="6 6">
-						<path d="M83738.1 175.6 L83892.25 293 L83892.25 501 L83892.3 501.0 " fill="none"></path>
+						<path d="M4147.7 2646.2 L5481.75 3314 L5481.75 3402 L5481.8 3402.0 " fill="none"></path>
 					</g>
-					<path d="M83741.3 171.3 L83738.1 175.6 L83734.8 179.8 L83727.5 167.5 Z"></path>
-					<path d="M83916.4 1457.6 L83916.5 1459 L83916.5 1621.5 L83916.5 1621.5 " fill="none"></path>
+					<path d="M4150.1 2641.5 L4147.7 2646.2 L4145.3 2651.0 L4135.8 2640.3 Z"></path>
+					<path d="M76515.6 160.6 L76359.75 293 L76359.75 591 L76359.8 591.0 " fill="none"></path>
+					<path d="M76519.0 164.7 L76515.6 160.6 L76512.1 156.6 L76525.8 152.0 Z"></path>
+					<path d="M76611.6 155.6 L77097.25 293 L77097.25 591 L77097.3 591.0 " fill="none"></path>
+					<path d="M76613.1 150.5 L76611.6 155.6 L76610.2 160.8 L76598.8 152.0 Z"></path>
+					<path d="M56676.0 2704.7 L56676 3314 L63007.5 3499.6059022320023 L63007.5 3499.6 " fill="none"></path>
 					<g fill="#eee8d5">
-						<path d="M83920.8 1447.8 L83916.4 1457.6 L83910.1 1448.8 L83914.5 1439.0 Z"></path>
+						<path d="M56681.3 2695.3 L56676.0 2704.7 L56670.7 2695.3 L56676.0 2686.0 Z"></path>
 					</g>
-					<path d="M84182.3 1450.9 L84192.25 1459 L84192.25 1697.5 L84192.25 1697.5 L84192.25 1936 L84192.25 1936 L84192.25 2625 L84192.25 2625 L84192.25 3314 L84192.25 3314 L84192.25 3500.5 L84192.25 3500.5 L84192.25 3687 L84192.25 3687 L84192.25 3843.5 L84192.25 3843.5 L84192.25 4000 L84192.25 4000 L62317 4133.557357815722 L62317.0 4133.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M84178.5 1440.8 L84182.3 1450.9 L84171.7 1449.0 L84167.9 1439.0 Z"></path>
+					<g data-name="PlatformLocaleWeb">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleWeb">
+							<rect x="0.0" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleWeb"></rect>
+							<path d="M0.0 629.5 L239.0 629.5" fill="none" data-name="PlatformLocaleWeb"></path>
+						</g>
+						<g transform="translate(0, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleWeb">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleWeb">
+								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleWeb">PlatformLocaleWeb</text>
+								
+							</g>
+						</g>
+						<g transform="translate(0, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleWeb">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleWeb">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleWeb">+Locale getPlatformLocale()</text>
+								
+							</g>
+						</g>
 					</g>
-					<path d="M83892.3 771.3 L83892.25 966 L83892.25 986 L83892.3 986.0 " fill="none"></path>
-					<path d="M83897.6 771.3 L83892.3 771.3 L83886.9 771.3 L83892.3 758.0 Z"></path>
-					<path d="M79942.0 182.0 L79762.75 293 L79762.75 614 L79762.8 614.0 " fill="none"></path>
-					<path d="M79944.8 186.6 L79942.0 182.0 L79939.2 177.5 L79953.3 175.0 Z"></path>
-					<path d="M79976.8 185.5 L79891.75 293 L79891.75 614 L79891.8 614.0 " fill="none"></path>
-					<path d="M79981.0 188.8 L79976.8 185.5 L79972.6 182.2 L79985.1 175.0 Z"></path>
-					<path d="M80101.0 156.5 L80686 293 L80686 614 L80686.0 614.0 " fill="none"></path>
-					<path d="M80102.2 151.3 L80101.0 156.5 L80099.8 161.6 L80088.0 153.4 Z"></path>
-					<path d="M80101.1 153.3 L80811.5 293 L80811.5 614 L80811.5 614.0 " fill="none"></path>
-					<path d="M80102.1 148.1 L80101.1 153.3 L80100.1 158.6 L80088.0 150.8 Z"></path>
-					<g data-name="Config">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Config">
-							<rect x="25187.5" y="60.5" height="152.0" width="396.0" data-name="Config"></rect>
-							<path d="M25187.5 91.5 L25583.5 91.5" fill="none" data-name="Config"></path>
+					<g data-name="PlatformLocale">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocale">
+							<rect x="139.5" y="105.5" height="62.0" width="239.0" data-name="PlatformLocale"></rect>
+							<path d="M139.5 136.5 L378.5 136.5" fill="none" data-name="PlatformLocale"></path>
 						</g>
-						<g transform="translate(25187.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Config">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Config">
-								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="Config">Config</text>
+						<g transform="translate(139.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformLocale">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocale">
+								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocale">PlatformLocale</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25187.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Config">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Config">
-								<text x="0.0" y="13.5" stroke="none" data-name="Config">&lt;static&gt;+isDebugMode: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Config">&lt;static&gt;+defaultLocale: Set&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Config">&lt;static&gt;+supportedLocales: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Config">&lt;static&gt;+newStudyId: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Config">&lt;static&gt;+newModelId: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Config">&lt;static&gt;+minSplashTime: int</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Config">&lt;static&gt;+formAutosaveDebounce: int</text>
+						<g transform="translate(139.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocale">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocale">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocale">+Locale getPlatformLocale()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ResultTypes">
-							<rect x="25623.5" y="121.0" height="31.0" width="114.0" data-name="ResultTypes"></rect>
+					<g data-name="PlatformLocaleMobile">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleMobile">
+							<rect x="279.0" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleMobile"></rect>
+							<path d="M279.0 629.5 L518.0 629.5" fill="none" data-name="PlatformLocaleMobile"></path>
 						</g>
-						<g transform="translate(25623.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ResultTypes">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ResultTypes">ResultTypes</text>
+						<g transform="translate(279, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleMobile">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleMobile">
+								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleMobile">PlatformLocaleMobile</text>
+								
+							</g>
+						</g>
+						<g transform="translate(279, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleMobile">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleMobile">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleMobile">+Locale getPlatformLocale()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementResultTypes">
-							<rect x="25254.5" y="591.0" height="77.0" width="252.0" data-name="MeasurementResultTypes"></rect>
-							<path d="M25254.5 622.0 L25506.5 622.0" fill="none" data-name="MeasurementResultTypes"></path>
+					<g data-name="AppTranslation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppTranslation">
+							<rect x="428.3" y="105.5" height="62.0" width="194.0" data-name="AppTranslation"></rect>
+							<path d="M428.3 136.5 L622.3 136.5" fill="none" data-name="AppTranslation"></path>
 						</g>
-						<g transform="translate(25254.5, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementResultTypes">
-								<text x="118.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementResultTypes">MeasurementResultTypes</text>
+						<g transform="translate(428.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppTranslation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppTranslation">
+								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppTranslation">AppTranslation</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25254.5, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementResultTypes">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+questionnaire: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
+						<g transform="translate(428.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppTranslation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppTranslation">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppTranslation">&lt;static&gt;+dynamic init()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionResultTypes">
-							<rect x="25546.5" y="591.0" height="77.0" width="268.0" data-name="InterventionResultTypes"></rect>
-							<path d="M25546.5 622.0 L25814.5 622.0" fill="none" data-name="InterventionResultTypes"></path>
+					<g data-name="LanguagePicker">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePicker">
+							<rect x="2072.5" y="2579.0" height="92.0" width="366.0" data-name="LanguagePicker"></rect>
+							<path d="M2072.5 2610.0 L2438.5 2610.0" fill="none" data-name="LanguagePicker"></path>
 						</g>
-						<g transform="translate(25546.5, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionResultTypes">
-								<text x="126.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionResultTypes">InterventionResultTypes</text>
+						<g transform="translate(2072.5, 2579)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePicker">
+								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePicker">LanguagePicker</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25546.5, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResultTypes">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+checkmarkTask: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
+						<g transform="translate(2072.5, 2610)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePicker">
+								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePicker">+languagePickerType: LanguagePickerType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePicker">+iconColor: Color?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePicker">+offset: Offset?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyExportData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyExportData">
-							<rect x="0.0" y="2564.0" height="122.0" width="414.0" data-name="StudyExportData"></rect>
-							<path d="M0.0 2595.0 L414.0 2595.0" fill="none" data-name="StudyExportData"></path>
+					<g data-name="LanguagePickerType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePickerType">
+							<rect x="1920.3" y="3447.0" height="107.0" width="366.0" data-name="LanguagePickerType"></rect>
+							<path d="M1920.3 3478.0 L2286.3 3478.0" fill="none" data-name="LanguagePickerType"></path>
 						</g>
-						<g transform="translate(0, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyExportData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyExportData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyExportData">StudyExportData</text>
+						<g transform="translate(1920.25, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePickerType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePickerType">
+								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePickerType">LanguagePickerType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(0, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyExportData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyExportData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyExportData">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyExportData">+measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyExportData">+interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyExportData">+mediaData: List&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyExportData">+isEmpty: bool</text>
+						<g transform="translate(1920.25, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePickerType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePickerType">
+								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePickerType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+values: List&lt;LanguagePickerType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+field: LanguagePickerType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+icon: LanguagePickerType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="64938.0" y="3485.0" height="31.0" width="61.0" data-name="Study"></rect>
+					<g data-name="Color">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
+							<rect x="41377.0" y="3485.0" height="31.0" width="58.0" data-name="Color"></rect>
 						</g>
-						<g transform="translate(64938, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
+						<g transform="translate(41377, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
+								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="Offset">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Offset">
+							<rect x="2376.3" y="3485.0" height="31.0" width="63.0" data-name="Offset"></rect>
+						</g>
+						<g transform="translate(2376.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Offset">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Offset">
+								<text x="23.5" y="13.5" stroke="none" text-anchor="middle" data-name="Offset">Offset</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="Enum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
+							<rect x="4074.8" y="2609.5" height="31.0" width="61.0" data-name="Enum"></rect>
+						</g>
+						<g transform="translate(4074.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="IStudyRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
+							<rect x="62541.0" y="3462.0" height="77.0" width="251.0" data-name="IStudyRepository"></rect>
+							<path d="M62541.0 3493.0 L62792.0 3493.0" fill="none" data-name="IStudyRepository"></path>
+						</g>
+						<g transform="translate(62541, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
+								
+							</g>
+						</g>
+						<g transform="translate(62541, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyRepository">+dynamic launch()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyRepository">+dynamic deleteParticipants()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="ModelRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepository">
+							<rect x="74780.5" y="986.0" height="453.0" width="662.0" data-name="ModelRepository"></rect>
+							<path d="M74780.5 1017.0 L75442.5 1017.0" fill="none" data-name="ModelRepository"></path>
+							<path d="M74780.5 1123.0 L75442.5 1123.0" fill="none" data-name="ModelRepository"></path>
+						</g>
+						<g transform="translate(74780.5, 986)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepository">
+								<text x="323.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepository">ModelRepository</text>
+								
+							</g>
+						</g>
+						<g transform="translate(74780.5, 1017)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+delegate: IModelRepositoryDelegate&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">-_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">-_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">-_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(74780.5, 1123)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt;? get()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">+dynamic fetchAll()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">+dynamic fetch()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+dynamic delete()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSave()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ModelRepository">-dynamic _buildModelSpecificController()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="ModelRepository">+dynamic ensurePersisted()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt; upsertLocally()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="ModelRepository">+List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="ModelRepository">+dynamic emitUpdate()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="ModelRepository">+dynamic emitModelEvent()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="ModelRepository">+dynamic emitError()</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="ModelRepository">+void dispose()</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="ModelRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTemplates">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTemplates">
-							<rect x="25777.5" y="90.0" height="93.0" width="307.0" data-name="StudyTemplates"></rect>
-							<path d="M25777.5 121.0 L26084.5 121.0" fill="none" data-name="StudyTemplates"></path>
-							<path d="M25777.5 152.0 L26084.5 152.0" fill="none" data-name="StudyTemplates"></path>
+					<g data-name="StudyRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepository">
+							<rect x="67033.3" y="3752.0" height="183.0" width="403.0" data-name="StudyRepository"></rect>
+							<path d="M67033.3 3783.0 L67436.3 3783.0" fill="none" data-name="StudyRepository"></path>
+							<path d="M67033.3 3859.0 L67436.3 3859.0" fill="none" data-name="StudyRepository"></path>
 						</g>
-						<g transform="translate(25777.5, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTemplates">
-								<text x="145.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTemplates">StudyTemplates</text>
+						<g transform="translate(67033.25, 3752)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepository">
+								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepository">StudyRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25777.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+kUnnamedStudyTitle: String</text>
+						<g transform="translate(67033.25, 3783)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+apiClient: StudyUApi</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+sortCallback: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25777.5, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+Study emptyDraft()</text>
+						<g transform="translate(67033.25, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+String getKey()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+dynamic deleteParticipants()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+dynamic launch()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyActionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyActionType">
-							<rect x="68.0" y="3402.0" height="197.0" width="358.0" data-name="StudyActionType"></rect>
-							<path d="M68.0 3433.0 L426.0 3433.0" fill="none" data-name="StudyActionType"></path>
+					<g data-name="StudyUApi">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApi">
+							<rect x="62929.0" y="4028.0" height="212.0" width="251.0" data-name="StudyUApi"></rect>
+							<path d="M62929.0 4059.0 L63180.0 4059.0" fill="none" data-name="StudyUApi"></path>
 						</g>
-						<g transform="translate(68, 3402)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyActionType">
-								<text x="171.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyActionType">StudyActionType</text>
+						<g transform="translate(62929, 4028)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyUApi">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApi">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApi">StudyUApi</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68, 3433)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyActionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyActionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+values: List&lt;StudyActionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pin: StudyActionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pinoff: StudyActionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+edit: StudyActionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicate: StudyActionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicateDraft: StudyActionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+addCollaborator: StudyActionType</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+export: StudyActionType</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+delete: StudyActionType</text>
+						<g transform="translate(62929, 4059)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApi">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApi">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApi">+dynamic saveStudy()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApi">+dynamic getUserStudies()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApi">+dynamic saveStudyInvite()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudyInvite()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudyInvite()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApi">+dynamic deleteParticipants()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApi">+dynamic fetchAppConfig()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApi">+dynamic fetchUser()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApi">+dynamic saveUser()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="3074.8" y="2609.5" height="31.0" width="61.0" data-name="Enum"></rect>
+					<g data-name="IAuthRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
+							<rect x="53795.0" y="4020.0" height="228.0" width="295.0" data-name="IAuthRepository"></rect>
+							<path d="M53795.0 4051.0 L54090.0 4051.0" fill="none" data-name="IAuthRepository"></path>
+							<path d="M53795.0 4142.0 L54090.0 4142.0" fill="none" data-name="IAuthRepository"></path>
 						</g>
-						<g transform="translate(3074.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
+						<g transform="translate(53795, 4020)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
+								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Notifications">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Notifications">
-							<rect x="3635.0" y="2541.5" height="167.0" width="407.0" data-name="Notifications"></rect>
-							<path d="M3635.0 2572.5 L4042.0 2572.5" fill="none" data-name="Notifications"></path>
-						</g>
-						<g transform="translate(3635, 2541.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Notifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notifications">
-								<text x="195.5" y="13.5" stroke="none" text-anchor="middle" data-name="Notifications">Notifications</text>
+						<g transform="translate(53795, 4051)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+allowPasswordReset: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+currentUser: User?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+isLoggedIn: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+session: Session?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+serializedSession: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3635, 2572.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Notifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Notifications">
-								<text x="0.0" y="13.5" stroke="none" data-name="Notifications">&lt;static&gt;+credentialsInvalid: SnackbarIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Notifications">&lt;static&gt;+userAlreadyRegistered: SnackbarIntent</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordReset: SnackbarIntent</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordResetSuccess: SnackbarIntent</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleted: SnackbarIntent</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeDeleted: SnackbarIntent</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeClipped: SnackbarIntent</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleteConfirmation: AlertIntent</text>
+						<g transform="translate(53795, 4142)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+dynamic signUp()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+dynamic signInWith()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+dynamic signOut()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+dynamic resetPasswordForEmail()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+dynamic updateUser()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IAuthRepository">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SnackbarIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SnackbarIntent">
-							<rect x="3353.0" y="3469.5" height="62.0" width="136.0" data-name="SnackbarIntent"></rect>
-							<path d="M3353.0 3500.5 L3489.0 3500.5" fill="none" data-name="SnackbarIntent"></path>
-						</g>
-						<g transform="translate(3353, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackbarIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackbarIntent">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackbarIntent">SnackbarIntent</text>
-								
-							</g>
+					<g data-name="ProviderRef">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ProviderRef">
+							<rect x="71875.3" y="4118.5" height="31.0" width="109.0" data-name="ProviderRef"></rect>
 						</g>
-						<g transform="translate(3353, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SnackbarIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SnackbarIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="SnackbarIntent">+duration: int?</text>
+						<g transform="translate(71875.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ProviderRef">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProviderRef">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProviderRef">ProviderRef</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AlertIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AlertIntent">
-							<rect x="3529.0" y="3454.5" height="92.0" width="204.0" data-name="AlertIntent"></rect>
-							<path d="M3529.0 3485.5 L3733.0 3485.5" fill="none" data-name="AlertIntent"></path>
+					<g data-name="void Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
+							<rect x="41393.5" y="4118.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
 						</g>
-						<g transform="translate(3529, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AlertIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AlertIntent">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="AlertIntent">AlertIntent</text>
+						<g transform="translate(41393.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
+								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(3529, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AlertIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AlertIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="AlertIntent">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AlertIntent">+dismissOnAction: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AlertIntent">+isDestructive: dynamic</text>
+					</g>
+					<g data-name="StudyRepositoryDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepositoryDelegate">
+							<rect x="74502.3" y="3744.5" height="198.0" width="282.0" data-name="StudyRepositoryDelegate"></rect>
+							<path d="M74502.3 3775.5 L74784.3 3775.5" fill="none" data-name="StudyRepositoryDelegate"></path>
+							<path d="M74502.3 3821.5 L74784.3 3821.5" fill="none" data-name="StudyRepositoryDelegate"></path>
+						</g>
+						<g transform="translate(74502.25, 3744.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepositoryDelegate">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepositoryDelegate">StudyRepositoryDelegate</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="NotificationDefaultActions">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDefaultActions">
-							<rect x="1724.0" y="3469.5" height="62.0" width="287.0" data-name="NotificationDefaultActions"></rect>
-							<path d="M1724.0 3500.5 L2011.0 3500.5" fill="none" data-name="NotificationDefaultActions"></path>
-						</g>
-						<g transform="translate(1724, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDefaultActions">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDefaultActions">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDefaultActions">NotificationDefaultActions</text>
+						<g transform="translate(74502.25, 3775.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+apiClient: StudyUApi</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+authRepository: IAuthRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1724, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDefaultActions">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDefaultActions">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDefaultActions">&lt;static&gt;+cancel: NotificationAction</text>
+						<g transform="translate(74502.25, 3821.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetchAll()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetch()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic save()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic delete()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic onError()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createNewInstance()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationAction">
-							<rect x="1739.5" y="3797.5" height="92.0" width="256.0" data-name="NotificationAction"></rect>
-							<path d="M1739.5 3828.5 L1995.5 3828.5" fill="none" data-name="NotificationAction"></path>
+					<g data-name="IModelRepositoryDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepositoryDelegate">
+							<rect x="74625.5" y="1621.5" height="152.0" width="225.0" data-name="IModelRepositoryDelegate"></rect>
+							<path d="M74625.5 1652.5 L74850.5 1652.5" fill="none" data-name="IModelRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(1739.5, 3797.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationAction">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationAction">NotificationAction</text>
+						<g transform="translate(74625.5, 1621.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepositoryDelegate">
+								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepositoryDelegate">IModelRepositoryDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(1739.5, 3828.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationAction">+label: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationAction">+onSelect: dynamic Function()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationAction">+isDestructive: bool</text>
+						<g transform="translate(74625.5, 1652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetchAll()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetch()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic save()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic delete()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepositoryDelegate">+T createNewInstance()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepositoryDelegate">+T createDuplicate()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic onError()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="INotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="60183.3" y="3447.0" height="107.0" width="395.0" data-name="INotificationService"></rect>
-							<path d="M60183.3 3478.0 L60578.3 3478.0" fill="none" data-name="INotificationService"></path>
+					<g data-name="IAppRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAppRepository">
+							<rect x="3354.3" y="3462.0" height="77.0" width="230.0" data-name="IAppRepository"></rect>
+							<path d="M3354.3 3493.0 L3584.3 3493.0" fill="none" data-name="IAppRepository"></path>
 						</g>
-						<g transform="translate(60183.25, 3447)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
-								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
+						<g transform="translate(3354.25, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppRepository">
+								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAppRepository">IAppRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60183.25, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="INotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="INotificationService">+void showMessage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="INotificationService">+void show()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="INotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="INotificationService">+void dispose()</text>
+						<g transform="translate(3354.25, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAppRepository">+dynamic fetchAppConfig()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IAppRepository">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationService">
-							<rect x="60153.3" y="3774.5" height="138.0" width="455.0" data-name="NotificationService"></rect>
-							<path d="M60153.3 3805.5 L60608.3 3805.5" fill="none" data-name="NotificationService"></path>
-							<path d="M60153.3 3836.5 L60608.3 3836.5" fill="none" data-name="NotificationService"></path>
-						</g>
-						<g transform="translate(60153.25, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationService">
-								<text x="219.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationService">NotificationService</text>
-								
-							</g>
+					<g data-name="AppRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppRepository">
+							<rect x="3354.3" y="3789.5" height="108.0" width="230.0" data-name="AppRepository"></rect>
+							<path d="M3354.3 3820.5 L3584.3 3820.5" fill="none" data-name="AppRepository"></path>
+							<path d="M3354.3 3851.5 L3584.3 3851.5" fill="none" data-name="AppRepository"></path>
 						</g>
-						<g transform="translate(60153.25, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">-_streamController: BehaviorSubject&lt;NotificationIntent&gt;</text>
+						<g transform="translate(3354.25, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppRepository">
+								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppRepository">AppRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60153.25, 3836.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationService">+void showMessage()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationService">+void show()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationService">+void dispose()</text>
+						<g transform="translate(3354.25, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+apiClient: StudyUApi</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="BehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BehaviorSubject">
-							<rect x="62172.0" y="4118.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
-						</g>
-						<g transform="translate(62172, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BehaviorSubject">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="BehaviorSubject">BehaviorSubject</text>
+						<g transform="translate(3354.25, 3851.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+dynamic fetchAppConfig()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppRepository">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationIntent">
-							<rect x="4082.0" y="2548.5" height="153.0" width="288.0" data-name="NotificationIntent"></rect>
-							<path d="M4082.0 2579.5 L4370.0 2579.5" fill="none" data-name="NotificationIntent"></path>
-							<path d="M4082.0 2670.5 L4370.0 2670.5" fill="none" data-name="NotificationIntent"></path>
-						</g>
-						<g transform="translate(4082, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationIntent">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationIntent">NotificationIntent</text>
-								
-							</g>
+					<g data-name="ModelEvent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelEvent">
+							<rect x="798.5" y="98.0" height="77.0" width="145.0" data-name="ModelEvent"></rect>
+							<path d="M798.5 129.0 L943.5 129.0" fill="none" data-name="ModelEvent"></path>
 						</g>
-						<g transform="translate(4082, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+message: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationIntent">+customContent: Widget?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationIntent">+icon: IconData?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationIntent">+actions: List&lt;NotificationAction&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationIntent">+type: NotificationType</text>
+						<g transform="translate(798.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelEvent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelEvent">
+								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelEvent">ModelEvent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4082, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+void register()</text>
+						<g transform="translate(798.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelEvent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelEvent">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelEvent">+modelId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelEvent">+model: T</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="21428.8" y="3485.0" height="31.0" width="71.0" data-name="Widget"></rect>
+					<g data-name="IsFetched">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsFetched">
+							<rect x="558.0" y="614.0" height="31.0" width="94.0" data-name="IsFetched"></rect>
 						</g>
-						<g transform="translate(21428.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
+						<g transform="translate(558, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsFetched">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsFetched">
+								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsFetched">IsFetched</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="25696.0" y="3485.0" height="31.0" width="87.0" data-name="IconData"></rect>
+					<g data-name="IsSaving">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaving">
+							<rect x="692.0" y="614.0" height="31.0" width="84.0" data-name="IsSaving"></rect>
 						</g>
-						<g transform="translate(25696, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
+						<g transform="translate(692, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaving">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaving">
+								<text x="34.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaving">IsSaving</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationType">
-							<rect x="1309.0" y="3439.5" height="122.0" width="325.0" data-name="NotificationType"></rect>
-							<path d="M1309.0 3470.5 L1634.0 3470.5" fill="none" data-name="NotificationType"></path>
-						</g>
-						<g transform="translate(1309, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationType">
-								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationType">NotificationType</text>
-								
-							</g>
+					<g data-name="IsSaved">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaved">
+							<rect x="816.0" y="614.0" height="31.0" width="80.0" data-name="IsSaved"></rect>
 						</g>
-						<g transform="translate(1309, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationType">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationType">&lt;static&gt;+values: List&lt;NotificationType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationType">&lt;static&gt;+snackbar: NotificationType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationType">&lt;static&gt;+alert: NotificationType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationType">&lt;static&gt;+custom: NotificationType</text>
+						<g transform="translate(816, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaved">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaved">
+								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaved">IsSaved</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="6731.0" y="4118.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
+					<g data-name="IsDeleted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IsDeleted">
+							<rect x="936.0" y="614.0" height="31.0" width="91.0" data-name="IsDeleted"></rect>
 						</g>
-						<g transform="translate(6731, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
+						<g transform="translate(936, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsDeleted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsDeleted">
+								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="IsDeleted">IsDeleted</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IClipboardService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IClipboardService">
-							<rect x="26124.5" y="105.5" height="62.0" width="156.0" data-name="IClipboardService"></rect>
-							<path d="M26124.5 136.5 L26280.5 136.5" fill="none" data-name="IClipboardService"></path>
+					<g data-name="WrappedModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WrappedModel">
+							<rect x="5474.3" y="2496.0" height="258.0" width="251.0" data-name="WrappedModel"></rect>
+							<path d="M5474.3 2527.0 L5725.3 2527.0" fill="none" data-name="WrappedModel"></path>
+							<path d="M5474.3 2678.0 L5725.3 2678.0" fill="none" data-name="WrappedModel"></path>
 						</g>
-						<g transform="translate(26124.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IClipboardService">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="IClipboardService">IClipboardService</text>
+						<g transform="translate(5474.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WrappedModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WrappedModel">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="WrappedModel">WrappedModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26124.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IClipboardService">
-								<text x="0.0" y="13.5" stroke="none" data-name="IClipboardService">+dynamic copy()</text>
+						<g transform="translate(5474.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">-_model: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+asyncValue: AsyncValue&lt;T&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+isLocalOnly: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+isDirty: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WrappedModel">+isDeleted: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WrappedModel">+lastSaved: DateTime?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WrappedModel">+lastFetched: DateTime?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WrappedModel">+lastUpdated: DateTime?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="WrappedModel">+model: T</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ClipboardService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ClipboardService">
-							<rect x="26127.0" y="598.5" height="62.0" width="151.0" data-name="ClipboardService"></rect>
-							<path d="M26127.0 629.5 L26278.0 629.5" fill="none" data-name="ClipboardService"></path>
-						</g>
-						<g transform="translate(26127, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ClipboardService">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="ClipboardService">ClipboardService</text>
+						<g transform="translate(5474.25, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">+dynamic markWithError()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+dynamic markAsLoading()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+dynamic markAsFetched()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+dynamic markAsSaved()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26127, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ClipboardService">
-								<text x="0.0" y="13.5" stroke="none" data-name="ClipboardService">+dynamic copy()</text>
+					</g>
+					<g data-name="AsyncValue">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
+							<rect x="45378.5" y="3485.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
+						</g>
+						<g transform="translate(45378.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NotificationDispatcher">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDispatcher">
-							<rect x="5376.5" y="2564.0" height="122.0" width="325.0" data-name="NotificationDispatcher"></rect>
-							<path d="M5376.5 2595.0 L5701.5 2595.0" fill="none" data-name="NotificationDispatcher"></path>
+					<g data-name="ModelRepositoryException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepositoryException">
+							<rect x="2508.0" y="614.0" height="31.0" width="227.0" data-name="ModelRepositoryException"></rect>
 						</g>
-						<g transform="translate(5376.5, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDispatcher">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDispatcher">
-								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDispatcher">NotificationDispatcher</text>
+						<g transform="translate(2508, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelRepositoryException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepositoryException">
+								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepositoryException">ModelRepositoryException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5376.5, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDispatcher">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDispatcher">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDispatcher">+child: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationDispatcher">+snackbarInnerPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationDispatcher">+snackbarWidth: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationDispatcher">+snackbarBehavior: SnackBarBehavior</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationDispatcher">+snackbarDefaultDuration: int</text>
+					</g>
+					<g data-name="Exception">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
+							<rect x="4429.8" y="121.0" height="31.0" width="94.0" data-name="Exception"></rect>
+						</g>
+						<g transform="translate(4429.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
+								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SnackBarBehavior">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SnackBarBehavior">
-							<rect x="3773.0" y="3485.0" height="31.0" width="162.0" data-name="SnackBarBehavior"></rect>
+					<g data-name="ModelNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelNotFoundException">
+							<rect x="2512.0" y="1197.0" height="31.0" width="219.0" data-name="ModelNotFoundException"></rect>
 						</g>
-						<g transform="translate(3773, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackBarBehavior">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackBarBehavior">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackBarBehavior">SnackBarBehavior</text>
+						<g transform="translate(2512, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelNotFoundException">
+								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelNotFoundException">ModelNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Assets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Assets">
-							<rect x="26320.5" y="105.5" height="62.0" width="218.0" data-name="Assets"></rect>
-							<path d="M26320.5 136.5 L26538.5 136.5" fill="none" data-name="Assets"></path>
+					<g data-name="IModelRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepository">
+							<rect x="74920.5" y="501.0" height="257.0" width="382.0" data-name="IModelRepository"></rect>
+							<path d="M74920.5 532.0 L75302.5 532.0" fill="none" data-name="IModelRepository"></path>
 						</g>
-						<g transform="translate(26320.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Assets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Assets">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="Assets">Assets</text>
+						<g transform="translate(74920.5, 501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepository">
+								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepository">IModelRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26320.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Assets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Assets">
-								<text x="0.0" y="13.5" stroke="none" data-name="Assets">&lt;static&gt;+logoWide: String</text>
+						<g transform="translate(74920.5, 532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepository">+String getKey()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepository">+WrappedModel&lt;T&gt;? get()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepository">+dynamic fetchAll()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepository">+dynamic fetch()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepository">+dynamic save()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepository">+dynamic delete()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSave()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="IModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="IModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="IModelRepository">+dynamic ensurePersisted()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="IModelRepository">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AsyncValueWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValueWidget">
-							<rect x="5741.5" y="2526.0" height="198.0" width="384.0" data-name="AsyncValueWidget"></rect>
-							<path d="M5741.5 2557.0 L6125.5 2557.0" fill="none" data-name="AsyncValueWidget"></path>
-							<path d="M5741.5 2648.0 L6125.5 2648.0" fill="none" data-name="AsyncValueWidget"></path>
+					<g data-name="IModelActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
+							<rect x="75365.0" y="105.5" height="62.0" width="403.0" data-name="IModelActionProvider"></rect>
+							<path d="M75365.0 136.5 L75768.0 136.5" fill="none" data-name="IModelActionProvider"></path>
 						</g>
-						<g transform="translate(5741.5, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValueWidget">
-								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValueWidget">AsyncValueWidget</text>
+						<g transform="translate(75365, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
+								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5741.5, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+value: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">+data: Widget Function(T)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">+error: Widget Function(Object, StackTrace?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">+loading: Widget Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AsyncValueWidget">+empty: Widget Function()?</text>
+						<g transform="translate(75365, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelActionProvider">
+								<text x="0.0" y="13.5" stroke="none" data-name="IModelActionProvider">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(5741.5, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">-Widget _buildDataOrEmptyWidget()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultLoad()</text>
+					</g>
+					<g data-name="BehaviorSubject">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BehaviorSubject">
+							<rect x="48236.5" y="4118.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
+						</g>
+						<g transform="translate(48236.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BehaviorSubject">
+								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="BehaviorSubject">BehaviorSubject</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="32617.5" y="3485.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
+					<g data-name="IInviteCodeRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
+							<rect x="70158.8" y="1666.5" height="62.0" width="265.0" data-name="IInviteCodeRepository"></rect>
+							<path d="M70158.8 1697.5 L70423.8 1697.5" fill="none" data-name="IInviteCodeRepository"></path>
 						</g>
-						<g transform="translate(32617.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
+						<g transform="translate(70158.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
+								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
+								
+							</g>
+						</g>
+						<g transform="translate(70158.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IInviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IInviteCodeRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IInviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="28098.3" y="3485.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
+					<g data-name="InviteCodeRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepository">
+							<rect x="73272.8" y="2518.5" height="213.0" width="403.0" data-name="InviteCodeRepository"></rect>
+							<path d="M73272.8 2549.5 L73675.8 2549.5" fill="none" data-name="InviteCodeRepository"></path>
+							<path d="M73272.8 2655.5 L73675.8 2655.5" fill="none" data-name="InviteCodeRepository"></path>
 						</g>
-						<g transform="translate(28098.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
+						<g transform="translate(73272.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepository">
+								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepository">InviteCodeRepository</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(Object, StackTrace?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Object, StackTrace?)?">
-							<rect x="3975.0" y="3485.0" height="31.0" width="326.0" data-name="Widget Function(Object, StackTrace?)?"></rect>
+						<g transform="translate(73272.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+apiClient: StudyUApi</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepository">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepository">+study: Study</text>
+								
+							</g>
 						</g>
-						<g transform="translate(3975, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Object, StackTrace?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Object, StackTrace?)?">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Object, StackTrace?)?">Widget Function(Object, StackTrace?)?</text>
+						<g transform="translate(73272.75, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+String getKey()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+dynamic emitUpdate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function()?">
-							<rect x="4341.0" y="3485.0" height="31.0" width="166.0" data-name="Widget Function()?"></rect>
+					<g data-name="Study">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
+							<rect x="63007.5" y="3485.0" height="31.0" width="61.0" data-name="Study"></rect>
 						</g>
-						<g transform="translate(4341, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function()?">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function()?">Widget Function()?</text>
+						<g transform="translate(63007.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
+								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControlLabel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlLabel">
-							<rect x="6234.5" y="2548.5" height="153.0" width="430.0" data-name="FormControlLabel"></rect>
-							<path d="M6234.5 2579.5 L6664.5 2579.5" fill="none" data-name="FormControlLabel"></path>
-							<path d="M6234.5 2670.5 L6664.5 2670.5" fill="none" data-name="FormControlLabel"></path>
+					<g data-name="InviteCodeRepositoryDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepositoryDelegate">
+							<rect x="74683.3" y="2518.5" height="213.0" width="299.0" data-name="InviteCodeRepositoryDelegate"></rect>
+							<path d="M74683.3 2549.5 L74982.3 2549.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
+							<path d="M74683.3 2610.5 L74982.3 2610.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
 						</g>
-						<g transform="translate(6234.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlLabel">
-								<text x="207.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlLabel">FormControlLabel</text>
+						<g transform="translate(74683.25, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepositoryDelegate">
+								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepositoryDelegate">InviteCodeRepositoryDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6234.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+formControl: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlLabel">+text: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlLabel">+isClickable: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlLabel">+textStyle: TextStyle?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormControlLabel">+onClick: void Function(AbstractControl&lt;dynamic&gt;)?</text>
+						<g transform="translate(74683.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+apiClient: StudyUApi</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+studyRepository: IStudyRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6234.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+Widget build()</text>
+						<g transform="translate(74683.25, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetch()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetchAll()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic save()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic delete()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic onError()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createDuplicate()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createNewInstance()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="23930.3" y="3485.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
+					<g data-name="StudyLaunched">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyLaunched">
+							<rect x="1067.0" y="614.0" height="31.0" width="140.0" data-name="StudyLaunched"></rect>
 						</g>
-						<g transform="translate(23930.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
+						<g transform="translate(1067, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyLaunched">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyLaunched">
+								<text x="62.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyLaunched">StudyLaunched</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TextStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
-							<rect x="10158.0" y="3485.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
+					<g data-name="SupabaseClientDependant">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClientDependant">
+							<rect x="46143.8" y="4103.0" height="62.0" width="284.0" data-name="SupabaseClientDependant"></rect>
+							<path d="M46143.8 4134.0 L46427.8 4134.0" fill="none" data-name="SupabaseClientDependant"></path>
 						</g>
-						<g transform="translate(10158, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
-								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
+						<g transform="translate(46143.75, 4103)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseClientDependant">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClientDependant">
+								<text x="134.0" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClientDependant">SupabaseClientDependant</text>
+								
+							</g>
+						</g>
+						<g transform="translate(46143.75, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseClientDependant">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseClientDependant">
+								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseClientDependant">+supabaseClient: SupabaseClient</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<rect x="4547.0" y="3485.0" height="31.0" width="352.0" data-name="void Function(AbstractControl&lt;dynamic&gt;)?"></rect>
+					<g data-name="SupabaseClient">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClient">
+							<rect x="48734.8" y="4676.0" height="31.0" width="141.0" data-name="SupabaseClient"></rect>
 						</g>
-						<g transform="translate(4547, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">void Function(AbstractControl&lt;dynamic&gt;)?</text>
+						<g transform="translate(48734.75, 4676)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClient">
+								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClient">SupabaseClient</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ActionPopUpMenuButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionPopUpMenuButton">
-							<rect x="6828.3" y="2496.0" height="258.0" width="324.0" data-name="ActionPopUpMenuButton"></rect>
-							<path d="M6828.3 2527.0 L7152.3 2527.0" fill="none" data-name="ActionPopUpMenuButton"></path>
-							<path d="M6828.3 2708.0 L7152.3 2708.0" fill="none" data-name="ActionPopUpMenuButton"></path>
+					<g data-name="SupabaseQueryError">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryError">
+							<rect x="2775.0" y="583.5" height="92.0" width="183.0" data-name="SupabaseQueryError"></rect>
+							<path d="M2775.0 614.5 L2958.0 614.5" fill="none" data-name="SupabaseQueryError"></path>
 						</g>
-						<g transform="translate(6828.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionPopUpMenuButton">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionPopUpMenuButton">ActionPopUpMenuButton</text>
+						<g transform="translate(2775, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseQueryError">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryError">
+								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryError">SupabaseQueryError</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6828.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColor: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColorHover: Color?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconSize: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ActionPopUpMenuButton">+disableSplashEffect: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ActionPopUpMenuButton">+hideOnEmpty: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ActionPopUpMenuButton">+orientation: Axis</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ActionPopUpMenuButton">+elevation: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ActionPopUpMenuButton">+splashRadius: double?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ActionPopUpMenuButton">+enabled: bool</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ActionPopUpMenuButton">+position: PopupMenuPosition</text>
+						<g transform="translate(2775, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryError">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryError">
+								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryError">+statusCode: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryError">+message: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryError">+details: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6828.25, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">-Widget _buildPopupMenu()</text>
+					</g>
+					<g data-name="SupabaseQueryMixin">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryMixin">
+							<rect x="46467.8" y="4065.5" height="137.0" width="215.0" data-name="SupabaseQueryMixin"></rect>
+							<path d="M46467.8 4096.5 L46682.8 4096.5" fill="none" data-name="SupabaseQueryMixin"></path>
+						</g>
+						<g transform="translate(46467.75, 4065.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseQueryMixin">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryMixin">
+								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryMixin">SupabaseQueryMixin</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="21539.8" y="3485.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(21539.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
+						<g transform="translate(46467.75, 4096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryMixin">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryMixin">
+								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic deleteAll()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getAll()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getById()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getByColumn()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseQueryMixin">+List&lt;T&gt; deserializeList()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SupabaseQueryMixin">+T deserializeObject()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Axis">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Axis">
-							<rect x="5663.3" y="3485.0" height="31.0" width="49.0" data-name="Axis"></rect>
+					<g data-name="User">
+						<g fill="#eee8d5" stroke="#33322E" data-name="User">
+							<rect x="53657.8" y="4676.0" height="31.0" width="53.0" data-name="User"></rect>
 						</g>
-						<g transform="translate(5663.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Axis">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Axis">
-								<text x="16.5" y="13.5" stroke="none" text-anchor="middle" data-name="Axis">Axis</text>
+						<g transform="translate(53657.75, 4676)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="User">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="User">
+								<text x="18.5" y="13.5" stroke="none" text-anchor="middle" data-name="User">User</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PopupMenuPosition">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PopupMenuPosition">
-							<rect x="5752.3" y="3485.0" height="31.0" width="174.0" data-name="PopupMenuPosition"></rect>
+					<g data-name="Session">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Session">
+							<rect x="56269.3" y="4676.0" height="31.0" width="79.0" data-name="Session"></rect>
 						</g>
-						<g transform="translate(5752.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PopupMenuPosition">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PopupMenuPosition">
-								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="PopupMenuPosition">PopupMenuPosition</text>
+						<g transform="translate(56269.25, 4676)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Session">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Session">
+								<text x="31.5" y="13.5" stroke="none" text-anchor="middle" data-name="Session">Session</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Search">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Search">
-							<rect x="7210.5" y="2571.5" height="107.0" width="373.0" data-name="Search"></rect>
-							<path d="M7210.5 2602.5 L7583.5 2602.5" fill="none" data-name="Search"></path>
+					<g data-name="IAppDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
+							<rect x="17865.8" y="3812.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
+							<path d="M17865.8 3843.5 L18062.8 3843.5" fill="none" data-name="IAppDelegate"></path>
 						</g>
-						<g transform="translate(7210.5, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Search">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Search">
-								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="Search">Search</text>
+						<g transform="translate(17865.75, 3812.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7210.5, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Search">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Search">
-								<text x="0.0" y="13.5" stroke="none" data-name="Search">+onQueryChanged: dynamic Function(String)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Search">+searchController: SearchController?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Search">+hintText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Search">+initialText: String?</text>
+						<g transform="translate(17865.75, 3843.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(String)">
-							<rect x="5966.3" y="3485.0" height="31.0" width="213.0" data-name="dynamic Function(String)"></rect>
+					<g data-name="AuthRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthRepository">
+							<rect x="56293.5" y="4318.0" height="288.0" width="295.0" data-name="AuthRepository"></rect>
+							<path d="M56293.5 4349.0 L56588.5 4349.0" fill="none" data-name="AuthRepository"></path>
+							<path d="M56293.5 4470.0 L56588.5 4470.0" fill="none" data-name="AuthRepository"></path>
 						</g>
-						<g transform="translate(5966.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(String)">
-								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(String)">dynamic Function(String)</text>
+						<g transform="translate(56293.5, 4318)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthRepository">
+								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthRepository">AuthRepository</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SearchController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="36070.5" y="3469.5" height="62.0" width="258.0" data-name="SearchController"></rect>
-							<path d="M36070.5 3500.5 L36328.5 3500.5" fill="none" data-name="SearchController"></path>
-						</g>
-						<g transform="translate(36070.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
+						<g transform="translate(56293.5, 4349)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">+supabaseClient: SupabaseClient</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+allowPasswordReset: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+authClient: GoTrueClient</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+session: Session?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+serializedSession: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+currentUser: User?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+isLoggedIn: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36070.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SearchController">
-								<text x="0.0" y="13.5" stroke="none" data-name="SearchController">+setText: void Function(String)</text>
+						<g transform="translate(56293.5, 4470)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">-void _registerAuthListener()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+dynamic signUp()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+dynamic signInWith()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+dynamic signOut()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+dynamic resetPasswordForEmail()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+dynamic updateUser()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+void dispose()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthRepository">+dynamic onAppStart()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(String)">
-							<rect x="36109.5" y="3828.0" height="31.0" width="180.0" data-name="void Function(String)"></rect>
+					<g data-name="GoTrueClient">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoTrueClient">
+							<rect x="56388.3" y="4676.0" height="31.0" width="120.0" data-name="GoTrueClient"></rect>
 						</g>
-						<g transform="translate(36109.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(String)">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(String)">void Function(String)</text>
+						<g transform="translate(56388.25, 4676)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoTrueClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoTrueClient">
+								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoTrueClient">GoTrueClient</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormScaffold">
-							<rect x="7623.5" y="2556.5" height="137.0" width="212.0" data-name="FormScaffold"></rect>
-							<path d="M7623.5 2587.5 L7835.5 2587.5" fill="none" data-name="FormScaffold"></path>
+					<g data-name="IUserRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
+							<rect x="53067.8" y="3439.0" height="123.0" width="260.0" data-name="IUserRepository"></rect>
+							<path d="M53067.8 3470.0 L53327.8 3470.0" fill="none" data-name="IUserRepository"></path>
+							<path d="M53067.8 3501.0 L53327.8 3501.0" fill="none" data-name="IUserRepository"></path>
 						</g>
-						<g transform="translate(7623.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormScaffold">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormScaffold">FormScaffold</text>
+						<g transform="translate(53067.75, 3439)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
+								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7623.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormScaffold">+formViewModel: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormScaffold">+actions: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormScaffold">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormScaffold">+actionsPadding: double</text>
+						<g transform="translate(53067.75, 3470)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+user: StudyUUser</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ConstrainedWidthFlexible">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConstrainedWidthFlexible">
-							<rect x="7875.5" y="2533.5" height="183.0" width="287.0" data-name="ConstrainedWidthFlexible"></rect>
-							<path d="M7875.5 2564.5 L8162.5 2564.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
-							<path d="M7875.5 2670.5 L8162.5 2670.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
-						</g>
-						<g transform="translate(7875.5, 2533.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConstrainedWidthFlexible">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConstrainedWidthFlexible">ConstrainedWidthFlexible</text>
+						<g transform="translate(53067.75, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+dynamic fetchUser()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IUserRepository">+dynamic saveUser()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IUserRepository">+dynamic updatePreferences()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(7875.5, 2564.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+minWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">+maxWidth: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConstrainedWidthFlexible">+flex: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConstrainedWidthFlexible">+flexSum: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConstrainedWidthFlexible">+child: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConstrainedWidthFlexible">+outerConstraints: BoxConstraints</text>
-								
-							</g>
+					</g>
+					<g data-name="StudyUUser">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUUser">
+							<rect x="57368.8" y="4118.5" height="31.0" width="110.0" data-name="StudyUUser"></rect>
 						</g>
-						<g transform="translate(7875.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">-double _getWidth()</text>
+						<g transform="translate(57368.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUUser">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUUser">
+								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUUser">StudyUUser</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoxConstraints">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoxConstraints">
-							<rect x="12912.0" y="3485.0" height="31.0" width="136.0" data-name="BoxConstraints"></rect>
+					<g data-name="UserRepository">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UserRepository">
+							<rect x="54909.8" y="3759.5" height="168.0" width="282.0" data-name="UserRepository"></rect>
+							<path d="M54909.8 3790.5 L55191.8 3790.5" fill="none" data-name="UserRepository"></path>
+							<path d="M54909.8 3866.5 L55191.8 3866.5" fill="none" data-name="UserRepository"></path>
 						</g>
-						<g transform="translate(12912, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxConstraints">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxConstraints">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxConstraints">BoxConstraints</text>
+						<g transform="translate(54909.75, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserRepository">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserRepository">UserRepository</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PrimaryButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PrimaryButton">
-							<rect x="8202.5" y="2511.5" height="227.0" width="333.0" data-name="PrimaryButton"></rect>
-							<path d="M8202.5 2542.5 L8535.5 2542.5" fill="none" data-name="PrimaryButton"></path>
-						</g>
-						<g transform="translate(8202.5, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PrimaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PrimaryButton">
-								<text x="158.5" y="13.5" stroke="none" text-anchor="middle" data-name="PrimaryButton">PrimaryButton</text>
+						<g transform="translate(54909.75, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+apiClient: StudyUApi</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+ref: Ref&lt;Object?&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="UserRepository">+user: StudyUUser</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8202.5, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PrimaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PrimaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="PrimaryButton">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PrimaryButton">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PrimaryButton">+isLoading: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PrimaryButton">+showLoadingEarliestAfterMs: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PrimaryButton">+onPressed: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PrimaryButton">+tooltip: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PrimaryButton">+tooltipDisabled: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PrimaryButton">+enabled: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PrimaryButton">+onPressedFuture: dynamic Function()?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="PrimaryButton">+innerPadding: EdgeInsets</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="PrimaryButton">+minimumSize: Size?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="PrimaryButton">+isDisabled: bool</text>
+						<g transform="translate(54909.75, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
+								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+dynamic fetchUser()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+dynamic saveUser()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+dynamic updatePreferences()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="18277.3" y="4118.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
+					<g data-name="Ref">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Ref">
+							<rect x="57520.5" y="4118.5" height="31.0" width="43.0" data-name="Ref"></rect>
 						</g>
-						<g transform="translate(18277.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
+						<g transform="translate(57520.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Ref">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Ref">
+								<text x="13.5" y="13.5" stroke="none" text-anchor="middle" data-name="Ref">Ref</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="11377.8" y="3485.0" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
+					<g data-name="PreferenceAction">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PreferenceAction">
+							<rect x="2479.3" y="3447.0" height="107.0" width="334.0" data-name="PreferenceAction"></rect>
+							<path d="M2479.3 3478.0 L2813.3 3478.0" fill="none" data-name="PreferenceAction"></path>
 						</g>
-						<g transform="translate(11377.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
-								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
+						<g transform="translate(2479.25, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreferenceAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreferenceAction">
+								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="PreferenceAction">PreferenceAction</text>
+								
+							</g>
+						</g>
+						<g transform="translate(2479.25, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreferenceAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreferenceAction">
+								<text x="0.0" y="13.5" stroke="none" data-name="PreferenceAction">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+values: List&lt;PreferenceAction&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pin: PreferenceAction</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pinOff: PreferenceAction</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EdgeInsets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="13098.8" y="3485.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
+					<g data-name="APIException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="APIException">
+							<rect x="4257.3" y="614.0" height="31.0" width="121.0" data-name="APIException"></rect>
 						</g>
-						<g transform="translate(13098.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
+						<g transform="translate(4257.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="APIException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="APIException">
+								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="APIException">APIException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Size">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Size">
-							<rect x="8443.0" y="3485.0" height="31.0" width="50.0" data-name="Size"></rect>
+					<g data-name="StudyNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotFoundException">
+							<rect x="2860.8" y="1197.0" height="31.0" width="216.0" data-name="StudyNotFoundException"></rect>
 						</g>
-						<g transform="translate(8443, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Size">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Size">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Size">Size</text>
+						<g transform="translate(2860.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotFoundException">
+								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotFoundException">StudyNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormTableRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRow">
-							<rect x="8575.5" y="2549.0" height="152.0" width="379.0" data-name="FormTableRow"></rect>
-							<path d="M8575.5 2580.0 L8954.5 2580.0" fill="none" data-name="FormTableRow"></path>
+					<g data-name="MeasurementNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementNotFoundException">
+							<rect x="3116.8" y="1197.0" height="31.0" width="279.0" data-name="MeasurementNotFoundException"></rect>
 						</g>
-						<g transform="translate(8575.5, 2549)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRow">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRow">FormTableRow</text>
+						<g transform="translate(3116.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementNotFoundException">
+								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementNotFoundException">MeasurementNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8575.5, 2580)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRow">+label: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRow">+labelBuilder: Widget Function(BuildContext)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRow">+labelStyle: TextStyle?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRow">+labelHelpText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormTableRow">+input: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormTableRow">+control: AbstractControl&lt;dynamic&gt;?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormTableRow">+layout: FormTableRowLayout?</text>
+					</g>
+					<g data-name="QuestionNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionNotFoundException">
+							<rect x="3435.8" y="1197.0" height="31.0" width="242.0" data-name="QuestionNotFoundException"></rect>
+						</g>
+						<g transform="translate(3435.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionNotFoundException">
+								<text x="113.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionNotFoundException">QuestionNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
-							<rect x="8533.0" y="3485.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
+					<g data-name="ConsentItemNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemNotFoundException">
+							<rect x="3717.8" y="1197.0" height="31.0" width="271.0" data-name="ConsentItemNotFoundException"></rect>
 						</g>
-						<g transform="translate(8533, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
+						<g transform="translate(3717.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemNotFoundException">
+								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemNotFoundException">ConsentItemNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormTableRowLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRowLayout">
-							<rect x="6441.0" y="3447.0" height="107.0" width="370.0" data-name="FormTableRowLayout"></rect>
-							<path d="M6441.0 3478.0 L6811.0 3478.0" fill="none" data-name="FormTableRowLayout"></path>
+					<g data-name="InterventionNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionNotFoundException">
+							<rect x="4028.8" y="1197.0" height="31.0" width="265.0" data-name="InterventionNotFoundException"></rect>
 						</g>
-						<g transform="translate(6441, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRowLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRowLayout">
-								<text x="177.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRowLayout">FormTableRowLayout</text>
+						<g transform="translate(4028.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionNotFoundException">
+								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionNotFoundException">InterventionNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(6441, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRowLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRowLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRowLayout">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+values: List&lt;FormTableRowLayout&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+vertical: FormTableRowLayout</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+horizontal: FormTableRowLayout</text>
+					</g>
+					<g data-name="InterventionTaskNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskNotFoundException">
+							<rect x="4333.8" y="1197.0" height="31.0" width="303.0" data-name="InterventionTaskNotFoundException"></rect>
+						</g>
+						<g transform="translate(4333.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskNotFoundException">
+								<text x="143.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskNotFoundException">InterventionTaskNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormTableLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableLayout">
-							<rect x="9383.5" y="2548.5" height="153.0" width="379.0" data-name="FormTableLayout"></rect>
-							<path d="M9383.5 2579.5 L9762.5 2579.5" fill="none" data-name="FormTableLayout"></path>
-							<path d="M9383.5 2670.5 L9762.5 2670.5" fill="none" data-name="FormTableLayout"></path>
+					<g data-name="ReportNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportNotFoundException">
+							<rect x="4676.8" y="1197.0" height="31.0" width="224.0" data-name="ReportNotFoundException"></rect>
 						</g>
-						<g transform="translate(9383.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableLayout">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableLayout">FormTableLayout</text>
+						<g transform="translate(4676.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportNotFoundException">
+								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportNotFoundException">ReportNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9383.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+rows: List&lt;FormTableRow&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableLayout">+columnWidths: Map&lt;int, TableColumnWidth&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableLayout">+rowDivider: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableLayout">+rowLayout: FormTableRowLayout?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormTableLayout">+rowLabelStyle: TextStyle?</text>
+					</g>
+					<g data-name="ReportSectionNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionNotFoundException">
+							<rect x="4940.8" y="1197.0" height="31.0" width="283.0" data-name="ReportSectionNotFoundException"></rect>
+						</g>
+						<g transform="translate(4940.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionNotFoundException">
+								<text x="133.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionNotFoundException">ReportSectionNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9383.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+Widget build()</text>
+					</g>
+					<g data-name="StudyInviteNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInviteNotFoundException">
+							<rect x="5263.8" y="1197.0" height="31.0" width="259.0" data-name="StudyInviteNotFoundException"></rect>
+						</g>
+						<g transform="translate(5263.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInviteNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInviteNotFoundException">
+								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInviteNotFoundException">StudyInviteNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormSectionHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSectionHeader">
-							<rect x="9802.5" y="2548.5" height="153.0" width="220.0" data-name="FormSectionHeader"></rect>
-							<path d="M9802.5 2579.5 L10022.5 2579.5" fill="none" data-name="FormSectionHeader"></path>
-							<path d="M9802.5 2670.5 L10022.5 2670.5" fill="none" data-name="FormSectionHeader"></path>
+					<g data-name="UserNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UserNotFoundException">
+							<rect x="5562.8" y="1197.0" height="31.0" width="208.0" data-name="UserNotFoundException"></rect>
 						</g>
-						<g transform="translate(9802.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSectionHeader">
-								<text x="102.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormSectionHeader">FormSectionHeader</text>
+						<g transform="translate(5562.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserNotFoundException">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserNotFoundException">UserNotFoundException</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9802.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormSectionHeader">+titleTextStyle: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormSectionHeader">+helpText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormSectionHeader">+divider: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormSectionHeader">+helpTextDisabled: bool</text>
+					</g>
+					<g data-name="StudyUApiClient">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApiClient">
+							<rect x="46335.8" y="4288.0" height="348.0" width="479.0" data-name="StudyUApiClient"></rect>
+							<path d="M46335.8 4319.0 L46814.8 4319.0" fill="none" data-name="StudyUApiClient"></path>
+							<path d="M46335.8 4410.0 L46814.8 4410.0" fill="none" data-name="StudyUApiClient"></path>
+						</g>
+						<g transform="translate(46335.75, 4288)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUApiClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApiClient">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApiClient">StudyUApiClient</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9802.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+Widget build()</text>
+						<g transform="translate(46335.75, 4319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+supabaseClient: SupabaseClient</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyColumns: List&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyDisplayColumns: List&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApiClient">+testDelayMilliseconds: int</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormLabel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormLabel">
-							<rect x="10231.0" y="2556.0" height="138.0" width="266.0" data-name="FormLabel"></rect>
-							<path d="M10231.0 2587.0 L10497.0 2587.0" fill="none" data-name="FormLabel"></path>
-							<path d="M10231.0 2663.0 L10497.0 2663.0" fill="none" data-name="FormLabel"></path>
-						</g>
-						<g transform="translate(10231, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormLabel">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormLabel">FormLabel</text>
+						<g transform="translate(46335.75, 4410)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteParticipants()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">+dynamic getUserStudies()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudy()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudy()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudyInvite()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudyInvite()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudyInvite()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchAppConfig()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchUser()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApiClient">+dynamic saveUser()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyUApiClient">-dynamic _awaitGuarded()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyUApiClient">-dynamic _apiException()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyUApiClient">-dynamic _testDelay()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10231, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+labelText: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormLabel">+helpText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormLabel">+labelTextStyle: TextStyle?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormLabel">+layout: FormTableRowLayout?</text>
+					</g>
+					<g data-name="Assets">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Assets">
+							<rect x="15727.3" y="105.5" height="62.0" width="218.0" data-name="Assets"></rect>
+							<path d="M15727.3 136.5 L15945.3 136.5" fill="none" data-name="Assets"></path>
+						</g>
+						<g transform="translate(15727.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Assets">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Assets">
+								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="Assets">Assets</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10231, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+Widget build()</text>
+						<g transform="translate(15727.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Assets">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Assets">
+								<text x="0.0" y="13.5" stroke="none" data-name="Assets">&lt;static&gt;+logoWide: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DismissButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DismissButton">
-							<rect x="15606.0" y="3789.5" height="108.0" width="249.0" data-name="DismissButton"></rect>
-							<path d="M15606.0 3820.5 L15855.0 3820.5" fill="none" data-name="DismissButton"></path>
-							<path d="M15606.0 3866.5 L15855.0 3866.5" fill="none" data-name="DismissButton"></path>
+					<g data-name="StudiesTableColumnSize">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
+							<rect x="15985.3" y="75.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
+							<path d="M15985.3 106.0 L16210.3 106.0" fill="none" data-name="StudiesTableColumnSize"></path>
+							<path d="M15985.3 167.0 L16210.3 167.0" fill="none" data-name="StudiesTableColumnSize"></path>
 						</g>
-						<g transform="translate(15606, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DismissButton">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="DismissButton">DismissButton</text>
+						<g transform="translate(15985.25, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
+								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15606, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+onPressed: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DismissButton">+text: String?</text>
+						<g transform="translate(15985.25, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15606, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+Widget build()</text>
+						<g transform="translate(15985.25, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Badge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Badge">
-							<rect x="10537.0" y="2496.0" height="258.0" width="263.0" data-name="Badge"></rect>
-							<path d="M10537.0 2527.0 L10800.0 2527.0" fill="none" data-name="Badge"></path>
-							<path d="M10537.0 2678.0 L10800.0 2678.0" fill="none" data-name="Badge"></path>
+					<g data-name="StudiesTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
+							<rect x="6636.3" y="1553.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
+							<path d="M6636.3 1584.5 L7116.3 1584.5" fill="none" data-name="StudiesTable"></path>
+							<path d="M6636.3 1795.5 L7116.3 1795.5" fill="none" data-name="StudiesTable"></path>
 						</g>
-						<g transform="translate(10537, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Badge">
-								<text x="123.5" y="13.5" stroke="none" text-anchor="middle" data-name="Badge">Badge</text>
+						<g transform="translate(6636.25, 1553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
+								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10537, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
-								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+icon: IconData?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Badge">+color: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Badge">+borderRadius: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Badge">+label: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Badge">+type: BadgeType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Badge">+padding: EdgeInsets</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Badge">+iconSize: double?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Badge">+labelStyle: TextStyle?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Badge">+center: bool</text>
+						<g transform="translate(6636.25, 1584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10537, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
-								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Badge">-Color? _getBackgroundColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Badge">-Color _getBorderColor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Badge">-Color? _getLabelColor()</text>
+						<g transform="translate(6636.25, 1795.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="24426.0" y="3432.0" height="137.0" width="288.0" data-name="BadgeType"></rect>
-							<path d="M24426.0 3463.0 L24714.0 3463.0" fill="none" data-name="BadgeType"></path>
+					<g data-name="void Function(Study)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
+							<rect x="6493.5" y="2609.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
 						</g>
-						<g transform="translate(24426, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
+						<g transform="translate(6493.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
+								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24426, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BadgeType">
-								<text x="0.0" y="13.5" stroke="none" data-name="BadgeType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BadgeType">&lt;static&gt;+values: List&lt;BadgeType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BadgeType">&lt;static&gt;+filled: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlined: BadgeType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlineFill: BadgeType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BadgeType">&lt;static&gt;+plain: BadgeType</text>
+					</g>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+							<rect x="6712.5" y="2609.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
+						</g>
+						<g transform="translate(6712.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
+								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StandardDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardDialog">
-							<rect x="10840.0" y="2488.5" height="273.0" width="247.0" data-name="StandardDialog"></rect>
-							<path d="M10840.0 2519.5 L11087.0 2519.5" fill="none" data-name="StandardDialog"></path>
-							<path d="M10840.0 2730.5 L11087.0 2730.5" fill="none" data-name="StandardDialog"></path>
+					<g data-name="Widget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
+							<rect x="40503.0" y="3485.0" height="31.0" width="71.0" data-name="Widget"></rect>
 						</g>
-						<g transform="translate(10840, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardDialog">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardDialog">StandardDialog</text>
+						<g transform="translate(40503, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
+								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(10840, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+title: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardDialog">+titleText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardDialog">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardDialog">+actionButtons: List&lt;Widget&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardDialog">+backgroundColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardDialog">+borderRadius: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StandardDialog">+width: double?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StandardDialog">+height: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StandardDialog">+minWidth: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StandardDialog">+minHeight: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StandardDialog">+maxWidth: double?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StandardDialog">+maxHeight: double?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StandardDialog">+padding: EdgeInsets</text>
-								
-							</g>
+					</g>
+					<g data-name="DashboardController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
+							<rect x="52960.8" y="2436.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
+							<path d="M52960.8 2467.0 L53574.8 2467.0" fill="none" data-name="DashboardController"></path>
+							<path d="M52960.8 2588.0 L53574.8 2588.0" fill="none" data-name="DashboardController"></path>
 						</g>
-						<g transform="translate(10840, 2730.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+Widget build()</text>
+						<g transform="translate(52960.75, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
+								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ISyncIndicatorViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ISyncIndicatorViewModel">
-							<rect x="26578.5" y="98.0" height="77.0" width="214.0" data-name="ISyncIndicatorViewModel"></rect>
-							<path d="M26578.5 129.0 L26792.5 129.0" fill="none" data-name="ISyncIndicatorViewModel"></path>
-						</g>
-						<g transform="translate(26578.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ISyncIndicatorViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ISyncIndicatorViewModel">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="ISyncIndicatorViewModel">ISyncIndicatorViewModel</text>
+						<g transform="translate(52960.75, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26578.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ISyncIndicatorViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ISyncIndicatorViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ISyncIndicatorViewModel">+isDirty: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ISyncIndicatorViewModel">+lastSynced: DateTime?</text>
+						<g transform="translate(52960.75, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SyncIndicator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SyncIndicator">
-							<rect x="11127.0" y="2564.0" height="122.0" width="208.0" data-name="SyncIndicator"></rect>
-							<path d="M11127.0 2595.0 L11335.0 2595.0" fill="none" data-name="SyncIndicator"></path>
+					<g data-name="StudiesTableColumn">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
+							<rect x="2903.3" y="3394.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
+							<path d="M2903.3 3425.5 L3264.3 3425.5" fill="none" data-name="StudiesTableColumn"></path>
 						</g>
-						<g transform="translate(11127, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SyncIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SyncIndicator">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="SyncIndicator">SyncIndicator</text>
+						<g transform="translate(2903.25, 3394.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
+								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11127, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SyncIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SyncIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="SyncIndicator">+state: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SyncIndicator">+lastSynced: DateTime?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SyncIndicator">+isDirty: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SyncIndicator">+animationDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SyncIndicator">+iconSize: double</text>
+						<g transform="translate(2903.25, 3425.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IWithBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="13085.5" y="1181.5" height="62.0" width="164.0" data-name="IWithBanner"></rect>
-							<path d="M13085.5 1212.5 L13249.5 1212.5" fill="none" data-name="IWithBanner"></path>
+					<g data-name="StudiesTableItem">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
+							<rect x="7215.0" y="2526.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
+							<path d="M7215.0 2557.5 L7615.0 2557.5" fill="none" data-name="StudiesTableItem"></path>
 						</g>
-						<g transform="translate(13085.5, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
+						<g transform="translate(7215, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
+								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13085.5, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IWithBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="IWithBanner">+Widget? banner()</text>
+						<g transform="translate(7215, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BannerBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BannerBox">
-							<rect x="11375.0" y="2534.0" height="182.0" width="298.0" data-name="BannerBox"></rect>
-							<path d="M11375.0 2565.0 L11673.0 2565.0" fill="none" data-name="BannerBox"></path>
+					<g data-name="void Function(Study, bool)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
+							<rect x="7233.3" y="3485.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
 						</g>
-						<g transform="translate(11375, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerBox">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerBox">BannerBox</text>
+						<g transform="translate(7233.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11375, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="BannerBox">+prefixIcon: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BannerBox">+body: Widget</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BannerBox">+style: BannerStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BannerBox">+padding: EdgeInsets?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BannerBox">+noPrefix: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BannerBox">+dismissable: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="BannerBox">+isDismissed: bool?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="BannerBox">+onDismissed: dynamic Function()?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="BannerBox">+dismissIconSize: double</text>
+					</g>
+					<g data-name="void Function(Study)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
+							<rect x="7506.3" y="3485.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
+						</g>
+						<g transform="translate(7506.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
+								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BannerStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BannerStyle">
-							<rect x="4939.0" y="3439.5" height="122.0" width="294.0" data-name="BannerStyle"></rect>
-							<path d="M4939.0 3470.5 L5233.0 3470.5" fill="none" data-name="BannerStyle"></path>
+					<g data-name="DashboardScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
+							<rect x="7655.0" y="2571.0" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
+							<path d="M7655.0 2602.0 L7998.0 2602.0" fill="none" data-name="DashboardScaffold"></path>
+							<path d="M7655.0 2648.0 L7998.0 2648.0" fill="none" data-name="DashboardScaffold"></path>
 						</g>
-						<g transform="translate(4939, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerStyle">
-								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerStyle">BannerStyle</text>
+						<g transform="translate(7655, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
+								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(4939, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerStyle">
-								<text x="0.0" y="13.5" stroke="none" data-name="BannerStyle">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+values: List&lt;BannerStyle&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+warning: BannerStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+info: BannerStyle</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+error: BannerStyle</text>
+						<g transform="translate(7655, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ActionMenuInline">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuInline">
-							<rect x="26832.5" y="52.5" height="168.0" width="324.0" data-name="ActionMenuInline"></rect>
-							<path d="M26832.5 83.5 L27156.5 83.5" fill="none" data-name="ActionMenuInline"></path>
-							<path d="M26832.5 189.5 L27156.5 189.5" fill="none" data-name="ActionMenuInline"></path>
-						</g>
-						<g transform="translate(26832.5, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuInline">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuInline">ActionMenuInline</text>
+						<g transform="translate(7655, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26832.5, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuInline">+iconSize: double?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuInline">+visible: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuInline">+splashRadius: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ActionMenuInline">+paddingVertical: double?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ActionMenuInline">+paddingHorizontal: double?</text>
+					</g>
+					<g data-name="StudiesTableColumnHeader">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
+							<rect x="26800.5" y="3782.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
+							<path d="M26800.5 3813.5 L27037.5 3813.5" fill="none" data-name="StudiesTableColumnHeader"></path>
+						</g>
+						<g transform="translate(26800.5, 3782.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
+								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26832.5, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+Widget build()</text>
+						<g transform="translate(26800.5, 3813.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Collapsible">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Collapsible">
-							<rect x="27196.5" y="83.0" height="107.0" width="441.0" data-name="Collapsible"></rect>
-							<path d="M27196.5 114.0 L27637.5 114.0" fill="none" data-name="Collapsible"></path>
+					<g data-name="StudiesFilter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
+							<rect x="4420.3" y="3462.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
+							<path d="M4420.3 3493.0 L4716.3 3493.0" fill="none" data-name="StudiesFilter"></path>
 						</g>
-						<g transform="translate(27196.5, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Collapsible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Collapsible">
-								<text x="212.5" y="13.5" stroke="none" text-anchor="middle" data-name="Collapsible">Collapsible</text>
+						<g transform="translate(4420.25, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27196.5, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Collapsible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Collapsible">
-								<text x="0.0" y="13.5" stroke="none" data-name="Collapsible">+contentBuilder: Widget Function(BuildContext, bool)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Collapsible">+headerBuilder: Widget Function(BuildContext, bool)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Collapsible">+title: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Collapsible">+isCollapsed: bool</text>
+						<g transform="translate(4420.25, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext, bool)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)">
-							<rect x="26318.0" y="614.0" height="31.0" width="300.0" data-name="Widget Function(BuildContext, bool)"></rect>
+					<g data-name="GoRouter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
+							<rect x="57029.0" y="3485.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
 						</g>
-						<g transform="translate(26318, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)">
-								<text x="142.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)">Widget Function(BuildContext, bool)</text>
+						<g transform="translate(57029, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
+								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)?">
-							<rect x="27262.0" y="614.0" height="31.0" width="310.0" data-name="Widget Function(BuildContext, bool)?"></rect>
+					<g data-name="StreamSubscription">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
+							<rect x="47842.3" y="3485.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
 						</g>
-						<g transform="translate(27262, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)?">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)?">Widget Function(BuildContext, bool)?</text>
+						<g transform="translate(47842.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
+								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NavbarTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="62257.0" y="1644.0" height="107.0" width="196.0" data-name="NavbarTab"></rect>
-							<path d="M62257.0 1675.0 L62453.0 1675.0" fill="none" data-name="NavbarTab"></path>
+					<g data-name="SearchController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
+							<rect x="51772.5" y="3469.5" height="62.0" width="258.0" data-name="SearchController"></rect>
+							<path d="M51772.5 3500.5 L52030.5 3500.5" fill="none" data-name="SearchController"></path>
 						</g>
-						<g transform="translate(62257, 1644)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
+						<g transform="translate(51772.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
+								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62257, 1675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NavbarTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="NavbarTab">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NavbarTab">+intent: RoutingIntent?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NavbarTab">+index: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NavbarTab">+enabled: bool</text>
+						<g transform="translate(51772.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SearchController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SearchController">
+								<text x="0.0" y="13.5" stroke="none" data-name="SearchController">+setText: void Function(String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RoutingIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="44409.5" y="2518.5" height="213.0" width="297.0" data-name="RoutingIntent"></rect>
-							<path d="M44409.5 2549.5 L44706.5 2549.5" fill="none" data-name="RoutingIntent"></path>
-							<path d="M44409.5 2685.5 L44706.5 2685.5" fill="none" data-name="RoutingIntent"></path>
-						</g>
-						<g transform="translate(44409.5, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
-								
-							</g>
+					<g data-name="DashboardScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
+							<rect x="8038.0" y="2594.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
+							<path d="M8038.0 2625.0 L8216.0 2625.0" fill="none" data-name="DashboardScreen"></path>
 						</g>
-						<g transform="translate(44409.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">+route: GoRoute</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+params: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntent">+queryParams: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntent">+dispatch: RoutingIntentDispatch?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntent">+extra: Object?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntent">+routeName: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntent">+arguments: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntent">+props: List&lt;Object?&gt;</text>
+						<g transform="translate(8038, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
+								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44409.5, 2685.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">-dynamic _validateRoute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+bool matches()</text>
+						<g transform="translate(8038, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TabbedNavbar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TabbedNavbar">
-							<rect x="12039.8" y="2496.5" height="257.0" width="308.0" data-name="TabbedNavbar"></rect>
-							<path d="M12039.8 2527.5 L12347.8 2527.5" fill="none" data-name="TabbedNavbar"></path>
+					<g data-name="AuthFormController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
+							<rect x="56923.0" y="2368.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
+							<path d="M56923.0 2399.5 L57773.0 2399.5" fill="none" data-name="AuthFormController"></path>
+							<path d="M56923.0 2655.5 L57773.0 2655.5" fill="none" data-name="AuthFormController"></path>
 						</g>
-						<g transform="translate(12039.75, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabbedNavbar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabbedNavbar">
-								<text x="146.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabbedNavbar">TabbedNavbar</text>
+						<g transform="translate(56923, 2368.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
+								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12039.75, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TabbedNavbar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TabbedNavbar">
-								<text x="0.0" y="13.5" stroke="none" data-name="TabbedNavbar">+tabs: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TabbedNavbar">+selectedTab: T?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TabbedNavbar">+indicator: BoxDecoration?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TabbedNavbar">+height: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TabbedNavbar">+disabledBackgroundColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TabbedNavbar">+disabledTooltipText: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TabbedNavbar">+onSelect: void Function(int, T)?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TabbedNavbar">+labelPadding: EdgeInsets?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="TabbedNavbar">+labelSpacing: double?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="TabbedNavbar">+indicatorSize: TabBarIndicatorSize?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="TabbedNavbar">+isScrollable: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="TabbedNavbar">+backgroundColor: Color?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="TabbedNavbar">+labelColorHover: Color?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="TabbedNavbar">+unselectedLabelColorHover: Color?</text>
+						<g transform="translate(56923, 2399.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="BoxDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoxDecoration">
-							<rect x="11666.3" y="3485.0" height="31.0" width="132.0" data-name="BoxDecoration"></rect>
-						</g>
-						<g transform="translate(11666.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxDecoration">
-								<text x="58.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxDecoration">BoxDecoration</text>
+						<g transform="translate(56923, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(int, T)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(int, T)?">
-							<rect x="11838.3" y="3485.0" height="31.0" width="183.0" data-name="void Function(int, T)?"></rect>
+					<g data-name="INotificationService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
+							<rect x="37529.5" y="3447.0" height="107.0" width="395.0" data-name="INotificationService"></rect>
+							<path d="M37529.5 3478.0 L37924.5 3478.0" fill="none" data-name="INotificationService"></path>
 						</g>
-						<g transform="translate(11838.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(int, T)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(int, T)?">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(int, T)?">void Function(int, T)?</text>
+						<g transform="translate(37529.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
+								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="TabBarIndicatorSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TabBarIndicatorSize">
-							<rect x="12061.3" y="3485.0" height="31.0" width="176.0" data-name="TabBarIndicatorSize"></rect>
-						</g>
-						<g transform="translate(12061.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabBarIndicatorSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabBarIndicatorSize">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabBarIndicatorSize">TabBarIndicatorSize</text>
+						<g transform="translate(37529.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="INotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="INotificationService">
+								<text x="0.0" y="13.5" stroke="none" data-name="INotificationService">+void showMessage()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="INotificationService">+void show()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="INotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="INotificationService">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SidesheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SidesheetTab">
-							<rect x="62009.3" y="2594.0" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
-							<path d="M62009.3 2625.0 L62339.3 2625.0" fill="none" data-name="SidesheetTab"></path>
-						</g>
-						<g transform="translate(62009.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SidesheetTab">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="SidesheetTab">SidesheetTab</text>
-								
-							</g>
+					<g data-name="FormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
+							<rect x="50670.5" y="3485.0" height="31.0" width="113.0" data-name="FormControl"></rect>
 						</g>
-						<g transform="translate(62009.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SidesheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="SidesheetTab">+builder: Widget Function(BuildContext)</text>
+						<g transform="translate(50670.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
+								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="48614.0" y="3485.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
+					<g data-name="FormGroup">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
+							<rect x="59116.5" y="3485.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
 						</g>
-						<g transform="translate(48614, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
+						<g transform="translate(59116.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Sidesheet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Sidesheet">
-							<rect x="12715.3" y="2519.0" height="212.0" width="341.0" data-name="Sidesheet"></rect>
-							<path d="M12715.3 2550.0 L13056.3 2550.0" fill="none" data-name="Sidesheet"></path>
-						</g>
-						<g transform="translate(12715.25, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Sidesheet">
-								<text x="162.5" y="13.5" stroke="none" text-anchor="middle" data-name="Sidesheet">Sidesheet</text>
-								
-							</g>
+					<g data-name="AuthFormKey">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
+							<rect x="13736.5" y="3417.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
+							<path d="M13736.5 3448.0 L14091.5 3448.0" fill="none" data-name="AuthFormKey"></path>
 						</g>
-						<g transform="translate(12715.25, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Sidesheet">
-								<text x="0.0" y="13.5" stroke="none" data-name="Sidesheet">&lt;static&gt;+kDefaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Sidesheet">+titleText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Sidesheet">+body: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Sidesheet">+tabs: List&lt;SidesheetTab&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Sidesheet">+actionButtons: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Sidesheet">+width: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Sidesheet">+withCloseButton: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Sidesheet">+ignoreAppBar: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Sidesheet">+collapseSingleTab: bool</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Sidesheet">+bodyPadding: EdgeInsets?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Sidesheet">+wrapContent: Widget Function(Widget)?</text>
+						<g transform="translate(13736.5, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
+								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Widget Function(Widget)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Widget)?">
-							<rect x="19573.8" y="3485.0" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
-						</g>
-						<g transform="translate(19573.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Widget)?">
-								<text x="102.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Widget)?">Widget Function(Widget)?</text>
+						<g transform="translate(13736.5, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormSideSheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSideSheetTab">
-							<rect x="62379.3" y="2594.0" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
-							<path d="M62379.3 2625.0 L62692.3 2625.0" fill="none" data-name="FormSideSheetTab"></path>
+					<g data-name="IFormGroupController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
+							<rect x="61942.8" y="105.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
+							<path d="M61942.8 136.5 L62129.8 136.5" fill="none" data-name="IFormGroupController"></path>
 						</g>
-						<g transform="translate(62379.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSideSheetTab">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormSideSheetTab">FormSideSheetTab</text>
+						<g transform="translate(61942.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
+								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62379.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSideSheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSideSheetTab">+formViewBuilder: Widget Function(T)</text>
+						<g transform="translate(61942.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="HelpIcon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HelpIcon">
-							<rect x="27677.5" y="90.0" height="93.0" width="174.0" data-name="HelpIcon"></rect>
-							<path d="M27677.5 121.0 L27851.5 121.0" fill="none" data-name="HelpIcon"></path>
-							<path d="M27677.5 152.0 L27851.5 152.0" fill="none" data-name="HelpIcon"></path>
+					<g data-name="PasswordRecoveryForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
+							<rect x="8256.0" y="2578.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
+							<path d="M8256.0 2609.5 L8464.0 2609.5" fill="none" data-name="PasswordRecoveryForm"></path>
+							<path d="M8256.0 2640.5 L8464.0 2640.5" fill="none" data-name="PasswordRecoveryForm"></path>
 						</g>
-						<g transform="translate(27677.5, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HelpIcon">
-								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="HelpIcon">HelpIcon</text>
+						<g transform="translate(8256, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27677.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
-								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+tooltipText: String?</text>
+						<g transform="translate(8256, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27677.5, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
-								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+Widget build()</text>
+						<g transform="translate(8256, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EmptyBody">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmptyBody">
-							<rect x="13672.0" y="2541.0" height="168.0" width="222.0" data-name="EmptyBody"></rect>
-							<path d="M13672.0 2572.0 L13894.0 2572.0" fill="none" data-name="EmptyBody"></path>
-							<path d="M13672.0 2678.0 L13894.0 2678.0" fill="none" data-name="EmptyBody"></path>
-						</g>
-						<g transform="translate(13672, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmptyBody">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="EmptyBody">EmptyBody</text>
-								
-							</g>
+					<g data-name="FormConsumerRefWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
+							<rect x="8639.0" y="1666.5" height="62.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
+							<path d="M8639.0 1697.5 L8858.0 1697.5" fill="none" data-name="FormConsumerRefWidget"></path>
 						</g>
-						<g transform="translate(13672, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+icon: IconData?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmptyBody">+leading: Widget?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmptyBody">+leadingSpacing: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmptyBody">+title: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EmptyBody">+description: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EmptyBody">+button: Widget?</text>
+						<g transform="translate(8639, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
+								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13672, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+Widget build()</text>
+						<g transform="translate(8639, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerRefWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerRefWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerRefWidget">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IndicatorRangeSliderThumbShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IndicatorRangeSliderThumbShape">
-							<rect x="27857.0" y="560.5" height="138.0" width="287.0" data-name="IndicatorRangeSliderThumbShape"></rect>
-							<path d="M27857.0 591.5 L28144.0 591.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
-							<path d="M27857.0 652.5 L28144.0 652.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
-						</g>
-						<g transform="translate(27857, 560.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IndicatorRangeSliderThumbShape">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="IndicatorRangeSliderThumbShape">IndicatorRangeSliderThumbShape</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27857, 591.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+buildContext: BuildContext</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+start: T</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+end: T</text>
-								
-							</g>
+					<g data-name="PasswordForgotForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
+							<rect x="8504.0" y="2578.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
+							<path d="M8504.0 2609.5 L8711.0 2609.5" fill="none" data-name="PasswordForgotForm"></path>
+							<path d="M8504.0 2640.5 L8711.0 2640.5" fill="none" data-name="PasswordForgotForm"></path>
 						</g>
-						<g transform="translate(27857, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+Size getPreferredSize()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+void paint()</text>
+						<g transform="translate(8504, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="BuildContext">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
-							<rect x="27942.5" y="1197.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
-						</g>
-						<g transform="translate(27942.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
+						<g transform="translate(8504, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="RangeSliderThumbShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RangeSliderThumbShape">
-							<rect x="27891.5" y="121.0" height="31.0" width="218.0" data-name="RangeSliderThumbShape"></rect>
-						</g>
-						<g transform="translate(27891.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="RangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RangeSliderThumbShape">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="RangeSliderThumbShape">RangeSliderThumbShape</text>
+						<g transform="translate(8504, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MouseEventsRegion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MouseEventsRegion">
-							<rect x="15931.5" y="3760.0" height="167.0" width="379.0" data-name="MouseEventsRegion"></rect>
-							<path d="M15931.5 3791.0 L16310.5 3791.0" fill="none" data-name="MouseEventsRegion"></path>
+					<g data-name="LoginForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
+							<rect x="8751.0" y="2578.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
+							<path d="M8751.0 2609.5 L8958.0 2609.5" fill="none" data-name="LoginForm"></path>
+							<path d="M8751.0 2640.5 L8958.0 2640.5" fill="none" data-name="LoginForm"></path>
 						</g>
-						<g transform="translate(15931.5, 3760)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MouseEventsRegion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MouseEventsRegion">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="MouseEventsRegion">MouseEventsRegion</text>
+						<g transform="translate(8751, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15931.5, 3791)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MouseEventsRegion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MouseEventsRegion">
-								<text x="0.0" y="13.5" stroke="none" data-name="MouseEventsRegion">+onTap: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MouseEventsRegion">+onHover: void Function(PointerHoverEvent)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MouseEventsRegion">+onEnter: void Function(PointerEnterEvent)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MouseEventsRegion">+onExit: void Function(PointerExitEvent)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MouseEventsRegion">+autoselectCursor: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MouseEventsRegion">+cursor: SystemMouseCursor</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MouseEventsRegion">&lt;static&gt;+defaultCursor: SystemMouseCursor</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MouseEventsRegion">+autoCursor: SystemMouseCursor</text>
+						<g transform="translate(8751, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(PointerHoverEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerHoverEvent)?">
-							<rect x="5826.8" y="4118.5" height="31.0" width="292.0" data-name="void Function(PointerHoverEvent)?"></rect>
-						</g>
-						<g transform="translate(5826.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerHoverEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerHoverEvent)?">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerHoverEvent)?">void Function(PointerHoverEvent)?</text>
+						<g transform="translate(8751, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(PointerEnterEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerEnterEvent)?">
-							<rect x="6158.8" y="4118.5" height="31.0" width="287.0" data-name="void Function(PointerEnterEvent)?"></rect>
+					<g data-name="EmailTextField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
+							<rect x="9316.0" y="2571.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
+							<path d="M9316.0 2602.5 L9637.0 2602.5" fill="none" data-name="EmailTextField"></path>
 						</g>
-						<g transform="translate(6158.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerEnterEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerEnterEvent)?">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerEnterEvent)?">void Function(PointerEnterEvent)?</text>
+						<g transform="translate(9316, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
+								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(PointerExitEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerExitEvent)?">
-							<rect x="13967.0" y="4118.5" height="31.0" width="274.0" data-name="void Function(PointerExitEvent)?"></rect>
-						</g>
-						<g transform="translate(13967, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerExitEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerExitEvent)?">
-								<text x="129.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerExitEvent)?">void Function(PointerExitEvent)?</text>
+						<g transform="translate(9316, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
+								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SystemMouseCursor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SystemMouseCursor">
-							<rect x="14281.0" y="4118.5" height="31.0" width="180.0" data-name="SystemMouseCursor"></rect>
+					<g data-name="PasswordTextField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
+							<rect x="9677.0" y="2564.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
+							<path d="M9677.0 2595.0 L10156.0 2595.0" fill="none" data-name="PasswordTextField"></path>
 						</g>
-						<g transform="translate(14281, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SystemMouseCursor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SystemMouseCursor">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="SystemMouseCursor">SystemMouseCursor</text>
+						<g transform="translate(9677, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReactiveCustomColorPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveCustomColorPicker">
-							<rect x="36406.0" y="614.0" height="31.0" width="236.0" data-name="ReactiveCustomColorPicker"></rect>
-						</g>
-						<g transform="translate(36406, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveCustomColorPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveCustomColorPicker">
-								<text x="110.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveCustomColorPicker">ReactiveCustomColorPicker</text>
+						<g transform="translate(9677, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
+								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReactiveFormField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFormField">
-							<rect x="36442.5" y="121.0" height="31.0" width="163.0" data-name="ReactiveFormField"></rect>
+					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+							<rect x="9536.5" y="3485.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
 						</g>
-						<g transform="translate(36442.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFormField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFormField">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFormField">ReactiveFormField</text>
+						<g transform="translate(9536.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
+								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TextParagraph">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextParagraph">
-							<rect x="13934.0" y="2556.0" height="138.0" width="208.0" data-name="TextParagraph"></rect>
-							<path d="M13934.0 2587.0 L14142.0 2587.0" fill="none" data-name="TextParagraph"></path>
-							<path d="M13934.0 2663.0 L14142.0 2663.0" fill="none" data-name="TextParagraph"></path>
-						</g>
-						<g transform="translate(13934, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextParagraph">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextParagraph">TextParagraph</text>
-								
-							</g>
+					<g data-name="AuthScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
+							<rect x="10196.0" y="2564.0" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
+							<path d="M10196.0 2595.0 L10455.0 2595.0" fill="none" data-name="AuthScaffold"></path>
 						</g>
-						<g transform="translate(13934, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
-								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+text: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TextParagraph">+style: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TextParagraph">+selectable: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TextParagraph">+span: List&lt;TextSpan&gt;?</text>
+						<g transform="translate(10196, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
+								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13934, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
-								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+Widget build()</text>
+						<g transform="translate(10196, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="UnderConstruction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnderConstruction">
-							<rect x="36645.5" y="105.5" height="62.0" width="164.0" data-name="UnderConstruction"></rect>
-							<path d="M36645.5 136.5 L36809.5 136.5" fill="none" data-name="UnderConstruction"></path>
+					<g data-name="EdgeInsets">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
+							<rect x="39971.0" y="3485.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
 						</g>
-						<g transform="translate(36645.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnderConstruction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnderConstruction">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="UnderConstruction">UnderConstruction</text>
+						<g transform="translate(39971, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
+								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36645.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnderConstruction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnderConstruction">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnderConstruction">+Widget build()</text>
+					</g>
+					<g data-name="StudyUJobsToBeDone">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
+							<rect x="19387.3" y="105.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
+							<path d="M19387.3 136.5 L19581.3 136.5" fill="none" data-name="StudyUJobsToBeDone"></path>
+						</g>
+						<g transform="translate(19387.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
+								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="NullHelperDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NullHelperDecoration">
-							<rect x="36828.5" y="614.0" height="31.0" width="184.0" data-name="NullHelperDecoration"></rect>
-						</g>
-						<g transform="translate(36828.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NullHelperDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NullHelperDecoration">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="NullHelperDecoration">NullHelperDecoration</text>
+						<g transform="translate(19387.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InputDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InputDecoration">
-							<rect x="36849.5" y="121.0" height="31.0" width="142.0" data-name="InputDecoration"></rect>
+					<g data-name="SignupForm">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
+							<rect x="8998.0" y="2563.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
+							<path d="M8998.0 2594.5 L9276.0 2594.5" fill="none" data-name="SignupForm"></path>
+							<path d="M8998.0 2625.5 L9276.0 2625.5" fill="none" data-name="SignupForm"></path>
 						</g>
-						<g transform="translate(36849.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InputDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InputDecoration">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="InputDecoration">InputDecoration</text>
+						<g transform="translate(8998, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
+								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ActionMenuType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuType">
-							<rect x="8839.0" y="3447.0" height="107.0" width="330.0" data-name="ActionMenuType"></rect>
-							<path d="M8839.0 3478.0 L9169.0 3478.0" fill="none" data-name="ActionMenuType"></path>
-						</g>
-						<g transform="translate(8839, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuType">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuType">ActionMenuType</text>
+						<g transform="translate(8998, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(8839, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+values: List&lt;ActionMenuType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+inline: ActionMenuType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+popup: ActionMenuType</text>
+						<g transform="translate(8998, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
+								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="HtmlStylingBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlStylingBanner">
-							<rect x="14182.0" y="2571.0" height="108.0" width="298.0" data-name="HtmlStylingBanner"></rect>
-							<path d="M14182.0 2602.0 L14480.0 2602.0" fill="none" data-name="HtmlStylingBanner"></path>
-							<path d="M14182.0 2648.0 L14480.0 2648.0" fill="none" data-name="HtmlStylingBanner"></path>
+					<g data-name="StudyInvitesTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
+							<rect x="1578.0" y="45.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
+							<path d="M1578.0 76.0 L2144.0 76.0" fill="none" data-name="StudyInvitesTable"></path>
+							<path d="M1578.0 182.0 L2144.0 182.0" fill="none" data-name="StudyInvitesTable"></path>
 						</g>
-						<g transform="translate(14182, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlStylingBanner">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlStylingBanner">HtmlStylingBanner</text>
+						<g transform="translate(1578, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
+								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14182, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+isDismissed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="HtmlStylingBanner">+onDismissed: dynamic Function()?</text>
+						<g transform="translate(1578, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14182, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+Widget build()</text>
+						<g transform="translate(1578, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="82075.0" y="105.5" height="62.0" width="192.0" data-name="FormConsumerWidget"></rect>
-							<path d="M82075.0 136.5 L82267.0 136.5" fill="none" data-name="FormConsumerWidget"></path>
+					<g data-name="void Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
+							<rect x="1247.0" y="614.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
 						</g>
-						<g transform="translate(82075, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
+						<g transform="translate(1247, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
+								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82075, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerWidget">+Widget build()</text>
+					</g>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+							<rect x="1509.0" y="614.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
+						</g>
+						<g transform="translate(1509, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
+								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormConsumerRefWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="13485.5" y="1666.5" height="62.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
-							<path d="M13485.5 1697.5 L13704.5 1697.5" fill="none" data-name="FormConsumerRefWidget"></path>
+					<g data-name="Intervention? Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
+							<rect x="1969.0" y="614.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
 						</g>
-						<g transform="translate(13485.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
+						<g transform="translate(1969, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13485.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerRefWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerRefWidget">+Widget build()</text>
+					</g>
+					<g data-name="int Function(StudyInvite)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
+							<rect x="2260.0" y="614.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
+						</g>
+						<g transform="translate(2260, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SplashPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SplashPage">
-							<rect x="37316.5" y="105.5" height="62.0" width="136.0" data-name="SplashPage"></rect>
-							<path d="M37316.5 136.5 L37452.5 136.5" fill="none" data-name="SplashPage"></path>
+					<g data-name="EnrolledBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
+							<rect x="19824.3" y="90.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
+							<path d="M19824.3 121.0 L19990.3 121.0" fill="none" data-name="EnrolledBadge"></path>
+							<path d="M19824.3 152.0 L19990.3 152.0" fill="none" data-name="EnrolledBadge"></path>
 						</g>
-						<g transform="translate(37316.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SplashPage">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SplashPage">SplashPage</text>
+						<g transform="translate(19824.25, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37316.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SplashPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SplashPage">+Widget build()</text>
+						<g transform="translate(19824.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
+								
+							</g>
+						</g>
+						<g transform="translate(19824.25, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ErrorPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ErrorPage">
-							<rect x="13283.5" y="1651.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
-							<path d="M13283.5 1682.0 L13445.5 1682.0" fill="none" data-name="ErrorPage"></path>
-							<path d="M13283.5 1713.0 L13445.5 1713.0" fill="none" data-name="ErrorPage"></path>
+					<g data-name="StudyRecruitScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
+							<rect x="48936.8" y="2571.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
+							<path d="M48936.8 2602.5 L49250.8 2602.5" fill="none" data-name="StudyRecruitScreen"></path>
 						</g>
-						<g transform="translate(13283.5, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ErrorPage">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="ErrorPage">ErrorPage</text>
+						<g transform="translate(48936.75, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
+								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13283.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+error: Exception?</text>
+						<g transform="translate(48936.75, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13283.5, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+Widget build()</text>
+					</g>
+					<g data-name="StudyPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
+							<rect x="53572.0" y="1651.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
+							<path d="M53572.0 1682.0 L53736.0 1682.0" fill="none" data-name="StudyPageWidget"></path>
+							<path d="M53572.0 1713.0 L53736.0 1713.0" fill="none" data-name="StudyPageWidget"></path>
+						</g>
+						<g transform="translate(53572, 1651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="29246.3" y="1197.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+						<g transform="translate(53572, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
+								
+							</g>
 						</g>
-						<g transform="translate(29246.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
+						<g transform="translate(53572, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyULogo">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyULogo">
-							<rect x="16427.0" y="3797.0" height="93.0" width="214.0" data-name="StudyULogo"></rect>
-							<path d="M16427.0 3828.0 L16641.0 3828.0" fill="none" data-name="StudyULogo"></path>
-							<path d="M16427.0 3859.0 L16641.0 3859.0" fill="none" data-name="StudyULogo"></path>
+					<g data-name="InviteCodeFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
+							<rect x="68401.8" y="1023.5" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
+							<path d="M68401.8 1054.5 L69068.8 1054.5" fill="none" data-name="InviteCodeFormViewModel"></path>
+							<path d="M68401.8 1280.5 L69068.8 1280.5" fill="none" data-name="InviteCodeFormViewModel"></path>
 						</g>
-						<g transform="translate(16427, 3797)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyULogo">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyULogo">StudyULogo</text>
+						<g transform="translate(68401.75, 1023.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
+								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16427, 3828)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+onTap: void Function()?</text>
+						<g transform="translate(68401.75, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16427, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+Widget build()</text>
+						<g transform="translate(68401.75, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SingleColumnLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayout">
-							<rect x="14520.0" y="2526.0" height="198.0" width="418.0" data-name="SingleColumnLayout"></rect>
-							<path d="M14520.0 2557.0 L14938.0 2557.0" fill="none" data-name="SingleColumnLayout"></path>
-							<path d="M14520.0 2693.0 L14938.0 2693.0" fill="none" data-name="SingleColumnLayout"></path>
+					<g data-name="FormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
+							<rect x="67716.8" y="313.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
+							<path d="M67716.8 344.0 L68588.8 344.0" fill="none" data-name="FormViewModel"></path>
+							<path d="M67716.8 660.0 L68588.8 660.0" fill="none" data-name="FormViewModel"></path>
 						</g>
-						<g transform="translate(14520, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayout">
-								<text x="201.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayout">SingleColumnLayout</text>
+						<g transform="translate(67716.75, 313)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
+								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14520, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraints: BoxConstraints</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraintsNarrow: BoxConstraints</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayout">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayout">+header: Widget?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayout">+stickyHeader: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayout">+constraints: BoxConstraints?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SingleColumnLayout">+scroll: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SingleColumnLayout">+padding: EdgeInsets?</text>
+						<g transform="translate(67716.75, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(67716.75, 660)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14520, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+dynamic fromType()</text>
+					</g>
+					<g data-name="InviteCodeFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
+							<rect x="72244.0" y="575.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
+							<path d="M72244.0 606.5 L72682.0 606.5" fill="none" data-name="InviteCodeFormView"></path>
+							<path d="M72244.0 637.5 L72682.0 637.5" fill="none" data-name="InviteCodeFormView"></path>
+						</g>
+						<g transform="translate(72244, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
+								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="SingleColumnLayoutType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="27032.3" y="3432.0" height="137.0" width="426.0" data-name="SingleColumnLayoutType"></rect>
-							<path d="M27032.3 3463.0 L27458.3 3463.0" fill="none" data-name="SingleColumnLayoutType"></path>
-						</g>
-						<g transform="translate(27032.25, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
-								<text x="205.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
+						<g transform="translate(72244, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27032.25, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayoutType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayoutType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedWide: SingleColumnLayoutType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedNarrow: SingleColumnLayoutType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+stretched: SingleColumnLayoutType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+split: SingleColumnLayoutType</text>
+						<g transform="translate(72244, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Hyperlink">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Hyperlink">
-							<rect x="15615.0" y="2519.0" height="212.0" width="222.0" data-name="Hyperlink"></rect>
-							<path d="M15615.0 2550.0 L15837.0 2550.0" fill="none" data-name="Hyperlink"></path>
+					<g data-name="FormConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
+							<rect x="73252.5" y="105.5" height="62.0" width="192.0" data-name="FormConsumerWidget"></rect>
+							<path d="M73252.5 136.5 L73444.5 136.5" fill="none" data-name="FormConsumerWidget"></path>
 						</g>
-						<g transform="translate(15615, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Hyperlink">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Hyperlink">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="Hyperlink">Hyperlink</text>
+						<g transform="translate(73252.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
+								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(15615, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Hyperlink">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Hyperlink">
-								<text x="0.0" y="13.5" stroke="none" data-name="Hyperlink">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Hyperlink">+url: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Hyperlink">+onClick: void Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Hyperlink">+linkColor: Color</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Hyperlink">+hoverColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Hyperlink">+visitedColor: Color?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Hyperlink">+style: TextStyle?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Hyperlink">+hoverStyle: TextStyle?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Hyperlink">+visitedStyle: TextStyle?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Hyperlink">+icon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Hyperlink">+iconSize: double?</text>
+						<g transform="translate(73252.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerWidget">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StandardTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableColumn">
-							<rect x="21586.0" y="2556.5" height="137.0" width="287.0" data-name="StandardTableColumn"></rect>
-							<path d="M21586.0 2587.5 L21873.0 2587.5" fill="none" data-name="StandardTableColumn"></path>
+					<g data-name="StudyRecruitController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
+							<rect x="66479.5" y="1121.0" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
+							<path d="M66479.5 1152.0 L67130.5 1152.0" fill="none" data-name="StudyRecruitController"></path>
+							<path d="M66479.5 1198.0 L67130.5 1198.0" fill="none" data-name="StudyRecruitController"></path>
 						</g>
-						<g transform="translate(21586, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableColumn">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableColumn">StandardTableColumn</text>
+						<g transform="translate(66479.5, 1121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
+								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21586, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableColumn">+label: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableColumn">+tooltip: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableColumn">+columnWidth: TableColumnWidth</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableColumn">+sortable: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardTableColumn">+sortAscending: bool?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardTableColumn">+sortableIcon: Widget?</text>
+						<g transform="translate(66479.5, 1152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="TableColumnWidth">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TableColumnWidth">
-							<rect x="24211.3" y="3485.0" height="31.0" width="165.0" data-name="TableColumnWidth"></rect>
-						</g>
-						<g transform="translate(24211.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TableColumnWidth">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableColumnWidth">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableColumnWidth">TableColumnWidth</text>
+						<g transform="translate(66479.5, 1198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StandardTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTable">
-							<rect x="19871.8" y="1501.5" height="392.0" width="688.0" data-name="StandardTable"></rect>
-							<path d="M19871.8 1532.5 L20559.8 1532.5" fill="none" data-name="StandardTable"></path>
+					<g data-name="StudyBaseController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
+							<rect x="8018.8" y="538.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
+							<path d="M8018.8 569.0 L8564.8 569.0" fill="none" data-name="StudyBaseController"></path>
+							<path d="M8018.8 645.0 L8564.8 645.0" fill="none" data-name="StudyBaseController"></path>
 						</g>
-						<g transform="translate(19871.75, 1501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTable">
-								<text x="336.0" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTable">StandardTable</text>
+						<g transform="translate(8018.75, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
+								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19871.75, 1532.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTable">+inputColumns: List&lt;StandardTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTable">+trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardTable">+trailingActionsMenuType: ActionMenuType?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardTable">+sortColumnPredicates: List&lt;int Function(T, T)?&gt;?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StandardTable">+pinnedPredicates: int Function(T, T)?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StandardTable">+headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StandardTable">+dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StandardTable">+inputTrailingActionsColumn: StandardTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StandardTable">+tableWrapper: Widget Function(Widget)?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StandardTable">+cellSpacing: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StandardTable">+rowSpacing: double</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StandardTable">+minRowHeight: double?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StandardTable">+showTableHeader: bool</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StandardTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StandardTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StandardTable">+trailingWidget: Widget?</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StandardTable">+leadingWidgetSpacing: double?</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StandardTable">+trailingWidgetSpacing: double?</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StandardTable">+emptyWidget: Widget?</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StandardTable">+rowStyle: StandardTableStyle</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StandardTable">+disableRowInteractions: bool</text>
+						<g transform="translate(8018.75, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="25512.0" y="3485.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
-						</g>
-						<g transform="translate(25512, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
+						<g transform="translate(8018.75, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-							<rect x="18928.3" y="2609.5" height="31.0" width="381.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?"></rect>
+					<g data-name="App">
+						<g fill="#eee8d5" stroke="#33322E" data-name="App">
+							<rect x="20212.3" y="121.0" height="31.0" width="47.0" data-name="App"></rect>
 						</g>
-						<g transform="translate(18928.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
+						<g transform="translate(20212.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
+								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="int Function(T, T)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(T, T)?">
-							<rect x="19389.3" y="2609.5" height="31.0" width="160.0" data-name="int Function(T, T)?"></rect>
+					<g data-name="AppContent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
+							<rect x="20299.3" y="121.0" height="31.0" width="109.0" data-name="AppContent"></rect>
 						</g>
-						<g transform="translate(19389.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(T, T)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(T, T)?">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(T, T)?">int Function(T, T)?</text>
+						<g transform="translate(20299.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
+								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<rect x="19589.3" y="2609.5" height="31.0" width="523.0" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?"></rect>
+					<g data-name="StudyAnalyzeScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
+							<rect x="52344.8" y="2586.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
+							<path d="M52344.8 2617.5 L52524.8 2617.5" fill="none" data-name="StudyAnalyzeScreen"></path>
 						</g>
-						<g transform="translate(19589.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-								<text x="253.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
+						<g transform="translate(52344.75, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
+								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
+								
+							</g>
+						</g>
+						<g transform="translate(52344.75, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StandardTableStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableStyle">
-							<rect x="9715.0" y="3447.0" height="107.0" width="353.0" data-name="StandardTableStyle"></rect>
-							<path d="M9715.0 3478.0 L10068.0 3478.0" fill="none" data-name="StandardTableStyle"></path>
+					<g data-name="StudyAnalyzeController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
+							<rect x="5810.8" y="1181.5" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
+							<path d="M5810.8 1212.5 L6011.8 1212.5" fill="none" data-name="StudyAnalyzeController"></path>
 						</g>
-						<g transform="translate(9715, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableStyle">
-								<text x="168.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableStyle">StandardTableStyle</text>
+						<g transform="translate(5810.75, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
+								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9715, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableStyle">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableStyle">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+values: List&lt;StandardTableStyle&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+plain: StandardTableStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+material: StandardTableStyle</text>
+						<g transform="translate(5810.75, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconPack">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPack">
-							<rect x="37492.5" y="82.5" height="108.0" width="359.0" data-name="IconPack"></rect>
-							<path d="M37492.5 113.5 L37851.5 113.5" fill="none" data-name="IconPack"></path>
-							<path d="M37492.5 159.5 L37851.5 159.5" fill="none" data-name="IconPack"></path>
-						</g>
-						<g transform="translate(37492.5, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPack">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPack">IconPack</text>
-								
-							</g>
+					<g data-name="AppStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
+							<rect x="3624.3" y="3447.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
+							<path d="M3624.3 3478.0 L3903.3 3478.0" fill="none" data-name="AppStatus"></path>
 						</g>
-						<g transform="translate(37492.5, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+defaultPack: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPack">&lt;static&gt;+material: List&lt;IconOption&gt;</text>
+						<g transform="translate(3624.25, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
+								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37492.5, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+IconOption? resolveIconByName()</text>
+						<g transform="translate(3624.25, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconOption">
-							<rect x="23053.0" y="2548.5" height="153.0" width="264.0" data-name="IconOption"></rect>
-							<path d="M23053.0 2579.5 L23317.0 2579.5" fill="none" data-name="IconOption"></path>
-							<path d="M23053.0 2655.5 L23317.0 2655.5" fill="none" data-name="IconOption"></path>
-						</g>
-						<g transform="translate(23053, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconOption">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="IconOption">IconOption</text>
-								
-							</g>
+					<g data-name="ManagedFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
+							<rect x="61858.5" y="1666.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
+							<path d="M61858.5 1697.5 L62254.5 1697.5" fill="none" data-name="ManagedFormViewModel"></path>
 						</g>
-						<g transform="translate(23053, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconOption">+isEmpty: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconOption">+props: List&lt;Object?&gt;</text>
+						<g transform="translate(61858.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
+								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23053, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+String toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">&lt;static&gt;+IconOption fromJson()</text>
+						<g transform="translate(61858.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="22666.5" y="1682.0" height="31.0" width="96.0" data-name="Equatable"></rect>
+					<g data-name="FormViewModelNotFoundException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
+							<rect x="5289.3" y="614.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
 						</g>
-						<g transform="translate(22666.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
+						<g transform="translate(5289.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReactiveIconPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveIconPicker">
-							<rect x="37070.0" y="614.0" height="31.0" width="168.0" data-name="ReactiveIconPicker"></rect>
+					<g data-name="FormViewModelCollection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
+							<rect x="64033.3" y="3707.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
+							<path d="M64033.3 3738.0 L64314.3 3738.0" fill="none" data-name="FormViewModelCollection"></path>
+							<path d="M64033.3 3829.0 L64314.3 3829.0" fill="none" data-name="FormViewModelCollection"></path>
 						</g>
-						<g transform="translate(37070, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveIconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveIconPicker">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveIconPicker">ReactiveIconPicker</text>
+						<g transform="translate(64033.25, 3707)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
+								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReactiveFocusableFormField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFocusableFormField">
-							<rect x="37031.5" y="121.0" height="31.0" width="245.0" data-name="ReactiveFocusableFormField"></rect>
+						<g transform="translate(64033.25, 3738)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(37031.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFocusableFormField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFocusableFormField">
-								<text x="114.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFocusableFormField">ReactiveFocusableFormField</text>
+						<g transform="translate(64033.25, 3829)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPicker">
-							<rect x="23138.0" y="1606.0" height="183.0" width="319.0" data-name="IconPicker"></rect>
-							<path d="M23138.0 1637.0 L23457.0 1637.0" fill="none" data-name="IconPicker"></path>
-							<path d="M23138.0 1758.0 L23457.0 1758.0" fill="none" data-name="IconPicker"></path>
+					<g data-name="FormArray">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
+							<rect x="62791.0" y="4118.5" height="31.0" width="98.0" data-name="FormArray"></rect>
 						</g>
-						<g transform="translate(23138, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPicker">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPicker">IconPicker</text>
+						<g transform="translate(62791, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
+								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23138, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPicker">+selectedOption: IconOption?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPicker">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconPicker">+galleryIconSize: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IconPicker">+selectedIconSize: double?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IconPicker">+focusNode: FocusNode?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IconPicker">+isDisabled: bool</text>
-								
-							</g>
+					</g>
+					<g data-name="FormInvalidException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
+							<rect x="5625.3" y="614.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
 						</g>
-						<g transform="translate(23138, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+Widget build()</text>
+						<g transform="translate(5625.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
+								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(IconOption)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(IconOption)?">
-							<rect x="23605.5" y="2609.5" height="31.0" width="230.0" data-name="void Function(IconOption)?"></rect>
+					<g data-name="FormConfigException">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
+							<rect x="5851.3" y="598.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
+							<path d="M5851.3 629.5 L6036.3 629.5" fill="none" data-name="FormConfigException"></path>
 						</g>
-						<g transform="translate(23605.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(IconOption)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(IconOption)?">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(IconOption)?">void Function(IconOption)?</text>
+						<g transform="translate(5851.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
+								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FocusNode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FocusNode">
-							<rect x="23404.0" y="2609.5" height="31.0" width="106.0" data-name="FocusNode"></rect>
-						</g>
-						<g transform="translate(23404, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FocusNode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FocusNode">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="FocusNode">FocusNode</text>
+						<g transform="translate(5851.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconPickerField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerField">
-							<rect x="23497.0" y="1606.0" height="183.0" width="319.0" data-name="IconPickerField"></rect>
-							<path d="M23497.0 1637.0 L23816.0 1637.0" fill="none" data-name="IconPickerField"></path>
-							<path d="M23497.0 1758.0 L23816.0 1758.0" fill="none" data-name="IconPickerField"></path>
-						</g>
-						<g transform="translate(23497, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerField">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerField">IconPickerField</text>
-								
-							</g>
+					<g data-name="IFormViewModelDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
+							<rect x="64558.3" y="1174.0" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
+							<path d="M64558.3 1205.0 L64775.3 1205.0" fill="none" data-name="IFormViewModelDelegate"></path>
 						</g>
-						<g transform="translate(23497, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerField">+selectedOption: IconOption?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerField">+selectedIconSize: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconPickerField">+galleryIconSize: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IconPickerField">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IconPickerField">+focusNode: FocusNode?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IconPickerField">+isDisabled: bool</text>
+						<g transform="translate(64558.25, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
+								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23497, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+Widget build()</text>
+						<g transform="translate(64558.25, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IconPickerGallery">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerGallery">
-							<rect x="23856.0" y="1636.0" height="123.0" width="319.0" data-name="IconPickerGallery"></rect>
-							<path d="M23856.0 1667.0 L24175.0 1667.0" fill="none" data-name="IconPickerGallery"></path>
-							<path d="M23856.0 1728.0 L24175.0 1728.0" fill="none" data-name="IconPickerGallery"></path>
+					<g data-name="FormControlOption">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
+							<rect x="10575.0" y="2571.5" height="107.0" width="190.0" data-name="FormControlOption"></rect>
+							<path d="M10575.0 2602.5 L10765.0 2602.5" fill="none" data-name="FormControlOption"></path>
 						</g>
-						<g transform="translate(23856, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerGallery">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerGallery">IconPickerGallery</text>
+						<g transform="translate(10575, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
+								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23856, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerGallery">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerGallery">+iconSize: double</text>
+						<g transform="translate(10575, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(23856, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+Widget build()</text>
+					</g>
+					<g data-name="Equatable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
+							<rect x="10805.5" y="1682.0" height="31.0" width="96.0" data-name="Equatable"></rect>
+						</g>
+						<g transform="translate(10805.5, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
+								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SecondaryButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SecondaryButton">
-							<rect x="20152.3" y="2556.0" height="138.0" width="249.0" data-name="SecondaryButton"></rect>
-							<path d="M20152.3 2587.0 L20401.3 2587.0" fill="none" data-name="SecondaryButton"></path>
-							<path d="M20152.3 2663.0 L20401.3 2663.0" fill="none" data-name="SecondaryButton"></path>
+					<g data-name="FormMode">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
+							<rect x="39135.5" y="3439.5" height="122.0" width="282.0" data-name="FormMode"></rect>
+							<path d="M39135.5 3470.5 L39417.5 3470.5" fill="none" data-name="FormMode"></path>
 						</g>
-						<g transform="translate(20152.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecondaryButton">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecondaryButton">SecondaryButton</text>
+						<g transform="translate(39135.5, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20152.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SecondaryButton">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SecondaryButton">+isLoading: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SecondaryButton">+onPressed: void Function()?</text>
+						<g transform="translate(39135.5, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20152.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+Widget build()</text>
+					</g>
+					<g data-name="FormValidationSetEnum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
+							<rect x="62890.3" y="1197.0" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
+						</g>
+						<g transform="translate(62890.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
+								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TwoColumnLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TwoColumnLayout">
-							<rect x="20637.5" y="2466.5" height="317.0" width="368.0" data-name="TwoColumnLayout"></rect>
-							<path d="M20637.5 2497.5 L21005.5 2497.5" fill="none" data-name="TwoColumnLayout"></path>
+					<g data-name="Debouncer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
+							<rect x="53168.5" y="4072.5" height="123.0" width="536.0" data-name="Debouncer"></rect>
+							<path d="M53168.5 4103.5 L53704.5 4103.5" fill="none" data-name="Debouncer"></path>
+							<path d="M53168.5 4164.5 L53704.5 4164.5" fill="none" data-name="Debouncer"></path>
 						</g>
-						<g transform="translate(20637.5, 2466.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TwoColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TwoColumnLayout">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="TwoColumnLayout">TwoColumnLayout</text>
+						<g transform="translate(53168.5, 4072.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
+								<text x="260.0" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20637.5, 2497.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TwoColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TwoColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultDivider: VerticalDivider</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultContentPadding: EdgeInsets</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+slimContentPadding: EdgeInsets</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TwoColumnLayout">+leftWidget: Widget</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TwoColumnLayout">+rightWidget: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TwoColumnLayout">+dividerWidget: Widget?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TwoColumnLayout">+headerWidget: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TwoColumnLayout">+flexLeft: int?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="TwoColumnLayout">+flexRight: int?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="TwoColumnLayout">+constraintsLeft: BoxConstraints?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="TwoColumnLayout">+constraintsRight: BoxConstraints?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="TwoColumnLayout">+scrollLeft: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="TwoColumnLayout">+scrollRight: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="TwoColumnLayout">+paddingLeft: EdgeInsets?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="TwoColumnLayout">+paddingRight: EdgeInsets?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorLeft: Color?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorRight: Color?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="TwoColumnLayout">+stretchHeight: bool</text>
+						<g transform="translate(53168.5, 4103.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
+								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+leading: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Debouncer">+cancelUncompleted: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Debouncer">-_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="VerticalDivider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VerticalDivider">
-							<rect x="20438.5" y="3485.0" height="31.0" width="130.0" data-name="VerticalDivider"></rect>
-						</g>
-						<g transform="translate(20438.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VerticalDivider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VerticalDivider">
-								<text x="57.0" y="13.5" stroke="none" text-anchor="middle" data-name="VerticalDivider">VerticalDivider</text>
+						<g transform="translate(53168.5, 4164.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
+								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+dynamic call()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppTranslation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppTranslation">
-							<rect x="38170.5" y="105.5" height="62.0" width="194.0" data-name="AppTranslation"></rect>
-							<path d="M38170.5 136.5 L38364.5 136.5" fill="none" data-name="AppTranslation"></path>
-						</g>
-						<g transform="translate(38170.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppTranslation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppTranslation">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppTranslation">AppTranslation</text>
-								
-							</g>
+					<g data-name="CancelableOperation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
+							<rect x="56070.5" y="4446.5" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
 						</g>
-						<g transform="translate(38170.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppTranslation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppTranslation">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppTranslation">&lt;static&gt;+dynamic init()</text>
+						<g transform="translate(56070.5, 4446.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
+								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformLocale">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocale">
-							<rect x="37891.5" y="105.5" height="62.0" width="239.0" data-name="PlatformLocale"></rect>
-							<path d="M37891.5 136.5 L38130.5 136.5" fill="none" data-name="PlatformLocale"></path>
+					<g data-name="UnsavedChangesDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
+							<rect x="20448.3" y="105.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
+							<path d="M20448.3 136.5 L20655.3 136.5" fill="none" data-name="UnsavedChangesDialog"></path>
 						</g>
-						<g transform="translate(37891.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocale">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocale">PlatformLocale</text>
+						<g transform="translate(20448.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
+								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37891.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocale">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocale">+Locale getPlatformLocale()</text>
+						<g transform="translate(20448.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformLocaleWeb">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleWeb">
-							<rect x="37584.8" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleWeb"></rect>
-							<path d="M37584.8 629.5 L37823.8 629.5" fill="none" data-name="PlatformLocaleWeb"></path>
+					<g data-name="FormArrayTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
+							<rect x="11406.0" y="2428.5" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
+							<path d="M11406.0 2459.5 L11896.0 2459.5" fill="none" data-name="FormArrayTable"></path>
+							<path d="M11406.0 2760.5 L11896.0 2760.5" fill="none" data-name="FormArrayTable"></path>
 						</g>
-						<g transform="translate(37584.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleWeb">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleWeb">PlatformLocaleWeb</text>
+						<g transform="translate(11406, 2428.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
+								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37584.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleWeb">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleWeb">+Locale getPlatformLocale()</text>
+						<g transform="translate(11406, 2459.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(11406, 2760.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformLocaleMobile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleMobile">
-							<rect x="38063.8" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleMobile"></rect>
-							<path d="M38063.8 629.5 L38302.8 629.5" fill="none" data-name="PlatformLocaleMobile"></path>
+					<g data-name="AbstractControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
+							<rect x="34872.0" y="3485.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
 						</g>
-						<g transform="translate(38063.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleMobile">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleMobile">PlatformLocaleMobile</text>
+						<g transform="translate(34872, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
+								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38063.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleMobile">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleMobile">+Locale getPlatformLocale()</text>
+					</g>
+					<g data-name="void Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
+							<rect x="19079.0" y="3485.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
+						</g>
+						<g transform="translate(19079, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
+								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LanguagePicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePicker">
-							<rect x="21180.0" y="2579.0" height="92.0" width="366.0" data-name="LanguagePicker"></rect>
-							<path d="M21180.0 2610.0 L21546.0 2610.0" fill="none" data-name="LanguagePicker"></path>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+							<rect x="10919.0" y="3485.0" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
 						</g>
-						<g transform="translate(21180, 2579)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePicker">
-								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePicker">LanguagePicker</text>
+						<g transform="translate(10919, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
+								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21180, 2610)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePicker">+languagePickerType: LanguagePickerType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePicker">+iconColor: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePicker">+offset: Offset?</text>
+					</g>
+					<g data-name="String Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
+							<rect x="11843.0" y="3485.0" height="31.0" width="157.0" data-name="String Function(T)"></rect>
+						</g>
+						<g transform="translate(11843, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
+								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LanguagePickerType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePickerType">
-							<rect x="9259.0" y="3447.0" height="107.0" width="366.0" data-name="LanguagePickerType"></rect>
-							<path d="M9259.0 3478.0 L9625.0 3478.0" fill="none" data-name="LanguagePickerType"></path>
+					<g data-name="IconData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
+							<rect x="40116.0" y="3485.0" height="31.0" width="87.0" data-name="IconData"></rect>
 						</g>
-						<g transform="translate(9259, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePickerType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePickerType">
-								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePickerType">LanguagePickerType</text>
+						<g transform="translate(40116, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
+								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(9259, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePickerType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePickerType">
-								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePickerType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+values: List&lt;LanguagePickerType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+field: LanguagePickerType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+icon: LanguagePickerType</text>
+					</g>
+					<g data-name="Widget Function(BuildContext, T, int)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
+							<rect x="12040.0" y="3485.0" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
+						</g>
+						<g transform="translate(12040, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
+								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Offset">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Offset">
-							<rect x="24108.3" y="3485.0" height="31.0" width="63.0" data-name="Offset"></rect>
+					<g data-name="IFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
+							<rect x="15450.8" y="1166.0" height="93.0" width="163.0" data-name="IFormData"></rect>
+							<path d="M15450.8 1197.0 L15613.8 1197.0" fill="none" data-name="IFormData"></path>
+							<path d="M15450.8 1228.0 L15613.8 1228.0" fill="none" data-name="IFormData"></path>
 						</g>
-						<g transform="translate(24108.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Offset">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Offset">
-								<text x="23.5" y="13.5" stroke="none" text-anchor="middle" data-name="Offset">Offset</text>
+						<g transform="translate(15450.75, 1166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
+								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="GoRouteParamEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouteParamEnum">
-							<rect x="38756.5" y="98.0" height="77.0" width="202.0" data-name="GoRouteParamEnum"></rect>
-							<path d="M38756.5 129.0 L38958.5 129.0" fill="none" data-name="GoRouteParamEnum"></path>
-						</g>
-						<g transform="translate(38756.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GoRouteParamEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouteParamEnum">
-								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouteParamEnum">GoRouteParamEnum</text>
+						<g transform="translate(15450.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38756.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouteParamEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouteParamEnum">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouteParamEnum">+String toRouteParam()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GoRouteParamEnum">+String toShortString()</text>
+						<g transform="translate(15450.75, 1228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RoutingIntents">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntents">
-							<rect x="24765.8" y="1479.0" height="437.0" width="572.0" data-name="RoutingIntents"></rect>
-							<path d="M24765.8 1510.0 L25337.8 1510.0" fill="none" data-name="RoutingIntents"></path>
+					<g data-name="CustomFormControl">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
+							<rect x="50520.5" y="3759.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
+							<path d="M50520.5 3790.5 L50933.5 3790.5" fill="none" data-name="CustomFormControl"></path>
+							<path d="M50520.5 3896.5 L50933.5 3896.5" fill="none" data-name="CustomFormControl"></path>
 						</g>
-						<g transform="translate(24765.75, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntents">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntents">
-								<text x="278.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntents">RoutingIntents</text>
+						<g transform="translate(50520.5, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24765.75, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntents">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntents">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+root: RoutingIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studies: RoutingIntent</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studiesShared: RoutingIntent</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+publicRegistry: RoutingIntent</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+study: RoutingIntent Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEdit: RoutingIntent Function(String)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInfo: RoutingIntent Function(String)</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String)</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInterventions: RoutingIntent Function(String)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String)</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditReports: RoutingIntent Function(String)</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String)</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute})</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyRecruit: RoutingIntent Function(String)</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyMonitor: RoutingIntent Function(String)</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyAnalyze: RoutingIntent Function(String)</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studySettings: RoutingIntent Function(String)</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+accountSettings: RoutingIntent</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyNew: RoutingIntent</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+login: RoutingIntent</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+signup: RoutingIntent</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot: RoutingIntent</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot2: RoutingIntent Function(String)</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordRecovery: RoutingIntent</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+error: RoutingIntent Function(Exception)</text>
+						<g transform="translate(50520.5, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="RoutingIntent Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String)">
-							<rect x="24191.8" y="2609.5" height="31.0" width="253.0" data-name="RoutingIntent Function(String)"></rect>
-						</g>
-						<g transform="translate(24191.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String)">
-								<text x="118.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String)">RoutingIntent Function(String)</text>
+						<g transform="translate(50520.5, 3896.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RoutingIntent Function(String, String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, String)">
-							<rect x="24880.8" y="2609.5" height="31.0" width="309.0" data-name="RoutingIntent Function(String, String)"></rect>
+					<g data-name="void Function(T?)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
+							<rect x="48421.5" y="4118.5" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
 						</g>
-						<g transform="translate(24880.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, String)">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, String)">RoutingIntent Function(String, String)</text>
+						<g transform="translate(48421.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RoutingIntent Function(String, {String? appRoute})">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, {String? appRoute})">
-							<rect x="25229.8" y="2609.5" height="31.0" width="413.0" data-name="RoutingIntent Function(String, {String? appRoute})"></rect>
+					<g data-name="void Function(ControlStatus)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
+							<rect x="48625.5" y="4118.5" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
 						</g>
-						<g transform="translate(25229.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, {String? appRoute})">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, {String? appRoute})">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, {String? appRoute})">RoutingIntent Function(String, {String? appRoute})</text>
+						<g transform="translate(48625.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
+								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RoutingIntent Function(Exception)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(Exception)">
-							<rect x="25682.8" y="2609.5" height="31.0" width="285.0" data-name="RoutingIntent Function(Exception)"></rect>
+					<g data-name="FormControlValidation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
+							<rect x="12318.8" y="2556.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
+							<path d="M12318.8 2587.0 L12803.8 2587.0" fill="none" data-name="FormControlValidation"></path>
+							<path d="M12318.8 2663.0 L12803.8 2663.0" fill="none" data-name="FormControlValidation"></path>
 						</g>
-						<g transform="translate(25682.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(Exception)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(Exception)">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(Exception)">RoutingIntent Function(Exception)</text>
+						<g transform="translate(12318.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
+								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="GoRoute">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRoute">
-							<rect x="44440.8" y="3485.0" height="31.0" width="86.0" data-name="GoRoute"></rect>
+						<g transform="translate(12318.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(44440.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRoute">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRoute">
-								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRoute">GoRoute</text>
+						<g transform="translate(12318.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RoutingIntentDispatch">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntentDispatch">
-							<rect x="14171.5" y="3447.0" height="107.0" width="373.0" data-name="RoutingIntentDispatch"></rect>
-							<path d="M14171.5 3478.0 L14544.5 3478.0" fill="none" data-name="RoutingIntentDispatch"></path>
+					<g data-name="DrawerEntry">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
+							<rect x="23459.8" y="1113.5" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
+							<path d="M23459.8 1144.5 L23904.8 1144.5" fill="none" data-name="DrawerEntry"></path>
+							<path d="M23459.8 1280.5 L23904.8 1280.5" fill="none" data-name="DrawerEntry"></path>
 						</g>
-						<g transform="translate(14171.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntentDispatch">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntentDispatch">
-								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntentDispatch">RoutingIntentDispatch</text>
+						<g transform="translate(23459.75, 1113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
+								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14171.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntentDispatch">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntentDispatch">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntentDispatch">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+go: RoutingIntentDispatch</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+push: RoutingIntentDispatch</text>
+						<g transform="translate(23459.75, 1144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DrawerEntry">+localizedHelpText: String Function()?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="DrawerEntry">+enabled: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="DrawerEntry">+onSelected: void Function(BuildContext, WidgetRef)?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="DrawerEntry">+autoCloseDrawer: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="DrawerEntry">+title: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="DrawerEntry">+helpText: String?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(23459.75, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RouterKeys">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouterKeys">
-							<rect x="38404.5" y="98.0" height="77.0" width="312.0" data-name="RouterKeys"></rect>
-							<path d="M38404.5 129.0 L38716.5 129.0" fill="none" data-name="RouterKeys"></path>
+					<g data-name="String Function()">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
+							<rect x="22486.3" y="1682.0" height="31.0" width="147.0" data-name="String Function()"></rect>
 						</g>
-						<g transform="translate(38404.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterKeys">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterKeys">
-								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterKeys">RouterKeys</text>
+						<g transform="translate(22486.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
+								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38404.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterKeys">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterKeys">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+studyKey: ValueKey&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+authKey: ValueKey&lt;String&gt;</text>
+					</g>
+					<g data-name="String Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
+							<rect x="23220.3" y="1682.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
+						</g>
+						<g transform="translate(23220.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
+								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ValueKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ValueKey">
-							<rect x="38515.0" y="614.0" height="31.0" width="91.0" data-name="ValueKey"></rect>
+					<g data-name="void Function(BuildContext, WidgetRef)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
+							<rect x="23417.3" y="1682.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
 						</g>
-						<g transform="translate(38515, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueKey">
-								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueKey">ValueKey</text>
+						<g transform="translate(23417.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
+								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RouteParams">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteParams">
-							<rect x="39171.5" y="75.5" height="122.0" width="267.0" data-name="RouteParams"></rect>
-							<path d="M39171.5 106.5 L39438.5 106.5" fill="none" data-name="RouteParams"></path>
+					<g data-name="GoRouterDrawerEntry">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
+							<rect x="24208.3" y="1643.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
+							<path d="M24208.3 1674.5 L24472.3 1674.5" fill="none" data-name="GoRouterDrawerEntry"></path>
+							<path d="M24208.3 1720.5 L24472.3 1720.5" fill="none" data-name="GoRouterDrawerEntry"></path>
 						</g>
-						<g transform="translate(39171.5, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteParams">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteParams">
-								<text x="125.5" y="13.5" stroke="none" text-anchor="middle" data-name="RouteParams">RouteParams</text>
+						<g transform="translate(24208.25, 1643.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
+								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39171.5, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteParams">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteParams">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studiesFilter: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteParams">&lt;static&gt;+measurementId: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteParams">&lt;static&gt;+interventionId: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RouteParams">&lt;static&gt;+testAppRoute: String</text>
+						<g transform="translate(24208.25, 1674.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(24208.25, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
+								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RouterConf">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouterConf">
-							<rect x="22033.0" y="2556.0" height="138.0" width="326.0" data-name="RouterConf"></rect>
-							<path d="M22033.0 2587.0 L22359.0 2587.0" fill="none" data-name="RouterConf"></path>
-							<path d="M22033.0 2663.0 L22359.0 2663.0" fill="none" data-name="RouterConf"></path>
+					<g data-name="RoutingIntent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
+							<rect x="29974.8" y="2518.5" height="213.0" width="297.0" data-name="RoutingIntent"></rect>
+							<path d="M29974.8 2549.5 L30271.8 2549.5" fill="none" data-name="RoutingIntent"></path>
+							<path d="M29974.8 2685.5 L30271.8 2685.5" fill="none" data-name="RoutingIntent"></path>
 						</g>
-						<g transform="translate(22033, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterConf">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterConf">RouterConf</text>
+						<g transform="translate(29974.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
+								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22033, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+router: GoRouter</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouterConf">&lt;static&gt;+routes: List&lt;GoRoute&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouterConf">&lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouterConf">&lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;</text>
+						<g transform="translate(29974.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">+route: GoRoute</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+params: Map&lt;String, String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntent">+queryParams: Map&lt;String, String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntent">+dispatch: RoutingIntentDispatch?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntent">+extra: Object?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntent">+routeName: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntent">+arguments: Map&lt;String, String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntent">+props: List&lt;Object?&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22033, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+GoRoute route()</text>
+						<g transform="translate(29974.75, 2685.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">-dynamic _validateRoute()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+bool matches()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="64028.3" y="3485.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
+					<g data-name="AppDrawer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
+							<rect x="20695.3" y="53.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
+							<path d="M20695.3 84.0 L20964.3 84.0" fill="none" data-name="AppDrawer"></path>
 						</g>
-						<g transform="translate(64028.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
+						<g transform="translate(20695.25, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
+								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
+								
+							</g>
+						</g>
+						<g transform="translate(20695.25, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppDrawer">+leftPaddingEntries: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AppDrawer">+logoPaddingVertical: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AppDrawer">+logoPaddingHorizontal: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="AppDrawer">+logoMaxHeight: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="AppDrawer">+logoSectionMinHeight: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="AppDrawer">+logoSectionMaxHeight: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="61589.3" y="1666.5" height="62.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
-							<path d="M61589.3 1697.5 L61773.3 1697.5" fill="none" data-name="StudyFormRouteArgs"></path>
+					<g data-name="StudyFormValidationSet">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
+							<rect x="3993.3" y="3462.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
+							<path d="M3993.3 3493.0 L4380.3 3493.0" fill="none" data-name="StudyFormValidationSet"></path>
 						</g>
-						<g transform="translate(61589.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
+						<g transform="translate(3993.25, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
+								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61589.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormRouteArgs">+studyId: String</text>
+						<g transform="translate(3993.25, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormRouteArgs">
-							<rect x="59486.5" y="2594.0" height="62.0" width="210.0" data-name="QuestionFormRouteArgs"></rect>
-							<path d="M59486.5 2625.0 L59696.5 2625.0" fill="none" data-name="QuestionFormRouteArgs"></path>
+					<g data-name="StudyFormScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
+							<rect x="24400.3" y="2563.5" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
+							<path d="M24400.3 2594.5 L24788.3 2594.5" fill="none" data-name="StudyFormScaffold"></path>
+							<path d="M24400.3 2655.5 L24788.3 2655.5" fill="none" data-name="StudyFormScaffold"></path>
 						</g>
-						<g transform="translate(59486.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormRouteArgs">
-								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormRouteArgs">QuestionFormRouteArgs</text>
+						<g transform="translate(24400.25, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
+								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59486.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormRouteArgs">+questionId: String</text>
+						<g transform="translate(24400.25, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ScreenerQuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormRouteArgs">
-							<rect x="58207.8" y="3485.0" height="31.0" width="282.0" data-name="ScreenerQuestionFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(58207.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormRouteArgs">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormRouteArgs">ScreenerQuestionFormRouteArgs</text>
+						<g transform="translate(24400.25, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormRouteArgs">
-							<rect x="60437.3" y="2594.0" height="62.0" width="239.0" data-name="ConsentItemFormRouteArgs"></rect>
-							<path d="M60437.3 2625.0 L60676.3 2625.0" fill="none" data-name="ConsentItemFormRouteArgs"></path>
-						</g>
-						<g transform="translate(60437.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormRouteArgs">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormRouteArgs">ConsentItemFormRouteArgs</text>
-								
-							</g>
+					<g data-name="T Function(WidgetRef)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
+							<rect x="24449.0" y="3485.0" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
 						</g>
-						<g transform="translate(60437.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormRouteArgs">+consentId: String</text>
+						<g transform="translate(24449, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="45441.0" y="2594.0" height="62.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
-							<path d="M45441.0 2625.0 L45688.0 2625.0" fill="none" data-name="MeasurementFormRouteArgs"></path>
+					<g data-name="Widget Function(T)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
+							<rect x="45922.5" y="3485.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
 						</g>
-						<g transform="translate(45441, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
+						<g transform="translate(45922.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45441, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementFormRouteArgs">+measurementId: String</text>
+					</g>
+					<g data-name="ConsumerWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
+							<rect x="27684.5" y="1197.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
+						</g>
+						<g transform="translate(27684.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormRouteArgs">
-							<rect x="50428.5" y="3469.5" height="62.0" width="265.0" data-name="SurveyQuestionFormRouteArgs"></rect>
-							<path d="M50428.5 3500.5 L50693.5 3500.5" fill="none" data-name="SurveyQuestionFormRouteArgs"></path>
+					<g data-name="StudyDesignEnrollmentFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
+							<rect x="53367.8" y="3454.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
+							<path d="M53367.8 3485.5 L53816.8 3485.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
 						</g>
-						<g transform="translate(50428.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormRouteArgs">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormRouteArgs">SurveyQuestionFormRouteArgs</text>
+						<g transform="translate(53367.75, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
+								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50428.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormRouteArgs">+questionId: String</text>
+						<g transform="translate(53367.75, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="44746.5" y="2594.0" height="62.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
-							<path d="M44746.5 2625.0 L44979.5 2625.0" fill="none" data-name="InterventionFormRouteArgs"></path>
+					<g data-name="StudyDesignPageWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
+							<rect x="54509.0" y="2594.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
+							<path d="M54509.0 2625.0 L54721.0 2625.0" fill="none" data-name="StudyDesignPageWidget"></path>
 						</g>
-						<g transform="translate(44746.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
+						<g transform="translate(54509, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
+								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44746.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormRouteArgs">+interventionId: String</text>
+						<g transform="translate(54509, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormRouteArgs">
-							<rect x="44727.5" y="3469.5" height="62.0" width="271.0" data-name="InterventionTaskFormRouteArgs"></rect>
-							<path d="M44727.5 3500.5 L44998.5 3500.5" fill="none" data-name="InterventionTaskFormRouteArgs"></path>
+					<g data-name="EnrollmentFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
+							<rect x="20527.0" y="2541.0" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
+							<path d="M20527.0 2572.0 L20981.0 2572.0" fill="none" data-name="EnrollmentFormData"></path>
+							<path d="M20527.0 2663.0 L20981.0 2663.0" fill="none" data-name="EnrollmentFormData"></path>
 						</g>
-						<g transform="translate(44727.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormRouteArgs">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormRouteArgs">InterventionTaskFormRouteArgs</text>
+						<g transform="translate(20527, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
+								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44727.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormRouteArgs">+taskId: String</text>
+						<g transform="translate(20527, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReportItemFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormRouteArgs">
-							<rect x="61743.3" y="2594.0" height="62.0" width="226.0" data-name="ReportItemFormRouteArgs"></rect>
-							<path d="M61743.3 2625.0 L61969.3 2625.0" fill="none" data-name="ReportItemFormRouteArgs"></path>
-						</g>
-						<g transform="translate(61743.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormRouteArgs">
-								<text x="105.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormRouteArgs">ReportItemFormRouteArgs</text>
+						<g transform="translate(20527, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61743.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormRouteArgs">+sectionId: String</text>
+					</g>
+					<g data-name="Participation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
+							<rect x="32045.0" y="3485.0" height="31.0" width="114.0" data-name="Participation"></rect>
+						</g>
+						<g transform="translate(32045, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
+								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DropdownMenuItemTheme">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DropdownMenuItemTheme">
-							<rect x="38936.0" y="598.5" height="62.0" width="258.0" data-name="DropdownMenuItemTheme"></rect>
-							<path d="M38936.0 629.5 L39194.0 629.5" fill="none" data-name="DropdownMenuItemTheme"></path>
+					<g data-name="QuestionnaireFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
+							<rect x="15615.3" y="3431.5" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
+							<path d="M15615.3 3462.5 L15983.3 3462.5" fill="none" data-name="QuestionnaireFormData"></path>
+							<path d="M15615.3 3508.5 L15983.3 3508.5" fill="none" data-name="QuestionnaireFormData"></path>
 						</g>
-						<g transform="translate(38936, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DropdownMenuItemTheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DropdownMenuItemTheme">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="DropdownMenuItemTheme">DropdownMenuItemTheme</text>
+						<g transform="translate(15615.25, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
+								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38936, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DropdownMenuItemTheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DropdownMenuItemTheme">
-								<text x="0.0" y="13.5" stroke="none" data-name="DropdownMenuItemTheme">+iconTheme: IconThemeData?</text>
+						<g transform="translate(15615.25, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IconThemeData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconThemeData">
-							<rect x="38994.5" y="1197.0" height="31.0" width="141.0" data-name="IconThemeData"></rect>
-						</g>
-						<g transform="translate(38994.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconThemeData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconThemeData">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconThemeData">IconThemeData</text>
+						<g transform="translate(15615.25, 3508.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Diagnosticable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Diagnosticable">
-							<rect x="38998.5" y="121.0" height="31.0" width="133.0" data-name="Diagnosticable"></rect>
+					<g data-name="IStudyFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
+							<rect x="21844.8" y="1666.5" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
+							<path d="M21844.8 1697.5 L21987.8 1697.5" fill="none" data-name="IStudyFormData"></path>
 						</g>
-						<g transform="translate(38998.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Diagnosticable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Diagnosticable">
-								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="Diagnosticable">Diagnosticable</text>
+						<g transform="translate(21844.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
+								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(21844.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ThemeConfig">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeConfig">
-							<rect x="39770.8" y="0.0" height="273.0" width="543.0" data-name="ThemeConfig"></rect>
-							<path d="M39770.8 31.0 L40313.8 31.0" fill="none" data-name="ThemeConfig"></path>
-							<path d="M39770.8 107.0 L40313.8 107.0" fill="none" data-name="ThemeConfig"></path>
+					<g data-name="EnrollmentFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
+							<rect x="63372.0" y="2376.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
+							<path d="M63372.0 2407.0 L64274.0 2407.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+							<path d="M63372.0 2633.0 L64274.0 2633.0" fill="none" data-name="EnrollmentFormViewModel"></path>
 						</g>
-						<g transform="translate(39770.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeConfig">
-								<text x="263.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeConfig">ThemeConfig</text>
+						<g transform="translate(63372, 2376)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
+								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39770.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMinContentWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMaxContentWidth: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kHoverFadeFactor: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMuteFadeFactor: double</text>
+						<g transform="translate(63372, 2407)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39770.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+dynamic bodyBackgroundColor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color modalBarrierColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color containerColor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color colorPickerInitialColor()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextMuted()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextBackground()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+double iconSplashRadius()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color sidesheetBackgroundColor()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()</text>
+						<g transform="translate(63372, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NoAnimationPageTransitionsBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NoAnimationPageTransitionsBuilder">
-							<rect x="39331.3" y="598.5" height="62.0" width="299.0" data-name="NoAnimationPageTransitionsBuilder"></rect>
-							<path d="M39331.3 629.5 L39630.3 629.5" fill="none" data-name="NoAnimationPageTransitionsBuilder"></path>
+					<g data-name="EnrollmentFormConsentItemDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
+							<rect x="58276.5" y="3394.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
+							<path d="M58276.5 3425.0 L59076.5 3425.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
+							<path d="M58276.5 3501.0 L59076.5 3501.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
 						</g>
-						<g transform="translate(39331.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NoAnimationPageTransitionsBuilder">
-								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="NoAnimationPageTransitionsBuilder">NoAnimationPageTransitionsBuilder</text>
+						<g transform="translate(58276.5, 3394)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39331.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NoAnimationPageTransitionsBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="NoAnimationPageTransitionsBuilder">+Widget buildTransitions()</text>
+						<g transform="translate(58276.5, 3425)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PageTransitionsBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsBuilder">
-							<rect x="39531.8" y="121.0" height="31.0" width="199.0" data-name="PageTransitionsBuilder"></rect>
-						</g>
-						<g transform="translate(39531.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PageTransitionsBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsBuilder">
-								<text x="91.5" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsBuilder">PageTransitionsBuilder</text>
+						<g transform="translate(58276.5, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WebTransitionBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebTransitionBuilder">
-							<rect x="39710.8" y="598.5" height="62.0" width="223.0" data-name="WebTransitionBuilder"></rect>
-							<path d="M39710.8 629.5 L39933.8 629.5" fill="none" data-name="WebTransitionBuilder"></path>
-						</g>
-						<g transform="translate(39710.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebTransitionBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebTransitionBuilder">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebTransitionBuilder">WebTransitionBuilder</text>
-								
-							</g>
+					<g data-name="WithQuestionnaireControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
+							<rect x="61129.5" y="1568.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
+							<path d="M61129.5 1599.5 L61761.5 1599.5" fill="none" data-name="WithQuestionnaireControls"></path>
+							<path d="M61129.5 1705.5 L61761.5 1705.5" fill="none" data-name="WithQuestionnaireControls"></path>
 						</g>
-						<g transform="translate(39710.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebTransitionBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebTransitionBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebTransitionBuilder">+Widget buildTransitions()</text>
+						<g transform="translate(61129.5, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
+								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ThemeSettingChange">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettingChange">
-							<rect x="39806.8" y="1666.5" height="62.0" width="216.0" data-name="ThemeSettingChange"></rect>
-							<path d="M39806.8 1697.5 L40022.8 1697.5" fill="none" data-name="ThemeSettingChange"></path>
-						</g>
-						<g transform="translate(39806.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettingChange">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettingChange">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettingChange">ThemeSettingChange</text>
+						<g transform="translate(61129.5, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39806.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettingChange">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettingChange">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettingChange">+settings: ThemeSettings</text>
+						<g transform="translate(61129.5, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ThemeSettings">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettings">
-							<rect x="37406.0" y="2586.5" height="77.0" width="227.0" data-name="ThemeSettings"></rect>
-							<path d="M37406.0 2617.5 L37633.0 2617.5" fill="none" data-name="ThemeSettings"></path>
+					<g data-name="IListActionProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
+							<rect x="75637.0" y="1174.0" height="77.0" width="179.0" data-name="IListActionProvider"></rect>
+							<path d="M75637.0 1205.0 L75816.0 1205.0" fill="none" data-name="IListActionProvider"></path>
 						</g>
-						<g transform="translate(37406, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettings">
-								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettings">ThemeSettings</text>
+						<g transform="translate(75637, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
+								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37406, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettings">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettings">+sourceColor: Color</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeSettings">+themeMode: ThemeMode</text>
+						<g transform="translate(75637, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IListActionProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IListActionProvider">
+								<text x="0.0" y="13.5" stroke="none" data-name="IListActionProvider">+void onSelectItem()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IListActionProvider">+void onNewItem()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Notification">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Notification">
-							<rect x="39862.8" y="1197.0" height="31.0" width="104.0" data-name="Notification"></rect>
+					<g data-name="IProviderArgsResolver">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
+							<rect x="48807.5" y="1181.5" height="62.0" width="193.0" data-name="IProviderArgsResolver"></rect>
+							<path d="M48807.5 1212.5 L49000.5 1212.5" fill="none" data-name="IProviderArgsResolver"></path>
 						</g>
-						<g transform="translate(39862.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Notification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notification">
-								<text x="44.0" y="13.5" stroke="none" text-anchor="middle" data-name="Notification">Notification</text>
+						<g transform="translate(48807.5, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
+								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
+								
+							</g>
+						</g>
+						<g transform="translate(48807.5, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IProviderArgsResolver">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IProviderArgsResolver">
+								<text x="0.0" y="13.5" stroke="none" data-name="IProviderArgsResolver">+R provide()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ThemeProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeProvider">
-							<rect x="40164.8" y="358.0" height="543.0" width="519.0" data-name="ThemeProvider"></rect>
-							<path d="M40164.8 389.0 L40683.8 389.0" fill="none" data-name="ThemeProvider"></path>
-							<path d="M40164.8 480.0 L40683.8 480.0" fill="none" data-name="ThemeProvider"></path>
+					<g data-name="ConsentItemFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
+							<rect x="12883.8" y="1613.5" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
+							<path d="M12883.8 1644.5 L13141.8 1644.5" fill="none" data-name="ConsentItemFormData"></path>
+							<path d="M12883.8 1735.5 L13141.8 1735.5" fill="none" data-name="ConsentItemFormData"></path>
 						</g>
-						<g transform="translate(40164.75, 358)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeProvider">
-								<text x="251.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeProvider">ThemeProvider</text>
+						<g transform="translate(12883.75, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
+								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40164.75, 389)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+settings: ValueNotifier&lt;ThemeSettings&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+lightDynamic: ColorScheme?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+darkDynamic: ColorScheme?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+pageTransitionsTheme: PageTransitionsTheme</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+shapeMedium: ShapeBorder</text>
+						<g transform="translate(12883.75, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40164.75, 480)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+Color custom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+Color blend()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+Color source()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+ColorScheme colors()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+CardTheme cardTheme()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ThemeProvider">+ListTileThemeData listTileTheme()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ThemeProvider">+AppBarTheme appBarTheme()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ThemeProvider">+SnackBarThemeData snackBarThemeData()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ThemeProvider">+TabBarTheme tabBarTheme()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ThemeProvider">+BottomAppBarTheme bottomAppBarTheme()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ThemeProvider">+BottomNavigationBarThemeData bottomNavigationBarTheme()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ThemeProvider">+SwitchThemeData switchTheme()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ThemeProvider">+InputDecorationTheme inputDecorationTheme()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ThemeProvider">+TextTheme textTheme()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ThemeProvider">+DividerThemeData dividerTheme()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ThemeProvider">+NavigationRailThemeData navigationRailTheme()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ThemeProvider">+DrawerThemeData drawerTheme()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ThemeProvider">+IconThemeData iconTheme()</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ThemeProvider">+CheckboxThemeData checkboxTheme()</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ThemeProvider">+RadioThemeData radioTheme()</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ThemeProvider">+TooltipThemeData tooltipTheme()</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ThemeProvider">+ThemeData light()</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ThemeProvider">+ThemeData dark()</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ThemeProvider">+ThemeMode themeMode()</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ThemeProvider">+ThemeData theme()</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ThemeProvider">&lt;static&gt;+ThemeProvider of()</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ThemeProvider">+bool updateShouldNotify()</text>
+						<g transform="translate(12883.75, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ValueNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ValueNotifier">
-							<rect x="40006.8" y="1197.0" height="31.0" width="117.0" data-name="ValueNotifier"></rect>
+					<g data-name="ConsentItemFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
+							<rect x="35900.5" y="2496.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
+							<path d="M35900.5 2527.0 L36596.5 2527.0" fill="none" data-name="ConsentItemFormViewModel"></path>
+							<path d="M35900.5 2693.0 L36596.5 2693.0" fill="none" data-name="ConsentItemFormViewModel"></path>
 						</g>
-						<g transform="translate(40006.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueNotifier">
-								<text x="50.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueNotifier">ValueNotifier</text>
+						<g transform="translate(35900.5, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ColorScheme">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ColorScheme">
-							<rect x="40163.8" y="1197.0" height="31.0" width="122.0" data-name="ColorScheme"></rect>
+						<g transform="translate(35900.5, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(40163.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ColorScheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ColorScheme">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="ColorScheme">ColorScheme</text>
+						<g transform="translate(35900.5, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PageTransitionsTheme">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsTheme">
-							<rect x="41059.5" y="1197.0" height="31.0" width="198.0" data-name="PageTransitionsTheme"></rect>
+					<g data-name="IScreenerQuestionLogicFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
+							<rect x="14827.3" y="2594.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
+							<path d="M14827.3 2625.0 L15159.3 2625.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
 						</g>
-						<g transform="translate(41059.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PageTransitionsTheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsTheme">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsTheme">PageTransitionsTheme</text>
+						<g transform="translate(14827.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
+								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ShapeBorder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ShapeBorder">
-							<rect x="41297.5" y="1197.0" height="31.0" width="120.0" data-name="ShapeBorder"></rect>
-						</g>
-						<g transform="translate(41297.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ShapeBorder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ShapeBorder">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="ShapeBorder">ShapeBorder</text>
+						<g transform="translate(14827.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InheritedWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InheritedWidget">
-							<rect x="40353.8" y="121.0" height="31.0" width="141.0" data-name="InheritedWidget"></rect>
+					<g data-name="ScreenerQuestionLogicFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
+							<rect x="72510.0" y="2556.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
+							<path d="M72510.0 2587.0 L72934.0 2587.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+							<path d="M72510.0 2618.0 L72934.0 2618.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
 						</g>
-						<g transform="translate(40353.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="InheritedWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InheritedWidget">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="InheritedWidget">InheritedWidget</text>
+						<g transform="translate(72510, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
+								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ThemeMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeMode">
-							<rect x="37746.0" y="3485.0" height="31.0" width="114.0" data-name="ThemeMode"></rect>
+						<g transform="translate(72510, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
+								
+							</g>
 						</g>
-						<g transform="translate(37746, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeMode">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeMode">ThemeMode</text>
+						<g transform="translate(72510, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CustomColor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomColor">
-							<rect x="24484.8" y="2563.5" height="123.0" width="128.0" data-name="CustomColor"></rect>
-							<path d="M24484.8 2594.5 L24612.8 2594.5" fill="none" data-name="CustomColor"></path>
-							<path d="M24484.8 2655.5 L24612.8 2655.5" fill="none" data-name="CustomColor"></path>
+					<g data-name="ScreenerQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
+							<rect x="43556.3" y="3334.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
+							<path d="M43556.3 3365.0 L44118.3 3365.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+							<path d="M43556.3 3546.0 L44118.3 3546.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(24484.75, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomColor">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomColor">CustomColor</text>
+						<g transform="translate(43556.25, 3334)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
+								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24484.75, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomColor">+color: Color</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomColor">+blend: bool</text>
+						<g transform="translate(43556.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24484.75, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+Color value()</text>
+						<g transform="translate(43556.25, 3546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SuppressedBehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SuppressedBehaviorSubject">
-							<rect x="16681.0" y="3774.5" height="138.0" width="388.0" data-name="SuppressedBehaviorSubject"></rect>
-							<path d="M16681.0 3805.5 L17069.0 3805.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
-							<path d="M16681.0 3866.5 L17069.0 3866.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
-						</g>
-						<g transform="translate(16681, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SuppressedBehaviorSubject">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="SuppressedBehaviorSubject">SuppressedBehaviorSubject</text>
-								
-							</g>
+					<g data-name="QuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
+							<rect x="36636.5" y="1956.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
+							<path d="M36636.5 1987.0 L37649.5 1987.0" fill="none" data-name="QuestionFormViewModel"></path>
+							<path d="M36636.5 3008.0 L37649.5 3008.0" fill="none" data-name="QuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(16681, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
-								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">+subject: BehaviorSubject&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+didSuppressInitialEvent: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SuppressedBehaviorSubject">-_controller: StreamController&lt;T&gt;</text>
+						<g transform="translate(36636.5, 1956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
+								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(16681, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
-								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">-StreamController&lt;T&gt; _buildDerivedController()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+dynamic close()</text>
+						<g transform="translate(36636.5, 1987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
+								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
+								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
+								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
+								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
+								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
+								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
+								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
+								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
+								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
+								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
+								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
+								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
+								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
+								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
+								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
+								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
+								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
+								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
+								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
+								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
+								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
+								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StreamController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
-							<rect x="14737.5" y="4118.5" height="31.0" width="149.0" data-name="StreamController"></rect>
-						</g>
-						<g transform="translate(14737.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
+						<g transform="translate(36636.5, 3008)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Time">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Time">
-							<rect x="40723.8" y="583.5" height="92.0" width="293.0" data-name="Time"></rect>
-							<path d="M40723.8 614.5 L41016.8 614.5" fill="none" data-name="Time"></path>
+					<g data-name="ConsentItemFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
+							<rect x="20523.5" y="1666.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
+							<path d="M20523.5 1697.5 L20904.5 1697.5" fill="none" data-name="ConsentItemFormView"></path>
 						</g>
-						<g transform="translate(40723.75, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Time">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Time">
-								<text x="138.5" y="13.5" stroke="none" text-anchor="middle" data-name="Time">Time</text>
+						<g transform="translate(20523.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
+								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40723.75, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Time">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Time">
-								<text x="0.0" y="13.5" stroke="none" data-name="Time">&lt;static&gt;+dynamic fromTimeOfDay()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Time">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Time">&lt;static&gt;+Time fromJson()</text>
+						<g transform="translate(20523.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimeOfDay">
-							<rect x="40818.8" y="121.0" height="31.0" width="103.0" data-name="TimeOfDay"></rect>
+					<g data-name="DataReferenceIdentifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
+							<rect x="19177.8" y="583.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
+							<path d="M19177.8 614.0 L19381.8 614.0" fill="none" data-name="DataReferenceIdentifier"></path>
+							<path d="M19177.8 645.0 L19381.8 645.0" fill="none" data-name="DataReferenceIdentifier"></path>
 						</g>
-						<g transform="translate(40818.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeOfDay">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeOfDay">TimeOfDay</text>
+						<g transform="translate(19177.75, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
+								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="TimeValueAccessor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimeValueAccessor">
-							<rect x="41056.8" y="583.5" height="92.0" width="297.0" data-name="TimeValueAccessor"></rect>
-							<path d="M41056.8 614.5 L41353.8 614.5" fill="none" data-name="TimeValueAccessor"></path>
-						</g>
-						<g transform="translate(41056.75, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeValueAccessor">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeValueAccessor">TimeValueAccessor</text>
+						<g transform="translate(19177.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41056.75, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimeValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimeValueAccessor">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimeValueAccessor">+String modelToViewValue()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TimeValueAccessor">+Time? viewToModelValue()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TimeValueAccessor">-String _addLeadingZeroIfNeeded()</text>
+						<g transform="translate(19177.75, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ControlValueAccessor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ControlValueAccessor">
-							<rect x="41109.8" y="121.0" height="31.0" width="191.0" data-name="ControlValueAccessor"></rect>
+					<g data-name="DataReference">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
+							<rect x="19212.3" y="121.0" height="31.0" width="135.0" data-name="DataReference"></rect>
 						</g>
-						<g transform="translate(41109.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ControlValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ControlValueAccessor">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="ControlValueAccessor">ControlValueAccessor</text>
+						<g transform="translate(19212.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
+								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ModelAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelAction">
-							<rect x="24652.8" y="2556.5" height="137.0" width="188.0" data-name="ModelAction"></rect>
-							<path d="M24652.8 2587.5 L24840.8 2587.5" fill="none" data-name="ModelAction"></path>
-						</g>
-						<g transform="translate(24652.75, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelAction">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelAction">ModelAction</text>
-								
-							</g>
+					<g data-name="AverageSectionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
+							<rect x="24634.3" y="1636.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
+							<path d="M24634.3 1667.0 L25113.3 1667.0" fill="none" data-name="AverageSectionFormView"></path>
+							<path d="M24634.3 1728.0 L25113.3 1728.0" fill="none" data-name="AverageSectionFormView"></path>
 						</g>
-						<g transform="translate(24652.75, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelAction">+type: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelAction">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelAction">+icon: IconData?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelAction">+onExecute: Function</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelAction">+isAvailable: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelAction">+isDestructive: bool</text>
+						<g transform="translate(24634.25, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="83485.3" y="105.5" height="62.0" width="403.0" data-name="IModelActionProvider"></rect>
-							<path d="M83485.3 136.5 L83888.3 136.5" fill="none" data-name="IModelActionProvider"></path>
-						</g>
-						<g transform="translate(83485.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
+						<g transform="translate(24634.25, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83485.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelActionProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelActionProvider">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+						<g transform="translate(24634.25, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="83092.5" y="1174.0" height="77.0" width="179.0" data-name="IListActionProvider"></rect>
-							<path d="M83092.5 1205.0 L83271.5 1205.0" fill="none" data-name="IListActionProvider"></path>
-						</g>
-						<g transform="translate(83092.5, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
+					<g data-name="ReportItemFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
+							<rect x="30663.3" y="2338.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
+							<path d="M30663.3 2369.5 L31650.3 2369.5" fill="none" data-name="ReportItemFormViewModel"></path>
+							<path d="M30663.3 2805.5 L31650.3 2805.5" fill="none" data-name="ReportItemFormViewModel"></path>
 						</g>
-						<g transform="translate(83092.5, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IListActionProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="IListActionProvider">+void onSelectItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IListActionProvider">+void onNewItem()</text>
+						<g transform="translate(30663.25, 2338.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
+								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ModelActionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelActionType">
-							<rect x="516.0" y="3417.0" height="167.0" width="334.0" data-name="ModelActionType"></rect>
-							<path d="M516.0 3448.0 L850.0 3448.0" fill="none" data-name="ModelActionType"></path>
-						</g>
-						<g transform="translate(516, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelActionType">
-								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelActionType">ModelActionType</text>
+						<g transform="translate(30663.25, 2369.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
+								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(516, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelActionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelActionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+values: List&lt;ModelActionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+edit: ModelActionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+delete: ModelActionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+remove: ModelActionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+duplicate: ModelActionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+clipboard: ModelActionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+primary: ModelActionType</text>
+						<g transform="translate(30663.25, 2805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="OptimisticUpdate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OptimisticUpdate">
-							<rect x="17318.5" y="3737.0" height="213.0" width="383.0" data-name="OptimisticUpdate"></rect>
-							<path d="M17318.5 3768.0 L17701.5 3768.0" fill="none" data-name="OptimisticUpdate"></path>
-							<path d="M17318.5 3904.0 L17701.5 3904.0" fill="none" data-name="OptimisticUpdate"></path>
+					<g data-name="TemporalAggregationFormatted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
+							<rect x="16273.5" y="2518.5" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
+							<path d="M16273.5 2549.5 L16721.5 2549.5" fill="none" data-name="TemporalAggregationFormatted"></path>
+							<path d="M16273.5 2655.5 L16721.5 2655.5" fill="none" data-name="TemporalAggregationFormatted"></path>
 						</g>
-						<g transform="translate(17318.5, 3737)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptimisticUpdate">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptimisticUpdate">OptimisticUpdate</text>
+						<g transform="translate(16273.5, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
+								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17318.5, 3768)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+applyOptimistic: void Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">+apply: dynamic Function()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="OptimisticUpdate">+rollback: void Function()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="OptimisticUpdate">+onUpdate: void Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="OptimisticUpdate">+onError: void Function(Object, StackTrace?)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="OptimisticUpdate">+rethrowErrors: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="OptimisticUpdate">+runOptimistically: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="OptimisticUpdate">+completeFutureOptimistically: bool</text>
+						<g transform="translate(16273.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(17318.5, 3904)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+dynamic execute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">-void _runUpdateHandlerIfAny()</text>
+						<g transform="translate(16273.5, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()">
-							<rect x="14926.5" y="4118.5" height="31.0" width="134.0" data-name="void Function()"></rect>
+					<g data-name="TemporalAggregation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
+							<rect x="14181.5" y="3485.0" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
 						</g>
-						<g transform="translate(14926.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()">void Function()</text>
+						<g transform="translate(14181.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
+								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(Object, StackTrace?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Object, StackTrace?)?">
-							<rect x="15100.5" y="4118.5" height="31.0" width="304.0" data-name="void Function(Object, StackTrace?)?"></rect>
+					<g data-name="ImprovementDirectionFormatted">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
+							<rect x="17050.3" y="2518.5" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
+							<path d="M17050.3 2549.5 L17501.3 2549.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
+							<path d="M17050.3 2655.5 L17501.3 2655.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
 						</g>
-						<g transform="translate(15100.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Object, StackTrace?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Object, StackTrace?)?">
-								<text x="144.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Object, StackTrace?)?">void Function(Object, StackTrace?)?</text>
+						<g transform="translate(17050.25, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
+								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FileFormatEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FileFormatEncoder">
-							<rect x="41468.8" y="90.5" height="92.0" width="216.0" data-name="FileFormatEncoder"></rect>
-							<path d="M41468.8 121.5 L41684.8 121.5" fill="none" data-name="FileFormatEncoder"></path>
-						</g>
-						<g transform="translate(41468.75, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FileFormatEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FileFormatEncoder">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="FileFormatEncoder">FileFormatEncoder</text>
+						<g transform="translate(17050.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41468.75, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FileFormatEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FileFormatEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="FileFormatEncoder">+dynamic encodeAsync()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FileFormatEncoder">+String encode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FileFormatEncoder">+dynamic call()</text>
+						<g transform="translate(17050.25, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CSVStringEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CSVStringEncoder">
-							<rect x="41393.8" y="598.5" height="62.0" width="162.0" data-name="CSVStringEncoder"></rect>
-							<path d="M41393.8 629.5 L41555.8 629.5" fill="none" data-name="CSVStringEncoder"></path>
-						</g>
-						<g transform="translate(41393.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CSVStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CSVStringEncoder">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="CSVStringEncoder">CSVStringEncoder</text>
-								
-							</g>
+					<g data-name="ImprovementDirection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
+							<rect x="17521.0" y="3485.0" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
 						</g>
-						<g transform="translate(41393.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CSVStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CSVStringEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="CSVStringEncoder">+String encode()</text>
+						<g transform="translate(17521, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
+								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="JsonStringEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JsonStringEncoder">
-							<rect x="41595.8" y="598.5" height="62.0" width="166.0" data-name="JsonStringEncoder"></rect>
-							<path d="M41595.8 629.5 L41761.8 629.5" fill="none" data-name="JsonStringEncoder"></path>
+					<g data-name="ReportSectionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
+							<rect x="11330.0" y="3447.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
+							<path d="M11330.0 3478.0 L11713.0 3478.0" fill="none" data-name="ReportSectionType"></path>
 						</g>
-						<g transform="translate(41595.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JsonStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonStringEncoder">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="JsonStringEncoder">JsonStringEncoder</text>
+						<g transform="translate(11330, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
+								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41595.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonStringEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonStringEncoder">+String encode()</text>
+						<g transform="translate(11330, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ExecutionLimiter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ExecutionLimiter">
-							<rect x="18293.8" y="3789.5" height="108.0" width="197.0" data-name="ExecutionLimiter"></rect>
-							<path d="M18293.8 3820.5 L18490.8 3820.5" fill="none" data-name="ExecutionLimiter"></path>
-							<path d="M18293.8 3866.5 L18490.8 3866.5" fill="none" data-name="ExecutionLimiter"></path>
+					<g data-name="DataReferenceEditor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
+							<rect x="17541.3" y="2556.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
+							<path d="M17541.3 2587.0 L18250.3 2587.0" fill="none" data-name="DataReferenceEditor"></path>
+							<path d="M17541.3 2648.0 L18250.3 2648.0" fill="none" data-name="DataReferenceEditor"></path>
 						</g>
-						<g transform="translate(18293.75, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ExecutionLimiter">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ExecutionLimiter">ExecutionLimiter</text>
+						<g transform="translate(17541.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
+								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18293.75, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
-								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+milliseconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ExecutionLimiter">&lt;static&gt;-_timer: Timer?</text>
+						<g transform="translate(17541.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18293.75, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
-								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+void dispose()</text>
+						<g transform="translate(17541.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
+								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Timer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Timer">
-							<rect x="15444.5" y="4118.5" height="31.0" width="60.0" data-name="Timer"></rect>
+					<g data-name="ReactiveDropdownField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
+							<rect x="18680.5" y="3485.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
 						</g>
-						<g transform="translate(15444.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timer">
-								<text x="22.0" y="13.5" stroke="none" text-anchor="middle" data-name="Timer">Timer</text>
+						<g transform="translate(18680.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
+								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Debouncer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="60210.8" y="4072.5" height="123.0" width="536.0" data-name="Debouncer"></rect>
-							<path d="M60210.8 4103.5 L60746.8 4103.5" fill="none" data-name="Debouncer"></path>
-							<path d="M60210.8 4164.5 L60746.8 4164.5" fill="none" data-name="Debouncer"></path>
+					<g data-name="LinearRegressionSectionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
+							<rect x="25153.3" y="1636.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
+							<path d="M25153.3 1667.0 L25632.3 1667.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+							<path d="M25153.3 1728.0 L25632.3 1728.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
 						</g>
-						<g transform="translate(60210.75, 4072.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
-								<text x="260.0" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
+						<g transform="translate(25153.25, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
+								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60210.75, 4103.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
-								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+leading: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Debouncer">+cancelUncompleted: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Debouncer">-_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?</text>
+						<g transform="translate(25153.25, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60210.75, 4164.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
-								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+dynamic call()</text>
+						<g transform="translate(25153.25, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CancelableOperation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="65854.3" y="4439.0" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
+					<g data-name="ReportItemFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
+							<rect x="22673.3" y="1613.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
+							<path d="M22673.3 1644.5 L23140.3 1644.5" fill="none" data-name="ReportItemFormView"></path>
+							<path d="M22673.3 1720.5 L23140.3 1720.5" fill="none" data-name="ReportItemFormView"></path>
 						</g>
-						<g transform="translate(65854.25, 4439)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
+						<g transform="translate(22673.25, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
+								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Throttler">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Throttler">
-							<rect x="40095.0" y="4103.0" height="62.0" width="136.0" data-name="Throttler"></rect>
-							<path d="M40095.0 4134.0 L40231.0 4134.0" fill="none" data-name="Throttler"></path>
-						</g>
-						<g transform="translate(40095, 4103)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Throttler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Throttler">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="Throttler">Throttler</text>
+						<g transform="translate(22673.25, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(40095, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Throttler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Throttler">
-								<text x="0.0" y="13.5" stroke="none" data-name="Throttler">+dynamic call()</text>
+						<g transform="translate(22673.25, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SerializableColor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SerializableColor">
-							<rect x="21412.8" y="3805.0" height="77.0" width="312.0" data-name="SerializableColor"></rect>
-							<path d="M21412.8 3836.0 L21724.8 3836.0" fill="none" data-name="SerializableColor"></path>
+					<g data-name="Widget Function(BuildContext)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
+							<rect x="42831.0" y="3485.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
 						</g>
-						<g transform="translate(21412.75, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SerializableColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SerializableColor">
-								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="SerializableColor">SerializableColor</text>
+						<g transform="translate(42831, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
+								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(21412.75, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SerializableColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SerializableColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="SerializableColor">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SerializableColor">&lt;static&gt;+SerializableColor fromJson()</text>
+					</g>
+					<g data-name="ReportItemFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
+							<rect x="13181.8" y="1628.5" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
+							<path d="M13181.8 1659.5 L13495.8 1659.5" fill="none" data-name="ReportItemFormData"></path>
+							<path d="M13181.8 1720.5 L13495.8 1720.5" fill="none" data-name="ReportItemFormData"></path>
+						</g>
+						<g transform="translate(13181.75, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
+								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="42585.8" y="1181.5" height="62.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-							<path d="M42585.8 1212.5 L42778.8 1212.5" fill="none" data-name="IProviderArgsResolver"></path>
-						</g>
-						<g transform="translate(42585.75, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
+						<g transform="translate(13181.75, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42585.75, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IProviderArgsResolver">
-								<text x="0.0" y="13.5" stroke="none" data-name="IProviderArgsResolver">+R provide()</text>
+						<g transform="translate(13181.75, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CombinedStreamNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CombinedStreamNotifier">
-							<rect x="41801.8" y="583.0" height="93.0" width="435.0" data-name="CombinedStreamNotifier"></rect>
-							<path d="M41801.8 614.0 L42236.8 614.0" fill="none" data-name="CombinedStreamNotifier"></path>
-							<path d="M41801.8 645.0 L42236.8 645.0" fill="none" data-name="CombinedStreamNotifier"></path>
+					<g data-name="ReportSection">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
+							<rect x="13274.8" y="2609.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
 						</g>
-						<g transform="translate(41801.75, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CombinedStreamNotifier">
-								<text x="209.5" y="13.5" stroke="none" text-anchor="middle" data-name="CombinedStreamNotifier">CombinedStreamNotifier</text>
+						<g transform="translate(13274.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
+								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41801.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">-_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
+					</g>
+					<g data-name="ReportsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
+							<rect x="64314.0" y="2451.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
+							<path d="M64314.0 2482.0 L65174.0 2482.0" fill="none" data-name="ReportsFormViewModel"></path>
+							<path d="M64314.0 2648.0 L65174.0 2648.0" fill="none" data-name="ReportsFormViewModel"></path>
+						</g>
+						<g transform="translate(64314, 2451)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
+								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41801.75, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">+void dispose()</text>
+						<g transform="translate(64314, 2482)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ChangeNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
-							<rect x="41952.3" y="121.0" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
-						</g>
-						<g transform="translate(41952.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
+						<g transform="translate(64314, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CountWhereValidator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CountWhereValidator">
-							<rect x="42276.8" y="553.0" height="153.0" width="383.0" data-name="CountWhereValidator"></rect>
-							<path d="M42276.8 584.0 L42659.8 584.0" fill="none" data-name="CountWhereValidator"></path>
-							<path d="M42276.8 675.0 L42659.8 675.0" fill="none" data-name="CountWhereValidator"></path>
-						</g>
-						<g transform="translate(42276.75, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CountWhereValidator">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="CountWhereValidator">CountWhereValidator</text>
-								
-							</g>
+					<g data-name="ReportFormItemDelegate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
+							<rect x="64888.3" y="1591.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
+							<path d="M64888.3 1622.0 L65731.3 1622.0" fill="none" data-name="ReportFormItemDelegate"></path>
+							<path d="M64888.3 1698.0 L65731.3 1698.0" fill="none" data-name="ReportFormItemDelegate"></path>
 						</g>
-						<g transform="translate(42276.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
-								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+predicate: bool Function(T?)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CountWhereValidator">+minCount: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CountWhereValidator">+maxCount: int?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMinCount: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMaxCount: String</text>
+						<g transform="translate(64888.25, 1591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
+								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42276.75, 675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
-								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+Map&lt;String, dynamic&gt;? validate()</text>
+						<g transform="translate(64888.25, 1622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="bool Function(T?)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="bool Function(T?)">
-							<rect x="42390.8" y="1197.0" height="31.0" width="155.0" data-name="bool Function(T?)"></rect>
-						</g>
-						<g transform="translate(42390.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="bool Function(T?)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="bool Function(T?)">
-								<text x="69.5" y="13.5" stroke="none" text-anchor="middle" data-name="bool Function(T?)">bool Function(T?)</text>
+						<g transform="translate(64888.25, 1698)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Validator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Validator">
-							<rect x="42425.3" y="121.0" height="31.0" width="86.0" data-name="Validator"></rect>
+					<g data-name="ReportBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
+							<rect x="19314.3" y="2556.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
+							<path d="M19314.3 2587.0 L19511.3 2587.0" fill="none" data-name="ReportBadge"></path>
+							<path d="M19314.3 2663.0 L19511.3 2663.0" fill="none" data-name="ReportBadge"></path>
 						</g>
-						<g transform="translate(42425.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Validator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Validator">
-								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="Validator">Validator</text>
+						<g transform="translate(19314.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Patterns">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Patterns">
-							<rect x="72659.0" y="90.5" height="92.0" width="287.0" data-name="Patterns"></rect>
-							<path d="M72659.0 121.5 L72946.0 121.5" fill="none" data-name="Patterns"></path>
-						</g>
-						<g transform="translate(72659, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Patterns">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Patterns">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="Patterns">Patterns</text>
+						<g transform="translate(19314.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72659, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Patterns">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Patterns">
-								<text x="0.0" y="13.5" stroke="none" data-name="Patterns">&lt;static&gt;+timeFormatString: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Patterns">&lt;static&gt;+emailFormatString: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Patterns">&lt;static&gt;+url: String</text>
+						<g transform="translate(19314.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="NumericalRangeFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NumericalRangeFormatter">
-							<rect x="43126.0" y="575.5" height="108.0" width="313.0" data-name="NumericalRangeFormatter"></rect>
-							<path d="M43126.0 606.5 L43439.0 606.5" fill="none" data-name="NumericalRangeFormatter"></path>
-							<path d="M43126.0 652.5 L43439.0 652.5" fill="none" data-name="NumericalRangeFormatter"></path>
+					<g data-name="ReportStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
+							<rect x="10357.0" y="3447.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
+							<path d="M10357.0 3478.0 L10658.0 3478.0" fill="none" data-name="ReportStatus"></path>
 						</g>
-						<g transform="translate(43126, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NumericalRangeFormatter">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="NumericalRangeFormatter">NumericalRangeFormatter</text>
+						<g transform="translate(10357, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
+								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43126, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+min: int?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NumericalRangeFormatter">+max: int?</text>
+						<g transform="translate(10357, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43126, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+TextEditingValue formatEditUpdate()</text>
+					</g>
+					<g data-name="BadgeType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
+							<rect x="32575.5" y="3432.0" height="137.0" width="288.0" data-name="BadgeType"></rect>
+							<path d="M32575.5 3463.0 L32863.5 3463.0" fill="none" data-name="BadgeType"></path>
+						</g>
+						<g transform="translate(32575.5, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
+								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="TextInputFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextInputFormatter">
-							<rect x="43376.0" y="121.0" height="31.0" width="166.0" data-name="TextInputFormatter"></rect>
-						</g>
-						<g transform="translate(43376, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TextInputFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextInputFormatter">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextInputFormatter">TextInputFormatter</text>
+						<g transform="translate(32575.5, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BadgeType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BadgeType">
+								<text x="0.0" y="13.5" stroke="none" data-name="BadgeType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BadgeType">&lt;static&gt;+values: List&lt;BadgeType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BadgeType">&lt;static&gt;+filled: BadgeType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlined: BadgeType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlineFill: BadgeType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="BadgeType">&lt;static&gt;+plain: BadgeType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudySequenceFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySequenceFormatter">
-							<rect x="43479.0" y="598.5" height="62.0" width="313.0" data-name="StudySequenceFormatter"></rect>
-							<path d="M43479.0 629.5 L43792.0 629.5" fill="none" data-name="StudySequenceFormatter"></path>
+					<g data-name="StudyDesignReportsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
+							<rect x="53856.8" y="3462.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
+							<path d="M53856.8 3493.0 L54249.8 3493.0" fill="none" data-name="StudyDesignReportsFormView"></path>
 						</g>
-						<g transform="translate(43479, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySequenceFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySequenceFormatter">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySequenceFormatter">StudySequenceFormatter</text>
+						<g transform="translate(53856.75, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
+								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43479, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySequenceFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySequenceFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySequenceFormatter">+TextEditingValue formatEditUpdate()</text>
+						<g transform="translate(53856.75, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Tuple">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Tuple">
-							<rect x="22399.0" y="2541.0" height="168.0" width="384.0" data-name="Tuple"></rect>
-							<path d="M22399.0 2572.0 L22783.0 2572.0" fill="none" data-name="Tuple"></path>
-							<path d="M22399.0 2633.0 L22783.0 2633.0" fill="none" data-name="Tuple"></path>
+					<g data-name="ReportsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
+							<rect x="21021.0" y="2563.5" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
+							<path d="M21021.0 2594.5 L21359.0 2594.5" fill="none" data-name="ReportsFormData"></path>
+							<path d="M21021.0 2640.5 L21359.0 2640.5" fill="none" data-name="ReportsFormData"></path>
 						</g>
-						<g transform="translate(22399, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Tuple">
-								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="Tuple">Tuple</text>
+						<g transform="translate(21021, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
+								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22399, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
-								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+first: T1</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">+second: T2</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+props: List&lt;Object?&gt;</text>
+						<g transform="translate(21021, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22399, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
-								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">&lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copy()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copyWith()</text>
+						<g transform="translate(21021, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="JsonFileLoader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JsonFileLoader">
-							<rect x="77468.5" y="75.0" height="123.0" width="319.0" data-name="JsonFileLoader"></rect>
-							<path d="M77468.5 106.0 L77787.5 106.0" fill="none" data-name="JsonFileLoader"></path>
-							<path d="M77468.5 137.0 L77787.5 137.0" fill="none" data-name="JsonFileLoader"></path>
+					<g data-name="StudyDesignInterventionsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
+							<rect x="54289.8" y="3469.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
+							<path d="M54289.8 3500.5 L54585.8 3500.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
 						</g>
-						<g transform="translate(77468.5, 75)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonFileLoader">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="JsonFileLoader">JsonFileLoader</text>
+						<g transform="translate(54289.75, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77468.5, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+jsonAssetsPath: String</text>
+						<g transform="translate(54289.75, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77468.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+dynamic loadJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonMapFromAssets()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonListFromAssets()</text>
+					</g>
+					<g data-name="StudyScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
+							<rect x="72762.0" y="1501.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
+							<path d="M72762.0 1532.0 L73520.0 1532.0" fill="none" data-name="StudyScheduleControls"></path>
+							<path d="M72762.0 1833.0 L73520.0 1833.0" fill="none" data-name="StudyScheduleControls"></path>
+						</g>
+						<g transform="translate(72762, 1501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
+								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IAppDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
-							<rect x="19658.5" y="3812.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
-							<path d="M19658.5 3843.5 L19855.5 3843.5" fill="none" data-name="IAppDelegate"></path>
-						</g>
-						<g transform="translate(19658.5, 3812.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
+						<g transform="translate(72762, 1532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(19658.5, 3843.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
+						<g transform="translate(72762, 1833)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
-							<rect x="77827.5" y="67.5" height="138.0" width="301.0" data-name="AppController"></rect>
-							<path d="M77827.5 98.5 L78128.5 98.5" fill="none" data-name="AppController"></path>
-							<path d="M77827.5 159.5 L78128.5 159.5" fill="none" data-name="AppController"></path>
+					<g data-name="PhaseSequence">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
+							<rect x="58951.8" y="3828.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
 						</g>
-						<g transform="translate(77827.5, 67.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
+						<g transform="translate(58951.75, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
+								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77827.5, 98.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
+					</g>
+					<g data-name="InterventionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
+							<rect x="23793.3" y="1666.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
+							<path d="M23793.3 1697.5 L24168.3 1697.5" fill="none" data-name="InterventionFormView"></path>
+						</g>
+						<g transform="translate(23793.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
+								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77827.5, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
+						<g transform="translate(23793.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyMonitorScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="28875.3" y="2594.0" height="62.0" width="176.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M28875.3 2625.0 L29051.3 2625.0" fill="none" data-name="StudyMonitorScreen"></path>
+					<g data-name="InterventionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
+							<rect x="60526.5" y="2391.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
+							<path d="M60526.5 2422.0 L61381.5 2422.0" fill="none" data-name="InterventionFormViewModel"></path>
+							<path d="M60526.5 2648.0 L61381.5 2648.0" fill="none" data-name="InterventionFormViewModel"></path>
 						</g>
-						<g transform="translate(28875.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
+						<g transform="translate(60526.5, 2391)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
+								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28875.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
+						<g transform="translate(60526.5, 2422)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								
+							</g>
+						</g>
+						<g transform="translate(60526.5, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="33543.0" y="1651.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
-							<path d="M33543.0 1682.0 L33707.0 1682.0" fill="none" data-name="StudyPageWidget"></path>
-							<path d="M33543.0 1713.0 L33707.0 1713.0" fill="none" data-name="StudyPageWidget"></path>
+					<g data-name="InterventionPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
+							<rect x="26517.3" y="1651.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
+							<path d="M26517.3 1682.0 L26847.3 1682.0" fill="none" data-name="InterventionPreview"></path>
+							<path d="M26517.3 1713.0 L26847.3 1713.0" fill="none" data-name="InterventionPreview"></path>
 						</g>
-						<g transform="translate(33543, 1651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
+						<g transform="translate(26517.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33543, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
+						<g transform="translate(26517.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33543, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
+						<g transform="translate(26517.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LoginForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
-							<rect x="11713.0" y="2578.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
-							<path d="M11713.0 2609.5 L11920.0 2609.5" fill="none" data-name="LoginForm"></path>
-							<path d="M11713.0 2640.5 L11920.0 2640.5" fill="none" data-name="LoginForm"></path>
+					<g data-name="InterventionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
+							<rect x="38517.5" y="2594.0" height="62.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
+							<path d="M38517.5 2625.0 L38750.5 2625.0" fill="none" data-name="InterventionFormRouteArgs"></path>
 						</g>
-						<g transform="translate(11713, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
+						<g transform="translate(38517.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11713, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
+						<g transform="translate(38517.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormRouteArgs">+interventionId: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(11713, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
+					</g>
+					<g data-name="StudyScheduleFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
+							<rect x="72961.5" y="1158.5" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
+							<path d="M72961.5 1189.5 L73320.5 1189.5" fill="none" data-name="StudyScheduleFormView"></path>
+							<path d="M72961.5 1220.5 L73320.5 1220.5" fill="none" data-name="StudyScheduleFormView"></path>
+						</g>
+						<g transform="translate(72961.5, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
+								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AuthFormKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
-							<rect x="14634.5" y="3417.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
-							<path d="M14634.5 3448.0 L14989.5 3448.0" fill="none" data-name="AuthFormKey"></path>
-						</g>
-						<g transform="translate(14634.5, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
-								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
+						<g transform="translate(72961.5, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(14634.5, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
+						<g transform="translate(72961.5, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PasswordRecoveryForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
-							<rect x="12467.3" y="2578.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
-							<path d="M12467.3 2609.5 L12675.3 2609.5" fill="none" data-name="PasswordRecoveryForm"></path>
-							<path d="M12467.3 2640.5 L12675.3 2640.5" fill="none" data-name="PasswordRecoveryForm"></path>
+					<g data-name="InterventionsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
+							<rect x="21399.0" y="2556.0" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
+							<path d="M21399.0 2587.0 L21793.0 2587.0" fill="none" data-name="InterventionsFormData"></path>
+							<path d="M21399.0 2648.0 L21793.0 2648.0" fill="none" data-name="InterventionsFormData"></path>
 						</g>
-						<g transform="translate(12467.25, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
+						<g transform="translate(21399, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
+								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12467.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
+						<g transform="translate(21399, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(12467.25, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
+						<g transform="translate(21399, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PasswordForgotForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
-							<rect x="13425.0" y="2578.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
-							<path d="M13425.0 2609.5 L13632.0 2609.5" fill="none" data-name="PasswordForgotForm"></path>
-							<path d="M13425.0 2640.5 L13632.0 2640.5" fill="none" data-name="PasswordForgotForm"></path>
+					<g data-name="StudyScheduleFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
+							<rect x="21566.5" y="3401.5" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
+							<path d="M21566.5 3432.5 L21862.5 3432.5" fill="none" data-name="StudyScheduleFormData"></path>
+							<path d="M21566.5 3538.5 L21862.5 3538.5" fill="none" data-name="StudyScheduleFormData"></path>
 						</g>
-						<g transform="translate(13425, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
+						<g transform="translate(21566.5, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
+								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13425, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
+						<g transform="translate(21566.5, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13425, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
+						<g transform="translate(21566.5, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SignupForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
-							<rect x="18358.3" y="2563.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
-							<path d="M18358.3 2594.5 L18636.3 2594.5" fill="none" data-name="SignupForm"></path>
-							<path d="M18358.3 2625.5 L18636.3 2625.5" fill="none" data-name="SignupForm"></path>
+					<g data-name="InterventionTaskFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
+							<rect x="59524.5" y="2488.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
+							<path d="M59524.5 2519.5 L60220.5 2519.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+							<path d="M59524.5 2700.5 L60220.5 2700.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
 						</g>
-						<g transform="translate(18358.25, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
-								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
+						<g transform="translate(59524.5, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18358.25, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
+						<g transform="translate(59524.5, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18358.25, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
+						<g transform="translate(59524.5, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
-							<rect x="29445.3" y="2564.0" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
-							<path d="M29445.3 2595.0 L29704.3 2595.0" fill="none" data-name="AuthScaffold"></path>
-						</g>
-						<g transform="translate(29445.25, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
-								
-							</g>
+					<g data-name="WithScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
+							<rect x="73560.0" y="1546.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
+							<path d="M73560.0 1577.0 L74055.0 1577.0" fill="none" data-name="WithScheduleControls"></path>
+							<path d="M73560.0 1803.0 L74055.0 1803.0" fill="none" data-name="WithScheduleControls"></path>
 						</g>
-						<g transform="translate(29445.25, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
+						<g transform="translate(73560, 1546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
+								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="EmailTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
-							<rect x="29744.3" y="2571.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
-							<path d="M29744.3 2602.5 L30065.3 2602.5" fill="none" data-name="EmailTextField"></path>
-						</g>
-						<g transform="translate(29744.25, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
+						<g transform="translate(73560, 1577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29744.25, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
+						<g transform="translate(73560, 1803)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="59258.3" y="3485.0" height="31.0" width="113.0" data-name="FormControl"></rect>
+					<g data-name="InterventionTaskFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
+							<rect x="13702.3" y="2541.0" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
+							<path d="M13702.3 2572.0 L13992.3 2572.0" fill="none" data-name="InterventionTaskFormData"></path>
+							<path d="M13702.3 2663.0 L13992.3 2663.0" fill="none" data-name="InterventionTaskFormData"></path>
 						</g>
-						<g transform="translate(59258.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
+						<g transform="translate(13702.25, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
+								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PasswordTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
-							<rect x="30105.3" y="2564.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
-							<path d="M30105.3 2595.0 L30584.3 2595.0" fill="none" data-name="PasswordTextField"></path>
-						</g>
-						<g transform="translate(30105.25, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
+						<g transform="translate(13702.25, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(30105.25, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
+						<g transform="translate(13702.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<rect x="29964.8" y="3485.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
+					<g data-name="IFormDataWithSchedule">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
+							<rect x="13993.0" y="1613.5" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
+							<path d="M13993.0 1644.5 L14291.0 1644.5" fill="none" data-name="IFormDataWithSchedule"></path>
+							<path d="M13993.0 1750.5 L14291.0 1750.5" fill="none" data-name="IFormDataWithSchedule"></path>
 						</g>
-						<g transform="translate(29964.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
+						<g transform="translate(13993, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
+								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyUJobsToBeDone">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
-							<rect x="78168.5" y="105.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
-							<path d="M78168.5 136.5 L78362.5 136.5" fill="none" data-name="StudyUJobsToBeDone"></path>
-						</g>
-						<g transform="translate(78168.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
+						<g transform="translate(13993, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78168.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
+						<g transform="translate(13993, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
+								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthFormController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
-							<rect x="43407.0" y="2368.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
-							<path d="M43407.0 2399.5 L44257.0 2399.5" fill="none" data-name="AuthFormController"></path>
-							<path d="M43407.0 2655.5 L44257.0 2655.5" fill="none" data-name="AuthFormController"></path>
+					<g data-name="InterventionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
+							<rect x="13535.8" y="1598.5" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
+							<path d="M13535.8 1629.5 L13917.8 1629.5" fill="none" data-name="InterventionFormData"></path>
+							<path d="M13535.8 1750.5 L13917.8 1750.5" fill="none" data-name="InterventionFormData"></path>
 						</g>
-						<g transform="translate(43407, 2368.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
-								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
+						<g transform="translate(13535.75, 1598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
+								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43407, 2399.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
+						<g transform="translate(13535.75, 1629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(43407, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
+						<g transform="translate(13535.75, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="72971.8" y="4020.0" height="228.0" width="295.0" data-name="IAuthRepository"></rect>
-							<path d="M72971.8 4051.0 L73266.8 4051.0" fill="none" data-name="IAuthRepository"></path>
-							<path d="M72971.8 4142.0 L73266.8 4142.0" fill="none" data-name="IAuthRepository"></path>
+					<g data-name="InterventionsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
+							<rect x="67065.0" y="2436.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
+							<path d="M67065.0 2467.0 L67904.0 2467.0" fill="none" data-name="InterventionsFormViewModel"></path>
+							<path d="M67065.0 2618.0 L67904.0 2618.0" fill="none" data-name="InterventionsFormViewModel"></path>
 						</g>
-						<g transform="translate(72971.75, 4020)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
+						<g transform="translate(67065, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
+								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72971.75, 4051)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+allowPasswordReset: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+currentUser: User?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+isLoggedIn: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+session: Session?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+serializedSession: String?</text>
+						<g transform="translate(67065, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72971.75, 4142)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+dynamic signUp()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+dynamic signInWith()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+dynamic signOut()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+dynamic updateUser()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IAuthRepository">+void dispose()</text>
+						<g transform="translate(67065, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="61341.3" y="3485.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
+					<g data-name="InterventionTaskFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
+							<rect x="25672.3" y="1666.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
+							<path d="M25672.3 1697.5 L26085.3 1697.5" fill="none" data-name="InterventionTaskFormView"></path>
 						</g>
-						<g transform="translate(61341.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
+						<g transform="translate(25672.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(25672.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormGroupController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="47019.5" y="105.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
-							<path d="M47019.5 136.5 L47206.5 136.5" fill="none" data-name="IFormGroupController"></path>
+					<g data-name="StudyDesignInfoFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
+							<rect x="54772.8" y="3469.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
+							<path d="M54772.8 3500.5 L54995.8 3500.5" fill="none" data-name="StudyDesignInfoFormView"></path>
 						</g>
-						<g transform="translate(47019.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
-								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
+						<g transform="translate(54772.75, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
+								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47019.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
+						<g transform="translate(54772.75, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
-							<rect x="940.0" y="3447.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
-							<path d="M940.0 3478.0 L1219.0 3478.0" fill="none" data-name="AppStatus"></path>
+					<g data-name="StudyInfoFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
+							<rect x="21873.0" y="2541.0" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
+							<path d="M21873.0 2572.0 L22287.0 2572.0" fill="none" data-name="StudyInfoFormData"></path>
+							<path d="M21873.0 2663.0 L22287.0 2663.0" fill="none" data-name="StudyInfoFormData"></path>
 						</g>
-						<g transform="translate(940, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
+						<g transform="translate(21873, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
+								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(940, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
+						<g transform="translate(21873, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
+								
+							</g>
+						</g>
+						<g transform="translate(21873, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormArrayTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
-							<rect x="31066.5" y="2428.5" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
-							<path d="M31066.5 2459.5 L31556.5 2459.5" fill="none" data-name="FormArrayTable"></path>
-							<path d="M31066.5 2760.5 L31556.5 2760.5" fill="none" data-name="FormArrayTable"></path>
+					<g data-name="StudyContactInfoFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
+							<rect x="22029.5" y="3386.5" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
+							<path d="M22029.5 3417.5 L22377.5 3417.5" fill="none" data-name="StudyContactInfoFormData"></path>
+							<path d="M22029.5 3568.5 L22377.5 3568.5" fill="none" data-name="StudyContactInfoFormData"></path>
 						</g>
-						<g transform="translate(31066.5, 2428.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
-								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
+						<g transform="translate(22029.5, 3386.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
+								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31066.5, 2459.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
+						<g transform="translate(22029.5, 3417.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31066.5, 2760.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
+						<g transform="translate(22029.5, 3568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<rect x="30425.0" y="3485.0" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
+					<g data-name="StudyInfoFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
+							<rect x="69116.0" y="2383.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
+							<path d="M69116.0 2414.5 L69812.0 2414.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+							<path d="M69116.0 2820.5 L69812.0 2820.5" fill="none" data-name="StudyInfoFormViewModel"></path>
 						</g>
-						<g transform="translate(30425, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
+						<g transform="translate(69116, 2383.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="String Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
-							<rect x="30876.0" y="3485.0" height="31.0" width="157.0" data-name="String Function(T)"></rect>
+						<g transform="translate(69116, 2414.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
+								
+							</g>
 						</g>
-						<g transform="translate(30876, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
+						<g transform="translate(69116, 2820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Widget Function(BuildContext, T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
-							<rect x="31526.0" y="3485.0" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
+					<g data-name="ScheduleControls">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
+							<rect x="73591.5" y="1158.5" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
+							<path d="M73591.5 1189.5 L74023.5 1189.5" fill="none" data-name="ScheduleControls"></path>
+							<path d="M73591.5 1220.5 L74023.5 1220.5" fill="none" data-name="ScheduleControls"></path>
 						</g>
-						<g transform="translate(31526, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
-								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
+						<g transform="translate(73591.5, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
+								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="58975.8" y="1666.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
-							<path d="M58975.8 1697.5 L59371.8 1697.5" fill="none" data-name="ManagedFormViewModel"></path>
-						</g>
-						<g transform="translate(58975.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
+						<g transform="translate(73591.5, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
 								
 							</g>
 						</g>
-						<g transform="translate(58975.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
+						<g transform="translate(73591.5, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="68299.0" y="313.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
-							<path d="M68299.0 344.0 L69171.0 344.0" fill="none" data-name="FormViewModel"></path>
-							<path d="M68299.0 660.0 L69171.0 660.0" fill="none" data-name="FormViewModel"></path>
+					<g data-name="StudyUTimeOfDay">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
+							<rect x="14032.3" y="2609.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
 						</g>
-						<g transform="translate(68299, 313)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
+						<g transform="translate(14032.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
+								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68299, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+					</g>
+					<g data-name="SurveyQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
+							<rect x="26125.3" y="1659.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
+							<path d="M26125.3 1690.0 L26477.3 1690.0" fill="none" data-name="SurveyQuestionFormView"></path>
+						</g>
+						<g transform="translate(26125.25, 1659)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68299, 660)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
+						<g transform="translate(26125.25, 1690)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
-							<rect x="72520.8" y="614.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
+					<g data-name="AudioRecordingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
+							<rect x="26887.3" y="1651.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
+							<path d="M26887.3 1682.0 L27239.3 1682.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+							<path d="M26887.3 1713.0 L27239.3 1713.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
 						</g>
-						<g transform="translate(72520.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
+						<g transform="translate(26887.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Exception">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="75456.5" y="121.0" height="31.0" width="94.0" data-name="Exception"></rect>
+						<g transform="translate(26887.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
 						</g>
-						<g transform="translate(75456.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
+						<g transform="translate(26887.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="65717.8" y="3707.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
-							<path d="M65717.8 3738.0 L65998.8 3738.0" fill="none" data-name="FormViewModelCollection"></path>
-							<path d="M65717.8 3829.0 L65998.8 3829.0" fill="none" data-name="FormViewModelCollection"></path>
+					<g data-name="FreeTextQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
+							<rect x="27279.3" y="1628.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
+							<path d="M27279.3 1659.5 L27631.3 1659.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+							<path d="M27279.3 1705.5 L27631.3 1705.5" fill="none" data-name="FreeTextQuestionFormView"></path>
 						</g>
-						<g transform="translate(65717.75, 3707)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
+						<g transform="translate(27279.25, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65717.75, 3738)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
+						<g transform="translate(27279.25, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65717.75, 3829)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
+						<g transform="translate(27279.25, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="61689.0" y="4118.5" height="31.0" width="98.0" data-name="FormArray"></rect>
+					<g data-name="ChoiceQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
+							<rect x="27671.3" y="1651.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
+							<path d="M27671.3 1682.0 L28023.3 1682.0" fill="none" data-name="ChoiceQuestionFormView"></path>
+							<path d="M27671.3 1713.0 L28023.3 1713.0" fill="none" data-name="ChoiceQuestionFormView"></path>
 						</g>
-						<g transform="translate(61689, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
+						<g transform="translate(27671.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
+								
+							</g>
+						</g>
+						<g transform="translate(27671.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
+						</g>
+						<g transform="translate(27671.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="CustomFormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
-							<rect x="59108.3" y="3759.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
-							<path d="M59108.3 3790.5 L59521.3 3790.5" fill="none" data-name="CustomFormControl"></path>
-							<path d="M59108.3 3896.5 L59521.3 3896.5" fill="none" data-name="CustomFormControl"></path>
+					<g data-name="ImageCapturingQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
+							<rect x="28063.3" y="1651.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
+							<path d="M28063.3 1682.0 L28415.3 1682.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+							<path d="M28063.3 1713.0 L28415.3 1713.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
 						</g>
-						<g transform="translate(59108.25, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
+						<g transform="translate(28063.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59108.25, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
+						<g transform="translate(28063.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59108.25, 3896.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
+						<g transform="translate(28063.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(T?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
-							<rect x="60887.0" y="4118.5" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
+					<g data-name="BoolQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
+							<rect x="28847.3" y="1651.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
+							<path d="M28847.3 1682.0 L29199.3 1682.0" fill="none" data-name="BoolQuestionFormView"></path>
+							<path d="M28847.3 1713.0 L29199.3 1713.0" fill="none" data-name="BoolQuestionFormView"></path>
 						</g>
-						<g transform="translate(60887, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
+						<g transform="translate(28847.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(ControlStatus)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
-							<rect x="61384.3" y="4118.5" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
+						<g transform="translate(28847.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+								
+							</g>
 						</g>
-						<g transform="translate(61384.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
+						<g transform="translate(28847.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="UnsavedChangesDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
-							<rect x="79433.8" y="105.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
-							<path d="M79433.8 136.5 L79640.8 136.5" fill="none" data-name="UnsavedChangesDialog"></path>
+					<g data-name="SurveyQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
+							<rect x="16466.3" y="3417.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
+							<path d="M16466.3 3448.0 L16829.3 3448.0" fill="none" data-name="SurveyQuestionType"></path>
 						</g>
-						<g transform="translate(79433.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
+						<g transform="translate(16466.25, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
+								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79433.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
+						<g transform="translate(16466.25, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormValidationSetEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
-							<rect x="60170.8" y="1197.0" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
+					<g data-name="IScaleQuestionFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
+							<rect x="21485.3" y="105.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
+							<path d="M21485.3 136.5 L21794.3 136.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
 						</g>
-						<g transform="translate(60170.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
-								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
+						<g transform="translate(21485.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
+								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormControlValidation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
-							<rect x="32866.0" y="2556.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
-							<path d="M32866.0 2587.0 L33351.0 2587.0" fill="none" data-name="FormControlValidation"></path>
-							<path d="M32866.0 2663.0 L33351.0 2663.0" fill="none" data-name="FormControlValidation"></path>
-						</g>
-						<g transform="translate(32866, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
-								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
+						<g transform="translate(21485.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32866, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
+					</g>
+					<g data-name="ScaleQuestionFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
+							<rect x="28455.3" y="1666.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
+							<path d="M28455.3 1697.5 L28807.3 1697.5" fill="none" data-name="ScaleQuestionFormView"></path>
+						</g>
+						<g transform="translate(28455.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32866, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
+						<g transform="translate(28455.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="50917.0" y="1166.0" height="93.0" width="163.0" data-name="IFormData"></rect>
-							<path d="M50917.0 1197.0 L51080.0 1197.0" fill="none" data-name="IFormData"></path>
-							<path d="M50917.0 1228.0 L51080.0 1228.0" fill="none" data-name="IFormData"></path>
+					<g data-name="QuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
+							<rect x="17034.0" y="1568.5" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
+							<path d="M17034.0 1599.5 L18202.0 1599.5" fill="none" data-name="QuestionFormData"></path>
+							<path d="M17034.0 1735.5 L18202.0 1735.5" fill="none" data-name="QuestionFormData"></path>
 						</g>
-						<g transform="translate(50917, 1166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
+						<g transform="translate(17034, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
+								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50917, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
+						<g transform="translate(17034, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50917, 1228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
+						<g transform="translate(17034, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FormInvalidException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
-							<rect x="74359.3" y="614.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
+					<g data-name="ChoiceQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
+							<rect x="15457.5" y="2541.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
+							<path d="M15457.5 2572.0 L15801.5 2572.0" fill="none" data-name="ChoiceQuestionFormData"></path>
+							<path d="M15457.5 2633.0 L15801.5 2633.0" fill="none" data-name="ChoiceQuestionFormData"></path>
 						</g>
-						<g transform="translate(74359.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
+						<g transform="translate(15457.5, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormConfigException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
-							<rect x="74585.3" y="598.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
-							<path d="M74585.3 629.5 L74770.3 629.5" fill="none" data-name="FormConfigException"></path>
-						</g>
-						<g transform="translate(74585.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
-								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
+						<g transform="translate(15457.5, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(74585.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
+						<g transform="translate(15457.5, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="67477.5" y="1174.0" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-							<path d="M67477.5 1205.0 L67694.5 1205.0" fill="none" data-name="IFormViewModelDelegate"></path>
+					<g data-name="BoolQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
+							<rect x="15841.5" y="2556.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
+							<path d="M15841.5 2587.0 L16233.5 2587.0" fill="none" data-name="BoolQuestionFormData"></path>
+							<path d="M15841.5 2633.0 L16233.5 2633.0" fill="none" data-name="BoolQuestionFormData"></path>
 						</g>
-						<g transform="translate(67477.5, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
+						<g transform="translate(15841.5, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
+								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(67477.5, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
+						<g transform="translate(15841.5, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormControlOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
-							<rect x="22823.0" y="2571.5" height="107.0" width="190.0" data-name="FormControlOption"></rect>
-							<path d="M22823.0 2602.5 L23013.0 2602.5" fill="none" data-name="FormControlOption"></path>
-						</g>
-						<g transform="translate(22823, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
+						<g transform="translate(15841.5, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(22823, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
+					</g>
+					<g data-name="ImageQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
+							<rect x="18290.3" y="2556.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
+							<path d="M18290.3 2587.0 L18762.3 2587.0" fill="none" data-name="ImageQuestionFormData"></path>
+							<path d="M18290.3 2633.0 L18762.3 2633.0" fill="none" data-name="ImageQuestionFormData"></path>
+						</g>
+						<g transform="translate(18290.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="FormMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
-							<rect x="25140.0" y="3439.5" height="122.0" width="282.0" data-name="FormMode"></rect>
-							<path d="M25140.0 3470.5 L25422.0 3470.5" fill="none" data-name="FormMode"></path>
-						</g>
-						<g transform="translate(25140, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
+						<g transform="translate(18290.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25140, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
+						<g transform="translate(18290.25, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrolledBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="79680.8" y="90.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M79680.8 121.0 L79846.8 121.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M79680.8 152.0 L79846.8 152.0" fill="none" data-name="EnrolledBadge"></path>
+					<g data-name="AudioQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
+							<rect x="18802.3" y="2548.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
+							<path d="M18802.3 2579.5 L19274.3 2579.5" fill="none" data-name="AudioQuestionFormData"></path>
+							<path d="M18802.3 2640.5 L19274.3 2640.5" fill="none" data-name="AudioQuestionFormData"></path>
 						</g>
-						<g transform="translate(79680.75, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
+						<g transform="translate(18802.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
+								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79680.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
+						<g transform="translate(18802.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79680.75, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
+						<g transform="translate(18802.25, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRecruitController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="75351.5" y="1121.0" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M75351.5 1152.0 L76002.5 1152.0" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M75351.5 1198.0 L76002.5 1198.0" fill="none" data-name="StudyRecruitController"></path>
+					<g data-name="ScaleQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
+							<rect x="19551.3" y="2481.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
+							<path d="M19551.3 2512.0 L19895.3 2512.0" fill="none" data-name="ScaleQuestionFormData"></path>
+							<path d="M19551.3 2708.0 L19895.3 2708.0" fill="none" data-name="ScaleQuestionFormData"></path>
 						</g>
-						<g transform="translate(75351.5, 1121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
-								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
+						<g transform="translate(19551.25, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
+								
+							</g>
+						</g>
+						<g transform="translate(19551.25, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75351.5, 1152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
+						<g transform="translate(19551.25, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(75351.5, 1198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
+					</g>
+					<g data-name="FreeTextQuestionFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
+							<rect x="19935.3" y="2541.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
+							<path d="M19935.3 2572.0 L20279.3 2572.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+							<path d="M19935.3 2648.0 L20279.3 2648.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+						</g>
+						<g transform="translate(19935.25, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IInviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="81834.0" y="1666.5" height="62.0" width="265.0" data-name="IInviteCodeRepository"></rect>
-							<path d="M81834.0 1697.5 L82099.0 1697.5" fill="none" data-name="IInviteCodeRepository"></path>
-						</g>
-						<g transform="translate(81834, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
+						<g transform="translate(19935.25, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81834, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IInviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IInviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
+						<g transform="translate(19935.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="71898.3" y="3485.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
+					<g data-name="FreeTextQuestionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
+							<rect x="20009.3" y="3485.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
 						</g>
-						<g transform="translate(71898.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
+						<g transform="translate(20009.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
+								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyBaseController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="73001.3" y="538.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
-							<path d="M73001.3 569.0 L73547.3 569.0" fill="none" data-name="StudyBaseController"></path>
-							<path d="M73001.3 645.0 L73547.3 645.0" fill="none" data-name="StudyBaseController"></path>
+					<g data-name="StudyFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
+							<rect x="67731.0" y="1516.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
+							<path d="M67731.0 1547.0 L68427.0 1547.0" fill="none" data-name="StudyFormViewModel"></path>
+							<path d="M67731.0 1758.0 L68427.0 1758.0" fill="none" data-name="StudyFormViewModel"></path>
 						</g>
-						<g transform="translate(73001.25, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
-								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
+						<g transform="translate(67731, 1516)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73001.25, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
+						<g transform="translate(67731, 1547)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73001.25, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
+						<g transform="translate(67731, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRecruitScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="29091.3" y="2571.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M29091.3 2602.5 L29405.3 2602.5" fill="none" data-name="StudyRecruitScreen"></path>
+					<g data-name="MeasurementsFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
+							<rect x="67944.0" y="2443.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
+							<path d="M67944.0 2474.5 L69036.0 2474.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+							<path d="M67944.0 2625.5 L69036.0 2625.5" fill="none" data-name="MeasurementsFormViewModel"></path>
 						</g>
-						<g transform="translate(29091.25, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
+						<g transform="translate(67944, 2443.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
+								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29091.25, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
+						<g transform="translate(67944, 2474.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InviteCodeFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
-							<rect x="80897.0" y="575.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
-							<path d="M80897.0 606.5 L81335.0 606.5" fill="none" data-name="InviteCodeFormView"></path>
-							<path d="M80897.0 637.5 L81335.0 637.5" fill="none" data-name="InviteCodeFormView"></path>
-						</g>
-						<g transform="translate(80897, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
-								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
+						<g transform="translate(67944, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80897, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
+					</g>
+					<g data-name="StudyDesignMeasurementsFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
+							<rect x="55035.8" y="3469.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
+							<path d="M55035.8 3500.5 L55345.8 3500.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
+						</g>
+						<g transform="translate(55035.75, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
+								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80897, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
+						<g transform="translate(55035.75, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="72890.5" y="1023.5" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M72890.5 1054.5 L73557.5 1054.5" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M72890.5 1280.5 L73557.5 1280.5" fill="none" data-name="InviteCodeFormViewModel"></path>
+					<g data-name="MeasurementsFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
+							<rect x="22367.0" y="2563.5" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
+							<path d="M22367.0 2594.5 L22861.0 2594.5" fill="none" data-name="MeasurementsFormData"></path>
+							<path d="M22367.0 2640.5 L22861.0 2640.5" fill="none" data-name="MeasurementsFormData"></path>
 						</g>
-						<g transform="translate(72890.5, 1023.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
-								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
+						<g transform="translate(22367, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
+								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72890.5, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
+						<g transform="translate(22367, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72890.5, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
+						<g transform="translate(22367, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInvitesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="78402.5" y="45.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M78402.5 76.0 L78968.5 76.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M78402.5 182.0 L78968.5 182.0" fill="none" data-name="StudyInvitesTable"></path>
+					<g data-name="SurveyPreview">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
+							<rect x="29239.3" y="1651.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
+							<path d="M29239.3 1682.0 L29583.3 1682.0" fill="none" data-name="SurveyPreview"></path>
+							<path d="M29239.3 1713.0 L29583.3 1713.0" fill="none" data-name="SurveyPreview"></path>
 						</g>
-						<g transform="translate(78402.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
-								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
+						<g transform="translate(29239.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
+								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78402.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
+						<g transform="translate(29239.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(78402.5, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
+						<g transform="translate(29239.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="77874.3" y="614.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
+					<g data-name="MeasurementFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
+							<rect x="39083.5" y="2594.0" height="62.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
+							<path d="M39083.5 2625.0 L39330.5 2625.0" fill="none" data-name="MeasurementFormRouteArgs"></path>
 						</g>
-						<g transform="translate(77874.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
+						<g transform="translate(39083.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
+								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="78136.3" y="614.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(78136.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
+						<g transform="translate(39083.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementFormRouteArgs">+measurementId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Intervention? Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="78596.3" y="614.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
+					<g data-name="MeasurementSurveyFormViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
+							<rect x="62596.0" y="2413.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
+							<path d="M62596.0 2444.5 L63292.0 2444.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+							<path d="M62596.0 2670.5 L63292.0 2670.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
 						</g>
-						<g transform="translate(78596.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
+						<g transform="translate(62596, 2413.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
+								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="int Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="78904.0" y="614.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
+						<g transform="translate(62596, 2444.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(78904, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
+						<g transform="translate(62596, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PublishSuccessDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
-							<rect x="30624.3" y="2594.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
-							<path d="M30624.3 2625.0 L30815.3 2625.0" fill="none" data-name="PublishSuccessDialog"></path>
-						</g>
-						<g transform="translate(30624.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
-								
-							</g>
+					<g data-name="MeasurementSurveyFormData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
+							<rect x="14232.3" y="2526.0" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
+							<path d="M14232.3 2557.0 L14641.3 2557.0" fill="none" data-name="MeasurementSurveyFormData"></path>
+							<path d="M14232.3 2678.0 L14641.3 2678.0" fill="none" data-name="MeasurementSurveyFormData"></path>
 						</g>
-						<g transform="translate(30624.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
+						<g transform="translate(14232.25, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
+								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="PublishDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
-							<rect x="33391.0" y="2594.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
-							<path d="M33391.0 2625.0 L33527.0 2625.0" fill="none" data-name="PublishDialog"></path>
-						</g>
-						<g transform="translate(33391, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
+						<g transform="translate(14232.25, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33391, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
+						<g transform="translate(14232.25, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PublishConfirmationDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
-							<rect x="33567.0" y="2594.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
-							<path d="M33567.0 2625.0 L33791.0 2625.0" fill="none" data-name="PublishConfirmationDialog"></path>
+					<g data-name="MeasurementSurveyFormView">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
+							<rect x="29663.3" y="1666.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
+							<path d="M29663.3 1697.5 L30107.3 1697.5" fill="none" data-name="MeasurementSurveyFormView"></path>
 						</g>
-						<g transform="translate(33567, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
+						<g transform="translate(29663.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
+								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33567, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
+						<g transform="translate(29663.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FrameControlsWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
-							<rect x="18530.8" y="3782.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
-							<path d="M18530.8 3813.0 L18821.8 3813.0" fill="none" data-name="FrameControlsWidget"></path>
-							<path d="M18530.8 3874.0 L18821.8 3874.0" fill="none" data-name="FrameControlsWidget"></path>
-						</g>
-						<g transform="translate(18530.75, 3782)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
-								
-							</g>
+					<g data-name="IStudyAppBarViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
+							<rect x="32292.5" y="3454.5" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
+							<path d="M32292.5 3485.5 L32535.5 3485.5" fill="none" data-name="IStudyAppBarViewModel"></path>
 						</g>
-						<g transform="translate(18530.75, 3813)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
+						<g transform="translate(32292.5, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
+								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(18530.75, 3874)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
+						<g transform="translate(32292.5, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="IStudyStatusBadgeViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
-							<rect x="34506.0" y="2586.5" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
-							<path d="M34506.0 2617.5 L34791.0 2617.5" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
+							<rect x="32286.0" y="2586.5" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
+							<path d="M32286.0 2617.5 L32571.0 2617.5" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
 						</g>
-						<g transform="translate(34506, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
+						<g transform="translate(32286, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
 								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34506, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
+						<g transform="translate(32286, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
@@ -11809,351 +12133,418 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="36368.5" y="3485.0" height="31.0" width="114.0" data-name="Participation"></rect>
+					<g data-name="IStudyNavViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
+							<rect x="32611.0" y="2556.5" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
+							<path d="M32611.0 2587.5 L32852.0 2587.5" fill="none" data-name="IStudyNavViewModel"></path>
 						</g>
-						<g transform="translate(36368.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
+						<g transform="translate(32611, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
+								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
-							<rect x="32274.5" y="3485.0" height="31.0" width="111.0" data-name="StudyStatus"></rect>
-						</g>
-						<g transform="translate(32274.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
-								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
+						<g transform="translate(32611, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyStatusBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
-							<rect x="34831.0" y="2548.5" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
-							<path d="M34831.0 2579.5 L35072.0 2579.5" fill="none" data-name="StudyStatusBadge"></path>
-							<path d="M34831.0 2670.5 L35072.0 2670.5" fill="none" data-name="StudyStatusBadge"></path>
+					<g data-name="StudyScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
+							<rect x="58505.5" y="1091.5" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
+							<path d="M58505.5 1122.5 L58840.5 1122.5" fill="none" data-name="StudyScaffold"></path>
 						</g>
-						<g transform="translate(34831, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
+						<g transform="translate(58505.5, 1091.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
+								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34831, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
+						<g transform="translate(58505.5, 1122.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34831, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
+					</g>
+					<g data-name="NavbarTab">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
+							<rect x="58472.5" y="1644.0" height="107.0" width="196.0" data-name="NavbarTab"></rect>
+							<path d="M58472.5 1675.0 L58668.5 1675.0" fill="none" data-name="NavbarTab"></path>
+						</g>
+						<g transform="translate(58472.5, 1644)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
+								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
+								
+							</g>
+						</g>
+						<g transform="translate(58472.5, 1675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NavbarTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NavbarTab">
+								<text x="0.0" y="13.5" stroke="none" data-name="NavbarTab">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NavbarTab">+intent: RoutingIntent?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NavbarTab">+index: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NavbarTab">+enabled: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="RouteInformation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
-							<rect x="32425.5" y="3431.5" height="138.0" width="152.0" data-name="RouteInformation"></rect>
-							<path d="M32425.5 3462.5 L32577.5 3462.5" fill="none" data-name="RouteInformation"></path>
-							<path d="M32425.5 3538.5 L32577.5 3538.5" fill="none" data-name="RouteInformation"></path>
+					<g data-name="SingleColumnLayoutType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
+							<rect x="37013.5" y="3432.0" height="137.0" width="426.0" data-name="SingleColumnLayoutType"></rect>
+							<path d="M37013.5 3463.0 L37439.5 3463.0" fill="none" data-name="SingleColumnLayoutType"></path>
 						</g>
-						<g transform="translate(32425.5, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
+						<g transform="translate(37013.5, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
+								<text x="205.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32425.5, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
+						<g transform="translate(37013.5, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayoutType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayoutType">
+								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayoutType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedWide: SingleColumnLayoutType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedNarrow: SingleColumnLayoutType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+stretched: SingleColumnLayoutType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+split: SingleColumnLayoutType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32425.5, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
+					</g>
+					<g data-name="StudyNav">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
+							<rect x="21834.3" y="68.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
+							<path d="M21834.3 99.0 L22067.3 99.0" fill="none" data-name="StudyNav"></path>
+						</g>
+						<g transform="translate(21834.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
+								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
+								
+							</g>
+						</g>
+						<g transform="translate(21834.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PlatformController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
-							<rect x="35112.0" y="2496.0" height="258.0" width="302.0" data-name="PlatformController"></rect>
-							<path d="M35112.0 2527.0 L35414.0 2527.0" fill="none" data-name="PlatformController"></path>
-							<path d="M35112.0 2618.0 L35414.0 2618.0" fill="none" data-name="PlatformController"></path>
+					<g data-name="StudyDesignNav">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
+							<rect x="22107.3" y="68.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
+							<path d="M22107.3 99.0 L22395.3 99.0" fill="none" data-name="StudyDesignNav"></path>
 						</g>
-						<g transform="translate(35112, 2496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
-								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
+						<g transform="translate(22107.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
+								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35112, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
+						<g transform="translate(22107.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35112, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
+					</g>
+					<g data-name="IWithBanner">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
+							<rect x="59059.0" y="1181.5" height="62.0" width="164.0" data-name="IWithBanner"></rect>
+							<path d="M59059.0 1212.5 L59223.0 1212.5" fill="none" data-name="IWithBanner"></path>
+						</g>
+						<g transform="translate(59059, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
+								
+							</g>
+						</g>
+						<g transform="translate(59059, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IWithBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IWithBanner">
+								<text x="0.0" y="13.5" stroke="none" data-name="IWithBanner">+Widget? banner()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WebController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
-							<rect x="32766.5" y="3401.5" height="198.0" width="273.0" data-name="WebController"></rect>
-							<path d="M32766.5 3432.5 L33039.5 3432.5" fill="none" data-name="WebController"></path>
-							<path d="M32766.5 3463.5 L33039.5 3463.5" fill="none" data-name="WebController"></path>
+					<g data-name="StudyController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
+							<rect x="5765.3" y="2511.0" height="228.0" width="573.0" data-name="StudyController"></rect>
+							<path d="M5765.3 2542.0 L6338.3 2542.0" fill="none" data-name="StudyController"></path>
+							<path d="M5765.3 2603.0 L6338.3 2603.0" fill="none" data-name="StudyController"></path>
 						</g>
-						<g transform="translate(32766.5, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
-								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
+						<g transform="translate(5765.25, 2511)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
+								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32766.5, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
+						<g transform="translate(5765.25, 2542)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(32766.5, 3463.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
+						<g transform="translate(5765.25, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFrameElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
-							<rect x="32835.5" y="3828.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
+					<g data-name="WebFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
+							<rect x="22435.3" y="82.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
+							<path d="M22435.3 113.5 L22604.3 113.5" fill="none" data-name="WebFrame"></path>
+							<path d="M22435.3 159.5 L22604.3 159.5" fill="none" data-name="WebFrame"></path>
+						</g>
+						<g transform="translate(22435.25, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
+								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
+								
+							</g>
+						</g>
+						<g transform="translate(22435.25, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
+								
+							</g>
 						</g>
-						<g transform="translate(32835.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
+						<g transform="translate(22435.25, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MobileController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
-							<rect x="33968.5" y="3417.0" height="167.0" width="191.0" data-name="MobileController"></rect>
-							<path d="M33968.5 3448.0 L34159.5 3448.0" fill="none" data-name="MobileController"></path>
+					<g data-name="DisabledFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
+							<rect x="22644.3" y="105.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
+							<path d="M22644.3 136.5 L22780.3 136.5" fill="none" data-name="DisabledFrame"></path>
 						</g>
-						<g transform="translate(33968.5, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
+						<g transform="translate(22644.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33968.5, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
+						<g transform="translate(22644.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
-							<rect x="72157.5" y="2511.0" height="228.0" width="573.0" data-name="StudyController"></rect>
-							<path d="M72157.5 2542.0 L72730.5 2542.0" fill="none" data-name="StudyController"></path>
-							<path d="M72157.5 2603.0 L72730.5 2603.0" fill="none" data-name="StudyController"></path>
+					<g data-name="PhoneContainer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
+							<rect x="33092.0" y="2518.5" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
+							<path d="M33092.0 2549.5 L33419.0 2549.5" fill="none" data-name="PhoneContainer"></path>
+							<path d="M33092.0 2700.5 L33419.0 2700.5" fill="none" data-name="PhoneContainer"></path>
 						</g>
-						<g transform="translate(72157.5, 2511)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
-								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
+						<g transform="translate(33092, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
+								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72157.5, 2542)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+						<g transform="translate(33092, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
+								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72157.5, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
+						<g transform="translate(33092, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
+								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyNavViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
-							<rect x="36428.5" y="2556.5" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
-							<path d="M36428.5 2587.5 L36669.5 2587.5" fill="none" data-name="IStudyNavViewModel"></path>
+					<g data-name="MobileFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
+							<rect x="22820.3" y="105.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
+							<path d="M22820.3 136.5 L22956.3 136.5" fill="none" data-name="MobileFrame"></path>
 						</g>
-						<g transform="translate(36428.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
+						<g transform="translate(22820.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36428.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
+						<g transform="translate(22820.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
-							<rect x="80128.0" y="68.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
-							<path d="M80128.0 99.0 L80361.0 99.0" fill="none" data-name="StudyNav"></path>
+					<g data-name="DesktopFrame">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
+							<rect x="22996.3" y="105.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
+							<path d="M22996.3 136.5 L23132.3 136.5" fill="none" data-name="DesktopFrame"></path>
 						</g>
-						<g transform="translate(80128, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
+						<g transform="translate(22996.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80128, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
+						<g transform="translate(22996.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
+								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
-							<rect x="80401.0" y="68.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
-							<path d="M80401.0 99.0 L80689.0 99.0" fill="none" data-name="StudyDesignNav"></path>
+					<g data-name="StudyTestScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
+							<rect x="54761.0" y="2548.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
+							<path d="M54761.0 2579.5 L54961.0 2579.5" fill="none" data-name="StudyTestScreen"></path>
+							<path d="M54761.0 2610.5 L54961.0 2610.5" fill="none" data-name="StudyTestScreen"></path>
 						</g>
-						<g transform="translate(80401, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
+						<g transform="translate(54761, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
+								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80401, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
+						<g transform="translate(54761, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(54761, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyParticipationBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
-							<rect x="36768.0" y="2556.0" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
-							<path d="M36768.0 2587.0 L36999.0 2587.0" fill="none" data-name="StudyParticipationBadge"></path>
-							<path d="M36768.0 2663.0 L36999.0 2663.0" fill="none" data-name="StudyParticipationBadge"></path>
+					<g data-name="StudyStatus">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
+							<rect x="32958.0" y="3485.0" height="31.0" width="111.0" data-name="StudyStatus"></rect>
 						</g>
-						<g transform="translate(36768, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
+						<g transform="translate(32958, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
+								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36768, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
+					</g>
+					<g data-name="StudyStatusBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
+							<rect x="34022.0" y="2548.5" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
+							<path d="M34022.0 2579.5 L34263.0 2579.5" fill="none" data-name="StudyStatusBadge"></path>
+							<path d="M34022.0 2670.5 L34263.0 2670.5" fill="none" data-name="StudyStatusBadge"></path>
+						</g>
+						<g transform="translate(34022, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
+								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36768, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
+						<g transform="translate(34022, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(34022, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="72645.0" y="3462.0" height="77.0" width="251.0" data-name="IStudyRepository"></rect>
-							<path d="M72645.0 3493.0 L72896.0 3493.0" fill="none" data-name="IStudyRepository"></path>
+					<g data-name="TestAppRoutes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
+							<rect x="23172.3" y="68.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
+							<path d="M23172.3 99.0 L23432.3 99.0" fill="none" data-name="TestAppRoutes"></path>
 						</g>
-						<g transform="translate(72645, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
+						<g transform="translate(23172.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
+								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72645, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyRepository">+dynamic launch()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyRepository">+dynamic deleteParticipants()</text>
+						<g transform="translate(23172.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
+								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="PreviewFrame">
 						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
-							<rect x="61535.8" y="1166.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
-							<path d="M61535.8 1197.5 L61826.8 1197.5" fill="none" data-name="PreviewFrame"></path>
+							<rect x="59693.5" y="1166.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
+							<path d="M59693.5 1197.5 L59984.5 1197.5" fill="none" data-name="PreviewFrame"></path>
 						</g>
-						<g transform="translate(61535.75, 1166.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
+						<g transform="translate(59693.5, 1166.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
 								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61535.75, 1197.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
+						<g transform="translate(59693.5, 1197.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
 								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
@@ -12162,211 +12553,243 @@
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyAppBarViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
-							<rect x="33506.8" y="3454.5" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
-							<path d="M33506.8 3485.5 L33749.8 3485.5" fill="none" data-name="IStudyAppBarViewModel"></path>
+					<g data-name="StudyFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
+							<rect x="59747.0" y="1666.5" height="62.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
+							<path d="M59747.0 1697.5 L59931.0 1697.5" fill="none" data-name="StudyFormRouteArgs"></path>
 						</g>
-						<g transform="translate(33506.75, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
+						<g transform="translate(59747, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
+								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33506.75, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
+						<g transform="translate(59747, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormRouteArgs">+studyId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
-							<rect x="63130.8" y="1091.5" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
-							<path d="M63130.8 1122.5 L63465.8 1122.5" fill="none" data-name="StudyScaffold"></path>
+					<g data-name="StudyTestController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
+							<rect x="6237.3" y="3805.0" height="77.0" width="282.0" data-name="StudyTestController"></rect>
+							<path d="M6237.3 3836.0 L6519.3 3836.0" fill="none" data-name="StudyTestController"></path>
 						</g>
-						<g transform="translate(63130.75, 1091.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
-								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
+						<g transform="translate(6237.25, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63130.75, 1122.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
+						<g transform="translate(6237.25, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WebFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
-							<rect x="80729.0" y="82.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
-							<path d="M80729.0 113.5 L80898.0 113.5" fill="none" data-name="WebFrame"></path>
-							<path d="M80729.0 159.5 L80898.0 159.5" fill="none" data-name="WebFrame"></path>
+					<g data-name="RouteInformation">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
+							<rect x="34136.0" y="3431.5" height="138.0" width="152.0" data-name="RouteInformation"></rect>
+							<path d="M34136.0 3462.5 L34288.0 3462.5" fill="none" data-name="RouteInformation"></path>
+							<path d="M34136.0 3538.5 L34288.0 3538.5" fill="none" data-name="RouteInformation"></path>
 						</g>
-						<g transform="translate(80729, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
+						<g transform="translate(34136, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
+								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
+								
+							</g>
+						</g>
+						<g transform="translate(34136, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(34136, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
+								
+							</g>
+						</g>
+					</g>
+					<g data-name="PlatformController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
+							<rect x="34429.5" y="2496.0" height="258.0" width="302.0" data-name="PlatformController"></rect>
+							<path d="M34429.5 2527.0 L34731.5 2527.0" fill="none" data-name="PlatformController"></path>
+							<path d="M34429.5 2618.0 L34731.5 2618.0" fill="none" data-name="PlatformController"></path>
+						</g>
+						<g transform="translate(34429.5, 2496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
+								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
+								
+							</g>
+						</g>
+						<g transform="translate(34429.5, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
+								
+							</g>
+						</g>
+						<g transform="translate(34429.5, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
+								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80729, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
-								
-							</g>
+					</g>
+					<g data-name="WebController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
+							<rect x="34328.0" y="3401.5" height="198.0" width="273.0" data-name="WebController"></rect>
+							<path d="M34328.0 3432.5 L34601.0 3432.5" fill="none" data-name="WebController"></path>
+							<path d="M34328.0 3463.5 L34601.0 3463.5" fill="none" data-name="WebController"></path>
 						</g>
-						<g transform="translate(80729, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
+						<g transform="translate(34328, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
+								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="DisabledFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
-							<rect x="80938.0" y="105.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
-							<path d="M80938.0 136.5 L81074.0 136.5" fill="none" data-name="DisabledFrame"></path>
-						</g>
-						<g transform="translate(80938, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
+						<g transform="translate(34328, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80938, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
+						<g transform="translate(34328, 3463.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PhoneContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
-							<rect x="37039.0" y="2518.5" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
-							<path d="M37039.0 2549.5 L37366.0 2549.5" fill="none" data-name="PhoneContainer"></path>
-							<path d="M37039.0 2700.5 L37366.0 2700.5" fill="none" data-name="PhoneContainer"></path>
+					<g data-name="IFrameElement">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
+							<rect x="34397.0" y="3828.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
 						</g>
-						<g transform="translate(37039, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
-								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
+						<g transform="translate(34397, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
+								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37039, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
+					</g>
+					<g data-name="MobileController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
+							<rect x="34641.0" y="3417.0" height="167.0" width="191.0" data-name="MobileController"></rect>
+							<path d="M34641.0 3448.0 L34832.0 3448.0" fill="none" data-name="MobileController"></path>
+						</g>
+						<g transform="translate(34641, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(37039, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
+						<g transform="translate(34641, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
+								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MobileFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
-							<rect x="81114.0" y="105.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
-							<path d="M81114.0 136.5 L81250.0 136.5" fill="none" data-name="MobileFrame"></path>
-						</g>
-						<g transform="translate(81114, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
-								
-							</g>
+					<g data-name="FrameControlsWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
+							<rect x="29477.8" y="3782.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
+							<path d="M29477.8 3813.0 L29768.8 3813.0" fill="none" data-name="FrameControlsWidget"></path>
+							<path d="M29477.8 3874.0 L29768.8 3874.0" fill="none" data-name="FrameControlsWidget"></path>
 						</g>
-						<g transform="translate(81114, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
+						<g transform="translate(29477.75, 3782)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
+								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="DesktopFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
-							<rect x="81290.0" y="105.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
-							<path d="M81290.0 136.5 L81426.0 136.5" fill="none" data-name="DesktopFrame"></path>
-						</g>
-						<g transform="translate(81290, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
+						<g transform="translate(29477.75, 3813)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81290, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
+						<g transform="translate(29477.75, 3874)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTestScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
-							<rect x="33831.0" y="2548.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
-							<path d="M33831.0 2579.5 L34031.0 2579.5" fill="none" data-name="StudyTestScreen"></path>
-							<path d="M33831.0 2610.5 L34031.0 2610.5" fill="none" data-name="StudyTestScreen"></path>
+					<g data-name="StudyParticipationBadge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
+							<rect x="34822.8" y="2556.0" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
+							<path d="M34822.8 2587.0 L35053.8 2587.0" fill="none" data-name="StudyParticipationBadge"></path>
+							<path d="M34822.8 2663.0 L35053.8 2663.0" fill="none" data-name="StudyParticipationBadge"></path>
 						</g>
-						<g transform="translate(33831, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
-								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
+						<g transform="translate(34822.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
+								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33831, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
+						<g transform="translate(34822.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(33831, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
+						<g transform="translate(34822.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
 					<g data-name="StudySettingsFormViewModel">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="69180.0" y="2496.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M69180.0 2527.0 L69659.0 2527.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M69180.0 2663.0 L69659.0 2663.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+							<rect x="70384.3" y="2496.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
+							<path d="M70384.3 2527.0 L70863.3 2527.0" fill="none" data-name="StudySettingsFormViewModel"></path>
+							<path d="M70384.3 2663.0 L70863.3 2663.0" fill="none" data-name="StudySettingsFormViewModel"></path>
 						</g>
-						<g transform="translate(69180, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
+						<g transform="translate(70384.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
 								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(69180, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+						<g transform="translate(70384.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
@@ -12379,7 +12802,7 @@
 								
 							</g>
 						</g>
-						<g transform="translate(69180, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
+						<g transform="translate(70384.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
 								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
@@ -12392,3849 +12815,3428 @@
 					</g>
 					<g data-name="StudySettingsDialog">
 						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="34071.0" y="2594.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M34071.0 2625.0 L34246.0 2625.0" fill="none" data-name="StudySettingsDialog"></path>
+							<rect x="55001.0" y="2594.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
+							<path d="M55001.0 2625.0 L55176.0 2625.0" fill="none" data-name="StudySettingsDialog"></path>
 						</g>
-						<g transform="translate(34071, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
+						<g transform="translate(55001, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
 								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34071, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
+						<g transform="translate(55001, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
 							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
 								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyTestController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
-							<rect x="72149.8" y="3805.0" height="77.0" width="282.0" data-name="StudyTestController"></rect>
-							<path d="M72149.8 3836.0 L72431.8 3836.0" fill="none" data-name="StudyTestController"></path>
-						</g>
-						<g transform="translate(72149.75, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72149.75, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TestAppRoutes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
-							<rect x="81466.0" y="68.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
-							<path d="M81466.0 99.0 L81726.0 99.0" fill="none" data-name="TestAppRoutes"></path>
-						</g>
-						<g transform="translate(81466, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
-								
-							</g>
-						</g>
-						<g transform="translate(81466, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
-								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
-							<rect x="64182.5" y="1113.5" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
-							<path d="M64182.5 1144.5 L64627.5 1144.5" fill="none" data-name="DrawerEntry"></path>
-							<path d="M64182.5 1280.5 L64627.5 1280.5" fill="none" data-name="DrawerEntry"></path>
-						</g>
-						<g transform="translate(64182.5, 1113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
-								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(64182.5, 1144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DrawerEntry">+localizedHelpText: String Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DrawerEntry">+enabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DrawerEntry">+onSelected: void Function(BuildContext, WidgetRef)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DrawerEntry">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DrawerEntry">+title: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DrawerEntry">+helpText: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(64182.5, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="String Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
-							<rect x="63786.3" y="1682.0" height="31.0" width="147.0" data-name="String Function()"></rect>
-						</g>
-						<g transform="translate(63786.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
-								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="String Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
-							<rect x="64013.3" y="1682.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
-						</g>
-						<g transform="translate(64013.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(BuildContext, WidgetRef)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
-							<rect x="64210.3" y="1682.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
-						</g>
-						<g transform="translate(64210.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
-								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouterDrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
-							<rect x="64586.3" y="1643.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
-							<path d="M64586.3 1674.5 L64850.3 1674.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-							<path d="M64586.3 1720.5 L64850.3 1720.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-						</g>
-						<g transform="translate(64586.25, 1643.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
-								
-							</g>
+					<g data-name="AccountSettingsDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
+							<rect x="30147.3" y="1666.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
+							<path d="M30147.3 1697.5 L30341.3 1697.5" fill="none" data-name="AccountSettingsDialog"></path>
 						</g>
-						<g transform="translate(64586.25, 1674.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
+						<g transform="translate(30147.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
+								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64586.25, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
+						<g transform="translate(30147.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppDrawer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
-							<rect x="81766.0" y="53.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
-							<path d="M81766.0 84.0 L82035.0 84.0" fill="none" data-name="AppDrawer"></path>
+					<g data-name="PublishDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
+							<rect x="55216.0" y="2594.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
+							<path d="M55216.0 2625.0 L55352.0 2625.0" fill="none" data-name="PublishDialog"></path>
 						</g>
-						<g transform="translate(81766, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
-								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
+						<g transform="translate(55216, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81766, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppDrawer">+leftPaddingEntries: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppDrawer">+logoPaddingVertical: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppDrawer">+logoPaddingHorizontal: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AppDrawer">+logoMaxHeight: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AppDrawer">+logoSectionMinHeight: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AppDrawer">+logoSectionMaxHeight: double</text>
+						<g transform="translate(55216, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyAnalyzeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
-							<rect x="34286.0" y="2586.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
-							<path d="M34286.0 2617.5 L34466.0 2617.5" fill="none" data-name="StudyAnalyzeScreen"></path>
+					<g data-name="PublishSuccessDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
+							<rect x="55758.0" y="2594.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
+							<path d="M55758.0 2625.0 L55949.0 2625.0" fill="none" data-name="PublishSuccessDialog"></path>
 						</g>
-						<g transform="translate(34286, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
+						<g transform="translate(55758, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34286, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
+						<g transform="translate(55758, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyAnalyzeController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
-							<rect x="73637.5" y="1181.5" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
-							<path d="M73637.5 1212.5 L73838.5 1212.5" fill="none" data-name="StudyAnalyzeController"></path>
+					<g data-name="PublishConfirmationDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
+							<rect x="55989.0" y="2594.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
+							<path d="M55989.0 2625.0 L56213.0 2625.0" fill="none" data-name="PublishConfirmationDialog"></path>
 						</g>
-						<g transform="translate(73637.5, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
-								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
+						<g transform="translate(55989, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
+								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(73637.5, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
+						<g transform="translate(55989, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignInterventionsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="34199.5" y="3469.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M34199.5 3500.5 L34495.5 3500.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
+					<g data-name="StudyMonitorScreen">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
+							<rect x="56253.0" y="2594.0" height="62.0" width="176.0" data-name="StudyMonitorScreen"></rect>
+							<path d="M56253.0 2625.0 L56429.0 2625.0" fill="none" data-name="StudyMonitorScreen"></path>
 						</g>
-						<g transform="translate(34199.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
+						<g transform="translate(56253, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
+								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34199.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
+						<g transform="translate(56253, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="36176.5" y="2594.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M36176.5 2625.0 L36388.5 2625.0" fill="none" data-name="StudyDesignPageWidget"></path>
+					<g data-name="AppController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
+							<rect x="23472.3" y="67.5" height="138.0" width="301.0" data-name="AppController"></rect>
+							<path d="M23472.3 98.5 L23773.3 98.5" fill="none" data-name="AppController"></path>
+							<path d="M23472.3 159.5 L23773.3 159.5" fill="none" data-name="AppController"></path>
 						</g>
-						<g transform="translate(36176.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
+						<g transform="translate(23472.25, 67.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
+								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(36176.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
+						<g transform="translate(23472.25, 98.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
+								
+							</g>
+						</g>
+						<g transform="translate(23472.25, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
+								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="29325.8" y="1666.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M29325.8 1697.5 L29700.8 1697.5" fill="none" data-name="InterventionFormView"></path>
+					<g data-name="FormSideSheetTab">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormSideSheetTab">
+							<rect x="58192.5" y="2594.0" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
+							<path d="M58192.5 2625.0 L58505.5 2625.0" fill="none" data-name="FormSideSheetTab"></path>
 						</g>
-						<g transform="translate(29325.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
-								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
+						<g transform="translate(58192.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSideSheetTab">
+								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormSideSheetTab">FormSideSheetTab</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29325.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
+						<g transform="translate(58192.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSideSheetTab">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormSideSheetTab">+formViewBuilder: Widget Function(T)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="57557.0" y="2391.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M57557.0 2422.0 L58412.0 2422.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M57557.0 2648.0 L58412.0 2648.0" fill="none" data-name="InterventionFormViewModel"></path>
-						</g>
-						<g transform="translate(57557, 2391)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
-								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
-								
-							</g>
+					<g data-name="SidesheetTab">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SidesheetTab">
+							<rect x="58545.5" y="2594.0" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
+							<path d="M58545.5 2625.0 L58875.5 2625.0" fill="none" data-name="SidesheetTab"></path>
 						</g>
-						<g transform="translate(57557, 2422)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(58545.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SidesheetTab">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="SidesheetTab">SidesheetTab</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57557, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
+						<g transform="translate(58545.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SidesheetTab">
+								<text x="0.0" y="13.5" stroke="none" data-name="SidesheetTab">+builder: Widget Function(BuildContext)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="25925.8" y="1651.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M25925.8 1682.0 L26255.8 1682.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M25925.8 1713.0 L26255.8 1713.0" fill="none" data-name="InterventionPreview"></path>
+					<g data-name="Sidesheet">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Sidesheet">
+							<rect x="38136.5" y="2519.0" height="212.0" width="341.0" data-name="Sidesheet"></rect>
+							<path d="M38136.5 2550.0 L38477.5 2550.0" fill="none" data-name="Sidesheet"></path>
 						</g>
-						<g transform="translate(25925.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
+						<g transform="translate(38136.5, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Sidesheet">
+								<text x="162.5" y="13.5" stroke="none" text-anchor="middle" data-name="Sidesheet">Sidesheet</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25925.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
+						<g transform="translate(38136.5, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Sidesheet">
+								<text x="0.0" y="13.5" stroke="none" data-name="Sidesheet">&lt;static&gt;+kDefaultWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Sidesheet">+titleText: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Sidesheet">+body: Widget?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Sidesheet">+tabs: List&lt;SidesheetTab&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Sidesheet">+actionButtons: List&lt;Widget&gt;?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Sidesheet">+width: double?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Sidesheet">+withCloseButton: bool</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Sidesheet">+ignoreAppBar: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="Sidesheet">+collapseSingleTab: bool</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="Sidesheet">+bodyPadding: EdgeInsets?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="Sidesheet">+wrapContent: Widget Function(Widget)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(25925.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
+					</g>
+					<g data-name="Widget Function(Widget)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Widget)?">
+							<rect x="35670.0" y="3485.0" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
+						</g>
+						<g transform="translate(35670, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Widget)?">
+								<text x="102.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Widget)?">Widget Function(Widget)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="81195.5" y="1158.5" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M81195.5 1189.5 L81554.5 1189.5" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M81195.5 1220.5 L81554.5 1220.5" fill="none" data-name="StudyScheduleFormView"></path>
+					<g data-name="ErrorPage">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ErrorPage">
+							<rect x="30381.3" y="1651.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
+							<path d="M30381.3 1682.0 L30543.3 1682.0" fill="none" data-name="ErrorPage"></path>
+							<path d="M30381.3 1713.0 L30543.3 1713.0" fill="none" data-name="ErrorPage"></path>
 						</g>
-						<g transform="translate(81195.5, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
+						<g transform="translate(30381.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ErrorPage">
+								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="ErrorPage">ErrorPage</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81195.5, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
+						<g transform="translate(30381.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
+								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+error: Exception?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81195.5, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
+						<g transform="translate(30381.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
+								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="80996.0" y="1501.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M80996.0 1532.0 L81754.0 1532.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M80996.0 1833.0 L81754.0 1833.0" fill="none" data-name="StudyScheduleControls"></path>
-						</g>
-						<g transform="translate(80996, 1501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
-								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
-								
-							</g>
+					<g data-name="SplashPage">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SplashPage">
+							<rect x="23813.3" y="105.5" height="62.0" width="136.0" data-name="SplashPage"></rect>
+							<path d="M23813.3 136.5 L23949.3 136.5" fill="none" data-name="SplashPage"></path>
 						</g>
-						<g transform="translate(80996, 1532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
+						<g transform="translate(23813.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SplashPage">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SplashPage">SplashPage</text>
 								
 							</g>
 						</g>
-						<g transform="translate(80996, 1833)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
+						<g transform="translate(23813.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SplashPage">
+								<text x="0.0" y="13.5" stroke="none" data-name="SplashPage">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="55203.3" y="2541.0" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M55203.3 2572.0 L55493.3 2572.0" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M55203.3 2663.0 L55493.3 2663.0" fill="none" data-name="InterventionTaskFormData"></path>
+					<g data-name="StandardTableColumn">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableColumn">
+							<rect x="35093.8" y="2556.5" height="137.0" width="287.0" data-name="StandardTableColumn"></rect>
+							<path d="M35093.8 2587.5 L35380.8 2587.5" fill="none" data-name="StandardTableColumn"></path>
 						</g>
-						<g transform="translate(55203.25, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
+						<g transform="translate(35093.75, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableColumn">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableColumn">StandardTableColumn</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55203.25, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
+						<g transform="translate(35093.75, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableColumn">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableColumn">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableColumn">+label: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableColumn">+tooltip: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableColumn">+columnWidth: TableColumnWidth</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableColumn">+sortable: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StandardTableColumn">+sortAscending: bool?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StandardTableColumn">+sortableIcon: Widget?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55203.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
+					</g>
+					<g data-name="TableColumnWidth">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TableColumnWidth">
+							<rect x="35050.0" y="3485.0" height="31.0" width="165.0" data-name="TableColumnWidth"></rect>
+						</g>
+						<g transform="translate(35050, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TableColumnWidth">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableColumnWidth">
+								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableColumnWidth">TableColumnWidth</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="55751.0" y="1613.5" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M55751.0 1644.5 L56049.0 1644.5" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M55751.0 1750.5 L56049.0 1750.5" fill="none" data-name="IFormDataWithSchedule"></path>
+					<g data-name="StandardTable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTable">
+							<rect x="33601.5" y="1501.5" height="392.0" width="688.0" data-name="StandardTable"></rect>
+							<path d="M33601.5 1532.5 L34289.5 1532.5" fill="none" data-name="StandardTable"></path>
 						</g>
-						<g transform="translate(55751, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
+						<g transform="translate(33601.5, 1501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTable">
+								<text x="336.0" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTable">StandardTable</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55751, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
+						<g transform="translate(33601.5, 1532.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTable">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardTable">+items: List&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StandardTable">+inputColumns: List&lt;StandardTableColumn&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StandardTable">+onSelectItem: void Function(T)</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StandardTable">+trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StandardTable">+trailingActionsMenuType: ActionMenuType?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StandardTable">+sortColumnPredicates: List&lt;int Function(T, T)?&gt;?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StandardTable">+pinnedPredicates: int Function(T, T)?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StandardTable">+headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StandardTable">+dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StandardTable">+inputTrailingActionsColumn: StandardTableColumn</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StandardTable">+tableWrapper: Widget Function(Widget)?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StandardTable">+cellSpacing: double</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StandardTable">+rowSpacing: double</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="StandardTable">+minRowHeight: double?</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="StandardTable">+showTableHeader: bool</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="StandardTable">+hideLeadingTrailingWhenEmpty: bool</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="StandardTable">+leadingWidget: Widget?</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="StandardTable">+trailingWidget: Widget?</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="StandardTable">+leadingWidgetSpacing: double?</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="StandardTable">+trailingWidgetSpacing: double?</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="StandardTable">+emptyWidget: Widget?</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="StandardTable">+rowStyle: StandardTableStyle</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="StandardTable">+disableRowInteractions: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55751, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
+					</g>
+					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
+							<rect x="31730.3" y="2609.5" height="31.0" width="381.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?"></rect>
+						</g>
+						<g transform="translate(31730.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
+								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="68261.0" y="2436.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M68261.0 2467.0 L69100.0 2467.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M68261.0 2618.0 L69100.0 2618.0" fill="none" data-name="InterventionsFormViewModel"></path>
+					<g data-name="ActionMenuType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuType">
+							<rect x="13316.5" y="3447.0" height="107.0" width="330.0" data-name="ActionMenuType"></rect>
+							<path d="M13316.5 3478.0 L13646.5 3478.0" fill="none" data-name="ActionMenuType"></path>
 						</g>
-						<g transform="translate(68261, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
-								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
+						<g transform="translate(13316.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuType">
+								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuType">ActionMenuType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68261, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
+						<g transform="translate(13316.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuType">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+values: List&lt;ActionMenuType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+inline: ActionMenuType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+popup: ActionMenuType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(68261, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
+					</g>
+					<g data-name="int Function(T, T)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(T, T)?">
+							<rect x="32892.0" y="2609.5" height="31.0" width="160.0" data-name="int Function(T, T)?"></rect>
+						</g>
+						<g transform="translate(32892, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(T, T)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(T, T)?">
+								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(T, T)?">int Function(T, T)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="60716.3" y="2488.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M60716.3 2519.5 L61412.3 2519.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M60716.3 2700.5 L61412.3 2700.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
+					<g data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+							<rect x="33459.0" y="2609.5" height="31.0" width="523.0" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?"></rect>
 						</g>
-						<g transform="translate(60716.25, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
+						<g transform="translate(33459, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
+								<text x="253.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60716.25, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+					</g>
+					<g data-name="StandardTableStyle">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableStyle">
+							<rect x="16023.3" y="3447.0" height="107.0" width="353.0" data-name="StandardTableStyle"></rect>
+							<path d="M16023.3 3478.0 L16376.3 3478.0" fill="none" data-name="StandardTableStyle"></path>
+						</g>
+						<g transform="translate(16023.25, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableStyle">
+								<text x="168.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableStyle">StandardTableStyle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60716.25, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
+						<g transform="translate(16023.25, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableStyle">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableStyle">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+values: List&lt;StandardTableStyle&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+plain: StandardTableStyle</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+material: StandardTableStyle</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="82429.3" y="1546.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M82429.3 1577.0 L82924.3 1577.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M82429.3 1803.0 L82924.3 1803.0" fill="none" data-name="WithScheduleControls"></path>
+					<g data-name="PrimaryButton">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PrimaryButton">
+							<rect x="39719.5" y="2511.5" height="227.0" width="333.0" data-name="PrimaryButton"></rect>
+							<path d="M39719.5 2542.5 L40052.5 2542.5" fill="none" data-name="PrimaryButton"></path>
 						</g>
-						<g transform="translate(82429.25, 1546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
+						<g transform="translate(39719.5, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PrimaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PrimaryButton">
+								<text x="158.5" y="13.5" stroke="none" text-anchor="middle" data-name="PrimaryButton">PrimaryButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82429.25, 1577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
+						<g transform="translate(39719.5, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PrimaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PrimaryButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="PrimaryButton">+text: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="PrimaryButton">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="PrimaryButton">+isLoading: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="PrimaryButton">+showLoadingEarliestAfterMs: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="PrimaryButton">+onPressed: void Function()?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="PrimaryButton">+tooltip: String</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="PrimaryButton">+tooltipDisabled: String</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="PrimaryButton">+enabled: bool</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="PrimaryButton">+onPressedFuture: dynamic Function()?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="PrimaryButton">+innerPadding: EdgeInsets</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="PrimaryButton">+minimumSize: Size?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="PrimaryButton">+isDisabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82429.25, 1803)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
+					</g>
+					<g data-name="dynamic Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
+							<rect x="43339.3" y="3485.0" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
+						</g>
+						<g transform="translate(43339.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
+								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PhaseSequence">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="66539.5" y="3828.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
+					<g data-name="Size">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Size">
+							<rect x="40243.0" y="3485.0" height="31.0" width="50.0" data-name="Size"></rect>
 						</g>
-						<g transform="translate(66539.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
-								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
+						<g transform="translate(40243, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Size">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Size">
+								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Size">Size</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="44758.0" y="1598.5" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M44758.0 1629.5 L45140.0 1629.5" fill="none" data-name="InterventionFormData"></path>
-							<path d="M44758.0 1750.5 L45140.0 1750.5" fill="none" data-name="InterventionFormData"></path>
+					<g data-name="DismissButton">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DismissButton">
+							<rect x="42277.5" y="3789.5" height="108.0" width="249.0" data-name="DismissButton"></rect>
+							<path d="M42277.5 3820.5 L42526.5 3820.5" fill="none" data-name="DismissButton"></path>
+							<path d="M42277.5 3866.5 L42526.5 3866.5" fill="none" data-name="DismissButton"></path>
 						</g>
-						<g transform="translate(44758, 1598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
+						<g transform="translate(42277.5, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DismissButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DismissButton">
+								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="DismissButton">DismissButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44758, 1629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
+						<g transform="translate(42277.5, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+onPressed: void Function()?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="DismissButton">+text: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44758, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
+						<g transform="translate(42277.5, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyScheduleFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="45892.3" y="3401.5" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M45892.3 3432.5 L46188.3 3432.5" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M45892.3 3538.5 L46188.3 3538.5" fill="none" data-name="StudyScheduleFormData"></path>
-						</g>
-						<g transform="translate(45892.25, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
-								
-							</g>
+					<g data-name="TwoColumnLayout">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TwoColumnLayout">
+							<rect x="40174.8" y="2466.5" height="317.0" width="368.0" data-name="TwoColumnLayout"></rect>
+							<path d="M40174.8 2497.5 L40542.8 2497.5" fill="none" data-name="TwoColumnLayout"></path>
 						</g>
-						<g transform="translate(45892.25, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
+						<g transform="translate(40174.75, 2466.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TwoColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TwoColumnLayout">
+								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="TwoColumnLayout">TwoColumnLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45892.25, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
+						<g transform="translate(40174.75, 2497.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TwoColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TwoColumnLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultDivider: VerticalDivider</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultContentPadding: EdgeInsets</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+slimContentPadding: EdgeInsets</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TwoColumnLayout">+leftWidget: Widget</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TwoColumnLayout">+rightWidget: Widget</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TwoColumnLayout">+dividerWidget: Widget?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="TwoColumnLayout">+headerWidget: Widget?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="TwoColumnLayout">+flexLeft: int?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="TwoColumnLayout">+flexRight: int?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="TwoColumnLayout">+constraintsLeft: BoxConstraints?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="TwoColumnLayout">+constraintsRight: BoxConstraints?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="TwoColumnLayout">+scrollLeft: bool</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="TwoColumnLayout">+scrollRight: bool</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="TwoColumnLayout">+paddingLeft: EdgeInsets?</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="TwoColumnLayout">+paddingRight: EdgeInsets?</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorLeft: Color?</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorRight: Color?</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="TwoColumnLayout">+stretchHeight: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="49374.5" y="1666.5" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M49374.5 1697.5 L49517.5 1697.5" fill="none" data-name="IStudyFormData"></path>
+					<g data-name="VerticalDivider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="VerticalDivider">
+							<rect x="40333.0" y="3485.0" height="31.0" width="130.0" data-name="VerticalDivider"></rect>
 						</g>
-						<g transform="translate(49374.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
+						<g transform="translate(40333, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VerticalDivider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VerticalDivider">
+								<text x="57.0" y="13.5" stroke="none" text-anchor="middle" data-name="VerticalDivider">VerticalDivider</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49374.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
+					</g>
+					<g data-name="BoxConstraints">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoxConstraints">
+							<rect x="41867.0" y="3485.0" height="31.0" width="136.0" data-name="BoxConstraints"></rect>
+						</g>
+						<g transform="translate(41867, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxConstraints">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxConstraints">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxConstraints">BoxConstraints</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionTaskFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="41046.3" y="1666.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M41046.3 1697.5 L41459.3 1697.5" fill="none" data-name="InterventionTaskFormView"></path>
+					<g data-name="ActionPopUpMenuButton">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ActionPopUpMenuButton">
+							<rect x="40930.8" y="2496.0" height="258.0" width="324.0" data-name="ActionPopUpMenuButton"></rect>
+							<path d="M40930.8 2527.0 L41254.8 2527.0" fill="none" data-name="ActionPopUpMenuButton"></path>
+							<path d="M40930.8 2708.0 L41254.8 2708.0" fill="none" data-name="ActionPopUpMenuButton"></path>
 						</g>
-						<g transform="translate(41046.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
+						<g transform="translate(40930.75, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionPopUpMenuButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionPopUpMenuButton">
+								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionPopUpMenuButton">ActionPopUpMenuButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41046.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
+						<g transform="translate(40930.75, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColor: Color?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColorHover: Color?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconSize: double</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ActionPopUpMenuButton">+disableSplashEffect: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ActionPopUpMenuButton">+hideOnEmpty: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ActionPopUpMenuButton">+orientation: Axis</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ActionPopUpMenuButton">+elevation: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ActionPopUpMenuButton">+splashRadius: double?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ActionPopUpMenuButton">+enabled: bool</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ActionPopUpMenuButton">+position: PopupMenuPosition</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InterventionsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="47496.0" y="2556.0" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M47496.0 2587.0 L47890.0 2587.0" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M47496.0 2648.0 L47890.0 2648.0" fill="none" data-name="InterventionsFormData"></path>
-						</g>
-						<g transform="translate(47496, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
+						<g transform="translate(40930.75, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">-Widget _buildPopupMenu()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47496, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
-								
-							</g>
+					</g>
+					<g data-name="Axis">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Axis">
+							<rect x="41074.0" y="3485.0" height="31.0" width="49.0" data-name="Axis"></rect>
 						</g>
-						<g transform="translate(47496, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
+						<g transform="translate(41074, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Axis">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Axis">
+								<text x="16.5" y="13.5" stroke="none" text-anchor="middle" data-name="Axis">Axis</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignReportsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="34535.5" y="3462.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M34535.5 3493.0 L34928.5 3493.0" fill="none" data-name="StudyDesignReportsFormView"></path>
-						</g>
-						<g transform="translate(34535.5, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
-								
-							</g>
+					<g data-name="PopupMenuPosition">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PopupMenuPosition">
+							<rect x="41163.0" y="3485.0" height="31.0" width="174.0" data-name="PopupMenuPosition"></rect>
 						</g>
-						<g transform="translate(34535.5, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
+						<g transform="translate(41163, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PopupMenuPosition">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PopupMenuPosition">
+								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="PopupMenuPosition">PopupMenuPosition</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="45180.0" y="1628.5" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M45180.0 1659.5 L45494.0 1659.5" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M45180.0 1720.5 L45494.0 1720.5" fill="none" data-name="ReportItemFormData"></path>
+					<g data-name="FormControlLabel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlLabel">
+							<rect x="41294.8" y="2548.5" height="153.0" width="430.0" data-name="FormControlLabel"></rect>
+							<path d="M41294.8 2579.5 L41724.8 2579.5" fill="none" data-name="FormControlLabel"></path>
+							<path d="M41294.8 2670.5 L41724.8 2670.5" fill="none" data-name="FormControlLabel"></path>
 						</g>
-						<g transform="translate(45180, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
+						<g transform="translate(41294.75, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlLabel">
+								<text x="207.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlLabel">FormControlLabel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45180, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
+						<g transform="translate(41294.75, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+formControl: AbstractControl&lt;dynamic&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormControlLabel">+text: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormControlLabel">+isClickable: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormControlLabel">+textStyle: TextStyle?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormControlLabel">+onClick: void Function(AbstractControl&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45180, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
+						<g transform="translate(41294.75, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="45273.0" y="2609.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
+					<g data-name="TextStyle">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
+							<rect x="46344.5" y="3485.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
 						</g>
-						<g transform="translate(45273, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
+						<g transform="translate(46344.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
+								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="45768.0" y="2556.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M45768.0 2587.0 L46477.0 2587.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M45768.0 2648.0 L46477.0 2648.0" fill="none" data-name="DataReferenceEditor"></path>
+					<g data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+							<rect x="41475.0" y="3485.0" height="31.0" width="352.0" data-name="void Function(AbstractControl&lt;dynamic&gt;)?"></rect>
 						</g>
-						<g transform="translate(45768, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
+						<g transform="translate(41475, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
+								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">void Function(AbstractControl&lt;dynamic&gt;)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45768, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
+					</g>
+					<g data-name="MouseEventsRegion">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MouseEventsRegion">
+							<rect x="42599.8" y="3760.0" height="167.0" width="379.0" data-name="MouseEventsRegion"></rect>
+							<path d="M42599.8 3791.0 L42978.8 3791.0" fill="none" data-name="MouseEventsRegion"></path>
+						</g>
+						<g transform="translate(42599.75, 3760)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MouseEventsRegion">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MouseEventsRegion">
+								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="MouseEventsRegion">MouseEventsRegion</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45768, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
+						<g transform="translate(42599.75, 3791)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MouseEventsRegion">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MouseEventsRegion">
+								<text x="0.0" y="13.5" stroke="none" data-name="MouseEventsRegion">+onTap: void Function()?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MouseEventsRegion">+onHover: void Function(PointerHoverEvent)?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="MouseEventsRegion">+onEnter: void Function(PointerEnterEvent)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="MouseEventsRegion">+onExit: void Function(PointerExitEvent)?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="MouseEventsRegion">+autoselectCursor: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="MouseEventsRegion">+cursor: SystemMouseCursor</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="MouseEventsRegion">&lt;static&gt;+defaultCursor: SystemMouseCursor</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="MouseEventsRegion">+autoCursor: SystemMouseCursor</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="45038.5" y="3485.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
+					<g data-name="void Function(PointerHoverEvent)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerHoverEvent)?">
+							<rect x="39672.3" y="4118.5" height="31.0" width="292.0" data-name="void Function(PointerHoverEvent)?"></rect>
 						</g>
-						<g transform="translate(45038.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
+						<g transform="translate(39672.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerHoverEvent)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerHoverEvent)?">
+								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerHoverEvent)?">void Function(PointerHoverEvent)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="46517.0" y="2518.5" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M46517.0 2549.5 L46965.0 2549.5" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M46517.0 2655.5 L46965.0 2655.5" fill="none" data-name="TemporalAggregationFormatted"></path>
+					<g data-name="void Function(PointerEnterEvent)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerEnterEvent)?">
+							<rect x="40004.3" y="4118.5" height="31.0" width="287.0" data-name="void Function(PointerEnterEvent)?"></rect>
 						</g>
-						<g transform="translate(46517, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
+						<g transform="translate(40004.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerEnterEvent)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerEnterEvent)?">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerEnterEvent)?">void Function(PointerEnterEvent)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(46517, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
-								
-							</g>
+					</g>
+					<g data-name="void Function(PointerExitEvent)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerExitEvent)?">
+							<rect x="40331.3" y="4118.5" height="31.0" width="274.0" data-name="void Function(PointerExitEvent)?"></rect>
 						</g>
-						<g transform="translate(46517, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
+						<g transform="translate(40331.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerExitEvent)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerExitEvent)?">
+								<text x="129.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerExitEvent)?">void Function(PointerExitEvent)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="45281.5" y="3485.0" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
+					<g data-name="SystemMouseCursor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SystemMouseCursor">
+							<rect x="41577.5" y="4118.5" height="31.0" width="180.0" data-name="SystemMouseCursor"></rect>
 						</g>
-						<g transform="translate(45281.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
+						<g transform="translate(41577.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SystemMouseCursor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SystemMouseCursor">
+								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="SystemMouseCursor">SystemMouseCursor</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="47005.0" y="2518.5" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M47005.0 2549.5 L47456.0 2549.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M47005.0 2655.5 L47456.0 2655.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
+					<g data-name="ISyncIndicatorViewModel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ISyncIndicatorViewModel">
+							<rect x="23989.3" y="98.0" height="77.0" width="214.0" data-name="ISyncIndicatorViewModel"></rect>
+							<path d="M23989.3 129.0 L24203.3 129.0" fill="none" data-name="ISyncIndicatorViewModel"></path>
 						</g>
-						<g transform="translate(47005, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
+						<g transform="translate(23989.25, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ISyncIndicatorViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ISyncIndicatorViewModel">
+								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="ISyncIndicatorViewModel">ISyncIndicatorViewModel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47005, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
+						<g transform="translate(23989.25, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ISyncIndicatorViewModel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ISyncIndicatorViewModel">
+								<text x="0.0" y="13.5" stroke="none" data-name="ISyncIndicatorViewModel">+isDirty: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ISyncIndicatorViewModel">+lastSynced: DateTime?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47005, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
+					</g>
+					<g data-name="SyncIndicator">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SyncIndicator">
+							<rect x="41764.8" y="2564.0" height="122.0" width="208.0" data-name="SyncIndicator"></rect>
+							<path d="M41764.8 2595.0 L41972.8 2595.0" fill="none" data-name="SyncIndicator"></path>
+						</g>
+						<g transform="translate(41764.75, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SyncIndicator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SyncIndicator">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="SyncIndicator">SyncIndicator</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="46911.3" y="3485.0" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
-						</g>
-						<g transform="translate(46911.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
+						<g transform="translate(41764.75, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SyncIndicator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SyncIndicator">
+								<text x="0.0" y="13.5" stroke="none" data-name="SyncIndicator">+state: AsyncValue&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SyncIndicator">+lastSynced: DateTime?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SyncIndicator">+isDirty: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SyncIndicator">+animationDuration: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SyncIndicator">+iconSize: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="13698.5" y="3447.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M13698.5 3478.0 L14081.5 3478.0" fill="none" data-name="ReportSectionType"></path>
+					<g data-name="BannerBox">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BannerBox">
+							<rect x="42012.8" y="2534.0" height="182.0" width="298.0" data-name="BannerBox"></rect>
+							<path d="M42012.8 2565.0 L42310.8 2565.0" fill="none" data-name="BannerBox"></path>
 						</g>
-						<g transform="translate(13698.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
+						<g transform="translate(42012.75, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerBox">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerBox">
+								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerBox">BannerBox</text>
 								
 							</g>
 						</g>
-						<g transform="translate(13698.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
+						<g transform="translate(42012.75, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerBox">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerBox">
+								<text x="0.0" y="13.5" stroke="none" data-name="BannerBox">+prefixIcon: Widget?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BannerBox">+body: Widget</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BannerBox">+style: BannerStyle</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="BannerBox">+padding: EdgeInsets?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="BannerBox">+noPrefix: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="BannerBox">+dismissable: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="BannerBox">+isDismissed: bool?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="BannerBox">+onDismissed: dynamic Function()?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="BannerBox">+dismissIconSize: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="26295.8" y="1636.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M26295.8 1667.0 L26774.8 1667.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M26295.8 1728.0 L26774.8 1728.0" fill="none" data-name="AverageSectionFormView"></path>
+					<g data-name="BannerStyle">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BannerStyle">
+							<rect x="23149.0" y="3439.5" height="122.0" width="294.0" data-name="BannerStyle"></rect>
+							<path d="M23149.0 3470.5 L23443.0 3470.5" fill="none" data-name="BannerStyle"></path>
 						</g>
-						<g transform="translate(26295.75, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
+						<g transform="translate(23149, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerStyle">
+								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerStyle">BannerStyle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26295.75, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+						<g transform="translate(23149, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerStyle">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerStyle">
+								<text x="0.0" y="13.5" stroke="none" data-name="BannerStyle">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+values: List&lt;BannerStyle&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+warning: BannerStyle</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+info: BannerStyle</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+error: BannerStyle</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26295.75, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
+					</g>
+					<g data-name="ReactiveCustomColorPicker">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveCustomColorPicker">
+							<rect x="19584.8" y="614.0" height="31.0" width="236.0" data-name="ReactiveCustomColorPicker"></rect>
+						</g>
+						<g transform="translate(19584.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveCustomColorPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveCustomColorPicker">
+								<text x="110.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveCustomColorPicker">ReactiveCustomColorPicker</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="38452.5" y="2338.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M38452.5 2369.5 L39439.5 2369.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M38452.5 2805.5 L39439.5 2805.5" fill="none" data-name="ReportItemFormViewModel"></path>
+					<g data-name="ReactiveFormField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFormField">
+							<rect x="19621.3" y="121.0" height="31.0" width="163.0" data-name="ReactiveFormField"></rect>
 						</g>
-						<g transform="translate(38452.5, 2338.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
-								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
+						<g transform="translate(19621.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFormField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFormField">
+								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFormField">ReactiveFormField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38452.5, 2369.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
+					</g>
+					<g data-name="SingleColumnLayout">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayout">
+							<rect x="42670.8" y="2526.0" height="198.0" width="418.0" data-name="SingleColumnLayout"></rect>
+							<path d="M42670.8 2557.0 L43088.8 2557.0" fill="none" data-name="SingleColumnLayout"></path>
+							<path d="M42670.8 2693.0 L43088.8 2693.0" fill="none" data-name="SingleColumnLayout"></path>
+						</g>
+						<g transform="translate(42670.75, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayout">
+								<text x="201.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayout">SingleColumnLayout</text>
+								
+							</g>
+						</g>
+						<g transform="translate(42670.75, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraints: BoxConstraints</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraintsNarrow: BoxConstraints</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayout">+body: Widget</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayout">+header: Widget?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayout">+stickyHeader: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayout">+constraints: BoxConstraints?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="SingleColumnLayout">+scroll: bool</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="SingleColumnLayout">+padding: EdgeInsets?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(38452.5, 2805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
+						<g transform="translate(42670.75, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+dynamic fromType()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="79224.3" y="583.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M79224.3 614.0 L79428.3 614.0" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M79224.3 645.0 L79428.3 645.0" fill="none" data-name="DataReferenceIdentifier"></path>
+					<g data-name="UnderConstruction">
+						<g fill="#eee8d5" stroke="#33322E" data-name="UnderConstruction">
+							<rect x="24528.3" y="105.5" height="62.0" width="164.0" data-name="UnderConstruction"></rect>
+							<path d="M24528.3 136.5 L24692.3 136.5" fill="none" data-name="UnderConstruction"></path>
 						</g>
-						<g transform="translate(79224.25, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
+						<g transform="translate(24528.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnderConstruction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnderConstruction">
+								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="UnderConstruction">UnderConstruction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79224.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
+						<g transform="translate(24528.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnderConstruction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnderConstruction">
+								<text x="0.0" y="13.5" stroke="none" data-name="UnderConstruction">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79224.25, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
+					</g>
+					<g data-name="NullHelperDecoration">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NullHelperDecoration">
+							<rect x="20009.3" y="614.0" height="31.0" width="184.0" data-name="NullHelperDecoration"></rect>
+						</g>
+						<g transform="translate(20009.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NullHelperDecoration">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NullHelperDecoration">
+								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="NullHelperDecoration">NullHelperDecoration</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="79258.8" y="121.0" height="31.0" width="135.0" data-name="DataReference"></rect>
+					<g data-name="InputDecoration">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InputDecoration">
+							<rect x="20030.3" y="121.0" height="31.0" width="142.0" data-name="InputDecoration"></rect>
 						</g>
-						<g transform="translate(79258.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
+						<g transform="translate(20030.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InputDecoration">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InputDecoration">
+								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="InputDecoration">InputDecoration</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="26814.8" y="1636.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M26814.8 1667.0 L27293.8 1667.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M26814.8 1728.0 L27293.8 1728.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
+					<g data-name="HelpIcon">
+						<g fill="#eee8d5" stroke="#33322E" data-name="HelpIcon">
+							<rect x="43529.0" y="90.0" height="93.0" width="174.0" data-name="HelpIcon"></rect>
+							<path d="M43529.0 121.0 L43703.0 121.0" fill="none" data-name="HelpIcon"></path>
+							<path d="M43529.0 152.0 L43703.0 152.0" fill="none" data-name="HelpIcon"></path>
 						</g>
-						<g transform="translate(26814.75, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
+						<g transform="translate(43529, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HelpIcon">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HelpIcon">
+								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="HelpIcon">HelpIcon</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26814.75, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
+						<g transform="translate(43529, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
+								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+tooltipText: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(26814.75, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
+						<g transform="translate(43529, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
+								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="41809.3" y="1613.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M41809.3 1644.5 L42276.3 1644.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M41809.3 1720.5 L42276.3 1720.5" fill="none" data-name="ReportItemFormView"></path>
-						</g>
-						<g transform="translate(41809.25, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
-								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
-								
-							</g>
+					<g data-name="Collapsible">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Collapsible">
+							<rect x="21004.3" y="83.0" height="107.0" width="441.0" data-name="Collapsible"></rect>
+							<path d="M21004.3 114.0 L21445.3 114.0" fill="none" data-name="Collapsible"></path>
 						</g>
-						<g transform="translate(41809.25, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
+						<g transform="translate(21004.25, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Collapsible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Collapsible">
+								<text x="212.5" y="13.5" stroke="none" text-anchor="middle" data-name="Collapsible">Collapsible</text>
 								
 							</g>
 						</g>
-						<g transform="translate(41809.25, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
+						<g transform="translate(21004.25, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Collapsible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Collapsible">
+								<text x="0.0" y="13.5" stroke="none" data-name="Collapsible">+contentBuilder: Widget Function(BuildContext, bool)</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Collapsible">+headerBuilder: Widget Function(BuildContext, bool)?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Collapsible">+title: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Collapsible">+isCollapsed: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="64778.3" y="2451.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M64778.3 2482.0 L65638.3 2482.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M64778.3 2648.0 L65638.3 2648.0" fill="none" data-name="ReportsFormViewModel"></path>
+					<g data-name="Widget Function(BuildContext, bool)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)">
+							<rect x="20654.0" y="614.0" height="31.0" width="300.0" data-name="Widget Function(BuildContext, bool)"></rect>
 						</g>
-						<g transform="translate(64778.25, 2451)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
-								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
+						<g transform="translate(20654, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)">
+								<text x="142.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)">Widget Function(BuildContext, bool)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(64778.25, 2482)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
-								
-							</g>
+					</g>
+					<g data-name="Widget Function(BuildContext, bool)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)?">
+							<rect x="22500.8" y="614.0" height="31.0" width="310.0" data-name="Widget Function(BuildContext, bool)?"></rect>
 						</g>
-						<g transform="translate(64778.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
+						<g transform="translate(22500.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)?">
+								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)?">Widget Function(BuildContext, bool)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportFormItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="65810.0" y="1591.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M65810.0 1622.0 L66653.0 1622.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M65810.0 1698.0 L66653.0 1698.0" fill="none" data-name="ReportFormItemDelegate"></path>
+					<g data-name="TextParagraph">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TextParagraph">
+							<rect x="43128.8" y="2556.0" height="138.0" width="208.0" data-name="TextParagraph"></rect>
+							<path d="M43128.8 2587.0 L43336.8 2587.0" fill="none" data-name="TextParagraph"></path>
+							<path d="M43128.8 2663.0 L43336.8 2663.0" fill="none" data-name="TextParagraph"></path>
 						</g>
-						<g transform="translate(65810, 1591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
-								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
+						<g transform="translate(43128.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextParagraph">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextParagraph">
+								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextParagraph">TextParagraph</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65810, 1622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
+						<g transform="translate(43128.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
+								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+text: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TextParagraph">+style: TextStyle?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TextParagraph">+selectable: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TextParagraph">+span: List&lt;TextSpan&gt;?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65810, 1698)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
+						<g transform="translate(43128.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
+								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="48983.0" y="2556.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M48983.0 2587.0 L49180.0 2587.0" fill="none" data-name="ReportBadge"></path>
-							<path d="M48983.0 2663.0 L49180.0 2663.0" fill="none" data-name="ReportBadge"></path>
+					<g data-name="StudyULogo">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyULogo">
+							<rect x="43045.3" y="3797.0" height="93.0" width="214.0" data-name="StudyULogo"></rect>
+							<path d="M43045.3 3828.0 L43259.3 3828.0" fill="none" data-name="StudyULogo"></path>
+							<path d="M43045.3 3859.0 L43259.3 3859.0" fill="none" data-name="StudyULogo"></path>
 						</g>
-						<g transform="translate(48983, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
+						<g transform="translate(43045.25, 3797)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyULogo">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyULogo">
+								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyULogo">StudyULogo</text>
 								
 							</g>
 						</g>
-						<g transform="translate(48983, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
+						<g transform="translate(43045.25, 3828)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+onTap: void Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(48983, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
+						<g transform="translate(43045.25, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="20608.5" y="3447.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M20608.5 3478.0 L20909.5 3478.0" fill="none" data-name="ReportStatus"></path>
+					<g data-name="Hyperlink">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Hyperlink">
+							<rect x="43377.5" y="2519.0" height="212.0" width="222.0" data-name="Hyperlink"></rect>
+							<path d="M43377.5 2550.0 L43599.5 2550.0" fill="none" data-name="Hyperlink"></path>
 						</g>
-						<g transform="translate(20608.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
+						<g transform="translate(43377.5, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Hyperlink">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Hyperlink">
+								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="Hyperlink">Hyperlink</text>
 								
 							</g>
 						</g>
-						<g transform="translate(20608.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
+						<g transform="translate(43377.5, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Hyperlink">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Hyperlink">
+								<text x="0.0" y="13.5" stroke="none" data-name="Hyperlink">+text: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Hyperlink">+url: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Hyperlink">+onClick: void Function()?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Hyperlink">+linkColor: Color</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Hyperlink">+hoverColor: Color?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Hyperlink">+visitedColor: Color?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Hyperlink">+style: TextStyle?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Hyperlink">+hoverStyle: TextStyle?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="Hyperlink">+visitedStyle: TextStyle?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="Hyperlink">+icon: IconData?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="Hyperlink">+iconSize: double?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="49220.0" y="2563.5" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M49220.0 2594.5 L49558.0 2594.5" fill="none" data-name="ReportsFormData"></path>
-							<path d="M49220.0 2640.5 L49558.0 2640.5" fill="none" data-name="ReportsFormData"></path>
+					<g data-name="ConstrainedWidthFlexible">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConstrainedWidthFlexible">
+							<rect x="43639.5" y="2533.5" height="183.0" width="287.0" data-name="ConstrainedWidthFlexible"></rect>
+							<path d="M43639.5 2564.5 L43926.5 2564.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
+							<path d="M43639.5 2670.5 L43926.5 2670.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
 						</g>
-						<g transform="translate(49220, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
+						<g transform="translate(43639.5, 2533.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConstrainedWidthFlexible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConstrainedWidthFlexible">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConstrainedWidthFlexible">ConstrainedWidthFlexible</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49220, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
+						<g transform="translate(43639.5, 2564.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+minWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">+maxWidth: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ConstrainedWidthFlexible">+flex: int</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ConstrainedWidthFlexible">+flexSum: int</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ConstrainedWidthFlexible">+child: Widget</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ConstrainedWidthFlexible">+outerConstraints: BoxConstraints</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49220, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
+						<g transform="translate(43639.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">-double _getWidth()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInfoFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="71210.8" y="2383.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M71210.8 2414.5 L71906.8 2414.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M71210.8 2820.5 L71906.8 2820.5" fill="none" data-name="StudyInfoFormViewModel"></path>
+					<g data-name="ActionMenuInline">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuInline">
+							<rect x="43939.0" y="52.5" height="168.0" width="324.0" data-name="ActionMenuInline"></rect>
+							<path d="M43939.0 83.5 L44263.0 83.5" fill="none" data-name="ActionMenuInline"></path>
+							<path d="M43939.0 189.5 L44263.0 189.5" fill="none" data-name="ActionMenuInline"></path>
 						</g>
-						<g transform="translate(71210.75, 2383.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
+						<g transform="translate(43939, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuInline">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuInline">
+								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuInline">ActionMenuInline</text>
 								
 							</g>
 						</g>
-						<g transform="translate(71210.75, 2414.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
+						<g transform="translate(43939, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuInline">+iconSize: double?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuInline">+visible: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuInline">+splashRadius: double?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ActionMenuInline">+paddingVertical: double?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ActionMenuInline">+paddingHorizontal: double?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(71210.75, 2820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
+						<g transform="translate(43939, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
+								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignInfoFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="34968.5" y="3469.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M34968.5 3500.5 L35191.5 3500.5" fill="none" data-name="StudyDesignInfoFormView"></path>
+					<g data-name="SecondaryButton">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SecondaryButton">
+							<rect x="44013.8" y="2556.0" height="138.0" width="249.0" data-name="SecondaryButton"></rect>
+							<path d="M44013.8 2587.0 L44262.8 2587.0" fill="none" data-name="SecondaryButton"></path>
+							<path d="M44013.8 2663.0 L44262.8 2663.0" fill="none" data-name="SecondaryButton"></path>
 						</g>
-						<g transform="translate(34968.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
+						<g transform="translate(44013.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecondaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecondaryButton">
+								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecondaryButton">SecondaryButton</text>
 								
 							</g>
 						</g>
-						<g transform="translate(34968.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
+						<g transform="translate(44013.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+text: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SecondaryButton">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SecondaryButton">+isLoading: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="SecondaryButton">+onPressed: void Function()?</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="49598.0" y="2541.0" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M49598.0 2572.0 L50012.0 2572.0" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M49598.0 2663.0 L50012.0 2663.0" fill="none" data-name="StudyInfoFormData"></path>
-						</g>
-						<g transform="translate(49598, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
+						<g transform="translate(44013.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
+								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+Widget build()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49598, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
+					</g>
+					<g data-name="TabbedNavbar">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TabbedNavbar">
+							<rect x="44643.0" y="2496.5" height="257.0" width="308.0" data-name="TabbedNavbar"></rect>
+							<path d="M44643.0 2527.5 L44951.0 2527.5" fill="none" data-name="TabbedNavbar"></path>
+						</g>
+						<g transform="translate(44643, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabbedNavbar">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabbedNavbar">
+								<text x="146.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabbedNavbar">TabbedNavbar</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49598, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
+						<g transform="translate(44643, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TabbedNavbar">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TabbedNavbar">
+								<text x="0.0" y="13.5" stroke="none" data-name="TabbedNavbar">+tabs: List&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TabbedNavbar">+selectedTab: T?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TabbedNavbar">+indicator: BoxDecoration?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="TabbedNavbar">+height: double?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="TabbedNavbar">+disabledBackgroundColor: Color?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="TabbedNavbar">+disabledTooltipText: String?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="TabbedNavbar">+onSelect: void Function(int, T)?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="TabbedNavbar">+labelPadding: EdgeInsets?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="TabbedNavbar">+labelSpacing: double?</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="TabbedNavbar">+indicatorSize: TabBarIndicatorSize?</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="TabbedNavbar">+isScrollable: bool</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="TabbedNavbar">+backgroundColor: Color?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="TabbedNavbar">+labelColorHover: Color?</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="TabbedNavbar">+unselectedLabelColorHover: Color?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyContactInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="49754.5" y="3386.5" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M49754.5 3417.5 L50102.5 3417.5" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M49754.5 3568.5 L50102.5 3568.5" fill="none" data-name="StudyContactInfoFormData"></path>
+					<g data-name="BoxDecoration">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BoxDecoration">
+							<rect x="45527.5" y="3485.0" height="31.0" width="132.0" data-name="BoxDecoration"></rect>
 						</g>
-						<g transform="translate(49754.5, 3386.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
-								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
+						<g transform="translate(45527.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxDecoration">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxDecoration">
+								<text x="58.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxDecoration">BoxDecoration</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49754.5, 3417.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
+					</g>
+					<g data-name="void Function(int, T)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(int, T)?">
+							<rect x="45699.5" y="3485.0" height="31.0" width="183.0" data-name="void Function(int, T)?"></rect>
+						</g>
+						<g transform="translate(45699.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(int, T)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(int, T)?">
+								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(int, T)?">void Function(int, T)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(49754.5, 3568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
+					</g>
+					<g data-name="TabBarIndicatorSize">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TabBarIndicatorSize">
+							<rect x="46128.5" y="3485.0" height="31.0" width="176.0" data-name="TabBarIndicatorSize"></rect>
+						</g>
+						<g transform="translate(46128.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabBarIndicatorSize">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabBarIndicatorSize">
+								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabBarIndicatorSize">TabBarIndicatorSize</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormValidationSet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="2051.0" y="3462.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M2051.0 3493.0 L2438.0 3493.0" fill="none" data-name="StudyFormValidationSet"></path>
+					<g data-name="StandardDialog">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StandardDialog">
+							<rect x="45103.5" y="2488.5" height="273.0" width="247.0" data-name="StandardDialog"></rect>
+							<path d="M45103.5 2519.5 L45350.5 2519.5" fill="none" data-name="StandardDialog"></path>
+							<path d="M45103.5 2730.5 L45350.5 2730.5" fill="none" data-name="StandardDialog"></path>
 						</g>
-						<g transform="translate(2051, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
-								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
+						<g transform="translate(45103.5, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardDialog">
+								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardDialog">StandardDialog</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2051, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
+						<g transform="translate(45103.5, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+title: Widget?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StandardDialog">+titleText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StandardDialog">+body: Widget</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StandardDialog">+actionButtons: List&lt;Widget&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StandardDialog">+backgroundColor: Color?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StandardDialog">+borderRadius: double?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StandardDialog">+width: double?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StandardDialog">+height: double?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StandardDialog">+minWidth: double</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StandardDialog">+minHeight: double</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="StandardDialog">+maxWidth: double?</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="StandardDialog">+maxHeight: double?</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="StandardDialog">+padding: EdgeInsets</text>
+								
+							</g>
+						</g>
+						<g transform="translate(45103.5, 2730.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
+								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="50092.0" y="2563.5" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M50092.0 2594.5 L50586.0 2594.5" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M50092.0 2640.5 L50586.0 2640.5" fill="none" data-name="MeasurementsFormData"></path>
+					<g data-name="FormTableRow">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRow">
+							<rect x="45390.5" y="2549.0" height="152.0" width="379.0" data-name="FormTableRow"></rect>
+							<path d="M45390.5 2580.0 L45769.5 2580.0" fill="none" data-name="FormTableRow"></path>
 						</g>
-						<g transform="translate(50092, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
-								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
+						<g transform="translate(45390.5, 2549)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRow">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRow">
+								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRow">FormTableRow</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50092, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
+						<g transform="translate(45390.5, 2580)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRow">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRow">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRow">+label: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRow">+labelBuilder: Widget Function(BuildContext)?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRow">+labelStyle: TextStyle?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRow">+labelHelpText: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormTableRow">+input: Widget</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormTableRow">+control: AbstractControl&lt;dynamic&gt;?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="FormTableRow">+layout: FormTableRowLayout?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50092, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
+					</g>
+					<g data-name="Widget Function(BuildContext)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
+							<rect x="46473.5" y="3485.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
+						</g>
+						<g transform="translate(46473.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
+								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="42356.3" y="1666.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M42356.3 1697.5 L42800.3 1697.5" fill="none" data-name="MeasurementSurveyFormView"></path>
+					<g data-name="FormTableRowLayout">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRowLayout">
+							<rect x="40614.0" y="3447.0" height="107.0" width="370.0" data-name="FormTableRowLayout"></rect>
+							<path d="M40614.0 3478.0 L40984.0 3478.0" fill="none" data-name="FormTableRowLayout"></path>
 						</g>
-						<g transform="translate(42356.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
+						<g transform="translate(40614, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRowLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRowLayout">
+								<text x="177.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRowLayout">FormTableRowLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(42356.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
+						<g transform="translate(40614, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRowLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRowLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRowLayout">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+values: List&lt;FormTableRowLayout&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+vertical: FormTableRowLayout</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+horizontal: FormTableRowLayout</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="62772.3" y="2413.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M62772.3 2444.5 L63468.3 2444.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M62772.3 2670.5 L63468.3 2670.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
+					<g data-name="FormTableLayout">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableLayout">
+							<rect x="45809.5" y="2548.5" height="153.0" width="379.0" data-name="FormTableLayout"></rect>
+							<path d="M45809.5 2579.5 L46188.5 2579.5" fill="none" data-name="FormTableLayout"></path>
+							<path d="M45809.5 2670.5 L46188.5 2670.5" fill="none" data-name="FormTableLayout"></path>
 						</g>
-						<g transform="translate(62772.25, 2413.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
+						<g transform="translate(45809.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableLayout">
+								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableLayout">FormTableLayout</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62772.25, 2444.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(45809.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+rows: List&lt;FormTableRow&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormTableLayout">+columnWidths: Map&lt;int, TableColumnWidth&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormTableLayout">+rowDivider: Widget?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormTableLayout">+rowLayout: FormTableRowLayout?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormTableLayout">+rowLabelStyle: TextStyle?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(62772.25, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
+						<g transform="translate(45809.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="27333.8" y="1651.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M27333.8 1682.0 L27677.8 1682.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M27333.8 1713.0 L27677.8 1713.0" fill="none" data-name="SurveyPreview"></path>
+					<g data-name="FormSectionHeader">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormSectionHeader">
+							<rect x="46228.5" y="2548.5" height="153.0" width="220.0" data-name="FormSectionHeader"></rect>
+							<path d="M46228.5 2579.5 L46448.5 2579.5" fill="none" data-name="FormSectionHeader"></path>
+							<path d="M46228.5 2670.5 L46448.5 2670.5" fill="none" data-name="FormSectionHeader"></path>
 						</g>
-						<g transform="translate(27333.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
+						<g transform="translate(46228.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSectionHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSectionHeader">
+								<text x="102.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormSectionHeader">FormSectionHeader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27333.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
+						<g transform="translate(46228.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormSectionHeader">+titleTextStyle: TextStyle?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormSectionHeader">+helpText: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormSectionHeader">+divider: bool</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormSectionHeader">+helpTextDisabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27333.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
+						<g transform="translate(46228.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="55533.3" y="2526.0" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M55533.3 2557.0 L55942.3 2557.0" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M55533.3 2678.0 L55942.3 2678.0" fill="none" data-name="MeasurementSurveyFormData"></path>
+					<g data-name="FormLabel">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormLabel">
+							<rect x="46488.5" y="2556.0" height="138.0" width="266.0" data-name="FormLabel"></rect>
+							<path d="M46488.5 2587.0 L46754.5 2587.0" fill="none" data-name="FormLabel"></path>
+							<path d="M46488.5 2663.0 L46754.5 2663.0" fill="none" data-name="FormLabel"></path>
 						</g>
-						<g transform="translate(55533.25, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
+						<g transform="translate(46488.5, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormLabel">
+								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormLabel">FormLabel</text>
 								
 							</g>
 						</g>
-						<g transform="translate(55533.25, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
+						<g transform="translate(46488.5, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+labelText: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormLabel">+helpText: String?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormLabel">+labelTextStyle: TextStyle?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormLabel">+layout: FormTableRowLayout?</text>
 								
 							</g>
-						</g>
-						<g transform="translate(55533.25, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
+						</g>
+						<g transform="translate(46488.5, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="52519.0" y="3431.5" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M52519.0 3462.5 L52887.0 3462.5" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M52519.0 3508.5 L52887.0 3508.5" fill="none" data-name="QuestionnaireFormData"></path>
+					<g data-name="Badge">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Badge">
+							<rect x="46794.5" y="2496.0" height="258.0" width="263.0" data-name="Badge"></rect>
+							<path d="M46794.5 2527.0 L47057.5 2527.0" fill="none" data-name="Badge"></path>
+							<path d="M46794.5 2678.0 L47057.5 2678.0" fill="none" data-name="Badge"></path>
 						</g>
-						<g transform="translate(52519, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
+						<g transform="translate(46794.5, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Badge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Badge">
+								<text x="123.5" y="13.5" stroke="none" text-anchor="middle" data-name="Badge">Badge</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52519, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
+						<g transform="translate(46794.5, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
+								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+icon: IconData?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Badge">+color: Color?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Badge">+borderRadius: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Badge">+label: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Badge">+type: BadgeType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Badge">+padding: EdgeInsets</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Badge">+iconSize: double?</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Badge">+labelStyle: TextStyle?</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="Badge">+center: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52519, 3508.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
+						<g transform="translate(46794.5, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
+								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Badge">-Color? _getBackgroundColor()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Badge">-Color _getBorderColor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Badge">-Color? _getLabelColor()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="63074.3" y="1568.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M63074.3 1599.5 L63706.3 1599.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M63074.3 1705.5 L63706.3 1705.5" fill="none" data-name="WithQuestionnaireControls"></path>
+					<g data-name="AsyncValueWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValueWidget">
+							<rect x="47734.8" y="2526.0" height="198.0" width="384.0" data-name="AsyncValueWidget"></rect>
+							<path d="M47734.8 2557.0 L48118.8 2557.0" fill="none" data-name="AsyncValueWidget"></path>
+							<path d="M47734.8 2648.0 L48118.8 2648.0" fill="none" data-name="AsyncValueWidget"></path>
 						</g>
-						<g transform="translate(63074.25, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
+						<g transform="translate(47734.75, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AsyncValueWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValueWidget">
+								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValueWidget">AsyncValueWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63074.25, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
+						<g transform="translate(47734.75, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+value: AsyncValue&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">+data: Widget Function(T)</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">+error: Widget Function(Object, StackTrace?)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">+loading: Widget Function()?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="AsyncValueWidget">+empty: Widget Function()?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(63074.25, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
+						<g transform="translate(47734.75, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
+								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+Widget build()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">-Widget _buildDataOrEmptyWidget()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultError()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultLoad()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignMeasurementsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="35231.5" y="3469.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M35231.5 3500.5 L35541.5 3500.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
+					<g data-name="Widget Function(Object, StackTrace?)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Object, StackTrace?)?">
+							<rect x="48357.3" y="3485.0" height="31.0" width="326.0" data-name="Widget Function(Object, StackTrace?)?"></rect>
 						</g>
-						<g transform="translate(35231.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
+						<g transform="translate(48357.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Object, StackTrace?)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Object, StackTrace?)?">
+								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Object, StackTrace?)?">Widget Function(Object, StackTrace?)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(35231.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
+					</g>
+					<g data-name="Widget Function()?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function()?">
+							<rect x="48723.3" y="3485.0" height="31.0" width="166.0" data-name="Widget Function()?"></rect>
+						</g>
+						<g transform="translate(48723.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function()?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function()?">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function()?">Widget Function()?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="66914.8" y="2443.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M66914.8 2474.5 L68006.8 2474.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M66914.8 2625.5 L68006.8 2625.5" fill="none" data-name="MeasurementsFormViewModel"></path>
+					<g data-name="IconPack">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPack">
+							<rect x="44303.0" y="82.5" height="108.0" width="359.0" data-name="IconPack"></rect>
+							<path d="M44303.0 113.5 L44662.0 113.5" fill="none" data-name="IconPack"></path>
+							<path d="M44303.0 159.5 L44662.0 159.5" fill="none" data-name="IconPack"></path>
 						</g>
-						<g transform="translate(66914.75, 2443.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
-								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
+						<g transform="translate(44303, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPack">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPack">
+								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPack">IconPack</text>
 								
 							</g>
 						</g>
-						<g transform="translate(66914.75, 2474.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(44303, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+defaultPack: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPack">&lt;static&gt;+material: List&lt;IconOption&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(66914.75, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
+						<g transform="translate(44303, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+IconOption? resolveIconByName()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="27488.8" y="2563.5" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M27488.8 2594.5 L27876.8 2594.5" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M27488.8 2655.5 L27876.8 2655.5" fill="none" data-name="StudyFormScaffold"></path>
+					<g data-name="IconOption">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconOption">
+							<rect x="27073.8" y="2548.5" height="153.0" width="264.0" data-name="IconOption"></rect>
+							<path d="M27073.8 2579.5 L27337.8 2579.5" fill="none" data-name="IconOption"></path>
+							<path d="M27073.8 2655.5 L27337.8 2655.5" fill="none" data-name="IconOption"></path>
 						</g>
-						<g transform="translate(27488.75, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
+						<g transform="translate(27073.75, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconOption">
+								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="IconOption">IconOption</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27488.75, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
+						<g transform="translate(27073.75, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+name: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">+icon: IconData?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconOption">+isEmpty: bool</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IconOption">+props: List&lt;Object?&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27488.75, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
+						<g transform="translate(27073.75, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+String toJson()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">&lt;static&gt;+IconOption fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="T Function(WidgetRef)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="27548.3" y="3485.0" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
+					<g data-name="ReactiveIconPicker">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveIconPicker">
+							<rect x="24281.8" y="614.0" height="31.0" width="168.0" data-name="ReactiveIconPicker"></rect>
 						</g>
-						<g transform="translate(27548.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
+						<g transform="translate(24281.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveIconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveIconPicker">
+								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveIconPicker">ReactiveIconPicker</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="53187.3" y="2496.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M53187.3 2527.0 L53883.3 2527.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M53187.3 2693.0 L53883.3 2693.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-						</g>
-						<g transform="translate(53187.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(53187.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
+					<g data-name="ReactiveFocusableFormField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFocusableFormField">
+							<rect x="24243.3" y="121.0" height="31.0" width="245.0" data-name="ReactiveFocusableFormField"></rect>
 						</g>
-						<g transform="translate(53187.25, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
+						<g transform="translate(24243.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFocusableFormField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFocusableFormField">
+								<text x="114.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFocusableFormField">ReactiveFocusableFormField</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyDesignEnrollmentFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="35581.5" y="3454.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M35581.5 3485.5 L36030.5 3485.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
-						</g>
-						<g transform="translate(35581.5, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
-								
-							</g>
+					<g data-name="IconPicker">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPicker">
+							<rect x="37687.0" y="1606.0" height="183.0" width="319.0" data-name="IconPicker"></rect>
+							<path d="M37687.0 1637.0 L38006.0 1637.0" fill="none" data-name="IconPicker"></path>
+							<path d="M37687.0 1758.0 L38006.0 1758.0" fill="none" data-name="IconPicker"></path>
 						</g>
-						<g transform="translate(35581.5, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
+						<g transform="translate(37687, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPicker">
+								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPicker">IconPicker</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IScreenerQuestionLogicFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="52303.3" y="2594.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M52303.3 2625.0 L52635.3 2625.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
-						</g>
-						<g transform="translate(52303.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
+						<g transform="translate(37687, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+iconOptions: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPicker">+selectedOption: IconOption?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconPicker">+onSelect: void Function(IconOption)?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IconPicker">+galleryIconSize: double?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IconPicker">+selectedIconSize: double?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IconPicker">+focusNode: FocusNode?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="IconPicker">+isDisabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52303.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+						<g transform="translate(37687, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionLogicFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="81582.0" y="2556.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M81582.0 2587.0 L82006.0 2587.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M81582.0 2618.0 L82006.0 2618.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
+					<g data-name="void Function(IconOption)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(IconOption)?">
+							<rect x="37835.5" y="2609.5" height="31.0" width="230.0" data-name="void Function(IconOption)?"></rect>
 						</g>
-						<g transform="translate(81582, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
-								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
+						<g transform="translate(37835.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(IconOption)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(IconOption)?">
+								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(IconOption)?">void Function(IconOption)?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(81582, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
-								
-							</g>
+					</g>
+					<g data-name="FocusNode">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FocusNode">
+							<rect x="37689.5" y="2609.5" height="31.0" width="106.0" data-name="FocusNode"></rect>
 						</g>
-						<g transform="translate(81582, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
+						<g transform="translate(37689.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FocusNode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FocusNode">
+								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="FocusNode">FocusNode</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScreenerQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="60618.3" y="3334.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M60618.3 3365.0 L61180.3 3365.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M60618.3 3546.0 L61180.3 3546.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
+					<g data-name="IconPickerField">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerField">
+							<rect x="38046.0" y="1606.0" height="183.0" width="319.0" data-name="IconPickerField"></rect>
+							<path d="M38046.0 1637.0 L38365.0 1637.0" fill="none" data-name="IconPickerField"></path>
+							<path d="M38046.0 1758.0 L38365.0 1758.0" fill="none" data-name="IconPickerField"></path>
 						</g>
-						<g transform="translate(60618.25, 3334)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
-								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
+						<g transform="translate(38046, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerField">
+								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerField">IconPickerField</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60618.25, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
+						<g transform="translate(38046, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+iconOptions: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerField">+selectedOption: IconOption?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerField">+selectedIconSize: double?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="IconPickerField">+galleryIconSize: double?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="IconPickerField">+onSelect: void Function(IconOption)?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="IconPickerField">+focusNode: FocusNode?</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="IconPickerField">+isDisabled: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(60618.25, 3546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
+						<g transform="translate(38046, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="50893.3" y="1613.5" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M50893.3 1644.5 L51151.3 1644.5" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M50893.3 1735.5 L51151.3 1735.5" fill="none" data-name="ConsentItemFormData"></path>
+					<g data-name="IconPickerGallery">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerGallery">
+							<rect x="38405.0" y="1636.0" height="123.0" width="319.0" data-name="IconPickerGallery"></rect>
+							<path d="M38405.0 1667.0 L38724.0 1667.0" fill="none" data-name="IconPickerGallery"></path>
+							<path d="M38405.0 1728.0 L38724.0 1728.0" fill="none" data-name="IconPickerGallery"></path>
 						</g>
-						<g transform="translate(50893.25, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
+						<g transform="translate(38405, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerGallery">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerGallery">
+								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerGallery">IconPickerGallery</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50893.25, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
+						<g transform="translate(38405, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+iconOptions: List&lt;IconOption&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerGallery">+onSelect: void Function(IconOption)?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerGallery">+iconSize: double</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50893.25, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
+						<g transform="translate(38405, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
+								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="44337.0" y="1666.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M44337.0 1697.5 L44718.0 1697.5" fill="none" data-name="ConsentItemFormView"></path>
+					<g data-name="HtmlStylingBanner">
+						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlStylingBanner">
+							<rect x="49290.8" y="2571.0" height="108.0" width="298.0" data-name="HtmlStylingBanner"></rect>
+							<path d="M49290.8 2602.0 L49588.8 2602.0" fill="none" data-name="HtmlStylingBanner"></path>
+							<path d="M49290.8 2648.0 L49588.8 2648.0" fill="none" data-name="HtmlStylingBanner"></path>
 						</g>
-						<g transform="translate(44337, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
+						<g transform="translate(49290.75, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlStylingBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlStylingBanner">
+								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlStylingBanner">HtmlStylingBanner</text>
 								
 							</g>
 						</g>
-						<g transform="translate(44337, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
+						<g transform="translate(49290.75, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
+								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+isDismissed: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="HtmlStylingBanner">+onDismissed: dynamic Function()?</text>
+								
+							</g>
+						</g>
+						<g transform="translate(49290.75, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
+								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="50626.0" y="2541.0" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M50626.0 2572.0 L51080.0 2572.0" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M50626.0 2663.0 L51080.0 2663.0" fill="none" data-name="EnrollmentFormData"></path>
+					<g data-name="IndicatorRangeSliderThumbShape">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IndicatorRangeSliderThumbShape">
+							<rect x="30601.3" y="560.5" height="138.0" width="287.0" data-name="IndicatorRangeSliderThumbShape"></rect>
+							<path d="M30601.3 591.5 L30888.3 591.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
+							<path d="M30601.3 652.5 L30888.3 652.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
 						</g>
-						<g transform="translate(50626, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
-								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
+						<g transform="translate(30601.25, 560.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IndicatorRangeSliderThumbShape">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="IndicatorRangeSliderThumbShape">IndicatorRangeSliderThumbShape</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50626, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
+						<g transform="translate(30601.25, 591.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
+								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+buildContext: BuildContext</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+start: T</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+end: T</text>
 								
 							</g>
 						</g>
-						<g transform="translate(50626, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
+						<g transform="translate(30601.25, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
+								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+Size getPreferredSize()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+void paint()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="47930.0" y="1956.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M47930.0 1987.0 L48943.0 1987.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M47930.0 3008.0 L48943.0 3008.0" fill="none" data-name="QuestionFormViewModel"></path>
+					<g data-name="BuildContext">
+						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
+							<rect x="30686.8" y="1197.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
 						</g>
-						<g transform="translate(47930, 1956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
+						<g transform="translate(30686.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
+								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
 								
 							</g>
 						</g>
-						<g transform="translate(47930, 1987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
+					</g>
+					<g data-name="RangeSliderThumbShape">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RangeSliderThumbShape">
+							<rect x="30635.8" y="121.0" height="31.0" width="218.0" data-name="RangeSliderThumbShape"></rect>
 						</g>
-						<g transform="translate(47930, 3008)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
+						<g transform="translate(30635.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="RangeSliderThumbShape">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RangeSliderThumbShape">
+								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="RangeSliderThumbShape">RangeSliderThumbShape</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="65972.8" y="2376.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M65972.8 2407.0 L66874.8 2407.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M65972.8 2633.0 L66874.8 2633.0" fill="none" data-name="EnrollmentFormViewModel"></path>
+					<g data-name="EmptyBody">
+						<g fill="#eee8d5" stroke="#33322E" data-name="EmptyBody">
+							<rect x="49628.8" y="2541.0" height="168.0" width="222.0" data-name="EmptyBody"></rect>
+							<path d="M49628.8 2572.0 L49850.8 2572.0" fill="none" data-name="EmptyBody"></path>
+							<path d="M49628.8 2678.0 L49850.8 2678.0" fill="none" data-name="EmptyBody"></path>
 						</g>
-						<g transform="translate(65972.75, 2376)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
-								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
+						<g transform="translate(49628.75, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmptyBody">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmptyBody">
+								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="EmptyBody">EmptyBody</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65972.75, 2407)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
+						<g transform="translate(49628.75, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
+								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+icon: IconData?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="EmptyBody">+leading: Widget?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="EmptyBody">+leadingSpacing: double?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="EmptyBody">+title: String?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="EmptyBody">+description: String?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="EmptyBody">+button: Widget?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65972.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
+						<g transform="translate(49628.75, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
+								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+Widget build()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="EnrollmentFormConsentItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="65723.8" y="3394.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M65723.8 3425.0 L66523.8 3425.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M65723.8 3501.0 L66523.8 3501.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-						</g>
-						<g transform="translate(65723.75, 3394)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
-								
-							</g>
+					<g data-name="FormScaffold">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FormScaffold">
+							<rect x="49890.8" y="2556.5" height="137.0" width="212.0" data-name="FormScaffold"></rect>
+							<path d="M49890.8 2587.5 L50102.8 2587.5" fill="none" data-name="FormScaffold"></path>
 						</g>
-						<g transform="translate(65723.75, 3425)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
+						<g transform="translate(49890.75, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormScaffold">
+								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormScaffold">FormScaffold</text>
 								
 							</g>
 						</g>
-						<g transform="translate(65723.75, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
+						<g transform="translate(49890.75, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormScaffold">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormScaffold">
+								<text x="0.0" y="13.5" stroke="none" data-name="FormScaffold">+formViewModel: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FormScaffold">+actions: List&lt;Widget&gt;?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FormScaffold">+body: Widget</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="FormScaffold">+drawer: Widget?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="FormScaffold">+actionsSpacing: double</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="FormScaffold">+actionsPadding: double</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="71357.0" y="1516.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M71357.0 1547.0 L72053.0 1547.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M71357.0 1758.0 L72053.0 1758.0" fill="none" data-name="StudyFormViewModel"></path>
+					<g data-name="Search">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Search">
+							<rect x="50142.8" y="2571.5" height="107.0" width="373.0" data-name="Search"></rect>
+							<path d="M50142.8 2602.5 L50515.8 2602.5" fill="none" data-name="Search"></path>
 						</g>
-						<g transform="translate(71357, 1516)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
+						<g transform="translate(50142.75, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Search">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Search">
+								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="Search">Search</text>
 								
 							</g>
 						</g>
-						<g transform="translate(71357, 1547)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
+						<g transform="translate(50142.75, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Search">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Search">
+								<text x="0.0" y="13.5" stroke="none" data-name="Search">+onQueryChanged: dynamic Function(String)</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Search">+searchController: SearchController?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Search">+hintText: String?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Search">+initialText: String?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(71357, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
+					</g>
+					<g data-name="dynamic Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(String)">
+							<rect x="50076.5" y="3485.0" height="31.0" width="213.0" data-name="dynamic Function(String)"></rect>
+						</g>
+						<g transform="translate(50076.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(String)">
+								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(String)">dynamic Function(String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="53367.3" y="1568.5" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M53367.3 1599.5 L54535.3 1599.5" fill="none" data-name="QuestionFormData"></path>
-							<path d="M53367.3 1735.5 L54535.3 1735.5" fill="none" data-name="QuestionFormData"></path>
+					<g data-name="void Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(String)">
+							<rect x="51811.5" y="3828.0" height="31.0" width="180.0" data-name="void Function(String)"></rect>
 						</g>
-						<g transform="translate(53367.25, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
+						<g transform="translate(51811.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(String)">
+								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(String)">void Function(String)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53367.25, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
+					</g>
+					<g data-name="IClipboardService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IClipboardService">
+							<rect x="43743.0" y="105.5" height="62.0" width="156.0" data-name="IClipboardService"></rect>
+							<path d="M43743.0 136.5 L43899.0 136.5" fill="none" data-name="IClipboardService"></path>
+						</g>
+						<g transform="translate(43743, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IClipboardService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IClipboardService">
+								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="IClipboardService">IClipboardService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53367.25, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
+						<g transform="translate(43743, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IClipboardService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IClipboardService">
+								<text x="0.0" y="13.5" stroke="none" data-name="IClipboardService">+dynamic copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="31073.0" y="3417.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M31073.0 3448.0 L31436.0 3448.0" fill="none" data-name="SurveyQuestionType"></path>
+					<g data-name="ClipboardService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ClipboardService">
+							<rect x="43745.5" y="598.5" height="62.0" width="151.0" data-name="ClipboardService"></rect>
+							<path d="M43745.5 629.5 L43896.5 629.5" fill="none" data-name="ClipboardService"></path>
 						</g>
-						<g transform="translate(31073, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
+						<g transform="translate(43745.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ClipboardService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ClipboardService">
+								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="ClipboardService">ClipboardService</text>
 								
 							</g>
 						</g>
-						<g transform="translate(31073, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
+						<g transform="translate(43745.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ClipboardService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ClipboardService">
+								<text x="0.0" y="13.5" stroke="none" data-name="ClipboardService">+dynamic copy()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="51487.3" y="2541.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M51487.3 2572.0 L51831.3 2572.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M51487.3 2633.0 L51831.3 2633.0" fill="none" data-name="ChoiceQuestionFormData"></path>
+					<g data-name="NotificationIntent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationIntent">
+							<rect x="51119.3" y="2548.5" height="153.0" width="288.0" data-name="NotificationIntent"></rect>
+							<path d="M51119.3 2579.5 L51407.3 2579.5" fill="none" data-name="NotificationIntent"></path>
+							<path d="M51119.3 2670.5 L51407.3 2670.5" fill="none" data-name="NotificationIntent"></path>
 						</g>
-						<g transform="translate(51487.25, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
+						<g transform="translate(51119.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="NotificationIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationIntent">
+								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationIntent">NotificationIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51487.25, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(51119.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+message: String?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationIntent">+customContent: Widget?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationIntent">+icon: IconData?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NotificationIntent">+actions: List&lt;NotificationAction&gt;?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="NotificationIntent">+type: NotificationType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51487.25, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(51119.25, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+void register()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="51871.3" y="2556.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M51871.3 2587.0 L52263.3 2587.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M51871.3 2633.0 L52263.3 2633.0" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(51871.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
+					<g data-name="NotificationType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationType">
+							<rect x="35255.0" y="3439.5" height="122.0" width="325.0" data-name="NotificationType"></rect>
+							<path d="M35255.0 3470.5 L35580.0 3470.5" fill="none" data-name="NotificationType"></path>
 						</g>
-						<g transform="translate(51871.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(35255, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationType">
+								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationType">NotificationType</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51871.25, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(35255, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationType">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationType">&lt;static&gt;+values: List&lt;NotificationType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationType">&lt;static&gt;+snackbar: NotificationType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NotificationType">&lt;static&gt;+alert: NotificationType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="NotificationType">&lt;static&gt;+custom: NotificationType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="52675.3" y="2556.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M52675.3 2587.0 L53147.3 2587.0" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M52675.3 2633.0 L53147.3 2633.0" fill="none" data-name="ImageQuestionFormData"></path>
+					<g data-name="NotificationAction">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationAction">
+							<rect x="51015.0" y="3797.5" height="92.0" width="256.0" data-name="NotificationAction"></rect>
+							<path d="M51015.0 3828.5 L51271.0 3828.5" fill="none" data-name="NotificationAction"></path>
 						</g>
-						<g transform="translate(52675.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
+						<g transform="translate(51015, 3797.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationAction">
+								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationAction">NotificationAction</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52675.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(51015, 3828.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationAction">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationAction">+label: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationAction">+onSelect: dynamic Function()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationAction">+isDestructive: bool</text>
 								
 							</g>
 						</g>
-						<g transform="translate(52675.25, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+					</g>
+					<g data-name="dynamic Function()">
+						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
+							<rect x="47853.5" y="4118.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
+						</g>
+						<g transform="translate(47853.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
+								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="53923.3" y="2548.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M53923.3 2579.5 L54395.3 2579.5" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M53923.3 2640.5 L54395.3 2640.5" fill="none" data-name="AudioQuestionFormData"></path>
+					<g data-name="SnackbarIntent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SnackbarIntent">
+							<rect x="50823.5" y="3469.5" height="62.0" width="136.0" data-name="SnackbarIntent"></rect>
+							<path d="M50823.5 3500.5 L50959.5 3500.5" fill="none" data-name="SnackbarIntent"></path>
 						</g>
-						<g transform="translate(53923.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
+						<g transform="translate(50823.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackbarIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackbarIntent">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackbarIntent">SnackbarIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53923.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+						<g transform="translate(50823.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SnackbarIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SnackbarIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="SnackbarIntent">+duration: int?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(53923.25, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+					</g>
+					<g data-name="AlertIntent">
+						<g fill="#eee8d5" stroke="#33322E" data-name="AlertIntent">
+							<rect x="51326.5" y="3454.5" height="92.0" width="204.0" data-name="AlertIntent"></rect>
+							<path d="M51326.5 3485.5 L51530.5 3485.5" fill="none" data-name="AlertIntent"></path>
+						</g>
+						<g transform="translate(51326.5, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AlertIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AlertIntent">
+								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="AlertIntent">AlertIntent</text>
+								
+							</g>
+						</g>
+						<g transform="translate(51326.5, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AlertIntent">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AlertIntent">
+								<text x="0.0" y="13.5" stroke="none" data-name="AlertIntent">+title: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="AlertIntent">+dismissOnAction: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="AlertIntent">+isDestructive: dynamic</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="54435.3" y="2481.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M54435.3 2512.0 L54779.3 2512.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M54435.3 2708.0 L54779.3 2708.0" fill="none" data-name="ScaleQuestionFormData"></path>
+					<g data-name="NotificationDispatcher">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDispatcher">
+							<rect x="51447.3" y="2564.0" height="122.0" width="325.0" data-name="NotificationDispatcher"></rect>
+							<path d="M51447.3 2595.0 L51772.3 2595.0" fill="none" data-name="NotificationDispatcher"></path>
 						</g>
-						<g transform="translate(54435.25, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
+						<g transform="translate(51447.25, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDispatcher">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDispatcher">
+								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDispatcher">NotificationDispatcher</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54435.25, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
+						<g transform="translate(51447.25, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDispatcher">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDispatcher">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDispatcher">+child: Widget?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationDispatcher">+snackbarInnerPadding: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationDispatcher">+snackbarWidth: double?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NotificationDispatcher">+snackbarBehavior: SnackBarBehavior</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="NotificationDispatcher">+snackbarDefaultDuration: int</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54435.25, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+					</g>
+					<g data-name="SnackBarBehavior">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SnackBarBehavior">
+							<rect x="51570.5" y="3485.0" height="31.0" width="162.0" data-name="SnackBarBehavior"></rect>
+						</g>
+						<g transform="translate(51570.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackBarBehavior">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackBarBehavior">
+								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackBarBehavior">SnackBarBehavior</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="54819.3" y="2541.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M54819.3 2572.0 L55163.3 2572.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M54819.3 2648.0 L55163.3 2648.0" fill="none" data-name="FreeTextQuestionFormData"></path>
+					<g data-name="Notifications">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Notifications">
+							<rect x="51897.8" y="2541.5" height="167.0" width="407.0" data-name="Notifications"></rect>
+							<path d="M51897.8 2572.5 L52304.8 2572.5" fill="none" data-name="Notifications"></path>
 						</g>
-						<g transform="translate(54819.25, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
+						<g transform="translate(51897.75, 2541.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Notifications">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notifications">
+								<text x="195.5" y="13.5" stroke="none" text-anchor="middle" data-name="Notifications">Notifications</text>
+								
+							</g>
+						</g>
+						<g transform="translate(51897.75, 2572.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Notifications">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Notifications">
+								<text x="0.0" y="13.5" stroke="none" data-name="Notifications">&lt;static&gt;+credentialsInvalid: SnackbarIntent</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Notifications">&lt;static&gt;+userAlreadyRegistered: SnackbarIntent</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordReset: SnackbarIntent</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordResetSuccess: SnackbarIntent</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleted: SnackbarIntent</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeDeleted: SnackbarIntent</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeClipped: SnackbarIntent</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleteConfirmation: AlertIntent</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54819.25, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
+					</g>
+					<g data-name="NotificationDefaultActions">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDefaultActions">
+							<rect x="50999.5" y="3469.5" height="62.0" width="287.0" data-name="NotificationDefaultActions"></rect>
+							<path d="M50999.5 3500.5 L51286.5 3500.5" fill="none" data-name="NotificationDefaultActions"></path>
+						</g>
+						<g transform="translate(50999.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDefaultActions">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDefaultActions">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDefaultActions">NotificationDefaultActions</text>
 								
 							</g>
 						</g>
-						<g transform="translate(54819.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
+						<g transform="translate(50999.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDefaultActions">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDefaultActions">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDefaultActions">&lt;static&gt;+cancel: NotificationAction</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="54893.3" y="3485.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
+					<g data-name="NotificationService">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationService">
+							<rect x="37499.5" y="3774.5" height="138.0" width="455.0" data-name="NotificationService"></rect>
+							<path d="M37499.5 3805.5 L37954.5 3805.5" fill="none" data-name="NotificationService"></path>
+							<path d="M37499.5 3836.5 L37954.5 3836.5" fill="none" data-name="NotificationService"></path>
 						</g>
-						<g transform="translate(54893.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
+						<g transform="translate(37499.5, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationService">
+								<text x="219.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationService">NotificationService</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="27757.8" y="1651.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M27757.8 1682.0 L28109.8 1682.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M27757.8 1713.0 L28109.8 1713.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
+						<g transform="translate(37499.5, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">-_streamController: BehaviorSubject&lt;NotificationIntent&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(27757.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
+						<g transform="translate(37499.5, 3836.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
+								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NotificationService">+void showMessage()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="NotificationService">+void show()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="NotificationService">+void dispose()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27757.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+					</g>
+					<g data-name="DropdownMenuItemTheme">
+						<g fill="#eee8d5" stroke="#33322E" data-name="DropdownMenuItemTheme">
+							<rect x="56815.5" y="598.5" height="62.0" width="258.0" data-name="DropdownMenuItemTheme"></rect>
+							<path d="M56815.5 629.5 L57073.5 629.5" fill="none" data-name="DropdownMenuItemTheme"></path>
+						</g>
+						<g transform="translate(56815.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DropdownMenuItemTheme">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DropdownMenuItemTheme">
+								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="DropdownMenuItemTheme">DropdownMenuItemTheme</text>
 								
 							</g>
 						</g>
-						<g transform="translate(27757.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
+						<g transform="translate(56815.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DropdownMenuItemTheme">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DropdownMenuItemTheme">
+								<text x="0.0" y="13.5" stroke="none" data-name="DropdownMenuItemTheme">+iconTheme: IconThemeData?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="28149.8" y="1628.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M28149.8 1659.5 L28501.8 1659.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M28149.8 1705.5 L28501.8 1705.5" fill="none" data-name="FreeTextQuestionFormView"></path>
+					<g data-name="IconThemeData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="IconThemeData">
+							<rect x="56874.0" y="1197.0" height="31.0" width="141.0" data-name="IconThemeData"></rect>
 						</g>
-						<g transform="translate(28149.75, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
+						<g transform="translate(56874, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconThemeData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconThemeData">
+								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconThemeData">IconThemeData</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28149.75, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
-								
-							</g>
+					</g>
+					<g data-name="Diagnosticable">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Diagnosticable">
+							<rect x="56878.0" y="121.0" height="31.0" width="133.0" data-name="Diagnosticable"></rect>
 						</g>
-						<g transform="translate(28149.75, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
+						<g transform="translate(56878, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Diagnosticable">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Diagnosticable">
+								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="Diagnosticable">Diagnosticable</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="28541.8" y="1651.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M28541.8 1682.0 L28893.8 1682.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M28541.8 1713.0 L28893.8 1713.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
+					<g data-name="ThemeConfig">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeConfig">
+							<rect x="69788.0" y="0.0" height="273.0" width="543.0" data-name="ThemeConfig"></rect>
+							<path d="M69788.0 31.0 L70331.0 31.0" fill="none" data-name="ThemeConfig"></path>
+							<path d="M69788.0 107.0 L70331.0 107.0" fill="none" data-name="ThemeConfig"></path>
 						</g>
-						<g transform="translate(28541.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
+						<g transform="translate(69788, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeConfig">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeConfig">
+								<text x="263.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeConfig">ThemeConfig</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28541.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(69788, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMinContentWidth: double</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMaxContentWidth: double</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kHoverFadeFactor: double</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMuteFadeFactor: double</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28541.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
+						<g transform="translate(69788, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+dynamic bodyBackgroundColor()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color modalBarrierColor()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color containerColor()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color colorPickerInitialColor()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextMuted()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextBackground()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+double iconSplashRadius()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color sidesheetBackgroundColor()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="82520.5" y="105.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M82520.5 136.5 L82829.5 136.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
+					<g data-name="NoAnimationPageTransitionsBuilder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NoAnimationPageTransitionsBuilder">
+							<rect x="68948.0" y="598.5" height="62.0" width="299.0" data-name="NoAnimationPageTransitionsBuilder"></rect>
+							<path d="M68948.0 629.5 L69247.0 629.5" fill="none" data-name="NoAnimationPageTransitionsBuilder"></path>
 						</g>
-						<g transform="translate(82520.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
+						<g transform="translate(68948, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NoAnimationPageTransitionsBuilder">
+								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="NoAnimationPageTransitionsBuilder">NoAnimationPageTransitionsBuilder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82520.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
+						<g transform="translate(68948, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NoAnimationPageTransitionsBuilder">
+								<text x="0.0" y="13.5" stroke="none" data-name="NoAnimationPageTransitionsBuilder">+Widget buildTransitions()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="51231.3" y="1666.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M51231.3 1697.5 L51583.3 1697.5" fill="none" data-name="ScaleQuestionFormView"></path>
+					<g data-name="PageTransitionsBuilder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsBuilder">
+							<rect x="69173.3" y="121.0" height="31.0" width="199.0" data-name="PageTransitionsBuilder"></rect>
 						</g>
-						<g transform="translate(51231.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
+						<g transform="translate(69173.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PageTransitionsBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsBuilder">
+								<text x="91.5" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsBuilder">PageTransitionsBuilder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(51231.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+					</g>
+					<g data-name="WebTransitionBuilder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="WebTransitionBuilder">
+							<rect x="69287.0" y="598.5" height="62.0" width="223.0" data-name="WebTransitionBuilder"></rect>
+							<path d="M69287.0 629.5 L69510.0 629.5" fill="none" data-name="WebTransitionBuilder"></path>
+						</g>
+						<g transform="translate(69287, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebTransitionBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebTransitionBuilder">
+								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebTransitionBuilder">WebTransitionBuilder</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="28933.8" y="1651.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M28933.8 1682.0 L29285.8 1682.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M28933.8 1713.0 L29285.8 1713.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-						</g>
-						<g transform="translate(28933.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
+						<g transform="translate(69287, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebTransitionBuilder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebTransitionBuilder">
+								<text x="0.0" y="13.5" stroke="none" data-name="WebTransitionBuilder">+Widget buildTransitions()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28933.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+					</g>
+					<g data-name="ThemeSettingChange">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettingChange">
+							<rect x="62294.5" y="1666.5" height="62.0" width="216.0" data-name="ThemeSettingChange"></rect>
+							<path d="M62294.5 1697.5 L62510.5 1697.5" fill="none" data-name="ThemeSettingChange"></path>
+						</g>
+						<g transform="translate(62294.5, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettingChange">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettingChange">
+								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettingChange">ThemeSettingChange</text>
 								
 							</g>
 						</g>
-						<g transform="translate(28933.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
+						<g transform="translate(62294.5, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettingChange">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettingChange">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettingChange">+settings: ThemeSettings</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="29740.8" y="1651.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M29740.8 1682.0 L30092.8 1682.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M29740.8 1713.0 L30092.8 1713.0" fill="none" data-name="BoolQuestionFormView"></path>
+					<g data-name="ThemeSettings">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettings">
+							<rect x="62289.0" y="2586.5" height="77.0" width="227.0" data-name="ThemeSettings"></rect>
+							<path d="M62289.0 2617.5 L62516.0 2617.5" fill="none" data-name="ThemeSettings"></path>
 						</g>
-						<g transform="translate(29740.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
+						<g transform="translate(62289, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettings">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettings">
+								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettings">ThemeSettings</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29740.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
+						<g transform="translate(62289, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettings">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettings">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettings">+sourceColor: Color</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeSettings">+themeMode: ThemeMode</text>
 								
 							</g>
 						</g>
-						<g transform="translate(29740.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
+					</g>
+					<g data-name="Notification">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Notification">
+							<rect x="62350.5" y="1197.0" height="31.0" width="104.0" data-name="Notification"></rect>
+						</g>
+						<g transform="translate(62350.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Notification">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notification">
+								<text x="44.0" y="13.5" stroke="none" text-anchor="middle" data-name="Notification">Notification</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="56104.5" y="1659.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M56104.5 1690.0 L56456.5 1690.0" fill="none" data-name="SurveyQuestionFormView"></path>
+					<g data-name="ThemeProvider">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeProvider">
+							<rect x="74195.8" y="358.0" height="543.0" width="519.0" data-name="ThemeProvider"></rect>
+							<path d="M74195.8 389.0 L74714.8 389.0" fill="none" data-name="ThemeProvider"></path>
+							<path d="M74195.8 480.0 L74714.8 480.0" fill="none" data-name="ThemeProvider"></path>
 						</g>
-						<g transform="translate(56104.5, 1659)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
+						<g transform="translate(74195.75, 358)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeProvider">
+								<text x="251.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeProvider">ThemeProvider</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56104.5, 1690)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
+						<g transform="translate(74195.75, 389)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+settings: ValueNotifier&lt;ThemeSettings&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+lightDynamic: ColorScheme?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+darkDynamic: ColorScheme?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+pageTransitionsTheme: PageTransitionsTheme</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+shapeMedium: ShapeBorder</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="55982.3" y="2609.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
-						</g>
-						<g transform="translate(55982.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
+						<g transform="translate(74195.75, 480)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
+								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+Color custom()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+Color blend()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+Color source()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+ColorScheme colors()</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+CardTheme cardTheme()</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ThemeProvider">+ListTileThemeData listTileTheme()</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ThemeProvider">+AppBarTheme appBarTheme()</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ThemeProvider">+SnackBarThemeData snackBarThemeData()</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="ThemeProvider">+TabBarTheme tabBarTheme()</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="ThemeProvider">+BottomAppBarTheme bottomAppBarTheme()</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="ThemeProvider">+BottomNavigationBarThemeData bottomNavigationBarTheme()</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="ThemeProvider">+SwitchThemeData switchTheme()</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="ThemeProvider">+InputDecorationTheme inputDecorationTheme()</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="ThemeProvider">+TextTheme textTheme()</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="ThemeProvider">+DividerThemeData dividerTheme()</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="ThemeProvider">+NavigationRailThemeData navigationRailTheme()</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="ThemeProvider">+DrawerThemeData drawerTheme()</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="ThemeProvider">+IconThemeData iconTheme()</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="ThemeProvider">+CheckboxThemeData checkboxTheme()</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="ThemeProvider">+RadioThemeData radioTheme()</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="ThemeProvider">+TooltipThemeData tooltipTheme()</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="ThemeProvider">+ThemeData light()</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="ThemeProvider">+ThemeData dark()</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="ThemeProvider">+ThemeMode themeMode()</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="ThemeProvider">+ThemeData theme()</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="ThemeProvider">&lt;static&gt;+ThemeProvider of()</text>
+								<text x="0.0" y="403.5" stroke="none" data-name="ThemeProvider">+bool updateShouldNotify()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="82460.8" y="1158.5" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M82460.8 1189.5 L82892.8 1189.5" fill="none" data-name="ScheduleControls"></path>
-							<path d="M82460.8 1220.5 L82892.8 1220.5" fill="none" data-name="ScheduleControls"></path>
+					<g data-name="ValueNotifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ValueNotifier">
+							<rect x="74063.5" y="1197.0" height="31.0" width="117.0" data-name="ValueNotifier"></rect>
 						</g>
-						<g transform="translate(82460.75, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
+						<g transform="translate(74063.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueNotifier">
+								<text x="50.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueNotifier">ValueNotifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82460.75, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
-								
-							</g>
+					</g>
+					<g data-name="ColorScheme">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ColorScheme">
+							<rect x="74220.5" y="1197.0" height="31.0" width="122.0" data-name="ColorScheme"></rect>
 						</g>
-						<g transform="translate(82460.75, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
+						<g transform="translate(74220.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ColorScheme">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ColorScheme">
+								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="ColorScheme">ColorScheme</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumnHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
-							<rect x="45539.0" y="3782.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
-							<path d="M45539.0 3813.5 L45776.0 3813.5" fill="none" data-name="StudiesTableColumnHeader"></path>
+					<g data-name="PageTransitionsTheme">
+						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsTheme">
+							<rect x="74382.5" y="1197.0" height="31.0" width="198.0" data-name="PageTransitionsTheme"></rect>
 						</g>
-						<g transform="translate(45539, 3782.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
-								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
+						<g transform="translate(74382.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PageTransitionsTheme">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsTheme">
+								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsTheme">PageTransitionsTheme</text>
 								
 							</g>
 						</g>
-						<g transform="translate(45539, 3813.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
+					</g>
+					<g data-name="ShapeBorder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ShapeBorder">
+							<rect x="74620.5" y="1197.0" height="31.0" width="120.0" data-name="ShapeBorder"></rect>
+						</g>
+						<g transform="translate(74620.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ShapeBorder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ShapeBorder">
+								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="ShapeBorder">ShapeBorder</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="56956.0" y="2594.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
-							<path d="M56956.0 2625.0 L57134.0 2625.0" fill="none" data-name="DashboardScreen"></path>
+					<g data-name="InheritedWidget">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InheritedWidget">
+							<rect x="74384.8" y="121.0" height="31.0" width="141.0" data-name="InheritedWidget"></rect>
 						</g>
-						<g transform="translate(56956, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
+						<g transform="translate(74384.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="InheritedWidget">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InheritedWidget">
+								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="InheritedWidget">InheritedWidget</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56956, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
+					</g>
+					<g data-name="ThemeMode">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeMode">
+							<rect x="62387.0" y="3485.0" height="31.0" width="114.0" data-name="ThemeMode"></rect>
+						</g>
+						<g transform="translate(62387, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeMode">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeMode">
+								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeMode">ThemeMode</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesFilter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
-							<rect x="24804.0" y="3462.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
-							<path d="M24804.0 3493.0 L25100.0 3493.0" fill="none" data-name="StudiesFilter"></path>
+					<g data-name="CustomColor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CustomColor">
+							<rect x="52564.8" y="2563.5" height="123.0" width="128.0" data-name="CustomColor"></rect>
+							<path d="M52564.8 2594.5 L52692.8 2594.5" fill="none" data-name="CustomColor"></path>
+							<path d="M52564.8 2655.5 L52692.8 2655.5" fill="none" data-name="CustomColor"></path>
 						</g>
-						<g transform="translate(24804, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
+						<g transform="translate(52564.75, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomColor">
+								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomColor">CustomColor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(24804, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
+						<g transform="translate(52564.75, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+name: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="CustomColor">+color: Color</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="CustomColor">+blend: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(52564.75, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
+								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+Color value()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
-							<rect x="57174.0" y="2571.0" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
-							<path d="M57174.0 2602.0 L57517.0 2602.0" fill="none" data-name="DashboardScaffold"></path>
-							<path d="M57174.0 2648.0 L57517.0 2648.0" fill="none" data-name="DashboardScaffold"></path>
+					<g data-name="Time">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Time">
+							<rect x="69550.0" y="583.5" height="92.0" width="293.0" data-name="Time"></rect>
+							<path d="M69550.0 614.5 L69843.0 614.5" fill="none" data-name="Time"></path>
 						</g>
-						<g transform="translate(57174, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
-								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
+						<g transform="translate(69550, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Time">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Time">
+								<text x="138.5" y="13.5" stroke="none" text-anchor="middle" data-name="Time">Time</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57174, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
+						<g transform="translate(69550, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Time">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Time">
+								<text x="0.0" y="13.5" stroke="none" data-name="Time">&lt;static&gt;+dynamic fromTimeOfDay()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Time">+Map&lt;String, dynamic&gt; toJson()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Time">&lt;static&gt;+Time fromJson()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(57174, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
+					</g>
+					<g data-name="TimeOfDay">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TimeOfDay">
+							<rect x="69645.0" y="121.0" height="31.0" width="103.0" data-name="TimeOfDay"></rect>
+						</g>
+						<g transform="translate(69645, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeOfDay">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeOfDay">
+								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeOfDay">TimeOfDay</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="DashboardController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
-							<rect x="70063.5" y="2436.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
-							<path d="M70063.5 2467.0 L70677.5 2467.0" fill="none" data-name="DashboardController"></path>
-							<path d="M70063.5 2588.0 L70677.5 2588.0" fill="none" data-name="DashboardController"></path>
+					<g data-name="TimeValueAccessor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TimeValueAccessor">
+							<rect x="70318.0" y="583.5" height="92.0" width="297.0" data-name="TimeValueAccessor"></rect>
+							<path d="M70318.0 614.5 L70615.0 614.5" fill="none" data-name="TimeValueAccessor"></path>
 						</g>
-						<g transform="translate(70063.5, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
-								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
+						<g transform="translate(70318, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeValueAccessor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeValueAccessor">
+								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeValueAccessor">TimeValueAccessor</text>
 								
 							</g>
 						</g>
-						<g transform="translate(70063.5, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
+						<g transform="translate(70318, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimeValueAccessor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimeValueAccessor">
+								<text x="0.0" y="13.5" stroke="none" data-name="TimeValueAccessor">+String modelToViewValue()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="TimeValueAccessor">+Time? viewToModelValue()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="TimeValueAccessor">-String _addLeadingZeroIfNeeded()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(70063.5, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
+					</g>
+					<g data-name="ControlValueAccessor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ControlValueAccessor">
+							<rect x="70371.0" y="121.0" height="31.0" width="191.0" data-name="ControlValueAccessor"></rect>
+						</g>
+						<g transform="translate(70371, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ControlValueAccessor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ControlValueAccessor">
+								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="ControlValueAccessor">ControlValueAccessor</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IUserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="70180.5" y="3439.0" height="123.0" width="260.0" data-name="IUserRepository"></rect>
-							<path d="M70180.5 3470.0 L70440.5 3470.0" fill="none" data-name="IUserRepository"></path>
-							<path d="M70180.5 3501.0 L70440.5 3501.0" fill="none" data-name="IUserRepository"></path>
+					<g data-name="NumericalRangeFormatter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="NumericalRangeFormatter">
+							<rect x="70655.0" y="575.5" height="108.0" width="313.0" data-name="NumericalRangeFormatter"></rect>
+							<path d="M70655.0 606.5 L70968.0 606.5" fill="none" data-name="NumericalRangeFormatter"></path>
+							<path d="M70655.0 652.5 L70968.0 652.5" fill="none" data-name="NumericalRangeFormatter"></path>
 						</g>
-						<g transform="translate(70180.5, 3439)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
+						<g transform="translate(70655, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericalRangeFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NumericalRangeFormatter">
+								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="NumericalRangeFormatter">NumericalRangeFormatter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(70180.5, 3470)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+user: StudyUUser</text>
+						<g transform="translate(70655, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
+								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+min: int?</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="NumericalRangeFormatter">+max: int?</text>
 								
 							</g>
 						</g>
-						<g transform="translate(70180.5, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+dynamic fetchUser()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IUserRepository">+dynamic saveUser()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IUserRepository">+dynamic updatePreferences()</text>
+						<g transform="translate(70655, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
+								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+TextEditingValue formatEditUpdate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumnSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
-							<rect x="82869.5" y="75.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
-							<path d="M82869.5 106.0 L83094.5 106.0" fill="none" data-name="StudiesTableColumnSize"></path>
-							<path d="M82869.5 167.0 L83094.5 167.0" fill="none" data-name="StudiesTableColumnSize"></path>
+					<g data-name="TextInputFormatter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="TextInputFormatter">
+							<rect x="70955.8" y="121.0" height="31.0" width="166.0" data-name="TextInputFormatter"></rect>
 						</g>
-						<g transform="translate(82869.5, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
+						<g transform="translate(70955.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TextInputFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextInputFormatter">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextInputFormatter">TextInputFormatter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82869.5, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
+					</g>
+					<g data-name="StudySequenceFormatter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudySequenceFormatter">
+							<rect x="71008.0" y="598.5" height="62.0" width="313.0" data-name="StudySequenceFormatter"></rect>
+							<path d="M71008.0 629.5 L71321.0 629.5" fill="none" data-name="StudySequenceFormatter"></path>
+						</g>
+						<g transform="translate(71008, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySequenceFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySequenceFormatter">
+								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySequenceFormatter">StudySequenceFormatter</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82869.5, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
+						<g transform="translate(71008, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySequenceFormatter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySequenceFormatter">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudySequenceFormatter">+TextEditingValue formatEditUpdate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
-							<rect x="56581.8" y="1553.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
-							<path d="M56581.8 1584.5 L57061.8 1584.5" fill="none" data-name="StudiesTable"></path>
-							<path d="M56581.8 1795.5 L57061.8 1795.5" fill="none" data-name="StudiesTable"></path>
+					<g data-name="JsonFileLoader">
+						<g fill="#eee8d5" stroke="#33322E" data-name="JsonFileLoader">
+							<rect x="73728.0" y="75.0" height="123.0" width="319.0" data-name="JsonFileLoader"></rect>
+							<path d="M73728.0 106.0 L74047.0 106.0" fill="none" data-name="JsonFileLoader"></path>
+							<path d="M73728.0 137.0 L74047.0 137.0" fill="none" data-name="JsonFileLoader"></path>
 						</g>
-						<g transform="translate(56581.75, 1553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
-								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
+						<g transform="translate(73728, 75)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="JsonFileLoader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonFileLoader">
+								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="JsonFileLoader">JsonFileLoader</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56581.75, 1584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
+						<g transform="translate(73728, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
+								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+jsonAssetsPath: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(56581.75, 1795.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
+						<g transform="translate(73728, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
+								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+dynamic loadJson()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonMapFromAssets()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonListFromAssets()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
-							<rect x="56280.0" y="2609.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
+					<g data-name="FileFormatEncoder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="FileFormatEncoder">
+							<rect x="71436.0" y="90.5" height="92.0" width="216.0" data-name="FileFormatEncoder"></rect>
+							<path d="M71436.0 121.5 L71652.0 121.5" fill="none" data-name="FileFormatEncoder"></path>
 						</g>
-						<g transform="translate(56280, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
+						<g transform="translate(71436, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FileFormatEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FileFormatEncoder">
+								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="FileFormatEncoder">FileFormatEncoder</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<rect x="56499.0" y="2609.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
-						</g>
-						<g transform="translate(56499, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
+						<g transform="translate(71436, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FileFormatEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FileFormatEncoder">
+								<text x="0.0" y="13.5" stroke="none" data-name="FileFormatEncoder">+dynamic encodeAsync()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="FileFormatEncoder">+String encode()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="FileFormatEncoder">+dynamic call()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
-							<rect x="2478.0" y="3394.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
-							<path d="M2478.0 3425.5 L2839.0 3425.5" fill="none" data-name="StudiesTableColumn"></path>
+					<g data-name="CSVStringEncoder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CSVStringEncoder">
+							<rect x="71361.0" y="598.5" height="62.0" width="162.0" data-name="CSVStringEncoder"></rect>
+							<path d="M71361.0 629.5 L71523.0 629.5" fill="none" data-name="CSVStringEncoder"></path>
 						</g>
-						<g transform="translate(2478, 3394.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
-								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
+						<g transform="translate(71361, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CSVStringEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CSVStringEncoder">
+								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="CSVStringEncoder">CSVStringEncoder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2478, 3425.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
+						<g transform="translate(71361, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CSVStringEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CSVStringEncoder">
+								<text x="0.0" y="13.5" stroke="none" data-name="CSVStringEncoder">+String encode()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudiesTableItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
-							<rect x="59997.3" y="2526.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
-							<path d="M59997.3 2557.5 L60397.3 2557.5" fill="none" data-name="StudiesTableItem"></path>
+					<g data-name="JsonStringEncoder">
+						<g fill="#eee8d5" stroke="#33322E" data-name="JsonStringEncoder">
+							<rect x="71563.0" y="598.5" height="62.0" width="166.0" data-name="JsonStringEncoder"></rect>
+							<path d="M71563.0 629.5 L71729.0 629.5" fill="none" data-name="JsonStringEncoder"></path>
 						</g>
-						<g transform="translate(59997.25, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
-								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
+						<g transform="translate(71563, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JsonStringEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonStringEncoder">
+								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="JsonStringEncoder">JsonStringEncoder</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59997.25, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
+						<g transform="translate(71563, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonStringEncoder">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonStringEncoder">
+								<text x="0.0" y="13.5" stroke="none" data-name="JsonStringEncoder">+String encode()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="void Function(Study, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
-							<rect x="59411.3" y="3485.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
+					<g data-name="ModelAction">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelAction">
+							<rect x="52732.8" y="2556.5" height="137.0" width="188.0" data-name="ModelAction"></rect>
+							<path d="M52732.8 2587.5 L52920.8 2587.5" fill="none" data-name="ModelAction"></path>
 						</g>
-						<g transform="translate(59411.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
+						<g transform="translate(52732.75, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelAction">
+								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelAction">ModelAction</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="void Function(Study)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
-							<rect x="59954.3" y="3485.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
-						</g>
-						<g transform="translate(59954.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
+						<g transform="translate(52732.75, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelAction">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelAction">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelAction">+type: T</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelAction">+label: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ModelAction">+icon: IconData?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ModelAction">+onExecute: Function</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ModelAction">+isAvailable: bool</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ModelAction">+isDestructive: bool</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="App">
-						<g fill="#eee8d5" stroke="#33322E" data-name="App">
-							<rect x="83134.5" y="121.0" height="31.0" width="47.0" data-name="App"></rect>
+					<g data-name="ModelActionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ModelActionType">
+							<rect x="4878.8" y="3417.0" height="167.0" width="334.0" data-name="ModelActionType"></rect>
+							<path d="M4878.8 3448.0 L5212.8 3448.0" fill="none" data-name="ModelActionType"></path>
 						</g>
-						<g transform="translate(83134.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
-								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
+						<g transform="translate(4878.75, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelActionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelActionType">
+								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelActionType">ModelActionType</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="AppContent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
-							<rect x="83221.5" y="121.0" height="31.0" width="109.0" data-name="AppContent"></rect>
-						</g>
-						<g transform="translate(83221.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
+						<g transform="translate(4878.75, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelActionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelActionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="ModelActionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+values: List&lt;ModelActionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+edit: ModelActionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+delete: ModelActionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+remove: ModelActionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+duplicate: ModelActionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+clipboard: ModelActionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+primary: ModelActionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AccountSettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
-							<rect x="39157.0" y="1666.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
-							<path d="M39157.0 1697.5 L39351.0 1697.5" fill="none" data-name="AccountSettingsDialog"></path>
+					<g data-name="CombinedStreamNotifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CombinedStreamNotifier">
+							<rect x="71769.0" y="583.0" height="93.0" width="435.0" data-name="CombinedStreamNotifier"></rect>
+							<path d="M71769.0 614.0 L72204.0 614.0" fill="none" data-name="CombinedStreamNotifier"></path>
+							<path d="M71769.0 645.0 L72204.0 645.0" fill="none" data-name="CombinedStreamNotifier"></path>
 						</g>
-						<g transform="translate(39157, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
+						<g transform="translate(71769, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CombinedStreamNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CombinedStreamNotifier">
+								<text x="209.5" y="13.5" stroke="none" text-anchor="middle" data-name="CombinedStreamNotifier">CombinedStreamNotifier</text>
 								
 							</g>
 						</g>
-						<g transform="translate(39157, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
+						<g transform="translate(71769, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">-_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ModelRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepository">
-							<rect x="83561.3" y="986.0" height="453.0" width="662.0" data-name="ModelRepository"></rect>
-							<path d="M83561.3 1017.0 L84223.3 1017.0" fill="none" data-name="ModelRepository"></path>
-							<path d="M83561.3 1123.0 L84223.3 1123.0" fill="none" data-name="ModelRepository"></path>
-						</g>
-						<g transform="translate(83561.25, 986)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepository">
-								<text x="323.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepository">ModelRepository</text>
+						<g transform="translate(71769, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
+								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">+void dispose()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83561.25, 1017)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+delegate: IModelRepositoryDelegate&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">-_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">-_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">-_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;</text>
-								
-							</g>
+					</g>
+					<g data-name="ChangeNotifier">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
+							<rect x="71919.5" y="121.0" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
 						</g>
-						<g transform="translate(83561.25, 1123)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt;? get()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">+dynamic fetchAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">+dynamic fetch()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ModelRepository">-dynamic _buildModelSpecificController()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ModelRepository">+dynamic ensurePersisted()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt; upsertLocally()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ModelRepository">+List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ModelRepository">+dynamic emitUpdate()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ModelRepository">+dynamic emitModelEvent()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ModelRepository">+dynamic emitError()</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ModelRepository">+void dispose()</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ModelRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+						<g transform="translate(71919.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
+								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepository">
-							<rect x="82756.8" y="2518.5" height="213.0" width="403.0" data-name="InviteCodeRepository"></rect>
-							<path d="M82756.8 2549.5 L83159.8 2549.5" fill="none" data-name="InviteCodeRepository"></path>
-							<path d="M82756.8 2655.5 L83159.8 2655.5" fill="none" data-name="InviteCodeRepository"></path>
+					<g data-name="Tuple">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Tuple">
+							<rect x="10805.0" y="2541.0" height="168.0" width="384.0" data-name="Tuple"></rect>
+							<path d="M10805.0 2572.0 L11189.0 2572.0" fill="none" data-name="Tuple"></path>
+							<path d="M10805.0 2633.0 L11189.0 2633.0" fill="none" data-name="Tuple"></path>
 						</g>
-						<g transform="translate(82756.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepository">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepository">InviteCodeRepository</text>
+						<g transform="translate(10805, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Tuple">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Tuple">
+								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="Tuple">Tuple</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82756.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepository">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepository">+study: Study</text>
+						<g transform="translate(10805, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
+								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+first: T1</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">+second: T2</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+props: List&lt;Object?&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(82756.75, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+dynamic emitUpdate()</text>
+						<g transform="translate(10805, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
+								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+Map&lt;String, dynamic&gt; toJson()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">&lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copy()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copyWith()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ProviderRef">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ProviderRef">
-							<rect x="83411.5" y="4118.5" height="31.0" width="109.0" data-name="ProviderRef"></rect>
+					<g data-name="CountWhereValidator">
+						<g fill="#eee8d5" stroke="#33322E" data-name="CountWhereValidator">
+							<rect x="77824.5" y="553.0" height="153.0" width="383.0" data-name="CountWhereValidator"></rect>
+							<path d="M77824.5 584.0 L78207.5 584.0" fill="none" data-name="CountWhereValidator"></path>
+							<path d="M77824.5 675.0 L78207.5 675.0" fill="none" data-name="CountWhereValidator"></path>
 						</g>
-						<g transform="translate(83411.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ProviderRef">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProviderRef">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProviderRef">ProviderRef</text>
+						<g transform="translate(77824.5, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CountWhereValidator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CountWhereValidator">
+								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="CountWhereValidator">CountWhereValidator</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyUApi">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApi">
-							<rect x="77217.3" y="4028.0" height="212.0" width="251.0" data-name="StudyUApi"></rect>
-							<path d="M77217.3 4059.0 L77468.3 4059.0" fill="none" data-name="StudyUApi"></path>
-						</g>
-						<g transform="translate(77217.25, 4028)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyUApi">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApi">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApi">StudyUApi</text>
+						<g transform="translate(77824.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
+								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+predicate: bool Function(T?)</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="CountWhereValidator">+minCount: int?</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="CountWhereValidator">+maxCount: int?</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMinCount: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMaxCount: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77217.25, 4059)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApi">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApi">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApi">+dynamic saveStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApi">+dynamic getUserStudies()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApi">+dynamic saveStudyInvite()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudyInvite()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudyInvite()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApi">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApi">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApi">+dynamic fetchUser()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApi">+dynamic saveUser()</text>
+						<g transform="translate(77824.5, 675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
+								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+Map&lt;String, dynamic&gt;? validate()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InviteCodeRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepositoryDelegate">
-							<rect x="83672.3" y="2518.5" height="213.0" width="299.0" data-name="InviteCodeRepositoryDelegate"></rect>
-							<path d="M83672.3 2549.5 L83971.3 2549.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
-							<path d="M83672.3 2610.5 L83971.3 2610.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
+					<g data-name="bool Function(T?)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="bool Function(T?)">
+							<rect x="77938.5" y="1197.0" height="31.0" width="155.0" data-name="bool Function(T?)"></rect>
 						</g>
-						<g transform="translate(83672.25, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepositoryDelegate">
-								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepositoryDelegate">InviteCodeRepositoryDelegate</text>
+						<g transform="translate(77938.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="bool Function(T?)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="bool Function(T?)">
+								<text x="69.5" y="13.5" stroke="none" text-anchor="middle" data-name="bool Function(T?)">bool Function(T?)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83672.25, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+apiClient: StudyUApi</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+studyRepository: IStudyRepository</text>
-								
-							</g>
+					</g>
+					<g data-name="Validator">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Validator">
+							<rect x="77973.0" y="121.0" height="31.0" width="86.0" data-name="Validator"></rect>
 						</g>
-						<g transform="translate(83672.25, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic onError()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createDuplicate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createNewInstance()</text>
+						<g transform="translate(77973, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Validator">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Validator">
+								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="Validator">Validator</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IModelRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepositoryDelegate">
-							<rect x="83804.0" y="1621.5" height="152.0" width="225.0" data-name="IModelRepositoryDelegate"></rect>
-							<path d="M83804.0 1652.5 L84029.0 1652.5" fill="none" data-name="IModelRepositoryDelegate"></path>
+					<g data-name="Patterns">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Patterns">
+							<rect x="76160.0" y="90.5" height="92.0" width="287.0" data-name="Patterns"></rect>
+							<path d="M76160.0 121.5 L76447.0 121.5" fill="none" data-name="Patterns"></path>
 						</g>
-						<g transform="translate(83804, 1621.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepositoryDelegate">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepositoryDelegate">IModelRepositoryDelegate</text>
+						<g transform="translate(76160, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Patterns">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Patterns">
+								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="Patterns">Patterns</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83804, 1652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepositoryDelegate">+T createNewInstance()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepositoryDelegate">+T createDuplicate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic onError()</text>
+						<g transform="translate(76160, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Patterns">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Patterns">
+								<text x="0.0" y="13.5" stroke="none" data-name="Patterns">&lt;static&gt;+timeFormatString: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Patterns">&lt;static&gt;+emailFormatString: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Patterns">&lt;static&gt;+url: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepository">
-							<rect x="72569.0" y="3752.0" height="183.0" width="403.0" data-name="StudyRepository"></rect>
-							<path d="M72569.0 3783.0 L72972.0 3783.0" fill="none" data-name="StudyRepository"></path>
-							<path d="M72569.0 3859.0 L72972.0 3859.0" fill="none" data-name="StudyRepository"></path>
+					<g data-name="SuppressedBehaviorSubject">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SuppressedBehaviorSubject">
+							<rect x="48508.8" y="3774.5" height="138.0" width="388.0" data-name="SuppressedBehaviorSubject"></rect>
+							<path d="M48508.8 3805.5 L48896.8 3805.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
+							<path d="M48508.8 3866.5 L48896.8 3866.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
 						</g>
-						<g transform="translate(72569, 3752)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepository">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepository">StudyRepository</text>
+						<g transform="translate(48508.75, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SuppressedBehaviorSubject">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SuppressedBehaviorSubject">
+								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="SuppressedBehaviorSubject">SuppressedBehaviorSubject</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72569, 3783)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+sortCallback: void Function()?</text>
+						<g transform="translate(48508.75, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
+								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">+subject: BehaviorSubject&lt;T&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+didSuppressInitialEvent: bool</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="SuppressedBehaviorSubject">-_controller: StreamController&lt;T&gt;</text>
 								
 							</g>
 						</g>
-						<g transform="translate(72569, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+dynamic launch()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
+						<g transform="translate(48508.75, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
+								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">-StreamController&lt;T&gt; _buildDerivedController()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+dynamic close()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepositoryDelegate">
-							<rect x="83870.3" y="3744.5" height="198.0" width="282.0" data-name="StudyRepositoryDelegate"></rect>
-							<path d="M83870.3 3775.5 L84152.3 3775.5" fill="none" data-name="StudyRepositoryDelegate"></path>
-							<path d="M83870.3 3821.5 L84152.3 3821.5" fill="none" data-name="StudyRepositoryDelegate"></path>
+					<g data-name="StreamController">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
+							<rect x="46722.8" y="4118.5" height="31.0" width="149.0" data-name="StreamController"></rect>
 						</g>
-						<g transform="translate(83870.25, 3744.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepositoryDelegate">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepositoryDelegate">StudyRepositoryDelegate</text>
+						<g transform="translate(46722.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
+								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83870.25, 3775.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+authRepository: IAuthRepository</text>
+					</g>
+					<g data-name="OptimisticUpdate">
+						<g fill="#eee8d5" stroke="#33322E" data-name="OptimisticUpdate">
+							<rect x="48936.8" y="3737.0" height="213.0" width="383.0" data-name="OptimisticUpdate"></rect>
+							<path d="M48936.8 3768.0 L49319.8 3768.0" fill="none" data-name="OptimisticUpdate"></path>
+							<path d="M48936.8 3904.0 L49319.8 3904.0" fill="none" data-name="OptimisticUpdate"></path>
+						</g>
+						<g transform="translate(48936.75, 3737)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptimisticUpdate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptimisticUpdate">
+								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptimisticUpdate">OptimisticUpdate</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83870.25, 3821.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic onError()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createNewInstance()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createDuplicate()</text>
+						<g transform="translate(48936.75, 3768)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
+								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+applyOptimistic: void Function()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">+apply: dynamic Function()</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="OptimisticUpdate">+rollback: void Function()</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="OptimisticUpdate">+onUpdate: void Function()?</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="OptimisticUpdate">+onError: void Function(Object, StackTrace?)?</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="OptimisticUpdate">+rethrowErrors: bool</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="OptimisticUpdate">+runOptimistically: bool</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="OptimisticUpdate">+completeFutureOptimistically: bool</text>
+								
+							</g>
+						</g>
+						<g transform="translate(48936.75, 3904)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
+								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+dynamic execute()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">-void _runUpdateHandlerIfAny()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="APIException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="APIException">
-							<rect x="76216.8" y="614.0" height="31.0" width="121.0" data-name="APIException"></rect>
+					<g data-name="void Function()">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()">
+							<rect x="46911.8" y="4118.5" height="31.0" width="134.0" data-name="void Function()"></rect>
 						</g>
-						<g transform="translate(76216.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="APIException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="APIException">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="APIException">APIException</text>
+						<g transform="translate(46911.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()">
+								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()">void Function()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotFoundException">
-							<rect x="73878.5" y="1197.0" height="31.0" width="216.0" data-name="StudyNotFoundException"></rect>
+					<g data-name="void Function(Object, StackTrace?)?">
+						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Object, StackTrace?)?">
+							<rect x="47085.8" y="4118.5" height="31.0" width="304.0" data-name="void Function(Object, StackTrace?)?"></rect>
 						</g>
-						<g transform="translate(73878.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotFoundException">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotFoundException">StudyNotFoundException</text>
+						<g transform="translate(47085.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Object, StackTrace?)?">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Object, StackTrace?)?">
+								<text x="144.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Object, StackTrace?)?">void Function(Object, StackTrace?)?</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="MeasurementNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementNotFoundException">
-							<rect x="74134.5" y="1197.0" height="31.0" width="279.0" data-name="MeasurementNotFoundException"></rect>
+					<g data-name="ExecutionLimiter">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ExecutionLimiter">
+							<rect x="50283.5" y="3789.5" height="108.0" width="197.0" data-name="ExecutionLimiter"></rect>
+							<path d="M50283.5 3820.5 L50480.5 3820.5" fill="none" data-name="ExecutionLimiter"></path>
+							<path d="M50283.5 3866.5 L50480.5 3866.5" fill="none" data-name="ExecutionLimiter"></path>
 						</g>
-						<g transform="translate(74134.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementNotFoundException">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementNotFoundException">MeasurementNotFoundException</text>
+						<g transform="translate(50283.5, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ExecutionLimiter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ExecutionLimiter">
+								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ExecutionLimiter">ExecutionLimiter</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="QuestionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionNotFoundException">
-							<rect x="74453.5" y="1197.0" height="31.0" width="242.0" data-name="QuestionNotFoundException"></rect>
+						<g transform="translate(50283.5, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
+								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+milliseconds: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="ExecutionLimiter">&lt;static&gt;-_timer: Timer?</text>
+								
+							</g>
 						</g>
-						<g transform="translate(74453.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionNotFoundException">
-								<text x="113.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionNotFoundException">QuestionNotFoundException</text>
+						<g transform="translate(50283.5, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
+								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+void dispose()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ConsentItemNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemNotFoundException">
-							<rect x="74735.5" y="1197.0" height="31.0" width="271.0" data-name="ConsentItemNotFoundException"></rect>
+					<g data-name="Timer">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Timer">
+							<rect x="47429.8" y="4118.5" height="31.0" width="60.0" data-name="Timer"></rect>
 						</g>
-						<g transform="translate(74735.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemNotFoundException">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemNotFoundException">ConsentItemNotFoundException</text>
+						<g transform="translate(47429.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timer">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timer">
+								<text x="22.0" y="13.5" stroke="none" text-anchor="middle" data-name="Timer">Timer</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="InterventionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionNotFoundException">
-							<rect x="75046.5" y="1197.0" height="31.0" width="265.0" data-name="InterventionNotFoundException"></rect>
+					<g data-name="Throttler">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Throttler">
+							<rect x="48060.5" y="4103.0" height="62.0" width="136.0" data-name="Throttler"></rect>
+							<path d="M48060.5 4134.0 L48196.5 4134.0" fill="none" data-name="Throttler"></path>
 						</g>
-						<g transform="translate(75046.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionNotFoundException">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionNotFoundException">InterventionNotFoundException</text>
+						<g transform="translate(48060.5, 4103)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Throttler">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Throttler">
+								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="Throttler">Throttler</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="InterventionTaskNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskNotFoundException">
-							<rect x="76042.5" y="1197.0" height="31.0" width="303.0" data-name="InterventionTaskNotFoundException"></rect>
-						</g>
-						<g transform="translate(76042.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskNotFoundException">
-								<text x="143.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskNotFoundException">InterventionTaskNotFoundException</text>
+						<g transform="translate(48060.5, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Throttler">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Throttler">
+								<text x="0.0" y="13.5" stroke="none" data-name="Throttler">+dynamic call()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ReportNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportNotFoundException">
-							<rect x="76385.5" y="1197.0" height="31.0" width="224.0" data-name="ReportNotFoundException"></rect>
+					<g data-name="SerializableColor">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SerializableColor">
+							<rect x="41250.0" y="3805.0" height="77.0" width="312.0" data-name="SerializableColor"></rect>
+							<path d="M41250.0 3836.0 L41562.0 3836.0" fill="none" data-name="SerializableColor"></path>
 						</g>
-						<g transform="translate(76385.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportNotFoundException">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportNotFoundException">ReportNotFoundException</text>
+						<g transform="translate(41250, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SerializableColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SerializableColor">
+								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="SerializableColor">SerializableColor</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="ReportSectionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionNotFoundException">
-							<rect x="76649.5" y="1197.0" height="31.0" width="283.0" data-name="ReportSectionNotFoundException"></rect>
-						</g>
-						<g transform="translate(76649.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionNotFoundException">
-								<text x="133.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionNotFoundException">ReportSectionNotFoundException</text>
+						<g transform="translate(41250, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SerializableColor">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SerializableColor">
+								<text x="0.0" y="13.5" stroke="none" data-name="SerializableColor">+Map&lt;String, dynamic&gt; toJson()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="SerializableColor">&lt;static&gt;+SerializableColor fromJson()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyInviteNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInviteNotFoundException">
-							<rect x="76972.5" y="1197.0" height="31.0" width="259.0" data-name="StudyInviteNotFoundException"></rect>
+					<g data-name="RoutingIntents">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntents">
+							<rect x="40948.0" y="1479.0" height="437.0" width="572.0" data-name="RoutingIntents"></rect>
+							<path d="M40948.0 1510.0 L41520.0 1510.0" fill="none" data-name="RoutingIntents"></path>
 						</g>
-						<g transform="translate(76972.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInviteNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInviteNotFoundException">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInviteNotFoundException">StudyInviteNotFoundException</text>
+						<g transform="translate(40948, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntents">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntents">
+								<text x="278.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntents">RoutingIntents</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="UserNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UserNotFoundException">
-							<rect x="77271.5" y="1197.0" height="31.0" width="208.0" data-name="UserNotFoundException"></rect>
-						</g>
-						<g transform="translate(77271.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserNotFoundException">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserNotFoundException">UserNotFoundException</text>
+						<g transform="translate(40948, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntents">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntents">
+								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+root: RoutingIntent</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studies: RoutingIntent</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studiesShared: RoutingIntent</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+publicRegistry: RoutingIntent</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+study: RoutingIntent Function(String)</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEdit: RoutingIntent Function(String)</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInfo: RoutingIntent Function(String)</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String)</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInterventions: RoutingIntent Function(String)</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String)</text>
+								<text x="0.0" y="163.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String)</text>
+								<text x="0.0" y="178.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditReports: RoutingIntent Function(String)</text>
+								<text x="0.0" y="193.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String)</text>
+								<text x="0.0" y="208.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute})</text>
+								<text x="0.0" y="223.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyRecruit: RoutingIntent Function(String)</text>
+								<text x="0.0" y="238.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyMonitor: RoutingIntent Function(String)</text>
+								<text x="0.0" y="253.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyAnalyze: RoutingIntent Function(String)</text>
+								<text x="0.0" y="268.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studySettings: RoutingIntent Function(String)</text>
+								<text x="0.0" y="283.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+accountSettings: RoutingIntent</text>
+								<text x="0.0" y="298.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyNew: RoutingIntent</text>
+								<text x="0.0" y="313.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+login: RoutingIntent</text>
+								<text x="0.0" y="328.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+signup: RoutingIntent</text>
+								<text x="0.0" y="343.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot: RoutingIntent</text>
+								<text x="0.0" y="358.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot2: RoutingIntent Function(String)</text>
+								<text x="0.0" y="373.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordRecovery: RoutingIntent</text>
+								<text x="0.0" y="388.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+error: RoutingIntent Function(Exception)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyUApiClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApiClient">
-							<rect x="76925.3" y="4288.0" height="333.0" width="479.0" data-name="StudyUApiClient"></rect>
-							<path d="M76925.3 4319.0 L77404.3 4319.0" fill="none" data-name="StudyUApiClient"></path>
-							<path d="M76925.3 4395.0 L77404.3 4395.0" fill="none" data-name="StudyUApiClient"></path>
+					<g data-name="RoutingIntent Function(String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String)">
+							<rect x="38790.5" y="2609.5" height="31.0" width="253.0" data-name="RoutingIntent Function(String)"></rect>
 						</g>
-						<g transform="translate(76925.25, 4288)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApiClient">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApiClient">StudyUApiClient</text>
+						<g transform="translate(38790.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String)">
+								<text x="118.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String)">RoutingIntent Function(String)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76925.25, 4319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+supabaseClient: SupabaseClient</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyColumns: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+testDelayMilliseconds: int</text>
-								
-							</g>
+					</g>
+					<g data-name="RoutingIntent Function(String, String)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, String)">
+							<rect x="39370.5" y="2609.5" height="31.0" width="309.0" data-name="RoutingIntent Function(String, String)"></rect>
 						</g>
-						<g transform="translate(76925.25, 4395)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">+dynamic getUserStudies()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudy()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudyInvite()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudyInvite()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudyInvite()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchUser()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApiClient">+dynamic saveUser()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyUApiClient">-dynamic _awaitGuarded()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyUApiClient">-dynamic _apiException()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyUApiClient">-dynamic _testDelay()</text>
+						<g transform="translate(39370.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, String)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, String)">
+								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, String)">RoutingIntent Function(String, String)</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SupabaseClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClient">
-							<rect x="76840.8" y="4661.0" height="31.0" width="141.0" data-name="SupabaseClient"></rect>
+					<g data-name="RoutingIntent Function(String, {String? appRoute})">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, {String? appRoute})">
+							<rect x="48158.8" y="2609.5" height="31.0" width="413.0" data-name="RoutingIntent Function(String, {String? appRoute})"></rect>
 						</g>
-						<g transform="translate(76840.75, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClient">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClient">SupabaseClient</text>
+						<g transform="translate(48158.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, {String? appRoute})">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, {String? appRoute})">
+								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, {String? appRoute})">RoutingIntent Function(String, {String? appRoute})</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SupabaseClientDependant">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClientDependant">
-							<rect x="76540.3" y="4103.0" height="62.0" width="284.0" data-name="SupabaseClientDependant"></rect>
-							<path d="M76540.3 4134.0 L76824.3 4134.0" fill="none" data-name="SupabaseClientDependant"></path>
+					<g data-name="RoutingIntent Function(Exception)">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(Exception)">
+							<rect x="48611.8" y="2609.5" height="31.0" width="285.0" data-name="RoutingIntent Function(Exception)"></rect>
 						</g>
-						<g transform="translate(76540.25, 4103)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseClientDependant">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClientDependant">
-								<text x="134.0" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClientDependant">SupabaseClientDependant</text>
+						<g transform="translate(48611.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(Exception)">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(Exception)">
+								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(Exception)">RoutingIntent Function(Exception)</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76540.25, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseClientDependant">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseClientDependant">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseClientDependant">+supabaseClient: SupabaseClient</text>
+					</g>
+					<g data-name="GoRoute">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRoute">
+							<rect x="30027.5" y="3485.0" height="31.0" width="86.0" data-name="GoRoute"></rect>
+						</g>
+						<g transform="translate(30027.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRoute">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRoute">
+								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRoute">GoRoute</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SupabaseQueryMixin">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryMixin">
-							<rect x="76879.3" y="4065.5" height="137.0" width="215.0" data-name="SupabaseQueryMixin"></rect>
-							<path d="M76879.3 4096.5 L77094.3 4096.5" fill="none" data-name="SupabaseQueryMixin"></path>
+					<g data-name="RoutingIntentDispatch">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntentDispatch">
+							<rect x="12853.5" y="3447.0" height="107.0" width="373.0" data-name="RoutingIntentDispatch"></rect>
+							<path d="M12853.5 3478.0 L13226.5 3478.0" fill="none" data-name="RoutingIntentDispatch"></path>
 						</g>
-						<g transform="translate(76879.25, 4065.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseQueryMixin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryMixin">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryMixin">SupabaseQueryMixin</text>
+						<g transform="translate(12853.5, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntentDispatch">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntentDispatch">
+								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntentDispatch">RoutingIntentDispatch</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76879.25, 4096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryMixin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryMixin">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic deleteAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getById()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getByColumn()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseQueryMixin">+List&lt;T&gt; deserializeList()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SupabaseQueryMixin">+T deserializeObject()</text>
+						<g transform="translate(12853.5, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntentDispatch">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntentDispatch">
+								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntentDispatch">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+go: RoutingIntentDispatch</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+push: RoutingIntentDispatch</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IAppRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppRepository">
-							<rect x="59684.3" y="3462.0" height="77.0" width="230.0" data-name="IAppRepository"></rect>
-							<path d="M59684.3 3493.0 L59914.3 3493.0" fill="none" data-name="IAppRepository"></path>
+					<g data-name="RouterKeys">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouterKeys">
+							<rect x="75808.0" y="98.0" height="77.0" width="312.0" data-name="RouterKeys"></rect>
+							<path d="M75808.0 129.0 L76120.0 129.0" fill="none" data-name="RouterKeys"></path>
 						</g>
-						<g transform="translate(59684.25, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppRepository">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAppRepository">IAppRepository</text>
+						<g transform="translate(75808, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterKeys">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterKeys">
+								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterKeys">RouterKeys</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59684.25, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppRepository">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAppRepository">+void dispose()</text>
+						<g transform="translate(75808, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterKeys">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterKeys">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+studyKey: ValueKey&lt;String&gt;</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+authKey: ValueKey&lt;String&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AppRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppRepository">
-							<rect x="59684.3" y="3789.5" height="108.0" width="230.0" data-name="AppRepository"></rect>
-							<path d="M59684.3 3820.5 L59914.3 3820.5" fill="none" data-name="AppRepository"></path>
-							<path d="M59684.3 3851.5 L59914.3 3851.5" fill="none" data-name="AppRepository"></path>
+					<g data-name="ValueKey">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ValueKey">
+							<rect x="75918.5" y="614.0" height="31.0" width="91.0" data-name="ValueKey"></rect>
 						</g>
-						<g transform="translate(59684.25, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppRepository">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppRepository">AppRepository</text>
+						<g transform="translate(75918.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueKey">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueKey">
+								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueKey">ValueKey</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59684.25, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+apiClient: StudyUApi</text>
+					</g>
+					<g data-name="RouteParams">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouteParams">
+							<rect x="76641.0" y="75.5" height="122.0" width="267.0" data-name="RouteParams"></rect>
+							<path d="M76641.0 106.5 L76908.0 106.5" fill="none" data-name="RouteParams"></path>
+						</g>
+						<g transform="translate(76641, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteParams">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteParams">
+								<text x="125.5" y="13.5" stroke="none" text-anchor="middle" data-name="RouteParams">RouteParams</text>
 								
 							</g>
 						</g>
-						<g transform="translate(59684.25, 3851.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppRepository">+void dispose()</text>
+						<g transform="translate(76641, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteParams">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteParams">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studiesFilter: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studyId: String</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RouteParams">&lt;static&gt;+measurementId: String</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RouteParams">&lt;static&gt;+interventionId: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="RouteParams">&lt;static&gt;+testAppRoute: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="StudyUUser">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUUser">
-							<rect x="76390.3" y="4118.5" height="31.0" width="110.0" data-name="StudyUUser"></rect>
+					<g data-name="RouterConf">
+						<g fill="#eee8d5" stroke="#33322E" data-name="RouterConf">
+							<rect x="55392.0" y="2556.0" height="138.0" width="326.0" data-name="RouterConf"></rect>
+							<path d="M55392.0 2587.0 L55718.0 2587.0" fill="none" data-name="RouterConf"></path>
+							<path d="M55392.0 2663.0 L55718.0 2663.0" fill="none" data-name="RouterConf"></path>
 						</g>
-						<g transform="translate(76390.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUUser">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUUser">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUUser">StudyUUser</text>
+						<g transform="translate(55392, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterConf">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterConf">
+								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterConf">RouterConf</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="UserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UserRepository">
-							<rect x="70645.8" y="3759.5" height="168.0" width="282.0" data-name="UserRepository"></rect>
-							<path d="M70645.8 3790.5 L70927.8 3790.5" fill="none" data-name="UserRepository"></path>
-							<path d="M70645.8 3866.5 L70927.8 3866.5" fill="none" data-name="UserRepository"></path>
+						<g transform="translate(55392, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+router: GoRouter</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="RouterConf">&lt;static&gt;+routes: List&lt;GoRoute&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="RouterConf">&lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="RouterConf">&lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;</text>
+								
+							</g>
 						</g>
-						<g transform="translate(70645.75, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserRepository">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserRepository">UserRepository</text>
+						<g transform="translate(55392, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
+								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+GoRoute route()</text>
 								
 							</g>
 						</g>
-						<g transform="translate(70645.75, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+ref: Ref&lt;Object?&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="UserRepository">+user: StudyUUser</text>
+					</g>
+					<g data-name="QuestionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormRouteArgs">
+							<rect x="58995.5" y="2594.0" height="62.0" width="210.0" data-name="QuestionFormRouteArgs"></rect>
+							<path d="M58995.5 2625.0 L59205.5 2625.0" fill="none" data-name="QuestionFormRouteArgs"></path>
+						</g>
+						<g transform="translate(58995.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormRouteArgs">
+								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormRouteArgs">QuestionFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(70645.75, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+dynamic fetchUser()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+dynamic saveUser()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+dynamic updatePreferences()</text>
+						<g transform="translate(58995.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormRouteArgs">+questionId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="Ref">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Ref">
-							<rect x="77134.3" y="4118.5" height="31.0" width="43.0" data-name="Ref"></rect>
+					<g data-name="ScreenerQuestionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormRouteArgs">
+							<rect x="57954.5" y="3485.0" height="31.0" width="282.0" data-name="ScreenerQuestionFormRouteArgs"></rect>
 						</g>
-						<g transform="translate(77134.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Ref">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Ref">
-								<text x="13.5" y="13.5" stroke="none" text-anchor="middle" data-name="Ref">Ref</text>
+						<g transform="translate(57954.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormRouteArgs">
+								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormRouteArgs">ScreenerQuestionFormRouteArgs</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="PreferenceAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreferenceAction">
-							<rect x="2929.0" y="3447.0" height="107.0" width="334.0" data-name="PreferenceAction"></rect>
-							<path d="M2929.0 3478.0 L3263.0 3478.0" fill="none" data-name="PreferenceAction"></path>
+					<g data-name="ConsentItemFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormRouteArgs">
+							<rect x="59245.5" y="2594.0" height="62.0" width="239.0" data-name="ConsentItemFormRouteArgs"></rect>
+							<path d="M59245.5 2625.0 L59484.5 2625.0" fill="none" data-name="ConsentItemFormRouteArgs"></path>
 						</g>
-						<g transform="translate(2929, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreferenceAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreferenceAction">
-								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="PreferenceAction">PreferenceAction</text>
+						<g transform="translate(59245.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormRouteArgs">
+								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormRouteArgs">ConsentItemFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(2929, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreferenceAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreferenceAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreferenceAction">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+values: List&lt;PreferenceAction&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pin: PreferenceAction</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pinOff: PreferenceAction</text>
+						<g transform="translate(59245.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormRouteArgs">+consentId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="User">
-						<g fill="#eee8d5" stroke="#33322E" data-name="User">
-							<rect x="73039.8" y="4661.0" height="31.0" width="53.0" data-name="User"></rect>
+					<g data-name="SurveyQuestionFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormRouteArgs">
+							<rect x="48052.3" y="3469.5" height="62.0" width="265.0" data-name="SurveyQuestionFormRouteArgs"></rect>
+							<path d="M48052.3 3500.5 L48317.3 3500.5" fill="none" data-name="SurveyQuestionFormRouteArgs"></path>
 						</g>
-						<g transform="translate(73039.75, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="User">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="User">
-								<text x="18.5" y="13.5" stroke="none" text-anchor="middle" data-name="User">User</text>
+						<g transform="translate(48052.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormRouteArgs">
+								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormRouteArgs">SurveyQuestionFormRouteArgs</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="Session">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Session">
-							<rect x="76321.0" y="4661.0" height="31.0" width="79.0" data-name="Session"></rect>
-						</g>
-						<g transform="translate(76321, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Session">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Session">
-								<text x="31.5" y="13.5" stroke="none" text-anchor="middle" data-name="Session">Session</text>
+						<g transform="translate(48052.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormRouteArgs">+questionId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="AuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthRepository">
-							<rect x="76315.0" y="4310.5" height="288.0" width="295.0" data-name="AuthRepository"></rect>
-							<path d="M76315.0 4341.5 L76610.0 4341.5" fill="none" data-name="AuthRepository"></path>
-							<path d="M76315.0 4462.5 L76610.0 4462.5" fill="none" data-name="AuthRepository"></path>
-						</g>
-						<g transform="translate(76315, 4310.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthRepository">
-								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthRepository">AuthRepository</text>
-								
-							</g>
+					<g data-name="InterventionTaskFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormRouteArgs">
+							<rect x="38498.5" y="3469.5" height="62.0" width="271.0" data-name="InterventionTaskFormRouteArgs"></rect>
+							<path d="M38498.5 3500.5 L38769.5 3500.5" fill="none" data-name="InterventionTaskFormRouteArgs"></path>
 						</g>
-						<g transform="translate(76315, 4341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">+supabaseClient: SupabaseClient</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+allowPasswordReset: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+authClient: GoTrueClient</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+session: Session?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+serializedSession: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+currentUser: User?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+isLoggedIn: bool</text>
+						<g transform="translate(38498.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormRouteArgs">
+								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormRouteArgs">InterventionTaskFormRouteArgs</text>
 								
 							</g>
 						</g>
-						<g transform="translate(76315, 4462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">-void _registerAuthListener()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+dynamic signUp()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+dynamic signInWith()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+dynamic signOut()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+dynamic updateUser()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+void dispose()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthRepository">+dynamic onAppStart()</text>
+						<g transform="translate(38498.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormRouteArgs">+taskId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="GoTrueClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoTrueClient">
-							<rect x="76440.0" y="4661.0" height="31.0" width="120.0" data-name="GoTrueClient"></rect>
+					<g data-name="ReportItemFormRouteArgs">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormRouteArgs">
+							<rect x="60260.5" y="2594.0" height="62.0" width="226.0" data-name="ReportItemFormRouteArgs"></rect>
+							<path d="M60260.5 2625.0 L60486.5 2625.0" fill="none" data-name="ReportItemFormRouteArgs"></path>
 						</g>
-						<g transform="translate(76440, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoTrueClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoTrueClient">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoTrueClient">GoTrueClient</text>
+						<g transform="translate(60260.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormRouteArgs">
+								<text x="105.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormRouteArgs">ReportItemFormRouteArgs</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="StudyLaunched">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyLaunched">
-							<rect x="79535.8" y="614.0" height="31.0" width="140.0" data-name="StudyLaunched"></rect>
-						</g>
-						<g transform="translate(79535.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyLaunched">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyLaunched">
-								<text x="62.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyLaunched">StudyLaunched</text>
+						<g transform="translate(60260.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormRouteArgs">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormRouteArgs">
+								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormRouteArgs">+sectionId: String</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ModelEvent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelEvent">
-							<rect x="79943.0" y="98.0" height="77.0" width="145.0" data-name="ModelEvent"></rect>
-							<path d="M79943.0 129.0 L80088.0 129.0" fill="none" data-name="ModelEvent"></path>
+					<g data-name="GoRouteParamEnum">
+						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouteParamEnum">
+							<rect x="76948.0" y="98.0" height="77.0" width="202.0" data-name="GoRouteParamEnum"></rect>
+							<path d="M76948.0 129.0 L77150.0 129.0" fill="none" data-name="GoRouteParamEnum"></path>
 						</g>
-						<g transform="translate(79943, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelEvent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelEvent">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelEvent">ModelEvent</text>
+						<g transform="translate(76948, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GoRouteParamEnum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouteParamEnum">
+								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouteParamEnum">GoRouteParamEnum</text>
 								
 							</g>
 						</g>
-						<g transform="translate(79943, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelEvent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelEvent">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelEvent">+modelId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelEvent">+model: T</text>
+						<g transform="translate(76948, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouteParamEnum">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouteParamEnum">
+								<text x="0.0" y="13.5" stroke="none" data-name="GoRouteParamEnum">+String toRouteParam()</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="GoRouteParamEnum">+String toShortString()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="SupabaseQueryError">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryError">
-							<rect x="77384.3" y="583.5" height="92.0" width="183.0" data-name="SupabaseQueryError"></rect>
-							<path d="M77384.3 614.5 L77567.3 614.5" fill="none" data-name="SupabaseQueryError"></path>
+					<g data-name="Config">
+						<g fill="#eee8d5" stroke="#33322E" data-name="Config">
+							<rect x="77190.0" y="60.5" height="152.0" width="396.0" data-name="Config"></rect>
+							<path d="M77190.0 91.5 L77586.0 91.5" fill="none" data-name="Config"></path>
 						</g>
-						<g transform="translate(77384.25, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseQueryError">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryError">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryError">SupabaseQueryError</text>
+						<g transform="translate(77190, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Config">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Config">
+								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="Config">Config</text>
 								
 							</g>
 						</g>
-						<g transform="translate(77384.25, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryError">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryError">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryError">+statusCode: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryError">+message: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryError">+details: dynamic</text>
+						<g transform="translate(77190, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Config">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Config">
+								<text x="0.0" y="13.5" stroke="none" data-name="Config">&lt;static&gt;+isDebugMode: bool</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="Config">&lt;static&gt;+defaultLocale: Set&lt;String&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="Config">&lt;static&gt;+supportedLocales: Map&lt;String, String&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="Config">&lt;static&gt;+newStudyId: String</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="Config">&lt;static&gt;+newModelId: String</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="Config">&lt;static&gt;+minSplashTime: int</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="Config">&lt;static&gt;+formAutosaveDebounce: int</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="WrappedModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WrappedModel">
-							<rect x="61452.3" y="2496.0" height="258.0" width="251.0" data-name="WrappedModel"></rect>
-							<path d="M61452.3 2527.0 L61703.3 2527.0" fill="none" data-name="WrappedModel"></path>
-							<path d="M61452.3 2678.0 L61703.3 2678.0" fill="none" data-name="WrappedModel"></path>
+					<g data-name="StudyTemplates">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTemplates">
+							<rect x="77626.0" y="90.0" height="93.0" width="307.0" data-name="StudyTemplates"></rect>
+							<path d="M77626.0 121.0 L77933.0 121.0" fill="none" data-name="StudyTemplates"></path>
+							<path d="M77626.0 152.0 L77933.0 152.0" fill="none" data-name="StudyTemplates"></path>
 						</g>
-						<g transform="translate(61452.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WrappedModel">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="WrappedModel">WrappedModel</text>
+						<g transform="translate(77626, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTemplates">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTemplates">
+								<text x="145.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTemplates">StudyTemplates</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61452.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">-_model: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+asyncValue: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+isLocalOnly: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+isDirty: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WrappedModel">+isDeleted: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WrappedModel">+lastSaved: DateTime?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WrappedModel">+lastFetched: DateTime?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WrappedModel">+lastUpdated: DateTime?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WrappedModel">+model: T</text>
+						<g transform="translate(77626, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+kUnnamedStudyTitle: String</text>
 								
 							</g>
 						</g>
-						<g transform="translate(61452.25, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">+dynamic markWithError()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+dynamic markAsLoading()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+dynamic markAsFetched()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+dynamic markAsSaved()</text>
+						<g transform="translate(77626, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+Study emptyDraft()</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ModelRepositoryException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepositoryException">
-							<rect x="77607.3" y="614.0" height="31.0" width="227.0" data-name="ModelRepositoryException"></rect>
+					<g data-name="StudyActionType">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyActionType">
+							<rect x="5302.8" y="3402.0" height="197.0" width="358.0" data-name="StudyActionType"></rect>
+							<path d="M5302.8 3433.0 L5660.8 3433.0" fill="none" data-name="StudyActionType"></path>
 						</g>
-						<g transform="translate(77607.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelRepositoryException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepositoryException">
-								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepositoryException">ModelRepositoryException</text>
+						<g transform="translate(5302.75, 3402)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyActionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyActionType">
+								<text x="171.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyActionType">StudyActionType</text>
+								
+							</g>
+						</g>
+						<g transform="translate(5302.75, 3433)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyActionType">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyActionType">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyActionType">+index: int</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+values: List&lt;StudyActionType&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pin: StudyActionType</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pinoff: StudyActionType</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+edit: StudyActionType</text>
+								<text x="0.0" y="88.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicate: StudyActionType</text>
+								<text x="0.0" y="103.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicateDraft: StudyActionType</text>
+								<text x="0.0" y="118.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+addCollaborator: StudyActionType</text>
+								<text x="0.0" y="133.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+export: StudyActionType</text>
+								<text x="0.0" y="148.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+delete: StudyActionType</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="ModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelNotFoundException">
-							<rect x="77611.3" y="1197.0" height="31.0" width="219.0" data-name="ModelNotFoundException"></rect>
+					<g data-name="ResultTypes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="ResultTypes">
+							<rect x="76487.0" y="121.0" height="31.0" width="114.0" data-name="ResultTypes"></rect>
 						</g>
-						<g transform="translate(77611.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelNotFoundException">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelNotFoundException">ModelNotFoundException</text>
+						<g transform="translate(76487, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ResultTypes">
+								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ResultTypes">ResultTypes</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IModelRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepository">
-							<rect x="83701.3" y="501.0" height="257.0" width="382.0" data-name="IModelRepository"></rect>
-							<path d="M83701.3 532.0 L84083.3 532.0" fill="none" data-name="IModelRepository"></path>
+					<g data-name="MeasurementResultTypes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementResultTypes">
+							<rect x="76233.8" y="591.0" height="77.0" width="252.0" data-name="MeasurementResultTypes"></rect>
+							<path d="M76233.8 622.0 L76485.8 622.0" fill="none" data-name="MeasurementResultTypes"></path>
 						</g>
-						<g transform="translate(83701.25, 501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepository">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepository">IModelRepository</text>
+						<g transform="translate(76233.75, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementResultTypes">
+								<text x="118.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementResultTypes">MeasurementResultTypes</text>
 								
 							</g>
 						</g>
-						<g transform="translate(83701.25, 532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepository">+WrappedModel&lt;T&gt;? get()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepository">+dynamic fetchAll()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepository">+dynamic fetch()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepository">+dynamic save()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepository">+dynamic delete()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSave()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="IModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="IModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="IModelRepository">+dynamic ensurePersisted()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="IModelRepository">+void dispose()</text>
+						<g transform="translate(76233.75, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementResultTypes">
+								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+questionnaire: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IsFetched">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsFetched">
-							<rect x="79715.8" y="614.0" height="31.0" width="94.0" data-name="IsFetched"></rect>
+					<g data-name="InterventionResultTypes">
+						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionResultTypes">
+							<rect x="76963.3" y="591.0" height="77.0" width="268.0" data-name="InterventionResultTypes"></rect>
+							<path d="M76963.3 622.0 L77231.3 622.0" fill="none" data-name="InterventionResultTypes"></path>
 						</g>
-						<g transform="translate(79715.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsFetched">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsFetched">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsFetched">IsFetched</text>
+						<g transform="translate(76963.25, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionResultTypes">
+								<text x="126.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionResultTypes">InterventionResultTypes</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IsSaving">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaving">
-							<rect x="79849.8" y="614.0" height="31.0" width="84.0" data-name="IsSaving"></rect>
-						</g>
-						<g transform="translate(79849.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaving">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaving">
-								<text x="34.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaving">IsSaving</text>
+						<g transform="translate(76963.25, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResultTypes">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResultTypes">
+								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+checkmarkTask: String</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
 								
 							</g>
 						</g>
 					</g>
-					<g data-name="IsSaved">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaved">
-							<rect x="80646.0" y="614.0" height="31.0" width="80.0" data-name="IsSaved"></rect>
+					<g data-name="StudyExportData">
+						<g fill="#eee8d5" stroke="#33322E" data-name="StudyExportData">
+							<rect x="56469.0" y="2564.0" height="122.0" width="414.0" data-name="StudyExportData"></rect>
+							<path d="M56469.0 2595.0 L56883.0 2595.0" fill="none" data-name="StudyExportData"></path>
 						</g>
-						<g transform="translate(80646, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaved">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaved">
-								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaved">IsSaved</text>
+						<g transform="translate(56469, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyExportData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyExportData">
+								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyExportData">StudyExportData</text>
 								
 							</g>
 						</g>
-					</g>
-					<g data-name="IsDeleted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsDeleted">
-							<rect x="80766.0" y="614.0" height="31.0" width="91.0" data-name="IsDeleted"></rect>
-						</g>
-						<g transform="translate(80766, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsDeleted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsDeleted">
-								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="IsDeleted">IsDeleted</text>
+						<g transform="translate(56469, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyExportData">
+							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyExportData">
+								<text x="0.0" y="13.5" stroke="none" data-name="StudyExportData">+study: Study</text>
+								<text x="0.0" y="28.5" stroke="none" data-name="StudyExportData">+measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
+								<text x="0.0" y="43.5" stroke="none" data-name="StudyExportData">+interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
+								<text x="0.0" y="58.5" stroke="none" data-name="StudyExportData">+mediaData: List&lt;String&gt;</text>
+								<text x="0.0" y="73.5" stroke="none" data-name="StudyExportData">+isEmpty: bool</text>
 								
 							</g>
 						</g>

From ecc0d0da88db4eec55a6bc4f8041039ffa749da6 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 27 May 2024 22:27:39 +0200
Subject: [PATCH 077/314] chore: format and fix

---
 .../study/dashboard/task_overview_tab/task_overview.dart     | 5 +++--
 app/lib/screens/study/report/report_history.dart             | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart b/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart
index d07550b54..6c3fd9529 100644
--- a/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart
+++ b/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
@@ -80,7 +79,9 @@ class _TaskOverviewState extends State<TaskOverview> {
               const SizedBox(height: 16),
               Row(
                 children: [
-                  Expanded(child: Text(AppLocalizations.of(context)!.intervention_current, style: theme.textTheme.titleLarge)),
+                  Expanded(
+                      child:
+                          Text(AppLocalizations.of(context)!.intervention_current, style: theme.textTheme.titleLarge)),
                   const Spacer(),
                   Text(
                     '${widget.subject!.daysLeftForPhase(widget.subject!.getInterventionIndexForDate(DateTime.now()))} ${AppLocalizations.of(context)!.days_left}',
diff --git a/app/lib/screens/study/report/report_history.dart b/app/lib/screens/study/report/report_history.dart
index 24f265f90..7fcd689e7 100644
--- a/app/lib/screens/study/report/report_history.dart
+++ b/app/lib/screens/study/report/report_history.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';

From bc76084dccd92bd42dc9f2287b1fd48673fc9df0 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 27 May 2024 18:02:26 +0200
Subject: [PATCH 078/314] feat: Add local env melos scripts

---
 melos.yaml | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/melos.yaml b/melos.yaml
index c4f4dd3f9..395ae5c53 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -93,10 +93,10 @@ scripts:
   dev:app:
     run: |
       melos exec -c 1 -- \
-        "flutter run -d chrome --web-port 8080 --dart-define=STUDYU_ENV=.env.local"
+        "flutter run -d chrome --web-port 8080 --dart-define=STUDYU_ENV=.env.dev"
     packageFilters:
       scope: studyu_app
-    description: Runs StudyU App with default environment
+    description: Runs StudyU App with the development environment
 
   dev:designer_v2:
     run: |
@@ -104,7 +104,23 @@ scripts:
         "flutter run -d chrome --web-port 8081 --dart-define=STUDYU_ENV=.env.local"
     packageFilters:
       scope: studyu_designer_v2
-    description: Runs StudyU Designer for local development
+    description: Runs StudyU Designer with the development environment
+
+  local:app:
+    run: |
+      melos exec -c 1 -- \
+        "flutter run -d chrome --web-port 8080 --dart-define=STUDYU_ENV=.env.local"
+    packageFilters:
+      scope: studyu_app
+    description: Runs StudyU App with local environment
+
+  local:designer_v2:
+    run: |
+      melos exec -c 1 -- \
+        "flutter run -d chrome --web-port 8081 --dart-define=STUDYU_ENV=.env.local"
+    packageFilters:
+      scope: studyu_designer_v2
+    description: Runs StudyU Designer with local environment
 
   build:android:
     run: |

From 5ba5eb847488a4adbee87195bda2f55206287fe7 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 27 May 2024 18:02:37 +0200
Subject: [PATCH 079/314] docs: Add documentation for supabase cli

---
 CONTRIBUTING.md    | 32 +++++++++++++-------------------
 supabase/README.md | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 19 deletions(-)
 create mode 100644 supabase/README.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b14ab8853..2245ff520 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -58,36 +58,27 @@ STUDYU_APP_URL="https://app.studyu.health/"
 STUDYU_DESIGNER_URL="https://designer.studyu.health/"
 ```
 
-The great advantage of this new approach (compared to the previous approach
-with different entrypoint `main.dart` files) is that we can set the
-configuration of already compiled web apps. Previously, once built, a Flutter
-web app and its container would be hardcoded to whatever variable was given at
-the build time. In the docker-compose setup, we leverage this by copying the
-config (`.env`) to the right place in the container, without needing to rebuild.
-Now we can publish a docker image and the same image can be used in multiple
-environments.
-
 Additionally, we have the following environment files:
 
 - `.env`: Production database used by default
 - `.env.dev`: Development database used by dev branch
 - `.env.local`: Local database for a custom Supabase instance (used by the
-StudyU CLI)
+Supabase CLI)
 
-Ideally we should only use the development database or a local one for all our
+Ideally, we should only use the development database or a local one for all our
 development work.
 
 ## Coding on `core`
 
-When developing models in the `core` package you need to make sure the JSON IO
-code is generated correctly. To do this we use `build_runner` together with
-`json_serializable`.
+Changes to the models in the `core` package requires to perform a re-generation
+of the JSON IO code. The toolchain we use for this consists of [build_runner](https://pub.dev/packages/build_runner)
+and [json_serializable](https://pub.dev/packages/json_serializable).
 
-To generate the IO code once, run `melos run generate`.
+After you made changes to the models, update the generated IO code by running `melos run generate`.
 
-Contrary to most recommendations, we commit those generated files to Git. This
-is needed, because core is a dependency by app and designer and dependencies
-need to have all files generated, when being imported.
+Contrary to most recommendations, we commit those generated files (`*.g.dart`) to Git. This
+is needed, because `core` is a dependency of the StudyU App and the StudyU Designer
+and dependencies need to have all files generated, when being imported.
 
 ## Code Style
 
@@ -105,4 +96,7 @@ We are using a self-hosted instance of [Supabase](https://supabase.com/) as a
 Backend-as-a-Service provider. Supabase provides different backend services
 such as a database, API, authentication, storage service all based around
 PostgreSQL and other FOSS. Since Supabase is open-source, we are hosting our
-own instance to ensure data privacy and security.
+own instance to ensure data privacy and security. For development purposes,
+Supabase can be self-hosted by using the [Supabase CLI](https://supabase.com/docs/guides/cli).
+Have a look into the [/supabase/README.md](./supabase/README.md) file for a
+guide on how to run the Supabase CLI for StudyU.
diff --git a/supabase/README.md b/supabase/README.md
new file mode 100644
index 000000000..629734932
--- /dev/null
+++ b/supabase/README.md
@@ -0,0 +1,42 @@
+# Supabase CLI for StudyU
+
+This guide describes how to run the [Supabase CLI](https://supabase.com/docs/guides/cli)
+for StudyU for development purposes. It assumes that you have already cloned the StudyU
+repository and are familiar with the process of how to run command line instructions.
+
+**It is strongly advised that the following instructions should only be followed for developing
+and testing the StudyU platform and __not__ for running live studies with actual participants.
+The setup should only be run on a local machine and the containers from the Supabase CLI is not
+meant to be exposed to a network or the Internet, as no means of security measurements are
+implemented.**
+
+Interested in running a study in a live and secure setting with StudyU? Head to the
+[Contact page](https://www.studyu.health/contact) of our website and send us a message. We are
+looking forward to support your research.
+
+## Getting Started
+
+1. Install [Docker](https://www.docker.com/).
+1. Follow the Supabase CLI [Getting Started](https://supabase.com/docs/guides/cli/getting-started) installation instructions.
+1. Open a command line and `cd` to the root directory of the studyu repository.
+1. Prepare the local environment by executing `cp flutter_common/lib/envs/.env.local.example flutter_common/lib/envs/.env.local`
+1. Run `supabase start`.
+
+This will spin up a local environment of Supabase for development. Run `supabase stop` to stop the
+Supabase stack.
+
+## Connect to the local Supabase Instance
+
+Run `melos run local:designer_v2` or `melos run local:app` to launch the respective StudyU
+component with the self-hosted environment of the Supabase CLI.  The database will come seeded
+with testing data. You can log into the StudyU Designer by using the credentials
+`user1@studyu.health` and `user1pass`.
+
+Open [Supabase Studio](http://localhost:54323) to access the graphical interface of Supabase to
+manage the local instance.
+
+## What's more?
+
+Run `supabase db reset` to revert to the default database state. Find out more commands and
+features of the Supabase CLI on the [CLI reference](https://supabase.com/docs/reference/cli/introduction)
+pages.

From 781ae66d859d05f89e46687ce1dfcb4e32e56244 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 19 Apr 2024 23:33:34 +0200
Subject: [PATCH 080/314] refactor: migrate to riverpod code generation

---
 designer_v2/lib/features/app.dart             |    4 +-
 designer_v2/lib/features/app_controller.dart  |   39 +-
 .../lib/features/app_controller.g.dart        |   28 +
 .../lib/features/app_controller_state.dart    |    2 +
 .../design/study_form_controller.dart         |   20 +-
 .../design/study_form_controller.g.dart       |  197 ++
 .../features/design/study_form_providers.dart |  117 +-
 .../design/study_form_providers.g.dart        | 1939 +++++++++++++++++
 .../recruit/invite_code_form_controller.dart  |   11 +-
 .../invite_code_form_controller.g.dart        |  193 ++
 .../recruit/study_recruit_controller.dart     |    2 +-
 .../lib/features/study/study_controller.dart  |   14 +-
 .../features/study/study_test_controller.dart |   10 +-
 .../study/study_test_controller.g.dart        |  163 ++
 .../lib/localization/language_picker.dart     |    4 +-
 .../lib/localization/locale_providers.dart    |   27 +-
 .../lib/localization/locale_providers.g.dart  |   62 +
 .../lib/localization/locale_state.dart        |   16 +-
 .../lib/localization/locale_state.g.dart      |   27 +
 designer_v2/lib/repositories/api_client.dart  |    9 +-
 .../lib/repositories/api_client.g.dart        |   24 +
 .../lib/repositories/auth_repository.dart     |   13 +-
 .../lib/repositories/auth_repository.g.dart   |   25 +
 .../repositories/invite_code_repository.dart  |    9 +-
 .../invite_code_repository.g.dart             |  161 ++
 .../lib/repositories/study_repository.dart    |   14 +-
 .../lib/repositories/study_repository.g.dart  |   25 +
 .../lib/repositories/supabase_client.dart     |   13 +-
 .../lib/repositories/supabase_client.g.dart   |   25 +
 designer_v2/lib/routing/router.dart           |   10 +-
 designer_v2/lib/routing/router.g.dart         |   34 +
 designer_v2/lib/services/clipboard.dart       |    9 +-
 designer_v2/lib/services/clipboard.g.dart     |   26 +
 .../lib/services/notification_service.dart    |   16 +-
 .../lib/services/notification_service.g.dart  |   27 +
 designer_v2/pubspec.yaml                      |    7 +-
 36 files changed, 3145 insertions(+), 177 deletions(-)
 create mode 100644 designer_v2/lib/features/app_controller.g.dart
 create mode 100644 designer_v2/lib/features/design/study_form_controller.g.dart
 create mode 100644 designer_v2/lib/features/design/study_form_providers.g.dart
 create mode 100644 designer_v2/lib/features/recruit/invite_code_form_controller.g.dart
 create mode 100644 designer_v2/lib/features/study/study_test_controller.g.dart
 create mode 100644 designer_v2/lib/localization/locale_providers.g.dart
 create mode 100644 designer_v2/lib/localization/locale_state.g.dart
 create mode 100644 designer_v2/lib/repositories/api_client.g.dart
 create mode 100644 designer_v2/lib/repositories/auth_repository.g.dart
 create mode 100644 designer_v2/lib/repositories/invite_code_repository.g.dart
 create mode 100644 designer_v2/lib/repositories/study_repository.g.dart
 create mode 100644 designer_v2/lib/repositories/supabase_client.g.dart
 create mode 100644 designer_v2/lib/routing/router.g.dart
 create mode 100644 designer_v2/lib/services/clipboard.g.dart
 create mode 100644 designer_v2/lib/services/notification_service.g.dart

diff --git a/designer_v2/lib/features/app.dart b/designer_v2/lib/features/app.dart
index 798f3fcb2..4b7fac349 100644
--- a/designer_v2/lib/features/app.dart
+++ b/designer_v2/lib/features/app.dart
@@ -11,6 +11,8 @@ import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/services/notification_dispatcher.dart';
 import 'package:studyu_designer_v2/theme.dart';
 
+import '../localization/locale_state.dart';
+
 final GlobalKey<ScaffoldMessengerState> scaffoldMessengerKey = GlobalKey();
 
 /// Entry widget of the app.
@@ -54,7 +56,7 @@ class _AppContentState extends ConsumerState<AppContent> {
     // todo move this into appControllerProvider
     WidgetsBinding.instance.addPostFrameCallback((_) async {
       // Locale Startup Actions
-      ref.read(localeStateProvider.notifier).initLocale();
+      ref.read(localeStateNotifierProvider.notifier).initLocale();
     });
   }
 
diff --git a/designer_v2/lib/features/app_controller.dart b/designer_v2/lib/features/app_controller.dart
index d4d916b17..33f99f147 100644
--- a/designer_v2/lib/features/app_controller.dart
+++ b/designer_v2/lib/features/app_controller.dart
@@ -1,9 +1,11 @@
 import 'dart:async';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/features/app_controller_state.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 
+part 'app_controller.g.dart';
+
 /// Interface for implementation by any resources that want to bind themselves
 /// to the application lifecycle
 abstract class IAppDelegate {
@@ -13,18 +15,24 @@ abstract class IAppDelegate {
 typedef _DelegateCallback = Future<bool> Function(IAppDelegate delegate);
 
 /// Main controller that's bound to the top-level application widget's state
-class AppController extends StateNotifier<AppControllerState> {
+@riverpod
+class AppController extends _$AppController {
+  @override
+  AppControllerState build() {
+    _appDelegates = [
+      /// Register [IAppDelegate]s here for invocation of app lifecycle methods
+      ref.watch(authRepositoryProvider),
+    ];
+    return const AppControllerState();
+  }
+
   /// List of listeners for app lifecycle events registered via Riverpod
-  final List<IAppDelegate> appDelegates;
+  late final List<IAppDelegate> _appDelegates;
 
   /// A dummy [Future] used for setting a lower bound on app initialization
   /// (so that the splash screen is shown during this time)
   late final _delayedFuture = Future.delayed(const Duration(milliseconds: Config.minSplashTime), () => true);
 
-  AppController({required this.appDelegates}) : super(const AppControllerState());
-
-  get isInitialized => state.status == AppStatus.initialized;
-
   Future<bool> onAppStart() async {
     // Forward onAppStart to all registered delegates so that they can
     // e.g. read some data from local storage for initialization
@@ -37,7 +45,7 @@ class AppController extends StateNotifier<AppControllerState> {
   Future<bool> _callDelegates(_DelegateCallback function, {withMinDelay = false}) async {
     final List<Future<bool>> delegateFutures = [];
     // Collect all delegated futures
-    for (final delegate in appDelegates) {
+    for (final delegate in _appDelegates) {
       final future = function(delegate);
       delegateFutures.add(future);
     }
@@ -50,18 +58,3 @@ class AppController extends StateNotifier<AppControllerState> {
     return !results.contains(false);
   }
 }
-
-final appControllerProvider = StateNotifierProvider<AppController, AppControllerState>((ref) {
-  final appController = AppController(appDelegates: [
-    /// Register [IAppDelegate]s here for invocation of app lifecycle methods
-    ref.watch(authRepositoryProvider),
-  ]);
-  appController.addListener((state) {
-    print("appController.state updated");
-  });
-  ref.onDispose(() {
-    print("appControllerProvider.DISPOSE");
-  });
-  print("appControllerProvider");
-  return appController;
-});
diff --git a/designer_v2/lib/features/app_controller.g.dart b/designer_v2/lib/features/app_controller.g.dart
new file mode 100644
index 000000000..ea2ecc794
--- /dev/null
+++ b/designer_v2/lib/features/app_controller.g.dart
@@ -0,0 +1,28 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'app_controller.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$appControllerHash() => r'c72d85991f008d5ad6a88ef46b77578f78c32ac5';
+
+/// Main controller that's bound to the top-level application widget's state
+///
+/// Copied from [AppController].
+@ProviderFor(AppController)
+final appControllerProvider =
+    AutoDisposeNotifierProvider<AppController, AppControllerState>.internal(
+  AppController.new,
+  name: r'appControllerProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$appControllerHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef _$AppController = AutoDisposeNotifier<AppControllerState>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/app_controller_state.dart b/designer_v2/lib/features/app_controller_state.dart
index 0dadffb63..5183f31f8 100644
--- a/designer_v2/lib/features/app_controller_state.dart
+++ b/designer_v2/lib/features/app_controller_state.dart
@@ -9,6 +9,8 @@ class AppControllerState extends Equatable {
 
   final AppStatus status;
 
+  get isInitialized => status == AppStatus.initialized;
+
   @override
   List<Object?> get props => [status];
 }
diff --git a/designer_v2/lib/features/design/study_form_controller.dart b/designer_v2/lib/features/design/study_form_controller.dart
index a1e1741a4..f56d6ac16 100644
--- a/designer_v2/lib/features/design/study_form_controller.dart
+++ b/designer_v2/lib/features/design/study_form_controller.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:reactive_forms/reactive_forms.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/features/design/enrollment/enrollment_form_controller.dart';
@@ -24,6 +24,8 @@ import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
 
+part 'study_form_controller.g.dart';
+
 class StudyFormViewModel extends FormViewModel<Study> implements IFormViewModelDelegate<FormViewModel> {
   StudyFormViewModel({
     required this.router,
@@ -162,20 +164,14 @@ class StudyFormViewModel extends FormViewModel<Study> implements IFormViewModelD
 ///
 /// Note: This is not safe to use in widgets (or other providers) that are built
 /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
-final studyFormViewModelProvider = Provider.autoDispose.family<StudyFormViewModel, StudyID>((ref, studyId) {
-  print("studyFormViewModelProvider");
+@riverpod
+StudyFormViewModel studyFormViewModel(StudyFormViewModelRef ref, StudyID studyId) {
+  print("studyFormViewModel");
   final state = ref.watch(studyControllerProvider(studyId));
-  final formViewModel = StudyFormViewModel(
+  return StudyFormViewModel(
     router: ref.watch(routerProvider),
     studyRepository: ref.watch(studyRepositoryProvider),
     authRepository: ref.watch(authRepositoryProvider),
     formData: state.study.value,
   );
-
-  ref.onDispose(() {
-    formViewModel.dispose();
-    print("studyFormViewModelProvider.DISPOSE");
-  });
-
-  return formViewModel;
-});
+}
diff --git a/designer_v2/lib/features/design/study_form_controller.g.dart b/designer_v2/lib/features/design/study_form_controller.g.dart
new file mode 100644
index 000000000..b194bf36c
--- /dev/null
+++ b/designer_v2/lib/features/design/study_form_controller.g.dart
@@ -0,0 +1,197 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'study_form_controller.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$studyFormViewModelHash() =>
+    r'1701792c105e122475442c914b567e7568bf85e8';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+/// Provides the [FormViewModel] that is responsible for displaying and
+/// editing the survey design form.
+///
+/// Note: This is not safe to use in widgets (or other providers) that are built
+/// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+///
+/// Copied from [studyFormViewModel].
+@ProviderFor(studyFormViewModel)
+const studyFormViewModelProvider = StudyFormViewModelFamily();
+
+/// Provides the [FormViewModel] that is responsible for displaying and
+/// editing the survey design form.
+///
+/// Note: This is not safe to use in widgets (or other providers) that are built
+/// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+///
+/// Copied from [studyFormViewModel].
+class StudyFormViewModelFamily extends Family<StudyFormViewModel> {
+  /// Provides the [FormViewModel] that is responsible for displaying and
+  /// editing the survey design form.
+  ///
+  /// Note: This is not safe to use in widgets (or other providers) that are built
+  /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+  ///
+  /// Copied from [studyFormViewModel].
+  const StudyFormViewModelFamily();
+
+  /// Provides the [FormViewModel] that is responsible for displaying and
+  /// editing the survey design form.
+  ///
+  /// Note: This is not safe to use in widgets (or other providers) that are built
+  /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+  ///
+  /// Copied from [studyFormViewModel].
+  StudyFormViewModelProvider call(
+    String studyId,
+  ) {
+    return StudyFormViewModelProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyFormViewModelProvider getProviderOverride(
+    covariant StudyFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyFormViewModelProvider';
+}
+
+/// Provides the [FormViewModel] that is responsible for displaying and
+/// editing the survey design form.
+///
+/// Note: This is not safe to use in widgets (or other providers) that are built
+/// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+///
+/// Copied from [studyFormViewModel].
+class StudyFormViewModelProvider
+    extends AutoDisposeProvider<StudyFormViewModel> {
+  /// Provides the [FormViewModel] that is responsible for displaying and
+  /// editing the survey design form.
+  ///
+  /// Note: This is not safe to use in widgets (or other providers) that are built
+  /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+  ///
+  /// Copied from [studyFormViewModel].
+  StudyFormViewModelProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => studyFormViewModel(
+            ref as StudyFormViewModelRef,
+            studyId,
+          ),
+          from: studyFormViewModelProvider,
+          name: r'studyFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyFormViewModelHash,
+          dependencies: StudyFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              StudyFormViewModelFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    StudyFormViewModel Function(StudyFormViewModelRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyFormViewModelProvider._internal(
+        (ref) => create(ref as StudyFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<StudyFormViewModel> createElement() {
+    return _StudyFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyFormViewModelProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyFormViewModelRef on AutoDisposeProviderRef<StudyFormViewModel> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyFormViewModelProviderElement
+    extends AutoDisposeProviderElement<StudyFormViewModel>
+    with StudyFormViewModelRef {
+  _StudyFormViewModelProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyFormViewModelProvider).studyId;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/design/study_form_providers.dart b/designer_v2/lib/features/design/study_form_providers.dart
index 9688f2aab..b6353cbac 100644
--- a/designer_v2/lib/features/design/study_form_providers.dart
+++ b/designer_v2/lib/features/design/study_form_providers.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/features/design/enrollment/consent_item_form_controller.dart';
 import 'package:studyu_designer_v2/features/design/enrollment/enrollment_form_controller.dart';
@@ -20,112 +20,103 @@ import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/routing/router_config.dart';
 
+part 'study_form_providers.g.dart';
+
 // - Study Info
 
-final studyInfoFormViewModelProvider = Provider.autoDispose.family<StudyInfoFormViewModel, StudyID>((ref, studyId) {
+@riverpod
+StudyInfoFormViewModel studyInfoFormViewModel(StudyInfoFormViewModelRef ref, StudyID studyId) {
   return ref.watch(studyFormViewModelProvider(studyId)).studyInfoFormViewModel;
-});
+}
 
 // - Enrollment
 
-final enrollmentFormViewModelProvider = Provider.autoDispose.family<EnrollmentFormViewModel, StudyID>((ref, studyId) {
+@riverpod
+EnrollmentFormViewModel enrollmentFormViewModel(EnrollmentFormViewModelRef ref, StudyID studyId) {
   return ref.watch(studyFormViewModelProvider(studyId)).enrollmentFormViewModel;
-});
+}
 
-final screenerQuestionFormViewModelProvider =
-    Provider.autoDispose.family<ScreenerQuestionFormViewModel, ScreenerQuestionFormRouteArgs>((ref, args) {
-  final owner = ref.watch(enrollmentFormViewModelProvider(args.studyId));
-  return owner.provide(args);
-});
+@riverpod
+ScreenerQuestionFormViewModel screenerQuestionFormViewModel(ScreenerQuestionFormViewModelRef ref, ScreenerQuestionFormRouteArgs args) {
+  return ref.watch(enrollmentFormViewModelProvider(args.studyId)).provide(args);
+}
 
-final consentItemFormViewModelProvider =
-    Provider.autoDispose.family<ConsentItemFormViewModel, ConsentItemFormRouteArgs>((ref, args) {
-  final owner = ref.watch(enrollmentFormViewModelProvider(args.studyId));
-  return owner.consentItemDelegate.provide(args);
-});
+@riverpod
+ConsentItemFormViewModel consentItemFormViewModel(ConsentItemFormViewModelRef ref, ConsentItemFormRouteArgs args) {
+  return ref.watch(enrollmentFormViewModelProvider(args.studyId)).consentItemDelegate.provide(args);
+}
 
 // - Interventions
 
-final interventionsFormViewModelProvider =
-    Provider.autoDispose.family<InterventionsFormViewModel, StudyID>((ref, studyId) {
+@riverpod
+InterventionsFormViewModel interventionsFormViewModel(InterventionsFormViewModelRef ref, StudyID studyId) {
   return ref.watch(studyFormViewModelProvider(studyId)).interventionsFormViewModel;
-});
+}
 
-final interventionFormViewModelProvider =
-    Provider.autoDispose.family<InterventionFormViewModel, InterventionFormRouteArgs>((ref, args) {
-  final owner = ref.watch(interventionsFormViewModelProvider(args.studyId));
-  return owner.provide(args);
-});
+@riverpod
+InterventionFormViewModel interventionFormViewModel(InterventionFormViewModelRef ref, InterventionFormRouteArgs args) {
+  return ref.watch(interventionsFormViewModelProvider(args.studyId)).provide(args);
+}
 
-final interventionTaskFormViewModelProvider =
-    Provider.autoDispose.family<InterventionTaskFormViewModel, InterventionTaskFormRouteArgs>((ref, args) {
-  final owner = ref.watch(interventionFormViewModelProvider(args));
-  return owner.provide(args);
-});
+@riverpod
+InterventionTaskFormViewModel interventionTaskFormViewModel(InterventionTaskFormViewModelRef ref, InterventionTaskFormRouteArgs args) {
+  return ref.watch(interventionFormViewModelProvider(args)).provide(args);
+}
 
 // - Measurements
 
-final measurementsFormViewModelProvider =
-    Provider.autoDispose.family<MeasurementsFormViewModel, StudyID>((ref, studyId) {
+@riverpod
+MeasurementsFormViewModel measurementsFormViewModel(MeasurementsFormViewModelRef ref, StudyID studyId) {
   return ref.watch(studyFormViewModelProvider(studyId)).measurementsFormViewModel;
-});
+}
 
-final surveyFormViewModelProvider =
-    Provider.autoDispose.family<MeasurementSurveyFormViewModel, MeasurementFormRouteArgs>((ref, args) {
-  final owner = ref.watch(measurementsFormViewModelProvider(args.studyId));
-  return owner.provide(args);
-});
+@riverpod
+MeasurementSurveyFormViewModel surveyFormViewModel(SurveyFormViewModelRef ref, MeasurementFormRouteArgs args) {
+  return ref.watch(measurementsFormViewModelProvider(args.studyId)).provide(args);
+}
 
-final surveyQuestionFormViewModelProvider =
-    Provider.autoDispose.family<QuestionFormViewModel, SurveyQuestionFormRouteArgs>((ref, args) {
-  final owner = ref.watch(surveyFormViewModelProvider(args));
-  return owner.provide(args);
-});
+@riverpod
+QuestionFormViewModel surveyQuestionFormViewModel(SurveyQuestionFormViewModelRef ref, SurveyQuestionFormRouteArgs args) {
+  return ref.watch(surveyFormViewModelProvider(args)).provide(args);
+}
 
 // - Reports
 
-final reportsFormViewModelProvider = Provider.autoDispose.family<ReportsFormViewModel, StudyID>((ref, studyId) {
+@riverpod
+ReportsFormViewModel reportsFormViewModel(ReportsFormViewModelRef ref, StudyID studyId) {
   return ref.watch(studyFormViewModelProvider(studyId)).reportsFormViewModel;
-});
+}
 
-final reportItemFormViewModelProvider =
-    Provider.autoDispose.family<ReportItemFormViewModel, ReportItemFormRouteArgs>((ref, args) {
-  final owner = ref.watch(reportsFormViewModelProvider(args.studyId));
-  return owner.reportItemDelegate.provide(args);
-});
+@riverpod
+ReportItemFormViewModel reportItemFormViewModel(ReportItemFormViewModelRef ref, ReportItemFormRouteArgs args) {
+  return ref.watch(reportsFormViewModelProvider(args.studyId)).reportItemDelegate.provide(args);
+}
 
 // - Validators
 
 /// Provides the [StudyFormViewModel] for validation purposes with
 /// a [StudyFormValidationSet.publish]
-final studyPublishValidatorProvider = Provider.autoDispose.family<StudyFormViewModel, StudyID>((ref, studyId) {
+@riverpod
+StudyFormViewModel studyPublishValidator(StudyPublishValidatorRef ref, StudyID studyId) {
   final state = ref.watch(studyControllerProvider(studyId));
-  final formViewModel = StudyFormViewModel(
+  return StudyFormViewModel(
     router: ref.watch(routerProvider),
     studyRepository: ref.watch(studyRepositoryProvider),
     authRepository: ref.watch(authRepositoryProvider),
     formData: state.study.value,
     validationSet: StudyFormValidationSet.publish,
   );
-  ref.onDispose(() {
-    formViewModel.dispose();
-  });
-  return formViewModel;
-});
+}
 
 /// Provides the [StudyFormViewModel] for validation purposes with
 /// a [StudyFormValidationSet.test]
-final studyTestValidatorProvider = Provider.autoDispose.family<StudyFormViewModel, StudyID>((ref, studyId) {
+@riverpod
+StudyFormViewModel studyTestValidator(StudyTestValidatorRef ref, StudyID studyId) {
   final state = ref.watch(studyControllerProvider(studyId));
-  final formViewModel = StudyFormViewModel(
+  return StudyFormViewModel(
     router: ref.watch(routerProvider),
     studyRepository: ref.watch(studyRepositoryProvider),
     authRepository: ref.watch(authRepositoryProvider),
     formData: state.study.value,
-    validationSet: StudyFormValidationSet.test,
   );
-  ref.onDispose(() {
-    formViewModel.dispose();
-  });
-  return formViewModel;
-});
+}
diff --git a/designer_v2/lib/features/design/study_form_providers.g.dart b/designer_v2/lib/features/design/study_form_providers.g.dart
new file mode 100644
index 000000000..e65a99dff
--- /dev/null
+++ b/designer_v2/lib/features/design/study_form_providers.g.dart
@@ -0,0 +1,1939 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'study_form_providers.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$studyInfoFormViewModelHash() =>
+    r'7f98d180b98a3f7fb550fa61cf9e0b60a0839f1e';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+/// See also [studyInfoFormViewModel].
+@ProviderFor(studyInfoFormViewModel)
+const studyInfoFormViewModelProvider = StudyInfoFormViewModelFamily();
+
+/// See also [studyInfoFormViewModel].
+class StudyInfoFormViewModelFamily extends Family<StudyInfoFormViewModel> {
+  /// See also [studyInfoFormViewModel].
+  const StudyInfoFormViewModelFamily();
+
+  /// See also [studyInfoFormViewModel].
+  StudyInfoFormViewModelProvider call(
+    String studyId,
+  ) {
+    return StudyInfoFormViewModelProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyInfoFormViewModelProvider getProviderOverride(
+    covariant StudyInfoFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyInfoFormViewModelProvider';
+}
+
+/// See also [studyInfoFormViewModel].
+class StudyInfoFormViewModelProvider
+    extends AutoDisposeProvider<StudyInfoFormViewModel> {
+  /// See also [studyInfoFormViewModel].
+  StudyInfoFormViewModelProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => studyInfoFormViewModel(
+            ref as StudyInfoFormViewModelRef,
+            studyId,
+          ),
+          from: studyInfoFormViewModelProvider,
+          name: r'studyInfoFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyInfoFormViewModelHash,
+          dependencies: StudyInfoFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              StudyInfoFormViewModelFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyInfoFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    StudyInfoFormViewModel Function(StudyInfoFormViewModelRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyInfoFormViewModelProvider._internal(
+        (ref) => create(ref as StudyInfoFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<StudyInfoFormViewModel> createElement() {
+    return _StudyInfoFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyInfoFormViewModelProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyInfoFormViewModelRef
+    on AutoDisposeProviderRef<StudyInfoFormViewModel> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyInfoFormViewModelProviderElement
+    extends AutoDisposeProviderElement<StudyInfoFormViewModel>
+    with StudyInfoFormViewModelRef {
+  _StudyInfoFormViewModelProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyInfoFormViewModelProvider).studyId;
+}
+
+String _$enrollmentFormViewModelHash() =>
+    r'f89c53ecf3f90e317a1fbab38a89ae095dc29cca';
+
+/// See also [enrollmentFormViewModel].
+@ProviderFor(enrollmentFormViewModel)
+const enrollmentFormViewModelProvider = EnrollmentFormViewModelFamily();
+
+/// See also [enrollmentFormViewModel].
+class EnrollmentFormViewModelFamily extends Family<EnrollmentFormViewModel> {
+  /// See also [enrollmentFormViewModel].
+  const EnrollmentFormViewModelFamily();
+
+  /// See also [enrollmentFormViewModel].
+  EnrollmentFormViewModelProvider call(
+    String studyId,
+  ) {
+    return EnrollmentFormViewModelProvider(
+      studyId,
+    );
+  }
+
+  @override
+  EnrollmentFormViewModelProvider getProviderOverride(
+    covariant EnrollmentFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'enrollmentFormViewModelProvider';
+}
+
+/// See also [enrollmentFormViewModel].
+class EnrollmentFormViewModelProvider
+    extends AutoDisposeProvider<EnrollmentFormViewModel> {
+  /// See also [enrollmentFormViewModel].
+  EnrollmentFormViewModelProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => enrollmentFormViewModel(
+            ref as EnrollmentFormViewModelRef,
+            studyId,
+          ),
+          from: enrollmentFormViewModelProvider,
+          name: r'enrollmentFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$enrollmentFormViewModelHash,
+          dependencies: EnrollmentFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              EnrollmentFormViewModelFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  EnrollmentFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    EnrollmentFormViewModel Function(EnrollmentFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: EnrollmentFormViewModelProvider._internal(
+        (ref) => create(ref as EnrollmentFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<EnrollmentFormViewModel> createElement() {
+    return _EnrollmentFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is EnrollmentFormViewModelProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin EnrollmentFormViewModelRef
+    on AutoDisposeProviderRef<EnrollmentFormViewModel> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _EnrollmentFormViewModelProviderElement
+    extends AutoDisposeProviderElement<EnrollmentFormViewModel>
+    with EnrollmentFormViewModelRef {
+  _EnrollmentFormViewModelProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as EnrollmentFormViewModelProvider).studyId;
+}
+
+String _$screenerQuestionFormViewModelHash() =>
+    r'3c5615d74c376a66c14dc44738595d0c5a6f972a';
+
+/// See also [screenerQuestionFormViewModel].
+@ProviderFor(screenerQuestionFormViewModel)
+const screenerQuestionFormViewModelProvider =
+    ScreenerQuestionFormViewModelFamily();
+
+/// See also [screenerQuestionFormViewModel].
+class ScreenerQuestionFormViewModelFamily
+    extends Family<ScreenerQuestionFormViewModel> {
+  /// See also [screenerQuestionFormViewModel].
+  const ScreenerQuestionFormViewModelFamily();
+
+  /// See also [screenerQuestionFormViewModel].
+  ScreenerQuestionFormViewModelProvider call(
+    ScreenerQuestionFormRouteArgs args,
+  ) {
+    return ScreenerQuestionFormViewModelProvider(
+      args,
+    );
+  }
+
+  @override
+  ScreenerQuestionFormViewModelProvider getProviderOverride(
+    covariant ScreenerQuestionFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.args,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'screenerQuestionFormViewModelProvider';
+}
+
+/// See also [screenerQuestionFormViewModel].
+class ScreenerQuestionFormViewModelProvider
+    extends AutoDisposeProvider<ScreenerQuestionFormViewModel> {
+  /// See also [screenerQuestionFormViewModel].
+  ScreenerQuestionFormViewModelProvider(
+    ScreenerQuestionFormRouteArgs args,
+  ) : this._internal(
+          (ref) => screenerQuestionFormViewModel(
+            ref as ScreenerQuestionFormViewModelRef,
+            args,
+          ),
+          from: screenerQuestionFormViewModelProvider,
+          name: r'screenerQuestionFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$screenerQuestionFormViewModelHash,
+          dependencies: ScreenerQuestionFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              ScreenerQuestionFormViewModelFamily._allTransitiveDependencies,
+          args: args,
+        );
+
+  ScreenerQuestionFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.args,
+  }) : super.internal();
+
+  final ScreenerQuestionFormRouteArgs args;
+
+  @override
+  Override overrideWith(
+    ScreenerQuestionFormViewModel Function(
+            ScreenerQuestionFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: ScreenerQuestionFormViewModelProvider._internal(
+        (ref) => create(ref as ScreenerQuestionFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        args: args,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<ScreenerQuestionFormViewModel> createElement() {
+    return _ScreenerQuestionFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is ScreenerQuestionFormViewModelProvider && other.args == args;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, args.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin ScreenerQuestionFormViewModelRef
+    on AutoDisposeProviderRef<ScreenerQuestionFormViewModel> {
+  /// The parameter `args` of this provider.
+  ScreenerQuestionFormRouteArgs get args;
+}
+
+class _ScreenerQuestionFormViewModelProviderElement
+    extends AutoDisposeProviderElement<ScreenerQuestionFormViewModel>
+    with ScreenerQuestionFormViewModelRef {
+  _ScreenerQuestionFormViewModelProviderElement(super.provider);
+
+  @override
+  ScreenerQuestionFormRouteArgs get args =>
+      (origin as ScreenerQuestionFormViewModelProvider).args;
+}
+
+String _$consentItemFormViewModelHash() =>
+    r'002af4b4fb26f4815e747107f93a6bdad9bee823';
+
+/// See also [consentItemFormViewModel].
+@ProviderFor(consentItemFormViewModel)
+const consentItemFormViewModelProvider = ConsentItemFormViewModelFamily();
+
+/// See also [consentItemFormViewModel].
+class ConsentItemFormViewModelFamily extends Family<ConsentItemFormViewModel> {
+  /// See also [consentItemFormViewModel].
+  const ConsentItemFormViewModelFamily();
+
+  /// See also [consentItemFormViewModel].
+  ConsentItemFormViewModelProvider call(
+    ConsentItemFormRouteArgs args,
+  ) {
+    return ConsentItemFormViewModelProvider(
+      args,
+    );
+  }
+
+  @override
+  ConsentItemFormViewModelProvider getProviderOverride(
+    covariant ConsentItemFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.args,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'consentItemFormViewModelProvider';
+}
+
+/// See also [consentItemFormViewModel].
+class ConsentItemFormViewModelProvider
+    extends AutoDisposeProvider<ConsentItemFormViewModel> {
+  /// See also [consentItemFormViewModel].
+  ConsentItemFormViewModelProvider(
+    ConsentItemFormRouteArgs args,
+  ) : this._internal(
+          (ref) => consentItemFormViewModel(
+            ref as ConsentItemFormViewModelRef,
+            args,
+          ),
+          from: consentItemFormViewModelProvider,
+          name: r'consentItemFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$consentItemFormViewModelHash,
+          dependencies: ConsentItemFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              ConsentItemFormViewModelFamily._allTransitiveDependencies,
+          args: args,
+        );
+
+  ConsentItemFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.args,
+  }) : super.internal();
+
+  final ConsentItemFormRouteArgs args;
+
+  @override
+  Override overrideWith(
+    ConsentItemFormViewModel Function(ConsentItemFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: ConsentItemFormViewModelProvider._internal(
+        (ref) => create(ref as ConsentItemFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        args: args,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<ConsentItemFormViewModel> createElement() {
+    return _ConsentItemFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is ConsentItemFormViewModelProvider && other.args == args;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, args.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin ConsentItemFormViewModelRef
+    on AutoDisposeProviderRef<ConsentItemFormViewModel> {
+  /// The parameter `args` of this provider.
+  ConsentItemFormRouteArgs get args;
+}
+
+class _ConsentItemFormViewModelProviderElement
+    extends AutoDisposeProviderElement<ConsentItemFormViewModel>
+    with ConsentItemFormViewModelRef {
+  _ConsentItemFormViewModelProviderElement(super.provider);
+
+  @override
+  ConsentItemFormRouteArgs get args =>
+      (origin as ConsentItemFormViewModelProvider).args;
+}
+
+String _$interventionsFormViewModelHash() =>
+    r'8e986de5d8f0a8983792dc91512d21c85344025d';
+
+/// See also [interventionsFormViewModel].
+@ProviderFor(interventionsFormViewModel)
+const interventionsFormViewModelProvider = InterventionsFormViewModelFamily();
+
+/// See also [interventionsFormViewModel].
+class InterventionsFormViewModelFamily
+    extends Family<InterventionsFormViewModel> {
+  /// See also [interventionsFormViewModel].
+  const InterventionsFormViewModelFamily();
+
+  /// See also [interventionsFormViewModel].
+  InterventionsFormViewModelProvider call(
+    String studyId,
+  ) {
+    return InterventionsFormViewModelProvider(
+      studyId,
+    );
+  }
+
+  @override
+  InterventionsFormViewModelProvider getProviderOverride(
+    covariant InterventionsFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'interventionsFormViewModelProvider';
+}
+
+/// See also [interventionsFormViewModel].
+class InterventionsFormViewModelProvider
+    extends AutoDisposeProvider<InterventionsFormViewModel> {
+  /// See also [interventionsFormViewModel].
+  InterventionsFormViewModelProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => interventionsFormViewModel(
+            ref as InterventionsFormViewModelRef,
+            studyId,
+          ),
+          from: interventionsFormViewModelProvider,
+          name: r'interventionsFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$interventionsFormViewModelHash,
+          dependencies: InterventionsFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              InterventionsFormViewModelFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  InterventionsFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    InterventionsFormViewModel Function(InterventionsFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: InterventionsFormViewModelProvider._internal(
+        (ref) => create(ref as InterventionsFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<InterventionsFormViewModel> createElement() {
+    return _InterventionsFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is InterventionsFormViewModelProvider &&
+        other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin InterventionsFormViewModelRef
+    on AutoDisposeProviderRef<InterventionsFormViewModel> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _InterventionsFormViewModelProviderElement
+    extends AutoDisposeProviderElement<InterventionsFormViewModel>
+    with InterventionsFormViewModelRef {
+  _InterventionsFormViewModelProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as InterventionsFormViewModelProvider).studyId;
+}
+
+String _$interventionFormViewModelHash() =>
+    r'c4bbeccc4b19cc3abceb394a213201496c776f75';
+
+/// See also [interventionFormViewModel].
+@ProviderFor(interventionFormViewModel)
+const interventionFormViewModelProvider = InterventionFormViewModelFamily();
+
+/// See also [interventionFormViewModel].
+class InterventionFormViewModelFamily
+    extends Family<InterventionFormViewModel> {
+  /// See also [interventionFormViewModel].
+  const InterventionFormViewModelFamily();
+
+  /// See also [interventionFormViewModel].
+  InterventionFormViewModelProvider call(
+    InterventionFormRouteArgs args,
+  ) {
+    return InterventionFormViewModelProvider(
+      args,
+    );
+  }
+
+  @override
+  InterventionFormViewModelProvider getProviderOverride(
+    covariant InterventionFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.args,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'interventionFormViewModelProvider';
+}
+
+/// See also [interventionFormViewModel].
+class InterventionFormViewModelProvider
+    extends AutoDisposeProvider<InterventionFormViewModel> {
+  /// See also [interventionFormViewModel].
+  InterventionFormViewModelProvider(
+    InterventionFormRouteArgs args,
+  ) : this._internal(
+          (ref) => interventionFormViewModel(
+            ref as InterventionFormViewModelRef,
+            args,
+          ),
+          from: interventionFormViewModelProvider,
+          name: r'interventionFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$interventionFormViewModelHash,
+          dependencies: InterventionFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              InterventionFormViewModelFamily._allTransitiveDependencies,
+          args: args,
+        );
+
+  InterventionFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.args,
+  }) : super.internal();
+
+  final InterventionFormRouteArgs args;
+
+  @override
+  Override overrideWith(
+    InterventionFormViewModel Function(InterventionFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: InterventionFormViewModelProvider._internal(
+        (ref) => create(ref as InterventionFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        args: args,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<InterventionFormViewModel> createElement() {
+    return _InterventionFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is InterventionFormViewModelProvider && other.args == args;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, args.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin InterventionFormViewModelRef
+    on AutoDisposeProviderRef<InterventionFormViewModel> {
+  /// The parameter `args` of this provider.
+  InterventionFormRouteArgs get args;
+}
+
+class _InterventionFormViewModelProviderElement
+    extends AutoDisposeProviderElement<InterventionFormViewModel>
+    with InterventionFormViewModelRef {
+  _InterventionFormViewModelProviderElement(super.provider);
+
+  @override
+  InterventionFormRouteArgs get args =>
+      (origin as InterventionFormViewModelProvider).args;
+}
+
+String _$interventionTaskFormViewModelHash() =>
+    r'58c02adfdf31d7529b49bed1b884d3042f032db0';
+
+/// See also [interventionTaskFormViewModel].
+@ProviderFor(interventionTaskFormViewModel)
+const interventionTaskFormViewModelProvider =
+    InterventionTaskFormViewModelFamily();
+
+/// See also [interventionTaskFormViewModel].
+class InterventionTaskFormViewModelFamily
+    extends Family<InterventionTaskFormViewModel> {
+  /// See also [interventionTaskFormViewModel].
+  const InterventionTaskFormViewModelFamily();
+
+  /// See also [interventionTaskFormViewModel].
+  InterventionTaskFormViewModelProvider call(
+    InterventionTaskFormRouteArgs args,
+  ) {
+    return InterventionTaskFormViewModelProvider(
+      args,
+    );
+  }
+
+  @override
+  InterventionTaskFormViewModelProvider getProviderOverride(
+    covariant InterventionTaskFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.args,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'interventionTaskFormViewModelProvider';
+}
+
+/// See also [interventionTaskFormViewModel].
+class InterventionTaskFormViewModelProvider
+    extends AutoDisposeProvider<InterventionTaskFormViewModel> {
+  /// See also [interventionTaskFormViewModel].
+  InterventionTaskFormViewModelProvider(
+    InterventionTaskFormRouteArgs args,
+  ) : this._internal(
+          (ref) => interventionTaskFormViewModel(
+            ref as InterventionTaskFormViewModelRef,
+            args,
+          ),
+          from: interventionTaskFormViewModelProvider,
+          name: r'interventionTaskFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$interventionTaskFormViewModelHash,
+          dependencies: InterventionTaskFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              InterventionTaskFormViewModelFamily._allTransitiveDependencies,
+          args: args,
+        );
+
+  InterventionTaskFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.args,
+  }) : super.internal();
+
+  final InterventionTaskFormRouteArgs args;
+
+  @override
+  Override overrideWith(
+    InterventionTaskFormViewModel Function(
+            InterventionTaskFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: InterventionTaskFormViewModelProvider._internal(
+        (ref) => create(ref as InterventionTaskFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        args: args,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<InterventionTaskFormViewModel> createElement() {
+    return _InterventionTaskFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is InterventionTaskFormViewModelProvider && other.args == args;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, args.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin InterventionTaskFormViewModelRef
+    on AutoDisposeProviderRef<InterventionTaskFormViewModel> {
+  /// The parameter `args` of this provider.
+  InterventionTaskFormRouteArgs get args;
+}
+
+class _InterventionTaskFormViewModelProviderElement
+    extends AutoDisposeProviderElement<InterventionTaskFormViewModel>
+    with InterventionTaskFormViewModelRef {
+  _InterventionTaskFormViewModelProviderElement(super.provider);
+
+  @override
+  InterventionTaskFormRouteArgs get args =>
+      (origin as InterventionTaskFormViewModelProvider).args;
+}
+
+String _$measurementsFormViewModelHash() =>
+    r'21fe7b97a1c4d44406c44ecc0ac3ba4bcb8dd8c0';
+
+/// See also [measurementsFormViewModel].
+@ProviderFor(measurementsFormViewModel)
+const measurementsFormViewModelProvider = MeasurementsFormViewModelFamily();
+
+/// See also [measurementsFormViewModel].
+class MeasurementsFormViewModelFamily
+    extends Family<MeasurementsFormViewModel> {
+  /// See also [measurementsFormViewModel].
+  const MeasurementsFormViewModelFamily();
+
+  /// See also [measurementsFormViewModel].
+  MeasurementsFormViewModelProvider call(
+    String studyId,
+  ) {
+    return MeasurementsFormViewModelProvider(
+      studyId,
+    );
+  }
+
+  @override
+  MeasurementsFormViewModelProvider getProviderOverride(
+    covariant MeasurementsFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'measurementsFormViewModelProvider';
+}
+
+/// See also [measurementsFormViewModel].
+class MeasurementsFormViewModelProvider
+    extends AutoDisposeProvider<MeasurementsFormViewModel> {
+  /// See also [measurementsFormViewModel].
+  MeasurementsFormViewModelProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => measurementsFormViewModel(
+            ref as MeasurementsFormViewModelRef,
+            studyId,
+          ),
+          from: measurementsFormViewModelProvider,
+          name: r'measurementsFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$measurementsFormViewModelHash,
+          dependencies: MeasurementsFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              MeasurementsFormViewModelFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  MeasurementsFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    MeasurementsFormViewModel Function(MeasurementsFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: MeasurementsFormViewModelProvider._internal(
+        (ref) => create(ref as MeasurementsFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<MeasurementsFormViewModel> createElement() {
+    return _MeasurementsFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is MeasurementsFormViewModelProvider &&
+        other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin MeasurementsFormViewModelRef
+    on AutoDisposeProviderRef<MeasurementsFormViewModel> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _MeasurementsFormViewModelProviderElement
+    extends AutoDisposeProviderElement<MeasurementsFormViewModel>
+    with MeasurementsFormViewModelRef {
+  _MeasurementsFormViewModelProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as MeasurementsFormViewModelProvider).studyId;
+}
+
+String _$surveyFormViewModelHash() =>
+    r'5639e7eecf4014f6359bf8a9d81554b6cc604955';
+
+/// See also [surveyFormViewModel].
+@ProviderFor(surveyFormViewModel)
+const surveyFormViewModelProvider = SurveyFormViewModelFamily();
+
+/// See also [surveyFormViewModel].
+class SurveyFormViewModelFamily extends Family<MeasurementSurveyFormViewModel> {
+  /// See also [surveyFormViewModel].
+  const SurveyFormViewModelFamily();
+
+  /// See also [surveyFormViewModel].
+  SurveyFormViewModelProvider call(
+    MeasurementFormRouteArgs args,
+  ) {
+    return SurveyFormViewModelProvider(
+      args,
+    );
+  }
+
+  @override
+  SurveyFormViewModelProvider getProviderOverride(
+    covariant SurveyFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.args,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'surveyFormViewModelProvider';
+}
+
+/// See also [surveyFormViewModel].
+class SurveyFormViewModelProvider
+    extends AutoDisposeProvider<MeasurementSurveyFormViewModel> {
+  /// See also [surveyFormViewModel].
+  SurveyFormViewModelProvider(
+    MeasurementFormRouteArgs args,
+  ) : this._internal(
+          (ref) => surveyFormViewModel(
+            ref as SurveyFormViewModelRef,
+            args,
+          ),
+          from: surveyFormViewModelProvider,
+          name: r'surveyFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$surveyFormViewModelHash,
+          dependencies: SurveyFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              SurveyFormViewModelFamily._allTransitiveDependencies,
+          args: args,
+        );
+
+  SurveyFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.args,
+  }) : super.internal();
+
+  final MeasurementFormRouteArgs args;
+
+  @override
+  Override overrideWith(
+    MeasurementSurveyFormViewModel Function(SurveyFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: SurveyFormViewModelProvider._internal(
+        (ref) => create(ref as SurveyFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        args: args,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<MeasurementSurveyFormViewModel> createElement() {
+    return _SurveyFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is SurveyFormViewModelProvider && other.args == args;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, args.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin SurveyFormViewModelRef
+    on AutoDisposeProviderRef<MeasurementSurveyFormViewModel> {
+  /// The parameter `args` of this provider.
+  MeasurementFormRouteArgs get args;
+}
+
+class _SurveyFormViewModelProviderElement
+    extends AutoDisposeProviderElement<MeasurementSurveyFormViewModel>
+    with SurveyFormViewModelRef {
+  _SurveyFormViewModelProviderElement(super.provider);
+
+  @override
+  MeasurementFormRouteArgs get args =>
+      (origin as SurveyFormViewModelProvider).args;
+}
+
+String _$surveyQuestionFormViewModelHash() =>
+    r'8359acab6df34eec28b3523b6e0c22cbfa001b66';
+
+/// See also [surveyQuestionFormViewModel].
+@ProviderFor(surveyQuestionFormViewModel)
+const surveyQuestionFormViewModelProvider = SurveyQuestionFormViewModelFamily();
+
+/// See also [surveyQuestionFormViewModel].
+class SurveyQuestionFormViewModelFamily extends Family<QuestionFormViewModel> {
+  /// See also [surveyQuestionFormViewModel].
+  const SurveyQuestionFormViewModelFamily();
+
+  /// See also [surveyQuestionFormViewModel].
+  SurveyQuestionFormViewModelProvider call(
+    SurveyQuestionFormRouteArgs args,
+  ) {
+    return SurveyQuestionFormViewModelProvider(
+      args,
+    );
+  }
+
+  @override
+  SurveyQuestionFormViewModelProvider getProviderOverride(
+    covariant SurveyQuestionFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.args,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'surveyQuestionFormViewModelProvider';
+}
+
+/// See also [surveyQuestionFormViewModel].
+class SurveyQuestionFormViewModelProvider
+    extends AutoDisposeProvider<QuestionFormViewModel> {
+  /// See also [surveyQuestionFormViewModel].
+  SurveyQuestionFormViewModelProvider(
+    SurveyQuestionFormRouteArgs args,
+  ) : this._internal(
+          (ref) => surveyQuestionFormViewModel(
+            ref as SurveyQuestionFormViewModelRef,
+            args,
+          ),
+          from: surveyQuestionFormViewModelProvider,
+          name: r'surveyQuestionFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$surveyQuestionFormViewModelHash,
+          dependencies: SurveyQuestionFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              SurveyQuestionFormViewModelFamily._allTransitiveDependencies,
+          args: args,
+        );
+
+  SurveyQuestionFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.args,
+  }) : super.internal();
+
+  final SurveyQuestionFormRouteArgs args;
+
+  @override
+  Override overrideWith(
+    QuestionFormViewModel Function(SurveyQuestionFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: SurveyQuestionFormViewModelProvider._internal(
+        (ref) => create(ref as SurveyQuestionFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        args: args,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<QuestionFormViewModel> createElement() {
+    return _SurveyQuestionFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is SurveyQuestionFormViewModelProvider && other.args == args;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, args.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin SurveyQuestionFormViewModelRef
+    on AutoDisposeProviderRef<QuestionFormViewModel> {
+  /// The parameter `args` of this provider.
+  SurveyQuestionFormRouteArgs get args;
+}
+
+class _SurveyQuestionFormViewModelProviderElement
+    extends AutoDisposeProviderElement<QuestionFormViewModel>
+    with SurveyQuestionFormViewModelRef {
+  _SurveyQuestionFormViewModelProviderElement(super.provider);
+
+  @override
+  SurveyQuestionFormRouteArgs get args =>
+      (origin as SurveyQuestionFormViewModelProvider).args;
+}
+
+String _$reportsFormViewModelHash() =>
+    r'6deed30173a2c97c7a9096cce168b7bb5890b933';
+
+/// See also [reportsFormViewModel].
+@ProviderFor(reportsFormViewModel)
+const reportsFormViewModelProvider = ReportsFormViewModelFamily();
+
+/// See also [reportsFormViewModel].
+class ReportsFormViewModelFamily extends Family<ReportsFormViewModel> {
+  /// See also [reportsFormViewModel].
+  const ReportsFormViewModelFamily();
+
+  /// See also [reportsFormViewModel].
+  ReportsFormViewModelProvider call(
+    String studyId,
+  ) {
+    return ReportsFormViewModelProvider(
+      studyId,
+    );
+  }
+
+  @override
+  ReportsFormViewModelProvider getProviderOverride(
+    covariant ReportsFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'reportsFormViewModelProvider';
+}
+
+/// See also [reportsFormViewModel].
+class ReportsFormViewModelProvider
+    extends AutoDisposeProvider<ReportsFormViewModel> {
+  /// See also [reportsFormViewModel].
+  ReportsFormViewModelProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => reportsFormViewModel(
+            ref as ReportsFormViewModelRef,
+            studyId,
+          ),
+          from: reportsFormViewModelProvider,
+          name: r'reportsFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$reportsFormViewModelHash,
+          dependencies: ReportsFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              ReportsFormViewModelFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  ReportsFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    ReportsFormViewModel Function(ReportsFormViewModelRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: ReportsFormViewModelProvider._internal(
+        (ref) => create(ref as ReportsFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<ReportsFormViewModel> createElement() {
+    return _ReportsFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is ReportsFormViewModelProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin ReportsFormViewModelRef on AutoDisposeProviderRef<ReportsFormViewModel> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _ReportsFormViewModelProviderElement
+    extends AutoDisposeProviderElement<ReportsFormViewModel>
+    with ReportsFormViewModelRef {
+  _ReportsFormViewModelProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as ReportsFormViewModelProvider).studyId;
+}
+
+String _$reportItemFormViewModelHash() =>
+    r'c2244f6b47445b8c54b061be046e6dd472e1afd6';
+
+/// See also [reportItemFormViewModel].
+@ProviderFor(reportItemFormViewModel)
+const reportItemFormViewModelProvider = ReportItemFormViewModelFamily();
+
+/// See also [reportItemFormViewModel].
+class ReportItemFormViewModelFamily extends Family<ReportItemFormViewModel> {
+  /// See also [reportItemFormViewModel].
+  const ReportItemFormViewModelFamily();
+
+  /// See also [reportItemFormViewModel].
+  ReportItemFormViewModelProvider call(
+    ReportItemFormRouteArgs args,
+  ) {
+    return ReportItemFormViewModelProvider(
+      args,
+    );
+  }
+
+  @override
+  ReportItemFormViewModelProvider getProviderOverride(
+    covariant ReportItemFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.args,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'reportItemFormViewModelProvider';
+}
+
+/// See also [reportItemFormViewModel].
+class ReportItemFormViewModelProvider
+    extends AutoDisposeProvider<ReportItemFormViewModel> {
+  /// See also [reportItemFormViewModel].
+  ReportItemFormViewModelProvider(
+    ReportItemFormRouteArgs args,
+  ) : this._internal(
+          (ref) => reportItemFormViewModel(
+            ref as ReportItemFormViewModelRef,
+            args,
+          ),
+          from: reportItemFormViewModelProvider,
+          name: r'reportItemFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$reportItemFormViewModelHash,
+          dependencies: ReportItemFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              ReportItemFormViewModelFamily._allTransitiveDependencies,
+          args: args,
+        );
+
+  ReportItemFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.args,
+  }) : super.internal();
+
+  final ReportItemFormRouteArgs args;
+
+  @override
+  Override overrideWith(
+    ReportItemFormViewModel Function(ReportItemFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: ReportItemFormViewModelProvider._internal(
+        (ref) => create(ref as ReportItemFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        args: args,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<ReportItemFormViewModel> createElement() {
+    return _ReportItemFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is ReportItemFormViewModelProvider && other.args == args;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, args.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin ReportItemFormViewModelRef
+    on AutoDisposeProviderRef<ReportItemFormViewModel> {
+  /// The parameter `args` of this provider.
+  ReportItemFormRouteArgs get args;
+}
+
+class _ReportItemFormViewModelProviderElement
+    extends AutoDisposeProviderElement<ReportItemFormViewModel>
+    with ReportItemFormViewModelRef {
+  _ReportItemFormViewModelProviderElement(super.provider);
+
+  @override
+  ReportItemFormRouteArgs get args =>
+      (origin as ReportItemFormViewModelProvider).args;
+}
+
+String _$studyPublishValidatorHash() =>
+    r'7052ac418dfb864a61546db1c713351194f2a684';
+
+/// Provides the [StudyFormViewModel] for validation purposes with
+/// a [StudyFormValidationSet.publish]
+///
+/// Copied from [studyPublishValidator].
+@ProviderFor(studyPublishValidator)
+const studyPublishValidatorProvider = StudyPublishValidatorFamily();
+
+/// Provides the [StudyFormViewModel] for validation purposes with
+/// a [StudyFormValidationSet.publish]
+///
+/// Copied from [studyPublishValidator].
+class StudyPublishValidatorFamily extends Family<StudyFormViewModel> {
+  /// Provides the [StudyFormViewModel] for validation purposes with
+  /// a [StudyFormValidationSet.publish]
+  ///
+  /// Copied from [studyPublishValidator].
+  const StudyPublishValidatorFamily();
+
+  /// Provides the [StudyFormViewModel] for validation purposes with
+  /// a [StudyFormValidationSet.publish]
+  ///
+  /// Copied from [studyPublishValidator].
+  StudyPublishValidatorProvider call(
+    String studyId,
+  ) {
+    return StudyPublishValidatorProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyPublishValidatorProvider getProviderOverride(
+    covariant StudyPublishValidatorProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyPublishValidatorProvider';
+}
+
+/// Provides the [StudyFormViewModel] for validation purposes with
+/// a [StudyFormValidationSet.publish]
+///
+/// Copied from [studyPublishValidator].
+class StudyPublishValidatorProvider
+    extends AutoDisposeProvider<StudyFormViewModel> {
+  /// Provides the [StudyFormViewModel] for validation purposes with
+  /// a [StudyFormValidationSet.publish]
+  ///
+  /// Copied from [studyPublishValidator].
+  StudyPublishValidatorProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => studyPublishValidator(
+            ref as StudyPublishValidatorRef,
+            studyId,
+          ),
+          from: studyPublishValidatorProvider,
+          name: r'studyPublishValidatorProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyPublishValidatorHash,
+          dependencies: StudyPublishValidatorFamily._dependencies,
+          allTransitiveDependencies:
+              StudyPublishValidatorFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyPublishValidatorProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    StudyFormViewModel Function(StudyPublishValidatorRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyPublishValidatorProvider._internal(
+        (ref) => create(ref as StudyPublishValidatorRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<StudyFormViewModel> createElement() {
+    return _StudyPublishValidatorProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyPublishValidatorProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyPublishValidatorRef on AutoDisposeProviderRef<StudyFormViewModel> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyPublishValidatorProviderElement
+    extends AutoDisposeProviderElement<StudyFormViewModel>
+    with StudyPublishValidatorRef {
+  _StudyPublishValidatorProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyPublishValidatorProvider).studyId;
+}
+
+String _$studyTestValidatorHash() =>
+    r'207988e121f40ffd2b4b055283baaf78c7a07d2d';
+
+/// Provides the [StudyFormViewModel] for validation purposes with
+/// a [StudyFormValidationSet.test]
+///
+/// Copied from [studyTestValidator].
+@ProviderFor(studyTestValidator)
+const studyTestValidatorProvider = StudyTestValidatorFamily();
+
+/// Provides the [StudyFormViewModel] for validation purposes with
+/// a [StudyFormValidationSet.test]
+///
+/// Copied from [studyTestValidator].
+class StudyTestValidatorFamily extends Family<StudyFormViewModel> {
+  /// Provides the [StudyFormViewModel] for validation purposes with
+  /// a [StudyFormValidationSet.test]
+  ///
+  /// Copied from [studyTestValidator].
+  const StudyTestValidatorFamily();
+
+  /// Provides the [StudyFormViewModel] for validation purposes with
+  /// a [StudyFormValidationSet.test]
+  ///
+  /// Copied from [studyTestValidator].
+  StudyTestValidatorProvider call(
+    String studyId,
+  ) {
+    return StudyTestValidatorProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyTestValidatorProvider getProviderOverride(
+    covariant StudyTestValidatorProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyTestValidatorProvider';
+}
+
+/// Provides the [StudyFormViewModel] for validation purposes with
+/// a [StudyFormValidationSet.test]
+///
+/// Copied from [studyTestValidator].
+class StudyTestValidatorProvider
+    extends AutoDisposeProvider<StudyFormViewModel> {
+  /// Provides the [StudyFormViewModel] for validation purposes with
+  /// a [StudyFormValidationSet.test]
+  ///
+  /// Copied from [studyTestValidator].
+  StudyTestValidatorProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => studyTestValidator(
+            ref as StudyTestValidatorRef,
+            studyId,
+          ),
+          from: studyTestValidatorProvider,
+          name: r'studyTestValidatorProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyTestValidatorHash,
+          dependencies: StudyTestValidatorFamily._dependencies,
+          allTransitiveDependencies:
+              StudyTestValidatorFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyTestValidatorProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    StudyFormViewModel Function(StudyTestValidatorRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyTestValidatorProvider._internal(
+        (ref) => create(ref as StudyTestValidatorRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<StudyFormViewModel> createElement() {
+    return _StudyTestValidatorProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyTestValidatorProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyTestValidatorRef on AutoDisposeProviderRef<StudyFormViewModel> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyTestValidatorProviderElement
+    extends AutoDisposeProviderElement<StudyFormViewModel>
+    with StudyTestValidatorRef {
+  _StudyTestValidatorProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyTestValidatorProvider).studyId;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/recruit/invite_code_form_controller.dart b/designer_v2/lib/features/recruit/invite_code_form_controller.dart
index 34ac2d93f..ffb1b693f 100644
--- a/designer_v2/lib/features/recruit/invite_code_form_controller.dart
+++ b/designer_v2/lib/features/recruit/invite_code_form_controller.dart
@@ -1,5 +1,5 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:reactive_forms/reactive_forms.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
@@ -10,6 +10,8 @@ import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/repositories/invite_code_repository.dart';
 import 'package:uuid/uuid.dart';
 
+part 'invite_code_form_controller.g.dart';
+
 class InviteCodeFormViewModel extends FormViewModel<StudyInvite> {
   InviteCodeFormViewModel({required this.study, required this.inviteCodeRepository}) : super();
 
@@ -114,11 +116,12 @@ class InviteCodeFormViewModel extends FormViewModel<StudyInvite> {
   }
 }
 
-/// Use the [family] modifier to provide a controller parametrized by [StudyID]
+/// Provide a controller parametrized by [StudyID]
 ///
 /// Note: This is not safe to use in widgets (or other providers) that are built
 /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
-final inviteCodeFormViewModelProvider = Provider.autoDispose.family<InviteCodeFormViewModel, StudyID>((ref, studyId) {
+@riverpod
+InviteCodeFormViewModel inviteCodeFormViewModel(InviteCodeFormViewModelRef ref, StudyID studyId) {
   print("inviteCodeFormViewModelProvider($studyId");
   // Reactively bind to and obtain [StudyController]'s current study
   final study = ref.watch(studyControllerProvider(studyId).select((state) => state.study));
@@ -128,4 +131,4 @@ final inviteCodeFormViewModelProvider = Provider.autoDispose.family<InviteCodeFo
     study: study.value!,
     inviteCodeRepository: inviteCodeRepository,
   );
-});
+}
diff --git a/designer_v2/lib/features/recruit/invite_code_form_controller.g.dart b/designer_v2/lib/features/recruit/invite_code_form_controller.g.dart
new file mode 100644
index 000000000..c11202adf
--- /dev/null
+++ b/designer_v2/lib/features/recruit/invite_code_form_controller.g.dart
@@ -0,0 +1,193 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'invite_code_form_controller.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$inviteCodeFormViewModelHash() =>
+    r'e3de1f19dc318e720664ee06c884a2d193b4c688';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+/// Provide a controller parametrized by [StudyID]
+///
+/// Note: This is not safe to use in widgets (or other providers) that are built
+/// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+///
+/// Copied from [inviteCodeFormViewModel].
+@ProviderFor(inviteCodeFormViewModel)
+const inviteCodeFormViewModelProvider = InviteCodeFormViewModelFamily();
+
+/// Provide a controller parametrized by [StudyID]
+///
+/// Note: This is not safe to use in widgets (or other providers) that are built
+/// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+///
+/// Copied from [inviteCodeFormViewModel].
+class InviteCodeFormViewModelFamily extends Family<InviteCodeFormViewModel> {
+  /// Provide a controller parametrized by [StudyID]
+  ///
+  /// Note: This is not safe to use in widgets (or other providers) that are built
+  /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+  ///
+  /// Copied from [inviteCodeFormViewModel].
+  const InviteCodeFormViewModelFamily();
+
+  /// Provide a controller parametrized by [StudyID]
+  ///
+  /// Note: This is not safe to use in widgets (or other providers) that are built
+  /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+  ///
+  /// Copied from [inviteCodeFormViewModel].
+  InviteCodeFormViewModelProvider call(
+    String studyId,
+  ) {
+    return InviteCodeFormViewModelProvider(
+      studyId,
+    );
+  }
+
+  @override
+  InviteCodeFormViewModelProvider getProviderOverride(
+    covariant InviteCodeFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'inviteCodeFormViewModelProvider';
+}
+
+/// Provide a controller parametrized by [StudyID]
+///
+/// Note: This is not safe to use in widgets (or other providers) that are built
+/// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+///
+/// Copied from [inviteCodeFormViewModel].
+class InviteCodeFormViewModelProvider
+    extends AutoDisposeProvider<InviteCodeFormViewModel> {
+  /// Provide a controller parametrized by [StudyID]
+  ///
+  /// Note: This is not safe to use in widgets (or other providers) that are built
+  /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+  ///
+  /// Copied from [inviteCodeFormViewModel].
+  InviteCodeFormViewModelProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => inviteCodeFormViewModel(
+            ref as InviteCodeFormViewModelRef,
+            studyId,
+          ),
+          from: inviteCodeFormViewModelProvider,
+          name: r'inviteCodeFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$inviteCodeFormViewModelHash,
+          dependencies: InviteCodeFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              InviteCodeFormViewModelFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  InviteCodeFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    InviteCodeFormViewModel Function(InviteCodeFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: InviteCodeFormViewModelProvider._internal(
+        (ref) => create(ref as InviteCodeFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<InviteCodeFormViewModel> createElement() {
+    return _InviteCodeFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is InviteCodeFormViewModelProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin InviteCodeFormViewModelRef
+    on AutoDisposeProviderRef<InviteCodeFormViewModel> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _InviteCodeFormViewModelProviderElement
+    extends AutoDisposeProviderElement<InviteCodeFormViewModel>
+    with InviteCodeFormViewModelRef {
+  _InviteCodeFormViewModelProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as InviteCodeFormViewModelProvider).studyId;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/recruit/study_recruit_controller.dart b/designer_v2/lib/features/recruit/study_recruit_controller.dart
index 909024b0a..154f46bb4 100644
--- a/designer_v2/lib/features/recruit/study_recruit_controller.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_controller.dart
@@ -79,7 +79,7 @@ class StudyRecruitController extends StudyBaseController<StudyRecruitControllerS
   }
 }
 
-/// Use the [family] modifier to provide a controller parametrized by [StudyID]
+/// Provide a controller parametrized by [StudyID]
 final studyRecruitControllerProvider = StateNotifierProvider.autoDispose
     .family<StudyRecruitController, StudyRecruitControllerState, StudyID>((ref, studyId) {
   return StudyRecruitController(
diff --git a/designer_v2/lib/features/study/study_controller.dart b/designer_v2/lib/features/study/study_controller.dart
index 2edbd13dd..da398c3db 100644
--- a/designer_v2/lib/features/study/study_controller.dart
+++ b/designer_v2/lib/features/study/study_controller.dart
@@ -34,7 +34,7 @@ class StudyController extends StudyBaseController<StudyControllerState> {
     if (studyEventsSubscription != null) {
       studyEventsSubscription?.cancel();
     }
-    studyEventsSubscription = studyRepository.watchChanges(studyId).listen((event) {
+    studyEventsSubscription = this.studyRepository.watchChanges(studyId).listen((event) {
       if (event is IsSaving) {
         state = state.copyWith(
           syncState: const AsyncValue.loading(),
@@ -61,7 +61,7 @@ class StudyController extends StudyBaseController<StudyControllerState> {
   /// when building subroutes
   _redirectNewToActualStudyID(StudyID actualStudyId) {
     if (studyId == Config.newModelId) {
-      router.dispatch(RoutingIntents.study(actualStudyId));
+      this.router.dispatch(RoutingIntents.study(actualStudyId));
     }
   }
 
@@ -72,26 +72,26 @@ class StudyController extends StudyBaseController<StudyControllerState> {
     }
     // filter out edit action since we are already editing the study
     return withIcons(
-        studyRepository.availableActions(study).where((action) => action.type != StudyActionType.edit).toList(),
+        this.studyRepository.availableActions(study).where((action) => action.type != StudyActionType.edit).toList(),
         studyActionIcons);
   }
 
   Future publishStudy({toRegistry = false}) {
     final study = state.study.value!;
     study.registryPublished = toRegistry;
-    return studyRepository.launch(study);
+    return this.studyRepository.launch(study);
   }
 
   void onChangeStudyParticipation() {
-    router.dispatch(RoutingIntents.studyEditEnrollment(studyId));
+    this.router.dispatch(RoutingIntents.studyEditEnrollment(studyId));
   }
 
   void onAddParticipants() {
-    router.dispatch(RoutingIntents.studyRecruit(studyId));
+    this.router.dispatch(RoutingIntents.studyRecruit(studyId));
   }
 
   void onSettingsPressed() {
-    router.dispatch(RoutingIntents.studySettings(studyId));
+    this.router.dispatch(RoutingIntents.studySettings(studyId));
   }
 
   @override
diff --git a/designer_v2/lib/features/study/study_test_controller.dart b/designer_v2/lib/features/study/study_test_controller.dart
index 71d1cb81b..e6c1cd400 100644
--- a/designer_v2/lib/features/study/study_test_controller.dart
+++ b/designer_v2/lib/features/study/study_test_controller.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/features/study/study_base_controller.dart';
 import 'package:studyu_designer_v2/features/study/study_test_controller_state.dart';
@@ -10,6 +11,8 @@ import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
 
+part 'study_test_controller.g.dart';
+
 class StudyTestController extends StudyBaseController<StudyTestControllerState> {
   StudyTestController({
     required super.studyId,
@@ -53,9 +56,9 @@ final studyTestControllerProvider =
   return controller;
 });
 
-final studyTestPlatformControllerProvider = Provider.family<PlatformController, StudyID>((ref, studyId) {
+@riverpod
+PlatformController studyTestPlatformController(StudyTestPlatformControllerRef ref, StudyID studyId) {
   final state = ref.watch(studyTestControllerProvider(studyId));
-
   PlatformController platformController;
   if (!kIsWeb) {
     // Mobile could be built with the webview_flutter package
@@ -64,6 +67,5 @@ final studyTestPlatformControllerProvider = Provider.family<PlatformController,
     // Desktop and Web
     platformController = WebController(state.appUrl, studyId);
   }
-
   return platformController;
-});
+}
diff --git a/designer_v2/lib/features/study/study_test_controller.g.dart b/designer_v2/lib/features/study/study_test_controller.g.dart
new file mode 100644
index 000000000..44a3a547c
--- /dev/null
+++ b/designer_v2/lib/features/study/study_test_controller.g.dart
@@ -0,0 +1,163 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'study_test_controller.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$studyTestPlatformControllerHash() =>
+    r'c09a0c6ecb0040703fa5fe35c927aa40c6a47a84';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+/// See also [studyTestPlatformController].
+@ProviderFor(studyTestPlatformController)
+const studyTestPlatformControllerProvider = StudyTestPlatformControllerFamily();
+
+/// See also [studyTestPlatformController].
+class StudyTestPlatformControllerFamily extends Family<PlatformController> {
+  /// See also [studyTestPlatformController].
+  const StudyTestPlatformControllerFamily();
+
+  /// See also [studyTestPlatformController].
+  StudyTestPlatformControllerProvider call(
+    String studyId,
+  ) {
+    return StudyTestPlatformControllerProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyTestPlatformControllerProvider getProviderOverride(
+    covariant StudyTestPlatformControllerProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyTestPlatformControllerProvider';
+}
+
+/// See also [studyTestPlatformController].
+class StudyTestPlatformControllerProvider
+    extends AutoDisposeProvider<PlatformController> {
+  /// See also [studyTestPlatformController].
+  StudyTestPlatformControllerProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => studyTestPlatformController(
+            ref as StudyTestPlatformControllerRef,
+            studyId,
+          ),
+          from: studyTestPlatformControllerProvider,
+          name: r'studyTestPlatformControllerProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyTestPlatformControllerHash,
+          dependencies: StudyTestPlatformControllerFamily._dependencies,
+          allTransitiveDependencies:
+              StudyTestPlatformControllerFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyTestPlatformControllerProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    PlatformController Function(StudyTestPlatformControllerRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyTestPlatformControllerProvider._internal(
+        (ref) => create(ref as StudyTestPlatformControllerRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<PlatformController> createElement() {
+    return _StudyTestPlatformControllerProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyTestPlatformControllerProvider &&
+        other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyTestPlatformControllerRef
+    on AutoDisposeProviderRef<PlatformController> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyTestPlatformControllerProviderElement
+    extends AutoDisposeProviderElement<PlatformController>
+    with StudyTestPlatformControllerRef {
+  _StudyTestPlatformControllerProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyTestPlatformControllerProvider).studyId;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/localization/language_picker.dart b/designer_v2/lib/localization/language_picker.dart
index a4db6910f..febc58ac9 100644
--- a/designer_v2/lib/localization/language_picker.dart
+++ b/designer_v2/lib/localization/language_picker.dart
@@ -7,6 +7,8 @@ import 'package:studyu_designer_v2/localization/locale_providers.dart';
 import 'package:studyu_designer_v2/localization/locale_translate_name.dart';
 import 'package:studyu_designer_v2/utils/font.dart';
 
+import 'locale_state.dart';
+
 enum LanguagePickerType { field, icon }
 
 class LanguagePicker extends ConsumerStatefulWidget {
@@ -28,7 +30,7 @@ class LanguagePicker extends ConsumerStatefulWidget {
 class _LanguagePickerState extends ConsumerState<LanguagePicker> {
   @override
   Widget build(BuildContext context) {
-    final controller = ref.watch(localeStateProvider.notifier);
+    final controller = ref.watch(localeStateNotifierProvider.notifier);
     final currentLocalization = ref.watch(localeProvider.select((value) => value));
     switch (widget.languagePickerType) {
       case LanguagePickerType.field:
diff --git a/designer_v2/lib/localization/locale_providers.dart b/designer_v2/lib/localization/locale_providers.dart
index 0810d079d..075e89dd3 100644
--- a/designer_v2/lib/localization/locale_providers.dart
+++ b/designer_v2/lib/localization/locale_providers.dart
@@ -1,29 +1,30 @@
 import 'dart:ui';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/localization/platform_locale/platform_locale_interface.dart';
 
 import 'locale_state.dart';
 
+part 'locale_providers.g.dart';
+
 /// Platform Locale Provider
 /// Returns the locale of the Platform.localeName
-final platformLocaleProvider = Provider<Locale>((_) {
+@riverpod
+Locale platformLocale(PlatformLocaleRef ref) {
   // Get the platform language using platform specific implementations
-  Locale platformLocale = PlatformLocale().getPlatformLocale();
-
-  return platformLocale;
-});
+  return PlatformLocale().getPlatformLocale();
+}
 
 /// Supported Locales Provider
-final supportedLocalesProvider = Provider<List<Locale>>((_) {
+@riverpod
+List<Locale> supportedLocales(SupportedLocalesRef ref) {
   return Config.supportedLocales.entries.map((e) => Locale(e.key, e.value)).toList();
-});
+}
 
 /// Locale Provider
 /// Provides the current locale, and automatically updates when the locale changes.
-final localeProvider = Provider<Locale>((ref) {
-  return ref.watch(localeStateProvider).locale;
-});
-
-final localeStateProvider = StateNotifierProvider<LocaleStateNotifier, LocaleState>((ref) => LocaleStateNotifier(ref));
+@riverpod
+Locale locale(LocaleRef ref) {
+  return ref.watch(localeStateNotifierProvider).locale;
+}
diff --git a/designer_v2/lib/localization/locale_providers.g.dart b/designer_v2/lib/localization/locale_providers.g.dart
new file mode 100644
index 000000000..0f71478e2
--- /dev/null
+++ b/designer_v2/lib/localization/locale_providers.g.dart
@@ -0,0 +1,62 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'locale_providers.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$platformLocaleHash() => r'a84e9e99af5cc228a9c3804c7b4b834044dff6d1';
+
+/// Platform Locale Provider
+/// Returns the locale of the Platform.localeName
+///
+/// Copied from [platformLocale].
+@ProviderFor(platformLocale)
+final platformLocaleProvider = AutoDisposeProvider<Locale>.internal(
+  platformLocale,
+  name: r'platformLocaleProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$platformLocaleHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef PlatformLocaleRef = AutoDisposeProviderRef<Locale>;
+String _$supportedLocalesHash() => r'5668fd6c2cb7ae6ce48a909d39d947d6ee61236a';
+
+/// Supported Locales Provider
+///
+/// Copied from [supportedLocales].
+@ProviderFor(supportedLocales)
+final supportedLocalesProvider = AutoDisposeProvider<List<Locale>>.internal(
+  supportedLocales,
+  name: r'supportedLocalesProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$supportedLocalesHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef SupportedLocalesRef = AutoDisposeProviderRef<List<Locale>>;
+String _$localeHash() => r'575c8d69cac8ac079fbb4a4d4b2307512dcfc728';
+
+/// Locale Provider
+/// Provides the current locale, and automatically updates when the locale changes.
+///
+/// Copied from [locale].
+@ProviderFor(locale)
+final localeProvider = AutoDisposeProvider<Locale>.internal(
+  locale,
+  name: r'localeProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product') ? null : _$localeHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef LocaleRef = AutoDisposeProviderRef<Locale>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/localization/locale_state.dart b/designer_v2/lib/localization/locale_state.dart
index 6bbc561d1..01d1d814f 100644
--- a/designer_v2/lib/localization/locale_state.dart
+++ b/designer_v2/lib/localization/locale_state.dart
@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_flutter_common/studyu_flutter_common.dart';
 
 import 'locale_providers.dart';
 
+part 'locale_state.g.dart';
+
 Locale fallbackLocale = Locale(Config.defaultLocale.first, Config.defaultLocale.last);
 
 @immutable
@@ -18,11 +20,17 @@ class LocaleState {
   }
 }
 
-class LocaleStateNotifier extends StateNotifier<LocaleState> {
-  final Ref ref;
+@riverpod
+class LocaleStateNotifier extends _$LocaleStateNotifier {
+
+  @override
+  LocaleState build() {
+    return LocaleState(fallbackLocale);
+  }
+
   static const _localStorageKey = 'lang';
 
-  LocaleStateNotifier(this.ref) : super(LocaleState(fallbackLocale));
+  //LocaleStateNotifier(this.ref) : super(LocaleState(fallbackLocale));
 
   /// Initialize Locale
   /// Can be run at startup to establish the initial local from storage, or the platform
diff --git a/designer_v2/lib/localization/locale_state.g.dart b/designer_v2/lib/localization/locale_state.g.dart
new file mode 100644
index 000000000..b6b7db0f2
--- /dev/null
+++ b/designer_v2/lib/localization/locale_state.g.dart
@@ -0,0 +1,27 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'locale_state.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$localeStateNotifierHash() =>
+    r'726764926faff3bc76af0f45fdd750e75014291f';
+
+/// See also [LocaleStateNotifier].
+@ProviderFor(LocaleStateNotifier)
+final localeStateNotifierProvider =
+    AutoDisposeNotifierProvider<LocaleStateNotifier, LocaleState>.internal(
+  LocaleStateNotifier.new,
+  name: r'localeStateNotifierProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$localeStateNotifierHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef _$LocaleStateNotifier = AutoDisposeNotifier<LocaleState>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/repositories/api_client.dart b/designer_v2/lib/repositories/api_client.dart
index 5f82534c8..d0c5ea226 100644
--- a/designer_v2/lib/repositories/api_client.dart
+++ b/designer_v2/lib/repositories/api_client.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/domain/study_subject.dart';
@@ -8,6 +8,8 @@ import 'package:studyu_designer_v2/repositories/supabase_client.dart';
 import 'package:studyu_designer_v2/utils/debug_print.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 
+part 'api_client.g.dart';
+
 abstract class StudyUApi {
   Future<Study> saveStudy(Study study);
   Future<Study> fetchStudy(StudyID studyId);
@@ -232,6 +234,7 @@ class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin im
   }
 }
 
-final apiClientProvider = riverpod.Provider<StudyUApi>((ref) => StudyUApiClient(
+@riverpod
+StudyUApiClient apiClient(ApiClientRef ref) => StudyUApiClient(
       supabaseClient: ref.watch(supabaseClientProvider),
-    ));
+    );
\ No newline at end of file
diff --git a/designer_v2/lib/repositories/api_client.g.dart b/designer_v2/lib/repositories/api_client.g.dart
new file mode 100644
index 000000000..0a41b7cd2
--- /dev/null
+++ b/designer_v2/lib/repositories/api_client.g.dart
@@ -0,0 +1,24 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'api_client.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$apiClientHash() => r'826df747926efc2d5519c65db1adbb05fff488f4';
+
+/// See also [apiClient].
+@ProviderFor(apiClient)
+final apiClientProvider = AutoDisposeProvider<StudyUApiClient>.internal(
+  apiClient,
+  name: r'apiClientProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product') ? null : _$apiClientHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef ApiClientRef = AutoDisposeProviderRef<StudyUApiClient>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/repositories/auth_repository.dart b/designer_v2/lib/repositories/auth_repository.dart
index c1ea03484..097ac003d 100644
--- a/designer_v2/lib/repositories/auth_repository.dart
+++ b/designer_v2/lib/repositories/auth_repository.dart
@@ -1,13 +1,15 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:rxdart/subjects.dart';
 import 'package:studyu_designer_v2/features/app_controller.dart';
 import 'package:studyu_designer_v2/repositories/supabase_client.dart';
 import 'package:studyu_designer_v2/utils/behaviour_subject.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 
+part 'auth_repository.g.dart';
+
 abstract class IAuthRepository extends IAppDelegate {
   // - Authentication
   User? get currentUser;
@@ -150,13 +152,10 @@ class AuthRepository implements IAuthRepository {
   }
 }
 
-final authRepositoryProvider = riverpod.Provider<IAuthRepository>((ref) {
+@riverpod
+AuthRepository authRepository(AuthRepositoryRef ref) {
   final authRepository = AuthRepository(
     supabaseClient: ref.watch(supabaseClientProvider),
   );
-  // Bind lifecycle to Riverpod
-  ref.onDispose(() {
-    authRepository.dispose();
-  });
   return authRepository;
-});
+}
\ No newline at end of file
diff --git a/designer_v2/lib/repositories/auth_repository.g.dart b/designer_v2/lib/repositories/auth_repository.g.dart
new file mode 100644
index 000000000..05d71f114
--- /dev/null
+++ b/designer_v2/lib/repositories/auth_repository.g.dart
@@ -0,0 +1,25 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'auth_repository.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$authRepositoryHash() => r'8f0a9fc8fb1b812cbea5c198a61e7ed065b36f42';
+
+/// See also [authRepository].
+@ProviderFor(authRepository)
+final authRepositoryProvider = AutoDisposeProvider<AuthRepository>.internal(
+  authRepository,
+  name: r'authRepositoryProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$authRepositoryHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef AuthRepositoryRef = AutoDisposeProviderRef<AuthRepository>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/repositories/invite_code_repository.dart b/designer_v2/lib/repositories/invite_code_repository.dart
index 6dcbd77e4..48e846544 100644
--- a/designer_v2/lib/repositories/invite_code_repository.dart
+++ b/designer_v2/lib/repositories/invite_code_repository.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/repositories/api_client.dart';
@@ -13,6 +13,8 @@ import 'package:studyu_designer_v2/services/notifications.dart';
 import 'package:studyu_designer_v2/utils/model_action.dart';
 import 'package:studyu_designer_v2/utils/optimistic_update.dart';
 
+part 'invite_code_repository.g.dart';
+
 abstract class IInviteCodeRepository implements ModelRepository<StudyInvite> {
   Future<bool> isCodeAlreadyUsed(String code);
 }
@@ -186,7 +188,8 @@ class InviteCodeRepositoryDelegate extends IModelRepositoryDelegate<StudyInvite>
   }
 }
 
-final inviteCodeRepositoryProvider = Provider.autoDispose.family<IInviteCodeRepository, StudyID>((ref, studyId) {
+@riverpod
+InviteCodeRepository inviteCodeRepository(InviteCodeRepositoryRef ref, StudyID studyId) {
   print("inviteCodeRepositoryProvider($studyId");
   // Initialize repository for a given study
   final repository = InviteCodeRepository(
@@ -202,4 +205,4 @@ final inviteCodeRepositoryProvider = Provider.autoDispose.family<IInviteCodeRepo
     repository.dispose();
   });
   return repository;
-});
+}
diff --git a/designer_v2/lib/repositories/invite_code_repository.g.dart b/designer_v2/lib/repositories/invite_code_repository.g.dart
new file mode 100644
index 000000000..f83a84c4b
--- /dev/null
+++ b/designer_v2/lib/repositories/invite_code_repository.g.dart
@@ -0,0 +1,161 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'invite_code_repository.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$inviteCodeRepositoryHash() =>
+    r'6e64d53ba64268495919cd6dc28d55ee5fa1e5e8';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+/// See also [inviteCodeRepository].
+@ProviderFor(inviteCodeRepository)
+const inviteCodeRepositoryProvider = InviteCodeRepositoryFamily();
+
+/// See also [inviteCodeRepository].
+class InviteCodeRepositoryFamily extends Family<InviteCodeRepository> {
+  /// See also [inviteCodeRepository].
+  const InviteCodeRepositoryFamily();
+
+  /// See also [inviteCodeRepository].
+  InviteCodeRepositoryProvider call(
+    String studyId,
+  ) {
+    return InviteCodeRepositoryProvider(
+      studyId,
+    );
+  }
+
+  @override
+  InviteCodeRepositoryProvider getProviderOverride(
+    covariant InviteCodeRepositoryProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'inviteCodeRepositoryProvider';
+}
+
+/// See also [inviteCodeRepository].
+class InviteCodeRepositoryProvider
+    extends AutoDisposeProvider<InviteCodeRepository> {
+  /// See also [inviteCodeRepository].
+  InviteCodeRepositoryProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => inviteCodeRepository(
+            ref as InviteCodeRepositoryRef,
+            studyId,
+          ),
+          from: inviteCodeRepositoryProvider,
+          name: r'inviteCodeRepositoryProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$inviteCodeRepositoryHash,
+          dependencies: InviteCodeRepositoryFamily._dependencies,
+          allTransitiveDependencies:
+              InviteCodeRepositoryFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  InviteCodeRepositoryProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    InviteCodeRepository Function(InviteCodeRepositoryRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: InviteCodeRepositoryProvider._internal(
+        (ref) => create(ref as InviteCodeRepositoryRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<InviteCodeRepository> createElement() {
+    return _InviteCodeRepositoryProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is InviteCodeRepositoryProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin InviteCodeRepositoryRef on AutoDisposeProviderRef<InviteCodeRepository> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _InviteCodeRepositoryProviderElement
+    extends AutoDisposeProviderElement<InviteCodeRepository>
+    with InviteCodeRepositoryRef {
+  _InviteCodeRepositoryProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as InviteCodeRepositoryProvider).studyId;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/repositories/study_repository.dart b/designer_v2/lib/repositories/study_repository.dart
index c02dbbb9f..cad5ee7ac 100644
--- a/designer_v2/lib/repositories/study_repository.dart
+++ b/designer_v2/lib/repositories/study_repository.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/domain/study_export.dart';
@@ -17,6 +17,8 @@ import 'package:studyu_designer_v2/utils/model_action.dart';
 import 'package:studyu_designer_v2/utils/optimistic_update.dart';
 import 'package:studyu_designer_v2/utils/performance.dart';
 
+part 'study_repository.g.dart';
+
 abstract class IStudyRepository implements ModelRepository<Study> {
   Future<void> launch(Study study);
   Future<void> deleteParticipants(Study study);
@@ -216,15 +218,9 @@ class StudyRepositoryDelegate extends IModelRepositoryDelegate<Study> {
   }
 }
 
-final studyRepositoryProvider = Provider<IStudyRepository>((ref) {
-  final studyRepository = StudyRepository(
+@riverpod
+StudyRepository studyRepository(StudyRepositoryRef ref) => StudyRepository(
     apiClient: ref.watch(apiClientProvider),
     authRepository: ref.watch(authRepositoryProvider),
     ref: ref,
   );
-  // Bind lifecycle to Riverpod
-  ref.onDispose(() {
-    studyRepository.dispose();
-  });
-  return studyRepository;
-});
diff --git a/designer_v2/lib/repositories/study_repository.g.dart b/designer_v2/lib/repositories/study_repository.g.dart
new file mode 100644
index 000000000..9e1018ec1
--- /dev/null
+++ b/designer_v2/lib/repositories/study_repository.g.dart
@@ -0,0 +1,25 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'study_repository.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$studyRepositoryHash() => r'c6acca4aa7223abf7fff39706672197beb800d62';
+
+/// See also [studyRepository].
+@ProviderFor(studyRepository)
+final studyRepositoryProvider = AutoDisposeProvider<StudyRepository>.internal(
+  studyRepository,
+  name: r'studyRepositoryProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$studyRepositoryHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef StudyRepositoryRef = AutoDisposeProviderRef<StudyRepository>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/repositories/supabase_client.dart b/designer_v2/lib/repositories/supabase_client.dart
index 1d92f8e10..f08030498 100644
--- a/designer_v2/lib/repositories/supabase_client.dart
+++ b/designer_v2/lib/repositories/supabase_client.dart
@@ -1,7 +1,9 @@
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_core/env.dart' as env;
 import 'package:supabase_flutter/supabase_flutter.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
+
+part 'supabase_client.g.dart';
 
 // TODO: Transfer networking code to core package (+ update app if needed)
 
@@ -33,7 +35,7 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
 
   Future<List<T>> deleteAll<T extends SupabaseObject>(Map<String, dynamic> selectionCriteria) async {
     try {
-      final data = await supabaseClient.from(tableName(T)).delete().match(selectionCriteria);
+      final data = await this.supabaseClient.from(tableName(T)).delete().match(selectionCriteria);
       if (data == null) return [];
       return deserializeList<T>(data);
     } on PostgrestException catch (error) {
@@ -43,7 +45,7 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
 
   Future<List<T>> getAll<T extends SupabaseObject>({List<String> selectedColumns = const ['*']}) async {
     try {
-      final data = await supabaseClient.from(tableName(T)).select(selectedColumns.join(','));
+      final data = await this.supabaseClient.from(tableName(T)).select(selectedColumns.join(','));
       return deserializeList<T>(data);
     } on PostgrestException catch (error) {
       throw SupabaseQueryError(statusCode: error.code, message: error.message, details: error.details);
@@ -58,7 +60,7 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
       {List<String> selectedColumns = const ['*']}) async {
     try {
       final data =
-          await supabaseClient.from(tableName(T)).select(selectedColumns.join(',')).eq(colName, value).single();
+          await this.supabaseClient.from(tableName(T)).select(selectedColumns.join(',')).eq(colName, value).single();
       return deserializeObject<T>(data);
     } on PostgrestException catch (error) {
       throw SupabaseQueryError(statusCode: error.code, message: error.message, details: error.details);
@@ -78,4 +80,5 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
 }
 
 // Re-expose the global client object via Riverpod
-final supabaseClientProvider = riverpod.Provider<SupabaseClient>((ref) => env.client);
+@riverpod
+SupabaseClient supabaseClient(SupabaseClientRef ref) => env.client;
diff --git a/designer_v2/lib/repositories/supabase_client.g.dart b/designer_v2/lib/repositories/supabase_client.g.dart
new file mode 100644
index 000000000..c4f4bb378
--- /dev/null
+++ b/designer_v2/lib/repositories/supabase_client.g.dart
@@ -0,0 +1,25 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'supabase_client.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$supabaseClientHash() => r'a3bca1b178af5002bfaaa08960ce5520580da5c9';
+
+/// See also [supabaseClient].
+@ProviderFor(supabaseClient)
+final supabaseClientProvider = AutoDisposeProvider<SupabaseClient>.internal(
+  supabaseClient,
+  name: r'supabaseClientProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$supabaseClientHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef SupabaseClientRef = AutoDisposeProviderRef<SupabaseClient>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/routing/router.dart b/designer_v2/lib/routing/router.dart
index 87be84e1b..0c3a77aea 100644
--- a/designer_v2/lib/routing/router.dart
+++ b/designer_v2/lib/routing/router.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/common_views/pages/error_page.dart';
 import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/features/app_controller.dart';
@@ -9,6 +9,7 @@ import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/utils/combined_stream_notifier.dart';
 
 import 'router_config.dart';
+part 'router.g.dart';
 
 /// How to create a new page & use it for navigation:
 ///
@@ -20,7 +21,8 @@ import 'router_config.dart';
 /// [RoutingIntent]s in router_intent.dart. These intents correspond to
 /// route changes in the app. See router_intent.dart for more details.
 
-final routerProvider = Provider<GoRouter>((ref) {
+@riverpod
+GoRouter router(RouterRef ref) {
   final authRepository = ref.watch(authRepositoryProvider);
   final appController = ref.read(appControllerProvider.notifier);
   const defaultLocation = studiesRouteName;
@@ -41,7 +43,7 @@ final routerProvider = Provider<GoRouter>((ref) {
     // Read most recent app state on re-evaluation (see refreshListenable)
     final isLoggedIn = authRepository.isLoggedIn;
     var allowPasswordReset = authRepository.allowPasswordReset;
-    final isInitialized = appController.isInitialized;
+    final isInitialized = ref.watch(appControllerProvider).isInitialized;
 
     // Carry original location through the redirect flow so that we can
     // redirect the user to where they came from after initialization
@@ -120,4 +122,4 @@ final routerProvider = Provider<GoRouter>((ref) {
   );
   RouterConf.router = router;
   return router;
-});
+}
diff --git a/designer_v2/lib/routing/router.g.dart b/designer_v2/lib/routing/router.g.dart
new file mode 100644
index 000000000..2b859ba8f
--- /dev/null
+++ b/designer_v2/lib/routing/router.g.dart
@@ -0,0 +1,34 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'router.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$routerHash() => r'a47e2b191040bbb7139da0b71689e8747b14683b';
+
+/// How to create a new page & use it for navigation:
+///
+/// 1. Add the [GoRoute] in router_config.dart and register it as
+/// a [RouterConf.topLevelRoute] (most likely it should be a top-level
+/// route, unless you know what you are doing with subroutes)
+///
+/// 2. To navigate to the new route from your code, specify one or more
+/// [RoutingIntent]s in router_intent.dart. These intents correspond to
+/// route changes in the app. See router_intent.dart for more details.
+///
+/// Copied from [router].
+@ProviderFor(router)
+final routerProvider = AutoDisposeProvider<GoRouter>.internal(
+  router,
+  name: r'routerProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product') ? null : _$routerHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef RouterRef = AutoDisposeProviderRef<GoRouter>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/services/clipboard.dart b/designer_v2/lib/services/clipboard.dart
index c928af02f..e923ee760 100644
--- a/designer_v2/lib/services/clipboard.dart
+++ b/designer_v2/lib/services/clipboard.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/services.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+part 'clipboard.g.dart';
 
 abstract class IClipboardService {
   Future<String> copy(String text);
@@ -13,4 +15,7 @@ class ClipboardService implements IClipboardService {
   }
 }
 
-final clipboardServiceProvider = Provider<IClipboardService>((ref) => ClipboardService());
+@riverpod
+IClipboardService clipboardService(ClipboardServiceRef ref) {
+  return ClipboardService();
+}
diff --git a/designer_v2/lib/services/clipboard.g.dart b/designer_v2/lib/services/clipboard.g.dart
new file mode 100644
index 000000000..ab78ab237
--- /dev/null
+++ b/designer_v2/lib/services/clipboard.g.dart
@@ -0,0 +1,26 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'clipboard.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$clipboardServiceHash() => r'367d2f59d85547e932e937fecc6c703b74a86b26';
+
+/// See also [clipboardService].
+@ProviderFor(clipboardService)
+final clipboardServiceProvider =
+    AutoDisposeProvider<IClipboardService>.internal(
+  clipboardService,
+  name: r'clipboardServiceProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$clipboardServiceHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef ClipboardServiceRef = AutoDisposeProviderRef<IClipboardService>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/services/notification_service.dart b/designer_v2/lib/services/notification_service.dart
index d83219469..f5b2c66a1 100644
--- a/designer_v2/lib/services/notification_service.dart
+++ b/designer_v2/lib/services/notification_service.dart
@@ -1,8 +1,10 @@
 import 'dart:async';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:rxdart/subjects.dart';
 import 'package:studyu_designer_v2/services/notification_types.dart';
 
+part 'notification_service.g.dart';
+
 abstract class INotificationService {
   void showMessage(String notificationText, {List<NotificationAction>? actions});
   void show(NotificationIntent notification, {List<NotificationAction>? actions});
@@ -46,11 +48,7 @@ class NotificationService implements INotificationService {
   }
 }
 
-final notificationServiceProvider = Provider<INotificationService>((ref) {
-  final notificationService = NotificationService();
-  // Bind lifecycle to Riverpod
-  ref.onDispose(() {
-    notificationService.dispose();
-  });
-  return notificationService;
-});
+@riverpod
+NotificationService notificationService(NotificationServiceRef ref) {
+  return NotificationService();
+}
diff --git a/designer_v2/lib/services/notification_service.g.dart b/designer_v2/lib/services/notification_service.g.dart
new file mode 100644
index 000000000..0cb507bc6
--- /dev/null
+++ b/designer_v2/lib/services/notification_service.g.dart
@@ -0,0 +1,27 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'notification_service.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$notificationServiceHash() =>
+    r'6db295591da0ebe2efdebffe326d89912af46b5a';
+
+/// See also [notificationService].
+@ProviderFor(notificationService)
+final notificationServiceProvider =
+    AutoDisposeProvider<NotificationService>.internal(
+  notificationService,
+  name: r'notificationServiceProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$notificationServiceHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef NotificationServiceRef = AutoDisposeProviderRef<NotificationService>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 4beebd13e..9b99681bf 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -31,6 +31,7 @@ dependencies:
   reactive_forms: ^17.0.1
   reactive_multi_select_flutter: ^2.0.1
   reactive_range_slider: ^2.1.0
+  riverpod_annotation: ^2.3.5
   rxdart: ^0.27.7
   studyu_core: ^4.4.2
   studyu_flutter_common: ^1.8.3
@@ -40,7 +41,8 @@ dependencies:
   uuid: ^4.4.0
 
 dev_dependencies:
-  custom_lint:
+  build_runner: ^2.4.9
+  custom_lint: ^0.6.4
   flutter_launcher_icons: ^0.13.1
   flutter_lints: ^4.0.0
   flutter_test:
@@ -48,7 +50,8 @@ dev_dependencies:
   integration_test:
     sdk: flutter
   patrol_finders: ^2.0.2
-  riverpod_lint:
+  riverpod_generator: ^2.4.0
+  riverpod_lint: ^2.3.10
   test: ^1.24.9 # integration_test
 
 flutter:

From a13f36689fd0294fec4366ee05a4315f2f809c71 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 22 Apr 2024 00:05:48 +0200
Subject: [PATCH 081/314] refactor: migrate to riverpod code generation 2

---
 app/lib/models/app_state.dart                 |   1 +
 .../lib/common_views/pages/splash_page.dart   |   1 -
 .../analyze/study_analyze_controller.dart     |  32 ++--
 .../analyze/study_analyze_controller.g.dart   | 176 ++++++++++++++++++
 .../study_analyze_controller_state.dart       |   8 +-
 designer_v2/lib/features/app.dart             |  14 +-
 designer_v2/lib/features/app_controller.dart  |  19 +-
 .../lib/features/app_controller.g.dart        |   8 +-
 .../recruit/study_recruit_controller.dart     |  59 +++---
 .../recruit/study_recruit_controller.g.dart   | 176 ++++++++++++++++++
 .../study_recruit_controller_state.dart       |  13 +-
 .../features/study/study_base_controller.dart |  47 +++--
 .../study/study_base_controller.g.dart        | 176 ++++++++++++++++++
 .../lib/features/study/study_base_state.dart  |  13 +-
 .../lib/features/study/study_controller.dart  |  76 +++-----
 .../features/study/study_controller.g.dart    | 175 +++++++++++++++++
 .../study/study_controller_state.dart         |  25 ++-
 .../lib/features/study/study_scaffold.dart    |   2 +-
 .../features/study/study_test_controller.dart |  72 +++----
 .../study/study_test_controller.g.dart        | 170 ++++++++++++++++-
 .../study/study_test_controller_state.dart    |   8 +-
 .../lib/localization/app_translation.dart     |   6 +-
 .../lib/localization/locale_state.dart        |  42 ++---
 .../lib/localization/locale_state.g.dart      |   2 +-
 designer_v2/lib/routing/router.dart           |  11 +-
 designer_v2/lib/routing/router.g.dart         |   2 +-
 26 files changed, 1081 insertions(+), 253 deletions(-)
 create mode 100644 designer_v2/lib/features/analyze/study_analyze_controller.g.dart
 create mode 100644 designer_v2/lib/features/recruit/study_recruit_controller.g.dart
 create mode 100644 designer_v2/lib/features/study/study_base_controller.g.dart
 create mode 100644 designer_v2/lib/features/study/study_controller.g.dart

diff --git a/app/lib/models/app_state.dart b/app/lib/models/app_state.dart
index 6a4096129..e34047c01 100644
--- a/app/lib/models/app_state.dart
+++ b/app/lib/models/app_state.dart
@@ -5,6 +5,7 @@ import 'package:studyu_app/util/cache.dart';
 import 'package:studyu_app/util/schedule_notifications.dart';
 import 'package:studyu_core/core.dart';
 
+// @riverpod
 class AppState with ChangeNotifier {
   Study? selectedStudy;
   List<Intervention>? selectedInterventions;
diff --git a/designer_v2/lib/common_views/pages/splash_page.dart b/designer_v2/lib/common_views/pages/splash_page.dart
index 88a8c41e8..6c7c8f57a 100644
--- a/designer_v2/lib/common_views/pages/splash_page.dart
+++ b/designer_v2/lib/common_views/pages/splash_page.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-// import 'package:studyu_designer_v2/localization/app_translation.dart';
 
 class SplashPage extends StatelessWidget {
   const SplashPage({super.key});
diff --git a/designer_v2/lib/features/analyze/study_analyze_controller.dart b/designer_v2/lib/features/analyze/study_analyze_controller.dart
index 098d21467..e6f960a31 100644
--- a/designer_v2/lib/features/analyze/study_analyze_controller.dart
+++ b/designer_v2/lib/features/analyze/study_analyze_controller.dart
@@ -1,21 +1,25 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/domain/study_export.dart';
 import 'package:studyu_designer_v2/features/analyze/study_analyze_controller_state.dart';
 import 'package:studyu_designer_v2/features/analyze/study_export_zip.dart';
-import 'package:studyu_designer_v2/features/study/study_base_controller.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/utils/performance.dart';
 
-class StudyAnalyzeController extends StudyBaseController<StudyAnalyzeControllerState> {
-  StudyAnalyzeController({
-    required super.studyId,
-    required super.studyRepository,
-    required super.router,
-    required super.currentUser,
-  }) : super(StudyAnalyzeControllerState(currentUser: currentUser)) {
+part 'study_analyze_controller.g.dart';
+
+@riverpod
+class StudyAnalyzeController extends _$StudyAnalyzeController {
+  @override
+  StudyAnalyzeControllerState build(StudyID studyId) {
+    return StudyAnalyzeControllerState(
+      studyId: studyId,
+      studyRepository: ref.watch(studyRepositoryProvider),
+      router: ref.watch(routerProvider),
+      currentUser: ref.watch(authRepositoryProvider).currentUser,
+    );
     // Reload the study in case some data was generated meanwhile
     // studyRepository.fetch(studyId);
   }
@@ -25,13 +29,3 @@ class StudyAnalyzeController extends StudyBaseController<StudyAnalyzeControllerS
     return runAsync(() => study.exportData.downloadAsZip());
   }
 }
-
-final studyAnalyzeControllerProvider = StateNotifierProvider.autoDispose
-    .family<StudyAnalyzeController, StudyAnalyzeControllerState, StudyID>((ref, studyId) {
-  return StudyAnalyzeController(
-    studyId: studyId,
-    currentUser: ref.watch(authRepositoryProvider).currentUser,
-    studyRepository: ref.watch(studyRepositoryProvider),
-    router: ref.watch(routerProvider),
-  );
-});
diff --git a/designer_v2/lib/features/analyze/study_analyze_controller.g.dart b/designer_v2/lib/features/analyze/study_analyze_controller.g.dart
new file mode 100644
index 000000000..32580e7d4
--- /dev/null
+++ b/designer_v2/lib/features/analyze/study_analyze_controller.g.dart
@@ -0,0 +1,176 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'study_analyze_controller.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$studyAnalyzeControllerHash() =>
+    r'b8b807673ff3f1e9ab65007220edfa3c8da32a49';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$StudyAnalyzeController
+    extends BuildlessAutoDisposeNotifier<StudyAnalyzeControllerState> {
+  late final String studyId;
+
+  StudyAnalyzeControllerState build(
+    String studyId,
+  );
+}
+
+/// See also [StudyAnalyzeController].
+@ProviderFor(StudyAnalyzeController)
+const studyAnalyzeControllerProvider = StudyAnalyzeControllerFamily();
+
+/// See also [StudyAnalyzeController].
+class StudyAnalyzeControllerFamily extends Family<StudyAnalyzeControllerState> {
+  /// See also [StudyAnalyzeController].
+  const StudyAnalyzeControllerFamily();
+
+  /// See also [StudyAnalyzeController].
+  StudyAnalyzeControllerProvider call(
+    String studyId,
+  ) {
+    return StudyAnalyzeControllerProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyAnalyzeControllerProvider getProviderOverride(
+    covariant StudyAnalyzeControllerProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyAnalyzeControllerProvider';
+}
+
+/// See also [StudyAnalyzeController].
+class StudyAnalyzeControllerProvider extends AutoDisposeNotifierProviderImpl<
+    StudyAnalyzeController, StudyAnalyzeControllerState> {
+  /// See also [StudyAnalyzeController].
+  StudyAnalyzeControllerProvider(
+    String studyId,
+  ) : this._internal(
+          () => StudyAnalyzeController()..studyId = studyId,
+          from: studyAnalyzeControllerProvider,
+          name: r'studyAnalyzeControllerProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyAnalyzeControllerHash,
+          dependencies: StudyAnalyzeControllerFamily._dependencies,
+          allTransitiveDependencies:
+              StudyAnalyzeControllerFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyAnalyzeControllerProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  StudyAnalyzeControllerState runNotifierBuild(
+    covariant StudyAnalyzeController notifier,
+  ) {
+    return notifier.build(
+      studyId,
+    );
+  }
+
+  @override
+  Override overrideWith(StudyAnalyzeController Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyAnalyzeControllerProvider._internal(
+        () => create()..studyId = studyId,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeNotifierProviderElement<StudyAnalyzeController,
+      StudyAnalyzeControllerState> createElement() {
+    return _StudyAnalyzeControllerProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyAnalyzeControllerProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyAnalyzeControllerRef
+    on AutoDisposeNotifierProviderRef<StudyAnalyzeControllerState> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyAnalyzeControllerProviderElement
+    extends AutoDisposeNotifierProviderElement<StudyAnalyzeController,
+        StudyAnalyzeControllerState> with StudyAnalyzeControllerRef {
+  _StudyAnalyzeControllerProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyAnalyzeControllerProvider).studyId;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/analyze/study_analyze_controller_state.dart b/designer_v2/lib/features/analyze/study_analyze_controller_state.dart
index bdb75c239..e5b65b462 100644
--- a/designer_v2/lib/features/analyze/study_analyze_controller_state.dart
+++ b/designer_v2/lib/features/analyze/study_analyze_controller_state.dart
@@ -5,6 +5,9 @@ import 'package:studyu_designer_v2/repositories/model_repository.dart';
 
 class StudyAnalyzeControllerState extends StudyControllerBaseState {
   const StudyAnalyzeControllerState({
+    required super.studyId,
+    required super.studyRepository,
+    required super.router,
     required super.currentUser,
     super.studyWithMetadata,
   });
@@ -18,8 +21,11 @@ class StudyAnalyzeControllerState extends StudyControllerBaseState {
     WrappedModel<Study>? studyWithMetadata,
   }) {
     return StudyAnalyzeControllerState(
-      studyWithMetadata: studyWithMetadata ?? super.studyWithMetadata,
+      studyId: studyId,
+      studyRepository: studyRepository,
+      router: router,
       currentUser: currentUser,
+      studyWithMetadata: studyWithMetadata ?? super.studyWithMetadata,
     );
   }
 
diff --git a/designer_v2/lib/features/app.dart b/designer_v2/lib/features/app.dart
index 4b7fac349..44b6422b4 100644
--- a/designer_v2/lib/features/app.dart
+++ b/designer_v2/lib/features/app.dart
@@ -3,15 +3,13 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_designer_v2/constants.dart';
-import 'package:studyu_designer_v2/features/app_controller.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
-import 'package:studyu_designer_v2/localization/locale_providers.dart';
 import 'package:studyu_designer_v2/localization/string_hardcoded.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/services/notification_dispatcher.dart';
 import 'package:studyu_designer_v2/theme.dart';
 
-import '../localization/locale_state.dart';
+import '../localization/locale_providers.dart';
 
 final GlobalKey<ScaffoldMessengerState> scaffoldMessengerKey = GlobalKey();
 
@@ -38,7 +36,6 @@ class AppContent extends ConsumerStatefulWidget {
 }
 
 class _AppContentState extends ConsumerState<AppContent> {
-  late final AppController appController;
 
   final settings = ValueNotifier(ThemeSettings(
     //sourceColor: Color(0xff2a4fda),
@@ -51,18 +48,11 @@ class _AppContentState extends ConsumerState<AppContent> {
   @override
   void initState() {
     super.initState();
-    appController = ref.read(appControllerProvider.notifier);
-    appController.onAppStart();
-    // todo move this into appControllerProvider
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      // Locale Startup Actions
-      ref.read(localeStateNotifierProvider.notifier).initLocale();
-    });
   }
 
   @override
   Widget build(BuildContext context) {
-    AppTranslation.init(ref); // todo Refactor this into initState locale delegate if possible
+    AppTranslation.init(ref);
     final router = ref.watch(routerProvider);
 
     return DynamicColorBuilder(
diff --git a/designer_v2/lib/features/app_controller.dart b/designer_v2/lib/features/app_controller.dart
index 33f99f147..7e9e5ad66 100644
--- a/designer_v2/lib/features/app_controller.dart
+++ b/designer_v2/lib/features/app_controller.dart
@@ -18,12 +18,19 @@ typedef _DelegateCallback = Future<bool> Function(IAppDelegate delegate);
 @riverpod
 class AppController extends _$AppController {
   @override
-  AppControllerState build() {
+  Future<AppControllerState> build() async {
     _appDelegates = [
       /// Register [IAppDelegate]s here for invocation of app lifecycle methods
       ref.watch(authRepositoryProvider),
     ];
-    return const AppControllerState();
+    ref.listenSelf((previous, next) {
+      print("APP CONTROLLER STATE CHANGED: $next");
+    });
+    //ref.read(routerProvider).refresh();
+    // Forward onAppStart to all registered delegates so that they can
+    // e.g. read some data from local storage for initialization
+    //await _callDelegates((delegate) => delegate.onAppStart(), withMinDelay: true);
+    return const AppControllerState(status: AppStatus.initialized);
   }
 
   /// List of listeners for app lifecycle events registered via Riverpod
@@ -33,14 +40,6 @@ class AppController extends _$AppController {
   /// (so that the splash screen is shown during this time)
   late final _delayedFuture = Future.delayed(const Duration(milliseconds: Config.minSplashTime), () => true);
 
-  Future<bool> onAppStart() async {
-    // Forward onAppStart to all registered delegates so that they can
-    // e.g. read some data from local storage for initialization
-    final result = await _callDelegates((delegate) => delegate.onAppStart(), withMinDelay: true);
-    state = const AppControllerState(status: AppStatus.initialized);
-    return result;
-  }
-
   /// Executes the given callback for all registered delegates concurrently
   Future<bool> _callDelegates(_DelegateCallback function, {withMinDelay = false}) async {
     final List<Future<bool>> delegateFutures = [];
diff --git a/designer_v2/lib/features/app_controller.g.dart b/designer_v2/lib/features/app_controller.g.dart
index ea2ecc794..ce14e1321 100644
--- a/designer_v2/lib/features/app_controller.g.dart
+++ b/designer_v2/lib/features/app_controller.g.dart
@@ -6,14 +6,14 @@ part of 'app_controller.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$appControllerHash() => r'c72d85991f008d5ad6a88ef46b77578f78c32ac5';
+String _$appControllerHash() => r'fe83de481e31f72f7a492084d62f04373130fb1e';
 
 /// Main controller that's bound to the top-level application widget's state
 ///
 /// Copied from [AppController].
 @ProviderFor(AppController)
-final appControllerProvider =
-    AutoDisposeNotifierProvider<AppController, AppControllerState>.internal(
+final appControllerProvider = AutoDisposeAsyncNotifierProvider<AppController,
+    AppControllerState>.internal(
   AppController.new,
   name: r'appControllerProvider',
   debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
@@ -23,6 +23,6 @@ final appControllerProvider =
   allTransitiveDependencies: null,
 );
 
-typedef _$AppController = AutoDisposeNotifier<AppControllerState>;
+typedef _$AppController = AutoDisposeAsyncNotifier<AppControllerState>;
 // ignore_for_file: type=lint
 // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/recruit/study_recruit_controller.dart b/designer_v2/lib/features/recruit/study_recruit_controller.dart
index 154f46bb4..ec9b1e16f 100644
--- a/designer_v2/lib/features/recruit/study_recruit_controller.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_controller.dart
@@ -1,9 +1,8 @@
 import 'dart:async';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/features/recruit/study_recruit_controller_state.dart';
-import 'package:studyu_designer_v2/features/study/study_base_controller.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/repositories/invite_code_repository.dart';
 import 'package:studyu_designer_v2/repositories/model_repository.dart';
@@ -11,28 +10,33 @@ import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/utils/model_action.dart';
 
-class StudyRecruitController extends StudyBaseController<StudyRecruitControllerState>
-    implements IModelActionProvider<StudyInvite> {
-  StudyRecruitController({
-    required super.studyId,
-    required super.studyRepository,
-    required super.currentUser,
-    required super.router,
-    required this.inviteCodeRepository,
-  }) : super(StudyRecruitControllerState(currentUser: currentUser)) {
+part 'study_recruit_controller.g.dart';
+
+@riverpod
+class StudyRecruitController extends _$StudyRecruitController implements IModelActionProvider<StudyInvite> {
+
+  /// [inviteCodeRepository] Reference to the repository for invite codes (resolved dynamically via Riverpod when the [state.study] becomes available)
+  @override
+  StudyRecruitControllerState build(StudyID studyId) {
     print("StudyRecruitController.constructor");
     _subscribeInvites();
+    ref.onDispose(() {print("StudyRecruitController.dispose");
+    _invitesSubscription?.cancel();});
+    return StudyRecruitControllerState(
+      studyId: studyId,
+      studyRepository: ref.watch(studyRepositoryProvider),
+      router: ref.watch(routerProvider),
+      currentUser: ref.watch(authRepositoryProvider).currentUser,
+      inviteCodeRepository: ref.watch(inviteCodeRepositoryProvider(studyId)),
+      invites: const AsyncValue.loading(),
+    );
   }
 
-  /// Reference to the repository for invite codes (resolved dynamically via
-  /// Riverpod when the [state.study] becomes available)
-  final IInviteCodeRepository inviteCodeRepository;
-
   StreamSubscription<List<WrappedModel<StudyInvite>>>? _invitesSubscription;
 
   _subscribeInvites() {
     print("StudyRecruitController.subscribe");
-    _invitesSubscription = inviteCodeRepository.watchAll().listen((wrappedModels) {
+    _invitesSubscription = state.inviteCodeRepository.watchAll().listen((wrappedModels) {
       print("StudyRecruitController.listenUpdate");
       // Update the controller's state when new invites are available in the repository
       final invites = wrappedModels.map((invite) => invite.model).toList();
@@ -56,7 +60,7 @@ class StudyRecruitController extends StudyBaseController<StudyRecruitControllerS
 
   @override
   List<ModelAction> availableActions(StudyInvite model) {
-    final actions = inviteCodeRepository
+    final actions = state.inviteCodeRepository
         .availableActions(model)
         .where((action) => action.type != ModelActionType.clipboard)
         .toList();
@@ -64,29 +68,10 @@ class StudyRecruitController extends StudyBaseController<StudyRecruitControllerS
   }
 
   List<ModelAction> availableInlineActions(StudyInvite model) {
-    final actions = inviteCodeRepository
+    final actions = state.inviteCodeRepository
         .availableActions(model)
         .where((action) => action.type == ModelActionType.clipboard)
         .toList();
     return withIcons(actions, modelActionIcons);
   }
-
-  @override
-  void dispose() {
-    print("StudyRecruitController.dispose");
-    _invitesSubscription?.cancel();
-    super.dispose();
-  }
 }
-
-/// Provide a controller parametrized by [StudyID]
-final studyRecruitControllerProvider = StateNotifierProvider.autoDispose
-    .family<StudyRecruitController, StudyRecruitControllerState, StudyID>((ref, studyId) {
-  return StudyRecruitController(
-    studyId: studyId,
-    studyRepository: ref.watch(studyRepositoryProvider),
-    currentUser: ref.watch(authRepositoryProvider).currentUser,
-    router: ref.watch(routerProvider),
-    inviteCodeRepository: ref.watch(inviteCodeRepositoryProvider(studyId)),
-  );
-});
diff --git a/designer_v2/lib/features/recruit/study_recruit_controller.g.dart b/designer_v2/lib/features/recruit/study_recruit_controller.g.dart
new file mode 100644
index 000000000..e1ea441d9
--- /dev/null
+++ b/designer_v2/lib/features/recruit/study_recruit_controller.g.dart
@@ -0,0 +1,176 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'study_recruit_controller.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$studyRecruitControllerHash() =>
+    r'8dc8092f83dbab107eadaa274ad0cdfc09d79e38';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$StudyRecruitController
+    extends BuildlessAutoDisposeNotifier<StudyRecruitControllerState> {
+  late final String studyId;
+
+  StudyRecruitControllerState build(
+    String studyId,
+  );
+}
+
+/// See also [StudyRecruitController].
+@ProviderFor(StudyRecruitController)
+const studyRecruitControllerProvider = StudyRecruitControllerFamily();
+
+/// See also [StudyRecruitController].
+class StudyRecruitControllerFamily extends Family<StudyRecruitControllerState> {
+  /// See also [StudyRecruitController].
+  const StudyRecruitControllerFamily();
+
+  /// See also [StudyRecruitController].
+  StudyRecruitControllerProvider call(
+    String studyId,
+  ) {
+    return StudyRecruitControllerProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyRecruitControllerProvider getProviderOverride(
+    covariant StudyRecruitControllerProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyRecruitControllerProvider';
+}
+
+/// See also [StudyRecruitController].
+class StudyRecruitControllerProvider extends AutoDisposeNotifierProviderImpl<
+    StudyRecruitController, StudyRecruitControllerState> {
+  /// See also [StudyRecruitController].
+  StudyRecruitControllerProvider(
+    String studyId,
+  ) : this._internal(
+          () => StudyRecruitController()..studyId = studyId,
+          from: studyRecruitControllerProvider,
+          name: r'studyRecruitControllerProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyRecruitControllerHash,
+          dependencies: StudyRecruitControllerFamily._dependencies,
+          allTransitiveDependencies:
+              StudyRecruitControllerFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyRecruitControllerProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  StudyRecruitControllerState runNotifierBuild(
+    covariant StudyRecruitController notifier,
+  ) {
+    return notifier.build(
+      studyId,
+    );
+  }
+
+  @override
+  Override overrideWith(StudyRecruitController Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyRecruitControllerProvider._internal(
+        () => create()..studyId = studyId,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeNotifierProviderElement<StudyRecruitController,
+      StudyRecruitControllerState> createElement() {
+    return _StudyRecruitControllerProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyRecruitControllerProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyRecruitControllerRef
+    on AutoDisposeNotifierProviderRef<StudyRecruitControllerState> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyRecruitControllerProviderElement
+    extends AutoDisposeNotifierProviderElement<StudyRecruitController,
+        StudyRecruitControllerState> with StudyRecruitControllerRef {
+  _StudyRecruitControllerProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyRecruitControllerProvider).studyId;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/recruit/study_recruit_controller_state.dart b/designer_v2/lib/features/recruit/study_recruit_controller_state.dart
index 22da2b5f9..8c9552c93 100644
--- a/designer_v2/lib/features/recruit/study_recruit_controller_state.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_controller_state.dart
@@ -1,12 +1,17 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/features/study/study_base_state.dart';
+import 'package:studyu_designer_v2/repositories/invite_code_repository.dart';
 import 'package:studyu_designer_v2/repositories/model_repository.dart';
 
 class StudyRecruitControllerState extends StudyControllerBaseState {
   const StudyRecruitControllerState({
+    required super.studyId,
+    required super.studyRepository,
+    required super.router,
     required super.currentUser,
     super.studyWithMetadata,
+    required this.inviteCodeRepository,
     this.invites = const AsyncValue.loading(),
   });
 
@@ -16,15 +21,21 @@ class StudyRecruitControllerState extends StudyControllerBaseState {
   /// [Study] async states, so that it can be used with [AsyncValueWidget]
   final AsyncValue<List<StudyInvite>?> invites;
 
+  final InviteCodeRepository inviteCodeRepository;
+
   @override
   StudyRecruitControllerState copyWith({
     WrappedModel<Study>? studyWithMetadata,
     AsyncValue<List<StudyInvite>>? invites,
   }) {
     return StudyRecruitControllerState(
+      studyId: studyId,
+      studyRepository: studyRepository,
+      router: router,
+      currentUser: currentUser,
       studyWithMetadata: studyWithMetadata ?? super.studyWithMetadata,
+      inviteCodeRepository: inviteCodeRepository,
       invites: invites ?? this.invites,
-      currentUser: super.currentUser,
     );
   }
 
diff --git a/designer_v2/lib/features/study/study_base_controller.dart b/designer_v2/lib/features/study/study_base_controller.dart
index 30f30c5a0..3041e26d5 100644
--- a/designer_v2/lib/features/study/study_base_controller.dart
+++ b/designer_v2/lib/features/study/study_base_controller.dart
@@ -1,38 +1,39 @@
 import 'dart:async';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:go_router/go_router.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/features/study/study_base_state.dart';
 import 'package:studyu_designer_v2/repositories/api_client.dart';
+import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/repositories/model_repository.dart';
 import 'package:studyu_designer_v2/repositories/study_repository.dart';
+import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/routing/router_intent.dart';
 
-class StudyBaseController<T extends StudyControllerBaseState> extends StateNotifier<T> {
-  StudyBaseController(
-    super.state, {
-    required this.studyId,
-    required this.studyRepository,
-    required this.router,
-    required currentUser,
-  }) {
+part 'study_base_controller.g.dart';
+
+@riverpod
+class StudyBaseController<T extends StudyControllerBaseState> extends _$StudyBaseController {
+  @override
+  StudyControllerBaseState build(StudyID studyId) {
     subscribeStudy(studyId);
+    return StudyControllerBaseState(
+      studyId: studyId,
+      studyRepository: ref.watch(studyRepositoryProvider),
+      router: ref.watch(routerProvider),
+      currentUser: ref.watch(authRepositoryProvider).currentUser,
+    );
   }
 
-  final StudyID studyId;
-  final IStudyRepository studyRepository;
-  final GoRouter router;
-
-  StreamSubscription<WrappedModel<Study>>? studySubscription;
+  StreamSubscription<WrappedModel<Study>>? _studySubscription;
 
   subscribeStudy(StudyID studyId) {
-    if (studySubscription != null) {
-      studySubscription!.cancel();
+    if (_studySubscription != null) {
+      _studySubscription!.cancel();
     }
-    studySubscription =
-        studyRepository.watch(studyId).listen(onStudySubscriptionUpdate, onError: onStudySubscriptionError);
+    _studySubscription =
+        state.studyRepository.watch(studyId).listen(onStudySubscriptionUpdate, onError: onStudySubscriptionError);
   }
 
   onStudySubscriptionUpdate(WrappedModel<Study> wrappedModel) {
@@ -46,13 +47,7 @@ class StudyBaseController<T extends StudyControllerBaseState> extends StateNotif
            during app initialization so that we don't need to render the loading state
            if the study doesn't exist
       */
-      router.dispatch(RoutingIntents.error(error));
+      state.router.dispatch(RoutingIntents.error(error));
     }
   }
-
-  @override
-  dispose() {
-    studySubscription?.cancel();
-    super.dispose();
-  }
 }
diff --git a/designer_v2/lib/features/study/study_base_controller.g.dart b/designer_v2/lib/features/study/study_base_controller.g.dart
new file mode 100644
index 000000000..e906e67ee
--- /dev/null
+++ b/designer_v2/lib/features/study/study_base_controller.g.dart
@@ -0,0 +1,176 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'study_base_controller.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$studyBaseControllerHash() =>
+    r'1277944be2302e5d8f5d0c9bdc36e05a05d2d104';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$StudyBaseController
+    extends BuildlessAutoDisposeNotifier<StudyControllerBaseState> {
+  late final String studyId;
+
+  StudyControllerBaseState build(
+    String studyId,
+  );
+}
+
+/// See also [StudyBaseController].
+@ProviderFor(StudyBaseController)
+const studyBaseControllerProvider = StudyBaseControllerFamily();
+
+/// See also [StudyBaseController].
+class StudyBaseControllerFamily extends Family<StudyControllerBaseState> {
+  /// See also [StudyBaseController].
+  const StudyBaseControllerFamily();
+
+  /// See also [StudyBaseController].
+  StudyBaseControllerProvider call(
+    String studyId,
+  ) {
+    return StudyBaseControllerProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyBaseControllerProvider getProviderOverride(
+    covariant StudyBaseControllerProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyBaseControllerProvider';
+}
+
+/// See also [StudyBaseController].
+class StudyBaseControllerProvider extends AutoDisposeNotifierProviderImpl<
+    StudyBaseController, StudyControllerBaseState> {
+  /// See also [StudyBaseController].
+  StudyBaseControllerProvider(
+    String studyId,
+  ) : this._internal(
+          () => StudyBaseController()..studyId = studyId,
+          from: studyBaseControllerProvider,
+          name: r'studyBaseControllerProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyBaseControllerHash,
+          dependencies: StudyBaseControllerFamily._dependencies,
+          allTransitiveDependencies:
+              StudyBaseControllerFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyBaseControllerProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  StudyControllerBaseState runNotifierBuild(
+    covariant StudyBaseController notifier,
+  ) {
+    return notifier.build(
+      studyId,
+    );
+  }
+
+  @override
+  Override overrideWith(StudyBaseController Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyBaseControllerProvider._internal(
+        () => create()..studyId = studyId,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeNotifierProviderElement<StudyBaseController,
+      StudyControllerBaseState> createElement() {
+    return _StudyBaseControllerProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyBaseControllerProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyBaseControllerRef
+    on AutoDisposeNotifierProviderRef<StudyControllerBaseState> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyBaseControllerProviderElement
+    extends AutoDisposeNotifierProviderElement<StudyBaseController,
+        StudyControllerBaseState> with StudyBaseControllerRef {
+  _StudyBaseControllerProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyBaseControllerProvider).studyId;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/study/study_base_state.dart b/designer_v2/lib/features/study/study_base_state.dart
index d43f28e78..88080c7fb 100644
--- a/designer_v2/lib/features/study/study_base_state.dart
+++ b/designer_v2/lib/features/study/study_base_state.dart
@@ -1,16 +1,24 @@
 import 'package:equatable/equatable.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/repositories/model_repository.dart';
+import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 
 class StudyControllerBaseState extends Equatable {
   const StudyControllerBaseState({
+    required this.studyId,
+    required this.studyRepository,
+    required this.router,
     required this.currentUser,
     this.studyWithMetadata,
   });
 
+  final StudyID studyId;
+  final IStudyRepository studyRepository;
+  final GoRouter router;
   final User? currentUser;
 
   /// The study that is currently being viewed or edited, wrapped in a
@@ -30,8 +38,11 @@ class StudyControllerBaseState extends Equatable {
 
   StudyControllerBaseState copyWith({WrappedModel<Study>? studyWithMetadata}) {
     return StudyControllerBaseState(
-      studyWithMetadata: studyWithMetadata ?? this.studyWithMetadata,
+      studyId: studyId,
+      studyRepository: studyRepository,
+      router: router,
       currentUser: currentUser,
+      studyWithMetadata: studyWithMetadata ?? this.studyWithMetadata,
     );
   }
 
diff --git a/designer_v2/lib/features/study/study_controller.dart b/designer_v2/lib/features/study/study_controller.dart
index da398c3db..64d889dc1 100644
--- a/designer_v2/lib/features/study/study_controller.dart
+++ b/designer_v2/lib/features/study/study_controller.dart
@@ -1,40 +1,42 @@
 import 'dart:async';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
-import 'package:studyu_designer_v2/features/study/study_actions.dart';
 import 'package:studyu_designer_v2/features/study/study_base_controller.dart';
 import 'package:studyu_designer_v2/features/study/study_controller_state.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/repositories/model_repository.dart';
 import 'package:studyu_designer_v2/repositories/model_repository_events.dart';
-import 'package:studyu_designer_v2/repositories/study_repository.dart';
-import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/routing/router_intent.dart';
-import 'package:studyu_designer_v2/services/notification_service.dart';
-import 'package:studyu_designer_v2/utils/model_action.dart';
 
-class StudyController extends StudyBaseController<StudyControllerState> {
-  StudyController({
-    required super.studyId,
-    required super.studyRepository,
-    required super.currentUser,
-    required super.router,
-    required this.notificationService,
-  }) : super(StudyControllerState(currentUser: currentUser)) {
+import '../../repositories/study_repository.dart';
+import '../../routing/router.dart';
+
+part 'study_controller.g.dart';
+
+@riverpod
+class StudyController extends _$StudyController {
+  @override
+  StudyControllerState build(StudyID studyId) {
     syncStudyStatus();
+    ref.onDispose(() => _studyEventsSubscription?.cancel());
+    return StudyControllerState(
+      studyId: studyId,
+      studyRepository: ref.watch(studyRepositoryProvider),
+      router: ref.watch(routerProvider),
+      currentUser: ref.watch(authRepositoryProvider).currentUser
+    );
   }
 
-  final INotificationService notificationService;
-  StreamSubscription<ModelEvent<Study>>? studyEventsSubscription;
+  StreamSubscription<ModelEvent<Study>>? _studyEventsSubscription;
 
   syncStudyStatus() {
-    if (studyEventsSubscription != null) {
-      studyEventsSubscription?.cancel();
+    if (_studyEventsSubscription != null) {
+      _studyEventsSubscription?.cancel();
     }
-    studyEventsSubscription = this.studyRepository.watchChanges(studyId).listen((event) {
+    _studyEventsSubscription = state.studyRepository.watchChanges(state.studyId).listen((event) {
       if (event is IsSaving) {
         state = state.copyWith(
           syncState: const AsyncValue.loading(),
@@ -50,9 +52,8 @@ class StudyController extends StudyBaseController<StudyControllerState> {
     });
   }
 
-  @override
   onStudySubscriptionUpdate(WrappedModel<Study> wrappedModel) {
-    super.onStudySubscriptionUpdate(wrappedModel);
+    ref.watch(studyBaseControllerProvider(state.studyId).notifier).onStudySubscriptionUpdate(wrappedModel);
     final studyId = wrappedModel.model.id;
     _redirectNewToActualStudyID(studyId);
   }
@@ -60,49 +61,32 @@ class StudyController extends StudyBaseController<StudyControllerState> {
   /// Redirect to the study-specific URL to avoid disposing a dirty controller
   /// when building subroutes
   _redirectNewToActualStudyID(StudyID actualStudyId) {
-    if (studyId == Config.newModelId) {
-      this.router.dispatch(RoutingIntents.study(actualStudyId));
-    }
-  }
-
-  List<ModelAction> get studyActions {
-    final study = state.study.value;
-    if (study == null) {
-      return [];
+    if (state.studyId == Config.newModelId) {
+      state.router.dispatch(RoutingIntents.study(actualStudyId));
     }
-    // filter out edit action since we are already editing the study
-    return withIcons(
-        this.studyRepository.availableActions(study).where((action) => action.type != StudyActionType.edit).toList(),
-        studyActionIcons);
   }
 
   Future publishStudy({toRegistry = false}) {
     final study = state.study.value!;
     study.registryPublished = toRegistry;
-    return this.studyRepository.launch(study);
+    return state.studyRepository.launch(study);
   }
 
   void onChangeStudyParticipation() {
-    this.router.dispatch(RoutingIntents.studyEditEnrollment(studyId));
+    state.router.dispatch(RoutingIntents.studyEditEnrollment(state.studyId));
   }
 
   void onAddParticipants() {
-    this.router.dispatch(RoutingIntents.studyRecruit(studyId));
+    state.router.dispatch(RoutingIntents.studyRecruit(state.studyId));
   }
 
   void onSettingsPressed() {
-    this.router.dispatch(RoutingIntents.studySettings(studyId));
-  }
-
-  @override
-  dispose() {
-    studyEventsSubscription?.cancel();
-    super.dispose();
+    state.router.dispatch(RoutingIntents.studySettings(state.studyId));
   }
 }
 
 /// Use the [family] modifier to provide a controller parametrized by [StudyID]
-final studyControllerProvider =
+/*final studyControllerProvider =
     StateNotifierProvider.autoDispose.family<StudyController, StudyControllerState, StudyID>((ref, studyId) {
   print("studyControllerProvider($studyId)");
   final controller = StudyController(
@@ -120,4 +104,4 @@ final studyControllerProvider =
     print("studyControllerProvider($studyId).DISPOSE");
   });
   return controller;
-});
+});*/
diff --git a/designer_v2/lib/features/study/study_controller.g.dart b/designer_v2/lib/features/study/study_controller.g.dart
new file mode 100644
index 000000000..cff6c09e7
--- /dev/null
+++ b/designer_v2/lib/features/study/study_controller.g.dart
@@ -0,0 +1,175 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'study_controller.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$studyControllerHash() => r'23bdef67597ce483a453b46c962f93804fca09b2';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$StudyController
+    extends BuildlessAutoDisposeNotifier<StudyControllerState> {
+  late final String studyId;
+
+  StudyControllerState build(
+    String studyId,
+  );
+}
+
+/// See also [StudyController].
+@ProviderFor(StudyController)
+const studyControllerProvider = StudyControllerFamily();
+
+/// See also [StudyController].
+class StudyControllerFamily extends Family<StudyControllerState> {
+  /// See also [StudyController].
+  const StudyControllerFamily();
+
+  /// See also [StudyController].
+  StudyControllerProvider call(
+    String studyId,
+  ) {
+    return StudyControllerProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyControllerProvider getProviderOverride(
+    covariant StudyControllerProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyControllerProvider';
+}
+
+/// See also [StudyController].
+class StudyControllerProvider extends AutoDisposeNotifierProviderImpl<
+    StudyController, StudyControllerState> {
+  /// See also [StudyController].
+  StudyControllerProvider(
+    String studyId,
+  ) : this._internal(
+          () => StudyController()..studyId = studyId,
+          from: studyControllerProvider,
+          name: r'studyControllerProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyControllerHash,
+          dependencies: StudyControllerFamily._dependencies,
+          allTransitiveDependencies:
+              StudyControllerFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyControllerProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  StudyControllerState runNotifierBuild(
+    covariant StudyController notifier,
+  ) {
+    return notifier.build(
+      studyId,
+    );
+  }
+
+  @override
+  Override overrideWith(StudyController Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyControllerProvider._internal(
+        () => create()..studyId = studyId,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeNotifierProviderElement<StudyController, StudyControllerState>
+      createElement() {
+    return _StudyControllerProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyControllerProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyControllerRef
+    on AutoDisposeNotifierProviderRef<StudyControllerState> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyControllerProviderElement
+    extends AutoDisposeNotifierProviderElement<StudyController,
+        StudyControllerState> with StudyControllerRef {
+  _StudyControllerProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyControllerProvider).studyId;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/study/study_controller_state.dart b/designer_v2/lib/features/study/study_controller_state.dart
index 3c41c6566..76faca5bd 100644
--- a/designer_v2/lib/features/study/study_controller_state.dart
+++ b/designer_v2/lib/features/study/study_controller_state.dart
@@ -2,21 +2,39 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/common_views/sync_indicator.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
+import 'package:studyu_designer_v2/features/study/study_actions.dart';
 import 'package:studyu_designer_v2/features/study/study_base_state.dart';
 import 'package:studyu_designer_v2/features/study/study_scaffold.dart';
 import 'package:studyu_designer_v2/repositories/model_repository.dart';
 
+import '../../utils/model_action.dart';
+
 class StudyControllerState extends StudyControllerBaseState implements IStudyAppBarViewModel, ISyncIndicatorViewModel {
   const StudyControllerState({
+    required super.studyId,
+    required super.studyRepository,
+    required super.router,
     required super.currentUser,
     super.studyWithMetadata,
     this.isDirty = false,
     this.syncState = const AsyncValue<void>.data(null),
-    this.lastSynced,
+    this.lastSynced
   });
 
   bool get isPublished => study.value != null && study.value!.published;
 
+  List<ModelAction> get studyActions {
+    final studyVal = study.value;
+    if (studyVal == null) {
+      return [];
+    }
+    // filter out edit action since we are already editing the study
+    return withIcons(
+        studyRepository.availableActions(studyVal).where((action) => action.type != StudyActionType.edit).toList(),
+        studyActionIcons
+    );
+  }
+
   // - ISyncIndicatorViewModel
 
   @override
@@ -86,11 +104,14 @@ class StudyControllerState extends StudyControllerBaseState implements IStudyApp
     DateTime? lastSynced,
   }) {
     return StudyControllerState(
+      studyId: studyId,
+      studyRepository: studyRepository,
+      router: router,
+      currentUser: currentUser,
       studyWithMetadata: studyWithMetadata ?? super.studyWithMetadata,
       isDirty: isDirty ?? this.isDirty,
       syncState: syncState ?? this.syncState,
       lastSynced: lastSynced ?? this.lastSynced,
-      currentUser: super.currentUser,
     );
   }
 }
diff --git a/designer_v2/lib/features/study/study_scaffold.dart b/designer_v2/lib/features/study/study_scaffold.dart
index 0a12c7c03..f3a5f876c 100644
--- a/designer_v2/lib/features/study/study_scaffold.dart
+++ b/designer_v2/lib/features/study/study_scaffold.dart
@@ -248,7 +248,7 @@ class _StudyScaffoldState extends ConsumerState<StudyScaffold> {
 
     actionButtons.add(
       ActionPopUpMenuButton(
-        actions: controller.studyActions,
+        actions: state.studyActions,
         orientation: Axis.vertical,
         enabled: state.study.hasValue, // disable while study is loading
         hideOnEmpty: false,
diff --git a/designer_v2/lib/features/study/study_test_controller.dart b/designer_v2/lib/features/study/study_test_controller.dart
index e6c1cd400..8aa4fec20 100644
--- a/designer_v2/lib/features/study/study_test_controller.dart
+++ b/designer_v2/lib/features/study/study_test_controller.dart
@@ -1,60 +1,42 @@
 import 'package:flutter/foundation.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
-import 'package:studyu_designer_v2/features/study/study_base_controller.dart';
 import 'package:studyu_designer_v2/features/study/study_test_controller_state.dart';
 import 'package:studyu_designer_v2/features/study/study_test_frame_controllers.dart';
-import 'package:studyu_designer_v2/localization/locale_providers.dart';
 import 'package:studyu_designer_v2/localization/string_hardcoded.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
-import 'package:studyu_designer_v2/repositories/study_repository.dart';
-import 'package:studyu_designer_v2/routing/router.dart';
+
+import '../../localization/locale_providers.dart';
+import '../../repositories/study_repository.dart';
+import '../../routing/router.dart';
 
 part 'study_test_controller.g.dart';
 
-class StudyTestController extends StudyBaseController<StudyTestControllerState> {
-  StudyTestController({
-    required super.studyId,
-    required super.studyRepository,
-    required super.currentUser,
-    required super.router,
-    required this.authRepository,
-    required this.languageCode,
-  }) : super(StudyTestControllerState(
-          currentUser: currentUser,
-          languageCode: languageCode,
-        )) {
-    state = state.copyWith(serializedSession: authRepository.serializedSession ?? '');
+@riverpod
+class StudyTestController extends _$StudyTestController {
+  @override
+  StudyTestControllerState build(StudyID studyId) {
+    ref.onDispose(() {
+      // Reload the study after disposing the test controller so that any
+      // data changes resulting from testing are reflected in the study for
+      // other parts of the app (e.g. test data that was generated)
+      //
+      // Ideally, we would stream changes from the backend/database directly,
+      // but this is a sufficient workaround for now
+      ref.watch(studyRepositoryProvider).fetch(studyId);
+    });
+    return StudyTestControllerState(
+      studyId: studyId,
+      studyRepository: ref.watch(studyRepositoryProvider),
+      router: ref.watch(routerProvider),
+      currentUser: ref.watch(authRepositoryProvider).currentUser,
+      serializedSession: ref.watch(authRepositoryProvider).serializedSession ?? '',
+      languageCode: ref.watch(localeProvider).languageCode,
+    );
   }
-
-  final IAuthRepository authRepository;
-  final String languageCode;
 }
 
-/// Use the [family] modifier to provide a controller parametrized by [StudyID]
-final studyTestControllerProvider =
-    StateNotifierProvider.family<StudyTestController, StudyTestControllerState, StudyID>((ref, studyId) {
-  final studyRepository = ref.watch(studyRepositoryProvider);
-  final controller = StudyTestController(
-    studyId: studyId,
-    studyRepository: studyRepository,
-    currentUser: ref.watch(authRepositoryProvider).currentUser,
-    router: ref.watch(routerProvider),
-    authRepository: ref.watch(authRepositoryProvider),
-    languageCode: ref.watch(localeProvider).languageCode,
-  );
-  ref.onDispose(() {
-    // Reload the study after disposing the test controller so that any
-    // data changes resulting from testing are reflected in the study for
-    // other parts of the app (e.g. test data that was generated)
-    //
-    // Ideally, we would stream changes from the backend/database directly,
-    // but this is a sufficient workaround for now
-    studyRepository.fetch(studyId);
-  });
-  return controller;
-});
+/// Provide a controller parametrized by [StudyID]
 
 @riverpod
 PlatformController studyTestPlatformController(StudyTestPlatformControllerRef ref, StudyID studyId) {
@@ -68,4 +50,4 @@ PlatformController studyTestPlatformController(StudyTestPlatformControllerRef re
     platformController = WebController(state.appUrl, studyId);
   }
   return platformController;
-}
+}
\ No newline at end of file
diff --git a/designer_v2/lib/features/study/study_test_controller.g.dart b/designer_v2/lib/features/study/study_test_controller.g.dart
index 44a3a547c..b85891216 100644
--- a/designer_v2/lib/features/study/study_test_controller.g.dart
+++ b/designer_v2/lib/features/study/study_test_controller.g.dart
@@ -30,16 +30,24 @@ class _SystemHash {
   }
 }
 
-/// See also [studyTestPlatformController].
+/// Provide a controller parametrized by [StudyID]
+///
+/// Copied from [studyTestPlatformController].
 @ProviderFor(studyTestPlatformController)
 const studyTestPlatformControllerProvider = StudyTestPlatformControllerFamily();
 
-/// See also [studyTestPlatformController].
+/// Provide a controller parametrized by [StudyID]
+///
+/// Copied from [studyTestPlatformController].
 class StudyTestPlatformControllerFamily extends Family<PlatformController> {
-  /// See also [studyTestPlatformController].
+  /// Provide a controller parametrized by [StudyID]
+  ///
+  /// Copied from [studyTestPlatformController].
   const StudyTestPlatformControllerFamily();
 
-  /// See also [studyTestPlatformController].
+  /// Provide a controller parametrized by [StudyID]
+  ///
+  /// Copied from [studyTestPlatformController].
   StudyTestPlatformControllerProvider call(
     String studyId,
   ) {
@@ -72,10 +80,14 @@ class StudyTestPlatformControllerFamily extends Family<PlatformController> {
   String? get name => r'studyTestPlatformControllerProvider';
 }
 
-/// See also [studyTestPlatformController].
+/// Provide a controller parametrized by [StudyID]
+///
+/// Copied from [studyTestPlatformController].
 class StudyTestPlatformControllerProvider
     extends AutoDisposeProvider<PlatformController> {
-  /// See also [studyTestPlatformController].
+  /// Provide a controller parametrized by [StudyID]
+  ///
+  /// Copied from [studyTestPlatformController].
   StudyTestPlatformControllerProvider(
     String studyId,
   ) : this._internal(
@@ -159,5 +171,151 @@ class _StudyTestPlatformControllerProviderElement
   @override
   String get studyId => (origin as StudyTestPlatformControllerProvider).studyId;
 }
+
+String _$studyTestControllerHash() =>
+    r'efc5f63d1d743edd57af6689308075f1c2cf3131';
+
+abstract class _$StudyTestController
+    extends BuildlessAutoDisposeNotifier<StudyTestControllerState> {
+  late final String studyId;
+
+  StudyTestControllerState build(
+    String studyId,
+  );
+}
+
+/// See also [StudyTestController].
+@ProviderFor(StudyTestController)
+const studyTestControllerProvider = StudyTestControllerFamily();
+
+/// See also [StudyTestController].
+class StudyTestControllerFamily extends Family<StudyTestControllerState> {
+  /// See also [StudyTestController].
+  const StudyTestControllerFamily();
+
+  /// See also [StudyTestController].
+  StudyTestControllerProvider call(
+    String studyId,
+  ) {
+    return StudyTestControllerProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyTestControllerProvider getProviderOverride(
+    covariant StudyTestControllerProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyTestControllerProvider';
+}
+
+/// See also [StudyTestController].
+class StudyTestControllerProvider extends AutoDisposeNotifierProviderImpl<
+    StudyTestController, StudyTestControllerState> {
+  /// See also [StudyTestController].
+  StudyTestControllerProvider(
+    String studyId,
+  ) : this._internal(
+          () => StudyTestController()..studyId = studyId,
+          from: studyTestControllerProvider,
+          name: r'studyTestControllerProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyTestControllerHash,
+          dependencies: StudyTestControllerFamily._dependencies,
+          allTransitiveDependencies:
+              StudyTestControllerFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyTestControllerProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  StudyTestControllerState runNotifierBuild(
+    covariant StudyTestController notifier,
+  ) {
+    return notifier.build(
+      studyId,
+    );
+  }
+
+  @override
+  Override overrideWith(StudyTestController Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyTestControllerProvider._internal(
+        () => create()..studyId = studyId,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeNotifierProviderElement<StudyTestController,
+      StudyTestControllerState> createElement() {
+    return _StudyTestControllerProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyTestControllerProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyTestControllerRef
+    on AutoDisposeNotifierProviderRef<StudyTestControllerState> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyTestControllerProviderElement
+    extends AutoDisposeNotifierProviderElement<StudyTestController,
+        StudyTestControllerState> with StudyTestControllerRef {
+  _StudyTestControllerProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyTestControllerProvider).studyId;
+}
 // ignore_for_file: type=lint
 // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/study/study_test_controller_state.dart b/designer_v2/lib/features/study/study_test_controller_state.dart
index 04645ab20..09b8c3790 100644
--- a/designer_v2/lib/features/study/study_test_controller_state.dart
+++ b/designer_v2/lib/features/study/study_test_controller_state.dart
@@ -5,6 +5,9 @@ import 'package:studyu_designer_v2/repositories/model_repository.dart';
 
 class StudyTestControllerState extends StudyControllerBaseState {
   const StudyTestControllerState({
+    required super.studyId,
+    required super.studyRepository,
+    required super.router,
     required super.currentUser,
     super.studyWithMetadata,
     this.serializedSession = '',
@@ -34,10 +37,13 @@ class StudyTestControllerState extends StudyControllerBaseState {
     String? languageCode,
   }) {
     return StudyTestControllerState(
+      studyId: studyId,
+      studyRepository: studyRepository,
+      router: router,
+      currentUser: currentUser,
       studyWithMetadata: studyWithMetadata ?? super.studyWithMetadata,
       serializedSession: serializedSession ?? this.serializedSession,
       languageCode: languageCode ?? this.languageCode,
-      currentUser: currentUser,
     );
   }
 
diff --git a/designer_v2/lib/localization/app_translation.dart b/designer_v2/lib/localization/app_translation.dart
index 6e3de4376..ea436d6fe 100644
--- a/designer_v2/lib/localization/app_translation.dart
+++ b/designer_v2/lib/localization/app_translation.dart
@@ -7,9 +7,9 @@ AppLocalizations get tr => _tr!;
 AppLocalizations? _tr;
 
 class AppTranslation {
-  static init(WidgetRef ref) async {
-    // Loads the currently selected locale from localeProvider and sets the localization
-    _tr = await AppLocalizations.delegate.load(ref.watch(localeProvider));
+  static init(WidgetRef ref) {
+    // Loads the currently selected locale and sets the localization
+    _tr = lookupAppLocalizations(ref.watch(localeProvider));
   }
 }
 
diff --git a/designer_v2/lib/localization/locale_state.dart b/designer_v2/lib/localization/locale_state.dart
index 01d1d814f..b51b9a083 100644
--- a/designer_v2/lib/localization/locale_state.dart
+++ b/designer_v2/lib/localization/locale_state.dart
@@ -22,41 +22,29 @@ class LocaleState {
 
 @riverpod
 class LocaleStateNotifier extends _$LocaleStateNotifier {
-
   @override
   LocaleState build() {
+    /// Initialize Locale
+    /// Can be run at startup to establish the initial local from storage, or the platform
+    /// 1. Attempts to restore locale from storage
+    /// 2. IF no locale in storage, attempts to set local from the platform settings
+    // Attempt to restore from storage
+    restoreFromStorage();
     return LocaleState(fallbackLocale);
   }
 
   static const _localStorageKey = 'lang';
 
-  //LocaleStateNotifier(this.ref) : super(LocaleState(fallbackLocale));
-
-  /// Initialize Locale
-  /// Can be run at startup to establish the initial local from storage, or the platform
-  /// 1. Attempts to restore locale from storage
-  /// 2. IF no locale in storage, attempts to set local from the platform settings
-  Future<void> initLocale() async {
-    // Attempt to restore from storage
-    bool fromStorageSuccess = await restoreFromStorage();
-
-    // If storage restore did not work, set from platform
-    if (!fromStorageSuccess) {
-      setLocale(ref.read(platformLocaleProvider));
-    }
-  }
-
   /// Set Locale
   /// Attempts to set the locale if it's in our list of supported locales.
   /// IF NOT: get the first locale that matches our language code and set that
   /// ELSE: do nothing.
-  void setLocale(Locale locale) {
-    List<Locale> supportedLocales = ref.read(supportedLocalesProvider);
+  void setLocale(Locale locale) async {
+    List<Locale> supportedLocales = ref.watch(supportedLocalesProvider);
 
     // Set the locale if it's in our list of supported locales
     if (supportedLocales.contains(locale)) {
       state = state.copyWith(locale: locale);
-      save();
     }
 
     // Get the closest language locale and set that instead
@@ -75,15 +63,17 @@ class LocaleStateNotifier extends _$LocaleStateNotifier {
   /// Restore Locale from Storage
   Future<bool> restoreFromStorage() async {
     try {
-      LocaleState? state = await load();
-      if (state == null) {
-        return false;
+      LocaleState? loadedState = await load();
+      if (loadedState != null) {
+        state = loadedState;
+        return true;
       }
-      state = state;
-      return true;
     } catch (e) {
-      return false;
+      rethrow;
     }
+    // If storage restore did not work, set from platform
+    setLocale(ref.watch(platformLocaleProvider));
+    return false;
   }
 
   Future<LocaleState?> load() async {
diff --git a/designer_v2/lib/localization/locale_state.g.dart b/designer_v2/lib/localization/locale_state.g.dart
index b6b7db0f2..69fa9100a 100644
--- a/designer_v2/lib/localization/locale_state.g.dart
+++ b/designer_v2/lib/localization/locale_state.g.dart
@@ -7,7 +7,7 @@ part of 'locale_state.dart';
 // **************************************************************************
 
 String _$localeStateNotifierHash() =>
-    r'726764926faff3bc76af0f45fdd750e75014291f';
+    r'33481e3cb3540bd28ad8ad47668e6f9d1d1c5594';
 
 /// See also [LocaleStateNotifier].
 @ProviderFor(LocaleStateNotifier)
diff --git a/designer_v2/lib/routing/router.dart b/designer_v2/lib/routing/router.dart
index 0c3a77aea..1b6e03144 100644
--- a/designer_v2/lib/routing/router.dart
+++ b/designer_v2/lib/routing/router.dart
@@ -4,11 +4,11 @@ import 'package:go_router/go_router.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/common_views/pages/error_page.dart';
 import 'package:studyu_designer_v2/constants.dart';
-import 'package:studyu_designer_v2/features/app_controller.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/utils/combined_stream_notifier.dart';
 
 import 'router_config.dart';
+
 part 'router.g.dart';
 
 /// How to create a new page & use it for navigation:
@@ -24,7 +24,6 @@ part 'router.g.dart';
 @riverpod
 GoRouter router(RouterRef ref) {
   final authRepository = ref.watch(authRepositoryProvider);
-  final appController = ref.read(appControllerProvider.notifier);
   const defaultLocation = studiesRouteName;
   late final GoRouter router;
 
@@ -43,7 +42,6 @@ GoRouter router(RouterRef ref) {
     // Read most recent app state on re-evaluation (see refreshListenable)
     final isLoggedIn = authRepository.isLoggedIn;
     var allowPasswordReset = authRepository.allowPasswordReset;
-    final isInitialized = ref.watch(appControllerProvider).isInitialized;
 
     // Carry original location through the redirect flow so that we can
     // redirect the user to where they came from after initialization
@@ -67,11 +65,6 @@ GoRouter router(RouterRef ref) {
       return router.namedLocation(name, queryParameters: qParams);
     }
 
-    if (!isInitialized) {
-      // Redirect to splash screen while app is pending initialization
-      return (isOnSplashPage) ? null : namedLocForwarded(splashRouteName);
-    }
-
     // Handle password recovery
     if (allowPasswordReset) {
       if (isOnPasswordRecoveryPage) {
@@ -112,7 +105,7 @@ GoRouter router(RouterRef ref) {
   router = GoRouter(
     refreshListenable: CombinedStreamNotifier([
       // Any stream registered here will trigger the router's redirect logic
-      appController.stream, // initialization events
+      // appController.stream, // initialization events
       authRepository.watchAuthStateChanges() // authentication events
     ]),
     routes: RouterConf.routes,
diff --git a/designer_v2/lib/routing/router.g.dart b/designer_v2/lib/routing/router.g.dart
index 2b859ba8f..dcb8481ee 100644
--- a/designer_v2/lib/routing/router.g.dart
+++ b/designer_v2/lib/routing/router.g.dart
@@ -6,7 +6,7 @@ part of 'router.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$routerHash() => r'a47e2b191040bbb7139da0b71689e8747b14683b';
+String _$routerHash() => r'886e6d20b787c9de54b15fa4dbeb51079e829937';
 
 /// How to create a new page & use it for navigation:
 ///

From 66d15ec843a2144fb84b5d6a64aaf29c2b91599a Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 29 May 2024 11:59:57 +0200
Subject: [PATCH 082/314] chore: format

---
 designer_v2/lib/repositories/api_client.dart | 29 ++++++--------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/designer_v2/lib/repositories/api_client.dart b/designer_v2/lib/repositories/api_client.dart
index 2e0299cb1..c8074e882 100644
--- a/designer_v2/lib/repositories/api_client.dart
+++ b/designer_v2/lib/repositories/api_client.dart
@@ -16,8 +16,7 @@ abstract class StudyUApi {
   Future<StudyInvite> saveStudyInvite(StudyInvite invite);
   Future<StudyInvite> fetchStudyInvite(String code);
   Future<void> deleteStudyInvite(StudyInvite invite);
-  Future<List<StudySubject>> deleteParticipants(
-      Study study, List<StudySubject> participants);
+  Future<List<StudySubject>> deleteParticipants(Study study, List<StudySubject> participants);
   /*
   Future<List<SubjectProgress>> deleteStudyProgress(
       Study study, List<SubjectProgress> records);
@@ -52,9 +51,7 @@ class StudyInviteNotFoundException extends APIException {}
 
 class UserNotFoundException extends APIException {}
 
-class StudyUApiClient extends SupabaseClientDependant
-    with SupabaseQueryMixin
-    implements StudyUApi {
+class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin implements StudyUApi {
   StudyUApiClient({
     required this.supabaseClient,
     this.testDelayMilliseconds = 0,
@@ -98,8 +95,7 @@ class StudyUApiClient extends SupabaseClientDependant
   final int testDelayMilliseconds;
 
   @override
-  Future<List<StudySubject>> deleteParticipants(
-      Study study, List<StudySubject> participants) async {
+  Future<List<StudySubject>> deleteParticipants(Study study, List<StudySubject> participants) async {
     await _testDelay();
     if (participants.isEmpty) {
       return Future.value([]);
@@ -127,8 +123,7 @@ class StudyUApiClient extends SupabaseClientDependant
    */
 
   @override
-  Future<List<Study>> getUserStudies(
-      {withParticipantActivity = false, forDashboardDisplay = true}) async {
+  Future<List<Study>> getUserStudies({withParticipantActivity = false, forDashboardDisplay = true}) async {
     await _testDelay();
     // TODO: fix Postgres policy for proper multi-tenancy
     final columns = (withParticipantActivity)
@@ -142,12 +137,9 @@ class StudyUApiClient extends SupabaseClientDependant
   }
 
   @override
-  Future<Study> fetchStudy(StudyID studyId,
-      {withParticipantActivity = true}) async {
+  Future<Study> fetchStudy(StudyID studyId, {withParticipantActivity = true}) async {
     await _testDelay();
-    final columns = (withParticipantActivity)
-        ? studyWithParticipantActivityColumns
-        : studyColumns;
+    final columns = (withParticipantActivity) ? studyWithParticipantActivityColumns : studyColumns;
     final request = getById<Study>(studyId, selectedColumns: columns);
     return _awaitGuarded(request, onError: {
       HttpStatus.notAcceptable: (e) => throw StudyNotFoundException(),
@@ -226,8 +218,7 @@ class StudyUApiClient extends SupabaseClientDependant
   /// domain-specific exception that bubbles up to the data layer.
   ///
   /// Raises a generic [APIException] for errors that cannot be handled.
-  Future<T> _awaitGuarded<T>(Future<T> future,
-      {Map<int, SupabaseQueryExceptionHandler>? onError}) async {
+  Future<T> _awaitGuarded<T>(Future<T> future, {Map<int, SupabaseQueryExceptionHandler>? onError}) async {
     try {
       final result = await future;
       return result;
@@ -235,8 +226,7 @@ class StudyUApiClient extends SupabaseClientDependant
       if (onError == null) {
         throw _apiException(error: e);
       }
-      if (e.statusCode == null ||
-          !onError.containsKey(int.parse(e.statusCode!))) {
+      if (e.statusCode == null || !onError.containsKey(int.parse(e.statusCode!))) {
         throw _apiException(error: e);
       }
       final errorHandler = onError[int.parse(e.statusCode!)]!;
@@ -258,8 +248,7 @@ class StudyUApiClient extends SupabaseClientDependant
   }
 
   _testDelay() async {
-    await Future.delayed(
-        Duration(milliseconds: testDelayMilliseconds), () => null);
+    await Future.delayed(Duration(milliseconds: testDelayMilliseconds), () => null);
   }
 }
 

From 1c2849715a6357d9a1906098ba102e6c188c0683 Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahim.ozkn@outlook.com>
Date: Sun, 2 Jun 2024 10:40:09 +0200
Subject: [PATCH 083/314] perf: added comments to the getUserStudies function

---
 designer_v2/lib/repositories/api_client.dart | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/designer_v2/lib/repositories/api_client.dart b/designer_v2/lib/repositories/api_client.dart
index 2e0299cb1..761db13c0 100644
--- a/designer_v2/lib/repositories/api_client.dart
+++ b/designer_v2/lib/repositories/api_client.dart
@@ -126,6 +126,13 @@ class StudyUApiClient extends SupabaseClientDependant
   }
    */
 
+  /// This function fetches all studies for the current user.
+  /// [withParticipantActivity] includes additional participant activity with all columns of Study table => [studyWithParticipantActivityColumns]
+  /// [forDashboardDisplay] includes only columns required for the Dashboard page display => [studyDisplayColumns]
+  /// otherwise, all columns are fetched => [studyColumns]
+  ///
+  ///
+  /// @return List<Study>
   @override
   Future<List<Study>> getUserStudies(
       {withParticipantActivity = false, forDashboardDisplay = true}) async {

From fd3aa852afd729ee7c155d20e10d96cd25abbf0e Mon Sep 17 00:00:00 2001
From: ahmed10 <ahmed10@uni-potsdam.de>
Date: Thu, 6 Jun 2024 14:42:20 +0200
Subject: [PATCH 084/314] fix:monitoring sector twicks

---
 .../monitor/participant_details_view.dart     | 111 +++++++++++++++---
 .../features/monitor/study_monitor_table.dart |  49 ++++++--
 designer_v2/lib/localization/app_de.arb       |  13 ++
 designer_v2/lib/localization/app_en.arb       |  13 ++
 4 files changed, 161 insertions(+), 25 deletions(-)

diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index 1c6911f79..b230c6e15 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -1,11 +1,11 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
-import 'package:reactive_forms/reactive_forms.dart';
+import 'package:intl/intl.dart';
 import 'package:studyu_core/core.dart';
-import 'package:studyu_designer_v2/common_views/form_table_layout.dart';
 import 'package:studyu_designer_v2/domain/study_monitoring.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 
+
 class ParticipantDetailsView extends StatelessWidget {
   const ParticipantDetailsView(
       {required this.monitorItem, required this.interventions, required this.observations, super.key});
@@ -17,26 +17,54 @@ class ParticipantDetailsView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        FormTableLayout(rows: [
-          FormTableRow(
-            label: tr.monitoring_table_column_participant_id,
-            labelStyle: const TextStyle(fontWeight: FontWeight.bold),
-            input: ReactiveTextField(
-              formControl: FormControl<String>(value: monitorItem.participantId),
-              readOnly: true,
-            ),
-          ),
-        ]),
-        const SizedBox(height: 16.0),
-        Align(
-          alignment: Alignment.centerLeft,
-          child: FormSectionHeader(
-            title: tr.participant_details_study_days_overview,
-          ),
+        Text(
+          tr.participant_details_study_days_overview,
+          style: Theme.of(context).textTheme.titleLarge,
         ),
         const SizedBox(height: 8.0),
+        _buildParticipantInfo(context),
+        const SizedBox(height: 8.0),
+        const Divider(),
+        Text(
+          tr.participant_details_study_days_description,
+          style: const TextStyle(fontSize: 16.0, color: Colors.black54),
+        ),
+        const SizedBox(height: 16.0),
         _buildPerDayStatus(context),
+        const SizedBox(height: 16.0),
+        _buildColorLegend(),
+      ],
+    );
+  }
+
+  Widget _buildParticipantInfo(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        _buildInfoRow(tr.monitoring_table_column_participant_id, monitorItem.participantId),
+        _buildInfoRow(tr.monitoring_table_column_invite_code, monitorItem.inviteCode ?? '-'),
+        _buildInfoRow(
+          tr.monitoring_table_column_enrolled,
+         _formatTime(monitorItem.enrolledAt,true),
+        ),
+        _buildInfoRow(
+          tr.monitoring_table_column_last_activity,
+          _formatTime(monitorItem.enrolledAt,true),
+        ),
+      ],
+    );
+  }
+
+    Widget _buildInfoRow(String label, String value) {
+    return Row(
+      children: [
+        Text(
+          label + ': ',
+          style: const TextStyle(fontWeight: FontWeight.bold),
+        ),
+        Text(value),
       ],
     );
   }
@@ -89,4 +117,51 @@ class ParticipantDetailsView extends StatelessWidget {
     }
     return sb.toString();
   }
+
+  Widget _buildColorLegend() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          tr.participant_details_color_legend_title,
+          style: const TextStyle(fontWeight: FontWeight.bold),
+        ),
+        const SizedBox(height: 8.0),
+        Row(
+          children: [
+            _buildLegendItem(Colors.green, tr.participant_details_color_legend_completed),
+            const SizedBox(width: 16.0),
+            _buildLegendItem(Colors.orange, tr.participant_details_color_legend_partially_completed),
+            const SizedBox(width: 16.0),
+            _buildLegendItem(Colors.red, tr.participant_details_color_legend_missed),
+          ],
+        ),
+      ],
+    );
+  }
+
+  Widget _buildLegendItem(Color color, String text) {
+    return Row(
+      children: [
+        Container(
+          width: 20.0,
+          height: 20.0,
+          decoration: BoxDecoration(borderRadius: BorderRadius.circular(3), color: color,),
+        ),
+        const SizedBox(width: 8.0),
+        Text(text),
+      ],
+    );
+  }
+
+  String _formatTime(DateTime time, bool showTime) {
+    final localTime = time.toLocal();
+    final timeZoneOffsetInHours = localTime.timeZoneOffset.inHours;
+    final timeZoneString = timeZoneOffsetInHours >= 0 ? "GMT +$timeZoneOffsetInHours" : "GMT $timeZoneOffsetInHours";
+    final locale = tr.localeName == "de" ? "de_DE" : "en_US";
+    final formattedDate = DateFormat("MMM d, yyyy", locale);
+    if (!showTime) return formattedDate.format(localTime);
+    final formattedTime = DateFormat.jm(locale);
+    return "${formattedDate.format(localTime)}, ${formattedTime.format(localTime)} $timeZoneString";
+  }
 }
diff --git a/designer_v2/lib/features/monitor/study_monitor_table.dart b/designer_v2/lib/features/monitor/study_monitor_table.dart
index a5b8322d0..ad599fa04 100644
--- a/designer_v2/lib/features/monitor/study_monitor_table.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_table.dart
@@ -3,6 +3,7 @@ import 'package:intl/intl.dart';
 import 'package:studyu_designer_v2/common_views/standard_table.dart';
 import 'package:studyu_designer_v2/domain/study_monitoring.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
+import 'package:studyu_designer_v2/utils/extensions.dart';
 
 class StudyMonitorTable extends StatelessWidget {
   final List<StudyMonitorItem> studyMonitorItems;
@@ -22,18 +23,23 @@ class StudyMonitorTable extends StatelessWidget {
             label: tr.monitoring_table_column_invite_code,
             columnWidth: const MaxColumnWidth(FixedColumnWidth(200), FlexColumnWidth(1.6))),
         StandardTableColumn(
+            sortable: true,
             label: tr.monitoring_table_column_enrolled,
             columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth(1.6))),
         StandardTableColumn(
+            sortable: true,
             label: tr.monitoring_table_column_last_activity,
             columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth(1.6))),
         StandardTableColumn(
+            sortable: true,
             label: tr.monitoring_table_column_day_in_study,
             columnWidth: const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.6))),
         StandardTableColumn(
+            sortable: true,
             label: tr.monitoring_table_column_completed_interventions,
             columnWidth: const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.6))),
         StandardTableColumn(
+            sortable: true,
             label: tr.monitoring_table_column_completed_surveys,
             columnWidth: const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.6))),
       ],
@@ -55,14 +61,31 @@ class StudyMonitorTable extends StatelessWidget {
       Text(item.inviteCode ?? "-"),
       Tooltip(
         message: _formatTime(item.enrolledAt, true),
-        child: Text(_formatTime(item.enrolledAt, false)),
+        child: Text(item.enrolledAt.toTimeAgoString()),
       ),
       Tooltip(
-        message: _formatTime(item.lastActivityAt, true),
-        child: Text(_formatTime(item.lastActivityAt, false)),
+      message: _formatTime(item.lastActivityAt, true),
+      child: Row(
+        children: [
+          Flexible(child: Text(item.lastActivityAt.toTimeAgoString())),
+          if (item.droppedOut) 
+             Row(
+              children: [
+                const SizedBox(width: 5.0),
+                Tooltip(
+                  message: tr.monitoring_table_row_tooltip_dropout,
+                  child: const Icon(Icons.close, color: Colors.red, size: 16.0),
+                ),
+              ],
+            ),
+        ],
       ),
+    ),
       _buildProgressCell(context, item.currentDayOfStudy, item.studyDurationInDays),
-      _buildProgressCell(context, item.completedInterventions, item.completedInterventions + item.missedInterventions),
+      _buildProgressCell(context, item.completedInterventions, item.completedInterventions + item.missedInterventions,tooltipMessage: tr.monitoring_table_completed_interventions_tooltip(
+          item.completedInterventions,
+          item.completedInterventions + item.missedInterventions,
+        )),
       _buildProgressCell(context, item.completedSurveys, item.completedSurveys + item.missedSurveys),
     ];
   }
@@ -78,7 +101,7 @@ class StudyMonitorTable extends StatelessWidget {
     return "${formattedDate.format(localTime)}, ${formattedTime.format(localTime)} $timeZoneString";
   }
 
-  Widget _buildProgressCell(BuildContext context, int progress, int total) {
+  Widget _buildProgressCell(BuildContext context, int progress, int total, {String tooltipMessage = ''} ) {
     final theme = Theme.of(context);
     return Stack(
       children: [
@@ -91,8 +114,20 @@ class StudyMonitorTable extends StatelessWidget {
         ),
         Align(
           alignment: Alignment.center,
-          child: Text("$progress/$total",
-              style: TextStyle(color: theme.colorScheme.onPrimary, fontWeight: FontWeight.bold)),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Text("$progress/$total",
+                  style: TextStyle(color: theme.colorScheme.onPrimary, fontWeight: FontWeight.bold)),
+              const SizedBox(width: 4.0),
+              if (tooltipMessage.isNotEmpty)
+                Tooltip(
+                  message: tooltipMessage,
+                  child: const Icon(Icons.info_outline, color: Colors.white, size: 16.0),
+                ),
+            ],
+          ),
+          
         ),
       ],
     );
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index 0cf7622b3..928c44817 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -486,6 +486,11 @@
   "@__________________STUDYPAGE_MONITOR__________________": {},
   "participant_details_title": "Teilnehmerdetails",
   "participant_details_study_days_overview": "Übersicht über Studientage",
+  "participant_details_study_days_description": "Dieser Abschnitt bietet einen Überblick über die Studientage des Teilnehmers.",
+  "participant_details_color_legend_title": "Farblegende:",
+  "participant_details_color_legend_completed": "Abgeschlossen",
+  "participant_details_color_legend_partially_completed": "Teilweise Abgeschlossen",
+  "participant_details_color_legend_missed": "Verpasst",
   "monitoring_no_participants_title": "Es gibt noch keine Teilnehmer in dieser Studie",
   "monitoring_no_participants_description": "Sobald Teilnehmer in Ihrer Studie eingeschrieben sind, können Sie hier deren Fortschritt überwachen und ihre Daten einsehen.",
   "monitoring_participants_title": "Teilnehmer",
@@ -502,6 +507,14 @@
   "monitoring_table_column_day_in_study": "Studientag",
   "monitoring_table_column_completed_interventions": "Abgeschlossene\nInterventionen",
   "monitoring_table_column_completed_surveys": "Abgeschlossene\nFragebögen",
+  "monitoring_table_row_tooltip_dropout": "Dieser Teilnehmer ist ausgeschieden und es wird keine neue Aktivität hinzugefügt",
+  "monitoring_table_completed_interventions_tooltip": "{progress} von {total} Interventionen abgeschlossen",
+  "@monitoring_table_completed_interventions_tooltip": {
+    "placeholders":{
+      "progress":{},
+      "total":{}
+    }
+  },
   "@__________________STUDYPAGE_ANALYZE__________________": {},
   "banner_text_study_analyze_draft": "Solange die Studie noch nicht live ist, basieren die Ergebnisse hier auf dem letzten Testlauf der Studie (siehe Testmodus).\nDie Ergebnisdaten werden automatisch zurückgesetzt sobald die Studie mit echten Teilnehmern startet.",
   "action_button_study_export": "Daten exportieren",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index 1b56ecf24..ece6573e1 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -533,6 +533,11 @@
   "@__________________STUDYPAGE_MONITOR__________________": {},
   "participant_details_title": "Participant Details",
   "participant_details_study_days_overview": "Study days overview",
+  "participant_details_study_days_description": "This section provides an overview of the participant's study days.",
+  "participant_details_color_legend_title": "Color Legend:",
+  "participant_details_color_legend_completed": "Completed",
+  "participant_details_color_legend_partially_completed": "Partially Completed",
+  "participant_details_color_legend_missed": "Missed",
   "monitoring_no_participants_title": "There are no participants in this study yet",
   "monitoring_no_participants_description": "Once participants have enrolled in your study, you can monitor their progress and view their data here.",
   "monitoring_participants_title": "Participants",
@@ -549,6 +554,14 @@
   "monitoring_table_column_day_in_study": "Day in Study",
   "monitoring_table_column_completed_interventions": "Completed\nInterventions",
   "monitoring_table_column_completed_surveys": "Completed\nSurveys",
+  "monitoring_table_row_tooltip_dropout": "This participant has dropped out and no new activity will be added",
+  "monitoring_table_completed_interventions_tooltip": "{progress} out of {total} interventions completed",
+  "@monitoring_table_completed_interventions_tooltip": {
+    "placeholders":{
+      "progress":{},
+      "total":{}
+    }
+  },
   "@__________________STUDYPAGE_ANALYZE__________________": {},
   "banner_text_study_analyze_draft": "Because this study has not been launched yet, this page is currently based on the data generated during study testing (only the latest test session).\nThe data on this page will be reset once you launch the study with real participants.",
   "action_button_study_export": "Export data",

From ecc3999c037c9c60c46d38bdeff7572eaabdf1b2 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 6 Jun 2024 15:37:12 +0200
Subject: [PATCH 085/314] fix: sort function

---
 .../lib/common_views/standard_table.dart      |  30 +-----
 .../monitor/participant_details_view.dart     |  12 ++-
 .../features/monitor/study_monitor_table.dart | 100 +++++++++++-------
 3 files changed, 70 insertions(+), 72 deletions(-)

diff --git a/designer_v2/lib/common_views/standard_table.dart b/designer_v2/lib/common_views/standard_table.dart
index 9285867d7..1acbe5a66 100644
--- a/designer_v2/lib/common_views/standard_table.dart
+++ b/designer_v2/lib/common_views/standard_table.dart
@@ -42,7 +42,6 @@ class StandardTable<T> extends StatefulWidget {
     required List<StandardTableColumn>? columns,
     required this.onSelectItem,
     required this.buildCellsAt,
-    this.pinnedPredicates,
     this.sortColumnPredicates,
     this.trailingActionsAt,
     StandardTableColumn? trailingActionsColumn,
@@ -88,7 +87,6 @@ class StandardTable<T> extends StatefulWidget {
 
   final StandardTableCellsBuilder<T> buildCellsAt;
   final List<int Function(T a, T b)?>? sortColumnPredicates;
-  final int Function(T a, T b)? pinnedPredicates;
   final StandardTableRowBuilder? headerRowBuilder;
   final StandardTableRowBuilder? dataRowBuilder;
   late final StandardTableColumn inputTrailingActionsColumn;
@@ -229,40 +227,20 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
       widget.items.sort((a, b) {
         return _sortLogic(a, b, columnIndex: columnIndex, sortAscending: sortAscending);
       });
-      _sortPinnedStudies(widget.items, columnIndex: columnIndex, sortAscending: sortAscending);
     } else {
       widget.items.clear();
       widget.items.addAll(sortDefaultOrder!);
-      _sortPinnedStudies(widget.items, columnIndex: columnIndex);
     }
     _cachedRows.clear();
   }
 
-  void _sortPinnedStudies(List<T> items, {required int columnIndex, bool? sortAscending}) {
-    // Extract and insert pinned items at the top
-    if (widget.pinnedPredicates != null) {
-      items.sort((a, b) {
-        int ret = widget.pinnedPredicates!(a, b);
-        // Fallback to default sorting algorithm
-        return ret == 0 ? _sortLogic(a, b, columnIndex: columnIndex, sortAscending: sortAscending) : ret;
-      });
-    }
-  }
-
-  int _sortLogic(T a, T b, {required int columnIndex, required bool? sortAscending, bool? useSortPredicate}) {
+  int _sortLogic(T a, T b, {required int columnIndex, required bool? sortAscending}) {
     final sortPredicate = widget.sortColumnPredicates;
-    if (useSortPredicate != null && useSortPredicate && sortPredicate != null && sortPredicate[columnIndex] != null) {
-      final int res;
+    if (sortPredicate != null && sortPredicate[columnIndex] != null) {
       if (sortAscending ?? true) {
-        res = sortPredicate[columnIndex]!(a, b);
-      } else {
-        res = sortPredicate[columnIndex]!(b, a);
-      }
-      if (res == 0) {
-        // Fallback to default sorting algorithm
-        return _sortLogic(a, b, columnIndex: columnIndex, sortAscending: sortAscending, useSortPredicate: false);
+        return sortPredicate[columnIndex]!(a, b);
       }
-      return res;
+      return sortPredicate[columnIndex]!(b, a);
     } else if (a is Comparable && b is Comparable) {
       // If sortPredicate is not provided, use default comparison logic
       return sortAscending ?? true ? Comparable.compare(a, b) : Comparable.compare(b, a);
diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index b230c6e15..2cc9c8478 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -5,7 +5,6 @@ import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study_monitoring.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 
-
 class ParticipantDetailsView extends StatelessWidget {
   const ParticipantDetailsView(
       {required this.monitorItem, required this.interventions, required this.observations, super.key});
@@ -47,17 +46,17 @@ class ParticipantDetailsView extends StatelessWidget {
         _buildInfoRow(tr.monitoring_table_column_invite_code, monitorItem.inviteCode ?? '-'),
         _buildInfoRow(
           tr.monitoring_table_column_enrolled,
-         _formatTime(monitorItem.enrolledAt,true),
+          _formatTime(monitorItem.enrolledAt, true),
         ),
         _buildInfoRow(
           tr.monitoring_table_column_last_activity,
-          _formatTime(monitorItem.enrolledAt,true),
+          _formatTime(monitorItem.enrolledAt, true),
         ),
       ],
     );
   }
 
-    Widget _buildInfoRow(String label, String value) {
+  Widget _buildInfoRow(String label, String value) {
     return Row(
       children: [
         Text(
@@ -146,7 +145,10 @@ class ParticipantDetailsView extends StatelessWidget {
         Container(
           width: 20.0,
           height: 20.0,
-          decoration: BoxDecoration(borderRadius: BorderRadius.circular(3), color: color,),
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(3),
+            color: color,
+          ),
         ),
         const SizedBox(width: 8.0),
         Text(text),
diff --git a/designer_v2/lib/features/monitor/study_monitor_table.dart b/designer_v2/lib/features/monitor/study_monitor_table.dart
index ad599fa04..d55073d8c 100644
--- a/designer_v2/lib/features/monitor/study_monitor_table.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_table.dart
@@ -15,33 +15,51 @@ class StudyMonitorTable extends StatelessWidget {
   Widget build(BuildContext context) {
     return StandardTable<StudyMonitorItem>(
       items: studyMonitorItems,
+      sortColumnPredicates: [
+        (a, b) => a.participantId.compareTo(b.participantId),
+        (a, b) => a.inviteCode != null ? a.inviteCode!.compareTo(b.inviteCode!) : 0,
+        (a, b) => a.enrolledAt.compareTo(b.enrolledAt),
+        (a, b) => a.lastActivityAt.compareTo(b.lastActivityAt),
+        (a, b) => a.currentDayOfStudy.compareTo(b.currentDayOfStudy),
+        (a, b) => a.completedInterventions.compareTo(b.completedInterventions),
+        (a, b) => a.completedSurveys.compareTo(b.completedSurveys),
+      ],
       columns: [
         StandardTableColumn(
-            label: tr.monitoring_table_column_participant_id,
-            columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth(1.6))),
+          sortable: true,
+          label: tr.monitoring_table_column_participant_id,
+          columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth(1.6)),
+        ),
         StandardTableColumn(
-            label: tr.monitoring_table_column_invite_code,
-            columnWidth: const MaxColumnWidth(FixedColumnWidth(200), FlexColumnWidth(1.6))),
+          sortable: true,
+          label: tr.monitoring_table_column_invite_code,
+          columnWidth: const MaxColumnWidth(FixedColumnWidth(200), FlexColumnWidth(1.6)),
+        ),
         StandardTableColumn(
-            sortable: true,
-            label: tr.monitoring_table_column_enrolled,
-            columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth(1.6))),
+          sortable: true,
+          label: tr.monitoring_table_column_enrolled,
+          columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth(1.6)),
+        ),
         StandardTableColumn(
-            sortable: true,
-            label: tr.monitoring_table_column_last_activity,
-            columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth(1.6))),
+          sortable: true,
+          label: tr.monitoring_table_column_last_activity,
+          columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth(1.6)),
+        ),
         StandardTableColumn(
-            sortable: true,
-            label: tr.monitoring_table_column_day_in_study,
-            columnWidth: const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.6))),
+          sortable: true,
+          label: tr.monitoring_table_column_day_in_study,
+          columnWidth: const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.6)),
+        ),
         StandardTableColumn(
-            sortable: true,
-            label: tr.monitoring_table_column_completed_interventions,
-            columnWidth: const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.6))),
+          sortable: true,
+          label: tr.monitoring_table_column_completed_interventions,
+          columnWidth: const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.6)),
+        ),
         StandardTableColumn(
-            sortable: true,
-            label: tr.monitoring_table_column_completed_surveys,
-            columnWidth: const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.6))),
+          sortable: true,
+          label: tr.monitoring_table_column_completed_surveys,
+          columnWidth: const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.6)),
+        ),
       ],
       buildCellsAt: _buildRow,
       cellSpacing: 10.0,
@@ -64,28 +82,29 @@ class StudyMonitorTable extends StatelessWidget {
         child: Text(item.enrolledAt.toTimeAgoString()),
       ),
       Tooltip(
-      message: _formatTime(item.lastActivityAt, true),
-      child: Row(
-        children: [
-          Flexible(child: Text(item.lastActivityAt.toTimeAgoString())),
-          if (item.droppedOut) 
-             Row(
-              children: [
-                const SizedBox(width: 5.0),
-                Tooltip(
-                  message: tr.monitoring_table_row_tooltip_dropout,
-                  child: const Icon(Icons.close, color: Colors.red, size: 16.0),
-                ),
-              ],
-            ),
-        ],
+        message: _formatTime(item.lastActivityAt, true),
+        child: Row(
+          children: [
+            Flexible(child: Text(item.lastActivityAt.toTimeAgoString())),
+            if (item.droppedOut)
+              Row(
+                children: [
+                  const SizedBox(width: 5.0),
+                  Tooltip(
+                    message: tr.monitoring_table_row_tooltip_dropout,
+                    child: const Icon(Icons.close, color: Colors.red, size: 16.0),
+                  ),
+                ],
+              ),
+          ],
+        ),
       ),
-    ),
       _buildProgressCell(context, item.currentDayOfStudy, item.studyDurationInDays),
-      _buildProgressCell(context, item.completedInterventions, item.completedInterventions + item.missedInterventions,tooltipMessage: tr.monitoring_table_completed_interventions_tooltip(
-          item.completedInterventions,
-          item.completedInterventions + item.missedInterventions,
-        )),
+      _buildProgressCell(context, item.completedInterventions, item.completedInterventions + item.missedInterventions,
+          tooltipMessage: tr.monitoring_table_completed_interventions_tooltip(
+            item.completedInterventions,
+            item.completedInterventions + item.missedInterventions,
+          )),
       _buildProgressCell(context, item.completedSurveys, item.completedSurveys + item.missedSurveys),
     ];
   }
@@ -101,7 +120,7 @@ class StudyMonitorTable extends StatelessWidget {
     return "${formattedDate.format(localTime)}, ${formattedTime.format(localTime)} $timeZoneString";
   }
 
-  Widget _buildProgressCell(BuildContext context, int progress, int total, {String tooltipMessage = ''} ) {
+  Widget _buildProgressCell(BuildContext context, int progress, int total, {String tooltipMessage = ''}) {
     final theme = Theme.of(context);
     return Stack(
       children: [
@@ -127,7 +146,6 @@ class StudyMonitorTable extends StatelessWidget {
                 ),
             ],
           ),
-          
         ),
       ],
     );

From 2efc8e154b20d6ac487e3f6bbf8a4aef1b077d4c Mon Sep 17 00:00:00 2001
From: ahmed10 <ahmed10@uni-potsdam.de>
Date: Fri, 7 Jun 2024 01:15:30 +0200
Subject: [PATCH 086/314] fix:intervention completed tooltip

---
 .../features/monitor/study_monitor_table.dart | 24 ++++---------------
 designer_v2/lib/localization/app_de.arb       |  8 +------
 designer_v2/lib/localization/app_en.arb       |  8 +------
 3 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/designer_v2/lib/features/monitor/study_monitor_table.dart b/designer_v2/lib/features/monitor/study_monitor_table.dart
index d55073d8c..d5999bf62 100644
--- a/designer_v2/lib/features/monitor/study_monitor_table.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_table.dart
@@ -53,6 +53,7 @@ class StudyMonitorTable extends StatelessWidget {
         StandardTableColumn(
           sortable: true,
           label: tr.monitoring_table_column_completed_interventions,
+          tooltip: tr.monitoring_table_completed_interventions_header_tooltip,
           columnWidth: const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.6)),
         ),
         StandardTableColumn(
@@ -100,11 +101,7 @@ class StudyMonitorTable extends StatelessWidget {
         ),
       ),
       _buildProgressCell(context, item.currentDayOfStudy, item.studyDurationInDays),
-      _buildProgressCell(context, item.completedInterventions, item.completedInterventions + item.missedInterventions,
-          tooltipMessage: tr.monitoring_table_completed_interventions_tooltip(
-            item.completedInterventions,
-            item.completedInterventions + item.missedInterventions,
-          )),
+      _buildProgressCell(context, item.completedInterventions, item.completedInterventions + item.missedInterventions),
       _buildProgressCell(context, item.completedSurveys, item.completedSurveys + item.missedSurveys),
     ];
   }
@@ -120,7 +117,7 @@ class StudyMonitorTable extends StatelessWidget {
     return "${formattedDate.format(localTime)}, ${formattedTime.format(localTime)} $timeZoneString";
   }
 
-  Widget _buildProgressCell(BuildContext context, int progress, int total, {String tooltipMessage = ''}) {
+  Widget _buildProgressCell(BuildContext context, int progress, int total) {
     final theme = Theme.of(context);
     return Stack(
       children: [
@@ -133,19 +130,8 @@ class StudyMonitorTable extends StatelessWidget {
         ),
         Align(
           alignment: Alignment.center,
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Text("$progress/$total",
-                  style: TextStyle(color: theme.colorScheme.onPrimary, fontWeight: FontWeight.bold)),
-              const SizedBox(width: 4.0),
-              if (tooltipMessage.isNotEmpty)
-                Tooltip(
-                  message: tooltipMessage,
-                  child: const Icon(Icons.info_outline, color: Colors.white, size: 16.0),
-                ),
-            ],
-          ),
+          child: Text("$progress/$total",
+              style: TextStyle(color: theme.colorScheme.onPrimary, fontWeight: FontWeight.bold)),
         ),
       ],
     );
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index 928c44817..3d3480888 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -508,13 +508,7 @@
   "monitoring_table_column_completed_interventions": "Abgeschlossene\nInterventionen",
   "monitoring_table_column_completed_surveys": "Abgeschlossene\nFragebögen",
   "monitoring_table_row_tooltip_dropout": "Dieser Teilnehmer ist ausgeschieden und es wird keine neue Aktivität hinzugefügt",
-  "monitoring_table_completed_interventions_tooltip": "{progress} von {total} Interventionen abgeschlossen",
-  "@monitoring_table_completed_interventions_tooltip": {
-    "placeholders":{
-      "progress":{},
-      "total":{}
-    }
-  },
+   "monitoring_table_completed_interventions_header_tooltip": "Der Eingriff ist erst abgeschlossen, wenn alle Aufgaben erledigt sind",
   "@__________________STUDYPAGE_ANALYZE__________________": {},
   "banner_text_study_analyze_draft": "Solange die Studie noch nicht live ist, basieren die Ergebnisse hier auf dem letzten Testlauf der Studie (siehe Testmodus).\nDie Ergebnisdaten werden automatisch zurückgesetzt sobald die Studie mit echten Teilnehmern startet.",
   "action_button_study_export": "Daten exportieren",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index ece6573e1..c56a200c5 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -555,13 +555,7 @@
   "monitoring_table_column_completed_interventions": "Completed\nInterventions",
   "monitoring_table_column_completed_surveys": "Completed\nSurveys",
   "monitoring_table_row_tooltip_dropout": "This participant has dropped out and no new activity will be added",
-  "monitoring_table_completed_interventions_tooltip": "{progress} out of {total} interventions completed",
-  "@monitoring_table_completed_interventions_tooltip": {
-    "placeholders":{
-      "progress":{},
-      "total":{}
-    }
-  },
+  "monitoring_table_completed_interventions_header_tooltip": "Intervention is only completed, if all tasks have been completed",
   "@__________________STUDYPAGE_ANALYZE__________________": {},
   "banner_text_study_analyze_draft": "Because this study has not been launched yet, this page is currently based on the data generated during study testing (only the latest test session).\nThe data on this page will be reset once you launch the study with real participants.",
   "action_button_study_export": "Export data",

From 94b73fbb6511e883586aede2bb794866fea84e2d Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Fri, 7 Jun 2024 14:11:39 +0200
Subject: [PATCH 087/314] fix:dropout logic changed to 7 dayes unactive

---
 designer_v2/lib/domain/study_monitoring.dart | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/designer_v2/lib/domain/study_monitoring.dart b/designer_v2/lib/domain/study_monitoring.dart
index 27a7d25fa..3937263a7 100644
--- a/designer_v2/lib/domain/study_monitoring.dart
+++ b/designer_v2/lib/domain/study_monitoring.dart
@@ -144,10 +144,15 @@ extension StudyMonitoringX on Study {
       ));
     }
 
-    final activeParticipants =
-        items.where((item) => !item.droppedOut && item.currentDayOfStudy < item.studyDurationInDays).length;
-    final dropoutParticipants =
-        items.where((item) => item.droppedOut && item.currentDayOfStudy < item.studyDurationInDays).length;
+    final now = DateTime.now();
+    final sevenDaysAgo = now.subtract(const Duration(days: 7)); //dropout time
+
+    final activeParticipants = items.where((item) {
+      return !item.droppedOut && item.currentDayOfStudy < item.studyDurationInDays && item.lastActivityAt.isAfter(sevenDaysAgo);
+    }).length;
+    final dropoutParticipants = items.where((item) {
+      return item.droppedOut && item.lastActivityAt.isBefore(sevenDaysAgo);
+    }).length;
     final completedParticipants = items.where((item) => item.currentDayOfStudy >= item.studyDurationInDays).length;
 
     assert(activeParticipants + dropoutParticipants + completedParticipants == items.length);

From 357b4f1d44debd08da738019dc3f55551790b08d Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Sun, 9 Jun 2024 12:12:21 +0200
Subject: [PATCH 088/314] fix: string interpolation

---
 designer_v2/lib/features/monitor/participant_details_view.dart | 2 +-
 designer_v2/pubspec.yaml                                       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index 2cc9c8478..91a537e29 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -60,7 +60,7 @@ class ParticipantDetailsView extends StatelessWidget {
     return Row(
       children: [
         Text(
-          label + ': ',
+          '$label: ',
           style: const TextStyle(fontWeight: FontWeight.bold),
         ),
         Text(value),
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 2baa8012b..53cef975d 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -25,6 +25,7 @@ dependencies:
   flutter_web_plugins:
     sdk: flutter
   go_router: ^14.1.0
+  intl: ^0.18.1
   material_color_utilities:
   material_design_icons_flutter: ^7.0.7296
   pointer_interceptor: ^0.10.1+1

From 911084edd53d269cf61a3fe51c8805e697c529ca Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Sun, 9 Jun 2024 12:16:44 +0200
Subject: [PATCH 089/314] fix: removed doc folder

---
 docs/README.md                                |    28 -
 docs/database/README.md                       |   295 -
 docs/database/auth.audit_log_entries.md       |    35 -
 docs/database/auth.audit_log_entries.svg      |    35 -
 docs/database/auth.instances.md               |    35 -
 docs/database/auth.instances.svg              |    38 -
 docs/database/auth.refresh_tokens.md          |    40 -
 docs/database/auth.refresh_tokens.svg         |    44 -
 docs/database/auth.schema_migrations.md       |    31 -
 docs/database/auth.schema_migrations.svg      |    26 -
 docs/database/auth.users.md                   |    61 -
 docs/database/auth.users.svg                  |   157 -
 .../database/extensions.pg_stat_statements.md |   117 -
 .../extensions.pg_stat_statements.svg         |   152 -
 .../extensions.pg_stat_statements_info.md     |    35 -
 .../extensions.pg_stat_statements_info.svg    |    29 -
 docs/database/net._http_response.md           |    30 -
 docs/database/net._http_response.svg          |    47 -
 docs/database/net.http_request_queue.md       |    22 -
 docs/database/net.http_request_queue.svg      |    41 -
 docs/database/pgsodium.decrypted_key.md       |    66 -
 docs/database/pgsodium.decrypted_key.svg      |    65 -
 docs/database/pgsodium.key.md                 |    58 -
 docs/database/pgsodium.key.svg                |   112 -
 docs/database/pgsodium.mask_columns.md        |    49 -
 docs/database/pgsodium.mask_columns.svg       |    44 -
 docs/database/pgsodium.masking_rule.md        |    85 -
 docs/database/pgsodium.masking_rule.svg       |    65 -
 docs/database/pgsodium.valid_key.md           |    54 -
 docs/database/pgsodium.valid_key.svg          |    50 -
 docs/database/public.app_config.md            |    39 -
 docs/database/public.app_config.svg           |    50 -
 docs/database/public.repo.md                  |    36 -
 docs/database/public.repo.svg                 |   139 -
 docs/database/public.study.md                 |    58 -
 docs/database/public.study.svg                |   201 -
 docs/database/public.study_invite.md          |    34 -
 docs/database/public.study_invite.svg         |   148 -
 docs/database/public.study_progress_export.md |    53 -
 .../database/public.study_progress_export.svg |    53 -
 docs/database/public.study_subject.md         |    38 -
 docs/database/public.study_subject.svg        |   207 -
 docs/database/public.study_tag.md             |    32 -
 docs/database/public.study_tag.svg            |   130 -
 docs/database/public.subject_progress.md      |    35 -
 docs/database/public.subject_progress.svg     |    78 -
 docs/database/public.tag.md                   |    32 -
 docs/database/public.tag.svg                  |    51 -
 docs/database/public.user.md                  |    33 -
 docs/database/public.user.svg                 |   176 -
 docs/database/schema.json                     |     1 -
 docs/database/schema.svg                      |  1142 --
 docs/database/storage.buckets.md              |    35 -
 docs/database/storage.buckets.svg             |   157 -
 docs/database/storage.migrations.md           |    34 -
 docs/database/storage.migrations.svg          |    35 -
 docs/database/storage.objects.md              |    40 -
 docs/database/storage.objects.svg             |   157 -
 docs/database/supabase_functions.hooks.md     |    37 -
 docs/database/supabase_functions.hooks.svg    |    38 -
 .../database/supabase_functions.migrations.md |    30 -
 .../supabase_functions.migrations.svg         |    29 -
 docs/database/vault.decrypted_secrets.md      |    56 -
 docs/database/vault.decrypted_secrets.svg     |    50 -
 docs/database/vault.secrets.md                |    46 -
 docs/database/vault.secrets.svg               |   105 -
 docs/uml/app/lib/models/uml.svg               |    14 -
 .../app/lib/screens/app_onboarding/uml.svg    |   339 -
 .../study/dashboard/contact_tab/uml.svg       |   309 -
 .../study/dashboard/task_overview_tab/uml.svg |   224 -
 .../app/lib/screens/study/dashboard/uml.svg   |   732 -
 .../app/lib/screens/study/multimodal/uml.svg  |    39 -
 .../app/lib/screens/study/onboarding/uml.svg  |   721 -
 .../screens/study/report/performance/uml.svg  |   291 -
 .../lib/screens/study/report/sections/uml.svg |   184 -
 docs/uml/app/lib/screens/study/report/uml.svg |   865 -
 .../app/lib/screens/study/report/util/uml.svg |   128 -
 .../screens/study/tasks/intervention/uml.svg  |    72 -
 .../screens/study/tasks/observation/uml.svg   |    72 -
 docs/uml/app/lib/screens/study/tasks/uml.svg  |   168 -
 docs/uml/app/lib/screens/study/uml.svg        |  2368 ---
 docs/uml/app/lib/screens/uml.svg              |  2660 ---
 docs/uml/app/lib/uml.svg                      |  4249 ----
 docs/uml/app/lib/util/uml.svg                 |   448 -
 .../widgets/questionnaire/questions/uml.svg   |   363 -
 .../uml/app/lib/widgets/questionnaire/uml.svg |   773 -
 docs/uml/app/lib/widgets/uml.svg              |  1172 --
 docs/uml/core/lib/src/env/uml.svg             |    14 -
 docs/uml/core/lib/src/models/consent/uml.svg  |    54 -
 docs/uml/core/lib/src/models/data/uml.svg     |    52 -
 .../core/lib/src/models/eligibility/uml.svg   |    12 -
 .../lib/src/models/expressions/types/uml.svg  |    12 -
 .../core/lib/src/models/expressions/uml.svg   |    12 -
 .../src/models/interventions/tasks/uml.svg    |    12 -
 .../core/lib/src/models/interventions/uml.svg |    12 -
 .../lib/src/models/observations/tasks/uml.svg |    12 -
 .../core/lib/src/models/observations/uml.svg  |    12 -
 .../models/questionnaire/questions/uml.svg    |    12 -
 .../core/lib/src/models/questionnaire/uml.svg |    12 -
 .../lib/src/models/report/sections/uml.svg    |   200 -
 docs/uml/core/lib/src/models/report/uml.svg   |   306 -
 docs/uml/core/lib/src/models/results/uml.svg  |    12 -
 .../src/models/study_results/results/uml.svg  |   123 -
 .../core/lib/src/models/study_results/uml.svg |   156 -
 .../lib/src/models/study_schedule/uml.svg     |    12 -
 docs/uml/core/lib/src/models/tables/uml.svg   |    12 -
 docs/uml/core/lib/src/models/tasks/uml.svg    |    12 -
 docs/uml/core/lib/src/models/uml.svg          |    12 -
 docs/uml/core/lib/src/uml.svg                 |    12 -
 docs/uml/core/lib/src/util/multimodal/uml.svg |    50 -
 docs/uml/core/lib/src/util/uml.svg            |    12 -
 docs/uml/core/lib/uml.svg                     |    12 -
 .../lib/common_views/pages/uml.svg            |    84 -
 .../lib/common_views/sidesheet/uml.svg        |   203 -
 docs/uml/designer_v2/lib/common_views/uml.svg |  3244 ---
 docs/uml/designer_v2/lib/domain/uml.svg       |   322 -
 .../designer_v2/lib/features/account/uml.svg  |    52 -
 .../designer_v2/lib/features/analyze/uml.svg  |    92 -
 .../uml/designer_v2/lib/features/auth/uml.svg |   650 -
 .../lib/features/dashboard/uml.svg            |   648 -
 .../lib/features/design/enrollment/uml.svg    |   820 -
 .../lib/features/design/info/uml.svg          |   319 -
 .../lib/features/design/interventions/uml.svg |  1004 -
 .../design/measurements/survey/uml.svg        |   398 -
 .../lib/features/design/measurements/uml.svg  |   645 -
 .../design/reports/section/types/uml.svg      |   446 -
 .../features/design/reports/section/uml.svg   |   705 -
 .../lib/features/design/reports/uml.svg       |  1170 --
 .../questionnaire/question/types/uml.svg      |   272 -
 .../shared/questionnaire/question/uml.svg     |  1066 -
 .../design/shared/questionnaire/uml.svg       |  1218 --
 .../features/design/shared/schedule/uml.svg   |   236 -
 .../lib/features/design/shared/uml.svg        |  1418 --
 .../designer_v2/lib/features/design/uml.svg   |  4822 -----
 .../designer_v2/lib/features/forms/uml.svg    |   937 -
 .../designer_v2/lib/features/monitor/uml.svg  |   172 -
 .../designer_v2/lib/features/publish/uml.svg  |   106 -
 .../designer_v2/lib/features/recruit/uml.svg  |   498 -
 .../lib/features/study/settings/uml.svg       |   185 -
 .../designer_v2/lib/features/study/uml.svg    |  1411 --
 docs/uml/designer_v2/lib/features/uml.svg     |  8943 ---------
 .../lib/localization/platform_locale/uml.svg  |    95 -
 docs/uml/designer_v2/lib/localization/uml.svg |   234 -
 docs/uml/designer_v2/lib/repositories/uml.svg |  1725 --
 docs/uml/designer_v2/lib/routing/uml.svg      |   680 -
 docs/uml/designer_v2/lib/services/uml.svg     |   518 -
 docs/uml/designer_v2/lib/uml.svg              | 16439 ----------------
 docs/uml/designer_v2/lib/utils/uml.svg        |  1035 -
 docs/uml/flutter_common/lib/src/uml.svg       |   273 -
 docs/uml/flutter_common/lib/src/utils/uml.svg |   273 -
 docs/uml/flutter_common/lib/uml.svg           |   273 -
 151 files changed, 76542 deletions(-)
 delete mode 100644 docs/README.md
 delete mode 100644 docs/database/README.md
 delete mode 100644 docs/database/auth.audit_log_entries.md
 delete mode 100644 docs/database/auth.audit_log_entries.svg
 delete mode 100644 docs/database/auth.instances.md
 delete mode 100644 docs/database/auth.instances.svg
 delete mode 100644 docs/database/auth.refresh_tokens.md
 delete mode 100644 docs/database/auth.refresh_tokens.svg
 delete mode 100644 docs/database/auth.schema_migrations.md
 delete mode 100644 docs/database/auth.schema_migrations.svg
 delete mode 100644 docs/database/auth.users.md
 delete mode 100644 docs/database/auth.users.svg
 delete mode 100644 docs/database/extensions.pg_stat_statements.md
 delete mode 100644 docs/database/extensions.pg_stat_statements.svg
 delete mode 100644 docs/database/extensions.pg_stat_statements_info.md
 delete mode 100644 docs/database/extensions.pg_stat_statements_info.svg
 delete mode 100644 docs/database/net._http_response.md
 delete mode 100644 docs/database/net._http_response.svg
 delete mode 100644 docs/database/net.http_request_queue.md
 delete mode 100644 docs/database/net.http_request_queue.svg
 delete mode 100644 docs/database/pgsodium.decrypted_key.md
 delete mode 100644 docs/database/pgsodium.decrypted_key.svg
 delete mode 100644 docs/database/pgsodium.key.md
 delete mode 100644 docs/database/pgsodium.key.svg
 delete mode 100644 docs/database/pgsodium.mask_columns.md
 delete mode 100644 docs/database/pgsodium.mask_columns.svg
 delete mode 100644 docs/database/pgsodium.masking_rule.md
 delete mode 100644 docs/database/pgsodium.masking_rule.svg
 delete mode 100644 docs/database/pgsodium.valid_key.md
 delete mode 100644 docs/database/pgsodium.valid_key.svg
 delete mode 100644 docs/database/public.app_config.md
 delete mode 100644 docs/database/public.app_config.svg
 delete mode 100644 docs/database/public.repo.md
 delete mode 100644 docs/database/public.repo.svg
 delete mode 100644 docs/database/public.study.md
 delete mode 100644 docs/database/public.study.svg
 delete mode 100644 docs/database/public.study_invite.md
 delete mode 100644 docs/database/public.study_invite.svg
 delete mode 100644 docs/database/public.study_progress_export.md
 delete mode 100644 docs/database/public.study_progress_export.svg
 delete mode 100644 docs/database/public.study_subject.md
 delete mode 100644 docs/database/public.study_subject.svg
 delete mode 100644 docs/database/public.study_tag.md
 delete mode 100644 docs/database/public.study_tag.svg
 delete mode 100644 docs/database/public.subject_progress.md
 delete mode 100644 docs/database/public.subject_progress.svg
 delete mode 100644 docs/database/public.tag.md
 delete mode 100644 docs/database/public.tag.svg
 delete mode 100644 docs/database/public.user.md
 delete mode 100644 docs/database/public.user.svg
 delete mode 100644 docs/database/schema.json
 delete mode 100644 docs/database/schema.svg
 delete mode 100644 docs/database/storage.buckets.md
 delete mode 100644 docs/database/storage.buckets.svg
 delete mode 100644 docs/database/storage.migrations.md
 delete mode 100644 docs/database/storage.migrations.svg
 delete mode 100644 docs/database/storage.objects.md
 delete mode 100644 docs/database/storage.objects.svg
 delete mode 100644 docs/database/supabase_functions.hooks.md
 delete mode 100644 docs/database/supabase_functions.hooks.svg
 delete mode 100644 docs/database/supabase_functions.migrations.md
 delete mode 100644 docs/database/supabase_functions.migrations.svg
 delete mode 100644 docs/database/vault.decrypted_secrets.md
 delete mode 100644 docs/database/vault.decrypted_secrets.svg
 delete mode 100644 docs/database/vault.secrets.md
 delete mode 100644 docs/database/vault.secrets.svg
 delete mode 100644 docs/uml/app/lib/models/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/app_onboarding/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/dashboard/contact_tab/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/dashboard/task_overview_tab/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/dashboard/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/multimodal/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/onboarding/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/report/performance/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/report/sections/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/report/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/report/util/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/tasks/intervention/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/tasks/observation/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/tasks/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/study/uml.svg
 delete mode 100644 docs/uml/app/lib/screens/uml.svg
 delete mode 100644 docs/uml/app/lib/uml.svg
 delete mode 100644 docs/uml/app/lib/util/uml.svg
 delete mode 100644 docs/uml/app/lib/widgets/questionnaire/questions/uml.svg
 delete mode 100644 docs/uml/app/lib/widgets/questionnaire/uml.svg
 delete mode 100644 docs/uml/app/lib/widgets/uml.svg
 delete mode 100644 docs/uml/core/lib/src/env/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/consent/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/data/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/eligibility/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/expressions/types/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/expressions/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/interventions/tasks/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/interventions/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/observations/tasks/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/observations/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/questionnaire/questions/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/questionnaire/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/report/sections/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/report/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/results/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/study_results/results/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/study_results/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/study_schedule/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/tables/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/tasks/uml.svg
 delete mode 100644 docs/uml/core/lib/src/models/uml.svg
 delete mode 100644 docs/uml/core/lib/src/uml.svg
 delete mode 100644 docs/uml/core/lib/src/util/multimodal/uml.svg
 delete mode 100644 docs/uml/core/lib/src/util/uml.svg
 delete mode 100644 docs/uml/core/lib/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/common_views/pages/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/common_views/sidesheet/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/common_views/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/domain/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/account/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/analyze/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/auth/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/dashboard/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/enrollment/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/info/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/interventions/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/measurements/survey/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/measurements/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/reports/section/types/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/reports/section/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/reports/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/types/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/shared/questionnaire/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/shared/schedule/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/shared/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/design/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/forms/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/monitor/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/publish/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/recruit/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/study/settings/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/study/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/features/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/localization/platform_locale/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/localization/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/repositories/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/routing/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/services/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/uml.svg
 delete mode 100644 docs/uml/designer_v2/lib/utils/uml.svg
 delete mode 100644 docs/uml/flutter_common/lib/src/uml.svg
 delete mode 100644 docs/uml/flutter_common/lib/src/utils/uml.svg
 delete mode 100644 docs/uml/flutter_common/lib/uml.svg

diff --git a/docs/README.md b/docs/README.md
deleted file mode 100644
index 030cc4870..000000000
--- a/docs/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# StudyU documentation
-
-To get an overview of the project and learn how to get started, please refer to
-our [contribution guide](../CONTRIBUTING.md).
-
-The contents of this directory serve as more detailed and specific
-documentation.
-
-## Automatically generated documentation
-
-The StudyU repository has GitHub workflows that automatically generate and
-update
-
-- Documentation of the database in [database/](database), generated by the
-  [`db-docs.yml`](../.github/workflows/db-docs.yml) workflow
-- UML diagrams for all dart code in [uml/](uml), organized in directories
-  analogous to the file structure of the code, generated by the
-  [`uml-docs.yml`](../.github/workflows/uml-docs.yml) workflow
-
-These documentation updates are committed to your branch while you are working
-on it, meaning you should pull and rebase where appropriate to keep a clean
-commit history.
-
-**Important note** The documentation workflows are designed to do as little work
-as necessary by detecting which parts of the documentation need to be updated.
-Manually committing anything to the [database/](database) or [uml/](uml)
-directories may break this detection. If you have to make any changes there,
-please make sure you understand how the respective workflow functions first.
diff --git a/docs/database/README.md b/docs/database/README.md
deleted file mode 100644
index 6d3d3bbf4..000000000
--- a/docs/database/README.md
+++ /dev/null
@@ -1,295 +0,0 @@
-# postgres
-
-## Tables
-
-| Name | Columns | Comment | Type |
-| ---- | ------- | ------- | ---- |
-| [auth.users](auth.users.md) | 21 | Auth: Stores user login data within a secure schema. | BASE TABLE |
-| [auth.refresh_tokens](auth.refresh_tokens.md) | 7 | Auth: Store of tokens used to refresh JWT tokens once they expire. | BASE TABLE |
-| [auth.instances](auth.instances.md) | 5 | Auth: Manages users across multiple sites. | BASE TABLE |
-| [auth.audit_log_entries](auth.audit_log_entries.md) | 4 | Auth: Audit trail for user actions. | BASE TABLE |
-| [auth.schema_migrations](auth.schema_migrations.md) | 1 | Auth: Manages updates to the auth system. | BASE TABLE |
-| [storage.buckets](storage.buckets.md) | 5 |  | BASE TABLE |
-| [storage.objects](storage.objects.md) | 8 |  | BASE TABLE |
-| [storage.migrations](storage.migrations.md) | 4 |  | BASE TABLE |
-| [net.http_request_queue](net.http_request_queue.md) | 6 |  | BASE TABLE |
-| [net._http_response](net._http_response.md) | 8 |  | BASE TABLE |
-| [supabase_functions.migrations](supabase_functions.migrations.md) | 2 |  | BASE TABLE |
-| [supabase_functions.hooks](supabase_functions.hooks.md) | 5 | Supabase Functions Hooks: Audit trail for triggered hooks. | BASE TABLE |
-| [public.study](public.study.md) | 21 |  | BASE TABLE |
-| [public.study_subject](public.study_subject.md) | 7 |  | BASE TABLE |
-| [public.app_config](public.app_config.md) | 9 | Stores app config for different envs | BASE TABLE |
-| [public.repo](public.repo.md) | 4 | Git repo where the generated project is stored | BASE TABLE |
-| [public.study_invite](public.study_invite.md) | 3 | Study invite codes | BASE TABLE |
-| [public.subject_progress](public.subject_progress.md) | 6 |  | BASE TABLE |
-| [public.study_progress_export](public.study_progress_export.md) | 10 |  | VIEW |
-| [public.user](public.user.md) | 3 | Users get automatically added, when a new user is created in auth.users | BASE TABLE |
-| [extensions.pg_stat_statements_info](extensions.pg_stat_statements_info.md) | 2 |  | VIEW |
-| [extensions.pg_stat_statements](extensions.pg_stat_statements.md) | 43 |  | VIEW |
-| [pgsodium.key](pgsodium.key.md) | 14 | This table holds metadata for derived keys given a key_id and key_context. The raw key is never stored. | BASE TABLE |
-| [pgsodium.valid_key](pgsodium.valid_key.md) | 9 |  | VIEW |
-| [pgsodium.masking_rule](pgsodium.masking_rule.md) | 14 |  | VIEW |
-| [pgsodium.mask_columns](pgsodium.mask_columns.md) | 7 |  | VIEW |
-| [pgsodium.decrypted_key](pgsodium.decrypted_key.md) | 14 |  | VIEW |
-| [vault.secrets](vault.secrets.md) | 8 | Table with encrypted `secret` column for storing sensitive information on disk. | BASE TABLE |
-| [vault.decrypted_secrets](vault.decrypted_secrets.md) | 9 |  | VIEW |
-
-## Stored procedures and functions
-
-| Name | ReturnType | Arguments | Type |
-| ---- | ------- | ------- | ---- |
-| extensions.uuid_generate_v4 | uuid |  | FUNCTION |
-| pgbouncer.get_auth | record | p_usename text | FUNCTION |
-| storage.filename | text | name text | FUNCTION |
-| extensions.digest | bytea | text, text | FUNCTION |
-| storage.foldername | _text | name text | FUNCTION |
-| extensions.decrypt_iv | bytea | bytea, bytea, bytea, text | FUNCTION |
-| storage.extension | text | name text | FUNCTION |
-| extensions.gen_random_bytes | bytea | integer | FUNCTION |
-| extensions.encrypt | bytea | bytea, bytea, text | FUNCTION |
-| extensions.decrypt | bytea | bytea, bytea, text | FUNCTION |
-| extensions.encrypt_iv | bytea | bytea, bytea, bytea, text | FUNCTION |
-| extensions.gen_random_uuid | uuid |  | FUNCTION |
-| extensions.uuid_nil | uuid |  | FUNCTION |
-| extensions.uuid_ns_dns | uuid |  | FUNCTION |
-| storage.search | record | prefix text, bucketname text, limits integer DEFAULT 100, levels integer DEFAULT 1, offsets integer DEFAULT 0 | FUNCTION |
-| extensions.uuid_ns_url | uuid |  | FUNCTION |
-| extensions.uuid_ns_oid | uuid |  | FUNCTION |
-| auth.uid | uuid |  | FUNCTION |
-| auth.email | text |  | FUNCTION |
-| extensions.uuid_generate_v3 | uuid | namespace uuid, name text | FUNCTION |
-| extensions.uuid_ns_x500 | uuid |  | FUNCTION |
-| extensions.uuid_generate_v1 | uuid |  | FUNCTION |
-| extensions.uuid_generate_v1mc | uuid |  | FUNCTION |
-| net.check_worker_is_up | void |  | FUNCTION |
-| net._await_response | bool | request_id bigint | FUNCTION |
-| net._urlencode_string | text | string character varying | FUNCTION |
-| net._encode_url_with_params_array | text | url text, params_array text[] | FUNCTION |
-| graphql.increment_schema_version | event_trigger |  | FUNCTION |
-| graphql.get_schema_version | int4 |  | FUNCTION |
-| graphql.resolve | jsonb | query text, variables jsonb DEFAULT '{}'::jsonb, "operationName" text DEFAULT NULL::text, extensions jsonb DEFAULT NULL::jsonb | FUNCTION |
-| extensions.pgp_pub_decrypt_bytea | bytea | bytea, bytea, text | FUNCTION |
-| extensions.pgp_pub_decrypt | text | bytea, bytea, text, text | FUNCTION |
-| extensions.pgp_pub_decrypt_bytea | bytea | bytea, bytea, text, text | FUNCTION |
-| net.http_delete | int8 | url text, params jsonb DEFAULT '{}'::jsonb, headers jsonb DEFAULT '{}'::jsonb, timeout_milliseconds integer DEFAULT 2000 | FUNCTION |
-| net._http_collect_response | http_response_result | request_id bigint, async boolean DEFAULT true | FUNCTION |
-| net.http_collect_response | http_response_result | request_id bigint, async boolean DEFAULT true | FUNCTION |
-| supabase_functions.http_request | trigger |  | FUNCTION |
-| public.active_subject_count | int4 | study study | FUNCTION |
-| public.can_edit | bool | user_id uuid, study_param study | FUNCTION |
-| public.get_study_from_invite | record | invite_code text | FUNCTION |
-| public.get_study_record_from_invite | study | invite_code text | FUNCTION |
-| public.handle_new_user | trigger |  | FUNCTION |
-| public.has_study_ended | bool | psubject_id uuid | FUNCTION |
-| public.has_results_public | bool | psubject_id uuid | FUNCTION |
-| public.has_study_ended | bool | subject study_subject | FUNCTION |
-| public.is_active_subject | bool | psubject_id uuid, days_active integer | FUNCTION |
-| public.is_study_subject_of | bool | _user_id uuid, _study_id uuid | FUNCTION |
-| public.last_completed_task | date | psubject_id uuid | FUNCTION |
-| public.study_active_days | _int4 | study_param study | FUNCTION |
-| public.study_ended_count | int4 | study study | FUNCTION |
-| public.study_length | int4 | study_param study | FUNCTION |
-| public.study_missed_days | _int4 | study_param study | FUNCTION |
-| net.http_get | int8 | url text, params jsonb DEFAULT '{}'::jsonb, headers jsonb DEFAULT '{}'::jsonb, timeout_milliseconds integer DEFAULT 2000 | FUNCTION |
-| extensions.pgp_sym_decrypt_bytea | bytea | bytea, text, text | FUNCTION |
-| public.study_participant_count | int4 | study study | FUNCTION |
-| public.study_total_tasks | int4 | subject study_subject | FUNCTION |
-| public.subject_current_day | int4 | subject study_subject | FUNCTION |
-| public.subject_total_active_days | int4 | subject study_subject | FUNCTION |
-| public.user_email | text | user_id uuid | FUNCTION |
-| extensions.pgp_pub_encrypt | bytea | text, bytea | FUNCTION |
-| extensions.pgp_pub_encrypt_bytea | bytea | bytea, bytea | FUNCTION |
-| extensions.pgp_pub_encrypt | bytea | text, bytea, text | FUNCTION |
-| extensions.pgp_pub_encrypt_bytea | bytea | bytea, bytea, text | FUNCTION |
-| extensions.pgp_pub_decrypt | text | bytea, bytea | FUNCTION |
-| extensions.pgp_pub_decrypt_bytea | bytea | bytea, bytea | FUNCTION |
-| extensions.pgp_pub_decrypt | text | bytea, bytea, text | FUNCTION |
-| extensions.gen_salt | text | text, integer | FUNCTION |
-| auth.role | text |  | FUNCTION |
-| extensions.uuid_generate_v5 | uuid | namespace uuid, name text | FUNCTION |
-| extensions.digest | bytea | bytea, text | FUNCTION |
-| extensions.hmac | bytea | text, text, text | FUNCTION |
-| extensions.hmac | bytea | bytea, bytea, text | FUNCTION |
-| extensions.crypt | text | text, text | FUNCTION |
-| extensions.gen_salt | text | text | FUNCTION |
-| extensions.sign | text | payload json, secret text, algorithm text DEFAULT 'HS256'::text | FUNCTION |
-| extensions.pgrst_ddl_watch | event_trigger |  | FUNCTION |
-| graphql._internal_resolve | jsonb | query text, variables jsonb DEFAULT '{}'::jsonb, "operationName" text DEFAULT NULL::text, extensions jsonb DEFAULT NULL::jsonb | FUNCTION |
-| graphql.exception | text | message text | FUNCTION |
-| graphql.comment_directive | jsonb | comment_ text | FUNCTION |
-| extensions.pgrst_drop_watch | event_trigger |  | FUNCTION |
-| graphql_public.graphql | jsonb | "operationName" text DEFAULT NULL::text, query text DEFAULT NULL::text, variables jsonb DEFAULT NULL::jsonb, extensions jsonb DEFAULT NULL::jsonb | FUNCTION |
-| extensions.grant_pg_graphql_access | event_trigger |  | FUNCTION |
-| net.http_post | int8 | url text, body jsonb DEFAULT '{}'::jsonb, params jsonb DEFAULT '{}'::jsonb, headers jsonb DEFAULT '{"Content-Type": "application/json"}'::jsonb, timeout_milliseconds integer DEFAULT 2000 | FUNCTION |
-| pgsodium.crypto_pwhash_saltgen | bytea |  | FUNCTION |
-| pgsodium.crypto_kx_client_session_keys | crypto_kx_session | client_pk bytea, client_sk bytea, server_pk bytea | FUNCTION |
-| pgsodium.crypto_kx_server_session_keys | crypto_kx_session | server_pk bytea, server_sk bytea, client_pk bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha512_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_box_new_seed | bytea |  | FUNCTION |
-| pgsodium.crypto_sign_new_seed | bytea |  | FUNCTION |
-| pgsodium.derive_key | bytea | key_id bigint, key_len integer DEFAULT 32, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.pgsodium_derive | bytea | key_id bigint, key_len integer DEFAULT 32, context bytea DEFAULT decode('pgsodium'::text, 'escape'::text) | FUNCTION |
-| pgsodium.randombytes_new_seed | bytea |  | FUNCTION |
-| pgsodium.crypto_secretbox_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_auth_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_box_noncegen | bytea |  | FUNCTION |
-| pgsodium.crypto_aead_ietf_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_shorthash_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_generichash_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_kdf_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_kx_new_keypair | crypto_kx_keypair |  | FUNCTION |
-| pgsodium.crypto_kx_new_seed | bytea |  | FUNCTION |
-| pgsodium.crypto_kx_seed_new_keypair | crypto_kx_keypair | seed bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha256_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_box_new_keypair | crypto_box_keypair |  | FUNCTION |
-| pgsodium.crypto_sign_new_keypair | crypto_sign_keypair |  | FUNCTION |
-| pgsodium.crypto_sign_init | bytea |  | FUNCTION |
-| pgsodium.crypto_sign_update | bytea | state bytea, message bytea | FUNCTION |
-| pgsodium.randombytes_random | int4 |  | FUNCTION |
-| pgsodium.crypto_secretbox_noncegen | bytea |  | FUNCTION |
-| pgsodium.crypto_aead_ietf_noncegen | bytea |  | FUNCTION |
-| pgsodium.crypto_secretstream_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_stream_xchacha20_keygen | bytea |  | FUNCTION |
-| pgsodium.crypto_stream_xchacha20_noncegen | bytea |  | FUNCTION |
-| pgsodium.crypto_cmp | bool | text, text | FUNCTION |
-| pgsodium.crypto_signcrypt_new_keypair | crypto_signcrypt_keypair |  | FUNCTION |
-| pgsodium.crypto_aead_det_encrypt | bytea | message bytea, additional bytea, key bytea, nonce bytea DEFAULT NULL::bytea | FUNCTION |
-| pgsodium.crypto_aead_det_decrypt | bytea | ciphertext bytea, additional bytea, key bytea, nonce bytea DEFAULT NULL::bytea | FUNCTION |
-| pgsodium.crypto_aead_det_encrypt | bytea | message bytea, additional bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea, nonce bytea DEFAULT NULL::bytea | FUNCTION |
-| pgsodium.crypto_aead_det_decrypt | bytea | message bytea, additional bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea, nonce bytea DEFAULT NULL::bytea | FUNCTION |
-| pgsodium.version | text |  | FUNCTION |
-| pgsodium.crypto_aead_det_noncegen | bytea |  | FUNCTION |
-| pgsodium.has_mask | bool | role regrole, source_name text | FUNCTION |
-| pgsodium.mask_columns | record | source_relid oid | FUNCTION |
-| pgsodium.crypto_sign_final_verify | bool | state bytea, signature bytea, key bytea | FUNCTION |
-| pgsodium.create_mask_view | void | relid oid, debug boolean DEFAULT false | FUNCTION |
-| pgsodium.create_key | valid_key | key_type pgsodium.key_type DEFAULT 'aead-det'::pgsodium.key_type, name text DEFAULT NULL::text, raw_key bytea DEFAULT NULL::bytea, raw_key_nonce bytea DEFAULT NULL::bytea, parent_key uuid DEFAULT NULL::uuid, key_context bytea DEFAULT '\x7067736f6469756d'::bytea, expires timestamp with time zone DEFAULT NULL::timestamp with time zone, associated_data text DEFAULT ''::text | FUNCTION |
-| pgsodium.get_key_by_name | valid_key | text | FUNCTION |
-| pgsodium.quote_assoc | text | text, boolean DEFAULT false | FUNCTION |
-| pgsodium.crypto_sign_open | bytea | signed_message bytea, key bytea | FUNCTION |
-| pgsodium.crypto_kdf_derive_from_key | bytea | subkey_size integer, subkey_id bigint, context bytea, primary_key uuid | FUNCTION |
-| pgsodium.get_named_keys | valid_key | filter text DEFAULT '%'::text | FUNCTION |
-| pgsodium.crypto_aead_det_encrypt | bytea | message bytea, additional bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_aead_det_decrypt | bytea | message bytea, additional bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_aead_ietf_encrypt | bytea | message bytea, additional bytea, nonce bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.get_key_by_id | valid_key | uuid | FUNCTION |
-| pgsodium.enable_security_label_trigger | void |  | FUNCTION |
-| pgsodium.disable_security_label_trigger | void |  | FUNCTION |
-| pgsodium.update_mask | void | target oid, debug boolean DEFAULT false | FUNCTION |
-| pgsodium.crypto_sign_update_agg1 | bytea | state bytea, message bytea | FUNCTION |
-| pgsodium.crypto_sign_update_agg2 | bytea | cur_state bytea, initial_state bytea, message bytea | FUNCTION |
-| pgsodium.crypto_sign_update_agg | bytea | message bytea | a |
-| pgsodium.crypto_sign_update_agg | bytea | state bytea, message bytea | a |
-| pgsodium.encrypted_columns | text | relid oid | FUNCTION |
-| pgsodium.decrypted_columns | text | relid oid | FUNCTION |
-| pgsodium.crypto_aead_ietf_encrypt | bytea | message bytea, additional bytea, nonce bytea, key bytea | FUNCTION |
-| pgsodium.crypto_aead_ietf_encrypt | bytea | message bytea, additional bytea, nonce bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_aead_ietf_decrypt | bytea | message bytea, additional bytea, nonce bytea, key bytea | FUNCTION |
-| pgsodium.crypto_aead_ietf_decrypt | bytea | message bytea, additional bytea, nonce bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_aead_ietf_decrypt | bytea | message bytea, additional bytea, nonce bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_auth | bytea | message bytea, key bytea | FUNCTION |
-| pgsodium.crypto_auth | bytea | message bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_auth | bytea | message bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_auth_verify | bool | mac bytea, message bytea, key bytea | FUNCTION |
-| pgsodium.crypto_auth_verify | bool | mac bytea, message bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_auth_verify | bool | mac bytea, message bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_box_seed_new_keypair | crypto_box_keypair | seed bytea | FUNCTION |
-| pgsodium.crypto_box | bytea | message bytea, nonce bytea, public bytea, secret bytea | FUNCTION |
-| pgsodium.crypto_box_open | bytea | ciphertext bytea, nonce bytea, public bytea, secret bytea | FUNCTION |
-| pgsodium.crypto_box_seal | bytea | message bytea, public_key bytea | FUNCTION |
-| pgsodium.crypto_box_seal_open | bytea | ciphertext bytea, public_key bytea, secret_key bytea | FUNCTION |
-| pgsodium.crypto_generichash | bytea | message bytea, key bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_generichash | bytea | message bytea, key bytea DEFAULT NULL::bytea | FUNCTION |
-| pgsodium.crypto_generichash | bytea | message bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_shorthash | bytea | message bytea, key bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_shorthash | bytea | message bytea, key bytea | FUNCTION |
-| pgsodium.crypto_shorthash | bytea | message bytea, key_uuid uuid | FUNCTION |
-| pgsodium.sodium_bin2base64 | text | bin bytea | FUNCTION |
-| pgsodium.sodium_base642bin | bytea | base64 text | FUNCTION |
-| pgsodium.crypto_auth_hmacsha512 | bytea | message bytea, secret bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha512 | bytea | message bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha512 | bytea | message bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_auth_hmacsha512_verify | bool | hash bytea, message bytea, secret bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha512_verify | bool | hash bytea, message bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha512_verify | bool | signature bytea, message bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_auth_hmacsha256 | bytea | message bytea, secret bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha256 | bytea | message bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha256 | bytea | message bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_auth_hmacsha256_verify | bool | hash bytea, message bytea, secret bytea | FUNCTION |
-| pgsodium.crypto_sign_final_create | bytea | state bytea, key bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha256_verify | bool | hash bytea, message bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_auth_hmacsha256_verify | bool | signature bytea, message bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_kdf_derive_from_key | bytea | subkey_size bigint, subkey_id bigint, context bytea, primary_key bytea | FUNCTION |
-| pgsodium.crypto_pwhash | bytea | password bytea, salt bytea | FUNCTION |
-| pgsodium.crypto_pwhash_str | bytea | password bytea | FUNCTION |
-| pgsodium.crypto_pwhash_str_verify | bool | hashed_password bytea, password bytea | FUNCTION |
-| pgsodium.randombytes_uniform | int4 | upper_bound integer | FUNCTION |
-| pgsodium.randombytes_buf | bytea | size integer | FUNCTION |
-| pgsodium.randombytes_buf_deterministic | bytea | size integer, seed bytea | FUNCTION |
-| pgsodium.crypto_secretbox | bytea | message bytea, nonce bytea, key bytea | FUNCTION |
-| pgsodium.crypto_secretbox | bytea | message bytea, nonce bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_secretbox | bytea | message bytea, nonce bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_secretbox_open | bytea | ciphertext bytea, nonce bytea, key bytea | FUNCTION |
-| pgsodium.crypto_secretbox_open | bytea | message bytea, nonce bytea, key_id bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_secretbox_open | bytea | message bytea, nonce bytea, key_uuid uuid | FUNCTION |
-| pgsodium.crypto_hash_sha256 | bytea | message bytea | FUNCTION |
-| pgsodium.crypto_hash_sha512 | bytea | message bytea | FUNCTION |
-| pgsodium.crypto_sign | bytea | message bytea, key bytea | FUNCTION |
-| pgsodium.crypto_sign_detached | bytea | message bytea, key bytea | FUNCTION |
-| pgsodium.crypto_sign_seed_new_keypair | crypto_sign_keypair | seed bytea | FUNCTION |
-| pgsodium.crypto_sign_verify_detached | bool | sig bytea, message bytea, key bytea | FUNCTION |
-| pgsodium.crypto_signcrypt_sign_after | bytea | state bytea, sender_sk bytea, ciphertext bytea | FUNCTION |
-| pgsodium.crypto_signcrypt_sign_before | crypto_signcrypt_state_key | sender bytea, recipient bytea, sender_sk bytea, recipient_pk bytea, additional bytea | FUNCTION |
-| pgsodium.crypto_signcrypt_verify_after | bool | state bytea, signature bytea, sender_pk bytea, ciphertext bytea | FUNCTION |
-| pgsodium.crypto_signcrypt_verify_before | crypto_signcrypt_state_key | signature bytea, sender bytea, recipient bytea, additional bytea, sender_pk bytea, recipient_sk bytea | FUNCTION |
-| pgsodium.crypto_signcrypt_verify_public | bool | signature bytea, sender bytea, recipient bytea, additional bytea, sender_pk bytea, ciphertext bytea | FUNCTION |
-| pgsodium.crypto_stream_xchacha20 | bytea | bigint, bytea, bytea | FUNCTION |
-| pgsodium.crypto_stream_xchacha20 | bytea | bigint, bytea, bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.crypto_stream_xchacha20_xor | bytea | bytea, bytea, bytea | FUNCTION |
-| pgsodium.crypto_stream_xchacha20_xor | bytea | bytea, bytea, bigint, context bytea DEFAULT '\x70676f736469756d'::bytea | FUNCTION |
-| pgsodium.crypto_stream_xchacha20_xor_ic | bytea | bytea, bytea, bigint, bytea | FUNCTION |
-| pgsodium.crypto_stream_xchacha20_xor_ic | bytea | bytea, bytea, bigint, bigint, context bytea DEFAULT '\x7067736f6469756d'::bytea | FUNCTION |
-| pgsodium.encrypted_column | text | relid oid, m record | FUNCTION |
-| pgsodium.update_masks | void | debug boolean DEFAULT false | FUNCTION |
-| pgsodium.key_encrypt_secret_raw_key | trigger |  | FUNCTION |
-| pgsodium.mask_role | void | masked_role regrole, source_name text, view_name text | FUNCTION |
-| pgsodium.create_mask_view | void | relid oid, subid integer, debug boolean DEFAULT false | FUNCTION |
-| pgsodium.trg_mask_update | event_trigger |  | FUNCTION |
-| pgsodium.crypto_aead_det_decrypt | bytea | message bytea, additional bytea, key_uuid uuid, nonce bytea | FUNCTION |
-| pgsodium.crypto_aead_det_encrypt | bytea | message bytea, additional bytea, key_uuid uuid, nonce bytea | FUNCTION |
-| pgsodium.crypto_aead_det_keygen | bytea |  | FUNCTION |
-| vault.secrets_encrypt_secret_secret | trigger |  | FUNCTION |
-| vault.create_secret | uuid | new_secret text, new_name text DEFAULT NULL::text, new_description text DEFAULT ''::text, new_key_id uuid DEFAULT NULL::uuid | FUNCTION |
-| vault.update_secret | void | secret_id uuid, new_secret text DEFAULT NULL::text, new_name text DEFAULT NULL::text, new_description text DEFAULT NULL::text, new_key_id uuid DEFAULT NULL::uuid | FUNCTION |
-| extensions.pgp_key_id | text | bytea | FUNCTION |
-| extensions.armor | text | bytea | FUNCTION |
-| extensions.armor | text | bytea, text[], text[] | FUNCTION |
-| extensions.dearmor | bytea | text | FUNCTION |
-| extensions.pgp_armor_headers | record | text, OUT key text, OUT value text | FUNCTION |
-| extensions.url_encode | text | data bytea | FUNCTION |
-| extensions.url_decode | bytea | data text | FUNCTION |
-| extensions.try_cast_double | float8 | inp text | FUNCTION |
-| extensions.moddatetime | trigger |  | FUNCTION |
-| extensions.pgp_sym_encrypt | bytea | text, text | FUNCTION |
-| extensions.pgp_sym_encrypt_bytea | bytea | bytea, text | FUNCTION |
-| extensions.pgp_sym_encrypt | bytea | text, text, text | FUNCTION |
-| extensions.pgp_sym_encrypt_bytea | bytea | bytea, text, text | FUNCTION |
-| extensions.pgp_sym_decrypt | text | bytea, text | FUNCTION |
-| extensions.pgp_sym_decrypt_bytea | bytea | bytea, text | FUNCTION |
-| extensions.pgp_sym_decrypt | text | bytea, text, text | FUNCTION |
-| extensions.algorithm_sign | text | signables text, secret text, algorithm text | FUNCTION |
-| extensions.verify | record | token text, secret text, algorithm text DEFAULT 'HS256'::text | FUNCTION |
-| extensions.grant_pg_cron_access | event_trigger |  | FUNCTION |
-| extensions.grant_pg_net_access | event_trigger |  | FUNCTION |
-| extensions.pg_stat_statements_reset | void | userid oid DEFAULT 0, dbid oid DEFAULT 0, queryid bigint DEFAULT 0 | FUNCTION |
-| extensions.pg_stat_statements_info | record | OUT dealloc bigint, OUT stats_reset timestamp with time zone | FUNCTION |
-| extensions.pg_stat_statements | record | showtext boolean, OUT userid oid, OUT dbid oid, OUT toplevel boolean, OUT queryid bigint, OUT query text, OUT plans bigint, OUT total_plan_time double precision, OUT min_plan_time double precision, OUT max_plan_time double precision, OUT mean_plan_time double precision, OUT stddev_plan_time double precision, OUT calls bigint, OUT total_exec_time double precision, OUT min_exec_time double precision, OUT max_exec_time double precision, OUT mean_exec_time double precision, OUT stddev_exec_time double precision, OUT rows bigint, OUT shared_blks_hit bigint, OUT shared_blks_read bigint, OUT shared_blks_dirtied bigint, OUT shared_blks_written bigint, OUT local_blks_hit bigint, OUT local_blks_read bigint, OUT local_blks_dirtied bigint, OUT local_blks_written bigint, OUT temp_blks_read bigint, OUT temp_blks_written bigint, OUT blk_read_time double precision, OUT blk_write_time double precision, OUT temp_blk_read_time double precision, OUT temp_blk_write_time double precision, OUT wal_records bigint, OUT wal_fpi bigint, OUT wal_bytes numeric, OUT jit_functions bigint, OUT jit_generation_time double precision, OUT jit_inlining_count bigint, OUT jit_inlining_time double precision, OUT jit_optimization_count bigint, OUT jit_optimization_time double precision, OUT jit_emission_count bigint, OUT jit_emission_time double precision | FUNCTION |
-| extensions.set_graphql_placeholder | event_trigger |  | FUNCTION |
-
-## Relations
-
-![er](schema.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/auth.audit_log_entries.md b/docs/database/auth.audit_log_entries.md
deleted file mode 100644
index 5753c1844..000000000
--- a/docs/database/auth.audit_log_entries.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# auth.audit_log_entries
-
-## Description
-
-Auth: Audit trail for user actions.
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| instance_id | uuid |  | true |  |  |  |
-| id | uuid |  | false |  |  |  |
-| payload | json |  | true |  |  |  |
-| created_at | timestamp with time zone |  | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| audit_log_entries_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| audit_log_entries_pkey | CREATE UNIQUE INDEX audit_log_entries_pkey ON auth.audit_log_entries USING btree (id) |
-| audit_logs_instance_id_idx | CREATE INDEX audit_logs_instance_id_idx ON auth.audit_log_entries USING btree (instance_id) |
-
-## Relations
-
-![er](auth.audit_log_entries.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/auth.audit_log_entries.svg b/docs/database/auth.audit_log_entries.svg
deleted file mode 100644
index 64855f6ea..000000000
--- a/docs/database/auth.audit_log_entries.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: auth.audit_log_entries Pages: 1 -->
-<svg width="418pt" height="255pt"
- viewBox="0.00 0.00 418.00 255.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 251)">
-<title>auth.audit_log_entries</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-251 414,-251 414,4 -4,4"/>
-<!-- auth.audit_log_entries -->
-<g id="node1" class="node">
-<title>auth.audit_log_entries</title>
-<polygon fill="#efefef" stroke="transparent" points="46,-165.5 46,-200.5 364,-200.5 364,-165.5 46,-165.5"/>
-<polygon fill="none" stroke="#000000" points="46,-165.5 46,-200.5 364,-200.5 364,-165.5 46,-165.5"/>
-<text text-anchor="start" x="52.6839" y="-178.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.audit_log_entries</text>
-<text text-anchor="start" x="229.7481" y="-178.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="263.9529" y="-178.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46,-135.5 46,-165.5 364,-165.5 364,-135.5 46,-135.5"/>
-<text text-anchor="start" x="53" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">instance_id </text>
-<text text-anchor="start" x="127.69" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46,-105.5 46,-135.5 364,-135.5 364,-105.5 46,-105.5"/>
-<text text-anchor="start" x="53" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="67.7798" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46,-75.5 46,-105.5 364,-105.5 364,-75.5 46,-75.5"/>
-<text text-anchor="start" x="53" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">payload </text>
-<text text-anchor="start" x="105.9102" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[json]</text>
-<polygon fill="none" stroke="#000000" points="46,-45.5 46,-75.5 364,-75.5 364,-45.5 46,-45.5"/>
-<text text-anchor="start" x="53" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="123.028" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-202.5 365.5,-202.5 365.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/auth.instances.md b/docs/database/auth.instances.md
deleted file mode 100644
index fd7b006fc..000000000
--- a/docs/database/auth.instances.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# auth.instances
-
-## Description
-
-Auth: Manages users across multiple sites.
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid |  | false |  |  |  |
-| uuid | uuid |  | true |  |  |  |
-| raw_base_config | text |  | true |  |  |  |
-| created_at | timestamp with time zone |  | true |  |  |  |
-| updated_at | timestamp with time zone |  | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| instances_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| instances_pkey | CREATE UNIQUE INDEX instances_pkey ON auth.instances USING btree (id) |
-
-## Relations
-
-![er](auth.instances.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/auth.instances.svg b/docs/database/auth.instances.svg
deleted file mode 100644
index 1de2be15a..000000000
--- a/docs/database/auth.instances.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: auth.instances Pages: 1 -->
-<svg width="357pt" height="285pt"
- viewBox="0.00 0.00 357.00 285.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 281)">
-<title>auth.instances</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-281 353,-281 353,4 -4,4"/>
-<!-- auth.instances -->
-<g id="node1" class="node">
-<title>auth.instances</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-195.5 46.5,-230.5 303.5,-230.5 303.5,-195.5 46.5,-195.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-195.5 46.5,-230.5 303.5,-230.5 303.5,-195.5 46.5,-195.5"/>
-<text text-anchor="start" x="53.1939" y="-208.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.instances</text>
-<text text-anchor="start" x="169.2381" y="-208.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="203.4429" y="-208.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-195.5 303.5,-195.5 303.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="68.2798" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 303.5,-165.5 303.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">uuid </text>
-<text text-anchor="start" x="83.845" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 303.5,-135.5 303.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">raw_base_config </text>
-<text text-anchor="start" x="163.1984" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 303.5,-105.5 303.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="123.528" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 303.5,-75.5 303.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at </text>
-<text text-anchor="start" x="127.4326" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-232.5 304.5,-232.5 304.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/auth.refresh_tokens.md b/docs/database/auth.refresh_tokens.md
deleted file mode 100644
index db4b1aca0..000000000
--- a/docs/database/auth.refresh_tokens.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# auth.refresh_tokens
-
-## Description
-
-Auth: Store of tokens used to refresh JWT tokens once they expire.
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| instance_id | uuid |  | true |  |  |  |
-| id | bigint | nextval('auth.refresh_tokens_id_seq'::regclass) | false |  |  |  |
-| token | varchar(255) |  | true |  |  |  |
-| user_id | varchar(255) |  | true |  |  |  |
-| revoked | boolean |  | true |  |  |  |
-| created_at | timestamp with time zone |  | true |  |  |  |
-| updated_at | timestamp with time zone |  | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| refresh_tokens_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| refresh_tokens_pkey | CREATE UNIQUE INDEX refresh_tokens_pkey ON auth.refresh_tokens USING btree (id) |
-| refresh_tokens_instance_id_idx | CREATE INDEX refresh_tokens_instance_id_idx ON auth.refresh_tokens USING btree (instance_id) |
-| refresh_tokens_instance_id_user_id_idx | CREATE INDEX refresh_tokens_instance_id_user_id_idx ON auth.refresh_tokens USING btree (instance_id, user_id) |
-| refresh_tokens_token_idx | CREATE INDEX refresh_tokens_token_idx ON auth.refresh_tokens USING btree (token) |
-
-## Relations
-
-![er](auth.refresh_tokens.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/auth.refresh_tokens.svg b/docs/database/auth.refresh_tokens.svg
deleted file mode 100644
index a9e4582f5..000000000
--- a/docs/database/auth.refresh_tokens.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: auth.refresh_tokens Pages: 1 -->
-<svg width="400pt" height="345pt"
- viewBox="0.00 0.00 400.00 345.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 341)">
-<title>auth.refresh_tokens</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-341 396,-341 396,4 -4,4"/>
-<!-- auth.refresh_tokens -->
-<g id="node1" class="node">
-<title>auth.refresh_tokens</title>
-<polygon fill="#efefef" stroke="transparent" points="46,-255.5 46,-290.5 346,-290.5 346,-255.5 46,-255.5"/>
-<polygon fill="none" stroke="#000000" points="46,-255.5 46,-290.5 346,-290.5 346,-255.5 46,-255.5"/>
-<text text-anchor="start" x="52.6884" y="-268.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.refresh_tokens</text>
-<text text-anchor="start" x="211.7436" y="-268.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="245.9484" y="-268.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46,-225.5 46,-255.5 346,-255.5 346,-225.5 46,-225.5"/>
-<text text-anchor="start" x="53" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">instance_id </text>
-<text text-anchor="start" x="127.69" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46,-195.5 46,-225.5 346,-225.5 346,-195.5 46,-195.5"/>
-<text text-anchor="start" x="53" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="67.7798" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46,-165.5 46,-195.5 346,-195.5 346,-165.5 46,-165.5"/>
-<text text-anchor="start" x="53" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">token </text>
-<text text-anchor="start" x="91.129" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="46,-135.5 46,-165.5 346,-165.5 346,-135.5 46,-135.5"/>
-<text text-anchor="start" x="53" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">user_id </text>
-<text text-anchor="start" x="102.7882" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="46,-105.5 46,-135.5 346,-135.5 346,-105.5 46,-105.5"/>
-<text text-anchor="start" x="53" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">revoked </text>
-<text text-anchor="start" x="106.6816" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="46,-75.5 46,-105.5 346,-105.5 346,-75.5 46,-75.5"/>
-<text text-anchor="start" x="53" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="123.028" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46,-45.5 46,-75.5 346,-75.5 346,-45.5 46,-45.5"/>
-<text text-anchor="start" x="53" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at </text>
-<text text-anchor="start" x="126.9326" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-292.5 347.5,-292.5 347.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/auth.schema_migrations.md b/docs/database/auth.schema_migrations.md
deleted file mode 100644
index d765593a2..000000000
--- a/docs/database/auth.schema_migrations.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# auth.schema_migrations
-
-## Description
-
-Auth: Manages updates to the auth system.
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| version | varchar(255) |  | false |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| schema_migrations_pkey | PRIMARY KEY | PRIMARY KEY (version) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| schema_migrations_pkey | CREATE UNIQUE INDEX schema_migrations_pkey ON auth.schema_migrations USING btree (version) |
-
-## Relations
-
-![er](auth.schema_migrations.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/auth.schema_migrations.svg b/docs/database/auth.schema_migrations.svg
deleted file mode 100644
index 4a9d4324a..000000000
--- a/docs/database/auth.schema_migrations.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: auth.schema_migrations Pages: 1 -->
-<svg width="437pt" height="165pt"
- viewBox="0.00 0.00 437.00 165.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 161)">
-<title>auth.schema_migrations</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-161 433,-161 433,4 -4,4"/>
-<!-- auth.schema_migrations -->
-<g id="node1" class="node">
-<title>auth.schema_migrations</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-75.5 46.5,-110.5 383.5,-110.5 383.5,-75.5 46.5,-75.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-110.5 383.5,-110.5 383.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.1961" y="-88.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.schema_migrations</text>
-<text text-anchor="start" x="249.2359" y="-88.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="283.4407" y="-88.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 383.5,-75.5 383.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">version </text>
-<text text-anchor="start" x="102.5056" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-112.5 384.5,-112.5 384.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/auth.users.md b/docs/database/auth.users.md
deleted file mode 100644
index 4e1cf1bf9..000000000
--- a/docs/database/auth.users.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# auth.users
-
-## Description
-
-Auth: Stores user login data within a secure schema.
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| instance_id | uuid |  | true |  |  |  |
-| id | uuid |  | false | [storage.buckets](storage.buckets.md) [storage.objects](storage.objects.md) |  |  |
-| aud | varchar(255) |  | true |  |  |  |
-| role | varchar(255) |  | true |  |  |  |
-| email | varchar(255) |  | true |  |  |  |
-| encrypted_password | varchar(255) |  | true |  |  |  |
-| confirmed_at | timestamp with time zone |  | true |  |  |  |
-| invited_at | timestamp with time zone |  | true |  |  |  |
-| confirmation_token | varchar(255) |  | true |  |  |  |
-| confirmation_sent_at | timestamp with time zone |  | true |  |  |  |
-| recovery_token | varchar(255) |  | true |  |  |  |
-| recovery_sent_at | timestamp with time zone |  | true |  |  |  |
-| email_change_token | varchar(255) |  | true |  |  |  |
-| email_change | varchar(255) |  | true |  |  |  |
-| email_change_sent_at | timestamp with time zone |  | true |  |  |  |
-| last_sign_in_at | timestamp with time zone |  | true |  |  |  |
-| raw_app_meta_data | jsonb |  | true |  |  |  |
-| raw_user_meta_data | jsonb |  | true |  |  |  |
-| is_super_admin | boolean |  | true |  |  |  |
-| created_at | timestamp with time zone |  | true |  |  |  |
-| updated_at | timestamp with time zone |  | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| users_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-| users_email_key | UNIQUE | UNIQUE (email) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| users_pkey | CREATE UNIQUE INDEX users_pkey ON auth.users USING btree (id) |
-| users_email_key | CREATE UNIQUE INDEX users_email_key ON auth.users USING btree (email) |
-| users_instance_id_email_idx | CREATE INDEX users_instance_id_email_idx ON auth.users USING btree (instance_id, email) |
-| users_instance_id_idx | CREATE INDEX users_instance_id_idx ON auth.users USING btree (instance_id) |
-
-## Triggers
-
-| Name | Definition |
-| ---- | ---------- |
-| on_auth_user_created | CREATE TRIGGER on_auth_user_created AFTER INSERT ON auth.users FOR EACH ROW EXECUTE FUNCTION handle_new_user() |
-
-## Relations
-
-![er](auth.users.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/auth.users.svg b/docs/database/auth.users.svg
deleted file mode 100644
index d921f4f1b..000000000
--- a/docs/database/auth.users.svg
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: auth.users Pages: 1 -->
-<svg width="804pt" height="1162pt"
- viewBox="0.00 0.00 803.50 1162.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1158)">
-<title>auth.users</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1158 799.5,-1158 799.5,4 -4,4"/>
-<!-- auth.users -->
-<g id="node1" class="node">
-<title>auth.users</title>
-<polygon fill="#efefef" stroke="transparent" points="226.5,-675.5 226.5,-710.5 550.5,-710.5 550.5,-675.5 226.5,-675.5"/>
-<polygon fill="none" stroke="#000000" points="226.5,-675.5 226.5,-710.5 550.5,-710.5 550.5,-675.5 226.5,-675.5"/>
-<text text-anchor="start" x="282.7022" y="-688.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.users</text>
-<text text-anchor="start" x="366.7298" y="-688.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="400.9346" y="-688.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-645.5 226.5,-675.5 550.5,-675.5 550.5,-645.5 226.5,-645.5"/>
-<text text-anchor="start" x="233.5" y="-656.9" font-family="Arial" font-size="14.00" fill="#000000">instance_id </text>
-<text text-anchor="start" x="308.19" y="-656.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-615.5 226.5,-645.5 550.5,-645.5 550.5,-615.5 226.5,-615.5"/>
-<text text-anchor="start" x="233.5" y="-626.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="248.2798" y="-626.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-585.5 226.5,-615.5 550.5,-615.5 550.5,-585.5 226.5,-585.5"/>
-<text text-anchor="start" x="233.5" y="-596.9" font-family="Arial" font-size="14.00" fill="#000000">aud </text>
-<text text-anchor="start" x="260.7384" y="-596.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-555.5 226.5,-585.5 550.5,-585.5 550.5,-555.5 226.5,-555.5"/>
-<text text-anchor="start" x="233.5" y="-566.9" font-family="Arial" font-size="14.00" fill="#000000">role </text>
-<text text-anchor="start" x="260.723" y="-566.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-525.5 226.5,-555.5 550.5,-555.5 550.5,-525.5 226.5,-525.5"/>
-<text text-anchor="start" x="233.5" y="-536.9" font-family="Arial" font-size="14.00" fill="#000000">email </text>
-<text text-anchor="start" x="270.8296" y="-536.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-495.5 226.5,-525.5 550.5,-525.5 550.5,-495.5 226.5,-495.5"/>
-<text text-anchor="start" x="233.5" y="-506.9" font-family="Arial" font-size="14.00" fill="#000000">encrypted_password </text>
-<text text-anchor="start" x="366.535" y="-506.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-465.5 226.5,-495.5 550.5,-495.5 550.5,-465.5 226.5,-465.5"/>
-<text text-anchor="start" x="233.5" y="-476.9" font-family="Arial" font-size="14.00" fill="#000000">confirmed_at </text>
-<text text-anchor="start" x="318.2952" y="-476.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-435.5 226.5,-465.5 550.5,-465.5 550.5,-435.5 226.5,-435.5"/>
-<text text-anchor="start" x="233.5" y="-446.9" font-family="Arial" font-size="14.00" fill="#000000">invited_at </text>
-<text text-anchor="start" x="297.298" y="-446.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-405.5 226.5,-435.5 550.5,-435.5 550.5,-405.5 226.5,-405.5"/>
-<text text-anchor="start" x="233.5" y="-416.9" font-family="Arial" font-size="14.00" fill="#000000">confirmation_token </text>
-<text text-anchor="start" x="355.6402" y="-416.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-375.5 226.5,-405.5 550.5,-405.5 550.5,-375.5 226.5,-375.5"/>
-<text text-anchor="start" x="233.5" y="-386.9" font-family="Arial" font-size="14.00" fill="#000000">confirmation_sent_at </text>
-<text text-anchor="start" x="367.3134" y="-386.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-345.5 226.5,-375.5 550.5,-375.5 550.5,-345.5 226.5,-345.5"/>
-<text text-anchor="start" x="233.5" y="-356.9" font-family="Arial" font-size="14.00" fill="#000000">recovery_token </text>
-<text text-anchor="start" x="333.0806" y="-356.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-315.5 226.5,-345.5 550.5,-345.5 550.5,-315.5 226.5,-315.5"/>
-<text text-anchor="start" x="233.5" y="-326.9" font-family="Arial" font-size="14.00" fill="#000000">recovery_sent_at </text>
-<text text-anchor="start" x="344.7538" y="-326.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-285.5 226.5,-315.5 550.5,-315.5 550.5,-285.5 226.5,-285.5"/>
-<text text-anchor="start" x="233.5" y="-296.9" font-family="Arial" font-size="14.00" fill="#000000">email_change_token </text>
-<text text-anchor="start" x="366.5462" y="-296.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-255.5 226.5,-285.5 550.5,-285.5 550.5,-255.5 226.5,-255.5"/>
-<text text-anchor="start" x="233.5" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">email_change </text>
-<text text-anchor="start" x="324.5252" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-225.5 226.5,-255.5 550.5,-255.5 550.5,-225.5 226.5,-225.5"/>
-<text text-anchor="start" x="233.2981" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">email_change_sent_at </text>
-<text text-anchor="start" x="378.0175" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-195.5 226.5,-225.5 550.5,-225.5 550.5,-195.5 226.5,-195.5"/>
-<text text-anchor="start" x="233.5" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">last_sign_in_at </text>
-<text text-anchor="start" x="330.7524" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-165.5 226.5,-195.5 550.5,-195.5 550.5,-165.5 226.5,-165.5"/>
-<text text-anchor="start" x="233.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">raw_app_meta_data </text>
-<text text-anchor="start" x="364.9908" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-135.5 226.5,-165.5 550.5,-165.5 550.5,-135.5 226.5,-135.5"/>
-<text text-anchor="start" x="233.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">raw_user_meta_data </text>
-<text text-anchor="start" x="368.8688" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-105.5 226.5,-135.5 550.5,-135.5 550.5,-105.5 226.5,-105.5"/>
-<text text-anchor="start" x="233.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">is_super_admin </text>
-<text text-anchor="start" x="336.1858" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-75.5 226.5,-105.5 550.5,-105.5 550.5,-75.5 226.5,-75.5"/>
-<text text-anchor="start" x="233.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="303.528" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="226.5,-45.5 226.5,-75.5 550.5,-75.5 550.5,-45.5 226.5,-45.5"/>
-<text text-anchor="start" x="233.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at </text>
-<text text-anchor="start" x="307.4326" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="225,-44.5 225,-712.5 552,-712.5 552,-44.5 225,-44.5"/>
-</g>
-<!-- storage.buckets -->
-<g id="node2" class="node">
-<title>storage.buckets</title>
-<polygon fill="#efefef" stroke="transparent" points="43.5,-1030.5 43.5,-1065.5 326.5,-1065.5 326.5,-1030.5 43.5,-1030.5"/>
-<polygon fill="none" stroke="#000000" points="43.5,-1030.5 43.5,-1065.5 326.5,-1065.5 326.5,-1030.5 43.5,-1030.5"/>
-<text text-anchor="start" x="57.6949" y="-1043.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.buckets</text>
-<text text-anchor="start" x="184.7371" y="-1043.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="218.9419" y="-1043.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-1000.5 43.5,-1030.5 326.5,-1030.5 326.5,-1000.5 43.5,-1000.5"/>
-<text text-anchor="start" x="50.5" y="-1011.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="95.594" y="-1011.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-970.5 43.5,-1000.5 326.5,-1000.5 326.5,-970.5 43.5,-970.5"/>
-<text text-anchor="start" x="50.5" y="-981.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="119.7132" y="-981.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-940.5 43.5,-970.5 326.5,-970.5 326.5,-940.5 43.5,-940.5"/>
-<text text-anchor="start" x="50.5" y="-951.9" font-family="Arial" font-size="14.00" fill="#000000">owner    </text>
-<text text-anchor="start" x="122.8198" y="-951.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-910.5 43.5,-940.5 326.5,-940.5 326.5,-910.5 43.5,-910.5"/>
-<text text-anchor="start" x="50.5" y="-921.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="150.8422" y="-921.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-880.5 43.5,-910.5 326.5,-910.5 326.5,-880.5 43.5,-880.5"/>
-<text text-anchor="start" x="50.0344" y="-891.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="154.2812" y="-891.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- storage.buckets&#45;&gt;auth.users -->
-<g id="edge1" class="edge">
-<title>storage.buckets:owner&#45;&gt;auth.users:id</title>
-<path fill="none" stroke="#000000" d="M336.8096,-954.3755C374.3473,-945.1834 347.3108,-881.6381 326.5,-838 301.8801,-786.3747 251.1199,-808.6253 226.5,-757 202.299,-706.2531 170.2778,-630.5 226.5,-630.5"/>
-<polygon fill="#000000" stroke="#000000" points="336.441,-954.4156 326.012,-951.0265 331.4705,-954.9578 326.5,-955.5 326.5,-955.5 326.5,-955.5 331.4705,-954.9578 326.988,-959.9735 336.441,-954.4156 336.441,-954.4156"/>
-<text text-anchor="start" x="333.4965" y="-965.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (owner) REFERENCES auth.users(id)</text>
-</g>
-<!-- storage.objects -->
-<g id="node3" class="node">
-<title>storage.objects</title>
-<polygon fill="#efefef" stroke="transparent" points="430.5,-1075.5 430.5,-1110.5 752.5,-1110.5 752.5,-1075.5 430.5,-1075.5"/>
-<polygon fill="none" stroke="#000000" points="430.5,-1075.5 430.5,-1110.5 752.5,-1110.5 752.5,-1075.5 430.5,-1075.5"/>
-<text text-anchor="start" x="466.6978" y="-1088.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.objects</text>
-<text text-anchor="start" x="588.7342" y="-1088.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="622.939" y="-1088.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-1045.5 430.5,-1075.5 752.5,-1075.5 752.5,-1045.5 430.5,-1045.5"/>
-<text text-anchor="start" x="437.5" y="-1056.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="482.594" y="-1056.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-1015.5 430.5,-1045.5 752.5,-1045.5 752.5,-1015.5 430.5,-1015.5"/>
-<text text-anchor="start" x="437.5" y="-1026.9" font-family="Arial" font-size="14.00" fill="#000000">bucket_id    </text>
-<text text-anchor="start" x="531.615" y="-1026.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-985.5 430.5,-1015.5 752.5,-1015.5 752.5,-985.5 430.5,-985.5"/>
-<text text-anchor="start" x="437.5" y="-996.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="506.7132" y="-996.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-955.5 430.5,-985.5 752.5,-985.5 752.5,-955.5 430.5,-955.5"/>
-<text text-anchor="start" x="437.5" y="-966.9" font-family="Arial" font-size="14.00" fill="#000000">owner    </text>
-<text text-anchor="start" x="509.8198" y="-966.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-925.5 430.5,-955.5 752.5,-955.5 752.5,-925.5 430.5,-925.5"/>
-<text text-anchor="start" x="437.5" y="-936.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="537.8422" y="-936.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-895.5 430.5,-925.5 752.5,-925.5 752.5,-895.5 430.5,-895.5"/>
-<text text-anchor="start" x="437.5" y="-906.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="541.7468" y="-906.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-865.5 430.5,-895.5 752.5,-895.5 752.5,-865.5 430.5,-865.5"/>
-<text text-anchor="start" x="437.4811" y="-876.9" font-family="Arial" font-size="14.00" fill="#000000">last_accessed_at    </text>
-<text text-anchor="start" x="579.8345" y="-876.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-835.5 430.5,-865.5 752.5,-865.5 752.5,-835.5 430.5,-835.5"/>
-<text text-anchor="start" x="437.5" y="-846.9" font-family="Arial" font-size="14.00" fill="#000000">metadata    </text>
-<text text-anchor="start" x="530.0596" y="-846.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- storage.objects&#45;&gt;auth.users -->
-<g id="edge2" class="edge">
-<title>storage.objects:owner&#45;&gt;auth.users:id</title>
-<path fill="none" stroke="#000000" d="M420.126,-969.7642C354.6257,-959.9049 385.6162,-853.3252 430.5,-793 463.7381,-748.327 517.2619,-801.673 550.5,-757 584.0608,-711.8933 606.7222,-630.5 550.5,-630.5"/>
-<polygon fill="#000000" stroke="#000000" points="420.5251,-969.7924 430.1816,-974.9887 425.5125,-970.1462 430.5,-970.5 430.5,-970.5 430.5,-970.5 425.5125,-970.1462 430.8184,-966.0113 420.5251,-969.7924 420.5251,-969.7924"/>
-<text text-anchor="start" x="437.4965" y="-980.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (owner) REFERENCES auth.users(id)</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/extensions.pg_stat_statements.md b/docs/database/extensions.pg_stat_statements.md
deleted file mode 100644
index 1ac95502f..000000000
--- a/docs/database/extensions.pg_stat_statements.md
+++ /dev/null
@@ -1,117 +0,0 @@
-# extensions.pg_stat_statements
-
-## Description
-
-<details>
-<summary><strong>Table Definition</strong></summary>
-
-```sql
-CREATE VIEW pg_stat_statements AS (
- SELECT pg_stat_statements.userid,
-    pg_stat_statements.dbid,
-    pg_stat_statements.toplevel,
-    pg_stat_statements.queryid,
-    pg_stat_statements.query,
-    pg_stat_statements.plans,
-    pg_stat_statements.total_plan_time,
-    pg_stat_statements.min_plan_time,
-    pg_stat_statements.max_plan_time,
-    pg_stat_statements.mean_plan_time,
-    pg_stat_statements.stddev_plan_time,
-    pg_stat_statements.calls,
-    pg_stat_statements.total_exec_time,
-    pg_stat_statements.min_exec_time,
-    pg_stat_statements.max_exec_time,
-    pg_stat_statements.mean_exec_time,
-    pg_stat_statements.stddev_exec_time,
-    pg_stat_statements.rows,
-    pg_stat_statements.shared_blks_hit,
-    pg_stat_statements.shared_blks_read,
-    pg_stat_statements.shared_blks_dirtied,
-    pg_stat_statements.shared_blks_written,
-    pg_stat_statements.local_blks_hit,
-    pg_stat_statements.local_blks_read,
-    pg_stat_statements.local_blks_dirtied,
-    pg_stat_statements.local_blks_written,
-    pg_stat_statements.temp_blks_read,
-    pg_stat_statements.temp_blks_written,
-    pg_stat_statements.blk_read_time,
-    pg_stat_statements.blk_write_time,
-    pg_stat_statements.temp_blk_read_time,
-    pg_stat_statements.temp_blk_write_time,
-    pg_stat_statements.wal_records,
-    pg_stat_statements.wal_fpi,
-    pg_stat_statements.wal_bytes,
-    pg_stat_statements.jit_functions,
-    pg_stat_statements.jit_generation_time,
-    pg_stat_statements.jit_inlining_count,
-    pg_stat_statements.jit_inlining_time,
-    pg_stat_statements.jit_optimization_count,
-    pg_stat_statements.jit_optimization_time,
-    pg_stat_statements.jit_emission_count,
-    pg_stat_statements.jit_emission_time
-   FROM pg_stat_statements(true) pg_stat_statements(userid, dbid, toplevel, queryid, query, plans, total_plan_time, min_plan_time, max_plan_time, mean_plan_time, stddev_plan_time, calls, total_exec_time, min_exec_time, max_exec_time, mean_exec_time, stddev_exec_time, rows, shared_blks_hit, shared_blks_read, shared_blks_dirtied, shared_blks_written, local_blks_hit, local_blks_read, local_blks_dirtied, local_blks_written, temp_blks_read, temp_blks_written, blk_read_time, blk_write_time, temp_blk_read_time, temp_blk_write_time, wal_records, wal_fpi, wal_bytes, jit_functions, jit_generation_time, jit_inlining_count, jit_inlining_time, jit_optimization_count, jit_optimization_time, jit_emission_count, jit_emission_time)
-)
-```
-
-</details>
-
-## Referenced Tables
-
-- pg_stat_statements
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| userid | oid |  | true |  |  |  |
-| dbid | oid |  | true |  |  |  |
-| toplevel | boolean |  | true |  |  |  |
-| queryid | bigint |  | true |  |  |  |
-| query | text |  | true |  |  |  |
-| plans | bigint |  | true |  |  |  |
-| total_plan_time | double precision |  | true |  |  |  |
-| min_plan_time | double precision |  | true |  |  |  |
-| max_plan_time | double precision |  | true |  |  |  |
-| mean_plan_time | double precision |  | true |  |  |  |
-| stddev_plan_time | double precision |  | true |  |  |  |
-| calls | bigint |  | true |  |  |  |
-| total_exec_time | double precision |  | true |  |  |  |
-| min_exec_time | double precision |  | true |  |  |  |
-| max_exec_time | double precision |  | true |  |  |  |
-| mean_exec_time | double precision |  | true |  |  |  |
-| stddev_exec_time | double precision |  | true |  |  |  |
-| rows | bigint |  | true |  |  |  |
-| shared_blks_hit | bigint |  | true |  |  |  |
-| shared_blks_read | bigint |  | true |  |  |  |
-| shared_blks_dirtied | bigint |  | true |  |  |  |
-| shared_blks_written | bigint |  | true |  |  |  |
-| local_blks_hit | bigint |  | true |  |  |  |
-| local_blks_read | bigint |  | true |  |  |  |
-| local_blks_dirtied | bigint |  | true |  |  |  |
-| local_blks_written | bigint |  | true |  |  |  |
-| temp_blks_read | bigint |  | true |  |  |  |
-| temp_blks_written | bigint |  | true |  |  |  |
-| blk_read_time | double precision |  | true |  |  |  |
-| blk_write_time | double precision |  | true |  |  |  |
-| temp_blk_read_time | double precision |  | true |  |  |  |
-| temp_blk_write_time | double precision |  | true |  |  |  |
-| wal_records | bigint |  | true |  |  |  |
-| wal_fpi | bigint |  | true |  |  |  |
-| wal_bytes | numeric |  | true |  |  |  |
-| jit_functions | bigint |  | true |  |  |  |
-| jit_generation_time | double precision |  | true |  |  |  |
-| jit_inlining_count | bigint |  | true |  |  |  |
-| jit_inlining_time | double precision |  | true |  |  |  |
-| jit_optimization_count | bigint |  | true |  |  |  |
-| jit_optimization_time | double precision |  | true |  |  |  |
-| jit_emission_count | bigint |  | true |  |  |  |
-| jit_emission_time | double precision |  | true |  |  |  |
-
-## Relations
-
-![er](extensions.pg_stat_statements.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/extensions.pg_stat_statements.svg b/docs/database/extensions.pg_stat_statements.svg
deleted file mode 100644
index 141127ffc..000000000
--- a/docs/database/extensions.pg_stat_statements.svg
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: extensions.pg_stat_statements Pages: 1 -->
-<svg width="439pt" height="1425pt"
- viewBox="0.00 0.00 439.00 1425.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1421)">
-<title>extensions.pg_stat_statements</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1421 435,-1421 435,4 -4,4"/>
-<!-- extensions.pg_stat_statements -->
-<g id="node1" class="node">
-<title>extensions.pg_stat_statements</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-1335.5 46.5,-1370.5 385.5,-1370.5 385.5,-1335.5 46.5,-1335.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-1335.5 46.5,-1370.5 385.5,-1370.5 385.5,-1335.5 46.5,-1335.5"/>
-<text text-anchor="start" x="53.0735" y="-1348.3" font-family="Arial Bold" font-size="18.00" fill="#000000">extensions.pg_stat_statements</text>
-<text text-anchor="start" x="301.1621" y="-1348.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="335.3669" y="-1348.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1305.5 46.5,-1335.5 385.5,-1335.5 385.5,-1305.5 46.5,-1305.5"/>
-<text text-anchor="start" x="53.5" y="-1316.9" font-family="Arial" font-size="14.00" fill="#000000">userid </text>
-<text text-anchor="start" x="95.5056" y="-1316.9" font-family="Arial" font-size="14.00" fill="#666666">[oid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1275.5 46.5,-1305.5 385.5,-1305.5 385.5,-1275.5 46.5,-1275.5"/>
-<text text-anchor="start" x="53.5" y="-1286.9" font-family="Arial" font-size="14.00" fill="#000000">dbid </text>
-<text text-anchor="start" x="83.845" y="-1286.9" font-family="Arial" font-size="14.00" fill="#666666">[oid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1245.5 46.5,-1275.5 385.5,-1275.5 385.5,-1245.5 46.5,-1245.5"/>
-<text text-anchor="start" x="53.5" y="-1256.9" font-family="Arial" font-size="14.00" fill="#000000">toplevel </text>
-<text text-anchor="start" x="105.6248" y="-1256.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1215.5 46.5,-1245.5 385.5,-1245.5 385.5,-1215.5 46.5,-1215.5"/>
-<text text-anchor="start" x="53.5" y="-1226.9" font-family="Arial" font-size="14.00" fill="#000000">queryid </text>
-<text text-anchor="start" x="103.2882" y="-1226.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1185.5 46.5,-1215.5 385.5,-1215.5 385.5,-1185.5 46.5,-1185.5"/>
-<text text-anchor="start" x="53.5" y="-1196.9" font-family="Arial" font-size="14.00" fill="#000000">query </text>
-<text text-anchor="start" x="92.399" y="-1196.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1155.5 46.5,-1185.5 385.5,-1185.5 385.5,-1155.5 46.5,-1155.5"/>
-<text text-anchor="start" x="53.5" y="-1166.9" font-family="Arial" font-size="14.00" fill="#000000">plans </text>
-<text text-anchor="start" x="90.845" y="-1166.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1125.5 46.5,-1155.5 385.5,-1155.5 385.5,-1125.5 46.5,-1125.5"/>
-<text text-anchor="start" x="53.5" y="-1136.9" font-family="Arial" font-size="14.00" fill="#000000">total_plan_time </text>
-<text text-anchor="start" x="152.3036" y="-1136.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1095.5 46.5,-1125.5 385.5,-1125.5 385.5,-1095.5 46.5,-1095.5"/>
-<text text-anchor="start" x="53.5" y="-1106.9" font-family="Arial" font-size="14.00" fill="#000000">min_plan_time </text>
-<text text-anchor="start" x="148.4004" y="-1106.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1065.5 46.5,-1095.5 385.5,-1095.5 385.5,-1065.5 46.5,-1065.5"/>
-<text text-anchor="start" x="53.5" y="-1076.9" font-family="Arial" font-size="14.00" fill="#000000">max_plan_time </text>
-<text text-anchor="start" x="152.2938" y="-1076.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1035.5 46.5,-1065.5 385.5,-1065.5 385.5,-1035.5 46.5,-1035.5"/>
-<text text-anchor="start" x="53.5" y="-1046.9" font-family="Arial" font-size="14.00" fill="#000000">mean_plan_time </text>
-<text text-anchor="start" x="160.859" y="-1046.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-1005.5 46.5,-1035.5 385.5,-1035.5 385.5,-1005.5 46.5,-1005.5"/>
-<text text-anchor="start" x="53.5" y="-1016.9" font-family="Arial" font-size="14.00" fill="#000000">stddev_plan_time </text>
-<text text-anchor="start" x="167.089" y="-1016.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-975.5 46.5,-1005.5 385.5,-1005.5 385.5,-975.5 46.5,-975.5"/>
-<text text-anchor="start" x="53.5" y="-986.9" font-family="Arial" font-size="14.00" fill="#000000">calls </text>
-<text text-anchor="start" x="85.3864" y="-986.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-945.5 46.5,-975.5 385.5,-975.5 385.5,-945.5 46.5,-945.5"/>
-<text text-anchor="start" x="53.5" y="-956.9" font-family="Arial" font-size="14.00" fill="#000000">total_exec_time </text>
-<text text-anchor="start" x="155.4144" y="-956.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-915.5 46.5,-945.5 385.5,-945.5 385.5,-915.5 46.5,-915.5"/>
-<text text-anchor="start" x="53.5" y="-926.9" font-family="Arial" font-size="14.00" fill="#000000">min_exec_time </text>
-<text text-anchor="start" x="151.5112" y="-926.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-885.5 46.5,-915.5 385.5,-915.5 385.5,-885.5 46.5,-885.5"/>
-<text text-anchor="start" x="53.5" y="-896.9" font-family="Arial" font-size="14.00" fill="#000000">max_exec_time </text>
-<text text-anchor="start" x="155.4046" y="-896.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-855.5 46.5,-885.5 385.5,-885.5 385.5,-855.5 46.5,-855.5"/>
-<text text-anchor="start" x="53.5" y="-866.9" font-family="Arial" font-size="14.00" fill="#000000">mean_exec_time </text>
-<text text-anchor="start" x="163.9698" y="-866.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-825.5 46.5,-855.5 385.5,-855.5 385.5,-825.5 46.5,-825.5"/>
-<text text-anchor="start" x="53.5" y="-836.9" font-family="Arial" font-size="14.00" fill="#000000">stddev_exec_time </text>
-<text text-anchor="start" x="170.1998" y="-836.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-795.5 46.5,-825.5 385.5,-825.5 385.5,-795.5 46.5,-795.5"/>
-<text text-anchor="start" x="53.5" y="-806.9" font-family="Arial" font-size="14.00" fill="#000000">rows </text>
-<text text-anchor="start" x="86.9404" y="-806.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-765.5 46.5,-795.5 385.5,-795.5 385.5,-765.5 46.5,-765.5"/>
-<text text-anchor="start" x="53.5" y="-776.9" font-family="Arial" font-size="14.00" fill="#000000">shared_blks_hit </text>
-<text text-anchor="start" x="155.4158" y="-776.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-735.5 46.5,-765.5 385.5,-765.5 385.5,-735.5 46.5,-735.5"/>
-<text text-anchor="start" x="53.5" y="-746.9" font-family="Arial" font-size="14.00" fill="#000000">shared_blks_read </text>
-<text text-anchor="start" x="168.6444" y="-746.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-705.5 46.5,-735.5 385.5,-735.5 385.5,-705.5 46.5,-705.5"/>
-<text text-anchor="start" x="53.5" y="-716.9" font-family="Arial" font-size="14.00" fill="#000000">shared_blks_dirtied </text>
-<text text-anchor="start" x="178.7482" y="-716.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-675.5 46.5,-705.5 385.5,-705.5 385.5,-675.5 46.5,-675.5"/>
-<text text-anchor="start" x="53.5" y="-686.9" font-family="Arial" font-size="14.00" fill="#000000">shared_blks_written </text>
-<text text-anchor="start" x="181.8562" y="-686.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-645.5 46.5,-675.5 385.5,-675.5 385.5,-645.5 46.5,-645.5"/>
-<text text-anchor="start" x="53.5" y="-656.9" font-family="Arial" font-size="14.00" fill="#000000">local_blks_hit </text>
-<text text-anchor="start" x="141.4032" y="-656.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-615.5 46.5,-645.5 385.5,-645.5 385.5,-615.5 46.5,-615.5"/>
-<text text-anchor="start" x="53.5" y="-626.9" font-family="Arial" font-size="14.00" fill="#000000">local_blks_read </text>
-<text text-anchor="start" x="154.6318" y="-626.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-585.5 46.5,-615.5 385.5,-615.5 385.5,-585.5 46.5,-585.5"/>
-<text text-anchor="start" x="53.5" y="-596.9" font-family="Arial" font-size="14.00" fill="#000000">local_blks_dirtied </text>
-<text text-anchor="start" x="164.7356" y="-596.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-555.5 46.5,-585.5 385.5,-585.5 385.5,-555.5 46.5,-555.5"/>
-<text text-anchor="start" x="53.5" y="-566.9" font-family="Arial" font-size="14.00" fill="#000000">local_blks_written </text>
-<text text-anchor="start" x="167.8436" y="-566.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-525.5 46.5,-555.5 385.5,-555.5 385.5,-525.5 46.5,-525.5"/>
-<text text-anchor="start" x="53.5" y="-536.9" font-family="Arial" font-size="14.00" fill="#000000">temp_blks_read </text>
-<text text-anchor="start" x="156.9698" y="-536.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-495.5 46.5,-525.5 385.5,-525.5 385.5,-495.5 46.5,-495.5"/>
-<text text-anchor="start" x="53.5" y="-506.9" font-family="Arial" font-size="14.00" fill="#000000">temp_blks_written </text>
-<text text-anchor="start" x="170.1816" y="-506.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-465.5 46.5,-495.5 385.5,-495.5 385.5,-465.5 46.5,-465.5"/>
-<text text-anchor="start" x="53.5" y="-476.9" font-family="Arial" font-size="14.00" fill="#000000">blk_read_time </text>
-<text text-anchor="start" x="145.2938" y="-476.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-435.5 46.5,-465.5 385.5,-465.5 385.5,-435.5 46.5,-435.5"/>
-<text text-anchor="start" x="53.5" y="-446.9" font-family="Arial" font-size="14.00" fill="#000000">blk_write_time </text>
-<text text-anchor="start" x="146.8324" y="-446.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-405.5 46.5,-435.5 385.5,-435.5 385.5,-405.5 46.5,-405.5"/>
-<text text-anchor="start" x="53.5" y="-416.9" font-family="Arial" font-size="14.00" fill="#000000">temp_blk_read_time </text>
-<text text-anchor="start" x="184.1928" y="-416.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-375.5 46.5,-405.5 385.5,-405.5 385.5,-375.5 46.5,-375.5"/>
-<text text-anchor="start" x="53.5" y="-386.9" font-family="Arial" font-size="14.00" fill="#000000">temp_blk_write_time </text>
-<text text-anchor="start" x="185.7314" y="-386.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-345.5 46.5,-375.5 385.5,-375.5 385.5,-345.5 46.5,-345.5"/>
-<text text-anchor="start" x="53.5" y="-356.9" font-family="Arial" font-size="14.00" fill="#000000">wal_records </text>
-<text text-anchor="start" x="132.838" y="-356.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-315.5 46.5,-345.5 385.5,-345.5 385.5,-315.5 46.5,-315.5"/>
-<text text-anchor="start" x="53.5" y="-326.9" font-family="Arial" font-size="14.00" fill="#000000">wal_fpi </text>
-<text text-anchor="start" x="100.9488" y="-326.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-285.5 46.5,-315.5 385.5,-315.5 385.5,-285.5 46.5,-285.5"/>
-<text text-anchor="start" x="53.5" y="-296.9" font-family="Arial" font-size="14.00" fill="#000000">wal_bytes </text>
-<text text-anchor="start" x="119.6248" y="-296.9" font-family="Arial" font-size="14.00" fill="#666666">[numeric]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-255.5 46.5,-285.5 385.5,-285.5 385.5,-255.5 46.5,-255.5"/>
-<text text-anchor="start" x="53.5" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">jit_functions </text>
-<text text-anchor="start" x="131.2952" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-225.5 46.5,-255.5 385.5,-255.5 385.5,-225.5 46.5,-225.5"/>
-<text text-anchor="start" x="53.5" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">jit_generation_time </text>
-<text text-anchor="start" x="175.636" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-195.5 46.5,-225.5 385.5,-225.5 385.5,-195.5 46.5,-195.5"/>
-<text text-anchor="start" x="53.5" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">jit_inlining_count </text>
-<text text-anchor="start" x="160.8548" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-195.5 385.5,-195.5 385.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">jit_inlining_time </text>
-<text text-anchor="start" x="153.0568" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 385.5,-165.5 385.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">jit_optimization_count </text>
-<text text-anchor="start" x="191.9726" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 385.5,-135.5 385.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">jit_optimization_time </text>
-<text text-anchor="start" x="184.1746" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 385.5,-105.5 385.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">jit_emission_count </text>
-<text text-anchor="start" x="172.5196" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 385.5,-75.5 385.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">jit_emission_time </text>
-<text text-anchor="start" x="164.7216" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-1372.5 386.5,-1372.5 386.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/extensions.pg_stat_statements_info.md b/docs/database/extensions.pg_stat_statements_info.md
deleted file mode 100644
index 8d09611a4..000000000
--- a/docs/database/extensions.pg_stat_statements_info.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# extensions.pg_stat_statements_info
-
-## Description
-
-<details>
-<summary><strong>Table Definition</strong></summary>
-
-```sql
-CREATE VIEW pg_stat_statements_info AS (
- SELECT pg_stat_statements_info.dealloc,
-    pg_stat_statements_info.stats_reset
-   FROM pg_stat_statements_info() pg_stat_statements_info(dealloc, stats_reset)
-)
-```
-
-</details>
-
-## Referenced Tables
-
-- pg_stat_statements_info
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| dealloc | bigint |  | true |  |  |  |
-| stats_reset | timestamp with time zone |  | true |  |  |  |
-
-## Relations
-
-![er](extensions.pg_stat_statements_info.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/extensions.pg_stat_statements_info.svg b/docs/database/extensions.pg_stat_statements_info.svg
deleted file mode 100644
index 3802f8f3f..000000000
--- a/docs/database/extensions.pg_stat_statements_info.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: extensions.pg_stat_statements_info Pages: 1 -->
-<svg width="478pt" height="195pt"
- viewBox="0.00 0.00 478.00 195.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 191)">
-<title>extensions.pg_stat_statements_info</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-191 474,-191 474,4 -4,4"/>
-<!-- extensions.pg_stat_statements_info -->
-<g id="node1" class="node">
-<title>extensions.pg_stat_statements_info</title>
-<polygon fill="#efefef" stroke="transparent" points="46,-105.5 46,-140.5 424,-140.5 424,-105.5 46,-105.5"/>
-<polygon fill="none" stroke="#000000" points="46,-105.5 46,-140.5 424,-140.5 424,-105.5 46,-105.5"/>
-<text text-anchor="start" x="52.566" y="-118.3" font-family="Arial Bold" font-size="18.00" fill="#000000">extensions.pg_stat_statements_info</text>
-<text text-anchor="start" x="339.6696" y="-118.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="373.8744" y="-118.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="46,-75.5 46,-105.5 424,-105.5 424,-75.5 46,-75.5"/>
-<text text-anchor="start" x="53" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">dealloc </text>
-<text text-anchor="start" x="101.2342" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46,-45.5 46,-75.5 424,-75.5 424,-45.5 46,-45.5"/>
-<text text-anchor="start" x="53" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">stats_reset </text>
-<text text-anchor="start" x="125.3534" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-142.5 425.5,-142.5 425.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/net._http_response.md b/docs/database/net._http_response.md
deleted file mode 100644
index fe5d4f918..000000000
--- a/docs/database/net._http_response.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# net._http_response
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | bigint |  | true |  |  |  |
-| status_code | integer |  | true |  |  |  |
-| content_type | text |  | true |  |  |  |
-| headers | jsonb |  | true |  |  |  |
-| content | text |  | true |  |  |  |
-| timed_out | boolean |  | true |  |  |  |
-| error_msg | text |  | true |  |  |  |
-| created | timestamp with time zone | now() | false |  |  |  |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| _http_response_created_idx | CREATE INDEX _http_response_created_idx ON net._http_response USING btree (created) |
-
-## Relations
-
-![er](net._http_response.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/net._http_response.svg b/docs/database/net._http_response.svg
deleted file mode 100644
index ce4d35d7a..000000000
--- a/docs/database/net._http_response.svg
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: net._http_response Pages: 1 -->
-<svg width="395pt" height="375pt"
- viewBox="0.00 0.00 395.00 375.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 371)">
-<title>net._http_response</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-371 391,-371 391,4 -4,4"/>
-<!-- net._http_response -->
-<g id="node1" class="node">
-<title>net._http_response</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-285.5 46.5,-320.5 341.5,-320.5 341.5,-285.5 46.5,-285.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-285.5 46.5,-320.5 341.5,-320.5 341.5,-285.5 46.5,-285.5"/>
-<text text-anchor="start" x="53.1814" y="-298.3" font-family="Arial Bold" font-size="18.00" fill="#000000">net._http_response</text>
-<text text-anchor="start" x="207.2506" y="-298.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="241.4554" y="-298.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-255.5 46.5,-285.5 341.5,-285.5 341.5,-255.5 46.5,-255.5"/>
-<text text-anchor="start" x="53.5" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="68.2798" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-225.5 46.5,-255.5 341.5,-255.5 341.5,-225.5 46.5,-225.5"/>
-<text text-anchor="start" x="53.5" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">status_code </text>
-<text text-anchor="start" x="132.8674" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-195.5 46.5,-225.5 341.5,-225.5 341.5,-195.5 46.5,-195.5"/>
-<text text-anchor="start" x="53.5" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">content_type </text>
-<text text-anchor="start" x="137.5406" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-195.5 341.5,-195.5 341.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">headers </text>
-<text text-anchor="start" x="107.9642" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 341.5,-165.5 341.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">content </text>
-<text text-anchor="start" x="103.3022" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 341.5,-135.5 341.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">timed_out </text>
-<text text-anchor="start" x="118.852" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 341.5,-105.5 341.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">error_msg </text>
-<text text-anchor="start" x="121.1634" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 341.5,-75.5 341.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">created </text>
-<text text-anchor="start" x="104.0722" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-322.5 342.5,-322.5 342.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/net.http_request_queue.md b/docs/database/net.http_request_queue.md
deleted file mode 100644
index af4cbff0b..000000000
--- a/docs/database/net.http_request_queue.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# net.http_request_queue
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | bigint | nextval('net.http_request_queue_id_seq'::regclass) | false |  |  |  |
-| method | net.http_method |  | false |  |  |  |
-| url | text |  | false |  |  |  |
-| headers | jsonb |  | false |  |  |  |
-| body | bytea |  | true |  |  |  |
-| timeout_milliseconds | integer |  | false |  |  |  |
-
-## Relations
-
-![er](net.http_request_queue.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/net.http_request_queue.svg b/docs/database/net.http_request_queue.svg
deleted file mode 100644
index 9472b9f9c..000000000
--- a/docs/database/net.http_request_queue.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: net.http_request_queue Pages: 1 -->
-<svg width="431pt" height="315pt"
- viewBox="0.00 0.00 431.00 315.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 311)">
-<title>net.http_request_queue</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-311 427,-311 427,4 -4,4"/>
-<!-- net.http_request_queue -->
-<g id="node1" class="node">
-<title>net.http_request_queue</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-225.5 46.5,-260.5 377.5,-260.5 377.5,-225.5 46.5,-225.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-225.5 46.5,-260.5 377.5,-260.5 377.5,-225.5 46.5,-225.5"/>
-<text text-anchor="start" x="53.1679" y="-238.3" font-family="Arial Bold" font-size="18.00" fill="#000000">net.http_request_queue</text>
-<text text-anchor="start" x="243.2641" y="-238.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="277.4689" y="-238.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-195.5 46.5,-225.5 377.5,-225.5 377.5,-195.5 46.5,-195.5"/>
-<text text-anchor="start" x="53.5" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="68.2798" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-195.5 377.5,-195.5 377.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">method </text>
-<text text-anchor="start" x="104.0722" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[net.http_method]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 377.5,-165.5 377.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">url </text>
-<text text-anchor="start" x="72.9404" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 377.5,-135.5 377.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">headers </text>
-<text text-anchor="start" x="107.9642" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 377.5,-105.5 377.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">body </text>
-<text text-anchor="start" x="87.7384" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 377.5,-75.5 377.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">timeout_milliseconds </text>
-<text text-anchor="start" x="187.2868" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-262.5 378.5,-262.5 378.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/pgsodium.decrypted_key.md b/docs/database/pgsodium.decrypted_key.md
deleted file mode 100644
index 8c383e7a3..000000000
--- a/docs/database/pgsodium.decrypted_key.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# pgsodium.decrypted_key
-
-## Description
-
-<details>
-<summary><strong>Table Definition</strong></summary>
-
-```sql
-CREATE VIEW decrypted_key AS (
- SELECT key.id,
-    key.status,
-    key.created,
-    key.expires,
-    key.key_type,
-    key.key_id,
-    key.key_context,
-    key.name,
-    key.associated_data,
-    key.raw_key,
-        CASE
-            WHEN (key.raw_key IS NULL) THEN NULL::bytea
-            ELSE
-            CASE
-                WHEN (key.parent_key IS NULL) THEN NULL::bytea
-                ELSE pgsodium.crypto_aead_det_decrypt(key.raw_key, convert_to(((key.id)::text || key.associated_data), 'utf8'::name), key.parent_key, key.raw_key_nonce)
-            END
-        END AS decrypted_raw_key,
-    key.raw_key_nonce,
-    key.parent_key,
-    key.comment
-   FROM pgsodium.key
-)
-```
-
-</details>
-
-## Referenced Tables
-
-- [pgsodium.key](pgsodium.key.md)
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid |  | true |  |  |  |
-| status | pgsodium.key_status |  | true |  |  |  |
-| created | timestamp with time zone |  | true |  |  |  |
-| expires | timestamp with time zone |  | true |  |  |  |
-| key_type | pgsodium.key_type |  | true |  |  |  |
-| key_id | bigint |  | true |  |  |  |
-| key_context | bytea |  | true |  |  |  |
-| name | text |  | true |  |  |  |
-| associated_data | text |  | true |  |  |  |
-| raw_key | bytea |  | true |  |  |  |
-| decrypted_raw_key | bytea |  | true |  |  |  |
-| raw_key_nonce | bytea |  | true |  |  |  |
-| parent_key | uuid |  | true |  |  |  |
-| comment | text |  | true |  |  |  |
-
-## Relations
-
-![er](pgsodium.decrypted_key.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/pgsodium.decrypted_key.svg b/docs/database/pgsodium.decrypted_key.svg
deleted file mode 100644
index 934d30424..000000000
--- a/docs/database/pgsodium.decrypted_key.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: pgsodium.decrypted_key Pages: 1 -->
-<svg width="391pt" height="555pt"
- viewBox="0.00 0.00 391.00 555.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 551)">
-<title>pgsodium.decrypted_key</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-551 387,-551 387,4 -4,4"/>
-<!-- pgsodium.decrypted_key -->
-<g id="node1" class="node">
-<title>pgsodium.decrypted_key</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-465.5 46.5,-500.5 337.5,-500.5 337.5,-465.5 46.5,-465.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-465.5 46.5,-500.5 337.5,-500.5 337.5,-465.5 46.5,-465.5"/>
-<text text-anchor="start" x="53.0891" y="-478.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.decrypted_key</text>
-<text text-anchor="start" x="253.1465" y="-478.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="287.3513" y="-478.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-435.5 46.5,-465.5 337.5,-465.5 337.5,-435.5 46.5,-435.5"/>
-<text text-anchor="start" x="53.5" y="-446.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="68.2798" y="-446.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-405.5 46.5,-435.5 337.5,-435.5 337.5,-405.5 46.5,-405.5"/>
-<text text-anchor="start" x="53.5" y="-416.9" font-family="Arial" font-size="14.00" fill="#000000">status </text>
-<text text-anchor="start" x="94.737" y="-416.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_status]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-375.5 46.5,-405.5 337.5,-405.5 337.5,-375.5 46.5,-375.5"/>
-<text text-anchor="start" x="53.5" y="-386.9" font-family="Arial" font-size="14.00" fill="#000000">created </text>
-<text text-anchor="start" x="104.0722" y="-386.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-345.5 46.5,-375.5 337.5,-375.5 337.5,-345.5 46.5,-345.5"/>
-<text text-anchor="start" x="53.5" y="-356.9" font-family="Arial" font-size="14.00" fill="#000000">expires </text>
-<text text-anchor="start" x="102.5056" y="-356.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-315.5 46.5,-345.5 337.5,-345.5 337.5,-315.5 46.5,-315.5"/>
-<text text-anchor="start" x="53.5" y="-326.9" font-family="Arial" font-size="14.00" fill="#000000">key_type </text>
-<text text-anchor="start" x="113.4116" y="-326.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_type]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-285.5 46.5,-315.5 337.5,-315.5 337.5,-285.5 46.5,-285.5"/>
-<text text-anchor="start" x="53.5" y="-296.9" font-family="Arial" font-size="14.00" fill="#000000">key_id </text>
-<text text-anchor="start" x="97.845" y="-296.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-255.5 46.5,-285.5 337.5,-285.5 337.5,-255.5 46.5,-255.5"/>
-<text text-anchor="start" x="53.5" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">key_context </text>
-<text text-anchor="start" x="132.0848" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-225.5 46.5,-255.5 337.5,-255.5 337.5,-225.5 46.5,-225.5"/>
-<text text-anchor="start" x="53.5" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">name </text>
-<text text-anchor="start" x="92.399" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-195.5 46.5,-225.5 337.5,-225.5 337.5,-195.5 46.5,-195.5"/>
-<text text-anchor="start" x="53.5" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">associated_data </text>
-<text text-anchor="start" x="159.3218" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-195.5 337.5,-195.5 337.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key </text>
-<text text-anchor="start" x="109.5056" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 337.5,-165.5 337.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">decrypted_raw_key </text>
-<text text-anchor="start" x="178.7524" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 337.5,-135.5 337.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key_nonce </text>
-<text text-anchor="start" x="155.4186" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 337.5,-105.5 337.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">parent_key </text>
-<text text-anchor="start" x="126.6374" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 337.5,-75.5 337.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">comment </text>
-<text text-anchor="start" x="114.9502" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-502.5 338.5,-502.5 338.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/pgsodium.key.md b/docs/database/pgsodium.key.md
deleted file mode 100644
index 974783813..000000000
--- a/docs/database/pgsodium.key.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# pgsodium.key
-
-## Description
-
-This table holds metadata for derived keys given a key_id and key_context. The raw key is never stored.
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid | gen_random_uuid() | false | [pgsodium.key](pgsodium.key.md) [vault.secrets](vault.secrets.md) |  |  |
-| status | pgsodium.key_status | 'valid'::pgsodium.key_status | true |  |  |  |
-| created | timestamp with time zone | CURRENT_TIMESTAMP | false |  |  |  |
-| expires | timestamp with time zone |  | true |  |  |  |
-| key_type | pgsodium.key_type |  | true |  |  |  |
-| key_id | bigint | nextval('pgsodium.key_key_id_seq'::regclass) | true |  |  |  |
-| key_context | bytea | '\x7067736f6469756d'::bytea | true |  |  |  |
-| name | text |  | true |  |  |  |
-| associated_data | text | 'associated'::text | true |  |  |  |
-| raw_key | bytea |  | true |  |  |  |
-| raw_key_nonce | bytea |  | true |  |  |  |
-| parent_key | uuid |  | true |  | [pgsodium.key](pgsodium.key.md) |  |
-| comment | text |  | true |  |  |  |
-| user_data | text |  | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| key_key_context_check | CHECK | CHECK ((length(key_context) = 8)) |
-| pgsodium_raw | CHECK | CHECK (<br>CASE<br>    WHEN (raw_key IS NOT NULL) THEN ((key_id IS NULL) AND (key_context IS NULL) AND (parent_key IS NOT NULL))<br>    ELSE ((key_id IS NOT NULL) AND (key_context IS NOT NULL) AND (parent_key IS NULL))<br>END) |
-| key_parent_key_fkey | FOREIGN KEY | FOREIGN KEY (parent_key) REFERENCES pgsodium.key(id) |
-| key_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-| pgsodium_key_unique_name | UNIQUE | UNIQUE (name) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| key_pkey | CREATE UNIQUE INDEX key_pkey ON pgsodium.key USING btree (id) |
-| key_status_idx | CREATE INDEX key_status_idx ON pgsodium.key USING btree (status) WHERE (status = ANY (ARRAY['valid'::pgsodium.key_status, 'default'::pgsodium.key_status])) |
-| key_status_idx1 | CREATE UNIQUE INDEX key_status_idx1 ON pgsodium.key USING btree (status) WHERE (status = 'default'::pgsodium.key_status) |
-| key_key_id_key_context_key_type_idx | CREATE UNIQUE INDEX key_key_id_key_context_key_type_idx ON pgsodium.key USING btree (key_id, key_context, key_type) |
-| pgsodium_key_unique_name | CREATE UNIQUE INDEX pgsodium_key_unique_name ON pgsodium.key USING btree (name) |
-
-## Triggers
-
-| Name | Definition |
-| ---- | ---------- |
-| key_encrypt_secret_trigger_raw_key | CREATE TRIGGER key_encrypt_secret_trigger_raw_key BEFORE INSERT OR UPDATE OF raw_key ON pgsodium.key FOR EACH ROW EXECUTE FUNCTION pgsodium.key_encrypt_secret_raw_key() |
-
-## Relations
-
-![er](pgsodium.key.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/pgsodium.key.svg b/docs/database/pgsodium.key.svg
deleted file mode 100644
index 9ba436b27..000000000
--- a/docs/database/pgsodium.key.svg
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: pgsodium.key Pages: 1 -->
-<svg width="709pt" height="952pt"
- viewBox="0.00 0.00 709.27 952.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 948)">
-<title>pgsodium.key</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-948 705.2694,-948 705.2694,4 -4,4"/>
-<!-- pgsodium.key -->
-<g id="node1" class="node">
-<title>pgsodium.key</title>
-<polygon fill="#efefef" stroke="transparent" points="164.2694,-465.5 164.2694,-500.5 416.2694,-500.5 416.2694,-465.5 164.2694,-465.5"/>
-<polygon fill="none" stroke="#000000" points="164.2694,-465.5 164.2694,-500.5 416.2694,-500.5 416.2694,-465.5 164.2694,-465.5"/>
-<text text-anchor="start" x="170.9725" y="-478.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.key</text>
-<text text-anchor="start" x="281.9983" y="-478.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="316.2031" y="-478.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-435.5 164.2694,-465.5 416.2694,-465.5 416.2694,-435.5 164.2694,-435.5"/>
-<text text-anchor="start" x="171.2694" y="-446.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="186.0492" y="-446.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-405.5 164.2694,-435.5 416.2694,-435.5 416.2694,-405.5 164.2694,-405.5"/>
-<text text-anchor="start" x="171.2694" y="-416.9" font-family="Arial" font-size="14.00" fill="#000000">status </text>
-<text text-anchor="start" x="212.5064" y="-416.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_status]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-375.5 164.2694,-405.5 416.2694,-405.5 416.2694,-375.5 164.2694,-375.5"/>
-<text text-anchor="start" x="171.2694" y="-386.9" font-family="Arial" font-size="14.00" fill="#000000">created </text>
-<text text-anchor="start" x="221.8416" y="-386.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-345.5 164.2694,-375.5 416.2694,-375.5 416.2694,-345.5 164.2694,-345.5"/>
-<text text-anchor="start" x="171.2694" y="-356.9" font-family="Arial" font-size="14.00" fill="#000000">expires </text>
-<text text-anchor="start" x="220.275" y="-356.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-315.5 164.2694,-345.5 416.2694,-345.5 416.2694,-315.5 164.2694,-315.5"/>
-<text text-anchor="start" x="171.2694" y="-326.9" font-family="Arial" font-size="14.00" fill="#000000">key_type </text>
-<text text-anchor="start" x="231.181" y="-326.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_type]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-285.5 164.2694,-315.5 416.2694,-315.5 416.2694,-285.5 164.2694,-285.5"/>
-<text text-anchor="start" x="171.2694" y="-296.9" font-family="Arial" font-size="14.00" fill="#000000">key_id </text>
-<text text-anchor="start" x="215.6144" y="-296.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-255.5 164.2694,-285.5 416.2694,-285.5 416.2694,-255.5 164.2694,-255.5"/>
-<text text-anchor="start" x="171.2694" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">key_context </text>
-<text text-anchor="start" x="249.8542" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-225.5 164.2694,-255.5 416.2694,-255.5 416.2694,-225.5 164.2694,-225.5"/>
-<text text-anchor="start" x="171.2694" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">name </text>
-<text text-anchor="start" x="210.1684" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-195.5 164.2694,-225.5 416.2694,-225.5 416.2694,-195.5 164.2694,-195.5"/>
-<text text-anchor="start" x="171.2694" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">associated_data </text>
-<text text-anchor="start" x="277.0912" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-165.5 164.2694,-195.5 416.2694,-195.5 416.2694,-165.5 164.2694,-165.5"/>
-<text text-anchor="start" x="171.2694" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key </text>
-<text text-anchor="start" x="227.275" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-135.5 164.2694,-165.5 416.2694,-165.5 416.2694,-135.5 164.2694,-135.5"/>
-<text text-anchor="start" x="171.2694" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key_nonce </text>
-<text text-anchor="start" x="273.188" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-105.5 164.2694,-135.5 416.2694,-135.5 416.2694,-105.5 164.2694,-105.5"/>
-<text text-anchor="start" x="171.2694" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">parent_key </text>
-<text text-anchor="start" x="244.4068" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-75.5 164.2694,-105.5 416.2694,-105.5 416.2694,-75.5 164.2694,-75.5"/>
-<text text-anchor="start" x="171.2694" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">comment </text>
-<text text-anchor="start" x="232.7196" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="164.2694,-45.5 164.2694,-75.5 416.2694,-75.5 416.2694,-45.5 164.2694,-45.5"/>
-<text text-anchor="start" x="171.2694" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">user_data </text>
-<text text-anchor="start" x="237.4068" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="162.7694,-44.5 162.7694,-502.5 417.7694,-502.5 417.7694,-44.5 162.7694,-44.5"/>
-</g>
-<!-- pgsodium.key&#45;&gt;pgsodium.key -->
-<g id="edge1" class="edge">
-<title>pgsodium.key:parent_key&#45;&gt;pgsodium.key:id</title>
-<path fill="none" stroke="#000000" d="M291.4278,-145.6892C299.2513,-337.1282 298.8652,-792 290.2694,-792 281.5331,-792 281.2772,-633.0714 289.5016,-465.6756"/>
-<polygon fill="#000000" stroke="#000000" points="291.4267,-145.6612 295.4959,-135.4783 291.2134,-140.6658 291,-135.6703 291,-135.6703 291,-135.6703 291.2134,-140.6658 286.5041,-135.8624 291.4267,-145.6612 291.4267,-145.6612"/>
-<text text-anchor="start" x="7.3785" y="-145.6703" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (parent_key) REFERENCES pgsodium.key(id)</text>
-</g>
-<!-- vault.secrets -->
-<g id="node2" class="node">
-<title>vault.secrets</title>
-<polygon fill="#efefef" stroke="transparent" points="148.2694,-865.5 148.2694,-900.5 431.2694,-900.5 431.2694,-865.5 148.2694,-865.5"/>
-<polygon fill="none" stroke="#000000" points="148.2694,-865.5 148.2694,-900.5 431.2694,-900.5 431.2694,-865.5 148.2694,-865.5"/>
-<text text-anchor="start" x="175.4765" y="-878.3" font-family="Arial Bold" font-size="18.00" fill="#000000">vault.secrets</text>
-<text text-anchor="start" x="276.4943" y="-878.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="310.6991" y="-878.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="148.2694,-835.5 148.2694,-865.5 431.2694,-865.5 431.2694,-835.5 148.2694,-835.5"/>
-<text text-anchor="start" x="155.2694" y="-846.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="200.3634" y="-846.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="148.2694,-805.5 148.2694,-835.5 431.2694,-835.5 431.2694,-805.5 148.2694,-805.5"/>
-<text text-anchor="start" x="155.2694" y="-816.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="224.4826" y="-816.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="148.2694,-775.5 148.2694,-805.5 431.2694,-805.5 431.2694,-775.5 148.2694,-775.5"/>
-<text text-anchor="start" x="155.2694" y="-786.9" font-family="Arial" font-size="14.00" fill="#000000">description    </text>
-<text text-anchor="start" x="257.1516" y="-786.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="148.2694,-745.5 148.2694,-775.5 431.2694,-775.5 431.2694,-745.5 148.2694,-745.5"/>
-<text text-anchor="start" x="155.2694" y="-756.9" font-family="Arial" font-size="14.00" fill="#000000">secret    </text>
-<text text-anchor="start" x="227.5906" y="-756.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="148.2694,-715.5 148.2694,-745.5 431.2694,-745.5 431.2694,-715.5 148.2694,-715.5"/>
-<text text-anchor="start" x="155.2694" y="-726.9" font-family="Arial" font-size="14.00" fill="#000000">key_id    </text>
-<text text-anchor="start" x="229.9286" y="-726.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="148.2694,-685.5 148.2694,-715.5 431.2694,-715.5 431.2694,-685.5 148.2694,-685.5"/>
-<text text-anchor="start" x="155.2694" y="-696.9" font-family="Arial" font-size="14.00" fill="#000000">nonce    </text>
-<text text-anchor="start" x="227.6046" y="-696.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="148.2694,-655.5 148.2694,-685.5 431.2694,-685.5 431.2694,-655.5 148.2694,-655.5"/>
-<text text-anchor="start" x="155.2694" y="-666.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="255.6116" y="-666.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="148.2694,-625.5 148.2694,-655.5 431.2694,-655.5 431.2694,-625.5 148.2694,-625.5"/>
-<text text-anchor="start" x="154.8038" y="-636.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="259.0506" y="-636.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- vault.secrets&#45;&gt;pgsodium.key -->
-<g id="edge2" class="edge">
-<title>vault.secrets:key_id&#45;&gt;pgsodium.key:id</title>
-<path fill="none" stroke="#000000" d="M441.2464,-729.6435C494.312,-719.9113 472.0566,-629.6556 431.2694,-583 352.4598,-492.8512 243.0791,-637.1488 164.2694,-547 136.0412,-514.7103 121.3806,-450.5 164.2694,-450.5"/>
-<polygon fill="#000000" stroke="#000000" points="441.2328,-729.6445 430.8845,-726.0165 436.2511,-730.0723 431.2694,-730.5 431.2694,-730.5 431.2694,-730.5 436.2511,-730.0723 431.6544,-734.9835 441.2328,-729.6445 441.2328,-729.6445"/>
-<text text-anchor="start" x="437.9309" y="-740.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (key_id) REFERENCES pgsodium.key(id)</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/pgsodium.mask_columns.md b/docs/database/pgsodium.mask_columns.md
deleted file mode 100644
index 74198bb0a..000000000
--- a/docs/database/pgsodium.mask_columns.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# pgsodium.mask_columns
-
-## Description
-
-<details>
-<summary><strong>Table Definition</strong></summary>
-
-```sql
-CREATE VIEW mask_columns AS (
- SELECT a.attname,
-    a.attrelid,
-    m.key_id,
-    m.key_id_column,
-    m.associated_columns,
-    m.nonce_column,
-    m.format_type
-   FROM (pg_attribute a
-     LEFT JOIN pgsodium.masking_rule m ON (((m.attrelid = a.attrelid) AND (m.attname = a.attname))))
-  WHERE ((a.attnum > 0) AND (NOT a.attisdropped))
-  ORDER BY a.attnum
-)
-```
-
-</details>
-
-## Referenced Tables
-
-- pg_attribute
-- [pgsodium.masking_rule](pgsodium.masking_rule.md)
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| attname | name |  | true |  |  |  |
-| attrelid | oid |  | true |  |  |  |
-| key_id | text |  | true |  |  |  |
-| key_id_column | text |  | true |  |  |  |
-| associated_columns | text |  | true |  |  |  |
-| nonce_column | text |  | true |  |  |  |
-| format_type | text |  | true |  |  |  |
-
-## Relations
-
-![er](pgsodium.mask_columns.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/pgsodium.mask_columns.svg b/docs/database/pgsodium.mask_columns.svg
deleted file mode 100644
index 931fa30af..000000000
--- a/docs/database/pgsodium.mask_columns.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: pgsodium.mask_columns Pages: 1 -->
-<svg width="394pt" height="345pt"
- viewBox="0.00 0.00 394.00 345.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 341)">
-<title>pgsodium.mask_columns</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-341 390,-341 390,4 -4,4"/>
-<!-- pgsodium.mask_columns -->
-<g id="node1" class="node">
-<title>pgsodium.mask_columns</title>
-<polygon fill="#efefef" stroke="transparent" points="46,-255.5 46,-290.5 340,-290.5 340,-255.5 46,-255.5"/>
-<polygon fill="none" stroke="#000000" points="46,-255.5 46,-290.5 340,-290.5 340,-255.5 46,-255.5"/>
-<text text-anchor="start" x="52.6032" y="-268.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.mask_columns</text>
-<text text-anchor="start" x="255.6324" y="-268.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="289.8372" y="-268.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="46,-225.5 46,-255.5 340,-255.5 340,-225.5 46,-225.5"/>
-<text text-anchor="start" x="53" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">attname </text>
-<text text-anchor="start" x="107.4628" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[name]</text>
-<polygon fill="none" stroke="#000000" points="46,-195.5 46,-225.5 340,-225.5 340,-195.5 46,-195.5"/>
-<text text-anchor="start" x="53" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">attrelid </text>
-<text text-anchor="start" x="98.8934" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[oid]</text>
-<polygon fill="none" stroke="#000000" points="46,-165.5 46,-195.5 340,-195.5 340,-165.5 46,-165.5"/>
-<text text-anchor="start" x="53" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">key_id </text>
-<text text-anchor="start" x="97.345" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46,-135.5 46,-165.5 340,-165.5 340,-135.5 46,-135.5"/>
-<text text-anchor="start" x="53" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">key_id_column </text>
-<text text-anchor="start" x="150.2426" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46,-105.5 46,-135.5 340,-135.5 340,-105.5 46,-105.5"/>
-<text text-anchor="start" x="53" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">associated_columns </text>
-<text text-anchor="start" x="183.6984" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46,-75.5 46,-105.5 340,-105.5 340,-75.5 46,-75.5"/>
-<text text-anchor="start" x="53" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">nonce_column </text>
-<text text-anchor="start" x="147.9186" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46,-45.5 46,-75.5 340,-75.5 340,-45.5 46,-45.5"/>
-<text text-anchor="start" x="53" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">format_type </text>
-<text text-anchor="start" x="130.7966" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-292.5 341.5,-292.5 341.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/pgsodium.masking_rule.md b/docs/database/pgsodium.masking_rule.md
deleted file mode 100644
index 339482785..000000000
--- a/docs/database/pgsodium.masking_rule.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# pgsodium.masking_rule
-
-## Description
-
-<details>
-<summary><strong>Table Definition</strong></summary>
-
-```sql
-CREATE VIEW masking_rule AS (
- WITH const AS (
-         SELECT 'encrypt +with +key +id +([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})'::text AS pattern_key_id,
-            'encrypt +with +key +column +([\w\"\-$]+)'::text AS pattern_key_id_column,
-            '(?<=associated) +\(([\w\"\-$, ]+)\)'::text AS pattern_associated_columns,
-            '(?<=nonce) +([\w\"\-$]+)'::text AS pattern_nonce_column,
-            '(?<=decrypt with view) +([\w\"\-$]+\.[\w\"\-$]+)'::text AS pattern_view_name,
-            '(?<=security invoker)'::text AS pattern_security_invoker
-        ), rules_from_seclabels AS (
-         SELECT sl.objoid AS attrelid,
-            sl.objsubid AS attnum,
-            (c.relnamespace)::regnamespace AS relnamespace,
-            c.relname,
-            a.attname,
-            format_type(a.atttypid, a.atttypmod) AS format_type,
-            sl.label AS col_description,
-            (regexp_match(sl.label, k.pattern_key_id_column, 'i'::text))[1] AS key_id_column,
-            (regexp_match(sl.label, k.pattern_key_id, 'i'::text))[1] AS key_id,
-            (regexp_match(sl.label, k.pattern_associated_columns, 'i'::text))[1] AS associated_columns,
-            (regexp_match(sl.label, k.pattern_nonce_column, 'i'::text))[1] AS nonce_column,
-            COALESCE((regexp_match(sl2.label, k.pattern_view_name, 'i'::text))[1], (((c.relnamespace)::regnamespace || '.'::text) || quote_ident(('decrypted_'::text || (c.relname)::text)))) AS view_name,
-            100 AS priority,
-            ((regexp_match(sl.label, k.pattern_security_invoker, 'i'::text))[1] IS NOT NULL) AS security_invoker
-           FROM const k,
-            (((pg_seclabel sl
-             JOIN pg_class c ON (((sl.classoid = c.tableoid) AND (sl.objoid = c.oid))))
-             JOIN pg_attribute a ON (((a.attrelid = c.oid) AND (sl.objsubid = a.attnum))))
-             LEFT JOIN pg_seclabel sl2 ON (((sl2.objoid = c.oid) AND (sl2.objsubid = 0))))
-          WHERE ((a.attnum > 0) AND (((c.relnamespace)::regnamespace)::oid <> ('pg_catalog'::regnamespace)::oid) AND (NOT a.attisdropped) AND (sl.label ~~* 'ENCRYPT%'::text) AND (sl.provider = 'pgsodium'::text))
-        )
- SELECT DISTINCT ON (rules_from_seclabels.attrelid, rules_from_seclabels.attnum) rules_from_seclabels.attrelid,
-    rules_from_seclabels.attnum,
-    rules_from_seclabels.relnamespace,
-    rules_from_seclabels.relname,
-    rules_from_seclabels.attname,
-    rules_from_seclabels.format_type,
-    rules_from_seclabels.col_description,
-    rules_from_seclabels.key_id_column,
-    rules_from_seclabels.key_id,
-    rules_from_seclabels.associated_columns,
-    rules_from_seclabels.nonce_column,
-    rules_from_seclabels.view_name,
-    rules_from_seclabels.priority,
-    rules_from_seclabels.security_invoker
-   FROM rules_from_seclabels
-  ORDER BY rules_from_seclabels.attrelid, rules_from_seclabels.attnum, rules_from_seclabels.priority DESC
-)
-```
-
-</details>
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| attrelid | oid |  | true |  |  |  |
-| attnum | integer |  | true |  |  |  |
-| relnamespace | regnamespace |  | true |  |  |  |
-| relname | name |  | true |  |  |  |
-| attname | name |  | true |  |  |  |
-| format_type | text |  | true |  |  |  |
-| col_description | text |  | true |  |  |  |
-| key_id_column | text |  | true |  |  |  |
-| key_id | text |  | true |  |  |  |
-| associated_columns | text |  | true |  |  |  |
-| nonce_column | text |  | true |  |  |  |
-| view_name | text |  | true |  |  |  |
-| priority | integer |  | true |  |  |  |
-| security_invoker | boolean |  | true |  |  |  |
-
-## Relations
-
-![er](pgsodium.masking_rule.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/pgsodium.masking_rule.svg b/docs/database/pgsodium.masking_rule.svg
deleted file mode 100644
index ade669e03..000000000
--- a/docs/database/pgsodium.masking_rule.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: pgsodium.masking_rule Pages: 1 -->
-<svg width="381pt" height="555pt"
- viewBox="0.00 0.00 381.00 555.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 551)">
-<title>pgsodium.masking_rule</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-551 377,-551 377,4 -4,4"/>
-<!-- pgsodium.masking_rule -->
-<g id="node1" class="node">
-<title>pgsodium.masking_rule</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-465.5 46.5,-500.5 327.5,-500.5 327.5,-465.5 46.5,-465.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-465.5 46.5,-500.5 327.5,-500.5 327.5,-465.5 46.5,-465.5"/>
-<text text-anchor="start" x="53.103" y="-478.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.masking_rule</text>
-<text text-anchor="start" x="243.1326" y="-478.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="277.3374" y="-478.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-435.5 46.5,-465.5 327.5,-465.5 327.5,-435.5 46.5,-435.5"/>
-<text text-anchor="start" x="53.5" y="-446.9" font-family="Arial" font-size="14.00" fill="#000000">attrelid </text>
-<text text-anchor="start" x="99.3934" y="-446.9" font-family="Arial" font-size="14.00" fill="#666666">[oid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-405.5 46.5,-435.5 327.5,-435.5 327.5,-405.5 46.5,-405.5"/>
-<text text-anchor="start" x="53.5" y="-416.9" font-family="Arial" font-size="14.00" fill="#000000">attnum </text>
-<text text-anchor="start" x="100.1802" y="-416.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-375.5 46.5,-405.5 327.5,-405.5 327.5,-375.5 46.5,-375.5"/>
-<text text-anchor="start" x="53.5" y="-386.9" font-family="Arial" font-size="14.00" fill="#000000">relnamespace </text>
-<text text-anchor="start" x="145.2966" y="-386.9" font-family="Arial" font-size="14.00" fill="#666666">[regnamespace]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-345.5 46.5,-375.5 327.5,-375.5 327.5,-345.5 46.5,-345.5"/>
-<text text-anchor="start" x="53.5" y="-356.9" font-family="Arial" font-size="14.00" fill="#000000">relname </text>
-<text text-anchor="start" x="107.9488" y="-356.9" font-family="Arial" font-size="14.00" fill="#666666">[name]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-315.5 46.5,-345.5 327.5,-345.5 327.5,-315.5 46.5,-315.5"/>
-<text text-anchor="start" x="53.5" y="-326.9" font-family="Arial" font-size="14.00" fill="#000000">attname </text>
-<text text-anchor="start" x="107.9628" y="-326.9" font-family="Arial" font-size="14.00" fill="#666666">[name]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-285.5 46.5,-315.5 327.5,-315.5 327.5,-285.5 46.5,-285.5"/>
-<text text-anchor="start" x="53.5" y="-296.9" font-family="Arial" font-size="14.00" fill="#000000">format_type </text>
-<text text-anchor="start" x="131.2966" y="-296.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-255.5 46.5,-285.5 327.5,-285.5 327.5,-255.5 46.5,-255.5"/>
-<text text-anchor="start" x="53.5" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">col_description </text>
-<text text-anchor="start" x="150.7398" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-225.5 46.5,-255.5 327.5,-255.5 327.5,-225.5 46.5,-225.5"/>
-<text text-anchor="start" x="53.5" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">key_id_column </text>
-<text text-anchor="start" x="150.7426" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-195.5 46.5,-225.5 327.5,-225.5 327.5,-195.5 46.5,-195.5"/>
-<text text-anchor="start" x="53.5" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">key_id </text>
-<text text-anchor="start" x="97.845" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-195.5 327.5,-195.5 327.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">associated_columns </text>
-<text text-anchor="start" x="184.1984" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 327.5,-165.5 327.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">nonce_column </text>
-<text text-anchor="start" x="148.4186" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 327.5,-135.5 327.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">view_name </text>
-<text text-anchor="start" x="128.1774" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 327.5,-105.5 327.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">priority </text>
-<text text-anchor="start" x="99.3808" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 327.5,-75.5 327.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">security_invoker </text>
-<text text-anchor="start" x="158.5112" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-502.5 328.5,-502.5 328.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/pgsodium.valid_key.md b/docs/database/pgsodium.valid_key.md
deleted file mode 100644
index 666f5b9a0..000000000
--- a/docs/database/pgsodium.valid_key.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# pgsodium.valid_key
-
-## Description
-
-<details>
-<summary><strong>Table Definition</strong></summary>
-
-```sql
-CREATE VIEW valid_key AS (
- SELECT key.id,
-    key.name,
-    key.status,
-    key.key_type,
-    key.key_id,
-    key.key_context,
-    key.created,
-    key.expires,
-    key.associated_data
-   FROM pgsodium.key
-  WHERE ((key.status = ANY (ARRAY['valid'::pgsodium.key_status, 'default'::pgsodium.key_status])) AND
-        CASE
-            WHEN (key.expires IS NULL) THEN true
-            ELSE (key.expires > now())
-        END)
-)
-```
-
-</details>
-
-## Referenced Tables
-
-- [pgsodium.key](pgsodium.key.md)
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid |  | true |  |  |  |
-| name | text |  | true |  |  |  |
-| status | pgsodium.key_status |  | true |  |  |  |
-| key_type | pgsodium.key_type |  | true |  |  |  |
-| key_id | bigint |  | true |  |  |  |
-| key_context | bytea |  | true |  |  |  |
-| created | timestamp with time zone |  | true |  |  |  |
-| expires | timestamp with time zone |  | true |  |  |  |
-| associated_data | text |  | true |  |  |  |
-
-## Relations
-
-![er](pgsodium.valid_key.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/pgsodium.valid_key.svg b/docs/database/pgsodium.valid_key.svg
deleted file mode 100644
index 807fa951e..000000000
--- a/docs/database/pgsodium.valid_key.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: pgsodium.valid_key Pages: 1 -->
-<svg width="349pt" height="405pt"
- viewBox="0.00 0.00 349.00 405.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 401)">
-<title>pgsodium.valid_key</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-401 345,-401 345,4 -4,4"/>
-<!-- pgsodium.valid_key -->
-<g id="node1" class="node">
-<title>pgsodium.valid_key</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-315.5 46.5,-350.5 295.5,-350.5 295.5,-315.5 46.5,-315.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-315.5 46.5,-350.5 295.5,-350.5 295.5,-315.5 46.5,-315.5"/>
-<text text-anchor="start" x="53.1014" y="-328.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.valid_key</text>
-<text text-anchor="start" x="211.1342" y="-328.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="245.339" y="-328.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-285.5 46.5,-315.5 295.5,-315.5 295.5,-285.5 46.5,-285.5"/>
-<text text-anchor="start" x="53.5" y="-296.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="68.2798" y="-296.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-255.5 46.5,-285.5 295.5,-285.5 295.5,-255.5 46.5,-255.5"/>
-<text text-anchor="start" x="53.5" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">name </text>
-<text text-anchor="start" x="92.399" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-225.5 46.5,-255.5 295.5,-255.5 295.5,-225.5 46.5,-225.5"/>
-<text text-anchor="start" x="53.5" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">status </text>
-<text text-anchor="start" x="94.737" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_status]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-195.5 46.5,-225.5 295.5,-225.5 295.5,-195.5 46.5,-195.5"/>
-<text text-anchor="start" x="53.5" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">key_type </text>
-<text text-anchor="start" x="113.4116" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_type]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-195.5 295.5,-195.5 295.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">key_id </text>
-<text text-anchor="start" x="97.845" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 295.5,-165.5 295.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">key_context </text>
-<text text-anchor="start" x="132.0848" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 295.5,-135.5 295.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">created </text>
-<text text-anchor="start" x="104.0722" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 295.5,-105.5 295.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">expires </text>
-<text text-anchor="start" x="102.5056" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 295.5,-75.5 295.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">associated_data </text>
-<text text-anchor="start" x="159.3218" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-352.5 296.5,-352.5 296.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.app_config.md b/docs/database/public.app_config.md
deleted file mode 100644
index 05b404751..000000000
--- a/docs/database/public.app_config.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# public.app_config
-
-## Description
-
-Stores app config for different envs
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | text |  | false |  |  |  |
-| app_min_version | text |  | false |  |  |  |
-| app_privacy | jsonb |  | false |  |  |  |
-| app_terms | jsonb |  | false |  |  |  |
-| designer_privacy | jsonb |  | false |  |  |  |
-| designer_terms | jsonb |  | false |  |  |  |
-| imprint | jsonb |  | false |  |  |  |
-| contact | jsonb | '{"email": "hpi-info@hpi.de", "phone": "+49-(0)331 5509-0", "website": "https://hpi.de/", "organization": "Hasso Plattner Institute"}'::jsonb | false |  |  |  |
-| analytics | jsonb |  | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| AppConfig_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| AppConfig_pkey | CREATE UNIQUE INDEX "AppConfig_pkey" ON public.app_config USING btree (id) |
-
-## Relations
-
-![er](public.app_config.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.app_config.svg b/docs/database/public.app_config.svg
deleted file mode 100644
index 7c1a3cfa0..000000000
--- a/docs/database/public.app_config.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.app_config Pages: 1 -->
-<svg width="381pt" height="405pt"
- viewBox="0.00 0.00 381.00 405.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 401)">
-<title>public.app_config</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-401 377,-401 377,4 -4,4"/>
-<!-- public.app_config -->
-<g id="node1" class="node">
-<title>public.app_config</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-315.5 46.5,-350.5 327.5,-350.5 327.5,-315.5 46.5,-315.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-315.5 46.5,-350.5 327.5,-350.5 327.5,-315.5 46.5,-315.5"/>
-<text text-anchor="start" x="53.1915" y="-328.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.app_config</text>
-<text text-anchor="start" x="193.2405" y="-328.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="227.4453" y="-328.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-285.5 46.5,-315.5 327.5,-315.5 327.5,-285.5 46.5,-285.5"/>
-<text text-anchor="start" x="53.5" y="-296.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="68.2798" y="-296.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-255.5 46.5,-285.5 327.5,-285.5 327.5,-255.5 46.5,-255.5"/>
-<text text-anchor="start" x="53.5" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">app_min_version </text>
-<text text-anchor="start" x="163.9684" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-225.5 46.5,-255.5 327.5,-255.5 327.5,-225.5 46.5,-225.5"/>
-<text text-anchor="start" x="53.5" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">app_privacy </text>
-<text text-anchor="start" x="132.8534" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-195.5 46.5,-225.5 327.5,-225.5 327.5,-195.5 46.5,-195.5"/>
-<text text-anchor="start" x="53.5" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">app_terms </text>
-<text text-anchor="start" x="123.5154" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-195.5 327.5,-195.5 327.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">designer_privacy </text>
-<text text-anchor="start" x="163.1858" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 327.5,-165.5 327.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">designer_terms </text>
-<text text-anchor="start" x="153.8478" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 327.5,-135.5 327.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">imprint </text>
-<text text-anchor="start" x="99.3808" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 327.5,-105.5 327.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">contact </text>
-<text text-anchor="start" x="102.5196" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 327.5,-75.5 327.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">analytics </text>
-<text text-anchor="start" x="111.8422" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-352.5 328.5,-352.5 328.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.repo.md b/docs/database/public.repo.md
deleted file mode 100644
index 9e45555ca..000000000
--- a/docs/database/public.repo.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# public.repo
-
-## Description
-
-Git repo where the generated project is stored
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| project_id | text |  | false |  |  |  |
-| user_id | uuid |  | false |  | [public.user](public.user.md) |  |
-| study_id | uuid |  | false |  | [public.study](public.study.md) |  |
-| provider | git_provider |  | false |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| repo_studyId_fkey | FOREIGN KEY | FOREIGN KEY (study_id) REFERENCES study(id) |
-| repo_pkey | PRIMARY KEY | PRIMARY KEY (project_id) |
-| repo_userId_fkey | FOREIGN KEY | FOREIGN KEY (user_id) REFERENCES "user"(id) ON DELETE CASCADE |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| repo_pkey | CREATE UNIQUE INDEX repo_pkey ON public.repo USING btree (project_id) |
-
-## Relations
-
-![er](public.repo.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.repo.svg b/docs/database/public.repo.svg
deleted file mode 100644
index ac7efbd9a..000000000
--- a/docs/database/public.repo.svg
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.repo Pages: 1 -->
-<svg width="837pt" height="1042pt"
- viewBox="0.00 0.00 836.50 1042.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1038)">
-<title>public.repo</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1038 832.5,-1038 832.5,4 -4,4"/>
-<!-- public.repo -->
-<g id="node1" class="node">
-<title>public.repo</title>
-<polygon fill="#efefef" stroke="transparent" points="349,-952.5 349,-987.5 578,-987.5 578,-952.5 349,-952.5"/>
-<polygon fill="none" stroke="#000000" points="349,-952.5 349,-987.5 578,-987.5 578,-952.5 349,-952.5"/>
-<text text-anchor="start" x="355.706" y="-965.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.repo</text>
-<text text-anchor="start" x="443.726" y="-965.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="477.9308" y="-965.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="349,-922.5 349,-952.5 578,-952.5 578,-922.5 349,-922.5"/>
-<text text-anchor="start" x="356" y="-933.9" font-family="Arial" font-size="14.00" fill="#000000">project_id </text>
-<text text-anchor="start" x="420.568" y="-933.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="349,-892.5 349,-922.5 578,-922.5 578,-892.5 349,-892.5"/>
-<text text-anchor="start" x="356" y="-903.9" font-family="Arial" font-size="14.00" fill="#000000">user_id </text>
-<text text-anchor="start" x="405.7882" y="-903.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="349,-862.5 349,-892.5 578,-892.5 578,-862.5 349,-862.5"/>
-<text text-anchor="start" x="356" y="-873.9" font-family="Arial" font-size="14.00" fill="#000000">study_id </text>
-<text text-anchor="start" x="412.0182" y="-873.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="349,-832.5 349,-862.5 578,-862.5 578,-832.5 349,-832.5"/>
-<text text-anchor="start" x="356" y="-843.9" font-family="Arial" font-size="14.00" fill="#000000">provider </text>
-<text text-anchor="start" x="410.4488" y="-843.9" font-family="Arial" font-size="14.00" fill="#666666">[git_provider]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="347,-831.5 347,-989.5 579,-989.5 579,-831.5 347,-831.5"/>
-</g>
-<!-- public.user -->
-<g id="node2" class="node">
-<title>public.user</title>
-<polygon fill="#efefef" stroke="transparent" points="170,-402.5 170,-437.5 398,-437.5 398,-402.5 170,-402.5"/>
-<polygon fill="none" stroke="#000000" points="170,-402.5 170,-437.5 398,-437.5 398,-402.5 170,-402.5"/>
-<text text-anchor="start" x="176.7091" y="-415.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.user</text>
-<text text-anchor="start" x="263.7229" y="-415.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="297.9277" y="-415.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="170,-372.5 170,-402.5 398,-402.5 398,-372.5 170,-372.5"/>
-<text text-anchor="start" x="177" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="222.094" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="170,-342.5 170,-372.5 398,-372.5 398,-342.5 170,-342.5"/>
-<text text-anchor="start" x="177" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">email    </text>
-<text text-anchor="start" x="244.6438" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="170,-312.5 170,-342.5 398,-342.5 398,-312.5 170,-312.5"/>
-<text text-anchor="start" x="177" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">preferences    </text>
-<text text-anchor="start" x="285.1122" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- public.repo&#45;&gt;public.user -->
-<g id="edge1" class="edge">
-<title>public.repo:user_id&#45;&gt;public.user:id</title>
-<path fill="none" stroke="#000000" d="M338.9896,-905.9147C250.6401,-874.5244 510.327,-387.5 398,-387.5"/>
-<polygon fill="#000000" stroke="#000000" points="339.1231,-905.9357 348.2961,-911.9446 344.0615,-906.7179 349,-907.5 349,-907.5 349,-907.5 344.0615,-906.7179 349.7039,-903.0554 339.1231,-905.9357 339.1231,-905.9357"/>
-<text text-anchor="start" x="7.0045" y="-917.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (user_id) REFERENCES &quot;user&quot;(id) ON DELETE CASCADE</text>
-</g>
-<!-- public.study -->
-<g id="node3" class="node">
-<title>public.study</title>
-<polygon fill="#efefef" stroke="transparent" points="503,-672.5 503,-707.5 786,-707.5 786,-672.5 503,-672.5"/>
-<polygon fill="none" stroke="#000000" points="503,-672.5 503,-707.5 786,-707.5 786,-672.5 503,-672.5"/>
-<text text-anchor="start" x="533.2041" y="-685.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study</text>
-<text text-anchor="start" x="628.2279" y="-685.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="662.4327" y="-685.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="503,-642.5 503,-672.5 786,-672.5 786,-642.5 503,-642.5"/>
-<text text-anchor="start" x="510" y="-653.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="555.094" y="-653.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="503,-612.5 503,-642.5 786,-642.5 786,-612.5 503,-612.5"/>
-<text text-anchor="start" x="510" y="-623.9" font-family="Arial" font-size="14.00" fill="#000000">contact    </text>
-<text text-anchor="start" x="589.3338" y="-623.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="503,-582.5 503,-612.5 786,-612.5 786,-582.5 503,-582.5"/>
-<text text-anchor="start" x="510" y="-593.9" font-family="Arial" font-size="14.00" fill="#000000">title    </text>
-<text text-anchor="start" x="565.9818" y="-593.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="503,-552.5 503,-582.5 786,-582.5 786,-552.5 503,-552.5"/>
-<text text-anchor="start" x="510" y="-563.9" font-family="Arial" font-size="14.00" fill="#000000">description    </text>
-<text text-anchor="start" x="611.8822" y="-563.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="503,-522.5 503,-552.5 786,-552.5 786,-522.5 503,-522.5"/>
-<text text-anchor="start" x="510" y="-533.9" font-family="Arial" font-size="14.00" fill="#000000">icon_name    </text>
-<text text-anchor="start" x="612.6676" y="-533.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="503,-492.5 503,-522.5 786,-522.5 786,-492.5 503,-492.5"/>
-<text text-anchor="start" x="510" y="-503.9" font-family="Arial" font-size="14.00" fill="#000000">published    </text>
-<text text-anchor="start" x="604.1136" y="-503.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="503,-462.5 503,-492.5 786,-492.5 786,-462.5 503,-462.5"/>
-<text text-anchor="start" x="510" y="-473.9" font-family="Arial" font-size="14.00" fill="#000000">registry_published    </text>
-<text text-anchor="start" x="657.7798" y="-473.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="503,-432.5 503,-462.5 786,-462.5 786,-432.5 503,-432.5"/>
-<text text-anchor="start" x="510" y="-443.9" font-family="Arial" font-size="14.00" fill="#000000">questionnaire    </text>
-<text text-anchor="start" x="628.23" y="-443.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="503,-402.5 503,-432.5 786,-432.5 786,-402.5 503,-402.5"/>
-<text text-anchor="start" x="510" y="-413.9" font-family="Arial" font-size="14.00" fill="#000000">eligibility_criteria    </text>
-<text text-anchor="start" x="646.8556" y="-413.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="503,-372.5 503,-402.5 786,-402.5 786,-372.5 503,-372.5"/>
-<text text-anchor="start" x="510" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">observations    </text>
-<text text-anchor="start" x="623.5582" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="503,-342.5 503,-372.5 786,-372.5 786,-342.5 503,-342.5"/>
-<text text-anchor="start" x="510" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">interventions    </text>
-<text text-anchor="start" x="623.5554" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="503,-312.5 503,-342.5 786,-342.5 786,-312.5 503,-312.5"/>
-<text text-anchor="start" x="510" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">consent    </text>
-<text text-anchor="start" x="593.2258" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="503,-282.5 503,-312.5 786,-312.5 786,-282.5 503,-282.5"/>
-<text text-anchor="start" x="510" y="-293.9" font-family="Arial" font-size="14.00" fill="#000000">schedule    </text>
-<text text-anchor="start" x="600.2244" y="-293.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="503,-252.5 503,-282.5 786,-282.5 786,-252.5 503,-252.5"/>
-<text text-anchor="start" x="510" y="-263.9" font-family="Arial" font-size="14.00" fill="#000000">report_specification    </text>
-<text text-anchor="start" x="665.561" y="-263.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="503,-222.5 503,-252.5 786,-252.5 786,-222.5 503,-222.5"/>
-<text text-anchor="start" x="510" y="-233.9" font-family="Arial" font-size="14.00" fill="#000000">results    </text>
-<text text-anchor="start" x="585.4278" y="-233.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="503,-192.5 503,-222.5 786,-222.5 786,-192.5 503,-192.5"/>
-<text text-anchor="start" x="510" y="-203.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="610.3422" y="-203.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="503,-162.5 503,-192.5 786,-192.5 786,-162.5 503,-162.5"/>
-<text text-anchor="start" x="509.5344" y="-173.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="613.7812" y="-173.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="503,-132.5 503,-162.5 786,-162.5 786,-132.5 503,-132.5"/>
-<text text-anchor="start" x="510" y="-143.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="590.1024" y="-143.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="503,-102.5 503,-132.5 786,-132.5 786,-102.5 503,-102.5"/>
-<text text-anchor="start" x="510" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">participation    </text>
-<text text-anchor="start" x="619.662" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[participation]</text>
-<polygon fill="none" stroke="#000000" points="503,-72.5 503,-102.5 786,-102.5 786,-72.5 503,-72.5"/>
-<text text-anchor="start" x="510" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">result_sharing    </text>
-<text text-anchor="start" x="632.108" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[result_sharing]</text>
-<polygon fill="none" stroke="#000000" points="503,-42.5 503,-72.5 786,-72.5 786,-42.5 503,-42.5"/>
-<text text-anchor="start" x="510" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">collaborator_emails    </text>
-<text text-anchor="start" x="665.547" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- public.repo&#45;&gt;public.study -->
-<g id="edge2" class="edge">
-<title>public.repo:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M588.1477,-875.9582C614.5252,-866.6871 597.3294,-817.7189 578,-787 558.3084,-755.7054 522.6916,-782.2946 503,-751 480.8686,-715.8281 461.4444,-657.5 503,-657.5"/>
-<polygon fill="#000000" stroke="#000000" points="587.8865,-875.9978 577.324,-873.0511 582.9433,-876.7489 578,-877.5 578,-877.5 578,-877.5 582.9433,-876.7489 578.676,-881.9489 587.8865,-875.9978 587.8865,-875.9978"/>
-<text text-anchor="start" x="585.3845" y="-887.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id)</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.study.md b/docs/database/public.study.md
deleted file mode 100644
index 96eddd9f7..000000000
--- a/docs/database/public.study.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# public.study
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid | gen_random_uuid() | false | [public.study_subject](public.study_subject.md) [public.repo](public.repo.md) [public.study_invite](public.study_invite.md) |  |  |
-| contact | jsonb |  | false |  |  |  |
-| title | text |  | false |  |  |  |
-| description | text |  | false |  |  |  |
-| icon_name | text |  | false |  |  |  |
-| published | boolean | false | false |  |  |  |
-| registry_published | boolean | false | false |  |  |  |
-| questionnaire | jsonb |  | false |  |  |  |
-| eligibility_criteria | jsonb |  | false |  |  |  |
-| observations | jsonb |  | false |  |  |  |
-| interventions | jsonb |  | false |  |  |  |
-| consent | jsonb |  | false |  |  |  |
-| schedule | jsonb |  | false |  |  |  |
-| report_specification | jsonb |  | false |  |  |  |
-| results | jsonb |  | false |  |  |  |
-| created_at | timestamp with time zone | now() | false |  |  |  |
-| updated_at | timestamp with time zone | now() | false |  |  |  |
-| user_id | uuid |  | false |  | [public.user](public.user.md) | UserId of study creator |
-| participation | participation | 'invite'::participation | false |  |  |  |
-| result_sharing | result_sharing | 'private'::result_sharing | false |  |  |  |
-| collaborator_emails | text[] | '{}'::text[] | false |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| study_id_key | UNIQUE | UNIQUE (id) |
-| study_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-| study_userId_fkey | FOREIGN KEY | FOREIGN KEY (user_id) REFERENCES "user"(id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| study_id_key | CREATE UNIQUE INDEX study_id_key ON public.study USING btree (id) |
-| study_pkey | CREATE UNIQUE INDEX study_pkey ON public.study USING btree (id) |
-
-## Triggers
-
-| Name | Definition |
-| ---- | ---------- |
-| handle_updated_at | CREATE TRIGGER handle_updated_at BEFORE UPDATE ON public.study FOR EACH ROW EXECUTE FUNCTION moddatetime('updated_at') |
-
-## Relations
-
-![er](public.study.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.study.svg b/docs/database/public.study.svg
deleted file mode 100644
index dec6fcf50..000000000
--- a/docs/database/public.study.svg
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.study Pages: 1 -->
-<svg width="1143pt" height="1379pt"
- viewBox="0.00 0.00 1142.50 1379.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1375)">
-<title>public.study</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1375 1138.5,-1375 1138.5,4 -4,4"/>
-<!-- public.study -->
-<g id="node1" class="node">
-<title>public.study</title>
-<polygon fill="#efefef" stroke="transparent" points="438.5,-922.5 438.5,-957.5 691.5,-957.5 691.5,-922.5 438.5,-922.5"/>
-<polygon fill="none" stroke="#000000" points="438.5,-922.5 438.5,-957.5 691.5,-957.5 691.5,-922.5 438.5,-922.5"/>
-<text text-anchor="start" x="453.7041" y="-935.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study</text>
-<text text-anchor="start" x="548.7279" y="-935.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="582.9327" y="-935.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-892.5 438.5,-922.5 691.5,-922.5 691.5,-892.5 438.5,-892.5"/>
-<text text-anchor="start" x="445.5" y="-903.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="460.2798" y="-903.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-862.5 438.5,-892.5 691.5,-892.5 691.5,-862.5 438.5,-862.5"/>
-<text text-anchor="start" x="445.5" y="-873.9" font-family="Arial" font-size="14.00" fill="#000000">contact </text>
-<text text-anchor="start" x="494.5196" y="-873.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-832.5 438.5,-862.5 691.5,-862.5 691.5,-832.5 438.5,-832.5"/>
-<text text-anchor="start" x="445.5" y="-843.9" font-family="Arial" font-size="14.00" fill="#000000">title </text>
-<text text-anchor="start" x="471.1676" y="-843.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-802.5 438.5,-832.5 691.5,-832.5 691.5,-802.5 438.5,-802.5"/>
-<text text-anchor="start" x="445.5" y="-813.9" font-family="Arial" font-size="14.00" fill="#000000">description </text>
-<text text-anchor="start" x="517.068" y="-813.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-772.5 438.5,-802.5 691.5,-802.5 691.5,-772.5 438.5,-772.5"/>
-<text text-anchor="start" x="445.5" y="-783.9" font-family="Arial" font-size="14.00" fill="#000000">icon_name </text>
-<text text-anchor="start" x="517.8534" y="-783.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-742.5 438.5,-772.5 691.5,-772.5 691.5,-742.5 438.5,-742.5"/>
-<text text-anchor="start" x="445.5" y="-753.9" font-family="Arial" font-size="14.00" fill="#000000">published </text>
-<text text-anchor="start" x="509.2994" y="-753.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-712.5 438.5,-742.5 691.5,-742.5 691.5,-712.5 438.5,-712.5"/>
-<text text-anchor="start" x="445.5" y="-723.9" font-family="Arial" font-size="14.00" fill="#000000">registry_published </text>
-<text text-anchor="start" x="562.9656" y="-723.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-682.5 438.5,-712.5 691.5,-712.5 691.5,-682.5 438.5,-682.5"/>
-<text text-anchor="start" x="445.5" y="-693.9" font-family="Arial" font-size="14.00" fill="#000000">questionnaire </text>
-<text text-anchor="start" x="533.4158" y="-693.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-652.5 438.5,-682.5 691.5,-682.5 691.5,-652.5 438.5,-652.5"/>
-<text text-anchor="start" x="445.5" y="-663.9" font-family="Arial" font-size="14.00" fill="#000000">eligibility_criteria </text>
-<text text-anchor="start" x="552.0414" y="-663.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-622.5 438.5,-652.5 691.5,-652.5 691.5,-622.5 438.5,-622.5"/>
-<text text-anchor="start" x="445.5" y="-633.9" font-family="Arial" font-size="14.00" fill="#000000">observations </text>
-<text text-anchor="start" x="528.744" y="-633.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-592.5 438.5,-622.5 691.5,-622.5 691.5,-592.5 438.5,-592.5"/>
-<text text-anchor="start" x="445.5" y="-603.9" font-family="Arial" font-size="14.00" fill="#000000">interventions </text>
-<text text-anchor="start" x="528.7412" y="-603.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-562.5 438.5,-592.5 691.5,-592.5 691.5,-562.5 438.5,-562.5"/>
-<text text-anchor="start" x="445.5" y="-573.9" font-family="Arial" font-size="14.00" fill="#000000">consent </text>
-<text text-anchor="start" x="498.4116" y="-573.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-532.5 438.5,-562.5 691.5,-562.5 691.5,-532.5 438.5,-532.5"/>
-<text text-anchor="start" x="445.5" y="-543.9" font-family="Arial" font-size="14.00" fill="#000000">schedule </text>
-<text text-anchor="start" x="505.4102" y="-543.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-502.5 438.5,-532.5 691.5,-532.5 691.5,-502.5 438.5,-502.5"/>
-<text text-anchor="start" x="445.5" y="-513.9" font-family="Arial" font-size="14.00" fill="#000000">report_specification </text>
-<text text-anchor="start" x="570.7468" y="-513.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-472.5 438.5,-502.5 691.5,-502.5 691.5,-472.5 438.5,-472.5"/>
-<text text-anchor="start" x="445.5" y="-483.9" font-family="Arial" font-size="14.00" fill="#000000">results </text>
-<text text-anchor="start" x="490.6136" y="-483.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-442.5 438.5,-472.5 691.5,-472.5 691.5,-442.5 438.5,-442.5"/>
-<text text-anchor="start" x="445.5" y="-453.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="515.528" y="-453.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-412.5 438.5,-442.5 691.5,-442.5 691.5,-412.5 438.5,-412.5"/>
-<text text-anchor="start" x="445.1915" y="-423.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at </text>
-<text text-anchor="start" x="519.1241" y="-423.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-382.5 438.5,-412.5 691.5,-412.5 691.5,-382.5 438.5,-382.5"/>
-<text text-anchor="start" x="445.5" y="-393.9" font-family="Arial" font-size="14.00" fill="#000000">user_id </text>
-<text text-anchor="start" x="495.2882" y="-393.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-352.5 438.5,-382.5 691.5,-382.5 691.5,-352.5 438.5,-352.5"/>
-<text text-anchor="start" x="445.5" y="-363.9" font-family="Arial" font-size="14.00" fill="#000000">participation </text>
-<text text-anchor="start" x="524.8478" y="-363.9" font-family="Arial" font-size="14.00" fill="#666666">[participation]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-322.5 438.5,-352.5 691.5,-352.5 691.5,-322.5 438.5,-322.5"/>
-<text text-anchor="start" x="445.5" y="-333.9" font-family="Arial" font-size="14.00" fill="#000000">result_sharing </text>
-<text text-anchor="start" x="537.2938" y="-333.9" font-family="Arial" font-size="14.00" fill="#666666">[result_sharing]</text>
-<polygon fill="none" stroke="#000000" points="438.5,-292.5 438.5,-322.5 691.5,-322.5 691.5,-292.5 438.5,-292.5"/>
-<text text-anchor="start" x="445.5" y="-303.9" font-family="Arial" font-size="14.00" fill="#000000">collaborator_emails </text>
-<text text-anchor="start" x="570.7328" y="-303.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="436.5,-291.5 436.5,-959.5 692.5,-959.5 692.5,-291.5 436.5,-291.5"/>
-</g>
-<!-- public.user -->
-<g id="node5" class="node">
-<title>public.user</title>
-<polygon fill="#efefef" stroke="transparent" points="451.5,-132.5 451.5,-167.5 679.5,-167.5 679.5,-132.5 451.5,-132.5"/>
-<polygon fill="none" stroke="#000000" points="451.5,-132.5 451.5,-167.5 679.5,-167.5 679.5,-132.5 451.5,-132.5"/>
-<text text-anchor="start" x="458.2091" y="-145.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.user</text>
-<text text-anchor="start" x="545.2229" y="-145.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="579.4277" y="-145.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="451.5,-102.5 451.5,-132.5 679.5,-132.5 679.5,-102.5 451.5,-102.5"/>
-<text text-anchor="start" x="458.5" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="503.594" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="451.5,-72.5 451.5,-102.5 679.5,-102.5 679.5,-72.5 451.5,-72.5"/>
-<text text-anchor="start" x="458.5" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">email    </text>
-<text text-anchor="start" x="526.1438" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="451.5,-42.5 451.5,-72.5 679.5,-72.5 679.5,-42.5 451.5,-42.5"/>
-<text text-anchor="start" x="458.5" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">preferences    </text>
-<text text-anchor="start" x="566.6122" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- public.study&#45;&gt;public.user -->
-<g id="edge4" class="edge">
-<title>public.study:user_id&#45;&gt;public.user:id</title>
-<path fill="none" stroke="#000000" d="M701.6767,-396.6288C755.786,-386.7296 732.7617,-294.9126 691.5,-247 621.1153,-165.2701 521.8847,-292.7299 451.5,-211 424.3827,-179.5117 409.9444,-117.5 451.5,-117.5"/>
-<polygon fill="#000000" stroke="#000000" points="701.4636,-396.647 691.1161,-393.0164 696.4818,-397.0735 691.5,-397.5 691.5,-397.5 691.5,-397.5 696.4818,-397.0735 691.8839,-401.9836 701.4636,-396.647 701.4636,-396.647"/>
-<text text-anchor="start" x="698.7855" y="-407.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (user_id) REFERENCES &quot;user&quot;(id)</text>
-</g>
-<!-- public.study_subject -->
-<g id="node2" class="node">
-<title>public.study_subject</title>
-<polygon fill="#efefef" stroke="transparent" points="43.5,-1292.5 43.5,-1327.5 346.5,-1327.5 346.5,-1292.5 43.5,-1292.5"/>
-<polygon fill="none" stroke="#000000" points="43.5,-1292.5 43.5,-1327.5 346.5,-1327.5 346.5,-1292.5 43.5,-1292.5"/>
-<text text-anchor="start" x="50.1935" y="-1305.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_subject</text>
-<text text-anchor="start" x="212.2385" y="-1305.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="246.4433" y="-1305.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-1262.5 43.5,-1292.5 346.5,-1292.5 346.5,-1262.5 43.5,-1262.5"/>
-<text text-anchor="start" x="50.5" y="-1273.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="95.594" y="-1273.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-1232.5 43.5,-1262.5 346.5,-1262.5 346.5,-1232.5 43.5,-1232.5"/>
-<text text-anchor="start" x="50.5" y="-1243.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="136.8324" y="-1243.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-1202.5 43.5,-1232.5 346.5,-1232.5 346.5,-1202.5 43.5,-1202.5"/>
-<text text-anchor="start" x="50.5" y="-1213.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="130.6024" y="-1213.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-1172.5 43.5,-1202.5 346.5,-1202.5 346.5,-1172.5 43.5,-1172.5"/>
-<text text-anchor="start" x="50.5" y="-1183.9" font-family="Arial" font-size="14.00" fill="#000000">started_at    </text>
-<text text-anchor="start" x="146.9502" y="-1183.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-1142.5 43.5,-1172.5 346.5,-1172.5 346.5,-1142.5 43.5,-1142.5"/>
-<text text-anchor="start" x="50.5" y="-1153.9" font-family="Arial" font-size="14.00" fill="#000000">selected_intervention_ids    </text>
-<text text-anchor="start" x="242.6374" y="-1153.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-1112.5 43.5,-1142.5 346.5,-1142.5 346.5,-1112.5 43.5,-1112.5"/>
-<text text-anchor="start" x="50.5" y="-1123.9" font-family="Arial" font-size="14.00" fill="#000000">invite_code    </text>
-<text text-anchor="start" x="155.5042" y="-1123.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-1082.5 43.5,-1112.5 346.5,-1112.5 346.5,-1082.5 43.5,-1082.5"/>
-<text text-anchor="start" x="50.5" y="-1093.9" font-family="Arial" font-size="14.00" fill="#000000">is_deleted    </text>
-<text text-anchor="start" x="148.5042" y="-1093.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-</g>
-<!-- public.study_subject&#45;&gt;public.study -->
-<g id="edge1" class="edge">
-<title>public.study_subject:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M356.5951,-1245.3288C419.0354,-1216.3721 363.8963,-907.5 438.5,-907.5"/>
-<polygon fill="#000000" stroke="#000000" points="356.2764,-1245.3973 345.5538,-1243.1006 351.3882,-1246.4486 346.5,-1247.5 346.5,-1247.5 346.5,-1247.5 351.3882,-1246.4486 347.4462,-1251.8994 356.2764,-1245.3973 356.2764,-1245.3973"/>
-<text text-anchor="start" x="353.6035" y="-1257.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE</text>
-</g>
-<!-- public.repo -->
-<g id="node3" class="node">
-<title>public.repo</title>
-<polygon fill="#efefef" stroke="transparent" points="450.5,-1247.5 450.5,-1282.5 679.5,-1282.5 679.5,-1247.5 450.5,-1247.5"/>
-<polygon fill="none" stroke="#000000" points="450.5,-1247.5 450.5,-1282.5 679.5,-1282.5 679.5,-1247.5 450.5,-1247.5"/>
-<text text-anchor="start" x="457.206" y="-1260.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.repo</text>
-<text text-anchor="start" x="545.226" y="-1260.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="579.4308" y="-1260.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="450.5,-1217.5 450.5,-1247.5 679.5,-1247.5 679.5,-1217.5 450.5,-1217.5"/>
-<text text-anchor="start" x="457.5" y="-1228.9" font-family="Arial" font-size="14.00" fill="#000000">project_id    </text>
-<text text-anchor="start" x="552.3822" y="-1228.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="450.5,-1187.5 450.5,-1217.5 679.5,-1217.5 679.5,-1187.5 450.5,-1187.5"/>
-<text text-anchor="start" x="457.5" y="-1198.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="537.6024" y="-1198.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="450.5,-1157.5 450.5,-1187.5 679.5,-1187.5 679.5,-1157.5 450.5,-1157.5"/>
-<text text-anchor="start" x="457.5" y="-1168.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="543.8324" y="-1168.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="450.5,-1127.5 450.5,-1157.5 679.5,-1157.5 679.5,-1127.5 450.5,-1127.5"/>
-<text text-anchor="start" x="457.5" y="-1138.9" font-family="Arial" font-size="14.00" fill="#000000">provider    </text>
-<text text-anchor="start" x="542.263" y="-1138.9" font-family="Arial" font-size="14.00" fill="#666666">[git_provider]</text>
-</g>
-<!-- public.repo&#45;&gt;public.study -->
-<g id="edge2" class="edge">
-<title>public.repo:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M440.6262,-1169.8772C390.3881,-1142.3551 383.0048,-907.5 438.5,-907.5"/>
-<polygon fill="#000000" stroke="#000000" points="440.8352,-1169.9326 449.3447,-1176.8492 445.6676,-1171.2163 450.5,-1172.5 450.5,-1172.5 450.5,-1172.5 445.6676,-1171.2163 451.6553,-1168.1508 440.8352,-1169.9326 440.8352,-1169.9326"/>
-<text text-anchor="start" x="397.6345" y="-1156.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id)</text>
-</g>
-<!-- public.study_invite -->
-<g id="node4" class="node">
-<title>public.study_invite</title>
-<polygon fill="#efefef" stroke="transparent" points="783.5,-1232.5 783.5,-1267.5 1071.5,-1267.5 1071.5,-1232.5 783.5,-1232.5"/>
-<polygon fill="none" stroke="#000000" points="783.5,-1232.5 783.5,-1267.5 1071.5,-1267.5 1071.5,-1232.5 783.5,-1232.5"/>
-<text text-anchor="start" x="790.1995" y="-1245.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_invite</text>
-<text text-anchor="start" x="937.2325" y="-1245.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="971.4373" y="-1245.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="783.5,-1202.5 783.5,-1232.5 1071.5,-1232.5 1071.5,-1202.5 783.5,-1202.5"/>
-<text text-anchor="start" x="790.5" y="-1213.9" font-family="Arial" font-size="14.00" fill="#000000">code    </text>
-<text text-anchor="start" x="855.0526" y="-1213.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="783.5,-1172.5 783.5,-1202.5 1071.5,-1202.5 1071.5,-1172.5 783.5,-1172.5"/>
-<text text-anchor="start" x="790.5" y="-1183.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="876.8324" y="-1183.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="783.5,-1142.5 783.5,-1172.5 1071.5,-1172.5 1071.5,-1142.5 783.5,-1142.5"/>
-<text text-anchor="start" x="790.5" y="-1153.9" font-family="Arial" font-size="14.00" fill="#000000">preselected_intervention_ids    </text>
-<text text-anchor="start" x="1002.8632" y="-1153.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- public.study_invite&#45;&gt;public.study -->
-<g id="edge3" class="edge">
-<title>public.study_invite:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M773.658,-1185.0794C721.9571,-1157.7124 753.4131,-907.5 691.5,-907.5"/>
-<polygon fill="#000000" stroke="#000000" points="773.7894,-1185.1116 782.4252,-1191.8698 778.6447,-1186.3058 783.5,-1187.5 783.5,-1187.5 783.5,-1187.5 778.6447,-1186.3058 784.5748,-1183.1302 773.7894,-1185.1116 773.7894,-1185.1116"/>
-<text text-anchor="start" x="790.6035" y="-1197.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.study_invite.md b/docs/database/public.study_invite.md
deleted file mode 100644
index 79c271b4f..000000000
--- a/docs/database/public.study_invite.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# public.study_invite
-
-## Description
-
-Study invite codes
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| code | text |  | false | [public.study_subject](public.study_subject.md) |  |  |
-| study_id | uuid |  | false |  | [public.study](public.study.md) |  |
-| preselected_intervention_ids | text[] |  | true |  |  | Intervention Ids (and order) preselected by study creator |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| study_invite_studyId_fkey | FOREIGN KEY | FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE |
-| study_invite_pkey | PRIMARY KEY | PRIMARY KEY (code) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| study_invite_pkey | CREATE UNIQUE INDEX study_invite_pkey ON public.study_invite USING btree (code) |
-
-## Relations
-
-![er](public.study_invite.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.study_invite.svg b/docs/database/public.study_invite.svg
deleted file mode 100644
index 2c39a3f06..000000000
--- a/docs/database/public.study_invite.svg
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.study_invite Pages: 1 -->
-<svg width="1061pt" height="1379pt"
- viewBox="0.00 0.00 1061.00 1379.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1375)">
-<title>public.study_invite</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1375 1057,-1375 1057,4 -4,4"/>
-<!-- public.study_invite -->
-<g id="node1" class="node">
-<title>public.study_invite</title>
-<polygon fill="#efefef" stroke="transparent" points="351,-922.5 351,-957.5 639,-957.5 639,-922.5 351,-922.5"/>
-<polygon fill="none" stroke="#000000" points="351,-922.5 351,-957.5 639,-957.5 639,-922.5 351,-922.5"/>
-<text text-anchor="start" x="357.6995" y="-935.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_invite</text>
-<text text-anchor="start" x="504.7325" y="-935.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="538.9373" y="-935.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="351,-892.5 351,-922.5 639,-922.5 639,-892.5 351,-892.5"/>
-<text text-anchor="start" x="358" y="-903.9" font-family="Arial" font-size="14.00" fill="#000000">code </text>
-<text text-anchor="start" x="392.2384" y="-903.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="351,-862.5 351,-892.5 639,-892.5 639,-862.5 351,-862.5"/>
-<text text-anchor="start" x="358" y="-873.9" font-family="Arial" font-size="14.00" fill="#000000">study_id </text>
-<text text-anchor="start" x="414.0182" y="-873.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="351,-832.5 351,-862.5 639,-862.5 639,-832.5 351,-832.5"/>
-<text text-anchor="start" x="358" y="-843.9" font-family="Arial" font-size="14.00" fill="#000000">preselected_intervention_ids </text>
-<text text-anchor="start" x="540.049" y="-843.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="349.5,-831.5 349.5,-959.5 640.5,-959.5 640.5,-831.5 349.5,-831.5"/>
-</g>
-<!-- public.study -->
-<g id="node3" class="node">
-<title>public.study</title>
-<polygon fill="#efefef" stroke="transparent" points="353,-672.5 353,-707.5 636,-707.5 636,-672.5 353,-672.5"/>
-<polygon fill="none" stroke="#000000" points="353,-672.5 353,-707.5 636,-707.5 636,-672.5 353,-672.5"/>
-<text text-anchor="start" x="383.2041" y="-685.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study</text>
-<text text-anchor="start" x="478.2279" y="-685.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="512.4327" y="-685.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="353,-642.5 353,-672.5 636,-672.5 636,-642.5 353,-642.5"/>
-<text text-anchor="start" x="360" y="-653.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="405.094" y="-653.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="353,-612.5 353,-642.5 636,-642.5 636,-612.5 353,-612.5"/>
-<text text-anchor="start" x="360" y="-623.9" font-family="Arial" font-size="14.00" fill="#000000">contact    </text>
-<text text-anchor="start" x="439.3338" y="-623.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="353,-582.5 353,-612.5 636,-612.5 636,-582.5 353,-582.5"/>
-<text text-anchor="start" x="360" y="-593.9" font-family="Arial" font-size="14.00" fill="#000000">title    </text>
-<text text-anchor="start" x="415.9818" y="-593.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="353,-552.5 353,-582.5 636,-582.5 636,-552.5 353,-552.5"/>
-<text text-anchor="start" x="360" y="-563.9" font-family="Arial" font-size="14.00" fill="#000000">description    </text>
-<text text-anchor="start" x="461.8822" y="-563.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="353,-522.5 353,-552.5 636,-552.5 636,-522.5 353,-522.5"/>
-<text text-anchor="start" x="360" y="-533.9" font-family="Arial" font-size="14.00" fill="#000000">icon_name    </text>
-<text text-anchor="start" x="462.6676" y="-533.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="353,-492.5 353,-522.5 636,-522.5 636,-492.5 353,-492.5"/>
-<text text-anchor="start" x="360" y="-503.9" font-family="Arial" font-size="14.00" fill="#000000">published    </text>
-<text text-anchor="start" x="454.1136" y="-503.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="353,-462.5 353,-492.5 636,-492.5 636,-462.5 353,-462.5"/>
-<text text-anchor="start" x="360" y="-473.9" font-family="Arial" font-size="14.00" fill="#000000">registry_published    </text>
-<text text-anchor="start" x="507.7798" y="-473.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="353,-432.5 353,-462.5 636,-462.5 636,-432.5 353,-432.5"/>
-<text text-anchor="start" x="360" y="-443.9" font-family="Arial" font-size="14.00" fill="#000000">questionnaire    </text>
-<text text-anchor="start" x="478.23" y="-443.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="353,-402.5 353,-432.5 636,-432.5 636,-402.5 353,-402.5"/>
-<text text-anchor="start" x="360" y="-413.9" font-family="Arial" font-size="14.00" fill="#000000">eligibility_criteria    </text>
-<text text-anchor="start" x="496.8556" y="-413.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="353,-372.5 353,-402.5 636,-402.5 636,-372.5 353,-372.5"/>
-<text text-anchor="start" x="360" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">observations    </text>
-<text text-anchor="start" x="473.5582" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="353,-342.5 353,-372.5 636,-372.5 636,-342.5 353,-342.5"/>
-<text text-anchor="start" x="360" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">interventions    </text>
-<text text-anchor="start" x="473.5554" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="353,-312.5 353,-342.5 636,-342.5 636,-312.5 353,-312.5"/>
-<text text-anchor="start" x="360" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">consent    </text>
-<text text-anchor="start" x="443.2258" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="353,-282.5 353,-312.5 636,-312.5 636,-282.5 353,-282.5"/>
-<text text-anchor="start" x="360" y="-293.9" font-family="Arial" font-size="14.00" fill="#000000">schedule    </text>
-<text text-anchor="start" x="450.2244" y="-293.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="353,-252.5 353,-282.5 636,-282.5 636,-252.5 353,-252.5"/>
-<text text-anchor="start" x="360" y="-263.9" font-family="Arial" font-size="14.00" fill="#000000">report_specification    </text>
-<text text-anchor="start" x="515.561" y="-263.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="353,-222.5 353,-252.5 636,-252.5 636,-222.5 353,-222.5"/>
-<text text-anchor="start" x="360" y="-233.9" font-family="Arial" font-size="14.00" fill="#000000">results    </text>
-<text text-anchor="start" x="435.4278" y="-233.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="353,-192.5 353,-222.5 636,-222.5 636,-192.5 353,-192.5"/>
-<text text-anchor="start" x="360" y="-203.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="460.3422" y="-203.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="353,-162.5 353,-192.5 636,-192.5 636,-162.5 353,-162.5"/>
-<text text-anchor="start" x="359.5344" y="-173.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="463.7812" y="-173.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="353,-132.5 353,-162.5 636,-162.5 636,-132.5 353,-132.5"/>
-<text text-anchor="start" x="360" y="-143.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="440.1024" y="-143.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="353,-102.5 353,-132.5 636,-132.5 636,-102.5 353,-102.5"/>
-<text text-anchor="start" x="360" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">participation    </text>
-<text text-anchor="start" x="469.662" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[participation]</text>
-<polygon fill="none" stroke="#000000" points="353,-72.5 353,-102.5 636,-102.5 636,-72.5 353,-72.5"/>
-<text text-anchor="start" x="360" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">result_sharing    </text>
-<text text-anchor="start" x="482.108" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[result_sharing]</text>
-<polygon fill="none" stroke="#000000" points="353,-42.5 353,-72.5 636,-72.5 636,-42.5 353,-42.5"/>
-<text text-anchor="start" x="360" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">collaborator_emails    </text>
-<text text-anchor="start" x="515.547" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- public.study_invite&#45;&gt;public.study -->
-<g id="edge2" class="edge">
-<title>public.study_invite:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M341.0736,-875.9839C313.4461,-866.4534 326.8941,-814.3424 351,-787 435.4324,-691.2315 551.5676,-846.7685 636,-751 663.4814,-719.8289 677.5556,-657.5 636,-657.5"/>
-<polygon fill="#000000" stroke="#000000" points="341.1146,-875.99 350.3205,-881.9484 346.0573,-876.745 351,-877.5 351,-877.5 351,-877.5 346.0573,-876.745 351.6795,-873.0516 341.1146,-875.99 341.1146,-875.99"/>
-<text text-anchor="start" x="7.1035" y="-887.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE</text>
-</g>
-<!-- public.study_subject -->
-<g id="node2" class="node">
-<title>public.study_subject</title>
-<polygon fill="#efefef" stroke="transparent" points="343,-1292.5 343,-1327.5 646,-1327.5 646,-1292.5 343,-1292.5"/>
-<polygon fill="none" stroke="#000000" points="343,-1292.5 343,-1327.5 646,-1327.5 646,-1292.5 343,-1292.5"/>
-<text text-anchor="start" x="349.6935" y="-1305.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_subject</text>
-<text text-anchor="start" x="511.7385" y="-1305.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="545.9433" y="-1305.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="343,-1262.5 343,-1292.5 646,-1292.5 646,-1262.5 343,-1262.5"/>
-<text text-anchor="start" x="350" y="-1273.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="395.094" y="-1273.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="343,-1232.5 343,-1262.5 646,-1262.5 646,-1232.5 343,-1232.5"/>
-<text text-anchor="start" x="350" y="-1243.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="436.3324" y="-1243.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="343,-1202.5 343,-1232.5 646,-1232.5 646,-1202.5 343,-1202.5"/>
-<text text-anchor="start" x="350" y="-1213.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="430.1024" y="-1213.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="343,-1172.5 343,-1202.5 646,-1202.5 646,-1172.5 343,-1172.5"/>
-<text text-anchor="start" x="350" y="-1183.9" font-family="Arial" font-size="14.00" fill="#000000">started_at    </text>
-<text text-anchor="start" x="446.4502" y="-1183.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="343,-1142.5 343,-1172.5 646,-1172.5 646,-1142.5 343,-1142.5"/>
-<text text-anchor="start" x="350" y="-1153.9" font-family="Arial" font-size="14.00" fill="#000000">selected_intervention_ids    </text>
-<text text-anchor="start" x="542.1374" y="-1153.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-<polygon fill="none" stroke="#000000" points="343,-1112.5 343,-1142.5 646,-1142.5 646,-1112.5 343,-1112.5"/>
-<text text-anchor="start" x="350" y="-1123.9" font-family="Arial" font-size="14.00" fill="#000000">invite_code    </text>
-<text text-anchor="start" x="455.0042" y="-1123.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="343,-1082.5 343,-1112.5 646,-1112.5 646,-1082.5 343,-1082.5"/>
-<text text-anchor="start" x="350" y="-1093.9" font-family="Arial" font-size="14.00" fill="#000000">is_deleted    </text>
-<text text-anchor="start" x="448.0042" y="-1093.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-</g>
-<!-- public.study_subject&#45;&gt;public.study_invite -->
-<g id="edge1" class="edge">
-<title>public.study_subject:invite_code&#45;&gt;public.study_invite:code</title>
-<path fill="none" stroke="#000000" d="M655.9422,-1125.9113C682.2076,-1116.3761 669.2618,-1066.2731 646,-1040 558.4421,-941.1075 438.5579,-1102.8925 351,-1004 322.5691,-971.8886 308.1111,-907.5 351,-907.5"/>
-<polygon fill="#000000" stroke="#000000" points="655.8747,-1125.922 645.2899,-1123.0564 650.9374,-1126.711 646,-1127.5 646,-1127.5 646,-1127.5 650.9374,-1126.711 646.7101,-1131.9436 655.8747,-1125.922 655.8747,-1125.922"/>
-<text text-anchor="start" x="653.0385" y="-1137.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (invite_code) REFERENCES study_invite(code) ON DELETE CASCADE</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.study_progress_export.md b/docs/database/public.study_progress_export.md
deleted file mode 100644
index 44e005d14..000000000
--- a/docs/database/public.study_progress_export.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# public.study_progress_export
-
-## Description
-
-<details>
-<summary><strong>Table Definition</strong></summary>
-
-```sql
-CREATE VIEW study_progress_export AS (
- SELECT subject_progress.completed_at,
-    subject_progress.intervention_id,
-    subject_progress.task_id,
-    subject_progress.result_type,
-    subject_progress.result,
-    subject_progress.subject_id,
-    study_subject.user_id,
-    study_subject.study_id,
-    study_subject.started_at,
-    study_subject.selected_intervention_ids
-   FROM study_subject,
-    subject_progress
-  WHERE (study_subject.id = subject_progress.subject_id)
-)
-```
-
-</details>
-
-## Referenced Tables
-
-- [public.study_subject](public.study_subject.md)
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| completed_at | timestamp with time zone |  | true |  |  |  |
-| intervention_id | text |  | true |  |  |  |
-| task_id | text |  | true |  |  |  |
-| result_type | text |  | true |  |  |  |
-| result | jsonb |  | true |  |  |  |
-| subject_id | uuid |  | true |  |  |  |
-| user_id | uuid |  | true |  |  |  |
-| study_id | uuid |  | true |  |  |  |
-| started_at | timestamp with time zone |  | true |  |  |  |
-| selected_intervention_ids | text[] |  | true |  |  |  |
-
-## Relations
-
-![er](public.study_progress_export.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.study_progress_export.svg b/docs/database/public.study_progress_export.svg
deleted file mode 100644
index 628fd0f66..000000000
--- a/docs/database/public.study_progress_export.svg
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.study_progress_export Pages: 1 -->
-<svg width="426pt" height="435pt"
- viewBox="0.00 0.00 426.00 435.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 431)">
-<title>public.study_progress_export</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-431 422,-431 422,4 -4,4"/>
-<!-- public.study_progress_export -->
-<g id="node1" class="node">
-<title>public.study_progress_export</title>
-<polygon fill="#efefef" stroke="transparent" points="46,-345.5 46,-380.5 372,-380.5 372,-345.5 46,-345.5"/>
-<polygon fill="none" stroke="#000000" points="46,-345.5 46,-380.5 372,-380.5 372,-345.5 46,-345.5"/>
-<text text-anchor="start" x="52.5886" y="-358.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_progress_export</text>
-<text text-anchor="start" x="287.647" y="-358.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="321.8518" y="-358.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="46,-315.5 46,-345.5 372,-345.5 372,-315.5 46,-315.5"/>
-<text text-anchor="start" x="53" y="-326.9" font-family="Arial" font-size="14.00" fill="#000000">completed_at </text>
-<text text-anchor="start" x="140.9172" y="-326.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46,-285.5 46,-315.5 372,-315.5 372,-285.5 46,-285.5"/>
-<text text-anchor="start" x="53" y="-296.9" font-family="Arial" font-size="14.00" fill="#000000">intervention_id </text>
-<text text-anchor="start" x="147.913" y="-296.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46,-255.5 46,-285.5 372,-285.5 372,-255.5 46,-255.5"/>
-<text text-anchor="start" x="53" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">task_id </text>
-<text text-anchor="start" x="101.2356" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46,-225.5 46,-255.5 372,-255.5 372,-225.5 46,-225.5"/>
-<text text-anchor="start" x="53" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">result_type </text>
-<text text-anchor="start" x="125.352" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46,-195.5 46,-225.5 372,-225.5 372,-195.5 46,-195.5"/>
-<text text-anchor="start" x="53" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">result </text>
-<text text-anchor="start" x="91.1136" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="46,-165.5 46,-195.5 372,-195.5 372,-165.5 46,-165.5"/>
-<text text-anchor="start" x="53" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">subject_id </text>
-<text text-anchor="start" x="119.9074" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46,-135.5 46,-165.5 372,-165.5 372,-135.5 46,-135.5"/>
-<text text-anchor="start" x="53" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">user_id </text>
-<text text-anchor="start" x="102.7882" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46,-105.5 46,-135.5 372,-135.5 372,-105.5 46,-105.5"/>
-<text text-anchor="start" x="53" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">study_id </text>
-<text text-anchor="start" x="109.0182" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46,-75.5 46,-105.5 372,-105.5 372,-75.5 46,-75.5"/>
-<text text-anchor="start" x="53" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">started_at </text>
-<text text-anchor="start" x="119.136" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46,-45.5 46,-75.5 372,-75.5 372,-45.5 46,-45.5"/>
-<text text-anchor="start" x="53" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">selected_intervention_ids </text>
-<text text-anchor="start" x="214.8232" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-382.5 373.5,-382.5 373.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.study_subject.md b/docs/database/public.study_subject.md
deleted file mode 100644
index 76d3dd93c..000000000
--- a/docs/database/public.study_subject.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# public.study_subject
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid | gen_random_uuid() | false | [public.subject_progress](public.subject_progress.md) |  |  |
-| study_id | uuid |  | false |  | [public.study](public.study.md) |  |
-| user_id | uuid |  | false |  | [public.user](public.user.md) |  |
-| started_at | timestamp with time zone | now() | true |  |  |  |
-| selected_intervention_ids | text[] |  | false |  |  |  |
-| invite_code | text |  | true |  | [public.study_invite](public.study_invite.md) |  |
-| is_deleted | boolean | false | false |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| study_subject_studyId_fkey | FOREIGN KEY | FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE |
-| study_subject_loginCode_fkey | FOREIGN KEY | FOREIGN KEY (invite_code) REFERENCES study_invite(code) ON DELETE CASCADE |
-| study_subject_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-| study_subject_userId_fkey | FOREIGN KEY | FOREIGN KEY (user_id) REFERENCES "user"(id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| study_subject_pkey | CREATE UNIQUE INDEX study_subject_pkey ON public.study_subject USING btree (id) |
-
-## Relations
-
-![er](public.study_subject.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.study_subject.svg b/docs/database/public.study_subject.svg
deleted file mode 100644
index 00b4f83b2..000000000
--- a/docs/database/public.study_subject.svg
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.study_subject Pages: 1 -->
-<svg width="1127pt" height="1469pt"
- viewBox="0.00 0.00 1127.00 1469.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1465)">
-<title>public.study_subject</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1465 1123,-1465 1123,4 -4,4"/>
-<!-- public.study_subject -->
-<g id="node1" class="node">
-<title>public.study_subject</title>
-<polygon fill="#efefef" stroke="transparent" points="409,-1042.5 409,-1077.5 712,-1077.5 712,-1042.5 409,-1042.5"/>
-<polygon fill="none" stroke="#000000" points="409,-1042.5 409,-1077.5 712,-1077.5 712,-1042.5 409,-1042.5"/>
-<text text-anchor="start" x="415.6935" y="-1055.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_subject</text>
-<text text-anchor="start" x="577.7385" y="-1055.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="611.9433" y="-1055.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="409,-1012.5 409,-1042.5 712,-1042.5 712,-1012.5 409,-1012.5"/>
-<text text-anchor="start" x="416" y="-1023.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="430.7798" y="-1023.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="409,-982.5 409,-1012.5 712,-1012.5 712,-982.5 409,-982.5"/>
-<text text-anchor="start" x="416" y="-993.9" font-family="Arial" font-size="14.00" fill="#000000">study_id </text>
-<text text-anchor="start" x="472.0182" y="-993.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="409,-952.5 409,-982.5 712,-982.5 712,-952.5 409,-952.5"/>
-<text text-anchor="start" x="416" y="-963.9" font-family="Arial" font-size="14.00" fill="#000000">user_id </text>
-<text text-anchor="start" x="465.7882" y="-963.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="409,-922.5 409,-952.5 712,-952.5 712,-922.5 409,-922.5"/>
-<text text-anchor="start" x="416" y="-933.9" font-family="Arial" font-size="14.00" fill="#000000">started_at </text>
-<text text-anchor="start" x="482.136" y="-933.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="409,-892.5 409,-922.5 712,-922.5 712,-892.5 409,-892.5"/>
-<text text-anchor="start" x="416" y="-903.9" font-family="Arial" font-size="14.00" fill="#000000">selected_intervention_ids </text>
-<text text-anchor="start" x="577.8232" y="-903.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-<polygon fill="none" stroke="#000000" points="409,-862.5 409,-892.5 712,-892.5 712,-862.5 409,-862.5"/>
-<text text-anchor="start" x="416" y="-873.9" font-family="Arial" font-size="14.00" fill="#000000">invite_code </text>
-<text text-anchor="start" x="490.69" y="-873.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="409,-832.5 409,-862.5 712,-862.5 712,-832.5 409,-832.5"/>
-<text text-anchor="start" x="416" y="-843.9" font-family="Arial" font-size="14.00" fill="#000000">is_deleted </text>
-<text text-anchor="start" x="483.69" y="-843.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="407,-831.5 407,-1079.5 713,-1079.5 713,-831.5 407,-831.5"/>
-</g>
-<!-- public.study -->
-<g id="node3" class="node">
-<title>public.study</title>
-<polygon fill="#efefef" stroke="transparent" points="60,-672.5 60,-707.5 343,-707.5 343,-672.5 60,-672.5"/>
-<polygon fill="none" stroke="#000000" points="60,-672.5 60,-707.5 343,-707.5 343,-672.5 60,-672.5"/>
-<text text-anchor="start" x="90.2041" y="-685.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study</text>
-<text text-anchor="start" x="185.2279" y="-685.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="219.4327" y="-685.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="60,-642.5 60,-672.5 343,-672.5 343,-642.5 60,-642.5"/>
-<text text-anchor="start" x="67" y="-653.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="112.094" y="-653.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="60,-612.5 60,-642.5 343,-642.5 343,-612.5 60,-612.5"/>
-<text text-anchor="start" x="67" y="-623.9" font-family="Arial" font-size="14.00" fill="#000000">contact    </text>
-<text text-anchor="start" x="146.3338" y="-623.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="60,-582.5 60,-612.5 343,-612.5 343,-582.5 60,-582.5"/>
-<text text-anchor="start" x="67" y="-593.9" font-family="Arial" font-size="14.00" fill="#000000">title    </text>
-<text text-anchor="start" x="122.9818" y="-593.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="60,-552.5 60,-582.5 343,-582.5 343,-552.5 60,-552.5"/>
-<text text-anchor="start" x="67" y="-563.9" font-family="Arial" font-size="14.00" fill="#000000">description    </text>
-<text text-anchor="start" x="168.8822" y="-563.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="60,-522.5 60,-552.5 343,-552.5 343,-522.5 60,-522.5"/>
-<text text-anchor="start" x="67" y="-533.9" font-family="Arial" font-size="14.00" fill="#000000">icon_name    </text>
-<text text-anchor="start" x="169.6676" y="-533.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="60,-492.5 60,-522.5 343,-522.5 343,-492.5 60,-492.5"/>
-<text text-anchor="start" x="67" y="-503.9" font-family="Arial" font-size="14.00" fill="#000000">published    </text>
-<text text-anchor="start" x="161.1136" y="-503.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="60,-462.5 60,-492.5 343,-492.5 343,-462.5 60,-462.5"/>
-<text text-anchor="start" x="67" y="-473.9" font-family="Arial" font-size="14.00" fill="#000000">registry_published    </text>
-<text text-anchor="start" x="214.7798" y="-473.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="60,-432.5 60,-462.5 343,-462.5 343,-432.5 60,-432.5"/>
-<text text-anchor="start" x="67" y="-443.9" font-family="Arial" font-size="14.00" fill="#000000">questionnaire    </text>
-<text text-anchor="start" x="185.23" y="-443.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="60,-402.5 60,-432.5 343,-432.5 343,-402.5 60,-402.5"/>
-<text text-anchor="start" x="67" y="-413.9" font-family="Arial" font-size="14.00" fill="#000000">eligibility_criteria    </text>
-<text text-anchor="start" x="203.8556" y="-413.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="60,-372.5 60,-402.5 343,-402.5 343,-372.5 60,-372.5"/>
-<text text-anchor="start" x="67" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">observations    </text>
-<text text-anchor="start" x="180.5582" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="60,-342.5 60,-372.5 343,-372.5 343,-342.5 60,-342.5"/>
-<text text-anchor="start" x="67" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">interventions    </text>
-<text text-anchor="start" x="180.5554" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="60,-312.5 60,-342.5 343,-342.5 343,-312.5 60,-312.5"/>
-<text text-anchor="start" x="67" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">consent    </text>
-<text text-anchor="start" x="150.2258" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="60,-282.5 60,-312.5 343,-312.5 343,-282.5 60,-282.5"/>
-<text text-anchor="start" x="67" y="-293.9" font-family="Arial" font-size="14.00" fill="#000000">schedule    </text>
-<text text-anchor="start" x="157.2244" y="-293.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="60,-252.5 60,-282.5 343,-282.5 343,-252.5 60,-252.5"/>
-<text text-anchor="start" x="67" y="-263.9" font-family="Arial" font-size="14.00" fill="#000000">report_specification    </text>
-<text text-anchor="start" x="222.561" y="-263.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="60,-222.5 60,-252.5 343,-252.5 343,-222.5 60,-222.5"/>
-<text text-anchor="start" x="67" y="-233.9" font-family="Arial" font-size="14.00" fill="#000000">results    </text>
-<text text-anchor="start" x="142.4278" y="-233.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="60,-192.5 60,-222.5 343,-222.5 343,-192.5 60,-192.5"/>
-<text text-anchor="start" x="67" y="-203.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="167.3422" y="-203.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="60,-162.5 60,-192.5 343,-192.5 343,-162.5 60,-162.5"/>
-<text text-anchor="start" x="66.5344" y="-173.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="170.7812" y="-173.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="60,-132.5 60,-162.5 343,-162.5 343,-132.5 60,-132.5"/>
-<text text-anchor="start" x="67" y="-143.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="147.1024" y="-143.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="60,-102.5 60,-132.5 343,-132.5 343,-102.5 60,-102.5"/>
-<text text-anchor="start" x="67" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">participation    </text>
-<text text-anchor="start" x="176.662" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[participation]</text>
-<polygon fill="none" stroke="#000000" points="60,-72.5 60,-102.5 343,-102.5 343,-72.5 60,-72.5"/>
-<text text-anchor="start" x="67" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">result_sharing    </text>
-<text text-anchor="start" x="189.108" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[result_sharing]</text>
-<polygon fill="none" stroke="#000000" points="60,-42.5 60,-72.5 343,-72.5 343,-42.5 60,-42.5"/>
-<text text-anchor="start" x="67" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">collaborator_emails    </text>
-<text text-anchor="start" x="222.547" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- public.study_subject&#45;&gt;public.study -->
-<g id="edge2" class="edge">
-<title>public.study_subject:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M399.2297,-995.3288C339.9154,-966.3721 416.3581,-657.5 343,-657.5"/>
-<polygon fill="#000000" stroke="#000000" points="399.2381,-995.3306 408.0238,-1001.8928 404.1191,-996.4153 409,-997.5 409,-997.5 409,-997.5 404.1191,-996.4153 409.9762,-993.1072 399.2381,-995.3306 399.2381,-995.3306"/>
-<text text-anchor="start" x="65.1035" y="-1007.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE</text>
-</g>
-<!-- public.user -->
-<g id="node4" class="node">
-<title>public.user</title>
-<polygon fill="#efefef" stroke="transparent" points="447,-402.5 447,-437.5 675,-437.5 675,-402.5 447,-402.5"/>
-<polygon fill="none" stroke="#000000" points="447,-402.5 447,-437.5 675,-437.5 675,-402.5 447,-402.5"/>
-<text text-anchor="start" x="453.7091" y="-415.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.user</text>
-<text text-anchor="start" x="540.7229" y="-415.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="574.9277" y="-415.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="447,-372.5 447,-402.5 675,-402.5 675,-372.5 447,-372.5"/>
-<text text-anchor="start" x="454" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="499.094" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="447,-342.5 447,-372.5 675,-372.5 675,-342.5 447,-342.5"/>
-<text text-anchor="start" x="454" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">email    </text>
-<text text-anchor="start" x="521.6438" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="447,-312.5 447,-342.5 675,-342.5 675,-312.5 447,-312.5"/>
-<text text-anchor="start" x="454" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">preferences    </text>
-<text text-anchor="start" x="562.1122" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- public.study_subject&#45;&gt;public.user -->
-<g id="edge3" class="edge">
-<title>public.study_subject:user_id&#45;&gt;public.user:id</title>
-<path fill="none" stroke="#000000" d="M722.0237,-966.8746C787.5813,-958.0975 738.7653,-858.7914 712,-787 649.1516,-618.4246 509.8484,-649.5754 447,-481 432.4833,-442.0625 405.4444,-387.5 447,-387.5"/>
-<polygon fill="#000000" stroke="#000000" points="721.9806,-966.8772 711.7197,-963.0087 716.9903,-967.1886 712,-967.5 712,-967.5 712,-967.5 716.9903,-967.1886 712.2803,-971.9913 721.9806,-966.8772 721.9806,-966.8772"/>
-<text text-anchor="start" x="719.2855" y="-977.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (user_id) REFERENCES &quot;user&quot;(id)</text>
-</g>
-<!-- public.study_invite -->
-<g id="node5" class="node">
-<title>public.study_invite</title>
-<polygon fill="#efefef" stroke="transparent" points="779,-402.5 779,-437.5 1067,-437.5 1067,-402.5 779,-402.5"/>
-<polygon fill="none" stroke="#000000" points="779,-402.5 779,-437.5 1067,-437.5 1067,-402.5 779,-402.5"/>
-<text text-anchor="start" x="785.6995" y="-415.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_invite</text>
-<text text-anchor="start" x="932.7325" y="-415.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="966.9373" y="-415.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="779,-372.5 779,-402.5 1067,-402.5 1067,-372.5 779,-372.5"/>
-<text text-anchor="start" x="786" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">code    </text>
-<text text-anchor="start" x="850.5526" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="779,-342.5 779,-372.5 1067,-372.5 1067,-342.5 779,-342.5"/>
-<text text-anchor="start" x="786" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="872.3324" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="779,-312.5 779,-342.5 1067,-342.5 1067,-312.5 779,-312.5"/>
-<text text-anchor="start" x="786" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">preselected_intervention_ids    </text>
-<text text-anchor="start" x="998.3632" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- public.study_subject&#45;&gt;public.study_invite -->
-<g id="edge4" class="edge">
-<title>public.study_subject:invite_code&#45;&gt;public.study_invite:code</title>
-<path fill="none" stroke="#000000" d="M722.0977,-875.9153C812.0446,-845.5011 672.747,-387.5 779,-387.5"/>
-<polygon fill="#000000" stroke="#000000" points="721.8791,-875.9495 711.3023,-873.0544 716.9395,-876.7247 712,-877.5 712,-877.5 712,-877.5 716.9395,-876.7247 712.6977,-881.9456 721.8791,-875.9495 721.8791,-875.9495"/>
-<text text-anchor="start" x="719.0385" y="-887.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (invite_code) REFERENCES study_invite(code) ON DELETE CASCADE</text>
-</g>
-<!-- public.subject_progress -->
-<g id="node2" class="node">
-<title>public.subject_progress</title>
-<polygon fill="#efefef" stroke="transparent" points="396,-1382.5 396,-1417.5 726,-1417.5 726,-1382.5 396,-1382.5"/>
-<polygon fill="none" stroke="#000000" points="396,-1382.5 396,-1417.5 726,-1417.5 726,-1382.5 396,-1382.5"/>
-<text text-anchor="start" x="402.6962" y="-1395.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.subject_progress</text>
-<text text-anchor="start" x="591.7358" y="-1395.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="625.9406" y="-1395.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="396,-1352.5 396,-1382.5 726,-1382.5 726,-1352.5 396,-1352.5"/>
-<text text-anchor="start" x="403" y="-1363.9" font-family="Arial" font-size="14.00" fill="#000000">completed_at    </text>
-<text text-anchor="start" x="521.2314" y="-1363.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="396,-1322.5 396,-1352.5 726,-1352.5 726,-1322.5 396,-1322.5"/>
-<text text-anchor="start" x="403" y="-1333.9" font-family="Arial" font-size="14.00" fill="#000000">subject_id    </text>
-<text text-anchor="start" x="500.2216" y="-1333.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="396,-1292.5 396,-1322.5 726,-1322.5 726,-1292.5 396,-1292.5"/>
-<text text-anchor="start" x="403" y="-1303.9" font-family="Arial" font-size="14.00" fill="#000000">intervention_id    </text>
-<text text-anchor="start" x="528.2272" y="-1303.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="396,-1262.5 396,-1292.5 726,-1292.5 726,-1262.5 396,-1262.5"/>
-<text text-anchor="start" x="403" y="-1273.9" font-family="Arial" font-size="14.00" fill="#000000">task_id    </text>
-<text text-anchor="start" x="481.5498" y="-1273.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="396,-1232.5 396,-1262.5 726,-1262.5 726,-1232.5 396,-1232.5"/>
-<text text-anchor="start" x="403" y="-1243.9" font-family="Arial" font-size="14.00" fill="#000000">result_type    </text>
-<text text-anchor="start" x="505.6662" y="-1243.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="396,-1202.5 396,-1232.5 726,-1232.5 726,-1202.5 396,-1202.5"/>
-<text text-anchor="start" x="403" y="-1213.9" font-family="Arial" font-size="14.00" fill="#000000">result    </text>
-<text text-anchor="start" x="471.4278" y="-1213.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- public.subject_progress&#45;&gt;public.study_subject -->
-<g id="edge1" class="edge">
-<title>public.subject_progress:subject_id&#45;&gt;public.study_subject:id</title>
-<path fill="none" stroke="#000000" d="M385.9985,-1336.7979C319.532,-1326.9612 345.8288,-1216.2114 396,-1160 490.1249,-1054.5432 617.8751,-1229.4568 712,-1124 740.5591,-1092.0026 754.8889,-1027.5 712,-1027.5"/>
-<polygon fill="#000000" stroke="#000000" points="386.0245,-1336.7996 395.6848,-1341.989 391.0123,-1337.1498 396,-1337.5 396,-1337.5 396,-1337.5 391.0123,-1337.1498 396.3152,-1333.011 386.0245,-1336.7996 386.0245,-1336.7996"/>
-<text text-anchor="start" x="6.5975" y="-1347.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (subject_id) REFERENCES study_subject(id) ON DELETE CASCADE</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.study_tag.md b/docs/database/public.study_tag.md
deleted file mode 100644
index c04ba255c..000000000
--- a/docs/database/public.study_tag.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# public.study_tag
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| study_id | uuid |  | false |  | [public.study](public.study.md) |  |
-| tag_id | uuid |  | false |  | [public.tag](public.tag.md) |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| study_tag_studyId_fkey | FOREIGN KEY | FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE |
-| study_tag_tagId_fkey | FOREIGN KEY | FOREIGN KEY (tag_id) REFERENCES tag(id) ON DELETE CASCADE |
-| study_tag_pkey | PRIMARY KEY | PRIMARY KEY (study_id, tag_id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| study_tag_pkey | CREATE UNIQUE INDEX study_tag_pkey ON public.study_tag USING btree (study_id, tag_id) |
-
-## Relations
-
-![er](public.study_tag.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.study_tag.svg b/docs/database/public.study_tag.svg
deleted file mode 100644
index 8df118323..000000000
--- a/docs/database/public.study_tag.svg
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.study_tag Pages: 1 -->
-<svg width="961pt" height="982pt"
- viewBox="0.00 0.00 961.00 982.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 978)">
-<title>public.study_tag</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-978 957,-978 957,4 -4,4"/>
-<!-- public.study_tag -->
-<g id="node1" class="node">
-<title>public.study_tag</title>
-<polygon fill="#efefef" stroke="transparent" points="351,-892.5 351,-927.5 622,-927.5 622,-892.5 351,-892.5"/>
-<polygon fill="none" stroke="#000000" points="351,-892.5 351,-927.5 622,-927.5 622,-892.5 351,-892.5"/>
-<text text-anchor="start" x="357.6937" y="-905.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_tag</text>
-<text text-anchor="start" x="487.7383" y="-905.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="521.9431" y="-905.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="351,-862.5 351,-892.5 622,-892.5 622,-862.5 351,-862.5"/>
-<text text-anchor="start" x="358" y="-873.9" font-family="Arial" font-size="14.00" fill="#000000">study_id </text>
-<text text-anchor="start" x="414.0182" y="-873.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="351,-832.5 351,-862.5 622,-862.5 622,-832.5 351,-832.5"/>
-<text text-anchor="start" x="358" y="-843.9" font-family="Arial" font-size="14.00" fill="#000000">tag_id </text>
-<text text-anchor="start" x="400.0182" y="-843.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="349,-831.5 349,-929.5 623,-929.5 623,-831.5 349,-831.5"/>
-</g>
-<!-- public.study -->
-<g id="node2" class="node">
-<title>public.study</title>
-<polygon fill="#efefef" stroke="transparent" points="168,-672.5 168,-707.5 451,-707.5 451,-672.5 168,-672.5"/>
-<polygon fill="none" stroke="#000000" points="168,-672.5 168,-707.5 451,-707.5 451,-672.5 168,-672.5"/>
-<text text-anchor="start" x="198.2041" y="-685.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study</text>
-<text text-anchor="start" x="293.2279" y="-685.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="327.4327" y="-685.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="168,-642.5 168,-672.5 451,-672.5 451,-642.5 168,-642.5"/>
-<text text-anchor="start" x="175" y="-653.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="220.094" y="-653.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="168,-612.5 168,-642.5 451,-642.5 451,-612.5 168,-612.5"/>
-<text text-anchor="start" x="175" y="-623.9" font-family="Arial" font-size="14.00" fill="#000000">contact    </text>
-<text text-anchor="start" x="254.3338" y="-623.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="168,-582.5 168,-612.5 451,-612.5 451,-582.5 168,-582.5"/>
-<text text-anchor="start" x="175" y="-593.9" font-family="Arial" font-size="14.00" fill="#000000">title    </text>
-<text text-anchor="start" x="230.9818" y="-593.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="168,-552.5 168,-582.5 451,-582.5 451,-552.5 168,-552.5"/>
-<text text-anchor="start" x="175" y="-563.9" font-family="Arial" font-size="14.00" fill="#000000">description    </text>
-<text text-anchor="start" x="276.8822" y="-563.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="168,-522.5 168,-552.5 451,-552.5 451,-522.5 168,-522.5"/>
-<text text-anchor="start" x="175" y="-533.9" font-family="Arial" font-size="14.00" fill="#000000">icon_name    </text>
-<text text-anchor="start" x="277.6676" y="-533.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="168,-492.5 168,-522.5 451,-522.5 451,-492.5 168,-492.5"/>
-<text text-anchor="start" x="175" y="-503.9" font-family="Arial" font-size="14.00" fill="#000000">published    </text>
-<text text-anchor="start" x="269.1136" y="-503.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="168,-462.5 168,-492.5 451,-492.5 451,-462.5 168,-462.5"/>
-<text text-anchor="start" x="175" y="-473.9" font-family="Arial" font-size="14.00" fill="#000000">registry_published    </text>
-<text text-anchor="start" x="322.7798" y="-473.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="168,-432.5 168,-462.5 451,-462.5 451,-432.5 168,-432.5"/>
-<text text-anchor="start" x="175" y="-443.9" font-family="Arial" font-size="14.00" fill="#000000">questionnaire    </text>
-<text text-anchor="start" x="293.23" y="-443.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="168,-402.5 168,-432.5 451,-432.5 451,-402.5 168,-402.5"/>
-<text text-anchor="start" x="175" y="-413.9" font-family="Arial" font-size="14.00" fill="#000000">eligibility_criteria    </text>
-<text text-anchor="start" x="311.8556" y="-413.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="168,-372.5 168,-402.5 451,-402.5 451,-372.5 168,-372.5"/>
-<text text-anchor="start" x="175" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">observations    </text>
-<text text-anchor="start" x="288.5582" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="168,-342.5 168,-372.5 451,-372.5 451,-342.5 168,-342.5"/>
-<text text-anchor="start" x="175" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">interventions    </text>
-<text text-anchor="start" x="288.5554" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="168,-312.5 168,-342.5 451,-342.5 451,-312.5 168,-312.5"/>
-<text text-anchor="start" x="175" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">consent    </text>
-<text text-anchor="start" x="258.2258" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="168,-282.5 168,-312.5 451,-312.5 451,-282.5 168,-282.5"/>
-<text text-anchor="start" x="175" y="-293.9" font-family="Arial" font-size="14.00" fill="#000000">schedule    </text>
-<text text-anchor="start" x="265.2244" y="-293.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="168,-252.5 168,-282.5 451,-282.5 451,-252.5 168,-252.5"/>
-<text text-anchor="start" x="175" y="-263.9" font-family="Arial" font-size="14.00" fill="#000000">report_specification    </text>
-<text text-anchor="start" x="330.561" y="-263.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="168,-222.5 168,-252.5 451,-252.5 451,-222.5 168,-222.5"/>
-<text text-anchor="start" x="175" y="-233.9" font-family="Arial" font-size="14.00" fill="#000000">results    </text>
-<text text-anchor="start" x="250.4278" y="-233.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="168,-192.5 168,-222.5 451,-222.5 451,-192.5 168,-192.5"/>
-<text text-anchor="start" x="175" y="-203.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="275.3422" y="-203.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="168,-162.5 168,-192.5 451,-192.5 451,-162.5 168,-162.5"/>
-<text text-anchor="start" x="174.5344" y="-173.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="278.7812" y="-173.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="168,-132.5 168,-162.5 451,-162.5 451,-132.5 168,-132.5"/>
-<text text-anchor="start" x="175" y="-143.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="255.1024" y="-143.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="168,-102.5 168,-132.5 451,-132.5 451,-102.5 168,-102.5"/>
-<text text-anchor="start" x="175" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">participation    </text>
-<text text-anchor="start" x="284.662" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[participation]</text>
-<polygon fill="none" stroke="#000000" points="168,-72.5 168,-102.5 451,-102.5 451,-72.5 168,-72.5"/>
-<text text-anchor="start" x="175" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">result_sharing    </text>
-<text text-anchor="start" x="297.108" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[result_sharing]</text>
-<polygon fill="none" stroke="#000000" points="168,-42.5 168,-72.5 451,-72.5 451,-42.5 168,-42.5"/>
-<text text-anchor="start" x="175" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">collaborator_emails    </text>
-<text text-anchor="start" x="330.547" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- public.study_tag&#45;&gt;public.study -->
-<g id="edge1" class="edge">
-<title>public.study_tag:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M340.8082,-875.9289C314.174,-866.4869 330.1303,-816.6939 351,-787 378.1617,-748.3535 423.8383,-789.6465 451,-751 474.895,-717.0016 492.5556,-657.5 451,-657.5"/>
-<polygon fill="#000000" stroke="#000000" points="341.1167,-875.9764 350.3144,-881.9475 346.0584,-876.7382 351,-877.5 351,-877.5 351,-877.5 346.0584,-876.7382 351.6856,-873.0525 341.1167,-875.9764 341.1167,-875.9764"/>
-<text text-anchor="start" x="7.1035" y="-887.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE</text>
-</g>
-<!-- public.tag -->
-<g id="node3" class="node">
-<title>public.tag</title>
-<polygon fill="#efefef" stroke="transparent" points="555,-387.5 555,-422.5 773,-422.5 773,-387.5 555,-387.5"/>
-<polygon fill="none" stroke="#000000" points="555,-387.5 555,-422.5 773,-422.5 773,-387.5 555,-387.5"/>
-<text text-anchor="start" x="561.7041" y="-400.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.tag</text>
-<text text-anchor="start" x="638.7279" y="-400.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="672.9327" y="-400.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="555,-357.5 555,-387.5 773,-387.5 773,-357.5 555,-357.5"/>
-<text text-anchor="start" x="562" y="-368.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="607.094" y="-368.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="555,-327.5 555,-357.5 773,-357.5 773,-327.5 555,-327.5"/>
-<text text-anchor="start" x="562" y="-338.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="631.2132" y="-338.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-</g>
-<!-- public.study_tag&#45;&gt;public.tag -->
-<g id="edge2" class="edge">
-<title>public.study_tag:tag_id&#45;&gt;public.tag:id</title>
-<path fill="none" stroke="#000000" d="M632.3092,-845.5862C708.3369,-812.9002 452.3554,-372.5 555,-372.5"/>
-<polygon fill="#000000" stroke="#000000" points="631.832,-845.6747 621.1786,-843.0756 626.916,-846.5873 622,-847.5 622,-847.5 622,-847.5 626.916,-846.5873 622.8214,-851.9244 631.832,-845.6747 631.832,-845.6747"/>
-<text text-anchor="start" x="629.1035" y="-857.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (tag_id) REFERENCES tag(id) ON DELETE CASCADE</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.subject_progress.md b/docs/database/public.subject_progress.md
deleted file mode 100644
index 4290bc003..000000000
--- a/docs/database/public.subject_progress.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# public.subject_progress
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| completed_at | timestamp with time zone | timezone('utc'::text, now()) | false |  |  |  |
-| subject_id | uuid |  | false |  | [public.study_subject](public.study_subject.md) |  |
-| intervention_id | text |  | false |  |  |  |
-| task_id | text |  | false |  |  |  |
-| result_type | text |  | false |  |  |  |
-| result | jsonb |  | false |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| participant_progress_pkey | PRIMARY KEY | PRIMARY KEY (completed_at, subject_id) |
-| participant_progress_subjectId_fkey | FOREIGN KEY | FOREIGN KEY (subject_id) REFERENCES study_subject(id) ON DELETE CASCADE |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| participant_progress_pkey | CREATE UNIQUE INDEX participant_progress_pkey ON public.subject_progress USING btree (completed_at, subject_id) |
-
-## Relations
-
-![er](public.subject_progress.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.subject_progress.svg b/docs/database/public.subject_progress.svg
deleted file mode 100644
index 4d3b52aaa..000000000
--- a/docs/database/public.subject_progress.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.subject_progress Pages: 1 -->
-<svg width="780pt" height="682pt"
- viewBox="0.00 0.00 780.00 682.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 678)">
-<title>public.subject_progress</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-678 776,-678 776,4 -4,4"/>
-<!-- public.subject_progress -->
-<g id="node1" class="node">
-<title>public.subject_progress</title>
-<polygon fill="#efefef" stroke="transparent" points="396,-592.5 396,-627.5 726,-627.5 726,-592.5 396,-592.5"/>
-<polygon fill="none" stroke="#000000" points="396,-592.5 396,-627.5 726,-627.5 726,-592.5 396,-592.5"/>
-<text text-anchor="start" x="402.6962" y="-605.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.subject_progress</text>
-<text text-anchor="start" x="591.7358" y="-605.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="625.9406" y="-605.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="396,-562.5 396,-592.5 726,-592.5 726,-562.5 396,-562.5"/>
-<text text-anchor="start" x="403" y="-573.9" font-family="Arial" font-size="14.00" fill="#000000">completed_at </text>
-<text text-anchor="start" x="490.9172" y="-573.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="396,-532.5 396,-562.5 726,-562.5 726,-532.5 396,-532.5"/>
-<text text-anchor="start" x="403" y="-543.9" font-family="Arial" font-size="14.00" fill="#000000">subject_id </text>
-<text text-anchor="start" x="469.9074" y="-543.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="396,-502.5 396,-532.5 726,-532.5 726,-502.5 396,-502.5"/>
-<text text-anchor="start" x="403" y="-513.9" font-family="Arial" font-size="14.00" fill="#000000">intervention_id </text>
-<text text-anchor="start" x="497.913" y="-513.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="396,-472.5 396,-502.5 726,-502.5 726,-472.5 396,-472.5"/>
-<text text-anchor="start" x="403" y="-483.9" font-family="Arial" font-size="14.00" fill="#000000">task_id </text>
-<text text-anchor="start" x="451.2356" y="-483.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="396,-442.5 396,-472.5 726,-472.5 726,-442.5 396,-442.5"/>
-<text text-anchor="start" x="403" y="-453.9" font-family="Arial" font-size="14.00" fill="#000000">result_type </text>
-<text text-anchor="start" x="475.352" y="-453.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="396,-412.5 396,-442.5 726,-442.5 726,-412.5 396,-412.5"/>
-<text text-anchor="start" x="403" y="-423.9" font-family="Arial" font-size="14.00" fill="#000000">result </text>
-<text text-anchor="start" x="441.1136" y="-423.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="394.5,-411.5 394.5,-629.5 727.5,-629.5 727.5,-411.5 394.5,-411.5"/>
-</g>
-<!-- public.study_subject -->
-<g id="node2" class="node">
-<title>public.study_subject</title>
-<polygon fill="#efefef" stroke="transparent" points="409,-252.5 409,-287.5 712,-287.5 712,-252.5 409,-252.5"/>
-<polygon fill="none" stroke="#000000" points="409,-252.5 409,-287.5 712,-287.5 712,-252.5 409,-252.5"/>
-<text text-anchor="start" x="415.6935" y="-265.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_subject</text>
-<text text-anchor="start" x="577.7385" y="-265.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="611.9433" y="-265.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="409,-222.5 409,-252.5 712,-252.5 712,-222.5 409,-222.5"/>
-<text text-anchor="start" x="416" y="-233.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="461.094" y="-233.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="409,-192.5 409,-222.5 712,-222.5 712,-192.5 409,-192.5"/>
-<text text-anchor="start" x="416" y="-203.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="502.3324" y="-203.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="409,-162.5 409,-192.5 712,-192.5 712,-162.5 409,-162.5"/>
-<text text-anchor="start" x="416" y="-173.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="496.1024" y="-173.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="409,-132.5 409,-162.5 712,-162.5 712,-132.5 409,-132.5"/>
-<text text-anchor="start" x="416" y="-143.9" font-family="Arial" font-size="14.00" fill="#000000">started_at    </text>
-<text text-anchor="start" x="512.4502" y="-143.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="409,-102.5 409,-132.5 712,-132.5 712,-102.5 409,-102.5"/>
-<text text-anchor="start" x="416" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">selected_intervention_ids    </text>
-<text text-anchor="start" x="608.1374" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-<polygon fill="none" stroke="#000000" points="409,-72.5 409,-102.5 712,-102.5 712,-72.5 409,-72.5"/>
-<text text-anchor="start" x="416" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">invite_code    </text>
-<text text-anchor="start" x="521.0042" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="409,-42.5 409,-72.5 712,-72.5 712,-42.5 409,-42.5"/>
-<text text-anchor="start" x="416" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">is_deleted    </text>
-<text text-anchor="start" x="514.0042" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-</g>
-<!-- public.subject_progress&#45;&gt;public.study_subject -->
-<g id="edge1" class="edge">
-<title>public.subject_progress:subject_id&#45;&gt;public.study_subject:id</title>
-<path fill="none" stroke="#000000" d="M385.8294,-546.786C318.2396,-536.7831 344.9808,-424.1615 396,-367 490.1249,-261.5432 617.8751,-436.4568 712,-331 739.6713,-299.9973 753.5556,-237.5 712,-237.5"/>
-<polygon fill="#000000" stroke="#000000" points="386.0245,-546.7996 395.6848,-551.989 391.0123,-547.1498 396,-547.5 396,-547.5 396,-547.5 391.0123,-547.1498 396.3152,-543.011 386.0245,-546.7996 386.0245,-546.7996"/>
-<text text-anchor="start" x="6.5975" y="-557.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (subject_id) REFERENCES study_subject(id) ON DELETE CASCADE</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.tag.md b/docs/database/public.tag.md
deleted file mode 100644
index 7b5185da3..000000000
--- a/docs/database/public.tag.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# public.tag
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid | gen_random_uuid() | false | [public.study_tag](public.study_tag.md) |  |  |
-| name | text |  | false |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| tag_name_key | UNIQUE | UNIQUE (name) |
-| tag_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| tag_name_key | CREATE UNIQUE INDEX tag_name_key ON public.tag USING btree (name) |
-| tag_pkey | CREATE UNIQUE INDEX tag_pkey ON public.tag USING btree (id) |
-
-## Relations
-
-![er](public.tag.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.tag.svg b/docs/database/public.tag.svg
deleted file mode 100644
index 6f2c73503..000000000
--- a/docs/database/public.tag.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.tag Pages: 1 -->
-<svg width="519pt" height="412pt"
- viewBox="0.00 0.00 518.50 412.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 408)">
-<title>public.tag</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-408 514.5,-408 514.5,4 -4,4"/>
-<!-- public.tag -->
-<g id="node1" class="node">
-<title>public.tag</title>
-<polygon fill="#efefef" stroke="transparent" points="70.5,-105.5 70.5,-140.5 288.5,-140.5 288.5,-105.5 70.5,-105.5"/>
-<polygon fill="none" stroke="#000000" points="70.5,-105.5 70.5,-140.5 288.5,-140.5 288.5,-105.5 70.5,-105.5"/>
-<text text-anchor="start" x="77.2041" y="-118.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.tag</text>
-<text text-anchor="start" x="154.2279" y="-118.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="188.4327" y="-118.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="70.5,-75.5 70.5,-105.5 288.5,-105.5 288.5,-75.5 70.5,-75.5"/>
-<text text-anchor="start" x="77.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="92.2798" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="70.5,-45.5 70.5,-75.5 288.5,-75.5 288.5,-45.5 70.5,-45.5"/>
-<text text-anchor="start" x="77.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">name </text>
-<text text-anchor="start" x="116.399" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="69,-44.5 69,-142.5 290,-142.5 290,-44.5 69,-44.5"/>
-</g>
-<!-- public.study_tag -->
-<g id="node2" class="node">
-<title>public.study_tag</title>
-<polygon fill="#efefef" stroke="transparent" points="43.5,-325.5 43.5,-360.5 314.5,-360.5 314.5,-325.5 43.5,-325.5"/>
-<polygon fill="none" stroke="#000000" points="43.5,-325.5 43.5,-360.5 314.5,-360.5 314.5,-325.5 43.5,-325.5"/>
-<text text-anchor="start" x="50.1937" y="-338.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_tag</text>
-<text text-anchor="start" x="180.2383" y="-338.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="214.4431" y="-338.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-295.5 43.5,-325.5 314.5,-325.5 314.5,-295.5 43.5,-295.5"/>
-<text text-anchor="start" x="50.5" y="-306.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="136.8324" y="-306.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-265.5 43.5,-295.5 314.5,-295.5 314.5,-265.5 43.5,-265.5"/>
-<text text-anchor="start" x="50.5" y="-276.9" font-family="Arial" font-size="14.00" fill="#000000">tag_id    </text>
-<text text-anchor="start" x="122.8324" y="-276.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-</g>
-<!-- public.study_tag&#45;&gt;public.tag -->
-<g id="edge1" class="edge">
-<title>public.study_tag:tag_id&#45;&gt;public.tag:id</title>
-<path fill="none" stroke="#000000" d="M178.5749,-255.3639C169.4899,-209.7503 96.0133,-236.8154 70.5,-187 50.9491,-148.8264 27.6111,-90.5 70.5,-90.5"/>
-<polygon fill="#000000" stroke="#000000" points="178.591,-255.5414 175.0186,-265.9091 179.0455,-260.5207 179.5,-265.5 179.5,-265.5 179.5,-265.5 179.0455,-260.5207 183.9814,-265.0909 178.591,-255.5414 178.591,-255.5414"/>
-<text text-anchor="start" x="186.6035" y="-275.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (tag_id) REFERENCES tag(id) ON DELETE CASCADE</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/public.user.md b/docs/database/public.user.md
deleted file mode 100644
index 5164cc9ca..000000000
--- a/docs/database/public.user.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# public.user
-
-## Description
-
-Users get automatically added, when a new user is created in auth.users
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid |  | false | [public.study](public.study.md) [public.study_subject](public.study_subject.md) [public.repo](public.repo.md) |  |  |
-| email | text |  | true |  |  |  |
-| preferences | jsonb |  | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| user_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| user_pkey | CREATE UNIQUE INDEX user_pkey ON public."user" USING btree (id) |
-
-## Relations
-
-![er](public.user.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/public.user.svg b/docs/database/public.user.svg
deleted file mode 100644
index 696e041a9..000000000
--- a/docs/database/public.user.svg
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: public.user Pages: 1 -->
-<svg width="1117pt" height="1012pt"
- viewBox="0.00 0.00 1117.00 1012.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1008)">
-<title>public.user</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1008 1113,-1008 1113,4 -4,4"/>
-<!-- public.user -->
-<g id="node1" class="node">
-<title>public.user</title>
-<polygon fill="#efefef" stroke="transparent" points="468.5,-135.5 468.5,-170.5 696.5,-170.5 696.5,-135.5 468.5,-135.5"/>
-<polygon fill="none" stroke="#000000" points="468.5,-135.5 468.5,-170.5 696.5,-170.5 696.5,-135.5 468.5,-135.5"/>
-<text text-anchor="start" x="475.2091" y="-148.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.user</text>
-<text text-anchor="start" x="562.2229" y="-148.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="596.4277" y="-148.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="468.5,-105.5 468.5,-135.5 696.5,-135.5 696.5,-105.5 468.5,-105.5"/>
-<text text-anchor="start" x="475.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="490.2798" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="468.5,-75.5 468.5,-105.5 696.5,-105.5 696.5,-75.5 468.5,-75.5"/>
-<text text-anchor="start" x="475.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">email </text>
-<text text-anchor="start" x="512.8296" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="468.5,-45.5 468.5,-75.5 696.5,-75.5 696.5,-45.5 468.5,-45.5"/>
-<text text-anchor="start" x="475.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">preferences </text>
-<text text-anchor="start" x="553.298" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="467,-44.5 467,-172.5 698,-172.5 698,-44.5 467,-44.5"/>
-</g>
-<!-- public.study -->
-<g id="node2" class="node">
-<title>public.study</title>
-<polygon fill="#efefef" stroke="transparent" points="43.5,-925.5 43.5,-960.5 326.5,-960.5 326.5,-925.5 43.5,-925.5"/>
-<polygon fill="none" stroke="#000000" points="43.5,-925.5 43.5,-960.5 326.5,-960.5 326.5,-925.5 43.5,-925.5"/>
-<text text-anchor="start" x="73.7041" y="-938.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study</text>
-<text text-anchor="start" x="168.7279" y="-938.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="202.9327" y="-938.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-895.5 43.5,-925.5 326.5,-925.5 326.5,-895.5 43.5,-895.5"/>
-<text text-anchor="start" x="50.5" y="-906.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="95.594" y="-906.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-865.5 43.5,-895.5 326.5,-895.5 326.5,-865.5 43.5,-865.5"/>
-<text text-anchor="start" x="50.5" y="-876.9" font-family="Arial" font-size="14.00" fill="#000000">contact    </text>
-<text text-anchor="start" x="129.8338" y="-876.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-835.5 43.5,-865.5 326.5,-865.5 326.5,-835.5 43.5,-835.5"/>
-<text text-anchor="start" x="50.5" y="-846.9" font-family="Arial" font-size="14.00" fill="#000000">title    </text>
-<text text-anchor="start" x="106.4818" y="-846.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-805.5 43.5,-835.5 326.5,-835.5 326.5,-805.5 43.5,-805.5"/>
-<text text-anchor="start" x="50.5" y="-816.9" font-family="Arial" font-size="14.00" fill="#000000">description    </text>
-<text text-anchor="start" x="152.3822" y="-816.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-775.5 43.5,-805.5 326.5,-805.5 326.5,-775.5 43.5,-775.5"/>
-<text text-anchor="start" x="50.5" y="-786.9" font-family="Arial" font-size="14.00" fill="#000000">icon_name    </text>
-<text text-anchor="start" x="153.1676" y="-786.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-745.5 43.5,-775.5 326.5,-775.5 326.5,-745.5 43.5,-745.5"/>
-<text text-anchor="start" x="50.5" y="-756.9" font-family="Arial" font-size="14.00" fill="#000000">published    </text>
-<text text-anchor="start" x="144.6136" y="-756.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-715.5 43.5,-745.5 326.5,-745.5 326.5,-715.5 43.5,-715.5"/>
-<text text-anchor="start" x="50.5" y="-726.9" font-family="Arial" font-size="14.00" fill="#000000">registry_published    </text>
-<text text-anchor="start" x="198.2798" y="-726.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-685.5 43.5,-715.5 326.5,-715.5 326.5,-685.5 43.5,-685.5"/>
-<text text-anchor="start" x="50.5" y="-696.9" font-family="Arial" font-size="14.00" fill="#000000">questionnaire    </text>
-<text text-anchor="start" x="168.73" y="-696.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-655.5 43.5,-685.5 326.5,-685.5 326.5,-655.5 43.5,-655.5"/>
-<text text-anchor="start" x="50.5" y="-666.9" font-family="Arial" font-size="14.00" fill="#000000">eligibility_criteria    </text>
-<text text-anchor="start" x="187.3556" y="-666.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-625.5 43.5,-655.5 326.5,-655.5 326.5,-625.5 43.5,-625.5"/>
-<text text-anchor="start" x="50.5" y="-636.9" font-family="Arial" font-size="14.00" fill="#000000">observations    </text>
-<text text-anchor="start" x="164.0582" y="-636.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-595.5 43.5,-625.5 326.5,-625.5 326.5,-595.5 43.5,-595.5"/>
-<text text-anchor="start" x="50.5" y="-606.9" font-family="Arial" font-size="14.00" fill="#000000">interventions    </text>
-<text text-anchor="start" x="164.0554" y="-606.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-565.5 43.5,-595.5 326.5,-595.5 326.5,-565.5 43.5,-565.5"/>
-<text text-anchor="start" x="50.5" y="-576.9" font-family="Arial" font-size="14.00" fill="#000000">consent    </text>
-<text text-anchor="start" x="133.7258" y="-576.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-535.5 43.5,-565.5 326.5,-565.5 326.5,-535.5 43.5,-535.5"/>
-<text text-anchor="start" x="50.5" y="-546.9" font-family="Arial" font-size="14.00" fill="#000000">schedule    </text>
-<text text-anchor="start" x="140.7244" y="-546.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-505.5 43.5,-535.5 326.5,-535.5 326.5,-505.5 43.5,-505.5"/>
-<text text-anchor="start" x="50.5" y="-516.9" font-family="Arial" font-size="14.00" fill="#000000">report_specification    </text>
-<text text-anchor="start" x="206.061" y="-516.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-475.5 43.5,-505.5 326.5,-505.5 326.5,-475.5 43.5,-475.5"/>
-<text text-anchor="start" x="50.5" y="-486.9" font-family="Arial" font-size="14.00" fill="#000000">results    </text>
-<text text-anchor="start" x="125.9278" y="-486.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-445.5 43.5,-475.5 326.5,-475.5 326.5,-445.5 43.5,-445.5"/>
-<text text-anchor="start" x="50.5" y="-456.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="150.8422" y="-456.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-415.5 43.5,-445.5 326.5,-445.5 326.5,-415.5 43.5,-415.5"/>
-<text text-anchor="start" x="50.0344" y="-426.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="154.2812" y="-426.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-385.5 43.5,-415.5 326.5,-415.5 326.5,-385.5 43.5,-385.5"/>
-<text text-anchor="start" x="50.5" y="-396.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="130.6024" y="-396.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-355.5 43.5,-385.5 326.5,-385.5 326.5,-355.5 43.5,-355.5"/>
-<text text-anchor="start" x="50.5" y="-366.9" font-family="Arial" font-size="14.00" fill="#000000">participation    </text>
-<text text-anchor="start" x="160.162" y="-366.9" font-family="Arial" font-size="14.00" fill="#666666">[participation]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-325.5 43.5,-355.5 326.5,-355.5 326.5,-325.5 43.5,-325.5"/>
-<text text-anchor="start" x="50.5" y="-336.9" font-family="Arial" font-size="14.00" fill="#000000">result_sharing    </text>
-<text text-anchor="start" x="172.608" y="-336.9" font-family="Arial" font-size="14.00" fill="#666666">[result_sharing]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-295.5 43.5,-325.5 326.5,-325.5 326.5,-295.5 43.5,-295.5"/>
-<text text-anchor="start" x="50.5" y="-306.9" font-family="Arial" font-size="14.00" fill="#000000">collaborator_emails    </text>
-<text text-anchor="start" x="206.047" y="-306.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- public.study&#45;&gt;public.user -->
-<g id="edge1" class="edge">
-<title>public.study:user_id&#45;&gt;public.user:id</title>
-<path fill="none" stroke="#000000" d="M336.5102,-399.8021C390.8558,-391.5403 347.8981,-311.6598 377.5,-253 409.6853,-189.221 397.0601,-120.5 468.5,-120.5"/>
-<polygon fill="#000000" stroke="#000000" points="336.4758,-399.8044 326.187,-396.0109 331.4879,-400.1522 326.5,-400.5 326.5,-400.5 326.5,-400.5 331.4879,-400.1522 326.813,-404.9891 336.4758,-399.8044 336.4758,-399.8044"/>
-<text text-anchor="start" x="333.7855" y="-410.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (user_id) REFERENCES &quot;user&quot;(id)</text>
-</g>
-<!-- public.study_subject -->
-<g id="node3" class="node">
-<title>public.study_subject</title>
-<polygon fill="#efefef" stroke="transparent" points="430.5,-715.5 430.5,-750.5 733.5,-750.5 733.5,-715.5 430.5,-715.5"/>
-<polygon fill="none" stroke="#000000" points="430.5,-715.5 430.5,-750.5 733.5,-750.5 733.5,-715.5 430.5,-715.5"/>
-<text text-anchor="start" x="437.1935" y="-728.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_subject</text>
-<text text-anchor="start" x="599.2385" y="-728.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="633.4433" y="-728.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-685.5 430.5,-715.5 733.5,-715.5 733.5,-685.5 430.5,-685.5"/>
-<text text-anchor="start" x="437.5" y="-696.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="482.594" y="-696.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-655.5 430.5,-685.5 733.5,-685.5 733.5,-655.5 430.5,-655.5"/>
-<text text-anchor="start" x="437.5" y="-666.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="523.8324" y="-666.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-625.5 430.5,-655.5 733.5,-655.5 733.5,-625.5 430.5,-625.5"/>
-<text text-anchor="start" x="437.5" y="-636.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="517.6024" y="-636.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-595.5 430.5,-625.5 733.5,-625.5 733.5,-595.5 430.5,-595.5"/>
-<text text-anchor="start" x="437.5" y="-606.9" font-family="Arial" font-size="14.00" fill="#000000">started_at    </text>
-<text text-anchor="start" x="533.9502" y="-606.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-565.5 430.5,-595.5 733.5,-595.5 733.5,-565.5 430.5,-565.5"/>
-<text text-anchor="start" x="437.5" y="-576.9" font-family="Arial" font-size="14.00" fill="#000000">selected_intervention_ids    </text>
-<text text-anchor="start" x="629.6374" y="-576.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-535.5 430.5,-565.5 733.5,-565.5 733.5,-535.5 430.5,-535.5"/>
-<text text-anchor="start" x="437.5" y="-546.9" font-family="Arial" font-size="14.00" fill="#000000">invite_code    </text>
-<text text-anchor="start" x="542.5042" y="-546.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="430.5,-505.5 430.5,-535.5 733.5,-535.5 733.5,-505.5 430.5,-505.5"/>
-<text text-anchor="start" x="437.5" y="-516.9" font-family="Arial" font-size="14.00" fill="#000000">is_deleted    </text>
-<text text-anchor="start" x="535.5042" y="-516.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-</g>
-<!-- public.study_subject&#45;&gt;public.user -->
-<g id="edge2" class="edge">
-<title>public.study_subject:user_id&#45;&gt;public.user:id</title>
-<path fill="none" stroke="#000000" d="M743.7762,-639.8208C807.9845,-630.7107 763.5602,-531.9207 733.5,-463 669.2536,-315.6983 532.7464,-364.3017 468.5,-217 451.3537,-177.6876 425.6111,-120.5 468.5,-120.5"/>
-<polygon fill="#000000" stroke="#000000" points="743.4782,-639.8404 733.2032,-636.0098 738.4891,-640.1702 733.5,-640.5 733.5,-640.5 733.5,-640.5 738.4891,-640.1702 733.7968,-644.9902 743.4782,-639.8404 743.4782,-639.8404"/>
-<text text-anchor="start" x="621.2855" y="-624.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (user_id) REFERENCES &quot;user&quot;(id)</text>
-</g>
-<!-- public.repo -->
-<g id="node4" class="node">
-<title>public.repo</title>
-<polygon fill="#efefef" stroke="transparent" points="837.5,-670.5 837.5,-705.5 1066.5,-705.5 1066.5,-670.5 837.5,-670.5"/>
-<polygon fill="none" stroke="#000000" points="837.5,-670.5 837.5,-705.5 1066.5,-705.5 1066.5,-670.5 837.5,-670.5"/>
-<text text-anchor="start" x="844.206" y="-683.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.repo</text>
-<text text-anchor="start" x="932.226" y="-683.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="966.4308" y="-683.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="837.5,-640.5 837.5,-670.5 1066.5,-670.5 1066.5,-640.5 837.5,-640.5"/>
-<text text-anchor="start" x="844.5" y="-651.9" font-family="Arial" font-size="14.00" fill="#000000">project_id    </text>
-<text text-anchor="start" x="939.3822" y="-651.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="837.5,-610.5 837.5,-640.5 1066.5,-640.5 1066.5,-610.5 837.5,-610.5"/>
-<text text-anchor="start" x="844.5" y="-621.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="924.6024" y="-621.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="837.5,-580.5 837.5,-610.5 1066.5,-610.5 1066.5,-580.5 837.5,-580.5"/>
-<text text-anchor="start" x="844.5" y="-591.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="930.8324" y="-591.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="837.5,-550.5 837.5,-580.5 1066.5,-580.5 1066.5,-550.5 837.5,-550.5"/>
-<text text-anchor="start" x="844.5" y="-561.9" font-family="Arial" font-size="14.00" fill="#000000">provider    </text>
-<text text-anchor="start" x="929.263" y="-561.9" font-family="Arial" font-size="14.00" fill="#666666">[git_provider]</text>
-</g>
-<!-- public.repo&#45;&gt;public.user -->
-<g id="edge3" class="edge">
-<title>public.repo:user_id&#45;&gt;public.user:id</title>
-<path fill="none" stroke="#000000" d="M827.5104,-623.9097C759.0295,-600.597 814.0587,-327.7172 785.5,-253 760.1719,-186.7351 767.4404,-120.5 696.5,-120.5"/>
-<polygon fill="#000000" stroke="#000000" points="827.6244,-623.9278 836.7925,-629.944 832.5622,-624.7139 837.5,-625.5 837.5,-625.5 837.5,-625.5 832.5622,-624.7139 838.2075,-621.056 827.6244,-623.9278 827.6244,-623.9278"/>
-<text text-anchor="start" x="495.5045" y="-635.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (user_id) REFERENCES &quot;user&quot;(id) ON DELETE CASCADE</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/schema.json b/docs/database/schema.json
deleted file mode 100644
index 3d40ab780..000000000
--- a/docs/database/schema.json
+++ /dev/null
@@ -1 +0,0 @@
-{"name":"postgres","desc":"","tables":[{"name":"auth.users","type":"BASE TABLE","comment":"Auth: Stores user login data within a secure schema.","columns":[{"name":"instance_id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"aud","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"role","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"email","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"encrypted_password","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"confirmed_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"invited_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"confirmation_token","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"confirmation_sent_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"recovery_token","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"recovery_sent_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"email_change_token","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"email_change","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"email_change_sent_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"last_sign_in_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"raw_app_meta_data","type":"jsonb","nullable":true,"default":null,"comment":""},{"name":"raw_user_meta_data","type":"jsonb","nullable":true,"default":null,"comment":""},{"name":"is_super_admin","type":"boolean","nullable":true,"default":null,"comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"updated_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""}],"indexes":[{"name":"users_pkey","def":"CREATE UNIQUE INDEX users_pkey ON auth.users USING btree (id)","table":"auth.users","columns":["id"],"comment":""},{"name":"users_email_key","def":"CREATE UNIQUE INDEX users_email_key ON auth.users USING btree (email)","table":"auth.users","columns":["email"],"comment":""},{"name":"users_instance_id_email_idx","def":"CREATE INDEX users_instance_id_email_idx ON auth.users USING btree (instance_id, email)","table":"auth.users","columns":["email","instance_id"],"comment":""},{"name":"users_instance_id_idx","def":"CREATE INDEX users_instance_id_idx ON auth.users USING btree (instance_id)","table":"auth.users","columns":["instance_id"],"comment":""}],"constraints":[{"name":"users_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"auth.users","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""},{"name":"users_email_key","type":"UNIQUE","def":"UNIQUE (email)","table":"auth.users","referenced_table":"","columns":["email"],"referenced_columns":[],"comment":""}],"triggers":[{"name":"on_auth_user_created","def":"CREATE TRIGGER on_auth_user_created AFTER INSERT ON auth.users FOR EACH ROW EXECUTE FUNCTION handle_new_user()","comment":""}],"def":""},{"name":"auth.refresh_tokens","type":"BASE TABLE","comment":"Auth: Store of tokens used to refresh JWT tokens once they expire.","columns":[{"name":"instance_id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"id","type":"bigint","nullable":false,"default":"nextval('auth.refresh_tokens_id_seq'::regclass)","comment":""},{"name":"token","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"user_id","type":"varchar(255)","nullable":true,"default":null,"comment":""},{"name":"revoked","type":"boolean","nullable":true,"default":null,"comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"updated_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""}],"indexes":[{"name":"refresh_tokens_pkey","def":"CREATE UNIQUE INDEX refresh_tokens_pkey ON auth.refresh_tokens USING btree (id)","table":"auth.refresh_tokens","columns":["id"],"comment":""},{"name":"refresh_tokens_instance_id_idx","def":"CREATE INDEX refresh_tokens_instance_id_idx ON auth.refresh_tokens USING btree (instance_id)","table":"auth.refresh_tokens","columns":["instance_id"],"comment":""},{"name":"refresh_tokens_instance_id_user_id_idx","def":"CREATE INDEX refresh_tokens_instance_id_user_id_idx ON auth.refresh_tokens USING btree (instance_id, user_id)","table":"auth.refresh_tokens","columns":["instance_id","user_id"],"comment":""},{"name":"refresh_tokens_token_idx","def":"CREATE INDEX refresh_tokens_token_idx ON auth.refresh_tokens USING btree (token)","table":"auth.refresh_tokens","columns":["token"],"comment":""}],"constraints":[{"name":"refresh_tokens_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"auth.refresh_tokens","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"auth.instances","type":"BASE TABLE","comment":"Auth: Manages users across multiple sites.","columns":[{"name":"id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"uuid","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"raw_base_config","type":"text","nullable":true,"default":null,"comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"updated_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""}],"indexes":[{"name":"instances_pkey","def":"CREATE UNIQUE INDEX instances_pkey ON auth.instances USING btree (id)","table":"auth.instances","columns":["id"],"comment":""}],"constraints":[{"name":"instances_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"auth.instances","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"auth.audit_log_entries","type":"BASE TABLE","comment":"Auth: Audit trail for user actions.","columns":[{"name":"instance_id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"payload","type":"json","nullable":true,"default":null,"comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""}],"indexes":[{"name":"audit_log_entries_pkey","def":"CREATE UNIQUE INDEX audit_log_entries_pkey ON auth.audit_log_entries USING btree (id)","table":"auth.audit_log_entries","columns":["id"],"comment":""},{"name":"audit_logs_instance_id_idx","def":"CREATE INDEX audit_logs_instance_id_idx ON auth.audit_log_entries USING btree (instance_id)","table":"auth.audit_log_entries","columns":["instance_id"],"comment":""}],"constraints":[{"name":"audit_log_entries_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"auth.audit_log_entries","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"auth.schema_migrations","type":"BASE TABLE","comment":"Auth: Manages updates to the auth system.","columns":[{"name":"version","type":"varchar(255)","nullable":false,"default":null,"comment":""}],"indexes":[{"name":"schema_migrations_pkey","def":"CREATE UNIQUE INDEX schema_migrations_pkey ON auth.schema_migrations USING btree (version)","table":"auth.schema_migrations","columns":["version"],"comment":""}],"constraints":[{"name":"schema_migrations_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (version)","table":"auth.schema_migrations","referenced_table":"","columns":["version"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"storage.buckets","type":"BASE TABLE","comment":"","columns":[{"name":"id","type":"text","nullable":false,"default":null,"comment":""},{"name":"name","type":"text","nullable":false,"default":null,"comment":""},{"name":"owner","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":true,"default":"now()","comment":""},{"name":"updated_at","type":"timestamp with time zone","nullable":true,"default":"now()","comment":""}],"indexes":[{"name":"buckets_pkey","def":"CREATE UNIQUE INDEX buckets_pkey ON storage.buckets USING btree (id)","table":"storage.buckets","columns":["id"],"comment":""},{"name":"bname","def":"CREATE UNIQUE INDEX bname ON storage.buckets USING btree (name)","table":"storage.buckets","columns":["name"],"comment":""}],"constraints":[{"name":"buckets_owner_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (owner) REFERENCES auth.users(id)","table":"storage.buckets","referenced_table":"users","columns":["owner"],"referenced_columns":["id"],"comment":""},{"name":"buckets_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"storage.buckets","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"storage.objects","type":"BASE TABLE","comment":"","columns":[{"name":"id","type":"uuid","nullable":false,"default":"uuid_generate_v4()","comment":""},{"name":"bucket_id","type":"text","nullable":true,"default":null,"comment":""},{"name":"name","type":"text","nullable":true,"default":null,"comment":""},{"name":"owner","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":true,"default":"now()","comment":""},{"name":"updated_at","type":"timestamp with time zone","nullable":true,"default":"now()","comment":""},{"name":"last_accessed_at","type":"timestamp with time zone","nullable":true,"default":"now()","comment":""},{"name":"metadata","type":"jsonb","nullable":true,"default":null,"comment":""}],"indexes":[{"name":"objects_pkey","def":"CREATE UNIQUE INDEX objects_pkey ON storage.objects USING btree (id)","table":"storage.objects","columns":["id"],"comment":""},{"name":"bucketid_objname","def":"CREATE UNIQUE INDEX bucketid_objname ON storage.objects USING btree (bucket_id, name)","table":"storage.objects","columns":["bucket_id","name"],"comment":""},{"name":"name_prefix_search","def":"CREATE INDEX name_prefix_search ON storage.objects USING btree (name text_pattern_ops)","table":"storage.objects","columns":["name"],"comment":""}],"constraints":[{"name":"objects_owner_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (owner) REFERENCES auth.users(id)","table":"storage.objects","referenced_table":"users","columns":["owner"],"referenced_columns":["id"],"comment":""},{"name":"objects_bucketId_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (bucket_id) REFERENCES storage.buckets(id)","table":"storage.objects","referenced_table":"buckets","columns":["bucket_id"],"referenced_columns":["id"],"comment":""},{"name":"objects_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"storage.objects","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"storage.migrations","type":"BASE TABLE","comment":"","columns":[{"name":"id","type":"integer","nullable":false,"default":null,"comment":""},{"name":"name","type":"varchar(100)","nullable":false,"default":null,"comment":""},{"name":"hash","type":"varchar(40)","nullable":false,"default":null,"comment":""},{"name":"executed_at","type":"timestamp without time zone","nullable":true,"default":"CURRENT_TIMESTAMP","comment":""}],"indexes":[{"name":"migrations_pkey","def":"CREATE UNIQUE INDEX migrations_pkey ON storage.migrations USING btree (id)","table":"storage.migrations","columns":["id"],"comment":""},{"name":"migrations_name_key","def":"CREATE UNIQUE INDEX migrations_name_key ON storage.migrations USING btree (name)","table":"storage.migrations","columns":["name"],"comment":""}],"constraints":[{"name":"migrations_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"storage.migrations","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""},{"name":"migrations_name_key","type":"UNIQUE","def":"UNIQUE (name)","table":"storage.migrations","referenced_table":"","columns":["name"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"net.http_request_queue","type":"BASE TABLE","comment":"","columns":[{"name":"id","type":"bigint","nullable":false,"default":"nextval('net.http_request_queue_id_seq'::regclass)","comment":""},{"name":"method","type":"net.http_method","nullable":false,"default":null,"comment":""},{"name":"url","type":"text","nullable":false,"default":null,"comment":""},{"name":"headers","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"body","type":"bytea","nullable":true,"default":null,"comment":""},{"name":"timeout_milliseconds","type":"integer","nullable":false,"default":null,"comment":""}],"indexes":[],"constraints":[],"triggers":[],"def":""},{"name":"net._http_response","type":"BASE TABLE","comment":"","columns":[{"name":"id","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"status_code","type":"integer","nullable":true,"default":null,"comment":""},{"name":"content_type","type":"text","nullable":true,"default":null,"comment":""},{"name":"headers","type":"jsonb","nullable":true,"default":null,"comment":""},{"name":"content","type":"text","nullable":true,"default":null,"comment":""},{"name":"timed_out","type":"boolean","nullable":true,"default":null,"comment":""},{"name":"error_msg","type":"text","nullable":true,"default":null,"comment":""},{"name":"created","type":"timestamp with time zone","nullable":false,"default":"now()","comment":""}],"indexes":[{"name":"_http_response_created_idx","def":"CREATE INDEX _http_response_created_idx ON net._http_response USING btree (created)","table":"net._http_response","columns":["created"],"comment":""}],"constraints":[],"triggers":[],"def":""},{"name":"supabase_functions.migrations","type":"BASE TABLE","comment":"","columns":[{"name":"version","type":"text","nullable":false,"default":null,"comment":""},{"name":"inserted_at","type":"timestamp with time zone","nullable":false,"default":"now()","comment":""}],"indexes":[{"name":"migrations_pkey","def":"CREATE UNIQUE INDEX migrations_pkey ON supabase_functions.migrations USING btree (version)","table":"supabase_functions.migrations","columns":["version"],"comment":""}],"constraints":[{"name":"migrations_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (version)","table":"supabase_functions.migrations","referenced_table":"","columns":["version"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"supabase_functions.hooks","type":"BASE TABLE","comment":"Supabase Functions Hooks: Audit trail for triggered hooks.","columns":[{"name":"id","type":"bigint","nullable":false,"default":"nextval('supabase_functions.hooks_id_seq'::regclass)","comment":""},{"name":"hook_table_id","type":"integer","nullable":false,"default":null,"comment":""},{"name":"hook_name","type":"text","nullable":false,"default":null,"comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":false,"default":"now()","comment":""},{"name":"request_id","type":"bigint","nullable":true,"default":null,"comment":""}],"indexes":[{"name":"hooks_pkey","def":"CREATE UNIQUE INDEX hooks_pkey ON supabase_functions.hooks USING btree (id)","table":"supabase_functions.hooks","columns":["id"],"comment":""},{"name":"supabase_functions_hooks_request_id_idx","def":"CREATE INDEX supabase_functions_hooks_request_id_idx ON supabase_functions.hooks USING btree (request_id)","table":"supabase_functions.hooks","columns":["request_id"],"comment":""},{"name":"supabase_functions_hooks_h_table_id_h_name_idx","def":"CREATE INDEX supabase_functions_hooks_h_table_id_h_name_idx ON supabase_functions.hooks USING btree (hook_table_id, hook_name)","table":"supabase_functions.hooks","columns":["hook_name","hook_table_id"],"comment":""}],"constraints":[{"name":"hooks_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"supabase_functions.hooks","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"public.study","type":"BASE TABLE","comment":"","columns":[{"name":"id","type":"uuid","nullable":false,"default":"gen_random_uuid()","comment":""},{"name":"contact","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"title","type":"text","nullable":false,"default":null,"comment":""},{"name":"description","type":"text","nullable":false,"default":null,"comment":""},{"name":"icon_name","type":"text","nullable":false,"default":null,"comment":""},{"name":"published","type":"boolean","nullable":false,"default":"false","comment":""},{"name":"registry_published","type":"boolean","nullable":false,"default":"false","comment":""},{"name":"questionnaire","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"eligibility_criteria","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"observations","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"interventions","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"consent","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"schedule","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"report_specification","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"results","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":false,"default":"now()","comment":""},{"name":"updated_at","type":"timestamp with time zone","nullable":false,"default":"now()","comment":""},{"name":"user_id","type":"uuid","nullable":false,"default":null,"comment":"UserId of study creator"},{"name":"participation","type":"participation","nullable":false,"default":"'invite'::participation","comment":""},{"name":"result_sharing","type":"result_sharing","nullable":false,"default":"'private'::result_sharing","comment":""},{"name":"collaborator_emails","type":"text[]","nullable":false,"default":"'{}'::text[]","comment":""}],"indexes":[{"name":"study_id_key","def":"CREATE UNIQUE INDEX study_id_key ON public.study USING btree (id)","table":"public.study","columns":["id"],"comment":""},{"name":"study_pkey","def":"CREATE UNIQUE INDEX study_pkey ON public.study USING btree (id)","table":"public.study","columns":["id"],"comment":""}],"constraints":[{"name":"study_id_key","type":"UNIQUE","def":"UNIQUE (id)","table":"public.study","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""},{"name":"study_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"public.study","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""},{"name":"study_userId_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (user_id) REFERENCES \"user\"(id)","table":"public.study","referenced_table":"user","columns":["user_id"],"referenced_columns":["id"],"comment":""}],"triggers":[{"name":"handle_updated_at","def":"CREATE TRIGGER handle_updated_at BEFORE UPDATE ON public.study FOR EACH ROW EXECUTE FUNCTION moddatetime('updated_at')","comment":""}],"def":""},{"name":"public.study_subject","type":"BASE TABLE","comment":"","columns":[{"name":"id","type":"uuid","nullable":false,"default":"gen_random_uuid()","comment":""},{"name":"study_id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"user_id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"started_at","type":"timestamp with time zone","nullable":true,"default":"now()","comment":""},{"name":"selected_intervention_ids","type":"text[]","nullable":false,"default":null,"comment":""},{"name":"invite_code","type":"text","nullable":true,"default":null,"comment":""},{"name":"is_deleted","type":"boolean","nullable":false,"default":"false","comment":""}],"indexes":[{"name":"study_subject_pkey","def":"CREATE UNIQUE INDEX study_subject_pkey ON public.study_subject USING btree (id)","table":"public.study_subject","columns":["id"],"comment":""}],"constraints":[{"name":"study_subject_studyId_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE","table":"public.study_subject","referenced_table":"study","columns":["study_id"],"referenced_columns":["id"],"comment":""},{"name":"study_subject_loginCode_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (invite_code) REFERENCES study_invite(code) ON DELETE CASCADE","table":"public.study_subject","referenced_table":"study_invite","columns":["invite_code"],"referenced_columns":["code"],"comment":""},{"name":"study_subject_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"public.study_subject","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""},{"name":"study_subject_userId_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (user_id) REFERENCES \"user\"(id)","table":"public.study_subject","referenced_table":"user","columns":["user_id"],"referenced_columns":["id"],"comment":""}],"triggers":[],"def":""},{"name":"public.app_config","type":"BASE TABLE","comment":"Stores app config for different envs","columns":[{"name":"id","type":"text","nullable":false,"default":null,"comment":""},{"name":"app_min_version","type":"text","nullable":false,"default":null,"comment":""},{"name":"app_privacy","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"app_terms","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"designer_privacy","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"designer_terms","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"imprint","type":"jsonb","nullable":false,"default":null,"comment":""},{"name":"contact","type":"jsonb","nullable":false,"default":"'{\"email\": \"hpi-info@hpi.de\", \"phone\": \"+49-(0)331 5509-0\", \"website\": \"https://hpi.de/\", \"organization\": \"Hasso Plattner Institute\"}'::jsonb","comment":""},{"name":"analytics","type":"jsonb","nullable":true,"default":null,"comment":""}],"indexes":[{"name":"AppConfig_pkey","def":"CREATE UNIQUE INDEX \"AppConfig_pkey\" ON public.app_config USING btree (id)","table":"public.app_config","columns":["id"],"comment":""}],"constraints":[{"name":"AppConfig_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"public.app_config","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"public.repo","type":"BASE TABLE","comment":"Git repo where the generated project is stored","columns":[{"name":"project_id","type":"text","nullable":false,"default":null,"comment":""},{"name":"user_id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"study_id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"provider","type":"git_provider","nullable":false,"default":null,"comment":""}],"indexes":[{"name":"repo_pkey","def":"CREATE UNIQUE INDEX repo_pkey ON public.repo USING btree (project_id)","table":"public.repo","columns":["project_id"],"comment":""}],"constraints":[{"name":"repo_studyId_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (study_id) REFERENCES study(id)","table":"public.repo","referenced_table":"study","columns":["study_id"],"referenced_columns":["id"],"comment":""},{"name":"repo_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (project_id)","table":"public.repo","referenced_table":"","columns":["project_id"],"referenced_columns":[],"comment":""},{"name":"repo_userId_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (user_id) REFERENCES \"user\"(id) ON DELETE CASCADE","table":"public.repo","referenced_table":"user","columns":["user_id"],"referenced_columns":["id"],"comment":""}],"triggers":[],"def":""},{"name":"public.study_invite","type":"BASE TABLE","comment":"Study invite codes","columns":[{"name":"code","type":"text","nullable":false,"default":null,"comment":""},{"name":"study_id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"preselected_intervention_ids","type":"text[]","nullable":true,"default":null,"comment":"Intervention Ids (and order) preselected by study creator"}],"indexes":[{"name":"study_invite_pkey","def":"CREATE UNIQUE INDEX study_invite_pkey ON public.study_invite USING btree (code)","table":"public.study_invite","columns":["code"],"comment":""}],"constraints":[{"name":"study_invite_studyId_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE","table":"public.study_invite","referenced_table":"study","columns":["study_id"],"referenced_columns":["id"],"comment":""},{"name":"study_invite_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (code)","table":"public.study_invite","referenced_table":"","columns":["code"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"public.subject_progress","type":"BASE TABLE","comment":"","columns":[{"name":"completed_at","type":"timestamp with time zone","nullable":false,"default":"timezone('utc'::text, now())","comment":""},{"name":"subject_id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"intervention_id","type":"text","nullable":false,"default":null,"comment":""},{"name":"task_id","type":"text","nullable":false,"default":null,"comment":""},{"name":"result_type","type":"text","nullable":false,"default":null,"comment":""},{"name":"result","type":"jsonb","nullable":false,"default":null,"comment":""}],"indexes":[{"name":"participant_progress_pkey","def":"CREATE UNIQUE INDEX participant_progress_pkey ON public.subject_progress USING btree (completed_at, subject_id)","table":"public.subject_progress","columns":["completed_at","subject_id"],"comment":""}],"constraints":[{"name":"participant_progress_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (completed_at, subject_id)","table":"public.subject_progress","referenced_table":"","columns":["completed_at","subject_id"],"referenced_columns":[],"comment":""},{"name":"participant_progress_subjectId_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (subject_id) REFERENCES study_subject(id) ON DELETE CASCADE","table":"public.subject_progress","referenced_table":"study_subject","columns":["subject_id"],"referenced_columns":["id"],"comment":""}],"triggers":[],"def":""},{"name":"public.study_progress_export","type":"VIEW","comment":"","columns":[{"name":"completed_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"intervention_id","type":"text","nullable":true,"default":null,"comment":""},{"name":"task_id","type":"text","nullable":true,"default":null,"comment":""},{"name":"result_type","type":"text","nullable":true,"default":null,"comment":""},{"name":"result","type":"jsonb","nullable":true,"default":null,"comment":""},{"name":"subject_id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"user_id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"study_id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"started_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"selected_intervention_ids","type":"text[]","nullable":true,"default":null,"comment":""}],"indexes":[],"constraints":[],"triggers":[],"def":"CREATE VIEW study_progress_export AS (\n SELECT subject_progress.completed_at,\n    subject_progress.intervention_id,\n    subject_progress.task_id,\n    subject_progress.result_type,\n    subject_progress.result,\n    subject_progress.subject_id,\n    study_subject.user_id,\n    study_subject.study_id,\n    study_subject.started_at,\n    study_subject.selected_intervention_ids\n   FROM study_subject,\n    subject_progress\n  WHERE (study_subject.id = subject_progress.subject_id)\n)","referenced_tables":["public.study_subject"]},{"name":"public.user","type":"BASE TABLE","comment":"Users get automatically added, when a new user is created in auth.users","columns":[{"name":"id","type":"uuid","nullable":false,"default":null,"comment":""},{"name":"email","type":"text","nullable":true,"default":null,"comment":""},{"name":"preferences","type":"jsonb","nullable":true,"default":null,"comment":""}],"indexes":[{"name":"user_pkey","def":"CREATE UNIQUE INDEX user_pkey ON public.\"user\" USING btree (id)","table":"public.user","columns":["id"],"comment":""}],"constraints":[{"name":"user_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"public.user","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""}],"triggers":[],"def":""},{"name":"extensions.pg_stat_statements_info","type":"VIEW","comment":"","columns":[{"name":"dealloc","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"stats_reset","type":"timestamp with time zone","nullable":true,"default":null,"comment":""}],"indexes":[],"constraints":[],"triggers":[],"def":"CREATE VIEW pg_stat_statements_info AS (\n SELECT pg_stat_statements_info.dealloc,\n    pg_stat_statements_info.stats_reset\n   FROM pg_stat_statements_info() pg_stat_statements_info(dealloc, stats_reset)\n)","referenced_tables":["pg_stat_statements_info"]},{"name":"extensions.pg_stat_statements","type":"VIEW","comment":"","columns":[{"name":"userid","type":"oid","nullable":true,"default":null,"comment":""},{"name":"dbid","type":"oid","nullable":true,"default":null,"comment":""},{"name":"toplevel","type":"boolean","nullable":true,"default":null,"comment":""},{"name":"queryid","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"query","type":"text","nullable":true,"default":null,"comment":""},{"name":"plans","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"total_plan_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"min_plan_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"max_plan_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"mean_plan_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"stddev_plan_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"calls","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"total_exec_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"min_exec_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"max_exec_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"mean_exec_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"stddev_exec_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"rows","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"shared_blks_hit","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"shared_blks_read","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"shared_blks_dirtied","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"shared_blks_written","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"local_blks_hit","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"local_blks_read","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"local_blks_dirtied","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"local_blks_written","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"temp_blks_read","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"temp_blks_written","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"blk_read_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"blk_write_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"temp_blk_read_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"temp_blk_write_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"wal_records","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"wal_fpi","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"wal_bytes","type":"numeric","nullable":true,"default":null,"comment":""},{"name":"jit_functions","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"jit_generation_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"jit_inlining_count","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"jit_inlining_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"jit_optimization_count","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"jit_optimization_time","type":"double precision","nullable":true,"default":null,"comment":""},{"name":"jit_emission_count","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"jit_emission_time","type":"double precision","nullable":true,"default":null,"comment":""}],"indexes":[],"constraints":[],"triggers":[],"def":"CREATE VIEW pg_stat_statements AS (\n SELECT pg_stat_statements.userid,\n    pg_stat_statements.dbid,\n    pg_stat_statements.toplevel,\n    pg_stat_statements.queryid,\n    pg_stat_statements.query,\n    pg_stat_statements.plans,\n    pg_stat_statements.total_plan_time,\n    pg_stat_statements.min_plan_time,\n    pg_stat_statements.max_plan_time,\n    pg_stat_statements.mean_plan_time,\n    pg_stat_statements.stddev_plan_time,\n    pg_stat_statements.calls,\n    pg_stat_statements.total_exec_time,\n    pg_stat_statements.min_exec_time,\n    pg_stat_statements.max_exec_time,\n    pg_stat_statements.mean_exec_time,\n    pg_stat_statements.stddev_exec_time,\n    pg_stat_statements.rows,\n    pg_stat_statements.shared_blks_hit,\n    pg_stat_statements.shared_blks_read,\n    pg_stat_statements.shared_blks_dirtied,\n    pg_stat_statements.shared_blks_written,\n    pg_stat_statements.local_blks_hit,\n    pg_stat_statements.local_blks_read,\n    pg_stat_statements.local_blks_dirtied,\n    pg_stat_statements.local_blks_written,\n    pg_stat_statements.temp_blks_read,\n    pg_stat_statements.temp_blks_written,\n    pg_stat_statements.blk_read_time,\n    pg_stat_statements.blk_write_time,\n    pg_stat_statements.temp_blk_read_time,\n    pg_stat_statements.temp_blk_write_time,\n    pg_stat_statements.wal_records,\n    pg_stat_statements.wal_fpi,\n    pg_stat_statements.wal_bytes,\n    pg_stat_statements.jit_functions,\n    pg_stat_statements.jit_generation_time,\n    pg_stat_statements.jit_inlining_count,\n    pg_stat_statements.jit_inlining_time,\n    pg_stat_statements.jit_optimization_count,\n    pg_stat_statements.jit_optimization_time,\n    pg_stat_statements.jit_emission_count,\n    pg_stat_statements.jit_emission_time\n   FROM pg_stat_statements(true) pg_stat_statements(userid, dbid, toplevel, queryid, query, plans, total_plan_time, min_plan_time, max_plan_time, mean_plan_time, stddev_plan_time, calls, total_exec_time, min_exec_time, max_exec_time, mean_exec_time, stddev_exec_time, rows, shared_blks_hit, shared_blks_read, shared_blks_dirtied, shared_blks_written, local_blks_hit, local_blks_read, local_blks_dirtied, local_blks_written, temp_blks_read, temp_blks_written, blk_read_time, blk_write_time, temp_blk_read_time, temp_blk_write_time, wal_records, wal_fpi, wal_bytes, jit_functions, jit_generation_time, jit_inlining_count, jit_inlining_time, jit_optimization_count, jit_optimization_time, jit_emission_count, jit_emission_time)\n)","referenced_tables":["pg_stat_statements"]},{"name":"pgsodium.key","type":"BASE TABLE","comment":"This table holds metadata for derived keys given a key_id and key_context. The raw key is never stored.","columns":[{"name":"id","type":"uuid","nullable":false,"default":"gen_random_uuid()","comment":""},{"name":"status","type":"pgsodium.key_status","nullable":true,"default":"'valid'::pgsodium.key_status","comment":""},{"name":"created","type":"timestamp with time zone","nullable":false,"default":"CURRENT_TIMESTAMP","comment":""},{"name":"expires","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"key_type","type":"pgsodium.key_type","nullable":true,"default":null,"comment":""},{"name":"key_id","type":"bigint","nullable":true,"default":"nextval('pgsodium.key_key_id_seq'::regclass)","comment":""},{"name":"key_context","type":"bytea","nullable":true,"default":"'\\x7067736f6469756d'::bytea","comment":""},{"name":"name","type":"text","nullable":true,"default":null,"comment":""},{"name":"associated_data","type":"text","nullable":true,"default":"'associated'::text","comment":""},{"name":"raw_key","type":"bytea","nullable":true,"default":null,"comment":""},{"name":"raw_key_nonce","type":"bytea","nullable":true,"default":null,"comment":""},{"name":"parent_key","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"comment","type":"text","nullable":true,"default":null,"comment":""},{"name":"user_data","type":"text","nullable":true,"default":null,"comment":""}],"indexes":[{"name":"key_pkey","def":"CREATE UNIQUE INDEX key_pkey ON pgsodium.key USING btree (id)","table":"pgsodium.key","columns":["id"],"comment":""},{"name":"key_status_idx","def":"CREATE INDEX key_status_idx ON pgsodium.key USING btree (status) WHERE (status = ANY (ARRAY['valid'::pgsodium.key_status, 'default'::pgsodium.key_status]))","table":"pgsodium.key","columns":["status"],"comment":""},{"name":"key_status_idx1","def":"CREATE UNIQUE INDEX key_status_idx1 ON pgsodium.key USING btree (status) WHERE (status = 'default'::pgsodium.key_status)","table":"pgsodium.key","columns":["status"],"comment":""},{"name":"key_key_id_key_context_key_type_idx","def":"CREATE UNIQUE INDEX key_key_id_key_context_key_type_idx ON pgsodium.key USING btree (key_id, key_context, key_type)","table":"pgsodium.key","columns":["key_context","key_id","key_type"],"comment":""},{"name":"pgsodium_key_unique_name","def":"CREATE UNIQUE INDEX pgsodium_key_unique_name ON pgsodium.key USING btree (name)","table":"pgsodium.key","columns":["name"],"comment":""}],"constraints":[{"name":"key_key_context_check","type":"CHECK","def":"CHECK ((length(key_context) = 8))","table":"pgsodium.key","referenced_table":"","columns":["key_context"],"referenced_columns":[],"comment":""},{"name":"pgsodium_raw","type":"CHECK","def":"CHECK (\nCASE\n    WHEN (raw_key IS NOT NULL) THEN ((key_id IS NULL) AND (key_context IS NULL) AND (parent_key IS NOT NULL))\n    ELSE ((key_id IS NOT NULL) AND (key_context IS NOT NULL) AND (parent_key IS NULL))\nEND)","table":"pgsodium.key","referenced_table":"","columns":["key_id","key_context","raw_key","parent_key"],"referenced_columns":[],"comment":""},{"name":"key_parent_key_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (parent_key) REFERENCES pgsodium.key(id)","table":"pgsodium.key","referenced_table":"key","columns":["parent_key"],"referenced_columns":["id"],"comment":""},{"name":"key_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"pgsodium.key","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""},{"name":"pgsodium_key_unique_name","type":"UNIQUE","def":"UNIQUE (name)","table":"pgsodium.key","referenced_table":"","columns":["name"],"referenced_columns":[],"comment":""}],"triggers":[{"name":"key_encrypt_secret_trigger_raw_key","def":"CREATE TRIGGER key_encrypt_secret_trigger_raw_key BEFORE INSERT OR UPDATE OF raw_key ON pgsodium.key FOR EACH ROW EXECUTE FUNCTION pgsodium.key_encrypt_secret_raw_key()","comment":""}],"def":""},{"name":"pgsodium.valid_key","type":"VIEW","comment":"","columns":[{"name":"id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"name","type":"text","nullable":true,"default":null,"comment":""},{"name":"status","type":"pgsodium.key_status","nullable":true,"default":null,"comment":""},{"name":"key_type","type":"pgsodium.key_type","nullable":true,"default":null,"comment":""},{"name":"key_id","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"key_context","type":"bytea","nullable":true,"default":null,"comment":""},{"name":"created","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"expires","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"associated_data","type":"text","nullable":true,"default":null,"comment":""}],"indexes":[],"constraints":[],"triggers":[],"def":"CREATE VIEW valid_key AS (\n SELECT key.id,\n    key.name,\n    key.status,\n    key.key_type,\n    key.key_id,\n    key.key_context,\n    key.created,\n    key.expires,\n    key.associated_data\n   FROM pgsodium.key\n  WHERE ((key.status = ANY (ARRAY['valid'::pgsodium.key_status, 'default'::pgsodium.key_status])) AND\n        CASE\n            WHEN (key.expires IS NULL) THEN true\n            ELSE (key.expires \u003e now())\n        END)\n)","referenced_tables":["pgsodium.key"]},{"name":"pgsodium.masking_rule","type":"VIEW","comment":"","columns":[{"name":"attrelid","type":"oid","nullable":true,"default":null,"comment":""},{"name":"attnum","type":"integer","nullable":true,"default":null,"comment":""},{"name":"relnamespace","type":"regnamespace","nullable":true,"default":null,"comment":""},{"name":"relname","type":"name","nullable":true,"default":null,"comment":""},{"name":"attname","type":"name","nullable":true,"default":null,"comment":""},{"name":"format_type","type":"text","nullable":true,"default":null,"comment":""},{"name":"col_description","type":"text","nullable":true,"default":null,"comment":""},{"name":"key_id_column","type":"text","nullable":true,"default":null,"comment":""},{"name":"key_id","type":"text","nullable":true,"default":null,"comment":""},{"name":"associated_columns","type":"text","nullable":true,"default":null,"comment":""},{"name":"nonce_column","type":"text","nullable":true,"default":null,"comment":""},{"name":"view_name","type":"text","nullable":true,"default":null,"comment":""},{"name":"priority","type":"integer","nullable":true,"default":null,"comment":""},{"name":"security_invoker","type":"boolean","nullable":true,"default":null,"comment":""}],"indexes":[],"constraints":[],"triggers":[],"def":"CREATE VIEW masking_rule AS (\n WITH const AS (\n         SELECT 'encrypt +with +key +id +([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})'::text AS pattern_key_id,\n            'encrypt +with +key +column +([\\w\\\"\\-$]+)'::text AS pattern_key_id_column,\n            '(?\u003c=associated) +\\(([\\w\\\"\\-$, ]+)\\)'::text AS pattern_associated_columns,\n            '(?\u003c=nonce) +([\\w\\\"\\-$]+)'::text AS pattern_nonce_column,\n            '(?\u003c=decrypt with view) +([\\w\\\"\\-$]+\\.[\\w\\\"\\-$]+)'::text AS pattern_view_name,\n            '(?\u003c=security invoker)'::text AS pattern_security_invoker\n        ), rules_from_seclabels AS (\n         SELECT sl.objoid AS attrelid,\n            sl.objsubid AS attnum,\n            (c.relnamespace)::regnamespace AS relnamespace,\n            c.relname,\n            a.attname,\n            format_type(a.atttypid, a.atttypmod) AS format_type,\n            sl.label AS col_description,\n            (regexp_match(sl.label, k.pattern_key_id_column, 'i'::text))[1] AS key_id_column,\n            (regexp_match(sl.label, k.pattern_key_id, 'i'::text))[1] AS key_id,\n            (regexp_match(sl.label, k.pattern_associated_columns, 'i'::text))[1] AS associated_columns,\n            (regexp_match(sl.label, k.pattern_nonce_column, 'i'::text))[1] AS nonce_column,\n            COALESCE((regexp_match(sl2.label, k.pattern_view_name, 'i'::text))[1], (((c.relnamespace)::regnamespace || '.'::text) || quote_ident(('decrypted_'::text || (c.relname)::text)))) AS view_name,\n            100 AS priority,\n            ((regexp_match(sl.label, k.pattern_security_invoker, 'i'::text))[1] IS NOT NULL) AS security_invoker\n           FROM const k,\n            (((pg_seclabel sl\n             JOIN pg_class c ON (((sl.classoid = c.tableoid) AND (sl.objoid = c.oid))))\n             JOIN pg_attribute a ON (((a.attrelid = c.oid) AND (sl.objsubid = a.attnum))))\n             LEFT JOIN pg_seclabel sl2 ON (((sl2.objoid = c.oid) AND (sl2.objsubid = 0))))\n          WHERE ((a.attnum \u003e 0) AND (((c.relnamespace)::regnamespace)::oid \u003c\u003e ('pg_catalog'::regnamespace)::oid) AND (NOT a.attisdropped) AND (sl.label ~~* 'ENCRYPT%'::text) AND (sl.provider = 'pgsodium'::text))\n        )\n SELECT DISTINCT ON (rules_from_seclabels.attrelid, rules_from_seclabels.attnum) rules_from_seclabels.attrelid,\n    rules_from_seclabels.attnum,\n    rules_from_seclabels.relnamespace,\n    rules_from_seclabels.relname,\n    rules_from_seclabels.attname,\n    rules_from_seclabels.format_type,\n    rules_from_seclabels.col_description,\n    rules_from_seclabels.key_id_column,\n    rules_from_seclabels.key_id,\n    rules_from_seclabels.associated_columns,\n    rules_from_seclabels.nonce_column,\n    rules_from_seclabels.view_name,\n    rules_from_seclabels.priority,\n    rules_from_seclabels.security_invoker\n   FROM rules_from_seclabels\n  ORDER BY rules_from_seclabels.attrelid, rules_from_seclabels.attnum, rules_from_seclabels.priority DESC\n)"},{"name":"pgsodium.mask_columns","type":"VIEW","comment":"","columns":[{"name":"attname","type":"name","nullable":true,"default":null,"comment":""},{"name":"attrelid","type":"oid","nullable":true,"default":null,"comment":""},{"name":"key_id","type":"text","nullable":true,"default":null,"comment":""},{"name":"key_id_column","type":"text","nullable":true,"default":null,"comment":""},{"name":"associated_columns","type":"text","nullable":true,"default":null,"comment":""},{"name":"nonce_column","type":"text","nullable":true,"default":null,"comment":""},{"name":"format_type","type":"text","nullable":true,"default":null,"comment":""}],"indexes":[],"constraints":[],"triggers":[],"def":"CREATE VIEW mask_columns AS (\n SELECT a.attname,\n    a.attrelid,\n    m.key_id,\n    m.key_id_column,\n    m.associated_columns,\n    m.nonce_column,\n    m.format_type\n   FROM (pg_attribute a\n     LEFT JOIN pgsodium.masking_rule m ON (((m.attrelid = a.attrelid) AND (m.attname = a.attname))))\n  WHERE ((a.attnum \u003e 0) AND (NOT a.attisdropped))\n  ORDER BY a.attnum\n)","referenced_tables":["pg_attribute","pgsodium.masking_rule"]},{"name":"pgsodium.decrypted_key","type":"VIEW","comment":"","columns":[{"name":"id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"status","type":"pgsodium.key_status","nullable":true,"default":null,"comment":""},{"name":"created","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"expires","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"key_type","type":"pgsodium.key_type","nullable":true,"default":null,"comment":""},{"name":"key_id","type":"bigint","nullable":true,"default":null,"comment":""},{"name":"key_context","type":"bytea","nullable":true,"default":null,"comment":""},{"name":"name","type":"text","nullable":true,"default":null,"comment":""},{"name":"associated_data","type":"text","nullable":true,"default":null,"comment":""},{"name":"raw_key","type":"bytea","nullable":true,"default":null,"comment":""},{"name":"decrypted_raw_key","type":"bytea","nullable":true,"default":null,"comment":""},{"name":"raw_key_nonce","type":"bytea","nullable":true,"default":null,"comment":""},{"name":"parent_key","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"comment","type":"text","nullable":true,"default":null,"comment":""}],"indexes":[],"constraints":[],"triggers":[],"def":"CREATE VIEW decrypted_key AS (\n SELECT key.id,\n    key.status,\n    key.created,\n    key.expires,\n    key.key_type,\n    key.key_id,\n    key.key_context,\n    key.name,\n    key.associated_data,\n    key.raw_key,\n        CASE\n            WHEN (key.raw_key IS NULL) THEN NULL::bytea\n            ELSE\n            CASE\n                WHEN (key.parent_key IS NULL) THEN NULL::bytea\n                ELSE pgsodium.crypto_aead_det_decrypt(key.raw_key, convert_to(((key.id)::text || key.associated_data), 'utf8'::name), key.parent_key, key.raw_key_nonce)\n            END\n        END AS decrypted_raw_key,\n    key.raw_key_nonce,\n    key.parent_key,\n    key.comment\n   FROM pgsodium.key\n)","referenced_tables":["pgsodium.key"]},{"name":"vault.secrets","type":"BASE TABLE","comment":"Table with encrypted `secret` column for storing sensitive information on disk.","columns":[{"name":"id","type":"uuid","nullable":false,"default":"gen_random_uuid()","comment":""},{"name":"name","type":"text","nullable":true,"default":null,"comment":""},{"name":"description","type":"text","nullable":false,"default":"''::text","comment":""},{"name":"secret","type":"text","nullable":false,"default":null,"comment":""},{"name":"key_id","type":"uuid","nullable":true,"default":"(pgsodium.create_key()).id","comment":""},{"name":"nonce","type":"bytea","nullable":true,"default":"pgsodium.crypto_aead_det_noncegen()","comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":false,"default":"CURRENT_TIMESTAMP","comment":""},{"name":"updated_at","type":"timestamp with time zone","nullable":false,"default":"CURRENT_TIMESTAMP","comment":""}],"indexes":[{"name":"secrets_pkey","def":"CREATE UNIQUE INDEX secrets_pkey ON vault.secrets USING btree (id)","table":"vault.secrets","columns":["id"],"comment":""},{"name":"secrets_name_idx","def":"CREATE UNIQUE INDEX secrets_name_idx ON vault.secrets USING btree (name) WHERE (name IS NOT NULL)","table":"vault.secrets","columns":["name"],"comment":""}],"constraints":[{"name":"secrets_key_id_fkey","type":"FOREIGN KEY","def":"FOREIGN KEY (key_id) REFERENCES pgsodium.key(id)","table":"vault.secrets","referenced_table":"key","columns":["key_id"],"referenced_columns":["id"],"comment":""},{"name":"secrets_pkey","type":"PRIMARY KEY","def":"PRIMARY KEY (id)","table":"vault.secrets","referenced_table":"","columns":["id"],"referenced_columns":[],"comment":""}],"triggers":[{"name":"secrets_encrypt_secret_trigger_secret","def":"CREATE TRIGGER secrets_encrypt_secret_trigger_secret BEFORE INSERT OR UPDATE OF secret ON vault.secrets FOR EACH ROW EXECUTE FUNCTION vault.secrets_encrypt_secret_secret()","comment":""}],"def":""},{"name":"vault.decrypted_secrets","type":"VIEW","comment":"","columns":[{"name":"id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"name","type":"text","nullable":true,"default":null,"comment":""},{"name":"description","type":"text","nullable":true,"default":null,"comment":""},{"name":"secret","type":"text","nullable":true,"default":null,"comment":""},{"name":"decrypted_secret","type":"text","nullable":true,"default":null,"comment":""},{"name":"key_id","type":"uuid","nullable":true,"default":null,"comment":""},{"name":"nonce","type":"bytea","nullable":true,"default":null,"comment":""},{"name":"created_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""},{"name":"updated_at","type":"timestamp with time zone","nullable":true,"default":null,"comment":""}],"indexes":[],"constraints":[],"triggers":[],"def":"CREATE VIEW decrypted_secrets AS (\n SELECT secrets.id,\n    secrets.name,\n    secrets.description,\n    secrets.secret,\n        CASE\n            WHEN (secrets.secret IS NULL) THEN NULL::text\n            ELSE\n            CASE\n                WHEN (secrets.key_id IS NULL) THEN NULL::text\n                ELSE convert_from(pgsodium.crypto_aead_det_decrypt(decode(secrets.secret, 'base64'::text), convert_to(((((secrets.id)::text || secrets.description) || (secrets.created_at)::text) || (secrets.updated_at)::text), 'utf8'::name), secrets.key_id, secrets.nonce), 'utf8'::name)\n            END\n        END AS decrypted_secret,\n    secrets.key_id,\n    secrets.nonce,\n    secrets.created_at,\n    secrets.updated_at\n   FROM vault.secrets\n)","referenced_tables":["vault.secrets"]}],"relations":[{"table":"storage.buckets","columns":["owner"],"cardinality":"Zero or more","parent_table":"auth.users","parent_columns":["id"],"parent_cardinality":"Zero or one","def":"FOREIGN KEY (owner) REFERENCES auth.users(id)","virtual":false},{"table":"storage.objects","columns":["owner"],"cardinality":"Zero or more","parent_table":"auth.users","parent_columns":["id"],"parent_cardinality":"Zero or one","def":"FOREIGN KEY (owner) REFERENCES auth.users(id)","virtual":false},{"table":"storage.objects","columns":["bucket_id"],"cardinality":"Zero or more","parent_table":"storage.buckets","parent_columns":["id"],"parent_cardinality":"Zero or one","def":"FOREIGN KEY (bucket_id) REFERENCES storage.buckets(id)","virtual":false},{"table":"public.study","columns":["user_id"],"cardinality":"Zero or more","parent_table":"public.user","parent_columns":["id"],"parent_cardinality":"Exactly one","def":"FOREIGN KEY (user_id) REFERENCES \"user\"(id)","virtual":false},{"table":"public.study_subject","columns":["study_id"],"cardinality":"Zero or more","parent_table":"public.study","parent_columns":["id"],"parent_cardinality":"Exactly one","def":"FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE","virtual":false},{"table":"public.study_subject","columns":["invite_code"],"cardinality":"Zero or more","parent_table":"public.study_invite","parent_columns":["code"],"parent_cardinality":"Zero or one","def":"FOREIGN KEY (invite_code) REFERENCES study_invite(code) ON DELETE CASCADE","virtual":false},{"table":"public.study_subject","columns":["user_id"],"cardinality":"Zero or more","parent_table":"public.user","parent_columns":["id"],"parent_cardinality":"Exactly one","def":"FOREIGN KEY (user_id) REFERENCES \"user\"(id)","virtual":false},{"table":"public.repo","columns":["study_id"],"cardinality":"Zero or more","parent_table":"public.study","parent_columns":["id"],"parent_cardinality":"Exactly one","def":"FOREIGN KEY (study_id) REFERENCES study(id)","virtual":false},{"table":"public.repo","columns":["user_id"],"cardinality":"Zero or more","parent_table":"public.user","parent_columns":["id"],"parent_cardinality":"Exactly one","def":"FOREIGN KEY (user_id) REFERENCES \"user\"(id) ON DELETE CASCADE","virtual":false},{"table":"public.study_invite","columns":["study_id"],"cardinality":"Zero or more","parent_table":"public.study","parent_columns":["id"],"parent_cardinality":"Exactly one","def":"FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE","virtual":false},{"table":"public.subject_progress","columns":["subject_id"],"cardinality":"Zero or more","parent_table":"public.study_subject","parent_columns":["id"],"parent_cardinality":"Exactly one","def":"FOREIGN KEY (subject_id) REFERENCES study_subject(id) ON DELETE CASCADE","virtual":false},{"table":"pgsodium.key","columns":["parent_key"],"cardinality":"Zero or more","parent_table":"pgsodium.key","parent_columns":["id"],"parent_cardinality":"Zero or one","def":"FOREIGN KEY (parent_key) REFERENCES pgsodium.key(id)","virtual":false},{"table":"vault.secrets","columns":["key_id"],"cardinality":"Zero or more","parent_table":"pgsodium.key","parent_columns":["id"],"parent_cardinality":"Zero or one","def":"FOREIGN KEY (key_id) REFERENCES pgsodium.key(id)","virtual":false}],"functions":[{"name":"extensions.uuid_generate_v4","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"pgbouncer.get_auth","return_type":"record","arguments":"p_usename text","type":"FUNCTION"},{"name":"storage.filename","return_type":"text","arguments":"name text","type":"FUNCTION"},{"name":"extensions.digest","return_type":"bytea","arguments":"text, text","type":"FUNCTION"},{"name":"storage.foldername","return_type":"_text","arguments":"name text","type":"FUNCTION"},{"name":"extensions.decrypt_iv","return_type":"bytea","arguments":"bytea, bytea, bytea, text","type":"FUNCTION"},{"name":"storage.extension","return_type":"text","arguments":"name text","type":"FUNCTION"},{"name":"extensions.gen_random_bytes","return_type":"bytea","arguments":"integer","type":"FUNCTION"},{"name":"extensions.encrypt","return_type":"bytea","arguments":"bytea, bytea, text","type":"FUNCTION"},{"name":"extensions.decrypt","return_type":"bytea","arguments":"bytea, bytea, text","type":"FUNCTION"},{"name":"extensions.encrypt_iv","return_type":"bytea","arguments":"bytea, bytea, bytea, text","type":"FUNCTION"},{"name":"extensions.gen_random_uuid","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"extensions.uuid_nil","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"extensions.uuid_ns_dns","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"storage.search","return_type":"record","arguments":"prefix text, bucketname text, limits integer DEFAULT 100, levels integer DEFAULT 1, offsets integer DEFAULT 0","type":"FUNCTION"},{"name":"extensions.uuid_ns_url","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"extensions.uuid_ns_oid","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"auth.uid","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"auth.email","return_type":"text","arguments":"","type":"FUNCTION"},{"name":"extensions.uuid_generate_v3","return_type":"uuid","arguments":"namespace uuid, name text","type":"FUNCTION"},{"name":"extensions.uuid_ns_x500","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"extensions.uuid_generate_v1","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"extensions.uuid_generate_v1mc","return_type":"uuid","arguments":"","type":"FUNCTION"},{"name":"net.check_worker_is_up","return_type":"void","arguments":"","type":"FUNCTION"},{"name":"net._await_response","return_type":"bool","arguments":"request_id bigint","type":"FUNCTION"},{"name":"net._urlencode_string","return_type":"text","arguments":"string character varying","type":"FUNCTION"},{"name":"net._encode_url_with_params_array","return_type":"text","arguments":"url text, params_array text[]","type":"FUNCTION"},{"name":"graphql.increment_schema_version","return_type":"event_trigger","arguments":"","type":"FUNCTION"},{"name":"graphql.get_schema_version","return_type":"int4","arguments":"","type":"FUNCTION"},{"name":"graphql.resolve","return_type":"jsonb","arguments":"query text, variables jsonb DEFAULT '{}'::jsonb, \"operationName\" text DEFAULT NULL::text, extensions jsonb DEFAULT NULL::jsonb","type":"FUNCTION"},{"name":"extensions.pgp_pub_decrypt_bytea","return_type":"bytea","arguments":"bytea, bytea, text","type":"FUNCTION"},{"name":"extensions.pgp_pub_decrypt","return_type":"text","arguments":"bytea, bytea, text, text","type":"FUNCTION"},{"name":"extensions.pgp_pub_decrypt_bytea","return_type":"bytea","arguments":"bytea, bytea, text, text","type":"FUNCTION"},{"name":"net.http_delete","return_type":"int8","arguments":"url text, params jsonb DEFAULT '{}'::jsonb, headers jsonb DEFAULT '{}'::jsonb, timeout_milliseconds integer DEFAULT 2000","type":"FUNCTION"},{"name":"net._http_collect_response","return_type":"http_response_result","arguments":"request_id bigint, async boolean DEFAULT true","type":"FUNCTION"},{"name":"net.http_collect_response","return_type":"http_response_result","arguments":"request_id bigint, async boolean DEFAULT true","type":"FUNCTION"},{"name":"supabase_functions.http_request","return_type":"trigger","arguments":"","type":"FUNCTION"},{"name":"public.active_subject_count","return_type":"int4","arguments":"study study","type":"FUNCTION"},{"name":"public.can_edit","return_type":"bool","arguments":"user_id uuid, study_param study","type":"FUNCTION"},{"name":"public.get_study_from_invite","return_type":"record","arguments":"invite_code text","type":"FUNCTION"},{"name":"public.get_study_record_from_invite","return_type":"study","arguments":"invite_code text","type":"FUNCTION"},{"name":"public.handle_new_user","return_type":"trigger","arguments":"","type":"FUNCTION"},{"name":"public.has_study_ended","return_type":"bool","arguments":"psubject_id uuid","type":"FUNCTION"},{"name":"public.has_results_public","return_type":"bool","arguments":"psubject_id uuid","type":"FUNCTION"},{"name":"public.has_study_ended","return_type":"bool","arguments":"subject study_subject","type":"FUNCTION"},{"name":"public.is_active_subject","return_type":"bool","arguments":"psubject_id uuid, days_active integer","type":"FUNCTION"},{"name":"public.is_study_subject_of","return_type":"bool","arguments":"_user_id uuid, _study_id uuid","type":"FUNCTION"},{"name":"public.last_completed_task","return_type":"date","arguments":"psubject_id uuid","type":"FUNCTION"},{"name":"public.study_active_days","return_type":"_int4","arguments":"study_param study","type":"FUNCTION"},{"name":"public.study_ended_count","return_type":"int4","arguments":"study study","type":"FUNCTION"},{"name":"public.study_length","return_type":"int4","arguments":"study_param study","type":"FUNCTION"},{"name":"public.study_missed_days","return_type":"_int4","arguments":"study_param study","type":"FUNCTION"},{"name":"net.http_get","return_type":"int8","arguments":"url text, params jsonb DEFAULT '{}'::jsonb, headers jsonb DEFAULT '{}'::jsonb, timeout_milliseconds integer DEFAULT 2000","type":"FUNCTION"},{"name":"extensions.pgp_sym_decrypt_bytea","return_type":"bytea","arguments":"bytea, text, text","type":"FUNCTION"},{"name":"public.study_participant_count","return_type":"int4","arguments":"study study","type":"FUNCTION"},{"name":"public.study_total_tasks","return_type":"int4","arguments":"subject study_subject","type":"FUNCTION"},{"name":"public.subject_current_day","return_type":"int4","arguments":"subject study_subject","type":"FUNCTION"},{"name":"public.subject_total_active_days","return_type":"int4","arguments":"subject study_subject","type":"FUNCTION"},{"name":"public.user_email","return_type":"text","arguments":"user_id uuid","type":"FUNCTION"},{"name":"extensions.pgp_pub_encrypt","return_type":"bytea","arguments":"text, bytea","type":"FUNCTION"},{"name":"extensions.pgp_pub_encrypt_bytea","return_type":"bytea","arguments":"bytea, bytea","type":"FUNCTION"},{"name":"extensions.pgp_pub_encrypt","return_type":"bytea","arguments":"text, bytea, text","type":"FUNCTION"},{"name":"extensions.pgp_pub_encrypt_bytea","return_type":"bytea","arguments":"bytea, bytea, text","type":"FUNCTION"},{"name":"extensions.pgp_pub_decrypt","return_type":"text","arguments":"bytea, bytea","type":"FUNCTION"},{"name":"extensions.pgp_pub_decrypt_bytea","return_type":"bytea","arguments":"bytea, bytea","type":"FUNCTION"},{"name":"extensions.pgp_pub_decrypt","return_type":"text","arguments":"bytea, bytea, text","type":"FUNCTION"},{"name":"extensions.gen_salt","return_type":"text","arguments":"text, integer","type":"FUNCTION"},{"name":"auth.role","return_type":"text","arguments":"","type":"FUNCTION"},{"name":"extensions.uuid_generate_v5","return_type":"uuid","arguments":"namespace uuid, name text","type":"FUNCTION"},{"name":"extensions.digest","return_type":"bytea","arguments":"bytea, text","type":"FUNCTION"},{"name":"extensions.hmac","return_type":"bytea","arguments":"text, text, text","type":"FUNCTION"},{"name":"extensions.hmac","return_type":"bytea","arguments":"bytea, bytea, text","type":"FUNCTION"},{"name":"extensions.crypt","return_type":"text","arguments":"text, text","type":"FUNCTION"},{"name":"extensions.gen_salt","return_type":"text","arguments":"text","type":"FUNCTION"},{"name":"extensions.sign","return_type":"text","arguments":"payload json, secret text, algorithm text DEFAULT 'HS256'::text","type":"FUNCTION"},{"name":"extensions.pgrst_ddl_watch","return_type":"event_trigger","arguments":"","type":"FUNCTION"},{"name":"graphql._internal_resolve","return_type":"jsonb","arguments":"query text, variables jsonb DEFAULT '{}'::jsonb, \"operationName\" text DEFAULT NULL::text, extensions jsonb DEFAULT NULL::jsonb","type":"FUNCTION"},{"name":"graphql.exception","return_type":"text","arguments":"message text","type":"FUNCTION"},{"name":"graphql.comment_directive","return_type":"jsonb","arguments":"comment_ text","type":"FUNCTION"},{"name":"extensions.pgrst_drop_watch","return_type":"event_trigger","arguments":"","type":"FUNCTION"},{"name":"graphql_public.graphql","return_type":"jsonb","arguments":"\"operationName\" text DEFAULT NULL::text, query text DEFAULT NULL::text, variables jsonb DEFAULT NULL::jsonb, extensions jsonb DEFAULT NULL::jsonb","type":"FUNCTION"},{"name":"extensions.grant_pg_graphql_access","return_type":"event_trigger","arguments":"","type":"FUNCTION"},{"name":"net.http_post","return_type":"int8","arguments":"url text, body jsonb DEFAULT '{}'::jsonb, params jsonb DEFAULT '{}'::jsonb, headers jsonb DEFAULT '{\"Content-Type\": \"application/json\"}'::jsonb, timeout_milliseconds integer DEFAULT 2000","type":"FUNCTION"},{"name":"pgsodium.crypto_pwhash_saltgen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_kx_client_session_keys","return_type":"crypto_kx_session","arguments":"client_pk bytea, client_sk bytea, server_pk bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_kx_server_session_keys","return_type":"crypto_kx_session","arguments":"server_pk bytea, server_sk bytea, client_pk bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha512_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_box_new_seed","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_new_seed","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.derive_key","return_type":"bytea","arguments":"key_id bigint, key_len integer DEFAULT 32, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.pgsodium_derive","return_type":"bytea","arguments":"key_id bigint, key_len integer DEFAULT 32, context bytea DEFAULT decode('pgsodium'::text, 'escape'::text)","type":"FUNCTION"},{"name":"pgsodium.randombytes_new_seed","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_secretbox_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_box_noncegen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_ietf_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_shorthash_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_generichash_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_kdf_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_kx_new_keypair","return_type":"crypto_kx_keypair","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_kx_new_seed","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_kx_seed_new_keypair","return_type":"crypto_kx_keypair","arguments":"seed bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha256_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_box_new_keypair","return_type":"crypto_box_keypair","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_new_keypair","return_type":"crypto_sign_keypair","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_init","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_update","return_type":"bytea","arguments":"state bytea, message bytea","type":"FUNCTION"},{"name":"pgsodium.randombytes_random","return_type":"int4","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_secretbox_noncegen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_ietf_noncegen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_secretstream_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_stream_xchacha20_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_stream_xchacha20_noncegen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_cmp","return_type":"bool","arguments":"text, text","type":"FUNCTION"},{"name":"pgsodium.crypto_signcrypt_new_keypair","return_type":"crypto_signcrypt_keypair","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_encrypt","return_type":"bytea","arguments":"message bytea, additional bytea, key bytea, nonce bytea DEFAULT NULL::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_decrypt","return_type":"bytea","arguments":"ciphertext bytea, additional bytea, key bytea, nonce bytea DEFAULT NULL::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_encrypt","return_type":"bytea","arguments":"message bytea, additional bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea, nonce bytea DEFAULT NULL::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_decrypt","return_type":"bytea","arguments":"message bytea, additional bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea, nonce bytea DEFAULT NULL::bytea","type":"FUNCTION"},{"name":"pgsodium.version","return_type":"text","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_noncegen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"pgsodium.has_mask","return_type":"bool","arguments":"role regrole, source_name text","type":"FUNCTION"},{"name":"pgsodium.mask_columns","return_type":"record","arguments":"source_relid oid","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_final_verify","return_type":"bool","arguments":"state bytea, signature bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.create_mask_view","return_type":"void","arguments":"relid oid, debug boolean DEFAULT false","type":"FUNCTION"},{"name":"pgsodium.create_key","return_type":"valid_key","arguments":"key_type pgsodium.key_type DEFAULT 'aead-det'::pgsodium.key_type, name text DEFAULT NULL::text, raw_key bytea DEFAULT NULL::bytea, raw_key_nonce bytea DEFAULT NULL::bytea, parent_key uuid DEFAULT NULL::uuid, key_context bytea DEFAULT '\\x7067736f6469756d'::bytea, expires timestamp with time zone DEFAULT NULL::timestamp with time zone, associated_data text DEFAULT ''::text","type":"FUNCTION"},{"name":"pgsodium.get_key_by_name","return_type":"valid_key","arguments":"text","type":"FUNCTION"},{"name":"pgsodium.quote_assoc","return_type":"text","arguments":"text, boolean DEFAULT false","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_open","return_type":"bytea","arguments":"signed_message bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_kdf_derive_from_key","return_type":"bytea","arguments":"subkey_size integer, subkey_id bigint, context bytea, primary_key uuid","type":"FUNCTION"},{"name":"pgsodium.get_named_keys","return_type":"valid_key","arguments":"filter text DEFAULT '%'::text","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_encrypt","return_type":"bytea","arguments":"message bytea, additional bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_decrypt","return_type":"bytea","arguments":"message bytea, additional bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_ietf_encrypt","return_type":"bytea","arguments":"message bytea, additional bytea, nonce bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.get_key_by_id","return_type":"valid_key","arguments":"uuid","type":"FUNCTION"},{"name":"pgsodium.enable_security_label_trigger","return_type":"void","arguments":"","type":"FUNCTION"},{"name":"pgsodium.disable_security_label_trigger","return_type":"void","arguments":"","type":"FUNCTION"},{"name":"pgsodium.update_mask","return_type":"void","arguments":"target oid, debug boolean DEFAULT false","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_update_agg1","return_type":"bytea","arguments":"state bytea, message bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_update_agg2","return_type":"bytea","arguments":"cur_state bytea, initial_state bytea, message bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_update_agg","return_type":"bytea","arguments":"message bytea","type":"a"},{"name":"pgsodium.crypto_sign_update_agg","return_type":"bytea","arguments":"state bytea, message bytea","type":"a"},{"name":"pgsodium.encrypted_columns","return_type":"text","arguments":"relid oid","type":"FUNCTION"},{"name":"pgsodium.decrypted_columns","return_type":"text","arguments":"relid oid","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_ietf_encrypt","return_type":"bytea","arguments":"message bytea, additional bytea, nonce bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_ietf_encrypt","return_type":"bytea","arguments":"message bytea, additional bytea, nonce bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_ietf_decrypt","return_type":"bytea","arguments":"message bytea, additional bytea, nonce bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_ietf_decrypt","return_type":"bytea","arguments":"message bytea, additional bytea, nonce bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_ietf_decrypt","return_type":"bytea","arguments":"message bytea, additional bytea, nonce bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_auth","return_type":"bytea","arguments":"message bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth","return_type":"bytea","arguments":"message bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth","return_type":"bytea","arguments":"message bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_verify","return_type":"bool","arguments":"mac bytea, message bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_verify","return_type":"bool","arguments":"mac bytea, message bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_verify","return_type":"bool","arguments":"mac bytea, message bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_box_seed_new_keypair","return_type":"crypto_box_keypair","arguments":"seed bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_box","return_type":"bytea","arguments":"message bytea, nonce bytea, public bytea, secret bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_box_open","return_type":"bytea","arguments":"ciphertext bytea, nonce bytea, public bytea, secret bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_box_seal","return_type":"bytea","arguments":"message bytea, public_key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_box_seal_open","return_type":"bytea","arguments":"ciphertext bytea, public_key bytea, secret_key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_generichash","return_type":"bytea","arguments":"message bytea, key bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_generichash","return_type":"bytea","arguments":"message bytea, key bytea DEFAULT NULL::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_generichash","return_type":"bytea","arguments":"message bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_shorthash","return_type":"bytea","arguments":"message bytea, key bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_shorthash","return_type":"bytea","arguments":"message bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_shorthash","return_type":"bytea","arguments":"message bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.sodium_bin2base64","return_type":"text","arguments":"bin bytea","type":"FUNCTION"},{"name":"pgsodium.sodium_base642bin","return_type":"bytea","arguments":"base64 text","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha512","return_type":"bytea","arguments":"message bytea, secret bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha512","return_type":"bytea","arguments":"message bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha512","return_type":"bytea","arguments":"message bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha512_verify","return_type":"bool","arguments":"hash bytea, message bytea, secret bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha512_verify","return_type":"bool","arguments":"hash bytea, message bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha512_verify","return_type":"bool","arguments":"signature bytea, message bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha256","return_type":"bytea","arguments":"message bytea, secret bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha256","return_type":"bytea","arguments":"message bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha256","return_type":"bytea","arguments":"message bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha256_verify","return_type":"bool","arguments":"hash bytea, message bytea, secret bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_final_create","return_type":"bytea","arguments":"state bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha256_verify","return_type":"bool","arguments":"hash bytea, message bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_auth_hmacsha256_verify","return_type":"bool","arguments":"signature bytea, message bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_kdf_derive_from_key","return_type":"bytea","arguments":"subkey_size bigint, subkey_id bigint, context bytea, primary_key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_pwhash","return_type":"bytea","arguments":"password bytea, salt bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_pwhash_str","return_type":"bytea","arguments":"password bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_pwhash_str_verify","return_type":"bool","arguments":"hashed_password bytea, password bytea","type":"FUNCTION"},{"name":"pgsodium.randombytes_uniform","return_type":"int4","arguments":"upper_bound integer","type":"FUNCTION"},{"name":"pgsodium.randombytes_buf","return_type":"bytea","arguments":"size integer","type":"FUNCTION"},{"name":"pgsodium.randombytes_buf_deterministic","return_type":"bytea","arguments":"size integer, seed bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_secretbox","return_type":"bytea","arguments":"message bytea, nonce bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_secretbox","return_type":"bytea","arguments":"message bytea, nonce bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_secretbox","return_type":"bytea","arguments":"message bytea, nonce bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_secretbox_open","return_type":"bytea","arguments":"ciphertext bytea, nonce bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_secretbox_open","return_type":"bytea","arguments":"message bytea, nonce bytea, key_id bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_secretbox_open","return_type":"bytea","arguments":"message bytea, nonce bytea, key_uuid uuid","type":"FUNCTION"},{"name":"pgsodium.crypto_hash_sha256","return_type":"bytea","arguments":"message bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_hash_sha512","return_type":"bytea","arguments":"message bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_sign","return_type":"bytea","arguments":"message bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_detached","return_type":"bytea","arguments":"message bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_seed_new_keypair","return_type":"crypto_sign_keypair","arguments":"seed bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_sign_verify_detached","return_type":"bool","arguments":"sig bytea, message bytea, key bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_signcrypt_sign_after","return_type":"bytea","arguments":"state bytea, sender_sk bytea, ciphertext bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_signcrypt_sign_before","return_type":"crypto_signcrypt_state_key","arguments":"sender bytea, recipient bytea, sender_sk bytea, recipient_pk bytea, additional bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_signcrypt_verify_after","return_type":"bool","arguments":"state bytea, signature bytea, sender_pk bytea, ciphertext bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_signcrypt_verify_before","return_type":"crypto_signcrypt_state_key","arguments":"signature bytea, sender bytea, recipient bytea, additional bytea, sender_pk bytea, recipient_sk bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_signcrypt_verify_public","return_type":"bool","arguments":"signature bytea, sender bytea, recipient bytea, additional bytea, sender_pk bytea, ciphertext bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_stream_xchacha20","return_type":"bytea","arguments":"bigint, bytea, bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_stream_xchacha20","return_type":"bytea","arguments":"bigint, bytea, bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_stream_xchacha20_xor","return_type":"bytea","arguments":"bytea, bytea, bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_stream_xchacha20_xor","return_type":"bytea","arguments":"bytea, bytea, bigint, context bytea DEFAULT '\\x70676f736469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_stream_xchacha20_xor_ic","return_type":"bytea","arguments":"bytea, bytea, bigint, bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_stream_xchacha20_xor_ic","return_type":"bytea","arguments":"bytea, bytea, bigint, bigint, context bytea DEFAULT '\\x7067736f6469756d'::bytea","type":"FUNCTION"},{"name":"pgsodium.encrypted_column","return_type":"text","arguments":"relid oid, m record","type":"FUNCTION"},{"name":"pgsodium.update_masks","return_type":"void","arguments":"debug boolean DEFAULT false","type":"FUNCTION"},{"name":"pgsodium.key_encrypt_secret_raw_key","return_type":"trigger","arguments":"","type":"FUNCTION"},{"name":"pgsodium.mask_role","return_type":"void","arguments":"masked_role regrole, source_name text, view_name text","type":"FUNCTION"},{"name":"pgsodium.create_mask_view","return_type":"void","arguments":"relid oid, subid integer, debug boolean DEFAULT false","type":"FUNCTION"},{"name":"pgsodium.trg_mask_update","return_type":"event_trigger","arguments":"","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_decrypt","return_type":"bytea","arguments":"message bytea, additional bytea, key_uuid uuid, nonce bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_encrypt","return_type":"bytea","arguments":"message bytea, additional bytea, key_uuid uuid, nonce bytea","type":"FUNCTION"},{"name":"pgsodium.crypto_aead_det_keygen","return_type":"bytea","arguments":"","type":"FUNCTION"},{"name":"vault.secrets_encrypt_secret_secret","return_type":"trigger","arguments":"","type":"FUNCTION"},{"name":"vault.create_secret","return_type":"uuid","arguments":"new_secret text, new_name text DEFAULT NULL::text, new_description text DEFAULT ''::text, new_key_id uuid DEFAULT NULL::uuid","type":"FUNCTION"},{"name":"vault.update_secret","return_type":"void","arguments":"secret_id uuid, new_secret text DEFAULT NULL::text, new_name text DEFAULT NULL::text, new_description text DEFAULT NULL::text, new_key_id uuid DEFAULT NULL::uuid","type":"FUNCTION"},{"name":"extensions.pgp_key_id","return_type":"text","arguments":"bytea","type":"FUNCTION"},{"name":"extensions.armor","return_type":"text","arguments":"bytea","type":"FUNCTION"},{"name":"extensions.armor","return_type":"text","arguments":"bytea, text[], text[]","type":"FUNCTION"},{"name":"extensions.dearmor","return_type":"bytea","arguments":"text","type":"FUNCTION"},{"name":"extensions.pgp_armor_headers","return_type":"record","arguments":"text, OUT key text, OUT value text","type":"FUNCTION"},{"name":"extensions.url_encode","return_type":"text","arguments":"data bytea","type":"FUNCTION"},{"name":"extensions.url_decode","return_type":"bytea","arguments":"data text","type":"FUNCTION"},{"name":"extensions.try_cast_double","return_type":"float8","arguments":"inp text","type":"FUNCTION"},{"name":"extensions.moddatetime","return_type":"trigger","arguments":"","type":"FUNCTION"},{"name":"extensions.pgp_sym_encrypt","return_type":"bytea","arguments":"text, text","type":"FUNCTION"},{"name":"extensions.pgp_sym_encrypt_bytea","return_type":"bytea","arguments":"bytea, text","type":"FUNCTION"},{"name":"extensions.pgp_sym_encrypt","return_type":"bytea","arguments":"text, text, text","type":"FUNCTION"},{"name":"extensions.pgp_sym_encrypt_bytea","return_type":"bytea","arguments":"bytea, text, text","type":"FUNCTION"},{"name":"extensions.pgp_sym_decrypt","return_type":"text","arguments":"bytea, text","type":"FUNCTION"},{"name":"extensions.pgp_sym_decrypt_bytea","return_type":"bytea","arguments":"bytea, text","type":"FUNCTION"},{"name":"extensions.pgp_sym_decrypt","return_type":"text","arguments":"bytea, text, text","type":"FUNCTION"},{"name":"extensions.algorithm_sign","return_type":"text","arguments":"signables text, secret text, algorithm text","type":"FUNCTION"},{"name":"extensions.verify","return_type":"record","arguments":"token text, secret text, algorithm text DEFAULT 'HS256'::text","type":"FUNCTION"},{"name":"extensions.grant_pg_cron_access","return_type":"event_trigger","arguments":"","type":"FUNCTION"},{"name":"extensions.grant_pg_net_access","return_type":"event_trigger","arguments":"","type":"FUNCTION"},{"name":"extensions.pg_stat_statements_reset","return_type":"void","arguments":"userid oid DEFAULT 0, dbid oid DEFAULT 0, queryid bigint DEFAULT 0","type":"FUNCTION"},{"name":"extensions.pg_stat_statements_info","return_type":"record","arguments":"OUT dealloc bigint, OUT stats_reset timestamp with time zone","type":"FUNCTION"},{"name":"extensions.pg_stat_statements","return_type":"record","arguments":"showtext boolean, OUT userid oid, OUT dbid oid, OUT toplevel boolean, OUT queryid bigint, OUT query text, OUT plans bigint, OUT total_plan_time double precision, OUT min_plan_time double precision, OUT max_plan_time double precision, OUT mean_plan_time double precision, OUT stddev_plan_time double precision, OUT calls bigint, OUT total_exec_time double precision, OUT min_exec_time double precision, OUT max_exec_time double precision, OUT mean_exec_time double precision, OUT stddev_exec_time double precision, OUT rows bigint, OUT shared_blks_hit bigint, OUT shared_blks_read bigint, OUT shared_blks_dirtied bigint, OUT shared_blks_written bigint, OUT local_blks_hit bigint, OUT local_blks_read bigint, OUT local_blks_dirtied bigint, OUT local_blks_written bigint, OUT temp_blks_read bigint, OUT temp_blks_written bigint, OUT blk_read_time double precision, OUT blk_write_time double precision, OUT temp_blk_read_time double precision, OUT temp_blk_write_time double precision, OUT wal_records bigint, OUT wal_fpi bigint, OUT wal_bytes numeric, OUT jit_functions bigint, OUT jit_generation_time double precision, OUT jit_inlining_count bigint, OUT jit_inlining_time double precision, OUT jit_optimization_count bigint, OUT jit_optimization_time double precision, OUT jit_emission_count bigint, OUT jit_emission_time double precision","type":"FUNCTION"},{"name":"extensions.set_graphql_placeholder","return_type":"event_trigger","arguments":"","type":"FUNCTION"}],"driver":{"name":"postgres","database_version":"PostgreSQL 15.1 (Ubuntu 15.1-1.pgdg20.04+1) on x86_64-pc-linux-gnu, compiled by gcc (Ubuntu 9.4.0-1ubuntu1~20.04.1) 9.4.0, 64-bit","meta":{"current_schema":"public","search_paths":["\"\\$user\"","public","extensions"],"dict":{"Functions":"Stored procedures and functions"}}}}
diff --git a/docs/database/schema.svg b/docs/database/schema.svg
deleted file mode 100644
index 7d67f2b18..000000000
--- a/docs/database/schema.svg
+++ /dev/null
@@ -1,1142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: postgres Pages: 1 -->
-<svg width="8975pt" height="3817pt"
- viewBox="0.00 0.00 8974.50 3817.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 3813)">
-<title>postgres</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-3813 8970.5,-3813 8970.5,4 -4,4"/>
-<!-- auth.users -->
-<g id="node1" class="node">
-<title>auth.users</title>
-<polygon fill="#efefef" stroke="transparent" points="238,-1706.5 238,-1741.5 592,-1741.5 592,-1706.5 238,-1706.5"/>
-<polygon fill="none" stroke="#000000" points="238,-1706.5 238,-1741.5 592,-1741.5 592,-1706.5 238,-1706.5"/>
-<text text-anchor="start" x="309.2022" y="-1719.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.users</text>
-<text text-anchor="start" x="393.2298" y="-1719.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="427.4346" y="-1719.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="238,-1676.5 238,-1706.5 592,-1706.5 592,-1676.5 238,-1676.5"/>
-<text text-anchor="start" x="245" y="-1687.9" font-family="Arial" font-size="14.00" fill="#000000">instance_id    </text>
-<text text-anchor="start" x="350.0042" y="-1687.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="238,-1646.5 238,-1676.5 592,-1676.5 592,-1646.5 238,-1646.5"/>
-<text text-anchor="start" x="245" y="-1657.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="290.094" y="-1657.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="238,-1616.5 238,-1646.5 592,-1646.5 592,-1616.5 238,-1616.5"/>
-<text text-anchor="start" x="245" y="-1627.9" font-family="Arial" font-size="14.00" fill="#000000">aud    </text>
-<text text-anchor="start" x="302.5526" y="-1627.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="238,-1586.5 238,-1616.5 592,-1616.5 592,-1586.5 238,-1586.5"/>
-<text text-anchor="start" x="245" y="-1597.9" font-family="Arial" font-size="14.00" fill="#000000">role    </text>
-<text text-anchor="start" x="302.5372" y="-1597.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="238,-1556.5 238,-1586.5 592,-1586.5 592,-1556.5 238,-1556.5"/>
-<text text-anchor="start" x="245" y="-1567.9" font-family="Arial" font-size="14.00" fill="#000000">email    </text>
-<text text-anchor="start" x="312.6438" y="-1567.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="238,-1526.5 238,-1556.5 592,-1556.5 592,-1526.5 238,-1526.5"/>
-<text text-anchor="start" x="245" y="-1537.9" font-family="Arial" font-size="14.00" fill="#000000">encrypted_password    </text>
-<text text-anchor="start" x="408.3492" y="-1537.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="238,-1496.5 238,-1526.5 592,-1526.5 592,-1496.5 238,-1496.5"/>
-<text text-anchor="start" x="245" y="-1507.9" font-family="Arial" font-size="14.00" fill="#000000">confirmed_at    </text>
-<text text-anchor="start" x="360.1094" y="-1507.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="238,-1466.5 238,-1496.5 592,-1496.5 592,-1466.5 238,-1466.5"/>
-<text text-anchor="start" x="245" y="-1477.9" font-family="Arial" font-size="14.00" fill="#000000">invited_at    </text>
-<text text-anchor="start" x="339.1122" y="-1477.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="238,-1436.5 238,-1466.5 592,-1466.5 592,-1436.5 238,-1436.5"/>
-<text text-anchor="start" x="245" y="-1447.9" font-family="Arial" font-size="14.00" fill="#000000">confirmation_token    </text>
-<text text-anchor="start" x="397.4544" y="-1447.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="238,-1406.5 238,-1436.5 592,-1436.5 592,-1406.5 238,-1406.5"/>
-<text text-anchor="start" x="245" y="-1417.9" font-family="Arial" font-size="14.00" fill="#000000">confirmation_sent_at    </text>
-<text text-anchor="start" x="409.1276" y="-1417.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="238,-1376.5 238,-1406.5 592,-1406.5 592,-1376.5 238,-1376.5"/>
-<text text-anchor="start" x="245" y="-1387.9" font-family="Arial" font-size="14.00" fill="#000000">recovery_token    </text>
-<text text-anchor="start" x="374.8948" y="-1387.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="238,-1346.5 238,-1376.5 592,-1376.5 592,-1346.5 238,-1346.5"/>
-<text text-anchor="start" x="245" y="-1357.9" font-family="Arial" font-size="14.00" fill="#000000">recovery_sent_at    </text>
-<text text-anchor="start" x="386.568" y="-1357.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="238,-1316.5 238,-1346.5 592,-1346.5 592,-1316.5 238,-1316.5"/>
-<text text-anchor="start" x="245" y="-1327.9" font-family="Arial" font-size="14.00" fill="#000000">email_change_token    </text>
-<text text-anchor="start" x="408.3604" y="-1327.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="238,-1286.5 238,-1316.5 592,-1316.5 592,-1286.5 238,-1286.5"/>
-<text text-anchor="start" x="245" y="-1297.9" font-family="Arial" font-size="14.00" fill="#000000">email_change    </text>
-<text text-anchor="start" x="366.3394" y="-1297.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="238,-1256.5 238,-1286.5 592,-1286.5 592,-1256.5 238,-1256.5"/>
-<text text-anchor="start" x="244.641" y="-1267.9" font-family="Arial" font-size="14.00" fill="#000000">email_change_sent_at    </text>
-<text text-anchor="start" x="419.6746" y="-1267.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="238,-1226.5 238,-1256.5 592,-1256.5 592,-1226.5 238,-1226.5"/>
-<text text-anchor="start" x="245" y="-1237.9" font-family="Arial" font-size="14.00" fill="#000000">last_sign_in_at    </text>
-<text text-anchor="start" x="372.5666" y="-1237.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="238,-1196.5 238,-1226.5 592,-1226.5 592,-1196.5 238,-1196.5"/>
-<text text-anchor="start" x="245" y="-1207.9" font-family="Arial" font-size="14.00" fill="#000000">raw_app_meta_data    </text>
-<text text-anchor="start" x="406.805" y="-1207.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="238,-1166.5 238,-1196.5 592,-1196.5 592,-1166.5 238,-1166.5"/>
-<text text-anchor="start" x="245" y="-1177.9" font-family="Arial" font-size="14.00" fill="#000000">raw_user_meta_data    </text>
-<text text-anchor="start" x="410.683" y="-1177.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="238,-1136.5 238,-1166.5 592,-1166.5 592,-1136.5 238,-1136.5"/>
-<text text-anchor="start" x="245" y="-1147.9" font-family="Arial" font-size="14.00" fill="#000000">is_super_admin    </text>
-<text text-anchor="start" x="378" y="-1147.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="238,-1106.5 238,-1136.5 592,-1136.5 592,-1106.5 238,-1106.5"/>
-<text text-anchor="start" x="245" y="-1117.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="345.3422" y="-1117.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="238,-1076.5 238,-1106.5 592,-1106.5 592,-1076.5 238,-1076.5"/>
-<text text-anchor="start" x="245" y="-1087.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="349.2468" y="-1087.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- auth.refresh_tokens -->
-<g id="node2" class="node">
-<title>auth.refresh_tokens</title>
-<polygon fill="#efefef" stroke="transparent" points="680,-3190.5 680,-3225.5 980,-3225.5 980,-3190.5 680,-3190.5"/>
-<polygon fill="none" stroke="#000000" points="680,-3190.5 680,-3225.5 980,-3225.5 980,-3190.5 680,-3190.5"/>
-<text text-anchor="start" x="686.6884" y="-3203.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.refresh_tokens</text>
-<text text-anchor="start" x="845.7436" y="-3203.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="879.9484" y="-3203.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="680,-3160.5 680,-3190.5 980,-3190.5 980,-3160.5 680,-3160.5"/>
-<text text-anchor="start" x="687" y="-3171.9" font-family="Arial" font-size="14.00" fill="#000000">instance_id    </text>
-<text text-anchor="start" x="792.0042" y="-3171.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="680,-3130.5 680,-3160.5 980,-3160.5 980,-3130.5 680,-3130.5"/>
-<text text-anchor="start" x="687" y="-3141.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="732.094" y="-3141.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="680,-3100.5 680,-3130.5 980,-3130.5 980,-3100.5 680,-3100.5"/>
-<text text-anchor="start" x="687" y="-3111.9" font-family="Arial" font-size="14.00" fill="#000000">token    </text>
-<text text-anchor="start" x="755.4432" y="-3111.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="680,-3070.5 680,-3100.5 980,-3100.5 980,-3070.5 680,-3070.5"/>
-<text text-anchor="start" x="687" y="-3081.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="767.1024" y="-3081.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="680,-3040.5 680,-3070.5 980,-3070.5 980,-3040.5 680,-3040.5"/>
-<text text-anchor="start" x="687" y="-3051.9" font-family="Arial" font-size="14.00" fill="#000000">revoked    </text>
-<text text-anchor="start" x="770.9958" y="-3051.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="680,-3010.5 680,-3040.5 980,-3040.5 980,-3010.5 680,-3010.5"/>
-<text text-anchor="start" x="687" y="-3021.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="787.3422" y="-3021.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="680,-2980.5 680,-3010.5 980,-3010.5 980,-2980.5 680,-2980.5"/>
-<text text-anchor="start" x="687" y="-2991.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="791.2468" y="-2991.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- auth.instances -->
-<g id="node3" class="node">
-<title>auth.instances</title>
-<polygon fill="#efefef" stroke="transparent" points="1085,-3160.5 1085,-3195.5 1368,-3195.5 1368,-3160.5 1085,-3160.5"/>
-<polygon fill="none" stroke="#000000" points="1085,-3160.5 1085,-3195.5 1368,-3195.5 1368,-3160.5 1085,-3160.5"/>
-<text text-anchor="start" x="1104.6939" y="-3173.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.instances</text>
-<text text-anchor="start" x="1220.7381" y="-3173.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="1254.9429" y="-3173.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="1085,-3130.5 1085,-3160.5 1368,-3160.5 1368,-3130.5 1085,-3130.5"/>
-<text text-anchor="start" x="1092" y="-3141.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="1137.094" y="-3141.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="1085,-3100.5 1085,-3130.5 1368,-3130.5 1368,-3100.5 1085,-3100.5"/>
-<text text-anchor="start" x="1092" y="-3111.9" font-family="Arial" font-size="14.00" fill="#000000">uuid    </text>
-<text text-anchor="start" x="1152.6592" y="-3111.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="1085,-3070.5 1085,-3100.5 1368,-3100.5 1368,-3070.5 1085,-3070.5"/>
-<text text-anchor="start" x="1092" y="-3081.9" font-family="Arial" font-size="14.00" fill="#000000">raw_base_config    </text>
-<text text-anchor="start" x="1232.0126" y="-3081.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="1085,-3040.5 1085,-3070.5 1368,-3070.5 1368,-3040.5 1085,-3040.5"/>
-<text text-anchor="start" x="1092" y="-3051.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="1192.3422" y="-3051.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="1085,-3010.5 1085,-3040.5 1368,-3040.5 1368,-3010.5 1085,-3010.5"/>
-<text text-anchor="start" x="1091.5344" y="-3021.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="1195.7812" y="-3021.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- auth.audit_log_entries -->
-<g id="node4" class="node">
-<title>auth.audit_log_entries</title>
-<polygon fill="#efefef" stroke="transparent" points="1472,-3145.5 1472,-3180.5 1790,-3180.5 1790,-3145.5 1472,-3145.5"/>
-<polygon fill="none" stroke="#000000" points="1472,-3145.5 1472,-3180.5 1790,-3180.5 1790,-3145.5 1472,-3145.5"/>
-<text text-anchor="start" x="1478.6839" y="-3158.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.audit_log_entries</text>
-<text text-anchor="start" x="1655.7481" y="-3158.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="1689.9529" y="-3158.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="1472,-3115.5 1472,-3145.5 1790,-3145.5 1790,-3115.5 1472,-3115.5"/>
-<text text-anchor="start" x="1479" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">instance_id    </text>
-<text text-anchor="start" x="1584.0042" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="1472,-3085.5 1472,-3115.5 1790,-3115.5 1790,-3085.5 1472,-3085.5"/>
-<text text-anchor="start" x="1479" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="1524.094" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="1472,-3055.5 1472,-3085.5 1790,-3085.5 1790,-3055.5 1472,-3055.5"/>
-<text text-anchor="start" x="1479" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">payload    </text>
-<text text-anchor="start" x="1562.2244" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[json]</text>
-<polygon fill="none" stroke="#000000" points="1472,-3025.5 1472,-3055.5 1790,-3055.5 1790,-3025.5 1472,-3025.5"/>
-<text text-anchor="start" x="1479" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="1579.3422" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- auth.schema_migrations -->
-<g id="node5" class="node">
-<title>auth.schema_migrations</title>
-<polygon fill="#efefef" stroke="transparent" points="1895,-3100.5 1895,-3135.5 2232,-3135.5 2232,-3100.5 1895,-3100.5"/>
-<polygon fill="none" stroke="#000000" points="1895,-3100.5 1895,-3135.5 2232,-3135.5 2232,-3100.5 1895,-3100.5"/>
-<text text-anchor="start" x="1901.6961" y="-3113.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.schema_migrations</text>
-<text text-anchor="start" x="2097.7359" y="-3113.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="2131.9407" y="-3113.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="1895,-3070.5 1895,-3100.5 2232,-3100.5 2232,-3070.5 1895,-3070.5"/>
-<text text-anchor="start" x="1902" y="-3081.9" font-family="Arial" font-size="14.00" fill="#000000">version    </text>
-<text text-anchor="start" x="1981.3198" y="-3081.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-</g>
-<!-- storage.buckets -->
-<g id="node6" class="node">
-<title>storage.buckets</title>
-<polygon fill="#efefef" stroke="transparent" points="380,-2148.5 380,-2183.5 663,-2183.5 663,-2148.5 380,-2148.5"/>
-<polygon fill="none" stroke="#000000" points="380,-2148.5 380,-2183.5 663,-2183.5 663,-2148.5 380,-2148.5"/>
-<text text-anchor="start" x="394.1949" y="-2161.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.buckets</text>
-<text text-anchor="start" x="521.2371" y="-2161.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="555.4419" y="-2161.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="380,-2118.5 380,-2148.5 663,-2148.5 663,-2118.5 380,-2118.5"/>
-<text text-anchor="start" x="387" y="-2129.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="432.094" y="-2129.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="380,-2088.5 380,-2118.5 663,-2118.5 663,-2088.5 380,-2088.5"/>
-<text text-anchor="start" x="387" y="-2099.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="456.2132" y="-2099.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="380,-2058.5 380,-2088.5 663,-2088.5 663,-2058.5 380,-2058.5"/>
-<text text-anchor="start" x="387" y="-2069.9" font-family="Arial" font-size="14.00" fill="#000000">owner    </text>
-<text text-anchor="start" x="459.3198" y="-2069.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="380,-2028.5 380,-2058.5 663,-2058.5 663,-2028.5 380,-2028.5"/>
-<text text-anchor="start" x="387" y="-2039.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="487.3422" y="-2039.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="380,-1998.5 380,-2028.5 663,-2028.5 663,-1998.5 380,-1998.5"/>
-<text text-anchor="start" x="386.5344" y="-2009.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="490.7812" y="-2009.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- storage.buckets&#45;&gt;auth.users -->
-<g id="edge1" class="edge">
-<title>storage.buckets:owner&#45;&gt;auth.users:id</title>
-<path fill="none" stroke="#000000" d="M369.6897,-2072.3751C332.1461,-2063.1802 359.1444,-1999.6167 380,-1956 432.2197,-1846.7895 539.7803,-1894.2105 592,-1785 615.6779,-1735.4808 646.8889,-1661.5 592,-1661.5"/>
-<polygon fill="#000000" stroke="#000000" points="370.059,-2072.4153 379.5119,-2077.9735 375.0295,-2072.9577 380,-2073.5 380,-2073.5 380,-2073.5 375.0295,-2072.9577 380.4881,-2069.0265 370.059,-2072.4153 370.059,-2072.4153"/>
-<text text-anchor="start" x="132.9965" y="-2083.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (owner) REFERENCES auth.users(id)</text>
-</g>
-<!-- storage.objects -->
-<g id="node7" class="node">
-<title>storage.objects</title>
-<polygon fill="#efefef" stroke="transparent" points="254,-3205.5 254,-3240.5 576,-3240.5 576,-3205.5 254,-3205.5"/>
-<polygon fill="none" stroke="#000000" points="254,-3205.5 254,-3240.5 576,-3240.5 576,-3205.5 254,-3205.5"/>
-<text text-anchor="start" x="290.1978" y="-3218.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.objects</text>
-<text text-anchor="start" x="412.2342" y="-3218.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="446.439" y="-3218.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="254,-3175.5 254,-3205.5 576,-3205.5 576,-3175.5 254,-3175.5"/>
-<text text-anchor="start" x="261" y="-3186.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="306.094" y="-3186.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="254,-3145.5 254,-3175.5 576,-3175.5 576,-3145.5 254,-3145.5"/>
-<text text-anchor="start" x="261" y="-3156.9" font-family="Arial" font-size="14.00" fill="#000000">bucket_id    </text>
-<text text-anchor="start" x="355.115" y="-3156.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="254,-3115.5 254,-3145.5 576,-3145.5 576,-3115.5 254,-3115.5"/>
-<text text-anchor="start" x="261" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="330.2132" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="254,-3085.5 254,-3115.5 576,-3115.5 576,-3085.5 254,-3085.5"/>
-<text text-anchor="start" x="261" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">owner    </text>
-<text text-anchor="start" x="333.3198" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="254,-3055.5 254,-3085.5 576,-3085.5 576,-3055.5 254,-3055.5"/>
-<text text-anchor="start" x="261" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="361.3422" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="254,-3025.5 254,-3055.5 576,-3055.5 576,-3025.5 254,-3025.5"/>
-<text text-anchor="start" x="261" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="365.2468" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="254,-2995.5 254,-3025.5 576,-3025.5 576,-2995.5 254,-2995.5"/>
-<text text-anchor="start" x="260.9811" y="-3006.9" font-family="Arial" font-size="14.00" fill="#000000">last_accessed_at    </text>
-<text text-anchor="start" x="403.3345" y="-3006.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="254,-2965.5 254,-2995.5 576,-2995.5 576,-2965.5 254,-2965.5"/>
-<text text-anchor="start" x="261" y="-2976.9" font-family="Arial" font-size="14.00" fill="#000000">metadata    </text>
-<text text-anchor="start" x="353.5596" y="-2976.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- storage.objects&#45;&gt;auth.users -->
-<g id="edge2" class="edge">
-<title>storage.objects:owner&#45;&gt;auth.users:id</title>
-<path fill="none" stroke="#000000" d="M245.5856,-3094.9996C173.0196,-2998.3885 160.9394,-1661.5 238,-1661.5"/>
-<polygon fill="#000000" stroke="#000000" points="245.6297,-3095.0284 251.5378,-3104.2666 249.8148,-3097.7642 254,-3100.5 254,-3100.5 254,-3100.5 249.8148,-3097.7642 256.4622,-3096.7334 245.6297,-3095.0284 245.6297,-3095.0284"/>
-<text text-anchor="start" x="6.9965" y="-3110.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (owner) REFERENCES auth.users(id)</text>
-</g>
-<!-- storage.objects&#45;&gt;storage.buckets -->
-<g id="edge3" class="edge">
-<title>storage.objects:bucket_id&#45;&gt;storage.buckets:id</title>
-<path fill="none" stroke="#000000" d="M586.2437,-3159.7556C787.913,-3128.657 151.2891,-2133.5 380,-2133.5"/>
-<polygon fill="#000000" stroke="#000000" points="585.9737,-3159.7752 575.6738,-3156.0118 580.9869,-3160.1376 576,-3160.5 576,-3160.5 576,-3160.5 580.9869,-3160.1376 576.3262,-3164.9882 585.9737,-3159.7752 585.9737,-3159.7752"/>
-<text text-anchor="start" x="436.764" y="-3144.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (bucket_id) REFERENCES storage.buckets(id)</text>
-</g>
-<!-- storage.migrations -->
-<g id="node8" class="node">
-<title>storage.migrations</title>
-<polygon fill="#efefef" stroke="transparent" points="2336,-3145.5 2336,-3180.5 2645,-3180.5 2645,-3145.5 2336,-3145.5"/>
-<polygon fill="none" stroke="#000000" points="2336,-3145.5 2336,-3180.5 2645,-3180.5 2645,-3145.5 2336,-3145.5"/>
-<text text-anchor="start" x="2352.7054" y="-3158.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.migrations</text>
-<text text-anchor="start" x="2500.7266" y="-3158.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="2534.9314" y="-3158.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="2336,-3115.5 2336,-3145.5 2645,-3145.5 2645,-3115.5 2336,-3115.5"/>
-<text text-anchor="start" x="2343" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="2388.094" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="2336,-3085.5 2336,-3115.5 2645,-3115.5 2645,-3085.5 2336,-3085.5"/>
-<text text-anchor="start" x="2343" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="2412.2132" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(100)]</text>
-<polygon fill="none" stroke="#000000" points="2336,-3055.5 2336,-3085.5 2645,-3085.5 2645,-3055.5 2336,-3055.5"/>
-<text text-anchor="start" x="2343" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">hash    </text>
-<text text-anchor="start" x="2407.5526" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(40)]</text>
-<polygon fill="none" stroke="#000000" points="2336,-3025.5 2336,-3055.5 2645,-3055.5 2645,-3025.5 2336,-3025.5"/>
-<text text-anchor="start" x="2342.6978" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">executed_at    </text>
-<text text-anchor="start" x="2453.162" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp without time zone]</text>
-</g>
-<!-- net.http_request_queue -->
-<g id="node9" class="node">
-<title>net.http_request_queue</title>
-<polygon fill="#efefef" stroke="transparent" points="2749,-3175.5 2749,-3210.5 3080,-3210.5 3080,-3175.5 2749,-3175.5"/>
-<polygon fill="none" stroke="#000000" points="2749,-3175.5 2749,-3210.5 3080,-3210.5 3080,-3175.5 2749,-3175.5"/>
-<text text-anchor="start" x="2755.6679" y="-3188.3" font-family="Arial Bold" font-size="18.00" fill="#000000">net.http_request_queue</text>
-<text text-anchor="start" x="2945.7641" y="-3188.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="2979.9689" y="-3188.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="2749,-3145.5 2749,-3175.5 3080,-3175.5 3080,-3145.5 2749,-3145.5"/>
-<text text-anchor="start" x="2756" y="-3156.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="2801.094" y="-3156.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="2749,-3115.5 2749,-3145.5 3080,-3145.5 3080,-3115.5 2749,-3115.5"/>
-<text text-anchor="start" x="2756" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">method    </text>
-<text text-anchor="start" x="2836.8864" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[net.http_method]</text>
-<polygon fill="none" stroke="#000000" points="2749,-3085.5 2749,-3115.5 3080,-3115.5 3080,-3085.5 2749,-3085.5"/>
-<text text-anchor="start" x="2756" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">url    </text>
-<text text-anchor="start" x="2805.7546" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="2749,-3055.5 2749,-3085.5 3080,-3085.5 3080,-3055.5 2749,-3055.5"/>
-<text text-anchor="start" x="2756" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">headers    </text>
-<text text-anchor="start" x="2840.7784" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="2749,-3025.5 2749,-3055.5 3080,-3055.5 3080,-3025.5 2749,-3025.5"/>
-<text text-anchor="start" x="2756" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">body    </text>
-<text text-anchor="start" x="2820.5526" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="2749,-2995.5 2749,-3025.5 3080,-3025.5 3080,-2995.5 2749,-2995.5"/>
-<text text-anchor="start" x="2756" y="-3006.9" font-family="Arial" font-size="14.00" fill="#000000">timeout_milliseconds    </text>
-<text text-anchor="start" x="2920.101" y="-3006.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-</g>
-<!-- net._http_response -->
-<g id="node10" class="node">
-<title>net._http_response</title>
-<polygon fill="#efefef" stroke="transparent" points="3184,-3205.5 3184,-3240.5 3479,-3240.5 3479,-3205.5 3184,-3205.5"/>
-<polygon fill="none" stroke="#000000" points="3184,-3205.5 3184,-3240.5 3479,-3240.5 3479,-3205.5 3184,-3205.5"/>
-<text text-anchor="start" x="3190.6814" y="-3218.3" font-family="Arial Bold" font-size="18.00" fill="#000000">net._http_response</text>
-<text text-anchor="start" x="3344.7506" y="-3218.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="3378.9554" y="-3218.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="3184,-3175.5 3184,-3205.5 3479,-3205.5 3479,-3175.5 3184,-3175.5"/>
-<text text-anchor="start" x="3191" y="-3186.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="3236.094" y="-3186.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="3184,-3145.5 3184,-3175.5 3479,-3175.5 3479,-3145.5 3184,-3145.5"/>
-<text text-anchor="start" x="3191" y="-3156.9" font-family="Arial" font-size="14.00" fill="#000000">status_code    </text>
-<text text-anchor="start" x="3300.6816" y="-3156.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="3184,-3115.5 3184,-3145.5 3479,-3145.5 3479,-3115.5 3184,-3115.5"/>
-<text text-anchor="start" x="3191" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">content_type    </text>
-<text text-anchor="start" x="3305.3548" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="3184,-3085.5 3184,-3115.5 3479,-3115.5 3479,-3085.5 3184,-3085.5"/>
-<text text-anchor="start" x="3191" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">headers    </text>
-<text text-anchor="start" x="3275.7784" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="3184,-3055.5 3184,-3085.5 3479,-3085.5 3479,-3055.5 3184,-3055.5"/>
-<text text-anchor="start" x="3191" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">content    </text>
-<text text-anchor="start" x="3271.1164" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="3184,-3025.5 3184,-3055.5 3479,-3055.5 3479,-3025.5 3184,-3025.5"/>
-<text text-anchor="start" x="3191" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">timed_out    </text>
-<text text-anchor="start" x="3286.6662" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="3184,-2995.5 3184,-3025.5 3479,-3025.5 3479,-2995.5 3184,-2995.5"/>
-<text text-anchor="start" x="3191" y="-3006.9" font-family="Arial" font-size="14.00" fill="#000000">error_msg    </text>
-<text text-anchor="start" x="3288.9776" y="-3006.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="3184,-2965.5 3184,-2995.5 3479,-2995.5 3479,-2965.5 3184,-2965.5"/>
-<text text-anchor="start" x="3191" y="-2976.9" font-family="Arial" font-size="14.00" fill="#000000">created    </text>
-<text text-anchor="start" x="3271.8864" y="-2976.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- supabase_functions.migrations -->
-<g id="node11" class="node">
-<title>supabase_functions.migrations</title>
-<polygon fill="#efefef" stroke="transparent" points="3583,-3115.5 3583,-3150.5 3972,-3150.5 3972,-3115.5 3583,-3115.5"/>
-<polygon fill="none" stroke="#000000" points="3583,-3115.5 3583,-3150.5 3972,-3150.5 3972,-3115.5 3583,-3115.5"/>
-<text text-anchor="start" x="3589.6816" y="-3128.3" font-family="Arial Bold" font-size="18.00" fill="#000000">supabase_functions.migrations</text>
-<text text-anchor="start" x="3837.7504" y="-3128.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="3871.9552" y="-3128.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="3583,-3085.5 3583,-3115.5 3972,-3115.5 3972,-3085.5 3583,-3085.5"/>
-<text text-anchor="start" x="3590" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">version    </text>
-<text text-anchor="start" x="3669.3198" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="3583,-3055.5 3583,-3085.5 3972,-3085.5 3972,-3055.5 3583,-3055.5"/>
-<text text-anchor="start" x="3590" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">inserted_at    </text>
-<text text-anchor="start" x="3693.4488" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- supabase_functions.hooks -->
-<g id="node12" class="node">
-<title>supabase_functions.hooks</title>
-<polygon fill="#efefef" stroke="transparent" points="4076,-3160.5 4076,-3195.5 4430,-3195.5 4430,-3160.5 4076,-3160.5"/>
-<polygon fill="none" stroke="#000000" points="4076,-3160.5 4076,-3195.5 4430,-3195.5 4430,-3160.5 4076,-3160.5"/>
-<text text-anchor="start" x="4082.6722" y="-3173.3" font-family="Arial Bold" font-size="18.00" fill="#000000">supabase_functions.hooks</text>
-<text text-anchor="start" x="4295.7598" y="-3173.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="4329.9646" y="-3173.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="4076,-3130.5 4076,-3160.5 4430,-3160.5 4430,-3130.5 4076,-3130.5"/>
-<text text-anchor="start" x="4083" y="-3141.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="4128.094" y="-3141.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="4076,-3100.5 4076,-3130.5 4430,-3130.5 4430,-3100.5 4076,-3100.5"/>
-<text text-anchor="start" x="4083" y="-3111.9" font-family="Arial" font-size="14.00" fill="#000000">hook_table_id    </text>
-<text text-anchor="start" x="4204.352" y="-3111.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="4076,-3070.5 4076,-3100.5 4430,-3100.5 4430,-3070.5 4076,-3070.5"/>
-<text text-anchor="start" x="4083" y="-3081.9" font-family="Arial" font-size="14.00" fill="#000000">hook_name    </text>
-<text text-anchor="start" x="4190.3436" y="-3081.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4076,-3040.5 4076,-3070.5 4430,-3070.5 4430,-3040.5 4076,-3040.5"/>
-<text text-anchor="start" x="4083" y="-3051.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="4183.3422" y="-3051.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="4076,-3010.5 4076,-3040.5 4430,-3040.5 4430,-3010.5 4076,-3010.5"/>
-<text text-anchor="start" x="4083" y="-3021.9" font-family="Arial" font-size="14.00" fill="#000000">request_id    </text>
-<text text-anchor="start" x="4182.5582" y="-3021.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-</g>
-<!-- public.study -->
-<g id="node13" class="node">
-<title>public.study</title>
-<polygon fill="#efefef" stroke="transparent" points="4747,-919.5 4747,-954.5 5030,-954.5 5030,-919.5 4747,-919.5"/>
-<polygon fill="none" stroke="#000000" points="4747,-919.5 4747,-954.5 5030,-954.5 5030,-919.5 4747,-919.5"/>
-<text text-anchor="start" x="4777.2041" y="-932.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study</text>
-<text text-anchor="start" x="4872.2279" y="-932.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="4906.4327" y="-932.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="4747,-889.5 4747,-919.5 5030,-919.5 5030,-889.5 4747,-889.5"/>
-<text text-anchor="start" x="4754" y="-900.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="4799.094" y="-900.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4747,-859.5 4747,-889.5 5030,-889.5 5030,-859.5 4747,-859.5"/>
-<text text-anchor="start" x="4754" y="-870.9" font-family="Arial" font-size="14.00" fill="#000000">contact    </text>
-<text text-anchor="start" x="4833.3338" y="-870.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4747,-829.5 4747,-859.5 5030,-859.5 5030,-829.5 4747,-829.5"/>
-<text text-anchor="start" x="4754" y="-840.9" font-family="Arial" font-size="14.00" fill="#000000">title    </text>
-<text text-anchor="start" x="4809.9818" y="-840.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4747,-799.5 4747,-829.5 5030,-829.5 5030,-799.5 4747,-799.5"/>
-<text text-anchor="start" x="4754" y="-810.9" font-family="Arial" font-size="14.00" fill="#000000">description    </text>
-<text text-anchor="start" x="4855.8822" y="-810.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4747,-769.5 4747,-799.5 5030,-799.5 5030,-769.5 4747,-769.5"/>
-<text text-anchor="start" x="4754" y="-780.9" font-family="Arial" font-size="14.00" fill="#000000">icon_name    </text>
-<text text-anchor="start" x="4856.6676" y="-780.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4747,-739.5 4747,-769.5 5030,-769.5 5030,-739.5 4747,-739.5"/>
-<text text-anchor="start" x="4754" y="-750.9" font-family="Arial" font-size="14.00" fill="#000000">published    </text>
-<text text-anchor="start" x="4848.1136" y="-750.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="4747,-709.5 4747,-739.5 5030,-739.5 5030,-709.5 4747,-709.5"/>
-<text text-anchor="start" x="4754" y="-720.9" font-family="Arial" font-size="14.00" fill="#000000">registry_published    </text>
-<text text-anchor="start" x="4901.7798" y="-720.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="4747,-679.5 4747,-709.5 5030,-709.5 5030,-679.5 4747,-679.5"/>
-<text text-anchor="start" x="4754" y="-690.9" font-family="Arial" font-size="14.00" fill="#000000">questionnaire    </text>
-<text text-anchor="start" x="4872.23" y="-690.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4747,-649.5 4747,-679.5 5030,-679.5 5030,-649.5 4747,-649.5"/>
-<text text-anchor="start" x="4754" y="-660.9" font-family="Arial" font-size="14.00" fill="#000000">eligibility_criteria    </text>
-<text text-anchor="start" x="4890.8556" y="-660.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4747,-619.5 4747,-649.5 5030,-649.5 5030,-619.5 4747,-619.5"/>
-<text text-anchor="start" x="4754" y="-630.9" font-family="Arial" font-size="14.00" fill="#000000">observations    </text>
-<text text-anchor="start" x="4867.5582" y="-630.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4747,-589.5 4747,-619.5 5030,-619.5 5030,-589.5 4747,-589.5"/>
-<text text-anchor="start" x="4754" y="-600.9" font-family="Arial" font-size="14.00" fill="#000000">interventions    </text>
-<text text-anchor="start" x="4867.5554" y="-600.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4747,-559.5 4747,-589.5 5030,-589.5 5030,-559.5 4747,-559.5"/>
-<text text-anchor="start" x="4754" y="-570.9" font-family="Arial" font-size="14.00" fill="#000000">consent    </text>
-<text text-anchor="start" x="4837.2258" y="-570.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4747,-529.5 4747,-559.5 5030,-559.5 5030,-529.5 4747,-529.5"/>
-<text text-anchor="start" x="4754" y="-540.9" font-family="Arial" font-size="14.00" fill="#000000">schedule    </text>
-<text text-anchor="start" x="4844.2244" y="-540.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4747,-499.5 4747,-529.5 5030,-529.5 5030,-499.5 4747,-499.5"/>
-<text text-anchor="start" x="4754" y="-510.9" font-family="Arial" font-size="14.00" fill="#000000">report_specification    </text>
-<text text-anchor="start" x="4909.561" y="-510.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4747,-469.5 4747,-499.5 5030,-499.5 5030,-469.5 4747,-469.5"/>
-<text text-anchor="start" x="4754" y="-480.9" font-family="Arial" font-size="14.00" fill="#000000">results    </text>
-<text text-anchor="start" x="4829.4278" y="-480.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4747,-439.5 4747,-469.5 5030,-469.5 5030,-439.5 4747,-439.5"/>
-<text text-anchor="start" x="4754" y="-450.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="4854.3422" y="-450.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="4747,-409.5 4747,-439.5 5030,-439.5 5030,-409.5 4747,-409.5"/>
-<text text-anchor="start" x="4753.5344" y="-420.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="4857.7812" y="-420.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="4747,-379.5 4747,-409.5 5030,-409.5 5030,-379.5 4747,-379.5"/>
-<text text-anchor="start" x="4754" y="-390.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="4834.1024" y="-390.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4747,-349.5 4747,-379.5 5030,-379.5 5030,-349.5 4747,-349.5"/>
-<text text-anchor="start" x="4754" y="-360.9" font-family="Arial" font-size="14.00" fill="#000000">participation    </text>
-<text text-anchor="start" x="4863.662" y="-360.9" font-family="Arial" font-size="14.00" fill="#666666">[participation]</text>
-<polygon fill="none" stroke="#000000" points="4747,-319.5 4747,-349.5 5030,-349.5 5030,-319.5 4747,-319.5"/>
-<text text-anchor="start" x="4754" y="-330.9" font-family="Arial" font-size="14.00" fill="#000000">result_sharing    </text>
-<text text-anchor="start" x="4876.108" y="-330.9" font-family="Arial" font-size="14.00" fill="#666666">[result_sharing]</text>
-<polygon fill="none" stroke="#000000" points="4747,-289.5 4747,-319.5 5030,-319.5 5030,-289.5 4747,-289.5"/>
-<text text-anchor="start" x="4754" y="-300.9" font-family="Arial" font-size="14.00" fill="#000000">collaborator_emails    </text>
-<text text-anchor="start" x="4909.547" y="-300.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- public.user -->
-<g id="node20" class="node">
-<title>public.user</title>
-<polygon fill="#efefef" stroke="transparent" points="4775,-132.5 4775,-167.5 5003,-167.5 5003,-132.5 4775,-132.5"/>
-<polygon fill="none" stroke="#000000" points="4775,-132.5 4775,-167.5 5003,-167.5 5003,-132.5 4775,-132.5"/>
-<text text-anchor="start" x="4781.7091" y="-145.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.user</text>
-<text text-anchor="start" x="4868.7229" y="-145.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="4902.9277" y="-145.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="4775,-102.5 4775,-132.5 5003,-132.5 5003,-102.5 4775,-102.5"/>
-<text text-anchor="start" x="4782" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="4827.094" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4775,-72.5 4775,-102.5 5003,-102.5 5003,-72.5 4775,-72.5"/>
-<text text-anchor="start" x="4782" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">email    </text>
-<text text-anchor="start" x="4849.6438" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4775,-42.5 4775,-72.5 5003,-72.5 5003,-42.5 4775,-42.5"/>
-<text text-anchor="start" x="4782" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">preferences    </text>
-<text text-anchor="start" x="4890.1122" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- public.study&#45;&gt;public.user -->
-<g id="edge4" class="edge">
-<title>public.study:user_id&#45;&gt;public.user:id</title>
-<path fill="none" stroke="#000000" d="M5039.9757,-393.6446C5093.0267,-383.9251 5070.6417,-293.7824 5030,-247 4954.9363,-160.5947 4850.0637,-297.4053 4775,-211 4747.7469,-179.6291 4733.4444,-117.5 4775,-117.5"/>
-<polygon fill="#000000" stroke="#000000" points="5039.9634,-393.6456 5029.6155,-390.0165 5034.9817,-394.0728 5030,-394.5 5030,-394.5 5030,-394.5 5034.9817,-394.0728 5030.3845,-398.9835 5039.9634,-393.6456 5039.9634,-393.6456"/>
-<text text-anchor="start" x="5037.2855" y="-404.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (user_id) REFERENCES &quot;user&quot;(id)</text>
-</g>
-<!-- public.study_subject -->
-<g id="node14" class="node">
-<title>public.study_subject</title>
-<polygon fill="#efefef" stroke="transparent" points="4547,-2178.5 4547,-2213.5 4850,-2213.5 4850,-2178.5 4547,-2178.5"/>
-<polygon fill="none" stroke="#000000" points="4547,-2178.5 4547,-2213.5 4850,-2213.5 4850,-2178.5 4547,-2178.5"/>
-<text text-anchor="start" x="4553.6935" y="-2191.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_subject</text>
-<text text-anchor="start" x="4715.7385" y="-2191.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="4749.9433" y="-2191.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="4547,-2148.5 4547,-2178.5 4850,-2178.5 4850,-2148.5 4547,-2148.5"/>
-<text text-anchor="start" x="4554" y="-2159.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="4599.094" y="-2159.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4547,-2118.5 4547,-2148.5 4850,-2148.5 4850,-2118.5 4547,-2118.5"/>
-<text text-anchor="start" x="4554" y="-2129.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="4640.3324" y="-2129.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4547,-2088.5 4547,-2118.5 4850,-2118.5 4850,-2088.5 4547,-2088.5"/>
-<text text-anchor="start" x="4554" y="-2099.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="4634.1024" y="-2099.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4547,-2058.5 4547,-2088.5 4850,-2088.5 4850,-2058.5 4547,-2058.5"/>
-<text text-anchor="start" x="4554" y="-2069.9" font-family="Arial" font-size="14.00" fill="#000000">started_at    </text>
-<text text-anchor="start" x="4650.4502" y="-2069.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="4547,-2028.5 4547,-2058.5 4850,-2058.5 4850,-2028.5 4547,-2028.5"/>
-<text text-anchor="start" x="4554" y="-2039.9" font-family="Arial" font-size="14.00" fill="#000000">selected_intervention_ids    </text>
-<text text-anchor="start" x="4746.1374" y="-2039.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-<polygon fill="none" stroke="#000000" points="4547,-1998.5 4547,-2028.5 4850,-2028.5 4850,-1998.5 4547,-1998.5"/>
-<text text-anchor="start" x="4554" y="-2009.9" font-family="Arial" font-size="14.00" fill="#000000">invite_code    </text>
-<text text-anchor="start" x="4659.0042" y="-2009.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4547,-1968.5 4547,-1998.5 4850,-1998.5 4850,-1968.5 4547,-1968.5"/>
-<text text-anchor="start" x="4554" y="-1979.9" font-family="Arial" font-size="14.00" fill="#000000">is_deleted    </text>
-<text text-anchor="start" x="4652.0042" y="-1979.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-</g>
-<!-- public.study_subject&#45;&gt;public.study -->
-<g id="edge5" class="edge">
-<title>public.study_subject:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M4860.1025,-2133.2106C5000.6238,-2124.8512 4881.3568,-1937.0561 4895,-1785 4902.4666,-1701.7831 4883.5748,-1101.3643 4933,-1034 4960.2024,-996.9244 5003.7434,-1035.7513 5030,-998 5053.7278,-963.8846 5071.5556,-904.5 5030,-904.5"/>
-<polygon fill="#000000" stroke="#000000" points="4859.9959,-2133.2135 4849.8711,-2129.0018 4854.9979,-2133.3568 4850,-2133.5 4850,-2133.5 4850,-2133.5 4854.9979,-2133.3568 4850.1289,-2137.9982 4859.9959,-2133.2135 4859.9959,-2133.2135"/>
-<text text-anchor="start" x="4857.1035" y="-2143.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE</text>
-</g>
-<!-- public.study_invite -->
-<g id="node17" class="node">
-<title>public.study_invite</title>
-<polygon fill="#efefef" stroke="transparent" points="4555,-1436.5 4555,-1471.5 4843,-1471.5 4843,-1436.5 4555,-1436.5"/>
-<polygon fill="none" stroke="#000000" points="4555,-1436.5 4555,-1471.5 4843,-1471.5 4843,-1436.5 4555,-1436.5"/>
-<text text-anchor="start" x="4561.6995" y="-1449.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_invite</text>
-<text text-anchor="start" x="4708.7325" y="-1449.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="4742.9373" y="-1449.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="4555,-1406.5 4555,-1436.5 4843,-1436.5 4843,-1406.5 4555,-1406.5"/>
-<text text-anchor="start" x="4562" y="-1417.9" font-family="Arial" font-size="14.00" fill="#000000">code    </text>
-<text text-anchor="start" x="4626.5526" y="-1417.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4555,-1376.5 4555,-1406.5 4843,-1406.5 4843,-1376.5 4555,-1376.5"/>
-<text text-anchor="start" x="4562" y="-1387.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="4648.3324" y="-1387.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4555,-1346.5 4555,-1376.5 4843,-1376.5 4843,-1346.5 4555,-1346.5"/>
-<text text-anchor="start" x="4562" y="-1357.9" font-family="Arial" font-size="14.00" fill="#000000">preselected_intervention_ids    </text>
-<text text-anchor="start" x="4774.3632" y="-1357.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- public.study_subject&#45;&gt;public.study_invite -->
-<g id="edge6" class="edge">
-<title>public.study_subject:invite_code&#45;&gt;public.study_invite:code</title>
-<path fill="none" stroke="#000000" d="M4859.8955,-2012.0049C4883.5643,-2003.3851 4860.7009,-1959.2602 4850,-1926 4781.1351,-1711.9559 4623.8649,-1729.0441 4555,-1515 4542.2727,-1475.4414 4513.4444,-1421.5 4555,-1421.5"/>
-<polygon fill="#000000" stroke="#000000" points="4859.8878,-2012.006 4849.3277,-2009.0505 4854.9439,-2012.753 4850,-2013.5 4850,-2013.5 4850,-2013.5 4854.9439,-2012.753 4850.6723,-2017.9495 4859.8878,-2012.006 4859.8878,-2012.006"/>
-<text text-anchor="start" x="4857.0385" y="-2023.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (invite_code) REFERENCES study_invite(code) ON DELETE CASCADE</text>
-</g>
-<!-- public.study_subject&#45;&gt;public.user -->
-<g id="edge7" class="edge">
-<title>public.study_subject:user_id&#45;&gt;public.user:id</title>
-<path fill="none" stroke="#000000" d="M4536.9616,-2103.4149C3660.2707,-2088.4977 3889.8978,-117.5 4775,-117.5"/>
-<polygon fill="#000000" stroke="#000000" points="4537.0004,-2103.4151 4546.9618,-2107.9998 4542.0002,-2103.4576 4547,-2103.5 4547,-2103.5 4547,-2103.5 4542.0002,-2103.4576 4547.0382,-2099.0002 4537.0004,-2103.4151 4537.0004,-2103.4151"/>
-<text text-anchor="start" x="4315.2855" y="-2113.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (user_id) REFERENCES &quot;user&quot;(id)</text>
-</g>
-<!-- public.app_config -->
-<g id="node15" class="node">
-<title>public.app_config</title>
-<polygon fill="#efefef" stroke="transparent" points="4969,-3220.5 4969,-3255.5 5250,-3255.5 5250,-3220.5 4969,-3220.5"/>
-<polygon fill="none" stroke="#000000" points="4969,-3220.5 4969,-3255.5 5250,-3255.5 5250,-3220.5 4969,-3220.5"/>
-<text text-anchor="start" x="4975.6915" y="-3233.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.app_config</text>
-<text text-anchor="start" x="5115.7405" y="-3233.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="5149.9453" y="-3233.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="4969,-3190.5 4969,-3220.5 5250,-3220.5 5250,-3190.5 4969,-3190.5"/>
-<text text-anchor="start" x="4976" y="-3201.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="5021.094" y="-3201.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4969,-3160.5 4969,-3190.5 5250,-3190.5 5250,-3160.5 4969,-3160.5"/>
-<text text-anchor="start" x="4976" y="-3171.9" font-family="Arial" font-size="14.00" fill="#000000">app_min_version    </text>
-<text text-anchor="start" x="5116.7826" y="-3171.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4969,-3130.5 4969,-3160.5 5250,-3160.5 5250,-3130.5 4969,-3130.5"/>
-<text text-anchor="start" x="4976" y="-3141.9" font-family="Arial" font-size="14.00" fill="#000000">app_privacy    </text>
-<text text-anchor="start" x="5085.6676" y="-3141.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4969,-3100.5 4969,-3130.5 5250,-3130.5 5250,-3100.5 4969,-3100.5"/>
-<text text-anchor="start" x="4976" y="-3111.9" font-family="Arial" font-size="14.00" fill="#000000">app_terms    </text>
-<text text-anchor="start" x="5076.3296" y="-3111.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4969,-3070.5 4969,-3100.5 5250,-3100.5 5250,-3070.5 4969,-3070.5"/>
-<text text-anchor="start" x="4976" y="-3081.9" font-family="Arial" font-size="14.00" fill="#000000">designer_privacy    </text>
-<text text-anchor="start" x="5116" y="-3081.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4969,-3040.5 4969,-3070.5 5250,-3070.5 5250,-3040.5 4969,-3040.5"/>
-<text text-anchor="start" x="4976" y="-3051.9" font-family="Arial" font-size="14.00" fill="#000000">designer_terms    </text>
-<text text-anchor="start" x="5106.662" y="-3051.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4969,-3010.5 4969,-3040.5 5250,-3040.5 5250,-3010.5 4969,-3010.5"/>
-<text text-anchor="start" x="4976" y="-3021.9" font-family="Arial" font-size="14.00" fill="#000000">imprint    </text>
-<text text-anchor="start" x="5052.195" y="-3021.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4969,-2980.5 4969,-3010.5 5250,-3010.5 5250,-2980.5 4969,-2980.5"/>
-<text text-anchor="start" x="4976" y="-2991.9" font-family="Arial" font-size="14.00" fill="#000000">contact    </text>
-<text text-anchor="start" x="5055.3338" y="-2991.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="4969,-2950.5 4969,-2980.5 5250,-2980.5 5250,-2950.5 4969,-2950.5"/>
-<text text-anchor="start" x="4976" y="-2961.9" font-family="Arial" font-size="14.00" fill="#000000">analytics    </text>
-<text text-anchor="start" x="5064.6564" y="-2961.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- public.repo -->
-<g id="node16" class="node">
-<title>public.repo</title>
-<polygon fill="#efefef" stroke="transparent" points="4986,-1451.5 4986,-1486.5 5215,-1486.5 5215,-1451.5 4986,-1451.5"/>
-<polygon fill="none" stroke="#000000" points="4986,-1451.5 4986,-1486.5 5215,-1486.5 5215,-1451.5 4986,-1451.5"/>
-<text text-anchor="start" x="4992.706" y="-1464.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.repo</text>
-<text text-anchor="start" x="5080.726" y="-1464.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="5114.9308" y="-1464.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="4986,-1421.5 4986,-1451.5 5215,-1451.5 5215,-1421.5 4986,-1421.5"/>
-<text text-anchor="start" x="4993" y="-1432.9" font-family="Arial" font-size="14.00" fill="#000000">project_id    </text>
-<text text-anchor="start" x="5087.8822" y="-1432.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4986,-1391.5 4986,-1421.5 5215,-1421.5 5215,-1391.5 4986,-1391.5"/>
-<text text-anchor="start" x="4993" y="-1402.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="5073.1024" y="-1402.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4986,-1361.5 4986,-1391.5 5215,-1391.5 5215,-1361.5 4986,-1361.5"/>
-<text text-anchor="start" x="4993" y="-1372.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="5079.3324" y="-1372.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4986,-1331.5 4986,-1361.5 5215,-1361.5 5215,-1331.5 4986,-1331.5"/>
-<text text-anchor="start" x="4993" y="-1342.9" font-family="Arial" font-size="14.00" fill="#000000">provider    </text>
-<text text-anchor="start" x="5077.763" y="-1342.9" font-family="Arial" font-size="14.00" fill="#666666">[git_provider]</text>
-</g>
-<!-- public.repo&#45;&gt;public.study -->
-<g id="edge8" class="edge">
-<title>public.repo:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M4975.7838,-1376.0912C4791.0216,-1360.505 5237.0867,-904.5 5030,-904.5"/>
-<polygon fill="#000000" stroke="#000000" points="4976.008,-1376.1 4985.82,-1380.9964 4981.004,-1376.3 4986,-1376.5 4986,-1376.5 4986,-1376.5 4981.004,-1376.3 4986.18,-1372.0036 4976.008,-1376.1 4976.008,-1376.1"/>
-<text text-anchor="start" x="4752.3845" y="-1386.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id)</text>
-</g>
-<!-- public.repo&#45;&gt;public.user -->
-<g id="edge9" class="edge">
-<title>public.repo:user_id&#45;&gt;public.user:id</title>
-<path fill="none" stroke="#000000" d="M5225.1241,-1406.3678C5793.0885,-1391.4388 5580.1836,-117.5 5003,-117.5"/>
-<polygon fill="#000000" stroke="#000000" points="5224.9991,-1406.3693 5214.9412,-1402.0004 5219.9996,-1406.4346 5215,-1406.5 5215,-1406.5 5215,-1406.5 5219.9996,-1406.4346 5215.0588,-1410.9996 5224.9991,-1406.3693 5224.9991,-1406.3693"/>
-<text text-anchor="start" x="5222.0045" y="-1416.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (user_id) REFERENCES &quot;user&quot;(id) ON DELETE CASCADE</text>
-</g>
-<!-- public.study_invite&#45;&gt;public.study -->
-<g id="edge10" class="edge">
-<title>public.study_invite:study_id&#45;&gt;public.study:id</title>
-<path fill="none" stroke="#000000" d="M4853.0803,-1391.1247C5046.4937,-1375.9321 4529.945,-904.5 4747,-904.5"/>
-<polygon fill="#000000" stroke="#000000" points="4852.9931,-1391.1279 4842.8326,-1387.0031 4847.9965,-1391.3139 4843,-1391.5 4843,-1391.5 4843,-1391.5 4847.9965,-1391.3139 4843.1674,-1395.9969 4852.9931,-1391.1279 4852.9931,-1391.1279"/>
-<text text-anchor="start" x="4762.3535" y="-1375.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (study_id) REFERENCES study(id) ON DELETE CASCADE</text>
-</g>
-<!-- public.subject_progress -->
-<g id="node18" class="node">
-<title>public.subject_progress</title>
-<polygon fill="#efefef" stroke="transparent" points="4534,-3175.5 4534,-3210.5 4864,-3210.5 4864,-3175.5 4534,-3175.5"/>
-<polygon fill="none" stroke="#000000" points="4534,-3175.5 4534,-3210.5 4864,-3210.5 4864,-3175.5 4534,-3175.5"/>
-<text text-anchor="start" x="4540.6962" y="-3188.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.subject_progress</text>
-<text text-anchor="start" x="4729.7358" y="-3188.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="4763.9406" y="-3188.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="4534,-3145.5 4534,-3175.5 4864,-3175.5 4864,-3145.5 4534,-3145.5"/>
-<text text-anchor="start" x="4541" y="-3156.9" font-family="Arial" font-size="14.00" fill="#000000">completed_at    </text>
-<text text-anchor="start" x="4659.2314" y="-3156.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="4534,-3115.5 4534,-3145.5 4864,-3145.5 4864,-3115.5 4534,-3115.5"/>
-<text text-anchor="start" x="4541" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">subject_id    </text>
-<text text-anchor="start" x="4638.2216" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="4534,-3085.5 4534,-3115.5 4864,-3115.5 4864,-3085.5 4534,-3085.5"/>
-<text text-anchor="start" x="4541" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">intervention_id    </text>
-<text text-anchor="start" x="4666.2272" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4534,-3055.5 4534,-3085.5 4864,-3085.5 4864,-3055.5 4534,-3055.5"/>
-<text text-anchor="start" x="4541" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">task_id    </text>
-<text text-anchor="start" x="4619.5498" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4534,-3025.5 4534,-3055.5 4864,-3055.5 4864,-3025.5 4534,-3025.5"/>
-<text text-anchor="start" x="4541" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">result_type    </text>
-<text text-anchor="start" x="4643.6662" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="4534,-2995.5 4534,-3025.5 4864,-3025.5 4864,-2995.5 4534,-2995.5"/>
-<text text-anchor="start" x="4541" y="-3006.9" font-family="Arial" font-size="14.00" fill="#000000">result    </text>
-<text text-anchor="start" x="4609.4278" y="-3006.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- public.subject_progress&#45;&gt;public.study_subject -->
-<g id="edge11" class="edge">
-<title>public.subject_progress:subject_id&#45;&gt;public.study_subject:id</title>
-<path fill="none" stroke="#000000" d="M4523.8378,-3129.7549C4332.4248,-3099.588 5072.4289,-2163.5 4850,-2163.5"/>
-<polygon fill="#000000" stroke="#000000" points="4524.0268,-3129.7686 4533.6709,-3134.988 4529.0134,-3130.1343 4534,-3130.5 4534,-3130.5 4534,-3130.5 4529.0134,-3130.1343 4534.3291,-3126.012 4524.0268,-3129.7686 4524.0268,-3129.7686"/>
-<text text-anchor="start" x="4540.5975" y="-3140.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (subject_id) REFERENCES study_subject(id) ON DELETE CASCADE</text>
-</g>
-<!-- public.study_progress_export -->
-<g id="node19" class="node">
-<title>public.study_progress_export</title>
-<polygon fill="#efefef" stroke="transparent" points="5354,-3235.5 5354,-3270.5 5680,-3270.5 5680,-3235.5 5354,-3235.5"/>
-<polygon fill="none" stroke="#000000" points="5354,-3235.5 5354,-3270.5 5680,-3270.5 5680,-3235.5 5354,-3235.5"/>
-<text text-anchor="start" x="5360.5886" y="-3248.3" font-family="Arial Bold" font-size="18.00" fill="#000000">public.study_progress_export</text>
-<text text-anchor="start" x="5595.647" y="-3248.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="5629.8518" y="-3248.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="5354,-3205.5 5354,-3235.5 5680,-3235.5 5680,-3205.5 5354,-3205.5"/>
-<text text-anchor="start" x="5361" y="-3216.9" font-family="Arial" font-size="14.00" fill="#000000">completed_at    </text>
-<text text-anchor="start" x="5479.2314" y="-3216.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="5354,-3175.5 5354,-3205.5 5680,-3205.5 5680,-3175.5 5354,-3175.5"/>
-<text text-anchor="start" x="5361" y="-3186.9" font-family="Arial" font-size="14.00" fill="#000000">intervention_id    </text>
-<text text-anchor="start" x="5486.2272" y="-3186.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="5354,-3145.5 5354,-3175.5 5680,-3175.5 5680,-3145.5 5354,-3145.5"/>
-<text text-anchor="start" x="5361" y="-3156.9" font-family="Arial" font-size="14.00" fill="#000000">task_id    </text>
-<text text-anchor="start" x="5439.5498" y="-3156.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="5354,-3115.5 5354,-3145.5 5680,-3145.5 5680,-3115.5 5354,-3115.5"/>
-<text text-anchor="start" x="5361" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">result_type    </text>
-<text text-anchor="start" x="5463.6662" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="5354,-3085.5 5354,-3115.5 5680,-3115.5 5680,-3085.5 5354,-3085.5"/>
-<text text-anchor="start" x="5361" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">result    </text>
-<text text-anchor="start" x="5429.4278" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="5354,-3055.5 5354,-3085.5 5680,-3085.5 5680,-3055.5 5354,-3055.5"/>
-<text text-anchor="start" x="5361" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">subject_id    </text>
-<text text-anchor="start" x="5458.2216" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="5354,-3025.5 5354,-3055.5 5680,-3055.5 5680,-3025.5 5354,-3025.5"/>
-<text text-anchor="start" x="5361" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">user_id    </text>
-<text text-anchor="start" x="5441.1024" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="5354,-2995.5 5354,-3025.5 5680,-3025.5 5680,-2995.5 5354,-2995.5"/>
-<text text-anchor="start" x="5361" y="-3006.9" font-family="Arial" font-size="14.00" fill="#000000">study_id    </text>
-<text text-anchor="start" x="5447.3324" y="-3006.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="5354,-2965.5 5354,-2995.5 5680,-2995.5 5680,-2965.5 5354,-2965.5"/>
-<text text-anchor="start" x="5361" y="-2976.9" font-family="Arial" font-size="14.00" fill="#000000">started_at    </text>
-<text text-anchor="start" x="5457.4502" y="-2976.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="5354,-2935.5 5354,-2965.5 5680,-2965.5 5680,-2935.5 5354,-2935.5"/>
-<text text-anchor="start" x="5361" y="-2946.9" font-family="Arial" font-size="14.00" fill="#000000">selected_intervention_ids    </text>
-<text text-anchor="start" x="5553.1374" y="-2946.9" font-family="Arial" font-size="14.00" fill="#666666">[text[]]</text>
-</g>
-<!-- extensions.pg_stat_statements_info -->
-<g id="node21" class="node">
-<title>extensions.pg_stat_statements_info</title>
-<polygon fill="#efefef" stroke="transparent" points="5784,-3115.5 5784,-3150.5 6162,-3150.5 6162,-3115.5 5784,-3115.5"/>
-<polygon fill="none" stroke="#000000" points="5784,-3115.5 5784,-3150.5 6162,-3150.5 6162,-3115.5 5784,-3115.5"/>
-<text text-anchor="start" x="5790.566" y="-3128.3" font-family="Arial Bold" font-size="18.00" fill="#000000">extensions.pg_stat_statements_info</text>
-<text text-anchor="start" x="6077.6696" y="-3128.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="6111.8744" y="-3128.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="5784,-3085.5 5784,-3115.5 6162,-3115.5 6162,-3085.5 5784,-3085.5"/>
-<text text-anchor="start" x="5791" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">dealloc    </text>
-<text text-anchor="start" x="5869.5484" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="5784,-3055.5 5784,-3085.5 6162,-3085.5 6162,-3055.5 5784,-3055.5"/>
-<text text-anchor="start" x="5791" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">stats_reset    </text>
-<text text-anchor="start" x="5893.6676" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- extensions.pg_stat_statements -->
-<g id="node22" class="node">
-<title>extensions.pg_stat_statements</title>
-<polygon fill="#efefef" stroke="transparent" points="6267,-3730.5 6267,-3765.5 6606,-3765.5 6606,-3730.5 6267,-3730.5"/>
-<polygon fill="none" stroke="#000000" points="6267,-3730.5 6267,-3765.5 6606,-3765.5 6606,-3730.5 6267,-3730.5"/>
-<text text-anchor="start" x="6273.5735" y="-3743.3" font-family="Arial Bold" font-size="18.00" fill="#000000">extensions.pg_stat_statements</text>
-<text text-anchor="start" x="6521.6621" y="-3743.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="6555.8669" y="-3743.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3700.5 6267,-3730.5 6606,-3730.5 6606,-3700.5 6267,-3700.5"/>
-<text text-anchor="start" x="6274" y="-3711.9" font-family="Arial" font-size="14.00" fill="#000000">userid    </text>
-<text text-anchor="start" x="6346.3198" y="-3711.9" font-family="Arial" font-size="14.00" fill="#666666">[oid]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3670.5 6267,-3700.5 6606,-3700.5 6606,-3670.5 6267,-3670.5"/>
-<text text-anchor="start" x="6274" y="-3681.9" font-family="Arial" font-size="14.00" fill="#000000">dbid    </text>
-<text text-anchor="start" x="6334.6592" y="-3681.9" font-family="Arial" font-size="14.00" fill="#666666">[oid]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3640.5 6267,-3670.5 6606,-3670.5 6606,-3640.5 6267,-3640.5"/>
-<text text-anchor="start" x="6274" y="-3651.9" font-family="Arial" font-size="14.00" fill="#000000">toplevel    </text>
-<text text-anchor="start" x="6356.439" y="-3651.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3610.5 6267,-3640.5 6606,-3640.5 6606,-3610.5 6267,-3610.5"/>
-<text text-anchor="start" x="6274" y="-3621.9" font-family="Arial" font-size="14.00" fill="#000000">queryid    </text>
-<text text-anchor="start" x="6354.1024" y="-3621.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3580.5 6267,-3610.5 6606,-3610.5 6606,-3580.5 6267,-3580.5"/>
-<text text-anchor="start" x="6274" y="-3591.9" font-family="Arial" font-size="14.00" fill="#000000">query    </text>
-<text text-anchor="start" x="6343.2132" y="-3591.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3550.5 6267,-3580.5 6606,-3580.5 6606,-3550.5 6267,-3550.5"/>
-<text text-anchor="start" x="6274" y="-3561.9" font-family="Arial" font-size="14.00" fill="#000000">plans    </text>
-<text text-anchor="start" x="6341.6592" y="-3561.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3520.5 6267,-3550.5 6606,-3550.5 6606,-3520.5 6267,-3520.5"/>
-<text text-anchor="start" x="6274" y="-3531.9" font-family="Arial" font-size="14.00" fill="#000000">total_plan_time    </text>
-<text text-anchor="start" x="6403.1178" y="-3531.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3490.5 6267,-3520.5 6606,-3520.5 6606,-3490.5 6267,-3490.5"/>
-<text text-anchor="start" x="6274" y="-3501.9" font-family="Arial" font-size="14.00" fill="#000000">min_plan_time    </text>
-<text text-anchor="start" x="6399.2146" y="-3501.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3460.5 6267,-3490.5 6606,-3490.5 6606,-3460.5 6267,-3460.5"/>
-<text text-anchor="start" x="6274" y="-3471.9" font-family="Arial" font-size="14.00" fill="#000000">max_plan_time    </text>
-<text text-anchor="start" x="6403.108" y="-3471.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3430.5 6267,-3460.5 6606,-3460.5 6606,-3430.5 6267,-3430.5"/>
-<text text-anchor="start" x="6274" y="-3441.9" font-family="Arial" font-size="14.00" fill="#000000">mean_plan_time    </text>
-<text text-anchor="start" x="6411.6732" y="-3441.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3400.5 6267,-3430.5 6606,-3430.5 6606,-3400.5 6267,-3400.5"/>
-<text text-anchor="start" x="6274" y="-3411.9" font-family="Arial" font-size="14.00" fill="#000000">stddev_plan_time    </text>
-<text text-anchor="start" x="6417.9032" y="-3411.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3370.5 6267,-3400.5 6606,-3400.5 6606,-3370.5 6267,-3370.5"/>
-<text text-anchor="start" x="6274" y="-3381.9" font-family="Arial" font-size="14.00" fill="#000000">calls    </text>
-<text text-anchor="start" x="6336.2006" y="-3381.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3340.5 6267,-3370.5 6606,-3370.5 6606,-3340.5 6267,-3340.5"/>
-<text text-anchor="start" x="6274" y="-3351.9" font-family="Arial" font-size="14.00" fill="#000000">total_exec_time    </text>
-<text text-anchor="start" x="6406.2286" y="-3351.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3310.5 6267,-3340.5 6606,-3340.5 6606,-3310.5 6267,-3310.5"/>
-<text text-anchor="start" x="6274" y="-3321.9" font-family="Arial" font-size="14.00" fill="#000000">min_exec_time    </text>
-<text text-anchor="start" x="6402.3254" y="-3321.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3280.5 6267,-3310.5 6606,-3310.5 6606,-3280.5 6267,-3280.5"/>
-<text text-anchor="start" x="6274" y="-3291.9" font-family="Arial" font-size="14.00" fill="#000000">max_exec_time    </text>
-<text text-anchor="start" x="6406.2188" y="-3291.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3250.5 6267,-3280.5 6606,-3280.5 6606,-3250.5 6267,-3250.5"/>
-<text text-anchor="start" x="6274" y="-3261.9" font-family="Arial" font-size="14.00" fill="#000000">mean_exec_time    </text>
-<text text-anchor="start" x="6414.784" y="-3261.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3220.5 6267,-3250.5 6606,-3250.5 6606,-3220.5 6267,-3220.5"/>
-<text text-anchor="start" x="6274" y="-3231.9" font-family="Arial" font-size="14.00" fill="#000000">stddev_exec_time    </text>
-<text text-anchor="start" x="6421.014" y="-3231.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3190.5 6267,-3220.5 6606,-3220.5 6606,-3190.5 6267,-3190.5"/>
-<text text-anchor="start" x="6274" y="-3201.9" font-family="Arial" font-size="14.00" fill="#000000">rows    </text>
-<text text-anchor="start" x="6337.7546" y="-3201.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3160.5 6267,-3190.5 6606,-3190.5 6606,-3160.5 6267,-3160.5"/>
-<text text-anchor="start" x="6274" y="-3171.9" font-family="Arial" font-size="14.00" fill="#000000">shared_blks_hit    </text>
-<text text-anchor="start" x="6406.23" y="-3171.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3130.5 6267,-3160.5 6606,-3160.5 6606,-3130.5 6267,-3130.5"/>
-<text text-anchor="start" x="6274" y="-3141.9" font-family="Arial" font-size="14.00" fill="#000000">shared_blks_read    </text>
-<text text-anchor="start" x="6419.4586" y="-3141.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3100.5 6267,-3130.5 6606,-3130.5 6606,-3100.5 6267,-3100.5"/>
-<text text-anchor="start" x="6274" y="-3111.9" font-family="Arial" font-size="14.00" fill="#000000">shared_blks_dirtied    </text>
-<text text-anchor="start" x="6429.5624" y="-3111.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3070.5 6267,-3100.5 6606,-3100.5 6606,-3070.5 6267,-3070.5"/>
-<text text-anchor="start" x="6274" y="-3081.9" font-family="Arial" font-size="14.00" fill="#000000">shared_blks_written    </text>
-<text text-anchor="start" x="6432.6704" y="-3081.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3040.5 6267,-3070.5 6606,-3070.5 6606,-3040.5 6267,-3040.5"/>
-<text text-anchor="start" x="6274" y="-3051.9" font-family="Arial" font-size="14.00" fill="#000000">local_blks_hit    </text>
-<text text-anchor="start" x="6392.2174" y="-3051.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-3010.5 6267,-3040.5 6606,-3040.5 6606,-3010.5 6267,-3010.5"/>
-<text text-anchor="start" x="6274" y="-3021.9" font-family="Arial" font-size="14.00" fill="#000000">local_blks_read    </text>
-<text text-anchor="start" x="6405.446" y="-3021.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2980.5 6267,-3010.5 6606,-3010.5 6606,-2980.5 6267,-2980.5"/>
-<text text-anchor="start" x="6274" y="-2991.9" font-family="Arial" font-size="14.00" fill="#000000">local_blks_dirtied    </text>
-<text text-anchor="start" x="6415.5498" y="-2991.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2950.5 6267,-2980.5 6606,-2980.5 6606,-2950.5 6267,-2950.5"/>
-<text text-anchor="start" x="6274" y="-2961.9" font-family="Arial" font-size="14.00" fill="#000000">local_blks_written    </text>
-<text text-anchor="start" x="6418.6578" y="-2961.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2920.5 6267,-2950.5 6606,-2950.5 6606,-2920.5 6267,-2920.5"/>
-<text text-anchor="start" x="6274" y="-2931.9" font-family="Arial" font-size="14.00" fill="#000000">temp_blks_read    </text>
-<text text-anchor="start" x="6407.784" y="-2931.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2890.5 6267,-2920.5 6606,-2920.5 6606,-2890.5 6267,-2890.5"/>
-<text text-anchor="start" x="6274" y="-2901.9" font-family="Arial" font-size="14.00" fill="#000000">temp_blks_written    </text>
-<text text-anchor="start" x="6420.9958" y="-2901.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2860.5 6267,-2890.5 6606,-2890.5 6606,-2860.5 6267,-2860.5"/>
-<text text-anchor="start" x="6274" y="-2871.9" font-family="Arial" font-size="14.00" fill="#000000">blk_read_time    </text>
-<text text-anchor="start" x="6396.108" y="-2871.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2830.5 6267,-2860.5 6606,-2860.5 6606,-2830.5 6267,-2830.5"/>
-<text text-anchor="start" x="6274" y="-2841.9" font-family="Arial" font-size="14.00" fill="#000000">blk_write_time    </text>
-<text text-anchor="start" x="6397.6466" y="-2841.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2800.5 6267,-2830.5 6606,-2830.5 6606,-2800.5 6267,-2800.5"/>
-<text text-anchor="start" x="6274" y="-2811.9" font-family="Arial" font-size="14.00" fill="#000000">temp_blk_read_time    </text>
-<text text-anchor="start" x="6435.007" y="-2811.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2770.5 6267,-2800.5 6606,-2800.5 6606,-2770.5 6267,-2770.5"/>
-<text text-anchor="start" x="6274" y="-2781.9" font-family="Arial" font-size="14.00" fill="#000000">temp_blk_write_time    </text>
-<text text-anchor="start" x="6436.5456" y="-2781.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2740.5 6267,-2770.5 6606,-2770.5 6606,-2740.5 6267,-2740.5"/>
-<text text-anchor="start" x="6274" y="-2751.9" font-family="Arial" font-size="14.00" fill="#000000">wal_records    </text>
-<text text-anchor="start" x="6383.6522" y="-2751.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2710.5 6267,-2740.5 6606,-2740.5 6606,-2710.5 6267,-2710.5"/>
-<text text-anchor="start" x="6274" y="-2721.9" font-family="Arial" font-size="14.00" fill="#000000">wal_fpi    </text>
-<text text-anchor="start" x="6351.763" y="-2721.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2680.5 6267,-2710.5 6606,-2710.5 6606,-2680.5 6267,-2680.5"/>
-<text text-anchor="start" x="6274" y="-2691.9" font-family="Arial" font-size="14.00" fill="#000000">wal_bytes    </text>
-<text text-anchor="start" x="6370.439" y="-2691.9" font-family="Arial" font-size="14.00" fill="#666666">[numeric]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2650.5 6267,-2680.5 6606,-2680.5 6606,-2650.5 6267,-2650.5"/>
-<text text-anchor="start" x="6274" y="-2661.9" font-family="Arial" font-size="14.00" fill="#000000">jit_functions    </text>
-<text text-anchor="start" x="6382.1094" y="-2661.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2620.5 6267,-2650.5 6606,-2650.5 6606,-2620.5 6267,-2620.5"/>
-<text text-anchor="start" x="6274" y="-2631.9" font-family="Arial" font-size="14.00" fill="#000000">jit_generation_time    </text>
-<text text-anchor="start" x="6426.4502" y="-2631.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2590.5 6267,-2620.5 6606,-2620.5 6606,-2590.5 6267,-2590.5"/>
-<text text-anchor="start" x="6274" y="-2601.9" font-family="Arial" font-size="14.00" fill="#000000">jit_inlining_count    </text>
-<text text-anchor="start" x="6411.669" y="-2601.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2560.5 6267,-2590.5 6606,-2590.5 6606,-2560.5 6267,-2560.5"/>
-<text text-anchor="start" x="6274" y="-2571.9" font-family="Arial" font-size="14.00" fill="#000000">jit_inlining_time    </text>
-<text text-anchor="start" x="6403.871" y="-2571.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2530.5 6267,-2560.5 6606,-2560.5 6606,-2530.5 6267,-2530.5"/>
-<text text-anchor="start" x="6274" y="-2541.9" font-family="Arial" font-size="14.00" fill="#000000">jit_optimization_count    </text>
-<text text-anchor="start" x="6442.7868" y="-2541.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2500.5 6267,-2530.5 6606,-2530.5 6606,-2500.5 6267,-2500.5"/>
-<text text-anchor="start" x="6274" y="-2511.9" font-family="Arial" font-size="14.00" fill="#000000">jit_optimization_time    </text>
-<text text-anchor="start" x="6434.9888" y="-2511.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2470.5 6267,-2500.5 6606,-2500.5 6606,-2470.5 6267,-2470.5"/>
-<text text-anchor="start" x="6274" y="-2481.9" font-family="Arial" font-size="14.00" fill="#000000">jit_emission_count    </text>
-<text text-anchor="start" x="6423.3338" y="-2481.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6267,-2440.5 6267,-2470.5 6606,-2470.5 6606,-2440.5 6267,-2440.5"/>
-<text text-anchor="start" x="6274" y="-2451.9" font-family="Arial" font-size="14.00" fill="#000000">jit_emission_time    </text>
-<text text-anchor="start" x="6415.5358" y="-2451.9" font-family="Arial" font-size="14.00" fill="#666666">[double precision]</text>
-</g>
-<!-- pgsodium.key -->
-<g id="node23" class="node">
-<title>pgsodium.key</title>
-<polygon fill="#efefef" stroke="transparent" points="6722,-2283.5 6722,-2318.5 6982,-2318.5 6982,-2283.5 6722,-2283.5"/>
-<polygon fill="none" stroke="#000000" points="6722,-2283.5 6722,-2318.5 6982,-2318.5 6982,-2283.5 6722,-2283.5"/>
-<text text-anchor="start" x="6732.7031" y="-2296.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.key</text>
-<text text-anchor="start" x="6843.7289" y="-2296.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="6877.9337" y="-2296.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="6722,-2253.5 6722,-2283.5 6982,-2283.5 6982,-2253.5 6722,-2253.5"/>
-<text text-anchor="start" x="6729" y="-2264.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="6774.094" y="-2264.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="6722,-2223.5 6722,-2253.5 6982,-2253.5 6982,-2223.5 6722,-2223.5"/>
-<text text-anchor="start" x="6729" y="-2234.9" font-family="Arial" font-size="14.00" fill="#000000">status    </text>
-<text text-anchor="start" x="6800.5512" y="-2234.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_status]</text>
-<polygon fill="none" stroke="#000000" points="6722,-2193.5 6722,-2223.5 6982,-2223.5 6982,-2193.5 6722,-2193.5"/>
-<text text-anchor="start" x="6728.7146" y="-2204.9" font-family="Arial" font-size="14.00" fill="#000000">created    </text>
-<text text-anchor="start" x="6809.601" y="-2204.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="6722,-2163.5 6722,-2193.5 6982,-2193.5 6982,-2163.5 6722,-2163.5"/>
-<text text-anchor="start" x="6729" y="-2174.9" font-family="Arial" font-size="14.00" fill="#000000">expires    </text>
-<text text-anchor="start" x="6808.3198" y="-2174.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="6722,-2133.5 6722,-2163.5 6982,-2163.5 6982,-2133.5 6722,-2133.5"/>
-<text text-anchor="start" x="6729" y="-2144.9" font-family="Arial" font-size="14.00" fill="#000000">key_type    </text>
-<text text-anchor="start" x="6819.2258" y="-2144.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_type]</text>
-<polygon fill="none" stroke="#000000" points="6722,-2103.5 6722,-2133.5 6982,-2133.5 6982,-2103.5 6722,-2103.5"/>
-<text text-anchor="start" x="6729" y="-2114.9" font-family="Arial" font-size="14.00" fill="#000000">key_id    </text>
-<text text-anchor="start" x="6803.6592" y="-2114.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="6722,-2073.5 6722,-2103.5 6982,-2103.5 6982,-2073.5 6722,-2073.5"/>
-<text text-anchor="start" x="6729" y="-2084.9" font-family="Arial" font-size="14.00" fill="#000000">key_context    </text>
-<text text-anchor="start" x="6837.899" y="-2084.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="6722,-2043.5 6722,-2073.5 6982,-2073.5 6982,-2043.5 6722,-2043.5"/>
-<text text-anchor="start" x="6729" y="-2054.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="6798.2132" y="-2054.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="6722,-2013.5 6722,-2043.5 6982,-2043.5 6982,-2013.5 6722,-2013.5"/>
-<text text-anchor="start" x="6729" y="-2024.9" font-family="Arial" font-size="14.00" fill="#000000">associated_data    </text>
-<text text-anchor="start" x="6865.136" y="-2024.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="6722,-1983.5 6722,-2013.5 6982,-2013.5 6982,-1983.5 6722,-1983.5"/>
-<text text-anchor="start" x="6729" y="-1994.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key    </text>
-<text text-anchor="start" x="6815.3198" y="-1994.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="6722,-1953.5 6722,-1983.5 6982,-1983.5 6982,-1953.5 6722,-1953.5"/>
-<text text-anchor="start" x="6729" y="-1964.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key_nonce    </text>
-<text text-anchor="start" x="6861.2328" y="-1964.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="6722,-1923.5 6722,-1953.5 6982,-1953.5 6982,-1923.5 6722,-1923.5"/>
-<text text-anchor="start" x="6729" y="-1934.9" font-family="Arial" font-size="14.00" fill="#000000">parent_key    </text>
-<text text-anchor="start" x="6832.4516" y="-1934.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="6722,-1893.5 6722,-1923.5 6982,-1923.5 6982,-1893.5 6722,-1893.5"/>
-<text text-anchor="start" x="6729" y="-1904.9" font-family="Arial" font-size="14.00" fill="#000000">comment    </text>
-<text text-anchor="start" x="6820.7644" y="-1904.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="6722,-1863.5 6722,-1893.5 6982,-1893.5 6982,-1863.5 6722,-1863.5"/>
-<text text-anchor="start" x="6729" y="-1874.9" font-family="Arial" font-size="14.00" fill="#000000">user_data    </text>
-<text text-anchor="start" x="6825.4516" y="-1874.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-</g>
-<!-- pgsodium.key&#45;&gt;pgsodium.key -->
-<g id="edge12" class="edge">
-<title>pgsodium.key:parent_key&#45;&gt;pgsodium.key:id</title>
-<path fill="none" stroke="#000000" d="M6853.0163,-1964.0446C6860.9862,-2185.4032 6860.6474,-2703 6852,-2703 6843.2241,-2703 6843.0056,-2483.6786 6851.3444,-2283.7737"/>
-<polygon fill="#000000" stroke="#000000" points="6853.0044,-1963.7239 6857.1274,-1953.5626 6852.8175,-1958.7274 6852.6305,-1953.7308 6852.6305,-1953.7308 6852.6305,-1953.7308 6852.8175,-1958.7274 6848.1337,-1953.8991 6853.0044,-1963.7239 6853.0044,-1963.7239"/>
-<text text-anchor="start" x="6569.009" y="-1963.7308" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (parent_key) REFERENCES pgsodium.key(id)</text>
-</g>
-<!-- pgsodium.valid_key -->
-<g id="node24" class="node">
-<title>pgsodium.valid_key</title>
-<polygon fill="#efefef" stroke="transparent" points="7097,-3220.5 7097,-3255.5 7357,-3255.5 7357,-3220.5 7097,-3220.5"/>
-<polygon fill="none" stroke="#000000" points="7097,-3220.5 7097,-3255.5 7357,-3255.5 7357,-3220.5 7097,-3220.5"/>
-<text text-anchor="start" x="7109.1014" y="-3233.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.valid_key</text>
-<text text-anchor="start" x="7267.1342" y="-3233.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="7301.339" y="-3233.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="7097,-3190.5 7097,-3220.5 7357,-3220.5 7357,-3190.5 7097,-3190.5"/>
-<text text-anchor="start" x="7104" y="-3201.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="7149.094" y="-3201.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="7097,-3160.5 7097,-3190.5 7357,-3190.5 7357,-3160.5 7097,-3160.5"/>
-<text text-anchor="start" x="7104" y="-3171.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="7173.2132" y="-3171.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7097,-3130.5 7097,-3160.5 7357,-3160.5 7357,-3130.5 7097,-3130.5"/>
-<text text-anchor="start" x="7104" y="-3141.9" font-family="Arial" font-size="14.00" fill="#000000">status    </text>
-<text text-anchor="start" x="7175.5512" y="-3141.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_status]</text>
-<polygon fill="none" stroke="#000000" points="7097,-3100.5 7097,-3130.5 7357,-3130.5 7357,-3100.5 7097,-3100.5"/>
-<text text-anchor="start" x="7104" y="-3111.9" font-family="Arial" font-size="14.00" fill="#000000">key_type    </text>
-<text text-anchor="start" x="7194.2258" y="-3111.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_type]</text>
-<polygon fill="none" stroke="#000000" points="7097,-3070.5 7097,-3100.5 7357,-3100.5 7357,-3070.5 7097,-3070.5"/>
-<text text-anchor="start" x="7104" y="-3081.9" font-family="Arial" font-size="14.00" fill="#000000">key_id    </text>
-<text text-anchor="start" x="7178.6592" y="-3081.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="7097,-3040.5 7097,-3070.5 7357,-3070.5 7357,-3040.5 7097,-3040.5"/>
-<text text-anchor="start" x="7104" y="-3051.9" font-family="Arial" font-size="14.00" fill="#000000">key_context    </text>
-<text text-anchor="start" x="7212.899" y="-3051.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="7097,-3010.5 7097,-3040.5 7357,-3040.5 7357,-3010.5 7097,-3010.5"/>
-<text text-anchor="start" x="7103.7146" y="-3021.9" font-family="Arial" font-size="14.00" fill="#000000">created    </text>
-<text text-anchor="start" x="7184.601" y="-3021.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="7097,-2980.5 7097,-3010.5 7357,-3010.5 7357,-2980.5 7097,-2980.5"/>
-<text text-anchor="start" x="7104" y="-2991.9" font-family="Arial" font-size="14.00" fill="#000000">expires    </text>
-<text text-anchor="start" x="7183.3198" y="-2991.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="7097,-2950.5 7097,-2980.5 7357,-2980.5 7357,-2950.5 7097,-2950.5"/>
-<text text-anchor="start" x="7104" y="-2961.9" font-family="Arial" font-size="14.00" fill="#000000">associated_data    </text>
-<text text-anchor="start" x="7240.136" y="-2961.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-</g>
-<!-- pgsodium.masking_rule -->
-<g id="node25" class="node">
-<title>pgsodium.masking_rule</title>
-<polygon fill="#efefef" stroke="transparent" points="7462,-3295.5 7462,-3330.5 7743,-3330.5 7743,-3295.5 7462,-3295.5"/>
-<polygon fill="none" stroke="#000000" points="7462,-3295.5 7462,-3330.5 7743,-3330.5 7743,-3295.5 7462,-3295.5"/>
-<text text-anchor="start" x="7468.603" y="-3308.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.masking_rule</text>
-<text text-anchor="start" x="7658.6326" y="-3308.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="7692.8374" y="-3308.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="7462,-3265.5 7462,-3295.5 7743,-3295.5 7743,-3265.5 7462,-3265.5"/>
-<text text-anchor="start" x="7469" y="-3276.9" font-family="Arial" font-size="14.00" fill="#000000">attrelid    </text>
-<text text-anchor="start" x="7545.2076" y="-3276.9" font-family="Arial" font-size="14.00" fill="#666666">[oid]</text>
-<polygon fill="none" stroke="#000000" points="7462,-3235.5 7462,-3265.5 7743,-3265.5 7743,-3235.5 7462,-3235.5"/>
-<text text-anchor="start" x="7469" y="-3246.9" font-family="Arial" font-size="14.00" fill="#000000">attnum    </text>
-<text text-anchor="start" x="7545.9944" y="-3246.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="7462,-3205.5 7462,-3235.5 7743,-3235.5 7743,-3205.5 7462,-3205.5"/>
-<text text-anchor="start" x="7469" y="-3216.9" font-family="Arial" font-size="14.00" fill="#000000">relnamespace    </text>
-<text text-anchor="start" x="7591.1108" y="-3216.9" font-family="Arial" font-size="14.00" fill="#666666">[regnamespace]</text>
-<polygon fill="none" stroke="#000000" points="7462,-3175.5 7462,-3205.5 7743,-3205.5 7743,-3175.5 7462,-3175.5"/>
-<text text-anchor="start" x="7469" y="-3186.9" font-family="Arial" font-size="14.00" fill="#000000">relname    </text>
-<text text-anchor="start" x="7553.763" y="-3186.9" font-family="Arial" font-size="14.00" fill="#666666">[name]</text>
-<polygon fill="none" stroke="#000000" points="7462,-3145.5 7462,-3175.5 7743,-3175.5 7743,-3145.5 7462,-3145.5"/>
-<text text-anchor="start" x="7469" y="-3156.9" font-family="Arial" font-size="14.00" fill="#000000">attname    </text>
-<text text-anchor="start" x="7553.777" y="-3156.9" font-family="Arial" font-size="14.00" fill="#666666">[name]</text>
-<polygon fill="none" stroke="#000000" points="7462,-3115.5 7462,-3145.5 7743,-3145.5 7743,-3115.5 7462,-3115.5"/>
-<text text-anchor="start" x="7469" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">format_type    </text>
-<text text-anchor="start" x="7577.1108" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7462,-3085.5 7462,-3115.5 7743,-3115.5 7743,-3085.5 7462,-3085.5"/>
-<text text-anchor="start" x="7469" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">col_description    </text>
-<text text-anchor="start" x="7596.554" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7462,-3055.5 7462,-3085.5 7743,-3085.5 7743,-3055.5 7462,-3055.5"/>
-<text text-anchor="start" x="7469" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">key_id_column    </text>
-<text text-anchor="start" x="7596.5568" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7462,-3025.5 7462,-3055.5 7743,-3055.5 7743,-3025.5 7462,-3025.5"/>
-<text text-anchor="start" x="7469" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">key_id    </text>
-<text text-anchor="start" x="7543.6592" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7462,-2995.5 7462,-3025.5 7743,-3025.5 7743,-2995.5 7462,-2995.5"/>
-<text text-anchor="start" x="7469" y="-3006.9" font-family="Arial" font-size="14.00" fill="#000000">associated_columns    </text>
-<text text-anchor="start" x="7630.0126" y="-3006.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7462,-2965.5 7462,-2995.5 7743,-2995.5 7743,-2965.5 7462,-2965.5"/>
-<text text-anchor="start" x="7469" y="-2976.9" font-family="Arial" font-size="14.00" fill="#000000">nonce_column    </text>
-<text text-anchor="start" x="7594.2328" y="-2976.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7462,-2935.5 7462,-2965.5 7743,-2965.5 7743,-2935.5 7462,-2935.5"/>
-<text text-anchor="start" x="7469" y="-2946.9" font-family="Arial" font-size="14.00" fill="#000000">view_name    </text>
-<text text-anchor="start" x="7573.9916" y="-2946.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7462,-2905.5 7462,-2935.5 7743,-2935.5 7743,-2905.5 7462,-2905.5"/>
-<text text-anchor="start" x="7469" y="-2916.9" font-family="Arial" font-size="14.00" fill="#000000">priority    </text>
-<text text-anchor="start" x="7545.195" y="-2916.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="7462,-2875.5 7462,-2905.5 7743,-2905.5 7743,-2875.5 7462,-2875.5"/>
-<text text-anchor="start" x="7469" y="-2886.9" font-family="Arial" font-size="14.00" fill="#000000">security_invoker    </text>
-<text text-anchor="start" x="7604.3254" y="-2886.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-</g>
-<!-- pgsodium.mask_columns -->
-<g id="node26" class="node">
-<title>pgsodium.mask_columns</title>
-<polygon fill="#efefef" stroke="transparent" points="7847,-3190.5 7847,-3225.5 8141,-3225.5 8141,-3190.5 7847,-3190.5"/>
-<polygon fill="none" stroke="#000000" points="7847,-3190.5 7847,-3225.5 8141,-3225.5 8141,-3190.5 7847,-3190.5"/>
-<text text-anchor="start" x="7853.6032" y="-3203.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.mask_columns</text>
-<text text-anchor="start" x="8056.6324" y="-3203.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="8090.8372" y="-3203.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="7847,-3160.5 7847,-3190.5 8141,-3190.5 8141,-3160.5 7847,-3160.5"/>
-<text text-anchor="start" x="7854" y="-3171.9" font-family="Arial" font-size="14.00" fill="#000000">attname    </text>
-<text text-anchor="start" x="7938.777" y="-3171.9" font-family="Arial" font-size="14.00" fill="#666666">[name]</text>
-<polygon fill="none" stroke="#000000" points="7847,-3130.5 7847,-3160.5 8141,-3160.5 8141,-3130.5 7847,-3130.5"/>
-<text text-anchor="start" x="7854" y="-3141.9" font-family="Arial" font-size="14.00" fill="#000000">attrelid    </text>
-<text text-anchor="start" x="7930.2076" y="-3141.9" font-family="Arial" font-size="14.00" fill="#666666">[oid]</text>
-<polygon fill="none" stroke="#000000" points="7847,-3100.5 7847,-3130.5 8141,-3130.5 8141,-3100.5 7847,-3100.5"/>
-<text text-anchor="start" x="7854" y="-3111.9" font-family="Arial" font-size="14.00" fill="#000000">key_id    </text>
-<text text-anchor="start" x="7928.6592" y="-3111.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7847,-3070.5 7847,-3100.5 8141,-3100.5 8141,-3070.5 7847,-3070.5"/>
-<text text-anchor="start" x="7854" y="-3081.9" font-family="Arial" font-size="14.00" fill="#000000">key_id_column    </text>
-<text text-anchor="start" x="7981.5568" y="-3081.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7847,-3040.5 7847,-3070.5 8141,-3070.5 8141,-3040.5 7847,-3040.5"/>
-<text text-anchor="start" x="7854" y="-3051.9" font-family="Arial" font-size="14.00" fill="#000000">associated_columns    </text>
-<text text-anchor="start" x="8015.0126" y="-3051.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7847,-3010.5 7847,-3040.5 8141,-3040.5 8141,-3010.5 7847,-3010.5"/>
-<text text-anchor="start" x="7854" y="-3021.9" font-family="Arial" font-size="14.00" fill="#000000">nonce_column    </text>
-<text text-anchor="start" x="7979.2328" y="-3021.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="7847,-2980.5 7847,-3010.5 8141,-3010.5 8141,-2980.5 7847,-2980.5"/>
-<text text-anchor="start" x="7854" y="-2991.9" font-family="Arial" font-size="14.00" fill="#000000">format_type    </text>
-<text text-anchor="start" x="7962.1108" y="-2991.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-</g>
-<!-- pgsodium.decrypted_key -->
-<g id="node27" class="node">
-<title>pgsodium.decrypted_key</title>
-<polygon fill="#efefef" stroke="transparent" points="8246,-3295.5 8246,-3330.5 8537,-3330.5 8537,-3295.5 8246,-3295.5"/>
-<polygon fill="none" stroke="#000000" points="8246,-3295.5 8246,-3330.5 8537,-3330.5 8537,-3295.5 8246,-3295.5"/>
-<text text-anchor="start" x="8252.5891" y="-3308.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.decrypted_key</text>
-<text text-anchor="start" x="8452.6465" y="-3308.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="8486.8513" y="-3308.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="8246,-3265.5 8246,-3295.5 8537,-3295.5 8537,-3265.5 8246,-3265.5"/>
-<text text-anchor="start" x="8253" y="-3276.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="8298.094" y="-3276.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="8246,-3235.5 8246,-3265.5 8537,-3265.5 8537,-3235.5 8246,-3235.5"/>
-<text text-anchor="start" x="8253" y="-3246.9" font-family="Arial" font-size="14.00" fill="#000000">status    </text>
-<text text-anchor="start" x="8324.5512" y="-3246.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_status]</text>
-<polygon fill="none" stroke="#000000" points="8246,-3205.5 8246,-3235.5 8537,-3235.5 8537,-3205.5 8246,-3205.5"/>
-<text text-anchor="start" x="8253" y="-3216.9" font-family="Arial" font-size="14.00" fill="#000000">created    </text>
-<text text-anchor="start" x="8333.8864" y="-3216.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="8246,-3175.5 8246,-3205.5 8537,-3205.5 8537,-3175.5 8246,-3175.5"/>
-<text text-anchor="start" x="8253" y="-3186.9" font-family="Arial" font-size="14.00" fill="#000000">expires    </text>
-<text text-anchor="start" x="8332.3198" y="-3186.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="8246,-3145.5 8246,-3175.5 8537,-3175.5 8537,-3145.5 8246,-3145.5"/>
-<text text-anchor="start" x="8253" y="-3156.9" font-family="Arial" font-size="14.00" fill="#000000">key_type    </text>
-<text text-anchor="start" x="8343.2258" y="-3156.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_type]</text>
-<polygon fill="none" stroke="#000000" points="8246,-3115.5 8246,-3145.5 8537,-3145.5 8537,-3115.5 8246,-3115.5"/>
-<text text-anchor="start" x="8253" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">key_id    </text>
-<text text-anchor="start" x="8327.6592" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="8246,-3085.5 8246,-3115.5 8537,-3115.5 8537,-3085.5 8246,-3085.5"/>
-<text text-anchor="start" x="8253" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">key_context    </text>
-<text text-anchor="start" x="8361.899" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="8246,-3055.5 8246,-3085.5 8537,-3085.5 8537,-3055.5 8246,-3055.5"/>
-<text text-anchor="start" x="8253" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="8322.2132" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="8246,-3025.5 8246,-3055.5 8537,-3055.5 8537,-3025.5 8246,-3025.5"/>
-<text text-anchor="start" x="8253" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">associated_data    </text>
-<text text-anchor="start" x="8389.136" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="8246,-2995.5 8246,-3025.5 8537,-3025.5 8537,-2995.5 8246,-2995.5"/>
-<text text-anchor="start" x="8253" y="-3006.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key    </text>
-<text text-anchor="start" x="8339.3198" y="-3006.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="8246,-2965.5 8246,-2995.5 8537,-2995.5 8537,-2965.5 8246,-2965.5"/>
-<text text-anchor="start" x="8253" y="-2976.9" font-family="Arial" font-size="14.00" fill="#000000">decrypted_raw_key    </text>
-<text text-anchor="start" x="8408.5666" y="-2976.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="8246,-2935.5 8246,-2965.5 8537,-2965.5 8537,-2935.5 8246,-2935.5"/>
-<text text-anchor="start" x="8253" y="-2946.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key_nonce    </text>
-<text text-anchor="start" x="8385.2328" y="-2946.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="8246,-2905.5 8246,-2935.5 8537,-2935.5 8537,-2905.5 8246,-2905.5"/>
-<text text-anchor="start" x="8253" y="-2916.9" font-family="Arial" font-size="14.00" fill="#000000">parent_key    </text>
-<text text-anchor="start" x="8356.4516" y="-2916.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="8246,-2875.5 8246,-2905.5 8537,-2905.5 8537,-2875.5 8246,-2875.5"/>
-<text text-anchor="start" x="8253" y="-2886.9" font-family="Arial" font-size="14.00" fill="#000000">comment    </text>
-<text text-anchor="start" x="8344.7644" y="-2886.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-</g>
-<!-- vault.secrets -->
-<g id="node28" class="node">
-<title>vault.secrets</title>
-<polygon fill="#efefef" stroke="transparent" points="6710,-3205.5 6710,-3240.5 6993,-3240.5 6993,-3205.5 6710,-3205.5"/>
-<polygon fill="none" stroke="#000000" points="6710,-3205.5 6710,-3240.5 6993,-3240.5 6993,-3205.5 6710,-3205.5"/>
-<text text-anchor="start" x="6737.2071" y="-3218.3" font-family="Arial Bold" font-size="18.00" fill="#000000">vault.secrets</text>
-<text text-anchor="start" x="6838.2249" y="-3218.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="6872.4297" y="-3218.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="6710,-3175.5 6710,-3205.5 6993,-3205.5 6993,-3175.5 6710,-3175.5"/>
-<text text-anchor="start" x="6717" y="-3186.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="6762.094" y="-3186.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="6710,-3145.5 6710,-3175.5 6993,-3175.5 6993,-3145.5 6710,-3145.5"/>
-<text text-anchor="start" x="6717" y="-3156.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="6786.2132" y="-3156.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="6710,-3115.5 6710,-3145.5 6993,-3145.5 6993,-3115.5 6710,-3115.5"/>
-<text text-anchor="start" x="6717" y="-3126.9" font-family="Arial" font-size="14.00" fill="#000000">description    </text>
-<text text-anchor="start" x="6818.8822" y="-3126.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="6710,-3085.5 6710,-3115.5 6993,-3115.5 6993,-3085.5 6710,-3085.5"/>
-<text text-anchor="start" x="6717" y="-3096.9" font-family="Arial" font-size="14.00" fill="#000000">secret    </text>
-<text text-anchor="start" x="6789.3212" y="-3096.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="6710,-3055.5 6710,-3085.5 6993,-3085.5 6993,-3055.5 6710,-3055.5"/>
-<text text-anchor="start" x="6717" y="-3066.9" font-family="Arial" font-size="14.00" fill="#000000">key_id    </text>
-<text text-anchor="start" x="6791.6592" y="-3066.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="6710,-3025.5 6710,-3055.5 6993,-3055.5 6993,-3025.5 6710,-3025.5"/>
-<text text-anchor="start" x="6717" y="-3036.9" font-family="Arial" font-size="14.00" fill="#000000">nonce    </text>
-<text text-anchor="start" x="6789.3352" y="-3036.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="6710,-2995.5 6710,-3025.5 6993,-3025.5 6993,-2995.5 6710,-2995.5"/>
-<text text-anchor="start" x="6717" y="-3006.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="6817.3422" y="-3006.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="6710,-2965.5 6710,-2995.5 6993,-2995.5 6993,-2965.5 6710,-2965.5"/>
-<text text-anchor="start" x="6716.5344" y="-2976.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="6820.7812" y="-2976.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- vault.secrets&#45;&gt;pgsodium.key -->
-<g id="edge13" class="edge">
-<title>vault.secrets:key_id&#45;&gt;pgsodium.key:id</title>
-<path fill="none" stroke="#000000" d="M7003.0792,-3069.5941C7156.1577,-3039.4778 6537.5523,-2268.5 6722,-2268.5"/>
-<polygon fill="#000000" stroke="#000000" points="7002.9599,-3069.6048 6992.5971,-3066.0181 6997.9799,-3070.0524 6993,-3070.5 6993,-3070.5 6993,-3070.5 6997.9799,-3070.0524 6993.4029,-3074.9819 7002.9599,-3069.6048 7002.9599,-3069.6048"/>
-<text text-anchor="start" x="6864.6615" y="-3054.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (key_id) REFERENCES pgsodium.key(id)</text>
-</g>
-<!-- vault.decrypted_secrets -->
-<g id="node29" class="node">
-<title>vault.decrypted_secrets</title>
-<polygon fill="#efefef" stroke="transparent" points="8641,-3220.5 8641,-3255.5 8924,-3255.5 8924,-3220.5 8641,-3220.5"/>
-<polygon fill="none" stroke="#000000" points="8641,-3220.5 8641,-3255.5 8924,-3255.5 8924,-3220.5 8641,-3220.5"/>
-<text text-anchor="start" x="8648.5931" y="-3233.3" font-family="Arial Bold" font-size="18.00" fill="#000000">vault.decrypted_secrets</text>
-<text text-anchor="start" x="8838.6425" y="-3233.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="8872.8473" y="-3233.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="8641,-3190.5 8641,-3220.5 8924,-3220.5 8924,-3190.5 8641,-3190.5"/>
-<text text-anchor="start" x="8648" y="-3201.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="8693.094" y="-3201.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="8641,-3160.5 8641,-3190.5 8924,-3190.5 8924,-3160.5 8641,-3160.5"/>
-<text text-anchor="start" x="8648" y="-3171.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="8717.2132" y="-3171.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="8641,-3130.5 8641,-3160.5 8924,-3160.5 8924,-3130.5 8641,-3130.5"/>
-<text text-anchor="start" x="8648" y="-3141.9" font-family="Arial" font-size="14.00" fill="#000000">description    </text>
-<text text-anchor="start" x="8749.8822" y="-3141.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="8641,-3100.5 8641,-3130.5 8924,-3130.5 8924,-3100.5 8641,-3100.5"/>
-<text text-anchor="start" x="8648" y="-3111.9" font-family="Arial" font-size="14.00" fill="#000000">secret    </text>
-<text text-anchor="start" x="8720.3212" y="-3111.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="8641,-3070.5 8641,-3100.5 8924,-3100.5 8924,-3070.5 8641,-3070.5"/>
-<text text-anchor="start" x="8648" y="-3081.9" font-family="Arial" font-size="14.00" fill="#000000">decrypted_secret    </text>
-<text text-anchor="start" x="8789.568" y="-3081.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="8641,-3040.5 8641,-3070.5 8924,-3070.5 8924,-3040.5 8641,-3040.5"/>
-<text text-anchor="start" x="8648" y="-3051.9" font-family="Arial" font-size="14.00" fill="#000000">key_id    </text>
-<text text-anchor="start" x="8722.6592" y="-3051.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="8641,-3010.5 8641,-3040.5 8924,-3040.5 8924,-3010.5 8641,-3010.5"/>
-<text text-anchor="start" x="8648" y="-3021.9" font-family="Arial" font-size="14.00" fill="#000000">nonce    </text>
-<text text-anchor="start" x="8720.3352" y="-3021.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="8641,-2980.5 8641,-3010.5 8924,-3010.5 8924,-2980.5 8641,-2980.5"/>
-<text text-anchor="start" x="8648" y="-2991.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="8748.3422" y="-2991.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="8641,-2950.5 8641,-2980.5 8924,-2980.5 8924,-2950.5 8641,-2950.5"/>
-<text text-anchor="start" x="8647.5344" y="-2961.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="8751.7812" y="-2961.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/storage.buckets.md b/docs/database/storage.buckets.md
deleted file mode 100644
index 721b3da57..000000000
--- a/docs/database/storage.buckets.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# storage.buckets
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | text |  | false | [storage.objects](storage.objects.md) |  |  |
-| name | text |  | false |  |  |  |
-| owner | uuid |  | true |  | [auth.users](auth.users.md) |  |
-| created_at | timestamp with time zone | now() | true |  |  |  |
-| updated_at | timestamp with time zone | now() | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| buckets_owner_fkey | FOREIGN KEY | FOREIGN KEY (owner) REFERENCES auth.users(id) |
-| buckets_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| buckets_pkey | CREATE UNIQUE INDEX buckets_pkey ON storage.buckets USING btree (id) |
-| bname | CREATE UNIQUE INDEX bname ON storage.buckets USING btree (name) |
-
-## Relations
-
-![er](storage.buckets.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/storage.buckets.svg b/docs/database/storage.buckets.svg
deleted file mode 100644
index eb745c9e2..000000000
--- a/docs/database/storage.buckets.svg
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: storage.buckets Pages: 1 -->
-<svg width="682pt" height="1469pt"
- viewBox="0.00 0.00 682.00 1469.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1465)">
-<title>storage.buckets</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1465 678,-1465 678,4 -4,4"/>
-<!-- storage.buckets -->
-<g id="node1" class="node">
-<title>storage.buckets</title>
-<polygon fill="#efefef" stroke="transparent" points="86,-982.5 86,-1017.5 354,-1017.5 354,-982.5 86,-982.5"/>
-<polygon fill="none" stroke="#000000" points="86,-982.5 86,-1017.5 354,-1017.5 354,-982.5 86,-982.5"/>
-<text text-anchor="start" x="92.6949" y="-995.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.buckets</text>
-<text text-anchor="start" x="219.7371" y="-995.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="253.9419" y="-995.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="86,-952.5 86,-982.5 354,-982.5 354,-952.5 86,-952.5"/>
-<text text-anchor="start" x="93" y="-963.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="107.7798" y="-963.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="86,-922.5 86,-952.5 354,-952.5 354,-922.5 86,-922.5"/>
-<text text-anchor="start" x="93" y="-933.9" font-family="Arial" font-size="14.00" fill="#000000">name </text>
-<text text-anchor="start" x="131.899" y="-933.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="86,-892.5 86,-922.5 354,-922.5 354,-892.5 86,-892.5"/>
-<text text-anchor="start" x="93" y="-903.9" font-family="Arial" font-size="14.00" fill="#000000">owner </text>
-<text text-anchor="start" x="135.0056" y="-903.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="86,-862.5 86,-892.5 354,-892.5 354,-862.5 86,-862.5"/>
-<text text-anchor="start" x="93" y="-873.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="163.028" y="-873.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="86,-832.5 86,-862.5 354,-862.5 354,-832.5 86,-832.5"/>
-<text text-anchor="start" x="93" y="-843.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at </text>
-<text text-anchor="start" x="166.9326" y="-843.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="84.5,-831.5 84.5,-1019.5 355.5,-1019.5 355.5,-831.5 84.5,-831.5"/>
-</g>
-<!-- auth.users -->
-<g id="node3" class="node">
-<title>auth.users</title>
-<polygon fill="#efefef" stroke="transparent" points="43,-672.5 43,-707.5 397,-707.5 397,-672.5 43,-672.5"/>
-<polygon fill="none" stroke="#000000" points="43,-672.5 43,-707.5 397,-707.5 397,-672.5 43,-672.5"/>
-<text text-anchor="start" x="114.2022" y="-685.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.users</text>
-<text text-anchor="start" x="198.2298" y="-685.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="232.4346" y="-685.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="43,-642.5 43,-672.5 397,-672.5 397,-642.5 43,-642.5"/>
-<text text-anchor="start" x="50" y="-653.9" font-family="Arial" font-size="14.00" fill="#000000">instance_id    </text>
-<text text-anchor="start" x="155.0042" y="-653.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43,-612.5 43,-642.5 397,-642.5 397,-612.5 43,-612.5"/>
-<text text-anchor="start" x="50" y="-623.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="95.094" y="-623.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43,-582.5 43,-612.5 397,-612.5 397,-582.5 43,-582.5"/>
-<text text-anchor="start" x="50" y="-593.9" font-family="Arial" font-size="14.00" fill="#000000">aud    </text>
-<text text-anchor="start" x="107.5526" y="-593.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="43,-552.5 43,-582.5 397,-582.5 397,-552.5 43,-552.5"/>
-<text text-anchor="start" x="50" y="-563.9" font-family="Arial" font-size="14.00" fill="#000000">role    </text>
-<text text-anchor="start" x="107.5372" y="-563.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="43,-522.5 43,-552.5 397,-552.5 397,-522.5 43,-522.5"/>
-<text text-anchor="start" x="50" y="-533.9" font-family="Arial" font-size="14.00" fill="#000000">email    </text>
-<text text-anchor="start" x="117.6438" y="-533.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="43,-492.5 43,-522.5 397,-522.5 397,-492.5 43,-492.5"/>
-<text text-anchor="start" x="50" y="-503.9" font-family="Arial" font-size="14.00" fill="#000000">encrypted_password    </text>
-<text text-anchor="start" x="213.3492" y="-503.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="43,-462.5 43,-492.5 397,-492.5 397,-462.5 43,-462.5"/>
-<text text-anchor="start" x="50" y="-473.9" font-family="Arial" font-size="14.00" fill="#000000">confirmed_at    </text>
-<text text-anchor="start" x="165.1094" y="-473.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43,-432.5 43,-462.5 397,-462.5 397,-432.5 43,-432.5"/>
-<text text-anchor="start" x="50" y="-443.9" font-family="Arial" font-size="14.00" fill="#000000">invited_at    </text>
-<text text-anchor="start" x="144.1122" y="-443.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43,-402.5 43,-432.5 397,-432.5 397,-402.5 43,-402.5"/>
-<text text-anchor="start" x="50" y="-413.9" font-family="Arial" font-size="14.00" fill="#000000">confirmation_token    </text>
-<text text-anchor="start" x="202.4544" y="-413.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="43,-372.5 43,-402.5 397,-402.5 397,-372.5 43,-372.5"/>
-<text text-anchor="start" x="50" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">confirmation_sent_at    </text>
-<text text-anchor="start" x="214.1276" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43,-342.5 43,-372.5 397,-372.5 397,-342.5 43,-342.5"/>
-<text text-anchor="start" x="50" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">recovery_token    </text>
-<text text-anchor="start" x="179.8948" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="43,-312.5 43,-342.5 397,-342.5 397,-312.5 43,-312.5"/>
-<text text-anchor="start" x="50" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">recovery_sent_at    </text>
-<text text-anchor="start" x="191.568" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43,-282.5 43,-312.5 397,-312.5 397,-282.5 43,-282.5"/>
-<text text-anchor="start" x="50" y="-293.9" font-family="Arial" font-size="14.00" fill="#000000">email_change_token    </text>
-<text text-anchor="start" x="213.3604" y="-293.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="43,-252.5 43,-282.5 397,-282.5 397,-252.5 43,-252.5"/>
-<text text-anchor="start" x="50" y="-263.9" font-family="Arial" font-size="14.00" fill="#000000">email_change    </text>
-<text text-anchor="start" x="171.3394" y="-263.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="43,-222.5 43,-252.5 397,-252.5 397,-222.5 43,-222.5"/>
-<text text-anchor="start" x="49.641" y="-233.9" font-family="Arial" font-size="14.00" fill="#000000">email_change_sent_at    </text>
-<text text-anchor="start" x="224.6746" y="-233.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43,-192.5 43,-222.5 397,-222.5 397,-192.5 43,-192.5"/>
-<text text-anchor="start" x="50" y="-203.9" font-family="Arial" font-size="14.00" fill="#000000">last_sign_in_at    </text>
-<text text-anchor="start" x="177.5666" y="-203.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43,-162.5 43,-192.5 397,-192.5 397,-162.5 43,-162.5"/>
-<text text-anchor="start" x="50" y="-173.9" font-family="Arial" font-size="14.00" fill="#000000">raw_app_meta_data    </text>
-<text text-anchor="start" x="211.805" y="-173.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43,-132.5 43,-162.5 397,-162.5 397,-132.5 43,-132.5"/>
-<text text-anchor="start" x="50" y="-143.9" font-family="Arial" font-size="14.00" fill="#000000">raw_user_meta_data    </text>
-<text text-anchor="start" x="215.683" y="-143.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="43,-102.5 43,-132.5 397,-132.5 397,-102.5 43,-102.5"/>
-<text text-anchor="start" x="50" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">is_super_admin    </text>
-<text text-anchor="start" x="183" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="43,-72.5 43,-102.5 397,-102.5 397,-72.5 43,-72.5"/>
-<text text-anchor="start" x="50" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="150.3422" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43,-42.5 43,-72.5 397,-72.5 397,-42.5 43,-42.5"/>
-<text text-anchor="start" x="50" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="154.2468" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- storage.buckets&#45;&gt;auth.users -->
-<g id="edge2" class="edge">
-<title>storage.buckets:owner&#45;&gt;auth.users:id</title>
-<path fill="none" stroke="#000000" d="M363.7801,-905.2462C421.1922,-878.7474 456.632,-627.5 397,-627.5"/>
-<polygon fill="#000000" stroke="#000000" points="363.7446,-905.2543 352.9894,-903.1149 358.8723,-906.3771 354,-907.5 354,-907.5 354,-907.5 358.8723,-906.3771 355.0106,-911.8851 363.7446,-905.2543 363.7446,-905.2543"/>
-<text text-anchor="start" x="360.9965" y="-917.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (owner) REFERENCES auth.users(id)</text>
-</g>
-<!-- storage.objects -->
-<g id="node2" class="node">
-<title>storage.objects</title>
-<polygon fill="#efefef" stroke="transparent" points="59,-1382.5 59,-1417.5 381,-1417.5 381,-1382.5 59,-1382.5"/>
-<polygon fill="none" stroke="#000000" points="59,-1382.5 59,-1417.5 381,-1417.5 381,-1382.5 59,-1382.5"/>
-<text text-anchor="start" x="95.1978" y="-1395.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.objects</text>
-<text text-anchor="start" x="217.2342" y="-1395.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="251.439" y="-1395.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="59,-1352.5 59,-1382.5 381,-1382.5 381,-1352.5 59,-1352.5"/>
-<text text-anchor="start" x="66" y="-1363.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="111.094" y="-1363.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="59,-1322.5 59,-1352.5 381,-1352.5 381,-1322.5 59,-1322.5"/>
-<text text-anchor="start" x="66" y="-1333.9" font-family="Arial" font-size="14.00" fill="#000000">bucket_id    </text>
-<text text-anchor="start" x="160.115" y="-1333.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="59,-1292.5 59,-1322.5 381,-1322.5 381,-1292.5 59,-1292.5"/>
-<text text-anchor="start" x="66" y="-1303.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="135.2132" y="-1303.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="59,-1262.5 59,-1292.5 381,-1292.5 381,-1262.5 59,-1262.5"/>
-<text text-anchor="start" x="66" y="-1273.9" font-family="Arial" font-size="14.00" fill="#000000">owner    </text>
-<text text-anchor="start" x="138.3198" y="-1273.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="59,-1232.5 59,-1262.5 381,-1262.5 381,-1232.5 59,-1232.5"/>
-<text text-anchor="start" x="66" y="-1243.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="166.3422" y="-1243.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="59,-1202.5 59,-1232.5 381,-1232.5 381,-1202.5 59,-1202.5"/>
-<text text-anchor="start" x="66" y="-1213.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="170.2468" y="-1213.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="59,-1172.5 59,-1202.5 381,-1202.5 381,-1172.5 59,-1172.5"/>
-<text text-anchor="start" x="65.9811" y="-1183.9" font-family="Arial" font-size="14.00" fill="#000000">last_accessed_at    </text>
-<text text-anchor="start" x="208.3345" y="-1183.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="59,-1142.5 59,-1172.5 381,-1172.5 381,-1142.5 59,-1142.5"/>
-<text text-anchor="start" x="66" y="-1153.9" font-family="Arial" font-size="14.00" fill="#000000">metadata    </text>
-<text text-anchor="start" x="158.5596" y="-1153.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-</g>
-<!-- storage.objects&#45;&gt;storage.buckets -->
-<g id="edge1" class="edge">
-<title>storage.objects:bucket_id&#45;&gt;storage.buckets:id</title>
-<path fill="none" stroke="#000000" d="M391.0252,-1335.5093C461.0182,-1306.3863 432.8985,-967.5 354,-967.5"/>
-<polygon fill="#000000" stroke="#000000" points="390.8085,-1335.5523 380.1235,-1333.0862 385.9042,-1336.5261 381,-1337.5 381,-1337.5 381,-1337.5 385.9042,-1336.5261 381.8765,-1341.9138 390.8085,-1335.5523 390.8085,-1335.5523"/>
-<text text-anchor="start" x="388.264" y="-1347.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (bucket_id) REFERENCES storage.buckets(id)</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/storage.migrations.md b/docs/database/storage.migrations.md
deleted file mode 100644
index 2d9064cfd..000000000
--- a/docs/database/storage.migrations.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# storage.migrations
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | integer |  | false |  |  |  |
-| name | varchar(100) |  | false |  |  |  |
-| hash | varchar(40) |  | false |  |  |  |
-| executed_at | timestamp without time zone | CURRENT_TIMESTAMP | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| migrations_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-| migrations_name_key | UNIQUE | UNIQUE (name) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| migrations_pkey | CREATE UNIQUE INDEX migrations_pkey ON storage.migrations USING btree (id) |
-| migrations_name_key | CREATE UNIQUE INDEX migrations_name_key ON storage.migrations USING btree (name) |
-
-## Relations
-
-![er](storage.migrations.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/storage.migrations.svg b/docs/database/storage.migrations.svg
deleted file mode 100644
index 4b38ba13d..000000000
--- a/docs/database/storage.migrations.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: storage.migrations Pages: 1 -->
-<svg width="389pt" height="255pt"
- viewBox="0.00 0.00 389.00 255.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 251)">
-<title>storage.migrations</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-251 385,-251 385,4 -4,4"/>
-<!-- storage.migrations -->
-<g id="node1" class="node">
-<title>storage.migrations</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-165.5 46.5,-200.5 335.5,-200.5 335.5,-165.5 46.5,-165.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-200.5 335.5,-200.5 335.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.2054" y="-178.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.migrations</text>
-<text text-anchor="start" x="201.2266" y="-178.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="235.4314" y="-178.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 335.5,-165.5 335.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="68.2798" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 335.5,-135.5 335.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">name </text>
-<text text-anchor="start" x="92.399" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(100)]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 335.5,-105.5 335.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">hash </text>
-<text text-anchor="start" x="87.7384" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(40)]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 335.5,-75.5 335.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">executed_at </text>
-<text text-anchor="start" x="133.65" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp without time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-202.5 336.5,-202.5 336.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/storage.objects.md b/docs/database/storage.objects.md
deleted file mode 100644
index 521b2a999..000000000
--- a/docs/database/storage.objects.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# storage.objects
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid | uuid_generate_v4() | false |  |  |  |
-| bucket_id | text |  | true |  | [storage.buckets](storage.buckets.md) |  |
-| name | text |  | true |  |  |  |
-| owner | uuid |  | true |  | [auth.users](auth.users.md) |  |
-| created_at | timestamp with time zone | now() | true |  |  |  |
-| updated_at | timestamp with time zone | now() | true |  |  |  |
-| last_accessed_at | timestamp with time zone | now() | true |  |  |  |
-| metadata | jsonb |  | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| objects_owner_fkey | FOREIGN KEY | FOREIGN KEY (owner) REFERENCES auth.users(id) |
-| objects_bucketId_fkey | FOREIGN KEY | FOREIGN KEY (bucket_id) REFERENCES storage.buckets(id) |
-| objects_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| objects_pkey | CREATE UNIQUE INDEX objects_pkey ON storage.objects USING btree (id) |
-| bucketid_objname | CREATE UNIQUE INDEX bucketid_objname ON storage.objects USING btree (bucket_id, name) |
-| name_prefix_search | CREATE INDEX name_prefix_search ON storage.objects USING btree (name text_pattern_ops) |
-
-## Relations
-
-![er](storage.objects.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/storage.objects.svg b/docs/database/storage.objects.svg
deleted file mode 100644
index 0a9fcd470..000000000
--- a/docs/database/storage.objects.svg
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: storage.objects Pages: 1 -->
-<svg width="878pt" height="1162pt"
- viewBox="0.00 0.00 878.00 1162.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1158)">
-<title>storage.objects</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1158 874,-1158 874,4 -4,4"/>
-<!-- storage.objects -->
-<g id="node1" class="node">
-<title>storage.objects</title>
-<polygon fill="#efefef" stroke="transparent" points="293,-1072.5 293,-1107.5 584,-1107.5 584,-1072.5 293,-1072.5"/>
-<polygon fill="none" stroke="#000000" points="293,-1072.5 293,-1107.5 584,-1107.5 584,-1072.5 293,-1072.5"/>
-<text text-anchor="start" x="313.6978" y="-1085.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.objects</text>
-<text text-anchor="start" x="435.7342" y="-1085.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="469.939" y="-1085.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="293,-1042.5 293,-1072.5 584,-1072.5 584,-1042.5 293,-1042.5"/>
-<text text-anchor="start" x="300" y="-1053.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="314.7798" y="-1053.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="293,-1012.5 293,-1042.5 584,-1042.5 584,-1012.5 293,-1012.5"/>
-<text text-anchor="start" x="300" y="-1023.9" font-family="Arial" font-size="14.00" fill="#000000">bucket_id </text>
-<text text-anchor="start" x="363.8008" y="-1023.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="293,-982.5 293,-1012.5 584,-1012.5 584,-982.5 293,-982.5"/>
-<text text-anchor="start" x="300" y="-993.9" font-family="Arial" font-size="14.00" fill="#000000">name </text>
-<text text-anchor="start" x="338.899" y="-993.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="293,-952.5 293,-982.5 584,-982.5 584,-952.5 293,-952.5"/>
-<text text-anchor="start" x="300" y="-963.9" font-family="Arial" font-size="14.00" fill="#000000">owner </text>
-<text text-anchor="start" x="342.0056" y="-963.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="293,-922.5 293,-952.5 584,-952.5 584,-922.5 293,-922.5"/>
-<text text-anchor="start" x="300" y="-933.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="370.028" y="-933.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="293,-892.5 293,-922.5 584,-922.5 584,-892.5 293,-892.5"/>
-<text text-anchor="start" x="300" y="-903.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at </text>
-<text text-anchor="start" x="373.9326" y="-903.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="293,-862.5 293,-892.5 584,-892.5 584,-862.5 293,-862.5"/>
-<text text-anchor="start" x="299.6382" y="-873.9" font-family="Arial" font-size="14.00" fill="#000000">last_accessed_at </text>
-<text text-anchor="start" x="411.6774" y="-873.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="293,-832.5 293,-862.5 584,-862.5 584,-832.5 293,-832.5"/>
-<text text-anchor="start" x="300" y="-843.9" font-family="Arial" font-size="14.00" fill="#000000">metadata </text>
-<text text-anchor="start" x="362.2454" y="-843.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="291,-831.5 291,-1109.5 585,-1109.5 585,-831.5 291,-831.5"/>
-</g>
-<!-- storage.buckets -->
-<g id="node2" class="node">
-<title>storage.buckets</title>
-<polygon fill="#efefef" stroke="transparent" points="86,-432.5 86,-467.5 369,-467.5 369,-432.5 86,-432.5"/>
-<polygon fill="none" stroke="#000000" points="86,-432.5 86,-467.5 369,-467.5 369,-432.5 86,-432.5"/>
-<text text-anchor="start" x="100.1949" y="-445.3" font-family="Arial Bold" font-size="18.00" fill="#000000">storage.buckets</text>
-<text text-anchor="start" x="227.2371" y="-445.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="261.4419" y="-445.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="86,-402.5 86,-432.5 369,-432.5 369,-402.5 86,-402.5"/>
-<text text-anchor="start" x="93" y="-413.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="138.094" y="-413.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="86,-372.5 86,-402.5 369,-402.5 369,-372.5 86,-372.5"/>
-<text text-anchor="start" x="93" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="162.2132" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="86,-342.5 86,-372.5 369,-372.5 369,-342.5 86,-342.5"/>
-<text text-anchor="start" x="93" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">owner    </text>
-<text text-anchor="start" x="165.3198" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="86,-312.5 86,-342.5 369,-342.5 369,-312.5 86,-312.5"/>
-<text text-anchor="start" x="93" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="193.3422" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="86,-282.5 86,-312.5 369,-312.5 369,-282.5 86,-282.5"/>
-<text text-anchor="start" x="92.5344" y="-293.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="196.7812" y="-293.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- storage.objects&#45;&gt;storage.buckets -->
-<g id="edge1" class="edge">
-<title>storage.objects:bucket_id&#45;&gt;storage.buckets:id</title>
-<path fill="none" stroke="#000000" d="M282.9864,-1026.1946C188.2843,-999.4826 360.8697,-571.1506 369,-511 374.5663,-469.8189 410.5556,-417.5 369,-417.5"/>
-<polygon fill="#000000" stroke="#000000" points="283.0839,-1026.2072 292.4182,-1031.9622 288.042,-1026.8536 293,-1027.5 293,-1027.5 293,-1027.5 288.042,-1026.8536 293.5818,-1023.0378 283.0839,-1026.2072 283.0839,-1026.2072"/>
-<text text-anchor="start" x="7.264" y="-1037.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (bucket_id) REFERENCES storage.buckets(id)</text>
-</g>
-<!-- auth.users -->
-<g id="node3" class="node">
-<title>auth.users</title>
-<polygon fill="#efefef" stroke="transparent" points="473,-672.5 473,-707.5 827,-707.5 827,-672.5 473,-672.5"/>
-<polygon fill="none" stroke="#000000" points="473,-672.5 473,-707.5 827,-707.5 827,-672.5 473,-672.5"/>
-<text text-anchor="start" x="544.2022" y="-685.3" font-family="Arial Bold" font-size="18.00" fill="#000000">auth.users</text>
-<text text-anchor="start" x="628.2298" y="-685.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="662.4346" y="-685.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="473,-642.5 473,-672.5 827,-672.5 827,-642.5 473,-642.5"/>
-<text text-anchor="start" x="480" y="-653.9" font-family="Arial" font-size="14.00" fill="#000000">instance_id    </text>
-<text text-anchor="start" x="585.0042" y="-653.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="473,-612.5 473,-642.5 827,-642.5 827,-612.5 473,-612.5"/>
-<text text-anchor="start" x="480" y="-623.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="525.094" y="-623.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="473,-582.5 473,-612.5 827,-612.5 827,-582.5 473,-582.5"/>
-<text text-anchor="start" x="480" y="-593.9" font-family="Arial" font-size="14.00" fill="#000000">aud    </text>
-<text text-anchor="start" x="537.5526" y="-593.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="473,-552.5 473,-582.5 827,-582.5 827,-552.5 473,-552.5"/>
-<text text-anchor="start" x="480" y="-563.9" font-family="Arial" font-size="14.00" fill="#000000">role    </text>
-<text text-anchor="start" x="537.5372" y="-563.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="473,-522.5 473,-552.5 827,-552.5 827,-522.5 473,-522.5"/>
-<text text-anchor="start" x="480" y="-533.9" font-family="Arial" font-size="14.00" fill="#000000">email    </text>
-<text text-anchor="start" x="547.6438" y="-533.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="473,-492.5 473,-522.5 827,-522.5 827,-492.5 473,-492.5"/>
-<text text-anchor="start" x="480" y="-503.9" font-family="Arial" font-size="14.00" fill="#000000">encrypted_password    </text>
-<text text-anchor="start" x="643.3492" y="-503.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="473,-462.5 473,-492.5 827,-492.5 827,-462.5 473,-462.5"/>
-<text text-anchor="start" x="480" y="-473.9" font-family="Arial" font-size="14.00" fill="#000000">confirmed_at    </text>
-<text text-anchor="start" x="595.1094" y="-473.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="473,-432.5 473,-462.5 827,-462.5 827,-432.5 473,-432.5"/>
-<text text-anchor="start" x="480" y="-443.9" font-family="Arial" font-size="14.00" fill="#000000">invited_at    </text>
-<text text-anchor="start" x="574.1122" y="-443.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="473,-402.5 473,-432.5 827,-432.5 827,-402.5 473,-402.5"/>
-<text text-anchor="start" x="480" y="-413.9" font-family="Arial" font-size="14.00" fill="#000000">confirmation_token    </text>
-<text text-anchor="start" x="632.4544" y="-413.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="473,-372.5 473,-402.5 827,-402.5 827,-372.5 473,-372.5"/>
-<text text-anchor="start" x="480" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">confirmation_sent_at    </text>
-<text text-anchor="start" x="644.1276" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="473,-342.5 473,-372.5 827,-372.5 827,-342.5 473,-342.5"/>
-<text text-anchor="start" x="480" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">recovery_token    </text>
-<text text-anchor="start" x="609.8948" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="473,-312.5 473,-342.5 827,-342.5 827,-312.5 473,-312.5"/>
-<text text-anchor="start" x="480" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">recovery_sent_at    </text>
-<text text-anchor="start" x="621.568" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="473,-282.5 473,-312.5 827,-312.5 827,-282.5 473,-282.5"/>
-<text text-anchor="start" x="480" y="-293.9" font-family="Arial" font-size="14.00" fill="#000000">email_change_token    </text>
-<text text-anchor="start" x="643.3604" y="-293.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="473,-252.5 473,-282.5 827,-282.5 827,-252.5 473,-252.5"/>
-<text text-anchor="start" x="480" y="-263.9" font-family="Arial" font-size="14.00" fill="#000000">email_change    </text>
-<text text-anchor="start" x="601.3394" y="-263.9" font-family="Arial" font-size="14.00" fill="#666666">[varchar(255)]</text>
-<polygon fill="none" stroke="#000000" points="473,-222.5 473,-252.5 827,-252.5 827,-222.5 473,-222.5"/>
-<text text-anchor="start" x="479.641" y="-233.9" font-family="Arial" font-size="14.00" fill="#000000">email_change_sent_at    </text>
-<text text-anchor="start" x="654.6746" y="-233.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="473,-192.5 473,-222.5 827,-222.5 827,-192.5 473,-192.5"/>
-<text text-anchor="start" x="480" y="-203.9" font-family="Arial" font-size="14.00" fill="#000000">last_sign_in_at    </text>
-<text text-anchor="start" x="607.5666" y="-203.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="473,-162.5 473,-192.5 827,-192.5 827,-162.5 473,-162.5"/>
-<text text-anchor="start" x="480" y="-173.9" font-family="Arial" font-size="14.00" fill="#000000">raw_app_meta_data    </text>
-<text text-anchor="start" x="641.805" y="-173.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="473,-132.5 473,-162.5 827,-162.5 827,-132.5 473,-132.5"/>
-<text text-anchor="start" x="480" y="-143.9" font-family="Arial" font-size="14.00" fill="#000000">raw_user_meta_data    </text>
-<text text-anchor="start" x="645.683" y="-143.9" font-family="Arial" font-size="14.00" fill="#666666">[jsonb]</text>
-<polygon fill="none" stroke="#000000" points="473,-102.5 473,-132.5 827,-132.5 827,-102.5 473,-102.5"/>
-<text text-anchor="start" x="480" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">is_super_admin    </text>
-<text text-anchor="start" x="613" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[boolean]</text>
-<polygon fill="none" stroke="#000000" points="473,-72.5 473,-102.5 827,-102.5 827,-72.5 473,-72.5"/>
-<text text-anchor="start" x="480" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">created_at    </text>
-<text text-anchor="start" x="580.3422" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="473,-42.5 473,-72.5 827,-72.5 827,-42.5 473,-42.5"/>
-<text text-anchor="start" x="480" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at    </text>
-<text text-anchor="start" x="584.2468" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-</g>
-<!-- storage.objects&#45;&gt;auth.users -->
-<g id="edge2" class="edge">
-<title>storage.objects:owner&#45;&gt;auth.users:id</title>
-<path fill="none" stroke="#000000" d="M594.1344,-966.8152C661.2243,-957.2154 629.0519,-848.9735 584,-787 553.5044,-745.0501 503.4956,-792.9499 473,-751 440.7252,-706.6026 418.1111,-627.5 473,-627.5"/>
-<polygon fill="#000000" stroke="#000000" points="593.9772,-966.8257 583.6966,-963.0102 588.9886,-967.1629 584,-967.5 584,-967.5 584,-967.5 588.9886,-967.1629 584.3034,-971.9898 593.9772,-966.8257 593.9772,-966.8257"/>
-<text text-anchor="start" x="590.9965" y="-977.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (owner) REFERENCES auth.users(id)</text>
-</g>
-</g>
-</svg>
diff --git a/docs/database/supabase_functions.hooks.md b/docs/database/supabase_functions.hooks.md
deleted file mode 100644
index b7940b96e..000000000
--- a/docs/database/supabase_functions.hooks.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# supabase_functions.hooks
-
-## Description
-
-Supabase Functions Hooks: Audit trail for triggered hooks.
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | bigint | nextval('supabase_functions.hooks_id_seq'::regclass) | false |  |  |  |
-| hook_table_id | integer |  | false |  |  |  |
-| hook_name | text |  | false |  |  |  |
-| created_at | timestamp with time zone | now() | false |  |  |  |
-| request_id | bigint |  | true |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| hooks_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| hooks_pkey | CREATE UNIQUE INDEX hooks_pkey ON supabase_functions.hooks USING btree (id) |
-| supabase_functions_hooks_request_id_idx | CREATE INDEX supabase_functions_hooks_request_id_idx ON supabase_functions.hooks USING btree (request_id) |
-| supabase_functions_hooks_h_table_id_h_name_idx | CREATE INDEX supabase_functions_hooks_h_table_id_h_name_idx ON supabase_functions.hooks USING btree (hook_table_id, hook_name) |
-
-## Relations
-
-![er](supabase_functions.hooks.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/supabase_functions.hooks.svg b/docs/database/supabase_functions.hooks.svg
deleted file mode 100644
index 770472c71..000000000
--- a/docs/database/supabase_functions.hooks.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: supabase_functions.hooks Pages: 1 -->
-<svg width="454pt" height="285pt"
- viewBox="0.00 0.00 454.00 285.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 281)">
-<title>supabase_functions.hooks</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-281 450,-281 450,4 -4,4"/>
-<!-- supabase_functions.hooks -->
-<g id="node1" class="node">
-<title>supabase_functions.hooks</title>
-<polygon fill="#efefef" stroke="transparent" points="46,-195.5 46,-230.5 400,-230.5 400,-195.5 46,-195.5"/>
-<polygon fill="none" stroke="#000000" points="46,-195.5 46,-230.5 400,-230.5 400,-195.5 46,-195.5"/>
-<text text-anchor="start" x="52.6722" y="-208.3" font-family="Arial Bold" font-size="18.00" fill="#000000">supabase_functions.hooks</text>
-<text text-anchor="start" x="265.7598" y="-208.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="299.9646" y="-208.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46,-165.5 46,-195.5 400,-195.5 400,-165.5 46,-165.5"/>
-<text text-anchor="start" x="53" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="67.7798" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="46,-135.5 46,-165.5 400,-165.5 400,-135.5 46,-135.5"/>
-<text text-anchor="start" x="53" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">hook_table_id </text>
-<text text-anchor="start" x="144.0378" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[integer]</text>
-<polygon fill="none" stroke="#000000" points="46,-105.5 46,-135.5 400,-135.5 400,-105.5 46,-105.5"/>
-<text text-anchor="start" x="53" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">hook_name </text>
-<text text-anchor="start" x="130.0294" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46,-75.5 46,-105.5 400,-105.5 400,-75.5 46,-75.5"/>
-<text text-anchor="start" x="53" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="123.028" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46,-45.5 46,-75.5 400,-75.5 400,-45.5 46,-45.5"/>
-<text text-anchor="start" x="53" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">request_id </text>
-<text text-anchor="start" x="122.244" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-232.5 401.5,-232.5 401.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/supabase_functions.migrations.md b/docs/database/supabase_functions.migrations.md
deleted file mode 100644
index 8c6ad439e..000000000
--- a/docs/database/supabase_functions.migrations.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# supabase_functions.migrations
-
-## Description
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| version | text |  | false |  |  |  |
-| inserted_at | timestamp with time zone | now() | false |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| migrations_pkey | PRIMARY KEY | PRIMARY KEY (version) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| migrations_pkey | CREATE UNIQUE INDEX migrations_pkey ON supabase_functions.migrations USING btree (version) |
-
-## Relations
-
-![er](supabase_functions.migrations.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/supabase_functions.migrations.svg b/docs/database/supabase_functions.migrations.svg
deleted file mode 100644
index bc1eca4aa..000000000
--- a/docs/database/supabase_functions.migrations.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: supabase_functions.migrations Pages: 1 -->
-<svg width="489pt" height="195pt"
- viewBox="0.00 0.00 489.00 195.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 191)">
-<title>supabase_functions.migrations</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-191 485,-191 485,4 -4,4"/>
-<!-- supabase_functions.migrations -->
-<g id="node1" class="node">
-<title>supabase_functions.migrations</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-105.5 46.5,-140.5 435.5,-140.5 435.5,-105.5 46.5,-105.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-140.5 435.5,-140.5 435.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.1816" y="-118.3" font-family="Arial Bold" font-size="18.00" fill="#000000">supabase_functions.migrations</text>
-<text text-anchor="start" x="301.2504" y="-118.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="335.4552" y="-118.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 435.5,-105.5 435.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">version </text>
-<text text-anchor="start" x="102.5056" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 435.5,-75.5 435.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">inserted_at </text>
-<text text-anchor="start" x="126.6346" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-142.5 436.5,-142.5 436.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/vault.decrypted_secrets.md b/docs/database/vault.decrypted_secrets.md
deleted file mode 100644
index a0e489c91..000000000
--- a/docs/database/vault.decrypted_secrets.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# vault.decrypted_secrets
-
-## Description
-
-<details>
-<summary><strong>Table Definition</strong></summary>
-
-```sql
-CREATE VIEW decrypted_secrets AS (
- SELECT secrets.id,
-    secrets.name,
-    secrets.description,
-    secrets.secret,
-        CASE
-            WHEN (secrets.secret IS NULL) THEN NULL::text
-            ELSE
-            CASE
-                WHEN (secrets.key_id IS NULL) THEN NULL::text
-                ELSE convert_from(pgsodium.crypto_aead_det_decrypt(decode(secrets.secret, 'base64'::text), convert_to(((((secrets.id)::text || secrets.description) || (secrets.created_at)::text) || (secrets.updated_at)::text), 'utf8'::name), secrets.key_id, secrets.nonce), 'utf8'::name)
-            END
-        END AS decrypted_secret,
-    secrets.key_id,
-    secrets.nonce,
-    secrets.created_at,
-    secrets.updated_at
-   FROM vault.secrets
-)
-```
-
-</details>
-
-## Referenced Tables
-
-- [vault.secrets](vault.secrets.md)
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid |  | true |  |  |  |
-| name | text |  | true |  |  |  |
-| description | text |  | true |  |  |  |
-| secret | text |  | true |  |  |  |
-| decrypted_secret | text |  | true |  |  |  |
-| key_id | uuid |  | true |  |  |  |
-| nonce | bytea |  | true |  |  |  |
-| created_at | timestamp with time zone |  | true |  |  |  |
-| updated_at | timestamp with time zone |  | true |  |  |  |
-
-## Relations
-
-![er](vault.decrypted_secrets.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/vault.decrypted_secrets.svg b/docs/database/vault.decrypted_secrets.svg
deleted file mode 100644
index e83fd10c6..000000000
--- a/docs/database/vault.decrypted_secrets.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: vault.decrypted_secrets Pages: 1 -->
-<svg width="381pt" height="405pt"
- viewBox="0.00 0.00 381.00 405.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 401)">
-<title>vault.decrypted_secrets</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-401 377,-401 377,4 -4,4"/>
-<!-- vault.decrypted_secrets -->
-<g id="node1" class="node">
-<title>vault.decrypted_secrets</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-315.5 46.5,-350.5 327.5,-350.5 327.5,-315.5 46.5,-315.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-315.5 46.5,-350.5 327.5,-350.5 327.5,-315.5 46.5,-315.5"/>
-<text text-anchor="start" x="53.0931" y="-328.3" font-family="Arial Bold" font-size="18.00" fill="#000000">vault.decrypted_secrets</text>
-<text text-anchor="start" x="243.1425" y="-328.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="277.3473" y="-328.3" font-family="Arial" font-size="14.00" fill="#666666">[VIEW]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-285.5 46.5,-315.5 327.5,-315.5 327.5,-285.5 46.5,-285.5"/>
-<text text-anchor="start" x="53.5" y="-296.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="68.2798" y="-296.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-255.5 46.5,-285.5 327.5,-285.5 327.5,-255.5 46.5,-255.5"/>
-<text text-anchor="start" x="53.5" y="-266.9" font-family="Arial" font-size="14.00" fill="#000000">name </text>
-<text text-anchor="start" x="92.399" y="-266.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-225.5 46.5,-255.5 327.5,-255.5 327.5,-225.5 46.5,-225.5"/>
-<text text-anchor="start" x="53.5" y="-236.9" font-family="Arial" font-size="14.00" fill="#000000">description </text>
-<text text-anchor="start" x="125.068" y="-236.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-195.5 46.5,-225.5 327.5,-225.5 327.5,-195.5 46.5,-195.5"/>
-<text text-anchor="start" x="53.5" y="-206.9" font-family="Arial" font-size="14.00" fill="#000000">secret </text>
-<text text-anchor="start" x="95.507" y="-206.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-165.5 46.5,-195.5 327.5,-195.5 327.5,-165.5 46.5,-165.5"/>
-<text text-anchor="start" x="53.5" y="-176.9" font-family="Arial" font-size="14.00" fill="#000000">decrypted_secret </text>
-<text text-anchor="start" x="164.7538" y="-176.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-135.5 46.5,-165.5 327.5,-165.5 327.5,-135.5 46.5,-135.5"/>
-<text text-anchor="start" x="53.5" y="-146.9" font-family="Arial" font-size="14.00" fill="#000000">key_id </text>
-<text text-anchor="start" x="97.845" y="-146.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-105.5 46.5,-135.5 327.5,-135.5 327.5,-105.5 46.5,-105.5"/>
-<text text-anchor="start" x="53.5" y="-116.9" font-family="Arial" font-size="14.00" fill="#000000">nonce </text>
-<text text-anchor="start" x="95.521" y="-116.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-75.5 46.5,-105.5 327.5,-105.5 327.5,-75.5 46.5,-75.5"/>
-<text text-anchor="start" x="53.5" y="-86.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="123.528" y="-86.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-45.5 46.5,-75.5 327.5,-75.5 327.5,-45.5 46.5,-45.5"/>
-<text text-anchor="start" x="53.5" y="-56.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at </text>
-<text text-anchor="start" x="127.4326" y="-56.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-44.5 44.5,-352.5 328.5,-352.5 328.5,-44.5 44.5,-44.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/database/vault.secrets.md b/docs/database/vault.secrets.md
deleted file mode 100644
index 35390903d..000000000
--- a/docs/database/vault.secrets.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# vault.secrets
-
-## Description
-
-Table with encrypted `secret` column for storing sensitive information on disk.
-
-## Columns
-
-| Name | Type | Default | Nullable | Children | Parents | Comment |
-| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
-| id | uuid | gen_random_uuid() | false |  |  |  |
-| name | text |  | true |  |  |  |
-| description | text | ''::text | false |  |  |  |
-| secret | text |  | false |  |  |  |
-| key_id | uuid | (pgsodium.create_key()).id | true |  | [pgsodium.key](pgsodium.key.md) |  |
-| nonce | bytea | pgsodium.crypto_aead_det_noncegen() | true |  |  |  |
-| created_at | timestamp with time zone | CURRENT_TIMESTAMP | false |  |  |  |
-| updated_at | timestamp with time zone | CURRENT_TIMESTAMP | false |  |  |  |
-
-## Constraints
-
-| Name | Type | Definition |
-| ---- | ---- | ---------- |
-| secrets_key_id_fkey | FOREIGN KEY | FOREIGN KEY (key_id) REFERENCES pgsodium.key(id) |
-| secrets_pkey | PRIMARY KEY | PRIMARY KEY (id) |
-
-## Indexes
-
-| Name | Definition |
-| ---- | ---------- |
-| secrets_pkey | CREATE UNIQUE INDEX secrets_pkey ON vault.secrets USING btree (id) |
-| secrets_name_idx | CREATE UNIQUE INDEX secrets_name_idx ON vault.secrets USING btree (name) WHERE (name IS NOT NULL) |
-
-## Triggers
-
-| Name | Definition |
-| ---- | ---------- |
-| secrets_encrypt_secret_trigger_secret | CREATE TRIGGER secrets_encrypt_secret_trigger_secret BEFORE INSERT OR UPDATE OF secret ON vault.secrets FOR EACH ROW EXECUTE FUNCTION vault.secrets_encrypt_secret_secret() |
-
-## Relations
-
-![er](vault.secrets.svg)
-
----
-
-> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/docs/database/vault.secrets.svg b/docs/database/vault.secrets.svg
deleted file mode 100644
index 3f750eb5e..000000000
--- a/docs/database/vault.secrets.svg
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: vault.secrets Pages: 1 -->
-<svg width="578pt" height="952pt"
- viewBox="0.00 0.00 577.50 952.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 948)">
-<title>vault.secrets</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-948 573.5,-948 573.5,4 -4,4"/>
-<!-- vault.secrets -->
-<g id="node1" class="node">
-<title>vault.secrets</title>
-<polygon fill="#efefef" stroke="transparent" points="46.5,-862.5 46.5,-897.5 299.5,-897.5 299.5,-862.5 46.5,-862.5"/>
-<polygon fill="none" stroke="#000000" points="46.5,-862.5 46.5,-897.5 299.5,-897.5 299.5,-862.5 46.5,-862.5"/>
-<text text-anchor="start" x="58.7071" y="-875.3" font-family="Arial Bold" font-size="18.00" fill="#000000">vault.secrets</text>
-<text text-anchor="start" x="159.7249" y="-875.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="193.9297" y="-875.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-832.5 46.5,-862.5 299.5,-862.5 299.5,-832.5 46.5,-832.5"/>
-<text text-anchor="start" x="53.5" y="-843.9" font-family="Arial" font-size="14.00" fill="#000000">id </text>
-<text text-anchor="start" x="68.2798" y="-843.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-802.5 46.5,-832.5 299.5,-832.5 299.5,-802.5 46.5,-802.5"/>
-<text text-anchor="start" x="53.5" y="-813.9" font-family="Arial" font-size="14.00" fill="#000000">name </text>
-<text text-anchor="start" x="92.399" y="-813.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-772.5 46.5,-802.5 299.5,-802.5 299.5,-772.5 46.5,-772.5"/>
-<text text-anchor="start" x="53.5" y="-783.9" font-family="Arial" font-size="14.00" fill="#000000">description </text>
-<text text-anchor="start" x="125.068" y="-783.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-742.5 46.5,-772.5 299.5,-772.5 299.5,-742.5 46.5,-742.5"/>
-<text text-anchor="start" x="53.5" y="-753.9" font-family="Arial" font-size="14.00" fill="#000000">secret </text>
-<text text-anchor="start" x="95.507" y="-753.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-712.5 46.5,-742.5 299.5,-742.5 299.5,-712.5 46.5,-712.5"/>
-<text text-anchor="start" x="53.5" y="-723.9" font-family="Arial" font-size="14.00" fill="#000000">key_id </text>
-<text text-anchor="start" x="97.845" y="-723.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-682.5 46.5,-712.5 299.5,-712.5 299.5,-682.5 46.5,-682.5"/>
-<text text-anchor="start" x="53.5" y="-693.9" font-family="Arial" font-size="14.00" fill="#000000">nonce </text>
-<text text-anchor="start" x="95.521" y="-693.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-652.5 46.5,-682.5 299.5,-682.5 299.5,-652.5 46.5,-652.5"/>
-<text text-anchor="start" x="53.5" y="-663.9" font-family="Arial" font-size="14.00" fill="#000000">created_at </text>
-<text text-anchor="start" x="123.528" y="-663.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="46.5,-622.5 46.5,-652.5 299.5,-652.5 299.5,-622.5 46.5,-622.5"/>
-<text text-anchor="start" x="53.1915" y="-633.9" font-family="Arial" font-size="14.00" fill="#000000">updated_at </text>
-<text text-anchor="start" x="127.1241" y="-633.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" stroke-width="3" points="44.5,-621.5 44.5,-899.5 300.5,-899.5 300.5,-621.5 44.5,-621.5"/>
-</g>
-<!-- pgsodium.key -->
-<g id="node2" class="node">
-<title>pgsodium.key</title>
-<polygon fill="#efefef" stroke="transparent" points="43.5,-462.5 43.5,-497.5 303.5,-497.5 303.5,-462.5 43.5,-462.5"/>
-<polygon fill="none" stroke="#000000" points="43.5,-462.5 43.5,-497.5 303.5,-497.5 303.5,-462.5 43.5,-462.5"/>
-<text text-anchor="start" x="54.2031" y="-475.3" font-family="Arial Bold" font-size="18.00" fill="#000000">pgsodium.key</text>
-<text text-anchor="start" x="165.2289" y="-475.3" font-family="Arial" font-size="14.00" fill="#000000">    </text>
-<text text-anchor="start" x="199.4337" y="-475.3" font-family="Arial" font-size="14.00" fill="#666666">[BASE TABLE]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-432.5 43.5,-462.5 303.5,-462.5 303.5,-432.5 43.5,-432.5"/>
-<text text-anchor="start" x="50.5" y="-443.9" font-family="Arial" font-size="14.00" fill="#000000">id    </text>
-<text text-anchor="start" x="95.594" y="-443.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-402.5 43.5,-432.5 303.5,-432.5 303.5,-402.5 43.5,-402.5"/>
-<text text-anchor="start" x="50.5" y="-413.9" font-family="Arial" font-size="14.00" fill="#000000">status    </text>
-<text text-anchor="start" x="122.0512" y="-413.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_status]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-372.5 43.5,-402.5 303.5,-402.5 303.5,-372.5 43.5,-372.5"/>
-<text text-anchor="start" x="50.2146" y="-383.9" font-family="Arial" font-size="14.00" fill="#000000">created    </text>
-<text text-anchor="start" x="131.101" y="-383.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-342.5 43.5,-372.5 303.5,-372.5 303.5,-342.5 43.5,-342.5"/>
-<text text-anchor="start" x="50.5" y="-353.9" font-family="Arial" font-size="14.00" fill="#000000">expires    </text>
-<text text-anchor="start" x="129.8198" y="-353.9" font-family="Arial" font-size="14.00" fill="#666666">[timestamp with time zone]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-312.5 43.5,-342.5 303.5,-342.5 303.5,-312.5 43.5,-312.5"/>
-<text text-anchor="start" x="50.5" y="-323.9" font-family="Arial" font-size="14.00" fill="#000000">key_type    </text>
-<text text-anchor="start" x="140.7258" y="-323.9" font-family="Arial" font-size="14.00" fill="#666666">[pgsodium.key_type]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-282.5 43.5,-312.5 303.5,-312.5 303.5,-282.5 43.5,-282.5"/>
-<text text-anchor="start" x="50.5" y="-293.9" font-family="Arial" font-size="14.00" fill="#000000">key_id    </text>
-<text text-anchor="start" x="125.1592" y="-293.9" font-family="Arial" font-size="14.00" fill="#666666">[bigint]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-252.5 43.5,-282.5 303.5,-282.5 303.5,-252.5 43.5,-252.5"/>
-<text text-anchor="start" x="50.5" y="-263.9" font-family="Arial" font-size="14.00" fill="#000000">key_context    </text>
-<text text-anchor="start" x="159.399" y="-263.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-222.5 43.5,-252.5 303.5,-252.5 303.5,-222.5 43.5,-222.5"/>
-<text text-anchor="start" x="50.5" y="-233.9" font-family="Arial" font-size="14.00" fill="#000000">name    </text>
-<text text-anchor="start" x="119.7132" y="-233.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-192.5 43.5,-222.5 303.5,-222.5 303.5,-192.5 43.5,-192.5"/>
-<text text-anchor="start" x="50.5" y="-203.9" font-family="Arial" font-size="14.00" fill="#000000">associated_data    </text>
-<text text-anchor="start" x="186.636" y="-203.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-162.5 43.5,-192.5 303.5,-192.5 303.5,-162.5 43.5,-162.5"/>
-<text text-anchor="start" x="50.5" y="-173.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key    </text>
-<text text-anchor="start" x="136.8198" y="-173.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-132.5 43.5,-162.5 303.5,-162.5 303.5,-132.5 43.5,-132.5"/>
-<text text-anchor="start" x="50.5" y="-143.9" font-family="Arial" font-size="14.00" fill="#000000">raw_key_nonce    </text>
-<text text-anchor="start" x="182.7328" y="-143.9" font-family="Arial" font-size="14.00" fill="#666666">[bytea]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-102.5 43.5,-132.5 303.5,-132.5 303.5,-102.5 43.5,-102.5"/>
-<text text-anchor="start" x="50.5" y="-113.9" font-family="Arial" font-size="14.00" fill="#000000">parent_key    </text>
-<text text-anchor="start" x="153.9516" y="-113.9" font-family="Arial" font-size="14.00" fill="#666666">[uuid]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-72.5 43.5,-102.5 303.5,-102.5 303.5,-72.5 43.5,-72.5"/>
-<text text-anchor="start" x="50.5" y="-83.9" font-family="Arial" font-size="14.00" fill="#000000">comment    </text>
-<text text-anchor="start" x="142.2644" y="-83.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-<polygon fill="none" stroke="#000000" points="43.5,-42.5 43.5,-72.5 303.5,-72.5 303.5,-42.5 43.5,-42.5"/>
-<text text-anchor="start" x="50.5" y="-53.9" font-family="Arial" font-size="14.00" fill="#000000">user_data    </text>
-<text text-anchor="start" x="146.9516" y="-53.9" font-family="Arial" font-size="14.00" fill="#666666">[text]</text>
-</g>
-<!-- vault.secrets&#45;&gt;pgsodium.key -->
-<g id="edge1" class="edge">
-<title>vault.secrets:key_id&#45;&gt;pgsodium.key:id</title>
-<path fill="none" stroke="#000000" d="M309.6787,-726.6271C363.81,-716.7088 340.9812,-624.7227 299.5,-577 224.1242,-490.2828 118.8758,-627.7172 43.5,-541 16.2384,-509.6365 1.9444,-447.5 43.5,-447.5"/>
-<polygon fill="#000000" stroke="#000000" points="309.4634,-726.6455 299.1155,-723.0165 304.4817,-727.0727 299.5,-727.5 299.5,-727.5 299.5,-727.5 304.4817,-727.0727 299.8845,-731.9835 309.4634,-726.6455 309.4634,-726.6455"/>
-<text text-anchor="start" x="306.1615" y="-737.5" font-family="Arial" font-size="10.00" fill="#000000">FOREIGN KEY (key_id) REFERENCES pgsodium.key(id)</text>
-</g>
-</g>
-</svg>
diff --git a/docs/uml/app/lib/models/uml.svg b/docs/uml/app/lib/models/uml.svg
deleted file mode 100644
index e1d655211..000000000
--- a/docs/uml/app/lib/models/uml.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/app_onboarding/uml.svg b/docs/uml/app/lib/screens/app_onboarding/uml.svg
deleted file mode 100644
index d3d4c5668..000000000
--- a/docs/uml/app/lib/screens/app_onboarding/uml.svg
+++ /dev/null
@@ -1,339 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2104.0" height="460.0" viewbox="0 0 2104 460" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[LoadingScreen
-	  |
-	  +sessionString: String?;
-	  +queryParameters: Map&lt;String, String&gt;?
-	]
-	
-	[AppOutdatedScreen
-	  |
-	  +Widget build()
-	]
-	
-	[WelcomeScreen
-	  |
-	  +Widget build()
-	]
-	
-	[TermsScreen
-	]
-	
-	[LegalSection
-	  |
-	  +title: String?;
-	  +description: String?;
-	  +icon: Icon?;
-	  +pdfUrl: String?;
-	  +pdfUrlLabel: String?;
-	  +acknowledgment: String?;
-	  +isChecked: bool?;
-	  +onChange: void Function(bool?)?
-	  |
-	  +Widget build()
-	]
-	
-	[LegalSection]o-[Icon]
-	[LegalSection]o-[void Function(bool?)?]
-	
-	[IFrameHelper
-	  |
-	  +void postRouteFinished();
-	  +void listen()
-	]
-	
-	[Preview
-	  |
-	  +queryParameters: Map&lt;String, String&gt;?;
-	  +appLanguage: AppLanguage;
-	  +selectedRoute: String?;
-	  +extra: String?;
-	  +study: Study?;
-	  +selectedStudyObjectId: String?;
-	  +subject: StudySubject?
-	  |
-	  +bool hasRoute();
-	  +void handleQueries();
-	  +dynamic init();
-	  +dynamic handleAuthorization();
-	  +dynamic runCommands();
-	  +String? getSelectedRoute();
-	  +bool containsQuery();
-	  +bool containsQueryPair();
-	  +dynamic getStudySubject();
-	  -dynamic _createFakeSubject();
-	  +List&lt;String&gt; getInterventionIds()
-	]
-	
-	[Preview]o-[AppLanguage]
-	[Preview]o-[Study]
-	[Preview]o-[StudySubject]
-	
-	[AboutScreen
-	  |
-	  +Widget build()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="460.0" width="2104.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M1035.5 282.7 L1005.5 353 L1005.5 373 L1005.5 373.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1044.0 276.2 L1035.5 282.7 L1034.2 272.0 L1042.8 265.5 Z"></path>
-					</g>
-					<path d="M1172.4 280.3 L1228.25 353 L1228.25 373 L1228.3 373.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1171.0 269.7 L1172.4 280.3 L1162.5 276.2 L1161.0 265.5 Z"></path>
-					</g>
-					<path d="M1518.5 290.6 L1425.75 353 L1425.75 373 L1425.8 373.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1529.2 289.8 L1518.5 290.6 L1523.3 281.0 L1534.0 280.2 Z"></path>
-					</g>
-					<path d="M1703.0 351.7 L1703 353 L1703 373 L1703.0 373.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1708.3 342.3 L1703.0 351.7 L1697.7 342.3 L1703.0 333.0 Z"></path>
-					</g>
-					<path d="M1830.2 348.3 L1833.5 353 L1833.5 373 L1833.5 373.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1829.2 337.6 L1830.2 348.3 L1820.5 343.7 L1819.5 333.0 Z"></path>
-					</g>
-					<g data-name="LoadingScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoadingScreen">
-							<rect x="0.0" y="128.0" height="77.0" width="338.0" data-name="LoadingScreen"></rect>
-							<path d="M0.0 159.0 L338.0 159.0" fill="none" data-name="LoadingScreen"></path>
-						</g>
-						<g transform="translate(0, 128)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoadingScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoadingScreen">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="LoadingScreen">LoadingScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 159)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoadingScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoadingScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoadingScreen">+sessionString: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LoadingScreen">+queryParameters: Map&lt;String, String&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppOutdatedScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppOutdatedScreen">
-							<rect x="378.0" y="135.5" height="62.0" width="176.0" data-name="AppOutdatedScreen"></rect>
-							<path d="M378.0 166.5 L554.0 166.5" fill="none" data-name="AppOutdatedScreen"></path>
-						</g>
-						<g transform="translate(378, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppOutdatedScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppOutdatedScreen">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppOutdatedScreen">AppOutdatedScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(378, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppOutdatedScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppOutdatedScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppOutdatedScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WelcomeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WelcomeScreen">
-							<rect x="594.0" y="135.5" height="62.0" width="145.0" data-name="WelcomeScreen"></rect>
-							<path d="M594.0 166.5 L739.0 166.5" fill="none" data-name="WelcomeScreen"></path>
-						</g>
-						<g transform="translate(594, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WelcomeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WelcomeScreen">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="WelcomeScreen">WelcomeScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(594, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WelcomeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WelcomeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="WelcomeScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TermsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TermsScreen">
-							<rect x="779.0" y="151.0" height="31.0" width="121.0" data-name="TermsScreen"></rect>
-						</g>
-						<g transform="translate(779, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TermsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TermsScreen">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="TermsScreen">TermsScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegalSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegalSection">
-							<rect x="940.0" y="67.5" height="198.0" width="290.0" data-name="LegalSection"></rect>
-							<path d="M940.0 98.5 L1230.0 98.5" fill="none" data-name="LegalSection"></path>
-							<path d="M940.0 234.5 L1230.0 234.5" fill="none" data-name="LegalSection"></path>
-						</g>
-						<g transform="translate(940, 67.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegalSection">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="LegalSection">LegalSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(940, 98.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegalSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegalSection">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LegalSection">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LegalSection">+icon: Icon?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="LegalSection">+pdfUrl: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="LegalSection">+pdfUrlLabel: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="LegalSection">+acknowledgment: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="LegalSection">+isChecked: bool?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="LegalSection">+onChange: void Function(bool?)?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(940, 234.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegalSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegalSection">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Icon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Icon">
-							<rect x="980.5" y="373.0" height="31.0" width="50.0" data-name="Icon"></rect>
-						</g>
-						<g transform="translate(980.5, 373)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Icon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Icon">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Icon">Icon</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(bool?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(bool?)?">
-							<rect x="1134.3" y="373.0" height="31.0" width="188.0" data-name="void Function(bool?)?"></rect>
-						</g>
-						<g transform="translate(1134.25, 373)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(bool?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(bool?)?">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(bool?)?">void Function(bool?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFrameHelper">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameHelper">
-							<rect x="1270.0" y="128.0" height="77.0" width="224.0" data-name="IFrameHelper"></rect>
-							<path d="M1270.0 159.0 L1494.0 159.0" fill="none" data-name="IFrameHelper"></path>
-						</g>
-						<g transform="translate(1270, 128)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameHelper">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameHelper">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameHelper">IFrameHelper</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1270, 159)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFrameHelper">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFrameHelper">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFrameHelper">+void postRouteFinished()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFrameHelper">+void listen()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Preview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Preview">
-							<rect x="1534.0" y="0.0" height="333.0" width="338.0" data-name="Preview"></rect>
-							<path d="M1534.0 31.0 L1872.0 31.0" fill="none" data-name="Preview"></path>
-							<path d="M1534.0 152.0 L1872.0 152.0" fill="none" data-name="Preview"></path>
-						</g>
-						<g transform="translate(1534, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Preview">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="Preview">Preview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1534, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Preview">
-								<text x="0.0" y="13.5" stroke="none" data-name="Preview">+queryParameters: Map&lt;String, String&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Preview">+appLanguage: AppLanguage</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Preview">+selectedRoute: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Preview">+extra: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Preview">+study: Study?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Preview">+selectedStudyObjectId: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Preview">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1534, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Preview">
-								<text x="0.0" y="13.5" stroke="none" data-name="Preview">+bool hasRoute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Preview">+void handleQueries()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Preview">+dynamic init()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Preview">+dynamic handleAuthorization()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Preview">+dynamic runCommands()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Preview">+String? getSelectedRoute()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Preview">+bool containsQuery()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Preview">+bool containsQueryPair()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Preview">+dynamic getStudySubject()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Preview">-dynamic _createFakeSubject()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Preview">+List&lt;String&gt; getInterventionIds()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppLanguage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppLanguage">
-							<rect x="1362.3" y="373.0" height="31.0" width="127.0" data-name="AppLanguage"></rect>
-						</g>
-						<g transform="translate(1362.25, 373)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppLanguage">
-								<text x="55.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppLanguage">AppLanguage</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="1672.5" y="373.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(1672.5, 373)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="1773.5" y="373.0" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(1773.5, 373)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AboutScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AboutScreen">
-							<rect x="1912.0" y="135.5" height="62.0" width="136.0" data-name="AboutScreen"></rect>
-							<path d="M1912.0 166.5 L2048.0 166.5" fill="none" data-name="AboutScreen"></path>
-						</g>
-						<g transform="translate(1912, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AboutScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AboutScreen">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="AboutScreen">AboutScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1912, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AboutScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AboutScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="AboutScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/dashboard/contact_tab/uml.svg b/docs/uml/app/lib/screens/study/dashboard/contact_tab/uml.svg
deleted file mode 100644
index c00cf0806..000000000
--- a/docs/uml/app/lib/screens/study/dashboard/contact_tab/uml.svg
+++ /dev/null
@@ -1,309 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1218.3" height="386.0" viewbox="0 0 1218.25 386" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[ContactScreen
-	]
-	
-	[ContactWidget
-	  |
-	  +contact: Contact?;
-	  +title: String;
-	  +subtitle: String?;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[ContactWidget]o-[Contact]
-	[ContactWidget]o-[Color]
-	
-	[ContactItem
-	  |
-	  +iconData: IconData;
-	  +itemName: String;
-	  +itemValue: String?;
-	  +type: ContactItemType?;
-	  +iconColor: Color?
-	  |
-	  +dynamic launchContact();
-	  +Widget build()
-	]
-	
-	[ContactItem]o-[IconData]
-	[ContactItem]o-[ContactItemType]
-	[ContactItem]o-[Color]
-	
-	[ContactItemType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ContactItemType&gt;;
-	  &lt;static&gt;+website: ContactItemType;
-	  &lt;static&gt;+email: ContactItemType;
-	  &lt;static&gt;+phone: ContactItemType
-	]
-	
-	[ContactItemType]o-[ContactItemType]
-	[Enum]&lt;:--[ContactItemType]
-	
-	[FAQ
-	  |
-	  +Widget build()
-	]
-	
-	[Entry
-	  |
-	  +title: String;
-	  +children: List&lt;Entry&gt;
-	]
-	
-	[EntryItem
-	  |
-	  +entry: Entry
-	  |
-	  -Widget _buildTiles();
-	  +Widget build()
-	]
-	
-	[EntryItem]o-[Entry]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="386.0" width="1218.3" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M233.1 171.1 L228.75 188 L228.75 253.5 L228.8 253.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M240.6 163.4 L233.1 171.1 L230.3 160.7 L237.8 153.0 Z"></path>
-					</g>
-					<path d="M305.2 169.1 L316.25 188 L338.0833333333333 253.5 L338.1 253.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M305.1 158.4 L305.2 169.1 L295.9 163.7 L295.8 153.0 Z"></path>
-					</g>
-					<path d="M456.5 185.8 L455.75 188 L455.75 253.5 L455.8 253.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M464.4 178.5 L456.5 185.8 L454.3 175.2 L462.2 168.0 Z"></path>
-					</g>
-					<path d="M604.6 180.0 L614.25 188 L636.7191358024692 208 L636.7 208.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M600.8 169.9 L604.6 180.0 L594.0 178.1 L590.3 168.0 Z"></path>
-					</g>
-					<path d="M387.1 180.8 L379.5 188 L350.1867283950617 253.5 L350.2 253.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M397.5 178.3 L387.1 180.8 L390.2 170.5 L400.7 168.0 Z"></path>
-					</g>
-					<path d="M889.1 214.2 L909.9166666666666 208 L919.5833333333334 208 L919.5833333333334 208 L929.25 269 L929.25 269 L919.5833333333334 330 L919.5833333333334 330 L909.9166666666666 330 L909.9166666666666 330 L871.25 318.4755700325733 L871.3 318.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M878.7 211.7 L889.1 214.2 L881.7 222.0 L871.3 219.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M725.3 112.8 L725.25 188 L720.3117283950618 208 L720.3 208.0 " fill="none"></path>
-					</g>
-					<path d="M730.6 112.8 L725.3 112.8 L719.9 112.8 L725.3 99.5 Z"></path>
-					<path d="M1068.3 156.7 L1068.25 188 L1068.25 230.5 L1068.3 230.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1073.6 147.3 L1068.3 156.7 L1062.9 147.3 L1068.3 138.0 Z"></path>
-					</g>
-					<g data-name="ContactScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactScreen">
-							<rect x="0.0" y="68.5" height="31.0" width="133.0" data-name="ContactScreen"></rect>
-						</g>
-						<g transform="translate(0, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactScreen">
-								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactScreen">ContactScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactWidget">
-							<rect x="173.0" y="15.0" height="138.0" width="165.0" data-name="ContactWidget"></rect>
-							<path d="M173.0 46.0 L338.0 46.0" fill="none" data-name="ContactWidget"></path>
-							<path d="M173.0 122.0 L338.0 122.0" fill="none" data-name="ContactWidget"></path>
-						</g>
-						<g transform="translate(173, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactWidget">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactWidget">ContactWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(173, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+contact: Contact?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactWidget">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactWidget">+subtitle: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(173, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Contact">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Contact">
-							<rect x="190.3" y="253.5" height="31.0" width="77.0" data-name="Contact"></rect>
-						</g>
-						<g transform="translate(190.25, 253.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Contact">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Contact">
-								<text x="30.5" y="13.5" stroke="none" text-anchor="middle" data-name="Contact">Contact</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="314.3" y="253.5" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(314.25, 253.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItem">
-							<rect x="378.0" y="0.0" height="168.0" width="223.0" data-name="ContactItem"></rect>
-							<path d="M378.0 31.0 L601.0 31.0" fill="none" data-name="ContactItem"></path>
-							<path d="M378.0 122.0 L601.0 122.0" fill="none" data-name="ContactItem"></path>
-						</g>
-						<g transform="translate(378, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItem">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItem">ContactItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(378, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+iconData: IconData</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+itemName: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItem">+itemValue: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItem">+type: ContactItemType?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItem">+iconColor: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(378, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+dynamic launchContact()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="412.3" y="253.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(412.25, 253.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItemType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItemType">
-							<rect x="539.3" y="208.0" height="122.0" width="332.0" data-name="ContactItemType"></rect>
-							<path d="M539.3 239.0 L871.3 239.0" fill="none" data-name="ContactItemType"></path>
-						</g>
-						<g transform="translate(539.25, 208)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItemType">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItemType">ContactItemType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(539.25, 239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItemType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItemType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+values: List&lt;ContactItemType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+website: ContactItemType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+email: ContactItemType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+phone: ContactItemType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="694.8" y="68.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(694.75, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FAQ">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FAQ">
-							<rect x="795.8" y="53.0" height="62.0" width="136.0" data-name="FAQ"></rect>
-							<path d="M795.8 84.0 L931.8 84.0" fill="none" data-name="FAQ"></path>
-						</g>
-						<g transform="translate(795.75, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FAQ">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="FAQ">FAQ</text>
-								
-							</g>
-						</g>
-						<g transform="translate(795.75, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FAQ">
-								<text x="0.0" y="13.5" stroke="none" data-name="FAQ">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Entry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Entry">
-							<rect x="974.3" y="230.5" height="77.0" width="188.0" data-name="Entry"></rect>
-							<path d="M974.3 261.5 L1162.3 261.5" fill="none" data-name="Entry"></path>
-						</g>
-						<g transform="translate(974.25, 230.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Entry">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="Entry">Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(974.25, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Entry">
-								<text x="0.0" y="13.5" stroke="none" data-name="Entry">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Entry">+children: List&lt;Entry&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EntryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EntryItem">
-							<rect x="978.8" y="30.0" height="108.0" width="179.0" data-name="EntryItem"></rect>
-							<path d="M978.8 61.0 L1157.8 61.0" fill="none" data-name="EntryItem"></path>
-							<path d="M978.8 92.0 L1157.8 92.0" fill="none" data-name="EntryItem"></path>
-						</g>
-						<g transform="translate(978.75, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EntryItem">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="EntryItem">EntryItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(978.75, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">+entry: Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(978.75, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">-Widget _buildTiles()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EntryItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/dashboard/task_overview_tab/uml.svg b/docs/uml/app/lib/screens/study/dashboard/task_overview_tab/uml.svg
deleted file mode 100644
index b5d839b5e..000000000
--- a/docs/uml/app/lib/screens/study/dashboard/task_overview_tab/uml.svg
+++ /dev/null
@@ -1,224 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1272.5" height="310.0" viewbox="0 0 1272.5 310" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[TaskOverview
-	  |
-	  +subject: StudySubject?;
-	  +scheduleToday: List&lt;TaskInstance&gt;?;
-	  +interventionIcon: String?
-	]
-	
-	[TaskOverview]o-[StudySubject]
-	
-	[TaskBox
-	  |
-	  +taskInstance: TaskInstance;
-	  +icon: Icon;
-	  +onCompleted: dynamic Function()
-	]
-	
-	[TaskBox]o-[TaskInstance]
-	[TaskBox]o-[Icon]
-	[TaskBox]o-[dynamic Function()]
-	
-	[ProgressRow
-	  |
-	  +subject: StudySubject?
-	]
-	
-	[ProgressRow]o-[StudySubject]
-	
-	[InterventionSegment
-	  |
-	  +intervention: Intervention;
-	  +percentCompleted: double;
-	  +percentMissed: double;
-	  +isCurrent: bool;
-	  +isFuture: bool;
-	  +phaseDuration: int
-	  |
-	  +List&lt;Widget&gt; buildSeparators();
-	  +Widget build()
-	]
-	
-	[InterventionSegment]o-[Intervention]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="310.0" width="1272.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M160.5 156.2 L160.5 203 L206.55633802816902 223 L206.6 223.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M165.8 146.8 L160.5 156.2 L155.2 146.8 L160.5 137.5 Z"></path>
-					</g>
-					<path d="M687.5 149.8 L626.75 203 L626.75 223 L626.8 223.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M698.0 147.7 L687.5 149.8 L691.0 139.6 L701.5 137.5 Z"></path>
-					</g>
-					<path d="M754.0 156.2 L754 203 L754 223 L754.0 223.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M759.3 146.8 L754.0 156.2 L748.7 146.8 L754.0 137.5 Z"></path>
-					</g>
-					<path d="M830.2 148.7 L902.5 203 L902.5 223 L902.5 223.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M825.9 138.8 L830.2 148.7 L819.5 147.4 L815.3 137.5 Z"></path>
-					</g>
-					<path d="M464.5 141.2 L464.5 203 L302.25 228.91619797525308 L302.3 228.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M469.8 131.8 L464.5 141.2 L459.2 131.8 L464.5 122.5 Z"></path>
-					</g>
-					<path d="M1081.0 201.7 L1081 203 L1081 223 L1081.0 223.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1086.3 192.3 L1081.0 201.7 L1075.7 192.3 L1081.0 183.0 Z"></path>
-					</g>
-					<g data-name="TaskOverview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskOverview">
-							<rect x="0.0" y="45.5" height="92.0" width="321.0" data-name="TaskOverview"></rect>
-							<path d="M0.0 76.5 L321.0 76.5" fill="none" data-name="TaskOverview"></path>
-						</g>
-						<g transform="translate(0, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskOverview">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskOverview">TaskOverview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskOverview">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskOverview">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskOverview">+scheduleToday: List&lt;TaskInstance&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskOverview">+interventionIcon: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="182.3" y="223.0" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(182.25, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskBox">
-							<rect x="608.0" y="45.5" height="92.0" width="292.0" data-name="TaskBox"></rect>
-							<path d="M608.0 76.5 L900.0 76.5" fill="none" data-name="TaskBox"></path>
-						</g>
-						<g transform="translate(608, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskBox">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskBox">TaskBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(608, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskBox">+taskInstance: TaskInstance</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskBox">+icon: Icon</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskBox">+onCompleted: dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskInstance">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskInstance">
-							<rect x="565.8" y="223.0" height="31.0" width="122.0" data-name="TaskInstance"></rect>
-						</g>
-						<g transform="translate(565.75, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskInstance">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskInstance">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskInstance">TaskInstance</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Icon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Icon">
-							<rect x="729.0" y="223.0" height="31.0" width="50.0" data-name="Icon"></rect>
-						</g>
-						<g transform="translate(729, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Icon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Icon">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Icon">Icon</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="819.0" y="223.0" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(819, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ProgressRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ProgressRow">
-							<rect x="361.0" y="60.5" height="62.0" width="207.0" data-name="ProgressRow"></rect>
-							<path d="M361.0 91.5 L568.0 91.5" fill="none" data-name="ProgressRow"></path>
-						</g>
-						<g transform="translate(361, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProgressRow">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProgressRow">ProgressRow</text>
-								
-							</g>
-						</g>
-						<g transform="translate(361, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ProgressRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="ProgressRow">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionSegment">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSegment">
-							<rect x="945.5" y="0.0" height="183.0" width="271.0" data-name="InterventionSegment"></rect>
-							<path d="M945.5 31.0 L1216.5 31.0" fill="none" data-name="InterventionSegment"></path>
-							<path d="M945.5 137.0 L1216.5 137.0" fill="none" data-name="InterventionSegment"></path>
-						</g>
-						<g transform="translate(945.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSegment">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSegment">InterventionSegment</text>
-								
-							</g>
-						</g>
-						<g transform="translate(945.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+percentCompleted: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionSegment">+percentMissed: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionSegment">+isCurrent: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionSegment">+isFuture: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionSegment">+phaseDuration: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(945.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+List&lt;Widget&gt; buildSeparators()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention">
-							<rect x="1026.0" y="223.0" height="31.0" width="110.0" data-name="Intervention"></rect>
-						</g>
-						<g transform="translate(1026, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention">Intervention</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/dashboard/uml.svg b/docs/uml/app/lib/screens/study/dashboard/uml.svg
deleted file mode 100644
index f9ee5b73d..000000000
--- a/docs/uml/app/lib/screens/study/dashboard/uml.svg
+++ /dev/null
@@ -1,732 +0,0 @@
-<svg version="1.1" baseProfile="full" width="4075.5" height="401.0" viewbox="0 0 4075.5 401" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[Settings
-	]
-	
-	[OptOutAlertDialog
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[OptOutAlertDialog]o-[StudySubject]
-	
-	[DeleteAlertDialog
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[DeleteAlertDialog]o-[StudySubject]
-	
-	[DashboardScreen
-	  |
-	  +error: String?
-	]
-	
-	[OverflowMenuItem
-	  |
-	  +name: String;
-	  +icon: IconData;
-	  +routeName: String?;
-	  +onTap: dynamic Function()?
-	]
-	
-	[OverflowMenuItem]o-[IconData]
-	[OverflowMenuItem]o-[dynamic Function()?]
-	
-	[StudyFinishedPlaceholder
-	  |
-	  &lt;static&gt;+space: SizedBox
-	  |
-	  +Widget build()
-	]
-	
-	[StudyFinishedPlaceholder]o-[SizedBox]
-	
-	[ProgressRow
-	  |
-	  +subject: StudySubject?
-	]
-	
-	[ProgressRow]o-[StudySubject]
-	
-	[InterventionSegment
-	  |
-	  +intervention: Intervention;
-	  +percentCompleted: double;
-	  +percentMissed: double;
-	  +isCurrent: bool;
-	  +isFuture: bool;
-	  +phaseDuration: int
-	  |
-	  +List&lt;Widget&gt; buildSeparators();
-	  +Widget build()
-	]
-	
-	[InterventionSegment]o-[Intervention]
-	
-	[TaskBox
-	  |
-	  +taskInstance: TaskInstance;
-	  +icon: Icon;
-	  +onCompleted: dynamic Function()
-	]
-	
-	[TaskBox]o-[TaskInstance]
-	[TaskBox]o-[Icon]
-	[TaskBox]o-[dynamic Function()]
-	
-	[TaskOverview
-	  |
-	  +subject: StudySubject?;
-	  +scheduleToday: List&lt;TaskInstance&gt;?;
-	  +interventionIcon: String?
-	]
-	
-	[TaskOverview]o-[StudySubject]
-	
-	[FAQ
-	  |
-	  +Widget build()
-	]
-	
-	[Entry
-	  |
-	  +title: String;
-	  +children: List&lt;Entry&gt;
-	]
-	
-	[EntryItem
-	  |
-	  +entry: Entry
-	  |
-	  -Widget _buildTiles();
-	  +Widget build()
-	]
-	
-	[EntryItem]o-[Entry]
-	
-	[ContactScreen
-	]
-	
-	[ContactWidget
-	  |
-	  +contact: Contact?;
-	  +title: String;
-	  +subtitle: String?;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[ContactWidget]o-[Contact]
-	[ContactWidget]o-[Color]
-	
-	[ContactItem
-	  |
-	  +iconData: IconData;
-	  +itemName: String;
-	  +itemValue: String?;
-	  +type: ContactItemType?;
-	  +iconColor: Color?
-	  |
-	  +dynamic launchContact();
-	  +Widget build()
-	]
-	
-	[ContactItem]o-[IconData]
-	[ContactItem]o-[ContactItemType]
-	[ContactItem]o-[Color]
-	
-	[ContactItemType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ContactItemType&gt;;
-	  &lt;static&gt;+website: ContactItemType;
-	  &lt;static&gt;+email: ContactItemType;
-	  &lt;static&gt;+phone: ContactItemType
-	]
-	
-	[ContactItemType]o-[ContactItemType]
-	[Enum]&lt;:--[ContactItemType]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="401.0" width="4075.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M223.5 156.7 L223.5 203 L611.5 273.1517857142857 L611.5 273.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M228.8 147.3 L223.5 156.7 L218.2 147.3 L223.5 138.0 Z"></path>
-					</g>
-					<path d="M470.5 156.7 L470.5 203 L633.0370370370371 268.5 L633.0 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M475.8 147.3 L470.5 156.7 L465.2 147.3 L470.5 138.0 Z"></path>
-					</g>
-					<path d="M2417.0 128.9 L2698 203 L2740.2515432098767 268.5 L2740.3 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2409.4 121.3 L2417.0 128.9 L2406.7 131.6 L2399.0 124.1 Z"></path>
-					</g>
-					<path d="M2184.4 155.8 L2117.5 203 L2117.5 268.5 L2117.5 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2195.1 154.7 L2184.4 155.8 L2189.0 146.0 L2199.7 145.0 Z"></path>
-					</g>
-					<path d="M1532.0 156.7 L1532 203 L1532 268.5 L1532.0 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1537.3 147.3 L1532.0 156.7 L1526.7 147.3 L1532.0 138.0 Z"></path>
-					</g>
-					<path d="M916.5 141.2 L916.5 203 L718.3827160493827 268.5 L718.4 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M921.8 131.8 L916.5 141.2 L911.2 131.8 L916.5 122.5 Z"></path>
-					</g>
-					<path d="M1818.5 201.7 L1818.5 203 L1818.5 268.5 L1818.5 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1823.8 192.3 L1818.5 201.7 L1813.2 192.3 L1818.5 183.0 Z"></path>
-					</g>
-					<path d="M2607.7 156.1 L2605.75 203 L2605.75 268.5 L2605.8 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2613.5 147.1 L2607.7 156.1 L2602.8 146.6 L2608.5 137.5 Z"></path>
-					</g>
-					<path d="M2541.6 149.5 L2478 203 L2478 268.5 L2478.0 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2552.1 147.6 L2541.6 149.5 L2545.3 139.4 L2555.8 137.5 Z"></path>
-					</g>
-					<path d="M2477.2 144.4 L2329.5 203 L2329.5 268.5 L2329.5 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2487.9 145.9 L2477.2 144.4 L2483.9 136.0 L2494.6 137.5 Z"></path>
-					</g>
-					<path d="M1220.5 156.2 L1220.5 203 L731.5 275.1475409836066 L731.5 275.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1225.8 146.8 L1220.5 156.2 L1215.2 146.8 L1220.5 137.5 Z"></path>
-					</g>
-					<path d="M3078.5 163.7 L3087.5 203 L3087.5 245.5 L3087.5 245.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3081.6 153.4 L3078.5 163.7 L3071.2 155.8 L3074.3 145.5 Z"></path>
-					</g>
-					<path d="M3857.8 162.9 L3912.5 203 L3912.5 268.5 L3912.5 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3853.4 153.1 L3857.8 162.9 L3847.1 161.7 L3842.8 151.9 Z"></path>
-					</g>
-					<path d="M3659.8 119.7 L3363 203 L3379.1728395061727 268.5 L3379.2 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3670.2 122.3 L3659.8 119.7 L3667.3 112.0 L3677.8 114.7 Z"></path>
-					</g>
-					<path d="M3346.1 113.5 L2819 203 L2763.4058641975307 268.5 L2763.4 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3356.2 117.2 L3346.1 113.5 L3354.4 106.7 L3364.5 110.4 Z"></path>
-					</g>
-					<path d="M3517.3 192.8 L3521.5 203 L3545.3271604938273 223 L3545.3 223.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3518.7 182.1 L3517.3 192.8 L3508.9 186.2 L3510.3 175.5 Z"></path>
-					</g>
-					<path d="M3480.1 194.2 L3480.5 203 L3401.6574074074074 268.5 L3401.7 268.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3485.1 184.6 L3480.1 194.2 L3474.4 185.0 L3479.4 175.5 Z"></path>
-					</g>
-					<path d="M3801.8 226.8 L3814 223 L3821.5 223 L3821.5 223 L3829 284 L3829 284 L3821.5 345 L3821.5 345 L3814 345 L3814 345 L3784 335.66326530612247 L3784.0 335.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3791.3 224.5 L3801.8 226.8 L3794.5 234.7 L3784.0 232.3 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3946.4 111.0 L3745.25 203 L3713.83024691358 223 L3713.8 223.0 " fill="none"></path>
-					</g>
-					<path d="M3948.6 115.8 L3946.4 111.0 L3944.2 106.1 L3958.5 105.5 Z"></path>
-					<g data-name="Settings">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Settings">
-							<rect x="0.0" y="76.0" height="31.0" width="80.0" data-name="Settings"></rect>
-						</g>
-						<g transform="translate(0, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Settings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Settings">
-								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="Settings">Settings</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OptOutAlertDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OptOutAlertDialog">
-							<rect x="120.0" y="45.0" height="93.0" width="207.0" data-name="OptOutAlertDialog"></rect>
-							<path d="M120.0 76.0 L327.0 76.0" fill="none" data-name="OptOutAlertDialog"></path>
-							<path d="M120.0 107.0 L327.0 107.0" fill="none" data-name="OptOutAlertDialog"></path>
-						</g>
-						<g transform="translate(120, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptOutAlertDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptOutAlertDialog">OptOutAlertDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(120, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptOutAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptOutAlertDialog">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(120, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptOutAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptOutAlertDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="611.5" y="268.5" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(611.5, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DeleteAlertDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DeleteAlertDialog">
-							<rect x="367.0" y="45.0" height="93.0" width="207.0" data-name="DeleteAlertDialog"></rect>
-							<path d="M367.0 76.0 L574.0 76.0" fill="none" data-name="DeleteAlertDialog"></path>
-							<path d="M367.0 107.0 L574.0 107.0" fill="none" data-name="DeleteAlertDialog"></path>
-						</g>
-						<g transform="translate(367, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DeleteAlertDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="DeleteAlertDialog">DeleteAlertDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(367, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DeleteAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="DeleteAlertDialog">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(367, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DeleteAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="DeleteAlertDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="614.0" y="60.5" height="62.0" width="159.0" data-name="DashboardScreen"></rect>
-							<path d="M614.0 91.5 L773.0 91.5" fill="none" data-name="DashboardScreen"></path>
-						</g>
-						<g transform="translate(614, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="71.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(614, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+error: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OverflowMenuItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OverflowMenuItem">
-							<rect x="2152.0" y="38.0" height="107.0" width="247.0" data-name="OverflowMenuItem"></rect>
-							<path d="M2152.0 69.0 L2399.0 69.0" fill="none" data-name="OverflowMenuItem"></path>
-						</g>
-						<g transform="translate(2152, 38)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OverflowMenuItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OverflowMenuItem">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="OverflowMenuItem">OverflowMenuItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2152, 69)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OverflowMenuItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OverflowMenuItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="OverflowMenuItem">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OverflowMenuItem">+icon: IconData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="OverflowMenuItem">+routeName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="OverflowMenuItem">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="2706.8" y="268.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(2706.75, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="2029.0" y="268.5" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
-						</g>
-						<g transform="translate(2029, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
-								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFinishedPlaceholder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFinishedPlaceholder">
-							<rect x="1421.0" y="45.0" height="93.0" width="222.0" data-name="StudyFinishedPlaceholder"></rect>
-							<path d="M1421.0 76.0 L1643.0 76.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
-							<path d="M1421.0 107.0 L1643.0 107.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
-						</g>
-						<g transform="translate(1421, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFinishedPlaceholder">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFinishedPlaceholder">StudyFinishedPlaceholder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1421, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">&lt;static&gt;+space: SizedBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1421, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SizedBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SizedBox">
-							<rect x="1487.0" y="268.5" height="31.0" width="90.0" data-name="SizedBox"></rect>
-						</g>
-						<g transform="translate(1487, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SizedBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SizedBox">
-								<text x="37.0" y="13.5" stroke="none" text-anchor="middle" data-name="SizedBox">SizedBox</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ProgressRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ProgressRow">
-							<rect x="813.0" y="60.5" height="62.0" width="207.0" data-name="ProgressRow"></rect>
-							<path d="M813.0 91.5 L1020.0 91.5" fill="none" data-name="ProgressRow"></path>
-						</g>
-						<g transform="translate(813, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProgressRow">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProgressRow">ProgressRow</text>
-								
-							</g>
-						</g>
-						<g transform="translate(813, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ProgressRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="ProgressRow">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionSegment">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSegment">
-							<rect x="1683.0" y="0.0" height="183.0" width="271.0" data-name="InterventionSegment"></rect>
-							<path d="M1683.0 31.0 L1954.0 31.0" fill="none" data-name="InterventionSegment"></path>
-							<path d="M1683.0 137.0 L1954.0 137.0" fill="none" data-name="InterventionSegment"></path>
-						</g>
-						<g transform="translate(1683, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSegment">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSegment">InterventionSegment</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1683, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+percentCompleted: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionSegment">+percentMissed: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionSegment">+isCurrent: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionSegment">+isFuture: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionSegment">+phaseDuration: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1683, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+List&lt;Widget&gt; buildSeparators()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention">
-							<rect x="1763.5" y="268.5" height="31.0" width="110.0" data-name="Intervention"></rect>
-						</g>
-						<g transform="translate(1763.5, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention">Intervention</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskBox">
-							<rect x="2464.5" y="45.5" height="92.0" width="292.0" data-name="TaskBox"></rect>
-							<path d="M2464.5 76.5 L2756.5 76.5" fill="none" data-name="TaskBox"></path>
-						</g>
-						<g transform="translate(2464.5, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskBox">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskBox">TaskBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2464.5, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskBox">+taskInstance: TaskInstance</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskBox">+icon: Icon</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskBox">+onCompleted: dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskInstance">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskInstance">
-							<rect x="2544.8" y="268.5" height="31.0" width="122.0" data-name="TaskInstance"></rect>
-						</g>
-						<g transform="translate(2544.75, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskInstance">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskInstance">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskInstance">TaskInstance</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Icon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Icon">
-							<rect x="2453.0" y="268.5" height="31.0" width="50.0" data-name="Icon"></rect>
-						</g>
-						<g transform="translate(2453, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Icon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Icon">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Icon">Icon</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="2246.0" y="268.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(2246, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskOverview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskOverview">
-							<rect x="1060.0" y="45.5" height="92.0" width="321.0" data-name="TaskOverview"></rect>
-							<path d="M1060.0 76.5 L1381.0 76.5" fill="none" data-name="TaskOverview"></path>
-						</g>
-						<g transform="translate(1060, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskOverview">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskOverview">TaskOverview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1060, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskOverview">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskOverview">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskOverview">+scheduleToday: List&lt;TaskInstance&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskOverview">+interventionIcon: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FAQ">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FAQ">
-							<rect x="2796.5" y="60.5" height="62.0" width="136.0" data-name="FAQ"></rect>
-							<path d="M2796.5 91.5 L2932.5 91.5" fill="none" data-name="FAQ"></path>
-						</g>
-						<g transform="translate(2796.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FAQ">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="FAQ">FAQ</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2796.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FAQ">
-								<text x="0.0" y="13.5" stroke="none" data-name="FAQ">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Entry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Entry">
-							<rect x="2993.5" y="245.5" height="77.0" width="188.0" data-name="Entry"></rect>
-							<path d="M2993.5 276.5 L3181.5 276.5" fill="none" data-name="Entry"></path>
-						</g>
-						<g transform="translate(2993.5, 245.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Entry">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="Entry">Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2993.5, 276.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Entry">
-								<text x="0.0" y="13.5" stroke="none" data-name="Entry">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Entry">+children: List&lt;Entry&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EntryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EntryItem">
-							<rect x="2972.5" y="37.5" height="108.0" width="179.0" data-name="EntryItem"></rect>
-							<path d="M2972.5 68.5 L3151.5 68.5" fill="none" data-name="EntryItem"></path>
-							<path d="M2972.5 99.5 L3151.5 99.5" fill="none" data-name="EntryItem"></path>
-						</g>
-						<g transform="translate(2972.5, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EntryItem">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="EntryItem">EntryItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2972.5, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">+entry: Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2972.5, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">-Widget _buildTiles()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EntryItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactScreen">
-							<rect x="3191.5" y="76.0" height="31.0" width="133.0" data-name="ContactScreen"></rect>
-						</g>
-						<g transform="translate(3191.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactScreen">
-								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactScreen">ContactScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactWidget">
-							<rect x="3677.8" y="22.5" height="138.0" width="165.0" data-name="ContactWidget"></rect>
-							<path d="M3677.8 53.5 L3842.8 53.5" fill="none" data-name="ContactWidget"></path>
-							<path d="M3677.8 129.5 L3842.8 129.5" fill="none" data-name="ContactWidget"></path>
-						</g>
-						<g transform="translate(3677.75, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactWidget">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactWidget">ContactWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3677.75, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+contact: Contact?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactWidget">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactWidget">+subtitle: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3677.75, 129.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Contact">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Contact">
-							<rect x="3874.0" y="268.5" height="31.0" width="77.0" data-name="Contact"></rect>
-						</g>
-						<g transform="translate(3874, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Contact">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Contact">
-								<text x="30.5" y="13.5" stroke="none" text-anchor="middle" data-name="Contact">Contact</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="3354.0" y="268.5" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(3354, 268.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItem">
-							<rect x="3364.5" y="7.5" height="168.0" width="223.0" data-name="ContactItem"></rect>
-							<path d="M3364.5 38.5 L3587.5 38.5" fill="none" data-name="ContactItem"></path>
-							<path d="M3364.5 129.5 L3587.5 129.5" fill="none" data-name="ContactItem"></path>
-						</g>
-						<g transform="translate(3364.5, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItem">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItem">ContactItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3364.5, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+iconData: IconData</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+itemName: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItem">+itemValue: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItem">+type: ContactItemType?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItem">+iconColor: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3364.5, 129.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+dynamic launchContact()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItemType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItemType">
-							<rect x="3452.0" y="223.0" height="122.0" width="332.0" data-name="ContactItemType"></rect>
-							<path d="M3452.0 254.0 L3784.0 254.0" fill="none" data-name="ContactItemType"></path>
-						</g>
-						<g transform="translate(3452, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItemType">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItemType">ContactItemType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3452, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItemType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItemType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+values: List&lt;ContactItemType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+website: ContactItemType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+email: ContactItemType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+phone: ContactItemType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="3958.5" y="76.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(3958.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/multimodal/uml.svg b/docs/uml/app/lib/screens/study/multimodal/uml.svg
deleted file mode 100644
index 6f6fa36dc..000000000
--- a/docs/uml/app/lib/screens/study/multimodal/uml.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<svg version="1.1" baseProfile="full" width="246.0" height="133.0" viewbox="0 0 246 133" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[CapturePictureScreen
-	  |
-	  +userId: String;
-	  +studyId: String
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="133.0" width="246.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)">
-					<g data-name="CapturePictureScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CapturePictureScreen">
-							<rect x="0.0" y="0.0" height="77.0" width="190.0" data-name="CapturePictureScreen"></rect>
-							<path d="M0.0 31.0 L190.0 31.0" fill="none" data-name="CapturePictureScreen"></path>
-						</g>
-						<g transform="translate(0, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CapturePictureScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CapturePictureScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="CapturePictureScreen">CapturePictureScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CapturePictureScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CapturePictureScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="CapturePictureScreen">+userId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CapturePictureScreen">+studyId: String</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/onboarding/uml.svg b/docs/uml/app/lib/screens/study/onboarding/uml.svg
deleted file mode 100644
index 942820264..000000000
--- a/docs/uml/app/lib/screens/study/onboarding/uml.svg
+++ /dev/null
@@ -1,721 +0,0 @@
-<svg version="1.1" baseProfile="full" width="5394.0" height="295.0" viewbox="0 0 5394 295" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudySelectionScreen
-	]
-	
-	[InviteCodeDialog
-	]
-	
-	[EligibilityResult
-	  |
-	  +eligible: bool;
-	  +firstFailed: EligibilityCriterion?
-	]
-	
-	[EligibilityResult]o-[EligibilityCriterion]
-	
-	[EligibilityScreen
-	  |
-	  +study: Study?
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;EligibilityResult&gt; routeFor()
-	]
-	
-	[EligibilityScreen]o-[Study]
-	
-	[ConsentScreen
-	]
-	
-	[ConsentCard
-	  |
-	  +consent: ConsentItem?;
-	  +index: int?;
-	  +onTapped: dynamic Function(int);
-	  +isChecked: bool?
-	  |
-	  +Widget build()
-	]
-	
-	[ConsentCard]o-[ConsentItem]
-	[ConsentCard]o-[dynamic Function(int)]
-	
-	[ConsentElement
-	  |
-	  +title: String;
-	  +descriptionText: String;
-	  +acknowledgmentText: String;
-	  +icon: IconData
-	]
-	
-	[ConsentElement]o-[IconData]
-	
-	[KickoffScreen
-	]
-	
-	[_KickoffScreen
-	  |
-	  +subject: StudySubject?;
-	  +ready: bool
-	  |
-	  -dynamic _storeUserStudy();
-	  -Widget _constructStatusIcon();
-	  -String _getStatusText();
-	  +Widget build()
-	]
-	
-	[_KickoffScreen]o-[StudySubject]
-	
-	[InterventionSelectionScreen
-	]
-	
-	[OnboardingProgress
-	  |
-	  +stage: int;
-	  +progress: double
-	  |
-	  -double _getProgressForStage();
-	  +Widget build()
-	]
-	
-	[StudyOverviewScreen
-	]
-	
-	[_StudyOverviewScreen
-	  |
-	  +study: Study?
-	  |
-	  +dynamic navigateToJourney();
-	  +dynamic navigateToEligibilityCheck();
-	  +Widget build()
-	]
-	
-	[_StudyOverviewScreen]o-[Study]
-	
-	[StudyDetailsView
-	  |
-	  +study: Study?;
-	  +iconSize: double
-	  |
-	  +Widget build()
-	]
-	
-	[StudyDetailsView]o-[Study]
-	
-	[JourneyOverviewScreen
-	]
-	
-	[_JourneyOverviewScreen
-	  |
-	  +subject: StudySubject?
-	  |
-	  +dynamic getConsentAndNavigateToDashboard();
-	  +Widget build()
-	]
-	
-	[_JourneyOverviewScreen]o-[StudySubject]
-	
-	[Timeline
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[Timeline]o-[StudySubject]
-	
-	[InterventionTile
-	  |
-	  +title: String?;
-	  +iconName: String;
-	  +date: DateTime;
-	  +color: Color?;
-	  +isFirst: bool;
-	  +isLast: bool
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionTile]o-[Color]
-	
-	[IconIndicator
-	  |
-	  +iconName: String;
-	  +color: Color?
-	  |
-	  +Widget build()
-	]
-	
-	[IconIndicator]o-[Color]
-	
-	[TimelineChild
-	  |
-	  +child: Widget?
-	  |
-	  +Widget build()
-	]
-	
-	[TimelineChild]o-[&lt;abstract&gt;Widget]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="295.0" width="5394.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M550.5 141.2 L550.5 188 L550.5 208 L550.5 208.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M555.8 131.8 L550.5 141.2 L545.2 131.8 L550.5 122.5 Z"></path>
-					</g>
-					<path d="M951.0 149.2 L951 188 L1527.5 221.7162273476112 L1527.5 221.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M956.3 139.8 L951.0 149.2 L945.7 139.8 L951.0 130.5 Z"></path>
-					</g>
-					<path d="M2146.8 163.7 L2112 188 L2112 208 L2112.0 208.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2157.5 162.7 L2146.8 163.7 L2151.4 154.0 L2162.1 153.0 Z"></path>
-					</g>
-					<path d="M2422.2 119.3 L2736.5 188 L2736.5 208 L2736.5 208.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2414.3 112.1 L2422.2 119.3 L2412.0 122.5 L2404.0 115.3 Z"></path>
-					</g>
-					<path d="M3388.5 156.2 L3388.5 188 L3388.5 208 L3388.5 208.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3393.8 146.8 L3388.5 156.2 L3383.2 146.8 L3388.5 137.5 Z"></path>
-					</g>
-					<path d="M3683.5 179.2 L3683.5 188 L4247 220.08380112269447 L4247.0 220.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3688.8 169.8 L3683.5 179.2 L3678.2 169.8 L3683.5 160.5 Z"></path>
-					</g>
-					<path d="M1558.0 164.2 L1558 188 L1558 208 L1558.0 208.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1563.3 154.8 L1558.0 164.2 L1552.7 154.8 L1558.0 145.5 Z"></path>
-					</g>
-					<path d="M1834.5 156.7 L1834.5 188 L1588.5 219.58408679927666 L1588.5 219.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1839.8 147.3 L1834.5 156.7 L1829.2 147.3 L1834.5 138.0 Z"></path>
-					</g>
-					<path d="M4307.0 156.7 L4307 188 L4307 208 L4307.0 208.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4312.3 147.3 L4307.0 156.7 L4301.7 147.3 L4307.0 138.0 Z"></path>
-					</g>
-					<path d="M4654.5 149.2 L4654.5 188 L4367 217.3705035971223 L4367.0 217.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4659.8 139.8 L4654.5 149.2 L4649.2 139.8 L4654.5 130.5 Z"></path>
-					</g>
-					<path d="M4878.5 186.7 L4878.5 188 L4950 213.25621890547262 L4950.0 213.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4883.8 177.3 L4878.5 186.7 L4873.2 177.3 L4878.5 168.0 Z"></path>
-					</g>
-					<path d="M5079.5 156.7 L5079.5 188 L5008 213.25621890547262 L5008.0 213.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5084.8 147.3 L5079.5 156.7 L5074.2 147.3 L5079.5 138.0 Z"></path>
-					</g>
-					<path d="M5269.0 149.2 L5269 188 L5269 208 L5269.0 208.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5274.3 139.8 L5269.0 149.2 L5263.7 139.8 L5269.0 130.5 Z"></path>
-					</g>
-					<g data-name="StudySelectionScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySelectionScreen">
-							<rect x="0.0" y="68.5" height="31.0" width="190.0" data-name="StudySelectionScreen"></rect>
-						</g>
-						<g transform="translate(0, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySelectionScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySelectionScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySelectionScreen">StudySelectionScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeDialog">
-							<rect x="230.0" y="68.5" height="31.0" width="151.0" data-name="InviteCodeDialog"></rect>
-						</g>
-						<g transform="translate(230, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeDialog">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeDialog">InviteCodeDialog</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityResult">
-							<rect x="421.0" y="45.5" height="77.0" width="259.0" data-name="EligibilityResult"></rect>
-							<path d="M421.0 76.5 L680.0 76.5" fill="none" data-name="EligibilityResult"></path>
-						</g>
-						<g transform="translate(421, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityResult">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityResult">EligibilityResult</text>
-								
-							</g>
-						</g>
-						<g transform="translate(421, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityResult">+eligible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EligibilityResult">+firstFailed: EligibilityCriterion?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityCriterion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityCriterion">
-							<rect x="474.5" y="208.0" height="31.0" width="152.0" data-name="EligibilityCriterion"></rect>
-						</g>
-						<g transform="translate(474.5, 208)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityCriterion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityCriterion">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityCriterion">EligibilityCriterion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityScreen">
-							<rect x="720.0" y="37.5" height="93.0" width="462.0" data-name="EligibilityScreen"></rect>
-							<path d="M720.0 68.5 L1182.0 68.5" fill="none" data-name="EligibilityScreen"></path>
-							<path d="M720.0 99.5 L1182.0 99.5" fill="none" data-name="EligibilityScreen"></path>
-						</g>
-						<g transform="translate(720, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityScreen">
-								<text x="223.0" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityScreen">EligibilityScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(720, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityScreen">+study: Study?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(720, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityScreen">&lt;static&gt;+MaterialPageRoute&lt;EligibilityResult&gt; routeFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="1527.5" y="208.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(1527.5, 208)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentScreen">
-							<rect x="1222.0" y="68.5" height="31.0" width="138.0" data-name="ConsentScreen"></rect>
-						</g>
-						<g transform="translate(1222, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentScreen">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentScreen">ConsentScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentCard">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentCard">
-							<rect x="2118.0" y="15.0" height="138.0" width="286.0" data-name="ConsentCard"></rect>
-							<path d="M2118.0 46.0 L2404.0 46.0" fill="none" data-name="ConsentCard"></path>
-							<path d="M2118.0 122.0 L2404.0 122.0" fill="none" data-name="ConsentCard"></path>
-						</g>
-						<g transform="translate(2118, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentCard">
-								<text x="135.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentCard">ConsentCard</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2118, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+consent: ConsentItem?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentCard">+index: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentCard">+onTapped: dynamic Function(int)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentCard">+isChecked: bool?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2118, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItem">
-							<rect x="2054.0" y="208.0" height="31.0" width="116.0" data-name="ConsentItem"></rect>
-						</g>
-						<g transform="translate(2054, 208)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItem">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItem">ConsentItem</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(int)">
-							<rect x="2643.5" y="208.0" height="31.0" width="186.0" data-name="dynamic Function(int)"></rect>
-						</g>
-						<g transform="translate(2643.5, 208)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(int)">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(int)">dynamic Function(int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentElement">
-							<rect x="3264.0" y="30.5" height="107.0" width="249.0" data-name="ConsentElement"></rect>
-							<path d="M3264.0 61.5 L3513.0 61.5" fill="none" data-name="ConsentElement"></path>
-						</g>
-						<g transform="translate(3264, 30.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentElement">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentElement">ConsentElement</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3264, 61.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentElement">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentElement">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentElement">+descriptionText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentElement">+acknowledgmentText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentElement">+icon: IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="3345.0" y="208.0" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(3345, 208)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="KickoffScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="KickoffScreen">
-							<rect x="1953.0" y="68.5" height="31.0" width="125.0" data-name="KickoffScreen"></rect>
-						</g>
-						<g transform="translate(1953, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="KickoffScreen">
-								<text x="54.5" y="13.5" stroke="none" text-anchor="middle" data-name="KickoffScreen">KickoffScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_KickoffScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_KickoffScreen">
-							<rect x="3553.0" y="7.5" height="153.0" width="261.0" data-name="_KickoffScreen"></rect>
-							<path d="M3553.0 38.5 L3814.0 38.5" fill="none" data-name="_KickoffScreen"></path>
-							<path d="M3553.0 84.5 L3814.0 84.5" fill="none" data-name="_KickoffScreen"></path>
-						</g>
-						<g transform="translate(3553, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_KickoffScreen">
-								<text x="122.5" y="13.5" stroke="none" text-anchor="middle" data-name="_KickoffScreen">_KickoffScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3553, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">+ready: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3553, 84.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">-dynamic _storeUserStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">-Widget _constructStatusIcon()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="_KickoffScreen">-String _getStatusText()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="_KickoffScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="4247.0" y="208.0" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(4247, 208)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionSelectionScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSelectionScreen">
-							<rect x="2444.0" y="68.5" height="31.0" width="239.0" data-name="InterventionSelectionScreen"></rect>
-						</g>
-						<g transform="translate(2444, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSelectionScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSelectionScreen">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSelectionScreen">InterventionSelectionScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OnboardingProgress">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OnboardingProgress">
-							<rect x="2723.0" y="22.5" height="123.0" width="271.0" data-name="OnboardingProgress"></rect>
-							<path d="M2723.0 53.5 L2994.0 53.5" fill="none" data-name="OnboardingProgress"></path>
-							<path d="M2723.0 99.5 L2994.0 99.5" fill="none" data-name="OnboardingProgress"></path>
-						</g>
-						<g transform="translate(2723, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OnboardingProgress">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="OnboardingProgress">OnboardingProgress</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2723, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
-								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">+stage: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+progress: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2723, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
-								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">-double _getProgressForStage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyOverviewScreen">
-							<rect x="3034.0" y="68.5" height="31.0" width="190.0" data-name="StudyOverviewScreen"></rect>
-						</g>
-						<g transform="translate(3034, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyOverviewScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyOverviewScreen">StudyOverviewScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_StudyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_StudyOverviewScreen">
-							<rect x="1400.0" y="22.5" height="123.0" width="316.0" data-name="_StudyOverviewScreen"></rect>
-							<path d="M1400.0 53.5 L1716.0 53.5" fill="none" data-name="_StudyOverviewScreen"></path>
-							<path d="M1400.0 84.5 L1716.0 84.5" fill="none" data-name="_StudyOverviewScreen"></path>
-						</g>
-						<g transform="translate(1400, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_StudyOverviewScreen">
-								<text x="150.0" y="13.5" stroke="none" text-anchor="middle" data-name="_StudyOverviewScreen">_StudyOverviewScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1400, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+study: Study?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1400, 84.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToJourney()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToEligibilityCheck()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="_StudyOverviewScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDetailsView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDetailsView">
-							<rect x="1756.0" y="30.0" height="108.0" width="157.0" data-name="StudyDetailsView"></rect>
-							<path d="M1756.0 61.0 L1913.0 61.0" fill="none" data-name="StudyDetailsView"></path>
-							<path d="M1756.0 107.0 L1913.0 107.0" fill="none" data-name="StudyDetailsView"></path>
-						</g>
-						<g transform="translate(1756, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDetailsView">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDetailsView">StudyDetailsView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1756, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+study: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDetailsView">+iconSize: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1756, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="JourneyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JourneyOverviewScreen">
-							<rect x="3854.0" y="68.5" height="31.0" width="209.0" data-name="JourneyOverviewScreen"></rect>
-						</g>
-						<g transform="translate(3854, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JourneyOverviewScreen">
-								<text x="96.5" y="13.5" stroke="none" text-anchor="middle" data-name="JourneyOverviewScreen">JourneyOverviewScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_JourneyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_JourneyOverviewScreen">
-							<rect x="4103.0" y="30.0" height="108.0" width="408.0" data-name="_JourneyOverviewScreen"></rect>
-							<path d="M4103.0 61.0 L4511.0 61.0" fill="none" data-name="_JourneyOverviewScreen"></path>
-							<path d="M4103.0 92.0 L4511.0 92.0" fill="none" data-name="_JourneyOverviewScreen"></path>
-						</g>
-						<g transform="translate(4103, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_JourneyOverviewScreen">
-								<text x="196.0" y="13.5" stroke="none" text-anchor="middle" data-name="_JourneyOverviewScreen">_JourneyOverviewScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4103, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_JourneyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_JourneyOverviewScreen">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4103, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_JourneyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_JourneyOverviewScreen">+dynamic getConsentAndNavigateToDashboard()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_JourneyOverviewScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Timeline">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Timeline">
-							<rect x="4551.0" y="37.5" height="93.0" width="207.0" data-name="Timeline"></rect>
-							<path d="M4551.0 68.5 L4758.0 68.5" fill="none" data-name="Timeline"></path>
-							<path d="M4551.0 99.5 L4758.0 99.5" fill="none" data-name="Timeline"></path>
-						</g>
-						<g transform="translate(4551, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timeline">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="Timeline">Timeline</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4551, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Timeline">
-								<text x="0.0" y="13.5" stroke="none" data-name="Timeline">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4551, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Timeline">
-								<text x="0.0" y="13.5" stroke="none" data-name="Timeline">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTile">
-							<rect x="4798.0" y="0.0" height="168.0" width="161.0" data-name="InterventionTile"></rect>
-							<path d="M4798.0 31.0 L4959.0 31.0" fill="none" data-name="InterventionTile"></path>
-							<path d="M4798.0 137.0 L4959.0 137.0" fill="none" data-name="InterventionTile"></path>
-						</g>
-						<g transform="translate(4798, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTile">
-								<text x="72.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTile">InterventionTile</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4798, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTile">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTile">+iconName: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTile">+date: DateTime</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTile">+color: Color?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTile">+isFirst: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTile">+isLast: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4798, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTile">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="4950.0" y="208.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(4950, 208)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconIndicator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconIndicator">
-							<rect x="4999.0" y="30.0" height="108.0" width="161.0" data-name="IconIndicator"></rect>
-							<path d="M4999.0 61.0 L5160.0 61.0" fill="none" data-name="IconIndicator"></path>
-							<path d="M4999.0 107.0 L5160.0 107.0" fill="none" data-name="IconIndicator"></path>
-						</g>
-						<g transform="translate(4999, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconIndicator">
-								<text x="72.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconIndicator">IconIndicator</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4999, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconIndicator">+iconName: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconIndicator">+color: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4999, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconIndicator">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TimelineChild">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimelineChild">
-							<rect x="5200.0" y="37.5" height="93.0" width="138.0" data-name="TimelineChild"></rect>
-							<path d="M5200.0 68.5 L5338.0 68.5" fill="none" data-name="TimelineChild"></path>
-							<path d="M5200.0 99.5 L5338.0 99.5" fill="none" data-name="TimelineChild"></path>
-						</g>
-						<g transform="translate(5200, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimelineChild">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="TimelineChild">TimelineChild</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5200, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimelineChild">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimelineChild">+child: Widget?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5200, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimelineChild">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimelineChild">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="5233.5" y="208.0" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(5233.5, 208)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/report/performance/uml.svg b/docs/uml/app/lib/screens/study/report/performance/uml.svg
deleted file mode 100644
index 882316c2f..000000000
--- a/docs/uml/app/lib/screens/study/report/performance/uml.svg
+++ /dev/null
@@ -1,291 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1567.0" height="357.0" viewbox="0 0 1567 357" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[PerformanceDetailsScreen
-	  |
-	  +reportSubject: StudySubject?
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor();
-	  +Widget build()
-	]
-	
-	[PerformanceDetailsScreen]o-[StudySubject]
-	
-	[InterventionPerformanceBar
-	  |
-	  +intervention: Intervention;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPerformanceBar]o-[Intervention]
-	[InterventionPerformanceBar]o-[StudySubject]
-	
-	[ObservationPerformanceBar
-	  |
-	  +observation: Observation;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[ObservationPerformanceBar]o-[&lt;abstract&gt;Observation]
-	[ObservationPerformanceBar]o-[StudySubject]
-	
-	[PerformanceBar
-	  |
-	  +task: Task;
-	  +completed: int;
-	  +total: int
-	  |
-	  +Widget build()
-	]
-	
-	[PerformanceBar]o-[&lt;abstract&gt;Task]
-	
-	[PerformanceSection
-	  |
-	  +minimumRatio: double;
-	  +maximum: double
-	  |
-	  +Widget buildContent();
-	  +String getPowerLevelDescription();
-	  +int getCountableObservationAmount()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[PerformanceSection]
-	
-	[PerformanceBar
-	  |
-	  +progress: double;
-	  +minimum: double?
-	  |
-	  +Widget build()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="357.0" width="1567.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M204.5 134.2 L204.5 143 L254.0505617977528 216.5 L254.1 216.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M209.8 124.8 L204.5 134.2 L199.2 124.8 L204.5 115.5 Z"></path>
-					</g>
-					<path d="M690.3 124.0 L727.5 143 L727.5 216.5 L727.5 216.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M684.4 115.0 L690.3 124.0 L679.6 124.5 L673.7 115.5 Z"></path>
-					</g>
-					<path d="M444.2 123.9 L406.25 143 L289.186797752809 216.5 L289.2 216.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M454.9 124.5 L444.2 123.9 L450.1 114.9 L460.8 115.5 Z"></path>
-					</g>
-					<path d="M924.5 127.6 L942.5 143 L942.5 216.5 L942.5 216.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M920.8 117.5 L924.5 127.6 L913.9 125.6 L910.3 115.5 Z"></path>
-					</g>
-					<path d="M709.1 101.5 L565.75 143 L316.96488764044943 216.5 L317.0 216.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M719.5 104.0 L709.1 101.5 L716.6 93.7 L727.0 96.3 Z"></path>
-					</g>
-					<path d="M1120.0 141.7 L1120 143 L1120 216.5 L1120.0 216.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1125.3 132.3 L1120.0 141.7 L1114.7 132.3 L1120.0 123.0 Z"></path>
-					</g>
-					<path d="M1349.0 90.3 L1349 143 L1349 163 L1349.0 163.0 " fill="none"></path>
-					<path d="M1354.3 90.3 L1349.0 90.3 L1343.7 90.3 L1349.0 77.0 Z"></path>
-					<g data-name="PerformanceDetailsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceDetailsScreen">
-							<rect x="0.0" y="7.5" height="108.0" width="409.0" data-name="PerformanceDetailsScreen"></rect>
-							<path d="M0.0 38.5 L409.0 38.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-							<path d="M0.0 69.5 L409.0 69.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-						</g>
-						<g transform="translate(0, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceDetailsScreen">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceDetailsScreen">PerformanceDetailsScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">+reportSubject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 69.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceDetailsScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="204.5" y="216.5" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(204.5, 216.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPerformanceBar">
-							<rect x="449.0" y="7.5" height="108.0" width="238.0" data-name="InterventionPerformanceBar"></rect>
-							<path d="M449.0 38.5 L687.0 38.5" fill="none" data-name="InterventionPerformanceBar"></path>
-							<path d="M449.0 84.5 L687.0 84.5" fill="none" data-name="InterventionPerformanceBar"></path>
-						</g>
-						<g transform="translate(449, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPerformanceBar">
-								<text x="111.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPerformanceBar">InterventionPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(449, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(449, 84.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention">
-							<rect x="672.5" y="216.5" height="31.0" width="110.0" data-name="Intervention"></rect>
-						</g>
-						<g transform="translate(672.5, 216.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention">Intervention</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ObservationPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ObservationPerformanceBar">
-							<rect x="727.0" y="7.5" height="108.0" width="240.0" data-name="ObservationPerformanceBar"></rect>
-							<path d="M727.0 38.5 L967.0 38.5" fill="none" data-name="ObservationPerformanceBar"></path>
-							<path d="M727.0 84.5 L967.0 84.5" fill="none" data-name="ObservationPerformanceBar"></path>
-						</g>
-						<g transform="translate(727, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ObservationPerformanceBar">
-								<text x="112.0" y="13.5" stroke="none" text-anchor="middle" data-name="ObservationPerformanceBar">ObservationPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(727, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+observation: Observation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ObservationPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(727, 84.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Observation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Observation">
-							<rect x="886.5" y="216.5" height="31.0" width="112.0" data-name="Observation"></rect>
-						</g>
-						<g transform="translate(886.5, 216.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Observation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Observation">
-								<text x="48.0" y="13.5" stroke="none" text-anchor="middle" data-name="Observation">Observation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceBar">
-							<rect x="1048.0" y="0.0" height="123.0" width="144.0" data-name="PerformanceBar"></rect>
-							<path d="M1048.0 31.0 L1192.0 31.0" fill="none" data-name="PerformanceBar"></path>
-							<path d="M1048.0 92.0 L1192.0 92.0" fill="none" data-name="PerformanceBar"></path>
-						</g>
-						<g transform="translate(1048, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceBar">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceBar">PerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1048, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+task: Task</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceBar">+completed: int</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PerformanceBar">+total: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1048, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Task">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Task">
-							<rect x="1093.0" y="216.5" height="31.0" width="54.0" data-name="Task"></rect>
-						</g>
-						<g transform="translate(1093, 216.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Task">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Task">
-								<text x="19.0" y="13.5" stroke="none" text-anchor="middle" data-name="Task">Task</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceSection">
-							<rect x="1187.0" y="163.0" height="138.0" width="324.0" data-name="PerformanceSection"></rect>
-							<path d="M1187.0 194.0 L1511.0 194.0" fill="none" data-name="PerformanceSection"></path>
-							<path d="M1187.0 240.0 L1511.0 240.0" fill="none" data-name="PerformanceSection"></path>
-						</g>
-						<g transform="translate(1187, 163)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceSection">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceSection">PerformanceSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1187, 194)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+minimumRatio: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+maximum: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1187, 240)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+Widget buildContent()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+String getPowerLevelDescription()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PerformanceSection">+int getCountableObservationAmount()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GenericSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GenericSection">
-							<rect x="1280.5" y="46.0" height="31.0" width="137.0" data-name="GenericSection"></rect>
-						</g>
-						<g transform="translate(1280.5, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GenericSection">
-								<text x="60.5" y="13.5" stroke="none" text-anchor="middle" data-name="GenericSection">GenericSection</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/report/sections/uml.svg b/docs/uml/app/lib/screens/study/report/sections/uml.svg
deleted file mode 100644
index 61a7f1b00..000000000
--- a/docs/uml/app/lib/screens/study/report/sections/uml.svg
+++ /dev/null
@@ -1,184 +0,0 @@
-<svg version="1.1" baseProfile="full" width="782.0" height="562.0" viewbox="0 0 782 562" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[LinearRegressionSectionWidget
-	  |
-	  +section: LinearRegressionSection
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionWidget]o-[LinearRegressionSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[LinearRegressionSectionWidget]
-	
-	[AverageSectionWidget
-	  |
-	  +section: AverageSection;
-	  +titlePos: List&lt;int&gt;;
-	  +phasePos: List&lt;int&gt;
-	  |
-	  +Widget build();
-	  +Widget getLegend();
-	  +Widget getDiagram();
-	  +BarChartData getChartData();
-	  +Widget getTitles();
-	  +Widget getValues();
-	  +List&lt;BarChartGroupData&gt; getBarGroups();
-	  +FlGridData getGridData();
-	  +MaterialColor getColor();
-	  +int getDayIndex();
-	  +Iterable&lt;DiagramDatum&gt; getAggregatedData();
-	  +Map&lt;String, String?&gt; getInterventionNames()
-	]
-	
-	[AverageSectionWidget]o-[AverageSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[AverageSectionWidget]
-	
-	[DiagramDatum
-	  |
-	  +x: num;
-	  +value: num;
-	  +timestamp: DateTime?;
-	  +intervention: String
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="562.0" width="782.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M146.0 356.2 L146 455 L146 475 L146.0 475.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M151.3 346.8 L146.0 356.2 L140.7 346.8 L146.0 337.5 Z"></path>
-					</g>
-					<path d="M284.7 73.8 L146 127 L146 244.5 L146.0 244.5 " fill="none"></path>
-					<path d="M286.6 78.8 L284.7 73.8 L282.8 68.8 L297.1 69.0 Z"></path>
-					<path d="M529.0 453.7 L529 455 L529 475 L529.0 475.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M534.3 444.3 L529.0 453.7 L523.7 444.3 L529.0 435.0 Z"></path>
-					</g>
-					<path d="M390.3 73.8 L529 127 L529 147 L529.0 147.0 " fill="none"></path>
-					<path d="M392.2 68.8 L390.3 73.8 L388.4 78.8 L377.9 69.0 Z"></path>
-					<g data-name="LinearRegressionSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionWidget">
-							<rect x="0.0" y="244.5" height="93.0" width="292.0" data-name="LinearRegressionSectionWidget"></rect>
-							<path d="M0.0 275.5 L292.0 275.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-							<path d="M0.0 306.5 L292.0 306.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-						</g>
-						<g transform="translate(0, 244.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionWidget">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionWidget">LinearRegressionSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 275.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+section: LinearRegressionSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSection">
-							<rect x="38.5" y="475.0" height="31.0" width="215.0" data-name="LinearRegressionSection"></rect>
-						</g>
-						<g transform="translate(38.5, 475)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSection">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSection">LinearRegressionSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionWidget">
-							<rect x="246.0" y="38.0" height="31.0" width="183.0" data-name="ReportSectionWidget"></rect>
-						</g>
-						<g transform="translate(246, 38)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionWidget">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionWidget">ReportSectionWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionWidget">
-							<rect x="332.0" y="147.0" height="288.0" width="394.0" data-name="AverageSectionWidget"></rect>
-							<path d="M332.0 178.0 L726.0 178.0" fill="none" data-name="AverageSectionWidget"></path>
-							<path d="M332.0 239.0 L726.0 239.0" fill="none" data-name="AverageSectionWidget"></path>
-						</g>
-						<g transform="translate(332, 147)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionWidget">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionWidget">AverageSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(332, 178)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+section: AverageSection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+titlePos: List&lt;int&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+phasePos: List&lt;int&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(332, 239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+Widget getLegend()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+Widget getDiagram()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AverageSectionWidget">+BarChartData getChartData()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AverageSectionWidget">+Widget getTitles()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AverageSectionWidget">+Widget getValues()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AverageSectionWidget">+List&lt;BarChartGroupData&gt; getBarGroups()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AverageSectionWidget">+FlGridData getGridData()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AverageSectionWidget">+MaterialColor getColor()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AverageSectionWidget">+int getDayIndex()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AverageSectionWidget">+Iterable&lt;DiagramDatum&gt; getAggregatedData()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AverageSectionWidget">+Map&lt;String, String?&gt; getInterventionNames()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSection">
-							<rect x="458.5" y="475.0" height="31.0" width="141.0" data-name="AverageSection"></rect>
-						</g>
-						<g transform="translate(458.5, 475)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSection">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSection">AverageSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DiagramDatum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DiagramDatum">
-							<rect x="469.0" y="0.0" height="107.0" width="202.0" data-name="DiagramDatum"></rect>
-							<path d="M469.0 31.0 L671.0 31.0" fill="none" data-name="DiagramDatum"></path>
-						</g>
-						<g transform="translate(469, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DiagramDatum">
-								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="DiagramDatum">DiagramDatum</text>
-								
-							</g>
-						</g>
-						<g transform="translate(469, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DiagramDatum">
-								<text x="0.0" y="13.5" stroke="none" data-name="DiagramDatum">+x: num</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DiagramDatum">+value: num</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DiagramDatum">+timestamp: DateTime?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DiagramDatum">+intervention: String</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/report/uml.svg b/docs/uml/app/lib/screens/study/report/uml.svg
deleted file mode 100644
index 6e51568c4..000000000
--- a/docs/uml/app/lib/screens/study/report/uml.svg
+++ /dev/null
@@ -1,865 +0,0 @@
-<svg version="1.1" baseProfile="full" width="4663.8" height="638.0" viewbox="0 0 4663.75 638" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[PerformanceSection
-	  |
-	  +minimumRatio: double;
-	  +maximum: double
-	  |
-	  +Widget buildContent();
-	  +String getPowerLevelDescription();
-	  +int getCountableObservationAmount()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[PerformanceSection]
-	
-	[PerformanceBar
-	  |
-	  +progress: double;
-	  +minimum: double?
-	  |
-	  +Widget build()
-	]
-	
-	[PerformanceDetailsScreen
-	  |
-	  +reportSubject: StudySubject?
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor();
-	  +Widget build()
-	]
-	
-	[PerformanceDetailsScreen]o-[StudySubject]
-	
-	[InterventionPerformanceBar
-	  |
-	  +intervention: Intervention;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPerformanceBar]o-[Intervention]
-	[InterventionPerformanceBar]o-[StudySubject]
-	
-	[ObservationPerformanceBar
-	  |
-	  +observation: Observation;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[ObservationPerformanceBar]o-[&lt;abstract&gt;Observation]
-	[ObservationPerformanceBar]o-[StudySubject]
-	
-	[PerformanceBar
-	  |
-	  +task: Task;
-	  +completed: int;
-	  +total: int
-	  |
-	  +Widget build()
-	]
-	
-	[PerformanceBar]o-[&lt;abstract&gt;Task]
-	
-	[ReportDetailsScreen
-	  |
-	  +subject: StudySubject
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor();
-	  +Widget build()
-	]
-	
-	[ReportDetailsScreen]o-[StudySubject]
-	
-	[ReportSectionContainer
-	  |
-	  +section: ReportSection;
-	  +subject: StudySubject;
-	  +primary: bool;
-	  +onTap: void Function()?
-	  |
-	  +ReportSectionWidget buildContents();
-	  +dynamic ();
-	  +List&lt;Widget&gt; buildPrimaryHeader();
-	  +Widget build()
-	]
-	
-	[ReportSectionContainer]o-[&lt;abstract&gt;ReportSection]
-	[ReportSectionContainer]o-[StudySubject]
-	[ReportSectionContainer]o-[void Function()?]
-	
-	[ReportHistoryScreen
-	  |
-	  +Widget build()
-	]
-	
-	[ReportHistoryItem
-	  |
-	  +subject: StudySubject
-	  |
-	  +Widget build()
-	]
-	
-	[ReportHistoryItem]o-[StudySubject]
-	
-	[GeneralDetailsSection
-	  |
-	  +Widget buildContent()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[GeneralDetailsSection]
-	
-	[&lt;abstract&gt;GenericSection
-	  |
-	  +subject: StudySubject?;
-	  +onTap: void Function()?
-	  |
-	  +Widget buildContent();
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;GenericSection]o-[StudySubject]
-	[&lt;abstract&gt;GenericSection]o-[void Function()?]
-	
-	[LegendWidget
-	  |
-	  +name: String;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[LegendWidget]o-[Color]
-	
-	[LegendsListWidget
-	  |
-	  +legends: List&lt;Legend&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[Legend
-	  |
-	  +name: String;
-	  +color: Color
-	]
-	
-	[Legend]o-[Color]
-	
-	[DisclaimerSection
-	  |
-	  +Widget buildContent()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[DisclaimerSection]
-	
-	[&lt;abstract&gt;ReportSectionWidget
-	  |
-	  +subject: StudySubject
-	]
-	
-	[&lt;abstract&gt;ReportSectionWidget]o-[StudySubject]
-	
-	[AverageSectionWidget
-	  |
-	  +section: AverageSection;
-	  +titlePos: List&lt;int&gt;;
-	  +phasePos: List&lt;int&gt;
-	  |
-	  +Widget build();
-	  +Widget getLegend();
-	  +Widget getDiagram();
-	  +BarChartData getChartData();
-	  +Widget getTitles();
-	  +Widget getValues();
-	  +List&lt;BarChartGroupData&gt; getBarGroups();
-	  +FlGridData getGridData();
-	  +MaterialColor getColor();
-	  +int getDayIndex();
-	  +Iterable&lt;DiagramDatum&gt; getAggregatedData();
-	  +Map&lt;String, String?&gt; getInterventionNames()
-	]
-	
-	[AverageSectionWidget]o-[AverageSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[AverageSectionWidget]
-	
-	[DiagramDatum
-	  |
-	  +x: num;
-	  +value: num;
-	  +timestamp: DateTime?;
-	  +intervention: String
-	]
-	
-	[LinearRegressionSectionWidget
-	  |
-	  +section: LinearRegressionSection
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionWidget]o-[LinearRegressionSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[LinearRegressionSectionWidget]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="638.0" width="4663.8" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M2304.0 156.2 L2218.25 203 L2253.7301829268295 298 L2253.7 298.0 " fill="none"></path>
-					<path d="M2306.6 160.9 L2304.0 156.2 L2301.5 151.5 L2315.8 149.8 Z"></path>
-					<path d="M204.5 164.2 L204.5 203 L1551 360.00391041592604 L1551.0 360.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M209.8 154.8 L204.5 164.2 L199.2 154.8 L204.5 145.5 Z"></path>
-					</g>
-					<path d="M923.3 156.1 L855.25 203 L487.3955792682927 351.5 L487.4 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M934.0 155.2 L923.3 156.1 L928.0 146.4 L938.7 145.5 Z"></path>
-					</g>
-					<path d="M1082.7 158.9 L1125.75 203 L1565.1379573170732 351.5 L1565.1 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1080.0 148.5 L1082.7 158.9 L1072.4 155.9 L1069.7 145.5 Z"></path>
-					</g>
-					<path d="M1467.0 158.8 L1423.75 203 L1024.8826219512196 351.5 L1024.9 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1477.4 155.9 L1467.0 158.8 L1469.7 148.4 L1480.1 145.5 Z"></path>
-					</g>
-					<path d="M1581.5 160.8 L1611 203 L1611 351.5 L1611.0 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1580.5 150.1 L1581.5 160.8 L1571.8 156.2 L1570.8 145.5 Z"></path>
-					</g>
-					<path d="M3093.3 164.2 L3093.25 203 L3201.2294207317073 351.5 L3201.2 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3098.6 154.8 L3093.3 164.2 L3087.9 154.8 L3093.3 145.5 Z"></path>
-					</g>
-					<path d="M653.5 164.2 L653.5 203 L1551 356.72323759791124 L1551.0 356.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M658.8 154.8 L653.5 164.2 L648.2 154.8 L653.5 145.5 Z"></path>
-					</g>
-					<path d="M1868.2 164.5 L1775 203 L1972.622713414634 351.5 L1972.6 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1878.9 165.9 L1868.2 164.5 L1874.8 156.0 L1885.5 157.4 Z"></path>
-					</g>
-					<path d="M1918.3 194.8 L1908.25 203 L1639.09375 351.5 L1639.1 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1928.9 193.0 L1918.3 194.8 L1922.2 184.8 L1932.8 183.0 Z"></path>
-					</g>
-					<path d="M2168.7 195.0 L2178.25 203 L2518.034298780488 351.5 L2518.0 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2164.9 184.9 L2168.7 195.0 L2158.1 193.1 L2154.3 183.0 Z"></path>
-					</g>
-					<path d="M1274.5 156.7 L1274.5 203 L1579.1966463414635 351.5 L1579.2 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1279.8 147.3 L1274.5 156.7 L1269.2 147.3 L1274.5 138.0 Z"></path>
-					</g>
-					<path d="M2408.0 166.1 L2400.75 203 L2695.7423780487807 336 L2695.7 336.0 " fill="none"></path>
-					<path d="M2413.3 167.1 L2408.0 166.1 L2402.8 165.0 L2410.6 153.0 Z"></path>
-					<path d="M2435.7 171.4 L2440.75 203 L1671 355.141006327207 L1671.0 355.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2439.4 161.4 L2435.7 171.4 L2428.9 163.1 L2432.7 153.0 Z"></path>
-					</g>
-					<path d="M2463.4 169.6 L2480.75 203 L2546.6242378048782 351.5 L2546.6 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2463.8 158.8 L2463.4 169.6 L2454.3 163.7 L2454.7 153.0 Z"></path>
-					</g>
-					<path d="M4131.8 164.2 L4131.75 203 L4209.169207317073 351.5 L4209.2 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4137.1 154.8 L4131.8 164.2 L4126.4 154.8 L4131.8 145.5 Z"></path>
-					</g>
-					<path d="M4302.8 148.7 L4302.75 203 L4225.330792682927 351.5 L4225.3 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4308.1 139.3 L4302.8 148.7 L4297.4 139.3 L4302.8 130.0 Z"></path>
-					</g>
-					<path d="M2542.5 128.4 L2784.25 203 L2996.9283536585367 336 L2996.9 336.0 " fill="none"></path>
-					<path d="M2544.1 123.3 L2542.5 128.4 L2540.9 133.5 L2529.8 124.5 Z"></path>
-					<path d="M3489.6 125.6 L3225.25 203 L1671 360.90428991791856 L1671.0 360.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3500.0 128.1 L3489.6 125.6 L3497.0 117.8 L3507.5 120.3 Z"></path>
-					</g>
-					<path d="M3476.5 529.7 L3476.5 531 L3476.5 551 L3476.5 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3481.8 520.3 L3476.5 529.7 L3471.2 520.3 L3476.5 511.0 Z"></path>
-					</g>
-					<path d="M3559.9 131.2 L3476.5 203 L3476.5 223 L3476.5 223.0 " fill="none"></path>
-					<path d="M3563.4 135.2 L3559.9 131.2 L3556.4 127.2 L3570.0 122.5 Z"></path>
-					<path d="M3859.5 432.2 L3859.5 531 L3859.5 551 L3859.5 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3864.8 422.8 L3859.5 432.2 L3854.2 422.8 L3859.5 413.5 Z"></path>
-					</g>
-					<path d="M3688.7 127.9 L3859.5 203 L3859.5 320.5 L3859.5 320.5 " fill="none"></path>
-					<path d="M3690.8 123.0 L3688.7 127.9 L3686.5 132.8 L3676.5 122.5 Z"></path>
-					<g data-name="PerformanceSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceSection">
-							<rect x="2117.5" y="298.0" height="138.0" width="324.0" data-name="PerformanceSection"></rect>
-							<path d="M2117.5 329.0 L2441.5 329.0" fill="none" data-name="PerformanceSection"></path>
-							<path d="M2117.5 375.0 L2441.5 375.0" fill="none" data-name="PerformanceSection"></path>
-						</g>
-						<g transform="translate(2117.5, 298)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceSection">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceSection">PerformanceSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2117.5, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+minimumRatio: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+maximum: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2117.5, 375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+Widget buildContent()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+String getPowerLevelDescription()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PerformanceSection">+int getCountableObservationAmount()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GenericSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GenericSection">
-							<rect x="2315.8" y="30.0" height="123.0" width="214.0" data-name="GenericSection"></rect>
-							<path d="M2315.8 61.0 L2529.8 61.0" fill="none" data-name="GenericSection"></path>
-							<path d="M2315.8 107.0 L2529.8 107.0" fill="none" data-name="GenericSection"></path>
-						</g>
-						<g transform="translate(2315.75, 30)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GenericSection">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="GenericSection">GenericSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2315.75, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GenericSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GenericSection">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GenericSection">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2315.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GenericSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GenericSection">+Widget buildContent()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GenericSection">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceBar">
-							<rect x="3008.3" y="37.5" height="108.0" width="170.0" data-name="PerformanceBar"></rect>
-							<path d="M3008.3 68.5 L3178.3 68.5" fill="none" data-name="PerformanceBar"></path>
-							<path d="M3008.3 114.5 L3178.3 114.5" fill="none" data-name="PerformanceBar"></path>
-						</g>
-						<g transform="translate(3008.25, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceBar">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceBar">PerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3008.25, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+progress: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceBar">+minimum: double?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3008.25, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceDetailsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceDetailsScreen">
-							<rect x="0.0" y="37.5" height="108.0" width="409.0" data-name="PerformanceDetailsScreen"></rect>
-							<path d="M0.0 68.5 L409.0 68.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-							<path d="M0.0 99.5 L409.0 99.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-						</g>
-						<g transform="translate(0, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceDetailsScreen">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceDetailsScreen">PerformanceDetailsScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">+reportSubject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceDetailsScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="1551.0" y="351.5" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(1551, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPerformanceBar">
-							<rect x="898.0" y="37.5" height="108.0" width="238.0" data-name="InterventionPerformanceBar"></rect>
-							<path d="M898.0 68.5 L1136.0 68.5" fill="none" data-name="InterventionPerformanceBar"></path>
-							<path d="M898.0 114.5 L1136.0 114.5" fill="none" data-name="InterventionPerformanceBar"></path>
-						</g>
-						<g transform="translate(898, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPerformanceBar">
-								<text x="111.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPerformanceBar">InterventionPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(898, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(898, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention">
-							<rect x="394.0" y="351.5" height="31.0" width="110.0" data-name="Intervention"></rect>
-						</g>
-						<g transform="translate(394, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention">Intervention</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ObservationPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ObservationPerformanceBar">
-							<rect x="1413.0" y="37.5" height="108.0" width="240.0" data-name="ObservationPerformanceBar"></rect>
-							<path d="M1413.0 68.5 L1653.0 68.5" fill="none" data-name="ObservationPerformanceBar"></path>
-							<path d="M1413.0 114.5 L1653.0 114.5" fill="none" data-name="ObservationPerformanceBar"></path>
-						</g>
-						<g transform="translate(1413, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ObservationPerformanceBar">
-								<text x="112.0" y="13.5" stroke="none" text-anchor="middle" data-name="ObservationPerformanceBar">ObservationPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1413, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+observation: Observation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ObservationPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1413, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Observation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Observation">
-							<rect x="927.3" y="351.5" height="31.0" width="112.0" data-name="Observation"></rect>
-						</g>
-						<g transform="translate(927.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Observation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Observation">
-								<text x="48.0" y="13.5" stroke="none" text-anchor="middle" data-name="Observation">Observation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Task">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Task">
-							<rect x="3185.5" y="351.5" height="31.0" width="54.0" data-name="Task"></rect>
-						</g>
-						<g transform="translate(3185.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Task">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Task">
-								<text x="19.0" y="13.5" stroke="none" text-anchor="middle" data-name="Task">Task</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportDetailsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportDetailsScreen">
-							<rect x="449.0" y="37.5" height="108.0" width="409.0" data-name="ReportDetailsScreen"></rect>
-							<path d="M449.0 68.5 L858.0 68.5" fill="none" data-name="ReportDetailsScreen"></path>
-							<path d="M449.0 99.5 L858.0 99.5" fill="none" data-name="ReportDetailsScreen"></path>
-						</g>
-						<g transform="translate(449, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportDetailsScreen">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportDetailsScreen">ReportDetailsScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(449, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportDetailsScreen">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(449, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportDetailsScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionContainer">
-							<rect x="1885.5" y="0.0" height="183.0" width="319.0" data-name="ReportSectionContainer"></rect>
-							<path d="M1885.5 31.0 L2204.5 31.0" fill="none" data-name="ReportSectionContainer"></path>
-							<path d="M1885.5 107.0 L2204.5 107.0" fill="none" data-name="ReportSectionContainer"></path>
-						</g>
-						<g transform="translate(1885.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionContainer">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionContainer">ReportSectionContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1885.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionContainer">+section: ReportSection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionContainer">+subject: StudySubject</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionContainer">+primary: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionContainer">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1885.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionContainer">+ReportSectionWidget buildContents()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionContainer">+dynamic ()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionContainer">+List&lt;Widget&gt; buildPrimaryHeader()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionContainer">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="1929.3" y="351.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(1929.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="2481.5" y="351.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(2481.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportHistoryScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryScreen">
-							<rect x="2788.3" y="60.5" height="62.0" width="180.0" data-name="ReportHistoryScreen"></rect>
-							<path d="M2788.3 91.5 L2968.3 91.5" fill="none" data-name="ReportHistoryScreen"></path>
-						</g>
-						<g transform="translate(2788.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryScreen">ReportHistoryScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2788.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportHistoryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryItem">
-							<rect x="1176.0" y="45.0" height="93.0" width="197.0" data-name="ReportHistoryItem"></rect>
-							<path d="M1176.0 76.0 L1373.0 76.0" fill="none" data-name="ReportHistoryItem"></path>
-							<path d="M1176.0 107.0 L1373.0 107.0" fill="none" data-name="ReportHistoryItem"></path>
-						</g>
-						<g transform="translate(1176, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryItem">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryItem">ReportHistoryItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1176, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1176, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GeneralDetailsSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GeneralDetailsSection">
-							<rect x="2665.5" y="336.0" height="62.0" width="198.0" data-name="GeneralDetailsSection"></rect>
-							<path d="M2665.5 367.0 L2863.5 367.0" fill="none" data-name="GeneralDetailsSection"></path>
-						</g>
-						<g transform="translate(2665.5, 336)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GeneralDetailsSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GeneralDetailsSection">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="GeneralDetailsSection">GeneralDetailsSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2665.5, 367)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GeneralDetailsSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GeneralDetailsSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GeneralDetailsSection">+Widget buildContent()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegendWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendWidget">
-							<rect x="4063.8" y="37.5" height="108.0" width="136.0" data-name="LegendWidget"></rect>
-							<path d="M4063.8 68.5 L4199.8 68.5" fill="none" data-name="LegendWidget"></path>
-							<path d="M4063.8 114.5 L4199.8 114.5" fill="none" data-name="LegendWidget"></path>
-						</g>
-						<g transform="translate(4063.75, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendWidget">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="LegendWidget">LegendWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4063.75, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LegendWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4063.75, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="4188.3" y="351.5" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(4188.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegendsListWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendsListWidget">
-							<rect x="3816.8" y="45.0" height="93.0" width="207.0" data-name="LegendsListWidget"></rect>
-							<path d="M3816.8 76.0 L4023.8 76.0" fill="none" data-name="LegendsListWidget"></path>
-							<path d="M3816.8 107.0 L4023.8 107.0" fill="none" data-name="LegendsListWidget"></path>
-						</g>
-						<g transform="translate(3816.75, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendsListWidget">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LegendsListWidget">LegendsListWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3816.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+legends: List&lt;Legend&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3816.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Legend">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Legend">
-							<rect x="4239.8" y="53.0" height="77.0" width="126.0" data-name="Legend"></rect>
-							<path d="M4239.8 84.0 L4365.8 84.0" fill="none" data-name="Legend"></path>
-						</g>
-						<g transform="translate(4239.75, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Legend">
-								<text x="55.0" y="13.5" stroke="none" text-anchor="middle" data-name="Legend">Legend</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4239.75, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Legend">
-								<text x="0.0" y="13.5" stroke="none" data-name="Legend">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Legend">+color: Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DisclaimerSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisclaimerSection">
-							<rect x="2947.5" y="336.0" height="62.0" width="198.0" data-name="DisclaimerSection"></rect>
-							<path d="M2947.5 367.0 L3145.5 367.0" fill="none" data-name="DisclaimerSection"></path>
-						</g>
-						<g transform="translate(2947.5, 336)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisclaimerSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisclaimerSection">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisclaimerSection">DisclaimerSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2947.5, 367)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisclaimerSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisclaimerSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisclaimerSection">+Widget buildContent()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionWidget">
-							<rect x="3507.5" y="60.5" height="62.0" width="197.0" data-name="ReportSectionWidget"></rect>
-							<path d="M3507.5 91.5 L3704.5 91.5" fill="none" data-name="ReportSectionWidget"></path>
-						</g>
-						<g transform="translate(3507.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionWidget">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionWidget">ReportSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3507.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionWidget">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionWidget">
-							<rect x="3279.5" y="223.0" height="288.0" width="394.0" data-name="AverageSectionWidget"></rect>
-							<path d="M3279.5 254.0 L3673.5 254.0" fill="none" data-name="AverageSectionWidget"></path>
-							<path d="M3279.5 315.0 L3673.5 315.0" fill="none" data-name="AverageSectionWidget"></path>
-						</g>
-						<g transform="translate(3279.5, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionWidget">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionWidget">AverageSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3279.5, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+section: AverageSection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+titlePos: List&lt;int&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+phasePos: List&lt;int&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3279.5, 315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+Widget getLegend()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+Widget getDiagram()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AverageSectionWidget">+BarChartData getChartData()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AverageSectionWidget">+Widget getTitles()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AverageSectionWidget">+Widget getValues()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AverageSectionWidget">+List&lt;BarChartGroupData&gt; getBarGroups()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AverageSectionWidget">+FlGridData getGridData()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AverageSectionWidget">+MaterialColor getColor()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AverageSectionWidget">+int getDayIndex()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AverageSectionWidget">+Iterable&lt;DiagramDatum&gt; getAggregatedData()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AverageSectionWidget">+Map&lt;String, String?&gt; getInterventionNames()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSection">
-							<rect x="3406.0" y="551.0" height="31.0" width="141.0" data-name="AverageSection"></rect>
-						</g>
-						<g transform="translate(3406, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSection">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSection">AverageSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DiagramDatum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DiagramDatum">
-							<rect x="4405.8" y="38.0" height="107.0" width="202.0" data-name="DiagramDatum"></rect>
-							<path d="M4405.8 69.0 L4607.8 69.0" fill="none" data-name="DiagramDatum"></path>
-						</g>
-						<g transform="translate(4405.75, 38)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DiagramDatum">
-								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="DiagramDatum">DiagramDatum</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4405.75, 69)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DiagramDatum">
-								<text x="0.0" y="13.5" stroke="none" data-name="DiagramDatum">+x: num</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DiagramDatum">+value: num</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DiagramDatum">+timestamp: DateTime?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DiagramDatum">+intervention: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionWidget">
-							<rect x="3713.5" y="320.5" height="93.0" width="292.0" data-name="LinearRegressionSectionWidget"></rect>
-							<path d="M3713.5 351.5 L4005.5 351.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-							<path d="M3713.5 382.5 L4005.5 382.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-						</g>
-						<g transform="translate(3713.5, 320.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionWidget">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionWidget">LinearRegressionSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3713.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+section: LinearRegressionSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3713.5, 382.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSection">
-							<rect x="3752.0" y="551.0" height="31.0" width="215.0" data-name="LinearRegressionSection"></rect>
-						</g>
-						<g transform="translate(3752, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSection">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSection">LinearRegressionSection</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/report/util/uml.svg b/docs/uml/app/lib/screens/study/report/util/uml.svg
deleted file mode 100644
index d13841612..000000000
--- a/docs/uml/app/lib/screens/study/report/util/uml.svg
+++ /dev/null
@@ -1,128 +0,0 @@
-<svg version="1.1" baseProfile="full" width="605.0" height="235.0" viewbox="0 0 605 235" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[LegendWidget
-	  |
-	  +name: String;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[LegendWidget]o-[Color]
-	
-	[LegendsListWidget
-	  |
-	  +legends: List&lt;Legend&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[Legend
-	  |
-	  +name: String;
-	  +color: Color
-	]
-	
-	[Legend]o-[Color]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="235.0" width="605.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M68.0 126.7 L68 128 L248 158.57416267942583 L248.0 158.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73.3 117.3 L68.0 126.7 L62.7 117.3 L68.0 108.0 Z"></path>
-					</g>
-					<path d="M486.0 111.2 L486 128 L306 158.57416267942583 L306.0 158.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M491.3 101.8 L486.0 111.2 L480.7 101.8 L486.0 92.5 Z"></path>
-					</g>
-					<g data-name="LegendWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendWidget">
-							<rect x="0.0" y="0.0" height="108.0" width="136.0" data-name="LegendWidget"></rect>
-							<path d="M0.0 31.0 L136.0 31.0" fill="none" data-name="LegendWidget"></path>
-							<path d="M0.0 77.0 L136.0 77.0" fill="none" data-name="LegendWidget"></path>
-						</g>
-						<g transform="translate(0, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendWidget">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="LegendWidget">LegendWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LegendWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 77)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="248.0" y="148.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(248, 148)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegendsListWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendsListWidget">
-							<rect x="176.0" y="7.5" height="93.0" width="207.0" data-name="LegendsListWidget"></rect>
-							<path d="M176.0 38.5 L383.0 38.5" fill="none" data-name="LegendsListWidget"></path>
-							<path d="M176.0 69.5 L383.0 69.5" fill="none" data-name="LegendsListWidget"></path>
-						</g>
-						<g transform="translate(176, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendsListWidget">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LegendsListWidget">LegendsListWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(176, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+legends: List&lt;Legend&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(176, 69.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Legend">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Legend">
-							<rect x="423.0" y="15.5" height="77.0" width="126.0" data-name="Legend"></rect>
-							<path d="M423.0 46.5 L549.0 46.5" fill="none" data-name="Legend"></path>
-						</g>
-						<g transform="translate(423, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Legend">
-								<text x="55.0" y="13.5" stroke="none" text-anchor="middle" data-name="Legend">Legend</text>
-								
-							</g>
-						</g>
-						<g transform="translate(423, 46.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Legend">
-								<text x="0.0" y="13.5" stroke="none" data-name="Legend">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Legend">+color: Color</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/tasks/intervention/uml.svg b/docs/uml/app/lib/screens/study/tasks/intervention/uml.svg
deleted file mode 100644
index e9e196b72..000000000
--- a/docs/uml/app/lib/screens/study/tasks/intervention/uml.svg
+++ /dev/null
@@ -1,72 +0,0 @@
-<svg version="1.1" baseProfile="full" width="395.0" height="204.0" viewbox="0 0 395 204" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[CheckmarkTaskWidget
-	  |
-	  +task: CheckmarkTask?;
-	  +completionPeriod: CompletionPeriod?
-	]
-	
-	[CheckmarkTaskWidget]o-[CheckmarkTask]
-	[CheckmarkTaskWidget]o-[CompletionPeriod]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="204.0" width="395.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M88.0 86.8 L71.5 97 L71.5 117 L71.5 117.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M98.8 86.4 L88.0 86.8 L93.1 77.4 L103.9 77.0 Z"></path>
-					</g>
-					<path d="M244.5 86.8 L261 97 L261 117 L261.0 117.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M239.4 77.4 L244.5 86.8 L233.7 86.4 L228.6 77.0 Z"></path>
-					</g>
-					<g data-name="CheckmarkTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTaskWidget">
-							<rect x="4.8" y="0.0" height="77.0" width="323.0" data-name="CheckmarkTaskWidget"></rect>
-							<path d="M4.8 31.0 L327.8 31.0" fill="none" data-name="CheckmarkTaskWidget"></path>
-						</g>
-						<g transform="translate(4.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTaskWidget">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTaskWidget">CheckmarkTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CheckmarkTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="CheckmarkTaskWidget">+task: CheckmarkTask?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CheckmarkTaskWidget">+completionPeriod: CompletionPeriod?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CheckmarkTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTask">
-							<rect x="0.0" y="117.0" height="31.0" width="143.0" data-name="CheckmarkTask"></rect>
-						</g>
-						<g transform="translate(0, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTask">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTask">CheckmarkTask</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CompletionPeriod">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CompletionPeriod">
-							<rect x="183.0" y="117.0" height="31.0" width="156.0" data-name="CompletionPeriod"></rect>
-						</g>
-						<g transform="translate(183, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CompletionPeriod">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CompletionPeriod">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="CompletionPeriod">CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/tasks/observation/uml.svg b/docs/uml/app/lib/screens/study/tasks/observation/uml.svg
deleted file mode 100644
index 6e6f81627..000000000
--- a/docs/uml/app/lib/screens/study/tasks/observation/uml.svg
+++ /dev/null
@@ -1,72 +0,0 @@
-<svg version="1.1" baseProfile="full" width="417.0" height="204.0" viewbox="0 0 417 204" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[QuestionnaireTaskWidget
-	  |
-	  +task: QuestionnaireTask;
-	  +completionPeriod: CompletionPeriod
-	]
-	
-	[QuestionnaireTaskWidget]o-[QuestionnaireTask]
-	[QuestionnaireTaskWidget]o-[CompletionPeriod]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="204.0" width="417.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M100.7 86.4 L82.5 97 L82.5 117 L82.5 117.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M111.4 86.3 L100.7 86.4 L106.0 77.1 L116.8 77.0 Z"></path>
-					</g>
-					<path d="M264.8 86.4 L283 97 L283 117 L283.0 117.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M259.5 77.1 L264.8 86.4 L254.1 86.3 L248.7 77.0 Z"></path>
-					</g>
-					<g data-name="QuestionnaireTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTaskWidget">
-							<rect x="26.3" y="0.0" height="77.0" width="313.0" data-name="QuestionnaireTaskWidget"></rect>
-							<path d="M26.3 31.0 L339.3 31.0" fill="none" data-name="QuestionnaireTaskWidget"></path>
-						</g>
-						<g transform="translate(26.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTaskWidget">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTaskWidget">QuestionnaireTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireTaskWidget">+task: QuestionnaireTask</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireTaskWidget">+completionPeriod: CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTask">
-							<rect x="0.0" y="117.0" height="31.0" width="165.0" data-name="QuestionnaireTask"></rect>
-						</g>
-						<g transform="translate(0, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTask">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTask">QuestionnaireTask</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CompletionPeriod">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CompletionPeriod">
-							<rect x="205.0" y="117.0" height="31.0" width="156.0" data-name="CompletionPeriod"></rect>
-						</g>
-						<g transform="translate(205, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CompletionPeriod">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CompletionPeriod">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="CompletionPeriod">CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/tasks/uml.svg b/docs/uml/app/lib/screens/study/tasks/uml.svg
deleted file mode 100644
index 49428166b..000000000
--- a/docs/uml/app/lib/screens/study/tasks/uml.svg
+++ /dev/null
@@ -1,168 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1149.0" height="220.0" viewbox="0 0 1149 220" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[QuestionnaireTaskWidget
-	  |
-	  +task: QuestionnaireTask;
-	  +completionPeriod: CompletionPeriod
-	]
-	
-	[QuestionnaireTaskWidget]o-[QuestionnaireTask]
-	[QuestionnaireTaskWidget]o-[CompletionPeriod]
-	
-	[TaskScreen
-	  |
-	  +taskInstance: TaskInstance
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()
-	]
-	
-	[TaskScreen]o-[TaskInstance]
-	
-	[CheckmarkTaskWidget
-	  |
-	  +task: CheckmarkTask?;
-	  +completionPeriod: CompletionPeriod?
-	]
-	
-	[CheckmarkTaskWidget]o-[CheckmarkTask]
-	[CheckmarkTaskWidget]o-[CompletionPeriod]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="220.0" width="1149.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M139.5 102.9 L136.5 113 L136.5 133 L136.5 133.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M147.3 95.5 L139.5 102.9 L137.1 92.4 L144.9 85.0 Z"></path>
-					</g>
-					<path d="M231.8 95.1 L259.5 113 L304.7112676056338 133 L304.7 133.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M226.9 85.6 L231.8 95.1 L221.1 94.5 L216.1 85.0 Z"></path>
-					</g>
-					<path d="M560.9 110.9 L561.5 113 L561.5 133 L561.5 133.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M563.3 100.4 L560.9 110.9 L553.1 103.5 L555.5 93.0 Z"></path>
-					</g>
-					<path d="M948.5 102.9 L951.5 113 L951.5 133 L951.5 133.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M950.9 92.4 L948.5 102.9 L940.7 95.5 L943.1 85.0 Z"></path>
-					</g>
-					<path d="M751.5 69.4 L409.25 113 L370.09507042253523 133 L370.1 133.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M761.4 73.5 L751.5 69.4 L760.1 63.0 L770.0 67.1 Z"></path>
-					</g>
-					<g data-name="QuestionnaireTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTaskWidget">
-							<rect x="0.0" y="8.0" height="77.0" width="313.0" data-name="QuestionnaireTaskWidget"></rect>
-							<path d="M0.0 39.0 L313.0 39.0" fill="none" data-name="QuestionnaireTaskWidget"></path>
-						</g>
-						<g transform="translate(0, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTaskWidget">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTaskWidget">QuestionnaireTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireTaskWidget">+task: QuestionnaireTask</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireTaskWidget">+completionPeriod: CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTask">
-							<rect x="54.0" y="133.0" height="31.0" width="165.0" data-name="QuestionnaireTask"></rect>
-						</g>
-						<g transform="translate(54, 133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTask">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTask">QuestionnaireTask</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CompletionPeriod">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CompletionPeriod">
-							<rect x="261.8" y="133.0" height="31.0" width="156.0" data-name="CompletionPeriod"></rect>
-						</g>
-						<g transform="translate(261.75, 133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CompletionPeriod">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CompletionPeriod">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="CompletionPeriod">CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskScreen">
-							<rect x="353.0" y="0.0" height="93.0" width="377.0" data-name="TaskScreen"></rect>
-							<path d="M353.0 31.0 L730.0 31.0" fill="none" data-name="TaskScreen"></path>
-							<path d="M353.0 62.0 L730.0 62.0" fill="none" data-name="TaskScreen"></path>
-						</g>
-						<g transform="translate(353, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskScreen">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskScreen">TaskScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(353, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">+taskInstance: TaskInstance</text>
-								
-							</g>
-						</g>
-						<g transform="translate(353, 62)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">&lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskInstance">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskInstance">
-							<rect x="500.5" y="133.0" height="31.0" width="122.0" data-name="TaskInstance"></rect>
-						</g>
-						<g transform="translate(500.5, 133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskInstance">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskInstance">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskInstance">TaskInstance</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CheckmarkTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTaskWidget">
-							<rect x="770.0" y="8.0" height="77.0" width="323.0" data-name="CheckmarkTaskWidget"></rect>
-							<path d="M770.0 39.0 L1093.0 39.0" fill="none" data-name="CheckmarkTaskWidget"></path>
-						</g>
-						<g transform="translate(770, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTaskWidget">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTaskWidget">CheckmarkTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(770, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CheckmarkTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="CheckmarkTaskWidget">+task: CheckmarkTask?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CheckmarkTaskWidget">+completionPeriod: CompletionPeriod?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CheckmarkTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTask">
-							<rect x="880.0" y="133.0" height="31.0" width="143.0" data-name="CheckmarkTask"></rect>
-						</g>
-						<g transform="translate(880, 133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTask">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTask">CheckmarkTask</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/study/uml.svg b/docs/uml/app/lib/screens/study/uml.svg
deleted file mode 100644
index 5476a482f..000000000
--- a/docs/uml/app/lib/screens/study/uml.svg
+++ /dev/null
@@ -1,2368 +0,0 @@
-<svg version="1.1" baseProfile="full" width="14919.8" height="638.0" viewbox="0 0 14919.75 638" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[ConsentScreen
-	]
-	
-	[ConsentCard
-	  |
-	  +consent: ConsentItem?;
-	  +index: int?;
-	  +onTapped: dynamic Function(int);
-	  +isChecked: bool?
-	  |
-	  +Widget build()
-	]
-	
-	[ConsentCard]o-[ConsentItem]
-	[ConsentCard]o-[dynamic Function(int)]
-	
-	[ConsentElement
-	  |
-	  +title: String;
-	  +descriptionText: String;
-	  +acknowledgmentText: String;
-	  +icon: IconData
-	]
-	
-	[ConsentElement]o-[IconData]
-	
-	[StudyOverviewScreen
-	]
-	
-	[_StudyOverviewScreen
-	  |
-	  +study: Study?
-	  |
-	  +dynamic navigateToJourney();
-	  +dynamic navigateToEligibilityCheck();
-	  +Widget build()
-	]
-	
-	[_StudyOverviewScreen]o-[Study]
-	
-	[StudyDetailsView
-	  |
-	  +study: Study?;
-	  +iconSize: double
-	  |
-	  +Widget build()
-	]
-	
-	[StudyDetailsView]o-[Study]
-	
-	[KickoffScreen
-	]
-	
-	[_KickoffScreen
-	  |
-	  +subject: StudySubject?;
-	  +ready: bool
-	  |
-	  -dynamic _storeUserStudy();
-	  -Widget _constructStatusIcon();
-	  -String _getStatusText();
-	  +Widget build()
-	]
-	
-	[_KickoffScreen]o-[StudySubject]
-	
-	[EligibilityResult
-	  |
-	  +eligible: bool;
-	  +firstFailed: EligibilityCriterion?
-	]
-	
-	[EligibilityResult]o-[EligibilityCriterion]
-	
-	[EligibilityScreen
-	  |
-	  +study: Study?
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;EligibilityResult&gt; routeFor()
-	]
-	
-	[EligibilityScreen]o-[Study]
-	
-	[OnboardingProgress
-	  |
-	  +stage: int;
-	  +progress: double
-	  |
-	  -double _getProgressForStage();
-	  +Widget build()
-	]
-	
-	[StudySelectionScreen
-	]
-	
-	[InviteCodeDialog
-	]
-	
-	[InterventionSelectionScreen
-	]
-	
-	[JourneyOverviewScreen
-	]
-	
-	[_JourneyOverviewScreen
-	  |
-	  +subject: StudySubject?
-	  |
-	  +dynamic getConsentAndNavigateToDashboard();
-	  +Widget build()
-	]
-	
-	[_JourneyOverviewScreen]o-[StudySubject]
-	
-	[Timeline
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[Timeline]o-[StudySubject]
-	
-	[InterventionTile
-	  |
-	  +title: String?;
-	  +iconName: String;
-	  +date: DateTime;
-	  +color: Color?;
-	  +isFirst: bool;
-	  +isLast: bool
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionTile]o-[Color]
-	
-	[IconIndicator
-	  |
-	  +iconName: String;
-	  +color: Color?
-	  |
-	  +Widget build()
-	]
-	
-	[IconIndicator]o-[Color]
-	
-	[TimelineChild
-	  |
-	  +child: Widget?
-	  |
-	  +Widget build()
-	]
-	
-	[TimelineChild]o-[&lt;abstract&gt;Widget]
-	
-	[AverageSectionWidget
-	  |
-	  +section: AverageSection;
-	  +titlePos: List&lt;int&gt;;
-	  +phasePos: List&lt;int&gt;
-	  |
-	  +Widget build();
-	  +Widget getLegend();
-	  +Widget getDiagram();
-	  +BarChartData getChartData();
-	  +Widget getTitles();
-	  +Widget getValues();
-	  +List&lt;BarChartGroupData&gt; getBarGroups();
-	  +FlGridData getGridData();
-	  +MaterialColor getColor();
-	  +int getDayIndex();
-	  +Iterable&lt;DiagramDatum&gt; getAggregatedData();
-	  +Map&lt;String, String?&gt; getInterventionNames()
-	]
-	
-	[AverageSectionWidget]o-[AverageSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[AverageSectionWidget]
-	
-	[DiagramDatum
-	  |
-	  +x: num;
-	  +value: num;
-	  +timestamp: DateTime?;
-	  +intervention: String
-	]
-	
-	[LinearRegressionSectionWidget
-	  |
-	  +section: LinearRegressionSection
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionWidget]o-[LinearRegressionSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[LinearRegressionSectionWidget]
-	
-	[ReportHistoryScreen
-	  |
-	  +Widget build()
-	]
-	
-	[ReportHistoryItem
-	  |
-	  +subject: StudySubject
-	  |
-	  +Widget build()
-	]
-	
-	[ReportHistoryItem]o-[StudySubject]
-	
-	[ReportDetailsScreen
-	  |
-	  +subject: StudySubject
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor();
-	  +Widget build()
-	]
-	
-	[ReportDetailsScreen]o-[StudySubject]
-	
-	[GeneralDetailsSection
-	  |
-	  +Widget buildContent()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[GeneralDetailsSection]
-	
-	[&lt;abstract&gt;GenericSection
-	  |
-	  +subject: StudySubject?;
-	  +onTap: void Function()?
-	  |
-	  +Widget buildContent();
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;GenericSection]o-[StudySubject]
-	[&lt;abstract&gt;GenericSection]o-[void Function()?]
-	
-	[DisclaimerSection
-	  |
-	  +Widget buildContent()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[DisclaimerSection]
-	
-	[&lt;abstract&gt;ReportSectionWidget
-	  |
-	  +subject: StudySubject
-	]
-	
-	[&lt;abstract&gt;ReportSectionWidget]o-[StudySubject]
-	
-	[LegendWidget
-	  |
-	  +name: String;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[LegendWidget]o-[Color]
-	
-	[LegendsListWidget
-	  |
-	  +legends: List&lt;Legend&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[Legend
-	  |
-	  +name: String;
-	  +color: Color
-	]
-	
-	[Legend]o-[Color]
-	
-	[PerformanceDetailsScreen
-	  |
-	  +reportSubject: StudySubject?
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor();
-	  +Widget build()
-	]
-	
-	[PerformanceDetailsScreen]o-[StudySubject]
-	
-	[InterventionPerformanceBar
-	  |
-	  +intervention: Intervention;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPerformanceBar]o-[Intervention]
-	[InterventionPerformanceBar]o-[StudySubject]
-	
-	[ObservationPerformanceBar
-	  |
-	  +observation: Observation;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[ObservationPerformanceBar]o-[&lt;abstract&gt;Observation]
-	[ObservationPerformanceBar]o-[StudySubject]
-	
-	[PerformanceBar
-	  |
-	  +task: Task;
-	  +completed: int;
-	  +total: int
-	  |
-	  +Widget build()
-	]
-	
-	[PerformanceBar]o-[&lt;abstract&gt;Task]
-	
-	[PerformanceSection
-	  |
-	  +minimumRatio: double;
-	  +maximum: double
-	  |
-	  +Widget buildContent();
-	  +String getPowerLevelDescription();
-	  +int getCountableObservationAmount()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[PerformanceSection]
-	
-	[PerformanceBar
-	  |
-	  +progress: double;
-	  +minimum: double?
-	  |
-	  +Widget build()
-	]
-	
-	[ReportSectionContainer
-	  |
-	  +section: ReportSection;
-	  +subject: StudySubject;
-	  +primary: bool;
-	  +onTap: void Function()?
-	  |
-	  +ReportSectionWidget buildContents();
-	  +dynamic ();
-	  +List&lt;Widget&gt; buildPrimaryHeader();
-	  +Widget build()
-	]
-	
-	[ReportSectionContainer]o-[&lt;abstract&gt;ReportSection]
-	[ReportSectionContainer]o-[StudySubject]
-	[ReportSectionContainer]o-[void Function()?]
-	
-	[Settings
-	]
-	
-	[OptOutAlertDialog
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[OptOutAlertDialog]o-[StudySubject]
-	
-	[DeleteAlertDialog
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[DeleteAlertDialog]o-[StudySubject]
-	
-	[TaskBox
-	  |
-	  +taskInstance: TaskInstance;
-	  +icon: Icon;
-	  +onCompleted: dynamic Function()
-	]
-	
-	[TaskBox]o-[TaskInstance]
-	[TaskBox]o-[Icon]
-	[TaskBox]o-[dynamic Function()]
-	
-	[ProgressRow
-	  |
-	  +subject: StudySubject?
-	]
-	
-	[ProgressRow]o-[StudySubject]
-	
-	[InterventionSegment
-	  |
-	  +intervention: Intervention;
-	  +percentCompleted: double;
-	  +percentMissed: double;
-	  +isCurrent: bool;
-	  +isFuture: bool;
-	  +phaseDuration: int
-	  |
-	  +List&lt;Widget&gt; buildSeparators();
-	  +Widget build()
-	]
-	
-	[InterventionSegment]o-[Intervention]
-	
-	[TaskOverview
-	  |
-	  +subject: StudySubject?;
-	  +scheduleToday: List&lt;TaskInstance&gt;?;
-	  +interventionIcon: String?
-	]
-	
-	[TaskOverview]o-[StudySubject]
-	
-	[ContactScreen
-	]
-	
-	[ContactWidget
-	  |
-	  +contact: Contact?;
-	  +title: String;
-	  +subtitle: String?;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[ContactWidget]o-[Contact]
-	[ContactWidget]o-[Color]
-	
-	[ContactItem
-	  |
-	  +iconData: IconData;
-	  +itemName: String;
-	  +itemValue: String?;
-	  +type: ContactItemType?;
-	  +iconColor: Color?
-	  |
-	  +dynamic launchContact();
-	  +Widget build()
-	]
-	
-	[ContactItem]o-[IconData]
-	[ContactItem]o-[ContactItemType]
-	[ContactItem]o-[Color]
-	
-	[ContactItemType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ContactItemType&gt;;
-	  &lt;static&gt;+website: ContactItemType;
-	  &lt;static&gt;+email: ContactItemType;
-	  &lt;static&gt;+phone: ContactItemType
-	]
-	
-	[ContactItemType]o-[ContactItemType]
-	[Enum]&lt;:--[ContactItemType]
-	
-	[FAQ
-	  |
-	  +Widget build()
-	]
-	
-	[Entry
-	  |
-	  +title: String;
-	  +children: List&lt;Entry&gt;
-	]
-	
-	[EntryItem
-	  |
-	  +entry: Entry
-	  |
-	  -Widget _buildTiles();
-	  +Widget build()
-	]
-	
-	[EntryItem]o-[Entry]
-	
-	[DashboardScreen
-	  |
-	  +error: String?
-	]
-	
-	[OverflowMenuItem
-	  |
-	  +name: String;
-	  +icon: IconData;
-	  +routeName: String?;
-	  +onTap: dynamic Function()?
-	]
-	
-	[OverflowMenuItem]o-[IconData]
-	[OverflowMenuItem]o-[dynamic Function()?]
-	
-	[StudyFinishedPlaceholder
-	  |
-	  &lt;static&gt;+space: SizedBox
-	  |
-	  +Widget build()
-	]
-	
-	[StudyFinishedPlaceholder]o-[SizedBox]
-	
-	[QuestionnaireTaskWidget
-	  |
-	  +task: QuestionnaireTask;
-	  +completionPeriod: CompletionPeriod
-	]
-	
-	[QuestionnaireTaskWidget]o-[QuestionnaireTask]
-	[QuestionnaireTaskWidget]o-[CompletionPeriod]
-	
-	[TaskScreen
-	  |
-	  +taskInstance: TaskInstance
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()
-	]
-	
-	[TaskScreen]o-[TaskInstance]
-	
-	[CheckmarkTaskWidget
-	  |
-	  +task: CheckmarkTask?;
-	  +completionPeriod: CompletionPeriod?
-	]
-	
-	[CheckmarkTaskWidget]o-[CheckmarkTask]
-	[CheckmarkTaskWidget]o-[CompletionPeriod]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="638.0" width="14919.8" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M392.2 174.7 L416.5 203 L416.5 351.5 L416.5 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M390.2 164.1 L392.2 174.7 L382.1 171.1 L380.1 160.5 Z"></path>
-					</g>
-					<path d="M249.8 174.7 L225.5 203 L225.5 351.5 L225.5 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M259.9 171.1 L249.8 174.7 L251.8 164.1 L261.9 160.5 Z"></path>
-					</g>
-					<path d="M628.5 163.7 L628.5 203 L6950.75 365.8793150846326 L6950.8 365.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M633.8 154.3 L628.5 163.7 L623.2 154.3 L628.5 145.0 Z"></path>
-					</g>
-					<path d="M2045.0 171.7 L2045 203 L1152.5 361.5807150595883 L1152.5 361.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2050.3 162.3 L2045.0 171.7 L2039.7 162.3 L2045.0 153.0 Z"></path>
-					</g>
-					<path d="M1603.5 164.2 L1603.5 203 L1152.5 356.6116303219107 L1152.5 356.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1608.8 154.8 L1603.5 164.2 L1598.2 154.8 L1603.5 145.5 Z"></path>
-					</g>
-					<path d="M7027.5 186.7 L7027.5 203 L6867.455030487805 351.5 L6867.5 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7032.8 177.3 L7027.5 186.7 L7022.2 177.3 L7027.5 168.0 Z"></path>
-					</g>
-					<path d="M7327.5 148.7 L7327.5 203 L3225.25 364.01693292646445 L3225.3 364.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7332.8 139.3 L7327.5 148.7 L7322.2 139.3 L7327.5 130.0 Z"></path>
-					</g>
-					<path d="M1254.0 156.7 L1254 203 L1134.4756097560976 351.5 L1134.5 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1259.3 147.3 L1254.0 156.7 L1248.7 147.3 L1254.0 138.0 Z"></path>
-					</g>
-					<path d="M6653.0 164.2 L6653 203 L6832.060213414634 351.5 L6832.1 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6658.3 154.8 L6653.0 164.2 L6647.7 154.8 L6653.0 145.5 Z"></path>
-					</g>
-					<path d="M5843.5 156.7 L5843.5 203 L6790.75 357.23082650781834 L6790.8 357.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5848.8 147.3 L5843.5 156.7 L5838.2 147.3 L5843.5 138.0 Z"></path>
-					</g>
-					<path d="M10101.3 194.2 L10101.25 203 L8576.25 363.93951093951097 L8576.3 363.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10106.6 184.8 L10101.3 194.2 L10095.9 184.8 L10101.3 175.5 Z"></path>
-					</g>
-					<path d="M9900.3 164.2 L9900.25 203 L8576.25 363.4848484848485 L8576.3 363.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9905.6 154.8 L9900.3 164.2 L9894.9 154.8 L9900.3 145.5 Z"></path>
-					</g>
-					<path d="M10649.8 156.7 L10649.75 203 L11404.75 359.6350411132195 L11404.8 359.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10655.1 147.3 L10649.8 156.7 L10644.4 147.3 L10649.8 138.0 Z"></path>
-					</g>
-					<path d="M8064.3 529.7 L8064.25 531 L8064.25 551 L8064.3 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8069.6 520.3 L8064.3 529.7 L8058.9 520.3 L8064.3 511.0 Z"></path>
-					</g>
-					<path d="M8925.6 128.7 L9066.5 203 L8261.25 334.76452980793215 L8261.3 334.8 " fill="none"></path>
-					<path d="M8928.1 124.0 L8925.6 128.7 L8923.1 133.4 L8913.8 122.5 Z"></path>
-					<path d="M7681.3 432.2 L7681.25 531 L7681.25 551 L7681.3 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7686.6 422.8 L7681.3 432.2 L7675.9 422.8 L7681.3 413.5 Z"></path>
-					</g>
-					<path d="M8839.1 135.0 L8814.25 203 L7827.25 345.8667255075022 L7827.3 345.9 " fill="none"></path>
-					<path d="M8844.1 136.9 L8839.1 135.0 L8834.1 133.2 L8843.7 122.5 Z"></path>
-					<path d="M5601.5 156.7 L5601.5 203 L6790.75 359.12327396437865 L6790.8 359.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5606.8 147.3 L5601.5 156.7 L5596.2 147.3 L5601.5 138.0 Z"></path>
-					</g>
-					<path d="M5258.5 164.2 L5258.5 203 L6790.75 360.8200659444183 L6790.8 360.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5263.8 154.8 L5258.5 164.2 L5253.2 154.8 L5258.5 145.5 Z"></path>
-					</g>
-					<path d="M11206.9 163.2 L11240.75 203 L12117.75 350.36475409836066 L12117.8 350.4 " fill="none"></path>
-					<path d="M11211.0 159.7 L11206.9 163.2 L11202.8 166.6 L11198.3 153.0 Z"></path>
-					<path d="M11142.9 171.7 L11141.75 203 L6910.75 364.7068282451643 L6910.8 364.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11148.6 162.5 L11142.9 171.7 L11138.0 162.1 L11143.7 153.0 Z"></path>
-					</g>
-					<path d="M11114.7 170.4 L11101.75 203 L11201.806402439024 351.5 L11201.8 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11123.1 163.6 L11114.7 170.4 L11113.2 159.7 L11121.6 153.0 Z"></path>
-					</g>
-					<path d="M11091.5 163.6 L11061.75 203 L11879.75 349.29443838604146 L11879.8 349.3 " fill="none"></path>
-					<path d="M11095.7 166.9 L11091.5 163.6 L11087.2 160.4 L11099.5 153.0 Z"></path>
-					<path d="M8821.6 137.6 L8774.25 203 L6910.75 361.88432544840134 L6910.8 361.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8831.4 133.2 L8821.6 137.6 L8822.8 126.9 L8832.5 122.5 Z"></path>
-					</g>
-					<path d="M9591.8 164.2 L9591.75 203 L8576.25 362.4466251795117 L8576.3 362.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9597.1 154.8 L9591.8 164.2 L9586.4 154.8 L9591.8 145.5 Z"></path>
-					</g>
-					<path d="M8653.5 148.7 L8653.5 203 L8557.291920731708 351.5 L8557.3 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8658.8 139.3 L8653.5 148.7 L8648.2 139.3 L8653.5 130.0 Z"></path>
-					</g>
-					<path d="M4809.5 164.2 L4809.5 203 L6790.75 362.1794243723209 L6790.8 362.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4814.8 154.8 L4809.5 164.2 L4804.2 154.8 L4809.5 145.5 Z"></path>
-					</g>
-					<path d="M8487.4 160.0 L8522.5 203 L8814.293445121952 351.5 L8814.3 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8485.6 149.4 L8487.4 160.0 L8477.3 156.1 L8475.6 145.5 Z"></path>
-					</g>
-					<path d="M8360.0 158.2 L8312 203 L6910.75 360.2660393498717 L6910.8 360.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8370.4 155.8 L8360.0 158.2 L8363.2 148.0 L8373.6 145.5 Z"></path>
-					</g>
-					<path d="M8224.0 158.2 L8272 203 L7495.25 355.97148003602524 L7495.3 356.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8220.8 148.0 L8224.0 158.2 L8213.6 155.8 L8210.4 145.5 Z"></path>
-					</g>
-					<path d="M8019.7 153.4 L7913.25 203 L6910.75 357.7388235294118 L6910.8 357.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8030.4 154.3 L8019.7 153.4 L8025.9 144.6 L8036.6 145.5 Z"></path>
-					</g>
-					<path d="M12054.0 171.7 L12054 203 L12690.5 360.32629992464206 L12690.5 360.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12059.3 162.3 L12054.0 171.7 L12048.7 162.3 L12054.0 153.0 Z"></path>
-					</g>
-					<path d="M11026.7 140.9 L10876.5 203 L11515.75 333.8418096723869 L11515.8 333.8 " fill="none"></path>
-					<path d="M11028.7 145.8 L11026.7 140.9 L11024.6 135.9 L11039.0 135.8 Z"></path>
-					<path d="M10488.4 196.0 L10495.5 203 L10985.142530487805 351.5 L10985.1 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10485.4 185.7 L10488.4 196.0 L10478.0 193.3 L10475.0 183.0 Z"></path>
-					</g>
-					<path d="M10349.6 200.9 L10349 203 L6910.75 364.18716501107696 L6910.8 364.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10357.3 193.4 L10349.6 200.9 L10347.1 190.5 L10354.8 183.0 Z"></path>
-					</g>
-					<path d="M10269.1 195.7 L10261.25 203 L11140.25 354.58359621451103 L11140.3 354.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10279.6 193.3 L10269.1 195.7 L10272.3 185.4 L10282.8 183.0 Z"></path>
-					</g>
-					<path d="M4461.5 156.7 L4461.5 203 L6790.75 362.88155278853196 L6790.8 362.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4466.8 147.3 L4461.5 156.7 L4456.2 147.3 L4461.5 138.0 Z"></path>
-					</g>
-					<path d="M4214.5 156.7 L4214.5 203 L6790.75 363.2674253200569 L6790.8 363.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4219.8 147.3 L4214.5 156.7 L4209.2 147.3 L4214.5 138.0 Z"></path>
-					</g>
-					<path d="M13015.8 147.0 L13110 203 L13057.934451219513 351.5 L13057.9 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13010.5 137.7 L13015.8 147.0 L13005.0 146.9 L12999.7 137.5 Z"></path>
-					</g>
-					<path d="M12897.0 154.8 L12877.75 203 L13365.75 359.00779727095517 L13365.8 359.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12905.4 148.1 L12897.0 154.8 L12895.5 144.2 L12903.9 137.5 Z"></path>
-					</g>
-					<path d="M12799.8 145.0 L12667 203 L12849.003048780487 351.5 L12849.0 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12810.5 146.1 L12799.8 145.0 L12806.3 136.3 L12816.9 137.5 Z"></path>
-					</g>
-					<path d="M2707.5 141.2 L2707.5 203 L6790.75 364.62505279671757 L6790.8 364.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2712.8 131.8 L2707.5 141.2 L2702.2 131.8 L2707.5 122.5 Z"></path>
-					</g>
-					<path d="M11806.5 201.7 L11806.5 203 L8899.75 363.95450324976787 L8899.8 364.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11811.8 192.3 L11806.5 201.7 L11801.2 192.3 L11806.5 183.0 Z"></path>
-					</g>
-					<path d="M2403.5 156.2 L2403.5 203 L6790.75 364.78739670582945 L6790.8 364.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2408.8 146.8 L2403.5 156.2 L2398.2 146.8 L2403.5 137.5 Z"></path>
-					</g>
-					<path d="M11474.2 147.8 L11571 203 L12482.5 360.3536842105263 L12482.5 360.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11468.7 138.5 L11474.2 147.8 L11463.5 147.8 L11458.0 138.6 Z"></path>
-					</g>
-					<path d="M11304.8 174.7 L11280.75 203 L8576.25 365.260106091092 L8576.3 365.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11314.9 171.1 L11304.8 174.7 L11306.8 164.2 L11316.9 160.5 Z"></path>
-					</g>
-					<path d="M7762.4 151.3 L7873.25 203 L7037.75 358.8839590443686 L7037.8 358.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7756.2 142.6 L7762.4 151.3 L7751.7 152.2 L7745.5 143.5 Z"></path>
-					</g>
-					<path d="M7761.8 163.0 L7833.25 203 L9566.25 352.66403370194837 L9566.3 352.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7756.2 153.8 L7761.8 163.0 L7751.0 163.1 L7745.5 153.9 Z"></path>
-					</g>
-					<path d="M7509.2 186.8 L7488 203 L8518.25 362.5100306820864 L8518.3 362.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7519.8 185.4 L7509.2 186.8 L7513.4 176.9 L7524.0 175.5 Z"></path>
-					</g>
-					<path d="M9916.9 353.8 L10584.25 306 L10755.75 306 L10755.75 306 L10927.25 367 L10927.25 367 L10755.75 428 L10755.75 428 L10584.25 428 L10584.25 428 L9898.25 378.88497652582157 L9898.3 378.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9907.2 349.1 L9916.9 353.8 L9907.9 359.8 L9898.3 355.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M13337.8 120.3 L13337.75 203 L9898.25 359.44931354874495 L9898.3 359.4 " fill="none"></path>
-					</g>
-					<path d="M13343.1 120.3 L13337.8 120.3 L13332.4 120.3 L13337.8 107.0 Z"></path>
-					<path d="M13768.3 164.2 L13768.25 203 L13768.25 328.5 L13768.3 328.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13773.6 154.8 L13768.3 164.2 L13762.9 154.8 L13768.3 145.5 Z"></path>
-					</g>
-					<path d="M9418.4 159.2 L9456 203 L7037.75 364.1020615415863 L7037.8 364.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9416.3 148.6 L9418.4 159.2 L9408.2 155.6 L9406.2 145.0 Z"></path>
-					</g>
-					<path d="M9293.8 158.2 L9249.25 203 L8470.983231707318 351.5 L8471.0 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9304.2 155.4 L9293.8 158.2 L9296.6 147.9 L9307.0 145.0 Z"></path>
-					</g>
-					<path d="M14008.8 156.7 L14008.75 203 L14008.75 351.5 L14008.8 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14014.1 147.3 L14008.8 156.7 L14003.4 147.3 L14008.8 138.0 Z"></path>
-					</g>
-					<path d="M14392.1 143.8 L14446.25 203 L14520.5 351.5 L14520.5 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14389.7 133.3 L14392.1 143.8 L14381.8 140.5 L14379.5 130.0 Z"></path>
-					</g>
-					<path d="M14297.2 143.9 L14244 203 L14318.25 351.5 L14318.3 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14307.4 140.5 L14297.2 143.9 L14299.4 133.4 L14309.6 130.0 Z"></path>
-					</g>
-					<path d="M12371.8 156.7 L12371.75 203 L12991.5 352.30444362835107 L12991.5 352.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12377.1 147.3 L12371.8 156.7 L12366.4 147.3 L12371.8 138.0 Z"></path>
-					</g>
-					<path d="M14712.5 148.4 L14722.25 203 L14722.25 351.5 L14722.3 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14716.1 138.2 L14712.5 148.4 L14705.6 140.1 L14709.2 130.0 Z"></path>
-					</g>
-					<path d="M14632.1 140.7 L14543.25 203 L14346.532774390244 351.5 L14346.5 351.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14642.8 139.7 L14632.1 140.7 L14636.6 131.0 L14647.3 130.0 Z"></path>
-					</g>
-					<g data-name="ConsentScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentScreen">
-							<rect x="0.0" y="76.0" height="31.0" width="138.0" data-name="ConsentScreen"></rect>
-						</g>
-						<g transform="translate(0, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentScreen">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentScreen">ConsentScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentCard">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentCard">
-							<rect x="178.0" y="22.5" height="138.0" width="286.0" data-name="ConsentCard"></rect>
-							<path d="M178.0 53.5 L464.0 53.5" fill="none" data-name="ConsentCard"></path>
-							<path d="M178.0 129.5 L464.0 129.5" fill="none" data-name="ConsentCard"></path>
-						</g>
-						<g transform="translate(178, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentCard">
-								<text x="135.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentCard">ConsentCard</text>
-								
-							</g>
-						</g>
-						<g transform="translate(178, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+consent: ConsentItem?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentCard">+index: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentCard">+onTapped: dynamic Function(int)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentCard">+isChecked: bool?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(178, 129.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItem">
-							<rect x="358.5" y="351.5" height="31.0" width="116.0" data-name="ConsentItem"></rect>
-						</g>
-						<g transform="translate(358.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItem">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItem">ConsentItem</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(int)">
-							<rect x="132.5" y="351.5" height="31.0" width="186.0" data-name="dynamic Function(int)"></rect>
-						</g>
-						<g transform="translate(132.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(int)">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(int)">dynamic Function(int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentElement">
-							<rect x="504.0" y="38.0" height="107.0" width="249.0" data-name="ConsentElement"></rect>
-							<path d="M504.0 69.0 L753.0 69.0" fill="none" data-name="ConsentElement"></path>
-						</g>
-						<g transform="translate(504, 38)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentElement">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentElement">ConsentElement</text>
-								
-							</g>
-						</g>
-						<g transform="translate(504, 69)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentElement">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentElement">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentElement">+descriptionText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentElement">+acknowledgmentText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentElement">+icon: IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="6950.8" y="351.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(6950.75, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyOverviewScreen">
-							<rect x="793.0" y="76.0" height="31.0" width="190.0" data-name="StudyOverviewScreen"></rect>
-						</g>
-						<g transform="translate(793, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyOverviewScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyOverviewScreen">StudyOverviewScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_StudyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_StudyOverviewScreen">
-							<rect x="1887.0" y="30.0" height="123.0" width="316.0" data-name="_StudyOverviewScreen"></rect>
-							<path d="M1887.0 61.0 L2203.0 61.0" fill="none" data-name="_StudyOverviewScreen"></path>
-							<path d="M1887.0 92.0 L2203.0 92.0" fill="none" data-name="_StudyOverviewScreen"></path>
-						</g>
-						<g transform="translate(1887, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_StudyOverviewScreen">
-								<text x="150.0" y="13.5" stroke="none" text-anchor="middle" data-name="_StudyOverviewScreen">_StudyOverviewScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1887, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+study: Study?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1887, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToJourney()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToEligibilityCheck()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="_StudyOverviewScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="1091.5" y="351.5" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(1091.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDetailsView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDetailsView">
-							<rect x="1525.0" y="37.5" height="108.0" width="157.0" data-name="StudyDetailsView"></rect>
-							<path d="M1525.0 68.5 L1682.0 68.5" fill="none" data-name="StudyDetailsView"></path>
-							<path d="M1525.0 114.5 L1682.0 114.5" fill="none" data-name="StudyDetailsView"></path>
-						</g>
-						<g transform="translate(1525, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDetailsView">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDetailsView">StudyDetailsView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1525, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+study: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDetailsView">+iconSize: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1525, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="KickoffScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="KickoffScreen">
-							<rect x="1722.0" y="76.0" height="31.0" width="125.0" data-name="KickoffScreen"></rect>
-						</g>
-						<g transform="translate(1722, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="KickoffScreen">
-								<text x="54.5" y="13.5" stroke="none" text-anchor="middle" data-name="KickoffScreen">KickoffScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_KickoffScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_KickoffScreen">
-							<rect x="6897.0" y="15.0" height="153.0" width="261.0" data-name="_KickoffScreen"></rect>
-							<path d="M6897.0 46.0 L7158.0 46.0" fill="none" data-name="_KickoffScreen"></path>
-							<path d="M6897.0 92.0 L7158.0 92.0" fill="none" data-name="_KickoffScreen"></path>
-						</g>
-						<g transform="translate(6897, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_KickoffScreen">
-								<text x="122.5" y="13.5" stroke="none" text-anchor="middle" data-name="_KickoffScreen">_KickoffScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6897, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">+ready: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6897, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">-dynamic _storeUserStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">-Widget _constructStatusIcon()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="_KickoffScreen">-String _getStatusText()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="_KickoffScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="6790.8" y="351.5" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(6790.75, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityResult">
-							<rect x="7198.0" y="53.0" height="77.0" width="259.0" data-name="EligibilityResult"></rect>
-							<path d="M7198.0 84.0 L7457.0 84.0" fill="none" data-name="EligibilityResult"></path>
-						</g>
-						<g transform="translate(7198, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityResult">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityResult">EligibilityResult</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7198, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityResult">+eligible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EligibilityResult">+firstFailed: EligibilityCriterion?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityCriterion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityCriterion">
-							<rect x="3073.3" y="351.5" height="31.0" width="152.0" data-name="EligibilityCriterion"></rect>
-						</g>
-						<g transform="translate(3073.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityCriterion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityCriterion">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityCriterion">EligibilityCriterion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityScreen">
-							<rect x="1023.0" y="45.0" height="93.0" width="462.0" data-name="EligibilityScreen"></rect>
-							<path d="M1023.0 76.0 L1485.0 76.0" fill="none" data-name="EligibilityScreen"></path>
-							<path d="M1023.0 107.0 L1485.0 107.0" fill="none" data-name="EligibilityScreen"></path>
-						</g>
-						<g transform="translate(1023, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityScreen">
-								<text x="223.0" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityScreen">EligibilityScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1023, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityScreen">+study: Study?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1023, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityScreen">&lt;static&gt;+MaterialPageRoute&lt;EligibilityResult&gt; routeFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OnboardingProgress">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OnboardingProgress">
-							<rect x="2851.0" y="30.0" height="123.0" width="271.0" data-name="OnboardingProgress"></rect>
-							<path d="M2851.0 61.0 L3122.0 61.0" fill="none" data-name="OnboardingProgress"></path>
-							<path d="M2851.0 107.0 L3122.0 107.0" fill="none" data-name="OnboardingProgress"></path>
-						</g>
-						<g transform="translate(2851, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OnboardingProgress">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="OnboardingProgress">OnboardingProgress</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2851, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
-								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">+stage: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+progress: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2851, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
-								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">-double _getProgressForStage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySelectionScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySelectionScreen">
-							<rect x="3162.0" y="76.0" height="31.0" width="190.0" data-name="StudySelectionScreen"></rect>
-						</g>
-						<g transform="translate(3162, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySelectionScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySelectionScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySelectionScreen">StudySelectionScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeDialog">
-							<rect x="3392.0" y="76.0" height="31.0" width="151.0" data-name="InviteCodeDialog"></rect>
-						</g>
-						<g transform="translate(3392, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeDialog">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeDialog">InviteCodeDialog</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionSelectionScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSelectionScreen">
-							<rect x="3583.0" y="76.0" height="31.0" width="239.0" data-name="InterventionSelectionScreen"></rect>
-						</g>
-						<g transform="translate(3583, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSelectionScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSelectionScreen">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSelectionScreen">InterventionSelectionScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="JourneyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JourneyOverviewScreen">
-							<rect x="3862.0" y="76.0" height="31.0" width="209.0" data-name="JourneyOverviewScreen"></rect>
-						</g>
-						<g transform="translate(3862, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JourneyOverviewScreen">
-								<text x="96.5" y="13.5" stroke="none" text-anchor="middle" data-name="JourneyOverviewScreen">JourneyOverviewScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_JourneyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_JourneyOverviewScreen">
-							<rect x="6449.0" y="37.5" height="108.0" width="408.0" data-name="_JourneyOverviewScreen"></rect>
-							<path d="M6449.0 68.5 L6857.0 68.5" fill="none" data-name="_JourneyOverviewScreen"></path>
-							<path d="M6449.0 99.5 L6857.0 99.5" fill="none" data-name="_JourneyOverviewScreen"></path>
-						</g>
-						<g transform="translate(6449, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_JourneyOverviewScreen">
-								<text x="196.0" y="13.5" stroke="none" text-anchor="middle" data-name="_JourneyOverviewScreen">_JourneyOverviewScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6449, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_JourneyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_JourneyOverviewScreen">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6449, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_JourneyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_JourneyOverviewScreen">+dynamic getConsentAndNavigateToDashboard()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_JourneyOverviewScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Timeline">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Timeline">
-							<rect x="5740.0" y="45.0" height="93.0" width="207.0" data-name="Timeline"></rect>
-							<path d="M5740.0 76.0 L5947.0 76.0" fill="none" data-name="Timeline"></path>
-							<path d="M5740.0 107.0 L5947.0 107.0" fill="none" data-name="Timeline"></path>
-						</g>
-						<g transform="translate(5740, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timeline">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="Timeline">Timeline</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5740, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Timeline">
-								<text x="0.0" y="13.5" stroke="none" data-name="Timeline">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5740, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Timeline">
-								<text x="0.0" y="13.5" stroke="none" data-name="Timeline">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTile">
-							<rect x="10020.8" y="7.5" height="168.0" width="161.0" data-name="InterventionTile"></rect>
-							<path d="M10020.8 38.5 L10181.8 38.5" fill="none" data-name="InterventionTile"></path>
-							<path d="M10020.8 144.5 L10181.8 144.5" fill="none" data-name="InterventionTile"></path>
-						</g>
-						<g transform="translate(10020.75, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTile">
-								<text x="72.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTile">InterventionTile</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10020.75, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTile">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTile">+iconName: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTile">+date: DateTime</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTile">+color: Color?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTile">+isFirst: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTile">+isLast: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10020.75, 144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTile">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="8518.3" y="351.5" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(8518.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconIndicator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconIndicator">
-							<rect x="9819.8" y="37.5" height="108.0" width="161.0" data-name="IconIndicator"></rect>
-							<path d="M9819.8 68.5 L9980.8 68.5" fill="none" data-name="IconIndicator"></path>
-							<path d="M9819.8 114.5 L9980.8 114.5" fill="none" data-name="IconIndicator"></path>
-						</g>
-						<g transform="translate(9819.75, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconIndicator">
-								<text x="72.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconIndicator">IconIndicator</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9819.75, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconIndicator">+iconName: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconIndicator">+color: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9819.75, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconIndicator">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TimelineChild">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimelineChild">
-							<rect x="10580.8" y="45.0" height="93.0" width="138.0" data-name="TimelineChild"></rect>
-							<path d="M10580.8 76.0 L10718.8 76.0" fill="none" data-name="TimelineChild"></path>
-							<path d="M10580.8 107.0 L10718.8 107.0" fill="none" data-name="TimelineChild"></path>
-						</g>
-						<g transform="translate(10580.75, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimelineChild">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="TimelineChild">TimelineChild</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10580.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimelineChild">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimelineChild">+child: Widget?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10580.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimelineChild">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimelineChild">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="11404.8" y="351.5" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(11404.75, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionWidget">
-							<rect x="7867.3" y="223.0" height="288.0" width="394.0" data-name="AverageSectionWidget"></rect>
-							<path d="M7867.3 254.0 L8261.3 254.0" fill="none" data-name="AverageSectionWidget"></path>
-							<path d="M7867.3 315.0 L8261.3 315.0" fill="none" data-name="AverageSectionWidget"></path>
-						</g>
-						<g transform="translate(7867.25, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionWidget">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionWidget">AverageSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7867.25, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+section: AverageSection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+titlePos: List&lt;int&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+phasePos: List&lt;int&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7867.25, 315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+Widget getLegend()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+Widget getDiagram()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AverageSectionWidget">+BarChartData getChartData()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AverageSectionWidget">+Widget getTitles()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AverageSectionWidget">+Widget getValues()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AverageSectionWidget">+List&lt;BarChartGroupData&gt; getBarGroups()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AverageSectionWidget">+FlGridData getGridData()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AverageSectionWidget">+MaterialColor getColor()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AverageSectionWidget">+int getDayIndex()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AverageSectionWidget">+Iterable&lt;DiagramDatum&gt; getAggregatedData()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AverageSectionWidget">+Map&lt;String, String?&gt; getInterventionNames()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSection">
-							<rect x="7993.8" y="551.0" height="31.0" width="141.0" data-name="AverageSection"></rect>
-						</g>
-						<g transform="translate(7993.75, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSection">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSection">AverageSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionWidget">
-							<rect x="8756.5" y="60.5" height="62.0" width="197.0" data-name="ReportSectionWidget"></rect>
-							<path d="M8756.5 91.5 L8953.5 91.5" fill="none" data-name="ReportSectionWidget"></path>
-						</g>
-						<g transform="translate(8756.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionWidget">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionWidget">ReportSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8756.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionWidget">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DiagramDatum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DiagramDatum">
-							<rect x="5987.0" y="38.0" height="107.0" width="202.0" data-name="DiagramDatum"></rect>
-							<path d="M5987.0 69.0 L6189.0 69.0" fill="none" data-name="DiagramDatum"></path>
-						</g>
-						<g transform="translate(5987, 38)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DiagramDatum">
-								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="DiagramDatum">DiagramDatum</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5987, 69)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DiagramDatum">
-								<text x="0.0" y="13.5" stroke="none" data-name="DiagramDatum">+x: num</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DiagramDatum">+value: num</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DiagramDatum">+timestamp: DateTime?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DiagramDatum">+intervention: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionWidget">
-							<rect x="7535.3" y="320.5" height="93.0" width="292.0" data-name="LinearRegressionSectionWidget"></rect>
-							<path d="M7535.3 351.5 L7827.3 351.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-							<path d="M7535.3 382.5 L7827.3 382.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-						</g>
-						<g transform="translate(7535.25, 320.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionWidget">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionWidget">LinearRegressionSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7535.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+section: LinearRegressionSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7535.25, 382.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSection">
-							<rect x="7573.8" y="551.0" height="31.0" width="215.0" data-name="LinearRegressionSection"></rect>
-						</g>
-						<g transform="translate(7573.75, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSection">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSection">LinearRegressionSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportHistoryScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryScreen">
-							<rect x="6229.0" y="60.5" height="62.0" width="180.0" data-name="ReportHistoryScreen"></rect>
-							<path d="M6229.0 91.5 L6409.0 91.5" fill="none" data-name="ReportHistoryScreen"></path>
-						</g>
-						<g transform="translate(6229, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryScreen">ReportHistoryScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6229, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportHistoryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryItem">
-							<rect x="5503.0" y="45.0" height="93.0" width="197.0" data-name="ReportHistoryItem"></rect>
-							<path d="M5503.0 76.0 L5700.0 76.0" fill="none" data-name="ReportHistoryItem"></path>
-							<path d="M5503.0 107.0 L5700.0 107.0" fill="none" data-name="ReportHistoryItem"></path>
-						</g>
-						<g transform="translate(5503, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryItem">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryItem">ReportHistoryItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5503, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5503, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportDetailsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportDetailsScreen">
-							<rect x="5054.0" y="37.5" height="108.0" width="409.0" data-name="ReportDetailsScreen"></rect>
-							<path d="M5054.0 68.5 L5463.0 68.5" fill="none" data-name="ReportDetailsScreen"></path>
-							<path d="M5054.0 99.5 L5463.0 99.5" fill="none" data-name="ReportDetailsScreen"></path>
-						</g>
-						<g transform="translate(5054, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportDetailsScreen">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportDetailsScreen">ReportDetailsScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5054, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportDetailsScreen">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5054, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportDetailsScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GeneralDetailsSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GeneralDetailsSection">
-							<rect x="12117.8" y="336.0" height="62.0" width="198.0" data-name="GeneralDetailsSection"></rect>
-							<path d="M12117.8 367.0 L12315.8 367.0" fill="none" data-name="GeneralDetailsSection"></path>
-						</g>
-						<g transform="translate(12117.75, 336)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GeneralDetailsSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GeneralDetailsSection">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="GeneralDetailsSection">GeneralDetailsSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12117.75, 367)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GeneralDetailsSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GeneralDetailsSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GeneralDetailsSection">+Widget buildContent()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GenericSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GenericSection">
-							<rect x="11039.0" y="30.0" height="123.0" width="214.0" data-name="GenericSection"></rect>
-							<path d="M11039.0 61.0 L11253.0 61.0" fill="none" data-name="GenericSection"></path>
-							<path d="M11039.0 107.0 L11253.0 107.0" fill="none" data-name="GenericSection"></path>
-						</g>
-						<g transform="translate(11039, 30)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GenericSection">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="GenericSection">GenericSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11039, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GenericSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GenericSection">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GenericSection">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11039, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GenericSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GenericSection">+Widget buildContent()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GenericSection">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="11140.3" y="351.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(11140.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DisclaimerSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisclaimerSection">
-							<rect x="11879.8" y="336.0" height="62.0" width="198.0" data-name="DisclaimerSection"></rect>
-							<path d="M11879.8 367.0 L12077.8 367.0" fill="none" data-name="DisclaimerSection"></path>
-						</g>
-						<g transform="translate(11879.75, 336)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisclaimerSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisclaimerSection">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisclaimerSection">DisclaimerSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11879.75, 367)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisclaimerSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisclaimerSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisclaimerSection">+Widget buildContent()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegendWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendWidget">
-							<rect x="9523.8" y="37.5" height="108.0" width="136.0" data-name="LegendWidget"></rect>
-							<path d="M9523.8 68.5 L9659.8 68.5" fill="none" data-name="LegendWidget"></path>
-							<path d="M9523.8 114.5 L9659.8 114.5" fill="none" data-name="LegendWidget"></path>
-						</g>
-						<g transform="translate(9523.75, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendWidget">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="LegendWidget">LegendWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9523.75, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LegendWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9523.75, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegendsListWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendsListWidget">
-							<rect x="7785.5" y="45.0" height="93.0" width="207.0" data-name="LegendsListWidget"></rect>
-							<path d="M7785.5 76.0 L7992.5 76.0" fill="none" data-name="LegendsListWidget"></path>
-							<path d="M7785.5 107.0 L7992.5 107.0" fill="none" data-name="LegendsListWidget"></path>
-						</g>
-						<g transform="translate(7785.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendsListWidget">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LegendsListWidget">LegendsListWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7785.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+legends: List&lt;Legend&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7785.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Legend">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Legend">
-							<rect x="8590.5" y="53.0" height="77.0" width="126.0" data-name="Legend"></rect>
-							<path d="M8590.5 84.0 L8716.5 84.0" fill="none" data-name="Legend"></path>
-						</g>
-						<g transform="translate(8590.5, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Legend">
-								<text x="55.0" y="13.5" stroke="none" text-anchor="middle" data-name="Legend">Legend</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8590.5, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Legend">
-								<text x="0.0" y="13.5" stroke="none" data-name="Legend">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Legend">+color: Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceDetailsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceDetailsScreen">
-							<rect x="4605.0" y="37.5" height="108.0" width="409.0" data-name="PerformanceDetailsScreen"></rect>
-							<path d="M4605.0 68.5 L5014.0 68.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-							<path d="M4605.0 99.5 L5014.0 99.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-						</g>
-						<g transform="translate(4605, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceDetailsScreen">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceDetailsScreen">PerformanceDetailsScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4605, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">+reportSubject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4605, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceDetailsScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPerformanceBar">
-							<rect x="8312.5" y="37.5" height="108.0" width="238.0" data-name="InterventionPerformanceBar"></rect>
-							<path d="M8312.5 68.5 L8550.5 68.5" fill="none" data-name="InterventionPerformanceBar"></path>
-							<path d="M8312.5 114.5 L8550.5 114.5" fill="none" data-name="InterventionPerformanceBar"></path>
-						</g>
-						<g transform="translate(8312.5, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPerformanceBar">
-								<text x="111.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPerformanceBar">InterventionPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8312.5, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8312.5, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention">
-							<rect x="8789.8" y="351.5" height="31.0" width="110.0" data-name="Intervention"></rect>
-						</g>
-						<g transform="translate(8789.75, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention">Intervention</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ObservationPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ObservationPerformanceBar">
-							<rect x="8032.5" y="37.5" height="108.0" width="240.0" data-name="ObservationPerformanceBar"></rect>
-							<path d="M8032.5 68.5 L8272.5 68.5" fill="none" data-name="ObservationPerformanceBar"></path>
-							<path d="M8032.5 114.5 L8272.5 114.5" fill="none" data-name="ObservationPerformanceBar"></path>
-						</g>
-						<g transform="translate(8032.5, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ObservationPerformanceBar">
-								<text x="112.0" y="13.5" stroke="none" text-anchor="middle" data-name="ObservationPerformanceBar">ObservationPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8032.5, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+observation: Observation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ObservationPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8032.5, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Observation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Observation">
-							<rect x="7383.3" y="351.5" height="31.0" width="112.0" data-name="Observation"></rect>
-						</g>
-						<g transform="translate(7383.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Observation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Observation">
-								<text x="48.0" y="13.5" stroke="none" text-anchor="middle" data-name="Observation">Observation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceBar">
-							<rect x="11982.0" y="30.0" height="123.0" width="144.0" data-name="PerformanceBar"></rect>
-							<path d="M11982.0 61.0 L12126.0 61.0" fill="none" data-name="PerformanceBar"></path>
-							<path d="M11982.0 122.0 L12126.0 122.0" fill="none" data-name="PerformanceBar"></path>
-						</g>
-						<g transform="translate(11982, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceBar">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceBar">PerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11982, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+task: Task</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceBar">+completed: int</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PerformanceBar">+total: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11982, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Task">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Task">
-							<rect x="12690.5" y="351.5" height="31.0" width="54.0" data-name="Task"></rect>
-						</g>
-						<g transform="translate(12690.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Task">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Task">
-								<text x="19.0" y="13.5" stroke="none" text-anchor="middle" data-name="Task">Task</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceSection">
-							<rect x="11515.8" y="298.0" height="138.0" width="324.0" data-name="PerformanceSection"></rect>
-							<path d="M11515.8 329.0 L11839.8 329.0" fill="none" data-name="PerformanceSection"></path>
-							<path d="M11515.8 375.0 L11839.8 375.0" fill="none" data-name="PerformanceSection"></path>
-						</g>
-						<g transform="translate(11515.75, 298)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceSection">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceSection">PerformanceSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11515.75, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+minimumRatio: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+maximum: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11515.75, 375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+Widget buildContent()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+String getPowerLevelDescription()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PerformanceSection">+int getCountableObservationAmount()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionContainer">
-							<rect x="10221.8" y="0.0" height="183.0" width="319.0" data-name="ReportSectionContainer"></rect>
-							<path d="M10221.8 31.0 L10540.8 31.0" fill="none" data-name="ReportSectionContainer"></path>
-							<path d="M10221.8 107.0 L10540.8 107.0" fill="none" data-name="ReportSectionContainer"></path>
-						</g>
-						<g transform="translate(10221.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionContainer">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionContainer">ReportSectionContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10221.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionContainer">+section: ReportSection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionContainer">+subject: StudySubject</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionContainer">+primary: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionContainer">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10221.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionContainer">+ReportSectionWidget buildContents()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionContainer">+dynamic ()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionContainer">+List&lt;Widget&gt; buildPrimaryHeader()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionContainer">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="10972.3" y="351.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(10972.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Settings">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Settings">
-							<rect x="9699.8" y="76.0" height="31.0" width="80.0" data-name="Settings"></rect>
-						</g>
-						<g transform="translate(9699.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Settings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Settings">
-								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="Settings">Settings</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OptOutAlertDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OptOutAlertDialog">
-							<rect x="4358.0" y="45.0" height="93.0" width="207.0" data-name="OptOutAlertDialog"></rect>
-							<path d="M4358.0 76.0 L4565.0 76.0" fill="none" data-name="OptOutAlertDialog"></path>
-							<path d="M4358.0 107.0 L4565.0 107.0" fill="none" data-name="OptOutAlertDialog"></path>
-						</g>
-						<g transform="translate(4358, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptOutAlertDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptOutAlertDialog">OptOutAlertDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4358, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptOutAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptOutAlertDialog">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4358, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptOutAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptOutAlertDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DeleteAlertDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DeleteAlertDialog">
-							<rect x="4111.0" y="45.0" height="93.0" width="207.0" data-name="DeleteAlertDialog"></rect>
-							<path d="M4111.0 76.0 L4318.0 76.0" fill="none" data-name="DeleteAlertDialog"></path>
-							<path d="M4111.0 107.0 L4318.0 107.0" fill="none" data-name="DeleteAlertDialog"></path>
-						</g>
-						<g transform="translate(4111, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DeleteAlertDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="DeleteAlertDialog">DeleteAlertDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4111, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DeleteAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="DeleteAlertDialog">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4111, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DeleteAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="DeleteAlertDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskBox">
-							<rect x="12776.3" y="45.5" height="92.0" width="292.0" data-name="TaskBox"></rect>
-							<path d="M12776.3 76.5 L13068.3 76.5" fill="none" data-name="TaskBox"></path>
-						</g>
-						<g transform="translate(12776.25, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskBox">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskBox">TaskBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12776.25, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskBox">+taskInstance: TaskInstance</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskBox">+icon: Icon</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskBox">+onCompleted: dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskInstance">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskInstance">
-							<rect x="12991.5" y="351.5" height="31.0" width="122.0" data-name="TaskInstance"></rect>
-						</g>
-						<g transform="translate(12991.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskInstance">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskInstance">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskInstance">TaskInstance</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Icon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Icon">
-							<rect x="13365.8" y="351.5" height="31.0" width="50.0" data-name="Icon"></rect>
-						</g>
-						<g transform="translate(13365.75, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Icon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Icon">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Icon">Icon</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="12784.5" y="351.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(12784.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ProgressRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ProgressRow">
-							<rect x="2604.0" y="60.5" height="62.0" width="207.0" data-name="ProgressRow"></rect>
-							<path d="M2604.0 91.5 L2811.0 91.5" fill="none" data-name="ProgressRow"></path>
-						</g>
-						<g transform="translate(2604, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProgressRow">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProgressRow">ProgressRow</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2604, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ProgressRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="ProgressRow">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionSegment">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSegment">
-							<rect x="11671.0" y="0.0" height="183.0" width="271.0" data-name="InterventionSegment"></rect>
-							<path d="M11671.0 31.0 L11942.0 31.0" fill="none" data-name="InterventionSegment"></path>
-							<path d="M11671.0 137.0 L11942.0 137.0" fill="none" data-name="InterventionSegment"></path>
-						</g>
-						<g transform="translate(11671, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSegment">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSegment">InterventionSegment</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11671, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+percentCompleted: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionSegment">+percentMissed: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionSegment">+isCurrent: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionSegment">+isFuture: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionSegment">+phaseDuration: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11671, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+List&lt;Widget&gt; buildSeparators()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskOverview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskOverview">
-							<rect x="2243.0" y="45.5" height="92.0" width="321.0" data-name="TaskOverview"></rect>
-							<path d="M2243.0 76.5 L2564.0 76.5" fill="none" data-name="TaskOverview"></path>
-						</g>
-						<g transform="translate(2243, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskOverview">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskOverview">TaskOverview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2243, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskOverview">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskOverview">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskOverview">+scheduleToday: List&lt;TaskInstance&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskOverview">+interventionIcon: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactScreen">
-							<rect x="11498.0" y="76.0" height="31.0" width="133.0" data-name="ContactScreen"></rect>
-						</g>
-						<g transform="translate(11498, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactScreen">
-								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactScreen">ContactScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactWidget">
-							<rect x="11293.0" y="22.5" height="138.0" width="165.0" data-name="ContactWidget"></rect>
-							<path d="M11293.0 53.5 L11458.0 53.5" fill="none" data-name="ContactWidget"></path>
-							<path d="M11293.0 129.5 L11458.0 129.5" fill="none" data-name="ContactWidget"></path>
-						</g>
-						<g transform="translate(11293, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactWidget">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactWidget">ContactWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11293, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+contact: Contact?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactWidget">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactWidget">+subtitle: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11293, 129.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Contact">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Contact">
-							<rect x="12482.5" y="351.5" height="31.0" width="77.0" data-name="Contact"></rect>
-						</g>
-						<g transform="translate(12482.5, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Contact">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Contact">
-								<text x="30.5" y="13.5" stroke="none" text-anchor="middle" data-name="Contact">Contact</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItem">
-							<rect x="7522.5" y="7.5" height="168.0" width="223.0" data-name="ContactItem"></rect>
-							<path d="M7522.5 38.5 L7745.5 38.5" fill="none" data-name="ContactItem"></path>
-							<path d="M7522.5 129.5 L7745.5 129.5" fill="none" data-name="ContactItem"></path>
-						</g>
-						<g transform="translate(7522.5, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItem">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItem">ContactItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7522.5, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+iconData: IconData</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+itemName: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItem">+itemValue: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItem">+type: ContactItemType?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItem">+iconColor: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7522.5, 129.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+dynamic launchContact()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItemType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItemType">
-							<rect x="9566.3" y="306.0" height="122.0" width="332.0" data-name="ContactItemType"></rect>
-							<path d="M9566.3 337.0 L9898.3 337.0" fill="none" data-name="ContactItemType"></path>
-						</g>
-						<g transform="translate(9566.25, 306)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItemType">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItemType">ContactItemType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9566.25, 337)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItemType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItemType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+values: List&lt;ContactItemType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+website: ContactItemType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+email: ContactItemType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+phone: ContactItemType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="13307.3" y="76.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(13307.25, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FAQ">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FAQ">
-							<rect x="12600.3" y="60.5" height="62.0" width="136.0" data-name="FAQ"></rect>
-							<path d="M12600.3 91.5 L12736.3 91.5" fill="none" data-name="FAQ"></path>
-						</g>
-						<g transform="translate(12600.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FAQ">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="FAQ">FAQ</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12600.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FAQ">
-								<text x="0.0" y="13.5" stroke="none" data-name="FAQ">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Entry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Entry">
-							<rect x="13674.3" y="328.5" height="77.0" width="188.0" data-name="Entry"></rect>
-							<path d="M13674.3 359.5 L13862.3 359.5" fill="none" data-name="Entry"></path>
-						</g>
-						<g transform="translate(13674.25, 328.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Entry">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="Entry">Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13674.25, 359.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Entry">
-								<text x="0.0" y="13.5" stroke="none" data-name="Entry">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Entry">+children: List&lt;Entry&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EntryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EntryItem">
-							<rect x="13678.8" y="37.5" height="108.0" width="179.0" data-name="EntryItem"></rect>
-							<path d="M13678.8 68.5 L13857.8 68.5" fill="none" data-name="EntryItem"></path>
-							<path d="M13678.8 99.5 L13857.8 99.5" fill="none" data-name="EntryItem"></path>
-						</g>
-						<g transform="translate(13678.75, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EntryItem">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="EntryItem">EntryItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13678.75, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">+entry: Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13678.75, 99.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">-Widget _buildTiles()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EntryItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="13108.3" y="60.5" height="62.0" width="159.0" data-name="DashboardScreen"></rect>
-							<path d="M13108.3 91.5 L13267.3 91.5" fill="none" data-name="DashboardScreen"></path>
-						</g>
-						<g transform="translate(13108.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="71.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13108.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+error: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OverflowMenuItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OverflowMenuItem">
-							<rect x="9236.8" y="38.0" height="107.0" width="247.0" data-name="OverflowMenuItem"></rect>
-							<path d="M9236.8 69.0 L9483.8 69.0" fill="none" data-name="OverflowMenuItem"></path>
-						</g>
-						<g transform="translate(9236.75, 38)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OverflowMenuItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OverflowMenuItem">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="OverflowMenuItem">OverflowMenuItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9236.75, 69)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OverflowMenuItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OverflowMenuItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="OverflowMenuItem">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OverflowMenuItem">+icon: IconData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="OverflowMenuItem">+routeName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="OverflowMenuItem">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="8301.3" y="351.5" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
-						</g>
-						<g transform="translate(8301.25, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
-								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFinishedPlaceholder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFinishedPlaceholder">
-							<rect x="13897.8" y="45.0" height="93.0" width="222.0" data-name="StudyFinishedPlaceholder"></rect>
-							<path d="M13897.8 76.0 L14119.8 76.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
-							<path d="M13897.8 107.0 L14119.8 107.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
-						</g>
-						<g transform="translate(13897.75, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFinishedPlaceholder">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFinishedPlaceholder">StudyFinishedPlaceholder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13897.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">&lt;static&gt;+space: SizedBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13897.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SizedBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SizedBox">
-							<rect x="13963.8" y="351.5" height="31.0" width="90.0" data-name="SizedBox"></rect>
-						</g>
-						<g transform="translate(13963.75, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SizedBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SizedBox">
-								<text x="37.0" y="13.5" stroke="none" text-anchor="middle" data-name="SizedBox">SizedBox</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTaskWidget">
-							<rect x="14187.8" y="53.0" height="77.0" width="313.0" data-name="QuestionnaireTaskWidget"></rect>
-							<path d="M14187.8 84.0 L14500.8 84.0" fill="none" data-name="QuestionnaireTaskWidget"></path>
-						</g>
-						<g transform="translate(14187.75, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTaskWidget">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTaskWidget">QuestionnaireTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14187.75, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireTaskWidget">+task: QuestionnaireTask</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireTaskWidget">+completionPeriod: CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTask">
-							<rect x="14445.8" y="351.5" height="31.0" width="165.0" data-name="QuestionnaireTask"></rect>
-						</g>
-						<g transform="translate(14445.75, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTask">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTask">QuestionnaireTask</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CompletionPeriod">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CompletionPeriod">
-							<rect x="14248.0" y="351.5" height="31.0" width="156.0" data-name="CompletionPeriod"></rect>
-						</g>
-						<g transform="translate(14248, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CompletionPeriod">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CompletionPeriod">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="CompletionPeriod">CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskScreen">
-							<rect x="12183.3" y="45.0" height="93.0" width="377.0" data-name="TaskScreen"></rect>
-							<path d="M12183.3 76.0 L12560.3 76.0" fill="none" data-name="TaskScreen"></path>
-							<path d="M12183.3 107.0 L12560.3 107.0" fill="none" data-name="TaskScreen"></path>
-						</g>
-						<g transform="translate(12183.25, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskScreen">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskScreen">TaskScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12183.25, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">+taskInstance: TaskInstance</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12183.25, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">&lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CheckmarkTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTaskWidget">
-							<rect x="14540.8" y="53.0" height="77.0" width="323.0" data-name="CheckmarkTaskWidget"></rect>
-							<path d="M14540.8 84.0 L14863.8 84.0" fill="none" data-name="CheckmarkTaskWidget"></path>
-						</g>
-						<g transform="translate(14540.75, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTaskWidget">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTaskWidget">CheckmarkTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14540.75, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CheckmarkTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="CheckmarkTaskWidget">+task: CheckmarkTask?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CheckmarkTaskWidget">+completionPeriod: CompletionPeriod?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CheckmarkTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTask">
-							<rect x="14650.8" y="351.5" height="31.0" width="143.0" data-name="CheckmarkTask"></rect>
-						</g>
-						<g transform="translate(14650.75, 351.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTask">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTask">CheckmarkTask</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/screens/uml.svg b/docs/uml/app/lib/screens/uml.svg
deleted file mode 100644
index 7e5967908..000000000
--- a/docs/uml/app/lib/screens/uml.svg
+++ /dev/null
@@ -1,2660 +0,0 @@
-<svg version="1.1" baseProfile="full" width="17674.5" height="788.0" viewbox="0 0 17674.5 788" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[ConsentScreen
-	]
-	
-	[ConsentCard
-	  |
-	  +consent: ConsentItem?;
-	  +index: int?;
-	  +onTapped: dynamic Function(int);
-	  +isChecked: bool?
-	  |
-	  +Widget build()
-	]
-	
-	[ConsentCard]o-[ConsentItem]
-	[ConsentCard]o-[dynamic Function(int)]
-	
-	[ConsentElement
-	  |
-	  +title: String;
-	  +descriptionText: String;
-	  +acknowledgmentText: String;
-	  +icon: IconData
-	]
-	
-	[ConsentElement]o-[IconData]
-	
-	[StudyOverviewScreen
-	]
-	
-	[_StudyOverviewScreen
-	  |
-	  +study: Study?
-	  |
-	  +dynamic navigateToJourney();
-	  +dynamic navigateToEligibilityCheck();
-	  +Widget build()
-	]
-	
-	[_StudyOverviewScreen]o-[Study]
-	
-	[StudyDetailsView
-	  |
-	  +study: Study?;
-	  +iconSize: double
-	  |
-	  +Widget build()
-	]
-	
-	[StudyDetailsView]o-[Study]
-	
-	[KickoffScreen
-	]
-	
-	[_KickoffScreen
-	  |
-	  +subject: StudySubject?;
-	  +ready: bool
-	  |
-	  -dynamic _storeUserStudy();
-	  -Widget _constructStatusIcon();
-	  -String _getStatusText();
-	  +Widget build()
-	]
-	
-	[_KickoffScreen]o-[StudySubject]
-	
-	[EligibilityResult
-	  |
-	  +eligible: bool;
-	  +firstFailed: EligibilityCriterion?
-	]
-	
-	[EligibilityResult]o-[EligibilityCriterion]
-	
-	[EligibilityScreen
-	  |
-	  +study: Study?
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;EligibilityResult&gt; routeFor()
-	]
-	
-	[EligibilityScreen]o-[Study]
-	
-	[OnboardingProgress
-	  |
-	  +stage: int;
-	  +progress: double
-	  |
-	  -double _getProgressForStage();
-	  +Widget build()
-	]
-	
-	[StudySelectionScreen
-	]
-	
-	[InviteCodeDialog
-	]
-	
-	[InterventionSelectionScreen
-	]
-	
-	[JourneyOverviewScreen
-	]
-	
-	[_JourneyOverviewScreen
-	  |
-	  +subject: StudySubject?
-	  |
-	  +dynamic getConsentAndNavigateToDashboard();
-	  +Widget build()
-	]
-	
-	[_JourneyOverviewScreen]o-[StudySubject]
-	
-	[Timeline
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[Timeline]o-[StudySubject]
-	
-	[InterventionTile
-	  |
-	  +title: String?;
-	  +iconName: String;
-	  +date: DateTime;
-	  +color: Color?;
-	  +isFirst: bool;
-	  +isLast: bool
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionTile]o-[Color]
-	
-	[IconIndicator
-	  |
-	  +iconName: String;
-	  +color: Color?
-	  |
-	  +Widget build()
-	]
-	
-	[IconIndicator]o-[Color]
-	
-	[TimelineChild
-	  |
-	  +child: Widget?
-	  |
-	  +Widget build()
-	]
-	
-	[TimelineChild]o-[&lt;abstract&gt;Widget]
-	
-	[AverageSectionWidget
-	  |
-	  +section: AverageSection;
-	  +titlePos: List&lt;int&gt;;
-	  +phasePos: List&lt;int&gt;
-	  |
-	  +Widget build();
-	  +Widget getLegend();
-	  +Widget getDiagram();
-	  +BarChartData getChartData();
-	  +Widget getTitles();
-	  +Widget getValues();
-	  +List&lt;BarChartGroupData&gt; getBarGroups();
-	  +FlGridData getGridData();
-	  +MaterialColor getColor();
-	  +int getDayIndex();
-	  +Iterable&lt;DiagramDatum&gt; getAggregatedData();
-	  +Map&lt;String, String?&gt; getInterventionNames()
-	]
-	
-	[AverageSectionWidget]o-[AverageSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[AverageSectionWidget]
-	
-	[DiagramDatum
-	  |
-	  +x: num;
-	  +value: num;
-	  +timestamp: DateTime?;
-	  +intervention: String
-	]
-	
-	[LinearRegressionSectionWidget
-	  |
-	  +section: LinearRegressionSection
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionWidget]o-[LinearRegressionSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[LinearRegressionSectionWidget]
-	
-	[ReportHistoryScreen
-	  |
-	  +Widget build()
-	]
-	
-	[ReportHistoryItem
-	  |
-	  +subject: StudySubject
-	  |
-	  +Widget build()
-	]
-	
-	[ReportHistoryItem]o-[StudySubject]
-	
-	[ReportDetailsScreen
-	  |
-	  +subject: StudySubject
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor();
-	  +Widget build()
-	]
-	
-	[ReportDetailsScreen]o-[StudySubject]
-	
-	[GeneralDetailsSection
-	  |
-	  +Widget buildContent()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[GeneralDetailsSection]
-	
-	[&lt;abstract&gt;GenericSection
-	  |
-	  +subject: StudySubject?;
-	  +onTap: void Function()?
-	  |
-	  +Widget buildContent();
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;GenericSection]o-[StudySubject]
-	[&lt;abstract&gt;GenericSection]o-[void Function()?]
-	
-	[DisclaimerSection
-	  |
-	  +Widget buildContent()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[DisclaimerSection]
-	
-	[&lt;abstract&gt;ReportSectionWidget
-	  |
-	  +subject: StudySubject
-	]
-	
-	[&lt;abstract&gt;ReportSectionWidget]o-[StudySubject]
-	
-	[LegendWidget
-	  |
-	  +name: String;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[LegendWidget]o-[Color]
-	
-	[LegendsListWidget
-	  |
-	  +legends: List&lt;Legend&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[Legend
-	  |
-	  +name: String;
-	  +color: Color
-	]
-	
-	[Legend]o-[Color]
-	
-	[PerformanceDetailsScreen
-	  |
-	  +reportSubject: StudySubject?
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor();
-	  +Widget build()
-	]
-	
-	[PerformanceDetailsScreen]o-[StudySubject]
-	
-	[InterventionPerformanceBar
-	  |
-	  +intervention: Intervention;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPerformanceBar]o-[Intervention]
-	[InterventionPerformanceBar]o-[StudySubject]
-	
-	[ObservationPerformanceBar
-	  |
-	  +observation: Observation;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[ObservationPerformanceBar]o-[&lt;abstract&gt;Observation]
-	[ObservationPerformanceBar]o-[StudySubject]
-	
-	[PerformanceBar
-	  |
-	  +task: Task;
-	  +completed: int;
-	  +total: int
-	  |
-	  +Widget build()
-	]
-	
-	[PerformanceBar]o-[&lt;abstract&gt;Task]
-	
-	[PerformanceSection
-	  |
-	  +minimumRatio: double;
-	  +maximum: double
-	  |
-	  +Widget buildContent();
-	  +String getPowerLevelDescription();
-	  +int getCountableObservationAmount()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[PerformanceSection]
-	
-	[PerformanceBar
-	  |
-	  +progress: double;
-	  +minimum: double?
-	  |
-	  +Widget build()
-	]
-	
-	[ReportSectionContainer
-	  |
-	  +section: ReportSection;
-	  +subject: StudySubject;
-	  +primary: bool;
-	  +onTap: void Function()?
-	  |
-	  +ReportSectionWidget buildContents();
-	  +dynamic ();
-	  +List&lt;Widget&gt; buildPrimaryHeader();
-	  +Widget build()
-	]
-	
-	[ReportSectionContainer]o-[&lt;abstract&gt;ReportSection]
-	[ReportSectionContainer]o-[StudySubject]
-	[ReportSectionContainer]o-[void Function()?]
-	
-	[Settings
-	]
-	
-	[OptOutAlertDialog
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[OptOutAlertDialog]o-[StudySubject]
-	
-	[DeleteAlertDialog
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[DeleteAlertDialog]o-[StudySubject]
-	
-	[TaskBox
-	  |
-	  +taskInstance: TaskInstance;
-	  +icon: Icon;
-	  +onCompleted: dynamic Function()
-	]
-	
-	[TaskBox]o-[TaskInstance]
-	[TaskBox]o-[Icon]
-	[TaskBox]o-[dynamic Function()]
-	
-	[ProgressRow
-	  |
-	  +subject: StudySubject?
-	]
-	
-	[ProgressRow]o-[StudySubject]
-	
-	[InterventionSegment
-	  |
-	  +intervention: Intervention;
-	  +percentCompleted: double;
-	  +percentMissed: double;
-	  +isCurrent: bool;
-	  +isFuture: bool;
-	  +phaseDuration: int
-	  |
-	  +List&lt;Widget&gt; buildSeparators();
-	  +Widget build()
-	]
-	
-	[InterventionSegment]o-[Intervention]
-	
-	[TaskOverview
-	  |
-	  +subject: StudySubject?;
-	  +scheduleToday: List&lt;TaskInstance&gt;?;
-	  +interventionIcon: String?
-	]
-	
-	[TaskOverview]o-[StudySubject]
-	
-	[ContactScreen
-	]
-	
-	[ContactWidget
-	  |
-	  +contact: Contact?;
-	  +title: String;
-	  +subtitle: String?;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[ContactWidget]o-[Contact]
-	[ContactWidget]o-[Color]
-	
-	[ContactItem
-	  |
-	  +iconData: IconData;
-	  +itemName: String;
-	  +itemValue: String?;
-	  +type: ContactItemType?;
-	  +iconColor: Color?
-	  |
-	  +dynamic launchContact();
-	  +Widget build()
-	]
-	
-	[ContactItem]o-[IconData]
-	[ContactItem]o-[ContactItemType]
-	[ContactItem]o-[Color]
-	
-	[ContactItemType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ContactItemType&gt;;
-	  &lt;static&gt;+website: ContactItemType;
-	  &lt;static&gt;+email: ContactItemType;
-	  &lt;static&gt;+phone: ContactItemType
-	]
-	
-	[ContactItemType]o-[ContactItemType]
-	[Enum]&lt;:--[ContactItemType]
-	
-	[FAQ
-	  |
-	  +Widget build()
-	]
-	
-	[Entry
-	  |
-	  +title: String;
-	  +children: List&lt;Entry&gt;
-	]
-	
-	[EntryItem
-	  |
-	  +entry: Entry
-	  |
-	  -Widget _buildTiles();
-	  +Widget build()
-	]
-	
-	[EntryItem]o-[Entry]
-	
-	[DashboardScreen
-	  |
-	  +error: String?
-	]
-	
-	[OverflowMenuItem
-	  |
-	  +name: String;
-	  +icon: IconData;
-	  +routeName: String?;
-	  +onTap: dynamic Function()?
-	]
-	
-	[OverflowMenuItem]o-[IconData]
-	[OverflowMenuItem]o-[dynamic Function()?]
-	
-	[StudyFinishedPlaceholder
-	  |
-	  &lt;static&gt;+space: SizedBox
-	  |
-	  +Widget build()
-	]
-	
-	[StudyFinishedPlaceholder]o-[SizedBox]
-	
-	[QuestionnaireTaskWidget
-	  |
-	  +task: QuestionnaireTask;
-	  +completionPeriod: CompletionPeriod
-	]
-	
-	[QuestionnaireTaskWidget]o-[QuestionnaireTask]
-	[QuestionnaireTaskWidget]o-[CompletionPeriod]
-	
-	[TaskScreen
-	  |
-	  +taskInstance: TaskInstance
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()
-	]
-	
-	[TaskScreen]o-[TaskInstance]
-	
-	[CheckmarkTaskWidget
-	  |
-	  +task: CheckmarkTask?;
-	  +completionPeriod: CompletionPeriod?
-	]
-	
-	[CheckmarkTaskWidget]o-[CheckmarkTask]
-	[CheckmarkTaskWidget]o-[CompletionPeriod]
-	
-	[AppOutdatedScreen
-	  |
-	  +Widget build()
-	]
-	
-	[TermsScreen
-	]
-	
-	[LegalSection
-	  |
-	  +title: String?;
-	  +description: String?;
-	  +icon: Icon?;
-	  +pdfUrl: String?;
-	  +pdfUrlLabel: String?;
-	  +acknowledgment: String?;
-	  +isChecked: bool?;
-	  +onChange: void Function(bool?)?
-	  |
-	  +Widget build()
-	]
-	
-	[LegalSection]o-[Icon]
-	[LegalSection]o-[void Function(bool?)?]
-	
-	[IFrameHelper
-	  |
-	  +void postRouteFinished();
-	  +void listen()
-	]
-	
-	[LoadingScreen
-	  |
-	  +sessionString: String?;
-	  +queryParameters: Map&lt;String, String&gt;?
-	]
-	
-	[AboutScreen
-	  |
-	  +Widget build()
-	]
-	
-	[Preview
-	  |
-	  +queryParameters: Map&lt;String, String&gt;?;
-	  +appLanguage: AppLanguage;
-	  +selectedRoute: String?;
-	  +extra: String?;
-	  +study: Study?;
-	  +selectedStudyObjectId: String?;
-	  +subject: StudySubject?
-	  |
-	  +bool hasRoute();
-	  +void handleQueries();
-	  +dynamic init();
-	  +dynamic handleAuthorization();
-	  +dynamic runCommands();
-	  +String? getSelectedRoute();
-	  +bool containsQuery();
-	  +bool containsQueryPair();
-	  +dynamic getStudySubject();
-	  -dynamic _createFakeSubject();
-	  +List&lt;String&gt; getInterventionIds()
-	]
-	
-	[Preview]o-[AppLanguage]
-	[Preview]o-[Study]
-	[Preview]o-[StudySubject]
-	
-	[WelcomeScreen
-	  |
-	  +Widget build()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="788.0" width="17674.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M364.8 252.1 L416.5 353 L416.5 501.5 L416.5 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M365.3 241.4 L364.8 252.1 L355.8 246.2 L356.3 235.5 Z"></path>
-					</g>
-					<path d="M277.2 252.1 L225.5 353 L225.5 501.5 L225.5 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M286.2 246.2 L277.2 252.1 L276.7 241.4 L285.7 235.5 Z"></path>
-					</g>
-					<path d="M628.5 238.7 L628.5 353 L4303 515.0812264658418 L4303.0 515.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M633.8 229.3 L628.5 238.7 L623.2 229.3 L628.5 220.0 Z"></path>
-					</g>
-					<path d="M2045.0 246.7 L2045 353 L1845.1135670731708 501.5 L1845.1 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2050.3 237.3 L2045.0 246.7 L2039.7 237.3 L2045.0 228.0 Z"></path>
-					</g>
-					<path d="M1603.5 239.2 L1603.5 353 L1803.3864329268292 501.5 L1803.4 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1608.8 229.8 L1603.5 239.2 L1598.2 229.8 L1603.5 220.5 Z"></path>
-					</g>
-					<path d="M7027.5 261.7 L7027.5 353 L7505.144817073171 501.5 L7505.1 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7032.8 252.3 L7027.5 261.7 L7022.2 252.3 L7027.5 243.0 Z"></path>
-					</g>
-					<path d="M7705.5 223.7 L7705.5 353 L8308.78125 501.5 L8308.8 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7710.8 214.3 L7705.5 223.7 L7700.2 214.3 L7705.5 205.0 Z"></path>
-					</g>
-					<path d="M1254.0 231.7 L1254 353 L1793.75 508.2284085927225 L1793.8 508.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1259.3 222.3 L1254.0 231.7 L1248.7 222.3 L1254.0 213.0 Z"></path>
-					</g>
-					<path d="M6653.0 239.2 L6653 353 L7495 506.09090909090907 L7495.0 506.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6658.3 229.8 L6653.0 239.2 L6647.7 229.8 L6653.0 220.5 Z"></path>
-					</g>
-					<path d="M5843.5 231.7 L5843.5 353 L7495 511.250657318142 L7495.0 511.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5848.8 222.3 L5843.5 231.7 L5838.2 222.3 L5843.5 213.0 Z"></path>
-					</g>
-					<path d="M11153.3 269.2 L11153.25 353 L9972.5 513.0686092167804 L9972.5 513.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11158.6 259.8 L11153.3 269.2 L11147.9 259.8 L11153.3 250.5 Z"></path>
-					</g>
-					<path d="M10952.3 239.2 L10952.25 353 L9972.5 512.2852540272614 L9972.5 512.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10957.6 229.8 L10952.3 239.2 L10946.9 229.8 L10952.3 220.5 Z"></path>
-					</g>
-					<path d="M11701.8 231.7 L11701.75 353 L12591 510.7042443903758 L12591.0 510.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11707.1 222.3 L11701.8 231.7 L11696.4 222.3 L11701.8 213.0 Z"></path>
-					</g>
-					<path d="M9677.5 679.7 L9677.5 681 L9677.5 701 L9677.5 701.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9682.8 670.3 L9677.5 679.7 L9672.2 670.3 L9677.5 661.0 Z"></path>
-					</g>
-					<path d="M10301.2 206.3 L10467.5 353 L9874.5 476.1037974683544 L9874.5 476.1 " fill="none"></path>
-					<path d="M10304.7 202.3 L10301.2 206.3 L10297.6 210.3 L10291.2 197.5 Z"></path>
-					<path d="M9294.5 582.2 L9294.5 681 L9294.5 701 L9294.5 701.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9299.8 572.8 L9294.5 582.2 L9289.2 572.8 L9294.5 563.5 Z"></path>
-					</g>
-					<path d="M10246.4 210.5 L10215.25 353 L9440.5 490.99511267988055 L9440.5 491.0 " fill="none"></path>
-					<path d="M10251.6 211.7 L10246.4 210.5 L10241.2 209.4 L10249.2 197.5 Z"></path>
-					<path d="M5601.5 231.7 L5601.5 353 L7495 511.9628871256719 L7495.0 512.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5606.8 222.3 L5601.5 231.7 L5596.2 222.3 L5601.5 213.0 Z"></path>
-					</g>
-					<path d="M5258.5 239.2 L5258.5 353 L7495 512.7152188112345 L7495.0 512.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5263.8 229.8 L5258.5 239.2 L5253.2 229.8 L5258.5 220.5 Z"></path>
-					</g>
-					<path d="M12267.1 237.6 L12379.25 353 L13386.25 502.32007233273055 L13386.3 502.3 " fill="none"></path>
-					<path d="M12270.9 233.8 L12267.1 237.6 L12263.2 241.3 L12257.8 228.0 Z"></path>
-					<path d="M12232.7 245.1 L12280.25 353 L7615 514.9175704989154 L7615.0 514.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12233.8 234.4 L12232.7 245.1 L12224.0 238.7 L12225.1 228.0 Z"></path>
-					</g>
-					<path d="M12216.1 246.2 L12240.25 353 L12383.543445121952 501.5 L12383.5 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12219.2 235.9 L12216.1 246.2 L12208.8 238.3 L12211.9 228.0 Z"></path>
-					</g>
-					<path d="M12198.9 241.3 L12200.25 353 L13066 500.1707696294377 L13066.0 500.2 " fill="none"></path>
-					<path d="M12204.2 241.3 L12198.9 241.3 L12193.6 241.4 L12198.7 228.0 Z"></path>
-					<path d="M10235.2 214.6 L10175.25 353 L7615 513.2446331456922 L7615.0 513.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10243.8 208.2 L10235.2 214.6 L10234.0 203.9 L10242.6 197.5 Z"></path>
-					</g>
-					<path d="M10763.8 239.2 L10763.75 353 L9972.5 511.20176775373363 L9972.5 511.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10769.1 229.8 L10763.8 239.2 L10758.4 229.8 L10763.8 220.5 Z"></path>
-					</g>
-					<path d="M10054.5 223.7 L10054.5 353 L9953.990853658537 501.5 L9954.0 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10059.8 214.3 L10054.5 223.7 L10049.2 214.3 L10054.5 205.0 Z"></path>
-					</g>
-					<path d="M4809.5 239.2 L4809.5 353 L7495 513.4159533782554 L7495.0 513.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4814.8 229.8 L4809.5 239.2 L4804.2 229.8 L4809.5 220.5 Z"></path>
-					</g>
-					<path d="M9867.0 237.3 L9923.5 353 L11577.25 511.7212874908559 L11577.3 511.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9867.7 226.5 L9867.0 237.3 L9858.1 231.2 L9858.8 220.5 Z"></path>
-					</g>
-					<path d="M9787.8 236.2 L9713 353 L7615 512.4402224281743 L7615.0 512.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9797.4 231.2 L9787.8 236.2 L9788.4 225.5 L9797.9 220.5 Z"></path>
-					</g>
-					<path d="M9598.2 236.2 L9673 353 L8985.75 504.6434577867474 L8985.8 504.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9597.6 225.5 L9598.2 236.2 L9588.6 231.2 L9588.1 220.5 Z"></path>
-					</g>
-					<path d="M9508.0 236.1 L9431.75 353 L7615 511.7568935660051 L7615.0 511.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9517.6 231.2 L9508.0 236.1 L9508.7 225.4 L9518.2 220.5 Z"></path>
-					</g>
-					<path d="M13106.0 246.7 L13106 353 L13872.5 511.41965973534974 L13872.5 511.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13111.3 237.3 L13106.0 246.7 L13100.7 237.3 L13106.0 228.0 Z"></path>
-					</g>
-					<path d="M12098.2 235.6 L11928.5 353 L12702 488.6002137894174 L12702.0 488.6 " fill="none"></path>
-					<path d="M12101.2 240.0 L12098.2 235.6 L12095.1 231.2 L12109.1 228.0 Z"></path>
-					<path d="M11499.1 273.9 L11547.5 353 L12158.704268292682 501.5 L12158.7 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11498.7 263.2 L11499.1 273.9 L11489.6 268.7 L11489.3 258.0 Z"></path>
-					</g>
-					<path d="M11429.9 276.7 L11427.5 353 L7615 514.4590058102001 L7615.0 514.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11435.5 267.5 L11429.9 276.7 L11424.8 267.2 L11430.4 258.0 Z"></path>
-					</g>
-					<path d="M11364.3 273.7 L11313.25 353 L12326.5 506.1195577055978 L12326.5 506.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11373.8 268.7 L11364.3 273.7 L11364.8 263.0 L11374.4 258.0 Z"></path>
-					</g>
-					<path d="M4461.5 231.7 L4461.5 353 L7495 513.8191368999516 L7495.0 513.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4466.8 222.3 L4461.5 231.7 L4456.2 222.3 L4461.5 213.0 Z"></path>
-					</g>
-					<path d="M4214.5 231.7 L4214.5 353 L7495 514.0543331836551 L7495.0 514.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4219.8 222.3 L4214.5 231.7 L4209.2 222.3 L4214.5 213.0 Z"></path>
-					</g>
-					<path d="M14185.8 229.4 L14244.25 353 L14299.484756097561 501.5 L14299.5 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14186.6 218.7 L14185.8 229.4 L14176.9 223.2 L14177.8 212.5 Z"></path>
-					</g>
-					<path d="M14105.7 226.8 L14000.5 353 L14630 510.73567608861725 L14630.0 510.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14115.8 223.1 L14105.7 226.8 L14107.6 216.3 L14117.6 212.5 Z"></path>
-					</g>
-					<path d="M14074.9 223.2 L13889.25 353 L14098.870426829268 501.5 L14098.9 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14085.6 222.2 L14074.9 223.2 L14079.5 213.5 L14090.2 212.5 Z"></path>
-					</g>
-					<path d="M2707.5 216.2 L2707.5 353 L7495 514.9700876740588 L7495.0 515.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2712.8 206.8 L2707.5 216.2 L2702.2 206.8 L2707.5 197.5 Z"></path>
-					</g>
-					<path d="M12858.5 276.7 L12858.5 353 L11687.25 509.6442405708461 L11687.3 509.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12863.8 267.3 L12858.5 276.7 L12853.2 267.3 L12858.5 258.0 Z"></path>
-					</g>
-					<path d="M2403.5 231.2 L2403.5 353 L7495 515.0898767349315 L7495.0 515.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2408.8 221.8 L2403.5 231.2 L2398.2 221.8 L2403.5 212.5 Z"></path>
-					</g>
-					<path d="M12650.2 251.6 L12709.5 353 L13664.5 510.6446904881731 L13664.5 510.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12650.1 240.9 L12650.2 251.6 L12640.9 246.2 L12640.8 235.5 Z"></path>
-					</g>
-					<path d="M12520.4 248.9 L12419.25 353 L9972.5 515.0789659699082 L9972.5 515.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12530.8 245.9 L12520.4 248.9 L12523.1 238.5 L12533.4 235.5 Z"></path>
-					</g>
-					<path d="M8768.9 268.8 L8787 353 L4390 515.3934241639455 L4390.0 515.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8772.2 258.5 L8768.9 268.8 L8761.8 260.7 L8765.0 250.5 Z"></path>
-					</g>
-					<path d="M8747.0 269.2 L8747 353 L10801 504.73693693693696 L10801.0 504.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8752.3 259.8 L8747.0 269.2 L8741.7 259.8 L8747.0 250.5 Z"></path>
-					</g>
-					<path d="M8617.4 198.4 L7989.5 353 L9914.5 514.5660184237462 L9914.5 514.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8627.7 201.4 L8617.4 198.4 L8625.2 191.0 L8635.5 194.0 Z"></path>
-					</g>
-					<path d="M11151.5 491.0 L11399.166666666666 456 L11465.708333333334 456 L11465.708333333334 456 L11532.25 517 L11532.25 517 L11465.708333333334 578 L11465.708333333334 578 L11399.166666666666 578 L11399.166666666666 578 L11133 540.4307751639028 L11133.0 540.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11141.5 487.0 L11151.5 491.0 L11143.0 497.5 L11133.0 493.6 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M14372.5 195.3 L14372.5 353 L11133 509.0058728527382 L11133.0 509.0 " fill="none"></path>
-					</g>
-					<path d="M14377.8 195.3 L14372.5 195.3 L14367.2 195.3 L14372.5 182.0 Z"></path>
-					<path d="M14841.0 239.2 L14841 353 L14903.55868902439 478.5 L14903.6 478.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14846.3 229.8 L14841.0 239.2 L14835.7 229.8 L14841.0 220.5 Z"></path>
-					</g>
-					<path d="M9315.1 235.6 L9391.75 353 L4390 515.5859967295971 L4390.0 515.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9314.5 224.9 L9315.1 235.6 L9305.6 230.7 L9304.9 220.0 Z"></path>
-					</g>
-					<path d="M9226.3 235.8 L9152.5 353 L8630.712652439024 501.5 L8630.7 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9235.8 230.7 L9226.3 235.8 L9226.8 225.1 L9236.3 220.0 Z"></path>
-					</g>
-					<path d="M15411.5 231.7 L15411.5 353 L15411.5 501.5 L15411.5 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15416.8 222.3 L15411.5 231.7 L15406.2 222.3 L15411.5 213.0 Z"></path>
-					</g>
-					<path d="M16219.0 211.4 L16607 353 L16715.884908536584 501.5 L16715.9 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16212.1 203.2 L16219.0 211.4 L16208.4 213.2 L16201.5 205.0 Z"></path>
-					</g>
-					<path d="M16027.0 215.9 L15835.25 353 L16089.465701219513 501.5 L16089.5 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16037.7 214.8 L16027.0 215.9 L16031.5 206.1 L16042.2 205.0 Z"></path>
-					</g>
-					<path d="M13582.5 231.7 L13582.5 353 L14244.25 503.15842269111033 L14244.3 503.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13587.8 222.3 L13582.5 231.7 L13577.2 222.3 L13582.5 213.0 Z"></path>
-					</g>
-					<path d="M17278.1 223.6 L17292 353 L17292 501.5 L17292.0 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17282.4 213.7 L17278.1 223.6 L17271.8 214.8 L17276.1 205.0 Z"></path>
-					</g>
-					<path d="M17137.0 210.8 L16704 353 L16171.573170731708 501.5 L16171.6 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17147.5 213.0 L17137.0 210.8 L17144.2 202.8 L17154.7 205.0 Z"></path>
-					</g>
-					<path d="M15194.0 280.9 L15243.5 353 L14680 510.03313508920985 L14680.0 510.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15193.1 270.2 L15194.0 280.9 L15184.3 276.2 L15183.4 265.5 Z"></path>
-					</g>
-					<path d="M15100.8 284.0 L15092.25 353 L15166.27362804878 501.5 L15166.3 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15107.3 275.4 L15100.8 284.0 L15096.7 274.1 L15103.2 265.5 Z"></path>
-					</g>
-					<path d="M7505.6 347.8 L7509.5 353 L8128.75 501.74697912852434 L8128.8 501.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7504.1 337.2 L7505.6 347.8 L7495.6 343.7 L7494.2 333.0 Z"></path>
-					</g>
-					<path d="M7301.1 350.6 L7300.25 353 L1854.75 516.0865595325055 L1854.8 516.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7309.3 343.6 L7301.1 350.6 L7299.2 340.0 L7307.4 333.0 Z"></path>
-					</g>
-					<path d="M7221.6 347.6 L7217.25 353 L7523.078506097561 501.5 L7523.1 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7231.6 343.6 L7221.6 347.6 L7223.3 336.9 L7233.3 333.0 Z"></path>
-					</g>
-					<g data-name="ConsentScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentScreen">
-							<rect x="0.0" y="151.0" height="31.0" width="138.0" data-name="ConsentScreen"></rect>
-						</g>
-						<g transform="translate(0, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentScreen">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentScreen">ConsentScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentCard">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentCard">
-							<rect x="178.0" y="97.5" height="138.0" width="286.0" data-name="ConsentCard"></rect>
-							<path d="M178.0 128.5 L464.0 128.5" fill="none" data-name="ConsentCard"></path>
-							<path d="M178.0 204.5 L464.0 204.5" fill="none" data-name="ConsentCard"></path>
-						</g>
-						<g transform="translate(178, 97.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentCard">
-								<text x="135.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentCard">ConsentCard</text>
-								
-							</g>
-						</g>
-						<g transform="translate(178, 128.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+consent: ConsentItem?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentCard">+index: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentCard">+onTapped: dynamic Function(int)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentCard">+isChecked: bool?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(178, 204.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItem">
-							<rect x="358.5" y="501.5" height="31.0" width="116.0" data-name="ConsentItem"></rect>
-						</g>
-						<g transform="translate(358.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItem">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItem">ConsentItem</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(int)">
-							<rect x="132.5" y="501.5" height="31.0" width="186.0" data-name="dynamic Function(int)"></rect>
-						</g>
-						<g transform="translate(132.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(int)">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(int)">dynamic Function(int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentElement">
-							<rect x="504.0" y="113.0" height="107.0" width="249.0" data-name="ConsentElement"></rect>
-							<path d="M504.0 144.0 L753.0 144.0" fill="none" data-name="ConsentElement"></path>
-						</g>
-						<g transform="translate(504, 113)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentElement">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentElement">ConsentElement</text>
-								
-							</g>
-						</g>
-						<g transform="translate(504, 144)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentElement">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentElement">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentElement">+descriptionText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentElement">+acknowledgmentText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentElement">+icon: IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="4303.0" y="501.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(4303, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyOverviewScreen">
-							<rect x="793.0" y="151.0" height="31.0" width="190.0" data-name="StudyOverviewScreen"></rect>
-						</g>
-						<g transform="translate(793, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyOverviewScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyOverviewScreen">StudyOverviewScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_StudyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_StudyOverviewScreen">
-							<rect x="1887.0" y="105.0" height="123.0" width="316.0" data-name="_StudyOverviewScreen"></rect>
-							<path d="M1887.0 136.0 L2203.0 136.0" fill="none" data-name="_StudyOverviewScreen"></path>
-							<path d="M1887.0 167.0 L2203.0 167.0" fill="none" data-name="_StudyOverviewScreen"></path>
-						</g>
-						<g transform="translate(1887, 105)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_StudyOverviewScreen">
-								<text x="150.0" y="13.5" stroke="none" text-anchor="middle" data-name="_StudyOverviewScreen">_StudyOverviewScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1887, 136)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+study: Study?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1887, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToJourney()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToEligibilityCheck()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="_StudyOverviewScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="1793.8" y="501.5" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(1793.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDetailsView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDetailsView">
-							<rect x="1525.0" y="112.5" height="108.0" width="157.0" data-name="StudyDetailsView"></rect>
-							<path d="M1525.0 143.5 L1682.0 143.5" fill="none" data-name="StudyDetailsView"></path>
-							<path d="M1525.0 189.5 L1682.0 189.5" fill="none" data-name="StudyDetailsView"></path>
-						</g>
-						<g transform="translate(1525, 112.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDetailsView">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDetailsView">StudyDetailsView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1525, 143.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+study: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDetailsView">+iconSize: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1525, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="KickoffScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="KickoffScreen">
-							<rect x="1722.0" y="151.0" height="31.0" width="125.0" data-name="KickoffScreen"></rect>
-						</g>
-						<g transform="translate(1722, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="KickoffScreen">
-								<text x="54.5" y="13.5" stroke="none" text-anchor="middle" data-name="KickoffScreen">KickoffScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_KickoffScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_KickoffScreen">
-							<rect x="6897.0" y="90.0" height="153.0" width="261.0" data-name="_KickoffScreen"></rect>
-							<path d="M6897.0 121.0 L7158.0 121.0" fill="none" data-name="_KickoffScreen"></path>
-							<path d="M6897.0 167.0 L7158.0 167.0" fill="none" data-name="_KickoffScreen"></path>
-						</g>
-						<g transform="translate(6897, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_KickoffScreen">
-								<text x="122.5" y="13.5" stroke="none" text-anchor="middle" data-name="_KickoffScreen">_KickoffScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6897, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">+ready: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6897, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">-dynamic _storeUserStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">-Widget _constructStatusIcon()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="_KickoffScreen">-String _getStatusText()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="_KickoffScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="7495.0" y="501.5" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(7495, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityResult">
-							<rect x="7576.0" y="128.0" height="77.0" width="259.0" data-name="EligibilityResult"></rect>
-							<path d="M7576.0 159.0 L7835.0 159.0" fill="none" data-name="EligibilityResult"></path>
-						</g>
-						<g transform="translate(7576, 128)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityResult">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityResult">EligibilityResult</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7576, 159)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityResult">+eligible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EligibilityResult">+firstFailed: EligibilityCriterion?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityCriterion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityCriterion">
-							<rect x="8295.8" y="501.5" height="31.0" width="152.0" data-name="EligibilityCriterion"></rect>
-						</g>
-						<g transform="translate(8295.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityCriterion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityCriterion">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityCriterion">EligibilityCriterion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityScreen">
-							<rect x="1023.0" y="120.0" height="93.0" width="462.0" data-name="EligibilityScreen"></rect>
-							<path d="M1023.0 151.0 L1485.0 151.0" fill="none" data-name="EligibilityScreen"></path>
-							<path d="M1023.0 182.0 L1485.0 182.0" fill="none" data-name="EligibilityScreen"></path>
-						</g>
-						<g transform="translate(1023, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityScreen">
-								<text x="223.0" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityScreen">EligibilityScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1023, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityScreen">+study: Study?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1023, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityScreen">&lt;static&gt;+MaterialPageRoute&lt;EligibilityResult&gt; routeFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OnboardingProgress">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OnboardingProgress">
-							<rect x="2851.0" y="105.0" height="123.0" width="271.0" data-name="OnboardingProgress"></rect>
-							<path d="M2851.0 136.0 L3122.0 136.0" fill="none" data-name="OnboardingProgress"></path>
-							<path d="M2851.0 182.0 L3122.0 182.0" fill="none" data-name="OnboardingProgress"></path>
-						</g>
-						<g transform="translate(2851, 105)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OnboardingProgress">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="OnboardingProgress">OnboardingProgress</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2851, 136)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
-								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">+stage: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+progress: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2851, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
-								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">-double _getProgressForStage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySelectionScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySelectionScreen">
-							<rect x="3162.0" y="151.0" height="31.0" width="190.0" data-name="StudySelectionScreen"></rect>
-						</g>
-						<g transform="translate(3162, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySelectionScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySelectionScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySelectionScreen">StudySelectionScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeDialog">
-							<rect x="3392.0" y="151.0" height="31.0" width="151.0" data-name="InviteCodeDialog"></rect>
-						</g>
-						<g transform="translate(3392, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeDialog">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeDialog">InviteCodeDialog</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionSelectionScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSelectionScreen">
-							<rect x="3583.0" y="151.0" height="31.0" width="239.0" data-name="InterventionSelectionScreen"></rect>
-						</g>
-						<g transform="translate(3583, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSelectionScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSelectionScreen">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSelectionScreen">InterventionSelectionScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="JourneyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JourneyOverviewScreen">
-							<rect x="3862.0" y="151.0" height="31.0" width="209.0" data-name="JourneyOverviewScreen"></rect>
-						</g>
-						<g transform="translate(3862, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JourneyOverviewScreen">
-								<text x="96.5" y="13.5" stroke="none" text-anchor="middle" data-name="JourneyOverviewScreen">JourneyOverviewScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_JourneyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_JourneyOverviewScreen">
-							<rect x="6449.0" y="112.5" height="108.0" width="408.0" data-name="_JourneyOverviewScreen"></rect>
-							<path d="M6449.0 143.5 L6857.0 143.5" fill="none" data-name="_JourneyOverviewScreen"></path>
-							<path d="M6449.0 174.5 L6857.0 174.5" fill="none" data-name="_JourneyOverviewScreen"></path>
-						</g>
-						<g transform="translate(6449, 112.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_JourneyOverviewScreen">
-								<text x="196.0" y="13.5" stroke="none" text-anchor="middle" data-name="_JourneyOverviewScreen">_JourneyOverviewScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6449, 143.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_JourneyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_JourneyOverviewScreen">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6449, 174.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_JourneyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_JourneyOverviewScreen">+dynamic getConsentAndNavigateToDashboard()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_JourneyOverviewScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Timeline">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Timeline">
-							<rect x="5740.0" y="120.0" height="93.0" width="207.0" data-name="Timeline"></rect>
-							<path d="M5740.0 151.0 L5947.0 151.0" fill="none" data-name="Timeline"></path>
-							<path d="M5740.0 182.0 L5947.0 182.0" fill="none" data-name="Timeline"></path>
-						</g>
-						<g transform="translate(5740, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timeline">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="Timeline">Timeline</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5740, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Timeline">
-								<text x="0.0" y="13.5" stroke="none" data-name="Timeline">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5740, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Timeline">
-								<text x="0.0" y="13.5" stroke="none" data-name="Timeline">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTile">
-							<rect x="11072.8" y="82.5" height="168.0" width="161.0" data-name="InterventionTile"></rect>
-							<path d="M11072.8 113.5 L11233.8 113.5" fill="none" data-name="InterventionTile"></path>
-							<path d="M11072.8 219.5 L11233.8 219.5" fill="none" data-name="InterventionTile"></path>
-						</g>
-						<g transform="translate(11072.75, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTile">
-								<text x="72.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTile">InterventionTile</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11072.75, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTile">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTile">+iconName: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTile">+date: DateTime</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTile">+color: Color?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTile">+isFirst: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTile">+isLast: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11072.75, 219.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTile">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="9914.5" y="501.5" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(9914.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconIndicator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconIndicator">
-							<rect x="10871.8" y="112.5" height="108.0" width="161.0" data-name="IconIndicator"></rect>
-							<path d="M10871.8 143.5 L11032.8 143.5" fill="none" data-name="IconIndicator"></path>
-							<path d="M10871.8 189.5 L11032.8 189.5" fill="none" data-name="IconIndicator"></path>
-						</g>
-						<g transform="translate(10871.75, 112.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconIndicator">
-								<text x="72.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconIndicator">IconIndicator</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10871.75, 143.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconIndicator">+iconName: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconIndicator">+color: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10871.75, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconIndicator">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TimelineChild">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimelineChild">
-							<rect x="11632.8" y="120.0" height="93.0" width="138.0" data-name="TimelineChild"></rect>
-							<path d="M11632.8 151.0 L11770.8 151.0" fill="none" data-name="TimelineChild"></path>
-							<path d="M11632.8 182.0 L11770.8 182.0" fill="none" data-name="TimelineChild"></path>
-						</g>
-						<g transform="translate(11632.75, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimelineChild">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="TimelineChild">TimelineChild</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11632.75, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimelineChild">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimelineChild">+child: Widget?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11632.75, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimelineChild">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimelineChild">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="12591.0" y="501.5" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(12591, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionWidget">
-							<rect x="9480.5" y="373.0" height="288.0" width="394.0" data-name="AverageSectionWidget"></rect>
-							<path d="M9480.5 404.0 L9874.5 404.0" fill="none" data-name="AverageSectionWidget"></path>
-							<path d="M9480.5 465.0 L9874.5 465.0" fill="none" data-name="AverageSectionWidget"></path>
-						</g>
-						<g transform="translate(9480.5, 373)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionWidget">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionWidget">AverageSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9480.5, 404)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+section: AverageSection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+titlePos: List&lt;int&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+phasePos: List&lt;int&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9480.5, 465)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+Widget getLegend()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+Widget getDiagram()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AverageSectionWidget">+BarChartData getChartData()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AverageSectionWidget">+Widget getTitles()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AverageSectionWidget">+Widget getValues()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AverageSectionWidget">+List&lt;BarChartGroupData&gt; getBarGroups()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AverageSectionWidget">+FlGridData getGridData()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AverageSectionWidget">+MaterialColor getColor()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AverageSectionWidget">+int getDayIndex()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AverageSectionWidget">+Iterable&lt;DiagramDatum&gt; getAggregatedData()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AverageSectionWidget">+Map&lt;String, String?&gt; getInterventionNames()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSection">
-							<rect x="9607.0" y="701.0" height="31.0" width="141.0" data-name="AverageSection"></rect>
-						</g>
-						<g transform="translate(9607, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSection">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSection">AverageSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionWidget">
-							<rect x="10157.5" y="135.5" height="62.0" width="197.0" data-name="ReportSectionWidget"></rect>
-							<path d="M10157.5 166.5 L10354.5 166.5" fill="none" data-name="ReportSectionWidget"></path>
-						</g>
-						<g transform="translate(10157.5, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionWidget">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionWidget">ReportSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10157.5, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionWidget">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DiagramDatum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DiagramDatum">
-							<rect x="5987.0" y="113.0" height="107.0" width="202.0" data-name="DiagramDatum"></rect>
-							<path d="M5987.0 144.0 L6189.0 144.0" fill="none" data-name="DiagramDatum"></path>
-						</g>
-						<g transform="translate(5987, 113)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DiagramDatum">
-								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="DiagramDatum">DiagramDatum</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5987, 144)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DiagramDatum">
-								<text x="0.0" y="13.5" stroke="none" data-name="DiagramDatum">+x: num</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DiagramDatum">+value: num</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DiagramDatum">+timestamp: DateTime?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DiagramDatum">+intervention: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionWidget">
-							<rect x="9148.5" y="470.5" height="93.0" width="292.0" data-name="LinearRegressionSectionWidget"></rect>
-							<path d="M9148.5 501.5 L9440.5 501.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-							<path d="M9148.5 532.5 L9440.5 532.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-						</g>
-						<g transform="translate(9148.5, 470.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionWidget">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionWidget">LinearRegressionSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9148.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+section: LinearRegressionSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9148.5, 532.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSection">
-							<rect x="9187.0" y="701.0" height="31.0" width="215.0" data-name="LinearRegressionSection"></rect>
-						</g>
-						<g transform="translate(9187, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSection">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSection">LinearRegressionSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportHistoryScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryScreen">
-							<rect x="6229.0" y="135.5" height="62.0" width="180.0" data-name="ReportHistoryScreen"></rect>
-							<path d="M6229.0 166.5 L6409.0 166.5" fill="none" data-name="ReportHistoryScreen"></path>
-						</g>
-						<g transform="translate(6229, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryScreen">ReportHistoryScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6229, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportHistoryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryItem">
-							<rect x="5503.0" y="120.0" height="93.0" width="197.0" data-name="ReportHistoryItem"></rect>
-							<path d="M5503.0 151.0 L5700.0 151.0" fill="none" data-name="ReportHistoryItem"></path>
-							<path d="M5503.0 182.0 L5700.0 182.0" fill="none" data-name="ReportHistoryItem"></path>
-						</g>
-						<g transform="translate(5503, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryItem">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryItem">ReportHistoryItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5503, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5503, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportDetailsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportDetailsScreen">
-							<rect x="5054.0" y="112.5" height="108.0" width="409.0" data-name="ReportDetailsScreen"></rect>
-							<path d="M5054.0 143.5 L5463.0 143.5" fill="none" data-name="ReportDetailsScreen"></path>
-							<path d="M5054.0 174.5 L5463.0 174.5" fill="none" data-name="ReportDetailsScreen"></path>
-						</g>
-						<g transform="translate(5054, 112.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportDetailsScreen">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportDetailsScreen">ReportDetailsScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5054, 143.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportDetailsScreen">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5054, 174.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportDetailsScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GeneralDetailsSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GeneralDetailsSection">
-							<rect x="13386.3" y="486.0" height="62.0" width="198.0" data-name="GeneralDetailsSection"></rect>
-							<path d="M13386.3 517.0 L13584.3 517.0" fill="none" data-name="GeneralDetailsSection"></path>
-						</g>
-						<g transform="translate(13386.25, 486)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GeneralDetailsSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GeneralDetailsSection">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="GeneralDetailsSection">GeneralDetailsSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13386.25, 517)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GeneralDetailsSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GeneralDetailsSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GeneralDetailsSection">+Widget buildContent()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GenericSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GenericSection">
-							<rect x="12091.0" y="105.0" height="123.0" width="214.0" data-name="GenericSection"></rect>
-							<path d="M12091.0 136.0 L12305.0 136.0" fill="none" data-name="GenericSection"></path>
-							<path d="M12091.0 182.0 L12305.0 182.0" fill="none" data-name="GenericSection"></path>
-						</g>
-						<g transform="translate(12091, 105)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GenericSection">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="GenericSection">GenericSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12091, 136)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GenericSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GenericSection">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GenericSection">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12091, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GenericSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GenericSection">+Widget buildContent()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GenericSection">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="12326.5" y="501.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(12326.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DisclaimerSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisclaimerSection">
-							<rect x="13066.0" y="486.0" height="62.0" width="198.0" data-name="DisclaimerSection"></rect>
-							<path d="M13066.0 517.0 L13264.0 517.0" fill="none" data-name="DisclaimerSection"></path>
-						</g>
-						<g transform="translate(13066, 486)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisclaimerSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisclaimerSection">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisclaimerSection">DisclaimerSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13066, 517)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisclaimerSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisclaimerSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisclaimerSection">+Widget buildContent()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegendWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendWidget">
-							<rect x="10695.8" y="112.5" height="108.0" width="136.0" data-name="LegendWidget"></rect>
-							<path d="M10695.8 143.5 L10831.8 143.5" fill="none" data-name="LegendWidget"></path>
-							<path d="M10695.8 189.5 L10831.8 189.5" fill="none" data-name="LegendWidget"></path>
-						</g>
-						<g transform="translate(10695.75, 112.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendWidget">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="LegendWidget">LegendWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10695.75, 143.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LegendWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10695.75, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegendsListWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendsListWidget">
-							<rect x="7875.0" y="120.0" height="93.0" width="207.0" data-name="LegendsListWidget"></rect>
-							<path d="M7875.0 151.0 L8082.0 151.0" fill="none" data-name="LegendsListWidget"></path>
-							<path d="M7875.0 182.0 L8082.0 182.0" fill="none" data-name="LegendsListWidget"></path>
-						</g>
-						<g transform="translate(7875, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendsListWidget">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LegendsListWidget">LegendsListWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7875, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+legends: List&lt;Legend&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7875, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Legend">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Legend">
-							<rect x="9991.5" y="128.0" height="77.0" width="126.0" data-name="Legend"></rect>
-							<path d="M9991.5 159.0 L10117.5 159.0" fill="none" data-name="Legend"></path>
-						</g>
-						<g transform="translate(9991.5, 128)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Legend">
-								<text x="55.0" y="13.5" stroke="none" text-anchor="middle" data-name="Legend">Legend</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9991.5, 159)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Legend">
-								<text x="0.0" y="13.5" stroke="none" data-name="Legend">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Legend">+color: Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceDetailsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceDetailsScreen">
-							<rect x="4605.0" y="112.5" height="108.0" width="409.0" data-name="PerformanceDetailsScreen"></rect>
-							<path d="M4605.0 143.5 L5014.0 143.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-							<path d="M4605.0 174.5 L5014.0 174.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-						</g>
-						<g transform="translate(4605, 112.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceDetailsScreen">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceDetailsScreen">PerformanceDetailsScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4605, 143.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">+reportSubject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4605, 174.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceDetailsScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPerformanceBar">
-							<rect x="9713.5" y="112.5" height="108.0" width="238.0" data-name="InterventionPerformanceBar"></rect>
-							<path d="M9713.5 143.5 L9951.5 143.5" fill="none" data-name="InterventionPerformanceBar"></path>
-							<path d="M9713.5 189.5 L9951.5 189.5" fill="none" data-name="InterventionPerformanceBar"></path>
-						</g>
-						<g transform="translate(9713.5, 112.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPerformanceBar">
-								<text x="111.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPerformanceBar">InterventionPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9713.5, 143.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9713.5, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention">
-							<rect x="11577.3" y="501.5" height="31.0" width="110.0" data-name="Intervention"></rect>
-						</g>
-						<g transform="translate(11577.25, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention">Intervention</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ObservationPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ObservationPerformanceBar">
-							<rect x="9433.5" y="112.5" height="108.0" width="240.0" data-name="ObservationPerformanceBar"></rect>
-							<path d="M9433.5 143.5 L9673.5 143.5" fill="none" data-name="ObservationPerformanceBar"></path>
-							<path d="M9433.5 189.5 L9673.5 189.5" fill="none" data-name="ObservationPerformanceBar"></path>
-						</g>
-						<g transform="translate(9433.5, 112.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ObservationPerformanceBar">
-								<text x="112.0" y="13.5" stroke="none" text-anchor="middle" data-name="ObservationPerformanceBar">ObservationPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9433.5, 143.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+observation: Observation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ObservationPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9433.5, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Observation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Observation">
-							<rect x="8873.8" y="501.5" height="31.0" width="112.0" data-name="Observation"></rect>
-						</g>
-						<g transform="translate(8873.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Observation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Observation">
-								<text x="48.0" y="13.5" stroke="none" text-anchor="middle" data-name="Observation">Observation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceBar">
-							<rect x="13034.0" y="105.0" height="123.0" width="144.0" data-name="PerformanceBar"></rect>
-							<path d="M13034.0 136.0 L13178.0 136.0" fill="none" data-name="PerformanceBar"></path>
-							<path d="M13034.0 197.0 L13178.0 197.0" fill="none" data-name="PerformanceBar"></path>
-						</g>
-						<g transform="translate(13034, 105)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceBar">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceBar">PerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13034, 136)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+task: Task</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceBar">+completed: int</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PerformanceBar">+total: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13034, 197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Task">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Task">
-							<rect x="13872.5" y="501.5" height="31.0" width="54.0" data-name="Task"></rect>
-						</g>
-						<g transform="translate(13872.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Task">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Task">
-								<text x="19.0" y="13.5" stroke="none" text-anchor="middle" data-name="Task">Task</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceSection">
-							<rect x="12702.0" y="448.0" height="138.0" width="324.0" data-name="PerformanceSection"></rect>
-							<path d="M12702.0 479.0 L13026.0 479.0" fill="none" data-name="PerformanceSection"></path>
-							<path d="M12702.0 525.0 L13026.0 525.0" fill="none" data-name="PerformanceSection"></path>
-						</g>
-						<g transform="translate(12702, 448)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceSection">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceSection">PerformanceSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12702, 479)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+minimumRatio: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+maximum: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12702, 525)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+Widget buildContent()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+String getPowerLevelDescription()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PerformanceSection">+int getCountableObservationAmount()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionContainer">
-							<rect x="11273.8" y="75.0" height="183.0" width="319.0" data-name="ReportSectionContainer"></rect>
-							<path d="M11273.8 106.0 L11592.8 106.0" fill="none" data-name="ReportSectionContainer"></path>
-							<path d="M11273.8 182.0 L11592.8 182.0" fill="none" data-name="ReportSectionContainer"></path>
-						</g>
-						<g transform="translate(11273.75, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionContainer">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionContainer">ReportSectionContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11273.75, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionContainer">+section: ReportSection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionContainer">+subject: StudySubject</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionContainer">+primary: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionContainer">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11273.75, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionContainer">+ReportSectionWidget buildContents()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionContainer">+dynamic ()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionContainer">+List&lt;Widget&gt; buildPrimaryHeader()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionContainer">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="12158.5" y="501.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(12158.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Settings">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Settings">
-							<rect x="10575.8" y="151.0" height="31.0" width="80.0" data-name="Settings"></rect>
-						</g>
-						<g transform="translate(10575.75, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Settings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Settings">
-								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="Settings">Settings</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OptOutAlertDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OptOutAlertDialog">
-							<rect x="4358.0" y="120.0" height="93.0" width="207.0" data-name="OptOutAlertDialog"></rect>
-							<path d="M4358.0 151.0 L4565.0 151.0" fill="none" data-name="OptOutAlertDialog"></path>
-							<path d="M4358.0 182.0 L4565.0 182.0" fill="none" data-name="OptOutAlertDialog"></path>
-						</g>
-						<g transform="translate(4358, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptOutAlertDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptOutAlertDialog">OptOutAlertDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4358, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptOutAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptOutAlertDialog">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4358, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptOutAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptOutAlertDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DeleteAlertDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DeleteAlertDialog">
-							<rect x="4111.0" y="120.0" height="93.0" width="207.0" data-name="DeleteAlertDialog"></rect>
-							<path d="M4111.0 151.0 L4318.0 151.0" fill="none" data-name="DeleteAlertDialog"></path>
-							<path d="M4111.0 182.0 L4318.0 182.0" fill="none" data-name="DeleteAlertDialog"></path>
-						</g>
-						<g transform="translate(4111, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DeleteAlertDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="DeleteAlertDialog">DeleteAlertDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4111, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DeleteAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="DeleteAlertDialog">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4111, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DeleteAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="DeleteAlertDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskBox">
-							<rect x="14010.0" y="120.5" height="92.0" width="292.0" data-name="TaskBox"></rect>
-							<path d="M14010.0 151.5 L14302.0 151.5" fill="none" data-name="TaskBox"></path>
-						</g>
-						<g transform="translate(14010, 120.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskBox">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskBox">TaskBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14010, 151.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskBox">+taskInstance: TaskInstance</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskBox">+icon: Icon</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskBox">+onCompleted: dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskInstance">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskInstance">
-							<rect x="14244.3" y="501.5" height="31.0" width="122.0" data-name="TaskInstance"></rect>
-						</g>
-						<g transform="translate(14244.25, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskInstance">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskInstance">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskInstance">TaskInstance</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Icon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Icon">
-							<rect x="14630.0" y="501.5" height="31.0" width="50.0" data-name="Icon"></rect>
-						</g>
-						<g transform="translate(14630, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Icon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Icon">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Icon">Icon</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="14037.3" y="501.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(14037.25, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ProgressRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ProgressRow">
-							<rect x="2604.0" y="135.5" height="62.0" width="207.0" data-name="ProgressRow"></rect>
-							<path d="M2604.0 166.5 L2811.0 166.5" fill="none" data-name="ProgressRow"></path>
-						</g>
-						<g transform="translate(2604, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProgressRow">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProgressRow">ProgressRow</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2604, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ProgressRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="ProgressRow">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionSegment">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSegment">
-							<rect x="12723.0" y="75.0" height="183.0" width="271.0" data-name="InterventionSegment"></rect>
-							<path d="M12723.0 106.0 L12994.0 106.0" fill="none" data-name="InterventionSegment"></path>
-							<path d="M12723.0 212.0 L12994.0 212.0" fill="none" data-name="InterventionSegment"></path>
-						</g>
-						<g transform="translate(12723, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSegment">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSegment">InterventionSegment</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12723, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+percentCompleted: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionSegment">+percentMissed: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionSegment">+isCurrent: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionSegment">+isFuture: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionSegment">+phaseDuration: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12723, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+List&lt;Widget&gt; buildSeparators()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskOverview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskOverview">
-							<rect x="2243.0" y="120.5" height="92.0" width="321.0" data-name="TaskOverview"></rect>
-							<path d="M2243.0 151.5 L2564.0 151.5" fill="none" data-name="TaskOverview"></path>
-						</g>
-						<g transform="translate(2243, 120.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskOverview">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskOverview">TaskOverview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2243, 151.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskOverview">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskOverview">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskOverview">+scheduleToday: List&lt;TaskInstance&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskOverview">+interventionIcon: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactScreen">
-							<rect x="12345.0" y="151.0" height="31.0" width="133.0" data-name="ContactScreen"></rect>
-						</g>
-						<g transform="translate(12345, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactScreen">
-								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactScreen">ContactScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactWidget">
-							<rect x="12518.0" y="97.5" height="138.0" width="165.0" data-name="ContactWidget"></rect>
-							<path d="M12518.0 128.5 L12683.0 128.5" fill="none" data-name="ContactWidget"></path>
-							<path d="M12518.0 204.5 L12683.0 204.5" fill="none" data-name="ContactWidget"></path>
-						</g>
-						<g transform="translate(12518, 97.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactWidget">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactWidget">ContactWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12518, 128.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+contact: Contact?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactWidget">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactWidget">+subtitle: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12518, 204.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Contact">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Contact">
-							<rect x="13664.5" y="501.5" height="31.0" width="77.0" data-name="Contact"></rect>
-						</g>
-						<g transform="translate(13664.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Contact">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Contact">
-								<text x="30.5" y="13.5" stroke="none" text-anchor="middle" data-name="Contact">Contact</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItem">
-							<rect x="8635.5" y="82.5" height="168.0" width="223.0" data-name="ContactItem"></rect>
-							<path d="M8635.5 113.5 L8858.5 113.5" fill="none" data-name="ContactItem"></path>
-							<path d="M8635.5 204.5 L8858.5 204.5" fill="none" data-name="ContactItem"></path>
-						</g>
-						<g transform="translate(8635.5, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItem">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItem">ContactItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8635.5, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+iconData: IconData</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+itemName: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItem">+itemValue: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItem">+type: ContactItemType?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItem">+iconColor: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8635.5, 204.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+dynamic launchContact()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItemType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItemType">
-							<rect x="10801.0" y="456.0" height="122.0" width="332.0" data-name="ContactItemType"></rect>
-							<path d="M10801.0 487.0 L11133.0 487.0" fill="none" data-name="ContactItemType"></path>
-						</g>
-						<g transform="translate(10801, 456)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItemType">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItemType">ContactItemType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10801, 487)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItemType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItemType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+values: List&lt;ContactItemType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+website: ContactItemType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+email: ContactItemType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+phone: ContactItemType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="14342.0" y="151.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(14342, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FAQ">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FAQ">
-							<rect x="13218.0" y="135.5" height="62.0" width="136.0" data-name="FAQ"></rect>
-							<path d="M13218.0 166.5 L13354.0 166.5" fill="none" data-name="FAQ"></path>
-						</g>
-						<g transform="translate(13218, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FAQ">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="FAQ">FAQ</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13218, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FAQ">
-								<text x="0.0" y="13.5" stroke="none" data-name="FAQ">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Entry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Entry">
-							<rect x="14828.8" y="478.5" height="77.0" width="188.0" data-name="Entry"></rect>
-							<path d="M14828.8 509.5 L15016.8 509.5" fill="none" data-name="Entry"></path>
-						</g>
-						<g transform="translate(14828.75, 478.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Entry">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="Entry">Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14828.75, 509.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Entry">
-								<text x="0.0" y="13.5" stroke="none" data-name="Entry">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Entry">+children: List&lt;Entry&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EntryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EntryItem">
-							<rect x="14751.5" y="112.5" height="108.0" width="179.0" data-name="EntryItem"></rect>
-							<path d="M14751.5 143.5 L14930.5 143.5" fill="none" data-name="EntryItem"></path>
-							<path d="M14751.5 174.5 L14930.5 174.5" fill="none" data-name="EntryItem"></path>
-						</g>
-						<g transform="translate(14751.5, 112.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EntryItem">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="EntryItem">EntryItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14751.5, 143.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">+entry: Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14751.5, 174.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">-Widget _buildTiles()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EntryItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="13811.0" y="135.5" height="62.0" width="159.0" data-name="DashboardScreen"></rect>
-							<path d="M13811.0 166.5 L13970.0 166.5" fill="none" data-name="DashboardScreen"></path>
-						</g>
-						<g transform="translate(13811, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="71.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13811, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+error: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OverflowMenuItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OverflowMenuItem">
-							<rect x="9146.5" y="113.0" height="107.0" width="247.0" data-name="OverflowMenuItem"></rect>
-							<path d="M9146.5 144.0 L9393.5 144.0" fill="none" data-name="OverflowMenuItem"></path>
-						</g>
-						<g transform="translate(9146.5, 113)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OverflowMenuItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OverflowMenuItem">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="OverflowMenuItem">OverflowMenuItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9146.5, 144)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OverflowMenuItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OverflowMenuItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="OverflowMenuItem">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OverflowMenuItem">+icon: IconData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="OverflowMenuItem">+routeName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="OverflowMenuItem">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="8487.8" y="501.5" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
-						</g>
-						<g transform="translate(8487.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
-								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFinishedPlaceholder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFinishedPlaceholder">
-							<rect x="15300.5" y="120.0" height="93.0" width="222.0" data-name="StudyFinishedPlaceholder"></rect>
-							<path d="M15300.5 151.0 L15522.5 151.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
-							<path d="M15300.5 182.0 L15522.5 182.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
-						</g>
-						<g transform="translate(15300.5, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFinishedPlaceholder">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFinishedPlaceholder">StudyFinishedPlaceholder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15300.5, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">&lt;static&gt;+space: SizedBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15300.5, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SizedBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SizedBox">
-							<rect x="15366.5" y="501.5" height="31.0" width="90.0" data-name="SizedBox"></rect>
-						</g>
-						<g transform="translate(15366.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SizedBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SizedBox">
-								<text x="37.0" y="13.5" stroke="none" text-anchor="middle" data-name="SizedBox">SizedBox</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTaskWidget">
-							<rect x="15939.5" y="128.0" height="77.0" width="313.0" data-name="QuestionnaireTaskWidget"></rect>
-							<path d="M15939.5 159.0 L16252.5 159.0" fill="none" data-name="QuestionnaireTaskWidget"></path>
-						</g>
-						<g transform="translate(15939.5, 128)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTaskWidget">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTaskWidget">QuestionnaireTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15939.5, 159)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireTaskWidget">+task: QuestionnaireTask</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireTaskWidget">+completionPeriod: CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTask">
-							<rect x="16644.8" y="501.5" height="31.0" width="165.0" data-name="QuestionnaireTask"></rect>
-						</g>
-						<g transform="translate(16644.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTask">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTask">QuestionnaireTask</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CompletionPeriod">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CompletionPeriod">
-							<rect x="16038.0" y="501.5" height="31.0" width="156.0" data-name="CompletionPeriod"></rect>
-						</g>
-						<g transform="translate(16038, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CompletionPeriod">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CompletionPeriod">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="CompletionPeriod">CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskScreen">
-							<rect x="13394.0" y="120.0" height="93.0" width="377.0" data-name="TaskScreen"></rect>
-							<path d="M13394.0 151.0 L13771.0 151.0" fill="none" data-name="TaskScreen"></path>
-							<path d="M13394.0 182.0 L13771.0 182.0" fill="none" data-name="TaskScreen"></path>
-						</g>
-						<g transform="translate(13394, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskScreen">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskScreen">TaskScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13394, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">+taskInstance: TaskInstance</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13394, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">&lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CheckmarkTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTaskWidget">
-							<rect x="17110.5" y="128.0" height="77.0" width="323.0" data-name="CheckmarkTaskWidget"></rect>
-							<path d="M17110.5 159.0 L17433.5 159.0" fill="none" data-name="CheckmarkTaskWidget"></path>
-						</g>
-						<g transform="translate(17110.5, 128)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTaskWidget">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTaskWidget">CheckmarkTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17110.5, 159)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CheckmarkTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="CheckmarkTaskWidget">+task: CheckmarkTask?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CheckmarkTaskWidget">+completionPeriod: CompletionPeriod?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CheckmarkTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTask">
-							<rect x="17220.5" y="501.5" height="31.0" width="143.0" data-name="CheckmarkTask"></rect>
-						</g>
-						<g transform="translate(17220.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTask">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTask">CheckmarkTask</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppOutdatedScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppOutdatedScreen">
-							<rect x="15562.5" y="135.5" height="62.0" width="176.0" data-name="AppOutdatedScreen"></rect>
-							<path d="M15562.5 166.5 L15738.5 166.5" fill="none" data-name="AppOutdatedScreen"></path>
-						</g>
-						<g transform="translate(15562.5, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppOutdatedScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppOutdatedScreen">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppOutdatedScreen">AppOutdatedScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15562.5, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppOutdatedScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppOutdatedScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppOutdatedScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TermsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TermsScreen">
-							<rect x="15778.5" y="151.0" height="31.0" width="121.0" data-name="TermsScreen"></rect>
-						</g>
-						<g transform="translate(15778.5, 151)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TermsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TermsScreen">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="TermsScreen">TermsScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegalSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegalSection">
-							<rect x="14970.5" y="67.5" height="198.0" width="290.0" data-name="LegalSection"></rect>
-							<path d="M14970.5 98.5 L15260.5 98.5" fill="none" data-name="LegalSection"></path>
-							<path d="M14970.5 234.5 L15260.5 234.5" fill="none" data-name="LegalSection"></path>
-						</g>
-						<g transform="translate(14970.5, 67.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegalSection">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="LegalSection">LegalSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14970.5, 98.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegalSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegalSection">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LegalSection">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LegalSection">+icon: Icon?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="LegalSection">+pdfUrl: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="LegalSection">+pdfUrlLabel: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="LegalSection">+acknowledgment: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="LegalSection">+isChecked: bool?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="LegalSection">+onChange: void Function(bool?)?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14970.5, 234.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegalSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegalSection">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(bool?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(bool?)?">
-							<rect x="15080.0" y="501.5" height="31.0" width="188.0" data-name="void Function(bool?)?"></rect>
-						</g>
-						<g transform="translate(15080, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(bool?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(bool?)?">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(bool?)?">void Function(bool?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFrameHelper">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameHelper">
-							<rect x="16292.5" y="128.0" height="77.0" width="224.0" data-name="IFrameHelper"></rect>
-							<path d="M16292.5 159.0 L16516.5 159.0" fill="none" data-name="IFrameHelper"></path>
-						</g>
-						<g transform="translate(16292.5, 128)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameHelper">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameHelper">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameHelper">IFrameHelper</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16292.5, 159)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFrameHelper">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFrameHelper">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFrameHelper">+void postRouteFinished()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFrameHelper">+void listen()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LoadingScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoadingScreen">
-							<rect x="16556.5" y="128.0" height="77.0" width="338.0" data-name="LoadingScreen"></rect>
-							<path d="M16556.5 159.0 L16894.5 159.0" fill="none" data-name="LoadingScreen"></path>
-						</g>
-						<g transform="translate(16556.5, 128)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoadingScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoadingScreen">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="LoadingScreen">LoadingScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16556.5, 159)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoadingScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoadingScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoadingScreen">+sessionString: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LoadingScreen">+queryParameters: Map&lt;String, String&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AboutScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AboutScreen">
-							<rect x="16934.5" y="135.5" height="62.0" width="136.0" data-name="AboutScreen"></rect>
-							<path d="M16934.5 166.5 L17070.5 166.5" fill="none" data-name="AboutScreen"></path>
-						</g>
-						<g transform="translate(16934.5, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AboutScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AboutScreen">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="AboutScreen">AboutScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16934.5, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AboutScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AboutScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="AboutScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Preview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Preview">
-							<rect x="7198.0" y="0.0" height="333.0" width="338.0" data-name="Preview"></rect>
-							<path d="M7198.0 31.0 L7536.0 31.0" fill="none" data-name="Preview"></path>
-							<path d="M7198.0 152.0 L7536.0 152.0" fill="none" data-name="Preview"></path>
-						</g>
-						<g transform="translate(7198, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Preview">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="Preview">Preview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7198, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Preview">
-								<text x="0.0" y="13.5" stroke="none" data-name="Preview">+queryParameters: Map&lt;String, String&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Preview">+appLanguage: AppLanguage</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Preview">+selectedRoute: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Preview">+extra: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Preview">+study: Study?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Preview">+selectedStudyObjectId: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Preview">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7198, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Preview">
-								<text x="0.0" y="13.5" stroke="none" data-name="Preview">+bool hasRoute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Preview">+void handleQueries()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Preview">+dynamic init()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Preview">+dynamic handleAuthorization()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Preview">+dynamic runCommands()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Preview">+String? getSelectedRoute()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Preview">+bool containsQuery()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Preview">+bool containsQueryPair()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Preview">+dynamic getStudySubject()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Preview">-dynamic _createFakeSubject()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Preview">+List&lt;String&gt; getInterventionIds()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppLanguage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppLanguage">
-							<rect x="8128.8" y="501.5" height="31.0" width="127.0" data-name="AppLanguage"></rect>
-						</g>
-						<g transform="translate(8128.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppLanguage">
-								<text x="55.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppLanguage">AppLanguage</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WelcomeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WelcomeScreen">
-							<rect x="17473.5" y="135.5" height="62.0" width="145.0" data-name="WelcomeScreen"></rect>
-							<path d="M17473.5 166.5 L17618.5 166.5" fill="none" data-name="WelcomeScreen"></path>
-						</g>
-						<g transform="translate(17473.5, 135.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WelcomeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WelcomeScreen">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="WelcomeScreen">WelcomeScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17473.5, 166.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WelcomeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WelcomeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="WelcomeScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/uml.svg b/docs/uml/app/lib/uml.svg
deleted file mode 100644
index b774303a4..000000000
--- a/docs/uml/app/lib/uml.svg
+++ /dev/null
@@ -1,4249 +0,0 @@
-<svg version="1.1" baseProfile="full" width="23475.0" height="1221.0" viewbox="0 0 23475 1221" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[MyApp
-	  |
-	  +queryParameters: Map&lt;String, String&gt;;
-	  +appConfig: AppConfig?;
-	  +initialRoute: String
-	]
-	
-	[MyApp]o-[AppConfig]
-	
-	[NotificationValidators
-	  |
-	  +didNotificationLaunchApp: bool;
-	  +wasNotificationActionHandled: bool;
-	  +wasNotificationActionCompleted: bool
-	]
-	
-	[StudyNotifications
-	  |
-	  +subject: StudySubject?;
-	  +flutterLocalNotificationsPlugin: FlutterLocalNotificationsPlugin;
-	  +context: BuildContext;
-	  +didReceiveLocalNotificationStream: StreamController&lt;ReceivedNotification&gt;;
-	  +selectNotificationStream: StreamController&lt;String?&gt;;
-	  &lt;static&gt;+validator: NotificationValidators;
-	  &lt;static&gt;+debug: bool;
-	  &lt;static&gt;+scheduledNotificationsDebug: String?
-	  |
-	  &lt;static&gt;+dynamic create();
-	  -dynamic _isAndroidPermissionGranted();
-	  -dynamic _requestPermissions();
-	  -void _configureDidReceiveLocalNotificationSubject();
-	  -void _configureSelectNotificationSubject();
-	  -void _initNotificationsPlugin();
-	  +dynamic handleNotificationResponse()
-	]
-	
-	[StudyNotifications]o-[StudySubject]
-	[StudyNotifications]o-[FlutterLocalNotificationsPlugin]
-	[StudyNotifications]o-[&lt;abstract&gt;BuildContext]
-	[StudyNotifications]o-[StreamController]
-	[StudyNotifications]o-[NotificationValidators]
-	
-	[ReceivedNotification
-	  |
-	  +id: int?;
-	  +title: String?;
-	  +body: String?;
-	  +payload: String?
-	]
-	
-	[StudyNotification
-	  |
-	  +taskInstance: TaskInstance;
-	  +date: DateTime
-	]
-	
-	[StudyNotification]o-[TaskInstance]
-	
-	[AppAnalytics
-	  |
-	  &lt;static&gt;-_userEnabled: bool?;
-	  &lt;static&gt;+keyAnalyticsUserEnable: String;
-	  +context: BuildContext;
-	  +subject: StudySubject?;
-	  &lt;static&gt;+isUserEnabled: dynamic
-	  |
-	  &lt;static&gt;+dynamic init();
-	  &lt;static&gt;+dynamic start();
-	  &lt;static&gt;+void setEnabled();
-	  +dynamic initBasic();
-	  +void initAdvanced()
-	]
-	
-	[AppAnalytics]o-[&lt;abstract&gt;BuildContext]
-	[AppAnalytics]o-[StudySubject]
-	
-	[GroupedIterable
-	  |
-	  +data: Map&lt;K, Iterable&lt;V&gt;&gt;;
-	  +iterator: Iterator&lt;MapEntry&lt;K, Iterable&lt;V&gt;&gt;&gt;
-	  |
-	  +Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregate();
-	  +Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregateWithKey()
-	]
-	
-	[Iterable]&lt;:-[GroupedIterable]
-	
-	[Cache
-	  |
-	  &lt;static&gt;+isSynchronizing: bool;
-	  &lt;static&gt;+sharedPrefs: dynamic
-	  |
-	  &lt;static&gt;+dynamic storeSubject();
-	  &lt;static&gt;+dynamic loadSubject();
-	  &lt;static&gt;+dynamic storeAnalytics();
-	  &lt;static&gt;+dynamic loadAnalytics();
-	  &lt;static&gt;+dynamic delete();
-	  &lt;static&gt;+dynamic synchronize()
-	]
-	
-	[ConsentScreen
-	]
-	
-	[ConsentCard
-	  |
-	  +consent: ConsentItem?;
-	  +index: int?;
-	  +onTapped: dynamic Function(int);
-	  +isChecked: bool?
-	  |
-	  +Widget build()
-	]
-	
-	[ConsentCard]o-[ConsentItem]
-	[ConsentCard]o-[dynamic Function(int)]
-	
-	[ConsentElement
-	  |
-	  +title: String;
-	  +descriptionText: String;
-	  +acknowledgmentText: String;
-	  +icon: IconData
-	]
-	
-	[ConsentElement]o-[IconData]
-	
-	[StudyOverviewScreen
-	]
-	
-	[_StudyOverviewScreen
-	  |
-	  +study: Study?
-	  |
-	  +dynamic navigateToJourney();
-	  +dynamic navigateToEligibilityCheck();
-	  +Widget build()
-	]
-	
-	[_StudyOverviewScreen]o-[Study]
-	
-	[StudyDetailsView
-	  |
-	  +study: Study?;
-	  +iconSize: double
-	  |
-	  +Widget build()
-	]
-	
-	[StudyDetailsView]o-[Study]
-	
-	[KickoffScreen
-	]
-	
-	[_KickoffScreen
-	  |
-	  +subject: StudySubject?;
-	  +ready: bool
-	  |
-	  -dynamic _storeUserStudy();
-	  -Widget _constructStatusIcon();
-	  -String _getStatusText();
-	  +Widget build()
-	]
-	
-	[_KickoffScreen]o-[StudySubject]
-	
-	[EligibilityResult
-	  |
-	  +eligible: bool;
-	  +firstFailed: EligibilityCriterion?
-	]
-	
-	[EligibilityResult]o-[EligibilityCriterion]
-	
-	[EligibilityScreen
-	  |
-	  +study: Study?
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;EligibilityResult&gt; routeFor()
-	]
-	
-	[EligibilityScreen]o-[Study]
-	
-	[OnboardingProgress
-	  |
-	  +stage: int;
-	  +progress: double
-	  |
-	  -double _getProgressForStage();
-	  +Widget build()
-	]
-	
-	[StudySelectionScreen
-	]
-	
-	[InviteCodeDialog
-	]
-	
-	[InterventionSelectionScreen
-	]
-	
-	[JourneyOverviewScreen
-	]
-	
-	[_JourneyOverviewScreen
-	  |
-	  +subject: StudySubject?
-	  |
-	  +dynamic getConsentAndNavigateToDashboard();
-	  +Widget build()
-	]
-	
-	[_JourneyOverviewScreen]o-[StudySubject]
-	
-	[Timeline
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[Timeline]o-[StudySubject]
-	
-	[InterventionTile
-	  |
-	  +title: String?;
-	  +iconName: String;
-	  +date: DateTime;
-	  +color: Color?;
-	  +isFirst: bool;
-	  +isLast: bool
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionTile]o-[Color]
-	
-	[IconIndicator
-	  |
-	  +iconName: String;
-	  +color: Color?
-	  |
-	  +Widget build()
-	]
-	
-	[IconIndicator]o-[Color]
-	
-	[TimelineChild
-	  |
-	  +child: Widget?
-	  |
-	  +Widget build()
-	]
-	
-	[TimelineChild]o-[&lt;abstract&gt;Widget]
-	
-	[AverageSectionWidget
-	  |
-	  +section: AverageSection;
-	  +titlePos: List&lt;int&gt;;
-	  +phasePos: List&lt;int&gt;
-	  |
-	  +Widget build();
-	  +Widget getLegend();
-	  +Widget getDiagram();
-	  +BarChartData getChartData();
-	  +Widget getTitles();
-	  +Widget getValues();
-	  +List&lt;BarChartGroupData&gt; getBarGroups();
-	  +FlGridData getGridData();
-	  +MaterialColor getColor();
-	  +int getDayIndex();
-	  +Iterable&lt;DiagramDatum&gt; getAggregatedData();
-	  +Map&lt;String, String?&gt; getInterventionNames()
-	]
-	
-	[AverageSectionWidget]o-[AverageSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[AverageSectionWidget]
-	
-	[DiagramDatum
-	  |
-	  +x: num;
-	  +value: num;
-	  +timestamp: DateTime?;
-	  +intervention: String
-	]
-	
-	[LinearRegressionSectionWidget
-	  |
-	  +section: LinearRegressionSection
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionWidget]o-[LinearRegressionSection]
-	[&lt;abstract&gt;ReportSectionWidget]&lt;:-[LinearRegressionSectionWidget]
-	
-	[ReportHistoryScreen
-	  |
-	  +Widget build()
-	]
-	
-	[ReportHistoryItem
-	  |
-	  +subject: StudySubject
-	  |
-	  +Widget build()
-	]
-	
-	[ReportHistoryItem]o-[StudySubject]
-	
-	[ReportDetailsScreen
-	  |
-	  +subject: StudySubject
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor();
-	  +Widget build()
-	]
-	
-	[ReportDetailsScreen]o-[StudySubject]
-	
-	[GeneralDetailsSection
-	  |
-	  +Widget buildContent()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[GeneralDetailsSection]
-	
-	[&lt;abstract&gt;GenericSection
-	  |
-	  +subject: StudySubject?;
-	  +onTap: void Function()?
-	  |
-	  +Widget buildContent();
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;GenericSection]o-[StudySubject]
-	[&lt;abstract&gt;GenericSection]o-[void Function()?]
-	
-	[DisclaimerSection
-	  |
-	  +Widget buildContent()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[DisclaimerSection]
-	
-	[&lt;abstract&gt;ReportSectionWidget
-	  |
-	  +subject: StudySubject
-	]
-	
-	[&lt;abstract&gt;ReportSectionWidget]o-[StudySubject]
-	
-	[LegendWidget
-	  |
-	  +name: String;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[LegendWidget]o-[Color]
-	
-	[LegendsListWidget
-	  |
-	  +legends: List&lt;Legend&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[Legend
-	  |
-	  +name: String;
-	  +color: Color
-	]
-	
-	[Legend]o-[Color]
-	
-	[PerformanceDetailsScreen
-	  |
-	  +reportSubject: StudySubject?
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor();
-	  +Widget build()
-	]
-	
-	[PerformanceDetailsScreen]o-[StudySubject]
-	
-	[InterventionPerformanceBar
-	  |
-	  +intervention: Intervention;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPerformanceBar]o-[Intervention]
-	[InterventionPerformanceBar]o-[StudySubject]
-	
-	[ObservationPerformanceBar
-	  |
-	  +observation: Observation;
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[ObservationPerformanceBar]o-[&lt;abstract&gt;Observation]
-	[ObservationPerformanceBar]o-[StudySubject]
-	
-	[PerformanceBar
-	  |
-	  +task: Task;
-	  +completed: int;
-	  +total: int
-	  |
-	  +Widget build()
-	]
-	
-	[PerformanceBar]o-[&lt;abstract&gt;Task]
-	
-	[PerformanceSection
-	  |
-	  +minimumRatio: double;
-	  +maximum: double
-	  |
-	  +Widget buildContent();
-	  +String getPowerLevelDescription();
-	  +int getCountableObservationAmount()
-	]
-	
-	[&lt;abstract&gt;GenericSection]&lt;:-[PerformanceSection]
-	
-	[PerformanceBar
-	  |
-	  +progress: double;
-	  +minimum: double?
-	  |
-	  +Widget build()
-	]
-	
-	[ReportSectionContainer
-	  |
-	  +section: ReportSection;
-	  +subject: StudySubject;
-	  +primary: bool;
-	  +onTap: void Function()?
-	  |
-	  +ReportSectionWidget buildContents();
-	  +dynamic ();
-	  +List&lt;Widget&gt; buildPrimaryHeader();
-	  +Widget build()
-	]
-	
-	[ReportSectionContainer]o-[&lt;abstract&gt;ReportSection]
-	[ReportSectionContainer]o-[StudySubject]
-	[ReportSectionContainer]o-[void Function()?]
-	
-	[Settings
-	]
-	
-	[OptOutAlertDialog
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[OptOutAlertDialog]o-[StudySubject]
-	
-	[DeleteAlertDialog
-	  |
-	  +subject: StudySubject?
-	  |
-	  +Widget build()
-	]
-	
-	[DeleteAlertDialog]o-[StudySubject]
-	
-	[TaskBox
-	  |
-	  +taskInstance: TaskInstance;
-	  +icon: Icon;
-	  +onCompleted: dynamic Function()
-	]
-	
-	[TaskBox]o-[TaskInstance]
-	[TaskBox]o-[Icon]
-	[TaskBox]o-[dynamic Function()]
-	
-	[ProgressRow
-	  |
-	  +subject: StudySubject?
-	]
-	
-	[ProgressRow]o-[StudySubject]
-	
-	[InterventionSegment
-	  |
-	  +intervention: Intervention;
-	  +percentCompleted: double;
-	  +percentMissed: double;
-	  +isCurrent: bool;
-	  +isFuture: bool;
-	  +phaseDuration: int
-	  |
-	  +List&lt;Widget&gt; buildSeparators();
-	  +Widget build()
-	]
-	
-	[InterventionSegment]o-[Intervention]
-	
-	[TaskOverview
-	  |
-	  +subject: StudySubject?;
-	  +scheduleToday: List&lt;TaskInstance&gt;?;
-	  +interventionIcon: String?
-	]
-	
-	[TaskOverview]o-[StudySubject]
-	
-	[ContactScreen
-	]
-	
-	[ContactWidget
-	  |
-	  +contact: Contact?;
-	  +title: String;
-	  +subtitle: String?;
-	  +color: Color
-	  |
-	  +Widget build()
-	]
-	
-	[ContactWidget]o-[Contact]
-	[ContactWidget]o-[Color]
-	
-	[ContactItem
-	  |
-	  +iconData: IconData;
-	  +itemName: String;
-	  +itemValue: String?;
-	  +type: ContactItemType?;
-	  +iconColor: Color?
-	  |
-	  +dynamic launchContact();
-	  +Widget build()
-	]
-	
-	[ContactItem]o-[IconData]
-	[ContactItem]o-[ContactItemType]
-	[ContactItem]o-[Color]
-	
-	[ContactItemType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ContactItemType&gt;;
-	  &lt;static&gt;+website: ContactItemType;
-	  &lt;static&gt;+email: ContactItemType;
-	  &lt;static&gt;+phone: ContactItemType
-	]
-	
-	[ContactItemType]o-[ContactItemType]
-	[Enum]&lt;:--[ContactItemType]
-	
-	[FAQ
-	  |
-	  +Widget build()
-	]
-	
-	[Entry
-	  |
-	  +title: String;
-	  +children: List&lt;Entry&gt;
-	]
-	
-	[EntryItem
-	  |
-	  +entry: Entry
-	  |
-	  -Widget _buildTiles();
-	  +Widget build()
-	]
-	
-	[EntryItem]o-[Entry]
-	
-	[DashboardScreen
-	  |
-	  +error: String?
-	]
-	
-	[OverflowMenuItem
-	  |
-	  +name: String;
-	  +icon: IconData;
-	  +routeName: String?;
-	  +onTap: dynamic Function()?
-	]
-	
-	[OverflowMenuItem]o-[IconData]
-	[OverflowMenuItem]o-[dynamic Function()?]
-	
-	[StudyFinishedPlaceholder
-	  |
-	  &lt;static&gt;+space: SizedBox
-	  |
-	  +Widget build()
-	]
-	
-	[StudyFinishedPlaceholder]o-[SizedBox]
-	
-	[QuestionnaireTaskWidget
-	  |
-	  +task: QuestionnaireTask;
-	  +completionPeriod: CompletionPeriod
-	]
-	
-	[QuestionnaireTaskWidget]o-[QuestionnaireTask]
-	[QuestionnaireTaskWidget]o-[CompletionPeriod]
-	
-	[TaskScreen
-	  |
-	  +taskInstance: TaskInstance
-	  |
-	  &lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()
-	]
-	
-	[TaskScreen]o-[TaskInstance]
-	
-	[CheckmarkTaskWidget
-	  |
-	  +task: CheckmarkTask?;
-	  +completionPeriod: CompletionPeriod?
-	]
-	
-	[CheckmarkTaskWidget]o-[CheckmarkTask]
-	[CheckmarkTaskWidget]o-[CompletionPeriod]
-	
-	[AppOutdatedScreen
-	  |
-	  +Widget build()
-	]
-	
-	[TermsScreen
-	]
-	
-	[LegalSection
-	  |
-	  +title: String?;
-	  +description: String?;
-	  +icon: Icon?;
-	  +pdfUrl: String?;
-	  +pdfUrlLabel: String?;
-	  +acknowledgment: String?;
-	  +isChecked: bool?;
-	  +onChange: void Function(bool?)?
-	  |
-	  +Widget build()
-	]
-	
-	[LegalSection]o-[Icon]
-	[LegalSection]o-[void Function(bool?)?]
-	
-	[IFrameHelper
-	  |
-	  +void postRouteFinished();
-	  +void listen()
-	]
-	
-	[LoadingScreen
-	  |
-	  +sessionString: String?;
-	  +queryParameters: Map&lt;String, String&gt;?
-	]
-	
-	[AboutScreen
-	  |
-	  +Widget build()
-	]
-	
-	[Preview
-	  |
-	  +queryParameters: Map&lt;String, String&gt;?;
-	  +appLanguage: AppLanguage;
-	  +selectedRoute: String?;
-	  +extra: String?;
-	  +study: Study?;
-	  +selectedStudyObjectId: String?;
-	  +subject: StudySubject?
-	  |
-	  +bool hasRoute();
-	  +void handleQueries();
-	  +dynamic init();
-	  +dynamic handleAuthorization();
-	  +dynamic runCommands();
-	  +String? getSelectedRoute();
-	  +bool containsQuery();
-	  +bool containsQueryPair();
-	  +dynamic getStudySubject();
-	  -dynamic _createFakeSubject();
-	  +List&lt;String&gt; getInterventionIds()
-	]
-	
-	[Preview]o-[AppLanguage]
-	[Preview]o-[Study]
-	[Preview]o-[StudySubject]
-	
-	[WelcomeScreen
-	  |
-	  +Widget build()
-	]
-	
-	[ThemeConfig
-	  |
-	  &lt;static&gt;+SliderThemeData coloredSliderTheme()
-	]
-	
-	[HtmlText
-	  |
-	  +text: String?;
-	  +style: TextStyle?;
-	  +centered: bool
-	  |
-	  +Widget build()
-	]
-	
-	[HtmlText]o-[TextStyle]
-	
-	[RoundCheckbox
-	  |
-	  +onChanged: dynamic Function(bool)?;
-	  +value: bool?
-	  |
-	  +Widget build()
-	]
-	
-	[RoundCheckbox]o-[dynamic Function(bool)?]
-	
-	[CustomSlider
-	  |
-	  +value: double?;
-	  +minValue: double?;
-	  +maxValue: double?;
-	  +minorTick: int?;
-	  +onChanged: dynamic Function(double)?;
-	  +onChangeEnd: dynamic Function(double)?;
-	  +activeColor: Color?;
-	  +inactiveColor: Color?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +thumbColor: Color?;
-	  +isColored: bool;
-	  +labelValuePrecision: int;
-	  +tickValuePrecision: int;
-	  +linearStep: bool;
-	  +steps: AnnotatedScaleQuestion?
-	  |
-	  +Widget build()
-	]
-	
-	[CustomSlider]o-[dynamic Function(double)?]
-	[CustomSlider]o-[Color]
-	[CustomSlider]o-[AnnotatedScaleQuestion]
-	
-	[CustomTrackShape
-	  |
-	  +Rect getPreferredRect()
-	]
-	
-	[RoundedRectSliderTrackShape]&lt;:-[CustomTrackShape]
-	
-	[QuestionHeader
-	  |
-	  +prompt: String?;
-	  +subtitle: String?;
-	  +rationale: String?
-	  |
-	  -List&lt;Widget&gt; _buildSubtitle();
-	  -List&lt;Widget&gt; _buildRationaleButton();
-	  +Widget build()
-	]
-	
-	[QuestionnaireWidget
-	  |
-	  +title: String?;
-	  +header: String?;
-	  +footer: String?;
-	  +questions: List&lt;Question&lt;dynamic&gt;&gt;
-	]
-	
-	[HtmlTextBox
-	  |
-	  +text: String?
-	  |
-	  +Widget build()
-	]
-	
-	[BooleanQuestionWidget
-	  |
-	  +question: BooleanQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[BooleanQuestionWidget]o-[BooleanQuestion]
-	[BooleanQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[BooleanQuestionWidget]
-	
-	[&lt;abstract&gt;QuestionWidget
-	  |
-	  +subtitle: String?
-	]
-	
-	[FreeTextQuestionWidget
-	  |
-	  +question: FreeTextQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[FreeTextQuestionWidget]o-[FreeTextQuestion]
-	[FreeTextQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[FreeTextQuestionWidget]
-	
-	[ScaleQuestionWidget
-	  |
-	  +question: ScaleQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[ScaleQuestionWidget]o-[ScaleQuestion]
-	[ScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ScaleQuestionWidget]
-	
-	[VisualAnalogueQuestionWidget
-	  |
-	  +question: VisualAnalogueQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[VisualAnalogueQuestionWidget]o-[VisualAnalogueQuestion]
-	[VisualAnalogueQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[VisualAnalogueQuestionWidget]
-	
-	[ChoiceQuestionWidget
-	  |
-	  +question: ChoiceQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;);
-	  +multiSelectionText: String;
-	  +subtitle: String?
-	]
-	
-	[ChoiceQuestionWidget]o-[ChoiceQuestion]
-	[ChoiceQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ChoiceQuestionWidget]
-	
-	[AnnotatedScaleQuestionWidget
-	  |
-	  +question: AnnotatedScaleQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[AnnotatedScaleQuestionWidget]o-[AnnotatedScaleQuestion]
-	[AnnotatedScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[AnnotatedScaleQuestionWidget]
-	
-	[QuestionContainer
-	  |
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;, int);
-	  +question: Question&lt;dynamic&gt;;
-	  +index: int
-	]
-	
-	[QuestionContainer]o-[dynamic Function(Answer&lt;dynamic&gt;, int)]
-	[QuestionContainer]o-[&lt;abstract&gt;Question]
-	
-	[InterventionCard
-	  |
-	  +intervention: Intervention;
-	  +selected: bool;
-	  +showCheckbox: bool;
-	  +showTasks: bool;
-	  +showDescription: bool;
-	  +onTap: dynamic Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionCard]o-[Intervention]
-	[InterventionCard]o-[dynamic Function()?]
-	
-	[InterventionCardTitle
-	  |
-	  +intervention: Intervention?;
-	  +selected: bool;
-	  +showCheckbox: bool;
-	  +showDescriptionButton: bool;
-	  +onTap: dynamic Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionCardTitle]o-[Intervention]
-	[InterventionCardTitle]o-[dynamic Function()?]
-	
-	[InterventionCardDescription
-	  |
-	  +intervention: Intervention
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionCardDescription]o-[Intervention]
-	
-	[_TaskList
-	  |
-	  +tasks: List&lt;InterventionTask&gt;
-	  |
-	  +String scheduleString();
-	  +Widget build()
-	]
-	
-	[SelectableButton
-	  |
-	  +child: Widget;
-	  +selected: bool;
-	  +onTap: dynamic Function()?
-	  |
-	  -Color _getFillColor();
-	  -Color _getTextColor();
-	  +Widget build()
-	]
-	
-	[SelectableButton]o-[&lt;abstract&gt;Widget]
-	[SelectableButton]o-[dynamic Function()?]
-	
-	[StudyTile
-	  |
-	  +title: String?;
-	  +description: String?;
-	  +iconName: String;
-	  +onTap: dynamic Function()?;
-	  +contentPadding: EdgeInsetsGeometry
-	  |
-	  +Widget build()
-	]
-	
-	[StudyTile]o-[dynamic Function()?]
-	[StudyTile]o-[&lt;abstract&gt;EdgeInsetsGeometry]
-	
-	[BottomOnboardingNavigation
-	  |
-	  +onBack: void Function()?;
-	  +onNext: void Function()?;
-	  +backLabel: String?;
-	  +nextLabel: String?;
-	  +hideNext: bool;
-	  +nextIcon: Icon?;
-	  +backIcon: Icon?;
-	  +progress: Widget?
-	  |
-	  +Widget build()
-	]
-	
-	[BottomOnboardingNavigation]o-[void Function()?]
-	[BottomOnboardingNavigation]o-[Icon]
-	[BottomOnboardingNavigation]o-[&lt;abstract&gt;Widget]
-	
-	[Routes
-	  |
-	  &lt;static&gt;+loading: String;
-	  &lt;static&gt;+preview: String;
-	  &lt;static&gt;+appOutdated: String;
-	  &lt;static&gt;+dashboard: String;
-	  &lt;static&gt;+welcome: String;
-	  &lt;static&gt;+about: String;
-	  &lt;static&gt;+terms: String;
-	  &lt;static&gt;+studySelection: String;
-	  &lt;static&gt;+studyOverview: String;
-	  &lt;static&gt;+interventionSelection: String;
-	  &lt;static&gt;+journey: String;
-	  &lt;static&gt;+consent: String;
-	  &lt;static&gt;+kickoff: String;
-	  &lt;static&gt;+contact: String;
-	  &lt;static&gt;+faq: String;
-	  &lt;static&gt;+appSettings: String;
-	  &lt;static&gt;+questionnaire: String;
-	  &lt;static&gt;+reportHistory: String;
-	  &lt;static&gt;+reportDetails: String;
-	  &lt;static&gt;+performanceDetails: String
-	  |
-	  &lt;static&gt;+Route&lt;dynamic&gt; unknownRoute();
-	  &lt;static&gt;+Route&lt;dynamic&gt;? generateRoute()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="1221.0" width="23475.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M164.0 261.2 L164 413 L164 584 L164.0 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M169.3 251.8 L164.0 261.2 L158.7 251.8 L164.0 242.5 Z"></path>
-					</g>
-					<path d="M4080.4 625.1 L1994.75 786 L5237.25 947.0204390613172 L5237.3 947.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4090.1 629.7 L4080.4 625.1 L4089.3 619.0 L4099.0 623.6 Z"></path>
-					</g>
-					<path d="M4743.6 629.2 L6492 786 L6492 934.5 L6492.0 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4734.8 623.1 L4743.6 629.2 L4733.8 633.7 L4725.0 627.6 Z"></path>
-					</g>
-					<path d="M4743.6 627.4 L6624.75 786 L6708.733993902439 934.5 L6708.7 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4734.7 621.4 L4743.6 627.4 L4733.9 632.0 L4725.0 625.9 Z"></path>
-					</g>
-					<path d="M4743.6 617.3 L7880.5 786 L7880.5 934.5 L7880.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4734.6 611.5 L4743.6 617.3 L4734.0 622.2 L4725.0 616.3 Z"></path>
-					</g>
-					<path d="M4080.4 623.6 L1844 786 L1844 904 L1844.0 904.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4090.1 628.2 L4080.4 623.6 L4089.3 617.6 L4099.0 622.2 Z"></path>
-					</g>
-					<path d="M6128.6 612.6 L7988.25 786 L8049.596798780488 934.5 L8049.6 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6119.8 606.4 L6128.6 612.6 L6118.8 617.0 L6110.0 610.8 Z"></path>
-					</g>
-					<path d="M3885.6 610.9 L6737.5 786 L6719.390243902439 934.5 L6719.4 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3876.6 605.0 L3885.6 610.9 L3876.0 615.7 L3867.0 609.8 Z"></path>
-					</g>
-					<path d="M3513.4 620.3 L2034.75 786 L5237.25 946.983908045977 L5237.3 947.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3523.3 624.6 L3513.4 620.3 L3522.1 614.0 L3532.0 618.3 Z"></path>
-					</g>
-					<path d="M1447.5 225.3 L1447.5 413 L1447.5 538 L1447.5 538.0 " fill="none"></path>
-					<path d="M1452.8 225.3 L1447.5 225.3 L1442.2 225.3 L1447.5 212.0 Z"></path>
-					<path d="M2087.8 278.8 L1956.25 413 L1956.25 584 L1956.3 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2098.1 275.9 L2087.8 278.8 L2090.5 268.4 L2100.9 265.5 Z"></path>
-					</g>
-					<path d="M2206.5 282.6 L2264 413 L2264 584 L2264.0 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2207.6 271.9 L2206.5 282.6 L2197.8 276.2 L2198.9 265.5 Z"></path>
-					</g>
-					<path d="M6834.6 614.9 L8427.5 786 L9019.75 938.7786079433739 L9019.8 938.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6825.8 608.6 L6834.6 614.9 L6824.7 619.2 L6816.0 612.9 Z"></path>
-					</g>
-					<path d="M7190.6 614.3 L9244.5 786 L9298.829268292682 934.5 L9298.8 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7181.7 608.2 L7190.6 614.3 L7180.9 618.8 L7172.0 612.7 Z"></path>
-					</g>
-					<path d="M7387.6 608.1 L9402.75 786 L9313.785823170732 934.5 L9313.8 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7378.8 601.9 L7387.6 608.1 L7377.8 612.6 L7369.0 606.4 Z"></path>
-					</g>
-					<path d="M532.6 615.9 L2074.75 786 L5237.25 946.9464701318852 L5237.3 946.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M523.9 609.6 L532.6 615.9 L522.7 620.2 L514.0 613.9 Z"></path>
-					</g>
-					<path d="M3983.0 253.7 L3983 413 L3983 584 L3983.0 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3988.3 244.3 L3983.0 253.7 L3977.7 244.3 L3983.0 235.0 Z"></path>
-					</g>
-					<path d="M8312.2 633.2 L9442.75 786 L9317.56631097561 934.5 L9317.6 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8303.7 626.7 L8312.2 633.2 L8302.3 637.3 L8293.8 630.7 Z"></path>
-					</g>
-					<path d="M980.5 626.7 L2282 786 L5237.25 946.7365890058868 L5237.3 946.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M971.9 620.3 L980.5 626.7 L970.6 630.9 L962.0 624.5 Z"></path>
-					</g>
-					<path d="M1227.5 616.1 L2475.75 786 L5237.25 946.5124933545986 L5237.3 946.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1219.0 609.6 L1227.5 616.1 L1217.5 620.1 L1209.0 613.6 Z"></path>
-					</g>
-					<path d="M8750.0 620.6 L9522.75 786 L9836.75 936.1341107871721 L9836.8 936.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8742.0 613.5 L8750.0 620.6 L8739.8 623.9 L8731.8 616.7 Z"></path>
-					</g>
-					<path d="M9323.1 653.2 L9562.75 786 L9837.112804878048 934.5 L9837.1 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9317.5 644.0 L9323.1 653.2 L9312.3 653.3 L9306.8 644.1 Z"></path>
-					</g>
-					<path d="M10085.9 662.8 L10025.75 786 L11808 946.7971393205886 L11808.0 946.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10094.8 656.7 L10085.9 662.8 L10085.2 652.0 L10094.1 646.0 Z"></path>
-					</g>
-					<path d="M12116.0 1112.7 L12116 1114 L12116 1134 L12116.0 1134.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12121.3 1103.3 L12116.0 1112.7 L12110.7 1103.3 L12116.0 1094.0 Z"></path>
-					</g>
-					<path d="M8544.1 605.2 L12116 786 L12116 806 L12116.0 806.0 " fill="none"></path>
-					<path d="M8544.3 599.8 L8544.1 605.2 L8543.8 610.5 L8530.8 604.5 Z"></path>
-					<path d="M12499.0 1015.2 L12499 1114 L12499 1134 L12499.0 1134.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12504.3 1005.8 L12499.0 1015.2 L12493.7 1005.8 L12499.0 996.5 Z"></path>
-					</g>
-					<path d="M8544.1 604.6 L12499 786 L12499 903.5 L12499.0 903.5 " fill="none"></path>
-					<path d="M8544.3 599.3 L8544.1 604.6 L8543.8 610.0 L8530.8 604.0 Z"></path>
-					<path d="M2612.1 628.8 L3238.5 786 L5237.25 945.2204007285975 L5237.3 945.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2604.4 621.3 L2612.1 628.8 L2601.8 631.7 L2594.0 624.2 Z"></path>
-					</g>
-					<path d="M3027.6 659.1 L3430 786 L5237.25 944.7302182353728 L5237.3 944.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3020.3 651.2 L3027.6 659.1 L3017.1 661.4 L3009.8 653.5 Z"></path>
-					</g>
-					<path d="M11282.0 613.3 L12784 786 L12784 919 L12784.0 919.0 " fill="none"></path>
-					<path d="M11282.6 608.0 L11282.0 613.3 L11281.4 618.6 L11268.8 611.8 Z"></path>
-					<path d="M11036.1 602.6 L3634.5 786 L5237.25 944.0820929183582 L5237.3 944.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11045.6 607.7 L11036.1 602.6 L11045.3 597.1 L11054.8 602.2 Z"></path>
-					</g>
-					<path d="M11287.3 612.9 L12909.5 786 L12986.919207317073 934.5 L12986.9 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11278.6 606.6 L11287.3 612.9 L11277.5 617.2 L11268.8 610.9 Z"></path>
-					</g>
-					<path d="M11282.0 610.5 L13206 786 L13206 919 L13206.0 919.0 " fill="none"></path>
-					<path d="M11282.5 605.2 L11282.0 610.5 L11281.5 615.8 L11268.8 609.3 Z"></path>
-					<path d="M8315.1 604.1 L3674.5 786 L5237.25 943.936219380681 L5237.3 943.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8324.6 609.1 L8315.1 604.1 L8324.2 598.4 L8333.8 603.4 Z"></path>
-					</g>
-					<path d="M9482.4 666.6 L9602.75 786 L9840.893292682927 934.5 L9840.9 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9479.6 656.3 L9482.4 666.6 L9472.1 663.9 L9469.2 653.5 Z"></path>
-					</g>
-					<path d="M9603.0 655.9 L9642.75 786 L9844.673780487805 934.5 L9844.7 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9605.3 645.4 L9603.0 655.9 L9595.1 648.5 L9597.5 638.0 Z"></path>
-					</g>
-					<path d="M3428.2 661.0 L3714.5 786 L5237.25 943.7829726741431 L5237.3 943.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3421.8 652.3 L3428.2 661.0 L3417.6 662.1 L3411.1 653.5 Z"></path>
-					</g>
-					<path d="M7810.4 604.0 L13323 786 L13508.172256097561 934.5 L13508.2 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7801.3 598.4 L7810.4 604.0 L7800.9 609.1 L7791.8 603.4 Z"></path>
-					</g>
-					<path d="M7535.2 611.3 L5488.75 786 L5315.349085365854 934.5 L5315.3 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7544.9 615.8 L7535.2 611.3 L7544.0 605.1 L7553.8 609.7 Z"></path>
-					</g>
-					<path d="M9030.4 604.4 L14212.5 786 L14212.5 934.5 L14212.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9021.3 598.7 L9030.4 604.4 L9020.9 609.4 L9011.8 603.7 Z"></path>
-					</g>
-					<path d="M8753.1 608.8 L6118.25 786 L5357.25 938.0146163215591 L5357.3 938.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8762.8 613.5 L8753.1 608.8 L8762.1 602.9 L8771.8 607.6 Z"></path>
-					</g>
-					<path d="M9078.8 276.7 L9078.75 413 L9078.75 584 L9078.8 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9084.1 267.3 L9078.8 276.7 L9073.4 267.3 L9078.8 258.0 Z"></path>
-					</g>
-					<path d="M11282.1 605.6 L14870.5 786 L14870.5 881 L14870.5 881.0 " fill="none"></path>
-					<path d="M11282.3 600.2 L11282.1 605.6 L11281.8 610.9 L11268.8 604.9 Z"></path>
-					<path d="M10026.4 605.8 L15136.5 786 L15136.5 934.5 L15136.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10017.3 600.1 L10026.4 605.8 L10016.9 610.8 L10007.8 605.1 Z"></path>
-					</g>
-					<path d="M9670.1 608.5 L6158.25 786 L5357.25 938.5714285714286 L5357.3 938.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9679.7 613.4 L9670.1 608.5 L9679.2 602.7 L9688.8 607.6 Z"></path>
-					</g>
-					<path d="M10026.4 610.1 L12995 786 L12995 934.5 L12995.0 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10017.4 604.2 L10026.4 610.1 L10016.8 614.8 L10007.8 609.0 Z"></path>
-					</g>
-					<path d="M4990.5 616.6 L6198.25 786 L5357.25 939.0788013318535 L5357.3 939.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4982.0 610.0 L4990.5 616.6 L4980.5 620.6 L4972.0 614.0 Z"></path>
-					</g>
-					<path d="M5237.4 619.8 L6238.25 786 L5357.25 939.5430393198725 L5357.3 939.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5229.1 613.0 L5237.4 619.8 L5227.3 623.5 L5219.0 616.7 Z"></path>
-					</g>
-					<path d="M11925.4 607.3 L8163.25 786 L8066.136432926829 934.5 L8066.1 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11934.9 612.2 L11925.4 607.3 L11934.4 601.5 L11944.0 606.4 Z"></path>
-					</g>
-					<path d="M12254.6 609.3 L15221 786 L15266.500762195123 934.5 L15266.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12245.6 603.4 L12254.6 609.3 L12245.0 614.1 L12236.0 608.2 Z"></path>
-					</g>
-					<path d="M12254.6 608.7 L15419.75 786 L15419.75 934.5 L15419.8 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12245.6 602.9 L12254.6 608.7 L12245.0 613.5 L12236.0 607.7 Z"></path>
-					</g>
-					<path d="M5484.3 624.3 L6278.25 786 L5357.25 939.9694189602446 L5357.3 940.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5476.2 617.2 L5484.3 624.3 L5474.1 627.7 L5466.0 620.6 Z"></path>
-					</g>
-					<path d="M14335.9 645.9 L13872.5 786 L13560.106707317073 934.5 L13560.1 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14346.4 648.3 L14335.9 645.9 L14343.3 638.1 L14353.8 640.5 Z"></path>
-					</g>
-					<path d="M5844.9 650.6 L6318.25 786 L5357.25 940.362389813908 L5357.3 940.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5837.4 642.9 L5844.9 650.6 L5834.5 653.1 L5827.0 645.4 Z"></path>
-					</g>
-					<path d="M12715.4 605.9 L15581.75 786 L15581.75 934.5 L15581.8 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12706.4 599.9 L12715.4 605.9 L12705.7 610.6 L12696.8 604.7 Z"></path>
-					</g>
-					<path d="M12513.1 606.5 L9905.75 786 L9869.530487804877 934.5 L9869.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12522.8 611.1 L12513.1 606.5 L12522.1 600.5 L12531.8 605.2 Z"></path>
-					</g>
-					<path d="M11375.4 607.8 L8568.75 786 L9019.75 935.5733063700708 L9019.8 935.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11385.0 612.5 L11375.4 607.8 L11384.3 601.8 L11394.0 606.6 Z"></path>
-					</g>
-					<path d="M11635.6 605.3 L15724 786 L15788.217987804877 889 L15788.2 889.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11626.6 599.5 L11635.6 605.3 L11626.1 610.2 L11617.0 604.4 Z"></path>
-					</g>
-					<path d="M11375.5 615.0 L9945.75 786 L9873.310975609756 934.5 L9873.3 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11385.4 619.2 L11375.5 615.0 L11384.1 608.6 L11394.0 612.8 Z"></path>
-					</g>
-					<path d="M16010.1 892.8 L16022.25 889 L16029.75 889 L16029.75 889 L16037.25 950 L16037.25 950 L16029.75 1011 L16029.75 1011 L16022.25 1011 L16022.25 1011 L15992.25 1001.6632653061224 L15992.3 1001.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15999.6 890.5 L16010.1 892.8 L16002.7 900.7 L15992.3 898.3 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M18540.2 602.6 L15978.5 786 L15882.879573170732 889 L15882.9 889.0 " fill="none"></path>
-					</g>
-					<path d="M18540.6 608.0 L18540.2 602.6 L18539.8 597.3 L18553.5 601.7 Z"></path>
-					<path d="M12370.0 269.2 L12370 413 L12370 561 L12370.0 561.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12375.3 259.8 L12370.0 269.2 L12364.7 259.8 L12370.0 250.5 Z"></path>
-					</g>
-					<path d="M11638.4 609.8 L9204.5 786 L9076.599847560976 934.5 L9076.6 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11648.1 614.4 L11638.4 609.8 L11647.3 603.8 L11657.0 608.4 Z"></path>
-					</g>
-					<path d="M11922.6 605.8 L16018.5 786 L16519.23475609756 934.5 L16519.2 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11913.6 600.0 L11922.6 605.8 L11913.1 610.7 L11904.0 604.9 Z"></path>
-					</g>
-					<path d="M12809.5 261.7 L12809.5 413 L12809.5 584 L12809.5 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12814.8 252.3 L12809.5 261.7 L12804.2 252.3 L12809.5 243.0 Z"></path>
-					</g>
-					<path d="M13098.8 252.8 L13047 413 L13047 584 L13047.0 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13106.8 245.5 L13098.8 252.8 L13096.6 242.2 L13104.6 235.0 Z"></path>
-					</g>
-					<path d="M13156.3 250.0 L13276 413 L13303.735924932977 584 L13303.7 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13155.1 239.4 L13156.3 250.0 L13146.5 245.7 L13145.3 235.0 Z"></path>
-					</g>
-					<path d="M6545.6 619.9 L8231 786 L8072.539634146341 934.5 L8072.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6536.8 613.7 L6545.6 619.9 L6535.8 624.3 L6527.0 618.1 Z"></path>
-					</g>
-					<path d="M13703.2 240.7 L14242.25 413 L14242.25 584 L14242.3 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13695.9 232.8 L13703.2 240.7 L13692.7 242.9 L13685.4 235.0 Z"></path>
-					</g>
-					<path d="M13508.7 247.5 L13326.25 413 L13307.912198391421 584 L13307.9 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13519.2 245.2 L13508.7 247.5 L13512.0 237.3 L13522.5 235.0 Z"></path>
-					</g>
-					<path d="M18635.9 608.2 L15285.5 786 L15272.596798780487 934.5 L15272.6 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18645.5 613.0 L18635.9 608.2 L18644.9 602.4 L18654.5 607.2 Z"></path>
-					</g>
-					<path d="M18961.7 669.1 L19234 786 L19234 934.5 L19234.0 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18955.2 660.5 L18961.7 669.1 L18951.0 670.3 L18944.5 661.7 Z"></path>
-					</g>
-					<path d="M11033.4 603.6 L19431.5 786 L19431.5 934.5 L19431.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11024.2 598.0 L11033.4 603.6 L11024.0 608.7 L11014.8 603.2 Z"></path>
-					</g>
-					<path d="M10658.3 625.2 L9482.75 786 L9321.346798780487 934.5 L9321.3 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10668.2 629.2 L10658.3 625.2 L10666.8 618.6 L10676.8 622.6 Z"></path>
-					</g>
-					<path d="M10658.1 607.3 L6358.25 786 L5357.25 940.7257304429784 L5357.3 940.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10667.6 612.2 L10658.1 607.3 L10667.2 601.6 L10676.8 606.5 Z"></path>
-					</g>
-					<path d="M15663.5 276.7 L15663.5 413 L15663.5 584 L15663.5 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15668.8 267.3 L15663.5 276.7 L15658.2 267.3 L15663.5 258.0 Z"></path>
-					</g>
-					<path d="M15943.0 269.2 L15943 413 L15943 584 L15943.0 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15948.3 259.8 L15943.0 269.2 L15937.7 259.8 L15943.0 250.5 Z"></path>
-					</g>
-					<path d="M17990.1 619.6 L19650.5 786 L19650.5 934.5 L19650.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17981.3 613.4 L17990.1 619.6 L17980.3 624.0 L17971.5 617.7 Z"></path>
-					</g>
-					<path d="M17588.8 604.3 L9985.75 786 L9877.091463414634 934.5 L9877.1 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17598.3 609.4 L17588.8 604.3 L17598.0 598.7 L17607.5 603.8 Z"></path>
-					</g>
-					<path d="M17990.1 616.5 L19986.75 786 L20087.032774390245 934.5 L20087.0 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17981.3 610.4 L17990.1 616.5 L17980.3 621.1 L17971.5 614.9 Z"></path>
-					</g>
-					<path d="M16482.5 225.3 L16482.5 413 L16482.5 568.5 L16482.5 568.5 " fill="none"></path>
-					<path d="M16487.8 225.3 L16482.5 225.3 L16477.2 225.3 L16482.5 212.0 Z"></path>
-					<path d="M19405.9 635.7 L20319.5 786 L20319.5 934.5 L20319.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19397.6 628.9 L19405.9 635.7 L19395.8 639.4 L19387.5 632.7 Z"></path>
-					</g>
-					<path d="M19406.0 626.7 L20695 786 L20802.07393292683 934.5 L20802.1 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19397.4 620.3 L19406.0 626.7 L19396.1 630.8 L19387.5 624.4 Z"></path>
-					</g>
-					<path d="M22010.0 203.0 L19186 413 L19186 561 L19186.0 561.0 " fill="none"></path>
-					<path d="M22010.3 208.3 L22010.0 203.0 L22009.6 197.7 L22023.3 202.0 Z"></path>
-					<path d="M21658.6 642.6 L21092.25 786 L21092.25 934.5 L21092.3 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21669.0 645.5 L21658.6 642.6 L21666.4 635.1 L21676.7 638.0 Z"></path>
-					</g>
-					<path d="M21608.9 638.4 L20774.5 786 L20809.587652439026 934.5 L20809.6 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21619.0 642.0 L21608.9 638.4 L21617.1 631.5 L21627.3 635.1 Z"></path>
-					</g>
-					<path d="M22048.8 235.9 L21828.75 413 L21828.75 561 L21828.8 561.0 " fill="none"></path>
-					<path d="M22052.2 240.0 L22048.8 235.9 L22045.5 231.7 L22059.2 227.5 Z"></path>
-					<path d="M22074.7 641.9 L21405.75 786 L21405.75 934.5 L21405.8 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22085.0 645.2 L22074.7 641.9 L22082.7 634.8 L22093.0 638.0 Z"></path>
-					</g>
-					<path d="M22051.7 627.7 L20814.5 786 L20813.368140243903 934.5 L20813.4 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22061.7 631.8 L22051.7 627.7 L22060.3 621.2 L22070.3 625.3 Z"></path>
-					</g>
-					<path d="M22131.0 237.9 L22271.75 413 L22271.75 561 L22271.8 561.0 " fill="none"></path>
-					<path d="M22135.2 234.6 L22131.0 237.9 L22126.9 241.2 L22122.7 227.5 Z"></path>
-					<path d="M22494.9 641.2 L21732.5 786 L21732.5 934.5 L21732.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22505.1 644.7 L22494.9 641.2 L22503.1 634.3 L22513.3 637.8 Z"></path>
-					</g>
-					<path d="M22494.7 621.6 L20854.5 786 L20817.14862804878 934.5 L20817.1 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22504.5 625.9 L22494.7 621.6 L22503.4 615.3 L22513.3 619.7 Z"></path>
-					</g>
-					<path d="M22184.8 227.1 L22714.75 413 L22714.75 561 L22714.8 561.0 " fill="none"></path>
-					<path d="M22186.6 222.0 L22184.8 227.1 L22183.1 232.1 L22172.3 222.6 Z"></path>
-					<path d="M23007.5 631.0 L21948.5 786 L21948.5 934.5 L21948.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23017.5 634.9 L23007.5 631.0 L23016.0 624.3 L23026.0 628.3 Z"></path>
-					</g>
-					<path d="M23007.6 639.3 L22215 786 L22215 934.5 L22215.0 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23017.8 642.8 L23007.6 639.3 L23015.9 632.3 L23026.0 635.9 Z"></path>
-					</g>
-					<path d="M22185.3 213.4 L23222.5 413 L23222.5 546 L23222.5 546.0 " fill="none"></path>
-					<path d="M22186.4 208.1 L22185.3 213.4 L22184.3 218.6 L22172.3 210.8 Z"></path>
-					<path d="M20151.9 656.0 L20188.5 786 L20106.100609756097 934.5 L20106.1 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20154.5 645.5 L20151.9 656.0 L20144.2 648.4 L20146.8 638.0 Z"></path>
-					</g>
-					<path d="M20318.7 642.3 L20932.75 786 L20824.544207317074 934.5 L20824.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20310.8 634.9 L20318.7 642.3 L20308.3 645.3 L20300.5 638.0 Z"></path>
-					</g>
-					<path d="M22010.0 206.2 L20136 413 L20136 561 L20136.0 561.0 " fill="none"></path>
-					<path d="M22010.6 211.5 L22010.0 206.2 L22009.4 200.9 L22023.3 204.7 Z"></path>
-					<path d="M19454.5 256.3 L19597.5 413 L19597.5 584 L19597.5 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19452.2 245.8 L19454.5 256.3 L19444.3 253.0 L19442.0 242.5 Z"></path>
-					</g>
-					<path d="M19512.7 250.6 L19851 413 L19851 584 L19851.0 584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19506.5 241.7 L19512.7 250.6 L19501.9 251.3 L19495.8 242.5 Z"></path>
-					</g>
-					<path d="M17010.9 607.7 L13912.5 786 L13563.887195121952 934.5 L13563.9 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17020.5 612.5 L17010.9 607.7 L17019.9 601.8 L17029.5 606.6 Z"></path>
-					</g>
-					<path d="M17294.9 625.5 L18169.25 786 L16660 940.9159755906744 L16660.0 940.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17286.6 618.6 L17294.9 625.5 L17284.7 629.1 L17276.5 622.2 Z"></path>
-					</g>
-					<path d="M17297.9 607.5 L14077 786 L13579.434451219513 934.5 L13579.4 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17307.5 612.3 L17297.9 607.5 L17306.9 601.6 L17316.5 606.5 Z"></path>
-					</g>
-					<path d="M17585.6 634.4 L18209.25 786 L16660 941.1378415509082 L16660.0 941.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17577.8 627.0 L17585.6 634.4 L17575.3 637.4 L17567.5 630.0 Z"></path>
-					</g>
-					<path d="M14646.8 637.7 L14117 786 L13582.5 934.6988973706531 L13582.5 934.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14657.2 640.3 L14646.8 637.7 L14654.3 630.1 L14664.8 632.7 Z"></path>
-					</g>
-					<path d="M16069.9 605.7 L11919.75 786 L11850.706554878048 934.5 L11850.7 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16079.4 610.6 L16069.9 605.7 L16078.9 599.9 L16088.5 604.9 Z"></path>
-					</g>
-					<path d="M16354.1 612.5 L18249.25 786 L16660 941.349128296826 L16660.0 941.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16345.3 606.3 L16354.1 612.5 L16344.3 617.0 L16335.5 610.8 Z"></path>
-					</g>
-					<path d="M20802.7 617.5 L19102.75 786 L16660 944.266074074074 L16660.0 944.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20812.5 621.9 L20802.7 617.5 L20811.4 611.3 L20821.3 615.7 Z"></path>
-					</g>
-					<path d="M21165.8 621.8 L22501.5 786 L22501.5 934.5 L22501.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21157.2 615.4 L21165.8 621.8 L21155.9 626.0 L21147.3 619.5 Z"></path>
-					</g>
-					<path d="M13864.5 628.2 L13080.5 786 L13003.080792682927 934.5 L13003.1 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13874.7 631.5 L13864.5 628.2 L13872.5 621.1 L13882.8 624.5 Z"></path>
-					</g>
-					<path d="M14149.2 619.7 L15325.5 786 L15276.377286585366 934.5 L15276.4 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14140.7 613.1 L14149.2 619.7 L14139.2 623.6 L14130.8 617.0 Z"></path>
-					</g>
-					<path d="M13864.2 612.5 L11959.75 786 L11854.487042682927 934.5 L11854.5 934.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13873.9 617.0 L13864.2 612.5 L13873.0 606.3 L13882.8 610.8 Z"></path>
-					</g>
-					<g data-name="MyApp">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MyApp">
-							<rect x="0.0" y="150.5" height="92.0" width="328.0" data-name="MyApp"></rect>
-							<path d="M0.0 181.5 L328.0 181.5" fill="none" data-name="MyApp"></path>
-						</g>
-						<g transform="translate(0, 150.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MyApp">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MyApp">
-								<text x="156.0" y="13.5" stroke="none" text-anchor="middle" data-name="MyApp">MyApp</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MyApp">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MyApp">
-								<text x="0.0" y="13.5" stroke="none" data-name="MyApp">+queryParameters: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MyApp">+appConfig: AppConfig?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MyApp">+initialRoute: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppConfig">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppConfig">
-							<rect x="115.0" y="584.0" height="31.0" width="98.0" data-name="AppConfig"></rect>
-						</g>
-						<g transform="translate(115, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppConfig">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppConfig">AppConfig</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationValidators">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationValidators">
-							<rect x="1682.5" y="904.0" height="92.0" width="323.0" data-name="NotificationValidators"></rect>
-							<path d="M1682.5 935.0 L2005.5 935.0" fill="none" data-name="NotificationValidators"></path>
-						</g>
-						<g transform="translate(1682.5, 904)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationValidators">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationValidators">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationValidators">NotificationValidators</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1682.5, 935)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationValidators">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationValidators">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationValidators">+didNotificationLaunchApp: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationValidators">+wasNotificationActionHandled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationValidators">+wasNotificationActionCompleted: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyNotifications">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotifications">
-							<rect x="4099.0" y="455.5" height="288.0" width="626.0" data-name="StudyNotifications"></rect>
-							<path d="M4099.0 486.5 L4725.0 486.5" fill="none" data-name="StudyNotifications"></path>
-							<path d="M4099.0 622.5 L4725.0 622.5" fill="none" data-name="StudyNotifications"></path>
-						</g>
-						<g transform="translate(4099, 455.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotifications">
-								<text x="305.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotifications">StudyNotifications</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4099, 486.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotifications">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotifications">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotifications">+flutterLocalNotificationsPlugin: FlutterLocalNotificationsPlugin</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNotifications">+context: BuildContext</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNotifications">+didReceiveLocalNotificationStream: StreamController&lt;ReceivedNotification&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNotifications">+selectNotificationStream: StreamController&lt;String?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+validator: NotificationValidators</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+debug: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+scheduledNotificationsDebug: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4099, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotifications">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+dynamic create()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotifications">-dynamic _isAndroidPermissionGranted()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNotifications">-dynamic _requestPermissions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNotifications">-void _configureDidReceiveLocalNotificationSubject()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNotifications">-void _configureSelectNotificationSubject()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNotifications">-void _initNotificationsPlugin()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyNotifications">+dynamic handleNotificationResponse()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="5237.3" y="934.5" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(5237.25, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FlutterLocalNotificationsPlugin">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FlutterLocalNotificationsPlugin">
-							<rect x="6364.5" y="934.5" height="31.0" width="255.0" data-name="FlutterLocalNotificationsPlugin"></rect>
-						</g>
-						<g transform="translate(6364.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FlutterLocalNotificationsPlugin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FlutterLocalNotificationsPlugin">
-								<text x="119.5" y="13.5" stroke="none" text-anchor="middle" data-name="FlutterLocalNotificationsPlugin">FlutterLocalNotificationsPlugin</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BuildContext">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
-							<rect x="6659.5" y="934.5" height="31.0" width="116.0" data-name="BuildContext"></rect>
-						</g>
-						<g transform="translate(6659.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
-							<rect x="7806.0" y="934.5" height="31.0" width="149.0" data-name="StreamController"></rect>
-						</g>
-						<g transform="translate(7806, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReceivedNotification">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReceivedNotification">
-							<rect x="779.8" y="143.0" height="107.0" width="178.0" data-name="ReceivedNotification"></rect>
-							<path d="M779.8 174.0 L957.8 174.0" fill="none" data-name="ReceivedNotification"></path>
-						</g>
-						<g transform="translate(779.75, 143)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReceivedNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReceivedNotification">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReceivedNotification">ReceivedNotification</text>
-								
-							</g>
-						</g>
-						<g transform="translate(779.75, 174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReceivedNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReceivedNotification">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReceivedNotification">+id: int?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReceivedNotification">+title: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReceivedNotification">+body: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReceivedNotification">+payload: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyNotification">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotification">
-							<rect x="5867.0" y="561.0" height="77.0" width="243.0" data-name="StudyNotification"></rect>
-							<path d="M5867.0 592.0 L6110.0 592.0" fill="none" data-name="StudyNotification"></path>
-						</g>
-						<g transform="translate(5867, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotification">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotification">StudyNotification</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5867, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotification">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotification">+taskInstance: TaskInstance</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotification">+date: DateTime</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskInstance">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskInstance">
-							<rect x="7995.0" y="934.5" height="31.0" width="122.0" data-name="TaskInstance"></rect>
-						</g>
-						<g transform="translate(7995, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskInstance">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskInstance">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskInstance">TaskInstance</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppAnalytics">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppAnalytics">
-							<rect x="3532.0" y="493.0" height="213.0" width="335.0" data-name="AppAnalytics"></rect>
-							<path d="M3532.0 524.0 L3867.0 524.0" fill="none" data-name="AppAnalytics"></path>
-							<path d="M3532.0 615.0 L3867.0 615.0" fill="none" data-name="AppAnalytics"></path>
-						</g>
-						<g transform="translate(3532, 493)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppAnalytics">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppAnalytics">
-								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppAnalytics">AppAnalytics</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3532, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppAnalytics">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppAnalytics">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;-_userEnabled: bool?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+keyAnalyticsUserEnable: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppAnalytics">+context: BuildContext</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppAnalytics">+subject: StudySubject?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+isUserEnabled: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3532, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppAnalytics">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppAnalytics">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+dynamic init()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+dynamic start()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+void setEnabled()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppAnalytics">+dynamic initBasic()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppAnalytics">+void initAdvanced()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GroupedIterable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GroupedIterable">
-							<rect x="1249.0" y="538.0" height="123.0" width="397.0" data-name="GroupedIterable"></rect>
-							<path d="M1249.0 569.0 L1646.0 569.0" fill="none" data-name="GroupedIterable"></path>
-							<path d="M1249.0 615.0 L1646.0 615.0" fill="none" data-name="GroupedIterable"></path>
-						</g>
-						<g transform="translate(1249, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GroupedIterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GroupedIterable">
-								<text x="190.5" y="13.5" stroke="none" text-anchor="middle" data-name="GroupedIterable">GroupedIterable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1249, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GroupedIterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GroupedIterable">
-								<text x="0.0" y="13.5" stroke="none" data-name="GroupedIterable">+data: Map&lt;K, Iterable&lt;V&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GroupedIterable">+iterator: Iterator&lt;MapEntry&lt;K, Iterable&lt;V&gt;&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1249, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GroupedIterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GroupedIterable">
-								<text x="0.0" y="13.5" stroke="none" data-name="GroupedIterable">+Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GroupedIterable">+Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregateWithKey()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Iterable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Iterable">
-							<rect x="1409.5" y="181.0" height="31.0" width="76.0" data-name="Iterable"></rect>
-						</g>
-						<g transform="translate(1409.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Iterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Iterable">
-								<text x="30.0" y="13.5" stroke="none" text-anchor="middle" data-name="Iterable">Iterable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Cache">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Cache">
-							<rect x="1525.5" y="105.0" height="183.0" width="282.0" data-name="Cache"></rect>
-							<path d="M1525.5 136.0 L1807.5 136.0" fill="none" data-name="Cache"></path>
-							<path d="M1525.5 182.0 L1807.5 182.0" fill="none" data-name="Cache"></path>
-						</g>
-						<g transform="translate(1525.5, 105)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Cache">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Cache">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="Cache">Cache</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1525.5, 136)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Cache">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Cache">
-								<text x="0.0" y="13.5" stroke="none" data-name="Cache">&lt;static&gt;+isSynchronizing: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Cache">&lt;static&gt;+sharedPrefs: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1525.5, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Cache">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Cache">
-								<text x="0.0" y="13.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic storeSubject()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic loadSubject()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic storeAnalytics()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic loadAnalytics()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic synchronize()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentScreen">
-							<rect x="1847.5" y="181.0" height="31.0" width="138.0" data-name="ConsentScreen"></rect>
-						</g>
-						<g transform="translate(1847.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentScreen">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentScreen">ConsentScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentCard">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentCard">
-							<rect x="2025.5" y="127.5" height="138.0" width="286.0" data-name="ConsentCard"></rect>
-							<path d="M2025.5 158.5 L2311.5 158.5" fill="none" data-name="ConsentCard"></path>
-							<path d="M2025.5 234.5 L2311.5 234.5" fill="none" data-name="ConsentCard"></path>
-						</g>
-						<g transform="translate(2025.5, 127.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentCard">
-								<text x="135.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentCard">ConsentCard</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2025.5, 158.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+consent: ConsentItem?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentCard">+index: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentCard">+onTapped: dynamic Function(int)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentCard">+isChecked: bool?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2025.5, 234.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentCard">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItem">
-							<rect x="1898.3" y="584.0" height="31.0" width="116.0" data-name="ConsentItem"></rect>
-						</g>
-						<g transform="translate(1898.25, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItem">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItem">ConsentItem</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(int)">
-							<rect x="2171.0" y="584.0" height="31.0" width="186.0" data-name="dynamic Function(int)"></rect>
-						</g>
-						<g transform="translate(2171, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(int)">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(int)">dynamic Function(int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentElement">
-							<rect x="6567.0" y="546.0" height="107.0" width="249.0" data-name="ConsentElement"></rect>
-							<path d="M6567.0 577.0 L6816.0 577.0" fill="none" data-name="ConsentElement"></path>
-						</g>
-						<g transform="translate(6567, 546)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentElement">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentElement">ConsentElement</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6567, 577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentElement">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentElement">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentElement">+descriptionText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentElement">+acknowledgmentText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentElement">+icon: IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="9019.8" y="934.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(9019.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyOverviewScreen">
-							<rect x="2952.8" y="181.0" height="31.0" width="190.0" data-name="StudyOverviewScreen"></rect>
-						</g>
-						<g transform="translate(2952.75, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyOverviewScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyOverviewScreen">StudyOverviewScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_StudyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_StudyOverviewScreen">
-							<rect x="6856.0" y="538.0" height="123.0" width="316.0" data-name="_StudyOverviewScreen"></rect>
-							<path d="M6856.0 569.0 L7172.0 569.0" fill="none" data-name="_StudyOverviewScreen"></path>
-							<path d="M6856.0 600.0 L7172.0 600.0" fill="none" data-name="_StudyOverviewScreen"></path>
-						</g>
-						<g transform="translate(6856, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_StudyOverviewScreen">
-								<text x="150.0" y="13.5" stroke="none" text-anchor="middle" data-name="_StudyOverviewScreen">_StudyOverviewScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6856, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+study: Study?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6856, 600)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_StudyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_StudyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToJourney()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_StudyOverviewScreen">+dynamic navigateToEligibilityCheck()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="_StudyOverviewScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="9274.0" y="934.5" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(9274, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDetailsView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDetailsView">
-							<rect x="7212.0" y="545.5" height="108.0" width="157.0" data-name="StudyDetailsView"></rect>
-							<path d="M7212.0 576.5 L7369.0 576.5" fill="none" data-name="StudyDetailsView"></path>
-							<path d="M7212.0 622.5 L7369.0 622.5" fill="none" data-name="StudyDetailsView"></path>
-						</g>
-						<g transform="translate(7212, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDetailsView">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDetailsView">StudyDetailsView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7212, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+study: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDetailsView">+iconSize: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7212, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDetailsView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="KickoffScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="KickoffScreen">
-							<rect x="3182.8" y="181.0" height="31.0" width="125.0" data-name="KickoffScreen"></rect>
-						</g>
-						<g transform="translate(3182.75, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="KickoffScreen">
-								<text x="54.5" y="13.5" stroke="none" text-anchor="middle" data-name="KickoffScreen">KickoffScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_KickoffScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_KickoffScreen">
-							<rect x="253.0" y="523.0" height="153.0" width="261.0" data-name="_KickoffScreen"></rect>
-							<path d="M253.0 554.0 L514.0 554.0" fill="none" data-name="_KickoffScreen"></path>
-							<path d="M253.0 600.0 L514.0 600.0" fill="none" data-name="_KickoffScreen"></path>
-						</g>
-						<g transform="translate(253, 523)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_KickoffScreen">
-								<text x="122.5" y="13.5" stroke="none" text-anchor="middle" data-name="_KickoffScreen">_KickoffScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(253, 554)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">+ready: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(253, 600)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_KickoffScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_KickoffScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_KickoffScreen">-dynamic _storeUserStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_KickoffScreen">-Widget _constructStatusIcon()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="_KickoffScreen">-String _getStatusText()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="_KickoffScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityResult">
-							<rect x="3853.5" y="158.0" height="77.0" width="259.0" data-name="EligibilityResult"></rect>
-							<path d="M3853.5 189.0 L4112.5 189.0" fill="none" data-name="EligibilityResult"></path>
-						</g>
-						<g transform="translate(3853.5, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityResult">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityResult">EligibilityResult</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3853.5, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityResult">+eligible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EligibilityResult">+firstFailed: EligibilityCriterion?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityCriterion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityCriterion">
-							<rect x="3907.0" y="584.0" height="31.0" width="152.0" data-name="EligibilityCriterion"></rect>
-						</g>
-						<g transform="translate(3907, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityCriterion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityCriterion">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityCriterion">EligibilityCriterion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EligibilityScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EligibilityScreen">
-							<rect x="7831.8" y="553.0" height="93.0" width="462.0" data-name="EligibilityScreen"></rect>
-							<path d="M7831.8 584.0 L8293.8 584.0" fill="none" data-name="EligibilityScreen"></path>
-							<path d="M7831.8 615.0 L8293.8 615.0" fill="none" data-name="EligibilityScreen"></path>
-						</g>
-						<g transform="translate(7831.75, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EligibilityScreen">
-								<text x="223.0" y="13.5" stroke="none" text-anchor="middle" data-name="EligibilityScreen">EligibilityScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7831.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityScreen">+study: Study?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7831.75, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EligibilityScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EligibilityScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="EligibilityScreen">&lt;static&gt;+MaterialPageRoute&lt;EligibilityResult&gt; routeFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OnboardingProgress">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OnboardingProgress">
-							<rect x="5522.8" y="135.0" height="123.0" width="271.0" data-name="OnboardingProgress"></rect>
-							<path d="M5522.8 166.0 L5793.8 166.0" fill="none" data-name="OnboardingProgress"></path>
-							<path d="M5522.8 212.0 L5793.8 212.0" fill="none" data-name="OnboardingProgress"></path>
-						</g>
-						<g transform="translate(5522.75, 135)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OnboardingProgress">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="OnboardingProgress">OnboardingProgress</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5522.75, 166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
-								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">+stage: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+progress: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5522.75, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OnboardingProgress">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OnboardingProgress">
-								<text x="0.0" y="13.5" stroke="none" data-name="OnboardingProgress">-double _getProgressForStage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OnboardingProgress">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySelectionScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySelectionScreen">
-							<rect x="5833.8" y="181.0" height="31.0" width="190.0" data-name="StudySelectionScreen"></rect>
-						</g>
-						<g transform="translate(5833.75, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySelectionScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySelectionScreen">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySelectionScreen">StudySelectionScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeDialog">
-							<rect x="6063.8" y="181.0" height="31.0" width="151.0" data-name="InviteCodeDialog"></rect>
-						</g>
-						<g transform="translate(6063.75, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeDialog">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeDialog">InviteCodeDialog</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionSelectionScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSelectionScreen">
-							<rect x="6254.8" y="181.0" height="31.0" width="239.0" data-name="InterventionSelectionScreen"></rect>
-						</g>
-						<g transform="translate(6254.75, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSelectionScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSelectionScreen">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSelectionScreen">InterventionSelectionScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="JourneyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JourneyOverviewScreen">
-							<rect x="6533.8" y="181.0" height="31.0" width="209.0" data-name="JourneyOverviewScreen"></rect>
-						</g>
-						<g transform="translate(6533.75, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JourneyOverviewScreen">
-								<text x="96.5" y="13.5" stroke="none" text-anchor="middle" data-name="JourneyOverviewScreen">JourneyOverviewScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_JourneyOverviewScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_JourneyOverviewScreen">
-							<rect x="554.0" y="545.5" height="108.0" width="408.0" data-name="_JourneyOverviewScreen"></rect>
-							<path d="M554.0 576.5 L962.0 576.5" fill="none" data-name="_JourneyOverviewScreen"></path>
-							<path d="M554.0 607.5 L962.0 607.5" fill="none" data-name="_JourneyOverviewScreen"></path>
-						</g>
-						<g transform="translate(554, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_JourneyOverviewScreen">
-								<text x="196.0" y="13.5" stroke="none" text-anchor="middle" data-name="_JourneyOverviewScreen">_JourneyOverviewScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(554, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_JourneyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_JourneyOverviewScreen">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(554, 607.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_JourneyOverviewScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_JourneyOverviewScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="_JourneyOverviewScreen">+dynamic getConsentAndNavigateToDashboard()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_JourneyOverviewScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Timeline">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Timeline">
-							<rect x="1002.0" y="553.0" height="93.0" width="207.0" data-name="Timeline"></rect>
-							<path d="M1002.0 584.0 L1209.0 584.0" fill="none" data-name="Timeline"></path>
-							<path d="M1002.0 615.0 L1209.0 615.0" fill="none" data-name="Timeline"></path>
-						</g>
-						<g transform="translate(1002, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timeline">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="Timeline">Timeline</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1002, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Timeline">
-								<text x="0.0" y="13.5" stroke="none" data-name="Timeline">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1002, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Timeline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Timeline">
-								<text x="0.0" y="13.5" stroke="none" data-name="Timeline">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTile">
-							<rect x="8570.8" y="515.5" height="168.0" width="161.0" data-name="InterventionTile"></rect>
-							<path d="M8570.8 546.5 L8731.8 546.5" fill="none" data-name="InterventionTile"></path>
-							<path d="M8570.8 652.5 L8731.8 652.5" fill="none" data-name="InterventionTile"></path>
-						</g>
-						<g transform="translate(8570.75, 515.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTile">
-								<text x="72.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTile">InterventionTile</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8570.75, 546.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTile">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTile">+iconName: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTile">+date: DateTime</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTile">+color: Color?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTile">+isFirst: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTile">+isLast: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8570.75, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTile">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="9836.8" y="934.5" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(9836.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconIndicator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconIndicator">
-							<rect x="9145.8" y="545.5" height="108.0" width="161.0" data-name="IconIndicator"></rect>
-							<path d="M9145.8 576.5 L9306.8 576.5" fill="none" data-name="IconIndicator"></path>
-							<path d="M9145.8 622.5 L9306.8 622.5" fill="none" data-name="IconIndicator"></path>
-						</g>
-						<g transform="translate(9145.75, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconIndicator">
-								<text x="72.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconIndicator">IconIndicator</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9145.75, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconIndicator">+iconName: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconIndicator">+color: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9145.75, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconIndicator">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TimelineChild">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimelineChild">
-							<rect x="10047.8" y="553.0" height="93.0" width="138.0" data-name="TimelineChild"></rect>
-							<path d="M10047.8 584.0 L10185.8 584.0" fill="none" data-name="TimelineChild"></path>
-							<path d="M10047.8 615.0 L10185.8 615.0" fill="none" data-name="TimelineChild"></path>
-						</g>
-						<g transform="translate(10047.75, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimelineChild">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="TimelineChild">TimelineChild</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10047.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimelineChild">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimelineChild">+child: Widget?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10047.75, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimelineChild">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimelineChild">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimelineChild">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="11808.0" y="934.5" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(11808, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionWidget">
-							<rect x="11919.0" y="806.0" height="288.0" width="394.0" data-name="AverageSectionWidget"></rect>
-							<path d="M11919.0 837.0 L12313.0 837.0" fill="none" data-name="AverageSectionWidget"></path>
-							<path d="M11919.0 898.0 L12313.0 898.0" fill="none" data-name="AverageSectionWidget"></path>
-						</g>
-						<g transform="translate(11919, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionWidget">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionWidget">AverageSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11919, 837)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+section: AverageSection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+titlePos: List&lt;int&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+phasePos: List&lt;int&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11919, 898)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionWidget">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionWidget">+Widget getLegend()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionWidget">+Widget getDiagram()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AverageSectionWidget">+BarChartData getChartData()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AverageSectionWidget">+Widget getTitles()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AverageSectionWidget">+Widget getValues()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AverageSectionWidget">+List&lt;BarChartGroupData&gt; getBarGroups()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AverageSectionWidget">+FlGridData getGridData()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AverageSectionWidget">+MaterialColor getColor()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AverageSectionWidget">+int getDayIndex()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AverageSectionWidget">+Iterable&lt;DiagramDatum&gt; getAggregatedData()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AverageSectionWidget">+Map&lt;String, String?&gt; getInterventionNames()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSection">
-							<rect x="12045.5" y="1134.0" height="31.0" width="141.0" data-name="AverageSection"></rect>
-						</g>
-						<g transform="translate(12045.5, 1134)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSection">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSection">AverageSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionWidget">
-							<rect x="8333.8" y="568.5" height="62.0" width="197.0" data-name="ReportSectionWidget"></rect>
-							<path d="M8333.8 599.5 L8530.8 599.5" fill="none" data-name="ReportSectionWidget"></path>
-						</g>
-						<g transform="translate(8333.75, 568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionWidget">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionWidget">ReportSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8333.75, 599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionWidget">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DiagramDatum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DiagramDatum">
-							<rect x="6782.8" y="143.0" height="107.0" width="202.0" data-name="DiagramDatum"></rect>
-							<path d="M6782.8 174.0 L6984.8 174.0" fill="none" data-name="DiagramDatum"></path>
-						</g>
-						<g transform="translate(6782.75, 143)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DiagramDatum">
-								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="DiagramDatum">DiagramDatum</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6782.75, 174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DiagramDatum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DiagramDatum">
-								<text x="0.0" y="13.5" stroke="none" data-name="DiagramDatum">+x: num</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DiagramDatum">+value: num</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DiagramDatum">+timestamp: DateTime?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DiagramDatum">+intervention: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionWidget">
-							<rect x="12353.0" y="903.5" height="93.0" width="292.0" data-name="LinearRegressionSectionWidget"></rect>
-							<path d="M12353.0 934.5 L12645.0 934.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-							<path d="M12353.0 965.5 L12645.0 965.5" fill="none" data-name="LinearRegressionSectionWidget"></path>
-						</g>
-						<g transform="translate(12353, 903.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionWidget">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionWidget">LinearRegressionSectionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12353, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+section: LinearRegressionSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12353, 965.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSection">
-							<rect x="12391.5" y="1134.0" height="31.0" width="215.0" data-name="LinearRegressionSection"></rect>
-						</g>
-						<g transform="translate(12391.5, 1134)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSection">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSection">LinearRegressionSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportHistoryScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryScreen">
-							<rect x="7024.8" y="165.5" height="62.0" width="180.0" data-name="ReportHistoryScreen"></rect>
-							<path d="M7024.8 196.5 L7204.8 196.5" fill="none" data-name="ReportHistoryScreen"></path>
-						</g>
-						<g transform="translate(7024.75, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryScreen">ReportHistoryScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7024.75, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportHistoryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportHistoryItem">
-							<rect x="2397.0" y="553.0" height="93.0" width="197.0" data-name="ReportHistoryItem"></rect>
-							<path d="M2397.0 584.0 L2594.0 584.0" fill="none" data-name="ReportHistoryItem"></path>
-							<path d="M2397.0 615.0 L2594.0 615.0" fill="none" data-name="ReportHistoryItem"></path>
-						</g>
-						<g transform="translate(2397, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportHistoryItem">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportHistoryItem">ReportHistoryItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2397, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2397, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportHistoryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportHistoryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportHistoryItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportDetailsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportDetailsScreen">
-							<rect x="2634.0" y="545.5" height="108.0" width="409.0" data-name="ReportDetailsScreen"></rect>
-							<path d="M2634.0 576.5 L3043.0 576.5" fill="none" data-name="ReportDetailsScreen"></path>
-							<path d="M2634.0 607.5 L3043.0 607.5" fill="none" data-name="ReportDetailsScreen"></path>
-						</g>
-						<g transform="translate(2634, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportDetailsScreen">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportDetailsScreen">ReportDetailsScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2634, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportDetailsScreen">+subject: StudySubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2634, 607.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportDetailsScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GeneralDetailsSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GeneralDetailsSection">
-							<rect x="12685.0" y="919.0" height="62.0" width="198.0" data-name="GeneralDetailsSection"></rect>
-							<path d="M12685.0 950.0 L12883.0 950.0" fill="none" data-name="GeneralDetailsSection"></path>
-						</g>
-						<g transform="translate(12685, 919)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GeneralDetailsSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GeneralDetailsSection">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="GeneralDetailsSection">GeneralDetailsSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12685, 950)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GeneralDetailsSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GeneralDetailsSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GeneralDetailsSection">+Widget buildContent()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GenericSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GenericSection">
-							<rect x="11054.8" y="538.0" height="123.0" width="214.0" data-name="GenericSection"></rect>
-							<path d="M11054.8 569.0 L11268.8 569.0" fill="none" data-name="GenericSection"></path>
-							<path d="M11054.8 615.0 L11268.8 615.0" fill="none" data-name="GenericSection"></path>
-						</g>
-						<g transform="translate(11054.75, 538)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GenericSection">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="GenericSection">GenericSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11054.75, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GenericSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GenericSection">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GenericSection">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11054.75, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GenericSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GenericSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="GenericSection">+Widget buildContent()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GenericSection">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="12923.0" y="934.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(12923, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DisclaimerSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisclaimerSection">
-							<rect x="13107.0" y="919.0" height="62.0" width="198.0" data-name="DisclaimerSection"></rect>
-							<path d="M13107.0 950.0 L13305.0 950.0" fill="none" data-name="DisclaimerSection"></path>
-						</g>
-						<g transform="translate(13107, 919)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisclaimerSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisclaimerSection">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisclaimerSection">DisclaimerSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13107, 950)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisclaimerSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisclaimerSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisclaimerSection">+Widget buildContent()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegendWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendWidget">
-							<rect x="9346.8" y="545.5" height="108.0" width="136.0" data-name="LegendWidget"></rect>
-							<path d="M9346.8 576.5 L9482.8 576.5" fill="none" data-name="LegendWidget"></path>
-							<path d="M9346.8 622.5 L9482.8 622.5" fill="none" data-name="LegendWidget"></path>
-						</g>
-						<g transform="translate(9346.75, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendWidget">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="LegendWidget">LegendWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9346.75, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LegendWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9346.75, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegendsListWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegendsListWidget">
-							<rect x="7244.8" y="150.0" height="93.0" width="207.0" data-name="LegendsListWidget"></rect>
-							<path d="M7244.8 181.0 L7451.8 181.0" fill="none" data-name="LegendsListWidget"></path>
-							<path d="M7244.8 212.0 L7451.8 212.0" fill="none" data-name="LegendsListWidget"></path>
-						</g>
-						<g transform="translate(7244.75, 150)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegendsListWidget">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LegendsListWidget">LegendsListWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7244.75, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+legends: List&lt;Legend&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7244.75, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegendsListWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegendsListWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegendsListWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Legend">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Legend">
-							<rect x="9522.8" y="561.0" height="77.0" width="126.0" data-name="Legend"></rect>
-							<path d="M9522.8 592.0 L9648.8 592.0" fill="none" data-name="Legend"></path>
-						</g>
-						<g transform="translate(9522.75, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Legend">
-								<text x="55.0" y="13.5" stroke="none" text-anchor="middle" data-name="Legend">Legend</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9522.75, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Legend">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Legend">
-								<text x="0.0" y="13.5" stroke="none" data-name="Legend">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Legend">+color: Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceDetailsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceDetailsScreen">
-							<rect x="3083.0" y="545.5" height="108.0" width="409.0" data-name="PerformanceDetailsScreen"></rect>
-							<path d="M3083.0 576.5 L3492.0 576.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-							<path d="M3083.0 607.5 L3492.0 607.5" fill="none" data-name="PerformanceDetailsScreen"></path>
-						</g>
-						<g transform="translate(3083, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceDetailsScreen">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceDetailsScreen">PerformanceDetailsScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3083, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">+reportSubject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3083, 607.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceDetailsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceDetailsScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceDetailsScreen">&lt;static&gt;+MaterialPageRoute&lt;dynamic&gt; routeFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceDetailsScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPerformanceBar">
-							<rect x="7553.8" y="545.5" height="108.0" width="238.0" data-name="InterventionPerformanceBar"></rect>
-							<path d="M7553.8 576.5 L7791.8 576.5" fill="none" data-name="InterventionPerformanceBar"></path>
-							<path d="M7553.8 622.5 L7791.8 622.5" fill="none" data-name="InterventionPerformanceBar"></path>
-						</g>
-						<g transform="translate(7553.75, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPerformanceBar">
-								<text x="111.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPerformanceBar">InterventionPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7553.75, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7553.75, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention">
-							<rect x="13472.5" y="934.5" height="31.0" width="110.0" data-name="Intervention"></rect>
-						</g>
-						<g transform="translate(13472.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention">Intervention</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ObservationPerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ObservationPerformanceBar">
-							<rect x="8771.8" y="545.5" height="108.0" width="240.0" data-name="ObservationPerformanceBar"></rect>
-							<path d="M8771.8 576.5 L9011.8 576.5" fill="none" data-name="ObservationPerformanceBar"></path>
-							<path d="M8771.8 622.5 L9011.8 622.5" fill="none" data-name="ObservationPerformanceBar"></path>
-						</g>
-						<g transform="translate(8771.75, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ObservationPerformanceBar">
-								<text x="112.0" y="13.5" stroke="none" text-anchor="middle" data-name="ObservationPerformanceBar">ObservationPerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8771.75, 576.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+observation: Observation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ObservationPerformanceBar">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8771.75, 622.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ObservationPerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ObservationPerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="ObservationPerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Observation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Observation">
-							<rect x="14156.5" y="934.5" height="31.0" width="112.0" data-name="Observation"></rect>
-						</g>
-						<g transform="translate(14156.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Observation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Observation">
-								<text x="48.0" y="13.5" stroke="none" text-anchor="middle" data-name="Observation">Observation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceBar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceBar">
-							<rect x="9006.8" y="135.0" height="123.0" width="144.0" data-name="PerformanceBar"></rect>
-							<path d="M9006.8 166.0 L9150.8 166.0" fill="none" data-name="PerformanceBar"></path>
-							<path d="M9006.8 227.0 L9150.8 227.0" fill="none" data-name="PerformanceBar"></path>
-						</g>
-						<g transform="translate(9006.75, 135)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceBar">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceBar">PerformanceBar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9006.75, 166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+task: Task</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceBar">+completed: int</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PerformanceBar">+total: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9006.75, 227)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceBar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceBar">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceBar">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Task">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Task">
-							<rect x="9051.8" y="584.0" height="31.0" width="54.0" data-name="Task"></rect>
-						</g>
-						<g transform="translate(9051.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Task">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Task">
-								<text x="19.0" y="13.5" stroke="none" text-anchor="middle" data-name="Task">Task</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PerformanceSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PerformanceSection">
-							<rect x="14708.5" y="881.0" height="138.0" width="324.0" data-name="PerformanceSection"></rect>
-							<path d="M14708.5 912.0 L15032.5 912.0" fill="none" data-name="PerformanceSection"></path>
-							<path d="M14708.5 958.0 L15032.5 958.0" fill="none" data-name="PerformanceSection"></path>
-						</g>
-						<g transform="translate(14708.5, 881)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PerformanceSection">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="PerformanceSection">PerformanceSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14708.5, 912)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+minimumRatio: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+maximum: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14708.5, 958)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PerformanceSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PerformanceSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="PerformanceSection">+Widget buildContent()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PerformanceSection">+String getPowerLevelDescription()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PerformanceSection">+int getCountableObservationAmount()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionContainer">
-							<rect x="9688.8" y="508.0" height="183.0" width="319.0" data-name="ReportSectionContainer"></rect>
-							<path d="M9688.8 539.0 L10007.8 539.0" fill="none" data-name="ReportSectionContainer"></path>
-							<path d="M9688.8 615.0 L10007.8 615.0" fill="none" data-name="ReportSectionContainer"></path>
-						</g>
-						<g transform="translate(9688.75, 508)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionContainer">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionContainer">ReportSectionContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9688.75, 539)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionContainer">+section: ReportSection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionContainer">+subject: StudySubject</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionContainer">+primary: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionContainer">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9688.75, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionContainer">+ReportSectionWidget buildContents()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionContainer">+dynamic ()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionContainer">+List&lt;Widget&gt; buildPrimaryHeader()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionContainer">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="15072.5" y="934.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(15072.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Settings">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Settings">
-							<rect x="10318.3" y="181.0" height="31.0" width="80.0" data-name="Settings"></rect>
-						</g>
-						<g transform="translate(10318.25, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Settings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Settings">
-								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="Settings">Settings</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OptOutAlertDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OptOutAlertDialog">
-							<rect x="4765.0" y="553.0" height="93.0" width="207.0" data-name="OptOutAlertDialog"></rect>
-							<path d="M4765.0 584.0 L4972.0 584.0" fill="none" data-name="OptOutAlertDialog"></path>
-							<path d="M4765.0 615.0 L4972.0 615.0" fill="none" data-name="OptOutAlertDialog"></path>
-						</g>
-						<g transform="translate(4765, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptOutAlertDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptOutAlertDialog">OptOutAlertDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4765, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptOutAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptOutAlertDialog">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4765, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptOutAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptOutAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptOutAlertDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DeleteAlertDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DeleteAlertDialog">
-							<rect x="5012.0" y="553.0" height="93.0" width="207.0" data-name="DeleteAlertDialog"></rect>
-							<path d="M5012.0 584.0 L5219.0 584.0" fill="none" data-name="DeleteAlertDialog"></path>
-							<path d="M5012.0 615.0 L5219.0 615.0" fill="none" data-name="DeleteAlertDialog"></path>
-						</g>
-						<g transform="translate(5012, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DeleteAlertDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="DeleteAlertDialog">DeleteAlertDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5012, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DeleteAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="DeleteAlertDialog">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5012, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DeleteAlertDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DeleteAlertDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="DeleteAlertDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskBox">
-							<rect x="11944.0" y="553.5" height="92.0" width="292.0" data-name="TaskBox"></rect>
-							<path d="M11944.0 584.5 L12236.0 584.5" fill="none" data-name="TaskBox"></path>
-						</g>
-						<g transform="translate(11944, 553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskBox">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskBox">TaskBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11944, 584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskBox">+taskInstance: TaskInstance</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskBox">+icon: Icon</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskBox">+onCompleted: dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Icon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Icon">
-							<rect x="15246.3" y="934.5" height="31.0" width="50.0" data-name="Icon"></rect>
-						</g>
-						<g transform="translate(15246.25, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Icon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Icon">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Icon">Icon</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="15336.3" y="934.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(15336.25, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ProgressRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ProgressRow">
-							<rect x="5259.0" y="568.5" height="62.0" width="207.0" data-name="ProgressRow"></rect>
-							<path d="M5259.0 599.5 L5466.0 599.5" fill="none" data-name="ProgressRow"></path>
-						</g>
-						<g transform="translate(5259, 568.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProgressRow">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProgressRow">ProgressRow</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5259, 599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ProgressRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ProgressRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="ProgressRow">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionSegment">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionSegment">
-							<rect x="14353.8" y="508.0" height="183.0" width="271.0" data-name="InterventionSegment"></rect>
-							<path d="M14353.8 539.0 L14624.8 539.0" fill="none" data-name="InterventionSegment"></path>
-							<path d="M14353.8 645.0 L14624.8 645.0" fill="none" data-name="InterventionSegment"></path>
-						</g>
-						<g transform="translate(14353.75, 508)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionSegment">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionSegment">InterventionSegment</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14353.75, 539)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+percentCompleted: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionSegment">+percentMissed: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionSegment">+isCurrent: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionSegment">+isFuture: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionSegment">+phaseDuration: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14353.75, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionSegment">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionSegment">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionSegment">+List&lt;Widget&gt; buildSeparators()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionSegment">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskOverview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskOverview">
-							<rect x="5506.0" y="553.5" height="92.0" width="321.0" data-name="TaskOverview"></rect>
-							<path d="M5506.0 584.5 L5827.0 584.5" fill="none" data-name="TaskOverview"></path>
-						</g>
-						<g transform="translate(5506, 553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskOverview">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskOverview">TaskOverview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5506, 584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskOverview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskOverview">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskOverview">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TaskOverview">+scheduleToday: List&lt;TaskInstance&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TaskOverview">+interventionIcon: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactScreen">
-							<rect x="10438.3" y="181.0" height="31.0" width="133.0" data-name="ContactScreen"></rect>
-						</g>
-						<g transform="translate(10438.25, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactScreen">
-								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactScreen">ContactScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactWidget">
-							<rect x="12531.8" y="530.5" height="138.0" width="165.0" data-name="ContactWidget"></rect>
-							<path d="M12531.8 561.5 L12696.8 561.5" fill="none" data-name="ContactWidget"></path>
-							<path d="M12531.8 637.5 L12696.8 637.5" fill="none" data-name="ContactWidget"></path>
-						</g>
-						<g transform="translate(12531.75, 530.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactWidget">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactWidget">ContactWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12531.75, 561.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+contact: Contact?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactWidget">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactWidget">+subtitle: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactWidget">+color: Color</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12531.75, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Contact">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Contact">
-							<rect x="15543.3" y="934.5" height="31.0" width="77.0" data-name="Contact"></rect>
-						</g>
-						<g transform="translate(15543.25, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Contact">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Contact">
-								<text x="30.5" y="13.5" stroke="none" text-anchor="middle" data-name="Contact">Contact</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItem">
-							<rect x="11394.0" y="515.5" height="168.0" width="223.0" data-name="ContactItem"></rect>
-							<path d="M11394.0 546.5 L11617.0 546.5" fill="none" data-name="ContactItem"></path>
-							<path d="M11394.0 637.5 L11617.0 637.5" fill="none" data-name="ContactItem"></path>
-						</g>
-						<g transform="translate(11394, 515.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItem">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItem">ContactItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11394, 546.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+iconData: IconData</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+itemName: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItem">+itemValue: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItem">+type: ContactItemType?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItem">+iconColor: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11394, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItem">+dynamic launchContact()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ContactItemType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ContactItemType">
-							<rect x="15660.3" y="889.0" height="122.0" width="332.0" data-name="ContactItemType"></rect>
-							<path d="M15660.3 920.0 L15992.3 920.0" fill="none" data-name="ContactItemType"></path>
-						</g>
-						<g transform="translate(15660.25, 889)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ContactItemType">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="ContactItemType">ContactItemType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15660.25, 920)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ContactItemType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ContactItemType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ContactItemType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+values: List&lt;ContactItemType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+website: ContactItemType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+email: ContactItemType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ContactItemType">&lt;static&gt;+phone: ContactItemType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="18553.5" y="584.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(18553.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FAQ">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FAQ">
-							<rect x="10611.3" y="165.5" height="62.0" width="136.0" data-name="FAQ"></rect>
-							<path d="M10611.3 196.5 L10747.3 196.5" fill="none" data-name="FAQ"></path>
-						</g>
-						<g transform="translate(10611.25, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FAQ">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="FAQ">FAQ</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10611.25, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FAQ">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FAQ">
-								<text x="0.0" y="13.5" stroke="none" data-name="FAQ">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Entry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Entry">
-							<rect x="12276.0" y="561.0" height="77.0" width="188.0" data-name="Entry"></rect>
-							<path d="M12276.0 592.0 L12464.0 592.0" fill="none" data-name="Entry"></path>
-						</g>
-						<g transform="translate(12276, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Entry">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="Entry">Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12276, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Entry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Entry">
-								<text x="0.0" y="13.5" stroke="none" data-name="Entry">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Entry">+children: List&lt;Entry&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EntryItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EntryItem">
-							<rect x="12280.5" y="142.5" height="108.0" width="179.0" data-name="EntryItem"></rect>
-							<path d="M12280.5 173.5 L12459.5 173.5" fill="none" data-name="EntryItem"></path>
-							<path d="M12280.5 204.5 L12459.5 204.5" fill="none" data-name="EntryItem"></path>
-						</g>
-						<g transform="translate(12280.5, 142.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EntryItem">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="EntryItem">EntryItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12280.5, 173.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">+entry: Entry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12280.5, 204.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EntryItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EntryItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="EntryItem">-Widget _buildTiles()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EntryItem">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="12499.5" y="165.5" height="62.0" width="159.0" data-name="DashboardScreen"></rect>
-							<path d="M12499.5 196.5 L12658.5 196.5" fill="none" data-name="DashboardScreen"></path>
-						</g>
-						<g transform="translate(12499.5, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="71.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12499.5, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+error: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OverflowMenuItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OverflowMenuItem">
-							<rect x="11657.0" y="546.0" height="107.0" width="247.0" data-name="OverflowMenuItem"></rect>
-							<path d="M11657.0 577.0 L11904.0 577.0" fill="none" data-name="OverflowMenuItem"></path>
-						</g>
-						<g transform="translate(11657, 546)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OverflowMenuItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OverflowMenuItem">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="OverflowMenuItem">OverflowMenuItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11657, 577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OverflowMenuItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OverflowMenuItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="OverflowMenuItem">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OverflowMenuItem">+icon: IconData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="OverflowMenuItem">+routeName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="OverflowMenuItem">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="16483.0" y="934.5" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
-						</g>
-						<g transform="translate(16483, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
-								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFinishedPlaceholder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFinishedPlaceholder">
-							<rect x="12698.5" y="150.0" height="93.0" width="222.0" data-name="StudyFinishedPlaceholder"></rect>
-							<path d="M12698.5 181.0 L12920.5 181.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
-							<path d="M12698.5 212.0 L12920.5 212.0" fill="none" data-name="StudyFinishedPlaceholder"></path>
-						</g>
-						<g transform="translate(12698.5, 150)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFinishedPlaceholder">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFinishedPlaceholder">StudyFinishedPlaceholder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12698.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">&lt;static&gt;+space: SizedBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12698.5, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFinishedPlaceholder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFinishedPlaceholder">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFinishedPlaceholder">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SizedBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SizedBox">
-							<rect x="12764.5" y="584.0" height="31.0" width="90.0" data-name="SizedBox"></rect>
-						</g>
-						<g transform="translate(12764.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SizedBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SizedBox">
-								<text x="37.0" y="13.5" stroke="none" text-anchor="middle" data-name="SizedBox">SizedBox</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTaskWidget">
-							<rect x="12960.5" y="158.0" height="77.0" width="313.0" data-name="QuestionnaireTaskWidget"></rect>
-							<path d="M12960.5 189.0 L13273.5 189.0" fill="none" data-name="QuestionnaireTaskWidget"></path>
-						</g>
-						<g transform="translate(12960.5, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTaskWidget">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTaskWidget">QuestionnaireTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12960.5, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireTaskWidget">+task: QuestionnaireTask</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireTaskWidget">+completionPeriod: CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireTask">
-							<rect x="12964.5" y="584.0" height="31.0" width="165.0" data-name="QuestionnaireTask"></rect>
-						</g>
-						<g transform="translate(12964.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireTask">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireTask">QuestionnaireTask</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CompletionPeriod">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CompletionPeriod">
-							<rect x="13228.3" y="584.0" height="31.0" width="156.0" data-name="CompletionPeriod"></rect>
-						</g>
-						<g transform="translate(13228.25, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CompletionPeriod">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CompletionPeriod">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="CompletionPeriod">CompletionPeriod</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskScreen">
-							<rect x="6150.0" y="553.0" height="93.0" width="377.0" data-name="TaskScreen"></rect>
-							<path d="M6150.0 584.0 L6527.0 584.0" fill="none" data-name="TaskScreen"></path>
-							<path d="M6150.0 615.0 L6527.0 615.0" fill="none" data-name="TaskScreen"></path>
-						</g>
-						<g transform="translate(6150, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskScreen">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="TaskScreen">TaskScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6150, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">+taskInstance: TaskInstance</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6150, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TaskScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TaskScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="TaskScreen">&lt;static&gt;+MaterialPageRoute&lt;bool&gt; routeFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CheckmarkTaskWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTaskWidget">
-							<rect x="13403.5" y="158.0" height="77.0" width="323.0" data-name="CheckmarkTaskWidget"></rect>
-							<path d="M13403.5 189.0 L13726.5 189.0" fill="none" data-name="CheckmarkTaskWidget"></path>
-						</g>
-						<g transform="translate(13403.5, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTaskWidget">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTaskWidget">CheckmarkTaskWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13403.5, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CheckmarkTaskWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CheckmarkTaskWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="CheckmarkTaskWidget">+task: CheckmarkTask?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CheckmarkTaskWidget">+completionPeriod: CompletionPeriod?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CheckmarkTask">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CheckmarkTask">
-							<rect x="14170.8" y="584.0" height="31.0" width="143.0" data-name="CheckmarkTask"></rect>
-						</g>
-						<g transform="translate(14170.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CheckmarkTask">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CheckmarkTask">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="CheckmarkTask">CheckmarkTask</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppOutdatedScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppOutdatedScreen">
-							<rect x="13766.5" y="165.5" height="62.0" width="176.0" data-name="AppOutdatedScreen"></rect>
-							<path d="M13766.5 196.5 L13942.5 196.5" fill="none" data-name="AppOutdatedScreen"></path>
-						</g>
-						<g transform="translate(13766.5, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppOutdatedScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppOutdatedScreen">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppOutdatedScreen">AppOutdatedScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13766.5, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppOutdatedScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppOutdatedScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppOutdatedScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TermsScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TermsScreen">
-							<rect x="13982.5" y="181.0" height="31.0" width="121.0" data-name="TermsScreen"></rect>
-						</g>
-						<g transform="translate(13982.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TermsScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TermsScreen">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="TermsScreen">TermsScreen</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LegalSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LegalSection">
-							<rect x="18654.5" y="500.5" height="198.0" width="290.0" data-name="LegalSection"></rect>
-							<path d="M18654.5 531.5 L18944.5 531.5" fill="none" data-name="LegalSection"></path>
-							<path d="M18654.5 667.5 L18944.5 667.5" fill="none" data-name="LegalSection"></path>
-						</g>
-						<g transform="translate(18654.5, 500.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LegalSection">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="LegalSection">LegalSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18654.5, 531.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegalSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegalSection">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LegalSection">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LegalSection">+icon: Icon?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="LegalSection">+pdfUrl: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="LegalSection">+pdfUrlLabel: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="LegalSection">+acknowledgment: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="LegalSection">+isChecked: bool?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="LegalSection">+onChange: void Function(bool?)?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18654.5, 667.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LegalSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LegalSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LegalSection">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(bool?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(bool?)?">
-							<rect x="19140.0" y="934.5" height="31.0" width="188.0" data-name="void Function(bool?)?"></rect>
-						</g>
-						<g transform="translate(19140, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(bool?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(bool?)?">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(bool?)?">void Function(bool?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFrameHelper">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameHelper">
-							<rect x="14143.5" y="158.0" height="77.0" width="224.0" data-name="IFrameHelper"></rect>
-							<path d="M14143.5 189.0 L14367.5 189.0" fill="none" data-name="IFrameHelper"></path>
-						</g>
-						<g transform="translate(14143.5, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameHelper">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameHelper">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameHelper">IFrameHelper</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14143.5, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFrameHelper">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFrameHelper">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFrameHelper">+void postRouteFinished()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFrameHelper">+void listen()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LoadingScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoadingScreen">
-							<rect x="14407.5" y="158.0" height="77.0" width="338.0" data-name="LoadingScreen"></rect>
-							<path d="M14407.5 189.0 L14745.5 189.0" fill="none" data-name="LoadingScreen"></path>
-						</g>
-						<g transform="translate(14407.5, 158)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoadingScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoadingScreen">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="LoadingScreen">LoadingScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14407.5, 189)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoadingScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoadingScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoadingScreen">+sessionString: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LoadingScreen">+queryParameters: Map&lt;String, String&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AboutScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AboutScreen">
-							<rect x="14785.5" y="165.5" height="62.0" width="136.0" data-name="AboutScreen"></rect>
-							<path d="M14785.5 196.5 L14921.5 196.5" fill="none" data-name="AboutScreen"></path>
-						</g>
-						<g transform="translate(14785.5, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AboutScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AboutScreen">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="AboutScreen">AboutScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14785.5, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AboutScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AboutScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="AboutScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Preview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Preview">
-							<rect x="10676.8" y="433.0" height="333.0" width="338.0" data-name="Preview"></rect>
-							<path d="M10676.8 464.0 L11014.8 464.0" fill="none" data-name="Preview"></path>
-							<path d="M10676.8 585.0 L11014.8 585.0" fill="none" data-name="Preview"></path>
-						</g>
-						<g transform="translate(10676.75, 433)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Preview">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="Preview">Preview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10676.75, 464)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Preview">
-								<text x="0.0" y="13.5" stroke="none" data-name="Preview">+queryParameters: Map&lt;String, String&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Preview">+appLanguage: AppLanguage</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Preview">+selectedRoute: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Preview">+extra: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Preview">+study: Study?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Preview">+selectedStudyObjectId: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Preview">+subject: StudySubject?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10676.75, 585)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Preview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Preview">
-								<text x="0.0" y="13.5" stroke="none" data-name="Preview">+bool hasRoute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Preview">+void handleQueries()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Preview">+dynamic init()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Preview">+dynamic handleAuthorization()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Preview">+dynamic runCommands()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Preview">+String? getSelectedRoute()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Preview">+bool containsQuery()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Preview">+bool containsQueryPair()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Preview">+dynamic getStudySubject()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Preview">-dynamic _createFakeSubject()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Preview">+List&lt;String&gt; getInterventionIds()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppLanguage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppLanguage">
-							<rect x="19368.0" y="934.5" height="31.0" width="127.0" data-name="AppLanguage"></rect>
-						</g>
-						<g transform="translate(19368, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppLanguage">
-								<text x="55.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppLanguage">AppLanguage</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WelcomeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WelcomeScreen">
-							<rect x="14961.5" y="165.5" height="62.0" width="145.0" data-name="WelcomeScreen"></rect>
-							<path d="M14961.5 196.5 L15106.5 196.5" fill="none" data-name="WelcomeScreen"></path>
-						</g>
-						<g transform="translate(14961.5, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WelcomeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WelcomeScreen">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="WelcomeScreen">WelcomeScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14961.5, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WelcomeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WelcomeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="WelcomeScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ThemeConfig">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeConfig">
-							<rect x="15146.5" y="165.5" height="62.0" width="399.0" data-name="ThemeConfig"></rect>
-							<path d="M15146.5 196.5 L15545.5 196.5" fill="none" data-name="ThemeConfig"></path>
-						</g>
-						<g transform="translate(15146.5, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeConfig">
-								<text x="191.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeConfig">ThemeConfig</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15146.5, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+SliderThemeData coloredSliderTheme()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="HtmlText">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlText">
-							<rect x="15585.5" y="135.0" height="123.0" width="156.0" data-name="HtmlText"></rect>
-							<path d="M15585.5 166.0 L15741.5 166.0" fill="none" data-name="HtmlText"></path>
-							<path d="M15585.5 227.0 L15741.5 227.0" fill="none" data-name="HtmlText"></path>
-						</g>
-						<g transform="translate(15585.5, 135)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlText">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlText">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlText">HtmlText</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15585.5, 166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlText">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlText">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlText">+text: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="HtmlText">+style: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="HtmlText">+centered: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15585.5, 227)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlText">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlText">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlText">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TextStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
-							<rect x="15619.0" y="584.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
-						</g>
-						<g transform="translate(15619, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
-								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoundCheckbox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoundCheckbox">
-							<rect x="15781.5" y="142.5" height="108.0" width="323.0" data-name="RoundCheckbox"></rect>
-							<path d="M15781.5 173.5 L16104.5 173.5" fill="none" data-name="RoundCheckbox"></path>
-							<path d="M15781.5 219.5 L16104.5 219.5" fill="none" data-name="RoundCheckbox"></path>
-						</g>
-						<g transform="translate(15781.5, 142.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoundCheckbox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoundCheckbox">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoundCheckbox">RoundCheckbox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15781.5, 173.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoundCheckbox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoundCheckbox">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoundCheckbox">+onChanged: dynamic Function(bool)?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoundCheckbox">+value: bool?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15781.5, 219.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoundCheckbox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoundCheckbox">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoundCheckbox">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(bool)?">
-							<rect x="15837.5" y="584.0" height="31.0" width="211.0" data-name="dynamic Function(bool)?"></rect>
-						</g>
-						<g transform="translate(15837.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(bool)?">
-								<text x="97.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(bool)?">dynamic Function(bool)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomSlider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomSlider">
-							<rect x="17607.5" y="440.5" height="318.0" width="364.0" data-name="CustomSlider"></rect>
-							<path d="M17607.5 471.5 L17971.5 471.5" fill="none" data-name="CustomSlider"></path>
-							<path d="M17607.5 727.5 L17971.5 727.5" fill="none" data-name="CustomSlider"></path>
-						</g>
-						<g transform="translate(17607.5, 440.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomSlider">
-								<text x="174.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomSlider">CustomSlider</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17607.5, 471.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomSlider">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomSlider">+value: double?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomSlider">+minValue: double?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomSlider">+maxValue: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomSlider">+minorTick: int?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomSlider">+onChanged: dynamic Function(double)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomSlider">+onChangeEnd: dynamic Function(double)?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="CustomSlider">+activeColor: Color?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="CustomSlider">+inactiveColor: Color?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="CustomSlider">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="CustomSlider">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="CustomSlider">+thumbColor: Color?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="CustomSlider">+isColored: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="CustomSlider">+labelValuePrecision: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="CustomSlider">+tickValuePrecision: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="CustomSlider">+linearStep: bool</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="CustomSlider">+steps: AnnotatedScaleQuestion?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17607.5, 727.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomSlider">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomSlider">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(double)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(double)?">
-							<rect x="19535.0" y="934.5" height="31.0" width="231.0" data-name="dynamic Function(double)?"></rect>
-						</g>
-						<g transform="translate(19535, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(double)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(double)?">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(double)?">dynamic Function(double)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AnnotatedScaleQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestion">
-							<rect x="19991.5" y="934.5" height="31.0" width="212.0" data-name="AnnotatedScaleQuestion"></rect>
-						</g>
-						<g transform="translate(19991.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestion">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestion">AnnotatedScaleQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomTrackShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomTrackShape">
-							<rect x="16375.5" y="568.5" height="62.0" width="214.0" data-name="CustomTrackShape"></rect>
-							<path d="M16375.5 599.5 L16589.5 599.5" fill="none" data-name="CustomTrackShape"></path>
-						</g>
-						<g transform="translate(16375.5, 568.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomTrackShape">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomTrackShape">CustomTrackShape</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16375.5, 599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomTrackShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomTrackShape">+Rect getPreferredRect()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoundedRectSliderTrackShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoundedRectSliderTrackShape">
-							<rect x="16350.5" y="181.0" height="31.0" width="264.0" data-name="RoundedRectSliderTrackShape"></rect>
-						</g>
-						<g transform="translate(16350.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoundedRectSliderTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoundedRectSliderTrackShape">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoundedRectSliderTrackShape">RoundedRectSliderTrackShape</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionHeader">
-							<rect x="17722.3" y="120.0" height="153.0" width="316.0" data-name="QuestionHeader"></rect>
-							<path d="M17722.3 151.0 L18038.3 151.0" fill="none" data-name="QuestionHeader"></path>
-							<path d="M17722.3 212.0 L18038.3 212.0" fill="none" data-name="QuestionHeader"></path>
-						</g>
-						<g transform="translate(17722.25, 120)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionHeader">
-								<text x="150.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionHeader">QuestionHeader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17722.25, 151)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionHeader">+prompt: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionHeader">+subtitle: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionHeader">+rationale: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17722.25, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionHeader">-List&lt;Widget&gt; _buildSubtitle()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionHeader">-List&lt;Widget&gt; _buildRationaleButton()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionHeader">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireWidget">
-							<rect x="18078.3" y="143.0" height="107.0" width="318.0" data-name="QuestionnaireWidget"></rect>
-							<path d="M18078.3 174.0 L18396.3 174.0" fill="none" data-name="QuestionnaireWidget"></path>
-						</g>
-						<g transform="translate(18078.25, 143)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireWidget">
-								<text x="151.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireWidget">QuestionnaireWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18078.25, 174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireWidget">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireWidget">+header: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireWidget">+footer: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionnaireWidget">+questions: List&lt;Question&lt;dynamic&gt;&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="HtmlTextBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlTextBox">
-							<rect x="18436.3" y="150.0" height="93.0" width="136.0" data-name="HtmlTextBox"></rect>
-							<path d="M18436.3 181.0 L18572.3 181.0" fill="none" data-name="HtmlTextBox"></path>
-							<path d="M18436.3 212.0 L18572.3 212.0" fill="none" data-name="HtmlTextBox"></path>
-						</g>
-						<g transform="translate(18436.25, 150)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlTextBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlTextBox">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlTextBox">HtmlTextBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18436.25, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlTextBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlTextBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlTextBox">+text: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18436.25, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlTextBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlTextBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlTextBox">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BooleanQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestionWidget">
-							<rect x="18984.5" y="561.0" height="77.0" width="403.0" data-name="BooleanQuestionWidget"></rect>
-							<path d="M18984.5 592.0 L19387.5 592.0" fill="none" data-name="BooleanQuestionWidget"></path>
-						</g>
-						<g transform="translate(18984.5, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestionWidget">BooleanQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18984.5, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BooleanQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BooleanQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="BooleanQuestionWidget">+question: BooleanQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BooleanQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BooleanQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestion">
-							<rect x="20243.5" y="934.5" height="31.0" width="152.0" data-name="BooleanQuestion"></rect>
-						</g>
-						<g transform="translate(20243.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestion">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestion">BooleanQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-							<rect x="20652.8" y="934.5" height="31.0" width="321.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(20652.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionWidget">
-							<rect x="22023.3" y="165.5" height="62.0" width="149.0" data-name="QuestionWidget"></rect>
-							<path d="M22023.3 196.5 L22172.3 196.5" fill="none" data-name="QuestionWidget"></path>
-						</g>
-						<g transform="translate(22023.25, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionWidget">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionWidget">QuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22023.25, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionWidget">+subtitle: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionWidget">
-							<rect x="21627.3" y="561.0" height="77.0" width="403.0" data-name="FreeTextQuestionWidget"></rect>
-							<path d="M21627.3 592.0 L22030.3 592.0" fill="none" data-name="FreeTextQuestionWidget"></path>
-						</g>
-						<g transform="translate(21627.25, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionWidget">FreeTextQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21627.25, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionWidget">+question: FreeTextQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestion">
-							<rect x="21013.8" y="934.5" height="31.0" width="157.0" data-name="FreeTextQuestion"></rect>
-						</g>
-						<g transform="translate(21013.75, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestion">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestion">FreeTextQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionWidget">
-							<rect x="22070.3" y="561.0" height="77.0" width="403.0" data-name="ScaleQuestionWidget"></rect>
-							<path d="M22070.3 592.0 L22473.3 592.0" fill="none" data-name="ScaleQuestionWidget"></path>
-						</g>
-						<g transform="translate(22070.25, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionWidget">ScaleQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22070.25, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionWidget">+question: ScaleQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestion">
-							<rect x="21340.3" y="934.5" height="31.0" width="131.0" data-name="ScaleQuestion"></rect>
-						</g>
-						<g transform="translate(21340.25, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestion">
-								<text x="57.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestion">ScaleQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VisualAnalogueQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestionWidget">
-							<rect x="22513.3" y="561.0" height="77.0" width="403.0" data-name="VisualAnalogueQuestionWidget"></rect>
-							<path d="M22513.3 592.0 L22916.3 592.0" fill="none" data-name="VisualAnalogueQuestionWidget"></path>
-						</g>
-						<g transform="translate(22513.25, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestionWidget">VisualAnalogueQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22513.25, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="VisualAnalogueQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="VisualAnalogueQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+question: VisualAnalogueQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VisualAnalogueQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestion">
-							<rect x="21627.5" y="934.5" height="31.0" width="210.0" data-name="VisualAnalogueQuestion"></rect>
-						</g>
-						<g transform="translate(21627.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestion">
-								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestion">VisualAnalogueQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionWidget">
-							<rect x="23026.0" y="546.0" height="107.0" width="393.0" data-name="ChoiceQuestionWidget"></rect>
-							<path d="M23026.0 577.0 L23419.0 577.0" fill="none" data-name="ChoiceQuestionWidget"></path>
-						</g>
-						<g transform="translate(23026, 546)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionWidget">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionWidget">ChoiceQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23026, 577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionWidget">+question: ChoiceQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionWidget">+multiSelectionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionWidget">+subtitle: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestion">
-							<rect x="21877.5" y="934.5" height="31.0" width="142.0" data-name="ChoiceQuestion"></rect>
-						</g>
-						<g transform="translate(21877.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestion">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestion">ChoiceQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-							<rect x="22059.5" y="934.5" height="31.0" width="311.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)"></rect>
-						</g>
-						<g transform="translate(22059.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-								<text x="147.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)">dynamic Function(Answer&lt;dynamic&gt;)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AnnotatedScaleQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestionWidget">
-							<rect x="19934.5" y="561.0" height="77.0" width="403.0" data-name="AnnotatedScaleQuestionWidget"></rect>
-							<path d="M19934.5 592.0 L20337.5 592.0" fill="none" data-name="AnnotatedScaleQuestionWidget"></path>
-						</g>
-						<g transform="translate(19934.5, 561)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestionWidget">AnnotatedScaleQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19934.5, 592)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AnnotatedScaleQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+question: AnnotatedScaleQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionContainer">
-							<rect x="19189.0" y="150.5" height="92.0" width="422.0" data-name="QuestionContainer"></rect>
-							<path d="M19189.0 181.5 L19611.0 181.5" fill="none" data-name="QuestionContainer"></path>
-						</g>
-						<g transform="translate(19189, 150.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionContainer">
-								<text x="203.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionContainer">QuestionContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19189, 181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionContainer">+onDone: dynamic Function(Answer&lt;dynamic&gt;, int)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionContainer">+question: Question&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionContainer">+index: int</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-							<rect x="19427.5" y="584.0" height="31.0" width="340.0" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)"></rect>
-						</g>
-						<g transform="translate(19427.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">dynamic Function(Answer&lt;dynamic&gt;, int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Question">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Question">
-							<rect x="19807.5" y="584.0" height="31.0" width="87.0" data-name="Question"></rect>
-						</g>
-						<g transform="translate(19807.5, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Question">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Question">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="Question">Question</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionCard">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionCard">
-							<rect x="17029.5" y="515.5" height="168.0" width="247.0" data-name="InterventionCard"></rect>
-							<path d="M17029.5 546.5 L17276.5 546.5" fill="none" data-name="InterventionCard"></path>
-							<path d="M17029.5 652.5 L17276.5 652.5" fill="none" data-name="InterventionCard"></path>
-						</g>
-						<g transform="translate(17029.5, 515.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionCard">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionCard">InterventionCard</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17029.5, 546.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCard">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionCard">+selected: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionCard">+showCheckbox: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionCard">+showTasks: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionCard">+showDescription: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionCard">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17029.5, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCard">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionCardTitle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionCardTitle">
-							<rect x="17316.5" y="523.0" height="153.0" width="251.0" data-name="InterventionCardTitle"></rect>
-							<path d="M17316.5 554.0 L17567.5 554.0" fill="none" data-name="InterventionCardTitle"></path>
-							<path d="M17316.5 645.0 L17567.5 645.0" fill="none" data-name="InterventionCardTitle"></path>
-						</g>
-						<g transform="translate(17316.5, 523)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionCardTitle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionCardTitle">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionCardTitle">InterventionCardTitle</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17316.5, 554)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardTitle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardTitle">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardTitle">+intervention: Intervention?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionCardTitle">+selected: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionCardTitle">+showCheckbox: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionCardTitle">+showDescriptionButton: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionCardTitle">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17316.5, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardTitle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardTitle">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardTitle">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionCardDescription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionCardDescription">
-							<rect x="14664.8" y="553.0" height="93.0" width="237.0" data-name="InterventionCardDescription"></rect>
-							<path d="M14664.8 584.0 L14901.8 584.0" fill="none" data-name="InterventionCardDescription"></path>
-							<path d="M14664.8 615.0 L14901.8 615.0" fill="none" data-name="InterventionCardDescription"></path>
-						</g>
-						<g transform="translate(14664.75, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionCardDescription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionCardDescription">
-								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionCardDescription">InterventionCardDescription</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14664.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardDescription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardDescription">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardDescription">+intervention: Intervention</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14664.75, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardDescription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardDescription">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardDescription">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_TaskList">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_TaskList">
-							<rect x="22212.3" y="142.5" height="108.0" width="258.0" data-name="_TaskList"></rect>
-							<path d="M22212.3 173.5 L22470.3 173.5" fill="none" data-name="_TaskList"></path>
-							<path d="M22212.3 204.5 L22470.3 204.5" fill="none" data-name="_TaskList"></path>
-						</g>
-						<g transform="translate(22212.25, 142.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_TaskList">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_TaskList">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="_TaskList">_TaskList</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22212.25, 173.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_TaskList">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_TaskList">
-								<text x="0.0" y="13.5" stroke="none" data-name="_TaskList">+tasks: List&lt;InterventionTask&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22212.25, 204.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_TaskList">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_TaskList">
-								<text x="0.0" y="13.5" stroke="none" data-name="_TaskList">+String scheduleString()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_TaskList">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SelectableButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SelectableButton">
-							<rect x="16088.5" y="523.0" height="153.0" width="247.0" data-name="SelectableButton"></rect>
-							<path d="M16088.5 554.0 L16335.5 554.0" fill="none" data-name="SelectableButton"></path>
-							<path d="M16088.5 615.0 L16335.5 615.0" fill="none" data-name="SelectableButton"></path>
-						</g>
-						<g transform="translate(16088.5, 523)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SelectableButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SelectableButton">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="SelectableButton">SelectableButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16088.5, 554)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SelectableButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SelectableButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SelectableButton">+child: Widget</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SelectableButton">+selected: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SelectableButton">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16088.5, 615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SelectableButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SelectableButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SelectableButton">-Color _getFillColor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SelectableButton">-Color _getTextColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SelectableButton">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTile">
-							<rect x="20821.3" y="523.0" height="153.0" width="326.0" data-name="StudyTile"></rect>
-							<path d="M20821.3 554.0 L21147.3 554.0" fill="none" data-name="StudyTile"></path>
-							<path d="M20821.3 645.0 L21147.3 645.0" fill="none" data-name="StudyTile"></path>
-						</g>
-						<g transform="translate(20821.25, 523)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTile">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTile">StudyTile</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20821.25, 554)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTile">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTile">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyTile">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyTile">+onTap: dynamic Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyTile">+contentPadding: EdgeInsetsGeometry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20821.25, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTile">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EdgeInsetsGeometry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsetsGeometry">
-							<rect x="22410.5" y="934.5" height="31.0" width="182.0" data-name="EdgeInsetsGeometry"></rect>
-						</g>
-						<g transform="translate(22410.5, 934.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="EdgeInsetsGeometry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsetsGeometry">
-								<text x="83.0" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsetsGeometry">EdgeInsetsGeometry</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BottomOnboardingNavigation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BottomOnboardingNavigation">
-							<rect x="13882.8" y="500.5" height="198.0" width="248.0" data-name="BottomOnboardingNavigation"></rect>
-							<path d="M13882.8 531.5 L14130.8 531.5" fill="none" data-name="BottomOnboardingNavigation"></path>
-							<path d="M13882.8 667.5 L14130.8 667.5" fill="none" data-name="BottomOnboardingNavigation"></path>
-						</g>
-						<g transform="translate(13882.75, 500.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BottomOnboardingNavigation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BottomOnboardingNavigation">
-								<text x="116.0" y="13.5" stroke="none" text-anchor="middle" data-name="BottomOnboardingNavigation">BottomOnboardingNavigation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13882.75, 531.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BottomOnboardingNavigation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BottomOnboardingNavigation">
-								<text x="0.0" y="13.5" stroke="none" data-name="BottomOnboardingNavigation">+onBack: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BottomOnboardingNavigation">+onNext: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BottomOnboardingNavigation">+backLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BottomOnboardingNavigation">+nextLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BottomOnboardingNavigation">+hideNext: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BottomOnboardingNavigation">+nextIcon: Icon?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="BottomOnboardingNavigation">+backIcon: Icon?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="BottomOnboardingNavigation">+progress: Widget?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13882.75, 667.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BottomOnboardingNavigation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BottomOnboardingNavigation">
-								<text x="0.0" y="13.5" stroke="none" data-name="BottomOnboardingNavigation">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Routes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Routes">
-							<rect x="22510.3" y="0.0" height="393.0" width="366.0" data-name="Routes"></rect>
-							<path d="M22510.3 31.0 L22876.3 31.0" fill="none" data-name="Routes"></path>
-							<path d="M22510.3 347.0 L22876.3 347.0" fill="none" data-name="Routes"></path>
-						</g>
-						<g transform="translate(22510.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Routes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Routes">
-								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="Routes">Routes</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22510.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Routes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Routes">
-								<text x="0.0" y="13.5" stroke="none" data-name="Routes">&lt;static&gt;+loading: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Routes">&lt;static&gt;+preview: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Routes">&lt;static&gt;+appOutdated: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Routes">&lt;static&gt;+dashboard: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Routes">&lt;static&gt;+welcome: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Routes">&lt;static&gt;+about: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Routes">&lt;static&gt;+terms: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Routes">&lt;static&gt;+studySelection: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Routes">&lt;static&gt;+studyOverview: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Routes">&lt;static&gt;+interventionSelection: String</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Routes">&lt;static&gt;+journey: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="Routes">&lt;static&gt;+consent: String</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="Routes">&lt;static&gt;+kickoff: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="Routes">&lt;static&gt;+contact: String</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="Routes">&lt;static&gt;+faq: String</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="Routes">&lt;static&gt;+appSettings: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="Routes">&lt;static&gt;+questionnaire: String</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="Routes">&lt;static&gt;+reportHistory: String</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="Routes">&lt;static&gt;+reportDetails: String</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="Routes">&lt;static&gt;+performanceDetails: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22510.25, 347)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Routes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Routes">
-								<text x="0.0" y="13.5" stroke="none" data-name="Routes">&lt;static&gt;+Route&lt;dynamic&gt; unknownRoute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Routes">&lt;static&gt;+Route&lt;dynamic&gt;? generateRoute()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/util/uml.svg b/docs/uml/app/lib/util/uml.svg
deleted file mode 100644
index 67876f367..000000000
--- a/docs/uml/app/lib/util/uml.svg
+++ /dev/null
@@ -1,448 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2730.0" height="507.0" viewbox="0 0 2730 507" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudyNotification
-	  |
-	  +taskInstance: TaskInstance;
-	  +date: DateTime
-	]
-	
-	[StudyNotification]o-[TaskInstance]
-	
-	[GroupedIterable
-	  |
-	  +data: Map&lt;K, Iterable&lt;V&gt;&gt;;
-	  +iterator: Iterator&lt;MapEntry&lt;K, Iterable&lt;V&gt;&gt;&gt;
-	  |
-	  +Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregate();
-	  +Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregateWithKey()
-	]
-	
-	[Iterable]&lt;:-[GroupedIterable]
-	
-	[TemporaryStorageHandler
-	  |
-	  &lt;static&gt;-_stagingBaseNamePrefix: String;
-	  &lt;static&gt;-_audioFileType: String;
-	  &lt;static&gt;-_imageFileType: String;
-	  -_userId: String;
-	  -_studyId: String
-	  |
-	  -String _buildFileName();
-	  &lt;static&gt;-dynamic _getMultimodalTempDirectory();
-	  &lt;static&gt;-dynamic _getMultimodalUploadDirectory();
-	  &lt;static&gt;+dynamic moveStagingFileToUploadDirectory();
-	  &lt;static&gt;+dynamic getFutureBlobFiles();
-	  +dynamic getStagingAudio();
-	  +dynamic getStagingImage();
-	  &lt;static&gt;+dynamic deleteAllStagingFiles()
-	]
-	
-	[Cache
-	  |
-	  &lt;static&gt;+isSynchronizing: bool
-	  |
-	  &lt;static&gt;+dynamic storeSubject();
-	  &lt;static&gt;+dynamic loadSubject();
-	  &lt;static&gt;+dynamic storeAnalytics();
-	  &lt;static&gt;+dynamic loadAnalytics();
-	  &lt;static&gt;+dynamic delete();
-	  &lt;static&gt;+dynamic uploadBlobFiles();
-	  &lt;static&gt;+dynamic synchronize()
-	]
-	
-	[NotificationValidators
-	  |
-	  +didNotificationLaunchApp: bool;
-	  +wasNotificationActionHandled: bool;
-	  +wasNotificationActionCompleted: bool
-	]
-	
-	[StudyNotifications
-	  |
-	  +subject: StudySubject?;
-	  +flutterLocalNotificationsPlugin: FlutterLocalNotificationsPlugin;
-	  +context: BuildContext;
-	  +didReceiveLocalNotificationStream: StreamController&lt;ReceivedNotification&gt;;
-	  +selectNotificationStream: StreamController&lt;String?&gt;;
-	  &lt;static&gt;+validator: NotificationValidators;
-	  &lt;static&gt;+debug: bool;
-	  &lt;static&gt;+scheduledNotificationsDebug: String?
-	  |
-	  &lt;static&gt;+dynamic create();
-	  -dynamic _isAndroidPermissionGranted();
-	  -dynamic _requestPermissions();
-	  -void _configureDidReceiveLocalNotificationSubject();
-	  -void _configureSelectNotificationSubject();
-	  -void _initNotificationsPlugin();
-	  +dynamic handleNotificationResponse()
-	]
-	
-	[StudyNotifications]o-[StudySubject]
-	[StudyNotifications]o-[FlutterLocalNotificationsPlugin]
-	[StudyNotifications]o-[&lt;abstract&gt;BuildContext]
-	[StudyNotifications]o-[StreamController]
-	[StudyNotifications]o-[NotificationValidators]
-	
-	[ReceivedNotification
-	  |
-	  +id: int?;
-	  +title: String?;
-	  +body: String?;
-	  +payload: String?
-	]
-	
-	[AppAnalytics
-	  |
-	  &lt;static&gt;-_userEnabled: bool?;
-	  &lt;static&gt;+keyAnalyticsUserEnable: String;
-	  +context: BuildContext;
-	  +subject: StudySubject?;
-	  &lt;static&gt;+isUserEnabled: dynamic
-	  |
-	  &lt;static&gt;+dynamic init();
-	  &lt;static&gt;+dynamic start();
-	  &lt;static&gt;+void setEnabled();
-	  +dynamic initBasic();
-	  +void initAdvanced()
-	]
-	
-	[AppAnalytics]o-[&lt;abstract&gt;BuildContext]
-	[AppAnalytics]o-[StudySubject]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="507.0" width="2730.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M121.5 201.2 L121.5 308 L121.5 374 L121.5 374.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M126.8 191.8 L121.5 201.2 L116.2 191.8 L121.5 182.5 Z"></path>
-					</g>
-					<path d="M421.0 172.8 L421 308 L421 328 L421.0 328.0 " fill="none"></path>
-					<path d="M426.3 172.8 L421.0 172.8 L415.7 172.8 L421.0 159.5 Z"></path>
-					<path d="M1899.6 205.2 L1342.5 308 L1150.978527607362 374 L1151.0 374.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1909.8 208.7 L1899.6 205.2 L1907.9 198.2 L1918.0 201.8 Z"></path>
-					</g>
-					<path d="M2008.0 298.6 L1994.5 308 L1994.5 374 L1994.5 374.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2018.7 297.7 L2008.0 298.6 L2012.6 288.9 L2023.3 288.0 Z"></path>
-					</g>
-					<path d="M1900.9 290.6 L1861.75 308 L1786.6395705521472 374 L1786.6 374.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1911.6 291.7 L1900.9 290.6 L1907.3 281.9 L1918.0 283.0 Z"></path>
-					</g>
-					<path d="M2236.5 306.7 L2236.5 308 L2236.5 374 L2236.5 374.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2241.5 297.1 L2236.5 306.7 L2230.8 297.5 L2235.8 288.0 Z"></path>
-					</g>
-					<path d="M2494.3 297.4 L2512.5 308 L2512.5 343.5 L2512.5 343.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2488.9 288.1 L2494.3 297.4 L2483.6 297.3 L2478.2 288.0 Z"></path>
-					</g>
-					<path d="M1674.8 260.6 L1749 308 L1765.196319018405 374 L1765.2 374.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1669.8 251.0 L1674.8 260.6 L1664.1 260.0 L1659.1 250.5 Z"></path>
-					</g>
-					<path d="M1307.2 202.9 L976.75 308 L1081.4187116564417 374 L1081.4 374.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1317.7 205.2 L1307.2 202.9 L1314.5 195.0 L1325.0 197.3 Z"></path>
-					</g>
-					<g data-name="StudyNotification">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotification">
-							<rect x="0.0" y="105.5" height="77.0" width="243.0" data-name="StudyNotification"></rect>
-							<path d="M0.0 136.5 L243.0 136.5" fill="none" data-name="StudyNotification"></path>
-						</g>
-						<g transform="translate(0, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotification">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotification">StudyNotification</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotification">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotification">+taskInstance: TaskInstance</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotification">+date: DateTime</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TaskInstance">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TaskInstance">
-							<rect x="60.5" y="374.0" height="31.0" width="122.0" data-name="TaskInstance"></rect>
-						</g>
-						<g transform="translate(60.5, 374)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TaskInstance">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TaskInstance">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="TaskInstance">TaskInstance</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GroupedIterable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GroupedIterable">
-							<rect x="222.5" y="328.0" height="123.0" width="397.0" data-name="GroupedIterable"></rect>
-							<path d="M222.5 359.0 L619.5 359.0" fill="none" data-name="GroupedIterable"></path>
-							<path d="M222.5 405.0 L619.5 405.0" fill="none" data-name="GroupedIterable"></path>
-						</g>
-						<g transform="translate(222.5, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GroupedIterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GroupedIterable">
-								<text x="190.5" y="13.5" stroke="none" text-anchor="middle" data-name="GroupedIterable">GroupedIterable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(222.5, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GroupedIterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GroupedIterable">
-								<text x="0.0" y="13.5" stroke="none" data-name="GroupedIterable">+data: Map&lt;K, Iterable&lt;V&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GroupedIterable">+iterator: Iterator&lt;MapEntry&lt;K, Iterable&lt;V&gt;&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(222.5, 405)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GroupedIterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GroupedIterable">
-								<text x="0.0" y="13.5" stroke="none" data-name="GroupedIterable">+Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GroupedIterable">+Iterable&lt;MapEntry&lt;K, R&gt;&gt; aggregateWithKey()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Iterable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Iterable">
-							<rect x="383.0" y="128.5" height="31.0" width="76.0" data-name="Iterable"></rect>
-						</g>
-						<g transform="translate(383, 128.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Iterable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Iterable">
-								<text x="30.0" y="13.5" stroke="none" text-anchor="middle" data-name="Iterable">Iterable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporaryStorageHandler">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporaryStorageHandler">
-							<rect x="499.0" y="15.0" height="258.0" width="449.0" data-name="TemporaryStorageHandler"></rect>
-							<path d="M499.0 46.0 L948.0 46.0" fill="none" data-name="TemporaryStorageHandler"></path>
-							<path d="M499.0 137.0 L948.0 137.0" fill="none" data-name="TemporaryStorageHandler"></path>
-						</g>
-						<g transform="translate(499, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporaryStorageHandler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporaryStorageHandler">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="TemporaryStorageHandler">TemporaryStorageHandler</text>
-								
-							</g>
-						</g>
-						<g transform="translate(499, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporaryStorageHandler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporaryStorageHandler">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-_stagingBaseNamePrefix: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-_audioFileType: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-_imageFileType: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporaryStorageHandler">-_userId: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporaryStorageHandler">-_studyId: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(499, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporaryStorageHandler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporaryStorageHandler">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporaryStorageHandler">-String _buildFileName()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-dynamic _getMultimodalTempDirectory()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;-dynamic _getMultimodalUploadDirectory()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;+dynamic moveStagingFileToUploadDirectory()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;+dynamic getFutureBlobFiles()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporaryStorageHandler">+dynamic getStagingAudio()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TemporaryStorageHandler">+dynamic getStagingImage()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TemporaryStorageHandler">&lt;static&gt;+dynamic deleteAllStagingFiles()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Cache">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Cache">
-							<rect x="988.0" y="52.5" height="183.0" width="297.0" data-name="Cache"></rect>
-							<path d="M988.0 83.5 L1285.0 83.5" fill="none" data-name="Cache"></path>
-							<path d="M988.0 114.5 L1285.0 114.5" fill="none" data-name="Cache"></path>
-						</g>
-						<g transform="translate(988, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Cache">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Cache">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="Cache">Cache</text>
-								
-							</g>
-						</g>
-						<g transform="translate(988, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Cache">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Cache">
-								<text x="0.0" y="13.5" stroke="none" data-name="Cache">&lt;static&gt;+isSynchronizing: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(988, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Cache">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Cache">
-								<text x="0.0" y="13.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic storeSubject()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic loadSubject()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic storeAnalytics()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic loadAnalytics()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic uploadBlobFiles()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Cache">&lt;static&gt;+dynamic synchronize()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationValidators">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationValidators">
-							<rect x="2351.0" y="343.5" height="92.0" width="323.0" data-name="NotificationValidators"></rect>
-							<path d="M2351.0 374.5 L2674.0 374.5" fill="none" data-name="NotificationValidators"></path>
-						</g>
-						<g transform="translate(2351, 343.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationValidators">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationValidators">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationValidators">NotificationValidators</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2351, 374.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationValidators">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationValidators">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationValidators">+didNotificationLaunchApp: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationValidators">+wasNotificationActionHandled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationValidators">+wasNotificationActionCompleted: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyNotifications">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotifications">
-							<rect x="1918.0" y="0.0" height="288.0" width="626.0" data-name="StudyNotifications"></rect>
-							<path d="M1918.0 31.0 L2544.0 31.0" fill="none" data-name="StudyNotifications"></path>
-							<path d="M1918.0 167.0 L2544.0 167.0" fill="none" data-name="StudyNotifications"></path>
-						</g>
-						<g transform="translate(1918, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotifications">
-								<text x="305.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotifications">StudyNotifications</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1918, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotifications">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotifications">+subject: StudySubject?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotifications">+flutterLocalNotificationsPlugin: FlutterLocalNotificationsPlugin</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNotifications">+context: BuildContext</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNotifications">+didReceiveLocalNotificationStream: StreamController&lt;ReceivedNotification&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNotifications">+selectNotificationStream: StreamController&lt;String?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+validator: NotificationValidators</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+debug: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+scheduledNotificationsDebug: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1918, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNotifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNotifications">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNotifications">&lt;static&gt;+dynamic create()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNotifications">-dynamic _isAndroidPermissionGranted()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNotifications">-dynamic _requestPermissions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNotifications">-void _configureDidReceiveLocalNotificationSubject()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNotifications">-void _configureSelectNotificationSubject()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNotifications">-void _initNotificationsPlugin()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyNotifications">+dynamic handleNotificationResponse()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySubject">
-							<rect x="1046.0" y="374.0" height="31.0" width="120.0" data-name="StudySubject"></rect>
-						</g>
-						<g transform="translate(1046, 374)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySubject">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudySubject">StudySubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FlutterLocalNotificationsPlugin">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FlutterLocalNotificationsPlugin">
-							<rect x="1867.0" y="374.0" height="31.0" width="255.0" data-name="FlutterLocalNotificationsPlugin"></rect>
-						</g>
-						<g transform="translate(1867, 374)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FlutterLocalNotificationsPlugin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FlutterLocalNotificationsPlugin">
-								<text x="119.5" y="13.5" stroke="none" text-anchor="middle" data-name="FlutterLocalNotificationsPlugin">FlutterLocalNotificationsPlugin</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BuildContext">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
-							<rect x="1711.0" y="374.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
-						</g>
-						<g transform="translate(1711, 374)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
-							<rect x="2162.0" y="374.0" height="31.0" width="149.0" data-name="StreamController"></rect>
-						</g>
-						<g transform="translate(2162, 374)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReceivedNotification">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReceivedNotification">
-							<rect x="1700.0" y="90.5" height="107.0" width="178.0" data-name="ReceivedNotification"></rect>
-							<path d="M1700.0 121.5 L1878.0 121.5" fill="none" data-name="ReceivedNotification"></path>
-						</g>
-						<g transform="translate(1700, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReceivedNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReceivedNotification">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReceivedNotification">ReceivedNotification</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1700, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReceivedNotification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReceivedNotification">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReceivedNotification">+id: int?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReceivedNotification">+title: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReceivedNotification">+body: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReceivedNotification">+payload: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppAnalytics">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppAnalytics">
-							<rect x="1325.0" y="37.5" height="213.0" width="335.0" data-name="AppAnalytics"></rect>
-							<path d="M1325.0 68.5 L1660.0 68.5" fill="none" data-name="AppAnalytics"></path>
-							<path d="M1325.0 159.5 L1660.0 159.5" fill="none" data-name="AppAnalytics"></path>
-						</g>
-						<g transform="translate(1325, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppAnalytics">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppAnalytics">
-								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppAnalytics">AppAnalytics</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1325, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppAnalytics">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppAnalytics">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;-_userEnabled: bool?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+keyAnalyticsUserEnable: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppAnalytics">+context: BuildContext</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppAnalytics">+subject: StudySubject?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+isUserEnabled: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1325, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppAnalytics">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppAnalytics">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+dynamic init()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+dynamic start()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppAnalytics">&lt;static&gt;+void setEnabled()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppAnalytics">+dynamic initBasic()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppAnalytics">+void initAdvanced()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/widgets/questionnaire/questions/uml.svg b/docs/uml/app/lib/widgets/questionnaire/questions/uml.svg
deleted file mode 100644
index abe98c1f5..000000000
--- a/docs/uml/app/lib/widgets/questionnaire/questions/uml.svg
+++ /dev/null
@@ -1,363 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2956.5" height="336.0" viewbox="0 0 2956.5 336" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[ChoiceQuestionWidget
-	  |
-	  +question: ChoiceQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;);
-	  +multiSelectionText: String;
-	  +subtitle: String?
-	]
-	
-	[ChoiceQuestionWidget]o-[ChoiceQuestion]
-	[ChoiceQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ChoiceQuestionWidget]
-	
-	[&lt;abstract&gt;QuestionWidget
-	  |
-	  +subtitle: String?
-	]
-	
-	[AnnotatedScaleQuestionWidget
-	  |
-	  +question: AnnotatedScaleQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[AnnotatedScaleQuestionWidget]o-[AnnotatedScaleQuestion]
-	[AnnotatedScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[AnnotatedScaleQuestionWidget]
-	
-	[BooleanQuestionWidget
-	  |
-	  +question: BooleanQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[BooleanQuestionWidget]o-[BooleanQuestion]
-	[BooleanQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[BooleanQuestionWidget]
-	
-	[FreeTextQuestionWidget
-	  |
-	  +question: FreeTextQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[FreeTextQuestionWidget]o-[FreeTextQuestion]
-	[FreeTextQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[FreeTextQuestionWidget]
-	
-	[ScaleQuestionWidget
-	  |
-	  +question: ScaleQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[ScaleQuestionWidget]o-[ScaleQuestion]
-	[ScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ScaleQuestionWidget]
-	
-	[VisualAnalogueQuestionWidget
-	  |
-	  +question: VisualAnalogueQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[VisualAnalogueQuestionWidget]o-[VisualAnalogueQuestion]
-	[VisualAnalogueQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[VisualAnalogueQuestionWidget]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="336.0" width="2956.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M90.9 218.0 L71 229 L71 249 L71.0 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M101.7 218.2 L90.9 218.0 L96.5 208.8 L107.3 209.0 Z"></path>
-					</g>
-					<path d="M317.6 218.0 L337.5 229 L337.5 249 L337.5 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M312.0 208.8 L317.6 218.0 L306.8 218.2 L301.2 209.0 Z"></path>
-					</g>
-					<path d="M1285.7 34.8 L204.25 82 L204.25 102 L204.3 102.0 " fill="none"></path>
-					<path d="M1285.9 40.2 L1285.7 34.8 L1285.4 29.5 L1299.0 34.2 Z"></path>
-					<path d="M658.8 207.7 L639 229 L639 249 L639.0 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M669.1 204.5 L658.8 207.7 L661.2 197.2 L671.5 194.0 Z"></path>
-					</g>
-					<path d="M830.3 200.4 L908.75 229 L956.637323943662 249 L956.6 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M823.4 192.2 L830.3 200.4 L819.7 202.2 L812.8 194.0 Z"></path>
-					</g>
-					<path d="M1285.7 37.7 L707.25 82 L707.25 117 L707.3 117.0 " fill="none"></path>
-					<path d="M1286.1 43.0 L1285.7 37.7 L1285.3 32.4 L1299.0 36.7 Z"></path>
-					<path d="M1372.1 179.1 L1836.5 229 L1836.5 249 L1836.5 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1363.3 172.8 L1372.1 179.1 L1362.2 183.4 L1353.5 177.1 Z"></path>
-					</g>
-					<path d="M1028.0 200.3 L948.75 229 L974.1021126760563 249 L974.1 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1038.6 202.2 L1028.0 200.3 L1034.9 192.2 L1045.5 194.0 Z"></path>
-					</g>
-					<path d="M1286.0 51.1 L1152 82 L1152 117 L1152.0 117.0 " fill="none"></path>
-					<path d="M1287.2 56.3 L1286.0 51.1 L1284.8 45.9 L1299.0 48.2 Z"></path>
-					<path d="M1815.0 184.4 L2155.25 229 L2155.25 249 L2155.3 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1806.4 177.9 L1815.0 184.4 L1805.1 188.4 L1796.5 181.9 Z"></path>
-					</g>
-					<path d="M1388.3 197.7 L1235.25 229 L1099.193661971831 249 L1099.2 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1398.5 201.1 L1388.3 197.7 L1396.3 190.6 L1406.6 194.0 Z"></path>
-					</g>
-					<path d="M1461.0 51.1 L1595 82 L1595 117 L1595.0 117.0 " fill="none"></path>
-					<path d="M1462.2 45.9 L1461.0 51.1 L1459.8 56.3 L1448.0 48.2 Z"></path>
-					<path d="M2257.9 193.0 L2468.75 229 L2468.75 249 L2468.8 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2249.6 186.2 L2257.9 193.0 L2247.8 196.7 L2239.5 189.9 Z"></path>
-					</g>
-					<path d="M1818.0 184.3 L1476.75 229 L1154.25 252.70341614906832 L1154.3 252.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1827.9 188.4 L1818.0 184.3 L1826.6 177.8 L1836.5 181.9 Z"></path>
-					</g>
-					<path d="M1461.3 37.7 L2038 82 L2038 117 L2038.0 117.0 " fill="none"></path>
-					<path d="M1461.7 32.4 L1461.3 37.7 L1460.9 43.1 L1448.0 36.7 Z"></path>
-					<path d="M2663.9 198.2 L2795.5 229 L2795.5 249 L2795.5 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2656.0 190.9 L2663.9 198.2 L2653.6 201.3 L2645.7 194.0 Z"></path>
-					</g>
-					<path d="M2260.9 176.7 L1718.25 229 L1154.25 256.63561076604555 L1154.3 256.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2270.7 181.1 L2260.9 176.7 L2269.7 170.5 L2279.5 174.9 Z"></path>
-					</g>
-					<path d="M1461.3 35.0 L2481 82 L2481 117 L2481.0 117.0 " fill="none"></path>
-					<path d="M1461.6 29.7 L1461.3 35.0 L1461.1 40.4 L1448.0 34.4 Z"></path>
-					<g data-name="ChoiceQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionWidget">
-							<rect x="7.8" y="102.0" height="107.0" width="393.0" data-name="ChoiceQuestionWidget"></rect>
-							<path d="M7.8 133.0 L400.8 133.0" fill="none" data-name="ChoiceQuestionWidget"></path>
-						</g>
-						<g transform="translate(7.75, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionWidget">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionWidget">ChoiceQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7.75, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionWidget">+question: ChoiceQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionWidget">+multiSelectionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionWidget">+subtitle: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestion">
-							<rect x="0.0" y="249.0" height="31.0" width="142.0" data-name="ChoiceQuestion"></rect>
-						</g>
-						<g transform="translate(0, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestion">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestion">ChoiceQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-							<rect x="182.0" y="249.0" height="31.0" width="311.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)"></rect>
-						</g>
-						<g transform="translate(182, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-								<text x="147.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)">dynamic Function(Answer&lt;dynamic&gt;)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionWidget">
-							<rect x="1299.0" y="0.0" height="62.0" width="149.0" data-name="QuestionWidget"></rect>
-							<path d="M1299.0 31.0 L1448.0 31.0" fill="none" data-name="QuestionWidget"></path>
-						</g>
-						<g transform="translate(1299, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionWidget">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionWidget">QuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1299, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionWidget">+subtitle: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AnnotatedScaleQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestionWidget">
-							<rect x="505.8" y="117.0" height="77.0" width="403.0" data-name="AnnotatedScaleQuestionWidget"></rect>
-							<path d="M505.8 148.0 L908.8 148.0" fill="none" data-name="AnnotatedScaleQuestionWidget"></path>
-						</g>
-						<g transform="translate(505.75, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestionWidget">AnnotatedScaleQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(505.75, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AnnotatedScaleQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+question: AnnotatedScaleQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AnnotatedScaleQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestion">
-							<rect x="533.0" y="249.0" height="31.0" width="212.0" data-name="AnnotatedScaleQuestion"></rect>
-						</g>
-						<g transform="translate(533, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestion">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestion">AnnotatedScaleQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-							<rect x="833.3" y="249.0" height="31.0" width="321.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(833.25, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BooleanQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestionWidget">
-							<rect x="950.5" y="117.0" height="77.0" width="403.0" data-name="BooleanQuestionWidget"></rect>
-							<path d="M950.5 148.0 L1353.5 148.0" fill="none" data-name="BooleanQuestionWidget"></path>
-						</g>
-						<g transform="translate(950.5, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestionWidget">BooleanQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(950.5, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BooleanQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BooleanQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="BooleanQuestionWidget">+question: BooleanQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BooleanQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BooleanQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestion">
-							<rect x="1760.5" y="249.0" height="31.0" width="152.0" data-name="BooleanQuestion"></rect>
-						</g>
-						<g transform="translate(1760.5, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestion">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestion">BooleanQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionWidget">
-							<rect x="1393.5" y="117.0" height="77.0" width="403.0" data-name="FreeTextQuestionWidget"></rect>
-							<path d="M1393.5 148.0 L1796.5 148.0" fill="none" data-name="FreeTextQuestionWidget"></path>
-						</g>
-						<g transform="translate(1393.5, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionWidget">FreeTextQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1393.5, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionWidget">+question: FreeTextQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestion">
-							<rect x="2076.8" y="249.0" height="31.0" width="157.0" data-name="FreeTextQuestion"></rect>
-						</g>
-						<g transform="translate(2076.75, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestion">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestion">FreeTextQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionWidget">
-							<rect x="1836.5" y="117.0" height="77.0" width="403.0" data-name="ScaleQuestionWidget"></rect>
-							<path d="M1836.5 148.0 L2239.5 148.0" fill="none" data-name="ScaleQuestionWidget"></path>
-						</g>
-						<g transform="translate(1836.5, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionWidget">ScaleQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1836.5, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionWidget">+question: ScaleQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestion">
-							<rect x="2403.3" y="249.0" height="31.0" width="131.0" data-name="ScaleQuestion"></rect>
-						</g>
-						<g transform="translate(2403.25, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestion">
-								<text x="57.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestion">ScaleQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VisualAnalogueQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestionWidget">
-							<rect x="2279.5" y="117.0" height="77.0" width="403.0" data-name="VisualAnalogueQuestionWidget"></rect>
-							<path d="M2279.5 148.0 L2682.5 148.0" fill="none" data-name="VisualAnalogueQuestionWidget"></path>
-						</g>
-						<g transform="translate(2279.5, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestionWidget">VisualAnalogueQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2279.5, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="VisualAnalogueQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="VisualAnalogueQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+question: VisualAnalogueQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VisualAnalogueQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestion">
-							<rect x="2690.5" y="249.0" height="31.0" width="210.0" data-name="VisualAnalogueQuestion"></rect>
-						</g>
-						<g transform="translate(2690.5, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestion">
-								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestion">VisualAnalogueQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/widgets/questionnaire/uml.svg b/docs/uml/app/lib/widgets/questionnaire/uml.svg
deleted file mode 100644
index 8feef1090..000000000
--- a/docs/uml/app/lib/widgets/questionnaire/uml.svg
+++ /dev/null
@@ -1,773 +0,0 @@
-<svg version="1.1" baseProfile="full" width="5393.5" height="638.0" viewbox="0 0 5393.5 638" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[AudioRecordingQuestionWidget
-	  |
-	  +question: AudioRecordingQuestion;
-	  +onDone: dynamic Function(Answer&lt;FutureBlobFile&gt;)?
-	]
-	
-	[AudioRecordingQuestionWidget]o-[AudioRecordingQuestion]
-	[AudioRecordingQuestionWidget]o-[dynamic Function(Answer&lt;FutureBlobFile&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[AudioRecordingQuestionWidget]
-	
-	[CustomSlider
-	  |
-	  +value: double?;
-	  +minValue: double?;
-	  +maxValue: double?;
-	  +minorTick: int?;
-	  +onChanged: dynamic Function(double)?;
-	  +onChangeEnd: dynamic Function(double)?;
-	  +activeColor: Color?;
-	  +inactiveColor: Color?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +thumbColor: Color?;
-	  +isColored: bool;
-	  +labelValuePrecision: int;
-	  +tickValuePrecision: int;
-	  +linearStep: bool;
-	  +steps: AnnotatedScaleQuestion?
-	  |
-	  +Widget build()
-	]
-	
-	[CustomSlider]o-[dynamic Function(double)?]
-	[CustomSlider]o-[Color]
-	[CustomSlider]o-[AnnotatedScaleQuestion]
-	
-	[CustomTrackShape
-	  |
-	  +Rect getPreferredRect()
-	]
-	
-	[RoundedRectSliderTrackShape]&lt;:-[CustomTrackShape]
-	
-	[QuestionContainer
-	  |
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;, int);
-	  +question: Question&lt;dynamic&gt;;
-	  +index: int
-	]
-	
-	[QuestionContainer]o-[dynamic Function(Answer&lt;dynamic&gt;, int)]
-	[QuestionContainer]o-[&lt;abstract&gt;Question]
-	
-	[QuestionHeader
-	  |
-	  +prompt: String?;
-	  +subtitle: String?;
-	  +rationale: String?
-	  |
-	  -List&lt;Widget&gt; _buildSubtitle();
-	  -List&lt;Widget&gt; _buildRationaleButton();
-	  +Widget build()
-	]
-	
-	[ImageCapturingQuestionWidget
-	  |
-	  +question: ImageCapturingQuestion;
-	  +onDone: dynamic Function(Answer&lt;FutureBlobFile&gt;)?
-	]
-	
-	[ImageCapturingQuestionWidget]o-[ImageCapturingQuestion]
-	[ImageCapturingQuestionWidget]o-[dynamic Function(Answer&lt;FutureBlobFile&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ImageCapturingQuestionWidget]
-	
-	[QuestionnaireWidget
-	  |
-	  +title: String?;
-	  +header: String?;
-	  +footer: String?;
-	  +questions: List&lt;Question&lt;dynamic&gt;&gt;
-	]
-	
-	[HtmlTextBox
-	  |
-	  +text: String?
-	  |
-	  +Widget build()
-	]
-	
-	[BooleanQuestionWidget
-	  |
-	  +question: BooleanQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[BooleanQuestionWidget]o-[BooleanQuestion]
-	[BooleanQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[BooleanQuestionWidget]
-	
-	[ChoiceQuestionWidget
-	  |
-	  +question: ChoiceQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;);
-	  +multiSelectionText: String;
-	  +subtitle: String?
-	]
-	
-	[ChoiceQuestionWidget]o-[ChoiceQuestion]
-	[ChoiceQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ChoiceQuestionWidget]
-	
-	[VisualAnalogueQuestionWidget
-	  |
-	  +question: VisualAnalogueQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[VisualAnalogueQuestionWidget]o-[VisualAnalogueQuestion]
-	[VisualAnalogueQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[VisualAnalogueQuestionWidget]
-	
-	[FreeTextQuestionWidget
-	  |
-	  +question: FreeTextQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[FreeTextQuestionWidget]o-[FreeTextQuestion]
-	[FreeTextQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[FreeTextQuestionWidget]
-	
-	[AnnotatedScaleQuestionWidget
-	  |
-	  +question: AnnotatedScaleQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[AnnotatedScaleQuestionWidget]o-[AnnotatedScaleQuestion]
-	[AnnotatedScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[AnnotatedScaleQuestionWidget]
-	
-	[&lt;abstract&gt;QuestionWidget
-	  |
-	  +subtitle: String?
-	]
-	
-	[ScaleQuestionWidget
-	  |
-	  +question: ScaleQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[ScaleQuestionWidget]o-[ScaleQuestion]
-	[ScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ScaleQuestionWidget]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="638.0" width="5393.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M5129.3 405.0 L5231 531 L5231 551 L5231.0 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5127.6 394.4 L5129.3 405.0 L5119.3 401.1 L5117.6 390.5 Z"></path>
-					</g>
-					<path d="M5043.4 405.0 L4941 531 L4861.56338028169 551 L4861.6 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5053.5 401.1 L5043.4 405.0 L5045.2 394.4 L5055.2 390.5 Z"></path>
-					</g>
-					<path d="M3105.8 80.6 L5086.5 173 L5086.5 313.5 L5086.5 313.5 " fill="none"></path>
-					<path d="M3106.1 75.3 L3105.8 80.6 L3105.6 85.9 L3092.5 80.0 Z"></path>
-					<path d="M660.7 418.5 L998.5 531 L596.5 558.5768115942029 L596.5 558.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M653.5 410.5 L660.7 418.5 L650.2 420.6 L643.0 412.6 Z"></path>
-					</g>
-					<path d="M538.2 528.1 L539.5 531 L325.5 562.2633744855967 L325.5 562.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M539.4 517.4 L538.2 528.1 L529.6 521.7 L530.7 511.0 Z"></path>
-					</g>
-					<path d="M441.2 529.6 L441 531 L1100.25 561.5826527278667 L1100.3 561.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M447.5 520.9 L441.2 529.6 L436.9 519.7 L443.2 511.0 Z"></path>
-					</g>
-					<path d="M132.0 105.3 L132 173 L132 321 L132.0 321.0 " fill="none"></path>
-					<path d="M137.3 105.3 L132.0 105.3 L126.7 105.3 L132.0 92.0 Z"></path>
-					<path d="M928.5 133.8 L980 173 L980 336.5 L980.0 336.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M924.3 123.9 L928.5 133.8 L917.9 132.4 L913.7 122.5 Z"></path>
-					</g>
-					<path d="M778.0 133.8 L726.5 173 L726.5 336.5 L726.5 336.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M788.6 132.4 L778.0 133.8 L782.2 123.9 L792.8 122.5 Z"></path>
-					</g>
-					<path d="M4554.8 407.5 L4610 531 L4530.56338028169 551 L4530.6 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4555.9 396.8 L4554.8 407.5 L4546.1 401.2 L4547.2 390.5 Z"></path>
-					</g>
-					<path d="M4469.8 402.5 L4316.5 531 L4615.5 552.9534643226474 L4615.5 553.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4480.4 400.6 L4469.8 402.5 L4473.5 392.4 L4484.1 390.5 Z"></path>
-					</g>
-					<path d="M3105.8 82.1 L4530 173 L4530 313.5 L4530.0 313.5 " fill="none"></path>
-					<path d="M3106.1 76.8 L3105.8 82.1 L3105.5 87.4 L3092.5 81.3 Z"></path>
-					<path d="M4082.2 408.2 L4124.25 531 L4124.25 551 L4124.3 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4084.2 397.6 L4082.2 408.2 L4074.1 401.1 L4076.2 390.5 Z"></path>
-					</g>
-					<path d="M3909.9 395.6 L3434.75 531 L2463.75 561.4644277507733 L2463.8 561.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3920.4 398.2 L3909.9 395.6 L3917.4 387.9 L3927.9 390.5 Z"></path>
-					</g>
-					<path d="M3105.8 84.6 L4063 173 L4063 313.5 L4063.0 313.5 " fill="none"></path>
-					<path d="M3106.3 79.3 L3105.8 84.6 L3105.3 89.9 L3092.5 83.4 Z"></path>
-					<path d="M3265.0 418.4 L3382.5 531 L3866.25 561.9565119423164 L3866.3 562.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3262.0 408.1 L3265.0 418.4 L3254.6 415.8 L3251.6 405.5 Z"></path>
-					</g>
-					<path d="M3138.2 419.7 L3043.5 531 L3461.75 556.8786492374728 L3461.8 556.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3148.3 416.1 L3138.2 419.7 L3140.1 409.2 L3150.2 405.5 Z"></path>
-					</g>
-					<path d="M3086.8 113.9 L3195.75 173 L3195.75 298.5 L3195.8 298.5 " fill="none"></path>
-					<path d="M3089.4 109.2 L3086.8 113.9 L3084.3 118.5 L3075.1 107.5 Z"></path>
-					<path d="M2779.2 407.9 L2826.5 531 L3211.75 558.8967363590006 L3211.8 558.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2780.9 397.3 L2779.2 407.9 L2770.9 401.1 L2772.5 390.5 Z"></path>
-					</g>
-					<path d="M2700.5 402.9 L2556.25 531 L2413.7147887323945 551 L2413.7 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2711.0 400.7 L2700.5 402.9 L2703.9 392.7 L2714.4 390.5 Z"></path>
-					</g>
-					<path d="M2931.0 108.8 L2757.75 173 L2757.75 313.5 L2757.8 313.5 " fill="none"></path>
-					<path d="M2932.9 113.8 L2931.0 108.8 L2929.1 103.8 L2943.5 104.1 Z"></path>
-					<path d="M2366.3 403.7 L2493.25 531 L3014.75 561.8554166666667 L3014.8 561.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2363.5 393.3 L2366.3 403.7 L2356.0 400.9 L2353.1 390.5 Z"></path>
-					</g>
-					<path d="M2257.5 402.9 L2113.25 531 L2220.292253521127 551 L2220.3 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2268.0 400.7 L2257.5 402.9 L2260.9 392.7 L2271.4 390.5 Z"></path>
-					</g>
-					<path d="M2930.3 88.5 L2314.75 173 L2314.75 313.5 L2314.8 313.5 " fill="none"></path>
-					<path d="M2931.0 93.8 L2930.3 88.5 L2929.6 83.3 L2943.5 86.7 Z"></path>
-					<path d="M1840.9 409.1 L1854.5 531 L1312.25 560.6951407635943 L1312.3 560.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1845.1 399.2 L1840.9 409.1 L1834.5 400.4 L1838.8 390.5 Z"></path>
-					</g>
-					<path d="M1777.2 402.9 L1633 531 L2142.75 557.9990675121223 L2142.8 558.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1787.7 400.7 L1777.2 402.9 L1780.6 392.7 L1791.2 390.5 Z"></path>
-					</g>
-					<path d="M2930.2 83.7 L1834.5 173 L1834.5 313.5 L1834.5 313.5 " fill="none"></path>
-					<path d="M2930.6 89.0 L2930.2 83.7 L2929.8 78.3 L2943.5 82.6 Z"></path>
-					<path d="M1448.8 402.9 L1593 531 L1633.1408450704225 551 L1633.1 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1445.4 392.7 L1448.8 402.9 L1438.3 400.7 L1434.8 390.5 Z"></path>
-					</g>
-					<path d="M1298.9 398.9 L1038.5 531 L2142.75 561.9949594781577 L2142.8 562.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1309.7 399.5 L1298.9 398.9 L1304.8 390.0 L1315.6 390.5 Z"></path>
-					</g>
-					<path d="M2930.2 81.7 L1391.5 173 L1391.5 313.5 L1391.5 313.5 " fill="none"></path>
-					<path d="M2930.5 87.0 L2930.2 81.7 L2929.9 76.4 L2943.5 80.9 Z"></path>
-					<g data-name="AudioRecordingQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionWidget">
-							<rect x="4861.0" y="313.5" height="77.0" width="451.0" data-name="AudioRecordingQuestionWidget"></rect>
-							<path d="M4861.0 344.5 L5312.0 344.5" fill="none" data-name="AudioRecordingQuestionWidget"></path>
-						</g>
-						<g transform="translate(4861, 313.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionWidget">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionWidget">AudioRecordingQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4861, 344.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionWidget">+question: AudioRecordingQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioRecordingQuestionWidget">+onDone: dynamic Function(Answer&lt;FutureBlobFile&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioRecordingQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestion">
-							<rect x="5124.5" y="551.0" height="31.0" width="213.0" data-name="AudioRecordingQuestion"></rect>
-						</g>
-						<g transform="translate(5124.5, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestion">
-								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestion">AudioRecordingQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">
-							<rect x="4615.5" y="551.0" height="31.0" width="369.0" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?"></rect>
-						</g>
-						<g transform="translate(4615.5, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">
-								<text x="176.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;FutureBlobFile&gt;)?">dynamic Function(Answer&lt;FutureBlobFile&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionWidget">
-							<rect x="2943.5" y="45.5" height="62.0" width="149.0" data-name="QuestionWidget"></rect>
-							<path d="M2943.5 76.5 L3092.5 76.5" fill="none" data-name="QuestionWidget"></path>
-						</g>
-						<g transform="translate(2943.5, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionWidget">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionWidget">QuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2943.5, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionWidget">+subtitle: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomSlider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomSlider">
-							<rect x="279.0" y="193.0" height="318.0" width="364.0" data-name="CustomSlider"></rect>
-							<path d="M279.0 224.0 L643.0 224.0" fill="none" data-name="CustomSlider"></path>
-							<path d="M279.0 480.0 L643.0 480.0" fill="none" data-name="CustomSlider"></path>
-						</g>
-						<g transform="translate(279, 193)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomSlider">
-								<text x="174.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomSlider">CustomSlider</text>
-								
-							</g>
-						</g>
-						<g transform="translate(279, 224)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomSlider">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomSlider">+value: double?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomSlider">+minValue: double?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomSlider">+maxValue: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomSlider">+minorTick: int?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomSlider">+onChanged: dynamic Function(double)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomSlider">+onChangeEnd: dynamic Function(double)?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="CustomSlider">+activeColor: Color?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="CustomSlider">+inactiveColor: Color?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="CustomSlider">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="CustomSlider">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="CustomSlider">+thumbColor: Color?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="CustomSlider">+isColored: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="CustomSlider">+labelValuePrecision: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="CustomSlider">+tickValuePrecision: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="CustomSlider">+linearStep: bool</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="CustomSlider">+steps: AnnotatedScaleQuestion?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(279, 480)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomSlider">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomSlider">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(double)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(double)?">
-							<rect x="365.5" y="551.0" height="31.0" width="231.0" data-name="dynamic Function(double)?"></rect>
-						</g>
-						<g transform="translate(365.5, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(double)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(double)?">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(double)?">dynamic Function(double)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="267.5" y="551.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(267.5, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AnnotatedScaleQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestion">
-							<rect x="1100.3" y="551.0" height="31.0" width="212.0" data-name="AnnotatedScaleQuestion"></rect>
-						</g>
-						<g transform="translate(1100.25, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestion">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestion">AnnotatedScaleQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomTrackShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomTrackShape">
-							<rect x="25.0" y="321.0" height="62.0" width="214.0" data-name="CustomTrackShape"></rect>
-							<path d="M25.0 352.0 L239.0 352.0" fill="none" data-name="CustomTrackShape"></path>
-						</g>
-						<g transform="translate(25, 321)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomTrackShape">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomTrackShape">CustomTrackShape</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25, 352)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomTrackShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomTrackShape">+Rect getPreferredRect()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoundedRectSliderTrackShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoundedRectSliderTrackShape">
-							<rect x="0.0" y="61.0" height="31.0" width="264.0" data-name="RoundedRectSliderTrackShape"></rect>
-						</g>
-						<g transform="translate(0, 61)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoundedRectSliderTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoundedRectSliderTrackShape">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoundedRectSliderTrackShape">RoundedRectSliderTrackShape</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionContainer">
-							<rect x="642.3" y="30.5" height="92.0" width="422.0" data-name="QuestionContainer"></rect>
-							<path d="M642.3 61.5 L1064.3 61.5" fill="none" data-name="QuestionContainer"></path>
-						</g>
-						<g transform="translate(642.25, 30.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionContainer">
-								<text x="203.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionContainer">QuestionContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(642.25, 61.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionContainer">+onDone: dynamic Function(Answer&lt;dynamic&gt;, int)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionContainer">+question: Question&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionContainer">+index: int</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-							<rect x="810.0" y="336.5" height="31.0" width="340.0" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)"></rect>
-						</g>
-						<g transform="translate(810, 336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">dynamic Function(Answer&lt;dynamic&gt;, int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Question">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Question">
-							<rect x="683.0" y="336.5" height="31.0" width="87.0" data-name="Question"></rect>
-						</g>
-						<g transform="translate(683, 336.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Question">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Question">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="Question">Question</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionHeader">
-							<rect x="3132.5" y="0.0" height="153.0" width="316.0" data-name="QuestionHeader"></rect>
-							<path d="M3132.5 31.0 L3448.5 31.0" fill="none" data-name="QuestionHeader"></path>
-							<path d="M3132.5 92.0 L3448.5 92.0" fill="none" data-name="QuestionHeader"></path>
-						</g>
-						<g transform="translate(3132.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionHeader">
-								<text x="150.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionHeader">QuestionHeader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3132.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionHeader">+prompt: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionHeader">+subtitle: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionHeader">+rationale: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3132.5, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionHeader">-List&lt;Widget&gt; _buildSubtitle()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionHeader">-List&lt;Widget&gt; _buildRationaleButton()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionHeader">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageCapturingQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionWidget">
-							<rect x="4304.5" y="313.5" height="77.0" width="451.0" data-name="ImageCapturingQuestionWidget"></rect>
-							<path d="M4304.5 344.5 L4755.5 344.5" fill="none" data-name="ImageCapturingQuestionWidget"></path>
-						</g>
-						<g transform="translate(4304.5, 313.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionWidget">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionWidget">ImageCapturingQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4304.5, 344.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionWidget">+question: ImageCapturingQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageCapturingQuestionWidget">+onDone: dynamic Function(Answer&lt;FutureBlobFile&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageCapturingQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestion">
-							<rect x="4362.5" y="551.0" height="31.0" width="213.0" data-name="ImageCapturingQuestion"></rect>
-						</g>
-						<g transform="translate(4362.5, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestion">
-								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestion">ImageCapturingQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireWidget">
-							<rect x="3488.5" y="23.0" height="107.0" width="318.0" data-name="QuestionnaireWidget"></rect>
-							<path d="M3488.5 54.0 L3806.5 54.0" fill="none" data-name="QuestionnaireWidget"></path>
-						</g>
-						<g transform="translate(3488.5, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireWidget">
-								<text x="151.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireWidget">QuestionnaireWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3488.5, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireWidget">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireWidget">+header: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireWidget">+footer: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionnaireWidget">+questions: List&lt;Question&lt;dynamic&gt;&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="HtmlTextBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlTextBox">
-							<rect x="3846.5" y="30.0" height="93.0" width="136.0" data-name="HtmlTextBox"></rect>
-							<path d="M3846.5 61.0 L3982.5 61.0" fill="none" data-name="HtmlTextBox"></path>
-							<path d="M3846.5 92.0 L3982.5 92.0" fill="none" data-name="HtmlTextBox"></path>
-						</g>
-						<g transform="translate(3846.5, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlTextBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlTextBox">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlTextBox">HtmlTextBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3846.5, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlTextBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlTextBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlTextBox">+text: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3846.5, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlTextBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlTextBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlTextBox">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BooleanQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestionWidget">
-							<rect x="3861.5" y="313.5" height="77.0" width="403.0" data-name="BooleanQuestionWidget"></rect>
-							<path d="M3861.5 344.5 L4264.5 344.5" fill="none" data-name="BooleanQuestionWidget"></path>
-						</g>
-						<g transform="translate(3861.5, 313.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestionWidget">BooleanQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3861.5, 344.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BooleanQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BooleanQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="BooleanQuestionWidget">+question: BooleanQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BooleanQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BooleanQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestion">
-							<rect x="4048.3" y="551.0" height="31.0" width="152.0" data-name="BooleanQuestion"></rect>
-						</g>
-						<g transform="translate(4048.25, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestion">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestion">BooleanQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-							<rect x="2142.8" y="551.0" height="31.0" width="321.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(2142.75, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionWidget">
-							<rect x="2999.3" y="298.5" height="107.0" width="393.0" data-name="ChoiceQuestionWidget"></rect>
-							<path d="M2999.3 329.5 L3392.3 329.5" fill="none" data-name="ChoiceQuestionWidget"></path>
-						</g>
-						<g transform="translate(2999.25, 298.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionWidget">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionWidget">ChoiceQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2999.25, 329.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionWidget">+question: ChoiceQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionWidget">+multiSelectionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionWidget">+subtitle: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestion">
-							<rect x="3866.3" y="551.0" height="31.0" width="142.0" data-name="ChoiceQuestion"></rect>
-						</g>
-						<g transform="translate(3866.25, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestion">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestion">ChoiceQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-							<rect x="3461.8" y="551.0" height="31.0" width="311.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)"></rect>
-						</g>
-						<g transform="translate(3461.75, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-								<text x="147.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)">dynamic Function(Answer&lt;dynamic&gt;)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VisualAnalogueQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestionWidget">
-							<rect x="2556.3" y="313.5" height="77.0" width="403.0" data-name="VisualAnalogueQuestionWidget"></rect>
-							<path d="M2556.3 344.5 L2959.3 344.5" fill="none" data-name="VisualAnalogueQuestionWidget"></path>
-						</g>
-						<g transform="translate(2556.25, 313.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestionWidget">VisualAnalogueQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2556.25, 344.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="VisualAnalogueQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="VisualAnalogueQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+question: VisualAnalogueQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VisualAnalogueQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestion">
-							<rect x="3211.8" y="551.0" height="31.0" width="210.0" data-name="VisualAnalogueQuestion"></rect>
-						</g>
-						<g transform="translate(3211.75, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestion">
-								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestion">VisualAnalogueQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionWidget">
-							<rect x="2113.3" y="313.5" height="77.0" width="403.0" data-name="FreeTextQuestionWidget"></rect>
-							<path d="M2113.3 344.5 L2516.3 344.5" fill="none" data-name="FreeTextQuestionWidget"></path>
-						</g>
-						<g transform="translate(2113.25, 313.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionWidget">FreeTextQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2113.25, 344.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionWidget">+question: FreeTextQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestion">
-							<rect x="3014.8" y="551.0" height="31.0" width="157.0" data-name="FreeTextQuestion"></rect>
-						</g>
-						<g transform="translate(3014.75, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestion">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestion">FreeTextQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AnnotatedScaleQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestionWidget">
-							<rect x="1633.0" y="313.5" height="77.0" width="403.0" data-name="AnnotatedScaleQuestionWidget"></rect>
-							<path d="M1633.0 344.5 L2036.0 344.5" fill="none" data-name="AnnotatedScaleQuestionWidget"></path>
-						</g>
-						<g transform="translate(1633, 313.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestionWidget">AnnotatedScaleQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1633, 344.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AnnotatedScaleQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+question: AnnotatedScaleQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionWidget">
-							<rect x="1190.0" y="313.5" height="77.0" width="403.0" data-name="ScaleQuestionWidget"></rect>
-							<path d="M1190.0 344.5 L1593.0 344.5" fill="none" data-name="ScaleQuestionWidget"></path>
-						</g>
-						<g transform="translate(1190, 313.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionWidget">ScaleQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1190, 344.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionWidget">+question: ScaleQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestion">
-							<rect x="1598.8" y="551.0" height="31.0" width="131.0" data-name="ScaleQuestion"></rect>
-						</g>
-						<g transform="translate(1598.75, 551)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestion">
-								<text x="57.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestion">ScaleQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/app/lib/widgets/uml.svg b/docs/uml/app/lib/widgets/uml.svg
deleted file mode 100644
index 81d54b744..000000000
--- a/docs/uml/app/lib/widgets/uml.svg
+++ /dev/null
@@ -1,1172 +0,0 @@
-<svg version="1.1" baseProfile="full" width="7194.8" height="683.0" viewbox="0 0 7194.75 683" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[SelectableButton
-	  |
-	  +child: Widget;
-	  +selected: bool;
-	  +onTap: dynamic Function()?
-	  |
-	  -Color _getFillColor();
-	  -Color _getTextColor();
-	  +Widget build()
-	]
-	
-	[SelectableButton]o-[&lt;abstract&gt;Widget]
-	[SelectableButton]o-[dynamic Function()?]
-	
-	[CustomSlider
-	  |
-	  +value: double?;
-	  +minValue: double?;
-	  +maxValue: double?;
-	  +minorTick: int?;
-	  +onChanged: dynamic Function(double)?;
-	  +onChangeEnd: dynamic Function(double)?;
-	  +activeColor: Color?;
-	  +inactiveColor: Color?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +thumbColor: Color?;
-	  +isColored: bool;
-	  +labelValuePrecision: int;
-	  +tickValuePrecision: int;
-	  +linearStep: bool;
-	  +steps: AnnotatedScaleQuestion?
-	  |
-	  +Widget build()
-	]
-	
-	[CustomSlider]o-[dynamic Function(double)?]
-	[CustomSlider]o-[Color]
-	[CustomSlider]o-[AnnotatedScaleQuestion]
-	
-	[CustomTrackShape
-	  |
-	  +Rect getPreferredRect()
-	]
-	
-	[RoundedRectSliderTrackShape]&lt;:-[CustomTrackShape]
-	
-	[QuestionnaireWidget
-	  |
-	  +title: String?;
-	  +header: String?;
-	  +footer: String?;
-	  +questions: List&lt;Question&lt;dynamic&gt;&gt;
-	]
-	
-	[HtmlTextBox
-	  |
-	  +text: String?
-	  |
-	  +Widget build()
-	]
-	
-	[QuestionContainer
-	  |
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;, int);
-	  +question: Question&lt;dynamic&gt;;
-	  +index: int
-	]
-	
-	[QuestionContainer]o-[dynamic Function(Answer&lt;dynamic&gt;, int)]
-	[QuestionContainer]o-[&lt;abstract&gt;Question]
-	
-	[QuestionHeader
-	  |
-	  +prompt: String?;
-	  +subtitle: String?;
-	  +rationale: String?
-	  |
-	  -List&lt;Widget&gt; _buildSubtitle();
-	  -List&lt;Widget&gt; _buildRationaleButton();
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionWidget
-	  |
-	  +question: ChoiceQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;);
-	  +multiSelectionText: String;
-	  +subtitle: String?
-	]
-	
-	[ChoiceQuestionWidget]o-[ChoiceQuestion]
-	[ChoiceQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ChoiceQuestionWidget]
-	
-	[FreeTextQuestionWidget
-	  |
-	  +question: FreeTextQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[FreeTextQuestionWidget]o-[FreeTextQuestion]
-	[FreeTextQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[FreeTextQuestionWidget]
-	
-	[AnnotatedScaleQuestionWidget
-	  |
-	  +question: AnnotatedScaleQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[AnnotatedScaleQuestionWidget]o-[AnnotatedScaleQuestion]
-	[AnnotatedScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[AnnotatedScaleQuestionWidget]
-	
-	[VisualAnalogueQuestionWidget
-	  |
-	  +question: VisualAnalogueQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[VisualAnalogueQuestionWidget]o-[VisualAnalogueQuestion]
-	[VisualAnalogueQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[VisualAnalogueQuestionWidget]
-	
-	[&lt;abstract&gt;QuestionWidget
-	  |
-	  +subtitle: String?
-	]
-	
-	[BooleanQuestionWidget
-	  |
-	  +question: BooleanQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[BooleanQuestionWidget]o-[BooleanQuestion]
-	[BooleanQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[BooleanQuestionWidget]
-	
-	[ScaleQuestionWidget
-	  |
-	  +question: ScaleQuestion;
-	  +onDone: dynamic Function(Answer&lt;dynamic&gt;)?
-	]
-	
-	[ScaleQuestionWidget]o-[ScaleQuestion]
-	[ScaleQuestionWidget]o-[dynamic Function(Answer&lt;dynamic&gt;)?]
-	[&lt;abstract&gt;QuestionWidget]&lt;:-[ScaleQuestionWidget]
-	
-	[StudyTile
-	  |
-	  +title: String?;
-	  +description: String?;
-	  +iconName: String;
-	  +onTap: dynamic Function()?;
-	  +contentPadding: EdgeInsetsGeometry
-	  |
-	  +Widget build()
-	]
-	
-	[StudyTile]o-[dynamic Function()?]
-	[StudyTile]o-[&lt;abstract&gt;EdgeInsetsGeometry]
-	
-	[RoundCheckbox
-	  |
-	  +onChanged: dynamic Function(bool)?;
-	  +value: bool?
-	  |
-	  +Widget build()
-	]
-	
-	[RoundCheckbox]o-[dynamic Function(bool)?]
-	
-	[InterventionCard
-	  |
-	  +intervention: Intervention;
-	  +selected: bool;
-	  +showCheckbox: bool;
-	  +showTasks: bool;
-	  +showDescription: bool;
-	  +onTap: dynamic Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionCard]o-[Intervention]
-	[InterventionCard]o-[dynamic Function()?]
-	
-	[InterventionCardTitle
-	  |
-	  +intervention: Intervention?;
-	  +selected: bool;
-	  +showCheckbox: bool;
-	  +showDescriptionButton: bool;
-	  +onTap: dynamic Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionCardTitle]o-[Intervention]
-	[InterventionCardTitle]o-[dynamic Function()?]
-	
-	[InterventionCardDescription
-	  |
-	  +intervention: Intervention
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionCardDescription]o-[Intervention]
-	
-	[_TaskList
-	  |
-	  +tasks: List&lt;InterventionTask&gt;
-	  |
-	  +String scheduleString();
-	  +Widget build()
-	]
-	
-	[HtmlText
-	  |
-	  +text: String?;
-	  +style: TextStyle?;
-	  +centered: bool
-	  |
-	  +Widget build()
-	]
-	
-	[HtmlText]o-[TextStyle]
-	
-	[BottomOnboardingNavigation
-	  |
-	  +onBack: void Function()?;
-	  +onNext: void Function()?;
-	  +backLabel: String?;
-	  +nextLabel: String?;
-	  +hideNext: bool;
-	  +nextIcon: Icon?;
-	  +backIcon: Icon?;
-	  +progress: Widget?
-	  |
-	  +Widget build()
-	]
-	
-	[BottomOnboardingNavigation]o-[void Function()?]
-	[BottomOnboardingNavigation]o-[Icon]
-	[BottomOnboardingNavigation]o-[&lt;abstract&gt;Widget]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="683.0" width="7194.8" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M614.9 190.2 L636.75 218 L2249 393.14352905477165 L2249.0 393.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M613.3 179.5 L614.9 190.2 L604.9 186.1 L603.4 175.5 Z"></path>
-					</g>
-					<path d="M511.6 193.2 L503.25 218 L1764.75 385.2655555555556 L1764.8 385.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M519.6 186.0 L511.6 193.2 L509.5 182.6 L517.5 175.5 Z"></path>
-					</g>
-					<path d="M832.3 422.1 L2061.25 576 L603.25 608.8941849380362 L603.3 608.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M823.7 415.7 L832.3 422.1 L822.3 426.2 L813.8 419.8 Z"></path>
-					</g>
-					<path d="M631.8 574.7 L631.75 576 L332.25 608.3660578386606 L332.3 608.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M637.1 565.3 L631.8 574.7 L626.4 565.3 L631.8 556.0 Z"></path>
-					</g>
-					<path d="M592.1 574.2 L591.75 576 L2475.25 609.6085699924604 L2475.3 609.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M599.4 566.3 L592.1 574.2 L589.0 563.9 L596.2 556.0 Z"></path>
-					</g>
-					<path d="M838.8 127.8 L838.75 218 L214 370.8257601639904 L214.0 370.8 " fill="none"></path>
-					<path d="M844.1 127.8 L838.8 127.8 L833.4 127.8 L838.8 114.5 Z"></path>
-					<path d="M1886.9 152.0 L2050.25 218 L1112.63687150838 381.5 L1112.6 381.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1880.2 143.6 L1886.9 152.0 L1876.2 153.4 L1869.6 145.0 Z"></path>
-					</g>
-					<path d="M1554.9 149.6 L1283 218 L375.25 388.8144546649146 L375.3 388.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1565.3 152.5 L1554.9 149.6 L1562.7 142.1 L1573.0 145.0 Z"></path>
-					</g>
-					<path d="M5963.1 464.8 L6055.75 576 L6055.75 596 L6055.8 596.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5961.2 454.3 L5963.1 464.8 L5953.0 461.1 L5951.1 450.5 Z"></path>
-					</g>
-					<path d="M5861.2 466.1 L5789.25 576 L5789.25 596 L5789.3 596.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5870.8 461.2 L5861.2 466.1 L5861.9 455.4 L5871.5 450.5 Z"></path>
-					</g>
-					<path d="M3663.4 113.7 L4283.75 218 L5710 375.32475735633955 L5710.0 375.3 " fill="none"></path>
-					<path d="M3664.3 108.5 L3663.4 113.7 L3662.5 119.0 L3650.3 111.5 Z"></path>
-					<path d="M5458.7 452.5 L5515.25 576 L5515.25 596 L5515.3 596.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5459.6 441.8 L5458.7 452.5 L5449.9 446.2 L5450.9 435.5 Z"></path>
-					</g>
-					<path d="M5360.9 446.0 L5168.75 576 L4368.25 605.5710197710717 L4368.3 605.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5371.6 445.1 L5360.9 446.0 L5365.6 436.3 L5376.4 435.5 Z"></path>
-					</g>
-					<path d="M3663.1 123.9 L3993.5 218 L5231.75 371.94808126410834 L5231.8 371.9 " fill="none"></path>
-					<path d="M3664.5 118.7 L3663.1 123.9 L3661.6 129.0 L3650.3 120.2 Z"></path>
-					<path d="M4730.3 451.6 L4804 576 L2687.25 609.8070520751321 L2687.3 609.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4730.1 440.8 L4730.3 451.6 L4721.0 446.2 L4720.8 435.5 Z"></path>
-					</g>
-					<path d="M4640.7 447.9 L4496.5 576 L4333.8239436619715 596 L4333.8 596.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4651.2 445.7 L4640.7 447.9 L4644.1 437.7 L4654.7 435.5 Z"></path>
-					</g>
-					<path d="M3632.7 137.5 L3752 218 L4496.5 358.872621564482 L4496.5 358.9 " fill="none"></path>
-					<path d="M3635.7 133.0 L3632.7 137.5 L3629.7 141.9 L3621.7 130.0 Z"></path>
-					<path d="M4312.3 447.9 L4456.5 576 L4975 605.5216519647153 L4975.0 605.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4308.9 437.7 L4312.3 447.9 L4301.8 445.7 L4298.3 435.5 Z"></path>
-					</g>
-					<path d="M4174.6 445.1 L3955.75 576 L4097.721830985915 596 L4097.7 596.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4185.4 444.9 L4174.6 445.1 L4179.9 435.7 L4190.6 435.5 Z"></path>
-					</g>
-					<path d="M3552.3 141.7 L3510.5 218 L4094.8701117318437 358.5 L4094.9 358.5 " fill="none"></path>
-					<path d="M3557.0 144.3 L3552.3 141.7 L3547.7 139.1 L3558.8 130.0 Z"></path>
-					<path d="M3714.4 445.6 L3915.75 576 L3924.4823943661972 596 L3924.5 596.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3709.5 436.1 L3714.4 445.6 L3703.7 445.0 L3698.7 435.5 Z"></path>
-					</g>
-					<path d="M3582.0 447.9 L3437.75 576 L4047.25 604.1003246753247 L4047.3 604.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3592.5 445.7 L3582.0 447.9 L3585.4 437.7 L3595.9 435.5 Z"></path>
-					</g>
-					<path d="M3514.0 137.0 L3382.25 218 L3583.973463687151 358.5 L3584.0 358.5 " fill="none"></path>
-					<path d="M3516.8 141.5 L3514.0 137.0 L3511.2 132.4 L3525.3 130.0 Z"></path>
-					<path d="M3253.5 447.9 L3397.75 576 L1778.75 610.1196200653013 L1778.8 610.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3250.1 437.7 L3253.5 447.9 L3243.0 445.7 L3239.6 435.5 Z"></path>
-					</g>
-					<path d="M2976.3 433.0 L2101.25 576 L4047.25 608.7951578447662 L4047.3 608.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2986.4 436.7 L2976.3 433.0 L2984.7 426.2 L2994.8 429.9 Z"></path>
-					</g>
-					<path d="M3503.0 136.1 L3342.25 218 L3227.6522346368715 358.5 L3227.7 358.5 " fill="none"></path>
-					<path d="M3505.5 140.8 L3503.0 136.1 L3500.6 131.3 L3514.9 130.0 Z"></path>
-					<path d="M2692.9 187.4 L2730 218 L1929.16969273743 381.5 L1929.2 381.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2689.1 177.3 L2692.9 187.4 L2682.3 185.6 L2678.5 175.5 Z"></path>
-					</g>
-					<path d="M2405.0 157.9 L2220.75 218 L1402.3365921787708 381.5 L1402.3 381.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2415.5 160.1 L2405.0 157.9 L2412.2 150.0 L2422.8 152.1 Z"></path>
-					</g>
-					<path d="M6206.3 171.7 L6206.25 218 L6495.1152234636875 381.5 L6495.1 381.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6211.6 162.3 L6206.3 171.7 L6200.9 162.3 L6206.3 153.0 Z"></path>
-					</g>
-					<path d="M3285.1 197.4 L3302.25 218 L3903.5 381.99809523809523 L3903.5 382.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3283.2 186.8 L3285.1 197.4 L3275.0 193.6 L3273.1 183.0 Z"></path>
-					</g>
-					<path d="M3101.9 195.9 L3078.75 218 L1941.75 384.0734394124847 L1941.8 384.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3112.3 193.3 L3101.9 195.9 L3104.9 185.6 L3115.4 183.0 Z"></path>
-					</g>
-					<path d="M3007.8 188.4 L3038.75 218 L3903.5 386.2960043490079 L3903.5 386.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3004.7 178.1 L3007.8 188.4 L2997.3 185.8 L2994.3 175.5 Z"></path>
-					</g>
-					<path d="M2807.1 187.4 L2770 218 L1932.633379888268 381.5 L1932.6 381.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2817.7 185.6 L2807.1 187.4 L2810.9 177.3 L2821.5 175.5 Z"></path>
-					</g>
-					<path d="M6824.3 164.2 L6824.25 218 L4013.5 393.5645991450755 L4013.5 393.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6829.6 154.8 L6824.3 164.2 L6818.9 154.8 L6824.3 145.5 Z"></path>
-					</g>
-					<path d="M7060.8 179.2 L7060.75 218 L7060.75 381.5 L7060.8 381.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7066.1 169.8 L7060.8 179.2 L7055.4 169.8 L7060.8 160.5 Z"></path>
-					</g>
-					<path d="M4631.1 110.7 L5934.75 218 L6272.939245810056 381.5 L6272.9 381.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4622.2 104.7 L4631.1 110.7 L4621.4 115.3 L4612.5 109.2 Z"></path>
-					</g>
-					<path d="M4631.1 112.0 L5797.75 218 L6143 384.91357191087104 L6143.0 384.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4622.3 105.8 L4631.1 112.0 L4621.3 116.4 L4612.5 110.3 Z"></path>
-					</g>
-					<path d="M4349.4 199.5 L4323.75 218 L2320 393.8839033958563 L2320.0 393.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4360.1 198.4 L4349.4 199.5 L4353.8 189.7 L4364.5 188.6 Z"></path>
-					</g>
-					<g data-name="SelectableButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SelectableButton">
-							<rect x="419.8" y="22.5" height="153.0" width="247.0" data-name="SelectableButton"></rect>
-							<path d="M419.8 53.5 L666.8 53.5" fill="none" data-name="SelectableButton"></path>
-							<path d="M419.8 114.5 L666.8 114.5" fill="none" data-name="SelectableButton"></path>
-						</g>
-						<g transform="translate(419.75, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SelectableButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SelectableButton">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="SelectableButton">SelectableButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(419.75, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SelectableButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SelectableButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SelectableButton">+child: Widget</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SelectableButton">+selected: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SelectableButton">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(419.75, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SelectableButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SelectableButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SelectableButton">-Color _getFillColor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SelectableButton">-Color _getTextColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SelectableButton">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="2249.0" y="381.5" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(2249, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="1764.8" y="381.5" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
-						</g>
-						<g transform="translate(1764.75, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
-								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomSlider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomSlider">
-							<rect x="449.8" y="238.0" height="318.0" width="364.0" data-name="CustomSlider"></rect>
-							<path d="M449.8 269.0 L813.8 269.0" fill="none" data-name="CustomSlider"></path>
-							<path d="M449.8 525.0 L813.8 525.0" fill="none" data-name="CustomSlider"></path>
-						</g>
-						<g transform="translate(449.75, 238)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomSlider">
-								<text x="174.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomSlider">CustomSlider</text>
-								
-							</g>
-						</g>
-						<g transform="translate(449.75, 269)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomSlider">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomSlider">+value: double?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomSlider">+minValue: double?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomSlider">+maxValue: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomSlider">+minorTick: int?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomSlider">+onChanged: dynamic Function(double)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomSlider">+onChangeEnd: dynamic Function(double)?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="CustomSlider">+activeColor: Color?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="CustomSlider">+inactiveColor: Color?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="CustomSlider">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="CustomSlider">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="CustomSlider">+thumbColor: Color?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="CustomSlider">+isColored: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="CustomSlider">+labelValuePrecision: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="CustomSlider">+tickValuePrecision: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="CustomSlider">+linearStep: bool</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="CustomSlider">+steps: AnnotatedScaleQuestion?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(449.75, 525)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomSlider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomSlider">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomSlider">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(double)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(double)?">
-							<rect x="372.3" y="596.0" height="31.0" width="231.0" data-name="dynamic Function(double)?"></rect>
-						</g>
-						<g transform="translate(372.25, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(double)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(double)?">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(double)?">dynamic Function(double)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="274.3" y="596.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(274.25, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AnnotatedScaleQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestion">
-							<rect x="2475.3" y="596.0" height="31.0" width="212.0" data-name="AnnotatedScaleQuestion"></rect>
-						</g>
-						<g transform="translate(2475.25, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestion">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestion">AnnotatedScaleQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomTrackShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomTrackShape">
-							<rect x="0.0" y="366.0" height="62.0" width="214.0" data-name="CustomTrackShape"></rect>
-							<path d="M0.0 397.0 L214.0 397.0" fill="none" data-name="CustomTrackShape"></path>
-						</g>
-						<g transform="translate(0, 366)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomTrackShape">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomTrackShape">CustomTrackShape</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 397)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomTrackShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomTrackShape">+Rect getPreferredRect()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoundedRectSliderTrackShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoundedRectSliderTrackShape">
-							<rect x="706.8" y="83.5" height="31.0" width="264.0" data-name="RoundedRectSliderTrackShape"></rect>
-						</g>
-						<g transform="translate(706.75, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoundedRectSliderTrackShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoundedRectSliderTrackShape">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoundedRectSliderTrackShape">RoundedRectSliderTrackShape</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireWidget">
-							<rect x="1010.8" y="45.5" height="107.0" width="318.0" data-name="QuestionnaireWidget"></rect>
-							<path d="M1010.8 76.5 L1328.8 76.5" fill="none" data-name="QuestionnaireWidget"></path>
-						</g>
-						<g transform="translate(1010.75, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireWidget">
-								<text x="151.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireWidget">QuestionnaireWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1010.75, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireWidget">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireWidget">+header: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireWidget">+footer: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionnaireWidget">+questions: List&lt;Question&lt;dynamic&gt;&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="HtmlTextBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlTextBox">
-							<rect x="1368.8" y="52.5" height="93.0" width="136.0" data-name="HtmlTextBox"></rect>
-							<path d="M1368.8 83.5 L1504.8 83.5" fill="none" data-name="HtmlTextBox"></path>
-							<path d="M1368.8 114.5 L1504.8 114.5" fill="none" data-name="HtmlTextBox"></path>
-						</g>
-						<g transform="translate(1368.75, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlTextBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlTextBox">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlTextBox">HtmlTextBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1368.75, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlTextBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlTextBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlTextBox">+text: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1368.75, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlTextBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlTextBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlTextBox">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionContainer">
-							<rect x="1544.8" y="53.0" height="92.0" width="422.0" data-name="QuestionContainer"></rect>
-							<path d="M1544.8 84.0 L1966.8 84.0" fill="none" data-name="QuestionContainer"></path>
-						</g>
-						<g transform="translate(1544.75, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionContainer">
-								<text x="203.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionContainer">QuestionContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1544.75, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionContainer">+onDone: dynamic Function(Answer&lt;dynamic&gt;, int)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionContainer">+question: Question&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionContainer">+index: int</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-							<rect x="853.8" y="381.5" height="31.0" width="340.0" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)"></rect>
-						</g>
-						<g transform="translate(853.75, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">
-								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;, int)">dynamic Function(Answer&lt;dynamic&gt;, int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Question">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Question">
-							<rect x="288.3" y="381.5" height="31.0" width="87.0" data-name="Question"></rect>
-						</g>
-						<g transform="translate(288.25, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Question">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Question">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="Question">Question</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionHeader">
-							<rect x="2066.8" y="22.5" height="153.0" width="316.0" data-name="QuestionHeader"></rect>
-							<path d="M2066.8 53.5 L2382.8 53.5" fill="none" data-name="QuestionHeader"></path>
-							<path d="M2066.8 114.5 L2382.8 114.5" fill="none" data-name="QuestionHeader"></path>
-						</g>
-						<g transform="translate(2066.75, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionHeader">
-								<text x="150.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionHeader">QuestionHeader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2066.75, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionHeader">+prompt: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionHeader">+subtitle: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionHeader">+rationale: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2066.75, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionHeader">-List&lt;Widget&gt; _buildSubtitle()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionHeader">-List&lt;Widget&gt; _buildRationaleButton()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionHeader">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionWidget">
-							<rect x="5710.0" y="343.5" height="107.0" width="393.0" data-name="ChoiceQuestionWidget"></rect>
-							<path d="M5710.0 374.5 L6103.0 374.5" fill="none" data-name="ChoiceQuestionWidget"></path>
-						</g>
-						<g transform="translate(5710, 343.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionWidget">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionWidget">ChoiceQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5710, 374.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionWidget">+question: ChoiceQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionWidget">+multiSelectionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionWidget">+subtitle: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestion">
-							<rect x="5984.8" y="596.0" height="31.0" width="142.0" data-name="ChoiceQuestion"></rect>
-						</g>
-						<g transform="translate(5984.75, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestion">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestion">ChoiceQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-							<rect x="5633.8" y="596.0" height="31.0" width="311.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)"></rect>
-						</g>
-						<g transform="translate(5633.75, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)">
-								<text x="147.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)">dynamic Function(Answer&lt;dynamic&gt;)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionWidget">
-							<rect x="3501.3" y="68.0" height="62.0" width="149.0" data-name="QuestionWidget"></rect>
-							<path d="M3501.3 99.0 L3650.3 99.0" fill="none" data-name="QuestionWidget"></path>
-						</g>
-						<g transform="translate(3501.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionWidget">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionWidget">QuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3501.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionWidget">+subtitle: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionWidget">
-							<rect x="5231.8" y="358.5" height="77.0" width="403.0" data-name="FreeTextQuestionWidget"></rect>
-							<path d="M5231.8 389.5 L5634.8 389.5" fill="none" data-name="FreeTextQuestionWidget"></path>
-						</g>
-						<g transform="translate(5231.75, 358.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionWidget">FreeTextQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5231.75, 389.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionWidget">+question: FreeTextQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestion">
-							<rect x="5436.8" y="596.0" height="31.0" width="157.0" data-name="FreeTextQuestion"></rect>
-						</g>
-						<g transform="translate(5436.75, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestion">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestion">FreeTextQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-							<rect x="4047.3" y="596.0" height="31.0" width="321.0" data-name="dynamic Function(Answer&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(4047.25, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(Answer&lt;dynamic&gt;)?">dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AnnotatedScaleQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AnnotatedScaleQuestionWidget">
-							<rect x="4496.5" y="358.5" height="77.0" width="403.0" data-name="AnnotatedScaleQuestionWidget"></rect>
-							<path d="M4496.5 389.5 L4899.5 389.5" fill="none" data-name="AnnotatedScaleQuestionWidget"></path>
-						</g>
-						<g transform="translate(4496.5, 358.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AnnotatedScaleQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="AnnotatedScaleQuestionWidget">AnnotatedScaleQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4496.5, 389.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AnnotatedScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AnnotatedScaleQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+question: AnnotatedScaleQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AnnotatedScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VisualAnalogueQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestionWidget">
-							<rect x="4053.5" y="358.5" height="77.0" width="403.0" data-name="VisualAnalogueQuestionWidget"></rect>
-							<path d="M4053.5 389.5 L4456.5 389.5" fill="none" data-name="VisualAnalogueQuestionWidget"></path>
-						</g>
-						<g transform="translate(4053.5, 358.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestionWidget">VisualAnalogueQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4053.5, 389.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="VisualAnalogueQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="VisualAnalogueQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+question: VisualAnalogueQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="VisualAnalogueQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VisualAnalogueQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VisualAnalogueQuestion">
-							<rect x="4975.0" y="596.0" height="31.0" width="210.0" data-name="VisualAnalogueQuestion"></rect>
-						</g>
-						<g transform="translate(4975, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VisualAnalogueQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VisualAnalogueQuestion">
-								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="VisualAnalogueQuestion">VisualAnalogueQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BooleanQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestionWidget">
-							<rect x="3437.8" y="358.5" height="77.0" width="403.0" data-name="BooleanQuestionWidget"></rect>
-							<path d="M3437.8 389.5 L3840.8 389.5" fill="none" data-name="BooleanQuestionWidget"></path>
-						</g>
-						<g transform="translate(3437.75, 358.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestionWidget">BooleanQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3437.75, 389.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BooleanQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BooleanQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="BooleanQuestionWidget">+question: BooleanQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BooleanQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BooleanQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BooleanQuestion">
-							<rect x="3855.3" y="596.0" height="31.0" width="152.0" data-name="BooleanQuestion"></rect>
-						</g>
-						<g transform="translate(3855.25, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BooleanQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BooleanQuestion">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="BooleanQuestion">BooleanQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionWidget">
-							<rect x="2994.8" y="358.5" height="77.0" width="403.0" data-name="ScaleQuestionWidget"></rect>
-							<path d="M2994.8 389.5 L3397.8 389.5" fill="none" data-name="ScaleQuestionWidget"></path>
-						</g>
-						<g transform="translate(2994.75, 358.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionWidget">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionWidget">ScaleQuestionWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2994.75, 389.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionWidget">+question: ScaleQuestion</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionWidget">+onDone: dynamic Function(Answer&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestion">
-							<rect x="1647.8" y="596.0" height="31.0" width="131.0" data-name="ScaleQuestion"></rect>
-						</g>
-						<g transform="translate(1647.75, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestion">
-								<text x="57.5" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestion">ScaleQuestion</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTile">
-							<rect x="2422.8" y="22.5" height="153.0" width="326.0" data-name="StudyTile"></rect>
-							<path d="M2422.8 53.5 L2748.8 53.5" fill="none" data-name="StudyTile"></path>
-							<path d="M2422.8 144.5 L2748.8 144.5" fill="none" data-name="StudyTile"></path>
-						</g>
-						<g transform="translate(2422.75, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTile">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTile">StudyTile</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2422.75, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTile">+title: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTile">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyTile">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyTile">+onTap: dynamic Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyTile">+contentPadding: EdgeInsetsGeometry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2422.75, 144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTile">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTile">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EdgeInsetsGeometry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsetsGeometry">
-							<rect x="1233.8" y="381.5" height="31.0" width="182.0" data-name="EdgeInsetsGeometry"></rect>
-						</g>
-						<g transform="translate(1233.75, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="EdgeInsetsGeometry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsetsGeometry">
-								<text x="83.0" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsetsGeometry">EdgeInsetsGeometry</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoundCheckbox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoundCheckbox">
-							<rect x="6044.8" y="45.0" height="108.0" width="323.0" data-name="RoundCheckbox"></rect>
-							<path d="M6044.8 76.0 L6367.8 76.0" fill="none" data-name="RoundCheckbox"></path>
-							<path d="M6044.8 122.0 L6367.8 122.0" fill="none" data-name="RoundCheckbox"></path>
-						</g>
-						<g transform="translate(6044.75, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoundCheckbox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoundCheckbox">
-								<text x="153.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoundCheckbox">RoundCheckbox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6044.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoundCheckbox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoundCheckbox">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoundCheckbox">+onChanged: dynamic Function(bool)?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoundCheckbox">+value: bool?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6044.75, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoundCheckbox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoundCheckbox">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoundCheckbox">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(bool)?">
-							<rect x="6417.0" y="381.5" height="31.0" width="211.0" data-name="dynamic Function(bool)?"></rect>
-						</g>
-						<g transform="translate(6417, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(bool)?">
-								<text x="97.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(bool)?">dynamic Function(bool)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionCard">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionCard">
-							<rect x="3079.8" y="15.0" height="168.0" width="247.0" data-name="InterventionCard"></rect>
-							<path d="M3079.8 46.0 L3326.8 46.0" fill="none" data-name="InterventionCard"></path>
-							<path d="M3079.8 152.0 L3326.8 152.0" fill="none" data-name="InterventionCard"></path>
-						</g>
-						<g transform="translate(3079.75, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionCard">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionCard">InterventionCard</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3079.75, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCard">+intervention: Intervention</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionCard">+selected: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionCard">+showCheckbox: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionCard">+showTasks: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionCard">+showDescription: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionCard">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3079.75, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCard">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCard">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCard">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention">
-							<rect x="3903.5" y="381.5" height="31.0" width="110.0" data-name="Intervention"></rect>
-						</g>
-						<g transform="translate(3903.5, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention">Intervention</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionCardTitle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionCardTitle">
-							<rect x="2788.8" y="22.5" height="153.0" width="251.0" data-name="InterventionCardTitle"></rect>
-							<path d="M2788.8 53.5 L3039.8 53.5" fill="none" data-name="InterventionCardTitle"></path>
-							<path d="M2788.8 144.5 L3039.8 144.5" fill="none" data-name="InterventionCardTitle"></path>
-						</g>
-						<g transform="translate(2788.75, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionCardTitle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionCardTitle">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionCardTitle">InterventionCardTitle</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2788.75, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardTitle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardTitle">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardTitle">+intervention: Intervention?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionCardTitle">+selected: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionCardTitle">+showCheckbox: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionCardTitle">+showDescriptionButton: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionCardTitle">+onTap: dynamic Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2788.75, 144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardTitle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardTitle">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardTitle">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionCardDescription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionCardDescription">
-							<rect x="6705.8" y="52.5" height="93.0" width="237.0" data-name="InterventionCardDescription"></rect>
-							<path d="M6705.8 83.5 L6942.8 83.5" fill="none" data-name="InterventionCardDescription"></path>
-							<path d="M6705.8 114.5 L6942.8 114.5" fill="none" data-name="InterventionCardDescription"></path>
-						</g>
-						<g transform="translate(6705.75, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionCardDescription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionCardDescription">
-								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionCardDescription">InterventionCardDescription</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6705.75, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardDescription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardDescription">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardDescription">+intervention: Intervention</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6705.75, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionCardDescription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionCardDescription">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionCardDescription">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="_TaskList">
-						<g fill="#eee8d5" stroke="#33322E" data-name="_TaskList">
-							<rect x="6407.8" y="45.0" height="108.0" width="258.0" data-name="_TaskList"></rect>
-							<path d="M6407.8 76.0 L6665.8 76.0" fill="none" data-name="_TaskList"></path>
-							<path d="M6407.8 107.0 L6665.8 107.0" fill="none" data-name="_TaskList"></path>
-						</g>
-						<g transform="translate(6407.75, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="_TaskList">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="_TaskList">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="_TaskList">_TaskList</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6407.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_TaskList">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_TaskList">
-								<text x="0.0" y="13.5" stroke="none" data-name="_TaskList">+tasks: List&lt;InterventionTask&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6407.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="_TaskList">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="_TaskList">
-								<text x="0.0" y="13.5" stroke="none" data-name="_TaskList">+String scheduleString()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="_TaskList">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="HtmlText">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlText">
-							<rect x="6982.8" y="37.5" height="123.0" width="156.0" data-name="HtmlText"></rect>
-							<path d="M6982.8 68.5 L7138.8 68.5" fill="none" data-name="HtmlText"></path>
-							<path d="M6982.8 129.5 L7138.8 129.5" fill="none" data-name="HtmlText"></path>
-						</g>
-						<g transform="translate(6982.75, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlText">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlText">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlText">HtmlText</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6982.75, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlText">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlText">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlText">+text: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="HtmlText">+style: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="HtmlText">+centered: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6982.75, 129.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlText">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlText">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlText">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TextStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
-							<rect x="7016.3" y="381.5" height="31.0" width="89.0" data-name="TextStyle"></rect>
-						</g>
-						<g transform="translate(7016.25, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
-								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BottomOnboardingNavigation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BottomOnboardingNavigation">
-							<rect x="4364.5" y="0.0" height="198.0" width="248.0" data-name="BottomOnboardingNavigation"></rect>
-							<path d="M4364.5 31.0 L4612.5 31.0" fill="none" data-name="BottomOnboardingNavigation"></path>
-							<path d="M4364.5 167.0 L4612.5 167.0" fill="none" data-name="BottomOnboardingNavigation"></path>
-						</g>
-						<g transform="translate(4364.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BottomOnboardingNavigation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BottomOnboardingNavigation">
-								<text x="116.0" y="13.5" stroke="none" text-anchor="middle" data-name="BottomOnboardingNavigation">BottomOnboardingNavigation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4364.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BottomOnboardingNavigation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BottomOnboardingNavigation">
-								<text x="0.0" y="13.5" stroke="none" data-name="BottomOnboardingNavigation">+onBack: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BottomOnboardingNavigation">+onNext: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BottomOnboardingNavigation">+backLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BottomOnboardingNavigation">+nextLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BottomOnboardingNavigation">+hideNext: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BottomOnboardingNavigation">+nextIcon: Icon?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="BottomOnboardingNavigation">+backIcon: Icon?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="BottomOnboardingNavigation">+progress: Widget?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4364.5, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BottomOnboardingNavigation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BottomOnboardingNavigation">
-								<text x="0.0" y="13.5" stroke="none" data-name="BottomOnboardingNavigation">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="6233.0" y="381.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(6233, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Icon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Icon">
-							<rect x="6143.0" y="381.5" height="31.0" width="50.0" data-name="Icon"></rect>
-						</g>
-						<g transform="translate(6143, 381.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Icon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Icon">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Icon">Icon</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/env/uml.svg b/docs/uml/core/lib/src/env/uml.svg
deleted file mode 100644
index e1d655211..000000000
--- a/docs/uml/core/lib/src/env/uml.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/consent/uml.svg b/docs/uml/core/lib/src/models/consent/uml.svg
deleted file mode 100644
index d14fbdd3c..000000000
--- a/docs/uml/core/lib/src/models/consent/uml.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<svg version="1.1" baseProfile="full" width="328.0" height="209.0" viewbox="0 0 328 209" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[ConsentItem
-	  |
-	  +id: String;
-	  +title: String?;
-	  +description: String?;
-	  +iconName: String
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  +String toString()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="209.0" width="328.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)">
-					<g data-name="ConsentItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItem">
-							<rect x="0.0" y="0.0" height="153.0" width="272.0" data-name="ConsentItem"></rect>
-							<path d="M0.0 31.0 L272.0 31.0" fill="none" data-name="ConsentItem"></path>
-							<path d="M0.0 107.0 L272.0 107.0" fill="none" data-name="ConsentItem"></path>
-						</g>
-						<g transform="translate(0, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItem">
-								<text x="128.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItem">ConsentItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItem">+id: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItem">+title: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItem">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItem">+iconName: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItem">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItem">+String toString()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/data/uml.svg b/docs/uml/core/lib/src/models/data/uml.svg
deleted file mode 100644
index 615c4e2a3..000000000
--- a/docs/uml/core/lib/src/models/data/uml.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<svg version="1.1" baseProfile="full" width="407.0" height="194.0" viewbox="0 0 407 194" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[DataReference
-	  |
-	  +task: String;
-	  +property: String
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  +String toString();
-	  +Map&lt;DateTime, T&gt; retrieveFromResults()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="194.0" width="407.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)">
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="0.0" y="0.0" height="138.0" width="351.0" data-name="DataReference"></rect>
-							<path d="M0.0 31.0 L351.0 31.0" fill="none" data-name="DataReference"></path>
-							<path d="M0.0 77.0 L351.0 77.0" fill="none" data-name="DataReference"></path>
-						</g>
-						<g transform="translate(0, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="167.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReference">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReference">+task: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReference">+property: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 77)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReference">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReference">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReference">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReference">+Map&lt;DateTime, T&gt; retrieveFromResults()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/eligibility/uml.svg b/docs/uml/core/lib/src/models/eligibility/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/eligibility/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/expressions/types/uml.svg b/docs/uml/core/lib/src/models/expressions/types/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/expressions/types/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/expressions/uml.svg b/docs/uml/core/lib/src/models/expressions/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/expressions/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/interventions/tasks/uml.svg b/docs/uml/core/lib/src/models/interventions/tasks/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/interventions/tasks/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/interventions/uml.svg b/docs/uml/core/lib/src/models/interventions/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/interventions/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/observations/tasks/uml.svg b/docs/uml/core/lib/src/models/observations/tasks/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/observations/tasks/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/observations/uml.svg b/docs/uml/core/lib/src/models/observations/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/observations/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/questionnaire/questions/uml.svg b/docs/uml/core/lib/src/models/questionnaire/questions/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/questionnaire/questions/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/questionnaire/uml.svg b/docs/uml/core/lib/src/models/questionnaire/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/questionnaire/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/report/sections/uml.svg b/docs/uml/core/lib/src/models/report/sections/uml.svg
deleted file mode 100644
index 62be008e4..000000000
--- a/docs/uml/core/lib/src/models/report/sections/uml.svg
+++ /dev/null
@@ -1,200 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1011.0" height="412.0" viewbox="0 0 1011 412" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[AverageSection
-	  |
-	  &lt;static&gt;+sectionType: String;
-	  +aggregate: TemporalAggregation?;
-	  +resultProperty: DataReference&lt;num&gt;?
-	  |
-	  +Map&lt;String, dynamic&gt; toJson()
-	]
-	
-	[AverageSection]o-[TemporalAggregation]
-	[AverageSection]o-[DataReference]
-	[&lt;abstract&gt;ReportSection]&lt;:-[AverageSection]
-	
-	[LinearRegressionSection
-	  |
-	  &lt;static&gt;+sectionType: String;
-	  +resultProperty: DataReference&lt;num&gt;?;
-	  +alpha: double;
-	  +improvement: ImprovementDirection?
-	  |
-	  +Map&lt;String, dynamic&gt; toJson()
-	]
-	
-	[LinearRegressionSection]o-[DataReference]
-	[LinearRegressionSection]o-[ImprovementDirection]
-	[&lt;abstract&gt;ReportSection]&lt;:-[LinearRegressionSection]
-	
-	[ImprovementDirection
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ImprovementDirection&gt;;
-	  &lt;static&gt;+positive: ImprovementDirection;
-	  &lt;static&gt;+negative: ImprovementDirection
-	]
-	
-	[ImprovementDirection]o-[ImprovementDirection]
-	[Enum]&lt;:--[ImprovementDirection]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="412.0" width="1011.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M147.1 219.7 L145 229 L145 287 L145.0 287.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M154.3 211.8 L147.1 219.7 L143.9 209.4 L151.2 201.5 Z"></path>
-					</g>
-					<path d="M248.2 213.9 L265.25 229 L328.5765306122449 287 L328.6 287.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M244.8 203.7 L248.2 213.9 L237.7 211.7 L234.3 201.5 Z"></path>
-					</g>
-					<path d="M272.9 30.3 L165 51 L165 78.5 L165.0 78.5 " fill="none"></path>
-					<path d="M273.9 35.5 L272.9 30.3 L271.9 25.1 L286.0 27.8 Z"></path>
-					<path d="M439.6 221.1 L430.25 229 L363.3724489795918 287 L363.4 287.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M450.1 219.1 L439.6 221.1 L443.2 211.0 L453.8 209.0 Z"></path>
-					</g>
-					<path d="M593.5 224.3 L596.75 229 L628.7908163265306 249 L628.8 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M592.6 213.6 L593.5 224.3 L583.8 219.7 L582.9 209.0 Z"></path>
-					</g>
-					<path d="M427.1 30.3 L535 51 L535 71 L535.0 71.0 " fill="none"></path>
-					<path d="M428.1 25.1 L427.1 30.3 L426.1 35.5 L414.0 27.8 Z"></path>
-					<path d="M918.1 252.0 L930 249 L937.5 249 L937.5 249 L945 302.5 L945 302.5 L937.5 356 L937.5 356 L930 356 L930 356 L900 348.5522041763341 L900.0 348.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M907.8 249.0 L918.1 252.0 L910.3 259.4 L900.0 256.4 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M770.5 168.8 L770.5 229 L755.2619047619048 249 L755.3 249.0 " fill="none"></path>
-					</g>
-					<path d="M775.8 168.8 L770.5 168.8 L765.2 168.8 L770.5 155.5 Z"></path>
-					<g data-name="AverageSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSection">
-							<rect x="0.0" y="78.5" height="123.0" width="330.0" data-name="AverageSection"></rect>
-							<path d="M0.0 109.5 L330.0 109.5" fill="none" data-name="AverageSection"></path>
-							<path d="M0.0 170.5 L330.0 170.5" fill="none" data-name="AverageSection"></path>
-						</g>
-						<g transform="translate(0, 78.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSection">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSection">AverageSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 109.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSection">&lt;static&gt;+sectionType: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSection">+aggregate: TemporalAggregation?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSection">+resultProperty: DataReference&lt;num&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 170.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSection">+Map&lt;String, dynamic&gt; toJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="52.0" y="287.0" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
-						</g>
-						<g transform="translate(52, 287)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="278.0" y="287.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(278, 287)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="286.0" y="0.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(286, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSection">
-							<rect x="370.0" y="71.0" height="138.0" width="330.0" data-name="LinearRegressionSection"></rect>
-							<path d="M370.0 102.0 L700.0 102.0" fill="none" data-name="LinearRegressionSection"></path>
-							<path d="M370.0 178.0 L700.0 178.0" fill="none" data-name="LinearRegressionSection"></path>
-						</g>
-						<g transform="translate(370, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSection">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSection">LinearRegressionSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(370, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSection">&lt;static&gt;+sectionType: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSection">+resultProperty: DataReference&lt;num&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSection">+alpha: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="LinearRegressionSection">+improvement: ImprovementDirection?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(370, 178)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSection">+Map&lt;String, dynamic&gt; toJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="529.0" y="249.0" height="107.0" width="371.0" data-name="ImprovementDirection"></rect>
-							<path d="M529.0 280.0 L900.0 280.0" fill="none" data-name="ImprovementDirection"></path>
-						</g>
-						<g transform="translate(529, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(529, 280)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirection">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirection">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirection">&lt;static&gt;+values: List&lt;ImprovementDirection&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirection">&lt;static&gt;+positive: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirection">&lt;static&gt;+negative: ImprovementDirection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="740.0" y="124.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(740, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/report/uml.svg b/docs/uml/core/lib/src/models/report/uml.svg
deleted file mode 100644
index e323c06c7..000000000
--- a/docs/uml/core/lib/src/models/report/uml.svg
+++ /dev/null
@@ -1,306 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1115.0" height="742.0" viewbox="0 0 1115 742" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[AverageSection
-	  |
-	  &lt;static&gt;+sectionType: String;
-	  +aggregate: TemporalAggregation?;
-	  +resultProperty: DataReference&lt;num&gt;?
-	  |
-	  +Map&lt;String, dynamic&gt; toJson()
-	]
-	
-	[AverageSection]o-[TemporalAggregation]
-	[AverageSection]o-[DataReference]
-	[&lt;abstract&gt;ReportSection]&lt;:-[AverageSection]
-	
-	[LinearRegressionSection
-	  |
-	  &lt;static&gt;+sectionType: String;
-	  +resultProperty: DataReference&lt;num&gt;?;
-	  +alpha: double;
-	  +improvement: ImprovementDirection?
-	  |
-	  +Map&lt;String, dynamic&gt; toJson()
-	]
-	
-	[LinearRegressionSection]o-[DataReference]
-	[LinearRegressionSection]o-[ImprovementDirection]
-	[&lt;abstract&gt;ReportSection]&lt;:-[LinearRegressionSection]
-	
-	[ImprovementDirection
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ImprovementDirection&gt;;
-	  &lt;static&gt;+positive: ImprovementDirection;
-	  &lt;static&gt;+negative: ImprovementDirection
-	]
-	
-	[ImprovementDirection]o-[ImprovementDirection]
-	[Enum]&lt;:--[ImprovementDirection]
-	
-	[TemporalAggregation
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;TemporalAggregation&gt;;
-	  &lt;static&gt;+day: TemporalAggregation;
-	  &lt;static&gt;+phase: TemporalAggregation;
-	  &lt;static&gt;+intervention: TemporalAggregation
-	]
-	
-	[TemporalAggregation]o-[TemporalAggregation]
-	[Enum]&lt;:--[TemporalAggregation]
-	
-	[ReportSpecification
-	  |
-	  +primary: ReportSection?;
-	  +secondary: List&lt;ReportSection&gt;
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  +String toString()
-	]
-	
-	[ReportSpecification]o-[&lt;abstract&gt;ReportSection]
-	
-	[&lt;abstract&gt;ReportSection
-	  |
-	  &lt;static&gt;+sectionTypes: Map&lt;String, ReportSection Function(Map&lt;String, dynamic&gt;)&gt;;
-	  &lt;static&gt;+keyType: String;
-	  +type: String;
-	  +id: String;
-	  +title: String?;
-	  +description: String?
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  +String toString()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="742.0" width="1115.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M163.9 534.6 L161.5 544 L167.05555555555554 564 L167.1 564.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M171.3 526.9 L163.9 534.6 L161.0 524.2 L168.5 516.5 Z"></path>
-					</g>
-					<path d="M332.7 524.4 L374.75 544 L496.65277777777777 609.5 L496.7 609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M326.5 515.6 L332.7 524.4 L322.0 525.3 L315.8 516.5 Z"></path>
-					</g>
-					<path d="M206.7 352.7 L184 366 L184 393.5 L184.0 393.5 " fill="none"></path>
-					<path d="M209.4 357.3 L206.7 352.7 L204.0 348.1 L218.2 346.0 Z"></path>
-					<path d="M665.2 534.7 L652 544 L549.7067901234568 609.5 L549.7 609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M675.9 533.7 L665.2 534.7 L669.7 525.0 L680.4 524.0 Z"></path>
-					</g>
-					<path d="M698.4 537.4 L692 544 L734.9475308641976 571.5 L734.9 571.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M708.8 534.4 L698.4 537.4 L701.1 527.0 L711.4 524.0 Z"></path>
-					</g>
-					<path d="M718.9 349.5 L778.5 366 L778.5 386 L778.5 386.0 " fill="none"></path>
-					<path d="M720.4 344.4 L718.9 349.5 L717.5 354.7 L706.1 346.0 Z"></path>
-					<path d="M1022.1 574.5 L1034 571.5 L1041.5 571.5 L1041.5 571.5 L1049 625 L1049 625 L1041.5 678.5 L1041.5 678.5 L1034 678.5 L1034 678.5 L1004 671.0522041763342 L1004.0 671.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1011.8 571.5 L1022.1 574.5 L1014.3 581.9 L1004.0 578.9 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M528.9 465.9 L838.5 544 L831.7098765432099 571.5 L831.7 571.5 " fill="none"></path>
-					</g>
-					<path d="M530.2 460.8 L528.9 465.9 L527.6 471.1 L516.0 462.7 Z"></path>
-					<path d="M386.0 567.4 L398 564 L405.5 564 L405.5 564 L413 625 L413 625 L405.5 686 L405.5 686 L398 686 L398 686 L368 677.4485981308411 L368.0 677.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M375.5 564.9 L386.0 567.4 L378.4 575.1 L368.0 572.6 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M447.8 477.3 L334.75 544 L297.52777777777777 564 L297.5 564.0 " fill="none"></path>
-					</g>
-					<path d="M450.5 481.9 L447.8 477.3 L445.1 472.7 L459.2 470.5 Z"></path>
-					<path d="M374.8 141.7 L374.75 143 L374.75 163 L374.8 163.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M380.1 132.3 L374.8 141.7 L369.4 132.3 L374.8 123.0 Z"></path>
-					</g>
-					<g data-name="AverageSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSection">
-							<rect x="19.0" y="393.5" height="123.0" width="330.0" data-name="AverageSection"></rect>
-							<path d="M19.0 424.5 L349.0 424.5" fill="none" data-name="AverageSection"></path>
-							<path d="M19.0 485.5 L349.0 485.5" fill="none" data-name="AverageSection"></path>
-						</g>
-						<g transform="translate(19, 393.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSection">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSection">AverageSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19, 424.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSection">&lt;static&gt;+sectionType: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSection">+aggregate: TemporalAggregation?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSection">+resultProperty: DataReference&lt;num&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19, 485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSection">+Map&lt;String, dynamic&gt; toJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="0.0" y="564.0" height="122.0" width="368.0" data-name="TemporalAggregation"></rect>
-							<path d="M0.0 595.0 L368.0 595.0" fill="none" data-name="TemporalAggregation"></path>
-						</g>
-						<g transform="translate(0, 564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregation">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregation">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregation">&lt;static&gt;+values: List&lt;TemporalAggregation&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregation">&lt;static&gt;+day: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregation">&lt;static&gt;+phase: TemporalAggregation</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregation">&lt;static&gt;+intervention: TemporalAggregation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="458.0" y="609.5" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(458, 609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="31.8" y="163.0" height="183.0" width="686.0" data-name="ReportSection"></rect>
-							<path d="M31.8 194.0 L717.8 194.0" fill="none" data-name="ReportSection"></path>
-							<path d="M31.8 300.0 L717.8 300.0" fill="none" data-name="ReportSection"></path>
-						</g>
-						<g transform="translate(31.75, 163)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="335.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31.75, 194)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSection">&lt;static&gt;+sectionTypes: Map&lt;String, ReportSection Function(Map&lt;String, dynamic&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSection">&lt;static&gt;+keyType: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSection">+type: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSection">+id: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportSection">+title: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportSection">+description: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31.75, 300)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSection">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSection">+String toString()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSection">
-							<rect x="613.5" y="386.0" height="138.0" width="330.0" data-name="LinearRegressionSection"></rect>
-							<path d="M613.5 417.0 L943.5 417.0" fill="none" data-name="LinearRegressionSection"></path>
-							<path d="M613.5 493.0 L943.5 493.0" fill="none" data-name="LinearRegressionSection"></path>
-						</g>
-						<g transform="translate(613.5, 386)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSection">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSection">LinearRegressionSection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(613.5, 417)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSection">&lt;static&gt;+sectionType: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSection">+resultProperty: DataReference&lt;num&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSection">+alpha: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="LinearRegressionSection">+improvement: ImprovementDirection?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(613.5, 493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSection">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSection">+Map&lt;String, dynamic&gt; toJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="633.0" y="571.5" height="107.0" width="371.0" data-name="ImprovementDirection"></rect>
-							<path d="M633.0 602.5 L1004.0 602.5" fill="none" data-name="ImprovementDirection"></path>
-						</g>
-						<g transform="translate(633, 571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(633, 602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirection">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirection">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirection">&lt;static&gt;+values: List&lt;ImprovementDirection&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirection">&lt;static&gt;+positive: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirection">&lt;static&gt;+negative: ImprovementDirection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="455.0" y="439.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(455, 439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSpecification">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSpecification">
-							<rect x="235.3" y="0.0" height="123.0" width="279.0" data-name="ReportSpecification"></rect>
-							<path d="M235.3 31.0 L514.3 31.0" fill="none" data-name="ReportSpecification"></path>
-							<path d="M235.3 77.0 L514.3 77.0" fill="none" data-name="ReportSpecification"></path>
-						</g>
-						<g transform="translate(235.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSpecification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSpecification">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSpecification">ReportSpecification</text>
-								
-							</g>
-						</g>
-						<g transform="translate(235.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSpecification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSpecification">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSpecification">+primary: ReportSection?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSpecification">+secondary: List&lt;ReportSection&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(235.25, 77)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSpecification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSpecification">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSpecification">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSpecification">+String toString()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/results/uml.svg b/docs/uml/core/lib/src/models/results/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/results/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/study_results/results/uml.svg b/docs/uml/core/lib/src/models/study_results/results/uml.svg
deleted file mode 100644
index d1a28082e..000000000
--- a/docs/uml/core/lib/src/models/study_results/results/uml.svg
+++ /dev/null
@@ -1,123 +0,0 @@
-<svg version="1.1" baseProfile="full" width="692.0" height="336.0" viewbox="0 0 692 336" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[InterventionResult
-	  |
-	  &lt;static&gt;+studyResultType: String
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  +List&lt;String&gt; getHeaders();
-	  +List&lt;dynamic&gt; getValues()
-	]
-	
-	[&lt;abstract&gt;StudyResult]&lt;:-[InterventionResult]
-	
-	[NumericResult
-	  |
-	  &lt;static&gt;+studyResultType: String;
-	  +resultProperty: DataReference&lt;num&gt;
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  +List&lt;String&gt; getHeaders();
-	  +List&lt;dynamic&gt; getValues()
-	]
-	
-	[NumericResult]o-[DataReference]
-	[&lt;abstract&gt;StudyResult]&lt;:-[NumericResult]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="336.0" width="692.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M238.5 29.9 L138 51 L138 78.5 L138.0 78.5 " fill="none"></path>
-					<path d="M239.5 35.1 L238.5 29.9 L237.4 24.7 L251.5 27.2 Z"></path>
-					<path d="M476.0 227.7 L476 229 L476 249 L476.0 249.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M481.3 218.3 L476.0 227.7 L470.7 218.3 L476.0 209.0 Z"></path>
-					</g>
-					<path d="M375.5 29.9 L476 51 L476 71 L476.0 71.0 " fill="none"></path>
-					<path d="M376.6 24.7 L375.5 29.9 L374.5 35.1 L362.5 27.2 Z"></path>
-					<g data-name="InterventionResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionResult">
-							<rect x="0.0" y="78.5" height="123.0" width="276.0" data-name="InterventionResult"></rect>
-							<path d="M0.0 109.5 L276.0 109.5" fill="none" data-name="InterventionResult"></path>
-							<path d="M0.0 140.5 L276.0 140.5" fill="none" data-name="InterventionResult"></path>
-						</g>
-						<g transform="translate(0, 78.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionResult">
-								<text x="130.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionResult">InterventionResult</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 109.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResult">&lt;static&gt;+studyResultType: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 140.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResult">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionResult">+List&lt;String&gt; getHeaders()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionResult">+List&lt;dynamic&gt; getValues()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyResult">
-							<rect x="251.5" y="0.0" height="31.0" width="111.0" data-name="StudyResult"></rect>
-						</g>
-						<g transform="translate(251.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyResult">
-								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyResult">StudyResult</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NumericResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NumericResult">
-							<rect x="316.0" y="71.0" height="138.0" width="320.0" data-name="NumericResult"></rect>
-							<path d="M316.0 102.0 L636.0 102.0" fill="none" data-name="NumericResult"></path>
-							<path d="M316.0 148.0 L636.0 148.0" fill="none" data-name="NumericResult"></path>
-						</g>
-						<g transform="translate(316, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NumericResult">
-								<text x="152.0" y="13.5" stroke="none" text-anchor="middle" data-name="NumericResult">NumericResult</text>
-								
-							</g>
-						</g>
-						<g transform="translate(316, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericResult">&lt;static&gt;+studyResultType: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NumericResult">+resultProperty: DataReference&lt;num&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(316, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericResult">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NumericResult">+List&lt;String&gt; getHeaders()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NumericResult">+List&lt;dynamic&gt; getValues()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="408.5" y="249.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(408.5, 249)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/study_results/uml.svg b/docs/uml/core/lib/src/models/study_results/uml.svg
deleted file mode 100644
index 7cdd82c0c..000000000
--- a/docs/uml/core/lib/src/models/study_results/uml.svg
+++ /dev/null
@@ -1,156 +0,0 @@
-<svg version="1.1" baseProfile="full" width="761.0" height="488.0" viewbox="0 0 761 488" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;StudyResult
-	  |
-	  &lt;static&gt;+studyResultTypes: Map&lt;String, StudyResult Function(Map&lt;String, dynamic&gt;)&gt;;
-	  &lt;static&gt;+keyType: String;
-	  +type: String;
-	  +id: String;
-	  +filename: String
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  +List&lt;String&gt; getHeaders();
-	  +List&lt;dynamic&gt; getValues()
-	]
-	
-	[InterventionResult
-	  |
-	  &lt;static&gt;+studyResultType: String
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  +List&lt;String&gt; getHeaders();
-	  +List&lt;dynamic&gt; getValues()
-	]
-	
-	[&lt;abstract&gt;StudyResult]&lt;:-[InterventionResult]
-	
-	[NumericResult
-	  |
-	  &lt;static&gt;+studyResultType: String;
-	  +resultProperty: DataReference&lt;num&gt;
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  +List&lt;String&gt; getHeaders();
-	  +List&lt;dynamic&gt; getValues()
-	]
-	
-	[NumericResult]o-[DataReference]
-	[&lt;abstract&gt;StudyResult]&lt;:-[NumericResult]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="488.0" width="761.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M202.7 190.3 L183.5 203 L183.5 230.5 L183.5 230.5 " fill="none"></path>
-					<path d="M205.6 194.8 L202.7 190.3 L199.7 185.9 L213.8 183.0 Z"></path>
-					<path d="M521.5 379.7 L521.5 381 L521.5 401 L521.5 401.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M526.8 370.3 L521.5 379.7 L516.2 370.3 L521.5 361.0 Z"></path>
-					</g>
-					<path d="M502.3 190.3 L521.5 203 L521.5 223 L521.5 223.0 " fill="none"></path>
-					<path d="M505.3 185.9 L502.3 190.3 L499.4 194.8 L491.2 183.0 Z"></path>
-					<g data-name="StudyResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyResult">
-							<rect x="0.0" y="0.0" height="183.0" width="705.0" data-name="StudyResult"></rect>
-							<path d="M0.0 31.0 L705.0 31.0" fill="none" data-name="StudyResult"></path>
-							<path d="M0.0 122.0 L705.0 122.0" fill="none" data-name="StudyResult"></path>
-						</g>
-						<g transform="translate(0, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyResult">
-								<text x="344.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyResult">StudyResult</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyResult">&lt;static&gt;+studyResultTypes: Map&lt;String, StudyResult Function(Map&lt;String, dynamic&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyResult">&lt;static&gt;+keyType: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyResult">+type: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyResult">+id: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyResult">+filename: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyResult">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyResult">+List&lt;String&gt; getHeaders()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyResult">+List&lt;dynamic&gt; getValues()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionResult">
-							<rect x="45.5" y="230.5" height="123.0" width="276.0" data-name="InterventionResult"></rect>
-							<path d="M45.5 261.5 L321.5 261.5" fill="none" data-name="InterventionResult"></path>
-							<path d="M45.5 292.5 L321.5 292.5" fill="none" data-name="InterventionResult"></path>
-						</g>
-						<g transform="translate(45.5, 230.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionResult">
-								<text x="130.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionResult">InterventionResult</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResult">&lt;static&gt;+studyResultType: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45.5, 292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResult">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionResult">+List&lt;String&gt; getHeaders()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionResult">+List&lt;dynamic&gt; getValues()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NumericResult">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NumericResult">
-							<rect x="361.5" y="223.0" height="138.0" width="320.0" data-name="NumericResult"></rect>
-							<path d="M361.5 254.0 L681.5 254.0" fill="none" data-name="NumericResult"></path>
-							<path d="M361.5 300.0 L681.5 300.0" fill="none" data-name="NumericResult"></path>
-						</g>
-						<g transform="translate(361.5, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NumericResult">
-								<text x="152.0" y="13.5" stroke="none" text-anchor="middle" data-name="NumericResult">NumericResult</text>
-								
-							</g>
-						</g>
-						<g transform="translate(361.5, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericResult">&lt;static&gt;+studyResultType: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NumericResult">+resultProperty: DataReference&lt;num&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(361.5, 300)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericResult">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericResult">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericResult">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NumericResult">+List&lt;String&gt; getHeaders()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NumericResult">+List&lt;dynamic&gt; getValues()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="454.0" y="401.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(454, 401)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/study_schedule/uml.svg b/docs/uml/core/lib/src/models/study_schedule/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/study_schedule/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/tables/uml.svg b/docs/uml/core/lib/src/models/tables/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/tables/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/tasks/uml.svg b/docs/uml/core/lib/src/models/tasks/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/tasks/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/models/uml.svg b/docs/uml/core/lib/src/models/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/models/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/uml.svg b/docs/uml/core/lib/src/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/util/multimodal/uml.svg b/docs/uml/core/lib/src/util/multimodal/uml.svg
deleted file mode 100644
index 987386914..000000000
--- a/docs/uml/core/lib/src/util/multimodal/uml.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<svg version="1.1" baseProfile="full" width="408.0" height="179.0" viewbox="0 0 408 179" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[BlobStorageHandler
-	  |
-	  &lt;static&gt;-_observationsBucketName: String
-	  |
-	  +dynamic uploadObservation();
-	  +dynamic downloadObservation();
-	  +dynamic removeObservation()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="179.0" width="408.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)">
-					<g data-name="BlobStorageHandler">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BlobStorageHandler">
-							<rect x="0.0" y="0.0" height="123.0" width="352.0" data-name="BlobStorageHandler"></rect>
-							<path d="M0.0 31.0 L352.0 31.0" fill="none" data-name="BlobStorageHandler"></path>
-							<path d="M0.0 62.0 L352.0 62.0" fill="none" data-name="BlobStorageHandler"></path>
-						</g>
-						<g transform="translate(0, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BlobStorageHandler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BlobStorageHandler">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BlobStorageHandler">BlobStorageHandler</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BlobStorageHandler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BlobStorageHandler">
-								<text x="0.0" y="13.5" stroke="none" data-name="BlobStorageHandler">&lt;static&gt;-_observationsBucketName: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 62)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BlobStorageHandler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BlobStorageHandler">
-								<text x="0.0" y="13.5" stroke="none" data-name="BlobStorageHandler">+dynamic uploadObservation()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BlobStorageHandler">+dynamic downloadObservation()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BlobStorageHandler">+dynamic removeObservation()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/src/util/uml.svg b/docs/uml/core/lib/src/util/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/src/util/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/core/lib/uml.svg b/docs/uml/core/lib/uml.svg
deleted file mode 100644
index 32b5afd1e..000000000
--- a/docs/uml/core/lib/uml.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg version="1.1" baseProfile="full" width="0.0" height="8.0" viewbox="0 0 0 8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="8.0" width="0.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/common_views/pages/uml.svg b/docs/uml/designer_v2/lib/common_views/pages/uml.svg
deleted file mode 100644
index afcb7191f..000000000
--- a/docs/uml/designer_v2/lib/common_views/pages/uml.svg
+++ /dev/null
@@ -1,84 +0,0 @@
-<svg version="1.1" baseProfile="full" width="389.0" height="251.0" viewbox="0 0 389 251" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[SplashPage
-	  |
-	  +Widget build()
-	]
-	
-	[ErrorPage
-	  |
-	  +error: Exception?
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ErrorPage]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="251.0" width="389.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M252.0 59.8 L252 82 L252 102 L252.0 102.0 " fill="none"></path>
-					<path d="M257.3 59.8 L252.0 59.8 L246.7 59.8 L252.0 46.5 Z"></path>
-					<g data-name="SplashPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SplashPage">
-							<rect x="0.0" y="0.0" height="62.0" width="136.0" data-name="SplashPage"></rect>
-							<path d="M0.0 31.0 L136.0 31.0" fill="none" data-name="SplashPage"></path>
-						</g>
-						<g transform="translate(0, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SplashPage">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SplashPage">SplashPage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SplashPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SplashPage">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ErrorPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ErrorPage">
-							<rect x="171.0" y="102.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
-							<path d="M171.0 133.0 L333.0 133.0" fill="none" data-name="ErrorPage"></path>
-							<path d="M171.0 164.0 L333.0 164.0" fill="none" data-name="ErrorPage"></path>
-						</g>
-						<g transform="translate(171, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ErrorPage">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="ErrorPage">ErrorPage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(171, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+error: Exception?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(171, 164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="176.0" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(176, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/common_views/sidesheet/uml.svg b/docs/uml/designer_v2/lib/common_views/sidesheet/uml.svg
deleted file mode 100644
index 828b9f312..000000000
--- a/docs/uml/designer_v2/lib/common_views/sidesheet/uml.svg
+++ /dev/null
@@ -1,203 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1256.0" height="441.0" viewbox="0 0 1256 441" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[FormSideSheetTab
-	  |
-	  +formViewBuilder: Widget Function(T)
-	]
-	
-	[FormSideSheetTab]o-[Widget Function(T)]
-	[NavbarTab]&lt;:-[FormSideSheetTab]
-	
-	[SidesheetTab
-	  |
-	  +builder: Widget Function(BuildContext)
-	]
-	
-	[SidesheetTab]o-[Widget Function(BuildContext)]
-	[NavbarTab]&lt;:-[SidesheetTab]
-	
-	[Sidesheet
-	  |
-	  &lt;static&gt;+kDefaultWidth: double;
-	  +titleText: String;
-	  +body: Widget?;
-	  +tabs: List&lt;SidesheetTab&gt;?;
-	  +actionButtons: List&lt;Widget&gt;?;
-	  +width: double?;
-	  +withCloseButton: bool;
-	  +ignoreAppBar: bool;
-	  +collapseSingleTab: bool;
-	  +bodyPadding: EdgeInsets?;
-	  +wrapContent: Widget Function(Widget)?
-	]
-	
-	[Sidesheet]o-[&lt;abstract&gt;Widget]
-	[Sidesheet]o-[EdgeInsets]
-	[Sidesheet]o-[Widget Function(Widget)?]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="441.0" width="1256.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M156.5 332.7 L156.5 334 L156.5 354 L156.5 354.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M161.8 323.3 L156.5 332.7 L151.2 323.3 L156.5 314.0 Z"></path>
-					</g>
-					<path d="M304.1 129.1 L156.5 232 L156.5 252 L156.5 252.0 " fill="none"></path>
-					<path d="M307.1 133.5 L304.1 129.1 L301.0 124.7 L315.0 121.5 Z"></path>
-					<path d="M518.0 332.7 L518 334 L518 354 L518.0 354.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M523.3 323.3 L518.0 332.7 L512.7 323.3 L518.0 314.0 Z"></path>
-					</g>
-					<path d="M370.4 129.1 L518 232 L518 252 L518.0 252.0 " fill="none"></path>
-					<path d="M373.5 124.7 L370.4 129.1 L367.4 133.5 L359.5 121.5 Z"></path>
-					<path d="M765.5 225.1 L758.5 232 L758.5 267.5 L758.5 267.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M775.9 222.3 L765.5 225.1 L768.4 214.7 L778.8 212.0 Z"></path>
-					</g>
-					<path d="M886.5 230.7 L886.5 232 L886.5 267.5 L886.5 267.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M891.8 221.3 L886.5 230.7 L881.2 221.3 L886.5 212.0 Z"></path>
-					</g>
-					<path d="M1072.9 221.7 L1089.5 232 L1089.5 267.5 L1089.5 267.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1067.7 212.2 L1072.9 221.7 L1062.1 221.3 L1057.0 211.8 Z"></path>
-					</g>
-					<g data-name="FormSideSheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSideSheetTab">
-							<rect x="0.0" y="252.0" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
-							<path d="M0.0 283.0 L313.0 283.0" fill="none" data-name="FormSideSheetTab"></path>
-						</g>
-						<g transform="translate(0, 252)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSideSheetTab">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormSideSheetTab">FormSideSheetTab</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 283)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSideSheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSideSheetTab">+formViewBuilder: Widget Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="73.5" y="354.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
-						</g>
-						<g transform="translate(73.5, 354)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NavbarTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="285.8" y="90.5" height="31.0" width="103.0" data-name="NavbarTab"></rect>
-						</g>
-						<g transform="translate(285.75, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SidesheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SidesheetTab">
-							<rect x="353.0" y="252.0" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
-							<path d="M353.0 283.0 L683.0 283.0" fill="none" data-name="SidesheetTab"></path>
-						</g>
-						<g transform="translate(353, 252)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SidesheetTab">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="SidesheetTab">SidesheetTab</text>
-								
-							</g>
-						</g>
-						<g transform="translate(353, 283)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SidesheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="SidesheetTab">+builder: Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="390.0" y="354.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
-						</g>
-						<g transform="translate(390, 354)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Sidesheet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Sidesheet">
-							<rect x="716.0" y="0.0" height="212.0" width="341.0" data-name="Sidesheet"></rect>
-							<path d="M716.0 31.0 L1057.0 31.0" fill="none" data-name="Sidesheet"></path>
-						</g>
-						<g transform="translate(716, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Sidesheet">
-								<text x="162.5" y="13.5" stroke="none" text-anchor="middle" data-name="Sidesheet">Sidesheet</text>
-								
-							</g>
-						</g>
-						<g transform="translate(716, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Sidesheet">
-								<text x="0.0" y="13.5" stroke="none" data-name="Sidesheet">&lt;static&gt;+kDefaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Sidesheet">+titleText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Sidesheet">+body: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Sidesheet">+tabs: List&lt;SidesheetTab&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Sidesheet">+actionButtons: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Sidesheet">+width: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Sidesheet">+withCloseButton: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Sidesheet">+ignoreAppBar: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Sidesheet">+collapseSingleTab: bool</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Sidesheet">+bodyPadding: EdgeInsets?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Sidesheet">+wrapContent: Widget Function(Widget)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="723.0" y="267.5" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(723, 267.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EdgeInsets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="834.0" y="267.5" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
-						</g>
-						<g transform="translate(834, 267.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(Widget)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Widget)?">
-							<rect x="979.0" y="267.5" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
-						</g>
-						<g transform="translate(979, 267.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Widget)?">
-								<text x="102.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Widget)?">Widget Function(Widget)?</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/common_views/uml.svg b/docs/uml/designer_v2/lib/common_views/uml.svg
deleted file mode 100644
index 315b900bc..000000000
--- a/docs/uml/designer_v2/lib/common_views/uml.svg
+++ /dev/null
@@ -1,3244 +0,0 @@
-<svg version="1.1" baseProfile="full" width="19632.8" height="997.0" viewbox="0 0 19632.75 997" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[AsyncValueWidget
-	  |
-	  +value: AsyncValue&lt;T&gt;;
-	  +data: Widget Function(T);
-	  +error: Widget Function(Object, StackTrace?)?;
-	  +loading: Widget Function()?;
-	  +empty: Widget Function()?
-	  |
-	  +Widget build();
-	  -Widget _buildDataOrEmptyWidget();
-	  -Widget _defaultError();
-	  -Widget _defaultLoad()
-	]
-	
-	[AsyncValueWidget]o-[&lt;abstract&gt;AsyncValue]
-	[AsyncValueWidget]o-[Widget Function(T)]
-	[AsyncValueWidget]o-[Widget Function(Object, StackTrace?)?]
-	[AsyncValueWidget]o-[Widget Function()?]
-	
-	[FormControlLabel
-	  |
-	  +formControl: AbstractControl&lt;dynamic&gt;;
-	  +text: String;
-	  +isClickable: bool;
-	  +textStyle: TextStyle?;
-	  +onClick: void Function(AbstractControl&lt;dynamic&gt;)?
-	  |
-	  +Widget build()
-	]
-	
-	[FormControlLabel]o-[&lt;abstract&gt;AbstractControl]
-	[FormControlLabel]o-[TextStyle]
-	[FormControlLabel]o-[void Function(AbstractControl&lt;dynamic&gt;)?]
-	
-	[ActionPopUpMenuButton
-	  |
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +triggerIconColor: Color?;
-	  +triggerIconColorHover: Color?;
-	  +triggerIconSize: double;
-	  +disableSplashEffect: bool;
-	  +hideOnEmpty: bool;
-	  +orientation: Axis;
-	  +elevation: double?;
-	  +splashRadius: double?;
-	  +enabled: bool;
-	  +position: PopupMenuPosition
-	  |
-	  +Widget build();
-	  -Widget _buildPopupMenu()
-	]
-	
-	[ActionPopUpMenuButton]o-[Color]
-	[ActionPopUpMenuButton]o-[Axis]
-	[ActionPopUpMenuButton]o-[PopupMenuPosition]
-	
-	[Search
-	  |
-	  +onQueryChanged: dynamic Function(String);
-	  +searchController: SearchController?;
-	  +hintText: String?;
-	  +initialText: String?
-	]
-	
-	[Search]o-[dynamic Function(String)]
-	[Search]o-[SearchController]
-	
-	[SearchController
-	  |
-	  +setText: void Function(String)
-	]
-	
-	[SearchController]o-[void Function(String)]
-	
-	[FormScaffold
-	  |
-	  +formViewModel: T;
-	  +actions: List&lt;Widget&gt;?;
-	  +body: Widget;
-	  +drawer: Widget?;
-	  +actionsSpacing: double;
-	  +actionsPadding: double
-	]
-	
-	[FormScaffold]o-[&lt;abstract&gt;Widget]
-	
-	[ConstrainedWidthFlexible
-	  |
-	  +minWidth: double;
-	  +maxWidth: double;
-	  +flex: int;
-	  +flexSum: int;
-	  +child: Widget;
-	  +outerConstraints: BoxConstraints
-	  |
-	  +Widget build();
-	  -double _getWidth()
-	]
-	
-	[ConstrainedWidthFlexible]o-[&lt;abstract&gt;Widget]
-	[ConstrainedWidthFlexible]o-[BoxConstraints]
-	
-	[PrimaryButton
-	  |
-	  +text: String;
-	  +icon: IconData?;
-	  +isLoading: bool;
-	  +showLoadingEarliestAfterMs: int;
-	  +onPressed: void Function()?;
-	  +tooltip: String;
-	  +tooltipDisabled: String;
-	  +enabled: bool;
-	  +onPressedFuture: dynamic Function()?;
-	  +innerPadding: EdgeInsets;
-	  +minimumSize: Size?;
-	  +isDisabled: bool
-	]
-	
-	[PrimaryButton]o-[IconData]
-	[PrimaryButton]o-[void Function()?]
-	[PrimaryButton]o-[dynamic Function()?]
-	[PrimaryButton]o-[EdgeInsets]
-	[PrimaryButton]o-[Size]
-	
-	[FormTableRow
-	  |
-	  +label: String?;
-	  +labelBuilder: Widget Function(BuildContext)?;
-	  +labelStyle: TextStyle?;
-	  +labelHelpText: String?;
-	  +input: Widget;
-	  +control: AbstractControl&lt;dynamic&gt;?;
-	  +layout: FormTableRowLayout?
-	]
-	
-	[FormTableRow]o-[Widget Function(BuildContext)?]
-	[FormTableRow]o-[TextStyle]
-	[FormTableRow]o-[&lt;abstract&gt;Widget]
-	[FormTableRow]o-[&lt;abstract&gt;AbstractControl]
-	[FormTableRow]o-[FormTableRowLayout]
-	
-	[FormTableLayout
-	  |
-	  +rows: List&lt;FormTableRow&gt;;
-	  +columnWidths: Map&lt;int, TableColumnWidth&gt;;
-	  +rowDivider: Widget?;
-	  +rowLayout: FormTableRowLayout?;
-	  +rowLabelStyle: TextStyle?
-	  |
-	  +Widget build()
-	]
-	
-	[FormTableLayout]o-[&lt;abstract&gt;Widget]
-	[FormTableLayout]o-[FormTableRowLayout]
-	[FormTableLayout]o-[TextStyle]
-	
-	[FormSectionHeader
-	  |
-	  +title: String;
-	  +titleTextStyle: TextStyle?;
-	  +helpText: String?;
-	  +divider: bool;
-	  +helpTextDisabled: bool
-	  |
-	  +Widget build()
-	]
-	
-	[FormSectionHeader]o-[TextStyle]
-	
-	[FormLabel
-	  |
-	  +labelText: String?;
-	  +helpText: String?;
-	  +labelTextStyle: TextStyle?;
-	  +layout: FormTableRowLayout?
-	  |
-	  +Widget build()
-	]
-	
-	[FormLabel]o-[TextStyle]
-	[FormLabel]o-[FormTableRowLayout]
-	
-	[FormTableRowLayout
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;FormTableRowLayout&gt;;
-	  &lt;static&gt;+vertical: FormTableRowLayout;
-	  &lt;static&gt;+horizontal: FormTableRowLayout
-	]
-	
-	[FormTableRowLayout]o-[FormTableRowLayout]
-	[Enum]&lt;:--[FormTableRowLayout]
-	
-	[DismissButton
-	  |
-	  +onPressed: void Function()?;
-	  +text: String?
-	  |
-	  +Widget build()
-	]
-	
-	[DismissButton]o-[void Function()?]
-	
-	[Badge
-	  |
-	  +icon: IconData?;
-	  +color: Color?;
-	  +borderRadius: double;
-	  +label: String;
-	  +type: BadgeType;
-	  +padding: EdgeInsets;
-	  +iconSize: double?;
-	  +labelStyle: TextStyle?;
-	  +center: bool
-	  |
-	  +Widget build();
-	  -Color? _getBackgroundColor();
-	  -Color _getBorderColor();
-	  -Color? _getLabelColor()
-	]
-	
-	[Badge]o-[IconData]
-	[Badge]o-[Color]
-	[Badge]o-[BadgeType]
-	[Badge]o-[EdgeInsets]
-	[Badge]o-[TextStyle]
-	
-	[BadgeType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;BadgeType&gt;;
-	  &lt;static&gt;+filled: BadgeType;
-	  &lt;static&gt;+outlined: BadgeType;
-	  &lt;static&gt;+outlineFill: BadgeType;
-	  &lt;static&gt;+plain: BadgeType
-	]
-	
-	[BadgeType]o-[BadgeType]
-	[Enum]&lt;:--[BadgeType]
-	
-	[StandardDialog
-	  |
-	  +title: Widget?;
-	  +titleText: String?;
-	  +body: Widget;
-	  +actionButtons: List&lt;Widget&gt;;
-	  +backgroundColor: Color?;
-	  +borderRadius: double?;
-	  +width: double?;
-	  +height: double?;
-	  +minWidth: double;
-	  +minHeight: double;
-	  +maxWidth: double?;
-	  +maxHeight: double?;
-	  +padding: EdgeInsets
-	  |
-	  +Widget build()
-	]
-	
-	[StandardDialog]o-[&lt;abstract&gt;Widget]
-	[StandardDialog]o-[Color]
-	[StandardDialog]o-[EdgeInsets]
-	
-	[&lt;abstract&gt;ISyncIndicatorViewModel
-	  |
-	  +isDirty: bool;
-	  +lastSynced: DateTime?
-	]
-	
-	[SyncIndicator
-	  |
-	  +state: AsyncValue&lt;T&gt;;
-	  +lastSynced: DateTime?;
-	  +isDirty: bool;
-	  +animationDuration: int;
-	  +iconSize: double
-	]
-	
-	[SyncIndicator]o-[&lt;abstract&gt;AsyncValue]
-	
-	[&lt;abstract&gt;IWithBanner
-	  |
-	  +Widget? banner()
-	]
-	
-	[BannerBox
-	  |
-	  +prefixIcon: Widget?;
-	  +body: Widget;
-	  +style: BannerStyle;
-	  +padding: EdgeInsets?;
-	  +noPrefix: bool;
-	  +dismissable: bool;
-	  +isDismissed: bool?;
-	  +onDismissed: dynamic Function()?;
-	  +dismissIconSize: double
-	]
-	
-	[BannerBox]o-[&lt;abstract&gt;Widget]
-	[BannerBox]o-[BannerStyle]
-	[BannerBox]o-[EdgeInsets]
-	[BannerBox]o-[dynamic Function()?]
-	
-	[BannerStyle
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;BannerStyle&gt;;
-	  &lt;static&gt;+warning: BannerStyle;
-	  &lt;static&gt;+info: BannerStyle;
-	  &lt;static&gt;+error: BannerStyle
-	]
-	
-	[BannerStyle]o-[BannerStyle]
-	[Enum]&lt;:--[BannerStyle]
-	
-	[ActionMenuInline
-	  |
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +iconSize: double?;
-	  +visible: bool;
-	  +splashRadius: double?;
-	  +paddingVertical: double?;
-	  +paddingHorizontal: double?
-	  |
-	  +Widget build()
-	]
-	
-	[Collapsible
-	  |
-	  +contentBuilder: Widget Function(BuildContext, bool);
-	  +headerBuilder: Widget Function(BuildContext, bool)?;
-	  +title: String?;
-	  +isCollapsed: bool
-	]
-	
-	[Collapsible]o-[Widget Function(BuildContext, bool)]
-	[Collapsible]o-[Widget Function(BuildContext, bool)?]
-	
-	[NavbarTab
-	  |
-	  +title: String;
-	  +intent: RoutingIntent?;
-	  +index: int;
-	  +enabled: bool
-	]
-	
-	[NavbarTab]o-[RoutingIntent]
-	
-	[TabbedNavbar
-	  |
-	  +tabs: List&lt;T&gt;;
-	  +selectedTab: T?;
-	  +indicator: BoxDecoration?;
-	  +height: double?;
-	  +disabledBackgroundColor: Color?;
-	  +disabledTooltipText: String?;
-	  +onSelect: void Function(int, T)?;
-	  +labelPadding: EdgeInsets?;
-	  +labelSpacing: double?;
-	  +indicatorSize: TabBarIndicatorSize?;
-	  +isScrollable: bool;
-	  +backgroundColor: Color?;
-	  +labelColorHover: Color?;
-	  +unselectedLabelColorHover: Color?
-	]
-	
-	[TabbedNavbar]o-[BoxDecoration]
-	[TabbedNavbar]o-[Color]
-	[TabbedNavbar]o-[void Function(int, T)?]
-	[TabbedNavbar]o-[EdgeInsets]
-	[TabbedNavbar]o-[TabBarIndicatorSize]
-	
-	[SidesheetTab
-	  |
-	  +builder: Widget Function(BuildContext)
-	]
-	
-	[SidesheetTab]o-[Widget Function(BuildContext)]
-	[NavbarTab]&lt;:-[SidesheetTab]
-	
-	[Sidesheet
-	  |
-	  &lt;static&gt;+kDefaultWidth: double;
-	  +titleText: String;
-	  +body: Widget?;
-	  +tabs: List&lt;SidesheetTab&gt;?;
-	  +actionButtons: List&lt;Widget&gt;?;
-	  +width: double?;
-	  +withCloseButton: bool;
-	  +ignoreAppBar: bool;
-	  +collapseSingleTab: bool;
-	  +bodyPadding: EdgeInsets?;
-	  +wrapContent: Widget Function(Widget)?
-	]
-	
-	[Sidesheet]o-[&lt;abstract&gt;Widget]
-	[Sidesheet]o-[EdgeInsets]
-	[Sidesheet]o-[Widget Function(Widget)?]
-	
-	[FormSideSheetTab
-	  |
-	  +formViewBuilder: Widget Function(T)
-	]
-	
-	[FormSideSheetTab]o-[Widget Function(T)]
-	[NavbarTab]&lt;:-[FormSideSheetTab]
-	
-	[HelpIcon
-	  |
-	  +tooltipText: String?
-	  |
-	  +Widget build()
-	]
-	
-	[EmptyBody
-	  |
-	  +icon: IconData?;
-	  +leading: Widget?;
-	  +leadingSpacing: double?;
-	  +title: String?;
-	  +description: String?;
-	  +button: Widget?
-	  |
-	  +Widget build()
-	]
-	
-	[EmptyBody]o-[IconData]
-	[EmptyBody]o-[&lt;abstract&gt;Widget]
-	
-	[IndicatorRangeSliderThumbShape
-	  |
-	  +buildContext: BuildContext;
-	  +start: T;
-	  +end: T
-	  |
-	  +Size getPreferredSize();
-	  +void paint()
-	]
-	
-	[IndicatorRangeSliderThumbShape]o-[&lt;abstract&gt;BuildContext]
-	[&lt;abstract&gt;RangeSliderThumbShape]&lt;:-[IndicatorRangeSliderThumbShape]
-	
-	[MouseEventsRegion
-	  |
-	  +onTap: void Function()?;
-	  +onHover: void Function(PointerHoverEvent)?;
-	  +onEnter: void Function(PointerEnterEvent)?;
-	  +onExit: void Function(PointerExitEvent)?;
-	  +autoselectCursor: bool;
-	  +cursor: SystemMouseCursor;
-	  &lt;static&gt;+defaultCursor: SystemMouseCursor;
-	  +autoCursor: SystemMouseCursor
-	]
-	
-	[MouseEventsRegion]o-[void Function()?]
-	[MouseEventsRegion]o-[void Function(PointerHoverEvent)?]
-	[MouseEventsRegion]o-[void Function(PointerEnterEvent)?]
-	[MouseEventsRegion]o-[void Function(PointerExitEvent)?]
-	[MouseEventsRegion]o-[SystemMouseCursor]
-	
-	[ReactiveCustomColorPicker
-	]
-	
-	[ReactiveFormField]&lt;:-[ReactiveCustomColorPicker]
-	
-	[TextParagraph
-	  |
-	  +text: String?;
-	  +style: TextStyle?;
-	  +selectable: bool;
-	  +span: List&lt;TextSpan&gt;?
-	  |
-	  +Widget build()
-	]
-	
-	[TextParagraph]o-[TextStyle]
-	
-	[UnderConstruction
-	  |
-	  +Widget build()
-	]
-	
-	[NullHelperDecoration
-	]
-	
-	[InputDecoration]&lt;:-[NullHelperDecoration]
-	
-	[ActionMenuType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ActionMenuType&gt;;
-	  &lt;static&gt;+inline: ActionMenuType;
-	  &lt;static&gt;+popup: ActionMenuType
-	]
-	
-	[ActionMenuType]o-[ActionMenuType]
-	[Enum]&lt;:--[ActionMenuType]
-	
-	[HtmlStylingBanner
-	  |
-	  +isDismissed: bool;
-	  +onDismissed: dynamic Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[HtmlStylingBanner]o-[dynamic Function()?]
-	
-	[&lt;abstract&gt;FormConsumerWidget
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;FormConsumerRefWidget
-	  |
-	  +Widget build()
-	]
-	
-	[SplashPage
-	  |
-	  +Widget build()
-	]
-	
-	[ErrorPage
-	  |
-	  +error: Exception?
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ErrorPage]
-	
-	[StudyULogo
-	  |
-	  +onTap: void Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[StudyULogo]o-[void Function()?]
-	
-	[SingleColumnLayout
-	  |
-	  &lt;static&gt;+defaultConstraints: BoxConstraints;
-	  &lt;static&gt;+defaultConstraintsNarrow: BoxConstraints;
-	  +body: Widget;
-	  +header: Widget?;
-	  +stickyHeader: bool;
-	  +constraints: BoxConstraints?;
-	  +scroll: bool;
-	  +padding: EdgeInsets?
-	  |
-	  &lt;static&gt;+dynamic fromType()
-	]
-	
-	[SingleColumnLayout]o-[BoxConstraints]
-	[SingleColumnLayout]o-[&lt;abstract&gt;Widget]
-	[SingleColumnLayout]o-[EdgeInsets]
-	
-	[SingleColumnLayoutType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;;
-	  &lt;static&gt;+boundedWide: SingleColumnLayoutType;
-	  &lt;static&gt;+boundedNarrow: SingleColumnLayoutType;
-	  &lt;static&gt;+stretched: SingleColumnLayoutType;
-	  &lt;static&gt;+split: SingleColumnLayoutType
-	]
-	
-	[SingleColumnLayoutType]o-[SingleColumnLayoutType]
-	[Enum]&lt;:--[SingleColumnLayoutType]
-	
-	[Hyperlink
-	  |
-	  +text: String;
-	  +url: String?;
-	  +onClick: void Function()?;
-	  +linkColor: Color;
-	  +hoverColor: Color?;
-	  +visitedColor: Color?;
-	  +style: TextStyle?;
-	  +hoverStyle: TextStyle?;
-	  +visitedStyle: TextStyle?;
-	  +icon: IconData?;
-	  +iconSize: double?
-	]
-	
-	[Hyperlink]o-[void Function()?]
-	[Hyperlink]o-[Color]
-	[Hyperlink]o-[TextStyle]
-	[Hyperlink]o-[IconData]
-	
-	[StandardTableColumn
-	  |
-	  +label: String;
-	  +tooltip: String?;
-	  +columnWidth: TableColumnWidth;
-	  +sortable: bool;
-	  +sortAscending: bool?;
-	  +sortableIcon: Widget?
-	]
-	
-	[StandardTableColumn]o-[&lt;abstract&gt;TableColumnWidth]
-	[StandardTableColumn]o-[&lt;abstract&gt;Widget]
-	
-	[StandardTable
-	  |
-	  +items: List&lt;T&gt;;
-	  +inputColumns: List&lt;StandardTableColumn&gt;;
-	  +onSelectItem: void Function(T);
-	  +trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?;
-	  +trailingActionsMenuType: ActionMenuType?;
-	  +sortColumnPredicates: List&lt;int Function(T, T)?&gt;?;
-	  +pinnedPredicates: int Function(T, T)?;
-	  +headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
-	  +dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
-	  +inputTrailingActionsColumn: StandardTableColumn;
-	  +tableWrapper: Widget Function(Widget)?;
-	  +cellSpacing: double;
-	  +rowSpacing: double;
-	  +minRowHeight: double?;
-	  +headerMaxLines: int;
-	  +showTableHeader: bool;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  +leadingWidget: Widget?;
-	  +trailingWidget: Widget?;
-	  +leadingWidgetSpacing: double?;
-	  +trailingWidgetSpacing: double?;
-	  +emptyWidget: Widget?;
-	  +rowStyle: StandardTableStyle;
-	  +disableRowInteractions: bool
-	]
-	
-	[StandardTable]o-[void Function(T)]
-	[StandardTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?]
-	[StandardTable]o-[ActionMenuType]
-	[StandardTable]o-[int Function(T, T)?]
-	[StandardTable]o-[TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?]
-	[StandardTable]o-[StandardTableColumn]
-	[StandardTable]o-[Widget Function(Widget)?]
-	[StandardTable]o-[&lt;abstract&gt;Widget]
-	[StandardTable]o-[StandardTableStyle]
-	
-	[StandardTableStyle
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StandardTableStyle&gt;;
-	  &lt;static&gt;+plain: StandardTableStyle;
-	  &lt;static&gt;+material: StandardTableStyle
-	]
-	
-	[StandardTableStyle]o-[StandardTableStyle]
-	[Enum]&lt;:--[StandardTableStyle]
-	
-	[IconPack
-	  |
-	  &lt;static&gt;+defaultPack: List&lt;IconOption&gt;;
-	  &lt;static&gt;+material: List&lt;IconOption&gt;
-	  |
-	  &lt;static&gt;+IconOption? resolveIconByName()
-	]
-	
-	[IconOption
-	  |
-	  +name: String;
-	  +icon: IconData?;
-	  +isEmpty: bool;
-	  +props: List&lt;Object?&gt;
-	  |
-	  +String toJson();
-	  &lt;static&gt;+IconOption fromJson()
-	]
-	
-	[IconOption]o-[IconData]
-	[&lt;abstract&gt;Equatable]&lt;:-[IconOption]
-	
-	[ReactiveIconPicker
-	]
-	
-	[ReactiveFocusableFormField]&lt;:-[ReactiveIconPicker]
-	
-	[IconPicker
-	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +selectedOption: IconOption?;
-	  +onSelect: void Function(IconOption)?;
-	  +galleryIconSize: double?;
-	  +selectedIconSize: double?;
-	  +focusNode: FocusNode?;
-	  +isDisabled: bool
-	  |
-	  +Widget build()
-	]
-	
-	[IconPicker]o-[IconOption]
-	[IconPicker]o-[void Function(IconOption)?]
-	[IconPicker]o-[FocusNode]
-	
-	[IconPickerField
-	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +selectedOption: IconOption?;
-	  +selectedIconSize: double?;
-	  +galleryIconSize: double?;
-	  +onSelect: void Function(IconOption)?;
-	  +focusNode: FocusNode?;
-	  +isDisabled: bool
-	  |
-	  +Widget build()
-	]
-	
-	[IconPickerField]o-[IconOption]
-	[IconPickerField]o-[void Function(IconOption)?]
-	[IconPickerField]o-[FocusNode]
-	
-	[IconPickerGallery
-	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +onSelect: void Function(IconOption)?;
-	  +iconSize: double
-	  |
-	  +Widget build()
-	]
-	
-	[IconPickerGallery]o-[void Function(IconOption)?]
-	
-	[SecondaryButton
-	  |
-	  +text: String;
-	  +icon: IconData?;
-	  +isLoading: bool;
-	  +onPressed: void Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[SecondaryButton]o-[IconData]
-	[SecondaryButton]o-[void Function()?]
-	
-	[TwoColumnLayout
-	  |
-	  &lt;static&gt;+defaultDivider: VerticalDivider;
-	  &lt;static&gt;+defaultContentPadding: EdgeInsets;
-	  &lt;static&gt;+slimContentPadding: EdgeInsets;
-	  +leftWidget: Widget;
-	  +rightWidget: Widget;
-	  +dividerWidget: Widget?;
-	  +headerWidget: Widget?;
-	  +flexLeft: int?;
-	  +flexRight: int?;
-	  +constraintsLeft: BoxConstraints?;
-	  +constraintsRight: BoxConstraints?;
-	  +scrollLeft: bool;
-	  +scrollRight: bool;
-	  +paddingLeft: EdgeInsets?;
-	  +paddingRight: EdgeInsets?;
-	  +backgroundColorLeft: Color?;
-	  +backgroundColorRight: Color?;
-	  +stretchHeight: bool
-	]
-	
-	[TwoColumnLayout]o-[VerticalDivider]
-	[TwoColumnLayout]o-[EdgeInsets]
-	[TwoColumnLayout]o-[&lt;abstract&gt;Widget]
-	[TwoColumnLayout]o-[BoxConstraints]
-	[TwoColumnLayout]o-[Color]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="997.0" width="19632.8" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M2089.5 652.7 L2673.5 784 L2750.830508474576 857 L2750.8 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2081.5 645.5 L2089.5 652.7 L2079.2 655.9 L2071.3 648.7 Z"></path>
-					</g>
-					<path d="M2089.8 625.0 L3802.25 784 L3933.4025423728813 857 L3933.4 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2081.0 618.9 L2089.8 625.0 L2080.1 629.5 L2071.3 623.3 Z"></path>
-					</g>
-					<path d="M1668.7 630.4 L369 784 L369 857 L369.0 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1678.6 634.6 L1668.7 630.4 L1677.4 624.0 L1687.3 628.2 Z"></path>
-					</g>
-					<path d="M1668.7 626.4 L83 784 L83 857 L83.0 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1678.5 630.8 L1668.7 626.4 L1677.4 620.2 L1687.3 624.6 Z"></path>
-					</g>
-					<path d="M2345.7 689.4 L2128.25 784 L2193.826271186441 857 L2193.8 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2356.4 690.6 L2345.7 689.4 L2352.1 680.8 L2362.8 682.0 Z"></path>
-					</g>
-					<path d="M2772.3 626.9 L4491 784 L4678.036723163842 857 L4678.0 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2763.5 620.7 L2772.3 626.9 L2762.6 631.3 L2753.8 625.2 Z"></path>
-					</g>
-					<path d="M2305.2 628.8 L748 784 L748 857 L748.0 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2315.0 633.2 L2305.2 628.8 L2313.9 622.5 L2323.8 626.9 Z"></path>
-					</g>
-					<path d="M4711.1 613.9 L8363.75 784 L10234.25 871.1488549618321 L10234.3 871.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4702.1 608.2 L4711.1 613.9 L4701.6 618.8 L4692.5 613.0 Z"></path>
-					</g>
-					<path d="M4349.9 617.5 L1854.25 784 L1854.25 857 L1854.3 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4359.5 622.2 L4349.9 617.5 L4358.8 611.6 L4368.5 616.3 Z"></path>
-					</g>
-					<path d="M4349.9 614.8 L1051 784 L1051 857 L1051.0 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4359.5 619.6 L4349.9 614.8 L4358.9 609.0 L4368.5 613.8 Z"></path>
-					</g>
-					<path d="M1551.2 233.0 L2900.25 427 L2900.25 590 L2900.3 590.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1542.7 226.4 L1551.2 233.0 L1541.2 236.9 L1532.8 230.3 Z"></path>
-					</g>
-					<path d="M1141.8 260.5 L544.75 427 L544.75 574.5 L544.8 574.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1152.2 263.2 L1141.8 260.5 L1149.3 252.9 L1159.8 255.5 Z"></path>
-					</g>
-					<path d="M692.3 623.5 L2008.75 784 L2008.75 857 L2008.8 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M683.7 617.1 L692.3 623.5 L682.4 627.7 L673.8 621.2 Z"></path>
-					</g>
-					<path d="M6878.6 690.0 L6821.75 784 L7398.5 867.368517762352 L7398.5 867.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6888.0 684.7 L6878.6 690.0 L6878.9 679.2 L6888.3 674.0 Z"></path>
-					</g>
-					<path d="M10038.4 614.4 L6959.75 784 L7398.5 865.8753294675804 L7398.5 865.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10048.0 619.2 L10038.4 614.4 L10047.4 608.6 L10057.0 613.4 Z"></path>
-					</g>
-					<path d="M10362.6 614.3 L13471.5 784 L13526.765536723164 857 L13526.8 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10353.6 608.5 L10362.6 614.3 L10353.0 619.2 L10344.0 613.3 Z"></path>
-					</g>
-					<path d="M10035.7 609.9 L17395.5 784 L17477.985875706214 857 L17478.0 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10026.5 604.3 L10035.7 609.9 L10026.2 615.0 L10017.0 609.4 Z"></path>
-					</g>
-					<path d="M10035.7 612.5 L14597.75 784 L16337 868.9819875776398 L16337.0 869.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10026.5 606.8 L10035.7 612.5 L10026.1 617.4 L10017.0 611.8 Z"></path>
-					</g>
-					<path d="M9665.4 614.6 L6214.75 784 L6332.498587570622 857 L6332.5 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9674.9 619.5 L9665.4 614.6 L9674.4 608.8 L9684.0 613.7 Z"></path>
-					</g>
-					<path d="M10035.2 648.6 L10615.75 784 L11105 863.923627134287 L11105.0 863.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10027.3 641.3 L10035.2 648.6 L10024.9 651.7 L10017.0 644.3 Z"></path>
-					</g>
-					<path d="M9665.3 609.9 L2341.75 784 L2341.75 857 L2341.8 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9674.8 615.0 L9665.3 609.9 L9674.5 604.3 L9684.0 609.5 Z"></path>
-					</g>
-					<path d="M3578.0 635.3 L2539.75 784 L2539.75 857 L2539.8 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3588.0 639.2 L3578.0 635.3 L3586.5 628.7 L3596.5 632.6 Z"></path>
-					</g>
-					<path d="M3993.7 655.3 L4531 784 L4685.042372881356 857 L4685.0 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3985.8 647.9 L3993.7 655.3 L3983.3 658.3 L3975.5 650.9 Z"></path>
-					</g>
-					<path d="M3994.1 617.1 L6999.75 784 L7398.5 865.2651122625216 L7398.5 865.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3985.1 611.2 L3994.1 617.1 L3984.5 621.9 L3975.5 616.0 Z"></path>
-					</g>
-					<path d="M3578.0 629.8 L2254.75 784 L2215.981638418079 857 L2216.0 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3587.8 634.0 L3578.0 629.8 L3586.6 623.4 L3596.5 627.6 Z"></path>
-					</g>
-					<path d="M3641.1 691.0 L3483.5 784 L3530.858757062147 819 L3530.9 819.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3651.9 690.8 L3641.1 691.0 L3646.5 681.6 L3657.2 681.5 Z"></path>
-					</g>
-					<path d="M5888.8 632.8 L7039.75 784 L7398.5 864.5310716550413 L7398.5 864.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5880.2 626.3 L5888.8 632.8 L5878.8 636.9 L5870.3 630.4 Z"></path>
-					</g>
-					<path d="M5472.7 623.5 L3622.5 784 L3614.8870056497176 819 L3614.9 819.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5482.4 628.1 L5472.7 623.5 L5481.5 617.4 L5491.3 621.9 Z"></path>
-					</g>
-					<path d="M5472.8 638.9 L4571 784 L4692.04802259887 857 L4692.0 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5482.9 642.7 L5472.8 638.9 L5481.2 632.2 L5491.3 636.0 Z"></path>
-					</g>
-					<path d="M5213.1 636.8 L4611 784 L4699.053672316384 857 L4699.1 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5223.4 639.8 L5213.1 636.8 L5220.9 629.4 L5231.3 632.4 Z"></path>
-					</g>
-					<path d="M4908.2 671.3 L4651 784 L4706.059322033899 857 L4706.1 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4918.8 672.4 L4908.2 671.3 L4914.6 662.7 L4925.3 663.8 Z"></path>
-					</g>
-					<path d="M4906.7 624.9 L3662.5 784 L3639.0677966101694 819 L3639.1 819.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4916.7 629.0 L4906.7 624.9 L4915.3 618.4 L4925.3 622.5 Z"></path>
-					</g>
-					<path d="M3806.4 822.0 L3818.25 819 L3825.75 819 L3825.75 819 L3833.25 872.5 L3833.25 872.5 L3825.75 926 L3825.75 926 L3818.25 926 L3818.25 926 L3788.25 918.5348837209302 L3788.3 918.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3796.0 819.0 L3806.4 822.0 L3798.6 829.4 L3788.3 826.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M7062.4 607.8 L3762.25 784 L3699.3686440677966 819 L3699.4 819.0 " fill="none"></path>
-					</g>
-					<path d="M7062.7 613.2 L7062.4 607.8 L7062.2 602.5 L7075.8 607.1 Z"></path>
-					<path d="M15364.0 678.2 L15364 784 L16337 866.4023923444976 L16337.0 866.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15369.3 668.8 L15364.0 678.2 L15358.7 668.8 L15364.0 659.5 Z"></path>
-					</g>
-					<path d="M9375.7 608.8 L17435.5 784 L17484.991525423728 857 L17485.0 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9366.4 603.2 L9375.7 608.8 L9366.2 613.9 L9357.0 608.4 Z"></path>
-					</g>
-					<path d="M9225.5 753.2 L9225.5 784 L10234.25 870.02686099735 L10234.3 870.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9230.8 743.8 L9225.5 753.2 L9220.2 743.8 L9225.5 734.5 Z"></path>
-					</g>
-					<path d="M9075.4 612.4 L5335.75 784 L5357.049435028249 804 L5357.0 804.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9084.9 617.3 L9075.4 612.4 L9084.4 606.6 L9094.0 611.5 Z"></path>
-					</g>
-					<path d="M9375.6 621.3 L10919.5 784 L11115.816384180791 857 L11115.8 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9366.8 615.0 L9375.6 621.3 L9365.7 625.6 L9357.0 619.4 Z"></path>
-					</g>
-					<path d="M9075.4 612.0 L5129 784 L4762.25 862.9237082066869 L4762.3 862.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9084.9 617.0 L9075.4 612.0 L9084.4 606.3 L9094.0 611.2 Z"></path>
-					</g>
-					<path d="M5591.4 809.0 L5604 804 L5611.5 804 L5611.5 804 L5619 872.5 L5619 872.5 L5611.5 941 L5611.5 941 L5604 941 L5604 941 L5574 929.1896551724138 L5574.0 929.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5580.7 807.4 L5591.4 809.0 L5584.6 817.4 L5574.0 815.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M7062.5 610.7 L5600.5 784 L5561.968926553673 804 L5562.0 804.0 " fill="none"></path>
-					</g>
-					<path d="M7063.1 616.0 L7062.5 610.7 L7061.9 605.4 L7075.8 609.1 Z"></path>
-					<path d="M9378.4 615.9 L7079.75 784 L7398.5 863.6312632321807 L7398.5 863.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9388.1 620.5 L9378.4 615.9 L9387.3 609.9 L9397.0 614.5 Z"></path>
-					</g>
-					<path d="M9520.5 760.7 L9520.5 784 L10234.25 869.0445977785257 L10234.3 869.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9525.8 751.3 L9520.5 760.7 L9515.2 751.3 L9520.5 742.0 Z"></path>
-					</g>
-					<path d="M9662.5 623.1 L10959.5 784 L11122.822033898305 857 L11122.8 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9653.9 616.7 L9662.5 623.1 L9652.6 627.3 L9644.0 620.8 Z"></path>
-					</g>
-					<path d="M3212.5 680.9 L3296.75 784 L2821.75 863.3909348441927 L2821.8 863.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3210.7 670.3 L3212.5 680.9 L3202.4 677.1 L3200.6 666.5 Z"></path>
-					</g>
-					<path d="M7612.0 715.2 L7612 784 L7465.175141242938 857 L7465.2 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7617.3 705.8 L7612.0 715.2 L7606.7 705.8 L7612.0 696.5 Z"></path>
-					</g>
-					<path d="M7444.4 620.7 L5640.5 784 L5885 839.2701149425287 L5885.0 839.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7454.2 625.1 L7444.4 620.7 L7453.2 614.5 L7463.0 619.0 Z"></path>
-					</g>
-					<path d="M7779.6 614.3 L10999.5 784 L11129.827683615818 857 L11129.8 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7770.6 608.5 L7779.6 614.3 L7770.0 619.2 L7761.0 613.4 Z"></path>
-					</g>
-					<path d="M7444.5 627.5 L6254.75 784 L6339.504237288135 857 L6339.5 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7454.4 631.6 L7444.5 627.5 L7453.1 621.0 L7463.0 625.1 Z"></path>
-					</g>
-					<path d="M6196.6 815.8 L6209 811.5 L6216.5 811.5 L6216.5 811.5 L6224 872.5 L6224 872.5 L6216.5 933.5 L6216.5 933.5 L6209 933.5 L6209 933.5 L6179 923.1610169491526 L6179.0 923.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6186.1 813.8 L6196.6 815.8 L6189.6 823.8 L6179.0 821.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M7062.7 613.9 L6174.75 784 L6130.392655367232 811.5 L6130.4 811.5 " fill="none"></path>
-					</g>
-					<path d="M7063.7 619.1 L7062.7 613.9 L7061.7 608.6 L7075.8 611.3 Z"></path>
-					<path d="M7478.6 262.6 L8002 427 L8002 590 L8002.0 590.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7471.3 254.7 L7478.6 262.6 L7468.1 264.9 L7460.8 257.0 Z"></path>
-					</g>
-					<path d="M7529.3 254.0 L8347 427 L8347 590 L8347.0 590.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7521.2 246.9 L7529.3 254.0 L7519.0 257.3 L7511.0 250.1 Z"></path>
-					</g>
-					<path d="M11158.4 214.9 L8993 427 L8993 590 L8993.0 590.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11168.2 219.3 L11158.4 214.9 L11167.2 208.7 L11177.0 213.1 Z"></path>
-					</g>
-					<path d="M10710.6 616.4 L13364.5 784 L13364.5 857 L13364.5 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10701.7 610.5 L10710.6 616.4 L10701.0 621.1 L10692.0 615.2 Z"></path>
-					</g>
-					<path d="M10365.7 640.0 L9645.5 784 L10234.25 868.345406717928 L10234.3 868.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10375.9 643.4 L10365.7 640.0 L10373.8 632.9 L10384.0 636.3 Z"></path>
-					</g>
-					<path d="M10710.6 619.6 L12724 784 L12724 857 L12724.0 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10701.7 613.5 L10710.6 619.6 L10700.9 624.2 L10692.0 618.1 Z"></path>
-					</g>
-					<path d="M10709.6 666.6 L11039.5 784 L11136.833333333334 857 L11136.8 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10702.6 658.4 L10709.6 666.6 L10699.0 668.5 L10692.0 660.3 Z"></path>
-					</g>
-					<path d="M10365.4 619.1 L8265.25 784 L8265.25 857 L8265.3 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10375.1 623.6 L10365.4 619.1 L10374.3 613.0 L10384.0 617.6 Z"></path>
-					</g>
-					<path d="M17050.3 646.4 L17269.75 784 L17269.75 857 L17269.8 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17045.2 636.9 L17050.3 646.4 L17039.5 646.0 L17034.5 636.5 Z"></path>
-					</g>
-					<path d="M11386.3 207.9 L16985 427 L16985 574.5 L16985.0 574.5 " fill="none"></path>
-					<path d="M11386.5 202.5 L11386.3 207.9 L11386.1 213.2 L11373.0 207.3 Z"></path>
-					<path d="M12195.3 612.6 L7652 784 L7469.5 858.0883027522935 L7469.5 858.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12204.9 617.6 L12195.3 612.6 L12204.5 607.0 L12214.0 611.9 Z"></path>
-					</g>
-					<path d="M12195.9 650.9 L11642.75 784 L11210 862.9250386398763 L11210.0 862.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12206.2 653.9 L12195.9 650.9 L12203.7 643.5 L12214.0 646.5 Z"></path>
-					</g>
-					<path d="M12573.7 610.6 L18963 784 L19068.78813559322 857 L19068.8 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12564.5 605.0 L12573.7 610.6 L12564.2 615.7 L12555.0 610.1 Z"></path>
-					</g>
-					<path d="M4137.1 651.4 L4036.25 784 L3974.385593220339 857 L3974.4 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4147.0 647.2 L4137.1 651.4 L4138.5 640.7 L4148.4 636.5 Z"></path>
-					</g>
-					<path d="M11163.7 207.0 L4172 427 L4172 574.5 L4172.0 574.5 " fill="none"></path>
-					<path d="M11163.8 212.3 L11163.7 207.0 L11163.5 201.7 L11177.0 206.6 Z"></path>
-					<path d="M11968.7 609.6 L17475.5 784 L17491.99717514124 857 L17492.0 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11959.5 604.0 L11968.7 609.6 L11959.2 614.6 L11950.0 609.0 Z"></path>
-					</g>
-					<path d="M11709.4 611.1 L7692 784 L7469.5 860.3226744186046 L7469.5 860.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11718.9 616.0 L11709.4 611.1 L11718.4 605.4 L11728.0 610.3 Z"></path>
-					</g>
-					<path d="M6648.5 693.1 L6657 784 L6657 857 L6657.0 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6652.9 683.3 L6648.5 693.1 L6642.3 684.3 L6646.7 674.5 Z"></path>
-					</g>
-					<path d="M5688.7 221.8 L6640.25 427 L6640.25 536.5 L6640.3 536.5 " fill="none"></path>
-					<path d="M5689.8 216.6 L5688.7 221.8 L5687.5 227.0 L5675.6 219.0 Z"></path>
-					<path d="M17936.6 622.3 L15928.75 784 L16337 859.2319104633003 L16337.0 859.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17946.4 626.8 L17936.6 622.3 L17945.5 616.2 L17955.3 620.8 Z"></path>
-					</g>
-					<path d="M18352.3 662.5 L18794.75 784 L18794.75 857 L18794.8 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18344.7 654.9 L18352.3 662.5 L18341.8 665.2 L18334.3 657.5 Z"></path>
-					</g>
-					<path d="M18311.0 698.1 L18465.25 784 L18465.25 857 L18465.3 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18305.4 688.9 L18311.0 698.1 L18300.2 698.2 L18294.7 689.0 Z"></path>
-					</g>
-					<path d="M18144.8 707.7 L18144.75 784 L18144.75 857 L18144.8 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18150.1 698.3 L18144.8 707.7 L18139.4 698.3 L18144.8 689.0 Z"></path>
-					</g>
-					<path d="M18004.3 699.4 L17877.75 784 L17877.75 857 L17877.8 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18015.1 698.6 L18004.3 699.4 L18009.1 689.8 L18019.9 689.0 Z"></path>
-					</g>
-					<path d="M9079.8 211.7 L11570 427 L11570 590 L11570.0 590.0 " fill="none"></path>
-					<path d="M9080.2 206.4 L9079.8 211.7 L9079.3 217.0 L9066.5 210.5 Z"></path>
-					<path d="M5892.1 634.3 L5255.75 784 L4762.25 865.1798327137546 L4762.3 865.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5902.4 637.3 L5892.1 634.3 L5899.9 626.9 L5910.3 630.0 Z"></path>
-					</g>
-					<path d="M9421.5 210.4 L12082 427 L12082 590 L12082.0 590.0 " fill="none"></path>
-					<path d="M9422.0 205.0 L9421.5 210.4 L9421.1 215.7 L9408.3 209.3 Z"></path>
-					<path d="M13995.1 856.0 L14408.333333333334 819 L14516.291666666666 819 L14516.291666666666 819 L14624.25 872.5 L14624.25 872.5 L14516.291666666666 926 L14516.291666666666 926 L14408.333333333334 926 L14408.333333333334 926 L13976.5 887.2905612957275 L13976.5 887.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13985.3 851.6 L13995.1 856.0 L13986.3 862.2 L13976.5 857.7 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M7150.1 606.7 L13695 784 L13741.073446327684 819 L13741.1 819.0 " fill="none"></path>
-					</g>
-					<path d="M7150.2 601.4 L7150.1 606.7 L7149.9 612.0 L7136.8 606.3 Z"></path>
-					<path d="M6343.3 676.2 L6397.5 784 L6364.505649717514 857 L6364.5 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6343.9 665.4 L6343.3 676.2 L6334.3 670.2 L6334.9 659.5 Z"></path>
-					</g>
-					<path d="M9919.0 210.5 L12676 427 L12676 559 L12676.0 559.0 " fill="none"></path>
-					<path d="M9919.5 205.2 L9919.0 210.5 L9918.6 215.8 L9905.8 209.5 Z"></path>
-					<path d="M16673.0 670.7 L16673 784 L16455.237288135595 857 L16455.2 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16678.3 661.3 L16673.0 670.7 L16667.7 661.3 L16673.0 652.0 Z"></path>
-					</g>
-					<path d="M11168.6 620.8 L13588 784 L13547.169491525423 857 L13547.2 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11159.7 614.9 L11168.6 620.8 L11159.0 625.5 L11150.0 619.6 Z"></path>
-					</g>
-					<path d="M10713.4 618.2 L7732 784 L7469.5 861.9572147651006 L7469.5 862.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10723.0 623.0 L10713.4 618.2 L10722.4 612.3 L10732.0 617.1 Z"></path>
-					</g>
-					<path d="M11168.1 660.2 L11682.75 784 L11210 863.6542122798668 L11210.0 863.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11160.3 652.8 L11168.1 660.2 L11157.8 663.2 L11150.0 655.8 Z"></path>
-					</g>
-					<path d="M4528.2 807.4 L4540.25 804 L4547.75 804 L4547.75 804 L4555.25 872.5 L4555.25 872.5 L4547.75 941 L4547.75 941 L4540.25 941 L4540.25 941 L4510.25 932.5432098765432 L4510.3 932.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4517.8 804.8 L4528.2 807.4 L4520.7 815.1 L4510.3 812.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M7062.4 608.3 L4297.25 784 L4297.25 804 L4297.3 804.0 " fill="none"></path>
-					</g>
-					<path d="M7062.8 613.6 L7062.4 608.3 L7062.1 603.0 L7075.8 607.4 Z"></path>
-					<path d="M11430.7 609.7 L16809 784 L16479.05649717514 857 L16479.1 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11421.5 604.1 L11430.7 609.7 L11421.2 614.7 L11412.0 609.1 Z"></path>
-					</g>
-					<path d="M11171.8 635.6 L10535.75 784 L10292.25 863.0816513761467 L10292.3 863.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11182.1 638.7 L11171.8 635.6 L11179.7 628.3 L11190.0 631.4 Z"></path>
-					</g>
-					<path d="M11171.3 609.4 L5295.75 784 L4762.25 865.6864186851211 L4762.3 865.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11180.8 614.4 L11171.3 609.4 L11180.5 603.7 L11190.0 608.8 Z"></path>
-					</g>
-					<path d="M11430.7 609.2 L17515.5 784 L17499.00282485876 857 L17499.0 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11421.5 603.6 L11430.7 609.2 L11421.2 614.3 L11412.0 608.7 Z"></path>
-					</g>
-					<path d="M13728.2 610.5 L19324.25 784 L19324.25 857 L19324.3 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13719.0 604.9 L13728.2 610.5 L13718.7 615.6 L13709.5 609.9 Z"></path>
-					</g>
-					<path d="M13403.8 610.5 L7772 784 L7469.5 863.2048816568048 L7469.5 863.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13413.3 615.5 L13403.8 610.5 L13413.0 604.9 L13422.5 609.9 Z"></path>
-					</g>
-					<path d="M13943.5 425.7 L13943.5 427 L13943.5 590 L13943.5 590.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13948.8 416.3 L13943.5 425.7 L13938.2 416.3 L13943.5 407.0 Z"></path>
-					</g>
-					<path d="M14233.9 418.1 L14246 427 L14246 590 L14246.0 590.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14229.6 408.3 L14233.9 418.1 L14223.3 416.8 L14218.9 407.0 Z"></path>
-					</g>
-					<path d="M13833.2 423.7 L13831.5 427 L13831.5 605.5 L13831.5 605.5 L13831.5 784 L13831.5 784 L13823.590395480225 819 L13823.6 819.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13842.1 417.7 L13833.2 423.7 L13832.6 413.0 L13841.5 407.0 Z"></path>
-					</g>
-					<path d="M14305.0 335.3 L14556.5 427 L14556.5 590 L14556.5 590.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14298.1 327.1 L14305.0 335.3 L14294.4 337.1 L14287.5 328.9 Z"></path>
-					</g>
-					<path d="M14305.7 284.9 L14938 427 L14938 590 L14938.0 590.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14297.8 277.7 L14305.7 284.9 L14295.4 288.1 L14287.5 280.8 Z"></path>
-					</g>
-					<path d="M13583.7 416.5 L13566 427 L13566 537 L13566.0 537.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13594.5 416.3 L13583.7 416.5 L13589.0 407.2 L13599.8 407.0 Z"></path>
-					</g>
-					<path d="M14306.1 219.0 L19187.75 427 L19187.75 605.5 L19187.75 605.5 L19187.75 784 L19187.75 784 L19108.151129943504 857 L19108.2 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14297.1 213.2 L14306.1 219.0 L14296.6 223.9 L14287.5 218.2 Z"></path>
-					</g>
-					<path d="M13580.8 216.7 L7812 427 L7812 605.5 L7812 605.5 L7812 784 L7812 784 L7469.5 864.188492063492 L7469.5 864.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13590.4 221.7 L13580.8 216.7 L13590.0 211.0 L13599.5 216.0 Z"></path>
-					</g>
-					<path d="M13581.3 285.2 L12952.25 427 L12952.25 605.5 L12952.25 605.5 L12952.25 784 L12952.25 784 L12983.7895480226 819 L12983.8 819.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13591.6 288.3 L13581.3 285.2 L13589.2 277.9 L13599.5 281.1 Z"></path>
-					</g>
-					<path d="M13226.6 822.1 L13238.5 819 L13246 819 L13246 819 L13253.5 872.5 L13253.5 872.5 L13246 926 L13246 926 L13238.5 926 L13238.5 926 L13208.5 918.227602905569 L13208.5 918.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13216.2 819.3 L13226.6 822.1 L13218.9 829.6 L13208.5 826.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M7150.1 606.8 L13178.25 784 L13120.411016949152 819 L13120.4 819.0 " fill="none"></path>
-					</g>
-					<path d="M7150.2 601.5 L7150.1 606.8 L7149.9 612.1 L7136.8 606.4 Z"></path>
-					<path d="M17638.8 695.6 L17555.5 784 L17506.008474576272 857 L17506.0 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17649.1 692.4 L17638.8 695.6 L17641.4 685.1 L17651.6 682.0 Z"></path>
-					</g>
-					<path d="M18582.6 214.1 L17359 427 L17591.75 540.9023303632625 L17591.8 540.9 " fill="none"></path>
-					<path d="M18583.5 219.4 L18582.6 214.1 L18581.7 208.9 L18595.8 211.9 Z"></path>
-					<path d="M16444.3 222.2 L15612.5 427 L15612.5 590 L15612.5 590.0 " fill="none"></path>
-					<path d="M16445.6 227.4 L16444.3 222.2 L16443.1 217.0 L16457.3 219.0 Z"></path>
-					<path d="M17378.9 248.2 L18089.5 427 L17855.75 541.078947368421 L17855.8 541.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17371.1 240.7 L17378.9 248.2 L17368.5 251.1 L17360.8 243.6 Z"></path>
-					</g>
-					<path d="M17023.3 231.0 L15753.5 427 L15882.25630252101 590 L15882.3 590.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17033.3 234.8 L17023.3 231.0 L17031.7 224.3 L17041.8 228.1 Z"></path>
-					</g>
-					<path d="M17023.6 247.2 L16293.5 427 L16457.413165266105 590 L16457.4 590.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17034.0 250.2 L17023.6 247.2 L17031.4 239.8 L17041.8 242.8 Z"></path>
-					</g>
-					<path d="M17794.3 250.9 L18454.25 427 L17855.75 573.2453798767967 L17855.8 573.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17786.6 243.3 L17794.3 250.9 L17783.9 253.6 L17776.3 246.1 Z"></path>
-					</g>
-					<path d="M17438.7 225.3 L15793.5 427 L15885.729691876752 590 L15885.7 590.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17448.6 229.5 L17438.7 225.3 L17447.3 218.9 L17457.3 223.1 Z"></path>
-					</g>
-					<path d="M17439.1 247.2 L16709 427 L16493.49299719888 590 L16493.5 590.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17449.5 250.2 L17439.1 247.2 L17446.9 239.8 L17457.3 242.8 Z"></path>
-					</g>
-					<path d="M16664.6 247.2 L15934.5 427 L15897.973389355742 590 L15898.0 590.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16675.0 250.2 L16664.6 247.2 L16672.4 239.8 L16682.8 242.8 Z"></path>
-					</g>
-					<path d="M17463.3 685.6 L17595.5 784 L17513.014124293786 857 L17513.0 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17458.9 675.8 L17463.3 685.6 L17452.6 684.3 L17448.3 674.5 Z"></path>
-					</g>
-					<path d="M17253.6 686.1 L17129.75 784 L16481 863.659209157128 L16481.0 863.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17264.2 684.5 L17253.6 686.1 L17257.6 676.1 L17268.2 674.5 Z"></path>
-					</g>
-					<path d="M13401.2 611.2 L19511.75 784 L19511.75 857 L19511.8 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13392.0 605.6 L13401.2 611.2 L13391.7 616.3 L13382.5 610.7 Z"></path>
-					</g>
-					<path d="M12996.6 666.9 L12612 784 L11210 869.3056033001031 L11210.0 869.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13007.1 669.3 L12996.6 666.9 L13004.0 659.1 L13014.5 661.5 Z"></path>
-					</g>
-					<path d="M12995.8 612.8 L8225.25 784 L7469.5 868.5293838862559 L7469.5 868.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13005.4 617.8 L12995.8 612.8 L13005.0 607.1 L13014.5 612.1 Z"></path>
-					</g>
-					<path d="M13399.9 684.2 L13655 784 L13558.90395480226 857 L13558.9 857.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13393.1 675.9 L13399.9 684.2 L13389.3 685.8 L13382.5 677.4 Z"></path>
-					</g>
-					<path d="M12995.9 619.3 L10575.75 784 L10292.25 864.2872 L10292.3 864.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13005.6 624.0 L12995.9 619.3 L13004.8 613.3 L13014.5 618.0 Z"></path>
-					</g>
-					<g data-name="AsyncValueWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValueWidget">
-							<rect x="1687.3" y="506.5" height="198.0" width="384.0" data-name="AsyncValueWidget"></rect>
-							<path d="M1687.3 537.5 L2071.3 537.5" fill="none" data-name="AsyncValueWidget"></path>
-							<path d="M1687.3 628.5 L2071.3 628.5" fill="none" data-name="AsyncValueWidget"></path>
-						</g>
-						<g transform="translate(1687.25, 506.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValueWidget">
-								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValueWidget">AsyncValueWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1687.25, 537.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+value: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">+data: Widget Function(T)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">+error: Widget Function(Object, StackTrace?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">+loading: Widget Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AsyncValueWidget">+empty: Widget Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1687.25, 628.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">-Widget _buildDataOrEmptyWidget()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultLoad()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="2712.8" y="857.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
-						</g>
-						<g transform="translate(2712.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="3878.3" y="857.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
-						</g>
-						<g transform="translate(3878.25, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(Object, StackTrace?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Object, StackTrace?)?">
-							<rect x="206.0" y="857.0" height="31.0" width="326.0" data-name="Widget Function(Object, StackTrace?)?"></rect>
-						</g>
-						<g transform="translate(206, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Object, StackTrace?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Object, StackTrace?)?">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Object, StackTrace?)?">Widget Function(Object, StackTrace?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function()?">
-							<rect x="0.0" y="857.0" height="31.0" width="166.0" data-name="Widget Function()?"></rect>
-						</g>
-						<g transform="translate(0, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function()?">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function()?">Widget Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControlLabel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlLabel">
-							<rect x="2323.8" y="529.0" height="153.0" width="430.0" data-name="FormControlLabel"></rect>
-							<path d="M2323.8 560.0 L2753.8 560.0" fill="none" data-name="FormControlLabel"></path>
-							<path d="M2323.8 651.0 L2753.8 651.0" fill="none" data-name="FormControlLabel"></path>
-						</g>
-						<g transform="translate(2323.75, 529)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlLabel">
-								<text x="207.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlLabel">FormControlLabel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2323.75, 560)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+formControl: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlLabel">+text: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlLabel">+isClickable: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlLabel">+textStyle: TextStyle?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormControlLabel">+onClick: void Function(AbstractControl&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2323.75, 651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="2138.8" y="857.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(2138.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TextStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
-							<rect x="4673.3" y="857.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
-						</g>
-						<g transform="translate(4673.25, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
-								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<rect x="572.0" y="857.0" height="31.0" width="352.0" data-name="void Function(AbstractControl&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(572, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">void Function(AbstractControl&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ActionPopUpMenuButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionPopUpMenuButton">
-							<rect x="4368.5" y="476.5" height="258.0" width="324.0" data-name="ActionPopUpMenuButton"></rect>
-							<path d="M4368.5 507.5 L4692.5 507.5" fill="none" data-name="ActionPopUpMenuButton"></path>
-							<path d="M4368.5 688.5 L4692.5 688.5" fill="none" data-name="ActionPopUpMenuButton"></path>
-						</g>
-						<g transform="translate(4368.5, 476.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionPopUpMenuButton">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionPopUpMenuButton">ActionPopUpMenuButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4368.5, 507.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColor: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColorHover: Color?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconSize: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ActionPopUpMenuButton">+disableSplashEffect: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ActionPopUpMenuButton">+hideOnEmpty: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ActionPopUpMenuButton">+orientation: Axis</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ActionPopUpMenuButton">+elevation: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ActionPopUpMenuButton">+splashRadius: double?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ActionPopUpMenuButton">+enabled: bool</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ActionPopUpMenuButton">+position: PopupMenuPosition</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4368.5, 688.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">-Widget _buildPopupMenu()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="10234.3" y="857.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(10234.25, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Axis">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Axis">
-							<rect x="1829.8" y="857.0" height="31.0" width="49.0" data-name="Axis"></rect>
-						</g>
-						<g transform="translate(1829.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Axis">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Axis">
-								<text x="16.5" y="13.5" stroke="none" text-anchor="middle" data-name="Axis">Axis</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PopupMenuPosition">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PopupMenuPosition">
-							<rect x="964.0" y="857.0" height="31.0" width="174.0" data-name="PopupMenuPosition"></rect>
-						</g>
-						<g transform="translate(964, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PopupMenuPosition">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PopupMenuPosition">
-								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="PopupMenuPosition">PopupMenuPosition</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Search">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Search">
-							<rect x="1159.8" y="150.0" height="107.0" width="373.0" data-name="Search"></rect>
-							<path d="M1159.8 181.0 L1532.8 181.0" fill="none" data-name="Search"></path>
-						</g>
-						<g transform="translate(1159.75, 150)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Search">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Search">
-								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="Search">Search</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1159.75, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Search">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Search">
-								<text x="0.0" y="13.5" stroke="none" data-name="Search">+onQueryChanged: dynamic Function(String)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Search">+searchController: SearchController?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Search">+hintText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Search">+initialText: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(String)">
-							<rect x="2793.8" y="590.0" height="31.0" width="213.0" data-name="dynamic Function(String)"></rect>
-						</g>
-						<g transform="translate(2793.75, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(String)">
-								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(String)">dynamic Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SearchController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="415.8" y="574.5" height="62.0" width="258.0" data-name="SearchController"></rect>
-							<path d="M415.8 605.5 L673.8 605.5" fill="none" data-name="SearchController"></path>
-						</g>
-						<g transform="translate(415.75, 574.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(415.75, 605.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SearchController">
-								<text x="0.0" y="13.5" stroke="none" data-name="SearchController">+setText: void Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(String)">
-							<rect x="1918.8" y="857.0" height="31.0" width="180.0" data-name="void Function(String)"></rect>
-						</g>
-						<g transform="translate(1918.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(String)">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(String)">void Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormScaffold">
-							<rect x="6823.8" y="537.0" height="137.0" width="212.0" data-name="FormScaffold"></rect>
-							<path d="M6823.8 568.0 L7035.8 568.0" fill="none" data-name="FormScaffold"></path>
-						</g>
-						<g transform="translate(6823.75, 537)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormScaffold">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormScaffold">FormScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6823.75, 568)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormScaffold">+formViewModel: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormScaffold">+actions: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormScaffold">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormScaffold">+actionsPadding: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="7398.5" y="857.0" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(7398.5, 857)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConstrainedWidthFlexible">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConstrainedWidthFlexible">
-							<rect x="10057.0" y="514.0" height="183.0" width="287.0" data-name="ConstrainedWidthFlexible"></rect>
-							<path d="M10057.0 545.0 L10344.0 545.0" fill="none" data-name="ConstrainedWidthFlexible"></path>
-							<path d="M10057.0 651.0 L10344.0 651.0" fill="none" data-name="ConstrainedWidthFlexible"></path>
-						</g>
-						<g transform="translate(10057, 514)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConstrainedWidthFlexible">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConstrainedWidthFlexible">ConstrainedWidthFlexible</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10057, 545)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+minWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">+maxWidth: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConstrainedWidthFlexible">+flex: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConstrainedWidthFlexible">+flexSum: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConstrainedWidthFlexible">+child: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConstrainedWidthFlexible">+outerConstraints: BoxConstraints</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10057, 651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">-double _getWidth()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoxConstraints">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoxConstraints">
-							<rect x="13470.5" y="857.0" height="31.0" width="136.0" data-name="BoxConstraints"></rect>
-						</g>
-						<g transform="translate(13470.5, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxConstraints">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxConstraints">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxConstraints">BoxConstraints</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PrimaryButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PrimaryButton">
-							<rect x="9684.0" y="492.0" height="227.0" width="333.0" data-name="PrimaryButton"></rect>
-							<path d="M9684.0 523.0 L10017.0 523.0" fill="none" data-name="PrimaryButton"></path>
-						</g>
-						<g transform="translate(9684, 492)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PrimaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PrimaryButton">
-								<text x="158.5" y="13.5" stroke="none" text-anchor="middle" data-name="PrimaryButton">PrimaryButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9684, 523)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PrimaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PrimaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="PrimaryButton">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PrimaryButton">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PrimaryButton">+isLoading: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PrimaryButton">+showLoadingEarliestAfterMs: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PrimaryButton">+onPressed: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PrimaryButton">+tooltip: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PrimaryButton">+tooltipDisabled: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PrimaryButton">+enabled: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PrimaryButton">+onPressedFuture: dynamic Function()?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="PrimaryButton">+innerPadding: EdgeInsets</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="PrimaryButton">+minimumSize: Size?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="PrimaryButton">+isDisabled: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="17452.0" y="857.0" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(17452, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="16337.0" y="857.0" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(16337, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="6269.0" y="857.0" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
-						</g>
-						<g transform="translate(6269, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
-								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EdgeInsets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="11105.0" y="857.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
-						</g>
-						<g transform="translate(11105, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Size">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Size">
-							<rect x="2316.8" y="857.0" height="31.0" width="50.0" data-name="Size"></rect>
-						</g>
-						<g transform="translate(2316.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Size">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Size">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Size">Size</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormTableRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRow">
-							<rect x="3596.5" y="529.5" height="152.0" width="379.0" data-name="FormTableRow"></rect>
-							<path d="M3596.5 560.5 L3975.5 560.5" fill="none" data-name="FormTableRow"></path>
-						</g>
-						<g transform="translate(3596.5, 529.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRow">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRow">FormTableRow</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3596.5, 560.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRow">+label: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRow">+labelBuilder: Widget Function(BuildContext)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRow">+labelStyle: TextStyle?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRow">+labelHelpText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormTableRow">+input: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormTableRow">+control: AbstractControl&lt;dynamic&gt;?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormTableRow">+layout: FormTableRowLayout?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
-							<rect x="2406.8" y="857.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
-						</g>
-						<g transform="translate(2406.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormTableRowLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRowLayout">
-							<rect x="3418.3" y="819.0" height="107.0" width="370.0" data-name="FormTableRowLayout"></rect>
-							<path d="M3418.3 850.0 L3788.3 850.0" fill="none" data-name="FormTableRowLayout"></path>
-						</g>
-						<g transform="translate(3418.25, 819)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRowLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRowLayout">
-								<text x="177.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRowLayout">FormTableRowLayout</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3418.25, 850)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRowLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRowLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRowLayout">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+values: List&lt;FormTableRowLayout&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+vertical: FormTableRowLayout</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+horizontal: FormTableRowLayout</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormTableLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableLayout">
-							<rect x="5491.3" y="529.0" height="153.0" width="379.0" data-name="FormTableLayout"></rect>
-							<path d="M5491.3 560.0 L5870.3 560.0" fill="none" data-name="FormTableLayout"></path>
-							<path d="M5491.3 651.0 L5870.3 651.0" fill="none" data-name="FormTableLayout"></path>
-						</g>
-						<g transform="translate(5491.25, 529)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableLayout">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableLayout">FormTableLayout</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5491.25, 560)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+rows: List&lt;FormTableRow&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableLayout">+columnWidths: Map&lt;int, TableColumnWidth&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableLayout">+rowDivider: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableLayout">+rowLayout: FormTableRowLayout?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormTableLayout">+rowLabelStyle: TextStyle?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5491.25, 651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormSectionHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSectionHeader">
-							<rect x="5231.3" y="529.0" height="153.0" width="220.0" data-name="FormSectionHeader"></rect>
-							<path d="M5231.3 560.0 L5451.3 560.0" fill="none" data-name="FormSectionHeader"></path>
-							<path d="M5231.3 651.0 L5451.3 651.0" fill="none" data-name="FormSectionHeader"></path>
-						</g>
-						<g transform="translate(5231.25, 529)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSectionHeader">
-								<text x="102.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormSectionHeader">FormSectionHeader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5231.25, 560)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormSectionHeader">+titleTextStyle: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormSectionHeader">+helpText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormSectionHeader">+divider: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormSectionHeader">+helpTextDisabled: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5231.25, 651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormLabel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormLabel">
-							<rect x="4925.3" y="536.5" height="138.0" width="266.0" data-name="FormLabel"></rect>
-							<path d="M4925.3 567.5 L5191.3 567.5" fill="none" data-name="FormLabel"></path>
-							<path d="M4925.3 643.5 L5191.3 643.5" fill="none" data-name="FormLabel"></path>
-						</g>
-						<g transform="translate(4925.25, 536.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormLabel">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormLabel">FormLabel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4925.25, 567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+labelText: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormLabel">+helpText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormLabel">+labelTextStyle: TextStyle?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormLabel">+layout: FormTableRowLayout?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4925.25, 643.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="7075.8" y="590.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(7075.75, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DismissButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DismissButton">
-							<rect x="15239.5" y="551.5" height="108.0" width="249.0" data-name="DismissButton"></rect>
-							<path d="M15239.5 582.5 L15488.5 582.5" fill="none" data-name="DismissButton"></path>
-							<path d="M15239.5 628.5 L15488.5 628.5" fill="none" data-name="DismissButton"></path>
-						</g>
-						<g transform="translate(15239.5, 551.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DismissButton">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="DismissButton">DismissButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15239.5, 582.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+onPressed: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DismissButton">+text: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15239.5, 628.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Badge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Badge">
-							<rect x="9094.0" y="476.5" height="258.0" width="263.0" data-name="Badge"></rect>
-							<path d="M9094.0 507.5 L9357.0 507.5" fill="none" data-name="Badge"></path>
-							<path d="M9094.0 658.5 L9357.0 658.5" fill="none" data-name="Badge"></path>
-						</g>
-						<g transform="translate(9094, 476.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Badge">
-								<text x="123.5" y="13.5" stroke="none" text-anchor="middle" data-name="Badge">Badge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9094, 507.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
-								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+icon: IconData?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Badge">+color: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Badge">+borderRadius: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Badge">+label: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Badge">+type: BadgeType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Badge">+padding: EdgeInsets</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Badge">+iconSize: double?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Badge">+labelStyle: TextStyle?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Badge">+center: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9094, 658.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
-								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Badge">-Color? _getBackgroundColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Badge">-Color _getBorderColor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Badge">-Color? _getLabelColor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="5286.0" y="804.0" height="137.0" width="288.0" data-name="BadgeType"></rect>
-							<path d="M5286.0 835.0 L5574.0 835.0" fill="none" data-name="BadgeType"></path>
-						</g>
-						<g transform="translate(5286, 804)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5286, 835)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BadgeType">
-								<text x="0.0" y="13.5" stroke="none" data-name="BadgeType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BadgeType">&lt;static&gt;+values: List&lt;BadgeType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BadgeType">&lt;static&gt;+filled: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlined: BadgeType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlineFill: BadgeType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BadgeType">&lt;static&gt;+plain: BadgeType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StandardDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardDialog">
-							<rect x="9397.0" y="469.0" height="273.0" width="247.0" data-name="StandardDialog"></rect>
-							<path d="M9397.0 500.0 L9644.0 500.0" fill="none" data-name="StandardDialog"></path>
-							<path d="M9397.0 711.0 L9644.0 711.0" fill="none" data-name="StandardDialog"></path>
-						</g>
-						<g transform="translate(9397, 469)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardDialog">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardDialog">StandardDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9397, 500)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+title: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardDialog">+titleText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardDialog">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardDialog">+actionButtons: List&lt;Widget&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardDialog">+backgroundColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardDialog">+borderRadius: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StandardDialog">+width: double?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StandardDialog">+height: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StandardDialog">+minWidth: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StandardDialog">+minHeight: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StandardDialog">+maxWidth: double?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StandardDialog">+maxHeight: double?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StandardDialog">+padding: EdgeInsets</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9397, 711)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ISyncIndicatorViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ISyncIndicatorViewModel">
-							<rect x="1838.0" y="165.0" height="77.0" width="214.0" data-name="ISyncIndicatorViewModel"></rect>
-							<path d="M1838.0 196.0 L2052.0 196.0" fill="none" data-name="ISyncIndicatorViewModel"></path>
-						</g>
-						<g transform="translate(1838, 165)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ISyncIndicatorViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ISyncIndicatorViewModel">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="ISyncIndicatorViewModel">ISyncIndicatorViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1838, 196)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ISyncIndicatorViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ISyncIndicatorViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ISyncIndicatorViewModel">+isDirty: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ISyncIndicatorViewModel">+lastSynced: DateTime?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SyncIndicator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SyncIndicator">
-							<rect x="3046.8" y="544.5" height="122.0" width="208.0" data-name="SyncIndicator"></rect>
-							<path d="M3046.8 575.5 L3254.8 575.5" fill="none" data-name="SyncIndicator"></path>
-						</g>
-						<g transform="translate(3046.75, 544.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SyncIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SyncIndicator">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="SyncIndicator">SyncIndicator</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3046.75, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SyncIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SyncIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="SyncIndicator">+state: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SyncIndicator">+lastSynced: DateTime?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SyncIndicator">+isDirty: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SyncIndicator">+animationDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SyncIndicator">+iconSize: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IWithBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="2092.0" y="172.5" height="62.0" width="164.0" data-name="IWithBanner"></rect>
-							<path d="M2092.0 203.5 L2256.0 203.5" fill="none" data-name="IWithBanner"></path>
-						</g>
-						<g transform="translate(2092, 172.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2092, 203.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IWithBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="IWithBanner">+Widget? banner()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BannerBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BannerBox">
-							<rect x="7463.0" y="514.5" height="182.0" width="298.0" data-name="BannerBox"></rect>
-							<path d="M7463.0 545.5 L7761.0 545.5" fill="none" data-name="BannerBox"></path>
-						</g>
-						<g transform="translate(7463, 514.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerBox">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerBox">BannerBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7463, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="BannerBox">+prefixIcon: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BannerBox">+body: Widget</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BannerBox">+style: BannerStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BannerBox">+padding: EdgeInsets?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BannerBox">+noPrefix: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BannerBox">+dismissable: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="BannerBox">+isDismissed: bool?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="BannerBox">+onDismissed: dynamic Function()?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="BannerBox">+dismissIconSize: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BannerStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BannerStyle">
-							<rect x="5885.0" y="811.5" height="122.0" width="294.0" data-name="BannerStyle"></rect>
-							<path d="M5885.0 842.5 L6179.0 842.5" fill="none" data-name="BannerStyle"></path>
-						</g>
-						<g transform="translate(5885, 811.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerStyle">
-								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerStyle">BannerStyle</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5885, 842.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerStyle">
-								<text x="0.0" y="13.5" stroke="none" data-name="BannerStyle">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+values: List&lt;BannerStyle&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+warning: BannerStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+info: BannerStyle</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+error: BannerStyle</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ActionMenuInline">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuInline">
-							<rect x="2296.0" y="119.5" height="168.0" width="324.0" data-name="ActionMenuInline"></rect>
-							<path d="M2296.0 150.5 L2620.0 150.5" fill="none" data-name="ActionMenuInline"></path>
-							<path d="M2296.0 256.5 L2620.0 256.5" fill="none" data-name="ActionMenuInline"></path>
-						</g>
-						<g transform="translate(2296, 119.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuInline">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuInline">ActionMenuInline</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2296, 150.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuInline">+iconSize: double?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuInline">+visible: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuInline">+splashRadius: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ActionMenuInline">+paddingVertical: double?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ActionMenuInline">+paddingHorizontal: double?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2296, 256.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Collapsible">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Collapsible">
-							<rect x="7070.0" y="150.0" height="107.0" width="441.0" data-name="Collapsible"></rect>
-							<path d="M7070.0 181.0 L7511.0 181.0" fill="none" data-name="Collapsible"></path>
-						</g>
-						<g transform="translate(7070, 150)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Collapsible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Collapsible">
-								<text x="212.5" y="13.5" stroke="none" text-anchor="middle" data-name="Collapsible">Collapsible</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7070, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Collapsible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Collapsible">
-								<text x="0.0" y="13.5" stroke="none" data-name="Collapsible">+contentBuilder: Widget Function(BuildContext, bool)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Collapsible">+headerBuilder: Widget Function(BuildContext, bool)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Collapsible">+title: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Collapsible">+isCollapsed: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, bool)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)">
-							<rect x="7852.0" y="590.0" height="31.0" width="300.0" data-name="Widget Function(BuildContext, bool)"></rect>
-						</g>
-						<g transform="translate(7852, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)">
-								<text x="142.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)">Widget Function(BuildContext, bool)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)?">
-							<rect x="8192.0" y="590.0" height="31.0" width="310.0" data-name="Widget Function(BuildContext, bool)?"></rect>
-						</g>
-						<g transform="translate(8192, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)?">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)?">Widget Function(BuildContext, bool)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NavbarTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="11177.0" y="150.0" height="107.0" width="196.0" data-name="NavbarTab"></rect>
-							<path d="M11177.0 181.0 L11373.0 181.0" fill="none" data-name="NavbarTab"></path>
-						</g>
-						<g transform="translate(11177, 150)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11177, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NavbarTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="NavbarTab">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NavbarTab">+intent: RoutingIntent?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NavbarTab">+index: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NavbarTab">+enabled: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="8932.0" y="590.0" height="31.0" width="122.0" data-name="RoutingIntent"></rect>
-						</g>
-						<g transform="translate(8932, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TabbedNavbar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TabbedNavbar">
-							<rect x="10384.0" y="477.0" height="257.0" width="308.0" data-name="TabbedNavbar"></rect>
-							<path d="M10384.0 508.0 L10692.0 508.0" fill="none" data-name="TabbedNavbar"></path>
-						</g>
-						<g transform="translate(10384, 477)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabbedNavbar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabbedNavbar">
-								<text x="146.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabbedNavbar">TabbedNavbar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10384, 508)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TabbedNavbar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TabbedNavbar">
-								<text x="0.0" y="13.5" stroke="none" data-name="TabbedNavbar">+tabs: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TabbedNavbar">+selectedTab: T?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TabbedNavbar">+indicator: BoxDecoration?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TabbedNavbar">+height: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TabbedNavbar">+disabledBackgroundColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TabbedNavbar">+disabledTooltipText: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TabbedNavbar">+onSelect: void Function(int, T)?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TabbedNavbar">+labelPadding: EdgeInsets?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="TabbedNavbar">+labelSpacing: double?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="TabbedNavbar">+indicatorSize: TabBarIndicatorSize?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="TabbedNavbar">+isScrollable: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="TabbedNavbar">+backgroundColor: Color?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="TabbedNavbar">+labelColorHover: Color?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="TabbedNavbar">+unselectedLabelColorHover: Color?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoxDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoxDecoration">
-							<rect x="13298.5" y="857.0" height="31.0" width="132.0" data-name="BoxDecoration"></rect>
-						</g>
-						<g transform="translate(13298.5, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxDecoration">
-								<text x="58.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxDecoration">BoxDecoration</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(int, T)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(int, T)?">
-							<rect x="12632.5" y="857.0" height="31.0" width="183.0" data-name="void Function(int, T)?"></rect>
-						</g>
-						<g transform="translate(12632.5, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(int, T)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(int, T)?">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(int, T)?">void Function(int, T)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TabBarIndicatorSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TabBarIndicatorSize">
-							<rect x="8177.3" y="857.0" height="31.0" width="176.0" data-name="TabBarIndicatorSize"></rect>
-						</g>
-						<g transform="translate(8177.25, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabBarIndicatorSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabBarIndicatorSize">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabBarIndicatorSize">TabBarIndicatorSize</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SidesheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SidesheetTab">
-							<rect x="16820.0" y="574.5" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
-							<path d="M16820.0 605.5 L17150.0 605.5" fill="none" data-name="SidesheetTab"></path>
-						</g>
-						<g transform="translate(16820, 574.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SidesheetTab">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="SidesheetTab">SidesheetTab</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16820, 605.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SidesheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="SidesheetTab">+builder: Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="17141.8" y="857.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
-						</g>
-						<g transform="translate(17141.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Sidesheet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Sidesheet">
-							<rect x="12214.0" y="499.5" height="212.0" width="341.0" data-name="Sidesheet"></rect>
-							<path d="M12214.0 530.5 L12555.0 530.5" fill="none" data-name="Sidesheet"></path>
-						</g>
-						<g transform="translate(12214, 499.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Sidesheet">
-								<text x="162.5" y="13.5" stroke="none" text-anchor="middle" data-name="Sidesheet">Sidesheet</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12214, 530.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Sidesheet">
-								<text x="0.0" y="13.5" stroke="none" data-name="Sidesheet">&lt;static&gt;+kDefaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Sidesheet">+titleText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Sidesheet">+body: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Sidesheet">+tabs: List&lt;SidesheetTab&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Sidesheet">+actionButtons: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Sidesheet">+width: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Sidesheet">+withCloseButton: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Sidesheet">+ignoreAppBar: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Sidesheet">+collapseSingleTab: bool</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Sidesheet">+bodyPadding: EdgeInsets?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Sidesheet">+wrapContent: Widget Function(Widget)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(Widget)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Widget)?">
-							<rect x="18980.8" y="857.0" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
-						</g>
-						<g transform="translate(18980.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Widget)?">
-								<text x="102.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Widget)?">Widget Function(Widget)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormSideSheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSideSheetTab">
-							<rect x="4015.5" y="574.5" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
-							<path d="M4015.5 605.5 L4328.5 605.5" fill="none" data-name="FormSideSheetTab"></path>
-						</g>
-						<g transform="translate(4015.5, 574.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSideSheetTab">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormSideSheetTab">FormSideSheetTab</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4015.5, 605.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSideSheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSideSheetTab">+formViewBuilder: Widget Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="HelpIcon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HelpIcon">
-							<rect x="7551.0" y="157.0" height="93.0" width="174.0" data-name="HelpIcon"></rect>
-							<path d="M7551.0 188.0 L7725.0 188.0" fill="none" data-name="HelpIcon"></path>
-							<path d="M7551.0 219.0 L7725.0 219.0" fill="none" data-name="HelpIcon"></path>
-						</g>
-						<g transform="translate(7551, 157)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HelpIcon">
-								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="HelpIcon">HelpIcon</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7551, 188)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
-								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+tooltipText: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7551, 219)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
-								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EmptyBody">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmptyBody">
-							<rect x="11728.0" y="521.5" height="168.0" width="222.0" data-name="EmptyBody"></rect>
-							<path d="M11728.0 552.5 L11950.0 552.5" fill="none" data-name="EmptyBody"></path>
-							<path d="M11728.0 658.5 L11950.0 658.5" fill="none" data-name="EmptyBody"></path>
-						</g>
-						<g transform="translate(11728, 521.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmptyBody">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="EmptyBody">EmptyBody</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11728, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+icon: IconData?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmptyBody">+leading: Widget?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmptyBody">+leadingSpacing: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmptyBody">+title: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EmptyBody">+description: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EmptyBody">+button: Widget?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11728, 658.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IndicatorRangeSliderThumbShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IndicatorRangeSliderThumbShape">
-							<rect x="6496.8" y="536.5" height="138.0" width="287.0" data-name="IndicatorRangeSliderThumbShape"></rect>
-							<path d="M6496.8 567.5 L6783.8 567.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
-							<path d="M6496.8 628.5 L6783.8 628.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
-						</g>
-						<g transform="translate(6496.75, 536.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IndicatorRangeSliderThumbShape">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="IndicatorRangeSliderThumbShape">IndicatorRangeSliderThumbShape</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6496.75, 567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+buildContext: BuildContext</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+start: T</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+end: T</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6496.75, 628.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+Size getPreferredSize()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+void paint()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BuildContext">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
-							<rect x="6599.0" y="857.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
-						</g>
-						<g transform="translate(6599, 857)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RangeSliderThumbShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RangeSliderThumbShape">
-							<rect x="5494.8" y="188.0" height="31.0" width="218.0" data-name="RangeSliderThumbShape"></rect>
-						</g>
-						<g transform="translate(5494.75, 188)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="RangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RangeSliderThumbShape">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="RangeSliderThumbShape">RangeSliderThumbShape</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MouseEventsRegion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MouseEventsRegion">
-							<rect x="17955.3" y="522.0" height="167.0" width="379.0" data-name="MouseEventsRegion"></rect>
-							<path d="M17955.3 553.0 L18334.3 553.0" fill="none" data-name="MouseEventsRegion"></path>
-						</g>
-						<g transform="translate(17955.25, 522)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MouseEventsRegion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MouseEventsRegion">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="MouseEventsRegion">MouseEventsRegion</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17955.25, 553)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MouseEventsRegion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MouseEventsRegion">
-								<text x="0.0" y="13.5" stroke="none" data-name="MouseEventsRegion">+onTap: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MouseEventsRegion">+onHover: void Function(PointerHoverEvent)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MouseEventsRegion">+onEnter: void Function(PointerEnterEvent)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MouseEventsRegion">+onExit: void Function(PointerExitEvent)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MouseEventsRegion">+autoselectCursor: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MouseEventsRegion">+cursor: SystemMouseCursor</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MouseEventsRegion">&lt;static&gt;+defaultCursor: SystemMouseCursor</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MouseEventsRegion">+autoCursor: SystemMouseCursor</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(PointerHoverEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerHoverEvent)?">
-							<rect x="18648.8" y="857.0" height="31.0" width="292.0" data-name="void Function(PointerHoverEvent)?"></rect>
-						</g>
-						<g transform="translate(18648.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerHoverEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerHoverEvent)?">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerHoverEvent)?">void Function(PointerHoverEvent)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(PointerEnterEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerEnterEvent)?">
-							<rect x="18321.8" y="857.0" height="31.0" width="287.0" data-name="void Function(PointerEnterEvent)?"></rect>
-						</g>
-						<g transform="translate(18321.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerEnterEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerEnterEvent)?">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerEnterEvent)?">void Function(PointerEnterEvent)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(PointerExitEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerExitEvent)?">
-							<rect x="18007.8" y="857.0" height="31.0" width="274.0" data-name="void Function(PointerExitEvent)?"></rect>
-						</g>
-						<g transform="translate(18007.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerExitEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerExitEvent)?">
-								<text x="129.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerExitEvent)?">void Function(PointerExitEvent)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SystemMouseCursor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SystemMouseCursor">
-							<rect x="17787.8" y="857.0" height="31.0" width="180.0" data-name="SystemMouseCursor"></rect>
-						</g>
-						<g transform="translate(17787.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SystemMouseCursor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SystemMouseCursor">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="SystemMouseCursor">SystemMouseCursor</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveCustomColorPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveCustomColorPicker">
-							<rect x="11452.0" y="590.0" height="31.0" width="236.0" data-name="ReactiveCustomColorPicker"></rect>
-						</g>
-						<g transform="translate(11452, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveCustomColorPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveCustomColorPicker">
-								<text x="110.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveCustomColorPicker">ReactiveCustomColorPicker</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveFormField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFormField">
-							<rect x="8903.5" y="188.0" height="31.0" width="163.0" data-name="ReactiveFormField"></rect>
-						</g>
-						<g transform="translate(8903.5, 188)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFormField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFormField">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFormField">ReactiveFormField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TextParagraph">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextParagraph">
-							<rect x="5910.3" y="536.5" height="138.0" width="208.0" data-name="TextParagraph"></rect>
-							<path d="M5910.3 567.5 L6118.3 567.5" fill="none" data-name="TextParagraph"></path>
-							<path d="M5910.3 643.5 L6118.3 643.5" fill="none" data-name="TextParagraph"></path>
-						</g>
-						<g transform="translate(5910.25, 536.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextParagraph">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextParagraph">TextParagraph</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5910.25, 567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
-								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+text: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TextParagraph">+style: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TextParagraph">+selectable: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TextParagraph">+span: List&lt;TextSpan&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5910.25, 643.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
-								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="UnderConstruction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnderConstruction">
-							<rect x="9448.3" y="172.5" height="62.0" width="164.0" data-name="UnderConstruction"></rect>
-							<path d="M9448.3 203.5 L9612.3 203.5" fill="none" data-name="UnderConstruction"></path>
-						</g>
-						<g transform="translate(9448.25, 172.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnderConstruction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnderConstruction">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="UnderConstruction">UnderConstruction</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9448.25, 203.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnderConstruction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnderConstruction">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnderConstruction">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NullHelperDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NullHelperDecoration">
-							<rect x="11990.0" y="590.0" height="31.0" width="184.0" data-name="NullHelperDecoration"></rect>
-						</g>
-						<g transform="translate(11990, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NullHelperDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NullHelperDecoration">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="NullHelperDecoration">NullHelperDecoration</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InputDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InputDecoration">
-							<rect x="9266.3" y="188.0" height="31.0" width="142.0" data-name="InputDecoration"></rect>
-						</g>
-						<g transform="translate(9266.25, 188)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InputDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InputDecoration">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="InputDecoration">InputDecoration</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ActionMenuType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuType">
-							<rect x="13646.5" y="819.0" height="107.0" width="330.0" data-name="ActionMenuType"></rect>
-							<path d="M13646.5 850.0 L13976.5 850.0" fill="none" data-name="ActionMenuType"></path>
-						</g>
-						<g transform="translate(13646.5, 819)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuType">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuType">ActionMenuType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13646.5, 850)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+values: List&lt;ActionMenuType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+inline: ActionMenuType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+popup: ActionMenuType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="HtmlStylingBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlStylingBanner">
-							<rect x="6158.8" y="551.5" height="108.0" width="298.0" data-name="HtmlStylingBanner"></rect>
-							<path d="M6158.8 582.5 L6456.8 582.5" fill="none" data-name="HtmlStylingBanner"></path>
-							<path d="M6158.8 628.5 L6456.8 628.5" fill="none" data-name="HtmlStylingBanner"></path>
-						</g>
-						<g transform="translate(6158.75, 551.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlStylingBanner">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlStylingBanner">HtmlStylingBanner</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6158.75, 582.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+isDismissed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="HtmlStylingBanner">+onDismissed: dynamic Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6158.75, 628.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="9945.8" y="172.5" height="62.0" width="192.0" data-name="FormConsumerWidget"></rect>
-							<path d="M9945.8 203.5 L10137.8 203.5" fill="none" data-name="FormConsumerWidget"></path>
-						</g>
-						<g transform="translate(9945.75, 172.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9945.75, 203.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerRefWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="10177.8" y="172.5" height="62.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
-							<path d="M10177.8 203.5 L10396.8 203.5" fill="none" data-name="FormConsumerRefWidget"></path>
-						</g>
-						<g transform="translate(10177.75, 172.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10177.75, 203.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerRefWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerRefWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SplashPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SplashPage">
-							<rect x="10436.8" y="172.5" height="62.0" width="136.0" data-name="SplashPage"></rect>
-							<path d="M10436.8 203.5 L10572.8 203.5" fill="none" data-name="SplashPage"></path>
-						</g>
-						<g transform="translate(10436.75, 172.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SplashPage">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SplashPage">SplashPage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10436.75, 203.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SplashPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SplashPage">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ErrorPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ErrorPage">
-							<rect x="12595.0" y="559.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
-							<path d="M12595.0 590.0 L12757.0 590.0" fill="none" data-name="ErrorPage"></path>
-							<path d="M12595.0 621.0 L12757.0 621.0" fill="none" data-name="ErrorPage"></path>
-						</g>
-						<g transform="translate(12595, 559)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ErrorPage">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="ErrorPage">ErrorPage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12595, 590)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+error: Exception?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12595, 621)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="9753.8" y="188.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(9753.75, 188)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyULogo">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyULogo">
-							<rect x="16566.0" y="559.0" height="93.0" width="214.0" data-name="StudyULogo"></rect>
-							<path d="M16566.0 590.0 L16780.0 590.0" fill="none" data-name="StudyULogo"></path>
-							<path d="M16566.0 621.0 L16780.0 621.0" fill="none" data-name="StudyULogo"></path>
-						</g>
-						<g transform="translate(16566, 559)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyULogo">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyULogo">StudyULogo</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16566, 590)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16566, 621)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SingleColumnLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayout">
-							<rect x="10732.0" y="506.5" height="198.0" width="418.0" data-name="SingleColumnLayout"></rect>
-							<path d="M10732.0 537.5 L11150.0 537.5" fill="none" data-name="SingleColumnLayout"></path>
-							<path d="M10732.0 673.5 L11150.0 673.5" fill="none" data-name="SingleColumnLayout"></path>
-						</g>
-						<g transform="translate(10732, 506.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayout">
-								<text x="201.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayout">SingleColumnLayout</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10732, 537.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraints: BoxConstraints</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraintsNarrow: BoxConstraints</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayout">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayout">+header: Widget?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayout">+stickyHeader: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayout">+constraints: BoxConstraints?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SingleColumnLayout">+scroll: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SingleColumnLayout">+padding: EdgeInsets?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10732, 673.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+dynamic fromType()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SingleColumnLayoutType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="4084.3" y="804.0" height="137.0" width="426.0" data-name="SingleColumnLayoutType"></rect>
-							<path d="M4084.3 835.0 L4510.3 835.0" fill="none" data-name="SingleColumnLayoutType"></path>
-						</g>
-						<g transform="translate(4084.25, 804)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
-								<text x="205.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4084.25, 835)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayoutType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayoutType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedWide: SingleColumnLayoutType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedNarrow: SingleColumnLayoutType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+stretched: SingleColumnLayoutType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+split: SingleColumnLayoutType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Hyperlink">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Hyperlink">
-							<rect x="11190.0" y="499.5" height="212.0" width="222.0" data-name="Hyperlink"></rect>
-							<path d="M11190.0 530.5 L11412.0 530.5" fill="none" data-name="Hyperlink"></path>
-						</g>
-						<g transform="translate(11190, 499.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Hyperlink">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Hyperlink">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="Hyperlink">Hyperlink</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11190, 530.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Hyperlink">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Hyperlink">
-								<text x="0.0" y="13.5" stroke="none" data-name="Hyperlink">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Hyperlink">+url: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Hyperlink">+onClick: void Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Hyperlink">+linkColor: Color</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Hyperlink">+hoverColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Hyperlink">+visitedColor: Color?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Hyperlink">+style: TextStyle?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Hyperlink">+hoverStyle: TextStyle?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Hyperlink">+visitedStyle: TextStyle?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Hyperlink">+icon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Hyperlink">+iconSize: double?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StandardTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableColumn">
-							<rect x="13422.5" y="537.0" height="137.0" width="287.0" data-name="StandardTableColumn"></rect>
-							<path d="M13422.5 568.0 L13709.5 568.0" fill="none" data-name="StandardTableColumn"></path>
-						</g>
-						<g transform="translate(13422.5, 537)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableColumn">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableColumn">StandardTableColumn</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13422.5, 568)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableColumn">+label: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableColumn">+tooltip: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableColumn">+columnWidth: TableColumnWidth</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableColumn">+sortable: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardTableColumn">+sortAscending: bool?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardTableColumn">+sortableIcon: Widget?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TableColumnWidth">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TableColumnWidth">
-							<rect x="19241.8" y="857.0" height="31.0" width="165.0" data-name="TableColumnWidth"></rect>
-						</g>
-						<g transform="translate(19241.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TableColumnWidth">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableColumnWidth">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableColumnWidth">TableColumnWidth</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StandardTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTable">
-							<rect x="13599.5" y="0.0" height="407.0" width="688.0" data-name="StandardTable"></rect>
-							<path d="M13599.5 31.0 L14287.5 31.0" fill="none" data-name="StandardTable"></path>
-						</g>
-						<g transform="translate(13599.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTable">
-								<text x="336.0" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTable">StandardTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13599.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTable">+inputColumns: List&lt;StandardTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTable">+trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardTable">+trailingActionsMenuType: ActionMenuType?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardTable">+sortColumnPredicates: List&lt;int Function(T, T)?&gt;?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StandardTable">+pinnedPredicates: int Function(T, T)?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StandardTable">+headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StandardTable">+dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StandardTable">+inputTrailingActionsColumn: StandardTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StandardTable">+tableWrapper: Widget Function(Widget)?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StandardTable">+cellSpacing: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StandardTable">+rowSpacing: double</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StandardTable">+minRowHeight: double?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StandardTable">+headerMaxLines: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StandardTable">+showTableHeader: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StandardTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StandardTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StandardTable">+trailingWidget: Widget?</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StandardTable">+leadingWidgetSpacing: double?</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StandardTable">+trailingWidgetSpacing: double?</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StandardTable">+emptyWidget: Widget?</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StandardTable">+rowStyle: StandardTableStyle</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="StandardTable">+disableRowInteractions: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="13871.5" y="590.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
-						</g>
-						<g transform="translate(13871.5, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-							<rect x="14055.5" y="590.0" height="31.0" width="381.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?"></rect>
-						</g>
-						<g transform="translate(14055.5, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="int Function(T, T)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(T, T)?">
-							<rect x="14476.5" y="590.0" height="31.0" width="160.0" data-name="int Function(T, T)?"></rect>
-						</g>
-						<g transform="translate(14476.5, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(T, T)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(T, T)?">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(T, T)?">int Function(T, T)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<rect x="14676.5" y="590.0" height="31.0" width="523.0" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?"></rect>
-						</g>
-						<g transform="translate(14676.5, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-								<text x="253.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StandardTableStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableStyle">
-							<rect x="12855.5" y="819.0" height="107.0" width="353.0" data-name="StandardTableStyle"></rect>
-							<path d="M12855.5 850.0 L13208.5 850.0" fill="none" data-name="StandardTableStyle"></path>
-						</g>
-						<g transform="translate(12855.5, 819)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableStyle">
-								<text x="168.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableStyle">StandardTableStyle</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12855.5, 850)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableStyle">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableStyle">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+values: List&lt;StandardTableStyle&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+plain: StandardTableStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+material: StandardTableStyle</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconPack">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPack">
-							<rect x="15998.8" y="149.5" height="108.0" width="359.0" data-name="IconPack"></rect>
-							<path d="M15998.8 180.5 L16357.8 180.5" fill="none" data-name="IconPack"></path>
-							<path d="M15998.8 226.5 L16357.8 226.5" fill="none" data-name="IconPack"></path>
-						</g>
-						<g transform="translate(15998.75, 149.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPack">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPack">IconPack</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15998.75, 180.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+defaultPack: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPack">&lt;static&gt;+material: List&lt;IconOption&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15998.75, 226.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+IconOption? resolveIconByName()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconOption">
-							<rect x="17591.8" y="529.0" height="153.0" width="264.0" data-name="IconOption"></rect>
-							<path d="M17591.8 560.0 L17855.8 560.0" fill="none" data-name="IconOption"></path>
-							<path d="M17591.8 636.0 L17855.8 636.0" fill="none" data-name="IconOption"></path>
-						</g>
-						<g transform="translate(17591.75, 529)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconOption">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="IconOption">IconOption</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17591.75, 560)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconOption">+isEmpty: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconOption">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17591.75, 636)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+String toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">&lt;static&gt;+IconOption fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="18595.8" y="188.0" height="31.0" width="96.0" data-name="Equatable"></rect>
-						</g>
-						<g transform="translate(18595.75, 188)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveIconPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveIconPicker">
-							<rect x="15528.5" y="590.0" height="31.0" width="168.0" data-name="ReactiveIconPicker"></rect>
-						</g>
-						<g transform="translate(15528.5, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveIconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveIconPicker">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveIconPicker">ReactiveIconPicker</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveFocusableFormField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFocusableFormField">
-							<rect x="16397.8" y="188.0" height="31.0" width="245.0" data-name="ReactiveFocusableFormField"></rect>
-						</g>
-						<g transform="translate(16397.75, 188)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFocusableFormField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFocusableFormField">
-								<text x="114.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFocusableFormField">ReactiveFocusableFormField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPicker">
-							<rect x="17041.8" y="112.0" height="183.0" width="319.0" data-name="IconPicker"></rect>
-							<path d="M17041.8 143.0 L17360.8 143.0" fill="none" data-name="IconPicker"></path>
-							<path d="M17041.8 264.0 L17360.8 264.0" fill="none" data-name="IconPicker"></path>
-						</g>
-						<g transform="translate(17041.75, 112)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPicker">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPicker">IconPicker</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17041.75, 143)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPicker">+selectedOption: IconOption?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPicker">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconPicker">+galleryIconSize: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IconPicker">+selectedIconSize: double?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IconPicker">+focusNode: FocusNode?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IconPicker">+isDisabled: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17041.75, 264)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(IconOption)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(IconOption)?">
-							<rect x="15779.5" y="590.0" height="31.0" width="230.0" data-name="void Function(IconOption)?"></rect>
-						</g>
-						<g transform="translate(15779.5, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(IconOption)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(IconOption)?">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(IconOption)?">void Function(IconOption)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FocusNode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FocusNode">
-							<rect x="16420.0" y="590.0" height="31.0" width="106.0" data-name="FocusNode"></rect>
-						</g>
-						<g transform="translate(16420, 590)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FocusNode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FocusNode">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="FocusNode">FocusNode</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconPickerField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerField">
-							<rect x="17457.3" y="112.0" height="183.0" width="319.0" data-name="IconPickerField"></rect>
-							<path d="M17457.3 143.0 L17776.3 143.0" fill="none" data-name="IconPickerField"></path>
-							<path d="M17457.3 264.0 L17776.3 264.0" fill="none" data-name="IconPickerField"></path>
-						</g>
-						<g transform="translate(17457.25, 112)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerField">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerField">IconPickerField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17457.25, 143)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerField">+selectedOption: IconOption?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerField">+selectedIconSize: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconPickerField">+galleryIconSize: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IconPickerField">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IconPickerField">+focusNode: FocusNode?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IconPickerField">+isDisabled: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17457.25, 264)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconPickerGallery">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerGallery">
-							<rect x="16682.8" y="142.0" height="123.0" width="319.0" data-name="IconPickerGallery"></rect>
-							<path d="M16682.8 173.0 L17001.8 173.0" fill="none" data-name="IconPickerGallery"></path>
-							<path d="M16682.8 234.0 L17001.8 234.0" fill="none" data-name="IconPickerGallery"></path>
-						</g>
-						<g transform="translate(16682.75, 142)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerGallery">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerGallery">IconPickerGallery</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16682.75, 173)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerGallery">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerGallery">+iconSize: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16682.75, 234)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SecondaryButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SecondaryButton">
-							<rect x="17231.0" y="536.5" height="138.0" width="249.0" data-name="SecondaryButton"></rect>
-							<path d="M17231.0 567.5 L17480.0 567.5" fill="none" data-name="SecondaryButton"></path>
-							<path d="M17231.0 643.5 L17480.0 643.5" fill="none" data-name="SecondaryButton"></path>
-						</g>
-						<g transform="translate(17231, 536.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecondaryButton">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecondaryButton">SecondaryButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17231, 567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SecondaryButton">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SecondaryButton">+isLoading: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SecondaryButton">+onPressed: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17231, 643.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TwoColumnLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TwoColumnLayout">
-							<rect x="13014.5" y="447.0" height="317.0" width="368.0" data-name="TwoColumnLayout"></rect>
-							<path d="M13014.5 478.0 L13382.5 478.0" fill="none" data-name="TwoColumnLayout"></path>
-						</g>
-						<g transform="translate(13014.5, 447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TwoColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TwoColumnLayout">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="TwoColumnLayout">TwoColumnLayout</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13014.5, 478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TwoColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TwoColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultDivider: VerticalDivider</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultContentPadding: EdgeInsets</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+slimContentPadding: EdgeInsets</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TwoColumnLayout">+leftWidget: Widget</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TwoColumnLayout">+rightWidget: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TwoColumnLayout">+dividerWidget: Widget?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TwoColumnLayout">+headerWidget: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TwoColumnLayout">+flexLeft: int?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="TwoColumnLayout">+flexRight: int?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="TwoColumnLayout">+constraintsLeft: BoxConstraints?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="TwoColumnLayout">+constraintsRight: BoxConstraints?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="TwoColumnLayout">+scrollLeft: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="TwoColumnLayout">+scrollRight: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="TwoColumnLayout">+paddingLeft: EdgeInsets?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="TwoColumnLayout">+paddingRight: EdgeInsets?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorLeft: Color?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorRight: Color?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="TwoColumnLayout">+stretchHeight: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VerticalDivider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VerticalDivider">
-							<rect x="19446.8" y="857.0" height="31.0" width="130.0" data-name="VerticalDivider"></rect>
-						</g>
-						<g transform="translate(19446.75, 857)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VerticalDivider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VerticalDivider">
-								<text x="57.0" y="13.5" stroke="none" text-anchor="middle" data-name="VerticalDivider">VerticalDivider</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/domain/uml.svg b/docs/uml/designer_v2/lib/domain/uml.svg
deleted file mode 100644
index 893c3e1b2..000000000
--- a/docs/uml/designer_v2/lib/domain/uml.svg
+++ /dev/null
@@ -1,322 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2168.3" height="475.0" viewbox="0 0 2168.25 475" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudyMonitorData
-	  |
-	  +activeParticipants: int;
-	  +dropoutParticipants: int;
-	  +completedParticipants: int;
-	  +items: List&lt;StudyMonitorItem&gt;
-	]
-	
-	[StudyMonitorItem
-	  |
-	  +participantId: String;
-	  +inviteCode: String?;
-	  +enrolledAt: DateTime;
-	  +lastActivityAt: DateTime;
-	  +currentDayOfStudy: int;
-	  +studyDurationInDays: int;
-	  +completedInterventions: int;
-	  +missedInterventions: int;
-	  +completedSurveys: int;
-	  +missedSurveys: int;
-	  +droppedOut: bool;
-	  +missedTasksPerDay: List&lt;Set&lt;String&gt;&gt;;
-	  +completedTasksPerDay: List&lt;Set&lt;String&gt;&gt;;
-	  +props: List&lt;Object?&gt;
-	]
-	
-	[&lt;abstract&gt;Equatable]&lt;:-[StudyMonitorItem]
-	
-	[&lt;abstract&gt;ResultTypes
-	]
-	
-	[MeasurementResultTypes
-	  |
-	  &lt;static&gt;+questionnaire: String;
-	  &lt;static&gt;+values: List&lt;String&gt;
-	]
-	
-	[&lt;abstract&gt;ResultTypes]&lt;:-[MeasurementResultTypes]
-	
-	[InterventionResultTypes
-	  |
-	  &lt;static&gt;+checkmarkTask: String;
-	  &lt;static&gt;+values: List&lt;String&gt;
-	]
-	
-	[&lt;abstract&gt;ResultTypes]&lt;:-[InterventionResultTypes]
-	
-	[StudyExportData
-	  |
-	  +study: Study;
-	  +measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
-	  +interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
-	  +mediaData: List&lt;String&gt;;
-	  +isEmpty: bool
-	]
-	
-	[StudyExportData]o-[Study]
-	
-	[StudyTemplates
-	  |
-	  &lt;static&gt;+kUnnamedStudyTitle: String
-	  |
-	  &lt;static&gt;+Study emptyDraft()
-	]
-	
-	[StudyActionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyActionType&gt;;
-	  &lt;static&gt;+pin: StudyActionType;
-	  &lt;static&gt;+pinoff: StudyActionType;
-	  &lt;static&gt;+edit: StudyActionType;
-	  &lt;static&gt;+duplicate: StudyActionType;
-	  &lt;static&gt;+duplicateDraft: StudyActionType;
-	  &lt;static&gt;+addCollaborator: StudyActionType;
-	  &lt;static&gt;+export: StudyActionType;
-	  &lt;static&gt;+delete: StudyActionType
-	]
-	
-	[StudyActionType]o-[StudyActionType]
-	[Enum]&lt;:--[StudyActionType]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="475.0" width="2168.3" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M352.0 89.8 L352 142 L352 162 L352.0 162.0 " fill="none"></path>
-					<path d="M357.3 89.8 L352.0 89.8 L346.7 89.8 L352.0 76.5 Z"></path>
-					<path d="M809.1 82.8 L699.5 142 L699.5 252 L699.5 252.0 " fill="none"></path>
-					<path d="M811.6 87.5 L809.1 82.8 L806.5 78.1 L820.8 76.5 Z"></path>
-					<path d="M889.9 82.8 L999.5 142 L999.5 252 L999.5 252.0 " fill="none"></path>
-					<path d="M892.5 78.1 L889.9 82.8 L887.4 87.5 L878.2 76.5 Z"></path>
-					<path d="M1253.8 140.7 L1253.75 142 L1253.75 275 L1253.8 275.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1259.1 131.3 L1253.8 140.7 L1248.4 131.3 L1253.8 122.0 Z"></path>
-					</g>
-					<path d="M2074.1 198.2 L2087.25 192 L2094.75 192 L2094.75 192 L2102.25 290.5 L2102.25 290.5 L2094.75 389 L2094.75 389 L2087.25 389 L2087.25 389 L2057.25 374.8612440191388 L2057.3 374.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2063.4 197.3 L2074.1 198.2 L2068.0 207.0 L2057.3 206.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1878.3 89.8 L1878.25 142 L1878.25 192 L1878.3 192.0 " fill="none"></path>
-					</g>
-					<path d="M1883.6 89.8 L1878.3 89.8 L1872.9 89.8 L1878.3 76.5 Z"></path>
-					<g data-name="StudyMonitorData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorData">
-							<rect x="0.0" y="7.5" height="107.0" width="264.0" data-name="StudyMonitorData"></rect>
-							<path d="M0.0 38.5 L264.0 38.5" fill="none" data-name="StudyMonitorData"></path>
-						</g>
-						<g transform="translate(0, 7.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorData">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorData">StudyMonitorData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 38.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorData">+activeParticipants: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorData">+dropoutParticipants: int</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorData">+completedParticipants: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorData">+items: List&lt;StudyMonitorItem&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyMonitorItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorItem">
-							<rect x="170.5" y="162.0" height="257.0" width="363.0" data-name="StudyMonitorItem"></rect>
-							<path d="M170.5 193.0 L533.5 193.0" fill="none" data-name="StudyMonitorItem"></path>
-						</g>
-						<g transform="translate(170.5, 162)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorItem">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorItem">StudyMonitorItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(170.5, 193)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">+participantId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorItem">+inviteCode: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorItem">+enrolledAt: DateTime</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorItem">+lastActivityAt: DateTime</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyMonitorItem">+currentDayOfStudy: int</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyMonitorItem">+studyDurationInDays: int</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyMonitorItem">+completedInterventions: int</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyMonitorItem">+missedInterventions: int</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyMonitorItem">+completedSurveys: int</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyMonitorItem">+missedSurveys: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyMonitorItem">+droppedOut: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyMonitorItem">+missedTasksPerDay: List&lt;Set&lt;String&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyMonitorItem">+completedTasksPerDay: List&lt;Set&lt;String&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyMonitorItem">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="304.0" y="45.5" height="31.0" width="96.0" data-name="Equatable"></rect>
-						</g>
-						<g transform="translate(304, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ResultTypes">
-							<rect x="792.5" y="45.5" height="31.0" width="114.0" data-name="ResultTypes"></rect>
-						</g>
-						<g transform="translate(792.5, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ResultTypes">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ResultTypes">ResultTypes</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementResultTypes">
-							<rect x="573.5" y="252.0" height="77.0" width="252.0" data-name="MeasurementResultTypes"></rect>
-							<path d="M573.5 283.0 L825.5 283.0" fill="none" data-name="MeasurementResultTypes"></path>
-						</g>
-						<g transform="translate(573.5, 252)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementResultTypes">
-								<text x="118.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementResultTypes">MeasurementResultTypes</text>
-								
-							</g>
-						</g>
-						<g transform="translate(573.5, 283)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementResultTypes">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+questionnaire: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionResultTypes">
-							<rect x="865.5" y="252.0" height="77.0" width="268.0" data-name="InterventionResultTypes"></rect>
-							<path d="M865.5 283.0 L1133.5 283.0" fill="none" data-name="InterventionResultTypes"></path>
-						</g>
-						<g transform="translate(865.5, 252)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionResultTypes">
-								<text x="126.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionResultTypes">InterventionResultTypes</text>
-								
-							</g>
-						</g>
-						<g transform="translate(865.5, 283)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResultTypes">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+checkmarkTask: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyExportData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyExportData">
-							<rect x="1046.8" y="0.0" height="122.0" width="414.0" data-name="StudyExportData"></rect>
-							<path d="M1046.8 31.0 L1460.8 31.0" fill="none" data-name="StudyExportData"></path>
-						</g>
-						<g transform="translate(1046.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyExportData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyExportData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyExportData">StudyExportData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1046.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyExportData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyExportData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyExportData">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyExportData">+measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyExportData">+interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyExportData">+mediaData: List&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyExportData">+isEmpty: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="1223.3" y="275.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(1223.25, 275)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTemplates">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTemplates">
-							<rect x="1500.8" y="14.5" height="93.0" width="307.0" data-name="StudyTemplates"></rect>
-							<path d="M1500.8 45.5 L1807.8 45.5" fill="none" data-name="StudyTemplates"></path>
-							<path d="M1500.8 76.5 L1807.8 76.5" fill="none" data-name="StudyTemplates"></path>
-						</g>
-						<g transform="translate(1500.75, 14.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTemplates">
-								<text x="145.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTemplates">StudyTemplates</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1500.75, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+kUnnamedStudyTitle: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1500.75, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+Study emptyDraft()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyActionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyActionType">
-							<rect x="1699.3" y="192.0" height="197.0" width="358.0" data-name="StudyActionType"></rect>
-							<path d="M1699.3 223.0 L2057.3 223.0" fill="none" data-name="StudyActionType"></path>
-						</g>
-						<g transform="translate(1699.25, 192)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyActionType">
-								<text x="171.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyActionType">StudyActionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1699.25, 223)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyActionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyActionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+values: List&lt;StudyActionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pin: StudyActionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pinoff: StudyActionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+edit: StudyActionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicate: StudyActionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicateDraft: StudyActionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+addCollaborator: StudyActionType</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+export: StudyActionType</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+delete: StudyActionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="1847.8" y="45.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(1847.75, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/account/uml.svg b/docs/uml/designer_v2/lib/features/account/uml.svg
deleted file mode 100644
index 732599e0e..000000000
--- a/docs/uml/designer_v2/lib/features/account/uml.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<svg version="1.1" baseProfile="full" width="250.0" height="189.0" viewbox="0 0 250 189" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[AccountSettingsDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AccountSettingsDialog]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="189.0" width="250.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M97.0 44.3 L97 51 L97 71 L97.0 71.0 " fill="none"></path>
-					<path d="M102.3 44.3 L97.0 44.3 L91.7 44.3 L97.0 31.0 Z"></path>
-					<g data-name="AccountSettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
-							<rect x="0.0" y="71.0" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
-							<path d="M0.0 102.0 L194.0 102.0" fill="none" data-name="AccountSettingsDialog"></path>
-						</g>
-						<g transform="translate(0, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="21.0" y="0.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(21, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/analyze/uml.svg b/docs/uml/designer_v2/lib/features/analyze/uml.svg
deleted file mode 100644
index eae674115..000000000
--- a/docs/uml/designer_v2/lib/features/analyze/uml.svg
+++ /dev/null
@@ -1,92 +0,0 @@
-<svg version="1.1" baseProfile="full" width="477.0" height="204.0" viewbox="0 0 477 204" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudyAnalyzeScreen
-	  |
-	  +Widget? banner();
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
-	
-	[StudyAnalyzeController
-	  |
-	  +dynamic onExport()
-	]
-	
-	[StudyBaseController]&lt;:-[StudyAnalyzeController]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="204.0" width="477.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M90.0 44.3 L90 51 L90 71 L90.0 71.0 " fill="none"></path>
-					<path d="M95.3 44.3 L90.0 44.3 L84.7 44.3 L90.0 31.0 Z"></path>
-					<path d="M320.5 44.3 L320.5 51 L320.5 78.5 L320.5 78.5 " fill="none"></path>
-					<path d="M325.8 44.3 L320.5 44.3 L315.2 44.3 L320.5 31.0 Z"></path>
-					<g data-name="StudyAnalyzeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
-							<rect x="0.0" y="71.0" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
-							<path d="M0.0 102.0 L180.0 102.0" fill="none" data-name="StudyAnalyzeScreen"></path>
-						</g>
-						<g transform="translate(0, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="11.5" y="0.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
-						</g>
-						<g transform="translate(11.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyAnalyzeController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
-							<rect x="220.0" y="78.5" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
-							<path d="M220.0 109.5 L421.0 109.5" fill="none" data-name="StudyAnalyzeController"></path>
-						</g>
-						<g transform="translate(220, 78.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
-								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(220, 109.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyBaseController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="231.5" y="0.0" height="31.0" width="178.0" data-name="StudyBaseController"></rect>
-						</g>
-						<g transform="translate(231.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/auth/uml.svg b/docs/uml/designer_v2/lib/features/auth/uml.svg
deleted file mode 100644
index dc5d87f42..000000000
--- a/docs/uml/designer_v2/lib/features/auth/uml.svg
+++ /dev/null
@@ -1,650 +0,0 @@
-<svg version="1.1" baseProfile="full" width="3553.3" height="968.0" viewbox="0 0 3553.25 968" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudyUJobsToBeDone
-	  |
-	  +Widget build()
-	]
-	
-	[LoginForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build()
-	]
-	
-	[LoginForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
-	
-	[PasswordForgotForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build()
-	]
-	
-	[PasswordForgotForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
-	
-	[AuthFormController
-	  |
-	  +authRepository: IAuthRepository;
-	  +sharedPreferences: SharedPreferences;
-	  +notificationService: INotificationService;
-	  +router: GoRouter;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +passwordControl: FormControl&lt;String&gt;;
-	  +passwordConfirmationControl: FormControl&lt;String&gt;;
-	  +rememberMeControl: FormControl&lt;bool&gt;;
-	  +termsOfServiceControl: FormControl&lt;bool&gt;;
-	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +loginForm: FormGroup;
-	  +signupForm: FormGroup;
-	  +passwordForgotForm: FormGroup;
-	  +passwordRecoveryForm: FormGroup;
-	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  -_formKey: AuthFormKey;
-	  +shouldRemember: bool;
-	  +formKey: AuthFormKey;
-	  +form: FormGroup
-	  |
-	  -dynamic _getFormFor();
-	  -dynamic _onChangeFormKey();
-	  +dynamic resetControlsFor();
-	  -dynamic _forceValidationMessages();
-	  +dynamic signUp();
-	  -dynamic _signUp();
-	  +dynamic signIn();
-	  -dynamic _signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic sendPasswordResetLink();
-	  +dynamic recoverPassword();
-	  +dynamic updateUser();
-	  -dynamic _readDebugUser();
-	  -void _setRememberMe();
-	  -void _delRememberMe();
-	  -void _initRememberMe()
-	]
-	
-	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
-	[AuthFormController]o-[SharedPreferences]
-	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
-	[AuthFormController]o-[GoRouter]
-	[AuthFormController]o-[FormControl]
-	[AuthFormController]o-[FormGroup]
-	[AuthFormController]o-[AuthFormKey]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[AuthFormController]
-	
-	[AuthFormKey
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AuthFormKey&gt;;
-	  &lt;static&gt;+login: AuthFormKey;
-	  &lt;static&gt;+signup: AuthFormKey;
-	  &lt;static&gt;+passwordForgot: AuthFormKey;
-	  &lt;static&gt;+passwordRecovery: AuthFormKey;
-	  &lt;static&gt;-_loginSubmit: AuthFormKey;
-	  &lt;static&gt;-_signupSubmit: AuthFormKey
-	]
-	
-	[AuthFormKey]o-[AuthFormKey]
-	[Enum]&lt;:--[AuthFormKey]
-	
-	[EmailTextField
-	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
-	]
-	
-	[EmailTextField]o-[FormControl]
-	
-	[PasswordTextField
-	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
-	]
-	
-	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
-	[PasswordTextField]o-[FormControl]
-	
-	[AuthScaffold
-	  |
-	  +body: Widget;
-	  +formKey: AuthFormKey;
-	  +leftContentMinWidth: double;
-	  +leftPanelMinWidth: double;
-	  +leftPanelPadding: EdgeInsets
-	]
-	
-	[AuthScaffold]o-[&lt;abstract&gt;Widget]
-	[AuthScaffold]o-[AuthFormKey]
-	[AuthScaffold]o-[EdgeInsets]
-	
-	[SignupForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build();
-	  -dynamic _onClickTermsOfUse();
-	  -dynamic _onClickPrivacyPolicy()
-	]
-	
-	[SignupForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
-	
-	[PasswordRecoveryForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build()
-	]
-	
-	[PasswordRecoveryForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="968.0" width="3553.3" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M103.5 468.7 L103.5 725 L483 795.5175044883304 L483.0 795.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M108.8 459.3 L103.5 468.7 L98.2 459.3 L103.5 450.0 Z"></path>
-					</g>
-					<path d="M319.0 48.5 L103.5 82 L103.5 357 L103.5 357.0 " fill="none"></path>
-					<path d="M319.8 53.8 L319.0 48.5 L318.2 43.3 L332.2 46.5 Z"></path>
-					<path d="M350.5 468.7 L350.5 725 L483 769.2379032258065 L483.0 769.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M355.8 459.3 L350.5 468.7 L345.2 459.3 L350.5 450.0 Z"></path>
-					</g>
-					<path d="M395.9 53.6 L350.5 82 L350.5 357 L350.5 357.0 " fill="none"></path>
-					<path d="M398.8 58.1 L395.9 53.6 L393.1 49.1 L407.2 46.5 Z"></path>
-					<path d="M1268.1 661.0 L1158.5 725 L1158.5 813 L1158.5 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1278.9 660.9 L1268.1 661.0 L1273.5 651.7 L1284.3 651.6 Z"></path>
-					</g>
-					<path d="M1362.3 717.5 L1354 725 L1354 813 L1354.0 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1372.8 715.2 L1362.3 717.5 L1365.6 707.3 L1376.1 705.0 Z"></path>
-					</g>
-					<path d="M1563.9 722.0 L1562.5 725 L1562.5 813 L1562.5 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1572.6 715.7 L1563.9 722.0 L1562.9 711.3 L1571.6 705.0 Z"></path>
-					</g>
-					<path d="M1853.1 722.0 L1854.5 725 L1854.5 813 L1854.5 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1854.2 711.3 L1853.1 722.0 L1844.4 715.7 L1845.5 705.0 Z"></path>
-					</g>
-					<path d="M1942.1 720.0 L1945.75 725 L2139.3925120772947 813 L2139.4 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1940.9 709.4 L1942.1 720.0 L1932.3 715.7 L1931.0 705.0 Z"></path>
-					</g>
-					<path d="M2150.8 635.0 L2322.5 725 L2322.5 813 L2322.5 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2145.0 625.9 L2150.8 635.0 L2140.0 635.4 L2134.3 626.3 Z"></path>
-					</g>
-					<path d="M1266.2 515.5 L437.5 725 L483 746.1177130044844 L483.0 746.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1276.5 518.4 L1266.2 515.5 L1273.9 508.1 L1284.3 510.9 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1709.3 59.8 L1709.25 82 L1709.25 102 L1709.3 102.0 " fill="none"></path>
-					</g>
-					<path d="M1714.6 59.8 L1709.3 59.8 L1703.9 59.8 L1709.3 46.5 Z"></path>
-					<path d="M856.0 776.5 L974.3333333333335 745 L1008.4166666666665 745 L1008.4166666666665 745 L1042.5 828.5 L1042.5 828.5 L1008.4166666666665 912 L1008.4166666666665 912 L974.3333333333335 912 L974.3333333333335 912 L838 875.7265002655337 L838.0 875.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M845.6 773.7 L856.0 776.5 L848.4 784.0 L838.0 781.3 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M524.5 432.3 L524.5 725 L550.7801932367149 745 L550.8 745.0 " fill="none"></path>
-					</g>
-					<path d="M529.8 432.3 L524.5 432.3 L519.2 432.3 L524.5 419.0 Z"></path>
-					<path d="M2302.6 474.0 L2188 725 L2175.671497584541 813 L2175.7 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2311.3 467.7 L2302.6 474.0 L2301.6 463.3 L2310.3 457.0 Z"></path>
-					</g>
-					<path d="M3142.4 474.3 L2733.75 725 L2733.75 813 L2733.8 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3153.2 473.9 L3142.4 474.3 L3147.6 464.8 L3158.3 464.5 Z"></path>
-					</g>
-					<path d="M3044.6 470.1 L2228 725 L2181.6618357487923 813 L2181.7 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3055.1 472.4 L3044.6 470.1 L3051.9 462.2 L3062.4 464.5 Z"></path>
-					</g>
-					<path d="M2848.3 480.7 L2989.25 725 L2989.25 813 L2989.3 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2848.2 469.9 L2848.3 480.7 L2839.0 475.2 L2838.9 464.5 Z"></path>
-					</g>
-					<path d="M2655.8 425.4 L629.25 725 L635.2886473429952 745 L635.3 745.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2665.8 429.3 L2655.8 425.4 L2664.2 418.7 L2674.3 422.6 Z"></path>
-					</g>
-					<path d="M2876.3 477.9 L3117.25 725 L3117.25 813 L3117.3 813.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2873.6 467.5 L2876.3 477.9 L2865.9 474.9 L2863.2 464.5 Z"></path>
-					</g>
-					<path d="M734.0 483.7 L734 725 L719.7971014492754 745 L719.8 745.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M739.3 474.3 L734.0 483.7 L728.7 474.3 L734.0 465.0 Z"></path>
-					</g>
-					<path d="M536.9 48.7 L734 82 L734 342 L734.0 342.0 " fill="none"></path>
-					<path d="M537.8 43.5 L536.9 48.7 L536.0 54.0 L523.8 46.5 Z"></path>
-					<path d="M1017.0 468.7 L1017 725 L838 776.9677419354839 L838.0 777.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1022.3 459.3 L1017.0 468.7 L1011.7 459.3 L1017.0 450.0 Z"></path>
-					</g>
-					<path d="M554.8 41.7 L1017 82 L1017 357 L1017.0 357.0 " fill="none"></path>
-					<path d="M555.2 36.4 L554.8 41.7 L554.3 47.0 L541.5 40.5 Z"></path>
-					<g data-name="StudyUJobsToBeDone">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
-							<rect x="88.5" y="0.0" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
-							<path d="M88.5 31.0 L282.5 31.0" fill="none" data-name="StudyUJobsToBeDone"></path>
-						</g>
-						<g transform="translate(88.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
-								
-							</g>
-						</g>
-						<g transform="translate(88.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LoginForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
-							<rect x="0.0" y="357.0" height="93.0" width="207.0" data-name="LoginForm"></rect>
-							<path d="M0.0 388.0 L207.0 388.0" fill="none" data-name="LoginForm"></path>
-							<path d="M0.0 419.0 L207.0 419.0" fill="none" data-name="LoginForm"></path>
-						</g>
-						<g transform="translate(0, 357)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 388)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 419)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthFormKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
-							<rect x="483.0" y="745.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
-							<path d="M483.0 776.0 L838.0 776.0" fill="none" data-name="AuthFormKey"></path>
-						</g>
-						<g transform="translate(483, 745)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
-								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(483, 776)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerRefWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="322.5" y="15.5" height="31.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
-						</g>
-						<g transform="translate(322.5, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordForgotForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
-							<rect x="247.0" y="357.0" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
-							<path d="M247.0 388.0 L454.0 388.0" fill="none" data-name="PasswordForgotForm"></path>
-							<path d="M247.0 419.0 L454.0 419.0" fill="none" data-name="PasswordForgotForm"></path>
-						</g>
-						<g transform="translate(247, 357)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(247, 388)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(247, 419)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthFormController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
-							<rect x="1284.3" y="102.0" height="603.0" width="850.0" data-name="AuthFormController"></rect>
-							<path d="M1284.3 133.0 L2134.3 133.0" fill="none" data-name="AuthFormController"></path>
-							<path d="M1284.3 434.0 L2134.3 434.0" fill="none" data-name="AuthFormController"></path>
-						</g>
-						<g transform="translate(1284.25, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
-								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1284.25, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+sharedPreferences: SharedPreferences</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">+rememberMeControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="AuthFormController">+shouldRemember: bool</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1284.25, 434)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">-void _setRememberMe()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">-void _delRememberMe()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="AuthFormController">-void _initRememberMe()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="1087.5" y="813.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
-						</g>
-						<g transform="translate(1087.5, 813)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SharedPreferences">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SharedPreferences">
-							<rect x="1269.5" y="813.0" height="31.0" width="169.0" data-name="SharedPreferences"></rect>
-						</g>
-						<g transform="translate(1269.5, 813)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SharedPreferences">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SharedPreferences">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="SharedPreferences">SharedPreferences</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="INotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="1478.5" y="813.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
-						</g>
-						<g transform="translate(1478.5, 813)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="1808.5" y="813.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(1808.5, 813)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="2117.0" y="813.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(2117, 813)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="2270.0" y="813.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(2270, 813)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormGroupController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="1615.8" y="15.5" height="31.0" width="187.0" data-name="IFormGroupController"></rect>
-						</g>
-						<g transform="translate(1615.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
-								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="494.0" y="388.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(494, 388)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EmailTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
-							<rect x="2174.3" y="350.0" height="107.0" width="321.0" data-name="EmailTextField"></rect>
-							<path d="M2174.3 381.0 L2495.3 381.0" fill="none" data-name="EmailTextField"></path>
-						</g>
-						<g transform="translate(2174.25, 350)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2174.25, 381)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
-							<rect x="3018.3" y="342.5" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
-							<path d="M3018.3 373.5 L3497.3 373.5" fill="none" data-name="PasswordTextField"></path>
-						</g>
-						<g transform="translate(3018.25, 342.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3018.25, 373.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<rect x="2553.8" y="813.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(2553.75, 813)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
-							<rect x="2674.3" y="342.5" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
-							<path d="M2674.3 373.5 L2933.3 373.5" fill="none" data-name="AuthScaffold"></path>
-						</g>
-						<g transform="translate(2674.25, 342.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2674.25, 373.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="2953.8" y="813.0" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(2953.75, 813)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EdgeInsets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="3064.8" y="813.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
-						</g>
-						<g transform="translate(3064.75, 813)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SignupForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
-							<rect x="595.0" y="342.0" height="123.0" width="278.0" data-name="SignupForm"></rect>
-							<path d="M595.0 373.0 L873.0 373.0" fill="none" data-name="SignupForm"></path>
-							<path d="M595.0 404.0 L873.0 404.0" fill="none" data-name="SignupForm"></path>
-						</g>
-						<g transform="translate(595, 342)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
-								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(595, 373)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(595, 404)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordRecoveryForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
-							<rect x="913.0" y="357.0" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
-							<path d="M913.0 388.0 L1121.0 388.0" fill="none" data-name="PasswordRecoveryForm"></path>
-							<path d="M913.0 419.0 L1121.0 419.0" fill="none" data-name="PasswordRecoveryForm"></path>
-						</g>
-						<g transform="translate(913, 357)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(913, 388)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(913, 419)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/dashboard/uml.svg b/docs/uml/designer_v2/lib/features/dashboard/uml.svg
deleted file mode 100644
index 74b4061b4..000000000
--- a/docs/uml/designer_v2/lib/features/dashboard/uml.svg
+++ /dev/null
@@ -1,648 +0,0 @@
-<svg version="1.1" baseProfile="full" width="3530.8" height="833.0" viewbox="0 0 3530.75 833" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudiesTableColumnHeader
-	  |
-	  +title: String;
-	  +sortable: bool;
-	  +sortAscending: bool;
-	  +sortingActive: bool;
-	  +onSort: void Function()?
-	]
-	
-	[StudiesTableColumnHeader]o-[void Function()?]
-	
-	[DashboardScaffold
-	  |
-	  &lt;static&gt;+compactWidthThreshold: double;
-	  +body: Widget
-	  |
-	  +Widget build()
-	]
-	
-	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
-	
-	[StudiesTableColumnSize
-	  |
-	  +collapsed: bool;
-	  +flex: int?;
-	  +width: double?
-	  |
-	  +Widget createContainer()
-	]
-	
-	[StudiesTable
-	  |
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +compactWidthThreshold: double;
-	  +superCompactWidthThreshold: double;
-	  +compactStatTitleThreshold: double;
-	  +studies: List&lt;Study&gt;;
-	  +onSelect: void Function(Study);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study);
-	  +emptyWidget: Widget;
-	  +pinnedStudies: Iterable&lt;String&gt;;
-	  +dashboardController: DashboardController
-	  |
-	  +Widget build();
-	  -Widget _buildColumnHeader()
-	]
-	
-	[StudiesTable]o-[void Function(Study)]
-	[StudiesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)]
-	[StudiesTable]o-[&lt;abstract&gt;Widget]
-	[StudiesTable]o-[DashboardController]
-	
-	[StudiesTableColumn
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesTableColumn&gt;;
-	  &lt;static&gt;+pin: StudiesTableColumn;
-	  &lt;static&gt;+title: StudiesTableColumn;
-	  &lt;static&gt;+status: StudiesTableColumn;
-	  &lt;static&gt;+participation: StudiesTableColumn;
-	  &lt;static&gt;+createdAt: StudiesTableColumn;
-	  &lt;static&gt;+enrolled: StudiesTableColumn;
-	  &lt;static&gt;+active: StudiesTableColumn;
-	  &lt;static&gt;+completed: StudiesTableColumn;
-	  &lt;static&gt;+action: StudiesTableColumn
-	]
-	
-	[StudiesTableColumn]o-[StudiesTableColumn]
-	[Enum]&lt;:--[StudiesTableColumn]
-	
-	[DashboardScreen
-	  |
-	  +filter: StudiesFilter?
-	]
-	
-	[DashboardScreen]o-[StudiesFilter]
-	
-	[DashboardController
-	  |
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +userRepository: IUserRepository;
-	  +router: GoRouter;
-	  -_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?;
-	  +searchController: SearchController;
-	  +isSortAscending: bool
-	  |
-	  -dynamic _subscribeStudies();
-	  +dynamic setSearchText();
-	  +dynamic setStudiesFilter();
-	  +dynamic onSelectStudy();
-	  +dynamic onClickNewStudy();
-	  +dynamic pinStudy();
-	  +dynamic pinOffStudy();
-	  +void setSorting();
-	  +void filterStudies();
-	  +void sortStudies();
-	  +bool isSortingActiveForColumn();
-	  +bool isPinned();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void dispose()
-	]
-	
-	[DashboardController]o-[&lt;abstract&gt;IStudyRepository]
-	[DashboardController]o-[&lt;abstract&gt;IAuthRepository]
-	[DashboardController]o-[&lt;abstract&gt;IUserRepository]
-	[DashboardController]o-[GoRouter]
-	[DashboardController]o-[StreamSubscription]
-	[DashboardController]o-[SearchController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
-	
-	[StudiesTableItem
-	  |
-	  +study: Study;
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
-	  +isPinned: bool;
-	  +onPinnedChanged: void Function(Study, bool)?;
-	  +onTap: void Function(Study)?
-	]
-	
-	[StudiesTableItem]o-[Study]
-	[StudiesTableItem]o-[void Function(Study, bool)?]
-	[StudiesTableItem]o-[void Function(Study)?]
-	
-	[StudiesFilter
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
-	]
-	
-	[Enum]&lt;:--[StudiesFilter]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="833.0" width="3530.8" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M118.5 223.7 L118.5 308 L118.5 501.5 L118.5 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M123.8 214.3 L118.5 223.7 L113.2 214.3 L118.5 205.0 Z"></path>
-					</g>
-					<path d="M448.5 216.7 L448.5 308 L448.5 501.5 L448.5 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M453.8 207.3 L448.5 216.7 L443.2 207.3 L448.5 198.0 Z"></path>
-					</g>
-					<path d="M924.7 298.1 L909.25 308 L909.25 501.5 L909.3 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M935.5 297.5 L924.7 298.1 L929.7 288.5 L940.4 288.0 Z"></path>
-					</g>
-					<path d="M1240.8 304.9 L1242.25 308 L1242.25 501.5 L1242.3 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1241.6 294.2 L1240.8 304.9 L1232.0 298.7 L1232.8 288.0 Z"></path>
-					</g>
-					<path d="M908.0 261.6 L806.75 308 L475.0687799043062 501.5 L475.1 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M918.7 262.6 L908.0 261.6 L914.3 252.9 L925.0 253.9 Z"></path>
-					</g>
-					<path d="M1422.4 242.9 L1591.75 308 L1609.549043062201 328 L1609.5 328.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1415.6 234.6 L1422.4 242.9 L1411.8 244.6 L1405.0 236.2 Z"></path>
-					</g>
-					<path d="M2502.4 417.7 L2515.75 411 L2523.25 411 L2523.25 411 L2530.75 517 L2530.75 517 L2523.25 623 L2523.25 623 L2515.75 623 L2515.75 623 L2485.75 607.8931116389549 L2485.8 607.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2491.7 417.1 L2502.4 417.7 L2496.5 426.7 L2485.8 426.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2484.2 167.7 L2305.25 308 L2305.25 411 L2305.3 411.0 " fill="none"></path>
-					</g>
-					<path d="M2487.5 171.9 L2484.2 167.7 L2480.9 163.5 L2494.7 159.5 Z"></path>
-					<path d="M2749.3 186.5 L2594.25 308 L2699.8947368421054 478.5 L2699.9 478.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2759.9 185.0 L2749.3 186.5 L2753.3 176.6 L2763.9 175.0 Z"></path>
-					</g>
-					<path d="M1453.8 668.2 L1330 726 L1330 746 L1330.0 746.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1464.5 669.1 L1453.8 668.2 L1460.0 659.4 L1470.8 660.3 Z"></path>
-					</g>
-					<path d="M1526.9 717.7 L1516.5 726 L1516.5 746 L1516.5 746.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1537.5 716.0 L1526.9 717.7 L1530.9 707.7 L1541.5 706.0 Z"></path>
-					</g>
-					<path d="M1700.0 723.5 L1699 726 L1699 746 L1699.0 746.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1708.2 716.6 L1700.0 723.5 L1698.3 712.9 L1706.5 706.0 Z"></path>
-					</g>
-					<path d="M1855.5 723.5 L1856.5 726 L1856.5 746 L1856.5 746.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1857.2 712.9 L1855.5 723.5 L1847.3 716.6 L1849.0 706.0 Z"></path>
-					</g>
-					<path d="M2017.9 718.0 L2027.5 726 L2027.5 746 L2027.5 746.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2014.2 707.9 L2017.9 718.0 L2007.3 716.1 L2003.6 706.0 Z"></path>
-					</g>
-					<path d="M2101.7 667.7 L2227 726 L2227 746 L2227.0 746.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2095.5 658.9 L2101.7 667.7 L2091.0 668.6 L2084.8 659.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1960.3 172.8 L1960.25 308 L1942.7858851674641 328 L1942.8 328.0 " fill="none"></path>
-					</g>
-					<path d="M1965.6 172.8 L1960.3 172.8 L1954.9 172.8 L1960.3 159.5 Z"></path>
-					<path d="M3043.5 251.6 L2942.25 308 L2942.25 501.5 L2942.3 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3054.2 251.7 L3043.5 251.6 L3049.0 242.4 L3059.8 242.5 Z"></path>
-					</g>
-					<path d="M3161.9 258.1 L3129.25 308 L3129.25 501.5 L3129.3 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3171.4 253.2 L3161.9 258.1 L3162.5 247.4 L3172.1 242.5 Z"></path>
-					</g>
-					<path d="M3335.1 256.5 L3380.25 308 L3380.25 501.5 L3380.3 501.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3333.0 246.0 L3335.1 256.5 L3325.0 253.0 L3322.8 242.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2554.4 165.9 L2813 308 L2740.190789473684 478.5 L2740.2 478.5 " fill="none"></path>
-					</g>
-					<path d="M2557.0 161.2 L2554.4 165.9 L2551.8 170.6 L2542.7 159.5 Z"></path>
-					<g data-name="StudiesTableColumnHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
-							<rect x="0.0" y="83.0" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
-							<path d="M0.0 114.0 L237.0 114.0" fill="none" data-name="StudiesTableColumnHeader"></path>
-						</g>
-						<g transform="translate(0, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
-								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="46.5" y="501.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(46.5, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
-							<rect x="277.0" y="90.0" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
-							<path d="M277.0 121.0 L620.0 121.0" fill="none" data-name="DashboardScaffold"></path>
-							<path d="M277.0 167.0 L620.0 167.0" fill="none" data-name="DashboardScaffold"></path>
-						</g>
-						<g transform="translate(277, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
-								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(277, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(277, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="413.0" y="501.5" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(413, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableColumnSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
-							<rect x="660.0" y="82.5" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
-							<path d="M660.0 113.5 L885.0 113.5" fill="none" data-name="StudiesTableColumnSize"></path>
-							<path d="M660.0 174.5 L885.0 174.5" fill="none" data-name="StudiesTableColumnSize"></path>
-						</g>
-						<g transform="translate(660, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
-								
-							</g>
-						</g>
-						<g transform="translate(660, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(660, 174.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
-							<rect x="925.0" y="0.0" height="288.0" width="480.0" data-name="StudiesTable"></rect>
-							<path d="M925.0 31.0 L1405.0 31.0" fill="none" data-name="StudiesTable"></path>
-							<path d="M925.0 242.0 L1405.0 242.0" fill="none" data-name="StudiesTable"></path>
-						</g>
-						<g transform="translate(925, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
-								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(925, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(925, 242)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
-							<rect x="819.8" y="501.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
-						</g>
-						<g transform="translate(819.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<rect x="1053.8" y="501.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
-						</g>
-						<g transform="translate(1053.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
-							<rect x="1470.8" y="328.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
-							<path d="M1470.8 359.0 L2084.8 359.0" fill="none" data-name="DashboardController"></path>
-							<path d="M1470.8 480.0 L2084.8 480.0" fill="none" data-name="DashboardController"></path>
-						</g>
-						<g transform="translate(1470.75, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
-								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1470.75, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1470.75, 480)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
-							<rect x="2124.8" y="411.0" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
-							<path d="M2124.8 442.0 L2485.8 442.0" fill="none" data-name="StudiesTableColumn"></path>
-						</g>
-						<g transform="translate(2124.75, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
-								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2124.75, 442)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="2484.0" y="128.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(2484, 128.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="2714.5" y="113.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
-							<path d="M2714.5 144.0 L2892.5 144.0" fill="none" data-name="DashboardScreen"></path>
-						</g>
-						<g transform="translate(2714.5, 113)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2714.5, 144)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesFilter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
-							<rect x="2575.8" y="478.5" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
-							<path d="M2575.8 509.5 L2871.8 509.5" fill="none" data-name="StudiesFilter"></path>
-						</g>
-						<g transform="translate(2575.75, 478.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2575.75, 509.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="1254.5" y="746.0" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
-						</g>
-						<g transform="translate(1254.5, 746)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="1445.5" y="746.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
-						</g>
-						<g transform="translate(1445.5, 746)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IUserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="1627.5" y="746.0" height="31.0" width="143.0" data-name="IUserRepository"></rect>
-						</g>
-						<g transform="translate(1627.5, 746)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="1810.5" y="746.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(1810.5, 746)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="1942.5" y="746.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
-						</g>
-						<g transform="translate(1942.5, 746)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SearchController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="2152.5" y="746.0" height="31.0" width="149.0" data-name="SearchController"></rect>
-						</g>
-						<g transform="translate(2152.5, 746)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="1868.3" y="128.5" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
-						</g>
-						<g transform="translate(1868.25, 128.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
-							<rect x="3036.5" y="45.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
-							<path d="M3036.5 76.5 L3436.5 76.5" fill="none" data-name="StudiesTableItem"></path>
-						</g>
-						<g transform="translate(3036.5, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
-								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3036.5, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="2911.8" y="501.5" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(2911.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Study, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
-							<rect x="3012.8" y="501.5" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
-						</g>
-						<g transform="translate(3012.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Study)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
-							<rect x="3285.8" y="501.5" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
-						</g>
-						<g transform="translate(3285.75, 501.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/enrollment/uml.svg b/docs/uml/designer_v2/lib/features/design/enrollment/uml.svg
deleted file mode 100644
index a0c07f4f0..000000000
--- a/docs/uml/designer_v2/lib/features/design/enrollment/uml.svg
+++ /dev/null
@@ -1,820 +0,0 @@
-<svg version="1.1" baseProfile="full" width="4949.5" height="1157.0" viewbox="0 0 4949.5 1157" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
-	  |
-	  +isDirtyOptionsBannerVisible: bool
-	]
-	
-	[ScreenerQuestionLogicFormView
-	  |
-	  +formViewModel: ScreenerQuestionFormViewModel
-	  |
-	  +Widget build();
-	  -dynamic _buildInfoBanner();
-	  -dynamic _buildAnswerOptionsLogicControls();
-	  -List&lt;Widget&gt; _buildOptionLogicRow()
-	]
-	
-	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
-	
-	[EnrollmentFormData
-	  |
-	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
-	  +enrollmentType: Participation;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
-	  +id: String
-	  |
-	  +Study apply();
-	  +EnrollmentFormData copy()
-	]
-	
-	[EnrollmentFormData]o-[Participation]
-	[EnrollmentFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
-	
-	[ConsentItemFormView
-	  |
-	  +formViewModel: ConsentItemFormViewModel
-	]
-	
-	[ConsentItemFormView]o-[ConsentItemFormViewModel]
-	
-	[ConsentItemFormData
-	  |
-	  +consentId: String;
-	  +title: String;
-	  +description: String;
-	  +iconName: String?;
-	  +id: String
-	  |
-	  +ConsentItem toConsentItem();
-	  +ConsentItemFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
-	
-	[StudyDesignEnrollmentFormView
-	  |
-	  +Widget build();
-	  -dynamic _showScreenerQuestionSidesheetWithArgs();
-	  -dynamic _showConsentItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
-	
-	[ScreenerQuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultResponseOptionValidity: bool;
-	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
-	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
-	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
-	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionValues: List&lt;dynamic&gt;;
-	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isDirtyOptionsBannerVisible: bool
-	  |
-	  +dynamic onResponseOptionsChanged();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
-	  +ScreenerQuestionFormViewModel createDuplicate()
-	]
-	
-	[ScreenerQuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
-	
-	[EnrollmentFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
-	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
-	  +consentItemArray: FormArray&lt;dynamic&gt;;
-	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +form: FormGroup;
-	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
-	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestScreener: bool;
-	  +canTestConsent: bool;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setControlsFrom();
-	  +EnrollmentFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
-	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
-	  +dynamic testScreener();
-	  +dynamic testConsent();
-	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
-	]
-	
-	[EnrollmentFormViewModel]o-[Study]
-	[EnrollmentFormViewModel]o-[GoRouter]
-	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
-	[EnrollmentFormViewModel]o-[FormControl]
-	[EnrollmentFormViewModel]o-[FormArray]
-	[EnrollmentFormViewModel]o-[FormViewModelCollection]
-	[EnrollmentFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
-	
-	[EnrollmentFormConsentItemDelegate
-	  |
-	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +owner: EnrollmentFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
-	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ConsentItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
-	]
-	
-	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
-	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
-	
-	[ConsentItemFormViewModel
-	  |
-	  +consentIdControl: FormControl&lt;String&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +form: FormGroup;
-	  +consentId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +ConsentItemFormData buildFormData();
-	  +ConsentItemFormViewModel createDuplicate()
-	]
-	
-	[ConsentItemFormViewModel]o-[FormControl]
-	[ConsentItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="1157.0" width="4949.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M212.0 242.7 L212 259 L337.17193308550185 361.5 L337.2 361.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M217.3 233.3 L212.0 242.7 L206.7 233.3 L212.0 224.0 Z"></path>
-					</g>
-					<path d="M212.0 44.3 L212 51 L212 86 L212.0 86.0 " fill="none"></path>
-					<path d="M217.3 44.3 L212.0 44.3 L206.7 44.3 L212.0 31.0 Z"></path>
-					<path d="M1287.2 252.5 L1281 259 L1281 512.5 L1281.0 512.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1297.5 249.4 L1287.2 252.5 L1289.8 242.1 L1300.1 239.0 Z"></path>
-					</g>
-					<path d="M1612.5 245.8 L1646.25 259 L1646.25 512.5 L1646.3 512.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1605.8 237.4 L1612.5 245.8 L1601.9 247.4 L1595.1 239.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1380.5 44.3 L1380.5 51 L1380.5 71 L1380.5 71.0 " fill="none"></path>
-					</g>
-					<path d="M1385.8 44.3 L1380.5 44.3 L1375.2 44.3 L1380.5 31.0 Z"></path>
-					<path d="M3581.0 200.5 L3533.75 259 L3741.668215613383 399 L3741.7 399.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3591.0 196.6 L3581.0 200.5 L3582.7 189.9 L3592.7 186.0 Z"></path>
-					</g>
-					<path d="M1776.5 44.3 L1776.5 51 L1776.5 71 L1776.5 71.0 " fill="none"></path>
-					<path d="M1781.8 44.3 L1776.5 44.3 L1771.2 44.3 L1776.5 31.0 Z"></path>
-					<path d="M2170.0 44.3 L2170 51 L2170 109 L2170.0 109.0 " fill="none"></path>
-					<path d="M2175.3 44.3 L2170.0 44.3 L2164.7 44.3 L2170.0 31.0 Z"></path>
-					<path d="M540.5 713.2 L540.5 797 L558.0494071146245 908 L558.0 908.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M545.8 703.8 L540.5 713.2 L535.2 703.8 L540.5 694.5 Z"></path>
-					</g>
-					<path d="M570.0 183.8 L570 259 L558.7592936802974 361.5 L558.8 361.5 " fill="none"></path>
-					<path d="M575.3 183.8 L570.0 183.8 L564.7 183.8 L570.0 170.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M882.0 199.3 L882 259 L751.8745353159851 361.5 L751.9 361.5 " fill="none"></path>
-					</g>
-					<path d="M887.3 199.3 L882.0 199.3 L876.7 199.3 L882.0 186.0 Z"></path>
-					<path d="M2559.4 618.4 L1632.75 797 L1632.75 908 L1632.8 908.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2569.6 621.9 L2559.4 618.4 L2567.6 611.4 L2577.8 614.9 Z"></path>
-					</g>
-					<path d="M2559.5 626.7 L1749.25 797 L1749.25 908 L1749.3 908.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2569.7 630.0 L2559.5 626.7 L2567.5 619.5 L2577.8 622.8 Z"></path>
-					</g>
-					<path d="M3498.0 634.0 L4219.5 797 L4262.820158102767 817 L4262.8 817.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3490.0 626.7 L3498.0 634.0 L3487.7 637.1 L3479.8 629.9 Z"></path>
-					</g>
-					<path d="M3443.1 786.9 L3459.25 797 L3476.7994071146245 908 L3476.8 908.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3438.0 777.4 L3443.1 786.9 L3432.3 786.5 L3427.2 777.0 Z"></path>
-					</g>
-					<path d="M2559.4 613.6 L1553 797 L609.5 917.2546599496221 L609.5 917.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2569.5 617.1 L2559.4 613.6 L2567.6 606.6 L2577.8 610.2 Z"></path>
-					</g>
-					<path d="M2559.5 633.8 L1835.25 797 L1835.25 923.5 L1835.25 923.5 L1835.25 1050 L1835.25 1050 L4124.75 1083.8796373488954 L4124.8 1083.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2569.8 636.9 L2559.5 633.8 L2567.5 626.5 L2577.8 629.6 Z"></path>
-					</g>
-					<path d="M3496.5 758.9 L3573.75 797 L3906.75 908 L3906.8 908.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3490.5 750.0 L3496.5 758.9 L3485.8 759.5 L3479.8 750.6 Z"></path>
-					</g>
-					<path d="M2505.0 183.8 L2505 259 L2577.75 296.364677804296 L2577.8 296.4 " fill="none"></path>
-					<path d="M2510.3 183.8 L2505.0 183.8 L2499.7 183.8 L2505.0 170.5 Z"></path>
-					<path d="M2729.5 183.8 L2729.5 259 L2751.7490706319704 279 L2751.7 279.0 " fill="none"></path>
-					<path d="M2734.8 183.8 L2729.5 183.8 L2724.2 183.8 L2729.5 170.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3223.5 175.0 L2992 259 L2994.732342007435 279 L2994.7 279.0 " fill="none"></path>
-					</g>
-					<path d="M3225.3 180.1 L3223.5 175.0 L3221.7 170.0 L3236.0 170.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3985.1 170.8 L3453.75 259 L3422.1514869888474 279 L3422.2 279.0 " fill="none"></path>
-					</g>
-					<path d="M3986.0 176.1 L3985.1 170.8 L3984.2 165.5 L3998.3 168.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M4600.5 164.4 L3493.75 259 L3459.1775092936805 279 L3459.2 279.0 " fill="none"></path>
-					</g>
-					<path d="M4600.9 169.7 L4600.5 164.4 L4600.0 159.1 L4613.8 163.2 Z"></path>
-					<path d="M4493.5 1048.7 L4493.5 1050 L4343.75 1070.5057859209257 L4343.8 1070.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4498.8 1039.3 L4493.5 1048.7 L4488.2 1039.3 L4493.5 1030.0 Z"></path>
-					</g>
-					<path d="M4726.4 808.7 L4750.25 797 L3479.75 598.4728434504792 L3479.8 598.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4715.7 808.1 L4726.4 808.7 L4720.4 817.7 L4709.7 817.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3400.5 166.2 L4413.5 259 L4413.5 528 L4413.5 528 L4413.5 797 L4413.5 797 L4426.148221343874 817 L4426.1 817.0 " fill="none"></path>
-					</g>
-					<path d="M3401.0 160.8 L3400.5 166.2 L3400.0 171.5 L3387.3 164.9 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M4148.7 174.1 L4453.5 259 L4453.5 528 L4453.5 528 L4453.5 797 L4453.5 797 L4459.824110671937 817 L4459.8 817.0 " fill="none"></path>
-					</g>
-					<path d="M4150.2 168.9 L4148.7 174.1 L4147.3 179.2 L4135.9 170.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M4710.3 183.8 L4710.25 259 L4710.25 528 L4710.25 528 L4710.25 797 L4710.25 797 L4675.981225296443 817 L4676.0 817.0 " fill="none"></path>
-					</g>
-					<path d="M4715.6 183.8 L4710.3 183.8 L4704.9 183.8 L4710.3 170.5 Z"></path>
-					<path d="M3726.2 667.4 L3533.75 797 L3485.927865612648 908 L3485.9 908.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3736.9 666.6 L3726.2 667.4 L3730.9 657.8 L3741.7 657.0 Z"></path>
-					</g>
-					<path d="M4063.9 670.8 L4179.5 797 L3980.9723320158105 908 L3981.0 908.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4061.6 660.3 L4063.9 670.8 L4053.7 667.5 L4051.3 657.0 Z"></path>
-					</g>
-					<path d="M4320.1 177.9 L4199.5 259 L4060.9312267657992 399 L4060.9 399.0 " fill="none"></path>
-					<path d="M4323.1 182.4 L4320.1 177.9 L4317.1 173.5 L4331.2 170.5 Z"></path>
-					<g data-name="IScreenerQuestionLogicFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="716.0" y="124.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M716.0 155.0 L1048.0 155.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
-						</g>
-						<g transform="translate(716, 124)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(716, 155)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionLogicFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="0.0" y="86.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M0.0 117.0 L424.0 117.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M0.0 148.0 L424.0 148.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-						</g>
-						<g transform="translate(0, 86)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
-								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 117)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="259.5" y="361.5" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M259.5 392.5 L821.5 392.5" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M259.5 573.5 L821.5 573.5" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(259.5, 361.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
-								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(259.5, 392.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(259.5, 573.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="116.0" y="0.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
-						</g>
-						<g transform="translate(116, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="1153.5" y="71.0" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M1153.5 102.0 L1607.5 102.0" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M1153.5 193.0 L1607.5 193.0" fill="none" data-name="EnrollmentFormData"></path>
-						</g>
-						<g transform="translate(1153.5, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
-								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1153.5, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1153.5, 193)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="1224.0" y="512.5" height="31.0" width="114.0" data-name="Participation"></rect>
-						</g>
-						<g transform="translate(1224, 512.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="1544.3" y="512.5" height="31.0" width="204.0" data-name="QuestionnaireFormData"></rect>
-						</g>
-						<g transform="translate(1544.25, 512.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="1309.0" y="0.0" height="31.0" width="143.0" data-name="IStudyFormData"></rect>
-						</g>
-						<g transform="translate(1309, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="3427.3" y="124.0" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M3427.3 155.0 L3808.3 155.0" fill="none" data-name="ConsentItemFormView"></path>
-						</g>
-						<g transform="translate(3427.25, 124)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3427.25, 155)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="3585.3" y="399.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M3585.3 430.0 L4281.3 430.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M3585.3 596.0 L4281.3 596.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-						</g>
-						<g transform="translate(3585.25, 399)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3585.25, 430)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3585.25, 596)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="1647.5" y="71.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M1647.5 102.0 L1905.5 102.0" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M1647.5 193.0 L1905.5 193.0" fill="none" data-name="ConsentItemFormData"></path>
-						</g>
-						<g transform="translate(1647.5, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1647.5, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1647.5, 193)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="1727.5" y="0.0" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(1727.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignEnrollmentFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="1945.5" y="109.0" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M1945.5 140.0 L2394.5 140.0" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
-						</g>
-						<g transform="translate(1945.5, 109)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1945.5, 140)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="2064.0" y="0.0" height="31.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-						</g>
-						<g transform="translate(2064, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="511.5" y="908.0" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(511.5, 908)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="464.0" y="139.5" height="31.0" width="212.0" data-name="QuestionFormViewModel"></rect>
-						</g>
-						<g transform="translate(464, 139.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="2577.8" y="279.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M2577.8 310.0 L3479.8 310.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M2577.8 536.0 L3479.8 536.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-						</g>
-						<g transform="translate(2577.75, 279)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
-								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2577.75, 310)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2577.75, 536)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="1602.3" y="908.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(1602.25, 908)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="1703.3" y="908.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(1703.25, 908)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormConsentItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="4093.5" y="817.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M4093.5 848.0 L4893.5 848.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M4093.5 924.0 L4893.5 924.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-						</g>
-						<g transform="translate(4093.5, 817)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4093.5, 848)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4093.5, 924)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="3422.8" y="908.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(3422.75, 908)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="4124.8" y="1070.0" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
-						</g>
-						<g transform="translate(4124.75, 1070)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="3900.8" y="908.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(3900.75, 908)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="2434.5" y="139.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(2434.5, 139.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="2615.5" y="139.5" height="31.0" width="228.0" data-name="WithQuestionnaireControls"></rect>
-						</g>
-						<g transform="translate(2615.5, 139.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="106.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="3170.3" y="139.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-						</g>
-						<g transform="translate(3170.25, 139.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="3998.3" y="139.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(3998.25, 139.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="4613.8" y="139.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-						</g>
-						<g transform="translate(4613.75, 139.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="4246.8" y="139.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(4246.75, 139.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/info/uml.svg b/docs/uml/designer_v2/lib/features/design/info/uml.svg
deleted file mode 100644
index 580464fbd..000000000
--- a/docs/uml/designer_v2/lib/features/design/info/uml.svg
+++ /dev/null
@@ -1,319 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1559.5" height="878.0" viewbox="0 0 1559.5 878" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudyDesignInfoFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
-	
-	[StudyInfoFormViewModel
-	  |
-	  +study: Study;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +organizationControl: FormControl&lt;String&gt;;
-	  +reviewBoardControl: FormControl&lt;String&gt;;
-	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
-	  +researchersControl: FormControl&lt;String&gt;;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +websiteControl: FormControl&lt;String&gt;;
-	  +phoneControl: FormControl&lt;String&gt;;
-	  +additionalInfoControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +iconRequired: dynamic;
-	  +organizationRequired: dynamic;
-	  +reviewBoardRequired: dynamic;
-	  +reviewBoardNumberRequired: dynamic;
-	  +researchersRequired: dynamic;
-	  +emailRequired: dynamic;
-	  +phoneRequired: dynamic;
-	  +emailFormat: dynamic;
-	  +websiteFormat: dynamic
-	  |
-	  +void setControlsFrom();
-	  +StudyInfoFormData buildFormData()
-	]
-	
-	[StudyInfoFormViewModel]o-[Study]
-	[StudyInfoFormViewModel]o-[FormControl]
-	[StudyInfoFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
-	
-	[StudyInfoFormData
-	  |
-	  +title: String;
-	  +description: String?;
-	  +iconName: String;
-	  +contactInfoFormData: StudyContactInfoFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
-	]
-	
-	[StudyInfoFormData]o-[StudyContactInfoFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
-	
-	[StudyContactInfoFormData
-	  |
-	  +organization: String?;
-	  +institutionalReviewBoard: String?;
-	  +institutionalReviewBoardNumber: String?;
-	  +researchers: String?;
-	  +email: String?;
-	  +website: String?;
-	  +phone: String?;
-	  +additionalInfo: String?;
-	  +id: String
-	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="878.0" width="1559.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M111.5 44.3 L111.5 51 L111.5 281.5 L111.5 281.5 " fill="none"></path>
-					<path d="M116.8 44.3 L111.5 44.3 L106.2 44.3 L111.5 31.0 Z"></path>
-					<path d="M485.6 570.8 L484 574 L484 692.5 L484.0 692.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M494.4 564.7 L485.6 570.8 L484.8 560.1 L493.7 554.0 Z"></path>
-					</g>
-					<path d="M611.0 572.7 L611 574 L611 692.5 L611.0 692.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M616.3 563.3 L611.0 572.7 L605.7 563.3 L611.0 554.0 Z"></path>
-					</g>
-					<path d="M844.1 567.8 L849.75 574 L849.75 692.5 L849.8 692.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M841.7 557.3 L844.1 567.8 L833.8 564.5 L831.5 554.0 Z"></path>
-					</g>
-					<path d="M611.0 44.3 L611 51 L611 71 L611.0 71.0 " fill="none"></path>
-					<path d="M616.3 44.3 L611.0 44.3 L605.7 44.3 L611.0 31.0 Z"></path>
-					<path d="M1206.0 415.2 L1206 574 L1224.4328358208954 594 L1224.4 594.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1211.3 405.8 L1206.0 415.2 L1200.7 405.8 L1206.0 396.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1262.8 34.7 L1206 51 L1206 228.5 L1206.0 228.5 " fill="none"></path>
-					</g>
-					<path d="M1264.2 39.8 L1262.8 34.7 L1261.3 29.6 L1275.6 31.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1396.2 34.7 L1453 51 L1453 312.5 L1453 312.5 L1453 574 L1453 574 L1434.5671641791046 594 L1434.6 594.0 " fill="none"></path>
-					</g>
-					<path d="M1397.7 29.6 L1396.2 34.7 L1394.8 39.8 L1383.4 31.0 Z"></path>
-					<g data-name="StudyDesignInfoFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="0.0" y="281.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M0.0 312.5 L223.0 312.5" fill="none" data-name="StudyDesignInfoFormView"></path>
-						</g>
-						<g transform="translate(0, 281.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 312.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="5.5" y="0.0" height="31.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-						</g>
-						<g transform="translate(5.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="263.0" y="71.0" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M263.0 102.0 L959.0 102.0" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M263.0 508.0 L959.0 508.0" fill="none" data-name="StudyInfoFormViewModel"></path>
-						</g>
-						<g transform="translate(263, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(263, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(263, 508)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="453.5" y="692.5" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(453.5, 692.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="554.5" y="692.5" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(554.5, 692.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="797.3" y="692.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(797.25, 692.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="540.5" y="0.0" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(540.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="999.0" y="228.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M999.0 259.5 L1413.0 259.5" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M999.0 350.5 L1413.0 350.5" fill="none" data-name="StudyInfoFormData"></path>
-						</g>
-						<g transform="translate(999, 228.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(999, 259.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(999, 350.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyContactInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="1155.5" y="594.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M1155.5 625.0 L1503.5 625.0" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M1155.5 776.0 L1503.5 776.0" fill="none" data-name="StudyContactInfoFormData"></path>
-						</g>
-						<g transform="translate(1155.5, 594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
-								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1155.5, 625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1155.5, 776)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="1258.0" y="0.0" height="31.0" width="143.0" data-name="IStudyFormData"></rect>
-						</g>
-						<g transform="translate(1258, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/interventions/uml.svg b/docs/uml/designer_v2/lib/features/design/interventions/uml.svg
deleted file mode 100644
index 21200174f..000000000
--- a/docs/uml/designer_v2/lib/features/design/interventions/uml.svg
+++ /dev/null
@@ -1,1004 +0,0 @@
-<svg version="1.1" baseProfile="full" width="5173.0" height="1337.0" viewbox="0 0 5173 1337" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[InterventionsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +interventionsArray: FormArray&lt;dynamic&gt;;
-	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
-	  +form: FormGroup;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +interventionsRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestStudySchedule: bool
-	  |
-	  +void setControlsFrom();
-	  +InterventionsFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +InterventionFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +dynamic testStudySchedule()
-	]
-	
-	[InterventionsFormViewModel]o-[Study]
-	[InterventionsFormViewModel]o-[GoRouter]
-	[InterventionsFormViewModel]o-[FormArray]
-	[InterventionsFormViewModel]o-[FormViewModelCollection]
-	[InterventionsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
-	
-	[InterventionTaskFormViewModel
-	  |
-	  +taskIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +taskTitleControl: FormControl&lt;String&gt;;
-	  +taskDescriptionControl: FormControl&lt;String&gt;;
-	  +markAsCompletedControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +taskId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +InterventionTaskFormData buildFormData();
-	  +InterventionTaskFormViewModel createDuplicate()
-	]
-	
-	[InterventionTaskFormViewModel]o-[FormControl]
-	[InterventionTaskFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
-	
-	[InterventionPreview
-	  |
-	  +routeArgs: InterventionFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPreview]o-[InterventionFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
-	
-	[&lt;abstract&gt;StudyScheduleControls
-	  |
-	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
-	  &lt;static&gt;+defaultScheduleTypeSequence: String;
-	  &lt;static&gt;+defaultNumCycles: int;
-	  &lt;static&gt;+defaultPeriodLength: int;
-	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
-	  +phaseDurationControl: FormControl&lt;int&gt;;
-	  +numCyclesControl: FormControl&lt;int&gt;;
-	  +includeBaselineControl: FormControl&lt;bool&gt;;
-	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  &lt;static&gt;+kNumCyclesMin: int;
-	  &lt;static&gt;+kNumCyclesMax: int;
-	  &lt;static&gt;+kPhaseDurationMin: int;
-	  &lt;static&gt;+kPhaseDurationMax: int;
-	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +numCyclesRange: dynamic;
-	  +phaseDurationRange: dynamic;
-	  +customSequenceRequired: dynamic
-	  |
-	  +void setStudyScheduleControlsFrom();
-	  +StudyScheduleFormData buildStudyScheduleFormData();
-	  +bool isSequencingCustom()
-	]
-	
-	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
-	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
-	
-	[InterventionTaskFormView
-	  |
-	  +formViewModel: InterventionTaskFormViewModel
-	]
-	
-	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
-	
-	[InterventionsFormData
-	  |
-	  +interventionsData: List&lt;InterventionFormData&gt;;
-	  +studyScheduleData: StudyScheduleFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +InterventionsFormData copy()
-	]
-	
-	[InterventionsFormData]o-[StudyScheduleFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
-	
-	[InterventionTaskFormData
-	  |
-	  +taskId: String;
-	  +taskTitle: String;
-	  +taskDescription: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +CheckmarkTask toTask();
-	  +InterventionTaskFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
-	
-	[InterventionFormView
-	  |
-	  +formViewModel: InterventionFormViewModel
-	]
-	
-	[InterventionFormView]o-[InterventionFormViewModel]
-	
-	[StudyDesignInterventionsFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
-	
-	[InterventionFormData
-	  |
-	  +interventionId: String;
-	  +title: String;
-	  +description: String?;
-	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
-	  +iconName: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +Intervention toIntervention();
-	  +InterventionFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
-	
-	[StudyScheduleFormData
-	  |
-	  +sequenceType: PhaseSequence;
-	  +sequenceTypeCustom: String;
-	  +numCycles: int;
-	  +phaseDuration: int;
-	  +includeBaseline: bool;
-	  +id: String
-	  |
-	  +StudySchedule toStudySchedule();
-	  +Study apply();
-	  +StudyScheduleFormData copy()
-	]
-	
-	[StudyScheduleFormData]o-[PhaseSequence]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
-	
-	[StudyScheduleFormView
-	  |
-	  +formViewModel: StudyScheduleControls
-	  |
-	  -FormTableRow _renderCustomSequence();
-	  +Widget build()
-	]
-	
-	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
-	
-	[InterventionFormViewModel
-	  |
-	  +study: Study;
-	  +interventionIdControl: FormControl&lt;String&gt;;
-	  +interventionTitleControl: FormControl&lt;String&gt;;
-	  +interventionIconControl: FormControl&lt;IconOption&gt;;
-	  +interventionDescriptionControl: FormControl&lt;String&gt;;
-	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
-	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
-	  +form: FormGroup;
-	  +interventionId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneTask: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +InterventionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +InterventionTaskFormViewModel provide();
-	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
-	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
-	  +InterventionFormViewModel createDuplicate()
-	]
-	
-	[InterventionFormViewModel]o-[Study]
-	[InterventionFormViewModel]o-[FormControl]
-	[InterventionFormViewModel]o-[FormArray]
-	[InterventionFormViewModel]o-[FormViewModelCollection]
-	[InterventionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="1337.0" width="5173.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M558.7 1179.0 L513.75 1230 L525.0176056338028 1250 L525.0 1250.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M568.9 1175.5 L558.7 1179.0 L560.9 1168.5 L571.1 1165.0 Z"></path>
-					</g>
-					<path d="M666.6 1182.6 L650.25 1230 L650.25 1250 L650.3 1250.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M674.6 1175.6 L666.6 1182.6 L664.6 1172.1 L672.6 1165.0 Z"></path>
-					</g>
-					<path d="M737.8 1183.7 L737.75 1230 L764.5105633802817 1250 L764.5 1250.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M743.1 1174.3 L737.8 1183.7 L732.4 1174.3 L737.8 1165.0 Z"></path>
-					</g>
-					<path d="M1119.7 1173.6 L1228.75 1230 L1632.75 1257.9298928919181 L1632.8 1257.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1113.8 1164.6 L1119.7 1173.6 L1108.9 1174.0 L1103.1 1165.0 Z"></path>
-					</g>
-					<path d="M1175.7 1037.5 L2547.25 1230 L2592.8838028169016 1250 L2592.9 1250.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1167.2 1030.9 L1175.7 1037.5 L1165.8 1041.5 L1157.3 1034.9 Z"></path>
-					</g>
-					<path d="M70.5 534.3 L70.5 722 L318.25 816.3102285500188 L318.3 816.3 " fill="none"></path>
-					<path d="M75.8 534.3 L70.5 534.3 L65.2 534.3 L70.5 521.0 Z"></path>
-					<path d="M1490.8 565.7 L471.75 722 L539.8208661417323 787 L539.8 787.0 " fill="none"></path>
-					<path d="M1491.6 570.9 L1490.8 565.7 L1490.0 560.4 L1504.0 563.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M327.7 529.1 L581.25 722 L621.2992125984252 787 L621.3 787.0 " fill="none"></path>
-					</g>
-					<path d="M331.0 524.8 L327.7 529.1 L324.5 533.3 L317.1 521.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M953.8 533.3 L1032 722 L956.6998031496063 787 L956.7 787.0 " fill="none"></path>
-					</g>
-					<path d="M958.7 531.3 L953.8 533.3 L948.9 535.4 L948.7 521.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1160.8 534.3 L1161.25 722 L1052.8740157480315 787 L1052.9 787.0 " fill="none"></path>
-					</g>
-					<path d="M1166.1 534.3 L1160.8 534.3 L1155.5 534.3 L1160.8 521.0 Z"></path>
-					<path d="M4161.5 1079.2 L4696.5 1230 L4874 1256.9284188034187 L4874.0 1256.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4153.9 1071.5 L4161.5 1079.2 L4151.0 1081.8 L4143.5 1074.1 Z"></path>
-					</g>
-					<path d="M3429.2 1053.0 L2587.25 1230 L2610.3485915492956 1250 L2610.3 1250.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3439.5 1056.3 L3429.2 1053.0 L3437.3 1045.9 L3447.5 1049.2 Z"></path>
-					</g>
-					<path d="M2500.8 523.6 L3502.75 722 L3638.175688976378 839.5 L3638.2 839.5 " fill="none"></path>
-					<path d="M2501.9 518.4 L2500.8 523.6 L2499.8 528.8 L2487.8 521.0 Z"></path>
-					<path d="M4540.8 530.5 L4351.5 722 L4094.2952755905512 839.5 L4094.3 839.5 " fill="none"></path>
-					<path d="M4544.6 534.2 L4540.8 530.5 L4537.0 526.7 L4550.2 521.0 Z"></path>
-					<path d="M2673.5 235.2 L2673.5 289 L2673.5 490 L2673.5 490.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2678.8 225.8 L2673.5 235.2 L2668.2 225.8 L2673.5 216.5 Z"></path>
-					</g>
-					<path d="M2673.5 44.3 L2673.5 51 L2673.5 123.5 L2673.5 123.5 " fill="none"></path>
-					<path d="M2678.8 44.3 L2673.5 44.3 L2668.2 44.3 L2673.5 31.0 Z"></path>
-					<path d="M2278.6 708.9 L2304 722 L3163.632874015748 960.5 L3163.6 960.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2272.7 699.9 L2278.6 708.9 L2267.9 709.4 L2262.0 700.4 Z"></path>
-					</g>
-					<path d="M2280.6 533.9 L4910.5 722 L4910.5 976 L4910.5 976 L4910.5 1230 L4910.5 1230 L4921.767605633803 1250 L4921.8 1250.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2271.7 527.9 L2280.6 533.9 L2270.9 538.6 L2262.0 532.6 Z"></path>
-					</g>
-					<path d="M4866.7 549.8 L4696.5 722 L4143.5 877.8956714761376 L4143.5 877.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4877.1 546.9 L4866.7 549.8 L4869.5 539.4 L4879.9 536.5 Z"></path>
-					</g>
-					<path d="M4163.5 257.7 L4163.5 289 L4227.812933025404 406.5 L4227.8 406.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4168.8 248.3 L4163.5 257.7 L4158.2 248.3 L4163.5 239.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M4217.5 34.8 L4163.5 51 L4163.5 101 L4163.5 101.0 " fill="none"></path>
-					</g>
-					<path d="M4219.0 39.9 L4217.5 34.8 L4216.0 29.7 L4230.3 31.0 Z"></path>
-					<path d="M3023.5 44.3 L3023.5 51 L3023.5 86 L3023.5 86.0 " fill="none"></path>
-					<path d="M3028.8 44.3 L3023.5 44.3 L3018.2 44.3 L3023.5 31.0 Z"></path>
-					<path d="M731.6 543.1 L1201.25 722 L1334.75 782.4438502673797 L1334.8 782.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M724.8 534.8 L731.6 543.1 L721.0 544.8 L714.2 536.5 Z"></path>
-					</g>
-					<path d="M3356.5 44.3 L3356.5 51 L3356.5 139 L3356.5 139.0 " fill="none"></path>
-					<path d="M3361.8 44.3 L3356.5 44.3 L3351.2 44.3 L3356.5 31.0 Z"></path>
-					<path d="M3735.5 44.3 L3735.5 51 L3735.5 71 L3735.5 71.0 " fill="none"></path>
-					<path d="M3740.8 44.3 L3735.5 44.3 L3730.2 44.3 L3735.5 31.0 Z"></path>
-					<path d="M4116.0 549.4 L3462.75 722 L3234.343996062992 960.5 L3234.3 960.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4126.3 552.2 L4116.0 549.4 L4123.6 541.8 L4134.0 544.6 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M4346.5 34.8 L4400.5 51 L4400.5 170 L4400.5 170 L4400.5 289 L4400.5 289 L4336.187066974596 406.5 L4336.2 406.5 " fill="none"></path>
-					</g>
-					<path d="M4348.0 29.7 L4346.5 34.8 L4345.0 39.9 L4333.7 31.0 Z"></path>
-					<path d="M1883.0 242.7 L1883 289 L1883 309 L1883.0 309.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1888.3 233.3 L1883.0 242.7 L1877.7 233.3 L1883.0 224.0 Z"></path>
-					</g>
-					<path d="M1883.0 44.3 L1883 51 L1883 116 L1883.0 116.0 " fill="none"></path>
-					<path d="M1888.3 44.3 L1883.0 44.3 L1877.7 44.3 L1883.0 31.0 Z"></path>
-					<path d="M1316.5 1071.1 L572 1230 L550.4507042253521 1250 L550.5 1250.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1326.7 1074.4 L1316.5 1071.1 L1324.5 1064.0 L1334.8 1067.2 Z"></path>
-					</g>
-					<path d="M2208.4 1011.5 L4950.5 1230 L4939.232394366197 1250 L4939.2 1250.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2199.5 1005.5 L2208.4 1011.5 L2198.6 1016.1 L2189.8 1010.1 Z"></path>
-					</g>
-					<path d="M1317.7 1172.9 L1188.75 1230 L834.25 1261.1889714993804 L834.3 1261.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1328.4 1174.0 L1317.7 1172.9 L1324.1 1164.2 L1334.8 1165.3 Z"></path>
-					</g>
-					<path d="M1762.3 1228.7 L1762.25 1230 L1750.9823943661972 1250 L1751.0 1250.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1767.6 1219.3 L1762.3 1228.7 L1756.9 1219.3 L1762.3 1210.0 Z"></path>
-					</g>
-					<path d="M2208.2 1040.1 L3529.25 1230 L2680.75 1263.4314650388458 L2680.8 1263.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2199.7 1033.5 L2208.2 1040.1 L2198.2 1044.1 L2189.8 1037.5 Z"></path>
-					</g>
-					<path d="M2354.6 525.6 L1817 722 L1812.6889763779527 742 L1812.7 742.0 " fill="none"></path>
-					<path d="M2356.4 530.6 L2354.6 525.6 L2352.7 520.6 L2367.1 521.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M418.5 522.4 L1857 722 L1849.5393700787401 742 L1849.5 742.0 " fill="none"></path>
-					</g>
-					<path d="M419.2 517.1 L418.5 522.4 L417.7 527.7 L405.3 520.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1023.6 523.9 L1897 722 L1886.3897637795276 742 L1886.4 742.0 " fill="none"></path>
-					</g>
-					<path d="M1024.8 518.7 L1023.6 523.9 L1022.4 529.1 L1010.6 521.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1235.6 524.2 L2026.25 722 L2005.4625984251968 742 L2005.5 742.0 " fill="none"></path>
-					</g>
-					<path d="M1236.9 519.1 L1235.6 524.2 L1234.4 529.4 L1222.7 521.0 Z"></path>
-					<g data-name="InterventionsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="318.3" y="787.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M318.3 818.0 L1157.3 818.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M318.3 969.0 L1157.3 969.0" fill="none" data-name="InterventionsFormViewModel"></path>
-						</g>
-						<g transform="translate(318.25, 787)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
-								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(318.25, 818)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(318.25, 969)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="503.3" y="1250.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(503.25, 1250)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="604.3" y="1250.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(604.25, 1250)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="736.3" y="1250.0" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(736.25, 1250)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="1632.8" y="1250.0" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
-						</g>
-						<g transform="translate(1632.75, 1250)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="2575.8" y="1250.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(2575.75, 1250)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="0.0" y="490.0" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(0, 490)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="1504.0" y="309.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M1504.0 340.0 L2262.0 340.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M1504.0 641.0 L2262.0 641.0" fill="none" data-name="StudyScheduleControls"></path>
-						</g>
-						<g transform="translate(1504, 309)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
-								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1504, 340)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1504, 641)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="188.3" y="490.0" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-						</g>
-						<g transform="translate(188.25, 490)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="860.3" y="490.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(860.25, 490)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="1064.3" y="490.0" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-						</g>
-						<g transform="translate(1064.25, 490)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="3447.5" y="839.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M3447.5 870.5 L4143.5 870.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M3447.5 1051.5 L4143.5 1051.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-						</g>
-						<g transform="translate(3447.5, 839.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3447.5, 870.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3447.5, 1051.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="4874.0" y="1250.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(4874, 1250)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="2302.0" y="490.0" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(2302, 490)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="4470.0" y="490.0" height="31.0" width="191.0" data-name="WithScheduleControls"></rect>
-						</g>
-						<g transform="translate(4470, 490)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="2508.5" y="123.5" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M2508.5 154.5 L2838.5 154.5" fill="none" data-name="InterventionPreview"></path>
-							<path d="M2508.5 185.5 L2838.5 185.5" fill="none" data-name="InterventionPreview"></path>
-						</g>
-						<g transform="translate(2508.5, 123.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2508.5, 154.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2508.5, 185.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="2557.0" y="490.0" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(2557, 490)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="2597.5" y="0.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(2597.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PhaseSequence">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="3146.5" y="960.5" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
-						</g>
-						<g transform="translate(3146.5, 960.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
-								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="4704.0" y="474.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M4704.0 505.5 L5117.0 505.5" fill="none" data-name="InterventionTaskFormView"></path>
-						</g>
-						<g transform="translate(4704, 474.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4704, 505.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="3966.5" y="101.0" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M3966.5 132.0 L4360.5 132.0" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M3966.5 193.0 L4360.5 193.0" fill="none" data-name="InterventionsFormData"></path>
-						</g>
-						<g transform="translate(3966.5, 101)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3966.5, 132)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3966.5, 193)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="4134.0" y="406.5" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M4134.0 437.5 L4430.0 437.5" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M4134.0 543.5 L4430.0 543.5" fill="none" data-name="StudyScheduleFormData"></path>
-						</g>
-						<g transform="translate(4134, 406.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4134, 437.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4134, 543.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="4210.5" y="0.0" height="31.0" width="143.0" data-name="IStudyFormData"></rect>
-						</g>
-						<g transform="translate(4210.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="2878.5" y="86.0" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M2878.5 117.0 L3168.5 117.0" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M2878.5 208.0 L3168.5 208.0" fill="none" data-name="InterventionTaskFormData"></path>
-						</g>
-						<g transform="translate(2878.5, 86)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2878.5, 117)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2878.5, 208)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="2920.0" y="0.0" height="31.0" width="207.0" data-name="IFormDataWithSchedule"></rect>
-						</g>
-						<g transform="translate(2920, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="445.3" y="474.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M445.3 505.5 L820.3 505.5" fill="none" data-name="InterventionFormView"></path>
-						</g>
-						<g transform="translate(445.25, 474.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
-								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(445.25, 505.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="1334.8" y="742.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M1334.8 773.0 L2189.8 773.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M1334.8 999.0 L2189.8 999.0" fill="none" data-name="InterventionFormViewModel"></path>
-						</g>
-						<g transform="translate(1334.75, 742)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
-								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1334.75, 773)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1334.75, 999)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignInterventionsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="3208.5" y="139.0" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M3208.5 170.0 L3504.5 170.0" fill="none" data-name="StudyDesignInterventionsFormView"></path>
-						</g>
-						<g transform="translate(3208.5, 139)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3208.5, 170)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="3250.5" y="0.0" height="31.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-						</g>
-						<g transform="translate(3250.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="3544.5" y="71.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M3544.5 102.0 L3926.5 102.0" fill="none" data-name="InterventionFormData"></path>
-							<path d="M3544.5 223.0 L3926.5 223.0" fill="none" data-name="InterventionFormData"></path>
-						</g>
-						<g transform="translate(3544.5, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3544.5, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3544.5, 223)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="3686.5" y="0.0" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(3686.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="1703.5" y="116.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M1703.5 147.0 L2062.5 147.0" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M1703.5 178.0 L2062.5 178.0" fill="none" data-name="StudyScheduleFormView"></path>
-						</g>
-						<g transform="translate(1703.5, 116)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1703.5, 147)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1703.5, 178)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="1787.0" y="0.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
-						</g>
-						<g transform="translate(1787, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/measurements/survey/uml.svg b/docs/uml/designer_v2/lib/features/design/measurements/survey/uml.svg
deleted file mode 100644
index 4f64dc548..000000000
--- a/docs/uml/designer_v2/lib/features/design/measurements/survey/uml.svg
+++ /dev/null
@@ -1,398 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2680.0" height="652.0" viewbox="0 0 2680 652" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[MeasurementSurveyFormView
-	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
-	]
-	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
-	
-	[MeasurementSurveyFormData
-	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
-	]
-	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
-	
-	[MeasurementSurveyFormViewModel
-	  |
-	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
-	]
-	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
-	
-	[SurveyPreview
-	  |
-	  +routeArgs: MeasurementFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="652.0" width="2680.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M222.0 80.7 L222 82 L754.5 222.00425894378196 L754.5 222.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M227.3 71.3 L222.0 80.7 L216.7 71.3 L222.0 62.0 Z"></path>
-					</g>
-					<path d="M2035.5 431.2 L2035.5 545 L2035.5 565 L2035.5 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2040.8 421.8 L2035.5 431.2 L2030.2 421.8 L2035.5 412.5 Z"></path>
-					</g>
-					<path d="M2035.5 59.8 L2035.5 82 L2035.5 214.5 L2035.5 214.5 " fill="none"></path>
-					<path d="M2040.8 59.8 L2035.5 59.8 L2030.2 59.8 L2035.5 46.5 Z"></path>
-					<path d="M966.9 541.0 L964.5 545 L964.5 565 L964.5 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M976.2 535.7 L966.9 541.0 L967.1 530.3 L976.4 525.0 Z"></path>
-					</g>
-					<path d="M1197.1 542.2 L1198.25 545 L1198.25 565 L1198.3 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1198.5 531.6 L1197.1 542.2 L1188.6 535.7 L1190.0 525.0 Z"></path>
-					</g>
-					<path d="M1468.0 451.3 L1716.5 545 L1716.5 565 L1716.5 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1461.1 443.0 L1468.0 451.3 L1457.4 453.0 L1450.5 444.7 Z"></path>
-					</g>
-					<path d="M591.5 59.8 L591.5 82 L754.5 155.84442270058707 L754.5 155.8 " fill="none"></path>
-					<path d="M596.8 59.8 L591.5 59.8 L586.2 59.8 L591.5 46.5 Z"></path>
-					<path d="M853.0 59.8 L853 82 L874.5550755939526 102 L874.6 102.0 " fill="none"></path>
-					<path d="M858.3 59.8 L853.0 59.8 L847.7 59.8 L853.0 46.5 Z"></path>
-					<path d="M1102.5 59.8 L1102.5 82 L1102.5 102 L1102.5 102.0 " fill="none"></path>
-					<path d="M1107.8 59.8 L1102.5 59.8 L1097.2 59.8 L1102.5 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1346.5 59.8 L1346.5 82 L1325.4200863930885 102 L1325.4 102.0 " fill="none"></path>
-					</g>
-					<path d="M1351.8 59.8 L1346.5 59.8 L1341.2 59.8 L1346.5 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1577.0 59.8 L1577 82 L1450.5 143.71707060063224 L1450.5 143.7 " fill="none"></path>
-					</g>
-					<path d="M1582.3 59.8 L1577.0 59.8 L1571.7 59.8 L1577.0 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1795.5 59.8 L1795.5 82 L1450.5 197.24891774891773 L1450.5 197.2 " fill="none"></path>
-					</g>
-					<path d="M1800.8 59.8 L1795.5 59.8 L1790.2 59.8 L1795.5 46.5 Z"></path>
-					<path d="M2452.0 378.7 L2452 545 L2452 565 L2452.0 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2457.3 369.3 L2452.0 378.7 L2446.7 369.3 L2452.0 360.0 Z"></path>
-					</g>
-					<path d="M2452.0 59.8 L2452 82 L2452 267 L2452.0 267.0 " fill="none"></path>
-					<path d="M2457.3 59.8 L2452.0 59.8 L2446.7 59.8 L2452.0 46.5 Z"></path>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="0.0" y="0.0" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M0.0 31.0 L444.0 31.0" fill="none" data-name="MeasurementSurveyFormView"></path>
-						</g>
-						<g transform="translate(0, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="754.5" y="102.0" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M754.5 133.0 L1450.5 133.0" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M754.5 359.0 L1450.5 359.0" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-						</g>
-						<g transform="translate(754.5, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(754.5, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(754.5, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="1831.0" y="214.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M1831.0 245.5 L2240.0 245.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M1831.0 366.5 L2240.0 366.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-						</g>
-						<g transform="translate(1831, 214.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1831, 245.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1831, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="1933.5" y="565.0" height="31.0" width="204.0" data-name="QuestionnaireFormData"></rect>
-						</g>
-						<g transform="translate(1933.5, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="1932.0" y="15.5" height="31.0" width="207.0" data-name="IFormDataWithSchedule"></rect>
-						</g>
-						<g transform="translate(1932, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="934.0" y="565.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(934, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="1141.8" y="565.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(1141.75, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="1664.0" y="565.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(1664, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="484.0" y="15.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(484, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="739.0" y="15.5" height="31.0" width="228.0" data-name="WithQuestionnaireControls"></rect>
-						</g>
-						<g transform="translate(739, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="106.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="1007.0" y="15.5" height="31.0" width="191.0" data-name="WithScheduleControls"></rect>
-						</g>
-						<g transform="translate(1007, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="1238.0" y="15.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-						</g>
-						<g transform="translate(1238, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="1495.0" y="15.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(1495, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="1699.0" y="15.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-						</g>
-						<g transform="translate(1699, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="2280.0" y="267.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M2280.0 298.0 L2624.0 298.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M2280.0 329.0 L2624.0 329.0" fill="none" data-name="SurveyPreview"></path>
-						</g>
-						<g transform="translate(2280, 267)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2280, 298)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2280, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="2328.5" y="565.0" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(2328.5, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="2376.0" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(2376, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/measurements/uml.svg b/docs/uml/designer_v2/lib/features/design/measurements/uml.svg
deleted file mode 100644
index 11d537c95..000000000
--- a/docs/uml/designer_v2/lib/features/design/measurements/uml.svg
+++ /dev/null
@@ -1,645 +0,0 @@
-<svg version="1.1" baseProfile="full" width="4118.8" height="652.0" viewbox="0 0 4118.75 652" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[MeasurementsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +measurementsArray: FormArray&lt;dynamic&gt;;
-	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
-	  +form: FormGroup;
-	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +measurementRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +MeasurementsFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +MeasurementSurveyFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave()
-	]
-	
-	[MeasurementsFormViewModel]o-[Study]
-	[MeasurementsFormViewModel]o-[GoRouter]
-	[MeasurementsFormViewModel]o-[FormArray]
-	[MeasurementsFormViewModel]o-[FormViewModelCollection]
-	[MeasurementsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
-	
-	[StudyDesignMeasurementsFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
-	
-	[MeasurementsFormData
-	  |
-	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
-	  +id: String
-	  |
-	  +Study apply();
-	  +MeasurementsFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
-	
-	[MeasurementSurveyFormView
-	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
-	]
-	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
-	
-	[MeasurementSurveyFormData
-	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
-	]
-	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
-	
-	[MeasurementSurveyFormViewModel
-	  |
-	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
-	]
-	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
-	
-	[SurveyPreview
-	  |
-	  +routeArgs: MeasurementFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="652.0" width="4118.8" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M1434.1 511.0 L1413.75 545 L1628.75 576.0896130346232 L1628.8 576.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1443.4 505.7 L1434.1 511.0 L1434.3 500.3 L1443.7 495.0 Z"></path>
-					</g>
-					<path d="M1551.8 513.7 L1551.75 545 L1450.5 569.4100169779286 L1450.5 569.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1557.2 504.3 L1551.8 513.7 L1546.5 504.3 L1551.9 495.0 Z"></path>
-					</g>
-					<path d="M1627.0 512.5 L1639.25 545 L1583.0528169014085 565 L1583.1 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1628.7 501.9 L1627.0 512.5 L1618.8 505.6 L1620.5 495.0 Z"></path>
-					</g>
-					<path d="M1900.9 503.9 L1976 545 L2049.239436619718 565 L2049.2 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1895.2 494.8 L1900.9 503.9 L1890.1 504.2 L1884.5 495.0 Z"></path>
-					</g>
-					<path d="M1996.5 502.3 L2097 545 L2491.5 576.3305369127517 L2491.5 576.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1990.0 493.7 L1996.5 502.3 L1985.8 503.6 L1979.3 495.0 Z"></path>
-					</g>
-					<path d="M70.5 59.8 L70.5 82 L1006.25 228.19613632529104 L1006.3 228.2 " fill="none"></path>
-					<path d="M75.8 59.8 L70.5 59.8 L65.2 59.8 L70.5 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1216.5 53.1 L1165.5 82 L1249.0313174946004 132 L1249.0 132.0 " fill="none"></path>
-					</g>
-					<path d="M1219.2 57.7 L1216.5 53.1 L1213.9 48.4 L1228.1 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1941.4 55.1 L1909.5 82 L1832.3401727861772 132 L1832.3 132.0 " fill="none"></path>
-					</g>
-					<path d="M1944.9 59.2 L1941.4 55.1 L1938.0 51.0 L1951.6 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M2692.3 52.5 L2633.25 82 L2098.25 196.57215541165587 L2098.3 196.6 " fill="none"></path>
-					</g>
-					<path d="M2694.7 57.2 L2692.3 52.5 L2689.9 47.7 L2704.3 46.5 Z"></path>
-					<path d="M287.0 59.8 L287 82 L278.55561555075593 282.5 L278.6 282.5 " fill="none"></path>
-					<path d="M292.3 59.8 L287.0 59.8 L281.7 59.8 L287.0 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M729.0 59.8 L729 82 L721.840172786177 252 L721.8 252.0 " fill="none"></path>
-					</g>
-					<path d="M734.3 59.8 L729.0 59.8 L723.7 59.8 L729.0 46.5 Z"></path>
-					<path d="M1626.0 80.7 L1626 82 L2143.25 220.391649812193 L2143.3 220.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1631.3 71.3 L1626.0 80.7 L1620.7 71.3 L1626.0 62.0 Z"></path>
-					</g>
-					<path d="M3474.3 431.2 L3474.25 545 L3474.25 565 L3474.3 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3479.6 421.8 L3474.3 431.2 L3468.9 421.8 L3474.3 412.5 Z"></path>
-					</g>
-					<path d="M3474.3 59.8 L3474.25 82 L3474.25 214.5 L3474.3 214.5 " fill="none"></path>
-					<path d="M3479.6 59.8 L3474.3 59.8 L3468.9 59.8 L3474.3 46.5 Z"></path>
-					<path d="M2184.0 535.9 L2171.5 545 L1689.75 578.3862859931673 L1689.8 578.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2194.7 534.8 L2184.0 535.9 L2188.4 526.2 L2199.1 525.0 Z"></path>
-					</g>
-					<path d="M2597.1 541.9 L2598.5 545 L2651.739436619718 565 L2651.7 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2598.0 531.2 L2597.1 541.9 L2588.3 535.7 L2589.2 525.0 Z"></path>
-					</g>
-					<path d="M2856.4 472.1 L3024.25 545 L2596.5 576.6192087454451 L2596.5 576.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2849.9 463.5 L2856.4 472.1 L2845.7 473.3 L2839.3 464.6 Z"></path>
-					</g>
-					<path d="M2491.3 59.8 L2491.25 82 L2491.25 102 L2491.3 102.0 " fill="none"></path>
-					<path d="M2496.6 59.8 L2491.3 59.8 L2485.9 59.8 L2491.3 46.5 Z"></path>
-					<path d="M2985.8 59.8 L2985.75 82 L2839.25 150.58392315470172 L2839.3 150.6 " fill="none"></path>
-					<path d="M2991.1 59.8 L2985.8 59.8 L2980.4 59.8 L2985.8 46.5 Z"></path>
-					<path d="M3235.3 59.8 L3235.25 82 L2839.25 205.21774193548387 L2839.3 205.2 " fill="none"></path>
-					<path d="M3240.6 59.8 L3235.3 59.8 L3229.9 59.8 L3235.3 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1318.5 50.4 L1420.75 82 L2143.25 238.2435777673984 L2143.3 238.2 " fill="none"></path>
-					</g>
-					<path d="M1320.0 45.3 L1318.5 50.4 L1316.9 55.5 L1305.7 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M2010.5 52.8 L2064.75 82 L2143.25 124.60902696365767 L2143.3 124.6 " fill="none"></path>
-					</g>
-					<path d="M2013.1 48.1 L2010.5 52.8 L2008.0 57.5 L1998.8 46.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M2779.2 52.3 L2840.5 82 L2810.327213822894 102 L2810.3 102.0 " fill="none"></path>
-					</g>
-					<path d="M2781.6 47.5 L2779.2 52.3 L2776.9 57.1 L2767.2 46.5 Z"></path>
-					<path d="M3890.8 378.7 L3890.75 545 L3890.75 565 L3890.8 565.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3896.1 369.3 L3890.8 378.7 L3885.4 369.3 L3890.8 360.0 Z"></path>
-					</g>
-					<path d="M3890.8 59.8 L3890.75 82 L3890.75 267 L3890.8 267.0 " fill="none"></path>
-					<path d="M3896.1 59.8 L3890.8 59.8 L3885.4 59.8 L3890.8 46.5 Z"></path>
-					<g data-name="MeasurementsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="1006.3" y="132.0" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M1006.3 163.0 L2098.3 163.0" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M1006.3 314.0 L2098.3 314.0" fill="none" data-name="MeasurementsFormViewModel"></path>
-						</g>
-						<g transform="translate(1006.25, 132)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
-								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1006.25, 163)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1006.25, 314)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="1628.8" y="565.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(1628.75, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="1358.5" y="565.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(1358.5, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="1490.5" y="565.0" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(1490.5, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="1996.5" y="565.0" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
-						</g>
-						<g transform="translate(1996.5, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="2491.5" y="565.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(2491.5, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="0.0" y="15.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(0, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="1147.0" y="15.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-						</g>
-						<g transform="translate(1147, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="1888.0" y="15.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(1888, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="2638.8" y="15.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-						</g>
-						<g transform="translate(2638.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignMeasurementsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="122.3" y="282.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M122.3 313.5 L432.3 313.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
-						</g>
-						<g transform="translate(122.25, 282.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(122.25, 313.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="181.0" y="15.5" height="31.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-						</g>
-						<g transform="translate(181, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="472.3" y="252.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M472.3 283.0 L966.3 283.0" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M472.3 329.0 L966.3 329.0" fill="none" data-name="MeasurementsFormData"></path>
-						</g>
-						<g transform="translate(472.25, 252)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
-								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(472.25, 283)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(472.25, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="657.5" y="15.5" height="31.0" width="143.0" data-name="IStudyFormData"></rect>
-						</g>
-						<g transform="translate(657.5, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="1404.0" y="0.0" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M1404.0 31.0 L1848.0 31.0" fill="none" data-name="MeasurementSurveyFormView"></path>
-						</g>
-						<g transform="translate(1404, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1404, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="2143.3" y="102.0" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M2143.3 133.0 L2839.3 133.0" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M2143.3 359.0 L2839.3 359.0" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-						</g>
-						<g transform="translate(2143.25, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2143.25, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2143.25, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="3269.8" y="214.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M3269.8 245.5 L3678.8 245.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M3269.8 366.5 L3678.8 366.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-						</g>
-						<g transform="translate(3269.75, 214.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3269.75, 245.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3269.75, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="3372.3" y="565.0" height="31.0" width="204.0" data-name="QuestionnaireFormData"></rect>
-						</g>
-						<g transform="translate(3372.25, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="3370.8" y="15.5" height="31.0" width="207.0" data-name="IFormDataWithSchedule"></rect>
-						</g>
-						<g transform="translate(3370.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="2636.5" y="565.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(2636.5, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="2383.8" y="15.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(2383.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="2871.8" y="15.5" height="31.0" width="228.0" data-name="WithQuestionnaireControls"></rect>
-						</g>
-						<g transform="translate(2871.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="106.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="3139.8" y="15.5" height="31.0" width="191.0" data-name="WithScheduleControls"></rect>
-						</g>
-						<g transform="translate(3139.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="3718.8" y="267.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M3718.8 298.0 L4062.8 298.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M3718.8 329.0 L4062.8 329.0" fill="none" data-name="SurveyPreview"></path>
-						</g>
-						<g transform="translate(3718.75, 267)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3718.75, 298)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3718.75, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="3767.3" y="565.0" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(3767.25, 565)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="3814.8" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(3814.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/reports/section/types/uml.svg b/docs/uml/designer_v2/lib/features/design/reports/section/types/uml.svg
deleted file mode 100644
index 023bcc555..000000000
--- a/docs/uml/designer_v2/lib/features/design/reports/section/types/uml.svg
+++ /dev/null
@@ -1,446 +0,0 @@
-<svg version="1.1" baseProfile="full" width="3199.5" height="503.0" viewbox="0 0 3199.5 503" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[TemporalAggregationFormatted
-	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
-	]
-	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
-	
-	[ImprovementDirectionFormatted
-	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
-	]
-	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
-	
-	[ReportSectionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
-	]
-	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
-	
-	[DataReferenceIdentifier
-	  |
-	  +hashCode: int
-	  |
-	  +bool ==()
-	]
-	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
-	
-	[DataReferenceEditor
-	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
-	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
-	]
-	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
-	
-	[AverageSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
-	
-	[LinearRegressionSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="503.0" width="3199.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M204.2 231.4 L204 233 L204 299 L204.0 299.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M211.0 223.1 L204.2 231.4 L200.4 221.4 L207.2 213.0 Z"></path>
-					</g>
-					<path d="M387.1 223.9 L399.75 233 L455.01993865030676 299 L455.0 299.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M382.7 214.1 L387.1 223.9 L376.4 222.8 L372.0 213.0 Z"></path>
-					</g>
-					<path d="M733.3 231.4 L733.5 233 L733.5 299 L733.5 299.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M737.1 221.4 L733.3 231.4 L726.5 223.1 L730.3 213.0 Z"></path>
-					</g>
-					<path d="M549.7 223.9 L537 233 L481.1226993865031 299 L481.1 299.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M560.4 222.8 L549.7 223.9 L554.2 214.1 L564.9 213.0 Z"></path>
-					</g>
-					<path d="M1269.1 263.9 L1281 261 L1288.5 261 L1288.5 261 L1296 314.5 L1296 314.5 L1288.5 368 L1288.5 368 L1281 368 L1281 368 L1251 360.7539503386005 L1251.0 360.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1258.8 260.9 L1269.1 263.9 L1261.3 271.2 L1251.0 268.2 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1059.5 135.3 L1059.5 233 L1059.5 261 L1059.5 261.0 " fill="none"></path>
-					</g>
-					<path d="M1064.8 135.3 L1059.5 135.3 L1054.2 135.3 L1059.5 122.0 Z"></path>
-					<path d="M1443.0 135.3 L1443 233 L1443 268 L1443.0 268.0 " fill="none"></path>
-					<path d="M1448.3 135.3 L1443.0 135.3 L1437.7 135.3 L1443.0 122.0 Z"></path>
-					<path d="M1819.7 188.4 L1773.25 233 L1773.25 299 L1773.3 299.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1830.1 185.8 L1819.7 188.4 L1822.7 178.1 L1833.1 175.5 Z"></path>
-					</g>
-					<path d="M1970.5 190.2 L2004 233 L2004 299 L2004.0 299.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1969.0 179.6 L1970.5 190.2 L1960.6 186.1 L1959.0 175.5 Z"></path>
-					</g>
-					<path d="M2385.0 394.7 L2385 396 L2531.1971830985917 416 L2531.2 416.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2390.3 385.3 L2385.0 394.7 L2379.7 385.3 L2385.0 376.0 Z"></path>
-					</g>
-					<path d="M2600.7 127.8 L2385 233 L2385 253 L2385.0 253.0 " fill="none"></path>
-					<path d="M2603.1 132.6 L2600.7 127.8 L2598.4 123.0 L2612.7 122.0 Z"></path>
-					<path d="M2904.0 394.7 L2904 396 L2757.8028169014083 416 L2757.8 416.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2909.3 385.3 L2904.0 394.7 L2898.7 385.3 L2904.0 376.0 Z"></path>
-					</g>
-					<path d="M2688.3 127.8 L2904 233 L2904 253 L2904.0 253.0 " fill="none"></path>
-					<path d="M2690.6 123.0 L2688.3 127.8 L2685.9 132.6 L2676.3 122.0 Z"></path>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="0.0" y="0.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M0.0 31.0 L448.0 31.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M0.0 137.0 L448.0 137.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-						</g>
-						<g transform="translate(0, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="111.0" y="299.0" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
-						</g>
-						<g transform="translate(111, 299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="424.5" y="299.0" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(424.5, 299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="488.0" y="0.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M488.0 31.0 L939.0 31.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M488.0 137.0 L939.0 137.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-						</g>
-						<g transform="translate(488, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(488, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(488, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="639.0" y="299.0" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
-						</g>
-						<g transform="translate(639, 299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="868.0" y="261.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M868.0 292.0 L1251.0 292.0" fill="none" data-name="ReportSectionType"></path>
-						</g>
-						<g transform="translate(868, 261)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(868, 292)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="1029.0" y="91.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(1029, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="1341.0" y="268.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M1341.0 299.0 L1545.0 299.0" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M1341.0 330.0 L1545.0 330.0" fill="none" data-name="DataReferenceIdentifier"></path>
-						</g>
-						<g transform="translate(1341, 268)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1341, 299)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1341, 330)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="1375.5" y="91.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(1375.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="1550.5" y="37.5" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M1550.5 68.5 L2259.5 68.5" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M1550.5 129.5 L2259.5 129.5" fill="none" data-name="DataReferenceEditor"></path>
-						</g>
-						<g transform="translate(1550.5, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1550.5, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1550.5, 129.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="1716.8" y="299.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(1716.75, 299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="1902.5" y="299.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
-						</g>
-						<g transform="translate(1902.5, 299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="2145.5" y="253.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M2145.5 284.0 L2624.5 284.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M2145.5 345.0 L2624.5 345.0" fill="none" data-name="AverageSectionFormView"></path>
-						</g>
-						<g transform="translate(2145.5, 253)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2145.5, 284)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2145.5, 345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="2530.5" y="416.0" height="31.0" width="228.0" data-name="ReportItemFormViewModel"></rect>
-						</g>
-						<g transform="translate(2530.5, 416)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
-								<text x="106.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="2568.5" y="91.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(2568.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="2664.5" y="253.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M2664.5 284.0 L3143.5 284.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M2664.5 345.0 L3143.5 345.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-						</g>
-						<g transform="translate(2664.5, 253)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2664.5, 284)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2664.5, 345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/reports/section/uml.svg b/docs/uml/designer_v2/lib/features/design/reports/section/uml.svg
deleted file mode 100644
index 61458f4da..000000000
--- a/docs/uml/designer_v2/lib/features/design/reports/section/uml.svg
+++ /dev/null
@@ -1,705 +0,0 @@
-<svg version="1.1" baseProfile="full" width="3731.5" height="1237.0" viewbox="0 0 3731.5 1237" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[ReportItemFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
-	  |
-	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
-	]
-	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
-	
-	[TemporalAggregationFormatted
-	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
-	]
-	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
-	
-	[ImprovementDirectionFormatted
-	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
-	]
-	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
-	
-	[ReportSectionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
-	]
-	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
-	
-	[DataReferenceIdentifier
-	  |
-	  +hashCode: int
-	  |
-	  +bool ==()
-	]
-	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
-	
-	[DataReferenceEditor
-	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
-	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
-	]
-	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
-	
-	[AverageSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
-	
-	[LinearRegressionSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
-	
-	[ReportItemFormData
-	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
-	  +id: String
-	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
-	]
-	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
-	
-	[ReportItemFormViewModel
-	  |
-	  &lt;static&gt;+defaultSectionType: ReportSectionType;
-	  +sectionIdControl: FormControl&lt;String&gt;;
-	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +sectionControl: FormControl&lt;ReportSection&gt;;
-	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
-	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
-	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
-	  +alphaControl: FormControl&lt;double&gt;;
-	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +form: FormGroup;
-	  +sectionId: String;
-	  +sectionType: ReportSectionType;
-	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
-	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
-	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +dataReferenceRequired: dynamic;
-	  +aggregationRequired: dynamic;
-	  +improvementDirectionRequired: dynamic;
-	  +alphaConfidenceRequired: dynamic
-	  |
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +ReportItemFormData buildFormData();
-	  +ReportItemFormViewModel createDuplicate();
-	  +dynamic onSectionTypeChanged();
-	  -void _updateFormControls();
-	  +void setControlsFrom()
-	]
-	
-	[ReportItemFormViewModel]o-[ReportSectionType]
-	[ReportItemFormViewModel]o-[FormControl]
-	[ReportItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="1237.0" width="3731.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M642.0 373.5 L1107.25 441 L1678.5 605.4405963841277 L1678.5 605.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M633.5 366.9 L642.0 373.5 L632.0 377.5 L623.5 370.9 Z"></path>
-					</g>
-					<path d="M370.3 439.3 L370 441 L370 732 L370.0 732.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M377.3 431.2 L370.3 439.3 L366.8 429.2 L373.8 421.0 Z"></path>
-					</g>
-					<path d="M756.7 231.4 L756.5 233 L756.5 321.5 L756.5 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M763.5 223.1 L756.7 231.4 L752.9 221.4 L759.7 213.0 Z"></path>
-					</g>
-					<path d="M964.1 222.8 L980.5 233 L1038.578125 321.5 L1038.6 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M959.0 213.4 L964.1 222.8 L953.4 222.5 L948.2 213.0 Z"></path>
-					</g>
-					<path d="M1313.3 230.4 L1314.25 233 L1314.25 321.5 L1314.3 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1314.9 219.8 L1313.3 230.4 L1305.0 223.6 L1306.6 213.0 Z"></path>
-					</g>
-					<path d="M1102.2 223.9 L1089.5 233 L1054.8233173076924 321.5 L1054.8 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1112.9 222.8 L1102.2 223.9 L1106.7 214.1 L1117.4 213.0 Z"></path>
-					</g>
-					<path d="M401.6 1109.9 L831.3333333333333 1074 L943.4166666666666 1074 L943.4166666666666 1074 L1055.5 1127.5 L1055.5 1127.5 L943.4166666666666 1181 L943.4166666666666 1181 L831.3333333333333 1181 L831.3333333333333 1181 L383 1143.5123730138057 L383.0 1143.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M391.9 1105.4 L401.6 1109.9 L392.7 1116.0 L383.0 1111.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M171.5 776.3 L171.5 1054 L176.9421768707483 1074 L176.9 1074.0 " fill="none"></path>
-					</g>
-					<path d="M176.8 776.3 L171.5 776.3 L166.2 776.3 L171.5 763.0 Z"></path>
-					<path d="M1599.0 135.3 L1599 233 L1599 290.5 L1599.0 290.5 " fill="none"></path>
-					<path d="M1604.3 135.3 L1599.0 135.3 L1593.7 135.3 L1599.0 122.0 Z"></path>
-					<path d="M2687.0 803.2 L1008 1054 L2095.5 1123.8699737762238 L2095.5 1123.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2697.1 807.1 L2687.0 803.2 L2695.5 796.6 L2705.5 800.5 Z"></path>
-					</g>
-					<path d="M3060.0 835.2 L3060 1054 L3060 1112 L3060.0 1112.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3065.3 825.8 L3060.0 835.2 L3054.7 825.8 L3060.0 816.5 Z"></path>
-					</g>
-					<path d="M1980.5 417.2 L1980.5 441 L1992.9959216965742 461 L1993.0 461.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1985.8 407.8 L1980.5 417.2 L1975.2 407.8 L1980.5 398.5 Z"></path>
-					</g>
-					<path d="M2196.2 127.8 L1980.5 233 L1980.5 275.5 L1980.5 275.5 " fill="none"></path>
-					<path d="M2198.6 132.6 L2196.2 127.8 L2193.9 123.0 L2208.2 122.0 Z"></path>
-					<path d="M2499.5 417.2 L2499.5 441 L2478.1296900489397 461 L2478.1 461.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2504.8 407.8 L2499.5 417.2 L2494.2 407.8 L2499.5 398.5 Z"></path>
-					</g>
-					<path d="M2283.8 127.8 L2499.5 233 L2499.5 275.5 L2499.5 275.5 " fill="none"></path>
-					<path d="M2286.1 123.0 L2283.8 127.8 L2281.4 132.6 L2271.8 122.0 Z"></path>
-					<path d="M3518.5 424.7 L3518.5 441 L3518.5 732 L3518.5 732.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3523.8 415.3 L3518.5 424.7 L3513.2 415.3 L3518.5 406.0 Z"></path>
-					</g>
-					<path d="M3518.5 135.3 L3518.5 233 L3518.5 268 L3518.5 268.0 " fill="none"></path>
-					<path d="M3523.8 135.3 L3518.5 135.3 L3513.2 135.3 L3518.5 122.0 Z"></path>
-					<path d="M1660.4 877.7 L968 1054 L383 1109.3734707018673 L383.0 1109.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1670.8 880.6 L1660.4 877.7 L1668.1 870.3 L1678.5 873.1 Z"></path>
-					</g>
-					<path d="M2172.0 1052.7 L2172 1054 L2156.21768707483 1112 L2156.2 1112.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2177.3 1043.3 L2172.0 1052.7 L2166.7 1043.3 L2172.0 1034.0 Z"></path>
-					</g>
-					<path d="M2581.1 1045.0 L2593.5 1054 L2593.5 1112 L2593.5 1112.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2576.7 1035.2 L2581.1 1045.0 L2570.4 1043.8 L2566.0 1034.0 Z"></path>
-					</g>
-					<path d="M2886.5 365.8 L2886.5 441 L2665.5 535.8026592022393 L2665.5 535.8 " fill="none"></path>
-					<path d="M2891.8 365.8 L2886.5 365.8 L2881.2 365.8 L2886.5 352.5 Z"></path>
-					<g data-name="ReportItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="156.5" y="253.0" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M156.5 284.0 L623.5 284.0" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M156.5 360.0 L623.5 360.0" fill="none" data-name="ReportItemFormView"></path>
-						</g>
-						<g transform="translate(156.5, 253)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
-								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(156.5, 284)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(156.5, 360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="1678.5" y="461.0" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M1678.5 492.0 L2665.5 492.0" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M1678.5 928.0 L2665.5 928.0" fill="none" data-name="ReportItemFormViewModel"></path>
-						</g>
-						<g transform="translate(1678.5, 461)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
-								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1678.5, 492)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1678.5, 928)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="242.0" y="732.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
-						</g>
-						<g transform="translate(242, 732)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="552.5" y="0.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M552.5 31.0 L1000.5 31.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M552.5 137.0 L1000.5 137.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-						</g>
-						<g transform="translate(552.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(552.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(552.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="663.5" y="321.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
-						</g>
-						<g transform="translate(663.5, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="1005.3" y="321.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(1005.25, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="1040.5" y="0.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M1040.5 31.0 L1491.5 31.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M1040.5 137.0 L1491.5 137.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-						</g>
-						<g transform="translate(1040.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1040.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1040.5, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="1219.8" y="321.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
-						</g>
-						<g transform="translate(1219.75, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="0.0" y="1074.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M0.0 1105.0 L383.0 1105.0" fill="none" data-name="ReportSectionType"></path>
-						</g>
-						<g transform="translate(0, 1074)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 1105)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="141.0" y="732.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(141, 732)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="1497.0" y="290.5" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M1497.0 321.5 L1701.0 321.5" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M1497.0 352.5 L1701.0 352.5" fill="none" data-name="DataReferenceIdentifier"></path>
-						</g>
-						<g transform="translate(1497, 290.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1497, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1497, 352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="1531.5" y="91.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(1531.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="2705.5" y="678.5" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M2705.5 709.5 L3414.5 709.5" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M2705.5 770.5 L3414.5 770.5" fill="none" data-name="DataReferenceEditor"></path>
-						</g>
-						<g transform="translate(2705.5, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2705.5, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2705.5, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="2095.5" y="1112.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(2095.5, 1112)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="2958.5" y="1112.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
-						</g>
-						<g transform="translate(2958.5, 1112)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="1741.0" y="275.5" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M1741.0 306.5 L2220.0 306.5" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M1741.0 367.5 L2220.0 367.5" fill="none" data-name="AverageSectionFormView"></path>
-						</g>
-						<g transform="translate(1741, 275.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1741, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1741, 367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="2164.0" y="91.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(2164, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="2260.0" y="275.5" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M2260.0 306.5 L2739.0 306.5" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M2260.0 367.5 L2739.0 367.5" fill="none" data-name="LinearRegressionSectionFormView"></path>
-						</g>
-						<g transform="translate(2260, 275.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2260, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2260, 367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="3361.5" y="268.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M3361.5 299.0 L3675.5 299.0" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M3361.5 360.0 L3675.5 360.0" fill="none" data-name="ReportItemFormData"></path>
-						</g>
-						<g transform="translate(3361.5, 268)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3361.5, 299)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3361.5, 360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="3454.5" y="732.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(3454.5, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="3469.5" y="91.0" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(3469.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="2541.0" y="1112.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(2541, 1112)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="2779.0" y="321.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(2779, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/reports/uml.svg b/docs/uml/designer_v2/lib/features/design/reports/uml.svg
deleted file mode 100644
index c1d5b37ce..000000000
--- a/docs/uml/designer_v2/lib/features/design/reports/uml.svg
+++ /dev/null
@@ -1,1170 +0,0 @@
-<svg version="1.1" baseProfile="full" width="6781.0" height="1414.0" viewbox="0 0 6781 1414" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[ReportBadge
-	  |
-	  +status: ReportStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
-	  |
-	  +Widget build()
-	]
-	
-	[ReportBadge]o-[ReportStatus]
-	[ReportBadge]o-[BadgeType]
-	
-	[ReportsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +reportItemDelegate: ReportFormItemDelegate;
-	  +reportItemArray: FormArray&lt;dynamic&gt;;
-	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +form: FormGroup;
-	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestConsent: bool
-	  |
-	  +void setControlsFrom();
-	  +ReportsFormData buildFormData();
-	  +void read();
-	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
-	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
-	  +dynamic testReport();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide()
-	]
-	
-	[ReportsFormViewModel]o-[Study]
-	[ReportsFormViewModel]o-[GoRouter]
-	[ReportsFormViewModel]o-[ReportFormItemDelegate]
-	[ReportsFormViewModel]o-[FormArray]
-	[ReportsFormViewModel]o-[FormViewModelCollection]
-	[ReportsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
-	
-	[ReportFormItemDelegate
-	  |
-	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +owner: ReportsFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
-	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
-	]
-	
-	[ReportFormItemDelegate]o-[FormViewModelCollection]
-	[ReportFormItemDelegate]o-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
-	
-	[StudyDesignReportsFormView
-	  |
-	  +Widget build();
-	  -dynamic _showReportItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
-	
-	[ReportsFormData
-	  |
-	  +reportItems: List&lt;ReportItemFormData&gt;;
-	  +id: String
-	  |
-	  +Study apply();
-	  +ReportsFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
-	
-	[ReportStatus
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
-	  &lt;static&gt;+primary: ReportStatus;
-	  &lt;static&gt;+secondary: ReportStatus
-	]
-	
-	[ReportStatus]o-[ReportStatus]
-	[Enum]&lt;:--[ReportStatus]
-	
-	[ReportItemFormViewModel
-	  |
-	  &lt;static&gt;+defaultSectionType: ReportSectionType;
-	  +sectionIdControl: FormControl&lt;String&gt;;
-	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +sectionControl: FormControl&lt;ReportSection&gt;;
-	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
-	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
-	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
-	  +alphaControl: FormControl&lt;double&gt;;
-	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +form: FormGroup;
-	  +sectionId: String;
-	  +sectionType: ReportSectionType;
-	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
-	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
-	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +dataReferenceRequired: dynamic;
-	  +aggregationRequired: dynamic;
-	  +improvementDirectionRequired: dynamic;
-	  +alphaConfidenceRequired: dynamic
-	  |
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +ReportItemFormData buildFormData();
-	  +ReportItemFormViewModel createDuplicate();
-	  +dynamic onSectionTypeChanged();
-	  -void _updateFormControls();
-	  +void setControlsFrom()
-	]
-	
-	[ReportItemFormViewModel]o-[ReportSectionType]
-	[ReportItemFormViewModel]o-[FormControl]
-	[ReportItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
-	
-	[ReportItemFormData
-	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
-	  +id: String
-	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
-	]
-	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
-	
-	[ReportItemFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
-	  |
-	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
-	]
-	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
-	
-	[TemporalAggregationFormatted
-	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
-	]
-	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
-	
-	[ImprovementDirectionFormatted
-	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
-	]
-	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
-	
-	[ReportSectionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
-	]
-	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
-	
-	[DataReferenceIdentifier
-	  |
-	  +hashCode: int
-	  |
-	  +bool ==()
-	]
-	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
-	
-	[LinearRegressionSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
-	
-	[DataReferenceEditor
-	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
-	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
-	]
-	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
-	
-	[AverageSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="1414.0" width="6781.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M92.8 835.1 L78.5 1054 L424.5 1142.1550855991943 L424.5 1142.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M98.7 826.2 L92.8 835.1 L88.1 825.5 L94.0 816.5 Z"></path>
-					</g>
-					<path d="M159.6 831.6 L321 1054 L125.76284584980237 1165 L125.8 1165.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M158.4 820.9 L159.6 831.6 L149.8 827.2 L148.6 816.5 Z"></path>
-					</g>
-					<path d="M576.5 934.1 L444.5 1054 L249.26284584980237 1165 L249.3 1165.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M587.0 931.7 L576.5 934.1 L579.8 923.8 L590.3 921.5 Z"></path>
-					</g>
-					<path d="M645.5 936.6 L561 1054 L365.7628458498024 1165 L365.8 1165.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M655.3 932.2 L645.5 936.6 L646.6 926.0 L656.4 921.5 Z"></path>
-					</g>
-					<path d="M756.2 940.0 L741 1054 L1335.5 1128.0199311023623 L1335.5 1128.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M762.7 931.5 L756.2 940.0 L752.1 930.0 L758.6 921.5 Z"></path>
-					</g>
-					<path d="M918.9 936.6 L1004 1054 L1004 1165 L1004.0 1165.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M917.7 925.9 L918.9 936.6 L909.1 932.2 L907.9 921.5 Z"></path>
-					</g>
-					<path d="M971.7 934.6 L1093 1054 L1093 1180.5 L1093 1180.5 L1093 1307 L1093 1307 L1207.0845070422536 1327 L1207.1 1327.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M968.8 924.2 L971.7 934.6 L961.4 931.8 L958.4 921.5 Z"></path>
-					</g>
-					<path d="M1141.9 929.9 L1386.75 1054 L3061.75 1176.6555716353112 L3061.8 1176.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1135.9 921.0 L1141.9 929.9 L1131.1 930.5 L1125.2 921.5 Z"></path>
-					</g>
-					<path d="M741.8 365.8 L741.75 441 L759.0420065252855 573.5 L759.0 573.5 " fill="none"></path>
-					<path d="M747.1 365.8 L741.8 365.8 L736.4 365.8 L741.8 352.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1435.0 353.3 L781.75 441 L781.75 573.5 L781.8 573.5 " fill="none"></path>
-					</g>
-					<path d="M1435.7 358.6 L1435.0 353.3 L1434.3 348.0 L1448.3 351.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1983.9 362.0 L1906 441 L1211.75 630.2707360462531 L1211.8 630.3 " fill="none"></path>
-					</g>
-					<path d="M1987.7 365.7 L1983.9 362.0 L1980.1 358.3 L1993.2 352.5 Z"></path>
-					<path d="M1757.0 1305.7 L1757 1307 L1405 1334.076923076923 L1405.0 1334.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1762.3 1296.3 L1757.0 1305.7 L1751.7 1296.3 L1757.0 1287.0 Z"></path>
-					</g>
-					<path d="M1461.5 1067.3 L1426.75 1054 L1147.9163947797715 921.5 L1147.9 921.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1468.3 1075.6 L1461.5 1067.3 L1472.2 1065.7 L1479.0 1074.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1615.5 356.8 L1866 441 L1866 747.5 L1866 747.5 L1866 1054 L1866 1054 L1848.7667984189723 1074 L1848.8 1074.0 " fill="none"></path>
-					</g>
-					<path d="M1617.2 351.7 L1615.5 356.8 L1613.8 361.8 L1602.8 352.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1638.3 776.3 L1638.25 1054 L1657.0247035573123 1074 L1657.0 1074.0 " fill="none"></path>
-					</g>
-					<path d="M1643.6 776.3 L1638.3 776.3 L1632.9 776.3 L1638.3 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M2093.1 355.3 L2489 441 L2489 747.5 L2489 747.5 L2489 1054 L2489 1054 L2178.5 1107.65881147541 L2178.5 1107.7 " fill="none"></path>
-					</g>
-					<path d="M2094.3 350.1 L2093.1 355.3 L2092.0 360.5 L2080.1 352.5 Z"></path>
-					<path d="M2341.5 135.3 L2341.5 233 L2341.5 298.5 L2341.5 298.5 " fill="none"></path>
-					<path d="M2346.8 135.3 L2341.5 135.3 L2336.2 135.3 L2341.5 122.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M2747.0 135.3 L2747 233 L2747 275.5 L2747.0 275.5 " fill="none"></path>
-					</g>
-					<path d="M2752.3 135.3 L2747.0 135.3 L2741.7 135.3 L2747.0 122.0 Z"></path>
-					<path d="M743.8 1147.5 L848.5 1127 L879.25 1127 L879.25 1127 L910 1180.5 L910 1180.5 L879.25 1234 L879.25 1234 L848.5 1234 L848.5 1234 L725.5 1209.9396709323582 L725.5 1209.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M733.6 1144.0 L743.8 1147.5 L735.7 1154.5 L725.5 1151.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1785.5 776.1 L1734.5 1054 L725.5 1164.0806382061232 L725.5 1164.1 " fill="none"></path>
-					</g>
-					<path d="M1790.7 777.1 L1785.5 776.1 L1780.3 775.2 L1787.9 763.0 Z"></path>
-					<path d="M3179.5 915.1 L2755.75 1054 L3206.75 1142.7961089494163 L3206.8 1142.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3190.0 917.2 L3179.5 915.1 L3186.7 907.1 L3197.3 909.3 Z"></path>
-					</g>
-					<path d="M3802.8 1051.5 L3803.75 1054 L4094.1926877470355 1165 L4094.2 1165.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3804.6 1040.9 L3802.8 1051.5 L3794.6 1044.6 L3796.4 1034.0 Z"></path>
-					</g>
-					<path d="M4200.6 1028.1 L4247.75 1054 L3166.75 1174.6409351565947 L3166.8 1174.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4195.0 1018.9 L4200.6 1028.1 L4189.9 1028.2 L4184.3 1019.1 Z"></path>
-					</g>
-					<path d="M3063.5 365.8 L3063.5 441 L3197.25 506.3557194101236 L3197.3 506.4 " fill="none"></path>
-					<path d="M3068.8 365.8 L3063.5 365.8 L3058.2 365.8 L3063.5 352.5 Z"></path>
-					<path d="M6568.0 424.7 L6568 441 L6568 732 L6568.0 732.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6573.3 415.3 L6568.0 424.7 L6562.7 415.3 L6568.0 406.0 Z"></path>
-					</g>
-					<path d="M6568.0 135.3 L6568 233 L6568 268 L6568.0 268.0 " fill="none"></path>
-					<path d="M6573.3 135.3 L6568.0 135.3 L6562.7 135.3 L6568.0 122.0 Z"></path>
-					<path d="M3737.6 380.5 L3387 441 L3406.820554649266 461 L3406.8 461.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3747.7 384.1 L3737.6 380.5 L3745.9 373.6 L3756.0 377.3 Z"></path>
-					</g>
-					<path d="M4241.4 379.2 L4611 441 L5076.457585644372 732 L5076.5 732.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4233.1 372.4 L4241.4 379.2 L4231.3 382.9 L4223.0 376.1 Z"></path>
-					</g>
-					<path d="M3550.9 169.1 L3304 233 L3304 321.5 L3304.0 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3561.3 171.9 L3550.9 169.1 L3558.6 161.6 L3569.0 164.4 Z"></path>
-					</g>
-					<path d="M4035.6 129.8 L5112.75 233 L5195.931490384615 321.5 L5195.9 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4026.8 123.6 L4035.6 129.8 L4025.8 134.2 L4017.0 128.0 Z"></path>
-					</g>
-					<path d="M5660.7 231.4 L5660.5 233 L5877.920673076923 321.5 L5877.9 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5667.5 223.1 L5660.7 231.4 L5656.9 221.4 L5663.7 213.0 Z"></path>
-					</g>
-					<path d="M5700.3 231.4 L5700.5 233 L5254 327.7673469387755 L5254.0 327.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5704.1 221.4 L5700.3 231.4 L5693.5 223.1 L5697.3 213.0 Z"></path>
-					</g>
-					<path d="M3608.3 1157.4 L3885.4166666666665 1127 L3959.3333333333335 1127 L3959.3333333333335 1127 L4033.25 1180.5 L4033.25 1180.5 L3959.3333333333335 1234 L3959.3333333333335 1234 L3885.4166666666665 1234 L3885.4166666666665 1234 L3589.75 1201.5302771125555 L3589.8 1201.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3598.4 1153.1 L3608.3 1157.4 L3599.6 1163.8 L3589.8 1159.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1792.6 776.3 L1810.75 1054 L3206.75 1165.24031496063 L3206.8 1165.2 " fill="none"></path>
-					</g>
-					<path d="M1798.0 776.0 L1792.6 776.3 L1787.3 776.7 L1791.8 763.0 Z"></path>
-					<path d="M6269.0 135.3 L6269 233 L6269 290.5 L6269.0 290.5 " fill="none"></path>
-					<path d="M6274.3 135.3 L6269.0 135.3 L6263.7 135.3 L6269.0 122.0 Z"></path>
-					<path d="M4887.5 417.2 L4887.5 441 L4184.25 621.1095675788595 L4184.3 621.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4892.8 407.8 L4887.5 417.2 L4882.2 407.8 L4887.5 398.5 Z"></path>
-					</g>
-					<path d="M5274.2 130.6 L5152.75 233 L5044.354567307692 275.5 L5044.4 275.5 " fill="none"></path>
-					<path d="M5277.6 134.7 L5274.2 130.6 L5270.7 126.5 L5284.4 122.0 Z"></path>
-					<path d="M4578.8 835.2 L4578.75 1054 L4189.153162055336 1165 L4189.2 1165.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4584.1 825.8 L4578.8 835.2 L4573.4 825.8 L4578.8 816.5 Z"></path>
-					</g>
-					<path d="M4612.3 833.9 L4697.75 1054 L4697.75 1165 L4697.8 1165.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4613.9 823.3 L4612.3 833.9 L4603.9 827.1 L4605.5 816.5 Z"></path>
-					</g>
-					<path d="M5542.0 417.2 L5542 441 L4184.25 665.7942606347062 L4184.3 665.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5547.3 407.8 L5542.0 417.2 L5536.7 407.8 L5542.0 398.5 Z"></path>
-					</g>
-					<path d="M5331.4 130.6 L5453.5 233 L5489.665865384615 275.5 L5489.7 275.5 " fill="none"></path>
-					<path d="M5334.9 126.5 L5331.4 130.6 L5328.0 134.7 L5321.2 122.0 Z"></path>
-					<g data-name="ReportBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="0.0" y="678.5" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M0.0 709.5 L197.0 709.5" fill="none" data-name="ReportBadge"></path>
-							<path d="M0.0 785.5 L197.0 785.5" fill="none" data-name="ReportBadge"></path>
-						</g>
-						<g transform="translate(0, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="424.5" y="1127.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M424.5 1158.0 L725.5 1158.0" fill="none" data-name="ReportStatus"></path>
-						</g>
-						<g transform="translate(424.5, 1127)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
-								
-							</g>
-						</g>
-						<g transform="translate(424.5, 1158)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="45.5" y="1165.0" height="31.0" width="106.0" data-name="BadgeType"></rect>
-						</g>
-						<g transform="translate(45.5, 1165)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="351.8" y="573.5" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M351.8 604.5 L1211.8 604.5" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M351.8 770.5 L1211.8 770.5" fill="none" data-name="ReportsFormViewModel"></path>
-						</g>
-						<g transform="translate(351.75, 573.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
-								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(351.75, 604.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(351.75, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="191.5" y="1165.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(191.5, 1165)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="292.5" y="1165.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(292.5, 1165)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportFormItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="1335.5" y="1074.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M1335.5 1105.0 L2178.5 1105.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M1335.5 1181.0 L2178.5 1181.0" fill="none" data-name="ReportFormItemDelegate"></path>
-						</g>
-						<g transform="translate(1335.5, 1074)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
-								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1335.5, 1105)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1335.5, 1181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="955.0" y="1165.0" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(955, 1165)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="1186.0" y="1327.0" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
-						</g>
-						<g transform="translate(1186, 1327)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="3061.8" y="1165.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(3061.75, 1165)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="671.3" y="321.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(671.25, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="1448.3" y="321.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-						</g>
-						<g transform="translate(1448.25, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="1912.0" y="321.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-						</g>
-						<g transform="translate(1912, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="1556.3" y="732.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(1556.25, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignReportsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="2145.0" y="298.5" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M2145.0 329.5 L2538.0 329.5" fill="none" data-name="StudyDesignReportsFormView"></path>
-						</g>
-						<g transform="translate(2145, 298.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2145, 329.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="2235.5" y="91.0" height="31.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-						</g>
-						<g transform="translate(2235.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="2578.0" y="275.5" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M2578.0 306.5 L2916.0 306.5" fill="none" data-name="ReportsFormData"></path>
-							<path d="M2578.0 352.5 L2916.0 352.5" fill="none" data-name="ReportsFormData"></path>
-						</g>
-						<g transform="translate(2578, 275.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2578, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2578, 352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="2675.5" y="91.0" height="31.0" width="143.0" data-name="IStudyFormData"></rect>
-						</g>
-						<g transform="translate(2675.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="1760.3" y="732.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(1760.25, 732)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="3197.3" y="461.0" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M3197.3 492.0 L4184.3 492.0" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M3197.3 928.0 L4184.3 928.0" fill="none" data-name="ReportItemFormViewModel"></path>
-						</g>
-						<g transform="translate(3197.25, 461)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
-								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3197.25, 492)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3197.25, 928)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="3206.8" y="1127.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M3206.8 1158.0 L3589.8 1158.0" fill="none" data-name="ReportSectionType"></path>
-						</g>
-						<g transform="translate(3206.75, 1127)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3206.75, 1158)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="4078.3" y="1165.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(4078.25, 1165)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="2956.0" y="321.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(2956, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="6411.0" y="268.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M6411.0 299.0 L6725.0 299.0" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M6411.0 360.0 L6725.0 360.0" fill="none" data-name="ReportItemFormData"></path>
-						</g>
-						<g transform="translate(6411, 268)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6411, 299)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6411, 360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="6504.0" y="732.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(6504, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="6519.0" y="91.0" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(6519, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="3756.0" y="253.0" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M3756.0 284.0 L4223.0 284.0" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M3756.0 360.0 L4223.0 360.0" fill="none" data-name="ReportItemFormView"></path>
-						</g>
-						<g transform="translate(3756, 253)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
-								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3756, 284)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3756, 360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="4973.3" y="732.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
-						</g>
-						<g transform="translate(4973.25, 732)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="3569.0" y="0.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M3569.0 31.0 L4017.0 31.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M3569.0 137.0 L4017.0 137.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-						</g>
-						<g transform="translate(3569, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3569, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3569, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="3211.0" y="321.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
-						</g>
-						<g transform="translate(3211, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="5167.0" y="321.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(5167, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="5455.0" y="0.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M5455.0 31.0 L5906.0 31.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M5455.0 137.0 L5906.0 137.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-						</g>
-						<g transform="translate(5455, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5455, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5455, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="5821.5" y="321.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
-						</g>
-						<g transform="translate(5821.5, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="6167.0" y="290.5" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M6167.0 321.5 L6371.0 321.5" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M6167.0 352.5 L6371.0 352.5" fill="none" data-name="DataReferenceIdentifier"></path>
-						</g>
-						<g transform="translate(6167, 290.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6167, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6167, 352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="6201.5" y="91.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(6201.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="4648.0" y="275.5" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M4648.0 306.5 L5127.0 306.5" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M4648.0 367.5 L5127.0 367.5" fill="none" data-name="LinearRegressionSectionFormView"></path>
-						</g>
-						<g transform="translate(4648, 275.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4648, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4648, 367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="5226.8" y="91.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(5226.75, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="4224.3" y="678.5" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M4224.3 709.5 L4933.3 709.5" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M4224.3 770.5 L4933.3 770.5" fill="none" data-name="DataReferenceEditor"></path>
-						</g>
-						<g transform="translate(4224.25, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4224.25, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4224.25, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="4596.3" y="1165.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
-						</g>
-						<g transform="translate(4596.25, 1165)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="5302.5" y="275.5" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M5302.5 306.5 L5781.5 306.5" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M5302.5 367.5 L5781.5 367.5" fill="none" data-name="AverageSectionFormView"></path>
-						</g>
-						<g transform="translate(5302.5, 275.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5302.5, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5302.5, 367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/types/uml.svg b/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/types/uml.svg
deleted file mode 100644
index 52be35c24..000000000
--- a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/types/uml.svg
+++ /dev/null
@@ -1,272 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2037.0" height="367.0" viewbox="0 0 2037 367" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[SurveyQuestionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
-	]
-	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	]
-	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
-	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
-	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
-	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
-	]
-	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="367.0" width="2037.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M380.8 106.5 L393 102.5 L400.5 102.5 L400.5 102.5 L408 171 L408 171 L400.5 239.5 L400.5 239.5 L393 239.5 L393 239.5 L363 229.7836879432624 L363.0 229.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M370.2 104.3 L380.8 106.5 L373.5 114.4 L363.0 112.2 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M181.5 59.8 L181.5 82 L181.5 102.5 L181.5 102.5 " fill="none"></path>
-					</g>
-					<path d="M186.8 59.8 L181.5 59.8 L176.2 59.8 L181.5 46.5 Z"></path>
-					<path d="M629.0 220.7 L629 260 L1111 289.1003401360544 L1111.0 289.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M634.3 211.3 L629.0 220.7 L623.7 211.3 L629.0 202.0 Z"></path>
-					</g>
-					<path d="M1021.0 236.2 L1021 260 L1131.4225352112676 280 L1131.4 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1026.3 226.8 L1021.0 236.2 L1015.7 226.8 L1021.0 217.5 Z"></path>
-					</g>
-					<path d="M1323.8 42.6 L1021 82 L1021 124.5 L1021.0 124.5 " fill="none"></path>
-					<path d="M1324.5 47.9 L1323.8 42.6 L1323.1 37.3 L1337.0 40.9 Z"></path>
-					<path d="M1413.0 236.2 L1413 260 L1302.5774647887324 280 L1302.6 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1418.3 226.8 L1413.0 236.2 L1407.7 226.8 L1413.0 217.5 Z"></path>
-					</g>
-					<path d="M1413.0 59.8 L1413 82 L1413 124.5 L1413.0 124.5 " fill="none"></path>
-					<path d="M1418.3 59.8 L1413.0 59.8 L1407.7 59.8 L1413.0 46.5 Z"></path>
-					<path d="M1805.0 258.7 L1805 260 L1323 289.1003401360544 L1323.0 289.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1810.3 249.3 L1805.0 258.7 L1799.7 249.3 L1805.0 240.0 Z"></path>
-					</g>
-					<path d="M1502.2 42.6 L1805 82 L1805 102 L1805.0 102.0 " fill="none"></path>
-					<path d="M1502.9 37.3 L1502.2 42.6 L1501.5 47.9 L1489.0 40.9 Z"></path>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="0.0" y="102.5" height="137.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M0.0 133.5 L363.0 133.5" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(0, 102.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 133.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="151.0" y="15.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(151, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="424.0" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M424.0 31.0 L733.0 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(424, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(424, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="453.0" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M453.0 171.0 L805.0 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
-						</g>
-						<g transform="translate(453, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(453, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="1111.0" y="280.0" height="31.0" width="212.0" data-name="QuestionFormViewModel"></rect>
-						</g>
-						<g transform="translate(1111, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="845.0" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M845.0 155.5 L1197.0 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M845.0 186.5 L1197.0 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-						</g>
-						<g transform="translate(845, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(845, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(845, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="1337.0" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(1337, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="1237.0" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M1237.0 155.5 L1589.0 155.5" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M1237.0 186.5 L1589.0 186.5" fill="none" data-name="BoolQuestionFormView"></path>
-						</g>
-						<g transform="translate(1237, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1237, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1237, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="1629.0" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M1629.0 133.0 L1981.0 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M1629.0 179.0 L1981.0 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-						</g>
-						<g transform="translate(1629, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1629, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1629, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/uml.svg b/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/uml.svg
deleted file mode 100644
index 13434ccb4..000000000
--- a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/uml.svg
+++ /dev/null
@@ -1,1066 +0,0 @@
-<svg version="1.1" baseProfile="full" width="4795.5" height="2073.0" viewbox="0 0 4795.5 2073" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[SurveyQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
-	]
-	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
-	
-	[QuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
-	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
-	]
-	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
-	
-	[&lt;abstract&gt;QuestionFormData
-	  |
-	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
-	  +questionId: String;
-	  +questionText: String;
-	  +questionInfoText: String?;
-	  +questionType: SurveyQuestionType;
-	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
-	  +responseOptions: List&lt;dynamic&gt;;
-	  +id: String
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +EligibilityCriterion toEligibilityCriterion();
-	  +Answer&lt;dynamic&gt; constructAnswerFor();
-	  +dynamic setResponseOptionsValidityFrom();
-	  +QuestionFormData copy()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
-	
-	[ChoiceQuestionFormData
-	  |
-	  +isMultipleChoice: bool;
-	  +answerOptions: List&lt;String&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +QuestionFormData copy();
-	  -Choice _buildChoiceForValue();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
-	
-	[BoolQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +BoolQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
-	
-	[ImageQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +ImageQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
-	
-	[AudioQuestionFormData
-	  |
-	  +maxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +AudioQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
-	
-	[ScaleQuestionFormData
-	  |
-	  +minValue: double;
-	  +maxValue: double;
-	  +minLabel: String?;
-	  +maxLabel: String?;
-	  +midValues: List&lt;double?&gt;;
-	  +midLabels: List&lt;String?&gt;;
-	  +stepSize: double;
-	  +initialValue: double?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +responseOptions: List&lt;double&gt;;
-	  +midAnnotations: List&lt;Annotation&gt;
-	  |
-	  +ScaleQuestion toQuestion();
-	  +QuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[ScaleQuestionFormData]o-[Color]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
-	
-	[FreeTextQuestionFormData
-	  |
-	  +textLengthRange: List&lt;int&gt;;
-	  +textType: FreeTextQuestionType;
-	  +textTypeExpression: String?;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +FreeTextQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	]
-	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
-	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
-	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
-	]
-	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
-	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
-	[SurveyQuestionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
-	]
-	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[AudioRecordingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
-	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
-	
-	[ImageCapturingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="2073.0" width="4795.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M2987.0 228.2 L2987 260 L1955.5 722.0959037711314 L1955.5 722.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2992.3 218.8 L2987.0 228.2 L2981.7 218.8 L2987.0 209.5 Z"></path>
-					</g>
-					<path d="M930.0 1521.2 L824 1638 L814.1829268292682 1718.5 L814.2 1718.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M940.2 1517.9 L930.0 1521.2 L932.3 1510.7 L942.5 1507.4 Z"></path>
-					</g>
-					<path d="M1133.4 1635.0 L1132 1638 L1132 1786.5 L1132.0 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1142.1 1628.7 L1133.4 1635.0 L1132.5 1624.2 L1141.2 1618.0 Z"></path>
-					</g>
-					<path d="M1289.7 1636.2 L1289.25 1638 L1289.25 1786.5 L1289.3 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1297.0 1628.3 L1289.7 1636.2 L1286.6 1625.9 L1293.9 1618.0 Z"></path>
-					</g>
-					<path d="M1914.4 1633.4 L1917.5 1638 L1917.5 1786.5 L1917.5 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1913.6 1622.7 L1914.4 1633.4 L1904.7 1628.7 L1903.9 1618.0 Z"></path>
-					</g>
-					<path d="M1968.1 1516.7 L2079 1638 L2079 1786.5 L2079.0 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1965.7 1506.2 L1968.1 1516.7 L1957.9 1513.4 L1955.5 1502.9 Z"></path>
-					</g>
-					<path d="M2663.5 199.8 L2663.5 260 L1955.5 661.6566488266776 L1955.5 661.7 " fill="none"></path>
-					<path d="M2668.8 199.8 L2663.5 199.8 L2658.2 199.8 L2663.5 186.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M2434.0 199.8 L2434 260 L1955.5 594.7071065989848 L1955.5 594.7 " fill="none"></path>
-					</g>
-					<path d="M2439.3 199.8 L2434.0 199.8 L2428.7 199.8 L2434.0 186.5 Z"></path>
-					<path d="M3006.3 1082.5 L784 1638 L793.8170731707318 1718.5 L793.8 1718.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3016.6 1085.4 L3006.3 1082.5 L3014.1 1075.1 L3024.4 1078.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3540.5 199.8 L3540.5 260 L3540.5 820 L3540.5 820.0 " fill="none"></path>
-					</g>
-					<path d="M3545.8 199.8 L3540.5 199.8 L3535.2 199.8 L3540.5 186.5 Z"></path>
-					<path d="M3304.8 1084.7 L2343.5 1638 L2343.5 1718 L2343.5 1718.0 " fill="none"></path>
-					<path d="M3307.5 1089.3 L3304.8 1084.7 L3302.2 1080.0 L3316.4 1078.0 Z"></path>
-					<path d="M3382.7 1086.8 L2751.5 1638 L2751.5 1733 L2751.5 1733.0 " fill="none"></path>
-					<path d="M3386.2 1090.8 L3382.7 1086.8 L3379.2 1082.8 L3392.8 1078.0 Z"></path>
-					<path d="M3475.6 1090.1 L3223.5 1638 L3223.5 1733 L3223.5 1733.0 " fill="none"></path>
-					<path d="M3480.4 1092.3 L3475.6 1090.1 L3470.7 1087.9 L3481.1 1078.0 Z"></path>
-					<path d="M3580.6 1090.8 L3735.5 1638 L3735.5 1725.5 L3735.5 1725.5 " fill="none"></path>
-					<path d="M3585.8 1089.4 L3580.6 1090.8 L3575.5 1092.3 L3577.0 1078.0 Z"></path>
-					<path d="M4183.5 1964.7 L4183.5 1966 L4183.5 1986 L4183.5 1986.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4188.8 1955.3 L4183.5 1964.7 L4178.2 1955.3 L4183.5 1946.0 Z"></path>
-					</g>
-					<path d="M3670.0 1087.7 L4183.5 1638 L4183.5 1658 L4183.5 1658.0 " fill="none"></path>
-					<path d="M3673.9 1084.1 L3670.0 1087.7 L3666.1 1091.4 L3660.9 1078.0 Z"></path>
-					<path d="M4567.5 1904.7 L4567.5 1966 L4567.5 1986 L4567.5 1986.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4572.8 1895.3 L4567.5 1904.7 L4562.2 1895.3 L4567.5 1886.0 Z"></path>
-					</g>
-					<path d="M3743.9 1085.4 L4567.5 1638 L4567.5 1718 L4567.5 1718.0 " fill="none"></path>
-					<path d="M3746.8 1081.0 L3743.9 1085.4 L3740.9 1089.9 L3732.8 1078.0 Z"></path>
-					<path d="M2136.0 220.7 L2136 260 L1955.5 441.0254730713246 L1955.5 441.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2141.3 211.3 L2136.0 220.7 L2130.7 211.3 L2136.0 202.0 Z"></path>
-					</g>
-					<path d="M1744.0 258.7 L1744 260 L1735.4368650217707 280 L1735.4 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1749.3 249.3 L1744.0 258.7 L1738.7 249.3 L1744.0 240.0 Z"></path>
-					</g>
-					<path d="M945.8 36.1 L1744 82 L1744 102 L1744.0 102.0 " fill="none"></path>
-					<path d="M946.1 30.8 L945.8 36.1 L945.5 41.5 L932.5 35.4 Z"></path>
-					<path d="M1352.0 236.2 L1352 260 L1354.8156748911465 280 L1354.8 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1357.3 226.8 L1352.0 236.2 L1346.7 226.8 L1352.0 217.5 Z"></path>
-					</g>
-					<path d="M945.8 40.2 L1352 82 L1352 124.5 L1352.0 124.5 " fill="none"></path>
-					<path d="M946.3 34.9 L945.8 40.2 L945.2 45.5 L932.5 38.8 Z"></path>
-					<path d="M1002.9 1723.5 L1015.5 1718.5 L1023 1718.5 L1023 1718.5 L1030.5 1802 L1030.5 1802 L1023 1885.5 L1023 1885.5 L1015.5 1885.5 L1015.5 1885.5 L985.5 1873.6560283687943 L985.5 1873.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M992.2 1722.0 L1002.9 1723.5 L996.1 1731.9 L985.5 1730.3 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M744.0 977.8 L744 1638 L773.4512195121952 1718.5 L773.5 1718.5 " fill="none"></path>
-					</g>
-					<path d="M749.3 977.8 L744.0 977.8 L738.7 977.8 L744.0 964.5 Z"></path>
-					<path d="M960.0 236.2 L960 260 L974.1944847605225 280 L974.2 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M965.3 226.8 L960.0 236.2 L954.7 226.8 L960.0 217.5 Z"></path>
-					</g>
-					<path d="M899.9 52.4 L960 82 L960 124.5 L960.0 124.5 " fill="none"></path>
-					<path d="M902.3 47.6 L899.9 52.4 L897.6 57.2 L888.0 46.5 Z"></path>
-					<path d="M568.0 236.2 L568 260 L942.5 552.883654937571 L942.5 552.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M573.3 226.8 L568.0 236.2 L562.7 226.8 L568.0 217.5 Z"></path>
-					</g>
-					<path d="M767.4 46.8 L568 82 L568 124.5 L568.0 124.5 " fill="none"></path>
-					<path d="M768.3 52.0 L767.4 46.8 L766.4 41.5 L780.5 44.4 Z"></path>
-					<path d="M176.0 236.2 L176 260 L942.5 674.8613511390416 L942.5 674.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M181.3 226.8 L176.0 236.2 L170.7 226.8 L176.0 217.5 Z"></path>
-					</g>
-					<path d="M767.2 37.7 L176 82 L176 124.5 L176.0 124.5 " fill="none"></path>
-					<path d="M767.6 43.0 L767.2 37.7 L766.8 32.4 L780.5 36.7 Z"></path>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="2811.0" y="132.5" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M2811.0 163.5 L3163.0 163.5" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(2811, 132.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2811, 163.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="942.5" y="280.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M942.5 311.0 L1955.5 311.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M942.5 1332.0 L1955.5 1332.0" fill="none" data-name="QuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(942.5, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(942.5, 311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(942.5, 1332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="622.5" y="1718.5" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M622.5 1749.5 L985.5 1749.5" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(622.5, 1718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(622.5, 1749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="1075.5" y="1786.5" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(1075.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="1240.3" y="1786.5" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(1240.25, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="1848.5" y="1786.5" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(1848.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="2026.5" y="1786.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(2026.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="2556.0" y="155.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(2556, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="2352.0" y="155.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(2352, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="2956.5" y="820.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M2956.5 851.0 L4124.5 851.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M2956.5 987.0 L4124.5 987.0" fill="none" data-name="QuestionFormData"></path>
-						</g>
-						<g transform="translate(2956.5, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2956.5, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2956.5, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="3491.5" y="155.5" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(3491.5, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="2171.5" y="1718.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M2171.5 1749.0 L2515.5 1749.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M2171.5 1810.0 L2515.5 1810.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-						</g>
-						<g transform="translate(2171.5, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2171.5, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2171.5, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="2555.5" y="1733.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M2555.5 1764.0 L2947.5 1764.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M2555.5 1810.0 L2947.5 1810.0" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(2555.5, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2555.5, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2555.5, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="2987.5" y="1733.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M2987.5 1764.0 L3459.5 1764.0" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M2987.5 1810.0 L3459.5 1810.0" fill="none" data-name="ImageQuestionFormData"></path>
-						</g>
-						<g transform="translate(2987.5, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2987.5, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2987.5, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="3499.5" y="1725.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M3499.5 1756.5 L3971.5 1756.5" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M3499.5 1817.5 L3971.5 1817.5" fill="none" data-name="AudioQuestionFormData"></path>
-						</g>
-						<g transform="translate(3499.5, 1725.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3499.5, 1756.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3499.5, 1817.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="4011.5" y="1658.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M4011.5 1689.0 L4355.5 1689.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M4011.5 1885.0 L4355.5 1885.0" fill="none" data-name="ScaleQuestionFormData"></path>
-						</g>
-						<g transform="translate(4011.5, 1658)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4011.5, 1689)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4011.5, 1885)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="4154.5" y="1986.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(4154.5, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="4395.5" y="1718.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M4395.5 1749.0 L4739.5 1749.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M4395.5 1825.0 L4739.5 1825.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-						</g>
-						<g transform="translate(4395.5, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4395.5, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4395.5, 1825)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="4469.5" y="1986.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
-						</g>
-						<g transform="translate(4469.5, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="431.5" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M431.5 31.0 L740.5 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(431.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(431.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="1960.0" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M1960.0 171.0 L2312.0 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
-						</g>
-						<g transform="translate(1960, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1960, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="1568.0" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M1568.0 133.0 L1920.0 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M1568.0 179.0 L1920.0 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-						</g>
-						<g transform="translate(1568, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1568, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1568, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="780.5" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(780.5, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="1176.0" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M1176.0 155.5 L1528.0 155.5" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M1176.0 186.5 L1528.0 186.5" fill="none" data-name="BoolQuestionFormView"></path>
-						</g>
-						<g transform="translate(1176, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1176, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1176, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="713.5" y="933.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(713.5, 933.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="784.0" y="124.5" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M784.0 155.5 L1136.0 155.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M784.0 186.5 L1136.0 186.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(784, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(784, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(784, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="392.0" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M392.0 155.5 L744.0 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M392.0 186.5 L744.0 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-						</g>
-						<g transform="translate(392, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(392, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(392, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="0.0" y="124.5" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M0.0 155.5 L352.0 155.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M0.0 186.5 L352.0 186.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-						</g>
-						<g transform="translate(0, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/uml.svg b/docs/uml/designer_v2/lib/features/design/shared/questionnaire/uml.svg
deleted file mode 100644
index fc77234fa..000000000
--- a/docs/uml/designer_v2/lib/features/design/shared/questionnaire/uml.svg
+++ /dev/null
@@ -1,1218 +0,0 @@
-<svg version="1.1" baseProfile="full" width="6044.3" height="2073.0" viewbox="0 0 6044.25 2073" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[SurveyQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
-	]
-	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
-	
-	[QuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
-	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
-	]
-	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
-	
-	[&lt;abstract&gt;QuestionFormData
-	  |
-	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
-	  +questionId: String;
-	  +questionText: String;
-	  +questionInfoText: String?;
-	  +questionType: SurveyQuestionType;
-	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
-	  +responseOptions: List&lt;dynamic&gt;;
-	  +id: String
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +EligibilityCriterion toEligibilityCriterion();
-	  +Answer&lt;dynamic&gt; constructAnswerFor();
-	  +dynamic setResponseOptionsValidityFrom();
-	  +QuestionFormData copy()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
-	
-	[ChoiceQuestionFormData
-	  |
-	  +isMultipleChoice: bool;
-	  +answerOptions: List&lt;String&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +QuestionFormData copy();
-	  -Choice _buildChoiceForValue();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
-	
-	[BoolQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +BoolQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
-	
-	[ImageQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +ImageQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
-	
-	[AudioQuestionFormData
-	  |
-	  +maxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +AudioQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
-	
-	[ScaleQuestionFormData
-	  |
-	  +minValue: double;
-	  +maxValue: double;
-	  +minLabel: String?;
-	  +maxLabel: String?;
-	  +midValues: List&lt;double?&gt;;
-	  +midLabels: List&lt;String?&gt;;
-	  +stepSize: double;
-	  +initialValue: double?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +responseOptions: List&lt;double&gt;;
-	  +midAnnotations: List&lt;Annotation&gt;
-	  |
-	  +ScaleQuestion toQuestion();
-	  +QuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[ScaleQuestionFormData]o-[Color]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
-	
-	[FreeTextQuestionFormData
-	  |
-	  +textLengthRange: List&lt;int&gt;;
-	  +textType: FreeTextQuestionType;
-	  +textTypeExpression: String?;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +FreeTextQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	]
-	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
-	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
-	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
-	]
-	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
-	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
-	[SurveyQuestionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
-	]
-	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[AudioRecordingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
-	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
-	
-	[ImageCapturingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls
-	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
-	  +void read();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
-	]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	
-	[QuestionnaireFormData
-	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
-	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="2073.0" width="6044.3" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M176.0 228.2 L176 260 L3189.5 849.8583806818182 L3189.5 849.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M181.3 218.8 L176.0 228.2 L170.7 218.8 L176.0 209.5 Z"></path>
-					</g>
-					<path d="M4219.4 1195.0 L5161.75 1638 L3591.75 1785.0054239223523 L3591.8 1785.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4213.2 1186.2 L4219.4 1195.0 L4208.7 1195.9 L4202.5 1187.1 Z"></path>
-					</g>
-					<path d="M4219.3 1204.2 L5109 1638 L3972.75 1794.231398029763 L3972.8 1794.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4213.2 1195.3 L4219.3 1204.2 L4208.6 1204.9 L4202.5 1196.0 Z"></path>
-					</g>
-					<path d="M3696.0 1636.7 L3696 1638 L4086.4916158536585 1786.5 L4086.5 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3701.3 1627.3 L3696.0 1636.7 L3690.7 1627.3 L3696.0 1618.0 Z"></path>
-					</g>
-					<path d="M3176.4 1478.8 L3020.25 1638 L3681.75 1786.5092402464065 L3681.8 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3186.8 1475.8 L3176.4 1478.8 L3179.2 1468.4 L3189.5 1465.4 Z"></path>
-					</g>
-					<path d="M3176.1 1449.5 L2980.25 1638 L2720.1486280487807 1786.5 L2720.1 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3186.5 1446.9 L3176.1 1449.5 L3179.1 1439.2 L3189.5 1436.6 Z"></path>
-					</g>
-					<path d="M499.5 199.8 L499.5 260 L3189.5 839.8248083841702 L3189.5 839.8 " fill="none"></path>
-					<path d="M504.8 199.8 L499.5 199.8 L494.2 199.8 L499.5 186.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M729.0 199.8 L729 260 L3189.5 831.3800134816313 L3189.5 831.4 " fill="none"></path>
-					</g>
-					<path d="M734.3 199.8 L729.0 199.8 L723.7 199.8 L729.0 186.5 Z"></path>
-					<path d="M1783.5 1087.5 L2717.75 1638 L3228.75 1759.016606498195 L3228.8 1759.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1778.2 1078.1 L1783.5 1087.5 L1772.7 1087.3 L1767.4 1078.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1502.3 192.3 L1642.5 260 L1566.099419448476 820 L1566.1 820.0 " fill="none"></path>
-					</g>
-					<path d="M1504.7 187.5 L1502.3 192.3 L1500.0 197.1 L1490.3 186.5 Z"></path>
-					<path d="M1723.8 1086.2 L2428.5 1638 L2428.5 1718 L2428.5 1718.0 " fill="none"></path>
-					<path d="M1727.0 1082.0 L1723.8 1086.2 L1720.5 1090.4 L1713.3 1078.0 Z"></path>
-					<path d="M1644.4 1089.0 L2020.5 1638 L2020.5 1733 L2020.5 1733.0 " fill="none"></path>
-					<path d="M1648.8 1086.0 L1644.4 1089.0 L1640.0 1092.0 L1636.9 1078.0 Z"></path>
-					<path d="M1548.5 1091.3 L1548.5 1638 L1548.5 1733 L1548.5 1733.0 " fill="none"></path>
-					<path d="M1553.8 1091.3 L1548.5 1091.3 L1543.2 1091.3 L1548.5 1078.0 Z"></path>
-					<path d="M1444.7 1088.7 L1036.5 1638 L1036.5 1725.5 L1036.5 1725.5 " fill="none"></path>
-					<path d="M1449.0 1091.9 L1444.7 1088.7 L1440.4 1085.5 L1452.6 1078.0 Z"></path>
-					<path d="M588.5 1964.7 L588.5 1966 L588.5 1986 L588.5 1986.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M593.8 1955.3 L588.5 1964.7 L583.2 1955.3 L588.5 1946.0 Z"></path>
-					</g>
-					<path d="M1357.9 1085.8 L588.5 1638 L588.5 1658 L588.5 1658.0 " fill="none"></path>
-					<path d="M1361.0 1090.1 L1357.9 1085.8 L1354.8 1081.4 L1368.8 1078.0 Z"></path>
-					<path d="M204.5 1904.7 L204.5 1966 L204.5 1986 L204.5 1986.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M209.8 1895.3 L204.5 1904.7 L199.2 1895.3 L204.5 1886.0 Z"></path>
-					</g>
-					<path d="M1285.0 1084.1 L204.5 1638 L204.5 1718 L204.5 1718.0 " fill="none"></path>
-					<path d="M1287.4 1088.8 L1285.0 1084.1 L1282.6 1079.3 L1296.9 1078.0 Z"></path>
-					<path d="M3019.5 220.7 L3019.5 260 L3189.5 433.1411677753141 L3189.5 433.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3024.8 211.3 L3019.5 220.7 L3014.2 211.3 L3019.5 202.0 Z"></path>
-					</g>
-					<path d="M5225.3 258.7 L5225.25 260 L4202.5 720.7976132090894 L4202.5 720.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5230.6 249.3 L5225.3 258.7 L5219.9 249.3 L5225.3 240.0 Z"></path>
-					</g>
-					<path d="M4530.6 36.8 L5225.25 82 L5225.25 102 L5225.3 102.0 " fill="none"></path>
-					<path d="M4530.9 31.5 L4530.6 36.8 L4530.2 42.1 L4517.3 35.9 Z"></path>
-					<path d="M4833.3 236.2 L4833.25 260 L4202.5 642.1382721477248 L4202.5 642.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4838.6 226.8 L4833.3 236.2 L4827.9 226.8 L4833.3 217.5 Z"></path>
-					</g>
-					<path d="M4530.5 42.6 L4833.25 82 L4833.25 124.5 L4833.3 124.5 " fill="none"></path>
-					<path d="M4531.2 37.3 L4530.5 42.6 L4529.8 47.9 L4517.3 40.9 Z"></path>
-					<path d="M3609.1 1723.5 L3621.75 1718.5 L3629.25 1718.5 L3629.25 1718.5 L3636.75 1802 L3636.75 1802 L3629.25 1885.5 L3629.25 1885.5 L3621.75 1885.5 L3621.75 1885.5 L3591.75 1873.6560283687943 L3591.8 1873.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3598.5 1722.0 L3609.1 1723.5 L3602.4 1731.9 L3591.8 1730.3 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2775.0 977.8 L2775 1638 L3228.75 1755.142857142857 L3228.8 1755.1 " fill="none"></path>
-					</g>
-					<path d="M2780.3 977.8 L2775.0 977.8 L2769.7 977.8 L2775.0 964.5 Z"></path>
-					<path d="M4441.3 236.2 L4441.25 260 L4202.5 480.72962093257297 L4202.5 480.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4446.6 226.8 L4441.3 236.2 L4435.9 226.8 L4441.3 217.5 Z"></path>
-					</g>
-					<path d="M4441.3 59.8 L4441.25 82 L4441.25 124.5 L4441.3 124.5 " fill="none"></path>
-					<path d="M4446.6 59.8 L4441.3 59.8 L4435.9 59.8 L4441.3 46.5 Z"></path>
-					<path d="M4049.3 236.2 L4049.25 260 L4038.9960087082727 280 L4039.0 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4054.6 226.8 L4049.3 236.2 L4043.9 226.8 L4049.3 217.5 Z"></path>
-					</g>
-					<path d="M4352.0 42.6 L4049.25 82 L4049.25 124.5 L4049.3 124.5 " fill="none"></path>
-					<path d="M4352.7 47.9 L4352.0 42.6 L4351.3 37.3 L4365.3 40.9 Z"></path>
-					<path d="M3657.3 236.2 L3657.25 260 L3658.374818577649 280 L3658.4 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3662.6 226.8 L3657.3 236.2 L3651.9 226.8 L3657.3 217.5 Z"></path>
-					</g>
-					<path d="M4351.9 36.8 L3657.25 82 L3657.25 124.5 L3657.3 124.5 " fill="none"></path>
-					<path d="M4352.3 42.1 L4351.9 36.8 L4351.6 31.5 L4365.3 35.9 Z"></path>
-					<path d="M5676.5 1096.7 L5692.25 1638 L4176.25 1796.8651757188497 L4176.3 1796.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5681.6 1087.2 L5676.5 1096.7 L5670.9 1087.5 L5676.0 1078.0 Z"></path>
-					</g>
-					<path d="M5573.6 1093.4 L5201.75 1638 L5735.761432926829 1786.5 L5735.8 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5583.3 1088.7 L5573.6 1093.4 L5574.5 1082.7 L5584.2 1078.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M5549.8 199.8 L5549.75 260 L5649.314586357039 820 L5649.3 820.0 " fill="none"></path>
-					</g>
-					<path d="M5555.1 199.8 L5549.8 199.8 L5544.4 199.8 L5549.8 186.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M5794.8 199.8 L5794.75 260 L5695.185413642961 820 L5695.2 820.0 " fill="none"></path>
-					</g>
-					<path d="M5800.1 199.8 L5794.8 199.8 L5789.4 199.8 L5794.8 186.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1396.1 179.9 L834.5 260 L749.9136429608128 880 L749.9 880.0 " fill="none"></path>
-					</g>
-					<path d="M1396.8 185.2 L1396.1 179.9 L1395.3 174.6 L1409.3 178.0 Z"></path>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="0.0" y="132.5" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M0.0 163.5 L352.0 163.5" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(0, 132.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 163.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="3189.5" y="280.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M3189.5 311.0 L4202.5 311.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M3189.5 1332.0 L4202.5 1332.0" fill="none" data-name="QuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(3189.5, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3189.5, 311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3189.5, 1332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="3228.8" y="1718.5" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M3228.8 1749.5 L3591.8 1749.5" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(3228.75, 1718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3228.75, 1749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="3859.8" y="1786.5" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(3859.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="4078.3" y="1786.5" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(4078.25, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="3681.8" y="1786.5" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(3681.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="2640.5" y="1786.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(2640.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="392.0" y="155.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(392, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="647.0" y="155.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(647, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="964.5" y="820.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M964.5 851.0 L2132.5 851.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M964.5 987.0 L2132.5 987.0" fill="none" data-name="QuestionFormData"></path>
-						</g>
-						<g transform="translate(964.5, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(964.5, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(964.5, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="1409.3" y="155.5" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(1409.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="2256.5" y="1718.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M2256.5 1749.0 L2600.5 1749.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M2256.5 1810.0 L2600.5 1810.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-						</g>
-						<g transform="translate(2256.5, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2256.5, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2256.5, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="1824.5" y="1733.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M1824.5 1764.0 L2216.5 1764.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M1824.5 1810.0 L2216.5 1810.0" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(1824.5, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1824.5, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1824.5, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="1312.5" y="1733.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M1312.5 1764.0 L1784.5 1764.0" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M1312.5 1810.0 L1784.5 1810.0" fill="none" data-name="ImageQuestionFormData"></path>
-						</g>
-						<g transform="translate(1312.5, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1312.5, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1312.5, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="800.5" y="1725.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M800.5 1756.5 L1272.5 1756.5" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M800.5 1817.5 L1272.5 1817.5" fill="none" data-name="AudioQuestionFormData"></path>
-						</g>
-						<g transform="translate(800.5, 1725.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(800.5, 1756.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(800.5, 1817.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="416.5" y="1658.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M416.5 1689.0 L760.5 1689.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M416.5 1885.0 L760.5 1885.0" fill="none" data-name="ScaleQuestionFormData"></path>
-						</g>
-						<g transform="translate(416.5, 1658)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(416.5, 1689)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(416.5, 1885)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="559.5" y="1986.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(559.5, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="32.5" y="1718.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M32.5 1749.0 L376.5 1749.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M32.5 1825.0 L376.5 1825.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-						</g>
-						<g transform="translate(32.5, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32.5, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32.5, 1825)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="106.5" y="1986.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
-						</g>
-						<g transform="translate(106.5, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="4016.3" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M4016.3 31.0 L4325.3 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(4016.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4016.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="2843.5" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M2843.5 171.0 L3195.5 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
-						</g>
-						<g transform="translate(2843.5, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2843.5, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="5049.3" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M5049.3 133.0 L5401.3 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M5049.3 179.0 L5401.3 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-						</g>
-						<g transform="translate(5049.25, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5049.25, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5049.25, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="4365.3" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(4365.25, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="4657.3" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M4657.3 155.5 L5009.3 155.5" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M4657.3 186.5 L5009.3 186.5" fill="none" data-name="BoolQuestionFormView"></path>
-						</g>
-						<g transform="translate(4657.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4657.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4657.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="2744.5" y="933.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(2744.5, 933.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="4265.3" y="124.5" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M4265.3 155.5 L4617.3 155.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M4265.3 186.5 L4617.3 186.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(4265.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4265.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4265.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="3873.3" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M3873.3 155.5 L4225.3 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M3873.3 186.5 L4225.3 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-						</g>
-						<g transform="translate(3873.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3873.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3873.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="3481.3" y="124.5" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M3481.3 155.5 L3833.3 155.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M3481.3 186.5 L3833.3 186.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-						</g>
-						<g transform="translate(3481.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3481.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3481.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="5356.3" y="820.0" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M5356.3 851.0 L5988.3 851.0" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M5356.3 957.0 L5988.3 957.0" fill="none" data-name="WithQuestionnaireControls"></path>
-						</g>
-						<g transform="translate(5356.25, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5356.25, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5356.25, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="5682.0" y="1786.5" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
-						</g>
-						<g transform="translate(5682, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="5441.3" y="155.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-						</g>
-						<g transform="translate(5441.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="5698.3" y="155.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-						</g>
-						<g transform="translate(5698.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="556.5" y="880.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M556.5 911.0 L924.5 911.0" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M556.5 957.0 L924.5 957.0" fill="none" data-name="QuestionnaireFormData"></path>
-						</g>
-						<g transform="translate(556.5, 880)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(556.5, 911)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(556.5, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/shared/schedule/uml.svg b/docs/uml/designer_v2/lib/features/design/shared/schedule/uml.svg
deleted file mode 100644
index 1808e476c..000000000
--- a/docs/uml/designer_v2/lib/features/design/shared/schedule/uml.svg
+++ /dev/null
@@ -1,236 +0,0 @@
-<svg version="1.1" baseProfile="full" width="857.5" height="709.0" viewbox="0 0 857.5 709" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[ScheduleControls
-	  |
-	  +formViewModel: WithScheduleControls
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
-	]
-	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
-	
-	[&lt;abstract&gt;WithScheduleControls
-	  |
-	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
-	  +instanceID: FormControl&lt;String&gt;;
-	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +hasReminderControl: FormControl&lt;bool&gt;;
-	  +reminderTimeControl: FormControl&lt;Time&gt;;
-	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
-	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
-	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  +hasReminder: bool;
-	  +isTimeRestricted: bool;
-	  +timeRestriction: List&lt;Time&gt;?
-	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
-	]
-	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule
-	  |
-	  +instanceId: String;
-	  +isTimeLocked: bool;
-	  +timeLockStart: StudyUTimeOfDay?;
-	  +timeLockEnd: StudyUTimeOfDay?;
-	  +hasReminder: bool;
-	  +reminderTime: StudyUTimeOfDay?
-	  |
-	  +Schedule toSchedule()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="709.0" width="857.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M247.5 227.7 L247.5 259 L247.5 279 L247.5 279.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M252.8 218.3 L247.5 227.7 L242.2 218.3 L247.5 209.0 Z"></path>
-					</g>
-					<path d="M247.5 44.3 L247.5 51 L247.5 101 L247.5 101.0 " fill="none"></path>
-					<path d="M252.8 44.3 L247.5 44.3 L242.2 44.3 L247.5 31.0 Z"></path>
-					<path d="M158.6 598.5 L156.75 602 L156.75 622 L156.8 622.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M167.7 592.7 L158.6 598.5 L158.3 587.8 L167.3 582.0 Z"></path>
-					</g>
-					<path d="M336.4 598.5 L338.25 602 L338.25 622 L338.3 622.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M336.7 587.8 L336.4 598.5 L327.3 592.7 L327.7 582.0 Z"></path>
-					</g>
-					<path d="M652.5 257.7 L652.5 259 L652.5 415 L652.5 415.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M657.8 248.3 L652.5 257.7 L647.2 248.3 L652.5 239.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M652.5 44.3 L652.5 51 L652.5 71 L652.5 71.0 " fill="none"></path>
-					</g>
-					<path d="M657.8 44.3 L652.5 44.3 L647.2 44.3 L652.5 31.0 Z"></path>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="31.5" y="101.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M31.5 132.0 L463.5 132.0" fill="none" data-name="ScheduleControls"></path>
-							<path d="M31.5 163.0 L463.5 163.0" fill="none" data-name="ScheduleControls"></path>
-						</g>
-						<g transform="translate(31.5, 101)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31.5, 132)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31.5, 163)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="0.0" y="279.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M0.0 310.0 L495.0 310.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M0.0 536.0 L495.0 536.0" fill="none" data-name="WithScheduleControls"></path>
-						</g>
-						<g transform="translate(0, 279)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 310)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 536)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="151.5" y="0.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
-						</g>
-						<g transform="translate(151.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="100.3" y="622.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(100.25, 622)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="253.3" y="622.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
-						</g>
-						<g transform="translate(253.25, 622)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="503.5" y="71.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M503.5 102.0 L801.5 102.0" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M503.5 208.0 L801.5 208.0" fill="none" data-name="IFormDataWithSchedule"></path>
-						</g>
-						<g transform="translate(503.5, 71)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
-								
-							</g>
-						</g>
-						<g transform="translate(503.5, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(503.5, 208)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="572.5" y="415.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
-						</g>
-						<g transform="translate(572.5, 415)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="603.5" y="0.0" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(603.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/shared/uml.svg b/docs/uml/designer_v2/lib/features/design/shared/uml.svg
deleted file mode 100644
index 164371e09..000000000
--- a/docs/uml/designer_v2/lib/features/design/shared/uml.svg
+++ /dev/null
@@ -1,1418 +0,0 @@
-<svg version="1.1" baseProfile="full" width="7327.3" height="2073.0" viewbox="0 0 7327.25 2073" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[SurveyQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
-	]
-	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
-	
-	[QuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
-	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
-	]
-	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
-	
-	[&lt;abstract&gt;QuestionFormData
-	  |
-	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
-	  +questionId: String;
-	  +questionText: String;
-	  +questionInfoText: String?;
-	  +questionType: SurveyQuestionType;
-	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
-	  +responseOptions: List&lt;dynamic&gt;;
-	  +id: String
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +EligibilityCriterion toEligibilityCriterion();
-	  +Answer&lt;dynamic&gt; constructAnswerFor();
-	  +dynamic setResponseOptionsValidityFrom();
-	  +QuestionFormData copy()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
-	
-	[ChoiceQuestionFormData
-	  |
-	  +isMultipleChoice: bool;
-	  +answerOptions: List&lt;String&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +QuestionFormData copy();
-	  -Choice _buildChoiceForValue();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
-	
-	[BoolQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +BoolQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
-	
-	[ImageQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +ImageQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
-	
-	[AudioQuestionFormData
-	  |
-	  +maxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +AudioQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
-	
-	[ScaleQuestionFormData
-	  |
-	  +minValue: double;
-	  +maxValue: double;
-	  +minLabel: String?;
-	  +maxLabel: String?;
-	  +midValues: List&lt;double?&gt;;
-	  +midLabels: List&lt;String?&gt;;
-	  +stepSize: double;
-	  +initialValue: double?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +responseOptions: List&lt;double&gt;;
-	  +midAnnotations: List&lt;Annotation&gt;
-	  |
-	  +ScaleQuestion toQuestion();
-	  +QuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[ScaleQuestionFormData]o-[Color]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
-	
-	[FreeTextQuestionFormData
-	  |
-	  +textLengthRange: List&lt;int&gt;;
-	  +textType: FreeTextQuestionType;
-	  +textTypeExpression: String?;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +FreeTextQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	]
-	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
-	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
-	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
-	]
-	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
-	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
-	[SurveyQuestionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
-	]
-	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[AudioRecordingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
-	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
-	
-	[ImageCapturingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls
-	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
-	  +void read();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
-	]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	
-	[QuestionnaireFormData
-	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
-	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
-	
-	[ScheduleControls
-	  |
-	  +formViewModel: WithScheduleControls
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
-	]
-	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule
-	  |
-	  +instanceId: String;
-	  +isTimeLocked: bool;
-	  +timeLockStart: StudyUTimeOfDay?;
-	  +timeLockEnd: StudyUTimeOfDay?;
-	  +hasReminder: bool;
-	  +reminderTime: StudyUTimeOfDay?
-	  |
-	  +Schedule toSchedule()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
-	
-	[&lt;abstract&gt;WithScheduleControls
-	  |
-	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
-	  +instanceID: FormControl&lt;String&gt;;
-	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +hasReminderControl: FormControl&lt;bool&gt;;
-	  +reminderTimeControl: FormControl&lt;Time&gt;;
-	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
-	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
-	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  +hasReminder: bool;
-	  +isTimeRestricted: bool;
-	  +timeRestriction: List&lt;Time&gt;?
-	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
-	]
-	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="2073.0" width="7327.3" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M176.0 228.2 L176 260 L4319 873.9427895472631 L4319.0 873.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M181.3 218.8 L176.0 228.2 L170.7 218.8 L176.0 209.5 Z"></path>
-					</g>
-					<path d="M5347.8 1278.3 L5918.25 1638 L4124 1786.9343287359231 L4124.0 1786.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5342.7 1268.8 L5347.8 1278.3 L5337.1 1277.8 L5332.0 1268.4 Z"></path>
-					</g>
-					<path d="M5347.6 1290.7 L5878.25 1638 L6896.5 1793.3784601070017 L6896.5 1793.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5342.7 1281.1 L5347.6 1290.7 L5336.9 1290.1 L5332.0 1280.5 Z"></path>
-					</g>
-					<path d="M4825.5 1636.7 L4825.5 1638 L5215.991615853659 1786.5 L5216.0 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4830.8 1627.3 L4825.5 1636.7 L4820.2 1627.3 L4825.5 1618.0 Z"></path>
-					</g>
-					<path d="M4307.0 1566.0 L4246.5 1638 L4960.25 1787.5432769083359 L4960.3 1787.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4317.1 1562.3 L4307.0 1566.0 L4308.9 1555.4 L4319.0 1551.7 Z"></path>
-					</g>
-					<path d="M4305.9 1475.7 L4145.75 1638 L4784.75 1789.5488069414316 L4784.8 1789.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4316.2 1472.8 L4305.9 1475.7 L4308.6 1465.3 L4319.0 1462.4 Z"></path>
-					</g>
-					<path d="M499.5 199.8 L499.5 260 L4319 868.3299815071659 L4319.0 868.3 " fill="none"></path>
-					<path d="M504.8 199.8 L499.5 199.8 L494.2 199.8 L499.5 186.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M729.0 199.8 L729 260 L4319 863.8105699987794 L4319.0 863.8 " fill="none"></path>
-					</g>
-					<path d="M734.3 199.8 L729.0 199.8 L723.7 199.8 L729.0 186.5 Z"></path>
-					<path d="M2954.4 1086.1 L4105.75 1638 L4025.6181402439024 1718.5 L4025.6 1718.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2948.3 1077.2 L2954.4 1086.1 L2943.7 1086.8 L2937.6 1078.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1911.5 177.8 L2668.5 260 L2668.5 820 L2668.5 820.0 " fill="none"></path>
-					</g>
-					<path d="M1912.1 172.5 L1911.5 177.8 L1910.9 183.1 L1898.3 176.3 Z"></path>
-					<path d="M2935.9 1084.0 L4033.25 1638 L3348.25 1769.0851808634773 L3348.3 1769.1 " fill="none"></path>
-					<path d="M2938.3 1079.2 L2935.9 1084.0 L2933.5 1088.8 L2924.0 1078.0 Z"></path>
-					<path d="M2858.4 1085.8 L3625.25 1638 L2964.25 1764.492415402567 L2964.3 1764.5 " fill="none"></path>
-					<path d="M2861.6 1081.5 L2858.4 1085.8 L2855.3 1090.1 L2847.6 1078.0 Z"></path>
-					<path d="M2766.9 1088.9 L3153.25 1638 L2532.25 1756.8378063010503 L2532.3 1756.8 " fill="none"></path>
-					<path d="M2771.3 1085.8 L2766.9 1088.9 L2762.6 1092.0 L2759.3 1078.0 Z"></path>
-					<path d="M2662.9 1091.3 L2641.25 1638 L2020.25 1756.8378063010503 L2020.3 1756.8 " fill="none"></path>
-					<path d="M2668.2 1091.5 L2662.9 1091.3 L2657.5 1091.1 L2663.4 1078.0 Z"></path>
-					<path d="M1336.3 1964.7 L1336.25 1966 L1336.25 1986 L1336.3 1986.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1341.6 1955.3 L1336.3 1964.7 L1330.9 1955.3 L1336.3 1946.0 Z"></path>
-					</g>
-					<path d="M2571.9 1089.0 L2193.25 1638 L1508.25 1769.0851808634773 L1508.3 1769.1 " fill="none"></path>
-					<path d="M2576.3 1092.0 L2571.9 1089.0 L2567.6 1085.9 L2579.5 1078.0 Z"></path>
-					<path d="M952.3 1904.7 L952.25 1966 L952.25 1986 L952.3 1986.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M957.6 1895.3 L952.3 1904.7 L946.9 1895.3 L952.3 1886.0 Z"></path>
-					</g>
-					<path d="M2497.2 1086.3 L1809.25 1638 L1124.25 1769.0851808634773 L1124.3 1769.1 " fill="none"></path>
-					<path d="M2500.6 1090.5 L2497.2 1086.3 L2493.9 1082.2 L2507.6 1078.0 Z"></path>
-					<path d="M3776.5 220.7 L3776.5 260 L4319 616.3226882745472 L4319.0 616.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3781.8 211.3 L3776.5 220.7 L3771.2 211.3 L3776.5 202.0 Z"></path>
-					</g>
-					<path d="M5973.3 258.7 L5973.25 260 L5332 644.9455456327598 L5332.0 644.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5978.6 249.3 L5973.3 258.7 L5967.9 249.3 L5973.3 240.0 Z"></path>
-					</g>
-					<path d="M5278.6 36.8 L5973.25 82 L5973.25 102 L5973.3 102.0 " fill="none"></path>
-					<path d="M5278.9 31.5 L5278.6 36.8 L5278.2 42.1 L5265.3 35.9 Z"></path>
-					<path d="M5581.3 236.2 L5581.25 260 L5332 487.235527621568 L5332.0 487.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5586.6 226.8 L5581.3 236.2 L5575.9 226.8 L5581.3 217.5 Z"></path>
-					</g>
-					<path d="M5278.5 42.6 L5581.25 82 L5581.25 124.5 L5581.3 124.5 " fill="none"></path>
-					<path d="M5279.2 37.3 L5278.5 42.6 L5277.8 47.9 L5265.3 40.9 Z"></path>
-					<path d="M4142.5 1773.8 L4534.5 1718.5 L4637.125 1718.5 L4637.125 1718.5 L4739.75 1802 L4739.75 1802 L4637.125 1885.5 L4637.125 1885.5 L4534.5 1885.5 L4534.5 1885.5 L4124 1827.6000844594594 L4124.0 1827.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4132.5 1769.8 L4142.5 1773.8 L4134.0 1780.4 L4124.0 1776.4 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1462.0 977.8 L1462 1638 L3761 1790 L3761.0 1790.0 " fill="none"></path>
-					</g>
-					<path d="M1467.3 977.8 L1462.0 977.8 L1456.7 977.8 L1462.0 964.5 Z"></path>
-					<path d="M5189.3 236.2 L5189.25 260 L5178.6912191582005 280 L5178.7 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5194.6 226.8 L5189.3 236.2 L5183.9 226.8 L5189.3 217.5 Z"></path>
-					</g>
-					<path d="M5189.3 59.8 L5189.25 82 L5189.25 124.5 L5189.3 124.5 " fill="none"></path>
-					<path d="M5194.6 59.8 L5189.3 59.8 L5183.9 59.8 L5189.3 46.5 Z"></path>
-					<path d="M4797.3 236.2 L4797.25 260 L4798.070029027576 280 L4798.1 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4802.6 226.8 L4797.3 236.2 L4791.9 226.8 L4797.3 217.5 Z"></path>
-					</g>
-					<path d="M5100.0 42.6 L4797.25 82 L4797.25 124.5 L4797.3 124.5 " fill="none"></path>
-					<path d="M5100.7 47.9 L5100.0 42.6 L5099.3 37.3 L5113.3 40.9 Z"></path>
-					<path d="M4405.3 236.2 L4405.25 260 L4417.448838896952 280 L4417.4 280.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4410.6 226.8 L4405.3 236.2 L4399.9 226.8 L4405.3 217.5 Z"></path>
-					</g>
-					<path d="M5099.9 36.8 L4405.25 82 L4405.25 124.5 L4405.3 124.5 " fill="none"></path>
-					<path d="M5100.3 42.1 L5099.9 36.8 L5099.6 31.5 L5113.3 35.9 Z"></path>
-					<path d="M6480.1 1095.3 L6702 1638 L5305.75 1796.4397163120568 L5305.8 1796.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6481.5 1084.6 L6480.1 1095.3 L6471.6 1088.7 L6473.0 1078.0 Z"></path>
-					</g>
-					<path d="M6323.4 1093.5 L5958.25 1638 L6384.282012195122 1786.5 L6384.3 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6333.0 1088.7 L6323.4 1093.5 L6324.1 1082.8 L6333.8 1078.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M6297.8 199.8 L6297.75 260 L6397.314586357039 820 L6397.3 820.0 " fill="none"></path>
-					</g>
-					<path d="M6303.1 199.8 L6297.8 199.8 L6292.4 199.8 L6297.8 186.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M6545.8 199.8 L6545.75 260 L6443.74709724238 820 L6443.7 820.0 " fill="none"></path>
-					</g>
-					<path d="M6551.1 199.8 L6545.8 199.8 L6540.4 199.8 L6545.8 186.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1787.0 179.6 L1207.5 260 L1207.5 880 L1207.5 880.0 " fill="none"></path>
-					</g>
-					<path d="M1787.8 184.9 L1787.0 179.6 L1786.3 174.3 L1800.3 177.8 Z"></path>
-					<path d="M7023.8 243.7 L7023.75 260 L7023.75 797.5 L7023.8 797.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7029.1 234.3 L7023.8 243.7 L7018.4 234.3 L7023.8 225.0 Z"></path>
-					</g>
-					<path d="M7023.8 59.8 L7023.75 82 L7023.75 117 L7023.8 117.0 " fill="none"></path>
-					<path d="M7029.1 59.8 L7023.8 59.8 L7018.4 59.8 L7023.8 46.5 Z"></path>
-					<path d="M472.5 1051.7 L472.5 1638 L472.5 1786.5 L472.5 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M477.8 1042.3 L472.5 1051.7 L467.2 1042.3 L472.5 1033.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1787.0 176.5 L834.5 260 L516.633526850508 865 L516.6 865.0 " fill="none"></path>
-					</g>
-					<path d="M1787.4 181.8 L1787.0 176.5 L1786.5 171.1 L1800.3 175.3 Z"></path>
-					<path d="M7028.7 1119.2 L7043.75 1638 L6961.576981707317 1786.5 L6961.6 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7033.7 1109.7 L7028.7 1119.2 L7023.1 1110.0 L7028.1 1100.5 Z"></path>
-					</g>
-					<path d="M6954.7 1117.8 L6742 1638 L7097.403963414634 1786.5 L7097.4 1786.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6963.2 1111.2 L6954.7 1117.8 L6953.3 1107.1 L6961.8 1100.5 Z"></path>
-					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="0.0" y="132.5" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M0.0 163.5 L352.0 163.5" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(0, 132.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 163.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="4319.0" y="280.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M4319.0 311.0 L5332.0 311.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M4319.0 1332.0 L5332.0 1332.0" fill="none" data-name="QuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(4319, 280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4319, 311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4319, 1332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="3761.0" y="1718.5" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M3761.0 1749.5 L4124.0 1749.5" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(3761, 1718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3761, 1749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="6896.5" y="1786.5" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(6896.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="5207.8" y="1786.5" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(5207.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="4960.3" y="1786.5" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(4960.25, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="4784.8" y="1786.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(4784.75, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="392.0" y="155.5" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(392, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="647.0" y="155.5" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(647, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="2084.5" y="820.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M2084.5 851.0 L3252.5 851.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M2084.5 987.0 L3252.5 987.0" fill="none" data-name="QuestionFormData"></path>
-						</g>
-						<g transform="translate(2084.5, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2084.5, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2084.5, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="1800.3" y="155.5" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(1800.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="3004.3" y="1718.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M3004.3 1749.0 L3348.3 1749.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M3004.3 1810.0 L3348.3 1810.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-						</g>
-						<g transform="translate(3004.25, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3004.25, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3004.25, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="2572.3" y="1733.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M2572.3 1764.0 L2964.3 1764.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M2572.3 1810.0 L2964.3 1810.0" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(2572.25, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2572.25, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2572.25, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="2060.3" y="1733.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M2060.3 1764.0 L2532.3 1764.0" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M2060.3 1810.0 L2532.3 1810.0" fill="none" data-name="ImageQuestionFormData"></path>
-						</g>
-						<g transform="translate(2060.25, 1733)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2060.25, 1764)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2060.25, 1810)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="1548.3" y="1725.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M1548.3 1756.5 L2020.3 1756.5" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M1548.3 1817.5 L2020.3 1817.5" fill="none" data-name="AudioQuestionFormData"></path>
-						</g>
-						<g transform="translate(1548.25, 1725.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1548.25, 1756.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1548.25, 1817.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="1164.3" y="1658.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M1164.3 1689.0 L1508.3 1689.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M1164.3 1885.0 L1508.3 1885.0" fill="none" data-name="ScaleQuestionFormData"></path>
-						</g>
-						<g transform="translate(1164.25, 1658)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1164.25, 1689)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1164.25, 1885)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="1307.3" y="1986.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(1307.25, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="780.3" y="1718.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M780.3 1749.0 L1124.3 1749.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M780.3 1825.0 L1124.3 1825.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-						</g>
-						<g transform="translate(780.25, 1718)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(780.25, 1749)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(780.25, 1825)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="854.3" y="1986.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
-						</g>
-						<g transform="translate(854.25, 1986)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="4764.3" y="0.0" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M4764.3 31.0 L5073.3 31.0" fill="none" data-name="IScaleQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(4764.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4764.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="3600.5" y="140.0" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M3600.5 171.0 L3952.5 171.0" fill="none" data-name="ScaleQuestionFormView"></path>
-						</g>
-						<g transform="translate(3600.5, 140)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3600.5, 171)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="5797.3" y="102.0" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M5797.3 133.0 L6149.3 133.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M5797.3 179.0 L6149.3 179.0" fill="none" data-name="FreeTextQuestionFormView"></path>
-						</g>
-						<g transform="translate(5797.25, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5797.25, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5797.25, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="5113.3" y="15.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(5113.25, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="5405.3" y="124.5" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M5405.3 155.5 L5757.3 155.5" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M5405.3 186.5 L5757.3 186.5" fill="none" data-name="BoolQuestionFormView"></path>
-						</g>
-						<g transform="translate(5405.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5405.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5405.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="1431.5" y="933.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(1431.5, 933.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="5013.3" y="124.5" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M5013.3 155.5 L5365.3 155.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M5013.3 186.5 L5365.3 186.5" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(5013.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5013.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5013.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="4621.3" y="124.5" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M4621.3 155.5 L4973.3 155.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M4621.3 186.5 L4973.3 186.5" fill="none" data-name="ChoiceQuestionFormView"></path>
-						</g>
-						<g transform="translate(4621.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4621.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4621.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="4229.3" y="124.5" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M4229.3 155.5 L4581.3 155.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M4229.3 186.5 L4581.3 186.5" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-						</g>
-						<g transform="translate(4229.25, 124.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4229.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4229.25, 186.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="6104.3" y="820.0" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M6104.3 851.0 L6736.3 851.0" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M6104.3 957.0 L6736.3 957.0" fill="none" data-name="WithQuestionnaireControls"></path>
-						</g>
-						<g transform="translate(6104.25, 820)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6104.25, 851)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6104.25, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="6319.3" y="1786.5" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
-						</g>
-						<g transform="translate(6319.25, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="6189.3" y="155.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-						</g>
-						<g transform="translate(6189.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="6449.3" y="155.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-						</g>
-						<g transform="translate(6449.25, 155.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="1023.5" y="880.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M1023.5 911.0 L1391.5 911.0" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M1023.5 957.0 L1391.5 957.0" fill="none" data-name="QuestionnaireFormData"></path>
-						</g>
-						<g transform="translate(1023.5, 880)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1023.5, 911)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1023.5, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="6807.8" y="117.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M6807.8 148.0 L7239.8 148.0" fill="none" data-name="ScheduleControls"></path>
-							<path d="M6807.8 179.0 L7239.8 179.0" fill="none" data-name="ScheduleControls"></path>
-						</g>
-						<g transform="translate(6807.75, 117)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6807.75, 148)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6807.75, 179)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="6776.3" y="797.5" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M6776.3 828.5 L7271.3 828.5" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M6776.3 1054.5 L7271.3 1054.5" fill="none" data-name="WithScheduleControls"></path>
-						</g>
-						<g transform="translate(6776.25, 797.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6776.25, 828.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6776.25, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="6927.8" y="15.5" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
-						</g>
-						<g transform="translate(6927.75, 15.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="323.5" y="865.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M323.5 896.0 L621.5 896.0" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M323.5 1002.0 L621.5 1002.0" fill="none" data-name="IFormDataWithSchedule"></path>
-						</g>
-						<g transform="translate(323.5, 865)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
-								
-							</g>
-						</g>
-						<g transform="translate(323.5, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(323.5, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="392.5" y="1786.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
-						</g>
-						<g transform="translate(392.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="7049.5" y="1786.5" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
-						</g>
-						<g transform="translate(7049.5, 1786.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/design/uml.svg b/docs/uml/designer_v2/lib/features/design/uml.svg
deleted file mode 100644
index 5ea2c816d..000000000
--- a/docs/uml/designer_v2/lib/features/design/uml.svg
+++ /dev/null
@@ -1,4822 +0,0 @@
-<svg version="1.1" baseProfile="full" width="29994.8" height="2822.0" viewbox="0 0 29994.75 2822" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[ScreenerQuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultResponseOptionValidity: bool;
-	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
-	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
-	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
-	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionValues: List&lt;dynamic&gt;;
-	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isDirtyOptionsBannerVisible: bool
-	  |
-	  +dynamic onResponseOptionsChanged();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
-	  +ScreenerQuestionFormViewModel createDuplicate()
-	]
-	
-	[ScreenerQuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
-	
-	[StudyDesignEnrollmentFormView
-	  |
-	  +Widget build();
-	  -dynamic _showScreenerQuestionSidesheetWithArgs();
-	  -dynamic _showConsentItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
-	
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
-	  |
-	  +isDirtyOptionsBannerVisible: bool
-	]
-	
-	[ScreenerQuestionLogicFormView
-	  |
-	  +formViewModel: ScreenerQuestionFormViewModel
-	  |
-	  +Widget build();
-	  -dynamic _buildInfoBanner();
-	  -dynamic _buildAnswerOptionsLogicControls();
-	  -List&lt;Widget&gt; _buildOptionLogicRow()
-	]
-	
-	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
-	
-	[ConsentItemFormData
-	  |
-	  +consentId: String;
-	  +title: String;
-	  +description: String;
-	  +iconName: String?;
-	  +id: String
-	  |
-	  +ConsentItem toConsentItem();
-	  +ConsentItemFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
-	
-	[EnrollmentFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
-	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
-	  +consentItemArray: FormArray&lt;dynamic&gt;;
-	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +form: FormGroup;
-	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
-	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestScreener: bool;
-	  +canTestConsent: bool;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setControlsFrom();
-	  +EnrollmentFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
-	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
-	  +dynamic testScreener();
-	  +dynamic testConsent();
-	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
-	]
-	
-	[EnrollmentFormViewModel]o-[Study]
-	[EnrollmentFormViewModel]o-[GoRouter]
-	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
-	[EnrollmentFormViewModel]o-[FormControl]
-	[EnrollmentFormViewModel]o-[FormArray]
-	[EnrollmentFormViewModel]o-[FormViewModelCollection]
-	[EnrollmentFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
-	
-	[EnrollmentFormConsentItemDelegate
-	  |
-	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +owner: EnrollmentFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
-	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ConsentItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
-	]
-	
-	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
-	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
-	
-	[ConsentItemFormViewModel
-	  |
-	  +consentIdControl: FormControl&lt;String&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +form: FormGroup;
-	  +consentId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +ConsentItemFormData buildFormData();
-	  +ConsentItemFormViewModel createDuplicate()
-	]
-	
-	[ConsentItemFormViewModel]o-[FormControl]
-	[ConsentItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
-	
-	[ConsentItemFormView
-	  |
-	  +formViewModel: ConsentItemFormViewModel
-	]
-	
-	[ConsentItemFormView]o-[ConsentItemFormViewModel]
-	
-	[EnrollmentFormData
-	  |
-	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
-	  +enrollmentType: Participation;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
-	  +id: String
-	  |
-	  +Study apply();
-	  +EnrollmentFormData copy()
-	]
-	
-	[EnrollmentFormData]o-[Participation]
-	[EnrollmentFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
-	
-	[StudyDesignInterventionsFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
-	
-	[InterventionsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +interventionsArray: FormArray&lt;dynamic&gt;;
-	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
-	  +form: FormGroup;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +interventionsRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestStudySchedule: bool
-	  |
-	  +void setControlsFrom();
-	  +InterventionsFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +InterventionFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +dynamic testStudySchedule()
-	]
-	
-	[InterventionsFormViewModel]o-[Study]
-	[InterventionsFormViewModel]o-[GoRouter]
-	[InterventionsFormViewModel]o-[FormArray]
-	[InterventionsFormViewModel]o-[FormViewModelCollection]
-	[InterventionsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
-	
-	[InterventionFormViewModel
-	  |
-	  +study: Study;
-	  +interventionIdControl: FormControl&lt;String&gt;;
-	  +interventionTitleControl: FormControl&lt;String&gt;;
-	  +interventionIconControl: FormControl&lt;IconOption&gt;;
-	  +interventionDescriptionControl: FormControl&lt;String&gt;;
-	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
-	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
-	  +form: FormGroup;
-	  +interventionId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneTask: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +InterventionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +InterventionTaskFormViewModel provide();
-	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
-	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
-	  +InterventionFormViewModel createDuplicate()
-	]
-	
-	[InterventionFormViewModel]o-[Study]
-	[InterventionFormViewModel]o-[FormControl]
-	[InterventionFormViewModel]o-[FormArray]
-	[InterventionFormViewModel]o-[FormViewModelCollection]
-	[InterventionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
-	
-	[InterventionTaskFormData
-	  |
-	  +taskId: String;
-	  +taskTitle: String;
-	  +taskDescription: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +CheckmarkTask toTask();
-	  +InterventionTaskFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
-	
-	[StudyScheduleFormData
-	  |
-	  +sequenceType: PhaseSequence;
-	  +sequenceTypeCustom: String;
-	  +numCycles: int;
-	  +phaseDuration: int;
-	  +includeBaseline: bool;
-	  +id: String
-	  |
-	  +StudySchedule toStudySchedule();
-	  +Study apply();
-	  +StudyScheduleFormData copy()
-	]
-	
-	[StudyScheduleFormData]o-[PhaseSequence]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
-	
-	[InterventionPreview
-	  |
-	  +routeArgs: InterventionFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPreview]o-[InterventionFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
-	
-	[InterventionTaskFormViewModel
-	  |
-	  +taskIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +taskTitleControl: FormControl&lt;String&gt;;
-	  +taskDescriptionControl: FormControl&lt;String&gt;;
-	  +markAsCompletedControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +taskId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +InterventionTaskFormData buildFormData();
-	  +InterventionTaskFormViewModel createDuplicate()
-	]
-	
-	[InterventionTaskFormViewModel]o-[FormControl]
-	[InterventionTaskFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
-	
-	[InterventionsFormData
-	  |
-	  +interventionsData: List&lt;InterventionFormData&gt;;
-	  +studyScheduleData: StudyScheduleFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +InterventionsFormData copy()
-	]
-	
-	[InterventionsFormData]o-[StudyScheduleFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
-	
-	[InterventionFormView
-	  |
-	  +formViewModel: InterventionFormViewModel
-	]
-	
-	[InterventionFormView]o-[InterventionFormViewModel]
-	
-	[&lt;abstract&gt;StudyScheduleControls
-	  |
-	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
-	  &lt;static&gt;+defaultScheduleTypeSequence: String;
-	  &lt;static&gt;+defaultNumCycles: int;
-	  &lt;static&gt;+defaultPeriodLength: int;
-	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
-	  +phaseDurationControl: FormControl&lt;int&gt;;
-	  +numCyclesControl: FormControl&lt;int&gt;;
-	  +includeBaselineControl: FormControl&lt;bool&gt;;
-	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  &lt;static&gt;+kNumCyclesMin: int;
-	  &lt;static&gt;+kNumCyclesMax: int;
-	  &lt;static&gt;+kPhaseDurationMin: int;
-	  &lt;static&gt;+kPhaseDurationMax: int;
-	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +numCyclesRange: dynamic;
-	  +phaseDurationRange: dynamic;
-	  +customSequenceRequired: dynamic
-	  |
-	  +void setStudyScheduleControlsFrom();
-	  +StudyScheduleFormData buildStudyScheduleFormData();
-	  +bool isSequencingCustom()
-	]
-	
-	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
-	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
-	
-	[InterventionTaskFormView
-	  |
-	  +formViewModel: InterventionTaskFormViewModel
-	]
-	
-	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
-	
-	[InterventionFormData
-	  |
-	  +interventionId: String;
-	  +title: String;
-	  +description: String?;
-	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
-	  +iconName: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +Intervention toIntervention();
-	  +InterventionFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
-	
-	[StudyScheduleFormView
-	  |
-	  +formViewModel: StudyScheduleControls
-	  |
-	  -FormTableRow _renderCustomSequence();
-	  +Widget build()
-	]
-	
-	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
-	
-	[&lt;abstract&gt;IStudyFormData
-	  |
-	  +Study apply()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
-	
-	[StudyInfoFormData
-	  |
-	  +title: String;
-	  +description: String?;
-	  +iconName: String;
-	  +contactInfoFormData: StudyContactInfoFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
-	]
-	
-	[StudyInfoFormData]o-[StudyContactInfoFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
-	
-	[StudyContactInfoFormData
-	  |
-	  +organization: String?;
-	  +institutionalReviewBoard: String?;
-	  +institutionalReviewBoardNumber: String?;
-	  +researchers: String?;
-	  +email: String?;
-	  +website: String?;
-	  +phone: String?;
-	  +additionalInfo: String?;
-	  +id: String
-	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
-	
-	[StudyDesignInfoFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
-	
-	[StudyInfoFormViewModel
-	  |
-	  +study: Study;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +organizationControl: FormControl&lt;String&gt;;
-	  +reviewBoardControl: FormControl&lt;String&gt;;
-	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
-	  +researchersControl: FormControl&lt;String&gt;;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +websiteControl: FormControl&lt;String&gt;;
-	  +phoneControl: FormControl&lt;String&gt;;
-	  +additionalInfoControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +iconRequired: dynamic;
-	  +organizationRequired: dynamic;
-	  +reviewBoardRequired: dynamic;
-	  +reviewBoardNumberRequired: dynamic;
-	  +researchersRequired: dynamic;
-	  +emailRequired: dynamic;
-	  +phoneRequired: dynamic;
-	  +emailFormat: dynamic;
-	  +websiteFormat: dynamic
-	  |
-	  +void setControlsFrom();
-	  +StudyInfoFormData buildFormData()
-	]
-	
-	[StudyInfoFormViewModel]o-[Study]
-	[StudyInfoFormViewModel]o-[FormControl]
-	[StudyInfoFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
-	
-	[MeasurementSurveyFormData
-	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
-	]
-	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
-	
-	[MeasurementSurveyFormView
-	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
-	]
-	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
-	
-	[MeasurementSurveyFormViewModel
-	  |
-	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
-	]
-	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
-	
-	[SurveyPreview
-	  |
-	  +routeArgs: MeasurementFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
-	
-	[StudyDesignMeasurementsFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
-	
-	[MeasurementsFormData
-	  |
-	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
-	  +id: String
-	  |
-	  +Study apply();
-	  +MeasurementsFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
-	
-	[MeasurementsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +measurementsArray: FormArray&lt;dynamic&gt;;
-	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
-	  +form: FormGroup;
-	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +measurementRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +MeasurementsFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +MeasurementSurveyFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave()
-	]
-	
-	[MeasurementsFormViewModel]o-[Study]
-	[MeasurementsFormViewModel]o-[GoRouter]
-	[MeasurementsFormViewModel]o-[FormArray]
-	[MeasurementsFormViewModel]o-[FormViewModelCollection]
-	[MeasurementsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
-	
-	[StudyFormValidationSet
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
-	]
-	
-	[Enum]&lt;:--[StudyFormValidationSet]
-	
-	[ReportsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +reportItemDelegate: ReportFormItemDelegate;
-	  +reportItemArray: FormArray&lt;dynamic&gt;;
-	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +form: FormGroup;
-	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestConsent: bool
-	  |
-	  +void setControlsFrom();
-	  +ReportsFormData buildFormData();
-	  +void read();
-	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
-	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
-	  +dynamic testReport();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide()
-	]
-	
-	[ReportsFormViewModel]o-[Study]
-	[ReportsFormViewModel]o-[GoRouter]
-	[ReportsFormViewModel]o-[ReportFormItemDelegate]
-	[ReportsFormViewModel]o-[FormArray]
-	[ReportsFormViewModel]o-[FormViewModelCollection]
-	[ReportsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
-	
-	[ReportFormItemDelegate
-	  |
-	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +owner: ReportsFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
-	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
-	]
-	
-	[ReportFormItemDelegate]o-[FormViewModelCollection]
-	[ReportFormItemDelegate]o-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
-	
-	[ReportItemFormData
-	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
-	  +id: String
-	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
-	]
-	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
-	
-	[ReportItemFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
-	  |
-	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
-	]
-	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
-	
-	[ReportItemFormViewModel
-	  |
-	  &lt;static&gt;+defaultSectionType: ReportSectionType;
-	  +sectionIdControl: FormControl&lt;String&gt;;
-	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +sectionControl: FormControl&lt;ReportSection&gt;;
-	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
-	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
-	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
-	  +alphaControl: FormControl&lt;double&gt;;
-	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +form: FormGroup;
-	  +sectionId: String;
-	  +sectionType: ReportSectionType;
-	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
-	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
-	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +dataReferenceRequired: dynamic;
-	  +aggregationRequired: dynamic;
-	  +improvementDirectionRequired: dynamic;
-	  +alphaConfidenceRequired: dynamic
-	  |
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +ReportItemFormData buildFormData();
-	  +ReportItemFormViewModel createDuplicate();
-	  +dynamic onSectionTypeChanged();
-	  -void _updateFormControls();
-	  +void setControlsFrom()
-	]
-	
-	[ReportItemFormViewModel]o-[ReportSectionType]
-	[ReportItemFormViewModel]o-[FormControl]
-	[ReportItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
-	
-	[TemporalAggregationFormatted
-	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
-	]
-	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
-	
-	[ImprovementDirectionFormatted
-	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
-	]
-	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
-	
-	[ReportSectionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
-	]
-	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
-	
-	[AverageSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
-	
-	[LinearRegressionSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
-	
-	[DataReferenceIdentifier
-	  |
-	  +hashCode: int
-	  |
-	  +bool ==()
-	]
-	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
-	
-	[DataReferenceEditor
-	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
-	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
-	]
-	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
-	
-	[ReportsFormData
-	  |
-	  +reportItems: List&lt;ReportItemFormData&gt;;
-	  +id: String
-	  |
-	  +Study apply();
-	  +ReportsFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
-	
-	[ReportStatus
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
-	  &lt;static&gt;+primary: ReportStatus;
-	  &lt;static&gt;+secondary: ReportStatus
-	]
-	
-	[ReportStatus]o-[ReportStatus]
-	[Enum]&lt;:--[ReportStatus]
-	
-	[ReportBadge
-	  |
-	  +status: ReportStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
-	  |
-	  +Widget build()
-	]
-	
-	[ReportBadge]o-[ReportStatus]
-	[ReportBadge]o-[BadgeType]
-	
-	[StudyDesignReportsFormView
-	  |
-	  +Widget build();
-	  -dynamic _showReportItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
-	
-	[StudyFormScaffold
-	  |
-	  +studyId: String;
-	  +formViewModelBuilder: T Function(WidgetRef);
-	  +formViewBuilder: Widget Function(T)
-	  |
-	  +Widget build()
-	]
-	
-	[StudyFormScaffold]o-[T Function(WidgetRef)]
-	[StudyFormScaffold]o-[Widget Function(T)]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
-	
-	[SurveyQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
-	]
-	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
-	
-	[QuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
-	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
-	]
-	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
-	
-	[&lt;abstract&gt;QuestionFormData
-	  |
-	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
-	  +questionId: String;
-	  +questionText: String;
-	  +questionInfoText: String?;
-	  +questionType: SurveyQuestionType;
-	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
-	  +responseOptions: List&lt;dynamic&gt;;
-	  +id: String
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +EligibilityCriterion toEligibilityCriterion();
-	  +Answer&lt;dynamic&gt; constructAnswerFor();
-	  +dynamic setResponseOptionsValidityFrom();
-	  +QuestionFormData copy()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
-	
-	[ChoiceQuestionFormData
-	  |
-	  +isMultipleChoice: bool;
-	  +answerOptions: List&lt;String&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +QuestionFormData copy();
-	  -Choice _buildChoiceForValue();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
-	
-	[BoolQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +BoolQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
-	
-	[ImageQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +ImageQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
-	
-	[AudioQuestionFormData
-	  |
-	  +maxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +AudioQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
-	
-	[ScaleQuestionFormData
-	  |
-	  +minValue: double;
-	  +maxValue: double;
-	  +minLabel: String?;
-	  +maxLabel: String?;
-	  +midValues: List&lt;double?&gt;;
-	  +midLabels: List&lt;String?&gt;;
-	  +stepSize: double;
-	  +initialValue: double?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +responseOptions: List&lt;double&gt;;
-	  +midAnnotations: List&lt;Annotation&gt;
-	  |
-	  +ScaleQuestion toQuestion();
-	  +QuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[ScaleQuestionFormData]o-[Color]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
-	
-	[FreeTextQuestionFormData
-	  |
-	  +textLengthRange: List&lt;int&gt;;
-	  +textType: FreeTextQuestionType;
-	  +textTypeExpression: String?;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +FreeTextQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	]
-	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
-	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
-	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
-	]
-	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
-	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
-	[SurveyQuestionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
-	]
-	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[AudioRecordingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
-	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
-	
-	[ImageCapturingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls
-	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
-	  +void read();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
-	]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	
-	[QuestionnaireFormData
-	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
-	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
-	
-	[ScheduleControls
-	  |
-	  +formViewModel: WithScheduleControls
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
-	]
-	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule
-	  |
-	  +instanceId: String;
-	  +isTimeLocked: bool;
-	  +timeLockStart: StudyUTimeOfDay?;
-	  +timeLockEnd: StudyUTimeOfDay?;
-	  +hasReminder: bool;
-	  +reminderTime: StudyUTimeOfDay?
-	  |
-	  +Schedule toSchedule()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
-	
-	[&lt;abstract&gt;WithScheduleControls
-	  |
-	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
-	  +instanceID: FormControl&lt;String&gt;;
-	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +hasReminderControl: FormControl&lt;bool&gt;;
-	  +reminderTimeControl: FormControl&lt;Time&gt;;
-	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
-	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
-	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  +hasReminder: bool;
-	  +isTimeRestricted: bool;
-	  +timeRestriction: List&lt;Time&gt;?
-	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
-	]
-	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
-	
-	[StudyFormViewModel
-	  |
-	  +studyDirtyCopy: Study?;
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +router: GoRouter;
-	  +studyInfoFormViewModel: StudyInfoFormViewModel;
-	  +enrollmentFormViewModel: EnrollmentFormViewModel;
-	  +measurementsFormViewModel: MeasurementsFormViewModel;
-	  +reportsFormViewModel: ReportsFormViewModel;
-	  +interventionsFormViewModel: InterventionsFormViewModel;
-	  +form: FormGroup;
-	  +isStudyReadonly: bool;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +void dispose();
-	  +void onCancel();
-	  +dynamic onSave();
-	  -dynamic _applyAndSaveSubform()
-	]
-	
-	[StudyFormViewModel]o-[Study]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyFormViewModel]o-[GoRouter]
-	[StudyFormViewModel]o-[StudyInfoFormViewModel]
-	[StudyFormViewModel]o-[EnrollmentFormViewModel]
-	[StudyFormViewModel]o-[MeasurementsFormViewModel]
-	[StudyFormViewModel]o-[ReportsFormViewModel]
-	[StudyFormViewModel]o-[InterventionsFormViewModel]
-	[StudyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget
-	  |
-	  +Widget? banner()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="2822.0" width="29994.8" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M6857.5 2713.7 L6857.5 2715 L8258.25 2749.30013795482 L8258.3 2749.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6862.8 2704.3 L6857.5 2713.7 L6852.2 2704.3 L6857.5 2695.0 Z"></path>
-					</g>
-					<path d="M16177.0 2334.1 L16173.25 2342 L7138.5 2522.87441966562 L7138.5 2522.9 " fill="none"></path>
-					<path d="M16181.8 2336.3 L16177.0 2334.1 L16172.2 2331.8 L16182.7 2322.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M801.0 1697.3 L801 2342 L6576.5 2519.84706513663 L6576.5 2519.8 " fill="none"></path>
-					</g>
-					<path d="M806.3 1697.3 L801.0 1697.3 L795.7 1697.3 L801.0 1684.0 Z"></path>
-					<path d="M1189.3 398.4 L224.5 531 L224.5 701.5 L224.5 701.5 " fill="none"></path>
-					<path d="M1190.0 403.7 L1189.3 398.4 L1188.6 393.1 L1202.5 396.6 Z"></path>
-					<path d="M2408.3 1740.7 L2408.25 2342 L6576.5 2516.7212732483003 L6576.5 2516.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2413.6 1731.3 L2408.3 1740.7 L2402.9 1731.3 L2408.3 1722.0 Z"></path>
-					</g>
-					<path d="M16034.4 107.6 L3081.5 233 L3081.5 382 L3081.5 382 L3081.5 531 L3081.5 531 L3081.5 747.5 L3081.5 747.5 L3081.5 964 L3081.5 964 L2475.6727140783746 1584 L2475.7 1584.0 " fill="none"></path>
-					<path d="M16034.5 112.9 L16034.4 107.6 L16034.4 102.2 L16047.8 107.4 Z"></path>
-					<path d="M24974.4 109.1 L22050.5 233 L22050.5 298 L22050.5 298.0 " fill="none"></path>
-					<path d="M24974.7 114.5 L24974.4 109.1 L24974.2 103.8 L24987.8 108.6 Z"></path>
-					<path d="M5489.2 1919.7 L5351 2342 L7178.5 2525.4385091496233 L7178.5 2525.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5497.2 1912.5 L5489.2 1919.7 L5487.0 1909.2 L5495.0 1902.0 Z"></path>
-					</g>
-					<path d="M5504.6 1920.0 L5391 2342 L8915.5 2526.0972552863745 L8915.5 2526.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5512.2 1912.4 L5504.6 1920.0 L5501.9 1909.6 L5509.5 1902.0 Z"></path>
-					</g>
-					<path d="M5520.1 1920.3 L5431 2342 L5736.5 2422.759390503189 L5736.5 2422.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5527.2 1912.2 L5520.1 1920.3 L5516.8 1910.0 L5523.9 1902.0 Z"></path>
-					</g>
-					<path d="M5535.5 1920.5 L5471 2342 L10248.5 2526.320179975176 L10248.5 2526.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5542.2 1912.0 L5535.5 1920.5 L5531.7 1910.4 L5538.4 1902.0 Z"></path>
-					</g>
-					<path d="M5607.6 1920.5 L5656.5 2342 L5656.5 2528.5 L5656.5 2528.5 L5656.5 2715 L5656.5 2715 L8258.25 2749.8437706309537 L8258.3 2749.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5611.8 1910.7 L5607.6 1920.5 L5601.2 1911.9 L5605.4 1902.0 Z"></path>
-					</g>
-					<path d="M5623.1 1920.4 L5696.5 2342 L5696.5 2528.5 L5696.5 2528.5 L5696.5 2715 L5696.5 2715 L8396.25 2749.116267687105 L8396.3 2749.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5626.7 1910.3 L5623.1 1920.4 L5616.2 1912.1 L5619.9 1902.0 Z"></path>
-					</g>
-					<path d="M5808.5 1916.0 L6184.25 2342 L9467.25 2525.5645330535153 L9467.3 2525.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5806.3 1905.5 L5808.5 1916.0 L5798.3 1912.5 L5796.1 1902.0 Z"></path>
-					</g>
-					<path d="M3865.8 400.4 L3287.5 531 L3287.5 747.5 L3287.5 747.5 L3287.5 964 L3287.5 964 L5125.5 1517.2468326780254 L5125.5 1517.2 " fill="none"></path>
-					<path d="M3867.0 405.6 L3865.8 400.4 L3864.7 395.2 L3878.8 397.5 Z"></path>
-					<path d="M15518.8 874.1 L15285.5 964 L6027.5 1620.9947471418272 L6027.5 1621.0 " fill="none"></path>
-					<path d="M15520.7 879.1 L15518.8 874.1 L15516.9 869.1 L15531.3 869.3 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M11147.9 384.7 L4561.5 531 L4561.5 747.5 L4561.5 747.5 L4561.5 964 L4561.5 964 L5209.685776487663 1404 L5209.7 1404.0 " fill="none"></path>
-					</g>
-					<path d="M11148.0 390.0 L11147.9 384.7 L11147.8 379.4 L11161.3 384.4 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M870.4 770.0 L555 964 L5125.5 1591.118291347207 L5125.5 1591.1 " fill="none"></path>
-					</g>
-					<path d="M873.2 774.5 L870.4 770.0 L867.6 765.4 L881.8 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M15015.3 398.4 L14129.25 531 L14129.25 747.5 L14129.25 747.5 L14129.25 964 L14129.25 964 L6027.5 1616.6679430592499 L6027.5 1616.7 " fill="none"></path>
-					</g>
-					<path d="M15016.1 403.7 L15015.3 398.4 L15014.5 393.1 L15028.5 396.4 Z"></path>
-					<path d="M6136.5 2653.7 L6136.5 2715 L8396.25 2748.8592909148465 L8396.3 2748.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6141.8 2644.3 L6136.5 2653.7 L6131.2 2644.3 L6136.5 2635.0 Z"></path>
-					</g>
-					<path d="M6304.7 2411.3 L6404.25 2342 L5875.643323657475 1902 L5875.6 1902.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6294.0 2412.3 L6304.7 2411.3 L6300.1 2421.0 L6289.4 2422.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M11147.9 384.9 L5085.5 531 L5085.5 747.5 L5085.5 747.5 L5085.5 964 L5085.5 964 L5085.5 1653 L5085.5 1653 L5085.5 2342 L5085.5 2342 L5736.5 2457.519980970504 L5736.5 2457.5 " fill="none"></path>
-					</g>
-					<path d="M11148.0 390.3 L11147.9 384.9 L11147.8 379.6 L11161.3 384.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M873.7 770.6 L595 964 L595 1653 L595 1653 L595 2342 L595 2342 L5736.5 2515.0379409907064 L5736.5 2515.0 " fill="none"></path>
-					</g>
-					<path d="M876.7 775.0 L873.7 770.6 L870.7 766.2 L884.7 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M15053.5 400.9 L14561.25 531 L14561.25 747.5 L14561.25 747.5 L14561.25 964 L14561.25 964 L14561.25 1653 L14561.25 1653 L14561.25 2342 L14561.25 2342 L6536.5 2519.645137837918 L6536.5 2519.6 " fill="none"></path>
-					</g>
-					<path d="M15054.8 406.1 L15053.5 400.9 L15052.1 395.8 L15066.4 397.5 Z"></path>
-					<path d="M1417.0 1799.6 L1221 2342 L10248.5 2527.3400209158963 L10248.5 2527.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1425.2 1792.6 L1417.0 1799.6 L1415.2 1789.0 L1423.4 1782.0 Z"></path>
-					</g>
-					<path d="M1529.5 1799.3 L1750 2342 L9467.25 2527.2398243186717 L9467.3 2527.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1530.9 1788.6 L1529.5 1799.3 L1521.0 1792.7 L1522.4 1782.0 Z"></path>
-					</g>
-					<path d="M1441.2 772.2 L1241 964 L1427.1248185776487 1524 L1427.1 1524.0 " fill="none"></path>
-					<path d="M1444.9 776.1 L1441.2 772.2 L1437.5 768.4 L1450.8 763.0 Z"></path>
-					<path d="M1805.0 797.2 L1805 964 L1532.721335268505 1524 L1532.7 1524.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1810.3 787.8 L1805.0 797.2 L1799.7 787.8 L1805.0 778.5 Z"></path>
-					</g>
-					<path d="M22734.9 845.2 L22624.25 964 L22624.25 1637.5 L22624.3 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22745.1 842.0 L22734.9 845.2 L22737.3 834.7 L22747.6 831.5 Z"></path>
-					</g>
-					<path d="M22878.5 848.0 L22939.25 964 L27467.5 1626.0965037933047 L27467.5 1626.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22878.8 837.3 L22878.5 848.0 L22869.4 842.2 L22869.8 831.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M23365.3 402.2 L22825.75 531 L22825.75 663.5 L22825.8 663.5 " fill="none"></path>
-					</g>
-					<path d="M23366.5 407.4 L23365.3 402.2 L23364.0 397.0 L23378.3 399.1 Z"></path>
-					<path d="M1189.5 408.4 L637 531 L637 716.5 L637.0 716.5 " fill="none"></path>
-					<path d="M1190.6 413.6 L1189.5 408.4 L1188.3 403.2 L1202.5 405.5 Z"></path>
-					<path d="M8181.0 1859.4 L7993.25 2342 L7239.5 2521.24689193497 L7239.5 2521.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8189.3 1852.6 L8181.0 1859.4 L8179.4 1848.8 L8187.7 1842.0 Z"></path>
-					</g>
-					<path d="M8261.2 1860.7 L8261 2342 L8915.5 2516.253033547466 L8915.5 2516.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8266.5 1851.3 L8261.2 1860.7 L8255.8 1851.3 L8261.2 1842.0 Z"></path>
-					</g>
-					<path d="M8341.5 1859.4 L8529 2342 L8529 2528.5 L8529 2528.5 L8529 2715 L8529 2715 L8356.25 2742.6555806087936 L8356.3 2742.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8343.0 1848.8 L8341.5 1859.4 L8333.1 1852.6 L8334.7 1842.0 Z"></path>
-					</g>
-					<path d="M8404.4 1857.3 L8744 2342 L8744 2528.5 L8744 2528.5 L8744 2715 L8744 2715 L8609.774647887323 2735 L8609.8 2735.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8403.4 1846.6 L8404.4 1857.3 L8394.7 1852.7 L8393.7 1842.0 Z"></path>
-					</g>
-					<path d="M8415.9 1856.9 L8784 2342 L9467.25 2515.1921508664627 L9467.3 2515.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8414.5 1846.2 L8415.9 1856.9 L8406.0 1852.7 L8404.6 1842.0 Z"></path>
-					</g>
-					<path d="M3870.0 400.6 L3327.5 531 L3327.5 747.5 L3327.5 747.5 L3327.5 964 L3327.5 964 L7841.75 1594.416670889283 L7841.8 1594.4 " fill="none"></path>
-					<path d="M3871.3 405.8 L3870.0 400.6 L3868.8 395.4 L3883.0 397.5 Z"></path>
-					<path d="M17265.3 953.6 L17255.25 964 L8680.75 1620.8635201245274 L8680.8 1620.9 " fill="none"></path>
-					<path d="M17269.2 957.3 L17265.3 953.6 L17261.5 949.9 L17274.6 944.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M11147.9 385.4 L5993.25 531 L5993.25 747.5 L5993.25 747.5 L5993.25 964 L5993.25 964 L7841.75 1525.55930335097 L7841.8 1525.6 " fill="none"></path>
-					</g>
-					<path d="M11148.1 390.8 L11147.9 385.4 L11147.8 380.1 L11161.3 385.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M887.0 773.6 L741 964 L7841.75 1614.5657059273296 L7841.8 1614.6 " fill="none"></path>
-					</g>
-					<path d="M891.2 776.8 L887.0 773.6 L882.8 770.3 L895.1 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M15121.6 410.7 L15107.5 531 L15107.5 747.5 L15107.5 747.5 L15107.5 964 L15107.5 964 L8680.75 1610.781924411174 L8680.8 1610.8 " fill="none"></path>
-					</g>
-					<path d="M15126.9 411.4 L15121.6 410.7 L15116.3 410.1 L15123.2 397.5 Z"></path>
-					<path d="M2956.9 1903.5 L2728 2342 L7178.5 2527.230584690917 L7178.5 2527.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2966.0 1897.7 L2956.9 1903.5 L2956.5 1892.8 L2965.6 1887.0 Z"></path>
-					</g>
-					<path d="M2971.3 1903.9 L2768 2342 L10248.5 2527.1019304763167 L10248.5 2527.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2980.1 1897.7 L2971.3 1903.9 L2970.4 1893.2 L2979.2 1887.0 Z"></path>
-					</g>
-					<path d="M3087.8 1905.7 L3087.75 2342 L3087.75 2528.5 L3087.75 2528.5 L3087.75 2715 L3087.75 2715 L8258.25 2750.166730529744 L8258.3 2750.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3093.1 1896.3 L3087.8 1905.7 L3082.4 1896.3 L3087.8 1887.0 Z"></path>
-					</g>
-					<path d="M3390.0 1898.8 L3935 2342 L3935 2528.5 L3935 2528.5 L3935 2715 L3935 2715 L8396.25 2749.6495378220206 L8396.3 2749.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3386.1 1888.8 L3390.0 1898.8 L3379.4 1897.0 L3375.5 1887.0 Z"></path>
-					</g>
-					<path d="M3403.8 1898.4 L3975 2342 L9467.25 2526.734140403084 L9467.3 2526.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3399.7 1888.5 L3403.8 1898.4 L3393.2 1896.9 L3389.1 1887.0 Z"></path>
-					</g>
-					<path d="M1470.8 776.2 L1496 964 L2660.25 1467.9536673472594 L2660.3 1468.0 " fill="none"></path>
-					<path d="M1476.1 775.5 L1470.8 776.2 L1465.6 776.9 L1469.1 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M11147.9 385.5 L6033.25 531 L6033.25 747.5 L6033.25 747.5 L6033.25 964 L6033.25 964 L3515.25 1553.0008487523342 L3515.3 1553.0 " fill="none"></path>
-					</g>
-					<path d="M11148.1 390.8 L11147.9 385.5 L11147.8 380.1 L11161.3 385.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M891.3 774.5 L781 964 L2660.25 1525.3106101658177 L2660.3 1525.3 " fill="none"></path>
-					</g>
-					<path d="M895.9 777.2 L891.3 774.5 L886.7 771.8 L898.0 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M15234.7 397.2 L16203.25 531 L16203.25 747.5 L16203.25 747.5 L16203.25 964 L16203.25 964 L3515.25 1630.5420304220197 L3515.3 1630.5 " fill="none"></path>
-					</g>
-					<path d="M15235.4 391.9 L15234.7 397.2 L15234.0 402.4 L15221.5 395.3 Z"></path>
-					<path d="M28201.8 443.8 L27973.75 531 L27973.75 663.5 L27973.8 663.5 " fill="none"></path>
-					<path d="M28203.7 448.7 L28201.8 443.8 L28199.9 438.8 L28214.3 439.0 Z"></path>
-					<path d="M23211.3 1770.7 L23211.25 2342 L20418.5 2523.749236674518 L20418.5 2523.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23216.6 1761.3 L23211.3 1770.7 L23205.9 1761.3 L23211.3 1752.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M23365.9 417.0 L23092.75 531 L23092.75 747.5 L23092.75 747.5 L23092.75 964 L23092.75 964 L23194.223149492016 1554 L23194.2 1554.0 " fill="none"></path>
-					</g>
-					<path d="M23368.0 421.9 L23365.9 417.0 L23363.9 412.1 L23378.3 411.8 Z"></path>
-					<path d="M18583.8 812.7 L18583.75 964 L18583.75 1637.5 L18583.8 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18589.1 803.3 L18583.8 812.7 L18578.4 803.3 L18583.8 794.0 Z"></path>
-					</g>
-					<path d="M20049.0 390.6 L18583.75 531 L18583.75 701 L18583.8 701.0 " fill="none"></path>
-					<path d="M20049.5 395.9 L20049.0 390.6 L20048.5 385.2 L20062.3 389.3 Z"></path>
-					<path d="M7373.7 1806.0 L7093.25 2342 L10248.5 2525.219156223243 L10248.5 2525.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7382.7 1800.2 L7373.7 1806.0 L7373.3 1795.3 L7382.3 1789.5 Z"></path>
-					</g>
-					<path d="M7538.9 1805.8 L7837.5 2342 L9467.25 2522.679670084708 L9467.3 2522.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7539.0 1795.1 L7538.9 1805.8 L7529.7 1800.2 L7529.8 1789.5 Z"></path>
-					</g>
-					<path d="M1476.0 775.7 L1536 964 L7105.75 1612.482573613282 L7105.8 1612.5 " fill="none"></path>
-					<path d="M1481.1 774.1 L1476.0 775.7 L1470.9 777.3 L1471.9 763.0 Z"></path>
-					<path d="M17901.1 906.6 L17818 964 L7801.75 1629.865475070555 L7801.8 1629.9 " fill="none"></path>
-					<path d="M17904.1 911.0 L17901.1 906.6 L17898.0 902.2 L17912.0 899.0 Z"></path>
-					<path d="M23329.8 835.2 L23329.75 964 L23228.276850507984 1554 L23228.3 1554.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23335.1 825.8 L23329.8 835.2 L23324.4 825.8 L23329.8 816.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M23416.4 423.4 L23329.75 531 L23329.75 678.5 L23329.8 678.5 " fill="none"></path>
-					</g>
-					<path d="M23420.6 426.7 L23416.4 423.4 L23412.3 420.0 L23424.8 413.0 Z"></path>
-					<path d="M3761.0 797.2 L3761 964 L3316.4009433962265 1419 L3316.4 1419.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3766.3 787.8 L3761.0 797.2 L3755.7 787.8 L3761.0 778.5 Z"></path>
-					</g>
-					<path d="M17464.8 962.7 L17464.75 964 L17464.75 1653 L17464.75 1653 L17464.75 2342 L17464.75 2342 L20272.5 2523.773973791547 L20272.5 2523.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17470.1 953.3 L17464.8 962.7 L17459.4 953.3 L17464.8 944.0 Z"></path>
-					</g>
-					<path d="M17764.4 954.6 L17778 964 L17778 1653 L17778 1653 L17778 2342 L17778 2342 L10361.5 2527.0899571791783 L10361.5 2527.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17759.8 944.9 L17764.4 954.6 L17753.7 953.7 L17749.1 944.0 Z"></path>
-					</g>
-					<path d="M4195.0 797.2 L4195 964 L7105.75 1579.422094361335 L7105.8 1579.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4200.3 787.8 L4195.0 797.2 L4189.7 787.8 L4195.0 778.5 Z"></path>
-					</g>
-					<path d="M24974.4 109.5 L22410.5 233 L22410.5 283 L22410.5 283.0 " fill="none"></path>
-					<path d="M24974.7 114.8 L24974.4 109.5 L24974.2 104.2 L24987.8 108.9 Z"></path>
-					<path d="M17464.8 454.7 L17464.75 531 L17464.75 551 L17464.8 551.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17470.1 445.3 L17464.8 454.7 L17459.4 445.3 L17464.8 436.0 Z"></path>
-					</g>
-					<path d="M16253.0 117.0 L17464.75 233 L17464.75 328 L17464.8 328.0 " fill="none"></path>
-					<path d="M16253.5 111.7 L16253.0 117.0 L16252.5 122.3 L16239.8 115.7 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M24974.5 111.5 L23449.75 233 L23449.75 351 L23449.8 351.0 " fill="none"></path>
-					</g>
-					<path d="M24974.9 116.8 L24974.5 111.5 L24974.0 106.1 L24987.8 110.4 Z"></path>
-					<path d="M23773.8 850.2 L23773.75 964 L23876.81603773585 1539 L23876.8 1539.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23779.1 840.8 L23773.8 850.2 L23768.4 840.8 L23773.8 831.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M23529.3 418.6 L23773.75 531 L23773.75 663.5 L23773.8 663.5 " fill="none"></path>
-					</g>
-					<path d="M23531.5 413.7 L23529.3 418.6 L23527.0 423.4 L23517.2 413.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M23534.2 404.0 L24020.75 531 L24020.75 747.5 L24020.75 747.5 L24020.75 964 L24020.75 964 L23917.68396226415 1539 L23917.7 1539.0 " fill="none"></path>
-					</g>
-					<path d="M23535.5 398.9 L23534.2 404.0 L23532.8 409.2 L23521.3 400.7 Z"></path>
-					<path d="M1427.6 403.2 L2147 531 L2147 716.5 L2147.0 716.5 " fill="none"></path>
-					<path d="M1428.6 397.9 L1427.6 403.2 L1426.7 408.4 L1414.5 400.8 Z"></path>
-					<path d="M4245.1 1911.0 L4015 2342 L7178.5 2526.719082654978 L7178.5 2526.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4254.2 1905.2 L4245.1 1911.0 L4244.8 1900.2 L4253.9 1894.5 Z"></path>
-					</g>
-					<path d="M4382.8 1913.2 L4382.75 2342 L10248.5 2526.7207353624044 L10248.5 2526.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4388.1 1903.8 L4382.8 1913.2 L4377.4 1903.8 L4382.8 1894.5 Z"></path>
-					</g>
-					<path d="M4550.0 1910.1 L4831 2342 L9467.25 2526.411756864836 L9467.3 2526.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4549.4 1899.4 L4550.0 1910.1 L4540.5 1905.2 L4539.9 1894.5 Z"></path>
-					</g>
-					<path d="M3874.3 400.8 L3367.5 531 L3367.5 747.5 L3367.5 747.5 L3367.5 964 L3367.5 964 L4034.75 1416.8295986210294 L4034.8 1416.8 " fill="none"></path>
-					<path d="M3875.6 406.0 L3874.3 400.8 L3872.9 395.7 L3887.2 397.5 Z"></path>
-					<path d="M28363.3 865.2 L28363.25 964 L27722.778301886792 1584 L27722.8 1584.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28368.6 855.8 L28363.3 865.2 L28357.9 855.8 L28363.3 846.5 Z"></path>
-					</g>
-					<path d="M28363.3 479.3 L28363.25 531 L28363.25 648.5 L28363.3 648.5 " fill="none"></path>
-					<path d="M28368.6 479.3 L28363.3 479.3 L28357.9 479.3 L28363.3 466.0 Z"></path>
-					<path d="M4823.5 797.2 L4823.5 964 L9892.75 1608.7391665512944 L9892.8 1608.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4828.8 787.8 L4823.5 797.2 L4818.2 787.8 L4823.5 778.5 Z"></path>
-					</g>
-					<path d="M10182.8 1882.6 L10066.75 2342 L7239.5 2526.509535473712 L7239.5 2526.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10190.2 1874.9 L10182.8 1882.6 L10179.9 1872.2 L10187.3 1864.5 Z"></path>
-					</g>
-					<path d="M10262.2 1883.1 L10305 2342 L10305 2513 L10305.0 2513.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10266.6 1873.3 L10262.2 1883.1 L10256.0 1874.3 L10260.5 1864.5 Z"></path>
-					</g>
-					<path d="M10310.4 1882.4 L10450 2342 L9572.25 2517.9746036011825 L9572.3 2518.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10312.8 1871.9 L10310.4 1882.4 L10302.6 1875.0 L10305.0 1864.5 Z"></path>
-					</g>
-					<path d="M1480.8 774.9 L1576 964 L9892.75 1625.327880204276 L9892.8 1625.3 " fill="none"></path>
-					<path d="M1485.6 772.5 L1480.8 774.9 L1476.0 777.3 L1474.8 763.0 Z"></path>
-					<path d="M15524.1 881.6 L15325.5 964 L10588.75 1605.8448792959339 L10588.8 1605.8 " fill="none"></path>
-					<path d="M15526.1 886.5 L15524.1 881.6 L15522.0 876.7 L15536.4 876.5 Z"></path>
-					<path d="M17929.6 907.3 L17858 964 L10588.75 1621.5224982769373 L10588.8 1621.5 " fill="none"></path>
-					<path d="M17932.9 911.5 L17929.6 907.3 L17926.3 903.1 L17940.0 899.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M11389.9 399.4 L12297.5 531 L12297.5 747.5 L12297.5 747.5 L12297.5 964 L12297.5 964 L10588.75 1536.4219034885134 L10588.8 1536.4 " fill="none"></path>
-					</g>
-					<path d="M11390.6 394.1 L11389.9 399.4 L11389.1 404.7 L11376.7 397.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M909.7 776.3 L927 964 L9892.75 1627.2561266944035 L9892.8 1627.3 " fill="none"></path>
-					</g>
-					<path d="M915.0 775.8 L909.7 776.3 L904.3 776.8 L908.4 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M15234.7 396.6 L16243.25 531 L16243.25 747.5 L16243.25 747.5 L16243.25 964 L16243.25 964 L10588.75 1613.0546438983756 L10588.8 1613.1 " fill="none"></path>
-					</g>
-					<path d="M15235.4 391.3 L15234.7 396.6 L15234.0 401.9 L15221.5 394.9 Z"></path>
-					<path d="M18960.8 812.7 L18960.75 964 L18960.75 1637.5 L18960.8 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18966.1 803.3 L18960.8 812.7 L18955.4 803.3 L18960.8 794.0 Z"></path>
-					</g>
-					<path d="M20049.0 393.3 L18960.75 531 L18960.75 701 L18960.8 701.0 " fill="none"></path>
-					<path d="M20049.7 398.6 L20049.0 393.3 L20048.4 388.0 L20062.3 391.6 Z"></path>
-					<path d="M1427.7 397.5 L2453.5 531 L2453.5 716.5 L2453.5 716.5 " fill="none"></path>
-					<path d="M1428.4 392.2 L1427.7 397.5 L1427.0 402.8 L1414.5 395.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M23534.4 396.7 L24307.75 531 L24307.75 686 L24307.8 686.0 " fill="none"></path>
-					</g>
-					<path d="M23535.3 391.4 L23534.4 396.7 L23533.5 402.0 L23521.3 394.4 Z"></path>
-					<path d="M9140.0 1850.2 L8824 2342 L7239.5 2524.9778637770896 L7239.5 2525.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9149.6 1845.2 L9140.0 1850.2 L9140.6 1839.5 L9150.1 1834.5 Z"></path>
-					</g>
-					<path d="M9178.8 1851.6 L8961.5 2342 L8961.5 2513 L8961.5 2513.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9187.4 1845.2 L9178.8 1851.6 L9177.7 1840.9 L9186.3 1834.5 Z"></path>
-					</g>
-					<path d="M9313.3 1852.7 L9427.25 2342 L9427.25 2528.5 L9427.25 2528.5 L9427.25 2715 L9427.25 2715 L8356.25 2748.946875 L8356.3 2748.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9316.3 1842.4 L9313.3 1852.7 L9306.0 1844.8 L9309.0 1834.5 Z"></path>
-					</g>
-					<path d="M9366.1 1851.2 L9612.25 2342 L9612.25 2528.5 L9612.25 2528.5 L9612.25 2715 L9612.25 2715 L8615.25 2746.9868956168098 L8615.3 2747.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9366.7 1840.5 L9366.1 1851.2 L9357.2 1845.2 L9357.8 1834.5 Z"></path>
-					</g>
-					<path d="M9377.4 1850.8 L9652.25 2342 L9530.762064343164 2513 L9530.8 2513.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9377.5 1840.0 L9377.4 1850.8 L9368.2 1845.2 L9368.3 1834.5 Z"></path>
-					</g>
-					<path d="M4011.7 401.4 L4441.5 531 L4441.5 747.5 L4441.5 747.5 L4441.5 964 L4441.5 964 L8720.75 1575.036371172478 L8720.8 1575.0 " fill="none"></path>
-					<path d="M4013.2 396.2 L4011.7 401.4 L4010.1 406.5 L3998.9 397.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M11391.5 399.0 L12337.5 531 L12337.5 747.5 L12337.5 747.5 L12337.5 964 L12337.5 964 L9812.75 1530.4911666530977 L9812.8 1530.5 " fill="none"></path>
-					</g>
-					<path d="M11392.2 393.7 L11391.5 399.0 L11390.7 404.3 L11378.3 397.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M914.9 775.8 L967 964 L8720.75 1607.6740564474833 L8720.8 1607.7 " fill="none"></path>
-					</g>
-					<path d="M920.0 774.4 L914.9 775.8 L909.7 777.3 L911.3 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M15234.7 396.1 L16283.25 531 L16283.25 747.5 L16283.25 747.5 L16283.25 964 L16283.25 964 L9812.75 1599.3843796764768 L9812.8 1599.4 " fill="none"></path>
-					</g>
-					<path d="M15235.4 390.8 L15234.7 396.1 L15234.0 401.4 L15221.5 394.4 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M10717.7 1681.6 L10595 2342 L10595 2490 L10595.0 2490.0 " fill="none"></path>
-					</g>
-					<path d="M10722.9 1682.6 L10717.7 1681.6 L10712.4 1680.6 L10720.1 1668.5 Z"></path>
-					<path d="M12101.3 1841.4 L11686.75 2342 L7239.5 2527.2296633353803 L7239.5 2527.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12111.3 1837.6 L12101.3 1841.4 L12103.1 1830.8 L12113.2 1827.0 Z"></path>
-					</g>
-					<path d="M12150.4 1843.3 L11870.25 2342 L9007.5 2525.550623119897 L9007.5 2525.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12159.6 1837.7 L12150.4 1843.3 L12150.3 1832.5 L12159.5 1827.0 Z"></path>
-					</g>
-					<path d="M12189.7 1844.6 L12014.5 2342 L11671.5 2425.674950948332 L11671.5 2425.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12197.9 1837.6 L12189.7 1844.6 L12187.8 1834.0 L12195.9 1827.0 Z"></path>
-					</g>
-					<path d="M12313.9 1844.9 L12460.75 2342 L12460.75 2528.5 L12460.75 2528.5 L12460.75 2715 L12460.75 2715 L8356.25 2750.0811965811968 L8356.3 2750.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12316.4 1834.4 L12313.9 1844.9 L12306.2 1837.5 L12308.6 1827.0 Z"></path>
-					</g>
-					<path d="M12399.9 1841.9 L12777.5 2342 L12777.5 2528.5 L12777.5 2528.5 L12777.5 2715 L12777.5 2715 L8615.25 2749.590009949084 L8615.3 2749.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12398.5 1831.2 L12399.9 1841.9 L12390.0 1837.7 L12388.6 1827.0 Z"></path>
-					</g>
-					<path d="M12410.5 1841.5 L12817.5 2342 L9572.25 2525.530930179668 L9572.3 2525.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12408.8 1830.9 L12410.5 1841.5 L12400.5 1837.6 L12398.7 1827.0 Z"></path>
-					</g>
-					<path d="M4015.9 401.1 L4481.5 531 L4481.5 747.5 L4481.5 747.5 L4481.5 964 L4481.5 964 L11827.25 1614.8982091759638 L11827.3 1614.9 " fill="none"></path>
-					<path d="M4017.3 395.9 L4015.9 401.1 L4014.5 406.2 L4003.1 397.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M11391.5 398.4 L12377.5 531 L12377.5 747.5 L12377.5 747.5 L12377.5 964 L12377.5 964 L12287.617924528302 1479 L12287.6 1479.0 " fill="none"></path>
-					</g>
-					<path d="M11392.2 393.1 L11391.5 398.4 L11390.8 403.7 L11378.3 396.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M15234.8 391.4 L16860.5 531 L16860.5 747.5 L16860.5 747.5 L16860.5 964 L16860.5 964 L12687.25 1588.6389507413242 L12687.3 1588.6 " fill="none"></path>
-					</g>
-					<path d="M15235.2 386.1 L15234.8 391.4 L15234.3 396.7 L15221.5 390.3 Z"></path>
-					<path d="M11250.0 2653.7 L11250 2715 L8615.25 2749.083492757584 L8615.3 2749.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11255.3 2644.3 L11250.0 2653.7 L11244.7 2644.3 L11250.0 2635.0 Z"></path>
-					</g>
-					<path d="M11690.0 2477.4 L12857.5 2342 L12408.837082728593 1827 L12408.8 1827.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11680.2 2473.2 L11690.0 2477.4 L11681.4 2483.8 L11671.5 2479.6 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M11391.6 388.6 L14009.25 531 L14009.25 747.5 L14009.25 747.5 L14009.25 964 L14009.25 964 L14009.25 1653 L14009.25 1653 L14009.25 2342 L14009.25 2342 L11671.5 2500.0104648002175 L11671.5 2500.0 " fill="none"></path>
-					</g>
-					<path d="M11391.9 383.3 L11391.6 388.6 L11391.3 394.0 L11378.3 387.9 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M919.8 775.1 L1007 964 L1007 1653 L1007 1653 L1007 2342 L1007 2342 L10828.5 2520.825514985844 L10828.5 2520.8 " fill="none"></path>
-					</g>
-					<path d="M924.6 772.9 L919.8 775.1 L914.9 777.3 L914.2 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M15234.8 390.5 L17045.75 531 L17045.75 747.5 L17045.75 747.5 L17045.75 964 L17045.75 964 L17045.75 1653 L17045.75 1653 L17045.75 2342 L17045.75 2342 L11671.5 2514.9366561704696 L11671.5 2514.9 " fill="none"></path>
-					</g>
-					<path d="M15235.2 385.2 L15234.8 390.5 L15234.4 395.8 L15221.5 389.5 Z"></path>
-					<path d="M25036.8 469.7 L25036.75 531 L25036.75 732 L25036.8 732.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25042.1 460.3 L25036.8 469.7 L25031.4 460.3 L25036.8 451.0 Z"></path>
-					</g>
-					<path d="M25036.8 135.3 L25036.75 233 L25036.75 313 L25036.8 313.0 " fill="none"></path>
-					<path d="M25042.1 135.3 L25036.8 135.3 L25031.4 135.3 L25036.8 122.0 Z"></path>
-					<path d="M11807.4 838.7 L11510 964 L14601.25 1558.1477787851315 L14601.3 1558.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11818.0 840.0 L11807.4 838.7 L11813.9 830.2 L11824.6 831.5 Z"></path>
-					</g>
-					<path d="M12078.2 847.9 L12140.75 964 L12839.1763425254 1637.5 L12839.2 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12078.4 837.2 L12078.2 847.9 L12069.0 842.2 L12069.3 831.5 Z"></path>
-					</g>
-					<path d="M14985.9 1957.1 L14848 2342 L14385.887399463807 2475 L14385.9 2475.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14994.0 1950.1 L14985.9 1957.1 L14984.0 1946.5 L14992.1 1939.5 Z"></path>
-					</g>
-					<path d="M15184.7 1957.4 L15298.25 2342 L10361.5 2526.38970109648 L10361.5 2526.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15187.1 1946.9 L15184.7 1957.4 L15176.9 1950.0 L15179.4 1939.5 Z"></path>
-					</g>
-					<path d="M15300.8 1954.9 L15565 2342 L9572.25 2526.8803399363137 L9572.3 2526.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15300.0 1944.2 L15300.8 1954.9 L15291.1 1950.2 L15290.3 1939.5 Z"></path>
-					</g>
-					<path d="M1485.2 774.0 L1616 964 L14601.25 1627.7735138644161 L14601.3 1627.8 " fill="none"></path>
-					<path d="M1489.6 771.0 L1485.2 774.0 L1480.8 777.0 L1477.7 763.0 Z"></path>
-					<path d="M28645.5 231.4 L28645.25 233 L28645.25 366.5 L28645.3 366.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28652.2 223.1 L28645.5 231.4 L28641.7 221.4 L28648.4 213.0 Z"></path>
-					</g>
-					<path d="M28810.9 224.8 L28821 233 L29040.289429530203 366.5 L29040.3 366.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28807.0 214.7 L28810.9 224.8 L28800.3 223.0 L28796.4 213.0 Z"></path>
-					</g>
-					<path d="M29009.1 224.8 L28999 233 L29218.289429530203 366.5 L29218.3 366.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M29019.7 223.0 L29009.1 224.8 L29013.0 214.7 L29023.6 213.0 Z"></path>
-					</g>
-					<path d="M29397.6 202.2 L29475.75 233 L29108.40100671141 366.5 L29108.4 366.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M29390.9 193.8 L29397.6 202.2 L29387.0 203.7 L29380.3 195.4 Z"></path>
-					</g>
-					<path d="M14409.6 2477.9 L14421.5 2475 L14429 2475 L14429 2475 L14436.5 2528.5 L14436.5 2528.5 L14429 2582 L14429 2582 L14421.5 2582 L14421.5 2582 L14391.5 2574.7539503386006 L14391.5 2574.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14399.3 2474.9 L14409.6 2477.9 L14401.8 2485.2 L14391.5 2482.2 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M10742.3 1679.3 L11228.5 2342 L14008.5 2516.4809019013965 L14008.5 2516.5 " fill="none"></path>
-					</g>
-					<path d="M10746.6 1676.1 L10742.3 1679.3 L10738.0 1682.4 L10734.4 1668.5 Z"></path>
-					<path d="M19412.3 827.7 L19412.25 964 L15588.25 1574.2457440648523 L15588.3 1574.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19417.6 818.3 L19412.3 827.7 L19406.9 818.3 L19412.3 809.0 Z"></path>
-					</g>
-					<path d="M20049.7 400.2 L19412.25 531 L19412.25 686 L19412.3 686.0 " fill="none"></path>
-					<path d="M20050.7 405.4 L20049.7 400.2 L20048.6 395.0 L20062.7 397.5 Z"></path>
-					<path d="M19931.3 827.7 L19931.25 964 L15588.25 1582.6967848650884 L15588.3 1582.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19936.6 818.3 L19931.3 827.7 L19925.9 818.3 L19931.3 809.0 Z"></path>
-					</g>
-					<path d="M20105.9 405.3 L19931.25 531 L19931.25 686 L19931.3 686.0 " fill="none"></path>
-					<path d="M20109.0 409.6 L20105.9 405.3 L20102.8 401.0 L20116.7 397.5 Z"></path>
-					<path d="M29836.8 135.3 L29836.75 233 L29836.75 335.5 L29836.8 335.5 " fill="none"></path>
-					<path d="M29842.1 135.3 L29836.8 135.3 L29831.4 135.3 L29836.8 122.0 Z"></path>
-					<path d="M13319.0 1737.3 L12897.5 2342 L10361.5 2524.435486981678 L10361.5 2524.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13328.7 1732.7 L13319.0 1737.3 L13319.9 1726.6 L13329.7 1722.0 Z"></path>
-					</g>
-					<path d="M13406.3 1739.7 L13604.25 2342 L14501.656166219838 2513 L14501.7 2513.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13408.4 1729.2 L13406.3 1739.7 L13398.3 1732.5 L13400.4 1722.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M23534.5 391.6 L24763.75 531 L24763.75 686 L24763.8 686.0 " fill="none"></path>
-					</g>
-					<path d="M23535.1 386.3 L23534.5 391.6 L23533.9 396.9 L23521.3 390.1 Z"></path>
-					<path d="M12031.0 2506.9 L12281.333333333334 2475 L12348.541666666666 2475 L12348.541666666666 2475 L12415.75 2528.5 L12415.75 2528.5 L12348.541666666666 2582 L12348.541666666666 2582 L12281.333333333334 2582 L12281.333333333334 2582 L12012.5 2547.7013116057233 L12012.5 2547.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12021.1 2502.8 L12031.0 2506.9 L12022.4 2513.4 L12012.5 2509.3 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M10745.7 1678.5 L11336.5 2342 L11711.5 2475.0875356803044 L11711.5 2475.1 " fill="none"></path>
-					</g>
-					<path d="M10749.7 1674.9 L10745.7 1678.5 L10741.7 1682.0 L10736.8 1668.5 Z"></path>
-					<path d="M13842.2 1739.7 L13644.25 2342 L12012.5 2512.7512273811194 L12012.5 2512.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13850.2 1732.5 L13842.2 1739.7 L13840.1 1729.2 L13848.1 1722.0 Z"></path>
-					</g>
-					<path d="M13877.0 1740.6 L13920 2342 L14724.5 2516.972886297376 L14724.5 2517.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13881.7 1730.9 L13877.0 1740.6 L13871.0 1731.7 L13875.7 1722.0 Z"></path>
-					</g>
-					<path d="M1427.8 393.6 L2845 531 L2845 709 L2845.0 709.0 " fill="none"></path>
-					<path d="M1428.3 388.3 L1427.8 393.6 L1427.3 398.9 L1414.5 392.3 Z"></path>
-					<path d="M20330.0 822.2 L20188 964 L20188 1637.5 L20188.0 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20340.3 819.4 L20330.0 822.2 L20332.8 811.8 L20343.2 809.0 Z"></path>
-					</g>
-					<path d="M20469.4 823.2 L20589.75 964 L20589.75 1637.5 L20589.8 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20467.4 812.6 L20469.4 823.2 L20459.3 819.6 L20457.3 809.0 Z"></path>
-					</g>
-					<path d="M20177.6 404.0 L20404.75 531 L20404.75 686 L20404.8 686.0 " fill="none"></path>
-					<path d="M20180.2 399.4 L20177.6 404.0 L20175.0 408.7 L20166.0 397.5 Z"></path>
-					<path d="M14345.3 804.7 L14345.25 964 L15992.75 1490.9858402971217 L15992.8 1491.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14350.6 795.3 L14345.3 804.7 L14339.9 795.3 L14345.3 786.0 Z"></path>
-					</g>
-					<path d="M16214.4 2339.2 L16213.25 2342 L15790 2472.526870607689 L15790.0 2472.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16222.9 2332.7 L16214.4 2339.2 L16213.0 2328.6 L16221.6 2322.0 Z"></path>
-					</g>
-					<path d="M16254.1 2339.6 L16253.25 2342 L10361.5 2526.728512587736 L10361.5 2526.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16262.3 2332.6 L16254.1 2339.6 L16252.2 2329.0 L16260.4 2322.0 Z"></path>
-					</g>
-					<path d="M16677.5 2340.1 L16678 2342 L16678 2528.5 L16678 2528.5 L16678 2715 L16678 2715 L8356.25 2750.292193053191 L8356.3 2750.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16680.3 2329.7 L16677.5 2340.1 L16670.0 2332.4 L16672.8 2322.0 Z"></path>
-					</g>
-					<path d="M16785.8 2339.2 L16787 2342 L16787 2513 L16787.0 2513.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16787.2 2328.6 L16785.8 2339.2 L16777.3 2332.7 L16778.6 2322.0 Z"></path>
-					</g>
-					<path d="M16825.5 2338.9 L16827 2342 L9572.25 2527.1600636354306 L9572.3 2527.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16826.3 2328.1 L16825.5 2338.9 L16816.7 2332.7 L16817.5 2322.0 Z"></path>
-					</g>
-					<path d="M1489.3 773.0 L1656 964 L15992.75 1629.489077526822 L15992.8 1629.5 " fill="none"></path>
-					<path d="M1493.3 769.5 L1489.3 773.0 L1485.3 776.6 L1480.5 763.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M938.8 770.9 L1201 964 L15992.75 1630.1883385354533 L15992.8 1630.2 " fill="none"></path>
-					</g>
-					<path d="M941.9 766.6 L938.8 770.9 L935.6 775.2 L928.0 763.0 Z"></path>
-					<path d="M25749.7 456.1 L25140.75 531 L25140.75 747.5 L25140.75 747.5 L25140.75 964 L25140.75 964 L25140.75 1653 L25140.75 1653 L25140.75 2342 L25140.75 2342 L15790 2524.9489233916443 L15790.0 2524.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25759.6 460.3 L25749.7 456.1 L25758.3 449.7 L25768.3 453.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M25099.0 112.5 L26352.25 233 L26352.25 253 L26352.3 253.0 " fill="none"></path>
-					</g>
-					<path d="M25099.5 107.2 L25099.0 112.5 L25098.5 117.8 L25085.8 111.2 Z"></path>
-					<path d="M25755.1 471.0 L25352.75 531 L25352.75 663.5 L25352.8 663.5 " fill="none"></path>
-					<path d="M25755.8 476.3 L25755.1 471.0 L25754.3 465.8 L25768.3 469.1 Z"></path>
-					<path d="M25827.2 514.3 L25760.75 531 L25760.75 678.5 L25760.8 678.5 " fill="none"></path>
-					<path d="M25828.5 519.4 L25827.2 514.3 L25825.9 509.1 L25840.1 511.0 Z"></path>
-					<path d="M26240.4 521.4 L26232.75 531 L26232.75 678.5 L26232.8 678.5 " fill="none"></path>
-					<path d="M26244.6 524.7 L26240.4 521.4 L26236.3 518.1 L26248.8 511.0 Z"></path>
-					<path d="M26704.5 515.7 L26744.75 531 L26744.75 671 L26744.8 671.0 " fill="none"></path>
-					<path d="M26706.4 510.7 L26704.5 515.7 L26702.6 520.7 L26692.1 511.0 Z"></path>
-					<path d="M27192.8 910.2 L27192.75 964 L27888.48820754717 1637.5 L27888.5 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M27198.1 900.8 L27192.8 910.2 L27187.4 900.8 L27192.8 891.5 Z"></path>
-					</g>
-					<path d="M26949.4 487.9 L27192.75 531 L27192.75 603.5 L27192.8 603.5 " fill="none"></path>
-					<path d="M26950.3 482.6 L26949.4 487.9 L26948.4 493.1 L26936.3 485.5 Z"></path>
-					<path d="M27576.8 850.2 L27576.75 964 L28166.42906386067 1637.5 L28166.4 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M27582.1 840.8 L27576.8 850.2 L27571.4 840.8 L27576.8 831.5 Z"></path>
-					</g>
-					<path d="M26949.5 454.7 L27576.75 531 L27576.75 663.5 L27576.8 663.5 " fill="none"></path>
-					<path d="M26950.1 449.4 L26949.5 454.7 L26948.8 460.0 L26936.3 453.1 Z"></path>
-					<path d="M16499.3 797.2 L16499.25 964 L16499.25 984 L16499.3 984.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16504.6 787.8 L16499.3 797.2 L16493.9 787.8 L16499.3 778.5 Z"></path>
-					</g>
-					<path d="M20814.8 835.2 L20814.75 964 L17005.75 1572.1337040899084 L17005.8 1572.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20820.1 825.8 L20814.8 835.2 L20809.4 825.8 L20814.8 816.5 Z"></path>
-					</g>
-					<path d="M20221.6 400.4 L20814.75 531 L20814.75 678.5 L20814.8 678.5 " fill="none"></path>
-					<path d="M20222.8 395.2 L20221.6 400.4 L20220.5 405.6 L20208.6 397.5 Z"></path>
-					<path d="M21206.8 812.7 L21206.75 964 L17005.75 1578.867551779076 L17005.8 1578.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21212.1 803.3 L21206.8 812.7 L21201.4 803.3 L21206.8 794.0 Z"></path>
-					</g>
-					<path d="M20227.5 394.4 L21206.75 531 L21206.75 701 L21206.8 701.0 " fill="none"></path>
-					<path d="M20228.2 389.2 L20227.5 394.4 L20226.7 399.7 L20214.3 392.6 Z"></path>
-					<path d="M15807.4 2450.0 L15820 2445 L15827.5 2445 L15827.5 2445 L15835 2528.5 L15835 2528.5 L15827.5 2612 L15827.5 2612 L15820 2612 L15820 2612 L15790 2600.1560283687945 L15790.0 2600.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15796.7 2448.5 L15807.4 2450.0 L15800.6 2458.4 L15790.0 2456.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M10746.9 1678.2 L11376.5 2342 L15427 2520.5014768431 L15427.0 2520.5 " fill="none"></path>
-					</g>
-					<path d="M10750.7 1674.5 L10746.9 1678.2 L10743.0 1681.8 L10737.7 1668.5 Z"></path>
-					<path d="M21598.8 812.7 L21598.75 964 L17005.75 1584.5661339346996 L17005.8 1584.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21604.1 803.3 L21598.8 812.7 L21593.4 803.3 L21598.8 794.0 Z"></path>
-					</g>
-					<path d="M20227.5 391.1 L21598.75 531 L21598.75 701 L21598.8 701.0 " fill="none"></path>
-					<path d="M20228.1 385.8 L20227.5 391.1 L20227.0 396.4 L20214.3 389.8 Z"></path>
-					<path d="M21990.8 812.7 L21990.75 964 L17005.75 1589.4511517800236 L17005.8 1589.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21996.1 803.3 L21990.8 812.7 L21985.4 803.3 L21990.8 794.0 Z"></path>
-					</g>
-					<path d="M20227.5 389.2 L21990.75 531 L21990.75 701 L21990.8 701.0 " fill="none"></path>
-					<path d="M20228.0 383.9 L20227.5 389.2 L20227.1 394.5 L20214.3 388.1 Z"></path>
-					<path d="M22382.8 812.7 L22382.75 964 L17005.75 1593.6852213818306 L17005.8 1593.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22388.1 803.3 L22382.8 812.7 L22377.4 803.3 L22382.8 794.0 Z"></path>
-					</g>
-					<path d="M20227.6 387.9 L22382.75 531 L22382.75 701 L22382.8 701.0 " fill="none"></path>
-					<path d="M20227.9 382.6 L20227.6 387.9 L20227.2 393.3 L20214.3 387.0 Z"></path>
-					<path d="M15869.6 895.0 L15880 964 L15880 1653 L15880 1653 L15880 2342 L15880 2342 L15880 2528.5 L15880 2528.5 L15880 2715 L15880 2715 L8356.25 2750.270294807038 L8356.3 2750.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15873.4 884.9 L15869.6 895.0 L15862.9 886.5 L15866.8 876.5 Z"></path>
-					</g>
-					<path d="M15896.5 894.2 L15920 964 L15920 1653 L15920 1653 L15920 2342 L15920 2342 L15920 2528.5 L15920 2528.5 L15920 2715 L15920 2715 L8615.25 2749.9757055669825 L8615.3 2750.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15898.6 883.6 L15896.5 894.2 L15888.5 887.0 L15890.6 876.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M11391.6 388.5 L14049.25 531 L15531.25 709.4499443826473 L15531.3 709.4 " fill="none"></path>
-					</g>
-					<path d="M11391.8 383.2 L11391.6 388.5 L11391.3 393.9 L11378.3 387.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M15234.8 389.7 L17255.25 531 L16163.25 698.9105113636364 L16163.3 698.9 " fill="none"></path>
-					</g>
-					<path d="M15235.2 384.4 L15234.8 389.7 L15234.4 395.0 L15221.5 388.7 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M25099.1 109.4 L27788.75 233 L27788.75 382 L27788.75 382 L27788.75 531 L27788.75 531 L27788.75 747.5 L27788.75 747.5 L27788.75 964 L27788.75 964 L27665.244920174166 1584 L27665.2 1584.0 " fill="none"></path>
-					</g>
-					<path d="M25099.3 104.0 L25099.1 109.4 L25098.8 114.7 L25085.8 108.8 Z"></path>
-					<path d="M18131.3 454.7 L18131.25 531 L18131.25 596 L18131.3 596.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18136.6 445.3 L18131.3 454.7 L18125.9 445.3 L18131.3 436.0 Z"></path>
-					</g>
-					<path d="M16253.1 113.5 L18131.25 233 L18131.25 328 L18131.3 328.0 " fill="none"></path>
-					<path d="M16253.4 108.1 L16253.1 113.5 L16252.7 118.8 L16239.8 112.6 Z"></path>
-					<path d="M28529.2 458.2 L28687.75 531 L28687.75 732 L28687.8 732.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28523.0 449.5 L28529.2 458.2 L28518.5 459.2 L28512.3 450.4 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M25099.1 108.9 L28363.25 233 L28363.25 298 L28363.3 298.0 " fill="none"></path>
-					</g>
-					<path d="M25099.3 103.5 L25099.1 108.9 L25098.9 114.2 L25085.8 108.4 Z"></path>
-					<path d="M18165.0 917.3 L18174.25 964 L18174.25 1653 L18174.25 1653 L18174.25 2342 L18174.25 2342 L10361.5 2527.1609587953108 L10361.5 2527.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18168.4 907.1 L18165.0 917.3 L18157.9 909.2 L18161.3 899.0 Z"></path>
-					</g>
-					<path d="M18260.3 913.7 L18299.25 964 L18299.25 1637.5 L18299.3 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18258.7 903.1 L18260.3 913.7 L18250.3 909.6 L18248.8 899.0 Z"></path>
-					</g>
-					<path d="M9152.1 775.6 L6692.75 964 L6692.75 1653 L6692.75 1653 L6692.75 2342 L6692.75 2342 L7178.5 2517.481598062954 L7178.5 2517.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9161.9 780.2 L9152.1 775.6 L9161.0 769.6 L9170.8 774.2 Z"></path>
-					</g>
-					<path d="M9152.1 776.8 L6808.25 964 L6808.25 1637.5 L6808.3 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9161.9 781.4 L9152.1 776.8 L9161.0 770.7 L9170.8 775.3 Z"></path>
-					</g>
-					<path d="M9152.2 778.9 L6994.75 964 L6994.75 1637.5 L6994.8 1637.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9161.9 783.5 L9152.2 778.9 L9161.0 772.8 L9170.8 777.4 Z"></path>
-					</g>
-					<path d="M9814.4 939.2 L9852.75 964 L9852.75 1653 L9852.75 1653 L9852.75 2342 L9852.75 2342 L9007.5 2518.874193548387 L9007.5 2518.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9809.5 929.6 L9814.4 939.2 L9803.7 938.6 L9798.8 929.0 Z"></path>
-					</g>
-					<path d="M9885.2 807.1 L10849.5 964 L4730.75 1615.922333475084 L4730.8 1615.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9876.8 800.4 L9885.2 807.1 L9875.1 810.9 L9866.8 804.1 Z"></path>
-					</g>
-					<path d="M9885.2 805.4 L10889.5 964 L6027.5 1594.513457556936 L6027.5 1594.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9876.8 798.7 L9885.2 805.4 L9875.1 809.2 L9866.8 802.5 Z"></path>
-					</g>
-					<path d="M9885.2 803.7 L10929.5 964 L9704.760341074021 1471.5 L9704.8 1471.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9876.8 797.0 L9885.2 803.7 L9875.2 807.6 L9866.8 800.9 Z"></path>
-					</g>
-					<path d="M9885.2 802.2 L10969.5 964 L11932.041727140784 1479 L11932.0 1479.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9876.8 795.5 L9885.2 802.2 L9875.2 806.1 L9866.8 799.4 Z"></path>
-					</g>
-					<path d="M9885.2 800.7 L11009.5 964 L8680.75 1547.829254980442 L8680.8 1547.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9876.8 794.1 L9885.2 800.7 L9875.2 804.7 L9866.8 798.0 Z"></path>
-					</g>
-					<path d="M9885.3 789.0 L11431.75 964 L11431.75 1653 L11431.75 1653 L11431.75 2342 L11431.75 2342 L9572.25 2523.37905334728 L9572.3 2523.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9876.6 782.6 L9885.3 789.0 L9875.4 793.2 L9866.8 786.9 Z"></path>
-					</g>
-					<path d="M4020.1 400.9 L4521.5 531 L9170.75 732.4233078193006 L9170.8 732.4 " fill="none"></path>
-					<path d="M4021.5 395.7 L4020.1 400.9 L4018.8 406.0 L4007.2 397.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M11391.6 388.4 L14089.25 531 L9866.75 731.0155891040367 L9866.8 731.0 " fill="none"></path>
-					</g>
-					<path d="M11391.8 383.1 L11391.6 388.4 L11391.3 393.8 L11378.3 387.7 Z"></path>
-					<path d="M1308.5 135.3 L1308.5 233 L1308.5 351 L1308.5 351.0 " fill="none"></path>
-					<path d="M1313.8 135.3 L1308.5 135.3 L1303.2 135.3 L1308.5 122.0 Z"></path>
-					<g data-name="ScreenerQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="6576.5" y="2362.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M6576.5 2393.0 L7138.5 2393.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M6576.5 2574.0 L7138.5 2574.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(6576.5, 2362)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
-								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6576.5, 2393)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6576.5, 2574)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="8258.3" y="2735.0" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(8258.25, 2735)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="15992.8" y="984.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M15992.8 1015.0 L17005.8 1015.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M15992.8 2036.0 L17005.8 2036.0" fill="none" data-name="QuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(15992.75, 984)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15992.75, 1015)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15992.75, 2036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScreenerQuestionLogicFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="635.0" y="1622.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M635.0 1653.0 L967.0 1653.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
-						</g>
-						<g transform="translate(635, 1622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(635, 1653)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignEnrollmentFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="0.0" y="701.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M0.0 732.5 L449.0 732.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
-						</g>
-						<g transform="translate(0, 701.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 732.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="1202.5" y="351.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M1202.5 382.0 L1414.5 382.0" fill="none" data-name="StudyDesignPageWidget"></path>
-						</g>
-						<g transform="translate(1202.5, 351)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1202.5, 382)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionLogicFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="2196.3" y="1584.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M2196.3 1615.0 L2620.3 1615.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M2196.3 1646.0 L2620.3 1646.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-						</g>
-						<g transform="translate(2196.25, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
-								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2196.25, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2196.25, 1646)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="16047.8" y="91.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
-						</g>
-						<g transform="translate(16047.75, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="21921.5" y="298.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M21921.5 329.0 L22179.5 329.0" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M21921.5 420.0 L22179.5 420.0" fill="none" data-name="ConsentItemFormData"></path>
-						</g>
-						<g transform="translate(21921.5, 298)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21921.5, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21921.5, 420)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="24987.8" y="91.0" height="31.0" width="98.0" data-name="IFormData"></rect>
-						</g>
-						<g transform="translate(24987.75, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="5125.5" y="1404.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M5125.5 1435.0 L6027.5 1435.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M5125.5 1661.0 L6027.5 1661.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-						</g>
-						<g transform="translate(5125.5, 1404)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
-								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5125.5, 1435)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5125.5, 1661)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="7178.5" y="2513.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(7178.5, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="8915.5" y="2513.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(8915.5, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormConsentItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="5736.5" y="2422.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M5736.5 2453.0 L6536.5 2453.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M5736.5 2529.0 L6536.5 2529.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-						</g>
-						<g transform="translate(5736.5, 2422)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5736.5, 2453)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5736.5, 2529)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="10248.5" y="2513.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(10248.5, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="8396.3" y="2735.0" height="31.0" width="219.0" data-name="FormViewModelCollection"></rect>
-						</g>
-						<g transform="translate(8396.25, 2735)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="9467.3" y="2513.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(9467.25, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="3877.0" y="366.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(3877, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="15531.3" y="618.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M15531.3 649.5 L16163.3 649.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M15531.3 755.5 L16163.3 755.5" fill="none" data-name="WithQuestionnaireControls"></path>
-						</g>
-						<g transform="translate(15531.25, 618.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15531.25, 649.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15531.25, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="11161.3" y="366.5" height="31.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-						</g>
-						<g transform="translate(11161.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="825.0" y="732.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(825, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="15028.5" y="366.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-						</g>
-						<g transform="translate(15028.5, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="1122.0" y="1524.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M1122.0 1555.0 L1818.0 1555.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M1122.0 1721.0 L1818.0 1721.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-						</g>
-						<g transform="translate(1122, 1524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1122, 1555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1122, 1721)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="1359.5" y="732.0" height="31.0" width="215.0" data-name="ManagedFormViewModel"></rect>
-						</g>
-						<g transform="translate(1359.5, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="1614.5" y="716.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M1614.5 747.5 L1995.5 747.5" fill="none" data-name="ConsentItemFormView"></path>
-						</g>
-						<g transform="translate(1614.5, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1614.5, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="22598.8" y="663.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M22598.8 694.5 L23052.8 694.5" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M22598.8 785.5 L23052.8 785.5" fill="none" data-name="EnrollmentFormData"></path>
-						</g>
-						<g transform="translate(22598.75, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
-								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22598.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22598.75, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="22567.3" y="1637.5" height="31.0" width="114.0" data-name="Participation"></rect>
-						</g>
-						<g transform="translate(22567.25, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="27467.5" y="1584.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M27467.5 1615.0 L27835.5 1615.0" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M27467.5 1661.0 L27835.5 1661.0" fill="none" data-name="QuestionnaireFormData"></path>
-						</g>
-						<g transform="translate(27467.5, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27467.5, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27467.5, 1661)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="23378.3" y="351.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M23378.3 382.0 L23521.3 382.0" fill="none" data-name="IStudyFormData"></path>
-						</g>
-						<g transform="translate(23378.25, 351)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23378.25, 382)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignInterventionsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="489.0" y="716.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M489.0 747.5 L785.0 747.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
-						</g>
-						<g transform="translate(489, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(489, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="7841.8" y="1464.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M7841.8 1495.0 L8680.8 1495.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M7841.8 1646.0 L8680.8 1646.0" fill="none" data-name="InterventionsFormViewModel"></path>
-						</g>
-						<g transform="translate(7841.75, 1464)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
-								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7841.75, 1495)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7841.75, 1646)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="17085.8" y="551.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M17085.8 582.0 L17843.8 582.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M17085.8 883.0 L17843.8 883.0" fill="none" data-name="StudyScheduleControls"></path>
-						</g>
-						<g transform="translate(17085.75, 551)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
-								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17085.75, 582)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17085.75, 883)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="2660.3" y="1419.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M2660.3 1450.0 L3515.3 1450.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M2660.3 1676.0 L3515.3 1676.0" fill="none" data-name="InterventionFormViewModel"></path>
-						</g>
-						<g transform="translate(2660.25, 1419)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
-								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2660.25, 1450)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2660.25, 1676)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="27828.8" y="663.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M27828.8 694.5 L28118.8 694.5" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M27828.8 785.5 L28118.8 785.5" fill="none" data-name="InterventionTaskFormData"></path>
-						</g>
-						<g transform="translate(27828.75, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27828.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27828.75, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="28214.3" y="298.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M28214.3 329.0 L28512.3 329.0" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M28214.3 435.0 L28512.3 435.0" fill="none" data-name="IFormDataWithSchedule"></path>
-						</g>
-						<g transform="translate(28214.25, 298)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28214.25, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28214.25, 435)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="23063.3" y="1554.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M23063.3 1585.0 L23359.3 1585.0" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M23063.3 1691.0 L23359.3 1691.0" fill="none" data-name="StudyScheduleFormData"></path>
-						</g>
-						<g transform="translate(23063.25, 1554)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23063.25, 1585)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23063.25, 1691)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PhaseSequence">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="20272.5" y="2513.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
-						</g>
-						<g transform="translate(20272.5, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
-								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="18418.8" y="701.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M18418.8 732.0 L18748.8 732.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M18418.8 763.0 L18748.8 763.0" fill="none" data-name="InterventionPreview"></path>
-						</g>
-						<g transform="translate(18418.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18418.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18418.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="18467.3" y="1637.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(18467.25, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="20062.3" y="366.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(20062.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="7105.8" y="1516.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M7105.8 1547.5 L7801.8 1547.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M7105.8 1728.5 L7801.8 1728.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-						</g>
-						<g transform="translate(7105.75, 1516.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7105.75, 1547.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7105.75, 1728.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="17883.8" y="596.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M17883.8 627.0 L18378.8 627.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M17883.8 853.0 L18378.8 853.0" fill="none" data-name="WithScheduleControls"></path>
-						</g>
-						<g transform="translate(17883.75, 596)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17883.75, 627)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17883.75, 853)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="23132.8" y="678.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M23132.8 709.5 L23526.8 709.5" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M23132.8 770.5 L23526.8 770.5" fill="none" data-name="InterventionsFormData"></path>
-						</g>
-						<g transform="translate(23132.75, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23132.75, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23132.75, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="3573.5" y="716.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M3573.5 747.5 L3948.5 747.5" fill="none" data-name="InterventionFormView"></path>
-						</g>
-						<g transform="translate(3573.5, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
-								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3573.5, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="3988.5" y="716.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M3988.5 747.5 L4401.5 747.5" fill="none" data-name="InterventionTaskFormView"></path>
-						</g>
-						<g transform="translate(3988.5, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3988.5, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="22219.5" y="283.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M22219.5 314.0 L22601.5 314.0" fill="none" data-name="InterventionFormData"></path>
-							<path d="M22219.5 435.0 L22601.5 435.0" fill="none" data-name="InterventionFormData"></path>
-						</g>
-						<g transform="translate(22219.5, 283)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22219.5, 314)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22219.5, 435)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="17285.3" y="328.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M17285.3 359.0 L17644.3 359.0" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M17285.3 390.0 L17644.3 390.0" fill="none" data-name="StudyScheduleFormView"></path>
-						</g>
-						<g transform="translate(17285.25, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17285.25, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17285.25, 390)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="23566.8" y="663.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M23566.8 694.5 L23980.8 694.5" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M23566.8 785.5 L23980.8 785.5" fill="none" data-name="StudyInfoFormData"></path>
-						</g>
-						<g transform="translate(23566.75, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23566.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23566.75, 785.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyContactInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="23723.3" y="1539.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M23723.3 1570.0 L24071.3 1570.0" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M23723.3 1721.0 L24071.3 1721.0" fill="none" data-name="StudyContactInfoFormData"></path>
-						</g>
-						<g transform="translate(23723.25, 1539)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
-								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23723.25, 1570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23723.25, 1721)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignInfoFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="2035.5" y="716.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M2035.5 747.5 L2258.5 747.5" fill="none" data-name="StudyDesignInfoFormView"></path>
-						</g>
-						<g transform="translate(2035.5, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2035.5, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="4034.8" y="1411.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M4034.8 1442.5 L4730.8 1442.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M4034.8 1848.5 L4730.8 1848.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-						</g>
-						<g transform="translate(4034.75, 1411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4034.75, 1442.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4034.75, 1848.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="28158.8" y="648.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M28158.8 679.5 L28567.8 679.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M28158.8 800.5 L28567.8 800.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-						</g>
-						<g transform="translate(28158.75, 648.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28158.75, 679.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28158.75, 800.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="4601.5" y="716.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M4601.5 747.5 L5045.5 747.5" fill="none" data-name="MeasurementSurveyFormView"></path>
-						</g>
-						<g transform="translate(4601.5, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4601.5, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="9892.8" y="1441.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M9892.8 1472.5 L10588.8 1472.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M9892.8 1698.5 L10588.8 1698.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-						</g>
-						<g transform="translate(9892.75, 1441.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9892.75, 1472.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9892.75, 1698.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="18788.8" y="701.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M18788.8 732.0 L19132.8 732.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M18788.8 763.0 L19132.8 763.0" fill="none" data-name="SurveyPreview"></path>
-						</g>
-						<g transform="translate(18788.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18788.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18788.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="18837.3" y="1637.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(18837.25, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignMeasurementsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="2298.5" y="716.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M2298.5 747.5 L2608.5 747.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
-						</g>
-						<g transform="translate(2298.5, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2298.5, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="24060.8" y="686.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M24060.8 717.0 L24554.8 717.0" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M24060.8 763.0 L24554.8 763.0" fill="none" data-name="MeasurementsFormData"></path>
-						</g>
-						<g transform="translate(24060.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
-								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24060.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24060.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="8720.8" y="1471.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M8720.8 1502.5 L9812.8 1502.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M8720.8 1653.5 L9812.8 1653.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-						</g>
-						<g transform="translate(8720.75, 1471.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
-								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8720.75, 1502.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8720.75, 1653.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormValidationSet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="10401.5" y="2490.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M10401.5 2521.0 L10788.5 2521.0" fill="none" data-name="StudyFormValidationSet"></path>
-						</g>
-						<g transform="translate(10401.5, 2490)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
-								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10401.5, 2521)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="10692.5" y="1637.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(10692.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="11827.3" y="1479.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M11827.3 1510.0 L12687.3 1510.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M11827.3 1676.0 L12687.3 1676.0" fill="none" data-name="ReportsFormViewModel"></path>
-						</g>
-						<g transform="translate(11827.25, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
-								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11827.25, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11827.25, 1676)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportFormItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="10828.5" y="2422.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M10828.5 2453.0 L11671.5 2453.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M10828.5 2529.0 L11671.5 2529.0" fill="none" data-name="ReportFormItemDelegate"></path>
-						</g>
-						<g transform="translate(10828.5, 2422)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
-								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10828.5, 2453)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10828.5, 2529)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="24879.8" y="313.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M24879.8 344.0 L25193.8 344.0" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M24879.8 405.0 L25193.8 405.0" fill="none" data-name="ReportItemFormData"></path>
-						</g>
-						<g transform="translate(24879.75, 313)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24879.75, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24879.75, 405)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="24972.8" y="732.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(24972.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="11790.5" y="663.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M11790.5 694.5 L12257.5 694.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M11790.5 770.5 L12257.5 770.5" fill="none" data-name="ReportItemFormView"></path>
-						</g>
-						<g transform="translate(11790.5, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
-								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11790.5, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11790.5, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="14601.3" y="1366.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M14601.3 1397.5 L15588.3 1397.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M14601.3 1833.5 L15588.3 1833.5" fill="none" data-name="ReportItemFormViewModel"></path>
-						</g>
-						<g transform="translate(14601.25, 1366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
-								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14601.25, 1397.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14601.25, 1833.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="12727.3" y="1637.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
-						</g>
-						<g transform="translate(12727.25, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="14008.5" y="2475.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M14008.5 2506.0 L14391.5 2506.0" fill="none" data-name="ReportSectionType"></path>
-						</g>
-						<g transform="translate(14008.5, 2475)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14008.5, 2506)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="28441.3" y="0.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M28441.3 31.0 L28889.3 31.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M28441.3 137.0 L28889.3 137.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-						</g>
-						<g transform="translate(28441.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28441.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28441.25, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="28552.3" y="366.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
-						</g>
-						<g transform="translate(28552.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="29022.3" y="366.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(29022.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="28929.3" y="0.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M28929.3 31.0 L29380.3 31.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M28929.3 137.0 L29380.3 137.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-						</g>
-						<g transform="translate(28929.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28929.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28929.25, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="29149.3" y="366.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
-						</g>
-						<g transform="translate(29149.25, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="19172.8" y="686.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M19172.8 717.0 L19651.8 717.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M19172.8 778.0 L19651.8 778.0" fill="none" data-name="AverageSectionFormView"></path>
-						</g>
-						<g transform="translate(19172.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19172.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19172.75, 778)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="19691.8" y="686.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M19691.8 717.0 L20170.8 717.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M19691.8 778.0 L20170.8 778.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-						</g>
-						<g transform="translate(19691.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19691.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19691.75, 778)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="29734.8" y="335.5" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M29734.8 366.5 L29938.8 366.5" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M29734.8 397.5 L29938.8 397.5" fill="none" data-name="DataReferenceIdentifier"></path>
-						</g>
-						<g transform="translate(29734.75, 335.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29734.75, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29734.75, 397.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="29769.3" y="91.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(29769.25, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="13023.3" y="1584.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M13023.3 1615.0 L13732.3 1615.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M13023.3 1676.0 L13732.3 1676.0" fill="none" data-name="DataReferenceEditor"></path>
-						</g>
-						<g transform="translate(13023.25, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13023.25, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13023.25, 1676)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="14481.5" y="2513.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
-						</g>
-						<g transform="translate(14481.5, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="24594.8" y="686.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M24594.8 717.0 L24932.8 717.0" fill="none" data-name="ReportsFormData"></path>
-							<path d="M24594.8 763.0 L24932.8 763.0" fill="none" data-name="ReportsFormData"></path>
-						</g>
-						<g transform="translate(24594.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24594.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24594.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="11711.5" y="2475.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M11711.5 2506.0 L12012.5 2506.0" fill="none" data-name="ReportStatus"></path>
-						</g>
-						<g transform="translate(11711.5, 2475)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11711.5, 2506)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="13772.3" y="1584.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M13772.3 1615.0 L13969.3 1615.0" fill="none" data-name="ReportBadge"></path>
-							<path d="M13772.3 1691.0 L13969.3 1691.0" fill="none" data-name="ReportBadge"></path>
-						</g>
-						<g transform="translate(13772.25, 1584)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13772.25, 1615)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13772.25, 1691)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="14724.5" y="2513.0" height="31.0" width="106.0" data-name="BadgeType"></rect>
-						</g>
-						<g transform="translate(14724.5, 2513)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignReportsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="2648.5" y="709.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M2648.5 740.0 L3041.5 740.0" fill="none" data-name="StudyDesignReportsFormView"></path>
-						</g>
-						<g transform="translate(2648.5, 709)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2648.5, 740)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="20210.8" y="686.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M20210.8 717.0 L20598.8 717.0" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M20210.8 778.0 L20598.8 778.0" fill="none" data-name="StudyFormScaffold"></path>
-						</g>
-						<g transform="translate(20210.75, 686)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20210.75, 717)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20210.75, 778)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="T Function(WidgetRef)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="20091.5" y="1637.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
-						</g>
-						<g transform="translate(20091.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="20506.8" y="1637.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
-						</g>
-						<g transform="translate(20506.75, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="14169.3" y="709.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M14169.3 740.0 L14521.3 740.0" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(14169.25, 709)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14169.25, 740)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="15427.0" y="2445.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M15427.0 2476.0 L15790.0 2476.0" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(15427, 2445)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15427, 2476)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="16718.0" y="2513.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(16718, 2513)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="25768.3" y="253.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M25768.3 284.0 L26936.3 284.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M25768.3 420.0 L26936.3 420.0" fill="none" data-name="QuestionFormData"></path>
-						</g>
-						<g transform="translate(25768.25, 253)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25768.25, 284)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25768.25, 420)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="25180.8" y="663.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M25180.8 694.5 L25524.8 694.5" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M25180.8 755.5 L25524.8 755.5" fill="none" data-name="ChoiceQuestionFormData"></path>
-						</g>
-						<g transform="translate(25180.75, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25180.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25180.75, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="25564.8" y="678.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M25564.8 709.5 L25956.8 709.5" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M25564.8 755.5 L25956.8 755.5" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(25564.75, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25564.75, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25564.75, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="25996.8" y="678.5" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M25996.8 709.5 L26468.8 709.5" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M25996.8 755.5 L26468.8 755.5" fill="none" data-name="ImageQuestionFormData"></path>
-						</g>
-						<g transform="translate(25996.75, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25996.75, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25996.75, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="26508.8" y="671.0" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M26508.8 702.0 L26980.8 702.0" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M26508.8 763.0 L26980.8 763.0" fill="none" data-name="AudioQuestionFormData"></path>
-						</g>
-						<g transform="translate(26508.75, 671)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26508.75, 702)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26508.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="27020.8" y="603.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M27020.8 634.5 L27364.8 634.5" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M27020.8 830.5 L27364.8 830.5" fill="none" data-name="ScaleQuestionFormData"></path>
-						</g>
-						<g transform="translate(27020.75, 603.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27020.75, 634.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27020.75, 830.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="27875.5" y="1637.5" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(27875.5, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="27404.8" y="663.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M27404.8 694.5 L27748.8 694.5" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M27404.8 770.5 L27748.8 770.5" fill="none" data-name="FreeTextQuestionFormData"></path>
-						</g>
-						<g transform="translate(27404.75, 663.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27404.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27404.75, 770.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="28082.0" y="1637.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
-						</g>
-						<g transform="translate(28082, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="29420.3" y="75.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M29420.3 106.5 L29729.3 106.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(29420.25, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29420.25, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="16323.3" y="716.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M16323.3 747.5 L16675.3 747.5" fill="none" data-name="ScaleQuestionFormView"></path>
-						</g>
-						<g transform="translate(16323.25, 716.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16323.25, 747.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="20638.8" y="678.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M20638.8 709.5 L20990.8 709.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M20638.8 755.5 L20990.8 755.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-						</g>
-						<g transform="translate(20638.75, 678.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20638.75, 709.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20638.75, 755.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="21030.8" y="701.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M21030.8 732.0 L21382.8 732.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M21030.8 763.0 L21382.8 763.0" fill="none" data-name="BoolQuestionFormView"></path>
-						</g>
-						<g transform="translate(21030.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21030.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21030.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="21422.8" y="701.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M21422.8 732.0 L21774.8 732.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M21422.8 763.0 L21774.8 763.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(21422.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21422.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21422.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="21814.8" y="701.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M21814.8 732.0 L22166.8 732.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M21814.8 763.0 L22166.8 763.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-						</g>
-						<g transform="translate(21814.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21814.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21814.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="22206.8" y="701.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M22206.8 732.0 L22558.8 732.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M22206.8 763.0 L22558.8 763.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-						</g>
-						<g transform="translate(22206.75, 701)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22206.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22206.75, 763)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="17915.3" y="328.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M17915.3 359.0 L18347.3 359.0" fill="none" data-name="ScheduleControls"></path>
-							<path d="M17915.3 390.0 L18347.3 390.0" fill="none" data-name="ScheduleControls"></path>
-						</g>
-						<g transform="translate(17915.25, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17915.25, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17915.25, 390)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="28607.8" y="732.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
-						</g>
-						<g transform="translate(28607.75, 732)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="18214.3" y="1637.5" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
-						</g>
-						<g transform="translate(18214.25, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="9170.8" y="566.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M9170.8 597.0 L9866.8 597.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M9170.8 808.0 L9866.8 808.0" fill="none" data-name="StudyFormViewModel"></path>
-						</g>
-						<g transform="translate(9170.75, 566)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9170.75, 597)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9170.75, 808)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="6732.8" y="1637.5" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
-						</g>
-						<g transform="translate(6732.75, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="6923.8" y="1637.5" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
-						</g>
-						<g transform="translate(6923.75, 1637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="1230.0" y="91.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
-						</g>
-						<g transform="translate(1230, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/forms/uml.svg b/docs/uml/designer_v2/lib/features/forms/uml.svg
deleted file mode 100644
index 7f58f6adb..000000000
--- a/docs/uml/designer_v2/lib/features/forms/uml.svg
+++ /dev/null
@@ -1,937 +0,0 @@
-<svg version="1.1" baseProfile="full" width="5433.8" height="1284.0" viewbox="0 0 5433.75 1284" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;ManagedFormViewModel
-	  |
-	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
-	]
-	
-	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
-	
-	[FormViewModelNotFoundException
-	]
-	
-	[Exception]&lt;:--[FormViewModelNotFoundException]
-	
-	[FormViewModelCollection
-	  |
-	  +formViewModels: List&lt;T&gt;;
-	  +formArray: FormArray&lt;dynamic&gt;;
-	  +stagedViewModels: List&lt;T&gt;;
-	  +retrievableViewModels: List&lt;T&gt;;
-	  +formData: List&lt;D&gt;
-	  |
-	  +void add();
-	  +T remove();
-	  +T? findWhere();
-	  +T? removeWhere();
-	  +bool contains();
-	  +void stage();
-	  +T commit();
-	  +void reset();
-	  +void read()
-	]
-	
-	[FormViewModelCollection]o-[FormArray]
-	
-	[CustomFormControl
-	  |
-	  -_onValueChangedDebouncer: Debouncer?;
-	  -_onStatusChangedDebouncer: Debouncer?;
-	  +onValueChanged: void Function(T?)?;
-	  +onStatusChanged: void Function(ControlStatus)?;
-	  +onStatusChangedDebounceTime: int?;
-	  +onValueChangedDebounceTime: int?
-	  |
-	  +void dispose()
-	]
-	
-	[CustomFormControl]o-[Debouncer]
-	[CustomFormControl]o-[void Function(T?)?]
-	[CustomFormControl]o-[void Function(ControlStatus)?]
-	[FormControl]&lt;:-[CustomFormControl]
-	
-	[FormArrayTable
-	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +items: List&lt;T&gt;;
-	  +onSelectItem: void Function(T);
-	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
-	  +onNewItem: void Function()?;
-	  +rowTitle: String Function(T);
-	  +onNewItemLabel: String;
-	  +sectionTitle: String?;
-	  +sectionDescription: String?;
-	  +emptyIcon: IconData?;
-	  +emptyTitle: String?;
-	  +emptyDescription: String?;
-	  +sectionTitleDivider: bool?;
-	  +rowPrefix: Widget Function(BuildContext, T, int)?;
-	  +rowSuffix: Widget Function(BuildContext, T, int)?;
-	  +leadingWidget: Widget?;
-	  +itemsSectionPadding: EdgeInsets?;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
-	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow();
-	  -Widget _newItemButton()
-	]
-	
-	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
-	[FormArrayTable]o-[void Function(T)]
-	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
-	[FormArrayTable]o-[void Function()?]
-	[FormArrayTable]o-[String Function(T)]
-	[FormArrayTable]o-[IconData]
-	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
-	[FormArrayTable]o-[&lt;abstract&gt;Widget]
-	[FormArrayTable]o-[EdgeInsets]
-	
-	[FormInvalidException
-	]
-	
-	[Exception]&lt;:--[FormInvalidException]
-	
-	[FormConfigException
-	  |
-	  +message: String?
-	]
-	
-	[Exception]&lt;:--[FormConfigException]
-	
-	[&lt;abstract&gt;IFormViewModelDelegate
-	  |
-	  +dynamic onSave();
-	  +void onCancel()
-	]
-	
-	[&lt;abstract&gt;IFormGroupController
-	  |
-	  +form: FormGroup
-	]
-	
-	[&lt;abstract&gt;IFormGroupController]o-[FormGroup]
-	
-	[FormControlOption
-	  |
-	  +value: T;
-	  +label: String;
-	  +description: String?;
-	  +props: List&lt;Object?&gt;
-	]
-	
-	[&lt;abstract&gt;Equatable]&lt;:-[FormControlOption]
-	
-	[&lt;abstract&gt;FormViewModel
-	  |
-	  -_formData: T?;
-	  -_formMode: FormMode;
-	  -_validationSet: FormValidationSetEnum?;
-	  +delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?;
-	  +autosave: bool;
-	  -_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;;
-	  -_immediateFormChildrenListenerDebouncer: Debouncer?;
-	  -_autosaveOperation: CancelableOperation&lt;dynamic&gt;?;
-	  -_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  +prevFormValue: Map&lt;String, dynamic&gt;?;
-	  &lt;static&gt;-_formKey: String;
-	  +formData: T?;
-	  +formMode: FormMode;
-	  +isReadonly: bool;
-	  +validationSet: FormValidationSetEnum?;
-	  +isDirty: bool;
-	  +title: String;
-	  +isValid: bool;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;
-	  |
-	  -dynamic _setFormData();
-	  -dynamic _rememberDefaultControlValidators();
-	  -Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators();
-	  -dynamic _disableAllControls();
-	  -dynamic _formModeUpdated();
-	  -dynamic _restoreControlsFromFormData();
-	  +void revalidate();
-	  -void _applyValidationSet();
-	  +void read();
-	  +dynamic save();
-	  +dynamic cancel();
-	  +void enableAutosave();
-	  +void listenToImmediateFormChildren();
-	  +dynamic markFormGroupChanged();
-	  +void dispose();
-	  +void setControlsFrom();
-	  +T buildFormData();
-	  +void initControls()
-	]
-	
-	[&lt;abstract&gt;FormViewModel]o-[FormMode]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;FormValidationSetEnum]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;IFormViewModelDelegate]
-	[&lt;abstract&gt;FormViewModel]o-[Debouncer]
-	[&lt;abstract&gt;FormViewModel]o-[CancelableOperation]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[&lt;abstract&gt;FormViewModel]
-	
-	[FormMode
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;FormMode&gt;;
-	  &lt;static&gt;+create: FormMode;
-	  &lt;static&gt;+readonly: FormMode;
-	  &lt;static&gt;+edit: FormMode
-	]
-	
-	[FormMode]o-[FormMode]
-	[Enum]&lt;:--[FormMode]
-	
-	[UnsavedChangesDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;FormValidationSetEnum
-	]
-	
-	[FormControlValidation
-	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
-	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
-	  +validationMessages: Map&lt;String, String Function(Object)&gt;
-	  |
-	  +FormControlValidation merge()
-	]
-	
-	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
-	
-	[&lt;abstract&gt;IFormData
-	  |
-	  +id: String
-	  |
-	  +IFormData copy()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="1284.0" width="5433.8" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M3073.3 860.8 L2164.5 1086 L913.5 1155.9316770186335 L913.5 1155.9 " fill="none"></path>
-					<path d="M3074.6 865.9 L3073.3 860.8 L3072.0 855.6 L3086.3 857.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M4371.2 220.7 L4146.25 413 L4146.25 734 L4146.3 734.0 " fill="none"></path>
-					</g>
-					<path d="M4374.7 224.7 L4371.2 220.7 L4367.8 216.6 L4381.4 212.0 Z"></path>
-					<path d="M502.0 351.7 L502 413 L502 734 L502.0 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M507.3 342.3 L502.0 351.7 L496.7 342.3 L502.0 333.0 Z"></path>
-					</g>
-					<path d="M188.2 851.9 L146.5 1086 L2104.5 1164.9241104752425 L2104.5 1164.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M195.1 843.6 L188.2 851.9 L184.6 841.8 L191.5 833.5 Z"></path>
-					</g>
-					<path d="M328.6 845.0 L636.75 1086 L186.5 1154.520901831846 L186.5 1154.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M324.5 835.0 L328.6 845.0 L318.0 843.5 L313.9 833.5 Z"></path>
-					</g>
-					<path d="M431.3 796.9 L1801 1086 L477.5 1159.9844720496894 L477.5 1160.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M423.2 789.8 L431.3 796.9 L421.0 800.2 L413.0 793.1 Z"></path>
-					</g>
-					<path d="M206.5 225.3 L206.5 413 L206.5 665.5 L206.5 665.5 " fill="none"></path>
-					<path d="M211.8 225.3 L206.5 225.3 L201.2 225.3 L206.5 212.0 Z"></path>
-					<path d="M2016.4 248.8 L1188.75 413 L975.3064635958395 734 L975.3 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2026.6 252.2 L2016.4 248.8 L2024.6 241.7 L2034.8 245.1 Z"></path>
-					</g>
-					<path d="M2016.5 254.6 L1299.25 413 L1299.25 734 L1299.3 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2026.8 257.8 L2016.5 254.6 L2024.5 247.4 L2034.8 250.6 Z"></path>
-					</g>
-					<path d="M2017.0 279.8 L1596.75 413 L1596.75 734 L1596.8 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2027.5 282.1 L2017.0 279.8 L2024.2 271.9 L2034.8 274.2 Z"></path>
-					</g>
-					<path d="M2018.5 343.2 L1894.25 413 L1894.25 734 L1894.3 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2029.2 343.3 L2018.5 343.2 L2024.0 334.0 L2034.8 334.1 Z"></path>
-					</g>
-					<path d="M2090.3 406.9 L2084.75 413 L2084.75 734 L2084.8 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2100.5 403.5 L2090.3 406.9 L2092.6 396.4 L2102.8 393.0 Z"></path>
-					</g>
-					<path d="M2247.0 411.5 L2246.75 413 L2246.75 734 L2246.8 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2253.7 403.0 L2247.0 411.5 L2243.1 401.4 L2249.8 393.0 Z"></path>
-					</g>
-					<path d="M2481.5 406.5 L2487.75 413 L2487.75 734 L2487.8 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2478.8 396.0 L2481.5 406.5 L2471.2 403.4 L2468.5 393.0 Z"></path>
-					</g>
-					<path d="M2541.5 325.0 L2720.75 413 L2720.75 734 L2720.8 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2535.5 316.1 L2541.5 325.0 L2530.8 325.7 L2524.8 316.8 Z"></path>
-					</g>
-					<path d="M2542.2 296.4 L2848.75 413 L2848.75 734 L2848.8 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2535.4 288.1 L2542.2 296.4 L2531.6 298.0 L2524.8 289.7 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M4403.2 225.2 L4427.25 413 L4427.25 734 L4427.3 734.0 " fill="none"></path>
-					</g>
-					<path d="M4408.5 224.5 L4403.2 225.2 L4397.9 225.9 L4401.5 212.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M4427.8 220.7 L4652.75 413 L4652.75 718.5 L4652.8 718.5 " fill="none"></path>
-					</g>
-					<path d="M4431.2 216.6 L4427.8 220.7 L4424.3 224.7 L4417.6 212.0 Z"></path>
-					<path d="M3299.1 236.8 L2993.75 413 L2993.75 734 L2993.8 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3309.9 236.8 L3299.1 236.8 L3304.5 227.5 L3315.3 227.5 Z"></path>
-					</g>
-					<path d="M4957.5 225.3 L4957.5 413 L4957.5 696 L4957.5 696.0 " fill="none"></path>
-					<path d="M4962.8 225.3 L4957.5 225.3 L4952.2 225.3 L4957.5 212.0 Z"></path>
-					<path d="M3068.6 902.6 L2525.25 1086 L4318 1161.0938590820945 L4318.0 1161.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3079.1 904.7 L3068.6 902.6 L3075.7 894.6 L3086.3 896.7 Z"></path>
-					</g>
-					<path d="M3068.6 909.0 L2565.25 1086 L3441.5 1158.5172413793102 L3441.5 1158.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3079.2 910.9 L3068.6 909.0 L3075.7 900.9 L3086.3 902.8 Z"></path>
-					</g>
-					<path d="M3809.6 1080.1 L3814.75 1086 L3804.3873456790125 1128.5 L3804.4 1128.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3807.5 1069.5 L3809.6 1080.1 L3799.5 1076.5 L3797.4 1066.0 Z"></path>
-					</g>
-					<path d="M3848.1 1079.3 L3854.75 1086 L2207.5 1164.544370860927 L2207.5 1164.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3845.3 1068.9 L3848.1 1079.3 L3837.8 1076.4 L3835.0 1066.0 Z"></path>
-					</g>
-					<path d="M3975.2 955.0 L4264 1086 L5194.75 1159.7498165810712 L5194.8 1159.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3969.0 946.3 L3975.2 955.0 L3964.5 956.0 L3958.3 947.3 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3398.6 238.4 L3522.25 413 L3522.25 433 L3522.3 433.0 " fill="none"></path>
-					</g>
-					<path d="M3403.0 235.3 L3398.6 238.4 L3394.3 241.5 L3390.9 227.5 Z"></path>
-					<path d="M4618.5 1147.8 L4966.5 1106 L5058.125 1106 L5058.125 1106 L5149.75 1167 L5149.75 1167 L5058.125 1228 L5058.125 1228 L4966.5 1228 L4966.5 1228 L4600 1183.9477832512316 L4600.0 1183.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4608.6 1143.6 L4618.5 1147.8 L4609.9 1154.2 L4600.0 1150.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M5123.0 778.3 L5123 1086 L4600 1149.7996987951808 L4600.0 1149.8 " fill="none"></path>
-					</g>
-					<path d="M5128.3 778.3 L5123.0 778.3 L5117.7 778.3 L5123.0 765.0 Z"></path>
-					<path d="M925.0 284.2 L925 413 L963.1575037147103 734 L963.2 734.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M930.3 274.8 L925.0 284.2 L919.7 274.8 L925.0 265.5 Z"></path>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="517.5" y="1136.0" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
-							<path d="M517.5 1167.0 L913.5 1167.0" fill="none" data-name="ManagedFormViewModel"></path>
-						</g>
-						<g transform="translate(517.5, 1136)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(517.5, 1167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="3086.3" y="433.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
-							<path d="M3086.3 464.0 L3958.3 464.0" fill="none" data-name="FormViewModel"></path>
-							<path d="M3086.3 780.0 L3958.3 780.0" fill="none" data-name="FormViewModel"></path>
-						</g>
-						<g transform="translate(3086.25, 433)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3086.25, 464)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3086.25, 780)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
-							<rect x="3998.3" y="734.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
-						</g>
-						<g transform="translate(3998.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Exception">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="4352.5" y="181.0" height="31.0" width="94.0" data-name="Exception"></rect>
-						</g>
-						<g transform="translate(4352.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="361.5" y="60.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
-							<path d="M361.5 91.0 L642.5 91.0" fill="none" data-name="FormViewModelCollection"></path>
-							<path d="M361.5 182.0 L642.5 182.0" fill="none" data-name="FormViewModelCollection"></path>
-						</g>
-						<g transform="translate(361.5, 60)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(361.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(361.5, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="453.0" y="734.0" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(453, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomFormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
-							<rect x="0.0" y="665.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
-							<path d="M0.0 696.5 L413.0 696.5" fill="none" data-name="CustomFormControl"></path>
-							<path d="M0.0 802.5 L413.0 802.5" fill="none" data-name="CustomFormControl"></path>
-						</g>
-						<g transform="translate(0, 665.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 696.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 802.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Debouncer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="2104.5" y="1151.5" height="31.0" width="103.0" data-name="Debouncer"></rect>
-						</g>
-						<g transform="translate(2104.5, 1151.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(T?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
-							<rect x="22.5" y="1151.5" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
-						</g>
-						<g transform="translate(22.5, 1151.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(ControlStatus)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
-							<rect x="226.5" y="1151.5" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
-						</g>
-						<g transform="translate(226.5, 1151.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="150.0" y="181.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(150, 181)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArrayTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
-							<rect x="2034.8" y="0.0" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
-							<path d="M2034.8 31.0 L2524.8 31.0" fill="none" data-name="FormArrayTable"></path>
-							<path d="M2034.8 332.0 L2524.8 332.0" fill="none" data-name="FormArrayTable"></path>
-						</g>
-						<g transform="translate(2034.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
-								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2034.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2034.75, 332)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="896.0" y="734.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(896, 734)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="1227.3" y="734.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
-						</g>
-						<g transform="translate(1227.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<rect x="1411.3" y="734.0" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
-						</g>
-						<g transform="translate(1411.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="1822.3" y="734.0" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(1822.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="String Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
-							<rect x="2006.3" y="734.0" height="31.0" width="157.0" data-name="String Function(T)"></rect>
-						</g>
-						<g transform="translate(2006.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="2203.3" y="734.0" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(2203.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
-							<rect x="2330.3" y="734.0" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
-						</g>
-						<g transform="translate(2330.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
-								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="2685.3" y="734.0" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(2685.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EdgeInsets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="2796.3" y="734.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
-						</g>
-						<g transform="translate(2796.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormInvalidException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
-							<rect x="4334.3" y="734.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
-						</g>
-						<g transform="translate(4334.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConfigException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
-							<rect x="4560.3" y="718.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
-							<path d="M4560.3 749.5 L4745.3 749.5" fill="none" data-name="FormConfigException"></path>
-						</g>
-						<g transform="translate(4560.25, 718.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
-								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4560.25, 749.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="3686.5" y="1128.5" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-							<path d="M3686.5 1159.5 L3903.5 1159.5" fill="none" data-name="IFormViewModelDelegate"></path>
-						</g>
-						<g transform="translate(3686.5, 1128.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3686.5, 1159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormGroupController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="3275.5" y="165.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
-							<path d="M3275.5 196.5 L3462.5 196.5" fill="none" data-name="IFormGroupController"></path>
-						</g>
-						<g transform="translate(3275.5, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
-								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3275.5, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="2941.3" y="734.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(2941.25, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControlOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
-							<rect x="4862.5" y="696.0" height="107.0" width="190.0" data-name="FormControlOption"></rect>
-							<path d="M4862.5 727.0 L5052.5 727.0" fill="none" data-name="FormControlOption"></path>
-						</g>
-						<g transform="translate(4862.5, 696)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4862.5, 727)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="4909.5" y="181.0" height="31.0" width="96.0" data-name="Equatable"></rect>
-						</g>
-						<g transform="translate(4909.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
-							<rect x="4318.0" y="1106.0" height="122.0" width="282.0" data-name="FormMode"></rect>
-							<path d="M4318.0 1137.0 L4600.0 1137.0" fill="none" data-name="FormMode"></path>
-						</g>
-						<g transform="translate(4318, 1106)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4318, 1137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormValidationSetEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
-							<rect x="3441.5" y="1151.5" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
-						</g>
-						<g transform="translate(3441.5, 1151.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
-								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CancelableOperation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="5194.8" y="1151.5" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
-						</g>
-						<g transform="translate(5194.75, 1151.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="5092.5" y="734.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(5092.5, 734)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="UnsavedChangesDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
-							<rect x="4662.5" y="165.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
-							<path d="M4662.5 196.5 L4869.5 196.5" fill="none" data-name="UnsavedChangesDialog"></path>
-						</g>
-						<g transform="translate(4662.5, 165.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4662.5, 196.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControlValidation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
-							<rect x="682.5" y="127.5" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
-							<path d="M682.5 158.5 L1167.5 158.5" fill="none" data-name="FormControlValidation"></path>
-							<path d="M682.5 234.5 L1167.5 234.5" fill="none" data-name="FormControlValidation"></path>
-						</g>
-						<g transform="translate(682.5, 127.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
-								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(682.5, 158.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(682.5, 234.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="5045.5" y="150.0" height="93.0" width="163.0" data-name="IFormData"></rect>
-							<path d="M5045.5 181.0 L5208.5 181.0" fill="none" data-name="IFormData"></path>
-							<path d="M5045.5 212.0 L5208.5 212.0" fill="none" data-name="IFormData"></path>
-						</g>
-						<g transform="translate(5045.5, 150)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5045.5, 181)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5045.5, 212)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/monitor/uml.svg b/docs/uml/designer_v2/lib/features/monitor/uml.svg
deleted file mode 100644
index fbafb4e75..000000000
--- a/docs/uml/designer_v2/lib/features/monitor/uml.svg
+++ /dev/null
@@ -1,172 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1031.5" height="356.0" viewbox="0 0 1031.5 356" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudyMonitorScreen
-	  |
-	  +Widget build();
-	  -Widget _monitorSectionHeader();
-	  -Widget _buildStat();
-	  -dynamic _onSelectParticipant()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
-	
-	[StudyMonitorTable
-	  |
-	  +studyMonitorItems: List&lt;StudyMonitorItem&gt;;
-	  +onSelectItem: void Function(StudyMonitorItem)
-	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow();
-	  -String _formatTime();
-	  -Widget _buildProgressCell()
-	]
-	
-	[StudyMonitorTable]o-[void Function(StudyMonitorItem)]
-	
-	[ParticipantDetailsView
-	  |
-	  +monitorItem: StudyMonitorItem;
-	  +interventions: List&lt;Intervention&gt;;
-	  +observations: List&lt;Observation&gt;
-	  |
-	  +Widget build();
-	  -Widget _buildPerDayStatus();
-	  -String _getTooltipText()
-	]
-	
-	[ParticipantDetailsView]o-[StudyMonitorItem]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="356.0" width="1031.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M140.0 105.3 L140 173 L140 193 L140.0 193.0 " fill="none"></path>
-					<path d="M145.3 105.3 L140.0 105.3 L134.7 105.3 L140.0 92.0 Z"></path>
-					<path d="M456.0 171.7 L456 173 L456 231 L456.0 231.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M461.3 162.3 L456.0 171.7 L450.7 162.3 L456.0 153.0 Z"></path>
-					</g>
-					<path d="M834.5 171.7 L834.5 173 L834.5 231 L834.5 231.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M839.8 162.3 L834.5 171.7 L829.2 162.3 L834.5 153.0 Z"></path>
-					</g>
-					<g data-name="StudyMonitorScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="0.0" y="193.0" height="107.0" width="280.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M0.0 224.0 L280.0 224.0" fill="none" data-name="StudyMonitorScreen"></path>
-						</g>
-						<g transform="translate(0, 193)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
-								<text x="132.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 224)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorScreen">-Widget _monitorSectionHeader()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorScreen">-Widget _buildStat()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorScreen">-dynamic _onSelectParticipant()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="61.5" y="61.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
-						</g>
-						<g transform="translate(61.5, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyMonitorTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorTable">
-							<rect x="258.5" y="0.0" height="153.0" width="395.0" data-name="StudyMonitorTable"></rect>
-							<path d="M258.5 31.0 L653.5 31.0" fill="none" data-name="StudyMonitorTable"></path>
-							<path d="M258.5 77.0 L653.5 77.0" fill="none" data-name="StudyMonitorTable"></path>
-						</g>
-						<g transform="translate(258.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorTable">
-								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorTable">StudyMonitorTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(258.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+studyMonitorItems: List&lt;StudyMonitorItem&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">+onSelectItem: void Function(StudyMonitorItem)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(258.5, 77)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">-List&lt;Widget&gt; _buildRow()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorTable">-String _formatTime()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorTable">-Widget _buildProgressCell()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(StudyMonitorItem)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyMonitorItem)">
-							<rect x="320.0" y="231.0" height="31.0" width="272.0" data-name="void Function(StudyMonitorItem)"></rect>
-						</g>
-						<g transform="translate(320, 231)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyMonitorItem)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyMonitorItem)">
-								<text x="128.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyMonitorItem)">void Function(StudyMonitorItem)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ParticipantDetailsView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsView">
-							<rect x="693.5" y="0.0" height="153.0" width="282.0" data-name="ParticipantDetailsView"></rect>
-							<path d="M693.5 31.0 L975.5 31.0" fill="none" data-name="ParticipantDetailsView"></path>
-							<path d="M693.5 92.0 L975.5 92.0" fill="none" data-name="ParticipantDetailsView"></path>
-						</g>
-						<g transform="translate(693.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsView">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsView">ParticipantDetailsView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(693.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsView">+monitorItem: StudyMonitorItem</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsView">+interventions: List&lt;Intervention&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsView">+observations: List&lt;Observation&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(693.5, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsView">-Widget _buildPerDayStatus()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsView">-String _getTooltipText()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyMonitorItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorItem">
-							<rect x="757.5" y="231.0" height="31.0" width="154.0" data-name="StudyMonitorItem"></rect>
-						</g>
-						<g transform="translate(757.5, 231)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorItem">
-								<text x="69.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorItem">StudyMonitorItem</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/publish/uml.svg b/docs/uml/designer_v2/lib/features/publish/uml.svg
deleted file mode 100644
index d971c6a59..000000000
--- a/docs/uml/designer_v2/lib/features/publish/uml.svg
+++ /dev/null
@@ -1,106 +0,0 @@
-<svg version="1.1" baseProfile="full" width="687.0" height="189.0" viewbox="0 0 687 189" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[PublishConfirmationDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
-	
-	[PublishSuccessDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
-	
-	[PublishDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="189.0" width="687.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M267.8 28.7 L112 51 L112 71 L112.0 71.0 " fill="none"></path>
-					<path d="M268.6 33.9 L267.8 28.7 L267.0 23.4 L281.0 26.8 Z"></path>
-					<path d="M359.5 44.3 L359.5 51 L359.5 71 L359.5 71.0 " fill="none"></path>
-					<path d="M364.8 44.3 L359.5 44.3 L354.2 44.3 L359.5 31.0 Z"></path>
-					<path d="M451.1 31.5 L563 51 L563 71 L563.0 71.0 " fill="none"></path>
-					<path d="M452.1 26.2 L451.1 31.5 L450.2 36.7 L438.0 29.2 Z"></path>
-					<g data-name="PublishConfirmationDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
-							<rect x="0.0" y="71.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
-							<path d="M0.0 102.0 L224.0 102.0" fill="none" data-name="PublishConfirmationDialog"></path>
-						</g>
-						<g transform="translate(0, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="281.0" y="0.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
-						</g>
-						<g transform="translate(281, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PublishSuccessDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
-							<rect x="264.0" y="71.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
-							<path d="M264.0 102.0 L455.0 102.0" fill="none" data-name="PublishSuccessDialog"></path>
-						</g>
-						<g transform="translate(264, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(264, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PublishDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
-							<rect x="495.0" y="71.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
-							<path d="M495.0 102.0 L631.0 102.0" fill="none" data-name="PublishDialog"></path>
-						</g>
-						<g transform="translate(495, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(495, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/recruit/uml.svg b/docs/uml/designer_v2/lib/features/recruit/uml.svg
deleted file mode 100644
index b113e1780..000000000
--- a/docs/uml/designer_v2/lib/features/recruit/uml.svg
+++ /dev/null
@@ -1,498 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2761.5" height="876.0" viewbox="0 0 2761.5 876" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[InviteCodeFormViewModel
-	  |
-	  +study: Study;
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  +codeControl: FormControl&lt;String&gt;;
-	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
-	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +interventionAControl: FormControl&lt;String&gt;;
-	  +interventionBControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
-	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +isPreconfiguredSchedule: bool;
-	  +preconfiguredSchedule: List&lt;String&gt;?
-	  |
-	  +void initControls();
-	  -dynamic _uniqueInviteCode();
-	  +void regenerateCode();
-	  -String _generateCode();
-	  +StudyInvite buildFormData();
-	  +void setControlsFrom();
-	  +dynamic save()
-	]
-	
-	[InviteCodeFormViewModel]o-[Study]
-	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[InviteCodeFormViewModel]o-[FormControl]
-	[InviteCodeFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
-	
-	[StudyRecruitController
-	  |
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
-	  |
-	  -dynamic _subscribeInvites();
-	  +Intervention? getIntervention();
-	  +int getParticipantCountForInvite();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void dispose()
-	]
-	
-	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[StudyRecruitController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyRecruitController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
-	
-	[EnrolledBadge
-	  |
-	  +enrolledCount: int
-	  |
-	  +Widget build()
-	]
-	
-	[StudyRecruitScreen
-	  |
-	  +Widget build();
-	  -Widget _inviteCodesSectionHeader();
-	  -Widget _newInviteCodeButton();
-	  -dynamic _onSelectInvite()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
-	
-	[InviteCodeFormView
-	  |
-	  +formViewModel: InviteCodeFormViewModel
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
-	]
-	
-	[InviteCodeFormView]o-[InviteCodeFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
-	
-	[StudyInvitesTable
-	  |
-	  +invites: List&lt;StudyInvite&gt;;
-	  +onSelect: void Function(StudyInvite);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getIntervention: Intervention? Function(String);
-	  +getParticipantCountForInvite: int Function(StudyInvite)
-	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow()
-	]
-	
-	[StudyInvitesTable]o-[void Function(StudyInvite)]
-	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
-	[StudyInvitesTable]o-[Intervention? Function(String)]
-	[StudyInvitesTable]o-[int Function(StudyInvite)]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="876.0" width="2761.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#33322E" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M82.0 760.6 L71.5 769 L71.5 789 L71.5 789.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M92.6 759.0 L82.0 760.6 L85.9 750.7 L96.6 749.0 Z"></path>
-					</g>
-					<path d="M178.4 763.9 L174.5 769 L209.99295774647888 789 L210.0 789.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M188.3 759.7 L178.4 763.9 L179.8 753.2 L189.7 749.0 Z"></path>
-					</g>
-					<path d="M607.7 760.0 L620 769 L620 789 L620.0 789.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M603.3 750.2 L607.7 760.0 L597.0 758.8 L592.6 749.0 Z"></path>
-					</g>
-					<path d="M683.8 728.1 L769 769 L769 789 L769.0 789.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M677.7 719.3 L683.8 728.1 L673.1 728.9 L667.0 720.0 Z"></path>
-					</g>
-					<path d="M100.0 305.8 L100 351 L122.34449760765551 371 L122.3 371.0 " fill="none"></path>
-					<path d="M105.3 305.8 L100.0 305.8 L94.7 305.8 L100.0 292.5 Z"></path>
-					<path d="M846.3 657.3 L504 769 L333 791.7786116322702 L333.0 791.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M856.9 659.5 L846.3 657.3 L853.6 649.3 L864.1 651.5 Z"></path>
-					</g>
-					<path d="M1237.0 665.5 L1327.75 769 L1327.75 789 L1327.8 789.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1234.9 655.0 L1237.0 665.5 L1226.9 662.0 L1224.7 651.5 Z"></path>
-					</g>
-					<path d="M777.5 305.8 L777.5 351 L983.8277511961722 468.5 L983.8 468.5 " fill="none"></path>
-					<path d="M782.8 305.8 L777.5 305.8 L772.2 305.8 L777.5 292.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1352.5 305.8 L1352.5 351 L1235.5622009569379 468.5 L1235.6 468.5 " fill="none"></path>
-					</g>
-					<path d="M1357.8 305.8 L1352.5 305.8 L1347.2 305.8 L1352.5 292.5 Z"></path>
-					<path d="M1063.5 120.3 L1063.5 203 L1063.5 223.5 L1063.5 223.5 " fill="none"></path>
-					<path d="M1068.8 120.3 L1063.5 120.3 L1058.2 120.3 L1063.5 107.0 Z"></path>
-					<path d="M429.5 349.7 L429.5 351 L420.31339712918657 371 L420.3 371.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M434.8 340.3 L429.5 349.7 L424.2 340.3 L429.5 331.0 Z"></path>
-					</g>
-					<path d="M429.5 120.3 L429.5 203 L429.5 223 L429.5 223.0 " fill="none"></path>
-					<path d="M434.8 120.3 L429.5 120.3 L424.2 120.3 L429.5 107.0 Z"></path>
-					<path d="M1922.4 145.0 L1595.5 203 L1595.5 261.5 L1595.5 261.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1932.5 148.6 L1922.4 145.0 L1930.6 138.1 L1940.8 141.7 Z"></path>
-					</g>
-					<path d="M1987.2 190.2 L1956.5 203 L1956.5 261.5 L1956.5 261.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1997.9 191.5 L1987.2 190.2 L1993.8 181.7 L2004.4 183.0 Z"></path>
-					</g>
-					<path d="M2325.6 196.4 L2332 203 L2332 261.5 L2332.0 261.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2322.9 186.0 L2325.6 196.4 L2315.3 193.4 L2312.6 183.0 Z"></path>
-					</g>
-					<path d="M2524.7 180.3 L2601.5 203 L2601.5 261.5 L2601.5 261.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2517.2 172.6 L2524.7 180.3 L2514.2 182.8 L2506.8 175.0 Z"></path>
-					</g>
-					<g data-name="InviteCodeFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="0.0" y="371.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M0.0 402.0 L667.0 402.0" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M0.0 628.0 L667.0 628.0" fill="none" data-name="InviteCodeFormViewModel"></path>
-						</g>
-						<g transform="translate(0, 371)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
-								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 402)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 628)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="41.0" y="789.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(41, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IInviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="142.0" y="789.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
-						</g>
-						<g transform="translate(142, 789)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="563.5" y="789.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(563.5, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="716.5" y="789.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(716.5, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="29.5" y="261.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(29.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRecruitController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="819.0" y="468.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M819.0 499.5 L1470.0 499.5" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M819.0 545.5 L1470.0 545.5" fill="none" data-name="StudyRecruitController"></path>
-						</g>
-						<g transform="translate(819, 468.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
-								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(819, 499.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(819, 545.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="1242.8" y="789.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
-						</g>
-						<g transform="translate(1242.75, 789)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyBaseController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="688.5" y="261.5" height="31.0" width="178.0" data-name="StudyBaseController"></rect>
-						</g>
-						<g transform="translate(688.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="1260.5" y="261.5" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
-						</g>
-						<g transform="translate(1260.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrolledBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="127.5" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M127.5 76.0 L293.5 76.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M127.5 107.0 L293.5 107.0" fill="none" data-name="EnrolledBadge"></path>
-						</g>
-						<g transform="translate(127.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(127.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(127.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRecruitScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="906.5" y="223.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M906.5 254.5 L1220.5 254.5" fill="none" data-name="StudyRecruitScreen"></path>
-						</g>
-						<g transform="translate(906.5, 223.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(906.5, 254.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="985.0" y="76.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
-						</g>
-						<g transform="translate(985, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
-							<rect x="210.5" y="223.0" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
-							<path d="M210.5 254.0 L648.5 254.0" fill="none" data-name="InviteCodeFormView"></path>
-							<path d="M210.5 285.0 L648.5 285.0" fill="none" data-name="InviteCodeFormView"></path>
-						</g>
-						<g transform="translate(210.5, 223)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
-								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(210.5, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(210.5, 285)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="333.5" y="76.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
-						</g>
-						<g transform="translate(333.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInvitesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="1940.8" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M1940.8 31.0 L2506.8 31.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M1940.8 137.0 L2506.8 137.0" fill="none" data-name="StudyInvitesTable"></path>
-						</g>
-						<g transform="translate(1940.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
-								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1940.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1940.75, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="1484.5" y="261.5" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(1484.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="1746.5" y="261.5" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(1746.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention? Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="2206.5" y="261.5" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
-						</g>
-						<g transform="translate(2206.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="int Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="2497.5" y="261.5" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(2497.5, 261.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/study/settings/uml.svg b/docs/uml/designer_v2/lib/features/study/settings/uml.svg
deleted file mode 100644
index b6f45b2a3..000000000
--- a/docs/uml/designer_v2/lib/features/study/settings/uml.svg
+++ /dev/null
@@ -1,185 +0,0 @@
-<svg version="1.1" baseProfile="full" width="798.0" height="456.0" viewbox="0 0 798 456" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[StudySettingsDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
-	
-	[StudySettingsFormViewModel
-	  |
-	  +study: AsyncValue&lt;Study&gt;;
-	  +studyRepository: IStudyRepository;
-	  &lt;static&gt;+defaultPublishedToRegistry: bool;
-	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
-	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
-	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +dynamic keepControlsSynced();
-	  +dynamic save();
-	  +dynamic setLaunchDefaults()
-	]
-	
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudySettingsFormViewModel]o-[FormControl]
-	[StudySettingsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="456.0" width="798.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M87.5 44.3 L87.5 51 L87.5 169 L87.5 169.0 " fill="none"></path>
-					<path d="M92.8 44.3 L87.5 44.3 L82.2 44.3 L87.5 31.0 Z"></path>
-					<path d="M216.7 338.4 L198.5 349 L198.5 369 L198.5 369.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M227.5 338.3 L216.7 338.4 L222.1 329.1 L232.9 329.0 Z"></path>
-					</g>
-					<path d="M370.7 345.2 L368.5 349 L368.5 369 L368.5 369.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M380.0 339.7 L370.7 345.2 L370.8 334.4 L380.0 329.0 Z"></path>
-					</g>
-					<path d="M538.3 345.2 L540.5 349 L540.5 369 L540.5 369.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M538.2 334.4 L538.3 345.2 L529.0 339.7 L529.0 329.0 Z"></path>
-					</g>
-					<path d="M673.7 339.0 L689.5 349 L689.5 369 L689.5 369.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M668.7 329.5 L673.7 339.0 L663.0 338.5 L658.0 329.0 Z"></path>
-					</g>
-					<path d="M454.5 44.3 L454.5 51 L454.5 71 L454.5 71.0 " fill="none"></path>
-					<path d="M459.8 44.3 L454.5 44.3 L449.2 44.3 L454.5 31.0 Z"></path>
-					<g data-name="StudySettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="0.0" y="169.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M0.0 200.0 L175.0 200.0" fill="none" data-name="StudySettingsDialog"></path>
-						</g>
-						<g transform="translate(0, 169)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
-								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 200)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="9.0" y="0.0" height="31.0" width="157.0" data-name="StudyPageWidget"></rect>
-						</g>
-						<g transform="translate(9, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySettingsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="215.0" y="71.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M215.0 102.0 L694.0 102.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M215.0 238.0 L694.0 238.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-						</g>
-						<g transform="translate(215, 71)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(215, 102)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(215, 238)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="144.0" y="369.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
-						</g>
-						<g transform="translate(144, 369)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="293.0" y="369.0" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
-						</g>
-						<g transform="translate(293, 369)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="484.0" y="369.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(484, 369)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="637.0" y="369.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(637, 369)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="384.0" y="0.0" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(384, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/study/uml.svg b/docs/uml/designer_v2/lib/features/study/uml.svg
deleted file mode 100644
index ecd129fbe..000000000
--- a/docs/uml/designer_v2/lib/features/study/uml.svg
+++ /dev/null
@@ -1,1411 +0,0 @@
-<svg version="1.1" baseProfile="full" width="6780.3" height="951.0" viewbox="0 0 6780.25 951" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[FrameControlsWidget
-	  |
-	  +onRefresh: void Function()?;
-	  +onOpenNewTab: void Function()?;
-	  +enabled: bool
-	  |
-	  +Widget build()
-	]
-	
-	[FrameControlsWidget]o-[void Function()?]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel
-	  |
-	  +studyParticipation: Participation?;
-	  +studyStatus: StudyStatus?
-	]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
-	
-	[StudyStatusBadge
-	  |
-	  +participation: Participation?;
-	  +status: StudyStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
-	  |
-	  +Widget build()
-	]
-	
-	[StudyStatusBadge]o-[Participation]
-	[StudyStatusBadge]o-[StudyStatus]
-	[StudyStatusBadge]o-[BadgeType]
-	
-	[RouteInformation
-	  |
-	  +route: String?;
-	  +extra: String?;
-	  +cmd: String?;
-	  +data: String?
-	  |
-	  +String toString()
-	]
-	
-	[&lt;abstract&gt;PlatformController
-	  |
-	  +studyId: String;
-	  +baseSrc: String;
-	  +previewSrc: String;
-	  +routeInformation: RouteInformation;
-	  +frameWidget: Widget
-	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void listen();
-	  +void send();
-	  +void openNewPage()
-	]
-	
-	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
-	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
-	
-	[WebController
-	  |
-	  +iFrameElement: IFrameElement
-	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void openNewPage();
-	  +void listen();
-	  +void send()
-	]
-	
-	[WebController]o-[IFrameElement]
-	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
-	
-	[MobileController
-	  |
-	  +void openNewPage();
-	  +void refresh();
-	  +void registerViews();
-	  +void listen();
-	  +void send();
-	  +void navigate();
-	  +void activate();
-	  +void generateUrl()
-	]
-	
-	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
-	
-	[StudyController
-	  |
-	  +notificationService: INotificationService;
-	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
-	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
-	  |
-	  +dynamic syncStudyStatus();
-	  +dynamic onStudySubscriptionUpdate();
-	  -dynamic _redirectNewToActualStudyID();
-	  +dynamic publishStudy();
-	  +void onChangeStudyParticipation();
-	  +void onAddParticipants();
-	  +void onSettingsPressed();
-	  +void dispose()
-	]
-	
-	[StudyController]o-[&lt;abstract&gt;INotificationService]
-	[StudyController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyController]
-	
-	[&lt;abstract&gt;IStudyNavViewModel
-	  |
-	  +isEditTabEnabled: bool;
-	  +isTestTabEnabled: bool;
-	  +isRecruitTabEnabled: bool;
-	  +isMonitorTabEnabled: bool;
-	  +isAnalyzeTabEnabled: bool;
-	  +isSettingsEnabled: bool
-	]
-	
-	[StudyNav
-	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic edit();
-	  &lt;static&gt;+dynamic test();
-	  &lt;static&gt;+dynamic recruit();
-	  &lt;static&gt;+dynamic monitor();
-	  &lt;static&gt;+dynamic analyze()
-	]
-	
-	[StudyDesignNav
-	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic info();
-	  &lt;static&gt;+dynamic enrollment();
-	  &lt;static&gt;+dynamic interventions();
-	  &lt;static&gt;+dynamic measurements();
-	  &lt;static&gt;+dynamic reports()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget
-	  |
-	  +studyId: String
-	  |
-	  +Widget? banner()
-	]
-	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
-	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
-	
-	[StudyParticipationBadge
-	  |
-	  +participation: Participation;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +center: bool
-	  |
-	  +Widget build()
-	]
-	
-	[StudyParticipationBadge]o-[Participation]
-	[StudyParticipationBadge]o-[BadgeType]
-	
-	[StudyBaseController
-	  |
-	  +studyId: String;
-	  +studyRepository: IStudyRepository;
-	  +router: GoRouter;
-	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
-	  |
-	  +dynamic subscribeStudy();
-	  +dynamic onStudySubscriptionUpdate();
-	  +dynamic onStudySubscriptionError();
-	  +void dispose()
-	]
-	
-	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyBaseController]o-[GoRouter]
-	[StudyBaseController]o-[StreamSubscription]
-	
-	[PreviewFrame
-	  |
-	  +studyId: String;
-	  +routeArgs: StudyFormRouteArgs?;
-	  +route: String?
-	]
-	
-	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
-	
-	[&lt;abstract&gt;IStudyAppBarViewModel
-	  |
-	  +isSyncIndicatorVisible: bool;
-	  +isStatusBadgeVisible: bool;
-	  +isPublishVisible: bool
-	]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	
-	[StudyScaffold
-	  |
-	  +studyId: String;
-	  +tabs: List&lt;NavbarTab&gt;?;
-	  +tabsSubnav: List&lt;NavbarTab&gt;?;
-	  +selectedTab: NavbarTab?;
-	  +selectedTabSubnav: NavbarTab?;
-	  +body: StudyPageWidget;
-	  +drawer: Widget?;
-	  +disableActions: bool;
-	  +actionsSpacing: double;
-	  +actionsPadding: double;
-	  +layoutType: SingleColumnLayoutType?;
-	  +appbarHeight: double;
-	  +appbarSubnavHeight: double
-	]
-	
-	[StudyScaffold]o-[NavbarTab]
-	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
-	[StudyScaffold]o-[&lt;abstract&gt;Widget]
-	[StudyScaffold]o-[SingleColumnLayoutType]
-	
-	[WebFrame
-	  |
-	  +previewSrc: String;
-	  +studyId: String
-	  |
-	  +Widget build()
-	]
-	
-	[DisabledFrame
-	  |
-	  +Widget build()
-	]
-	
-	[PhoneContainer
-	  |
-	  &lt;static&gt;+defaultWidth: double;
-	  &lt;static&gt;+defaultHeight: double;
-	  +width: double;
-	  +height: double;
-	  +borderColor: Color;
-	  +borderWidth: double;
-	  +borderRadius: double;
-	  +innerContent: Widget;
-	  +innerContentBackgroundColor: Color?
-	  |
-	  +Widget build()
-	]
-	
-	[PhoneContainer]o-[Color]
-	[PhoneContainer]o-[&lt;abstract&gt;Widget]
-	
-	[MobileFrame
-	  |
-	  +Widget build()
-	]
-	
-	[DesktopFrame
-	  |
-	  +Widget build()
-	]
-	
-	[StudyTestScreen
-	  |
-	  +previewRoute: String?
-	  |
-	  +Widget build();
-	  +Widget? banner();
-	  +dynamic load();
-	  +dynamic save();
-	  +dynamic showHelp()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
-	
-	[StudySettingsFormViewModel
-	  |
-	  +study: AsyncValue&lt;Study&gt;;
-	  +studyRepository: IStudyRepository;
-	  &lt;static&gt;+defaultPublishedToRegistry: bool;
-	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
-	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
-	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +dynamic keepControlsSynced();
-	  +dynamic save();
-	  +dynamic setLaunchDefaults()
-	]
-	
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudySettingsFormViewModel]o-[FormControl]
-	[StudySettingsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
-	
-	[StudySettingsDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
-	
-	[StudyTestController
-	  |
-	  +authRepository: IAuthRepository;
-	  +languageCode: String
-	]
-	
-	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyBaseController]&lt;:-[StudyTestController]
-	
-	[TestAppRoutes
-	  |
-	  &lt;static&gt;+studyOverview: String;
-	  &lt;static&gt;+eligibility: String;
-	  &lt;static&gt;+intervention: String;
-	  &lt;static&gt;+consent: String;
-	  &lt;static&gt;+journey: String;
-	  &lt;static&gt;+dashboard: String
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="951.0" width="6780.3" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M2771.0 507.2 L2771 576 L2771 694.5 L2771.0 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2776.3 497.8 L2771.0 507.2 L2765.7 497.8 L2771.0 488.5 Z"></path>
-					</g>
-					<path d="M1868.4 150.3 L2133 278 L2625.5 393.01959247648904 L2625.5 393.0 " fill="none"></path>
-					<path d="M1870.7 145.5 L1868.4 150.3 L1866.1 155.1 L1856.4 144.5 Z"></path>
-					<path d="M1074.8 181.7 L1156.75 278 L517 414.81054897739506 L517.0 414.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1072.9 171.2 L1074.8 181.7 L1064.7 178.1 L1062.8 167.5 Z"></path>
-					</g>
-					<path d="M1041.9 185.8 L1061.25 278 L672.621644295302 411.5 L672.6 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1045.2 175.5 L1041.9 185.8 L1034.8 177.7 L1038.1 167.5 Z"></path>
-					</g>
-					<path d="M499.6 218.3 L563 278 L470.7147651006711 411.5 L470.7 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M496.5 208.0 L499.6 218.3 L489.1 215.8 L486.0 205.5 Z"></path>
-					</g>
-					<path d="M417.5 224.0 L424.75 278 L606.4085570469799 411.5 L606.4 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M421.5 214.0 L417.5 224.0 L411.0 215.5 L415.0 205.5 Z"></path>
-					</g>
-					<path d="M332.6 220.1 L286.75 278 L133.31459731543623 411.5 L133.3 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M342.6 216.1 L332.6 220.1 L334.2 209.5 L344.2 205.5 Z"></path>
-					</g>
-					<path d="M1647.3 273.2 L1650.75 278 L1419 390.2038992688871 L1419.0 390.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1646.2 262.5 L1647.3 273.2 L1637.6 268.7 L1636.5 258.0 Z"></path>
-					</g>
-					<path d="M1480.3 275.1 L1479 278 L4812.5 425.4299495399228 L4812.5 425.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1488.9 268.7 L1480.3 275.1 L1479.2 264.4 L1487.8 258.0 Z"></path>
-					</g>
-					<path d="M1090.5 544.7 L1090.5 576 L1090.5 694.5 L1090.5 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1095.8 535.3 L1090.5 544.7 L1085.2 535.3 L1090.5 526.0 Z"></path>
-					</g>
-					<path d="M1408.1 267.5 L1397.75 278 L1227 360.8047192839707 L1227.0 360.8 " fill="none"></path>
-					<path d="M1411.9 271.2 L1408.1 267.5 L1404.3 263.8 L1417.4 258.0 Z"></path>
-					<path d="M1381.5 209.2 L1241.75 278 L914 393.3803898405198 L914.0 393.4 " fill="none"></path>
-					<path d="M1383.9 214.0 L1381.5 209.2 L1379.2 204.4 L1393.5 203.3 Z"></path>
-					<path d="M3728.5 842.7 L3728.5 844 L3728.5 864 L3728.5 864.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3733.8 833.3 L3728.5 842.7 L3723.2 833.3 L3728.5 824.0 Z"></path>
-					</g>
-					<path d="M3434.1 831.1 L3402.75 844 L3350.4964788732395 864 L3350.5 864.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3444.8 832.5 L3434.1 831.1 L3440.7 822.6 L3451.4 824.0 Z"></path>
-					</g>
-					<path d="M3925.0 524.7 L4022 576 L3978.194029850746 596 L3978.2 596.0 " fill="none"></path>
-					<path d="M3927.5 520.0 L3925.0 524.7 L3922.5 529.4 L3913.2 518.5 Z"></path>
-					<path d="M1801.5 154.4 L1690.75 278 L5339.5 423.72505528379014 L5339.5 423.7 " fill="none"></path>
-					<path d="M1805.4 158.0 L1801.5 154.4 L1797.5 150.9 L1810.4 144.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M6367.8 157.8 L6367.75 278 L5503.5 414.0879788639366 L5503.5 414.1 " fill="none"></path>
-					</g>
-					<path d="M6373.1 157.8 L6367.8 157.8 L6362.4 157.8 L6367.8 144.5 Z"></path>
-					<path d="M169.5 213.7 L210.5 278 L434.0453020134228 411.5 L434.0 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M169.0 203.0 L169.5 213.7 L160.0 208.7 L159.5 198.0 Z"></path>
-					</g>
-					<path d="M115.5 216.7 L115.5 278 L115.5 411.5 L115.5 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M120.8 207.3 L115.5 216.7 L110.2 207.3 L115.5 198.0 Z"></path>
-					</g>
-					<path d="M3808.9 534.2 L3835.75 576 L4224.633395522388 694.5 L4224.6 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3808.3 523.5 L3808.9 534.2 L3799.4 529.2 L3798.8 518.5 Z"></path>
-					</g>
-					<path d="M3486.8 525.3 L3356 576 L3356 694.5 L3356.0 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3497.4 526.8 L3486.8 525.3 L3493.6 516.9 L3504.2 518.5 Z"></path>
-					</g>
-					<path d="M3449.2 519.2 L3270 576 L3270 710 L3270 710 L3270 844 L3270 844 L3292.5352112676055 864 L3292.5 864.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3459.7 521.5 L3449.2 519.2 L3456.5 511.3 L3467.0 513.5 Z"></path>
-					</g>
-					<path d="M3929.8 193.7 L3929.75 278 L5115.5 416.27176677753863 L5115.5 416.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3935.1 184.3 L3929.8 193.7 L3924.4 184.3 L3929.8 175.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1009.5 179.9 L970 278 L2218.5 413.78576642335764 L2218.5 413.8 " fill="none"></path>
-					</g>
-					<path d="M1014.5 181.9 L1009.5 179.9 L1004.6 177.9 L1014.5 167.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M4235.8 210.8 L4235.75 278 L2461.5 417.4504813398391 L2461.5 417.5 " fill="none"></path>
-					</g>
-					<path d="M4241.1 210.8 L4235.8 210.8 L4230.4 210.8 L4235.8 197.5 Z"></path>
-					<path d="M5935.8 224.2 L6039.75 278 L6417.178691275168 411.5 L6417.2 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5930.0 215.2 L5935.8 224.2 L5925.1 224.7 L5919.3 215.7 Z"></path>
-					</g>
-					<path d="M5723.5 268.3 L5721.5 278 L5503.5 386.2733333333333 L5503.5 386.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5730.6 260.2 L5723.5 268.3 L5720.1 258.1 L5727.2 250.0 Z"></path>
-					</g>
-					<path d="M5686.7 266.9 L5681.5 278 L4883.5 420.65386922615477 L4883.5 420.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5695.5 260.7 L5686.7 266.9 L5685.9 256.2 L5694.7 250.0 Z"></path>
-					</g>
-					<path d="M5567.7 224.6 L5464.75 278 L6177.720637583892 411.5 L6177.7 411.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5578.4 225.0 L5567.7 224.6 L5573.5 215.5 L5584.3 216.0 Z"></path>
-					</g>
-					<path d="M3654.3 251.5 L3670.25 278 L4923.5 423.63014232793915 L4923.5 423.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3654.1 240.8 L3654.3 251.5 L3645.0 246.2 L3644.7 235.5 Z"></path>
-					</g>
-					<path d="M3485.4 250.2 L3463.5 278 L4812.5 423.1794871794872 L4812.5 423.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3495.4 246.1 L3485.4 250.2 L3487.0 239.5 L3496.9 235.5 Z"></path>
-					</g>
-					<path d="M5465.1 484.1 L5535.25 576 L5535.25 633.5 L5535.3 633.5 " fill="none"></path>
-					<path d="M5469.3 480.9 L5465.1 484.1 L5460.9 487.3 L5457.0 473.5 Z"></path>
-					<path d="M4721.3 567.1 L4733.25 576 L4733.25 694.5 L4733.3 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4717.0 557.3 L4721.3 567.1 L4710.7 565.9 L4706.4 556.0 Z"></path>
-					</g>
-					<path d="M4531.3 574.7 L4531.25 576 L4305.083022388059 694.5 L4305.1 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4536.7 565.4 L4531.3 574.7 L4526.0 565.3 L4531.5 556.0 Z"></path>
-					</g>
-					<path d="M4313.3 566.0 L4297.5 576 L4430.149253731343 694.5 L4430.1 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4324.1 565.5 L4313.3 566.0 L4318.4 556.5 L4329.1 556.0 Z"></path>
-					</g>
-					<path d="M4276.8 553.6 L4231.5 576 L4121.8432835820895 694.5 L4121.8 694.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4287.5 554.3 L4276.8 553.6 L4282.8 544.7 L4293.5 545.4 Z"></path>
-					</g>
-					<path d="M3234.0 157.8 L3234 278 L4293.5 399.52848344880675 L4293.5 399.5 " fill="none"></path>
-					<path d="M3239.3 157.8 L3234.0 157.8 L3228.7 157.8 L3234.0 144.5 Z"></path>
-					<path d="M5326.7 454.9 L4915.25 576 L4915.25 679 L4915.3 679.0 " fill="none"></path>
-					<path d="M5328.2 460.0 L5326.7 454.9 L5325.2 449.8 L5339.5 451.1 Z"></path>
-					<path d="M3089.0 767.2 L3089 844 L3089 864 L3089.0 864.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3094.3 757.8 L3089.0 767.2 L3083.7 757.8 L3089.0 748.5 Z"></path>
-					</g>
-					<path d="M3454.0 492.5 L3089 576 L3089 671.5 L3089.0 671.5 " fill="none"></path>
-					<path d="M3455.2 497.7 L3454.0 492.5 L3452.8 487.3 L3467.0 489.5 Z"></path>
-					<g data-name="FrameControlsWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
-							<rect x="2625.5" y="365.5" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
-							<path d="M2625.5 396.5 L2916.5 396.5" fill="none" data-name="FrameControlsWidget"></path>
-							<path d="M2625.5 457.5 L2916.5 457.5" fill="none" data-name="FrameControlsWidget"></path>
-						</g>
-						<g transform="translate(2625.5, 365.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2625.5, 396.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2625.5, 457.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="2699.0" y="694.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(2699, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="1748.3" y="113.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(1748.25, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyStatusBadgeViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
-							<rect x="887.5" y="90.5" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
-							<path d="M887.5 121.5 L1172.5 121.5" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
-						</g>
-						<g transform="translate(887.5, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(887.5, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="403.0" y="411.5" height="31.0" width="114.0" data-name="Participation"></rect>
-						</g>
-						<g transform="translate(403, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
-							<rect x="572.0" y="411.5" height="31.0" width="111.0" data-name="StudyStatus"></rect>
-						</g>
-						<g transform="translate(572, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
-								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyStatusBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
-							<rect x="284.3" y="52.5" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
-							<path d="M284.3 83.5 L525.3 83.5" fill="none" data-name="StudyStatusBadge"></path>
-							<path d="M284.3 174.5 L525.3 174.5" fill="none" data-name="StudyStatusBadge"></path>
-						</g>
-						<g transform="translate(284.25, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(284.25, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(284.25, 174.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="62.5" y="411.5" height="31.0" width="106.0" data-name="BadgeType"></rect>
-						</g>
-						<g transform="translate(62.5, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RouteInformation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
-							<rect x="1267.0" y="358.0" height="138.0" width="152.0" data-name="RouteInformation"></rect>
-							<path d="M1267.0 389.0 L1419.0 389.0" fill="none" data-name="RouteInformation"></path>
-							<path d="M1267.0 465.0 L1419.0 465.0" fill="none" data-name="RouteInformation"></path>
-						</g>
-						<g transform="translate(1267, 358)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1267, 389)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1267, 465)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
-							<rect x="1393.5" y="0.0" height="258.0" width="302.0" data-name="PlatformController"></rect>
-							<path d="M1393.5 31.0 L1695.5 31.0" fill="none" data-name="PlatformController"></path>
-							<path d="M1393.5 122.0 L1695.5 122.0" fill="none" data-name="PlatformController"></path>
-						</g>
-						<g transform="translate(1393.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
-								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1393.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1393.5, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="4812.5" y="411.5" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(4812.5, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WebController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
-							<rect x="954.0" y="328.0" height="198.0" width="273.0" data-name="WebController"></rect>
-							<path d="M954.0 359.0 L1227.0 359.0" fill="none" data-name="WebController"></path>
-							<path d="M954.0 390.0 L1227.0 390.0" fill="none" data-name="WebController"></path>
-						</g>
-						<g transform="translate(954, 328)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
-								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(954, 359)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
-								
-							</g>
-						</g>
-						<g transform="translate(954, 390)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFrameElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
-							<rect x="1023.0" y="694.5" height="31.0" width="135.0" data-name="IFrameElement"></rect>
-						</g>
-						<g transform="translate(1023, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MobileController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
-							<rect x="723.0" y="343.5" height="167.0" width="191.0" data-name="MobileController"></rect>
-							<path d="M723.0 374.5 L914.0 374.5" fill="none" data-name="MobileController"></path>
-						</g>
-						<g transform="translate(723, 343.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(723, 374.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
-							<rect x="3442.0" y="596.0" height="228.0" width="573.0" data-name="StudyController"></rect>
-							<path d="M3442.0 627.0 L4015.0 627.0" fill="none" data-name="StudyController"></path>
-							<path d="M3442.0 688.0 L4015.0 688.0" fill="none" data-name="StudyController"></path>
-						</g>
-						<g transform="translate(3442, 596)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
-								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3442, 627)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3442, 688)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="INotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="3644.5" y="864.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
-						</g>
-						<g transform="translate(3644.5, 864)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="3225.0" y="864.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
-						</g>
-						<g transform="translate(3225, 864)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyBaseController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="3467.0" y="335.5" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
-							<path d="M3467.0 366.5 L4013.0 366.5" fill="none" data-name="StudyBaseController"></path>
-							<path d="M3467.0 442.5 L4013.0 442.5" fill="none" data-name="StudyBaseController"></path>
-						</g>
-						<g transform="translate(3467, 335.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
-								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3467, 366.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3467, 442.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyNavViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
-							<rect x="4115.3" y="60.5" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
-							<path d="M4115.3 91.5 L4356.3 91.5" fill="none" data-name="IStudyNavViewModel"></path>
-						</g>
-						<g transform="translate(4115.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4115.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
-							<rect x="1940.3" y="60.5" height="137.0" width="233.0" data-name="StudyNav"></rect>
-							<path d="M1940.3 91.5 L2173.3 91.5" fill="none" data-name="StudyNav"></path>
-						</g>
-						<g transform="translate(1940.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1940.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
-							<rect x="2213.3" y="60.5" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
-							<path d="M2213.3 91.5 L2501.3 91.5" fill="none" data-name="StudyDesignNav"></path>
-						</g>
-						<g transform="translate(2213.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2213.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="5339.5" y="380.5" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
-							<path d="M5339.5 411.5 L5503.5 411.5" fill="none" data-name="StudyPageWidget"></path>
-							<path d="M5339.5 442.5 L5503.5 442.5" fill="none" data-name="StudyPageWidget"></path>
-						</g>
-						<g transform="translate(5339.5, 380.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5339.5, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5339.5, 442.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IWithBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="6311.3" y="113.5" height="31.0" width="113.0" data-name="IWithBanner"></rect>
-						</g>
-						<g transform="translate(6311.25, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyParticipationBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
-							<rect x="0.0" y="60.0" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
-							<path d="M0.0 91.0 L231.0 91.0" fill="none" data-name="StudyParticipationBadge"></path>
-							<path d="M0.0 167.0 L231.0 167.0" fill="none" data-name="StudyParticipationBadge"></path>
-						</g>
-						<g transform="translate(0, 60)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="4200.0" y="694.5" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
-						</g>
-						<g transform="translate(4200, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="3310.0" y="694.5" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(3310, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PreviewFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
-							<rect x="3784.3" y="83.0" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
-							<path d="M3784.3 114.0 L4075.3 114.0" fill="none" data-name="PreviewFrame"></path>
-						</g>
-						<g transform="translate(3784.25, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3784.25, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="5115.5" y="411.5" height="31.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(5115.5, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyAppBarViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
-							<rect x="2218.5" y="381.0" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
-							<path d="M2218.5 412.0 L2461.5 412.0" fill="none" data-name="IStudyAppBarViewModel"></path>
-						</g>
-						<g transform="translate(2218.5, 381)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2218.5, 412)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
-							<rect x="5584.3" y="8.0" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
-							<path d="M5584.3 39.0 L5919.3 39.0" fill="none" data-name="StudyScaffold"></path>
-						</g>
-						<g transform="translate(5584.25, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
-								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5584.25, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NavbarTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="6409.5" y="411.5" height="31.0" width="103.0" data-name="NavbarTab"></rect>
-						</g>
-						<g transform="translate(6409.5, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SingleColumnLayoutType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="6151.5" y="411.5" height="31.0" width="218.0" data-name="SingleColumnLayoutType"></rect>
-						</g>
-						<g transform="translate(6151.5, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WebFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
-							<rect x="5199.3" y="75.0" height="108.0" width="169.0" data-name="WebFrame"></rect>
-							<path d="M5199.3 106.0 L5368.3 106.0" fill="none" data-name="WebFrame"></path>
-							<path d="M5199.3 152.0 L5368.3 152.0" fill="none" data-name="WebFrame"></path>
-						</g>
-						<g transform="translate(5199.25, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5199.25, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5199.25, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DisabledFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
-							<rect x="5408.3" y="98.0" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
-							<path d="M5408.3 129.0 L5544.3 129.0" fill="none" data-name="DisabledFrame"></path>
-						</g>
-						<g transform="translate(5408.25, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5408.25, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PhoneContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
-							<rect x="3417.3" y="22.5" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
-							<path d="M3417.3 53.5 L3744.3 53.5" fill="none" data-name="PhoneContainer"></path>
-							<path d="M3417.3 204.5 L3744.3 204.5" fill="none" data-name="PhoneContainer"></path>
-						</g>
-						<g transform="translate(3417.25, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
-								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3417.25, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3417.25, 204.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="4923.5" y="411.5" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(4923.5, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MobileFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
-							<rect x="5959.3" y="98.0" height="62.0" width="136.0" data-name="MobileFrame"></rect>
-							<path d="M5959.3 129.0 L6095.3 129.0" fill="none" data-name="MobileFrame"></path>
-						</g>
-						<g transform="translate(5959.25, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5959.25, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DesktopFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
-							<rect x="6135.3" y="98.0" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
-							<path d="M6135.3 129.0 L6271.3 129.0" fill="none" data-name="DesktopFrame"></path>
-						</g>
-						<g transform="translate(6135.25, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6135.25, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTestScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
-							<rect x="5435.3" y="633.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
-							<path d="M5435.3 664.5 L5635.3 664.5" fill="none" data-name="StudyTestScreen"></path>
-							<path d="M5435.3 695.5 L5635.3 695.5" fill="none" data-name="StudyTestScreen"></path>
-						</g>
-						<g transform="translate(5435.25, 633.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
-								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5435.25, 664.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5435.25, 695.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySettingsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="4293.5" y="298.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M4293.5 329.0 L4772.5 329.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M4293.5 465.0 L4772.5 465.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-						</g>
-						<g transform="translate(4293.5, 298)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4293.5, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4293.5, 465)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="4678.8" y="694.5" height="31.0" width="109.0" data-name="AsyncValue"></rect>
-						</g>
-						<g transform="translate(4678.75, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="4391.0" y="694.5" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(4391, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="4055.0" y="694.5" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(4055, 694.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="3163.5" y="113.5" height="31.0" width="141.0" data-name="FormViewModel"></rect>
-						</g>
-						<g transform="translate(3163.5, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="4827.8" y="679.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M4827.8 710.0 L5002.8 710.0" fill="none" data-name="StudySettingsDialog"></path>
-						</g>
-						<g transform="translate(4827.75, 679)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
-								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4827.75, 710)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTestController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
-							<rect x="2948.0" y="671.5" height="77.0" width="282.0" data-name="StudyTestController"></rect>
-							<path d="M2948.0 702.5 L3230.0 702.5" fill="none" data-name="StudyTestController"></path>
-						</g>
-						<g transform="translate(2948, 671.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2948, 702.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="3018.0" y="864.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
-						</g>
-						<g transform="translate(3018, 864)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TestAppRoutes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
-							<rect x="6464.3" y="60.5" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
-							<path d="M6464.3 91.5 L6724.3 91.5" fill="none" data-name="TestAppRoutes"></path>
-						</g>
-						<g transform="translate(6464.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6464.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
-								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/features/uml.svg b/docs/uml/designer_v2/lib/features/uml.svg
deleted file mode 100644
index 562de6fb2..000000000
--- a/docs/uml/designer_v2/lib/features/uml.svg
+++ /dev/null
@@ -1,8943 +0,0 @@
-<svg version="1.1" baseProfile="full" width="49294.0" height="3778.0" viewbox="0 0 49294 3778" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;IAppDelegate
-	  |
-	  +dynamic onAppStart()
-	]
-	
-	[AppController
-	  |
-	  +appDelegates: List&lt;IAppDelegate&gt;;
-	  -_delayedFuture: dynamic;
-	  +isInitialized: dynamic
-	  |
-	  +dynamic onAppStart();
-	  -dynamic _callDelegates()
-	]
-	
-	[StudyMonitorScreen
-	  |
-	  +Widget build();
-	  -Widget _monitorSectionHeader();
-	  -Widget _buildStat();
-	  -dynamic _onSelectParticipant()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
-	
-	[StudyMonitorTable
-	  |
-	  +studyMonitorItems: List&lt;StudyMonitorItem&gt;;
-	  +onSelectItem: void Function(StudyMonitorItem)
-	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow();
-	  -String _formatTime();
-	  -Widget _buildProgressCell()
-	]
-	
-	[StudyMonitorTable]o-[void Function(StudyMonitorItem)]
-	
-	[ParticipantDetailsView
-	  |
-	  +monitorItem: StudyMonitorItem;
-	  +interventions: List&lt;Intervention&gt;;
-	  +observations: List&lt;Observation&gt;
-	  |
-	  +Widget build();
-	  -Widget _buildPerDayStatus();
-	  -String _getTooltipText()
-	]
-	
-	[ParticipantDetailsView]o-[StudyMonitorItem]
-	
-	[LoginForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build()
-	]
-	
-	[LoginForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
-	
-	[PasswordRecoveryForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build()
-	]
-	
-	[PasswordRecoveryForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
-	
-	[PasswordForgotForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build()
-	]
-	
-	[PasswordForgotForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
-	
-	[SignupForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build();
-	  -dynamic _onClickTermsOfUse();
-	  -dynamic _onClickPrivacyPolicy()
-	]
-	
-	[SignupForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
-	
-	[AuthScaffold
-	  |
-	  +body: Widget;
-	  +formKey: AuthFormKey;
-	  +leftContentMinWidth: double;
-	  +leftPanelMinWidth: double;
-	  +leftPanelPadding: EdgeInsets
-	]
-	
-	[AuthScaffold]o-[&lt;abstract&gt;Widget]
-	[AuthScaffold]o-[AuthFormKey]
-	[AuthScaffold]o-[EdgeInsets]
-	
-	[EmailTextField
-	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
-	]
-	
-	[EmailTextField]o-[FormControl]
-	
-	[PasswordTextField
-	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
-	]
-	
-	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
-	[PasswordTextField]o-[FormControl]
-	
-	[StudyUJobsToBeDone
-	  |
-	  +Widget build()
-	]
-	
-	[AuthFormController
-	  |
-	  +authRepository: IAuthRepository;
-	  +notificationService: INotificationService;
-	  +router: GoRouter;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +passwordControl: FormControl&lt;String&gt;;
-	  +passwordConfirmationControl: FormControl&lt;String&gt;;
-	  +termsOfServiceControl: FormControl&lt;bool&gt;;
-	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +loginForm: FormGroup;
-	  +signupForm: FormGroup;
-	  +passwordForgotForm: FormGroup;
-	  +passwordRecoveryForm: FormGroup;
-	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  -_formKey: AuthFormKey;
-	  +formKey: AuthFormKey;
-	  +form: FormGroup
-	  |
-	  -dynamic _getFormFor();
-	  -dynamic _onChangeFormKey();
-	  +dynamic resetControlsFor();
-	  -dynamic _forceValidationMessages();
-	  +dynamic signUp();
-	  -dynamic _signUp();
-	  +dynamic signIn();
-	  -dynamic _signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic sendPasswordResetLink();
-	  +dynamic recoverPassword();
-	  +dynamic updateUser();
-	  -dynamic _readDebugUser()
-	]
-	
-	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
-	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
-	[AuthFormController]o-[GoRouter]
-	[AuthFormController]o-[FormControl]
-	[AuthFormController]o-[FormGroup]
-	[AuthFormController]o-[AuthFormKey]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[AuthFormController]
-	
-	[AuthFormKey
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AuthFormKey&gt;;
-	  &lt;static&gt;+login: AuthFormKey;
-	  &lt;static&gt;+signup: AuthFormKey;
-	  &lt;static&gt;+passwordForgot: AuthFormKey;
-	  &lt;static&gt;+passwordRecovery: AuthFormKey;
-	  &lt;static&gt;-_loginSubmit: AuthFormKey;
-	  &lt;static&gt;-_signupSubmit: AuthFormKey
-	]
-	
-	[AuthFormKey]o-[AuthFormKey]
-	[Enum]&lt;:--[AuthFormKey]
-	
-	[AppStatus
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
-	  &lt;static&gt;+initializing: AppStatus;
-	  &lt;static&gt;+initialized: AppStatus
-	]
-	
-	[AppStatus]o-[AppStatus]
-	[Enum]&lt;:--[AppStatus]
-	
-	[FormArrayTable
-	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +items: List&lt;T&gt;;
-	  +onSelectItem: void Function(T);
-	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
-	  +onNewItem: void Function()?;
-	  +rowTitle: String Function(T);
-	  +onNewItemLabel: String;
-	  +sectionTitle: String?;
-	  +sectionDescription: String?;
-	  +emptyIcon: IconData?;
-	  +emptyTitle: String?;
-	  +emptyDescription: String?;
-	  +sectionTitleDivider: bool?;
-	  +rowPrefix: Widget Function(BuildContext, T, int)?;
-	  +rowSuffix: Widget Function(BuildContext, T, int)?;
-	  +leadingWidget: Widget?;
-	  +itemsSectionPadding: EdgeInsets?;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
-	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow();
-	  -Widget _newItemButton()
-	]
-	
-	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
-	[FormArrayTable]o-[void Function(T)]
-	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
-	[FormArrayTable]o-[void Function()?]
-	[FormArrayTable]o-[String Function(T)]
-	[FormArrayTable]o-[IconData]
-	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
-	[FormArrayTable]o-[&lt;abstract&gt;Widget]
-	[FormArrayTable]o-[EdgeInsets]
-	
-	[&lt;abstract&gt;ManagedFormViewModel
-	  |
-	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
-	]
-	
-	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
-	
-	[FormViewModelNotFoundException
-	]
-	
-	[Exception]&lt;:--[FormViewModelNotFoundException]
-	
-	[FormViewModelCollection
-	  |
-	  +formViewModels: List&lt;T&gt;;
-	  +formArray: FormArray&lt;dynamic&gt;;
-	  +stagedViewModels: List&lt;T&gt;;
-	  +retrievableViewModels: List&lt;T&gt;;
-	  +formData: List&lt;D&gt;
-	  |
-	  +void add();
-	  +T remove();
-	  +T? findWhere();
-	  +T? removeWhere();
-	  +bool contains();
-	  +void stage();
-	  +T commit();
-	  +void reset();
-	  +void read()
-	]
-	
-	[FormViewModelCollection]o-[FormArray]
-	
-	[CustomFormControl
-	  |
-	  -_onValueChangedDebouncer: Debouncer?;
-	  -_onStatusChangedDebouncer: Debouncer?;
-	  +onValueChanged: void Function(T?)?;
-	  +onStatusChanged: void Function(ControlStatus)?;
-	  +onStatusChangedDebounceTime: int?;
-	  +onValueChangedDebounceTime: int?
-	  |
-	  +void dispose()
-	]
-	
-	[CustomFormControl]o-[Debouncer]
-	[CustomFormControl]o-[void Function(T?)?]
-	[CustomFormControl]o-[void Function(ControlStatus)?]
-	[FormControl]&lt;:-[CustomFormControl]
-	
-	[UnsavedChangesDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;FormValidationSetEnum
-	]
-	
-	[FormControlValidation
-	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
-	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
-	  +validationMessages: Map&lt;String, String Function(Object)&gt;
-	  |
-	  +FormControlValidation merge()
-	]
-	
-	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
-	
-	[&lt;abstract&gt;IFormData
-	  |
-	  +id: String
-	  |
-	  +IFormData copy()
-	]
-	
-	[FormInvalidException
-	]
-	
-	[Exception]&lt;:--[FormInvalidException]
-	
-	[FormConfigException
-	  |
-	  +message: String?
-	]
-	
-	[Exception]&lt;:--[FormConfigException]
-	
-	[&lt;abstract&gt;IFormViewModelDelegate
-	  |
-	  +dynamic onSave();
-	  +void onCancel()
-	]
-	
-	[&lt;abstract&gt;IFormGroupController
-	  |
-	  +form: FormGroup
-	]
-	
-	[&lt;abstract&gt;IFormGroupController]o-[FormGroup]
-	
-	[FormControlOption
-	  |
-	  +value: T;
-	  +label: String;
-	  +description: String?;
-	  +props: List&lt;Object?&gt;
-	]
-	
-	[&lt;abstract&gt;Equatable]&lt;:-[FormControlOption]
-	
-	[&lt;abstract&gt;FormViewModel
-	  |
-	  -_formData: T?;
-	  -_formMode: FormMode;
-	  -_validationSet: FormValidationSetEnum?;
-	  +delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?;
-	  +autosave: bool;
-	  -_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;;
-	  -_immediateFormChildrenListenerDebouncer: Debouncer?;
-	  -_autosaveOperation: CancelableOperation&lt;dynamic&gt;?;
-	  -_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  +prevFormValue: Map&lt;String, dynamic&gt;?;
-	  &lt;static&gt;-_formKey: String;
-	  +formData: T?;
-	  +formMode: FormMode;
-	  +isReadonly: bool;
-	  +validationSet: FormValidationSetEnum?;
-	  +isDirty: bool;
-	  +title: String;
-	  +isValid: bool;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;
-	  |
-	  -dynamic _setFormData();
-	  -dynamic _rememberDefaultControlValidators();
-	  -Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators();
-	  -dynamic _disableAllControls();
-	  -dynamic _formModeUpdated();
-	  -dynamic _restoreControlsFromFormData();
-	  +void revalidate();
-	  -void _applyValidationSet();
-	  +void read();
-	  +dynamic save();
-	  +dynamic cancel();
-	  +void enableAutosave();
-	  +void listenToImmediateFormChildren();
-	  +dynamic markFormGroupChanged();
-	  +void dispose();
-	  +void setControlsFrom();
-	  +T buildFormData();
-	  +void initControls()
-	]
-	
-	[&lt;abstract&gt;FormViewModel]o-[FormMode]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;FormValidationSetEnum]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;IFormViewModelDelegate]
-	[&lt;abstract&gt;FormViewModel]o-[Debouncer]
-	[&lt;abstract&gt;FormViewModel]o-[CancelableOperation]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[&lt;abstract&gt;FormViewModel]
-	
-	[FormMode
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;FormMode&gt;;
-	  &lt;static&gt;+create: FormMode;
-	  &lt;static&gt;+readonly: FormMode;
-	  &lt;static&gt;+edit: FormMode
-	]
-	
-	[FormMode]o-[FormMode]
-	[Enum]&lt;:--[FormMode]
-	
-	[EnrolledBadge
-	  |
-	  +enrolledCount: int
-	  |
-	  +Widget build()
-	]
-	
-	[StudyRecruitController
-	  |
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
-	  |
-	  -dynamic _subscribeInvites();
-	  +Intervention? getIntervention();
-	  +int getParticipantCountForInvite();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void dispose()
-	]
-	
-	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[StudyRecruitController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyRecruitController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
-	
-	[StudyRecruitScreen
-	  |
-	  +Widget build();
-	  -Widget _inviteCodesSectionHeader();
-	  -Widget _newInviteCodeButton();
-	  -dynamic _onSelectInvite()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
-	
-	[InviteCodeFormView
-	  |
-	  +formViewModel: InviteCodeFormViewModel
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
-	]
-	
-	[InviteCodeFormView]o-[InviteCodeFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
-	
-	[StudyInvitesTable
-	  |
-	  +invites: List&lt;StudyInvite&gt;;
-	  +onSelect: void Function(StudyInvite);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getIntervention: Intervention? Function(String);
-	  +getParticipantCountForInvite: int Function(StudyInvite)
-	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow()
-	]
-	
-	[StudyInvitesTable]o-[void Function(StudyInvite)]
-	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
-	[StudyInvitesTable]o-[Intervention? Function(String)]
-	[StudyInvitesTable]o-[int Function(StudyInvite)]
-	
-	[InviteCodeFormViewModel
-	  |
-	  +study: Study;
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  +codeControl: FormControl&lt;String&gt;;
-	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
-	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +interventionAControl: FormControl&lt;String&gt;;
-	  +interventionBControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
-	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +isPreconfiguredSchedule: bool;
-	  +preconfiguredSchedule: List&lt;String&gt;?
-	  |
-	  +void initControls();
-	  -dynamic _uniqueInviteCode();
-	  +void regenerateCode();
-	  -String _generateCode();
-	  +StudyInvite buildFormData();
-	  +void setControlsFrom();
-	  +dynamic save()
-	]
-	
-	[InviteCodeFormViewModel]o-[Study]
-	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[InviteCodeFormViewModel]o-[FormControl]
-	[InviteCodeFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
-	
-	[PublishSuccessDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
-	
-	[PublishDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
-	
-	[PublishConfirmationDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
-	
-	[FrameControlsWidget
-	  |
-	  +onRefresh: void Function()?;
-	  +onOpenNewTab: void Function()?;
-	  +enabled: bool
-	  |
-	  +Widget build()
-	]
-	
-	[FrameControlsWidget]o-[void Function()?]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel
-	  |
-	  +studyParticipation: Participation?;
-	  +studyStatus: StudyStatus?
-	]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
-	
-	[StudyStatusBadge
-	  |
-	  +participation: Participation?;
-	  +status: StudyStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
-	  |
-	  +Widget build()
-	]
-	
-	[StudyStatusBadge]o-[Participation]
-	[StudyStatusBadge]o-[StudyStatus]
-	[StudyStatusBadge]o-[BadgeType]
-	
-	[RouteInformation
-	  |
-	  +route: String?;
-	  +extra: String?;
-	  +cmd: String?;
-	  +data: String?
-	  |
-	  +String toString()
-	]
-	
-	[&lt;abstract&gt;PlatformController
-	  |
-	  +studyId: String;
-	  +baseSrc: String;
-	  +previewSrc: String;
-	  +routeInformation: RouteInformation;
-	  +frameWidget: Widget
-	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void listen();
-	  +void send();
-	  +void openNewPage()
-	]
-	
-	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
-	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
-	
-	[WebController
-	  |
-	  +iFrameElement: IFrameElement
-	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void openNewPage();
-	  +void listen();
-	  +void send()
-	]
-	
-	[WebController]o-[IFrameElement]
-	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
-	
-	[MobileController
-	  |
-	  +void openNewPage();
-	  +void refresh();
-	  +void registerViews();
-	  +void listen();
-	  +void send();
-	  +void navigate();
-	  +void activate();
-	  +void generateUrl()
-	]
-	
-	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
-	
-	[StudyController
-	  |
-	  +notificationService: INotificationService;
-	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
-	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
-	  |
-	  +dynamic syncStudyStatus();
-	  +dynamic onStudySubscriptionUpdate();
-	  -dynamic _redirectNewToActualStudyID();
-	  +dynamic publishStudy();
-	  +void onChangeStudyParticipation();
-	  +void onAddParticipants();
-	  +void onSettingsPressed();
-	  +void dispose()
-	]
-	
-	[StudyController]o-[&lt;abstract&gt;INotificationService]
-	[StudyController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyController]
-	
-	[&lt;abstract&gt;IStudyNavViewModel
-	  |
-	  +isEditTabEnabled: bool;
-	  +isTestTabEnabled: bool;
-	  +isRecruitTabEnabled: bool;
-	  +isMonitorTabEnabled: bool;
-	  +isAnalyzeTabEnabled: bool;
-	  +isSettingsEnabled: bool
-	]
-	
-	[StudyNav
-	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic edit();
-	  &lt;static&gt;+dynamic test();
-	  &lt;static&gt;+dynamic recruit();
-	  &lt;static&gt;+dynamic monitor();
-	  &lt;static&gt;+dynamic analyze()
-	]
-	
-	[StudyDesignNav
-	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic info();
-	  &lt;static&gt;+dynamic enrollment();
-	  &lt;static&gt;+dynamic interventions();
-	  &lt;static&gt;+dynamic measurements();
-	  &lt;static&gt;+dynamic reports()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget
-	  |
-	  +studyId: String
-	  |
-	  +Widget? banner()
-	]
-	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
-	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
-	
-	[StudyParticipationBadge
-	  |
-	  +participation: Participation;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +center: bool
-	  |
-	  +Widget build()
-	]
-	
-	[StudyParticipationBadge]o-[Participation]
-	[StudyParticipationBadge]o-[BadgeType]
-	
-	[StudyBaseController
-	  |
-	  +studyId: String;
-	  +studyRepository: IStudyRepository;
-	  +router: GoRouter;
-	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
-	  |
-	  +dynamic subscribeStudy();
-	  +dynamic onStudySubscriptionUpdate();
-	  +dynamic onStudySubscriptionError();
-	  +void dispose()
-	]
-	
-	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyBaseController]o-[GoRouter]
-	[StudyBaseController]o-[StreamSubscription]
-	
-	[PreviewFrame
-	  |
-	  +studyId: String;
-	  +routeArgs: StudyFormRouteArgs?;
-	  +route: String?
-	]
-	
-	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
-	
-	[&lt;abstract&gt;IStudyAppBarViewModel
-	  |
-	  +isSyncIndicatorVisible: bool;
-	  +isStatusBadgeVisible: bool;
-	  +isPublishVisible: bool
-	]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	
-	[StudyScaffold
-	  |
-	  +studyId: String;
-	  +tabs: List&lt;NavbarTab&gt;?;
-	  +tabsSubnav: List&lt;NavbarTab&gt;?;
-	  +selectedTab: NavbarTab?;
-	  +selectedTabSubnav: NavbarTab?;
-	  +body: StudyPageWidget;
-	  +drawer: Widget?;
-	  +disableActions: bool;
-	  +actionsSpacing: double;
-	  +actionsPadding: double;
-	  +layoutType: SingleColumnLayoutType?;
-	  +appbarHeight: double;
-	  +appbarSubnavHeight: double
-	]
-	
-	[StudyScaffold]o-[NavbarTab]
-	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
-	[StudyScaffold]o-[&lt;abstract&gt;Widget]
-	[StudyScaffold]o-[SingleColumnLayoutType]
-	
-	[WebFrame
-	  |
-	  +previewSrc: String;
-	  +studyId: String
-	  |
-	  +Widget build()
-	]
-	
-	[DisabledFrame
-	  |
-	  +Widget build()
-	]
-	
-	[PhoneContainer
-	  |
-	  &lt;static&gt;+defaultWidth: double;
-	  &lt;static&gt;+defaultHeight: double;
-	  +width: double;
-	  +height: double;
-	  +borderColor: Color;
-	  +borderWidth: double;
-	  +borderRadius: double;
-	  +innerContent: Widget;
-	  +innerContentBackgroundColor: Color?
-	  |
-	  +Widget build()
-	]
-	
-	[PhoneContainer]o-[Color]
-	[PhoneContainer]o-[&lt;abstract&gt;Widget]
-	
-	[MobileFrame
-	  |
-	  +Widget build()
-	]
-	
-	[DesktopFrame
-	  |
-	  +Widget build()
-	]
-	
-	[StudyTestScreen
-	  |
-	  +previewRoute: String?
-	  |
-	  +Widget build();
-	  +Widget? banner();
-	  +dynamic load();
-	  +dynamic save();
-	  +dynamic showHelp()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
-	
-	[StudySettingsFormViewModel
-	  |
-	  +study: AsyncValue&lt;Study&gt;;
-	  +studyRepository: IStudyRepository;
-	  &lt;static&gt;+defaultPublishedToRegistry: bool;
-	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
-	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
-	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +dynamic keepControlsSynced();
-	  +dynamic save();
-	  +dynamic setLaunchDefaults()
-	]
-	
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudySettingsFormViewModel]o-[FormControl]
-	[StudySettingsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
-	
-	[StudySettingsDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
-	
-	[StudyTestController
-	  |
-	  +authRepository: IAuthRepository;
-	  +languageCode: String
-	]
-	
-	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyBaseController]&lt;:-[StudyTestController]
-	
-	[TestAppRoutes
-	  |
-	  &lt;static&gt;+studyOverview: String;
-	  &lt;static&gt;+eligibility: String;
-	  &lt;static&gt;+intervention: String;
-	  &lt;static&gt;+consent: String;
-	  &lt;static&gt;+journey: String;
-	  &lt;static&gt;+dashboard: String
-	]
-	
-	[DrawerEntry
-	  |
-	  +localizedTitle: String Function();
-	  +icon: IconData?;
-	  +localizedHelpText: String Function()?;
-	  +enabled: bool;
-	  +onSelected: void Function(BuildContext, WidgetRef)?;
-	  +autoCloseDrawer: bool;
-	  +title: String;
-	  +helpText: String?
-	  |
-	  +void onClick()
-	]
-	
-	[DrawerEntry]o-[String Function()]
-	[DrawerEntry]o-[IconData]
-	[DrawerEntry]o-[String Function()?]
-	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
-	
-	[GoRouterDrawerEntry
-	  |
-	  +intent: RoutingIntent;
-	  +onNavigated: void Function()?
-	  |
-	  +void onClick()
-	]
-	
-	[GoRouterDrawerEntry]o-[RoutingIntent]
-	[GoRouterDrawerEntry]o-[void Function()?]
-	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
-	
-	[AppDrawer
-	  |
-	  +width: int;
-	  +autoCloseDrawer: bool;
-	  +leftPaddingEntries: double;
-	  +logoPaddingVertical: double;
-	  +logoPaddingHorizontal: double;
-	  +logoMaxHeight: double;
-	  +logoSectionMinHeight: double;
-	  +logoSectionMaxHeight: double
-	]
-	
-	[StudyAnalyzeScreen
-	  |
-	  +Widget? banner();
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
-	
-	[StudyAnalyzeController
-	  |
-	  +dynamic onExport()
-	]
-	
-	[StudyBaseController]&lt;:-[StudyAnalyzeController]
-	
-	[StudyDesignInterventionsFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
-	
-	[InterventionFormView
-	  |
-	  +formViewModel: InterventionFormViewModel
-	]
-	
-	[InterventionFormView]o-[InterventionFormViewModel]
-	
-	[InterventionPreview
-	  |
-	  +routeArgs: InterventionFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPreview]o-[InterventionFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
-	
-	[StudyScheduleFormView
-	  |
-	  +formViewModel: StudyScheduleControls
-	  |
-	  -FormTableRow _renderCustomSequence();
-	  +Widget build()
-	]
-	
-	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
-	
-	[InterventionTaskFormData
-	  |
-	  +taskId: String;
-	  +taskTitle: String;
-	  +taskDescription: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +CheckmarkTask toTask();
-	  +InterventionTaskFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
-	
-	[InterventionsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +interventionsArray: FormArray&lt;dynamic&gt;;
-	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
-	  +form: FormGroup;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +interventionsRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestStudySchedule: bool
-	  |
-	  +void setControlsFrom();
-	  +InterventionsFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +InterventionFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +dynamic testStudySchedule()
-	]
-	
-	[InterventionsFormViewModel]o-[Study]
-	[InterventionsFormViewModel]o-[GoRouter]
-	[InterventionsFormViewModel]o-[FormArray]
-	[InterventionsFormViewModel]o-[FormViewModelCollection]
-	[InterventionsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
-	
-	[InterventionTaskFormViewModel
-	  |
-	  +taskIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +taskTitleControl: FormControl&lt;String&gt;;
-	  +taskDescriptionControl: FormControl&lt;String&gt;;
-	  +markAsCompletedControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +taskId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +InterventionTaskFormData buildFormData();
-	  +InterventionTaskFormViewModel createDuplicate()
-	]
-	
-	[InterventionTaskFormViewModel]o-[FormControl]
-	[InterventionTaskFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
-	
-	[&lt;abstract&gt;StudyScheduleControls
-	  |
-	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
-	  &lt;static&gt;+defaultScheduleTypeSequence: String;
-	  &lt;static&gt;+defaultNumCycles: int;
-	  &lt;static&gt;+defaultPeriodLength: int;
-	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
-	  +phaseDurationControl: FormControl&lt;int&gt;;
-	  +numCyclesControl: FormControl&lt;int&gt;;
-	  +includeBaselineControl: FormControl&lt;bool&gt;;
-	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  &lt;static&gt;+kNumCyclesMin: int;
-	  &lt;static&gt;+kNumCyclesMax: int;
-	  &lt;static&gt;+kPhaseDurationMin: int;
-	  &lt;static&gt;+kPhaseDurationMax: int;
-	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +numCyclesRange: dynamic;
-	  +phaseDurationRange: dynamic;
-	  +customSequenceRequired: dynamic
-	  |
-	  +void setStudyScheduleControlsFrom();
-	  +StudyScheduleFormData buildStudyScheduleFormData();
-	  +bool isSequencingCustom()
-	]
-	
-	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
-	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
-	
-	[InterventionFormData
-	  |
-	  +interventionId: String;
-	  +title: String;
-	  +description: String?;
-	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
-	  +iconName: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +Intervention toIntervention();
-	  +InterventionFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
-	
-	[StudyScheduleFormData
-	  |
-	  +sequenceType: PhaseSequence;
-	  +sequenceTypeCustom: String;
-	  +numCycles: int;
-	  +phaseDuration: int;
-	  +includeBaseline: bool;
-	  +id: String
-	  |
-	  +StudySchedule toStudySchedule();
-	  +Study apply();
-	  +StudyScheduleFormData copy()
-	]
-	
-	[StudyScheduleFormData]o-[PhaseSequence]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
-	
-	[InterventionTaskFormView
-	  |
-	  +formViewModel: InterventionTaskFormViewModel
-	]
-	
-	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
-	
-	[InterventionsFormData
-	  |
-	  +interventionsData: List&lt;InterventionFormData&gt;;
-	  +studyScheduleData: StudyScheduleFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +InterventionsFormData copy()
-	]
-	
-	[InterventionsFormData]o-[StudyScheduleFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
-	
-	[InterventionFormViewModel
-	  |
-	  +study: Study;
-	  +interventionIdControl: FormControl&lt;String&gt;;
-	  +interventionTitleControl: FormControl&lt;String&gt;;
-	  +interventionIconControl: FormControl&lt;IconOption&gt;;
-	  +interventionDescriptionControl: FormControl&lt;String&gt;;
-	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
-	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
-	  +form: FormGroup;
-	  +interventionId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneTask: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +InterventionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +InterventionTaskFormViewModel provide();
-	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
-	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
-	  +InterventionFormViewModel createDuplicate()
-	]
-	
-	[InterventionFormViewModel]o-[Study]
-	[InterventionFormViewModel]o-[FormControl]
-	[InterventionFormViewModel]o-[FormArray]
-	[InterventionFormViewModel]o-[FormViewModelCollection]
-	[InterventionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
-	
-	[StudyDesignReportsFormView
-	  |
-	  +Widget build();
-	  -dynamic _showReportItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
-	
-	[ReportItemFormData
-	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
-	  +id: String
-	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
-	]
-	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
-	
-	[DataReferenceEditor
-	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
-	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
-	]
-	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
-	
-	[TemporalAggregationFormatted
-	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
-	]
-	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
-	
-	[ImprovementDirectionFormatted
-	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
-	]
-	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
-	
-	[ReportSectionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
-	]
-	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
-	
-	[AverageSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
-	
-	[DataReferenceIdentifier
-	  |
-	  +hashCode: int
-	  |
-	  +bool ==()
-	]
-	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
-	
-	[LinearRegressionSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
-	
-	[ReportItemFormViewModel
-	  |
-	  &lt;static&gt;+defaultSectionType: ReportSectionType;
-	  +sectionIdControl: FormControl&lt;String&gt;;
-	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +sectionControl: FormControl&lt;ReportSection&gt;;
-	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
-	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
-	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
-	  +alphaControl: FormControl&lt;double&gt;;
-	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +form: FormGroup;
-	  +sectionId: String;
-	  +sectionType: ReportSectionType;
-	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
-	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
-	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +dataReferenceRequired: dynamic;
-	  +aggregationRequired: dynamic;
-	  +improvementDirectionRequired: dynamic;
-	  +alphaConfidenceRequired: dynamic
-	  |
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +ReportItemFormData buildFormData();
-	  +ReportItemFormViewModel createDuplicate();
-	  +dynamic onSectionTypeChanged();
-	  -void _updateFormControls();
-	  +void setControlsFrom()
-	]
-	
-	[ReportItemFormViewModel]o-[ReportSectionType]
-	[ReportItemFormViewModel]o-[FormControl]
-	[ReportItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
-	
-	[ReportItemFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
-	  |
-	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
-	]
-	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
-	
-	[ReportsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +reportItemDelegate: ReportFormItemDelegate;
-	  +reportItemArray: FormArray&lt;dynamic&gt;;
-	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +form: FormGroup;
-	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestConsent: bool
-	  |
-	  +void setControlsFrom();
-	  +ReportsFormData buildFormData();
-	  +void read();
-	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
-	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
-	  +dynamic testReport();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide()
-	]
-	
-	[ReportsFormViewModel]o-[Study]
-	[ReportsFormViewModel]o-[GoRouter]
-	[ReportsFormViewModel]o-[ReportFormItemDelegate]
-	[ReportsFormViewModel]o-[FormArray]
-	[ReportsFormViewModel]o-[FormViewModelCollection]
-	[ReportsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
-	
-	[ReportFormItemDelegate
-	  |
-	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +owner: ReportsFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
-	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
-	]
-	
-	[ReportFormItemDelegate]o-[FormViewModelCollection]
-	[ReportFormItemDelegate]o-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
-	
-	[ReportBadge
-	  |
-	  +status: ReportStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
-	  |
-	  +Widget build()
-	]
-	
-	[ReportBadge]o-[ReportStatus]
-	[ReportBadge]o-[BadgeType]
-	
-	[ReportsFormData
-	  |
-	  +reportItems: List&lt;ReportItemFormData&gt;;
-	  +id: String
-	  |
-	  +Study apply();
-	  +ReportsFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
-	
-	[ReportStatus
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
-	  &lt;static&gt;+primary: ReportStatus;
-	  &lt;static&gt;+secondary: ReportStatus
-	]
-	
-	[ReportStatus]o-[ReportStatus]
-	[Enum]&lt;:--[ReportStatus]
-	
-	[&lt;abstract&gt;IStudyFormData
-	  |
-	  +Study apply()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
-	
-	[StudyInfoFormViewModel
-	  |
-	  +study: Study;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +organizationControl: FormControl&lt;String&gt;;
-	  +reviewBoardControl: FormControl&lt;String&gt;;
-	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
-	  +researchersControl: FormControl&lt;String&gt;;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +websiteControl: FormControl&lt;String&gt;;
-	  +phoneControl: FormControl&lt;String&gt;;
-	  +additionalInfoControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +iconRequired: dynamic;
-	  +organizationRequired: dynamic;
-	  +reviewBoardRequired: dynamic;
-	  +reviewBoardNumberRequired: dynamic;
-	  +researchersRequired: dynamic;
-	  +emailRequired: dynamic;
-	  +phoneRequired: dynamic;
-	  +emailFormat: dynamic;
-	  +websiteFormat: dynamic
-	  |
-	  +void setControlsFrom();
-	  +StudyInfoFormData buildFormData()
-	]
-	
-	[StudyInfoFormViewModel]o-[Study]
-	[StudyInfoFormViewModel]o-[FormControl]
-	[StudyInfoFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
-	
-	[StudyDesignInfoFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
-	
-	[StudyInfoFormData
-	  |
-	  +title: String;
-	  +description: String?;
-	  +iconName: String;
-	  +contactInfoFormData: StudyContactInfoFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
-	]
-	
-	[StudyInfoFormData]o-[StudyContactInfoFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
-	
-	[StudyContactInfoFormData
-	  |
-	  +organization: String?;
-	  +institutionalReviewBoard: String?;
-	  +institutionalReviewBoardNumber: String?;
-	  +researchers: String?;
-	  +email: String?;
-	  +website: String?;
-	  +phone: String?;
-	  +additionalInfo: String?;
-	  +id: String
-	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
-	
-	[StudyFormValidationSet
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
-	]
-	
-	[Enum]&lt;:--[StudyFormValidationSet]
-	
-	[MeasurementsFormData
-	  |
-	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
-	  +id: String
-	  |
-	  +Study apply();
-	  +MeasurementsFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
-	
-	[MeasurementSurveyFormView
-	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
-	]
-	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
-	
-	[SurveyPreview
-	  |
-	  +routeArgs: MeasurementFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
-	
-	[MeasurementSurveyFormData
-	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
-	]
-	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
-	
-	[MeasurementSurveyFormViewModel
-	  |
-	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
-	]
-	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
-	
-	[StudyDesignMeasurementsFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
-	
-	[MeasurementsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +measurementsArray: FormArray&lt;dynamic&gt;;
-	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
-	  +form: FormGroup;
-	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +measurementRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +MeasurementsFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +MeasurementSurveyFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave()
-	]
-	
-	[MeasurementsFormViewModel]o-[Study]
-	[MeasurementsFormViewModel]o-[GoRouter]
-	[MeasurementsFormViewModel]o-[FormArray]
-	[MeasurementsFormViewModel]o-[FormViewModelCollection]
-	[MeasurementsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
-	
-	[StudyFormScaffold
-	  |
-	  +studyId: String;
-	  +formViewModelBuilder: T Function(WidgetRef);
-	  +formViewBuilder: Widget Function(T)
-	  |
-	  +Widget build()
-	]
-	
-	[StudyFormScaffold]o-[T Function(WidgetRef)]
-	[StudyFormScaffold]o-[Widget Function(T)]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
-	
-	[ConsentItemFormViewModel
-	  |
-	  +consentIdControl: FormControl&lt;String&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +form: FormGroup;
-	  +consentId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +ConsentItemFormData buildFormData();
-	  +ConsentItemFormViewModel createDuplicate()
-	]
-	
-	[ConsentItemFormViewModel]o-[FormControl]
-	[ConsentItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
-	
-	[StudyDesignEnrollmentFormView
-	  |
-	  +Widget build();
-	  -dynamic _showScreenerQuestionSidesheetWithArgs();
-	  -dynamic _showConsentItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
-	
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
-	  |
-	  +isDirtyOptionsBannerVisible: bool
-	]
-	
-	[ScreenerQuestionLogicFormView
-	  |
-	  +formViewModel: ScreenerQuestionFormViewModel
-	  |
-	  +Widget build();
-	  -dynamic _buildInfoBanner();
-	  -dynamic _buildAnswerOptionsLogicControls();
-	  -List&lt;Widget&gt; _buildOptionLogicRow()
-	]
-	
-	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
-	
-	[ConsentItemFormData
-	  |
-	  +consentId: String;
-	  +title: String;
-	  +description: String;
-	  +iconName: String?;
-	  +id: String
-	  |
-	  +ConsentItem toConsentItem();
-	  +ConsentItemFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
-	
-	[ConsentItemFormView
-	  |
-	  +formViewModel: ConsentItemFormViewModel
-	]
-	
-	[ConsentItemFormView]o-[ConsentItemFormViewModel]
-	
-	[EnrollmentFormData
-	  |
-	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
-	  +enrollmentType: Participation;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
-	  +id: String
-	  |
-	  +Study apply();
-	  +EnrollmentFormData copy()
-	]
-	
-	[EnrollmentFormData]o-[Participation]
-	[EnrollmentFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
-	
-	[ScreenerQuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultResponseOptionValidity: bool;
-	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
-	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
-	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
-	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionValues: List&lt;dynamic&gt;;
-	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isDirtyOptionsBannerVisible: bool
-	  |
-	  +dynamic onResponseOptionsChanged();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
-	  +ScreenerQuestionFormViewModel createDuplicate()
-	]
-	
-	[ScreenerQuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
-	
-	[EnrollmentFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
-	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
-	  +consentItemArray: FormArray&lt;dynamic&gt;;
-	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +form: FormGroup;
-	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
-	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestScreener: bool;
-	  +canTestConsent: bool;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setControlsFrom();
-	  +EnrollmentFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
-	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
-	  +dynamic testScreener();
-	  +dynamic testConsent();
-	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
-	]
-	
-	[EnrollmentFormViewModel]o-[Study]
-	[EnrollmentFormViewModel]o-[GoRouter]
-	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
-	[EnrollmentFormViewModel]o-[FormControl]
-	[EnrollmentFormViewModel]o-[FormArray]
-	[EnrollmentFormViewModel]o-[FormViewModelCollection]
-	[EnrollmentFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
-	
-	[EnrollmentFormConsentItemDelegate
-	  |
-	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +owner: EnrollmentFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
-	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ConsentItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
-	]
-	
-	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
-	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
-	
-	[StudyFormViewModel
-	  |
-	  +studyDirtyCopy: Study?;
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +router: GoRouter;
-	  +studyInfoFormViewModel: StudyInfoFormViewModel;
-	  +enrollmentFormViewModel: EnrollmentFormViewModel;
-	  +measurementsFormViewModel: MeasurementsFormViewModel;
-	  +reportsFormViewModel: ReportsFormViewModel;
-	  +interventionsFormViewModel: InterventionsFormViewModel;
-	  +form: FormGroup;
-	  +isStudyReadonly: bool;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +void dispose();
-	  +void onCancel();
-	  +dynamic onSave();
-	  -dynamic _applyAndSaveSubform()
-	]
-	
-	[StudyFormViewModel]o-[Study]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyFormViewModel]o-[GoRouter]
-	[StudyFormViewModel]o-[StudyInfoFormViewModel]
-	[StudyFormViewModel]o-[EnrollmentFormViewModel]
-	[StudyFormViewModel]o-[MeasurementsFormViewModel]
-	[StudyFormViewModel]o-[ReportsFormViewModel]
-	[StudyFormViewModel]o-[InterventionsFormViewModel]
-	[StudyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls
-	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
-	  +void read();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
-	]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	
-	[QuestionnaireFormData
-	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
-	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
-	
-	[&lt;abstract&gt;QuestionFormData
-	  |
-	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
-	  +questionId: String;
-	  +questionText: String;
-	  +questionInfoText: String?;
-	  +questionType: SurveyQuestionType;
-	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
-	  +responseOptions: List&lt;dynamic&gt;;
-	  +id: String
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +EligibilityCriterion toEligibilityCriterion();
-	  +Answer&lt;dynamic&gt; constructAnswerFor();
-	  +dynamic setResponseOptionsValidityFrom();
-	  +QuestionFormData copy()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
-	
-	[ChoiceQuestionFormData
-	  |
-	  +isMultipleChoice: bool;
-	  +answerOptions: List&lt;String&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +QuestionFormData copy();
-	  -Choice _buildChoiceForValue();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
-	
-	[BoolQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +BoolQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
-	
-	[ImageQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +ImageQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
-	
-	[AudioQuestionFormData
-	  |
-	  +maxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +AudioQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
-	
-	[ScaleQuestionFormData
-	  |
-	  +minValue: double;
-	  +maxValue: double;
-	  +minLabel: String?;
-	  +maxLabel: String?;
-	  +midValues: List&lt;double?&gt;;
-	  +midLabels: List&lt;String?&gt;;
-	  +stepSize: double;
-	  +initialValue: double?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +responseOptions: List&lt;double&gt;;
-	  +midAnnotations: List&lt;Annotation&gt;
-	  |
-	  +ScaleQuestion toQuestion();
-	  +QuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[ScaleQuestionFormData]o-[Color]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
-	
-	[FreeTextQuestionFormData
-	  |
-	  +textLengthRange: List&lt;int&gt;;
-	  +textType: FreeTextQuestionType;
-	  +textTypeExpression: String?;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +FreeTextQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
-	
-	[AudioRecordingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
-	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
-	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
-	]
-	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
-	
-	[SurveyQuestionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
-	]
-	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[ImageCapturingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	]
-	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
-	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
-	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
-	[QuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
-	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
-	]
-	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
-	
-	[SurveyQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
-	]
-	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule
-	  |
-	  +instanceId: String;
-	  +isTimeLocked: bool;
-	  +timeLockStart: StudyUTimeOfDay?;
-	  +timeLockEnd: StudyUTimeOfDay?;
-	  +hasReminder: bool;
-	  +reminderTime: StudyUTimeOfDay?
-	  |
-	  +Schedule toSchedule()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
-	
-	[ScheduleControls
-	  |
-	  +formViewModel: WithScheduleControls
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
-	]
-	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
-	
-	[&lt;abstract&gt;WithScheduleControls
-	  |
-	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
-	  +instanceID: FormControl&lt;String&gt;;
-	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +hasReminderControl: FormControl&lt;bool&gt;;
-	  +reminderTimeControl: FormControl&lt;Time&gt;;
-	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
-	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
-	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  +hasReminder: bool;
-	  +isTimeRestricted: bool;
-	  +timeRestriction: List&lt;Time&gt;?
-	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
-	]
-	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget
-	  |
-	  +Widget? banner()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
-	
-	[StudiesTableColumnHeader
-	  |
-	  +title: String;
-	  +sortable: bool;
-	  +sortAscending: bool;
-	  +sortingActive: bool;
-	  +onSort: void Function()?
-	]
-	
-	[StudiesTableColumnHeader]o-[void Function()?]
-	
-	[DashboardScreen
-	  |
-	  +filter: StudiesFilter?
-	]
-	
-	[DashboardScreen]o-[StudiesFilter]
-	
-	[DashboardScaffold
-	  |
-	  &lt;static&gt;+compactWidthThreshold: double;
-	  +body: Widget
-	  |
-	  +Widget build()
-	]
-	
-	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
-	
-	[DashboardController
-	  |
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +userRepository: IUserRepository;
-	  +router: GoRouter;
-	  -_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?;
-	  +searchController: SearchController;
-	  +isSortAscending: bool
-	  |
-	  -dynamic _subscribeStudies();
-	  +dynamic setSearchText();
-	  +dynamic setStudiesFilter();
-	  +dynamic onSelectStudy();
-	  +dynamic onClickNewStudy();
-	  +dynamic pinStudy();
-	  +dynamic pinOffStudy();
-	  +void setSorting();
-	  +void filterStudies();
-	  +void sortStudies();
-	  +bool isSortingActiveForColumn();
-	  +bool isPinned();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void dispose()
-	]
-	
-	[DashboardController]o-[&lt;abstract&gt;IStudyRepository]
-	[DashboardController]o-[&lt;abstract&gt;IAuthRepository]
-	[DashboardController]o-[&lt;abstract&gt;IUserRepository]
-	[DashboardController]o-[GoRouter]
-	[DashboardController]o-[StreamSubscription]
-	[DashboardController]o-[SearchController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
-	
-	[StudiesFilter
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
-	]
-	
-	[Enum]&lt;:--[StudiesFilter]
-	
-	[StudiesTableColumnSize
-	  |
-	  +collapsed: bool;
-	  +flex: int?;
-	  +width: double?
-	  |
-	  +Widget createContainer()
-	]
-	
-	[StudiesTable
-	  |
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +compactWidthThreshold: double;
-	  +superCompactWidthThreshold: double;
-	  +compactStatTitleThreshold: double;
-	  +studies: List&lt;Study&gt;;
-	  +onSelect: void Function(Study);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study);
-	  +emptyWidget: Widget;
-	  +pinnedStudies: Iterable&lt;String&gt;;
-	  +dashboardController: DashboardController
-	  |
-	  +Widget build();
-	  -Widget _buildColumnHeader()
-	]
-	
-	[StudiesTable]o-[void Function(Study)]
-	[StudiesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)]
-	[StudiesTable]o-[&lt;abstract&gt;Widget]
-	[StudiesTable]o-[DashboardController]
-	
-	[StudiesTableColumn
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesTableColumn&gt;;
-	  &lt;static&gt;+pin: StudiesTableColumn;
-	  &lt;static&gt;+title: StudiesTableColumn;
-	  &lt;static&gt;+status: StudiesTableColumn;
-	  &lt;static&gt;+participation: StudiesTableColumn;
-	  &lt;static&gt;+createdAt: StudiesTableColumn;
-	  &lt;static&gt;+enrolled: StudiesTableColumn;
-	  &lt;static&gt;+active: StudiesTableColumn;
-	  &lt;static&gt;+completed: StudiesTableColumn;
-	  &lt;static&gt;+action: StudiesTableColumn
-	]
-	
-	[StudiesTableColumn]o-[StudiesTableColumn]
-	[Enum]&lt;:--[StudiesTableColumn]
-	
-	[StudiesTableItem
-	  |
-	  +study: Study;
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
-	  +isPinned: bool;
-	  +onPinnedChanged: void Function(Study, bool)?;
-	  +onTap: void Function(Study)?
-	]
-	
-	[StudiesTableItem]o-[Study]
-	[StudiesTableItem]o-[void Function(Study, bool)?]
-	[StudiesTableItem]o-[void Function(Study)?]
-	
-	[App
-	]
-	
-	[AppContent
-	]
-	
-	[AccountSettingsDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AccountSettingsDialog]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="3778.0" width="49294.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M20147.4 1407.6 L19041.25 1607 L19041.25 2242.5 L19041.3 2242.5 " fill="none"></path>
-					<path d="M20148.3 1412.9 L20147.4 1407.6 L20146.4 1402.4 L20160.5 1405.3 Z"></path>
-					<path d="M26245.0 186.7 L26245 203 L26245 524 L26245.0 524.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26250.3 177.3 L26245.0 186.7 L26239.7 177.3 L26245.0 168.0 Z"></path>
-					</g>
-					<path d="M26623.5 186.7 L26623.5 203 L26623.5 524 L26623.5 524.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26628.8 177.3 L26623.5 186.7 L26618.2 177.3 L26623.5 168.0 Z"></path>
-					</g>
-					<path d="M103.5 2361.2 L103.5 2985 L1100 3143.302597955707 L1100.0 3143.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M108.8 2351.8 L103.5 2361.2 L98.2 2351.8 L103.5 2342.5 Z"></path>
-					</g>
-					<path d="M737.6 1410.0 L103.5 1607 L103.5 2249.5 L103.5 2249.5 " fill="none"></path>
-					<path d="M739.2 1415.0 L737.6 1410.0 L736.1 1404.9 L750.4 1406.0 Z"></path>
-					<path d="M676.5 2361.2 L676.5 2985 L1100 3116.4188851913477 L1100.0 3116.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M681.8 2351.8 L676.5 2361.2 L671.2 2351.8 L676.5 2342.5 Z"></path>
-					</g>
-					<path d="M784.8 1417.6 L676.5 1607 L676.5 2249.5 L676.5 2249.5 " fill="none"></path>
-					<path d="M789.4 1420.2 L784.8 1417.6 L780.1 1414.9 L791.4 1406.0 Z"></path>
-					<path d="M924.0 2361.2 L924 2985 L1119.230563002681 3088 L1119.2 3088.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M929.3 2351.8 L924.0 2361.2 L918.7 2351.8 L924.0 2342.5 Z"></path>
-					</g>
-					<path d="M815.7 1417.6 L924 1607 L924 2249.5 L924.0 2249.5 " fill="none"></path>
-					<path d="M820.4 1414.9 L815.7 1417.6 L811.1 1420.2 L809.1 1406.0 Z"></path>
-					<path d="M1206.5 2376.2 L1206.5 2985 L1245.7117962466489 3088 L1245.7 3088.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1211.8 2366.8 L1206.5 2376.2 L1201.2 2366.8 L1206.5 2357.5 Z"></path>
-					</g>
-					<path d="M841.1 1412.3 L1206.5 1607 L1206.5 2234.5 L1206.5 2234.5 " fill="none"></path>
-					<path d="M843.6 1407.6 L841.1 1412.3 L838.6 1417.0 L829.3 1406.0 Z"></path>
-					<path d="M1353.2 1468.8 L1296 1607 L14594.75 2294.165663610627 L14594.8 2294.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1361.6 1462.2 L1353.2 1468.8 L1351.8 1458.1 L1360.3 1451.5 Z"></path>
-					</g>
-					<path d="M1385.5 1470.2 L1385.5 1607 L1385.5 2296 L1385.5 2296 L1385.5 2985 L1385.5 2985 L1325.8538873994637 3088 L1325.9 3088.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1390.8 1460.8 L1385.5 1470.2 L1380.2 1460.8 L1385.5 1451.5 Z"></path>
-					</g>
-					<path d="M1400.2 1469.9 L1425.5 1607 L3931.75 2281.8632144601856 L3931.8 2281.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1403.7 1459.7 L1400.2 1469.9 L1393.2 1461.6 L1396.8 1451.5 Z"></path>
-					</g>
-					<path d="M1850.0 2368.2 L1850 2985 L32934 3171.1616223246256 L32934.0 3171.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1855.3 2358.8 L1850.0 2368.2 L1844.7 2358.8 L1850.0 2349.5 Z"></path>
-					</g>
-					<path d="M2267.1 2374.9 L2090 2985 L586.9879356568365 3156 L587.0 3156.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2274.8 2367.5 L2267.1 2374.9 L2264.6 2364.5 L2272.3 2357.0 Z"></path>
-					</g>
-					<path d="M2319.7 2374.5 L2550.5 2985 L32934 3171.153835413929 L32934.0 3171.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2321.4 2363.8 L2319.7 2374.5 L2311.4 2367.6 L2313.1 2357.0 Z"></path>
-					</g>
-					<path d="M35940.7 2562.4 L35267.75 2985 L31367.5 3168.1656594271326 L31367.5 3168.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35951.4 2562.0 L35940.7 2562.4 L35945.8 2552.9 L35956.5 2552.5 Z"></path>
-					</g>
-					<path d="M35955.8 2562.7 L35307.75 2985 L16537.5 3170.6690998050835 L16537.5 3170.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35966.5 2562.1 L35955.8 2562.7 L35960.7 2553.1 L35971.4 2552.5 Z"></path>
-					</g>
-					<path d="M35970.8 2563.0 L35347.75 2985 L34603.75 3160.640506329114 L34603.8 3160.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35981.6 2562.1 L35970.8 2563.0 L35975.6 2553.3 L35986.3 2552.5 Z"></path>
-					</g>
-					<path d="M36433.8 2570.6 L36537.5 2985 L33047 3168.5292500704822 L33047.0 3168.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36436.7 2560.3 L36433.8 2570.6 L36426.3 2562.8 L36429.2 2552.5 Z"></path>
-					</g>
-					<path d="M36449.6 2570.3 L36577.5 2985 L39422.75 3168.121085324821 L39422.8 3168.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36452.0 2559.8 L36449.6 2570.3 L36441.8 2563.0 L36444.1 2552.5 Z"></path>
-					</g>
-					<path d="M36465.4 2570.0 L36617.5 2985 L1455 3170.5632781550653 L1455.0 3170.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36467.2 2559.4 L36465.4 2570.0 L36457.2 2563.1 L36459.0 2552.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M38450.7 96.9 L36365 203 L36365 539.5 L36365 539.5 L36365 876 L36365 876 L36365 1025 L36365 1025 L36365 1174 L36365 1174 L36365 1390.5 L36365 1390.5 L36365 1607 L36365 1607 L36365 2039.5 L36365.0 2039.5 " fill="none"></path>
-					</g>
-					<path d="M38451.0 102.3 L38450.7 96.9 L38450.4 91.6 L38464.0 96.3 Z"></path>
-					<path d="M1472.3 3093.1 L1485 3088 L1492.5 3088 L1492.5 3088 L1500 3171.5 L1500 3171.5 L1492.5 3255 L1492.5 3255 L1485 3255 L1485 3255 L1455 3242.9277108433735 L1455.0 3242.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1461.7 3091.6 L1472.3 3093.1 L1465.6 3101.5 L1455.0 3100.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2994.6 2322.9 L2590.5 2985 L1455 3146.2876999238383 L1455.0 3146.3 " fill="none"></path>
-					</g>
-					<path d="M2999.1 2325.7 L2994.6 2322.9 L2990.0 2320.1 L3001.5 2311.5 Z"></path>
-					<path d="M1027.8 3121.9 L1040 3118 L1047.5 3118 L1047.5 3118 L1055 3171.5 L1055 3171.5 L1047.5 3225 L1047.5 3225 L1040 3225 L1040 3225 L1010 3215.5309734513276 L1010.0 3215.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1017.3 3119.6 L1027.8 3121.9 L1020.5 3129.7 L1010.0 3127.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2996.0 2323.2 L2630.5 2985 L1010 3156.7177556818183 L1010.0 3156.7 " fill="none"></path>
-					</g>
-					<path d="M3000.7 2325.8 L2996.0 2323.2 L2991.3 2320.6 L3002.4 2311.5 Z"></path>
-					<path d="M2583.1 1431.8 L1465.5 1607 L1465.5 2296 L1465.5 2296 L1465.5 2985 L1465.5 2985 L10406.25 3170.0717139765256 L10406.3 3170.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2593.1 1435.6 L2583.1 1431.8 L2591.5 1425.1 L2601.5 1428.9 Z"></path>
-					</g>
-					<path d="M2583.1 1435.4 L1577.5 1607 L1577.5 2280.5 L1577.5 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2593.2 1439.1 L2583.1 1435.4 L2591.4 1428.6 L2601.5 1432.3 Z"></path>
-					</g>
-					<path d="M2756.2 1604.2 L2755 1607 L2755 2280.5 L2755.0 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2764.7 1597.7 L2756.2 1604.2 L2754.9 1593.5 L2763.5 1587.0 Z"></path>
-					</g>
-					<path d="M3109.6 1456.1 L3714.75 1607 L17375.75 2292.3876793126046 L17375.8 2292.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3101.8 1448.7 L3109.6 1456.1 L3099.3 1459.0 L3091.5 1451.6 Z"></path>
-					</g>
-					<path d="M3109.7 1453.2 L3754.75 1607 L4146.240203193033 2280.5 L4146.2 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3101.8 1445.9 L3109.7 1453.2 L3099.3 1456.3 L3091.5 1448.9 Z"></path>
-					</g>
-					<path d="M3109.7 1450.6 L3794.75 1607 L16444 2293.638691378937 L16444.0 2293.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3101.8 1443.3 L3109.7 1450.6 L3099.4 1453.7 L3091.5 1446.4 Z"></path>
-					</g>
-					<path d="M3109.7 1448.2 L3834.75 1607 L4417.83091436865 2280.5 L4417.8 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3101.8 1441.0 L3109.7 1448.2 L3099.5 1451.4 L3091.5 1444.2 Z"></path>
-					</g>
-					<path d="M3109.8 1445.9 L3874.75 1607 L14594.75 2293.7258611872994 L14594.8 2293.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3101.7 1438.8 L3109.8 1445.9 L3099.5 1449.2 L3091.5 1442.1 Z"></path>
-					</g>
-					<path d="M3109.8 1440.6 L3984.25 1607 L3984.25 2280.5 L3984.3 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3101.7 1433.6 L3109.8 1440.6 L3099.7 1444.1 L3091.5 1437.1 Z"></path>
-					</g>
-					<path d="M43766.0 648.3 L42826 876 L42826 1025 L42826 1025 L42826 1174 L42826 1174 L42826 1359.5 L42826.0 1359.5 " fill="none"></path>
-					<path d="M43767.3 653.4 L43766.0 648.3 L43764.8 643.1 L43779.0 645.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M27118.0 111.9 L26888.5 203 L26888.5 524 L26888.5 524.0 " fill="none"></path>
-					</g>
-					<path d="M27120.0 116.9 L27118.0 111.9 L27116.1 107.0 L27130.4 107.0 Z"></path>
-					<path d="M39928.3 3669.7 L39928.25 3671 L38873.25 3704.924365942029 L38873.3 3704.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39933.6 3660.3 L39928.3 3669.7 L39922.9 3660.3 L39928.3 3651.0 Z"></path>
-					</g>
-					<path d="M32765.7 3561.7 L32244.75 3671 L41566.5 3706.3049502573813 L41566.5 3706.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32776.0 3565.0 L32765.7 3561.7 L32773.8 3554.5 L32784.0 3557.8 Z"></path>
-					</g>
-					<path d="M32990.5 3617.2 L32990.5 3671 L31830.25 3704.156671362447 L31830.3 3704.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32995.8 3607.8 L32990.5 3617.2 L32985.2 3607.8 L32990.5 3598.5 Z"></path>
-					</g>
-					<path d="M33215.7 3522.5 L37379.5 3671 L32121.25 3705.672463431623 L32121.3 3705.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M33206.5 3516.9 L33215.7 3522.5 L33206.1 3527.5 L33197.0 3521.9 Z"></path>
-					</g>
-					<path d="M32990.5 3200.3 L32990.5 3358 L32990.5 3430.5 L32990.5 3430.5 " fill="none"></path>
-					<path d="M32995.8 3200.3 L32990.5 3200.3 L32985.2 3200.3 L32990.5 3187.0 Z"></path>
-					<path d="M5564.3 2383.7 L5564.25 2985 L10406.25 3168.8796579108125 L10406.3 3168.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5569.6 2374.3 L5564.3 2383.7 L5558.9 2374.3 L5564.3 2365.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M27169.5 120.3 L27169.5 203 L27169.5 524 L27169.5 524.0 " fill="none"></path>
-					</g>
-					<path d="M27174.8 120.3 L27169.5 120.3 L27164.2 120.3 L27169.5 107.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M27229.8 92.3 L35196.75 203 L35196.75 508.5 L35196.8 508.5 " fill="none"></path>
-					</g>
-					<path d="M27229.9 87.0 L27229.8 92.3 L27229.8 97.7 L27216.5 92.2 Z"></path>
-					<path d="M38445.4 98.7 L36830 203 L36830 539.5 L36830 539.5 L36830 876 L36830 876 L36830 1025 L36830 1025 L36830 1174 L36830 1174 L36830 1390.5 L36830 1390.5 L36830 1607 L36830 1607 L36830 2296 L36830 2296 L36830 2985 L36830 2985 L39422.75 3167.798554011908 L39422.8 3167.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38455.0 103.5 L38445.4 98.7 L38454.3 92.8 L38464.0 97.5 Z"></path>
-					</g>
-					<path d="M44786.0 120.3 L44786 203 L44786 486 L44786.0 486.0 " fill="none"></path>
-					<path d="M44791.3 120.3 L44786.0 120.3 L44780.7 120.3 L44786.0 107.0 Z"></path>
-					<path d="M43761.1 676.0 L43095.75 876 L43095.75 1025 L43095.75 1025 L43095.75 1174 L43095.75 1174 L43095.75 1390.5 L43095.75 1390.5 L43095.75 1607 L43095.75 1607 L43095.75 2296 L43095.75 2296 L43095.75 2985 L43095.75 2985 L28888.25 3169.6672997177407 L28888.3 3169.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43771.6 678.4 L43761.1 676.0 L43768.5 668.2 L43779.0 670.6 Z"></path>
-					</g>
-					<path d="M43762.3 762.4 L43531.5 876 L43531.5 1009.5 L43531.5 1009.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43773.0 763.1 L43762.3 762.4 L43768.3 753.5 L43779.0 754.2 Z"></path>
-					</g>
-					<path d="M44096.6 873.6 L44095.75 876 L44095.75 986.5 L44095.8 986.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44104.7 866.6 L44096.6 873.6 L44094.7 863.0 L44102.8 856.0 Z"></path>
-					</g>
-					<path d="M44315.1 873.9 L44315.75 876 L44315.75 1025 L44315.75 1025 L44315.75 1174 L44315.75 1174 L44315.75 1390.5 L44315.75 1390.5 L44315.75 1607 L44315.75 1607 L44315.75 2296 L44315.75 2296 L44315.75 2985 L44315.75 2985 L44315.75 3171.5 L44315.75 3171.5 L44315.75 3358 L44315.75 3358 L44315.75 3514.5 L44315.75 3514.5 L44315.75 3671 L44315.75 3671 L41669.5 3705.822305625058 L41669.5 3705.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44317.5 863.4 L44315.1 873.9 L44307.3 866.5 L44309.8 856.0 Z"></path>
-					</g>
-					<path d="M44444.0 871.4 L44447.25 876 L44447.25 1009.5 L44447.3 1009.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44443.1 860.7 L44444.0 871.4 L44434.4 866.7 L44433.4 856.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M38664.3 93.6 L44215 203 L44215 223 L44215.0 223.0 " fill="none"></path>
-					</g>
-					<path d="M38664.4 88.3 L38664.3 93.6 L38664.2 98.9 L38651.0 93.3 Z"></path>
-					<path d="M28905.8 3114.9 L28918.25 3110.5 L28925.75 3110.5 L28925.75 3110.5 L28933.25 3171.5 L28933.25 3171.5 L28925.75 3232.5 L28925.75 3232.5 L28918.25 3232.5 L28918.25 3232.5 L28888.25 3221.7982456140353 L28888.3 3221.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28895.2 3113.0 L28905.8 3114.9 L28898.8 3123.1 L28888.3 3121.2 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2997.4 2323.5 L2670.5 2985 L28606.25 3170.491572952918 L28606.3 3170.5 " fill="none"></path>
-					</g>
-					<path d="M3002.2 2325.8 L2997.4 2323.5 L2992.7 2321.1 L3003.3 2311.5 Z"></path>
-					<path d="M6127.4 2404.8 L5888.25 2985 L31407.5 3170.804668208747 L31407.5 3170.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6135.9 2398.2 L6127.4 2404.8 L6126.0 2394.1 L6134.5 2387.5 Z"></path>
-					</g>
-					<path d="M6209.8 2405.2 L6409 2985 L13835.5 3169.389569327032 L13835.5 3169.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6211.8 2394.6 L6209.8 2405.2 L6201.7 2398.1 L6203.7 2387.5 Z"></path>
-					</g>
-					<path d="M5365.4 1442.9 L4469.75 1607 L5946.156023222061 2204.5 L5946.2 2204.5 " fill="none"></path>
-					<path d="M5366.3 1448.2 L5365.4 1442.9 L5364.4 1437.7 L5378.5 1440.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M7393.6 1419.3 L7376.25 1607 L6332.14259796807 2204.5 L6332.1 2204.5 " fill="none"></path>
-					</g>
-					<path d="M7398.9 1419.8 L7393.6 1419.3 L7388.3 1418.8 L7394.8 1406.0 Z"></path>
-					<path d="M20147.6 1414.3 L19378.25 1607 L19378.25 2242.5 L19378.3 2242.5 " fill="none"></path>
-					<path d="M20148.9 1419.5 L20147.6 1414.3 L20146.3 1409.1 L20160.5 1411.0 Z"></path>
-					<path d="M37089.0 1463.2 L37089 1607 L42388.75 2255.2097812097813 L42388.8 2255.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37094.3 1453.8 L37089.0 1463.2 L37083.7 1453.8 L37089.0 1444.5 Z"></path>
-					</g>
-					<path d="M39258.8 555.6 L37089 876 L37089 1025 L37089 1025 L37089 1174 L37089 1174 L37089 1336.5 L37089.0 1336.5 " fill="none"></path>
-					<path d="M39259.6 560.9 L39258.8 555.6 L39258.0 550.3 L39272.0 553.7 Z"></path>
-					<path d="M45264.9 182.6 L45197.5 203 L45197.5 524 L45197.5 524.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45275.4 185.0 L45264.9 182.6 L45272.3 174.8 L45282.8 177.2 Z"></path>
-					</g>
-					<path d="M45558.6 201.6 L45558.5 203 L45558.5 524 L45558.5 524.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45564.5 192.7 L45558.6 201.6 L45553.9 192.0 L45559.8 183.0 Z"></path>
-					</g>
-					<path d="M45866.6 182.6 L45934 203 L45934 524 L45934.0 524.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45859.2 174.8 L45866.6 182.6 L45856.1 185.0 L45848.8 177.2 Z"></path>
-					</g>
-					<path d="M45867.1 144.2 L46203.5 203 L46203.5 524 L46203.5 524.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45858.9 137.3 L45867.1 144.2 L45857.0 147.8 L45848.8 141.0 Z"></path>
-					</g>
-					<path d="M42666.1 2503.0 L42535.5 2985 L40770.25 3168.3323820130863 L40770.3 3168.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42673.7 2495.4 L42666.1 2503.0 L42663.4 2492.6 L42671.0 2485.0 Z"></path>
-					</g>
-					<path d="M42678.1 2503.3 L42575.5 2985 L31598.5 3169.8914427636037 L31598.5 3169.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42685.3 2495.2 L42678.1 2503.3 L42674.8 2493.0 L42682.0 2485.0 Z"></path>
-					</g>
-					<path d="M42766.4 2503.3 L42869 2985 L33047 3170.43331477451 L33047.0 3170.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42769.7 2493.0 L42766.4 2503.3 L42759.2 2495.2 L42762.5 2485.0 Z"></path>
-					</g>
-					<path d="M42778.4 2503.0 L42909 2985 L39527.75 3168.648525664361 L39527.8 3168.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42781.1 2492.6 L42778.4 2503.0 L42770.8 2495.4 L42773.5 2485.0 Z"></path>
-					</g>
-					<path d="M44566.9 865.1 L44578.75 876 L44578.75 1025 L44578.75 1025 L44578.75 1174 L44578.75 1174 L44578.75 1390.5 L44578.75 1390.5 L44578.75 1607 L44578.75 1607 L43055.75 2172.228656073256 L43055.8 2172.2 " fill="none"></path>
-					<path d="M44570.5 861.1 L44566.9 865.1 L44563.3 869.0 L44557.1 856.0 Z"></path>
-					<path d="M20148.0 1426.3 L19670.75 1607 L19670.75 2265 L19670.8 2265.0 " fill="none"></path>
-					<path d="M20149.9 1431.3 L20148.0 1426.3 L20146.1 1421.3 L20160.5 1421.6 Z"></path>
-					<path d="M20335.9 1443.6 L20623.25 1607 L20623.25 2265 L20623.3 2265.0 " fill="none"></path>
-					<path d="M20338.5 1439.0 L20335.9 1443.6 L20333.2 1448.2 L20324.3 1437.0 Z"></path>
-					<path d="M20337.0 1424.6 L20843.25 1607 L20843.25 2265 L20843.3 2265.0 " fill="none"></path>
-					<path d="M20338.9 1419.6 L20337.0 1424.6 L20335.2 1429.6 L20324.5 1420.1 Z"></path>
-					<path d="M12101.0 1470.7 L12101 1607 L17375.75 2286.721840370318 L17375.8 2286.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12106.3 1461.3 L12101.0 1470.7 L12095.7 1461.3 L12101.0 1452.0 Z"></path>
-					</g>
-					<path d="M17769.7 1027.3 L12101 1174 L12101 1329 L12101.0 1329.0 " fill="none"></path>
-					<path d="M17769.8 1032.6 L17769.7 1027.3 L17769.5 1022.0 L17783.0 1027.0 Z"></path>
-					<path d="M8403.0 1438.6 L8124 1607 L9846.60576923077 2280.5 L9846.6 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8413.7 1438.4 L8403.0 1438.6 L8408.2 1429.3 L8419.0 1429.0 Z"></path>
-					</g>
-					<path d="M8511.1 1445.6 L8594.25 1607 L8694.199746008708 2280.5 L8694.2 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8511.6 1434.9 L8511.1 1445.6 L8502.1 1439.7 L8502.6 1429.0 Z"></path>
-					</g>
-					<path d="M8737.8 1483.6 L8674.25 1607 L9858.984397677794 2280.5 L9859.0 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8746.8 1477.7 L8737.8 1483.6 L8737.3 1472.9 L8746.4 1467.0 Z"></path>
-					</g>
-					<path d="M8835.5 1483.5 L8901.5 1607 L8701.11175616836 2280.5 L8701.1 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8835.8 1472.7 L8835.5 1483.5 L8826.3 1477.7 L8826.7 1467.0 Z"></path>
-					</g>
-					<path d="M8851.7 1482.2 L8941.5 1607 L11459.25 2281.795195954488 L11459.3 2281.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8850.6 1471.5 L8851.7 1482.2 L8841.9 1477.7 L8840.8 1467.0 Z"></path>
-					</g>
-					<path d="M9049.8 1537.3 L9027.25 1607 L8883.948113207547 2227 L8883.9 2227.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9057.7 1530.0 L9049.8 1537.3 L9047.6 1526.7 L9055.5 1519.5 Z"></path>
-					</g>
-					<path d="M9128.4 1537.8 L9143 1607 L14594.75 2291.542484851246 L14594.8 2291.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9131.7 1527.5 L9128.4 1537.8 L9121.2 1529.7 L9124.5 1519.5 Z"></path>
-					</g>
-					<path d="M10119.8 2413.7 L10119.75 2985 L11139.75 3159.9241379310347 L11139.8 3159.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10125.1 2404.3 L10119.8 2413.7 L10114.4 2404.3 L10119.8 2395.0 Z"></path>
-					</g>
-					<path d="M9172.5 1531.3 L9213 1607 L9989.462264150943 2197 L9989.5 2197.0 " fill="none"></path>
-					<path d="M9177.2 1528.7 L9172.5 1531.3 L9167.8 1533.8 L9166.2 1519.5 Z"></path>
-					<path d="M9197.8 1530.3 L9253 1607 L10296.25 2238.2177826564216 L10296.3 2238.2 " fill="none"></path>
-					<path d="M9202.2 1527.2 L9197.8 1530.3 L9193.5 1533.4 L9190.1 1519.5 Z"></path>
-					<path d="M4879.5 2428.0 L4728.75 2985 L16369.5 3170.1638521077207 L16369.5 3170.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4887.1 2420.4 L4879.5 2428.0 L4876.8 2417.6 L4884.4 2410.0 Z"></path>
-					</g>
-					<path d="M4942.8 2428.3 L5058.5 2985 L13835.5 3169.7111825772963 L13835.5 3169.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4946.1 2418.1 L4942.8 2428.3 L4935.6 2420.2 L4939.0 2410.0 Z"></path>
-					</g>
-					<path d="M5365.7 1474.5 L4915.25 1607 L4915.25 2182 L4915.3 2182.0 " fill="none"></path>
-					<path d="M5367.2 1479.7 L5365.7 1474.5 L5364.2 1469.4 L5378.5 1470.8 Z"></path>
-					<path d="M17769.7 1027.4 L12276.25 1174 L20160.5 1388.2714734034207 L20160.5 1388.3 " fill="none"></path>
-					<path d="M17769.8 1032.7 L17769.7 1027.4 L17769.5 1022.1 L17783.0 1027.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M21420.3 1053.8 L21420.25 1174 L20324.5 1375.42634260242 L20324.5 1375.4 " fill="none"></path>
-					</g>
-					<path d="M21425.6 1053.8 L21420.3 1053.8 L21414.9 1053.8 L21420.3 1040.5 Z"></path>
-					<path d="M9638.2 1475.9 L9566.75 1607 L9879.062409288825 2280.5 L9879.1 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9647.4 1470.2 L9638.2 1475.9 L9638.0 1465.1 L9647.1 1459.5 Z"></path>
-					</g>
-					<path d="M9816.5 1464.1 L10072.25 1607 L11479.855224963716 2280.5 L11479.9 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9811.0 1454.9 L9816.5 1464.1 L9805.8 1464.2 L9800.3 1455.0 Z"></path>
-					</g>
-					<path d="M5461.8 1490.7 L5241.75 1607 L5241.75 2296 L5241.75 2296 L5241.75 2985 L5241.75 2985 L33316 3170.9997912947715 L33316.0 3171.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5472.6 1491.1 L5461.8 1490.7 L5467.6 1481.6 L5478.3 1482.0 Z"></path>
-					</g>
-					<path d="M5479.1 1491.4 L5281.75 1607 L5281.75 2296 L5281.75 2296 L5281.75 2985 L5281.75 2985 L34511.75 3171.2069613335157 L34511.8 3171.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5489.9 1491.3 L5479.1 1491.4 L5484.5 1482.1 L5495.2 1482.0 Z"></path>
-					</g>
-					<path d="M5942.9 1442.1 L6873.75 1607 L6873.75 2296 L6873.75 2296 L6873.75 2985 L6873.75 2985 L13835.5 3169.250381381488 L13835.5 3169.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5934.6 1435.2 L5942.9 1442.1 L5932.8 1445.7 L5924.5 1438.9 Z"></path>
-					</g>
-					<path d="M46721.5 156.2 L46721.5 203 L46721.5 524 L46721.5 524.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46726.8 146.8 L46721.5 156.2 L46716.2 146.8 L46721.5 137.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M8517.3 1439.9 L8634.25 1607 L9173.89404934688 2250 L9173.9 2250.0 " fill="none"></path>
-					</g>
-					<path d="M8521.7 1436.9 L8517.3 1439.9 L8513.0 1443.0 L8509.7 1429.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M9408.8 1472.3 L9408.75 1607 L9225.602322206096 2250 L9225.6 2250.0 " fill="none"></path>
-					</g>
-					<path d="M9414.1 1472.3 L9408.8 1472.3 L9403.4 1472.3 L9408.8 1459.0 Z"></path>
-					<path d="M24997.6 1078.6 L24667.25 1174 L25103.60103926097 1375 L25103.6 1375.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25008.0 1081.1 L24997.6 1078.6 L25005.1 1070.9 L25015.5 1073.4 Z"></path>
-					</g>
-					<path d="M24997.7 1083.7 L24713 1174 L20324.5 1386.5288558326808 L20324.5 1386.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25008.2 1086.0 L24997.7 1083.7 L25005.0 1075.8 L25015.5 1078.1 Z"></path>
-					</g>
-					<path d="M25225.6 1163.8 L25228.75 1174 L25228.75 1390.5 L25228.75 1390.5 L25228.75 1607 L25228.75 1607 L14665.75 2293.692173420767 L14665.8 2293.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25228.0 1153.4 L25225.6 1163.8 L25217.8 1156.5 L25220.2 1146.0 Z"></path>
-					</g>
-					<path d="M25356.0 1157.3 L25377.75 1174 L25377.75 1375 L25377.8 1375.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25351.8 1147.4 L25356.0 1157.3 L25345.3 1155.9 L25341.2 1146.0 Z"></path>
-					</g>
-					<path d="M10677.2 1514.5 L10642.25 1607 L21235.25 2294.118904161175 L21235.3 2294.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10685.5 1507.6 L10677.2 1514.5 L10675.5 1503.8 L10683.8 1497.0 Z"></path>
-					</g>
-					<path d="M10904.4 1475.0 L11186.25 1607 L14594.75 2288.8979384436702 L14594.8 2288.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10898.2 1466.2 L10904.4 1475.0 L10893.7 1475.9 L10887.5 1467.1 Z"></path>
-					</g>
-					<path d="M20337.4 1414.6 L21095.25 1607 L21095.25 2219.5 L21095.3 2219.5 " fill="none"></path>
-					<path d="M20338.7 1409.4 L20337.4 1414.6 L20336.1 1419.8 L20324.5 1411.3 Z"></path>
-					<path d="M44592.2 2443.4 L44494.5 2985 L44494.5 3156 L44494.5 3156.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44599.1 2435.1 L44592.2 2443.4 L44588.6 2433.2 L44595.5 2425.0 Z"></path>
-					</g>
-					<path d="M44600.7 2443.5 L44534.5 2985 L33467 3170.2363591492417 L33467.0 3170.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44607.1 2434.9 L44600.7 2443.5 L44596.5 2433.6 L44603.0 2425.0 Z"></path>
-					</g>
-					<path d="M44640.1 2443.5 L44718.5 2985 L33047 3170.6015305252386 L33047.0 3170.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44644.0 2433.5 L44640.1 2443.5 L44633.5 2435.0 L44637.4 2425.0 Z"></path>
-					</g>
-					<path d="M44648.6 2443.3 L44758.5 2985 L39527.75 3169.6467373302416 L39527.8 3169.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44652.0 2433.1 L44648.6 2443.3 L44641.5 2435.2 L44644.9 2425.0 Z"></path>
-					</g>
-					<path d="M44605.0 864.5 L44618.75 876 L44618.75 1025 L44618.75 1025 L44618.75 1174 L44618.75 1174 L44618.75 1390.5 L44618.75 1390.5 L44618.75 1607 L44618.75 1607 L44618.75 2167 L44618.8 2167.0 " fill="none"></path>
-					<path d="M44608.4 860.4 L44605.0 864.5 L44601.6 868.6 L44594.8 856.0 Z"></path>
-					<path d="M20337.6 1408.0 L21420.75 1607 L21420.75 2265 L21420.8 2265.0 " fill="none"></path>
-					<path d="M20338.6 1402.7 L20337.6 1408.0 L20336.6 1413.2 L20324.5 1405.6 Z"></path>
-					<path d="M7054.8 2353.2 L7054.75 2985 L31225.5 3170.9537729330596 L31225.5 3171.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7060.1 2343.8 L7054.8 2353.2 L7049.4 2343.8 L7054.8 2334.5 Z"></path>
-					</g>
-					<path d="M5937.7 1434.7 L7054.75 1607 L7054.75 2257.5 L7054.8 2257.5 " fill="none"></path>
-					<path d="M5938.5 1429.4 L5937.7 1434.7 L5936.9 1439.9 L5924.5 1432.6 Z"></path>
-					<path d="M25692.8 1131.7 L25600.25 1174 L25600.25 1375 L25600.3 1375.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25703.5 1132.7 L25692.8 1131.7 L25699.1 1123.0 L25709.8 1124.0 Z"></path>
-					</g>
-					<path d="M26080.1 1134.9 L26134.75 1174 L26134.75 1390.5 L26134.75 1390.5 L26134.75 1607 L26134.75 1607 L16531 2292.893259737231 L16531.0 2292.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26075.6 1125.1 L26080.1 1134.9 L26069.4 1133.8 L26065.0 1124.0 Z"></path>
-					</g>
-					<path d="M26160.7 1131.7 L26253.25 1174 L26253.25 1375 L26253.3 1375.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26154.4 1123.0 L26160.7 1131.7 L26150.0 1132.7 L26143.7 1124.0 Z"></path>
-					</g>
-					<path d="M26167.4 1083.5 L26539.75 1174 L26539.75 1375 L26539.8 1375.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26159.6 1076.1 L26167.4 1083.5 L26157.1 1086.5 L26149.3 1079.1 Z"></path>
-					</g>
-					<path d="M26775.9 1454.3 L26527.25 1607 L27964.66908563135 2280.5 L27964.7 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26786.7 1453.9 L26775.9 1454.3 L26781.1 1444.8 L26791.8 1444.5 Z"></path>
-					</g>
-					<path d="M26901.7 1462.4 L26945.75 1607 L17519.75 2290.7770056854074 L17519.8 2290.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26904.0 1451.9 L26901.7 1462.4 L26893.8 1455.0 L26896.2 1444.5 Z"></path>
-					</g>
-					<path d="M26162.4 1061.8 L26879.75 1174 L26879.75 1336.5 L26879.8 1336.5 " fill="none"></path>
-					<path d="M26163.2 1056.6 L26162.4 1061.8 L26161.6 1067.1 L26149.3 1059.8 Z"></path>
-					<path d="M20337.7 1404.5 L21711.25 1607 L22611.94230769231 2257.5 L22611.9 2257.5 " fill="none"></path>
-					<path d="M20338.5 1399.3 L20337.7 1404.5 L20336.9 1409.8 L20324.5 1402.6 Z"></path>
-					<path d="M5937.7 1427.3 L7336.25 1607 L7336.25 2265 L7336.3 2265.0 " fill="none"></path>
-					<path d="M5938.4 1422.0 L5937.7 1427.3 L5937.0 1432.6 L5924.5 1425.6 Z"></path>
-					<path d="M22877.1 2338.6 L22511.5 2985 L14341.5 3168.1816542438087 L14341.5 3168.2 " fill="none"></path>
-					<path d="M22881.8 2341.2 L22877.1 2338.6 L22872.5 2336.0 L22883.7 2327.0 Z"></path>
-					<path d="M12844.0 1440.2 L12844 1607 L28098.75 2277.2177780611837 L28098.8 2277.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12849.3 1430.8 L12844.0 1440.2 L12838.7 1430.8 L12844.0 1421.5 Z"></path>
-					</g>
-					<path d="M12451.5 1455.7 L12451.5 1607 L11328.59270682148 2280.5 L11328.6 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12456.8 1446.3 L12451.5 1455.7 L12446.2 1446.3 L12451.5 1437.0 Z"></path>
-					</g>
-					<path d="M17769.7 1027.5 L12451.5 1174 L12451.5 1344 L12451.5 1344.0 " fill="none"></path>
-					<path d="M17769.8 1032.8 L17769.7 1027.5 L17769.5 1022.1 L17783.0 1027.1 Z"></path>
-					<path d="M37727.0 1097.7 L37727 1174 L37727 1194 L37727.0 1194.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37732.3 1088.3 L37727.0 1097.7 L37721.7 1088.3 L37727.0 1079.0 Z"></path>
-					</g>
-					<path d="M39279.4 557.7 L37727 876 L37727 971 L37727.0 971.0 " fill="none"></path>
-					<path d="M39280.4 562.9 L39279.4 557.7 L39278.3 552.5 L39292.4 555.0 Z"></path>
-					<path d="M35616.0 1116.5 L35531 1174 L35531 1306.5 L35531.0 1306.5 " fill="none"></path>
-					<path d="M35619.0 1120.9 L35616.0 1116.5 L35613.1 1112.1 L35627.1 1109.0 Z"></path>
-					<path d="M38305.0 2499.9 L37936.75 2985 L40709.25 3169.470656439529 L40709.3 3169.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38314.9 2495.7 L38305.0 2499.9 L38306.4 2489.2 L38316.3 2485.0 Z"></path>
-					</g>
-					<path d="M38316.5 2500.3 L37976.75 2985 L34603.75 3168.99078677976 L34603.8 3169.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38326.3 2495.7 L38316.5 2500.3 L38317.5 2489.6 L38327.3 2485.0 Z"></path>
-					</g>
-					<path d="M38459.8 2503.7 L38459.75 2985 L38459.75 3171.5 L38459.75 3171.5 L38459.75 3358 L38459.75 3358 L38459.75 3514.5 L38459.75 3514.5 L38459.75 3671 L38459.75 3671 L38775.25 3701.727709190672 L38775.3 3701.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38465.1 2494.3 L38459.8 2503.7 L38454.4 2494.3 L38459.8 2485.0 Z"></path>
-					</g>
-					<path d="M38471.8 2503.6 L38499.75 2985 L38499.75 3171.5 L38499.75 3171.5 L38499.75 3358 L38499.75 3358 L39787.75 3499.1074553727685 L39787.8 3499.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38476.6 2494.0 L38471.8 2503.6 L38465.9 2494.6 L38470.7 2485.0 Z"></path>
-					</g>
-					<path d="M38753.8 2495.5 L39475.25 2985 L39475.25 3156 L39475.3 3156.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38749.0 2485.8 L38753.8 2495.5 L38743.0 2494.7 L38738.3 2485.0 Z"></path>
-					</g>
-					<path d="M44664.1 632.8 L45834.25 876 L45834.25 1025 L45834.25 1025 L45834.25 1174 L45834.25 1174 L45834.25 1390.5 L45834.25 1390.5 L45834.25 1607 L45834.25 1607 L38879.25 2256.806088548376 L38879.3 2256.8 " fill="none"></path>
-					<path d="M44665.1 627.6 L44664.1 632.8 L44663.0 638.0 L44651.0 630.1 Z"></path>
-					<path d="M37426.4 1594.5 L37408 1607 L38171.24383164006 2107 L38171.2 2107.0 " fill="none"></path>
-					<path d="M37429.4 1598.9 L37426.4 1594.5 L37423.4 1590.1 L37437.5 1587.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M43974.2 1048.1 L43310.75 1174 L43310.75 1390.5 L43310.75 1390.5 L43310.75 1607 L43310.75 1607 L38879.25 2236.417336631622 L38879.3 2236.4 " fill="none"></path>
-					</g>
-					<path d="M43975.1 1053.3 L43974.2 1048.1 L43973.2 1042.8 L43987.3 1045.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M14559.7 1417.5 L14448.5 1607 L38040.25 2283.962496746317 L38040.3 2284.0 " fill="none"></path>
-					</g>
-					<path d="M14564.3 1420.2 L14559.7 1417.5 L14555.1 1414.8 L14566.4 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29747.4 1032.2 L27593 1174 L27593 1390.5 L27593 1390.5 L27593 1607 L27593 1607 L38040.25 2269.4018450778754 L38040.3 2269.4 " fill="none"></path>
-					</g>
-					<path d="M29747.8 1037.5 L29747.4 1032.2 L29747.1 1026.9 L29760.8 1031.4 Z"></path>
-					<path d="M31425.5 2450.6 L31290.5 2985 L32934 3165.3016176470587 L32934.0 3165.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31432.9 2442.9 L31425.5 2450.6 L31422.6 2440.2 L31430.0 2432.5 Z"></path>
-					</g>
-					<path d="M31513.4 2450.3 L31683 2985 L39422.75 3170.2434630562416 L39422.8 3170.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31515.7 2439.8 L31513.4 2450.3 L31505.5 2443.0 L31507.8 2432.5 Z"></path>
-					</g>
-					<path d="M42781.3 1430.4 L42583.25 1607 L31812.5 2274.4353456998315 L31812.5 2274.4 " fill="none"></path>
-					<path d="M42784.8 1434.4 L42781.3 1430.4 L42777.7 1426.4 L42791.2 1421.5 Z"></path>
-					<path d="M42180.8 1553.1 L42145 1607 L31812.5 2273.5504892093068 L31812.5 2273.6 " fill="none"></path>
-					<path d="M42185.2 1556.1 L42180.8 1553.1 L42176.3 1550.2 L42188.2 1542.0 Z"></path>
-					<path d="M37727.0 1605.7 L37727 1607 L37727 2296 L37727 2296 L37727 2985 L37727 2985 L28031.25 3170.1063211772234 L28031.3 3170.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37732.3 1596.3 L37727.0 1605.7 L37721.7 1596.3 L37727.0 1587.0 Z"></path>
-					</g>
-					<path d="M38124.5 1438.6 L39515.25 1607 L39515.25 2296 L39515.25 2296 L39515.25 2985 L39515.25 2985 L33047 3169.885033909345 L33047.0 3169.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38115.9 1432.2 L38124.5 1438.6 L38114.6 1442.8 L38106.0 1436.4 Z"></path>
-					</g>
-					<path d="M27289.2 540.7 L198.75 876 L198.75 926 L198.8 926.0 " fill="none"></path>
-					<path d="M27289.2 546.0 L27289.2 540.7 L27289.1 535.3 L27302.5 540.5 Z"></path>
-					<path d="M6685.8 2413.7 L6685.75 2985 L27885.25 3170.859995299095 L27885.3 3170.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6691.1 2404.3 L6685.8 2413.7 L6680.4 2404.3 L6685.8 2395.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M9078.2 1027.6 L4293.25 1174 L4293.25 1390.5 L4293.25 1390.5 L4293.25 1607 L4293.25 1607 L6537.75 2253.378474399164 L6537.8 2253.4 " fill="none"></path>
-					</g>
-					<path d="M9078.3 1032.9 L9078.2 1027.6 L9078.0 1022.3 L9091.5 1027.2 Z"></path>
-					<path d="M15334.0 1440.2 L15334 1607 L31116.5 2281.135488670531 L31116.5 2281.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15339.3 1430.8 L15334.0 1440.2 L15328.7 1430.8 L15334.0 1421.5 Z"></path>
-					</g>
-					<path d="M7725.3 1478.2 L7725.25 1607 L6833.75 2197.9028379028377 L6833.8 2197.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7730.6 1468.8 L7725.3 1478.2 L7719.9 1468.8 L7725.3 1459.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M9078.2 1033.8 L7725.25 1174 L7725.25 1321.5 L7725.3 1321.5 " fill="none"></path>
-					</g>
-					<path d="M9078.8 1039.1 L9078.2 1033.8 L9077.7 1028.5 L9091.5 1032.4 Z"></path>
-					<path d="M28328.5 2544.6 L27978.25 2985 L40709.25 3171.054264780786 L40709.3 3171.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28338.5 2540.6 L28328.5 2544.6 L28330.2 2534.0 L28340.1 2530.0 Z"></path>
-					</g>
-					<path d="M28342.6 2545.0 L28018.25 2985 L32934 3169.380788375484 L32934.0 3169.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28352.5 2540.7 L28342.6 2545.0 L28343.9 2534.3 L28353.7 2530.0 Z"></path>
-					</g>
-					<path d="M28526.3 2548.7 L28526.25 2985 L28526.25 3171.5 L28526.25 3171.5 L28526.25 3358 L28526.25 3358 L28526.25 3514.5 L28526.25 3514.5 L28526.25 3671 L28526.25 3671 L38775.25 3706.3310837055737 L38775.3 3706.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28531.6 2539.3 L28526.3 2548.7 L28520.9 2539.3 L28526.3 2530.0 Z"></path>
-					</g>
-					<path d="M28540.9 2548.6 L28566.25 2985 L28566.25 3171.5 L28566.25 3171.5 L28566.25 3358 L28566.25 3358 L39787.75 3512.564755324767 L39787.8 3512.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28545.7 2539.0 L28540.9 2548.6 L28535.1 2539.6 L28539.8 2530.0 Z"></path>
-					</g>
-					<path d="M28739.8 2544.1 L29119.25 2985 L39422.75 3170.554533603708 L39422.8 3170.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28737.8 2533.6 L28739.8 2544.1 L28729.7 2540.6 L28727.6 2530.0 Z"></path>
-					</g>
-					<path d="M42787.9 1431.2 L42623.25 1607 L28953.75 2275.105660778889 L28953.8 2275.1 " fill="none"></path>
-					<path d="M42791.7 1434.9 L42787.9 1431.2 L42784.0 1427.6 L42797.0 1421.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M43974.2 1049.3 L43350.75 1174 L43350.75 1390.5 L43350.75 1390.5 L43350.75 1607 L43350.75 1607 L28953.75 2276.1310330871192 L28953.8 2276.1 " fill="none"></path>
-					</g>
-					<path d="M43975.2 1054.5 L43974.2 1049.3 L43973.1 1044.1 L43987.3 1046.7 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M14564.3 1418.4 L14488.5 1607 L28098.75 2275.0174707485176 L28098.8 2275.0 " fill="none"></path>
-					</g>
-					<path d="M14569.2 1420.4 L14564.3 1418.4 L14559.4 1416.4 L14569.3 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29747.5 1037.3 L28526.25 1174 L28526.25 1390.5 L28526.25 1390.5 L28526.25 1607 L28526.25 1607 L28526.25 2062 L28526.3 2062.0 " fill="none"></path>
-					</g>
-					<path d="M29748.1 1042.6 L29747.5 1037.3 L29746.9 1032.0 L29760.8 1035.8 Z"></path>
-					<path d="M22879.7 2338.9 L22554.5 2985 L15227.5 3166.6289625839036 L15227.5 3166.6 " fill="none"></path>
-					<path d="M22884.4 2341.3 L22879.7 2338.9 L22874.9 2336.5 L22885.6 2327.0 Z"></path>
-					<path d="M586.8 1112.7 L586.75 1174 L586.75 1375 L586.8 1375.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M592.1 1103.3 L586.8 1112.7 L581.4 1103.3 L586.8 1094.0 Z"></path>
-					</g>
-					<path d="M27289.2 540.7 L586.75 876 L586.75 956 L586.8 956.0 " fill="none"></path>
-					<path d="M27289.2 546.0 L27289.2 540.7 L27289.1 535.4 L27302.5 540.5 Z"></path>
-					<path d="M20060.3 2376.7 L19303 2985 L32934 3170.7301552511417 L32934.0 3170.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20070.9 2375.0 L20060.3 2376.7 L20064.2 2366.7 L20074.9 2365.0 Z"></path>
-					</g>
-					<path d="M20267.9 2376.2 L21081.25 2985 L13459.5 3169.0489916809634 L13459.5 3169.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20263.6 2366.3 L20267.9 2376.2 L20257.2 2374.9 L20252.9 2365.0 Z"></path>
-					</g>
-					<path d="M16477.5 1510.7 L16388.5 1607 L17624.30896226415 2280.5 L17624.3 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16487.7 1507.5 L16477.5 1510.7 L16479.9 1500.2 L16490.1 1497.0 Z"></path>
-					</g>
-					<path d="M16600.1 1515.6 L16608.5 1607 L16490.22206095791 2280.5 L16490.2 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16604.5 1505.8 L16600.1 1515.6 L16593.9 1506.8 L16598.3 1497.0 Z"></path>
-					</g>
-					<path d="M17690.4 1515.6 L17682 1607 L18515.077467343977 2280.5 L18515.1 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17696.6 1506.8 L17690.4 1515.6 L17686.0 1505.8 L17692.2 1497.0 Z"></path>
-					</g>
-					<path d="M17813.4 1510.7 L17902.75 1607 L16519.337989840347 2280.5 L16519.3 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17811.0 1500.2 L17813.4 1510.7 L17803.2 1507.5 L17800.8 1497.0 Z"></path>
-					</g>
-					<path d="M10334.4 3120.9 L10346.25 3118 L10353.75 3118 L10353.75 3118 L10361.25 3171.5 L10361.25 3171.5 L10353.75 3225 L10353.75 3225 L10346.25 3225 L10346.25 3225 L10316.25 3217.7539503386006 L10316.3 3217.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10324.1 3117.9 L10334.4 3120.9 L10326.6 3128.2 L10316.3 3125.2 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2998.9 2323.7 L2710.5 2985 L9933.25 3166.682958492093 L9933.3 3166.7 " fill="none"></path>
-					</g>
-					<path d="M3003.8 2325.9 L2998.9 2323.7 L2994.0 2321.6 L3004.2 2311.5 Z"></path>
-					<path d="M13311.0 1470.7 L13311 1607 L21548.25 2257.054720384847 L21548.3 2257.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13316.3 1461.3 L13311.0 1470.7 L13305.7 1461.3 L13311.0 1452.0 Z"></path>
-					</g>
-					<path d="M17769.7 1027.9 L13311 1174 L13311 1329 L13311.0 1329.0 " fill="none"></path>
-					<path d="M17769.8 1033.3 L17769.7 1027.9 L17769.5 1022.6 L17783.0 1027.5 Z"></path>
-					<path d="M48320.5 120.3 L48320.5 203 L48320.5 493 L48320.5 493.0 " fill="none"></path>
-					<path d="M48325.8 120.3 L48320.5 120.3 L48315.2 120.3 L48320.5 107.0 Z"></path>
-					<path d="M13830.0 1470.7 L13830 1607 L21548.25 2254.593296191433 L21548.3 2254.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13835.3 1461.3 L13830.0 1470.7 L13824.7 1461.3 L13830.0 1452.0 Z"></path>
-					</g>
-					<path d="M17769.7 1028.3 L13830 1174 L13830 1329 L13830.0 1329.0 " fill="none"></path>
-					<path d="M17769.9 1033.6 L17769.7 1028.3 L17769.5 1023.0 L17783.0 1027.8 Z"></path>
-					<path d="M21644.0 2593.7 L21121.25 2985 L10316.25 3168.2521711453646 L10316.3 3168.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21654.7 2592.4 L21644.0 2593.7 L21648.3 2583.8 L21659.0 2582.5 Z"></path>
-					</g>
-					<path d="M22060.8 2601.1 L22084.75 2985 L32934 3170.5337895147054 L32934.0 3170.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22065.5 2591.5 L22060.8 2601.1 L22054.9 2592.1 L22059.6 2582.5 Z"></path>
-					</g>
-					<path d="M22230.3 2598.3 L22471.5 2985 L39422.75 3170.9241711387194 L39422.8 3170.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22229.9 2587.6 L22230.3 2598.3 L22220.9 2593.2 L22220.4 2582.5 Z"></path>
-					</g>
-					<path d="M42794.7 1432.2 L42663.25 1607 L22535.25 2279.5113110103534 L22535.3 2279.5 " fill="none"></path>
-					<path d="M42798.9 1435.4 L42794.7 1432.2 L42790.4 1429.0 L42802.7 1421.5 Z"></path>
-					<path d="M22371.2 1481.2 L22041.75 1607 L22041.75 2009.5 L22041.8 2009.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22381.8 1482.8 L22371.2 1481.2 L22378.0 1472.8 L22388.6 1474.5 Z"></path>
-					</g>
-					<path d="M22845.8 1481.2 L23175.25 1607 L23175.25 2280.5 L23175.3 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22839.0 1472.8 L22845.8 1481.2 L22835.2 1482.8 L22828.4 1474.5 Z"></path>
-					</g>
-					<path d="M43489.4 2487.3 L43290.75 2985 L40770.25 3169.2701881615053 L40770.3 3169.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43497.8 2480.6 L43489.4 2487.3 L43487.9 2476.7 L43496.3 2470.0 Z"></path>
-					</g>
-					<path d="M43500.4 2487.7 L43330.75 2985 L34603.75 3170.5221133021773 L34603.8 3170.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43508.4 2480.6 L43500.4 2487.7 L43498.3 2477.1 L43506.4 2470.0 Z"></path>
-					</g>
-					<path d="M43511.4 2488.0 L43370.75 2985 L39382.75 3153.672638621159 L39382.8 3153.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43519.1 2480.4 L43511.4 2488.0 L43508.8 2477.5 L43516.5 2470.0 Z"></path>
-					</g>
-					<path d="M43565.8 2488.7 L43565.75 2985 L43565.75 3171.5 L43565.75 3171.5 L43565.75 3358 L43565.75 3358 L43565.75 3514.5 L43565.75 3514.5 L43565.75 3671 L43565.75 3671 L38873.25 3706.133132974797 L38873.3 3706.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43571.1 2479.3 L43565.8 2488.7 L43560.4 2479.3 L43565.8 2470.0 Z"></path>
-					</g>
-					<path d="M43620.1 2488.0 L43760.75 2985 L43760.75 3171.5 L43760.75 3171.5 L43760.75 3358 L43760.75 3358 L40068.75 3508.7626875407695 L40068.8 3508.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43622.7 2477.5 L43620.1 2488.0 L43612.4 2480.4 L43615.0 2470.0 Z"></path>
-					</g>
-					<path d="M43631.1 2487.7 L43800.75 2985 L39527.75 3169.2363888567797 L39527.8 3169.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43633.2 2477.1 L43631.1 2487.7 L43623.1 2480.6 L43625.1 2470.0 Z"></path>
-					</g>
-					<path d="M44664.1 630.6 L45874.25 876 L45874.25 1025 L45874.25 1025 L45874.25 1174 L45874.25 1174 L45874.25 1390.5 L45874.25 1390.5 L45874.25 1607 L45874.25 1607 L43995.75 2167.66125189517 L43995.8 2167.7 " fill="none"></path>
-					<path d="M44665.1 625.3 L44664.1 630.6 L44663.0 635.8 L44651.0 627.9 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M43974.4 1059.1 L43565.75 1174 L43565.75 1390.5 L43565.75 1390.5 L43565.75 1607 L43565.75 1607 L43565.75 2122 L43565.8 2122.0 " fill="none"></path>
-					</g>
-					<path d="M43975.9 1064.2 L43974.4 1059.1 L43973.0 1054.0 L43987.3 1055.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29827.7 1048.9 L29672.75 1174 L29672.75 1390.5 L29672.75 1390.5 L29672.75 1607 L29672.75 1607 L43135.75 2274.6748722378175 L43135.8 2274.7 " fill="none"></path>
-					</g>
-					<path d="M29831.0 1053.0 L29827.7 1048.9 L29824.3 1044.7 L29838.1 1040.5 Z"></path>
-					<path d="M38961.3 3296.7 L38961.25 3358 L39787.75 3491.761375387797 L39787.8 3491.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38966.6 3287.3 L38961.3 3296.7 L38955.9 3287.3 L38961.3 3278.0 Z"></path>
-					</g>
-					<path d="M39401.4 3154.7 L43840.75 2985 L43635.19847605225 2470 L43635.2 2470.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39391.9 3149.7 L39401.4 3154.7 L39392.3 3160.4 L39382.8 3155.4 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M44075.3 1075.9 L44035.75 1174 L44035.75 1390.5 L44035.75 1390.5 L44035.75 1607 L44035.75 1607 L44035.75 2296 L44035.75 2296 L44035.75 2985 L44035.75 2985 L39382.75 3156.0088678687557 L39382.8 3156.0 " fill="none"></path>
-					</g>
-					<path d="M44080.2 1077.9 L44075.3 1075.9 L44070.3 1073.9 L44080.2 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M14572.1 1419.2 L14550.25 1607 L14550.25 2296 L14550.25 2296 L14550.25 2985 L14550.25 2985 L38539.75 3168.279740690672 L38539.8 3168.3 " fill="none"></path>
-					</g>
-					<path d="M14577.4 1419.9 L14572.1 1419.2 L14566.9 1418.6 L14573.7 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29893.0 1047.6 L30092.5 1174 L30092.5 1390.5 L30092.5 1390.5 L30092.5 1607 L30092.5 1607 L30092.5 2296 L30092.5 2296 L30092.5 2985 L30092.5 2985 L38539.75 3162.6363213530653 L38539.8 3162.6 " fill="none"></path>
-					</g>
-					<path d="M29895.8 1043.1 L29893.0 1047.6 L29890.1 1052.1 L29881.7 1040.5 Z"></path>
-					<path d="M23404.8 1476.4 L23343.25 1607 L23343.25 2296 L23343.25 2296 L23343.25 2985 L23343.25 2985 L12794.5 3168.8766151833074 L12794.5 3168.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23413.6 1470.2 L23404.8 1476.4 L23403.9 1465.7 L23412.7 1459.5 Z"></path>
-					</g>
-					<path d="M23499.0 1475.3 L23582.5 1607 L11565.25 2292.974627700338 L11565.3 2293.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23498.5 1464.5 L23499.0 1475.3 L23489.5 1470.2 L23489.0 1459.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M9078.3 1037.2 L8131.25 1174 L8131.25 1329 L8131.3 1329.0 " fill="none"></path>
-					</g>
-					<path d="M9079.1 1042.5 L9078.3 1037.2 L9077.5 1032.0 L9091.5 1035.3 Z"></path>
-					<path d="M12812.4 3121.6 L12824.5 3118 L12832 3118 L12832 3118 L12839.5 3171.5 L12839.5 3171.5 L12832 3225 L12832 3225 L12824.5 3225 L12824.5 3225 L12794.5 3216.1080332409974 L12794.5 3216.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12801.9 3119.1 L12812.4 3121.6 L12805.0 3129.4 L12794.5 3126.9 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3011.0 2324.8 L3011 2985 L12493.5 3168.5862400083047 L12493.5 3168.6 " fill="none"></path>
-					</g>
-					<path d="M3016.3 2324.8 L3011.0 2324.8 L3005.7 2324.8 L3011.0 2311.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M27289.2 541.3 L9163 876 L9163 994 L9163.0 994.0 " fill="none"></path>
-					</g>
-					<path d="M27289.3 546.6 L27289.2 541.3 L27289.1 535.9 L27302.5 541.0 Z"></path>
-					<path d="M45333.2 2555.5 L45212.25 2985 L40770.25 3170.22817216322 L40770.3 3170.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45340.9 2547.9 L45333.2 2555.5 L45330.6 2545.0 L45338.3 2537.5 Z"></path>
-					</g>
-					<path d="M45406.3 2556.2 L45406.25 2985 L33047 3170.651299760385 L33047.0 3170.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45411.6 2546.8 L45406.3 2556.2 L45400.9 2546.8 L45406.3 2537.5 Z"></path>
-					</g>
-					<path d="M45479.3 2555.5 L45600.25 2985 L39527.75 3169.9014285714284 L39527.8 3169.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45481.9 2545.0 L45479.3 2555.5 L45471.6 2547.9 L45474.2 2537.5 Z"></path>
-					</g>
-					<path d="M44664.1 628.4 L45914.25 876 L45914.25 1025 L45914.25 1025 L45914.25 1174 L45914.25 1174 L45914.25 1390.5 L45914.25 1390.5 L45914.25 1607 L45914.25 1607 L45584.308055152396 2054.5 L45584.3 2054.5 " fill="none"></path>
-					<path d="M44665.1 623.2 L44664.1 628.4 L44663.0 633.7 L44651.0 625.8 Z"></path>
-					<path d="M22904.0 2340.3 L22944.25 2985 L15490.5 3168.75128052609 L15490.5 3168.8 " fill="none"></path>
-					<path d="M22909.3 2340.0 L22904.0 2340.3 L22898.7 2340.6 L22903.2 2327.0 Z"></path>
-					<path d="M10273.5 1493.2 L10273.5 1607 L10630.475689404935 2182 L10630.5 2182.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10278.8 1483.8 L10273.5 1493.2 L10268.2 1483.8 L10273.5 1474.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M9247.7 1036.4 L10273.5 1174 L10273.5 1306.5 L10273.5 1306.5 " fill="none"></path>
-					</g>
-					<path d="M9248.4 1031.1 L9247.7 1036.4 L9247.0 1041.7 L9234.5 1034.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M9247.8 1034.3 L10520.5 1174 L10520.5 1390.5 L10520.5 1390.5 L10520.5 1607 L10520.5 1607 L10671.343613933237 2182 L10671.3 2182.0 " fill="none"></path>
-					</g>
-					<path d="M9248.3 1029.0 L9247.8 1034.3 L9247.2 1039.6 L9234.5 1032.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3045.8 2318.8 L4064 2985 L1932 3155.9817243603525 L1932.0 3156.0 " fill="none"></path>
-					</g>
-					<path d="M3048.8 2314.3 L3045.8 2318.8 L3042.9 2323.3 L3034.7 2311.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M9247.8 1031.3 L11174.5 1174 L11174.5 1329 L11174.5 1329.0 " fill="none"></path>
-					</g>
-					<path d="M9248.2 1026.0 L9247.8 1031.3 L9247.4 1036.6 L9234.5 1030.3 Z"></path>
-					<path d="M24823.8 1440.2 L24823.75 1607 L32925.25 2267.6229362684185 L32925.3 2267.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24829.1 1430.8 L24823.8 1440.2 L24818.4 1430.8 L24823.8 1421.5 Z"></path>
-					</g>
-					<path d="M14281.5 1455.7 L14281.5 1607 L14281.5 2280.5 L14281.5 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14286.8 1446.3 L14281.5 1455.7 L14276.2 1446.3 L14281.5 1437.0 Z"></path>
-					</g>
-					<path d="M17769.7 1028.7 L14281.5 1174 L14281.5 1344 L14281.5 1344.0 " fill="none"></path>
-					<path d="M17769.9 1034.0 L17769.7 1028.7 L17769.5 1023.4 L17783.0 1028.2 Z"></path>
-					<path d="M35920.5 1508.2 L35920.5 1607 L25587.5 2283.945611866502 L25587.5 2283.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35925.8 1498.8 L35920.5 1508.2 L35915.2 1498.8 L35920.5 1489.5 Z"></path>
-					</g>
-					<path d="M35856.7 1117.8 L35920.5 1174 L35920.5 1291.5 L35920.5 1291.5 " fill="none"></path>
-					<path d="M35860.2 1113.8 L35856.7 1117.8 L35853.1 1121.8 L35846.7 1109.0 Z"></path>
-					<path d="M33090.7 2522.0 L32716.75 2985 L40709.25 3170.7910071045744 L40709.3 3170.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M33100.7 2518.1 L33090.7 2522.0 L33092.4 2511.4 L33102.4 2507.5 Z"></path>
-					</g>
-					<path d="M33273.3 2526.2 L33273.25 2985 L33013.99932975871 3156 L33014.0 3156.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M33278.6 2516.8 L33273.3 2526.2 L33267.9 2516.8 L33273.3 2507.5 Z"></path>
-					</g>
-					<path d="M33364.3 2524.8 L33547.25 2985 L39422.75 3169.8483046558704 L39422.8 3169.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M33365.8 2514.2 L33364.3 2524.8 L33355.9 2518.1 L33357.4 2507.5 Z"></path>
-					</g>
-					<path d="M42838.0 1434.4 L42885 1607 L33621.25 2271.054282518792 L33621.3 2271.1 " fill="none"></path>
-					<path d="M42843.1 1433.0 L42838.0 1434.4 L42832.8 1435.8 L42834.4 1421.5 Z"></path>
-					<path d="M39575.9 1532.3 L39555.25 1607 L33621.25 2257.831900668577 L33621.3 2257.8 " fill="none"></path>
-					<path d="M39581.1 1533.8 L39575.9 1532.3 L39570.8 1530.9 L39579.5 1519.5 Z"></path>
-					<path d="M42210.4 1554.0 L42185 1607 L33621.25 2269.0948466911664 L33621.3 2269.1 " fill="none"></path>
-					<path d="M42215.2 1556.3 L42210.4 1554.0 L42205.6 1551.7 L42216.1 1542.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M44088.8 1076.7 L44075.75 1174 L44075.75 1390.5 L44075.75 1390.5 L44075.75 1607 L44075.75 1607 L33621.25 2273.8040268456375 L33621.3 2273.8 " fill="none"></path>
-					</g>
-					<path d="M44094.1 1077.4 L44088.8 1076.7 L44083.5 1076.0 L44090.6 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M14577.5 1419.3 L14590.25 1607 L32925.25 2283.1663009152708 L32925.3 2283.2 " fill="none"></path>
-					</g>
-					<path d="M14582.8 1418.9 L14577.5 1419.3 L14572.1 1419.7 L14576.6 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29897.6 1046.8 L30132.5 1174 L30132.5 1390.5 L30132.5 1390.5 L30132.5 1607 L30132.5 1607 L32925.25 2219.657725065669 L32925.3 2219.7 " fill="none"></path>
-					</g>
-					<path d="M29900.1 1042.2 L29897.6 1046.8 L29895.1 1051.5 L29885.9 1040.5 Z"></path>
-					<path d="M22914.0 2339.8 L23102.25 2985 L15840.5 3167.6024033437825 L15840.5 3167.6 " fill="none"></path>
-					<path d="M22919.1 2338.3 L22914.0 2339.8 L22908.9 2341.3 L22910.3 2327.0 Z"></path>
-					<path d="M40131.1 2494.5 L39908.25 2985 L40709.25 3164.6590499098015 L40709.3 3164.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40139.8 2488.2 L40131.1 2494.5 L40130.1 2483.8 L40138.8 2477.5 Z"></path>
-					</g>
-					<path d="M40142.5 2494.9 L39948.25 2985 L34603.75 3169.9084964289027 L34603.8 3169.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40150.9 2488.1 L40142.5 2494.9 L40140.9 2484.2 L40149.3 2477.5 Z"></path>
-					</g>
-					<path d="M40221.3 2496.2 L40221.25 2985 L40221.25 3171.5 L40221.25 3171.5 L40221.25 3358 L40221.25 3358 L40221.25 3514.5 L40221.25 3514.5 L40221.25 3671 L40221.25 3671 L38873.25 3705.2548317823907 L38873.3 3705.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40226.6 2486.8 L40221.3 2496.2 L40215.9 2486.8 L40221.3 2477.5 Z"></path>
-					</g>
-					<path d="M40346.8 2493.2 L40659.75 2985 L40659.75 3171.5 L40659.75 3171.5 L40659.75 3358 L40659.75 3358 L40068.75 3484.440874914559 L40068.8 3484.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40346.3 2482.5 L40346.8 2493.2 L40337.3 2488.2 L40336.8 2477.5 Z"></path>
-					</g>
-					<path d="M40357.9 2492.8 L40699.75 2985 L39527.75 3163.5038791343404 L39527.8 3163.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40357.0 2482.1 L40357.9 2492.8 L40348.2 2488.2 L40347.3 2477.5 Z"></path>
-					</g>
-					<path d="M44664.1 626.4 L45954.25 876 L45954.25 1025 L45954.25 1025 L45954.25 1174 L45954.25 1174 L45954.25 1390.5 L45954.25 1390.5 L45954.25 1607 L45954.25 1607 L40767.25 2230.3809523809523 L40767.3 2230.4 " fill="none"></path>
-					<path d="M44665.1 621.2 L44664.1 626.4 L44663.1 631.6 L44651.0 623.9 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M44102.7 1076.7 L44115.75 1174 L44115.75 1390.5 L44115.75 1390.5 L44115.75 1607 L44115.75 1607 L40767.25 2199.403774553858 L40767.3 2199.4 " fill="none"></path>
-					</g>
-					<path d="M44108.0 1076.0 L44102.7 1076.7 L44097.4 1077.4 L44100.9 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M14585.8 1418.5 L14655.5 1607 L39675.25 2281.28523512903 L39675.3 2281.3 " fill="none"></path>
-					</g>
-					<path d="M14590.9 1416.7 L14585.8 1418.5 L14580.8 1420.4 L14581.2 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29902.1 1046.2 L30172.5 1174 L30172.5 1390.5 L30172.5 1390.5 L30172.5 1607 L30172.5 1607 L39675.25 2258.5631048637892 L39675.3 2258.6 " fill="none"></path>
-					</g>
-					<path d="M29904.4 1041.4 L29902.1 1046.2 L29899.8 1051.0 L29890.0 1040.5 Z"></path>
-					<path d="M14865.0 1469.6 L14815.5 1607 L16625.83671988389 2280.5 L16625.8 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14873.2 1462.6 L14865.0 1469.6 L14863.2 1459.0 L14871.3 1452.0 Z"></path>
-					</g>
-					<path d="M14963.1 1465.7 L15093.75 1607 L16935.12246008708 2280.5 L16935.1 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14960.6 1455.2 L14963.1 1465.7 L14952.8 1462.5 L14950.4 1452.0 Z"></path>
-					</g>
-					<path d="M17769.7 1029.5 L14893.5 1174 L14893.5 1329 L14893.5 1329.0 " fill="none"></path>
-					<path d="M17770.0 1034.8 L17769.7 1029.5 L17769.4 1024.2 L17783.0 1028.8 Z"></path>
-					<path d="M34395.2 2442.5 L34195.25 2985 L33047 3162.7535795808258 L33047.0 3162.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M34403.5 2435.6 L34395.2 2442.5 L34393.5 2431.9 L34401.7 2425.0 Z"></path>
-					</g>
-					<path d="M34609.0 2437.4 L35227.75 2985 L39422.75 3169.1948204826367 L39422.8 3169.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M34605.5 2427.2 L34609.0 2437.4 L34598.5 2435.2 L34595.0 2425.0 Z"></path>
-					</g>
-					<path d="M42845.7 1433.6 L42925 1607 L34797.25 2267.710822051146 L34797.3 2267.7 " fill="none"></path>
-					<path d="M42850.6 1431.4 L42845.7 1433.6 L42840.9 1435.8 L42840.2 1421.5 Z"></path>
-					<path d="M22916.5 2339.6 L23142.25 2985 L16329.5 3165.5503392660485 L16329.5 3165.6 " fill="none"></path>
-					<path d="M22921.5 2337.8 L22916.5 2339.6 L22911.5 2341.3 L22912.1 2327.0 Z"></path>
-					<path d="M42001.3 2383.7 L42001.25 2985 L32200.5 3166.301844917797 L32200.5 3166.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42006.6 2374.3 L42001.3 2383.7 L41995.9 2374.3 L42001.3 2365.0 Z"></path>
-					</g>
-					<path d="M39477.2 553.5 L42001.25 876 L42001.25 1025 L42001.25 1025 L42001.25 1174 L42001.25 1174 L42001.25 1390.5 L42001.25 1390.5 L42001.25 1607 L42001.25 1607 L42001.25 2227 L42001.3 2227.0 " fill="none"></path>
-					<path d="M39477.9 548.2 L39477.2 553.5 L39476.5 558.7 L39464.0 551.8 Z"></path>
-					<path d="M27303.7 593.4 L26882.75 876 L26882.75 941 L26882.8 941.0 " fill="none"></path>
-					<path d="M27306.6 597.9 L27303.7 593.4 L27300.7 589.0 L27314.7 586.0 Z"></path>
-					<path d="M25904.3 1440.2 L25904.25 1607 L34101.25 2267.940081919251 L34101.3 2267.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25909.6 1430.8 L25904.3 1440.2 L25898.9 1430.8 L25904.3 1421.5 Z"></path>
-					</g>
-					<path d="M11492.2 1482.4 L11226.25 1607 L9916.395137880987 2280.5 L9916.4 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11503.0 1483.3 L11492.2 1482.4 L11498.4 1473.6 L11509.2 1474.5 Z"></path>
-					</g>
-					<path d="M11772.9 1488.7 L11874.75 1607 L25219.5 2286.6291416427975 L25219.5 2286.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11770.9 1478.1 L11772.9 1488.7 L11762.8 1485.1 L11760.8 1474.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M9247.8 1030.0 L11688.5 1174 L11688.5 1306.5 L11688.5 1306.5 " fill="none"></path>
-					</g>
-					<path d="M9248.1 1024.7 L9247.8 1030.0 L9247.5 1035.3 L9234.5 1029.2 Z"></path>
-					<path d="M31919.5 3356.7 L31919.5 3358 L31919.5 3514.5 L31919.5 3514.5 L31919.5 3671 L31919.5 3671 L38775.25 3706.2480719794344 L38775.3 3706.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31924.8 3347.3 L31919.5 3356.7 L31914.2 3347.3 L31919.5 3338.0 Z"></path>
-					</g>
-					<path d="M25614.7 2452.2 L23843.5 2985 L31638.5 3165.0108345715703 L31638.5 3165.0 " fill="none"></path>
-					<path d="M25616.3 2457.3 L25614.7 2452.2 L25613.2 2447.1 L25627.5 2448.4 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29416.0 2340.3 L29416 2985 L31638.5 3150.566706610745 L31638.5 3150.6 " fill="none"></path>
-					</g>
-					<path d="M29421.3 2340.3 L29416.0 2340.3 L29410.7 2340.3 L29416.0 2327.0 Z"></path>
-					<path d="M41059.6 2559.9 L40739.75 2985 L40739.75 3156 L40739.8 3156.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41069.5 2555.7 L41059.6 2559.9 L41061.0 2549.3 L41070.9 2545.0 Z"></path>
-					</g>
-					<path d="M41074.7 2560.3 L40779.75 2985 L34603.75 3170.121182899389 L34603.8 3170.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41084.4 2555.7 L41074.7 2560.3 L41075.6 2549.6 L41085.3 2545.0 Z"></path>
-					</g>
-					<path d="M41089.8 2560.7 L40819.75 2985 L35443.75 3158.584487534626 L35443.8 3158.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41099.3 2555.7 L41089.8 2560.7 L41090.3 2550.0 L41099.8 2545.0 Z"></path>
-					</g>
-					<path d="M41104.9 2561.2 L40859.75 2985 L33047 3170.1609587953108 L33047.0 3170.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41114.2 2555.7 L41104.9 2561.2 L41104.9 2550.4 L41114.2 2545.0 Z"></path>
-					</g>
-					<path d="M41322.4 2563.2 L41423.75 2985 L41423.75 3171.5 L41423.75 3171.5 L41423.75 3358 L41423.75 3358 L41423.75 3514.5 L41423.75 3514.5 L41423.75 3671 L41423.75 3671 L38873.25 3705.8308328524718 L38873.3 3705.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41325.4 2552.8 L41322.4 2563.2 L41315.1 2555.3 L41318.1 2545.0 Z"></path>
-					</g>
-					<path d="M41337.9 2562.9 L41463.75 2985 L41463.75 3171.5 L41463.75 3171.5 L41463.75 3358 L41463.75 3358 L40068.75 3500.180071637903 L40068.8 3500.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41340.3 2552.4 L41337.9 2562.9 L41330.1 2555.5 L41332.5 2545.0 Z"></path>
-					</g>
-					<path d="M41353.2 2562.6 L41503.75 2985 L39527.75 3166.673157505546 L39527.8 3166.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41355.1 2552.0 L41353.2 2562.6 L41345.1 2555.6 L41347.0 2545.0 Z"></path>
-					</g>
-					<path d="M44664.1 624.4 L45994.25 876 L45994.25 1025 L45994.25 1025 L45994.25 1174 L45994.25 1174 L45994.25 1390.5 L45994.25 1390.5 L45994.25 1607 L45994.25 1607 L41709.25 2230.3878800675675 L41709.3 2230.4 " fill="none"></path>
-					<path d="M44665.1 619.2 L44664.1 624.4 L44663.1 629.7 L44651.0 622.0 Z"></path>
-					<path d="M39602.1 1532.8 L39595.25 1607 L40807.25 2109.1455201443173 L40807.3 2109.1 " fill="none"></path>
-					<path d="M39607.4 1533.3 L39602.1 1532.8 L39596.8 1532.3 L39603.3 1519.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M44116.2 1075.9 L44155.75 1174 L44155.75 1390.5 L44155.75 1390.5 L44155.75 1607 L44155.75 1607 L41709.25 2188.756169111303 L41709.3 2188.8 " fill="none"></path>
-					</g>
-					<path d="M44121.2 1073.9 L44116.2 1075.9 L44111.3 1077.9 L44111.3 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M14590.6 1417.7 L14695.5 1607 L40807.25 2284.301700689876 L40807.3 2284.3 " fill="none"></path>
-					</g>
-					<path d="M14595.2 1415.1 L14590.6 1417.7 L14585.9 1420.2 L14584.1 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29948.1 1043.1 L30604.5 1174 L30604.5 1390.5 L30604.5 1390.5 L30604.5 1607 L30604.5 1607 L40807.25 2266.832899213892 L40807.3 2266.8 " fill="none"></path>
-					</g>
-					<path d="M29949.1 1037.9 L29948.1 1043.1 L29947.0 1048.3 L29935.0 1040.5 Z"></path>
-					<path d="M35043.8 3296.7 L35043.75 3358 L39787.75 3509.9983621660353 L39787.8 3510.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35049.1 3287.3 L35043.8 3296.7 L35038.4 3287.3 L35043.8 3278.0 Z"></path>
-					</g>
-					<path d="M35462.4 3159.5 L41543.75 2985 L41361.42779390421 2545 L41361.4 2545.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35452.9 3154.4 L35462.4 3159.5 L35453.2 3165.1 L35443.8 3160.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M44129.0 1074.6 L44195.75 1174 L44195.75 1390.5 L44195.75 1390.5 L44195.75 1607 L44195.75 1607 L44195.75 2296 L44195.75 2296 L44195.75 2985 L44195.75 2985 L35443.75 3163.3487762237764 L35443.8 3163.3 " fill="none"></path>
-					</g>
-					<path d="M44133.4 1071.6 L44129.0 1074.6 L44124.6 1077.5 L44121.6 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M14594.9 1416.7 L14735.5 1607 L14735.5 2296 L14735.5 2296 L14735.5 2985 L14735.5 2985 L34643.75 3167.826616030431 L34643.8 3167.8 " fill="none"></path>
-					</g>
-					<path d="M14599.2 1413.6 L14594.9 1416.7 L14590.6 1419.9 L14587.0 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29952.2 1043.0 L30644.5 1174 L30644.5 1390.5 L30644.5 1390.5 L30644.5 1607 L30644.5 1607 L30644.5 2296 L30644.5 2296 L30644.5 2985 L30644.5 2985 L34643.75 3154.5425640734215 L34643.8 3154.5 " fill="none"></path>
-					</g>
-					<path d="M29953.2 1037.7 L29952.2 1043.0 L29951.3 1048.2 L29939.1 1040.5 Z"></path>
-					<path d="M45061.0 1540.3 L44898.25 1607 L44898.25 2296 L44898.25 2296 L44898.25 2985 L44898.25 2985 L40770.25 3170.132138992425 L40770.3 3170.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45071.6 1541.7 L45061.0 1540.3 L45067.6 1531.8 L45078.3 1533.2 Z"></path>
-					</g>
-					<path d="M45061.2 1552.5 L44938.25 1607 L44938.25 2296 L44938.25 2296 L44938.25 2985 L44938.25 2985 L33467 3170.2805443090047 L33467.0 3170.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45071.9 1553.5 L45061.2 1552.5 L45067.6 1543.8 L45078.3 1544.9 Z"></path>
-					</g>
-					<path d="M45061.4 1566.8 L44978.25 1607 L44978.25 2296 L44978.25 2296 L44978.25 2985 L44978.25 2985 L31367.5 3170.532177901219 L31367.5 3170.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45072.2 1567.5 L45061.4 1566.8 L45067.5 1557.9 L45078.3 1558.7 Z"></path>
-					</g>
-					<path d="M45067.7 1580.7 L45018.25 1607 L45018.25 2296 L45018.25 2296 L45018.25 2985 L45018.25 2985 L34603.75 3170.6798671191627 L34603.8 3170.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45078.5 1581.1 L45067.7 1580.7 L45073.5 1571.7 L45084.2 1572.0 Z"></path>
-					</g>
-					<path d="M45407.8 1590.6 L45406.25 1607 L45406.25 2054.5 L45406.3 2054.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45413.9 1581.8 L45407.8 1590.6 L45403.3 1580.8 L45409.5 1572.0 Z"></path>
-					</g>
-					<path d="M45530.5 1588.5 L45540.25 1607 L41709.25 2223.431340495096 L41709.3 2223.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45530.9 1577.8 L45530.5 1588.5 L45521.4 1582.7 L45521.8 1572.0 Z"></path>
-					</g>
-					<path d="M45566.2 1587.2 L45580.25 1607 L40767.25 2225.8014554954284 L40767.3 2225.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45565.1 1576.5 L45566.2 1587.2 L45556.4 1582.7 L45555.4 1572.0 Z"></path>
-					</g>
-					<path d="M45601.3 1585.9 L45620.25 1607 L43995.75 2151.7945972256025 L43995.8 2151.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45599.1 1575.4 L45601.3 1585.9 L45591.1 1582.5 L45588.9 1572.0 Z"></path>
-					</g>
-					<path d="M45636.1 1584.7 L45660.25 1607 L38879.25 2255.8589681272133 L38879.3 2255.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45632.9 1574.4 L45636.1 1584.7 L45625.6 1582.3 L45622.4 1572.0 Z"></path>
-					</g>
-					<path d="M45750.8 1581.5 L45794.25 1607 L45794.25 2296 L45794.25 2296 L45794.25 2985 L45794.25 2985 L39527.75 3169.950506409242 L39527.8 3170.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45745.5 1572.1 L45750.8 1581.5 L45740.1 1581.3 L45734.8 1572.0 Z"></path>
-					</g>
-					<path d="M44664.1 622.6 L46034.25 876 L46034.25 1025 L46034.25 1025 L46034.25 1174 L46034.25 1174 L45774.25 1266.5822368421052 L45774.3 1266.6 " fill="none"></path>
-					<path d="M44665.1 617.3 L44664.1 622.6 L44663.1 627.8 L44651.0 620.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M44141.1 1073.2 L44235.75 1174 L45078.25 1327.2139857202856 L45078.3 1327.2 " fill="none"></path>
-					</g>
-					<path d="M44144.9 1069.6 L44141.1 1073.2 L44137.2 1076.9 L44131.9 1063.5 Z"></path>
-					<path d="M39628.9 1538.1 L39635.25 1607 L39635.25 2296 L39635.25 2296 L39635.25 2985 L39635.25 2985 L39635.25 3171.5 L39635.25 3171.5 L39635.25 3358 L39635.25 3358 L39635.25 3514.5 L39635.25 3514.5 L39635.25 3671 L39635.25 3671 L38873.25 3704.355117139334 L38873.3 3704.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39633.3 1528.3 L39628.9 1538.1 L39622.7 1529.3 L39627.2 1519.5 Z"></path>
-					</g>
-					<path d="M39949.8 1424.4 L41749.25 1607 L41749.25 2296 L41749.25 2296 L41749.25 2985 L41749.25 2985 L41749.25 3171.5 L41749.25 3171.5 L41749.25 3358 L41749.25 3358 L40068.75 3502.4251784733665 L40068.8 3502.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39941.1 1418.2 L39949.8 1424.4 L39940.0 1428.8 L39931.3 1422.6 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M44152.5 1072.0 L44275.75 1174 L39931.25 1375.8204591781998 L39931.3 1375.8 " fill="none"></path>
-					</g>
-					<path d="M44155.9 1067.9 L44152.5 1072.0 L44149.1 1076.1 L44142.3 1063.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M29966.9 1041.3 L30860.5 1174 L39299.25 1382.68549930038 L39299.3 1382.7 " fill="none"></path>
-					</g>
-					<path d="M29967.7 1036.0 L29966.9 1041.3 L29966.2 1046.6 L29953.8 1039.3 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M27328.7 595.5 L27051.75 876 L27051.75 1025 L27051.75 1025 L27051.75 1174 L27051.75 1174 L27051.75 1390.5 L27051.75 1390.5 L27051.75 1607 L27051.75 1607 L25568.564223512338 2227 L25568.6 2227.0 " fill="none"></path>
-					</g>
-					<path d="M27332.5 599.2 L27328.7 595.5 L27324.9 591.7 L27338.1 586.0 Z"></path>
-					<path d="M32045.2 1082.1 L31076.5 1174 L31076.5 1390.5 L31076.5 1390.5 L31076.5 1607 L31076.5 1607 L31076.5 2296 L31076.5 2296 L31076.5 2985 L31076.5 2985 L14744.5 3169.4501771278046 L14744.5 3169.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32055.0 1086.6 L32045.2 1082.1 L32054.0 1076.0 L32063.8 1080.4 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M27478.8 545.6 L32647.75 876 L32647.75 896 L32647.8 896.0 " fill="none"></path>
-					</g>
-					<path d="M27479.1 540.2 L27478.8 545.6 L27478.5 550.9 L27465.5 544.7 Z"></path>
-					<path d="M32921.4 1159.9 L32950 1174 L32950 1306.5 L32950.0 1306.5 " fill="none"></path>
-					<path d="M32923.7 1155.1 L32921.4 1159.9 L32919.0 1164.7 L32909.4 1154.0 Z"></path>
-					<path d="M33244.8 1150.3 L33358 1174 L33358 1321.5 L33358.0 1321.5 " fill="none"></path>
-					<path d="M33245.9 1145.0 L33244.8 1150.3 L33243.7 1155.5 L33231.8 1147.5 Z"></path>
-					<path d="M33245.0 1100.3 L33830 1174 L33830 1321.5 L33830.0 1321.5 " fill="none"></path>
-					<path d="M33245.6 1095.0 L33245.0 1100.3 L33244.3 1105.6 L33231.8 1098.6 Z"></path>
-					<path d="M33245.0 1077.5 L34342 1174 L34342 1314 L34342.0 1314.0 " fill="none"></path>
-					<path d="M33245.5 1072.2 L33245.0 1077.5 L33244.6 1082.8 L33231.8 1076.4 Z"></path>
-					<path d="M34790.0 1553.2 L34790 1607 L21293.25 2294.5227436556197 L21293.3 2294.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M34795.3 1543.8 L34790.0 1553.2 L34784.7 1543.8 L34790.0 1534.5 Z"></path>
-					</g>
-					<path d="M33245.1 1066.5 L34790 1174 L34790 1246.5 L34790.0 1246.5 " fill="none"></path>
-					<path d="M33245.4 1061.2 L33245.1 1066.5 L33244.7 1071.9 L33231.8 1065.6 Z"></path>
-					<path d="M35174.0 1493.2 L35174 1607 L35174 2280.5 L35174.0 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35179.3 1483.8 L35174.0 1493.2 L35168.7 1483.8 L35174.0 1474.5 Z"></path>
-					</g>
-					<path d="M33245.1 1060.2 L35174 1174 L35174 1306.5 L35174.0 1306.5 " fill="none"></path>
-					<path d="M33245.4 1054.9 L33245.1 1060.2 L33244.7 1065.6 L33231.8 1059.4 Z"></path>
-					<path d="M15756.5 1455.7 L15756.5 1607 L25627.5 2262.371621296073 L25627.5 2262.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15761.8 1446.3 L15756.5 1455.7 L15751.2 1446.3 L15756.5 1437.0 Z"></path>
-					</g>
-					<path d="M17769.7 1031.3 L15756.5 1174 L15756.5 1344 L15756.5 1344.0 " fill="none"></path>
-					<path d="M17770.1 1036.6 L17769.7 1031.3 L17769.3 1026.0 L17783.0 1030.4 Z"></path>
-					<path d="M16148.5 1478.2 L16148.5 1607 L25627.5 2261.0514746382255 L25627.5 2261.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16153.8 1468.8 L16148.5 1478.2 L16143.2 1468.8 L16148.5 1459.5 Z"></path>
-					</g>
-					<path d="M17769.7 1032.8 L16148.5 1174 L16148.5 1321.5 L16148.5 1321.5 " fill="none"></path>
-					<path d="M17770.2 1038.1 L17769.7 1032.8 L17769.3 1027.5 L17783.0 1031.6 Z"></path>
-					<path d="M14761.9 3093.0 L14774.5 3088 L14782 3088 L14782 3088 L14789.5 3171.5 L14789.5 3171.5 L14782 3255 L14782 3255 L14774.5 3255 L14774.5 3255 L14744.5 3243.1560283687945 L14744.5 3243.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14751.2 3091.5 L14761.9 3093.0 L14755.1 3101.4 L14744.5 3099.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3046.9 2318.6 L4104 2985 L14381.5 3168.2635768237883 L14381.5 3168.3 " fill="none"></path>
-					</g>
-					<path d="M3049.7 2314.1 L3046.9 2318.6 L3044.0 2323.1 L3035.6 2311.5 Z"></path>
-					<path d="M18143.5 1455.7 L18143.5 1607 L25627.5 2252.3258244164945 L25627.5 2252.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18148.8 1446.3 L18143.5 1455.7 L18138.2 1446.3 L18143.5 1437.0 Z"></path>
-					</g>
-					<path d="M17900.4 1046.7 L18143.5 1174 L18143.5 1344 L18143.5 1344.0 " fill="none"></path>
-					<path d="M17902.9 1042.0 L17900.4 1046.7 L17897.9 1051.4 L17888.6 1040.5 Z"></path>
-					<path d="M30388.5 1440.2 L30388.5 1607 L26640.5 2213.97426254554 L26640.5 2214.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M30393.8 1430.8 L30388.5 1440.2 L30383.2 1430.8 L30388.5 1421.5 Z"></path>
-					</g>
-					<path d="M23759.8 1455.7 L23759.75 1607 L25627.5 2149.015267979362 L25627.5 2149.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23765.1 1446.3 L23759.8 1455.7 L23754.4 1446.3 L23759.8 1437.0 Z"></path>
-					</g>
-					<path d="M17948.3 1029.3 L20921.5 1174 L23583.75 1377.0748260371709 L23583.8 1377.1 " fill="none"></path>
-					<path d="M17948.6 1024.0 L17948.3 1029.3 L17948.1 1034.7 L17935.0 1028.7 Z"></path>
-					<path d="M24151.8 1455.7 L24151.75 1607 L25627.5 2119.948291083365 L25627.5 2119.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24157.1 1446.3 L24151.8 1455.7 L24146.4 1446.3 L24151.8 1437.0 Z"></path>
-					</g>
-					<path d="M17948.3 1029.1 L21137.5 1174 L23975.75 1377.8587127809571 L23975.8 1377.9 " fill="none"></path>
-					<path d="M17948.6 1023.7 L17948.3 1029.1 L17948.1 1034.4 L17935.0 1028.5 Z"></path>
-					<path d="M25610.9 2566.8 L24803 2985 L14744.5 3168.1943603515624 L14744.5 3168.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25621.7 2567.2 L25610.9 2566.8 L25616.8 2557.7 L25627.5 2558.2 Z"></path>
-					</g>
-					<path d="M25611.0 2575.1 L24843 2985 L32934 3170.2066891684567 L32934.0 3170.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25621.8 2575.4 L25611.0 2575.1 L25616.8 2566.0 L25627.5 2566.3 Z"></path>
-					</g>
-					<path d="M26657.8 2506.9 L27845.25 2985 L27845.25 3171.5 L27845.25 3171.5 L27845.25 3358 L27845.25 3358 L27845.25 3514.5 L27845.25 3514.5 L27845.25 3671 L27845.25 3671 L38775.25 3706.3415611622186 L38775.3 3706.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26651.1 2498.5 L26657.8 2506.9 L26647.2 2508.4 L26640.5 2499.9 Z"></path>
-					</g>
-					<path d="M26657.9 2500.6 L27898.25 2985 L10544.25 3170.761407335132 L10544.3 3170.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26651.1 2492.2 L26657.9 2500.6 L26647.3 2502.2 L26640.5 2493.8 Z"></path>
-					</g>
-					<path d="M26657.9 2496.1 L27938.25 2985 L39422.75 3170.651317500217 L39422.8 3170.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26651.1 2487.8 L26657.9 2496.1 L26647.3 2497.7 L26640.5 2489.4 Z"></path>
-					</g>
-					<path d="M42853.1 1432.7 L42965 1607 L26640.5 2275.265729903155 L26640.5 2275.3 " fill="none"></path>
-					<path d="M42857.6 1429.8 L42853.1 1432.7 L42848.6 1435.6 L42845.9 1421.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M14598.9 1415.8 L14775.5 1607 L25627.5 2265.2760047541487 L25627.5 2265.3 " fill="none"></path>
-					</g>
-					<path d="M14602.8 1412.2 L14598.9 1415.8 L14594.9 1419.4 L14589.8 1406.0 Z"></path>
-					<path d="M30860.5 1447.7 L30860.5 1607 L26640.5 2222.1655559081773 L26640.5 2222.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M30865.8 1438.3 L30860.5 1447.7 L30855.2 1438.3 L30860.5 1429.0 Z"></path>
-					</g>
-					<path d="M35918.1 1075.4 L36245 1174 L36245 1375 L36245.0 1375.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35910.7 1067.6 L35918.1 1075.4 L35907.6 1077.8 L35900.3 1070.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M27478.8 543.3 L35751.25 876 L35751.25 941 L35751.3 941.0 " fill="none"></path>
-					</g>
-					<path d="M27479.0 538.0 L27478.8 543.3 L27478.6 548.6 L27465.5 542.8 Z"></path>
-					<path d="M42288.8 1097.7 L42288.75 1174 L42288.75 1239 L42288.8 1239.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42294.1 1088.3 L42288.8 1097.7 L42283.4 1088.3 L42288.8 1079.0 Z"></path>
-					</g>
-					<path d="M39477.2 552.1 L42288.75 876 L42288.75 971 L42288.8 971.0 " fill="none"></path>
-					<path d="M39477.9 546.8 L39477.2 552.1 L39476.6 557.4 L39464.0 550.6 Z"></path>
-					<path d="M42304.5 1560.6 L42308.75 1607 L42308.75 2296 L42308.75 2296 L42308.75 2985 L42308.75 2985 L33047 3170.369181445014 L33047.0 3170.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42308.9 1550.8 L42304.5 1560.6 L42298.3 1551.8 L42302.7 1542.0 Z"></path>
-					</g>
-					<path d="M42335.7 1560.0 L42348.75 1607 L42348.75 2296 L42348.75 2296 L42348.75 2985 L42348.75 2985 L14005.5 3170.9423680669756 L14005.5 3170.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42338.4 1549.6 L42335.7 1560.0 L42328.1 1552.4 L42330.7 1542.0 Z"></path>
-					</g>
-					<path d="M20337.7 1404.2 L21751.25 1607 L22849.508345428156 2265 L22849.5 2265.0 " fill="none"></path>
-					<path d="M20338.5 1398.9 L20337.7 1404.2 L20336.9 1409.4 L20324.5 1402.3 Z"></path>
-					<path d="M31465.8 1470.2 L31465.75 1607 L17519.75 2292.4611214153233 L17519.8 2292.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31471.1 1460.8 L31465.8 1470.2 L31460.4 1460.8 L31465.8 1451.5 Z"></path>
-					</g>
-					<path d="M31941.5 2345.7 L31941.5 2985 L13795.5 3169.991199300317 L13795.5 3170.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31946.8 2336.3 L31941.5 2345.7 L31936.2 2336.3 L31941.5 2327.0 Z"></path>
-					</g>
-					<path d="M31795.8 1463.2 L31795.75 1607 L14665.75 2294.5750779179166 L14665.8 2294.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31801.1 1453.8 L31795.8 1463.2 L31790.4 1453.8 L31795.8 1444.5 Z"></path>
-					</g>
-					<path d="M17768.3 2419.5 L16282.75 2985 L33316 3170.676985460656 L33316.0 3170.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17778.9 2421.2 L17768.3 2419.5 L17775.1 2411.2 L17785.8 2412.9 Z"></path>
-					</g>
-					<path d="M17768.5 2432.4 L16454.75 2985 L31225.5 3170.6078208432295 L31225.5 3170.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17779.2 2433.7 L17768.5 2432.4 L17775.1 2423.8 L17785.8 2425.1 Z"></path>
-					</g>
-					<path d="M17768.6 2435.8 L16494.75 2985 L13027.5 3167.7317908866125 L13027.5 3167.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17779.3 2437.0 L17768.6 2435.8 L17775.1 2427.2 L17785.8 2428.4 Z"></path>
-					</g>
-					<path d="M18407.6 2495.0 L19183 2985 L34511.75 3170.9420071871086 L34511.8 3170.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18402.6 2485.5 L18407.6 2495.0 L18396.9 2494.5 L18391.8 2485.0 Z"></path>
-					</g>
-					<path d="M18415.7 2492.9 L19223 2985 L14005.5 3168.510372465818 L14005.5 3168.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18410.5 2483.5 L18415.7 2492.9 L18404.9 2492.6 L18399.8 2483.1 Z"></path>
-					</g>
-					<path d="M18415.8 2486.2 L19263 2985 L13216.5 3169.2300686162394 L13216.5 3169.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18410.5 2476.9 L18415.8 2486.2 L18405.1 2486.1 L18399.8 2476.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M7414.0 1417.1 L7540.75 1607 L17785.75 2275.954226686884 L17785.8 2276.0 " fill="none"></path>
-					</g>
-					<path d="M7418.4 1414.1 L7414.0 1417.1 L7409.6 1420.1 L7406.6 1406.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3053.6 2315.7 L4501.75 2985 L13499.5 3168.481986168439 L13499.5 3168.5 " fill="none"></path>
-					</g>
-					<path d="M3055.8 2310.8 L3053.6 2315.7 L3051.4 2320.5 L3041.5 2310.1 Z"></path>
-					<path d="M32257.5 1544.6 L32160 1607 L32160 2280.5 L32160.0 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32268.2 1544.0 L32257.5 1544.6 L32262.5 1535.0 L32273.2 1534.5 Z"></path>
-					</g>
-					<path d="M32483.0 1553.1 L32478 1607 L32478 2280.5 L32478.0 2280.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32489.1 1544.3 L32483.0 1553.1 L32478.5 1543.3 L32484.7 1534.5 Z"></path>
-					</g>
-					<path d="M32756.3 1441.1 L33604 1607 L14665.75 2294.710876869359 L14665.8 2294.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32748.2 1434.0 L32756.3 1441.1 L32746.1 1444.5 L32738.0 1437.5 Z"></path>
-					</g>
-					<path d="M32756.3 1439.3 L33644 1607 L18399.75 2282.398328108673 L18399.8 2282.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32748.2 1432.3 L32756.3 1439.3 L32746.2 1442.8 L32738.0 1435.8 Z"></path>
-					</g>
-					<path d="M2349.7 3072.2 L2363 3065.5 L2370.5 3065.5 L2370.5 3065.5 L2378 3171.5 L2378 3171.5 L2370.5 3277.5 L2370.5 3277.5 L2363 3277.5 L2363 3277.5 L2333 3262.393111638955 L2333.0 3262.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2338.9 3071.6 L2349.7 3072.2 L2343.7 3081.2 L2333.0 3080.6 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3053.8 2313.6 L4688.75 2985 L2333 3158.227156234598 L2333.0 3158.2 " fill="none"></path>
-					</g>
-					<path d="M3055.9 2308.7 L3053.8 2313.6 L3051.8 2318.5 L3041.5 2308.5 Z"></path>
-					<path d="M33815.2 2411.8 L33587.25 2985 L40709.25 3170.7047186298496 L40709.3 3170.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M33823.6 2405.1 L33815.2 2411.8 L33813.7 2401.2 L33822.1 2394.5 Z"></path>
-					</g>
-					<path d="M33861.3 2413.2 L33861.25 2985 L32473.5 3157.0560910752865 L32473.5 3157.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M33866.6 2403.8 L33861.3 2413.2 L33855.9 2403.8 L33861.3 2394.5 Z"></path>
-					</g>
-					<path d="M33910.6 2411.7 L34155.25 2985 L33262.42828418231 3156 L33262.4 3156.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M33911.8 2401.0 L33910.6 2411.7 L33902.0 2405.2 L33903.3 2394.5 Z"></path>
-					</g>
-					<path d="M17948.3 1028.9 L21314 1174 L24367.75 1383.834761564707 L24367.8 1383.8 " fill="none"></path>
-					<path d="M17948.6 1023.5 L17948.3 1028.9 L17948.1 1034.2 L17935.0 1028.3 Z"></path>
-					<g data-name="IAppDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
-							<rect x="25469.5" y="60.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
-							<path d="M25469.5 91.5 L25666.5 91.5" fill="none" data-name="IAppDelegate"></path>
-						</g>
-						<g transform="translate(25469.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25469.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
-							<rect x="25706.5" y="22.5" height="138.0" width="301.0" data-name="AppController"></rect>
-							<path d="M25706.5 53.5 L26007.5 53.5" fill="none" data-name="AppController"></path>
-							<path d="M25706.5 114.5 L26007.5 114.5" fill="none" data-name="AppController"></path>
-						</g>
-						<g transform="translate(25706.5, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25706.5, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25706.5, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyMonitorScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="18901.3" y="2242.5" height="107.0" width="280.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M18901.3 2273.5 L19181.3 2273.5" fill="none" data-name="StudyMonitorScreen"></path>
-						</g>
-						<g transform="translate(18901.25, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
-								<text x="132.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18901.25, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorScreen">-Widget _monitorSectionHeader()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorScreen">-Widget _buildStat()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorScreen">-dynamic _onSelectParticipant()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="20160.5" y="1344.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
-							<path d="M20160.5 1375.0 L20324.5 1375.0" fill="none" data-name="StudyPageWidget"></path>
-							<path d="M20160.5 1406.0 L20324.5 1406.0" fill="none" data-name="StudyPageWidget"></path>
-						</g>
-						<g transform="translate(20160.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20160.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20160.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyMonitorTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorTable">
-							<rect x="26047.5" y="15.0" height="153.0" width="395.0" data-name="StudyMonitorTable"></rect>
-							<path d="M26047.5 46.0 L26442.5 46.0" fill="none" data-name="StudyMonitorTable"></path>
-							<path d="M26047.5 92.0 L26442.5 92.0" fill="none" data-name="StudyMonitorTable"></path>
-						</g>
-						<g transform="translate(26047.5, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorTable">
-								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorTable">StudyMonitorTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26047.5, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+studyMonitorItems: List&lt;StudyMonitorItem&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">+onSelectItem: void Function(StudyMonitorItem)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26047.5, 92)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">-List&lt;Widget&gt; _buildRow()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorTable">-String _formatTime()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorTable">-Widget _buildProgressCell()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(StudyMonitorItem)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyMonitorItem)">
-							<rect x="26109.0" y="524.0" height="31.0" width="272.0" data-name="void Function(StudyMonitorItem)"></rect>
-						</g>
-						<g transform="translate(26109, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyMonitorItem)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyMonitorItem)">
-								<text x="128.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyMonitorItem)">void Function(StudyMonitorItem)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ParticipantDetailsView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsView">
-							<rect x="26482.5" y="15.0" height="153.0" width="282.0" data-name="ParticipantDetailsView"></rect>
-							<path d="M26482.5 46.0 L26764.5 46.0" fill="none" data-name="ParticipantDetailsView"></path>
-							<path d="M26482.5 107.0 L26764.5 107.0" fill="none" data-name="ParticipantDetailsView"></path>
-						</g>
-						<g transform="translate(26482.5, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsView">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsView">ParticipantDetailsView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26482.5, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsView">+monitorItem: StudyMonitorItem</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsView">+interventions: List&lt;Intervention&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsView">+observations: List&lt;Observation&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26482.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsView">-Widget _buildPerDayStatus()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsView">-String _getTooltipText()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyMonitorItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorItem">
-							<rect x="26546.5" y="524.0" height="31.0" width="154.0" data-name="StudyMonitorItem"></rect>
-						</g>
-						<g transform="translate(26546.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorItem">
-								<text x="69.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorItem">StudyMonitorItem</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LoginForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
-							<rect x="0.0" y="2249.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
-							<path d="M0.0 2280.5 L207.0 2280.5" fill="none" data-name="LoginForm"></path>
-							<path d="M0.0 2311.5 L207.0 2311.5" fill="none" data-name="LoginForm"></path>
-						</g>
-						<g transform="translate(0, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthFormKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
-							<rect x="1100.0" y="3088.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
-							<path d="M1100.0 3119.0 L1455.0 3119.0" fill="none" data-name="AuthFormKey"></path>
-						</g>
-						<g transform="translate(1100, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
-								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1100, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerRefWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="690.8" y="1375.0" height="31.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
-						</g>
-						<g transform="translate(690.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordRecoveryForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
-							<rect x="572.5" y="2249.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
-							<path d="M572.5 2280.5 L780.5 2280.5" fill="none" data-name="PasswordRecoveryForm"></path>
-							<path d="M572.5 2311.5 L780.5 2311.5" fill="none" data-name="PasswordRecoveryForm"></path>
-						</g>
-						<g transform="translate(572.5, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(572.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(572.5, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordForgotForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
-							<rect x="820.5" y="2249.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
-							<path d="M820.5 2280.5 L1027.5 2280.5" fill="none" data-name="PasswordForgotForm"></path>
-							<path d="M820.5 2311.5 L1027.5 2311.5" fill="none" data-name="PasswordForgotForm"></path>
-						</g>
-						<g transform="translate(820.5, 2249.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(820.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(820.5, 2311.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SignupForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
-							<rect x="1067.5" y="2234.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
-							<path d="M1067.5 2265.5 L1345.5 2265.5" fill="none" data-name="SignupForm"></path>
-							<path d="M1067.5 2296.5 L1345.5 2296.5" fill="none" data-name="SignupForm"></path>
-						</g>
-						<g transform="translate(1067.5, 2234.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
-								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1067.5, 2265.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1067.5, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
-							<rect x="1256.0" y="1329.5" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
-							<path d="M1256.0 1360.5 L1515.0 1360.5" fill="none" data-name="AuthScaffold"></path>
-						</g>
-						<g transform="translate(1256, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1256, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="14594.8" y="2280.5" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(14594.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EdgeInsets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="3931.8" y="2280.5" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
-						</g>
-						<g transform="translate(3931.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EmailTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
-							<rect x="1689.5" y="2242.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
-							<path d="M1689.5 2273.5 L2010.5 2273.5" fill="none" data-name="EmailTextField"></path>
-						</g>
-						<g transform="translate(1689.5, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1689.5, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="32934.0" y="3156.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(32934, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
-							<rect x="2050.5" y="2235.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
-							<path d="M2050.5 2266.0 L2529.5 2266.0" fill="none" data-name="PasswordTextField"></path>
-						</g>
-						<g transform="translate(2050.5, 2235)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2050.5, 2266)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<rect x="270.8" y="3156.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(270.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUJobsToBeDone">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
-							<rect x="26846.5" y="60.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
-							<path d="M26846.5 91.5 L27040.5 91.5" fill="none" data-name="StudyUJobsToBeDone"></path>
-						</g>
-						<g transform="translate(26846.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26846.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthFormController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
-							<rect x="35940.0" y="2039.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
-							<path d="M35940.0 2070.5 L36790.0 2070.5" fill="none" data-name="AuthFormController"></path>
-							<path d="M35940.0 2326.5 L36790.0 2326.5" fill="none" data-name="AuthFormController"></path>
-						</g>
-						<g transform="translate(35940, 2039.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
-								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35940, 2070.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35940, 2326.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="31225.5" y="3156.0" height="31.0" width="142.0" data-name="IAuthRepository"></rect>
-						</g>
-						<g transform="translate(31225.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="INotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="16369.5" y="3156.0" height="31.0" width="168.0" data-name="INotificationService"></rect>
-						</g>
-						<g transform="translate(16369.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="34511.8" y="3156.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(34511.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="39422.8" y="3156.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(39422.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormGroupController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="38464.0" y="60.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
-							<path d="M38464.0 91.5 L38651.0 91.5" fill="none" data-name="IFormGroupController"></path>
-						</g>
-						<g transform="translate(38464, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
-								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38464, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="2980.5" y="2280.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(2980.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
-							<rect x="731.0" y="3118.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
-							<path d="M731.0 3149.0 L1010.0 3149.0" fill="none" data-name="AppStatus"></path>
-						</g>
-						<g transform="translate(731, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
-								
-							</g>
-						</g>
-						<g transform="translate(731, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArrayTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
-							<rect x="2601.5" y="1194.0" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
-							<path d="M2601.5 1225.0 L3091.5 1225.0" fill="none" data-name="FormArrayTable"></path>
-							<path d="M2601.5 1526.0 L3091.5 1526.0" fill="none" data-name="FormArrayTable"></path>
-						</g>
-						<g transform="translate(2601.5, 1194)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
-								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2601.5, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2601.5, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="10406.3" y="3156.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(10406.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="1505.5" y="2280.5" height="31.0" width="144.0" data-name="void Function(T)"></rect>
-						</g>
-						<g transform="translate(1505.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<rect x="2569.5" y="2280.5" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
-						</g>
-						<g transform="translate(2569.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="17375.8" y="2280.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(17375.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="String Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
-							<rect x="4076.8" y="2280.5" height="31.0" width="157.0" data-name="String Function(T)"></rect>
-						</g>
-						<g transform="translate(4076.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="16444.0" y="2280.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(16444, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
-							<rect x="4273.8" y="2280.5" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
-						</g>
-						<g transform="translate(4273.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
-								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="42628.0" y="1359.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
-							<path d="M42628.0 1390.5 L43024.0 1390.5" fill="none" data-name="ManagedFormViewModel"></path>
-						</g>
-						<g transform="translate(42628, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(42628, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="43779.0" y="223.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
-							<path d="M43779.0 254.0 L44651.0 254.0" fill="none" data-name="FormViewModel"></path>
-							<path d="M43779.0 570.0 L44651.0 570.0" fill="none" data-name="FormViewModel"></path>
-						</g>
-						<g transform="translate(43779, 223)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43779, 254)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43779, 570)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
-							<rect x="26740.5" y="524.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
-						</g>
-						<g transform="translate(26740.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Exception">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="27122.5" y="76.0" height="31.0" width="94.0" data-name="Exception"></rect>
-						</g>
-						<g transform="translate(27122.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="39787.8" y="3378.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
-							<path d="M39787.8 3409.0 L40068.8 3409.0" fill="none" data-name="FormViewModelCollection"></path>
-							<path d="M39787.8 3500.0 L40068.8 3500.0" fill="none" data-name="FormViewModelCollection"></path>
-						</g>
-						<g transform="translate(39787.75, 3378)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39787.75, 3409)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39787.75, 3500)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="38775.3" y="3691.0" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(38775.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomFormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
-							<rect x="32784.0" y="3430.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
-							<path d="M32784.0 3461.5 L33197.0 3461.5" fill="none" data-name="CustomFormControl"></path>
-							<path d="M32784.0 3567.5 L33197.0 3567.5" fill="none" data-name="CustomFormControl"></path>
-						</g>
-						<g transform="translate(32784, 3430.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32784, 3461.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32784, 3567.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Debouncer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="41566.5" y="3691.0" height="31.0" width="103.0" data-name="Debouncer"></rect>
-						</g>
-						<g transform="translate(41566.5, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(T?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
-							<rect x="31666.3" y="3691.0" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
-						</g>
-						<g transform="translate(31666.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(ControlStatus)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
-							<rect x="31870.3" y="3691.0" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
-						</g>
-						<g transform="translate(31870.25, 3691)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="UnsavedChangesDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
-							<rect x="44285.0" y="60.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
-							<path d="M44285.0 91.5 L44492.0 91.5" fill="none" data-name="UnsavedChangesDialog"></path>
-						</g>
-						<g transform="translate(44285, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44285, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormValidationSetEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
-							<rect x="43429.0" y="1009.5" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
-						</g>
-						<g transform="translate(43429, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
-								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControlValidation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
-							<rect x="5321.8" y="2227.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
-							<path d="M5321.8 2258.0 L5806.8 2258.0" fill="none" data-name="FormControlValidation"></path>
-							<path d="M5321.8 2334.0 L5806.8 2334.0" fill="none" data-name="FormControlValidation"></path>
-						</g>
-						<g transform="translate(5321.75, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
-								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5321.75, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5321.75, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="27302.5" y="493.0" height="93.0" width="163.0" data-name="IFormData"></rect>
-							<path d="M27302.5 524.0 L27465.5 524.0" fill="none" data-name="IFormData"></path>
-							<path d="M27302.5 555.0 L27465.5 555.0" fill="none" data-name="IFormData"></path>
-						</g>
-						<g transform="translate(27302.5, 493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27302.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27302.5, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormInvalidException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
-							<rect x="27076.5" y="524.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
-						</g>
-						<g transform="translate(27076.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConfigException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
-							<rect x="35104.3" y="508.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
-							<path d="M35104.3 539.5 L35289.3 539.5" fill="none" data-name="FormConfigException"></path>
-						</g>
-						<g transform="translate(35104.25, 508.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
-								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35104.25, 539.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="43987.3" y="986.5" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-							<path d="M43987.3 1017.5 L44204.3 1017.5" fill="none" data-name="IFormViewModelDelegate"></path>
-						</g>
-						<g transform="translate(43987.25, 986.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43987.25, 1017.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControlOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
-							<rect x="44691.0" y="486.0" height="107.0" width="190.0" data-name="FormControlOption"></rect>
-							<path d="M44691.0 517.0 L44881.0 517.0" fill="none" data-name="FormControlOption"></path>
-						</g>
-						<g transform="translate(44691, 486)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44691, 517)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="44738.0" y="76.0" height="31.0" width="96.0" data-name="Equatable"></rect>
-						</g>
-						<g transform="translate(44738, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
-							<rect x="28606.3" y="3110.5" height="122.0" width="282.0" data-name="FormMode"></rect>
-							<path d="M28606.3 3141.5 L28888.3 3141.5" fill="none" data-name="FormMode"></path>
-						</g>
-						<g transform="translate(28606.25, 3110.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28606.25, 3141.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CancelableOperation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="44355.8" y="1009.5" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
-						</g>
-						<g transform="translate(44355.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrolledBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="44874.0" y="45.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M44874.0 76.0 L45040.0 76.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M44874.0 107.0 L45040.0 107.0" fill="none" data-name="EnrolledBadge"></path>
-						</g>
-						<g transform="translate(44874, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44874, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44874, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRecruitController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="5846.8" y="2204.5" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M5846.8 2235.5 L6497.8 2235.5" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M5846.8 2281.5 L6497.8 2281.5" fill="none" data-name="StudyRecruitController"></path>
-						</g>
-						<g transform="translate(5846.75, 2204.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
-								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5846.75, 2235.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5846.75, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IInviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="31407.5" y="3156.0" height="31.0" width="191.0" data-name="IInviteCodeRepository"></rect>
-						</g>
-						<g transform="translate(31407.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="13835.5" y="3156.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
-						</g>
-						<g transform="translate(13835.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyBaseController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="5378.5" y="1299.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
-							<path d="M5378.5 1330.0 L5924.5 1330.0" fill="none" data-name="StudyBaseController"></path>
-							<path d="M5378.5 1406.0 L5924.5 1406.0" fill="none" data-name="StudyBaseController"></path>
-						</g>
-						<g transform="translate(5378.5, 1299)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
-								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5378.5, 1330)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5378.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="7304.3" y="1375.0" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
-						</g>
-						<g transform="translate(7304.25, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRecruitScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="19221.3" y="2242.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M19221.3 2273.5 L19535.3 2273.5" fill="none" data-name="StudyRecruitScreen"></path>
-						</g>
-						<g transform="translate(19221.25, 2242.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19221.25, 2273.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
-							<rect x="36870.0" y="1336.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
-							<path d="M36870.0 1367.5 L37308.0 1367.5" fill="none" data-name="InviteCodeFormView"></path>
-							<path d="M36870.0 1398.5 L37308.0 1398.5" fill="none" data-name="InviteCodeFormView"></path>
-						</g>
-						<g transform="translate(36870, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
-								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36870, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36870, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="42388.8" y="2107.0" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M42388.8 2138.0 L43055.8 2138.0" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M42388.8 2364.0 L43055.8 2364.0" fill="none" data-name="InviteCodeFormViewModel"></path>
-						</g>
-						<g transform="translate(42388.75, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
-								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(42388.75, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(42388.75, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="39272.0" y="524.0" height="31.0" width="192.0" data-name="FormConsumerWidget"></rect>
-						</g>
-						<g transform="translate(39272, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInvitesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="45282.8" y="0.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M45282.8 31.0 L45848.8 31.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M45282.8 137.0 L45848.8 137.0" fill="none" data-name="StudyInvitesTable"></path>
-						</g>
-						<g transform="translate(45282.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
-								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45282.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45282.75, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="45086.5" y="524.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(45086.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="45348.5" y="524.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(45348.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention? Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="45808.5" y="524.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
-						</g>
-						<g transform="translate(45808.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="int Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="46099.5" y="524.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(46099.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="40709.3" y="3156.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(40709.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PublishSuccessDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
-							<rect x="19575.3" y="2265.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
-							<path d="M19575.3 2296.0 L19766.3 2296.0" fill="none" data-name="PublishSuccessDialog"></path>
-						</g>
-						<g transform="translate(19575.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19575.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PublishDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
-							<rect x="20555.3" y="2265.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
-							<path d="M20555.3 2296.0 L20691.3 2296.0" fill="none" data-name="PublishDialog"></path>
-						</g>
-						<g transform="translate(20555.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20555.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PublishConfirmationDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
-							<rect x="20731.3" y="2265.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
-							<path d="M20731.3 2296.0 L20955.3 2296.0" fill="none" data-name="PublishConfirmationDialog"></path>
-						</g>
-						<g transform="translate(20731.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20731.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FrameControlsWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
-							<rect x="11955.5" y="1329.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
-							<path d="M11955.5 1360.0 L12246.5 1360.0" fill="none" data-name="FrameControlsWidget"></path>
-							<path d="M11955.5 1421.0 L12246.5 1421.0" fill="none" data-name="FrameControlsWidget"></path>
-						</g>
-						<g transform="translate(11955.5, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11955.5, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11955.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="17783.0" y="1009.5" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(17783, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyStatusBadgeViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
-							<rect x="8340.3" y="1352.0" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
-							<path d="M8340.3 1383.0 L8625.3 1383.0" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
-						</g>
-						<g transform="translate(8340.25, 1352)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8340.25, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="9829.3" y="2280.5" height="31.0" width="114.0" data-name="Participation"></rect>
-						</g>
-						<g transform="translate(9829.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
-							<rect x="8641.0" y="2280.5" height="31.0" width="111.0" data-name="StudyStatus"></rect>
-						</g>
-						<g transform="translate(8641, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
-								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyStatusBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
-							<rect x="8665.3" y="1314.0" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
-							<path d="M8665.3 1345.0 L8906.3 1345.0" fill="none" data-name="StudyStatusBadge"></path>
-							<path d="M8665.3 1436.0 L8906.3 1436.0" fill="none" data-name="StudyStatusBadge"></path>
-						</g>
-						<g transform="translate(8665.25, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8665.25, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8665.25, 1436)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="11459.3" y="2280.5" height="31.0" width="106.0" data-name="BadgeType"></rect>
-						</g>
-						<g transform="translate(11459.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RouteInformation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
-							<rect x="8792.0" y="2227.0" height="138.0" width="152.0" data-name="RouteInformation"></rect>
-							<path d="M8792.0 2258.0 L8944.0 2258.0" fill="none" data-name="RouteInformation"></path>
-							<path d="M8792.0 2334.0 L8944.0 2334.0" fill="none" data-name="RouteInformation"></path>
-						</g>
-						<g transform="translate(8792, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8792, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8792, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
-							<rect x="8946.3" y="1261.5" height="258.0" width="302.0" data-name="PlatformController"></rect>
-							<path d="M8946.3 1292.5 L9248.3 1292.5" fill="none" data-name="PlatformController"></path>
-							<path d="M8946.3 1383.5 L9248.3 1383.5" fill="none" data-name="PlatformController"></path>
-						</g>
-						<g transform="translate(8946.25, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
-								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8946.25, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8946.25, 1383.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WebController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
-							<rect x="9983.3" y="2197.0" height="198.0" width="273.0" data-name="WebController"></rect>
-							<path d="M9983.3 2228.0 L10256.3 2228.0" fill="none" data-name="WebController"></path>
-							<path d="M9983.3 2259.0 L10256.3 2259.0" fill="none" data-name="WebController"></path>
-						</g>
-						<g transform="translate(9983.25, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
-								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9983.25, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9983.25, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFrameElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
-							<rect x="11139.8" y="3156.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
-						</g>
-						<g transform="translate(11139.75, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MobileController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
-							<rect x="10296.3" y="2212.5" height="167.0" width="191.0" data-name="MobileController"></rect>
-							<path d="M10296.3 2243.5 L10487.3 2243.5" fill="none" data-name="MobileController"></path>
-						</g>
-						<g transform="translate(10296.25, 2212.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10296.25, 2243.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
-							<rect x="4628.8" y="2182.0" height="228.0" width="573.0" data-name="StudyController"></rect>
-							<path d="M4628.8 2213.0 L5201.8 2213.0" fill="none" data-name="StudyController"></path>
-							<path d="M4628.8 2274.0 L5201.8 2274.0" fill="none" data-name="StudyController"></path>
-						</g>
-						<g transform="translate(4628.75, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
-								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4628.75, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4628.75, 2274)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyNavViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
-							<rect x="9288.3" y="1322.0" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
-							<path d="M9288.3 1353.0 L9529.3 1353.0" fill="none" data-name="IStudyNavViewModel"></path>
-						</g>
-						<g transform="translate(9288.25, 1322)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9288.25, 1353)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
-							<rect x="45975.0" y="23.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
-							<path d="M45975.0 54.0 L46208.0 54.0" fill="none" data-name="StudyNav"></path>
-						</g>
-						<g transform="translate(45975, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45975, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
-							<rect x="46248.0" y="23.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
-							<path d="M46248.0 54.0 L46536.0 54.0" fill="none" data-name="StudyDesignNav"></path>
-						</g>
-						<g transform="translate(46248, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
-								
-							</g>
-						</g>
-						<g transform="translate(46248, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IWithBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="21363.8" y="1009.5" height="31.0" width="113.0" data-name="IWithBanner"></rect>
-						</g>
-						<g transform="translate(21363.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyParticipationBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
-							<rect x="9569.3" y="1321.5" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
-							<path d="M9569.3 1352.5 L9800.3 1352.5" fill="none" data-name="StudyParticipationBadge"></path>
-							<path d="M9569.3 1428.5 L9800.3 1428.5" fill="none" data-name="StudyParticipationBadge"></path>
-						</g>
-						<g transform="translate(9569.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9569.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9569.25, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="33316.0" y="3156.0" height="31.0" width="151.0" data-name="IStudyRepository"></rect>
-						</g>
-						<g transform="translate(33316, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PreviewFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
-							<rect x="46576.0" y="45.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
-							<path d="M46576.0 76.5 L46867.0 76.5" fill="none" data-name="PreviewFrame"></path>
-						</g>
-						<g transform="translate(46576, 45.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(46576, 76.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="46629.5" y="524.0" height="31.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(46629.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyAppBarViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
-							<rect x="9091.0" y="2250.0" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
-							<path d="M9091.0 2281.0 L9334.0 2281.0" fill="none" data-name="IStudyAppBarViewModel"></path>
-						</g>
-						<g transform="translate(9091, 2250)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9091, 2281)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
-							<rect x="25015.5" y="904.0" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
-							<path d="M25015.5 935.0 L25350.5 935.0" fill="none" data-name="StudyScaffold"></path>
-						</g>
-						<g transform="translate(25015.5, 904)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
-								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25015.5, 935)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NavbarTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="25085.8" y="1375.0" height="31.0" width="103.0" data-name="NavbarTab"></rect>
-						</g>
-						<g transform="translate(25085.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SingleColumnLayoutType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="25268.8" y="1375.0" height="31.0" width="218.0" data-name="SingleColumnLayoutType"></rect>
-						</g>
-						<g transform="translate(25268.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WebFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
-							<rect x="46907.0" y="37.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
-							<path d="M46907.0 68.5 L47076.0 68.5" fill="none" data-name="WebFrame"></path>
-							<path d="M46907.0 114.5 L47076.0 114.5" fill="none" data-name="WebFrame"></path>
-						</g>
-						<g transform="translate(46907, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(46907, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(46907, 114.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DisabledFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
-							<rect x="47116.0" y="60.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
-							<path d="M47116.0 91.5 L47252.0 91.5" fill="none" data-name="DisabledFrame"></path>
-						</g>
-						<g transform="translate(47116, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47116, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PhoneContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
-							<rect x="10560.5" y="1284.0" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
-							<path d="M10560.5 1315.0 L10887.5 1315.0" fill="none" data-name="PhoneContainer"></path>
-							<path d="M10560.5 1466.0 L10887.5 1466.0" fill="none" data-name="PhoneContainer"></path>
-						</g>
-						<g transform="translate(10560.5, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
-								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10560.5, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10560.5, 1466)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="21235.3" y="2280.5" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(21235.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MobileFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
-							<rect x="47292.0" y="60.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
-							<path d="M47292.0 91.5 L47428.0 91.5" fill="none" data-name="MobileFrame"></path>
-						</g>
-						<g transform="translate(47292, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47292, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DesktopFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
-							<rect x="47468.0" y="60.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
-							<path d="M47468.0 91.5 L47604.0 91.5" fill="none" data-name="DesktopFrame"></path>
-						</g>
-						<g transform="translate(47468, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47468, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTestScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
-							<rect x="20995.3" y="2219.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
-							<path d="M20995.3 2250.5 L21195.3 2250.5" fill="none" data-name="StudyTestScreen"></path>
-							<path d="M20995.3 2281.5 L21195.3 2281.5" fill="none" data-name="StudyTestScreen"></path>
-						</g>
-						<g transform="translate(20995.25, 2219.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
-								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20995.25, 2250.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20995.25, 2281.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySettingsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="44379.3" y="2167.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M44379.3 2198.0 L44858.3 2198.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M44379.3 2334.0 L44858.3 2334.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-						</g>
-						<g transform="translate(44379.25, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44379.25, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44379.25, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="44440.0" y="3156.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
-						</g>
-						<g transform="translate(44440, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="21333.3" y="2265.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M21333.3 2296.0 L21508.3 2296.0" fill="none" data-name="StudySettingsDialog"></path>
-						</g>
-						<g transform="translate(21333.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
-								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21333.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTestController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
-							<rect x="6913.8" y="2257.5" height="77.0" width="282.0" data-name="StudyTestController"></rect>
-							<path d="M6913.8 2288.5 L7195.8 2288.5" fill="none" data-name="StudyTestController"></path>
-						</g>
-						<g transform="translate(6913.75, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6913.75, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TestAppRoutes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
-							<rect x="47644.0" y="23.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
-							<path d="M47644.0 54.0 L47904.0 54.0" fill="none" data-name="TestAppRoutes"></path>
-						</g>
-						<g transform="translate(47644, 23)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47644, 54)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
-								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
-							<rect x="25704.3" y="926.0" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
-							<path d="M25704.3 957.0 L26149.3 957.0" fill="none" data-name="DrawerEntry"></path>
-							<path d="M25704.3 1093.0 L26149.3 1093.0" fill="none" data-name="DrawerEntry"></path>
-						</g>
-						<g transform="translate(25704.25, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
-								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25704.25, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DrawerEntry">+localizedHelpText: String Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DrawerEntry">+enabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DrawerEntry">+onSelected: void Function(BuildContext, WidgetRef)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DrawerEntry">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DrawerEntry">+title: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DrawerEntry">+helpText: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25704.25, 1093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="String Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
-							<rect x="25526.8" y="1375.0" height="31.0" width="147.0" data-name="String Function()"></rect>
-						</g>
-						<g transform="translate(25526.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
-								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="String Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
-							<rect x="26174.8" y="1375.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
-						</g>
-						<g transform="translate(26174.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(BuildContext, WidgetRef)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
-							<rect x="26371.8" y="1375.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
-						</g>
-						<g transform="translate(26371.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
-								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouterDrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
-							<rect x="26747.8" y="1336.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
-							<path d="M26747.8 1367.5 L27011.8 1367.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-							<path d="M26747.8 1413.5 L27011.8 1413.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-						</g>
-						<g transform="translate(26747.75, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26747.75, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26747.75, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="27936.8" y="2280.5" height="31.0" width="122.0" data-name="RoutingIntent"></rect>
-						</g>
-						<g transform="translate(27936.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppDrawer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
-							<rect x="47944.0" y="8.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
-							<path d="M47944.0 39.0 L48213.0 39.0" fill="none" data-name="AppDrawer"></path>
-						</g>
-						<g transform="translate(47944, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
-								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47944, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppDrawer">+leftPaddingEntries: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppDrawer">+logoPaddingVertical: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppDrawer">+logoPaddingHorizontal: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AppDrawer">+logoMaxHeight: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AppDrawer">+logoSectionMinHeight: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AppDrawer">+logoSectionMaxHeight: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyAnalyzeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
-							<rect x="22575.3" y="2257.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
-							<path d="M22575.3 2288.5 L22755.3 2288.5" fill="none" data-name="StudyAnalyzeScreen"></path>
-						</g>
-						<g transform="translate(22575.25, 2257.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22575.25, 2288.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyAnalyzeController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
-							<rect x="7235.8" y="2265.0" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
-							<path d="M7235.8 2296.0 L7436.8 2296.0" fill="none" data-name="StudyAnalyzeController"></path>
-						</g>
-						<g transform="translate(7235.75, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
-								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7235.75, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignInterventionsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="14045.5" y="3140.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M14045.5 3171.5 L14341.5 3171.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
-						</g>
-						<g transform="translate(14045.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14045.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="22795.3" y="2265.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M22795.3 2296.0 L23007.3 2296.0" fill="none" data-name="StudyDesignPageWidget"></path>
-						</g>
-						<g transform="translate(22795.25, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22795.25, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="12656.5" y="1359.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M12656.5 1390.5 L13031.5 1390.5" fill="none" data-name="InterventionFormView"></path>
-						</g>
-						<g transform="translate(12656.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
-								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12656.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="28098.8" y="2062.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M28098.8 2093.0 L28953.8 2093.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M28098.8 2319.0 L28953.8 2319.0" fill="none" data-name="InterventionFormViewModel"></path>
-						</g>
-						<g transform="translate(28098.75, 2062)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
-								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28098.75, 2093)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28098.75, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="12286.5" y="1344.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M12286.5 1375.0 L12616.5 1375.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M12286.5 1406.0 L12616.5 1406.0" fill="none" data-name="InterventionPreview"></path>
-						</g>
-						<g transform="translate(12286.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12286.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12286.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="11186.3" y="2280.5" height="31.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(11186.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="37547.5" y="971.0" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M37547.5 1002.0 L37906.5 1002.0" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M37547.5 1033.0 L37906.5 1033.0" fill="none" data-name="StudyScheduleFormView"></path>
-						</g>
-						<g transform="translate(37547.5, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37547.5, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37547.5, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="37348.0" y="1194.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M37348.0 1225.0 L38106.0 1225.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M37348.0 1526.0 L38106.0 1526.0" fill="none" data-name="StudyScheduleControls"></path>
-						</g>
-						<g transform="translate(37348, 1194)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
-								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37348, 1225)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37348, 1526)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="35386.0" y="1306.5" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M35386.0 1337.5 L35676.0 1337.5" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M35386.0 1428.5 L35676.0 1428.5" fill="none" data-name="InterventionTaskFormData"></path>
-						</g>
-						<g transform="translate(35386, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35386, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35386, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="35602.3" y="941.0" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M35602.3 972.0 L35900.3 972.0" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M35602.3 1078.0 L35900.3 1078.0" fill="none" data-name="IFormDataWithSchedule"></path>
-						</g>
-						<g transform="translate(35602.25, 941)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35602.25, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35602.25, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="38040.3" y="2107.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M38040.3 2138.0 L38879.3 2138.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M38040.3 2289.0 L38879.3 2289.0" fill="none" data-name="InterventionsFormViewModel"></path>
-						</g>
-						<g transform="translate(38040.25, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
-								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38040.25, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38040.25, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="14493.5" y="1375.0" height="31.0" width="164.0" data-name="IListActionProvider"></rect>
-						</g>
-						<g transform="translate(14493.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="29760.8" y="1009.5" height="31.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-						</g>
-						<g transform="translate(29760.75, 1009.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="31116.5" y="2159.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M31116.5 2190.5 L31812.5 2190.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M31116.5 2371.5 L31812.5 2371.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-						</g>
-						<g transform="translate(31116.5, 2159.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31116.5, 2190.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31116.5, 2371.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="42041.3" y="1239.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M42041.3 1270.0 L42536.3 1270.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M42041.3 1496.0 L42536.3 1496.0" fill="none" data-name="WithScheduleControls"></path>
-						</g>
-						<g transform="translate(42041.25, 1239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(42041.25, 1270)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(42041.25, 1496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PhaseSequence">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="27885.3" y="3156.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
-						</g>
-						<g transform="translate(27885.25, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
-								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="7.8" y="926.0" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M7.8 957.0 L389.8 957.0" fill="none" data-name="InterventionFormData"></path>
-							<path d="M7.8 1078.0 L389.8 1078.0" fill="none" data-name="InterventionFormData"></path>
-						</g>
-						<g transform="translate(7.75, 926)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7.75, 957)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7.75, 1078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="6537.8" y="2197.0" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M6537.8 2228.0 L6833.8 2228.0" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M6537.8 2334.0 L6833.8 2334.0" fill="none" data-name="StudyScheduleFormData"></path>
-						</g>
-						<g transform="translate(6537.75, 2197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6537.75, 2228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6537.75, 2334)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="9091.5" y="994.0" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M9091.5 1025.0 L9234.5 1025.0" fill="none" data-name="IStudyFormData"></path>
-						</g>
-						<g transform="translate(9091.5, 994)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9091.5, 1025)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="15127.5" y="1359.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M15127.5 1390.5 L15540.5 1390.5" fill="none" data-name="InterventionTaskFormView"></path>
-						</g>
-						<g transform="translate(15127.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15127.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="7528.3" y="1321.5" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M7528.3 1352.5 L7922.3 1352.5" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M7528.3 1413.5 L7922.3 1413.5" fill="none" data-name="InterventionsFormData"></path>
-						</g>
-						<g transform="translate(7528.25, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7528.25, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7528.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignReportsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="14834.5" y="3133.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M14834.5 3164.0 L15227.5 3164.0" fill="none" data-name="StudyDesignReportsFormView"></path>
-						</g>
-						<g transform="translate(14834.5, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14834.5, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="429.8" y="956.0" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M429.8 987.0 L743.8 987.0" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M429.8 1048.0 L743.8 1048.0" fill="none" data-name="ReportItemFormData"></path>
-						</g>
-						<g transform="translate(429.75, 956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(429.75, 987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(429.75, 1048)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="522.8" y="1375.0" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(522.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="19806.3" y="2227.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M19806.3 2258.0 L20515.3 2258.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M19806.3 2319.0 L20515.3 2319.0" fill="none" data-name="DataReferenceEditor"></path>
-						</g>
-						<g transform="translate(19806.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19806.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19806.25, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="13256.5" y="3156.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
-						</g>
-						<g transform="translate(13256.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="16364.5" y="1284.0" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M16364.5 1315.0 L16812.5 1315.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M16364.5 1421.0 L16812.5 1421.0" fill="none" data-name="TemporalAggregationFormatted"></path>
-						</g>
-						<g transform="translate(16364.5, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16364.5, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16364.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="17559.8" y="2280.5" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
-						</g>
-						<g transform="translate(17559.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="17476.5" y="1284.0" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M17476.5 1315.0 L17927.5 1315.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M17476.5 1421.0 L17927.5 1421.0" fill="none" data-name="ImprovementDirectionFormatted"></path>
-						</g>
-						<g transform="translate(17476.5, 1284)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17476.5, 1315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17476.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="18439.8" y="2280.5" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
-						</g>
-						<g transform="translate(18439.75, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="9933.3" y="3118.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M9933.3 3149.0 L10316.3 3149.0" fill="none" data-name="ReportSectionType"></path>
-						</g>
-						<g transform="translate(9933.25, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9933.25, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="13071.5" y="1329.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M13071.5 1360.0 L13550.5 1360.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M13071.5 1421.0 L13550.5 1421.0" fill="none" data-name="AverageSectionFormView"></path>
-						</g>
-						<g transform="translate(13071.5, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13071.5, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13071.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="21548.3" y="2009.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M21548.3 2040.5 L22535.3 2040.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M21548.3 2476.5 L22535.3 2476.5" fill="none" data-name="ReportItemFormViewModel"></path>
-						</g>
-						<g transform="translate(21548.25, 2009.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
-								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21548.25, 2040.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21548.25, 2476.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="48218.5" y="493.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M48218.5 524.0 L48422.5 524.0" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M48218.5 555.0 L48422.5 555.0" fill="none" data-name="DataReferenceIdentifier"></path>
-						</g>
-						<g transform="translate(48218.5, 493)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
-								
-							</g>
-						</g>
-						<g transform="translate(48218.5, 524)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(48218.5, 555)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="48253.0" y="76.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(48253, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="13590.5" y="1329.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M13590.5 1360.0 L14069.5 1360.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M13590.5 1421.0 L14069.5 1421.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-						</g>
-						<g transform="translate(13590.5, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13590.5, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13590.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="22375.0" y="1306.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M22375.0 1337.5 L22842.0 1337.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M22375.0 1413.5 L22842.0 1413.5" fill="none" data-name="ReportItemFormView"></path>
-						</g>
-						<g transform="translate(22375, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
-								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22375, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22375, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="23047.3" y="2280.5" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
-						</g>
-						<g transform="translate(23047.25, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="43135.8" y="2122.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M43135.8 2153.0 L43995.8 2153.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M43135.8 2319.0 L43995.8 2319.0" fill="none" data-name="ReportsFormViewModel"></path>
-						</g>
-						<g transform="translate(43135.75, 2122)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
-								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43135.75, 2153)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43135.75, 2319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportFormItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="38539.8" y="3065.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M38539.8 3096.0 L39382.8 3096.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M38539.8 3172.0 L39382.8 3172.0" fill="none" data-name="ReportFormItemDelegate"></path>
-						</g>
-						<g transform="translate(38539.75, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
-								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38539.75, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38539.75, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="23346.8" y="1321.5" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M23346.8 1352.5 L23543.8 1352.5" fill="none" data-name="ReportBadge"></path>
-							<path d="M23346.8 1428.5 L23543.8 1428.5" fill="none" data-name="ReportBadge"></path>
-						</g>
-						<g transform="translate(23346.75, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23346.75, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23346.75, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="12493.5" y="3118.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M12493.5 3149.0 L12794.5 3149.0" fill="none" data-name="ReportStatus"></path>
-						</g>
-						<g transform="translate(12493.5, 3118)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12493.5, 3149)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="7962.3" y="1329.0" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M7962.3 1360.0 L8300.3 1360.0" fill="none" data-name="ReportsFormData"></path>
-							<path d="M7962.3 1406.0 L8300.3 1406.0" fill="none" data-name="ReportsFormData"></path>
-						</g>
-						<g transform="translate(7962.25, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7962.25, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7962.25, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="45058.3" y="2054.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M45058.3 2085.5 L45754.3 2085.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M45058.3 2491.5 L45754.3 2491.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-						</g>
-						<g transform="translate(45058.25, 2054.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45058.25, 2085.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45058.25, 2491.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignInfoFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="15267.5" y="3140.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M15267.5 3171.5 L15490.5 3171.5" fill="none" data-name="StudyDesignInfoFormView"></path>
-						</g>
-						<g transform="translate(15267.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15267.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="10066.5" y="1306.5" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M10066.5 1337.5 L10480.5 1337.5" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M10066.5 1428.5 L10480.5 1428.5" fill="none" data-name="StudyInfoFormData"></path>
-						</g>
-						<g transform="translate(10066.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10066.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10066.5, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyContactInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="10527.3" y="2182.0" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M10527.3 2213.0 L10875.3 2213.0" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M10527.3 2364.0 L10875.3 2364.0" fill="none" data-name="StudyContactInfoFormData"></path>
-						</g>
-						<g transform="translate(10527.25, 2182)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
-								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10527.25, 2213)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10527.25, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormValidationSet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="1545.0" y="3133.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M1545.0 3164.0 L1932.0 3164.0" fill="none" data-name="StudyFormValidationSet"></path>
-						</g>
-						<g transform="translate(1545, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
-								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1545, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="10927.5" y="1329.0" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M10927.5 1360.0 L11421.5 1360.0" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M10927.5 1406.0 L11421.5 1406.0" fill="none" data-name="MeasurementsFormData"></path>
-						</g>
-						<g transform="translate(10927.5, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
-								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10927.5, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10927.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="24601.8" y="1359.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M24601.8 1390.5 L25045.8 1390.5" fill="none" data-name="MeasurementSurveyFormView"></path>
-						</g>
-						<g transform="translate(24601.75, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24601.75, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="32925.3" y="2084.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M32925.3 2115.5 L33621.3 2115.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M32925.3 2341.5 L33621.3 2341.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-						</g>
-						<g transform="translate(32925.25, 2084.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32925.25, 2115.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32925.25, 2341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="14109.5" y="1344.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M14109.5 1375.0 L14453.5 1375.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M14109.5 1406.0 L14453.5 1406.0" fill="none" data-name="SurveyPreview"></path>
-						</g>
-						<g transform="translate(14109.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14109.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14109.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="14158.0" y="2280.5" height="31.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(14158, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="35716.0" y="1291.5" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M35716.0 1322.5 L36125.0 1322.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M35716.0 1443.5 L36125.0 1443.5" fill="none" data-name="MeasurementSurveyFormData"></path>
-						</g>
-						<g transform="translate(35716, 1291.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35716, 1322.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35716, 1443.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="25219.5" y="2227.0" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M25219.5 2258.0 L25587.5 2258.0" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M25219.5 2304.0 L25587.5 2304.0" fill="none" data-name="QuestionnaireFormData"></path>
-						</g>
-						<g transform="translate(25219.5, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25219.5, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25219.5, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="39299.3" y="1261.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M39299.3 1292.5 L39931.3 1292.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M39299.3 1398.5 L39931.3 1398.5" fill="none" data-name="WithQuestionnaireControls"></path>
-						</g>
-						<g transform="translate(39299.25, 1261.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39299.25, 1292.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39299.25, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignMeasurementsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="15530.5" y="3140.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M15530.5 3171.5 L15840.5 3171.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
-						</g>
-						<g transform="translate(15530.5, 3140.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15530.5, 3171.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="39675.3" y="2114.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M39675.3 2145.5 L40767.3 2145.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M39675.3 2296.5 L40767.3 2296.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-						</g>
-						<g transform="translate(39675.25, 2114.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
-								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39675.25, 2145.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39675.25, 2296.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="14699.5" y="1329.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M14699.5 1360.0 L15087.5 1360.0" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M14699.5 1421.0 L15087.5 1421.0" fill="none" data-name="StudyFormScaffold"></path>
-						</g>
-						<g transform="translate(14699.5, 1329)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14699.5, 1360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14699.5, 1421)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="T Function(WidgetRef)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="16571.0" y="2280.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
-						</g>
-						<g transform="translate(16571, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="16894.5" y="2280.5" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
-						</g>
-						<g transform="translate(16894.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="34101.3" y="2167.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M34101.3 2198.0 L34797.3 2198.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M34101.3 2364.0 L34797.3 2364.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-						</g>
-						<g transform="translate(34101.25, 2167)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34101.25, 2198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34101.25, 2364)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignEnrollmentFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="15880.5" y="3125.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M15880.5 3156.5 L16329.5 3156.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
-						</g>
-						<g transform="translate(15880.5, 3125.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15880.5, 3156.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScreenerQuestionLogicFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="29250.0" y="2265.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M29250.0 2296.0 L29582.0 2296.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
-						</g>
-						<g transform="translate(29250, 2265)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29250, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionLogicFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="41789.3" y="2227.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M41789.3 2258.0 L42213.3 2258.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M41789.3 2289.0 L42213.3 2289.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-						</g>
-						<g transform="translate(41789.25, 2227)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
-								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41789.25, 2258)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41789.25, 2289)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="31638.5" y="3005.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M31638.5 3036.0 L32200.5 3036.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M31638.5 3217.0 L32200.5 3217.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(31638.5, 3005)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
-								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31638.5, 3036)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31638.5, 3217)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="26753.8" y="941.0" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M26753.8 972.0 L27011.8 972.0" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M26753.8 1063.0 L27011.8 1063.0" fill="none" data-name="ConsentItemFormData"></path>
-						</g>
-						<g transform="translate(26753.75, 941)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26753.75, 972)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26753.75, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="25713.8" y="1359.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M25713.8 1390.5 L26094.8 1390.5" fill="none" data-name="ConsentItemFormView"></path>
-						</g>
-						<g transform="translate(25713.75, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25713.75, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="11461.5" y="1306.5" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M11461.5 1337.5 L11915.5 1337.5" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M11461.5 1428.5 L11915.5 1428.5" fill="none" data-name="EnrollmentFormData"></path>
-						</g>
-						<g transform="translate(11461.5, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
-								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11461.5, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11461.5, 1428.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="25627.5" y="1627.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M25627.5 1658.0 L26640.5 1658.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M25627.5 2679.0 L26640.5 2679.0" fill="none" data-name="QuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(25627.5, 1627)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25627.5, 1658)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25627.5, 2679)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="40807.3" y="2047.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M40807.3 2078.0 L41709.3 2078.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M40807.3 2304.0 L41709.3 2304.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-						</g>
-						<g transform="translate(40807.25, 2047)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
-								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(40807.25, 2078)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(40807.25, 2304)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormConsentItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="34643.8" y="3065.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M34643.8 3096.0 L35443.8 3096.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M34643.8 3172.0 L35443.8 3172.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-						</g>
-						<g transform="translate(34643.75, 3065)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34643.75, 3096)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34643.75, 3172)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="45078.3" y="1209.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M45078.3 1240.0 L45774.3 1240.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M45078.3 1451.0 L45774.3 1451.0" fill="none" data-name="StudyFormViewModel"></path>
-						</g>
-						<g transform="translate(45078.25, 1209)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45078.25, 1240)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45078.25, 1451)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="32063.8" y="896.0" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M32063.8 927.0 L33231.8 927.0" fill="none" data-name="QuestionFormData"></path>
-							<path d="M32063.8 1063.0 L33231.8 1063.0" fill="none" data-name="QuestionFormData"></path>
-						</g>
-						<g transform="translate(32063.75, 896)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32063.75, 927)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32063.75, 1063)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="14381.5" y="3088.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M14381.5 3119.0 L14744.5 3119.0" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(14381.5, 3088)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14381.5, 3119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="32778.0" y="1306.5" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M32778.0 1337.5 L33122.0 1337.5" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M32778.0 1398.5 L33122.0 1398.5" fill="none" data-name="ChoiceQuestionFormData"></path>
-						</g>
-						<g transform="translate(32778, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32778, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32778, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="33162.0" y="1321.5" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M33162.0 1352.5 L33554.0 1352.5" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M33162.0 1398.5 L33554.0 1398.5" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(33162, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33162, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33162, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="33594.0" y="1321.5" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M33594.0 1352.5 L34066.0 1352.5" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M33594.0 1398.5 L34066.0 1398.5" fill="none" data-name="ImageQuestionFormData"></path>
-						</g>
-						<g transform="translate(33594, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33594, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33594, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="34106.0" y="1314.0" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M34106.0 1345.0 L34578.0 1345.0" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M34106.0 1406.0 L34578.0 1406.0" fill="none" data-name="AudioQuestionFormData"></path>
-						</g>
-						<g transform="translate(34106, 1314)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34106, 1345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34106, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="34618.0" y="1246.5" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M34618.0 1277.5 L34962.0 1277.5" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M34618.0 1473.5 L34962.0 1473.5" fill="none" data-name="ScaleQuestionFormData"></path>
-						</g>
-						<g transform="translate(34618, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34618, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34618, 1473.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="35002.0" y="1306.5" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M35002.0 1337.5 L35346.0 1337.5" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M35002.0 1413.5 L35346.0 1413.5" fill="none" data-name="FreeTextQuestionFormData"></path>
-						</g>
-						<g transform="translate(35002, 1306.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35002, 1337.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35002, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="35076.0" y="2280.5" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
-						</g>
-						<g transform="translate(35076, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="15580.5" y="1344.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M15580.5 1375.0 L15932.5 1375.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M15580.5 1406.0 L15932.5 1406.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(15580.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15580.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15580.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="15972.5" y="1321.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M15972.5 1352.5 L16324.5 1352.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M15972.5 1398.5 L16324.5 1398.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-						</g>
-						<g transform="translate(15972.5, 1321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15972.5, 1352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15972.5, 1398.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="17967.5" y="1344.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M17967.5 1375.0 L18319.5 1375.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M17967.5 1406.0 L18319.5 1406.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-						</g>
-						<g transform="translate(17967.5, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17967.5, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17967.5, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="48428.0" y="60.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M48428.0 91.5 L48737.0 91.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(48428, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(48428, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="30212.5" y="1359.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M30212.5 1390.5 L30564.5 1390.5" fill="none" data-name="ScaleQuestionFormView"></path>
-						</g>
-						<g transform="translate(30212.5, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(30212.5, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="23583.8" y="1344.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M23583.8 1375.0 L23935.8 1375.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M23583.8 1406.0 L23935.8 1406.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-						</g>
-						<g transform="translate(23583.75, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23583.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23583.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="23975.8" y="1344.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M23975.8 1375.0 L24327.8 1375.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M23975.8 1406.0 L24327.8 1406.0" fill="none" data-name="BoolQuestionFormView"></path>
-						</g>
-						<g transform="translate(23975.75, 1344)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23975.75, 1375)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23975.75, 1406)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="30684.5" y="1352.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M30684.5 1383.0 L31036.5 1383.0" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(30684.5, 1352)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(30684.5, 1383)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="36165.0" y="1375.0" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
-						</g>
-						<g transform="translate(36165, 1375)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="42072.8" y="971.0" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M42072.8 1002.0 L42504.8 1002.0" fill="none" data-name="ScheduleControls"></path>
-							<path d="M42072.8 1033.0 L42504.8 1033.0" fill="none" data-name="ScheduleControls"></path>
-						</g>
-						<g transform="translate(42072.75, 971)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(42072.75, 1002)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(42072.75, 1033)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableColumnHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
-							<rect x="31347.3" y="1329.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
-							<path d="M31347.3 1360.5 L31584.3 1360.5" fill="none" data-name="StudiesTableColumnHeader"></path>
-						</g>
-						<g transform="translate(31347.25, 1329.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
-								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31347.25, 1360.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="31852.5" y="2265.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
-							<path d="M31852.5 2296.0 L32030.5 2296.0" fill="none" data-name="DashboardScreen"></path>
-						</g>
-						<g transform="translate(31852.5, 2265)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31852.5, 2296)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesFilter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
-							<rect x="13499.5" y="3133.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
-							<path d="M13499.5 3164.0 L13795.5 3164.0" fill="none" data-name="StudiesFilter"></path>
-						</g>
-						<g transform="translate(13499.5, 3133)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13499.5, 3164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
-							<rect x="31624.3" y="1336.5" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
-							<path d="M31624.3 1367.5 L31967.3 1367.5" fill="none" data-name="DashboardScaffold"></path>
-							<path d="M31624.3 1413.5 L31967.3 1413.5" fill="none" data-name="DashboardScaffold"></path>
-						</g>
-						<g transform="translate(31624.25, 1336.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
-								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31624.25, 1367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31624.25, 1413.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
-							<rect x="17785.8" y="2107.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
-							<path d="M17785.8 2138.0 L18399.8 2138.0" fill="none" data-name="DashboardController"></path>
-							<path d="M17785.8 2259.0 L18399.8 2259.0" fill="none" data-name="DashboardController"></path>
-						</g>
-						<g transform="translate(17785.75, 2107)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
-								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17785.75, 2138)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17785.75, 2259)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IUserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="12884.5" y="3156.0" height="31.0" width="143.0" data-name="IUserRepository"></rect>
-						</g>
-						<g transform="translate(12884.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SearchController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="13067.5" y="3156.0" height="31.0" width="149.0" data-name="SearchController"></rect>
-						</g>
-						<g transform="translate(13067.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableColumnSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
-							<rect x="48777.0" y="30.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
-							<path d="M48777.0 61.0 L49002.0 61.0" fill="none" data-name="StudiesTableColumnSize"></path>
-							<path d="M48777.0 122.0 L49002.0 122.0" fill="none" data-name="StudiesTableColumnSize"></path>
-						</g>
-						<g transform="translate(48777, 30)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
-								
-							</g>
-						</g>
-						<g transform="translate(48777, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(48777, 122)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
-							<rect x="32258.0" y="1246.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
-							<path d="M32258.0 1277.5 L32738.0 1277.5" fill="none" data-name="StudiesTable"></path>
-							<path d="M32258.0 1488.5 L32738.0 1488.5" fill="none" data-name="StudiesTable"></path>
-						</g>
-						<g transform="translate(32258, 1246.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
-								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32258, 1277.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32258, 1488.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
-							<rect x="32070.5" y="2280.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
-						</g>
-						<g transform="translate(32070.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<rect x="32289.5" y="2280.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
-						</g>
-						<g transform="translate(32289.5, 2280.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
-							<rect x="1972.0" y="3065.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
-							<path d="M1972.0 3096.5 L2333.0 3096.5" fill="none" data-name="StudiesTableColumn"></path>
-						</g>
-						<g transform="translate(1972, 3065.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
-								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1972, 3096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
-							<rect x="33661.3" y="2197.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
-							<path d="M33661.3 2228.5 L34061.3 2228.5" fill="none" data-name="StudiesTableItem"></path>
-						</g>
-						<g transform="translate(33661.25, 2197.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
-								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33661.25, 2228.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Study, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
-							<rect x="32240.5" y="3156.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
-						</g>
-						<g transform="translate(32240.5, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Study)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
-							<rect x="33087.0" y="3156.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
-						</g>
-						<g transform="translate(33087, 3156)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="App">
-						<g fill="#eee8d5" stroke="#33322E" data-name="App">
-							<rect x="49042.0" y="76.0" height="31.0" width="47.0" data-name="App"></rect>
-						</g>
-						<g transform="translate(49042, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
-								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppContent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
-							<rect x="49129.0" y="76.0" height="31.0" width="109.0" data-name="AppContent"></rect>
-						</g>
-						<g transform="translate(49129, 76)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AccountSettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
-							<rect x="24367.8" y="1359.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
-							<path d="M24367.8 1390.5 L24561.8 1390.5" fill="none" data-name="AccountSettingsDialog"></path>
-						</g>
-						<g transform="translate(24367.75, 1359.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24367.75, 1390.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/localization/platform_locale/uml.svg b/docs/uml/designer_v2/lib/localization/platform_locale/uml.svg
deleted file mode 100644
index d262765fc..000000000
--- a/docs/uml/designer_v2/lib/localization/platform_locale/uml.svg
+++ /dev/null
@@ -1,95 +0,0 @@
-<svg version="1.1" baseProfile="full" width="574.0" height="220.0" viewbox="0 0 574 220" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[PlatformLocaleWeb
-	  |
-	  +Locale getPlatformLocale()
-	]
-	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleWeb]
-	
-	[&lt;abstract&gt;PlatformLocale
-	  |
-	  +Locale getPlatformLocale()
-	]
-	
-	[PlatformLocaleMobile
-	  |
-	  +Locale getPlatformLocale()
-	]
-	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleMobile]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="220.0" width="574.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<g stroke-dasharray="6 6">
-						<path d="M161.7 66.6 L119.5 82 L119.5 102 L119.5 102.0 " fill="none"></path>
-					</g>
-					<path d="M163.5 71.6 L161.7 66.6 L159.9 61.6 L174.2 62.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M356.3 66.6 L398.5 82 L398.5 102 L398.5 102.0 " fill="none"></path>
-					</g>
-					<path d="M358.1 61.6 L356.3 66.6 L354.5 71.6 L343.8 62.0 Z"></path>
-					<g data-name="PlatformLocaleWeb">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleWeb">
-							<rect x="0.0" y="102.0" height="62.0" width="239.0" data-name="PlatformLocaleWeb"></rect>
-							<path d="M0.0 133.0 L239.0 133.0" fill="none" data-name="PlatformLocaleWeb"></path>
-						</g>
-						<g transform="translate(0, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleWeb">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleWeb">PlatformLocaleWeb</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleWeb">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleWeb">+Locale getPlatformLocale()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformLocale">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocale">
-							<rect x="139.5" y="0.0" height="62.0" width="239.0" data-name="PlatformLocale"></rect>
-							<path d="M139.5 31.0 L378.5 31.0" fill="none" data-name="PlatformLocale"></path>
-						</g>
-						<g transform="translate(139.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocale">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocale">PlatformLocale</text>
-								
-							</g>
-						</g>
-						<g transform="translate(139.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocale">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocale">+Locale getPlatformLocale()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformLocaleMobile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleMobile">
-							<rect x="279.0" y="102.0" height="62.0" width="239.0" data-name="PlatformLocaleMobile"></rect>
-							<path d="M279.0 133.0 L518.0 133.0" fill="none" data-name="PlatformLocaleMobile"></path>
-						</g>
-						<g transform="translate(279, 102)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleMobile">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleMobile">PlatformLocaleMobile</text>
-								
-							</g>
-						</g>
-						<g transform="translate(279, 133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleMobile">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleMobile">+Locale getPlatformLocale()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/localization/uml.svg b/docs/uml/designer_v2/lib/localization/uml.svg
deleted file mode 100644
index 8f5009747..000000000
--- a/docs/uml/designer_v2/lib/localization/uml.svg
+++ /dev/null
@@ -1,234 +0,0 @@
-<svg version="1.1" baseProfile="full" width="1338.0" height="295.0" viewbox="0 0 1338 295" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[LanguagePicker
-	  |
-	  +languagePickerType: LanguagePickerType;
-	  +iconColor: Color?;
-	  +offset: Offset?
-	]
-	
-	[LanguagePicker]o-[LanguagePickerType]
-	[LanguagePicker]o-[Color]
-	[LanguagePicker]o-[Offset]
-	
-	[LanguagePickerType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;LanguagePickerType&gt;;
-	  &lt;static&gt;+field: LanguagePickerType;
-	  &lt;static&gt;+icon: LanguagePickerType
-	]
-	
-	[LanguagePickerType]o-[LanguagePickerType]
-	[Enum]&lt;:--[LanguagePickerType]
-	
-	[PlatformLocaleMobile
-	  |
-	  +Locale getPlatformLocale()
-	]
-	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleMobile]
-	
-	[&lt;abstract&gt;PlatformLocale
-	  |
-	  +Locale getPlatformLocale()
-	]
-	
-	[PlatformLocaleWeb
-	  |
-	  +Locale getPlatformLocale()
-	]
-	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleWeb]
-	
-	[AppTranslation
-	  |
-	  &lt;static&gt;+dynamic init()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="295.0" width="1338.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M353.0 97.8 L309.75 112 L275.26020408163265 132 L275.3 132.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M363.5 100.0 L353.0 97.8 L360.2 89.8 L370.7 92.0 Z"></path>
-					</g>
-					<path d="M486.0 109.4 L485 112 L485 170 L485.0 170.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M494.4 102.6 L486.0 109.4 L484.5 98.7 L492.9 92.0 Z"></path>
-					</g>
-					<path d="M577.9 104.3 L586.75 112 L586.75 170 L586.8 170.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M574.3 94.1 L577.9 104.3 L567.3 102.2 L563.8 92.0 Z"></path>
-					</g>
-					<path d="M384.1 135.0 L396 132 L403.5 132 L403.5 132 L411 185.5 L411 185.5 L403.5 239 L403.5 239 L396 239 L396 239 L366 231.46478873239437 L366.0 231.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M373.8 132.1 L384.1 135.0 L376.4 142.4 L366.0 139.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M163.0 74.8 L163 112 L168.4421768707483 132 L168.4 132.0 " fill="none"></path>
-					</g>
-					<path d="M168.3 74.8 L163.0 74.8 L157.7 74.8 L163.0 61.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M845.5 82.3 L777.75 112 L777.75 154.5 L777.8 154.5 " fill="none"></path>
-					</g>
-					<path d="M847.6 87.2 L845.5 82.3 L843.3 77.5 L857.7 77.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1000.6 83.1 L1056.75 112 L1056.75 154.5 L1056.8 154.5 " fill="none"></path>
-					</g>
-					<path d="M1003.0 78.4 L1000.6 83.1 L998.2 87.8 L988.7 77.0 Z"></path>
-					<g data-name="LanguagePicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePicker">
-							<rect x="328.0" y="0.0" height="92.0" width="366.0" data-name="LanguagePicker"></rect>
-							<path d="M328.0 31.0 L694.0 31.0" fill="none" data-name="LanguagePicker"></path>
-						</g>
-						<g transform="translate(328, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePicker">
-								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePicker">LanguagePicker</text>
-								
-							</g>
-						</g>
-						<g transform="translate(328, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePicker">+languagePickerType: LanguagePickerType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePicker">+iconColor: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePicker">+offset: Offset?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LanguagePickerType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePickerType">
-							<rect x="0.0" y="132.0" height="107.0" width="366.0" data-name="LanguagePickerType"></rect>
-							<path d="M0.0 163.0 L366.0 163.0" fill="none" data-name="LanguagePickerType"></path>
-						</g>
-						<g transform="translate(0, 132)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePickerType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePickerType">
-								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePickerType">LanguagePickerType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 163)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePickerType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePickerType">
-								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePickerType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+values: List&lt;LanguagePickerType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+field: LanguagePickerType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+icon: LanguagePickerType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="456.0" y="170.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(456, 170)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Offset">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Offset">
-							<rect x="555.3" y="170.0" height="31.0" width="63.0" data-name="Offset"></rect>
-						</g>
-						<g transform="translate(555.25, 170)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Offset">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Offset">
-								<text x="23.5" y="13.5" stroke="none" text-anchor="middle" data-name="Offset">Offset</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="132.5" y="30.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(132.5, 30.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformLocaleMobile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleMobile">
-							<rect x="658.3" y="154.5" height="62.0" width="239.0" data-name="PlatformLocaleMobile"></rect>
-							<path d="M658.3 185.5 L897.3 185.5" fill="none" data-name="PlatformLocaleMobile"></path>
-						</g>
-						<g transform="translate(658.25, 154.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleMobile">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleMobile">PlatformLocaleMobile</text>
-								
-							</g>
-						</g>
-						<g transform="translate(658.25, 185.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleMobile">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleMobile">+Locale getPlatformLocale()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformLocale">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocale">
-							<rect x="809.0" y="15.0" height="62.0" width="239.0" data-name="PlatformLocale"></rect>
-							<path d="M809.0 46.0 L1048.0 46.0" fill="none" data-name="PlatformLocale"></path>
-						</g>
-						<g transform="translate(809, 15)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocale">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocale">PlatformLocale</text>
-								
-							</g>
-						</g>
-						<g transform="translate(809, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocale">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocale">+Locale getPlatformLocale()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformLocaleWeb">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleWeb">
-							<rect x="937.3" y="154.5" height="62.0" width="239.0" data-name="PlatformLocaleWeb"></rect>
-							<path d="M937.3 185.5 L1176.3 185.5" fill="none" data-name="PlatformLocaleWeb"></path>
-						</g>
-						<g transform="translate(937.25, 154.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleWeb">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleWeb">PlatformLocaleWeb</text>
-								
-							</g>
-						</g>
-						<g transform="translate(937.25, 185.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleWeb">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleWeb">+Locale getPlatformLocale()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppTranslation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppTranslation">
-							<rect x="1088.0" y="15.0" height="62.0" width="194.0" data-name="AppTranslation"></rect>
-							<path d="M1088.0 46.0 L1282.0 46.0" fill="none" data-name="AppTranslation"></path>
-						</g>
-						<g transform="translate(1088, 15)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppTranslation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppTranslation">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppTranslation">AppTranslation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1088, 46)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppTranslation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppTranslation">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppTranslation">&lt;static&gt;+dynamic init()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/repositories/uml.svg b/docs/uml/designer_v2/lib/repositories/uml.svg
deleted file mode 100644
index 0274e227c..000000000
--- a/docs/uml/designer_v2/lib/repositories/uml.svg
+++ /dev/null
@@ -1,1725 +0,0 @@
-<svg version="1.1" baseProfile="full" width="5267.0" height="2662.0" viewbox="0 0 5267 2662" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;StudyUApi
-	  |
-	  +dynamic saveStudy();
-	  +dynamic fetchStudy();
-	  +dynamic getUserStudies();
-	  +dynamic deleteStudy();
-	  +dynamic saveStudyInvite();
-	  +dynamic fetchStudyInvite();
-	  +dynamic deleteStudyInvite();
-	  +dynamic deleteParticipants();
-	  +dynamic fetchAppConfig();
-	  +dynamic fetchUser();
-	  +dynamic saveUser()
-	]
-	
-	[APIException
-	]
-	
-	[Exception]&lt;:--[APIException]
-	
-	[StudyNotFoundException
-	]
-	
-	[APIException]&lt;:-[StudyNotFoundException]
-	
-	[MeasurementNotFoundException
-	]
-	
-	[APIException]&lt;:-[MeasurementNotFoundException]
-	
-	[QuestionNotFoundException
-	]
-	
-	[APIException]&lt;:-[QuestionNotFoundException]
-	
-	[ConsentItemNotFoundException
-	]
-	
-	[APIException]&lt;:-[ConsentItemNotFoundException]
-	
-	[InterventionNotFoundException
-	]
-	
-	[APIException]&lt;:-[InterventionNotFoundException]
-	
-	[InterventionTaskNotFoundException
-	]
-	
-	[APIException]&lt;:-[InterventionTaskNotFoundException]
-	
-	[ReportNotFoundException
-	]
-	
-	[APIException]&lt;:-[ReportNotFoundException]
-	
-	[ReportSectionNotFoundException
-	]
-	
-	[APIException]&lt;:-[ReportSectionNotFoundException]
-	
-	[StudyInviteNotFoundException
-	]
-	
-	[APIException]&lt;:-[StudyInviteNotFoundException]
-	
-	[UserNotFoundException
-	]
-	
-	[APIException]&lt;:-[UserNotFoundException]
-	
-	[StudyUApiClient
-	  |
-	  +supabaseClient: SupabaseClient;
-	  &lt;static&gt;+studyColumns: List&lt;String&gt;;
-	  &lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;;
-	  +testDelayMilliseconds: int
-	  |
-	  +dynamic deleteParticipants();
-	  +dynamic getUserStudies();
-	  +dynamic fetchStudy();
-	  +dynamic deleteStudy();
-	  +dynamic saveStudy();
-	  +dynamic fetchStudyInvite();
-	  +dynamic saveStudyInvite();
-	  +dynamic deleteStudyInvite();
-	  +dynamic fetchAppConfig();
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  -dynamic _awaitGuarded();
-	  -dynamic _apiException();
-	  -dynamic _testDelay()
-	]
-	
-	[StudyUApiClient]o-[SupabaseClient]
-	[&lt;abstract&gt;SupabaseClientDependant]&lt;:-[StudyUApiClient]
-	[&lt;abstract&gt;SupabaseQueryMixin]&lt;:-[StudyUApiClient]
-	[&lt;abstract&gt;StudyUApi]&lt;:--[StudyUApiClient]
-	
-	[&lt;abstract&gt;IStudyRepository
-	  |
-	  +dynamic launch();
-	  +dynamic deleteParticipants()
-	]
-	
-	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IStudyRepository]
-	
-	[StudyRepository
-	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +ref: ProviderRef&lt;dynamic&gt;;
-	  +sortCallback: void Function()?
-	  |
-	  +String getKey();
-	  +dynamic deleteParticipants();
-	  +dynamic launch();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
-	]
-	
-	[StudyRepository]o-[&lt;abstract&gt;StudyUApi]
-	[StudyRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyRepository]o-[&lt;abstract&gt;ProviderRef]
-	[StudyRepository]o-[void Function()?]
-	[&lt;abstract&gt;ModelRepository]&lt;:-[StudyRepository]
-	[&lt;abstract&gt;IStudyRepository]&lt;:--[StudyRepository]
-	
-	[StudyRepositoryDelegate
-	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository
-	  |
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic onError();
-	  +Study createNewInstance();
-	  +Study createDuplicate()
-	]
-	
-	[StudyRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
-	[StudyRepositoryDelegate]o-[&lt;abstract&gt;IAuthRepository]
-	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[StudyRepositoryDelegate]
-	
-	[&lt;abstract&gt;IAppRepository
-	  |
-	  +dynamic fetchAppConfig();
-	  +void dispose()
-	]
-	
-	[AppRepository
-	  |
-	  +apiClient: StudyUApi
-	  |
-	  +dynamic fetchAppConfig();
-	  +void dispose()
-	]
-	
-	[AppRepository]o-[&lt;abstract&gt;StudyUApi]
-	[&lt;abstract&gt;IAppRepository]&lt;:--[AppRepository]
-	
-	[WrappedModel
-	  |
-	  -_model: T;
-	  +asyncValue: AsyncValue&lt;T&gt;;
-	  +isLocalOnly: bool;
-	  +isDirty: bool;
-	  +isDeleted: bool;
-	  +lastSaved: DateTime?;
-	  +lastFetched: DateTime?;
-	  +lastUpdated: DateTime?;
-	  +model: T
-	  |
-	  +dynamic markWithError();
-	  +dynamic markAsLoading();
-	  +dynamic markAsFetched();
-	  +dynamic markAsSaved()
-	]
-	
-	[WrappedModel]o-[&lt;abstract&gt;AsyncValue]
-	
-	[ModelRepositoryException
-	]
-	
-	[Exception]&lt;:--[ModelRepositoryException]
-	
-	[ModelNotFoundException
-	]
-	
-	[ModelRepositoryException]&lt;:--[ModelNotFoundException]
-	
-	[&lt;abstract&gt;IModelRepository
-	  |
-	  +String getKey();
-	  +WrappedModel&lt;T&gt;? get();
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic duplicateAndSave();
-	  +dynamic duplicateAndSaveFromRemote();
-	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
-	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
-	  +dynamic ensurePersisted();
-	  +void dispose()
-	]
-	
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[&lt;abstract&gt;IModelRepository]
-	
-	[&lt;abstract&gt;IModelRepositoryDelegate
-	  |
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +T createNewInstance();
-	  +T createDuplicate();
-	  +dynamic onError()
-	]
-	
-	[&lt;abstract&gt;ModelRepository
-	  |
-	  +delegate: IModelRepositoryDelegate&lt;T&gt;;
-	  -_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;;
-	  -_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;;
-	  +modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;;
-	  +modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;;
-	  -_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;
-	  |
-	  +WrappedModel&lt;T&gt;? get();
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic duplicateAndSave();
-	  +dynamic duplicateAndSaveFromRemote();
-	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
-	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
-	  -dynamic _buildModelSpecificController();
-	  +dynamic ensurePersisted();
-	  +WrappedModel&lt;T&gt; upsertLocally();
-	  +List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally();
-	  +dynamic emitUpdate();
-	  +dynamic emitModelEvent();
-	  +dynamic emitError();
-	  +void dispose();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
-	]
-	
-	[&lt;abstract&gt;ModelRepository]o-[&lt;abstract&gt;IModelRepositoryDelegate]
-	[&lt;abstract&gt;ModelRepository]o-[BehaviorSubject]
-	[&lt;abstract&gt;IModelRepository]&lt;:-[&lt;abstract&gt;ModelRepository]
-	
-	[StudyLaunched
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[StudyLaunched]
-	
-	[&lt;abstract&gt;IInviteCodeRepository
-	  |
-	  +dynamic isCodeAlreadyUsed()
-	]
-	
-	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IInviteCodeRepository]
-	
-	[InviteCodeRepository
-	  |
-	  +studyId: String;
-	  +ref: ProviderRef&lt;dynamic&gt;;
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +studyRepository: IStudyRepository;
-	  +study: Study
-	  |
-	  +String getKey();
-	  +dynamic isCodeAlreadyUsed();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +dynamic emitUpdate()
-	]
-	
-	[InviteCodeRepository]o-[&lt;abstract&gt;ProviderRef]
-	[InviteCodeRepository]o-[&lt;abstract&gt;StudyUApi]
-	[InviteCodeRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[InviteCodeRepository]o-[&lt;abstract&gt;IStudyRepository]
-	[InviteCodeRepository]o-[Study]
-	[&lt;abstract&gt;ModelRepository]&lt;:-[InviteCodeRepository]
-	[&lt;abstract&gt;IInviteCodeRepository]&lt;:--[InviteCodeRepository]
-	
-	[InviteCodeRepositoryDelegate
-	  |
-	  +study: Study;
-	  +apiClient: StudyUApi;
-	  +studyRepository: IStudyRepository
-	  |
-	  +dynamic fetch();
-	  +dynamic fetchAll();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic onError();
-	  +StudyInvite createDuplicate();
-	  +StudyInvite createNewInstance()
-	]
-	
-	[InviteCodeRepositoryDelegate]o-[Study]
-	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
-	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;IStudyRepository]
-	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[InviteCodeRepositoryDelegate]
-	
-	[&lt;abstract&gt;IAuthRepository
-	  |
-	  +allowPasswordReset: bool;
-	  +currentUser: User?;
-	  +isLoggedIn: bool;
-	  +session: Session?;
-	  +serializedSession: String?
-	  |
-	  +dynamic signUp();
-	  +dynamic signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic updateUser();
-	  +void dispose()
-	]
-	
-	[&lt;abstract&gt;IAuthRepository]o-[User]
-	[&lt;abstract&gt;IAuthRepository]o-[Session]
-	[&lt;abstract&gt;IAppDelegate]&lt;:-[&lt;abstract&gt;IAuthRepository]
-	
-	[AuthRepository
-	  |
-	  +supabaseClient: SupabaseClient;
-	  +sharedPreferences: SharedPreferences;
-	  +allowPasswordReset: bool;
-	  +authClient: GoTrueClient;
-	  +session: Session?;
-	  +serializedSession: String?;
-	  +currentUser: User?;
-	  +isLoggedIn: bool
-	  |
-	  -void _registerAuthListener();
-	  +dynamic signUp();
-	  +dynamic signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic updateUser();
-	  +void dispose();
-	  +dynamic onAppStart()
-	]
-	
-	[AuthRepository]o-[SupabaseClient]
-	[AuthRepository]o-[SharedPreferences]
-	[AuthRepository]o-[GoTrueClient]
-	[AuthRepository]o-[Session]
-	[AuthRepository]o-[User]
-	[&lt;abstract&gt;IAuthRepository]&lt;:--[AuthRepository]
-	
-	[&lt;abstract&gt;IUserRepository
-	  |
-	  +user: StudyUUser
-	  |
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  +dynamic updatePreferences()
-	]
-	
-	[&lt;abstract&gt;IUserRepository]o-[StudyUUser]
-	
-	[UserRepository
-	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +ref: Ref&lt;Object?&gt;;
-	  +user: StudyUUser
-	  |
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  +dynamic updatePreferences()
-	]
-	
-	[UserRepository]o-[&lt;abstract&gt;StudyUApi]
-	[UserRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[UserRepository]o-[&lt;abstract&gt;Ref]
-	[UserRepository]o-[StudyUUser]
-	[&lt;abstract&gt;IUserRepository]&lt;:--[UserRepository]
-	
-	[PreferenceAction
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;PreferenceAction&gt;;
-	  &lt;static&gt;+pin: PreferenceAction;
-	  &lt;static&gt;+pinOff: PreferenceAction
-	]
-	
-	[PreferenceAction]o-[PreferenceAction]
-	[Enum]&lt;:--[PreferenceAction]
-	
-	[&lt;abstract&gt;ModelEvent
-	  |
-	  +modelId: String;
-	  +model: T
-	]
-	
-	[IsFetched
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsFetched]
-	
-	[IsSaving
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaving]
-	
-	[IsSaved
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaved]
-	
-	[IsDeleted
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsDeleted]
-	
-	[&lt;abstract&gt;SupabaseClientDependant
-	  |
-	  +supabaseClient: SupabaseClient
-	]
-	
-	[&lt;abstract&gt;SupabaseClientDependant]o-[SupabaseClient]
-	
-	[SupabaseQueryError
-	  |
-	  +statusCode: String?;
-	  +message: String;
-	  +details: dynamic
-	]
-	
-	[Exception]&lt;:--[SupabaseQueryError]
-	
-	[&lt;abstract&gt;SupabaseQueryMixin
-	  |
-	  +dynamic deleteAll();
-	  +dynamic getAll();
-	  +dynamic getById();
-	  +dynamic getByColumn();
-	  +List&lt;T&gt; deserializeList();
-	  +T deserializeObject()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="2662.0" width="5267.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<g stroke-dasharray="6 6">
-						<path d="M3701.2 132.9 L1462.5 278 L1462.5 411 L1462.5 411.0 " fill="none"></path>
-					</g>
-					<path d="M3701.5 138.2 L3701.2 132.9 L3700.8 127.6 L3714.5 132.0 Z"></path>
-					<path d="M1388.7 434.6 L108 575 L108 806 L108.0 806.0 " fill="none"></path>
-					<path d="M1389.3 439.9 L1388.7 434.6 L1388.2 429.3 L1402.0 433.1 Z"></path>
-					<path d="M1388.8 436.8 L395.5 575 L395.5 806 L395.5 806.0 " fill="none"></path>
-					<path d="M1389.5 442.0 L1388.8 436.8 L1388.1 431.5 L1402.0 434.9 Z"></path>
-					<path d="M1388.9 440.8 L696 575 L696 806 L696.0 806.0 " fill="none"></path>
-					<path d="M1389.9 446.0 L1388.9 440.8 L1387.9 435.5 L1402.0 438.2 Z"></path>
-					<path d="M1400.7 446.0 L992.5 575 L992.5 806 L992.5 806.0 " fill="none"></path>
-					<path d="M1402.3 451.1 L1400.7 446.0 L1399.1 440.9 L1413.4 442.0 Z"></path>
-					<path d="M1435.8 451.0 L1300.5 575 L1300.5 806 L1300.5 806.0 " fill="none"></path>
-					<path d="M1439.4 454.9 L1435.8 451.0 L1432.2 447.1 L1445.6 442.0 Z"></path>
-					<path d="M1489.2 451.0 L1624.5 575 L1624.5 806 L1624.5 806.0 " fill="none"></path>
-					<path d="M1492.8 447.1 L1489.2 451.0 L1485.6 454.9 L1479.4 442.0 Z"></path>
-					<path d="M1523.8 446.1 L1928 575 L1928 806 L1928.0 806.0 " fill="none"></path>
-					<path d="M1525.4 441.0 L1523.8 446.1 L1522.2 451.1 L1511.1 442.0 Z"></path>
-					<path d="M1536.1 440.9 L2221.5 575 L2221.5 806 L2221.5 806.0 " fill="none"></path>
-					<path d="M1537.1 435.7 L1536.1 440.9 L1535.1 446.1 L1523.0 438.3 Z"></path>
-					<path d="M1536.2 436.7 L2532.5 575 L2532.5 806 L2532.5 806.0 " fill="none"></path>
-					<path d="M1536.9 431.4 L1536.2 436.7 L1535.5 442.0 L1523.0 434.9 Z"></path>
-					<path d="M1536.3 434.7 L2806 575 L2806 806 L2806.0 806.0 " fill="none"></path>
-					<path d="M1536.8 429.4 L1536.3 434.7 L1535.7 440.0 L1523.0 433.2 Z"></path>
-					<path d="M2536.5 2553.7 L2536.5 2555 L2469.0352112676055 2575 L2469.0 2575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2541.8 2544.3 L2536.5 2553.7 L2531.2 2544.3 L2536.5 2535.0 Z"></path>
-					</g>
-					<path d="M2477.7 2087.4 L2594 2182 L2587.8337801608577 2202 L2587.8 2202.0 " fill="none"></path>
-					<path d="M2481.1 2083.3 L2477.7 2087.4 L2474.3 2091.6 L2467.4 2079.0 Z"></path>
-					<path d="M2604.2 2123.9 L2516.5 2182 L2518.6447721179625 2202 L2518.6 2202.0 " fill="none"></path>
-					<path d="M2607.2 2128.3 L2604.2 2123.9 L2601.3 2119.4 L2615.4 2116.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M2257.8 2152.9 L2295.5 2182 L2321.344504021448 2202 L2321.3 2202.0 " fill="none"></path>
-					</g>
-					<path d="M2261.1 2148.7 L2257.8 2152.9 L2254.6 2157.2 L2247.3 2144.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3623.8 1003.1 L3746.25 1068 L3746.25 1164 L3746.25 1164 L3746.25 1260 L3746.25 1260 L3746.25 1386.5 L3746.25 1386.5 L3746.25 1513 L3746.25 1513 L3713.14263803681 1556 L3713.1 1556.0 " fill="none"></path>
-					</g>
-					<path d="M3626.3 998.4 L3623.8 1003.1 L3621.3 1007.8 L3612.0 996.9 Z"></path>
-					<path d="M3624.4 1811.8 L2289.75 1914 L2247.25 1947.8988095238096 L2247.3 1947.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3634.1 1816.5 L3624.4 1811.8 L3633.3 1805.8 L3643.0 1810.4 Z"></path>
-					</g>
-					<path d="M3844.5 1905.2 L3844.5 1914 L3298.25 2019.50990990991 L3298.3 2019.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3849.8 1895.8 L3844.5 1905.2 L3839.2 1895.8 L3844.5 1886.5 Z"></path>
-					</g>
-					<path d="M4064.2 1846.7 L4350.5 1914 L4294.566231343284 2032.5 L4294.6 2032.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4056.3 1839.3 L4064.2 1846.7 L4053.9 1849.7 L4046.0 1842.4 Z"></path>
-					</g>
-					<path d="M4064.3 1837.9 L4453.75 1914 L4453.75 2032.5 L4453.8 2032.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4056.2 1830.9 L4064.3 1837.9 L4054.1 1841.4 L4046.0 1834.4 Z"></path>
-					</g>
-					<path d="M3624.5 952.5 L3927.25 1068 L3927.25 1164 L3927.25 1164 L3927.25 1260 L3927.25 1260 L3927.25 1386.5 L3927.25 1386.5 L3927.25 1513 L3927.25 1513 L3927.25 1594.5 L3927.25 1594.5 L3927.25 1676 L3927.25 1676 L3908.127100840336 1703.5 L3908.1 1703.5 " fill="none"></path>
-					<path d="M3626.4 947.5 L3624.5 952.5 L3622.6 957.5 L3612.0 947.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3683.5 1646.3 L3683.5 1676 L3720.705882352941 1703.5 L3720.7 1703.5 " fill="none"></path>
-					</g>
-					<path d="M3688.8 1646.3 L3683.5 1646.3 L3678.2 1646.3 L3683.5 1633.0 Z"></path>
-					<path d="M2249.8 1912.7 L2249.75 1914 L2223.0037313432836 1942 L2223.0 1942.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2255.1 1903.3 L2249.8 1912.7 L2244.4 1903.3 L2249.8 1894.0 Z"></path>
-					</g>
-					<path d="M2409.3 1809.5 L3562.75 1914 L3298.25 2000.0266990291261 L3298.3 2000.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2400.5 1803.3 L2409.3 1809.5 L2399.6 1813.9 L2390.8 1807.8 Z"></path>
-					</g>
-					<path d="M2249.8 1253.3 L2249.75 1260 L2249.75 1386.5 L2249.75 1386.5 L2249.75 1513 L2249.75 1513 L2249.75 1594.5 L2249.75 1594.5 L2249.75 1676 L2249.75 1676 L2249.75 1696 L2249.8 1696.0 " fill="none"></path>
-					<path d="M2255.1 1253.3 L2249.8 1253.3 L2244.4 1253.3 L2249.8 1240.0 Z"></path>
-					<path d="M1953.8 1867.7 L1953.75 1914 L1996.25 1947.8988095238096 L1996.3 1947.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1959.1 1858.3 L1953.8 1867.7 L1948.4 1858.3 L1953.8 1849.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M1953.8 1646.3 L1953.75 1676 L1953.75 1741 L1953.8 1741.0 " fill="none"></path>
-					</g>
-					<path d="M1959.1 1646.3 L1953.8 1646.3 L1948.4 1646.3 L1953.8 1633.0 Z"></path>
-					<path d="M2383.6 164.2 L2848 278 L2848 411 L2848.0 411.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2375.8 156.8 L2383.6 164.2 L2373.3 167.2 L2365.5 159.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3761.5 157.8 L3761.5 278 L3761.5 411 L3761.5 411.0 " fill="none"></path>
-					</g>
-					<path d="M3766.8 157.8 L3761.5 157.8 L3756.2 157.8 L3761.5 144.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3761.5 455.3 L3761.5 575 L3761.5 806 L3761.5 806.0 " fill="none"></path>
-					</g>
-					<path d="M3766.8 455.3 L3761.5 455.3 L3756.2 455.3 L3761.5 442.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3173.1 154.5 L3281 278 L3281 298 L3281.0 298.0 " fill="none"></path>
-					</g>
-					<path d="M3177.1 151.0 L3173.1 154.5 L3169.1 158.0 L3164.3 144.5 Z"></path>
-					<path d="M2931.8 905.0 L2249.75 1068 L2249.75 1088 L2249.8 1088.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2942.2 908.0 L2931.8 905.0 L2939.7 897.6 L2950.0 900.6 Z"></path>
-					</g>
-					<path d="M2961.7 1059.1 L2949.75 1068 L2949.75 1148.5 L2949.8 1148.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2972.3 1057.9 L2961.7 1059.1 L2966.0 1049.3 L2976.6 1048.0 Z"></path>
-					</g>
-					<path d="M3281.0 568.3 L3281 575 L3281 595 L3281.0 595.0 " fill="none"></path>
-					<path d="M3286.3 568.3 L3281.0 568.3 L3275.7 568.3 L3281.0 555.0 Z"></path>
-					<path d="M4609.5 147.0 L3985 278 L3985 411 L3985.0 411.0 " fill="none"></path>
-					<path d="M4610.5 152.2 L4609.5 147.0 L4608.4 141.7 L4622.5 144.2 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3197.3 1060.6 L3194.75 1068 L3194.75 1133 L3194.8 1133.0 " fill="none"></path>
-					</g>
-					<path d="M3202.4 1062.3 L3197.3 1060.6 L3192.3 1058.8 L3201.7 1048.0 Z"></path>
-					<path d="M3501.0 1414.7 L4267.25 1513 L4267.25 1594.5 L4267.25 1594.5 L4267.25 1676 L4267.25 1676 L4267.25 1795 L4267.25 1795 L4267.25 1914 L4267.25 1914 L4284.936567164179 2032.5 L4284.9 2032.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3492.4 1408.2 L3501.0 1414.7 L3491.1 1418.8 L3482.5 1412.3 Z"></path>
-					</g>
-					<path d="M3060.9 1404.0 L1688.25 1513 L1688.25 1594.5 L1688.25 1594.5 L1688.25 1676 L1688.25 1676 L1688.25 1795 L1688.25 1795 L1688.25 1914 L1688.25 1914 L1996.25 2009.20645905421 L1996.3 2009.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3070.6 1408.6 L3060.9 1404.0 L3069.8 1397.9 L3079.5 1402.5 Z"></path>
-					</g>
-					<path d="M3281.0 1511.7 L3281 1513 L3281 1594.5 L3281 1594.5 L3281 1676 L3281 1676 L3281 1795 L3281 1795 L3281 1914 L3281 1914 L3261.5597014925374 1934 L3261.6 1934.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3286.3 1502.3 L3281.0 1511.7 L3275.7 1502.3 L3281.0 1493.0 Z"></path>
-					</g>
-					<path d="M3500.1 1462.6 L3645.5 1513 L3665.5490797546013 1556 L3665.5 1556.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3493.1 1454.5 L3500.1 1462.6 L3489.6 1464.5 L3482.5 1456.4 Z"></path>
-					</g>
-					<path d="M3060.9 1404.9 L1768.25 1513 L1768.25 1579 L1768.3 1579.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3070.6 1409.4 L3060.9 1404.9 L3069.8 1398.8 L3079.5 1403.3 Z"></path>
-					</g>
-					<path d="M3589.8 1056.1 L3605.5 1068 L3605.5 1164 L3605.5 1164 L3605.5 1260 L3605.5 1260 L3482.5 1307.949152542373 L3482.5 1307.9 " fill="none"></path>
-					<path d="M3593.0 1051.8 L3589.8 1056.1 L3586.6 1060.3 L3579.2 1048.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3194.8 1208.3 L3194.75 1260 L3208.3863636363635 1280 L3208.4 1280.0 " fill="none"></path>
-					</g>
-					<path d="M3200.1 1208.3 L3194.8 1208.3 L3189.4 1208.3 L3194.8 1195.0 Z"></path>
-					<path d="M1728.3 1511.7 L1728.25 1513 L1760.6426380368098 1579 L1760.6 1579.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1733.6 1502.3 L1728.3 1511.7 L1722.9 1502.3 L1728.3 1493.0 Z"></path>
-					</g>
-					<path d="M1650.9 1508.8 L1648.25 1513 L1648.25 1594.5 L1648.25 1594.5 L1648.25 1676 L1648.25 1676 L1648.25 1795 L1648.25 1795 L1648.25 1914 L1648.25 1914 L1996.25 2012.4836325237593 L1996.3 2012.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1660.4 1503.7 L1650.9 1508.8 L1651.4 1498.0 L1660.9 1493.0 Z"></path>
-					</g>
-					<path d="M1896.4 1398.0 L3582.75 1513 L3635.9064417177915 1556 L3635.9 1556.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1887.4 1392.0 L1896.4 1398.0 L1886.7 1402.7 L1877.8 1396.7 Z"></path>
-					</g>
-					<path d="M2124.1 1187.1 L1728.25 1260 L1728.25 1280 L1728.3 1280.0 " fill="none"></path>
-					<path d="M2125.1 1192.4 L2124.1 1187.1 L2123.2 1181.9 L2137.3 1184.7 Z"></path>
-					<path d="M2985.9 2114.0 L2816 2182 L2816 2368.5 L2816 2368.5 L2816 2555 L2816 2555 L2816 2575 L2816.0 2575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2996.6 2115.5 L2985.9 2114.0 L2992.6 2105.6 L3003.3 2107.0 Z"></path>
-					</g>
-					<path d="M3251.6 2176.7 L3255.75 2182 L3255.75 2368.5 L3255.75 2368.5 L3255.75 2555 L3255.75 2555 L3255.75 2575 L3255.8 2575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3250.0 2166.1 L3251.6 2176.7 L3241.6 2172.6 L3240.1 2162.0 Z"></path>
-					</g>
-					<path d="M3030.3 1823.8 L3030.25 1914 L3048.2350746268658 1934 L3048.2 1934.0 " fill="none"></path>
-					<path d="M3035.6 1823.8 L3030.3 1823.8 L3024.9 1823.8 L3030.3 1810.5 Z"></path>
-					<path d="M2857.6 2413.8 L2272 2555 L2353.549295774648 2575 L2353.5 2575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2867.9 2416.8 L2857.6 2413.8 L2865.4 2406.5 L2875.8 2409.5 Z"></path>
-					</g>
-					<path d="M3232.5 2461.6 L3419.75 2555 L3419.75 2575 L3419.8 2575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3226.5 2452.7 L3232.5 2461.6 L3221.7 2462.2 L3215.8 2453.3 Z"></path>
-					</g>
-					<path d="M3233.5 2431.2 L3604.25 2555 L3604.25 2575 L3604.3 2575.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3226.3 2423.2 L3233.5 2431.2 L3222.9 2433.3 L3215.8 2425.3 Z"></path>
-					</g>
-					<path d="M3045.8 2538.7 L3045.75 2555 L3216.25 2583.822619047619 L3216.3 2583.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3051.1 2529.3 L3045.8 2538.7 L3040.4 2529.3 L3045.8 2520.0 Z"></path>
-					</g>
-					<path d="M2858.4 2443.0 L2576.5 2555 L2789.5 2586.572025052192 L2789.5 2586.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2869.0 2444.5 L2858.4 2443.0 L2865.1 2434.6 L2875.8 2436.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3053.2 2172.5 L3045.75 2182 L3045.75 2217 L3045.8 2217.0 " fill="none"></path>
-					</g>
-					<path d="M3057.4 2175.8 L3053.2 2172.5 L3049.0 2169.2 L3061.4 2162.0 Z"></path>
-					<path d="M4245.7 1616.0 L4659 1676 L4659 1795 L4659 1795 L4659 1914 L4659 1914 L4625.174440298508 2032.5 L4625.2 2032.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4237.3 1609.4 L4245.7 1616.0 L4235.7 1620.0 L4227.3 1613.4 Z"></path>
-					</g>
-					<path d="M3302.4 1805.2 L1608.25 1914 L1996.25 2015.2502434274586 L1996.3 2015.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3312.0 1810.0 L3302.4 1805.2 L3311.3 1799.3 L3321.0 1804.1 Z"></path>
-					</g>
-					<path d="M3302.4 1811.8 L2329.75 1914 L3003.25 2023.9257003654081 L3003.3 2023.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3312.3 1816.1 L3302.4 1811.8 L3311.2 1805.5 L3321.0 1809.8 Z"></path>
-					</g>
-					<path d="M3621.6 1809.9 L4737.25 1914 L4737.25 2032.5 L4737.3 2032.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3612.8 1803.7 L3621.6 1809.9 L3611.8 1814.3 L3603.0 1808.2 Z"></path>
-					</g>
-					<path d="M3621.6 1812.3 L4557.25 1914 L4613.4048507462685 2032.5 L4613.4 2032.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3612.9 1806.0 L3621.6 1812.3 L3611.7 1816.6 L3603.0 1810.3 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3954.0 1612.9 L3462 1676 L3462 1711 L3462.0 1711.0 " fill="none"></path>
-					</g>
-					<path d="M3954.7 1618.2 L3954.0 1612.9 L3953.3 1607.6 L3967.3 1611.2 Z"></path>
-					<path d="M4447.0 376.3 L4459 373 L4466.5 373 L4466.5 373 L4474 426.5 L4474 426.5 L4466.5 480 L4466.5 480 L4459 480 L4459 480 L4429 471.8527918781726 L4429.0 471.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4436.6 373.6 L4447.0 376.3 L4439.4 383.8 L4429.0 381.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M4268.7 157.8 L4262 278 L4262 373 L4262.0 373.0 " fill="none"></path>
-					</g>
-					<path d="M4274.0 158.1 L4268.7 157.8 L4263.3 157.5 L4269.4 144.5 Z"></path>
-					<path d="M4652.9 177.6 L4566 278 L4566 411 L4566.0 411.0 " fill="none"></path>
-					<path d="M4657.0 181.1 L4652.9 177.6 L4648.9 174.1 L4661.7 167.5 Z"></path>
-					<path d="M4695.0 180.8 L4695 278 L4695 411 L4695.0 411.0 " fill="none"></path>
-					<path d="M4700.3 180.8 L4695.0 180.8 L4689.7 180.8 L4695.0 167.5 Z"></path>
-					<path d="M4735.0 177.8 L4817 278 L4817 411 L4817.0 411.0 " fill="none"></path>
-					<path d="M4739.1 174.4 L4735.0 177.8 L4730.8 181.2 L4726.5 167.5 Z"></path>
-					<path d="M4770.4 174.4 L4942.5 278 L4942.5 411 L4942.5 411.0 " fill="none"></path>
-					<path d="M4773.1 169.8 L4770.4 174.4 L4767.6 178.9 L4759.0 167.5 Z"></path>
-					<path d="M2368.2 2089.5 L2232 2182 L2232 2368.5 L2232 2368.5 L2232 2555 L2232 2555 L2346.25 2576.953315290934 L2346.3 2577.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2378.9 2088.7 L2368.2 2089.5 L2372.9 2079.8 L2383.6 2079.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3821.8 135.6 L5119.5 278 L5119.5 380.5 L5119.5 380.5 " fill="none"></path>
-					</g>
-					<path d="M3822.3 130.3 L3821.8 135.6 L3821.2 140.9 L3808.5 134.2 Z"></path>
-					<g data-name="StudyUApi">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApi">
-							<rect x="1996.3" y="1942.0" height="212.0" width="251.0" data-name="StudyUApi"></rect>
-							<path d="M1996.3 1973.0 L2247.3 1973.0" fill="none" data-name="StudyUApi"></path>
-						</g>
-						<g transform="translate(1996.25, 1942)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyUApi">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApi">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApi">StudyUApi</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1996.25, 1973)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApi">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApi">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApi">+dynamic saveStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApi">+dynamic getUserStudies()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApi">+dynamic saveStudyInvite()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudyInvite()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudyInvite()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApi">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApi">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApi">+dynamic fetchUser()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApi">+dynamic saveUser()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="APIException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="APIException">
-							<rect x="1402.0" y="411.0" height="31.0" width="121.0" data-name="APIException"></rect>
-						</g>
-						<g transform="translate(1402, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="APIException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="APIException">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="APIException">APIException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Exception">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="3714.5" y="113.5" height="31.0" width="94.0" data-name="Exception"></rect>
-						</g>
-						<g transform="translate(3714.5, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotFoundException">
-							<rect x="0.0" y="806.0" height="31.0" width="216.0" data-name="StudyNotFoundException"></rect>
-						</g>
-						<g transform="translate(0, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotFoundException">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotFoundException">StudyNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementNotFoundException">
-							<rect x="256.0" y="806.0" height="31.0" width="279.0" data-name="MeasurementNotFoundException"></rect>
-						</g>
-						<g transform="translate(256, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementNotFoundException">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementNotFoundException">MeasurementNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionNotFoundException">
-							<rect x="575.0" y="806.0" height="31.0" width="242.0" data-name="QuestionNotFoundException"></rect>
-						</g>
-						<g transform="translate(575, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionNotFoundException">
-								<text x="113.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionNotFoundException">QuestionNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemNotFoundException">
-							<rect x="857.0" y="806.0" height="31.0" width="271.0" data-name="ConsentItemNotFoundException"></rect>
-						</g>
-						<g transform="translate(857, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemNotFoundException">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemNotFoundException">ConsentItemNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionNotFoundException">
-							<rect x="1168.0" y="806.0" height="31.0" width="265.0" data-name="InterventionNotFoundException"></rect>
-						</g>
-						<g transform="translate(1168, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionNotFoundException">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionNotFoundException">InterventionNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskNotFoundException">
-							<rect x="1473.0" y="806.0" height="31.0" width="303.0" data-name="InterventionTaskNotFoundException"></rect>
-						</g>
-						<g transform="translate(1473, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskNotFoundException">
-								<text x="143.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskNotFoundException">InterventionTaskNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportNotFoundException">
-							<rect x="1816.0" y="806.0" height="31.0" width="224.0" data-name="ReportNotFoundException"></rect>
-						</g>
-						<g transform="translate(1816, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportNotFoundException">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportNotFoundException">ReportNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionNotFoundException">
-							<rect x="2080.0" y="806.0" height="31.0" width="283.0" data-name="ReportSectionNotFoundException"></rect>
-						</g>
-						<g transform="translate(2080, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionNotFoundException">
-								<text x="133.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionNotFoundException">ReportSectionNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInviteNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInviteNotFoundException">
-							<rect x="2403.0" y="806.0" height="31.0" width="259.0" data-name="StudyInviteNotFoundException"></rect>
-						</g>
-						<g transform="translate(2403, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInviteNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInviteNotFoundException">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInviteNotFoundException">StudyInviteNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="UserNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UserNotFoundException">
-							<rect x="2702.0" y="806.0" height="31.0" width="208.0" data-name="UserNotFoundException"></rect>
-						</g>
-						<g transform="translate(2702, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserNotFoundException">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserNotFoundException">UserNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUApiClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApiClient">
-							<rect x="2297.0" y="2202.0" height="333.0" width="479.0" data-name="StudyUApiClient"></rect>
-							<path d="M2297.0 2233.0 L2776.0 2233.0" fill="none" data-name="StudyUApiClient"></path>
-							<path d="M2297.0 2309.0 L2776.0 2309.0" fill="none" data-name="StudyUApiClient"></path>
-						</g>
-						<g transform="translate(2297, 2202)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApiClient">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApiClient">StudyUApiClient</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2297, 2233)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+supabaseClient: SupabaseClient</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyColumns: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+testDelayMilliseconds: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2297, 2309)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">+dynamic getUserStudies()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudy()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudyInvite()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudyInvite()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudyInvite()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchUser()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApiClient">+dynamic saveUser()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyUApiClient">-dynamic _awaitGuarded()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyUApiClient">-dynamic _apiException()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyUApiClient">-dynamic _testDelay()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClient">
-							<rect x="2346.3" y="2575.0" height="31.0" width="141.0" data-name="SupabaseClient"></rect>
-						</g>
-						<g transform="translate(2346.25, 2575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClient">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClient">SupabaseClient</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseClientDependant">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClientDependant">
-							<rect x="2287.3" y="2017.0" height="62.0" width="284.0" data-name="SupabaseClientDependant"></rect>
-							<path d="M2287.3 2048.0 L2571.3 2048.0" fill="none" data-name="SupabaseClientDependant"></path>
-						</g>
-						<g transform="translate(2287.25, 2017)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseClientDependant">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClientDependant">
-								<text x="134.0" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClientDependant">SupabaseClientDependant</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2287.25, 2048)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseClientDependant">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseClientDependant">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseClientDependant">+supabaseClient: SupabaseClient</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseQueryMixin">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryMixin">
-							<rect x="2611.3" y="1979.5" height="137.0" width="215.0" data-name="SupabaseQueryMixin"></rect>
-							<path d="M2611.3 2010.5 L2826.3 2010.5" fill="none" data-name="SupabaseQueryMixin"></path>
-						</g>
-						<g transform="translate(2611.25, 1979.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseQueryMixin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryMixin">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryMixin">SupabaseQueryMixin</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2611.25, 2010.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryMixin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryMixin">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic deleteAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getById()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getByColumn()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseQueryMixin">+List&lt;T&gt; deserializeList()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SupabaseQueryMixin">+T deserializeObject()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="3558.0" y="1556.0" height="77.0" width="251.0" data-name="IStudyRepository"></rect>
-							<path d="M3558.0 1587.0 L3809.0 1587.0" fill="none" data-name="IStudyRepository"></path>
-						</g>
-						<g transform="translate(3558, 1556)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3558, 1587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyRepository">+dynamic launch()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyRepository">+dynamic deleteParticipants()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepository">
-							<rect x="2950.0" y="595.0" height="453.0" width="662.0" data-name="ModelRepository"></rect>
-							<path d="M2950.0 626.0 L3612.0 626.0" fill="none" data-name="ModelRepository"></path>
-							<path d="M2950.0 732.0 L3612.0 732.0" fill="none" data-name="ModelRepository"></path>
-						</g>
-						<g transform="translate(2950, 595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepository">
-								<text x="323.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepository">ModelRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2950, 626)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+delegate: IModelRepositoryDelegate&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">-_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">-_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">-_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2950, 732)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt;? get()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">+dynamic fetchAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">+dynamic fetch()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ModelRepository">-dynamic _buildModelSpecificController()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ModelRepository">+dynamic ensurePersisted()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt; upsertLocally()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ModelRepository">+List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ModelRepository">+dynamic emitUpdate()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ModelRepository">+dynamic emitModelEvent()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ModelRepository">+dynamic emitError()</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ModelRepository">+void dispose()</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ModelRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepository">
-							<rect x="3643.0" y="1703.5" height="183.0" width="403.0" data-name="StudyRepository"></rect>
-							<path d="M3643.0 1734.5 L4046.0 1734.5" fill="none" data-name="StudyRepository"></path>
-							<path d="M3643.0 1810.5 L4046.0 1810.5" fill="none" data-name="StudyRepository"></path>
-						</g>
-						<g transform="translate(3643, 1703.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepository">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepository">StudyRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3643, 1734.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+sortCallback: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3643, 1810.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+dynamic launch()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="3003.3" y="1934.0" height="228.0" width="295.0" data-name="IAuthRepository"></rect>
-							<path d="M3003.3 1965.0 L3298.3 1965.0" fill="none" data-name="IAuthRepository"></path>
-							<path d="M3003.3 2056.0 L3298.3 2056.0" fill="none" data-name="IAuthRepository"></path>
-						</g>
-						<g transform="translate(3003.25, 1934)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3003.25, 1965)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+allowPasswordReset: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+currentUser: User?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+isLoggedIn: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+session: Session?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+serializedSession: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3003.25, 2056)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+dynamic signUp()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+dynamic signInWith()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+dynamic signOut()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+dynamic updateUser()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IAuthRepository">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ProviderRef">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ProviderRef">
-							<rect x="4232.8" y="2032.5" height="31.0" width="109.0" data-name="ProviderRef"></rect>
-						</g>
-						<g transform="translate(4232.75, 2032.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ProviderRef">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProviderRef">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProviderRef">ProviderRef</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="4381.8" y="2032.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(4381.75, 2032.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepositoryDelegate">
-							<rect x="2108.8" y="1696.0" height="198.0" width="282.0" data-name="StudyRepositoryDelegate"></rect>
-							<path d="M2108.8 1727.0 L2390.8 1727.0" fill="none" data-name="StudyRepositoryDelegate"></path>
-							<path d="M2108.8 1773.0 L2390.8 1773.0" fill="none" data-name="StudyRepositoryDelegate"></path>
-						</g>
-						<g transform="translate(2108.75, 1696)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepositoryDelegate">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepositoryDelegate">StudyRepositoryDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2108.75, 1727)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+authRepository: IAuthRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2108.75, 1773)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic onError()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createNewInstance()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepositoryDelegate">
-							<rect x="2137.3" y="1088.0" height="152.0" width="225.0" data-name="IModelRepositoryDelegate"></rect>
-							<path d="M2137.3 1119.0 L2362.3 1119.0" fill="none" data-name="IModelRepositoryDelegate"></path>
-						</g>
-						<g transform="translate(2137.25, 1088)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepositoryDelegate">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepositoryDelegate">IModelRepositoryDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2137.25, 1119)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepositoryDelegate">+T createNewInstance()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepositoryDelegate">+T createDuplicate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic onError()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAppRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppRepository">
-							<rect x="1838.8" y="1556.0" height="77.0" width="230.0" data-name="IAppRepository"></rect>
-							<path d="M1838.8 1587.0 L2068.8 1587.0" fill="none" data-name="IAppRepository"></path>
-						</g>
-						<g transform="translate(1838.75, 1556)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppRepository">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAppRepository">IAppRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1838.75, 1587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppRepository">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAppRepository">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppRepository">
-							<rect x="1838.8" y="1741.0" height="108.0" width="230.0" data-name="AppRepository"></rect>
-							<path d="M1838.8 1772.0 L2068.8 1772.0" fill="none" data-name="AppRepository"></path>
-							<path d="M1838.8 1803.0 L2068.8 1803.0" fill="none" data-name="AppRepository"></path>
-						</g>
-						<g transform="translate(1838.75, 1741)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppRepository">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppRepository">AppRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1838.75, 1772)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+apiClient: StudyUApi</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1838.75, 1803)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppRepository">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WrappedModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WrappedModel">
-							<rect x="2114.5" y="0.0" height="258.0" width="251.0" data-name="WrappedModel"></rect>
-							<path d="M2114.5 31.0 L2365.5 31.0" fill="none" data-name="WrappedModel"></path>
-							<path d="M2114.5 182.0 L2365.5 182.0" fill="none" data-name="WrappedModel"></path>
-						</g>
-						<g transform="translate(2114.5, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WrappedModel">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="WrappedModel">WrappedModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2114.5, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">-_model: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+asyncValue: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+isLocalOnly: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+isDirty: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WrappedModel">+isDeleted: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WrappedModel">+lastSaved: DateTime?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WrappedModel">+lastFetched: DateTime?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WrappedModel">+lastUpdated: DateTime?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WrappedModel">+model: T</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2114.5, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">+dynamic markWithError()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+dynamic markAsLoading()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+dynamic markAsFetched()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+dynamic markAsSaved()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="2793.5" y="411.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
-						</g>
-						<g transform="translate(2793.5, 411)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelRepositoryException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepositoryException">
-							<rect x="3648.0" y="411.0" height="31.0" width="227.0" data-name="ModelRepositoryException"></rect>
-						</g>
-						<g transform="translate(3648, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelRepositoryException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepositoryException">
-								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepositoryException">ModelRepositoryException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelNotFoundException">
-							<rect x="3652.0" y="806.0" height="31.0" width="219.0" data-name="ModelNotFoundException"></rect>
-						</g>
-						<g transform="translate(3652, 806)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelNotFoundException">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelNotFoundException">ModelNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepository">
-							<rect x="3090.0" y="298.0" height="257.0" width="382.0" data-name="IModelRepository"></rect>
-							<path d="M3090.0 329.0 L3472.0 329.0" fill="none" data-name="IModelRepository"></path>
-						</g>
-						<g transform="translate(3090, 298)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepository">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepository">IModelRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3090, 329)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepository">+WrappedModel&lt;T&gt;? get()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepository">+dynamic fetchAll()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepository">+dynamic fetch()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepository">+dynamic save()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepository">+dynamic delete()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSave()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="IModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="IModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="IModelRepository">+dynamic ensurePersisted()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="IModelRepository">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="3058.8" y="113.5" height="31.0" width="184.0" data-name="IModelActionProvider"></rect>
-						</g>
-						<g transform="translate(3058.75, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BehaviorSubject">
-							<rect x="2877.3" y="1148.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
-						</g>
-						<g transform="translate(2877.25, 1148.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BehaviorSubject">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="BehaviorSubject">BehaviorSubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyLaunched">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyLaunched">
-							<rect x="3915.0" y="411.0" height="31.0" width="140.0" data-name="StudyLaunched"></rect>
-						</g>
-						<g transform="translate(3915, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyLaunched">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyLaunched">
-								<text x="62.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyLaunched">StudyLaunched</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelEvent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelEvent">
-							<rect x="4622.5" y="90.5" height="77.0" width="145.0" data-name="ModelEvent"></rect>
-							<path d="M4622.5 121.5 L4767.5 121.5" fill="none" data-name="ModelEvent"></path>
-						</g>
-						<g transform="translate(4622.5, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelEvent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelEvent">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelEvent">ModelEvent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4622.5, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelEvent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelEvent">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelEvent">+modelId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelEvent">+model: T</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IInviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="3062.3" y="1133.0" height="62.0" width="265.0" data-name="IInviteCodeRepository"></rect>
-							<path d="M3062.3 1164.0 L3327.3 1164.0" fill="none" data-name="IInviteCodeRepository"></path>
-						</g>
-						<g transform="translate(3062.25, 1133)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3062.25, 1164)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IInviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IInviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepository">
-							<rect x="3079.5" y="1280.0" height="213.0" width="403.0" data-name="InviteCodeRepository"></rect>
-							<path d="M3079.5 1311.0 L3482.5 1311.0" fill="none" data-name="InviteCodeRepository"></path>
-							<path d="M3079.5 1417.0 L3482.5 1417.0" fill="none" data-name="InviteCodeRepository"></path>
-						</g>
-						<g transform="translate(3079.5, 1280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepository">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepository">InviteCodeRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3079.5, 1311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepository">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepository">+study: Study</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3079.5, 1417)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+dynamic emitUpdate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="1737.8" y="1579.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(1737.75, 1579)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepositoryDelegate">
-							<rect x="1578.8" y="1280.0" height="213.0" width="299.0" data-name="InviteCodeRepositoryDelegate"></rect>
-							<path d="M1578.8 1311.0 L1877.8 1311.0" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
-							<path d="M1578.8 1372.0 L1877.8 1372.0" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
-						</g>
-						<g transform="translate(1578.75, 1280)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepositoryDelegate">
-								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepositoryDelegate">InviteCodeRepositoryDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1578.75, 1311)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+apiClient: StudyUApi</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+studyRepository: IStudyRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1578.75, 1372)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic onError()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createDuplicate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createNewInstance()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="User">
-						<g fill="#eee8d5" stroke="#33322E" data-name="User">
-							<rect x="2789.5" y="2575.0" height="31.0" width="53.0" data-name="User"></rect>
-						</g>
-						<g transform="translate(2789.5, 2575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="User">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="User">
-								<text x="18.5" y="13.5" stroke="none" text-anchor="middle" data-name="User">User</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Session">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Session">
-							<rect x="3216.3" y="2575.0" height="31.0" width="79.0" data-name="Session"></rect>
-						</g>
-						<g transform="translate(3216.25, 2575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Session">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Session">
-								<text x="31.5" y="13.5" stroke="none" text-anchor="middle" data-name="Session">Session</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAppDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
-							<rect x="2968.8" y="1779.5" height="31.0" width="123.0" data-name="IAppDelegate"></rect>
-						</g>
-						<g transform="translate(2968.75, 1779.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
-								<text x="53.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthRepository">
-							<rect x="2875.8" y="2217.0" height="303.0" width="340.0" data-name="AuthRepository"></rect>
-							<path d="M2875.8 2248.0 L3215.8 2248.0" fill="none" data-name="AuthRepository"></path>
-							<path d="M2875.8 2384.0 L3215.8 2384.0" fill="none" data-name="AuthRepository"></path>
-						</g>
-						<g transform="translate(2875.75, 2217)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthRepository">
-								<text x="162.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthRepository">AuthRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2875.75, 2248)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">+supabaseClient: SupabaseClient</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+sharedPreferences: SharedPreferences</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+allowPasswordReset: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+authClient: GoTrueClient</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+session: Session?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+serializedSession: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+currentUser: User?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthRepository">+isLoggedIn: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2875.75, 2384)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">-void _registerAuthListener()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+dynamic signUp()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+dynamic signInWith()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+dynamic signOut()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+dynamic updateUser()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+void dispose()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthRepository">+dynamic onAppStart()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SharedPreferences">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SharedPreferences">
-							<rect x="3335.3" y="2575.0" height="31.0" width="169.0" data-name="SharedPreferences"></rect>
-						</g>
-						<g transform="translate(3335.25, 2575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SharedPreferences">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SharedPreferences">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="SharedPreferences">SharedPreferences</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoTrueClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoTrueClient">
-							<rect x="3544.3" y="2575.0" height="31.0" width="120.0" data-name="GoTrueClient"></rect>
-						</g>
-						<g transform="translate(3544.25, 2575)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoTrueClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoTrueClient">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoTrueClient">GoTrueClient</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IUserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="3967.3" y="1533.0" height="123.0" width="260.0" data-name="IUserRepository"></rect>
-							<path d="M3967.3 1564.0 L4227.3 1564.0" fill="none" data-name="IUserRepository"></path>
-							<path d="M3967.3 1595.0 L4227.3 1595.0" fill="none" data-name="IUserRepository"></path>
-						</g>
-						<g transform="translate(3967.25, 1533)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3967.25, 1564)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+user: StudyUUser</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3967.25, 1595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+dynamic fetchUser()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IUserRepository">+dynamic saveUser()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IUserRepository">+dynamic updatePreferences()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUUser">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUUser">
-							<rect x="4565.8" y="2032.5" height="31.0" width="110.0" data-name="StudyUUser"></rect>
-						</g>
-						<g transform="translate(4565.75, 2032.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUUser">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUUser">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUUser">StudyUUser</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="UserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UserRepository">
-							<rect x="3321.0" y="1711.0" height="168.0" width="282.0" data-name="UserRepository"></rect>
-							<path d="M3321.0 1742.0 L3603.0 1742.0" fill="none" data-name="UserRepository"></path>
-							<path d="M3321.0 1818.0 L3603.0 1818.0" fill="none" data-name="UserRepository"></path>
-						</g>
-						<g transform="translate(3321, 1711)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserRepository">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserRepository">UserRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3321, 1742)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+ref: Ref&lt;Object?&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="UserRepository">+user: StudyUUser</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3321, 1818)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+dynamic fetchUser()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+dynamic saveUser()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+dynamic updatePreferences()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Ref">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Ref">
-							<rect x="4715.8" y="2032.5" height="31.0" width="43.0" data-name="Ref"></rect>
-						</g>
-						<g transform="translate(4715.75, 2032.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Ref">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Ref">
-								<text x="13.5" y="13.5" stroke="none" text-anchor="middle" data-name="Ref">Ref</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PreferenceAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreferenceAction">
-							<rect x="4095.0" y="373.0" height="107.0" width="334.0" data-name="PreferenceAction"></rect>
-							<path d="M4095.0 404.0 L4429.0 404.0" fill="none" data-name="PreferenceAction"></path>
-						</g>
-						<g transform="translate(4095, 373)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreferenceAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreferenceAction">
-								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="PreferenceAction">PreferenceAction</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4095, 404)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreferenceAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreferenceAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreferenceAction">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+values: List&lt;PreferenceAction&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pin: PreferenceAction</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pinOff: PreferenceAction</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="4239.8" y="113.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(4239.75, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IsFetched">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsFetched">
-							<rect x="4519.0" y="411.0" height="31.0" width="94.0" data-name="IsFetched"></rect>
-						</g>
-						<g transform="translate(4519, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsFetched">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsFetched">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsFetched">IsFetched</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IsSaving">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaving">
-							<rect x="4653.0" y="411.0" height="31.0" width="84.0" data-name="IsSaving"></rect>
-						</g>
-						<g transform="translate(4653, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaving">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaving">
-								<text x="34.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaving">IsSaving</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IsSaved">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaved">
-							<rect x="4777.0" y="411.0" height="31.0" width="80.0" data-name="IsSaved"></rect>
-						</g>
-						<g transform="translate(4777, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaved">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaved">
-								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaved">IsSaved</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IsDeleted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsDeleted">
-							<rect x="4897.0" y="411.0" height="31.0" width="91.0" data-name="IsDeleted"></rect>
-						</g>
-						<g transform="translate(4897, 411)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsDeleted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsDeleted">
-								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="IsDeleted">IsDeleted</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseQueryError">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryError">
-							<rect x="5028.0" y="380.5" height="92.0" width="183.0" data-name="SupabaseQueryError"></rect>
-							<path d="M5028.0 411.5 L5211.0 411.5" fill="none" data-name="SupabaseQueryError"></path>
-						</g>
-						<g transform="translate(5028, 380.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseQueryError">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryError">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryError">SupabaseQueryError</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5028, 411.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryError">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryError">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryError">+statusCode: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryError">+message: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryError">+details: dynamic</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/routing/uml.svg b/docs/uml/designer_v2/lib/routing/uml.svg
deleted file mode 100644
index 956bf0220..000000000
--- a/docs/uml/designer_v2/lib/routing/uml.svg
+++ /dev/null
@@ -1,680 +0,0 @@
-<svg version="1.1" baseProfile="full" width="4151.0" height="893.0" viewbox="0 0 4151 893" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[RouterKeys
-	  |
-	  &lt;static&gt;+studyKey: ValueKey&lt;String&gt;;
-	  &lt;static&gt;+authKey: ValueKey&lt;String&gt;
-	]
-	
-	[RouterKeys]o-[ValueKey]
-	
-	[RouteParams
-	  |
-	  &lt;static&gt;+studiesFilter: String;
-	  &lt;static&gt;+studyId: String;
-	  &lt;static&gt;+measurementId: String;
-	  &lt;static&gt;+interventionId: String;
-	  &lt;static&gt;+testAppRoute: String
-	]
-	
-	[RouterConf
-	  |
-	  &lt;static&gt;+router: GoRouter;
-	  &lt;static&gt;+routes: List&lt;GoRoute&gt;;
-	  &lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;;
-	  &lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;
-	  |
-	  &lt;static&gt;+GoRoute route()
-	]
-	
-	[RouterConf]o-[GoRouter]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs
-	  |
-	  +studyId: String
-	]
-	
-	[&lt;abstract&gt;QuestionFormRouteArgs
-	  |
-	  +questionId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[&lt;abstract&gt;QuestionFormRouteArgs]
-	
-	[ScreenerQuestionFormRouteArgs
-	]
-	
-	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:-[ScreenerQuestionFormRouteArgs]
-	
-	[ConsentItemFormRouteArgs
-	  |
-	  +consentId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ConsentItemFormRouteArgs]
-	
-	[MeasurementFormRouteArgs
-	  |
-	  +measurementId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[MeasurementFormRouteArgs]
-	
-	[SurveyQuestionFormRouteArgs
-	  |
-	  +questionId: String
-	]
-	
-	[MeasurementFormRouteArgs]&lt;:-[SurveyQuestionFormRouteArgs]
-	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:--[SurveyQuestionFormRouteArgs]
-	
-	[InterventionFormRouteArgs
-	  |
-	  +interventionId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[InterventionFormRouteArgs]
-	
-	[InterventionTaskFormRouteArgs
-	  |
-	  +taskId: String
-	]
-	
-	[InterventionFormRouteArgs]&lt;:-[InterventionTaskFormRouteArgs]
-	
-	[ReportItemFormRouteArgs
-	  |
-	  +sectionId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ReportItemFormRouteArgs]
-	
-	[&lt;abstract&gt;GoRouteParamEnum
-	  |
-	  +String toRouteParam();
-	  +String toShortString()
-	]
-	
-	[RoutingIntents
-	  |
-	  &lt;static&gt;+root: RoutingIntent;
-	  &lt;static&gt;+studies: RoutingIntent;
-	  &lt;static&gt;+studiesShared: RoutingIntent;
-	  &lt;static&gt;+publicRegistry: RoutingIntent;
-	  &lt;static&gt;+study: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEdit: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditInfo: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditInterventions: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String);
-	  &lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditReports: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String);
-	  &lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute});
-	  &lt;static&gt;+studyRecruit: RoutingIntent Function(String);
-	  &lt;static&gt;+studyMonitor: RoutingIntent Function(String);
-	  &lt;static&gt;+studyAnalyze: RoutingIntent Function(String);
-	  &lt;static&gt;+studySettings: RoutingIntent Function(String);
-	  &lt;static&gt;+accountSettings: RoutingIntent;
-	  &lt;static&gt;+studyNew: RoutingIntent;
-	  &lt;static&gt;+login: RoutingIntent;
-	  &lt;static&gt;+signup: RoutingIntent;
-	  &lt;static&gt;+passwordForgot: RoutingIntent;
-	  &lt;static&gt;+passwordForgot2: RoutingIntent Function(String);
-	  &lt;static&gt;+passwordRecovery: RoutingIntent;
-	  &lt;static&gt;+error: RoutingIntent Function(Exception)
-	]
-	
-	[RoutingIntents]o-[RoutingIntent]
-	[RoutingIntents]o-[RoutingIntent Function(String)]
-	[RoutingIntents]o-[RoutingIntent Function(String, String)]
-	[RoutingIntents]o-[RoutingIntent Function(String, {String? appRoute})]
-	[RoutingIntents]o-[RoutingIntent Function(Exception)]
-	
-	[RoutingIntent
-	  |
-	  +route: GoRoute;
-	  +params: Map&lt;String, String&gt;;
-	  +queryParams: Map&lt;String, String&gt;;
-	  +dispatch: RoutingIntentDispatch?;
-	  +extra: Object?;
-	  +routeName: String;
-	  +arguments: Map&lt;String, String&gt;;
-	  +props: List&lt;Object?&gt;
-	  |
-	  -dynamic _validateRoute();
-	  +bool matches()
-	]
-	
-	[RoutingIntent]o-[GoRoute]
-	[RoutingIntent]o-[RoutingIntentDispatch]
-	[&lt;abstract&gt;Equatable]&lt;:-[RoutingIntent]
-	
-	[RoutingIntentDispatch
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;;
-	  &lt;static&gt;+go: RoutingIntentDispatch;
-	  &lt;static&gt;+push: RoutingIntentDispatch
-	]
-	
-	[RoutingIntentDispatch]o-[RoutingIntentDispatch]
-	[Enum]&lt;:--[RoutingIntentDispatch]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="893.0" width="4151.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M156.0 275.7 L156 457 L156 568 L156.0 568.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M161.3 266.3 L156.0 275.7 L150.7 266.3 L156.0 257.0 Z"></path>
-					</g>
-					<path d="M822.0 306.2 L822 457 L822 568 L822.0 568.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M827.3 296.8 L822.0 306.2 L816.7 296.8 L822.0 287.5 Z"></path>
-					</g>
-					<path d="M1477.1 254.8 L1013 457 L1013 552.5 L1013.0 552.5 " fill="none"></path>
-					<path d="M1479.2 259.7 L1477.1 254.8 L1475.0 249.9 L1489.3 249.5 Z"></path>
-					<path d="M1006.0 627.7 L993 710 L993 768 L993.0 768.0 " fill="none"></path>
-					<path d="M1011.3 628.5 L1006.0 627.7 L1000.7 626.8 L1008.1 614.5 Z"></path>
-					<path d="M1513.5 258.1 L1277.5 457 L1277.5 552.5 L1277.5 552.5 " fill="none"></path>
-					<path d="M1517.0 262.2 L1513.5 258.1 L1510.1 254.0 L1523.7 249.5 Z"></path>
-					<path d="M1560.5 262.8 L1560.5 457 L1560.5 552.5 L1560.5 552.5 " fill="none"></path>
-					<path d="M1565.8 262.8 L1560.5 262.8 L1555.2 262.8 L1560.5 249.5 Z"></path>
-					<path d="M1560.5 627.8 L1560.5 710 L1548.9353741496598 752.5 L1548.9 752.5 " fill="none"></path>
-					<path d="M1565.8 627.8 L1560.5 627.8 L1555.2 627.8 L1560.5 614.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M1087.1 620.4 L1266.75 710 L1425.0408163265306 752.5 L1425.0 752.5 " fill="none"></path>
-					</g>
-					<path d="M1089.5 615.7 L1087.1 620.4 L1084.7 625.2 L1075.2 614.5 Z"></path>
-					<path d="M1609.1 257.9 L1854.5 457 L1854.5 552.5 L1854.5 552.5 " fill="none"></path>
-					<path d="M1612.4 253.8 L1609.1 257.9 L1605.7 262.0 L1598.7 249.5 Z"></path>
-					<path d="M1854.5 627.8 L1854.5 710 L1854.5 752.5 L1854.5 752.5 " fill="none"></path>
-					<path d="M1859.8 627.8 L1854.5 627.8 L1849.2 627.8 L1854.5 614.5 Z"></path>
-					<path d="M1646.0 254.7 L2124 457 L2124 552.5 L2124.0 552.5 " fill="none"></path>
-					<path d="M1648.1 249.8 L1646.0 254.7 L1643.9 259.6 L1633.7 249.5 Z"></path>
-					<path d="M2795.2 353.5 L2563 457 L2541.2608695652175 477 L2541.3 477.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2805.9 354.6 L2795.2 353.5 L2801.6 344.9 L2812.3 345.9 Z"></path>
-					</g>
-					<path d="M2796.7 419.5 L2740.5 457 L2740.5 568 L2740.5 568.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2807.4 418.8 L2796.7 419.5 L2801.5 409.9 L2812.3 409.2 Z"></path>
-					</g>
-					<path d="M3061.7 455.4 L3061.5 457 L3061.5 568 L3061.5 568.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3068.4 447.0 L3061.7 455.4 L3057.9 445.4 L3064.6 437.0 Z"></path>
-					</g>
-					<path d="M3399.9 416.0 L3462.5 457 L3462.5 568 L3462.5 568.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3395.0 406.4 L3399.9 416.0 L3389.1 415.3 L3384.3 405.8 Z"></path>
-					</g>
-					<path d="M3402.0 314.7 L3851.5 457 L3851.5 568 L3851.5 568.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3394.8 306.8 L3402.0 314.7 L3391.5 317.0 L3384.3 309.1 Z"></path>
-					</g>
-					<path d="M2262.0 700.9 L2249.25 710 L2249.25 768 L2249.3 768.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2272.6 699.8 L2262.0 700.9 L2266.4 691.1 L2277.1 690.0 Z"></path>
-					</g>
-					<path d="M2552.6 702.8 L2560.25 710 L3245.25 767.7710843373494 L3245.3 767.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2549.4 692.5 L2552.6 702.8 L2542.1 700.3 L2538.9 690.0 Z"></path>
-					</g>
-					<path d="M2405.5 247.3 L2405.5 457 L2408.6620553359685 477 L2408.7 477.0 " fill="none"></path>
-					<path d="M2410.8 247.3 L2405.5 247.3 L2400.2 247.3 L2405.5 234.0 Z"></path>
-					<path d="M3636.4 732.9 L3648.25 730 L3655.75 730 L3655.75 730 L3663.25 783.5 L3663.25 783.5 L3655.75 837 L3655.75 837 L3648.25 837 L3648.25 837 L3618.25 829.5866050808314 L3618.3 829.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3626.0 730.0 L3636.4 732.9 L3628.6 740.4 L3618.3 737.4 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M4064.5 612.3 L4064.5 710 L3618.25 761.8362307388384 L3618.3 761.8 " fill="none"></path>
-					</g>
-					<path d="M4069.8 612.3 L4064.5 612.3 L4059.2 612.3 L4064.5 599.0 Z"></path>
-					<g data-name="RouterKeys">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouterKeys">
-							<rect x="0.0" y="180.0" height="77.0" width="312.0" data-name="RouterKeys"></rect>
-							<path d="M0.0 211.0 L312.0 211.0" fill="none" data-name="RouterKeys"></path>
-						</g>
-						<g transform="translate(0, 180)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterKeys">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterKeys">
-								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterKeys">RouterKeys</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 211)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterKeys">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterKeys">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+studyKey: ValueKey&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+authKey: ValueKey&lt;String&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ValueKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ValueKey">
-							<rect x="110.5" y="568.0" height="31.0" width="91.0" data-name="ValueKey"></rect>
-						</g>
-						<g transform="translate(110.5, 568)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueKey">
-								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueKey">ValueKey</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RouteParams">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteParams">
-							<rect x="352.0" y="157.5" height="122.0" width="267.0" data-name="RouteParams"></rect>
-							<path d="M352.0 188.5 L619.0 188.5" fill="none" data-name="RouteParams"></path>
-						</g>
-						<g transform="translate(352, 157.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteParams">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteParams">
-								<text x="125.5" y="13.5" stroke="none" text-anchor="middle" data-name="RouteParams">RouteParams</text>
-								
-							</g>
-						</g>
-						<g transform="translate(352, 188.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteParams">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteParams">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studiesFilter: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteParams">&lt;static&gt;+measurementId: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteParams">&lt;static&gt;+interventionId: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RouteParams">&lt;static&gt;+testAppRoute: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RouterConf">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouterConf">
-							<rect x="659.0" y="149.5" height="138.0" width="326.0" data-name="RouterConf"></rect>
-							<path d="M659.0 180.5 L985.0 180.5" fill="none" data-name="RouterConf"></path>
-							<path d="M659.0 256.5 L985.0 256.5" fill="none" data-name="RouterConf"></path>
-						</g>
-						<g transform="translate(659, 149.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterConf">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterConf">RouterConf</text>
-								
-							</g>
-						</g>
-						<g transform="translate(659, 180.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+router: GoRouter</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouterConf">&lt;static&gt;+routes: List&lt;GoRoute&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouterConf">&lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouterConf">&lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(659, 256.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+GoRoute route()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="776.0" y="568.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(776, 568)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="1468.5" y="187.5" height="62.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
-							<path d="M1468.5 218.5 L1652.5 218.5" fill="none" data-name="StudyFormRouteArgs"></path>
-						</g>
-						<g transform="translate(1468.5, 187.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1468.5, 218.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormRouteArgs">+studyId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormRouteArgs">
-							<rect x="908.0" y="552.5" height="62.0" width="210.0" data-name="QuestionFormRouteArgs"></rect>
-							<path d="M908.0 583.5 L1118.0 583.5" fill="none" data-name="QuestionFormRouteArgs"></path>
-						</g>
-						<g transform="translate(908, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormRouteArgs">
-								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormRouteArgs">QuestionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(908, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormRouteArgs">+questionId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormRouteArgs">
-							<rect x="852.0" y="768.0" height="31.0" width="282.0" data-name="ScreenerQuestionFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(852, 768)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormRouteArgs">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormRouteArgs">ScreenerQuestionFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormRouteArgs">
-							<rect x="1158.0" y="552.5" height="62.0" width="239.0" data-name="ConsentItemFormRouteArgs"></rect>
-							<path d="M1158.0 583.5 L1397.0 583.5" fill="none" data-name="ConsentItemFormRouteArgs"></path>
-						</g>
-						<g transform="translate(1158, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormRouteArgs">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormRouteArgs">ConsentItemFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1158, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormRouteArgs">+consentId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="1437.0" y="552.5" height="62.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
-							<path d="M1437.0 583.5 L1684.0 583.5" fill="none" data-name="MeasurementFormRouteArgs"></path>
-						</g>
-						<g transform="translate(1437, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1437, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementFormRouteArgs">+measurementId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormRouteArgs">
-							<rect x="1408.0" y="752.5" height="62.0" width="265.0" data-name="SurveyQuestionFormRouteArgs"></rect>
-							<path d="M1408.0 783.5 L1673.0 783.5" fill="none" data-name="SurveyQuestionFormRouteArgs"></path>
-						</g>
-						<g transform="translate(1408, 752.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormRouteArgs">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormRouteArgs">SurveyQuestionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1408, 783.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormRouteArgs">+questionId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="1738.0" y="552.5" height="62.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
-							<path d="M1738.0 583.5 L1971.0 583.5" fill="none" data-name="InterventionFormRouteArgs"></path>
-						</g>
-						<g transform="translate(1738, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1738, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormRouteArgs">+interventionId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormRouteArgs">
-							<rect x="1719.0" y="752.5" height="62.0" width="271.0" data-name="InterventionTaskFormRouteArgs"></rect>
-							<path d="M1719.0 783.5 L1990.0 783.5" fill="none" data-name="InterventionTaskFormRouteArgs"></path>
-						</g>
-						<g transform="translate(1719, 752.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormRouteArgs">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormRouteArgs">InterventionTaskFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1719, 783.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormRouteArgs">+taskId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormRouteArgs">
-							<rect x="2011.0" y="552.5" height="62.0" width="226.0" data-name="ReportItemFormRouteArgs"></rect>
-							<path d="M2011.0 583.5 L2237.0 583.5" fill="none" data-name="ReportItemFormRouteArgs"></path>
-						</g>
-						<g transform="translate(2011, 552.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormRouteArgs">
-								<text x="105.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormRouteArgs">ReportItemFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2011, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormRouteArgs">+sectionId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouteParamEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouteParamEnum">
-							<rect x="2115.5" y="180.0" height="77.0" width="202.0" data-name="GoRouteParamEnum"></rect>
-							<path d="M2115.5 211.0 L2317.5 211.0" fill="none" data-name="GoRouteParamEnum"></path>
-						</g>
-						<g transform="translate(2115.5, 180)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GoRouteParamEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouteParamEnum">
-								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouteParamEnum">GoRouteParamEnum</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2115.5, 211)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouteParamEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouteParamEnum">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouteParamEnum">+String toRouteParam()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GoRouteParamEnum">+String toShortString()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntents">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntents">
-							<rect x="2812.3" y="0.0" height="437.0" width="572.0" data-name="RoutingIntents"></rect>
-							<path d="M2812.3 31.0 L3384.3 31.0" fill="none" data-name="RoutingIntents"></path>
-						</g>
-						<g transform="translate(2812.25, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntents">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntents">
-								<text x="278.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntents">RoutingIntents</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2812.25, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntents">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntents">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+root: RoutingIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studies: RoutingIntent</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studiesShared: RoutingIntent</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+publicRegistry: RoutingIntent</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+study: RoutingIntent Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEdit: RoutingIntent Function(String)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInfo: RoutingIntent Function(String)</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String)</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInterventions: RoutingIntent Function(String)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String)</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditReports: RoutingIntent Function(String)</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String)</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute})</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyRecruit: RoutingIntent Function(String)</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyMonitor: RoutingIntent Function(String)</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyAnalyze: RoutingIntent Function(String)</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studySettings: RoutingIntent Function(String)</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+accountSettings: RoutingIntent</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyNew: RoutingIntent</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+login: RoutingIntent</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+signup: RoutingIntent</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot: RoutingIntent</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot2: RoutingIntent Function(String)</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordRecovery: RoutingIntent</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+error: RoutingIntent Function(Exception)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="2277.0" y="477.0" height="213.0" width="297.0" data-name="RoutingIntent"></rect>
-							<path d="M2277.0 508.0 L2574.0 508.0" fill="none" data-name="RoutingIntent"></path>
-							<path d="M2277.0 644.0 L2574.0 644.0" fill="none" data-name="RoutingIntent"></path>
-						</g>
-						<g transform="translate(2277, 477)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2277, 508)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">+route: GoRoute</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+params: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntent">+queryParams: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntent">+dispatch: RoutingIntentDispatch?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntent">+extra: Object?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntent">+routeName: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntent">+arguments: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntent">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2277, 644)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">-dynamic _validateRoute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+bool matches()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String)">
-							<rect x="2614.0" y="568.0" height="31.0" width="253.0" data-name="RoutingIntent Function(String)"></rect>
-						</g>
-						<g transform="translate(2614, 568)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String)">
-								<text x="118.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String)">RoutingIntent Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(String, String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, String)">
-							<rect x="2907.0" y="568.0" height="31.0" width="309.0" data-name="RoutingIntent Function(String, String)"></rect>
-						</g>
-						<g transform="translate(2907, 568)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, String)">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, String)">RoutingIntent Function(String, String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(String, {String? appRoute})">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, {String? appRoute})">
-							<rect x="3256.0" y="568.0" height="31.0" width="413.0" data-name="RoutingIntent Function(String, {String? appRoute})"></rect>
-						</g>
-						<g transform="translate(3256, 568)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, {String? appRoute})">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, {String? appRoute})">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, {String? appRoute})">RoutingIntent Function(String, {String? appRoute})</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(Exception)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(Exception)">
-							<rect x="3709.0" y="568.0" height="31.0" width="285.0" data-name="RoutingIntent Function(Exception)"></rect>
-						</g>
-						<g transform="translate(3709, 568)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(Exception)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(Exception)">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(Exception)">RoutingIntent Function(Exception)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRoute">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRoute">
-							<rect x="2206.3" y="768.0" height="31.0" width="86.0" data-name="GoRoute"></rect>
-						</g>
-						<g transform="translate(2206.25, 768)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRoute">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRoute">
-								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRoute">GoRoute</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntentDispatch">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntentDispatch">
-							<rect x="3245.3" y="730.0" height="107.0" width="373.0" data-name="RoutingIntentDispatch"></rect>
-							<path d="M3245.3 761.0 L3618.3 761.0" fill="none" data-name="RoutingIntentDispatch"></path>
-						</g>
-						<g transform="translate(3245.25, 730)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntentDispatch">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntentDispatch">
-								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntentDispatch">RoutingIntentDispatch</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3245.25, 761)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntentDispatch">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntentDispatch">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntentDispatch">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+go: RoutingIntentDispatch</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+push: RoutingIntentDispatch</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="2357.5" y="203.0" height="31.0" width="96.0" data-name="Equatable"></rect>
-						</g>
-						<g transform="translate(2357.5, 203)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="4034.0" y="568.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(4034, 568)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/services/uml.svg b/docs/uml/designer_v2/lib/services/uml.svg
deleted file mode 100644
index 49812d478..000000000
--- a/docs/uml/designer_v2/lib/services/uml.svg
+++ /dev/null
@@ -1,518 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2988.8" height="472.0" viewbox="0 0 2988.75 472" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[&lt;abstract&gt;IClipboardService
-	  |
-	  +dynamic copy()
-	]
-	
-	[ClipboardService
-	  |
-	  +dynamic copy()
-	]
-	
-	[&lt;abstract&gt;IClipboardService]&lt;:--[ClipboardService]
-	
-	[&lt;abstract&gt;NotificationIntent
-	  |
-	  +message: String?;
-	  +customContent: Widget?;
-	  +icon: IconData?;
-	  +actions: List&lt;NotificationAction&gt;?;
-	  +type: NotificationType
-	  |
-	  +void register()
-	]
-	
-	[&lt;abstract&gt;NotificationIntent]o-[&lt;abstract&gt;Widget]
-	[&lt;abstract&gt;NotificationIntent]o-[IconData]
-	[&lt;abstract&gt;NotificationIntent]o-[NotificationType]
-	
-	[NotificationAction
-	  |
-	  +label: String;
-	  +onSelect: dynamic Function();
-	  +isDestructive: bool
-	]
-	
-	[NotificationAction]o-[dynamic Function()]
-	
-	[SnackbarIntent
-	  |
-	  +duration: int?
-	]
-	
-	[&lt;abstract&gt;NotificationIntent]&lt;:-[SnackbarIntent]
-	
-	[AlertIntent
-	  |
-	  +title: String;
-	  +dismissOnAction: bool;
-	  +isDestructive: dynamic
-	]
-	
-	[&lt;abstract&gt;NotificationIntent]&lt;:-[AlertIntent]
-	
-	[NotificationType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;NotificationType&gt;;
-	  &lt;static&gt;+snackbar: NotificationType;
-	  &lt;static&gt;+alert: NotificationType;
-	  &lt;static&gt;+custom: NotificationType
-	]
-	
-	[NotificationType]o-[NotificationType]
-	[Enum]&lt;:--[NotificationType]
-	
-	[NotificationDispatcher
-	  |
-	  +child: Widget?;
-	  +snackbarInnerPadding: double;
-	  +snackbarWidth: double?;
-	  +snackbarBehavior: SnackBarBehavior;
-	  +snackbarDefaultDuration: int
-	]
-	
-	[NotificationDispatcher]o-[&lt;abstract&gt;Widget]
-	[NotificationDispatcher]o-[SnackBarBehavior]
-	
-	[Notifications
-	  |
-	  &lt;static&gt;+credentialsInvalid: SnackbarIntent;
-	  &lt;static&gt;+userAlreadyRegistered: SnackbarIntent;
-	  &lt;static&gt;+passwordReset: SnackbarIntent;
-	  &lt;static&gt;+passwordResetSuccess: SnackbarIntent;
-	  &lt;static&gt;+studyDeleted: SnackbarIntent;
-	  &lt;static&gt;+inviteCodeDeleted: SnackbarIntent;
-	  &lt;static&gt;+inviteCodeClipped: SnackbarIntent;
-	  &lt;static&gt;+studyDeleteConfirmation: AlertIntent
-	]
-	
-	[Notifications]o-[SnackbarIntent]
-	[Notifications]o-[AlertIntent]
-	
-	[NotificationDefaultActions
-	  |
-	  &lt;static&gt;+cancel: NotificationAction
-	]
-	
-	[NotificationDefaultActions]o-[NotificationAction]
-	
-	[&lt;abstract&gt;INotificationService
-	  |
-	  +void showMessage();
-	  +void show();
-	  +Stream&lt;NotificationIntent&gt; watchNotifications();
-	  +void dispose()
-	]
-	
-	[NotificationService
-	  |
-	  -_streamController: BehaviorSubject&lt;NotificationIntent&gt;
-	  |
-	  +Stream&lt;NotificationIntent&gt; watchNotifications();
-	  +void showMessage();
-	  +void show();
-	  +void dispose()
-	]
-	
-	[NotificationService]o-[BehaviorSubject]
-	[&lt;abstract&gt;INotificationService]&lt;:--[NotificationService]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="472.0" width="2988.8" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<g stroke-dasharray="6 6">
-						<path d="M78.0 127.8 L78 187 L78 245 L78.0 245.0 " fill="none"></path>
-					</g>
-					<path d="M83.3 127.8 L78.0 127.8 L72.7 127.8 L78.0 114.5 Z"></path>
-					<path d="M471.5 120.0 L173.5 187 L415.75 264.6246624662466 L415.8 264.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M481.8 123.1 L471.5 120.0 L479.5 112.7 L489.8 115.9 Z"></path>
-					</g>
-					<path d="M763.3 170.4 L788 187 L788 260.5 L788.0 260.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M758.5 160.8 L763.3 170.4 L752.5 169.6 L747.8 160.0 Z"></path>
-					</g>
-					<path d="M795.4 139.8 L931 187 L963.4044943820224 215 L963.4 215.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M788.3 131.7 L795.4 139.8 L784.8 141.7 L777.8 133.6 Z"></path>
-					</g>
-					<path d="M1438.5 340.7 L1438.5 365 L1438.5 385 L1438.5 385.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1443.8 331.3 L1438.5 340.7 L1433.2 331.3 L1438.5 322.0 Z"></path>
-					</g>
-					<path d="M791.0 100.8 L1576.5 187 L1640.3651685393259 245 L1640.4 245.0 " fill="none"></path>
-					<path d="M791.6 95.5 L791.0 100.8 L790.4 106.1 L777.8 99.3 Z"></path>
-					<path d="M791.0 97.5 L1799.5 187 L1840.5674157303372 230 L1840.6 230.0 " fill="none"></path>
-					<path d="M791.5 92.2 L791.0 97.5 L790.6 102.8 L777.8 96.3 Z"></path>
-					<path d="M1214.4 223.2 L1242.5 215 L1254 215 L1254 215 L1265.5 276 L1265.5 276 L1254 337 L1254 337 L1242.5 337 L1242.5 337 L1196.5 323.5419664268585 L1196.5 323.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1204.0 220.7 L1214.4 223.2 L1207.0 231.0 L1196.5 228.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M891.3 98.7 L1141.25 187 L1107.508426966292 215 L1107.5 215.0 " fill="none"></path>
-					</g>
-					<path d="M893.1 93.7 L891.3 98.7 L889.5 103.7 L878.8 94.3 Z"></path>
-					<path d="M1388.7 105.3 L708.5 187 L486.75 263.7181729834791 L486.8 263.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1398.6 109.4 L1388.7 105.3 L1397.3 98.8 L1407.3 103.0 Z"></path>
-					</g>
-					<path d="M1750.6 118.3 L2107.5 187 L2107.5 260.5 L2107.5 260.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1742.4 111.3 L1750.6 118.3 L1740.4 121.8 L1732.3 114.8 Z"></path>
-					</g>
-					<path d="M2042.5 129.0 L1759.5 187 L1704.1067415730338 245 L1704.1 245.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2052.7 132.3 L2042.5 129.0 L2050.5 121.9 L2060.8 125.2 Z"></path>
-					</g>
-					<path d="M2043.2 162.9 L1976 187 L1931.7921348314608 230 L1931.8 230.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2053.8 164.7 L2043.2 162.9 L2050.2 154.7 L2060.8 156.6 Z"></path>
-					</g>
-					<path d="M1192.9 119.5 L1438.5 187 L1438.5 230 L1438.5 230.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1185.4 111.8 L1192.9 119.5 L1182.5 122.1 L1174.9 114.5 Z"></path>
-					</g>
-					<path d="M2705.3 363.7 L2705.25 365 L2705.25 385 L2705.3 385.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2710.6 354.3 L2705.3 363.7 L2699.9 354.3 L2705.3 345.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M2705.3 150.3 L2705.25 187 L2705.25 207 L2705.3 207.0 " fill="none"></path>
-					</g>
-					<path d="M2710.6 150.3 L2705.3 150.3 L2699.9 150.3 L2705.3 137.0 Z"></path>
-					<g data-name="IClipboardService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IClipboardService">
-							<rect x="0.0" y="52.5" height="62.0" width="156.0" data-name="IClipboardService"></rect>
-							<path d="M0.0 83.5 L156.0 83.5" fill="none" data-name="IClipboardService"></path>
-						</g>
-						<g transform="translate(0, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IClipboardService">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="IClipboardService">IClipboardService</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IClipboardService">
-								<text x="0.0" y="13.5" stroke="none" data-name="IClipboardService">+dynamic copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ClipboardService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ClipboardService">
-							<rect x="2.5" y="245.0" height="62.0" width="151.0" data-name="ClipboardService"></rect>
-							<path d="M2.5 276.0 L153.5 276.0" fill="none" data-name="ClipboardService"></path>
-						</g>
-						<g transform="translate(2.5, 245)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ClipboardService">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="ClipboardService">ClipboardService</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2.5, 276)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ClipboardService">
-								<text x="0.0" y="13.5" stroke="none" data-name="ClipboardService">+dynamic copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationIntent">
-							<rect x="489.8" y="7.0" height="153.0" width="288.0" data-name="NotificationIntent"></rect>
-							<path d="M489.8 38.0 L777.8 38.0" fill="none" data-name="NotificationIntent"></path>
-							<path d="M489.8 129.0 L777.8 129.0" fill="none" data-name="NotificationIntent"></path>
-						</g>
-						<g transform="translate(489.75, 7)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationIntent">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationIntent">NotificationIntent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(489.75, 38)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+message: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationIntent">+customContent: Widget?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationIntent">+icon: IconData?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationIntent">+actions: List&lt;NotificationAction&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationIntent">+type: NotificationType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(489.75, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+void register()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="415.8" y="260.5" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(415.75, 260.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="744.5" y="260.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(744.5, 260.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationType">
-							<rect x="871.5" y="215.0" height="122.0" width="325.0" data-name="NotificationType"></rect>
-							<path d="M871.5 246.0 L1196.5 246.0" fill="none" data-name="NotificationType"></path>
-						</g>
-						<g transform="translate(871.5, 215)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationType">
-								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationType">NotificationType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(871.5, 246)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationType">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationType">&lt;static&gt;+values: List&lt;NotificationType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationType">&lt;static&gt;+snackbar: NotificationType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationType">&lt;static&gt;+alert: NotificationType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationType">&lt;static&gt;+custom: NotificationType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationAction">
-							<rect x="1310.5" y="230.0" height="92.0" width="256.0" data-name="NotificationAction"></rect>
-							<path d="M1310.5 261.0 L1566.5 261.0" fill="none" data-name="NotificationAction"></path>
-						</g>
-						<g transform="translate(1310.5, 230)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationAction">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationAction">NotificationAction</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1310.5, 261)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationAction">+label: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationAction">+onSelect: dynamic Function()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationAction">+isDestructive: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="1355.0" y="385.0" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(1355, 385)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SnackbarIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SnackbarIntent">
-							<rect x="1606.5" y="245.0" height="62.0" width="136.0" data-name="SnackbarIntent"></rect>
-							<path d="M1606.5 276.0 L1742.5 276.0" fill="none" data-name="SnackbarIntent"></path>
-						</g>
-						<g transform="translate(1606.5, 245)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackbarIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackbarIntent">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackbarIntent">SnackbarIntent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1606.5, 276)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SnackbarIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SnackbarIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="SnackbarIntent">+duration: int?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AlertIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AlertIntent">
-							<rect x="1782.5" y="230.0" height="92.0" width="204.0" data-name="AlertIntent"></rect>
-							<path d="M1782.5 261.0 L1986.5 261.0" fill="none" data-name="AlertIntent"></path>
-						</g>
-						<g transform="translate(1782.5, 230)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AlertIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AlertIntent">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="AlertIntent">AlertIntent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1782.5, 261)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AlertIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AlertIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="AlertIntent">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AlertIntent">+dismissOnAction: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AlertIntent">+isDestructive: dynamic</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="817.8" y="68.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(817.75, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationDispatcher">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDispatcher">
-							<rect x="1407.3" y="22.5" height="122.0" width="325.0" data-name="NotificationDispatcher"></rect>
-							<path d="M1407.3 53.5 L1732.3 53.5" fill="none" data-name="NotificationDispatcher"></path>
-						</g>
-						<g transform="translate(1407.25, 22.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDispatcher">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDispatcher">
-								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDispatcher">NotificationDispatcher</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1407.25, 53.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDispatcher">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDispatcher">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDispatcher">+child: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationDispatcher">+snackbarInnerPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationDispatcher">+snackbarWidth: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationDispatcher">+snackbarBehavior: SnackBarBehavior</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationDispatcher">+snackbarDefaultDuration: int</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SnackBarBehavior">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SnackBarBehavior">
-							<rect x="2026.5" y="260.5" height="31.0" width="162.0" data-name="SnackBarBehavior"></rect>
-						</g>
-						<g transform="translate(2026.5, 260.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackBarBehavior">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackBarBehavior">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackBarBehavior">SnackBarBehavior</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Notifications">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Notifications">
-							<rect x="2060.8" y="0.0" height="167.0" width="407.0" data-name="Notifications"></rect>
-							<path d="M2060.8 31.0 L2467.8 31.0" fill="none" data-name="Notifications"></path>
-						</g>
-						<g transform="translate(2060.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Notifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notifications">
-								<text x="195.5" y="13.5" stroke="none" text-anchor="middle" data-name="Notifications">Notifications</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2060.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Notifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Notifications">
-								<text x="0.0" y="13.5" stroke="none" data-name="Notifications">&lt;static&gt;+credentialsInvalid: SnackbarIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Notifications">&lt;static&gt;+userAlreadyRegistered: SnackbarIntent</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordReset: SnackbarIntent</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordResetSuccess: SnackbarIntent</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleted: SnackbarIntent</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeDeleted: SnackbarIntent</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeClipped: SnackbarIntent</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleteConfirmation: AlertIntent</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationDefaultActions">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDefaultActions">
-							<rect x="918.8" y="52.5" height="62.0" width="287.0" data-name="NotificationDefaultActions"></rect>
-							<path d="M918.8 83.5 L1205.8 83.5" fill="none" data-name="NotificationDefaultActions"></path>
-						</g>
-						<g transform="translate(918.75, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDefaultActions">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDefaultActions">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDefaultActions">NotificationDefaultActions</text>
-								
-							</g>
-						</g>
-						<g transform="translate(918.75, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDefaultActions">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDefaultActions">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDefaultActions">&lt;static&gt;+cancel: NotificationAction</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="INotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="2507.8" y="30.0" height="107.0" width="395.0" data-name="INotificationService"></rect>
-							<path d="M2507.8 61.0 L2902.8 61.0" fill="none" data-name="INotificationService"></path>
-						</g>
-						<g transform="translate(2507.75, 30)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
-								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2507.75, 61)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="INotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="INotificationService">+void showMessage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="INotificationService">+void show()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="INotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="INotificationService">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationService">
-							<rect x="2477.8" y="207.0" height="138.0" width="455.0" data-name="NotificationService"></rect>
-							<path d="M2477.8 238.0 L2932.8 238.0" fill="none" data-name="NotificationService"></path>
-							<path d="M2477.8 269.0 L2932.8 269.0" fill="none" data-name="NotificationService"></path>
-						</g>
-						<g transform="translate(2477.75, 207)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationService">
-								<text x="219.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationService">NotificationService</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2477.75, 238)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">-_streamController: BehaviorSubject&lt;NotificationIntent&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2477.75, 269)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationService">+void showMessage()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationService">+void show()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationService">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BehaviorSubject">
-							<rect x="2632.8" y="385.0" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
-						</g>
-						<g transform="translate(2632.75, 385)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BehaviorSubject">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="BehaviorSubject">BehaviorSubject</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/uml.svg b/docs/uml/designer_v2/lib/uml.svg
deleted file mode 100644
index 45a13971a..000000000
--- a/docs/uml/designer_v2/lib/uml.svg
+++ /dev/null
@@ -1,16439 +0,0 @@
-<svg version="1.1" baseProfile="full" width="84151.5" height="4748.0" viewbox="0 0 84151.5 4748" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[Config
-	  |
-	  &lt;static&gt;+isDebugMode: bool;
-	  &lt;static&gt;+defaultLocale: Set&lt;String&gt;;
-	  &lt;static&gt;+supportedLocales: Map&lt;String, String&gt;;
-	  &lt;static&gt;+newStudyId: String;
-	  &lt;static&gt;+newModelId: String;
-	  &lt;static&gt;+minSplashTime: int;
-	  &lt;static&gt;+formAutosaveDebounce: int
-	]
-	
-	[StudyMonitorData
-	  |
-	  +activeParticipants: int;
-	  +dropoutParticipants: int;
-	  +completedParticipants: int;
-	  +items: List&lt;StudyMonitorItem&gt;
-	]
-	
-	[StudyMonitorItem
-	  |
-	  +participantId: String;
-	  +inviteCode: String?;
-	  +enrolledAt: DateTime;
-	  +lastActivityAt: DateTime;
-	  +currentDayOfStudy: int;
-	  +studyDurationInDays: int;
-	  +completedInterventions: int;
-	  +missedInterventions: int;
-	  +completedSurveys: int;
-	  +missedSurveys: int;
-	  +droppedOut: bool;
-	  +missedTasksPerDay: List&lt;Set&lt;String&gt;&gt;;
-	  +completedTasksPerDay: List&lt;Set&lt;String&gt;&gt;;
-	  +props: List&lt;Object?&gt;
-	]
-	
-	[&lt;abstract&gt;Equatable]&lt;:-[StudyMonitorItem]
-	
-	[&lt;abstract&gt;ResultTypes
-	]
-	
-	[MeasurementResultTypes
-	  |
-	  &lt;static&gt;+questionnaire: String;
-	  &lt;static&gt;+values: List&lt;String&gt;
-	]
-	
-	[&lt;abstract&gt;ResultTypes]&lt;:-[MeasurementResultTypes]
-	
-	[InterventionResultTypes
-	  |
-	  &lt;static&gt;+checkmarkTask: String;
-	  &lt;static&gt;+values: List&lt;String&gt;
-	]
-	
-	[&lt;abstract&gt;ResultTypes]&lt;:-[InterventionResultTypes]
-	
-	[StudyExportData
-	  |
-	  +study: Study;
-	  +measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
-	  +interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;;
-	  +mediaData: List&lt;String&gt;;
-	  +isEmpty: bool
-	]
-	
-	[StudyExportData]o-[Study]
-	
-	[StudyTemplates
-	  |
-	  &lt;static&gt;+kUnnamedStudyTitle: String
-	  |
-	  &lt;static&gt;+Study emptyDraft()
-	]
-	
-	[StudyActionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyActionType&gt;;
-	  &lt;static&gt;+pin: StudyActionType;
-	  &lt;static&gt;+pinoff: StudyActionType;
-	  &lt;static&gt;+edit: StudyActionType;
-	  &lt;static&gt;+duplicate: StudyActionType;
-	  &lt;static&gt;+duplicateDraft: StudyActionType;
-	  &lt;static&gt;+addCollaborator: StudyActionType;
-	  &lt;static&gt;+export: StudyActionType;
-	  &lt;static&gt;+delete: StudyActionType
-	]
-	
-	[StudyActionType]o-[StudyActionType]
-	[Enum]&lt;:--[StudyActionType]
-	
-	[Notifications
-	  |
-	  &lt;static&gt;+credentialsInvalid: SnackbarIntent;
-	  &lt;static&gt;+userAlreadyRegistered: SnackbarIntent;
-	  &lt;static&gt;+passwordReset: SnackbarIntent;
-	  &lt;static&gt;+passwordResetSuccess: SnackbarIntent;
-	  &lt;static&gt;+studyDeleted: SnackbarIntent;
-	  &lt;static&gt;+inviteCodeDeleted: SnackbarIntent;
-	  &lt;static&gt;+inviteCodeClipped: SnackbarIntent;
-	  &lt;static&gt;+studyDeleteConfirmation: AlertIntent
-	]
-	
-	[Notifications]o-[SnackbarIntent]
-	[Notifications]o-[AlertIntent]
-	
-	[NotificationDefaultActions
-	  |
-	  &lt;static&gt;+cancel: NotificationAction
-	]
-	
-	[NotificationDefaultActions]o-[NotificationAction]
-	
-	[&lt;abstract&gt;INotificationService
-	  |
-	  +void showMessage();
-	  +void show();
-	  +Stream&lt;NotificationIntent&gt; watchNotifications();
-	  +void dispose()
-	]
-	
-	[NotificationService
-	  |
-	  -_streamController: BehaviorSubject&lt;NotificationIntent&gt;
-	  |
-	  +Stream&lt;NotificationIntent&gt; watchNotifications();
-	  +void showMessage();
-	  +void show();
-	  +void dispose()
-	]
-	
-	[NotificationService]o-[BehaviorSubject]
-	[&lt;abstract&gt;INotificationService]&lt;:--[NotificationService]
-	
-	[&lt;abstract&gt;NotificationIntent
-	  |
-	  +message: String?;
-	  +customContent: Widget?;
-	  +icon: IconData?;
-	  +actions: List&lt;NotificationAction&gt;?;
-	  +type: NotificationType
-	  |
-	  +void register()
-	]
-	
-	[&lt;abstract&gt;NotificationIntent]o-[&lt;abstract&gt;Widget]
-	[&lt;abstract&gt;NotificationIntent]o-[IconData]
-	[&lt;abstract&gt;NotificationIntent]o-[NotificationType]
-	
-	[NotificationAction
-	  |
-	  +label: String;
-	  +onSelect: dynamic Function();
-	  +isDestructive: bool
-	]
-	
-	[NotificationAction]o-[dynamic Function()]
-	
-	[SnackbarIntent
-	  |
-	  +duration: int?
-	]
-	
-	[&lt;abstract&gt;NotificationIntent]&lt;:-[SnackbarIntent]
-	
-	[AlertIntent
-	  |
-	  +title: String;
-	  +dismissOnAction: bool;
-	  +isDestructive: dynamic
-	]
-	
-	[&lt;abstract&gt;NotificationIntent]&lt;:-[AlertIntent]
-	
-	[NotificationType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;NotificationType&gt;;
-	  &lt;static&gt;+snackbar: NotificationType;
-	  &lt;static&gt;+alert: NotificationType;
-	  &lt;static&gt;+custom: NotificationType
-	]
-	
-	[NotificationType]o-[NotificationType]
-	[Enum]&lt;:--[NotificationType]
-	
-	[&lt;abstract&gt;IClipboardService
-	  |
-	  +dynamic copy()
-	]
-	
-	[ClipboardService
-	  |
-	  +dynamic copy()
-	]
-	
-	[&lt;abstract&gt;IClipboardService]&lt;:--[ClipboardService]
-	
-	[NotificationDispatcher
-	  |
-	  +child: Widget?;
-	  +snackbarInnerPadding: double;
-	  +snackbarWidth: double?;
-	  +snackbarBehavior: SnackBarBehavior;
-	  +snackbarDefaultDuration: int
-	]
-	
-	[NotificationDispatcher]o-[&lt;abstract&gt;Widget]
-	[NotificationDispatcher]o-[SnackBarBehavior]
-	
-	[Assets
-	  |
-	  &lt;static&gt;+logoWide: String
-	]
-	
-	[AsyncValueWidget
-	  |
-	  +value: AsyncValue&lt;T&gt;;
-	  +data: Widget Function(T);
-	  +error: Widget Function(Object, StackTrace?)?;
-	  +loading: Widget Function()?;
-	  +empty: Widget Function()?
-	  |
-	  +Widget build();
-	  -Widget _buildDataOrEmptyWidget();
-	  -Widget _defaultError();
-	  -Widget _defaultLoad()
-	]
-	
-	[AsyncValueWidget]o-[&lt;abstract&gt;AsyncValue]
-	[AsyncValueWidget]o-[Widget Function(T)]
-	[AsyncValueWidget]o-[Widget Function(Object, StackTrace?)?]
-	[AsyncValueWidget]o-[Widget Function()?]
-	
-	[FormControlLabel
-	  |
-	  +formControl: AbstractControl&lt;dynamic&gt;;
-	  +text: String;
-	  +isClickable: bool;
-	  +textStyle: TextStyle?;
-	  +onClick: void Function(AbstractControl&lt;dynamic&gt;)?
-	  |
-	  +Widget build()
-	]
-	
-	[FormControlLabel]o-[&lt;abstract&gt;AbstractControl]
-	[FormControlLabel]o-[TextStyle]
-	[FormControlLabel]o-[void Function(AbstractControl&lt;dynamic&gt;)?]
-	
-	[ActionPopUpMenuButton
-	  |
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +triggerIconColor: Color?;
-	  +triggerIconColorHover: Color?;
-	  +triggerIconSize: double;
-	  +disableSplashEffect: bool;
-	  +hideOnEmpty: bool;
-	  +orientation: Axis;
-	  +elevation: double?;
-	  +splashRadius: double?;
-	  +enabled: bool;
-	  +position: PopupMenuPosition
-	  |
-	  +Widget build();
-	  -Widget _buildPopupMenu()
-	]
-	
-	[ActionPopUpMenuButton]o-[Color]
-	[ActionPopUpMenuButton]o-[Axis]
-	[ActionPopUpMenuButton]o-[PopupMenuPosition]
-	
-	[Search
-	  |
-	  +onQueryChanged: dynamic Function(String);
-	  +searchController: SearchController?;
-	  +hintText: String?;
-	  +initialText: String?
-	]
-	
-	[Search]o-[dynamic Function(String)]
-	[Search]o-[SearchController]
-	
-	[SearchController
-	  |
-	  +setText: void Function(String)
-	]
-	
-	[SearchController]o-[void Function(String)]
-	
-	[FormScaffold
-	  |
-	  +formViewModel: T;
-	  +actions: List&lt;Widget&gt;?;
-	  +body: Widget;
-	  +drawer: Widget?;
-	  +actionsSpacing: double;
-	  +actionsPadding: double
-	]
-	
-	[FormScaffold]o-[&lt;abstract&gt;Widget]
-	
-	[ConstrainedWidthFlexible
-	  |
-	  +minWidth: double;
-	  +maxWidth: double;
-	  +flex: int;
-	  +flexSum: int;
-	  +child: Widget;
-	  +outerConstraints: BoxConstraints
-	  |
-	  +Widget build();
-	  -double _getWidth()
-	]
-	
-	[ConstrainedWidthFlexible]o-[&lt;abstract&gt;Widget]
-	[ConstrainedWidthFlexible]o-[BoxConstraints]
-	
-	[PrimaryButton
-	  |
-	  +text: String;
-	  +icon: IconData?;
-	  +isLoading: bool;
-	  +showLoadingEarliestAfterMs: int;
-	  +onPressed: void Function()?;
-	  +tooltip: String;
-	  +tooltipDisabled: String;
-	  +enabled: bool;
-	  +onPressedFuture: dynamic Function()?;
-	  +innerPadding: EdgeInsets;
-	  +minimumSize: Size?;
-	  +isDisabled: bool
-	]
-	
-	[PrimaryButton]o-[IconData]
-	[PrimaryButton]o-[void Function()?]
-	[PrimaryButton]o-[dynamic Function()?]
-	[PrimaryButton]o-[EdgeInsets]
-	[PrimaryButton]o-[Size]
-	
-	[FormTableRow
-	  |
-	  +label: String?;
-	  +labelBuilder: Widget Function(BuildContext)?;
-	  +labelStyle: TextStyle?;
-	  +labelHelpText: String?;
-	  +input: Widget;
-	  +control: AbstractControl&lt;dynamic&gt;?;
-	  +layout: FormTableRowLayout?
-	]
-	
-	[FormTableRow]o-[Widget Function(BuildContext)?]
-	[FormTableRow]o-[TextStyle]
-	[FormTableRow]o-[&lt;abstract&gt;Widget]
-	[FormTableRow]o-[&lt;abstract&gt;AbstractControl]
-	[FormTableRow]o-[FormTableRowLayout]
-	
-	[FormTableLayout
-	  |
-	  +rows: List&lt;FormTableRow&gt;;
-	  +columnWidths: Map&lt;int, TableColumnWidth&gt;;
-	  +rowDivider: Widget?;
-	  +rowLayout: FormTableRowLayout?;
-	  +rowLabelStyle: TextStyle?
-	  |
-	  +Widget build()
-	]
-	
-	[FormTableLayout]o-[&lt;abstract&gt;Widget]
-	[FormTableLayout]o-[FormTableRowLayout]
-	[FormTableLayout]o-[TextStyle]
-	
-	[FormSectionHeader
-	  |
-	  +title: String;
-	  +titleTextStyle: TextStyle?;
-	  +helpText: String?;
-	  +divider: bool;
-	  +helpTextDisabled: bool
-	  |
-	  +Widget build()
-	]
-	
-	[FormSectionHeader]o-[TextStyle]
-	
-	[FormLabel
-	  |
-	  +labelText: String?;
-	  +helpText: String?;
-	  +labelTextStyle: TextStyle?;
-	  +layout: FormTableRowLayout?
-	  |
-	  +Widget build()
-	]
-	
-	[FormLabel]o-[TextStyle]
-	[FormLabel]o-[FormTableRowLayout]
-	
-	[FormTableRowLayout
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;FormTableRowLayout&gt;;
-	  &lt;static&gt;+vertical: FormTableRowLayout;
-	  &lt;static&gt;+horizontal: FormTableRowLayout
-	]
-	
-	[FormTableRowLayout]o-[FormTableRowLayout]
-	[Enum]&lt;:--[FormTableRowLayout]
-	
-	[DismissButton
-	  |
-	  +onPressed: void Function()?;
-	  +text: String?
-	  |
-	  +Widget build()
-	]
-	
-	[DismissButton]o-[void Function()?]
-	
-	[Badge
-	  |
-	  +icon: IconData?;
-	  +color: Color?;
-	  +borderRadius: double;
-	  +label: String;
-	  +type: BadgeType;
-	  +padding: EdgeInsets;
-	  +iconSize: double?;
-	  +labelStyle: TextStyle?;
-	  +center: bool
-	  |
-	  +Widget build();
-	  -Color? _getBackgroundColor();
-	  -Color _getBorderColor();
-	  -Color? _getLabelColor()
-	]
-	
-	[Badge]o-[IconData]
-	[Badge]o-[Color]
-	[Badge]o-[BadgeType]
-	[Badge]o-[EdgeInsets]
-	[Badge]o-[TextStyle]
-	
-	[BadgeType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;BadgeType&gt;;
-	  &lt;static&gt;+filled: BadgeType;
-	  &lt;static&gt;+outlined: BadgeType;
-	  &lt;static&gt;+outlineFill: BadgeType;
-	  &lt;static&gt;+plain: BadgeType
-	]
-	
-	[BadgeType]o-[BadgeType]
-	[Enum]&lt;:--[BadgeType]
-	
-	[StandardDialog
-	  |
-	  +title: Widget?;
-	  +titleText: String?;
-	  +body: Widget;
-	  +actionButtons: List&lt;Widget&gt;;
-	  +backgroundColor: Color?;
-	  +borderRadius: double?;
-	  +width: double?;
-	  +height: double?;
-	  +minWidth: double;
-	  +minHeight: double;
-	  +maxWidth: double?;
-	  +maxHeight: double?;
-	  +padding: EdgeInsets
-	  |
-	  +Widget build()
-	]
-	
-	[StandardDialog]o-[&lt;abstract&gt;Widget]
-	[StandardDialog]o-[Color]
-	[StandardDialog]o-[EdgeInsets]
-	
-	[&lt;abstract&gt;ISyncIndicatorViewModel
-	  |
-	  +isDirty: bool;
-	  +lastSynced: DateTime?
-	]
-	
-	[SyncIndicator
-	  |
-	  +state: AsyncValue&lt;T&gt;;
-	  +lastSynced: DateTime?;
-	  +isDirty: bool;
-	  +animationDuration: int;
-	  +iconSize: double
-	]
-	
-	[SyncIndicator]o-[&lt;abstract&gt;AsyncValue]
-	
-	[&lt;abstract&gt;IWithBanner
-	  |
-	  +Widget? banner()
-	]
-	
-	[BannerBox
-	  |
-	  +prefixIcon: Widget?;
-	  +body: Widget;
-	  +style: BannerStyle;
-	  +padding: EdgeInsets?;
-	  +noPrefix: bool;
-	  +dismissable: bool;
-	  +isDismissed: bool?;
-	  +onDismissed: dynamic Function()?;
-	  +dismissIconSize: double
-	]
-	
-	[BannerBox]o-[&lt;abstract&gt;Widget]
-	[BannerBox]o-[BannerStyle]
-	[BannerBox]o-[EdgeInsets]
-	[BannerBox]o-[dynamic Function()?]
-	
-	[BannerStyle
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;BannerStyle&gt;;
-	  &lt;static&gt;+warning: BannerStyle;
-	  &lt;static&gt;+info: BannerStyle;
-	  &lt;static&gt;+error: BannerStyle
-	]
-	
-	[BannerStyle]o-[BannerStyle]
-	[Enum]&lt;:--[BannerStyle]
-	
-	[ActionMenuInline
-	  |
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +iconSize: double?;
-	  +visible: bool;
-	  +splashRadius: double?;
-	  +paddingVertical: double?;
-	  +paddingHorizontal: double?
-	  |
-	  +Widget build()
-	]
-	
-	[Collapsible
-	  |
-	  +contentBuilder: Widget Function(BuildContext, bool);
-	  +headerBuilder: Widget Function(BuildContext, bool)?;
-	  +title: String?;
-	  +isCollapsed: bool
-	]
-	
-	[Collapsible]o-[Widget Function(BuildContext, bool)]
-	[Collapsible]o-[Widget Function(BuildContext, bool)?]
-	
-	[NavbarTab
-	  |
-	  +title: String;
-	  +intent: RoutingIntent?;
-	  +index: int;
-	  +enabled: bool
-	]
-	
-	[NavbarTab]o-[RoutingIntent]
-	
-	[TabbedNavbar
-	  |
-	  +tabs: List&lt;T&gt;;
-	  +selectedTab: T?;
-	  +indicator: BoxDecoration?;
-	  +height: double?;
-	  +disabledBackgroundColor: Color?;
-	  +disabledTooltipText: String?;
-	  +onSelect: void Function(int, T)?;
-	  +labelPadding: EdgeInsets?;
-	  +labelSpacing: double?;
-	  +indicatorSize: TabBarIndicatorSize?;
-	  +isScrollable: bool;
-	  +backgroundColor: Color?;
-	  +labelColorHover: Color?;
-	  +unselectedLabelColorHover: Color?
-	]
-	
-	[TabbedNavbar]o-[BoxDecoration]
-	[TabbedNavbar]o-[Color]
-	[TabbedNavbar]o-[void Function(int, T)?]
-	[TabbedNavbar]o-[EdgeInsets]
-	[TabbedNavbar]o-[TabBarIndicatorSize]
-	
-	[SidesheetTab
-	  |
-	  +builder: Widget Function(BuildContext)
-	]
-	
-	[SidesheetTab]o-[Widget Function(BuildContext)]
-	[NavbarTab]&lt;:-[SidesheetTab]
-	
-	[Sidesheet
-	  |
-	  &lt;static&gt;+kDefaultWidth: double;
-	  +titleText: String;
-	  +body: Widget?;
-	  +tabs: List&lt;SidesheetTab&gt;?;
-	  +actionButtons: List&lt;Widget&gt;?;
-	  +width: double?;
-	  +withCloseButton: bool;
-	  +ignoreAppBar: bool;
-	  +collapseSingleTab: bool;
-	  +bodyPadding: EdgeInsets?;
-	  +wrapContent: Widget Function(Widget)?
-	]
-	
-	[Sidesheet]o-[&lt;abstract&gt;Widget]
-	[Sidesheet]o-[EdgeInsets]
-	[Sidesheet]o-[Widget Function(Widget)?]
-	
-	[FormSideSheetTab
-	  |
-	  +formViewBuilder: Widget Function(T)
-	]
-	
-	[FormSideSheetTab]o-[Widget Function(T)]
-	[NavbarTab]&lt;:-[FormSideSheetTab]
-	
-	[HelpIcon
-	  |
-	  +tooltipText: String?
-	  |
-	  +Widget build()
-	]
-	
-	[EmptyBody
-	  |
-	  +icon: IconData?;
-	  +leading: Widget?;
-	  +leadingSpacing: double?;
-	  +title: String?;
-	  +description: String?;
-	  +button: Widget?
-	  |
-	  +Widget build()
-	]
-	
-	[EmptyBody]o-[IconData]
-	[EmptyBody]o-[&lt;abstract&gt;Widget]
-	
-	[IndicatorRangeSliderThumbShape
-	  |
-	  +buildContext: BuildContext;
-	  +start: T;
-	  +end: T
-	  |
-	  +Size getPreferredSize();
-	  +void paint()
-	]
-	
-	[IndicatorRangeSliderThumbShape]o-[&lt;abstract&gt;BuildContext]
-	[&lt;abstract&gt;RangeSliderThumbShape]&lt;:-[IndicatorRangeSliderThumbShape]
-	
-	[MouseEventsRegion
-	  |
-	  +onTap: void Function()?;
-	  +onHover: void Function(PointerHoverEvent)?;
-	  +onEnter: void Function(PointerEnterEvent)?;
-	  +onExit: void Function(PointerExitEvent)?;
-	  +autoselectCursor: bool;
-	  +cursor: SystemMouseCursor;
-	  &lt;static&gt;+defaultCursor: SystemMouseCursor;
-	  +autoCursor: SystemMouseCursor
-	]
-	
-	[MouseEventsRegion]o-[void Function()?]
-	[MouseEventsRegion]o-[void Function(PointerHoverEvent)?]
-	[MouseEventsRegion]o-[void Function(PointerEnterEvent)?]
-	[MouseEventsRegion]o-[void Function(PointerExitEvent)?]
-	[MouseEventsRegion]o-[SystemMouseCursor]
-	
-	[ReactiveCustomColorPicker
-	]
-	
-	[ReactiveFormField]&lt;:-[ReactiveCustomColorPicker]
-	
-	[TextParagraph
-	  |
-	  +text: String?;
-	  +style: TextStyle?;
-	  +selectable: bool;
-	  +span: List&lt;TextSpan&gt;?
-	  |
-	  +Widget build()
-	]
-	
-	[TextParagraph]o-[TextStyle]
-	
-	[UnderConstruction
-	  |
-	  +Widget build()
-	]
-	
-	[NullHelperDecoration
-	]
-	
-	[InputDecoration]&lt;:-[NullHelperDecoration]
-	
-	[ActionMenuType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ActionMenuType&gt;;
-	  &lt;static&gt;+inline: ActionMenuType;
-	  &lt;static&gt;+popup: ActionMenuType
-	]
-	
-	[ActionMenuType]o-[ActionMenuType]
-	[Enum]&lt;:--[ActionMenuType]
-	
-	[HtmlStylingBanner
-	  |
-	  +isDismissed: bool;
-	  +onDismissed: dynamic Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[HtmlStylingBanner]o-[dynamic Function()?]
-	
-	[&lt;abstract&gt;FormConsumerWidget
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;FormConsumerRefWidget
-	  |
-	  +Widget build()
-	]
-	
-	[SplashPage
-	  |
-	  +Widget build()
-	]
-	
-	[ErrorPage
-	  |
-	  +error: Exception?
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ErrorPage]
-	
-	[StudyULogo
-	  |
-	  +onTap: void Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[StudyULogo]o-[void Function()?]
-	
-	[SingleColumnLayout
-	  |
-	  &lt;static&gt;+defaultConstraints: BoxConstraints;
-	  &lt;static&gt;+defaultConstraintsNarrow: BoxConstraints;
-	  +body: Widget;
-	  +header: Widget?;
-	  +stickyHeader: bool;
-	  +constraints: BoxConstraints?;
-	  +scroll: bool;
-	  +padding: EdgeInsets?
-	  |
-	  &lt;static&gt;+dynamic fromType()
-	]
-	
-	[SingleColumnLayout]o-[BoxConstraints]
-	[SingleColumnLayout]o-[&lt;abstract&gt;Widget]
-	[SingleColumnLayout]o-[EdgeInsets]
-	
-	[SingleColumnLayoutType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;;
-	  &lt;static&gt;+boundedWide: SingleColumnLayoutType;
-	  &lt;static&gt;+boundedNarrow: SingleColumnLayoutType;
-	  &lt;static&gt;+stretched: SingleColumnLayoutType;
-	  &lt;static&gt;+split: SingleColumnLayoutType
-	]
-	
-	[SingleColumnLayoutType]o-[SingleColumnLayoutType]
-	[Enum]&lt;:--[SingleColumnLayoutType]
-	
-	[Hyperlink
-	  |
-	  +text: String;
-	  +url: String?;
-	  +onClick: void Function()?;
-	  +linkColor: Color;
-	  +hoverColor: Color?;
-	  +visitedColor: Color?;
-	  +style: TextStyle?;
-	  +hoverStyle: TextStyle?;
-	  +visitedStyle: TextStyle?;
-	  +icon: IconData?;
-	  +iconSize: double?
-	]
-	
-	[Hyperlink]o-[void Function()?]
-	[Hyperlink]o-[Color]
-	[Hyperlink]o-[TextStyle]
-	[Hyperlink]o-[IconData]
-	
-	[StandardTableColumn
-	  |
-	  +label: String;
-	  +tooltip: String?;
-	  +columnWidth: TableColumnWidth;
-	  +sortable: bool;
-	  +sortAscending: bool?;
-	  +sortableIcon: Widget?
-	]
-	
-	[StandardTableColumn]o-[&lt;abstract&gt;TableColumnWidth]
-	[StandardTableColumn]o-[&lt;abstract&gt;Widget]
-	
-	[StandardTable
-	  |
-	  +items: List&lt;T&gt;;
-	  +inputColumns: List&lt;StandardTableColumn&gt;;
-	  +onSelectItem: void Function(T);
-	  +trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?;
-	  +trailingActionsMenuType: ActionMenuType?;
-	  +sortColumnPredicates: List&lt;int Function(T, T)?&gt;?;
-	  +pinnedPredicates: int Function(T, T)?;
-	  +headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
-	  +dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?;
-	  +inputTrailingActionsColumn: StandardTableColumn;
-	  +tableWrapper: Widget Function(Widget)?;
-	  +cellSpacing: double;
-	  +rowSpacing: double;
-	  +minRowHeight: double?;
-	  +headerMaxLines: int;
-	  +showTableHeader: bool;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  +leadingWidget: Widget?;
-	  +trailingWidget: Widget?;
-	  +leadingWidgetSpacing: double?;
-	  +trailingWidgetSpacing: double?;
-	  +emptyWidget: Widget?;
-	  +rowStyle: StandardTableStyle;
-	  +disableRowInteractions: bool
-	]
-	
-	[StandardTable]o-[void Function(T)]
-	[StandardTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?]
-	[StandardTable]o-[ActionMenuType]
-	[StandardTable]o-[int Function(T, T)?]
-	[StandardTable]o-[TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?]
-	[StandardTable]o-[StandardTableColumn]
-	[StandardTable]o-[Widget Function(Widget)?]
-	[StandardTable]o-[&lt;abstract&gt;Widget]
-	[StandardTable]o-[StandardTableStyle]
-	
-	[StandardTableStyle
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StandardTableStyle&gt;;
-	  &lt;static&gt;+plain: StandardTableStyle;
-	  &lt;static&gt;+material: StandardTableStyle
-	]
-	
-	[StandardTableStyle]o-[StandardTableStyle]
-	[Enum]&lt;:--[StandardTableStyle]
-	
-	[IconPack
-	  |
-	  &lt;static&gt;+defaultPack: List&lt;IconOption&gt;;
-	  &lt;static&gt;+material: List&lt;IconOption&gt;
-	  |
-	  &lt;static&gt;+IconOption? resolveIconByName()
-	]
-	
-	[IconOption
-	  |
-	  +name: String;
-	  +icon: IconData?;
-	  +isEmpty: bool;
-	  +props: List&lt;Object?&gt;
-	  |
-	  +String toJson();
-	  &lt;static&gt;+IconOption fromJson()
-	]
-	
-	[IconOption]o-[IconData]
-	[&lt;abstract&gt;Equatable]&lt;:-[IconOption]
-	
-	[ReactiveIconPicker
-	]
-	
-	[ReactiveFocusableFormField]&lt;:-[ReactiveIconPicker]
-	
-	[IconPicker
-	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +selectedOption: IconOption?;
-	  +onSelect: void Function(IconOption)?;
-	  +galleryIconSize: double?;
-	  +selectedIconSize: double?;
-	  +focusNode: FocusNode?;
-	  +isDisabled: bool
-	  |
-	  +Widget build()
-	]
-	
-	[IconPicker]o-[IconOption]
-	[IconPicker]o-[void Function(IconOption)?]
-	[IconPicker]o-[FocusNode]
-	
-	[IconPickerField
-	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +selectedOption: IconOption?;
-	  +selectedIconSize: double?;
-	  +galleryIconSize: double?;
-	  +onSelect: void Function(IconOption)?;
-	  +focusNode: FocusNode?;
-	  +isDisabled: bool
-	  |
-	  +Widget build()
-	]
-	
-	[IconPickerField]o-[IconOption]
-	[IconPickerField]o-[void Function(IconOption)?]
-	[IconPickerField]o-[FocusNode]
-	
-	[IconPickerGallery
-	  |
-	  +iconOptions: List&lt;IconOption&gt;;
-	  +onSelect: void Function(IconOption)?;
-	  +iconSize: double
-	  |
-	  +Widget build()
-	]
-	
-	[IconPickerGallery]o-[void Function(IconOption)?]
-	
-	[SecondaryButton
-	  |
-	  +text: String;
-	  +icon: IconData?;
-	  +isLoading: bool;
-	  +onPressed: void Function()?
-	  |
-	  +Widget build()
-	]
-	
-	[SecondaryButton]o-[IconData]
-	[SecondaryButton]o-[void Function()?]
-	
-	[TwoColumnLayout
-	  |
-	  &lt;static&gt;+defaultDivider: VerticalDivider;
-	  &lt;static&gt;+defaultContentPadding: EdgeInsets;
-	  &lt;static&gt;+slimContentPadding: EdgeInsets;
-	  +leftWidget: Widget;
-	  +rightWidget: Widget;
-	  +dividerWidget: Widget?;
-	  +headerWidget: Widget?;
-	  +flexLeft: int?;
-	  +flexRight: int?;
-	  +constraintsLeft: BoxConstraints?;
-	  +constraintsRight: BoxConstraints?;
-	  +scrollLeft: bool;
-	  +scrollRight: bool;
-	  +paddingLeft: EdgeInsets?;
-	  +paddingRight: EdgeInsets?;
-	  +backgroundColorLeft: Color?;
-	  +backgroundColorRight: Color?;
-	  +stretchHeight: bool
-	]
-	
-	[TwoColumnLayout]o-[VerticalDivider]
-	[TwoColumnLayout]o-[EdgeInsets]
-	[TwoColumnLayout]o-[&lt;abstract&gt;Widget]
-	[TwoColumnLayout]o-[BoxConstraints]
-	[TwoColumnLayout]o-[Color]
-	
-	[AppTranslation
-	  |
-	  &lt;static&gt;+dynamic init()
-	]
-	
-	[&lt;abstract&gt;PlatformLocale
-	  |
-	  +Locale getPlatformLocale()
-	]
-	
-	[PlatformLocaleWeb
-	  |
-	  +Locale getPlatformLocale()
-	]
-	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleWeb]
-	
-	[PlatformLocaleMobile
-	  |
-	  +Locale getPlatformLocale()
-	]
-	
-	[&lt;abstract&gt;PlatformLocale]&lt;:--[PlatformLocaleMobile]
-	
-	[LanguagePicker
-	  |
-	  +languagePickerType: LanguagePickerType;
-	  +iconColor: Color?;
-	  +offset: Offset?
-	]
-	
-	[LanguagePicker]o-[LanguagePickerType]
-	[LanguagePicker]o-[Color]
-	[LanguagePicker]o-[Offset]
-	
-	[LanguagePickerType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;LanguagePickerType&gt;;
-	  &lt;static&gt;+field: LanguagePickerType;
-	  &lt;static&gt;+icon: LanguagePickerType
-	]
-	
-	[LanguagePickerType]o-[LanguagePickerType]
-	[Enum]&lt;:--[LanguagePickerType]
-	
-	[&lt;abstract&gt;GoRouteParamEnum
-	  |
-	  +String toRouteParam();
-	  +String toShortString()
-	]
-	
-	[RoutingIntents
-	  |
-	  &lt;static&gt;+root: RoutingIntent;
-	  &lt;static&gt;+studies: RoutingIntent;
-	  &lt;static&gt;+studiesShared: RoutingIntent;
-	  &lt;static&gt;+publicRegistry: RoutingIntent;
-	  &lt;static&gt;+study: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEdit: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditInfo: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditInterventions: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String);
-	  &lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditReports: RoutingIntent Function(String);
-	  &lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String);
-	  &lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute});
-	  &lt;static&gt;+studyRecruit: RoutingIntent Function(String);
-	  &lt;static&gt;+studyMonitor: RoutingIntent Function(String);
-	  &lt;static&gt;+studyAnalyze: RoutingIntent Function(String);
-	  &lt;static&gt;+studySettings: RoutingIntent Function(String);
-	  &lt;static&gt;+accountSettings: RoutingIntent;
-	  &lt;static&gt;+studyNew: RoutingIntent;
-	  &lt;static&gt;+login: RoutingIntent;
-	  &lt;static&gt;+signup: RoutingIntent;
-	  &lt;static&gt;+passwordForgot: RoutingIntent;
-	  &lt;static&gt;+passwordForgot2: RoutingIntent Function(String);
-	  &lt;static&gt;+passwordRecovery: RoutingIntent;
-	  &lt;static&gt;+error: RoutingIntent Function(Exception)
-	]
-	
-	[RoutingIntents]o-[RoutingIntent]
-	[RoutingIntents]o-[RoutingIntent Function(String)]
-	[RoutingIntents]o-[RoutingIntent Function(String, String)]
-	[RoutingIntents]o-[RoutingIntent Function(String, {String? appRoute})]
-	[RoutingIntents]o-[RoutingIntent Function(Exception)]
-	
-	[RoutingIntent
-	  |
-	  +route: GoRoute;
-	  +params: Map&lt;String, String&gt;;
-	  +queryParams: Map&lt;String, String&gt;;
-	  +dispatch: RoutingIntentDispatch?;
-	  +extra: Object?;
-	  +routeName: String;
-	  +arguments: Map&lt;String, String&gt;;
-	  +props: List&lt;Object?&gt;
-	  |
-	  -dynamic _validateRoute();
-	  +bool matches()
-	]
-	
-	[RoutingIntent]o-[GoRoute]
-	[RoutingIntent]o-[RoutingIntentDispatch]
-	[&lt;abstract&gt;Equatable]&lt;:-[RoutingIntent]
-	
-	[RoutingIntentDispatch
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;;
-	  &lt;static&gt;+go: RoutingIntentDispatch;
-	  &lt;static&gt;+push: RoutingIntentDispatch
-	]
-	
-	[RoutingIntentDispatch]o-[RoutingIntentDispatch]
-	[Enum]&lt;:--[RoutingIntentDispatch]
-	
-	[RouterKeys
-	  |
-	  &lt;static&gt;+studyKey: ValueKey&lt;String&gt;;
-	  &lt;static&gt;+authKey: ValueKey&lt;String&gt;
-	]
-	
-	[RouterKeys]o-[ValueKey]
-	
-	[RouteParams
-	  |
-	  &lt;static&gt;+studiesFilter: String;
-	  &lt;static&gt;+studyId: String;
-	  &lt;static&gt;+measurementId: String;
-	  &lt;static&gt;+interventionId: String;
-	  &lt;static&gt;+testAppRoute: String
-	]
-	
-	[RouterConf
-	  |
-	  &lt;static&gt;+router: GoRouter;
-	  &lt;static&gt;+routes: List&lt;GoRoute&gt;;
-	  &lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;;
-	  &lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;
-	  |
-	  &lt;static&gt;+GoRoute route()
-	]
-	
-	[RouterConf]o-[GoRouter]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs
-	  |
-	  +studyId: String
-	]
-	
-	[&lt;abstract&gt;QuestionFormRouteArgs
-	  |
-	  +questionId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[&lt;abstract&gt;QuestionFormRouteArgs]
-	
-	[ScreenerQuestionFormRouteArgs
-	]
-	
-	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:-[ScreenerQuestionFormRouteArgs]
-	
-	[ConsentItemFormRouteArgs
-	  |
-	  +consentId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ConsentItemFormRouteArgs]
-	
-	[MeasurementFormRouteArgs
-	  |
-	  +measurementId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[MeasurementFormRouteArgs]
-	
-	[SurveyQuestionFormRouteArgs
-	  |
-	  +questionId: String
-	]
-	
-	[MeasurementFormRouteArgs]&lt;:-[SurveyQuestionFormRouteArgs]
-	[&lt;abstract&gt;QuestionFormRouteArgs]&lt;:--[SurveyQuestionFormRouteArgs]
-	
-	[InterventionFormRouteArgs
-	  |
-	  +interventionId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[InterventionFormRouteArgs]
-	
-	[InterventionTaskFormRouteArgs
-	  |
-	  +taskId: String
-	]
-	
-	[InterventionFormRouteArgs]&lt;:-[InterventionTaskFormRouteArgs]
-	
-	[ReportItemFormRouteArgs
-	  |
-	  +sectionId: String
-	]
-	
-	[&lt;abstract&gt;StudyFormRouteArgs]&lt;:-[ReportItemFormRouteArgs]
-	
-	[DropdownMenuItemTheme
-	  |
-	  +iconTheme: IconThemeData?
-	]
-	
-	[DropdownMenuItemTheme]o-[IconThemeData]
-	[&lt;abstract&gt;Diagnosticable]&lt;:-[DropdownMenuItemTheme]
-	
-	[ThemeConfig
-	  |
-	  &lt;static&gt;+kMinContentWidth: double;
-	  &lt;static&gt;+kMaxContentWidth: double;
-	  &lt;static&gt;+kHoverFadeFactor: double;
-	  &lt;static&gt;+kMuteFadeFactor: double
-	  |
-	  &lt;static&gt;+dynamic bodyBackgroundColor();
-	  &lt;static&gt;+Color modalBarrierColor();
-	  &lt;static&gt;+Color containerColor();
-	  &lt;static&gt;+Color colorPickerInitialColor();
-	  &lt;static&gt;+TextStyle bodyTextMuted();
-	  &lt;static&gt;+TextStyle bodyTextBackground();
-	  &lt;static&gt;+double iconSplashRadius();
-	  &lt;static&gt;+Color sidesheetBackgroundColor();
-	  &lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme();
-	  &lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()
-	]
-	
-	[NoAnimationPageTransitionsBuilder
-	  |
-	  +Widget buildTransitions()
-	]
-	
-	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[NoAnimationPageTransitionsBuilder]
-	
-	[WebTransitionBuilder
-	  |
-	  +Widget buildTransitions()
-	]
-	
-	[&lt;abstract&gt;PageTransitionsBuilder]&lt;:-[WebTransitionBuilder]
-	
-	[ThemeSettingChange
-	  |
-	  +settings: ThemeSettings
-	]
-	
-	[ThemeSettingChange]o-[ThemeSettings]
-	[&lt;abstract&gt;Notification]&lt;:-[ThemeSettingChange]
-	
-	[ThemeProvider
-	  |
-	  +settings: ValueNotifier&lt;ThemeSettings&gt;;
-	  +lightDynamic: ColorScheme?;
-	  +darkDynamic: ColorScheme?;
-	  +pageTransitionsTheme: PageTransitionsTheme;
-	  +shapeMedium: ShapeBorder
-	  |
-	  +Color custom();
-	  +Color blend();
-	  +Color source();
-	  +ColorScheme colors();
-	  +CardTheme cardTheme();
-	  +ListTileThemeData listTileTheme();
-	  +AppBarTheme appBarTheme();
-	  +SnackBarThemeData snackBarThemeData();
-	  +TabBarTheme tabBarTheme();
-	  +BottomAppBarTheme bottomAppBarTheme();
-	  +BottomNavigationBarThemeData bottomNavigationBarTheme();
-	  +SwitchThemeData switchTheme();
-	  +InputDecorationTheme inputDecorationTheme();
-	  +TextTheme textTheme();
-	  +DividerThemeData dividerTheme();
-	  +NavigationRailThemeData navigationRailTheme();
-	  +DrawerThemeData drawerTheme();
-	  +IconThemeData iconTheme();
-	  +CheckboxThemeData checkboxTheme();
-	  +RadioThemeData radioTheme();
-	  +TooltipThemeData tooltipTheme();
-	  +ThemeData light();
-	  +ThemeData dark();
-	  +ThemeMode themeMode();
-	  +ThemeData theme();
-	  &lt;static&gt;+ThemeProvider of();
-	  +bool updateShouldNotify()
-	]
-	
-	[ThemeProvider]o-[ValueNotifier]
-	[ThemeProvider]o-[ColorScheme]
-	[ThemeProvider]o-[PageTransitionsTheme]
-	[ThemeProvider]o-[&lt;abstract&gt;ShapeBorder]
-	[&lt;abstract&gt;InheritedWidget]&lt;:-[ThemeProvider]
-	
-	[ThemeSettings
-	  |
-	  +sourceColor: Color;
-	  +themeMode: ThemeMode
-	]
-	
-	[ThemeSettings]o-[Color]
-	[ThemeSettings]o-[ThemeMode]
-	
-	[CustomColor
-	  |
-	  +name: String;
-	  +color: Color;
-	  +blend: bool
-	  |
-	  +Color value()
-	]
-	
-	[CustomColor]o-[Color]
-	
-	[SuppressedBehaviorSubject
-	  |
-	  +subject: BehaviorSubject&lt;T&gt;;
-	  +didSuppressInitialEvent: bool;
-	  -_controller: StreamController&lt;T&gt;
-	  |
-	  -StreamController&lt;T&gt; _buildDerivedController();
-	  +dynamic close()
-	]
-	
-	[SuppressedBehaviorSubject]o-[BehaviorSubject]
-	[SuppressedBehaviorSubject]o-[StreamController]
-	
-	[Time
-	  |
-	  &lt;static&gt;+dynamic fromTimeOfDay();
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+Time fromJson()
-	]
-	
-	[TimeOfDay]&lt;:-[Time]
-	
-	[TimeValueAccessor
-	  |
-	  +String modelToViewValue();
-	  +Time? viewToModelValue();
-	  -String _addLeadingZeroIfNeeded()
-	]
-	
-	[&lt;abstract&gt;ControlValueAccessor]&lt;:-[TimeValueAccessor]
-	
-	[ModelAction
-	  |
-	  +type: T;
-	  +label: String;
-	  +icon: IconData?;
-	  +onExecute: Function;
-	  +isAvailable: bool;
-	  +isDestructive: bool
-	]
-	
-	[ModelAction]o-[IconData]
-	
-	[&lt;abstract&gt;IModelActionProvider
-	  |
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
-	]
-	
-	[&lt;abstract&gt;IListActionProvider
-	  |
-	  +void onSelectItem();
-	  +void onNewItem()
-	]
-	
-	[&lt;abstract&gt;IModelActionProvider]&lt;:-[&lt;abstract&gt;IListActionProvider]
-	
-	[ModelActionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ModelActionType&gt;;
-	  &lt;static&gt;+edit: ModelActionType;
-	  &lt;static&gt;+delete: ModelActionType;
-	  &lt;static&gt;+remove: ModelActionType;
-	  &lt;static&gt;+duplicate: ModelActionType;
-	  &lt;static&gt;+clipboard: ModelActionType;
-	  &lt;static&gt;+primary: ModelActionType
-	]
-	
-	[ModelActionType]o-[ModelActionType]
-	[Enum]&lt;:--[ModelActionType]
-	
-	[OptimisticUpdate
-	  |
-	  +applyOptimistic: void Function();
-	  +apply: dynamic Function();
-	  +rollback: void Function();
-	  +onUpdate: void Function()?;
-	  +onError: void Function(Object, StackTrace?)?;
-	  +rethrowErrors: bool;
-	  +runOptimistically: bool;
-	  +completeFutureOptimistically: bool
-	  |
-	  +dynamic execute();
-	  -void _runUpdateHandlerIfAny()
-	]
-	
-	[OptimisticUpdate]o-[void Function()]
-	[OptimisticUpdate]o-[dynamic Function()]
-	[OptimisticUpdate]o-[void Function()?]
-	[OptimisticUpdate]o-[void Function(Object, StackTrace?)?]
-	
-	[&lt;abstract&gt;FileFormatEncoder
-	  |
-	  +dynamic encodeAsync();
-	  +String encode();
-	  +dynamic call()
-	]
-	
-	[CSVStringEncoder
-	  |
-	  +String encode()
-	]
-	
-	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[CSVStringEncoder]
-	
-	[JsonStringEncoder
-	  |
-	  +String encode()
-	]
-	
-	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[JsonStringEncoder]
-	
-	[&lt;abstract&gt;ExecutionLimiter
-	  |
-	  +milliseconds: int;
-	  &lt;static&gt;-_timer: Timer?
-	  |
-	  +void dispose()
-	]
-	
-	[&lt;abstract&gt;ExecutionLimiter]o-[Timer]
-	
-	[Debouncer
-	  |
-	  +leading: bool;
-	  +cancelUncompleted: bool;
-	  -_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?
-	  |
-	  +dynamic call()
-	]
-	
-	[Debouncer]o-[CancelableOperation]
-	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Debouncer]
-	
-	[Throttler
-	  |
-	  +dynamic call()
-	]
-	
-	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Throttler]
-	
-	[SerializableColor
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+SerializableColor fromJson()
-	]
-	
-	[Color]&lt;:-[SerializableColor]
-	
-	[&lt;abstract&gt;IProviderArgsResolver
-	  |
-	  +R provide()
-	]
-	
-	[CombinedStreamNotifier
-	  |
-	  -_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;
-	  |
-	  +void dispose()
-	]
-	
-	[ChangeNotifier]&lt;:-[CombinedStreamNotifier]
-	
-	[CountWhereValidator
-	  |
-	  +predicate: bool Function(T?);
-	  +minCount: int?;
-	  +maxCount: int?;
-	  &lt;static&gt;+kValidationMessageMinCount: String;
-	  &lt;static&gt;+kValidationMessageMaxCount: String
-	  |
-	  +Map&lt;String, dynamic&gt;? validate()
-	]
-	
-	[CountWhereValidator]o-[bool Function(T?)]
-	[&lt;abstract&gt;Validator]&lt;:-[CountWhereValidator]
-	
-	[Patterns
-	  |
-	  &lt;static&gt;+timeFormatString: String;
-	  &lt;static&gt;+emailFormatString: String;
-	  &lt;static&gt;+url: String
-	]
-	
-	[NumericalRangeFormatter
-	  |
-	  +min: int?;
-	  +max: int?
-	  |
-	  +TextEditingValue formatEditUpdate()
-	]
-	
-	[&lt;abstract&gt;TextInputFormatter]&lt;:-[NumericalRangeFormatter]
-	
-	[StudySequenceFormatter
-	  |
-	  +TextEditingValue formatEditUpdate()
-	]
-	
-	[&lt;abstract&gt;TextInputFormatter]&lt;:-[StudySequenceFormatter]
-	
-	[Tuple
-	  |
-	  +first: T1;
-	  +second: T2;
-	  +props: List&lt;Object?&gt;
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson();
-	  +Tuple&lt;T1, T2&gt; copy();
-	  +Tuple&lt;T1, T2&gt; copyWith()
-	]
-	
-	[&lt;abstract&gt;Equatable]&lt;:-[Tuple]
-	
-	[&lt;abstract&gt;JsonFileLoader
-	  |
-	  +jsonAssetsPath: String
-	  |
-	  +dynamic loadJson();
-	  +dynamic parseJsonMapFromAssets();
-	  +dynamic parseJsonListFromAssets()
-	]
-	
-	[&lt;abstract&gt;IAppDelegate
-	  |
-	  +dynamic onAppStart()
-	]
-	
-	[AppController
-	  |
-	  +appDelegates: List&lt;IAppDelegate&gt;;
-	  -_delayedFuture: dynamic;
-	  +isInitialized: dynamic
-	  |
-	  +dynamic onAppStart();
-	  -dynamic _callDelegates()
-	]
-	
-	[StudyMonitorScreen
-	  |
-	  +Widget build();
-	  -Widget _monitorSectionHeader();
-	  -Widget _buildStat();
-	  -dynamic _onSelectParticipant()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyMonitorScreen]
-	
-	[StudyMonitorTable
-	  |
-	  +studyMonitorItems: List&lt;StudyMonitorItem&gt;;
-	  +onSelectItem: void Function(StudyMonitorItem)
-	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow();
-	  -String _formatTime();
-	  -Widget _buildProgressCell()
-	]
-	
-	[StudyMonitorTable]o-[void Function(StudyMonitorItem)]
-	
-	[ParticipantDetailsView
-	  |
-	  +monitorItem: StudyMonitorItem;
-	  +interventions: List&lt;Intervention&gt;;
-	  +observations: List&lt;Observation&gt;
-	  |
-	  +Widget build();
-	  -Widget _buildPerDayStatus();
-	  -String _getTooltipText()
-	]
-	
-	[ParticipantDetailsView]o-[StudyMonitorItem]
-	
-	[LoginForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build()
-	]
-	
-	[LoginForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[LoginForm]
-	
-	[PasswordRecoveryForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build()
-	]
-	
-	[PasswordRecoveryForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordRecoveryForm]
-	
-	[PasswordForgotForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build()
-	]
-	
-	[PasswordForgotForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[PasswordForgotForm]
-	
-	[SignupForm
-	  |
-	  +formKey: AuthFormKey
-	  |
-	  +Widget build();
-	  -dynamic _onClickTermsOfUse();
-	  -dynamic _onClickPrivacyPolicy()
-	]
-	
-	[SignupForm]o-[AuthFormKey]
-	[&lt;abstract&gt;FormConsumerRefWidget]&lt;:-[SignupForm]
-	
-	[AuthScaffold
-	  |
-	  +body: Widget;
-	  +formKey: AuthFormKey;
-	  +leftContentMinWidth: double;
-	  +leftPanelMinWidth: double;
-	  +leftPanelPadding: EdgeInsets
-	]
-	
-	[AuthScaffold]o-[&lt;abstract&gt;Widget]
-	[AuthScaffold]o-[AuthFormKey]
-	[AuthScaffold]o-[EdgeInsets]
-	
-	[EmailTextField
-	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
-	]
-	
-	[EmailTextField]o-[FormControl]
-	
-	[PasswordTextField
-	  |
-	  +labelText: String;
-	  +hintText: String?;
-	  +onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?;
-	  +formControlName: String?;
-	  +formControl: FormControl&lt;dynamic&gt;?
-	]
-	
-	[PasswordTextField]o-[dynamic Function(FormControl&lt;dynamic&gt;)?]
-	[PasswordTextField]o-[FormControl]
-	
-	[StudyUJobsToBeDone
-	  |
-	  +Widget build()
-	]
-	
-	[AuthFormController
-	  |
-	  +authRepository: IAuthRepository;
-	  +notificationService: INotificationService;
-	  +router: GoRouter;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +passwordControl: FormControl&lt;String&gt;;
-	  +passwordConfirmationControl: FormControl&lt;String&gt;;
-	  +termsOfServiceControl: FormControl&lt;bool&gt;;
-	  &lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +loginForm: FormGroup;
-	  +signupForm: FormGroup;
-	  +passwordForgotForm: FormGroup;
-	  +passwordRecoveryForm: FormGroup;
-	  +controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  -_formKey: AuthFormKey;
-	  +formKey: AuthFormKey;
-	  +form: FormGroup
-	  |
-	  -dynamic _getFormFor();
-	  -dynamic _onChangeFormKey();
-	  +dynamic resetControlsFor();
-	  -dynamic _forceValidationMessages();
-	  +dynamic signUp();
-	  -dynamic _signUp();
-	  +dynamic signIn();
-	  -dynamic _signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic sendPasswordResetLink();
-	  +dynamic recoverPassword();
-	  +dynamic updateUser();
-	  -dynamic _readDebugUser()
-	]
-	
-	[AuthFormController]o-[&lt;abstract&gt;IAuthRepository]
-	[AuthFormController]o-[&lt;abstract&gt;INotificationService]
-	[AuthFormController]o-[GoRouter]
-	[AuthFormController]o-[FormControl]
-	[AuthFormController]o-[FormGroup]
-	[AuthFormController]o-[AuthFormKey]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[AuthFormController]
-	
-	[AuthFormKey
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AuthFormKey&gt;;
-	  &lt;static&gt;+login: AuthFormKey;
-	  &lt;static&gt;+signup: AuthFormKey;
-	  &lt;static&gt;+passwordForgot: AuthFormKey;
-	  &lt;static&gt;+passwordRecovery: AuthFormKey;
-	  &lt;static&gt;-_loginSubmit: AuthFormKey;
-	  &lt;static&gt;-_signupSubmit: AuthFormKey
-	]
-	
-	[AuthFormKey]o-[AuthFormKey]
-	[Enum]&lt;:--[AuthFormKey]
-	
-	[AppStatus
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;AppStatus&gt;;
-	  &lt;static&gt;+initializing: AppStatus;
-	  &lt;static&gt;+initialized: AppStatus
-	]
-	
-	[AppStatus]o-[AppStatus]
-	[Enum]&lt;:--[AppStatus]
-	
-	[FormArrayTable
-	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +items: List&lt;T&gt;;
-	  +onSelectItem: void Function(T);
-	  +getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int);
-	  +onNewItem: void Function()?;
-	  +rowTitle: String Function(T);
-	  +onNewItemLabel: String;
-	  +sectionTitle: String?;
-	  +sectionDescription: String?;
-	  +emptyIcon: IconData?;
-	  +emptyTitle: String?;
-	  +emptyDescription: String?;
-	  +sectionTitleDivider: bool?;
-	  +rowPrefix: Widget Function(BuildContext, T, int)?;
-	  +rowSuffix: Widget Function(BuildContext, T, int)?;
-	  +leadingWidget: Widget?;
-	  +itemsSectionPadding: EdgeInsets?;
-	  +hideLeadingTrailingWhenEmpty: bool;
-	  &lt;static&gt;+columns: List&lt;StandardTableColumn&gt;
-	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow();
-	  -Widget _newItemButton()
-	]
-	
-	[FormArrayTable]o-[&lt;abstract&gt;AbstractControl]
-	[FormArrayTable]o-[void Function(T)]
-	[FormArrayTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)]
-	[FormArrayTable]o-[void Function()?]
-	[FormArrayTable]o-[String Function(T)]
-	[FormArrayTable]o-[IconData]
-	[FormArrayTable]o-[Widget Function(BuildContext, T, int)?]
-	[FormArrayTable]o-[&lt;abstract&gt;Widget]
-	[FormArrayTable]o-[EdgeInsets]
-	
-	[&lt;abstract&gt;ManagedFormViewModel
-	  |
-	  +ManagedFormViewModel&lt;T&gt; createDuplicate()
-	]
-	
-	[&lt;abstract&gt;FormViewModel]&lt;:-[&lt;abstract&gt;ManagedFormViewModel]
-	
-	[FormViewModelNotFoundException
-	]
-	
-	[Exception]&lt;:--[FormViewModelNotFoundException]
-	
-	[FormViewModelCollection
-	  |
-	  +formViewModels: List&lt;T&gt;;
-	  +formArray: FormArray&lt;dynamic&gt;;
-	  +stagedViewModels: List&lt;T&gt;;
-	  +retrievableViewModels: List&lt;T&gt;;
-	  +formData: List&lt;D&gt;
-	  |
-	  +void add();
-	  +T remove();
-	  +T? findWhere();
-	  +T? removeWhere();
-	  +bool contains();
-	  +void stage();
-	  +T commit();
-	  +void reset();
-	  +void read()
-	]
-	
-	[FormViewModelCollection]o-[FormArray]
-	
-	[CustomFormControl
-	  |
-	  -_onValueChangedDebouncer: Debouncer?;
-	  -_onStatusChangedDebouncer: Debouncer?;
-	  +onValueChanged: void Function(T?)?;
-	  +onStatusChanged: void Function(ControlStatus)?;
-	  +onStatusChangedDebounceTime: int?;
-	  +onValueChangedDebounceTime: int?
-	  |
-	  +void dispose()
-	]
-	
-	[CustomFormControl]o-[Debouncer]
-	[CustomFormControl]o-[void Function(T?)?]
-	[CustomFormControl]o-[void Function(ControlStatus)?]
-	[FormControl]&lt;:-[CustomFormControl]
-	
-	[UnsavedChangesDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;FormValidationSetEnum
-	]
-	
-	[FormControlValidation
-	  |
-	  +control: AbstractControl&lt;dynamic&gt;;
-	  +validators: List&lt;Validator&lt;dynamic&gt;&gt;;
-	  +asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?;
-	  +validationMessages: Map&lt;String, String Function(Object)&gt;
-	  |
-	  +FormControlValidation merge()
-	]
-	
-	[FormControlValidation]o-[&lt;abstract&gt;AbstractControl]
-	
-	[&lt;abstract&gt;IFormData
-	  |
-	  +id: String
-	  |
-	  +IFormData copy()
-	]
-	
-	[FormInvalidException
-	]
-	
-	[Exception]&lt;:--[FormInvalidException]
-	
-	[FormConfigException
-	  |
-	  +message: String?
-	]
-	
-	[Exception]&lt;:--[FormConfigException]
-	
-	[&lt;abstract&gt;IFormViewModelDelegate
-	  |
-	  +dynamic onSave();
-	  +void onCancel()
-	]
-	
-	[&lt;abstract&gt;IFormGroupController
-	  |
-	  +form: FormGroup
-	]
-	
-	[&lt;abstract&gt;IFormGroupController]o-[FormGroup]
-	
-	[FormControlOption
-	  |
-	  +value: T;
-	  +label: String;
-	  +description: String?;
-	  +props: List&lt;Object?&gt;
-	]
-	
-	[&lt;abstract&gt;Equatable]&lt;:-[FormControlOption]
-	
-	[&lt;abstract&gt;FormViewModel
-	  |
-	  -_formData: T?;
-	  -_formMode: FormMode;
-	  -_validationSet: FormValidationSetEnum?;
-	  +delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?;
-	  +autosave: bool;
-	  -_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;;
-	  -_immediateFormChildrenListenerDebouncer: Debouncer?;
-	  -_autosaveOperation: CancelableOperation&lt;dynamic&gt;?;
-	  -_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;;
-	  +prevFormValue: Map&lt;String, dynamic&gt;?;
-	  &lt;static&gt;-_formKey: String;
-	  +formData: T?;
-	  +formMode: FormMode;
-	  +isReadonly: bool;
-	  +validationSet: FormValidationSetEnum?;
-	  +isDirty: bool;
-	  +title: String;
-	  +isValid: bool;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;
-	  |
-	  -dynamic _setFormData();
-	  -dynamic _rememberDefaultControlValidators();
-	  -Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators();
-	  -dynamic _disableAllControls();
-	  -dynamic _formModeUpdated();
-	  -dynamic _restoreControlsFromFormData();
-	  +void revalidate();
-	  -void _applyValidationSet();
-	  +void read();
-	  +dynamic save();
-	  +dynamic cancel();
-	  +void enableAutosave();
-	  +void listenToImmediateFormChildren();
-	  +dynamic markFormGroupChanged();
-	  +void dispose();
-	  +void setControlsFrom();
-	  +T buildFormData();
-	  +void initControls()
-	]
-	
-	[&lt;abstract&gt;FormViewModel]o-[FormMode]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;FormValidationSetEnum]
-	[&lt;abstract&gt;FormViewModel]o-[&lt;abstract&gt;IFormViewModelDelegate]
-	[&lt;abstract&gt;FormViewModel]o-[Debouncer]
-	[&lt;abstract&gt;FormViewModel]o-[CancelableOperation]
-	[&lt;abstract&gt;IFormGroupController]&lt;:--[&lt;abstract&gt;FormViewModel]
-	
-	[FormMode
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;FormMode&gt;;
-	  &lt;static&gt;+create: FormMode;
-	  &lt;static&gt;+readonly: FormMode;
-	  &lt;static&gt;+edit: FormMode
-	]
-	
-	[FormMode]o-[FormMode]
-	[Enum]&lt;:--[FormMode]
-	
-	[EnrolledBadge
-	  |
-	  +enrolledCount: int
-	  |
-	  +Widget build()
-	]
-	
-	[StudyRecruitController
-	  |
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  -_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?
-	  |
-	  -dynamic _subscribeInvites();
-	  +Intervention? getIntervention();
-	  +int getParticipantCountForInvite();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void dispose()
-	]
-	
-	[StudyRecruitController]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[StudyRecruitController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyRecruitController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[StudyRecruitController]
-	
-	[StudyRecruitScreen
-	  |
-	  +Widget build();
-	  -Widget _inviteCodesSectionHeader();
-	  -Widget _newInviteCodeButton();
-	  -dynamic _onSelectInvite()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyRecruitScreen]
-	
-	[InviteCodeFormView
-	  |
-	  +formViewModel: InviteCodeFormViewModel
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalInterventionRows()
-	]
-	
-	[InviteCodeFormView]o-[InviteCodeFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[InviteCodeFormView]
-	
-	[StudyInvitesTable
-	  |
-	  +invites: List&lt;StudyInvite&gt;;
-	  +onSelect: void Function(StudyInvite);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite);
-	  +getIntervention: Intervention? Function(String);
-	  +getParticipantCountForInvite: int Function(StudyInvite)
-	  |
-	  +Widget build();
-	  -List&lt;Widget&gt; _buildRow()
-	]
-	
-	[StudyInvitesTable]o-[void Function(StudyInvite)]
-	[StudyInvitesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)]
-	[StudyInvitesTable]o-[Intervention? Function(String)]
-	[StudyInvitesTable]o-[int Function(StudyInvite)]
-	
-	[InviteCodeFormViewModel
-	  |
-	  +study: Study;
-	  +inviteCodeRepository: IInviteCodeRepository;
-	  +codeControl: FormControl&lt;String&gt;;
-	  +codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;;
-	  +isPreconfiguredScheduleControl: FormControl&lt;bool&gt;;
-	  +preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +interventionAControl: FormControl&lt;String&gt;;
-	  +interventionBControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;;
-	  +preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +isPreconfiguredSchedule: bool;
-	  +preconfiguredSchedule: List&lt;String&gt;?
-	  |
-	  +void initControls();
-	  -dynamic _uniqueInviteCode();
-	  +void regenerateCode();
-	  -String _generateCode();
-	  +StudyInvite buildFormData();
-	  +void setControlsFrom();
-	  +dynamic save()
-	]
-	
-	[InviteCodeFormViewModel]o-[Study]
-	[InviteCodeFormViewModel]o-[&lt;abstract&gt;IInviteCodeRepository]
-	[InviteCodeFormViewModel]o-[FormControl]
-	[InviteCodeFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InviteCodeFormViewModel]
-	
-	[PublishSuccessDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishSuccessDialog]
-	
-	[PublishDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishDialog]
-	
-	[PublishConfirmationDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[PublishConfirmationDialog]
-	
-	[FrameControlsWidget
-	  |
-	  +onRefresh: void Function()?;
-	  +onOpenNewTab: void Function()?;
-	  +enabled: bool
-	  |
-	  +Widget build()
-	]
-	
-	[FrameControlsWidget]o-[void Function()?]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FrameControlsWidget]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel
-	  |
-	  +studyParticipation: Participation?;
-	  +studyStatus: StudyStatus?
-	]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[Participation]
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]o-[StudyStatus]
-	
-	[StudyStatusBadge
-	  |
-	  +participation: Participation?;
-	  +status: StudyStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
-	  |
-	  +Widget build()
-	]
-	
-	[StudyStatusBadge]o-[Participation]
-	[StudyStatusBadge]o-[StudyStatus]
-	[StudyStatusBadge]o-[BadgeType]
-	
-	[RouteInformation
-	  |
-	  +route: String?;
-	  +extra: String?;
-	  +cmd: String?;
-	  +data: String?
-	  |
-	  +String toString()
-	]
-	
-	[&lt;abstract&gt;PlatformController
-	  |
-	  +studyId: String;
-	  +baseSrc: String;
-	  +previewSrc: String;
-	  +routeInformation: RouteInformation;
-	  +frameWidget: Widget
-	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void listen();
-	  +void send();
-	  +void openNewPage()
-	]
-	
-	[&lt;abstract&gt;PlatformController]o-[RouteInformation]
-	[&lt;abstract&gt;PlatformController]o-[&lt;abstract&gt;Widget]
-	
-	[WebController
-	  |
-	  +iFrameElement: IFrameElement
-	  |
-	  +void activate();
-	  +void registerViews();
-	  +void generateUrl();
-	  +void navigate();
-	  +void refresh();
-	  +void openNewPage();
-	  +void listen();
-	  +void send()
-	]
-	
-	[WebController]o-[IFrameElement]
-	[&lt;abstract&gt;PlatformController]&lt;:-[WebController]
-	
-	[MobileController
-	  |
-	  +void openNewPage();
-	  +void refresh();
-	  +void registerViews();
-	  +void listen();
-	  +void send();
-	  +void navigate();
-	  +void activate();
-	  +void generateUrl()
-	]
-	
-	[&lt;abstract&gt;PlatformController]&lt;:-[MobileController]
-	
-	[StudyController
-	  |
-	  +notificationService: INotificationService;
-	  +studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?;
-	  +studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;
-	  |
-	  +dynamic syncStudyStatus();
-	  +dynamic onStudySubscriptionUpdate();
-	  -dynamic _redirectNewToActualStudyID();
-	  +dynamic publishStudy();
-	  +void onChangeStudyParticipation();
-	  +void onAddParticipants();
-	  +void onSettingsPressed();
-	  +void dispose()
-	]
-	
-	[StudyController]o-[&lt;abstract&gt;INotificationService]
-	[StudyController]o-[StreamSubscription]
-	[StudyBaseController]&lt;:-[StudyController]
-	
-	[&lt;abstract&gt;IStudyNavViewModel
-	  |
-	  +isEditTabEnabled: bool;
-	  +isTestTabEnabled: bool;
-	  +isRecruitTabEnabled: bool;
-	  +isMonitorTabEnabled: bool;
-	  +isAnalyzeTabEnabled: bool;
-	  +isSettingsEnabled: bool
-	]
-	
-	[StudyNav
-	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic edit();
-	  &lt;static&gt;+dynamic test();
-	  &lt;static&gt;+dynamic recruit();
-	  &lt;static&gt;+dynamic monitor();
-	  &lt;static&gt;+dynamic analyze()
-	]
-	
-	[StudyDesignNav
-	  |
-	  &lt;static&gt;+dynamic tabs();
-	  &lt;static&gt;+dynamic info();
-	  &lt;static&gt;+dynamic enrollment();
-	  &lt;static&gt;+dynamic interventions();
-	  &lt;static&gt;+dynamic measurements();
-	  &lt;static&gt;+dynamic reports()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget
-	  |
-	  +studyId: String
-	  |
-	  +Widget? banner()
-	]
-	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[&lt;abstract&gt;StudyPageWidget]
-	[&lt;abstract&gt;IWithBanner]&lt;:--[&lt;abstract&gt;StudyPageWidget]
-	
-	[StudyParticipationBadge
-	  |
-	  +participation: Participation;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +center: bool
-	  |
-	  +Widget build()
-	]
-	
-	[StudyParticipationBadge]o-[Participation]
-	[StudyParticipationBadge]o-[BadgeType]
-	
-	[StudyBaseController
-	  |
-	  +studyId: String;
-	  +studyRepository: IStudyRepository;
-	  +router: GoRouter;
-	  +studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?
-	  |
-	  +dynamic subscribeStudy();
-	  +dynamic onStudySubscriptionUpdate();
-	  +dynamic onStudySubscriptionError();
-	  +void dispose()
-	]
-	
-	[StudyBaseController]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyBaseController]o-[GoRouter]
-	[StudyBaseController]o-[StreamSubscription]
-	
-	[PreviewFrame
-	  |
-	  +studyId: String;
-	  +routeArgs: StudyFormRouteArgs?;
-	  +route: String?
-	]
-	
-	[PreviewFrame]o-[&lt;abstract&gt;StudyFormRouteArgs]
-	
-	[&lt;abstract&gt;IStudyAppBarViewModel
-	  |
-	  +isSyncIndicatorVisible: bool;
-	  +isStatusBadgeVisible: bool;
-	  +isPublishVisible: bool
-	]
-	
-	[&lt;abstract&gt;IStudyStatusBadgeViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	[&lt;abstract&gt;IStudyNavViewModel]&lt;:--[&lt;abstract&gt;IStudyAppBarViewModel]
-	
-	[StudyScaffold
-	  |
-	  +studyId: String;
-	  +tabs: List&lt;NavbarTab&gt;?;
-	  +tabsSubnav: List&lt;NavbarTab&gt;?;
-	  +selectedTab: NavbarTab?;
-	  +selectedTabSubnav: NavbarTab?;
-	  +body: StudyPageWidget;
-	  +drawer: Widget?;
-	  +disableActions: bool;
-	  +actionsSpacing: double;
-	  +actionsPadding: double;
-	  +layoutType: SingleColumnLayoutType?;
-	  +appbarHeight: double;
-	  +appbarSubnavHeight: double
-	]
-	
-	[StudyScaffold]o-[NavbarTab]
-	[StudyScaffold]o-[&lt;abstract&gt;StudyPageWidget]
-	[StudyScaffold]o-[&lt;abstract&gt;Widget]
-	[StudyScaffold]o-[SingleColumnLayoutType]
-	
-	[WebFrame
-	  |
-	  +previewSrc: String;
-	  +studyId: String
-	  |
-	  +Widget build()
-	]
-	
-	[DisabledFrame
-	  |
-	  +Widget build()
-	]
-	
-	[PhoneContainer
-	  |
-	  &lt;static&gt;+defaultWidth: double;
-	  &lt;static&gt;+defaultHeight: double;
-	  +width: double;
-	  +height: double;
-	  +borderColor: Color;
-	  +borderWidth: double;
-	  +borderRadius: double;
-	  +innerContent: Widget;
-	  +innerContentBackgroundColor: Color?
-	  |
-	  +Widget build()
-	]
-	
-	[PhoneContainer]o-[Color]
-	[PhoneContainer]o-[&lt;abstract&gt;Widget]
-	
-	[MobileFrame
-	  |
-	  +Widget build()
-	]
-	
-	[DesktopFrame
-	  |
-	  +Widget build()
-	]
-	
-	[StudyTestScreen
-	  |
-	  +previewRoute: String?
-	  |
-	  +Widget build();
-	  +Widget? banner();
-	  +dynamic load();
-	  +dynamic save();
-	  +dynamic showHelp()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyTestScreen]
-	
-	[StudySettingsFormViewModel
-	  |
-	  +study: AsyncValue&lt;Study&gt;;
-	  +studyRepository: IStudyRepository;
-	  &lt;static&gt;+defaultPublishedToRegistry: bool;
-	  &lt;static&gt;+defaultPublishedToRegistryResults: bool;
-	  +isPublishedToRegistryControl: FormControl&lt;bool&gt;;
-	  +isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +dynamic keepControlsSynced();
-	  +dynamic save();
-	  +dynamic setLaunchDefaults()
-	]
-	
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;AsyncValue]
-	[StudySettingsFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudySettingsFormViewModel]o-[FormControl]
-	[StudySettingsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudySettingsFormViewModel]
-	
-	[StudySettingsDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudySettingsDialog]
-	
-	[StudyTestController
-	  |
-	  +authRepository: IAuthRepository;
-	  +languageCode: String
-	]
-	
-	[StudyTestController]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyBaseController]&lt;:-[StudyTestController]
-	
-	[TestAppRoutes
-	  |
-	  &lt;static&gt;+studyOverview: String;
-	  &lt;static&gt;+eligibility: String;
-	  &lt;static&gt;+intervention: String;
-	  &lt;static&gt;+consent: String;
-	  &lt;static&gt;+journey: String;
-	  &lt;static&gt;+dashboard: String
-	]
-	
-	[DrawerEntry
-	  |
-	  +localizedTitle: String Function();
-	  +icon: IconData?;
-	  +localizedHelpText: String Function()?;
-	  +enabled: bool;
-	  +onSelected: void Function(BuildContext, WidgetRef)?;
-	  +autoCloseDrawer: bool;
-	  +title: String;
-	  +helpText: String?
-	  |
-	  +void onClick()
-	]
-	
-	[DrawerEntry]o-[String Function()]
-	[DrawerEntry]o-[IconData]
-	[DrawerEntry]o-[String Function()?]
-	[DrawerEntry]o-[void Function(BuildContext, WidgetRef)?]
-	
-	[GoRouterDrawerEntry
-	  |
-	  +intent: RoutingIntent;
-	  +onNavigated: void Function()?
-	  |
-	  +void onClick()
-	]
-	
-	[GoRouterDrawerEntry]o-[RoutingIntent]
-	[GoRouterDrawerEntry]o-[void Function()?]
-	[DrawerEntry]&lt;:-[GoRouterDrawerEntry]
-	
-	[AppDrawer
-	  |
-	  +width: int;
-	  +autoCloseDrawer: bool;
-	  +leftPaddingEntries: double;
-	  +logoPaddingVertical: double;
-	  +logoPaddingHorizontal: double;
-	  +logoMaxHeight: double;
-	  +logoSectionMinHeight: double;
-	  +logoSectionMaxHeight: double
-	]
-	
-	[StudyAnalyzeScreen
-	  |
-	  +Widget? banner();
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[StudyAnalyzeScreen]
-	
-	[StudyAnalyzeController
-	  |
-	  +dynamic onExport()
-	]
-	
-	[StudyBaseController]&lt;:-[StudyAnalyzeController]
-	
-	[StudyDesignInterventionsFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInterventionsFormView]
-	
-	[InterventionFormView
-	  |
-	  +formViewModel: InterventionFormViewModel
-	]
-	
-	[InterventionFormView]o-[InterventionFormViewModel]
-	
-	[InterventionPreview
-	  |
-	  +routeArgs: InterventionFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[InterventionPreview]o-[InterventionFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[InterventionPreview]
-	
-	[StudyScheduleFormView
-	  |
-	  +formViewModel: StudyScheduleControls
-	  |
-	  -FormTableRow _renderCustomSequence();
-	  +Widget build()
-	]
-	
-	[StudyScheduleFormView]o-[&lt;abstract&gt;StudyScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[StudyScheduleFormView]
-	
-	[InterventionTaskFormData
-	  |
-	  +taskId: String;
-	  +taskTitle: String;
-	  +taskDescription: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +CheckmarkTask toTask();
-	  +InterventionTaskFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[InterventionTaskFormData]
-	
-	[InterventionsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +interventionsArray: FormArray&lt;dynamic&gt;;
-	  +interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;;
-	  +form: FormGroup;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +interventionsRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestStudySchedule: bool
-	  |
-	  +void setControlsFrom();
-	  +InterventionsFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +InterventionFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +dynamic testStudySchedule()
-	]
-	
-	[InterventionsFormViewModel]o-[Study]
-	[InterventionsFormViewModel]o-[GoRouter]
-	[InterventionsFormViewModel]o-[FormArray]
-	[InterventionsFormViewModel]o-[FormViewModelCollection]
-	[InterventionsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;StudyScheduleControls]&lt;:-[InterventionsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionsFormViewModel]
-	
-	[InterventionTaskFormViewModel
-	  |
-	  +taskIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +taskTitleControl: FormControl&lt;String&gt;;
-	  +taskDescriptionControl: FormControl&lt;String&gt;;
-	  +markAsCompletedControl: FormControl&lt;bool&gt;;
-	  +form: FormGroup;
-	  +taskId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +InterventionTaskFormData buildFormData();
-	  +InterventionTaskFormViewModel createDuplicate()
-	]
-	
-	[InterventionTaskFormViewModel]o-[FormControl]
-	[InterventionTaskFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionTaskFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[InterventionTaskFormViewModel]
-	
-	[&lt;abstract&gt;StudyScheduleControls
-	  |
-	  &lt;static&gt;+defaultScheduleType: PhaseSequence;
-	  &lt;static&gt;+defaultScheduleTypeSequence: String;
-	  &lt;static&gt;+defaultNumCycles: int;
-	  &lt;static&gt;+defaultPeriodLength: int;
-	  +sequenceTypeControl: FormControl&lt;PhaseSequence&gt;;
-	  +sequenceTypeCustomControl: FormControl&lt;String&gt;;
-	  +phaseDurationControl: FormControl&lt;int&gt;;
-	  +numCyclesControl: FormControl&lt;int&gt;;
-	  +includeBaselineControl: FormControl&lt;bool&gt;;
-	  +studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  &lt;static&gt;+kNumCyclesMin: int;
-	  &lt;static&gt;+kNumCyclesMax: int;
-	  &lt;static&gt;+kPhaseDurationMin: int;
-	  &lt;static&gt;+kPhaseDurationMax: int;
-	  +sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;;
-	  +studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +numCyclesRange: dynamic;
-	  +phaseDurationRange: dynamic;
-	  +customSequenceRequired: dynamic
-	  |
-	  +void setStudyScheduleControlsFrom();
-	  +StudyScheduleFormData buildStudyScheduleFormData();
-	  +bool isSequencingCustom()
-	]
-	
-	[&lt;abstract&gt;StudyScheduleControls]o-[PhaseSequence]
-	[&lt;abstract&gt;StudyScheduleControls]o-[FormControl]
-	
-	[InterventionFormData
-	  |
-	  +interventionId: String;
-	  +title: String;
-	  +description: String?;
-	  +tasksData: List&lt;InterventionTaskFormData&gt;?;
-	  +iconName: String?;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +Intervention toIntervention();
-	  +InterventionFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:-[InterventionFormData]
-	
-	[StudyScheduleFormData
-	  |
-	  +sequenceType: PhaseSequence;
-	  +sequenceTypeCustom: String;
-	  +numCycles: int;
-	  +phaseDuration: int;
-	  +includeBaseline: bool;
-	  +id: String
-	  |
-	  +StudySchedule toStudySchedule();
-	  +Study apply();
-	  +StudyScheduleFormData copy()
-	]
-	
-	[StudyScheduleFormData]o-[PhaseSequence]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyScheduleFormData]
-	
-	[InterventionTaskFormView
-	  |
-	  +formViewModel: InterventionTaskFormViewModel
-	]
-	
-	[InterventionTaskFormView]o-[InterventionTaskFormViewModel]
-	
-	[InterventionsFormData
-	  |
-	  +interventionsData: List&lt;InterventionFormData&gt;;
-	  +studyScheduleData: StudyScheduleFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +InterventionsFormData copy()
-	]
-	
-	[InterventionsFormData]o-[StudyScheduleFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[InterventionsFormData]
-	
-	[InterventionFormViewModel
-	  |
-	  +study: Study;
-	  +interventionIdControl: FormControl&lt;String&gt;;
-	  +interventionTitleControl: FormControl&lt;String&gt;;
-	  +interventionIconControl: FormControl&lt;IconOption&gt;;
-	  +interventionDescriptionControl: FormControl&lt;String&gt;;
-	  +interventionTasksArray: FormArray&lt;dynamic&gt;;
-	  +tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;;
-	  +form: FormGroup;
-	  +interventionId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneTask: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +InterventionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +InterventionTaskFormViewModel provide();
-	  +InterventionTaskFormRouteArgs buildNewFormRouteArgs();
-	  +InterventionTaskFormRouteArgs buildFormRouteArgs();
-	  +InterventionFormViewModel createDuplicate()
-	]
-	
-	[InterventionFormViewModel]o-[Study]
-	[InterventionFormViewModel]o-[FormControl]
-	[InterventionFormViewModel]o-[FormArray]
-	[InterventionFormViewModel]o-[FormViewModelCollection]
-	[InterventionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[InterventionFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[InterventionFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[InterventionFormViewModel]
-	
-	[StudyDesignReportsFormView
-	  |
-	  +Widget build();
-	  -dynamic _showReportItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignReportsFormView]
-	
-	[ReportItemFormData
-	  |
-	  +isPrimary: bool;
-	  +section: ReportSection;
-	  +id: String
-	  |
-	  &lt;static&gt;+dynamic fromDomainModel();
-	  +ReportItemFormData copy()
-	]
-	
-	[ReportItemFormData]o-[&lt;abstract&gt;ReportSection]
-	[&lt;abstract&gt;IFormData]&lt;:-[ReportItemFormData]
-	
-	[DataReferenceEditor
-	  |
-	  +formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;;
-	  +availableTasks: List&lt;Task&gt;;
-	  +buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;
-	  |
-	  +FormTableRow buildFormTableRow();
-	  -List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()
-	]
-	
-	[DataReferenceEditor]o-[FormControl]
-	[DataReferenceEditor]o-[ReactiveDropdownField]
-	
-	[TemporalAggregationFormatted
-	  |
-	  -_value: TemporalAggregation;
-	  &lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;;
-	  +value: TemporalAggregation;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+TemporalAggregationFormatted fromJson()
-	]
-	
-	[TemporalAggregationFormatted]o-[TemporalAggregation]
-	[TemporalAggregationFormatted]o-[IconData]
-	
-	[ImprovementDirectionFormatted
-	  |
-	  -_value: ImprovementDirection;
-	  &lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;;
-	  +value: ImprovementDirection;
-	  +string: String;
-	  +icon: IconData?;
-	  +hashCode: int
-	  |
-	  +bool ==();
-	  +String toString();
-	  +String toJson();
-	  &lt;static&gt;+ImprovementDirectionFormatted fromJson()
-	]
-	
-	[ImprovementDirectionFormatted]o-[ImprovementDirection]
-	[ImprovementDirectionFormatted]o-[IconData]
-	
-	[ReportSectionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportSectionType&gt;;
-	  &lt;static&gt;+average: ReportSectionType;
-	  &lt;static&gt;+linearRegression: ReportSectionType
-	]
-	
-	[ReportSectionType]o-[ReportSectionType]
-	[Enum]&lt;:--[ReportSectionType]
-	
-	[AverageSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[AverageSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AverageSectionFormView]
-	
-	[DataReferenceIdentifier
-	  |
-	  +hashCode: int
-	  |
-	  +bool ==()
-	]
-	
-	[DataReference]&lt;:-[DataReferenceIdentifier]
-	
-	[LinearRegressionSectionFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;
-	  |
-	  +Widget build()
-	]
-	
-	[LinearRegressionSectionFormView]o-[ReportItemFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[LinearRegressionSectionFormView]
-	
-	[ReportItemFormViewModel
-	  |
-	  &lt;static&gt;+defaultSectionType: ReportSectionType;
-	  +sectionIdControl: FormControl&lt;String&gt;;
-	  +sectionTypeControl: FormControl&lt;ReportSectionType&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +sectionControl: FormControl&lt;ReportSection&gt;;
-	  +dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;;
-	  +temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;;
-	  +improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;;
-	  +alphaControl: FormControl&lt;double&gt;;
-	  -_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +form: FormGroup;
-	  +sectionId: String;
-	  +sectionType: ReportSectionType;
-	  &lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;;
-	  &lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;;
-	  &lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +dataReferenceRequired: dynamic;
-	  +aggregationRequired: dynamic;
-	  +improvementDirectionRequired: dynamic;
-	  +alphaConfidenceRequired: dynamic
-	  |
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +ReportItemFormData buildFormData();
-	  +ReportItemFormViewModel createDuplicate();
-	  +dynamic onSectionTypeChanged();
-	  -void _updateFormControls();
-	  +void setControlsFrom()
-	]
-	
-	[ReportItemFormViewModel]o-[ReportSectionType]
-	[ReportItemFormViewModel]o-[FormControl]
-	[ReportItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ReportItemFormViewModel]
-	
-	[ReportItemFormView
-	  |
-	  +formViewModel: ReportItemFormViewModel;
-	  +studyId: String;
-	  +reportSectionColumnWidth: dynamic;
-	  +sectionTypeBodyBuilder: Widget Function(BuildContext)
-	  |
-	  +Widget build();
-	  -dynamic _buildSectionText();
-	  -dynamic _buildSectionTypeHeader()
-	]
-	
-	[ReportItemFormView]o-[ReportItemFormViewModel]
-	[ReportItemFormView]o-[Widget Function(BuildContext)]
-	
-	[ReportsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +reportItemDelegate: ReportFormItemDelegate;
-	  +reportItemArray: FormArray&lt;dynamic&gt;;
-	  +reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +form: FormGroup;
-	  +reportItemModels: List&lt;ReportItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestConsent: bool
-	  |
-	  +void setControlsFrom();
-	  +ReportsFormData buildFormData();
-	  +void read();
-	  +ReportItemFormRouteArgs buildNewReportItemFormRouteArgs();
-	  +ReportItemFormRouteArgs buildReportItemFormRouteArgs();
-	  +dynamic testReport();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide()
-	]
-	
-	[ReportsFormViewModel]o-[Study]
-	[ReportsFormViewModel]o-[GoRouter]
-	[ReportsFormViewModel]o-[ReportFormItemDelegate]
-	[ReportsFormViewModel]o-[FormArray]
-	[ReportsFormViewModel]o-[FormViewModelCollection]
-	[ReportsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportsFormViewModel]
-	
-	[ReportFormItemDelegate
-	  |
-	  +formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;;
-	  +owner: ReportsFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
-	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ReportItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
-	]
-	
-	[ReportFormItemDelegate]o-[FormViewModelCollection]
-	[ReportFormItemDelegate]o-[ReportsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[ReportFormItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[ReportFormItemDelegate]
-	
-	[ReportBadge
-	  |
-	  +status: ReportStatus?;
-	  +type: BadgeType;
-	  +showPrefixIcon: bool;
-	  +showTooltip: bool
-	  |
-	  +Widget build()
-	]
-	
-	[ReportBadge]o-[ReportStatus]
-	[ReportBadge]o-[BadgeType]
-	
-	[ReportsFormData
-	  |
-	  +reportItems: List&lt;ReportItemFormData&gt;;
-	  +id: String
-	  |
-	  +Study apply();
-	  +ReportsFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[ReportsFormData]
-	
-	[ReportStatus
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ReportStatus&gt;;
-	  &lt;static&gt;+primary: ReportStatus;
-	  &lt;static&gt;+secondary: ReportStatus
-	]
-	
-	[ReportStatus]o-[ReportStatus]
-	[Enum]&lt;:--[ReportStatus]
-	
-	[&lt;abstract&gt;IStudyFormData
-	  |
-	  +Study apply()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IStudyFormData]
-	
-	[StudyInfoFormViewModel
-	  |
-	  +study: Study;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +organizationControl: FormControl&lt;String&gt;;
-	  +reviewBoardControl: FormControl&lt;String&gt;;
-	  +reviewBoardNumberControl: FormControl&lt;String&gt;;
-	  +researchersControl: FormControl&lt;String&gt;;
-	  +emailControl: FormControl&lt;String&gt;;
-	  +websiteControl: FormControl&lt;String&gt;;
-	  +phoneControl: FormControl&lt;String&gt;;
-	  +additionalInfoControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +iconRequired: dynamic;
-	  +organizationRequired: dynamic;
-	  +reviewBoardRequired: dynamic;
-	  +reviewBoardNumberRequired: dynamic;
-	  +researchersRequired: dynamic;
-	  +emailRequired: dynamic;
-	  +phoneRequired: dynamic;
-	  +emailFormat: dynamic;
-	  +websiteFormat: dynamic
-	  |
-	  +void setControlsFrom();
-	  +StudyInfoFormData buildFormData()
-	]
-	
-	[StudyInfoFormViewModel]o-[Study]
-	[StudyInfoFormViewModel]o-[FormControl]
-	[StudyInfoFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyInfoFormViewModel]
-	
-	[StudyDesignInfoFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignInfoFormView]
-	
-	[StudyInfoFormData
-	  |
-	  +title: String;
-	  +description: String?;
-	  +iconName: String;
-	  +contactInfoFormData: StudyContactInfoFormData;
-	  +id: String
-	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
-	]
-	
-	[StudyInfoFormData]o-[StudyContactInfoFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyInfoFormData]
-	
-	[StudyContactInfoFormData
-	  |
-	  +organization: String?;
-	  +institutionalReviewBoard: String?;
-	  +institutionalReviewBoardNumber: String?;
-	  +researchers: String?;
-	  +email: String?;
-	  +website: String?;
-	  +phone: String?;
-	  +additionalInfo: String?;
-	  +id: String
-	  |
-	  +Study apply();
-	  +StudyInfoFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[StudyContactInfoFormData]
-	
-	[StudyFormValidationSet
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;
-	]
-	
-	[Enum]&lt;:--[StudyFormValidationSet]
-	
-	[MeasurementsFormData
-	  |
-	  +surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;;
-	  +id: String
-	  |
-	  +Study apply();
-	  +MeasurementsFormData copy()
-	]
-	
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[MeasurementsFormData]
-	
-	[MeasurementSurveyFormView
-	  |
-	  +formViewModel: MeasurementSurveyFormViewModel
-	]
-	
-	[MeasurementSurveyFormView]o-[MeasurementSurveyFormViewModel]
-	
-	[SurveyPreview
-	  |
-	  +routeArgs: MeasurementFormRouteArgs
-	  |
-	  +Widget build()
-	]
-	
-	[SurveyPreview]o-[MeasurementFormRouteArgs]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[SurveyPreview]
-	
-	[MeasurementSurveyFormData
-	  |
-	  +measurementId: String;
-	  +title: String;
-	  +introText: String?;
-	  +outroText: String?;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  &lt;static&gt;+kDefaultTitle: String;
-	  +id: String
-	  |
-	  +QuestionnaireTask toQuestionnaireTask();
-	  +MeasurementSurveyFormData copy()
-	]
-	
-	[MeasurementSurveyFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IFormDataWithSchedule]&lt;:-[MeasurementSurveyFormData]
-	
-	[MeasurementSurveyFormViewModel
-	  |
-	  +study: Study;
-	  +measurementIdControl: FormControl&lt;String&gt;;
-	  +instanceIdControl: FormControl&lt;String&gt;;
-	  +surveyTitleControl: FormControl&lt;String&gt;;
-	  +surveyIntroTextControl: FormControl&lt;String&gt;;
-	  +surveyOutroTextControl: FormControl&lt;String&gt;;
-	  +form: FormGroup;
-	  +measurementId: String;
-	  +instanceId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +atLeastOneQuestion: dynamic;
-	  +breadcrumbsTitle: String;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +MeasurementSurveyFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +SurveyQuestionFormRouteArgs buildNewFormRouteArgs();
-	  +SurveyQuestionFormRouteArgs buildFormRouteArgs();
-	  +MeasurementSurveyFormViewModel createDuplicate()
-	]
-	
-	[MeasurementSurveyFormViewModel]o-[Study]
-	[MeasurementSurveyFormViewModel]o-[FormControl]
-	[MeasurementSurveyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;WithScheduleControls]&lt;:-[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementSurveyFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementSurveyFormViewModel]
-	
-	[StudyDesignMeasurementsFormView
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignMeasurementsFormView]
-	
-	[MeasurementsFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +measurementsArray: FormArray&lt;dynamic&gt;;
-	  +surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;;
-	  +form: FormGroup;
-	  +measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +measurementRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +MeasurementsFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +MeasurementSurveyFormViewModel provide();
-	  +void onCancel();
-	  +dynamic onSave()
-	]
-	
-	[MeasurementsFormViewModel]o-[Study]
-	[MeasurementsFormViewModel]o-[GoRouter]
-	[MeasurementsFormViewModel]o-[FormArray]
-	[MeasurementsFormViewModel]o-[FormViewModelCollection]
-	[MeasurementsFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[MeasurementsFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[MeasurementsFormViewModel]
-	
-	[StudyFormScaffold
-	  |
-	  +studyId: String;
-	  +formViewModelBuilder: T Function(WidgetRef);
-	  +formViewBuilder: Widget Function(T)
-	  |
-	  +Widget build()
-	]
-	
-	[StudyFormScaffold]o-[T Function(WidgetRef)]
-	[StudyFormScaffold]o-[Widget Function(T)]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[StudyFormScaffold]
-	
-	[ConsentItemFormViewModel
-	  |
-	  +consentIdControl: FormControl&lt;String&gt;;
-	  +titleControl: FormControl&lt;String&gt;;
-	  +descriptionControl: FormControl&lt;String&gt;;
-	  +iconControl: FormControl&lt;IconOption&gt;;
-	  +form: FormGroup;
-	  +consentId: String;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titleRequired: dynamic;
-	  +descriptionRequired: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void setControlsFrom();
-	  +ConsentItemFormData buildFormData();
-	  +ConsentItemFormViewModel createDuplicate()
-	]
-	
-	[ConsentItemFormViewModel]o-[FormControl]
-	[ConsentItemFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[ConsentItemFormViewModel]
-	
-	[StudyDesignEnrollmentFormView
-	  |
-	  +Widget build();
-	  -dynamic _showScreenerQuestionSidesheetWithArgs();
-	  -dynamic _showConsentItemSidesheetWithArgs()
-	]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget]&lt;:-[StudyDesignEnrollmentFormView]
-	
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel
-	  |
-	  +isDirtyOptionsBannerVisible: bool
-	]
-	
-	[ScreenerQuestionLogicFormView
-	  |
-	  +formViewModel: ScreenerQuestionFormViewModel
-	  |
-	  +Widget build();
-	  -dynamic _buildInfoBanner();
-	  -dynamic _buildAnswerOptionsLogicControls();
-	  -List&lt;Widget&gt; _buildOptionLogicRow()
-	]
-	
-	[ScreenerQuestionLogicFormView]o-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScreenerQuestionLogicFormView]
-	
-	[ConsentItemFormData
-	  |
-	  +consentId: String;
-	  +title: String;
-	  +description: String;
-	  +iconName: String?;
-	  +id: String
-	  |
-	  +ConsentItem toConsentItem();
-	  +ConsentItemFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:-[ConsentItemFormData]
-	
-	[ConsentItemFormView
-	  |
-	  +formViewModel: ConsentItemFormViewModel
-	]
-	
-	[ConsentItemFormView]o-[ConsentItemFormViewModel]
-	
-	[EnrollmentFormData
-	  |
-	  &lt;static&gt;+kDefaultEnrollmentType: Participation;
-	  +enrollmentType: Participation;
-	  +questionnaireFormData: QuestionnaireFormData;
-	  +consentItemsFormData: List&lt;ConsentItemFormData&gt;?;
-	  +id: String
-	  |
-	  +Study apply();
-	  +EnrollmentFormData copy()
-	]
-	
-	[EnrollmentFormData]o-[Participation]
-	[EnrollmentFormData]o-[QuestionnaireFormData]
-	[&lt;abstract&gt;IStudyFormData]&lt;:--[EnrollmentFormData]
-	
-	[ScreenerQuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultResponseOptionValidity: bool;
-	  +responseOptionsDisabledArray: FormArray&lt;dynamic&gt;;
-	  +responseOptionsLogicControls: FormArray&lt;bool&gt;;
-	  +responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;;
-	  -_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +prevResponseOptionValues: List&lt;dynamic&gt;;
-	  +responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isDirtyOptionsBannerVisible: bool
-	  |
-	  +dynamic onResponseOptionsChanged();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  -List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor();
-	  -AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor();
-	  +ScreenerQuestionFormViewModel createDuplicate()
-	]
-	
-	[ScreenerQuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]&lt;:-[ScreenerQuestionFormViewModel]
-	[&lt;abstract&gt;IScreenerQuestionLogicFormViewModel]&lt;:--[ScreenerQuestionFormViewModel]
-	
-	[EnrollmentFormViewModel
-	  |
-	  +study: Study;
-	  +router: GoRouter;
-	  +consentItemDelegate: EnrollmentFormConsentItemDelegate;
-	  +enrollmentTypeControl: FormControl&lt;Participation&gt;;
-	  +consentItemArray: FormArray&lt;dynamic&gt;;
-	  +consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +form: FormGroup;
-	  +enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;;
-	  +consentItemModels: List&lt;ConsentItemFormViewModel&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +canTestScreener: bool;
-	  +canTestConsent: bool;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setControlsFrom();
-	  +EnrollmentFormData buildFormData();
-	  +void read();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions();
-	  +void onSelectItem();
-	  +void onNewItem();
-	  +ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs();
-	  +ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs();
-	  +ConsentItemFormRouteArgs buildConsentItemFormRouteArgs();
-	  +dynamic testScreener();
-	  +dynamic testConsent();
-	  +ScreenerQuestionFormViewModel provideQuestionFormViewModel()
-	]
-	
-	[EnrollmentFormViewModel]o-[Study]
-	[EnrollmentFormViewModel]o-[GoRouter]
-	[EnrollmentFormViewModel]o-[EnrollmentFormConsentItemDelegate]
-	[EnrollmentFormViewModel]o-[FormControl]
-	[EnrollmentFormViewModel]o-[FormArray]
-	[EnrollmentFormViewModel]o-[FormViewModelCollection]
-	[EnrollmentFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;WithQuestionnaireControls]&lt;:-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormViewModel]
-	
-	[EnrollmentFormConsentItemDelegate
-	  |
-	  +formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;;
-	  +owner: EnrollmentFormViewModel;
-	  +propagateOnSave: bool;
-	  +validationSet: dynamic
-	  |
-	  +void onCancel();
-	  +dynamic onSave();
-	  +ConsentItemFormViewModel provide();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem()
-	]
-	
-	[EnrollmentFormConsentItemDelegate]o-[FormViewModelCollection]
-	[EnrollmentFormConsentItemDelegate]o-[EnrollmentFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[EnrollmentFormConsentItemDelegate]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[EnrollmentFormConsentItemDelegate]
-	
-	[StudyFormViewModel
-	  |
-	  +studyDirtyCopy: Study?;
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +router: GoRouter;
-	  +studyInfoFormViewModel: StudyInfoFormViewModel;
-	  +enrollmentFormViewModel: EnrollmentFormViewModel;
-	  +measurementsFormViewModel: MeasurementsFormViewModel;
-	  +reportsFormViewModel: ReportsFormViewModel;
-	  +interventionsFormViewModel: InterventionsFormViewModel;
-	  +form: FormGroup;
-	  +isStudyReadonly: bool;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +titles: Map&lt;FormMode, String&gt;
-	  |
-	  +void read();
-	  +void setControlsFrom();
-	  +Study buildFormData();
-	  +void dispose();
-	  +void onCancel();
-	  +dynamic onSave();
-	  -dynamic _applyAndSaveSubform()
-	]
-	
-	[StudyFormViewModel]o-[Study]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IStudyRepository]
-	[StudyFormViewModel]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyFormViewModel]o-[GoRouter]
-	[StudyFormViewModel]o-[StudyInfoFormViewModel]
-	[StudyFormViewModel]o-[EnrollmentFormViewModel]
-	[StudyFormViewModel]o-[MeasurementsFormViewModel]
-	[StudyFormViewModel]o-[ReportsFormViewModel]
-	[StudyFormViewModel]o-[InterventionsFormViewModel]
-	[StudyFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;FormViewModel]&lt;:-[StudyFormViewModel]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[StudyFormViewModel]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls
-	  |
-	  +questionsArray: FormArray&lt;dynamic&gt;;
-	  +questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;;
-	  +questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;;
-	  +propagateOnSave: bool;
-	  +questionModels: List&lt;Q&gt;;
-	  +questionTitles: Map&lt;FormMode, String Function()&gt;
-	  |
-	  +void setQuestionnaireControlsFrom();
-	  +QuestionnaireFormData buildQuestionnaireFormData();
-	  +void read();
-	  +void onCancel();
-	  +dynamic onSave();
-	  +Q provide();
-	  +Q provideQuestionFormViewModel()
-	]
-	
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormArray]
-	[&lt;abstract&gt;WithQuestionnaireControls]o-[FormViewModelCollection]
-	[&lt;abstract&gt;IFormViewModelDelegate]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	[&lt;abstract&gt;IProviderArgsResolver]&lt;:--[&lt;abstract&gt;WithQuestionnaireControls]
-	
-	[QuestionnaireFormData
-	  |
-	  +questionsData: List&lt;QuestionFormData&gt;?;
-	  +id: String
-	  |
-	  +StudyUQuestionnaire toQuestionnaire();
-	  +List&lt;EligibilityCriterion&gt; toEligibilityCriteria();
-	  +QuestionnaireFormData copy()
-	]
-	
-	[&lt;abstract&gt;IFormData]&lt;:--[QuestionnaireFormData]
-	
-	[&lt;abstract&gt;QuestionFormData
-	  |
-	  &lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;;
-	  +questionId: String;
-	  +questionText: String;
-	  +questionInfoText: String?;
-	  +questionType: SurveyQuestionType;
-	  +responseOptionsValidity: Map&lt;dynamic, bool&gt;;
-	  +responseOptions: List&lt;dynamic&gt;;
-	  +id: String
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +EligibilityCriterion toEligibilityCriterion();
-	  +Answer&lt;dynamic&gt; constructAnswerFor();
-	  +dynamic setResponseOptionsValidityFrom();
-	  +QuestionFormData copy()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]o-[SurveyQuestionType]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;QuestionFormData]
-	
-	[ChoiceQuestionFormData
-	  |
-	  +isMultipleChoice: bool;
-	  +answerOptions: List&lt;String&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +QuestionFormData copy();
-	  -Choice _buildChoiceForValue();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ChoiceQuestionFormData]
-	
-	[BoolQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +BoolQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[BoolQuestionFormData]
-	
-	[ImageQuestionFormData
-	  |
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +ImageQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ImageQuestionFormData]
-	
-	[AudioQuestionFormData
-	  |
-	  +maxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +AudioQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[AudioQuestionFormData]
-	
-	[ScaleQuestionFormData
-	  |
-	  +minValue: double;
-	  +maxValue: double;
-	  +minLabel: String?;
-	  +maxLabel: String?;
-	  +midValues: List&lt;double?&gt;;
-	  +midLabels: List&lt;String?&gt;;
-	  +stepSize: double;
-	  +initialValue: double?;
-	  +minColor: Color?;
-	  +maxColor: Color?;
-	  +responseOptions: List&lt;double&gt;;
-	  +midAnnotations: List&lt;Annotation&gt;
-	  |
-	  +ScaleQuestion toQuestion();
-	  +QuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[ScaleQuestionFormData]o-[Color]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[ScaleQuestionFormData]
-	
-	[FreeTextQuestionFormData
-	  |
-	  +textLengthRange: List&lt;int&gt;;
-	  +textType: FreeTextQuestionType;
-	  +textTypeExpression: String?;
-	  +responseOptions: List&lt;String&gt;
-	  |
-	  +Question&lt;dynamic&gt; toQuestion();
-	  +FreeTextQuestionFormData copy();
-	  +Answer&lt;dynamic&gt; constructAnswerFor()
-	]
-	
-	[FreeTextQuestionFormData]o-[FreeTextQuestionType]
-	[&lt;abstract&gt;QuestionFormData]&lt;:-[FreeTextQuestionFormData]
-	
-	[AudioRecordingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[AudioRecordingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AudioRecordingQuestionFormView]
-	
-	[FreeTextQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +generateLabelHelpTextMap: dynamic
-	  |
-	  +Widget build();
-	  +Widget disableOnReadonly();
-	  +Widget generateRow()
-	]
-	
-	[FreeTextQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[FreeTextQuestionFormView]
-	
-	[SurveyQuestionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;SurveyQuestionType&gt;;
-	  &lt;static&gt;+choice: SurveyQuestionType;
-	  &lt;static&gt;+bool: SurveyQuestionType;
-	  &lt;static&gt;+scale: SurveyQuestionType;
-	  &lt;static&gt;+image: SurveyQuestionType;
-	  &lt;static&gt;+audio: SurveyQuestionType;
-	  &lt;static&gt;+freeText: SurveyQuestionType
-	]
-	
-	[SurveyQuestionType]o-[SurveyQuestionType]
-	[Enum]&lt;:--[SurveyQuestionType]
-	
-	[ImageCapturingQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ImageCapturingQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ImageCapturingQuestionFormView]
-	
-	[&lt;abstract&gt;IScaleQuestionFormViewModel
-	  |
-	  +isMidValuesClearedInfoVisible: bool
-	]
-	
-	[ScaleQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	]
-	
-	[ScaleQuestionFormView]o-[QuestionFormViewModel]
-	
-	[ChoiceQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[ChoiceQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[ChoiceQuestionFormView]
-	
-	[BoolQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel
-	  |
-	  +Widget build()
-	]
-	
-	[BoolQuestionFormView]o-[QuestionFormViewModel]
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[BoolQuestionFormView]
-	
-	[QuestionFormViewModel
-	  |
-	  &lt;static&gt;+defaultQuestionType: SurveyQuestionType;
-	  -_titles: Map&lt;FormMode, String Function()&gt;?;
-	  +questionIdControl: FormControl&lt;String&gt;;
-	  +questionTypeControl: FormControl&lt;SurveyQuestionType&gt;;
-	  +questionTextControl: FormControl&lt;String&gt;;
-	  +questionInfoTextControl: FormControl&lt;String&gt;;
-	  +questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;;
-	  +isMultipleChoiceControl: FormControl&lt;bool&gt;;
-	  +choiceResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +customOptionsMin: int;
-	  +customOptionsMax: int;
-	  +customOptionsInitial: int;
-	  +boolResponseOptionsArray: FormArray&lt;String&gt;;
-	  +imageResponseOptionsArray: FormArray&lt;String&gt;;
-	  &lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int;
-	  &lt;static&gt;+kMaxRecordingDurationSeconds: int;
-	  +audioResponseOptionsArray: FormArray&lt;String&gt;;
-	  +maxRecordingDurationSecondsControl: FormControl&lt;int&gt;;
-	  &lt;static&gt;+kDefaultScaleMinValue: int;
-	  &lt;static&gt;+kDefaultScaleMaxValue: int;
-	  &lt;static&gt;+kNumMidValueControls: int;
-	  &lt;static&gt;+kMidValueDebounceMilliseconds: int;
-	  +scaleMinValueControl: FormControl&lt;int&gt;;
-	  +scaleMaxValueControl: FormControl&lt;int&gt;;
-	  -_scaleRangeControl: FormControl&lt;int&gt;;
-	  +scaleMinLabelControl: FormControl&lt;String&gt;;
-	  +scaleMaxLabelControl: FormControl&lt;String&gt;;
-	  +scaleMidValueControls: FormArray&lt;int&gt;;
-	  +scaleMidLabelControls: FormArray&lt;String?&gt;;
-	  -_scaleResponseOptionsArray: FormArray&lt;int&gt;;
-	  +scaleMinColorControl: FormControl&lt;SerializableColor&gt;;
-	  +scaleMaxColorControl: FormControl&lt;SerializableColor&gt;;
-	  +prevMidValues: List&lt;int?&gt;?;
-	  +freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;;
-	  +customRegexControl: FormControl&lt;String&gt;;
-	  +freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;;
-	  +freeTextLengthMin: AbstractControl&lt;int&gt;;
-	  +freeTextLengthMax: AbstractControl&lt;int&gt;;
-	  +freeTextExampleTextControl: FormControl&lt;String&gt;;
-	  &lt;static&gt;+kDefaultFreeTextMinLength: int;
-	  &lt;static&gt;+kDefaultFreeTextMaxLength: int;
-	  +freeTextLengthControl: FormControl&lt;RangeValues&gt;;
-	  -_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;;
-	  -_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  -_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;;
-	  +form: FormGroup;
-	  +questionId: String;
-	  +questionType: SurveyQuestionType;
-	  +questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;;
-	  +answerOptionsArray: FormArray&lt;dynamic&gt;;
-	  +answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;;
-	  +validAnswerOptions: List&lt;String&gt;;
-	  +boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;;
-	  +scaleMinValue: int;
-	  +scaleMaxValue: int;
-	  +scaleRange: int;
-	  +scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;;
-	  +sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;;
-	  +questionTextRequired: dynamic;
-	  +numValidChoiceOptions: dynamic;
-	  +scaleRangeValid: dynamic;
-	  +maxRecordingDurationValid: dynamic;
-	  +titles: Map&lt;FormMode, String&gt;;
-	  +isAddOptionButtonVisible: bool;
-	  +isMidValuesClearedInfoVisible: bool
-	  |
-	  +String? scaleMidLabelAt();
-	  -dynamic _onScaleRangeChanged();
-	  -dynamic _applyInputFormatters();
-	  -dynamic _updateScaleMidValueControls();
-	  -Map&lt;String, dynamic&gt;? _validateFreeText();
-	  -dynamic _onFreeTextLengthChanged();
-	  -List&lt;FormControlValidation&gt; _getValidationConfig();
-	  +dynamic onQuestionTypeChanged();
-	  +dynamic onResponseOptionsChanged();
-	  -void _updateFormControls();
-	  +void initControls();
-	  +void setControlsFrom();
-	  +QuestionFormData buildFormData();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void onNewItem();
-	  +void onSelectItem();
-	  +dynamic save();
-	  +QuestionFormViewModel createDuplicate()
-	]
-	
-	[QuestionFormViewModel]o-[SurveyQuestionType]
-	[QuestionFormViewModel]o-[FormControl]
-	[QuestionFormViewModel]o-[FormArray]
-	[QuestionFormViewModel]o-[&lt;abstract&gt;AbstractControl]
-	[QuestionFormViewModel]o-[FormGroup]
-	[&lt;abstract&gt;ManagedFormViewModel]&lt;:-[QuestionFormViewModel]
-	[&lt;abstract&gt;IListActionProvider]&lt;:--[QuestionFormViewModel]
-	
-	[SurveyQuestionFormView
-	  |
-	  +formViewModel: QuestionFormViewModel;
-	  +isHtmlStyleable: bool
-	]
-	
-	[SurveyQuestionFormView]o-[QuestionFormViewModel]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule
-	  |
-	  +instanceId: String;
-	  +isTimeLocked: bool;
-	  +timeLockStart: StudyUTimeOfDay?;
-	  +timeLockEnd: StudyUTimeOfDay?;
-	  +hasReminder: bool;
-	  +reminderTime: StudyUTimeOfDay?
-	  |
-	  +Schedule toSchedule()
-	]
-	
-	[&lt;abstract&gt;IFormDataWithSchedule]o-[StudyUTimeOfDay]
-	[&lt;abstract&gt;IFormData]&lt;:--[&lt;abstract&gt;IFormDataWithSchedule]
-	
-	[ScheduleControls
-	  |
-	  +formViewModel: WithScheduleControls
-	  |
-	  +Widget build();
-	  -List&lt;FormTableRow&gt; _conditionalTimeRestrictions()
-	]
-	
-	[ScheduleControls]o-[&lt;abstract&gt;WithScheduleControls]
-	[&lt;abstract&gt;FormConsumerWidget]&lt;:-[ScheduleControls]
-	
-	[&lt;abstract&gt;WithScheduleControls
-	  |
-	  +isTimeRestrictedControl: FormControl&lt;bool&gt;;
-	  +instanceID: FormControl&lt;String&gt;;
-	  +restrictedTimeStartControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +restrictedTimeEndControl: FormControl&lt;Time&gt;;
-	  +restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;;
-	  +hasReminderControl: FormControl&lt;bool&gt;;
-	  +reminderTimeControl: FormControl&lt;Time&gt;;
-	  +reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;;
-	  -_reminderControlStream: StreamSubscription&lt;dynamic&gt;?;
-	  +scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;;
-	  +hasReminder: bool;
-	  +isTimeRestricted: bool;
-	  +timeRestriction: List&lt;Time&gt;?
-	  |
-	  +void setScheduleControlsFrom();
-	  -dynamic _initReminderControl()
-	]
-	
-	[&lt;abstract&gt;WithScheduleControls]o-[FormControl]
-	[&lt;abstract&gt;WithScheduleControls]o-[StreamSubscription]
-	
-	[&lt;abstract&gt;StudyDesignPageWidget
-	  |
-	  +Widget? banner()
-	]
-	
-	[&lt;abstract&gt;StudyPageWidget]&lt;:-[&lt;abstract&gt;StudyDesignPageWidget]
-	
-	[StudiesTableColumnHeader
-	  |
-	  +title: String;
-	  +sortable: bool;
-	  +sortAscending: bool;
-	  +sortingActive: bool;
-	  +onSort: void Function()?
-	]
-	
-	[StudiesTableColumnHeader]o-[void Function()?]
-	
-	[DashboardScreen
-	  |
-	  +filter: StudiesFilter?
-	]
-	
-	[DashboardScreen]o-[StudiesFilter]
-	
-	[DashboardScaffold
-	  |
-	  &lt;static&gt;+compactWidthThreshold: double;
-	  +body: Widget
-	  |
-	  +Widget build()
-	]
-	
-	[DashboardScaffold]o-[&lt;abstract&gt;Widget]
-	
-	[DashboardController
-	  |
-	  +studyRepository: IStudyRepository;
-	  +authRepository: IAuthRepository;
-	  +userRepository: IUserRepository;
-	  +router: GoRouter;
-	  -_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?;
-	  +searchController: SearchController;
-	  +isSortAscending: bool
-	  |
-	  -dynamic _subscribeStudies();
-	  +dynamic setSearchText();
-	  +dynamic setStudiesFilter();
-	  +dynamic onSelectStudy();
-	  +dynamic onClickNewStudy();
-	  +dynamic pinStudy();
-	  +dynamic pinOffStudy();
-	  +void setSorting();
-	  +void filterStudies();
-	  +void sortStudies();
-	  +bool isSortingActiveForColumn();
-	  +bool isPinned();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +void dispose()
-	]
-	
-	[DashboardController]o-[&lt;abstract&gt;IStudyRepository]
-	[DashboardController]o-[&lt;abstract&gt;IAuthRepository]
-	[DashboardController]o-[&lt;abstract&gt;IUserRepository]
-	[DashboardController]o-[GoRouter]
-	[DashboardController]o-[StreamSubscription]
-	[DashboardController]o-[SearchController]
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[DashboardController]
-	
-	[StudiesFilter
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesFilter&gt;
-	]
-	
-	[Enum]&lt;:--[StudiesFilter]
-	
-	[StudiesTableColumnSize
-	  |
-	  +collapsed: bool;
-	  +flex: int?;
-	  +width: double?
-	  |
-	  +Widget createContainer()
-	]
-	
-	[StudiesTable
-	  |
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +compactWidthThreshold: double;
-	  +superCompactWidthThreshold: double;
-	  +compactStatTitleThreshold: double;
-	  +studies: List&lt;Study&gt;;
-	  +onSelect: void Function(Study);
-	  +getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study);
-	  +emptyWidget: Widget;
-	  +pinnedStudies: Iterable&lt;String&gt;;
-	  +dashboardController: DashboardController
-	  |
-	  +Widget build();
-	  -Widget _buildColumnHeader()
-	]
-	
-	[StudiesTable]o-[void Function(Study)]
-	[StudiesTable]o-[List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)]
-	[StudiesTable]o-[&lt;abstract&gt;Widget]
-	[StudiesTable]o-[DashboardController]
-	
-	[StudiesTableColumn
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;StudiesTableColumn&gt;;
-	  &lt;static&gt;+pin: StudiesTableColumn;
-	  &lt;static&gt;+title: StudiesTableColumn;
-	  &lt;static&gt;+status: StudiesTableColumn;
-	  &lt;static&gt;+participation: StudiesTableColumn;
-	  &lt;static&gt;+createdAt: StudiesTableColumn;
-	  &lt;static&gt;+enrolled: StudiesTableColumn;
-	  &lt;static&gt;+active: StudiesTableColumn;
-	  &lt;static&gt;+completed: StudiesTableColumn;
-	  &lt;static&gt;+action: StudiesTableColumn
-	]
-	
-	[StudiesTableColumn]o-[StudiesTableColumn]
-	[Enum]&lt;:--[StudiesTableColumn]
-	
-	[StudiesTableItem
-	  |
-	  +study: Study;
-	  +itemHeight: double;
-	  +itemPadding: double;
-	  +rowSpacing: double;
-	  +columnSpacing: double;
-	  +actions: List&lt;ModelAction&lt;dynamic&gt;&gt;;
-	  +columnSizes: List&lt;StudiesTableColumnSize&gt;;
-	  +isPinned: bool;
-	  +onPinnedChanged: void Function(Study, bool)?;
-	  +onTap: void Function(Study)?
-	]
-	
-	[StudiesTableItem]o-[Study]
-	[StudiesTableItem]o-[void Function(Study, bool)?]
-	[StudiesTableItem]o-[void Function(Study)?]
-	
-	[App
-	]
-	
-	[AppContent
-	]
-	
-	[AccountSettingsDialog
-	  |
-	  +Widget build()
-	]
-	
-	[&lt;abstract&gt;ConsumerWidget]&lt;:-[AccountSettingsDialog]
-	
-	[&lt;abstract&gt;IInviteCodeRepository
-	  |
-	  +dynamic isCodeAlreadyUsed()
-	]
-	
-	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IInviteCodeRepository]
-	
-	[InviteCodeRepository
-	  |
-	  +studyId: String;
-	  +ref: ProviderRef&lt;dynamic&gt;;
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +studyRepository: IStudyRepository;
-	  +study: Study
-	  |
-	  +String getKey();
-	  +dynamic isCodeAlreadyUsed();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions();
-	  +dynamic emitUpdate()
-	]
-	
-	[InviteCodeRepository]o-[&lt;abstract&gt;ProviderRef]
-	[InviteCodeRepository]o-[&lt;abstract&gt;StudyUApi]
-	[InviteCodeRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[InviteCodeRepository]o-[&lt;abstract&gt;IStudyRepository]
-	[InviteCodeRepository]o-[Study]
-	[&lt;abstract&gt;ModelRepository]&lt;:-[InviteCodeRepository]
-	[&lt;abstract&gt;IInviteCodeRepository]&lt;:--[InviteCodeRepository]
-	
-	[InviteCodeRepositoryDelegate
-	  |
-	  +study: Study;
-	  +apiClient: StudyUApi;
-	  +studyRepository: IStudyRepository
-	  |
-	  +dynamic fetch();
-	  +dynamic fetchAll();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic onError();
-	  +StudyInvite createDuplicate();
-	  +StudyInvite createNewInstance()
-	]
-	
-	[InviteCodeRepositoryDelegate]o-[Study]
-	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
-	[InviteCodeRepositoryDelegate]o-[&lt;abstract&gt;IStudyRepository]
-	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[InviteCodeRepositoryDelegate]
-	
-	[&lt;abstract&gt;IStudyRepository
-	  |
-	  +dynamic launch();
-	  +dynamic deleteParticipants()
-	]
-	
-	[&lt;abstract&gt;ModelRepository]&lt;:--[&lt;abstract&gt;IStudyRepository]
-	
-	[StudyRepository
-	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +ref: ProviderRef&lt;dynamic&gt;;
-	  +sortCallback: void Function()?
-	  |
-	  +String getKey();
-	  +dynamic deleteParticipants();
-	  +dynamic launch();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
-	]
-	
-	[StudyRepository]o-[&lt;abstract&gt;StudyUApi]
-	[StudyRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[StudyRepository]o-[&lt;abstract&gt;ProviderRef]
-	[StudyRepository]o-[void Function()?]
-	[&lt;abstract&gt;ModelRepository]&lt;:-[StudyRepository]
-	[&lt;abstract&gt;IStudyRepository]&lt;:--[StudyRepository]
-	
-	[StudyRepositoryDelegate
-	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository
-	  |
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic onError();
-	  +Study createNewInstance();
-	  +Study createDuplicate()
-	]
-	
-	[StudyRepositoryDelegate]o-[&lt;abstract&gt;StudyUApi]
-	[StudyRepositoryDelegate]o-[&lt;abstract&gt;IAuthRepository]
-	[&lt;abstract&gt;IModelRepositoryDelegate]&lt;:-[StudyRepositoryDelegate]
-	
-	[&lt;abstract&gt;StudyUApi
-	  |
-	  +dynamic saveStudy();
-	  +dynamic fetchStudy();
-	  +dynamic getUserStudies();
-	  +dynamic deleteStudy();
-	  +dynamic saveStudyInvite();
-	  +dynamic fetchStudyInvite();
-	  +dynamic deleteStudyInvite();
-	  +dynamic deleteParticipants();
-	  +dynamic fetchAppConfig();
-	  +dynamic fetchUser();
-	  +dynamic saveUser()
-	]
-	
-	[APIException
-	]
-	
-	[Exception]&lt;:--[APIException]
-	
-	[StudyNotFoundException
-	]
-	
-	[APIException]&lt;:-[StudyNotFoundException]
-	
-	[MeasurementNotFoundException
-	]
-	
-	[APIException]&lt;:-[MeasurementNotFoundException]
-	
-	[QuestionNotFoundException
-	]
-	
-	[APIException]&lt;:-[QuestionNotFoundException]
-	
-	[ConsentItemNotFoundException
-	]
-	
-	[APIException]&lt;:-[ConsentItemNotFoundException]
-	
-	[InterventionNotFoundException
-	]
-	
-	[APIException]&lt;:-[InterventionNotFoundException]
-	
-	[InterventionTaskNotFoundException
-	]
-	
-	[APIException]&lt;:-[InterventionTaskNotFoundException]
-	
-	[ReportNotFoundException
-	]
-	
-	[APIException]&lt;:-[ReportNotFoundException]
-	
-	[ReportSectionNotFoundException
-	]
-	
-	[APIException]&lt;:-[ReportSectionNotFoundException]
-	
-	[StudyInviteNotFoundException
-	]
-	
-	[APIException]&lt;:-[StudyInviteNotFoundException]
-	
-	[UserNotFoundException
-	]
-	
-	[APIException]&lt;:-[UserNotFoundException]
-	
-	[StudyUApiClient
-	  |
-	  +supabaseClient: SupabaseClient;
-	  &lt;static&gt;+studyColumns: List&lt;String&gt;;
-	  &lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;;
-	  +testDelayMilliseconds: int
-	  |
-	  +dynamic deleteParticipants();
-	  +dynamic getUserStudies();
-	  +dynamic fetchStudy();
-	  +dynamic deleteStudy();
-	  +dynamic saveStudy();
-	  +dynamic fetchStudyInvite();
-	  +dynamic saveStudyInvite();
-	  +dynamic deleteStudyInvite();
-	  +dynamic fetchAppConfig();
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  -dynamic _awaitGuarded();
-	  -dynamic _apiException();
-	  -dynamic _testDelay()
-	]
-	
-	[StudyUApiClient]o-[SupabaseClient]
-	[&lt;abstract&gt;SupabaseClientDependant]&lt;:-[StudyUApiClient]
-	[&lt;abstract&gt;SupabaseQueryMixin]&lt;:-[StudyUApiClient]
-	[&lt;abstract&gt;StudyUApi]&lt;:--[StudyUApiClient]
-	
-	[&lt;abstract&gt;IAppRepository
-	  |
-	  +dynamic fetchAppConfig();
-	  +void dispose()
-	]
-	
-	[AppRepository
-	  |
-	  +apiClient: StudyUApi
-	  |
-	  +dynamic fetchAppConfig();
-	  +void dispose()
-	]
-	
-	[AppRepository]o-[&lt;abstract&gt;StudyUApi]
-	[&lt;abstract&gt;IAppRepository]&lt;:--[AppRepository]
-	
-	[&lt;abstract&gt;IUserRepository
-	  |
-	  +user: StudyUUser
-	  |
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  +dynamic updatePreferences()
-	]
-	
-	[&lt;abstract&gt;IUserRepository]o-[StudyUUser]
-	
-	[UserRepository
-	  |
-	  +apiClient: StudyUApi;
-	  +authRepository: IAuthRepository;
-	  +ref: Ref&lt;Object?&gt;;
-	  +user: StudyUUser
-	  |
-	  +dynamic fetchUser();
-	  +dynamic saveUser();
-	  +dynamic updatePreferences()
-	]
-	
-	[UserRepository]o-[&lt;abstract&gt;StudyUApi]
-	[UserRepository]o-[&lt;abstract&gt;IAuthRepository]
-	[UserRepository]o-[&lt;abstract&gt;Ref]
-	[UserRepository]o-[StudyUUser]
-	[&lt;abstract&gt;IUserRepository]&lt;:--[UserRepository]
-	
-	[PreferenceAction
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;PreferenceAction&gt;;
-	  &lt;static&gt;+pin: PreferenceAction;
-	  &lt;static&gt;+pinOff: PreferenceAction
-	]
-	
-	[PreferenceAction]o-[PreferenceAction]
-	[Enum]&lt;:--[PreferenceAction]
-	
-	[&lt;abstract&gt;IAuthRepository
-	  |
-	  +allowPasswordReset: bool;
-	  +currentUser: User?;
-	  +isLoggedIn: bool;
-	  +session: Session?;
-	  +serializedSession: String?
-	  |
-	  +dynamic signUp();
-	  +dynamic signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic updateUser();
-	  +void dispose()
-	]
-	
-	[&lt;abstract&gt;IAuthRepository]o-[User]
-	[&lt;abstract&gt;IAuthRepository]o-[Session]
-	[&lt;abstract&gt;IAppDelegate]&lt;:-[&lt;abstract&gt;IAuthRepository]
-	
-	[AuthRepository
-	  |
-	  +supabaseClient: SupabaseClient;
-	  +allowPasswordReset: bool;
-	  +authClient: GoTrueClient;
-	  +session: Session?;
-	  +serializedSession: String?;
-	  +currentUser: User?;
-	  +isLoggedIn: bool
-	  |
-	  -void _registerAuthListener();
-	  +dynamic signUp();
-	  +dynamic signInWith();
-	  +dynamic signOut();
-	  +dynamic resetPasswordForEmail();
-	  +dynamic updateUser();
-	  +void dispose();
-	  +dynamic onAppStart()
-	]
-	
-	[AuthRepository]o-[SupabaseClient]
-	[AuthRepository]o-[GoTrueClient]
-	[AuthRepository]o-[Session]
-	[AuthRepository]o-[User]
-	[&lt;abstract&gt;IAuthRepository]&lt;:--[AuthRepository]
-	
-	[StudyLaunched
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[StudyLaunched]
-	
-	[&lt;abstract&gt;SupabaseClientDependant
-	  |
-	  +supabaseClient: SupabaseClient
-	]
-	
-	[&lt;abstract&gt;SupabaseClientDependant]o-[SupabaseClient]
-	
-	[SupabaseQueryError
-	  |
-	  +statusCode: String?;
-	  +message: String;
-	  +details: dynamic
-	]
-	
-	[Exception]&lt;:--[SupabaseQueryError]
-	
-	[&lt;abstract&gt;SupabaseQueryMixin
-	  |
-	  +dynamic deleteAll();
-	  +dynamic getAll();
-	  +dynamic getById();
-	  +dynamic getByColumn();
-	  +List&lt;T&gt; deserializeList();
-	  +T deserializeObject()
-	]
-	
-	[WrappedModel
-	  |
-	  -_model: T;
-	  +asyncValue: AsyncValue&lt;T&gt;;
-	  +isLocalOnly: bool;
-	  +isDirty: bool;
-	  +isDeleted: bool;
-	  +lastSaved: DateTime?;
-	  +lastFetched: DateTime?;
-	  +lastUpdated: DateTime?;
-	  +model: T
-	  |
-	  +dynamic markWithError();
-	  +dynamic markAsLoading();
-	  +dynamic markAsFetched();
-	  +dynamic markAsSaved()
-	]
-	
-	[WrappedModel]o-[&lt;abstract&gt;AsyncValue]
-	
-	[ModelRepositoryException
-	]
-	
-	[Exception]&lt;:--[ModelRepositoryException]
-	
-	[ModelNotFoundException
-	]
-	
-	[ModelRepositoryException]&lt;:--[ModelNotFoundException]
-	
-	[&lt;abstract&gt;IModelRepository
-	  |
-	  +String getKey();
-	  +WrappedModel&lt;T&gt;? get();
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic duplicateAndSave();
-	  +dynamic duplicateAndSaveFromRemote();
-	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
-	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
-	  +dynamic ensurePersisted();
-	  +void dispose()
-	]
-	
-	[&lt;abstract&gt;IModelActionProvider]&lt;:--[&lt;abstract&gt;IModelRepository]
-	
-	[&lt;abstract&gt;IModelRepositoryDelegate
-	  |
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +T createNewInstance();
-	  +T createDuplicate();
-	  +dynamic onError()
-	]
-	
-	[&lt;abstract&gt;ModelRepository
-	  |
-	  +delegate: IModelRepositoryDelegate&lt;T&gt;;
-	  -_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;;
-	  -_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;;
-	  +modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;;
-	  +modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;;
-	  -_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;
-	  |
-	  +WrappedModel&lt;T&gt;? get();
-	  +dynamic fetchAll();
-	  +dynamic fetch();
-	  +dynamic save();
-	  +dynamic delete();
-	  +dynamic duplicateAndSave();
-	  +dynamic duplicateAndSaveFromRemote();
-	  +Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll();
-	  +Stream&lt;WrappedModel&lt;T&gt;&gt; watch();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges();
-	  +Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges();
-	  -dynamic _buildModelSpecificController();
-	  +dynamic ensurePersisted();
-	  +WrappedModel&lt;T&gt; upsertLocally();
-	  +List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally();
-	  +dynamic emitUpdate();
-	  +dynamic emitModelEvent();
-	  +dynamic emitError();
-	  +void dispose();
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
-	]
-	
-	[&lt;abstract&gt;ModelRepository]o-[&lt;abstract&gt;IModelRepositoryDelegate]
-	[&lt;abstract&gt;ModelRepository]o-[BehaviorSubject]
-	[&lt;abstract&gt;IModelRepository]&lt;:-[&lt;abstract&gt;ModelRepository]
-	
-	[&lt;abstract&gt;ModelEvent
-	  |
-	  +modelId: String;
-	  +model: T
-	]
-	
-	[IsFetched
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsFetched]
-	
-	[IsSaving
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaving]
-	
-	[IsSaved
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsSaved]
-	
-	[IsDeleted
-	]
-	
-	[&lt;abstract&gt;ModelEvent]&lt;:-[IsDeleted]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="bold" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="4748.0" width="84151.5" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M107.2 1726.1 L72 1936 L22360.25 2619.4345842744133 L22360.3 2619.4 " fill="none"></path>
-					<path d="M112.5 1727.0 L107.2 1726.1 L101.9 1725.3 L109.4 1713.0 Z"></path>
-					<path d="M26605.7 158.2 L26347.25 293 L26347.25 591 L26347.3 591.0 " fill="none"></path>
-					<path d="M26608.2 162.9 L26605.7 158.2 L26603.2 153.4 L26617.5 152.0 Z"></path>
-					<path d="M26647.3 165.3 L26647.25 293 L26647.25 591 L26647.3 591.0 " fill="none"></path>
-					<path d="M26652.6 165.3 L26647.3 165.3 L26641.9 165.3 L26647.3 152.0 Z"></path>
-					<path d="M631.0 2704.7 L631 3314 L64459 3500.4109241526185 L64459.0 3500.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M636.3 2695.3 L631.0 2704.7 L625.7 2695.3 L631.0 2686.0 Z"></path>
-					</g>
-					<path d="M866.9 3408.2 L880 3402 L887.5 3402 L887.5 3402 L895 3500.5 L895 3500.5 L887.5 3599 L887.5 3599 L880 3599 L880 3599 L850 3584.8612440191387 L850.0 3584.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M856.2 3407.3 L866.9 3408.2 L860.7 3417.0 L850.0 3416.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3485.8 2635.5 L671 3314 L671 3402 L671.0 3402.0 " fill="none"></path>
-					</g>
-					<path d="M3487.0 2640.7 L3485.8 2635.5 L3484.5 2630.3 L3498.8 2632.4 Z"></path>
-					<path d="M4245.2 2726.9 L4145.5 3314 L3894.9490616621983 3469.5 L3894.9 3469.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4252.0 2718.6 L4245.2 2726.9 L4241.5 2716.8 L4248.3 2708.5 Z"></path>
-					</g>
-					<path d="M4288.1 2726.6 L4436.25 3314 L4149.034852546917 3454.5 L4149.0 3454.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4291.0 2716.2 L4288.1 2726.6 L4280.7 2718.9 L4283.6 2708.5 Z"></path>
-					</g>
-					<path d="M2291.5 3550.2 L2291.5 3687 L2291.5 3797.5 L2291.5 3797.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2296.8 3540.8 L2291.5 3550.2 L2286.2 3540.8 L2291.5 3531.5 Z"></path>
-					</g>
-					<path d="M61821.5 3931.2 L61821.5 4000 L63516.75 4128.504313392731 L63516.8 4128.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M61826.8 3921.8 L61821.5 3931.2 L61816.2 3921.8 L61821.5 3912.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M61821.5 3567.3 L61821.5 3687 L61821.5 3774.5 L61821.5 3774.5 " fill="none"></path>
-					</g>
-					<path d="M61826.8 3567.3 L61821.5 3567.3 L61816.2 3567.3 L61821.5 3554.0 Z"></path>
-					<path d="M4626.1 2719.6 L4476.25 3314 L21189 3500.1046900422434 L21189.0 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4633.6 2711.9 L4626.1 2719.6 L4623.3 2709.2 L4630.7 2701.5 Z"></path>
-					</g>
-					<path d="M4631.6 2719.8 L4516.25 3314 L25956.25 3500.122372983918 L25956.3 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4638.6 2711.7 L4631.6 2719.8 L4628.1 2709.6 L4635.1 2701.5 Z"></path>
-					</g>
-					<path d="M4637.1 2720.0 L4556.25 3314 L2058 3489.1098844310814 L2058.0 3489.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4643.6 2711.5 L4637.1 2720.0 L4633.0 2710.0 L4639.6 2701.5 Z"></path>
-					</g>
-					<path d="M2291.5 3908.2 L2291.5 4000 L7295.25 4131.8005798810755 L7295.3 4131.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2296.8 3898.8 L2291.5 3908.2 L2286.2 3898.8 L2291.5 3889.5 Z"></path>
-					</g>
-					<path d="M4760.6 2709.6 L5551 3314 L3913 3493.0662368112544 L3913.0 3493.1 " fill="none"></path>
-					<path d="M4763.9 2705.4 L4760.6 2709.6 L4757.4 2713.8 L4750.0 2701.5 Z"></path>
-					<path d="M4785.7 2708.5 L5769.75 3314 L4157 3489.406254556058 L4157.0 3489.4 " fill="none"></path>
-					<path d="M4788.5 2703.9 L4785.7 2708.5 L4782.9 2713.0 L4774.3 2701.5 Z"></path>
-					<path d="M2075.8 3443.4 L2088 3439.5 L2095.5 3439.5 L2095.5 3439.5 L2103 3500.5 L2103 3500.5 L2095.5 3561.5 L2095.5 3561.5 L2088 3561.5 L2088 3561.5 L2058 3551.9935064935066 L2058.0 3552.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2065.3 3441.1 L2075.8 3443.4 L2068.5 3451.3 L2058.0 3449.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3486.1 2639.2 L1440 3314 L1746.5160857908847 3439.5 L1746.5 3439.5 " fill="none"></path>
-					</g>
-					<path d="M3487.8 2644.3 L3486.1 2639.2 L3484.4 2634.2 L3498.8 2635.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M27169.3 180.8 L27169.25 293 L27169.25 598.5 L27169.3 598.5 " fill="none"></path>
-					</g>
-					<path d="M27174.6 180.8 L27169.3 180.8 L27163.9 180.8 L27169.3 167.5 Z"></path>
-					<path d="M5945.4 2704.2 L5809.75 3314 L21189 3500.070492547722 L21189.0 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5952.6 2696.3 L5945.4 2704.2 L5942.2 2694.0 L5949.4 2686.0 Z"></path>
-					</g>
-					<path d="M5974.0 2704.5 L6058.25 3314 L4359 3492.01439404578 L4359.0 3492.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5978.0 2694.5 L5974.0 2704.5 L5967.4 2696.0 L5971.4 2686.0 Z"></path>
-					</g>
-					<path d="M6327.4 2742.1 L6180.25 3314 L35359.5 3500.1523111130114 L35359.5 3500.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6334.9 2734.4 L6327.4 2742.1 L6324.5 2731.7 L6332.0 2724.0 Z"></path>
-					</g>
-					<path d="M6334.1 2742.3 L6220.25 3314 L29511.5 3499.8377541525397 L29511.5 3499.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6341.2 2734.2 L6334.1 2742.3 L6330.7 2732.1 L6337.8 2724.0 Z"></path>
-					</g>
-					<path d="M6340.9 2742.5 L6260.25 3314 L4703.141420911528 3485 L4703.1 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6347.5 2734.0 L6340.9 2742.5 L6336.9 2732.5 L6343.5 2724.0 Z"></path>
-					</g>
-					<path d="M6388.6 2742.0 L6540.5 3314 L4931 3491.3540620384047 L4931.0 3491.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6391.3 2731.7 L6388.6 2742.0 L6381.0 2734.4 L6383.8 2724.0 Z"></path>
-					</g>
-					<path d="M6845.6 2719.4 L6670 3314 L24200.25 3499.768804068355 L24200.3 3499.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6853.4 2712.0 L6845.6 2719.4 L6843.1 2708.9 L6850.9 2701.5 Z"></path>
-					</g>
-					<path d="M6851.0 2719.7 L6710 3314 L10582 3498.3809523809523 L10582.0 3498.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6858.4 2711.8 L6851.0 2719.7 L6848.0 2709.3 L6855.3 2701.5 Z"></path>
-					</g>
-					<path d="M6879.0 2720.1 L6913.5 3314 L5293.813672922252 3485 L5293.8 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M6883.8 2710.5 L6879.0 2720.1 L6873.2 2711.1 L6877.9 2701.5 Z"></path>
-					</g>
-					<path d="M7374.0 2772.0 L7225.75 3314 L21300 3500.1165068335313 L21300.0 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7381.6 2764.4 L7374.0 2772.0 L7371.4 2761.6 L7379.0 2754.0 Z"></path>
-					</g>
-					<path d="M7382.5 2772.2 L7265.75 3314 L6136.25 3496.5405112651647 L6136.3 3496.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7389.7 2764.2 L7382.5 2772.2 L7379.3 2762.0 L7386.4 2754.0 Z"></path>
-					</g>
-					<path d="M7434.7 2772.5 L7510 3314 L6350.25 3487.485762983758 L6350.3 3487.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7438.7 2762.5 L7434.7 2772.5 L7428.2 2764.0 L7432.2 2754.0 Z"></path>
-					</g>
-					<path d="M7812.9 2697.0 L7743.5 3314 L6600.367292225201 3485 L6600.4 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7819.2 2688.4 L7812.9 2697.0 L7808.6 2687.2 L7815.0 2678.5 Z"></path>
-					</g>
-					<path d="M7836.2 2696.8 L7967.25 3314 L40261.25 3499.7579804459797 L40261.3 3499.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7839.5 2686.5 L7836.2 2696.8 L7829.1 2688.7 L7832.4 2678.5 Z"></path>
-					</g>
-					<path d="M40390.3 3550.2 L40390.25 3687 L40390.25 3828 L40390.3 3828.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40395.6 3540.8 L40390.3 3550.2 L40384.9 3540.8 L40390.3 3531.5 Z"></path>
-					</g>
-					<path d="M8153.5 2712.2 L8153.5 3314 L21189 3499.993477928238 L21189.0 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8158.8 2702.8 L8153.5 2712.2 L8148.2 2702.8 L8153.5 2693.5 Z"></path>
-					</g>
-					<path d="M8423.1 2734.9 L8318.25 3314 L21189 3499.9870121065373 L21189.0 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8430.0 2726.6 L8423.1 2734.9 L8419.5 2724.7 L8426.4 2716.5 Z"></path>
-					</g>
-					<path d="M8467.7 2734.7 L8598 3314 L13267 3497.8227781296177 L13267.0 3497.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8470.8 2724.4 L8467.7 2734.7 L8460.4 2726.8 L8463.6 2716.5 Z"></path>
-					</g>
-					<path d="M8763.4 2756.7 L8638 3314 L25956.25 3500.032722795801 L25956.3 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8770.6 2748.8 L8763.4 2756.7 L8760.2 2746.4 L8767.5 2738.5 Z"></path>
-					</g>
-					<path d="M8774.6 2757.0 L8697 3314 L8697 3500.5 L8697 3500.5 L8697 3687 L8697 3687 L8697 3843.5 L8697 3843.5 L8697 4000 L8697 4000 L18072.75 4132.978804477257 L18072.8 4133.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8781.2 2748.5 L8774.6 2757.0 L8770.6 2747.0 L8777.2 2738.5 Z"></path>
-					</g>
-					<path d="M8782.3 2757.1 L8737 3314 L11864.75 3495.3681694520014 L11864.8 3495.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8788.3 2748.2 L8782.3 2757.1 L8777.7 2747.4 L8783.8 2738.5 Z"></path>
-					</g>
-					<path d="M8789.9 2757.2 L8777 3314 L13453.5 3498.429530556143 L13453.5 3498.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8795.5 2748.0 L8789.9 2757.2 L8784.8 2747.7 L8790.4 2738.5 Z"></path>
-					</g>
-					<path d="M8812.0 2757.0 L8892 3314 L8892 3485 L8892.0 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M8815.9 2747.0 L8812.0 2757.0 L8805.4 2748.5 L8809.3 2738.5 Z"></path>
-					</g>
-					<path d="M9175.4 2719.5 L9090 3314 L9090 3485 L9090.0 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9182.0 2711.0 L9175.4 2719.5 L9171.5 2709.5 L9178.1 2701.0 Z"></path>
-					</g>
-					<path d="M9247.5 2716.7 L9628.5 3314 L10582 3492.184118236473 L10582.0 3492.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9247.0 2706.0 L9247.5 2716.7 L9238.0 2711.7 L9237.5 2701.0 Z"></path>
-					</g>
-					<path d="M9252.6 2716.3 L9668.5 3314 L21189 3499.9270725164415 L21189.0 3499.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9251.6 2705.6 L9252.6 2716.3 L9242.8 2711.7 L9241.9 2701.0 Z"></path>
-					</g>
-					<path d="M9257.5 2715.9 L9708.5 3314 L24200.25 3499.6162199749324 L24200.3 3499.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9256.2 2705.2 L9257.5 2715.9 L9247.7 2711.7 L9246.3 2701.0 Z"></path>
-					</g>
-					<path d="M9264.8 2715.3 L9767.5 3314 L7235 3487.8035878564856 L7235.0 3487.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9262.9 2704.7 L9264.8 2715.3 L9254.7 2711.6 L9252.8 2701.0 Z"></path>
-					</g>
-					<path d="M9971.0 2719.5 L9807.5 3314 L21189 3499.920097223439 L21189.0 3499.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9978.6 2711.9 L9971.0 2719.5 L9968.3 2709.1 L9976.0 2701.5 Z"></path>
-					</g>
-					<path d="M9991.5 2720.1 L9957.25 3314 L7235 3488.6322555679767 L7235.0 3488.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9997.4 2711.1 L9991.5 2720.1 L9986.7 2710.5 L9992.6 2701.5 Z"></path>
-					</g>
-					<path d="M10017.6 2719.7 L10146.75 3314 L10586.628016085791 3485 L10586.6 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10020.8 2709.5 L10017.6 2719.7 L10010.4 2711.8 L10013.6 2701.5 Z"></path>
-					</g>
-					<path d="M10336.5 2720.2 L10336.5 3314 L10602.398123324398 3485 L10602.4 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10341.8 2710.8 L10336.5 2720.2 L10331.2 2710.8 L10336.5 2701.5 Z"></path>
-					</g>
-					<path d="M10785.5 2712.7 L10768 3314 L10638.260053619302 3485 L10638.3 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10791.1 2703.5 L10785.5 2712.7 L10780.4 2703.2 L10786.0 2694.0 Z"></path>
-					</g>
-					<path d="M10804.8 2712.3 L10920.25 3314 L7235 3491.585201214392 L7235.0 3491.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10808.2 2702.2 L10804.8 2712.3 L10797.8 2704.2 L10801.2 2694.0 Z"></path>
-					</g>
-					<path d="M7253.6 3490.1 L8096.1666666666715 3447 L8311.458333333328 3447 L8311.458333333328 3447 L8526.75 3500.5 L8526.75 3500.5 L8311.458333333328 3554 L8311.458333333328 3554 L8096.1666666666715 3554 L8096.1666666666715 3554 L7235 3509.9607296479207 L7235.0 3510.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M7244.0 3485.2 L7253.6 3490.1 L7244.6 3495.9 L7235.0 3491.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3486.1 2639.5 L1480 3314 L6865 3494.30565529623 L6865.0 3494.3 " fill="none"></path>
-					</g>
-					<path d="M3487.8 2644.6 L3486.1 2639.5 L3484.4 2634.4 L3498.8 2635.3 Z"></path>
-					<path d="M15526.0 3916.2 L15526 4000 L18072.75 4130.315799522673 L18072.8 4130.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15531.3 3906.8 L15526.0 3916.2 L15520.7 3906.8 L15526.0 3897.5 Z"></path>
-					</g>
-					<path d="M11064.2 2772.3 L10960.25 3314 L25956.25 3499.9605704976893 L25956.3 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11071.2 2764.2 L11064.2 2772.3 L11060.7 2762.2 L11067.7 2754.0 Z"></path>
-					</g>
-					<path d="M11082.9 2772.6 L11047.75 3314 L21300 3499.973945288754 L21300.0 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11088.8 2763.7 L11082.9 2772.6 L11078.2 2763.0 L11084.1 2754.0 Z"></path>
-					</g>
-					<path d="M11091.5 2772.7 L11087.75 3314 L24378.25 3498.5009676578957 L24378.3 3498.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11096.9 2763.4 L11091.5 2772.7 L11086.2 2763.3 L11091.6 2754.0 Z"></path>
-					</g>
-					<path d="M11100.1 2772.6 L11127.75 3314 L13453.5 3496.3830022075053 L13453.5 3496.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11104.9 2763.0 L11100.1 2772.6 L11094.3 2763.6 L11099.1 2754.0 Z"></path>
-					</g>
-					<path d="M11119.8 2772.4 L11220 3314 L10671 3486.5164279696714 L10671.0 3486.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11123.3 2762.2 L11119.8 2772.4 L11112.8 2764.1 L11116.4 2754.0 Z"></path>
-					</g>
-					<path d="M24683.6 3437.0 L24696.25 3432 L24703.75 3432 L24703.75 3432 L24711.25 3500.5 L24711.25 3500.5 L24703.75 3569 L24703.75 3569 L24696.25 3569 L24696.25 3569 L24666.25 3557.189655172414 L24666.3 3557.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24673.0 3435.4 L24683.6 3437.0 L24676.9 3445.4 L24666.3 3443.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3486.1 2639.8 L1520 3314 L24378.25 3499.3324620417566 L24378.3 3499.3 " fill="none"></path>
-					</g>
-					<path d="M3487.9 2644.8 L3486.1 2639.8 L3484.4 2634.7 L3498.8 2635.5 Z"></path>
-					<path d="M11358.8 2779.9 L11260 3314 L21189 3499.835566260224 L21189.0 3499.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11365.8 2771.6 L11358.8 2779.9 L11355.3 2769.7 L11362.2 2761.5 Z"></path>
-					</g>
-					<path d="M11384.4 2780.2 L11373.75 3314 L21300 3499.956718816705 L21300.0 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11389.9 2770.9 L11384.4 2780.2 L11379.3 2770.7 L11384.8 2761.5 Z"></path>
-					</g>
-					<path d="M11413.1 2779.9 L11501.25 3314 L13453.5 3495.615974560419 L13453.5 3495.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11416.8 2769.8 L11413.1 2779.9 L11406.3 2771.6 L11410.0 2761.5 Z"></path>
-					</g>
-					<path d="M11655.0 2704.7 L11655 3314 L35359.5 3500.072193695021 L35359.5 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11660.3 2695.3 L11655.0 2704.7 L11649.7 2695.3 L11655.0 2686.0 Z"></path>
-					</g>
-					<path d="M11927.9 2734.4 L11821.5 3314 L21189 3499.795889609699 L21189.0 3499.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11934.9 2726.1 L11927.9 2734.4 L11924.4 2724.2 L11931.3 2716.0 Z"></path>
-					</g>
-					<path d="M11954.8 2734.6 L11990.75 3314 L5657 3496.2697025807197 L5657.0 3496.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11959.5 2725.0 L11954.8 2734.6 L11948.9 2725.6 L11953.6 2716.0 Z"></path>
-					</g>
-					<path d="M11961.2 2734.5 L12030.75 3314 L13453.5 3493.8629893238435 L13453.5 3493.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11965.3 2724.6 L11961.2 2734.5 L11954.7 2725.9 L11958.9 2716.0 Z"></path>
-					</g>
-					<path d="M11977.9 2734.0 L12137.25 3314 L11968.542225201072 3485 L11968.5 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M11980.6 2723.6 L11977.9 2734.0 L11970.3 2726.4 L11973.0 2716.0 Z"></path>
-					</g>
-					<path d="M5674.6 3443.8 L5687 3439.5 L5694.5 3439.5 L5694.5 3439.5 L5702 3500.5 L5702 3500.5 L5694.5 3561.5 L5694.5 3561.5 L5687 3561.5 L5687 3561.5 L5657 3551.1610169491523 L5657.0 3551.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M5664.1 3441.8 L5674.6 3443.8 L5667.6 3451.8 L5657.0 3449.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3520.2 2653.2 L3307.25 3314 L5363 3488.0539666326185 L5363.0 3488.1 " fill="none"></path>
-					</g>
-					<path d="M3525.2 2654.8 L3520.2 2653.2 L3515.1 2651.6 L3524.3 2640.5 Z"></path>
-					<path d="M28144.8 175.9 L27434.75 293 L27434.75 614 L27434.8 614.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28154.9 179.6 L28144.8 175.9 L28153.2 169.1 L28163.3 172.9 Z"></path>
-					</g>
-					<path d="M28383.8 208.7 L28383.75 293 L28383.75 614 L28383.8 614.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28389.1 199.3 L28383.8 208.7 L28378.4 199.3 L28383.8 190.0 Z"></path>
-					</g>
-					<path d="M61639.5 1761.7 L61391.25 1936 L42151.75 2619.722689292346 L42151.8 2619.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M61650.2 1760.7 L61639.5 1761.7 L61644.1 1752.0 L61654.8 1751.0 Z"></path>
-					</g>
-					<path d="M12496.0 2771.4 L12331.75 3314 L12163.042225201072 3485 L12163.0 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12503.8 2764.0 L12496.0 2771.4 L12493.6 2760.9 L12501.4 2753.5 Z"></path>
-					</g>
-					<path d="M12516.8 2771.9 L12430.5 3314 L21300 3499.8922009327416 L21300.0 3499.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12523.6 2763.6 L12516.8 2771.9 L12513.0 2761.9 L12519.8 2753.5 Z"></path>
-					</g>
-					<path d="M12537.9 2772.2 L12529.25 3314 L12360.542225201072 3485 L12360.5 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12543.4 2762.9 L12537.9 2772.2 L12532.7 2762.7 L12538.2 2753.5 Z"></path>
-					</g>
-					<path d="M12561.3 2772.0 L12639 3314 L13453.5 3489.2067474048445 L13453.5 3489.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12565.3 2762.0 L12561.3 2772.0 L12554.7 2763.5 L12558.7 2753.5 Z"></path>
-					</g>
-					<path d="M12584.5 2771.4 L12748.75 3314 L12580.042225201072 3485 L12580.0 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12586.9 2760.9 L12584.5 2771.4 L12576.7 2764.0 L12579.1 2753.5 Z"></path>
-					</g>
-					<path d="M61550.3 2674.7 L61550.25 3314 L49008.25 3498.615864246251 L49008.3 3498.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M61555.6 2665.3 L61550.3 2674.7 L61544.9 2665.3 L61550.3 2656.0 Z"></path>
-					</g>
-					<path d="M61682.4 1761.6 L61550.25 1936 L61550.25 2594 L61550.3 2594.0 " fill="none"></path>
-					<path d="M61686.7 1764.8 L61682.4 1761.6 L61678.2 1758.4 L61690.5 1751.0 Z"></path>
-					<path d="M13206.8 2749.3 L13094.5 3314 L21189 3499.685639606396 L21189.0 3499.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13213.8 2741.2 L13206.8 2749.3 L13203.4 2739.1 L13210.4 2731.0 Z"></path>
-					</g>
-					<path d="M13231.5 2749.7 L13231.75 3314 L13483.207104557641 3485 L13483.2 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13236.9 2740.3 L13231.5 2749.7 L13226.2 2740.3 L13231.5 2731.0 Z"></path>
-					</g>
-					<path d="M13256.3 2749.3 L13368.75 3314 L18892.25 3496.842163649272 L18892.3 3496.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13259.7 2739.1 L13256.3 2749.3 L13249.2 2741.2 L13252.6 2731.0 Z"></path>
-					</g>
-					<path d="M61911.8 2674.7 L61911.75 3314 L29677.5 3500.0210143189784 L29677.5 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M61917.1 2665.3 L61911.8 2674.7 L61906.4 2665.3 L61911.8 2656.0 Z"></path>
-					</g>
-					<path d="M61779.6 1761.6 L61911.75 1936 L61911.75 2594 L61911.8 2594.0 " fill="none"></path>
-					<path d="M61783.8 1758.4 L61779.6 1761.6 L61775.3 1764.8 L61771.5 1751.0 Z"></path>
-					<path d="M13785.0 2727.4 L13693.5 3314 L25956.25 3499.8407618080246 L25956.3 3499.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13791.7 2719.0 L13785.0 2727.4 L13781.2 2717.4 L13787.9 2709.0 Z"></path>
-					</g>
-					<path d="M13817.0 2727.4 L13908.5 3314 L21189 3499.5950314379443 L21189.0 3499.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13820.8 2717.4 L13817.0 2727.4 L13810.3 2719.0 L13814.1 2709.0 Z"></path>
-					</g>
-					<path d="M28967.3 717.2 L28967.25 966 L28967.25 1197 L28967.3 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28972.6 707.8 L28967.3 717.2 L28961.9 707.8 L28967.3 698.5 Z"></path>
-					</g>
-					<path d="M28967.3 165.3 L28967.25 293 L28967.25 560.5 L28967.3 560.5 " fill="none"></path>
-					<path d="M28972.6 165.3 L28967.3 165.3 L28961.9 165.3 L28967.3 152.0 Z"></path>
-					<path d="M15798.7 3938.7 L15723 4000 L18072.75 4130.016104056984 L18072.8 4130.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15809.4 3937.0 L15798.7 3938.7 L15802.6 3928.7 L15813.3 3927.0 Z"></path>
-					</g>
-					<path d="M15821.5 3940.3 L15763 4000 L6683 4131.879471060048 L6683.0 4131.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15831.9 3937.4 L15821.5 3940.3 L15824.3 3929.9 L15834.6 3927.0 Z"></path>
-					</g>
-					<path d="M15936.8 3945.3 L15947.75 4000 L7010 4131.882560220234 L7010.0 4131.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15940.2 3935.1 L15936.8 3945.3 L15929.8 3937.2 L15933.2 3927.0 Z"></path>
-					</g>
-					<path d="M15962.2 3944.0 L15987.75 4000 L14407.5 4123.309652059979 L14407.5 4123.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15963.2 3933.3 L15962.2 3944.0 L15953.5 3937.7 L15954.5 3927.0 Z"></path>
-					</g>
-					<path d="M16051.7 3937.7 L16141.25 4000 L14627.5 4126.480124707717 L14627.5 4126.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16047.1 3928.0 L16051.7 3937.7 L16041.0 3936.7 L16036.4 3927.0 Z"></path>
-					</g>
-					<path d="M36180.0 165.3 L36180 293 L36180 614 L36180.0 614.0 " fill="none"></path>
-					<path d="M36185.3 165.3 L36180.0 165.3 L36174.7 165.3 L36180.0 152.0 Z"></path>
-					<path d="M14056.0 2712.7 L14056 3314 L10671 3498.080040822277 L10671.0 3498.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14061.3 2703.3 L14056.0 2712.7 L14050.7 2703.3 L14056.0 2694.0 Z"></path>
-					</g>
-					<path d="M36576.5 165.3 L36576.5 293 L36576.5 614 L36576.5 614.0 " fill="none"></path>
-					<path d="M36581.8 165.3 L36576.5 165.3 L36571.2 165.3 L36576.5 152.0 Z"></path>
-					<path d="M9611.0 3450.3 L9623 3447 L9630.5 3447 L9630.5 3447 L9638 3500.5 L9638 3500.5 L9630.5 3554 L9630.5 3554 L9623 3554 L9623 3554 L9593 3545.769230769231 L9593.0 3545.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M9600.6 3447.6 L9611.0 3450.3 L9603.4 3457.9 L9593.0 3455.2 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3521.8 2653.4 L3347.25 3314 L9263 3495.439357809481 L9263.0 3495.4 " fill="none"></path>
-					</g>
-					<path d="M3526.9 2654.8 L3521.8 2653.4 L3516.6 2652.0 L3525.2 2640.5 Z"></path>
-					<path d="M14349.0 2697.7 L14349 3314 L12041.75 3493.610612543045 L12041.8 3493.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14354.3 2688.3 L14349.0 2697.7 L14343.7 2688.3 L14349.0 2679.0 Z"></path>
-					</g>
-					<path d="M30292.9 1213.9 L15172.75 1459 L15172.75 1651 L15172.8 1651.0 " fill="none"></path>
-					<path d="M30293.0 1219.3 L30292.9 1213.9 L30292.8 1208.6 L30306.3 1213.7 Z"></path>
-					<path d="M16329.5 3908.7 L16329.5 4000 L18072.75 4128.685029610247 L18072.8 4128.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16334.8 3899.3 L16329.5 3908.7 L16324.2 3899.3 L16329.5 3890.0 Z"></path>
-					</g>
-					<path d="M14716.6 2742.1 L14568 3314 L13403 3490.2145174371453 L13403.0 3490.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14724.1 2734.4 L14716.6 2742.1 L14713.8 2731.7 L14721.3 2724.0 Z"></path>
-					</g>
-					<path d="M14813.1 2740.2 L15142.5 3314 L21189 3499.411418941138 L21189.0 3499.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14813.1 2729.4 L14813.1 2740.2 L14803.8 2734.7 L14803.8 2724.0 Z"></path>
-					</g>
-					<path d="M14841.5 2738.3 L15321.5 3314 L13558.5 3495.106857614982 L13558.5 3495.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14839.6 2727.8 L14841.5 2738.3 L14831.4 2734.6 L14829.5 2724.0 Z"></path>
-					</g>
-					<path d="M29439.5 3435.4 L29451.5 3432 L29459 3432 L29459 3432 L29466.5 3500.5 L29466.5 3500.5 L29459 3569 L29459 3569 L29451.5 3569 L29451.5 3569 L29421.5 3560.543209876543 L29421.5 3560.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M29429.0 3432.8 L29439.5 3435.4 L29431.9 3443.1 L29421.5 3440.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3523.4 2653.6 L3387.25 3314 L28995.5 3498.9615578254343 L28995.5 3499.0 " fill="none"></path>
-					</g>
-					<path d="M3528.6 2654.6 L3523.4 2653.6 L3518.1 2652.5 L3526.1 2640.5 Z"></path>
-					<path d="M15492.7 2749.2 L15361.5 3314 L15361.5 3500.5 L15361.5 3500.5 L15361.5 3687 L15361.5 3687 L15361.5 3843.5 L15361.5 3843.5 L15361.5 4000 L15361.5 4000 L18072.75 4130.53354890865 L18072.8 4130.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15500.0 2741.3 L15492.7 2749.2 L15489.6 2738.9 L15496.9 2731.0 Z"></path>
-					</g>
-					<path d="M15649.0 2691.8 L16837.25 3314 L21300 3499.2959036010466 L21300.0 3499.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15643.2 2682.7 L15649.0 2691.8 L15638.3 2692.2 L15632.5 2683.1 Z"></path>
-					</g>
-					<path d="M15649.1 2689.9 L16877.25 3314 L10671 3499.1722793264807 L10671.0 3499.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15643.2 2680.9 L15649.1 2689.9 L15638.4 2690.4 L15632.5 2681.4 Z"></path>
-					</g>
-					<path d="M15649.5 2683.9 L17017.25 3314 L25956.25 3499.59682716393 L25956.3 3499.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M15643.2 2675.2 L15649.5 2683.9 L15638.7 2684.9 L15632.5 2676.1 Z"></path>
-					</g>
-					<path d="M21753.4 2711.8 L21633 3314 L24859.25 3495.849829996222 L24859.3 3495.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21760.5 2703.7 L21753.4 2711.8 L21750.0 2701.6 L21757.1 2693.5 Z"></path>
-					</g>
-					<path d="M21779.8 2712.1 L21842.5 3314 L21260 3489.7868122977347 L21260.0 3489.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21784.2 2702.2 L21779.8 2712.1 L21773.5 2703.3 L21777.9 2693.5 Z"></path>
-					</g>
-					<path d="M20517.2 1736.9 L18683.75 1936 L18683.75 2625 L18683.75 2625 L18683.75 3314 L18683.75 3314 L25436.25 3498.5323833247858 L25436.3 3498.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20527.0 1741.2 L20517.2 1736.9 L20525.9 1730.6 L20535.8 1734.9 Z"></path>
-					</g>
-					<path d="M20517.2 1741.5 L18914.25 1936 L18914.25 2609.5 L18914.3 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20527.1 1745.7 L20517.2 1741.5 L20525.8 1735.1 L20535.8 1739.2 Z"></path>
-					</g>
-					<path d="M20517.3 1747.3 L19144.75 1936 L19144.75 2625 L19144.75 2625 L19144.75 3314 L19144.75 3314 L9593 3497.333046028765 L9593.0 3497.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20527.2 1751.3 L20517.3 1747.3 L20525.8 1740.8 L20535.8 1744.8 Z"></path>
-					</g>
-					<path d="M20517.3 1751.0 L19264.75 1936 L19264.75 2609.5 L19264.8 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20527.3 1754.9 L20517.3 1751.0 L20525.7 1744.4 L20535.8 1748.3 Z"></path>
-					</g>
-					<path d="M20875.1 1919.7 L20874.75 1936 L20874.75 2609.5 L20874.8 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20880.6 1910.4 L20875.1 1919.7 L20870.0 1910.2 L20875.5 1901.0 Z"></path>
-					</g>
-					<path d="M21241.8 1794.4 L21770.75 1936 L21770.75 2556.5 L21770.8 2556.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21234.1 1786.8 L21241.8 1794.4 L21231.4 1797.1 L21223.8 1789.6 Z"></path>
-					</g>
-					<path d="M21242.0 1777.9 L21954.25 1936 L21954.25 2625 L21954.25 2625 L21954.25 3314 L21954.25 3314 L19113.25 3493.517702862951 L19113.3 3493.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21234.0 1770.7 L21242.0 1777.9 L21231.7 1781.1 L21223.8 1773.9 Z"></path>
-					</g>
-					<path d="M21242.3 1743.4 L22763.25 1936 L22763.25 2625 L22763.25 2625 L22763.25 3314 L22763.25 3314 L21260 3496.19731925264 L21260.0 3496.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21233.7 1736.9 L21242.3 1743.4 L21232.3 1747.5 L21223.8 1741.1 Z"></path>
-					</g>
-					<path d="M21242.3 1742.5 L22803.25 1936 L22803.25 2625 L22803.25 2625 L22803.25 3314 L22803.25 3314 L10492 3497.864036756021 L10492.0 3497.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21233.7 1736.0 L21242.3 1742.5 L21232.4 1746.6 L21223.8 1740.2 Z"></path>
-					</g>
-					<path d="M10510.1 3450.1 L10522 3447 L10529.5 3447 L10529.5 3447 L10537 3500.5 L10537 3500.5 L10529.5 3554 L10529.5 3554 L10522 3554 L10522 3554 L10492 3546.227602905569 L10492.0 3546.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10499.7 3447.3 L10510.1 3450.1 L10502.4 3457.6 L10492.0 3454.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3525.0 2653.7 L3427.25 3314 L10139 3495.721246325264 L10139.0 3495.7 " fill="none"></path>
-					</g>
-					<path d="M3530.3 2654.5 L3525.0 2653.7 L3519.7 2652.9 L3527.0 2640.5 Z"></path>
-					<path d="M21455.3 2720.2 L21455.25 3314 L25956.25 3498.7148201122236 L25956.3 3498.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M21460.6 2710.8 L21455.3 2720.2 L21449.9 2710.8 L21455.3 2701.5 Z"></path>
-					</g>
-					<path d="M112.0 1726.3 L112 1936 L21323.25 2620.7387932953043 L21323.3 2620.7 " fill="none"></path>
-					<path d="M117.3 1726.3 L112.0 1726.3 L106.7 1726.3 L112.0 1713.0 Z"></path>
-					<path d="M36810.0 165.3 L36810 293 L36810 614 L36810.0 614.0 " fill="none"></path>
-					<path d="M36815.3 165.3 L36810.0 165.3 L36804.7 165.3 L36810.0 152.0 Z"></path>
-					<path d="M22984.9 1801.8 L22843.25 1936 L21587.25 2559.4755043227665 L21587.3 2559.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22995.3 1799.3 L22984.9 1801.8 L22988.0 1791.5 L22998.4 1789.0 Z"></path>
-					</g>
-					<path d="M23052.9 1806.4 L23002.75 1936 L23506.408744557328 2609.5 L23506.4 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23061.2 1799.6 L23052.9 1806.4 L23051.3 1795.8 L23059.6 1789.0 Z"></path>
-					</g>
-					<path d="M23166.6 1804.5 L23254.5 1936 L23254.5 2609.5 L23254.5 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23165.8 1793.8 L23166.6 1804.5 L23156.9 1799.7 L23156.2 1789.0 Z"></path>
-					</g>
-					<path d="M23382.4 1804.5 L23294.5 1936 L21587.25 2575.551583525894 L21587.3 2575.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23392.1 1799.7 L23382.4 1804.5 L23383.2 1793.8 L23392.8 1789.0 Z"></path>
-					</g>
-					<path d="M23483.4 1807.0 L23518 1936 L23518 2609.5 L23518.0 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23486.1 1796.6 L23483.4 1807.0 L23475.8 1799.4 L23478.6 1789.0 Z"></path>
-					</g>
-					<path d="M23525.6 1804.5 L23613.5 1936 L23262.57619738752 2609.5 L23262.6 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23524.8 1793.8 L23525.6 1804.5 L23515.9 1799.7 L23515.2 1789.0 Z"></path>
-					</g>
-					<path d="M23813.0 1777.7 L23813 1936 L23524.636429608126 2609.5 L23524.6 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M23818.3 1768.3 L23813.0 1777.7 L23807.7 1768.3 L23813.0 1759.0 Z"></path>
-					</g>
-					<path d="M19488.7 2712.2 L19347 3314 L25956.25 3499.2805418811768 L25956.3 3499.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19496.1 2704.3 L19488.7 2712.2 L19485.7 2701.9 L19493.0 2694.0 Z"></path>
-					</g>
-					<path d="M19524.7 2712.4 L19631 3314 L19631 3500.5 L19631 3500.5 L19631 3687 L19631 3687 L19631 3843.5 L19631 3843.5 L19631 4000 L19631 4000 L18216.75 4127.508494533221 L18216.8 4127.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19528.3 2702.3 L19524.7 2712.4 L19517.8 2704.1 L19521.4 2694.0 Z"></path>
-					</g>
-					<path d="M19827.1 2801.9 L19736 3314 L19736 3485 L19736.0 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19833.9 2793.6 L19827.1 2801.9 L19823.4 2791.8 L19830.3 2783.5 Z"></path>
-					</g>
-					<path d="M19863.9 2802.2 L19879.5 3314 L13558.5 3498.963756177924 L13558.5 3499.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19868.9 2792.7 L19863.9 2802.2 L19858.3 2793.0 L19863.3 2783.5 Z"></path>
-					</g>
-					<path d="M19874.2 2802.1 L19919.5 3314 L21189 3495.4266283524903 L21189.0 3495.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19878.7 2792.3 L19874.2 2802.1 L19868.0 2793.3 L19872.5 2783.5 Z"></path>
-					</g>
-					<path d="M19884.4 2802.0 L19959.5 3314 L13403 3498.585591365386 L13403.0 3498.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19888.4 2792.0 L19884.4 2802.0 L19877.8 2793.5 L19881.7 2783.5 Z"></path>
-					</g>
-					<path d="M19905.5 2801.5 L20042 3314 L21300 3496.297591297591 L21300.0 3496.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19908.3 2791.1 L19905.5 2801.5 L19898.0 2793.9 L19900.7 2783.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M37594.4 173.6 L37360.25 293 L37360.25 598.5 L37360.3 598.5 " fill="none"></path>
-					</g>
-					<path d="M37596.8 178.3 L37594.4 173.6 L37591.9 168.8 L37606.2 167.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M37711.0 176.5 L37839.25 293 L37839.25 598.5 L37839.3 598.5 " fill="none"></path>
-					</g>
-					<path d="M37714.6 172.5 L37711.0 176.5 L37707.4 180.4 L37701.1 167.5 Z"></path>
-					<path d="M20362.0 2688.0 L20082 3314 L10049 3497.1592110415036 L10049.0 3497.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20370.7 2681.7 L20362.0 2688.0 L20361.0 2677.3 L20369.7 2671.0 Z"></path>
-					</g>
-					<path d="M20402.5 2689.3 L20521 3314 L21300 3493.8063118811883 L21300.0 3493.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20406.0 2679.2 L20402.5 2689.3 L20395.5 2681.2 L20399.0 2671.0 Z"></path>
-					</g>
-					<path d="M20429.6 2686.7 L20829.25 3314 L24756.25 3499.0159151193634 L24756.3 3499.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M20429.1 2676.0 L20429.6 2686.7 L20420.1 2681.7 L20419.6 2671.0 Z"></path>
-					</g>
-					<path d="M10067.1 3450.0 L10079 3447 L10086.5 3447 L10086.5 3447 L10094 3500.5 L10094 3500.5 L10086.5 3554 L10086.5 3554 L10079 3554 L10079 3554 L10049 3546.4647887323945 L10049.0 3546.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M10056.8 3447.1 L10067.1 3450.0 L10059.4 3457.4 L10049.0 3454.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3526.7 2653.8 L3467.25 3314 L9683 3495.16622387185 L9683.0 3495.2 " fill="none"></path>
-					</g>
-					<path d="M3532.0 2654.3 L3526.7 2653.8 L3521.3 2653.3 L3527.9 2640.5 Z"></path>
-					<path d="M24545.4 1791.2 L24075.75 1936 L41854.75 2619.292762515688 L41854.8 2619.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24555.9 1793.5 L24545.4 1791.2 L24552.8 1783.3 L24563.3 1785.7 Z"></path>
-					</g>
-					<path d="M24545.5 1796.3 L24115.75 1936 L24115.75 2609.5 L24115.8 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24556.0 1798.5 L24545.5 1796.3 L24552.7 1788.3 L24563.3 1790.5 Z"></path>
-					</g>
-					<path d="M24832.8 1934.6 L24832.75 1936 L24832.75 2609.5 L24832.8 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24838.8 1925.7 L24832.8 1934.6 L24828.2 1924.9 L24834.1 1916.0 Z"></path>
-					</g>
-					<path d="M25151.1 1884.7 L25233.75 1936 L25233.75 2609.5 L25233.8 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25146.0 1875.3 L25151.1 1884.7 L25140.4 1884.4 L25135.3 1874.9 Z"></path>
-					</g>
-					<path d="M25153.1 1791.2 L25622.75 1936 L25622.75 2609.5 L25622.8 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25145.7 1783.3 L25153.1 1791.2 L25142.6 1793.5 L25135.3 1785.7 Z"></path>
-					</g>
-					<path d="M41989.8 2750.1 L41929 3314 L41929 3485 L41929.0 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41996.1 2741.4 L41989.8 2750.1 L41985.5 2740.2 L41991.8 2731.5 Z"></path>
-					</g>
-					<path d="M42016.7 2750.1 L42077.5 3314 L14418 3499.2509067729657 L14418.0 3499.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42021.0 2740.2 L42016.7 2750.1 L42010.4 2741.4 L42014.7 2731.5 Z"></path>
-					</g>
-					<path d="M116.8 1726.1 L152 1936 L41854.75 2622.555234311998 L41854.8 2622.6 " fill="none"></path>
-					<path d="M122.1 1725.3 L116.8 1726.1 L111.5 1727.0 L114.6 1713.0 Z"></path>
-					<path d="M14436.1 3449.9 L14448 3447 L14455.5 3447 L14455.5 3447 L14463 3500.5 L14463 3500.5 L14455.5 3554 L14455.5 3554 L14448 3554 L14448 3554 L14418 3546.5866050808313 L14418.0 3546.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14425.8 3447.0 L14436.1 3449.9 L14428.3 3457.4 L14418.0 3454.4 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3528.3 2653.8 L3507.25 3314 L14045 3497.256672960813 L14045.0 3497.3 " fill="none"></path>
-					</g>
-					<path d="M3533.7 2654.0 L3528.3 2653.8 L3523.0 2653.7 L3528.8 2640.5 Z"></path>
-					<path d="M38216.5 193.7 L38216.5 293 L38216.5 614 L38216.5 614.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38221.8 184.3 L38216.5 193.7 L38211.2 184.3 L38216.5 175.0 Z"></path>
-					</g>
-					<path d="M22157.3 2712.7 L22157.25 3314 L63549.25 3500.2929678073265 L63549.3 3500.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M22162.6 2703.3 L22157.3 2712.7 L22151.9 2703.3 L22157.3 2694.0 Z"></path>
-					</g>
-					<path d="M61087.1 1714.0 L59668.25 1936 L59668.25 2594 L59668.3 2594.0 " fill="none"></path>
-					<path d="M61087.9 1719.2 L61087.1 1714.0 L61086.3 1708.7 L61100.3 1711.9 Z"></path>
-					<path d="M59667.0 2669.3 L59648.25 3314 L60377.86528150134 3485 L60377.9 3485.0 " fill="none"></path>
-					<path d="M59672.3 2669.5 L59667.0 2669.3 L59661.6 2669.2 L59667.4 2656.0 Z"></path>
-					<path d="M61087.1 1717.4 L59932.75 1936 L59932.75 2594 L59932.8 2594.0 " fill="none"></path>
-					<path d="M61088.1 1722.6 L61087.1 1717.4 L61086.2 1712.2 L61100.3 1714.9 Z"></path>
-					<path d="M61097.9 1733.2 L60562.5 1936 L45650 2619.34081537643 L45650.0 2619.3 " fill="none"></path>
-					<path d="M61099.8 1738.2 L61097.9 1733.2 L61096.0 1728.2 L61110.4 1728.5 Z"></path>
-					<path d="M45526.5 2669.3 L45526.5 3314 L50399 3495.562687312687 L50399.0 3495.6 " fill="none"></path>
-					<path d="M45531.8 2669.3 L45526.5 2669.3 L45521.2 2669.3 L45526.5 2656.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M59684.3 2668.5 L59923 3314 L50664 3497.868764308151 L50664.0 3497.9 " fill="none"></path>
-					</g>
-					<path d="M59689.3 2666.7 L59684.3 2668.5 L59679.3 2670.4 L59679.7 2656.0 Z"></path>
-					<path d="M61103.2 1733.5 L60602.5 1936 L44863.5 2619.937498029075 L44863.5 2619.9 " fill="none"></path>
-					<path d="M61105.2 1738.4 L61103.2 1733.5 L61101.2 1728.6 L61115.6 1728.5 Z"></path>
-					<path d="M44747.0 2669.3 L44747 3314 L44747 3469.5 L44747.0 3469.5 " fill="none"></path>
-					<path d="M44752.3 2669.3 L44747.0 2669.3 L44741.7 2669.3 L44747.0 2656.0 Z"></path>
-					<path d="M61199.7 1741.6 L61232.25 1936 L61232.25 2594 L61232.3 2594.0 " fill="none"></path>
-					<path d="M61204.9 1740.8 L61199.7 1741.6 L61194.4 1742.5 L61197.4 1728.5 Z"></path>
-					<path d="M38721.0 679.2 L38721 966 L38721 1197 L38721.0 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38726.3 669.8 L38721.0 679.2 L38715.7 669.8 L38721.0 660.5 Z"></path>
-					</g>
-					<path d="M38721.0 165.3 L38721 293 L38721 598.5 L38721.0 598.5 " fill="none"></path>
-					<path d="M38726.3 165.3 L38721.0 165.3 L38715.7 165.3 L38721.0 152.0 Z"></path>
-					<path d="M39263.1 161.6 L39136.75 293 L39136.75 598.5 L39136.8 598.5 " fill="none"></path>
-					<path d="M39266.9 165.3 L39263.1 161.6 L39259.3 157.9 L39272.3 152.0 Z"></path>
-					<path d="M39316.5 160.5 L39478.25 293 L39478.25 598.5 L39478.3 598.5 " fill="none"></path>
-					<path d="M39319.9 156.3 L39316.5 160.5 L39313.1 164.6 L39306.2 152.0 Z"></path>
-					<path d="M39300.3 1747.2 L39300.25 1936 L39300.25 2586.5 L39300.3 2586.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39305.6 1737.8 L39300.3 1747.2 L39294.9 1737.8 L39300.3 1728.5 Z"></path>
-					</g>
-					<path d="M39300.3 1241.3 L39300.25 1459 L39300.25 1666.5 L39300.3 1666.5 " fill="none"></path>
-					<path d="M39305.6 1241.3 L39300.3 1241.3 L39294.9 1241.3 L39300.3 1228.0 Z"></path>
-					<path d="M39804.3 777.0 L39450.75 966 L39450.75 1197 L39450.8 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39815.0 777.3 L39804.3 777.0 L39810.0 767.9 L39820.8 768.2 Z"></path>
-					</g>
-					<path d="M39805.6 826.2 L39610.25 966 L39610.25 1197 L39610.3 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39816.3 825.1 L39805.6 826.2 L39810.1 816.4 L39820.8 815.3 Z"></path>
-					</g>
-					<path d="M40354.9 828.8 L40544 966 L40544 1197 L40544.0 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40350.4 819.0 L40354.9 828.8 L40344.2 827.6 L40339.8 817.8 Z"></path>
-					</g>
-					<path d="M40357.3 729.4 L41013.5 966 L41013.5 1197 L41013.5 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40350.3 721.2 L40357.3 729.4 L40346.7 731.3 L40339.8 723.1 Z"></path>
-					</g>
-					<path d="M40080.3 165.3 L40080.25 293 L40080.25 358 L40080.3 358.0 " fill="none"></path>
-					<path d="M40085.6 165.3 L40080.3 165.3 L40074.9 165.3 L40080.3 152.0 Z"></path>
-					<path d="M39270.4 2679.9 L38925.75 3314 L21358 3500.192642107207 L21358.0 3500.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39279.6 2674.2 L39270.4 2679.9 L39270.2 2669.2 L39279.3 2663.5 Z"></path>
-					</g>
-					<path d="M39395.3 2671.7 L40701 3314 L40701 3485 L40701.0 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M39389.3 2662.8 L39395.3 2671.7 L39384.5 2672.4 L39378.5 2663.5 Z"></path>
-					</g>
-					<path d="M24346.3 2705.2 L24346.25 3314 L21358 3498.707473692932 L21358.0 3498.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24351.6 2695.8 L24346.3 2705.2 L24340.9 2695.8 L24346.3 2686.5 Z"></path>
-					</g>
-					<path d="M16591.2 3926.0 L16520 4000 L63516.75 4133.793601980061 L63516.8 4133.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16601.5 3922.9 L16591.2 3926.0 L16593.8 3915.5 L16604.1 3912.5 Z"></path>
-					</g>
-					<path d="M16770.0 3924.3 L16863.25 4000 L15053 4128.703276296591 L15053.0 4128.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M16766.1 3914.2 L16770.0 3924.3 L16759.4 3922.5 L16755.5 3912.5 Z"></path>
-					</g>
-					<path d="M40526.3 165.3 L40526.25 293 L40526.25 583.5 L40526.3 583.5 " fill="none"></path>
-					<path d="M40531.6 165.3 L40526.3 165.3 L40520.9 165.3 L40526.3 152.0 Z"></path>
-					<path d="M40861.3 165.3 L40861.25 293 L40861.25 583.5 L40861.3 583.5 " fill="none"></path>
-					<path d="M40866.6 165.3 L40861.3 165.3 L40855.9 165.3 L40861.3 152.0 Z"></path>
-					<path d="M24544.3 2712.2 L24544.25 3314 L25956.25 3494.9261422191685 L25956.3 3494.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M24549.6 2702.8 L24544.3 2712.2 L24538.9 2702.8 L24544.3 2693.5 Z"></path>
-					</g>
-					<path d="M83446.3 171.4 L83054.25 293 L83054.25 629.5 L83054.25 629.5 L83054.25 966 L83054.25 966 L83054.25 1174 L83054.3 1174.0 " fill="none"></path>
-					<path d="M83447.9 176.5 L83446.3 171.4 L83444.7 166.4 L83459.0 167.5 Z"></path>
-					<path d="M1291.2 3422.4 L1304 3417 L1311.5 3417 L1311.5 3417 L1319 3500.5 L1319 3500.5 L1311.5 3584 L1311.5 3584 L1304 3584 L1304 3584 L1274 3571.284263959391 L1274.0 3571.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1280.5 3421.2 L1291.2 3422.4 L1284.7 3431.0 L1274.0 3429.7 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3530.0 2653.8 L3547.25 3314 L1274 3487.7367585288393 L1274.0 3487.7 " fill="none"></path>
-					</g>
-					<path d="M3535.3 2653.7 L3530.0 2653.8 L3524.7 2654.0 L3529.7 2640.5 Z"></path>
-					<path d="M17097.1 3941.9 L16974 4000 L15227 4129.050716648291 L15227.0 4129.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17107.8 3942.7 L17097.1 3941.9 L17103.3 3933.1 L17114.0 3933.9 Z"></path>
-					</g>
-					<path d="M17097.6 3955.1 L17014 4000 L7462.25 4132.838743156638 L7462.3 4132.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17108.3 3955.4 L17097.6 3955.1 L17103.3 3946.0 L17114.0 3946.3 Z"></path>
-					</g>
-					<path d="M17515.0 3901.4 L17871.75 4000 L18113.171641791047 4118.5 L18113.2 4118.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17507.4 3893.8 L17515.0 3901.4 L17504.6 3904.1 L17497.0 3896.4 Z"></path>
-					</g>
-					<path d="M17515.1 3897.6 L17911.75 4000 L15571 4125.829104402768 L15571.0 4125.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17507.4 3890.1 L17515.1 3897.6 L17504.7 3900.4 L17497.0 3892.9 Z"></path>
-					</g>
-					<path d="M41195.5 193.7 L41130.75 293 L41130.75 598.5 L41130.8 598.5 " fill="none"></path>
-					<path d="M41200.0 196.6 L41195.5 193.7 L41191.0 190.8 L41202.8 182.5 Z"></path>
-					<path d="M41270.0 193.7 L41334.75 293 L41334.75 598.5 L41334.8 598.5 " fill="none"></path>
-					<path d="M41274.5 190.8 L41270.0 193.7 L41265.5 196.6 L41262.7 182.5 Z"></path>
-					<path d="M18125.0 3911.2 L18042.75 4000 L15671 4132.326220464245 L15671.0 4132.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18135.3 3908.0 L18125.0 3911.2 L18127.5 3900.7 L18137.7 3897.5 Z"></path>
-					</g>
-					<path d="M59481.3 4214.2 L59481.25 4268 L65807.25 4451.84090377873 L65807.3 4451.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M59486.6 4204.8 L59481.3 4214.2 L59475.9 4204.8 L59481.3 4195.5 Z"></path>
-					</g>
-					<path d="M18177.9 3910.7 L18164.75 4000 L59213.25 4133.1308073045875 L59213.3 4133.1 " fill="none"></path>
-					<path d="M18183.2 3911.5 L18177.9 3910.7 L18172.6 3909.9 L18179.8 3897.5 Z"></path>
-					<path d="M18238.0 3908.0 L18309.75 4000 L40742 4133.595026721925 L40742.0 4133.6 " fill="none"></path>
-					<path d="M18242.2 3904.7 L18238.0 3908.0 L18233.8 3911.3 L18229.8 3897.5 Z"></path>
-					<path d="M21329.0 3529.3 L21329 3687 L21329 3805 L21329.0 3805.0 " fill="none"></path>
-					<path d="M21334.3 3529.3 L21329.0 3529.3 L21323.7 3529.3 L21329.0 3516.0 Z"></path>
-					<path d="M41675.3 165.3 L41675.25 293 L41675.25 583 L41675.3 583.0 " fill="none"></path>
-					<path d="M41680.6 165.3 L41675.3 165.3 L41669.9 165.3 L41675.3 152.0 Z"></path>
-					<path d="M42124.3 724.7 L42124.25 966 L42124.25 1197 L42124.3 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42129.6 715.3 L42124.3 724.7 L42118.9 715.3 L42124.3 706.0 Z"></path>
-					</g>
-					<path d="M42124.3 165.3 L42124.25 293 L42124.25 553 L42124.3 553.0 " fill="none"></path>
-					<path d="M42129.6 165.3 L42124.3 165.3 L42118.9 165.3 L42124.3 152.0 Z"></path>
-					<path d="M43073.0 160.8 L42924 293 L42924 575.5 L42924.0 575.5 " fill="none"></path>
-					<path d="M43076.6 164.8 L43073.0 160.8 L43069.5 156.9 L43083.0 152.0 Z"></path>
-					<path d="M43128.0 160.8 L43277 293 L43277 598.5 L43277.0 598.5 " fill="none"></path>
-					<path d="M43131.5 156.9 L43128.0 160.8 L43124.4 164.8 L43118.0 152.0 Z"></path>
-					<path d="M121.4 1725.6 L192 1936 L192 2541 L192.0 2541.0 " fill="none"></path>
-					<path d="M126.5 1723.9 L121.4 1725.6 L116.4 1727.3 L117.2 1713.0 Z"></path>
-					<path d="M34012.9 1704.0 L30593.25 1936 L30593.25 2571.5 L30593.3 2571.5 " fill="none"></path>
-					<path d="M34013.3 1709.3 L34012.9 1704.0 L34012.6 1698.6 L34026.3 1703.1 Z"></path>
-					<path d="M43609.5 231.7 L43609.5 293 L43609.5 614 L43609.5 614.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43614.8 222.3 L43609.5 231.7 L43604.2 222.3 L43609.5 213.0 Z"></path>
-					</g>
-					<path d="M27272.3 1792.7 L27272.25 1936 L22723.25 2598.5644223655004 L22723.3 2598.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M27277.6 1783.3 L27272.3 1792.7 L27266.9 1783.3 L27272.3 1774.0 Z"></path>
-					</g>
-					<path d="M12917.5 2690.2 L12917.5 3314 L16987 3492.705380268425 L16987.0 3492.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M12922.8 2680.8 L12917.5 2690.2 L12912.2 2680.8 L12917.5 2671.5 Z"></path>
-					</g>
-					<path d="M15280.5 1709.3 L12917.5 1936 L12917.5 2578.5 L12917.5 2578.5 " fill="none"></path>
-					<path d="M15281.0 1714.6 L15280.5 1709.3 L15280.0 1704.0 L15293.8 1708.0 Z"></path>
-					<path d="M13546.0 2690.2 L13546 3314 L16987 3491.3515268757774 L16987.0 3491.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M13551.3 2680.8 L13546.0 2690.2 L13540.7 2680.8 L13546.0 2671.5 Z"></path>
-					</g>
-					<path d="M15280.5 1713.3 L13546 1936 L13546 2578.5 L13546.0 2578.5 " fill="none"></path>
-					<path d="M15281.2 1718.5 L15280.5 1713.3 L15279.8 1708.0 L15293.8 1711.6 Z"></path>
-					<path d="M17164.5 2690.2 L17164.5 3314 L17164.5 3417 L17164.5 3417.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17169.8 2680.8 L17164.5 2690.2 L17159.2 2680.8 L17164.5 2671.5 Z"></path>
-					</g>
-					<path d="M15526.0 1714.1 L17164.5 1936 L17164.5 2578.5 L17164.5 2578.5 " fill="none"></path>
-					<path d="M15526.7 1708.8 L15526.0 1714.1 L15525.2 1719.4 L15512.8 1712.3 Z"></path>
-					<path d="M18292.8 2705.2 L18292.75 3314 L17342 3471.1592067360957 L17342.0 3471.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18298.1 2695.8 L18292.8 2705.2 L18287.4 2695.8 L18292.8 2686.5 Z"></path>
-					</g>
-					<path d="M15526.0 1707.6 L18292.75 1936 L18292.75 2563.5 L18292.8 2563.5 " fill="none"></path>
-					<path d="M15526.5 1702.3 L15526.0 1707.6 L15525.6 1713.0 L15512.8 1706.5 Z"></path>
-					<path d="M30766.5 2694.5 L29551.5 3314 L21260 3499.7049057283534 L21260.0 3499.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M30777.2 2695.0 L30766.5 2694.5 L30772.4 2685.5 L30783.1 2686.0 Z"></path>
-					</g>
-					<path d="M30779.7 2695.3 L29696.5 3314 L17342 3497.8584623364186 L17342.0 3497.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M30790.5 2695.3 L30779.7 2695.3 L30785.2 2686.0 L30796.0 2686.0 Z"></path>
-					</g>
-					<path d="M30919.4 2704.3 L31047.75 3314 L13558.5 3499.9418316302535 L13558.5 3499.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M30922.7 2694.0 L30919.4 2704.3 L30912.3 2696.2 L30915.6 2686.0 Z"></path>
-					</g>
-					<path d="M31232.8 2697.2 L31232.75 3314 L59651 3500.129944073258 L59651.0 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31238.1 2687.8 L31232.8 2697.2 L31227.4 2687.8 L31232.8 2678.5 Z"></path>
-					</g>
-					<path d="M31649.8 2703.9 L31472.75 3314 L32308.953753351205 3485 L32309.0 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31657.6 2696.5 L31649.8 2703.9 L31647.3 2693.5 L31655.0 2686.0 Z"></path>
-					</g>
-					<path d="M31719.6 2701.9 L32092 3314 L59651 3500.1184298672847 L59651.0 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M31719.3 2691.2 L31719.6 2701.9 L31710.2 2696.7 L31709.9 2686.0 Z"></path>
-					</g>
-					<path d="M43352.9 2882.7 L42614.5 3314 L42614.5 3500.5 L42614.5 3500.5 L42614.5 3687 L42614.5 3687 L42614.5 3843.5 L42614.5 3843.5 L42614.5 4000 L42614.5 4000 L72021.75 4133.331241171047 L72021.8 4133.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43363.6 2882.6 L43352.9 2882.7 L43358.3 2873.4 L43369.0 2873.3 Z"></path>
-					</g>
-					<path d="M43353.8 2891.2 L42654.5 3314 L61624 3498.5782725517815 L61624.0 3498.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43364.6 2890.9 L43353.8 2891.2 L43359.0 2881.8 L43369.8 2881.5 Z"></path>
-					</g>
-					<path d="M43368.9 2891.4 L42694.5 3314 L63549.25 3500.0895362606607 L63549.3 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43379.6 2891.0 L43368.9 2891.4 L43373.9 2881.9 L43384.7 2881.5 Z"></path>
-					</g>
-					<path d="M43499.3 2894.1 L43039.5 3314 L59651 3499.867815574754 L59651.0 3499.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43509.8 2891.7 L43499.3 2894.1 L43502.6 2883.9 L43513.1 2881.5 Z"></path>
-					</g>
-					<path d="M43514.6 2894.5 L43079.5 3314 L62924.25 3500.007909384463 L62924.3 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43525.0 2891.8 L43514.6 2894.5 L43517.6 2884.1 L43528.0 2881.5 Z"></path>
-					</g>
-					<path d="M43878.6 2899.3 L44006.5 3314 L17342 3499.2667182028163 L17342.0 3499.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M43881.0 2888.8 L43878.6 2899.3 L43870.8 2892.0 L43873.1 2881.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M45857.0 144.2 L43794 293 L43794 629.5 L43794 629.5 L43794 966 L43794 966 L43794 1212.5 L43794 1212.5 L43794 1459 L43794 1459 L43794 1697.5 L43794 1697.5 L43794 1936 L43794 1936 L43794 2368.5 L43794.0 2368.5 " fill="none"></path>
-					</g>
-					<path d="M45857.3 149.5 L45857.0 144.2 L45856.6 138.9 L45870.3 143.2 Z"></path>
-					<path d="M17359.8 3440.6 L17436.66666666667 3417 L17460.33333333333 3417 L17460.33333333333 3417 L17484 3500.5 L17484 3500.5 L17460.33333333333 3584 L17460.33333333333 3584 L17436.66666666667 3584 L17436.66666666667 3584 L17342 3554.9565217391296 L17342.0 3555.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M17349.4 3438.2 L17359.8 3440.6 L17352.5 3448.4 L17342.0 3446.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3538.1 2653.2 L3745.5 3314 L16987 3498.0330687830688 L16987.0 3498.0 " fill="none"></path>
-					</g>
-					<path d="M3543.2 2651.6 L3538.1 2653.2 L3533.0 2654.8 L3534.1 2640.5 Z"></path>
-					<path d="M1660.8 3450.9 L1673 3447 L1680.5 3447 L1680.5 3447 L1688 3500.5 L1688 3500.5 L1680.5 3554 L1680.5 3554 L1673 3554 L1673 3554 L1643 3544.5309734513276 L1643.0 3544.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1650.3 3448.6 L1660.8 3450.9 L1653.5 3458.7 L1643.0 3456.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3539.7 2653.0 L3785.5 3314 L1643 3489.0991454864156 L1643.0 3489.1 " fill="none"></path>
-					</g>
-					<path d="M3544.7 2651.1 L3539.7 2653.0 L3534.7 2654.9 L3535.0 2640.5 Z"></path>
-					<path d="M32422.0 2837.4 L32132 3314 L24338.25 3498.8633588757116 L24338.3 3498.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32431.4 2832.2 L32422.0 2837.4 L32422.3 2826.7 L32431.7 2821.5 Z"></path>
-					</g>
-					<path d="M32619.7 2839.3 L32771.5 3314 L25580.25 3498.651240835714 L25580.3 3498.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32622.0 2828.8 L32619.7 2839.3 L32611.8 2832.0 L32614.1 2821.5 Z"></path>
-					</g>
-					<path d="M32662.8 2838.0 L32912 3314 L32912 3485 L32912.0 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32663.2 2827.3 L32662.8 2838.0 L32653.7 2832.2 L32654.1 2821.5 Z"></path>
-					</g>
-					<path d="M32730.5 2835.7 L33137.5 3314 L33137.5 3500.5 L33137.5 3500.5 L33137.5 3687 L33137.5 3687 L33137.5 3843.5 L33137.5 3843.5 L33137.5 4000 L33137.5 4000 L18216.75 4133.356488969669 L18216.8 4133.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32728.6 2825.2 L32730.5 2835.7 L32720.4 2832.1 L32718.4 2821.5 Z"></path>
-					</g>
-					<path d="M32765.6 2834.5 L33256 3314 L33256 3485 L33256.0 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32762.6 2824.2 L32765.6 2834.5 L32755.2 2831.8 L32752.2 2821.5 Z"></path>
-					</g>
-					<path d="M32806.1 2833.3 L33394 3314 L26043.25 3499.4028299016127 L26043.3 3499.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32802.2 2823.3 L32806.1 2833.3 L32795.4 2831.5 L32791.6 2821.5 Z"></path>
-					</g>
-					<path d="M32811.5 2807.8 L33532 3314 L33532 3485 L33532.0 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32807.0 2798.1 L32811.5 2807.8 L32800.8 2806.8 L32796.3 2797.1 Z"></path>
-					</g>
-					<path d="M32813.6 2729.2 L34285.75 3314 L21260 3499.9930998181644 L21260.0 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32806.9 2720.8 L32813.6 2729.2 L32803.0 2730.7 L32796.3 2722.3 Z"></path>
-					</g>
-					<path d="M32813.7 2725.2 L34355 3314 L13558.5 3500.030373159384 L13558.5 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M32806.9 2716.9 L32813.7 2725.2 L32803.1 2726.9 L32796.3 2718.6 Z"></path>
-					</g>
-					<path d="M68237.4 641.7 L56327.75 966 L56327.75 1212.5 L56327.75 1212.5 L56327.75 1459 L56327.75 1459 L56327.75 1666.5 L56327.8 1666.5 " fill="none"></path>
-					<path d="M68237.6 647.1 L68237.4 641.7 L68237.3 636.4 L68250.8 641.4 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M74699.9 140.6 L72472.5 293 L72472.5 614 L72472.5 614.0 " fill="none"></path>
-					</g>
-					<path d="M74700.3 145.9 L74699.9 140.6 L74699.6 135.3 L74713.3 139.7 Z"></path>
-					<path d="M65379.3 3998.7 L65379.25 4000 L63107.25 4131.171046962516 L63107.3 4131.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65384.6 3989.3 L65379.3 3998.7 L65373.9 3989.3 L65379.3 3980.0 Z"></path>
-					</g>
-					<path d="M59482.4 3858.4 L57348.5 4000 L59213.25 4117.161645762513 L59213.3 4117.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M59492.0 3863.1 L59482.4 3858.4 L59491.3 3852.5 L59501.0 3857.2 Z"></path>
-					</g>
-					<path d="M59707.5 3946.2 L59707.5 4000 L59852.308768656716 4118.5 L59852.3 4118.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M59712.8 3936.8 L59707.5 3946.2 L59702.2 3936.8 L59707.5 3927.5 Z"></path>
-					</g>
-					<path d="M59840.9 3938.3 L59927.75 4000 L61217.75 4122.1193924408335 L61217.8 4122.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M59836.4 3928.6 L59840.9 3938.3 L59830.2 3937.3 L59825.7 3927.5 Z"></path>
-					</g>
-					<path d="M59707.5 3529.3 L59707.5 3687 L59707.5 3759.5 L59707.5 3759.5 " fill="none"></path>
-					<path d="M59712.8 3529.3 L59707.5 3529.3 L59702.2 3529.3 L59707.5 3516.0 Z"></path>
-					<path d="M34638.8 2712.7 L34638.75 3314 L24338.25 3499.259004773615 L24338.3 3499.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M34644.1 2703.3 L34638.8 2712.7 L34633.4 2703.3 L34638.8 2694.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M74706.3 156.7 L74341.25 293 L74341.25 614 L74341.3 614.0 " fill="none"></path>
-					</g>
-					<path d="M74708.1 161.7 L74706.3 156.7 L74704.4 151.7 L74718.8 152.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M74730.7 160.4 L74566.75 293 L74566.75 598.5 L74566.8 598.5 " fill="none"></path>
-					</g>
-					<path d="M74734.1 164.5 L74730.7 160.4 L74727.4 156.2 L74741.1 152.0 Z"></path>
-					<path d="M45851.7 146.8 L44259 293 L44259 629.5 L44259 629.5 L44259 966 L44259 966 L44259 1212.5 L44259 1212.5 L44259 1459 L44259 1459 L44259 1697.5 L44259 1697.5 L44259 1936 L44259 1936 L44259 2625 L44259 2625 L44259 3314 L44259 3314 L62924.25 3499.9769002684616 L62924.3 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45861.4 151.2 L45851.7 146.8 L45860.5 140.6 L45870.3 145.1 Z"></path>
-					</g>
-					<path d="M173.3 1698.7 L12232 1936 L12232 2571.5 L12232.0 2571.5 " fill="none"></path>
-					<path d="M173.4 1693.4 L173.3 1698.7 L173.2 1704.0 L160.0 1698.4 Z"></path>
-					<path d="M68232.1 644.6 L58538.75 966 L58538.75 1212.5 L58538.75 1212.5 L58538.75 1459 L58538.75 1459 L58538.75 1697.5 L58538.75 1697.5 L58538.75 1936 L58538.75 1936 L58538.75 2625 L58538.75 2625 L58538.75 3314 L58538.75 3314 L25346.25 3499.711108944455 L25346.3 3499.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68241.6 649.6 L68232.1 644.6 L68241.2 638.9 L68250.8 644.0 Z"></path>
-					</g>
-					<path d="M68232.1 646.7 L59802.75 966 L59802.75 1197 L59802.8 1197.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68241.6 651.7 L68232.1 646.7 L68241.2 641.0 L68250.8 646.0 Z"></path>
-					</g>
-					<path d="M68232.6 739.3 L67294.75 966 L67294.75 1174 L67294.8 1174.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68242.9 742.3 L68232.6 739.3 L68240.4 731.9 L68250.8 734.9 Z"></path>
-					</g>
-					<path d="M68233.2 791.1 L67742 966 L67742 1212.5 L67742 1212.5 L67742 1459 L67742 1459 L67742 1697.5 L67742 1697.5 L67742 1936 L67742 1936 L67742 2625 L67742 2625 L67742 3314 L67742 3314 L67742 3500.5 L67742 3500.5 L67742 3687 L67742 3687 L67742 3843.5 L67742 3843.5 L67742 4000 L67742 4000 L59749.25 4129.652694973217 L59749.3 4129.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68243.7 792.9 L68233.2 791.1 L68240.2 782.9 L68250.8 784.8 Z"></path>
-					</g>
-					<path d="M68661.1 964.6 L68661 966 L68661 1212.5 L68661 1212.5 L68661 1459 L68661 1459 L68661 1697.5 L68661 1697.5 L68661 1936 L68661 1936 L68661 2625 L68661 2625 L68661 3314 L68661 3314 L68661 3500.5 L68661 3500.5 L68661 3687 L68661 3687 L68661 3843.5 L68661 3843.5 L68661 4000 L68661 4000 L68661 4134 L68661 4134 L68661 4268 L68661 4268 L65990.25 4448.322155851209 L65990.3 4448.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68667.1 955.7 L68661.1 964.6 L68656.5 954.9 L68662.5 946.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M46070.6 137.2 L68686.75 293 L68686.75 313 L68686.8 313.0 " fill="none"></path>
-					</g>
-					<path d="M46070.6 131.9 L46070.6 137.2 L46070.5 142.6 L46057.3 137.1 Z"></path>
-					<path d="M25363.8 3443.9 L25376.25 3439.5 L25383.75 3439.5 L25383.75 3439.5 L25391.25 3500.5 L25391.25 3500.5 L25383.75 3561.5 L25383.75 3561.5 L25376.25 3561.5 L25376.25 3561.5 L25346.25 3550.7982456140353 L25346.3 3550.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25353.2 3442.0 L25363.8 3443.9 L25356.8 3452.1 L25346.3 3450.2 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3541.2 2652.7 L3825.5 3314 L25064.25 3499.27002771314 L25064.3 3499.3 " fill="none"></path>
-					</g>
-					<path d="M3546.1 2650.6 L3541.2 2652.7 L3536.3 2654.9 L3535.9 2640.5 Z"></path>
-					<path d="M75222.4 1295.6 L74546.25 1459 L81706.25 1693.1666095303394 L81706.3 1693.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M75232.7 1298.6 L75222.4 1295.6 L75230.2 1288.2 L75240.5 1291.2 Z"></path>
-					</g>
-					<path d="M75910.1 1241.6 L78485 1459 L78485 1697.5 L78485 1697.5 L78485 1936 L78485 1936 L78485 2625 L78485 2625 L78485 3314 L78485 3314 L72204 3498.009817781967 L72204.0 3498.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M75901.2 1235.5 L75910.1 1241.6 L75900.4 1246.1 L75891.5 1240.0 Z"></path>
-					</g>
-					<path d="M72890.9 725.4 L72207.75 966 L75240.5 1188.607868681605 L75240.5 1188.6 " fill="none"></path>
-					<path d="M72892.6 730.5 L72890.9 725.4 L72889.1 720.4 L72903.4 721.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83466.4 172.3 L83154.25 293 L83154.25 629.5 L83154.25 629.5 L83154.25 966 L83154.25 966 L75891.5 1201.9263170032616 L75891.5 1201.9 " fill="none"></path>
-					</g>
-					<path d="M83468.3 177.3 L83466.4 172.3 L83464.5 167.3 L83478.8 167.5 Z"></path>
-					<path d="M34013.0 1708.9 L32109.25 1936 L32109.25 2571.5 L32109.3 2571.5 " fill="none"></path>
-					<path d="M34013.6 1714.2 L34013.0 1708.9 L34012.4 1703.6 L34026.3 1707.3 Z"></path>
-					<path d="M80988.3 702.2 L80988.25 966 L73446.5 1202.0612520237453 L73446.5 1202.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M80993.6 692.8 L80988.3 702.2 L80982.9 692.8 L80988.3 683.5 Z"></path>
-					</g>
-					<path d="M81934.1 152.7 L80988.25 293 L80988.25 575.5 L80988.3 575.5 " fill="none"></path>
-					<path d="M81934.8 158.0 L81934.1 152.7 L81933.3 147.4 L81947.3 150.7 Z"></path>
-					<path d="M78256.6 205.5 L77874.25 293 L77874.25 614 L77874.3 614.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M78266.8 208.6 L78256.6 205.5 L78264.5 198.2 L78274.8 201.3 Z"></path>
-					</g>
-					<path d="M78352.4 236.1 L78235.25 293 L78235.25 614 L78235.3 614.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M78363.1 236.9 L78352.4 236.1 L78358.5 227.3 L78369.2 228.0 Z"></path>
-					</g>
-					<path d="M78594.7 245.7 L78610.75 293 L78610.75 614 L78610.8 614.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M78596.8 235.1 L78594.7 245.7 L78586.7 238.6 L78588.7 228.0 Z"></path>
-					</g>
-					<path d="M78763.1 236.1 L78880.25 293 L78880.25 614 L78880.3 614.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M78757.0 227.3 L78763.1 236.1 L78752.4 236.9 L78746.3 228.0 Z"></path>
-					</g>
-					<path d="M72958.5 1416.4 L72926.25 1459 L72926.25 1697.5 L72926.25 1697.5 L72926.25 1936 L72926.25 1936 L72926.25 2625 L72926.25 2625 L72926.25 3314 L72926.25 3314 L64520 3499.825777106113 L64520.0 3499.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72968.4 1412.2 L72958.5 1416.4 L72959.9 1405.7 L72969.8 1401.5 Z"></path>
-					</g>
-					<path d="M72990.9 1417.5 L72966.25 1459 L81706.25 1693.938292476754 L81706.3 1693.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73000.3 1412.2 L72990.9 1417.5 L72991.1 1406.8 L73000.5 1401.5 Z"></path>
-					</g>
-					<path d="M73129.8 1420.1 L73133 1459 L73133 1697.5 L73133 1697.5 L73133 1936 L73133 1936 L73133 2625 L73133 2625 L73133 3314 L73133 3314 L59764 3499.7151316524523 L59764.0 3499.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73134.4 1410.4 L73129.8 1420.1 L73123.8 1411.2 L73128.3 1401.5 Z"></path>
-					</g>
-					<path d="M73251.3 1417.0 L73279.75 1459 L73279.75 1697.5 L73279.75 1697.5 L73279.75 1936 L73279.75 1936 L73279.75 2625 L73279.75 2625 L73279.75 3314 L73279.75 3314 L63029.25 3499.5496699990294 L63029.3 3499.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73250.5 1406.2 L73251.3 1417.0 L73241.7 1412.2 L73240.9 1401.5 Z"></path>
-					</g>
-					<path d="M68798.3 958.6 L68800.75 966 L72779.5 1193.4362281871413 L72779.5 1193.4 " fill="none"></path>
-					<path d="M68803.3 956.9 L68798.3 958.6 L68793.2 960.3 L68794.0 946.0 Z"></path>
-					<path d="M34203.1 1722.4 L35016.75 1936 L35016.75 2594 L35016.8 2594.0 " fill="none"></path>
-					<path d="M34204.5 1717.3 L34203.1 1722.4 L34201.8 1727.6 L34190.3 1719.0 Z"></path>
-					<path d="M34203.3 1717.9 L35220.25 1936 L35220.25 2594 L35220.3 2594.0 " fill="none"></path>
-					<path d="M34204.4 1712.7 L34203.3 1717.9 L34202.2 1723.1 L34190.3 1715.1 Z"></path>
-					<path d="M34203.4 1714.5 L35440.25 1936 L35440.25 2594 L35440.3 2594.0 " fill="none"></path>
-					<path d="M34204.3 1709.3 L34203.4 1714.5 L34202.4 1719.8 L34190.3 1712.2 Z"></path>
-					<path d="M18471.8 3923.7 L18471.75 4000 L18182.574626865673 4118.5 L18182.6 4118.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M18477.1 3914.3 L18471.8 3923.7 L18466.4 3914.3 L18471.8 3905.0 Z"></path>
-					</g>
-					<path d="M30292.9 1214.3 L18471.75 1459 L18471.75 1697.5 L18471.75 1697.5 L18471.75 1936 L18471.75 1936 L18471.75 2625 L18471.75 2625 L18471.75 3314 L18471.75 3314 L18471.75 3500.5 L18471.75 3500.5 L18471.75 3687 L18471.75 3687 L18471.75 3782 L18471.8 3782.0 " fill="none"></path>
-					<path d="M30293.0 1219.7 L30292.9 1214.3 L30292.8 1209.0 L30306.3 1214.1 Z"></path>
-					<path d="M36132.5 2675.9 L35414.25 3314 L37084.5 3494.3454190186712 L37084.5 3494.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36143.0 2673.7 L36132.5 2675.9 L36135.9 2665.7 L36146.4 2663.5 Z"></path>
-					</g>
-					<path d="M36135.0 2676.3 L35454.25 3314 L34313.5 3491.8473354231974 L34313.5 3491.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36145.5 2673.8 L36135.0 2676.3 L36138.2 2666.0 L36148.7 2663.5 Z"></path>
-					</g>
-					<path d="M36471.9 2719.7 L36341.25 3314 L37084.5 3487.216026241799 L37084.5 3487.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36479.1 2711.8 L36471.9 2719.7 L36468.7 2709.5 L36475.9 2701.5 Z"></path>
-					</g>
-					<path d="M36477.4 2719.9 L36381.25 3314 L34313.5 3495.625044154009 L34313.5 3495.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36484.1 2711.6 L36477.4 2719.9 L36473.6 2709.9 L36480.4 2701.5 Z"></path>
-					</g>
-					<path d="M36508.7 2719.9 L36608.5 3314 L24666.25 3498.277970834626 L24666.3 3498.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36512.4 2709.8 L36508.7 2719.9 L36501.9 2711.6 L36505.6 2701.5 Z"></path>
-					</g>
-					<path d="M36812.2 2771.9 L36648.5 3314 L34505.5 3494.112438035151 L34505.5 3494.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36820.0 2764.5 L36812.2 2771.9 L36809.8 2761.4 L36817.6 2754.0 Z"></path>
-					</g>
-					<path d="M36820.6 2772.1 L36688.5 3314 L21260 3500.0718604500776 L21260.0 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M36828.0 2764.3 L36820.6 2772.1 L36817.7 2761.8 L36825.0 2754.0 Z"></path>
-					</g>
-					<path d="M35645.0 3618.2 L35645 3687 L35645 3828 L35645.0 3828.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M35650.3 3608.8 L35645.0 3618.2 L35639.7 3608.8 L35645.0 3599.5 Z"></path>
-					</g>
-					<path d="M36875.0 2767.2 L36946.25 3314 L35781.5 3480.936311239193 L35781.5 3480.9 " fill="none"></path>
-					<path d="M36880.3 2766.5 L36875.0 2767.2 L36869.7 2767.9 L36873.3 2754.0 Z"></path>
-					<path d="M36907.0 2766.6 L37102.25 3314 L36012.5 3485.473001476482 L36012.5 3485.5 " fill="none"></path>
-					<path d="M36912.0 2764.8 L36907.0 2766.6 L36902.0 2768.4 L36902.5 2754.0 Z"></path>
-					<path d="M72188.1 2756.0 L71933.75 3314 L62019 3496.8575119286015 L62019.0 3496.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72196.8 2749.7 L72188.1 2756.0 L72187.1 2745.3 L72195.8 2739.0 Z"></path>
-					</g>
-					<path d="M72275.3 2757.3 L72391 3314 L72141.60589812332 3485 L72141.6 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72278.6 2747.1 L72275.3 2757.3 L72268.1 2749.2 L72271.5 2739.0 Z"></path>
-					</g>
-					<path d="M72901.8 725.6 L72247.75 966 L72247.75 1212.5 L72247.75 1212.5 L72247.75 1459 L72247.75 1459 L72247.75 1697.5 L72247.75 1697.5 L72247.75 1936 L72247.75 1936 L72247.75 2511 L72247.8 2511.0 " fill="none"></path>
-					<path d="M72903.6 730.6 L72901.8 725.6 L72900.0 720.6 L72914.3 721.0 Z"></path>
-					<path d="M30458.4 1231.2 L31388 1459 L34026.25 1690.3105872622002 L34026.3 1690.3 " fill="none"></path>
-					<path d="M30459.7 1226.0 L30458.4 1231.2 L30457.2 1236.4 L30445.5 1228.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M15132.8 1256.8 L15132.75 1459 L34026.25 1696.4693552212063 L34026.3 1696.5 " fill="none"></path>
-					</g>
-					<path d="M15138.1 1256.8 L15132.8 1256.8 L15127.4 1256.8 L15132.8 1243.5 Z"></path>
-					<path d="M37890.0 2712.7 L37872.5 3314 L37198.5 3485.9575923392613 L37198.5 3486.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37895.6 2703.5 L37890.0 2712.7 L37884.9 2703.2 L37890.5 2694.0 Z"></path>
-					</g>
-					<path d="M37910.2 2712.3 L38032 3314 L24666.25 3498.51210237051 L24666.3 3498.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M37913.5 2702.1 L37910.2 2712.3 L37903.1 2704.2 L37906.5 2694.0 Z"></path>
-					</g>
-					<path d="M72986.9 730.3 L72574.25 966 L72574.25 1212.5 L72574.25 1212.5 L72574.25 1459 L72574.25 1459 L72574.25 1697.5 L72574.25 1697.5 L72574.25 1936 L72574.25 1936 L72574.25 2625 L72574.25 2625 L72574.25 3314 L72574.25 3314 L71994 3467.3356358483884 L71994.0 3467.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72997.6 730.3 L72986.9 730.3 L72992.3 721.0 L73003.1 721.0 Z"></path>
-					</g>
-					<path d="M72998.1 730.8 L72614.25 966 L72614.25 1212.5 L72614.25 1212.5 L72614.25 1459 L72614.25 1459 L72614.25 1697.5 L72614.25 1697.5 L72614.25 1936 L72614.25 1936 L72614.25 2625 L72614.25 2625 L72614.25 3314 L72614.25 3314 L63641.25 3499.5487858964407 L63641.3 3499.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73008.8 730.4 L72998.1 730.8 L73003.2 721.3 L73014.0 721.0 Z"></path>
-					</g>
-					<path d="M73033.4 732.6 L72739.5 966 L72739.5 1212.5 L72739.5 1212.5 L72739.5 1459 L72739.5 1459 L72739.5 1697.5 L72739.5 1697.5 L72739.5 1936 L72739.5 1936 L72739.5 2625 L72739.5 2625 L72739.5 3314 L72739.5 3314 L72170.56970509383 3485 L72170.6 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M73044.0 731.0 L73033.4 732.6 L73037.4 722.6 L73048.0 721.0 Z"></path>
-					</g>
-					<path d="M61192.3 1277.2 L61192.25 1459 L61192.25 1666.5 L61192.3 1666.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M61197.6 1267.8 L61192.3 1277.2 L61186.9 1267.8 L61192.3 1258.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M36198.1 2676.7 L36301.25 3314 L35319.5 3479.960910944935 L35319.5 3480.0 " fill="none"></path>
-					</g>
-					<path d="M36203.4 2675.8 L36198.1 2676.7 L36192.8 2677.5 L36196.0 2663.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M37388.0 2706.8 L37388 3314 L35319.5 3490.153082191781 L35319.5 3490.2 " fill="none"></path>
-					</g>
-					<path d="M37393.3 2706.8 L37388.0 2706.8 L37382.7 2706.8 L37388.0 2693.5 Z"></path>
-					<path d="M62561.1 1257.6 L61731 1459 L61731 1644 L61731.0 1644.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M62571.4 1260.5 L62561.1 1257.6 L62568.9 1250.2 L62579.3 1253.1 Z"></path>
-					</g>
-					<path d="M62561.5 1274.5 L62010 1459 L34190.25 1696.7990762228176 L34190.3 1696.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M62572.1 1276.6 L62561.5 1274.5 L62568.7 1266.4 L62579.3 1268.5 Z"></path>
-					</g>
-					<path d="M62561.8 1283.9 L62108.25 1459 L62108.25 1697.5 L62108.25 1697.5 L62108.25 1936 L62108.25 1936 L62108.25 2625 L62108.25 2625 L62108.25 3314 L62108.25 3314 L21260 3500.338059131073 L21260.0 3500.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M62572.5 1285.5 L62561.8 1283.9 L62568.6 1275.6 L62579.3 1277.2 Z"></path>
-					</g>
-					<path d="M62931.1 1299.8 L63267.25 1459 L63267.25 1697.5 L63267.25 1697.5 L63267.25 1936 L63267.25 1936 L63267.25 2625 L63267.25 2625 L63267.25 3314 L63267.25 3314 L29421.5 3499.3336477410357 L29421.5 3499.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M62925.0 1291.0 L62931.1 1299.8 L62920.4 1300.6 L62914.3 1291.8 Z"></path>
-					</g>
-					<path d="M38186.2 2749.8 L38072 3314 L21358 3500.1769694797827 L21358.0 3500.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38193.3 2741.7 L38186.2 2749.8 L38182.9 2739.6 L38189.9 2731.5 Z"></path>
-					</g>
-					<path d="M38228.7 2750.0 L38306.25 3314 L21260 3500.112407979276 L21260.0 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M38232.7 2740.0 L38228.7 2750.0 L38222.1 2741.5 L38226.1 2731.5 Z"></path>
-					</g>
-					<path d="M34203.4 1711.8 L35692.25 1936 L35692.25 2548.5 L35692.3 2548.5 " fill="none"></path>
-					<path d="M34204.2 1706.6 L34203.4 1711.8 L34202.6 1717.1 L34190.3 1709.8 Z"></path>
-					<path d="M68910.6 2772.3 L68800.75 3314 L35468.5 3500.195560364516 L35468.5 3500.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68917.7 2764.2 L68910.6 2772.3 L68907.3 2762.1 L68914.3 2754.0 Z"></path>
-					</g>
-					<path d="M68919.1 2772.5 L68840.75 3314 L71743 3492.7695896292626 L71743.0 3492.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68925.8 2764.0 L68919.1 2772.5 L68915.2 2762.5 L68921.8 2754.0 Z"></path>
-					</g>
-					<path d="M68944.8 2772.7 L68960.5 3314 L59764 3499.361207176051 L59764.0 3499.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68949.8 2763.2 L68944.8 2772.7 L68939.2 2763.5 L68944.2 2754.0 Z"></path>
-					</g>
-					<path d="M68966.1 2772.4 L69060.25 3314 L63029.25 3498.8905235473003 L63029.3 3498.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68969.8 2762.3 L68966.1 2772.4 L68959.3 2764.1 L68962.9 2754.0 Z"></path>
-					</g>
-					<path d="M68933.4 956.6 L68940.5 966 L68940.5 1212.5 L68940.5 1212.5 L68940.5 1459 L68940.5 1459 L68940.5 1697.5 L68940.5 1697.5 L68940.5 1936 L68940.5 1936 L68940.5 2496 L68940.5 2496.0 " fill="none"></path>
-					<path d="M68937.7 953.4 L68933.4 956.6 L68929.2 959.9 L68925.4 946.0 Z"></path>
-					<path d="M34203.5 1710.0 L35919.75 1936 L35919.75 2594 L35919.8 2594.0 " fill="none"></path>
-					<path d="M34204.2 1704.7 L34203.5 1710.0 L34202.8 1715.3 L34190.3 1708.3 Z"></path>
-					<path d="M71457.3 3900.7 L71457.25 4000 L72021.75 4106.240168539326 L72021.8 4106.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71462.6 3891.3 L71457.3 3900.7 L71451.9 3891.3 L71457.3 3882.0 Z"></path>
-					</g>
-					<path d="M73260.4 730.6 L73486.5 966 L73486.5 1212.5 L73486.5 1212.5 L73486.5 1459 L73486.5 1459 L73486.5 1697.5 L73486.5 1697.5 L73486.5 1936 L73486.5 1936 L73486.5 2625 L73486.5 2625 L73486.5 3314 L73486.5 3314 L73486.5 3500.5 L73486.5 3500.5 L73486.5 3687 L73486.5 3687 L71598.25 3832.6257853886905 L71598.3 3832.6 " fill="none"></path>
-					<path d="M73264.2 726.9 L73260.4 730.6 L73256.5 734.3 L73251.1 721.0 Z"></path>
-					<path d="M63690.0 1319.2 L63380.75 1459 L63380.75 1682 L63380.8 1682.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M63700.7 1320.2 L63690.0 1319.2 L63696.3 1310.5 L63707.0 1311.5 Z"></path>
-					</g>
-					<path d="M63736.4 1320.8 L63494.25 1459 L63494.25 1697.5 L63494.25 1697.5 L63494.25 1936 L63494.25 1936 L63494.25 2625 L63494.25 2625 L63494.25 3314 L63494.25 3314 L26043.25 3500.283628265479 L26043.3 3500.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M63747.1 1320.8 L63736.4 1320.8 L63741.8 1311.5 L63752.6 1311.5 Z"></path>
-					</g>
-					<path d="M63785.5 1323.0 L63612.75 1459 L63612.75 1682 L63612.8 1682.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M63796.2 1321.5 L63785.5 1323.0 L63789.6 1313.1 L63800.2 1311.5 Z"></path>
-					</g>
-					<path d="M63913.2 1330.1 L63899.25 1459 L63899.25 1682 L63899.3 1682.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M63919.6 1321.4 L63913.2 1330.1 L63908.9 1320.2 L63915.3 1311.5 Z"></path>
-					</g>
-					<path d="M64144.0 1762.0 L63886.75 1936 L42151.75 2620.3244910549042 L42151.8 2620.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M64154.7 1761.1 L64144.0 1762.0 L64148.7 1752.3 L64159.4 1751.5 Z"></path>
-					</g>
-					<path d="M64245.3 1770.1 L64259.25 1936 L64259.25 2625 L64259.25 2625 L64259.25 3314 L64259.25 3314 L64259.25 3500.5 L64259.25 3500.5 L64259.25 3687 L64259.25 3687 L64259.25 3843.5 L64259.25 3843.5 L64259.25 4000 L64259.25 4000 L18216.75 4133.790781641349 L18216.8 4133.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M64249.9 1760.4 L64245.3 1770.1 L64239.2 1761.2 L64243.8 1751.5 Z"></path>
-					</g>
-					<path d="M64062.3 1319.7 L64239.25 1459 L64239.25 1643.5 L64239.3 1643.5 " fill="none"></path>
-					<path d="M64065.6 1315.6 L64062.3 1319.7 L64059.0 1323.9 L64051.8 1311.5 Z"></path>
-					<path d="M34203.5 1705.0 L37137.5 1936 L37137.5 2586.5 L37137.5 2586.5 " fill="none"></path>
-					<path d="M34204.0 1699.7 L34203.5 1705.0 L34203.1 1710.3 L34190.3 1704.0 Z"></path>
-					<path d="M73300.1 728.8 L73627 966 L73627 1181.5 L73627.0 1181.5 " fill="none"></path>
-					<path d="M73303.3 724.5 L73300.1 728.8 L73297.0 733.1 L73289.4 721.0 Z"></path>
-					<path d="M38636.6 2668.2 L38346.25 3314 L36348.5 3487.636432482815 L36348.5 3487.6 " fill="none"></path>
-					<path d="M38641.5 2670.3 L38636.6 2668.2 L38631.7 2666.0 L38642.1 2656.0 Z"></path>
-					<path d="M30020.8 1747.2 L30020.75 1936 L56178.25 2613.9205378973106 L56178.3 2613.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M30026.1 1737.8 L30020.8 1747.2 L30015.4 1737.8 L30020.8 1728.5 Z"></path>
-					</g>
-					<path d="M25888.3 1762.7 L25888.25 1936 L44630.5 2620.7436998740636 L44630.5 2620.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M25893.6 1753.3 L25888.3 1762.7 L25882.9 1753.3 L25888.3 1744.0 Z"></path>
-					</g>
-					<path d="M30471.3 1229.7 L31655.5 1459 L26053.25 1690.6765572846678 L26053.3 1690.7 " fill="none"></path>
-					<path d="M30472.4 1224.5 L30471.3 1229.7 L30470.3 1235.0 L30458.3 1227.2 Z"></path>
-					<path d="M81247.3 1285.2 L81247.25 1459 L81247.25 1501 L81247.3 1501.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M81252.6 1275.8 L81247.3 1285.2 L81241.9 1275.8 L81247.3 1266.5 Z"></path>
-					</g>
-					<path d="M81934.2 157.9 L81247.25 293 L81247.25 629.5 L81247.25 629.5 L81247.25 966 L81247.25 966 L81247.25 1158.5 L81247.3 1158.5 " fill="none"></path>
-					<path d="M81935.2 163.2 L81934.2 157.9 L81933.1 152.7 L81947.3 155.4 Z"></path>
-					<path d="M55619.8 1785.4 L55344.25 1936 L55344.25 2541 L55344.3 2541.0 " fill="none"></path>
-					<path d="M55622.4 1790.0 L55619.8 1785.4 L55617.2 1780.7 L55631.5 1779.0 Z"></path>
-					<path d="M68126.6 2831.5 L67951.75 3314 L64520 3498.857065492093 L64520.0 3498.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68134.8 2824.6 L68126.6 2831.5 L68124.8 2821.0 L68133.0 2814.0 Z"></path>
-					</g>
-					<path d="M68138.5 2831.9 L67991.75 3314 L63641.25 3498.548675082452 L63641.3 3498.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68146.3 2824.5 L68138.5 2831.9 L68136.1 2821.4 L68144.0 2814.0 Z"></path>
-					</g>
-					<path d="M68150.5 2832.1 L68031.75 3314 L68031.75 3500.5 L68031.75 3500.5 L68031.75 3687 L68031.75 3687 L68031.75 3843.5 L68031.75 3843.5 L68031.75 4000 L68031.75 4000 L63107.25 4132.679802955665 L63107.3 4132.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68157.9 2824.3 L68150.5 2832.1 L68147.5 2821.8 L68154.9 2814.0 Z"></path>
-					</g>
-					<path d="M68213.6 2832.6 L68241.5 3314 L68241.5 3500.5 L68241.5 3500.5 L68241.5 3687 L68241.5 3687 L65519.75 3835.817844353219 L65519.8 3835.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68218.3 2823.0 L68213.6 2832.6 L68207.7 2823.6 L68212.5 2814.0 Z"></path>
-					</g>
-					<path d="M68264.5 2831.9 L68411.25 3314 L63029.25 3498.6983163124482 L63029.3 3498.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M68266.9 2821.4 L68264.5 2831.9 L68256.7 2824.5 L68259.0 2814.0 Z"></path>
-					</g>
-					<path d="M69136.0 675.6 L71967.75 966 L71967.75 1212.5 L71967.75 1212.5 L71967.75 1459 L71967.75 1459 L71967.75 1697.5 L71967.75 1697.5 L71967.75 1936 L71967.75 1936 L68621 2548.2564221705943 L68621.0 2548.3 " fill="none"></path>
-					<path d="M69136.6 670.3 L69136.0 675.6 L69135.5 680.9 L69122.8 674.2 Z"></path>
-					<path d="M80855.0 1734.1 L78694.5 1936 L68621 2597.4544458210235 L68621.0 2597.5 " fill="none"></path>
-					<path d="M80855.5 1739.5 L80855.0 1734.1 L80854.5 1728.8 L80868.3 1732.9 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M67173.0 1223.4 L64540.25 1459 L64540.25 1697.5 L64540.25 1697.5 L64540.25 1936 L64540.25 1936 L67782 2546.055513827245 L67782.0 2546.1 " fill="none"></path>
-					</g>
-					<path d="M67173.4 1228.7 L67173.0 1223.4 L67172.5 1218.1 L67186.3 1222.2 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83014.6 1261.4 L82854.25 1459 L82854.25 1697.5 L82854.25 1697.5 L82854.25 1936 L82854.25 1936 L68621 2605.27431710771 L68621.0 2605.3 " fill="none"></path>
-					</g>
-					<path d="M83018.8 1264.7 L83014.6 1261.4 L83010.5 1258.0 L83023.0 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42228.5 1226.1 L40351.75 1459 L40351.75 1697.5 L40351.75 1697.5 L40351.75 1936 L40351.75 1936 L67782 2614.621612402266 L67782.0 2614.6 " fill="none"></path>
-					</g>
-					<path d="M42229.2 1231.4 L42228.5 1226.1 L42227.9 1220.8 L42241.8 1224.5 Z"></path>
-					<path d="M60678.3 2779.2 L60494.5 3314 L59764 3487.1108640406605 L59764.0 3487.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M60686.4 2772.1 L60678.3 2779.2 L60676.3 2768.6 L60684.3 2761.5 Z"></path>
-					</g>
-					<path d="M60817.6 2777.7 L61120.75 3314 L62924.25 3495.224542025862 L62924.3 3495.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M60817.7 2767.0 L60817.6 2777.7 L60808.4 2772.2 L60808.4 2761.5 Z"></path>
-					</g>
-					<path d="M56273.5 1736.3 L55994 1936 L60383.25 2574.3858251095044 L60383.3 2574.4 " fill="none"></path>
-					<path d="M56276.6 1740.6 L56273.5 1736.3 L56270.4 1731.9 L56284.4 1728.5 Z"></path>
-					<path d="M82289.5 1821.2 L82048.75 1936 L61079.25 2613.752339627067 L61079.3 2613.8 " fill="none"></path>
-					<path d="M82291.8 1826.1 L82289.5 1821.2 L82287.2 1816.4 L82301.5 1815.5 Z"></path>
-					<path d="M80850.3 1813.6 L80432 1936 L80432 2625 L80432 2625 L80432 3314 L80432 3314 L80432 3500.5 L80432 3500.5 L80432 3687 L80432 3687 L66206.5 3842.701000104906 L66206.5 3842.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M80860.8 1816.1 L80850.3 1813.6 L80857.8 1805.9 L80868.3 1808.4 Z"></path>
-					</g>
-					<path d="M81322.2 1911.6 L81330.75 1936 L81330.75 2625 L81330.75 2625 L81330.75 3314 L81330.75 3314 L59764 3500.012688888118 L59764.0 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M81324.2 1901.0 L81322.2 1911.6 L81314.1 1904.6 L81316.0 1894.0 Z"></path>
-					</g>
-					<path d="M49552.4 1217.0 L44490 1459 L44490 1598.5 L44490.0 1598.5 " fill="none"></path>
-					<path d="M49552.7 1222.4 L49552.4 1217.0 L49552.2 1211.7 L49565.8 1216.4 Z"></path>
-					<path d="M47545.0 3618.2 L47545 3687 L66060.5 3842.885399575006 L66060.5 3842.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M47550.3 3608.8 L47545.0 3618.2 L47539.7 3608.8 L47545.0 3599.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M49999.5 1705.1 L47426.5 1936 L47426.5 2625 L47426.5 2625 L47426.5 3314 L47426.5 3314 L47482.09651474531 3401.5 L47482.1 3401.5 " fill="none"></path>
-					</g>
-					<path d="M49999.9 1710.4 L49999.5 1705.1 L49999.0 1699.8 L50012.8 1703.9 Z"></path>
-					<path d="M40638.3 1747.2 L40638.25 1936 L60383.25 2613.0668889663066 L60383.3 2613.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M40643.6 1737.8 L40638.3 1747.2 L40632.9 1737.8 L40638.3 1728.5 Z"></path>
-					</g>
-					<path d="M47663.5 2712.7 L47663.5 3314 L47607.90348525469 3401.5 L47607.9 3401.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M47668.8 2703.3 L47663.5 2712.7 L47658.2 2703.3 L47663.5 2694.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M49999.5 1705.9 L47663.5 1936 L47663.5 2556 L47663.5 2556.0 " fill="none"></path>
-					</g>
-					<path d="M50000.0 1711.2 L49999.5 1705.9 L49999.0 1700.5 L50012.8 1704.5 Z"></path>
-					<path d="M56440.6 2874.6 L56149.75 3314 L64459 3499.817935189904 L64459.0 3499.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M56450.2 2869.7 L56440.6 2874.6 L56441.3 2863.8 L56450.9 2859.0 Z"></path>
-					</g>
-					<path d="M56454.8 2875.0 L56189.75 3314 L59651 3497.504548361879 L59651.0 3497.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M56464.2 2869.7 L56454.8 2875.0 L56455.1 2864.2 L56464.5 2859.0 Z"></path>
-					</g>
-					<path d="M56469.1 2875.4 L56229.75 3314 L56229.75 3500.5 L56229.75 3500.5 L56229.75 3687 L56229.75 3687 L56229.75 3843.5 L56229.75 3843.5 L56229.75 4000 L56229.75 4000 L63009.25 4133.038441824705 L63009.3 4133.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M56478.3 2869.7 L56469.1 2875.4 L56468.9 2864.6 L56478.1 2859.0 Z"></path>
-					</g>
-					<path d="M56602.7 2877.7 L56597.5 3314 L56597.5 3500.5 L56597.5 3500.5 L56597.5 3687 L56597.5 3687 L65238.75 3840.9961425683946 L65238.8 3841.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M56608.2 2868.4 L56602.7 2877.7 L56597.5 2868.3 L56602.9 2859.0 Z"></path>
-					</g>
-					<path d="M56739.4 2875.5 L56973.5 3314 L62924.25 3498.8690084537543 L62924.3 3498.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M56739.7 2864.7 L56739.4 2875.5 L56730.3 2869.7 L56730.6 2859.0 Z"></path>
-					</g>
-					<path d="M56316.7 1741.4 L56267.75 1936 L56490.95754716981 2391 L56491.0 2391.0 " fill="none"></path>
-					<path d="M56321.9 1742.7 L56316.7 1741.4 L56311.5 1740.1 L56320.0 1728.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M67173.0 1223.6 L64580.25 1459 L64580.25 1697.5 L64580.25 1697.5 L64580.25 1936 L64580.25 1936 L57033.25 2588.0638284531947 L57033.3 2588.1 " fill="none"></path>
-					</g>
-					<path d="M67173.5 1228.9 L67173.0 1223.6 L67172.5 1218.2 L67186.3 1222.4 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83022.0 1262.2 L82894.25 1459 L82894.25 1697.5 L82894.25 1697.5 L82894.25 1936 L82894.25 1936 L57033.25 2613.795576012325 L57033.3 2613.8 " fill="none"></path>
-					</g>
-					<path d="M83026.5 1265.1 L83022.0 1262.2 L83017.5 1259.3 L83029.3 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42228.5 1226.4 L40391.75 1459 L40391.75 1697.5 L40391.75 1697.5 L40391.75 1936 L40391.75 1936 L56178.25 2606.83375477982 L56178.3 2606.8 " fill="none"></path>
-					</g>
-					<path d="M42229.2 1231.7 L42228.5 1226.4 L42227.9 1221.1 L42241.8 1224.7 Z"></path>
-					<path d="M38639.0 2668.4 L38386.25 3314 L36781.5 3480.1545454545453 L36781.5 3480.2 " fill="none"></path>
-					<path d="M38644.0 2670.4 L38639.0 2668.4 L38634.0 2666.5 L38643.9 2656.0 Z"></path>
-					<path d="M45299.0 1785.2 L45299 1936 L45299 2609.5 L45299.0 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45304.3 1775.8 L45299.0 1785.2 L45293.7 1775.8 L45299.0 1766.5 Z"></path>
-					</g>
-					<path d="M49552.4 1217.9 L45299 1459 L45299 1628.5 L45299.0 1628.5 " fill="none"></path>
-					<path d="M49552.7 1223.2 L49552.4 1217.9 L49552.1 1212.6 L49565.8 1217.1 Z"></path>
-					<path d="M46014.4 2711.6 L45805.5 3314 L59651 3499.742033520357 L59651.0 3499.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46022.5 2704.6 L46014.4 2711.6 L46012.5 2701.1 L46020.6 2694.0 Z"></path>
-					</g>
-					<path d="M46068.7 2712.0 L46236.5 3314 L46236.5 3485 L46236.5 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46071.4 2701.6 L46068.7 2712.0 L46061.1 2704.4 L46063.7 2694.0 Z"></path>
-					</g>
-					<path d="M46628.3 2749.5 L46471 3314 L46471 3485 L46471.0 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46636.0 2741.9 L46628.3 2749.5 L46625.7 2739.1 L46633.3 2731.5 Z"></path>
-					</g>
-					<path d="M46703.5 2749.2 L46887.75 3314 L26043.25 3500.1116071428573 L26043.3 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M46705.7 2738.7 L46703.5 2749.2 L46695.6 2742.0 L46697.7 2731.5 Z"></path>
-					</g>
-					<path d="M47112.0 2749.2 L46927.75 3314 L46927.75 3485 L46927.8 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M47119.9 2742.0 L47112.0 2749.2 L47109.8 2738.7 L47117.8 2731.5 Z"></path>
-					</g>
-					<path d="M47174.5 2749.9 L47273.75 3314 L26043.25 3500.1186542258156 L26043.3 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M47178.1 2739.8 L47174.5 2749.9 L47167.6 2741.6 L47171.2 2731.5 Z"></path>
-					</g>
-					<path d="M14909.1 3449.9 L14921 3447 L14928.5 3447 L14928.5 3447 L14936 3500.5 L14936 3500.5 L14928.5 3554 L14928.5 3554 L14921 3554 L14921 3554 L14891 3546.7539503386006 L14891.0 3546.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M14898.8 3446.9 L14909.1 3449.9 L14901.3 3457.2 L14891.0 3454.2 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3542.7 2652.5 L3865.5 3314 L14508 3497.2034567103565 L14508.0 3497.2 " fill="none"></path>
-					</g>
-					<path d="M3547.5 2650.1 L3542.7 2652.5 L3537.9 2654.8 L3536.8 2640.5 Z"></path>
-					<path d="M26332.8 1777.7 L26332.75 1936 L40694.25 2602.1106361494444 L40694.3 2602.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26338.1 1768.3 L26332.8 1777.7 L26327.4 1768.3 L26332.8 1759.0 Z"></path>
-					</g>
-					<path d="M30471.4 1227.0 L31897.75 1459 L26572.25 1687.2357142857143 L26572.3 1687.2 " fill="none"></path>
-					<path d="M30472.3 1221.7 L30471.4 1227.0 L30470.6 1232.3 L30458.3 1224.9 Z"></path>
-					<path d="M79198.5 165.3 L79198.5 293 L79198.5 583 L79198.5 583.0 " fill="none"></path>
-					<path d="M79203.8 165.3 L79198.5 165.3 L79193.2 165.3 L79198.5 152.0 Z"></path>
-					<path d="M26851.8 1777.7 L26851.75 1936 L40694.25 2601.281982421875 L40694.3 2601.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M26857.1 1768.3 L26851.8 1777.7 L26846.4 1768.3 L26851.8 1759.0 Z"></path>
-					</g>
-					<path d="M30471.5 1224.8 L32177.25 1459 L27091.25 1686.774105717773 L27091.3 1686.8 " fill="none"></path>
-					<path d="M30472.2 1219.5 L30471.5 1224.8 L30470.7 1230.0 L30458.3 1222.9 Z"></path>
-					<path d="M40991.8 2927.2 L40741 3314 L14891 3499.1285448226868 L14891.0 3499.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41001.4 2922.2 L40991.8 2927.2 L40992.4 2916.4 L41002.0 2911.5 Z"></path>
-					</g>
-					<path d="M41187.8 2930.2 L41187.75 3314 L59651 3499.931026336749 L59651.0 3499.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41193.1 2920.8 L41187.8 2930.2 L41182.4 2920.8 L41187.8 2911.5 Z"></path>
-					</g>
-					<path d="M41305.4 2928.9 L41454.5 3314 L62924.25 3500.0450638292928 L62924.3 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41307.0 2918.3 L41305.4 2928.9 L41297.1 2922.1 L41298.7 2911.5 Z"></path>
-					</g>
-					<path d="M56324.0 1741.8 L56307.75 1936 L41681.25 2602.5118055555554 L41681.3 2602.5 " fill="none"></path>
-					<path d="M56329.4 1742.2 L56324.0 1741.8 L56318.7 1741.3 L56325.2 1728.5 Z"></path>
-					<path d="M41346.6 1793.9 L41187.75 1936 L41187.75 2338.5 L41187.8 2338.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41357.1 1791.7 L41346.6 1793.9 L41350.0 1783.7 L41360.6 1781.5 Z"></path>
-					</g>
-					<path d="M41562.4 1793.9 L41721.25 1936 L41721.25 2625 L41721.25 2625 L41721.25 3314 L41721.25 3314 L48752.25 3497.165456069283 L48752.3 3497.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M41559.0 1783.7 L41562.4 1793.9 L41551.9 1791.7 L41548.4 1781.5 Z"></path>
-					</g>
-					<path d="M64658.4 2816.5 L64474.25 3314 L64488.23257372654 3485 L64488.2 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M64666.6 2809.6 L64658.4 2816.5 L64656.6 2805.9 L64664.9 2799.0 Z"></path>
-					</g>
-					<path d="M64669.4 2816.8 L64514.25 3314 L63641.25 3491.164853101197 L63641.3 3491.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M64677.3 2809.5 L64669.4 2816.8 L64667.1 2806.3 L64675.0 2799.0 Z"></path>
-					</g>
-					<path d="M65057.2 2441.9 L65963.25 1936 L65846.60849056604 1804 L65846.6 1804.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65046.4 2441.8 L65057.2 2441.9 L65051.6 2451.1 L65040.9 2451.0 Z"></path>
-					</g>
-					<path d="M64683.4 2817.2 L64564.75 3314 L64564.75 3500.5 L64564.75 3500.5 L64564.75 3687 L64564.75 3687 L64564.75 3843.5 L64564.75 3843.5 L64564.75 4000 L64564.75 4000 L63107.25 4129.641553269167 L63107.3 4129.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M64690.7 2809.3 L64683.4 2817.2 L64680.4 2806.8 L64687.7 2799.0 Z"></path>
-					</g>
-					<path d="M64743.4 2817.6 L64779.75 3314 L64779.75 3500.5 L64779.75 3500.5 L64779.75 3687 L64779.75 3687 L65238.75 3806.8223519599665 L65238.8 3806.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M64748.0 2807.9 L64743.4 2817.6 L64737.4 2808.7 L64742.0 2799.0 Z"></path>
-					</g>
-					<path d="M64789.1 2816.8 L64944.25 3314 L63029.25 3495.5235069885643 L63029.3 3495.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M64791.4 2806.3 L64789.1 2816.8 L64781.2 2809.5 L64783.5 2799.0 Z"></path>
-					</g>
-					<path d="M69136.0 675.0 L72007.75 966 L72007.75 1212.5 L72007.75 1212.5 L72007.75 1459 L72007.75 1459 L72007.75 1697.5 L72007.75 1697.5 L72007.75 1936 L72007.75 1936 L65159.25 2584.295184447345 L65159.3 2584.3 " fill="none"></path>
-					<path d="M69136.6 669.7 L69136.0 675.0 L69135.5 680.3 L69122.8 673.7 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M67173.0 1223.7 L64620.25 1459 L64620.25 1697.5 L64620.25 1697.5 L64620.25 1936 L64620.25 1936 L64701.72314949202 2451 L64701.7 2451.0 " fill="none"></path>
-					</g>
-					<path d="M67173.5 1229.0 L67173.0 1223.7 L67172.5 1218.4 L67186.3 1222.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42228.6 1231.1 L40884.75 1459 L40884.75 1697.5 L40884.75 1697.5 L40884.75 1936 L40884.75 1936 L64299.25 2612.5749124536055 L64299.3 2612.6 " fill="none"></path>
-					</g>
-					<path d="M42229.5 1236.4 L42228.6 1231.1 L42227.7 1225.8 L42241.8 1228.9 Z"></path>
-					<path d="M65488.3 1811.4 L65199.25 1936 L65199.25 2625 L65199.25 2625 L65199.25 3314 L65199.25 3314 L65199.25 3500.5 L65199.25 3500.5 L65199.25 3687 L65199.25 3687 L65238.75 3721.3430555555556 L65238.8 3721.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65499.0 1812.6 L65488.3 1811.4 L65494.8 1802.8 L65505.5 1804.0 Z"></path>
-					</g>
-					<path d="M65742.0 1822.6 L65732.5 1936 L64982.61066763425 2451 L64982.6 2451.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65748.1 1813.7 L65742.0 1822.6 L65737.5 1812.9 L65743.6 1804.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M67173.1 1231.9 L65752.5 1459 L65752.5 1591 L65752.5 1591.0 " fill="none"></path>
-					</g>
-					<path d="M67173.9 1237.2 L67173.1 1231.9 L67172.2 1226.7 L67186.3 1229.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83029.7 1263.0 L82934.25 1459 L66174 1691.649155353791 L66174.0 1691.6 " fill="none"></path>
-					</g>
-					<path d="M83034.5 1265.3 L83029.7 1263.0 L83024.9 1260.7 L83035.5 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42228.6 1231.6 L40924.75 1459 L65331 1693.4509923372034 L65331.0 1693.5 " fill="none"></path>
-					</g>
-					<path d="M42229.5 1236.9 L42228.6 1231.6 L42227.7 1226.4 L42241.8 1229.3 Z"></path>
-					<path d="M47980.3 2712.3 L47851.25 3314 L19454.25 3499.516787809791 L19454.3 3499.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M47987.5 2704.2 L47980.3 2712.3 L47977.0 2702.0 L47984.2 2694.0 Z"></path>
-					</g>
-					<path d="M48054.4 2709.6 L48450.5 3314 L24666.25 3499.377644625077 L24666.3 3499.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M48053.8 2698.9 L48054.4 2709.6 L48044.9 2704.7 L48044.2 2694.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M49999.5 1708.9 L48306.5 1936 L48306.5 2563.5 L48306.5 2563.5 " fill="none"></path>
-					</g>
-					<path d="M50000.2 1714.2 L49999.5 1708.9 L49998.8 1703.6 L50012.8 1707.1 Z"></path>
-					<path d="M19472.1 3450.6 L19484.25 3447 L19491.75 3447 L19491.75 3447 L19499.25 3500.5 L19499.25 3500.5 L19491.75 3554 L19491.75 3554 L19484.25 3554 L19484.25 3554 L19454.25 3545.1080332409974 L19454.3 3545.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M19461.7 3448.1 L19472.1 3450.6 L19464.7 3458.4 L19454.3 3455.9 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3544.1 2652.2 L3905.5 3314 L19153.25 3498.677179224912 L19153.3 3498.7 " fill="none"></path>
-					</g>
-					<path d="M3548.8 2649.6 L3544.1 2652.2 L3539.4 2654.8 L3537.7 2640.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M49740.4 1265.0 L50084.25 1459 L50084.25 1666.5 L50084.3 1666.5 " fill="none"></path>
-					</g>
-					<path d="M49743.0 1260.4 L49740.4 1265.0 L49737.7 1269.7 L49728.8 1258.5 Z"></path>
-					<path d="M71232.3 2883.2 L71015 3314 L64520 3499.6283043444946 L64520.0 3499.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71241.3 2877.2 L71232.3 2883.2 L71231.7 2872.4 L71240.7 2866.5 Z"></path>
-					</g>
-					<path d="M71247.1 2883.5 L71055 3314 L59764 3499.571403392818 L59764.0 3499.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71255.8 2877.2 L71247.1 2883.5 L71246.0 2872.8 L71254.7 2866.5 Z"></path>
-					</g>
-					<path d="M71428.1 2884.6 L71536.5 3314 L63029.25 3499.3561289757295 L63029.3 3499.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71430.9 2874.2 L71428.1 2884.6 L71420.6 2876.9 L71423.5 2866.5 Z"></path>
-					</g>
-					<path d="M69136.0 674.5 L72047.75 966 L72047.75 1212.5 L72047.75 1212.5 L72047.75 1459 L72047.75 1459 L72047.75 1697.5 L72047.75 1697.5 L72047.75 1936 L72047.75 1936 L71602.68559506531 2383.5 L71602.7 2383.5 " fill="none"></path>
-					<path d="M69136.5 669.2 L69136.0 674.5 L69135.5 679.8 L69122.8 673.2 Z"></path>
-					<path d="M38641.4 2668.6 L38426.25 3314 L37044.5 3486.5741670852167 L37044.5 3486.6 " fill="none"></path>
-					<path d="M38646.5 2670.3 L38641.4 2668.6 L38636.4 2667.0 L38645.7 2656.0 Z"></path>
-					<path d="M49775.5 2727.7 L49775.5 3314 L49823.50938337802 3386.5 L49823.5 3386.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M49780.8 2718.3 L49775.5 2727.7 L49770.2 2718.3 L49775.5 2709.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M50033.6 1736.7 L49775.5 1936 L49775.5 2541 L49775.5 2541.0 " fill="none"></path>
-					</g>
-					<path d="M50036.8 1740.9 L50033.6 1736.7 L50030.3 1732.4 L50044.1 1728.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M50072.9 1741.4 L50022.5 1936 L50022.5 2625 L50022.5 2625 L50022.5 3314 L50022.5 3314 L49974.49061662198 3386.5 L49974.5 3386.5 " fill="none"></path>
-					</g>
-					<path d="M50078.0 1742.7 L50072.9 1741.4 L50067.7 1740.1 L50076.2 1728.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3545.5 2651.9 L3945.5 3314 L2862 3472.240211433046 L2862.0 3472.2 " fill="none"></path>
-					</g>
-					<path d="M3550.1 2649.2 L3545.5 2651.9 L3540.9 2654.7 L3538.6 2640.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M50122.7 1738.2 L50309.5 1936 L50309.5 2563.5 L50309.5 2563.5 " fill="none"></path>
-					</g>
-					<path d="M50126.6 1734.5 L50122.7 1738.2 L50118.8 1741.9 L50113.5 1728.5 Z"></path>
-					<path d="M42140.0 1747.2 L42140 1936 L62148.25 2613.2212097021797 L62148.3 2613.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M42145.3 1737.8 L42140.0 1747.2 L42134.7 1737.8 L42140.0 1728.5 Z"></path>
-					</g>
-					<path d="M27625.3 1762.7 L27625.25 1936 L45403 2620.2466168563647 L45403.0 2620.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M27630.6 1753.3 L27625.3 1762.7 L27619.9 1753.3 L27625.3 1744.0 Z"></path>
-					</g>
-					<path d="M30471.5 1222.5 L32584 1459 L27797.25 1689.2273506428032 L27797.3 1689.2 " fill="none"></path>
-					<path d="M30472.1 1217.2 L30471.5 1222.5 L30470.9 1227.8 L30458.3 1221.0 Z"></path>
-					<path d="M55733.8 2742.7 L55733.75 3314 L53016.75 3488.6709755256807 L53016.8 3488.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M55739.1 2733.3 L55733.8 2742.7 L55728.4 2733.3 L55733.8 2724.0 Z"></path>
-					</g>
-					<path d="M55761.5 1794.6 L55733.75 1936 L55733.75 2526 L55733.8 2526.0 " fill="none"></path>
-					<path d="M55766.7 1795.6 L55761.5 1794.6 L55756.2 1793.6 L55764.0 1781.5 Z"></path>
-					<path d="M62431.6 2854.5 L62302.25 3314 L64459 3497.899359926849 L64459.0 3497.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M62439.3 2846.9 L62431.6 2854.5 L62429.0 2844.0 L62436.7 2836.5 Z"></path>
-					</g>
-					<path d="M62444.9 2854.7 L62342.25 3314 L59764 3496.5006641996392 L59764.0 3496.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M62452.1 2846.8 L62444.9 2854.7 L62441.7 2844.4 L62449.0 2836.5 Z"></path>
-					</g>
-					<path d="M62554.2 2854.6 L62670.25 3314 L62951.27680965148 3485 L62951.3 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M62557.1 2844.2 L62554.2 2854.6 L62546.8 2846.9 L62549.7 2836.5 Z"></path>
-					</g>
-					<path d="M56331.5 1741.8 L56347.75 1936 L62148.25 2586.003171505245 L62148.3 2586.0 " fill="none"></path>
-					<path d="M56336.8 1741.3 L56331.5 1741.8 L56326.1 1742.2 L56330.3 1728.5 Z"></path>
-					<path d="M62675.2 1833.1 L62496.25 1936 L62496.25 2413.5 L62496.3 2413.5 " fill="none"></path>
-					<path d="M62677.9 1837.8 L62675.2 1833.1 L62672.6 1828.5 L62686.8 1826.5 Z"></path>
-					<path d="M82289.7 1831.9 L82088.75 1936 L62844.25 2612.762051805538 L62844.3 2612.8 " fill="none"></path>
-					<path d="M82292.1 1836.6 L82289.7 1831.9 L82287.2 1827.2 L82301.5 1825.8 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M67173.3 1240.2 L66214 1459 L66214 1697.5 L66214 1697.5 L66214 1936 L66214 1936 L62844.25 2560.5061529150694 L62844.3 2560.5 " fill="none"></path>
-					</g>
-					<path d="M67174.4 1245.4 L67173.3 1240.2 L67172.1 1235.0 L67186.3 1237.2 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83037.6 1263.7 L82974.25 1459 L82974.25 1697.5 L82974.25 1697.5 L82974.25 1936 L82974.25 1936 L62844.25 2613.2912393788456 L62844.3 2613.3 " fill="none"></path>
-					</g>
-					<path d="M83042.7 1265.3 L83037.6 1263.7 L83032.6 1262.0 L83041.8 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42228.6 1232.6 L40991 1459 L40991 1697.5 L40991 1697.5 L40991 1936 L40991 1936 L62148.25 2613.850536496902 L62148.3 2613.9 " fill="none"></path>
-					</g>
-					<path d="M42229.6 1237.8 L42228.6 1232.6 L42227.7 1227.3 L42241.8 1230.2 Z"></path>
-					<path d="M38643.9 2668.9 L38466.25 3314 L38466.25 3469.5 L38466.3 3469.5 " fill="none"></path>
-					<path d="M38649.1 2670.3 L38643.9 2668.9 L38638.8 2667.4 L38647.5 2656.0 Z"></path>
-					<path d="M66828.4 2821.2 L66443.25 3314 L64520 3497.5885476647472 L64520.0 3497.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M66838.4 2817.1 L66828.4 2821.2 L66829.9 2810.6 L66839.9 2806.5 Z"></path>
-					</g>
-					<path d="M66839.5 2821.6 L66483.25 3314 L63641.25 3497.529432132964 L63641.3 3497.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M66849.3 2817.2 L66839.5 2821.6 L66840.6 2810.9 L66850.4 2806.5 Z"></path>
-					</g>
-					<path d="M66873.8 2822.9 L66606 3314 L66606 3500.5 L66606 3500.5 L66606 3687 L66606 3687 L66606 3843.5 L66606 3843.5 L66606 4000 L66606 4000 L63107.25 4132.1492495243465 L63107.3 4132.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M66883.0 2817.2 L66873.8 2822.9 L66873.6 2812.1 L66882.8 2806.5 Z"></path>
-					</g>
-					<path d="M66951.9 2825.0 L66879 3314 L66879 3500.5 L66879 3500.5 L66879 3687 L66879 3687 L65519.75 3828.83872312052 L65519.8 3828.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M66958.6 2816.5 L66951.9 2825.0 L66948.0 2814.9 L66954.7 2806.5 Z"></path>
-					</g>
-					<path d="M67060.5 2823.9 L67254.75 3314 L63029.25 3498.211255259467 L63029.3 3498.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M67062.1 2813.2 L67060.5 2823.9 L67052.1 2817.1 L67053.7 2806.5 Z"></path>
-					</g>
-					<path d="M69136.0 674.0 L72087.75 966 L72087.75 1212.5 L72087.75 1212.5 L72087.75 1459 L72087.75 1459 L72087.75 1697.5 L72087.75 1697.5 L72087.75 1936 L72087.75 1936 L67527.75 2551.323149236193 L67527.8 2551.3 " fill="none"></path>
-					<path d="M69136.5 668.6 L69136.0 674.0 L69135.5 679.3 L69122.8 672.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M67173.3 1241.3 L66254 1459 L66254 1697.5 L66254 1697.5 L66254 1936 L66254 1936 L66790.04227140783 2443.5 L66790.0 2443.5 " fill="none"></path>
-					</g>
-					<path d="M67174.5 1246.5 L67173.3 1241.3 L67172.0 1236.1 L67186.3 1238.2 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83045.9 1264.2 L83014.25 1459 L83014.25 1697.5 L83014.25 1697.5 L83014.25 1936 L83014.25 1936 L67527.75 2601.535537190083 L67527.8 2601.5 " fill="none"></path>
-					</g>
-					<path d="M83051.1 1265.0 L83045.9 1264.2 L83040.6 1263.3 L83048.0 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42228.6 1233.2 L41031 1459 L41031 1697.5 L41031 1697.5 L41031 1936 L41031 1936 L66435.75 2610.503540360105 L66435.8 2610.5 " fill="none"></path>
-					</g>
-					<path d="M42229.6 1238.4 L42228.6 1233.2 L42227.7 1227.9 L42241.8 1230.7 Z"></path>
-					<path d="M27972.7 1773.8 L27848.25 1936 L27848.25 2609.5 L27848.3 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M27982.6 1769.7 L27972.7 1773.8 L27974.1 1763.2 L27984.1 1759.0 Z"></path>
-					</g>
-					<path d="M28090.4 1773.7 L28216.25 1936 L28216.25 2625 L28216.25 2625 L28216.25 3314 L28216.25 3314 L29511.5 3489.268728460004 L29511.5 3489.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28088.9 1763.1 L28090.4 1773.7 L28080.5 1769.6 L28079.0 1759.0 Z"></path>
-					</g>
-					<path d="M30471.5 1221.6 L32807 1459 L28225.25 1687.8116787939068 L28225.3 1687.8 " fill="none"></path>
-					<path d="M30472.1 1216.3 L30471.5 1221.6 L30471.0 1226.9 L30458.3 1220.2 Z"></path>
-					<path d="M52678.6 2769.4 L52304.75 3314 L59651 3499.0765762723313 L59651.0 3499.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M52688.3 2764.7 L52678.6 2769.4 L52679.5 2758.7 L52689.2 2754.0 Z"></path>
-					</g>
-					<path d="M52936.2 2766.4 L53549.75 3314 L62924.25 3499.4613609844064 L62924.3 3499.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M52932.8 2756.2 L52936.2 2766.4 L52925.7 2764.2 L52922.3 2754.0 Z"></path>
-					</g>
-					<path d="M56338.8 1741.4 L56387.75 1936 L53125.75 2558.581163434903 L53125.8 2558.6 " fill="none"></path>
-					<path d="M56344.0 1740.1 L56338.8 1741.4 L56333.6 1742.7 L56335.5 1728.5 Z"></path>
-					<path d="M38670.6 2668.6 L38885.75 3314 L38885.75 3454.5 L38885.8 3454.5 " fill="none"></path>
-					<path d="M38675.6 2667.0 L38670.6 2668.6 L38665.5 2670.3 L38666.3 2656.0 Z"></path>
-					<path d="M81666.3 2712.7 L81666.25 3314 L62621 3497.788325464071 L62621.0 3497.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M81671.6 2703.3 L81666.3 2712.7 L81660.9 2703.3 L81666.3 2694.0 Z"></path>
-					</g>
-					<path d="M81956.3 172.6 L81666.25 293 L81666.25 629.5 L81666.25 629.5 L81666.25 966 L81666.25 966 L81666.25 1212.5 L81666.25 1212.5 L81666.25 1459 L81666.25 1459 L81666.25 1697.5 L81666.25 1697.5 L81666.25 1936 L81666.25 1936 L81666.25 2556 L81666.3 2556.0 " fill="none"></path>
-					<path d="M81958.3 177.5 L81956.3 172.6 L81954.2 167.7 L81968.6 167.5 Z"></path>
-					<path d="M49741.9 1229.8 L50992.75 1459 L50992.75 1613.5 L50992.8 1613.5 " fill="none"></path>
-					<path d="M49742.8 1224.6 L49741.9 1229.8 L49740.9 1235.1 L49728.8 1227.4 Z"></path>
-					<path d="M44911.5 1747.2 L44911.5 1936 L52429.75 2594.5188940092166 L52429.8 2594.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M44916.8 1737.8 L44911.5 1747.2 L44906.2 1737.8 L44911.5 1728.5 Z"></path>
-					</g>
-					<path d="M50768.1 2725.3 L50443 3314 L37198.5 3499.700804420554 L37198.5 3499.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M50777.3 2719.7 L50768.1 2725.3 L50767.9 2714.6 L50777.1 2709.0 Z"></path>
-					</g>
-					<path d="M50840.4 2727.4 L50937 3314 L52648.75 3482.3984570750363 L52648.8 3482.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M50844.1 2717.3 L50840.4 2727.4 L50833.6 2719.1 L50837.3 2709.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M50168.4 1724.7 L50823.5 1936 L50823.5 2541 L50823.5 2541.0 " fill="none"></path>
-					</g>
-					<path d="M50170.1 1719.6 L50168.4 1724.7 L50166.8 1729.7 L50155.8 1720.6 Z"></path>
-					<path d="M62340.0 3685.7 L62340 3687 L62340 3843.5 L62340 3843.5 L62340 4000 L62340 4000 L63009.25 4124.858336233902 L63009.3 4124.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M62345.3 3676.3 L62340.0 3685.7 L62334.7 3676.3 L62340.0 3667.0 Z"></path>
-					</g>
-					<path d="M48507.4 3292.1 L48490.5 3314 L62059 3496.716000577638 L62059.0 3496.7 " fill="none"></path>
-					<path d="M48511.6 3295.4 L48507.4 3292.1 L48503.1 3288.9 L48515.5 3281.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M51791.8 2669.3 L51791.75 3314 L62059 3495.5317351219396 L62059.0 3495.5 " fill="none"></path>
-					</g>
-					<path d="M51797.1 2669.3 L51791.8 2669.3 L51786.4 2669.3 L51791.8 2656.0 Z"></path>
-					<path d="M65738.1 2888.7 L65404.75 3314 L64520 3494.2850314121824 L64520.0 3494.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65748.0 2884.6 L65738.1 2888.7 L65739.6 2878.1 L65749.6 2874.0 Z"></path>
-					</g>
-					<path d="M65753.1 2889.1 L65444.75 3314 L63641.25 3495.861449040281 L63641.3 3495.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65762.9 2884.7 L65753.1 2889.1 L65754.3 2878.4 L65764.1 2874.0 Z"></path>
-					</g>
-					<path d="M65768.1 2889.5 L65484.75 3314 L65553.3827077748 3394 L65553.4 3394.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65777.8 2884.7 L65768.1 2889.5 L65768.9 2878.8 L65778.5 2874.0 Z"></path>
-					</g>
-					<path d="M65783.2 2889.9 L65524.75 3314 L59764 3498.6886200524305 L59764.0 3498.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65792.7 2884.7 L65783.2 2889.9 L65783.6 2879.2 L65793.0 2874.0 Z"></path>
-					</g>
-					<path d="M66075.3 2890.8 L66283.25 3314 L66283.25 3500.5 L66283.25 3500.5 L66283.25 3687 L66283.25 3687 L66283.25 3843.5 L66283.25 3843.5 L66283.25 4000 L66283.25 4000 L63107.25 4131.964031007752 L63107.3 4132.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M66076.0 2880.0 L66075.3 2890.8 L66066.4 2884.7 L66067.1 2874.0 Z"></path>
-					</g>
-					<path d="M66090.5 2890.4 L66323.25 3314 L66323.25 3500.5 L66323.25 3500.5 L66323.25 3687 L66323.25 3687 L65519.75 3820.2073622881358 L65519.8 3820.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M66090.7 2879.6 L66090.5 2890.4 L66081.4 2884.7 L66081.5 2874.0 Z"></path>
-					</g>
-					<path d="M66105.7 2890.0 L66363.25 3314 L63029.25 3497.6087405876274 L63029.3 3497.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M66105.4 2879.2 L66105.7 2890.0 L66096.3 2884.7 L66096.0 2874.0 Z"></path>
-					</g>
-					<path d="M69136.0 673.4 L72127.75 966 L72127.75 1212.5 L72127.75 1212.5 L72127.75 1459 L72127.75 1459 L72127.75 1697.5 L72127.75 1697.5 L72127.75 1936 L72127.75 1936 L66395.75 2574.7430050137473 L66395.8 2574.7 " fill="none"></path>
-					<path d="M69136.5 668.1 L69136.0 673.4 L69135.5 678.7 L69122.8 672.1 Z"></path>
-					<path d="M62757.2 1835.4 L62644.75 1936 L65493.75 2530.8366666666666 L65493.8 2530.8 " fill="none"></path>
-					<path d="M62760.7 1839.4 L62757.2 1835.4 L62753.6 1831.4 L62767.1 1826.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M67195.3 1256.4 L66736.25 1459 L66736.25 1697.5 L66736.25 1697.5 L66736.25 1936 L66736.25 1936 L66230.7928156749 2376 L66230.8 2376.0 " fill="none"></path>
-					</g>
-					<path d="M67197.5 1261.3 L67195.3 1256.4 L67193.2 1251.5 L67207.5 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83054.3 1264.3 L83054.25 1459 L83054.25 1697.5 L83054.25 1697.5 L83054.25 1936 L83054.25 1936 L66395.75 2606.838218533563 L66395.8 2606.8 " fill="none"></path>
-					</g>
-					<path d="M83059.6 1264.3 L83054.3 1264.3 L83048.9 1264.3 L83054.3 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42268.6 1249.8 L41878 1459 L41878 1697.5 L41878 1697.5 L41878 1936 L41878 1936 L65493.75 2612.0884519097926 L65493.8 2612.1 " fill="none"></path>
-					</g>
-					<path d="M42271.1 1254.5 L42268.6 1249.8 L42266.1 1245.1 L42280.4 1243.5 Z"></path>
-					<path d="M65644.8 3625.7 L65644.75 3687 L65519.75 3760.6817325800375 L65519.8 3760.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M65650.1 3616.3 L65644.8 3625.7 L65639.4 3616.3 L65644.8 3607.0 Z"></path>
-					</g>
-					<path d="M66062.9 3397.7 L66403.25 3314 L66110.44883889695 2874 L66110.4 2874.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M66052.5 3394.7 L66062.9 3397.7 L66055.1 3405.1 L66044.8 3402.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M67347.3 1259.9 L67567.75 1459 L67567.75 1697.5 L67567.75 1697.5 L67567.75 1936 L67567.75 1936 L67567.75 2625 L67567.75 2625 L67567.75 3314 L67567.75 3314 L66044.75 3461.7064482579303 L66044.8 3461.7 " fill="none"></path>
-					</g>
-					<path d="M67350.9 1256.0 L67347.3 1259.9 L67343.7 1263.9 L67337.4 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83062.6 1264.2 L83094.25 1459 L83094.25 1697.5 L83094.25 1697.5 L83094.25 1936 L83094.25 1936 L83094.25 2625 L83094.25 2625 L83094.25 3314 L83094.25 3314 L66044.75 3496.224805868363 L66044.8 3496.2 " fill="none"></path>
-					</g>
-					<path d="M83067.9 1263.3 L83062.6 1264.2 L83057.4 1265.0 L83060.5 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42349.6 1256.4 L42402 1459 L42402 1697.5 L42402 1697.5 L42402 1936 L42402 1936 L42402 2625 L42402 2625 L42402 3314 L42402 3314 L65244.75 3497.2903970055177 L65244.8 3497.3 " fill="none"></path>
-					</g>
-					<path d="M42354.8 1255.1 L42349.6 1256.4 L42344.4 1257.7 L42346.3 1243.5 Z"></path>
-					<path d="M71189.9 1734.9 L69220 1936 L69220 2625 L69220 2625 L69220 3314 L69220 3314 L64520 3499.2975372582177 L64520.0 3499.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71199.8 1739.3 L71189.9 1734.9 L71198.7 1728.7 L71208.5 1733.0 Z"></path>
-					</g>
-					<path d="M71189.9 1735.6 L69260 1936 L69260 2625 L69260 2625 L69260 3314 L69260 3314 L71743 3491.5271228675483 L71743.0 3491.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71199.8 1739.9 L71189.9 1735.6 L71198.7 1729.3 L71208.5 1733.6 Z"></path>
-					</g>
-					<path d="M71189.9 1736.2 L69300 1936 L69300 2625 L69300 2625 L69300 3314 L69300 3314 L69300 3500.5 L69300 3500.5 L69300 3687 L69300 3687 L69300 3843.5 L69300 3843.5 L69300 4000 L69300 4000 L72021.75 4127.111440271848 L72021.8 4127.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71199.8 1740.6 L71189.9 1736.2 L71198.7 1730.0 L71208.5 1734.3 Z"></path>
-					</g>
-					<path d="M71189.9 1736.9 L69340 1936 L69340 2625 L69340 2625 L69340 3314 L69340 3314 L63641.25 3499.0066364941904 L63641.3 3499.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71199.8 1741.2 L71189.9 1736.9 L71198.6 1730.6 L71208.5 1734.9 Z"></path>
-					</g>
-					<path d="M71397.1 1893.5 L71362.5 1936 L71362.5 2383.5 L71362.5 2383.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71407.1 1889.6 L71397.1 1893.5 L71398.8 1882.9 L71408.9 1879.0 Z"></path>
-					</g>
-					<path d="M71506.3 1897.1 L71496.5 1936 L66395.75 2569.0286396181386 L66395.8 2569.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71513.7 1889.4 L71506.3 1897.1 L71503.4 1886.8 L71510.8 1879.0 Z"></path>
-					</g>
-					<path d="M71539.7 1897.6 L71536.5 1936 L67527.75 2542.406224271365 L67527.8 2542.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71545.8 1888.7 L71539.7 1897.6 L71535.2 1887.9 L71541.3 1879.0 Z"></path>
-					</g>
-					<path d="M71573.3 1897.6 L71576.5 1936 L65159.25 2581.731534557669 L65159.3 2581.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71577.8 1887.9 L71573.3 1897.6 L71567.2 1888.7 L71571.7 1879.0 Z"></path>
-					</g>
-					<path d="M71606.7 1897.1 L71616.5 1936 L68621 2540.3629575402633 L68621.0 2540.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71609.6 1886.8 L71606.7 1897.1 L71599.3 1889.4 L71602.2 1879.0 Z"></path>
-					</g>
-					<path d="M71715.9 1893.5 L71750.5 1936 L71750.5 2625 L71750.5 2625 L71750.5 3314 L71750.5 3314 L63029.25 3499.384029063969 L63029.3 3499.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M71714.2 1882.9 L71715.9 1893.5 L71705.9 1889.6 L71704.1 1879.0 Z"></path>
-					</g>
-					<path d="M69136.0 672.9 L72167.75 966 L72167.75 1212.5 L72167.75 1212.5 L72167.75 1459 L72167.75 1459 L71904.5 1561.7159509202454 L71904.5 1561.7 " fill="none"></path>
-					<path d="M69136.5 667.6 L69136.0 672.9 L69135.5 678.2 L69122.8 671.6 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M67354.1 1259.2 L67607.75 1459 L71208.5 1676.4811965811966 L71208.5 1676.5 " fill="none"></path>
-					</g>
-					<path d="M67357.4 1255.1 L67354.1 1259.2 L67350.8 1263.4 L67343.6 1251.0 Z"></path>
-					<path d="M62894.5 1845.0 L62884.25 1936 L62884.25 2625 L62884.25 2625 L62884.25 3314 L62884.25 3314 L62884.25 3500.5 L62884.25 3500.5 L62884.25 3687 L62884.25 3687 L62884.25 3843.5 L62884.25 3843.5 L62884.25 4000 L62884.25 4000 L63038.12313432836 4118.5 L63038.1 4118.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M62900.9 1836.4 L62894.5 1845.0 L62890.3 1835.2 L62896.6 1826.5 Z"></path>
-					</g>
-					<path d="M63007.0 1842.1 L63069.25 1936 L63069.25 2625 L63069.25 2625 L63069.25 3314 L63069.25 3314 L63069.25 3500.5 L63069.25 3500.5 L63069.25 3687 L63069.25 3687 L65238.75 3833.981277056277 L65238.8 3834.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M63006.3 1831.3 L63007.0 1842.1 L62997.4 1837.2 L62996.7 1826.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M67360.8 1258.6 L67647.75 1459 L63227.25 1681.5882508181146 L63227.3 1681.6 " fill="none"></path>
-					</g>
-					<path d="M67363.9 1254.3 L67360.8 1258.6 L67357.8 1263.0 L67349.9 1251.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M42447.6 1241.9 L43256.25 1459 L62595.25 1693.665555838209 L62595.3 1693.7 " fill="none"></path>
-					</g>
-					<path d="M42449.0 1236.7 L42447.6 1241.9 L42446.2 1247.0 L42434.8 1238.4 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M49741.9 1227.9 L51161.75 1459 L51161.75 1697.5 L51161.75 1697.5 L51161.75 1936 L51161.75 1936 L51161.75 2625 L51161.75 2625 L51161.75 3314 L51161.75 3314 L52648.75 3479.9637941352485 L52648.8 3480.0 " fill="none"></path>
-					</g>
-					<path d="M49742.8 1222.6 L49741.9 1227.9 L49741.1 1233.2 L49728.8 1225.8 Z"></path>
-					<path d="M53471.1 1747.5 L51201.75 1936 L51201.75 2625 L51201.75 2625 L51201.75 3314 L51201.75 3314 L34092.5 3498.5423203157757 L34092.5 3498.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M53480.9 1752.1 L53471.1 1747.5 L53480.0 1741.5 L53489.8 1746.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M49742.1 1217.8 L54073.75 1459 L54073.75 1568.5 L54073.8 1568.5 " fill="none"></path>
-					</g>
-					<path d="M49742.4 1212.5 L49742.1 1217.8 L49741.8 1223.1 L49728.8 1217.0 Z"></path>
-					<path d="M53476.5 1751.1 L51413.75 1936 L51413.75 2541 L51413.8 2541.0 " fill="none"></path>
-					<path d="M53476.9 1756.4 L53476.5 1751.1 L53476.0 1745.7 L53489.8 1749.9 Z"></path>
-					<path d="M53476.5 1773.3 L52193.75 1936 L52193.75 2556 L52193.8 2556.0 " fill="none"></path>
-					<path d="M53477.2 1778.6 L53476.5 1773.3 L53475.9 1768.0 L53489.8 1771.6 Z"></path>
-					<path d="M53697.7 1831.0 L53401.75 1936 L53401.75 2556 L53401.8 2556.0 " fill="none"></path>
-					<path d="M53699.5 1836.0 L53697.7 1831.0 L53695.9 1825.9 L53710.3 1826.5 Z"></path>
-					<path d="M53979.8 1837.6 L53913.75 1936 L53913.75 2548.5 L53913.8 2548.5 " fill="none"></path>
-					<path d="M53984.2 1840.5 L53979.8 1837.6 L53975.4 1834.6 L53987.2 1826.5 Z"></path>
-					<path d="M54361.8 2787.7 L54361.75 3314 L21358 3500.3362685516645 L21358.0 3500.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M54367.1 2778.3 L54361.8 2787.7 L54356.4 2778.3 L54361.8 2769.0 Z"></path>
-					</g>
-					<path d="M54239.8 1835.0 L54361.75 1936 L54361.75 2481 L54361.8 2481.0 " fill="none"></path>
-					<path d="M54243.2 1830.9 L54239.8 1835.0 L54236.4 1839.1 L54229.5 1826.5 Z"></path>
-					<path d="M54745.8 2727.7 L54745.75 3314 L54800.76340482574 3485 L54800.8 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M54751.1 2718.3 L54745.8 2727.7 L54740.4 2718.3 L54745.8 2709.0 Z"></path>
-					</g>
-					<path d="M54449.8 1831.0 L54745.75 1936 L54745.75 2541 L54745.8 2541.0 " fill="none"></path>
-					<path d="M54451.6 1825.9 L54449.8 1831.0 L54448.0 1836.0 L54437.2 1826.5 Z"></path>
-					<path d="M28441.3 1762.7 L28441.25 1936 L48515.5 2608.0434507974687 L48515.5 2608.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28446.6 1753.3 L28441.3 1762.7 L28435.9 1753.3 L28441.3 1744.0 Z"></path>
-					</g>
-					<path d="M30471.5 1220.8 L33032 1459 L28617.25 1688.3563960137233 L28617.3 1688.4 " fill="none"></path>
-					<path d="M30472.0 1215.5 L30471.5 1220.8 L30471.0 1226.1 L30458.3 1219.6 Z"></path>
-					<path d="M28833.3 1785.2 L28833.25 1936 L48515.5 2607.7142096464613 L48515.5 2607.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M28838.6 1775.8 L28833.3 1785.2 L28827.9 1775.8 L28833.3 1766.5 Z"></path>
-					</g>
-					<path d="M30471.5 1220.2 L33248 1459 L29009.25 1687.9918738320403 L29009.3 1688.0 " fill="none"></path>
-					<path d="M30472.0 1214.9 L30471.5 1220.2 L30471.1 1225.5 L30458.3 1219.0 Z"></path>
-					<path d="M34109.9 3422.0 L34122.5 3417 L34130 3417 L34130 3417 L34137.5 3500.5 L34137.5 3500.5 L34130 3584 L34130 3584 L34122.5 3584 L34122.5 3584 L34092.5 3572.1560283687945 L34092.5 3572.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M34099.2 3420.5 L34109.9 3422.0 L34103.1 3430.4 L34092.5 3428.8 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3546.9 2651.6 L3985.5 3314 L33729.5 3499.368866017276 L33729.5 3499.4 " fill="none"></path>
-					</g>
-					<path d="M3551.3 2648.7 L3546.9 2651.6 L3542.4 2654.6 L3539.5 2640.5 Z"></path>
-					<path d="M29225.3 1762.7 L29225.25 1936 L48515.5 2607.3719297359416 L48515.5 2607.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M29230.6 1753.3 L29225.3 1762.7 L29219.9 1753.3 L29225.3 1744.0 Z"></path>
-					</g>
-					<path d="M30471.5 1219.6 L33464 1459 L29401.25 1687.597080507225 L29401.3 1687.6 " fill="none"></path>
-					<path d="M30472.0 1214.3 L30471.5 1219.6 L30471.1 1225.0 L30458.3 1218.6 Z"></path>
-					<path d="M55221.0 1747.2 L55221 1936 L49528.5 2568.704065171802 L49528.5 2568.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M55226.3 1737.8 L55221.0 1747.2 L55215.7 1737.8 L55221.0 1728.5 Z"></path>
-					</g>
-					<path d="M29617.3 1762.7 L29617.25 1936 L48515.5 2607.0158208686016 L48515.5 2607.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M29622.6 1753.3 L29617.3 1762.7 L29611.9 1753.3 L29617.3 1744.0 Z"></path>
-					</g>
-					<path d="M30471.5 1219.2 L33680 1459 L29793.25 1687.1680819641867 L29793.3 1687.2 " fill="none"></path>
-					<path d="M30471.9 1213.9 L30471.5 1219.2 L30471.1 1224.5 L30458.3 1218.2 Z"></path>
-					<path d="M30424.3 1762.7 L30424.25 1936 L48515.5 2606.2354451479346 L48515.5 2606.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M30429.6 1753.3 L30424.3 1762.7 L30418.9 1753.3 L30424.3 1744.0 Z"></path>
-					</g>
-					<path d="M30471.6 1218.4 L34103.5 1459 L30600.25 1686.0911530882652 L30600.3 1686.1 " fill="none"></path>
-					<path d="M30471.9 1213.1 L30471.6 1218.4 L30471.2 1223.7 L30458.3 1217.5 Z"></path>
-					<path d="M48533.9 3309.2 L48530.5 3314 L34092.5 3498.184616436951 L34092.5 3498.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M48543.7 3304.7 L48533.9 3309.2 L48535.0 3298.5 L48544.8 3294.0 Z"></path>
-					</g>
-					<path d="M48573.4 3309.6 L48570.5 3314 L59651 3499.5538520247824 L59651.0 3499.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M48583.0 3304.7 L48573.4 3309.6 L48574.0 3298.9 L48583.6 3294.0 Z"></path>
-					</g>
-					<path d="M48713.6 3311.0 L48712.25 3314 L48712.25 3500.5 L48712.25 3500.5 L48712.25 3687 L48712.25 3687 L48712.25 3843.5 L48712.25 3843.5 L48712.25 4000 L48712.25 4000 L63009.25 4133.542311445699 L63009.3 4133.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M48722.3 3304.7 L48713.6 3311.0 L48712.5 3300.3 L48721.2 3294.0 Z"></path>
-					</g>
-					<path d="M48947.4 3312.6 L48947.25 3314 L24338.25 3499.9785436421103 L24338.3 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M48953.7 3303.9 L48947.4 3312.6 L48943.1 3302.7 L48949.4 3294.0 Z"></path>
-					</g>
-					<path d="M49377.0 3310.6 L49378.75 3314 L62924.25 3499.7799492572435 L62924.3 3499.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M49377.4 3299.8 L49377.0 3310.6 L49367.9 3304.7 L49368.4 3294.0 Z"></path>
-					</g>
-					<path d="M56417.7 1733.5 L56924.25 1936 L49528.5 2580.8380840899745 L49528.5 2580.8 " fill="none"></path>
-					<path d="M56419.6 1728.5 L56417.7 1733.5 L56415.7 1738.4 L56405.3 1728.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83070.9 1263.7 L83134.25 1459 L83134.25 1697.5 L83134.25 1697.5 L83134.25 1936 L83134.25 1936 L49528.5 2614.769701500194 L49528.5 2614.8 " fill="none"></path>
-					</g>
-					<path d="M83075.9 1262.0 L83070.9 1263.7 L83065.8 1265.3 L83066.7 1251.0 Z"></path>
-					<path d="M57151.3 1754.7 L57151.25 1936 L49528.5 2582.0712550358276 L49528.5 2582.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M57156.6 1745.3 L57151.3 1754.7 L57145.9 1745.3 L57151.3 1736.0 Z"></path>
-					</g>
-					<path d="M55852.6 1796.6 L55954 1936 L56055.904753265604 2609.5 L56055.9 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M55851.4 1785.9 L55852.6 1796.6 L55842.8 1792.2 L55841.6 1781.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M49742.1 1216.3 L55780.5 1459 L55780.5 1613.5 L55780.5 1613.5 " fill="none"></path>
-					</g>
-					<path d="M49742.3 1211.0 L49742.1 1216.3 L49741.9 1221.6 L49728.8 1215.8 Z"></path>
-					<path d="M82549.0 1285.2 L82549 1459 L82549 1546 L82549.0 1546.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M82554.3 1275.8 L82549.0 1285.2 L82543.7 1275.8 L82549.0 1266.5 Z"></path>
-					</g>
-					<path d="M82152.0 170.1 L82549 293 L82549 629.5 L82549 629.5 L82549 966 L82549 966 L82549 1158.5 L82549.0 1158.5 " fill="none"></path>
-					<path d="M82153.6 165.1 L82152.0 170.1 L82150.4 175.2 L82139.3 166.2 Z"></path>
-					<path d="M82285.3 1847.2 L82128.75 1936 L82128.75 2625 L82128.75 2625 L82128.75 3314 L82128.75 3314 L59764 3500.030032892903 L59764.0 3500.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M82296.0 1847.2 L82285.3 1847.2 L82290.8 1837.9 L82301.5 1838.0 Z"></path>
-					</g>
-					<path d="M82577.5 1867.4 L82589 1936 L82589 2625 L82589 2625 L82589 3314 L82589 3314 L72204 3498.985912129895 L72204.0 3499.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M82581.2 1857.3 L82577.5 1867.4 L82570.7 1859.1 L82574.4 1849.0 Z"></path>
-					</g>
-					<path d="M34203.6 1702.5 L38656 1936 L38656 2594 L38656.0 2594.0 " fill="none"></path>
-					<path d="M34203.8 1697.2 L34203.6 1702.5 L34203.3 1707.8 L34190.3 1701.8 Z"></path>
-					<path d="M45394.5 3923.2 L45394.5 4000 L18216.75 4133.645941705887 L18216.8 4133.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M45399.8 3913.8 L45394.5 3923.2 L45389.2 3913.8 L45394.5 3904.5 Z"></path>
-					</g>
-					<path d="M57409.8 2674.7 L57409.75 3314 L25916.25 3499.62766461767 L25916.3 3499.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M57415.1 2665.3 L57409.8 2674.7 L57404.4 2665.3 L57409.8 2656.0 Z"></path>
-					</g>
-					<path d="M57710.3 2697.7 L57710.25 3314 L21260 3500.3185387445783 L21260.0 3500.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M57715.6 2688.3 L57710.3 2697.7 L57704.9 2688.3 L57710.3 2679.0 Z"></path>
-					</g>
-					<path d="M69832.2 2828.4 L69428.5 3314 L71743 3490.9074795081965 L71743.0 3490.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M69842.3 2824.6 L69832.2 2828.4 L69834.1 2817.8 L69844.1 2814.0 Z"></path>
-					</g>
-					<path d="M69843.7 2828.8 L69468.5 3314 L69468.5 3500.5 L69468.5 3500.5 L69468.5 3687 L69468.5 3687 L69468.5 3843.5 L69468.5 3843.5 L69468.5 4000 L69468.5 4000 L72021.75 4126.681662501157 L72021.8 4126.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M69853.6 2824.6 L69843.7 2828.8 L69845.2 2818.1 L69855.1 2814.0 Z"></path>
-					</g>
-					<path d="M69983.2 2832.6 L69941.25 3314 L69941.25 3439 L69941.3 3439.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M69989.3 2823.8 L69983.2 2832.6 L69978.7 2822.8 L69984.8 2814.0 Z"></path>
-					</g>
-					<path d="M70261.2 2825.4 L70895 3314 L63641.25 3499.3247542724066 L63641.3 3499.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M70257.1 2815.5 L70261.2 2825.4 L70250.6 2823.9 L70246.4 2814.0 Z"></path>
-					</g>
-					<path d="M70272.4 2825.1 L70935 3314 L72034 3487.111064189189 L72034.0 3487.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M70268.1 2815.3 L70272.4 2825.1 L70261.7 2823.8 L70257.4 2814.0 Z"></path>
-					</g>
-					<path d="M70283.6 2824.8 L70975 3314 L40519.25 3499.71338248637 L40519.3 3499.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M70279.1 2815.0 L70283.6 2824.8 L70272.9 2823.7 L70268.4 2814.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M83479.5 173.1 L83219 293 L83219 629.5 L83219 629.5 L83219 966 L83219 966 L83219 1212.5 L83219 1212.5 L83219 1459 L83219 1459 L83219 1697.5 L83219 1697.5 L83219 1936 L83219 1936 L70308.25 2608.9970494221784 L70308.3 2609.0 " fill="none"></path>
-					</g>
-					<path d="M83481.8 177.9 L83479.5 173.1 L83477.3 168.2 L83491.7 167.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M3548.2 2651.3 L4025.5 3314 L25620.25 3499.230519368525 L25620.3 3499.2 " fill="none"></path>
-					</g>
-					<path d="M3552.5 2648.2 L3548.2 2651.3 L3543.9 2654.4 L3540.4 2640.5 Z"></path>
-					<path d="M57986.3 1756.0 L57191.25 1936 L57191.25 2609.5 L57191.3 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M57996.6 1759.1 L57986.3 1756.0 L57994.2 1748.7 L58004.5 1751.8 Z"></path>
-					</g>
-					<path d="M58154.3 1857.8 L58110.25 1936 L58110.25 2609.5 L58110.3 2609.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M58163.5 1852.2 L58154.3 1857.8 L58154.2 1847.0 L58163.4 1841.5 Z"></path>
-					</g>
-					<path d="M58308.3 1858.9 L58338.75 1936 L58338.75 2625 L58338.75 2625 L58338.75 3314 L58338.75 3314 L21260 3500.3216116451226 L21260.0 3500.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M58309.8 1848.2 L58308.3 1858.9 L58299.9 1852.1 L58301.4 1841.5 Z"></path>
-					</g>
-					<path d="M58334.7 1857.8 L58378.75 1936 L69694.25 2606.8005592600557 L69694.3 2606.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M58334.8 1847.0 L58334.7 1857.8 L58325.5 1852.2 L58325.6 1841.5 Z"></path>
-					</g>
-					<path d="M3279.7 3401.2 L3293 3394.5 L3300.5 3394.5 L3300.5 3394.5 L3308 3500.5 L3308 3500.5 L3300.5 3606.5 L3300.5 3606.5 L3293 3606.5 L3293 3606.5 L3263 3591.393111638955 L3263.0 3591.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3268.9 3400.6 L3279.7 3401.2 L3273.7 3410.2 L3263.0 3409.6 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3549.5 2651.0 L4065.5 3314 L3263 3466.254577822991 L3263.0 3466.3 " fill="none"></path>
-					</g>
-					<path d="M3553.7 2647.7 L3549.5 2651.0 L3545.3 2654.3 L3541.3 2640.5 Z"></path>
-					<path d="M58860.0 2741.1 L58658.75 3314 L64459 3499.524439394589 L64459.0 3499.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M58868.1 2734.1 L58860.0 2741.1 L58858.0 2730.5 L58866.2 2723.5 Z"></path>
-					</g>
-					<path d="M58866.6 2741.4 L58698.75 3314 L58698.75 3485 L58698.8 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M58874.4 2734.0 L58866.6 2741.4 L58864.1 2731.0 L58871.9 2723.5 Z"></path>
-					</g>
-					<path d="M58934.9 2741.4 L59102.75 3314 L59832.36528150134 3485 L59832.4 3485.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M58937.4 2731.0 L58934.9 2741.4 L58927.1 2734.0 L58929.6 2723.5 Z"></path>
-					</g>
-					<path d="M30471.6 1215.1 L39003.25 1459 L39003.25 1666.5 L39003.3 1666.5 " fill="none"></path>
-					<path d="M30471.7 1209.7 L30471.6 1215.1 L30471.4 1220.4 L30458.3 1214.7 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83422.3 1434.5 L83384.5 1459 L81971.25 1677.0560407569142 L81971.3 1677.1 " fill="none"></path>
-					</g>
-					<path d="M83425.2 1438.9 L83422.3 1434.5 L83419.4 1430.0 L83433.5 1427.2 Z"></path>
-					<path d="M82805.0 2749.8 L82689.75 3314 L82689.75 3500.5 L82689.75 3500.5 L82689.75 3687 L82689.75 3687 L82689.75 3843.5 L82689.75 3843.5 L82689.75 4000 L82689.75 4000 L83283.75 4122.738627602159 L83283.8 4122.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M82812.1 2741.7 L82805.0 2749.8 L82801.7 2739.6 L82808.7 2731.5 Z"></path>
-					</g>
-					<path d="M82812.2 2750.0 L82729.75 3314 L82729.75 3500.5 L82729.75 3500.5 L82729.75 3687 L82729.75 3687 L82729.75 3843.5 L82729.75 3843.5 L82729.75 4000 L82729.75 4000 L77107.5 4131.074159453699 L77107.5 4131.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M82818.9 2741.5 L82812.2 2750.0 L82808.3 2740.0 L82814.9 2731.5 Z"></path>
-					</g>
-					<path d="M82819.5 2750.1 L82769.75 3314 L82769.75 3500.5 L82769.75 3500.5 L82769.75 3687 L82769.75 3687 L82769.75 3843.5 L82769.75 3843.5 L82769.75 4000 L82769.75 4000 L72316.75 4132.13546530824 L72316.8 4132.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M82825.6 2741.3 L82819.5 2750.1 L82815.0 2740.3 L82821.1 2731.5 Z"></path>
-					</g>
-					<path d="M82837.8 2750.1 L82870.5 3314 L71994 3498.372591347028 L71994.0 3498.4 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M82842.5 2740.5 L82837.8 2750.1 L82831.9 2741.1 L82836.7 2731.5 Z"></path>
-					</g>
-					<path d="M82848.8 2750.0 L82931.25 3314 L64520 3500.1915558447545 L64520.0 3500.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M82852.7 2740.0 L82848.8 2750.0 L82842.1 2741.5 L82846.1 2731.5 Z"></path>
-					</g>
-					<path d="M83441.3 1446.8 L83424.5 1459 L83424.5 1697.5 L83424.5 1697.5 L83424.5 1936 L83424.5 1936 L82922.31567489114 2518.5 L82922.3 2518.5 " fill="none"></path>
-					<path d="M83444.4 1451.1 L83441.3 1446.8 L83438.2 1442.5 L83452.1 1439.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M81838.8 1741.8 L81838.75 1936 L82677.20337445573 2518.5 L82677.2 2518.5 " fill="none"></path>
-					</g>
-					<path d="M81844.1 1741.8 L81838.8 1741.8 L81833.4 1741.8 L81838.8 1728.5 Z"></path>
-					<path d="M83676.8 2750.0 L83599.25 3314 L64520 3500.20233781185 L64520.0 3500.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M83683.4 2741.5 L83676.8 2750.0 L83672.8 2740.0 L83679.4 2731.5 Z"></path>
-					</g>
-					<path d="M83684.1 2750.1 L83639.25 3314 L83639.25 3500.5 L83639.25 3500.5 L83639.25 3687 L83639.25 3687 L83639.25 3843.5 L83639.25 3843.5 L83639.25 4000 L83639.25 4000 L77107.5 4131.4738818581245 L77107.5 4131.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M83690.1 2741.2 L83684.1 2750.1 L83679.5 2740.4 L83685.5 2731.5 Z"></path>
-					</g>
-					<path d="M83707.6 2750.1 L83768.75 3314 L71994 3498.533171572026 L71994.0 3498.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M83711.9 2740.2 L83707.6 2750.1 L83701.3 2741.4 L83705.6 2731.5 Z"></path>
-					</g>
-					<path d="M83753.6 1785.9 L83694 1936 L83694 2518.5 L83694.0 2518.5 " fill="none"></path>
-					<path d="M83758.6 1787.9 L83753.6 1785.9 L83748.7 1783.9 L83758.6 1773.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83478.5 1447.5 L83464.5 1459 L83464.5 1697.5 L83464.5 1697.5 L83464.5 1936 L83464.5 1936 L83464.5 2625 L83464.5 2625 L83464.5 3314 L83464.5 3314 L71994 3498.4815669196273 L71994.0 3498.5 " fill="none"></path>
-					</g>
-					<path d="M83481.9 1451.6 L83478.5 1447.5 L83475.2 1443.3 L83488.8 1439.0 Z"></path>
-					<path d="M72006.2 3903.0 L71648.5 4000 L76856.5 4130.84691103403 L76856.5 4130.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72016.6 3905.7 L72006.2 3903.0 L72013.8 3895.4 L72024.3 3898.1 Z"></path>
-					</g>
-					<path d="M72006.3 3907.4 L71688.5 4000 L72021.75 4092.8871554862194 L72021.8 4092.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72016.8 3909.9 L72006.3 3907.4 L72013.8 3899.7 L72024.3 3902.2 Z"></path>
-					</g>
-					<path d="M72445.9 3849.8 L77713.75 4000 L83283.75 4132.701573473198 L83283.8 4132.7 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72436.7 3844.2 L72445.9 3849.8 L72436.4 3854.8 L72427.3 3849.2 Z"></path>
-					</g>
-					<path d="M72445.9 3849.7 L77762.5 4000 L18216.75 4133.838169001681 L18216.8 4133.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72436.7 3844.1 L72445.9 3849.7 L72436.4 3854.8 L72427.3 3849.2 Z"></path>
-					</g>
-					<path d="M83515.9 1448.2 L83504.5 1459 L83504.5 1697.5 L83504.5 1697.5 L83504.5 1936 L83504.5 1936 L83504.5 2625 L83504.5 2625 L83504.5 3314 L83504.5 3314 L83504.5 3500.5 L83504.5 3500.5 L83504.5 3687 L83504.5 3687 L72427.25 3840.7040563005653 L72427.3 3840.7 " fill="none"></path>
-					<path d="M83519.6 1452.0 L83515.9 1448.2 L83512.2 1444.3 L83525.6 1439.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M71868.5 3552.3 L71868.5 3687 L72024.25 3755.2291812456265 L72024.3 3755.2 " fill="none"></path>
-					</g>
-					<path d="M71873.8 3552.3 L71868.5 3552.3 L71863.2 3552.3 L71868.5 3539.0 Z"></path>
-					<path d="M83789.7 3956.9 L83754 4000 L77107.5 4131.516686355581 L77107.5 4131.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M83799.7 3953.1 L83789.7 3956.9 L83791.5 3946.3 L83801.6 3942.5 Z"></path>
-					</g>
-					<path d="M83935.8 3959.5 L83954 4000 L72316.75 4132.322832474172 L72316.8 4132.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M83936.8 3948.8 L83935.8 3959.5 L83927.1 3953.2 L83928.1 3942.5 Z"></path>
-					</g>
-					<path d="M83823.9 1785.9 L83883.5 1936 L83883.5 2625 L83883.5 2625 L83883.5 3314 L83883.5 3314 L83883.5 3500.5 L83883.5 3500.5 L83883.5 3687 L83883.5 3687 L83883.5 3744.5 L83883.5 3744.5 " fill="none"></path>
-					<path d="M83828.8 1783.9 L83823.9 1785.9 L83818.9 1787.9 L83818.9 1773.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M74820.2 150.4 L75437 293 L75437 614 L75437.0 614.0 " fill="none"></path>
-					</g>
-					<path d="M74821.4 145.2 L74820.2 150.4 L74819.0 155.6 L74807.3 147.4 Z"></path>
-					<path d="M75363.5 645.3 L73875.5 966 L73875.5 1197 L73875.5 1197.0 " fill="none"></path>
-					<path d="M75364.6 650.6 L75363.5 645.3 L75362.3 640.1 L75376.5 642.5 Z"></path>
-					<path d="M75365.4 648.4 L74163 966 L74163 1197 L74163.0 1197.0 " fill="none"></path>
-					<path d="M75366.8 653.6 L75365.4 648.4 L75364.1 643.2 L75378.3 645.0 Z"></path>
-					<path d="M75379.6 649.4 L74463.5 966 L74463.5 1197 L74463.5 1197.0 " fill="none"></path>
-					<path d="M75381.3 654.4 L75379.6 649.4 L75377.8 644.3 L75392.2 645.0 Z"></path>
-					<path d="M75393.9 650.9 L74760 966 L74760 1197 L74760.0 1197.0 " fill="none"></path>
-					<path d="M75396.2 655.7 L75393.9 650.9 L75391.5 646.2 L75405.8 645.0 Z"></path>
-					<path d="M75410.2 654.0 L75068 966 L75068 1197 L75068.0 1197.0 " fill="none"></path>
-					<path d="M75413.7 657.9 L75410.2 654.0 L75406.6 650.0 L75420.0 645.0 Z"></path>
-					<path d="M75478.6 651.2 L76083 966 L76083 1197 L76083.0 1197.0 " fill="none"></path>
-					<path d="M75481.0 646.4 L75478.6 651.2 L75476.1 655.9 L75466.8 645.0 Z"></path>
-					<path d="M75493.3 649.5 L76386.5 966 L76386.5 1197 L76386.5 1197.0 " fill="none"></path>
-					<path d="M75495.1 644.4 L75493.3 649.5 L75491.5 654.5 L75480.7 645.0 Z"></path>
-					<path d="M75507.1 648.5 L76680 966 L76680 1197 L76680.0 1197.0 " fill="none"></path>
-					<path d="M75508.5 643.3 L75507.1 648.5 L75505.7 653.6 L75494.3 645.0 Z"></path>
-					<path d="M75510.5 645.4 L76991 966 L76991 1197 L76991.0 1197.0 " fill="none"></path>
-					<path d="M75511.7 640.2 L75510.5 645.4 L75509.4 650.6 L75497.5 642.6 Z"></path>
-					<path d="M75510.6 643.1 L77264.5 966 L77264.5 1197 L77264.5 1197.0 " fill="none"></path>
-					<path d="M75511.6 637.8 L75510.6 643.1 L75509.6 648.3 L75497.5 640.6 Z"></path>
-					<path d="M76804.0 4639.7 L76804 4641 L76621 4666.627218934911 L76621.0 4666.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M76809.3 4630.3 L76804.0 4639.7 L76798.7 4630.3 L76804.0 4621.0 Z"></path>
-					</g>
-					<path d="M76283.2 4174.7 L76195.5 4268 L76564.5 4381.095316351684 L76564.5 4381.1 " fill="none"></path>
-					<path d="M76287.1 4178.4 L76283.2 4174.7 L76279.3 4171.1 L76292.4 4165.0 Z"></path>
-					<path d="M76626.0 4215.8 L76626 4268 L76645.08847184987 4288 L76645.1 4288.0 " fill="none"></path>
-					<path d="M76631.3 4215.8 L76626.0 4215.8 L76620.7 4215.8 L76626.0 4202.5 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M76982.0 4253.3 L76982 4268 L76962.91152815013 4288 L76962.9 4288.0 " fill="none"></path>
-					</g>
-					<path d="M76987.3 4253.3 L76982.0 4253.3 L76976.7 4253.3 L76982.0 4240.0 Z"></path>
-					<path d="M60148.0 3916.2 L60148 4000 L76856.5 4133.0010098609955 L76856.5 4133.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M60153.3 3906.8 L60148.0 3916.2 L60142.7 3906.8 L60148.0 3897.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M60148.0 3552.3 L60148 3687 L60148 3789.5 L60148.0 3789.5 " fill="none"></path>
-					</g>
-					<path d="M60153.3 3552.3 L60148.0 3552.3 L60142.7 3552.3 L60148.0 3539.0 Z"></path>
-					<path d="M69803.3 3570.4 L69573.5 3687 L69573.5 3843.5 L69573.5 3843.5 L69573.5 4000 L69573.5 4000 L72429 4131.467789039684 L72429.0 4131.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M69814.1 3571.0 L69803.3 3570.4 L69809.2 3561.5 L69820.0 3562.0 Z"></path>
-					</g>
-					<path d="M70259.3 3910.8 L70049.75 4000 L76856.5 4131.574092105738 L76856.5 4131.6 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M70270.0 3912.1 L70259.3 3910.8 L70265.8 3902.3 L70276.5 3903.5 Z"></path>
-					</g>
-					<path d="M70259.7 3918.9 L70089.75 4000 L72021.75 4124.495311372926 L72021.8 4124.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M70270.4 3919.7 L70259.7 3918.9 L70265.8 3910.0 L70276.5 3910.8 Z"></path>
-					</g>
-					<path d="M70481.8 3943.2 L70518.5 4000 L76773.5 4133.540986218434 L76773.5 4133.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M70481.3 3932.5 L70481.8 3943.2 L70472.3 3938.2 L70471.7 3927.5 Z"></path>
-					</g>
-					<path d="M70505.7 3941.4 L70558.5 4000 L72429 4130.172422747339 L72429.0 4130.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M70503.4 3930.9 L70505.7 3941.4 L70495.5 3938.0 L70493.2 3927.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M70083.7 3556.3 L70417.5 3687 L70417.5 3759.5 L70417.5 3759.5 " fill="none"></path>
-					</g>
-					<path d="M70085.6 3551.3 L70083.7 3556.3 L70081.7 3561.2 L70071.3 3551.4 Z"></path>
-					<path d="M3705.0 3450.3 L3717 3447 L3724.5 3447 L3724.5 3447 L3732 3500.5 L3732 3500.5 L3724.5 3554 L3724.5 3554 L3717 3554 L3717 3554 L3687 3545.8527918781724 L3687.0 3545.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3694.6 3447.6 L3705.0 3450.3 L3697.4 3457.8 L3687.0 3455.1 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3550.8 2650.7 L4105.5 3314 L3687 3447.3052946199828 L3687.0 3447.3 " fill="none"></path>
-					</g>
-					<path d="M3554.9 2647.3 L3550.8 2650.7 L3546.7 2654.1 L3542.2 2640.5 Z"></path>
-					<path d="M72003.1 4141.0 L68993.25 4268 L68993.25 4454.5 L68993.25 4454.5 L68993.25 4641 L68993.25 4641 L72089.75 4676.198767211015 L72089.8 4676.2 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72012.6 4145.9 L72003.1 4141.0 L72012.2 4135.3 L72021.8 4140.2 Z"></path>
-					</g>
-					<path d="M72335.4 4140.2 L75769.75 4268 L75769.75 4454.5 L75769.75 4454.5 L75769.75 4641 L75769.75 4641 L75897 4668.090704647676 L75897.0 4668.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M72326.3 4134.5 L72335.4 4140.2 L72325.9 4145.2 L72316.8 4139.5 Z"></path>
-					</g>
-					<path d="M19271.0 3887.8 L19271 4000 L72021.75 4133.626358149844 L72021.8 4133.6 " fill="none"></path>
-					<path d="M19276.3 3887.8 L19271.0 3887.8 L19265.7 3887.8 L19271.0 3874.5 Z"></path>
-					<path d="M76021.0 4615.2 L76008 4641 L76480 4671.8866359447 L76480.0 4671.9 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M76029.9 4609.2 L76021.0 4615.2 L76020.4 4604.4 L76029.4 4598.5 Z"></path>
-					</g>
-					<path d="M76055.1 4616.4 L76048 4641 L76099.40845070423 4661 L76099.4 4661.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M76062.8 4608.9 L76055.1 4616.4 L76052.5 4606.0 L76060.2 4598.5 Z"></path>
-					</g>
-					<path d="M76148.4 4616.4 L76155.5 4641 L75976 4670.097031963471 L75976.0 4670.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M76151.0 4606.0 L76148.4 4616.4 L76140.7 4608.9 L76143.3 4598.5 Z"></path>
-					</g>
-					<path d="M76182.5 4615.2 L76195.5 4641 L72142.75 4676.269381626525 L72142.8 4676.3 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M76183.1 4604.4 L76182.5 4615.2 L76173.6 4609.2 L76174.1 4598.5 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M72330.1 4139.5 L76101.75 4268 L76101.75 4310.5 L76101.8 4310.5 " fill="none"></path>
-					</g>
-					<path d="M72330.3 4134.1 L72330.1 4139.5 L72329.9 4144.8 L72316.8 4139.0 Z"></path>
-					<path d="M79802.8 168.9 L79478 293 L79478 614 L79478.0 614.0 " fill="none"></path>
-					<path d="M79804.7 173.9 L79802.8 168.9 L79800.9 164.0 L79815.3 164.2 Z"></path>
-					<path d="M76328.9 4183.5 L76341.5 4268 L76341.5 4454.5 L76341.5 4454.5 L76341.5 4641 L76341.5 4641 L76480 4664.525119617225 L76480.0 4664.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M76332.8 4173.4 L76328.9 4183.5 L76322.2 4175.0 L76326.1 4165.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M74820.6 140.1 L77364.75 293 L77364.75 583.5 L77364.8 583.5 " fill="none"></path>
-					</g>
-					<path d="M74820.9 134.8 L74820.6 140.1 L74820.2 145.4 L74807.3 139.3 Z"></path>
-					<path d="M60217.8 2772.7 L60217.75 3314 L35468.5 3500.0902131734115 L35468.5 3500.1 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M60223.1 2763.3 L60217.8 2772.7 L60212.4 2763.3 L60217.8 2754.0 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M74820.6 139.8 L77609.75 293 L77609.75 614 L77609.8 614.0 " fill="none"></path>
-					</g>
-					<path d="M74820.9 134.5 L74820.6 139.8 L74820.3 145.1 L74807.3 139.1 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M77609.8 658.3 L77609.75 966 L77609.75 1197 L77609.8 1197.0 " fill="none"></path>
-					</g>
-					<path d="M77615.1 658.3 L77609.8 658.3 L77604.4 658.3 L77609.8 645.0 Z"></path>
-					<g stroke-dasharray="6 6">
-						<path d="M83610.3 175.6 L83764.5 293 L83764.5 501 L83764.5 501.0 " fill="none"></path>
-					</g>
-					<path d="M83613.5 171.3 L83610.3 175.6 L83607.1 179.8 L83599.7 167.5 Z"></path>
-					<path d="M83788.6 1457.6 L83788.75 1459 L83788.75 1621.5 L83788.8 1621.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M83793.0 1447.8 L83788.6 1457.6 L83782.4 1448.8 L83786.8 1439.0 Z"></path>
-					</g>
-					<path d="M84054.6 1450.9 L84064.5 1459 L84064.5 1697.5 L84064.5 1697.5 L84064.5 1936 L84064.5 1936 L84064.5 2625 L84064.5 2625 L84064.5 3314 L84064.5 3314 L84064.5 3500.5 L84064.5 3500.5 L84064.5 3687 L84064.5 3687 L84064.5 3843.5 L84064.5 3843.5 L84064.5 4000 L84064.5 4000 L63661.75 4133.525524718868 L63661.8 4133.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M84050.8 1440.8 L84054.6 1450.9 L84044.0 1449.0 L84040.2 1439.0 Z"></path>
-					</g>
-					<path d="M83764.5 771.3 L83764.5 966 L83764.5 986 L83764.5 986.0 " fill="none"></path>
-					<path d="M83769.8 771.3 L83764.5 771.3 L83759.2 771.3 L83764.5 758.0 Z"></path>
-					<path d="M79814.2 182.0 L79635 293 L79635 614 L79635.0 614.0 " fill="none"></path>
-					<path d="M79817.0 186.6 L79814.2 182.0 L79811.4 177.5 L79825.6 175.0 Z"></path>
-					<path d="M79849.0 185.5 L79764 293 L79764 614 L79764.0 614.0 " fill="none"></path>
-					<path d="M79853.2 188.8 L79849.0 185.5 L79844.9 182.2 L79857.3 175.0 Z"></path>
-					<path d="M79973.2 156.5 L80558.25 293 L80558.25 614 L80558.3 614.0 " fill="none"></path>
-					<path d="M79974.4 151.3 L79973.2 156.5 L79972.0 161.6 L79960.3 153.4 Z"></path>
-					<path d="M79973.3 153.3 L80683.75 293 L80683.75 614 L80683.8 614.0 " fill="none"></path>
-					<path d="M79974.4 148.1 L79973.3 153.3 L79972.3 158.6 L79960.3 150.8 Z"></path>
-					<g data-name="Config">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Config">
-							<rect x="25850.3" y="60.5" height="152.0" width="396.0" data-name="Config"></rect>
-							<path d="M25850.3 91.5 L26246.3 91.5" fill="none" data-name="Config"></path>
-						</g>
-						<g transform="translate(25850.25, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Config">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Config">
-								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="Config">Config</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25850.25, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Config">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Config">
-								<text x="0.0" y="13.5" stroke="none" data-name="Config">&lt;static&gt;+isDebugMode: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Config">&lt;static&gt;+defaultLocale: Set&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Config">&lt;static&gt;+supportedLocales: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Config">&lt;static&gt;+newStudyId: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Config">&lt;static&gt;+newModelId: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Config">&lt;static&gt;+minSplashTime: int</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Config">&lt;static&gt;+formAutosaveDebounce: int</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyMonitorData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorData">
-							<rect x="26286.3" y="83.0" height="107.0" width="264.0" data-name="StudyMonitorData"></rect>
-							<path d="M26286.3 114.0 L26550.3 114.0" fill="none" data-name="StudyMonitorData"></path>
-						</g>
-						<g transform="translate(26286.25, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorData">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorData">StudyMonitorData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26286.25, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorData">+activeParticipants: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorData">+dropoutParticipants: int</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorData">+completedParticipants: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorData">+items: List&lt;StudyMonitorItem&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyMonitorItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorItem">
-							<rect x="22360.3" y="2496.5" height="257.0" width="363.0" data-name="StudyMonitorItem"></rect>
-							<path d="M22360.3 2527.5 L22723.3 2527.5" fill="none" data-name="StudyMonitorItem"></path>
-						</g>
-						<g transform="translate(22360.25, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorItem">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorItem">StudyMonitorItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22360.25, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorItem">+participantId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorItem">+inviteCode: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorItem">+enrolledAt: DateTime</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorItem">+lastActivityAt: DateTime</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyMonitorItem">+currentDayOfStudy: int</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyMonitorItem">+studyDurationInDays: int</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyMonitorItem">+completedInterventions: int</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyMonitorItem">+missedInterventions: int</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyMonitorItem">+completedSurveys: int</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyMonitorItem">+missedSurveys: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyMonitorItem">+droppedOut: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyMonitorItem">+missedTasksPerDay: List&lt;Set&lt;String&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyMonitorItem">+completedTasksPerDay: List&lt;Set&lt;String&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyMonitorItem">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="64.0" y="1682.0" height="31.0" width="96.0" data-name="Equatable"></rect>
-						</g>
-						<g transform="translate(64, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ResultTypes">
-							<rect x="26590.3" y="121.0" height="31.0" width="114.0" data-name="ResultTypes"></rect>
-						</g>
-						<g transform="translate(26590.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ResultTypes">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ResultTypes">ResultTypes</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementResultTypes">
-							<rect x="26221.3" y="591.0" height="77.0" width="252.0" data-name="MeasurementResultTypes"></rect>
-							<path d="M26221.3 622.0 L26473.3 622.0" fill="none" data-name="MeasurementResultTypes"></path>
-						</g>
-						<g transform="translate(26221.25, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementResultTypes">
-								<text x="118.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementResultTypes">MeasurementResultTypes</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26221.25, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementResultTypes">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+questionnaire: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionResultTypes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionResultTypes">
-							<rect x="26513.3" y="591.0" height="77.0" width="268.0" data-name="InterventionResultTypes"></rect>
-							<path d="M26513.3 622.0 L26781.3 622.0" fill="none" data-name="InterventionResultTypes"></path>
-						</g>
-						<g transform="translate(26513.25, 591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionResultTypes">
-								<text x="126.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionResultTypes">InterventionResultTypes</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26513.25, 622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionResultTypes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionResultTypes">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+checkmarkTask: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionResultTypes">&lt;static&gt;+values: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyExportData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyExportData">
-							<rect x="424.0" y="2564.0" height="122.0" width="414.0" data-name="StudyExportData"></rect>
-							<path d="M424.0 2595.0 L838.0 2595.0" fill="none" data-name="StudyExportData"></path>
-						</g>
-						<g transform="translate(424, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyExportData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyExportData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyExportData">StudyExportData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(424, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyExportData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyExportData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyExportData">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyExportData">+measurementsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyExportData">+interventionsData: List&lt;Map&lt;String, dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyExportData">+mediaData: List&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyExportData">+isEmpty: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Study">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Study">
-							<rect x="64459.0" y="3485.0" height="31.0" width="61.0" data-name="Study"></rect>
-						</g>
-						<g transform="translate(64459, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Study">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Study">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Study">Study</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTemplates">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTemplates">
-							<rect x="26744.3" y="90.0" height="93.0" width="307.0" data-name="StudyTemplates"></rect>
-							<path d="M26744.3 121.0 L27051.3 121.0" fill="none" data-name="StudyTemplates"></path>
-							<path d="M26744.3 152.0 L27051.3 152.0" fill="none" data-name="StudyTemplates"></path>
-						</g>
-						<g transform="translate(26744.25, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTemplates">
-								<text x="145.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTemplates">StudyTemplates</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26744.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+kUnnamedStudyTitle: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26744.25, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTemplates">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTemplates">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTemplates">&lt;static&gt;+Study emptyDraft()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyActionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyActionType">
-							<rect x="492.0" y="3402.0" height="197.0" width="358.0" data-name="StudyActionType"></rect>
-							<path d="M492.0 3433.0 L850.0 3433.0" fill="none" data-name="StudyActionType"></path>
-						</g>
-						<g transform="translate(492, 3402)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyActionType">
-								<text x="171.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyActionType">StudyActionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(492, 3433)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyActionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyActionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+values: List&lt;StudyActionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pin: StudyActionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+pinoff: StudyActionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+edit: StudyActionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicate: StudyActionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+duplicateDraft: StudyActionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+addCollaborator: StudyActionType</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+export: StudyActionType</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyActionType">&lt;static&gt;+delete: StudyActionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="3498.8" y="2609.5" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(3498.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Notifications">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Notifications">
-							<rect x="4059.0" y="2541.5" height="167.0" width="407.0" data-name="Notifications"></rect>
-							<path d="M4059.0 2572.5 L4466.0 2572.5" fill="none" data-name="Notifications"></path>
-						</g>
-						<g transform="translate(4059, 2541.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Notifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notifications">
-								<text x="195.5" y="13.5" stroke="none" text-anchor="middle" data-name="Notifications">Notifications</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4059, 2572.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Notifications">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Notifications">
-								<text x="0.0" y="13.5" stroke="none" data-name="Notifications">&lt;static&gt;+credentialsInvalid: SnackbarIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Notifications">&lt;static&gt;+userAlreadyRegistered: SnackbarIntent</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordReset: SnackbarIntent</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Notifications">&lt;static&gt;+passwordResetSuccess: SnackbarIntent</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleted: SnackbarIntent</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeDeleted: SnackbarIntent</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Notifications">&lt;static&gt;+inviteCodeClipped: SnackbarIntent</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Notifications">&lt;static&gt;+studyDeleteConfirmation: AlertIntent</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SnackbarIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SnackbarIntent">
-							<rect x="3777.0" y="3469.5" height="62.0" width="136.0" data-name="SnackbarIntent"></rect>
-							<path d="M3777.0 3500.5 L3913.0 3500.5" fill="none" data-name="SnackbarIntent"></path>
-						</g>
-						<g transform="translate(3777, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackbarIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackbarIntent">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackbarIntent">SnackbarIntent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3777, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SnackbarIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SnackbarIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="SnackbarIntent">+duration: int?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AlertIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AlertIntent">
-							<rect x="3953.0" y="3454.5" height="92.0" width="204.0" data-name="AlertIntent"></rect>
-							<path d="M3953.0 3485.5 L4157.0 3485.5" fill="none" data-name="AlertIntent"></path>
-						</g>
-						<g transform="translate(3953, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AlertIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AlertIntent">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="AlertIntent">AlertIntent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3953, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AlertIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AlertIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="AlertIntent">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AlertIntent">+dismissOnAction: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AlertIntent">+isDestructive: dynamic</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationDefaultActions">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDefaultActions">
-							<rect x="2148.0" y="3469.5" height="62.0" width="287.0" data-name="NotificationDefaultActions"></rect>
-							<path d="M2148.0 3500.5 L2435.0 3500.5" fill="none" data-name="NotificationDefaultActions"></path>
-						</g>
-						<g transform="translate(2148, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDefaultActions">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDefaultActions">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDefaultActions">NotificationDefaultActions</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2148, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDefaultActions">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDefaultActions">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDefaultActions">&lt;static&gt;+cancel: NotificationAction</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationAction">
-							<rect x="2163.5" y="3797.5" height="92.0" width="256.0" data-name="NotificationAction"></rect>
-							<path d="M2163.5 3828.5 L2419.5 3828.5" fill="none" data-name="NotificationAction"></path>
-						</g>
-						<g transform="translate(2163.5, 3797.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationAction">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationAction">NotificationAction</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2163.5, 3828.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationAction">+label: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationAction">+onSelect: dynamic Function()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationAction">+isDestructive: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="INotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="INotificationService">
-							<rect x="61624.0" y="3447.0" height="107.0" width="395.0" data-name="INotificationService"></rect>
-							<path d="M61624.0 3478.0 L62019.0 3478.0" fill="none" data-name="INotificationService"></path>
-						</g>
-						<g transform="translate(61624, 3447)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="INotificationService">
-								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="INotificationService">INotificationService</text>
-								
-							</g>
-						</g>
-						<g transform="translate(61624, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="INotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="INotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="INotificationService">+void showMessage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="INotificationService">+void show()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="INotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="INotificationService">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationService">
-							<rect x="61594.0" y="3774.5" height="138.0" width="455.0" data-name="NotificationService"></rect>
-							<path d="M61594.0 3805.5 L62049.0 3805.5" fill="none" data-name="NotificationService"></path>
-							<path d="M61594.0 3836.5 L62049.0 3836.5" fill="none" data-name="NotificationService"></path>
-						</g>
-						<g transform="translate(61594, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationService">
-								<text x="219.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationService">NotificationService</text>
-								
-							</g>
-						</g>
-						<g transform="translate(61594, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">-_streamController: BehaviorSubject&lt;NotificationIntent&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(61594, 3836.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationService">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationService">+Stream&lt;NotificationIntent&gt; watchNotifications()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationService">+void showMessage()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationService">+void show()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationService">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BehaviorSubject">
-							<rect x="63516.8" y="4118.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
-						</g>
-						<g transform="translate(63516.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BehaviorSubject">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="BehaviorSubject">BehaviorSubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationIntent">
-							<rect x="4506.0" y="2548.5" height="153.0" width="288.0" data-name="NotificationIntent"></rect>
-							<path d="M4506.0 2579.5 L4794.0 2579.5" fill="none" data-name="NotificationIntent"></path>
-							<path d="M4506.0 2670.5 L4794.0 2670.5" fill="none" data-name="NotificationIntent"></path>
-						</g>
-						<g transform="translate(4506, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationIntent">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationIntent">NotificationIntent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4506, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+message: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationIntent">+customContent: Widget?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationIntent">+icon: IconData?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationIntent">+actions: List&lt;NotificationAction&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationIntent">+type: NotificationType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4506, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationIntent">+void register()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget">
-							<rect x="21189.0" y="3485.0" height="31.0" width="71.0" data-name="Widget"></rect>
-						</g>
-						<g transform="translate(21189, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Widget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget">
-								<text x="27.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget">Widget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="25956.3" y="3485.0" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(25956.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationType">
-							<rect x="1733.0" y="3439.5" height="122.0" width="325.0" data-name="NotificationType"></rect>
-							<path d="M1733.0 3470.5 L2058.0 3470.5" fill="none" data-name="NotificationType"></path>
-						</g>
-						<g transform="translate(1733, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationType">
-								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationType">NotificationType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1733, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationType">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationType">&lt;static&gt;+values: List&lt;NotificationType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationType">&lt;static&gt;+snackbar: NotificationType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationType">&lt;static&gt;+alert: NotificationType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationType">&lt;static&gt;+custom: NotificationType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="7295.3" y="4118.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(7295.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IClipboardService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IClipboardService">
-							<rect x="27091.3" y="105.5" height="62.0" width="156.0" data-name="IClipboardService"></rect>
-							<path d="M27091.3 136.5 L27247.3 136.5" fill="none" data-name="IClipboardService"></path>
-						</g>
-						<g transform="translate(27091.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IClipboardService">
-								<text x="70.0" y="13.5" stroke="none" text-anchor="middle" data-name="IClipboardService">IClipboardService</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27091.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IClipboardService">
-								<text x="0.0" y="13.5" stroke="none" data-name="IClipboardService">+dynamic copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ClipboardService">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ClipboardService">
-							<rect x="27093.8" y="598.5" height="62.0" width="151.0" data-name="ClipboardService"></rect>
-							<path d="M27093.8 629.5 L27244.8 629.5" fill="none" data-name="ClipboardService"></path>
-						</g>
-						<g transform="translate(27093.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ClipboardService">
-								<text x="67.5" y="13.5" stroke="none" text-anchor="middle" data-name="ClipboardService">ClipboardService</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27093.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ClipboardService">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ClipboardService">
-								<text x="0.0" y="13.5" stroke="none" data-name="ClipboardService">+dynamic copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NotificationDispatcher">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NotificationDispatcher">
-							<rect x="5800.5" y="2564.0" height="122.0" width="325.0" data-name="NotificationDispatcher"></rect>
-							<path d="M5800.5 2595.0 L6125.5 2595.0" fill="none" data-name="NotificationDispatcher"></path>
-						</g>
-						<g transform="translate(5800.5, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NotificationDispatcher">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NotificationDispatcher">
-								<text x="154.5" y="13.5" stroke="none" text-anchor="middle" data-name="NotificationDispatcher">NotificationDispatcher</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5800.5, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NotificationDispatcher">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NotificationDispatcher">
-								<text x="0.0" y="13.5" stroke="none" data-name="NotificationDispatcher">+child: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NotificationDispatcher">+snackbarInnerPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NotificationDispatcher">+snackbarWidth: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NotificationDispatcher">+snackbarBehavior: SnackBarBehavior</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="NotificationDispatcher">+snackbarDefaultDuration: int</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SnackBarBehavior">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SnackBarBehavior">
-							<rect x="4197.0" y="3485.0" height="31.0" width="162.0" data-name="SnackBarBehavior"></rect>
-						</g>
-						<g transform="translate(4197, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SnackBarBehavior">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SnackBarBehavior">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="SnackBarBehavior">SnackBarBehavior</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Assets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Assets">
-							<rect x="27287.3" y="105.5" height="62.0" width="218.0" data-name="Assets"></rect>
-							<path d="M27287.3 136.5 L27505.3 136.5" fill="none" data-name="Assets"></path>
-						</g>
-						<g transform="translate(27287.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Assets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Assets">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="Assets">Assets</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27287.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Assets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Assets">
-								<text x="0.0" y="13.5" stroke="none" data-name="Assets">&lt;static&gt;+logoWide: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AsyncValueWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValueWidget">
-							<rect x="6165.5" y="2526.0" height="198.0" width="384.0" data-name="AsyncValueWidget"></rect>
-							<path d="M6165.5 2557.0 L6549.5 2557.0" fill="none" data-name="AsyncValueWidget"></path>
-							<path d="M6165.5 2648.0 L6549.5 2648.0" fill="none" data-name="AsyncValueWidget"></path>
-						</g>
-						<g transform="translate(6165.5, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValueWidget">
-								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValueWidget">AsyncValueWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6165.5, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+value: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">+data: Widget Function(T)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">+error: Widget Function(Object, StackTrace?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">+loading: Widget Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AsyncValueWidget">+empty: Widget Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6165.5, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AsyncValueWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AsyncValueWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="AsyncValueWidget">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AsyncValueWidget">-Widget _buildDataOrEmptyWidget()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AsyncValueWidget">-Widget _defaultLoad()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AsyncValue">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AsyncValue">
-							<rect x="35359.5" y="3485.0" height="31.0" width="109.0" data-name="AsyncValue"></rect>
-						</g>
-						<g transform="translate(35359.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AsyncValue">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AsyncValue">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AsyncValue">AsyncValue</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(T)">
-							<rect x="29511.5" y="3485.0" height="31.0" width="166.0" data-name="Widget Function(T)"></rect>
-						</g>
-						<g transform="translate(29511.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(T)">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(T)">Widget Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(Object, StackTrace?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Object, StackTrace?)?">
-							<rect x="4399.0" y="3485.0" height="31.0" width="326.0" data-name="Widget Function(Object, StackTrace?)?"></rect>
-						</g>
-						<g transform="translate(4399, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Object, StackTrace?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Object, StackTrace?)?">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Object, StackTrace?)?">Widget Function(Object, StackTrace?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function()?">
-							<rect x="4765.0" y="3485.0" height="31.0" width="166.0" data-name="Widget Function()?"></rect>
-						</g>
-						<g transform="translate(4765, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function()?">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function()?">Widget Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControlLabel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlLabel">
-							<rect x="6658.5" y="2548.5" height="153.0" width="430.0" data-name="FormControlLabel"></rect>
-							<path d="M6658.5 2579.5 L7088.5 2579.5" fill="none" data-name="FormControlLabel"></path>
-							<path d="M6658.5 2670.5 L7088.5 2670.5" fill="none" data-name="FormControlLabel"></path>
-						</g>
-						<g transform="translate(6658.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlLabel">
-								<text x="207.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlLabel">FormControlLabel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6658.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+formControl: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlLabel">+text: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlLabel">+isClickable: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlLabel">+textStyle: TextStyle?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormControlLabel">+onClick: void Function(AbstractControl&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6658.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlLabel">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AbstractControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AbstractControl">
-							<rect x="24200.3" y="3485.0" height="31.0" width="138.0" data-name="AbstractControl"></rect>
-						</g>
-						<g transform="translate(24200.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="AbstractControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AbstractControl">
-								<text x="61.0" y="13.5" stroke="none" text-anchor="middle" data-name="AbstractControl">AbstractControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TextStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextStyle">
-							<rect x="10582.0" y="3485.0" height="31.0" width="89.0" data-name="TextStyle"></rect>
-						</g>
-						<g transform="translate(10582, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextStyle">
-								<text x="36.5" y="13.5" stroke="none" text-anchor="middle" data-name="TextStyle">TextStyle</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<rect x="4971.0" y="3485.0" height="31.0" width="352.0" data-name="void Function(AbstractControl&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(4971, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(AbstractControl&lt;dynamic&gt;)?">void Function(AbstractControl&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ActionPopUpMenuButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionPopUpMenuButton">
-							<rect x="7252.3" y="2496.0" height="258.0" width="324.0" data-name="ActionPopUpMenuButton"></rect>
-							<path d="M7252.3 2527.0 L7576.3 2527.0" fill="none" data-name="ActionPopUpMenuButton"></path>
-							<path d="M7252.3 2708.0 L7576.3 2708.0" fill="none" data-name="ActionPopUpMenuButton"></path>
-						</g>
-						<g transform="translate(7252.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionPopUpMenuButton">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionPopUpMenuButton">ActionPopUpMenuButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7252.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColor: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconColorHover: Color?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionPopUpMenuButton">+triggerIconSize: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ActionPopUpMenuButton">+disableSplashEffect: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ActionPopUpMenuButton">+hideOnEmpty: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ActionPopUpMenuButton">+orientation: Axis</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ActionPopUpMenuButton">+elevation: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ActionPopUpMenuButton">+splashRadius: double?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ActionPopUpMenuButton">+enabled: bool</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ActionPopUpMenuButton">+position: PopupMenuPosition</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7252.25, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionPopUpMenuButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionPopUpMenuButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionPopUpMenuButton">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionPopUpMenuButton">-Widget _buildPopupMenu()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="21300.0" y="3485.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(21300, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Axis">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Axis">
-							<rect x="6087.3" y="3485.0" height="31.0" width="49.0" data-name="Axis"></rect>
-						</g>
-						<g transform="translate(6087.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Axis">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Axis">
-								<text x="16.5" y="13.5" stroke="none" text-anchor="middle" data-name="Axis">Axis</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PopupMenuPosition">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PopupMenuPosition">
-							<rect x="6176.3" y="3485.0" height="31.0" width="174.0" data-name="PopupMenuPosition"></rect>
-						</g>
-						<g transform="translate(6176.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PopupMenuPosition">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PopupMenuPosition">
-								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="PopupMenuPosition">PopupMenuPosition</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Search">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Search">
-							<rect x="7634.5" y="2571.5" height="107.0" width="373.0" data-name="Search"></rect>
-							<path d="M7634.5 2602.5 L8007.5 2602.5" fill="none" data-name="Search"></path>
-						</g>
-						<g transform="translate(7634.5, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Search">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Search">
-								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="Search">Search</text>
-								
-							</g>
-						</g>
-						<g transform="translate(7634.5, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Search">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Search">
-								<text x="0.0" y="13.5" stroke="none" data-name="Search">+onQueryChanged: dynamic Function(String)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Search">+searchController: SearchController?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Search">+hintText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Search">+initialText: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(String)">
-							<rect x="6390.3" y="3485.0" height="31.0" width="213.0" data-name="dynamic Function(String)"></rect>
-						</g>
-						<g transform="translate(6390.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(String)">
-								<text x="98.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(String)">dynamic Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SearchController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SearchController">
-							<rect x="40261.3" y="3469.5" height="62.0" width="258.0" data-name="SearchController"></rect>
-							<path d="M40261.3 3500.5 L40519.3 3500.5" fill="none" data-name="SearchController"></path>
-						</g>
-						<g transform="translate(40261.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SearchController">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="SearchController">SearchController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(40261.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SearchController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SearchController">
-								<text x="0.0" y="13.5" stroke="none" data-name="SearchController">+setText: void Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(String)">
-							<rect x="40300.3" y="3828.0" height="31.0" width="180.0" data-name="void Function(String)"></rect>
-						</g>
-						<g transform="translate(40300.25, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(String)">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(String)">void Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormScaffold">
-							<rect x="8047.5" y="2556.5" height="137.0" width="212.0" data-name="FormScaffold"></rect>
-							<path d="M8047.5 2587.5 L8259.5 2587.5" fill="none" data-name="FormScaffold"></path>
-						</g>
-						<g transform="translate(8047.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormScaffold">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormScaffold">FormScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8047.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormScaffold">+formViewModel: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormScaffold">+actions: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormScaffold">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormScaffold">+actionsPadding: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConstrainedWidthFlexible">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConstrainedWidthFlexible">
-							<rect x="8299.5" y="2533.5" height="183.0" width="287.0" data-name="ConstrainedWidthFlexible"></rect>
-							<path d="M8299.5 2564.5 L8586.5 2564.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
-							<path d="M8299.5 2670.5 L8586.5 2670.5" fill="none" data-name="ConstrainedWidthFlexible"></path>
-						</g>
-						<g transform="translate(8299.5, 2533.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConstrainedWidthFlexible">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConstrainedWidthFlexible">ConstrainedWidthFlexible</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8299.5, 2564.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+minWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">+maxWidth: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConstrainedWidthFlexible">+flex: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConstrainedWidthFlexible">+flexSum: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConstrainedWidthFlexible">+child: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConstrainedWidthFlexible">+outerConstraints: BoxConstraints</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8299.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConstrainedWidthFlexible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConstrainedWidthFlexible">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConstrainedWidthFlexible">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConstrainedWidthFlexible">-double _getWidth()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoxConstraints">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoxConstraints">
-							<rect x="13267.0" y="3485.0" height="31.0" width="136.0" data-name="BoxConstraints"></rect>
-						</g>
-						<g transform="translate(13267, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxConstraints">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxConstraints">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxConstraints">BoxConstraints</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PrimaryButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PrimaryButton">
-							<rect x="8626.5" y="2511.5" height="227.0" width="333.0" data-name="PrimaryButton"></rect>
-							<path d="M8626.5 2542.5 L8959.5 2542.5" fill="none" data-name="PrimaryButton"></path>
-						</g>
-						<g transform="translate(8626.5, 2511.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PrimaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PrimaryButton">
-								<text x="158.5" y="13.5" stroke="none" text-anchor="middle" data-name="PrimaryButton">PrimaryButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8626.5, 2542.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PrimaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PrimaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="PrimaryButton">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PrimaryButton">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PrimaryButton">+isLoading: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PrimaryButton">+showLoadingEarliestAfterMs: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PrimaryButton">+onPressed: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PrimaryButton">+tooltip: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PrimaryButton">+tooltipDisabled: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PrimaryButton">+enabled: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PrimaryButton">+onPressedFuture: dynamic Function()?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="PrimaryButton">+innerPadding: EdgeInsets</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="PrimaryButton">+minimumSize: Size?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="PrimaryButton">+isDisabled: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="18072.8" y="4118.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(18072.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()?">
-							<rect x="11864.8" y="3485.0" height="31.0" width="177.0" data-name="dynamic Function()?"></rect>
-						</g>
-						<g transform="translate(11864.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()?">
-								<text x="80.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()?">dynamic Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EdgeInsets">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EdgeInsets">
-							<rect x="13453.5" y="3485.0" height="31.0" width="105.0" data-name="EdgeInsets"></rect>
-						</g>
-						<g transform="translate(13453.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EdgeInsets">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EdgeInsets">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="EdgeInsets">EdgeInsets</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Size">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Size">
-							<rect x="8867.0" y="3485.0" height="31.0" width="50.0" data-name="Size"></rect>
-						</g>
-						<g transform="translate(8867, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Size">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Size">
-								<text x="17.0" y="13.5" stroke="none" text-anchor="middle" data-name="Size">Size</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormTableRow">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRow">
-							<rect x="8999.5" y="2549.0" height="152.0" width="379.0" data-name="FormTableRow"></rect>
-							<path d="M8999.5 2580.0 L9378.5 2580.0" fill="none" data-name="FormTableRow"></path>
-						</g>
-						<g transform="translate(8999.5, 2549)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRow">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRow">FormTableRow</text>
-								
-							</g>
-						</g>
-						<g transform="translate(8999.5, 2580)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRow">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRow">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRow">+label: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRow">+labelBuilder: Widget Function(BuildContext)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRow">+labelStyle: TextStyle?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRow">+labelHelpText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormTableRow">+input: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormTableRow">+control: AbstractControl&lt;dynamic&gt;?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormTableRow">+layout: FormTableRowLayout?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
-							<rect x="8957.0" y="3485.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
-						</g>
-						<g transform="translate(8957, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormTableRowLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableRowLayout">
-							<rect x="6865.0" y="3447.0" height="107.0" width="370.0" data-name="FormTableRowLayout"></rect>
-							<path d="M6865.0 3478.0 L7235.0 3478.0" fill="none" data-name="FormTableRowLayout"></path>
-						</g>
-						<g transform="translate(6865, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableRowLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableRowLayout">
-								<text x="177.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableRowLayout">FormTableRowLayout</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6865, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableRowLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableRowLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableRowLayout">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+values: List&lt;FormTableRowLayout&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+vertical: FormTableRowLayout</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableRowLayout">&lt;static&gt;+horizontal: FormTableRowLayout</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormTableLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormTableLayout">
-							<rect x="9807.5" y="2548.5" height="153.0" width="379.0" data-name="FormTableLayout"></rect>
-							<path d="M9807.5 2579.5 L10186.5 2579.5" fill="none" data-name="FormTableLayout"></path>
-							<path d="M9807.5 2670.5 L10186.5 2670.5" fill="none" data-name="FormTableLayout"></path>
-						</g>
-						<g transform="translate(9807.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormTableLayout">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormTableLayout">FormTableLayout</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9807.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+rows: List&lt;FormTableRow&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormTableLayout">+columnWidths: Map&lt;int, TableColumnWidth&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormTableLayout">+rowDivider: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormTableLayout">+rowLayout: FormTableRowLayout?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormTableLayout">+rowLabelStyle: TextStyle?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9807.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormTableLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormTableLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormTableLayout">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormSectionHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSectionHeader">
-							<rect x="10226.5" y="2548.5" height="153.0" width="220.0" data-name="FormSectionHeader"></rect>
-							<path d="M10226.5 2579.5 L10446.5 2579.5" fill="none" data-name="FormSectionHeader"></path>
-							<path d="M10226.5 2670.5 L10446.5 2670.5" fill="none" data-name="FormSectionHeader"></path>
-						</g>
-						<g transform="translate(10226.5, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSectionHeader">
-								<text x="102.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormSectionHeader">FormSectionHeader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10226.5, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormSectionHeader">+titleTextStyle: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormSectionHeader">+helpText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormSectionHeader">+divider: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormSectionHeader">+helpTextDisabled: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10226.5, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSectionHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSectionHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSectionHeader">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormLabel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormLabel">
-							<rect x="10655.0" y="2556.0" height="138.0" width="266.0" data-name="FormLabel"></rect>
-							<path d="M10655.0 2587.0 L10921.0 2587.0" fill="none" data-name="FormLabel"></path>
-							<path d="M10655.0 2663.0 L10921.0 2663.0" fill="none" data-name="FormLabel"></path>
-						</g>
-						<g transform="translate(10655, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormLabel">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormLabel">FormLabel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10655, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+labelText: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormLabel">+helpText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormLabel">+labelTextStyle: TextStyle?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormLabel">+layout: FormTableRowLayout?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10655, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormLabel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormLabel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormLabel">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DismissButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DismissButton">
-							<rect x="15401.5" y="3789.5" height="108.0" width="249.0" data-name="DismissButton"></rect>
-							<path d="M15401.5 3820.5 L15650.5 3820.5" fill="none" data-name="DismissButton"></path>
-							<path d="M15401.5 3866.5 L15650.5 3866.5" fill="none" data-name="DismissButton"></path>
-						</g>
-						<g transform="translate(15401.5, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DismissButton">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="DismissButton">DismissButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15401.5, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+onPressed: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DismissButton">+text: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15401.5, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DismissButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DismissButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="DismissButton">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Badge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Badge">
-							<rect x="10961.0" y="2496.0" height="258.0" width="263.0" data-name="Badge"></rect>
-							<path d="M10961.0 2527.0 L11224.0 2527.0" fill="none" data-name="Badge"></path>
-							<path d="M10961.0 2678.0 L11224.0 2678.0" fill="none" data-name="Badge"></path>
-						</g>
-						<g transform="translate(10961, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Badge">
-								<text x="123.5" y="13.5" stroke="none" text-anchor="middle" data-name="Badge">Badge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10961, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
-								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+icon: IconData?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Badge">+color: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Badge">+borderRadius: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Badge">+label: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Badge">+type: BadgeType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Badge">+padding: EdgeInsets</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Badge">+iconSize: double?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Badge">+labelStyle: TextStyle?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Badge">+center: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10961, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Badge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Badge">
-								<text x="0.0" y="13.5" stroke="none" data-name="Badge">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Badge">-Color? _getBackgroundColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Badge">-Color _getBorderColor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Badge">-Color? _getLabelColor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BadgeType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BadgeType">
-							<rect x="24378.3" y="3432.0" height="137.0" width="288.0" data-name="BadgeType"></rect>
-							<path d="M24378.3 3463.0 L24666.3 3463.0" fill="none" data-name="BadgeType"></path>
-						</g>
-						<g transform="translate(24378.25, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BadgeType">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="BadgeType">BadgeType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24378.25, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BadgeType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BadgeType">
-								<text x="0.0" y="13.5" stroke="none" data-name="BadgeType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BadgeType">&lt;static&gt;+values: List&lt;BadgeType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BadgeType">&lt;static&gt;+filled: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlined: BadgeType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BadgeType">&lt;static&gt;+outlineFill: BadgeType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BadgeType">&lt;static&gt;+plain: BadgeType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StandardDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardDialog">
-							<rect x="11264.0" y="2488.5" height="273.0" width="247.0" data-name="StandardDialog"></rect>
-							<path d="M11264.0 2519.5 L11511.0 2519.5" fill="none" data-name="StandardDialog"></path>
-							<path d="M11264.0 2730.5 L11511.0 2730.5" fill="none" data-name="StandardDialog"></path>
-						</g>
-						<g transform="translate(11264, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardDialog">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardDialog">StandardDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11264, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+title: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardDialog">+titleText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardDialog">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardDialog">+actionButtons: List&lt;Widget&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardDialog">+backgroundColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardDialog">+borderRadius: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StandardDialog">+width: double?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StandardDialog">+height: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StandardDialog">+minWidth: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StandardDialog">+minHeight: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StandardDialog">+maxWidth: double?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StandardDialog">+maxHeight: double?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StandardDialog">+padding: EdgeInsets</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11264, 2730.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ISyncIndicatorViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ISyncIndicatorViewModel">
-							<rect x="27545.3" y="98.0" height="77.0" width="214.0" data-name="ISyncIndicatorViewModel"></rect>
-							<path d="M27545.3 129.0 L27759.3 129.0" fill="none" data-name="ISyncIndicatorViewModel"></path>
-						</g>
-						<g transform="translate(27545.25, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ISyncIndicatorViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ISyncIndicatorViewModel">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="ISyncIndicatorViewModel">ISyncIndicatorViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27545.25, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ISyncIndicatorViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ISyncIndicatorViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ISyncIndicatorViewModel">+isDirty: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ISyncIndicatorViewModel">+lastSynced: DateTime?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SyncIndicator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SyncIndicator">
-							<rect x="11551.0" y="2564.0" height="122.0" width="208.0" data-name="SyncIndicator"></rect>
-							<path d="M11551.0 2595.0 L11759.0 2595.0" fill="none" data-name="SyncIndicator"></path>
-						</g>
-						<g transform="translate(11551, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SyncIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SyncIndicator">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="SyncIndicator">SyncIndicator</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11551, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SyncIndicator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SyncIndicator">
-								<text x="0.0" y="13.5" stroke="none" data-name="SyncIndicator">+state: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SyncIndicator">+lastSynced: DateTime?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SyncIndicator">+isDirty: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SyncIndicator">+animationDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SyncIndicator">+iconSize: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IWithBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IWithBanner">
-							<rect x="15050.8" y="1181.5" height="62.0" width="164.0" data-name="IWithBanner"></rect>
-							<path d="M15050.8 1212.5 L15214.8 1212.5" fill="none" data-name="IWithBanner"></path>
-						</g>
-						<g transform="translate(15050.75, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IWithBanner">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="IWithBanner">IWithBanner</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15050.75, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IWithBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IWithBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="IWithBanner">+Widget? banner()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BannerBox">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BannerBox">
-							<rect x="11799.0" y="2534.0" height="182.0" width="298.0" data-name="BannerBox"></rect>
-							<path d="M11799.0 2565.0 L12097.0 2565.0" fill="none" data-name="BannerBox"></path>
-						</g>
-						<g transform="translate(11799, 2534)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerBox">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerBox">BannerBox</text>
-								
-							</g>
-						</g>
-						<g transform="translate(11799, 2565)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerBox">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerBox">
-								<text x="0.0" y="13.5" stroke="none" data-name="BannerBox">+prefixIcon: Widget?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BannerBox">+body: Widget</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BannerBox">+style: BannerStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BannerBox">+padding: EdgeInsets?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BannerBox">+noPrefix: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="BannerBox">+dismissable: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="BannerBox">+isDismissed: bool?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="BannerBox">+onDismissed: dynamic Function()?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="BannerBox">+dismissIconSize: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BannerStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BannerStyle">
-							<rect x="5363.0" y="3439.5" height="122.0" width="294.0" data-name="BannerStyle"></rect>
-							<path d="M5363.0 3470.5 L5657.0 3470.5" fill="none" data-name="BannerStyle"></path>
-						</g>
-						<g transform="translate(5363, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BannerStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BannerStyle">
-								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="BannerStyle">BannerStyle</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5363, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BannerStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BannerStyle">
-								<text x="0.0" y="13.5" stroke="none" data-name="BannerStyle">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+values: List&lt;BannerStyle&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+warning: BannerStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+info: BannerStyle</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="BannerStyle">&lt;static&gt;+error: BannerStyle</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ActionMenuInline">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuInline">
-							<rect x="27799.3" y="52.5" height="168.0" width="324.0" data-name="ActionMenuInline"></rect>
-							<path d="M27799.3 83.5 L28123.3 83.5" fill="none" data-name="ActionMenuInline"></path>
-							<path d="M27799.3 189.5 L28123.3 189.5" fill="none" data-name="ActionMenuInline"></path>
-						</g>
-						<g transform="translate(27799.25, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuInline">
-								<text x="154.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuInline">ActionMenuInline</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27799.25, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuInline">+iconSize: double?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuInline">+visible: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuInline">+splashRadius: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ActionMenuInline">+paddingVertical: double?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ActionMenuInline">+paddingHorizontal: double?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27799.25, 189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuInline">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuInline">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuInline">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Collapsible">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Collapsible">
-							<rect x="28163.3" y="83.0" height="107.0" width="441.0" data-name="Collapsible"></rect>
-							<path d="M28163.3 114.0 L28604.3 114.0" fill="none" data-name="Collapsible"></path>
-						</g>
-						<g transform="translate(28163.25, 83)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Collapsible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Collapsible">
-								<text x="212.5" y="13.5" stroke="none" text-anchor="middle" data-name="Collapsible">Collapsible</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28163.25, 114)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Collapsible">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Collapsible">
-								<text x="0.0" y="13.5" stroke="none" data-name="Collapsible">+contentBuilder: Widget Function(BuildContext, bool)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Collapsible">+headerBuilder: Widget Function(BuildContext, bool)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Collapsible">+title: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Collapsible">+isCollapsed: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, bool)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)">
-							<rect x="27284.8" y="614.0" height="31.0" width="300.0" data-name="Widget Function(BuildContext, bool)"></rect>
-						</g>
-						<g transform="translate(27284.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)">
-								<text x="142.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)">Widget Function(BuildContext, bool)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, bool)?">
-							<rect x="28228.8" y="614.0" height="31.0" width="310.0" data-name="Widget Function(BuildContext, bool)?"></rect>
-						</g>
-						<g transform="translate(28228.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, bool)?">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, bool)?">Widget Function(BuildContext, bool)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NavbarTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NavbarTab">
-							<rect x="61633.0" y="1644.0" height="107.0" width="196.0" data-name="NavbarTab"></rect>
-							<path d="M61633.0 1675.0 L61829.0 1675.0" fill="none" data-name="NavbarTab"></path>
-						</g>
-						<g transform="translate(61633, 1644)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NavbarTab">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="NavbarTab">NavbarTab</text>
-								
-							</g>
-						</g>
-						<g transform="translate(61633, 1675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NavbarTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NavbarTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="NavbarTab">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NavbarTab">+intent: RoutingIntent?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="NavbarTab">+index: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="NavbarTab">+enabled: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent">
-							<rect x="41854.8" y="2518.5" height="213.0" width="297.0" data-name="RoutingIntent"></rect>
-							<path d="M41854.8 2549.5 L42151.8 2549.5" fill="none" data-name="RoutingIntent"></path>
-							<path d="M41854.8 2685.5 L42151.8 2685.5" fill="none" data-name="RoutingIntent"></path>
-						</g>
-						<g transform="translate(41854.75, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent">RoutingIntent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41854.75, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">+route: GoRoute</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+params: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntent">+queryParams: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntent">+dispatch: RoutingIntentDispatch?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntent">+extra: Object?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntent">+routeName: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntent">+arguments: Map&lt;String, String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntent">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41854.75, 2685.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntent">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntent">-dynamic _validateRoute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntent">+bool matches()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TabbedNavbar">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TabbedNavbar">
-							<rect x="12386.3" y="2496.5" height="257.0" width="308.0" data-name="TabbedNavbar"></rect>
-							<path d="M12386.3 2527.5 L12694.3 2527.5" fill="none" data-name="TabbedNavbar"></path>
-						</g>
-						<g transform="translate(12386.25, 2496.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabbedNavbar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabbedNavbar">
-								<text x="146.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabbedNavbar">TabbedNavbar</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12386.25, 2527.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TabbedNavbar">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TabbedNavbar">
-								<text x="0.0" y="13.5" stroke="none" data-name="TabbedNavbar">+tabs: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TabbedNavbar">+selectedTab: T?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TabbedNavbar">+indicator: BoxDecoration?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TabbedNavbar">+height: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TabbedNavbar">+disabledBackgroundColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TabbedNavbar">+disabledTooltipText: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TabbedNavbar">+onSelect: void Function(int, T)?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TabbedNavbar">+labelPadding: EdgeInsets?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="TabbedNavbar">+labelSpacing: double?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="TabbedNavbar">+indicatorSize: TabBarIndicatorSize?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="TabbedNavbar">+isScrollable: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="TabbedNavbar">+backgroundColor: Color?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="TabbedNavbar">+labelColorHover: Color?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="TabbedNavbar">+unselectedLabelColorHover: Color?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoxDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoxDecoration">
-							<rect x="12081.8" y="3485.0" height="31.0" width="132.0" data-name="BoxDecoration"></rect>
-						</g>
-						<g transform="translate(12081.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoxDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoxDecoration">
-								<text x="58.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoxDecoration">BoxDecoration</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(int, T)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(int, T)?">
-							<rect x="12253.8" y="3485.0" height="31.0" width="183.0" data-name="void Function(int, T)?"></rect>
-						</g>
-						<g transform="translate(12253.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(int, T)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(int, T)?">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(int, T)?">void Function(int, T)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TabBarIndicatorSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TabBarIndicatorSize">
-							<rect x="12476.8" y="3485.0" height="31.0" width="176.0" data-name="TabBarIndicatorSize"></rect>
-						</g>
-						<g transform="translate(12476.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TabBarIndicatorSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TabBarIndicatorSize">
-								<text x="80.0" y="13.5" stroke="none" text-anchor="middle" data-name="TabBarIndicatorSize">TabBarIndicatorSize</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SidesheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SidesheetTab">
-							<rect x="61385.3" y="2594.0" height="62.0" width="330.0" data-name="SidesheetTab"></rect>
-							<path d="M61385.3 2625.0 L61715.3 2625.0" fill="none" data-name="SidesheetTab"></path>
-						</g>
-						<g transform="translate(61385.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SidesheetTab">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="SidesheetTab">SidesheetTab</text>
-								
-							</g>
-						</g>
-						<g transform="translate(61385.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SidesheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SidesheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="SidesheetTab">+builder: Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)">
-							<rect x="48752.3" y="3485.0" height="31.0" width="256.0" data-name="Widget Function(BuildContext)"></rect>
-						</g>
-						<g transform="translate(48752.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)">
-								<text x="120.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)">Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Sidesheet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Sidesheet">
-							<rect x="13061.0" y="2519.0" height="212.0" width="341.0" data-name="Sidesheet"></rect>
-							<path d="M13061.0 2550.0 L13402.0 2550.0" fill="none" data-name="Sidesheet"></path>
-						</g>
-						<g transform="translate(13061, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Sidesheet">
-								<text x="162.5" y="13.5" stroke="none" text-anchor="middle" data-name="Sidesheet">Sidesheet</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13061, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Sidesheet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Sidesheet">
-								<text x="0.0" y="13.5" stroke="none" data-name="Sidesheet">&lt;static&gt;+kDefaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Sidesheet">+titleText: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Sidesheet">+body: Widget?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Sidesheet">+tabs: List&lt;SidesheetTab&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Sidesheet">+actionButtons: List&lt;Widget&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Sidesheet">+width: double?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Sidesheet">+withCloseButton: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Sidesheet">+ignoreAppBar: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Sidesheet">+collapseSingleTab: bool</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Sidesheet">+bodyPadding: EdgeInsets?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Sidesheet">+wrapContent: Widget Function(Widget)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(Widget)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(Widget)?">
-							<rect x="18892.3" y="3485.0" height="31.0" width="221.0" data-name="Widget Function(Widget)?"></rect>
-						</g>
-						<g transform="translate(18892.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(Widget)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(Widget)?">
-								<text x="102.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(Widget)?">Widget Function(Widget)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormSideSheetTab">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormSideSheetTab">
-							<rect x="61755.3" y="2594.0" height="62.0" width="313.0" data-name="FormSideSheetTab"></rect>
-							<path d="M61755.3 2625.0 L62068.3 2625.0" fill="none" data-name="FormSideSheetTab"></path>
-						</g>
-						<g transform="translate(61755.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormSideSheetTab">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormSideSheetTab">FormSideSheetTab</text>
-								
-							</g>
-						</g>
-						<g transform="translate(61755.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormSideSheetTab">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormSideSheetTab">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormSideSheetTab">+formViewBuilder: Widget Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="HelpIcon">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HelpIcon">
-							<rect x="28644.3" y="90.0" height="93.0" width="174.0" data-name="HelpIcon"></rect>
-							<path d="M28644.3 121.0 L28818.3 121.0" fill="none" data-name="HelpIcon"></path>
-							<path d="M28644.3 152.0 L28818.3 152.0" fill="none" data-name="HelpIcon"></path>
-						</g>
-						<g transform="translate(28644.25, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HelpIcon">
-								<text x="79.0" y="13.5" stroke="none" text-anchor="middle" data-name="HelpIcon">HelpIcon</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28644.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
-								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+tooltipText: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28644.25, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HelpIcon">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HelpIcon">
-								<text x="0.0" y="13.5" stroke="none" data-name="HelpIcon">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EmptyBody">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmptyBody">
-							<rect x="13690.0" y="2541.0" height="168.0" width="222.0" data-name="EmptyBody"></rect>
-							<path d="M13690.0 2572.0 L13912.0 2572.0" fill="none" data-name="EmptyBody"></path>
-							<path d="M13690.0 2678.0 L13912.0 2678.0" fill="none" data-name="EmptyBody"></path>
-						</g>
-						<g transform="translate(13690, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmptyBody">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="EmptyBody">EmptyBody</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13690, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+icon: IconData?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmptyBody">+leading: Widget?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmptyBody">+leadingSpacing: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmptyBody">+title: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EmptyBody">+description: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EmptyBody">+button: Widget?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13690, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmptyBody">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmptyBody">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmptyBody">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IndicatorRangeSliderThumbShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IndicatorRangeSliderThumbShape">
-							<rect x="28823.8" y="560.5" height="138.0" width="287.0" data-name="IndicatorRangeSliderThumbShape"></rect>
-							<path d="M28823.8 591.5 L29110.8 591.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
-							<path d="M28823.8 652.5 L29110.8 652.5" fill="none" data-name="IndicatorRangeSliderThumbShape"></path>
-						</g>
-						<g transform="translate(28823.75, 560.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IndicatorRangeSliderThumbShape">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="IndicatorRangeSliderThumbShape">IndicatorRangeSliderThumbShape</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28823.75, 591.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+buildContext: BuildContext</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+start: T</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+end: T</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28823.75, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IndicatorRangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IndicatorRangeSliderThumbShape">
-								<text x="0.0" y="13.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+Size getPreferredSize()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IndicatorRangeSliderThumbShape">+void paint()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BuildContext">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BuildContext">
-							<rect x="28909.3" y="1197.0" height="31.0" width="116.0" data-name="BuildContext"></rect>
-						</g>
-						<g transform="translate(28909.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="BuildContext">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BuildContext">
-								<text x="50.0" y="13.5" stroke="none" text-anchor="middle" data-name="BuildContext">BuildContext</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RangeSliderThumbShape">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RangeSliderThumbShape">
-							<rect x="28858.3" y="121.0" height="31.0" width="218.0" data-name="RangeSliderThumbShape"></rect>
-						</g>
-						<g transform="translate(28858.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="RangeSliderThumbShape">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RangeSliderThumbShape">
-								<text x="101.0" y="13.5" stroke="none" text-anchor="middle" data-name="RangeSliderThumbShape">RangeSliderThumbShape</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MouseEventsRegion">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MouseEventsRegion">
-							<rect x="15727.0" y="3760.0" height="167.0" width="379.0" data-name="MouseEventsRegion"></rect>
-							<path d="M15727.0 3791.0 L16106.0 3791.0" fill="none" data-name="MouseEventsRegion"></path>
-						</g>
-						<g transform="translate(15727, 3760)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MouseEventsRegion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MouseEventsRegion">
-								<text x="181.5" y="13.5" stroke="none" text-anchor="middle" data-name="MouseEventsRegion">MouseEventsRegion</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15727, 3791)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MouseEventsRegion">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MouseEventsRegion">
-								<text x="0.0" y="13.5" stroke="none" data-name="MouseEventsRegion">+onTap: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MouseEventsRegion">+onHover: void Function(PointerHoverEvent)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MouseEventsRegion">+onEnter: void Function(PointerEnterEvent)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MouseEventsRegion">+onExit: void Function(PointerExitEvent)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MouseEventsRegion">+autoselectCursor: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MouseEventsRegion">+cursor: SystemMouseCursor</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MouseEventsRegion">&lt;static&gt;+defaultCursor: SystemMouseCursor</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MouseEventsRegion">+autoCursor: SystemMouseCursor</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(PointerHoverEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerHoverEvent)?">
-							<rect x="6391.0" y="4118.5" height="31.0" width="292.0" data-name="void Function(PointerHoverEvent)?"></rect>
-						</g>
-						<g transform="translate(6391, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerHoverEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerHoverEvent)?">
-								<text x="138.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerHoverEvent)?">void Function(PointerHoverEvent)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(PointerEnterEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerEnterEvent)?">
-							<rect x="6723.0" y="4118.5" height="31.0" width="287.0" data-name="void Function(PointerEnterEvent)?"></rect>
-						</g>
-						<g transform="translate(6723, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerEnterEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerEnterEvent)?">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerEnterEvent)?">void Function(PointerEnterEvent)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(PointerExitEvent)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(PointerExitEvent)?">
-							<rect x="14133.5" y="4118.5" height="31.0" width="274.0" data-name="void Function(PointerExitEvent)?"></rect>
-						</g>
-						<g transform="translate(14133.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(PointerExitEvent)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(PointerExitEvent)?">
-								<text x="129.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(PointerExitEvent)?">void Function(PointerExitEvent)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SystemMouseCursor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SystemMouseCursor">
-							<rect x="14447.5" y="4118.5" height="31.0" width="180.0" data-name="SystemMouseCursor"></rect>
-						</g>
-						<g transform="translate(14447.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SystemMouseCursor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SystemMouseCursor">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="SystemMouseCursor">SystemMouseCursor</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveCustomColorPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveCustomColorPicker">
-							<rect x="36062.0" y="614.0" height="31.0" width="236.0" data-name="ReactiveCustomColorPicker"></rect>
-						</g>
-						<g transform="translate(36062, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveCustomColorPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveCustomColorPicker">
-								<text x="110.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveCustomColorPicker">ReactiveCustomColorPicker</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveFormField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFormField">
-							<rect x="36098.5" y="121.0" height="31.0" width="163.0" data-name="ReactiveFormField"></rect>
-						</g>
-						<g transform="translate(36098.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFormField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFormField">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFormField">ReactiveFormField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TextParagraph">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextParagraph">
-							<rect x="13952.0" y="2556.0" height="138.0" width="208.0" data-name="TextParagraph"></rect>
-							<path d="M13952.0 2587.0 L14160.0 2587.0" fill="none" data-name="TextParagraph"></path>
-							<path d="M13952.0 2663.0 L14160.0 2663.0" fill="none" data-name="TextParagraph"></path>
-						</g>
-						<g transform="translate(13952, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextParagraph">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextParagraph">TextParagraph</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13952, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
-								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+text: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TextParagraph">+style: TextStyle?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TextParagraph">+selectable: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TextParagraph">+span: List&lt;TextSpan&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13952, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TextParagraph">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TextParagraph">
-								<text x="0.0" y="13.5" stroke="none" data-name="TextParagraph">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="UnderConstruction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnderConstruction">
-							<rect x="36301.5" y="105.5" height="62.0" width="164.0" data-name="UnderConstruction"></rect>
-							<path d="M36301.5 136.5 L36465.5 136.5" fill="none" data-name="UnderConstruction"></path>
-						</g>
-						<g transform="translate(36301.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnderConstruction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnderConstruction">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="UnderConstruction">UnderConstruction</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36301.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnderConstruction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnderConstruction">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnderConstruction">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NullHelperDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NullHelperDecoration">
-							<rect x="36484.5" y="614.0" height="31.0" width="184.0" data-name="NullHelperDecoration"></rect>
-						</g>
-						<g transform="translate(36484.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NullHelperDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NullHelperDecoration">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="NullHelperDecoration">NullHelperDecoration</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InputDecoration">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InputDecoration">
-							<rect x="36505.5" y="121.0" height="31.0" width="142.0" data-name="InputDecoration"></rect>
-						</g>
-						<g transform="translate(36505.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InputDecoration">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InputDecoration">
-								<text x="63.0" y="13.5" stroke="none" text-anchor="middle" data-name="InputDecoration">InputDecoration</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ActionMenuType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ActionMenuType">
-							<rect x="9263.0" y="3447.0" height="107.0" width="330.0" data-name="ActionMenuType"></rect>
-							<path d="M9263.0 3478.0 L9593.0 3478.0" fill="none" data-name="ActionMenuType"></path>
-						</g>
-						<g transform="translate(9263, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ActionMenuType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ActionMenuType">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="ActionMenuType">ActionMenuType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9263, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ActionMenuType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ActionMenuType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ActionMenuType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+values: List&lt;ActionMenuType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+inline: ActionMenuType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ActionMenuType">&lt;static&gt;+popup: ActionMenuType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="HtmlStylingBanner">
-						<g fill="#eee8d5" stroke="#33322E" data-name="HtmlStylingBanner">
-							<rect x="14200.0" y="2571.0" height="108.0" width="298.0" data-name="HtmlStylingBanner"></rect>
-							<path d="M14200.0 2602.0 L14498.0 2602.0" fill="none" data-name="HtmlStylingBanner"></path>
-							<path d="M14200.0 2648.0 L14498.0 2648.0" fill="none" data-name="HtmlStylingBanner"></path>
-						</g>
-						<g transform="translate(14200, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="HtmlStylingBanner">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="HtmlStylingBanner">HtmlStylingBanner</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14200, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+isDismissed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="HtmlStylingBanner">+onDismissed: dynamic Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14200, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="HtmlStylingBanner">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="HtmlStylingBanner">
-								<text x="0.0" y="13.5" stroke="none" data-name="HtmlStylingBanner">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerWidget">
-							<rect x="81947.3" y="105.5" height="62.0" width="192.0" data-name="FormConsumerWidget"></rect>
-							<path d="M81947.3 136.5 L82139.3 136.5" fill="none" data-name="FormConsumerWidget"></path>
-						</g>
-						<g transform="translate(81947.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerWidget">
-								<text x="88.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerWidget">FormConsumerWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(81947.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConsumerRefWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConsumerRefWidget">
-							<rect x="15293.8" y="1666.5" height="62.0" width="219.0" data-name="FormConsumerRefWidget"></rect>
-							<path d="M15293.8 1697.5 L15512.8 1697.5" fill="none" data-name="FormConsumerRefWidget"></path>
-						</g>
-						<g transform="translate(15293.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConsumerRefWidget">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConsumerRefWidget">FormConsumerRefWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15293.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConsumerRefWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConsumerRefWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConsumerRefWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SplashPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SplashPage">
-							<rect x="36972.5" y="105.5" height="62.0" width="136.0" data-name="SplashPage"></rect>
-							<path d="M36972.5 136.5 L37108.5 136.5" fill="none" data-name="SplashPage"></path>
-						</g>
-						<g transform="translate(36972.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SplashPage">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="SplashPage">SplashPage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36972.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SplashPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SplashPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SplashPage">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ErrorPage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ErrorPage">
-							<rect x="15091.8" y="1651.0" height="93.0" width="162.0" data-name="ErrorPage"></rect>
-							<path d="M15091.8 1682.0 L15253.8 1682.0" fill="none" data-name="ErrorPage"></path>
-							<path d="M15091.8 1713.0 L15253.8 1713.0" fill="none" data-name="ErrorPage"></path>
-						</g>
-						<g transform="translate(15091.75, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ErrorPage">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="ErrorPage">ErrorPage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15091.75, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+error: Exception?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15091.75, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ErrorPage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ErrorPage">
-								<text x="0.0" y="13.5" stroke="none" data-name="ErrorPage">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsumerWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsumerWidget">
-							<rect x="30306.3" y="1197.0" height="31.0" width="152.0" data-name="ConsumerWidget"></rect>
-						</g>
-						<g transform="translate(30306.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ConsumerWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsumerWidget">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsumerWidget">ConsumerWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyULogo">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyULogo">
-							<rect x="16222.5" y="3797.0" height="93.0" width="214.0" data-name="StudyULogo"></rect>
-							<path d="M16222.5 3828.0 L16436.5 3828.0" fill="none" data-name="StudyULogo"></path>
-							<path d="M16222.5 3859.0 L16436.5 3859.0" fill="none" data-name="StudyULogo"></path>
-						</g>
-						<g transform="translate(16222.5, 3797)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyULogo">
-								<text x="99.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyULogo">StudyULogo</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16222.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+onTap: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16222.5, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyULogo">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyULogo">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyULogo">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SingleColumnLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayout">
-							<rect x="14538.0" y="2526.0" height="198.0" width="418.0" data-name="SingleColumnLayout"></rect>
-							<path d="M14538.0 2557.0 L14956.0 2557.0" fill="none" data-name="SingleColumnLayout"></path>
-							<path d="M14538.0 2693.0 L14956.0 2693.0" fill="none" data-name="SingleColumnLayout"></path>
-						</g>
-						<g transform="translate(14538, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayout">
-								<text x="201.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayout">SingleColumnLayout</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14538, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraints: BoxConstraints</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+defaultConstraintsNarrow: BoxConstraints</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayout">+body: Widget</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayout">+header: Widget?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayout">+stickyHeader: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayout">+constraints: BoxConstraints?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SingleColumnLayout">+scroll: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SingleColumnLayout">+padding: EdgeInsets?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14538, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayout">&lt;static&gt;+dynamic fromType()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SingleColumnLayoutType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SingleColumnLayoutType">
-							<rect x="28995.5" y="3432.0" height="137.0" width="426.0" data-name="SingleColumnLayoutType"></rect>
-							<path d="M28995.5 3463.0 L29421.5 3463.0" fill="none" data-name="SingleColumnLayoutType"></path>
-						</g>
-						<g transform="translate(28995.5, 3432)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SingleColumnLayoutType">
-								<text x="205.0" y="13.5" stroke="none" text-anchor="middle" data-name="SingleColumnLayoutType">SingleColumnLayoutType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28995.5, 3463)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SingleColumnLayoutType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SingleColumnLayoutType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SingleColumnLayoutType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+values: List&lt;SingleColumnLayoutType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedWide: SingleColumnLayoutType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+boundedNarrow: SingleColumnLayoutType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+stretched: SingleColumnLayoutType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SingleColumnLayoutType">&lt;static&gt;+split: SingleColumnLayoutType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Hyperlink">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Hyperlink">
-							<rect x="15410.5" y="2519.0" height="212.0" width="222.0" data-name="Hyperlink"></rect>
-							<path d="M15410.5 2550.0 L15632.5 2550.0" fill="none" data-name="Hyperlink"></path>
-						</g>
-						<g transform="translate(15410.5, 2519)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Hyperlink">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Hyperlink">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="Hyperlink">Hyperlink</text>
-								
-							</g>
-						</g>
-						<g transform="translate(15410.5, 2550)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Hyperlink">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Hyperlink">
-								<text x="0.0" y="13.5" stroke="none" data-name="Hyperlink">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Hyperlink">+url: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Hyperlink">+onClick: void Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Hyperlink">+linkColor: Color</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="Hyperlink">+hoverColor: Color?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="Hyperlink">+visitedColor: Color?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="Hyperlink">+style: TextStyle?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="Hyperlink">+hoverStyle: TextStyle?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="Hyperlink">+visitedStyle: TextStyle?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="Hyperlink">+icon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="Hyperlink">+iconSize: double?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StandardTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableColumn">
-							<rect x="21627.3" y="2556.5" height="137.0" width="287.0" data-name="StandardTableColumn"></rect>
-							<path d="M21627.3 2587.5 L21914.3 2587.5" fill="none" data-name="StandardTableColumn"></path>
-						</g>
-						<g transform="translate(21627.25, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableColumn">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableColumn">StandardTableColumn</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21627.25, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableColumn">+label: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableColumn">+tooltip: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableColumn">+columnWidth: TableColumnWidth</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableColumn">+sortable: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardTableColumn">+sortAscending: bool?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardTableColumn">+sortableIcon: Widget?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TableColumnWidth">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TableColumnWidth">
-							<rect x="24859.3" y="3485.0" height="31.0" width="165.0" data-name="TableColumnWidth"></rect>
-						</g>
-						<g transform="translate(24859.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TableColumnWidth">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableColumnWidth">
-								<text x="74.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableColumnWidth">TableColumnWidth</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StandardTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTable">
-							<rect x="20535.8" y="1494.0" height="407.0" width="688.0" data-name="StandardTable"></rect>
-							<path d="M20535.8 1525.0 L21223.8 1525.0" fill="none" data-name="StandardTable"></path>
-						</g>
-						<g transform="translate(20535.75, 1494)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTable">
-								<text x="336.0" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTable">StandardTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20535.75, 1525)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTable">+inputColumns: List&lt;StandardTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTable">+trailingActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StandardTable">+trailingActionsMenuType: ActionMenuType?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StandardTable">+sortColumnPredicates: List&lt;int Function(T, T)?&gt;?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StandardTable">+pinnedPredicates: int Function(T, T)?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StandardTable">+headerRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StandardTable">+dataRowBuilder: TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StandardTable">+inputTrailingActionsColumn: StandardTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StandardTable">+tableWrapper: Widget Function(Widget)?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StandardTable">+cellSpacing: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StandardTable">+rowSpacing: double</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StandardTable">+minRowHeight: double?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StandardTable">+headerMaxLines: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StandardTable">+showTableHeader: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StandardTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StandardTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StandardTable">+trailingWidget: Widget?</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StandardTable">+leadingWidgetSpacing: double?</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StandardTable">+trailingWidgetSpacing: double?</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StandardTable">+emptyWidget: Widget?</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StandardTable">+rowStyle: StandardTableStyle</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="StandardTable">+disableRowInteractions: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T)">
-							<rect x="25436.3" y="3485.0" height="31.0" width="144.0" data-name="void Function(T)"></rect>
-						</g>
-						<g transform="translate(25436.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T)">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T)">void Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-							<rect x="18723.8" y="2609.5" height="31.0" width="381.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?"></rect>
-						</g>
-						<g transform="translate(18723.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="int Function(T, T)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(T, T)?">
-							<rect x="19184.8" y="2609.5" height="31.0" width="160.0" data-name="int Function(T, T)?"></rect>
-						</g>
-						<g transform="translate(19184.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(T, T)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(T, T)?">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(T, T)?">int Function(T, T)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<rect x="20613.3" y="2609.5" height="31.0" width="523.0" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?"></rect>
-						</g>
-						<g transform="translate(20613.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">
-								<text x="253.5" y="13.5" stroke="none" text-anchor="middle" data-name="TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?">TableRow Function(BuildContext, List&lt;StandardTableColumn&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StandardTableStyle">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StandardTableStyle">
-							<rect x="10139.0" y="3447.0" height="107.0" width="353.0" data-name="StandardTableStyle"></rect>
-							<path d="M10139.0 3478.0 L10492.0 3478.0" fill="none" data-name="StandardTableStyle"></path>
-						</g>
-						<g transform="translate(10139, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StandardTableStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StandardTableStyle">
-								<text x="168.5" y="13.5" stroke="none" text-anchor="middle" data-name="StandardTableStyle">StandardTableStyle</text>
-								
-							</g>
-						</g>
-						<g transform="translate(10139, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StandardTableStyle">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StandardTableStyle">
-								<text x="0.0" y="13.5" stroke="none" data-name="StandardTableStyle">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+values: List&lt;StandardTableStyle&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+plain: StandardTableStyle</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StandardTableStyle">&lt;static&gt;+material: StandardTableStyle</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconPack">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPack">
-							<rect x="37148.5" y="82.5" height="108.0" width="359.0" data-name="IconPack"></rect>
-							<path d="M37148.5 113.5 L37507.5 113.5" fill="none" data-name="IconPack"></path>
-							<path d="M37148.5 159.5 L37507.5 159.5" fill="none" data-name="IconPack"></path>
-						</g>
-						<g transform="translate(37148.5, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPack">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPack">IconPack</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37148.5, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+defaultPack: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPack">&lt;static&gt;+material: List&lt;IconOption&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37148.5, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPack">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPack">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPack">&lt;static&gt;+IconOption? resolveIconByName()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconOption">
-							<rect x="21323.3" y="2548.5" height="153.0" width="264.0" data-name="IconOption"></rect>
-							<path d="M21323.3 2579.5 L21587.3 2579.5" fill="none" data-name="IconOption"></path>
-							<path d="M21323.3 2655.5 L21587.3 2655.5" fill="none" data-name="IconOption"></path>
-						</g>
-						<g transform="translate(21323.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconOption">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="IconOption">IconOption</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21323.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconOption">+isEmpty: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconOption">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21323.25, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconOption">+String toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconOption">&lt;static&gt;+IconOption fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveIconPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveIconPicker">
-							<rect x="36726.0" y="614.0" height="31.0" width="168.0" data-name="ReactiveIconPicker"></rect>
-						</g>
-						<g transform="translate(36726, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveIconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveIconPicker">
-								<text x="76.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveIconPicker">ReactiveIconPicker</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveFocusableFormField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveFocusableFormField">
-							<rect x="36687.5" y="121.0" height="31.0" width="245.0" data-name="ReactiveFocusableFormField"></rect>
-						</g>
-						<g transform="translate(36687.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveFocusableFormField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveFocusableFormField">
-								<text x="114.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveFocusableFormField">ReactiveFocusableFormField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconPicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPicker">
-							<rect x="22935.5" y="1606.0" height="183.0" width="319.0" data-name="IconPicker"></rect>
-							<path d="M22935.5 1637.0 L23254.5 1637.0" fill="none" data-name="IconPicker"></path>
-							<path d="M22935.5 1758.0 L23254.5 1758.0" fill="none" data-name="IconPicker"></path>
-						</g>
-						<g transform="translate(22935.5, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPicker">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPicker">IconPicker</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22935.5, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPicker">+selectedOption: IconOption?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPicker">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconPicker">+galleryIconSize: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IconPicker">+selectedIconSize: double?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IconPicker">+focusNode: FocusNode?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IconPicker">+isDisabled: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(22935.5, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPicker">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(IconOption)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(IconOption)?">
-							<rect x="23403.0" y="2609.5" height="31.0" width="230.0" data-name="void Function(IconOption)?"></rect>
-						</g>
-						<g transform="translate(23403, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(IconOption)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(IconOption)?">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(IconOption)?">void Function(IconOption)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FocusNode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FocusNode">
-							<rect x="23201.5" y="2609.5" height="31.0" width="106.0" data-name="FocusNode"></rect>
-						</g>
-						<g transform="translate(23201.5, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FocusNode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FocusNode">
-								<text x="45.0" y="13.5" stroke="none" text-anchor="middle" data-name="FocusNode">FocusNode</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconPickerField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerField">
-							<rect x="23294.5" y="1606.0" height="183.0" width="319.0" data-name="IconPickerField"></rect>
-							<path d="M23294.5 1637.0 L23613.5 1637.0" fill="none" data-name="IconPickerField"></path>
-							<path d="M23294.5 1758.0 L23613.5 1758.0" fill="none" data-name="IconPickerField"></path>
-						</g>
-						<g transform="translate(23294.5, 1606)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerField">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerField">IconPickerField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23294.5, 1637)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerField">+selectedOption: IconOption?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerField">+selectedIconSize: double?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IconPickerField">+galleryIconSize: double?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IconPickerField">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IconPickerField">+focusNode: FocusNode?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IconPickerField">+isDisabled: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23294.5, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerField">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerField">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconPickerGallery">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconPickerGallery">
-							<rect x="23653.5" y="1636.0" height="123.0" width="319.0" data-name="IconPickerGallery"></rect>
-							<path d="M23653.5 1667.0 L23972.5 1667.0" fill="none" data-name="IconPickerGallery"></path>
-							<path d="M23653.5 1728.0 L23972.5 1728.0" fill="none" data-name="IconPickerGallery"></path>
-						</g>
-						<g transform="translate(23653.5, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconPickerGallery">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconPickerGallery">IconPickerGallery</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23653.5, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+iconOptions: List&lt;IconOption&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IconPickerGallery">+onSelect: void Function(IconOption)?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IconPickerGallery">+iconSize: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(23653.5, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IconPickerGallery">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IconPickerGallery">
-								<text x="0.0" y="13.5" stroke="none" data-name="IconPickerGallery">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SecondaryButton">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SecondaryButton">
-							<rect x="19384.8" y="2556.0" height="138.0" width="249.0" data-name="SecondaryButton"></rect>
-							<path d="M19384.8 2587.0 L19633.8 2587.0" fill="none" data-name="SecondaryButton"></path>
-							<path d="M19384.8 2663.0 L19633.8 2663.0" fill="none" data-name="SecondaryButton"></path>
-						</g>
-						<g transform="translate(19384.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecondaryButton">
-								<text x="116.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecondaryButton">SecondaryButton</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19384.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+text: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SecondaryButton">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SecondaryButton">+isLoading: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SecondaryButton">+onPressed: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19384.75, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecondaryButton">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecondaryButton">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecondaryButton">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TwoColumnLayout">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TwoColumnLayout">
-							<rect x="19674.5" y="2466.5" height="317.0" width="368.0" data-name="TwoColumnLayout"></rect>
-							<path d="M19674.5 2497.5 L20042.5 2497.5" fill="none" data-name="TwoColumnLayout"></path>
-						</g>
-						<g transform="translate(19674.5, 2466.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TwoColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TwoColumnLayout">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="TwoColumnLayout">TwoColumnLayout</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19674.5, 2497.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TwoColumnLayout">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TwoColumnLayout">
-								<text x="0.0" y="13.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultDivider: VerticalDivider</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+defaultContentPadding: EdgeInsets</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TwoColumnLayout">&lt;static&gt;+slimContentPadding: EdgeInsets</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TwoColumnLayout">+leftWidget: Widget</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TwoColumnLayout">+rightWidget: Widget</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TwoColumnLayout">+dividerWidget: Widget?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="TwoColumnLayout">+headerWidget: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="TwoColumnLayout">+flexLeft: int?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="TwoColumnLayout">+flexRight: int?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="TwoColumnLayout">+constraintsLeft: BoxConstraints?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="TwoColumnLayout">+constraintsRight: BoxConstraints?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="TwoColumnLayout">+scrollLeft: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="TwoColumnLayout">+scrollRight: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="TwoColumnLayout">+paddingLeft: EdgeInsets?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="TwoColumnLayout">+paddingRight: EdgeInsets?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorLeft: Color?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="TwoColumnLayout">+backgroundColorRight: Color?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="TwoColumnLayout">+stretchHeight: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="VerticalDivider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="VerticalDivider">
-							<rect x="19671.0" y="3485.0" height="31.0" width="130.0" data-name="VerticalDivider"></rect>
-						</g>
-						<g transform="translate(19671, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="VerticalDivider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="VerticalDivider">
-								<text x="57.0" y="13.5" stroke="none" text-anchor="middle" data-name="VerticalDivider">VerticalDivider</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppTranslation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppTranslation">
-							<rect x="37826.5" y="105.5" height="62.0" width="194.0" data-name="AppTranslation"></rect>
-							<path d="M37826.5 136.5 L38020.5 136.5" fill="none" data-name="AppTranslation"></path>
-						</g>
-						<g transform="translate(37826.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppTranslation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppTranslation">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppTranslation">AppTranslation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37826.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppTranslation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppTranslation">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppTranslation">&lt;static&gt;+dynamic init()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformLocale">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocale">
-							<rect x="37547.5" y="105.5" height="62.0" width="239.0" data-name="PlatformLocale"></rect>
-							<path d="M37547.5 136.5 L37786.5 136.5" fill="none" data-name="PlatformLocale"></path>
-						</g>
-						<g transform="translate(37547.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocale">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocale">PlatformLocale</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37547.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocale">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocale">+Locale getPlatformLocale()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformLocaleWeb">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleWeb">
-							<rect x="37240.8" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleWeb"></rect>
-							<path d="M37240.8 629.5 L37479.8 629.5" fill="none" data-name="PlatformLocaleWeb"></path>
-						</g>
-						<g transform="translate(37240.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleWeb">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleWeb">PlatformLocaleWeb</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37240.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleWeb">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleWeb">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleWeb">+Locale getPlatformLocale()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformLocaleMobile">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformLocaleMobile">
-							<rect x="37719.8" y="598.5" height="62.0" width="239.0" data-name="PlatformLocaleMobile"></rect>
-							<path d="M37719.8 629.5 L37958.8 629.5" fill="none" data-name="PlatformLocaleMobile"></path>
-						</g>
-						<g transform="translate(37719.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformLocaleMobile">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformLocaleMobile">PlatformLocaleMobile</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37719.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformLocaleMobile">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformLocaleMobile">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformLocaleMobile">+Locale getPlatformLocale()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LanguagePicker">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePicker">
-							<rect x="20207.3" y="2579.0" height="92.0" width="366.0" data-name="LanguagePicker"></rect>
-							<path d="M20207.3 2610.0 L20573.3 2610.0" fill="none" data-name="LanguagePicker"></path>
-						</g>
-						<g transform="translate(20207.25, 2579)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePicker">
-								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePicker">LanguagePicker</text>
-								
-							</g>
-						</g>
-						<g transform="translate(20207.25, 2610)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePicker">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePicker">
-								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePicker">+languagePickerType: LanguagePickerType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePicker">+iconColor: Color?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePicker">+offset: Offset?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LanguagePickerType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LanguagePickerType">
-							<rect x="9683.0" y="3447.0" height="107.0" width="366.0" data-name="LanguagePickerType"></rect>
-							<path d="M9683.0 3478.0 L10049.0 3478.0" fill="none" data-name="LanguagePickerType"></path>
-						</g>
-						<g transform="translate(9683, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LanguagePickerType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LanguagePickerType">
-								<text x="175.0" y="13.5" stroke="none" text-anchor="middle" data-name="LanguagePickerType">LanguagePickerType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(9683, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LanguagePickerType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LanguagePickerType">
-								<text x="0.0" y="13.5" stroke="none" data-name="LanguagePickerType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+values: List&lt;LanguagePickerType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+field: LanguagePickerType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="LanguagePickerType">&lt;static&gt;+icon: LanguagePickerType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Offset">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Offset">
-							<rect x="24756.3" y="3485.0" height="31.0" width="63.0" data-name="Offset"></rect>
-						</g>
-						<g transform="translate(24756.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Offset">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Offset">
-								<text x="23.5" y="13.5" stroke="none" text-anchor="middle" data-name="Offset">Offset</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouteParamEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouteParamEnum">
-							<rect x="38412.5" y="98.0" height="77.0" width="202.0" data-name="GoRouteParamEnum"></rect>
-							<path d="M38412.5 129.0 L38614.5 129.0" fill="none" data-name="GoRouteParamEnum"></path>
-						</g>
-						<g transform="translate(38412.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="GoRouteParamEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouteParamEnum">
-								<text x="93.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouteParamEnum">GoRouteParamEnum</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38412.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouteParamEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouteParamEnum">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouteParamEnum">+String toRouteParam()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GoRouteParamEnum">+String toShortString()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntents">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntents">
-							<rect x="24563.3" y="1479.0" height="437.0" width="572.0" data-name="RoutingIntents"></rect>
-							<path d="M24563.3 1510.0 L25135.3 1510.0" fill="none" data-name="RoutingIntents"></path>
-						</g>
-						<g transform="translate(24563.25, 1479)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntents">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntents">
-								<text x="278.0" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntents">RoutingIntents</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24563.25, 1510)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntents">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntents">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+root: RoutingIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studies: RoutingIntent</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studiesShared: RoutingIntent</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+publicRegistry: RoutingIntent</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+study: RoutingIntent Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEdit: RoutingIntent Function(String)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInfo: RoutingIntent Function(String)</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditEnrollment: RoutingIntent Function(String)</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditInterventions: RoutingIntent Function(String)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditIntervention: RoutingIntent Function(String, String)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurements: RoutingIntent Function(String)</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditReports: RoutingIntent Function(String)</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyEditMeasurement: RoutingIntent Function(String, String)</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyTest: RoutingIntent Function(String, {String? appRoute})</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyRecruit: RoutingIntent Function(String)</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyMonitor: RoutingIntent Function(String)</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyAnalyze: RoutingIntent Function(String)</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studySettings: RoutingIntent Function(String)</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+accountSettings: RoutingIntent</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+studyNew: RoutingIntent</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+login: RoutingIntent</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+signup: RoutingIntent</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot: RoutingIntent</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordForgot2: RoutingIntent Function(String)</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+passwordRecovery: RoutingIntent</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="RoutingIntents">&lt;static&gt;+error: RoutingIntent Function(Exception)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String)">
-							<rect x="23989.3" y="2609.5" height="31.0" width="253.0" data-name="RoutingIntent Function(String)"></rect>
-						</g>
-						<g transform="translate(23989.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String)">
-								<text x="118.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String)">RoutingIntent Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(String, String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, String)">
-							<rect x="24678.3" y="2609.5" height="31.0" width="309.0" data-name="RoutingIntent Function(String, String)"></rect>
-						</g>
-						<g transform="translate(24678.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, String)">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, String)">RoutingIntent Function(String, String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(String, {String? appRoute})">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(String, {String? appRoute})">
-							<rect x="25027.3" y="2609.5" height="31.0" width="413.0" data-name="RoutingIntent Function(String, {String? appRoute})"></rect>
-						</g>
-						<g transform="translate(25027.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(String, {String? appRoute})">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(String, {String? appRoute})">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(String, {String? appRoute})">RoutingIntent Function(String, {String? appRoute})</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntent Function(Exception)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntent Function(Exception)">
-							<rect x="25480.3" y="2609.5" height="31.0" width="285.0" data-name="RoutingIntent Function(Exception)"></rect>
-						</g>
-						<g transform="translate(25480.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntent Function(Exception)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntent Function(Exception)">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntent Function(Exception)">RoutingIntent Function(Exception)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRoute">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRoute">
-							<rect x="41886.0" y="3485.0" height="31.0" width="86.0" data-name="GoRoute"></rect>
-						</g>
-						<g transform="translate(41886, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRoute">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRoute">
-								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRoute">GoRoute</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RoutingIntentDispatch">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RoutingIntentDispatch">
-							<rect x="14045.0" y="3447.0" height="107.0" width="373.0" data-name="RoutingIntentDispatch"></rect>
-							<path d="M14045.0 3478.0 L14418.0 3478.0" fill="none" data-name="RoutingIntentDispatch"></path>
-						</g>
-						<g transform="translate(14045, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RoutingIntentDispatch">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RoutingIntentDispatch">
-								<text x="178.5" y="13.5" stroke="none" text-anchor="middle" data-name="RoutingIntentDispatch">RoutingIntentDispatch</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14045, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RoutingIntentDispatch">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RoutingIntentDispatch">
-								<text x="0.0" y="13.5" stroke="none" data-name="RoutingIntentDispatch">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+values: List&lt;RoutingIntentDispatch&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+go: RoutingIntentDispatch</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RoutingIntentDispatch">&lt;static&gt;+push: RoutingIntentDispatch</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RouterKeys">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouterKeys">
-							<rect x="38060.5" y="98.0" height="77.0" width="312.0" data-name="RouterKeys"></rect>
-							<path d="M38060.5 129.0 L38372.5 129.0" fill="none" data-name="RouterKeys"></path>
-						</g>
-						<g transform="translate(38060.5, 98)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterKeys">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterKeys">
-								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterKeys">RouterKeys</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38060.5, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterKeys">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterKeys">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+studyKey: ValueKey&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouterKeys">&lt;static&gt;+authKey: ValueKey&lt;String&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ValueKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ValueKey">
-							<rect x="38171.0" y="614.0" height="31.0" width="91.0" data-name="ValueKey"></rect>
-						</g>
-						<g transform="translate(38171, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueKey">
-								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueKey">ValueKey</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RouteParams">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteParams">
-							<rect x="38827.5" y="75.5" height="122.0" width="267.0" data-name="RouteParams"></rect>
-							<path d="M38827.5 106.5 L39094.5 106.5" fill="none" data-name="RouteParams"></path>
-						</g>
-						<g transform="translate(38827.5, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteParams">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteParams">
-								<text x="125.5" y="13.5" stroke="none" text-anchor="middle" data-name="RouteParams">RouteParams</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38827.5, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteParams">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteParams">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studiesFilter: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteParams">&lt;static&gt;+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteParams">&lt;static&gt;+measurementId: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteParams">&lt;static&gt;+interventionId: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RouteParams">&lt;static&gt;+testAppRoute: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RouterConf">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouterConf">
-							<rect x="21994.3" y="2556.0" height="138.0" width="326.0" data-name="RouterConf"></rect>
-							<path d="M21994.3 2587.0 L22320.3 2587.0" fill="none" data-name="RouterConf"></path>
-							<path d="M21994.3 2663.0 L22320.3 2663.0" fill="none" data-name="RouterConf"></path>
-						</g>
-						<g transform="translate(21994.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouterConf">
-								<text x="155.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouterConf">RouterConf</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21994.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+router: GoRouter</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouterConf">&lt;static&gt;+routes: List&lt;GoRoute&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouterConf">&lt;static&gt;+publicRoutes: List&lt;GoRoute&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouterConf">&lt;static&gt;+privateRoutes: List&lt;GoRoute&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21994.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouterConf">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouterConf">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouterConf">&lt;static&gt;+GoRoute route()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouter">
-							<rect x="63549.3" y="3485.0" height="31.0" width="92.0" data-name="GoRouter"></rect>
-						</g>
-						<g transform="translate(63549.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouter">
-								<text x="38.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouter">GoRouter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormRouteArgs">
-							<rect x="61100.3" y="1666.5" height="62.0" width="184.0" data-name="StudyFormRouteArgs"></rect>
-							<path d="M61100.3 1697.5 L61284.3 1697.5" fill="none" data-name="StudyFormRouteArgs"></path>
-						</g>
-						<g transform="translate(61100.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormRouteArgs">
-								<text x="84.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormRouteArgs">StudyFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(61100.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormRouteArgs">+studyId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormRouteArgs">
-							<rect x="59563.3" y="2594.0" height="62.0" width="210.0" data-name="QuestionFormRouteArgs"></rect>
-							<path d="M59563.3 2625.0 L59773.3 2625.0" fill="none" data-name="QuestionFormRouteArgs"></path>
-						</g>
-						<g transform="translate(59563.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormRouteArgs">
-								<text x="97.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormRouteArgs">QuestionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(59563.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormRouteArgs">+questionId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormRouteArgs">
-							<rect x="60303.0" y="3485.0" height="31.0" width="282.0" data-name="ScreenerQuestionFormRouteArgs"></rect>
-						</g>
-						<g transform="translate(60303, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormRouteArgs">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormRouteArgs">ScreenerQuestionFormRouteArgs</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormRouteArgs">
-							<rect x="59813.3" y="2594.0" height="62.0" width="239.0" data-name="ConsentItemFormRouteArgs"></rect>
-							<path d="M59813.3 2625.0 L60052.3 2625.0" fill="none" data-name="ConsentItemFormRouteArgs"></path>
-						</g>
-						<g transform="translate(59813.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormRouteArgs">
-								<text x="111.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormRouteArgs">ConsentItemFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(59813.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormRouteArgs">+consentId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementFormRouteArgs">
-							<rect x="45403.0" y="2594.0" height="62.0" width="247.0" data-name="MeasurementFormRouteArgs"></rect>
-							<path d="M45403.0 2625.0 L45650.0 2625.0" fill="none" data-name="MeasurementFormRouteArgs"></path>
-						</g>
-						<g transform="translate(45403, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementFormRouteArgs">
-								<text x="115.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementFormRouteArgs">MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45403, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementFormRouteArgs">+measurementId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormRouteArgs">
-							<rect x="50399.0" y="3469.5" height="62.0" width="265.0" data-name="SurveyQuestionFormRouteArgs"></rect>
-							<path d="M50399.0 3500.5 L50664.0 3500.5" fill="none" data-name="SurveyQuestionFormRouteArgs"></path>
-						</g>
-						<g transform="translate(50399, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormRouteArgs">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormRouteArgs">SurveyQuestionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(50399, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormRouteArgs">+questionId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormRouteArgs">
-							<rect x="44630.5" y="2594.0" height="62.0" width="233.0" data-name="InterventionFormRouteArgs"></rect>
-							<path d="M44630.5 2625.0 L44863.5 2625.0" fill="none" data-name="InterventionFormRouteArgs"></path>
-						</g>
-						<g transform="translate(44630.5, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormRouteArgs">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormRouteArgs">InterventionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44630.5, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormRouteArgs">+interventionId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormRouteArgs">
-							<rect x="44611.5" y="3469.5" height="62.0" width="271.0" data-name="InterventionTaskFormRouteArgs"></rect>
-							<path d="M44611.5 3500.5 L44882.5 3500.5" fill="none" data-name="InterventionTaskFormRouteArgs"></path>
-						</g>
-						<g transform="translate(44611.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormRouteArgs">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormRouteArgs">InterventionTaskFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44611.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormRouteArgs">+taskId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormRouteArgs">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormRouteArgs">
-							<rect x="61119.3" y="2594.0" height="62.0" width="226.0" data-name="ReportItemFormRouteArgs"></rect>
-							<path d="M61119.3 2625.0 L61345.3 2625.0" fill="none" data-name="ReportItemFormRouteArgs"></path>
-						</g>
-						<g transform="translate(61119.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormRouteArgs">
-								<text x="105.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormRouteArgs">ReportItemFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(61119.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormRouteArgs">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormRouteArgs">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormRouteArgs">+sectionId: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DropdownMenuItemTheme">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DropdownMenuItemTheme">
-							<rect x="38592.0" y="598.5" height="62.0" width="258.0" data-name="DropdownMenuItemTheme"></rect>
-							<path d="M38592.0 629.5 L38850.0 629.5" fill="none" data-name="DropdownMenuItemTheme"></path>
-						</g>
-						<g transform="translate(38592, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DropdownMenuItemTheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DropdownMenuItemTheme">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="DropdownMenuItemTheme">DropdownMenuItemTheme</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38592, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DropdownMenuItemTheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DropdownMenuItemTheme">
-								<text x="0.0" y="13.5" stroke="none" data-name="DropdownMenuItemTheme">+iconTheme: IconThemeData?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconThemeData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconThemeData">
-							<rect x="38650.5" y="1197.0" height="31.0" width="141.0" data-name="IconThemeData"></rect>
-						</g>
-						<g transform="translate(38650.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconThemeData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconThemeData">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconThemeData">IconThemeData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Diagnosticable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Diagnosticable">
-							<rect x="38654.5" y="121.0" height="31.0" width="133.0" data-name="Diagnosticable"></rect>
-						</g>
-						<g transform="translate(38654.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Diagnosticable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Diagnosticable">
-								<text x="58.5" y="13.5" stroke="none" text-anchor="middle" data-name="Diagnosticable">Diagnosticable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ThemeConfig">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeConfig">
-							<rect x="39426.8" y="0.0" height="273.0" width="543.0" data-name="ThemeConfig"></rect>
-							<path d="M39426.8 31.0 L39969.8 31.0" fill="none" data-name="ThemeConfig"></path>
-							<path d="M39426.8 107.0 L39969.8 107.0" fill="none" data-name="ThemeConfig"></path>
-						</g>
-						<g transform="translate(39426.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeConfig">
-								<text x="263.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeConfig">ThemeConfig</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39426.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMinContentWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMaxContentWidth: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kHoverFadeFactor: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+kMuteFadeFactor: double</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39426.75, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeConfig">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeConfig">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+dynamic bodyBackgroundColor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color modalBarrierColor()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color containerColor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color colorPickerInitialColor()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextMuted()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+TextStyle bodyTextBackground()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+double iconSplashRadius()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+Color sidesheetBackgroundColor()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+InputDecorationTheme dropdownInputDecorationTheme()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ThemeConfig">&lt;static&gt;+DropdownMenuItemTheme dropdownMenuItemTheme()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NoAnimationPageTransitionsBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NoAnimationPageTransitionsBuilder">
-							<rect x="38987.3" y="598.5" height="62.0" width="299.0" data-name="NoAnimationPageTransitionsBuilder"></rect>
-							<path d="M38987.3 629.5 L39286.3 629.5" fill="none" data-name="NoAnimationPageTransitionsBuilder"></path>
-						</g>
-						<g transform="translate(38987.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NoAnimationPageTransitionsBuilder">
-								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="NoAnimationPageTransitionsBuilder">NoAnimationPageTransitionsBuilder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38987.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NoAnimationPageTransitionsBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NoAnimationPageTransitionsBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="NoAnimationPageTransitionsBuilder">+Widget buildTransitions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PageTransitionsBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsBuilder">
-							<rect x="39187.8" y="121.0" height="31.0" width="199.0" data-name="PageTransitionsBuilder"></rect>
-						</g>
-						<g transform="translate(39187.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PageTransitionsBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsBuilder">
-								<text x="91.5" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsBuilder">PageTransitionsBuilder</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WebTransitionBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebTransitionBuilder">
-							<rect x="39366.8" y="598.5" height="62.0" width="223.0" data-name="WebTransitionBuilder"></rect>
-							<path d="M39366.8 629.5 L39589.8 629.5" fill="none" data-name="WebTransitionBuilder"></path>
-						</g>
-						<g transform="translate(39366.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebTransitionBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebTransitionBuilder">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebTransitionBuilder">WebTransitionBuilder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39366.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebTransitionBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebTransitionBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebTransitionBuilder">+Widget buildTransitions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ThemeSettingChange">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettingChange">
-							<rect x="39192.3" y="1666.5" height="62.0" width="216.0" data-name="ThemeSettingChange"></rect>
-							<path d="M39192.3 1697.5 L39408.3 1697.5" fill="none" data-name="ThemeSettingChange"></path>
-						</g>
-						<g transform="translate(39192.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettingChange">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettingChange">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettingChange">ThemeSettingChange</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39192.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettingChange">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettingChange">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettingChange">+settings: ThemeSettings</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ThemeSettings">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeSettings">
-							<rect x="39186.8" y="2586.5" height="77.0" width="227.0" data-name="ThemeSettings"></rect>
-							<path d="M39186.8 2617.5 L39413.8 2617.5" fill="none" data-name="ThemeSettings"></path>
-						</g>
-						<g transform="translate(39186.75, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeSettings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeSettings">
-								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeSettings">ThemeSettings</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39186.75, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeSettings">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeSettings">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeSettings">+sourceColor: Color</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeSettings">+themeMode: ThemeMode</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Notification">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Notification">
-							<rect x="39248.3" y="1197.0" height="31.0" width="104.0" data-name="Notification"></rect>
-						</g>
-						<g transform="translate(39248.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Notification">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Notification">
-								<text x="44.0" y="13.5" stroke="none" text-anchor="middle" data-name="Notification">Notification</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ThemeProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeProvider">
-							<rect x="39820.8" y="358.0" height="543.0" width="519.0" data-name="ThemeProvider"></rect>
-							<path d="M39820.8 389.0 L40339.8 389.0" fill="none" data-name="ThemeProvider"></path>
-							<path d="M39820.8 480.0 L40339.8 480.0" fill="none" data-name="ThemeProvider"></path>
-						</g>
-						<g transform="translate(39820.75, 358)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeProvider">
-								<text x="251.5" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeProvider">ThemeProvider</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39820.75, 389)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+settings: ValueNotifier&lt;ThemeSettings&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+lightDynamic: ColorScheme?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+darkDynamic: ColorScheme?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+pageTransitionsTheme: PageTransitionsTheme</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+shapeMedium: ShapeBorder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(39820.75, 480)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ThemeProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ThemeProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="ThemeProvider">+Color custom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ThemeProvider">+Color blend()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ThemeProvider">+Color source()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ThemeProvider">+ColorScheme colors()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ThemeProvider">+CardTheme cardTheme()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ThemeProvider">+ListTileThemeData listTileTheme()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ThemeProvider">+AppBarTheme appBarTheme()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ThemeProvider">+SnackBarThemeData snackBarThemeData()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ThemeProvider">+TabBarTheme tabBarTheme()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ThemeProvider">+BottomAppBarTheme bottomAppBarTheme()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ThemeProvider">+BottomNavigationBarThemeData bottomNavigationBarTheme()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ThemeProvider">+SwitchThemeData switchTheme()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ThemeProvider">+InputDecorationTheme inputDecorationTheme()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ThemeProvider">+TextTheme textTheme()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ThemeProvider">+DividerThemeData dividerTheme()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ThemeProvider">+NavigationRailThemeData navigationRailTheme()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ThemeProvider">+DrawerThemeData drawerTheme()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ThemeProvider">+IconThemeData iconTheme()</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ThemeProvider">+CheckboxThemeData checkboxTheme()</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ThemeProvider">+RadioThemeData radioTheme()</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ThemeProvider">+TooltipThemeData tooltipTheme()</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ThemeProvider">+ThemeData light()</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ThemeProvider">+ThemeData dark()</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ThemeProvider">+ThemeMode themeMode()</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ThemeProvider">+ThemeData theme()</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ThemeProvider">&lt;static&gt;+ThemeProvider of()</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ThemeProvider">+bool updateShouldNotify()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ValueNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ValueNotifier">
-							<rect x="39392.3" y="1197.0" height="31.0" width="117.0" data-name="ValueNotifier"></rect>
-						</g>
-						<g transform="translate(39392.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ValueNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ValueNotifier">
-								<text x="50.5" y="13.5" stroke="none" text-anchor="middle" data-name="ValueNotifier">ValueNotifier</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ColorScheme">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ColorScheme">
-							<rect x="39549.3" y="1197.0" height="31.0" width="122.0" data-name="ColorScheme"></rect>
-						</g>
-						<g transform="translate(39549.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ColorScheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ColorScheme">
-								<text x="53.0" y="13.5" stroke="none" text-anchor="middle" data-name="ColorScheme">ColorScheme</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PageTransitionsTheme">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PageTransitionsTheme">
-							<rect x="40445.0" y="1197.0" height="31.0" width="198.0" data-name="PageTransitionsTheme"></rect>
-						</g>
-						<g transform="translate(40445, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PageTransitionsTheme">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PageTransitionsTheme">
-								<text x="91.0" y="13.5" stroke="none" text-anchor="middle" data-name="PageTransitionsTheme">PageTransitionsTheme</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ShapeBorder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ShapeBorder">
-							<rect x="40953.5" y="1197.0" height="31.0" width="120.0" data-name="ShapeBorder"></rect>
-						</g>
-						<g transform="translate(40953.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ShapeBorder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ShapeBorder">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="ShapeBorder">ShapeBorder</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InheritedWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InheritedWidget">
-							<rect x="40009.8" y="121.0" height="31.0" width="141.0" data-name="InheritedWidget"></rect>
-						</g>
-						<g transform="translate(40009.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="InheritedWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InheritedWidget">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="InheritedWidget">InheritedWidget</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ThemeMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ThemeMode">
-							<rect x="40644.0" y="3485.0" height="31.0" width="114.0" data-name="ThemeMode"></rect>
-						</g>
-						<g transform="translate(40644, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ThemeMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ThemeMode">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="ThemeMode">ThemeMode</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomColor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomColor">
-							<rect x="24282.3" y="2563.5" height="123.0" width="128.0" data-name="CustomColor"></rect>
-							<path d="M24282.3 2594.5 L24410.3 2594.5" fill="none" data-name="CustomColor"></path>
-							<path d="M24282.3 2655.5 L24410.3 2655.5" fill="none" data-name="CustomColor"></path>
-						</g>
-						<g transform="translate(24282.25, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomColor">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="CustomColor">CustomColor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24282.25, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+name: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomColor">+color: Color</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomColor">+blend: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24282.25, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomColor">+Color value()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SuppressedBehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SuppressedBehaviorSubject">
-							<rect x="16476.5" y="3774.5" height="138.0" width="388.0" data-name="SuppressedBehaviorSubject"></rect>
-							<path d="M16476.5 3805.5 L16864.5 3805.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
-							<path d="M16476.5 3866.5 L16864.5 3866.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
-						</g>
-						<g transform="translate(16476.5, 3774.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SuppressedBehaviorSubject">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="SuppressedBehaviorSubject">SuppressedBehaviorSubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16476.5, 3805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
-								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">+subject: BehaviorSubject&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+didSuppressInitialEvent: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SuppressedBehaviorSubject">-_controller: StreamController&lt;T&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16476.5, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
-								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">-StreamController&lt;T&gt; _buildDerivedController()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+dynamic close()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
-							<rect x="14904.0" y="4118.5" height="31.0" width="149.0" data-name="StreamController"></rect>
-						</g>
-						<g transform="translate(14904, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Time">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Time">
-							<rect x="40379.8" y="583.5" height="92.0" width="293.0" data-name="Time"></rect>
-							<path d="M40379.8 614.5 L40672.8 614.5" fill="none" data-name="Time"></path>
-						</g>
-						<g transform="translate(40379.75, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Time">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Time">
-								<text x="138.5" y="13.5" stroke="none" text-anchor="middle" data-name="Time">Time</text>
-								
-							</g>
-						</g>
-						<g transform="translate(40379.75, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Time">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Time">
-								<text x="0.0" y="13.5" stroke="none" data-name="Time">&lt;static&gt;+dynamic fromTimeOfDay()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Time">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Time">&lt;static&gt;+Time fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimeOfDay">
-							<rect x="40474.8" y="121.0" height="31.0" width="103.0" data-name="TimeOfDay"></rect>
-						</g>
-						<g transform="translate(40474.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeOfDay">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeOfDay">TimeOfDay</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TimeValueAccessor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimeValueAccessor">
-							<rect x="40712.8" y="583.5" height="92.0" width="297.0" data-name="TimeValueAccessor"></rect>
-							<path d="M40712.8 614.5 L41009.8 614.5" fill="none" data-name="TimeValueAccessor"></path>
-						</g>
-						<g transform="translate(40712.75, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeValueAccessor">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeValueAccessor">TimeValueAccessor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(40712.75, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimeValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimeValueAccessor">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimeValueAccessor">+String modelToViewValue()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TimeValueAccessor">+Time? viewToModelValue()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TimeValueAccessor">-String _addLeadingZeroIfNeeded()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ControlValueAccessor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ControlValueAccessor">
-							<rect x="40765.8" y="121.0" height="31.0" width="191.0" data-name="ControlValueAccessor"></rect>
-						</g>
-						<g transform="translate(40765.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ControlValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ControlValueAccessor">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="ControlValueAccessor">ControlValueAccessor</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelAction">
-							<rect x="24450.3" y="2556.5" height="137.0" width="188.0" data-name="ModelAction"></rect>
-							<path d="M24450.3 2587.5 L24638.3 2587.5" fill="none" data-name="ModelAction"></path>
-						</g>
-						<g transform="translate(24450.25, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelAction">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelAction">ModelAction</text>
-								
-							</g>
-						</g>
-						<g transform="translate(24450.25, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelAction">+type: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelAction">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelAction">+icon: IconData?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelAction">+onExecute: Function</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelAction">+isAvailable: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelAction">+isDestructive: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="83357.5" y="105.5" height="62.0" width="403.0" data-name="IModelActionProvider"></rect>
-							<path d="M83357.5 136.5 L83760.5 136.5" fill="none" data-name="IModelActionProvider"></path>
-						</g>
-						<g transform="translate(83357.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
-								
-							</g>
-						</g>
-						<g transform="translate(83357.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelActionProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelActionProvider">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="82964.8" y="1174.0" height="77.0" width="179.0" data-name="IListActionProvider"></rect>
-							<path d="M82964.8 1205.0 L83143.8 1205.0" fill="none" data-name="IListActionProvider"></path>
-						</g>
-						<g transform="translate(82964.75, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82964.75, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IListActionProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="IListActionProvider">+void onSelectItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IListActionProvider">+void onNewItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelActionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelActionType">
-							<rect x="940.0" y="3417.0" height="167.0" width="334.0" data-name="ModelActionType"></rect>
-							<path d="M940.0 3448.0 L1274.0 3448.0" fill="none" data-name="ModelActionType"></path>
-						</g>
-						<g transform="translate(940, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelActionType">
-								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelActionType">ModelActionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(940, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelActionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelActionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+values: List&lt;ModelActionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+edit: ModelActionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+delete: ModelActionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+remove: ModelActionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+duplicate: ModelActionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+clipboard: ModelActionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+primary: ModelActionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OptimisticUpdate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OptimisticUpdate">
-							<rect x="17114.0" y="3737.0" height="213.0" width="383.0" data-name="OptimisticUpdate"></rect>
-							<path d="M17114.0 3768.0 L17497.0 3768.0" fill="none" data-name="OptimisticUpdate"></path>
-							<path d="M17114.0 3904.0 L17497.0 3904.0" fill="none" data-name="OptimisticUpdate"></path>
-						</g>
-						<g transform="translate(17114, 3737)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptimisticUpdate">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptimisticUpdate">OptimisticUpdate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17114, 3768)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+applyOptimistic: void Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">+apply: dynamic Function()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="OptimisticUpdate">+rollback: void Function()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="OptimisticUpdate">+onUpdate: void Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="OptimisticUpdate">+onError: void Function(Object, StackTrace?)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="OptimisticUpdate">+rethrowErrors: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="OptimisticUpdate">+runOptimistically: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="OptimisticUpdate">+completeFutureOptimistically: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17114, 3904)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+dynamic execute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">-void _runUpdateHandlerIfAny()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()">
-							<rect x="15093.0" y="4118.5" height="31.0" width="134.0" data-name="void Function()"></rect>
-						</g>
-						<g transform="translate(15093, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()">void Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Object, StackTrace?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Object, StackTrace?)?">
-							<rect x="15267.0" y="4118.5" height="31.0" width="304.0" data-name="void Function(Object, StackTrace?)?"></rect>
-						</g>
-						<g transform="translate(15267, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Object, StackTrace?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Object, StackTrace?)?">
-								<text x="144.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Object, StackTrace?)?">void Function(Object, StackTrace?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FileFormatEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FileFormatEncoder">
-							<rect x="41124.8" y="90.5" height="92.0" width="216.0" data-name="FileFormatEncoder"></rect>
-							<path d="M41124.8 121.5 L41340.8 121.5" fill="none" data-name="FileFormatEncoder"></path>
-						</g>
-						<g transform="translate(41124.75, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FileFormatEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FileFormatEncoder">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="FileFormatEncoder">FileFormatEncoder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41124.75, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FileFormatEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FileFormatEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="FileFormatEncoder">+dynamic encodeAsync()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FileFormatEncoder">+String encode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FileFormatEncoder">+dynamic call()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CSVStringEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CSVStringEncoder">
-							<rect x="41049.8" y="598.5" height="62.0" width="162.0" data-name="CSVStringEncoder"></rect>
-							<path d="M41049.8 629.5 L41211.8 629.5" fill="none" data-name="CSVStringEncoder"></path>
-						</g>
-						<g transform="translate(41049.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CSVStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CSVStringEncoder">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="CSVStringEncoder">CSVStringEncoder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41049.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CSVStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CSVStringEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="CSVStringEncoder">+String encode()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="JsonStringEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JsonStringEncoder">
-							<rect x="41251.8" y="598.5" height="62.0" width="166.0" data-name="JsonStringEncoder"></rect>
-							<path d="M41251.8 629.5 L41417.8 629.5" fill="none" data-name="JsonStringEncoder"></path>
-						</g>
-						<g transform="translate(41251.75, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JsonStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonStringEncoder">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="JsonStringEncoder">JsonStringEncoder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41251.75, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonStringEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonStringEncoder">+String encode()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ExecutionLimiter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ExecutionLimiter">
-							<rect x="18089.3" y="3789.5" height="108.0" width="197.0" data-name="ExecutionLimiter"></rect>
-							<path d="M18089.3 3820.5 L18286.3 3820.5" fill="none" data-name="ExecutionLimiter"></path>
-							<path d="M18089.3 3866.5 L18286.3 3866.5" fill="none" data-name="ExecutionLimiter"></path>
-						</g>
-						<g transform="translate(18089.25, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ExecutionLimiter">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ExecutionLimiter">ExecutionLimiter</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18089.25, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
-								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+milliseconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ExecutionLimiter">&lt;static&gt;-_timer: Timer?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18089.25, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
-								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Timer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Timer">
-							<rect x="15611.0" y="4118.5" height="31.0" width="60.0" data-name="Timer"></rect>
-						</g>
-						<g transform="translate(15611, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timer">
-								<text x="22.0" y="13.5" stroke="none" text-anchor="middle" data-name="Timer">Timer</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Debouncer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="59213.3" y="4072.5" height="123.0" width="536.0" data-name="Debouncer"></rect>
-							<path d="M59213.3 4103.5 L59749.3 4103.5" fill="none" data-name="Debouncer"></path>
-							<path d="M59213.3 4164.5 L59749.3 4164.5" fill="none" data-name="Debouncer"></path>
-						</g>
-						<g transform="translate(59213.25, 4072.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
-								<text x="260.0" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(59213.25, 4103.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
-								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+leading: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Debouncer">+cancelUncompleted: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Debouncer">-_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(59213.25, 4164.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
-								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+dynamic call()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CancelableOperation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="65807.3" y="4439.0" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
-						</g>
-						<g transform="translate(65807.25, 4439)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Throttler">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Throttler">
-							<rect x="40742.0" y="4103.0" height="62.0" width="136.0" data-name="Throttler"></rect>
-							<path d="M40742.0 4134.0 L40878.0 4134.0" fill="none" data-name="Throttler"></path>
-						</g>
-						<g transform="translate(40742, 4103)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Throttler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Throttler">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="Throttler">Throttler</text>
-								
-							</g>
-						</g>
-						<g transform="translate(40742, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Throttler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Throttler">
-								<text x="0.0" y="13.5" stroke="none" data-name="Throttler">+dynamic call()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SerializableColor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SerializableColor">
-							<rect x="21173.0" y="3805.0" height="77.0" width="312.0" data-name="SerializableColor"></rect>
-							<path d="M21173.0 3836.0 L21485.0 3836.0" fill="none" data-name="SerializableColor"></path>
-						</g>
-						<g transform="translate(21173, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SerializableColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SerializableColor">
-								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="SerializableColor">SerializableColor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(21173, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SerializableColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SerializableColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="SerializableColor">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SerializableColor">&lt;static&gt;+SerializableColor fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="42241.8" y="1181.5" height="62.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-							<path d="M42241.8 1212.5 L42434.8 1212.5" fill="none" data-name="IProviderArgsResolver"></path>
-						</g>
-						<g transform="translate(42241.75, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-						<g transform="translate(42241.75, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IProviderArgsResolver">
-								<text x="0.0" y="13.5" stroke="none" data-name="IProviderArgsResolver">+R provide()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CombinedStreamNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CombinedStreamNotifier">
-							<rect x="41457.8" y="583.0" height="93.0" width="435.0" data-name="CombinedStreamNotifier"></rect>
-							<path d="M41457.8 614.0 L41892.8 614.0" fill="none" data-name="CombinedStreamNotifier"></path>
-							<path d="M41457.8 645.0 L41892.8 645.0" fill="none" data-name="CombinedStreamNotifier"></path>
-						</g>
-						<g transform="translate(41457.75, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CombinedStreamNotifier">
-								<text x="209.5" y="13.5" stroke="none" text-anchor="middle" data-name="CombinedStreamNotifier">CombinedStreamNotifier</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41457.75, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">-_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41457.75, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChangeNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
-							<rect x="41608.3" y="121.0" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
-						</g>
-						<g transform="translate(41608.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CountWhereValidator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CountWhereValidator">
-							<rect x="41932.8" y="553.0" height="153.0" width="383.0" data-name="CountWhereValidator"></rect>
-							<path d="M41932.8 584.0 L42315.8 584.0" fill="none" data-name="CountWhereValidator"></path>
-							<path d="M41932.8 675.0 L42315.8 675.0" fill="none" data-name="CountWhereValidator"></path>
-						</g>
-						<g transform="translate(41932.75, 553)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CountWhereValidator">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="CountWhereValidator">CountWhereValidator</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41932.75, 584)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
-								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+predicate: bool Function(T?)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CountWhereValidator">+minCount: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CountWhereValidator">+maxCount: int?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMinCount: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMaxCount: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41932.75, 675)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
-								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+Map&lt;String, dynamic&gt;? validate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="bool Function(T?)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="bool Function(T?)">
-							<rect x="42046.8" y="1197.0" height="31.0" width="155.0" data-name="bool Function(T?)"></rect>
-						</g>
-						<g transform="translate(42046.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="bool Function(T?)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="bool Function(T?)">
-								<text x="69.5" y="13.5" stroke="none" text-anchor="middle" data-name="bool Function(T?)">bool Function(T?)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Validator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Validator">
-							<rect x="42081.3" y="121.0" height="31.0" width="86.0" data-name="Validator"></rect>
-						</g>
-						<g transform="translate(42081.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Validator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Validator">
-								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="Validator">Validator</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Patterns">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Patterns">
-							<rect x="43847.0" y="90.5" height="92.0" width="287.0" data-name="Patterns"></rect>
-							<path d="M43847.0 121.5 L44134.0 121.5" fill="none" data-name="Patterns"></path>
-						</g>
-						<g transform="translate(43847, 90.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Patterns">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Patterns">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="Patterns">Patterns</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43847, 121.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Patterns">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Patterns">
-								<text x="0.0" y="13.5" stroke="none" data-name="Patterns">&lt;static&gt;+timeFormatString: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Patterns">&lt;static&gt;+emailFormatString: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Patterns">&lt;static&gt;+url: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NumericalRangeFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NumericalRangeFormatter">
-							<rect x="42767.5" y="575.5" height="108.0" width="313.0" data-name="NumericalRangeFormatter"></rect>
-							<path d="M42767.5 606.5 L43080.5 606.5" fill="none" data-name="NumericalRangeFormatter"></path>
-							<path d="M42767.5 652.5 L43080.5 652.5" fill="none" data-name="NumericalRangeFormatter"></path>
-						</g>
-						<g transform="translate(42767.5, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NumericalRangeFormatter">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="NumericalRangeFormatter">NumericalRangeFormatter</text>
-								
-							</g>
-						</g>
-						<g transform="translate(42767.5, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+min: int?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NumericalRangeFormatter">+max: int?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(42767.5, 652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+TextEditingValue formatEditUpdate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TextInputFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextInputFormatter">
-							<rect x="43017.5" y="121.0" height="31.0" width="166.0" data-name="TextInputFormatter"></rect>
-						</g>
-						<g transform="translate(43017.5, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TextInputFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextInputFormatter">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextInputFormatter">TextInputFormatter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySequenceFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySequenceFormatter">
-							<rect x="43120.5" y="598.5" height="62.0" width="313.0" data-name="StudySequenceFormatter"></rect>
-							<path d="M43120.5 629.5 L43433.5 629.5" fill="none" data-name="StudySequenceFormatter"></path>
-						</g>
-						<g transform="translate(43120.5, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySequenceFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySequenceFormatter">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySequenceFormatter">StudySequenceFormatter</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43120.5, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySequenceFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySequenceFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySequenceFormatter">+TextEditingValue formatEditUpdate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Tuple">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Tuple">
-							<rect x="0.0" y="2541.0" height="168.0" width="384.0" data-name="Tuple"></rect>
-							<path d="M0.0 2572.0 L384.0 2572.0" fill="none" data-name="Tuple"></path>
-							<path d="M0.0 2633.0 L384.0 2633.0" fill="none" data-name="Tuple"></path>
-						</g>
-						<g transform="translate(0, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Tuple">
-								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="Tuple">Tuple</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
-								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+first: T1</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">+second: T2</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
-								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">&lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copy()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copyWith()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="JsonFileLoader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JsonFileLoader">
-							<rect x="72296.0" y="75.0" height="123.0" width="319.0" data-name="JsonFileLoader"></rect>
-							<path d="M72296.0 106.0 L72615.0 106.0" fill="none" data-name="JsonFileLoader"></path>
-							<path d="M72296.0 137.0 L72615.0 137.0" fill="none" data-name="JsonFileLoader"></path>
-						</g>
-						<g transform="translate(72296, 75)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonFileLoader">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="JsonFileLoader">JsonFileLoader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72296, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+jsonAssetsPath: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72296, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+dynamic loadJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonMapFromAssets()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonListFromAssets()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAppDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppDelegate">
-							<rect x="19172.5" y="3812.5" height="62.0" width="197.0" data-name="IAppDelegate"></rect>
-							<path d="M19172.5 3843.5 L19369.5 3843.5" fill="none" data-name="IAppDelegate"></path>
-						</g>
-						<g transform="translate(19172.5, 3812.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppDelegate">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAppDelegate">IAppDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19172.5, 3843.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppDelegate">+dynamic onAppStart()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppController">
-							<rect x="72655.0" y="67.5" height="138.0" width="301.0" data-name="AppController"></rect>
-							<path d="M72655.0 98.5 L72956.0 98.5" fill="none" data-name="AppController"></path>
-							<path d="M72655.0 159.5 L72956.0 159.5" fill="none" data-name="AppController"></path>
-						</g>
-						<g transform="translate(72655, 67.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppController">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppController">AppController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72655, 98.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+appDelegates: List&lt;IAppDelegate&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-_delayedFuture: dynamic</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppController">+isInitialized: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72655, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppController">+dynamic onAppStart()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppController">-dynamic _callDelegates()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyMonitorScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorScreen">
-							<rect x="30453.3" y="2571.5" height="107.0" width="280.0" data-name="StudyMonitorScreen"></rect>
-							<path d="M30453.3 2602.5 L30733.3 2602.5" fill="none" data-name="StudyMonitorScreen"></path>
-						</g>
-						<g transform="translate(30453.25, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorScreen">
-								<text x="132.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorScreen">StudyMonitorScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(30453.25, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorScreen">-Widget _monitorSectionHeader()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorScreen">-Widget _buildStat()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorScreen">-dynamic _onSelectParticipant()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyPageWidget">
-							<rect x="34026.3" y="1651.0" height="93.0" width="164.0" data-name="StudyPageWidget"></rect>
-							<path d="M34026.3 1682.0 L34190.3 1682.0" fill="none" data-name="StudyPageWidget"></path>
-							<path d="M34026.3 1713.0 L34190.3 1713.0" fill="none" data-name="StudyPageWidget"></path>
-						</g>
-						<g transform="translate(34026.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyPageWidget">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyPageWidget">StudyPageWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34026.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+studyId: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34026.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyPageWidget">+Widget? banner()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyMonitorTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyMonitorTable">
-							<rect x="43412.0" y="60.0" height="153.0" width="395.0" data-name="StudyMonitorTable"></rect>
-							<path d="M43412.0 91.0 L43807.0 91.0" fill="none" data-name="StudyMonitorTable"></path>
-							<path d="M43412.0 137.0 L43807.0 137.0" fill="none" data-name="StudyMonitorTable"></path>
-						</g>
-						<g transform="translate(43412, 60)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyMonitorTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyMonitorTable">
-								<text x="189.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyMonitorTable">StudyMonitorTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43412, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+studyMonitorItems: List&lt;StudyMonitorItem&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">+onSelectItem: void Function(StudyMonitorItem)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43412, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyMonitorTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyMonitorTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyMonitorTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyMonitorTable">-List&lt;Widget&gt; _buildRow()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyMonitorTable">-String _formatTime()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyMonitorTable">-Widget _buildProgressCell()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(StudyMonitorItem)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyMonitorItem)">
-							<rect x="43473.5" y="614.0" height="31.0" width="272.0" data-name="void Function(StudyMonitorItem)"></rect>
-						</g>
-						<g transform="translate(43473.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyMonitorItem)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyMonitorItem)">
-								<text x="128.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyMonitorItem)">void Function(StudyMonitorItem)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ParticipantDetailsView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ParticipantDetailsView">
-							<rect x="27131.3" y="1621.0" height="153.0" width="282.0" data-name="ParticipantDetailsView"></rect>
-							<path d="M27131.3 1652.0 L27413.3 1652.0" fill="none" data-name="ParticipantDetailsView"></path>
-							<path d="M27131.3 1713.0 L27413.3 1713.0" fill="none" data-name="ParticipantDetailsView"></path>
-						</g>
-						<g transform="translate(27131.25, 1621)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ParticipantDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ParticipantDetailsView">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="ParticipantDetailsView">ParticipantDetailsView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27131.25, 1652)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsView">+monitorItem: StudyMonitorItem</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsView">+interventions: List&lt;Intervention&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsView">+observations: List&lt;Observation&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27131.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ParticipantDetailsView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ParticipantDetailsView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ParticipantDetailsView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ParticipantDetailsView">-Widget _buildPerDayStatus()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ParticipantDetailsView">-String _getTooltipText()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LoginForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LoginForm">
-							<rect x="12814.0" y="2578.5" height="93.0" width="207.0" data-name="LoginForm"></rect>
-							<path d="M12814.0 2609.5 L13021.0 2609.5" fill="none" data-name="LoginForm"></path>
-							<path d="M12814.0 2640.5 L13021.0 2640.5" fill="none" data-name="LoginForm"></path>
-						</g>
-						<g transform="translate(12814, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LoginForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="LoginForm">LoginForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12814, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12814, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LoginForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LoginForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="LoginForm">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthFormKey">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormKey">
-							<rect x="16987.0" y="3417.0" height="167.0" width="355.0" data-name="AuthFormKey"></rect>
-							<path d="M16987.0 3448.0 L17342.0 3448.0" fill="none" data-name="AuthFormKey"></path>
-						</g>
-						<g transform="translate(16987, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormKey">
-								<text x="169.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormKey">AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(16987, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormKey">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormKey">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormKey">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+values: List&lt;AuthFormKey&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+login: AuthFormKey</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+signup: AuthFormKey</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordForgot: AuthFormKey</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;+passwordRecovery: AuthFormKey</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_loginSubmit: AuthFormKey</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormKey">&lt;static&gt;-_signupSubmit: AuthFormKey</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordRecoveryForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordRecoveryForm">
-							<rect x="13442.0" y="2578.5" height="93.0" width="208.0" data-name="PasswordRecoveryForm"></rect>
-							<path d="M13442.0 2609.5 L13650.0 2609.5" fill="none" data-name="PasswordRecoveryForm"></path>
-							<path d="M13442.0 2640.5 L13650.0 2640.5" fill="none" data-name="PasswordRecoveryForm"></path>
-						</g>
-						<g transform="translate(13442, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordRecoveryForm">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordRecoveryForm">PasswordRecoveryForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13442, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(13442, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordRecoveryForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordRecoveryForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordRecoveryForm">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordForgotForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordForgotForm">
-							<rect x="17061.0" y="2578.5" height="93.0" width="207.0" data-name="PasswordForgotForm"></rect>
-							<path d="M17061.0 2609.5 L17268.0 2609.5" fill="none" data-name="PasswordForgotForm"></path>
-							<path d="M17061.0 2640.5 L17268.0 2640.5" fill="none" data-name="PasswordForgotForm"></path>
-						</g>
-						<g transform="translate(17061, 2578.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordForgotForm">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordForgotForm">PasswordForgotForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17061, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(17061, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordForgotForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordForgotForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordForgotForm">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SignupForm">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SignupForm">
-							<rect x="18153.8" y="2563.5" height="123.0" width="278.0" data-name="SignupForm"></rect>
-							<path d="M18153.8 2594.5 L18431.8 2594.5" fill="none" data-name="SignupForm"></path>
-							<path d="M18153.8 2625.5 L18431.8 2625.5" fill="none" data-name="SignupForm"></path>
-						</g>
-						<g transform="translate(18153.75, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SignupForm">
-								<text x="131.0" y="13.5" stroke="none" text-anchor="middle" data-name="SignupForm">SignupForm</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18153.75, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+formKey: AuthFormKey</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18153.75, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SignupForm">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SignupForm">
-								<text x="0.0" y="13.5" stroke="none" data-name="SignupForm">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SignupForm">-dynamic _onClickTermsOfUse()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SignupForm">-dynamic _onClickPrivacyPolicy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthScaffold">
-							<rect x="30773.3" y="2564.0" height="122.0" width="259.0" data-name="AuthScaffold"></rect>
-							<path d="M30773.3 2595.0 L31032.3 2595.0" fill="none" data-name="AuthScaffold"></path>
-						</g>
-						<g transform="translate(30773.25, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthScaffold">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthScaffold">AuthScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(30773.25, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthScaffold">+body: Widget</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthScaffold">+formKey: AuthFormKey</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthScaffold">+leftContentMinWidth: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthScaffold">+leftPanelMinWidth: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthScaffold">+leftPanelPadding: EdgeInsets</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EmailTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EmailTextField">
-							<rect x="31072.3" y="2571.5" height="107.0" width="321.0" data-name="EmailTextField"></rect>
-							<path d="M31072.3 2602.5 L31393.3 2602.5" fill="none" data-name="EmailTextField"></path>
-						</g>
-						<g transform="translate(31072.25, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EmailTextField">
-								<text x="152.5" y="13.5" stroke="none" text-anchor="middle" data-name="EmailTextField">EmailTextField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31072.25, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EmailTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EmailTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="EmailTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EmailTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EmailTextField">+formControlName: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EmailTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControl">
-							<rect x="59651.0" y="3485.0" height="31.0" width="113.0" data-name="FormControl"></rect>
-						</g>
-						<g transform="translate(59651, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControl">
-								<text x="48.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControl">FormControl</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PasswordTextField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PasswordTextField">
-							<rect x="31433.3" y="2564.0" height="122.0" width="479.0" data-name="PasswordTextField"></rect>
-							<path d="M31433.3 2595.0 L31912.3 2595.0" fill="none" data-name="PasswordTextField"></path>
-						</g>
-						<g transform="translate(31433.25, 2564)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PasswordTextField">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="PasswordTextField">PasswordTextField</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31433.25, 2595)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PasswordTextField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PasswordTextField">
-								<text x="0.0" y="13.5" stroke="none" data-name="PasswordTextField">+labelText: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PasswordTextField">+hintText: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PasswordTextField">+onSubmitted: dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PasswordTextField">+formControlName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PasswordTextField">+formControl: FormControl&lt;dynamic&gt;?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<rect x="32204.8" y="3485.0" height="31.0" width="360.0" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?"></rect>
-						</g>
-						<g transform="translate(32204.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">
-								<text x="172.0" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function(FormControl&lt;dynamic&gt;)?">dynamic Function(FormControl&lt;dynamic&gt;)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUJobsToBeDone">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUJobsToBeDone">
-							<rect x="77707.5" y="105.5" height="62.0" width="194.0" data-name="StudyUJobsToBeDone"></rect>
-							<path d="M77707.5 136.5 L77901.5 136.5" fill="none" data-name="StudyUJobsToBeDone"></path>
-						</g>
-						<g transform="translate(77707.5, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUJobsToBeDone">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUJobsToBeDone">StudyUJobsToBeDone</text>
-								
-							</g>
-						</g>
-						<g transform="translate(77707.5, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUJobsToBeDone">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUJobsToBeDone">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUJobsToBeDone">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthFormController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthFormController">
-							<rect x="43369.0" y="2368.5" height="513.0" width="850.0" data-name="AuthFormController"></rect>
-							<path d="M43369.0 2399.5 L44219.0 2399.5" fill="none" data-name="AuthFormController"></path>
-							<path d="M43369.0 2655.5 L44219.0 2655.5" fill="none" data-name="AuthFormController"></path>
-						</g>
-						<g transform="translate(43369, 2368.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthFormController">
-								<text x="417.0" y="13.5" stroke="none" text-anchor="middle" data-name="AuthFormController">AuthFormController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43369, 2399.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">+notificationService: INotificationService</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+passwordControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">+passwordConfirmationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+termsOfServiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">&lt;static&gt;+authValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+loginForm: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+signupForm: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+passwordForgotForm: FormGroup</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+passwordRecoveryForm: FormGroup</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+controlValidatorsByForm: Map&lt;AuthFormKey, Map&lt;FormControl&lt;dynamic&gt;, List&lt;Validator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-_formKey: AuthFormKey</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="AuthFormController">+formKey: AuthFormKey</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="AuthFormController">+form: FormGroup</text>
-								
-							</g>
-						</g>
-						<g transform="translate(43369, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthFormController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthFormController">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthFormController">-dynamic _getFormFor()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthFormController">-dynamic _onChangeFormKey()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthFormController">+dynamic resetControlsFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthFormController">-dynamic _forceValidationMessages()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthFormController">+dynamic signUp()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthFormController">-dynamic _signUp()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthFormController">+dynamic signIn()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthFormController">-dynamic _signInWith()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="AuthFormController">+dynamic signOut()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="AuthFormController">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="AuthFormController">+dynamic sendPasswordResetLink()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="AuthFormController">+dynamic recoverPassword()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="AuthFormController">+dynamic updateUser()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="AuthFormController">-dynamic _readDebugUser()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAuthRepository">
-							<rect x="72021.8" y="4020.0" height="228.0" width="295.0" data-name="IAuthRepository"></rect>
-							<path d="M72021.8 4051.0 L72316.8 4051.0" fill="none" data-name="IAuthRepository"></path>
-							<path d="M72021.8 4142.0 L72316.8 4142.0" fill="none" data-name="IAuthRepository"></path>
-						</g>
-						<g transform="translate(72021.75, 4020)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAuthRepository">
-								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="IAuthRepository">IAuthRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72021.75, 4051)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+allowPasswordReset: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+currentUser: User?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+isLoggedIn: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+session: Session?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+serializedSession: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72021.75, 4142)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAuthRepository">+dynamic signUp()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAuthRepository">+dynamic signInWith()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IAuthRepository">+dynamic signOut()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IAuthRepository">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IAuthRepository">+dynamic updateUser()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IAuthRepository">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormGroup">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormGroup">
-							<rect x="62924.3" y="3485.0" height="31.0" width="105.0" data-name="FormGroup"></rect>
-						</g>
-						<g transform="translate(62924.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormGroup">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormGroup">
-								<text x="44.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormGroup">FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormGroupController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormGroupController">
-							<rect x="45870.3" y="105.5" height="62.0" width="187.0" data-name="IFormGroupController"></rect>
-							<path d="M45870.3 136.5 L46057.3 136.5" fill="none" data-name="IFormGroupController"></path>
-						</g>
-						<g transform="translate(45870.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormGroupController">
-								<text x="85.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormGroupController">IFormGroupController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45870.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormGroupController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormGroupController">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormGroupController">+form: FormGroup</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppStatus">
-							<rect x="1364.0" y="3447.0" height="107.0" width="279.0" data-name="AppStatus"></rect>
-							<path d="M1364.0 3478.0 L1643.0 3478.0" fill="none" data-name="AppStatus"></path>
-						</g>
-						<g transform="translate(1364, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppStatus">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppStatus">AppStatus</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1364, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppStatus">&lt;static&gt;+values: List&lt;AppStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initializing: AppStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppStatus">&lt;static&gt;+initialized: AppStatus</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArrayTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArrayTable">
-							<rect x="32306.3" y="2428.5" height="393.0" width="490.0" data-name="FormArrayTable"></rect>
-							<path d="M32306.3 2459.5 L32796.3 2459.5" fill="none" data-name="FormArrayTable"></path>
-							<path d="M32306.3 2760.5 L32796.3 2760.5" fill="none" data-name="FormArrayTable"></path>
-						</g>
-						<g transform="translate(32306.25, 2428.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArrayTable">
-								<text x="237.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArrayTable">FormArrayTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32306.25, 2459.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">+items: List&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">+onSelectItem: void Function(T)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormArrayTable">+getActionsAt: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormArrayTable">+onNewItem: void Function()?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormArrayTable">+rowTitle: String Function(T)</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormArrayTable">+onNewItemLabel: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormArrayTable">+sectionTitle: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormArrayTable">+sectionDescription: String?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormArrayTable">+emptyIcon: IconData?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormArrayTable">+emptyTitle: String?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormArrayTable">+emptyDescription: String?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormArrayTable">+sectionTitleDivider: bool?</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormArrayTable">+rowPrefix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormArrayTable">+rowSuffix: Widget Function(BuildContext, T, int)?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormArrayTable">+leadingWidget: Widget?</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormArrayTable">+itemsSectionPadding: EdgeInsets?</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormArrayTable">+hideLeadingTrailingWhenEmpty: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormArrayTable">&lt;static&gt;+columns: List&lt;StandardTableColumn&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(32306.25, 2760.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormArrayTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormArrayTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormArrayTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormArrayTable">-List&lt;Widget&gt; _buildRow()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormArrayTable">-Widget _newItemButton()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<rect x="32726.5" y="3485.0" height="31.0" width="371.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)"></rect>
-						</g>
-						<g transform="translate(32726.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">
-								<text x="177.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(T, int)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="String Function(T)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function(T)">
-							<rect x="33177.5" y="3485.0" height="31.0" width="157.0" data-name="String Function(T)"></rect>
-						</g>
-						<g transform="translate(33177.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function(T)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function(T)">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function(T)">String Function(T)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, T, int)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T, int)?">
-							<rect x="33374.5" y="3485.0" height="31.0" width="315.0" data-name="Widget Function(BuildContext, T, int)?"></rect>
-						</g>
-						<g transform="translate(33374.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T, int)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T, int)?">
-								<text x="149.5" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T, int)?">Widget Function(BuildContext, T, int)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ManagedFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ManagedFormViewModel">
-							<rect x="56129.8" y="1666.5" height="62.0" width="396.0" data-name="ManagedFormViewModel"></rect>
-							<path d="M56129.8 1697.5 L56525.8 1697.5" fill="none" data-name="ManagedFormViewModel"></path>
-						</g>
-						<g transform="translate(56129.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ManagedFormViewModel">
-								<text x="190.0" y="13.5" stroke="none" text-anchor="middle" data-name="ManagedFormViewModel">ManagedFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(56129.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ManagedFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ManagedFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ManagedFormViewModel">+ManagedFormViewModel&lt;T&gt; createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModel">
-							<rect x="68250.8" y="313.0" height="633.0" width="872.0" data-name="FormViewModel"></rect>
-							<path d="M68250.8 344.0 L69122.8 344.0" fill="none" data-name="FormViewModel"></path>
-							<path d="M68250.8 660.0 L69122.8 660.0" fill="none" data-name="FormViewModel"></path>
-						</g>
-						<g transform="translate(68250.75, 313)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModel">
-								<text x="428.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModel">FormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(68250.75, 344)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-_formData: T?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-_formMode: FormMode</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-_validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">+delegate: IFormViewModelDelegate&lt;FormViewModel&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">+autosave: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenSubscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">-_immediateFormChildrenListenerDebouncer: Debouncer?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-_autosaveOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">-_defaultControlValidators: Map&lt;String, Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+prevFormValue: Map&lt;String, dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">&lt;static&gt;-_formKey: String</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+formData: T?</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+formMode: FormMode</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+isReadonly: bool</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+validationSet: FormValidationSetEnum?</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+isDirty: bool</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+title: String</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+isValid: bool</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="FormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="FormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(68250.75, 660)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModel">-dynamic _setFormData()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModel">-dynamic _rememberDefaultControlValidators()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModel">-Tuple&lt;List&lt;Validator&lt;dynamic&gt;&gt;, List&lt;AsyncValidator&lt;dynamic&gt;&gt;&gt;? _getDefaultValidators()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModel">-dynamic _disableAllControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModel">-dynamic _formModeUpdated()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModel">-dynamic _restoreControlsFromFormData()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModel">+void revalidate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModel">-void _applyValidationSet()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModel">+void read()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="FormViewModel">+dynamic save()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="FormViewModel">+dynamic cancel()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="FormViewModel">+void enableAutosave()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="FormViewModel">+void listenToImmediateFormChildren()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="FormViewModel">+dynamic markFormGroupChanged()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="FormViewModel">+void dispose()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="FormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="FormViewModel">+T buildFormData()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="FormViewModel">+void initControls()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelNotFoundException">
-							<rect x="72324.5" y="614.0" height="31.0" width="296.0" data-name="FormViewModelNotFoundException"></rect>
-						</g>
-						<g transform="translate(72324.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelNotFoundException">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelNotFoundException">FormViewModelNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Exception">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Exception">
-							<rect x="74713.3" y="121.0" height="31.0" width="94.0" data-name="Exception"></rect>
-						</g>
-						<g transform="translate(74713.25, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Exception">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Exception">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="Exception">Exception</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormViewModelCollection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormViewModelCollection">
-							<rect x="65238.8" y="3707.0" height="273.0" width="281.0" data-name="FormViewModelCollection"></rect>
-							<path d="M65238.8 3738.0 L65519.8 3738.0" fill="none" data-name="FormViewModelCollection"></path>
-							<path d="M65238.8 3829.0 L65519.8 3829.0" fill="none" data-name="FormViewModelCollection"></path>
-						</g>
-						<g transform="translate(65238.75, 3707)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormViewModelCollection">
-								<text x="132.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormViewModelCollection">FormViewModelCollection</text>
-								
-							</g>
-						</g>
-						<g transform="translate(65238.75, 3738)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+formViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+formArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+stagedViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+retrievableViewModels: List&lt;T&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+formData: List&lt;D&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(65238.75, 3829)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormViewModelCollection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormViewModelCollection">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormViewModelCollection">+void add()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormViewModelCollection">+T remove()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormViewModelCollection">+T? findWhere()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormViewModelCollection">+T? removeWhere()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormViewModelCollection">+bool contains()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="FormViewModelCollection">+void stage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="FormViewModelCollection">+T commit()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="FormViewModelCollection">+void reset()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="FormViewModelCollection">+void read()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormArray">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormArray">
-							<rect x="63009.3" y="4118.5" height="31.0" width="98.0" data-name="FormArray"></rect>
-						</g>
-						<g transform="translate(63009.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormArray">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormArray">
-								<text x="41.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormArray">FormArray</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CustomFormControl">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CustomFormControl">
-							<rect x="59501.0" y="3759.5" height="168.0" width="413.0" data-name="CustomFormControl"></rect>
-							<path d="M59501.0 3790.5 L59914.0 3790.5" fill="none" data-name="CustomFormControl"></path>
-							<path d="M59501.0 3896.5 L59914.0 3896.5" fill="none" data-name="CustomFormControl"></path>
-						</g>
-						<g transform="translate(59501, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CustomFormControl">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="CustomFormControl">CustomFormControl</text>
-								
-							</g>
-						</g>
-						<g transform="translate(59501, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">-_onValueChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CustomFormControl">-_onStatusChangedDebouncer: Debouncer?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CustomFormControl">+onValueChanged: void Function(T?)?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CustomFormControl">+onStatusChanged: void Function(ControlStatus)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CustomFormControl">+onStatusChangedDebounceTime: int?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="CustomFormControl">+onValueChangedDebounceTime: int?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(59501, 3896.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CustomFormControl">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CustomFormControl">
-								<text x="0.0" y="13.5" stroke="none" data-name="CustomFormControl">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(T?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(T?)?">
-							<rect x="59789.3" y="4118.5" height="31.0" width="164.0" data-name="void Function(T?)?"></rect>
-						</g>
-						<g transform="translate(59789.25, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(T?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(T?)?">
-								<text x="74.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(T?)?">void Function(T?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(ControlStatus)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(ControlStatus)?">
-							<rect x="61217.8" y="4118.5" height="31.0" width="251.0" data-name="void Function(ControlStatus)?"></rect>
-						</g>
-						<g transform="translate(61217.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(ControlStatus)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(ControlStatus)?">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(ControlStatus)?">void Function(ControlStatus)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="UnsavedChangesDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UnsavedChangesDialog">
-							<rect x="79306.0" y="105.5" height="62.0" width="207.0" data-name="UnsavedChangesDialog"></rect>
-							<path d="M79306.0 136.5 L79513.0 136.5" fill="none" data-name="UnsavedChangesDialog"></path>
-						</g>
-						<g transform="translate(79306, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UnsavedChangesDialog">
-								<text x="95.5" y="13.5" stroke="none" text-anchor="middle" data-name="UnsavedChangesDialog">UnsavedChangesDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(79306, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UnsavedChangesDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UnsavedChangesDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="UnsavedChangesDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormValidationSetEnum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormValidationSetEnum">
-							<rect x="59700.3" y="1197.0" height="31.0" width="205.0" data-name="FormValidationSetEnum"></rect>
-						</g>
-						<g transform="translate(59700.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FormValidationSetEnum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormValidationSetEnum">
-								<text x="94.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormValidationSetEnum">FormValidationSetEnum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControlValidation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlValidation">
-							<rect x="34396.3" y="2556.0" height="138.0" width="485.0" data-name="FormControlValidation"></rect>
-							<path d="M34396.3 2587.0 L34881.3 2587.0" fill="none" data-name="FormControlValidation"></path>
-							<path d="M34396.3 2663.0 L34881.3 2663.0" fill="none" data-name="FormControlValidation"></path>
-						</g>
-						<g transform="translate(34396.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlValidation">
-								<text x="234.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlValidation">FormControlValidation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34396.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+control: AbstractControl&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlValidation">+validators: List&lt;Validator&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlValidation">+asyncValidators: List&lt;AsyncValidator&lt;dynamic&gt;&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlValidation">+validationMessages: Map&lt;String, String Function(Object)&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34396.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlValidation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlValidation">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlValidation">+FormControlValidation merge()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormData">
-							<rect x="49565.8" y="1166.0" height="93.0" width="163.0" data-name="IFormData"></rect>
-							<path d="M49565.8 1197.0 L49728.8 1197.0" fill="none" data-name="IFormData"></path>
-							<path d="M49565.8 1228.0 L49728.8 1228.0" fill="none" data-name="IFormData"></path>
-						</g>
-						<g transform="translate(49565.75, 1166)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormData">
-								<text x="73.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormData">IFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(49565.75, 1197)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(49565.75, 1228)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormData">+IFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormInvalidException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormInvalidException">
-							<rect x="74248.3" y="614.0" height="31.0" width="186.0" data-name="FormInvalidException"></rect>
-						</g>
-						<g transform="translate(74248.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormInvalidException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormInvalidException">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormInvalidException">FormInvalidException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormConfigException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormConfigException">
-							<rect x="74474.3" y="598.5" height="62.0" width="185.0" data-name="FormConfigException"></rect>
-							<path d="M74474.3 629.5 L74659.3 629.5" fill="none" data-name="FormConfigException"></path>
-						</g>
-						<g transform="translate(74474.25, 598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormConfigException">
-								<text x="84.5" y="13.5" stroke="none" text-anchor="middle" data-name="FormConfigException">FormConfigException</text>
-								
-							</g>
-						</g>
-						<g transform="translate(74474.25, 629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormConfigException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormConfigException">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormConfigException">+message: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormViewModelDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormViewModelDelegate">
-							<rect x="67186.3" y="1174.0" height="77.0" width="217.0" data-name="IFormViewModelDelegate"></rect>
-							<path d="M67186.3 1205.0 L67403.3 1205.0" fill="none" data-name="IFormViewModelDelegate"></path>
-						</g>
-						<g transform="translate(67186.25, 1174)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormViewModelDelegate">
-								<text x="100.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFormViewModelDelegate">IFormViewModelDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(67186.25, 1205)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormViewModelDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormViewModelDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormViewModelDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormViewModelDelegate">+void onCancel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormControlOption">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormControlOption">
-							<rect x="12137.0" y="2571.5" height="107.0" width="190.0" data-name="FormControlOption"></rect>
-							<path d="M12137.0 2602.5 L12327.0 2602.5" fill="none" data-name="FormControlOption"></path>
-						</g>
-						<g transform="translate(12137, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormControlOption">
-								<text x="87.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormControlOption">FormControlOption</text>
-								
-							</g>
-						</g>
-						<g transform="translate(12137, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormControlOption">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormControlOption">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormControlOption">+value: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormControlOption">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormControlOption">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormControlOption">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FormMode">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FormMode">
-							<rect x="25064.3" y="3439.5" height="122.0" width="282.0" data-name="FormMode"></rect>
-							<path d="M25064.3 3470.5 L25346.3 3470.5" fill="none" data-name="FormMode"></path>
-						</g>
-						<g transform="translate(25064.25, 3439.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FormMode">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="FormMode">FormMode</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25064.25, 3470.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FormMode">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FormMode">
-								<text x="0.0" y="13.5" stroke="none" data-name="FormMode">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FormMode">&lt;static&gt;+values: List&lt;FormMode&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FormMode">&lt;static&gt;+create: FormMode</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FormMode">&lt;static&gt;+readonly: FormMode</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="FormMode">&lt;static&gt;+edit: FormMode</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrolledBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrolledBadge">
-							<rect x="79553.0" y="90.0" height="93.0" width="166.0" data-name="EnrolledBadge"></rect>
-							<path d="M79553.0 121.0 L79719.0 121.0" fill="none" data-name="EnrolledBadge"></path>
-							<path d="M79553.0 152.0 L79719.0 152.0" fill="none" data-name="EnrolledBadge"></path>
-						</g>
-						<g transform="translate(79553, 90)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrolledBadge">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrolledBadge">EnrolledBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(79553, 121)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+enrolledCount: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(79553, 152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrolledBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrolledBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrolledBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRecruitController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitController">
-							<rect x="75240.5" y="1121.0" height="183.0" width="651.0" data-name="StudyRecruitController"></rect>
-							<path d="M75240.5 1152.0 L75891.5 1152.0" fill="none" data-name="StudyRecruitController"></path>
-							<path d="M75240.5 1198.0 L75891.5 1198.0" fill="none" data-name="StudyRecruitController"></path>
-						</g>
-						<g transform="translate(75240.5, 1121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitController">
-								<text x="317.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitController">StudyRecruitController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(75240.5, 1152)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">-_invitesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;StudyInvite&gt;&gt;&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(75240.5, 1198)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitController">-dynamic _subscribeInvites()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitController">+Intervention? getIntervention()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitController">+int getParticipantCountForInvite()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRecruitController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRecruitController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IInviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IInviteCodeRepository">
-							<rect x="81706.3" y="1666.5" height="62.0" width="265.0" data-name="IInviteCodeRepository"></rect>
-							<path d="M81706.3 1697.5 L81971.3 1697.5" fill="none" data-name="IInviteCodeRepository"></path>
-						</g>
-						<g transform="translate(81706.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IInviteCodeRepository">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="IInviteCodeRepository">IInviteCodeRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(81706.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IInviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IInviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IInviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamSubscription">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamSubscription">
-							<rect x="72034.0" y="3485.0" height="31.0" width="170.0" data-name="StreamSubscription"></rect>
-						</g>
-						<g transform="translate(72034, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamSubscription">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamSubscription">
-								<text x="77.0" y="13.5" stroke="none" text-anchor="middle" data-name="StreamSubscription">StreamSubscription</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyBaseController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyBaseController">
-							<rect x="72890.3" y="538.0" height="183.0" width="546.0" data-name="StudyBaseController"></rect>
-							<path d="M72890.3 569.0 L73436.3 569.0" fill="none" data-name="StudyBaseController"></path>
-							<path d="M72890.3 645.0 L73436.3 645.0" fill="none" data-name="StudyBaseController"></path>
-						</g>
-						<g transform="translate(72890.25, 538)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyBaseController">
-								<text x="265.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyBaseController">StudyBaseController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72890.25, 569)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+router: GoRouter</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+studySubscription: StreamSubscription&lt;WrappedModel&lt;Study&gt;&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72890.25, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyBaseController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyBaseController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyBaseController">+dynamic subscribeStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyBaseController">+dynamic onStudySubscriptionError()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyBaseController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRecruitScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRecruitScreen">
-							<rect x="31952.3" y="2571.5" height="107.0" width="314.0" data-name="StudyRecruitScreen"></rect>
-							<path d="M31952.3 2602.5 L32266.3 2602.5" fill="none" data-name="StudyRecruitScreen"></path>
-						</g>
-						<g transform="translate(31952.25, 2571.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRecruitScreen">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRecruitScreen">StudyRecruitScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(31952.25, 2602.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRecruitScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRecruitScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRecruitScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRecruitScreen">-Widget _inviteCodesSectionHeader()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRecruitScreen">-Widget _newInviteCodeButton()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRecruitScreen">-dynamic _onSelectInvite()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormView">
-							<rect x="80769.3" y="575.5" height="108.0" width="438.0" data-name="InviteCodeFormView"></rect>
-							<path d="M80769.3 606.5 L81207.3 606.5" fill="none" data-name="InviteCodeFormView"></path>
-							<path d="M80769.3 637.5 L81207.3 637.5" fill="none" data-name="InviteCodeFormView"></path>
-						</g>
-						<g transform="translate(80769.25, 575.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormView">
-								<text x="211.0" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormView">InviteCodeFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(80769.25, 606.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+formViewModel: InviteCodeFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(80769.25, 637.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormView">-List&lt;FormTableRow&gt; _conditionalInterventionRows()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeFormViewModel">
-							<rect x="72779.5" y="1023.5" height="378.0" width="667.0" data-name="InviteCodeFormViewModel"></rect>
-							<path d="M72779.5 1054.5 L73446.5 1054.5" fill="none" data-name="InviteCodeFormViewModel"></path>
-							<path d="M72779.5 1280.5 L73446.5 1280.5" fill="none" data-name="InviteCodeFormViewModel"></path>
-						</g>
-						<g transform="translate(72779.5, 1023.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeFormViewModel">
-								<text x="325.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeFormViewModel">InviteCodeFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72779.5, 1054.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">+inviteCodeRepository: IInviteCodeRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">+codeControlValidationMessages: Map&lt;String, String Function(dynamic)&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredScheduleControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionAControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionBControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InviteCodeFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InviteCodeFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InviteCodeFormViewModel">+interventionControlOptions: List&lt;FormControlOption&lt;String&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredScheduleTypeOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InviteCodeFormViewModel">+isPreconfiguredSchedule: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InviteCodeFormViewModel">+preconfiguredSchedule: List&lt;String&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72779.5, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeFormViewModel">+void initControls()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeFormViewModel">-dynamic _uniqueInviteCode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeFormViewModel">+void regenerateCode()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeFormViewModel">-String _generateCode()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeFormViewModel">+StudyInvite buildFormData()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeFormViewModel">+dynamic save()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInvitesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInvitesTable">
-							<rect x="78274.8" y="45.0" height="183.0" width="566.0" data-name="StudyInvitesTable"></rect>
-							<path d="M78274.8 76.0 L78840.8 76.0" fill="none" data-name="StudyInvitesTable"></path>
-							<path d="M78274.8 182.0 L78840.8 182.0" fill="none" data-name="StudyInvitesTable"></path>
-						</g>
-						<g transform="translate(78274.75, 45)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInvitesTable">
-								<text x="275.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInvitesTable">StudyInvitesTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(78274.75, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+invites: List&lt;StudyInvite&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">+onSelect: void Function(StudyInvite)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInvitesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInvitesTable">+getInlineActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInvitesTable">+getIntervention: Intervention? Function(String)</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInvitesTable">+getParticipantCountForInvite: int Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(78274.75, 182)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInvitesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInvitesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInvitesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInvitesTable">-List&lt;Widget&gt; _buildRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(StudyInvite)">
-							<rect x="77763.3" y="614.0" height="31.0" width="222.0" data-name="void Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(77763.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(StudyInvite)">
-								<text x="103.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(StudyInvite)">void Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<rect x="78025.3" y="614.0" height="31.0" width="420.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(78025.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">
-								<text x="202.0" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Intervention? Function(String)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Intervention? Function(String)">
-							<rect x="78485.3" y="614.0" height="31.0" width="251.0" data-name="Intervention? Function(String)"></rect>
-						</g>
-						<g transform="translate(78485.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Intervention? Function(String)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Intervention? Function(String)">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="Intervention? Function(String)">Intervention? Function(String)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="int Function(StudyInvite)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="int Function(StudyInvite)">
-							<rect x="78776.3" y="614.0" height="31.0" width="208.0" data-name="int Function(StudyInvite)"></rect>
-						</g>
-						<g transform="translate(78776.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="int Function(StudyInvite)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="int Function(StudyInvite)">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="int Function(StudyInvite)">int Function(StudyInvite)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PublishSuccessDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishSuccessDialog">
-							<rect x="34921.3" y="2594.0" height="62.0" width="191.0" data-name="PublishSuccessDialog"></rect>
-							<path d="M34921.3 2625.0 L35112.3 2625.0" fill="none" data-name="PublishSuccessDialog"></path>
-						</g>
-						<g transform="translate(34921.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishSuccessDialog">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="PublishSuccessDialog">PublishSuccessDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34921.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishSuccessDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishSuccessDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishSuccessDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PublishDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishDialog">
-							<rect x="35152.3" y="2594.0" height="62.0" width="136.0" data-name="PublishDialog"></rect>
-							<path d="M35152.3 2625.0 L35288.3 2625.0" fill="none" data-name="PublishDialog"></path>
-						</g>
-						<g transform="translate(35152.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishDialog">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishDialog">PublishDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35152.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PublishConfirmationDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PublishConfirmationDialog">
-							<rect x="35328.3" y="2594.0" height="62.0" width="224.0" data-name="PublishConfirmationDialog"></rect>
-							<path d="M35328.3 2625.0 L35552.3 2625.0" fill="none" data-name="PublishConfirmationDialog"></path>
-						</g>
-						<g transform="translate(35328.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PublishConfirmationDialog">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="PublishConfirmationDialog">PublishConfirmationDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35328.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PublishConfirmationDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PublishConfirmationDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="PublishConfirmationDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FrameControlsWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FrameControlsWidget">
-							<rect x="18326.3" y="3782.0" height="123.0" width="291.0" data-name="FrameControlsWidget"></rect>
-							<path d="M18326.3 3813.0 L18617.3 3813.0" fill="none" data-name="FrameControlsWidget"></path>
-							<path d="M18326.3 3874.0 L18617.3 3874.0" fill="none" data-name="FrameControlsWidget"></path>
-						</g>
-						<g transform="translate(18326.25, 3782)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FrameControlsWidget">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="FrameControlsWidget">FrameControlsWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18326.25, 3813)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+onRefresh: void Function()?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FrameControlsWidget">+onOpenNewTab: void Function()?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FrameControlsWidget">+enabled: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(18326.25, 3874)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FrameControlsWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FrameControlsWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="FrameControlsWidget">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyStatusBadgeViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyStatusBadgeViewModel">
-							<rect x="36047.3" y="2586.5" height="77.0" width="285.0" data-name="IStudyStatusBadgeViewModel"></rect>
-							<path d="M36047.3 2617.5 L36332.3 2617.5" fill="none" data-name="IStudyStatusBadgeViewModel"></path>
-						</g>
-						<g transform="translate(36047.25, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyStatusBadgeViewModel">
-								<text x="134.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyStatusBadgeViewModel">IStudyStatusBadgeViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36047.25, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyStatusBadgeViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyStatusBadgeViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyParticipation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyStatusBadgeViewModel">+studyStatus: StudyStatus?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Participation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Participation">
-							<rect x="37084.5" y="3485.0" height="31.0" width="114.0" data-name="Participation"></rect>
-						</g>
-						<g transform="translate(37084.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Participation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Participation">
-								<text x="49.0" y="13.5" stroke="none" text-anchor="middle" data-name="Participation">Participation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatus">
-							<rect x="34202.5" y="3485.0" height="31.0" width="111.0" data-name="StudyStatus"></rect>
-						</g>
-						<g transform="translate(34202.5, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatus">
-								<text x="47.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatus">StudyStatus</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyStatusBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyStatusBadge">
-							<rect x="36372.3" y="2548.5" height="153.0" width="241.0" data-name="StudyStatusBadge"></rect>
-							<path d="M36372.3 2579.5 L36613.3 2579.5" fill="none" data-name="StudyStatusBadge"></path>
-							<path d="M36372.3 2670.5 L36613.3 2670.5" fill="none" data-name="StudyStatusBadge"></path>
-						</g>
-						<g transform="translate(36372.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyStatusBadge">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyStatusBadge">StudyStatusBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36372.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+participation: Participation?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyStatusBadge">+status: StudyStatus?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyStatusBadge">+type: BadgeType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyStatusBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyStatusBadge">+showTooltip: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36372.25, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyStatusBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyStatusBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyStatusBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="RouteInformation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RouteInformation">
-							<rect x="34353.5" y="3431.5" height="138.0" width="152.0" data-name="RouteInformation"></rect>
-							<path d="M34353.5 3462.5 L34505.5 3462.5" fill="none" data-name="RouteInformation"></path>
-							<path d="M34353.5 3538.5 L34505.5 3538.5" fill="none" data-name="RouteInformation"></path>
-						</g>
-						<g transform="translate(34353.5, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RouteInformation">
-								<text x="68.0" y="13.5" stroke="none" text-anchor="middle" data-name="RouteInformation">RouteInformation</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34353.5, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+route: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RouteInformation">+extra: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RouteInformation">+cmd: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RouteInformation">+data: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(34353.5, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RouteInformation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RouteInformation">
-								<text x="0.0" y="13.5" stroke="none" data-name="RouteInformation">+String toString()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PlatformController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PlatformController">
-							<rect x="36705.5" y="2496.0" height="258.0" width="302.0" data-name="PlatformController"></rect>
-							<path d="M36705.5 2527.0 L37007.5 2527.0" fill="none" data-name="PlatformController"></path>
-							<path d="M36705.5 2618.0 L37007.5 2618.0" fill="none" data-name="PlatformController"></path>
-						</g>
-						<g transform="translate(36705.5, 2496)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PlatformController">
-								<text x="143.0" y="13.5" stroke="none" text-anchor="middle" data-name="PlatformController">PlatformController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36705.5, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+baseSrc: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+previewSrc: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+routeInformation: RouteInformation</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+frameWidget: Widget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36705.5, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PlatformController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PlatformController">
-								<text x="0.0" y="13.5" stroke="none" data-name="PlatformController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PlatformController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PlatformController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PlatformController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PlatformController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PlatformController">+void listen()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PlatformController">+void send()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PlatformController">+void openNewPage()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WebController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebController">
-							<rect x="35508.5" y="3401.5" height="198.0" width="273.0" data-name="WebController"></rect>
-							<path d="M35508.5 3432.5 L35781.5 3432.5" fill="none" data-name="WebController"></path>
-							<path d="M35508.5 3463.5 L35781.5 3463.5" fill="none" data-name="WebController"></path>
-						</g>
-						<g transform="translate(35508.5, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebController">
-								<text x="128.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebController">WebController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35508.5, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+iFrameElement: IFrameElement</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35508.5, 3463.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebController">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebController">+void activate()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebController">+void registerViews()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WebController">+void generateUrl()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WebController">+void navigate()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WebController">+void refresh()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WebController">+void openNewPage()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WebController">+void listen()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WebController">+void send()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFrameElement">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFrameElement">
-							<rect x="35577.5" y="3828.0" height="31.0" width="135.0" data-name="IFrameElement"></rect>
-						</g>
-						<g transform="translate(35577.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IFrameElement">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFrameElement">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="IFrameElement">IFrameElement</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MobileController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileController">
-							<rect x="35821.5" y="3417.0" height="167.0" width="191.0" data-name="MobileController"></rect>
-							<path d="M35821.5 3448.0 L36012.5 3448.0" fill="none" data-name="MobileController"></path>
-						</g>
-						<g transform="translate(35821.5, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileController">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="MobileController">MobileController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35821.5, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileController">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileController">+void openNewPage()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MobileController">+void refresh()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MobileController">+void registerViews()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MobileController">+void listen()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MobileController">+void send()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MobileController">+void navigate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MobileController">+void activate()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MobileController">+void generateUrl()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyController">
-							<rect x="71961.3" y="2511.0" height="228.0" width="573.0" data-name="StudyController"></rect>
-							<path d="M71961.3 2542.0 L72534.3 2542.0" fill="none" data-name="StudyController"></path>
-							<path d="M71961.3 2603.0 L72534.3 2603.0" fill="none" data-name="StudyController"></path>
-						</g>
-						<g transform="translate(71961.25, 2511)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyController">
-								<text x="278.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyController">StudyController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(71961.25, 2542)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+notificationService: INotificationService</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+studyEventsSubscription: StreamSubscription&lt;ModelEvent&lt;Study&gt;&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">+studyActions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(71961.25, 2603)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyController">+dynamic syncStudyStatus()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyController">+dynamic onStudySubscriptionUpdate()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyController">-dynamic _redirectNewToActualStudyID()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyController">+dynamic publishStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyController">+void onChangeStudyParticipation()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyController">+void onAddParticipants()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyController">+void onSettingsPressed()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyNavViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyNavViewModel">
-							<rect x="37267.5" y="2556.5" height="137.0" width="241.0" data-name="IStudyNavViewModel"></rect>
-							<path d="M37267.5 2587.5 L37508.5 2587.5" fill="none" data-name="IStudyNavViewModel"></path>
-						</g>
-						<g transform="translate(37267.5, 2556.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyNavViewModel">
-								<text x="112.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyNavViewModel">IStudyNavViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37267.5, 2587.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyNavViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyNavViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyNavViewModel">+isEditTabEnabled: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyNavViewModel">+isTestTabEnabled: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyNavViewModel">+isRecruitTabEnabled: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IStudyNavViewModel">+isMonitorTabEnabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IStudyNavViewModel">+isAnalyzeTabEnabled: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IStudyNavViewModel">+isSettingsEnabled: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNav">
-							<rect x="80000.3" y="68.0" height="137.0" width="233.0" data-name="StudyNav"></rect>
-							<path d="M80000.3 99.0 L80233.3 99.0" fill="none" data-name="StudyNav"></path>
-						</g>
-						<g transform="translate(80000.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNav">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNav">StudyNav</text>
-								
-							</g>
-						</g>
-						<g transform="translate(80000.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic edit()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic test()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic recruit()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic monitor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyNav">&lt;static&gt;+dynamic analyze()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignNav">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignNav">
-							<rect x="80273.3" y="68.0" height="137.0" width="288.0" data-name="StudyDesignNav"></rect>
-							<path d="M80273.3 99.0 L80561.3 99.0" fill="none" data-name="StudyDesignNav"></path>
-						</g>
-						<g transform="translate(80273.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignNav">
-								<text x="136.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignNav">StudyDesignNav</text>
-								
-							</g>
-						</g>
-						<g transform="translate(80273.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignNav">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignNav">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic tabs()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic info()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic enrollment()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic interventions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic measurements()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyDesignNav">&lt;static&gt;+dynamic reports()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyParticipationBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyParticipationBadge">
-							<rect x="37777.0" y="2556.0" height="138.0" width="231.0" data-name="StudyParticipationBadge"></rect>
-							<path d="M37777.0 2587.0 L38008.0 2587.0" fill="none" data-name="StudyParticipationBadge"></path>
-							<path d="M37777.0 2663.0 L38008.0 2663.0" fill="none" data-name="StudyParticipationBadge"></path>
-						</g>
-						<g transform="translate(37777, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyParticipationBadge">
-								<text x="107.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyParticipationBadge">StudyParticipationBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37777, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+participation: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyParticipationBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyParticipationBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyParticipationBadge">+center: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37777, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyParticipationBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyParticipationBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyParticipationBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyRepository">
-							<rect x="71743.0" y="3462.0" height="77.0" width="251.0" data-name="IStudyRepository"></rect>
-							<path d="M71743.0 3493.0 L71994.0 3493.0" fill="none" data-name="IStudyRepository"></path>
-						</g>
-						<g transform="translate(71743, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyRepository">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyRepository">IStudyRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(71743, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyRepository">+dynamic launch()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyRepository">+dynamic deleteParticipants()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PreviewFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreviewFrame">
-							<rect x="61046.8" y="1166.5" height="92.0" width="291.0" data-name="PreviewFrame"></rect>
-							<path d="M61046.8 1197.5 L61337.8 1197.5" fill="none" data-name="PreviewFrame"></path>
-						</g>
-						<g transform="translate(61046.75, 1166.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreviewFrame">
-								<text x="137.5" y="13.5" stroke="none" text-anchor="middle" data-name="PreviewFrame">PreviewFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(61046.75, 1197.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreviewFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreviewFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreviewFrame">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreviewFrame">+routeArgs: StudyFormRouteArgs?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreviewFrame">+route: String?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyAppBarViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyAppBarViewModel">
-							<rect x="35076.5" y="3454.5" height="92.0" width="243.0" data-name="IStudyAppBarViewModel"></rect>
-							<path d="M35076.5 3485.5 L35319.5 3485.5" fill="none" data-name="IStudyAppBarViewModel"></path>
-						</g>
-						<g transform="translate(35076.5, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyAppBarViewModel">
-								<text x="113.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyAppBarViewModel">IStudyAppBarViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35076.5, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyAppBarViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyAppBarViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyAppBarViewModel">+isSyncIndicatorVisible: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IStudyAppBarViewModel">+isStatusBadgeVisible: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IStudyAppBarViewModel">+isPublishVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScaffold">
-							<rect x="62579.3" y="1091.5" height="242.0" width="335.0" data-name="StudyScaffold"></rect>
-							<path d="M62579.3 1122.5 L62914.3 1122.5" fill="none" data-name="StudyScaffold"></path>
-						</g>
-						<g transform="translate(62579.25, 1091.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScaffold">
-								<text x="159.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScaffold">StudyScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(62579.25, 1122.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScaffold">+tabs: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScaffold">+tabsSubnav: List&lt;NavbarTab&gt;?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScaffold">+selectedTab: NavbarTab?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScaffold">+selectedTabSubnav: NavbarTab?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScaffold">+body: StudyPageWidget</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScaffold">+drawer: Widget?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScaffold">+disableActions: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScaffold">+actionsSpacing: double</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScaffold">+actionsPadding: double</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScaffold">+layoutType: SingleColumnLayoutType?</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScaffold">+appbarHeight: double</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScaffold">+appbarSubnavHeight: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WebFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WebFrame">
-							<rect x="80601.3" y="82.5" height="108.0" width="169.0" data-name="WebFrame"></rect>
-							<path d="M80601.3 113.5 L80770.3 113.5" fill="none" data-name="WebFrame"></path>
-							<path d="M80601.3 159.5 L80770.3 159.5" fill="none" data-name="WebFrame"></path>
-						</g>
-						<g transform="translate(80601.25, 82.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WebFrame">
-								<text x="76.5" y="13.5" stroke="none" text-anchor="middle" data-name="WebFrame">WebFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(80601.25, 113.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+previewSrc: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WebFrame">+studyId: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(80601.25, 159.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WebFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WebFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="WebFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DisabledFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DisabledFrame">
-							<rect x="80810.3" y="105.5" height="62.0" width="136.0" data-name="DisabledFrame"></rect>
-							<path d="M80810.3 136.5 L80946.3 136.5" fill="none" data-name="DisabledFrame"></path>
-						</g>
-						<g transform="translate(80810.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DisabledFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DisabledFrame">DisabledFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(80810.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DisabledFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DisabledFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DisabledFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PhoneContainer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhoneContainer">
-							<rect x="38048.0" y="2518.5" height="213.0" width="327.0" data-name="PhoneContainer"></rect>
-							<path d="M38048.0 2549.5 L38375.0 2549.5" fill="none" data-name="PhoneContainer"></path>
-							<path d="M38048.0 2700.5 L38375.0 2700.5" fill="none" data-name="PhoneContainer"></path>
-						</g>
-						<g transform="translate(38048, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhoneContainer">
-								<text x="155.5" y="13.5" stroke="none" text-anchor="middle" data-name="PhoneContainer">PhoneContainer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38048, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultWidth: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PhoneContainer">&lt;static&gt;+defaultHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PhoneContainer">+width: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PhoneContainer">+height: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="PhoneContainer">+borderColor: Color</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="PhoneContainer">+borderWidth: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="PhoneContainer">+borderRadius: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="PhoneContainer">+innerContent: Widget</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="PhoneContainer">+innerContentBackgroundColor: Color?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38048, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PhoneContainer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PhoneContainer">
-								<text x="0.0" y="13.5" stroke="none" data-name="PhoneContainer">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MobileFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MobileFrame">
-							<rect x="80986.3" y="105.5" height="62.0" width="136.0" data-name="MobileFrame"></rect>
-							<path d="M80986.3 136.5 L81122.3 136.5" fill="none" data-name="MobileFrame"></path>
-						</g>
-						<g transform="translate(80986.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MobileFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="MobileFrame">MobileFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(80986.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MobileFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MobileFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="MobileFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DesktopFrame">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DesktopFrame">
-							<rect x="81162.3" y="105.5" height="62.0" width="136.0" data-name="DesktopFrame"></rect>
-							<path d="M81162.3 136.5 L81298.3 136.5" fill="none" data-name="DesktopFrame"></path>
-						</g>
-						<g transform="translate(81162.25, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DesktopFrame">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="DesktopFrame">DesktopFrame</text>
-								
-							</g>
-						</g>
-						<g transform="translate(81162.25, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DesktopFrame">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DesktopFrame">
-								<text x="0.0" y="13.5" stroke="none" data-name="DesktopFrame">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTestScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestScreen">
-							<rect x="35592.3" y="2548.5" height="153.0" width="200.0" data-name="StudyTestScreen"></rect>
-							<path d="M35592.3 2579.5 L35792.3 2579.5" fill="none" data-name="StudyTestScreen"></path>
-							<path d="M35592.3 2610.5 L35792.3 2610.5" fill="none" data-name="StudyTestScreen"></path>
-						</g>
-						<g transform="translate(35592.25, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestScreen">
-								<text x="92.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestScreen">StudyTestScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35592.25, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+previewRoute: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35592.25, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestScreen">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestScreen">+Widget? banner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyTestScreen">+dynamic load()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyTestScreen">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyTestScreen">+dynamic showHelp()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySettingsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsFormViewModel">
-							<rect x="68701.0" y="2496.0" height="258.0" width="479.0" data-name="StudySettingsFormViewModel"></rect>
-							<path d="M68701.0 2527.0 L69180.0 2527.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-							<path d="M68701.0 2663.0 L69180.0 2663.0" fill="none" data-name="StudySettingsFormViewModel"></path>
-						</g>
-						<g transform="translate(68701, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsFormViewModel">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsFormViewModel">StudySettingsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(68701, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+study: AsyncValue&lt;Study&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistry: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">&lt;static&gt;+defaultPublishedToRegistryResults: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudySettingsFormViewModel">+isPublishedToRegistryResultsControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudySettingsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudySettingsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(68701, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudySettingsFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic keepControlsSynced()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudySettingsFormViewModel">+dynamic setLaunchDefaults()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySettingsDialog">
-							<rect x="35832.3" y="2594.0" height="62.0" width="175.0" data-name="StudySettingsDialog"></rect>
-							<path d="M35832.3 2625.0 L36007.3 2625.0" fill="none" data-name="StudySettingsDialog"></path>
-						</g>
-						<g transform="translate(35832.25, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySettingsDialog">
-								<text x="79.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySettingsDialog">StudySettingsDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(35832.25, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySettingsDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyTestController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyTestController">
-							<rect x="71316.3" y="3805.0" height="77.0" width="282.0" data-name="StudyTestController"></rect>
-							<path d="M71316.3 3836.0 L71598.3 3836.0" fill="none" data-name="StudyTestController"></path>
-						</g>
-						<g transform="translate(71316.25, 3805)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyTestController">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyTestController">StudyTestController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(71316.25, 3836)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyTestController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyTestController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyTestController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyTestController">+languageCode: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TestAppRoutes">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TestAppRoutes">
-							<rect x="81338.3" y="68.0" height="137.0" width="260.0" data-name="TestAppRoutes"></rect>
-							<path d="M81338.3 99.0 L81598.3 99.0" fill="none" data-name="TestAppRoutes"></path>
-						</g>
-						<g transform="translate(81338.25, 68)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TestAppRoutes">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="TestAppRoutes">TestAppRoutes</text>
-								
-							</g>
-						</g>
-						<g transform="translate(81338.25, 99)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TestAppRoutes">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TestAppRoutes">
-								<text x="0.0" y="13.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+studyOverview: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+eligibility: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+intervention: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+consent: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+journey: String</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TestAppRoutes">&lt;static&gt;+dashboard: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DrawerEntry">
-							<rect x="63703.5" y="1113.5" height="198.0" width="445.0" data-name="DrawerEntry"></rect>
-							<path d="M63703.5 1144.5 L64148.5 1144.5" fill="none" data-name="DrawerEntry"></path>
-							<path d="M63703.5 1280.5 L64148.5 1280.5" fill="none" data-name="DrawerEntry"></path>
-						</g>
-						<g transform="translate(63703.5, 1113.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DrawerEntry">
-								<text x="214.5" y="13.5" stroke="none" text-anchor="middle" data-name="DrawerEntry">DrawerEntry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(63703.5, 1144.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+localizedTitle: String Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DrawerEntry">+icon: IconData?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DrawerEntry">+localizedHelpText: String Function()?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DrawerEntry">+enabled: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DrawerEntry">+onSelected: void Function(BuildContext, WidgetRef)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DrawerEntry">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DrawerEntry">+title: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DrawerEntry">+helpText: String?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(63703.5, 1280.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="DrawerEntry">+void onClick()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="String Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()">
-							<rect x="63307.3" y="1682.0" height="31.0" width="147.0" data-name="String Function()"></rect>
-						</g>
-						<g transform="translate(63307.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()">
-								<text x="65.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()">String Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="String Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="String Function()?">
-							<rect x="63534.3" y="1682.0" height="31.0" width="157.0" data-name="String Function()?"></rect>
-						</g>
-						<g transform="translate(63534.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="String Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="String Function()?">
-								<text x="70.5" y="13.5" stroke="none" text-anchor="middle" data-name="String Function()?">String Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(BuildContext, WidgetRef)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(BuildContext, WidgetRef)?">
-							<rect x="63731.3" y="1682.0" height="31.0" width="336.0" data-name="void Function(BuildContext, WidgetRef)?"></rect>
-						</g>
-						<g transform="translate(63731.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(BuildContext, WidgetRef)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(BuildContext, WidgetRef)?">
-								<text x="160.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(BuildContext, WidgetRef)?">void Function(BuildContext, WidgetRef)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoRouterDrawerEntry">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoRouterDrawerEntry">
-							<rect x="64107.3" y="1643.5" height="108.0" width="264.0" data-name="GoRouterDrawerEntry"></rect>
-							<path d="M64107.3 1674.5 L64371.3 1674.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-							<path d="M64107.3 1720.5 L64371.3 1720.5" fill="none" data-name="GoRouterDrawerEntry"></path>
-						</g>
-						<g transform="translate(64107.25, 1643.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoRouterDrawerEntry">
-								<text x="124.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoRouterDrawerEntry">GoRouterDrawerEntry</text>
-								
-							</g>
-						</g>
-						<g transform="translate(64107.25, 1674.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+intent: RoutingIntent</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="GoRouterDrawerEntry">+onNavigated: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(64107.25, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="GoRouterDrawerEntry">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="GoRouterDrawerEntry">
-								<text x="0.0" y="13.5" stroke="none" data-name="GoRouterDrawerEntry">+void onClick()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppDrawer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppDrawer">
-							<rect x="81638.3" y="53.0" height="167.0" width="269.0" data-name="AppDrawer"></rect>
-							<path d="M81638.3 84.0 L81907.3 84.0" fill="none" data-name="AppDrawer"></path>
-						</g>
-						<g transform="translate(81638.25, 53)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppDrawer">
-								<text x="126.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppDrawer">AppDrawer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(81638.25, 84)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppDrawer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppDrawer">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppDrawer">+width: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppDrawer">+autoCloseDrawer: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppDrawer">+leftPaddingEntries: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppDrawer">+logoPaddingVertical: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AppDrawer">+logoPaddingHorizontal: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AppDrawer">+logoMaxHeight: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AppDrawer">+logoSectionMinHeight: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AppDrawer">+logoSectionMaxHeight: double</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyAnalyzeScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeScreen">
-							<rect x="37047.5" y="2586.5" height="77.0" width="180.0" data-name="StudyAnalyzeScreen"></rect>
-							<path d="M37047.5 2617.5 L37227.5 2617.5" fill="none" data-name="StudyAnalyzeScreen"></path>
-						</g>
-						<g transform="translate(37047.5, 2586.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeScreen">
-								<text x="82.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeScreen">StudyAnalyzeScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(37047.5, 2617.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget? banner()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyAnalyzeScreen">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyAnalyzeController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyAnalyzeController">
-							<rect x="73526.5" y="1181.5" height="62.0" width="201.0" data-name="StudyAnalyzeController"></rect>
-							<path d="M73526.5 1212.5 L73727.5 1212.5" fill="none" data-name="StudyAnalyzeController"></path>
-						</g>
-						<g transform="translate(73526.5, 1181.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyAnalyzeController">
-								<text x="92.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyAnalyzeController">StudyAnalyzeController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(73526.5, 1212.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyAnalyzeController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyAnalyzeController">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyAnalyzeController">+dynamic onExport()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignInterventionsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInterventionsFormView">
-							<rect x="36052.5" y="3469.5" height="62.0" width="296.0" data-name="StudyDesignInterventionsFormView"></rect>
-							<path d="M36052.5 3500.5 L36348.5 3500.5" fill="none" data-name="StudyDesignInterventionsFormView"></path>
-						</g>
-						<g transform="translate(36052.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInterventionsFormView">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInterventionsFormView">StudyDesignInterventionsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36052.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInterventionsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInterventionsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInterventionsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignPageWidget">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignPageWidget">
-							<rect x="38550.0" y="2594.0" height="62.0" width="212.0" data-name="StudyDesignPageWidget"></rect>
-							<path d="M38550.0 2625.0 L38762.0 2625.0" fill="none" data-name="StudyDesignPageWidget"></path>
-						</g>
-						<g transform="translate(38550, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignPageWidget">
-								<text x="98.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignPageWidget">StudyDesignPageWidget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38550, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignPageWidget">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignPageWidget">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignPageWidget">+Widget? banner()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormView">
-							<rect x="29833.3" y="1666.5" height="62.0" width="375.0" data-name="InterventionFormView"></rect>
-							<path d="M29833.3 1697.5 L30208.3 1697.5" fill="none" data-name="InterventionFormView"></path>
-						</g>
-						<g transform="translate(29833.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormView">
-								<text x="179.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormView">InterventionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29833.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormView">+formViewModel: InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormViewModel">
-							<rect x="56178.3" y="2391.0" height="468.0" width="855.0" data-name="InterventionFormViewModel"></rect>
-							<path d="M56178.3 2422.0 L57033.3 2422.0" fill="none" data-name="InterventionFormViewModel"></path>
-							<path d="M56178.3 2648.0 L57033.3 2648.0" fill="none" data-name="InterventionFormViewModel"></path>
-						</g>
-						<g transform="translate(56178.25, 2391)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormViewModel">
-								<text x="419.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormViewModel">InterventionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(56178.25, 2422)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+interventionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+interventionTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+interventionIconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+interventionDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+interventionTasksArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+tasksCollection: FormViewModelCollection&lt;InterventionTaskFormViewModel, InterventionTaskFormData&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+interventionId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+atLeastOneTask: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="InterventionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(56178.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormViewModel provide()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionFormViewModel">+InterventionTaskFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="InterventionFormViewModel">+InterventionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionPreview">
-							<rect x="25723.3" y="1651.0" height="93.0" width="330.0" data-name="InterventionPreview"></rect>
-							<path d="M25723.3 1682.0 L26053.3 1682.0" fill="none" data-name="InterventionPreview"></path>
-							<path d="M25723.3 1713.0 L26053.3 1713.0" fill="none" data-name="InterventionPreview"></path>
-						</g>
-						<g transform="translate(25723.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionPreview">
-								<text x="157.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionPreview">InterventionPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25723.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+routeArgs: InterventionFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25723.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionPreview">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormView">
-							<rect x="81067.8" y="1158.5" height="108.0" width="359.0" data-name="StudyScheduleFormView"></rect>
-							<path d="M81067.8 1189.5 L81426.8 1189.5" fill="none" data-name="StudyScheduleFormView"></path>
-							<path d="M81067.8 1220.5 L81426.8 1220.5" fill="none" data-name="StudyScheduleFormView"></path>
-						</g>
-						<g transform="translate(81067.75, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormView">
-								<text x="171.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormView">StudyScheduleFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(81067.75, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">+formViewModel: StudyScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(81067.75, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormView">-FormTableRow _renderCustomSequence()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleControls">
-							<rect x="80868.3" y="1501.0" height="393.0" width="758.0" data-name="StudyScheduleControls"></rect>
-							<path d="M80868.3 1532.0 L81626.3 1532.0" fill="none" data-name="StudyScheduleControls"></path>
-							<path d="M80868.3 1833.0 L81626.3 1833.0" fill="none" data-name="StudyScheduleControls"></path>
-						</g>
-						<g transform="translate(80868.25, 1501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleControls">
-								<text x="371.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleControls">StudyScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(80868.25, 1532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultScheduleTypeSequence: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultNumCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+defaultPeriodLength: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControl: FormControl&lt;PhaseSequence&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeCustomControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyScheduleControls">+numCyclesControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyScheduleControls">+includeBaselineControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMin: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kNumCyclesMax: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMin: int</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyScheduleControls">&lt;static&gt;+kPhaseDurationMax: int</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyScheduleControls">+sequenceTypeControlOptions: List&lt;FormControlOption&lt;PhaseSequence&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyScheduleControls">+studyScheduleValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyScheduleControls">+numCyclesRange: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyScheduleControls">+phaseDurationRange: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyScheduleControls">+customSequenceRequired: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(80868.25, 1833)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleControls">+void setStudyScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleControls">+StudyScheduleFormData buildStudyScheduleFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleControls">+bool isSequencingCustom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormData">
-							<rect x="55199.3" y="2541.0" height="168.0" width="290.0" data-name="InterventionTaskFormData"></rect>
-							<path d="M55199.3 2572.0 L55489.3 2572.0" fill="none" data-name="InterventionTaskFormData"></path>
-							<path d="M55199.3 2663.0 L55489.3 2663.0" fill="none" data-name="InterventionTaskFormData"></path>
-						</g>
-						<g transform="translate(55199.25, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormData">
-								<text x="137.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormData">InterventionTaskFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(55199.25, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+taskId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+taskTitle: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormData">+taskDescription: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(55199.25, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormData">+CheckmarkTask toTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormData">+InterventionTaskFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IFormDataWithSchedule">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IFormDataWithSchedule">
-							<rect x="55631.5" y="1613.5" height="168.0" width="298.0" data-name="IFormDataWithSchedule"></rect>
-							<path d="M55631.5 1644.5 L55929.5 1644.5" fill="none" data-name="IFormDataWithSchedule"></path>
-							<path d="M55631.5 1750.5 L55929.5 1750.5" fill="none" data-name="IFormDataWithSchedule"></path>
-						</g>
-						<g transform="translate(55631.5, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IFormDataWithSchedule">
-								<text x="141.0" y="13.5" stroke="none" text-anchor="middle" data-name="IFormDataWithSchedule">IFormDataWithSchedule</text>
-								
-							</g>
-						</g>
-						<g transform="translate(55631.5, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+instanceId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IFormDataWithSchedule">+isTimeLocked: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockStart: StudyUTimeOfDay?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IFormDataWithSchedule">+timeLockEnd: StudyUTimeOfDay?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IFormDataWithSchedule">+hasReminder: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IFormDataWithSchedule">+reminderTime: StudyUTimeOfDay?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(55631.5, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IFormDataWithSchedule">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IFormDataWithSchedule">
-								<text x="0.0" y="13.5" stroke="none" data-name="IFormDataWithSchedule">+Schedule toSchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormViewModel">
-							<rect x="67782.0" y="2436.0" height="378.0" width="839.0" data-name="InterventionsFormViewModel"></rect>
-							<path d="M67782.0 2467.0 L68621.0 2467.0" fill="none" data-name="InterventionsFormViewModel"></path>
-							<path d="M67782.0 2618.0 L68621.0 2618.0" fill="none" data-name="InterventionsFormViewModel"></path>
-						</g>
-						<g transform="translate(67782, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormViewModel">
-								<text x="411.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormViewModel">InterventionsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(67782, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsCollection: FormViewModelCollection&lt;InterventionFormViewModel, InterventionFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+interventionsRequired: dynamic</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+canTestStudySchedule: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(67782, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionsFormViewModel">+InterventionFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="InterventionsFormViewModel">+dynamic testStudySchedule()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormViewModel">
-							<rect x="60383.3" y="2488.5" height="273.0" width="696.0" data-name="InterventionTaskFormViewModel"></rect>
-							<path d="M60383.3 2519.5 L61079.3 2519.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-							<path d="M60383.3 2700.5 L61079.3 2700.5" fill="none" data-name="InterventionTaskFormViewModel"></path>
-						</g>
-						<g transform="translate(60383.25, 2488.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormViewModel">InterventionTaskFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(60383.25, 2519.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskDescriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionTaskFormViewModel">+markAsCompletedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionTaskFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionTaskFormViewModel">+taskId: String</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="InterventionTaskFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="InterventionTaskFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="InterventionTaskFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="InterventionTaskFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(60383.25, 2700.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionTaskFormViewModel">+InterventionTaskFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithScheduleControls">
-							<rect x="82301.5" y="1546.0" height="303.0" width="495.0" data-name="WithScheduleControls"></rect>
-							<path d="M82301.5 1577.0 L82796.5 1577.0" fill="none" data-name="WithScheduleControls"></path>
-							<path d="M82301.5 1803.0 L82796.5 1803.0" fill="none" data-name="WithScheduleControls"></path>
-						</g>
-						<g transform="translate(82301.5, 1546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithScheduleControls">
-								<text x="239.5" y="13.5" stroke="none" text-anchor="middle" data-name="WithScheduleControls">WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82301.5, 1577)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+isTimeRestrictedControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">+instanceID: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeStartPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithScheduleControls">+restrictedTimeEndPickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithScheduleControls">+hasReminderControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WithScheduleControls">+reminderTimeControl: FormControl&lt;Time&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WithScheduleControls">+reminderTimePickerControl: FormControl&lt;TimeOfDay&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="WithScheduleControls">-_reminderControlStream: StreamSubscription&lt;dynamic&gt;?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="WithScheduleControls">+scheduleFormControls: Map&lt;String, FormControl&lt;Object&gt;&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="WithScheduleControls">+hasReminder: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="WithScheduleControls">+isTimeRestricted: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="WithScheduleControls">+timeRestriction: List&lt;Time&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82301.5, 1803)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithScheduleControls">+void setScheduleControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithScheduleControls">-dynamic _initReminderControl()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PhaseSequence">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PhaseSequence">
-							<rect x="66060.5" y="3828.0" height="31.0" width="146.0" data-name="PhaseSequence"></rect>
-						</g>
-						<g transform="translate(66060.5, 3828)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PhaseSequence">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PhaseSequence">
-								<text x="65.0" y="13.5" stroke="none" text-anchor="middle" data-name="PhaseSequence">PhaseSequence</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionFormData">
-							<rect x="44299.0" y="1598.5" height="198.0" width="382.0" data-name="InterventionFormData"></rect>
-							<path d="M44299.0 1629.5 L44681.0 1629.5" fill="none" data-name="InterventionFormData"></path>
-							<path d="M44299.0 1750.5 L44681.0 1750.5" fill="none" data-name="InterventionFormData"></path>
-						</g>
-						<g transform="translate(44299, 1598.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionFormData">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionFormData">InterventionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44299, 1629.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+interventionId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionFormData">+description: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InterventionFormData">+tasksData: List&lt;InterventionTaskFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InterventionFormData">+iconName: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InterventionFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InterventionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44299, 1750.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionFormData">+Intervention toIntervention()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionFormData">+InterventionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyScheduleFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyScheduleFormData">
-							<rect x="47397.0" y="3401.5" height="198.0" width="296.0" data-name="StudyScheduleFormData"></rect>
-							<path d="M47397.0 3432.5 L47693.0 3432.5" fill="none" data-name="StudyScheduleFormData"></path>
-							<path d="M47397.0 3538.5 L47693.0 3538.5" fill="none" data-name="StudyScheduleFormData"></path>
-						</g>
-						<g transform="translate(47397, 3401.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyScheduleFormData">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyScheduleFormData">StudyScheduleFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47397, 3432.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+sequenceType: PhaseSequence</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+sequenceTypeCustom: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+numCycles: int</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyScheduleFormData">+phaseDuration: int</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyScheduleFormData">+includeBaseline: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyScheduleFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47397, 3538.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyScheduleFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyScheduleFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyScheduleFormData">+StudySchedule toStudySchedule()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyScheduleFormData">+Study apply()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyScheduleFormData">+StudyScheduleFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IStudyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IStudyFormData">
-							<rect x="50012.8" y="1666.5" height="62.0" width="143.0" data-name="IStudyFormData"></rect>
-							<path d="M50012.8 1697.5 L50155.8 1697.5" fill="none" data-name="IStudyFormData"></path>
-						</g>
-						<g transform="translate(50012.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IStudyFormData">
-								<text x="63.5" y="13.5" stroke="none" text-anchor="middle" data-name="IStudyFormData">IStudyFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(50012.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IStudyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IStudyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="IStudyFormData">+Study apply()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskFormView">
-							<rect x="40431.8" y="1666.5" height="62.0" width="413.0" data-name="InterventionTaskFormView"></rect>
-							<path d="M40431.8 1697.5 L40844.8 1697.5" fill="none" data-name="InterventionTaskFormView"></path>
-						</g>
-						<g transform="translate(40431.75, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskFormView">
-								<text x="198.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskFormView">InterventionTaskFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(40431.75, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionTaskFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionTaskFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionTaskFormView">+formViewModel: InterventionTaskFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionsFormData">
-							<rect x="47466.5" y="2556.0" height="138.0" width="394.0" data-name="InterventionsFormData"></rect>
-							<path d="M47466.5 2587.0 L47860.5 2587.0" fill="none" data-name="InterventionsFormData"></path>
-							<path d="M47466.5 2648.0 L47860.5 2648.0" fill="none" data-name="InterventionsFormData"></path>
-						</g>
-						<g transform="translate(47466.5, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionsFormData">
-								<text x="189.0" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionsFormData">InterventionsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47466.5, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+interventionsData: List&lt;InterventionFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+studyScheduleData: StudyScheduleFormData</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InterventionsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47466.5, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InterventionsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InterventionsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="InterventionsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InterventionsFormData">+InterventionsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignReportsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignReportsFormView">
-							<rect x="36388.5" y="3462.0" height="77.0" width="393.0" data-name="StudyDesignReportsFormView"></rect>
-							<path d="M36388.5 3493.0 L36781.5 3493.0" fill="none" data-name="StudyDesignReportsFormView"></path>
-						</g>
-						<g transform="translate(36388.5, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignReportsFormView">
-								<text x="188.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignReportsFormView">StudyDesignReportsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36388.5, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignReportsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignReportsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignReportsFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignReportsFormView">-dynamic _showReportItemSidesheetWithArgs()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormData">
-							<rect x="45142.0" y="1628.5" height="138.0" width="314.0" data-name="ReportItemFormData"></rect>
-							<path d="M45142.0 1659.5 L45456.0 1659.5" fill="none" data-name="ReportItemFormData"></path>
-							<path d="M45142.0 1720.5 L45456.0 1720.5" fill="none" data-name="ReportItemFormData"></path>
-						</g>
-						<g transform="translate(45142, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormData">
-								<text x="149.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormData">ReportItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45142, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">+isPrimary: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+section: ReportSection</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45142, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormData">&lt;static&gt;+dynamic fromDomainModel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormData">+ReportItemFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSection">
-							<rect x="45235.0" y="2609.5" height="31.0" width="128.0" data-name="ReportSection"></rect>
-						</g>
-						<g transform="translate(45235, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ReportSection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSection">
-								<text x="56.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSection">ReportSection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceEditor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceEditor">
-							<rect x="45690.0" y="2556.0" height="138.0" width="709.0" data-name="DataReferenceEditor"></rect>
-							<path d="M45690.0 2587.0 L46399.0 2587.0" fill="none" data-name="DataReferenceEditor"></path>
-							<path d="M45690.0 2648.0 L46399.0 2648.0" fill="none" data-name="DataReferenceEditor"></path>
-						</g>
-						<g transform="translate(45690, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceEditor">
-								<text x="346.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceEditor">DataReferenceEditor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45690, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+formControl: FormControl&lt;DataReferenceIdentifier&lt;T&gt;&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">+availableTasks: List&lt;Task&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DataReferenceEditor">+buildReactiveDropdownField: ReactiveDropdownField&lt;dynamic&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45690, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceEditor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceEditor">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceEditor">+FormTableRow buildFormTableRow()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DataReferenceEditor">-List&lt;DropdownMenuItem&lt;DataReferenceIdentifier&lt;dynamic&gt;&gt;&gt; _dataReferenceItems()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReactiveDropdownField">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReactiveDropdownField">
-							<rect x="46135.0" y="3485.0" height="31.0" width="203.0" data-name="ReactiveDropdownField"></rect>
-						</g>
-						<g transform="translate(46135, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReactiveDropdownField">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReactiveDropdownField">
-								<text x="93.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReactiveDropdownField">ReactiveDropdownField</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregationFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregationFormatted">
-							<rect x="46439.0" y="2518.5" height="213.0" width="448.0" data-name="TemporalAggregationFormatted"></rect>
-							<path d="M46439.0 2549.5 L46887.0 2549.5" fill="none" data-name="TemporalAggregationFormatted"></path>
-							<path d="M46439.0 2655.5 L46887.0 2655.5" fill="none" data-name="TemporalAggregationFormatted"></path>
-						</g>
-						<g transform="translate(46439, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregationFormatted">
-								<text x="216.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregationFormatted">TemporalAggregationFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(46439, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">-_value: TemporalAggregation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+values: List&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+value: TemporalAggregation</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="TemporalAggregationFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="TemporalAggregationFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(46439, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TemporalAggregationFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TemporalAggregationFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="TemporalAggregationFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TemporalAggregationFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TemporalAggregationFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="TemporalAggregationFormatted">&lt;static&gt;+TemporalAggregationFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TemporalAggregation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TemporalAggregation">
-							<rect x="46378.0" y="3485.0" height="31.0" width="186.0" data-name="TemporalAggregation"></rect>
-						</g>
-						<g transform="translate(46378, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TemporalAggregation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TemporalAggregation">
-								<text x="85.0" y="13.5" stroke="none" text-anchor="middle" data-name="TemporalAggregation">TemporalAggregation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirectionFormatted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirectionFormatted">
-							<rect x="46927.0" y="2518.5" height="213.0" width="451.0" data-name="ImprovementDirectionFormatted"></rect>
-							<path d="M46927.0 2549.5 L47378.0 2549.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
-							<path d="M46927.0 2655.5 L47378.0 2655.5" fill="none" data-name="ImprovementDirectionFormatted"></path>
-						</g>
-						<g transform="translate(46927, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirectionFormatted">
-								<text x="217.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirectionFormatted">ImprovementDirectionFormatted</text>
-								
-							</g>
-						</g>
-						<g transform="translate(46927, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">-_value: ImprovementDirection</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+values: List&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+value: ImprovementDirection</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">+string: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ImprovementDirectionFormatted">+icon: IconData?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ImprovementDirectionFormatted">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(46927, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImprovementDirectionFormatted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImprovementDirectionFormatted">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImprovementDirectionFormatted">+bool ==()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toString()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImprovementDirectionFormatted">+String toJson()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ImprovementDirectionFormatted">&lt;static&gt;+ImprovementDirectionFormatted fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImprovementDirection">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImprovementDirection">
-							<rect x="46833.3" y="3485.0" height="31.0" width="189.0" data-name="ImprovementDirection"></rect>
-						</g>
-						<g transform="translate(46833.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImprovementDirection">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImprovementDirection">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="ImprovementDirection">ImprovementDirection</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionType">
-							<rect x="14508.0" y="3447.0" height="107.0" width="383.0" data-name="ReportSectionType"></rect>
-							<path d="M14508.0 3478.0 L14891.0 3478.0" fill="none" data-name="ReportSectionType"></path>
-						</g>
-						<g transform="translate(14508, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionType">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionType">ReportSectionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(14508, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportSectionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportSectionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportSectionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+values: List&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+average: ReportSectionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportSectionType">&lt;static&gt;+linearRegression: ReportSectionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AverageSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AverageSectionFormView">
-							<rect x="26093.3" y="1636.0" height="123.0" width="479.0" data-name="AverageSectionFormView"></rect>
-							<path d="M26093.3 1667.0 L26572.3 1667.0" fill="none" data-name="AverageSectionFormView"></path>
-							<path d="M26093.3 1728.0 L26572.3 1728.0" fill="none" data-name="AverageSectionFormView"></path>
-						</g>
-						<g transform="translate(26093.25, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AverageSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="AverageSectionFormView">AverageSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26093.25, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AverageSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AverageSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26093.25, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AverageSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AverageSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AverageSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormViewModel">
-							<rect x="40694.3" y="2338.5" height="573.0" width="987.0" data-name="ReportItemFormViewModel"></rect>
-							<path d="M40694.3 2369.5 L41681.3 2369.5" fill="none" data-name="ReportItemFormViewModel"></path>
-							<path d="M40694.3 2805.5 L41681.3 2805.5" fill="none" data-name="ReportItemFormViewModel"></path>
-						</g>
-						<g transform="translate(40694.25, 2338.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormViewModel">
-								<text x="485.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormViewModel">ReportItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(40694.25, 2369.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+defaultSectionType: ReportSectionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+sectionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+sectionTypeControl: FormControl&lt;ReportSectionType&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+sectionControl: FormControl&lt;ReportSection&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceControl: FormControl&lt;DataReferenceIdentifier&lt;num&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportItemFormViewModel">+temporalAggregationControl: FormControl&lt;TemporalAggregationFormatted&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionControl: FormControl&lt;ImprovementDirectionFormatted&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportItemFormViewModel">+alphaControl: FormControl&lt;double&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ReportItemFormViewModel">-_controlsBySectionType: Map&lt;ReportSectionType, FormGroup&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ReportItemFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ReportItemFormViewModel">-_validationConfigsBySectionType: Map&lt;ReportSectionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ReportItemFormViewModel">+sectionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ReportItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ReportItemFormViewModel">+sectionId: String</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ReportItemFormViewModel">+sectionType: ReportSectionType</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+sectionTypeControlOptions: List&lt;FormControlOption&lt;ReportSectionType&gt;&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+temporalAggregationControlOptions: List&lt;FormControlOption&lt;TemporalAggregationFormatted&gt;&gt;</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ReportItemFormViewModel">&lt;static&gt;+improvementDirectionControlOptions: List&lt;FormControlOption&lt;ImprovementDirectionFormatted&gt;&gt;</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="ReportItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="ReportItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="ReportItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="ReportItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="ReportItemFormViewModel">+dataReferenceRequired: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="ReportItemFormViewModel">+aggregationRequired: dynamic</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="ReportItemFormViewModel">+improvementDirectionRequired: dynamic</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="ReportItemFormViewModel">+alphaConfidenceRequired: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(40694.25, 2805.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormViewModel">+ReportItemFormViewModel createDuplicate()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormViewModel">+dynamic onSectionTypeChanged()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportItemFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportItemFormViewModel">+void setControlsFrom()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReferenceIdentifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReferenceIdentifier">
-							<rect x="79096.5" y="583.0" height="93.0" width="204.0" data-name="DataReferenceIdentifier"></rect>
-							<path d="M79096.5 614.0 L79300.5 614.0" fill="none" data-name="DataReferenceIdentifier"></path>
-							<path d="M79096.5 645.0 L79300.5 645.0" fill="none" data-name="DataReferenceIdentifier"></path>
-						</g>
-						<g transform="translate(79096.5, 583)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReferenceIdentifier">
-								<text x="94.0" y="13.5" stroke="none" text-anchor="middle" data-name="DataReferenceIdentifier">DataReferenceIdentifier</text>
-								
-							</g>
-						</g>
-						<g transform="translate(79096.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+hashCode: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(79096.5, 645)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DataReferenceIdentifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DataReferenceIdentifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="DataReferenceIdentifier">+bool ==()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DataReference">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DataReference">
-							<rect x="79131.0" y="121.0" height="31.0" width="135.0" data-name="DataReference"></rect>
-						</g>
-						<g transform="translate(79131, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DataReference">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DataReference">
-								<text x="59.5" y="13.5" stroke="none" text-anchor="middle" data-name="DataReference">DataReference</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LinearRegressionSectionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LinearRegressionSectionFormView">
-							<rect x="26612.3" y="1636.0" height="123.0" width="479.0" data-name="LinearRegressionSectionFormView"></rect>
-							<path d="M26612.3 1667.0 L27091.3 1667.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-							<path d="M26612.3 1728.0 L27091.3 1728.0" fill="none" data-name="LinearRegressionSectionFormView"></path>
-						</g>
-						<g transform="translate(26612.25, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LinearRegressionSectionFormView">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="LinearRegressionSectionFormView">LinearRegressionSectionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26612.25, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="LinearRegressionSectionFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="LinearRegressionSectionFormView">+reportSectionColumnWidth: Map&lt;int, TableColumnWidth&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(26612.25, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="LinearRegressionSectionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="LinearRegressionSectionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="LinearRegressionSectionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportItemFormView">
-							<rect x="41221.0" y="1613.5" height="168.0" width="467.0" data-name="ReportItemFormView"></rect>
-							<path d="M41221.0 1644.5 L41688.0 1644.5" fill="none" data-name="ReportItemFormView"></path>
-							<path d="M41221.0 1720.5 L41688.0 1720.5" fill="none" data-name="ReportItemFormView"></path>
-						</g>
-						<g transform="translate(41221, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportItemFormView">
-								<text x="225.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportItemFormView">ReportItemFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41221, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+formViewModel: ReportItemFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">+studyId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">+reportSectionColumnWidth: dynamic</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportItemFormView">+sectionTypeBodyBuilder: Widget Function(BuildContext)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41221, 1720.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportItemFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportItemFormView">-dynamic _buildSectionTypeHeader()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormViewModel">
-							<rect x="64299.3" y="2451.0" height="348.0" width="860.0" data-name="ReportsFormViewModel"></rect>
-							<path d="M64299.3 2482.0 L65159.3 2482.0" fill="none" data-name="ReportsFormViewModel"></path>
-							<path d="M64299.3 2648.0 L65159.3 2648.0" fill="none" data-name="ReportsFormViewModel"></path>
-						</g>
-						<g transform="translate(64299.25, 2451)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormViewModel">
-								<text x="422.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormViewModel">ReportsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(64299.25, 2482)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+reportItemDelegate: ReportFormItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+reportItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+reportItemFormViewModels: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+reportItemModels: List&lt;ReportItemFormViewModel&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ReportsFormViewModel">+canTestConsent: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(64299.25, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormViewModel">+ReportsFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportsFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildNewReportItemFormRouteArgs()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormRouteArgs buildReportItemFormRouteArgs()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportsFormViewModel">+dynamic testReport()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ReportsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ReportsFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ReportsFormViewModel">+ReportItemFormViewModel provide()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportFormItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportFormItemDelegate">
-							<rect x="65331.0" y="1591.0" height="213.0" width="843.0" data-name="ReportFormItemDelegate"></rect>
-							<path d="M65331.0 1622.0 L66174.0 1622.0" fill="none" data-name="ReportFormItemDelegate"></path>
-							<path d="M65331.0 1698.0 L66174.0 1698.0" fill="none" data-name="ReportFormItemDelegate"></path>
-						</g>
-						<g transform="translate(65331, 1591)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportFormItemDelegate">
-								<text x="413.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportFormItemDelegate">ReportFormItemDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(65331, 1622)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+formViewModelCollection: FormViewModelCollection&lt;ReportItemFormViewModel, ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+owner: ReportsFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+validationSet: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(65331, 1698)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportFormItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportFormItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportFormItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportFormItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportFormItemDelegate">+ReportItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportFormItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ReportFormItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ReportFormItemDelegate">+void onSelectItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportBadge">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportBadge">
-							<rect x="47900.5" y="2556.0" height="138.0" width="197.0" data-name="ReportBadge"></rect>
-							<path d="M47900.5 2587.0 L48097.5 2587.0" fill="none" data-name="ReportBadge"></path>
-							<path d="M47900.5 2663.0 L48097.5 2663.0" fill="none" data-name="ReportBadge"></path>
-						</g>
-						<g transform="translate(47900.5, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportBadge">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportBadge">ReportBadge</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47900.5, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+status: ReportStatus?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportBadge">+type: BadgeType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportBadge">+showPrefixIcon: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportBadge">+showTooltip: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(47900.5, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportBadge">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportBadge">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportBadge">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportStatus">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportStatus">
-							<rect x="19153.3" y="3447.0" height="107.0" width="301.0" data-name="ReportStatus"></rect>
-							<path d="M19153.3 3478.0 L19454.3 3478.0" fill="none" data-name="ReportStatus"></path>
-						</g>
-						<g transform="translate(19153.25, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportStatus">
-								<text x="142.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportStatus">ReportStatus</text>
-								
-							</g>
-						</g>
-						<g transform="translate(19153.25, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportStatus">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportStatus">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportStatus">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+values: List&lt;ReportStatus&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+primary: ReportStatus</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ReportStatus">&lt;static&gt;+secondary: ReportStatus</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportsFormData">
-							<rect x="48137.5" y="2563.5" height="123.0" width="338.0" data-name="ReportsFormData"></rect>
-							<path d="M48137.5 2594.5 L48475.5 2594.5" fill="none" data-name="ReportsFormData"></path>
-							<path d="M48137.5 2640.5 L48475.5 2640.5" fill="none" data-name="ReportsFormData"></path>
-						</g>
-						<g transform="translate(48137.5, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportsFormData">
-								<text x="161.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportsFormData">ReportsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(48137.5, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+reportItems: List&lt;ReportItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(48137.5, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ReportsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ReportsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ReportsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ReportsFormData">+ReportsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormViewModel">
-							<rect x="71014.5" y="2383.5" height="483.0" width="696.0" data-name="StudyInfoFormViewModel"></rect>
-							<path d="M71014.5 2414.5 L71710.5 2414.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-							<path d="M71014.5 2820.5 L71710.5 2820.5" fill="none" data-name="StudyInfoFormViewModel"></path>
-						</g>
-						<g transform="translate(71014.5, 2383.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormViewModel">StudyInfoFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(71014.5, 2414.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyInfoFormViewModel">+emailControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyInfoFormViewModel">+additionalInfoControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyInfoFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyInfoFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="StudyInfoFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="StudyInfoFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="StudyInfoFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="StudyInfoFormViewModel">+iconRequired: dynamic</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="StudyInfoFormViewModel">+organizationRequired: dynamic</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardRequired: dynamic</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="StudyInfoFormViewModel">+reviewBoardNumberRequired: dynamic</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="StudyInfoFormViewModel">+researchersRequired: dynamic</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="StudyInfoFormViewModel">+emailRequired: dynamic</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="StudyInfoFormViewModel">+phoneRequired: dynamic</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="StudyInfoFormViewModel">+emailFormat: dynamic</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="StudyInfoFormViewModel">+websiteFormat: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(71014.5, 2820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormViewModel">+StudyInfoFormData buildFormData()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignInfoFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignInfoFormView">
-							<rect x="36821.5" y="3469.5" height="62.0" width="223.0" data-name="StudyDesignInfoFormView"></rect>
-							<path d="M36821.5 3500.5 L37044.5 3500.5" fill="none" data-name="StudyDesignInfoFormView"></path>
-						</g>
-						<g transform="translate(36821.5, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignInfoFormView">
-								<text x="103.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignInfoFormView">StudyDesignInfoFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(36821.5, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignInfoFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignInfoFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignInfoFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInfoFormData">
-							<rect x="49568.5" y="2541.0" height="168.0" width="414.0" data-name="StudyInfoFormData"></rect>
-							<path d="M49568.5 2572.0 L49982.5 2572.0" fill="none" data-name="StudyInfoFormData"></path>
-							<path d="M49568.5 2663.0 L49982.5 2663.0" fill="none" data-name="StudyInfoFormData"></path>
-						</g>
-						<g transform="translate(49568.5, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInfoFormData">
-								<text x="199.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInfoFormData">StudyInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(49568.5, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+description: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyInfoFormData">+iconName: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyInfoFormData">+contactInfoFormData: StudyContactInfoFormData</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(49568.5, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyContactInfoFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyContactInfoFormData">
-							<rect x="49725.0" y="3386.5" height="228.0" width="348.0" data-name="StudyContactInfoFormData"></rect>
-							<path d="M49725.0 3417.5 L50073.0 3417.5" fill="none" data-name="StudyContactInfoFormData"></path>
-							<path d="M49725.0 3568.5 L50073.0 3568.5" fill="none" data-name="StudyContactInfoFormData"></path>
-						</g>
-						<g transform="translate(49725, 3386.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyContactInfoFormData">
-								<text x="166.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyContactInfoFormData">StudyContactInfoFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(49725, 3417.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+organization: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoard: String?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyContactInfoFormData">+institutionalReviewBoardNumber: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyContactInfoFormData">+researchers: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyContactInfoFormData">+email: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyContactInfoFormData">+website: String?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyContactInfoFormData">+phone: String?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyContactInfoFormData">+additionalInfo: String?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyContactInfoFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(49725, 3568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyContactInfoFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyContactInfoFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyContactInfoFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyContactInfoFormData">+StudyInfoFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormValidationSet">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormValidationSet">
-							<rect x="2475.0" y="3462.0" height="77.0" width="387.0" data-name="StudyFormValidationSet"></rect>
-							<path d="M2475.0 3493.0 L2862.0 3493.0" fill="none" data-name="StudyFormValidationSet"></path>
-						</g>
-						<g transform="translate(2475, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormValidationSet">
-								<text x="185.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormValidationSet">StudyFormValidationSet</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2475, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormValidationSet">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormValidationSet">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormValidationSet">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormValidationSet">&lt;static&gt;+values: List&lt;StudyFormValidationSet&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementsFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormData">
-							<rect x="50062.5" y="2563.5" height="123.0" width="494.0" data-name="MeasurementsFormData"></rect>
-							<path d="M50062.5 2594.5 L50556.5 2594.5" fill="none" data-name="MeasurementsFormData"></path>
-							<path d="M50062.5 2640.5 L50556.5 2640.5" fill="none" data-name="MeasurementsFormData"></path>
-						</g>
-						<g transform="translate(50062.5, 2563.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormData">
-								<text x="239.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormData">MeasurementsFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(50062.5, 2594.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+surveyMeasurements: List&lt;MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(50062.5, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormData">+MeasurementsFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormView">
-							<rect x="41918.0" y="1666.5" height="62.0" width="444.0" data-name="MeasurementSurveyFormView"></rect>
-							<path d="M41918.0 1697.5 L42362.0 1697.5" fill="none" data-name="MeasurementSurveyFormView"></path>
-						</g>
-						<g transform="translate(41918, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormView">
-								<text x="214.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormView">MeasurementSurveyFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(41918, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormView">+formViewModel: MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormViewModel">
-							<rect x="62148.3" y="2413.5" height="423.0" width="696.0" data-name="MeasurementSurveyFormViewModel"></rect>
-							<path d="M62148.3 2444.5 L62844.3 2444.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-							<path d="M62148.3 2670.5 L62844.3 2670.5" fill="none" data-name="MeasurementSurveyFormViewModel"></path>
-						</g>
-						<g transform="translate(62148.25, 2413.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormViewModel">MeasurementSurveyFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(62148.25, 2444.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyTitleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyIntroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+surveyOutroTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+measurementId: String</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+instanceId: String</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+atLeastOneQuestion: dynamic</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+breadcrumbsTitle: String</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(62148.25, 2670.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildNewFormRouteArgs()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+SurveyQuestionFormRouteArgs buildFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementSurveyFormViewModel">+MeasurementSurveyFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyPreview">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyPreview">
-							<rect x="27453.3" y="1651.0" height="93.0" width="344.0" data-name="SurveyPreview"></rect>
-							<path d="M27453.3 1682.0 L27797.3 1682.0" fill="none" data-name="SurveyPreview"></path>
-							<path d="M27453.3 1713.0 L27797.3 1713.0" fill="none" data-name="SurveyPreview"></path>
-						</g>
-						<g transform="translate(27453.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyPreview">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyPreview">SurveyPreview</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27453.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+routeArgs: MeasurementFormRouteArgs</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27453.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyPreview">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyPreview">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyPreview">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementSurveyFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementSurveyFormData">
-							<rect x="55529.3" y="2526.0" height="198.0" width="409.0" data-name="MeasurementSurveyFormData"></rect>
-							<path d="M55529.3 2557.0 L55938.3 2557.0" fill="none" data-name="MeasurementSurveyFormData"></path>
-							<path d="M55529.3 2678.0 L55938.3 2678.0" fill="none" data-name="MeasurementSurveyFormData"></path>
-						</g>
-						<g transform="translate(55529.25, 2526)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementSurveyFormData">
-								<text x="196.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementSurveyFormData">MeasurementSurveyFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(55529.25, 2557)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+measurementId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementSurveyFormData">+introText: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementSurveyFormData">+outroText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementSurveyFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementSurveyFormData">&lt;static&gt;+kDefaultTitle: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementSurveyFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(55529.25, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementSurveyFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementSurveyFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementSurveyFormData">+QuestionnaireTask toQuestionnaireTask()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementSurveyFormData">+MeasurementSurveyFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionnaireFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionnaireFormData">
-							<rect x="52648.8" y="3431.5" height="138.0" width="368.0" data-name="QuestionnaireFormData"></rect>
-							<path d="M52648.8 3462.5 L53016.8 3462.5" fill="none" data-name="QuestionnaireFormData"></path>
-							<path d="M52648.8 3508.5 L53016.8 3508.5" fill="none" data-name="QuestionnaireFormData"></path>
-						</g>
-						<g transform="translate(52648.75, 3431.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionnaireFormData">
-								<text x="176.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionnaireFormData">QuestionnaireFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(52648.75, 3462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+questionsData: List&lt;QuestionFormData&gt;?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(52648.75, 3508.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionnaireFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionnaireFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionnaireFormData">+StudyUQuestionnaire toQuestionnaire()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionnaireFormData">+List&lt;EligibilityCriterion&gt; toEligibilityCriteria()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionnaireFormData">+QuestionnaireFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WithQuestionnaireControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WithQuestionnaireControls">
-							<rect x="62595.3" y="1568.5" height="258.0" width="632.0" data-name="WithQuestionnaireControls"></rect>
-							<path d="M62595.3 1599.5 L63227.3 1599.5" fill="none" data-name="WithQuestionnaireControls"></path>
-							<path d="M62595.3 1705.5 L63227.3 1705.5" fill="none" data-name="WithQuestionnaireControls"></path>
-						</g>
-						<g transform="translate(62595.25, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WithQuestionnaireControls">
-								<text x="308.0" y="13.5" stroke="none" text-anchor="middle" data-name="WithQuestionnaireControls">WithQuestionnaireControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(62595.25, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+questionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+questionFormViewModels: FormViewModelCollection&lt;Q, QuestionFormData&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+questionnaireControls: Map&lt;String, FormArray&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+propagateOnSave: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+questionModels: List&lt;Q&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(62595.25, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WithQuestionnaireControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WithQuestionnaireControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="WithQuestionnaireControls">+void setQuestionnaireControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WithQuestionnaireControls">+QuestionnaireFormData buildQuestionnaireFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WithQuestionnaireControls">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WithQuestionnaireControls">+void onCancel()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WithQuestionnaireControls">+dynamic onSave()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WithQuestionnaireControls">+Q provide()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WithQuestionnaireControls">+Q provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignMeasurementsFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignMeasurementsFormView">
-							<rect x="38311.3" y="3469.5" height="62.0" width="310.0" data-name="StudyDesignMeasurementsFormView"></rect>
-							<path d="M38311.3 3500.5 L38621.3 3500.5" fill="none" data-name="StudyDesignMeasurementsFormView"></path>
-						</g>
-						<g transform="translate(38311.25, 3469.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignMeasurementsFormView">
-								<text x="147.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignMeasurementsFormView">StudyDesignMeasurementsFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38311.25, 3500.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignMeasurementsFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignMeasurementsFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignMeasurementsFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementsFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementsFormViewModel">
-							<rect x="66435.8" y="2443.5" height="363.0" width="1092.0" data-name="MeasurementsFormViewModel"></rect>
-							<path d="M66435.8 2474.5 L67527.8 2474.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-							<path d="M66435.8 2625.5 L67527.8 2625.5" fill="none" data-name="MeasurementsFormViewModel"></path>
-						</g>
-						<g transform="translate(66435.75, 2443.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementsFormViewModel">
-								<text x="538.0" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementsFormViewModel">MeasurementsFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(66435.75, 2474.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+surveyMeasurementFormViewModels: FormViewModelCollection&lt;MeasurementSurveyFormViewModel, MeasurementSurveyFormData&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementViewModels: List&lt;MeasurementSurveyFormViewModel&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+measurementRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(66435.75, 2625.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="MeasurementsFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="MeasurementsFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="MeasurementsFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="MeasurementsFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementsFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="MeasurementsFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="MeasurementsFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="MeasurementsFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="MeasurementsFormViewModel">+MeasurementSurveyFormViewModel provide()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="MeasurementsFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="MeasurementsFormViewModel">+dynamic onSave()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormScaffold">
-							<rect x="27837.3" y="1636.0" height="123.0" width="388.0" data-name="StudyFormScaffold"></rect>
-							<path d="M27837.3 1667.0 L28225.3 1667.0" fill="none" data-name="StudyFormScaffold"></path>
-							<path d="M27837.3 1728.0 L28225.3 1728.0" fill="none" data-name="StudyFormScaffold"></path>
-						</g>
-						<g transform="translate(27837.25, 1636)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormScaffold">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormScaffold">StudyFormScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27837.25, 1667)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormScaffold">+formViewModelBuilder: T Function(WidgetRef)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormScaffold">+formViewBuilder: Widget Function(T)</text>
-								
-							</g>
-						</g>
-						<g transform="translate(27837.25, 1728)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormScaffold">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="T Function(WidgetRef)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="T Function(WidgetRef)">
-							<rect x="27751.8" y="2609.5" height="31.0" width="193.0" data-name="T Function(WidgetRef)"></rect>
-						</g>
-						<g transform="translate(27751.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="T Function(WidgetRef)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="T Function(WidgetRef)">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="T Function(WidgetRef)">T Function(WidgetRef)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormViewModel">
-							<rect x="52429.8" y="2496.0" height="258.0" width="696.0" data-name="ConsentItemFormViewModel"></rect>
-							<path d="M52429.8 2527.0 L53125.8 2527.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-							<path d="M52429.8 2693.0 L53125.8 2693.0" fill="none" data-name="ConsentItemFormViewModel"></path>
-						</g>
-						<g transform="translate(52429.75, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormViewModel">ConsentItemFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(52429.75, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+consentIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+titleControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormViewModel">+iconControl: FormControl&lt;IconOption&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ConsentItemFormViewModel">+consentId: String</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ConsentItemFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ConsentItemFormViewModel">+titleRequired: dynamic</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ConsentItemFormViewModel">+descriptionRequired: dynamic</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ConsentItemFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(52429.75, 2693)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormViewModel">+ConsentItemFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyDesignEnrollmentFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyDesignEnrollmentFormView">
-							<rect x="38661.3" y="3454.5" height="92.0" width="449.0" data-name="StudyDesignEnrollmentFormView"></rect>
-							<path d="M38661.3 3485.5 L39110.3 3485.5" fill="none" data-name="StudyDesignEnrollmentFormView"></path>
-						</g>
-						<g transform="translate(38661.25, 3454.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyDesignEnrollmentFormView">
-								<text x="216.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyDesignEnrollmentFormView">StudyDesignEnrollmentFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38661.25, 3485.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyDesignEnrollmentFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyDesignEnrollmentFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyDesignEnrollmentFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showScreenerQuestionSidesheetWithArgs()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyDesignEnrollmentFormView">-dynamic _showConsentItemSidesheetWithArgs()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScreenerQuestionLogicFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScreenerQuestionLogicFormViewModel">
-							<rect x="51625.8" y="2594.0" height="62.0" width="332.0" data-name="IScreenerQuestionLogicFormViewModel"></rect>
-							<path d="M51625.8 2625.0 L51957.8 2625.0" fill="none" data-name="IScreenerQuestionLogicFormViewModel"></path>
-						</g>
-						<g transform="translate(51625.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="158.0" y="13.5" stroke="none" text-anchor="middle" data-name="IScreenerQuestionLogicFormViewModel">IScreenerQuestionLogicFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(51625.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScreenerQuestionLogicFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScreenerQuestionLogicFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScreenerQuestionLogicFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionLogicFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionLogicFormView">
-							<rect x="81454.3" y="2556.0" height="138.0" width="424.0" data-name="ScreenerQuestionLogicFormView"></rect>
-							<path d="M81454.3 2587.0 L81878.3 2587.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-							<path d="M81454.3 2618.0 L81878.3 2618.0" fill="none" data-name="ScreenerQuestionLogicFormView"></path>
-						</g>
-						<g transform="translate(81454.25, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionLogicFormView">
-								<text x="204.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionLogicFormView">ScreenerQuestionLogicFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(81454.25, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+formViewModel: ScreenerQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(81454.25, 2618)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionLogicFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionLogicFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionLogicFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildInfoBanner()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-dynamic _buildAnswerOptionsLogicControls()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionLogicFormView">-List&lt;Widget&gt; _buildOptionLogicRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScreenerQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScreenerQuestionFormViewModel">
-							<rect x="62059.0" y="3334.0" height="333.0" width="562.0" data-name="ScreenerQuestionFormViewModel"></rect>
-							<path d="M62059.0 3365.0 L62621.0 3365.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-							<path d="M62059.0 3546.0 L62621.0 3546.0" fill="none" data-name="ScreenerQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(62059, 3334)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScreenerQuestionFormViewModel">
-								<text x="273.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScreenerQuestionFormViewModel">ScreenerQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(62059, 3365)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">&lt;static&gt;+defaultResponseOptionValidity: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicControls: FormArray&lt;bool&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsLogicDescriptionControls: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-_questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+prevResponseOptionValues: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+responseOptionsDisabledControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+logicControlOptions: List&lt;FormControlOption&lt;bool&gt;&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+isDirtyOptionsBannerVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(62059, 3546)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScreenerQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScreenerQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-List&lt;FormControl&lt;dynamic&gt;&gt; _copyFormControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedLogicControlFor()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScreenerQuestionFormViewModel">-AbstractControl&lt;dynamic&gt;? _findAssociatedControlFor()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScreenerQuestionFormViewModel">+ScreenerQuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormData">
-							<rect x="50863.8" y="1613.5" height="168.0" width="258.0" data-name="ConsentItemFormData"></rect>
-							<path d="M50863.8 1644.5 L51121.8 1644.5" fill="none" data-name="ConsentItemFormData"></path>
-							<path d="M50863.8 1735.5 L51121.8 1735.5" fill="none" data-name="ConsentItemFormData"></path>
-						</g>
-						<g transform="translate(50863.75, 1613.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormData">
-								<text x="121.0" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormData">ConsentItemFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(50863.75, 1644.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+consentId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+title: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ConsentItemFormData">+description: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ConsentItemFormData">+iconName: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ConsentItemFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(50863.75, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormData">+ConsentItem toConsentItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ConsentItemFormData">+ConsentItemFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemFormView">
-							<rect x="44721.0" y="1666.5" height="62.0" width="381.0" data-name="ConsentItemFormView"></rect>
-							<path d="M44721.0 1697.5 L45102.0 1697.5" fill="none" data-name="ConsentItemFormView"></path>
-						</g>
-						<g transform="translate(44721, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemFormView">
-								<text x="182.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemFormView">ConsentItemFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(44721, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ConsentItemFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ConsentItemFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ConsentItemFormView">+formViewModel: ConsentItemFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormData">
-							<rect x="50596.5" y="2541.0" height="168.0" width="454.0" data-name="EnrollmentFormData"></rect>
-							<path d="M50596.5 2572.0 L51050.5 2572.0" fill="none" data-name="EnrollmentFormData"></path>
-							<path d="M50596.5 2663.0 L51050.5 2663.0" fill="none" data-name="EnrollmentFormData"></path>
-						</g>
-						<g transform="translate(50596.5, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormData">
-								<text x="219.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormData">EnrollmentFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(50596.5, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">&lt;static&gt;+kDefaultEnrollmentType: Participation</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+enrollmentType: Participation</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormData">+questionnaireFormData: QuestionnaireFormData</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormData">+consentItemsFormData: List&lt;ConsentItemFormData&gt;?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(50596.5, 2663)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormData">+Study apply()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormData">+EnrollmentFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormViewModel">
-							<rect x="48515.5" y="1956.0" height="1338.0" width="1013.0" data-name="QuestionFormViewModel"></rect>
-							<path d="M48515.5 1987.0 L49528.5 1987.0" fill="none" data-name="QuestionFormViewModel"></path>
-							<path d="M48515.5 3008.0 L49528.5 3008.0" fill="none" data-name="QuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(48515.5, 1956)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormViewModel">
-								<text x="498.5" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormViewModel">QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(48515.5, 1987)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+defaultQuestionType: SurveyQuestionType</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-_titles: Map&lt;FormMode, String Function()&gt;?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">+questionIdControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControl: FormControl&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">+questionTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">+questionInfoTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">+questionBaseControls: Map&lt;String, AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+isMultipleChoiceControl: FormControl&lt;bool&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+choiceResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMin: int</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsMax: int</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+customOptionsInitial: int</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+boolResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+imageResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMaxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+audioResponseOptionsArray: FormArray&lt;String&gt;</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationSecondsControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMinValue: int</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultScaleMaxValue: int</text>
-								<text x="0.0" y="313.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kNumMidValueControls: int</text>
-								<text x="0.0" y="328.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kMidValueDebounceMilliseconds: int</text>
-								<text x="0.0" y="343.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="358.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValueControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="373.5" stroke="none" data-name="QuestionFormViewModel">-_scaleRangeControl: FormControl&lt;int&gt;</text>
-								<text x="0.0" y="388.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="403.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxLabelControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="418.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidValueControls: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="433.5" stroke="none" data-name="QuestionFormViewModel">+scaleMidLabelControls: FormArray&lt;String?&gt;</text>
-								<text x="0.0" y="448.5" stroke="none" data-name="QuestionFormViewModel">-_scaleResponseOptionsArray: FormArray&lt;int&gt;</text>
-								<text x="0.0" y="463.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="478.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxColorControl: FormControl&lt;SerializableColor&gt;</text>
-								<text x="0.0" y="493.5" stroke="none" data-name="QuestionFormViewModel">+prevMidValues: List&lt;int?&gt;?</text>
-								<text x="0.0" y="508.5" stroke="none" data-name="QuestionFormViewModel">+freeTextTypeControl: FormControl&lt;FreeTextQuestionType&gt;</text>
-								<text x="0.0" y="523.5" stroke="none" data-name="QuestionFormViewModel">+customRegexControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="538.5" stroke="none" data-name="QuestionFormViewModel">+freeTextResponseOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="553.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMin: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="568.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthMax: AbstractControl&lt;int&gt;</text>
-								<text x="0.0" y="583.5" stroke="none" data-name="QuestionFormViewModel">+freeTextExampleTextControl: FormControl&lt;String&gt;</text>
-								<text x="0.0" y="598.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMinLength: int</text>
-								<text x="0.0" y="613.5" stroke="none" data-name="QuestionFormViewModel">&lt;static&gt;+kDefaultFreeTextMaxLength: int</text>
-								<text x="0.0" y="628.5" stroke="none" data-name="QuestionFormViewModel">+freeTextLengthControl: FormControl&lt;RangeValues&gt;</text>
-								<text x="0.0" y="643.5" stroke="none" data-name="QuestionFormViewModel">-_controlsByQuestionType: Map&lt;SurveyQuestionType, FormGroup&gt;</text>
-								<text x="0.0" y="658.5" stroke="none" data-name="QuestionFormViewModel">-_sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="673.5" stroke="none" data-name="QuestionFormViewModel">-_validationConfigsByQuestionType: Map&lt;SurveyQuestionType, Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;&gt;</text>
-								<text x="0.0" y="688.5" stroke="none" data-name="QuestionFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="703.5" stroke="none" data-name="QuestionFormViewModel">+questionId: String</text>
-								<text x="0.0" y="718.5" stroke="none" data-name="QuestionFormViewModel">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="733.5" stroke="none" data-name="QuestionFormViewModel">+questionTypeControlOptions: List&lt;FormControlOption&lt;SurveyQuestionType&gt;&gt;</text>
-								<text x="0.0" y="748.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="763.5" stroke="none" data-name="QuestionFormViewModel">+answerOptionsControls: List&lt;AbstractControl&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="778.5" stroke="none" data-name="QuestionFormViewModel">+validAnswerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="793.5" stroke="none" data-name="QuestionFormViewModel">+boolOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="808.5" stroke="none" data-name="QuestionFormViewModel">+imageOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="823.5" stroke="none" data-name="QuestionFormViewModel">+audioOptions: List&lt;AbstractControl&lt;String&gt;&gt;</text>
-								<text x="0.0" y="838.5" stroke="none" data-name="QuestionFormViewModel">+scaleMinValue: int</text>
-								<text x="0.0" y="853.5" stroke="none" data-name="QuestionFormViewModel">+scaleMaxValue: int</text>
-								<text x="0.0" y="868.5" stroke="none" data-name="QuestionFormViewModel">+scaleRange: int</text>
-								<text x="0.0" y="883.5" stroke="none" data-name="QuestionFormViewModel">+scaleAllValueControls: List&lt;AbstractControl&lt;int&gt;&gt;</text>
-								<text x="0.0" y="898.5" stroke="none" data-name="QuestionFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="913.5" stroke="none" data-name="QuestionFormViewModel">+questionTextRequired: dynamic</text>
-								<text x="0.0" y="928.5" stroke="none" data-name="QuestionFormViewModel">+numValidChoiceOptions: dynamic</text>
-								<text x="0.0" y="943.5" stroke="none" data-name="QuestionFormViewModel">+scaleRangeValid: dynamic</text>
-								<text x="0.0" y="958.5" stroke="none" data-name="QuestionFormViewModel">+maxRecordingDurationValid: dynamic</text>
-								<text x="0.0" y="973.5" stroke="none" data-name="QuestionFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="988.5" stroke="none" data-name="QuestionFormViewModel">+isAddOptionButtonVisible: bool</text>
-								<text x="0.0" y="1003.5" stroke="none" data-name="QuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(48515.5, 3008)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormViewModel">+String? scaleMidLabelAt()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onScaleRangeChanged()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _applyInputFormatters()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _updateScaleMidValueControls()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormViewModel">-Map&lt;String, dynamic&gt;? _validateFreeText()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormViewModel">-dynamic _onFreeTextLengthChanged()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormViewModel">-List&lt;FormControlValidation&gt; _getValidationConfig()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onQuestionTypeChanged()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="QuestionFormViewModel">+dynamic onResponseOptionsChanged()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="QuestionFormViewModel">-void _updateFormControls()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="QuestionFormViewModel">+void initControls()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="QuestionFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormData buildFormData()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="QuestionFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="QuestionFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="QuestionFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="QuestionFormViewModel">+dynamic save()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="QuestionFormViewModel">+QuestionFormViewModel createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormViewModel">
-							<rect x="65493.8" y="2376.0" height="498.0" width="902.0" data-name="EnrollmentFormViewModel"></rect>
-							<path d="M65493.8 2407.0 L66395.8 2407.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-							<path d="M65493.8 2633.0 L66395.8 2633.0" fill="none" data-name="EnrollmentFormViewModel"></path>
-						</g>
-						<g transform="translate(65493.75, 2376)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormViewModel">
-								<text x="443.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormViewModel">EnrollmentFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(65493.75, 2407)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemDelegate: EnrollmentFormConsentItemDelegate</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControl: FormControl&lt;Participation&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemArray: FormArray&lt;dynamic&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemFormViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+enrollmentTypeControlOptions: List&lt;FormControlOption&lt;Participation&gt;&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+consentItemModels: List&lt;ConsentItemFormViewModel&gt;</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestScreener: bool</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+canTestConsent: bool</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+questionTitles: Map&lt;FormMode, String Function()&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(65493.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormViewModel">+EnrollmentFormData buildFormData()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormViewModel">+void read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availablePopupActions()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormViewModel">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableInlineActions()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="EnrollmentFormViewModel">+void onSelectItem()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="EnrollmentFormViewModel">+void onNewItem()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildNewScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildNewConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="EnrollmentFormViewModel">+ConsentItemFormRouteArgs buildConsentItemFormRouteArgs()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testScreener()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="EnrollmentFormViewModel">+dynamic testConsent()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="EnrollmentFormViewModel">+ScreenerQuestionFormViewModel provideQuestionFormViewModel()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="EnrollmentFormConsentItemDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="EnrollmentFormConsentItemDelegate">
-							<rect x="65244.8" y="3394.0" height="213.0" width="800.0" data-name="EnrollmentFormConsentItemDelegate"></rect>
-							<path d="M65244.8 3425.0 L66044.8 3425.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-							<path d="M65244.8 3501.0 L66044.8 3501.0" fill="none" data-name="EnrollmentFormConsentItemDelegate"></path>
-						</g>
-						<g transform="translate(65244.75, 3394)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="392.0" y="13.5" stroke="none" text-anchor="middle" data-name="EnrollmentFormConsentItemDelegate">EnrollmentFormConsentItemDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(65244.75, 3425)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+formViewModels: FormViewModelCollection&lt;ConsentItemFormViewModel, ConsentItemFormData&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+owner: EnrollmentFormViewModel</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+propagateOnSave: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+validationSet: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(65244.75, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="EnrollmentFormConsentItemDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="EnrollmentFormConsentItemDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onCancel()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+dynamic onSave()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+ConsentItemFormViewModel provide()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onNewItem()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="EnrollmentFormConsentItemDelegate">+void onSelectItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyFormViewModel">
-							<rect x="71208.5" y="1516.0" height="363.0" width="696.0" data-name="StudyFormViewModel"></rect>
-							<path d="M71208.5 1547.0 L71904.5 1547.0" fill="none" data-name="StudyFormViewModel"></path>
-							<path d="M71208.5 1758.0 L71904.5 1758.0" fill="none" data-name="StudyFormViewModel"></path>
-						</g>
-						<g transform="translate(71208.5, 1516)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyFormViewModel">
-								<text x="340.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyFormViewModel">StudyFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(71208.5, 1547)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+studyDirtyCopy: Study?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+studyInfoFormViewModel: StudyInfoFormViewModel</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+enrollmentFormViewModel: EnrollmentFormViewModel</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">+measurementsFormViewModel: MeasurementsFormViewModel</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyFormViewModel">+reportsFormViewModel: ReportsFormViewModel</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyFormViewModel">+interventionsFormViewModel: InterventionsFormViewModel</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyFormViewModel">+form: FormGroup</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyFormViewModel">+isStudyReadonly: bool</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyFormViewModel">+sharedValidationConfig: Map&lt;FormValidationSetEnum, List&lt;FormControlValidation&gt;&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyFormViewModel">+titles: Map&lt;FormMode, String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(71208.5, 1758)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyFormViewModel">+void read()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyFormViewModel">+void setControlsFrom()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyFormViewModel">+Study buildFormData()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyFormViewModel">+void dispose()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyFormViewModel">+void onCancel()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyFormViewModel">+dynamic onSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyFormViewModel">-dynamic _applyAndSaveSubform()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionFormData">
-							<rect x="53489.8" y="1568.5" height="258.0" width="1168.0" data-name="QuestionFormData"></rect>
-							<path d="M53489.8 1599.5 L54657.8 1599.5" fill="none" data-name="QuestionFormData"></path>
-							<path d="M53489.8 1735.5 L54657.8 1735.5" fill="none" data-name="QuestionFormData"></path>
-						</g>
-						<g transform="translate(53489.75, 1568.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionFormData">
-								<text x="576.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionFormData">QuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(53489.75, 1599.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">&lt;static&gt;+questionTypeFormDataFactories: Map&lt;SurveyQuestionType, QuestionFormData Function(Question&lt;dynamic&gt;, List&lt;EligibilityCriterion&gt;)&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+questionId: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+questionText: String</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+questionInfoText: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+questionType: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="QuestionFormData">+responseOptionsValidity: Map&lt;dynamic, bool&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="QuestionFormData">+responseOptions: List&lt;dynamic&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="QuestionFormData">+id: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(53489.75, 1735.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="QuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="QuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="QuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="QuestionFormData">+EligibilityCriterion toEligibilityCriterion()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="QuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="QuestionFormData">+dynamic setResponseOptionsValidityFrom()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="QuestionFormData">+QuestionFormData copy()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionType">
-							<rect x="33729.5" y="3417.0" height="167.0" width="363.0" data-name="SurveyQuestionType"></rect>
-							<path d="M33729.5 3448.0 L34092.5 3448.0" fill="none" data-name="SurveyQuestionType"></path>
-						</g>
-						<g transform="translate(33729.5, 3417)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionType">
-								<text x="173.5" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionType">SurveyQuestionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(33729.5, 3448)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+values: List&lt;SurveyQuestionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+choice: SurveyQuestionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+bool: SurveyQuestionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+scale: SurveyQuestionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+image: SurveyQuestionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+audio: SurveyQuestionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="SurveyQuestionType">&lt;static&gt;+freeText: SurveyQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormData">
-							<rect x="51241.8" y="2541.0" height="168.0" width="344.0" data-name="ChoiceQuestionFormData"></rect>
-							<path d="M51241.8 2572.0 L51585.8 2572.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-							<path d="M51241.8 2633.0 L51585.8 2633.0" fill="none" data-name="ChoiceQuestionFormData"></path>
-						</g>
-						<g transform="translate(51241.75, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormData">ChoiceQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(51241.75, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+isMultipleChoice: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+answerOptions: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(51241.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ChoiceQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ChoiceQuestionFormData">-Choice _buildChoiceForValue()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ChoiceQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormData">
-							<rect x="51997.8" y="2556.0" height="138.0" width="392.0" data-name="BoolQuestionFormData"></rect>
-							<path d="M51997.8 2587.0 L52389.8 2587.0" fill="none" data-name="BoolQuestionFormData"></path>
-							<path d="M51997.8 2633.0 L52389.8 2633.0" fill="none" data-name="BoolQuestionFormData"></path>
-						</g>
-						<g transform="translate(51997.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormData">
-								<text x="188.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormData">BoolQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(51997.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, bool&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(51997.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="BoolQuestionFormData">+BoolQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="BoolQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageQuestionFormData">
-							<rect x="53165.8" y="2556.0" height="138.0" width="472.0" data-name="ImageQuestionFormData"></rect>
-							<path d="M53165.8 2587.0 L53637.8 2587.0" fill="none" data-name="ImageQuestionFormData"></path>
-							<path d="M53165.8 2633.0 L53637.8 2633.0" fill="none" data-name="ImageQuestionFormData"></path>
-						</g>
-						<g transform="translate(53165.75, 2556)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageQuestionFormData">ImageQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(53165.75, 2587)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(53165.75, 2633)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ImageQuestionFormData">+ImageQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ImageQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioQuestionFormData">
-							<rect x="53677.8" y="2548.5" height="153.0" width="472.0" data-name="AudioQuestionFormData"></rect>
-							<path d="M53677.8 2579.5 L54149.8 2579.5" fill="none" data-name="AudioQuestionFormData"></path>
-							<path d="M53677.8 2640.5 L54149.8 2640.5" fill="none" data-name="AudioQuestionFormData"></path>
-						</g>
-						<g transform="translate(53677.75, 2548.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioQuestionFormData">
-								<text x="228.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioQuestionFormData">AudioQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(53677.75, 2579.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+maxRecordingDurationSeconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">&lt;static&gt;+kResponseOptions: Map&lt;String, FutureBlobFile&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(53677.75, 2640.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AudioQuestionFormData">+AudioQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AudioQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormData">
-							<rect x="54189.8" y="2481.0" height="288.0" width="344.0" data-name="ScaleQuestionFormData"></rect>
-							<path d="M54189.8 2512.0 L54533.8 2512.0" fill="none" data-name="ScaleQuestionFormData"></path>
-							<path d="M54189.8 2708.0 L54533.8 2708.0" fill="none" data-name="ScaleQuestionFormData"></path>
-						</g>
-						<g transform="translate(54189.75, 2481)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormData">ScaleQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(54189.75, 2512)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+minValue: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+maxValue: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+minLabel: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ScaleQuestionFormData">+maxLabel: String?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ScaleQuestionFormData">+midValues: List&lt;double?&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ScaleQuestionFormData">+midLabels: List&lt;String?&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ScaleQuestionFormData">+stepSize: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ScaleQuestionFormData">+initialValue: double?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ScaleQuestionFormData">+minColor: Color?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ScaleQuestionFormData">+maxColor: Color?</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ScaleQuestionFormData">+responseOptions: List&lt;double&gt;</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ScaleQuestionFormData">+midAnnotations: List&lt;Annotation&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(54189.75, 2708)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormData">+ScaleQuestion toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScaleQuestionFormData">+QuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ScaleQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormData">
-							<rect x="54573.8" y="2541.0" height="168.0" width="344.0" data-name="FreeTextQuestionFormData"></rect>
-							<path d="M54573.8 2572.0 L54917.8 2572.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-							<path d="M54573.8 2648.0 L54917.8 2648.0" fill="none" data-name="FreeTextQuestionFormData"></path>
-						</g>
-						<g transform="translate(54573.75, 2541)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormData">
-								<text x="164.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormData">FreeTextQuestionFormData</text>
-								
-							</g>
-						</g>
-						<g transform="translate(54573.75, 2572)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+textLengthRange: List&lt;int&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+textType: FreeTextQuestionType</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+textTypeExpression: String?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="FreeTextQuestionFormData">+responseOptions: List&lt;String&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(54573.75, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormData">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormData">+Question&lt;dynamic&gt; toQuestion()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormData">+FreeTextQuestionFormData copy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormData">+Answer&lt;dynamic&gt; constructAnswerFor()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionType">
-							<rect x="54707.8" y="3485.0" height="31.0" width="196.0" data-name="FreeTextQuestionType"></rect>
-						</g>
-						<g transform="translate(54707.75, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionType">
-								<text x="90.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionType">FreeTextQuestionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AudioRecordingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AudioRecordingQuestionFormView">
-							<rect x="28265.3" y="1651.0" height="93.0" width="352.0" data-name="AudioRecordingQuestionFormView"></rect>
-							<path d="M28265.3 1682.0 L28617.3 1682.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-							<path d="M28265.3 1713.0 L28617.3 1713.0" fill="none" data-name="AudioRecordingQuestionFormView"></path>
-						</g>
-						<g transform="translate(28265.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AudioRecordingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="AudioRecordingQuestionFormView">AudioRecordingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28265.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28265.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AudioRecordingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AudioRecordingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="AudioRecordingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FreeTextQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FreeTextQuestionFormView">
-							<rect x="28657.3" y="1628.5" height="138.0" width="352.0" data-name="FreeTextQuestionFormView"></rect>
-							<path d="M28657.3 1659.5 L29009.3 1659.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-							<path d="M28657.3 1705.5 L29009.3 1705.5" fill="none" data-name="FreeTextQuestionFormView"></path>
-						</g>
-						<g transform="translate(28657.25, 1628.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FreeTextQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="FreeTextQuestionFormView">FreeTextQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28657.25, 1659.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+generateLabelHelpTextMap: dynamic</text>
-								
-							</g>
-						</g>
-						<g transform="translate(28657.25, 1705.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FreeTextQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FreeTextQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget disableOnReadonly()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FreeTextQuestionFormView">+Widget generateRow()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ImageCapturingQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ImageCapturingQuestionFormView">
-							<rect x="29049.3" y="1651.0" height="93.0" width="352.0" data-name="ImageCapturingQuestionFormView"></rect>
-							<path d="M29049.3 1682.0 L29401.3 1682.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-							<path d="M29049.3 1713.0 L29401.3 1713.0" fill="none" data-name="ImageCapturingQuestionFormView"></path>
-						</g>
-						<g transform="translate(29049.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ImageCapturingQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ImageCapturingQuestionFormView">ImageCapturingQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29049.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29049.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ImageCapturingQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ImageCapturingQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ImageCapturingQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IScaleQuestionFormViewModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IScaleQuestionFormViewModel">
-							<rect x="82392.8" y="105.5" height="62.0" width="309.0" data-name="IScaleQuestionFormViewModel"></rect>
-							<path d="M82392.8 136.5 L82701.8 136.5" fill="none" data-name="IScaleQuestionFormViewModel"></path>
-						</g>
-						<g transform="translate(82392.75, 105.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IScaleQuestionFormViewModel">
-								<text x="146.5" y="13.5" stroke="none" text-anchor="middle" data-name="IScaleQuestionFormViewModel">IScaleQuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82392.75, 136.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IScaleQuestionFormViewModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IScaleQuestionFormViewModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="IScaleQuestionFormViewModel">+isMidValuesClearedInfoVisible: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScaleQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScaleQuestionFormView">
-							<rect x="55045.0" y="1666.5" height="62.0" width="352.0" data-name="ScaleQuestionFormView"></rect>
-							<path d="M55045.0 1697.5 L55397.0 1697.5" fill="none" data-name="ScaleQuestionFormView"></path>
-						</g>
-						<g transform="translate(55045, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScaleQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScaleQuestionFormView">ScaleQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(55045, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScaleQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScaleQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScaleQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChoiceQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChoiceQuestionFormView">
-							<rect x="29441.3" y="1651.0" height="93.0" width="352.0" data-name="ChoiceQuestionFormView"></rect>
-							<path d="M29441.3 1682.0 L29793.3 1682.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-							<path d="M29441.3 1713.0 L29793.3 1713.0" fill="none" data-name="ChoiceQuestionFormView"></path>
-						</g>
-						<g transform="translate(29441.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChoiceQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChoiceQuestionFormView">ChoiceQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29441.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(29441.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ChoiceQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ChoiceQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="ChoiceQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BoolQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BoolQuestionFormView">
-							<rect x="30248.3" y="1651.0" height="93.0" width="352.0" data-name="BoolQuestionFormView"></rect>
-							<path d="M30248.3 1682.0 L30600.3 1682.0" fill="none" data-name="BoolQuestionFormView"></path>
-							<path d="M30248.3 1713.0 L30600.3 1713.0" fill="none" data-name="BoolQuestionFormView"></path>
-						</g>
-						<g transform="translate(30248.25, 1651)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BoolQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="BoolQuestionFormView">BoolQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(30248.25, 1682)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(30248.25, 1713)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="BoolQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="BoolQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="BoolQuestionFormView">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SurveyQuestionFormView">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SurveyQuestionFormView">
-							<rect x="56975.3" y="1659.0" height="77.0" width="352.0" data-name="SurveyQuestionFormView"></rect>
-							<path d="M56975.3 1690.0 L57327.3 1690.0" fill="none" data-name="SurveyQuestionFormView"></path>
-						</g>
-						<g transform="translate(56975.25, 1659)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SurveyQuestionFormView">
-								<text x="168.0" y="13.5" stroke="none" text-anchor="middle" data-name="SurveyQuestionFormView">SurveyQuestionFormView</text>
-								
-							</g>
-						</g>
-						<g transform="translate(56975.25, 1690)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SurveyQuestionFormView">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SurveyQuestionFormView">
-								<text x="0.0" y="13.5" stroke="none" data-name="SurveyQuestionFormView">+formViewModel: QuestionFormViewModel</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SurveyQuestionFormView">+isHtmlStyleable: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUTimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUTimeOfDay">
-							<rect x="55978.3" y="2609.5" height="31.0" width="160.0" data-name="StudyUTimeOfDay"></rect>
-						</g>
-						<g transform="translate(55978.25, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUTimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUTimeOfDay">
-								<text x="72.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUTimeOfDay">StudyUTimeOfDay</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ScheduleControls">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ScheduleControls">
-							<rect x="82333.0" y="1158.5" height="108.0" width="432.0" data-name="ScheduleControls"></rect>
-							<path d="M82333.0 1189.5 L82765.0 1189.5" fill="none" data-name="ScheduleControls"></path>
-							<path d="M82333.0 1220.5 L82765.0 1220.5" fill="none" data-name="ScheduleControls"></path>
-						</g>
-						<g transform="translate(82333, 1158.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ScheduleControls">
-								<text x="208.0" y="13.5" stroke="none" text-anchor="middle" data-name="ScheduleControls">ScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82333, 1189.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+formViewModel: WithScheduleControls</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82333, 1220.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ScheduleControls">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ScheduleControls">
-								<text x="0.0" y="13.5" stroke="none" data-name="ScheduleControls">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ScheduleControls">-List&lt;FormTableRow&gt; _conditionalTimeRestrictions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableColumnHeader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnHeader">
-							<rect x="45276.0" y="3782.5" height="122.0" width="237.0" data-name="StudiesTableColumnHeader"></rect>
-							<path d="M45276.0 3813.5 L45513.0 3813.5" fill="none" data-name="StudiesTableColumnHeader"></path>
-						</g>
-						<g transform="translate(45276, 3782.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnHeader">
-								<text x="110.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnHeader">StudiesTableColumnHeader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(45276, 3813.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnHeader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnHeader">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnHeader">+title: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnHeader">+sortable: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnHeader">+sortAscending: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumnHeader">+sortingActive: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumnHeader">+onSort: void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScreen">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScreen">
-							<rect x="57320.8" y="2594.0" height="62.0" width="178.0" data-name="DashboardScreen"></rect>
-							<path d="M57320.8 2625.0 L57498.8 2625.0" fill="none" data-name="DashboardScreen"></path>
-						</g>
-						<g transform="translate(57320.75, 2594)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScreen">
-								<text x="81.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScreen">DashboardScreen</text>
-								
-							</g>
-						</g>
-						<g transform="translate(57320.75, 2625)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScreen">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScreen">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScreen">+filter: StudiesFilter?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesFilter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesFilter">
-							<rect x="25620.3" y="3462.0" height="77.0" width="296.0" data-name="StudiesFilter"></rect>
-							<path d="M25620.3 3493.0 L25916.3 3493.0" fill="none" data-name="StudiesFilter"></path>
-						</g>
-						<g transform="translate(25620.25, 3462)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesFilter">
-								<text x="140.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesFilter">StudiesFilter</text>
-								
-							</g>
-						</g>
-						<g transform="translate(25620.25, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesFilter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesFilter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesFilter">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesFilter">&lt;static&gt;+values: List&lt;StudiesFilter&gt;</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardScaffold">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardScaffold">
-							<rect x="57538.8" y="2571.0" height="108.0" width="343.0" data-name="DashboardScaffold"></rect>
-							<path d="M57538.8 2602.0 L57881.8 2602.0" fill="none" data-name="DashboardScaffold"></path>
-							<path d="M57538.8 2648.0 L57881.8 2648.0" fill="none" data-name="DashboardScaffold"></path>
-						</g>
-						<g transform="translate(57538.75, 2571)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardScaffold">
-								<text x="163.5" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardScaffold">DashboardScaffold</text>
-								
-							</g>
-						</g>
-						<g transform="translate(57538.75, 2602)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">&lt;static&gt;+compactWidthThreshold: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardScaffold">+body: Widget</text>
-								
-							</g>
-						</g>
-						<g transform="translate(57538.75, 2648)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardScaffold">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardScaffold">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardScaffold">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="DashboardController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="DashboardController">
-							<rect x="69694.3" y="2436.0" height="378.0" width="614.0" data-name="DashboardController"></rect>
-							<path d="M69694.3 2467.0 L70308.3 2467.0" fill="none" data-name="DashboardController"></path>
-							<path d="M69694.3 2588.0 L70308.3 2588.0" fill="none" data-name="DashboardController"></path>
-						</g>
-						<g transform="translate(69694.25, 2436)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="DashboardController">
-								<text x="299.0" y="13.5" stroke="none" text-anchor="middle" data-name="DashboardController">DashboardController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(69694.25, 2467)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+userRepository: IUserRepository</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+router: GoRouter</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">-_studiesSubscription: StreamSubscription&lt;List&lt;WrappedModel&lt;Study&gt;&gt;&gt;?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+searchController: SearchController</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+isSortAscending: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(69694.25, 2588)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="DashboardController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="DashboardController">
-								<text x="0.0" y="13.5" stroke="none" data-name="DashboardController">-dynamic _subscribeStudies()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="DashboardController">+dynamic setSearchText()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="DashboardController">+dynamic setStudiesFilter()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="DashboardController">+dynamic onSelectStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="DashboardController">+dynamic onClickNewStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="DashboardController">+dynamic pinStudy()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="DashboardController">+dynamic pinOffStudy()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="DashboardController">+void setSorting()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="DashboardController">+void filterStudies()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="DashboardController">+void sortStudies()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="DashboardController">+bool isSortingActiveForColumn()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="DashboardController">+bool isPinned()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="DashboardController">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="DashboardController">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IUserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IUserRepository">
-							<rect x="69811.3" y="3439.0" height="123.0" width="260.0" data-name="IUserRepository"></rect>
-							<path d="M69811.3 3470.0 L70071.3 3470.0" fill="none" data-name="IUserRepository"></path>
-							<path d="M69811.3 3501.0 L70071.3 3501.0" fill="none" data-name="IUserRepository"></path>
-						</g>
-						<g transform="translate(69811.25, 3439)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IUserRepository">
-								<text x="122.0" y="13.5" stroke="none" text-anchor="middle" data-name="IUserRepository">IUserRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(69811.25, 3470)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+user: StudyUUser</text>
-								
-							</g>
-						</g>
-						<g transform="translate(69811.25, 3501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IUserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IUserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IUserRepository">+dynamic fetchUser()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IUserRepository">+dynamic saveUser()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IUserRepository">+dynamic updatePreferences()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableColumnSize">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumnSize">
-							<rect x="82741.8" y="75.0" height="123.0" width="225.0" data-name="StudiesTableColumnSize"></rect>
-							<path d="M82741.8 106.0 L82966.8 106.0" fill="none" data-name="StudiesTableColumnSize"></path>
-							<path d="M82741.8 167.0 L82966.8 167.0" fill="none" data-name="StudiesTableColumnSize"></path>
-						</g>
-						<g transform="translate(82741.75, 75)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumnSize">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumnSize">StudiesTableColumnSize</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82741.75, 106)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+collapsed: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumnSize">+flex: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumnSize">+width: double?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82741.75, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumnSize">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumnSize">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumnSize">+Widget createContainer()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTable">
-							<rect x="58004.5" y="1553.5" height="288.0" width="480.0" data-name="StudiesTable"></rect>
-							<path d="M58004.5 1584.5 L58484.5 1584.5" fill="none" data-name="StudiesTable"></path>
-							<path d="M58004.5 1795.5 L58484.5 1795.5" fill="none" data-name="StudiesTable"></path>
-						</g>
-						<g transform="translate(58004.5, 1553.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTable">
-								<text x="232.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTable">StudiesTable</text>
-								
-							</g>
-						</g>
-						<g transform="translate(58004.5, 1584.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+itemHeight: double</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">+itemPadding: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTable">+rowSpacing: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTable">+columnSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTable">+compactWidthThreshold: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTable">+superCompactWidthThreshold: double</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTable">+compactStatTitleThreshold: double</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTable">+studies: List&lt;Study&gt;</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTable">+onSelect: void Function(Study)</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTable">+getActions: List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTable">+emptyWidget: Widget</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudiesTable">+pinnedStudies: Iterable&lt;String&gt;</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudiesTable">+dashboardController: DashboardController</text>
-								
-							</g>
-						</g>
-						<g transform="translate(58004.5, 1795.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTable">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTable">+Widget build()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTable">-Widget _buildColumnHeader()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)">
-							<rect x="57101.8" y="2609.5" height="31.0" width="179.0" data-name="void Function(Study)"></rect>
-						</g>
-						<g transform="translate(57101.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)">void Function(Study)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<rect x="57921.8" y="2609.5" height="31.0" width="377.0" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)"></rect>
-						</g>
-						<g transform="translate(57921.75, 2609.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">
-								<text x="180.5" y="13.5" stroke="none" text-anchor="middle" data-name="List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)">List&lt;ModelAction&lt;dynamic&gt;&gt; Function(Study)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableColumn">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableColumn">
-							<rect x="2902.0" y="3394.5" height="212.0" width="361.0" data-name="StudiesTableColumn"></rect>
-							<path d="M2902.0 3425.5 L3263.0 3425.5" fill="none" data-name="StudiesTableColumn"></path>
-						</g>
-						<g transform="translate(2902, 3394.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableColumn">
-								<text x="172.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableColumn">StudiesTableColumn</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2902, 3425.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableColumn">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableColumn">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableColumn">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+values: List&lt;StudiesTableColumn&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+pin: StudiesTableColumn</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+title: StudiesTableColumn</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+status: StudiesTableColumn</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+participation: StudiesTableColumn</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+createdAt: StudiesTableColumn</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+enrolled: StudiesTableColumn</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+active: StudiesTableColumn</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+completed: StudiesTableColumn</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudiesTableColumn">&lt;static&gt;+action: StudiesTableColumn</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudiesTableItem">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudiesTableItem">
-							<rect x="58700.8" y="2526.5" height="197.0" width="400.0" data-name="StudiesTableItem"></rect>
-							<path d="M58700.8 2557.5 L59100.8 2557.5" fill="none" data-name="StudiesTableItem"></path>
-						</g>
-						<g transform="translate(58700.75, 2526.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudiesTableItem">
-								<text x="192.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudiesTableItem">StudiesTableItem</text>
-								
-							</g>
-						</g>
-						<g transform="translate(58700.75, 2557.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudiesTableItem">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudiesTableItem">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudiesTableItem">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudiesTableItem">+itemHeight: double</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudiesTableItem">+itemPadding: double</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudiesTableItem">+rowSpacing: double</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudiesTableItem">+columnSpacing: double</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudiesTableItem">+actions: List&lt;ModelAction&lt;dynamic&gt;&gt;</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudiesTableItem">+columnSizes: List&lt;StudiesTableColumnSize&gt;</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudiesTableItem">+isPinned: bool</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudiesTableItem">+onPinnedChanged: void Function(Study, bool)?</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudiesTableItem">+onTap: void Function(Study)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Study, bool)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study, bool)?">
-							<rect x="58582.3" y="3485.0" height="31.0" width="233.0" data-name="void Function(Study, bool)?"></rect>
-						</g>
-						<g transform="translate(58582.25, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study, bool)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study, bool)?">
-								<text x="108.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study, bool)?">void Function(Study, bool)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Study)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Study)?">
-							<rect x="59804.0" y="3485.0" height="31.0" width="189.0" data-name="void Function(Study)?"></rect>
-						</g>
-						<g transform="translate(59804, 3485)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Study)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Study)?">
-								<text x="86.5" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Study)?">void Function(Study)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="App">
-						<g fill="#eee8d5" stroke="#33322E" data-name="App">
-							<rect x="83006.8" y="121.0" height="31.0" width="47.0" data-name="App"></rect>
-						</g>
-						<g transform="translate(83006.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="App">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="App">
-								<text x="15.5" y="13.5" stroke="none" text-anchor="middle" data-name="App">App</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppContent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppContent">
-							<rect x="83093.8" y="121.0" height="31.0" width="109.0" data-name="AppContent"></rect>
-						</g>
-						<g transform="translate(83093.75, 121)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppContent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppContent">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="AppContent">AppContent</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AccountSettingsDialog">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AccountSettingsDialog">
-							<rect x="38906.3" y="1666.5" height="62.0" width="194.0" data-name="AccountSettingsDialog"></rect>
-							<path d="M38906.3 1697.5 L39100.3 1697.5" fill="none" data-name="AccountSettingsDialog"></path>
-						</g>
-						<g transform="translate(38906.25, 1666.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AccountSettingsDialog">
-								<text x="89.0" y="13.5" stroke="none" text-anchor="middle" data-name="AccountSettingsDialog">AccountSettingsDialog</text>
-								
-							</g>
-						</g>
-						<g transform="translate(38906.25, 1697.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AccountSettingsDialog">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AccountSettingsDialog">
-								<text x="0.0" y="13.5" stroke="none" data-name="AccountSettingsDialog">+Widget build()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepository">
-							<rect x="83433.5" y="986.0" height="453.0" width="662.0" data-name="ModelRepository"></rect>
-							<path d="M83433.5 1017.0 L84095.5 1017.0" fill="none" data-name="ModelRepository"></path>
-							<path d="M83433.5 1123.0 L84095.5 1123.0" fill="none" data-name="ModelRepository"></path>
-						</g>
-						<g transform="translate(83433.5, 986)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepository">
-								<text x="323.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepository">ModelRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(83433.5, 1017)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+delegate: IModelRepositoryDelegate&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">-_allModelsStreamController: BehaviorSubject&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">-_allModelEventsStreamController: BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+modelStreamControllers: Map&lt;String, BehaviorSubject&lt;WrappedModel&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+modelEventsStreamControllers: Map&lt;String, BehaviorSubject&lt;ModelEvent&lt;T&gt;&gt;&gt;</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">-_allModels: Map&lt;String, WrappedModel&lt;T&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(83433.5, 1123)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt;? get()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelRepository">+dynamic fetchAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelRepository">+dynamic fetch()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelRepository">+dynamic save()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelRepository">+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSave()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="ModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="ModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="ModelRepository">-dynamic _buildModelSpecificController()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="ModelRepository">+dynamic ensurePersisted()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="ModelRepository">+WrappedModel&lt;T&gt; upsertLocally()</text>
-								<text x="0.0" y="223.5" stroke="none" data-name="ModelRepository">+List&lt;WrappedModel&lt;T&gt;&gt; upsertAllLocally()</text>
-								<text x="0.0" y="238.5" stroke="none" data-name="ModelRepository">+dynamic emitUpdate()</text>
-								<text x="0.0" y="253.5" stroke="none" data-name="ModelRepository">+dynamic emitModelEvent()</text>
-								<text x="0.0" y="268.5" stroke="none" data-name="ModelRepository">+dynamic emitError()</text>
-								<text x="0.0" y="283.5" stroke="none" data-name="ModelRepository">+void dispose()</text>
-								<text x="0.0" y="298.5" stroke="none" data-name="ModelRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepository">
-							<rect x="82629.0" y="2518.5" height="213.0" width="403.0" data-name="InviteCodeRepository"></rect>
-							<path d="M82629.0 2549.5 L83032.0 2549.5" fill="none" data-name="InviteCodeRepository"></path>
-							<path d="M82629.0 2655.5 L83032.0 2655.5" fill="none" data-name="InviteCodeRepository"></path>
-						</g>
-						<g transform="translate(82629, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepository">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepository">InviteCodeRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82629, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+studyId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepository">+studyRepository: IStudyRepository</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepository">+study: Study</text>
-								
-							</g>
-						</g>
-						<g transform="translate(82629, 2655.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepository">+dynamic isCodeAlreadyUsed()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepository">+dynamic emitUpdate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ProviderRef">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ProviderRef">
-							<rect x="83283.8" y="4118.5" height="31.0" width="109.0" data-name="ProviderRef"></rect>
-						</g>
-						<g transform="translate(83283.75, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ProviderRef">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ProviderRef">
-								<text x="46.5" y="13.5" stroke="none" text-anchor="middle" data-name="ProviderRef">ProviderRef</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUApi">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApi">
-							<rect x="76856.5" y="4028.0" height="212.0" width="251.0" data-name="StudyUApi"></rect>
-							<path d="M76856.5 4059.0 L77107.5 4059.0" fill="none" data-name="StudyUApi"></path>
-						</g>
-						<g transform="translate(76856.5, 4028)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="StudyUApi">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApi">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApi">StudyUApi</text>
-								
-							</g>
-						</g>
-						<g transform="translate(76856.5, 4059)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApi">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApi">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApi">+dynamic saveStudy()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudy()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApi">+dynamic getUserStudies()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApi">+dynamic saveStudyInvite()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApi">+dynamic fetchStudyInvite()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApi">+dynamic deleteStudyInvite()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApi">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApi">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApi">+dynamic fetchUser()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApi">+dynamic saveUser()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InviteCodeRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InviteCodeRepositoryDelegate">
-							<rect x="83544.5" y="2518.5" height="213.0" width="299.0" data-name="InviteCodeRepositoryDelegate"></rect>
-							<path d="M83544.5 2549.5 L83843.5 2549.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
-							<path d="M83544.5 2610.5 L83843.5 2610.5" fill="none" data-name="InviteCodeRepositoryDelegate"></path>
-						</g>
-						<g transform="translate(83544.5, 2518.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InviteCodeRepositoryDelegate">
-								<text x="141.5" y="13.5" stroke="none" text-anchor="middle" data-name="InviteCodeRepositoryDelegate">InviteCodeRepositoryDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(83544.5, 2549.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+study: Study</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+apiClient: StudyUApi</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+studyRepository: IStudyRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(83544.5, 2610.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="InviteCodeRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="InviteCodeRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+dynamic onError()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createDuplicate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="InviteCodeRepositoryDelegate">+StudyInvite createNewInstance()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepositoryDelegate">
-							<rect x="83676.3" y="1621.5" height="152.0" width="225.0" data-name="IModelRepositoryDelegate"></rect>
-							<path d="M83676.3 1652.5 L83901.3 1652.5" fill="none" data-name="IModelRepositoryDelegate"></path>
-						</g>
-						<g transform="translate(83676.25, 1621.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepositoryDelegate">
-								<text x="104.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepositoryDelegate">IModelRepositoryDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(83676.25, 1652.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepositoryDelegate">+T createNewInstance()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepositoryDelegate">+T createDuplicate()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepositoryDelegate">+dynamic onError()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepository">
-							<rect x="72024.3" y="3752.0" height="183.0" width="403.0" data-name="StudyRepository"></rect>
-							<path d="M72024.3 3783.0 L72427.3 3783.0" fill="none" data-name="StudyRepository"></path>
-							<path d="M72024.3 3859.0 L72427.3 3859.0" fill="none" data-name="StudyRepository"></path>
-						</g>
-						<g transform="translate(72024.25, 3752)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepository">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepository">StudyRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72024.25, 3783)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+ref: ProviderRef&lt;dynamic&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+sortCallback: void Function()?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(72024.25, 3859)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepository">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepository">+dynamic launch()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepository">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyRepositoryDelegate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyRepositoryDelegate">
-							<rect x="83742.5" y="3744.5" height="198.0" width="282.0" data-name="StudyRepositoryDelegate"></rect>
-							<path d="M83742.5 3775.5 L84024.5 3775.5" fill="none" data-name="StudyRepositoryDelegate"></path>
-							<path d="M83742.5 3821.5 L84024.5 3821.5" fill="none" data-name="StudyRepositoryDelegate"></path>
-						</g>
-						<g transform="translate(83742.5, 3744.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyRepositoryDelegate">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyRepositoryDelegate">StudyRepositoryDelegate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(83742.5, 3775.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+authRepository: IAuthRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(83742.5, 3821.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyRepositoryDelegate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyRepositoryDelegate">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetchAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic fetch()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic save()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic delete()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyRepositoryDelegate">+dynamic onError()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createNewInstance()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyRepositoryDelegate">+Study createDuplicate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="APIException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="APIException">
-							<rect x="75376.5" y="614.0" height="31.0" width="121.0" data-name="APIException"></rect>
-						</g>
-						<g transform="translate(75376.5, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="APIException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="APIException">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="APIException">APIException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyNotFoundException">
-							<rect x="73767.5" y="1197.0" height="31.0" width="216.0" data-name="StudyNotFoundException"></rect>
-						</g>
-						<g transform="translate(73767.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyNotFoundException">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyNotFoundException">StudyNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="MeasurementNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="MeasurementNotFoundException">
-							<rect x="74023.5" y="1197.0" height="31.0" width="279.0" data-name="MeasurementNotFoundException"></rect>
-						</g>
-						<g transform="translate(74023.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="MeasurementNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="MeasurementNotFoundException">
-								<text x="131.5" y="13.5" stroke="none" text-anchor="middle" data-name="MeasurementNotFoundException">MeasurementNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="QuestionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="QuestionNotFoundException">
-							<rect x="74342.5" y="1197.0" height="31.0" width="242.0" data-name="QuestionNotFoundException"></rect>
-						</g>
-						<g transform="translate(74342.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="QuestionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="QuestionNotFoundException">
-								<text x="113.0" y="13.5" stroke="none" text-anchor="middle" data-name="QuestionNotFoundException">QuestionNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ConsentItemNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ConsentItemNotFoundException">
-							<rect x="74624.5" y="1197.0" height="31.0" width="271.0" data-name="ConsentItemNotFoundException"></rect>
-						</g>
-						<g transform="translate(74624.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ConsentItemNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ConsentItemNotFoundException">
-								<text x="127.5" y="13.5" stroke="none" text-anchor="middle" data-name="ConsentItemNotFoundException">ConsentItemNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionNotFoundException">
-							<rect x="74935.5" y="1197.0" height="31.0" width="265.0" data-name="InterventionNotFoundException"></rect>
-						</g>
-						<g transform="translate(74935.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionNotFoundException">
-								<text x="124.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionNotFoundException">InterventionNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="InterventionTaskNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="InterventionTaskNotFoundException">
-							<rect x="75931.5" y="1197.0" height="31.0" width="303.0" data-name="InterventionTaskNotFoundException"></rect>
-						</g>
-						<g transform="translate(75931.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="InterventionTaskNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="InterventionTaskNotFoundException">
-								<text x="143.5" y="13.5" stroke="none" text-anchor="middle" data-name="InterventionTaskNotFoundException">InterventionTaskNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportNotFoundException">
-							<rect x="76274.5" y="1197.0" height="31.0" width="224.0" data-name="ReportNotFoundException"></rect>
-						</g>
-						<g transform="translate(76274.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportNotFoundException">
-								<text x="104.0" y="13.5" stroke="none" text-anchor="middle" data-name="ReportNotFoundException">ReportNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ReportSectionNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ReportSectionNotFoundException">
-							<rect x="76538.5" y="1197.0" height="31.0" width="283.0" data-name="ReportSectionNotFoundException"></rect>
-						</g>
-						<g transform="translate(76538.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ReportSectionNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ReportSectionNotFoundException">
-								<text x="133.5" y="13.5" stroke="none" text-anchor="middle" data-name="ReportSectionNotFoundException">ReportSectionNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyInviteNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyInviteNotFoundException">
-							<rect x="76861.5" y="1197.0" height="31.0" width="259.0" data-name="StudyInviteNotFoundException"></rect>
-						</g>
-						<g transform="translate(76861.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyInviteNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyInviteNotFoundException">
-								<text x="121.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyInviteNotFoundException">StudyInviteNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="UserNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UserNotFoundException">
-							<rect x="77160.5" y="1197.0" height="31.0" width="208.0" data-name="UserNotFoundException"></rect>
-						</g>
-						<g transform="translate(77160.5, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserNotFoundException">
-								<text x="96.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserNotFoundException">UserNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUApiClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUApiClient">
-							<rect x="76564.5" y="4288.0" height="333.0" width="479.0" data-name="StudyUApiClient"></rect>
-							<path d="M76564.5 4319.0 L77043.5 4319.0" fill="none" data-name="StudyUApiClient"></path>
-							<path d="M76564.5 4395.0 L77043.5 4395.0" fill="none" data-name="StudyUApiClient"></path>
-						</g>
-						<g transform="translate(76564.5, 4288)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUApiClient">
-								<text x="231.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUApiClient">StudyUApiClient</text>
-								
-							</g>
-						</g>
-						<g transform="translate(76564.5, 4319)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+supabaseClient: SupabaseClient</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyColumns: List&lt;String&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">&lt;static&gt;+studyWithParticipantActivityColumns: List&lt;String&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+testDelayMilliseconds: int</text>
-								
-							</g>
-						</g>
-						<g transform="translate(76564.5, 4395)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudyUApiClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudyUApiClient">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteParticipants()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="StudyUApiClient">+dynamic getUserStudies()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudy()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudy()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudy()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchStudyInvite()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="StudyUApiClient">+dynamic saveStudyInvite()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="StudyUApiClient">+dynamic deleteStudyInvite()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="StudyUApiClient">+dynamic fetchUser()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="StudyUApiClient">+dynamic saveUser()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="StudyUApiClient">-dynamic _awaitGuarded()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="StudyUApiClient">-dynamic _apiException()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="StudyUApiClient">-dynamic _testDelay()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClient">
-							<rect x="76480.0" y="4661.0" height="31.0" width="141.0" data-name="SupabaseClient"></rect>
-						</g>
-						<g transform="translate(76480, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClient">
-								<text x="62.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClient">SupabaseClient</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseClientDependant">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseClientDependant">
-							<rect x="76179.5" y="4103.0" height="62.0" width="284.0" data-name="SupabaseClientDependant"></rect>
-							<path d="M76179.5 4134.0 L76463.5 4134.0" fill="none" data-name="SupabaseClientDependant"></path>
-						</g>
-						<g transform="translate(76179.5, 4103)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseClientDependant">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseClientDependant">
-								<text x="134.0" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseClientDependant">SupabaseClientDependant</text>
-								
-							</g>
-						</g>
-						<g transform="translate(76179.5, 4134)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseClientDependant">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseClientDependant">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseClientDependant">+supabaseClient: SupabaseClient</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseQueryMixin">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryMixin">
-							<rect x="76518.5" y="4065.5" height="137.0" width="215.0" data-name="SupabaseQueryMixin"></rect>
-							<path d="M76518.5 4096.5 L76733.5 4096.5" fill="none" data-name="SupabaseQueryMixin"></path>
-						</g>
-						<g transform="translate(76518.5, 4065.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="SupabaseQueryMixin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryMixin">
-								<text x="99.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryMixin">SupabaseQueryMixin</text>
-								
-							</g>
-						</g>
-						<g transform="translate(76518.5, 4096.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryMixin">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryMixin">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic deleteAll()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getAll()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getById()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseQueryMixin">+dynamic getByColumn()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseQueryMixin">+List&lt;T&gt; deserializeList()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SupabaseQueryMixin">+T deserializeObject()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IAppRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IAppRepository">
-							<rect x="60033.0" y="3462.0" height="77.0" width="230.0" data-name="IAppRepository"></rect>
-							<path d="M60033.0 3493.0 L60263.0 3493.0" fill="none" data-name="IAppRepository"></path>
-						</g>
-						<g transform="translate(60033, 3462)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IAppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IAppRepository">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="IAppRepository">IAppRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(60033, 3493)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IAppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IAppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IAppRepository">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IAppRepository">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppRepository">
-							<rect x="60033.0" y="3789.5" height="108.0" width="230.0" data-name="AppRepository"></rect>
-							<path d="M60033.0 3820.5 L60263.0 3820.5" fill="none" data-name="AppRepository"></path>
-							<path d="M60033.0 3851.5 L60263.0 3851.5" fill="none" data-name="AppRepository"></path>
-						</g>
-						<g transform="translate(60033, 3789.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppRepository">
-								<text x="107.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppRepository">AppRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(60033, 3820.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+apiClient: StudyUApi</text>
-								
-							</g>
-						</g>
-						<g transform="translate(60033, 3851.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppRepository">+dynamic fetchAppConfig()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppRepository">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyUUser">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyUUser">
-							<rect x="72429.0" y="4118.5" height="31.0" width="110.0" data-name="StudyUUser"></rect>
-						</g>
-						<g transform="translate(72429, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyUUser">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyUUser">
-								<text x="47.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyUUser">StudyUUser</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="UserRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="UserRepository">
-							<rect x="70276.5" y="3759.5" height="168.0" width="282.0" data-name="UserRepository"></rect>
-							<path d="M70276.5 3790.5 L70558.5 3790.5" fill="none" data-name="UserRepository"></path>
-							<path d="M70276.5 3866.5 L70558.5 3866.5" fill="none" data-name="UserRepository"></path>
-						</g>
-						<g transform="translate(70276.5, 3759.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="UserRepository">
-								<text x="133.0" y="13.5" stroke="none" text-anchor="middle" data-name="UserRepository">UserRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(70276.5, 3790.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+apiClient: StudyUApi</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+authRepository: IAuthRepository</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+ref: Ref&lt;Object?&gt;</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="UserRepository">+user: StudyUUser</text>
-								
-							</g>
-						</g>
-						<g transform="translate(70276.5, 3866.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="UserRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="UserRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="UserRepository">+dynamic fetchUser()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="UserRepository">+dynamic saveUser()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="UserRepository">+dynamic updatePreferences()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Ref">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Ref">
-							<rect x="76773.5" y="4118.5" height="31.0" width="43.0" data-name="Ref"></rect>
-						</g>
-						<g transform="translate(76773.5, 4118.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Ref">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Ref">
-								<text x="13.5" y="13.5" stroke="none" text-anchor="middle" data-name="Ref">Ref</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="PreferenceAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="PreferenceAction">
-							<rect x="3353.0" y="3447.0" height="107.0" width="334.0" data-name="PreferenceAction"></rect>
-							<path d="M3353.0 3478.0 L3687.0 3478.0" fill="none" data-name="PreferenceAction"></path>
-						</g>
-						<g transform="translate(3353, 3447)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="PreferenceAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="PreferenceAction">
-								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="PreferenceAction">PreferenceAction</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3353, 3478)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="PreferenceAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="PreferenceAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="PreferenceAction">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+values: List&lt;PreferenceAction&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pin: PreferenceAction</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="PreferenceAction">&lt;static&gt;+pinOff: PreferenceAction</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="User">
-						<g fill="#eee8d5" stroke="#33322E" data-name="User">
-							<rect x="72089.8" y="4661.0" height="31.0" width="53.0" data-name="User"></rect>
-						</g>
-						<g transform="translate(72089.75, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="User">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="User">
-								<text x="18.5" y="13.5" stroke="none" text-anchor="middle" data-name="User">User</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Session">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Session">
-							<rect x="75897.0" y="4661.0" height="31.0" width="79.0" data-name="Session"></rect>
-						</g>
-						<g transform="translate(75897, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Session">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Session">
-								<text x="31.5" y="13.5" stroke="none" text-anchor="middle" data-name="Session">Session</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AuthRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AuthRepository">
-							<rect x="75954.3" y="4310.5" height="288.0" width="295.0" data-name="AuthRepository"></rect>
-							<path d="M75954.3 4341.5 L76249.3 4341.5" fill="none" data-name="AuthRepository"></path>
-							<path d="M75954.3 4462.5 L76249.3 4462.5" fill="none" data-name="AuthRepository"></path>
-						</g>
-						<g transform="translate(75954.25, 4310.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AuthRepository">
-								<text x="139.5" y="13.5" stroke="none" text-anchor="middle" data-name="AuthRepository">AuthRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(75954.25, 4341.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">+supabaseClient: SupabaseClient</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+allowPasswordReset: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+authClient: GoTrueClient</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+session: Session?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+serializedSession: String?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+currentUser: User?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+isLoggedIn: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(75954.25, 4462.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AuthRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AuthRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="AuthRepository">-void _registerAuthListener()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AuthRepository">+dynamic signUp()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AuthRepository">+dynamic signInWith()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AuthRepository">+dynamic signOut()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="AuthRepository">+dynamic resetPasswordForEmail()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="AuthRepository">+dynamic updateUser()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="AuthRepository">+void dispose()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="AuthRepository">+dynamic onAppStart()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="GoTrueClient">
-						<g fill="#eee8d5" stroke="#33322E" data-name="GoTrueClient">
-							<rect x="76079.3" y="4661.0" height="31.0" width="120.0" data-name="GoTrueClient"></rect>
-						</g>
-						<g transform="translate(76079.25, 4661)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="GoTrueClient">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="GoTrueClient">
-								<text x="52.0" y="13.5" stroke="none" text-anchor="middle" data-name="GoTrueClient">GoTrueClient</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudyLaunched">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudyLaunched">
-							<rect x="79408.0" y="614.0" height="31.0" width="140.0" data-name="StudyLaunched"></rect>
-						</g>
-						<g transform="translate(79408, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudyLaunched">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudyLaunched">
-								<text x="62.0" y="13.5" stroke="none" text-anchor="middle" data-name="StudyLaunched">StudyLaunched</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelEvent">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelEvent">
-							<rect x="79815.3" y="98.0" height="77.0" width="145.0" data-name="ModelEvent"></rect>
-							<path d="M79815.3 129.0 L79960.3 129.0" fill="none" data-name="ModelEvent"></path>
-						</g>
-						<g transform="translate(79815.25, 98)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ModelEvent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelEvent">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelEvent">ModelEvent</text>
-								
-							</g>
-						</g>
-						<g transform="translate(79815.25, 129)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelEvent">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelEvent">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelEvent">+modelId: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelEvent">+model: T</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseQueryError">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseQueryError">
-							<rect x="77273.3" y="583.5" height="92.0" width="183.0" data-name="SupabaseQueryError"></rect>
-							<path d="M77273.3 614.5 L77456.3 614.5" fill="none" data-name="SupabaseQueryError"></path>
-						</g>
-						<g transform="translate(77273.25, 583.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseQueryError">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseQueryError">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseQueryError">SupabaseQueryError</text>
-								
-							</g>
-						</g>
-						<g transform="translate(77273.25, 614.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseQueryError">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseQueryError">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseQueryError">+statusCode: String?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseQueryError">+message: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseQueryError">+details: dynamic</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="WrappedModel">
-						<g fill="#eee8d5" stroke="#33322E" data-name="WrappedModel">
-							<rect x="60092.3" y="2496.0" height="258.0" width="251.0" data-name="WrappedModel"></rect>
-							<path d="M60092.3 2527.0 L60343.3 2527.0" fill="none" data-name="WrappedModel"></path>
-							<path d="M60092.3 2678.0 L60343.3 2678.0" fill="none" data-name="WrappedModel"></path>
-						</g>
-						<g transform="translate(60092.25, 2496)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="WrappedModel">
-								<text x="117.5" y="13.5" stroke="none" text-anchor="middle" data-name="WrappedModel">WrappedModel</text>
-								
-							</g>
-						</g>
-						<g transform="translate(60092.25, 2527)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">-_model: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+asyncValue: AsyncValue&lt;T&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+isLocalOnly: bool</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+isDirty: bool</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="WrappedModel">+isDeleted: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="WrappedModel">+lastSaved: DateTime?</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="WrappedModel">+lastFetched: DateTime?</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="WrappedModel">+lastUpdated: DateTime?</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="WrappedModel">+model: T</text>
-								
-							</g>
-						</g>
-						<g transform="translate(60092.25, 2678)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="WrappedModel">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="WrappedModel">
-								<text x="0.0" y="13.5" stroke="none" data-name="WrappedModel">+dynamic markWithError()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="WrappedModel">+dynamic markAsLoading()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="WrappedModel">+dynamic markAsFetched()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="WrappedModel">+dynamic markAsSaved()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelRepositoryException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelRepositoryException">
-							<rect x="77496.3" y="614.0" height="31.0" width="227.0" data-name="ModelRepositoryException"></rect>
-						</g>
-						<g transform="translate(77496.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelRepositoryException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelRepositoryException">
-								<text x="105.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelRepositoryException">ModelRepositoryException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelNotFoundException">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelNotFoundException">
-							<rect x="77500.3" y="1197.0" height="31.0" width="219.0" data-name="ModelNotFoundException"></rect>
-						</g>
-						<g transform="translate(77500.25, 1197)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelNotFoundException">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelNotFoundException">
-								<text x="101.5" y="13.5" stroke="none" text-anchor="middle" data-name="ModelNotFoundException">ModelNotFoundException</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelRepository">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelRepository">
-							<rect x="83573.5" y="501.0" height="257.0" width="382.0" data-name="IModelRepository"></rect>
-							<path d="M83573.5 532.0 L83955.5 532.0" fill="none" data-name="IModelRepository"></path>
-						</g>
-						<g transform="translate(83573.5, 501)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelRepository">
-								<text x="183.0" y="13.5" stroke="none" text-anchor="middle" data-name="IModelRepository">IModelRepository</text>
-								
-							</g>
-						</g>
-						<g transform="translate(83573.5, 532)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelRepository">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelRepository">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelRepository">+String getKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IModelRepository">+WrappedModel&lt;T&gt;? get()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="IModelRepository">+dynamic fetchAll()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="IModelRepository">+dynamic fetch()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="IModelRepository">+dynamic save()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="IModelRepository">+dynamic delete()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSave()</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="IModelRepository">+dynamic duplicateAndSaveFromRemote()</text>
-								<text x="0.0" y="133.5" stroke="none" data-name="IModelRepository">+Stream&lt;WrappedModel&lt;T&gt;&gt; watch()</text>
-								<text x="0.0" y="148.5" stroke="none" data-name="IModelRepository">+Stream&lt;List&lt;WrappedModel&lt;T&gt;&gt;&gt; watchAll()</text>
-								<text x="0.0" y="163.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchChanges()</text>
-								<text x="0.0" y="178.5" stroke="none" data-name="IModelRepository">+Stream&lt;ModelEvent&lt;T&gt;&gt; watchAllChanges()</text>
-								<text x="0.0" y="193.5" stroke="none" data-name="IModelRepository">+dynamic ensurePersisted()</text>
-								<text x="0.0" y="208.5" stroke="none" data-name="IModelRepository">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IsFetched">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsFetched">
-							<rect x="79588.0" y="614.0" height="31.0" width="94.0" data-name="IsFetched"></rect>
-						</g>
-						<g transform="translate(79588, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsFetched">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsFetched">
-								<text x="39.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsFetched">IsFetched</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IsSaving">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaving">
-							<rect x="79722.0" y="614.0" height="31.0" width="84.0" data-name="IsSaving"></rect>
-						</g>
-						<g transform="translate(79722, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaving">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaving">
-								<text x="34.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaving">IsSaving</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IsSaved">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsSaved">
-							<rect x="80518.3" y="614.0" height="31.0" width="80.0" data-name="IsSaved"></rect>
-						</g>
-						<g transform="translate(80518.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsSaved">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsSaved">
-								<text x="32.0" y="13.5" stroke="none" text-anchor="middle" data-name="IsSaved">IsSaved</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IsDeleted">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IsDeleted">
-							<rect x="80638.3" y="614.0" height="31.0" width="91.0" data-name="IsDeleted"></rect>
-						</g>
-						<g transform="translate(80638.25, 614)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IsDeleted">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IsDeleted">
-								<text x="37.5" y="13.5" stroke="none" text-anchor="middle" data-name="IsDeleted">IsDeleted</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/designer_v2/lib/utils/uml.svg b/docs/uml/designer_v2/lib/utils/uml.svg
deleted file mode 100644
index 69a23ca7f..000000000
--- a/docs/uml/designer_v2/lib/utils/uml.svg
+++ /dev/null
@@ -1,1035 +0,0 @@
-<svg version="1.1" baseProfile="full" width="7005.0" height="548.0" viewbox="0 0 7005 548" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[SerializableColor
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+SerializableColor fromJson()
-	]
-	
-	[Color]&lt;:-[SerializableColor]
-	
-	[&lt;abstract&gt;FileFormatEncoder
-	  |
-	  +dynamic encodeAsync();
-	  +String encode();
-	  +dynamic call()
-	]
-	
-	[CSVStringEncoder
-	  |
-	  +String encode()
-	]
-	
-	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[CSVStringEncoder]
-	
-	[JsonStringEncoder
-	  |
-	  +String encode()
-	]
-	
-	[&lt;abstract&gt;FileFormatEncoder]&lt;:-[JsonStringEncoder]
-	
-	[&lt;abstract&gt;ExecutionLimiter
-	  |
-	  +milliseconds: int;
-	  &lt;static&gt;-_timer: Timer?
-	  |
-	  +void dispose()
-	]
-	
-	[&lt;abstract&gt;ExecutionLimiter]o-[Timer]
-	
-	[Debouncer
-	  |
-	  +leading: bool;
-	  +cancelUncompleted: bool;
-	  -_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?
-	  |
-	  +dynamic call()
-	]
-	
-	[Debouncer]o-[CancelableOperation]
-	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Debouncer]
-	
-	[Throttler
-	  |
-	  +dynamic call()
-	]
-	
-	[&lt;abstract&gt;ExecutionLimiter]&lt;:-[Throttler]
-	
-	[OptimisticUpdate
-	  |
-	  +applyOptimistic: void Function();
-	  +apply: dynamic Function();
-	  +rollback: void Function();
-	  +onUpdate: void Function()?;
-	  +onError: void Function(Object, StackTrace?)?;
-	  +rethrowErrors: bool;
-	  +runOptimistically: bool;
-	  +completeFutureOptimistically: bool
-	  |
-	  +dynamic execute();
-	  -void _runUpdateHandlerIfAny()
-	]
-	
-	[OptimisticUpdate]o-[void Function()]
-	[OptimisticUpdate]o-[dynamic Function()]
-	[OptimisticUpdate]o-[void Function()?]
-	[OptimisticUpdate]o-[void Function(Object, StackTrace?)?]
-	
-	[CountWhereValidator
-	  |
-	  +predicate: bool Function(T?);
-	  +minCount: int?;
-	  +maxCount: int?;
-	  &lt;static&gt;+kValidationMessageMinCount: String;
-	  &lt;static&gt;+kValidationMessageMaxCount: String
-	  |
-	  +Map&lt;String, dynamic&gt;? validate()
-	]
-	
-	[CountWhereValidator]o-[bool Function(T?)]
-	[&lt;abstract&gt;Validator]&lt;:-[CountWhereValidator]
-	
-	[Patterns
-	  |
-	  &lt;static&gt;+timeFormatString: String;
-	  &lt;static&gt;+emailFormatString: String;
-	  &lt;static&gt;+url: String
-	]
-	
-	[ModelAction
-	  |
-	  +type: T;
-	  +label: String;
-	  +icon: IconData?;
-	  +onExecute: Function;
-	  +isAvailable: bool;
-	  +isDestructive: bool
-	]
-	
-	[ModelAction]o-[IconData]
-	
-	[&lt;abstract&gt;IModelActionProvider
-	  |
-	  +List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()
-	]
-	
-	[&lt;abstract&gt;IListActionProvider
-	  |
-	  +void onSelectItem();
-	  +void onNewItem()
-	]
-	
-	[&lt;abstract&gt;IModelActionProvider]&lt;:-[&lt;abstract&gt;IListActionProvider]
-	
-	[ModelActionType
-	  |
-	  +index: int;
-	  &lt;static&gt;+values: List&lt;ModelActionType&gt;;
-	  &lt;static&gt;+edit: ModelActionType;
-	  &lt;static&gt;+delete: ModelActionType;
-	  &lt;static&gt;+remove: ModelActionType;
-	  &lt;static&gt;+duplicate: ModelActionType;
-	  &lt;static&gt;+clipboard: ModelActionType;
-	  &lt;static&gt;+primary: ModelActionType
-	]
-	
-	[ModelActionType]o-[ModelActionType]
-	[Enum]&lt;:--[ModelActionType]
-	
-	[&lt;abstract&gt;IProviderArgsResolver
-	  |
-	  +R provide()
-	]
-	
-	[Tuple
-	  |
-	  +first: T1;
-	  +second: T2;
-	  +props: List&lt;Object?&gt;
-	  |
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson();
-	  +Tuple&lt;T1, T2&gt; copy();
-	  +Tuple&lt;T1, T2&gt; copyWith()
-	]
-	
-	[&lt;abstract&gt;Equatable]&lt;:-[Tuple]
-	
-	[SuppressedBehaviorSubject
-	  |
-	  +subject: BehaviorSubject&lt;T&gt;;
-	  +didSuppressInitialEvent: bool;
-	  -_controller: StreamController&lt;T&gt;
-	  |
-	  -StreamController&lt;T&gt; _buildDerivedController();
-	  +dynamic close()
-	]
-	
-	[SuppressedBehaviorSubject]o-[BehaviorSubject]
-	[SuppressedBehaviorSubject]o-[StreamController]
-	
-	[&lt;abstract&gt;JsonFileLoader
-	  |
-	  +jsonAssetsPath: String
-	  |
-	  +dynamic loadJson();
-	  +dynamic parseJsonMapFromAssets();
-	  +dynamic parseJsonListFromAssets()
-	]
-	
-	[CombinedStreamNotifier
-	  |
-	  -_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;
-	  |
-	  +void dispose()
-	]
-	
-	[ChangeNotifier]&lt;:-[CombinedStreamNotifier]
-	
-	[Time
-	  |
-	  &lt;static&gt;+dynamic fromTimeOfDay();
-	  +Map&lt;String, dynamic&gt; toJson();
-	  &lt;static&gt;+Time fromJson()
-	]
-	
-	[TimeOfDay]&lt;:-[Time]
-	
-	[TimeValueAccessor
-	  |
-	  +String modelToViewValue();
-	  +Time? viewToModelValue();
-	  -String _addLeadingZeroIfNeeded()
-	]
-	
-	[&lt;abstract&gt;ControlValueAccessor]&lt;:-[TimeValueAccessor]
-	
-	[NumericalRangeFormatter
-	  |
-	  +min: int?;
-	  +max: int?
-	  |
-	  +TextEditingValue formatEditUpdate()
-	]
-	
-	[&lt;abstract&gt;TextInputFormatter]&lt;:-[NumericalRangeFormatter]
-	
-	[StudySequenceFormatter
-	  |
-	  +TextEditingValue formatEditUpdate()
-	]
-	
-	[&lt;abstract&gt;TextInputFormatter]&lt;:-[StudySequenceFormatter]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="548.0" width="7005.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M156.0 135.3 L156 233 L156 298.5 L156.0 298.5 " fill="none"></path>
-					<path d="M161.3 135.3 L156.0 135.3 L150.7 135.3 L156.0 122.0 Z"></path>
-					<path d="M489.5 162.9 L433 233 L433 306 L433.0 306.0 " fill="none"></path>
-					<path d="M493.7 166.2 L489.5 162.9 L485.4 159.5 L497.9 152.5 Z"></path>
-					<path d="M580.5 162.9 L637 233 L637 306 L637.0 306.0 " fill="none"></path>
-					<path d="M584.6 159.5 L580.5 162.9 L576.3 166.2 L572.1 152.5 Z"></path>
-					<path d="M1012.0 149.9 L790 233 L790 321.5 L790.0 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1022.6 151.6 L1012.0 149.9 L1018.9 141.6 L1029.5 143.4 Z"></path>
-					</g>
-					<path d="M1128.0 417.2 L1128 441 L1128 461 L1128.0 461.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1133.3 407.8 L1128.0 417.2 L1122.7 407.8 L1128.0 398.5 Z"></path>
-					</g>
-					<path d="M1128.0 173.8 L1128 233 L1128 275.5 L1128.0 275.5 " fill="none"></path>
-					<path d="M1133.3 173.8 L1128.0 173.8 L1122.7 173.8 L1128.0 160.5 Z"></path>
-					<path d="M1239.1 143.9 L1504 233 L1504 306 L1504.0 306.0 " fill="none"></path>
-					<path d="M1240.8 138.8 L1239.1 143.9 L1237.4 148.9 L1226.5 139.6 Z"></path>
-					<path d="M1758.7 198.0 L1679 233 L1679 321.5 L1679.0 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1769.3 199.2 L1758.7 198.0 L1765.1 189.4 L1775.8 190.5 Z"></path>
-					</g>
-					<path d="M1873.5 227.8 L1869.5 233 L1869.5 321.5 L1869.5 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1883.5 223.6 L1873.5 227.8 L1875.0 217.1 L1885.0 213.0 Z"></path>
-					</g>
-					<path d="M2061.0 227.8 L2065 233 L2065 321.5 L2065.0 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2059.5 217.1 L2061.0 227.8 L2051.0 223.6 L2049.5 213.0 Z"></path>
-					</g>
-					<path d="M2176.4 179.6 L2329 233 L2329 321.5 L2329.0 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2169.3 171.5 L2176.4 179.6 L2165.8 181.6 L2158.8 173.5 Z"></path>
-					</g>
-					<path d="M2712.5 432.2 L2712.5 441 L2712.5 461 L2712.5 461.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M2717.8 422.8 L2712.5 432.2 L2707.2 422.8 L2712.5 413.5 Z"></path>
-					</g>
-					<path d="M2712.5 135.3 L2712.5 233 L2712.5 260.5 L2712.5 260.5 " fill="none"></path>
-					<path d="M2717.8 135.3 L2712.5 135.3 L2707.2 135.3 L2712.5 122.0 Z"></path>
-					<path d="M3216.5 193.7 L3216.5 233 L3216.5 321.5 L3216.5 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M3221.8 184.3 L3216.5 193.7 L3211.2 184.3 L3216.5 175.0 Z"></path>
-					</g>
-					<path d="M3552.0 150.8 L3552 233 L3552 298.5 L3552.0 298.5 " fill="none"></path>
-					<path d="M3557.3 150.8 L3552.0 150.8 L3546.7 150.8 L3552.0 137.5 Z"></path>
-					<path d="M4032.7 258.9 L4045.5 253.5 L4053 253.5 L4053 253.5 L4060.5 337 L4060.5 337 L4053 420.5 L4053 420.5 L4045.5 420.5 L4045.5 420.5 L4015.5 407.78426395939084 L4015.5 407.8 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4022.0 257.7 L4032.7 258.9 L4026.2 267.5 L4015.5 266.2 Z"></path>
-					</g>
-					<g stroke-dasharray="6 6">
-						<path d="M3848.5 135.3 L3848.5 233 L3848.5 253.5 L3848.5 253.5 " fill="none"></path>
-					</g>
-					<path d="M3853.8 135.3 L3848.5 135.3 L3843.2 135.3 L3848.5 122.0 Z"></path>
-					<path d="M4297.5 135.3 L4297.5 233 L4297.5 253 L4297.5 253.0 " fill="none"></path>
-					<path d="M4302.8 135.3 L4297.5 135.3 L4292.2 135.3 L4297.5 122.0 Z"></path>
-					<path d="M4633.4 190.5 L4602 233 L4602 321.5 L4602.0 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4643.2 186.2 L4633.4 190.5 L4634.7 179.8 L4644.5 175.5 Z"></path>
-					</g>
-					<path d="M4799.7 186.9 L4859.5 233 L4859.5 321.5 L4859.5 321.5 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M4795.6 177.0 L4799.7 186.9 L4789.1 185.4 L4785.0 175.5 Z"></path>
-					</g>
-					<path d="M5355.5 135.3 L5355.5 233 L5355.5 290.5 L5355.5 290.5 " fill="none"></path>
-					<path d="M5360.8 135.3 L5355.5 135.3 L5350.2 135.3 L5355.5 122.0 Z"></path>
-					<path d="M5759.5 135.3 L5759.5 233 L5759.5 291 L5759.5 291.0 " fill="none"></path>
-					<path d="M5764.8 135.3 L5759.5 135.3 L5754.2 135.3 L5759.5 122.0 Z"></path>
-					<path d="M6094.5 135.3 L6094.5 233 L6094.5 291 L6094.5 291.0 " fill="none"></path>
-					<path d="M6099.8 135.3 L6094.5 135.3 L6089.2 135.3 L6094.5 122.0 Z"></path>
-					<path d="M6583.5 129.8 L6439.5 233 L6439.5 283 L6439.5 283.0 " fill="none"></path>
-					<path d="M6586.6 134.1 L6583.5 129.8 L6580.4 125.4 L6594.4 122.0 Z"></path>
-					<path d="M6648.5 129.8 L6792.5 233 L6792.5 306 L6792.5 306.0 " fill="none"></path>
-					<path d="M6651.6 125.4 L6648.5 129.8 L6645.4 134.1 L6637.6 122.0 Z"></path>
-					<g data-name="SerializableColor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SerializableColor">
-							<rect x="0.0" y="298.5" height="77.0" width="312.0" data-name="SerializableColor"></rect>
-							<path d="M0.0 329.5 L312.0 329.5" fill="none" data-name="SerializableColor"></path>
-						</g>
-						<g transform="translate(0, 298.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SerializableColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SerializableColor">
-								<text x="148.0" y="13.5" stroke="none" text-anchor="middle" data-name="SerializableColor">SerializableColor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(0, 329.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SerializableColor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SerializableColor">
-								<text x="0.0" y="13.5" stroke="none" data-name="SerializableColor">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SerializableColor">&lt;static&gt;+SerializableColor fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Color">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Color">
-							<rect x="127.0" y="91.0" height="31.0" width="58.0" data-name="Color"></rect>
-						</g>
-						<g transform="translate(127, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Color">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Color">
-								<text x="21.0" y="13.5" stroke="none" text-anchor="middle" data-name="Color">Color</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="FileFormatEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="FileFormatEncoder">
-							<rect x="427.0" y="60.5" height="92.0" width="216.0" data-name="FileFormatEncoder"></rect>
-							<path d="M427.0 91.5 L643.0 91.5" fill="none" data-name="FileFormatEncoder"></path>
-						</g>
-						<g transform="translate(427, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="FileFormatEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="FileFormatEncoder">
-								<text x="100.0" y="13.5" stroke="none" text-anchor="middle" data-name="FileFormatEncoder">FileFormatEncoder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(427, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="FileFormatEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="FileFormatEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="FileFormatEncoder">+dynamic encodeAsync()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="FileFormatEncoder">+String encode()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="FileFormatEncoder">+dynamic call()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CSVStringEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CSVStringEncoder">
-							<rect x="352.0" y="306.0" height="62.0" width="162.0" data-name="CSVStringEncoder"></rect>
-							<path d="M352.0 337.0 L514.0 337.0" fill="none" data-name="CSVStringEncoder"></path>
-						</g>
-						<g transform="translate(352, 306)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CSVStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CSVStringEncoder">
-								<text x="73.0" y="13.5" stroke="none" text-anchor="middle" data-name="CSVStringEncoder">CSVStringEncoder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(352, 337)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CSVStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CSVStringEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="CSVStringEncoder">+String encode()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="JsonStringEncoder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JsonStringEncoder">
-							<rect x="554.0" y="306.0" height="62.0" width="166.0" data-name="JsonStringEncoder"></rect>
-							<path d="M554.0 337.0 L720.0 337.0" fill="none" data-name="JsonStringEncoder"></path>
-						</g>
-						<g transform="translate(554, 306)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="JsonStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonStringEncoder">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="JsonStringEncoder">JsonStringEncoder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(554, 337)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonStringEncoder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonStringEncoder">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonStringEncoder">+String encode()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ExecutionLimiter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ExecutionLimiter">
-							<rect x="1029.5" y="52.5" height="108.0" width="197.0" data-name="ExecutionLimiter"></rect>
-							<path d="M1029.5 83.5 L1226.5 83.5" fill="none" data-name="ExecutionLimiter"></path>
-							<path d="M1029.5 129.5 L1226.5 129.5" fill="none" data-name="ExecutionLimiter"></path>
-						</g>
-						<g transform="translate(1029.5, 52.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ExecutionLimiter">
-								<text x="90.5" y="13.5" stroke="none" text-anchor="middle" data-name="ExecutionLimiter">ExecutionLimiter</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1029.5, 83.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
-								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+milliseconds: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ExecutionLimiter">&lt;static&gt;-_timer: Timer?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1029.5, 129.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ExecutionLimiter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ExecutionLimiter">
-								<text x="0.0" y="13.5" stroke="none" data-name="ExecutionLimiter">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Timer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Timer">
-							<rect x="760.0" y="321.5" height="31.0" width="60.0" data-name="Timer"></rect>
-						</g>
-						<g transform="translate(760, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Timer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Timer">
-								<text x="22.0" y="13.5" stroke="none" text-anchor="middle" data-name="Timer">Timer</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Debouncer">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Debouncer">
-							<rect x="860.0" y="275.5" height="123.0" width="536.0" data-name="Debouncer"></rect>
-							<path d="M860.0 306.5 L1396.0 306.5" fill="none" data-name="Debouncer"></path>
-							<path d="M860.0 367.5 L1396.0 367.5" fill="none" data-name="Debouncer"></path>
-						</g>
-						<g transform="translate(860, 275.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Debouncer">
-								<text x="260.0" y="13.5" stroke="none" text-anchor="middle" data-name="Debouncer">Debouncer</text>
-								
-							</g>
-						</g>
-						<g transform="translate(860, 306.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
-								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+leading: bool</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Debouncer">+cancelUncompleted: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Debouncer">-_uncompletedFutureOperation: CancelableOperation&lt;dynamic&gt;?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(860, 367.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Debouncer">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Debouncer">
-								<text x="0.0" y="13.5" stroke="none" data-name="Debouncer">+dynamic call()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CancelableOperation">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CancelableOperation">
-							<rect x="1036.5" y="461.0" height="31.0" width="183.0" data-name="CancelableOperation"></rect>
-						</g>
-						<g transform="translate(1036.5, 461)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CancelableOperation">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CancelableOperation">
-								<text x="83.5" y="13.5" stroke="none" text-anchor="middle" data-name="CancelableOperation">CancelableOperation</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Throttler">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Throttler">
-							<rect x="1436.0" y="306.0" height="62.0" width="136.0" data-name="Throttler"></rect>
-							<path d="M1436.0 337.0 L1572.0 337.0" fill="none" data-name="Throttler"></path>
-						</g>
-						<g transform="translate(1436, 306)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Throttler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Throttler">
-								<text x="60.0" y="13.5" stroke="none" text-anchor="middle" data-name="Throttler">Throttler</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1436, 337)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Throttler">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Throttler">
-								<text x="0.0" y="13.5" stroke="none" data-name="Throttler">+dynamic call()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="OptimisticUpdate">
-						<g fill="#eee8d5" stroke="#33322E" data-name="OptimisticUpdate">
-							<rect x="1775.8" y="0.0" height="213.0" width="383.0" data-name="OptimisticUpdate"></rect>
-							<path d="M1775.8 31.0 L2158.8 31.0" fill="none" data-name="OptimisticUpdate"></path>
-							<path d="M1775.8 167.0 L2158.8 167.0" fill="none" data-name="OptimisticUpdate"></path>
-						</g>
-						<g transform="translate(1775.75, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="OptimisticUpdate">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="OptimisticUpdate">OptimisticUpdate</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1775.75, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+applyOptimistic: void Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">+apply: dynamic Function()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="OptimisticUpdate">+rollback: void Function()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="OptimisticUpdate">+onUpdate: void Function()?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="OptimisticUpdate">+onError: void Function(Object, StackTrace?)?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="OptimisticUpdate">+rethrowErrors: bool</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="OptimisticUpdate">+runOptimistically: bool</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="OptimisticUpdate">+completeFutureOptimistically: bool</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1775.75, 167)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="OptimisticUpdate">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="OptimisticUpdate">
-								<text x="0.0" y="13.5" stroke="none" data-name="OptimisticUpdate">+dynamic execute()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="OptimisticUpdate">-void _runUpdateHandlerIfAny()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()">
-							<rect x="1612.0" y="321.5" height="31.0" width="134.0" data-name="void Function()"></rect>
-						</g>
-						<g transform="translate(1612, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()">void Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="1786.0" y="321.5" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(1786, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function()?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function()?">
-							<rect x="1993.0" y="321.5" height="31.0" width="144.0" data-name="void Function()?"></rect>
-						</g>
-						<g transform="translate(1993, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function()?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function()?">
-								<text x="64.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function()?">void Function()?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="void Function(Object, StackTrace?)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="void Function(Object, StackTrace?)?">
-							<rect x="2177.0" y="321.5" height="31.0" width="304.0" data-name="void Function(Object, StackTrace?)?"></rect>
-						</g>
-						<g transform="translate(2177, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="void Function(Object, StackTrace?)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="void Function(Object, StackTrace?)?">
-								<text x="144.0" y="13.5" stroke="none" text-anchor="middle" data-name="void Function(Object, StackTrace?)?">void Function(Object, StackTrace?)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CountWhereValidator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CountWhereValidator">
-							<rect x="2521.0" y="260.5" height="153.0" width="383.0" data-name="CountWhereValidator"></rect>
-							<path d="M2521.0 291.5 L2904.0 291.5" fill="none" data-name="CountWhereValidator"></path>
-							<path d="M2521.0 382.5 L2904.0 382.5" fill="none" data-name="CountWhereValidator"></path>
-						</g>
-						<g transform="translate(2521, 260.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CountWhereValidator">
-								<text x="183.5" y="13.5" stroke="none" text-anchor="middle" data-name="CountWhereValidator">CountWhereValidator</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2521, 291.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
-								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+predicate: bool Function(T?)</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="CountWhereValidator">+minCount: int?</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="CountWhereValidator">+maxCount: int?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMinCount: String</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="CountWhereValidator">&lt;static&gt;+kValidationMessageMaxCount: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2521, 382.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CountWhereValidator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CountWhereValidator">
-								<text x="0.0" y="13.5" stroke="none" data-name="CountWhereValidator">+Map&lt;String, dynamic&gt;? validate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="bool Function(T?)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="bool Function(T?)">
-							<rect x="2635.0" y="461.0" height="31.0" width="155.0" data-name="bool Function(T?)"></rect>
-						</g>
-						<g transform="translate(2635, 461)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="bool Function(T?)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="bool Function(T?)">
-								<text x="69.5" y="13.5" stroke="none" text-anchor="middle" data-name="bool Function(T?)">bool Function(T?)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Validator">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Validator">
-							<rect x="2669.5" y="91.0" height="31.0" width="86.0" data-name="Validator"></rect>
-						</g>
-						<g transform="translate(2669.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Validator">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Validator">
-								<text x="35.0" y="13.5" stroke="none" text-anchor="middle" data-name="Validator">Validator</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Patterns">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Patterns">
-							<rect x="2795.5" y="60.5" height="92.0" width="287.0" data-name="Patterns"></rect>
-							<path d="M2795.5 91.5 L3082.5 91.5" fill="none" data-name="Patterns"></path>
-						</g>
-						<g transform="translate(2795.5, 60.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Patterns">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Patterns">
-								<text x="135.5" y="13.5" stroke="none" text-anchor="middle" data-name="Patterns">Patterns</text>
-								
-							</g>
-						</g>
-						<g transform="translate(2795.5, 91.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Patterns">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Patterns">
-								<text x="0.0" y="13.5" stroke="none" data-name="Patterns">&lt;static&gt;+timeFormatString: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Patterns">&lt;static&gt;+emailFormatString: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Patterns">&lt;static&gt;+url: String</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelAction">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelAction">
-							<rect x="3122.5" y="38.0" height="137.0" width="188.0" data-name="ModelAction"></rect>
-							<path d="M3122.5 69.0 L3310.5 69.0" fill="none" data-name="ModelAction"></path>
-						</g>
-						<g transform="translate(3122.5, 38)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelAction">
-								<text x="86.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelAction">ModelAction</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3122.5, 69)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelAction">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelAction">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelAction">+type: T</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelAction">+label: String</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelAction">+icon: IconData?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelAction">+onExecute: Function</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelAction">+isAvailable: bool</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelAction">+isDestructive: bool</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IconData">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IconData">
-							<rect x="3173.0" y="321.5" height="31.0" width="87.0" data-name="IconData"></rect>
-						</g>
-						<g transform="translate(3173, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="IconData">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IconData">
-								<text x="35.5" y="13.5" stroke="none" text-anchor="middle" data-name="IconData">IconData</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IModelActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IModelActionProvider">
-							<rect x="3350.5" y="75.5" height="62.0" width="403.0" data-name="IModelActionProvider"></rect>
-							<path d="M3350.5 106.5 L3753.5 106.5" fill="none" data-name="IModelActionProvider"></path>
-						</g>
-						<g transform="translate(3350.5, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IModelActionProvider">
-								<text x="193.5" y="13.5" stroke="none" text-anchor="middle" data-name="IModelActionProvider">IModelActionProvider</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3350.5, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IModelActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IModelActionProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="IModelActionProvider">+List&lt;ModelAction&lt;dynamic&gt;&gt; availableActions()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IListActionProvider">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IListActionProvider">
-							<rect x="3462.5" y="298.5" height="77.0" width="179.0" data-name="IListActionProvider"></rect>
-							<path d="M3462.5 329.5 L3641.5 329.5" fill="none" data-name="IListActionProvider"></path>
-						</g>
-						<g transform="translate(3462.5, 298.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IListActionProvider">
-								<text x="81.5" y="13.5" stroke="none" text-anchor="middle" data-name="IListActionProvider">IListActionProvider</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3462.5, 329.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IListActionProvider">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IListActionProvider">
-								<text x="0.0" y="13.5" stroke="none" data-name="IListActionProvider">+void onSelectItem()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="IListActionProvider">+void onNewItem()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ModelActionType">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ModelActionType">
-							<rect x="3681.5" y="253.5" height="167.0" width="334.0" data-name="ModelActionType"></rect>
-							<path d="M3681.5 284.5 L4015.5 284.5" fill="none" data-name="ModelActionType"></path>
-						</g>
-						<g transform="translate(3681.5, 253.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ModelActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ModelActionType">
-								<text x="159.0" y="13.5" stroke="none" text-anchor="middle" data-name="ModelActionType">ModelActionType</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3681.5, 284.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="ModelActionType">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="ModelActionType">
-								<text x="0.0" y="13.5" stroke="none" data-name="ModelActionType">+index: int</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+values: List&lt;ModelActionType&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+edit: ModelActionType</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+delete: ModelActionType</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+remove: ModelActionType</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+duplicate: ModelActionType</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+clipboard: ModelActionType</text>
-								<text x="0.0" y="118.5" stroke="none" data-name="ModelActionType">&lt;static&gt;+primary: ModelActionType</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Enum">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Enum">
-							<rect x="3818.0" y="91.0" height="31.0" width="61.0" data-name="Enum"></rect>
-						</g>
-						<g transform="translate(3818, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Enum">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Enum">
-								<text x="22.5" y="13.5" stroke="none" text-anchor="middle" data-name="Enum">Enum</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="IProviderArgsResolver">
-						<g fill="#eee8d5" stroke="#33322E" data-name="IProviderArgsResolver">
-							<rect x="3967.8" y="75.5" height="62.0" width="193.0" data-name="IProviderArgsResolver"></rect>
-							<path d="M3967.8 106.5 L4160.8 106.5" fill="none" data-name="IProviderArgsResolver"></path>
-						</g>
-						<g transform="translate(3967.75, 75.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="IProviderArgsResolver">
-								<text x="88.5" y="13.5" stroke="none" text-anchor="middle" data-name="IProviderArgsResolver">IProviderArgsResolver</text>
-								
-							</g>
-						</g>
-						<g transform="translate(3967.75, 106.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="IProviderArgsResolver">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="IProviderArgsResolver">
-								<text x="0.0" y="13.5" stroke="none" data-name="IProviderArgsResolver">+R provide()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Tuple">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Tuple">
-							<rect x="4105.5" y="253.0" height="168.0" width="384.0" data-name="Tuple"></rect>
-							<path d="M4105.5 284.0 L4489.5 284.0" fill="none" data-name="Tuple"></path>
-							<path d="M4105.5 345.0 L4489.5 345.0" fill="none" data-name="Tuple"></path>
-						</g>
-						<g transform="translate(4105.5, 253)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Tuple">
-								<text x="184.0" y="13.5" stroke="none" text-anchor="middle" data-name="Tuple">Tuple</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4105.5, 284)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
-								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+first: T1</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">+second: T2</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+props: List&lt;Object?&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4105.5, 345)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Tuple">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Tuple">
-								<text x="0.0" y="13.5" stroke="none" data-name="Tuple">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Tuple">&lt;static&gt;+Tuple&lt;dynamic, dynamic&gt; fromJson()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copy()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="Tuple">+Tuple&lt;T1, T2&gt; copyWith()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Equatable">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Equatable">
-							<rect x="4249.5" y="91.0" height="31.0" width="96.0" data-name="Equatable"></rect>
-						</g>
-						<g transform="translate(4249.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="Equatable">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Equatable">
-								<text x="40.0" y="13.5" stroke="none" text-anchor="middle" data-name="Equatable">Equatable</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SuppressedBehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SuppressedBehaviorSubject">
-							<rect x="4501.5" y="37.5" height="138.0" width="388.0" data-name="SuppressedBehaviorSubject"></rect>
-							<path d="M4501.5 68.5 L4889.5 68.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
-							<path d="M4501.5 129.5 L4889.5 129.5" fill="none" data-name="SuppressedBehaviorSubject"></path>
-						</g>
-						<g transform="translate(4501.5, 37.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SuppressedBehaviorSubject">
-								<text x="186.0" y="13.5" stroke="none" text-anchor="middle" data-name="SuppressedBehaviorSubject">SuppressedBehaviorSubject</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4501.5, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
-								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">+subject: BehaviorSubject&lt;T&gt;</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+didSuppressInitialEvent: bool</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SuppressedBehaviorSubject">-_controller: StreamController&lt;T&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4501.5, 129.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SuppressedBehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SuppressedBehaviorSubject">
-								<text x="0.0" y="13.5" stroke="none" data-name="SuppressedBehaviorSubject">-StreamController&lt;T&gt; _buildDerivedController()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SuppressedBehaviorSubject">+dynamic close()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="BehaviorSubject">
-						<g fill="#eee8d5" stroke="#33322E" data-name="BehaviorSubject">
-							<rect x="4529.5" y="321.5" height="31.0" width="145.0" data-name="BehaviorSubject"></rect>
-						</g>
-						<g transform="translate(4529.5, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="BehaviorSubject">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="BehaviorSubject">
-								<text x="64.5" y="13.5" stroke="none" text-anchor="middle" data-name="BehaviorSubject">BehaviorSubject</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StreamController">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StreamController">
-							<rect x="4785.0" y="321.5" height="31.0" width="149.0" data-name="StreamController"></rect>
-						</g>
-						<g transform="translate(4785, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StreamController">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StreamController">
-								<text x="66.5" y="13.5" stroke="none" text-anchor="middle" data-name="StreamController">StreamController</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="JsonFileLoader">
-						<g fill="#eee8d5" stroke="#33322E" data-name="JsonFileLoader">
-							<rect x="4929.5" y="45.0" height="123.0" width="319.0" data-name="JsonFileLoader"></rect>
-							<path d="M4929.5 76.0 L5248.5 76.0" fill="none" data-name="JsonFileLoader"></path>
-							<path d="M4929.5 107.0 L5248.5 107.0" fill="none" data-name="JsonFileLoader"></path>
-						</g>
-						<g transform="translate(4929.5, 45)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="JsonFileLoader">
-								<text x="151.5" y="13.5" stroke="none" text-anchor="middle" data-name="JsonFileLoader">JsonFileLoader</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4929.5, 76)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+jsonAssetsPath: String</text>
-								
-							</g>
-						</g>
-						<g transform="translate(4929.5, 107)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="JsonFileLoader">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="JsonFileLoader">
-								<text x="0.0" y="13.5" stroke="none" data-name="JsonFileLoader">+dynamic loadJson()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonMapFromAssets()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="JsonFileLoader">+dynamic parseJsonListFromAssets()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="CombinedStreamNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="CombinedStreamNotifier">
-							<rect x="5138.0" y="290.5" height="93.0" width="435.0" data-name="CombinedStreamNotifier"></rect>
-							<path d="M5138.0 321.5 L5573.0 321.5" fill="none" data-name="CombinedStreamNotifier"></path>
-							<path d="M5138.0 352.5 L5573.0 352.5" fill="none" data-name="CombinedStreamNotifier"></path>
-						</g>
-						<g transform="translate(5138, 290.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="CombinedStreamNotifier">
-								<text x="209.5" y="13.5" stroke="none" text-anchor="middle" data-name="CombinedStreamNotifier">CombinedStreamNotifier</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5138, 321.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">-_subscriptions: List&lt;StreamSubscription&lt;dynamic&gt;&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5138, 352.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="CombinedStreamNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="CombinedStreamNotifier">
-								<text x="0.0" y="13.5" stroke="none" data-name="CombinedStreamNotifier">+void dispose()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChangeNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
-							<rect x="5288.5" y="91.0" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
-						</g>
-						<g transform="translate(5288.5, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Time">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Time">
-							<rect x="5613.0" y="291.0" height="92.0" width="293.0" data-name="Time"></rect>
-							<path d="M5613.0 322.0 L5906.0 322.0" fill="none" data-name="Time"></path>
-						</g>
-						<g transform="translate(5613, 291)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Time">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Time">
-								<text x="138.5" y="13.5" stroke="none" text-anchor="middle" data-name="Time">Time</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5613, 322)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="Time">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="Time">
-								<text x="0.0" y="13.5" stroke="none" data-name="Time">&lt;static&gt;+dynamic fromTimeOfDay()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="Time">+Map&lt;String, dynamic&gt; toJson()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="Time">&lt;static&gt;+Time fromJson()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TimeOfDay">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimeOfDay">
-							<rect x="5708.0" y="91.0" height="31.0" width="103.0" data-name="TimeOfDay"></rect>
-						</g>
-						<g transform="translate(5708, 91)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeOfDay">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeOfDay">
-								<text x="43.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeOfDay">TimeOfDay</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TimeValueAccessor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TimeValueAccessor">
-							<rect x="5946.0" y="291.0" height="92.0" width="297.0" data-name="TimeValueAccessor"></rect>
-							<path d="M5946.0 322.0 L6243.0 322.0" fill="none" data-name="TimeValueAccessor"></path>
-						</g>
-						<g transform="translate(5946, 291)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="TimeValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TimeValueAccessor">
-								<text x="140.5" y="13.5" stroke="none" text-anchor="middle" data-name="TimeValueAccessor">TimeValueAccessor</text>
-								
-							</g>
-						</g>
-						<g transform="translate(5946, 322)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="TimeValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="TimeValueAccessor">
-								<text x="0.0" y="13.5" stroke="none" data-name="TimeValueAccessor">+String modelToViewValue()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="TimeValueAccessor">+Time? viewToModelValue()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="TimeValueAccessor">-String _addLeadingZeroIfNeeded()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ControlValueAccessor">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ControlValueAccessor">
-							<rect x="5999.0" y="91.0" height="31.0" width="191.0" data-name="ControlValueAccessor"></rect>
-						</g>
-						<g transform="translate(5999, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="ControlValueAccessor">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ControlValueAccessor">
-								<text x="87.5" y="13.5" stroke="none" text-anchor="middle" data-name="ControlValueAccessor">ControlValueAccessor</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="NumericalRangeFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="NumericalRangeFormatter">
-							<rect x="6283.0" y="283.0" height="108.0" width="313.0" data-name="NumericalRangeFormatter"></rect>
-							<path d="M6283.0 314.0 L6596.0 314.0" fill="none" data-name="NumericalRangeFormatter"></path>
-							<path d="M6283.0 360.0 L6596.0 360.0" fill="none" data-name="NumericalRangeFormatter"></path>
-						</g>
-						<g transform="translate(6283, 283)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="NumericalRangeFormatter">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="NumericalRangeFormatter">NumericalRangeFormatter</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6283, 314)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+min: int?</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="NumericalRangeFormatter">+max: int?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6283, 360)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="NumericalRangeFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="NumericalRangeFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="NumericalRangeFormatter">+TextEditingValue formatEditUpdate()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="TextInputFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="TextInputFormatter">
-							<rect x="6533.0" y="91.0" height="31.0" width="166.0" data-name="TextInputFormatter"></rect>
-						</g>
-						<g transform="translate(6533, 91)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="TextInputFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="TextInputFormatter">
-								<text x="75.0" y="13.5" stroke="none" text-anchor="middle" data-name="TextInputFormatter">TextInputFormatter</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="StudySequenceFormatter">
-						<g fill="#eee8d5" stroke="#33322E" data-name="StudySequenceFormatter">
-							<rect x="6636.0" y="306.0" height="62.0" width="313.0" data-name="StudySequenceFormatter"></rect>
-							<path d="M6636.0 337.0 L6949.0 337.0" fill="none" data-name="StudySequenceFormatter"></path>
-						</g>
-						<g transform="translate(6636, 306)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="StudySequenceFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="StudySequenceFormatter">
-								<text x="148.5" y="13.5" stroke="none" text-anchor="middle" data-name="StudySequenceFormatter">StudySequenceFormatter</text>
-								
-							</g>
-						</g>
-						<g transform="translate(6636, 337)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="StudySequenceFormatter">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="StudySequenceFormatter">
-								<text x="0.0" y="13.5" stroke="none" data-name="StudySequenceFormatter">+TextEditingValue formatEditUpdate()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/flutter_common/lib/src/uml.svg b/docs/uml/flutter_common/lib/src/uml.svg
deleted file mode 100644
index 7c3cc286a..000000000
--- a/docs/uml/flutter_common/lib/src/uml.svg
+++ /dev/null
@@ -1,273 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2513.0" height="488.0" viewbox="0 0 2513 488" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[RetryFutureBuilder
-	  |
-	  +tryFunction: dynamic Function();
-	  +successBuilder: Widget Function(BuildContext, T?);
-	  +initialData: T?;
-	  +loadingBuilder: Widget Function(BuildContext)?;
-	  +errorWidgetBuilder: Widget Function(BuildContext, dynamic, void Function())?;
-	  +extraWidgets: List&lt;Widget&gt;
-	  |
-	  &lt;static&gt;+RetryFutureBuilderState&lt;dynamic&gt;? of()
-	]
-	
-	[RetryFutureBuilder]o-[dynamic Function()]
-	[RetryFutureBuilder]o-[Widget Function(BuildContext, T?)]
-	[RetryFutureBuilder]o-[Widget Function(BuildContext)?]
-	[RetryFutureBuilder]o-[Widget Function(BuildContext, dynamic, void Function())?]
-	
-	[AppLanguage
-	  |
-	  &lt;static&gt;+keyLanguageCode: String;
-	  +supportedLocales: List&lt;Locale&gt;;
-	  -_appLocale: Locale?;
-	  +appLocal: Locale?
-	  |
-	  +dynamic fetchLocale();
-	  +dynamic changeLanguage()
-	]
-	
-	[AppLanguage]o-[Locale]
-	[ChangeNotifier]&lt;:-[AppLanguage]
-	
-	[SupabaseStorage
-	  |
-	  +dynamic initialize();
-	  +dynamic hasAccessToken();
-	  +dynamic accessToken();
-	  +dynamic persistSession();
-	  +dynamic removePersistedSession()
-	]
-	
-	[&lt;abstract&gt;LocalStorage]&lt;:-[SupabaseStorage]
-	
-	[SecureStorage
-	  |
-	  &lt;static&gt;+dynamic containsKey();
-	  &lt;static&gt;+dynamic write();
-	  &lt;static&gt;+dynamic read();
-	  &lt;static&gt;+dynamic readBool();
-	  &lt;static&gt;+dynamic delete();
-	  &lt;static&gt;+dynamic deleteAll();
-	  &lt;static&gt;+dynamic migrateSharedPreferencesToSecureStorage()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="488.0" width="2513.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M170.9 166.6 L83.5 188 L83.5 269 L83.5 269.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M181.2 169.6 L170.9 166.6 L178.7 159.2 L189.0 162.2 Z"></path>
-					</g>
-					<path d="M364.8 178.3 L350 188 L350 269 L350.0 269.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M375.5 177.6 L364.8 178.3 L369.7 168.7 L380.4 168.0 Z"></path>
-					</g>
-					<path d="M651.2 178.3 L666 188 L666 269 L666.0 269.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M646.3 168.7 L651.2 178.3 L640.5 177.6 L635.6 168.0 Z"></path>
-					</g>
-					<path d="M845.4 146.0 L1074 188 L1074 269 L1074.0 269.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M837.1 139.1 L845.4 146.0 L835.2 149.5 L827.0 142.6 Z"></path>
-					</g>
-					<path d="M1496.0 379.7 L1496 381 L1496 401 L1496.0 401.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1501.3 370.3 L1496.0 379.7 L1490.7 370.3 L1496.0 361.0 Z"></path>
-					</g>
-					<path d="M1496.0 112.8 L1496 188 L1496 208 L1496.0 208.0 " fill="none"></path>
-					<path d="M1501.3 112.8 L1496.0 112.8 L1490.7 112.8 L1496.0 99.5 Z"></path>
-					<path d="M1835.5 112.8 L1835.5 188 L1835.5 223.5 L1835.5 223.5 " fill="none"></path>
-					<path d="M1840.8 112.8 L1835.5 112.8 L1830.2 112.8 L1835.5 99.5 Z"></path>
-					<g data-name="RetryFutureBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RetryFutureBuilder">
-							<rect x="189.0" y="0.0" height="168.0" width="638.0" data-name="RetryFutureBuilder"></rect>
-							<path d="M189.0 31.0 L827.0 31.0" fill="none" data-name="RetryFutureBuilder"></path>
-							<path d="M189.0 137.0 L827.0 137.0" fill="none" data-name="RetryFutureBuilder"></path>
-						</g>
-						<g transform="translate(189, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RetryFutureBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RetryFutureBuilder">
-								<text x="311.0" y="13.5" stroke="none" text-anchor="middle" data-name="RetryFutureBuilder">RetryFutureBuilder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(189, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RetryFutureBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RetryFutureBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="RetryFutureBuilder">+tryFunction: dynamic Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RetryFutureBuilder">+successBuilder: Widget Function(BuildContext, T?)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RetryFutureBuilder">+initialData: T?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RetryFutureBuilder">+loadingBuilder: Widget Function(BuildContext)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RetryFutureBuilder">+errorWidgetBuilder: Widget Function(BuildContext, dynamic, void Function())?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RetryFutureBuilder">+extraWidgets: List&lt;Widget&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(189, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RetryFutureBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RetryFutureBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="RetryFutureBuilder">&lt;static&gt;+RetryFutureBuilderState&lt;dynamic&gt;? of()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="0.0" y="269.0" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(0, 269)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, T?)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T?)">
-							<rect x="207.0" y="269.0" height="31.0" width="286.0" data-name="Widget Function(BuildContext, T?)"></rect>
-						</g>
-						<g transform="translate(207, 269)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T?)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T?)">
-								<text x="135.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T?)">Widget Function(BuildContext, T?)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
-							<rect x="533.0" y="269.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
-						</g>
-						<g transform="translate(533, 269)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, dynamic, void Function())?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, dynamic, void Function())?">
-							<rect x="839.0" y="269.0" height="31.0" width="470.0" data-name="Widget Function(BuildContext, dynamic, void Function())?"></rect>
-						</g>
-						<g transform="translate(839, 269)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, dynamic, void Function())?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, dynamic, void Function())?">
-								<text x="227.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, dynamic, void Function())?">Widget Function(BuildContext, dynamic, void Function())?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppLanguage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppLanguage">
-							<rect x="1349.0" y="208.0" height="153.0" width="294.0" data-name="AppLanguage"></rect>
-							<path d="M1349.0 239.0 L1643.0 239.0" fill="none" data-name="AppLanguage"></path>
-							<path d="M1349.0 315.0 L1643.0 315.0" fill="none" data-name="AppLanguage"></path>
-						</g>
-						<g transform="translate(1349, 208)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppLanguage">
-								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppLanguage">AppLanguage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1349, 239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppLanguage">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppLanguage">&lt;static&gt;+keyLanguageCode: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppLanguage">+supportedLocales: List&lt;Locale&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppLanguage">-_appLocale: Locale?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppLanguage">+appLocal: Locale?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1349, 315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppLanguage">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppLanguage">+dynamic fetchLocale()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppLanguage">+dynamic changeLanguage()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Locale">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Locale">
-							<rect x="1461.5" y="401.0" height="31.0" width="69.0" data-name="Locale"></rect>
-						</g>
-						<g transform="translate(1461.5, 401)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Locale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Locale">
-								<text x="26.5" y="13.5" stroke="none" text-anchor="middle" data-name="Locale">Locale</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChangeNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
-							<rect x="1429.0" y="68.5" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
-						</g>
-						<g transform="translate(1429, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseStorage">
-							<rect x="1683.0" y="223.5" height="122.0" width="305.0" data-name="SupabaseStorage"></rect>
-							<path d="M1683.0 254.5 L1988.0 254.5" fill="none" data-name="SupabaseStorage"></path>
-						</g>
-						<g transform="translate(1683, 223.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseStorage">
-								<text x="144.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseStorage">SupabaseStorage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1683, 254.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseStorage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseStorage">+dynamic initialize()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseStorage">+dynamic hasAccessToken()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseStorage">+dynamic accessToken()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseStorage">+dynamic persistSession()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseStorage">+dynamic removePersistedSession()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LocalStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LocalStorage">
-							<rect x="1775.0" y="68.5" height="31.0" width="121.0" data-name="LocalStorage"></rect>
-						</g>
-						<g transform="translate(1775, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="LocalStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LocalStorage">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="LocalStorage">LocalStorage</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SecureStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SecureStorage">
-							<rect x="1936.0" y="8.0" height="152.0" width="521.0" data-name="SecureStorage"></rect>
-							<path d="M1936.0 39.0 L2457.0 39.0" fill="none" data-name="SecureStorage"></path>
-						</g>
-						<g transform="translate(1936, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecureStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecureStorage">
-								<text x="252.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecureStorage">SecureStorage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1936, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecureStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecureStorage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic containsKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic write()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic readBool()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic deleteAll()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic migrateSharedPreferencesToSecureStorage()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/flutter_common/lib/src/utils/uml.svg b/docs/uml/flutter_common/lib/src/utils/uml.svg
deleted file mode 100644
index 7c3cc286a..000000000
--- a/docs/uml/flutter_common/lib/src/utils/uml.svg
+++ /dev/null
@@ -1,273 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2513.0" height="488.0" viewbox="0 0 2513 488" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[RetryFutureBuilder
-	  |
-	  +tryFunction: dynamic Function();
-	  +successBuilder: Widget Function(BuildContext, T?);
-	  +initialData: T?;
-	  +loadingBuilder: Widget Function(BuildContext)?;
-	  +errorWidgetBuilder: Widget Function(BuildContext, dynamic, void Function())?;
-	  +extraWidgets: List&lt;Widget&gt;
-	  |
-	  &lt;static&gt;+RetryFutureBuilderState&lt;dynamic&gt;? of()
-	]
-	
-	[RetryFutureBuilder]o-[dynamic Function()]
-	[RetryFutureBuilder]o-[Widget Function(BuildContext, T?)]
-	[RetryFutureBuilder]o-[Widget Function(BuildContext)?]
-	[RetryFutureBuilder]o-[Widget Function(BuildContext, dynamic, void Function())?]
-	
-	[AppLanguage
-	  |
-	  &lt;static&gt;+keyLanguageCode: String;
-	  +supportedLocales: List&lt;Locale&gt;;
-	  -_appLocale: Locale?;
-	  +appLocal: Locale?
-	  |
-	  +dynamic fetchLocale();
-	  +dynamic changeLanguage()
-	]
-	
-	[AppLanguage]o-[Locale]
-	[ChangeNotifier]&lt;:-[AppLanguage]
-	
-	[SupabaseStorage
-	  |
-	  +dynamic initialize();
-	  +dynamic hasAccessToken();
-	  +dynamic accessToken();
-	  +dynamic persistSession();
-	  +dynamic removePersistedSession()
-	]
-	
-	[&lt;abstract&gt;LocalStorage]&lt;:-[SupabaseStorage]
-	
-	[SecureStorage
-	  |
-	  &lt;static&gt;+dynamic containsKey();
-	  &lt;static&gt;+dynamic write();
-	  &lt;static&gt;+dynamic read();
-	  &lt;static&gt;+dynamic readBool();
-	  &lt;static&gt;+dynamic delete();
-	  &lt;static&gt;+dynamic deleteAll();
-	  &lt;static&gt;+dynamic migrateSharedPreferencesToSecureStorage()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="488.0" width="2513.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M170.9 166.6 L83.5 188 L83.5 269 L83.5 269.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M181.2 169.6 L170.9 166.6 L178.7 159.2 L189.0 162.2 Z"></path>
-					</g>
-					<path d="M364.8 178.3 L350 188 L350 269 L350.0 269.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M375.5 177.6 L364.8 178.3 L369.7 168.7 L380.4 168.0 Z"></path>
-					</g>
-					<path d="M651.2 178.3 L666 188 L666 269 L666.0 269.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M646.3 168.7 L651.2 178.3 L640.5 177.6 L635.6 168.0 Z"></path>
-					</g>
-					<path d="M845.4 146.0 L1074 188 L1074 269 L1074.0 269.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M837.1 139.1 L845.4 146.0 L835.2 149.5 L827.0 142.6 Z"></path>
-					</g>
-					<path d="M1496.0 379.7 L1496 381 L1496 401 L1496.0 401.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1501.3 370.3 L1496.0 379.7 L1490.7 370.3 L1496.0 361.0 Z"></path>
-					</g>
-					<path d="M1496.0 112.8 L1496 188 L1496 208 L1496.0 208.0 " fill="none"></path>
-					<path d="M1501.3 112.8 L1496.0 112.8 L1490.7 112.8 L1496.0 99.5 Z"></path>
-					<path d="M1835.5 112.8 L1835.5 188 L1835.5 223.5 L1835.5 223.5 " fill="none"></path>
-					<path d="M1840.8 112.8 L1835.5 112.8 L1830.2 112.8 L1835.5 99.5 Z"></path>
-					<g data-name="RetryFutureBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RetryFutureBuilder">
-							<rect x="189.0" y="0.0" height="168.0" width="638.0" data-name="RetryFutureBuilder"></rect>
-							<path d="M189.0 31.0 L827.0 31.0" fill="none" data-name="RetryFutureBuilder"></path>
-							<path d="M189.0 137.0 L827.0 137.0" fill="none" data-name="RetryFutureBuilder"></path>
-						</g>
-						<g transform="translate(189, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RetryFutureBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RetryFutureBuilder">
-								<text x="311.0" y="13.5" stroke="none" text-anchor="middle" data-name="RetryFutureBuilder">RetryFutureBuilder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(189, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RetryFutureBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RetryFutureBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="RetryFutureBuilder">+tryFunction: dynamic Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RetryFutureBuilder">+successBuilder: Widget Function(BuildContext, T?)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RetryFutureBuilder">+initialData: T?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RetryFutureBuilder">+loadingBuilder: Widget Function(BuildContext)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RetryFutureBuilder">+errorWidgetBuilder: Widget Function(BuildContext, dynamic, void Function())?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RetryFutureBuilder">+extraWidgets: List&lt;Widget&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(189, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RetryFutureBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RetryFutureBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="RetryFutureBuilder">&lt;static&gt;+RetryFutureBuilderState&lt;dynamic&gt;? of()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="0.0" y="269.0" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(0, 269)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, T?)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T?)">
-							<rect x="207.0" y="269.0" height="31.0" width="286.0" data-name="Widget Function(BuildContext, T?)"></rect>
-						</g>
-						<g transform="translate(207, 269)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T?)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T?)">
-								<text x="135.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T?)">Widget Function(BuildContext, T?)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
-							<rect x="533.0" y="269.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
-						</g>
-						<g transform="translate(533, 269)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, dynamic, void Function())?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, dynamic, void Function())?">
-							<rect x="839.0" y="269.0" height="31.0" width="470.0" data-name="Widget Function(BuildContext, dynamic, void Function())?"></rect>
-						</g>
-						<g transform="translate(839, 269)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, dynamic, void Function())?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, dynamic, void Function())?">
-								<text x="227.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, dynamic, void Function())?">Widget Function(BuildContext, dynamic, void Function())?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppLanguage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppLanguage">
-							<rect x="1349.0" y="208.0" height="153.0" width="294.0" data-name="AppLanguage"></rect>
-							<path d="M1349.0 239.0 L1643.0 239.0" fill="none" data-name="AppLanguage"></path>
-							<path d="M1349.0 315.0 L1643.0 315.0" fill="none" data-name="AppLanguage"></path>
-						</g>
-						<g transform="translate(1349, 208)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppLanguage">
-								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppLanguage">AppLanguage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1349, 239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppLanguage">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppLanguage">&lt;static&gt;+keyLanguageCode: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppLanguage">+supportedLocales: List&lt;Locale&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppLanguage">-_appLocale: Locale?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppLanguage">+appLocal: Locale?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1349, 315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppLanguage">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppLanguage">+dynamic fetchLocale()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppLanguage">+dynamic changeLanguage()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Locale">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Locale">
-							<rect x="1461.5" y="401.0" height="31.0" width="69.0" data-name="Locale"></rect>
-						</g>
-						<g transform="translate(1461.5, 401)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Locale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Locale">
-								<text x="26.5" y="13.5" stroke="none" text-anchor="middle" data-name="Locale">Locale</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChangeNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
-							<rect x="1429.0" y="68.5" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
-						</g>
-						<g transform="translate(1429, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseStorage">
-							<rect x="1683.0" y="223.5" height="122.0" width="305.0" data-name="SupabaseStorage"></rect>
-							<path d="M1683.0 254.5 L1988.0 254.5" fill="none" data-name="SupabaseStorage"></path>
-						</g>
-						<g transform="translate(1683, 223.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseStorage">
-								<text x="144.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseStorage">SupabaseStorage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1683, 254.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseStorage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseStorage">+dynamic initialize()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseStorage">+dynamic hasAccessToken()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseStorage">+dynamic accessToken()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseStorage">+dynamic persistSession()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseStorage">+dynamic removePersistedSession()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LocalStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LocalStorage">
-							<rect x="1775.0" y="68.5" height="31.0" width="121.0" data-name="LocalStorage"></rect>
-						</g>
-						<g transform="translate(1775, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="LocalStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LocalStorage">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="LocalStorage">LocalStorage</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SecureStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SecureStorage">
-							<rect x="1936.0" y="8.0" height="152.0" width="521.0" data-name="SecureStorage"></rect>
-							<path d="M1936.0 39.0 L2457.0 39.0" fill="none" data-name="SecureStorage"></path>
-						</g>
-						<g transform="translate(1936, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecureStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecureStorage">
-								<text x="252.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecureStorage">SecureStorage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1936, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecureStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecureStorage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic containsKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic write()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic readBool()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic deleteAll()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic migrateSharedPreferencesToSecureStorage()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
diff --git a/docs/uml/flutter_common/lib/uml.svg b/docs/uml/flutter_common/lib/uml.svg
deleted file mode 100644
index 7c3cc286a..000000000
--- a/docs/uml/flutter_common/lib/uml.svg
+++ /dev/null
@@ -1,273 +0,0 @@
-<svg version="1.1" baseProfile="full" width="2513.0" height="488.0" viewbox="0 0 2513 488" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
-	<desc >[RetryFutureBuilder
-	  |
-	  +tryFunction: dynamic Function();
-	  +successBuilder: Widget Function(BuildContext, T?);
-	  +initialData: T?;
-	  +loadingBuilder: Widget Function(BuildContext)?;
-	  +errorWidgetBuilder: Widget Function(BuildContext, dynamic, void Function())?;
-	  +extraWidgets: List&lt;Widget&gt;
-	  |
-	  &lt;static&gt;+RetryFutureBuilderState&lt;dynamic&gt;? of()
-	]
-	
-	[RetryFutureBuilder]o-[dynamic Function()]
-	[RetryFutureBuilder]o-[Widget Function(BuildContext, T?)]
-	[RetryFutureBuilder]o-[Widget Function(BuildContext)?]
-	[RetryFutureBuilder]o-[Widget Function(BuildContext, dynamic, void Function())?]
-	
-	[AppLanguage
-	  |
-	  &lt;static&gt;+keyLanguageCode: String;
-	  +supportedLocales: List&lt;Locale&gt;;
-	  -_appLocale: Locale?;
-	  +appLocal: Locale?
-	  |
-	  +dynamic fetchLocale();
-	  +dynamic changeLanguage()
-	]
-	
-	[AppLanguage]o-[Locale]
-	[ChangeNotifier]&lt;:-[AppLanguage]
-	
-	[SupabaseStorage
-	  |
-	  +dynamic initialize();
-	  +dynamic hasAccessToken();
-	  +dynamic accessToken();
-	  +dynamic persistSession();
-	  +dynamic removePersistedSession()
-	]
-	
-	[&lt;abstract&gt;LocalStorage]&lt;:-[SupabaseStorage]
-	
-	[SecureStorage
-	  |
-	  &lt;static&gt;+dynamic containsKey();
-	  &lt;static&gt;+dynamic write();
-	  &lt;static&gt;+dynamic read();
-	  &lt;static&gt;+dynamic readBool();
-	  &lt;static&gt;+dynamic delete();
-	  &lt;static&gt;+dynamic deleteAll();
-	  &lt;static&gt;+dynamic migrateSharedPreferencesToSecureStorage()
-	]
-	
-	</desc>
-	<g stroke-width="1.0" text-align="left" font="12pt Helvetica, Arial, sans-serif" font-size="12pt" font-family="Helvetica" font-weight="normal" font-style="normal">
-		<g font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" stroke-width="3.0" stroke-linejoin="round" stroke-linecap="round" stroke="#33322E">
-			<g stroke="transparent" fill="transparent">
-				<rect x="0.0" y="0.0" height="488.0" width="2513.0" stroke="none"></rect>
-			</g>
-			<g transform="translate(8, 8)" fill="#33322E">
-				<g transform="translate(20, 20)" fill="#eee8d5" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal">
-					<path d="M170.9 166.6 L83.5 188 L83.5 269 L83.5 269.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M181.2 169.6 L170.9 166.6 L178.7 159.2 L189.0 162.2 Z"></path>
-					</g>
-					<path d="M364.8 178.3 L350 188 L350 269 L350.0 269.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M375.5 177.6 L364.8 178.3 L369.7 168.7 L380.4 168.0 Z"></path>
-					</g>
-					<path d="M651.2 178.3 L666 188 L666 269 L666.0 269.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M646.3 168.7 L651.2 178.3 L640.5 177.6 L635.6 168.0 Z"></path>
-					</g>
-					<path d="M845.4 146.0 L1074 188 L1074 269 L1074.0 269.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M837.1 139.1 L845.4 146.0 L835.2 149.5 L827.0 142.6 Z"></path>
-					</g>
-					<path d="M1496.0 379.7 L1496 381 L1496 401 L1496.0 401.0 " fill="none"></path>
-					<g fill="#eee8d5">
-						<path d="M1501.3 370.3 L1496.0 379.7 L1490.7 370.3 L1496.0 361.0 Z"></path>
-					</g>
-					<path d="M1496.0 112.8 L1496 188 L1496 208 L1496.0 208.0 " fill="none"></path>
-					<path d="M1501.3 112.8 L1496.0 112.8 L1490.7 112.8 L1496.0 99.5 Z"></path>
-					<path d="M1835.5 112.8 L1835.5 188 L1835.5 223.5 L1835.5 223.5 " fill="none"></path>
-					<path d="M1840.8 112.8 L1835.5 112.8 L1830.2 112.8 L1835.5 99.5 Z"></path>
-					<g data-name="RetryFutureBuilder">
-						<g fill="#eee8d5" stroke="#33322E" data-name="RetryFutureBuilder">
-							<rect x="189.0" y="0.0" height="168.0" width="638.0" data-name="RetryFutureBuilder"></rect>
-							<path d="M189.0 31.0 L827.0 31.0" fill="none" data-name="RetryFutureBuilder"></path>
-							<path d="M189.0 137.0 L827.0 137.0" fill="none" data-name="RetryFutureBuilder"></path>
-						</g>
-						<g transform="translate(189, 0)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="RetryFutureBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="RetryFutureBuilder">
-								<text x="311.0" y="13.5" stroke="none" text-anchor="middle" data-name="RetryFutureBuilder">RetryFutureBuilder</text>
-								
-							</g>
-						</g>
-						<g transform="translate(189, 31)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RetryFutureBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RetryFutureBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="RetryFutureBuilder">+tryFunction: dynamic Function()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="RetryFutureBuilder">+successBuilder: Widget Function(BuildContext, T?)</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="RetryFutureBuilder">+initialData: T?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="RetryFutureBuilder">+loadingBuilder: Widget Function(BuildContext)?</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="RetryFutureBuilder">+errorWidgetBuilder: Widget Function(BuildContext, dynamic, void Function())?</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="RetryFutureBuilder">+extraWidgets: List&lt;Widget&gt;</text>
-								
-							</g>
-						</g>
-						<g transform="translate(189, 137)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="RetryFutureBuilder">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="RetryFutureBuilder">
-								<text x="0.0" y="13.5" stroke="none" data-name="RetryFutureBuilder">&lt;static&gt;+RetryFutureBuilderState&lt;dynamic&gt;? of()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="dynamic Function()">
-						<g fill="#eee8d5" stroke="#33322E" data-name="dynamic Function()">
-							<rect x="0.0" y="269.0" height="31.0" width="167.0" data-name="dynamic Function()"></rect>
-						</g>
-						<g transform="translate(0, 269)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="dynamic Function()">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="dynamic Function()">
-								<text x="75.5" y="13.5" stroke="none" text-anchor="middle" data-name="dynamic Function()">dynamic Function()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, T?)">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, T?)">
-							<rect x="207.0" y="269.0" height="31.0" width="286.0" data-name="Widget Function(BuildContext, T?)"></rect>
-						</g>
-						<g transform="translate(207, 269)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, T?)">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, T?)">
-								<text x="135.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, T?)">Widget Function(BuildContext, T?)</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext)?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext)?">
-							<rect x="533.0" y="269.0" height="31.0" width="266.0" data-name="Widget Function(BuildContext)?"></rect>
-						</g>
-						<g transform="translate(533, 269)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext)?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext)?">
-								<text x="125.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext)?">Widget Function(BuildContext)?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Widget Function(BuildContext, dynamic, void Function())?">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Widget Function(BuildContext, dynamic, void Function())?">
-							<rect x="839.0" y="269.0" height="31.0" width="470.0" data-name="Widget Function(BuildContext, dynamic, void Function())?"></rect>
-						</g>
-						<g transform="translate(839, 269)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Widget Function(BuildContext, dynamic, void Function())?">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Widget Function(BuildContext, dynamic, void Function())?">
-								<text x="227.0" y="13.5" stroke="none" text-anchor="middle" data-name="Widget Function(BuildContext, dynamic, void Function())?">Widget Function(BuildContext, dynamic, void Function())?</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="AppLanguage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="AppLanguage">
-							<rect x="1349.0" y="208.0" height="153.0" width="294.0" data-name="AppLanguage"></rect>
-							<path d="M1349.0 239.0 L1643.0 239.0" fill="none" data-name="AppLanguage"></path>
-							<path d="M1349.0 315.0 L1643.0 315.0" fill="none" data-name="AppLanguage"></path>
-						</g>
-						<g transform="translate(1349, 208)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="AppLanguage">
-								<text x="139.0" y="13.5" stroke="none" text-anchor="middle" data-name="AppLanguage">AppLanguage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1349, 239)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppLanguage">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppLanguage">&lt;static&gt;+keyLanguageCode: String</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppLanguage">+supportedLocales: List&lt;Locale&gt;</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="AppLanguage">-_appLocale: Locale?</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="AppLanguage">+appLocal: Locale?</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1349, 315)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="AppLanguage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="AppLanguage">
-								<text x="0.0" y="13.5" stroke="none" data-name="AppLanguage">+dynamic fetchLocale()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="AppLanguage">+dynamic changeLanguage()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="Locale">
-						<g fill="#eee8d5" stroke="#33322E" data-name="Locale">
-							<rect x="1461.5" y="401.0" height="31.0" width="69.0" data-name="Locale"></rect>
-						</g>
-						<g transform="translate(1461.5, 401)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="Locale">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="Locale">
-								<text x="26.5" y="13.5" stroke="none" text-anchor="middle" data-name="Locale">Locale</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="ChangeNotifier">
-						<g fill="#eee8d5" stroke="#33322E" data-name="ChangeNotifier">
-							<rect x="1429.0" y="68.5" height="31.0" width="134.0" data-name="ChangeNotifier"></rect>
-						</g>
-						<g transform="translate(1429, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="ChangeNotifier">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="ChangeNotifier">
-								<text x="59.0" y="13.5" stroke="none" text-anchor="middle" data-name="ChangeNotifier">ChangeNotifier</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SupabaseStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SupabaseStorage">
-							<rect x="1683.0" y="223.5" height="122.0" width="305.0" data-name="SupabaseStorage"></rect>
-							<path d="M1683.0 254.5 L1988.0 254.5" fill="none" data-name="SupabaseStorage"></path>
-						</g>
-						<g transform="translate(1683, 223.5)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SupabaseStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SupabaseStorage">
-								<text x="144.5" y="13.5" stroke="none" text-anchor="middle" data-name="SupabaseStorage">SupabaseStorage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1683, 254.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SupabaseStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SupabaseStorage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SupabaseStorage">+dynamic initialize()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SupabaseStorage">+dynamic hasAccessToken()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SupabaseStorage">+dynamic accessToken()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SupabaseStorage">+dynamic persistSession()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SupabaseStorage">+dynamic removePersistedSession()</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="LocalStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="LocalStorage">
-							<rect x="1775.0" y="68.5" height="31.0" width="121.0" data-name="LocalStorage"></rect>
-						</g>
-						<g transform="translate(1775, 68.5)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="italic" data-name="LocalStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="LocalStorage">
-								<text x="52.5" y="13.5" stroke="none" text-anchor="middle" data-name="LocalStorage">LocalStorage</text>
-								
-							</g>
-						</g>
-					</g>
-					<g data-name="SecureStorage">
-						<g fill="#eee8d5" stroke="#33322E" data-name="SecureStorage">
-							<rect x="1936.0" y="8.0" height="152.0" width="521.0" data-name="SecureStorage"></rect>
-							<path d="M1936.0 39.0 L2457.0 39.0" fill="none" data-name="SecureStorage"></path>
-						</g>
-						<g transform="translate(1936, 8)" font-family="Helvetica" font-size="12pt" font-weight="bold" font-style="normal" data-name="SecureStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="center" data-name="SecureStorage">
-								<text x="252.5" y="13.5" stroke="none" text-anchor="middle" data-name="SecureStorage">SecureStorage</text>
-								
-							</g>
-						</g>
-						<g transform="translate(1936, 39)" font-family="Helvetica" font-size="12pt" font-weight="normal" font-style="normal" data-name="SecureStorage">
-							<g transform="translate(8, 8)" fill="#33322E" text-align="left" data-name="SecureStorage">
-								<text x="0.0" y="13.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic containsKey()</text>
-								<text x="0.0" y="28.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic write()</text>
-								<text x="0.0" y="43.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic read()</text>
-								<text x="0.0" y="58.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic readBool()</text>
-								<text x="0.0" y="73.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic delete()</text>
-								<text x="0.0" y="88.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic deleteAll()</text>
-								<text x="0.0" y="103.5" stroke="none" data-name="SecureStorage">&lt;static&gt;+dynamic migrateSharedPreferencesToSecureStorage()</text>
-								
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file

From 74ef2ce992617bd6173cec3a1a2e2766e8c4545d Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 9 Jun 2024 22:48:26 +0200
Subject: [PATCH 090/314] chore: format

---
 designer_v2/lib/domain/study_monitoring.dart | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/designer_v2/lib/domain/study_monitoring.dart b/designer_v2/lib/domain/study_monitoring.dart
index 3937263a7..986b98805 100644
--- a/designer_v2/lib/domain/study_monitoring.dart
+++ b/designer_v2/lib/domain/study_monitoring.dart
@@ -148,7 +148,9 @@ extension StudyMonitoringX on Study {
     final sevenDaysAgo = now.subtract(const Duration(days: 7)); //dropout time
 
     final activeParticipants = items.where((item) {
-      return !item.droppedOut && item.currentDayOfStudy < item.studyDurationInDays && item.lastActivityAt.isAfter(sevenDaysAgo);
+      return !item.droppedOut &&
+          item.currentDayOfStudy < item.studyDurationInDays &&
+          item.lastActivityAt.isAfter(sevenDaysAgo);
     }).length;
     final dropoutParticipants = items.where((item) {
       return item.droppedOut && item.lastActivityAt.isBefore(sevenDaysAgo);

From 1b585063170cec47b74c061c1cfa9a7795ba634b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20G=C3=B6cer?= <dev@hig.dev>
Date: Thu, 21 Mar 2024 20:10:41 +0100
Subject: [PATCH 091/314] feat: close study

---
 app/lib/l10n/app_de.arb                       |  2 ++
 app/lib/l10n/app_en.arb                       |  2 ++
 .../study/onboarding/study_selection.dart     | 28 +++++++++++++++++++
 core/lib/src/models/tables/study.dart         |  3 +-
 core/lib/src/models/tables/study.g.dart       |  1 +
 database/migration/migrate-close_study.sql    | 11 ++++++++
 database/studyu-schema.sql                    | 16 ++++++++++-
 designer_v2/lib/domain/participation.dart     |  6 ++++
 designer_v2/lib/domain/study.dart             |  7 +++++
 .../enrollment_form_controller.dart           |  6 ++--
 .../lib/features/study/study_actions.dart     |  1 +
 .../study/study_participation_badge.dart      |  9 ++++++
 designer_v2/lib/localization/app_de.arb       |  7 +++++
 designer_v2/lib/localization/app_en.arb       |  7 +++++
 .../lib/repositories/study_repository.dart    | 17 +++++++++++
 designer_v2/lib/services/notifications.dart   |  9 ++++++
 16 files changed, 128 insertions(+), 4 deletions(-)
 create mode 100644 database/migration/migrate-close_study.sql

diff --git a/app/lib/l10n/app_de.arb b/app/lib/l10n/app_de.arb
index 96112955e..bd312db03 100644
--- a/app/lib/l10n/app_de.arb
+++ b/app/lib/l10n/app_de.arb
@@ -23,6 +23,8 @@
   "study_selection_single_reason": "Wenn Sie zur selben Zeit an mehreren Studien teilnehmen würde, könnten die Kombination der Interventionen die Ergebnisse verfälschen.",
   "study_selection_unsupported_title": "Veraltete App-Version",
   "study_selection_unsupported": "Die Studie, an der Sie teilnehmen möchten, ist nicht mit Ihrer App-Version kompatibel. Bitte aktualisieren Sie die App auf die neueste Version.",
+  "study_selection_closed_title": "Studie geschlossen",
+  "study_selection_closed": "Diese Studie ist derzeit für neue Teilnehmer geschlossen.",
   "study_selection_hidden_studies": "Einige Studien konnten nicht angezeigt werden, da Ihre App-Version veraltet ist. Bitte aktualisieren Sie Ihre App, um alle verfügbaren Studien zu sehen.",
   "study_overview_title": "Übersicht",
   "eligibility_questionnaire_title": "Fragebogen",
diff --git a/app/lib/l10n/app_en.arb b/app/lib/l10n/app_en.arb
index b262a5e46..b2301dba5 100644
--- a/app/lib/l10n/app_en.arb
+++ b/app/lib/l10n/app_en.arb
@@ -22,6 +22,8 @@
   "study_selection_single_reason": "If you were to participate in multiple studies at a time, the interventions of these studies might interfere with one another and alter the results.",
   "study_selection_unsupported_title": "Outdated app version",
   "study_selection_unsupported": "The study you are trying to join is not compatible with your app version. Please update the app to the latest version.",
+  "study_selection_closed_title": "Study closed",
+  "study_selection_closed": "This study is currently closed for new participants.",
   "study_selection_hidden_studies": "Some studies couldn't be shown, because your app version is outdated. Please update your app to see all available studies.",
   "study_overview_title": "Overview",
   "eligibility_questionnaire_title": "Questionnaire",
diff --git a/app/lib/screens/study/onboarding/study_selection.dart b/app/lib/screens/study/onboarding/study_selection.dart
index 35f072a74..3a2846a3d 100644
--- a/app/lib/screens/study/onboarding/study_selection.dart
+++ b/app/lib/screens/study/onboarding/study_selection.dart
@@ -42,6 +42,22 @@ Future<void> showAppOutdatedDialog(BuildContext context) async {
   );
 }
 
+Future<void> showStudyClosedDialog(BuildContext context) async {
+  await showDialog(
+    context: context,
+    builder: (context) => AlertDialog(
+      title: Text(AppLocalizations.of(context)!.study_selection_closed_title),
+      content: Text(AppLocalizations.of(context)!.study_selection_closed),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.pop(context),
+          child: const Text("OK"),
+        ),
+      ],
+    ),
+  );
+}
+
 class StudySelectionScreen extends StatefulWidget {
   const StudySelectionScreen({super.key});
 
@@ -143,6 +159,10 @@ class _StudySelectionScreenState extends State<StudySelectionScreen> {
                             child: StudyTile.fromStudy(
                               study: study,
                               onTap: () async {
+                                if (study.participation == Participation.closed) {
+                                  await showStudyClosedDialog(context);
+                                  return;
+                                }
                                 await navigateToStudyOverview(context, study);
                               },
                             ),
@@ -253,10 +273,18 @@ class _InviteCodeDialogState extends State<InviteCodeDialog> {
                     // and UnknownJsonTypeError is a subclass of ArgumentError
                     debugPrint('Study selection from invite failed: $error');
                     if (!context.mounted) return;
+                    Navigator.pop(context);
                     await showAppOutdatedDialog(context);
                     return;
                   }
 
+                  if (study.participation == Participation.closed) {
+                    if (!context.mounted) return;
+                    Navigator.pop(context);
+                    await showStudyClosedDialog(context);
+                    return;
+                  }
+
                   if (!context.mounted) return;
                   Navigator.pop(context);
 
diff --git a/core/lib/src/models/tables/study.dart b/core/lib/src/models/tables/study.dart
index a168737c4..11eb0443b 100644
--- a/core/lib/src/models/tables/study.dart
+++ b/core/lib/src/models/tables/study.dart
@@ -19,7 +19,8 @@ enum StudyStatus {
 
 enum Participation {
   open,
-  invite;
+  invite,
+  closed;
 
   String toJson() => name;
   static Participation fromJson(String json) => values.byName(json);
diff --git a/core/lib/src/models/tables/study.g.dart b/core/lib/src/models/tables/study.g.dart
index bc1917f4d..634e99936 100644
--- a/core/lib/src/models/tables/study.g.dart
+++ b/core/lib/src/models/tables/study.g.dart
@@ -81,6 +81,7 @@ Map<String, dynamic> _$StudyToJson(Study instance) {
 const _$ParticipationEnumMap = {
   Participation.open: 'open',
   Participation.invite: 'invite',
+  Participation.closed: 'closed',
 };
 
 const _$ResultSharingEnumMap = {
diff --git a/database/migration/migrate-close_study.sql b/database/migration/migrate-close_study.sql
new file mode 100644
index 000000000..d17deb086
--- /dev/null
+++ b/database/migration/migrate-close_study.sql
@@ -0,0 +1,11 @@
+ALTER TYPE public.participation ADD VALUE 'closed';
+
+CREATE POLICY "Joining a closed study should not be possible" ON public.study_subject
+    AS RESTRICTIVE
+    FOR INSERT
+    WITH CHECK (NOT EXISTS (
+    SELECT 1
+    FROM public.study
+    WHERE study.id = study_subject.study_id
+      AND study.participation = 'closed'
+));
\ No newline at end of file
diff --git a/database/studyu-schema.sql b/database/studyu-schema.sql
index cd3102532..277fc9308 100644
--- a/database/studyu-schema.sql
+++ b/database/studyu-schema.sql
@@ -47,7 +47,8 @@ ALTER TYPE public.git_provider OWNER TO postgres;
 
 CREATE TYPE public.participation AS ENUM (
     'open',
-    'invite'
+    'invite',
+    'closed'
 );
 
 
@@ -835,6 +836,19 @@ CREATE POLICY "Editors can see subjects from their studies" ON public.study_subj
 CREATE POLICY "Invite code needs to be valid (not possible in the app)" ON public.study_subject AS RESTRICTIVE FOR INSERT WITH CHECK (((invite_code IS NULL) OR (study_id IN ( SELECT code_fun.study_id
    FROM public.get_study_from_invite(study_subject.invite_code) code_fun(study_id, preselected_intervention_ids)))));
 
+--
+-- Name: study_subject Joining a closed study should not be possible; Type: POLICY; Schema: public; Owner: postgres
+--
+
+CREATE POLICY "Joining a closed study should not be possible" ON public.study_subject
+AS RESTRICTIVE
+FOR INSERT
+WITH CHECK (NOT EXISTS (
+    SELECT 1
+    FROM public.study
+    WHERE study.id = study_subject.study_id
+    AND study.participation = 'closed'
+));
 
 --
 -- Name: subject_progress Editors can see their study subjects progress; Type: POLICY; Schema: public; Owner: postgres
diff --git a/designer_v2/lib/domain/participation.dart b/designer_v2/lib/domain/participation.dart
index edd6ec47a..9c537ad6b 100644
--- a/designer_v2/lib/domain/participation.dart
+++ b/designer_v2/lib/domain/participation.dart
@@ -9,6 +9,8 @@ extension ParticipationFormatted on Participation {
         return tr.form_enrollment_option_open;
       case Participation.invite:
         return tr.form_enrollment_option_invite;
+      case Participation.closed:
+        return tr.form_enrollment_option_closed;
       default:
         return "[Invalid Participation]";
     }
@@ -31,6 +33,8 @@ extension ParticipationFormatted on Participation {
         return tr.participation_open_who_description;
       case Participation.invite:
         return tr.participation_invite_who_description;
+      case Participation.closed:
+        return tr.participation_closed_who_description;
       default:
         return "[Invalid Participation]";
     }
@@ -42,6 +46,8 @@ extension ParticipationFormatted on Participation {
         return tr.participation_open_who;
       case Participation.invite:
         return tr.participation_invite_who;
+      case Participation.closed:
+        return tr.participation_closed_who;
       default:
         return "[Invalid Participation]";
     }
diff --git a/designer_v2/lib/domain/study.dart b/designer_v2/lib/domain/study.dart
index 37aa3bc37..f90fdd5b7 100644
--- a/designer_v2/lib/domain/study.dart
+++ b/designer_v2/lib/domain/study.dart
@@ -14,6 +14,7 @@ enum StudyActionType {
   duplicateDraft,
   addCollaborator,
   export,
+  close,
   delete,
 }
 
@@ -27,6 +28,8 @@ extension StudyActionTypeFormatted on StudyActionType {
         return tr.action_unpin;
       case StudyActionType.edit:
         return tr.action_edit;
+      case StudyActionType.close:
+        return tr.action_close;
       case StudyActionType.delete:
         return tr.action_delete;
       case StudyActionType.duplicate:
@@ -225,6 +228,10 @@ extension StudyPermissionsX on Study {
     return isOwner(user);
   }
 
+  bool canClose(sb.User user) {
+    return isOwner(user);
+  }
+
   bool canChangeSettings(sb.User user) {
     return isOwner(user);
   }
diff --git a/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart b/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart
index 43f725d37..c5f9aa38b 100644
--- a/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart
+++ b/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart
@@ -55,8 +55,10 @@ class EnrollmentFormViewModel extends FormViewModel<EnrollmentFormData>
 
   final FormControl<Participation> enrollmentTypeControl = FormControl();
 
-  List<FormControlOption<Participation>> get enrollmentTypeControlOptions =>
-      Participation.values.map((v) => FormControlOption(v, v.string, description: v.designDescription)).toList();
+  List<FormControlOption<Participation>> get enrollmentTypeControlOptions => Participation.values
+      .where((p) => p != Participation.closed)
+      .map((v) => FormControlOption(v, v.string, description: v.designDescription))
+      .toList();
 
   late final FormArray consentItemArray = FormArray([]);
   late final FormViewModelCollection<ConsentItemFormViewModel, ConsentItemFormData> consentItemFormViewModels =
diff --git a/designer_v2/lib/features/study/study_actions.dart b/designer_v2/lib/features/study/study_actions.dart
index cbd257fcb..8b38692cd 100644
--- a/designer_v2/lib/features/study/study_actions.dart
+++ b/designer_v2/lib/features/study/study_actions.dart
@@ -11,4 +11,5 @@ Map<StudyActionType, IconData> studyActionIcons = {
   StudyActionType.addCollaborator: Icons.person_add_rounded,
   StudyActionType.export: Icons.download_rounded,
   StudyActionType.delete: Icons.delete_rounded,
+  StudyActionType.close: MdiIcons.accountLock,
 };
diff --git a/designer_v2/lib/features/study/study_participation_badge.dart b/designer_v2/lib/features/study/study_participation_badge.dart
index 1fba1655d..88a90c69b 100644
--- a/designer_v2/lib/features/study/study_participation_badge.dart
+++ b/designer_v2/lib/features/study/study_participation_badge.dart
@@ -49,6 +49,15 @@ class StudyParticipationBadge extends StatelessWidget {
           icon: showPrefixIcon ? Icons.lock_rounded : null,
           padding: const EdgeInsets.symmetric(horizontal: 4.0, vertical: 4.0),
         ));
+      case Participation.closed:
+        return inTooltip(studybadge.Badge(
+          label: participation.whoShort,
+          center: center,
+          color: colorScheme.onPrimaryContainer.withOpacity(0.6),
+          type: type,
+          icon: showPrefixIcon ? Icons.lock_rounded : null,
+          padding: const EdgeInsets.symmetric(horizontal: 4.0, vertical: 4.0),
+        ));
     }
   }
 }
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index 5d0595fa7..e61e59385 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -65,6 +65,8 @@
   "participation_open_who_description": "Jeder kann sich für die Studie in der StudyU App anmelden.",
   "participation_invite_who": "Ausgewählte Teilnehmer",
   "participation_invite_who_description": "Nur ausgewählte Nutzer mit Teilnahme-Code könnten sich für die Studie in der StudyU App anmelden.",
+  "participation_closed_who": "Geschlossen",
+  "participation_closed_who_description": "Die Studie ist nicht mehr für neue Teilnehmer geöffnet.",
   "participation_open_as_adjective": "für jeden offen",
   "participation_invite_as_adjective": "nur für ausgewählte Teilnehmer offen",
   "participation_open_launch_description": "Nach dem Start kann sich jeder in der StudyU App für die Studie anmelden.",
@@ -76,6 +78,7 @@
 
   "form_enrollment_option_open": "Open",
   "form_enrollment_option_invite": "Private (Invite-only)",
+  "form_enrollment_option_closed": "Closed",
   "@__________________NAV_DRAWER__________________": {},
   "navlink_my_studies": "Meine Studien",
   "navlink_shared_studies": "Mit mir geteilt",
@@ -119,6 +122,9 @@
   "study_settings_publish_results_tooltip": "Andere Forscher und Kliniker können auf die anonymisierten Ergebnisdaten einer Studie zugreifen, \nsie exportieren und analysieren (die Analysieren-Unterseite deiner Studie ist zugänglich). Die Studie \nselbst wird dadurch automatisch auch für andere Forscher und Kliniker im Studienregister veröffentlicht.",
   "action_button_study_launch": "Studie starten",
   "notification_study_deleted": "Die Studie wurde gelöscht",
+  "notification_study_closed": "Die Studie wurde geschlossen",
+  "dialog_study_close_title": "Teilnahme schließen?",
+  "dialog_study_close_description": "Bist du sicher, dass die Teilnahme an der Studie geschlossen werden soll? Es können keine neuen Teilnehmer mehr eingeschrieben werden.",
   "dialog_study_delete_title": "Dauerhaft löschen?",
   "dialog_study_delete_description": "Bist du sicher, dass die Studie gelöscht werden soll? Die Studie und alle gesammelten Daten gehen dabei unwiderruflich verloren.",
   "@__________________STUDYPAGE_DESIGN_SHARED__________________": {},
@@ -545,6 +551,7 @@
   "action_pin": "Anheften",
   "action_unpin": "Nicht mehr anheften",
   "action_edit": "Bearbeiten",
+  "action_close": "Schließen",
   "action_delete": "Löschen",
   "action_remove": "Entfernen",
   "action_duplicate": "Duplizieren",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index 004ed2dd9..74ef80d24 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -73,6 +73,8 @@
   "participation_open_who_description": "All StudyU users may enroll to the study in the StudyU app.",
   "participation_invite_who": "Invite-only",
   "participation_invite_who_description": "Only participants with an access code can enroll in the StudyU app.",
+  "participation_closed_who": "Closed",
+  "participation_closed_who_description": "No new participants can enroll in the study.",
   "participation_open_as_adjective": "open to everyone",
   "participation_invite_as_adjective": "invite-only",
   "participation_open_launch_description": "Once launched, all users of the StudyU platform can enroll in your study as long as they meet your screening criteria.",
@@ -82,6 +84,7 @@
   "phase_sequence_random": "Random",
 "phase_sequence_custom": "Custom",  "form_enrollment_option_open": "Open",
   "form_enrollment_option_invite": "Private (Invite-only)",
+  "form_enrollment_option_closed": "Closed",
   "notification_code_deleted": "Access code deleted",
   "notification_code_clipboard": "Code copied to clipboard",
   "@__________________DASHBOARD__________________": {},
@@ -119,6 +122,9 @@
   "study_settings_publish_results_tooltip": "Make your anonymized study results & data available in the study registry. \nOther researchers & clinicians will be able to access, export and \nanalyze the results from your study (the Analyze page will be available). \n This will automatically publish your study design to the registry.",
   "action_button_study_launch": "Launch",
   "notification_study_deleted": "Study was deleted",
+  "notification_study_closed": "Study was closed",
+  "dialog_study_close_title": "Close participation?",
+  "dialog_study_close_description": "Are you sure you want to close participation for this study? No new participants will be able to enroll.",
   "dialog_study_delete_title": "Permanently delete?",
   "dialog_study_delete_description": "Are you sure you want to delete this study? You will permanently lose the study and all data that has been collected.",
   "@__________________STUDYPAGE_DESIGN_SHARED__________________": {},
@@ -594,6 +600,7 @@
   "action_pin": "Pin",
   "action_unpin": "Remove pin",
   "action_delete": "Delete",
+  "action_close": "Close",
   "action_remove": "Remove",
   "action_duplicate": "Duplicate",
   "action_clipboard": "Copy to clipboard",
diff --git a/designer_v2/lib/repositories/study_repository.dart b/designer_v2/lib/repositories/study_repository.dart
index c02dbbb9f..d4f138a2d 100644
--- a/designer_v2/lib/repositories/study_repository.dart
+++ b/designer_v2/lib/repositories/study_repository.dart
@@ -105,6 +105,13 @@ class StudyRepository extends ModelRepository<Study> implements IStudyRepository
               () => ref.read(notificationServiceProvider).show(Notifications.studyDeleted)));
     }
 
+    Future<void> onCloseCallback() {
+      model.participation = Participation.closed;
+      return save(model).then((value) => ref.read(routerProvider).dispatch(RoutingIntents.studies)).then((value) =>
+          Future.delayed(const Duration(milliseconds: 200),
+              () => ref.read(notificationServiceProvider).show(Notifications.studyClosed)));
+    }
+
     final currentUser = authRepository.currentUser!;
 
     // TODO: review Postgres policies to match [ModelAction.isAvailable]
@@ -153,6 +160,16 @@ class StudyRepository extends ModelRepository<Study> implements IStudyRepository
         },
         isAvailable: model.canExport(currentUser),
       ),
+      ModelAction(
+        type: StudyActionType.close,
+        label: StudyActionType.close.string,
+        onExecute: () {
+          return ref.read(notificationServiceProvider).show(Notifications.studyCloseConfirmation, actions: [
+            NotificationAction(label: StudyActionType.close.string, onSelect: onCloseCallback),
+          ]);
+        },
+        isAvailable: model.canClose(currentUser) && model.participation != Participation.closed,
+      ),
       ModelAction(
         type: StudyActionType.delete,
         label: StudyActionType.delete.string,
diff --git a/designer_v2/lib/services/notifications.dart b/designer_v2/lib/services/notifications.dart
index 88cfe6d48..40eeb7abe 100644
--- a/designer_v2/lib/services/notifications.dart
+++ b/designer_v2/lib/services/notifications.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/services/notification_types.dart';
 
@@ -18,6 +19,9 @@ class Notifications {
   static final studyDeleted = SnackbarIntent(
     message: tr.notification_study_deleted,
   );
+  static final studyClosed = SnackbarIntent(
+    message: tr.notification_study_closed,
+  );
   static final inviteCodeDeleted = SnackbarIntent(
     message: tr.notification_code_deleted,
   );
@@ -29,6 +33,11 @@ class Notifications {
       message: tr.dialog_study_delete_description,
       icon: Icons.delete_rounded,
       actions: [NotificationDefaultActions.cancel]);
+  static final studyCloseConfirmation = AlertIntent(
+      title: tr.dialog_study_close_title,
+      message: tr.dialog_study_close_description,
+      icon: MdiIcons.accountLock,
+      actions: [NotificationDefaultActions.cancel]);
 }
 
 class NotificationDefaultActions {

From d42efb284a98ff35184df82eafed007ebc7e07e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20G=C3=B6cer?= <dev@hig.dev>
Date: Wed, 3 Apr 2024 05:57:48 +0200
Subject: [PATCH 092/314] feat: close study using is_closed column

---
 .../screens/study/onboarding/study_selection.dart    |  4 ++--
 core/lib/src/models/tables/study.dart                | 12 +++++++-----
 core/lib/src/models/tables/study.g.dart              |  3 ++-
 database/migration/migrate-close_study.sql           |  5 +++--
 database/studyu-schema.sql                           |  3 ++-
 designer_v2/lib/domain/participation.dart            |  6 ------
 .../enrollment/enrollment_form_controller.dart       |  6 ++----
 .../features/study/study_participation_badge.dart    |  9 ---------
 .../lib/features/study/study_status_badge.dart       |  2 +-
 designer_v2/lib/localization/app_de.arb              |  3 ---
 designer_v2/lib/localization/app_en.arb              |  3 ---
 designer_v2/lib/repositories/study_repository.dart   |  4 ++--
 12 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/app/lib/screens/study/onboarding/study_selection.dart b/app/lib/screens/study/onboarding/study_selection.dart
index 3a2846a3d..3a1d36769 100644
--- a/app/lib/screens/study/onboarding/study_selection.dart
+++ b/app/lib/screens/study/onboarding/study_selection.dart
@@ -159,7 +159,7 @@ class _StudySelectionScreenState extends State<StudySelectionScreen> {
                             child: StudyTile.fromStudy(
                               study: study,
                               onTap: () async {
-                                if (study.participation == Participation.closed) {
+                                if (study.isClosed) {
                                   await showStudyClosedDialog(context);
                                   return;
                                 }
@@ -278,7 +278,7 @@ class _InviteCodeDialogState extends State<InviteCodeDialog> {
                     return;
                   }
 
-                  if (study.participation == Participation.closed) {
+                  if (study.isClosed) {
                     if (!context.mounted) return;
                     Navigator.pop(context);
                     await showStudyClosedDialog(context);
diff --git a/core/lib/src/models/tables/study.dart b/core/lib/src/models/tables/study.dart
index 11eb0443b..2ca6e6ce5 100644
--- a/core/lib/src/models/tables/study.dart
+++ b/core/lib/src/models/tables/study.dart
@@ -19,8 +19,7 @@ enum StudyStatus {
 
 enum Participation {
   open,
-  invite,
-  closed;
+  invite;
 
   String toJson() => name;
   static Participation fromJson(String json) => values.byName(json);
@@ -55,6 +54,8 @@ class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study>
   @JsonKey(name: 'icon_name')
   late String iconName = 'accountHeart';
   late bool published = false;
+  @JsonKey(name: 'is_closed', defaultValue: false)
+  bool isClosed = false;
   late StudyUQuestionnaire questionnaire = StudyUQuestionnaire();
   @JsonKey(name: 'eligibility_criteria')
   late List<EligibilityCriterion> eligibilityCriteria = [];
@@ -171,7 +172,7 @@ class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study>
   static Future<ExtractionResult<Study>> publishedPublicStudies() async {
     ExtractionResult<Study> result;
     try {
-      final response = await env.client.from(tableName).select().eq('participation', 'open');
+      final response = await env.client.from(tableName).select().eq('participation', 'open').eq("is_closed", false);
       final extracted = SupabaseQuery.extractSupabaseList<Study>(List<Map<String, dynamic>>.from(response));
       result = ExtractionSuccess<Study>(extracted);
     } on ExtractionFailedException<Study> catch (error) {
@@ -233,6 +234,9 @@ class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study>
   // - Status
 
   StudyStatus get status {
+    if (isClosed) {
+      return StudyStatus.closed;
+    }
     if (published) {
       return StudyStatus.running;
     }
@@ -241,8 +245,6 @@ class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study>
 
   bool get isDraft => status == StudyStatus.draft;
   bool get isRunning => status == StudyStatus.running;
-  // TODO: missing flag to indicate that study is completed & enrollment closed
-  bool get isClosed => false;
 
   bool isReadonly(User user) {
     return status != StudyStatus.draft || !canEdit(user);
diff --git a/core/lib/src/models/tables/study.g.dart b/core/lib/src/models/tables/study.g.dart
index 634e99936..62a0663b4 100644
--- a/core/lib/src/models/tables/study.g.dart
+++ b/core/lib/src/models/tables/study.g.dart
@@ -19,6 +19,7 @@ Study _$StudyFromJson(Map<String, dynamic> json) => Study(
       ..contact = Contact.fromJson(json['contact'] as Map<String, dynamic>)
       ..iconName = json['icon_name'] as String
       ..published = json['published'] as bool
+      ..isClosed = json['is_closed'] as bool? ?? false
       ..questionnaire =
           StudyUQuestionnaire.fromJson(json['questionnaire'] as List<dynamic>)
       ..eligibilityCriteria = (json['eligibility_criteria'] as List<dynamic>)
@@ -64,6 +65,7 @@ Map<String, dynamic> _$StudyToJson(Study instance) {
   val['contact'] = instance.contact.toJson();
   val['icon_name'] = instance.iconName;
   val['published'] = instance.published;
+  val['is_closed'] = instance.isClosed;
   val['questionnaire'] = instance.questionnaire.toJson();
   val['eligibility_criteria'] =
       instance.eligibilityCriteria.map((e) => e.toJson()).toList();
@@ -81,7 +83,6 @@ Map<String, dynamic> _$StudyToJson(Study instance) {
 const _$ParticipationEnumMap = {
   Participation.open: 'open',
   Participation.invite: 'invite',
-  Participation.closed: 'closed',
 };
 
 const _$ResultSharingEnumMap = {
diff --git a/database/migration/migrate-close_study.sql b/database/migration/migrate-close_study.sql
index d17deb086..2a4e7e953 100644
--- a/database/migration/migrate-close_study.sql
+++ b/database/migration/migrate-close_study.sql
@@ -1,4 +1,5 @@
-ALTER TYPE public.participation ADD VALUE 'closed';
+ALTER TABLE public.study
+    ADD COLUMN is_closed boolean DEFAULT false NOT NULL;
 
 CREATE POLICY "Joining a closed study should not be possible" ON public.study_subject
     AS RESTRICTIVE
@@ -7,5 +8,5 @@ CREATE POLICY "Joining a closed study should not be possible" ON public.study_su
     SELECT 1
     FROM public.study
     WHERE study.id = study_subject.study_id
-      AND study.participation = 'closed'
+      AND study.is_closed
 ));
\ No newline at end of file
diff --git a/database/studyu-schema.sql b/database/studyu-schema.sql
index 277fc9308..5aa5c89ea 100644
--- a/database/studyu-schema.sql
+++ b/database/studyu-schema.sql
@@ -82,6 +82,7 @@ CREATE TABLE public.study (
     description text NOT NULL,
     icon_name text NOT NULL,
     published boolean DEFAULT false NOT NULL,
+    is_closed boolean DEFAULT false NOT NULL,
     registry_published boolean DEFAULT false NOT NULL,
     questionnaire jsonb NOT NULL,
     eligibility_criteria jsonb NOT NULL,
@@ -847,7 +848,7 @@ WITH CHECK (NOT EXISTS (
     SELECT 1
     FROM public.study
     WHERE study.id = study_subject.study_id
-    AND study.participation = 'closed'
+    AND study.is_closed
 ));
 
 --
diff --git a/designer_v2/lib/domain/participation.dart b/designer_v2/lib/domain/participation.dart
index 9c537ad6b..edd6ec47a 100644
--- a/designer_v2/lib/domain/participation.dart
+++ b/designer_v2/lib/domain/participation.dart
@@ -9,8 +9,6 @@ extension ParticipationFormatted on Participation {
         return tr.form_enrollment_option_open;
       case Participation.invite:
         return tr.form_enrollment_option_invite;
-      case Participation.closed:
-        return tr.form_enrollment_option_closed;
       default:
         return "[Invalid Participation]";
     }
@@ -33,8 +31,6 @@ extension ParticipationFormatted on Participation {
         return tr.participation_open_who_description;
       case Participation.invite:
         return tr.participation_invite_who_description;
-      case Participation.closed:
-        return tr.participation_closed_who_description;
       default:
         return "[Invalid Participation]";
     }
@@ -46,8 +42,6 @@ extension ParticipationFormatted on Participation {
         return tr.participation_open_who;
       case Participation.invite:
         return tr.participation_invite_who;
-      case Participation.closed:
-        return tr.participation_closed_who;
       default:
         return "[Invalid Participation]";
     }
diff --git a/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart b/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart
index c5f9aa38b..43f725d37 100644
--- a/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart
+++ b/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart
@@ -55,10 +55,8 @@ class EnrollmentFormViewModel extends FormViewModel<EnrollmentFormData>
 
   final FormControl<Participation> enrollmentTypeControl = FormControl();
 
-  List<FormControlOption<Participation>> get enrollmentTypeControlOptions => Participation.values
-      .where((p) => p != Participation.closed)
-      .map((v) => FormControlOption(v, v.string, description: v.designDescription))
-      .toList();
+  List<FormControlOption<Participation>> get enrollmentTypeControlOptions =>
+      Participation.values.map((v) => FormControlOption(v, v.string, description: v.designDescription)).toList();
 
   late final FormArray consentItemArray = FormArray([]);
   late final FormViewModelCollection<ConsentItemFormViewModel, ConsentItemFormData> consentItemFormViewModels =
diff --git a/designer_v2/lib/features/study/study_participation_badge.dart b/designer_v2/lib/features/study/study_participation_badge.dart
index 88a90c69b..1fba1655d 100644
--- a/designer_v2/lib/features/study/study_participation_badge.dart
+++ b/designer_v2/lib/features/study/study_participation_badge.dart
@@ -49,15 +49,6 @@ class StudyParticipationBadge extends StatelessWidget {
           icon: showPrefixIcon ? Icons.lock_rounded : null,
           padding: const EdgeInsets.symmetric(horizontal: 4.0, vertical: 4.0),
         ));
-      case Participation.closed:
-        return inTooltip(studybadge.Badge(
-          label: participation.whoShort,
-          center: center,
-          color: colorScheme.onPrimaryContainer.withOpacity(0.6),
-          type: type,
-          icon: showPrefixIcon ? Icons.lock_rounded : null,
-          padding: const EdgeInsets.symmetric(horizontal: 4.0, vertical: 4.0),
-        ));
     }
   }
 }
diff --git a/designer_v2/lib/features/study/study_status_badge.dart b/designer_v2/lib/features/study/study_status_badge.dart
index 7d0abca49..e2cc1d8b0 100644
--- a/designer_v2/lib/features/study/study_status_badge.dart
+++ b/designer_v2/lib/features/study/study_status_badge.dart
@@ -52,7 +52,7 @@ class StudyStatusBadge extends StatelessWidget {
       case StudyStatus.closed:
         return inTooltip(studybadge.Badge(
           label: status!.string,
-          color: colorScheme.primaryContainer,
+          color: Colors.redAccent,
           type: type,
           icon: prefixIcon,
         ));
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index e61e59385..7fc45c0f0 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -65,8 +65,6 @@
   "participation_open_who_description": "Jeder kann sich für die Studie in der StudyU App anmelden.",
   "participation_invite_who": "Ausgewählte Teilnehmer",
   "participation_invite_who_description": "Nur ausgewählte Nutzer mit Teilnahme-Code könnten sich für die Studie in der StudyU App anmelden.",
-  "participation_closed_who": "Geschlossen",
-  "participation_closed_who_description": "Die Studie ist nicht mehr für neue Teilnehmer geöffnet.",
   "participation_open_as_adjective": "für jeden offen",
   "participation_invite_as_adjective": "nur für ausgewählte Teilnehmer offen",
   "participation_open_launch_description": "Nach dem Start kann sich jeder in der StudyU App für die Studie anmelden.",
@@ -78,7 +76,6 @@
 
   "form_enrollment_option_open": "Open",
   "form_enrollment_option_invite": "Private (Invite-only)",
-  "form_enrollment_option_closed": "Closed",
   "@__________________NAV_DRAWER__________________": {},
   "navlink_my_studies": "Meine Studien",
   "navlink_shared_studies": "Mit mir geteilt",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index 74ef80d24..f2dd3b72d 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -73,8 +73,6 @@
   "participation_open_who_description": "All StudyU users may enroll to the study in the StudyU app.",
   "participation_invite_who": "Invite-only",
   "participation_invite_who_description": "Only participants with an access code can enroll in the StudyU app.",
-  "participation_closed_who": "Closed",
-  "participation_closed_who_description": "No new participants can enroll in the study.",
   "participation_open_as_adjective": "open to everyone",
   "participation_invite_as_adjective": "invite-only",
   "participation_open_launch_description": "Once launched, all users of the StudyU platform can enroll in your study as long as they meet your screening criteria.",
@@ -84,7 +82,6 @@
   "phase_sequence_random": "Random",
 "phase_sequence_custom": "Custom",  "form_enrollment_option_open": "Open",
   "form_enrollment_option_invite": "Private (Invite-only)",
-  "form_enrollment_option_closed": "Closed",
   "notification_code_deleted": "Access code deleted",
   "notification_code_clipboard": "Code copied to clipboard",
   "@__________________DASHBOARD__________________": {},
diff --git a/designer_v2/lib/repositories/study_repository.dart b/designer_v2/lib/repositories/study_repository.dart
index d4f138a2d..a36134faf 100644
--- a/designer_v2/lib/repositories/study_repository.dart
+++ b/designer_v2/lib/repositories/study_repository.dart
@@ -106,7 +106,7 @@ class StudyRepository extends ModelRepository<Study> implements IStudyRepository
     }
 
     Future<void> onCloseCallback() {
-      model.participation = Participation.closed;
+      model.isClosed = true;
       return save(model).then((value) => ref.read(routerProvider).dispatch(RoutingIntents.studies)).then((value) =>
           Future.delayed(const Duration(milliseconds: 200),
               () => ref.read(notificationServiceProvider).show(Notifications.studyClosed)));
@@ -168,7 +168,7 @@ class StudyRepository extends ModelRepository<Study> implements IStudyRepository
             NotificationAction(label: StudyActionType.close.string, onSelect: onCloseCallback),
           ]);
         },
-        isAvailable: model.canClose(currentUser) && model.participation != Participation.closed,
+        isAvailable: model.canClose(currentUser) && model.status == StudyStatus.running,
       ),
       ModelAction(
         type: StudyActionType.delete,

From df2d3613195c0339dd7510fd1705751bbfb2c24c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20G=C3=B6cer?= <dev@hig.dev>
Date: Wed, 3 Apr 2024 06:40:26 +0200
Subject: [PATCH 093/314] feat: fix duplicate and designer updates for study
 closing

---
 designer_v2/lib/domain/study.dart             |  1 +
 .../features/recruit/study_recruit_page.dart  | 49 ++++++++++++++++---
 .../features/study/study_status_badge.dart    |  4 +-
 designer_v2/lib/localization/app_de.arb       |  2 +
 designer_v2/lib/localization/app_en.arb       |  4 +-
 5 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/designer_v2/lib/domain/study.dart b/designer_v2/lib/domain/study.dart
index f90fdd5b7..26ca0c72f 100644
--- a/designer_v2/lib/domain/study.dart
+++ b/designer_v2/lib/domain/study.dart
@@ -114,6 +114,7 @@ extension StudyDuplicateX on Study {
     copy.title = (copy.title ?? '').withDuplicateLabel();
     copy.userId = userId;
     copy.published = false;
+    copy.isClosed = false;
     copy.resultSharing = ResultSharing.private;
     copy.registryPublished = false;
     copy.results = [];
diff --git a/designer_v2/lib/features/recruit/study_recruit_page.dart b/designer_v2/lib/features/recruit/study_recruit_page.dart
index 85f8497f0..42774a979 100644
--- a/designer_v2/lib/features/recruit/study_recruit_page.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_page.dart
@@ -2,9 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/common_views/async_value_widget.dart';
+import 'package:studyu_designer_v2/common_views/banner.dart';
 import 'package:studyu_designer_v2/common_views/empty_body.dart';
 import 'package:studyu_designer_v2/common_views/primary_button.dart';
 import 'package:studyu_designer_v2/common_views/sidesheet/sidesheet_form.dart';
+import 'package:studyu_designer_v2/common_views/text_paragraph.dart';
 import 'package:studyu_designer_v2/features/recruit/invite_code_form_controller.dart';
 import 'package:studyu_designer_v2/features/recruit/invite_code_form_view.dart';
 import 'package:studyu_designer_v2/features/recruit/invite_codes_table.dart';
@@ -50,6 +52,32 @@ class StudyRecruitScreen extends StudyPageWidget {
             ));
   }
 
+  @override
+  Widget? banner(BuildContext context, WidgetRef ref) {
+    final state = ref.watch(studyRecruitControllerProvider(studyId));
+    final isStudyClosed = state.studyWithMetadata?.model.isClosed == true;
+
+    if (isStudyClosed) {
+      return BannerBox(
+          noPrefix: true,
+          body: Column(
+              mainAxisAlignment: MainAxisAlignment.start,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                TextParagraph(
+                  text: tr.banner_study_closed_title,
+                  style: const TextStyle(fontWeight: FontWeight.bold),
+                ),
+                TextParagraph(
+                  text: tr.banner_study_closed_description,
+                ),
+              ]),
+          style: BannerStyle.info);
+    }
+
+    return null;
+  }
+
   Widget _inviteCodesSectionHeader(BuildContext context, WidgetRef ref) {
     return Row(
       children: [
@@ -62,17 +90,22 @@ class StudyRecruitScreen extends StudyPageWidget {
   }
 
   Widget _newInviteCodeButton(BuildContext context, WidgetRef ref) {
+    final state = ref.watch(studyRecruitControllerProvider(studyId));
+    final isStudyClosed = state.studyWithMetadata?.model.isClosed == true;
+
     return PrimaryButton(
       icon: Icons.add,
       text: tr.action_button_code_new,
-      onPressed: () {
-        final formViewModel = ref.read(inviteCodeFormViewModelProvider(studyId));
-        showFormSideSheet<InviteCodeFormViewModel>(
-          context: context,
-          formViewModel: formViewModel,
-          formViewBuilder: (formViewModel) => InviteCodeFormView(formViewModel: formViewModel),
-        );
-      },
+      onPressed: isStudyClosed
+          ? null
+          : () {
+              final formViewModel = ref.read(inviteCodeFormViewModelProvider(studyId));
+              showFormSideSheet<InviteCodeFormViewModel>(
+                context: context,
+                formViewModel: formViewModel,
+                formViewBuilder: (formViewModel) => InviteCodeFormView(formViewModel: formViewModel),
+              );
+            },
     );
   }
 
diff --git a/designer_v2/lib/features/study/study_status_badge.dart b/designer_v2/lib/features/study/study_status_badge.dart
index e2cc1d8b0..8eb4f977b 100644
--- a/designer_v2/lib/features/study/study_status_badge.dart
+++ b/designer_v2/lib/features/study/study_status_badge.dart
@@ -29,7 +29,9 @@ class StudyStatusBadge extends StatelessWidget {
     final colorScheme = Theme.of(context).colorScheme;
     final prefixIcon = showPrefixIcon ? Icons.circle_rounded : null;
 
-    final tooltipMessage = ('${status?.description ?? ''}\n${participation?.description ?? ''}').trim();
+    final tooltipMessage =
+        ('${status?.description ?? ''}\n${(status == StudyStatus.closed ? null : participation?.description) ?? ''}')
+            .trim();
 
     Widget inTooltip(Widget child) {
       if (tooltipMessage.isNotEmpty && showTooltip) {
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index 7fc45c0f0..835a4600e 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -240,6 +240,8 @@
   "free_text_question_type_custom_explanation": "Die Eingabe muss dem angegebenen regulären Ausdruck entsprechen.",
   "banner_study_readonly_title": "Die Studie kann nicht bearbeitet werden.",
   "banner_study_readonly_description": "Du kannst nur Studien bearbeiten, die du selbst erstellt hast oder die mit dir zur Mitarbeit geteilt wurden. Studien, die bereits gestartet sind, können grundsätzlich nicht mehr verändert werden.",
+  "banner_study_closed_title": "Diese Studie ist geschlossen.",
+  "banner_study_closed_description": "Neue Teilnehmer können sich nicht in diese Studie einschreiben.",
   "form_section_scheduling": "Zeitplan & Einhaltung",
   "form_section_scheduling_description": "Um die Compliance von Teilnehmern zu verbessern, kannst du ein begrenztes Zeitfenster & eine App-Benachrichtigung als Erinnerung definieren.",
   "form_field_has_reminder": "Erinnerung",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index f2dd3b72d..a26a51319 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -68,7 +68,7 @@
   "study_status_running": "Live",
   "study_status_running_description": "This study is currently in progress.",
   "study_status_closed": "Closed",
-  "study_status_closed_description": "This study has been completed.",
+  "study_status_closed_description": "This study has been completed.\nNo new participants will be able to enroll.",
   "participation_open_who": "Everyone",
   "participation_open_who_description": "All StudyU users may enroll to the study in the StudyU app.",
   "participation_invite_who": "Invite-only",
@@ -244,6 +244,8 @@
 
   "banner_study_readonly_title": "This study cannot be edited.",
   "banner_study_readonly_description": "You can only make changes to studies where you are an owner or collaborator. Studies that have been launched cannot be changed by anyone.",
+  "banner_study_closed_title": "This study is closed.",
+  "banner_study_closed_description": "No new participants will be able to enroll in this study.",
   "form_section_scheduling": "Scheduling and Compliance",
   "form_section_scheduling_description": "To improve compliance, you can set a limited window of time for participants to complete the task & send a reminder notification at the specified time.",
   "form_field_has_reminder": "App reminder",

From 6df5f30d88900febc178f9bb27c7a027ba8bcd43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20G=C3=B6cer?= <dev@hig.dev>
Date: Wed, 3 Apr 2024 06:57:35 +0200
Subject: [PATCH 094/314] feat: small fixes for study closing

---
 database/studyu-schema.sql              | 1 -
 designer_v2/lib/localization/app_de.arb | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/database/studyu-schema.sql b/database/studyu-schema.sql
index 5aa5c89ea..5cc8b39f8 100644
--- a/database/studyu-schema.sql
+++ b/database/studyu-schema.sql
@@ -48,7 +48,6 @@ ALTER TYPE public.git_provider OWNER TO postgres;
 CREATE TYPE public.participation AS ENUM (
     'open',
     'invite',
-    'closed'
 );
 
 
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index 835a4600e..ded5ffe6a 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -60,7 +60,7 @@
   "study_status_running": "Live",
   "study_status_running_description": "Die Studie wird gerade durchgeführt",
   "study_status_closed": "Abgeschlossen",
-  "study_status_closed_description": "Die Studie wurde bereits abgeschlossen",
+  "study_status_closed_description": "Diese Studie ist abgeschlossen.\nEs können sich keine neuen Teilnehmer mehr einschreiben.",
   "participation_open_who": "Für jeden offen",
   "participation_open_who_description": "Jeder kann sich für die Studie in der StudyU App anmelden.",
   "participation_invite_who": "Ausgewählte Teilnehmer",

From aae8c4748e6c6e1ea33adcdef600a85a641c20fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20G=C3=B6cer?= <dev@hig.dev>
Date: Tue, 9 Apr 2024 05:06:59 +0200
Subject: [PATCH 095/314] fix: typo / grammar

---
 designer_v2/lib/localization/app_en.arb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index a26a51319..87421f050 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -121,7 +121,7 @@
   "notification_study_deleted": "Study was deleted",
   "notification_study_closed": "Study was closed",
   "dialog_study_close_title": "Close participation?",
-  "dialog_study_close_description": "Are you sure you want to close participation for this study? No new participants will be able to enroll.",
+  "dialog_study_close_description": "Are you sure that you want to close participation for this study? No new participants will be able to enroll.",
   "dialog_study_delete_title": "Permanently delete?",
   "dialog_study_delete_description": "Are you sure you want to delete this study? You will permanently lose the study and all data that has been collected.",
   "@__________________STUDYPAGE_DESIGN_SHARED__________________": {},

From 162331819ee5f289141ca5dc05a00d9f520dd609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20G=C3=B6cer?= <dev@hig.dev>
Date: Tue, 16 Apr 2024 16:53:45 +0200
Subject: [PATCH 096/314] fix: remove abundant comma and add EOF

---
 database/migration/migrate-close_study.sql | 2 +-
 database/studyu-schema.sql                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/database/migration/migrate-close_study.sql b/database/migration/migrate-close_study.sql
index 2a4e7e953..f887f3652 100644
--- a/database/migration/migrate-close_study.sql
+++ b/database/migration/migrate-close_study.sql
@@ -9,4 +9,4 @@ CREATE POLICY "Joining a closed study should not be possible" ON public.study_su
     FROM public.study
     WHERE study.id = study_subject.study_id
       AND study.is_closed
-));
\ No newline at end of file
+));
diff --git a/database/studyu-schema.sql b/database/studyu-schema.sql
index 5cc8b39f8..dd7a7f95e 100644
--- a/database/studyu-schema.sql
+++ b/database/studyu-schema.sql
@@ -47,7 +47,7 @@ ALTER TYPE public.git_provider OWNER TO postgres;
 
 CREATE TYPE public.participation AS ENUM (
     'open',
-    'invite',
+    'invite'
 );
 
 

From 54c7151304e7977f466f51f38ef0d41fa61f3d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20G=C3=B6cer?= <dev@hig.dev>
Date: Tue, 16 Apr 2024 19:50:18 +0200
Subject: [PATCH 097/314] fix: users not able to continue closed study

---
 app/lib/util/cache.dart                       |  2 +-
 core/lib/src/models/tables/study_subject.dart | 10 ++++++----
 core/lib/src/util/supabase_object.dart        | 18 +++++++++++++++---
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/lib/util/cache.dart b/app/lib/util/cache.dart
index 751d6c9ab..66da4813c 100644
--- a/app/lib/util/cache.dart
+++ b/app/lib/util/cache.dart
@@ -95,7 +95,7 @@ class Cache {
         finalProgress.retainWhere((element) => duplicates.add(element.completedAt));
         // replace remote progress with our merge
         remoteSubject.progress = finalProgress;
-        await remoteSubject.save();
+        await remoteSubject.save(onlyUpdate: true);
       } else {
         // Unable to determine what has changed
         // We can either drop local or overwrite remote
diff --git a/core/lib/src/models/tables/study_subject.dart b/core/lib/src/models/tables/study_subject.dart
index 8f41558b3..b964632fe 100644
--- a/core/lib/src/models/tables/study_subject.dart
+++ b/core/lib/src/models/tables/study_subject.dart
@@ -251,13 +251,15 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
       progress.map((p) => p.setStartDateBackBy(days: days).toJson()).toList(),
     );
     startedAt = startedAt!.subtract(Duration(days: days));
-    save();
+    save(onlyUpdate: true);
   }
 
   @override
-  Future<StudySubject> save() async {
+  Future<StudySubject> save({bool onlyUpdate = false}) async {
     try {
-      final response = await env.client.from(tableName).upsert(toJson()).select();
+      final tableQuery = env.client.from(tableName);
+      final query = onlyUpdate ? tableQuery.update(toJson()).eq("id", id) : tableQuery.upsert(toJson());
+      final response = await query.select();
       final json = toFullJson(partialJson: List<Map<String, dynamic>>.from(response).single);
       final newSubject = StudySubject.fromJson(json);
       _controller.add(newSubject);
@@ -317,7 +319,7 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
 
   Future<StudySubject> softDelete() {
     isDeleted = true;
-    return save();
+    return save(onlyUpdate: true);
   }
 
   static Future<List<StudySubject>> getStudyHistory(String userId) async {
diff --git a/core/lib/src/util/supabase_object.dart b/core/lib/src/util/supabase_object.dart
index b204076db..9059c59ff 100644
--- a/core/lib/src/util/supabase_object.dart
+++ b/core/lib/src/util/supabase_object.dart
@@ -37,9 +37,21 @@ abstract class SupabaseObjectFunctions<T extends SupabaseObject> implements Supa
         await env.client.from(tableName(T)).delete().primaryKeys(primaryKeys).select().single(),
       );
 
-  Future<T> save() async {
-    return SupabaseQuery.extractSupabaseList<T>(await env.client.from(tableName(T)).upsert(this.toJson()).select())
-        .single;
+  /// Save the object to the database.
+  /// By default, this will upsert the object, i.e. insert it if it does not exist, or update it if it does.
+  /// If [onlyUpdate] is set to true, the object has to exist in the database, otherwise the result will be empty.
+  Future<T> save({bool onlyUpdate = false}) async {
+    final tableQuery = env.client.from(tableName(T));
+    PostgrestFilterBuilder query;
+    if (onlyUpdate) {
+      query = tableQuery.upsert(this.toJson());
+      for (final entry in primaryKeys.entries) {
+        query = query.eq(entry.key, entry.value);
+      }
+    } else {
+      query = tableQuery.upsert(this.toJson());
+    }
+    return SupabaseQuery.extractSupabaseList<T>(await query.select()).single;
   }
 }
 

From 72e20f5244849ae5965e3f8d72d319d3328b91d8 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 24 May 2024 21:19:34 +0200
Subject: [PATCH 098/314] chore: rebase dev

---
 app/lib/util/study_subject_extension.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/util/study_subject_extension.dart b/app/lib/util/study_subject_extension.dart
index a8c12d5fe..fa6b31f24 100644
--- a/app/lib/util/study_subject_extension.dart
+++ b/app/lib/util/study_subject_extension.dart
@@ -58,7 +58,7 @@ extension StudySubjectExtension on StudySubject {
     } else {
       p = await p.save();
       progress.add(p);
-      await save();
+      await save(onlyUpdate: true);
     }
   }
 }

From cbc724d62554d9a4e237ae357b571e8ea5c493e4 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sat, 25 May 2024 16:29:17 +0200
Subject: [PATCH 099/314] feat: add separators to model action popup

---
 .../lib/repositories/study_repository.dart    |  1 +
 designer_v2/lib/utils/model_action.dart       | 26 ++++++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/designer_v2/lib/repositories/study_repository.dart b/designer_v2/lib/repositories/study_repository.dart
index a36134faf..654215a82 100644
--- a/designer_v2/lib/repositories/study_repository.dart
+++ b/designer_v2/lib/repositories/study_repository.dart
@@ -160,6 +160,7 @@ class StudyRepository extends ModelRepository<Study> implements IStudyRepository
         },
         isAvailable: model.canExport(currentUser),
       ),
+      ModelAction.addSeparator(),
       ModelAction(
         type: StudyActionType.close,
         label: StudyActionType.close.string,
diff --git a/designer_v2/lib/utils/model_action.dart b/designer_v2/lib/utils/model_action.dart
index 39e852d2b..9c15757bd 100644
--- a/designer_v2/lib/utils/model_action.dart
+++ b/designer_v2/lib/utils/model_action.dart
@@ -6,16 +6,28 @@ class ModelAction<T> {
   final String label;
   IconData? icon;
   final Function onExecute;
+  final bool isSeparator;
   final bool isAvailable;
   final bool isDestructive;
 
-  ModelAction(
-      {required this.type,
-      required this.label,
-      required this.onExecute,
-      this.isAvailable = true,
-      this.isDestructive = false,
-      this.icon});
+  ModelAction({
+    required this.type,
+    required this.label,
+    required this.onExecute,
+    this.isSeparator = false,
+    this.isAvailable = true,
+    this.isDestructive = false,
+    this.icon
+  });
+
+  static ModelAction addSeparator() {
+    return ModelAction(
+      type: null,
+      label: '',
+      onExecute: () {},
+      isSeparator: true,
+    );
+  }
 }
 
 abstract class IModelActionProvider<V> {

From 05b0195a8977aef48f4d82ec1852b9b21b07c191 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sat, 25 May 2024 16:29:44 +0200
Subject: [PATCH 100/314] style: mark close notification as destructive

---
 designer_v2/lib/repositories/study_repository.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_v2/lib/repositories/study_repository.dart b/designer_v2/lib/repositories/study_repository.dart
index 654215a82..e0625f53f 100644
--- a/designer_v2/lib/repositories/study_repository.dart
+++ b/designer_v2/lib/repositories/study_repository.dart
@@ -166,7 +166,7 @@ class StudyRepository extends ModelRepository<Study> implements IStudyRepository
         label: StudyActionType.close.string,
         onExecute: () {
           return ref.read(notificationServiceProvider).show(Notifications.studyCloseConfirmation, actions: [
-            NotificationAction(label: StudyActionType.close.string, onSelect: onCloseCallback),
+            NotificationAction(label: StudyActionType.close.string, onSelect: onCloseCallback, isDestructive: true),
           ]);
         },
         isAvailable: model.canClose(currentUser) && model.status == StudyStatus.running,

From 891b8d72a745f950a0dfefa833f8cf98139d521c Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sat, 25 May 2024 16:30:21 +0200
Subject: [PATCH 101/314] style: enable hover color for action popup actions

---
 .../lib/common_views/action_popup_menu.dart   | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/designer_v2/lib/common_views/action_popup_menu.dart b/designer_v2/lib/common_views/action_popup_menu.dart
index e07d61bef..c6137da2c 100644
--- a/designer_v2/lib/common_views/action_popup_menu.dart
+++ b/designer_v2/lib/common_views/action_popup_menu.dart
@@ -48,7 +48,7 @@ class ActionPopUpMenuButton extends StatelessWidget {
             data: Theme.of(context).copyWith(
               splashColor: Colors.transparent,
               highlightColor: Colors.transparent,
-              hoverColor: Colors.transparent,
+              // hoverColor: Colors.transparent,
             ),
             child: popupMenu);
       }
@@ -70,26 +70,37 @@ class ActionPopUpMenuButton extends StatelessWidget {
         elevation: elevation,
         splashRadius: splashRadius,
         position: position,
-        onSelected: (ModelAction action) => action.onExecute(),
+        onSelected: (action) => action is ModelAction ? action.onExecute() : null,
         itemBuilder: (BuildContext context) {
           final textTheme = theme.textTheme.labelMedium!;
-          return actions.map((action) {
-            return PopupMenuItem(
+          final List<PopupMenuEntry> popupList = [];
+          for (final action in actions) {
+            if (action.isSeparator) {
+              popupList.add(const PopupMenuDivider());
+              continue;
+            }
+            popupList.add(PopupMenuItem(
               value: action,
               child: ListTile(
-                contentPadding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 0),
+                contentPadding: const EdgeInsets.symmetric(
+                    horizontal: 8.0, vertical: 0),
                 horizontalTitleGap: 4.0,
                 leading: (action.icon == null)
                     ? const SizedBox.shrink()
                     : Icon(action.icon,
-                        size: theme.iconTheme.size ?? 14.0,
-                        color: action.isDestructive ? Colors.red : iconColorDefault),
+                    size: theme.iconTheme.size ?? 14.0,
+                    color: action.isDestructive
+                        ? Colors.red
+                        : iconColorDefault),
                 title: action.isDestructive
-                    ? Text(action.label, style: textTheme.copyWith(color: Colors.red))
+                    ? Text(
+                    action.label, style: textTheme.copyWith(color: Colors.red))
                     : Text(action.label, style: textTheme),
               ),
-            );
-          }).toList();
+            ));
+            continue;
+          }
+          return popupList;
         });
   }
 }

From 30b84ee9a1c140a04d39debf718e655f1cc77cb0 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sat, 25 May 2024 18:57:38 +0200
Subject: [PATCH 102/314] chore: format

---
 .../lib/common_views/action_popup_menu.dart     | 12 ++++--------
 designer_v2/lib/utils/model_action.dart         | 17 ++++++++---------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/designer_v2/lib/common_views/action_popup_menu.dart b/designer_v2/lib/common_views/action_popup_menu.dart
index c6137da2c..42a38f1f6 100644
--- a/designer_v2/lib/common_views/action_popup_menu.dart
+++ b/designer_v2/lib/common_views/action_popup_menu.dart
@@ -82,19 +82,15 @@ class ActionPopUpMenuButton extends StatelessWidget {
             popupList.add(PopupMenuItem(
               value: action,
               child: ListTile(
-                contentPadding: const EdgeInsets.symmetric(
-                    horizontal: 8.0, vertical: 0),
+                contentPadding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 0),
                 horizontalTitleGap: 4.0,
                 leading: (action.icon == null)
                     ? const SizedBox.shrink()
                     : Icon(action.icon,
-                    size: theme.iconTheme.size ?? 14.0,
-                    color: action.isDestructive
-                        ? Colors.red
-                        : iconColorDefault),
+                        size: theme.iconTheme.size ?? 14.0,
+                        color: action.isDestructive ? Colors.red : iconColorDefault),
                 title: action.isDestructive
-                    ? Text(
-                    action.label, style: textTheme.copyWith(color: Colors.red))
+                    ? Text(action.label, style: textTheme.copyWith(color: Colors.red))
                     : Text(action.label, style: textTheme),
               ),
             ));
diff --git a/designer_v2/lib/utils/model_action.dart b/designer_v2/lib/utils/model_action.dart
index 9c15757bd..8e70575d2 100644
--- a/designer_v2/lib/utils/model_action.dart
+++ b/designer_v2/lib/utils/model_action.dart
@@ -10,15 +10,14 @@ class ModelAction<T> {
   final bool isAvailable;
   final bool isDestructive;
 
-  ModelAction({
-    required this.type,
-    required this.label,
-    required this.onExecute,
-    this.isSeparator = false,
-    this.isAvailable = true,
-    this.isDestructive = false,
-    this.icon
-  });
+  ModelAction(
+      {required this.type,
+      required this.label,
+      required this.onExecute,
+      this.isSeparator = false,
+      this.isAvailable = true,
+      this.isDestructive = false,
+      this.icon});
 
   static ModelAction addSeparator() {
     return ModelAction(

From 3f0d1a797fe12cf8b3311dad0408d575230fca73 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 10 Jun 2024 15:27:48 +0200
Subject: [PATCH 103/314] refactor: format time using locale

---
 designer_v2/lib/domain/study_monitoring.dart  | 67 +++++++++++-------
 .../monitor/participant_details_view.dart     | 69 ++++++++++---------
 .../features/monitor/study_monitor_page.dart  |  1 +
 .../features/monitor/study_monitor_table.dart | 47 ++++++-------
 designer_v2/lib/utils/extensions.dart         | 10 +++
 5 files changed, 117 insertions(+), 77 deletions(-)

diff --git a/designer_v2/lib/domain/study_monitoring.dart b/designer_v2/lib/domain/study_monitoring.dart
index 986b98805..d9dc4531a 100644
--- a/designer_v2/lib/domain/study_monitoring.dart
+++ b/designer_v2/lib/domain/study_monitoring.dart
@@ -30,7 +30,7 @@ class StudyMonitorData {
 class StudyMonitorItem extends Equatable {
   final String participantId;
   final String? inviteCode;
-  final DateTime enrolledAt;
+  final DateTime startedAt;
   final DateTime lastActivityAt;
   final int currentDayOfStudy;
   final int studyDurationInDays;
@@ -45,7 +45,7 @@ class StudyMonitorItem extends Equatable {
   StudyMonitorItem({
     required this.participantId,
     required this.inviteCode,
-    required this.enrolledAt,
+    required this.startedAt,
     required this.lastActivityAt,
     required this.currentDayOfStudy,
     required this.studyDurationInDays,
@@ -72,19 +72,28 @@ extension StudyMonitoringX on Study {
     final participants = this.participants ?? [];
     final participantsProgress = this.participantsProgress ?? [];
 
-    participants.sort((a, b) => a.startedAt!.compareTo(b.startedAt!)); // ascending
+    participants
+        .sort((a, b) => a.startedAt!.compareTo(b.startedAt!)); // ascending
 
     for (final participant in participants) {
-      final progresses = participantsProgress.where((progress) => progress.subjectId == participant.id).toList();
-      progresses.sort((b, a) => a.completedAt!.compareTo(b.completedAt!)); // descending
-      final interventionOrder = schedule.generateInterventionIdsInOrder(participant.selectedInterventionIds);
-      final lastActivityAt = progresses.isNotEmpty ? progresses.first.completedAt! : participant.startedAt!;
+      final progresses = participantsProgress
+          .where((progress) => progress.subjectId == participant.id)
+          .toList();
+      progresses.sort(
+          (b, a) => a.completedAt!.compareTo(b.completedAt!)); // descending
+      final interventionOrder = schedule
+          .generateInterventionIdsInOrder(participant.selectedInterventionIds);
+      final lastActivityAt = progresses.isNotEmpty
+          ? progresses.first.completedAt!
+          : participant.startedAt!;
       final studyDurationInDays = schedule.length;
-      final currentDayOfStudy =
-          min(studyDurationInDays, DateTime.now().toUtc().difference(participant.startedAt!).inDays);
-      final daysInBaseline = schedule.includeBaseline ? schedule.phaseDuration : 0;
+      final currentDayOfStudy = min(studyDurationInDays,
+          DateTime.now().toUtc().difference(participant.startedAt!).inDays);
+      final daysInBaseline =
+          schedule.includeBaseline ? schedule.phaseDuration : 0;
 
-      final Set<String> requiredSurveyTaskIds = observations.map((o) => o.id).toSet();
+      final Set<String> requiredSurveyTaskIds =
+          observations.map((o) => o.id).toSet();
 
       int completedInterventions = 0;
       int completedSurveys = 0;
@@ -94,29 +103,38 @@ extension StudyMonitoringX on Study {
       for (int day = 0; day < currentDayOfStudy; day++) {
         final Set<String> requiredInterventionTaskIds = {};
         if (day >= daysInBaseline) {
-          final interventionIdForThisPhase = interventionOrder[day ~/ schedule.phaseDuration];
-          final interventionForThisPhase = interventions.firstWhere((i) => i.id == interventionIdForThisPhase);
-          requiredInterventionTaskIds.addAll(interventionForThisPhase.tasks.map((t) => t.id));
+          final interventionIdForThisPhase =
+              interventionOrder[day ~/ schedule.phaseDuration];
+          final interventionForThisPhase = interventions
+              .firstWhere((i) => i.id == interventionIdForThisPhase);
+          requiredInterventionTaskIds
+              .addAll(interventionForThisPhase.tasks.map((t) => t.id));
         }
 
-        final requiredTaskIds = requiredInterventionTaskIds.union(requiredSurveyTaskIds);
+        final requiredTaskIds =
+            requiredInterventionTaskIds.union(requiredSurveyTaskIds);
 
         final completedTaskIds = progresses
             .where((p) =>
-                p.completedAt!.isAfter(participant.startedAt!.add(Duration(days: day))) &&
-                p.completedAt!.isBefore(participant.startedAt!.add(Duration(days: day + 1))))
+                p.completedAt!
+                    .isAfter(participant.startedAt!.add(Duration(days: day))) &&
+                p.completedAt!.isBefore(
+                    participant.startedAt!.add(Duration(days: day + 1))))
             .map((p) => p.taskId)
             .toSet();
 
         final missedTaskIds = requiredTaskIds.difference(completedTaskIds);
         missedTasksPerDay.add(missedTaskIds);
 
-        final completedTaskIdsPerDay = requiredTaskIds.intersection(completedTaskIds);
+        final completedTaskIdsPerDay =
+            requiredTaskIds.intersection(completedTaskIds);
         completedTasksPerDay.add(completedTaskIdsPerDay);
 
-        final completedSurveysSet = requiredSurveyTaskIds.intersection(completedTaskIds);
+        final completedSurveysSet =
+            requiredSurveyTaskIds.intersection(completedTaskIds);
         final completedIntervention = requiredInterventionTaskIds.isNotEmpty &&
-            requiredInterventionTaskIds.intersection(completedTaskIds).length == requiredInterventionTaskIds.length;
+            requiredInterventionTaskIds.intersection(completedTaskIds).length ==
+                requiredInterventionTaskIds.length;
         completedSurveys += completedSurveysSet.length;
         completedInterventions += completedIntervention ? 1 : 0;
       }
@@ -130,7 +148,7 @@ extension StudyMonitoringX on Study {
       items.add(StudyMonitorItem(
         participantId: participant.id,
         inviteCode: participant.inviteCode,
-        enrolledAt: participant.startedAt!,
+        startedAt: participant.startedAt!,
         lastActivityAt: lastActivityAt,
         currentDayOfStudy: currentDayOfStudy,
         studyDurationInDays: studyDurationInDays,
@@ -155,9 +173,12 @@ extension StudyMonitoringX on Study {
     final dropoutParticipants = items.where((item) {
       return item.droppedOut && item.lastActivityAt.isBefore(sevenDaysAgo);
     }).length;
-    final completedParticipants = items.where((item) => item.currentDayOfStudy >= item.studyDurationInDays).length;
+    final completedParticipants = items
+        .where((item) => item.currentDayOfStudy >= item.studyDurationInDays)
+        .length;
 
-    assert(activeParticipants + dropoutParticipants + completedParticipants == items.length);
+    assert(activeParticipants + dropoutParticipants + completedParticipants ==
+        items.length);
 
     return StudyMonitorData(
       activeParticipants: activeParticipants,
diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index 91a537e29..63823c83d 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -1,20 +1,26 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study_monitoring.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
+import 'package:studyu_designer_v2/localization/locale_providers.dart';
+import 'package:studyu_designer_v2/utils/extensions.dart';
 
-class ParticipantDetailsView extends StatelessWidget {
+class ParticipantDetailsView extends ConsumerWidget {
   const ParticipantDetailsView(
-      {required this.monitorItem, required this.interventions, required this.observations, super.key});
+      {required this.monitorItem,
+      required this.interventions,
+      required this.observations,
+      super.key});
 
   final StudyMonitorItem monitorItem;
   final List<Intervention> interventions;
   final List<Observation> observations;
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
+    final languageCode = ref.watch(localeProvider).languageCode;
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -23,7 +29,7 @@ class ParticipantDetailsView extends StatelessWidget {
           style: Theme.of(context).textTheme.titleLarge,
         ),
         const SizedBox(height: 8.0),
-        _buildParticipantInfo(context),
+        _buildParticipantInfo(languageCode),
         const SizedBox(height: 8.0),
         const Divider(),
         Text(
@@ -31,26 +37,29 @@ class ParticipantDetailsView extends StatelessWidget {
           style: const TextStyle(fontSize: 16.0, color: Colors.black54),
         ),
         const SizedBox(height: 16.0),
-        _buildPerDayStatus(context),
+        _buildPerDayStatus(),
         const SizedBox(height: 16.0),
         _buildColorLegend(),
       ],
     );
   }
 
-  Widget _buildParticipantInfo(BuildContext context) {
+  Widget _buildParticipantInfo(String languageCode) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        _buildInfoRow(tr.monitoring_table_column_participant_id, monitorItem.participantId),
-        _buildInfoRow(tr.monitoring_table_column_invite_code, monitorItem.inviteCode ?? '-'),
+        _buildInfoRow(tr.monitoring_table_column_participant_id,
+            monitorItem.participantId),
+        _buildInfoRow(tr.monitoring_table_column_invite_code,
+            monitorItem.inviteCode ?? '-'),
         _buildInfoRow(
           tr.monitoring_table_column_enrolled,
-          _formatTime(monitorItem.enrolledAt, true),
+          monitorItem.startedAt
+              .toLocalizedString(locale: languageCode, showTime: false),
         ),
         _buildInfoRow(
           tr.monitoring_table_column_last_activity,
-          _formatTime(monitorItem.enrolledAt, true),
+          monitorItem.lastActivityAt.toLocalizedString(locale: languageCode),
         ),
       ],
     );
@@ -68,12 +77,14 @@ class ParticipantDetailsView extends StatelessWidget {
     );
   }
 
-  Widget _buildPerDayStatus(BuildContext context) {
-    assert(monitorItem.missedTasksPerDay.length == monitorItem.completedTasksPerDay.length);
+  Widget _buildPerDayStatus() {
+    assert(monitorItem.missedTasksPerDay.length ==
+        monitorItem.completedTasksPerDay.length);
     return Wrap(
       children: monitorItem.missedTasksPerDay
           .mapIndexed((index, missed) => Tooltip(
-                message: _getTooltipText(missed, monitorItem.completedTasksPerDay[index]),
+                message: _getTooltipText(
+                    missed, monitorItem.completedTasksPerDay[index]),
                 child: Container(
                   height: 50,
                   width: 50,
@@ -81,13 +92,16 @@ class ParticipantDetailsView extends StatelessWidget {
                   decoration: BoxDecoration(
                     color: missed.isEmpty
                         ? Colors.green
-                        : (monitorItem.completedTasksPerDay[index].isEmpty ? Colors.red : Colors.orange),
+                        : (monitorItem.completedTasksPerDay[index].isEmpty
+                            ? Colors.red
+                            : Colors.orange),
                     borderRadius: BorderRadius.circular(8),
                   ),
                   child: Center(
                     child: Text(
                       (index + 1).toString(),
-                      style: const TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
+                      style: const TextStyle(
+                          color: Colors.white, fontWeight: FontWeight.bold),
                     ),
                   ),
                 ),
@@ -96,7 +110,8 @@ class ParticipantDetailsView extends StatelessWidget {
     );
   }
 
-  String _getTooltipText(Set<String> missedTaskIds, Set<String> completedTaskIds) {
+  String _getTooltipText(
+      Set<String> missedTaskIds, Set<String> completedTaskIds) {
     final sb = StringBuffer();
     for (final intervention in interventions) {
       for (final task in intervention.tasks) {
@@ -128,11 +143,14 @@ class ParticipantDetailsView extends StatelessWidget {
         const SizedBox(height: 8.0),
         Row(
           children: [
-            _buildLegendItem(Colors.green, tr.participant_details_color_legend_completed),
+            _buildLegendItem(
+                Colors.green, tr.participant_details_color_legend_completed),
             const SizedBox(width: 16.0),
-            _buildLegendItem(Colors.orange, tr.participant_details_color_legend_partially_completed),
+            _buildLegendItem(Colors.orange,
+                tr.participant_details_color_legend_partially_completed),
             const SizedBox(width: 16.0),
-            _buildLegendItem(Colors.red, tr.participant_details_color_legend_missed),
+            _buildLegendItem(
+                Colors.red, tr.participant_details_color_legend_missed),
           ],
         ),
       ],
@@ -155,15 +173,4 @@ class ParticipantDetailsView extends StatelessWidget {
       ],
     );
   }
-
-  String _formatTime(DateTime time, bool showTime) {
-    final localTime = time.toLocal();
-    final timeZoneOffsetInHours = localTime.timeZoneOffset.inHours;
-    final timeZoneString = timeZoneOffsetInHours >= 0 ? "GMT +$timeZoneOffsetInHours" : "GMT $timeZoneOffsetInHours";
-    final locale = tr.localeName == "de" ? "de_DE" : "en_US";
-    final formattedDate = DateFormat("MMM d, yyyy", locale);
-    if (!showTime) return formattedDate.format(localTime);
-    final formattedTime = DateFormat.jm(locale);
-    return "${formattedDate.format(localTime)}, ${formattedTime.format(localTime)} $timeZoneString";
-  }
 }
diff --git a/designer_v2/lib/features/monitor/study_monitor_page.dart b/designer_v2/lib/features/monitor/study_monitor_page.dart
index 52dbae14e..bb3cbee6b 100644
--- a/designer_v2/lib/features/monitor/study_monitor_page.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_page.dart
@@ -31,6 +31,7 @@ class StudyMonitorScreen extends StudyPageWidget {
               const SizedBox(height: 40.0), // spacing between body elements
               studyMonitorData.items.isNotEmpty
                   ? StudyMonitorTable(
+                      ref: ref,
                       studyMonitorItems: studyMonitorData.items,
                       onSelectItem: (item) => _onSelectParticipant(context, ref, item, study),
                     )
diff --git a/designer_v2/lib/features/monitor/study_monitor_table.dart b/designer_v2/lib/features/monitor/study_monitor_table.dart
index d5999bf62..5e7e43e7a 100644
--- a/designer_v2/lib/features/monitor/study_monitor_table.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_table.dart
@@ -1,24 +1,32 @@
 import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_designer_v2/common_views/standard_table.dart';
 import 'package:studyu_designer_v2/domain/study_monitoring.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/utils/extensions.dart';
+import 'package:studyu_designer_v2/localization/locale_providers.dart';
 
-class StudyMonitorTable extends StatelessWidget {
+class StudyMonitorTable extends ConsumerWidget {
+  final WidgetRef ref;
   final List<StudyMonitorItem> studyMonitorItems;
   final OnSelectHandler<StudyMonitorItem> onSelectItem;
 
-  const StudyMonitorTable({required this.studyMonitorItems, required this.onSelectItem, super.key});
+  const StudyMonitorTable({
+    required this.ref,
+    required this.studyMonitorItems,
+    required this.onSelectItem,
+    super.key,
+  });
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     return StandardTable<StudyMonitorItem>(
       items: studyMonitorItems,
       sortColumnPredicates: [
         (a, b) => a.participantId.compareTo(b.participantId),
-        (a, b) => a.inviteCode != null ? a.inviteCode!.compareTo(b.inviteCode!) : 0,
-        (a, b) => a.enrolledAt.compareTo(b.enrolledAt),
+        (a, b) =>
+            a.inviteCode != null ? a.inviteCode!.compareTo(b.inviteCode!) : 0,
+        (a, b) => a.startedAt.compareTo(b.startedAt),
         (a, b) => a.lastActivityAt.compareTo(b.lastActivityAt),
         (a, b) => a.currentDayOfStudy.compareTo(b.currentDayOfStudy),
         (a, b) => a.completedInterventions.compareTo(b.completedInterventions),
@@ -59,7 +67,7 @@ class StudyMonitorTable extends StatelessWidget {
         StandardTableColumn(
           sortable: true,
           label: tr.monitoring_table_column_completed_surveys,
-          columnWidth: const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.6)),
+          columnWidth: const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.7)),
         ),
       ],
       buildCellsAt: _buildRow,
@@ -71,7 +79,9 @@ class StudyMonitorTable extends StatelessWidget {
     );
   }
 
-  List<Widget> _buildRow(BuildContext context, StudyMonitorItem item, int rowIdx, Set<MaterialState> states) {
+  List<Widget> _buildRow(BuildContext context, StudyMonitorItem item,
+      int rowIdx, Set<WidgetState> states) {
+    final languageCode = ref.watch(localeProvider).languageCode;
     return [
       Tooltip(
         message: item.participantId,
@@ -79,11 +89,12 @@ class StudyMonitorTable extends StatelessWidget {
       ),
       Text(item.inviteCode ?? "-"),
       Tooltip(
-        message: _formatTime(item.enrolledAt, true),
-        child: Text(item.enrolledAt.toTimeAgoString()),
+        message: item.startedAt
+            .toLocalizedString(locale: languageCode, showTime: false),
+        child: Text(item.startedAt.toTimeAgoString()),
       ),
       Tooltip(
-        message: _formatTime(item.lastActivityAt, true),
+        message: item.lastActivityAt.toLocalizedString(locale: languageCode),
         child: Row(
           children: [
             Flexible(child: Text(item.lastActivityAt.toTimeAgoString())),
@@ -93,7 +104,8 @@ class StudyMonitorTable extends StatelessWidget {
                   const SizedBox(width: 5.0),
                   Tooltip(
                     message: tr.monitoring_table_row_tooltip_dropout,
-                    child: const Icon(Icons.close, color: Colors.red, size: 16.0),
+                    child:
+                        const Icon(Icons.close, color: Colors.red, size: 16.0),
                   ),
                 ],
               ),
@@ -106,17 +118,6 @@ class StudyMonitorTable extends StatelessWidget {
     ];
   }
 
-  String _formatTime(DateTime time, bool showTime) {
-    final localTime = time.toLocal();
-    final timeZoneOffsetInHours = localTime.timeZoneOffset.inHours;
-    final timeZoneString = timeZoneOffsetInHours >= 0 ? "GMT +$timeZoneOffsetInHours" : "GMT $timeZoneOffsetInHours";
-    final locale = tr.localeName == "de" ? "de_DE" : "en_US";
-    final formattedDate = DateFormat("MMM d, yyyy", locale);
-    if (!showTime) return formattedDate.format(localTime);
-    final formattedTime = DateFormat.jm(locale);
-    return "${formattedDate.format(localTime)}, ${formattedTime.format(localTime)} $timeZoneString";
-  }
-
   Widget _buildProgressCell(BuildContext context, int progress, int total) {
     final theme = Theme.of(context);
     return Stack(
diff --git a/designer_v2/lib/utils/extensions.dart b/designer_v2/lib/utils/extensions.dart
index d9c697460..f68268b93 100644
--- a/designer_v2/lib/utils/extensions.dart
+++ b/designer_v2/lib/utils/extensions.dart
@@ -1,3 +1,4 @@
+import 'package:intl/intl.dart';
 import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 
@@ -87,6 +88,15 @@ extension DateTimeAgoX on DateTime {
   String toTimeAgoStringPrecise() {
     return _timeAgoFormatted(inSeconds: true);
   }
+
+  toLocalizedString({required String locale, showTime = true}) {
+    final time = toLocal();
+    final formatter = DateFormat.yMMMMd(locale);
+    if (showTime) {
+      return formatter.add_Hm().format(time);
+    }
+    return formatter.format(time);
+  }
 }
 
 typedef ListElementFactory<E> = E Function();

From b699cd90c87753002ec4222ee2fb8f6837b084b5 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 10 Jun 2024 15:28:04 +0200
Subject: [PATCH 104/314] chore: small translation changes

---
 designer_v2/lib/features/monitor/study_monitor_table.dart | 2 +-
 designer_v2/lib/localization/app_de.arb                   | 4 ++--
 designer_v2/lib/localization/app_en.arb                   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/designer_v2/lib/features/monitor/study_monitor_table.dart b/designer_v2/lib/features/monitor/study_monitor_table.dart
index 5e7e43e7a..4a389daa3 100644
--- a/designer_v2/lib/features/monitor/study_monitor_table.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_table.dart
@@ -80,7 +80,7 @@ class StudyMonitorTable extends ConsumerWidget {
   }
 
   List<Widget> _buildRow(BuildContext context, StudyMonitorItem item,
-      int rowIdx, Set<WidgetState> states) {
+      int rowIdx, Set<MaterialState> states) {
     final languageCode = ref.watch(localeProvider).languageCode;
     return [
       Tooltip(
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index 3d3480888..ccec9ce21 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -489,7 +489,7 @@
   "participant_details_study_days_description": "Dieser Abschnitt bietet einen Überblick über die Studientage des Teilnehmers.",
   "participant_details_color_legend_title": "Farblegende:",
   "participant_details_color_legend_completed": "Abgeschlossen",
-  "participant_details_color_legend_partially_completed": "Teilweise Abgeschlossen",
+  "participant_details_color_legend_partially_completed": "Teilweise abgeschlossen",
   "participant_details_color_legend_missed": "Verpasst",
   "monitoring_no_participants_title": "Es gibt noch keine Teilnehmer in dieser Studie",
   "monitoring_no_participants_description": "Sobald Teilnehmer in Ihrer Studie eingeschrieben sind, können Sie hier deren Fortschritt überwachen und ihre Daten einsehen.",
@@ -502,7 +502,7 @@
   "monitoring_completed_tooltip": "Anzahl der Teilnehmer, die das Ende der Studie erreicht haben",
   "monitoring_table_column_participant_id": "Teilnehmer-ID",
   "monitoring_table_column_invite_code": "Einladungscode",
-  "monitoring_table_column_enrolled": "Eingeschrieben",
+  "monitoring_table_column_enrolled": "Studienstart",
   "monitoring_table_column_last_activity": "Letzte Aktivität",
   "monitoring_table_column_day_in_study": "Studientag",
   "monitoring_table_column_completed_interventions": "Abgeschlossene\nInterventionen",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index c56a200c5..289110056 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -549,7 +549,7 @@
   "monitoring_completed_tooltip": "Number of participants who reached the end of the study",
   "monitoring_table_column_participant_id": "Participant ID",
   "monitoring_table_column_invite_code": "Invite Code",
-  "monitoring_table_column_enrolled": "Enrolled",
+  "monitoring_table_column_enrolled": "Started At",
   "monitoring_table_column_last_activity": "Last Activity",
   "monitoring_table_column_day_in_study": "Day in Study",
   "monitoring_table_column_completed_interventions": "Completed\nInterventions",

From 88a96b8a2312de3043b3b26343a9692aa8a842ba Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 19 Apr 2024 23:33:34 +0200
Subject: [PATCH 105/314] refactor: migrate to riverpod code generation

---
 designer_v2/lib/features/app.dart             |    4 +-
 designer_v2/lib/features/app_controller.dart  |   39 +-
 .../lib/features/app_controller.g.dart        |   28 +
 .../lib/features/app_controller_state.dart    |    2 +
 .../design/study_form_controller.dart         |   20 +-
 .../design/study_form_controller.g.dart       |  197 ++
 .../features/design/study_form_providers.dart |  117 +-
 .../design/study_form_providers.g.dart        | 1939 +++++++++++++++++
 .../recruit/invite_code_form_controller.dart  |   11 +-
 .../invite_code_form_controller.g.dart        |  193 ++
 .../recruit/study_recruit_controller.dart     |    2 +-
 .../lib/features/study/study_controller.dart  |   14 +-
 .../features/study/study_test_controller.dart |   10 +-
 .../study/study_test_controller.g.dart        |  163 ++
 .../lib/localization/language_picker.dart     |    4 +-
 .../lib/localization/locale_providers.dart    |   27 +-
 .../lib/localization/locale_providers.g.dart  |   62 +
 .../lib/localization/locale_state.dart        |   16 +-
 .../lib/localization/locale_state.g.dart      |   27 +
 designer_v2/lib/repositories/api_client.dart  |    9 +-
 .../lib/repositories/api_client.g.dart        |   24 +
 .../lib/repositories/auth_repository.dart     |   13 +-
 .../lib/repositories/auth_repository.g.dart   |   25 +
 .../repositories/invite_code_repository.dart  |    9 +-
 .../invite_code_repository.g.dart             |  161 ++
 .../lib/repositories/study_repository.dart    |   14 +-
 .../lib/repositories/study_repository.g.dart  |   25 +
 .../lib/repositories/supabase_client.dart     |   13 +-
 .../lib/repositories/supabase_client.g.dart   |   25 +
 designer_v2/lib/routing/router.dart           |   10 +-
 designer_v2/lib/routing/router.g.dart         |   34 +
 designer_v2/lib/services/clipboard.dart       |    9 +-
 designer_v2/lib/services/clipboard.g.dart     |   26 +
 .../lib/services/notification_service.dart    |   16 +-
 .../lib/services/notification_service.g.dart  |   27 +
 designer_v2/pubspec.yaml                      |    7 +-
 36 files changed, 3145 insertions(+), 177 deletions(-)
 create mode 100644 designer_v2/lib/features/app_controller.g.dart
 create mode 100644 designer_v2/lib/features/design/study_form_controller.g.dart
 create mode 100644 designer_v2/lib/features/design/study_form_providers.g.dart
 create mode 100644 designer_v2/lib/features/recruit/invite_code_form_controller.g.dart
 create mode 100644 designer_v2/lib/features/study/study_test_controller.g.dart
 create mode 100644 designer_v2/lib/localization/locale_providers.g.dart
 create mode 100644 designer_v2/lib/localization/locale_state.g.dart
 create mode 100644 designer_v2/lib/repositories/api_client.g.dart
 create mode 100644 designer_v2/lib/repositories/auth_repository.g.dart
 create mode 100644 designer_v2/lib/repositories/invite_code_repository.g.dart
 create mode 100644 designer_v2/lib/repositories/study_repository.g.dart
 create mode 100644 designer_v2/lib/repositories/supabase_client.g.dart
 create mode 100644 designer_v2/lib/routing/router.g.dart
 create mode 100644 designer_v2/lib/services/clipboard.g.dart
 create mode 100644 designer_v2/lib/services/notification_service.g.dart

diff --git a/designer_v2/lib/features/app.dart b/designer_v2/lib/features/app.dart
index 798f3fcb2..4b7fac349 100644
--- a/designer_v2/lib/features/app.dart
+++ b/designer_v2/lib/features/app.dart
@@ -11,6 +11,8 @@ import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/services/notification_dispatcher.dart';
 import 'package:studyu_designer_v2/theme.dart';
 
+import '../localization/locale_state.dart';
+
 final GlobalKey<ScaffoldMessengerState> scaffoldMessengerKey = GlobalKey();
 
 /// Entry widget of the app.
@@ -54,7 +56,7 @@ class _AppContentState extends ConsumerState<AppContent> {
     // todo move this into appControllerProvider
     WidgetsBinding.instance.addPostFrameCallback((_) async {
       // Locale Startup Actions
-      ref.read(localeStateProvider.notifier).initLocale();
+      ref.read(localeStateNotifierProvider.notifier).initLocale();
     });
   }
 
diff --git a/designer_v2/lib/features/app_controller.dart b/designer_v2/lib/features/app_controller.dart
index d4d916b17..33f99f147 100644
--- a/designer_v2/lib/features/app_controller.dart
+++ b/designer_v2/lib/features/app_controller.dart
@@ -1,9 +1,11 @@
 import 'dart:async';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/features/app_controller_state.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 
+part 'app_controller.g.dart';
+
 /// Interface for implementation by any resources that want to bind themselves
 /// to the application lifecycle
 abstract class IAppDelegate {
@@ -13,18 +15,24 @@ abstract class IAppDelegate {
 typedef _DelegateCallback = Future<bool> Function(IAppDelegate delegate);
 
 /// Main controller that's bound to the top-level application widget's state
-class AppController extends StateNotifier<AppControllerState> {
+@riverpod
+class AppController extends _$AppController {
+  @override
+  AppControllerState build() {
+    _appDelegates = [
+      /// Register [IAppDelegate]s here for invocation of app lifecycle methods
+      ref.watch(authRepositoryProvider),
+    ];
+    return const AppControllerState();
+  }
+
   /// List of listeners for app lifecycle events registered via Riverpod
-  final List<IAppDelegate> appDelegates;
+  late final List<IAppDelegate> _appDelegates;
 
   /// A dummy [Future] used for setting a lower bound on app initialization
   /// (so that the splash screen is shown during this time)
   late final _delayedFuture = Future.delayed(const Duration(milliseconds: Config.minSplashTime), () => true);
 
-  AppController({required this.appDelegates}) : super(const AppControllerState());
-
-  get isInitialized => state.status == AppStatus.initialized;
-
   Future<bool> onAppStart() async {
     // Forward onAppStart to all registered delegates so that they can
     // e.g. read some data from local storage for initialization
@@ -37,7 +45,7 @@ class AppController extends StateNotifier<AppControllerState> {
   Future<bool> _callDelegates(_DelegateCallback function, {withMinDelay = false}) async {
     final List<Future<bool>> delegateFutures = [];
     // Collect all delegated futures
-    for (final delegate in appDelegates) {
+    for (final delegate in _appDelegates) {
       final future = function(delegate);
       delegateFutures.add(future);
     }
@@ -50,18 +58,3 @@ class AppController extends StateNotifier<AppControllerState> {
     return !results.contains(false);
   }
 }
-
-final appControllerProvider = StateNotifierProvider<AppController, AppControllerState>((ref) {
-  final appController = AppController(appDelegates: [
-    /// Register [IAppDelegate]s here for invocation of app lifecycle methods
-    ref.watch(authRepositoryProvider),
-  ]);
-  appController.addListener((state) {
-    print("appController.state updated");
-  });
-  ref.onDispose(() {
-    print("appControllerProvider.DISPOSE");
-  });
-  print("appControllerProvider");
-  return appController;
-});
diff --git a/designer_v2/lib/features/app_controller.g.dart b/designer_v2/lib/features/app_controller.g.dart
new file mode 100644
index 000000000..ea2ecc794
--- /dev/null
+++ b/designer_v2/lib/features/app_controller.g.dart
@@ -0,0 +1,28 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'app_controller.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$appControllerHash() => r'c72d85991f008d5ad6a88ef46b77578f78c32ac5';
+
+/// Main controller that's bound to the top-level application widget's state
+///
+/// Copied from [AppController].
+@ProviderFor(AppController)
+final appControllerProvider =
+    AutoDisposeNotifierProvider<AppController, AppControllerState>.internal(
+  AppController.new,
+  name: r'appControllerProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$appControllerHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef _$AppController = AutoDisposeNotifier<AppControllerState>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/app_controller_state.dart b/designer_v2/lib/features/app_controller_state.dart
index 0dadffb63..5183f31f8 100644
--- a/designer_v2/lib/features/app_controller_state.dart
+++ b/designer_v2/lib/features/app_controller_state.dart
@@ -9,6 +9,8 @@ class AppControllerState extends Equatable {
 
   final AppStatus status;
 
+  get isInitialized => status == AppStatus.initialized;
+
   @override
   List<Object?> get props => [status];
 }
diff --git a/designer_v2/lib/features/design/study_form_controller.dart b/designer_v2/lib/features/design/study_form_controller.dart
index a1e1741a4..f56d6ac16 100644
--- a/designer_v2/lib/features/design/study_form_controller.dart
+++ b/designer_v2/lib/features/design/study_form_controller.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:reactive_forms/reactive_forms.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/features/design/enrollment/enrollment_form_controller.dart';
@@ -24,6 +24,8 @@ import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
 
+part 'study_form_controller.g.dart';
+
 class StudyFormViewModel extends FormViewModel<Study> implements IFormViewModelDelegate<FormViewModel> {
   StudyFormViewModel({
     required this.router,
@@ -162,20 +164,14 @@ class StudyFormViewModel extends FormViewModel<Study> implements IFormViewModelD
 ///
 /// Note: This is not safe to use in widgets (or other providers) that are built
 /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
-final studyFormViewModelProvider = Provider.autoDispose.family<StudyFormViewModel, StudyID>((ref, studyId) {
-  print("studyFormViewModelProvider");
+@riverpod
+StudyFormViewModel studyFormViewModel(StudyFormViewModelRef ref, StudyID studyId) {
+  print("studyFormViewModel");
   final state = ref.watch(studyControllerProvider(studyId));
-  final formViewModel = StudyFormViewModel(
+  return StudyFormViewModel(
     router: ref.watch(routerProvider),
     studyRepository: ref.watch(studyRepositoryProvider),
     authRepository: ref.watch(authRepositoryProvider),
     formData: state.study.value,
   );
-
-  ref.onDispose(() {
-    formViewModel.dispose();
-    print("studyFormViewModelProvider.DISPOSE");
-  });
-
-  return formViewModel;
-});
+}
diff --git a/designer_v2/lib/features/design/study_form_controller.g.dart b/designer_v2/lib/features/design/study_form_controller.g.dart
new file mode 100644
index 000000000..b194bf36c
--- /dev/null
+++ b/designer_v2/lib/features/design/study_form_controller.g.dart
@@ -0,0 +1,197 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'study_form_controller.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$studyFormViewModelHash() =>
+    r'1701792c105e122475442c914b567e7568bf85e8';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+/// Provides the [FormViewModel] that is responsible for displaying and
+/// editing the survey design form.
+///
+/// Note: This is not safe to use in widgets (or other providers) that are built
+/// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+///
+/// Copied from [studyFormViewModel].
+@ProviderFor(studyFormViewModel)
+const studyFormViewModelProvider = StudyFormViewModelFamily();
+
+/// Provides the [FormViewModel] that is responsible for displaying and
+/// editing the survey design form.
+///
+/// Note: This is not safe to use in widgets (or other providers) that are built
+/// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+///
+/// Copied from [studyFormViewModel].
+class StudyFormViewModelFamily extends Family<StudyFormViewModel> {
+  /// Provides the [FormViewModel] that is responsible for displaying and
+  /// editing the survey design form.
+  ///
+  /// Note: This is not safe to use in widgets (or other providers) that are built
+  /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+  ///
+  /// Copied from [studyFormViewModel].
+  const StudyFormViewModelFamily();
+
+  /// Provides the [FormViewModel] that is responsible for displaying and
+  /// editing the survey design form.
+  ///
+  /// Note: This is not safe to use in widgets (or other providers) that are built
+  /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+  ///
+  /// Copied from [studyFormViewModel].
+  StudyFormViewModelProvider call(
+    String studyId,
+  ) {
+    return StudyFormViewModelProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyFormViewModelProvider getProviderOverride(
+    covariant StudyFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyFormViewModelProvider';
+}
+
+/// Provides the [FormViewModel] that is responsible for displaying and
+/// editing the survey design form.
+///
+/// Note: This is not safe to use in widgets (or other providers) that are built
+/// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+///
+/// Copied from [studyFormViewModel].
+class StudyFormViewModelProvider
+    extends AutoDisposeProvider<StudyFormViewModel> {
+  /// Provides the [FormViewModel] that is responsible for displaying and
+  /// editing the survey design form.
+  ///
+  /// Note: This is not safe to use in widgets (or other providers) that are built
+  /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+  ///
+  /// Copied from [studyFormViewModel].
+  StudyFormViewModelProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => studyFormViewModel(
+            ref as StudyFormViewModelRef,
+            studyId,
+          ),
+          from: studyFormViewModelProvider,
+          name: r'studyFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyFormViewModelHash,
+          dependencies: StudyFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              StudyFormViewModelFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    StudyFormViewModel Function(StudyFormViewModelRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyFormViewModelProvider._internal(
+        (ref) => create(ref as StudyFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<StudyFormViewModel> createElement() {
+    return _StudyFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyFormViewModelProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyFormViewModelRef on AutoDisposeProviderRef<StudyFormViewModel> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyFormViewModelProviderElement
+    extends AutoDisposeProviderElement<StudyFormViewModel>
+    with StudyFormViewModelRef {
+  _StudyFormViewModelProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyFormViewModelProvider).studyId;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/design/study_form_providers.dart b/designer_v2/lib/features/design/study_form_providers.dart
index 9688f2aab..b6353cbac 100644
--- a/designer_v2/lib/features/design/study_form_providers.dart
+++ b/designer_v2/lib/features/design/study_form_providers.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/features/design/enrollment/consent_item_form_controller.dart';
 import 'package:studyu_designer_v2/features/design/enrollment/enrollment_form_controller.dart';
@@ -20,112 +20,103 @@ import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/routing/router_config.dart';
 
+part 'study_form_providers.g.dart';
+
 // - Study Info
 
-final studyInfoFormViewModelProvider = Provider.autoDispose.family<StudyInfoFormViewModel, StudyID>((ref, studyId) {
+@riverpod
+StudyInfoFormViewModel studyInfoFormViewModel(StudyInfoFormViewModelRef ref, StudyID studyId) {
   return ref.watch(studyFormViewModelProvider(studyId)).studyInfoFormViewModel;
-});
+}
 
 // - Enrollment
 
-final enrollmentFormViewModelProvider = Provider.autoDispose.family<EnrollmentFormViewModel, StudyID>((ref, studyId) {
+@riverpod
+EnrollmentFormViewModel enrollmentFormViewModel(EnrollmentFormViewModelRef ref, StudyID studyId) {
   return ref.watch(studyFormViewModelProvider(studyId)).enrollmentFormViewModel;
-});
+}
 
-final screenerQuestionFormViewModelProvider =
-    Provider.autoDispose.family<ScreenerQuestionFormViewModel, ScreenerQuestionFormRouteArgs>((ref, args) {
-  final owner = ref.watch(enrollmentFormViewModelProvider(args.studyId));
-  return owner.provide(args);
-});
+@riverpod
+ScreenerQuestionFormViewModel screenerQuestionFormViewModel(ScreenerQuestionFormViewModelRef ref, ScreenerQuestionFormRouteArgs args) {
+  return ref.watch(enrollmentFormViewModelProvider(args.studyId)).provide(args);
+}
 
-final consentItemFormViewModelProvider =
-    Provider.autoDispose.family<ConsentItemFormViewModel, ConsentItemFormRouteArgs>((ref, args) {
-  final owner = ref.watch(enrollmentFormViewModelProvider(args.studyId));
-  return owner.consentItemDelegate.provide(args);
-});
+@riverpod
+ConsentItemFormViewModel consentItemFormViewModel(ConsentItemFormViewModelRef ref, ConsentItemFormRouteArgs args) {
+  return ref.watch(enrollmentFormViewModelProvider(args.studyId)).consentItemDelegate.provide(args);
+}
 
 // - Interventions
 
-final interventionsFormViewModelProvider =
-    Provider.autoDispose.family<InterventionsFormViewModel, StudyID>((ref, studyId) {
+@riverpod
+InterventionsFormViewModel interventionsFormViewModel(InterventionsFormViewModelRef ref, StudyID studyId) {
   return ref.watch(studyFormViewModelProvider(studyId)).interventionsFormViewModel;
-});
+}
 
-final interventionFormViewModelProvider =
-    Provider.autoDispose.family<InterventionFormViewModel, InterventionFormRouteArgs>((ref, args) {
-  final owner = ref.watch(interventionsFormViewModelProvider(args.studyId));
-  return owner.provide(args);
-});
+@riverpod
+InterventionFormViewModel interventionFormViewModel(InterventionFormViewModelRef ref, InterventionFormRouteArgs args) {
+  return ref.watch(interventionsFormViewModelProvider(args.studyId)).provide(args);
+}
 
-final interventionTaskFormViewModelProvider =
-    Provider.autoDispose.family<InterventionTaskFormViewModel, InterventionTaskFormRouteArgs>((ref, args) {
-  final owner = ref.watch(interventionFormViewModelProvider(args));
-  return owner.provide(args);
-});
+@riverpod
+InterventionTaskFormViewModel interventionTaskFormViewModel(InterventionTaskFormViewModelRef ref, InterventionTaskFormRouteArgs args) {
+  return ref.watch(interventionFormViewModelProvider(args)).provide(args);
+}
 
 // - Measurements
 
-final measurementsFormViewModelProvider =
-    Provider.autoDispose.family<MeasurementsFormViewModel, StudyID>((ref, studyId) {
+@riverpod
+MeasurementsFormViewModel measurementsFormViewModel(MeasurementsFormViewModelRef ref, StudyID studyId) {
   return ref.watch(studyFormViewModelProvider(studyId)).measurementsFormViewModel;
-});
+}
 
-final surveyFormViewModelProvider =
-    Provider.autoDispose.family<MeasurementSurveyFormViewModel, MeasurementFormRouteArgs>((ref, args) {
-  final owner = ref.watch(measurementsFormViewModelProvider(args.studyId));
-  return owner.provide(args);
-});
+@riverpod
+MeasurementSurveyFormViewModel surveyFormViewModel(SurveyFormViewModelRef ref, MeasurementFormRouteArgs args) {
+  return ref.watch(measurementsFormViewModelProvider(args.studyId)).provide(args);
+}
 
-final surveyQuestionFormViewModelProvider =
-    Provider.autoDispose.family<QuestionFormViewModel, SurveyQuestionFormRouteArgs>((ref, args) {
-  final owner = ref.watch(surveyFormViewModelProvider(args));
-  return owner.provide(args);
-});
+@riverpod
+QuestionFormViewModel surveyQuestionFormViewModel(SurveyQuestionFormViewModelRef ref, SurveyQuestionFormRouteArgs args) {
+  return ref.watch(surveyFormViewModelProvider(args)).provide(args);
+}
 
 // - Reports
 
-final reportsFormViewModelProvider = Provider.autoDispose.family<ReportsFormViewModel, StudyID>((ref, studyId) {
+@riverpod
+ReportsFormViewModel reportsFormViewModel(ReportsFormViewModelRef ref, StudyID studyId) {
   return ref.watch(studyFormViewModelProvider(studyId)).reportsFormViewModel;
-});
+}
 
-final reportItemFormViewModelProvider =
-    Provider.autoDispose.family<ReportItemFormViewModel, ReportItemFormRouteArgs>((ref, args) {
-  final owner = ref.watch(reportsFormViewModelProvider(args.studyId));
-  return owner.reportItemDelegate.provide(args);
-});
+@riverpod
+ReportItemFormViewModel reportItemFormViewModel(ReportItemFormViewModelRef ref, ReportItemFormRouteArgs args) {
+  return ref.watch(reportsFormViewModelProvider(args.studyId)).reportItemDelegate.provide(args);
+}
 
 // - Validators
 
 /// Provides the [StudyFormViewModel] for validation purposes with
 /// a [StudyFormValidationSet.publish]
-final studyPublishValidatorProvider = Provider.autoDispose.family<StudyFormViewModel, StudyID>((ref, studyId) {
+@riverpod
+StudyFormViewModel studyPublishValidator(StudyPublishValidatorRef ref, StudyID studyId) {
   final state = ref.watch(studyControllerProvider(studyId));
-  final formViewModel = StudyFormViewModel(
+  return StudyFormViewModel(
     router: ref.watch(routerProvider),
     studyRepository: ref.watch(studyRepositoryProvider),
     authRepository: ref.watch(authRepositoryProvider),
     formData: state.study.value,
     validationSet: StudyFormValidationSet.publish,
   );
-  ref.onDispose(() {
-    formViewModel.dispose();
-  });
-  return formViewModel;
-});
+}
 
 /// Provides the [StudyFormViewModel] for validation purposes with
 /// a [StudyFormValidationSet.test]
-final studyTestValidatorProvider = Provider.autoDispose.family<StudyFormViewModel, StudyID>((ref, studyId) {
+@riverpod
+StudyFormViewModel studyTestValidator(StudyTestValidatorRef ref, StudyID studyId) {
   final state = ref.watch(studyControllerProvider(studyId));
-  final formViewModel = StudyFormViewModel(
+  return StudyFormViewModel(
     router: ref.watch(routerProvider),
     studyRepository: ref.watch(studyRepositoryProvider),
     authRepository: ref.watch(authRepositoryProvider),
     formData: state.study.value,
-    validationSet: StudyFormValidationSet.test,
   );
-  ref.onDispose(() {
-    formViewModel.dispose();
-  });
-  return formViewModel;
-});
+}
diff --git a/designer_v2/lib/features/design/study_form_providers.g.dart b/designer_v2/lib/features/design/study_form_providers.g.dart
new file mode 100644
index 000000000..e65a99dff
--- /dev/null
+++ b/designer_v2/lib/features/design/study_form_providers.g.dart
@@ -0,0 +1,1939 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'study_form_providers.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$studyInfoFormViewModelHash() =>
+    r'7f98d180b98a3f7fb550fa61cf9e0b60a0839f1e';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+/// See also [studyInfoFormViewModel].
+@ProviderFor(studyInfoFormViewModel)
+const studyInfoFormViewModelProvider = StudyInfoFormViewModelFamily();
+
+/// See also [studyInfoFormViewModel].
+class StudyInfoFormViewModelFamily extends Family<StudyInfoFormViewModel> {
+  /// See also [studyInfoFormViewModel].
+  const StudyInfoFormViewModelFamily();
+
+  /// See also [studyInfoFormViewModel].
+  StudyInfoFormViewModelProvider call(
+    String studyId,
+  ) {
+    return StudyInfoFormViewModelProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyInfoFormViewModelProvider getProviderOverride(
+    covariant StudyInfoFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyInfoFormViewModelProvider';
+}
+
+/// See also [studyInfoFormViewModel].
+class StudyInfoFormViewModelProvider
+    extends AutoDisposeProvider<StudyInfoFormViewModel> {
+  /// See also [studyInfoFormViewModel].
+  StudyInfoFormViewModelProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => studyInfoFormViewModel(
+            ref as StudyInfoFormViewModelRef,
+            studyId,
+          ),
+          from: studyInfoFormViewModelProvider,
+          name: r'studyInfoFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyInfoFormViewModelHash,
+          dependencies: StudyInfoFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              StudyInfoFormViewModelFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyInfoFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    StudyInfoFormViewModel Function(StudyInfoFormViewModelRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyInfoFormViewModelProvider._internal(
+        (ref) => create(ref as StudyInfoFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<StudyInfoFormViewModel> createElement() {
+    return _StudyInfoFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyInfoFormViewModelProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyInfoFormViewModelRef
+    on AutoDisposeProviderRef<StudyInfoFormViewModel> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyInfoFormViewModelProviderElement
+    extends AutoDisposeProviderElement<StudyInfoFormViewModel>
+    with StudyInfoFormViewModelRef {
+  _StudyInfoFormViewModelProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyInfoFormViewModelProvider).studyId;
+}
+
+String _$enrollmentFormViewModelHash() =>
+    r'f89c53ecf3f90e317a1fbab38a89ae095dc29cca';
+
+/// See also [enrollmentFormViewModel].
+@ProviderFor(enrollmentFormViewModel)
+const enrollmentFormViewModelProvider = EnrollmentFormViewModelFamily();
+
+/// See also [enrollmentFormViewModel].
+class EnrollmentFormViewModelFamily extends Family<EnrollmentFormViewModel> {
+  /// See also [enrollmentFormViewModel].
+  const EnrollmentFormViewModelFamily();
+
+  /// See also [enrollmentFormViewModel].
+  EnrollmentFormViewModelProvider call(
+    String studyId,
+  ) {
+    return EnrollmentFormViewModelProvider(
+      studyId,
+    );
+  }
+
+  @override
+  EnrollmentFormViewModelProvider getProviderOverride(
+    covariant EnrollmentFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'enrollmentFormViewModelProvider';
+}
+
+/// See also [enrollmentFormViewModel].
+class EnrollmentFormViewModelProvider
+    extends AutoDisposeProvider<EnrollmentFormViewModel> {
+  /// See also [enrollmentFormViewModel].
+  EnrollmentFormViewModelProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => enrollmentFormViewModel(
+            ref as EnrollmentFormViewModelRef,
+            studyId,
+          ),
+          from: enrollmentFormViewModelProvider,
+          name: r'enrollmentFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$enrollmentFormViewModelHash,
+          dependencies: EnrollmentFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              EnrollmentFormViewModelFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  EnrollmentFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    EnrollmentFormViewModel Function(EnrollmentFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: EnrollmentFormViewModelProvider._internal(
+        (ref) => create(ref as EnrollmentFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<EnrollmentFormViewModel> createElement() {
+    return _EnrollmentFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is EnrollmentFormViewModelProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin EnrollmentFormViewModelRef
+    on AutoDisposeProviderRef<EnrollmentFormViewModel> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _EnrollmentFormViewModelProviderElement
+    extends AutoDisposeProviderElement<EnrollmentFormViewModel>
+    with EnrollmentFormViewModelRef {
+  _EnrollmentFormViewModelProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as EnrollmentFormViewModelProvider).studyId;
+}
+
+String _$screenerQuestionFormViewModelHash() =>
+    r'3c5615d74c376a66c14dc44738595d0c5a6f972a';
+
+/// See also [screenerQuestionFormViewModel].
+@ProviderFor(screenerQuestionFormViewModel)
+const screenerQuestionFormViewModelProvider =
+    ScreenerQuestionFormViewModelFamily();
+
+/// See also [screenerQuestionFormViewModel].
+class ScreenerQuestionFormViewModelFamily
+    extends Family<ScreenerQuestionFormViewModel> {
+  /// See also [screenerQuestionFormViewModel].
+  const ScreenerQuestionFormViewModelFamily();
+
+  /// See also [screenerQuestionFormViewModel].
+  ScreenerQuestionFormViewModelProvider call(
+    ScreenerQuestionFormRouteArgs args,
+  ) {
+    return ScreenerQuestionFormViewModelProvider(
+      args,
+    );
+  }
+
+  @override
+  ScreenerQuestionFormViewModelProvider getProviderOverride(
+    covariant ScreenerQuestionFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.args,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'screenerQuestionFormViewModelProvider';
+}
+
+/// See also [screenerQuestionFormViewModel].
+class ScreenerQuestionFormViewModelProvider
+    extends AutoDisposeProvider<ScreenerQuestionFormViewModel> {
+  /// See also [screenerQuestionFormViewModel].
+  ScreenerQuestionFormViewModelProvider(
+    ScreenerQuestionFormRouteArgs args,
+  ) : this._internal(
+          (ref) => screenerQuestionFormViewModel(
+            ref as ScreenerQuestionFormViewModelRef,
+            args,
+          ),
+          from: screenerQuestionFormViewModelProvider,
+          name: r'screenerQuestionFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$screenerQuestionFormViewModelHash,
+          dependencies: ScreenerQuestionFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              ScreenerQuestionFormViewModelFamily._allTransitiveDependencies,
+          args: args,
+        );
+
+  ScreenerQuestionFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.args,
+  }) : super.internal();
+
+  final ScreenerQuestionFormRouteArgs args;
+
+  @override
+  Override overrideWith(
+    ScreenerQuestionFormViewModel Function(
+            ScreenerQuestionFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: ScreenerQuestionFormViewModelProvider._internal(
+        (ref) => create(ref as ScreenerQuestionFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        args: args,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<ScreenerQuestionFormViewModel> createElement() {
+    return _ScreenerQuestionFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is ScreenerQuestionFormViewModelProvider && other.args == args;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, args.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin ScreenerQuestionFormViewModelRef
+    on AutoDisposeProviderRef<ScreenerQuestionFormViewModel> {
+  /// The parameter `args` of this provider.
+  ScreenerQuestionFormRouteArgs get args;
+}
+
+class _ScreenerQuestionFormViewModelProviderElement
+    extends AutoDisposeProviderElement<ScreenerQuestionFormViewModel>
+    with ScreenerQuestionFormViewModelRef {
+  _ScreenerQuestionFormViewModelProviderElement(super.provider);
+
+  @override
+  ScreenerQuestionFormRouteArgs get args =>
+      (origin as ScreenerQuestionFormViewModelProvider).args;
+}
+
+String _$consentItemFormViewModelHash() =>
+    r'002af4b4fb26f4815e747107f93a6bdad9bee823';
+
+/// See also [consentItemFormViewModel].
+@ProviderFor(consentItemFormViewModel)
+const consentItemFormViewModelProvider = ConsentItemFormViewModelFamily();
+
+/// See also [consentItemFormViewModel].
+class ConsentItemFormViewModelFamily extends Family<ConsentItemFormViewModel> {
+  /// See also [consentItemFormViewModel].
+  const ConsentItemFormViewModelFamily();
+
+  /// See also [consentItemFormViewModel].
+  ConsentItemFormViewModelProvider call(
+    ConsentItemFormRouteArgs args,
+  ) {
+    return ConsentItemFormViewModelProvider(
+      args,
+    );
+  }
+
+  @override
+  ConsentItemFormViewModelProvider getProviderOverride(
+    covariant ConsentItemFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.args,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'consentItemFormViewModelProvider';
+}
+
+/// See also [consentItemFormViewModel].
+class ConsentItemFormViewModelProvider
+    extends AutoDisposeProvider<ConsentItemFormViewModel> {
+  /// See also [consentItemFormViewModel].
+  ConsentItemFormViewModelProvider(
+    ConsentItemFormRouteArgs args,
+  ) : this._internal(
+          (ref) => consentItemFormViewModel(
+            ref as ConsentItemFormViewModelRef,
+            args,
+          ),
+          from: consentItemFormViewModelProvider,
+          name: r'consentItemFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$consentItemFormViewModelHash,
+          dependencies: ConsentItemFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              ConsentItemFormViewModelFamily._allTransitiveDependencies,
+          args: args,
+        );
+
+  ConsentItemFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.args,
+  }) : super.internal();
+
+  final ConsentItemFormRouteArgs args;
+
+  @override
+  Override overrideWith(
+    ConsentItemFormViewModel Function(ConsentItemFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: ConsentItemFormViewModelProvider._internal(
+        (ref) => create(ref as ConsentItemFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        args: args,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<ConsentItemFormViewModel> createElement() {
+    return _ConsentItemFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is ConsentItemFormViewModelProvider && other.args == args;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, args.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin ConsentItemFormViewModelRef
+    on AutoDisposeProviderRef<ConsentItemFormViewModel> {
+  /// The parameter `args` of this provider.
+  ConsentItemFormRouteArgs get args;
+}
+
+class _ConsentItemFormViewModelProviderElement
+    extends AutoDisposeProviderElement<ConsentItemFormViewModel>
+    with ConsentItemFormViewModelRef {
+  _ConsentItemFormViewModelProviderElement(super.provider);
+
+  @override
+  ConsentItemFormRouteArgs get args =>
+      (origin as ConsentItemFormViewModelProvider).args;
+}
+
+String _$interventionsFormViewModelHash() =>
+    r'8e986de5d8f0a8983792dc91512d21c85344025d';
+
+/// See also [interventionsFormViewModel].
+@ProviderFor(interventionsFormViewModel)
+const interventionsFormViewModelProvider = InterventionsFormViewModelFamily();
+
+/// See also [interventionsFormViewModel].
+class InterventionsFormViewModelFamily
+    extends Family<InterventionsFormViewModel> {
+  /// See also [interventionsFormViewModel].
+  const InterventionsFormViewModelFamily();
+
+  /// See also [interventionsFormViewModel].
+  InterventionsFormViewModelProvider call(
+    String studyId,
+  ) {
+    return InterventionsFormViewModelProvider(
+      studyId,
+    );
+  }
+
+  @override
+  InterventionsFormViewModelProvider getProviderOverride(
+    covariant InterventionsFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'interventionsFormViewModelProvider';
+}
+
+/// See also [interventionsFormViewModel].
+class InterventionsFormViewModelProvider
+    extends AutoDisposeProvider<InterventionsFormViewModel> {
+  /// See also [interventionsFormViewModel].
+  InterventionsFormViewModelProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => interventionsFormViewModel(
+            ref as InterventionsFormViewModelRef,
+            studyId,
+          ),
+          from: interventionsFormViewModelProvider,
+          name: r'interventionsFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$interventionsFormViewModelHash,
+          dependencies: InterventionsFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              InterventionsFormViewModelFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  InterventionsFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    InterventionsFormViewModel Function(InterventionsFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: InterventionsFormViewModelProvider._internal(
+        (ref) => create(ref as InterventionsFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<InterventionsFormViewModel> createElement() {
+    return _InterventionsFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is InterventionsFormViewModelProvider &&
+        other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin InterventionsFormViewModelRef
+    on AutoDisposeProviderRef<InterventionsFormViewModel> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _InterventionsFormViewModelProviderElement
+    extends AutoDisposeProviderElement<InterventionsFormViewModel>
+    with InterventionsFormViewModelRef {
+  _InterventionsFormViewModelProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as InterventionsFormViewModelProvider).studyId;
+}
+
+String _$interventionFormViewModelHash() =>
+    r'c4bbeccc4b19cc3abceb394a213201496c776f75';
+
+/// See also [interventionFormViewModel].
+@ProviderFor(interventionFormViewModel)
+const interventionFormViewModelProvider = InterventionFormViewModelFamily();
+
+/// See also [interventionFormViewModel].
+class InterventionFormViewModelFamily
+    extends Family<InterventionFormViewModel> {
+  /// See also [interventionFormViewModel].
+  const InterventionFormViewModelFamily();
+
+  /// See also [interventionFormViewModel].
+  InterventionFormViewModelProvider call(
+    InterventionFormRouteArgs args,
+  ) {
+    return InterventionFormViewModelProvider(
+      args,
+    );
+  }
+
+  @override
+  InterventionFormViewModelProvider getProviderOverride(
+    covariant InterventionFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.args,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'interventionFormViewModelProvider';
+}
+
+/// See also [interventionFormViewModel].
+class InterventionFormViewModelProvider
+    extends AutoDisposeProvider<InterventionFormViewModel> {
+  /// See also [interventionFormViewModel].
+  InterventionFormViewModelProvider(
+    InterventionFormRouteArgs args,
+  ) : this._internal(
+          (ref) => interventionFormViewModel(
+            ref as InterventionFormViewModelRef,
+            args,
+          ),
+          from: interventionFormViewModelProvider,
+          name: r'interventionFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$interventionFormViewModelHash,
+          dependencies: InterventionFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              InterventionFormViewModelFamily._allTransitiveDependencies,
+          args: args,
+        );
+
+  InterventionFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.args,
+  }) : super.internal();
+
+  final InterventionFormRouteArgs args;
+
+  @override
+  Override overrideWith(
+    InterventionFormViewModel Function(InterventionFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: InterventionFormViewModelProvider._internal(
+        (ref) => create(ref as InterventionFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        args: args,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<InterventionFormViewModel> createElement() {
+    return _InterventionFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is InterventionFormViewModelProvider && other.args == args;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, args.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin InterventionFormViewModelRef
+    on AutoDisposeProviderRef<InterventionFormViewModel> {
+  /// The parameter `args` of this provider.
+  InterventionFormRouteArgs get args;
+}
+
+class _InterventionFormViewModelProviderElement
+    extends AutoDisposeProviderElement<InterventionFormViewModel>
+    with InterventionFormViewModelRef {
+  _InterventionFormViewModelProviderElement(super.provider);
+
+  @override
+  InterventionFormRouteArgs get args =>
+      (origin as InterventionFormViewModelProvider).args;
+}
+
+String _$interventionTaskFormViewModelHash() =>
+    r'58c02adfdf31d7529b49bed1b884d3042f032db0';
+
+/// See also [interventionTaskFormViewModel].
+@ProviderFor(interventionTaskFormViewModel)
+const interventionTaskFormViewModelProvider =
+    InterventionTaskFormViewModelFamily();
+
+/// See also [interventionTaskFormViewModel].
+class InterventionTaskFormViewModelFamily
+    extends Family<InterventionTaskFormViewModel> {
+  /// See also [interventionTaskFormViewModel].
+  const InterventionTaskFormViewModelFamily();
+
+  /// See also [interventionTaskFormViewModel].
+  InterventionTaskFormViewModelProvider call(
+    InterventionTaskFormRouteArgs args,
+  ) {
+    return InterventionTaskFormViewModelProvider(
+      args,
+    );
+  }
+
+  @override
+  InterventionTaskFormViewModelProvider getProviderOverride(
+    covariant InterventionTaskFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.args,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'interventionTaskFormViewModelProvider';
+}
+
+/// See also [interventionTaskFormViewModel].
+class InterventionTaskFormViewModelProvider
+    extends AutoDisposeProvider<InterventionTaskFormViewModel> {
+  /// See also [interventionTaskFormViewModel].
+  InterventionTaskFormViewModelProvider(
+    InterventionTaskFormRouteArgs args,
+  ) : this._internal(
+          (ref) => interventionTaskFormViewModel(
+            ref as InterventionTaskFormViewModelRef,
+            args,
+          ),
+          from: interventionTaskFormViewModelProvider,
+          name: r'interventionTaskFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$interventionTaskFormViewModelHash,
+          dependencies: InterventionTaskFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              InterventionTaskFormViewModelFamily._allTransitiveDependencies,
+          args: args,
+        );
+
+  InterventionTaskFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.args,
+  }) : super.internal();
+
+  final InterventionTaskFormRouteArgs args;
+
+  @override
+  Override overrideWith(
+    InterventionTaskFormViewModel Function(
+            InterventionTaskFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: InterventionTaskFormViewModelProvider._internal(
+        (ref) => create(ref as InterventionTaskFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        args: args,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<InterventionTaskFormViewModel> createElement() {
+    return _InterventionTaskFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is InterventionTaskFormViewModelProvider && other.args == args;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, args.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin InterventionTaskFormViewModelRef
+    on AutoDisposeProviderRef<InterventionTaskFormViewModel> {
+  /// The parameter `args` of this provider.
+  InterventionTaskFormRouteArgs get args;
+}
+
+class _InterventionTaskFormViewModelProviderElement
+    extends AutoDisposeProviderElement<InterventionTaskFormViewModel>
+    with InterventionTaskFormViewModelRef {
+  _InterventionTaskFormViewModelProviderElement(super.provider);
+
+  @override
+  InterventionTaskFormRouteArgs get args =>
+      (origin as InterventionTaskFormViewModelProvider).args;
+}
+
+String _$measurementsFormViewModelHash() =>
+    r'21fe7b97a1c4d44406c44ecc0ac3ba4bcb8dd8c0';
+
+/// See also [measurementsFormViewModel].
+@ProviderFor(measurementsFormViewModel)
+const measurementsFormViewModelProvider = MeasurementsFormViewModelFamily();
+
+/// See also [measurementsFormViewModel].
+class MeasurementsFormViewModelFamily
+    extends Family<MeasurementsFormViewModel> {
+  /// See also [measurementsFormViewModel].
+  const MeasurementsFormViewModelFamily();
+
+  /// See also [measurementsFormViewModel].
+  MeasurementsFormViewModelProvider call(
+    String studyId,
+  ) {
+    return MeasurementsFormViewModelProvider(
+      studyId,
+    );
+  }
+
+  @override
+  MeasurementsFormViewModelProvider getProviderOverride(
+    covariant MeasurementsFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'measurementsFormViewModelProvider';
+}
+
+/// See also [measurementsFormViewModel].
+class MeasurementsFormViewModelProvider
+    extends AutoDisposeProvider<MeasurementsFormViewModel> {
+  /// See also [measurementsFormViewModel].
+  MeasurementsFormViewModelProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => measurementsFormViewModel(
+            ref as MeasurementsFormViewModelRef,
+            studyId,
+          ),
+          from: measurementsFormViewModelProvider,
+          name: r'measurementsFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$measurementsFormViewModelHash,
+          dependencies: MeasurementsFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              MeasurementsFormViewModelFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  MeasurementsFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    MeasurementsFormViewModel Function(MeasurementsFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: MeasurementsFormViewModelProvider._internal(
+        (ref) => create(ref as MeasurementsFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<MeasurementsFormViewModel> createElement() {
+    return _MeasurementsFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is MeasurementsFormViewModelProvider &&
+        other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin MeasurementsFormViewModelRef
+    on AutoDisposeProviderRef<MeasurementsFormViewModel> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _MeasurementsFormViewModelProviderElement
+    extends AutoDisposeProviderElement<MeasurementsFormViewModel>
+    with MeasurementsFormViewModelRef {
+  _MeasurementsFormViewModelProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as MeasurementsFormViewModelProvider).studyId;
+}
+
+String _$surveyFormViewModelHash() =>
+    r'5639e7eecf4014f6359bf8a9d81554b6cc604955';
+
+/// See also [surveyFormViewModel].
+@ProviderFor(surveyFormViewModel)
+const surveyFormViewModelProvider = SurveyFormViewModelFamily();
+
+/// See also [surveyFormViewModel].
+class SurveyFormViewModelFamily extends Family<MeasurementSurveyFormViewModel> {
+  /// See also [surveyFormViewModel].
+  const SurveyFormViewModelFamily();
+
+  /// See also [surveyFormViewModel].
+  SurveyFormViewModelProvider call(
+    MeasurementFormRouteArgs args,
+  ) {
+    return SurveyFormViewModelProvider(
+      args,
+    );
+  }
+
+  @override
+  SurveyFormViewModelProvider getProviderOverride(
+    covariant SurveyFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.args,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'surveyFormViewModelProvider';
+}
+
+/// See also [surveyFormViewModel].
+class SurveyFormViewModelProvider
+    extends AutoDisposeProvider<MeasurementSurveyFormViewModel> {
+  /// See also [surveyFormViewModel].
+  SurveyFormViewModelProvider(
+    MeasurementFormRouteArgs args,
+  ) : this._internal(
+          (ref) => surveyFormViewModel(
+            ref as SurveyFormViewModelRef,
+            args,
+          ),
+          from: surveyFormViewModelProvider,
+          name: r'surveyFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$surveyFormViewModelHash,
+          dependencies: SurveyFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              SurveyFormViewModelFamily._allTransitiveDependencies,
+          args: args,
+        );
+
+  SurveyFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.args,
+  }) : super.internal();
+
+  final MeasurementFormRouteArgs args;
+
+  @override
+  Override overrideWith(
+    MeasurementSurveyFormViewModel Function(SurveyFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: SurveyFormViewModelProvider._internal(
+        (ref) => create(ref as SurveyFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        args: args,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<MeasurementSurveyFormViewModel> createElement() {
+    return _SurveyFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is SurveyFormViewModelProvider && other.args == args;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, args.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin SurveyFormViewModelRef
+    on AutoDisposeProviderRef<MeasurementSurveyFormViewModel> {
+  /// The parameter `args` of this provider.
+  MeasurementFormRouteArgs get args;
+}
+
+class _SurveyFormViewModelProviderElement
+    extends AutoDisposeProviderElement<MeasurementSurveyFormViewModel>
+    with SurveyFormViewModelRef {
+  _SurveyFormViewModelProviderElement(super.provider);
+
+  @override
+  MeasurementFormRouteArgs get args =>
+      (origin as SurveyFormViewModelProvider).args;
+}
+
+String _$surveyQuestionFormViewModelHash() =>
+    r'8359acab6df34eec28b3523b6e0c22cbfa001b66';
+
+/// See also [surveyQuestionFormViewModel].
+@ProviderFor(surveyQuestionFormViewModel)
+const surveyQuestionFormViewModelProvider = SurveyQuestionFormViewModelFamily();
+
+/// See also [surveyQuestionFormViewModel].
+class SurveyQuestionFormViewModelFamily extends Family<QuestionFormViewModel> {
+  /// See also [surveyQuestionFormViewModel].
+  const SurveyQuestionFormViewModelFamily();
+
+  /// See also [surveyQuestionFormViewModel].
+  SurveyQuestionFormViewModelProvider call(
+    SurveyQuestionFormRouteArgs args,
+  ) {
+    return SurveyQuestionFormViewModelProvider(
+      args,
+    );
+  }
+
+  @override
+  SurveyQuestionFormViewModelProvider getProviderOverride(
+    covariant SurveyQuestionFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.args,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'surveyQuestionFormViewModelProvider';
+}
+
+/// See also [surveyQuestionFormViewModel].
+class SurveyQuestionFormViewModelProvider
+    extends AutoDisposeProvider<QuestionFormViewModel> {
+  /// See also [surveyQuestionFormViewModel].
+  SurveyQuestionFormViewModelProvider(
+    SurveyQuestionFormRouteArgs args,
+  ) : this._internal(
+          (ref) => surveyQuestionFormViewModel(
+            ref as SurveyQuestionFormViewModelRef,
+            args,
+          ),
+          from: surveyQuestionFormViewModelProvider,
+          name: r'surveyQuestionFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$surveyQuestionFormViewModelHash,
+          dependencies: SurveyQuestionFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              SurveyQuestionFormViewModelFamily._allTransitiveDependencies,
+          args: args,
+        );
+
+  SurveyQuestionFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.args,
+  }) : super.internal();
+
+  final SurveyQuestionFormRouteArgs args;
+
+  @override
+  Override overrideWith(
+    QuestionFormViewModel Function(SurveyQuestionFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: SurveyQuestionFormViewModelProvider._internal(
+        (ref) => create(ref as SurveyQuestionFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        args: args,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<QuestionFormViewModel> createElement() {
+    return _SurveyQuestionFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is SurveyQuestionFormViewModelProvider && other.args == args;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, args.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin SurveyQuestionFormViewModelRef
+    on AutoDisposeProviderRef<QuestionFormViewModel> {
+  /// The parameter `args` of this provider.
+  SurveyQuestionFormRouteArgs get args;
+}
+
+class _SurveyQuestionFormViewModelProviderElement
+    extends AutoDisposeProviderElement<QuestionFormViewModel>
+    with SurveyQuestionFormViewModelRef {
+  _SurveyQuestionFormViewModelProviderElement(super.provider);
+
+  @override
+  SurveyQuestionFormRouteArgs get args =>
+      (origin as SurveyQuestionFormViewModelProvider).args;
+}
+
+String _$reportsFormViewModelHash() =>
+    r'6deed30173a2c97c7a9096cce168b7bb5890b933';
+
+/// See also [reportsFormViewModel].
+@ProviderFor(reportsFormViewModel)
+const reportsFormViewModelProvider = ReportsFormViewModelFamily();
+
+/// See also [reportsFormViewModel].
+class ReportsFormViewModelFamily extends Family<ReportsFormViewModel> {
+  /// See also [reportsFormViewModel].
+  const ReportsFormViewModelFamily();
+
+  /// See also [reportsFormViewModel].
+  ReportsFormViewModelProvider call(
+    String studyId,
+  ) {
+    return ReportsFormViewModelProvider(
+      studyId,
+    );
+  }
+
+  @override
+  ReportsFormViewModelProvider getProviderOverride(
+    covariant ReportsFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'reportsFormViewModelProvider';
+}
+
+/// See also [reportsFormViewModel].
+class ReportsFormViewModelProvider
+    extends AutoDisposeProvider<ReportsFormViewModel> {
+  /// See also [reportsFormViewModel].
+  ReportsFormViewModelProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => reportsFormViewModel(
+            ref as ReportsFormViewModelRef,
+            studyId,
+          ),
+          from: reportsFormViewModelProvider,
+          name: r'reportsFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$reportsFormViewModelHash,
+          dependencies: ReportsFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              ReportsFormViewModelFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  ReportsFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    ReportsFormViewModel Function(ReportsFormViewModelRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: ReportsFormViewModelProvider._internal(
+        (ref) => create(ref as ReportsFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<ReportsFormViewModel> createElement() {
+    return _ReportsFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is ReportsFormViewModelProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin ReportsFormViewModelRef on AutoDisposeProviderRef<ReportsFormViewModel> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _ReportsFormViewModelProviderElement
+    extends AutoDisposeProviderElement<ReportsFormViewModel>
+    with ReportsFormViewModelRef {
+  _ReportsFormViewModelProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as ReportsFormViewModelProvider).studyId;
+}
+
+String _$reportItemFormViewModelHash() =>
+    r'c2244f6b47445b8c54b061be046e6dd472e1afd6';
+
+/// See also [reportItemFormViewModel].
+@ProviderFor(reportItemFormViewModel)
+const reportItemFormViewModelProvider = ReportItemFormViewModelFamily();
+
+/// See also [reportItemFormViewModel].
+class ReportItemFormViewModelFamily extends Family<ReportItemFormViewModel> {
+  /// See also [reportItemFormViewModel].
+  const ReportItemFormViewModelFamily();
+
+  /// See also [reportItemFormViewModel].
+  ReportItemFormViewModelProvider call(
+    ReportItemFormRouteArgs args,
+  ) {
+    return ReportItemFormViewModelProvider(
+      args,
+    );
+  }
+
+  @override
+  ReportItemFormViewModelProvider getProviderOverride(
+    covariant ReportItemFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.args,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'reportItemFormViewModelProvider';
+}
+
+/// See also [reportItemFormViewModel].
+class ReportItemFormViewModelProvider
+    extends AutoDisposeProvider<ReportItemFormViewModel> {
+  /// See also [reportItemFormViewModel].
+  ReportItemFormViewModelProvider(
+    ReportItemFormRouteArgs args,
+  ) : this._internal(
+          (ref) => reportItemFormViewModel(
+            ref as ReportItemFormViewModelRef,
+            args,
+          ),
+          from: reportItemFormViewModelProvider,
+          name: r'reportItemFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$reportItemFormViewModelHash,
+          dependencies: ReportItemFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              ReportItemFormViewModelFamily._allTransitiveDependencies,
+          args: args,
+        );
+
+  ReportItemFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.args,
+  }) : super.internal();
+
+  final ReportItemFormRouteArgs args;
+
+  @override
+  Override overrideWith(
+    ReportItemFormViewModel Function(ReportItemFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: ReportItemFormViewModelProvider._internal(
+        (ref) => create(ref as ReportItemFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        args: args,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<ReportItemFormViewModel> createElement() {
+    return _ReportItemFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is ReportItemFormViewModelProvider && other.args == args;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, args.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin ReportItemFormViewModelRef
+    on AutoDisposeProviderRef<ReportItemFormViewModel> {
+  /// The parameter `args` of this provider.
+  ReportItemFormRouteArgs get args;
+}
+
+class _ReportItemFormViewModelProviderElement
+    extends AutoDisposeProviderElement<ReportItemFormViewModel>
+    with ReportItemFormViewModelRef {
+  _ReportItemFormViewModelProviderElement(super.provider);
+
+  @override
+  ReportItemFormRouteArgs get args =>
+      (origin as ReportItemFormViewModelProvider).args;
+}
+
+String _$studyPublishValidatorHash() =>
+    r'7052ac418dfb864a61546db1c713351194f2a684';
+
+/// Provides the [StudyFormViewModel] for validation purposes with
+/// a [StudyFormValidationSet.publish]
+///
+/// Copied from [studyPublishValidator].
+@ProviderFor(studyPublishValidator)
+const studyPublishValidatorProvider = StudyPublishValidatorFamily();
+
+/// Provides the [StudyFormViewModel] for validation purposes with
+/// a [StudyFormValidationSet.publish]
+///
+/// Copied from [studyPublishValidator].
+class StudyPublishValidatorFamily extends Family<StudyFormViewModel> {
+  /// Provides the [StudyFormViewModel] for validation purposes with
+  /// a [StudyFormValidationSet.publish]
+  ///
+  /// Copied from [studyPublishValidator].
+  const StudyPublishValidatorFamily();
+
+  /// Provides the [StudyFormViewModel] for validation purposes with
+  /// a [StudyFormValidationSet.publish]
+  ///
+  /// Copied from [studyPublishValidator].
+  StudyPublishValidatorProvider call(
+    String studyId,
+  ) {
+    return StudyPublishValidatorProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyPublishValidatorProvider getProviderOverride(
+    covariant StudyPublishValidatorProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyPublishValidatorProvider';
+}
+
+/// Provides the [StudyFormViewModel] for validation purposes with
+/// a [StudyFormValidationSet.publish]
+///
+/// Copied from [studyPublishValidator].
+class StudyPublishValidatorProvider
+    extends AutoDisposeProvider<StudyFormViewModel> {
+  /// Provides the [StudyFormViewModel] for validation purposes with
+  /// a [StudyFormValidationSet.publish]
+  ///
+  /// Copied from [studyPublishValidator].
+  StudyPublishValidatorProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => studyPublishValidator(
+            ref as StudyPublishValidatorRef,
+            studyId,
+          ),
+          from: studyPublishValidatorProvider,
+          name: r'studyPublishValidatorProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyPublishValidatorHash,
+          dependencies: StudyPublishValidatorFamily._dependencies,
+          allTransitiveDependencies:
+              StudyPublishValidatorFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyPublishValidatorProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    StudyFormViewModel Function(StudyPublishValidatorRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyPublishValidatorProvider._internal(
+        (ref) => create(ref as StudyPublishValidatorRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<StudyFormViewModel> createElement() {
+    return _StudyPublishValidatorProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyPublishValidatorProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyPublishValidatorRef on AutoDisposeProviderRef<StudyFormViewModel> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyPublishValidatorProviderElement
+    extends AutoDisposeProviderElement<StudyFormViewModel>
+    with StudyPublishValidatorRef {
+  _StudyPublishValidatorProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyPublishValidatorProvider).studyId;
+}
+
+String _$studyTestValidatorHash() =>
+    r'207988e121f40ffd2b4b055283baaf78c7a07d2d';
+
+/// Provides the [StudyFormViewModel] for validation purposes with
+/// a [StudyFormValidationSet.test]
+///
+/// Copied from [studyTestValidator].
+@ProviderFor(studyTestValidator)
+const studyTestValidatorProvider = StudyTestValidatorFamily();
+
+/// Provides the [StudyFormViewModel] for validation purposes with
+/// a [StudyFormValidationSet.test]
+///
+/// Copied from [studyTestValidator].
+class StudyTestValidatorFamily extends Family<StudyFormViewModel> {
+  /// Provides the [StudyFormViewModel] for validation purposes with
+  /// a [StudyFormValidationSet.test]
+  ///
+  /// Copied from [studyTestValidator].
+  const StudyTestValidatorFamily();
+
+  /// Provides the [StudyFormViewModel] for validation purposes with
+  /// a [StudyFormValidationSet.test]
+  ///
+  /// Copied from [studyTestValidator].
+  StudyTestValidatorProvider call(
+    String studyId,
+  ) {
+    return StudyTestValidatorProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyTestValidatorProvider getProviderOverride(
+    covariant StudyTestValidatorProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyTestValidatorProvider';
+}
+
+/// Provides the [StudyFormViewModel] for validation purposes with
+/// a [StudyFormValidationSet.test]
+///
+/// Copied from [studyTestValidator].
+class StudyTestValidatorProvider
+    extends AutoDisposeProvider<StudyFormViewModel> {
+  /// Provides the [StudyFormViewModel] for validation purposes with
+  /// a [StudyFormValidationSet.test]
+  ///
+  /// Copied from [studyTestValidator].
+  StudyTestValidatorProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => studyTestValidator(
+            ref as StudyTestValidatorRef,
+            studyId,
+          ),
+          from: studyTestValidatorProvider,
+          name: r'studyTestValidatorProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyTestValidatorHash,
+          dependencies: StudyTestValidatorFamily._dependencies,
+          allTransitiveDependencies:
+              StudyTestValidatorFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyTestValidatorProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    StudyFormViewModel Function(StudyTestValidatorRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyTestValidatorProvider._internal(
+        (ref) => create(ref as StudyTestValidatorRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<StudyFormViewModel> createElement() {
+    return _StudyTestValidatorProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyTestValidatorProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyTestValidatorRef on AutoDisposeProviderRef<StudyFormViewModel> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyTestValidatorProviderElement
+    extends AutoDisposeProviderElement<StudyFormViewModel>
+    with StudyTestValidatorRef {
+  _StudyTestValidatorProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyTestValidatorProvider).studyId;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/recruit/invite_code_form_controller.dart b/designer_v2/lib/features/recruit/invite_code_form_controller.dart
index 34ac2d93f..ffb1b693f 100644
--- a/designer_v2/lib/features/recruit/invite_code_form_controller.dart
+++ b/designer_v2/lib/features/recruit/invite_code_form_controller.dart
@@ -1,5 +1,5 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:reactive_forms/reactive_forms.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
@@ -10,6 +10,8 @@ import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/repositories/invite_code_repository.dart';
 import 'package:uuid/uuid.dart';
 
+part 'invite_code_form_controller.g.dart';
+
 class InviteCodeFormViewModel extends FormViewModel<StudyInvite> {
   InviteCodeFormViewModel({required this.study, required this.inviteCodeRepository}) : super();
 
@@ -114,11 +116,12 @@ class InviteCodeFormViewModel extends FormViewModel<StudyInvite> {
   }
 }
 
-/// Use the [family] modifier to provide a controller parametrized by [StudyID]
+/// Provide a controller parametrized by [StudyID]
 ///
 /// Note: This is not safe to use in widgets (or other providers) that are built
 /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
-final inviteCodeFormViewModelProvider = Provider.autoDispose.family<InviteCodeFormViewModel, StudyID>((ref, studyId) {
+@riverpod
+InviteCodeFormViewModel inviteCodeFormViewModel(InviteCodeFormViewModelRef ref, StudyID studyId) {
   print("inviteCodeFormViewModelProvider($studyId");
   // Reactively bind to and obtain [StudyController]'s current study
   final study = ref.watch(studyControllerProvider(studyId).select((state) => state.study));
@@ -128,4 +131,4 @@ final inviteCodeFormViewModelProvider = Provider.autoDispose.family<InviteCodeFo
     study: study.value!,
     inviteCodeRepository: inviteCodeRepository,
   );
-});
+}
diff --git a/designer_v2/lib/features/recruit/invite_code_form_controller.g.dart b/designer_v2/lib/features/recruit/invite_code_form_controller.g.dart
new file mode 100644
index 000000000..c11202adf
--- /dev/null
+++ b/designer_v2/lib/features/recruit/invite_code_form_controller.g.dart
@@ -0,0 +1,193 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'invite_code_form_controller.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$inviteCodeFormViewModelHash() =>
+    r'e3de1f19dc318e720664ee06c884a2d193b4c688';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+/// Provide a controller parametrized by [StudyID]
+///
+/// Note: This is not safe to use in widgets (or other providers) that are built
+/// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+///
+/// Copied from [inviteCodeFormViewModel].
+@ProviderFor(inviteCodeFormViewModel)
+const inviteCodeFormViewModelProvider = InviteCodeFormViewModelFamily();
+
+/// Provide a controller parametrized by [StudyID]
+///
+/// Note: This is not safe to use in widgets (or other providers) that are built
+/// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+///
+/// Copied from [inviteCodeFormViewModel].
+class InviteCodeFormViewModelFamily extends Family<InviteCodeFormViewModel> {
+  /// Provide a controller parametrized by [StudyID]
+  ///
+  /// Note: This is not safe to use in widgets (or other providers) that are built
+  /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+  ///
+  /// Copied from [inviteCodeFormViewModel].
+  const InviteCodeFormViewModelFamily();
+
+  /// Provide a controller parametrized by [StudyID]
+  ///
+  /// Note: This is not safe to use in widgets (or other providers) that are built
+  /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+  ///
+  /// Copied from [inviteCodeFormViewModel].
+  InviteCodeFormViewModelProvider call(
+    String studyId,
+  ) {
+    return InviteCodeFormViewModelProvider(
+      studyId,
+    );
+  }
+
+  @override
+  InviteCodeFormViewModelProvider getProviderOverride(
+    covariant InviteCodeFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'inviteCodeFormViewModelProvider';
+}
+
+/// Provide a controller parametrized by [StudyID]
+///
+/// Note: This is not safe to use in widgets (or other providers) that are built
+/// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+///
+/// Copied from [inviteCodeFormViewModel].
+class InviteCodeFormViewModelProvider
+    extends AutoDisposeProvider<InviteCodeFormViewModel> {
+  /// Provide a controller parametrized by [StudyID]
+  ///
+  /// Note: This is not safe to use in widgets (or other providers) that are built
+  /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+  ///
+  /// Copied from [inviteCodeFormViewModel].
+  InviteCodeFormViewModelProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => inviteCodeFormViewModel(
+            ref as InviteCodeFormViewModelRef,
+            studyId,
+          ),
+          from: inviteCodeFormViewModelProvider,
+          name: r'inviteCodeFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$inviteCodeFormViewModelHash,
+          dependencies: InviteCodeFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              InviteCodeFormViewModelFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  InviteCodeFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    InviteCodeFormViewModel Function(InviteCodeFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: InviteCodeFormViewModelProvider._internal(
+        (ref) => create(ref as InviteCodeFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<InviteCodeFormViewModel> createElement() {
+    return _InviteCodeFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is InviteCodeFormViewModelProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin InviteCodeFormViewModelRef
+    on AutoDisposeProviderRef<InviteCodeFormViewModel> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _InviteCodeFormViewModelProviderElement
+    extends AutoDisposeProviderElement<InviteCodeFormViewModel>
+    with InviteCodeFormViewModelRef {
+  _InviteCodeFormViewModelProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as InviteCodeFormViewModelProvider).studyId;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/recruit/study_recruit_controller.dart b/designer_v2/lib/features/recruit/study_recruit_controller.dart
index 909024b0a..154f46bb4 100644
--- a/designer_v2/lib/features/recruit/study_recruit_controller.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_controller.dart
@@ -79,7 +79,7 @@ class StudyRecruitController extends StudyBaseController<StudyRecruitControllerS
   }
 }
 
-/// Use the [family] modifier to provide a controller parametrized by [StudyID]
+/// Provide a controller parametrized by [StudyID]
 final studyRecruitControllerProvider = StateNotifierProvider.autoDispose
     .family<StudyRecruitController, StudyRecruitControllerState, StudyID>((ref, studyId) {
   return StudyRecruitController(
diff --git a/designer_v2/lib/features/study/study_controller.dart b/designer_v2/lib/features/study/study_controller.dart
index 2edbd13dd..da398c3db 100644
--- a/designer_v2/lib/features/study/study_controller.dart
+++ b/designer_v2/lib/features/study/study_controller.dart
@@ -34,7 +34,7 @@ class StudyController extends StudyBaseController<StudyControllerState> {
     if (studyEventsSubscription != null) {
       studyEventsSubscription?.cancel();
     }
-    studyEventsSubscription = studyRepository.watchChanges(studyId).listen((event) {
+    studyEventsSubscription = this.studyRepository.watchChanges(studyId).listen((event) {
       if (event is IsSaving) {
         state = state.copyWith(
           syncState: const AsyncValue.loading(),
@@ -61,7 +61,7 @@ class StudyController extends StudyBaseController<StudyControllerState> {
   /// when building subroutes
   _redirectNewToActualStudyID(StudyID actualStudyId) {
     if (studyId == Config.newModelId) {
-      router.dispatch(RoutingIntents.study(actualStudyId));
+      this.router.dispatch(RoutingIntents.study(actualStudyId));
     }
   }
 
@@ -72,26 +72,26 @@ class StudyController extends StudyBaseController<StudyControllerState> {
     }
     // filter out edit action since we are already editing the study
     return withIcons(
-        studyRepository.availableActions(study).where((action) => action.type != StudyActionType.edit).toList(),
+        this.studyRepository.availableActions(study).where((action) => action.type != StudyActionType.edit).toList(),
         studyActionIcons);
   }
 
   Future publishStudy({toRegistry = false}) {
     final study = state.study.value!;
     study.registryPublished = toRegistry;
-    return studyRepository.launch(study);
+    return this.studyRepository.launch(study);
   }
 
   void onChangeStudyParticipation() {
-    router.dispatch(RoutingIntents.studyEditEnrollment(studyId));
+    this.router.dispatch(RoutingIntents.studyEditEnrollment(studyId));
   }
 
   void onAddParticipants() {
-    router.dispatch(RoutingIntents.studyRecruit(studyId));
+    this.router.dispatch(RoutingIntents.studyRecruit(studyId));
   }
 
   void onSettingsPressed() {
-    router.dispatch(RoutingIntents.studySettings(studyId));
+    this.router.dispatch(RoutingIntents.studySettings(studyId));
   }
 
   @override
diff --git a/designer_v2/lib/features/study/study_test_controller.dart b/designer_v2/lib/features/study/study_test_controller.dart
index 71d1cb81b..e6c1cd400 100644
--- a/designer_v2/lib/features/study/study_test_controller.dart
+++ b/designer_v2/lib/features/study/study_test_controller.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/features/study/study_base_controller.dart';
 import 'package:studyu_designer_v2/features/study/study_test_controller_state.dart';
@@ -10,6 +11,8 @@ import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
 
+part 'study_test_controller.g.dart';
+
 class StudyTestController extends StudyBaseController<StudyTestControllerState> {
   StudyTestController({
     required super.studyId,
@@ -53,9 +56,9 @@ final studyTestControllerProvider =
   return controller;
 });
 
-final studyTestPlatformControllerProvider = Provider.family<PlatformController, StudyID>((ref, studyId) {
+@riverpod
+PlatformController studyTestPlatformController(StudyTestPlatformControllerRef ref, StudyID studyId) {
   final state = ref.watch(studyTestControllerProvider(studyId));
-
   PlatformController platformController;
   if (!kIsWeb) {
     // Mobile could be built with the webview_flutter package
@@ -64,6 +67,5 @@ final studyTestPlatformControllerProvider = Provider.family<PlatformController,
     // Desktop and Web
     platformController = WebController(state.appUrl, studyId);
   }
-
   return platformController;
-});
+}
diff --git a/designer_v2/lib/features/study/study_test_controller.g.dart b/designer_v2/lib/features/study/study_test_controller.g.dart
new file mode 100644
index 000000000..44a3a547c
--- /dev/null
+++ b/designer_v2/lib/features/study/study_test_controller.g.dart
@@ -0,0 +1,163 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'study_test_controller.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$studyTestPlatformControllerHash() =>
+    r'c09a0c6ecb0040703fa5fe35c927aa40c6a47a84';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+/// See also [studyTestPlatformController].
+@ProviderFor(studyTestPlatformController)
+const studyTestPlatformControllerProvider = StudyTestPlatformControllerFamily();
+
+/// See also [studyTestPlatformController].
+class StudyTestPlatformControllerFamily extends Family<PlatformController> {
+  /// See also [studyTestPlatformController].
+  const StudyTestPlatformControllerFamily();
+
+  /// See also [studyTestPlatformController].
+  StudyTestPlatformControllerProvider call(
+    String studyId,
+  ) {
+    return StudyTestPlatformControllerProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyTestPlatformControllerProvider getProviderOverride(
+    covariant StudyTestPlatformControllerProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyTestPlatformControllerProvider';
+}
+
+/// See also [studyTestPlatformController].
+class StudyTestPlatformControllerProvider
+    extends AutoDisposeProvider<PlatformController> {
+  /// See also [studyTestPlatformController].
+  StudyTestPlatformControllerProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => studyTestPlatformController(
+            ref as StudyTestPlatformControllerRef,
+            studyId,
+          ),
+          from: studyTestPlatformControllerProvider,
+          name: r'studyTestPlatformControllerProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyTestPlatformControllerHash,
+          dependencies: StudyTestPlatformControllerFamily._dependencies,
+          allTransitiveDependencies:
+              StudyTestPlatformControllerFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyTestPlatformControllerProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    PlatformController Function(StudyTestPlatformControllerRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyTestPlatformControllerProvider._internal(
+        (ref) => create(ref as StudyTestPlatformControllerRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<PlatformController> createElement() {
+    return _StudyTestPlatformControllerProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyTestPlatformControllerProvider &&
+        other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyTestPlatformControllerRef
+    on AutoDisposeProviderRef<PlatformController> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyTestPlatformControllerProviderElement
+    extends AutoDisposeProviderElement<PlatformController>
+    with StudyTestPlatformControllerRef {
+  _StudyTestPlatformControllerProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyTestPlatformControllerProvider).studyId;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/localization/language_picker.dart b/designer_v2/lib/localization/language_picker.dart
index a4db6910f..febc58ac9 100644
--- a/designer_v2/lib/localization/language_picker.dart
+++ b/designer_v2/lib/localization/language_picker.dart
@@ -7,6 +7,8 @@ import 'package:studyu_designer_v2/localization/locale_providers.dart';
 import 'package:studyu_designer_v2/localization/locale_translate_name.dart';
 import 'package:studyu_designer_v2/utils/font.dart';
 
+import 'locale_state.dart';
+
 enum LanguagePickerType { field, icon }
 
 class LanguagePicker extends ConsumerStatefulWidget {
@@ -28,7 +30,7 @@ class LanguagePicker extends ConsumerStatefulWidget {
 class _LanguagePickerState extends ConsumerState<LanguagePicker> {
   @override
   Widget build(BuildContext context) {
-    final controller = ref.watch(localeStateProvider.notifier);
+    final controller = ref.watch(localeStateNotifierProvider.notifier);
     final currentLocalization = ref.watch(localeProvider.select((value) => value));
     switch (widget.languagePickerType) {
       case LanguagePickerType.field:
diff --git a/designer_v2/lib/localization/locale_providers.dart b/designer_v2/lib/localization/locale_providers.dart
index 0810d079d..075e89dd3 100644
--- a/designer_v2/lib/localization/locale_providers.dart
+++ b/designer_v2/lib/localization/locale_providers.dart
@@ -1,29 +1,30 @@
 import 'dart:ui';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/localization/platform_locale/platform_locale_interface.dart';
 
 import 'locale_state.dart';
 
+part 'locale_providers.g.dart';
+
 /// Platform Locale Provider
 /// Returns the locale of the Platform.localeName
-final platformLocaleProvider = Provider<Locale>((_) {
+@riverpod
+Locale platformLocale(PlatformLocaleRef ref) {
   // Get the platform language using platform specific implementations
-  Locale platformLocale = PlatformLocale().getPlatformLocale();
-
-  return platformLocale;
-});
+  return PlatformLocale().getPlatformLocale();
+}
 
 /// Supported Locales Provider
-final supportedLocalesProvider = Provider<List<Locale>>((_) {
+@riverpod
+List<Locale> supportedLocales(SupportedLocalesRef ref) {
   return Config.supportedLocales.entries.map((e) => Locale(e.key, e.value)).toList();
-});
+}
 
 /// Locale Provider
 /// Provides the current locale, and automatically updates when the locale changes.
-final localeProvider = Provider<Locale>((ref) {
-  return ref.watch(localeStateProvider).locale;
-});
-
-final localeStateProvider = StateNotifierProvider<LocaleStateNotifier, LocaleState>((ref) => LocaleStateNotifier(ref));
+@riverpod
+Locale locale(LocaleRef ref) {
+  return ref.watch(localeStateNotifierProvider).locale;
+}
diff --git a/designer_v2/lib/localization/locale_providers.g.dart b/designer_v2/lib/localization/locale_providers.g.dart
new file mode 100644
index 000000000..0f71478e2
--- /dev/null
+++ b/designer_v2/lib/localization/locale_providers.g.dart
@@ -0,0 +1,62 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'locale_providers.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$platformLocaleHash() => r'a84e9e99af5cc228a9c3804c7b4b834044dff6d1';
+
+/// Platform Locale Provider
+/// Returns the locale of the Platform.localeName
+///
+/// Copied from [platformLocale].
+@ProviderFor(platformLocale)
+final platformLocaleProvider = AutoDisposeProvider<Locale>.internal(
+  platformLocale,
+  name: r'platformLocaleProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$platformLocaleHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef PlatformLocaleRef = AutoDisposeProviderRef<Locale>;
+String _$supportedLocalesHash() => r'5668fd6c2cb7ae6ce48a909d39d947d6ee61236a';
+
+/// Supported Locales Provider
+///
+/// Copied from [supportedLocales].
+@ProviderFor(supportedLocales)
+final supportedLocalesProvider = AutoDisposeProvider<List<Locale>>.internal(
+  supportedLocales,
+  name: r'supportedLocalesProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$supportedLocalesHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef SupportedLocalesRef = AutoDisposeProviderRef<List<Locale>>;
+String _$localeHash() => r'575c8d69cac8ac079fbb4a4d4b2307512dcfc728';
+
+/// Locale Provider
+/// Provides the current locale, and automatically updates when the locale changes.
+///
+/// Copied from [locale].
+@ProviderFor(locale)
+final localeProvider = AutoDisposeProvider<Locale>.internal(
+  locale,
+  name: r'localeProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product') ? null : _$localeHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef LocaleRef = AutoDisposeProviderRef<Locale>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/localization/locale_state.dart b/designer_v2/lib/localization/locale_state.dart
index 6bbc561d1..01d1d814f 100644
--- a/designer_v2/lib/localization/locale_state.dart
+++ b/designer_v2/lib/localization/locale_state.dart
@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_flutter_common/studyu_flutter_common.dart';
 
 import 'locale_providers.dart';
 
+part 'locale_state.g.dart';
+
 Locale fallbackLocale = Locale(Config.defaultLocale.first, Config.defaultLocale.last);
 
 @immutable
@@ -18,11 +20,17 @@ class LocaleState {
   }
 }
 
-class LocaleStateNotifier extends StateNotifier<LocaleState> {
-  final Ref ref;
+@riverpod
+class LocaleStateNotifier extends _$LocaleStateNotifier {
+
+  @override
+  LocaleState build() {
+    return LocaleState(fallbackLocale);
+  }
+
   static const _localStorageKey = 'lang';
 
-  LocaleStateNotifier(this.ref) : super(LocaleState(fallbackLocale));
+  //LocaleStateNotifier(this.ref) : super(LocaleState(fallbackLocale));
 
   /// Initialize Locale
   /// Can be run at startup to establish the initial local from storage, or the platform
diff --git a/designer_v2/lib/localization/locale_state.g.dart b/designer_v2/lib/localization/locale_state.g.dart
new file mode 100644
index 000000000..b6b7db0f2
--- /dev/null
+++ b/designer_v2/lib/localization/locale_state.g.dart
@@ -0,0 +1,27 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'locale_state.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$localeStateNotifierHash() =>
+    r'726764926faff3bc76af0f45fdd750e75014291f';
+
+/// See also [LocaleStateNotifier].
+@ProviderFor(LocaleStateNotifier)
+final localeStateNotifierProvider =
+    AutoDisposeNotifierProvider<LocaleStateNotifier, LocaleState>.internal(
+  LocaleStateNotifier.new,
+  name: r'localeStateNotifierProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$localeStateNotifierHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef _$LocaleStateNotifier = AutoDisposeNotifier<LocaleState>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/repositories/api_client.dart b/designer_v2/lib/repositories/api_client.dart
index 5f82534c8..d0c5ea226 100644
--- a/designer_v2/lib/repositories/api_client.dart
+++ b/designer_v2/lib/repositories/api_client.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/domain/study_subject.dart';
@@ -8,6 +8,8 @@ import 'package:studyu_designer_v2/repositories/supabase_client.dart';
 import 'package:studyu_designer_v2/utils/debug_print.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 
+part 'api_client.g.dart';
+
 abstract class StudyUApi {
   Future<Study> saveStudy(Study study);
   Future<Study> fetchStudy(StudyID studyId);
@@ -232,6 +234,7 @@ class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin im
   }
 }
 
-final apiClientProvider = riverpod.Provider<StudyUApi>((ref) => StudyUApiClient(
+@riverpod
+StudyUApiClient apiClient(ApiClientRef ref) => StudyUApiClient(
       supabaseClient: ref.watch(supabaseClientProvider),
-    ));
+    );
\ No newline at end of file
diff --git a/designer_v2/lib/repositories/api_client.g.dart b/designer_v2/lib/repositories/api_client.g.dart
new file mode 100644
index 000000000..0a41b7cd2
--- /dev/null
+++ b/designer_v2/lib/repositories/api_client.g.dart
@@ -0,0 +1,24 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'api_client.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$apiClientHash() => r'826df747926efc2d5519c65db1adbb05fff488f4';
+
+/// See also [apiClient].
+@ProviderFor(apiClient)
+final apiClientProvider = AutoDisposeProvider<StudyUApiClient>.internal(
+  apiClient,
+  name: r'apiClientProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product') ? null : _$apiClientHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef ApiClientRef = AutoDisposeProviderRef<StudyUApiClient>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/repositories/auth_repository.dart b/designer_v2/lib/repositories/auth_repository.dart
index c1ea03484..097ac003d 100644
--- a/designer_v2/lib/repositories/auth_repository.dart
+++ b/designer_v2/lib/repositories/auth_repository.dart
@@ -1,13 +1,15 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:rxdart/subjects.dart';
 import 'package:studyu_designer_v2/features/app_controller.dart';
 import 'package:studyu_designer_v2/repositories/supabase_client.dart';
 import 'package:studyu_designer_v2/utils/behaviour_subject.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 
+part 'auth_repository.g.dart';
+
 abstract class IAuthRepository extends IAppDelegate {
   // - Authentication
   User? get currentUser;
@@ -150,13 +152,10 @@ class AuthRepository implements IAuthRepository {
   }
 }
 
-final authRepositoryProvider = riverpod.Provider<IAuthRepository>((ref) {
+@riverpod
+AuthRepository authRepository(AuthRepositoryRef ref) {
   final authRepository = AuthRepository(
     supabaseClient: ref.watch(supabaseClientProvider),
   );
-  // Bind lifecycle to Riverpod
-  ref.onDispose(() {
-    authRepository.dispose();
-  });
   return authRepository;
-});
+}
\ No newline at end of file
diff --git a/designer_v2/lib/repositories/auth_repository.g.dart b/designer_v2/lib/repositories/auth_repository.g.dart
new file mode 100644
index 000000000..05d71f114
--- /dev/null
+++ b/designer_v2/lib/repositories/auth_repository.g.dart
@@ -0,0 +1,25 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'auth_repository.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$authRepositoryHash() => r'8f0a9fc8fb1b812cbea5c198a61e7ed065b36f42';
+
+/// See also [authRepository].
+@ProviderFor(authRepository)
+final authRepositoryProvider = AutoDisposeProvider<AuthRepository>.internal(
+  authRepository,
+  name: r'authRepositoryProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$authRepositoryHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef AuthRepositoryRef = AutoDisposeProviderRef<AuthRepository>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/repositories/invite_code_repository.dart b/designer_v2/lib/repositories/invite_code_repository.dart
index 6dcbd77e4..48e846544 100644
--- a/designer_v2/lib/repositories/invite_code_repository.dart
+++ b/designer_v2/lib/repositories/invite_code_repository.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/repositories/api_client.dart';
@@ -13,6 +13,8 @@ import 'package:studyu_designer_v2/services/notifications.dart';
 import 'package:studyu_designer_v2/utils/model_action.dart';
 import 'package:studyu_designer_v2/utils/optimistic_update.dart';
 
+part 'invite_code_repository.g.dart';
+
 abstract class IInviteCodeRepository implements ModelRepository<StudyInvite> {
   Future<bool> isCodeAlreadyUsed(String code);
 }
@@ -186,7 +188,8 @@ class InviteCodeRepositoryDelegate extends IModelRepositoryDelegate<StudyInvite>
   }
 }
 
-final inviteCodeRepositoryProvider = Provider.autoDispose.family<IInviteCodeRepository, StudyID>((ref, studyId) {
+@riverpod
+InviteCodeRepository inviteCodeRepository(InviteCodeRepositoryRef ref, StudyID studyId) {
   print("inviteCodeRepositoryProvider($studyId");
   // Initialize repository for a given study
   final repository = InviteCodeRepository(
@@ -202,4 +205,4 @@ final inviteCodeRepositoryProvider = Provider.autoDispose.family<IInviteCodeRepo
     repository.dispose();
   });
   return repository;
-});
+}
diff --git a/designer_v2/lib/repositories/invite_code_repository.g.dart b/designer_v2/lib/repositories/invite_code_repository.g.dart
new file mode 100644
index 000000000..f83a84c4b
--- /dev/null
+++ b/designer_v2/lib/repositories/invite_code_repository.g.dart
@@ -0,0 +1,161 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'invite_code_repository.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$inviteCodeRepositoryHash() =>
+    r'6e64d53ba64268495919cd6dc28d55ee5fa1e5e8';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+/// See also [inviteCodeRepository].
+@ProviderFor(inviteCodeRepository)
+const inviteCodeRepositoryProvider = InviteCodeRepositoryFamily();
+
+/// See also [inviteCodeRepository].
+class InviteCodeRepositoryFamily extends Family<InviteCodeRepository> {
+  /// See also [inviteCodeRepository].
+  const InviteCodeRepositoryFamily();
+
+  /// See also [inviteCodeRepository].
+  InviteCodeRepositoryProvider call(
+    String studyId,
+  ) {
+    return InviteCodeRepositoryProvider(
+      studyId,
+    );
+  }
+
+  @override
+  InviteCodeRepositoryProvider getProviderOverride(
+    covariant InviteCodeRepositoryProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'inviteCodeRepositoryProvider';
+}
+
+/// See also [inviteCodeRepository].
+class InviteCodeRepositoryProvider
+    extends AutoDisposeProvider<InviteCodeRepository> {
+  /// See also [inviteCodeRepository].
+  InviteCodeRepositoryProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => inviteCodeRepository(
+            ref as InviteCodeRepositoryRef,
+            studyId,
+          ),
+          from: inviteCodeRepositoryProvider,
+          name: r'inviteCodeRepositoryProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$inviteCodeRepositoryHash,
+          dependencies: InviteCodeRepositoryFamily._dependencies,
+          allTransitiveDependencies:
+              InviteCodeRepositoryFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  InviteCodeRepositoryProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    InviteCodeRepository Function(InviteCodeRepositoryRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: InviteCodeRepositoryProvider._internal(
+        (ref) => create(ref as InviteCodeRepositoryRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<InviteCodeRepository> createElement() {
+    return _InviteCodeRepositoryProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is InviteCodeRepositoryProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin InviteCodeRepositoryRef on AutoDisposeProviderRef<InviteCodeRepository> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _InviteCodeRepositoryProviderElement
+    extends AutoDisposeProviderElement<InviteCodeRepository>
+    with InviteCodeRepositoryRef {
+  _InviteCodeRepositoryProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as InviteCodeRepositoryProvider).studyId;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/repositories/study_repository.dart b/designer_v2/lib/repositories/study_repository.dart
index c02dbbb9f..cad5ee7ac 100644
--- a/designer_v2/lib/repositories/study_repository.dart
+++ b/designer_v2/lib/repositories/study_repository.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/domain/study_export.dart';
@@ -17,6 +17,8 @@ import 'package:studyu_designer_v2/utils/model_action.dart';
 import 'package:studyu_designer_v2/utils/optimistic_update.dart';
 import 'package:studyu_designer_v2/utils/performance.dart';
 
+part 'study_repository.g.dart';
+
 abstract class IStudyRepository implements ModelRepository<Study> {
   Future<void> launch(Study study);
   Future<void> deleteParticipants(Study study);
@@ -216,15 +218,9 @@ class StudyRepositoryDelegate extends IModelRepositoryDelegate<Study> {
   }
 }
 
-final studyRepositoryProvider = Provider<IStudyRepository>((ref) {
-  final studyRepository = StudyRepository(
+@riverpod
+StudyRepository studyRepository(StudyRepositoryRef ref) => StudyRepository(
     apiClient: ref.watch(apiClientProvider),
     authRepository: ref.watch(authRepositoryProvider),
     ref: ref,
   );
-  // Bind lifecycle to Riverpod
-  ref.onDispose(() {
-    studyRepository.dispose();
-  });
-  return studyRepository;
-});
diff --git a/designer_v2/lib/repositories/study_repository.g.dart b/designer_v2/lib/repositories/study_repository.g.dart
new file mode 100644
index 000000000..9e1018ec1
--- /dev/null
+++ b/designer_v2/lib/repositories/study_repository.g.dart
@@ -0,0 +1,25 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'study_repository.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$studyRepositoryHash() => r'c6acca4aa7223abf7fff39706672197beb800d62';
+
+/// See also [studyRepository].
+@ProviderFor(studyRepository)
+final studyRepositoryProvider = AutoDisposeProvider<StudyRepository>.internal(
+  studyRepository,
+  name: r'studyRepositoryProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$studyRepositoryHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef StudyRepositoryRef = AutoDisposeProviderRef<StudyRepository>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/repositories/supabase_client.dart b/designer_v2/lib/repositories/supabase_client.dart
index 1d92f8e10..f08030498 100644
--- a/designer_v2/lib/repositories/supabase_client.dart
+++ b/designer_v2/lib/repositories/supabase_client.dart
@@ -1,7 +1,9 @@
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_core/env.dart' as env;
 import 'package:supabase_flutter/supabase_flutter.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
+
+part 'supabase_client.g.dart';
 
 // TODO: Transfer networking code to core package (+ update app if needed)
 
@@ -33,7 +35,7 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
 
   Future<List<T>> deleteAll<T extends SupabaseObject>(Map<String, dynamic> selectionCriteria) async {
     try {
-      final data = await supabaseClient.from(tableName(T)).delete().match(selectionCriteria);
+      final data = await this.supabaseClient.from(tableName(T)).delete().match(selectionCriteria);
       if (data == null) return [];
       return deserializeList<T>(data);
     } on PostgrestException catch (error) {
@@ -43,7 +45,7 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
 
   Future<List<T>> getAll<T extends SupabaseObject>({List<String> selectedColumns = const ['*']}) async {
     try {
-      final data = await supabaseClient.from(tableName(T)).select(selectedColumns.join(','));
+      final data = await this.supabaseClient.from(tableName(T)).select(selectedColumns.join(','));
       return deserializeList<T>(data);
     } on PostgrestException catch (error) {
       throw SupabaseQueryError(statusCode: error.code, message: error.message, details: error.details);
@@ -58,7 +60,7 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
       {List<String> selectedColumns = const ['*']}) async {
     try {
       final data =
-          await supabaseClient.from(tableName(T)).select(selectedColumns.join(',')).eq(colName, value).single();
+          await this.supabaseClient.from(tableName(T)).select(selectedColumns.join(',')).eq(colName, value).single();
       return deserializeObject<T>(data);
     } on PostgrestException catch (error) {
       throw SupabaseQueryError(statusCode: error.code, message: error.message, details: error.details);
@@ -78,4 +80,5 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
 }
 
 // Re-expose the global client object via Riverpod
-final supabaseClientProvider = riverpod.Provider<SupabaseClient>((ref) => env.client);
+@riverpod
+SupabaseClient supabaseClient(SupabaseClientRef ref) => env.client;
diff --git a/designer_v2/lib/repositories/supabase_client.g.dart b/designer_v2/lib/repositories/supabase_client.g.dart
new file mode 100644
index 000000000..c4f4bb378
--- /dev/null
+++ b/designer_v2/lib/repositories/supabase_client.g.dart
@@ -0,0 +1,25 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'supabase_client.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$supabaseClientHash() => r'a3bca1b178af5002bfaaa08960ce5520580da5c9';
+
+/// See also [supabaseClient].
+@ProviderFor(supabaseClient)
+final supabaseClientProvider = AutoDisposeProvider<SupabaseClient>.internal(
+  supabaseClient,
+  name: r'supabaseClientProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$supabaseClientHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef SupabaseClientRef = AutoDisposeProviderRef<SupabaseClient>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/routing/router.dart b/designer_v2/lib/routing/router.dart
index 87be84e1b..0c3a77aea 100644
--- a/designer_v2/lib/routing/router.dart
+++ b/designer_v2/lib/routing/router.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/common_views/pages/error_page.dart';
 import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/features/app_controller.dart';
@@ -9,6 +9,7 @@ import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/utils/combined_stream_notifier.dart';
 
 import 'router_config.dart';
+part 'router.g.dart';
 
 /// How to create a new page & use it for navigation:
 ///
@@ -20,7 +21,8 @@ import 'router_config.dart';
 /// [RoutingIntent]s in router_intent.dart. These intents correspond to
 /// route changes in the app. See router_intent.dart for more details.
 
-final routerProvider = Provider<GoRouter>((ref) {
+@riverpod
+GoRouter router(RouterRef ref) {
   final authRepository = ref.watch(authRepositoryProvider);
   final appController = ref.read(appControllerProvider.notifier);
   const defaultLocation = studiesRouteName;
@@ -41,7 +43,7 @@ final routerProvider = Provider<GoRouter>((ref) {
     // Read most recent app state on re-evaluation (see refreshListenable)
     final isLoggedIn = authRepository.isLoggedIn;
     var allowPasswordReset = authRepository.allowPasswordReset;
-    final isInitialized = appController.isInitialized;
+    final isInitialized = ref.watch(appControllerProvider).isInitialized;
 
     // Carry original location through the redirect flow so that we can
     // redirect the user to where they came from after initialization
@@ -120,4 +122,4 @@ final routerProvider = Provider<GoRouter>((ref) {
   );
   RouterConf.router = router;
   return router;
-});
+}
diff --git a/designer_v2/lib/routing/router.g.dart b/designer_v2/lib/routing/router.g.dart
new file mode 100644
index 000000000..2b859ba8f
--- /dev/null
+++ b/designer_v2/lib/routing/router.g.dart
@@ -0,0 +1,34 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'router.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$routerHash() => r'a47e2b191040bbb7139da0b71689e8747b14683b';
+
+/// How to create a new page & use it for navigation:
+///
+/// 1. Add the [GoRoute] in router_config.dart and register it as
+/// a [RouterConf.topLevelRoute] (most likely it should be a top-level
+/// route, unless you know what you are doing with subroutes)
+///
+/// 2. To navigate to the new route from your code, specify one or more
+/// [RoutingIntent]s in router_intent.dart. These intents correspond to
+/// route changes in the app. See router_intent.dart for more details.
+///
+/// Copied from [router].
+@ProviderFor(router)
+final routerProvider = AutoDisposeProvider<GoRouter>.internal(
+  router,
+  name: r'routerProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product') ? null : _$routerHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef RouterRef = AutoDisposeProviderRef<GoRouter>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/services/clipboard.dart b/designer_v2/lib/services/clipboard.dart
index c928af02f..e923ee760 100644
--- a/designer_v2/lib/services/clipboard.dart
+++ b/designer_v2/lib/services/clipboard.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/services.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+part 'clipboard.g.dart';
 
 abstract class IClipboardService {
   Future<String> copy(String text);
@@ -13,4 +15,7 @@ class ClipboardService implements IClipboardService {
   }
 }
 
-final clipboardServiceProvider = Provider<IClipboardService>((ref) => ClipboardService());
+@riverpod
+IClipboardService clipboardService(ClipboardServiceRef ref) {
+  return ClipboardService();
+}
diff --git a/designer_v2/lib/services/clipboard.g.dart b/designer_v2/lib/services/clipboard.g.dart
new file mode 100644
index 000000000..ab78ab237
--- /dev/null
+++ b/designer_v2/lib/services/clipboard.g.dart
@@ -0,0 +1,26 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'clipboard.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$clipboardServiceHash() => r'367d2f59d85547e932e937fecc6c703b74a86b26';
+
+/// See also [clipboardService].
+@ProviderFor(clipboardService)
+final clipboardServiceProvider =
+    AutoDisposeProvider<IClipboardService>.internal(
+  clipboardService,
+  name: r'clipboardServiceProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$clipboardServiceHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef ClipboardServiceRef = AutoDisposeProviderRef<IClipboardService>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/services/notification_service.dart b/designer_v2/lib/services/notification_service.dart
index d83219469..f5b2c66a1 100644
--- a/designer_v2/lib/services/notification_service.dart
+++ b/designer_v2/lib/services/notification_service.dart
@@ -1,8 +1,10 @@
 import 'dart:async';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:rxdart/subjects.dart';
 import 'package:studyu_designer_v2/services/notification_types.dart';
 
+part 'notification_service.g.dart';
+
 abstract class INotificationService {
   void showMessage(String notificationText, {List<NotificationAction>? actions});
   void show(NotificationIntent notification, {List<NotificationAction>? actions});
@@ -46,11 +48,7 @@ class NotificationService implements INotificationService {
   }
 }
 
-final notificationServiceProvider = Provider<INotificationService>((ref) {
-  final notificationService = NotificationService();
-  // Bind lifecycle to Riverpod
-  ref.onDispose(() {
-    notificationService.dispose();
-  });
-  return notificationService;
-});
+@riverpod
+NotificationService notificationService(NotificationServiceRef ref) {
+  return NotificationService();
+}
diff --git a/designer_v2/lib/services/notification_service.g.dart b/designer_v2/lib/services/notification_service.g.dart
new file mode 100644
index 000000000..0cb507bc6
--- /dev/null
+++ b/designer_v2/lib/services/notification_service.g.dart
@@ -0,0 +1,27 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'notification_service.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$notificationServiceHash() =>
+    r'6db295591da0ebe2efdebffe326d89912af46b5a';
+
+/// See also [notificationService].
+@ProviderFor(notificationService)
+final notificationServiceProvider =
+    AutoDisposeProvider<NotificationService>.internal(
+  notificationService,
+  name: r'notificationServiceProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$notificationServiceHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef NotificationServiceRef = AutoDisposeProviderRef<NotificationService>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 4beebd13e..9b99681bf 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -31,6 +31,7 @@ dependencies:
   reactive_forms: ^17.0.1
   reactive_multi_select_flutter: ^2.0.1
   reactive_range_slider: ^2.1.0
+  riverpod_annotation: ^2.3.5
   rxdart: ^0.27.7
   studyu_core: ^4.4.2
   studyu_flutter_common: ^1.8.3
@@ -40,7 +41,8 @@ dependencies:
   uuid: ^4.4.0
 
 dev_dependencies:
-  custom_lint:
+  build_runner: ^2.4.9
+  custom_lint: ^0.6.4
   flutter_launcher_icons: ^0.13.1
   flutter_lints: ^4.0.0
   flutter_test:
@@ -48,7 +50,8 @@ dev_dependencies:
   integration_test:
     sdk: flutter
   patrol_finders: ^2.0.2
-  riverpod_lint:
+  riverpod_generator: ^2.4.0
+  riverpod_lint: ^2.3.10
   test: ^1.24.9 # integration_test
 
 flutter:

From 89b67c7addd6b4e5e7308799e21da1f35a83d948 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 22 Apr 2024 00:05:48 +0200
Subject: [PATCH 106/314] refactor: migrate to riverpod code generation 2

---
 app/lib/models/app_state.dart                 |   1 +
 .../lib/common_views/pages/splash_page.dart   |   1 -
 .../analyze/study_analyze_controller.dart     |  32 ++--
 .../analyze/study_analyze_controller.g.dart   | 176 ++++++++++++++++++
 .../study_analyze_controller_state.dart       |   8 +-
 designer_v2/lib/features/app.dart             |  14 +-
 designer_v2/lib/features/app_controller.dart  |  19 +-
 .../lib/features/app_controller.g.dart        |   8 +-
 .../recruit/study_recruit_controller.dart     |  59 +++---
 .../recruit/study_recruit_controller.g.dart   | 176 ++++++++++++++++++
 .../study_recruit_controller_state.dart       |  13 +-
 .../features/study/study_base_controller.dart |  47 +++--
 .../study/study_base_controller.g.dart        | 176 ++++++++++++++++++
 .../lib/features/study/study_base_state.dart  |  13 +-
 .../lib/features/study/study_controller.dart  |  76 +++-----
 .../features/study/study_controller.g.dart    | 175 +++++++++++++++++
 .../study/study_controller_state.dart         |  25 ++-
 .../lib/features/study/study_scaffold.dart    |   2 +-
 .../features/study/study_test_controller.dart |  72 +++----
 .../study/study_test_controller.g.dart        | 170 ++++++++++++++++-
 .../study/study_test_controller_state.dart    |   8 +-
 .../lib/localization/app_translation.dart     |   6 +-
 .../lib/localization/locale_state.dart        |  42 ++---
 .../lib/localization/locale_state.g.dart      |   2 +-
 designer_v2/lib/routing/router.dart           |  11 +-
 designer_v2/lib/routing/router.g.dart         |   2 +-
 26 files changed, 1081 insertions(+), 253 deletions(-)
 create mode 100644 designer_v2/lib/features/analyze/study_analyze_controller.g.dart
 create mode 100644 designer_v2/lib/features/recruit/study_recruit_controller.g.dart
 create mode 100644 designer_v2/lib/features/study/study_base_controller.g.dart
 create mode 100644 designer_v2/lib/features/study/study_controller.g.dart

diff --git a/app/lib/models/app_state.dart b/app/lib/models/app_state.dart
index 6a4096129..e34047c01 100644
--- a/app/lib/models/app_state.dart
+++ b/app/lib/models/app_state.dart
@@ -5,6 +5,7 @@ import 'package:studyu_app/util/cache.dart';
 import 'package:studyu_app/util/schedule_notifications.dart';
 import 'package:studyu_core/core.dart';
 
+// @riverpod
 class AppState with ChangeNotifier {
   Study? selectedStudy;
   List<Intervention>? selectedInterventions;
diff --git a/designer_v2/lib/common_views/pages/splash_page.dart b/designer_v2/lib/common_views/pages/splash_page.dart
index 88a8c41e8..6c7c8f57a 100644
--- a/designer_v2/lib/common_views/pages/splash_page.dart
+++ b/designer_v2/lib/common_views/pages/splash_page.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-// import 'package:studyu_designer_v2/localization/app_translation.dart';
 
 class SplashPage extends StatelessWidget {
   const SplashPage({super.key});
diff --git a/designer_v2/lib/features/analyze/study_analyze_controller.dart b/designer_v2/lib/features/analyze/study_analyze_controller.dart
index 098d21467..e6f960a31 100644
--- a/designer_v2/lib/features/analyze/study_analyze_controller.dart
+++ b/designer_v2/lib/features/analyze/study_analyze_controller.dart
@@ -1,21 +1,25 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/domain/study_export.dart';
 import 'package:studyu_designer_v2/features/analyze/study_analyze_controller_state.dart';
 import 'package:studyu_designer_v2/features/analyze/study_export_zip.dart';
-import 'package:studyu_designer_v2/features/study/study_base_controller.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/utils/performance.dart';
 
-class StudyAnalyzeController extends StudyBaseController<StudyAnalyzeControllerState> {
-  StudyAnalyzeController({
-    required super.studyId,
-    required super.studyRepository,
-    required super.router,
-    required super.currentUser,
-  }) : super(StudyAnalyzeControllerState(currentUser: currentUser)) {
+part 'study_analyze_controller.g.dart';
+
+@riverpod
+class StudyAnalyzeController extends _$StudyAnalyzeController {
+  @override
+  StudyAnalyzeControllerState build(StudyID studyId) {
+    return StudyAnalyzeControllerState(
+      studyId: studyId,
+      studyRepository: ref.watch(studyRepositoryProvider),
+      router: ref.watch(routerProvider),
+      currentUser: ref.watch(authRepositoryProvider).currentUser,
+    );
     // Reload the study in case some data was generated meanwhile
     // studyRepository.fetch(studyId);
   }
@@ -25,13 +29,3 @@ class StudyAnalyzeController extends StudyBaseController<StudyAnalyzeControllerS
     return runAsync(() => study.exportData.downloadAsZip());
   }
 }
-
-final studyAnalyzeControllerProvider = StateNotifierProvider.autoDispose
-    .family<StudyAnalyzeController, StudyAnalyzeControllerState, StudyID>((ref, studyId) {
-  return StudyAnalyzeController(
-    studyId: studyId,
-    currentUser: ref.watch(authRepositoryProvider).currentUser,
-    studyRepository: ref.watch(studyRepositoryProvider),
-    router: ref.watch(routerProvider),
-  );
-});
diff --git a/designer_v2/lib/features/analyze/study_analyze_controller.g.dart b/designer_v2/lib/features/analyze/study_analyze_controller.g.dart
new file mode 100644
index 000000000..32580e7d4
--- /dev/null
+++ b/designer_v2/lib/features/analyze/study_analyze_controller.g.dart
@@ -0,0 +1,176 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'study_analyze_controller.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$studyAnalyzeControllerHash() =>
+    r'b8b807673ff3f1e9ab65007220edfa3c8da32a49';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$StudyAnalyzeController
+    extends BuildlessAutoDisposeNotifier<StudyAnalyzeControllerState> {
+  late final String studyId;
+
+  StudyAnalyzeControllerState build(
+    String studyId,
+  );
+}
+
+/// See also [StudyAnalyzeController].
+@ProviderFor(StudyAnalyzeController)
+const studyAnalyzeControllerProvider = StudyAnalyzeControllerFamily();
+
+/// See also [StudyAnalyzeController].
+class StudyAnalyzeControllerFamily extends Family<StudyAnalyzeControllerState> {
+  /// See also [StudyAnalyzeController].
+  const StudyAnalyzeControllerFamily();
+
+  /// See also [StudyAnalyzeController].
+  StudyAnalyzeControllerProvider call(
+    String studyId,
+  ) {
+    return StudyAnalyzeControllerProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyAnalyzeControllerProvider getProviderOverride(
+    covariant StudyAnalyzeControllerProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyAnalyzeControllerProvider';
+}
+
+/// See also [StudyAnalyzeController].
+class StudyAnalyzeControllerProvider extends AutoDisposeNotifierProviderImpl<
+    StudyAnalyzeController, StudyAnalyzeControllerState> {
+  /// See also [StudyAnalyzeController].
+  StudyAnalyzeControllerProvider(
+    String studyId,
+  ) : this._internal(
+          () => StudyAnalyzeController()..studyId = studyId,
+          from: studyAnalyzeControllerProvider,
+          name: r'studyAnalyzeControllerProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyAnalyzeControllerHash,
+          dependencies: StudyAnalyzeControllerFamily._dependencies,
+          allTransitiveDependencies:
+              StudyAnalyzeControllerFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyAnalyzeControllerProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  StudyAnalyzeControllerState runNotifierBuild(
+    covariant StudyAnalyzeController notifier,
+  ) {
+    return notifier.build(
+      studyId,
+    );
+  }
+
+  @override
+  Override overrideWith(StudyAnalyzeController Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyAnalyzeControllerProvider._internal(
+        () => create()..studyId = studyId,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeNotifierProviderElement<StudyAnalyzeController,
+      StudyAnalyzeControllerState> createElement() {
+    return _StudyAnalyzeControllerProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyAnalyzeControllerProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyAnalyzeControllerRef
+    on AutoDisposeNotifierProviderRef<StudyAnalyzeControllerState> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyAnalyzeControllerProviderElement
+    extends AutoDisposeNotifierProviderElement<StudyAnalyzeController,
+        StudyAnalyzeControllerState> with StudyAnalyzeControllerRef {
+  _StudyAnalyzeControllerProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyAnalyzeControllerProvider).studyId;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/analyze/study_analyze_controller_state.dart b/designer_v2/lib/features/analyze/study_analyze_controller_state.dart
index bdb75c239..e5b65b462 100644
--- a/designer_v2/lib/features/analyze/study_analyze_controller_state.dart
+++ b/designer_v2/lib/features/analyze/study_analyze_controller_state.dart
@@ -5,6 +5,9 @@ import 'package:studyu_designer_v2/repositories/model_repository.dart';
 
 class StudyAnalyzeControllerState extends StudyControllerBaseState {
   const StudyAnalyzeControllerState({
+    required super.studyId,
+    required super.studyRepository,
+    required super.router,
     required super.currentUser,
     super.studyWithMetadata,
   });
@@ -18,8 +21,11 @@ class StudyAnalyzeControllerState extends StudyControllerBaseState {
     WrappedModel<Study>? studyWithMetadata,
   }) {
     return StudyAnalyzeControllerState(
-      studyWithMetadata: studyWithMetadata ?? super.studyWithMetadata,
+      studyId: studyId,
+      studyRepository: studyRepository,
+      router: router,
       currentUser: currentUser,
+      studyWithMetadata: studyWithMetadata ?? super.studyWithMetadata,
     );
   }
 
diff --git a/designer_v2/lib/features/app.dart b/designer_v2/lib/features/app.dart
index 4b7fac349..44b6422b4 100644
--- a/designer_v2/lib/features/app.dart
+++ b/designer_v2/lib/features/app.dart
@@ -3,15 +3,13 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_designer_v2/constants.dart';
-import 'package:studyu_designer_v2/features/app_controller.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
-import 'package:studyu_designer_v2/localization/locale_providers.dart';
 import 'package:studyu_designer_v2/localization/string_hardcoded.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/services/notification_dispatcher.dart';
 import 'package:studyu_designer_v2/theme.dart';
 
-import '../localization/locale_state.dart';
+import '../localization/locale_providers.dart';
 
 final GlobalKey<ScaffoldMessengerState> scaffoldMessengerKey = GlobalKey();
 
@@ -38,7 +36,6 @@ class AppContent extends ConsumerStatefulWidget {
 }
 
 class _AppContentState extends ConsumerState<AppContent> {
-  late final AppController appController;
 
   final settings = ValueNotifier(ThemeSettings(
     //sourceColor: Color(0xff2a4fda),
@@ -51,18 +48,11 @@ class _AppContentState extends ConsumerState<AppContent> {
   @override
   void initState() {
     super.initState();
-    appController = ref.read(appControllerProvider.notifier);
-    appController.onAppStart();
-    // todo move this into appControllerProvider
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      // Locale Startup Actions
-      ref.read(localeStateNotifierProvider.notifier).initLocale();
-    });
   }
 
   @override
   Widget build(BuildContext context) {
-    AppTranslation.init(ref); // todo Refactor this into initState locale delegate if possible
+    AppTranslation.init(ref);
     final router = ref.watch(routerProvider);
 
     return DynamicColorBuilder(
diff --git a/designer_v2/lib/features/app_controller.dart b/designer_v2/lib/features/app_controller.dart
index 33f99f147..7e9e5ad66 100644
--- a/designer_v2/lib/features/app_controller.dart
+++ b/designer_v2/lib/features/app_controller.dart
@@ -18,12 +18,19 @@ typedef _DelegateCallback = Future<bool> Function(IAppDelegate delegate);
 @riverpod
 class AppController extends _$AppController {
   @override
-  AppControllerState build() {
+  Future<AppControllerState> build() async {
     _appDelegates = [
       /// Register [IAppDelegate]s here for invocation of app lifecycle methods
       ref.watch(authRepositoryProvider),
     ];
-    return const AppControllerState();
+    ref.listenSelf((previous, next) {
+      print("APP CONTROLLER STATE CHANGED: $next");
+    });
+    //ref.read(routerProvider).refresh();
+    // Forward onAppStart to all registered delegates so that they can
+    // e.g. read some data from local storage for initialization
+    //await _callDelegates((delegate) => delegate.onAppStart(), withMinDelay: true);
+    return const AppControllerState(status: AppStatus.initialized);
   }
 
   /// List of listeners for app lifecycle events registered via Riverpod
@@ -33,14 +40,6 @@ class AppController extends _$AppController {
   /// (so that the splash screen is shown during this time)
   late final _delayedFuture = Future.delayed(const Duration(milliseconds: Config.minSplashTime), () => true);
 
-  Future<bool> onAppStart() async {
-    // Forward onAppStart to all registered delegates so that they can
-    // e.g. read some data from local storage for initialization
-    final result = await _callDelegates((delegate) => delegate.onAppStart(), withMinDelay: true);
-    state = const AppControllerState(status: AppStatus.initialized);
-    return result;
-  }
-
   /// Executes the given callback for all registered delegates concurrently
   Future<bool> _callDelegates(_DelegateCallback function, {withMinDelay = false}) async {
     final List<Future<bool>> delegateFutures = [];
diff --git a/designer_v2/lib/features/app_controller.g.dart b/designer_v2/lib/features/app_controller.g.dart
index ea2ecc794..ce14e1321 100644
--- a/designer_v2/lib/features/app_controller.g.dart
+++ b/designer_v2/lib/features/app_controller.g.dart
@@ -6,14 +6,14 @@ part of 'app_controller.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$appControllerHash() => r'c72d85991f008d5ad6a88ef46b77578f78c32ac5';
+String _$appControllerHash() => r'fe83de481e31f72f7a492084d62f04373130fb1e';
 
 /// Main controller that's bound to the top-level application widget's state
 ///
 /// Copied from [AppController].
 @ProviderFor(AppController)
-final appControllerProvider =
-    AutoDisposeNotifierProvider<AppController, AppControllerState>.internal(
+final appControllerProvider = AutoDisposeAsyncNotifierProvider<AppController,
+    AppControllerState>.internal(
   AppController.new,
   name: r'appControllerProvider',
   debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
@@ -23,6 +23,6 @@ final appControllerProvider =
   allTransitiveDependencies: null,
 );
 
-typedef _$AppController = AutoDisposeNotifier<AppControllerState>;
+typedef _$AppController = AutoDisposeAsyncNotifier<AppControllerState>;
 // ignore_for_file: type=lint
 // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/recruit/study_recruit_controller.dart b/designer_v2/lib/features/recruit/study_recruit_controller.dart
index 154f46bb4..ec9b1e16f 100644
--- a/designer_v2/lib/features/recruit/study_recruit_controller.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_controller.dart
@@ -1,9 +1,8 @@
 import 'dart:async';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/features/recruit/study_recruit_controller_state.dart';
-import 'package:studyu_designer_v2/features/study/study_base_controller.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/repositories/invite_code_repository.dart';
 import 'package:studyu_designer_v2/repositories/model_repository.dart';
@@ -11,28 +10,33 @@ import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/utils/model_action.dart';
 
-class StudyRecruitController extends StudyBaseController<StudyRecruitControllerState>
-    implements IModelActionProvider<StudyInvite> {
-  StudyRecruitController({
-    required super.studyId,
-    required super.studyRepository,
-    required super.currentUser,
-    required super.router,
-    required this.inviteCodeRepository,
-  }) : super(StudyRecruitControllerState(currentUser: currentUser)) {
+part 'study_recruit_controller.g.dart';
+
+@riverpod
+class StudyRecruitController extends _$StudyRecruitController implements IModelActionProvider<StudyInvite> {
+
+  /// [inviteCodeRepository] Reference to the repository for invite codes (resolved dynamically via Riverpod when the [state.study] becomes available)
+  @override
+  StudyRecruitControllerState build(StudyID studyId) {
     print("StudyRecruitController.constructor");
     _subscribeInvites();
+    ref.onDispose(() {print("StudyRecruitController.dispose");
+    _invitesSubscription?.cancel();});
+    return StudyRecruitControllerState(
+      studyId: studyId,
+      studyRepository: ref.watch(studyRepositoryProvider),
+      router: ref.watch(routerProvider),
+      currentUser: ref.watch(authRepositoryProvider).currentUser,
+      inviteCodeRepository: ref.watch(inviteCodeRepositoryProvider(studyId)),
+      invites: const AsyncValue.loading(),
+    );
   }
 
-  /// Reference to the repository for invite codes (resolved dynamically via
-  /// Riverpod when the [state.study] becomes available)
-  final IInviteCodeRepository inviteCodeRepository;
-
   StreamSubscription<List<WrappedModel<StudyInvite>>>? _invitesSubscription;
 
   _subscribeInvites() {
     print("StudyRecruitController.subscribe");
-    _invitesSubscription = inviteCodeRepository.watchAll().listen((wrappedModels) {
+    _invitesSubscription = state.inviteCodeRepository.watchAll().listen((wrappedModels) {
       print("StudyRecruitController.listenUpdate");
       // Update the controller's state when new invites are available in the repository
       final invites = wrappedModels.map((invite) => invite.model).toList();
@@ -56,7 +60,7 @@ class StudyRecruitController extends StudyBaseController<StudyRecruitControllerS
 
   @override
   List<ModelAction> availableActions(StudyInvite model) {
-    final actions = inviteCodeRepository
+    final actions = state.inviteCodeRepository
         .availableActions(model)
         .where((action) => action.type != ModelActionType.clipboard)
         .toList();
@@ -64,29 +68,10 @@ class StudyRecruitController extends StudyBaseController<StudyRecruitControllerS
   }
 
   List<ModelAction> availableInlineActions(StudyInvite model) {
-    final actions = inviteCodeRepository
+    final actions = state.inviteCodeRepository
         .availableActions(model)
         .where((action) => action.type == ModelActionType.clipboard)
         .toList();
     return withIcons(actions, modelActionIcons);
   }
-
-  @override
-  void dispose() {
-    print("StudyRecruitController.dispose");
-    _invitesSubscription?.cancel();
-    super.dispose();
-  }
 }
-
-/// Provide a controller parametrized by [StudyID]
-final studyRecruitControllerProvider = StateNotifierProvider.autoDispose
-    .family<StudyRecruitController, StudyRecruitControllerState, StudyID>((ref, studyId) {
-  return StudyRecruitController(
-    studyId: studyId,
-    studyRepository: ref.watch(studyRepositoryProvider),
-    currentUser: ref.watch(authRepositoryProvider).currentUser,
-    router: ref.watch(routerProvider),
-    inviteCodeRepository: ref.watch(inviteCodeRepositoryProvider(studyId)),
-  );
-});
diff --git a/designer_v2/lib/features/recruit/study_recruit_controller.g.dart b/designer_v2/lib/features/recruit/study_recruit_controller.g.dart
new file mode 100644
index 000000000..e1ea441d9
--- /dev/null
+++ b/designer_v2/lib/features/recruit/study_recruit_controller.g.dart
@@ -0,0 +1,176 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'study_recruit_controller.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$studyRecruitControllerHash() =>
+    r'8dc8092f83dbab107eadaa274ad0cdfc09d79e38';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$StudyRecruitController
+    extends BuildlessAutoDisposeNotifier<StudyRecruitControllerState> {
+  late final String studyId;
+
+  StudyRecruitControllerState build(
+    String studyId,
+  );
+}
+
+/// See also [StudyRecruitController].
+@ProviderFor(StudyRecruitController)
+const studyRecruitControllerProvider = StudyRecruitControllerFamily();
+
+/// See also [StudyRecruitController].
+class StudyRecruitControllerFamily extends Family<StudyRecruitControllerState> {
+  /// See also [StudyRecruitController].
+  const StudyRecruitControllerFamily();
+
+  /// See also [StudyRecruitController].
+  StudyRecruitControllerProvider call(
+    String studyId,
+  ) {
+    return StudyRecruitControllerProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyRecruitControllerProvider getProviderOverride(
+    covariant StudyRecruitControllerProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyRecruitControllerProvider';
+}
+
+/// See also [StudyRecruitController].
+class StudyRecruitControllerProvider extends AutoDisposeNotifierProviderImpl<
+    StudyRecruitController, StudyRecruitControllerState> {
+  /// See also [StudyRecruitController].
+  StudyRecruitControllerProvider(
+    String studyId,
+  ) : this._internal(
+          () => StudyRecruitController()..studyId = studyId,
+          from: studyRecruitControllerProvider,
+          name: r'studyRecruitControllerProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyRecruitControllerHash,
+          dependencies: StudyRecruitControllerFamily._dependencies,
+          allTransitiveDependencies:
+              StudyRecruitControllerFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyRecruitControllerProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  StudyRecruitControllerState runNotifierBuild(
+    covariant StudyRecruitController notifier,
+  ) {
+    return notifier.build(
+      studyId,
+    );
+  }
+
+  @override
+  Override overrideWith(StudyRecruitController Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyRecruitControllerProvider._internal(
+        () => create()..studyId = studyId,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeNotifierProviderElement<StudyRecruitController,
+      StudyRecruitControllerState> createElement() {
+    return _StudyRecruitControllerProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyRecruitControllerProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyRecruitControllerRef
+    on AutoDisposeNotifierProviderRef<StudyRecruitControllerState> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyRecruitControllerProviderElement
+    extends AutoDisposeNotifierProviderElement<StudyRecruitController,
+        StudyRecruitControllerState> with StudyRecruitControllerRef {
+  _StudyRecruitControllerProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyRecruitControllerProvider).studyId;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/recruit/study_recruit_controller_state.dart b/designer_v2/lib/features/recruit/study_recruit_controller_state.dart
index 22da2b5f9..8c9552c93 100644
--- a/designer_v2/lib/features/recruit/study_recruit_controller_state.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_controller_state.dart
@@ -1,12 +1,17 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/features/study/study_base_state.dart';
+import 'package:studyu_designer_v2/repositories/invite_code_repository.dart';
 import 'package:studyu_designer_v2/repositories/model_repository.dart';
 
 class StudyRecruitControllerState extends StudyControllerBaseState {
   const StudyRecruitControllerState({
+    required super.studyId,
+    required super.studyRepository,
+    required super.router,
     required super.currentUser,
     super.studyWithMetadata,
+    required this.inviteCodeRepository,
     this.invites = const AsyncValue.loading(),
   });
 
@@ -16,15 +21,21 @@ class StudyRecruitControllerState extends StudyControllerBaseState {
   /// [Study] async states, so that it can be used with [AsyncValueWidget]
   final AsyncValue<List<StudyInvite>?> invites;
 
+  final InviteCodeRepository inviteCodeRepository;
+
   @override
   StudyRecruitControllerState copyWith({
     WrappedModel<Study>? studyWithMetadata,
     AsyncValue<List<StudyInvite>>? invites,
   }) {
     return StudyRecruitControllerState(
+      studyId: studyId,
+      studyRepository: studyRepository,
+      router: router,
+      currentUser: currentUser,
       studyWithMetadata: studyWithMetadata ?? super.studyWithMetadata,
+      inviteCodeRepository: inviteCodeRepository,
       invites: invites ?? this.invites,
-      currentUser: super.currentUser,
     );
   }
 
diff --git a/designer_v2/lib/features/study/study_base_controller.dart b/designer_v2/lib/features/study/study_base_controller.dart
index 30f30c5a0..3041e26d5 100644
--- a/designer_v2/lib/features/study/study_base_controller.dart
+++ b/designer_v2/lib/features/study/study_base_controller.dart
@@ -1,38 +1,39 @@
 import 'dart:async';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:go_router/go_router.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/features/study/study_base_state.dart';
 import 'package:studyu_designer_v2/repositories/api_client.dart';
+import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/repositories/model_repository.dart';
 import 'package:studyu_designer_v2/repositories/study_repository.dart';
+import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/routing/router_intent.dart';
 
-class StudyBaseController<T extends StudyControllerBaseState> extends StateNotifier<T> {
-  StudyBaseController(
-    super.state, {
-    required this.studyId,
-    required this.studyRepository,
-    required this.router,
-    required currentUser,
-  }) {
+part 'study_base_controller.g.dart';
+
+@riverpod
+class StudyBaseController<T extends StudyControllerBaseState> extends _$StudyBaseController {
+  @override
+  StudyControllerBaseState build(StudyID studyId) {
     subscribeStudy(studyId);
+    return StudyControllerBaseState(
+      studyId: studyId,
+      studyRepository: ref.watch(studyRepositoryProvider),
+      router: ref.watch(routerProvider),
+      currentUser: ref.watch(authRepositoryProvider).currentUser,
+    );
   }
 
-  final StudyID studyId;
-  final IStudyRepository studyRepository;
-  final GoRouter router;
-
-  StreamSubscription<WrappedModel<Study>>? studySubscription;
+  StreamSubscription<WrappedModel<Study>>? _studySubscription;
 
   subscribeStudy(StudyID studyId) {
-    if (studySubscription != null) {
-      studySubscription!.cancel();
+    if (_studySubscription != null) {
+      _studySubscription!.cancel();
     }
-    studySubscription =
-        studyRepository.watch(studyId).listen(onStudySubscriptionUpdate, onError: onStudySubscriptionError);
+    _studySubscription =
+        state.studyRepository.watch(studyId).listen(onStudySubscriptionUpdate, onError: onStudySubscriptionError);
   }
 
   onStudySubscriptionUpdate(WrappedModel<Study> wrappedModel) {
@@ -46,13 +47,7 @@ class StudyBaseController<T extends StudyControllerBaseState> extends StateNotif
            during app initialization so that we don't need to render the loading state
            if the study doesn't exist
       */
-      router.dispatch(RoutingIntents.error(error));
+      state.router.dispatch(RoutingIntents.error(error));
     }
   }
-
-  @override
-  dispose() {
-    studySubscription?.cancel();
-    super.dispose();
-  }
 }
diff --git a/designer_v2/lib/features/study/study_base_controller.g.dart b/designer_v2/lib/features/study/study_base_controller.g.dart
new file mode 100644
index 000000000..e906e67ee
--- /dev/null
+++ b/designer_v2/lib/features/study/study_base_controller.g.dart
@@ -0,0 +1,176 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'study_base_controller.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$studyBaseControllerHash() =>
+    r'1277944be2302e5d8f5d0c9bdc36e05a05d2d104';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$StudyBaseController
+    extends BuildlessAutoDisposeNotifier<StudyControllerBaseState> {
+  late final String studyId;
+
+  StudyControllerBaseState build(
+    String studyId,
+  );
+}
+
+/// See also [StudyBaseController].
+@ProviderFor(StudyBaseController)
+const studyBaseControllerProvider = StudyBaseControllerFamily();
+
+/// See also [StudyBaseController].
+class StudyBaseControllerFamily extends Family<StudyControllerBaseState> {
+  /// See also [StudyBaseController].
+  const StudyBaseControllerFamily();
+
+  /// See also [StudyBaseController].
+  StudyBaseControllerProvider call(
+    String studyId,
+  ) {
+    return StudyBaseControllerProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyBaseControllerProvider getProviderOverride(
+    covariant StudyBaseControllerProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyBaseControllerProvider';
+}
+
+/// See also [StudyBaseController].
+class StudyBaseControllerProvider extends AutoDisposeNotifierProviderImpl<
+    StudyBaseController, StudyControllerBaseState> {
+  /// See also [StudyBaseController].
+  StudyBaseControllerProvider(
+    String studyId,
+  ) : this._internal(
+          () => StudyBaseController()..studyId = studyId,
+          from: studyBaseControllerProvider,
+          name: r'studyBaseControllerProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyBaseControllerHash,
+          dependencies: StudyBaseControllerFamily._dependencies,
+          allTransitiveDependencies:
+              StudyBaseControllerFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyBaseControllerProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  StudyControllerBaseState runNotifierBuild(
+    covariant StudyBaseController notifier,
+  ) {
+    return notifier.build(
+      studyId,
+    );
+  }
+
+  @override
+  Override overrideWith(StudyBaseController Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyBaseControllerProvider._internal(
+        () => create()..studyId = studyId,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeNotifierProviderElement<StudyBaseController,
+      StudyControllerBaseState> createElement() {
+    return _StudyBaseControllerProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyBaseControllerProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyBaseControllerRef
+    on AutoDisposeNotifierProviderRef<StudyControllerBaseState> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyBaseControllerProviderElement
+    extends AutoDisposeNotifierProviderElement<StudyBaseController,
+        StudyControllerBaseState> with StudyBaseControllerRef {
+  _StudyBaseControllerProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyBaseControllerProvider).studyId;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/study/study_base_state.dart b/designer_v2/lib/features/study/study_base_state.dart
index d43f28e78..88080c7fb 100644
--- a/designer_v2/lib/features/study/study_base_state.dart
+++ b/designer_v2/lib/features/study/study_base_state.dart
@@ -1,16 +1,24 @@
 import 'package:equatable/equatable.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/repositories/model_repository.dart';
+import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 
 class StudyControllerBaseState extends Equatable {
   const StudyControllerBaseState({
+    required this.studyId,
+    required this.studyRepository,
+    required this.router,
     required this.currentUser,
     this.studyWithMetadata,
   });
 
+  final StudyID studyId;
+  final IStudyRepository studyRepository;
+  final GoRouter router;
   final User? currentUser;
 
   /// The study that is currently being viewed or edited, wrapped in a
@@ -30,8 +38,11 @@ class StudyControllerBaseState extends Equatable {
 
   StudyControllerBaseState copyWith({WrappedModel<Study>? studyWithMetadata}) {
     return StudyControllerBaseState(
-      studyWithMetadata: studyWithMetadata ?? this.studyWithMetadata,
+      studyId: studyId,
+      studyRepository: studyRepository,
+      router: router,
       currentUser: currentUser,
+      studyWithMetadata: studyWithMetadata ?? this.studyWithMetadata,
     );
   }
 
diff --git a/designer_v2/lib/features/study/study_controller.dart b/designer_v2/lib/features/study/study_controller.dart
index da398c3db..64d889dc1 100644
--- a/designer_v2/lib/features/study/study_controller.dart
+++ b/designer_v2/lib/features/study/study_controller.dart
@@ -1,40 +1,42 @@
 import 'dart:async';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
-import 'package:studyu_designer_v2/features/study/study_actions.dart';
 import 'package:studyu_designer_v2/features/study/study_base_controller.dart';
 import 'package:studyu_designer_v2/features/study/study_controller_state.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/repositories/model_repository.dart';
 import 'package:studyu_designer_v2/repositories/model_repository_events.dart';
-import 'package:studyu_designer_v2/repositories/study_repository.dart';
-import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/routing/router_intent.dart';
-import 'package:studyu_designer_v2/services/notification_service.dart';
-import 'package:studyu_designer_v2/utils/model_action.dart';
 
-class StudyController extends StudyBaseController<StudyControllerState> {
-  StudyController({
-    required super.studyId,
-    required super.studyRepository,
-    required super.currentUser,
-    required super.router,
-    required this.notificationService,
-  }) : super(StudyControllerState(currentUser: currentUser)) {
+import '../../repositories/study_repository.dart';
+import '../../routing/router.dart';
+
+part 'study_controller.g.dart';
+
+@riverpod
+class StudyController extends _$StudyController {
+  @override
+  StudyControllerState build(StudyID studyId) {
     syncStudyStatus();
+    ref.onDispose(() => _studyEventsSubscription?.cancel());
+    return StudyControllerState(
+      studyId: studyId,
+      studyRepository: ref.watch(studyRepositoryProvider),
+      router: ref.watch(routerProvider),
+      currentUser: ref.watch(authRepositoryProvider).currentUser
+    );
   }
 
-  final INotificationService notificationService;
-  StreamSubscription<ModelEvent<Study>>? studyEventsSubscription;
+  StreamSubscription<ModelEvent<Study>>? _studyEventsSubscription;
 
   syncStudyStatus() {
-    if (studyEventsSubscription != null) {
-      studyEventsSubscription?.cancel();
+    if (_studyEventsSubscription != null) {
+      _studyEventsSubscription?.cancel();
     }
-    studyEventsSubscription = this.studyRepository.watchChanges(studyId).listen((event) {
+    _studyEventsSubscription = state.studyRepository.watchChanges(state.studyId).listen((event) {
       if (event is IsSaving) {
         state = state.copyWith(
           syncState: const AsyncValue.loading(),
@@ -50,9 +52,8 @@ class StudyController extends StudyBaseController<StudyControllerState> {
     });
   }
 
-  @override
   onStudySubscriptionUpdate(WrappedModel<Study> wrappedModel) {
-    super.onStudySubscriptionUpdate(wrappedModel);
+    ref.watch(studyBaseControllerProvider(state.studyId).notifier).onStudySubscriptionUpdate(wrappedModel);
     final studyId = wrappedModel.model.id;
     _redirectNewToActualStudyID(studyId);
   }
@@ -60,49 +61,32 @@ class StudyController extends StudyBaseController<StudyControllerState> {
   /// Redirect to the study-specific URL to avoid disposing a dirty controller
   /// when building subroutes
   _redirectNewToActualStudyID(StudyID actualStudyId) {
-    if (studyId == Config.newModelId) {
-      this.router.dispatch(RoutingIntents.study(actualStudyId));
-    }
-  }
-
-  List<ModelAction> get studyActions {
-    final study = state.study.value;
-    if (study == null) {
-      return [];
+    if (state.studyId == Config.newModelId) {
+      state.router.dispatch(RoutingIntents.study(actualStudyId));
     }
-    // filter out edit action since we are already editing the study
-    return withIcons(
-        this.studyRepository.availableActions(study).where((action) => action.type != StudyActionType.edit).toList(),
-        studyActionIcons);
   }
 
   Future publishStudy({toRegistry = false}) {
     final study = state.study.value!;
     study.registryPublished = toRegistry;
-    return this.studyRepository.launch(study);
+    return state.studyRepository.launch(study);
   }
 
   void onChangeStudyParticipation() {
-    this.router.dispatch(RoutingIntents.studyEditEnrollment(studyId));
+    state.router.dispatch(RoutingIntents.studyEditEnrollment(state.studyId));
   }
 
   void onAddParticipants() {
-    this.router.dispatch(RoutingIntents.studyRecruit(studyId));
+    state.router.dispatch(RoutingIntents.studyRecruit(state.studyId));
   }
 
   void onSettingsPressed() {
-    this.router.dispatch(RoutingIntents.studySettings(studyId));
-  }
-
-  @override
-  dispose() {
-    studyEventsSubscription?.cancel();
-    super.dispose();
+    state.router.dispatch(RoutingIntents.studySettings(state.studyId));
   }
 }
 
 /// Use the [family] modifier to provide a controller parametrized by [StudyID]
-final studyControllerProvider =
+/*final studyControllerProvider =
     StateNotifierProvider.autoDispose.family<StudyController, StudyControllerState, StudyID>((ref, studyId) {
   print("studyControllerProvider($studyId)");
   final controller = StudyController(
@@ -120,4 +104,4 @@ final studyControllerProvider =
     print("studyControllerProvider($studyId).DISPOSE");
   });
   return controller;
-});
+});*/
diff --git a/designer_v2/lib/features/study/study_controller.g.dart b/designer_v2/lib/features/study/study_controller.g.dart
new file mode 100644
index 000000000..cff6c09e7
--- /dev/null
+++ b/designer_v2/lib/features/study/study_controller.g.dart
@@ -0,0 +1,175 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'study_controller.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$studyControllerHash() => r'23bdef67597ce483a453b46c962f93804fca09b2';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$StudyController
+    extends BuildlessAutoDisposeNotifier<StudyControllerState> {
+  late final String studyId;
+
+  StudyControllerState build(
+    String studyId,
+  );
+}
+
+/// See also [StudyController].
+@ProviderFor(StudyController)
+const studyControllerProvider = StudyControllerFamily();
+
+/// See also [StudyController].
+class StudyControllerFamily extends Family<StudyControllerState> {
+  /// See also [StudyController].
+  const StudyControllerFamily();
+
+  /// See also [StudyController].
+  StudyControllerProvider call(
+    String studyId,
+  ) {
+    return StudyControllerProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyControllerProvider getProviderOverride(
+    covariant StudyControllerProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyControllerProvider';
+}
+
+/// See also [StudyController].
+class StudyControllerProvider extends AutoDisposeNotifierProviderImpl<
+    StudyController, StudyControllerState> {
+  /// See also [StudyController].
+  StudyControllerProvider(
+    String studyId,
+  ) : this._internal(
+          () => StudyController()..studyId = studyId,
+          from: studyControllerProvider,
+          name: r'studyControllerProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyControllerHash,
+          dependencies: StudyControllerFamily._dependencies,
+          allTransitiveDependencies:
+              StudyControllerFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyControllerProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  StudyControllerState runNotifierBuild(
+    covariant StudyController notifier,
+  ) {
+    return notifier.build(
+      studyId,
+    );
+  }
+
+  @override
+  Override overrideWith(StudyController Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyControllerProvider._internal(
+        () => create()..studyId = studyId,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeNotifierProviderElement<StudyController, StudyControllerState>
+      createElement() {
+    return _StudyControllerProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyControllerProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyControllerRef
+    on AutoDisposeNotifierProviderRef<StudyControllerState> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyControllerProviderElement
+    extends AutoDisposeNotifierProviderElement<StudyController,
+        StudyControllerState> with StudyControllerRef {
+  _StudyControllerProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyControllerProvider).studyId;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/study/study_controller_state.dart b/designer_v2/lib/features/study/study_controller_state.dart
index 3c41c6566..76faca5bd 100644
--- a/designer_v2/lib/features/study/study_controller_state.dart
+++ b/designer_v2/lib/features/study/study_controller_state.dart
@@ -2,21 +2,39 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/common_views/sync_indicator.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
+import 'package:studyu_designer_v2/features/study/study_actions.dart';
 import 'package:studyu_designer_v2/features/study/study_base_state.dart';
 import 'package:studyu_designer_v2/features/study/study_scaffold.dart';
 import 'package:studyu_designer_v2/repositories/model_repository.dart';
 
+import '../../utils/model_action.dart';
+
 class StudyControllerState extends StudyControllerBaseState implements IStudyAppBarViewModel, ISyncIndicatorViewModel {
   const StudyControllerState({
+    required super.studyId,
+    required super.studyRepository,
+    required super.router,
     required super.currentUser,
     super.studyWithMetadata,
     this.isDirty = false,
     this.syncState = const AsyncValue<void>.data(null),
-    this.lastSynced,
+    this.lastSynced
   });
 
   bool get isPublished => study.value != null && study.value!.published;
 
+  List<ModelAction> get studyActions {
+    final studyVal = study.value;
+    if (studyVal == null) {
+      return [];
+    }
+    // filter out edit action since we are already editing the study
+    return withIcons(
+        studyRepository.availableActions(studyVal).where((action) => action.type != StudyActionType.edit).toList(),
+        studyActionIcons
+    );
+  }
+
   // - ISyncIndicatorViewModel
 
   @override
@@ -86,11 +104,14 @@ class StudyControllerState extends StudyControllerBaseState implements IStudyApp
     DateTime? lastSynced,
   }) {
     return StudyControllerState(
+      studyId: studyId,
+      studyRepository: studyRepository,
+      router: router,
+      currentUser: currentUser,
       studyWithMetadata: studyWithMetadata ?? super.studyWithMetadata,
       isDirty: isDirty ?? this.isDirty,
       syncState: syncState ?? this.syncState,
       lastSynced: lastSynced ?? this.lastSynced,
-      currentUser: super.currentUser,
     );
   }
 }
diff --git a/designer_v2/lib/features/study/study_scaffold.dart b/designer_v2/lib/features/study/study_scaffold.dart
index 0a12c7c03..f3a5f876c 100644
--- a/designer_v2/lib/features/study/study_scaffold.dart
+++ b/designer_v2/lib/features/study/study_scaffold.dart
@@ -248,7 +248,7 @@ class _StudyScaffoldState extends ConsumerState<StudyScaffold> {
 
     actionButtons.add(
       ActionPopUpMenuButton(
-        actions: controller.studyActions,
+        actions: state.studyActions,
         orientation: Axis.vertical,
         enabled: state.study.hasValue, // disable while study is loading
         hideOnEmpty: false,
diff --git a/designer_v2/lib/features/study/study_test_controller.dart b/designer_v2/lib/features/study/study_test_controller.dart
index e6c1cd400..8aa4fec20 100644
--- a/designer_v2/lib/features/study/study_test_controller.dart
+++ b/designer_v2/lib/features/study/study_test_controller.dart
@@ -1,60 +1,42 @@
 import 'package:flutter/foundation.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
-import 'package:studyu_designer_v2/features/study/study_base_controller.dart';
 import 'package:studyu_designer_v2/features/study/study_test_controller_state.dart';
 import 'package:studyu_designer_v2/features/study/study_test_frame_controllers.dart';
-import 'package:studyu_designer_v2/localization/locale_providers.dart';
 import 'package:studyu_designer_v2/localization/string_hardcoded.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
-import 'package:studyu_designer_v2/repositories/study_repository.dart';
-import 'package:studyu_designer_v2/routing/router.dart';
+
+import '../../localization/locale_providers.dart';
+import '../../repositories/study_repository.dart';
+import '../../routing/router.dart';
 
 part 'study_test_controller.g.dart';
 
-class StudyTestController extends StudyBaseController<StudyTestControllerState> {
-  StudyTestController({
-    required super.studyId,
-    required super.studyRepository,
-    required super.currentUser,
-    required super.router,
-    required this.authRepository,
-    required this.languageCode,
-  }) : super(StudyTestControllerState(
-          currentUser: currentUser,
-          languageCode: languageCode,
-        )) {
-    state = state.copyWith(serializedSession: authRepository.serializedSession ?? '');
+@riverpod
+class StudyTestController extends _$StudyTestController {
+  @override
+  StudyTestControllerState build(StudyID studyId) {
+    ref.onDispose(() {
+      // Reload the study after disposing the test controller so that any
+      // data changes resulting from testing are reflected in the study for
+      // other parts of the app (e.g. test data that was generated)
+      //
+      // Ideally, we would stream changes from the backend/database directly,
+      // but this is a sufficient workaround for now
+      ref.watch(studyRepositoryProvider).fetch(studyId);
+    });
+    return StudyTestControllerState(
+      studyId: studyId,
+      studyRepository: ref.watch(studyRepositoryProvider),
+      router: ref.watch(routerProvider),
+      currentUser: ref.watch(authRepositoryProvider).currentUser,
+      serializedSession: ref.watch(authRepositoryProvider).serializedSession ?? '',
+      languageCode: ref.watch(localeProvider).languageCode,
+    );
   }
-
-  final IAuthRepository authRepository;
-  final String languageCode;
 }
 
-/// Use the [family] modifier to provide a controller parametrized by [StudyID]
-final studyTestControllerProvider =
-    StateNotifierProvider.family<StudyTestController, StudyTestControllerState, StudyID>((ref, studyId) {
-  final studyRepository = ref.watch(studyRepositoryProvider);
-  final controller = StudyTestController(
-    studyId: studyId,
-    studyRepository: studyRepository,
-    currentUser: ref.watch(authRepositoryProvider).currentUser,
-    router: ref.watch(routerProvider),
-    authRepository: ref.watch(authRepositoryProvider),
-    languageCode: ref.watch(localeProvider).languageCode,
-  );
-  ref.onDispose(() {
-    // Reload the study after disposing the test controller so that any
-    // data changes resulting from testing are reflected in the study for
-    // other parts of the app (e.g. test data that was generated)
-    //
-    // Ideally, we would stream changes from the backend/database directly,
-    // but this is a sufficient workaround for now
-    studyRepository.fetch(studyId);
-  });
-  return controller;
-});
+/// Provide a controller parametrized by [StudyID]
 
 @riverpod
 PlatformController studyTestPlatformController(StudyTestPlatformControllerRef ref, StudyID studyId) {
@@ -68,4 +50,4 @@ PlatformController studyTestPlatformController(StudyTestPlatformControllerRef re
     platformController = WebController(state.appUrl, studyId);
   }
   return platformController;
-}
+}
\ No newline at end of file
diff --git a/designer_v2/lib/features/study/study_test_controller.g.dart b/designer_v2/lib/features/study/study_test_controller.g.dart
index 44a3a547c..b85891216 100644
--- a/designer_v2/lib/features/study/study_test_controller.g.dart
+++ b/designer_v2/lib/features/study/study_test_controller.g.dart
@@ -30,16 +30,24 @@ class _SystemHash {
   }
 }
 
-/// See also [studyTestPlatformController].
+/// Provide a controller parametrized by [StudyID]
+///
+/// Copied from [studyTestPlatformController].
 @ProviderFor(studyTestPlatformController)
 const studyTestPlatformControllerProvider = StudyTestPlatformControllerFamily();
 
-/// See also [studyTestPlatformController].
+/// Provide a controller parametrized by [StudyID]
+///
+/// Copied from [studyTestPlatformController].
 class StudyTestPlatformControllerFamily extends Family<PlatformController> {
-  /// See also [studyTestPlatformController].
+  /// Provide a controller parametrized by [StudyID]
+  ///
+  /// Copied from [studyTestPlatformController].
   const StudyTestPlatformControllerFamily();
 
-  /// See also [studyTestPlatformController].
+  /// Provide a controller parametrized by [StudyID]
+  ///
+  /// Copied from [studyTestPlatformController].
   StudyTestPlatformControllerProvider call(
     String studyId,
   ) {
@@ -72,10 +80,14 @@ class StudyTestPlatformControllerFamily extends Family<PlatformController> {
   String? get name => r'studyTestPlatformControllerProvider';
 }
 
-/// See also [studyTestPlatformController].
+/// Provide a controller parametrized by [StudyID]
+///
+/// Copied from [studyTestPlatformController].
 class StudyTestPlatformControllerProvider
     extends AutoDisposeProvider<PlatformController> {
-  /// See also [studyTestPlatformController].
+  /// Provide a controller parametrized by [StudyID]
+  ///
+  /// Copied from [studyTestPlatformController].
   StudyTestPlatformControllerProvider(
     String studyId,
   ) : this._internal(
@@ -159,5 +171,151 @@ class _StudyTestPlatformControllerProviderElement
   @override
   String get studyId => (origin as StudyTestPlatformControllerProvider).studyId;
 }
+
+String _$studyTestControllerHash() =>
+    r'efc5f63d1d743edd57af6689308075f1c2cf3131';
+
+abstract class _$StudyTestController
+    extends BuildlessAutoDisposeNotifier<StudyTestControllerState> {
+  late final String studyId;
+
+  StudyTestControllerState build(
+    String studyId,
+  );
+}
+
+/// See also [StudyTestController].
+@ProviderFor(StudyTestController)
+const studyTestControllerProvider = StudyTestControllerFamily();
+
+/// See also [StudyTestController].
+class StudyTestControllerFamily extends Family<StudyTestControllerState> {
+  /// See also [StudyTestController].
+  const StudyTestControllerFamily();
+
+  /// See also [StudyTestController].
+  StudyTestControllerProvider call(
+    String studyId,
+  ) {
+    return StudyTestControllerProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudyTestControllerProvider getProviderOverride(
+    covariant StudyTestControllerProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studyTestControllerProvider';
+}
+
+/// See also [StudyTestController].
+class StudyTestControllerProvider extends AutoDisposeNotifierProviderImpl<
+    StudyTestController, StudyTestControllerState> {
+  /// See also [StudyTestController].
+  StudyTestControllerProvider(
+    String studyId,
+  ) : this._internal(
+          () => StudyTestController()..studyId = studyId,
+          from: studyTestControllerProvider,
+          name: r'studyTestControllerProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studyTestControllerHash,
+          dependencies: StudyTestControllerFamily._dependencies,
+          allTransitiveDependencies:
+              StudyTestControllerFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudyTestControllerProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  StudyTestControllerState runNotifierBuild(
+    covariant StudyTestController notifier,
+  ) {
+    return notifier.build(
+      studyId,
+    );
+  }
+
+  @override
+  Override overrideWith(StudyTestController Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: StudyTestControllerProvider._internal(
+        () => create()..studyId = studyId,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeNotifierProviderElement<StudyTestController,
+      StudyTestControllerState> createElement() {
+    return _StudyTestControllerProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudyTestControllerProvider && other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudyTestControllerRef
+    on AutoDisposeNotifierProviderRef<StudyTestControllerState> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudyTestControllerProviderElement
+    extends AutoDisposeNotifierProviderElement<StudyTestController,
+        StudyTestControllerState> with StudyTestControllerRef {
+  _StudyTestControllerProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudyTestControllerProvider).studyId;
+}
 // ignore_for_file: type=lint
 // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/study/study_test_controller_state.dart b/designer_v2/lib/features/study/study_test_controller_state.dart
index 04645ab20..09b8c3790 100644
--- a/designer_v2/lib/features/study/study_test_controller_state.dart
+++ b/designer_v2/lib/features/study/study_test_controller_state.dart
@@ -5,6 +5,9 @@ import 'package:studyu_designer_v2/repositories/model_repository.dart';
 
 class StudyTestControllerState extends StudyControllerBaseState {
   const StudyTestControllerState({
+    required super.studyId,
+    required super.studyRepository,
+    required super.router,
     required super.currentUser,
     super.studyWithMetadata,
     this.serializedSession = '',
@@ -34,10 +37,13 @@ class StudyTestControllerState extends StudyControllerBaseState {
     String? languageCode,
   }) {
     return StudyTestControllerState(
+      studyId: studyId,
+      studyRepository: studyRepository,
+      router: router,
+      currentUser: currentUser,
       studyWithMetadata: studyWithMetadata ?? super.studyWithMetadata,
       serializedSession: serializedSession ?? this.serializedSession,
       languageCode: languageCode ?? this.languageCode,
-      currentUser: currentUser,
     );
   }
 
diff --git a/designer_v2/lib/localization/app_translation.dart b/designer_v2/lib/localization/app_translation.dart
index 6e3de4376..ea436d6fe 100644
--- a/designer_v2/lib/localization/app_translation.dart
+++ b/designer_v2/lib/localization/app_translation.dart
@@ -7,9 +7,9 @@ AppLocalizations get tr => _tr!;
 AppLocalizations? _tr;
 
 class AppTranslation {
-  static init(WidgetRef ref) async {
-    // Loads the currently selected locale from localeProvider and sets the localization
-    _tr = await AppLocalizations.delegate.load(ref.watch(localeProvider));
+  static init(WidgetRef ref) {
+    // Loads the currently selected locale and sets the localization
+    _tr = lookupAppLocalizations(ref.watch(localeProvider));
   }
 }
 
diff --git a/designer_v2/lib/localization/locale_state.dart b/designer_v2/lib/localization/locale_state.dart
index 01d1d814f..b51b9a083 100644
--- a/designer_v2/lib/localization/locale_state.dart
+++ b/designer_v2/lib/localization/locale_state.dart
@@ -22,41 +22,29 @@ class LocaleState {
 
 @riverpod
 class LocaleStateNotifier extends _$LocaleStateNotifier {
-
   @override
   LocaleState build() {
+    /// Initialize Locale
+    /// Can be run at startup to establish the initial local from storage, or the platform
+    /// 1. Attempts to restore locale from storage
+    /// 2. IF no locale in storage, attempts to set local from the platform settings
+    // Attempt to restore from storage
+    restoreFromStorage();
     return LocaleState(fallbackLocale);
   }
 
   static const _localStorageKey = 'lang';
 
-  //LocaleStateNotifier(this.ref) : super(LocaleState(fallbackLocale));
-
-  /// Initialize Locale
-  /// Can be run at startup to establish the initial local from storage, or the platform
-  /// 1. Attempts to restore locale from storage
-  /// 2. IF no locale in storage, attempts to set local from the platform settings
-  Future<void> initLocale() async {
-    // Attempt to restore from storage
-    bool fromStorageSuccess = await restoreFromStorage();
-
-    // If storage restore did not work, set from platform
-    if (!fromStorageSuccess) {
-      setLocale(ref.read(platformLocaleProvider));
-    }
-  }
-
   /// Set Locale
   /// Attempts to set the locale if it's in our list of supported locales.
   /// IF NOT: get the first locale that matches our language code and set that
   /// ELSE: do nothing.
-  void setLocale(Locale locale) {
-    List<Locale> supportedLocales = ref.read(supportedLocalesProvider);
+  void setLocale(Locale locale) async {
+    List<Locale> supportedLocales = ref.watch(supportedLocalesProvider);
 
     // Set the locale if it's in our list of supported locales
     if (supportedLocales.contains(locale)) {
       state = state.copyWith(locale: locale);
-      save();
     }
 
     // Get the closest language locale and set that instead
@@ -75,15 +63,17 @@ class LocaleStateNotifier extends _$LocaleStateNotifier {
   /// Restore Locale from Storage
   Future<bool> restoreFromStorage() async {
     try {
-      LocaleState? state = await load();
-      if (state == null) {
-        return false;
+      LocaleState? loadedState = await load();
+      if (loadedState != null) {
+        state = loadedState;
+        return true;
       }
-      state = state;
-      return true;
     } catch (e) {
-      return false;
+      rethrow;
     }
+    // If storage restore did not work, set from platform
+    setLocale(ref.watch(platformLocaleProvider));
+    return false;
   }
 
   Future<LocaleState?> load() async {
diff --git a/designer_v2/lib/localization/locale_state.g.dart b/designer_v2/lib/localization/locale_state.g.dart
index b6b7db0f2..69fa9100a 100644
--- a/designer_v2/lib/localization/locale_state.g.dart
+++ b/designer_v2/lib/localization/locale_state.g.dart
@@ -7,7 +7,7 @@ part of 'locale_state.dart';
 // **************************************************************************
 
 String _$localeStateNotifierHash() =>
-    r'726764926faff3bc76af0f45fdd750e75014291f';
+    r'33481e3cb3540bd28ad8ad47668e6f9d1d1c5594';
 
 /// See also [LocaleStateNotifier].
 @ProviderFor(LocaleStateNotifier)
diff --git a/designer_v2/lib/routing/router.dart b/designer_v2/lib/routing/router.dart
index 0c3a77aea..1b6e03144 100644
--- a/designer_v2/lib/routing/router.dart
+++ b/designer_v2/lib/routing/router.dart
@@ -4,11 +4,11 @@ import 'package:go_router/go_router.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/common_views/pages/error_page.dart';
 import 'package:studyu_designer_v2/constants.dart';
-import 'package:studyu_designer_v2/features/app_controller.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/utils/combined_stream_notifier.dart';
 
 import 'router_config.dart';
+
 part 'router.g.dart';
 
 /// How to create a new page & use it for navigation:
@@ -24,7 +24,6 @@ part 'router.g.dart';
 @riverpod
 GoRouter router(RouterRef ref) {
   final authRepository = ref.watch(authRepositoryProvider);
-  final appController = ref.read(appControllerProvider.notifier);
   const defaultLocation = studiesRouteName;
   late final GoRouter router;
 
@@ -43,7 +42,6 @@ GoRouter router(RouterRef ref) {
     // Read most recent app state on re-evaluation (see refreshListenable)
     final isLoggedIn = authRepository.isLoggedIn;
     var allowPasswordReset = authRepository.allowPasswordReset;
-    final isInitialized = ref.watch(appControllerProvider).isInitialized;
 
     // Carry original location through the redirect flow so that we can
     // redirect the user to where they came from after initialization
@@ -67,11 +65,6 @@ GoRouter router(RouterRef ref) {
       return router.namedLocation(name, queryParameters: qParams);
     }
 
-    if (!isInitialized) {
-      // Redirect to splash screen while app is pending initialization
-      return (isOnSplashPage) ? null : namedLocForwarded(splashRouteName);
-    }
-
     // Handle password recovery
     if (allowPasswordReset) {
       if (isOnPasswordRecoveryPage) {
@@ -112,7 +105,7 @@ GoRouter router(RouterRef ref) {
   router = GoRouter(
     refreshListenable: CombinedStreamNotifier([
       // Any stream registered here will trigger the router's redirect logic
-      appController.stream, // initialization events
+      // appController.stream, // initialization events
       authRepository.watchAuthStateChanges() // authentication events
     ]),
     routes: RouterConf.routes,
diff --git a/designer_v2/lib/routing/router.g.dart b/designer_v2/lib/routing/router.g.dart
index 2b859ba8f..dcb8481ee 100644
--- a/designer_v2/lib/routing/router.g.dart
+++ b/designer_v2/lib/routing/router.g.dart
@@ -6,7 +6,7 @@ part of 'router.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$routerHash() => r'a47e2b191040bbb7139da0b71689e8747b14683b';
+String _$routerHash() => r'886e6d20b787c9de54b15fa4dbeb51079e829937';
 
 /// How to create a new page & use it for navigation:
 ///

From 6d1e731619e90389a031a7f1722d0a24394d1897 Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahim.ozkn@outlook.com>
Date: Mon, 10 Jun 2024 23:58:54 +0200
Subject: [PATCH 107/314] refactor: migrated auth_form_controller.dart to
 riverpod v2

---
 .../features/auth/auth_form_controller.dart   |  88 ++++-----
 .../features/auth/auth_form_controller.g.dart | 176 ++++++++++++++++++
 melos.yaml                                    |   4 +-
 3 files changed, 225 insertions(+), 43 deletions(-)
 create mode 100644 designer_v2/lib/features/auth/auth_form_controller.g.dart

diff --git a/designer_v2/lib/features/auth/auth_form_controller.dart b/designer_v2/lib/features/auth/auth_form_controller.dart
index 034feb869..834c36eb4 100644
--- a/designer_v2/lib/features/auth/auth_form_controller.dart
+++ b/designer_v2/lib/features/auth/auth_form_controller.dart
@@ -1,7 +1,10 @@
+import 'dart:async';
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:reactive_forms/reactive_forms.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
@@ -11,6 +14,8 @@ import 'package:studyu_designer_v2/services/notification_service.dart';
 import 'package:studyu_designer_v2/services/notifications.dart';
 import 'package:supabase/supabase.dart';
 
+part 'auth_form_controller.g.dart';
+
 enum AuthFormKey {
   login,
   signup,
@@ -48,19 +53,49 @@ enum AuthFormKey {
   }
 }
 
-class AuthFormController extends StateNotifier<AsyncValue<void>> implements IFormGroupController {
-  AuthFormController({
-    required this.authRepository,
-    required this.notificationService,
-    required this.router,
-  }) : super(const AsyncValue.data(null)) {
+@riverpod
+class AuthFormController extends _$AuthFormController implements IFormGroupController {
+
+  @override
+  AsyncValue<void> build(AuthFormKey formKey) {
+    authRepository = ref.watch(authRepositoryProvider);
+    notificationService = ref.watch(notificationServiceProvider);
+    router = ref.watch(routerProvider);
+
+    formKey = formKey;
+    resetControlsFor(formKey);
+
+    ref.listenSelf((previous, next) {
+      print("authFormController.state updated");
+      if (state.hasError) {
+        final AuthException error = state.error as AuthException;
+        switch (error.message) {
+          case "Invalid login credentials":
+            notificationService.show(Notifications.credentialsInvalid);
+            break;
+          case "User already registered":
+            notificationService.show(Notifications.userAlreadyRegistered);
+            break;
+          default:
+            notificationService.showMessage(error.message);
+        }
+      }
+    });
+
+    ref.onDispose(() {
+      print("authFormControllerProvider.DISPOSE");
+    });
+
     _readDebugUser();
     _onChangeFormKey(formKey);
+
+    return AsyncValue.data(null);
   }
 
-  final IAuthRepository authRepository;
-  final INotificationService notificationService;
-  final GoRouter router;
+
+  late final IAuthRepository authRepository;
+  late final INotificationService notificationService;
+  late final GoRouter router;
 
   // - Form controls
 
@@ -198,6 +233,7 @@ class AuthFormController extends StateNotifier<AsyncValue<void>> implements IFor
     }
     try {
       state = const AsyncValue.loading();
+      print("authRepository.signUp");
       return await authRepository.signUp(email: email, password: password);
     } catch (e) {
       state = AsyncValue.error(e, StackTrace.current);
@@ -223,7 +259,7 @@ class AuthFormController extends StateNotifier<AsyncValue<void>> implements IFor
     } catch (e) {
       state = AsyncValue.error(e, StackTrace.current);
     } finally {
-      state = const AsyncValue.data(null);
+      state =  const AsyncValue.data(null);
     }
     return Future.value(AuthResponse());
   }
@@ -291,35 +327,3 @@ class AuthFormController extends StateNotifier<AsyncValue<void>> implements IFor
     }
   }
 }
-
-final authFormControllerProvider =
-    StateNotifierProvider.autoDispose.family<AuthFormController, AsyncValue<void>, AuthFormKey>((ref, formKey) {
-  final authFormController = AuthFormController(
-    authRepository: ref.watch(authRepositoryProvider),
-    notificationService: ref.watch(notificationServiceProvider),
-    router: ref.watch(routerProvider),
-  );
-  authFormController.formKey = formKey;
-  authFormController.resetControlsFor(formKey);
-  authFormController.addListener((state) {
-    print("authFormController.state updated");
-    if (state.hasError) {
-      final AuthException error = state.error as AuthException;
-      switch (error.message) {
-        case "Invalid login credentials":
-          authFormController.notificationService.show(Notifications.credentialsInvalid);
-          break;
-        case "User already registered":
-          authFormController.notificationService.show(Notifications.userAlreadyRegistered);
-          break;
-        default:
-          authFormController.notificationService.showMessage(error.message);
-      }
-    }
-  });
-  ref.onDispose(() {
-    print("authFormControllerProvider.DISPOSE");
-  });
-  print("authFormControllerProvider");
-  return authFormController;
-});
diff --git a/designer_v2/lib/features/auth/auth_form_controller.g.dart b/designer_v2/lib/features/auth/auth_form_controller.g.dart
new file mode 100644
index 000000000..9fc00fa8b
--- /dev/null
+++ b/designer_v2/lib/features/auth/auth_form_controller.g.dart
@@ -0,0 +1,176 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'auth_form_controller.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$authFormControllerHash() =>
+    r'536f61faf22e316334e07415d09389bff1c76b45';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$AuthFormController
+    extends BuildlessAutoDisposeNotifier<AsyncValue<void>> {
+  late final AuthFormKey formKey;
+
+  AsyncValue<void> build(
+    AuthFormKey formKey,
+  );
+}
+
+/// See also [AuthFormController].
+@ProviderFor(AuthFormController)
+const authFormControllerProvider = AuthFormControllerFamily();
+
+/// See also [AuthFormController].
+class AuthFormControllerFamily extends Family<AsyncValue<void>> {
+  /// See also [AuthFormController].
+  const AuthFormControllerFamily();
+
+  /// See also [AuthFormController].
+  AuthFormControllerProvider call(
+    AuthFormKey formKey,
+  ) {
+    return AuthFormControllerProvider(
+      formKey,
+    );
+  }
+
+  @override
+  AuthFormControllerProvider getProviderOverride(
+    covariant AuthFormControllerProvider provider,
+  ) {
+    return call(
+      provider.formKey,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'authFormControllerProvider';
+}
+
+/// See also [AuthFormController].
+class AuthFormControllerProvider extends AutoDisposeNotifierProviderImpl<
+    AuthFormController, AsyncValue<void>> {
+  /// See also [AuthFormController].
+  AuthFormControllerProvider(
+    AuthFormKey formKey,
+  ) : this._internal(
+          () => AuthFormController()..formKey = formKey,
+          from: authFormControllerProvider,
+          name: r'authFormControllerProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$authFormControllerHash,
+          dependencies: AuthFormControllerFamily._dependencies,
+          allTransitiveDependencies:
+              AuthFormControllerFamily._allTransitiveDependencies,
+          formKey: formKey,
+        );
+
+  AuthFormControllerProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.formKey,
+  }) : super.internal();
+
+  final AuthFormKey formKey;
+
+  @override
+  AsyncValue<void> runNotifierBuild(
+    covariant AuthFormController notifier,
+  ) {
+    return notifier.build(
+      formKey,
+    );
+  }
+
+  @override
+  Override overrideWith(AuthFormController Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: AuthFormControllerProvider._internal(
+        () => create()..formKey = formKey,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        formKey: formKey,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeNotifierProviderElement<AuthFormController, AsyncValue<void>>
+      createElement() {
+    return _AuthFormControllerProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is AuthFormControllerProvider && other.formKey == formKey;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, formKey.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin AuthFormControllerRef
+    on AutoDisposeNotifierProviderRef<AsyncValue<void>> {
+  /// The parameter `formKey` of this provider.
+  AuthFormKey get formKey;
+}
+
+class _AuthFormControllerProviderElement
+    extends AutoDisposeNotifierProviderElement<AuthFormController,
+        AsyncValue<void>> with AuthFormControllerRef {
+  _AuthFormControllerProviderElement(super.provider);
+
+  @override
+  AuthFormKey get formKey => (origin as AuthFormControllerProvider).formKey;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/melos.yaml b/melos.yaml
index 395ae5c53..4b26d44a7 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -64,7 +64,9 @@ scripts:
         "dart run build_runner build --delete-conflicting-outputs"
     description: Generate files with build_runner
     packageFilters:
-      scope: studyu_core
+      scope:
+        - 'studyu_core'
+        - 'studyu_designer_v2'
 
   reset:
     run: |

From 4f0f59a2b108063606803d8436b0cbf9191f6a6e Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 13 May 2024 23:55:07 +0200
Subject: [PATCH 108/314] chore: flutter fix

---
 .../intervention/checkmark_task_widget.dart   |  4 +--
 .../questionnaire_task_widget.dart            |  2 +-
 app/lib/theme.dart                            |  2 +-
 .../questions/choice_question_widget.dart     |  4 +--
 .../lib/common_views/action_inline_menu.dart  |  6 ++--
 .../lib/common_views/action_popup_menu.dart   |  4 +--
 designer_v2/lib/common_views/collapse.dart    |  2 +-
 designer_v2/lib/common_views/icon_picker.dart |  2 +-
 designer_v2/lib/common_views/icons.dart       |  2 +-
 .../lib/common_views/mouse_events.dart        | 18 +++++-----
 .../lib/common_views/navbar_tabbed.dart       |  4 +--
 designer_v2/lib/common_views/search.dart      |  2 +-
 .../lib/common_views/sidesheet/sidesheet.dart |  2 +-
 .../lib/common_views/standard_table.dart      | 16 ++++-----
 designer_v2/lib/common_views/studyu_logo.dart |  2 +-
 .../lib/common_views/sync_indicator.dart      |  4 +--
 .../lib/common_views/text_hyperlink.dart      |  2 +-
 .../dashboard/studies_table_item.dart         |  2 +-
 .../lib/features/forms/form_array_table.dart  |  2 +-
 .../features/recruit/invite_codes_table.dart  |  2 +-
 designer_v2/lib/theme.dart                    | 36 +++++++++----------
 21 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/app/lib/screens/study/tasks/intervention/checkmark_task_widget.dart b/app/lib/screens/study/tasks/intervention/checkmark_task_widget.dart
index 747cd1430..75321a435 100644
--- a/app/lib/screens/study/tasks/intervention/checkmark_task_widget.dart
+++ b/app/lib/screens/study/tasks/intervention/checkmark_task_widget.dart
@@ -25,8 +25,8 @@ class _CheckmarkTaskWidgetState extends State<CheckmarkTaskWidget> {
   Widget build(BuildContext context) {
     return ElevatedButton.icon(
       style: ButtonStyle(
-          backgroundColor: MaterialStateProperty.all<Color>(Colors.green),
-          textStyle: MaterialStateProperty.all<TextStyle>(const TextStyle(color: Colors.white))),
+          backgroundColor: WidgetStateProperty.all<Color>(Colors.green),
+          textStyle: WidgetStateProperty.all<TextStyle>(const TextStyle(color: Colors.white))),
       onPressed: () async {
         if (isRedundantClick(loginClickTime)) return;
         setState(() {
diff --git a/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart b/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart
index e53427ce6..55d24b076 100644
--- a/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart
+++ b/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart
@@ -66,7 +66,7 @@ class _QuestionnaireTaskWidgetState extends State<QuestionnaireTaskWidget> {
         ),
         response != null && responseValidator
             ? ElevatedButton.icon(
-                style: ButtonStyle(backgroundColor: MaterialStateProperty.all<Color>(Colors.green)),
+                style: ButtonStyle(backgroundColor: WidgetStateProperty.all<Color>(Colors.green)),
                 onPressed: () async {
                   if (isRedundantClick(loginClickTime)) {
                     return;
diff --git a/app/lib/theme.dart b/app/lib/theme.dart
index 37fc09fa3..b1b7a8859 100644
--- a/app/lib/theme.dart
+++ b/app/lib/theme.dart
@@ -19,7 +19,7 @@ ThemeData get theme => ThemeData(
           ),
       elevatedButtonTheme: ElevatedButtonThemeData(
         style: ButtonStyle(
-          foregroundColor: MaterialStateProperty.all(Colors.white),
+          foregroundColor: WidgetStateProperty.all(Colors.white),
         ),
       ),
       visualDensity: VisualDensity.adaptivePlatformDensity,
diff --git a/app/lib/widgets/questionnaire/questions/choice_question_widget.dart b/app/lib/widgets/questionnaire/questions/choice_question_widget.dart
index 5e3678a07..fe125fcec 100644
--- a/app/lib/widgets/questionnaire/questions/choice_question_widget.dart
+++ b/app/lib/widgets/questionnaire/questions/choice_question_widget.dart
@@ -61,8 +61,8 @@ class _ChoiceQuestionWidgetState extends State<ChoiceQuestionWidget> {
         OutlinedButton(
           onPressed: confirm,
           style: ButtonStyle(
-            backgroundColor: MaterialStateProperty.all<Color>(Theme.of(context).colorScheme.secondary),
-            foregroundColor: MaterialStateProperty.all<Color>(Colors.white),
+            backgroundColor: WidgetStateProperty.all<Color>(Theme.of(context).colorScheme.secondary),
+            foregroundColor: WidgetStateProperty.all<Color>(Colors.white),
           ),
           child: Text(AppLocalizations.of(context)!.confirm),
         ),
diff --git a/designer_v2/lib/common_views/action_inline_menu.dart b/designer_v2/lib/common_views/action_inline_menu.dart
index 33a5869df..fb60e19d5 100644
--- a/designer_v2/lib/common_views/action_inline_menu.dart
+++ b/designer_v2/lib/common_views/action_inline_menu.dart
@@ -14,7 +14,7 @@ class ActionMenuInline extends StatelessWidget {
       super.key});
 
   final List<ModelAction> actions;
-  final MaterialStateProperty<Color>? iconColor;
+  final WidgetStateProperty<Color>? iconColor;
   final double? iconSize;
   final bool visible;
   final double? splashRadius;
@@ -30,8 +30,8 @@ class ActionMenuInline extends StatelessWidget {
 
     final theme = Theme.of(context);
 
-    defaultIconColor(Set<MaterialState> states) {
-      if (states.contains(MaterialState.hovered)) {
+    defaultIconColor(Set<WidgetState> states) {
+      if (states.contains(WidgetState.hovered)) {
         return theme.colorScheme.secondary.withOpacity(0.8);
       }
       return theme.colorScheme.secondary.withOpacity(0.4);
diff --git a/designer_v2/lib/common_views/action_popup_menu.dart b/designer_v2/lib/common_views/action_popup_menu.dart
index e07d61bef..f9f0df2fd 100644
--- a/designer_v2/lib/common_views/action_popup_menu.dart
+++ b/designer_v2/lib/common_views/action_popup_menu.dart
@@ -57,9 +57,9 @@ class ActionPopUpMenuButton extends StatelessWidget {
     });
   }
 
-  Widget _buildPopupMenu(BuildContext context, Set<MaterialState> state) {
+  Widget _buildPopupMenu(BuildContext context, Set<WidgetState> state) {
     final theme = Theme.of(context);
-    final isHovered = state.contains(MaterialState.hovered);
+    final isHovered = state.contains(WidgetState.hovered);
     final iconColorDefault = triggerIconColor ?? theme.iconTheme.color!.withOpacity(0.7);
     final iconColorHover = triggerIconColorHover ?? theme.iconTheme.color!.withOpacity(0.7);
     final triggerIcon = (orientation == Axis.vertical) ? Icons.more_vert_rounded : Icons.more_horiz_rounded;
diff --git a/designer_v2/lib/common_views/collapse.dart b/designer_v2/lib/common_views/collapse.dart
index 7b4ad7402..76627f837 100644
--- a/designer_v2/lib/common_views/collapse.dart
+++ b/designer_v2/lib/common_views/collapse.dart
@@ -45,7 +45,7 @@ class _CollapsibleState extends State<Collapsible> {
     final headerWidget = widget.headerBuilder?.call(context, isCollapsed) ??
         MouseEventsRegion(
           builder: (context, states) {
-            final isHovered = states.contains(MaterialState.hovered);
+            final isHovered = states.contains(WidgetState.hovered);
 
             // Use [TabBarThemeData] colors for default header styling
             /*Color? actualColor = isHovered
diff --git a/designer_v2/lib/common_views/icon_picker.dart b/designer_v2/lib/common_views/icon_picker.dart
index 308878aaf..e154e8bf9 100644
--- a/designer_v2/lib/common_views/icon_picker.dart
+++ b/designer_v2/lib/common_views/icon_picker.dart
@@ -182,7 +182,7 @@ class IconPickerGallery extends StatelessWidget {
     for (final iconOption in iconOptions) {
       final iconWidget = MouseEventsRegion(
           builder: (context, state) {
-            final isHovered = state.contains(MaterialState.hovered);
+            final isHovered = state.contains(WidgetState.hovered);
             return Container(
               color: isHovered ? Theme.of(context).colorScheme.primary.withOpacity(0.2) : null,
               child: Icon(iconOption.icon!, size: iconSize),
diff --git a/designer_v2/lib/common_views/icons.dart b/designer_v2/lib/common_views/icons.dart
index 37789377c..0dbc58a16 100644
--- a/designer_v2/lib/common_views/icons.dart
+++ b/designer_v2/lib/common_views/icons.dart
@@ -14,7 +14,7 @@ class HelpIcon extends StatelessWidget {
       message: tooltipText,
       child: MouseEventsRegion(
         builder: (context, states) {
-          final iconColor = theme.iconTheme.color?.withOpacity((states.contains(MaterialState.hovered)) ? 0.6 : 0.35) ??
+          final iconColor = theme.iconTheme.color?.withOpacity((states.contains(WidgetState.hovered)) ? 0.6 : 0.35) ??
               theme.colorScheme.onSurface.withOpacity(0.3);
           return Icon(
             Icons.help_outline_rounded,
diff --git a/designer_v2/lib/common_views/mouse_events.dart b/designer_v2/lib/common_views/mouse_events.dart
index d788e1676..c5306de59 100644
--- a/designer_v2/lib/common_views/mouse_events.dart
+++ b/designer_v2/lib/common_views/mouse_events.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
-typedef MouseEventsRegionBuilder = Widget Function(BuildContext context, Set<MaterialState> state);
+typedef MouseEventsRegionBuilder = Widget Function(BuildContext context, Set<WidgetState> state);
 
-typedef MaterialStatesChangedCallback = void Function(Set<MaterialState> state);
+typedef MaterialStatesChangedCallback = void Function(Set<WidgetState> state);
 
 /// Helper widget that allows specifying both [onHover] and [onTap] callbacks
 /// for the widget it contains while exposing the current interaction state
@@ -47,7 +47,7 @@ class MouseEventsRegion extends StatefulWidget {
 }
 
 class _MouseEventsRegionState extends State<MouseEventsRegion> {
-  late final MaterialStatesController statesController;
+  late final WidgetStatesController statesController;
 
   void handleStatesControllerChange() {
     if (widget.onStateChanged != null) {
@@ -60,7 +60,7 @@ class _MouseEventsRegionState extends State<MouseEventsRegion> {
   @override
   void initState() {
     super.initState();
-    statesController = MaterialStatesController();
+    statesController = WidgetStatesController();
     statesController.addListener(handleStatesControllerChange);
   }
 
@@ -68,9 +68,9 @@ class _MouseEventsRegionState extends State<MouseEventsRegion> {
   Widget build(BuildContext context) {
     return GestureDetector(
       onTap: widget.onTap,
-      onTapDown: (_) => statesController.update(MaterialState.pressed, true),
-      onTapUp: (_) => statesController.update(MaterialState.pressed, false),
-      onTapCancel: () => statesController.update(MaterialState.pressed, false),
+      onTapDown: (_) => statesController.update(WidgetState.pressed, true),
+      onTapUp: (_) => statesController.update(WidgetState.pressed, false),
+      onTapCancel: () => statesController.update(WidgetState.pressed, false),
       child: MouseRegion(
           cursor: widget.autoCursor,
           onHover: (e) {
@@ -79,13 +79,13 @@ class _MouseEventsRegionState extends State<MouseEventsRegion> {
             }
           },
           onEnter: (e) {
-            statesController.update(MaterialState.hovered, true);
+            statesController.update(WidgetState.hovered, true);
             if (widget.onExit != null) {
               widget.onEnter!(e);
             }
           },
           onExit: (e) {
-            statesController.update(MaterialState.hovered, false);
+            statesController.update(WidgetState.hovered, false);
             if (widget.onExit != null) {
               widget.onExit!(e);
             }
diff --git a/designer_v2/lib/common_views/navbar_tabbed.dart b/designer_v2/lib/common_views/navbar_tabbed.dart
index 8d9a6c1a9..0e4a530e8 100644
--- a/designer_v2/lib/common_views/navbar_tabbed.dart
+++ b/designer_v2/lib/common_views/navbar_tabbed.dart
@@ -59,7 +59,7 @@ class TabbedNavbar<T extends NavbarTab> extends ConsumerStatefulWidget {
   final TabBarIndicatorSize? indicatorSize;
   final bool isScrollable;
   final Color? backgroundColor;
-  final MaterialStateProperty<Color>? overlayColor;
+  final WidgetStateProperty<Color>? overlayColor;
   final Color? labelColorHover;
   final Color? unselectedLabelColorHover;
 
@@ -229,7 +229,7 @@ class _TabbedNavbarState<T extends NavbarTab> extends ConsumerState<TabbedNavbar
           MouseEventsRegion(
             builder: (context, states) {
               final isSelected = t.index == selectedTabIndex;
-              final isHovered = states.contains(MaterialState.hovered);
+              final isHovered = states.contains(WidgetState.hovered);
 
               TextStyle actualTextStyle = (isSelected)
                   ? theme.tabBarTheme.labelStyle ?? TextStyle(color: theme.tabBarTheme.labelColor)
diff --git a/designer_v2/lib/common_views/search.dart b/designer_v2/lib/common_views/search.dart
index ece8b9b8f..8bbcdee16 100644
--- a/designer_v2/lib/common_views/search.dart
+++ b/designer_v2/lib/common_views/search.dart
@@ -51,7 +51,7 @@ class SearchState extends State<Search> {
       hintText: widget.hintText ?? "Search",
       controller: _searchController,
       leading: const Icon(Icons.search),
-      shadowColor: MaterialStateProperty.resolveWith((states) {
+      shadowColor: WidgetStateProperty.resolveWith((states) {
         return Colors.transparent;
       }),
     );
diff --git a/designer_v2/lib/common_views/sidesheet/sidesheet.dart b/designer_v2/lib/common_views/sidesheet/sidesheet.dart
index 51846da7e..d89ca4c2d 100644
--- a/designer_v2/lib/common_views/sidesheet/sidesheet.dart
+++ b/designer_v2/lib/common_views/sidesheet/sidesheet.dart
@@ -172,7 +172,7 @@ class _SidesheetState extends State<Sidesheet> {
                       isScrollable: true,
                       indicatorSize: TabBarIndicatorSize.label,
                       backgroundColor: backgroundColor,
-                      overlayColor: MaterialStateColor.resolveWith(
+                      overlayColor: WidgetStateColor.resolveWith(
                         (states) => Colors.transparent,
                       ),
                       labelColorHover: tabBarLabelHoverColor,
diff --git a/designer_v2/lib/common_views/standard_table.dart b/designer_v2/lib/common_views/standard_table.dart
index 912d93785..eb7190ac5 100644
--- a/designer_v2/lib/common_views/standard_table.dart
+++ b/designer_v2/lib/common_views/standard_table.dart
@@ -14,7 +14,7 @@ typedef OnSelectHandler<T> = void Function(T item);
 typedef StandardTableRowBuilder = TableRow Function(BuildContext context, List<StandardTableColumn> columns);
 
 typedef StandardTableCellsBuilder<T> = List<Widget> Function(
-    BuildContext context, T item, int rowIdx, Set<MaterialState> states);
+    BuildContext context, T item, int rowIdx, Set<WidgetState> states);
 
 enum StandardTableStyle { plain, material }
 
@@ -124,9 +124,9 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
   /// Cached list of [TableRow]s corresponding to each item in [widget.items]
   final List<TableRow> _cachedRows = [];
 
-  /// Current set of [MaterialState]s for each row in [_cachedRows]
+  /// Current set of [WidgetState]s for each row in [_cachedRows]
   /// Used to keep track of current hover & pressed status
-  final List<Set<MaterialState>> _rowStates = [];
+  final List<Set<WidgetState>> _rowStates = [];
 
   /// Indices to rebuild [TableRow]s for instead of using the cached version
   final Set<int> _dirtyRowIndices = {};
@@ -153,11 +153,11 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
   _initRowStates() {
     _rowStates.clear();
     for (var _ in widget.items) {
-      _rowStates.add(<MaterialState>{});
+      _rowStates.add(<WidgetState>{});
     }
   }
 
-  _onRowStateChanged(int rowIdx, Set<MaterialState> states) {
+  _onRowStateChanged(int rowIdx, Set<WidgetState> states) {
     setState(() {
       _rowStates[rowIdx] = states;
       // flag row for rebuild to reflect its current set of [MaterialStatus]
@@ -402,11 +402,11 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
     BuildContext context,
     T item,
     int rowIdx,
-    Set<MaterialState> states,
+    Set<WidgetState> states,
   ) {
     final theme = Theme.of(context);
-    final rowIsHovered = states.contains(MaterialState.hovered);
-    final rowIsPressed = states.contains(MaterialState.pressed);
+    final rowIsHovered = states.contains(WidgetState.hovered);
+    final rowIsPressed = states.contains(WidgetState.pressed);
     final rowColor =
         (widget.rowStyle == StandardTableStyle.material) ? theme.colorScheme.onPrimary : Colors.transparent;
 
diff --git a/designer_v2/lib/common_views/studyu_logo.dart b/designer_v2/lib/common_views/studyu_logo.dart
index 077265402..421460ba4 100644
--- a/designer_v2/lib/common_views/studyu_logo.dart
+++ b/designer_v2/lib/common_views/studyu_logo.dart
@@ -11,7 +11,7 @@ class StudyULogo extends StatelessWidget {
   Widget build(BuildContext context) {
     return MouseEventsRegion(
         builder: (context, states) {
-          final isHovered = states.contains(MaterialState.hovered);
+          final isHovered = states.contains(WidgetState.hovered);
           final colorBlendFactor = isHovered ? 0.5 : 0.6;
 
           return Container(
diff --git a/designer_v2/lib/common_views/sync_indicator.dart b/designer_v2/lib/common_views/sync_indicator.dart
index 77629da3e..fb588fd91 100644
--- a/designer_v2/lib/common_views/sync_indicator.dart
+++ b/designer_v2/lib/common_views/sync_indicator.dart
@@ -78,9 +78,9 @@ class _SyncIndicatorState extends State<SyncIndicator> with SingleTickerProvider
     );
   }
 
-  Widget buildIndicator(BuildContext context, Set<MaterialState> states) {
+  Widget buildIndicator(BuildContext context, Set<WidgetState> states) {
     final theme = Theme.of(context);
-    final isHovered = states.contains(MaterialState.hovered);
+    final isHovered = states.contains(WidgetState.hovered);
     double actualOpacity = (widget.state.isRefreshing) ? 0.5 : 0.2;
     actualOpacity += (isHovered) ? 0.2 : 0.0;
     final iconColor = theme.iconTheme.color!.withOpacity(actualOpacity);
diff --git a/designer_v2/lib/common_views/text_hyperlink.dart b/designer_v2/lib/common_views/text_hyperlink.dart
index 3fb5380fa..2c1f3d4cd 100644
--- a/designer_v2/lib/common_views/text_hyperlink.dart
+++ b/designer_v2/lib/common_views/text_hyperlink.dart
@@ -51,7 +51,7 @@ class _HyperlinkState extends State<Hyperlink> {
 
     return MouseEventsRegion(
       builder: (context, states) {
-        final isHovered = states.contains(MaterialState.hovered);
+        final isHovered = states.contains(WidgetState.hovered);
 
         final visitedColor = widget.visitedColor ?? widget.linkColor;
         final visitedHoverColor = widget.hoverColor ?? visitedColor.faded(ThemeConfig.kHoverFadeFactor);
diff --git a/designer_v2/lib/features/dashboard/studies_table_item.dart b/designer_v2/lib/features/dashboard/studies_table_item.dart
index 1636e2a0f..09a674a1a 100644
--- a/designer_v2/lib/features/dashboard/studies_table_item.dart
+++ b/designer_v2/lib/features/dashboard/studies_table_item.dart
@@ -63,7 +63,7 @@ class _StudiesTableItemState extends State<StudiesTableItem> {
       );
     }
 
-    Widget getRespectivePinIcon(Set<MaterialState> state) {
+    Widget getRespectivePinIcon(Set<WidgetState> state) {
       if (isHoveringPin) {
         return widget.isPinned ? icon(MdiIcons.pinOff) : icon(MdiIcons.pin);
       } else {
diff --git a/designer_v2/lib/features/forms/form_array_table.dart b/designer_v2/lib/features/forms/form_array_table.dart
index efe6114d1..5082209e6 100644
--- a/designer_v2/lib/features/forms/form_array_table.dart
+++ b/designer_v2/lib/features/forms/form_array_table.dart
@@ -129,7 +129,7 @@ class FormArrayTable<T> extends StatelessWidget {
     );
   }
 
-  List<Widget> _buildRow(BuildContext context, T item, int rowIdx, Set<MaterialState> states) {
+  List<Widget> _buildRow(BuildContext context, T item, int rowIdx, Set<WidgetState> states) {
     final tableTextStyleSecondary = Theme.of(context).textTheme.bodyMedium;
     return [
       CustomScrollView(physics: const NeverScrollableScrollPhysics(), scrollDirection: Axis.horizontal, slivers: [
diff --git a/designer_v2/lib/features/recruit/invite_codes_table.dart b/designer_v2/lib/features/recruit/invite_codes_table.dart
index 919caa692..f4059ef84 100644
--- a/designer_v2/lib/features/recruit/invite_codes_table.dart
+++ b/designer_v2/lib/features/recruit/invite_codes_table.dart
@@ -57,7 +57,7 @@ class StudyInvitesTable extends StatelessWidget {
     );
   }
 
-  List<Widget> _buildRow(BuildContext context, StudyInvite item, int rowIdx, Set<MaterialState> states) {
+  List<Widget> _buildRow(BuildContext context, StudyInvite item, int rowIdx, Set<WidgetState> states) {
     final theme = Theme.of(context);
     final mutedTextStyle = ThemeConfig.bodyTextBackground(theme);
 
diff --git a/designer_v2/lib/theme.dart b/designer_v2/lib/theme.dart
index fa3b5d9ff..73e44ebd0 100644
--- a/designer_v2/lib/theme.dart
+++ b/designer_v2/lib/theme.dart
@@ -210,7 +210,7 @@ class ThemeProvider extends InheritedWidget {
   BottomNavigationBarThemeData bottomNavigationBarTheme(ColorScheme colors) {
     return BottomNavigationBarThemeData(
       type: BottomNavigationBarType.fixed,
-      backgroundColor: colors.surfaceVariant,
+      backgroundColor: colors.surfaceContainerHighest,
       selectedItemColor: colors.onSurface,
       unselectedItemColor: colors.onSurfaceVariant,
       elevation: 0,
@@ -220,26 +220,26 @@ class ThemeProvider extends InheritedWidget {
 
   SwitchThemeData switchTheme(ColorScheme colors) {
     return SwitchThemeData(
-      thumbColor: MaterialStateColor.resolveWith((states) {
-        if (states.contains(MaterialState.selected)) {
-          if (states.contains(MaterialState.disabled)) {
+      thumbColor: WidgetStateColor.resolveWith((states) {
+        if (states.contains(WidgetState.selected)) {
+          if (states.contains(WidgetState.disabled)) {
             return colors.primary.withOpacity(0.6);
           }
           return colors.primary;
         }
-        if (states.contains(MaterialState.disabled)) {
+        if (states.contains(WidgetState.disabled)) {
           return Colors.white.withOpacity(0.6);
         }
         return Colors.white;
       }),
-      trackColor: MaterialStateColor.resolveWith((states) {
-        if (states.contains(MaterialState.selected)) {
-          if (states.contains(MaterialState.disabled)) {
+      trackColor: WidgetStateColor.resolveWith((states) {
+        if (states.contains(WidgetState.selected)) {
+          if (states.contains(WidgetState.disabled)) {
             return colors.primary.withOpacity(0.5 * 0.6);
           }
           return colors.primary.withOpacity(0.5);
         }
-        if (states.contains(MaterialState.disabled)) {
+        if (states.contains(WidgetState.disabled)) {
           return colors.onSurface.withOpacity(0.3 * 0.6);
         }
         return colors.onSurface.withOpacity(0.3);
@@ -259,14 +259,14 @@ class ThemeProvider extends InheritedWidget {
       disabledBorder: OutlineInputBorder(
         borderRadius: BorderRadius.circular(5),
         borderSide: BorderSide(
-          color: colors.surfaceVariant.withOpacity(0.6),
+          color: colors.surfaceContainerHighest.withOpacity(0.6),
           width: 1.0,
         ),
       ),
       enabledBorder: OutlineInputBorder(
         borderRadius: BorderRadius.circular(5),
         borderSide: BorderSide(
-          color: colors.surfaceVariant.withOpacity(0.8),
+          color: colors.surfaceContainerHighest.withOpacity(0.8),
           width: 1.0,
         ),
       ),
@@ -341,9 +341,9 @@ class ThemeProvider extends InheritedWidget {
   CheckboxThemeData checkboxTheme(ColorScheme colors) {
     return CheckboxThemeData(
       splashRadius: 18.0,
-      fillColor: MaterialStateColor.resolveWith((states) {
-        if (states.contains(MaterialState.selected)) {
-          if (states.contains(MaterialState.disabled)) {
+      fillColor: WidgetStateColor.resolveWith((states) {
+        if (states.contains(WidgetState.selected)) {
+          if (states.contains(WidgetState.disabled)) {
             return colors.primary.withOpacity(0.5 * 1.0);
           }
           return colors.primary.withOpacity(1.0);
@@ -360,11 +360,11 @@ class ThemeProvider extends InheritedWidget {
   RadioThemeData radioTheme(ColorScheme colors) {
     return RadioThemeData(
       splashRadius: 18.0,
-      fillColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
-        if (states.contains(MaterialState.disabled)) {
+      fillColor: WidgetStateProperty.resolveWith<Color?>((Set<WidgetState> states) {
+        if (states.contains(WidgetState.disabled)) {
           return null;
         }
-        if (states.contains(MaterialState.selected)) {
+        if (states.contains(WidgetState.selected)) {
           return colors.primary.withOpacity(0.9);
         }
         return null;
@@ -436,7 +436,7 @@ class ThemeProvider extends InheritedWidget {
       tabBarTheme: tabBarTheme(colorScheme),
       drawerTheme: drawerTheme(colorScheme),
       snackBarTheme: snackBarThemeData(colorScheme),
-      scaffoldBackgroundColor: colorScheme.background,
+      scaffoldBackgroundColor: colorScheme.surface,
       inputDecorationTheme: inputDecorationTheme(colorScheme),
       switchTheme: switchTheme(colorScheme),
       textTheme: textTheme(colorScheme),

From fafceeca878db13bb5391327483acb71e2b634e9 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 13 May 2024 23:55:23 +0200
Subject: [PATCH 109/314] chore: update html files

---
 app/web/index.html         | 23 +----------------------
 designer_v2/web/index.html | 25 +------------------------
 2 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/app/web/index.html b/app/web/index.html
index f2135681c..57d3c5787 100644
--- a/app/web/index.html
+++ b/app/web/index.html
@@ -34,29 +34,8 @@
 
   <title>StudyU App | StudyU Health</title>
   <link rel="manifest" href="manifest.json">
-
-  <script>
-    // The value below is injected by flutter build, do not touch.
-    const serviceWorkerVersion = null;
-  </script>
-  <!-- This script adds the flutter initialization JS code -->
-  <script src="flutter.js" defer></script>
 </head>
 <body>
-  <script>
-    window.addEventListener('load', function(ev) {
-      // Download main.dart.js
-      _flutter.loader.loadEntrypoint({
-        serviceWorker: {
-          serviceWorkerVersion: serviceWorkerVersion,
-        },
-        onEntrypointLoaded: function(engineInitializer) {
-          engineInitializer.initializeEngine().then(function(appRunner) {
-            appRunner.runApp();
-          });
-        }
-      });
-    });
-  </script>
+  <script src="flutter_bootstrap.js" async></script>
 </body>
 </html>
diff --git a/designer_v2/web/index.html b/designer_v2/web/index.html
index 40041af31..9d3acfe06 100644
--- a/designer_v2/web/index.html
+++ b/designer_v2/web/index.html
@@ -35,31 +35,8 @@
 
   <title>Designer | StudyU Health</title>
   <link rel="manifest" href="manifest.json">
-
-  <script>
-    // The value below is injected by flutter build, do not touch.
-    const serviceWorkerVersion = null;
-  </script>
-  <!-- This script adds the flutter initialization JS code -->
-  <script src="flutter.js" defer></script>
 </head>
 <body>
-  <script>
-    window.addEventListener('load', function(ev) {
-      // Download main.dart.js
-      _flutter.loader.loadEntrypoint({
-        serviceWorker: {
-          serviceWorkerVersion: serviceWorkerVersion,
-        },
-        onEntrypointLoaded: function(engineInitializer) {
-          engineInitializer.initializeEngine({
-            useColorEmoji: true,
-          }).then(function(appRunner) {
-            appRunner.runApp();
-          });
-        }
-      });
-    });
-  </script>
+  <script src="flutter_bootstrap.js" async></script>
 </body>
 </html>

From 59af4ec47aa242a3d7238bf1ff983a51ec695b9b Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 13 May 2024 23:55:29 +0200
Subject: [PATCH 110/314] chore: upgrade deps

---
 app/pubspec.lock            | 36 ++++++++++++++---------------
 app/pubspec.yaml            |  2 +-
 designer_v2/pubspec.lock    | 45 +++++++++++++++++++------------------
 designer_v2/pubspec.yaml    |  6 +++++
 flutter_common/pubspec.lock | 24 ++++++++++----------
 5 files changed, 60 insertions(+), 53 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index 8fda1fbd1..4dcbdb9b8 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -93,18 +93,18 @@ packages:
     dependency: "direct main"
     description:
       name: camera
-      sha256: dfa8fc5a1adaeb95e7a54d86a5bd56f4bb0e035515354c8ac6d262e35cec2ec8
+      sha256: cf8ed1789aa244392cfc49d13e97879700476ba641c92500e01f630e109c0f6c
       url: "https://pub.dev"
     source: hosted
-    version: "0.10.6"
-  camera_android:
+    version: "0.11.0"
+  camera_android_camerax:
     dependency: transitive
     description:
-      name: camera_android
-      sha256: "7b0aba6398afa8475e2bc9115d976efb49cf8db781e922572d443795c04a4f4f"
+      name: camera_android_camerax
+      sha256: a2aac9505259a86d5eb6b0a14116b9a64f34a4735009f47731e59834218a5a29
       url: "https://pub.dev"
     source: hosted
-    version: "0.10.9+1"
+    version: "0.6.5+1"
   camera_avfoundation:
     dependency: transitive
     description:
@@ -625,26 +625,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.4"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.3"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
@@ -697,10 +697,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.12.0"
   mime:
     dependency: transitive
     description:
@@ -1220,10 +1220,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.0"
   timeline_tile:
     dependency: "direct main"
     description:
@@ -1412,10 +1412,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.2.1"
   wakelock_plus:
     dependency: "direct main"
     description:
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 8599dffca..41a7b0e33 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -8,7 +8,7 @@ repository: https://github.com/hpi-studyu/studyu
 environment:
   sdk: '>=3.2.0 <4.0.0'
 dependencies:
-  camera: ^0.10.6
+  camera: ^0.11.0
   collection: ^1.18.0
   cross_file: ^0.3.4+1
   cupertino_icons: ^1.0.8
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index d76411159..899f3dd47 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -241,10 +241,11 @@ packages:
   flutter_colorpicker:
     dependency: "direct main"
     description:
-      name: flutter_colorpicker
-      sha256: "458a6ed8ea480eb16ff892aedb4b7092b2804affd7e046591fb03127e8d8ef8b"
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: master
+      resolved-ref: "92bdb69a313a56c391ef148c12ef6539bd31253d"
+      url: "https://github.com/mchome/flutter_colorpicker"
+    source: git
     version: "1.0.3"
   flutter_dotenv:
     dependency: transitive
@@ -456,10 +457,10 @@ packages:
     dependency: transitive
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   io:
     dependency: transitive
     description:
@@ -496,26 +497,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.4"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.3"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
@@ -568,10 +569,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.12.0"
   mime:
     dependency: transitive
     description:
@@ -1091,26 +1092,26 @@ packages:
     dependency: "direct dev"
     description:
       name: test
-      sha256: a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f
+      sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073"
       url: "https://pub.dev"
     source: hosted
-    version: "1.24.9"
+    version: "1.25.2"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.0"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a
+      sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.9"
+    version: "0.6.0"
   typed_data:
     dependency: transitive
     description:
@@ -1203,10 +1204,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.2.1"
   watcher:
     dependency: transitive
     description:
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 4beebd13e..6fe718a08 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -39,6 +39,12 @@ dependencies:
   url_launcher: ^6.2.6
   uuid: ^4.4.0
 
+dependency_overrides:
+  flutter_colorpicker: # todo this package is outdated and should be replaced, if possible because reactive_color_picker depends on it
+    git:
+      url: https://github.com/mchome/flutter_colorpicker
+      ref: master  # or 786d04363f587b818ce585d25b9c2bb62de95aba
+
 dev_dependencies:
   custom_lint:
   flutter_launcher_icons: ^0.13.1
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index bfe5e83fe..816c0d9aa 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -244,26 +244,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.4"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.3"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
@@ -300,10 +300,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.12.0"
   mime:
     dependency: transitive
     description:
@@ -584,10 +584,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.0"
   typed_data:
     dependency: transitive
     description:
@@ -680,10 +680,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.2.1"
   web:
     dependency: transitive
     description:

From 0446baf5e878517cc87b7763eb3afc5817193ff7 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 14 May 2024 17:12:47 +0200
Subject: [PATCH 111/314] style: visual fixes for flutter 3.22

---
 designer_v2/lib/theme.dart | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/designer_v2/lib/theme.dart b/designer_v2/lib/theme.dart
index 73e44ebd0..1cceba685 100644
--- a/designer_v2/lib/theme.dart
+++ b/designer_v2/lib/theme.dart
@@ -131,10 +131,18 @@ class ThemeProvider extends InheritedWidget {
 
   ColorScheme colors(Brightness brightness, Color? targetColor) {
     final dynamicPrimary = brightness == Brightness.light ? lightDynamic?.primary : darkDynamic?.primary;
-    return ColorScheme.fromSeed(
+    final scheme = SchemeFidelity(sourceColorHct: dynamicPrimary != null
+        ? Hct.fromInt(dynamicPrimary.value)
+        : Hct.fromInt(source(targetColor).value), isDark: false, contrastLevel: 0.0);
+    final colorScheme = ColorScheme.fromSeed(
       seedColor: dynamicPrimary ?? source(targetColor),
+      // todo use dynamicSchemeVariant once its in the flutter stable channel
+      // dynamicSchemeVariant: DynamicSchemeVariant.fidelity,
       brightness: brightness,
     );
+    return colorScheme.copyWith(
+      primary: Color(MaterialDynamicColors.primary.getArgb(scheme)),
+    );
   }
 
   ShapeBorder get shapeMedium => RoundedRectangleBorder(
@@ -255,7 +263,7 @@ class ThemeProvider extends InheritedWidget {
       focusColor: Colors.white,
       isDense: true,
       hintStyle: TextStyle(color: colors.onSurfaceVariant.withOpacity(0.4)),
-      //contentPadding: EdgeInsets.fromLTRB(16.0, 16.0, 16.0, 16.0),
+      contentPadding: const EdgeInsets.fromLTRB(16.0, 16.0, 16.0, 16.0),
       disabledBorder: OutlineInputBorder(
         borderRadius: BorderRadius.circular(5),
         borderSide: BorderSide(
@@ -326,9 +334,7 @@ class ThemeProvider extends InheritedWidget {
   }
 
   DrawerThemeData drawerTheme(ColorScheme colors) {
-    return const DrawerThemeData(
-      backgroundColor: Colors.white,
-    );
+    return const DrawerThemeData();
   }
 
   IconThemeData iconTheme(ColorScheme colors) {

From 8755ba903c17158ab84b2b9da1c4503b75b23801 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 14 May 2024 17:13:59 +0200
Subject: [PATCH 112/314] fix: Flutter 3.22 arg error

---
 designer_v2/lib/repositories/supabase_client.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_v2/lib/repositories/supabase_client.dart b/designer_v2/lib/repositories/supabase_client.dart
index 1d92f8e10..146bde635 100644
--- a/designer_v2/lib/repositories/supabase_client.dart
+++ b/designer_v2/lib/repositories/supabase_client.dart
@@ -31,7 +31,7 @@ typedef PostgrestDataCallback = Object Function(dynamic data);
 mixin SupabaseQueryMixin on SupabaseClientDependant {
   // - Networking
 
-  Future<List<T>> deleteAll<T extends SupabaseObject>(Map<String, dynamic> selectionCriteria) async {
+  Future<List<T>> deleteAll<T extends SupabaseObject>(Map<String, Object> selectionCriteria) async {
     try {
       final data = await supabaseClient.from(tableName(T)).delete().match(selectionCriteria);
       if (data == null) return [];

From ee9d454c6be130798df393bcfbbe42f238426ccc Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 14 May 2024 17:16:19 +0200
Subject: [PATCH 113/314] chore: upgrade deps

---
 app/pubspec.lock            | 72 ++++++++++++++++++-------------------
 app/pubspec.yaml            |  8 ++---
 core/pubspec.lock           | 55 +++++++++++++++++-----------
 core/pubspec.yaml           |  4 +--
 designer_v2/pubspec.lock    | 56 ++++++++++++++---------------
 designer_v2/pubspec.yaml    | 10 +++---
 flutter_common/pubspec.lock | 44 +++++++++++------------
 flutter_common/pubspec.yaml |  2 +-
 8 files changed, 132 insertions(+), 119 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index 4dcbdb9b8..c5eb46f26 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -5,18 +5,18 @@ packages:
     dependency: transitive
     description:
       name: app_links
-      sha256: "0fd41f0501f131d931251e0942ac63d6216096a0052aeca037915c2c1deeb121"
+      sha256: "8c6ef5ba9e26b720d4c9073826befb87df2ab5e7a81c22b6c3145080b5e736c9"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "6.0.2"
   archive:
     dependency: transitive
     description:
       name: archive
-      sha256: "0763b45fa9294197a2885c8567927e2830ade852e5c896fd4ab7e0e348d0f373"
+      sha256: ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265
       url: "https://pub.dev"
     source: hosted
-    version: "3.5.0"
+    version: "3.5.1"
   args:
     dependency: transitive
     description:
@@ -457,10 +457,10 @@ packages:
     dependency: transitive
     description:
       name: functions_client
-      sha256: a70b0dd9a1c35d05d1141557f7e49ffe4de5f450ffde31755a9eeeadca03b8ee
+      sha256: "48659e5c6a4bbe02659102bf6406a0cf39142202deae65aacfa78688f2e68946"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   fwfh_cached_network_image:
     dependency: transitive
     description:
@@ -513,10 +513,10 @@ packages:
     dependency: transitive
     description:
       name: gotrue
-      sha256: c9c984f088320a5c5e87c7a34571e3de3982cca4cbd8b978e59d36baf748edfb
+      sha256: aaefc58b168723f8b5ca2a70ee8c0a051cba16f112be50f41c1ff8fb96b6a6df
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.1"
+    version: "2.7.0"
   gtk:
     dependency: transitive
     description:
@@ -777,10 +777,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
   path_provider_linux:
     dependency: transitive
     description:
@@ -825,10 +825,10 @@ packages:
     dependency: transitive
     description:
       name: permission_handler_android
-      sha256: "1acac6bae58144b442f11e66621c062aead9c99841093c38f5bcdcc24c1c3474"
+      sha256: "8bb852cd759488893805c3161d0b2b5db55db52f773dbb014420b304055ba2c5"
       url: "https://pub.dev"
     source: hosted
-    version: "12.0.5"
+    version: "12.0.6"
   permission_handler_apple:
     dependency: transitive
     description:
@@ -889,10 +889,10 @@ packages:
     dependency: transitive
     description:
       name: postgrest
-      sha256: "9a3b590cf123f8d323b6a918702e037f037027d12a01902f9dc6ee38fdc05d6c"
+      sha256: f1f78470a74c611811132ff12acdef9c08b3ec65b61e88161a057d6cc5fbbd83
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   provider:
     dependency: "direct main"
     description:
@@ -1017,26 +1017,26 @@ packages:
     dependency: transitive
     description:
       name: sentry
-      sha256: "1d2952d40b99da0dc4bf3ba4797e3985dd60cc61a13d0a1d2c62b02f6528441a"
+      sha256: fd1fbfe860c05f5c52820ec4dbf2b6473789e83ead26cfc18bca4fe80bf3f008
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.0"
+    version: "8.2.0"
   sentry_flutter:
     dependency: "direct main"
     description:
       name: sentry_flutter
-      sha256: "848aaccfc75f1d35d5f7e5230770761f1b2a33e604f24498200566443da1470a"
+      sha256: c64f0aec5332bec87083b61514d1b6b29e435b9045d03ce1575861192b9a5680
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.0"
+    version: "8.2.0"
   sentry_logging:
     dependency: "direct main"
     description:
       name: sentry_logging
-      sha256: "86a0b30a868cd9738694ddde4b82a2ac60b1e33abdff04216dfc556ef6d56fb1"
+      sha256: edfc054d65f0257303540f9fe76820005a710440eee062052efdff5252ecc121
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.0"
+    version: "8.2.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -1057,10 +1057,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c"
+      sha256: "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.5"
+    version: "2.4.0"
   shared_preferences_linux:
     dependency: transitive
     description:
@@ -1118,10 +1118,10 @@ packages:
     dependency: transitive
     description:
       name: sqflite
-      sha256: "5ce2e1a15e822c3b4bfb5400455775e421da7098eed8adc8f26298ada7c9308c"
+      sha256: a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.3"
+    version: "2.3.3+1"
   sqflite_common:
     dependency: transitive
     description:
@@ -1188,18 +1188,18 @@ packages:
     dependency: "direct main"
     description:
       name: supabase
-      sha256: ef407187b18c440f4a5c3f3cf30eb5cc1daadd4ff5616febf445a37e0e0ed34e
+      sha256: cd3d6bcc6b15ffd6eacea92ec2a2d9f09bf72c8a95c09a14f3b523ae9ee99cb6
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   supabase_flutter:
     dependency: "direct main"
     description:
       name: supabase_flutter
-      sha256: "6a77bd6ef6dc451bb2561de0334d68d620b84d7df1de1448dd7962ed5d1a79ea"
+      sha256: "7f552ddddb2f1ac2925dc70af655b39bb64f8d3c1ca6dda58685d1fb4eec447c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.2"
+    version: "2.5.3"
   synchronized:
     dependency: transitive
     description:
@@ -1284,10 +1284,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5"
+      sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.5"
+    version: "6.3.0"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -1300,10 +1300,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234
+      sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.2.0"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -1388,10 +1388,10 @@ packages:
     dependency: transitive
     description:
       name: video_player_avfoundation
-      sha256: "00c49b1d68071341397cf760b982c1e26ed9232464c8506ee08378a5cca5070d"
+      sha256: d1e9a824f2b324000dc8fb2dcb2a3285b6c1c7c487521c63306cc5b394f68a7c
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.7"
+    version: "2.6.1"
   video_player_platform_interface:
     dependency: transitive
     description:
@@ -1460,10 +1460,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: f038ee2fae73b509dde1bc9d2c5a50ca92054282de17631a9a3d515883740934
+      sha256: dad3313c9ead95517bb1cae5e1c9d20ba83729d5a59e5e83c0a2d66203f27f91
       url: "https://pub.dev"
     source: hosted
-    version: "3.16.0"
+    version: "3.16.1"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 41a7b0e33..1cd9333f1 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -35,13 +35,13 @@ dependencies:
   quiver: ^3.2.1
   rainbow_color: ^2.0.1
   record: ^5.0.5
-  sentry_flutter: ^8.1.0
-  sentry_logging: ^8.1.0
+  sentry_flutter: ^8.2.0
+  sentry_logging: ^8.2.0
   shared_preferences: ^2.2.3
   studyu_core: ^4.4.2
   studyu_flutter_common: ^1.8.3
-  supabase: ^2.1.2
-  supabase_flutter: ^2.5.2
+  supabase: ^2.1.3
+  supabase_flutter: ^2.5.3
   timeline_tile: ^2.0.0
   timezone: ^0.9.3
   universal_html: ^2.2.4
diff --git a/core/pubspec.lock b/core/pubspec.lock
index e5bb2e1a2..8d05cbe27 100644
--- a/core/pubspec.lock
+++ b/core/pubspec.lock
@@ -5,18 +5,23 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
+      sha256: "5aaf60d96c4cd00fe7f21594b5ad6a1b699c80a27420f8a837f4d68473ef09e3"
       url: "https://pub.dev"
     source: hosted
-    version: "67.0.0"
+    version: "68.0.0"
+  _macros:
+    dependency: transitive
+    description: dart
+    source: sdk
+    version: "0.1.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
+      sha256: "21f1d3720fd1c70316399d5e2bccaebb415c434592d778cce8acb967b8578808"
       url: "https://pub.dev"
     source: hosted
-    version: "6.4.1"
+    version: "6.5.0"
   args:
     dependency: transitive
     description:
@@ -141,10 +146,10 @@ packages:
     dependency: transitive
     description:
       name: coverage
-      sha256: "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76"
+      sha256: "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.7.2"
+    version: "1.8.0"
   crypto:
     dependency: transitive
     description:
@@ -197,10 +202,10 @@ packages:
     dependency: transitive
     description:
       name: functions_client
-      sha256: a70b0dd9a1c35d05d1141557f7e49ffe4de5f450ffde31755a9eeeadca03b8ee
+      sha256: "48659e5c6a4bbe02659102bf6406a0cf39142202deae65aacfa78688f2e68946"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   glob:
     dependency: transitive
     description:
@@ -213,10 +218,10 @@ packages:
     dependency: transitive
     description:
       name: gotrue
-      sha256: c9c984f088320a5c5e87c7a34571e3de3982cca4cbd8b978e59d36baf748edfb
+      sha256: aaefc58b168723f8b5ca2a70ee8c0a051cba16f112be50f41c1ff8fb96b6a6df
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.1"
+    version: "2.7.0"
   graphs:
     dependency: transitive
     description:
@@ -313,6 +318,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
+  macros:
+    dependency: transitive
+    description:
+      name: macros
+      sha256: "12e8a9842b5a7390de7a781ec63d793527582398d16ea26c60fed58833c9ae79"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0-main.0"
   matcher:
     dependency: transitive
     description:
@@ -325,10 +338,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.14.0"
+    version: "1.15.0"
   mime:
     dependency: transitive
     description:
@@ -373,10 +386,10 @@ packages:
     dependency: transitive
     description:
       name: postgrest
-      sha256: "9a3b590cf123f8d323b6a918702e037f037027d12a01902f9dc6ee38fdc05d6c"
+      sha256: f1f78470a74c611811132ff12acdef9c08b3ec65b61e88161a057d6cc5fbbd83
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   pub_semver:
     dependency: transitive
     description:
@@ -429,10 +442,10 @@ packages:
     dependency: "direct main"
     description:
       name: sentry
-      sha256: "1d2952d40b99da0dc4bf3ba4797e3985dd60cc61a13d0a1d2c62b02f6528441a"
+      sha256: fd1fbfe860c05f5c52820ec4dbf2b6473789e83ead26cfc18bca4fe80bf3f008
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.0"
+    version: "8.2.0"
   shelf:
     dependency: transitive
     description:
@@ -557,10 +570,10 @@ packages:
     dependency: "direct main"
     description:
       name: supabase
-      sha256: ef407187b18c440f4a5c3f3cf30eb5cc1daadd4ff5616febf445a37e0e0ed34e
+      sha256: cd3d6bcc6b15ffd6eacea92ec2a2d9f09bf72c8a95c09a14f3b523ae9ee99cb6
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   term_glyph:
     dependency: transitive
     description:
@@ -621,10 +634,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+      sha256: "7475cb4dd713d57b6f7464c0e13f06da0d535d8b2067e188962a59bac2cf280b"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.1"
+    version: "14.2.2"
   watcher:
     dependency: transitive
     description:
@@ -674,4 +687,4 @@ packages:
     source: hosted
     version: "2.0.0"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
+  dart: ">=3.4.0-256.0.dev <4.0.0"
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index c5361ac52..f92a32290 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -13,8 +13,8 @@ dependencies:
   json_annotation: ^4.9.0
   logger: ^2.3.0
   quiver: ^3.2.1
-  sentry: ^8.1.0
-  supabase: ^2.1.2
+  sentry: ^8.2.0
+  supabase: ^2.1.3
   uuid: ^4.4.0
 
 dev_dependencies:
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 899f3dd47..039347595 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -29,10 +29,10 @@ packages:
     dependency: transitive
     description:
       name: app_links
-      sha256: "0fd41f0501f131d931251e0942ac63d6216096a0052aeca037915c2c1deeb121"
+      sha256: "8c6ef5ba9e26b720d4c9073826befb87df2ab5e7a81c22b6c3145080b5e736c9"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "6.0.2"
   archive:
     dependency: "direct main"
     description:
@@ -125,10 +125,10 @@ packages:
     dependency: transitive
     description:
       name: coverage
-      sha256: "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76"
+      sha256: "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.7.2"
+    version: "1.8.0"
   crypto:
     dependency: transitive
     description:
@@ -359,10 +359,10 @@ packages:
     dependency: transitive
     description:
       name: frontend_server_client
-      sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
+      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "4.0.0"
   fuchsia_remote_debug_protocol:
     dependency: transitive
     description: flutter
@@ -372,10 +372,10 @@ packages:
     dependency: transitive
     description:
       name: functions_client
-      sha256: a70b0dd9a1c35d05d1141557f7e49ffe4de5f450ffde31755a9eeeadca03b8ee
+      sha256: "48659e5c6a4bbe02659102bf6406a0cf39142202deae65aacfa78688f2e68946"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   glob:
     dependency: transitive
     description:
@@ -388,18 +388,18 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: "81f94e16d7063b60f0da3a79f872e140d6518f306749303bf981abd7d6b46734"
+      sha256: "7685acd06244ba4be60f455c5cafe5790c63dc91fc03f7385b1e922a6b85b17c"
       url: "https://pub.dev"
     source: hosted
-    version: "14.1.0"
+    version: "14.1.1"
   gotrue:
     dependency: transitive
     description:
       name: gotrue
-      sha256: c9c984f088320a5c5e87c7a34571e3de3982cca4cbd8b978e59d36baf748edfb
+      sha256: aaefc58b168723f8b5ca2a70ee8c0a051cba16f112be50f41c1ff8fb96b6a6df
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.1"
+    version: "2.7.0"
   gtk:
     dependency: transitive
     description:
@@ -633,10 +633,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
   path_provider_linux:
     dependency: transitive
     description:
@@ -737,10 +737,10 @@ packages:
     dependency: transitive
     description:
       name: postgrest
-      sha256: "9a3b590cf123f8d323b6a918702e037f037027d12a01902f9dc6ee38fdc05d6c"
+      sha256: f1f78470a74c611811132ff12acdef9c08b3ec65b61e88161a057d6cc5fbbd83
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   process:
     dependency: transitive
     description:
@@ -857,10 +857,10 @@ packages:
     dependency: transitive
     description:
       name: sentry
-      sha256: "1d2952d40b99da0dc4bf3ba4797e3985dd60cc61a13d0a1d2c62b02f6528441a"
+      sha256: fd1fbfe860c05f5c52820ec4dbf2b6473789e83ead26cfc18bca4fe80bf3f008
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.0"
+    version: "8.2.0"
   shared_preferences:
     dependency: transitive
     description:
@@ -881,10 +881,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c"
+      sha256: "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.5"
+    version: "2.4.0"
   shared_preferences_linux:
     dependency: transitive
     description:
@@ -1052,18 +1052,18 @@ packages:
     dependency: "direct main"
     description:
       name: supabase
-      sha256: ef407187b18c440f4a5c3f3cf30eb5cc1daadd4ff5616febf445a37e0e0ed34e
+      sha256: cd3d6bcc6b15ffd6eacea92ec2a2d9f09bf72c8a95c09a14f3b523ae9ee99cb6
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   supabase_flutter:
     dependency: "direct main"
     description:
       name: supabase_flutter
-      sha256: "6a77bd6ef6dc451bb2561de0334d68d620b84d7df1de1448dd7962ed5d1a79ea"
+      sha256: "7f552ddddb2f1ac2925dc70af655b39bb64f8d3c1ca6dda58685d1fb4eec447c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.2"
+    version: "2.5.3"
   sync_http:
     dependency: transitive
     description:
@@ -1140,10 +1140,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5"
+      sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.5"
+    version: "6.3.0"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -1156,10 +1156,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234
+      sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.2.0"
   url_launcher_platform_interface:
     dependency: transitive
     description:
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 6fe718a08..7bfefb175 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -13,7 +13,7 @@ dependencies:
   async: ^2.11.0
   csv: ^6.0.0
   cupertino_icons: ^1.0.8
-  dynamic_color:
+  dynamic_color: ^1.7.0
   equatable: ^2.0.5
   flutter:
     sdk: flutter
@@ -23,8 +23,8 @@ dependencies:
   flutter_riverpod: ^2.5.1
   flutter_web_plugins:
     sdk: flutter
-  go_router: ^14.1.0
-  material_color_utilities:
+  go_router: ^14.1.1
+  material_color_utilities: 0.8.0 # integration_test
   material_design_icons_flutter: ^7.0.7296
   pointer_interceptor: ^0.10.1+1
   reactive_color_picker: ^2.0.1
@@ -34,8 +34,8 @@ dependencies:
   rxdart: ^0.27.7
   studyu_core: ^4.4.2
   studyu_flutter_common: ^1.8.3
-  supabase: ^2.1.2
-  supabase_flutter: ^2.5.2
+  supabase: ^2.1.3
+  supabase_flutter: ^2.5.3
   url_launcher: ^6.2.6
   uuid: ^4.4.0
 
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index 816c0d9aa..ab9f57d9a 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: app_links
-      sha256: "0fd41f0501f131d931251e0942ac63d6216096a0052aeca037915c2c1deeb121"
+      sha256: "8c6ef5ba9e26b720d4c9073826befb87df2ab5e7a81c22b6c3145080b5e736c9"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "6.0.2"
   async:
     dependency: transitive
     description:
@@ -180,18 +180,18 @@ packages:
     dependency: transitive
     description:
       name: functions_client
-      sha256: a70b0dd9a1c35d05d1141557f7e49ffe4de5f450ffde31755a9eeeadca03b8ee
+      sha256: "48659e5c6a4bbe02659102bf6406a0cf39142202deae65aacfa78688f2e68946"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   gotrue:
     dependency: transitive
     description:
       name: gotrue
-      sha256: c9c984f088320a5c5e87c7a34571e3de3982cca4cbd8b978e59d36baf748edfb
+      sha256: aaefc58b168723f8b5ca2a70ee8c0a051cba16f112be50f41c1ff8fb96b6a6df
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.1"
+    version: "2.7.0"
   gtk:
     dependency: transitive
     description:
@@ -340,10 +340,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
   path_provider_linux:
     dependency: transitive
     description:
@@ -388,10 +388,10 @@ packages:
     dependency: transitive
     description:
       name: postgrest
-      sha256: "9a3b590cf123f8d323b6a918702e037f037027d12a01902f9dc6ee38fdc05d6c"
+      sha256: f1f78470a74c611811132ff12acdef9c08b3ec65b61e88161a057d6cc5fbbd83
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   quiver:
     dependency: transitive
     description:
@@ -428,10 +428,10 @@ packages:
     dependency: transitive
     description:
       name: sentry
-      sha256: "1d2952d40b99da0dc4bf3ba4797e3985dd60cc61a13d0a1d2c62b02f6528441a"
+      sha256: fd1fbfe860c05f5c52820ec4dbf2b6473789e83ead26cfc18bca4fe80bf3f008
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.0"
+    version: "8.2.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -452,10 +452,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c"
+      sha256: "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.5"
+    version: "2.4.0"
   shared_preferences_linux:
     dependency: transitive
     description:
@@ -552,18 +552,18 @@ packages:
     dependency: transitive
     description:
       name: supabase
-      sha256: ef407187b18c440f4a5c3f3cf30eb5cc1daadd4ff5616febf445a37e0e0ed34e
+      sha256: cd3d6bcc6b15ffd6eacea92ec2a2d9f09bf72c8a95c09a14f3b523ae9ee99cb6
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   supabase_flutter:
     dependency: "direct main"
     description:
       name: supabase_flutter
-      sha256: "6a77bd6ef6dc451bb2561de0334d68d620b84d7df1de1448dd7962ed5d1a79ea"
+      sha256: "7f552ddddb2f1ac2925dc70af655b39bb64f8d3c1ca6dda58685d1fb4eec447c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.2"
+    version: "2.5.3"
   synchronized:
     dependency: "direct main"
     description:
@@ -616,10 +616,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5"
+      sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.5"
+    version: "6.3.0"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -632,10 +632,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234
+      sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.2.0"
   url_launcher_platform_interface:
     dependency: transitive
     description:
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index 6f11ec370..175af286c 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
   flutter_secure_storage: ^9.1.1
   shared_preferences: ^2.2.3 # Can be removed after migrating phase
   studyu_core: ^4.4.2
-  supabase_flutter: ^2.5.2
+  supabase_flutter: ^2.5.3
   synchronized: ^3.1.0+1
   uuid: ^4.4.0
 

From 588e533a23bf46fe269721b3ded6d6fcd1b6cf22 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 08:51:38 +0200
Subject: [PATCH 114/314] chore: upgrade deps

---
 app/pubspec.lock            | 78 ++++++++++++++++++-------------------
 app/pubspec.yaml            |  2 +-
 core/pubspec.lock           | 14 +++----
 core/pubspec.yaml           |  2 +-
 designer_v2/pubspec.lock    | 53 +++++++++++++------------
 designer_v2/pubspec.yaml    | 14 ++-----
 flutter_common/pubspec.lock | 26 ++++++-------
 flutter_common/pubspec.yaml |  2 +-
 8 files changed, 92 insertions(+), 99 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index c5eb46f26..9b334c456 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -5,18 +5,18 @@ packages:
     dependency: transitive
     description:
       name: app_links
-      sha256: "8c6ef5ba9e26b720d4c9073826befb87df2ab5e7a81c22b6c3145080b5e736c9"
+      sha256: "96e677810b83707ff5e10fac11e4839daa0ea4e0123c35864c092699165eb3db"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.2"
+    version: "6.1.1"
   archive:
     dependency: transitive
     description:
       name: archive
-      sha256: ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265
+      sha256: "6bd38d335f0954f5fad9c79e614604fbf03a0e5b975923dd001b6ea965ef5b4b"
       url: "https://pub.dev"
     source: hosted
-    version: "3.5.1"
+    version: "3.6.0"
   args:
     dependency: transitive
     description:
@@ -101,10 +101,10 @@ packages:
     dependency: transitive
     description:
       name: camera_android_camerax
-      sha256: a2aac9505259a86d5eb6b0a14116b9a64f34a4735009f47731e59834218a5a29
+      sha256: "59967e6d80df9d682a33b86f228cc524e6b52d6184b84f6ac62151dd98bd1ea0"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.5+1"
+    version: "0.6.5+2"
   camera_avfoundation:
     dependency: transitive
     description:
@@ -367,10 +367,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_secure_storage
-      sha256: c0f402067fb0498934faa6bddd670de0a3db45222e2ca9a068c6177c9a2360a4
+      sha256: "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0"
       url: "https://pub.dev"
     source: hosted
-    version: "9.1.1"
+    version: "9.2.2"
   flutter_secure_storage_linux:
     dependency: transitive
     description:
@@ -383,18 +383,18 @@ packages:
     dependency: transitive
     description:
       name: flutter_secure_storage_macos
-      sha256: "8cfa53010a294ff095d7be8fa5bb15f2252c50018d69c5104851303f3ff92510"
+      sha256: "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.2"
   flutter_secure_storage_platform_interface:
     dependency: transitive
     description:
       name: flutter_secure_storage_platform_interface
-      sha256: "301f67ee9b87f04aef227f57f13f126fa7b13543c8e7a93f25c5d2d534c28a4a"
+      sha256: cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   flutter_secure_storage_web:
     dependency: transitive
     description:
@@ -553,10 +553,10 @@ packages:
     dependency: transitive
     description:
       name: image
-      sha256: "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e"
+      sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.7"
+    version: "4.2.0"
   intersperse:
     dependency: "direct main"
     description:
@@ -593,26 +593,26 @@ packages:
     dependency: transitive
     description:
       name: just_audio
-      sha256: b7cb6bbf3750caa924d03f432ba401ec300fd90936b3f73a9b33d58b1e96286b
+      sha256: "5abfab1d199e01ab5beffa61b3e782350df5dad036cb8c83b79fa45fc656614e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.37"
+    version: "0.9.38"
   just_audio_platform_interface:
     dependency: transitive
     description:
       name: just_audio_platform_interface
-      sha256: c3dee0014248c97c91fe6299edb73dc4d6c6930a2f4f713579cd692d9e47f4a1
+      sha256: "0243828cce503c8366cc2090cefb2b3c871aa8ed2f520670d76fd47aa1ab2790"
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.2"
+    version: "4.3.0"
   just_audio_web:
     dependency: transitive
     description:
       name: just_audio_web
-      sha256: "134356b0fe3d898293102b33b5fd618831ffdc72bb7a1b726140abdf22772b70"
+      sha256: "0edb481ad4aa1ff38f8c40f1a3576013c3420bf6669b686fe661627d49bc606c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.9"
+    version: "0.4.11"
   jwt_decode:
     dependency: transitive
     description:
@@ -945,26 +945,26 @@ packages:
     dependency: "direct main"
     description:
       name: record
-      sha256: "113b368168c49c78902ab37c2b354dea30a0aec5bdeca434073826b6ea73eca1"
+      sha256: "90dae13f3edb582c19e148a32dae9f643f03ab368d70ec7d0b872014018a94da"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.5"
+    version: "5.1.0"
   record_android:
     dependency: transitive
     description:
       name: record_android
-      sha256: "0df98e05873b22b443309e289bf1eb3b5b9a60e7779134334e2073eb0763a992"
+      sha256: bc36a2b33fd920a0f92d208500f879dd03c6db1aa91da72232d897f73b689033
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   record_darwin:
     dependency: transitive
     description:
       name: record_darwin
-      sha256: ee8cb1bb1712d7ce38140ecabe70e5c286c02f05296d66043bee865ace7eb1b9
+      sha256: "2210da0fde7c86b4048cccfe2cd19b25fc7adf1ada7d50ec4a5ab4af2a863739"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0"
   record_linux:
     dependency: transitive
     description:
@@ -977,18 +977,18 @@ packages:
     dependency: transitive
     description:
       name: record_platform_interface
-      sha256: "3a4b56e94ecd2a0b2b43eb1fa6f94c5b8484334f5d38ef43959c4bf97fb374cf"
+      sha256: "11f8b03ea8a0e279b0e306571dbe0db0202c0b8e866495c9fa1ad2281d5e4c15"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.1.0"
   record_web:
     dependency: transitive
     description:
       name: record_web
-      sha256: "24847cdbcf999f7a5762170792f622ac844858766becd0f2370ec8ae22f7526e"
+      sha256: "0ef370d1e6553ad33c39dd03103b374e7861f3518b0533e64c94d73f988a5ffa"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.5"
+    version: "1.1.0"
   record_windows:
     dependency: transitive
     description:
@@ -1276,10 +1276,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775"
+      sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.1"
+    version: "6.3.2"
   url_launcher_ios:
     dependency: transitive
     description:
@@ -1460,10 +1460,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: dad3313c9ead95517bb1cae5e1c9d20ba83729d5a59e5e83c0a2d66203f27f91
+      sha256: "2282ba2320af34b2bd5320156c664d73f3f022341ed78847bc87723bf88c142f"
       url: "https://pub.dev"
     source: hosted
-    version: "3.16.1"
+    version: "3.16.2"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
@@ -1476,18 +1476,18 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: f12f8d8a99784b863e8b85e4a9a5e3cf1839d6803d2c0c3e0533a8f3c5a992a7
+      sha256: "7affdf9d680c015b11587181171d3cad8093e449db1f7d9f0f08f4f33d24f9a0"
       url: "https://pub.dev"
     source: hosted
-    version: "3.13.0"
+    version: "3.13.1"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
+      sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
       url: "https://pub.dev"
     source: hosted
-    version: "5.5.0"
+    version: "5.5.1"
   xdg_directories:
     dependency: transitive
     description:
@@ -1521,5 +1521,5 @@ packages:
     source: hosted
     version: "2.0.0"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
+  dart: ">=3.4.0 <4.0.0"
   flutter: ">=3.19.0"
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 1cd9333f1..75839e146 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -34,7 +34,7 @@ dependencies:
   provider: ^6.1.2
   quiver: ^3.2.1
   rainbow_color: ^2.0.1
-  record: ^5.0.5
+  record: ^5.1.0
   sentry_flutter: ^8.2.0
   sentry_logging: ^8.2.0
   shared_preferences: ^2.2.3
diff --git a/core/pubspec.lock b/core/pubspec.lock
index 8d05cbe27..bd4f27141 100644
--- a/core/pubspec.lock
+++ b/core/pubspec.lock
@@ -66,10 +66,10 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1"
+      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
   build_resolvers:
     dependency: transitive
     description:
@@ -82,10 +82,10 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22"
+      sha256: "1414d6d733a85d8ad2f1dfcb3ea7945759e35a123cb99ccfac75d0758f75edfa"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.9"
+    version: "2.4.10"
   build_runner_core:
     dependency: transitive
     description:
@@ -474,10 +474,10 @@ packages:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
+      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.0"
   source_gen:
     dependency: transitive
     description:
@@ -687,4 +687,4 @@ packages:
     source: hosted
     version: "2.0.0"
 sdks:
-  dart: ">=3.4.0-256.0.dev <4.0.0"
+  dart: ">=3.4.0 <4.0.0"
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index f92a32290..da2ed499f 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -18,7 +18,7 @@ dependencies:
   uuid: ^4.4.0
 
 dev_dependencies:
-  build_runner: ^2.4.9
+  build_runner: ^2.4.10
   json_serializable: ^6.8.0
   lint: ^2.3.0
   test: ^1.25.5
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 039347595..2f32d7681 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -29,18 +29,18 @@ packages:
     dependency: transitive
     description:
       name: app_links
-      sha256: "8c6ef5ba9e26b720d4c9073826befb87df2ab5e7a81c22b6c3145080b5e736c9"
+      sha256: "96e677810b83707ff5e10fac11e4839daa0ea4e0123c35864c092699165eb3db"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.2"
+    version: "6.1.1"
   archive:
     dependency: "direct main"
     description:
       name: archive
-      sha256: ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265
+      sha256: "6bd38d335f0954f5fad9c79e614604fbf03a0e5b975923dd001b6ea965ef5b4b"
       url: "https://pub.dev"
     source: hosted
-    version: "3.5.1"
+    version: "3.6.0"
   args:
     dependency: transitive
     description:
@@ -241,12 +241,11 @@ packages:
   flutter_colorpicker:
     dependency: "direct main"
     description:
-      path: "."
-      ref: master
-      resolved-ref: "92bdb69a313a56c391ef148c12ef6539bd31253d"
-      url: "https://github.com/mchome/flutter_colorpicker"
-    source: git
-    version: "1.0.3"
+      name: flutter_colorpicker
+      sha256: "969de5f6f9e2a570ac660fb7b501551451ea2a1ab9e2097e89475f60e07816ea"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
   flutter_dotenv:
     dependency: transitive
     description:
@@ -293,10 +292,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_secure_storage
-      sha256: c0f402067fb0498934faa6bddd670de0a3db45222e2ca9a068c6177c9a2360a4
+      sha256: "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0"
       url: "https://pub.dev"
     source: hosted
-    version: "9.1.1"
+    version: "9.2.2"
   flutter_secure_storage_linux:
     dependency: transitive
     description:
@@ -309,18 +308,18 @@ packages:
     dependency: transitive
     description:
       name: flutter_secure_storage_macos
-      sha256: "8cfa53010a294ff095d7be8fa5bb15f2252c50018d69c5104851303f3ff92510"
+      sha256: "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.2"
   flutter_secure_storage_platform_interface:
     dependency: transitive
     description:
       name: flutter_secure_storage_platform_interface
-      sha256: "301f67ee9b87f04aef227f57f13f126fa7b13543c8e7a93f25c5d2d534c28a4a"
+      sha256: cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   flutter_secure_storage_web:
     dependency: transitive
     description:
@@ -388,10 +387,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: "7685acd06244ba4be60f455c5cafe5790c63dc91fc03f7385b1e922a6b85b17c"
+      sha256: "6ad5662b014c06c20fa46ab78715c96b2222a7fe4f87bf77e0289592c2539e86"
       url: "https://pub.dev"
     source: hosted
-    version: "14.1.1"
+    version: "14.1.3"
   gotrue:
     dependency: transitive
     description:
@@ -444,10 +443,10 @@ packages:
     dependency: transitive
     description:
       name: image
-      sha256: "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e"
+      sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.7"
+    version: "4.2.0"
   integration_test:
     dependency: "direct dev"
     description: flutter
@@ -665,10 +664,10 @@ packages:
     dependency: "direct dev"
     description:
       name: patrol_finders
-      sha256: ac33527cc1b63e3aa131dbd7107cfda8ee2df0fb4a4a423c067174a2e60db77b
+      sha256: e14214e88c84d34a1d7c89778ddf5c5a913bfc0a6a308da47d3ebca374a1f5f4
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.0"
   petitparser:
     dependency: transitive
     description:
@@ -1132,10 +1131,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775"
+      sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.1"
+    version: "6.3.2"
   url_launcher_ios:
     dependency: transitive
     description:
@@ -1252,10 +1251,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
+      sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
       url: "https://pub.dev"
     source: hosted
-    version: "5.5.0"
+    version: "5.5.1"
   xdg_directories:
     dependency: transitive
     description:
@@ -1289,5 +1288,5 @@ packages:
     source: hosted
     version: "2.0.0"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
+  dart: ">=3.4.0 <4.0.0"
   flutter: ">=3.19.0"
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 7bfefb175..1b61424f4 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
   sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
-  archive: ^3.5.1
+  archive: ^3.6.0
   async: ^2.11.0
   csv: ^6.0.0
   cupertino_icons: ^1.0.8
@@ -17,13 +17,13 @@ dependencies:
   equatable: ^2.0.5
   flutter:
     sdk: flutter
-  flutter_colorpicker: ^1.0.3
+  flutter_colorpicker: ^1.1.0
   flutter_localizations:
     sdk: flutter
   flutter_riverpod: ^2.5.1
   flutter_web_plugins:
     sdk: flutter
-  go_router: ^14.1.1
+  go_router: ^14.1.3
   material_color_utilities: 0.8.0 # integration_test
   material_design_icons_flutter: ^7.0.7296
   pointer_interceptor: ^0.10.1+1
@@ -39,12 +39,6 @@ dependencies:
   url_launcher: ^6.2.6
   uuid: ^4.4.0
 
-dependency_overrides:
-  flutter_colorpicker: # todo this package is outdated and should be replaced, if possible because reactive_color_picker depends on it
-    git:
-      url: https://github.com/mchome/flutter_colorpicker
-      ref: master  # or 786d04363f587b818ce585d25b9c2bb62de95aba
-
 dev_dependencies:
   custom_lint:
   flutter_launcher_icons: ^0.13.1
@@ -53,7 +47,7 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     sdk: flutter
-  patrol_finders: ^2.0.2
+  patrol_finders: ^2.1.0
   riverpod_lint:
   test: ^1.24.9 # integration_test
 
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index ab9f57d9a..186714fa5 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: app_links
-      sha256: "8c6ef5ba9e26b720d4c9073826befb87df2ab5e7a81c22b6c3145080b5e736c9"
+      sha256: "96e677810b83707ff5e10fac11e4839daa0ea4e0123c35864c092699165eb3db"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.2"
+    version: "6.1.1"
   async:
     dependency: transitive
     description:
@@ -122,10 +122,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_secure_storage
-      sha256: c0f402067fb0498934faa6bddd670de0a3db45222e2ca9a068c6177c9a2360a4
+      sha256: "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0"
       url: "https://pub.dev"
     source: hosted
-    version: "9.1.1"
+    version: "9.2.2"
   flutter_secure_storage_linux:
     dependency: transitive
     description:
@@ -138,18 +138,18 @@ packages:
     dependency: transitive
     description:
       name: flutter_secure_storage_macos
-      sha256: "8cfa53010a294ff095d7be8fa5bb15f2252c50018d69c5104851303f3ff92510"
+      sha256: "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.2"
   flutter_secure_storage_platform_interface:
     dependency: transitive
     description:
       name: flutter_secure_storage_platform_interface
-      sha256: "301f67ee9b87f04aef227f57f13f126fa7b13543c8e7a93f25c5d2d534c28a4a"
+      sha256: cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   flutter_secure_storage_web:
     dependency: transitive
     description:
@@ -608,10 +608,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775"
+      sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.1"
+    version: "6.3.2"
   url_launcher_ios:
     dependency: transitive
     description:
@@ -704,10 +704,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
+      sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
       url: "https://pub.dev"
     source: hosted
-    version: "5.5.0"
+    version: "5.5.1"
   xdg_directories:
     dependency: transitive
     description:
@@ -725,5 +725,5 @@ packages:
     source: hosted
     version: "2.0.0"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
+  dart: ">=3.4.0 <4.0.0"
   flutter: ">=3.19.0"
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index 175af286c..d805948b0 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_dotenv: ^5.1.0
-  flutter_secure_storage: ^9.1.1
+  flutter_secure_storage: ^9.2.2
   shared_preferences: ^2.2.3 # Can be removed after migrating phase
   studyu_core: ^4.4.2
   supabase_flutter: ^2.5.3

From 3a408290b05a6b913c868fea943539c389bb01aa Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 09:12:43 +0200
Subject: [PATCH 115/314] fix: add compatibility for emoji font with flutter >=
 3.22

---
 designer_v2/web/flutter_bootstrap.js | 12 ++++++++++++
 designer_v2/web/index.html           |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 designer_v2/web/flutter_bootstrap.js

diff --git a/designer_v2/web/flutter_bootstrap.js b/designer_v2/web/flutter_bootstrap.js
new file mode 100644
index 000000000..6f8c03d44
--- /dev/null
+++ b/designer_v2/web/flutter_bootstrap.js
@@ -0,0 +1,12 @@
+{{flutter_js}}
+{{flutter_build_config}}
+
+_flutter.loader.load({
+    onEntrypointLoaded: async function(engineInitializer) {
+        const appRunner = await engineInitializer.initializeEngine({
+            useColorEmoji: true,
+        });
+
+        await appRunner.runApp();
+    }
+});
diff --git a/designer_v2/web/index.html b/designer_v2/web/index.html
index 9d3acfe06..0b31d0f8f 100644
--- a/designer_v2/web/index.html
+++ b/designer_v2/web/index.html
@@ -37,6 +37,8 @@
   <link rel="manifest" href="manifest.json">
 </head>
 <body>
-  <script src="flutter_bootstrap.js" async></script>
+  <script>
+    {{flutter_bootstrap_js}}
+  </script>
 </body>
 </html>

From d864470f7e9916be3e535b1b10bbda79702892a0 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 09:17:48 +0200
Subject: [PATCH 116/314] chore: rename studyu-packages to studyu

---
 melos.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/melos.yaml b/melos.yaml
index 395ae5c53..295c6bb6a 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -1,4 +1,4 @@
-name: studyu-packages
+name: studyu
 
 repository: https://github.com/hpi-studyu/studyu
 

From ab6c76f071146beb084c5fe822ffa3f1ac23d951 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 09:21:05 +0200
Subject: [PATCH 117/314] chore: bundle update

---
 app/android/Gemfile.lock | 18 ++++++++++--------
 app/ios/Gemfile.lock     | 18 ++++++++++--------
 app/ios/Podfile.lock     | 18 +++++++++---------
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/app/android/Gemfile.lock b/app/android/Gemfile.lock
index cb09ef947..a785ea5d2 100644
--- a/app/android/Gemfile.lock
+++ b/app/android/Gemfile.lock
@@ -10,17 +10,17 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.914.0)
-    aws-sdk-core (3.192.0)
+    aws-partitions (1.933.0)
+    aws-sdk-core (3.196.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.79.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
+    aws-sdk-kms (1.82.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.147.0)
-      aws-sdk-core (~> 3, >= 3.192.0)
+    aws-sdk-s3 (1.151.0)
+      aws-sdk-core (~> 3, >= 3.194.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -157,7 +157,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     multi_json (1.15.0)
-    multipart-post (2.4.0)
+    multipart-post (2.4.1)
     nanaimo (0.3.0)
     naturally (2.2.1)
     nkf (0.2.0)
@@ -171,7 +171,8 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -184,6 +185,7 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
+    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
diff --git a/app/ios/Gemfile.lock b/app/ios/Gemfile.lock
index cb09ef947..a785ea5d2 100644
--- a/app/ios/Gemfile.lock
+++ b/app/ios/Gemfile.lock
@@ -10,17 +10,17 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.914.0)
-    aws-sdk-core (3.192.0)
+    aws-partitions (1.933.0)
+    aws-sdk-core (3.196.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.79.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
+    aws-sdk-kms (1.82.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.147.0)
-      aws-sdk-core (~> 3, >= 3.192.0)
+    aws-sdk-s3 (1.151.0)
+      aws-sdk-core (~> 3, >= 3.194.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -157,7 +157,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     multi_json (1.15.0)
-    multipart-post (2.4.0)
+    multipart-post (2.4.1)
     nanaimo (0.3.0)
     naturally (2.2.1)
     nkf (0.2.0)
@@ -171,7 +171,8 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -184,6 +185,7 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
+    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock
index bf4adfc7d..209989e65 100644
--- a/app/ios/Podfile.lock
+++ b/app/ios/Podfile.lock
@@ -26,11 +26,11 @@ PODS:
   - record_darwin (1.0.0):
     - Flutter
     - FlutterMacOS
-  - Sentry/HybridSDK (8.25.0)
-  - sentry_flutter (8.1.0):
+  - Sentry/HybridSDK (8.25.2)
+  - sentry_flutter (8.2.0):
     - Flutter
     - FlutterMacOS
-    - Sentry/HybridSDK (= 8.25.0)
+    - Sentry/HybridSDK (= 8.25.2)
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -126,15 +126,15 @@ SPEC CHECKSUMS:
   flutter_timezone: ffb07bdad3c6276af8dada0f11978d8a1f8a20bb
   just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
   package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
-  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
   record_darwin: 1f6619f2abac4d1ca91d3eeab038c980d76f1517
-  Sentry: cd86fc55628f5b7c572cabe66cc8f95a9d2f165a
-  sentry_flutter: ca7760fc008dc3bc2981730dc0c1d2f892178370
-  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
+  Sentry: 51b056d96914a741f63eca774d118678b1eb05a1
+  sentry_flutter: e8397d13e297a5d4b6be8a752e33140b21c5cc97
+  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
-  url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586
-  video_player_avfoundation: 2b4384f3b157206b5e150a0083cdc0c905d260d3
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
   wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
   webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36
 

From 7811d5d41e0c379bc69b7c6237bb62876956928a Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 09:30:15 +0200
Subject: [PATCH 118/314] chore: format

---
 designer_v2/lib/theme.dart | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/designer_v2/lib/theme.dart b/designer_v2/lib/theme.dart
index 1cceba685..e74e7c97b 100644
--- a/designer_v2/lib/theme.dart
+++ b/designer_v2/lib/theme.dart
@@ -131,9 +131,11 @@ class ThemeProvider extends InheritedWidget {
 
   ColorScheme colors(Brightness brightness, Color? targetColor) {
     final dynamicPrimary = brightness == Brightness.light ? lightDynamic?.primary : darkDynamic?.primary;
-    final scheme = SchemeFidelity(sourceColorHct: dynamicPrimary != null
-        ? Hct.fromInt(dynamicPrimary.value)
-        : Hct.fromInt(source(targetColor).value), isDark: false, contrastLevel: 0.0);
+    final scheme = SchemeFidelity(
+        sourceColorHct:
+            dynamicPrimary != null ? Hct.fromInt(dynamicPrimary.value) : Hct.fromInt(source(targetColor).value),
+        isDark: false,
+        contrastLevel: 0.0);
     final colorScheme = ColorScheme.fromSeed(
       seedColor: dynamicPrimary ?? source(targetColor),
       // todo use dynamicSchemeVariant once its in the flutter stable channel

From cc4552aafcc621f20a4a54a7c7c25a50980c37d8 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 23:26:26 +0200
Subject: [PATCH 119/314] ci: bump flutter version

---
 .github/workflows/init-workspace/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/init-workspace/action.yml b/.github/workflows/init-workspace/action.yml
index 5b4d32b82..565c0c76e 100644
--- a/.github/workflows/init-workspace/action.yml
+++ b/.github/workflows/init-workspace/action.yml
@@ -10,7 +10,7 @@ runs:
       with:
         channel: stable
         # Increase this version manually when we add support for a new Flutter release
-        flutter-version: '3.19.6'
+        flutter-version: '3.22.x'
 
     - name: Install melos
       run: dart pub global activate melos

From 7b023223fbab5468bd3d0a3234b1535b38650ee3 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 22:28:55 +0200
Subject: [PATCH 120/314] style(designer_v2): add loading screen

---
 .../lib/common_views/pages/splash_page.dart   | 10 +--
 designer_v2/web/flutter_bootstrap.js          | 78 +++++++++++++++++--
 2 files changed, 72 insertions(+), 16 deletions(-)

diff --git a/designer_v2/lib/common_views/pages/splash_page.dart b/designer_v2/lib/common_views/pages/splash_page.dart
index 88a8c41e8..64368c9a2 100644
--- a/designer_v2/lib/common_views/pages/splash_page.dart
+++ b/designer_v2/lib/common_views/pages/splash_page.dart
@@ -1,18 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-// import 'package:studyu_designer_v2/localization/app_translation.dart';
 
 class SplashPage extends StatelessWidget {
   const SplashPage({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      body: Center(
-        child: Text(AppLocalizations.of(context)!.loading_message),
-        // tr leads to unexpected null value, splash screen probably skips too fast
-        // child: Text(tr.loading_message),
-      ),
-    );
+    return Container();
   }
 }
diff --git a/designer_v2/web/flutter_bootstrap.js b/designer_v2/web/flutter_bootstrap.js
index 6f8c03d44..ce61faf42 100644
--- a/designer_v2/web/flutter_bootstrap.js
+++ b/designer_v2/web/flutter_bootstrap.js
@@ -1,12 +1,76 @@
 {{flutter_js}}
 {{flutter_build_config}}
 
-_flutter.loader.load({
-    onEntrypointLoaded: async function(engineInitializer) {
-        const appRunner = await engineInitializer.initializeEngine({
-            useColorEmoji: true,
-        });
+// Create the loading indicator element
+var loadingDiv = document.createElement('div');
+loadingDiv.id = 'loading';
+loadingDiv.innerHTML = `
+  <style>
+    body {
+      inset: 0;
+      overflow: hidden;
+      margin: 0;
+      padding: 0;
+      position: fixed;
+    }
 
-        await appRunner.runApp();
+    #loading {
+      align-items: center;
+      display: flex;
+      height: 100%;
+      justify-content: center;
+      width: 100%;
     }
-});
+
+    #loading img {
+      animation: 1s ease-in-out 0s infinite alternate breathe;
+      # opacity: .66;
+      transition: opacity .4s;
+    }
+
+    #loading.main_done img {
+      opacity: 1;
+    }
+
+    #loading.init_done img {
+      animation: .33s ease-in-out 0s 1 forwards zooooom;
+      opacity: .05;
+    }
+
+    @keyframes breathe {
+      from {
+        transform: scale(1);
+      }
+
+      to {
+        transform: scale(0.9);
+      }
+    }
+
+    @keyframes zooooom {
+      from {
+        transform: scale(1);
+      }
+
+      to {
+        transform: scale(0.01);
+      }
+    }
+  </style>
+  <img src="icons/Icon-192.png" alt="Loading indicator..." />
+`;
+
+// Append the loading indicator to the document body
+document.body.appendChild(loadingDiv);
+// Loading entrypoint
+_flutter.loader.load({
+  onEntrypointLoaded: async function(engineInitializer) {
+    // Initializing engine
+    loadingDiv.classList.add('main_done');
+    const appRunner = await engineInitializer.initializeEngine();
+
+    // Running app
+    loadingDiv.classList.add('init_done');
+    await appRunner.runApp();
+  }
+});
\ No newline at end of file

From 12f7bac745357b20b57df8cccf126ea0963806f8 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 23 May 2024 23:21:19 +0200
Subject: [PATCH 121/314] style(designer_v2): prettify animation

---
 designer_v2/web/flutter_bootstrap.js | 33 ++++++++++++++++++----------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/designer_v2/web/flutter_bootstrap.js b/designer_v2/web/flutter_bootstrap.js
index ce61faf42..8f0d40aea 100644
--- a/designer_v2/web/flutter_bootstrap.js
+++ b/designer_v2/web/flutter_bootstrap.js
@@ -4,6 +4,7 @@
 // Create the loading indicator element
 var loadingDiv = document.createElement('div');
 loadingDiv.id = 'loading';
+
 loadingDiv.innerHTML = `
   <style>
     body {
@@ -16,22 +17,25 @@ loadingDiv.innerHTML = `
 
     #loading {
       align-items: center;
+      background-color: #3088cf;
       display: flex;
       height: 100%;
       justify-content: center;
       width: 100%;
     }
 
+    #loading-box {
+      background-color: white;
+      border-radius: 10px;
+      padding: 20px;
+    }
+
     #loading img {
       animation: 1s ease-in-out 0s infinite alternate breathe;
-      # opacity: .66;
+      opacity: 1.0;
       transition: opacity .4s;
     }
 
-    #loading.main_done img {
-      opacity: 1;
-    }
-
     #loading.init_done img {
       animation: .33s ease-in-out 0s 1 forwards zooooom;
       opacity: .05;
@@ -39,17 +43,17 @@ loadingDiv.innerHTML = `
 
     @keyframes breathe {
       from {
-        transform: scale(1);
+        transform: scale(0.9);
       }
 
       to {
-        transform: scale(0.9);
+        transform: scale(0.8);
       }
     }
 
     @keyframes zooooom {
       from {
-        transform: scale(1);
+        transform: scale(0.9);
       }
 
       to {
@@ -57,20 +61,25 @@ loadingDiv.innerHTML = `
       }
     }
   </style>
-  <img src="icons/Icon-192.png" alt="Loading indicator..." />
+  <div id="loading-box">
+    <img src="icons/Icon-192.png" alt="Loading indicator..." />
+  </div>
 `;
 
 // Append the loading indicator to the document body
 document.body.appendChild(loadingDiv);
+
 // Loading entrypoint
 _flutter.loader.load({
   onEntrypointLoaded: async function(engineInitializer) {
-    // Initializing engine
-    loadingDiv.classList.add('main_done');
     const appRunner = await engineInitializer.initializeEngine();
 
-    // Running app
     loadingDiv.classList.add('init_done');
+    // Hide the loading indicator after the animation is done
+    loadingDiv.addEventListener('animationend', function() {
+        document.getElementById('loading').style.visibility = 'hidden';
+    });
+
     await appRunner.runApp();
   }
 });
\ No newline at end of file

From 72ed147c9c703b247d52d08a66ba5bff934b3f7d Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 24 May 2024 10:35:11 +0200
Subject: [PATCH 122/314] chore: linebreak

---
 designer_v2/web/flutter_bootstrap.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_v2/web/flutter_bootstrap.js b/designer_v2/web/flutter_bootstrap.js
index 8f0d40aea..45f76ee49 100644
--- a/designer_v2/web/flutter_bootstrap.js
+++ b/designer_v2/web/flutter_bootstrap.js
@@ -82,4 +82,4 @@ _flutter.loader.load({
 
     await appRunner.runApp();
   }
-});
\ No newline at end of file
+});

From 0980eb2a108fdf2f87fc76f64a94a76d54b0bc4e Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 7 Jun 2024 11:23:00 +0200
Subject: [PATCH 123/314] fix: upgrade deps

---
 app/pubspec.lock            | 86 ++++++++++++++++++-------------------
 app/pubspec.yaml            | 10 ++---
 core/pubspec.lock           | 40 ++++++++---------
 core/pubspec.yaml           |  6 +--
 designer_v2/pubspec.lock    | 54 +++++++++++------------
 designer_v2/pubspec.yaml    | 12 +++---
 flutter_common/pubspec.lock | 34 +++++++--------
 flutter_common/pubspec.yaml |  2 +-
 pubspec.lock                |  4 +-
 9 files changed, 124 insertions(+), 124 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index 9b334c456..6e0484250 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -13,10 +13,10 @@ packages:
     dependency: transitive
     description:
       name: archive
-      sha256: "6bd38d335f0954f5fad9c79e614604fbf03a0e5b975923dd001b6ea965ef5b4b"
+      sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
       url: "https://pub.dev"
     source: hosted
-    version: "3.6.0"
+    version: "3.6.1"
   args:
     dependency: transitive
     description:
@@ -93,18 +93,18 @@ packages:
     dependency: "direct main"
     description:
       name: camera
-      sha256: cf8ed1789aa244392cfc49d13e97879700476ba641c92500e01f630e109c0f6c
+      sha256: "2170a943dcb67be2af2c6bcda8775e74b41d4c02d6a4eb10bdc832ee185c4eea"
       url: "https://pub.dev"
     source: hosted
-    version: "0.11.0"
+    version: "0.11.0+1"
   camera_android_camerax:
     dependency: transitive
     description:
       name: camera_android_camerax
-      sha256: "59967e6d80df9d682a33b86f228cc524e6b52d6184b84f6ac62151dd98bd1ea0"
+      sha256: "7d84815edbb8304b51c10deba3c20f44eef80aa46ff156ec45428ed16600b49a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.5+2"
+    version: "0.6.5+5"
   camera_avfoundation:
     dependency: transitive
     description:
@@ -359,10 +359,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f"
+      sha256: c6b0b4c05c458e1c01ad9bcc14041dd7b1f6783d487be4386f793f47a8a4d03e
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.19"
+    version: "2.0.20"
   flutter_secure_storage:
     dependency: transitive
     description:
@@ -769,10 +769,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d
+      sha256: "9c96da072b421e98183f9ea7464898428e764bc0ce5567f27ec8693442e72514"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.4"
+    version: "2.2.5"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -833,10 +833,10 @@ packages:
     dependency: transitive
     description:
       name: permission_handler_apple
-      sha256: e9ad66020b89ff1b63908f247c2c6f931c6e62699b756ef8b3c4569350cd8662
+      sha256: e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0
       url: "https://pub.dev"
     source: hosted
-    version: "9.4.4"
+    version: "9.4.5"
   permission_handler_html:
     dependency: transitive
     description:
@@ -937,26 +937,26 @@ packages:
     dependency: transitive
     description:
       name: realtime_client
-      sha256: "492a1ab568b3812cb345aad8dd09b3936877edba81a6ab6f5fdf365c155797e1"
+      sha256: cd44fa21407a2e217d674f1c1a33b36c49ad0d8aea0349bf5b66594db06c80fb
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.4"
+    version: "2.1.0"
   record:
     dependency: "direct main"
     description:
       name: record
-      sha256: "90dae13f3edb582c19e148a32dae9f643f03ab368d70ec7d0b872014018a94da"
+      sha256: "78353d3d55fa145ffe1db1f63232ad0a0cd4c773e9f7d161210ce796ba1c94f9"
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.0"
+    version: "5.1.1"
   record_android:
     dependency: transitive
     description:
       name: record_android
-      sha256: bc36a2b33fd920a0f92d208500f879dd03c6db1aa91da72232d897f73b689033
+      sha256: fe83beefc8ac81b9dd02ca9365e8685755e3f12be1d442964082f1d5b618183d
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.2"
   record_darwin:
     dependency: transitive
     description:
@@ -985,18 +985,18 @@ packages:
     dependency: transitive
     description:
       name: record_web
-      sha256: "0ef370d1e6553ad33c39dd03103b374e7861f3518b0533e64c94d73f988a5ffa"
+      sha256: "703adb626d31e2dd86a8f6b34e306e03cd323e0c5e16e11bbc0385b07a8df97e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   record_windows:
     dependency: transitive
     description:
       name: record_windows
-      sha256: "39998b3ea7d8d28b04159d82220e6e5e32a7c357c6fb2794f5736beea272f6c3"
+      sha256: e653555aa3fda168aded7c34e11bd82baf0c6ac84e7624553def3c77ffefd36f
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   retry:
     dependency: transitive
     description:
@@ -1049,10 +1049,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2"
+      sha256: "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.3"
   shared_preferences_foundation:
     dependency: transitive
     description:
@@ -1142,10 +1142,10 @@ packages:
     dependency: transitive
     description:
       name: storage_client
-      sha256: bf5589d5de61a2451edb1b8960a0e673d4bb5c42ecc4dddf7c051a93789ced34
+      sha256: e37f1b9d40f43078d12bd2d1b6b08c2c16fbdbafc58b57bc44922da6ea3f5625
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   stream_channel:
     dependency: transitive
     description:
@@ -1188,18 +1188,18 @@ packages:
     dependency: "direct main"
     description:
       name: supabase
-      sha256: cd3d6bcc6b15ffd6eacea92ec2a2d9f09bf72c8a95c09a14f3b523ae9ee99cb6
+      sha256: "4555658031af0a8b38c7375f28e4b35312291f4aab0ca504dd76661381ce134f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.2.0"
   supabase_flutter:
     dependency: "direct main"
     description:
       name: supabase_flutter
-      sha256: "7f552ddddb2f1ac2925dc70af655b39bb64f8d3c1ca6dda58685d1fb4eec447c"
+      sha256: "1d6fb4ffaf50fc6f60507ab8ebf0b7dedbe6fabfbd8066db6f2a6552ddd0ea8c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.3"
+    version: "2.5.4"
   synchronized:
     dependency: transitive
     description:
@@ -1268,18 +1268,18 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
+      sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.6"
+    version: "6.3.0"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9"
+      sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.2"
+    version: "6.3.3"
   url_launcher_ios:
     dependency: transitive
     description:
@@ -1380,10 +1380,10 @@ packages:
     dependency: transitive
     description:
       name: video_player_android
-      sha256: "134e1ad410d67e18a19486ed9512c72dfc6d8ffb284d0e8f2e99e903d1ba8fa3"
+      sha256: b7ee816fc517d4029dbeb4ff3a124fb30e644f059abe3ec88b7a1138d487d735
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.14"
+    version: "2.4.17"
   video_player_avfoundation:
     dependency: transitive
     description:
@@ -1404,10 +1404,10 @@ packages:
     dependency: transitive
     description:
       name: video_player_web
-      sha256: "41245cef5ef29c4585dbabcbcbe9b209e34376642c7576cabf11b4ad9289d6e4"
+      sha256: ff4d69a6614b03f055397c27a71c9d3ddea2b2a23d71b2ba0164f59ca32b8fe2
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.3.1"
   vm_service:
     dependency: transitive
     description:
@@ -1452,18 +1452,18 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter
-      sha256: "25e1b6e839e8cbfbd708abc6f85ed09d1727e24e08e08c6b8590d7c65c9a8932"
+      sha256: "6869c8786d179f929144b4a1f86e09ac0eddfe475984951ea6c634774c16b522"
       url: "https://pub.dev"
     source: hosted
-    version: "4.7.0"
+    version: "4.8.0"
   webview_flutter_android:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: "2282ba2320af34b2bd5320156c664d73f3f022341ed78847bc87723bf88c142f"
+      sha256: f42447ca49523f11d8f70abea55ea211b3cafe172dd7a0e7ac007bb35dd356dc
       url: "https://pub.dev"
     source: hosted
-    version: "3.16.2"
+    version: "3.16.4"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
@@ -1522,4 +1522,4 @@ packages:
     version: "2.0.0"
 sdks:
   dart: ">=3.4.0 <4.0.0"
-  flutter: ">=3.19.0"
+  flutter: ">=3.22.0"
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 75839e146..f17b4a2d6 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -8,7 +8,7 @@ repository: https://github.com/hpi-studyu/studyu
 environment:
   sdk: '>=3.2.0 <4.0.0'
 dependencies:
-  camera: ^0.11.0
+  camera: ^0.11.0+1
   collection: ^1.18.0
   cross_file: ^0.3.4+1
   cupertino_icons: ^1.0.8
@@ -34,18 +34,18 @@ dependencies:
   provider: ^6.1.2
   quiver: ^3.2.1
   rainbow_color: ^2.0.1
-  record: ^5.1.0
+  record: ^5.1.1
   sentry_flutter: ^8.2.0
   sentry_logging: ^8.2.0
   shared_preferences: ^2.2.3
   studyu_core: ^4.4.2
   studyu_flutter_common: ^1.8.3
-  supabase: ^2.1.3
-  supabase_flutter: ^2.5.3
+  supabase: ^2.2.0
+  supabase_flutter: ^2.5.4
   timeline_tile: ^2.0.0
   timezone: ^0.9.3
   universal_html: ^2.2.4
-  url_launcher: ^6.2.6
+  url_launcher: ^6.3.0
   uuid: ^4.4.0
   wakelock_plus: ^1.2.5
 
diff --git a/core/pubspec.lock b/core/pubspec.lock
index bd4f27141..bd10eb6d5 100644
--- a/core/pubspec.lock
+++ b/core/pubspec.lock
@@ -82,18 +82,18 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "1414d6d733a85d8ad2f1dfcb3ea7945759e35a123cb99ccfac75d0758f75edfa"
+      sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.10"
+    version: "2.4.11"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799"
+      sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe
       url: "https://pub.dev"
     source: hosted
-    version: "7.3.0"
+    version: "7.3.1"
   built_collection:
     dependency: transitive
     description:
@@ -402,10 +402,10 @@ packages:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367
+      sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.3"
+    version: "1.3.0"
   quiver:
     dependency: "direct main"
     description:
@@ -418,10 +418,10 @@ packages:
     dependency: transitive
     description:
       name: realtime_client
-      sha256: "492a1ab568b3812cb345aad8dd09b3936877edba81a6ab6f5fdf365c155797e1"
+      sha256: cd44fa21407a2e217d674f1c1a33b36c49ad0d8aea0349bf5b66594db06c80fb
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.4"
+    version: "2.1.0"
   retry:
     dependency: transitive
     description:
@@ -538,10 +538,10 @@ packages:
     dependency: transitive
     description:
       name: storage_client
-      sha256: bf5589d5de61a2451edb1b8960a0e673d4bb5c42ecc4dddf7c051a93789ced34
+      sha256: e37f1b9d40f43078d12bd2d1b6b08c2c16fbdbafc58b57bc44922da6ea3f5625
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   stream_channel:
     dependency: transitive
     description:
@@ -570,10 +570,10 @@ packages:
     dependency: "direct main"
     description:
       name: supabase
-      sha256: cd3d6bcc6b15ffd6eacea92ec2a2d9f09bf72c8a95c09a14f3b523ae9ee99cb6
+      sha256: "4555658031af0a8b38c7375f28e4b35312291f4aab0ca504dd76661381ce134f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.2.0"
   term_glyph:
     dependency: transitive
     description:
@@ -586,26 +586,26 @@ packages:
     dependency: "direct dev"
     description:
       name: test
-      sha256: d11b55850c68c1f6c0cf00eabded4e66c4043feaf6c0d7ce4a36785137df6331
+      sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.25.5"
+    version: "1.25.7"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.1"
+    version: "0.7.2"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: "4d070a6bc36c1c4e89f20d353bfd71dc30cdf2bd0e14349090af360a029ab292"
+      sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.2"
+    version: "0.6.4"
   timing:
     dependency: transitive
     description:
@@ -634,10 +634,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "7475cb4dd713d57b6f7464c0e13f06da0d535d8b2067e188962a59bac2cf280b"
+      sha256: "360c4271613beb44db559547d02f8b0dc044741d0eeb9aa6ccdb47e8ec54c63a"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.2"
+    version: "14.2.3"
   watcher:
     dependency: transitive
     description:
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index da2ed499f..79cb2380c 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -14,11 +14,11 @@ dependencies:
   logger: ^2.3.0
   quiver: ^3.2.1
   sentry: ^8.2.0
-  supabase: ^2.1.3
+  supabase: ^2.2.0
   uuid: ^4.4.0
 
 dev_dependencies:
-  build_runner: ^2.4.10
+  build_runner: ^2.4.11
   json_serializable: ^6.8.0
   lint: ^2.3.0
-  test: ^1.25.5
+  test: ^1.25.7
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 2f32d7681..2249506b0 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -37,10 +37,10 @@ packages:
     dependency: "direct main"
     description:
       name: archive
-      sha256: "6bd38d335f0954f5fad9c79e614604fbf03a0e5b975923dd001b6ea965ef5b4b"
+      sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
       url: "https://pub.dev"
     source: hosted
-    version: "3.6.0"
+    version: "3.6.1"
   args:
     dependency: transitive
     description:
@@ -387,10 +387,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: "6ad5662b014c06c20fa46ab78715c96b2222a7fe4f87bf77e0289592c2539e86"
+      sha256: abec47eb8c8c36ebf41d0a4c64dbbe7f956e39a012b3aafc530e951bdc12fe3f
       url: "https://pub.dev"
     source: hosted
-    version: "14.1.3"
+    version: "14.1.4"
   gotrue:
     dependency: transitive
     description:
@@ -624,10 +624,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d
+      sha256: "9c96da072b421e98183f9ea7464898428e764bc0ce5567f27ec8693442e72514"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.4"
+    version: "2.2.5"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -664,10 +664,10 @@ packages:
     dependency: "direct dev"
     description:
       name: patrol_finders
-      sha256: e14214e88c84d34a1d7c89778ddf5c5a913bfc0a6a308da47d3ebca374a1f5f4
+      sha256: "6bf2c3093fbccd02f80f73fafc1bd021d76410cbab6e329be220b5e3bc58f072"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
   petitparser:
     dependency: transitive
     description:
@@ -704,10 +704,10 @@ packages:
     dependency: transitive
     description:
       name: pointer_interceptor_ios
-      sha256: "2e73c39452830adc4695757130676a39412a3b7f3c34e3f752791b5384770877"
+      sha256: a6906772b3205b42c44614fcea28f818b1e5fdad73a4ca742a7bd49818d9c917
       url: "https://pub.dev"
     source: hosted
-    version: "0.10.0+2"
+    version: "0.10.1"
   pointer_interceptor_platform_interface:
     dependency: transitive
     description:
@@ -760,10 +760,10 @@ packages:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367
+      sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.3"
+    version: "1.3.0"
   quiver:
     dependency: transitive
     description:
@@ -808,10 +808,10 @@ packages:
     dependency: transitive
     description:
       name: realtime_client
-      sha256: "492a1ab568b3812cb345aad8dd09b3936877edba81a6ab6f5fdf365c155797e1"
+      sha256: cd44fa21407a2e217d674f1c1a33b36c49ad0d8aea0349bf5b66594db06c80fb
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.4"
+    version: "2.1.0"
   retry:
     dependency: transitive
     description:
@@ -872,10 +872,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2"
+      sha256: "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.3"
   shared_preferences_foundation:
     dependency: transitive
     description:
@@ -1005,10 +1005,10 @@ packages:
     dependency: transitive
     description:
       name: storage_client
-      sha256: bf5589d5de61a2451edb1b8960a0e673d4bb5c42ecc4dddf7c051a93789ced34
+      sha256: e37f1b9d40f43078d12bd2d1b6b08c2c16fbdbafc58b57bc44922da6ea3f5625
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   stream_channel:
     dependency: transitive
     description:
@@ -1051,18 +1051,18 @@ packages:
     dependency: "direct main"
     description:
       name: supabase
-      sha256: cd3d6bcc6b15ffd6eacea92ec2a2d9f09bf72c8a95c09a14f3b523ae9ee99cb6
+      sha256: "4555658031af0a8b38c7375f28e4b35312291f4aab0ca504dd76661381ce134f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.2.0"
   supabase_flutter:
     dependency: "direct main"
     description:
       name: supabase_flutter
-      sha256: "7f552ddddb2f1ac2925dc70af655b39bb64f8d3c1ca6dda58685d1fb4eec447c"
+      sha256: "1d6fb4ffaf50fc6f60507ab8ebf0b7dedbe6fabfbd8066db6f2a6552ddd0ea8c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.3"
+    version: "2.5.4"
   sync_http:
     dependency: transitive
     description:
@@ -1123,18 +1123,18 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
+      sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.6"
+    version: "6.3.0"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9"
+      sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.2"
+    version: "6.3.3"
   url_launcher_ios:
     dependency: transitive
     description:
@@ -1289,4 +1289,4 @@ packages:
     version: "2.0.0"
 sdks:
   dart: ">=3.4.0 <4.0.0"
-  flutter: ">=3.19.0"
+  flutter: ">=3.22.0"
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 1b61424f4..0433e7fb8 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
   sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
-  archive: ^3.6.0
+  archive: ^3.6.1
   async: ^2.11.0
   csv: ^6.0.0
   cupertino_icons: ^1.0.8
@@ -23,7 +23,7 @@ dependencies:
   flutter_riverpod: ^2.5.1
   flutter_web_plugins:
     sdk: flutter
-  go_router: ^14.1.3
+  go_router: ^14.1.4
   material_color_utilities: 0.8.0 # integration_test
   material_design_icons_flutter: ^7.0.7296
   pointer_interceptor: ^0.10.1+1
@@ -34,9 +34,9 @@ dependencies:
   rxdart: ^0.27.7
   studyu_core: ^4.4.2
   studyu_flutter_common: ^1.8.3
-  supabase: ^2.1.3
-  supabase_flutter: ^2.5.3
-  url_launcher: ^6.2.6
+  supabase: ^2.2.0
+  supabase_flutter: ^2.5.4
+  url_launcher: ^6.3.0
   uuid: ^4.4.0
 
 dev_dependencies:
@@ -47,7 +47,7 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     sdk: flutter
-  patrol_finders: ^2.1.0
+  patrol_finders: ^2.1.2
   riverpod_lint:
   test: ^1.24.9 # integration_test
 
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index 186714fa5..8b36fee9e 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -332,10 +332,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d
+      sha256: "9c96da072b421e98183f9ea7464898428e764bc0ce5567f27ec8693442e72514"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.4"
+    version: "2.2.5"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -404,10 +404,10 @@ packages:
     dependency: transitive
     description:
       name: realtime_client
-      sha256: "492a1ab568b3812cb345aad8dd09b3936877edba81a6ab6f5fdf365c155797e1"
+      sha256: cd44fa21407a2e217d674f1c1a33b36c49ad0d8aea0349bf5b66594db06c80fb
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.4"
+    version: "2.1.0"
   retry:
     dependency: transitive
     description:
@@ -444,10 +444,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2"
+      sha256: "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.3"
   shared_preferences_foundation:
     dependency: transitive
     description:
@@ -521,10 +521,10 @@ packages:
     dependency: transitive
     description:
       name: storage_client
-      sha256: bf5589d5de61a2451edb1b8960a0e673d4bb5c42ecc4dddf7c051a93789ced34
+      sha256: e37f1b9d40f43078d12bd2d1b6b08c2c16fbdbafc58b57bc44922da6ea3f5625
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   stream_channel:
     dependency: transitive
     description:
@@ -552,18 +552,18 @@ packages:
     dependency: transitive
     description:
       name: supabase
-      sha256: cd3d6bcc6b15ffd6eacea92ec2a2d9f09bf72c8a95c09a14f3b523ae9ee99cb6
+      sha256: "4555658031af0a8b38c7375f28e4b35312291f4aab0ca504dd76661381ce134f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.2.0"
   supabase_flutter:
     dependency: "direct main"
     description:
       name: supabase_flutter
-      sha256: "7f552ddddb2f1ac2925dc70af655b39bb64f8d3c1ca6dda58685d1fb4eec447c"
+      sha256: "1d6fb4ffaf50fc6f60507ab8ebf0b7dedbe6fabfbd8066db6f2a6552ddd0ea8c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.3"
+    version: "2.5.4"
   synchronized:
     dependency: "direct main"
     description:
@@ -600,18 +600,18 @@ packages:
     dependency: transitive
     description:
       name: url_launcher
-      sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
+      sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.6"
+    version: "6.3.0"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9"
+      sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.2"
+    version: "6.3.3"
   url_launcher_ios:
     dependency: transitive
     description:
@@ -726,4 +726,4 @@ packages:
     version: "2.0.0"
 sdks:
   dart: ">=3.4.0 <4.0.0"
-  flutter: ">=3.19.0"
+  flutter: ">=3.22.0"
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index d805948b0..087c68c8b 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
   flutter_secure_storage: ^9.2.2
   shared_preferences: ^2.2.3 # Can be removed after migrating phase
   studyu_core: ^4.4.2
-  supabase_flutter: ^2.5.3
+  supabase_flutter: ^2.5.4
   synchronized: ^3.1.0+1
   uuid: ^4.4.0
 
diff --git a/pubspec.lock b/pubspec.lock
index fc4a0080a..ca3ec2ce5 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -301,10 +301,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.1"
+    version: "0.7.2"
   typed_data:
     dependency: transitive
     description:

From 72226c65476c12dcc07bdedee726ae6fea01f30c Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 7 Jun 2024 13:57:49 +0200
Subject: [PATCH 124/314] fix: check if canPop

---
 designer_v2/lib/common_views/form_scaffold.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_v2/lib/common_views/form_scaffold.dart b/designer_v2/lib/common_views/form_scaffold.dart
index 5b8577374..279ffd02f 100644
--- a/designer_v2/lib/common_views/form_scaffold.dart
+++ b/designer_v2/lib/common_views/form_scaffold.dart
@@ -65,7 +65,7 @@ class _FormScaffoldState<T extends FormViewModel> extends ConsumerState<FormScaf
     return (bool value) async {
       final backNavigationAllowed = await _promptBackNavigationConfirmation();
       if (backNavigationAllowed) {
-        if (mounted) Navigator.of(context).pop();
+        if (mounted && Navigator.of(context).canPop()) Navigator.of(context).pop();
       }
     };
   }

From 353aeed5c386b9764bf793b3dd4bc4d46a07c717 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 7 Jun 2024 13:58:12 +0200
Subject: [PATCH 125/314] fix: integration test sign out

---
 designer_v2/integration_test/app_test.dart             | 4 ++--
 designer_v2/integration_test/robots/studies_robot.dart | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/designer_v2/integration_test/app_test.dart b/designer_v2/integration_test/app_test.dart
index 32c695770..1dc1673e5 100644
--- a/designer_v2/integration_test/app_test.dart
+++ b/designer_v2/integration_test/app_test.dart
@@ -120,7 +120,7 @@ void main() {
     */
     // We start with a new account and study here, since tests run asynchronously and
     // previous tests might not have been completed when running this one
-    patrolWidgetTest('Publish a study', semanticsEnabled: false, ($) async {
+    patrolWidgetTest('Publish a study', (PatrolTester $) async {
       final appRobot = AppRobot($); // RM
       final authRobot = AuthRobot($); // RM
       final studiesRobot = StudiesRobot($);
@@ -231,7 +231,7 @@ void main() {
       await studyDesignRobot.tapMyStudiesButton();
       await studiesRobot.validateOnStudiesScreen();
 
-      // await studiesRobot.tapSignOutButton(); // does not work
+      await studiesRobot.tapSignOutButton();
 
       // todo dump database data and validate its state
     });
diff --git a/designer_v2/integration_test/robots/studies_robot.dart b/designer_v2/integration_test/robots/studies_robot.dart
index e21634498..56e32f8a2 100644
--- a/designer_v2/integration_test/robots/studies_robot.dart
+++ b/designer_v2/integration_test/robots/studies_robot.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:patrol_finders/patrol_finders.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
@@ -32,6 +33,6 @@ class StudiesRobot {
   }
 
   Future<void> tapSignOutButton() async {
-    await $(tr.navlink_logout).tap();
+    await $(Icons.logout_rounded).tap();
   }
 }

From 7f03dd541bd8af254179cc8197a42c973d14becf Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 7 Jun 2024 14:04:17 +0200
Subject: [PATCH 126/314] chore(release): publish packages

 - studyu_app@2.7.6-dev.0
 - studyu_core@4.4.3-dev.0
 - studyu_designer_v2@1.8.1-dev.0
 - studyu_flutter_common@1.8.4-dev.0
---
 CHANGELOG.md                | 42 +++++++++++++++++++++++++++++++++++++
 app/CHANGELOG.md            |  5 +++++
 app/pubspec.yaml            |  6 +++---
 core/CHANGELOG.md           |  4 ++++
 core/pubspec.yaml           |  2 +-
 designer_v2/CHANGELOG.md    |  8 +++++++
 designer_v2/pubspec.yaml    |  6 +++---
 flutter_common/CHANGELOG.md |  5 +++++
 flutter_common/pubspec.yaml |  4 ++--
 9 files changed, 73 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23f3fc9b7..1db85e632 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,48 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2024-06-07
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`studyu_app` - `v2.7.6-dev.0`](#studyu_app---v276-dev0)
+ - [`studyu_core` - `v4.4.3-dev.0`](#studyu_core---v443-dev0)
+ - [`studyu_designer_v2` - `v1.8.1-dev.0`](#studyu_designer_v2---v181-dev0)
+ - [`studyu_flutter_common` - `v1.8.4-dev.0`](#studyu_flutter_common---v184-dev0)
+
+---
+
+#### `studyu_app` - `v2.7.6-dev.0`
+
+ - **FIX**: upgrade deps.
+ - **FIX**: UI overflows.
+
+#### `studyu_core` - `v4.4.3-dev.0`
+
+ - **FIX**: upgrade deps.
+
+#### `studyu_designer_v2` - `v1.8.1-dev.0`
+
+ - **FIX**: integration test sign out.
+ - **FIX**: check if canPop.
+ - **FIX**: upgrade deps.
+ - **FIX**: add compatibility for emoji font with flutter >= 3.22.
+ - **FIX**: Flutter 3.22 arg error.
+
+#### `studyu_flutter_common` - `v1.8.4-dev.0`
+
+ - **FIX**: upgrade deps.
+ - **FIX**: put supabase cli default anon key in env.local.example.
+
+
 ## 2024-05-13
 
 ### Changes
diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md
index cc511277d..04fa5959a 100644
--- a/app/CHANGELOG.md
+++ b/app/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.7.6-dev.0
+
+ - **FIX**: upgrade deps.
+ - **FIX**: UI overflows.
+
 ## 2.7.5
 
  - **FIX**: update podfile.
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index f17b4a2d6..d8a506c33 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_app
-version: 2.7.5
+version: 2.7.6-dev.0
 description: Partake in digital N-of-1 trials with the innovative StudyU Health App
 publish_to: none
 homepage: https://studyu.health
@@ -38,8 +38,8 @@ dependencies:
   sentry_flutter: ^8.2.0
   sentry_logging: ^8.2.0
   shared_preferences: ^2.2.3
-  studyu_core: ^4.4.2
-  studyu_flutter_common: ^1.8.3
+  studyu_core: ^4.4.3-dev.0
+  studyu_flutter_common: ^1.8.4-dev.0
   supabase: ^2.2.0
   supabase_flutter: ^2.5.4
   timeline_tile: ^2.0.0
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 7b8d97130..e0bc5355a 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.4.3-dev.0
+
+ - **FIX**: upgrade deps.
+
 ## 4.4.2
 
  - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index 79cb2380c..71b920c99 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_core
-version: 4.4.2
+version: 4.4.3-dev.0
 description: This package contains StudyU models and common functions for the app and designer packages
 homepage: https://studyu.health
 repository: https://github.com/hpi-studyu/studyu
diff --git a/designer_v2/CHANGELOG.md b/designer_v2/CHANGELOG.md
index dbe71f863..8c8e14f82 100644
--- a/designer_v2/CHANGELOG.md
+++ b/designer_v2/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.8.1-dev.0
+
+ - **FIX**: integration test sign out.
+ - **FIX**: check if canPop.
+ - **FIX**: upgrade deps.
+ - **FIX**: add compatibility for emoji font with flutter >= 3.22.
+ - **FIX**: Flutter 3.22 arg error.
+
 ## 1.8.0
 
  - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 0433e7fb8..11e6e4b0e 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_designer_v2
-version: 1.8.0
+version: 1.8.1-dev.0
 description: Implement digital N-of-1 studies seamlessly with the StudyU Health Designer
 publish_to: none
 homepage: https://studyu.health
@@ -32,8 +32,8 @@ dependencies:
   reactive_multi_select_flutter: ^2.0.1
   reactive_range_slider: ^2.1.0
   rxdart: ^0.27.7
-  studyu_core: ^4.4.2
-  studyu_flutter_common: ^1.8.3
+  studyu_core: ^4.4.3-dev.0
+  studyu_flutter_common: ^1.8.4-dev.0
   supabase: ^2.2.0
   supabase_flutter: ^2.5.4
   url_launcher: ^6.3.0
diff --git a/flutter_common/CHANGELOG.md b/flutter_common/CHANGELOG.md
index e15cea9e6..aed61c52d 100644
--- a/flutter_common/CHANGELOG.md
+++ b/flutter_common/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.8.4-dev.0
+
+ - **FIX**: upgrade deps.
+ - **FIX**: put supabase cli default anon key in env.local.example.
+
 ## 1.8.3
 
  - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index 087c68c8b..97e4a4f30 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_flutter_common
-version: 1.8.3
+version: 1.8.4-dev.0
 description: StudyU common flutter components and functions for app and designer
 homepage: https://studyu.health
 repository: https://github.com/hpi-studyu/studyu
@@ -13,7 +13,7 @@ dependencies:
   flutter_dotenv: ^5.1.0
   flutter_secure_storage: ^9.2.2
   shared_preferences: ^2.2.3 # Can be removed after migrating phase
-  studyu_core: ^4.4.2
+  studyu_core: ^4.4.3-dev.0
   supabase_flutter: ^2.5.4
   synchronized: ^3.1.0+1
   uuid: ^4.4.0

From 3bfeb3c05ccbddea0524a1cfe10eee0dcb09d20f Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 7 Jun 2024 14:05:05 +0200
Subject: [PATCH 127/314] chore: lock files

---
 app/pubspec.lock            | 4 ++--
 designer_v2/pubspec.lock    | 4 ++--
 flutter_common/pubspec.lock | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index 6e0484250..f1b37c873 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -1176,14 +1176,14 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.2"
+    version: "4.4.3-dev.0"
   studyu_flutter_common:
     dependency: "direct main"
     description:
       path: "../flutter_common"
       relative: true
     source: path
-    version: "1.8.3"
+    version: "1.8.4-dev.0"
   supabase:
     dependency: "direct main"
     description:
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 2249506b0..699474e79 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -1039,14 +1039,14 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.2"
+    version: "4.4.3-dev.0"
   studyu_flutter_common:
     dependency: "direct main"
     description:
       path: "../flutter_common"
       relative: true
     source: path
-    version: "1.8.3"
+    version: "1.8.4-dev.0"
   supabase:
     dependency: "direct main"
     description:
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index 8b36fee9e..4a88183fe 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -547,7 +547,7 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.2"
+    version: "4.4.3-dev.0"
   supabase:
     dependency: transitive
     description:

From 0178db42746f1944c428175ff48743472d33132c Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 7 Jun 2024 14:31:06 +0200
Subject: [PATCH 128/314] fix: add emojis again

---
 designer_v2/web/flutter_bootstrap.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/designer_v2/web/flutter_bootstrap.js b/designer_v2/web/flutter_bootstrap.js
index 45f76ee49..3951307ec 100644
--- a/designer_v2/web/flutter_bootstrap.js
+++ b/designer_v2/web/flutter_bootstrap.js
@@ -72,7 +72,9 @@ document.body.appendChild(loadingDiv);
 // Loading entrypoint
 _flutter.loader.load({
   onEntrypointLoaded: async function(engineInitializer) {
-    const appRunner = await engineInitializer.initializeEngine();
+    const appRunner = await engineInitializer.initializeEngine({
+        useColorEmoji: true,
+    });
 
     loadingDiv.classList.add('init_done');
     // Hide the loading indicator after the animation is done

From e11704d917a8f7dd29d3f97c6f0ad6494c4c00c8 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 9 Jun 2024 18:23:45 +0200
Subject: [PATCH 129/314] chore: bump minSdkVersion

---
 app/android/app/build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle
index 0d97d49a1..cf6010963 100644
--- a/app/android/app/build.gradle
+++ b/app/android/app/build.gradle
@@ -63,8 +63,7 @@ android {
         applicationId "health.studyu.app"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration
-        // camera_android requires at least sdk 21
-        minSdkVersion Math.max(flutter.minSdkVersion, 21)
+        minSdkVersion Math.max(flutter.minSdkVersion, 23)
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

From 7dc5c076c91f3f45fe091d2488330249cb6693c1 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 9 Jun 2024 21:31:08 +0200
Subject: [PATCH 130/314] chore: fix melos package filter

---
 melos.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/melos.yaml b/melos.yaml
index 295c6bb6a..975cdf402 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -56,7 +56,7 @@ scripts:
         "flutter test"
     description: Run `flutter test` for a specific package.
     packageFilters:
-      dir-exists: test
+      dirExists: test
 
   generate:
     run: |
@@ -125,10 +125,10 @@ scripts:
   build:android:
     run: |
       melos exec -c 2 --fail-fast -- \
-        "flutter build apk --multidex"
+        "flutter build apk"
     description: Build app for Android.
     packageFilters:
-      dir-exists: android
+      dirExists: android
 
   build:ios:
     run: |
@@ -136,7 +136,7 @@ scripts:
         "flutter build ipa --no-codesign"
     description: Build app for iOS.
     packageFilters:
-      dir-exists: ios
+      dirExists: ios
 
   build:web:
     run: |
@@ -145,7 +145,7 @@ scripts:
     description: Build app for Web.
     packageFilters:
       scope: [studyu_app, studyu_designer_v2]
-      dir-exists: web
+      dirExists: web
 
   build:web:app:
     run: |
@@ -170,7 +170,7 @@ scripts:
     description: Build web dev.
     packageFilters:
       scope: [studyu_app, studyu_designer_v2]
-      dir-exists: web
+      dirExists: web
 
   build:web:app:dev:
     run: |
@@ -179,7 +179,7 @@ scripts:
     description: Build web app dev.
     packageFilters:
       scope: studyu_app
-      dir-exists: web
+      dirExists: web
 
   build:web:designer_v2:dev:
     run: |
@@ -188,4 +188,4 @@ scripts:
     description: Build web designer_v2 dev.
     packageFilters:
       scope: studyu_designer_v2
-      dir-exists: web
+      dirExists: web

From 75a5efd3d9c9aad0f3ebc0729590f76ed3fe31c5 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 9 Jun 2024 22:09:09 +0200
Subject: [PATCH 131/314] fix(app): update android deployment

---
 app/.metadata                                 | 30 +++++------
 app/android/Gemfile.lock                      | 18 +++----
 app/android/app/build.gradle                  | 52 +++++++++----------
 app/android/app/src/main/AndroidManifest.xml  | 12 +++++
 .../app/{studyu_app => }/MainActivity.kt      |  3 +-
 app/android/build.gradle                      | 16 +-----
 app/android/gradle.properties                 |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 app/android/settings.gradle                   | 12 ++---
 9 files changed, 69 insertions(+), 78 deletions(-)
 rename app/android/app/src/main/kotlin/health/studyu/app/{studyu_app => }/MainActivity.kt (65%)

diff --git a/app/.metadata b/app/.metadata
index eea2802f1..6eb54a17b 100644
--- a/app/.metadata
+++ b/app/.metadata
@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "67457e669f79e9f8d13d7a68fe09775fefbb79f4"
+  revision: "761747bfc538b5af34aa0d3fac380f1bc331ec49"
   channel: "stable"
 
 project_type: app
@@ -13,26 +13,26 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
-      base_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
     - platform: android
-      create_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
-      base_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
     - platform: ios
-      create_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
-      base_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
     - platform: linux
-      create_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
-      base_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
     - platform: macos
-      create_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
-      base_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
     - platform: web
-      create_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
-      base_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
     - platform: windows
-      create_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
-      base_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
 
   # User provided section
 
diff --git a/app/android/Gemfile.lock b/app/android/Gemfile.lock
index a785ea5d2..6102ebb87 100644
--- a/app/android/Gemfile.lock
+++ b/app/android/Gemfile.lock
@@ -10,17 +10,17 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.933.0)
-    aws-sdk-core (3.196.1)
+    aws-partitions (1.941.0)
+    aws-sdk-core (3.197.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.82.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
+    aws-sdk-kms (1.83.0)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.151.0)
-      aws-sdk-core (~> 3, >= 3.194.0)
+    aws-sdk-s3 (1.152.0)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -147,7 +147,7 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.6)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
@@ -171,8 +171,8 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.2.9)
+      strscan
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle
index cf6010963..dbbbe5092 100644
--- a/app/android/app/build.gradle
+++ b/app/android/app/build.gradle
@@ -1,25 +1,26 @@
 plugins {
     id "com.android.application"
     id "kotlin-android"
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
     id "dev.flutter.flutter-gradle-plugin"
 }
 
 def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
+def localPropertiesFile = rootProject.file("local.properties")
 if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
+    localPropertiesFile.withReader("UTF-8") { reader ->
         localProperties.load(reader)
     }
 }
 
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
 if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
+    flutterVersionCode = "1"
 }
 
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
+def flutterVersionName = localProperties.getProperty("flutter.versionName")
 if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
+    flutterVersionName = "1.0"
 }
 
 def keystoreProperties = new Properties()
@@ -29,44 +30,39 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    namespace "health.studyu.app"
+    namespace = "health.studyu.app"
     // Start flutter_local_notifications
-    compileSdkVersion Math.max(flutter.compileSdkVersion, 34)
+    compileSdkVersion = Math.max(flutter.compileSdkVersion, 34)
     // End flutter_local_notifications
-
-    ndkVersion flutter.ndkVersion
+    // temp fix for record_audio package instead of "flutter.ndkVersion"
+    ndkVersion = "26.1.10909125"
 
     // Start flutter_local_notifications
     defaultConfig {
-        multiDexEnabled true
+        multiDexEnabled = true
     }
     // End flutter_local_notifications
 
     compileOptions {
         // Start flutter_local_notifications
         // Flag to enable support for the new language APIs
-        coreLibraryDesugaringEnabled true
+        coreLibraryDesugaringEnabled = true
         // End flutter_local_notifications
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
-
     kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+        jvmTarget = '17'
     }
 
     defaultConfig {
-        applicationId "health.studyu.app"
+        applicationId = "health.studyu.app"
         // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration
-        minSdkVersion Math.max(flutter.minSdkVersion, 23)
-        targetSdkVersion flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
+        minSdk = Math.max(flutter.minSdkVersion, 23)
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutterVersionCode.toInteger()
+        versionName = flutterVersionName
     }
 
     signingConfigs {
@@ -79,13 +75,13 @@ android {
     }
     buildTypes {
         release {
-            signingConfig keystorePropertiesFile.exists() ? signingConfigs.release : null
+            signingConfig = keystorePropertiesFile.exists() ? signingConfigs.release : null
         }
     }
 }
 
 flutter {
-    source '../..'
+    source = "../.."
 }
 
 dependencies {
diff --git a/app/android/app/src/main/AndroidManifest.xml b/app/android/app/src/main/AndroidManifest.xml
index 9a2bf234f..f195e55a9 100644
--- a/app/android/app/src/main/AndroidManifest.xml
+++ b/app/android/app/src/main/AndroidManifest.xml
@@ -34,6 +34,7 @@
             android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
+            android:taskAffinity=""
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
@@ -68,4 +69,15 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
+    <!-- Required to query activities that can process text, see:
+         https://developer.android.com/training/package-visibility and
+         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
+
+         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <data android:mimeType="text/plain"/>
+        </intent>
+    </queries>
 </manifest>
diff --git a/app/android/app/src/main/kotlin/health/studyu/app/studyu_app/MainActivity.kt b/app/android/app/src/main/kotlin/health/studyu/app/MainActivity.kt
similarity index 65%
rename from app/android/app/src/main/kotlin/health/studyu/app/studyu_app/MainActivity.kt
rename to app/android/app/src/main/kotlin/health/studyu/app/MainActivity.kt
index fdeb24d36..2e44fe3cb 100644
--- a/app/android/app/src/main/kotlin/health/studyu/app/studyu_app/MainActivity.kt
+++ b/app/android/app/src/main/kotlin/health/studyu/app/MainActivity.kt
@@ -2,5 +2,4 @@ package health.studyu.app
 
 import io.flutter.embedding.android.FlutterActivity
 
-class MainActivity: FlutterActivity() {
-}
+class MainActivity: FlutterActivity()
diff --git a/app/android/build.gradle b/app/android/build.gradle
index e83fb5dac..d2ffbffa4 100644
--- a/app/android/build.gradle
+++ b/app/android/build.gradle
@@ -1,15 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
@@ -17,12 +5,12 @@ allprojects {
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {
diff --git a/app/android/gradle.properties b/app/android/gradle.properties
index 598d13fee..3b5b324f6 100644
--- a/app/android/gradle.properties
+++ b/app/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G
+org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b99c..5af0f539c 100644
--- a/app/android/gradle/wrapper/gradle-wrapper.properties
+++ b/app/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
diff --git a/app/android/settings.gradle b/app/android/settings.gradle
index 7cd712855..2054f554f 100644
--- a/app/android/settings.gradle
+++ b/app/android/settings.gradle
@@ -5,25 +5,21 @@ pluginManagement {
         def flutterSdkPath = properties.getProperty("flutter.sdk")
         assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
         return flutterSdkPath
-    }
-    settings.ext.flutterSdkPath = flutterSdkPath()
+    }()
 
-    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
     repositories {
         google()
         mavenCentral()
         gradlePluginPortal()
     }
-
-    plugins {
-        id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
-    }
 }
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
+    id "com.android.application" version "8.4.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.23" apply false
 }
 
 include ":app"

From f85b9705a1f44efd2ced3a6d93cac1f22b6557cb Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 9 Jun 2024 22:37:01 +0200
Subject: [PATCH 132/314] fix(app): update ios deployment

---
 app/ios/Flutter/AppFrameworkInfo.plist        |  40 ++--
 app/ios/Gemfile.lock                          |  18 +-
 app/ios/Runner.xcodeproj/project.pbxproj      | 203 +++++++++---------
 .../WorkspaceSettings.xcsettings}             |   4 +-
 app/ios/Runner/AppDelegate.swift              |   2 +-
 app/ios/Runner/Info.plist                     |  10 +-
 6 files changed, 133 insertions(+), 144 deletions(-)
 rename app/ios/{Runner/Runner.entitlements => Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings} (76%)

diff --git a/app/ios/Flutter/AppFrameworkInfo.plist b/app/ios/Flutter/AppFrameworkInfo.plist
index 658d8c43c..7c5696400 100644
--- a/app/ios/Flutter/AppFrameworkInfo.plist
+++ b/app/ios/Flutter/AppFrameworkInfo.plist
@@ -2,25 +2,25 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>App</string>
-	<key>CFBundleIdentifier</key>
-	<string>io.flutter.flutter.app</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>App</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>MinimumOSVersion</key>
-	<string>12.0</string>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>App</string>
+  <key>CFBundleIdentifier</key>
+  <string>io.flutter.flutter.app</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>App</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>1.0</string>
+  <key>MinimumOSVersion</key>
+  <string>12.0</string>
 </dict>
 </plist>
diff --git a/app/ios/Gemfile.lock b/app/ios/Gemfile.lock
index a785ea5d2..6102ebb87 100644
--- a/app/ios/Gemfile.lock
+++ b/app/ios/Gemfile.lock
@@ -10,17 +10,17 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.933.0)
-    aws-sdk-core (3.196.1)
+    aws-partitions (1.941.0)
+    aws-sdk-core (3.197.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.82.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
+    aws-sdk-kms (1.83.0)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.151.0)
-      aws-sdk-core (~> 3, >= 3.194.0)
+    aws-sdk-s3 (1.152.0)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -147,7 +147,7 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.6)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
@@ -171,8 +171,8 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.2.9)
+      strscan
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
diff --git a/app/ios/Runner.xcodeproj/project.pbxproj b/app/ios/Runner.xcodeproj/project.pbxproj
index 277b82799..32da88680 100644
--- a/app/ios/Runner.xcodeproj/project.pbxproj
+++ b/app/ios/Runner.xcodeproj/project.pbxproj
@@ -8,14 +8,14 @@
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
+		2C0B37CAA7639B0F0E17EC9E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4054400FD08195D6D039426B /* Pods_RunnerTests.framework */; };
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
-		DE4118BD26316093944BB547 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE547177D29B8D213743F79 /* Pods_RunnerTests.framework */; };
-		FC481FC0442D5BFCD045B2A4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08D7BE2B1AE5B4F163FA205D /* Pods_Runner.framework */; };
+		B4D3D9481EDF0C2BD0964E3E /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F115AD174C4ABDE2642BA57E /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -42,36 +42,37 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		0478E8710A337E13C25553BB /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
-		08D7BE2B1AE5B4F163FA205D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		068983464CF7CDD3590832BA /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		24A7CEAF7A5088D16B69966D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		4054400FD08195D6D039426B /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		53C2C7121DC855633D5FEB06 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		5DB7F232F74A09A72F6AD57F /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+		8AA78B79C4823734C6A0AE13 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
+		9011E63D7F66016CEDA6A1F7 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
+		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		A2DFB344666DB82893BA7FC6 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
-		B460FAC5445920DDC9850928 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
-		BA7676A230E68AD3052DD1FC /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
-		DCE547177D29B8D213743F79 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		EECA26449F4B4D025A92396E /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
+		E8DED1FBAADC53ADE2681E37 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
+		F115AD174C4ABDE2642BA57E /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		5E6821C3162E0BA77F37A0B6 /* Frameworks */ = {
+		526870A4F4835F50D09866E7 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DE4118BD26316093944BB547 /* Pods_RunnerTests.framework in Frameworks */,
+				2C0B37CAA7639B0F0E17EC9E /* Pods_RunnerTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -79,22 +80,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				FC481FC0442D5BFCD045B2A4 /* Pods_Runner.framework in Frameworks */,
+				B4D3D9481EDF0C2BD0964E3E /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		23971B813AD3D63C4CE72982 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				08D7BE2B1AE5B4F163FA205D /* Pods_Runner.framework */,
-				DCE547177D29B8D213743F79 /* Pods_RunnerTests.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 		331C8082294A63A400263BE5 /* RunnerTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -103,25 +95,13 @@
 			path = RunnerTests;
 			sourceTree = "<group>";
 		};
-		6502177C35D2F3021D741B69 /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				24A7CEAF7A5088D16B69966D /* Pods-Runner.debug.xcconfig */,
-				0478E8710A337E13C25553BB /* Pods-Runner.release.xcconfig */,
-				A2DFB344666DB82893BA7FC6 /* Pods-Runner.profile.xcconfig */,
-				BA7676A230E68AD3052DD1FC /* Pods-RunnerTests.debug.xcconfig */,
-				B460FAC5445920DDC9850928 /* Pods-RunnerTests.release.xcconfig */,
-				EECA26449F4B4D025A92396E /* Pods-RunnerTests.profile.xcconfig */,
-			);
-			path = Pods;
-			sourceTree = "<group>";
-		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
+				9740EEB31CF90195004384FC /* Generated.xcconfig */,
 			);
 			name = Flutter;
 			sourceTree = "<group>";
@@ -133,8 +113,8 @@
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
 				331C8082294A63A400263BE5 /* RunnerTests */,
-				6502177C35D2F3021D741B69 /* Pods */,
-				23971B813AD3D63C4CE72982 /* Frameworks */,
+				C4FA2E59E94821951CF50F29 /* Pods */,
+				CFDC1B1E68702D22D28FF4A6 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -162,6 +142,29 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
+		C4FA2E59E94821951CF50F29 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				068983464CF7CDD3590832BA /* Pods-Runner.debug.xcconfig */,
+				5DB7F232F74A09A72F6AD57F /* Pods-Runner.release.xcconfig */,
+				53C2C7121DC855633D5FEB06 /* Pods-Runner.profile.xcconfig */,
+				E8DED1FBAADC53ADE2681E37 /* Pods-RunnerTests.debug.xcconfig */,
+				9011E63D7F66016CEDA6A1F7 /* Pods-RunnerTests.release.xcconfig */,
+				8AA78B79C4823734C6A0AE13 /* Pods-RunnerTests.profile.xcconfig */,
+			);
+			name = Pods;
+			path = Pods;
+			sourceTree = "<group>";
+		};
+		CFDC1B1E68702D22D28FF4A6 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				F115AD174C4ABDE2642BA57E /* Pods_Runner.framework */,
+				4054400FD08195D6D039426B /* Pods_RunnerTests.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -169,10 +172,10 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
 			buildPhases = (
-				981263AE3167A46D87159B77 /* [CP] Check Pods Manifest.lock */,
+				2DE1FE9399C152E151A275B9 /* [CP] Check Pods Manifest.lock */,
 				331C807D294A63A400263BE5 /* Sources */,
 				331C807F294A63A400263BE5 /* Resources */,
-				5E6821C3162E0BA77F37A0B6 /* Frameworks */,
+				526870A4F4835F50D09866E7 /* Frameworks */,
 			);
 			buildRules = (
 			);
@@ -188,15 +191,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				4D1CF857AD8F68E56E755C00 /* [CP] Check Pods Manifest.lock */,
+				9629C3DEB1E88775B661C61C /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				C2C30BD0C13D89C7E793B3B1 /* [CP] Embed Pods Frameworks */,
-				C5D6FA130EE6A24643B63C2A /* [CP] Copy Pods Resources */,
+				6F4EA73A919628CAFDE30C92 /* [CP] Embed Pods Frameworks */,
+				860B6597EF246AC3E75A1AFB /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -228,7 +231,7 @@
 				};
 			};
 			buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
-			compatibilityVersion = "Xcode 15.0";
+			compatibilityVersion = "Xcode 9.3";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -268,23 +271,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
-			);
-			name = "Thin Binary";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
-		};
-		4D1CF857AD8F68E56E755C00 /* [CP] Check Pods Manifest.lock */ = {
+		2DE1FE9399C152E151A275B9 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -299,84 +286,100 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
+		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
-			name = "Run Script";
+			name = "Thin Binary";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		981263AE3167A46D87159B77 /* [CP] Check Pods Manifest.lock */ = {
+		6F4EA73A919628CAFDE30C92 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		C2C30BD0C13D89C7E793B3B1 /* [CP] Embed Pods Frameworks */ = {
+		860B6597EF246AC3E75A1AFB /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Embed Pods Frameworks";
+			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		C5D6FA130EE6A24643B63C2A /* [CP] Copy Pods Resources */ = {
+		9629C3DEB1E88775B661C61C /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Copy Pods Resources";
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		9740EEB61CF901F6004384FC /* Run Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -431,6 +434,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -460,6 +464,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -483,23 +488,15 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = PG566C9XUK;
-				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = PG566C9XUK;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = health.studyu.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "match AppStore health.studyu.app";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore health.studyu.app";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -508,7 +505,7 @@
 		};
 		331C8088294A63A400263BE5 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = BA7676A230E68AD3052DD1FC /* Pods-RunnerTests.debug.xcconfig */;
+			baseConfigurationReference = E8DED1FBAADC53ADE2681E37 /* Pods-RunnerTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -526,7 +523,7 @@
 		};
 		331C8089294A63A400263BE5 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = B460FAC5445920DDC9850928 /* Pods-RunnerTests.release.xcconfig */;
+			baseConfigurationReference = 9011E63D7F66016CEDA6A1F7 /* Pods-RunnerTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -542,7 +539,7 @@
 		};
 		331C808A294A63A400263BE5 /* Profile */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = EECA26449F4B4D025A92396E /* Pods-RunnerTests.profile.xcconfig */;
+			baseConfigurationReference = 8AA78B79C4823734C6A0AE13 /* Pods-RunnerTests.profile.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -560,6 +557,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -589,6 +587,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -615,6 +614,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -644,6 +644,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -669,21 +670,15 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = PG566C9XUK;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = health.studyu.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "match AppStore health.studyu.app";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -697,21 +692,15 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = PG566C9XUK;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = health.studyu.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "match AppStore health.studyu.app";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
diff --git a/app/ios/Runner/Runner.entitlements b/app/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
similarity index 76%
rename from app/ios/Runner/Runner.entitlements
rename to app/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
index 28c29bf6d..f9b0d7c5e 100644
--- a/app/ios/Runner/Runner.entitlements
+++ b/app/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>aps-environment</key>
-	<string>production</string>
+	<key>PreviewsEnabled</key>
+	<false/>
 </dict>
 </plist>
diff --git a/app/ios/Runner/AppDelegate.swift b/app/ios/Runner/AppDelegate.swift
index f0630aa0c..aa0522ca0 100644
--- a/app/ios/Runner/AppDelegate.swift
+++ b/app/ios/Runner/AppDelegate.swift
@@ -1,5 +1,5 @@
-import UIKit
 import Flutter
+import UIKit
 import flutter_local_notifications
 
 @UIApplicationMain
diff --git a/app/ios/Runner/Info.plist b/app/ios/Runner/Info.plist
index 752966c2e..391233a29 100644
--- a/app/ios/Runner/Info.plist
+++ b/app/ios/Runner/Info.plist
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -71,9 +69,11 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
-	<key>NSCameraUsageDescription</key>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
+    <key>NSCameraUsageDescription</key>
     <string>Need to access your camera to capture a photo for trial observations.</string>
 </dict>
 </plist>

From dfe3e741fa4f89fe69a2bcda2e7a0ad7602c2e59 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 9 Jun 2024 22:46:50 +0200
Subject: [PATCH 133/314] style: remove dynamicSchemeVariant todo

---
 designer_v2/lib/theme.dart | 2 --
 1 file changed, 2 deletions(-)

diff --git a/designer_v2/lib/theme.dart b/designer_v2/lib/theme.dart
index e74e7c97b..957020312 100644
--- a/designer_v2/lib/theme.dart
+++ b/designer_v2/lib/theme.dart
@@ -138,8 +138,6 @@ class ThemeProvider extends InheritedWidget {
         contrastLevel: 0.0);
     final colorScheme = ColorScheme.fromSeed(
       seedColor: dynamicPrimary ?? source(targetColor),
-      // todo use dynamicSchemeVariant once its in the flutter stable channel
-      // dynamicSchemeVariant: DynamicSchemeVariant.fidelity,
       brightness: brightness,
     );
     return colorScheme.copyWith(

From 5c0f04ff8f5f2abf1ed890d4ca5b1257b0eacc47 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sat, 25 May 2024 21:52:02 +0200
Subject: [PATCH 134/314] chore: translation

---
 designer_v2/lib/localization/app_en.arb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index 87421f050..fa8539822 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -68,7 +68,7 @@
   "study_status_running": "Live",
   "study_status_running_description": "This study is currently in progress.",
   "study_status_closed": "Closed",
-  "study_status_closed_description": "This study has been completed.\nNo new participants will be able to enroll.",
+  "study_status_closed_description": "This study has been completed.\nNew participants can no longer enroll.",
   "participation_open_who": "Everyone",
   "participation_open_who_description": "All StudyU users may enroll to the study in the StudyU app.",
   "participation_invite_who": "Invite-only",
@@ -121,7 +121,7 @@
   "notification_study_deleted": "Study was deleted",
   "notification_study_closed": "Study was closed",
   "dialog_study_close_title": "Close participation?",
-  "dialog_study_close_description": "Are you sure that you want to close participation for this study? No new participants will be able to enroll.",
+  "dialog_study_close_description": "Are you sure that you want to close participation for this study? New participants can no longer enroll.",
   "dialog_study_delete_title": "Permanently delete?",
   "dialog_study_delete_description": "Are you sure you want to delete this study? You will permanently lose the study and all data that has been collected.",
   "@__________________STUDYPAGE_DESIGN_SHARED__________________": {},
@@ -245,7 +245,7 @@
   "banner_study_readonly_title": "This study cannot be edited.",
   "banner_study_readonly_description": "You can only make changes to studies where you are an owner or collaborator. Studies that have been launched cannot be changed by anyone.",
   "banner_study_closed_title": "This study is closed.",
-  "banner_study_closed_description": "No new participants will be able to enroll in this study.",
+  "banner_study_closed_description": "New participants can no longer enroll in this study.",
   "form_section_scheduling": "Scheduling and Compliance",
   "form_section_scheduling_description": "To improve compliance, you can set a limited window of time for participants to complete the task & send a reminder notification at the specified time.",
   "form_field_has_reminder": "App reminder",

From 3cf8804463bb10d8e5d8a25aa5cd99664e0a7cee Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sat, 25 May 2024 21:54:20 +0200
Subject: [PATCH 135/314] feat: deprecate published for study_status

---
 .../study/onboarding/study_selection.dart     |   4 -
 core/lib/src/models/tables/study.dart         |  19 +--
 .../20240526_migrate_close_study.sql          | 146 ++++++++++++++++++
 database/migration/migrate-close_study.sql    |  12 --
 database/studyu-schema.sql                    |  16 +-
 designer_v2/lib/domain/study.dart             |   5 +-
 .../features/recruit/study_recruit_page.dart  |   3 +-
 .../study/study_controller_state.dart         |   2 +-
 .../lib/repositories/model_repository.dart    |   2 +-
 .../lib/repositories/study_repository.dart    |   2 +-
 10 files changed, 158 insertions(+), 53 deletions(-)
 create mode 100644 database/migration/20240526_migrate_close_study.sql
 delete mode 100644 database/migration/migrate-close_study.sql

diff --git a/app/lib/screens/study/onboarding/study_selection.dart b/app/lib/screens/study/onboarding/study_selection.dart
index 3a1d36769..ce40c7461 100644
--- a/app/lib/screens/study/onboarding/study_selection.dart
+++ b/app/lib/screens/study/onboarding/study_selection.dart
@@ -159,10 +159,6 @@ class _StudySelectionScreenState extends State<StudySelectionScreen> {
                             child: StudyTile.fromStudy(
                               study: study,
                               onTap: () async {
-                                if (study.isClosed) {
-                                  await showStudyClosedDialog(context);
-                                  return;
-                                }
                                 await navigateToStudyOverview(context, study);
                               },
                             ),
diff --git a/core/lib/src/models/tables/study.dart b/core/lib/src/models/tables/study.dart
index 04f28354d..b2d37d748 100644
--- a/core/lib/src/models/tables/study.dart
+++ b/core/lib/src/models/tables/study.dart
@@ -54,10 +54,10 @@ class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study>
   late Contact contact = Contact();
   @JsonKey(name: 'icon_name', defaultValue: 'accountHeart')
   late String iconName = 'accountHeart';
+  @Deprecated('Use status instead')
   @JsonKey(defaultValue: false)
   late bool published = false;
-  @JsonKey(name: 'is_closed', defaultValue: false)
-  bool isClosed = false;
+  late StudyStatus status = StudyStatus.draft;
   @JsonKey(fromJson: _questionnaireFromJson)
   late StudyUQuestionnaire questionnaire = StudyUQuestionnaire();
   @JsonKey(name: 'eligibility_criteria', fromJson: _eligibilityCriteriaFromJson)
@@ -231,7 +231,7 @@ class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study>
   static Future<ExtractionResult<Study>> publishedPublicStudies() async {
     ExtractionResult<Study> result;
     try {
-      final response = await env.client.from(tableName).select().eq('participation', 'open').eq("is_closed", false);
+      final response = await env.client.from(tableName).select().eq('participation', 'open').eq("closed", false);
       final extracted = SupabaseQuery.extractSupabaseList<Study>(List<Map<String, dynamic>>.from(response));
       result = ExtractionSuccess<Study>(extracted);
     } on ExtractionFailedException<Study> catch (error) {
@@ -292,18 +292,9 @@ class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study>
 
   // - Status
 
-  StudyStatus get status {
-    if (isClosed) {
-      return StudyStatus.closed;
-    }
-    if (published) {
-      return StudyStatus.running;
-    }
-    return StudyStatus.draft;
-  }
-
   bool get isDraft => status == StudyStatus.draft;
   bool get isRunning => status == StudyStatus.running;
+  bool get isClosed => status == StudyStatus.closed;
 
   bool isReadonly(User user) {
     return status != StudyStatus.draft || !canEdit(user);
@@ -311,7 +302,7 @@ class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study>
 
   @override
   String toString() {
-    return 'Study{id: $id, title: $title, description: $description, userId: $userId, participation: $participation, resultSharing: $resultSharing, contact: $contact, iconName: $iconName, published: $published, questionnaire: $questionnaire, eligibilityCriteria: $eligibilityCriteria, consent: $consent, interventions: $interventions, observations: $observations, schedule: $schedule, reportSpecification: $reportSpecification, results: $results, collaboratorEmails: $collaboratorEmails, registryPublished: $registryPublished, participantCount: $participantCount, endedCount: $endedCount, activeSubjectCount: $activeSubjectCount, missedDays: $missedDays, repo: $repo, invites: $invites, participants: $participants, participantsProgress: $participantsProgress, createdAt: $createdAt}';
+    return 'Study{id: $id, title: $title, description: $description, userId: $userId, participation: $participation, resultSharing: $resultSharing, contact: $contact, iconName: $iconName, published: <deprecated>, status: $status, questionnaire: $questionnaire, eligibilityCriteria: $eligibilityCriteria, consent: $consent, interventions: $interventions, observations: $observations, schedule: $schedule, reportSpecification: $reportSpecification, results: $results, collaboratorEmails: $collaboratorEmails, registryPublished: $registryPublished, participantCount: $participantCount, endedCount: $endedCount, activeSubjectCount: $activeSubjectCount, missedDays: $missedDays, repo: $repo, invites: $invites, participants: $participants, participantsProgress: $participantsProgress, createdAt: $createdAt}';
   }
 
   @override
diff --git a/database/migration/20240526_migrate_close_study.sql b/database/migration/20240526_migrate_close_study.sql
new file mode 100644
index 000000000..99953068d
--- /dev/null
+++ b/database/migration/20240526_migrate_close_study.sql
@@ -0,0 +1,146 @@
+-- todo move to studyu-schema.sql
+
+CREATE TYPE public.study_status AS ENUM (
+    'draft',
+    'running',
+    'closed'
+);
+
+ALTER TABLE public.study
+ADD COLUMN status public.study_status DEFAULT 'draft'::public.study_status NOT NULL;
+
+-- Migrate existing studies from published to study_status
+UPDATE public.study SET status = CASE
+    WHEN status != 'draft'::public.study_status THEN status
+    WHEN published THEN 'running'::public.study_status
+    ELSE status
+END;
+
+-- Migrate policy
+DROP POLICY "Editors can do everything with their studies" ON public.study;
+
+CREATE POLICY "Editors can view their studies" ON public.study FOR SELECT USING (auth.uid() = user_id);
+
+CREATE POLICY "Editor can control their draft studies" ON public.study
+    USING (public.can_edit(auth.uid(), study.*) AND status = 'draft'::public.study_status);
+
+-- Editors can only update registry_published and resultSharing
+--grant update (registry_published, result_sharing) on public.study USING (public.can_edit(auth.uid(), study.*);
+--CREATE POLICY "Editors can only update registry_published and resultSharing" ON public.study
+--    FOR UPDATE
+--    USING (public.can_edit(auth.uid(), study.*))
+--    WITH CHECK ((new.*) IS NOT DISTINCT FROM (old.* EXCEPT registry_published, result_sharing));
+-- todo solve with trigger or function
+-- or create view with only updatable columns and provide permission on view see https://dba.stackexchange.com/questions/298931/allow-users-to-modify-only-some-but-not-all-fields-in-a-postgresql-table-with
+
+-- https://stackoverflow.com/questions/72756376/supabase-solutions-for-column-level-security
+
+-- https://github.com/orgs/supabase/discussions/656#discussioncomment-5594653
+CREATE OR REPLACE FUNCTION public.allow_updating_only()
+ RETURNS trigger
+ LANGUAGE plpgsql
+AS $function$
+DECLARE
+  whitelist TEXT[] := TG_ARGV::TEXT[];
+  schema_table TEXT;
+  column_name TEXT;
+  rec RECORD;
+  new_value TEXT;
+  old_value TEXT;
+BEGIN
+  schema_table := concat(TG_TABLE_SCHEMA, '.', TG_TABLE_NAME);
+
+  -- If RLS is not active on current table for function invoker, early return
+  IF NOT row_security_active(schema_table) THEN
+    RETURN NEW;
+  END IF;
+
+  -- Otherwise, loop on all columns of the table schema
+  FOR rec IN (
+    SELECT col.column_name
+    FROM information_schema.columns as col
+    WHERE table_schema = TG_TABLE_SCHEMA
+    AND table_name = TG_TABLE_NAME
+  ) LOOP
+    -- If the current column is whitelisted, early continue
+    column_name := rec.column_name;
+    IF column_name = ANY(whitelist) THEN
+      CONTINUE;
+    END IF;
+
+    -- If not whitelisted, execute dynamic SQL to get column value from OLD and NEW records
+    EXECUTE format('SELECT ($1).%I, ($2).%I', column_name, column_name)
+    INTO new_value, old_value
+    USING NEW, OLD;
+
+    -- Raise exception if column value changed
+    IF new_value IS DISTINCT FROM old_value THEN
+      RAISE EXCEPTION 'Unauthorized change to "%"', column_name;
+    END IF;
+  END LOOP;
+
+  -- RLS active, but no exception encountered, clear to proceed.
+  RETURN NEW;
+END;
+$function$;
+
+CREATE OR REPLACE FUNCTION public.check_study_update_permissions()
+ RETURNS trigger
+ LANGUAGE plpgsql
+AS $function$
+BEGIN
+  -- todo check if this is needed, because the policy should already prevent modification of foreign studies
+  --IF study_param.user_id != auth.uid() THEN
+  --  RAISE EXCEPTION 'Only the owner can update the status';
+  --END IF;
+
+  -- check if old.status is not draft and if yes check if allow_updating_only includes registry_published and result_sharing otherwise raise exception
+  IF OLD.status != 'draft'::public.study_status THEN
+    PERFORM public.allow_updating_only(ARRAY['registry_published', 'result_sharing']);
+    -- dont allow to update status directly
+    IF NEW.status != OLD.status THEN
+      RAISE EXCEPTION 'Study.status can only be updated using the `public.update_study_status` function';
+    END IF;
+  END IF;
+
+  RETURN NEW;
+END;
+$function$;
+
+CREATE OR REPLACE TRIGGER study_status_update_permissions
+  BEFORE UPDATE
+  ON public.study
+  FOR EACH ROW
+  EXECUTE FUNCTION public.check_study_update_permissions();
+
+-- todo use this function to update status in designer
+-- Owners can update status
+CREATE FUNCTION public.update_study_status(study_param public.study) RETURNS VOID
+    LANGUAGE plpgsql -- SECURITY DEFINER
+    AS $$
+BEGIN
+    --IF study_param.user_id != auth.uid() THEN
+    --    RAISE EXCEPTION 'Only the owner can update the status';
+    --END IF;
+    -- Increment the study.status
+    UPDATE public.study
+    SET status = CASE
+        WHEN study_param.status = 'draft'::public.study_status THEN 'running'::public.study_status
+        WHEN study_param.status = 'running'::public.study_status THEN 'closed'::public.study_status
+        ELSE study_param.status
+    END
+    WHERE id = study_param.id;
+END;
+$$;
+
+ALTER FUNCTION public.update_study_status(public.study) OWNER TO postgres;
+
+CREATE POLICY "Joining a closed study should not be possible" ON public.study_subject
+    AS RESTRICTIVE
+    FOR INSERT
+    WITH CHECK (NOT EXISTS (
+    SELECT 1
+    FROM public.study
+    WHERE study.id = study_subject.study_id
+      AND study.status = 'closed'::public.study_status
+));
diff --git a/database/migration/migrate-close_study.sql b/database/migration/migrate-close_study.sql
deleted file mode 100644
index f887f3652..000000000
--- a/database/migration/migrate-close_study.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-ALTER TABLE public.study
-    ADD COLUMN is_closed boolean DEFAULT false NOT NULL;
-
-CREATE POLICY "Joining a closed study should not be possible" ON public.study_subject
-    AS RESTRICTIVE
-    FOR INSERT
-    WITH CHECK (NOT EXISTS (
-    SELECT 1
-    FROM public.study
-    WHERE study.id = study_subject.study_id
-      AND study.is_closed
-));
diff --git a/database/studyu-schema.sql b/database/studyu-schema.sql
index dd7a7f95e..b202d5ef4 100644
--- a/database/studyu-schema.sql
+++ b/database/studyu-schema.sql
@@ -80,8 +80,8 @@ CREATE TABLE public.study (
     title text NOT NULL,
     description text NOT NULL,
     icon_name text NOT NULL,
+    -- published is deprecated, use status instead
     published boolean DEFAULT false NOT NULL,
-    is_closed boolean DEFAULT false NOT NULL,
     registry_published boolean DEFAULT false NOT NULL,
     questionnaire jsonb NOT NULL,
     eligibility_criteria jsonb NOT NULL,
@@ -836,20 +836,6 @@ CREATE POLICY "Editors can see subjects from their studies" ON public.study_subj
 CREATE POLICY "Invite code needs to be valid (not possible in the app)" ON public.study_subject AS RESTRICTIVE FOR INSERT WITH CHECK (((invite_code IS NULL) OR (study_id IN ( SELECT code_fun.study_id
    FROM public.get_study_from_invite(study_subject.invite_code) code_fun(study_id, preselected_intervention_ids)))));
 
---
--- Name: study_subject Joining a closed study should not be possible; Type: POLICY; Schema: public; Owner: postgres
---
-
-CREATE POLICY "Joining a closed study should not be possible" ON public.study_subject
-AS RESTRICTIVE
-FOR INSERT
-WITH CHECK (NOT EXISTS (
-    SELECT 1
-    FROM public.study
-    WHERE study.id = study_subject.study_id
-    AND study.is_closed
-));
-
 --
 -- Name: subject_progress Editors can see their study subjects progress; Type: POLICY; Schema: public; Owner: postgres
 --
diff --git a/designer_v2/lib/domain/study.dart b/designer_v2/lib/domain/study.dart
index 26ca0c72f..4c3cedfd0 100644
--- a/designer_v2/lib/domain/study.dart
+++ b/designer_v2/lib/domain/study.dart
@@ -113,8 +113,7 @@ extension StudyDuplicateX on Study {
     copy.resetJsonIgnoredAttributes();
     copy.title = (copy.title ?? '').withDuplicateLabel();
     copy.userId = userId;
-    copy.published = false;
-    copy.isClosed = false;
+    copy.status = StudyStatus.draft;
     copy.resultSharing = ResultSharing.private;
     copy.registryPublished = false;
     copy.results = [];
@@ -141,7 +140,7 @@ extension StudyDuplicateX on Study {
     final copy = Study.fromJson(toJson());
     copy.copyJsonIgnoredAttributes(from: this, createdAt: true);
     copy.resetParticipantData();
-    copy.published = true;
+    copy.status = StudyStatus.running;
     return copy;
   }
 
diff --git a/designer_v2/lib/features/recruit/study_recruit_page.dart b/designer_v2/lib/features/recruit/study_recruit_page.dart
index 42774a979..c9f886496 100644
--- a/designer_v2/lib/features/recruit/study_recruit_page.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_page.dart
@@ -55,7 +55,7 @@ class StudyRecruitScreen extends StudyPageWidget {
   @override
   Widget? banner(BuildContext context, WidgetRef ref) {
     final state = ref.watch(studyRecruitControllerProvider(studyId));
-    final isStudyClosed = state.studyWithMetadata?.model.isClosed == true;
+    final isStudyClosed = state.studyWithMetadata!.model.isClosed;
 
     if (isStudyClosed) {
       return BannerBox(
@@ -74,7 +74,6 @@ class StudyRecruitScreen extends StudyPageWidget {
               ]),
           style: BannerStyle.info);
     }
-
     return null;
   }
 
diff --git a/designer_v2/lib/features/study/study_controller_state.dart b/designer_v2/lib/features/study/study_controller_state.dart
index 3c41c6566..483b9b61c 100644
--- a/designer_v2/lib/features/study/study_controller_state.dart
+++ b/designer_v2/lib/features/study/study_controller_state.dart
@@ -15,7 +15,7 @@ class StudyControllerState extends StudyControllerBaseState implements IStudyApp
     this.lastSynced,
   });
 
-  bool get isPublished => study.value != null && study.value!.published;
+  bool get isPublished => study.value != null && study.value!.status == StudyStatus.running;
 
   // - ISyncIndicatorViewModel
 
diff --git a/designer_v2/lib/repositories/model_repository.dart b/designer_v2/lib/repositories/model_repository.dart
index c2415a57f..d910bd2f3 100644
--- a/designer_v2/lib/repositories/model_repository.dart
+++ b/designer_v2/lib/repositories/model_repository.dart
@@ -304,7 +304,7 @@ abstract class ModelRepository<T> extends IModelRepository<T> {
     if (fetchOnSubscribe) {
       if (!(wrappedModel != null && wrappedModel.isLocalOnly)) {
         fetch(modelId).catchError((e) {
-          if (!modelController.isClosed) {
+          if (!modelController.closed) {
             modelController.addError(e);
           }
           return e;
diff --git a/designer_v2/lib/repositories/study_repository.dart b/designer_v2/lib/repositories/study_repository.dart
index e0625f53f..8c523ca9b 100644
--- a/designer_v2/lib/repositories/study_repository.dart
+++ b/designer_v2/lib/repositories/study_repository.dart
@@ -106,7 +106,7 @@ class StudyRepository extends ModelRepository<Study> implements IStudyRepository
     }
 
     Future<void> onCloseCallback() {
-      model.isClosed = true;
+      model.status = StudyStatus.closed;
       return save(model).then((value) => ref.read(routerProvider).dispatch(RoutingIntents.studies)).then((value) =>
           Future.delayed(const Duration(milliseconds: 200),
               () => ref.read(notificationServiceProvider).show(Notifications.studyClosed)));

From 29310b78019518a2063836125fced614bd2c6823 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 26 May 2024 08:01:09 +0200
Subject: [PATCH 136/314] chore: create migration temporarily

---
 supabase/migrations/20240526_migrate_close_study.sql | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 supabase/migrations/20240526_migrate_close_study.sql

diff --git a/supabase/migrations/20240526_migrate_close_study.sql b/supabase/migrations/20240526_migrate_close_study.sql
new file mode 120000
index 000000000..5cfba03e0
--- /dev/null
+++ b/supabase/migrations/20240526_migrate_close_study.sql
@@ -0,0 +1 @@
+../../database/migration/20240526_migrate_close_study.sql
\ No newline at end of file

From 9aba30c686abb5b89ffa8df3fb68d741ccf509c1 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 26 May 2024 16:54:51 +0200
Subject: [PATCH 137/314] fix: improve status transition rules

---
 .../20240526_migrate_close_study.sql          | 83 ++++++++++---------
 1 file changed, 42 insertions(+), 41 deletions(-)

diff --git a/database/migration/20240526_migrate_close_study.sql b/database/migration/20240526_migrate_close_study.sql
index 99953068d..c6cf982cd 100644
--- a/database/migration/20240526_migrate_close_study.sql
+++ b/database/migration/20240526_migrate_close_study.sql
@@ -22,7 +22,8 @@ DROP POLICY "Editors can do everything with their studies" ON public.study;
 CREATE POLICY "Editors can view their studies" ON public.study FOR SELECT USING (auth.uid() = user_id);
 
 CREATE POLICY "Editor can control their draft studies" ON public.study
-    USING (public.can_edit(auth.uid(), study.*) AND status = 'draft'::public.study_status);
+    --USING (public.can_edit(auth.uid(), study.*) AND status = 'draft'::public.study_status);
+    USING (public.can_edit(auth.uid(), study.*));
 
 -- Editors can only update registry_published and resultSharing
 --grant update (registry_published, result_sharing) on public.study USING (public.can_edit(auth.uid(), study.*);
@@ -36,6 +37,8 @@ CREATE POLICY "Editor can control their draft studies" ON public.study
 -- https://stackoverflow.com/questions/72756376/supabase-solutions-for-column-level-security
 
 -- https://github.com/orgs/supabase/discussions/656#discussioncomment-5594653
+
+-- todo document this function
 CREATE OR REPLACE FUNCTION public.allow_updating_only()
  RETURNS trigger
  LANGUAGE plpgsql
@@ -48,6 +51,27 @@ DECLARE
   new_value TEXT;
   old_value TEXT;
 BEGIN
+
+  -- If the current user is 'postgres', return NEW without making any changes
+  IF CURRENT_USER = 'postgres' THEN
+    RETURN NEW;
+  END IF;
+
+  -- If the status is draft, return NEW without making any changes
+  IF OLD.status = 'draft'::public.study_status THEN
+    RETURN NEW;
+  END IF;
+
+  -- Don't allow invalid status transitions
+  IF OLD.status != NEW.status THEN
+    IF NOT (
+        (OLD.status = 'draft'::public.study_status AND NEW.status = 'running'::public.study_status)
+        OR (OLD.status = 'running'::public.study_status AND NEW.status = 'closed'::public.study_status)
+    ) THEN
+      RAISE EXCEPTION 'Invalid status transition';
+    END IF;
+  END IF;
+
   schema_table := concat(TG_TABLE_SCHEMA, '.', TG_TABLE_NAME);
 
   -- If RLS is not active on current table for function invoker, early return
@@ -84,56 +108,33 @@ BEGIN
 END;
 $function$;
 
-CREATE OR REPLACE FUNCTION public.check_study_update_permissions()
- RETURNS trigger
- LANGUAGE plpgsql
-AS $function$
-BEGIN
-  -- todo check if this is needed, because the policy should already prevent modification of foreign studies
-  --IF study_param.user_id != auth.uid() THEN
-  --  RAISE EXCEPTION 'Only the owner can update the status';
-  --END IF;
-
-  -- check if old.status is not draft and if yes check if allow_updating_only includes registry_published and result_sharing otherwise raise exception
-  IF OLD.status != 'draft'::public.study_status THEN
-    PERFORM public.allow_updating_only(ARRAY['registry_published', 'result_sharing']);
-    -- dont allow to update status directly
-    IF NEW.status != OLD.status THEN
-      RAISE EXCEPTION 'Study.status can only be updated using the `public.update_study_status` function';
-    END IF;
-  END IF;
-
-  RETURN NEW;
-END;
-$function$;
-
 CREATE OR REPLACE TRIGGER study_status_update_permissions
   BEFORE UPDATE
   ON public.study
   FOR EACH ROW
-  EXECUTE FUNCTION public.check_study_update_permissions();
+  EXECUTE FUNCTION public.allow_updating_only('updated_at', 'status', 'registry_published', 'result_sharing');
+  -- todo also add participation?
 
--- todo use this function to update status in designer
 -- Owners can update status
-CREATE FUNCTION public.update_study_status(study_param public.study) RETURNS VOID
-    LANGUAGE plpgsql -- SECURITY DEFINER
-    AS $$
-BEGIN
+--CREATE FUNCTION public.update_study_status(study_param public.study) RETURNS VOID
+--    LANGUAGE plpgsql -- SECURITY DEFINER
+--    AS $$
+--BEGIN
     --IF study_param.user_id != auth.uid() THEN
     --    RAISE EXCEPTION 'Only the owner can update the status';
     --END IF;
     -- Increment the study.status
-    UPDATE public.study
-    SET status = CASE
-        WHEN study_param.status = 'draft'::public.study_status THEN 'running'::public.study_status
-        WHEN study_param.status = 'running'::public.study_status THEN 'closed'::public.study_status
-        ELSE study_param.status
-    END
-    WHERE id = study_param.id;
-END;
-$$;
-
-ALTER FUNCTION public.update_study_status(public.study) OWNER TO postgres;
+--    UPDATE public.study
+--    SET status = CASE
+--        WHEN study_param.status = 'draft'::public.study_status THEN 'running'::public.study_status
+--        WHEN study_param.status = 'running'::public.study_status THEN 'closed'::public.study_status
+--        ELSE study_param.status
+--    END
+--    WHERE id = study_param.id;
+--END;
+--$$;
+
+--ALTER FUNCTION public.update_study_status(public.study) OWNER TO postgres;
 
 CREATE POLICY "Joining a closed study should not be possible" ON public.study_subject
     AS RESTRICTIVE

From 15a72e5e8ffb9c8a7251fcd4eeefe8b5713d5d49 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 7 Jun 2024 16:33:11 +0200
Subject: [PATCH 138/314] feat: study close button

---
 .../20240526_migrate_close_study.sql          |  2 +-
 designer_v2/lib/domain/study.dart             |  3 -
 .../close/study_close_dialog_confirm.dart     | 64 +++++++++++++++++++
 .../close/study_close_dialog_success.dart     | 42 ++++++++++++
 .../publish/study_publish_dialog_confirm.dart |  0
 .../publish/study_publish_dialog_success.dart |  0
 .../lib/features/dialogs/study_dialogs.dart   | 39 +++++++++++
 .../publish/study_publish_dialog.dart         | 31 ---------
 .../features/recruit/study_recruit_page.dart  |  4 +-
 .../lib/features/study/study_actions.dart     |  1 -
 .../lib/features/study/study_controller.dart  |  6 +-
 .../study/study_controller_state.dart         |  2 +
 .../lib/features/study/study_scaffold.dart    | 23 ++++++-
 designer_v2/lib/localization/app_de.arb       |  2 +-
 designer_v2/lib/localization/app_en.arb       |  2 +-
 .../lib/repositories/study_repository.dart    | 39 ++++++-----
 designer_v2/lib/services/notifications.dart   |  3 -
 17 files changed, 200 insertions(+), 63 deletions(-)
 create mode 100644 designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart
 create mode 100644 designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart
 rename designer_v2/lib/features/{ => dialogs}/publish/study_publish_dialog_confirm.dart (100%)
 rename designer_v2/lib/features/{ => dialogs}/publish/study_publish_dialog_success.dart (100%)
 create mode 100644 designer_v2/lib/features/dialogs/study_dialogs.dart
 delete mode 100644 designer_v2/lib/features/publish/study_publish_dialog.dart

diff --git a/database/migration/20240526_migrate_close_study.sql b/database/migration/20240526_migrate_close_study.sql
index c6cf982cd..b5d44e7e8 100644
--- a/database/migration/20240526_migrate_close_study.sql
+++ b/database/migration/20240526_migrate_close_study.sql
@@ -31,7 +31,7 @@ CREATE POLICY "Editor can control their draft studies" ON public.study
 --    FOR UPDATE
 --    USING (public.can_edit(auth.uid(), study.*))
 --    WITH CHECK ((new.*) IS NOT DISTINCT FROM (old.* EXCEPT registry_published, result_sharing));
--- todo solve with trigger or function
+-- t odo solve with trigger or function
 -- or create view with only updatable columns and provide permission on view see https://dba.stackexchange.com/questions/298931/allow-users-to-modify-only-some-but-not-all-fields-in-a-postgresql-table-with
 
 -- https://stackoverflow.com/questions/72756376/supabase-solutions-for-column-level-security
diff --git a/designer_v2/lib/domain/study.dart b/designer_v2/lib/domain/study.dart
index 4c3cedfd0..27c25ba3a 100644
--- a/designer_v2/lib/domain/study.dart
+++ b/designer_v2/lib/domain/study.dart
@@ -14,7 +14,6 @@ enum StudyActionType {
   duplicateDraft,
   addCollaborator,
   export,
-  close,
   delete,
 }
 
@@ -28,8 +27,6 @@ extension StudyActionTypeFormatted on StudyActionType {
         return tr.action_unpin;
       case StudyActionType.edit:
         return tr.action_edit;
-      case StudyActionType.close:
-        return tr.action_close;
       case StudyActionType.delete:
         return tr.action_delete;
       case StudyActionType.duplicate:
diff --git a/designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart b/designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart
new file mode 100644
index 000000000..ab3aa2d6b
--- /dev/null
+++ b/designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart
@@ -0,0 +1,64 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:reactive_forms/reactive_forms.dart';
+import 'package:studyu_designer_v2/common_views/dialog.dart';
+import 'package:studyu_designer_v2/common_views/form_buttons.dart';
+import 'package:studyu_designer_v2/common_views/primary_button.dart';
+import 'package:studyu_designer_v2/features/study/settings/study_settings_form_controller.dart';
+import 'package:studyu_designer_v2/features/study/study_controller.dart';
+import 'package:studyu_designer_v2/features/study/study_page_view.dart';
+import 'package:studyu_designer_v2/localization/app_translation.dart';
+
+class CloseConfirmationDialog extends StudyPageWidget {
+  const CloseConfirmationDialog(super.studyId, {super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final controller = ref.watch(studyControllerProvider(studyId).notifier);
+    final formViewModel =
+        ref.watch(studySettingsFormViewModelProvider(studyId));
+
+    return ReactiveForm(
+      formGroup: formViewModel.form,
+      child: StandardDialog(
+        titleText: tr.dialog_study_close_title,
+        body: Column(
+          mainAxisAlignment: MainAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Flexible(
+                    child: Column(
+                      mainAxisAlignment: MainAxisAlignment.start,
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        RichText(
+                          text: TextSpan(
+                            text: tr.dialog_study_close_description,
+                      ),
+                    ),
+                  ],
+                )),
+              ],
+            ),
+          ],
+        ),
+        actionButtons: [
+          const DismissButton(),
+          ReactiveFormConsumer(builder: (context, form, child) {
+            return PrimaryButton(
+              text: tr.dialog_close,
+              icon: null,
+              onPressedFuture: () => controller.closeStudy(),
+            );
+          }),
+        ],
+        maxWidth: 650,
+        minWidth: 610,
+        minHeight: 200,
+      ),
+    );
+  }
+}
diff --git a/designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart b/designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart
new file mode 100644
index 000000000..c08726a0e
--- /dev/null
+++ b/designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart
@@ -0,0 +1,42 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:studyu_designer_v2/common_views/dialog.dart';
+import 'package:studyu_designer_v2/common_views/empty_body.dart';
+import 'package:studyu_designer_v2/common_views/primary_button.dart';
+import 'package:studyu_designer_v2/features/study/study_page_view.dart';
+import 'package:studyu_designer_v2/localization/app_translation.dart';
+import 'package:studyu_designer_v2/localization/string_hardcoded.dart';
+
+class CloseSuccessDialog extends StudyPageWidget {
+  const CloseSuccessDialog(super.studyId, {super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final theme = Theme.of(context);
+
+    return StandardDialog(
+      body: Column(
+        children: [
+          const SizedBox(height: 24.0),
+          EmptyBody(
+            leading: Text("\u{1f512}".hardcoded,
+                style: theme.textTheme.displayLarge?.copyWith(
+                  fontSize: (theme.textTheme.displayLarge?.fontSize ?? 48.0) * 1.5,
+                )),
+            title: tr.notification_study_closed,
+            description: '',
+          ),
+          const SizedBox(height: 8.0),
+        ],
+      ),
+      actionButtons: [
+        PrimaryButton(
+          text: tr.action_button_study_close,
+          icon: null,
+          onPressedFuture: () => Navigator.maybePop(context),
+        ),
+      ],
+      maxWidth: 450,
+    );
+  }
+}
diff --git a/designer_v2/lib/features/publish/study_publish_dialog_confirm.dart b/designer_v2/lib/features/dialogs/publish/study_publish_dialog_confirm.dart
similarity index 100%
rename from designer_v2/lib/features/publish/study_publish_dialog_confirm.dart
rename to designer_v2/lib/features/dialogs/publish/study_publish_dialog_confirm.dart
diff --git a/designer_v2/lib/features/publish/study_publish_dialog_success.dart b/designer_v2/lib/features/dialogs/publish/study_publish_dialog_success.dart
similarity index 100%
rename from designer_v2/lib/features/publish/study_publish_dialog_success.dart
rename to designer_v2/lib/features/dialogs/publish/study_publish_dialog_success.dart
diff --git a/designer_v2/lib/features/dialogs/study_dialogs.dart b/designer_v2/lib/features/dialogs/study_dialogs.dart
new file mode 100644
index 000000000..8ecee70f9
--- /dev/null
+++ b/designer_v2/lib/features/dialogs/study_dialogs.dart
@@ -0,0 +1,39 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:studyu_designer_v2/domain/study.dart';
+import 'package:studyu_designer_v2/features/dialogs/close/study_close_dialog_confirm.dart';
+import 'package:studyu_designer_v2/features/dialogs/close/study_close_dialog_success.dart';
+import 'package:studyu_designer_v2/features/dialogs/publish/study_publish_dialog_confirm.dart';
+import 'package:studyu_designer_v2/features/dialogs/publish/study_publish_dialog_success.dart';
+import 'package:studyu_designer_v2/features/study/study_controller.dart';
+import 'package:studyu_designer_v2/features/study/study_page_view.dart';
+import 'package:studyu_designer_v2/theme.dart';
+
+enum StudyDialogType { publish, close }
+
+class StudyDialog extends StudyPageWidget {
+  final StudyDialogType dialogType;
+
+  const StudyDialog(this.dialogType, super.studyId, {super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final state = ref.watch(studyControllerProvider(studyId));
+
+    switch(dialogType) {
+      case StudyDialogType.publish:
+        return state.isPublished ? PublishSuccessDialog(studyId) : PublishConfirmationDialog(studyId);
+      case StudyDialogType.close:
+        return state.isClosed ? CloseSuccessDialog(studyId) : CloseConfirmationDialog(studyId);
+    }
+  }
+}
+
+showStudyDialog(BuildContext context, StudyID studyId, StudyDialogType dialogType) {
+  final theme = Theme.of(context);
+  return showDialog(
+    context: context,
+    barrierColor: ThemeConfig.modalBarrierColor(theme),
+    builder: (context) => StudyDialog(dialogType, studyId),
+  );
+}
diff --git a/designer_v2/lib/features/publish/study_publish_dialog.dart b/designer_v2/lib/features/publish/study_publish_dialog.dart
deleted file mode 100644
index d9efd69c1..000000000
--- a/designer_v2/lib/features/publish/study_publish_dialog.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:studyu_designer_v2/domain/study.dart';
-import 'package:studyu_designer_v2/features/publish/study_publish_dialog_confirm.dart';
-import 'package:studyu_designer_v2/features/publish/study_publish_dialog_success.dart';
-import 'package:studyu_designer_v2/features/study/study_controller.dart';
-import 'package:studyu_designer_v2/features/study/study_page_view.dart';
-import 'package:studyu_designer_v2/theme.dart';
-
-class PublishDialog extends StudyPageWidget {
-  const PublishDialog(super.studyId, {super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final state = ref.watch(studyControllerProvider(studyId));
-
-    if (state.isPublished) {
-      return PublishSuccessDialog(studyId);
-    }
-    return PublishConfirmationDialog(studyId);
-  }
-}
-
-showPublishDialog(BuildContext context, StudyID studyId) {
-  final theme = Theme.of(context);
-  return showDialog(
-    context: context,
-    barrierColor: ThemeConfig.modalBarrierColor(theme),
-    builder: (context) => PublishDialog(studyId),
-  );
-}
diff --git a/designer_v2/lib/features/recruit/study_recruit_page.dart b/designer_v2/lib/features/recruit/study_recruit_page.dart
index c9f886496..5b89866a8 100644
--- a/designer_v2/lib/features/recruit/study_recruit_page.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_page.dart
@@ -55,9 +55,9 @@ class StudyRecruitScreen extends StudyPageWidget {
   @override
   Widget? banner(BuildContext context, WidgetRef ref) {
     final state = ref.watch(studyRecruitControllerProvider(studyId));
-    final isStudyClosed = state.studyWithMetadata!.model.isClosed;
+    final isStudyClosed = state.studyWithMetadata?.model.isClosed;
 
-    if (isStudyClosed) {
+    if (isStudyClosed ?? false) {
       return BannerBox(
           noPrefix: true,
           body: Column(
diff --git a/designer_v2/lib/features/study/study_actions.dart b/designer_v2/lib/features/study/study_actions.dart
index 8b38692cd..cbd257fcb 100644
--- a/designer_v2/lib/features/study/study_actions.dart
+++ b/designer_v2/lib/features/study/study_actions.dart
@@ -11,5 +11,4 @@ Map<StudyActionType, IconData> studyActionIcons = {
   StudyActionType.addCollaborator: Icons.person_add_rounded,
   StudyActionType.export: Icons.download_rounded,
   StudyActionType.delete: Icons.delete_rounded,
-  StudyActionType.close: MdiIcons.accountLock,
 };
diff --git a/designer_v2/lib/features/study/study_controller.dart b/designer_v2/lib/features/study/study_controller.dart
index 2edbd13dd..3091f8350 100644
--- a/designer_v2/lib/features/study/study_controller.dart
+++ b/designer_v2/lib/features/study/study_controller.dart
@@ -82,6 +82,11 @@ class StudyController extends StudyBaseController<StudyControllerState> {
     return studyRepository.launch(study);
   }
 
+  Future closeStudy() {
+    final study = state.study.value!;
+    return studyRepository.close(study);
+  }
+
   void onChangeStudyParticipation() {
     router.dispatch(RoutingIntents.studyEditEnrollment(studyId));
   }
@@ -111,7 +116,6 @@ final studyControllerProvider =
     currentUser: ref.watch(authRepositoryProvider).currentUser,
     router: ref.watch(routerProvider),
     notificationService: ref.watch(notificationServiceProvider),
-    //ref: ref,
   );
   controller.addListener((state) {
     print("studyController.state updated");
diff --git a/designer_v2/lib/features/study/study_controller_state.dart b/designer_v2/lib/features/study/study_controller_state.dart
index 483b9b61c..bd31b0813 100644
--- a/designer_v2/lib/features/study/study_controller_state.dart
+++ b/designer_v2/lib/features/study/study_controller_state.dart
@@ -17,6 +17,8 @@ class StudyControllerState extends StudyControllerBaseState implements IStudyApp
 
   bool get isPublished => study.value != null && study.value!.status == StudyStatus.running;
 
+  bool get isClosed => study.value != null && study.value!.status == StudyStatus.closed;
+
   // - ISyncIndicatorViewModel
 
   @override
diff --git a/designer_v2/lib/features/study/study_scaffold.dart b/designer_v2/lib/features/study/study_scaffold.dart
index 0a12c7c03..4536e38bc 100644
--- a/designer_v2/lib/features/study/study_scaffold.dart
+++ b/designer_v2/lib/features/study/study_scaffold.dart
@@ -6,13 +6,13 @@ import 'package:studyu_designer_v2/common_views/async_value_widget.dart';
 import 'package:studyu_designer_v2/common_views/layout_single_column.dart';
 import 'package:studyu_designer_v2/common_views/navbar_tabbed.dart';
 import 'package:studyu_designer_v2/common_views/primary_button.dart';
+import 'package:studyu_designer_v2/common_views/secondary_button.dart';
 import 'package:studyu_designer_v2/common_views/sync_indicator.dart';
 import 'package:studyu_designer_v2/common_views/utils.dart';
 import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/features/app_drawer.dart';
 import 'package:studyu_designer_v2/features/design/study_form_providers.dart';
 import 'package:studyu_designer_v2/features/forms/form_validation.dart';
-import 'package:studyu_designer_v2/features/publish/study_publish_dialog.dart';
 import 'package:studyu_designer_v2/features/study/study_controller.dart';
 import 'package:studyu_designer_v2/features/study/study_controller_state.dart';
 import 'package:studyu_designer_v2/features/study/study_navbar.dart';
@@ -20,6 +20,7 @@ import 'package:studyu_designer_v2/features/study/study_page_view.dart';
 import 'package:studyu_designer_v2/features/study/study_status_badge.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/theme.dart';
+import 'package:studyu_designer_v2/features/dialogs/study_dialogs.dart';
 
 abstract class IStudyAppBarViewModel implements IStudyStatusBadgeViewModel, IStudyNavViewModel {
   bool get isSyncIndicatorVisible;
@@ -228,7 +229,7 @@ class _StudyScaffoldState extends ConsumerState<StudyScaffold> {
             tooltipDisabled: "${tr.form_invalid_prompt}\n\n${form.validationErrorSummary}",
             icon: null,
             enabled: formViewModel.isValid,
-            onPressed: () => showPublishDialog(context, widget.studyId),
+            onPressed: () => showStudyDialog(context, widget.studyId, StudyDialogType.publish),
           );
         }),
       );
@@ -236,6 +237,24 @@ class _StudyScaffoldState extends ConsumerState<StudyScaffold> {
       actionButtons.add(const SizedBox(width: 12.0)); // padding
     }
 
+    if (state.isPublished) {
+      final formViewModel = ref.watch(studyPublishValidatorProvider(widget.studyId));
+      final closeButton = ReactiveForm(
+        formGroup: formViewModel.form,
+        child: ReactiveFormConsumer(
+            // enable re-rendering based on form validation status
+            builder: (context, form, child) {
+          return SecondaryButton(
+            text: tr.action_button_study_close,
+            icon: null,
+            onPressed: () => showStudyDialog(context, widget.studyId, StudyDialogType.close),
+          );
+        }),
+      );
+      actionButtons.add(closeButton);
+      actionButtons.add(const SizedBox(width: 12.0)); // padding
+    }
+
     if (state.isSettingsEnabled) {
       actionButtons.add(IconButton(
         onPressed: controller.onSettingsPressed,
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index ded5ffe6a..e19eebf00 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -118,6 +118,7 @@
   "study_settings_publish_results": "Ergebnisse veröffentlichen",
   "study_settings_publish_results_tooltip": "Andere Forscher und Kliniker können auf die anonymisierten Ergebnisdaten einer Studie zugreifen, \nsie exportieren und analysieren (die Analysieren-Unterseite deiner Studie ist zugänglich). Die Studie \nselbst wird dadurch automatisch auch für andere Forscher und Kliniker im Studienregister veröffentlicht.",
   "action_button_study_launch": "Studie starten",
+  "action_button_study_close": "Studie schließen",
   "notification_study_deleted": "Die Studie wurde gelöscht",
   "notification_study_closed": "Die Studie wurde geschlossen",
   "dialog_study_close_title": "Teilnahme schließen?",
@@ -550,7 +551,6 @@
   "action_pin": "Anheften",
   "action_unpin": "Nicht mehr anheften",
   "action_edit": "Bearbeiten",
-  "action_close": "Schließen",
   "action_delete": "Löschen",
   "action_remove": "Entfernen",
   "action_duplicate": "Duplizieren",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index fa8539822..12b88af00 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -118,6 +118,7 @@
   "study_settings_publish_results": "Publish results",
   "study_settings_publish_results_tooltip": "Make your anonymized study results & data available in the study registry. \nOther researchers & clinicians will be able to access, export and \nanalyze the results from your study (the Analyze page will be available). \n This will automatically publish your study design to the registry.",
   "action_button_study_launch": "Launch",
+  "action_button_study_close": "Close study",
   "notification_study_deleted": "Study was deleted",
   "notification_study_closed": "Study was closed",
   "dialog_study_close_title": "Close participation?",
@@ -599,7 +600,6 @@
   "action_pin": "Pin",
   "action_unpin": "Remove pin",
   "action_delete": "Delete",
-  "action_close": "Close",
   "action_remove": "Remove",
   "action_duplicate": "Duplicate",
   "action_clipboard": "Copy to clipboard",
diff --git a/designer_v2/lib/repositories/study_repository.dart b/designer_v2/lib/repositories/study_repository.dart
index 8c523ca9b..10980492b 100644
--- a/designer_v2/lib/repositories/study_repository.dart
+++ b/designer_v2/lib/repositories/study_repository.dart
@@ -20,6 +20,7 @@ import 'package:studyu_designer_v2/utils/performance.dart';
 abstract class IStudyRepository implements ModelRepository<Study> {
   Future<void> launch(Study study);
   Future<void> deleteParticipants(Study study);
+  Future<void> close(Study study);
   // Future<void> deleteProgress(Study study);
 }
 
@@ -97,6 +98,27 @@ class StudyRepository extends ModelRepository<Study> implements IStudyRepository
     return publishOperation.execute();
   }
 
+  @override
+  Future<void> close(Study study) async {
+    final wrappedModel = get(study.id);
+    if (wrappedModel == null) {
+      throw ModelNotFoundException();
+    }
+    study.status = StudyStatus.closed;
+
+    final publishOperation = OptimisticUpdate(
+      applyOptimistic: () => {}, // nothing to do here
+      apply: () => save(study, runOptimistically: false),
+      rollback: () {}, // nothing to do here
+      onUpdate: () => emitUpdate(),
+      onError: (e, stackTrace) {
+        emitError(modelStreamControllers[study.id], e, stackTrace);
+      },
+    );
+
+    return publishOperation.execute();
+  }
+
   @override
   List<ModelAction> availableActions(Study model) {
     Future<void> onDeleteCallback() {
@@ -105,13 +127,6 @@ class StudyRepository extends ModelRepository<Study> implements IStudyRepository
               () => ref.read(notificationServiceProvider).show(Notifications.studyDeleted)));
     }
 
-    Future<void> onCloseCallback() {
-      model.status = StudyStatus.closed;
-      return save(model).then((value) => ref.read(routerProvider).dispatch(RoutingIntents.studies)).then((value) =>
-          Future.delayed(const Duration(milliseconds: 200),
-              () => ref.read(notificationServiceProvider).show(Notifications.studyClosed)));
-    }
-
     final currentUser = authRepository.currentUser!;
 
     // TODO: review Postgres policies to match [ModelAction.isAvailable]
@@ -161,16 +176,6 @@ class StudyRepository extends ModelRepository<Study> implements IStudyRepository
         isAvailable: model.canExport(currentUser),
       ),
       ModelAction.addSeparator(),
-      ModelAction(
-        type: StudyActionType.close,
-        label: StudyActionType.close.string,
-        onExecute: () {
-          return ref.read(notificationServiceProvider).show(Notifications.studyCloseConfirmation, actions: [
-            NotificationAction(label: StudyActionType.close.string, onSelect: onCloseCallback, isDestructive: true),
-          ]);
-        },
-        isAvailable: model.canClose(currentUser) && model.status == StudyStatus.running,
-      ),
       ModelAction(
         type: StudyActionType.delete,
         label: StudyActionType.delete.string,
diff --git a/designer_v2/lib/services/notifications.dart b/designer_v2/lib/services/notifications.dart
index 40eeb7abe..adcc3b239 100644
--- a/designer_v2/lib/services/notifications.dart
+++ b/designer_v2/lib/services/notifications.dart
@@ -19,9 +19,6 @@ class Notifications {
   static final studyDeleted = SnackbarIntent(
     message: tr.notification_study_deleted,
   );
-  static final studyClosed = SnackbarIntent(
-    message: tr.notification_study_closed,
-  );
   static final inviteCodeDeleted = SnackbarIntent(
     message: tr.notification_code_deleted,
   );

From 881f856fe5a2a039fb9de2d0f90d744ad717c322 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 7 Jun 2024 16:38:32 +0200
Subject: [PATCH 139/314] chore: format

---
 .../dialogs/close/study_close_dialog_confirm.dart | 15 +++++++--------
 .../lib/features/dialogs/study_dialogs.dart       |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart b/designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart
index ab3aa2d6b..d0ddf8ca9 100644
--- a/designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart
+++ b/designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart
@@ -15,8 +15,7 @@ class CloseConfirmationDialog extends StudyPageWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final controller = ref.watch(studyControllerProvider(studyId).notifier);
-    final formViewModel =
-        ref.watch(studySettingsFormViewModelProvider(studyId));
+    final formViewModel = ref.watch(studySettingsFormViewModelProvider(studyId));
 
     return ReactiveForm(
       formGroup: formViewModel.form,
@@ -31,12 +30,12 @@ class CloseConfirmationDialog extends StudyPageWidget {
               children: [
                 Flexible(
                     child: Column(
-                      mainAxisAlignment: MainAxisAlignment.start,
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        RichText(
-                          text: TextSpan(
-                            text: tr.dialog_study_close_description,
+                  mainAxisAlignment: MainAxisAlignment.start,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    RichText(
+                      text: TextSpan(
+                        text: tr.dialog_study_close_description,
                       ),
                     ),
                   ],
diff --git a/designer_v2/lib/features/dialogs/study_dialogs.dart b/designer_v2/lib/features/dialogs/study_dialogs.dart
index 8ecee70f9..bd22ccf7e 100644
--- a/designer_v2/lib/features/dialogs/study_dialogs.dart
+++ b/designer_v2/lib/features/dialogs/study_dialogs.dart
@@ -20,7 +20,7 @@ class StudyDialog extends StudyPageWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final state = ref.watch(studyControllerProvider(studyId));
 
-    switch(dialogType) {
+    switch (dialogType) {
       case StudyDialogType.publish:
         return state.isPublished ? PublishSuccessDialog(studyId) : PublishConfirmationDialog(studyId);
       case StudyDialogType.close:

From acdbb1c2c1274dc4f6bbb6e89156b83326cd4afc Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 10 Jun 2024 09:55:22 +0200
Subject: [PATCH 140/314] chore: copy migration to schema

---
 core/lib/src/models/tables/study.g.dart       |  10 +-
 .../20240526_migrate_close_study.sql          |  24 ++-
 database/studyu-schema.sql                    | 173 ++++++++++++++----
 .../20240526_migrate_close_study.sql          |   1 -
 4 files changed, 158 insertions(+), 50 deletions(-)
 delete mode 120000 supabase/migrations/20240526_migrate_close_study.sql

diff --git a/core/lib/src/models/tables/study.g.dart b/core/lib/src/models/tables/study.g.dart
index 78f3de9de..85629996b 100644
--- a/core/lib/src/models/tables/study.g.dart
+++ b/core/lib/src/models/tables/study.g.dart
@@ -19,7 +19,7 @@ Study _$StudyFromJson(Map<String, dynamic> json) => Study(
       ..contact = Study._contactFromJson(json['contact'])
       ..iconName = json['icon_name'] as String? ?? 'accountHeart'
       ..published = json['published'] as bool? ?? false
-      ..isClosed = json['is_closed'] as bool? ?? false
+      ..status = $enumDecode(_$StudyStatusEnumMap, json['status'])
       ..questionnaire = Study._questionnaireFromJson(json['questionnaire'])
       ..eligibilityCriteria =
           Study._eligibilityCriteriaFromJson(json['eligibility_criteria'])
@@ -67,7 +67,7 @@ Map<String, dynamic> _$StudyToJson(Study instance) {
   val['contact'] = instance.contact.toJson();
   val['icon_name'] = instance.iconName;
   val['published'] = instance.published;
-  val['is_closed'] = instance.isClosed;
+  val['status'] = instance.status.toJson();
   val['questionnaire'] = instance.questionnaire.toJson();
   val['eligibility_criteria'] =
       instance.eligibilityCriteria.map((e) => e.toJson()).toList();
@@ -92,3 +92,9 @@ const _$ResultSharingEnumMap = {
   ResultSharing.private: 'private',
   ResultSharing.organization: 'organization',
 };
+
+const _$StudyStatusEnumMap = {
+  StudyStatus.draft: 'draft',
+  StudyStatus.running: 'running',
+  StudyStatus.closed: 'closed',
+};
diff --git a/database/migration/20240526_migrate_close_study.sql b/database/migration/20240526_migrate_close_study.sql
index b5d44e7e8..dd5d804c8 100644
--- a/database/migration/20240526_migrate_close_study.sql
+++ b/database/migration/20240526_migrate_close_study.sql
@@ -6,6 +6,8 @@ CREATE TYPE public.study_status AS ENUM (
     'closed'
 );
 
+ALTER TYPE public.study_status OWNER TO postgres;
+
 ALTER TABLE public.study
 ADD COLUMN status public.study_status DEFAULT 'draft'::public.study_status NOT NULL;
 
@@ -17,13 +19,13 @@ UPDATE public.study SET status = CASE
 END;
 
 -- Migrate policy
-DROP POLICY "Editors can do everything with their studies" ON public.study;
+--DROP POLICY "Editors can do everything with their studies" ON public.study;
 
 CREATE POLICY "Editors can view their studies" ON public.study FOR SELECT USING (auth.uid() = user_id);
 
-CREATE POLICY "Editor can control their draft studies" ON public.study
-    --USING (public.can_edit(auth.uid(), study.*) AND status = 'draft'::public.study_status);
-    USING (public.can_edit(auth.uid(), study.*));
+--CREATE POLICY "Editor can control their draft studies" ON public.study
+    -- old --USING (public.can_edit(auth.uid(), study.*) AND status = 'draft'::public.study_status);
+--    USING (public.can_edit(auth.uid(), study.*));
 
 -- Editors can only update registry_published and resultSharing
 --grant update (registry_published, result_sharing) on public.study USING (public.can_edit(auth.uid(), study.*);
@@ -38,8 +40,7 @@ CREATE POLICY "Editor can control their draft studies" ON public.study
 
 -- https://github.com/orgs/supabase/discussions/656#discussioncomment-5594653
 
--- todo document this function
-CREATE OR REPLACE FUNCTION public.allow_updating_only()
+CREATE OR REPLACE FUNCTION public.allow_updating_only_study()
  RETURNS trigger
  LANGUAGE plpgsql
 AS $function$
@@ -52,17 +53,17 @@ DECLARE
   old_value TEXT;
 BEGIN
 
-  -- If the current user is 'postgres', return NEW without making any changes
+  -- The user 'postgres' should be able to update any record, e.g. when using Supabase Studio
   IF CURRENT_USER = 'postgres' THEN
     RETURN NEW;
   END IF;
 
-  -- If the status is draft, return NEW without making any changes
+  -- In draft status allow update of all columns
   IF OLD.status = 'draft'::public.study_status THEN
     RETURN NEW;
   END IF;
 
-  -- Don't allow invalid status transitions
+  -- Only allow status to be updated from draft to running and from running to closed
   IF OLD.status != NEW.status THEN
     IF NOT (
         (OLD.status = 'draft'::public.study_status AND NEW.status = 'running'::public.study_status)
@@ -108,11 +109,14 @@ BEGIN
 END;
 $function$;
 
+ALTER FUNCTION public.allow_updating_only_study() OWNER TO postgres;
+
+-- Only allow updating status, registry_published and result_sharing of the study table when in draft mode
 CREATE OR REPLACE TRIGGER study_status_update_permissions
   BEFORE UPDATE
   ON public.study
   FOR EACH ROW
-  EXECUTE FUNCTION public.allow_updating_only('updated_at', 'status', 'registry_published', 'result_sharing');
+  EXECUTE FUNCTION public.allow_updating_only_study('updated_at', 'status', 'registry_published', 'result_sharing');
   -- todo also add participation?
 
 -- Owners can update status
diff --git a/database/studyu-schema.sql b/database/studyu-schema.sql
index b202d5ef4..083ece6dc 100644
--- a/database/studyu-schema.sql
+++ b/database/studyu-schema.sql
@@ -66,6 +66,14 @@ CREATE TYPE public.result_sharing AS ENUM (
 
 ALTER TYPE public.result_sharing OWNER TO postgres;
 
+CREATE TYPE public.study_status AS ENUM (
+    'draft',
+    'running',
+    'closed'
+);
+
+ALTER TYPE public.study_status OWNER TO postgres;
+
 SET default_tablespace = '';
 
 SET default_table_access_method = heap;
@@ -82,6 +90,7 @@ CREATE TABLE public.study (
     icon_name text NOT NULL,
     -- published is deprecated, use status instead
     published boolean DEFAULT false NOT NULL,
+    status public.study_status DEFAULT 'draft'::public.study_status NOT NULL,
     registry_published boolean DEFAULT false NOT NULL,
     questionnaire jsonb NOT NULL,
     eligibility_criteria jsonb NOT NULL,
@@ -486,6 +495,78 @@ $$;
 
 ALTER FUNCTION public.user_email(user_id uuid) OWNER TO postgres;
 
+
+CREATE OR REPLACE FUNCTION public.allow_updating_only_study()
+ RETURNS trigger
+ LANGUAGE plpgsql
+AS $function$
+DECLARE
+  whitelist TEXT[] := TG_ARGV::TEXT[];
+  schema_table TEXT;
+  column_name TEXT;
+  rec RECORD;
+  new_value TEXT;
+  old_value TEXT;
+BEGIN
+
+  -- The user 'postgres' should be able to update any record, e.g. when using Supabase Studio
+  IF CURRENT_USER = 'postgres' THEN
+    RETURN NEW;
+  END IF;
+
+  -- In draft status allow update of all columns
+  IF OLD.status = 'draft'::public.study_status THEN
+    RETURN NEW;
+  END IF;
+
+  -- Only allow status to be updated from draft to running and from running to closed
+  IF OLD.status != NEW.status THEN
+    IF NOT (
+        (OLD.status = 'draft'::public.study_status AND NEW.status = 'running'::public.study_status)
+        OR (OLD.status = 'running'::public.study_status AND NEW.status = 'closed'::public.study_status)
+    ) THEN
+      RAISE EXCEPTION 'Invalid status transition';
+    END IF;
+  END IF;
+
+  schema_table := concat(TG_TABLE_SCHEMA, '.', TG_TABLE_NAME);
+
+  -- If RLS is not active on current table for function invoker, early return
+  IF NOT row_security_active(schema_table) THEN
+    RETURN NEW;
+  END IF;
+
+  -- Otherwise, loop on all columns of the table schema
+  FOR rec IN (
+    SELECT col.column_name
+    FROM information_schema.columns as col
+    WHERE table_schema = TG_TABLE_SCHEMA
+    AND table_name = TG_TABLE_NAME
+  ) LOOP
+    -- If the current column is whitelisted, early continue
+    column_name := rec.column_name;
+    IF column_name = ANY(whitelist) THEN
+      CONTINUE;
+    END IF;
+
+    -- If not whitelisted, execute dynamic SQL to get column value from OLD and NEW records
+    EXECUTE format('SELECT ($1).%I, ($2).%I', column_name, column_name)
+    INTO new_value, old_value
+    USING NEW, OLD;
+
+    -- Raise exception if column value changed
+    IF new_value IS DISTINCT FROM old_value THEN
+      RAISE EXCEPTION 'Unauthorized change to "%"', column_name;
+    END IF;
+  END LOOP;
+
+  -- RLS active, but no exception encountered, clear to proceed.
+  RETURN NEW;
+END;
+$function$;
+
+ALTER FUNCTION public.allow_updating_only_study() OWNER TO postgres;
+
 --
 -- Name: app_config; Type: TABLE; Schema: public; Owner: postgres
 --
@@ -686,6 +767,12 @@ CREATE TRIGGER on_auth_user_created AFTER INSERT ON auth.users FOR EACH ROW EXEC
 
 CREATE TRIGGER handle_updated_at BEFORE UPDATE ON public.study FOR EACH ROW EXECUTE FUNCTION extensions.moddatetime('updated_at');
 
+-- Only allow updating status, registry_published and result_sharing of the study table when in draft mode
+CREATE OR REPLACE TRIGGER study_status_update_permissions
+  BEFORE UPDATE
+  ON public.study
+  FOR EACH ROW
+  EXECUTE FUNCTION public.allow_updating_only_study('updated_at', 'status', 'registry_published', 'result_sharing');
 
 --
 -- Name: subject_progress participant_progress_subjectId_fkey; Type: FK CONSTRAINT; Schema: public; Owner: postgres
@@ -781,6 +868,8 @@ CREATE POLICY "Study creators can do everything with repos from their studies" O
 CREATE POLICY "Study subjects can view their joined study" ON public.study FOR SELECT USING (public.is_study_subject_of(auth.uid(), id));
 
 
+CREATE POLICY "Editors can view their studies" ON public.study FOR SELECT USING (auth.uid() = user_id);
+
 --
 -- Name: study Editors can do everything with their studies; Type: POLICY; Schema: public; Owner: postgres
 --
@@ -876,92 +965,102 @@ USING (public.has_results_public(id));
 CREATE POLICY "Allow users to manage their own user" ON public."user" FOR ALL USING (auth.uid() = id);
 
 --
--- Name: app_config; Type: ROW SECURITY; Schema: public; Owner: postgres
+-- Name: create blob storage bucket for observations; Type: value; Schema: storage; Owner: postgres
 --
 
-ALTER TABLE public.app_config ENABLE ROW LEVEL SECURITY;
+INSERT INTO storage.buckets (id, name) VALUES ('observations', 'observations');
 
 --
--- Name: repo; Type: ROW SECURITY; Schema: public; Owner: postgres
+-- Name: authenticated Users can view their uploaded data; Type: POLICY, Schema: storage
 --
 
-ALTER TABLE public.repo ENABLE ROW LEVEL SECURITY;
+CREATE POLICY "Allow authenticated Users to view own observations" ON storage.objects FOR
+SELECT
+TO authenticated USING (((bucket_id = 'observations'::text) AND (owner = auth.uid())));
 
 --
--- Name: study; Type: ROW SECURITY; Schema: public; Owner: postgres
+-- Name: authenticated Users can upload observations to storage; Type: POLICY, Schema: storage
 --
 
-ALTER TABLE public.study ENABLE ROW LEVEL SECURITY;
+CREATE POLICY "Allow authenticated Users to upload observations" ON storage.objects FOR
+INSERT
+TO authenticated WITH CHECK ((bucket_id = 'observations'::text));
 
 --
--- Name: study_invite; Type: ROW SECURITY; Schema: public; Owner: postgres
+-- Name: authenticated Users can delete own observations; Type: POLICY, Schema: storage
 --
 
-ALTER TABLE public.study_invite ENABLE ROW LEVEL SECURITY;
+CREATE POLICY "Allow authenticated Users to delete own observations" ON storage.objects FOR
+DELETE
+TO authenticated USING (((bucket_id = 'observations'::text) AND (owner = auth.uid())));
 
 --
--- Name: study_subject; Type: ROW SECURITY; Schema: public; Owner: postgres
+-- Name: Researchers can view observations of studies which they created; Type: POLICY, Schema: storage
 --
 
-ALTER TABLE public.study_subject ENABLE ROW LEVEL SECURITY;
+CREATE POLICY "Allow Researchers to view observations of own studies" ON storage.objects FOR
+SELECT
+TO public USING (((bucket_id = 'observations'::text) AND
+    (name ~~ ANY (SELECT ('%'::text || ((public.study.id)::text || '%'::text)) AS study_id
+    FROM public.study
+    WHERE ((public.study.user_id)::text = (auth.uid())::text)))));
+
+CREATE POLICY "Joining a closed study should not be possible" ON public.study_subject
+    AS RESTRICTIVE
+    FOR INSERT
+    WITH CHECK (NOT EXISTS (
+    SELECT 1
+    FROM public.study
+    WHERE study.id = study_subject.study_id
+      AND study.status = 'closed'::public.study_status
+));
 
 --
--- Name: subject_progress; Type: ROW SECURITY; Schema: public; Owner: postgres
+-- Name: app_config; Type: ROW SECURITY; Schema: public; Owner: postgres
 --
 
-ALTER TABLE public.subject_progress ENABLE ROW LEVEL SECURITY;
+ALTER TABLE public.app_config ENABLE ROW LEVEL SECURITY;
 
 --
--- Name: user; Type: ROW SECURITY; Schema: public; Owner: postgres
+-- Name: repo; Type: ROW SECURITY; Schema: public; Owner: postgres
 --
 
-ALTER TABLE public."user" ENABLE ROW LEVEL SECURITY;
+ALTER TABLE public.repo ENABLE ROW LEVEL SECURITY;
 
 --
--- Name: study_progress_export; Type: ROW SECURITY; Schema: public; Owner: postgres
+-- Name: study; Type: ROW SECURITY; Schema: public; Owner: postgres
 --
 
-ALTER VIEW public.study_progress_export SET (security_invoker = on);
+ALTER TABLE public.study ENABLE ROW LEVEL SECURITY;
 
 --
--- Name: create blob storage bucket for observations; Type: value; Schema: storage; Owner: postgres
+-- Name: study_invite; Type: ROW SECURITY; Schema: public; Owner: postgres
 --
 
-INSERT INTO storage.buckets (id, name) VALUES ('observations', 'observations');
+ALTER TABLE public.study_invite ENABLE ROW LEVEL SECURITY;
 
 --
--- Name: authenticated Users can view their uploaded data; Type: POLICY, Schema: storage
+-- Name: study_subject; Type: ROW SECURITY; Schema: public; Owner: postgres
 --
 
-CREATE POLICY "Allow authenticated Users to view own observations" ON storage.objects FOR
-SELECT
-TO authenticated USING (((bucket_id = 'observations'::text) AND (owner = auth.uid())));
+ALTER TABLE public.study_subject ENABLE ROW LEVEL SECURITY;
 
 --
--- Name: authenticated Users can upload observations to storage; Type: POLICY, Schema: storage
+-- Name: subject_progress; Type: ROW SECURITY; Schema: public; Owner: postgres
 --
 
-CREATE POLICY "Allow authenticated Users to upload observations" ON storage.objects FOR
-INSERT
-TO authenticated WITH CHECK ((bucket_id = 'observations'::text));
+ALTER TABLE public.subject_progress ENABLE ROW LEVEL SECURITY;
 
 --
--- Name: authenticated Users can delete own observations; Type: POLICY, Schema: storage
+-- Name: user; Type: ROW SECURITY; Schema: public; Owner: postgres
 --
 
-CREATE POLICY "Allow authenticated Users to delete own observations" ON storage.objects FOR
-DELETE
-TO authenticated USING (((bucket_id = 'observations'::text) AND (owner = auth.uid())));
+ALTER TABLE public."user" ENABLE ROW LEVEL SECURITY;
 
 --
--- Name: Researchers can view observations of studies which they created; Type: POLICY, Schema: storage
+-- Name: study_progress_export; Type: ROW SECURITY; Schema: public; Owner: postgres
 --
 
-CREATE POLICY "Allow Researchers to view observations of own studies" ON storage.objects FOR
-SELECT
-TO public USING (((bucket_id = 'observations'::text) AND
-    (name ~~ ANY (SELECT ('%'::text || ((public.study.id)::text || '%'::text)) AS study_id
-    FROM public.study
-    WHERE ((public.study.user_id)::text = (auth.uid())::text)))));
+ALTER VIEW public.study_progress_export SET (security_invoker = on);
 
 COMMIT;
diff --git a/supabase/migrations/20240526_migrate_close_study.sql b/supabase/migrations/20240526_migrate_close_study.sql
deleted file mode 120000
index 5cfba03e0..000000000
--- a/supabase/migrations/20240526_migrate_close_study.sql
+++ /dev/null
@@ -1 +0,0 @@
-../../database/migration/20240526_migrate_close_study.sql
\ No newline at end of file

From aed1effbb5cd2e7fba01872514908b0255b12528 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 11 Jun 2024 17:23:17 +0200
Subject: [PATCH 141/314] fix: merge dashboard refactor pr

---
 designer_v2/lib/repositories/api_client.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_v2/lib/repositories/api_client.dart b/designer_v2/lib/repositories/api_client.dart
index 0a6971a18..8348c0cb3 100644
--- a/designer_v2/lib/repositories/api_client.dart
+++ b/designer_v2/lib/repositories/api_client.dart
@@ -78,7 +78,7 @@ class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin im
     'user_id',
     'participation',
     'result_sharing',
-    'published',
+    'status',
     'registry_published',
     'study_participant_count',
     'study_ended_count',

From 051552d259ab28ebda107cc9fa75f78923883ff5 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 11 Jun 2024 17:23:59 +0200
Subject: [PATCH 142/314] chore: fix seed

---
 supabase/seed.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/supabase/seed.sql b/supabase/seed.sql
index 672244d29..c4f606cdc 100644
--- a/supabase/seed.sql
+++ b/supabase/seed.sql
@@ -28,7 +28,7 @@ BEGIN
       title,
       description,
       icon_name,
-      published,
+      status,
       registry_published,
       questionnaire,
       eligibility_criteria,
@@ -49,8 +49,8 @@ BEGIN
       'Public demo study of user1',
       'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
       'accountHeart',
-      -- published
-      true,
+      -- status
+      'running',
       -- registry_published
       true,
       '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',

From dbd18102117af3768a7452e5585126f75ca0f5f1 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 11 Jun 2024 17:24:40 +0200
Subject: [PATCH 143/314] fix: study visibility policy no longer uses published
 field

---
 database/migration/20240526_migrate_close_study.sql | 7 +++++++
 database/studyu-schema.sql                          | 6 ++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/database/migration/20240526_migrate_close_study.sql b/database/migration/20240526_migrate_close_study.sql
index dd5d804c8..5451cbfa7 100644
--- a/database/migration/20240526_migrate_close_study.sql
+++ b/database/migration/20240526_migrate_close_study.sql
@@ -21,6 +21,13 @@ END;
 -- Migrate policy
 --DROP POLICY "Editors can do everything with their studies" ON public.study;
 
+DROP POLICY "Everybody can view designated published studies" ON public.study;
+
+CREATE POLICY "Study visibility" ON public.study FOR SELECT
+USING ((status = 'running'::public.study_status OR status = 'closed'::public.study_status)
+AND (registry_published = true OR participation = 'open'::public.participation OR result_sharing = 'public'::public.result_sharing));
+-- todo should we allow draft studies in registry if they have been published?
+
 CREATE POLICY "Editors can view their studies" ON public.study FOR SELECT USING (auth.uid() = user_id);
 
 --CREATE POLICY "Editor can control their draft studies" ON public.study
diff --git a/database/studyu-schema.sql b/database/studyu-schema.sql
index 083ece6dc..b57a283b5 100644
--- a/database/studyu-schema.sql
+++ b/database/studyu-schema.sql
@@ -878,10 +878,12 @@ CREATE POLICY "Editors can do everything with their studies" ON public.study USI
 
 
 --
--- Name: study Everybody can view (published and registry_published) studies; Type: POLICY; Schema: public; Owner: postgres
+-- Name: study Study visibility; Type: POLICY; Schema: public; Owner: postgres
 --
 
-CREATE POLICY "Everybody can view designated published studies" ON public.study FOR SELECT USING (((published = true) AND (registry_published = true OR participation = 'open'::public.participation OR result_sharing = 'public'::public.result_sharing)));
+CREATE POLICY "Study visibility" ON public.study FOR SELECT
+USING ((status = 'running'::public.study_status OR status = 'closed'::public.study_status)
+AND (registry_published = true OR participation = 'open'::public.participation OR result_sharing = 'public'::public.result_sharing));
 
 
 --

From 1ce2f78c9866b0b2869ec9485071e8e3e65fa50f Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 11 Jun 2024 18:12:07 +0200
Subject: [PATCH 144/314] fix: potential isClosed error

---
 designer_v2/lib/repositories/model_repository.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_v2/lib/repositories/model_repository.dart b/designer_v2/lib/repositories/model_repository.dart
index d910bd2f3..c2415a57f 100644
--- a/designer_v2/lib/repositories/model_repository.dart
+++ b/designer_v2/lib/repositories/model_repository.dart
@@ -304,7 +304,7 @@ abstract class ModelRepository<T> extends IModelRepository<T> {
     if (fetchOnSubscribe) {
       if (!(wrappedModel != null && wrappedModel.isLocalOnly)) {
         fetch(modelId).catchError((e) {
-          if (!modelController.closed) {
+          if (!modelController.isClosed) {
             modelController.addError(e);
           }
           return e;

From 7dcc928442a2bd2a3e8358802857459f5896f984 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 11 Jun 2024 18:12:26 +0200
Subject: [PATCH 145/314] fix: migrate app to status

---
 core/lib/src/models/tables/study.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lib/src/models/tables/study.dart b/core/lib/src/models/tables/study.dart
index b2d37d748..382eccb05 100644
--- a/core/lib/src/models/tables/study.dart
+++ b/core/lib/src/models/tables/study.dart
@@ -231,7 +231,7 @@ class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study>
   static Future<ExtractionResult<Study>> publishedPublicStudies() async {
     ExtractionResult<Study> result;
     try {
-      final response = await env.client.from(tableName).select().eq('participation', 'open').eq("closed", false);
+      final response = await env.client.from(tableName).select().eq('participation', 'open').neq('status', StudyStatus.closed.name);
       final extracted = SupabaseQuery.extractSupabaseList<Study>(List<Map<String, dynamic>>.from(response));
       result = ExtractionSuccess<Study>(extracted);
     } on ExtractionFailedException<Study> catch (error) {

From 1cb7740c89337ef20b2c6570cffa6643cfbc6bfd Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 11 Jun 2024 18:12:52 +0200
Subject: [PATCH 146/314] fix: do not show separator if no delete item shown

---
 designer_v2/lib/repositories/study_repository.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_v2/lib/repositories/study_repository.dart b/designer_v2/lib/repositories/study_repository.dart
index 10980492b..8515f6470 100644
--- a/designer_v2/lib/repositories/study_repository.dart
+++ b/designer_v2/lib/repositories/study_repository.dart
@@ -175,7 +175,7 @@ class StudyRepository extends ModelRepository<Study> implements IStudyRepository
         },
         isAvailable: model.canExport(currentUser),
       ),
-      ModelAction.addSeparator(),
+      if (model.canDelete(currentUser)) ModelAction.addSeparator(),
       ModelAction(
         type: StudyActionType.delete,
         label: StudyActionType.delete.string,

From b6dad92a4e0f0dc2a17c9b201fb233de17acd127 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 11 Jun 2024 18:13:24 +0200
Subject: [PATCH 147/314] fix: only show close button for editors

---
 designer_v2/lib/features/study/study_controller_state.dart | 3 +++
 designer_v2/lib/features/study/study_scaffold.dart         | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/designer_v2/lib/features/study/study_controller_state.dart b/designer_v2/lib/features/study/study_controller_state.dart
index bd31b0813..ddae66487 100644
--- a/designer_v2/lib/features/study/study_controller_state.dart
+++ b/designer_v2/lib/features/study/study_controller_state.dart
@@ -69,6 +69,9 @@ class StudyControllerState extends StudyControllerBaseState implements IStudyApp
   @override
   bool get isPublishVisible => studyWithMetadata?.model.status == StudyStatus.draft;
 
+  @override
+  bool get isClosedVisible => studyWithMetadata?.model.status == StudyStatus.running && studyWithMetadata!.model.canEdit(super.currentUser);
+
   @override
   StudyStatus? get studyStatus => study.value?.status;
 
diff --git a/designer_v2/lib/features/study/study_scaffold.dart b/designer_v2/lib/features/study/study_scaffold.dart
index 4536e38bc..b261601f2 100644
--- a/designer_v2/lib/features/study/study_scaffold.dart
+++ b/designer_v2/lib/features/study/study_scaffold.dart
@@ -26,6 +26,7 @@ abstract class IStudyAppBarViewModel implements IStudyStatusBadgeViewModel, IStu
   bool get isSyncIndicatorVisible;
   bool get isStatusBadgeVisible;
   bool get isPublishVisible;
+  bool get isClosedVisible;
 }
 
 /// Custom scaffold shared between all pages for an individual [Study]
@@ -237,7 +238,7 @@ class _StudyScaffoldState extends ConsumerState<StudyScaffold> {
       actionButtons.add(const SizedBox(width: 12.0)); // padding
     }
 
-    if (state.isPublished) {
+    if (state.isClosedVisible) {
       final formViewModel = ref.watch(studyPublishValidatorProvider(widget.studyId));
       final closeButton = ReactiveForm(
         formGroup: formViewModel.form,

From 547c468c2c5e52912bb7cc8a9833d4534a07556a Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 11 Jun 2024 18:30:52 +0200
Subject: [PATCH 148/314] fix: add closed success description

---
 .../lib/features/dialogs/close/study_close_dialog_success.dart | 2 +-
 designer_v2/lib/localization/app_de.arb                        | 3 ++-
 designer_v2/lib/localization/app_en.arb                        | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart b/designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart
index c08726a0e..47e852758 100644
--- a/designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart
+++ b/designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart
@@ -24,7 +24,7 @@ class CloseSuccessDialog extends StudyPageWidget {
                   fontSize: (theme.textTheme.displayLarge?.fontSize ?? 48.0) * 1.5,
                 )),
             title: tr.notification_study_closed,
-            description: '',
+            description: tr.notification_study_closed_description,
           ),
           const SizedBox(height: 8.0),
         ],
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index e19eebf00..b69ad6487 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -121,8 +121,9 @@
   "action_button_study_close": "Studie schließen",
   "notification_study_deleted": "Die Studie wurde gelöscht",
   "notification_study_closed": "Die Studie wurde geschlossen",
+  "notification_study_closed_description": "Neue Teilnehmer können sich nicht mehr einschreiben",
   "dialog_study_close_title": "Teilnahme schließen?",
-  "dialog_study_close_description": "Bist du sicher, dass die Teilnahme an der Studie geschlossen werden soll? Es können keine neuen Teilnehmer mehr eingeschrieben werden.",
+  "dialog_study_close_description": "Bist du sicher, dass die Teilnahme an der Studie geschlossen werden soll? Es können keine neuen Teilnehmer mehr eingeschrieben werden, aber bereits angemeldete Teilnehmer können die Studie weiterhin durchführen.",
   "dialog_study_delete_title": "Dauerhaft löschen?",
   "dialog_study_delete_description": "Bist du sicher, dass die Studie gelöscht werden soll? Die Studie und alle gesammelten Daten gehen dabei unwiderruflich verloren.",
   "@__________________STUDYPAGE_DESIGN_SHARED__________________": {},
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index 12b88af00..8e428367a 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -121,8 +121,9 @@
   "action_button_study_close": "Close study",
   "notification_study_deleted": "Study was deleted",
   "notification_study_closed": "Study was closed",
+  "notification_study_closed_description": "New participants can no longer enroll in this study.",
   "dialog_study_close_title": "Close participation?",
-  "dialog_study_close_description": "Are you sure that you want to close participation for this study? New participants can no longer enroll.",
+  "dialog_study_close_description": "Are you sure that you want to close participation for this study? New participants can no longer enroll, but enrolled participants can continue to participate.",
   "dialog_study_delete_title": "Permanently delete?",
   "dialog_study_delete_description": "Are you sure you want to delete this study? You will permanently lose the study and all data that has been collected.",
   "@__________________STUDYPAGE_DESIGN_SHARED__________________": {},

From 4beb796aae314ec8bcc27d7f1f738c6866698993 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 11 Jun 2024 18:37:07 +0200
Subject: [PATCH 149/314] style: format

---
 core/lib/src/models/tables/study.dart                      | 3 ++-
 designer_v2/lib/features/study/study_controller_state.dart | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/lib/src/models/tables/study.dart b/core/lib/src/models/tables/study.dart
index 382eccb05..1267c6f17 100644
--- a/core/lib/src/models/tables/study.dart
+++ b/core/lib/src/models/tables/study.dart
@@ -231,7 +231,8 @@ class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study>
   static Future<ExtractionResult<Study>> publishedPublicStudies() async {
     ExtractionResult<Study> result;
     try {
-      final response = await env.client.from(tableName).select().eq('participation', 'open').neq('status', StudyStatus.closed.name);
+      final response =
+          await env.client.from(tableName).select().eq('participation', 'open').neq('status', StudyStatus.closed.name);
       final extracted = SupabaseQuery.extractSupabaseList<Study>(List<Map<String, dynamic>>.from(response));
       result = ExtractionSuccess<Study>(extracted);
     } on ExtractionFailedException<Study> catch (error) {
diff --git a/designer_v2/lib/features/study/study_controller_state.dart b/designer_v2/lib/features/study/study_controller_state.dart
index ddae66487..13f02e1e2 100644
--- a/designer_v2/lib/features/study/study_controller_state.dart
+++ b/designer_v2/lib/features/study/study_controller_state.dart
@@ -70,7 +70,8 @@ class StudyControllerState extends StudyControllerBaseState implements IStudyApp
   bool get isPublishVisible => studyWithMetadata?.model.status == StudyStatus.draft;
 
   @override
-  bool get isClosedVisible => studyWithMetadata?.model.status == StudyStatus.running && studyWithMetadata!.model.canEdit(super.currentUser);
+  bool get isClosedVisible =>
+      studyWithMetadata?.model.status == StudyStatus.running && studyWithMetadata!.model.canEdit(super.currentUser);
 
   @override
   StudyStatus? get studyStatus => study.value?.status;

From 9ffc7ce1fdebf2605fdd7970d519e05288aae7a0 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 11 Jun 2024 18:52:21 +0200
Subject: [PATCH 150/314] tests: migrate db test to status

---
 supabase/tests/010-study.sql | 58 ++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/supabase/tests/010-study.sql b/supabase/tests/010-study.sql
index b7e9ee6ae..bf235df24 100644
--- a/supabase/tests/010-study.sql
+++ b/supabase/tests/010-study.sql
@@ -20,7 +20,7 @@ INSERT INTO public.study (
   title,
   description,
   icon_name,
-  published,
+  status,
   registry_published,
   questionnaire,
   eligibility_criteria,
@@ -38,11 +38,11 @@ INSERT INTO public.study (
   collaborator_emails
 ) VALUES(
   '{"email":"example@example.com","phone":"0123456789","website":"https://studyu.health","researchers":"StudyU Researcher","organization":"StudyU","institutionalReviewBoard":"This study has not been submitted to the IRB Board. It is for illustration purposes of StudyU only.","institutionalReviewBoardNumber":"N/A"}',
-  'Study: published=true, registry_published=true, participation=open, result_sharing=public',
+  'Study: status=running, registry_published=true, participation=open, result_sharing=public',
   'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
   'accountHeart',
-  -- published
-  true,
+  -- status
+  'running',
   -- registry_published
   true,
   '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
@@ -63,7 +63,7 @@ INSERT INTO public.study (
   title,
   description,
   icon_name,
-  published,
+  status,
   registry_published,
   questionnaire,
   eligibility_criteria,
@@ -81,11 +81,11 @@ INSERT INTO public.study (
   collaborator_emails
 ) VALUES(
   '{"email":"example@example.com","phone":"0123456789","website":"https://studyu.health","researchers":"StudyU Researcher","organization":"StudyU","institutionalReviewBoard":"This study has not been submitted to the IRB Board. It is for illustration purposes of StudyU only.","institutionalReviewBoardNumber":"N/A"}',
-  'Study: published=true, registry_published=false, participation=open, result_sharing=public',
+  'Study: status=running, registry_published=false, participation=open, result_sharing=public',
   'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
   'accountHeart',
-  -- published
-  true,
+  -- status
+  'running',
   -- registry_published
   false,
   '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
@@ -106,7 +106,7 @@ INSERT INTO public.study (
   title,
   description,
   icon_name,
-  published,
+  status,
   registry_published,
   questionnaire,
   eligibility_criteria,
@@ -124,11 +124,11 @@ INSERT INTO public.study (
   collaborator_emails
 ) VALUES(
   '{"email":"example@example.com","phone":"0123456789","website":"https://studyu.health","researchers":"StudyU Researcher","organization":"StudyU","institutionalReviewBoard":"This study has not been submitted to the IRB Board. It is for illustration purposes of StudyU only.","institutionalReviewBoardNumber":"N/A"}',
-  'Study: published=true, registry_published=false, participation=invite, result_sharing=public',
+  'Study: status=running, registry_published=false, participation=invite, result_sharing=public',
   'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
   'accountHeart',
-  -- published
-  true,
+  -- status
+  'running',
   -- registry_published
   false,
   '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
@@ -150,7 +150,7 @@ INSERT INTO public.study (
   title,
   description,
   icon_name,
-  published,
+  status,
   registry_published,
   questionnaire,
   eligibility_criteria,
@@ -168,11 +168,11 @@ INSERT INTO public.study (
   collaborator_emails
 ) VALUES(
   '{"email":"example@example.com","phone":"0123456789","website":"https://studyu.health","researchers":"StudyU Researcher","organization":"StudyU","institutionalReviewBoard":"This study has not been submitted to the IRB Board. It is for illustration purposes of StudyU only.","institutionalReviewBoardNumber":"N/A"}',
-  'Study: published=true, registry_published=false, participation=invite, result_sharing=private',
+  'Study: status=running, registry_published=false, participation=invite, result_sharing=private',
   'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
   'accountHeart',
-  -- published
-  true,
+  -- status
+  'running',
   -- registry_published
   false,
   '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
@@ -198,7 +198,7 @@ INSERT INTO public.study (
   title,
   description,
   icon_name,
-  published,
+  status,
   registry_published,
   questionnaire,
   eligibility_criteria,
@@ -216,11 +216,11 @@ INSERT INTO public.study (
   collaborator_emails
 ) VALUES(
   '{"email":"example@example.com","phone":"0123456789","website":"https://studyu.health","researchers":"StudyU Researcher","organization":"StudyU","institutionalReviewBoard":"This study has not been submitted to the IRB Board. It is for illustration purposes of StudyU only.","institutionalReviewBoardNumber":"N/A"}',
-  'Study: published=false, registry_published=true, participation=open, result_sharing=public',
+  'Study: status=draft, registry_published=true, participation=open, result_sharing=public',
   'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
   'accountHeart',
-  -- published
-  false,
+  -- status
+  'draft',
   -- registry_published
   true,
   '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
@@ -241,7 +241,7 @@ INSERT INTO public.study (
   title,
   description,
   icon_name,
-  published,
+  status,
   registry_published,
   questionnaire,
   eligibility_criteria,
@@ -259,11 +259,11 @@ INSERT INTO public.study (
   collaborator_emails
 ) VALUES(
   '{"email":"example@example.com","phone":"0123456789","website":"https://studyu.health","researchers":"StudyU Researcher","organization":"StudyU","institutionalReviewBoard":"This study has not been submitted to the IRB Board. It is for illustration purposes of StudyU only.","institutionalReviewBoardNumber":"N/A"}',
-  'Study: published=false, registry_published=false, participation=invite, result_sharing=private',
+  'Study: status=draft, registry_published=false, participation=invite, result_sharing=private',
   'This is a Demo Study. This study helps you find out which treatment is more effective for you.',
   'accountHeart',
-  -- published
-  false,
+  -- status
+  'draft',
   -- registry_published
   false,
   '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
@@ -299,7 +299,7 @@ SELECT is(count(*)::int, 3, 'Check if users were created and can be accessed') F
 
 SELECT tests.clear_authentication();
 SELECT is(count(*)::int, 0, 'Check if users cannot be accessed anonymously') FROM public.user;
-SELECT is(published, true, 'Check if all anonymously accessed studies are published') FROM public.study;
+SELECT is(status, 'running', 'Check if all anonymously accessed studies are running') FROM public.study;
 
 -- CREATOR 1 TESTS
 
@@ -315,12 +315,12 @@ SELECT is(email, 'test_creator_2@studyu.health', 'Check if a user can only retri
 
 SELECT tests.authenticate_as('test_consumer');
 
--- test specific: all published studies are created by test_creator_1
-SELECT is(user_id, (tests.get_supabase_user('test_creator_1') ->> 'id')::uuid, 'All published studies are created by test_creator_1') FROM public.study;
+-- test specific: all running studies are created by test_creator_1
+SELECT is(user_id, (tests.get_supabase_user('test_creator_1') ->> 'id')::uuid, 'All running studies are created by test_creator_1') FROM public.study;
 SELECT is(count(*)::int, 3, 'Verify number of accessible studies') FROM public.study;
 
--- check if the consumer can only access designated published studies
-SELECT is(published, true, 'Check if test_consumer can only access studies that are published') FROM public.study;
+-- check if the consumer can only access designated running studies
+SELECT is(status, 'running', 'Check if test_consumer can only access studies that are running') FROM public.study;
 SELECT tests.is_either_true(
       'Check if test_consumer can only retrieve designated studies',
       tests.is_equal(registry_published, true),

From 7c5b8aeebb08f1a14c1ca9f591ba18899347589d Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 11 Jun 2024 18:54:11 +0200
Subject: [PATCH 151/314] tests: fix workflow trigger

---
 .github/workflows/supabase-test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/supabase-test.yml b/.github/workflows/supabase-test.yml
index 54eccfa7a..1635a5d56 100644
--- a/.github/workflows/supabase-test.yml
+++ b/.github/workflows/supabase-test.yml
@@ -2,8 +2,9 @@ name: Test Supabase
 on:
   push:
     paths:
-      - ".github/workflows/supabase-test.yml"
       - "database/**"
+      - "supabase/**"
+      - ".github/workflows/supabase-test.yml"
   workflow_dispatch:
 
 jobs:

From 6824d841f791e013d64feed311a11bc2eb6bea65 Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Tue, 11 Jun 2024 23:49:57 +0200
Subject: [PATCH 152/314] chore: Updated dropout logic documentation

---
 designer_v2/lib/domain/study_monitoring.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/designer_v2/lib/domain/study_monitoring.dart b/designer_v2/lib/domain/study_monitoring.dart
index d9dc4531a..7750c0334 100644
--- a/designer_v2/lib/domain/study_monitoring.dart
+++ b/designer_v2/lib/domain/study_monitoring.dart
@@ -10,6 +10,7 @@ class StudyMonitorData {
 
   /// Number of participants who dropped out of the study before the study ended
   /// Hint: The is_deleted flag in the study_subject database table marks a participant as dropped out
+  /// Note: If the participant's last activity exceeds 7 days, they will also be counted as a dropout
   final int dropoutParticipants;
 
   /// Number of participants who completed the study

From d101225d7fb025ece5e66fe79b912723a70a5a84 Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Tue, 11 Jun 2024 23:58:33 +0200
Subject: [PATCH 153/314] chore: replaced icons with unicodes

---
 .../lib/features/monitor/participant_details_view.dart    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index 63823c83d..f65209b71 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -116,17 +116,17 @@ class ParticipantDetailsView extends ConsumerWidget {
     for (final intervention in interventions) {
       for (final task in intervention.tasks) {
         if (missedTaskIds.contains(task.id)) {
-          sb.writeln('❌ ${intervention.name} - ${task.title}');
+          sb.writeln('\u{274C} ${intervention.name} - ${task.title}');
         } else if (completedTaskIds.contains(task.id)) {
-          sb.writeln('✅ ${intervention.name} - ${task.title}');
+          sb.writeln('\u{2705} ${intervention.name} - ${task.title}');
         }
       }
     }
     for (final observation in observations) {
       if (missedTaskIds.contains(observation.id)) {
-        sb.writeln('❌ ${observation.title}');
+        sb.writeln('\u{274C} ${observation.title}');
       } else if (completedTaskIds.contains(observation.id)) {
-        sb.writeln('✅ ${observation.title}');
+        sb.writeln('\u{2705} ${observation.title}');
       }
     }
     return sb.toString();

From 2901d719e9e372d07d99be0ab4ce0851abc23117 Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Wed, 12 Jun 2024 00:22:30 +0200
Subject: [PATCH 154/314] chore: translation changed

---
 designer_v2/lib/localization/app_de.arb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index ccec9ce21..4072827fe 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -508,7 +508,7 @@
   "monitoring_table_column_completed_interventions": "Abgeschlossene\nInterventionen",
   "monitoring_table_column_completed_surveys": "Abgeschlossene\nFragebögen",
   "monitoring_table_row_tooltip_dropout": "Dieser Teilnehmer ist ausgeschieden und es wird keine neue Aktivität hinzugefügt",
-   "monitoring_table_completed_interventions_header_tooltip": "Der Eingriff ist erst abgeschlossen, wenn alle Aufgaben erledigt sind",
+  "monitoring_table_completed_interventions_header_tooltip": "Die Intervention ist erst abgeschlossen, wenn alle Aufgaben erledigt sind",
   "@__________________STUDYPAGE_ANALYZE__________________": {},
   "banner_text_study_analyze_draft": "Solange die Studie noch nicht live ist, basieren die Ergebnisse hier auf dem letzten Testlauf der Studie (siehe Testmodus).\nDie Ergebnisdaten werden automatisch zurückgesetzt sobald die Studie mit echten Teilnehmern startet.",
   "action_button_study_export": "Daten exportieren",

From 39a320ebc9ebbff99f24af763cb6f92fca661af1 Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Wed, 12 Jun 2024 00:32:25 +0200
Subject: [PATCH 155/314] chore: participantDropoutDuration moved to constant
 file

---
 designer_v2/lib/constants.dart               | 2 ++
 designer_v2/lib/domain/study_monitoring.dart | 8 +++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/designer_v2/lib/constants.dart b/designer_v2/lib/constants.dart
index 0443bca8c..91a22c62c 100644
--- a/designer_v2/lib/constants.dart
+++ b/designer_v2/lib/constants.dart
@@ -46,3 +46,5 @@ const String signupRouteName = 'signup';
 const String forgotPasswordRouteName = 'forgotPassword';
 const String recoverPasswordRouteName = 'recoverPassword';
 const String errorRouteName = 'error';
+final DateTime participantDropoutDuration = DateTime.now().subtract(const Duration(days: 7));
+
diff --git a/designer_v2/lib/domain/study_monitoring.dart b/designer_v2/lib/domain/study_monitoring.dart
index 7750c0334..ad49fca9a 100644
--- a/designer_v2/lib/domain/study_monitoring.dart
+++ b/designer_v2/lib/domain/study_monitoring.dart
@@ -2,6 +2,7 @@ import 'dart:math';
 
 import 'package:equatable/equatable.dart';
 import 'package:studyu_core/core.dart';
+import 'package:studyu_designer_v2/constants.dart';
 
 class StudyMonitorData {
   /// Number of participants who are currently active in the study
@@ -163,16 +164,13 @@ extension StudyMonitoringX on Study {
       ));
     }
 
-    final now = DateTime.now();
-    final sevenDaysAgo = now.subtract(const Duration(days: 7)); //dropout time
-
     final activeParticipants = items.where((item) {
       return !item.droppedOut &&
           item.currentDayOfStudy < item.studyDurationInDays &&
-          item.lastActivityAt.isAfter(sevenDaysAgo);
+          item.lastActivityAt.isAfter(participantDropoutDuration);
     }).length;
     final dropoutParticipants = items.where((item) {
-      return item.droppedOut && item.lastActivityAt.isBefore(sevenDaysAgo);
+      return item.droppedOut && item.lastActivityAt.isBefore(participantDropoutDuration);
     }).length;
     final completedParticipants = items
         .where((item) => item.currentDayOfStudy >= item.studyDurationInDays)

From eb4ae038b62b977f33188705df9d5943e9a6b4d4 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 9 Jun 2024 13:22:00 +0200
Subject: [PATCH 156/314] chore: use same lint for all packages

---
 app/analysis_options.yaml            |  1 -
 core/analysis_options.yaml           |  1 -
 designer_v2/analysis_options.yaml    |  2 +-
 designer_v2/pubspec.yaml             |  1 +
 flutter_analysis_options.yaml        | 52 ----------------------------
 flutter_common/analysis_options.yaml |  1 -
 pubspec.lock                         | 16 ---------
 pubspec.yaml                         |  1 -
 8 files changed, 2 insertions(+), 73 deletions(-)
 delete mode 100644 app/analysis_options.yaml
 delete mode 100644 core/analysis_options.yaml
 delete mode 100644 flutter_analysis_options.yaml
 delete mode 100644 flutter_common/analysis_options.yaml

diff --git a/app/analysis_options.yaml b/app/analysis_options.yaml
deleted file mode 100644
index ca8edeaa3..000000000
--- a/app/analysis_options.yaml
+++ /dev/null
@@ -1 +0,0 @@
-include: ../flutter_analysis_options.yaml
diff --git a/core/analysis_options.yaml b/core/analysis_options.yaml
deleted file mode 100644
index 5e2133eb6..000000000
--- a/core/analysis_options.yaml
+++ /dev/null
@@ -1 +0,0 @@
-include: ../analysis_options.yaml
diff --git a/designer_v2/analysis_options.yaml b/designer_v2/analysis_options.yaml
index 3d0cfc1ee..0310d91c6 100644
--- a/designer_v2/analysis_options.yaml
+++ b/designer_v2/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: ../flutter_analysis_options.yaml
+include: ../analysis_options.yaml
 
 analyzer:
   plugins:
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 11e6e4b0e..6d917e59b 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -47,6 +47,7 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     sdk: flutter
+  lint: ^2.3.0
   patrol_finders: ^2.1.2
   riverpod_lint:
   test: ^1.24.9 # integration_test
diff --git a/flutter_analysis_options.yaml b/flutter_analysis_options.yaml
deleted file mode 100644
index 6ca7f76a2..000000000
--- a/flutter_analysis_options.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-# This file is used by all flutter projects in this monorepo.
-
-# This file configures the analyzer, which statically analyzes Dart code to
-# check for errors, warnings, and lints.
-#
-# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
-# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
-# invoked from the command line by running `flutter analyze`.
-
-# The following line activates a set of recommended lints for Flutter apps,
-# packages, and plugins designed to encourage good coding practices.
-include: package:flutter_lints/flutter.yaml
-
-analyzer:
-  exclude:
-    - "**/*.g.dart"
-
-linter:
-  # The lint rules applied to this project can be customized in the
-  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
-  # included above or to enable additional rules. A list of all available lints
-  # and their documentation is published at
-  # https://dart-lang.github.io/linter/lints/index.html.
-  #
-  # Instead of disabling a lint rule for the entire project in the
-  # section below, it can also be suppressed for a single line of code
-  # or a specific dart file by using the `// ignore: name_of_lint` and
-  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
-  # producing the lint.
-  rules:
-    # STYLE
-    # cascade_invocations: true # May has issues: https://github.com/dart-lang/linter/issues/1589
-    # prefer_foreach: true
-    # prefer_int_literals: true
-    # prefer_single_quotes: true
-    # use_raw_strings: true
-
-    # prefer_single_quotes: true
-
-    # DISABLE
-    # We have prints for better debugging. Maybe not the best option.
-    avoid_print: false
-    # Highlights localization imports and others which are annoying to fix
-    # depend_on_referenced_packages: false
-    # I prefer the distinction between local source files and imported packages.
-    # Apparently package imports are preferred because they allow for easy find and replace
-    # always_use_package_imports: false
-
-    sort_pub_dependencies: true
-
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options
\ No newline at end of file
diff --git a/flutter_common/analysis_options.yaml b/flutter_common/analysis_options.yaml
deleted file mode 100644
index ca8edeaa3..000000000
--- a/flutter_common/analysis_options.yaml
+++ /dev/null
@@ -1 +0,0 @@
-include: ../flutter_analysis_options.yaml
diff --git a/pubspec.lock b/pubspec.lock
index ca3ec2ce5..255782ece 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -81,14 +81,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.0"
   glob:
     dependency: transitive
     description:
@@ -145,14 +137,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.0"
   matcher:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index b8592b1e2..7e9cec361 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,6 +7,5 @@ environment:
   sdk: ">=2.18.0 <3.0.0"
 
 dev_dependencies:
-  flutter_lints: ^4.0.0
   lint: ^2.3.0
   melos: ^6.0.0

From 8169e201e1770952dd6bd275aeda8bf925613b9b Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 9 Jun 2024 13:25:58 +0200
Subject: [PATCH 157/314] chore: use default dart format code style

---
 melos.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/melos.yaml b/melos.yaml
index 975cdf402..4ce51f49b 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -23,18 +23,16 @@ scripts:
         "dart fix --apply"
     description: Fix auto-fixable lint errors
 
-  # todo revert to default line length
   format:
     run: |
       melos exec -c 6 -- \
-        "dart format -l 120 ."
+        "dart format ."
     description: Format all code and markdown files
 
-  # todo do not exclude files anymore when line length is set to default
   format:ci:
     run: |
       melos exec -c 6 -- \
-        "find . -type f -name '*.dart' ! -name '*.g.dart' ! -path '**/.dart_tool/**' | tr '\n' ' ' | xargs dart format -l 120 --set-exit-if-changed"
+        "dart format . --set-exit-if-changed"
     description: Format all code without generated files
 
   outdated:

From d49d217008e5d61c4855a95cb09f3d0b21cc51a7 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 9 Jun 2024 16:35:11 +0200
Subject: [PATCH 158/314] chore: analysis lint fixes

---
 app/pubspec.yaml                              |   1 +
 .../src/models/consent/consent_item.g.dart    |  23 +-
 core/lib/src/models/contact.g.dart            |  31 +-
 .../eligibility/eligibility_criterion.g.dart  |  21 +-
 .../types/boolean_expression.g.dart           |  18 +-
 .../types/choice_expression.g.dart            |  20 +-
 .../expressions/types/not_expression.g.dart   |  18 +-
 .../models/interventions/intervention.g.dart  |  25 +-
 .../interventions/tasks/checkmark_task.g.dart |  27 +-
 .../tasks/questionnaire_task.g.dart           |  29 +-
 .../questionnaire/question_conditional.g.dart |   2 +-
 .../questions/annotated_scale_question.g.dart |  35 +-
 .../questions/audio_recording_question.g.dart |  27 +-
 .../questions/boolean_question.g.dart         |  25 +-
 .../questions/choice_question.g.dart          |  29 +-
 .../questions/free_text_question.g.dart       |  31 +-
 .../questions/image_capturing_question.g.dart |  25 +-
 .../questions/scale_question.g.dart           |  39 +--
 .../questions/visual_analogue_question.g.dart |  41 +--
 .../models/report/report_specification.g.dart |  19 +-
 .../report/sections/average_section.g.dart    |  27 +-
 .../sections/linear_regression_section.g.dart |  30 +-
 core/lib/src/models/results/result.g.dart     |  18 +-
 .../results/numeric_result.g.dart             |   2 +-
 .../study_schedule/study_schedule.g.dart      |   2 +-
 core/lib/src/models/tables/app_config.g.dart  |  32 +-
 core/lib/src/models/tables/repo.g.dart        |  26 +-
 core/lib/src/models/tables/study.g.dart       |  53 ++-
 .../lib/src/models/tables/study_invite.g.dart |  22 +-
 .../src/models/tables/study_subject.g.dart    |  29 +-
 .../src/models/tables/subject_progress.g.dart |  26 +-
 core/lib/src/models/tables/user.g.dart        |   2 +-
 core/lib/src/models/tasks/schedule.g.dart     |   9 +-
 core/lib/src/util/analytics.g.dart            |  21 +-
 designer_v2/analysis_options.yaml             |   3 +
 designer_v2/integration_test/app_test.dart    |   8 +-
 .../robots/study_info_robot.dart              |  18 +-
 .../robots/study_interventions_robot.dart     |   8 +-
 .../robots/study_measurements_robot.dart      |  12 +-
 .../lib/common_views/action_inline_menu.dart  |  56 +--
 .../lib/common_views/action_popup_menu.dart   |  14 +-
 designer_v2/lib/common_views/badge.dart       |  13 +-
 designer_v2/lib/common_views/banner.dart      |  54 +--
 designer_v2/lib/common_views/collapse.dart    |   8 +-
 .../common_views/constrained_flexible.dart    |   2 +-
 designer_v2/lib/common_views/dialog.dart      |   7 +-
 designer_v2/lib/common_views/empty_body.dart  |  78 +++--
 .../lib/common_views/form_buttons.dart        |  16 +-
 .../common_views/form_consumer_widget.dart    |   4 +-
 .../lib/common_views/form_control_label.dart  |  29 +-
 .../lib/common_views/form_scaffold.dart       |  63 ++--
 .../lib/common_views/form_table_layout.dart   |  24 +-
 designer_v2/lib/common_views/icon_picker.dart | 158 +++++----
 .../common_views/layout_single_column.dart    |  11 +-
 .../lib/common_views/layout_two_column.dart   | 173 +++++-----
 .../lib/common_views/mouse_events.dart        |  61 ++--
 .../lib/common_views/navbar_tabbed.dart       |  72 ++--
 .../lib/common_views/primary_button.dart      |  76 +++--
 .../common_views/reactive_color_picker.dart   |  45 ++-
 designer_v2/lib/common_views/search.dart      |   2 +-
 .../lib/common_views/sidesheet/sidesheet.dart |  27 +-
 .../sidesheet/sidesheet_form.dart             |  18 +-
 .../lib/common_views/standard_table.dart      | 278 +++++++++------
 designer_v2/lib/common_views/studyu_logo.dart |   2 +-
 .../lib/common_views/styling_information.dart |  21 +-
 .../lib/common_views/sync_indicator.dart      |   5 +-
 .../lib/common_views/text_hyperlink.dart      |   5 +-
 .../lib/common_views/under_construction.dart  |   2 +-
 designer_v2/lib/domain/schedule.dart          |   2 +-
 designer_v2/lib/domain/study.dart             |  14 +-
 designer_v2/lib/domain/study_export.dart      |  27 +-
 .../features/account/account_settings.dart    |   4 +-
 .../analyze/study_analyze_controller.dart     |   8 +-
 .../features/analyze/study_analyze_page.dart  |   7 +-
 .../features/analyze/study_export_zip.dart    |   2 +-
 designer_v2/lib/features/app.dart             |   2 +-
 designer_v2/lib/features/app_controller.dart  |  36 +-
 designer_v2/lib/features/app_drawer.dart      |  46 +--
 .../features/auth/auth_form_controller.dart   |  92 ++---
 .../lib/features/auth/auth_form_fields.dart   |  59 ++--
 .../lib/features/auth/auth_scaffold.dart      |  48 +--
 .../lib/features/auth/login_form_view.dart    |  51 +--
 .../auth/password_forgot_form_view.dart       |  42 ++-
 .../auth/password_recovery_form_view.dart     |  49 +--
 .../lib/features/auth/signup_form_view.dart   |  73 ++--
 .../lib/features/auth/studyu_jtbd.dart        |  20 +-
 .../dashboard/dashboard_controller.dart       |  67 ++--
 .../features/dashboard/dashboard_page.dart    |  10 +-
 .../dashboard/dashboard_scaffold.dart         |   3 +-
 .../features/dashboard/dashboard_state.dart   |   9 +-
 .../lib/features/dashboard/studies_table.dart |  14 +-
 .../studies_table_column_header.dart          |   8 +-
 .../dashboard/studies_table_item.dart         | 249 ++++++++------
 .../consent_item_form_controller.dart         |  16 +-
 .../enrollment/consent_item_form_view.dart    |   7 +-
 .../enrollment_form_controller.dart           |  81 +++--
 .../enrollment/enrollment_form_view.dart      | 191 +++++++----
 .../screener_question_form_controller.dart    |   6 +-
 .../screener_question_logic_form_view.dart    |  12 +-
 .../info/study_info_form_controller.dart      | 206 +++++++----
 .../design/info/study_info_form_view.dart     |  11 +-
 .../intervention_form_controller.dart         |  92 +++--
 .../interventions/intervention_form_data.dart |   6 +-
 .../interventions/intervention_form_view.dart | 105 +++---
 .../intervention_preview_view.dart            |  11 +-
 .../intervention_task_form_controller.dart    |   8 +-
 .../intervention_task_form_view.dart          |   9 +-
 .../interventions_form_controller.dart        |  90 +++--
 .../interventions_form_view.dart              |  13 +-
 .../study_schedule_form_controller_mixin.dart |  10 +-
 .../study_schedule_form_data.dart             |   2 +-
 .../study_schedule_form_view.dart             |   4 +-
 .../measurements_form_controller.dart         |  80 +++--
 .../measurements/measurements_form_data.dart  |   4 +-
 .../measurements/measurements_form_view.dart  |   5 +-
 .../survey/survey_form_controller.dart        |  66 ++--
 .../measurements/survey/survey_form_view.dart | 293 ++++++++--------
 .../survey/survey_preview_view.dart           |  11 +-
 .../features/design/reports/report_badge.dart |   6 +-
 .../reports/reports_form_controller.dart      |  59 ++--
 .../design/reports/reports_form_data.dart     |   2 +-
 .../design/reports/reports_form_view.dart     |  68 ++--
 .../section/report_item_form_controller.dart  | 228 +++++++++----
 .../section/report_item_form_data.dart        |   8 +-
 .../section/report_item_form_view.dart        |  20 +-
 .../types/average_section_form_view.dart      |   8 +-
 .../section/types/data_reference_editor.dart  |   3 +-
 .../linear_regression_section_form_view.dart  |  10 +-
 .../reports/section/types/section_type.dart   |  29 +-
 .../question/question_form_controller.dart    | 322 +++++++++++-------
 .../question/question_form_data.dart          | 100 ++++--
 .../question/question_form_view.dart          | 246 +++++++------
 .../types/bool_question_form_view.dart        |   8 +-
 .../types/choice_question_form_view.dart      |  34 +-
 .../types/free_text_question_form_view.dart   |  24 +-
 .../types/scale_question_form_view.dart       |  17 +-
 .../questionnaire_form_data.dart              |   2 +-
 .../schedule/schedule_controls_view.dart      |  20 +-
 .../schedule_form_controller_mixin.dart       |  26 +-
 .../shared/schedule/schedule_form_data.dart   |   6 +-
 .../design/study_design_page_view.dart        |   5 +-
 .../design/study_form_controller.dart         |  29 +-
 .../lib/features/design/study_form_data.dart  |   2 +-
 .../features/design/study_form_scaffold.dart  |   4 +-
 .../lib/features/forms/form_array_table.dart  | 113 +++---
 .../lib/features/forms/form_control.dart      |  21 +-
 .../lib/features/forms/form_validation.dart   |  50 ++-
 .../lib/features/forms/form_view_model.dart   |  98 ++++--
 .../forms/form_view_model_collection.dart     |   2 +-
 .../form_view_model_collection_actions.dart   |  22 +-
 .../publish/study_publish_dialog.dart         |   2 +-
 .../publish/study_publish_dialog_confirm.dart | 120 ++++---
 .../publish/study_publish_dialog_success.dart |   7 +-
 .../lib/features/recruit/enrolled_badge.dart  |   2 +-
 .../recruit/invite_code_form_controller.dart  |  80 +++--
 .../recruit/invite_code_form_view.dart        |  14 +-
 .../features/recruit/invite_codes_table.dart  |  11 +-
 .../recruit/study_recruit_controller.dart     |  12 +-
 .../features/recruit/study_recruit_page.dart  |   8 +-
 .../study/settings/study_settings_dialog.dart |   7 +-
 .../study_settings_form_controller.dart       |  23 +-
 .../features/study/study_base_controller.dart |  20 +-
 .../lib/features/study/study_controller.dart  |  25 +-
 .../study/study_controller_state.dart         |   2 +-
 .../lib/features/study/study_navbar.dart      |  49 ++-
 .../study/study_participation_badge.dart      |   6 +-
 .../lib/features/study/study_scaffold.dart    | 130 +++----
 .../features/study/study_status_badge.dart    |  10 +-
 .../features/study/study_test_controller.dart |   2 +-
 .../lib/features/study/study_test_frame.dart  | 104 +++---
 .../study/study_test_frame_controllers.dart   |   6 +-
 .../study/study_test_frame_views.dart         |  14 +-
 .../lib/features/study/study_test_page.dart   | 169 ++++-----
 .../lib/localization/app_translation.dart     |   4 +-
 .../lib/localization/language_picker.dart     |  14 +-
 .../lib/localization/locale_providers.dart    |   5 +-
 .../lib/localization/locale_state.dart        |  25 +-
 .../platform_locale_interface.dart            |   2 +-
 .../platform_locale_mobile.dart               |   8 +-
 .../platform_locale/platform_locale_stub.dart |   2 +-
 .../platform_locale/platform_locale_web.dart  |   8 +-
 designer_v2/lib/main.dart                     |  13 +-
 designer_v2/lib/repositories/api_client.dart  |  91 +++--
 .../lib/repositories/auth_repository.dart     |  12 +-
 .../repositories/invite_code_repository.dart  |  62 ++--
 .../lib/repositories/model_repository.dart    |  99 ++++--
 .../lib/repositories/study_repository.dart    |  10 +-
 .../lib/repositories/supabase_client.dart     |   6 +-
 .../lib/repositories/user_repository.dart     |  22 +-
 designer_v2/lib/routing/router.dart           |  13 +-
 designer_v2/lib/routing/router_config.dart    |  77 ++---
 designer_v2/lib/routing/router_intent.dart    |  86 +++--
 designer_v2/lib/routing/router_utils.dart     |   2 +-
 .../lib/services/notification_dispatcher.dart | 152 +++++----
 .../lib/services/notification_types.dart      |  22 +-
 designer_v2/lib/services/notifications.dart   |   2 +-
 designer_v2/lib/theme.dart                    |  18 +-
 designer_v2/lib/utils/behaviour_subject.dart  |   2 +-
 designer_v2/lib/utils/color.dart              |   2 +-
 designer_v2/lib/utils/debouncer.dart          |  18 +-
 designer_v2/lib/utils/extensions.dart         |  38 ++-
 designer_v2/lib/utils/file_download.dart      |  18 +-
 designer_v2/lib/utils/font.dart               |  10 +-
 designer_v2/lib/utils/json_file_loader.dart   |   7 +-
 designer_v2/lib/utils/json_format.dart        |   4 +-
 designer_v2/lib/utils/model_action.dart       |  22 +-
 designer_v2/lib/utils/optimistic_update.dart  |   8 +-
 designer_v2/lib/utils/performance.dart        |  27 +-
 designer_v2/lib/utils/time_of_day.dart        |  12 +-
 designer_v2/pubspec.lock                      |   8 +
 210 files changed, 4397 insertions(+), 3388 deletions(-)

diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index d8a506c33..efb8e574b 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -7,6 +7,7 @@ repository: https://github.com/hpi-studyu/studyu
 
 environment:
   sdk: '>=3.2.0 <4.0.0'
+
 dependencies:
   camera: ^0.11.0+1
   collection: ^1.18.0
diff --git a/core/lib/src/models/consent/consent_item.g.dart b/core/lib/src/models/consent/consent_item.g.dart
index ab84c211e..5adf71a9a 100644
--- a/core/lib/src/models/consent/consent_item.g.dart
+++ b/core/lib/src/models/consent/consent_item.g.dart
@@ -13,19 +13,10 @@ ConsentItem _$ConsentItemFromJson(Map<String, dynamic> json) => ConsentItem(
       ..description = json['description'] as String?
       ..iconName = json['iconName'] as String;
 
-Map<String, dynamic> _$ConsentItemToJson(ConsentItem instance) {
-  final val = <String, dynamic>{
-    'id': instance.id,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('title', instance.title);
-  writeNotNull('description', instance.description);
-  val['iconName'] = instance.iconName;
-  return val;
-}
+Map<String, dynamic> _$ConsentItemToJson(ConsentItem instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'title': instance.title,
+      'description': instance.description,
+      'iconName': instance.iconName,
+    };
diff --git a/core/lib/src/models/contact.g.dart b/core/lib/src/models/contact.g.dart
index 9ce399e8d..3dec28717 100644
--- a/core/lib/src/models/contact.g.dart
+++ b/core/lib/src/models/contact.g.dart
@@ -17,24 +17,13 @@ Contact _$ContactFromJson(Map<String, dynamic> json) => Contact()
   ..phone = json['phone'] as String
   ..additionalInfo = json['additionalInfo'] as String?;
 
-Map<String, dynamic> _$ContactToJson(Contact instance) {
-  final val = <String, dynamic>{
-    'organization': instance.organization,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('institutionalReviewBoard', instance.institutionalReviewBoard);
-  writeNotNull('institutionalReviewBoardNumber',
-      instance.institutionalReviewBoardNumber);
-  writeNotNull('researchers', instance.researchers);
-  val['email'] = instance.email;
-  val['website'] = instance.website;
-  val['phone'] = instance.phone;
-  writeNotNull('additionalInfo', instance.additionalInfo);
-  return val;
-}
+Map<String, dynamic> _$ContactToJson(Contact instance) => <String, dynamic>{
+      'organization': instance.organization,
+      'institutionalReviewBoard': instance.institutionalReviewBoard,
+      'institutionalReviewBoardNumber': instance.institutionalReviewBoardNumber,
+      'researchers': instance.researchers,
+      'email': instance.email,
+      'website': instance.website,
+      'phone': instance.phone,
+      'additionalInfo': instance.additionalInfo,
+    };
diff --git a/core/lib/src/models/eligibility/eligibility_criterion.g.dart b/core/lib/src/models/eligibility/eligibility_criterion.g.dart
index ad35bd974..9b7681a7a 100644
--- a/core/lib/src/models/eligibility/eligibility_criterion.g.dart
+++ b/core/lib/src/models/eligibility/eligibility_criterion.g.dart
@@ -16,18 +16,9 @@ EligibilityCriterion _$EligibilityCriterionFromJson(
           Expression.fromJson(json['condition'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$EligibilityCriterionToJson(
-    EligibilityCriterion instance) {
-  final val = <String, dynamic>{
-    'id': instance.id,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('reason', instance.reason);
-  val['condition'] = instance.condition.toJson();
-  return val;
-}
+        EligibilityCriterion instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'reason': instance.reason,
+      'condition': instance.condition,
+    };
diff --git a/core/lib/src/models/expressions/types/boolean_expression.g.dart b/core/lib/src/models/expressions/types/boolean_expression.g.dart
index 3328aae56..d1e111774 100644
--- a/core/lib/src/models/expressions/types/boolean_expression.g.dart
+++ b/core/lib/src/models/expressions/types/boolean_expression.g.dart
@@ -11,16 +11,8 @@ BooleanExpression _$BooleanExpressionFromJson(Map<String, dynamic> json) =>
       ..type = json['type'] as String?
       ..target = json['target'] as String?;
 
-Map<String, dynamic> _$BooleanExpressionToJson(BooleanExpression instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('type', instance.type);
-  writeNotNull('target', instance.target);
-  return val;
-}
+Map<String, dynamic> _$BooleanExpressionToJson(BooleanExpression instance) =>
+    <String, dynamic>{
+      'type': instance.type,
+      'target': instance.target,
+    };
diff --git a/core/lib/src/models/expressions/types/choice_expression.g.dart b/core/lib/src/models/expressions/types/choice_expression.g.dart
index 3e1c40902..e8da4fa7e 100644
--- a/core/lib/src/models/expressions/types/choice_expression.g.dart
+++ b/core/lib/src/models/expressions/types/choice_expression.g.dart
@@ -12,17 +12,9 @@ ChoiceExpression _$ChoiceExpressionFromJson(Map<String, dynamic> json) =>
       ..target = json['target'] as String?
       ..choices = (json['choices'] as List<dynamic>).toSet();
 
-Map<String, dynamic> _$ChoiceExpressionToJson(ChoiceExpression instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('type', instance.type);
-  writeNotNull('target', instance.target);
-  val['choices'] = instance.choices.toList();
-  return val;
-}
+Map<String, dynamic> _$ChoiceExpressionToJson(ChoiceExpression instance) =>
+    <String, dynamic>{
+      'type': instance.type,
+      'target': instance.target,
+      'choices': instance.choices.toList(),
+    };
diff --git a/core/lib/src/models/expressions/types/not_expression.g.dart b/core/lib/src/models/expressions/types/not_expression.g.dart
index 84704e8cf..34a584147 100644
--- a/core/lib/src/models/expressions/types/not_expression.g.dart
+++ b/core/lib/src/models/expressions/types/not_expression.g.dart
@@ -12,16 +12,8 @@ NotExpression _$NotExpressionFromJson(Map<String, dynamic> json) =>
       ..expression =
           Expression.fromJson(json['expression'] as Map<String, dynamic>);
 
-Map<String, dynamic> _$NotExpressionToJson(NotExpression instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('type', instance.type);
-  val['expression'] = instance.expression.toJson();
-  return val;
-}
+Map<String, dynamic> _$NotExpressionToJson(NotExpression instance) =>
+    <String, dynamic>{
+      'type': instance.type,
+      'expression': instance.expression,
+    };
diff --git a/core/lib/src/models/interventions/intervention.g.dart b/core/lib/src/models/interventions/intervention.g.dart
index 6e62e92fa..e561962b8 100644
--- a/core/lib/src/models/interventions/intervention.g.dart
+++ b/core/lib/src/models/interventions/intervention.g.dart
@@ -16,20 +16,11 @@ Intervention _$InterventionFromJson(Map<String, dynamic> json) => Intervention(
           .map((e) => InterventionTask.fromJson(e as Map<String, dynamic>))
           .toList();
 
-Map<String, dynamic> _$InterventionToJson(Intervention instance) {
-  final val = <String, dynamic>{
-    'id': instance.id,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('name', instance.name);
-  writeNotNull('description', instance.description);
-  val['icon'] = instance.icon;
-  val['tasks'] = instance.tasks.map((e) => e.toJson()).toList();
-  return val;
-}
+Map<String, dynamic> _$InterventionToJson(Intervention instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'name': instance.name,
+      'description': instance.description,
+      'icon': instance.icon,
+      'tasks': instance.tasks,
+    };
diff --git a/core/lib/src/models/interventions/tasks/checkmark_task.g.dart b/core/lib/src/models/interventions/tasks/checkmark_task.g.dart
index d7db031af..1539d81c2 100644
--- a/core/lib/src/models/interventions/tasks/checkmark_task.g.dart
+++ b/core/lib/src/models/interventions/tasks/checkmark_task.g.dart
@@ -15,21 +15,12 @@ CheckmarkTask _$CheckmarkTaskFromJson(Map<String, dynamic> json) =>
       ..footer = json['footer'] as String?
       ..schedule = Schedule.fromJson(json['schedule'] as Map<String, dynamic>);
 
-Map<String, dynamic> _$CheckmarkTaskToJson(CheckmarkTask instance) {
-  final val = <String, dynamic>{
-    'type': instance.type,
-    'id': instance.id,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('title', instance.title);
-  writeNotNull('header', instance.header);
-  writeNotNull('footer', instance.footer);
-  val['schedule'] = instance.schedule.toJson();
-  return val;
-}
+Map<String, dynamic> _$CheckmarkTaskToJson(CheckmarkTask instance) =>
+    <String, dynamic>{
+      'type': instance.type,
+      'id': instance.id,
+      'title': instance.title,
+      'header': instance.header,
+      'footer': instance.footer,
+      'schedule': instance.schedule,
+    };
diff --git a/core/lib/src/models/observations/tasks/questionnaire_task.g.dart b/core/lib/src/models/observations/tasks/questionnaire_task.g.dart
index 9f86bb97a..a4cc3590f 100644
--- a/core/lib/src/models/observations/tasks/questionnaire_task.g.dart
+++ b/core/lib/src/models/observations/tasks/questionnaire_task.g.dart
@@ -17,22 +17,13 @@ QuestionnaireTask _$QuestionnaireTaskFromJson(Map<String, dynamic> json) =>
       ..questions =
           StudyUQuestionnaire.fromJson(json['questions'] as List<dynamic>);
 
-Map<String, dynamic> _$QuestionnaireTaskToJson(QuestionnaireTask instance) {
-  final val = <String, dynamic>{
-    'type': instance.type,
-    'id': instance.id,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('title', instance.title);
-  writeNotNull('header', instance.header);
-  writeNotNull('footer', instance.footer);
-  val['schedule'] = instance.schedule.toJson();
-  val['questions'] = instance.questions.toJson();
-  return val;
-}
+Map<String, dynamic> _$QuestionnaireTaskToJson(QuestionnaireTask instance) =>
+    <String, dynamic>{
+      'type': instance.type,
+      'id': instance.id,
+      'title': instance.title,
+      'header': instance.header,
+      'footer': instance.footer,
+      'schedule': instance.schedule,
+      'questions': instance.questions,
+    };
diff --git a/core/lib/src/models/questionnaire/question_conditional.g.dart b/core/lib/src/models/questionnaire/question_conditional.g.dart
index 4a9effa84..eb7704d09 100644
--- a/core/lib/src/models/questionnaire/question_conditional.g.dart
+++ b/core/lib/src/models/questionnaire/question_conditional.g.dart
@@ -15,5 +15,5 @@ QuestionConditional<V> _$QuestionConditionalFromJson<V>(
 Map<String, dynamic> _$QuestionConditionalToJson<V>(
         QuestionConditional<V> instance) =>
     <String, dynamic>{
-      'condition': instance.condition.toJson(),
+      'condition': instance.condition,
     };
diff --git a/core/lib/src/models/questionnaire/questions/annotated_scale_question.g.dart b/core/lib/src/models/questionnaire/questions/annotated_scale_question.g.dart
index 1de91484b..e8ec497c2 100644
--- a/core/lib/src/models/questionnaire/questions/annotated_scale_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/annotated_scale_question.g.dart
@@ -26,28 +26,19 @@ AnnotatedScaleQuestion _$AnnotatedScaleQuestionFromJson(
           .toList();
 
 Map<String, dynamic> _$AnnotatedScaleQuestionToJson(
-    AnnotatedScaleQuestion instance) {
-  final val = <String, dynamic>{
-    'type': instance.type,
-    'id': instance.id,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('prompt', instance.prompt);
-  writeNotNull('rationale', instance.rationale);
-  writeNotNull('conditional', instance.conditional?.toJson());
-  val['minimum'] = instance.minimum;
-  val['maximum'] = instance.maximum;
-  val['step'] = instance.step;
-  val['initial'] = instance.initial;
-  val['annotations'] = instance.annotations.map((e) => e.toJson()).toList();
-  return val;
-}
+        AnnotatedScaleQuestion instance) =>
+    <String, dynamic>{
+      'type': instance.type,
+      'id': instance.id,
+      'prompt': instance.prompt,
+      'rationale': instance.rationale,
+      'conditional': instance.conditional,
+      'minimum': instance.minimum,
+      'maximum': instance.maximum,
+      'step': instance.step,
+      'initial': instance.initial,
+      'annotations': instance.annotations,
+    };
 
 Annotation _$AnnotationFromJson(Map<String, dynamic> json) => Annotation()
   ..value = (json['value'] as num).toInt()
diff --git a/core/lib/src/models/questionnaire/questions/audio_recording_question.g.dart b/core/lib/src/models/questionnaire/questions/audio_recording_question.g.dart
index c09581df9..08c0d5af8 100644
--- a/core/lib/src/models/questionnaire/questions/audio_recording_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/audio_recording_question.g.dart
@@ -22,21 +22,12 @@ AudioRecordingQuestion _$AudioRecordingQuestionFromJson(
               json['conditional'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$AudioRecordingQuestionToJson(
-    AudioRecordingQuestion instance) {
-  final val = <String, dynamic>{
-    'type': instance.type,
-    'id': instance.id,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('prompt', instance.prompt);
-  writeNotNull('rationale', instance.rationale);
-  writeNotNull('conditional', instance.conditional?.toJson());
-  val['maxRecordingDurationSeconds'] = instance.maxRecordingDurationSeconds;
-  return val;
-}
+        AudioRecordingQuestion instance) =>
+    <String, dynamic>{
+      'type': instance.type,
+      'id': instance.id,
+      'prompt': instance.prompt,
+      'rationale': instance.rationale,
+      'conditional': instance.conditional,
+      'maxRecordingDurationSeconds': instance.maxRecordingDurationSeconds,
+    };
diff --git a/core/lib/src/models/questionnaire/questions/boolean_question.g.dart b/core/lib/src/models/questionnaire/questions/boolean_question.g.dart
index c20af6101..b052d3105 100644
--- a/core/lib/src/models/questionnaire/questions/boolean_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/boolean_question.g.dart
@@ -17,20 +17,11 @@ BooleanQuestion _$BooleanQuestionFromJson(Map<String, dynamic> json) =>
           : QuestionConditional<bool>.fromJson(
               json['conditional'] as Map<String, dynamic>);
 
-Map<String, dynamic> _$BooleanQuestionToJson(BooleanQuestion instance) {
-  final val = <String, dynamic>{
-    'type': instance.type,
-    'id': instance.id,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('prompt', instance.prompt);
-  writeNotNull('rationale', instance.rationale);
-  writeNotNull('conditional', instance.conditional?.toJson());
-  return val;
-}
+Map<String, dynamic> _$BooleanQuestionToJson(BooleanQuestion instance) =>
+    <String, dynamic>{
+      'type': instance.type,
+      'id': instance.id,
+      'prompt': instance.prompt,
+      'rationale': instance.rationale,
+      'conditional': instance.conditional,
+    };
diff --git a/core/lib/src/models/questionnaire/questions/choice_question.g.dart b/core/lib/src/models/questionnaire/questions/choice_question.g.dart
index 6fd59f733..e8ada08fd 100644
--- a/core/lib/src/models/questionnaire/questions/choice_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/choice_question.g.dart
@@ -21,25 +21,16 @@ ChoiceQuestion _$ChoiceQuestionFromJson(Map<String, dynamic> json) =>
           .map((e) => Choice.fromJson(e as Map<String, dynamic>))
           .toList();
 
-Map<String, dynamic> _$ChoiceQuestionToJson(ChoiceQuestion instance) {
-  final val = <String, dynamic>{
-    'type': instance.type,
-    'id': instance.id,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('prompt', instance.prompt);
-  writeNotNull('rationale', instance.rationale);
-  writeNotNull('conditional', instance.conditional?.toJson());
-  val['multiple'] = instance.multiple;
-  val['choices'] = instance.choices.map((e) => e.toJson()).toList();
-  return val;
-}
+Map<String, dynamic> _$ChoiceQuestionToJson(ChoiceQuestion instance) =>
+    <String, dynamic>{
+      'type': instance.type,
+      'id': instance.id,
+      'prompt': instance.prompt,
+      'rationale': instance.rationale,
+      'conditional': instance.conditional,
+      'multiple': instance.multiple,
+      'choices': instance.choices,
+    };
 
 Choice _$ChoiceFromJson(Map<String, dynamic> json) => Choice(
       json['id'] as String,
diff --git a/core/lib/src/models/questionnaire/questions/free_text_question.g.dart b/core/lib/src/models/questionnaire/questions/free_text_question.g.dart
index 4a6865334..322c5845b 100644
--- a/core/lib/src/models/questionnaire/questions/free_text_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/free_text_question.g.dart
@@ -23,26 +23,17 @@ FreeTextQuestion _$FreeTextQuestionFromJson(Map<String, dynamic> json) =>
           : QuestionConditional<String>.fromJson(
               json['conditional'] as Map<String, dynamic>);
 
-Map<String, dynamic> _$FreeTextQuestionToJson(FreeTextQuestion instance) {
-  final val = <String, dynamic>{
-    'type': instance.type,
-    'id': instance.id,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('prompt', instance.prompt);
-  writeNotNull('rationale', instance.rationale);
-  writeNotNull('conditional', instance.conditional?.toJson());
-  val['lengthRange'] = instance.lengthRange;
-  val['textType'] = instance.textType.toJson();
-  writeNotNull('customTypeExpression', instance.customTypeExpression);
-  return val;
-}
+Map<String, dynamic> _$FreeTextQuestionToJson(FreeTextQuestion instance) =>
+    <String, dynamic>{
+      'type': instance.type,
+      'id': instance.id,
+      'prompt': instance.prompt,
+      'rationale': instance.rationale,
+      'conditional': instance.conditional,
+      'lengthRange': instance.lengthRange,
+      'textType': instance.textType,
+      'customTypeExpression': instance.customTypeExpression,
+    };
 
 const _$FreeTextQuestionTypeEnumMap = {
   FreeTextQuestionType.any: 'any',
diff --git a/core/lib/src/models/questionnaire/questions/image_capturing_question.g.dart b/core/lib/src/models/questionnaire/questions/image_capturing_question.g.dart
index b06b088d5..6858d4e64 100644
--- a/core/lib/src/models/questionnaire/questions/image_capturing_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/image_capturing_question.g.dart
@@ -19,20 +19,11 @@ ImageCapturingQuestion _$ImageCapturingQuestionFromJson(
               json['conditional'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$ImageCapturingQuestionToJson(
-    ImageCapturingQuestion instance) {
-  final val = <String, dynamic>{
-    'type': instance.type,
-    'id': instance.id,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('prompt', instance.prompt);
-  writeNotNull('rationale', instance.rationale);
-  writeNotNull('conditional', instance.conditional?.toJson());
-  return val;
-}
+        ImageCapturingQuestion instance) =>
+    <String, dynamic>{
+      'type': instance.type,
+      'id': instance.id,
+      'prompt': instance.prompt,
+      'rationale': instance.rationale,
+      'conditional': instance.conditional,
+    };
diff --git a/core/lib/src/models/questionnaire/questions/scale_question.g.dart b/core/lib/src/models/questionnaire/questions/scale_question.g.dart
index e69c71d08..ef62e5eaa 100644
--- a/core/lib/src/models/questionnaire/questions/scale_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/scale_question.g.dart
@@ -26,27 +26,18 @@ ScaleQuestion _$ScaleQuestionFromJson(Map<String, dynamic> json) =>
       ..maxColor = (json['max_color'] as num?)?.toInt()
       ..step = (json['step'] as num).toDouble();
 
-Map<String, dynamic> _$ScaleQuestionToJson(ScaleQuestion instance) {
-  final val = <String, dynamic>{
-    'type': instance.type,
-    'id': instance.id,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('prompt', instance.prompt);
-  writeNotNull('rationale', instance.rationale);
-  writeNotNull('conditional', instance.conditional?.toJson());
-  val['minimum'] = instance.minimum;
-  val['maximum'] = instance.maximum;
-  val['initial'] = instance.initial;
-  val['annotations'] = instance.annotations.map((e) => e.toJson()).toList();
-  writeNotNull('min_color', instance.minColor);
-  writeNotNull('max_color', instance.maxColor);
-  val['step'] = instance.step;
-  return val;
-}
+Map<String, dynamic> _$ScaleQuestionToJson(ScaleQuestion instance) =>
+    <String, dynamic>{
+      'type': instance.type,
+      'id': instance.id,
+      'prompt': instance.prompt,
+      'rationale': instance.rationale,
+      'conditional': instance.conditional,
+      'minimum': instance.minimum,
+      'maximum': instance.maximum,
+      'initial': instance.initial,
+      'annotations': instance.annotations,
+      'min_color': instance.minColor,
+      'max_color': instance.maxColor,
+      'step': instance.step,
+    };
diff --git a/core/lib/src/models/questionnaire/questions/visual_analogue_question.g.dart b/core/lib/src/models/questionnaire/questions/visual_analogue_question.g.dart
index 2c2a2b505..8c0a83a93 100644
--- a/core/lib/src/models/questionnaire/questions/visual_analogue_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/visual_analogue_question.g.dart
@@ -27,28 +27,19 @@ VisualAnalogueQuestion _$VisualAnalogueQuestionFromJson(
       ..maximumAnnotation = json['maximumAnnotation'] as String;
 
 Map<String, dynamic> _$VisualAnalogueQuestionToJson(
-    VisualAnalogueQuestion instance) {
-  final val = <String, dynamic>{
-    'type': instance.type,
-    'id': instance.id,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('prompt', instance.prompt);
-  writeNotNull('rationale', instance.rationale);
-  writeNotNull('conditional', instance.conditional?.toJson());
-  val['minimum'] = instance.minimum;
-  val['maximum'] = instance.maximum;
-  val['step'] = instance.step;
-  val['initial'] = instance.initial;
-  val['minimumColor'] = instance.minimumColor;
-  val['maximumColor'] = instance.maximumColor;
-  val['minimumAnnotation'] = instance.minimumAnnotation;
-  val['maximumAnnotation'] = instance.maximumAnnotation;
-  return val;
-}
+        VisualAnalogueQuestion instance) =>
+    <String, dynamic>{
+      'type': instance.type,
+      'id': instance.id,
+      'prompt': instance.prompt,
+      'rationale': instance.rationale,
+      'conditional': instance.conditional,
+      'minimum': instance.minimum,
+      'maximum': instance.maximum,
+      'step': instance.step,
+      'initial': instance.initial,
+      'minimumColor': instance.minimumColor,
+      'maximumColor': instance.maximumColor,
+      'minimumAnnotation': instance.minimumAnnotation,
+      'maximumAnnotation': instance.maximumAnnotation,
+    };
diff --git a/core/lib/src/models/report/report_specification.g.dart b/core/lib/src/models/report/report_specification.g.dart
index ed596a611..70634fb92 100644
--- a/core/lib/src/models/report/report_specification.g.dart
+++ b/core/lib/src/models/report/report_specification.g.dart
@@ -15,16 +15,9 @@ ReportSpecification _$ReportSpecificationFromJson(Map<String, dynamic> json) =>
           .map((e) => ReportSection.fromJson(e as Map<String, dynamic>))
           .toList();
 
-Map<String, dynamic> _$ReportSpecificationToJson(ReportSpecification instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('primary', instance.primary?.toJson());
-  val['secondary'] = instance.secondary.map((e) => e.toJson()).toList();
-  return val;
-}
+Map<String, dynamic> _$ReportSpecificationToJson(
+        ReportSpecification instance) =>
+    <String, dynamic>{
+      'primary': instance.primary,
+      'secondary': instance.secondary,
+    };
diff --git a/core/lib/src/models/report/sections/average_section.g.dart b/core/lib/src/models/report/sections/average_section.g.dart
index 21fd5f5f4..e646742a8 100644
--- a/core/lib/src/models/report/sections/average_section.g.dart
+++ b/core/lib/src/models/report/sections/average_section.g.dart
@@ -19,24 +19,15 @@ AverageSection _$AverageSectionFromJson(Map<String, dynamic> json) =>
           : DataReference<num>.fromJson(
               json['resultProperty'] as Map<String, dynamic>);
 
-Map<String, dynamic> _$AverageSectionToJson(AverageSection instance) {
-  final val = <String, dynamic>{
-    'type': instance.type,
-    'id': instance.id,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('title', instance.title);
-  writeNotNull('description', instance.description);
-  writeNotNull('aggregate', _$TemporalAggregationEnumMap[instance.aggregate]);
-  writeNotNull('resultProperty', instance.resultProperty?.toJson());
-  return val;
-}
+Map<String, dynamic> _$AverageSectionToJson(AverageSection instance) =>
+    <String, dynamic>{
+      'type': instance.type,
+      'id': instance.id,
+      'title': instance.title,
+      'description': instance.description,
+      'aggregate': _$TemporalAggregationEnumMap[instance.aggregate],
+      'resultProperty': instance.resultProperty,
+    };
 
 const _$TemporalAggregationEnumMap = {
   TemporalAggregation.day: 'day',
diff --git a/core/lib/src/models/report/sections/linear_regression_section.g.dart b/core/lib/src/models/report/sections/linear_regression_section.g.dart
index 977a7209b..0ee0c7645 100644
--- a/core/lib/src/models/report/sections/linear_regression_section.g.dart
+++ b/core/lib/src/models/report/sections/linear_regression_section.g.dart
@@ -22,26 +22,16 @@ LinearRegressionSection _$LinearRegressionSectionFromJson(
           _$ImprovementDirectionEnumMap, json['improvement']);
 
 Map<String, dynamic> _$LinearRegressionSectionToJson(
-    LinearRegressionSection instance) {
-  final val = <String, dynamic>{
-    'type': instance.type,
-    'id': instance.id,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('title', instance.title);
-  writeNotNull('description', instance.description);
-  writeNotNull('resultProperty', instance.resultProperty?.toJson());
-  val['alpha'] = instance.alpha;
-  writeNotNull(
-      'improvement', _$ImprovementDirectionEnumMap[instance.improvement]);
-  return val;
-}
+        LinearRegressionSection instance) =>
+    <String, dynamic>{
+      'type': instance.type,
+      'id': instance.id,
+      'title': instance.title,
+      'description': instance.description,
+      'resultProperty': instance.resultProperty,
+      'alpha': instance.alpha,
+      'improvement': _$ImprovementDirectionEnumMap[instance.improvement],
+    };
 
 const _$ImprovementDirectionEnumMap = {
   ImprovementDirection.positive: 'positive',
diff --git a/core/lib/src/models/results/result.g.dart b/core/lib/src/models/results/result.g.dart
index ce6de6834..836732dd8 100644
--- a/core/lib/src/models/results/result.g.dart
+++ b/core/lib/src/models/results/result.g.dart
@@ -10,17 +10,7 @@ Result<T> _$ResultFromJson<T>(Map<String, dynamic> json) => Result<T>(
       json['type'] as String,
     )..periodId = json['periodId'] as String?;
 
-Map<String, dynamic> _$ResultToJson<T>(Result<T> instance) {
-  final val = <String, dynamic>{
-    'type': instance.type,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('periodId', instance.periodId);
-  return val;
-}
+Map<String, dynamic> _$ResultToJson<T>(Result<T> instance) => <String, dynamic>{
+      'type': instance.type,
+      'periodId': instance.periodId,
+    };
diff --git a/core/lib/src/models/study_results/results/numeric_result.g.dart b/core/lib/src/models/study_results/results/numeric_result.g.dart
index b6a5fd1d0..449f4ba30 100644
--- a/core/lib/src/models/study_results/results/numeric_result.g.dart
+++ b/core/lib/src/models/study_results/results/numeric_result.g.dart
@@ -19,5 +19,5 @@ Map<String, dynamic> _$NumericResultToJson(NumericResult instance) =>
       'type': instance.type,
       'id': instance.id,
       'filename': instance.filename,
-      'resultProperty': instance.resultProperty.toJson(),
+      'resultProperty': instance.resultProperty,
     };
diff --git a/core/lib/src/models/study_schedule/study_schedule.g.dart b/core/lib/src/models/study_schedule/study_schedule.g.dart
index ae103a19d..abb4ffa92 100644
--- a/core/lib/src/models/study_schedule/study_schedule.g.dart
+++ b/core/lib/src/models/study_schedule/study_schedule.g.dart
@@ -20,7 +20,7 @@ Map<String, dynamic> _$StudyScheduleToJson(StudySchedule instance) =>
       'numberOfCycles': instance.numberOfCycles,
       'phaseDuration': instance.phaseDuration,
       'includeBaseline': instance.includeBaseline,
-      'sequence': instance.sequence.toJson(),
+      'sequence': instance.sequence,
       'sequenceCustom': instance.sequenceCustom,
     };
 
diff --git a/core/lib/src/models/tables/app_config.g.dart b/core/lib/src/models/tables/app_config.g.dart
index 34f42d78b..7f1e01df8 100644
--- a/core/lib/src/models/tables/app_config.g.dart
+++ b/core/lib/src/models/tables/app_config.g.dart
@@ -21,24 +21,14 @@ AppConfig _$AppConfigFromJson(Map<String, dynamic> json) => AppConfig(
           : StudyUAnalytics.fromJson(json['analytics'] as Map<String, dynamic>),
     );
 
-Map<String, dynamic> _$AppConfigToJson(AppConfig instance) {
-  final val = <String, dynamic>{
-    'id': instance.id,
-    'app_min_version': instance.appMinVersion,
-    'app_privacy': instance.appPrivacy,
-    'app_terms': instance.appTerms,
-    'designer_privacy': instance.designerPrivacy,
-    'designer_terms': instance.designerTerms,
-    'imprint': instance.imprint,
-    'contact': instance.contact.toJson(),
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('analytics', instance.analytics?.toJson());
-  return val;
-}
+Map<String, dynamic> _$AppConfigToJson(AppConfig instance) => <String, dynamic>{
+      'id': instance.id,
+      'app_min_version': instance.appMinVersion,
+      'app_privacy': instance.appPrivacy,
+      'app_terms': instance.appTerms,
+      'designer_privacy': instance.designerPrivacy,
+      'designer_terms': instance.designerTerms,
+      'imprint': instance.imprint,
+      'contact': instance.contact,
+      'analytics': instance.analytics,
+    };
diff --git a/core/lib/src/models/tables/repo.g.dart b/core/lib/src/models/tables/repo.g.dart
index 1f653769c..55f466f3b 100644
--- a/core/lib/src/models/tables/repo.g.dart
+++ b/core/lib/src/models/tables/repo.g.dart
@@ -15,24 +15,14 @@ Repo _$RepoFromJson(Map<String, dynamic> json) => Repo(
       json['git_url'] as String?,
     );
 
-Map<String, dynamic> _$RepoToJson(Repo instance) {
-  final val = <String, dynamic>{
-    'project_id': instance.projectId,
-    'user_id': instance.userId,
-    'study_id': instance.studyId,
-    'provider': _$GitProviderEnumMap[instance.provider]!,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('web_url', instance.webUrl);
-  writeNotNull('git_url', instance.gitUrl);
-  return val;
-}
+Map<String, dynamic> _$RepoToJson(Repo instance) => <String, dynamic>{
+      'project_id': instance.projectId,
+      'user_id': instance.userId,
+      'study_id': instance.studyId,
+      'provider': _$GitProviderEnumMap[instance.provider]!,
+      'web_url': instance.webUrl,
+      'git_url': instance.gitUrl,
+    };
 
 const _$GitProviderEnumMap = {
   GitProvider.gitlab: 'gitlab',
diff --git a/core/lib/src/models/tables/study.g.dart b/core/lib/src/models/tables/study.g.dart
index e1b6daece..99cb0e329 100644
--- a/core/lib/src/models/tables/study.g.dart
+++ b/core/lib/src/models/tables/study.g.dart
@@ -47,38 +47,27 @@ Study _$StudyFromJson(Map<String, dynamic> json) => Study(
           []
       ..registryPublished = json['registry_published'] as bool? ?? false;
 
-Map<String, dynamic> _$StudyToJson(Study instance) {
-  final val = <String, dynamic>{
-    'id': instance.id,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('title', instance.title);
-  writeNotNull('description', instance.description);
-  val['user_id'] = instance.userId;
-  val['participation'] = instance.participation.toJson();
-  val['result_sharing'] = instance.resultSharing.toJson();
-  val['contact'] = instance.contact.toJson();
-  val['icon_name'] = instance.iconName;
-  val['published'] = instance.published;
-  val['questionnaire'] = instance.questionnaire.toJson();
-  val['eligibility_criteria'] =
-      instance.eligibilityCriteria.map((e) => e.toJson()).toList();
-  val['consent'] = instance.consent.map((e) => e.toJson()).toList();
-  val['interventions'] = instance.interventions.map((e) => e.toJson()).toList();
-  val['observations'] = instance.observations.map((e) => e.toJson()).toList();
-  val['schedule'] = instance.schedule.toJson();
-  val['report_specification'] = instance.reportSpecification.toJson();
-  val['results'] = instance.results.map((e) => e.toJson()).toList();
-  val['collaborator_emails'] = instance.collaboratorEmails;
-  val['registry_published'] = instance.registryPublished;
-  return val;
-}
+Map<String, dynamic> _$StudyToJson(Study instance) => <String, dynamic>{
+      'id': instance.id,
+      'title': instance.title,
+      'description': instance.description,
+      'user_id': instance.userId,
+      'participation': instance.participation,
+      'result_sharing': instance.resultSharing,
+      'contact': instance.contact,
+      'icon_name': instance.iconName,
+      'published': instance.published,
+      'questionnaire': instance.questionnaire,
+      'eligibility_criteria': instance.eligibilityCriteria,
+      'consent': instance.consent,
+      'interventions': instance.interventions,
+      'observations': instance.observations,
+      'schedule': instance.schedule,
+      'report_specification': instance.reportSpecification,
+      'results': instance.results,
+      'collaborator_emails': instance.collaboratorEmails,
+      'registry_published': instance.registryPublished,
+    };
 
 const _$ParticipationEnumMap = {
   Participation.open: 'open',
diff --git a/core/lib/src/models/tables/study_invite.g.dart b/core/lib/src/models/tables/study_invite.g.dart
index 006ba6254..4a9c8102a 100644
--- a/core/lib/src/models/tables/study_invite.g.dart
+++ b/core/lib/src/models/tables/study_invite.g.dart
@@ -15,19 +15,9 @@ StudyInvite _$StudyInviteFromJson(Map<String, dynamic> json) => StudyInvite(
               .toList(),
     );
 
-Map<String, dynamic> _$StudyInviteToJson(StudyInvite instance) {
-  final val = <String, dynamic>{
-    'code': instance.code,
-    'study_id': instance.studyId,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull(
-      'preselected_intervention_ids', instance.preselectedInterventionIds);
-  return val;
-}
+Map<String, dynamic> _$StudyInviteToJson(StudyInvite instance) =>
+    <String, dynamic>{
+      'code': instance.code,
+      'study_id': instance.studyId,
+      'preselected_intervention_ids': instance.preselectedInterventionIds,
+    };
diff --git a/core/lib/src/models/tables/study_subject.g.dart b/core/lib/src/models/tables/study_subject.g.dart
index bf851a5a8..d36af0389 100644
--- a/core/lib/src/models/tables/study_subject.g.dart
+++ b/core/lib/src/models/tables/study_subject.g.dart
@@ -20,22 +20,13 @@ StudySubject _$StudySubjectFromJson(Map<String, dynamic> json) => StudySubject(
       ..inviteCode = json['invite_code'] as String?
       ..isDeleted = json['is_deleted'] as bool;
 
-Map<String, dynamic> _$StudySubjectToJson(StudySubject instance) {
-  final val = <String, dynamic>{
-    'id': instance.id,
-    'study_id': instance.studyId,
-    'user_id': instance.userId,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('started_at', instance.startedAt?.toIso8601String());
-  val['selected_intervention_ids'] = instance.selectedInterventionIds;
-  writeNotNull('invite_code', instance.inviteCode);
-  val['is_deleted'] = instance.isDeleted;
-  return val;
-}
+Map<String, dynamic> _$StudySubjectToJson(StudySubject instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'study_id': instance.studyId,
+      'user_id': instance.userId,
+      'started_at': instance.startedAt?.toIso8601String(),
+      'selected_intervention_ids': instance.selectedInterventionIds,
+      'invite_code': instance.inviteCode,
+      'is_deleted': instance.isDeleted,
+    };
diff --git a/core/lib/src/models/tables/subject_progress.g.dart b/core/lib/src/models/tables/subject_progress.g.dart
index 0b5d8ff49..47d7fb451 100644
--- a/core/lib/src/models/tables/subject_progress.g.dart
+++ b/core/lib/src/models/tables/subject_progress.g.dart
@@ -17,20 +17,12 @@ SubjectProgress _$SubjectProgressFromJson(Map<String, dynamic> json) =>
         ? null
         : DateTime.parse(json['completed_at'] as String);
 
-Map<String, dynamic> _$SubjectProgressToJson(SubjectProgress instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('completed_at', instance.completedAt?.toIso8601String());
-  val['subject_id'] = instance.subjectId;
-  val['intervention_id'] = instance.interventionId;
-  val['task_id'] = instance.taskId;
-  val['result_type'] = instance.resultType;
-  val['result'] = instance.result.toJson();
-  return val;
-}
+Map<String, dynamic> _$SubjectProgressToJson(SubjectProgress instance) =>
+    <String, dynamic>{
+      'completed_at': instance.completedAt?.toIso8601String(),
+      'subject_id': instance.subjectId,
+      'intervention_id': instance.interventionId,
+      'task_id': instance.taskId,
+      'result_type': instance.resultType,
+      'result': instance.result,
+    };
diff --git a/core/lib/src/models/tables/user.g.dart b/core/lib/src/models/tables/user.g.dart
index fe2299aa4..54c1d0f1d 100644
--- a/core/lib/src/models/tables/user.g.dart
+++ b/core/lib/src/models/tables/user.g.dart
@@ -18,7 +18,7 @@ Map<String, dynamic> _$StudyUUserToJson(StudyUUser instance) =>
     <String, dynamic>{
       'id': instance.id,
       'email': instance.email,
-      'preferences': instance.preferences.toJson(),
+      'preferences': instance.preferences,
     };
 
 Preferences _$PreferencesFromJson(Map<String, dynamic> json) => Preferences(
diff --git a/core/lib/src/models/tasks/schedule.g.dart b/core/lib/src/models/tasks/schedule.g.dart
index b9645deb8..371ee3aed 100644
--- a/core/lib/src/models/tasks/schedule.g.dart
+++ b/core/lib/src/models/tasks/schedule.g.dart
@@ -15,9 +15,8 @@ Schedule _$ScheduleFromJson(Map<String, dynamic> json) => Schedule()
       .toList();
 
 Map<String, dynamic> _$ScheduleToJson(Schedule instance) => <String, dynamic>{
-      'completionPeriods':
-          instance.completionPeriods.map((e) => e.toJson()).toList(),
-      'reminders': instance.reminders.map((e) => e.toJson()).toList(),
+      'completionPeriods': instance.completionPeriods,
+      'reminders': instance.reminders,
     };
 
 CompletionPeriod _$CompletionPeriodFromJson(Map<String, dynamic> json) =>
@@ -30,6 +29,6 @@ CompletionPeriod _$CompletionPeriodFromJson(Map<String, dynamic> json) =>
 Map<String, dynamic> _$CompletionPeriodToJson(CompletionPeriod instance) =>
     <String, dynamic>{
       'id': instance.id,
-      'unlockTime': instance.unlockTime.toJson(),
-      'lockTime': instance.lockTime.toJson(),
+      'unlockTime': instance.unlockTime,
+      'lockTime': instance.lockTime,
     };
diff --git a/core/lib/src/util/analytics.g.dart b/core/lib/src/util/analytics.g.dart
index c512b03a3..139c61ba4 100644
--- a/core/lib/src/util/analytics.g.dart
+++ b/core/lib/src/util/analytics.g.dart
@@ -13,18 +13,9 @@ StudyUAnalytics _$StudyUAnalyticsFromJson(Map<String, dynamic> json) =>
       (json['samplingRate'] as num?)?.toDouble(),
     );
 
-Map<String, dynamic> _$StudyUAnalyticsToJson(StudyUAnalytics instance) {
-  final val = <String, dynamic>{
-    'enabled': instance.enabled,
-    'dsn': instance.dsn,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('samplingRate', instance.samplingRate);
-  return val;
-}
+Map<String, dynamic> _$StudyUAnalyticsToJson(StudyUAnalytics instance) =>
+    <String, dynamic>{
+      'enabled': instance.enabled,
+      'dsn': instance.dsn,
+      'samplingRate': instance.samplingRate,
+    };
diff --git a/designer_v2/analysis_options.yaml b/designer_v2/analysis_options.yaml
index 0310d91c6..76e535897 100644
--- a/designer_v2/analysis_options.yaml
+++ b/designer_v2/analysis_options.yaml
@@ -1,5 +1,8 @@
 include: ../analysis_options.yaml
 
 analyzer:
+  errors:
+    avoid_classes_with_only_static_members: ignore
+    unsafe_html: ignore
   plugins:
     - custom_lint
diff --git a/designer_v2/integration_test/app_test.dart b/designer_v2/integration_test/app_test.dart
index 1dc1673e5..de622cd95 100644
--- a/designer_v2/integration_test/app_test.dart
+++ b/designer_v2/integration_test/app_test.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:patrol_finders/patrol_finders.dart';
+import 'package:flutter_web_plugins/url_strategy.dart';
 import 'package:integration_test/integration_test.dart';
+import 'package:patrol_finders/patrol_finders.dart';
 import 'package:studyu_designer_v2/features/app.dart';
-import 'package:studyu_flutter_common/studyu_flutter_common.dart';
 import 'package:studyu_designer_v2/utils/performance.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter_web_plugins/url_strategy.dart';
+import 'package:studyu_flutter_common/studyu_flutter_common.dart';
 
 import 'robots/robots.dart';
 
diff --git a/designer_v2/integration_test/robots/study_info_robot.dart b/designer_v2/integration_test/robots/study_info_robot.dart
index 15eb8f9a4..85944e89b 100644
--- a/designer_v2/integration_test/robots/study_info_robot.dart
+++ b/designer_v2/integration_test/robots/study_info_robot.dart
@@ -17,7 +17,7 @@ class StudyInfoRobot {
         .which<TextField>((widget) =>
             widget.decoration is InputDecoration &&
             widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_study_title)
+            widget.decoration!.hintText! == tr.form_field_study_title,)
         .scrollTo()
         .enterText(studyName);
   }
@@ -27,7 +27,7 @@ class StudyInfoRobot {
         .which<TextField>((widget) =>
             widget.decoration is InputDecoration &&
             widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_study_description_hint)
+            widget.decoration!.hintText! == tr.form_field_study_description_hint,)
         .scrollTo()
         .enterText(studyDescription);
   }
@@ -37,7 +37,7 @@ class StudyInfoRobot {
         .which<TextField>((widget) =>
             widget.decoration is InputDecoration &&
             widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_organization)
+            widget.decoration!.hintText! == tr.form_field_organization,)
         .scrollTo()
         .enterText(orgName);
   }
@@ -47,7 +47,7 @@ class StudyInfoRobot {
         .which<TextField>((widget) =>
             widget.decoration is InputDecoration &&
             widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_review_board)
+            widget.decoration!.hintText! == tr.form_field_review_board,)
         .scrollTo()
         .enterText(irbName);
   }
@@ -57,7 +57,7 @@ class StudyInfoRobot {
         .which<TextField>((widget) =>
             widget.decoration is InputDecoration &&
             widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_review_board_number)
+            widget.decoration!.hintText! == tr.form_field_review_board_number,)
         .scrollTo()
         .enterText(irbNumber);
   }
@@ -67,7 +67,7 @@ class StudyInfoRobot {
         .which<TextField>((widget) =>
             widget.decoration is InputDecoration &&
             widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_researchers)
+            widget.decoration!.hintText! == tr.form_field_researchers,)
         .scrollTo()
         .enterText(personName);
   }
@@ -77,7 +77,7 @@ class StudyInfoRobot {
         .which<TextField>((widget) =>
             widget.decoration is InputDecoration &&
             widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_website)
+            widget.decoration!.hintText! == tr.form_field_website,)
         .scrollTo()
         .enterText(website);
   }
@@ -87,7 +87,7 @@ class StudyInfoRobot {
         .which<TextField>((widget) =>
             widget.decoration is InputDecoration &&
             widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_contact_email)
+            widget.decoration!.hintText! == tr.form_field_contact_email,)
         .scrollTo()
         .enterText(emailAddress);
   }
@@ -97,7 +97,7 @@ class StudyInfoRobot {
         .which<TextField>((widget) =>
             widget.decoration is InputDecoration &&
             widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_contact_phone)
+            widget.decoration!.hintText! == tr.form_field_contact_phone,)
         .scrollTo()
         .enterText(phoneNumber);
   }
diff --git a/designer_v2/integration_test/robots/study_interventions_robot.dart b/designer_v2/integration_test/robots/study_interventions_robot.dart
index ccc3bbc0a..ebbeebb8d 100644
--- a/designer_v2/integration_test/robots/study_interventions_robot.dart
+++ b/designer_v2/integration_test/robots/study_interventions_robot.dart
@@ -29,7 +29,7 @@ class StudyInterventionsRobot {
         .which<TextField>((widget) =>
             widget.decoration is InputDecoration &&
             widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_intervention_title)
+            widget.decoration!.hintText! == tr.form_field_intervention_title,)
         .scrollTo()
         .enterText(interventionName);
   }
@@ -39,7 +39,7 @@ class StudyInterventionsRobot {
         .which<TextField>((widget) =>
             widget.decoration is InputDecoration &&
             widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_intervention_description_hint)
+            widget.decoration!.hintText! == tr.form_field_intervention_description_hint,)
         .scrollTo()
         .enterText(interventionDescription);
   }
@@ -49,7 +49,7 @@ class StudyInterventionsRobot {
         .which<TextField>((widget) =>
             widget.decoration is InputDecoration &&
             widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_intervention_task_title)
+            widget.decoration!.hintText! == tr.form_field_intervention_task_title,)
         .scrollTo()
         .enterText(taskName);
   }
@@ -59,7 +59,7 @@ class StudyInterventionsRobot {
         .which<TextField>((widget) =>
             widget.decoration is InputDecoration &&
             widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_intervention_task_description_hint)
+            widget.decoration!.hintText! == tr.form_field_intervention_task_description_hint,)
         .scrollTo()
         .enterText(taskDescription);
   }
diff --git a/designer_v2/integration_test/robots/study_measurements_robot.dart b/designer_v2/integration_test/robots/study_measurements_robot.dart
index 929c76add..900d34327 100644
--- a/designer_v2/integration_test/robots/study_measurements_robot.dart
+++ b/designer_v2/integration_test/robots/study_measurements_robot.dart
@@ -29,7 +29,7 @@ class StudyMeasurementsRobot {
         .which<TextField>((widget) =>
             widget.decoration is InputDecoration &&
             widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_measurement_survey_title)
+            widget.decoration!.hintText! == tr.form_field_measurement_survey_title,)
         .scrollTo()
         .enterText(surveyName);
   }
@@ -39,7 +39,7 @@ class StudyMeasurementsRobot {
         .which<TextField>((widget) =>
             widget.decoration is InputDecoration &&
             widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_measurement_survey_intro_text_hint)
+            widget.decoration!.hintText! == tr.form_field_measurement_survey_intro_text_hint,)
         .scrollTo()
         .enterText(introText);
   }
@@ -49,7 +49,7 @@ class StudyMeasurementsRobot {
         .which<TextField>((widget) =>
             widget.decoration is InputDecoration &&
             widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_measurement_survey_outro_text_hint)
+            widget.decoration!.hintText! == tr.form_field_measurement_survey_outro_text_hint,)
         .scrollTo()
         .enterText(outroText);
   }
@@ -59,7 +59,7 @@ class StudyMeasurementsRobot {
         .which<TextField>((widget) =>
             widget.decoration is InputDecoration &&
             widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_question)
+            widget.decoration!.hintText! == tr.form_field_question,)
         .scrollTo()
         .enterText(questionText);
   }
@@ -69,7 +69,7 @@ class StudyMeasurementsRobot {
         .which<TextField>((widget) =>
             widget.decoration is InputDecoration &&
             widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_array_response_options_choice_hint)
+            widget.decoration!.hintText! == tr.form_array_response_options_choice_hint,)
         .at(0)
         .scrollTo()
         .enterText(optionText);
@@ -80,7 +80,7 @@ class StudyMeasurementsRobot {
         .which<TextField>((widget) =>
             widget.decoration is InputDecoration &&
             widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_array_response_options_choice_hint)
+            widget.decoration!.hintText! == tr.form_array_response_options_choice_hint,)
         .at(1)
         .scrollTo()
         .enterText(optionText);
diff --git a/designer_v2/lib/common_views/action_inline_menu.dart b/designer_v2/lib/common_views/action_inline_menu.dart
index fb60e19d5..009f00fc5 100644
--- a/designer_v2/lib/common_views/action_inline_menu.dart
+++ b/designer_v2/lib/common_views/action_inline_menu.dart
@@ -3,15 +3,16 @@ import 'package:studyu_designer_v2/common_views/mouse_events.dart';
 import 'package:studyu_designer_v2/utils/model_action.dart';
 
 class ActionMenuInline extends StatelessWidget {
-  const ActionMenuInline(
-      {required this.actions,
-      this.splashRadius = 18.0,
-      this.iconSize,
-      this.iconColor,
-      this.visible = true,
-      this.paddingHorizontal = 2.0,
-      this.paddingVertical = 0.0,
-      super.key});
+  const ActionMenuInline({
+    required this.actions,
+    this.splashRadius = 18.0,
+    this.iconSize,
+    this.iconColor,
+    this.visible = true,
+    this.paddingHorizontal = 2.0,
+    this.paddingVertical = 0.0,
+    super.key,
+  });
 
   final List<ModelAction> actions;
   final WidgetStateProperty<Color>? iconColor;
@@ -30,31 +31,42 @@ class ActionMenuInline extends StatelessWidget {
 
     final theme = Theme.of(context);
 
-    defaultIconColor(Set<WidgetState> states) {
+    Color defaultIconColor(Set<WidgetState> states) {
       if (states.contains(WidgetState.hovered)) {
         return theme.colorScheme.secondary.withOpacity(0.8);
       }
       return theme.colorScheme.secondary.withOpacity(0.4);
     }
 
-    final actionButtons = actions.map((action) {
+    final actionButtons = actions.map((ModelAction action) {
       return Tooltip(
-          message: action.label,
-          child: MouseEventsRegion(builder: (context, state) {
+        message: action.label,
+        child: MouseEventsRegion(
+          builder: (context, state) {
             return IconButton(
-                padding: EdgeInsets.zero,
-                splashRadius: splashRadius,
-                onPressed: () => action.onExecute(),
-                iconSize: iconSize ?? theme.iconTheme.size ?? 16.0,
-                icon: Icon(action.icon,
-                    color: iconColor?.resolve(state) ?? (action.isDestructive ? Colors.red : defaultIconColor(state))));
-          }));
+              padding: EdgeInsets.zero,
+              splashRadius: splashRadius,
+              onPressed: () => action.onExecute(),
+              iconSize: iconSize ?? theme.iconTheme.size ?? 16.0,
+              icon: Icon(
+                action.icon,
+                color: iconColor?.resolve(state) ??
+                    (action.isDestructive
+                        ? Colors.red
+                        : defaultIconColor(state)),
+              ),
+            );
+          },
+        ),
+      );
     }).toList();
 
     return Padding(
-      padding: EdgeInsets.symmetric(horizontal: paddingHorizontal ?? 0, vertical: paddingVertical ?? 0),
+      padding: EdgeInsets.symmetric(
+        horizontal: paddingHorizontal ?? 0,
+        vertical: paddingVertical ?? 0,
+      ),
       child: Row(
-        crossAxisAlignment: CrossAxisAlignment.center,
         children: actionButtons,
       ),
     );
diff --git a/designer_v2/lib/common_views/action_popup_menu.dart b/designer_v2/lib/common_views/action_popup_menu.dart
index f9f0df2fd..b312f89b8 100644
--- a/designer_v2/lib/common_views/action_popup_menu.dart
+++ b/designer_v2/lib/common_views/action_popup_menu.dart
@@ -19,7 +19,7 @@ class ActionPopUpMenuButton extends StatelessWidget {
       this.disableSplashEffect = false,
       this.hideOnEmpty = true,
       this.enabled = true,
-      super.key});
+      super.key,});
 
   final List<ModelAction> actions;
   final Color? triggerIconColor;
@@ -50,11 +50,11 @@ class ActionPopUpMenuButton extends StatelessWidget {
               highlightColor: Colors.transparent,
               hoverColor: Colors.transparent,
             ),
-            child: popupMenu);
+            child: popupMenu,);
       }
 
       return widget;
-    });
+    },);
   }
 
   Widget _buildPopupMenu(BuildContext context, Set<WidgetState> state) {
@@ -65,7 +65,7 @@ class ActionPopUpMenuButton extends StatelessWidget {
     final triggerIcon = (orientation == Axis.vertical) ? Icons.more_vert_rounded : Icons.more_horiz_rounded;
 
     return PopupMenuButton(
-        icon: Icon(triggerIcon, size: triggerIconSize, color: (isHovered) ? iconColorHover : iconColorDefault),
+        icon: Icon(triggerIcon, size: triggerIconSize, color: isHovered ? iconColorHover : iconColorDefault),
         enabled: enabled,
         elevation: elevation,
         splashRadius: splashRadius,
@@ -77,19 +77,19 @@ class ActionPopUpMenuButton extends StatelessWidget {
             return PopupMenuItem(
               value: action,
               child: ListTile(
-                contentPadding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 0),
+                contentPadding: const EdgeInsets.symmetric(horizontal: 8.0),
                 horizontalTitleGap: 4.0,
                 leading: (action.icon == null)
                     ? const SizedBox.shrink()
                     : Icon(action.icon,
                         size: theme.iconTheme.size ?? 14.0,
-                        color: action.isDestructive ? Colors.red : iconColorDefault),
+                        color: action.isDestructive ? Colors.red : iconColorDefault,),
                 title: action.isDestructive
                     ? Text(action.label, style: textTheme.copyWith(color: Colors.red))
                     : Text(action.label, style: textTheme),
               ),
             );
           }).toList();
-        });
+        },);
   }
 }
diff --git a/designer_v2/lib/common_views/badge.dart b/designer_v2/lib/common_views/badge.dart
index 547e2720a..de46b62d3 100644
--- a/designer_v2/lib/common_views/badge.dart
+++ b/designer_v2/lib/common_views/badge.dart
@@ -47,16 +47,13 @@ class Badge extends StatelessWidget {
           padding: padding,
           child: Row(
             mainAxisAlignment: center ? MainAxisAlignment.center : MainAxisAlignment.start,
-            crossAxisAlignment: CrossAxisAlignment.center,
             children: [
-              (icon != null)
-                  ? Icon(
+              if (icon != null) Icon(
                       icon,
                       size: iconSize ?? ((theme.iconTheme.size ?? 14.0) * 0.8),
                       color: _getLabelColor(theme)?.faded(0.65),
-                    )
-                  : const SizedBox.shrink(),
-              (icon != null) ? const SizedBox(width: 8.0) : const SizedBox.shrink(),
+                    ) else const SizedBox.shrink(),
+              if (icon != null) const SizedBox(width: 8.0) else const SizedBox.shrink(),
               Expanded(
                   child: Text(
                 label,
@@ -70,12 +67,12 @@ class Badge extends StatelessWidget {
                       fontWeight: FontWeight.bold,
                     )
                     .merge(labelStyle),
-              )),
+              ),),
             ],
           ),
         ),
       ),
-    ));
+    ),);
   }
 
   Color? _getBackgroundColor(ThemeData theme) {
diff --git a/designer_v2/lib/common_views/banner.dart b/designer_v2/lib/common_views/banner.dart
index 4b072f78b..5a98ad01f 100644
--- a/designer_v2/lib/common_views/banner.dart
+++ b/designer_v2/lib/common_views/banner.dart
@@ -10,17 +10,18 @@ abstract class IWithBanner {
 enum BannerStyle { warning, info, error }
 
 class BannerBox extends StatefulWidget {
-  const BannerBox(
-      {required this.body,
-      required this.style,
-      this.padding = const EdgeInsets.symmetric(vertical: 18.0, horizontal: 48.0),
-      this.prefixIcon,
-      this.noPrefix = false,
-      this.isDismissed,
-      this.dismissable = true,
-      this.onDismissed,
-      this.dismissIconSize = 24.0,
-      super.key});
+  const BannerBox({
+    required this.body,
+    required this.style,
+    this.padding = const EdgeInsets.symmetric(vertical: 18.0, horizontal: 48.0),
+    this.prefixIcon,
+    this.noPrefix = false,
+    this.isDismissed,
+    this.dismissable = true,
+    this.onDismissed,
+    this.dismissIconSize = 24.0,
+    super.key,
+  });
 
   final Widget? prefixIcon;
   final Widget body;
@@ -73,26 +74,31 @@ class _BannerBoxState extends State<BannerBox> {
           child: Row(
             children: [
               Expanded(
-                  child: Wrap(
-                crossAxisAlignment: WrapCrossAlignment.center,
-                children: [
-                  (widget.noPrefix) ? const SizedBox.shrink() : icon,
-                  (widget.noPrefix) ? const SizedBox.shrink() : const SizedBox(width: 24.0),
-                  Opacity(
-                    opacity: 0.85,
-                    child: widget.body,
-                  ),
-                ],
-              )),
+                child: Wrap(
+                  crossAxisAlignment: WrapCrossAlignment.center,
+                  children: [
+                    if (widget.noPrefix) const SizedBox.shrink() else icon,
+                    if (widget.noPrefix)
+                      const SizedBox.shrink()
+                    else
+                      const SizedBox(width: 24.0),
+                    Opacity(
+                      opacity: 0.85,
+                      child: widget.body,
+                    ),
+                  ],
+                ),
+              ),
               SizedBox(
                 height: double.infinity,
                 child: Opacity(
                   opacity: 0.5,
                   child: IconButton(
-                    icon: Icon(Icons.close_rounded, size: widget.dismissIconSize),
+                    icon:
+                        Icon(Icons.close_rounded, size: widget.dismissIconSize),
                     splashRadius: widget.dismissIconSize,
                     onPressed: () => setState(() {
-                      if (widget.onDismissed != null) widget.onDismissed!();
+                      widget.onDismissed?.call();
                       isDismissed = true;
                     }),
                   ),
diff --git a/designer_v2/lib/common_views/collapse.dart b/designer_v2/lib/common_views/collapse.dart
index 76627f837..d1940047f 100644
--- a/designer_v2/lib/common_views/collapse.dart
+++ b/designer_v2/lib/common_views/collapse.dart
@@ -3,7 +3,7 @@ import 'package:studyu_designer_v2/common_views/form_table_layout.dart';
 import 'package:studyu_designer_v2/common_views/mouse_events.dart';
 import 'package:studyu_designer_v2/common_views/utils.dart';
 
-import '../theme.dart';
+import 'package:studyu_designer_v2/theme.dart';
 
 typedef CollapsibleSectionBuilder = Widget Function(BuildContext context, bool isCollapsed);
 
@@ -22,7 +22,7 @@ class Collapsible extends StatefulWidget {
     this.maintainState = true,
     super.key,
   }) : assert((headerBuilder != null && title == null) || (headerBuilder == null && title != null),
-            "Must provide either headerBuilder or title");
+            "Must provide either headerBuilder or title",);
 
   final CollapsibleSectionBuilder contentBuilder;
   final CollapsibleSectionBuilder? headerBuilder;
@@ -57,7 +57,7 @@ class _CollapsibleState extends State<Collapsible> {
               child: Row(
                 children: [
                   FormLabel(
-                    labelText: widget.title!,
+                    labelText: widget.title,
                     //labelTextStyle: TextStyle(color: actualColor),
                   ),
                   const SizedBox(width: 4.0),
@@ -80,7 +80,7 @@ class _CollapsibleState extends State<Collapsible> {
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         headerWidget,
-        !isCollapsed ? contentWidget : const SizedBox.shrink(),
+        if (!isCollapsed) contentWidget else const SizedBox.shrink(),
       ],
     );
   }
diff --git a/designer_v2/lib/common_views/constrained_flexible.dart b/designer_v2/lib/common_views/constrained_flexible.dart
index fcec8cdac..0441f9033 100644
--- a/designer_v2/lib/common_views/constrained_flexible.dart
+++ b/designer_v2/lib/common_views/constrained_flexible.dart
@@ -10,7 +10,7 @@ class ConstrainedWidthFlexible extends StatelessWidget {
       required this.flexSum,
       required this.outerConstraints,
       required this.child,
-      super.key});
+      super.key,});
 
   final double minWidth;
   final double maxWidth;
diff --git a/designer_v2/lib/common_views/dialog.dart b/designer_v2/lib/common_views/dialog.dart
index 431fa4500..579200342 100644
--- a/designer_v2/lib/common_views/dialog.dart
+++ b/designer_v2/lib/common_views/dialog.dart
@@ -63,10 +63,9 @@ class StandardDialog extends StatelessWidget {
           boxShadow: [
             BoxShadow(
               color: theme.shadowColor,
-              spreadRadius: 0,
               blurRadius: 3,
               offset: const Offset(1, 1),
-            )
+            ),
           ],
         ),
         child: Container(
@@ -94,8 +93,8 @@ class StandardDialog extends StatelessWidget {
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    (titleWidget != null) ? titleWidget : const SizedBox.shrink(),
-                    (titleWidget != null) ? SizedBox(height: padding.top * 2 / 3) : const SizedBox.shrink(),
+                    if (titleWidget != null) titleWidget else const SizedBox.shrink(),
+                    if (titleWidget != null) SizedBox(height: padding.top * 2 / 3) else const SizedBox.shrink(),
                     Expanded(
                       child: SingleChildScrollView(child: body),
                     ),
diff --git a/designer_v2/lib/common_views/empty_body.dart b/designer_v2/lib/common_views/empty_body.dart
index bff2fd096..75fb3a296 100644
--- a/designer_v2/lib/common_views/empty_body.dart
+++ b/designer_v2/lib/common_views/empty_body.dart
@@ -26,40 +26,50 @@ class EmptyBody extends StatelessWidget {
       child: Column(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
-          (leading != null) ? leading! : const SizedBox.shrink(),
-          (leading != null) ? SizedBox(height: leadingSpacing!) : const SizedBox.shrink(),
-          (icon != null)
-              ? Padding(
-                  padding: const EdgeInsets.only(bottom: 0.0),
-                  child: Icon(
-                    icon,
-                    size: 96.0,
-                    color: theme.colorScheme.secondary,
-                  ))
-              : const SizedBox.shrink(),
-          (title != null)
-              ? Padding(
-                  padding: const EdgeInsets.symmetric(vertical: 6.0),
-                  child: SelectableText(
-                    title!,
-                    textAlign: TextAlign.center,
-                    style: theme.textTheme.headlineMedium,
-                  ),
-                )
-              : const SizedBox.shrink(),
-          (description != null)
-              ? SelectableText(description!,
-                  textAlign: TextAlign.center,
-                  style: theme.textTheme.bodyMedium?.copyWith(
-                    color: theme.textTheme.bodyMedium?.color?.faded(0.9),
-                  ))
-              : const SizedBox.shrink(),
-          (button != null)
-              ? Padding(
-                  padding: const EdgeInsets.fromLTRB(0, 20.0, 0, 16.0),
-                  child: button,
-                )
-              : const SizedBox.shrink(),
+          if (leading != null) leading! else const SizedBox.shrink(),
+          if (leading != null)
+            SizedBox(height: leadingSpacing)
+          else
+            const SizedBox.shrink(),
+          if (icon != null)
+            Padding(
+              padding: EdgeInsets.zero,
+              child: Icon(
+                icon,
+                size: 96.0,
+                color: theme.colorScheme.secondary,
+              ),
+            )
+          else
+            const SizedBox.shrink(),
+          if (title != null)
+            Padding(
+              padding: const EdgeInsets.symmetric(vertical: 6.0),
+              child: SelectableText(
+                title!,
+                textAlign: TextAlign.center,
+                style: theme.textTheme.headlineMedium,
+              ),
+            )
+          else
+            const SizedBox.shrink(),
+          if (description != null)
+            SelectableText(
+              description!,
+              textAlign: TextAlign.center,
+              style: theme.textTheme.bodyMedium?.copyWith(
+                color: theme.textTheme.bodyMedium?.color?.faded(0.9),
+              ),
+            )
+          else
+            const SizedBox.shrink(),
+          if (button != null)
+            Padding(
+              padding: const EdgeInsets.fromLTRB(0, 20.0, 0, 16.0),
+              child: button,
+            )
+          else
+            const SizedBox.shrink(),
         ],
       ),
     );
diff --git a/designer_v2/lib/common_views/form_buttons.dart b/designer_v2/lib/common_views/form_buttons.dart
index d859da87b..fdcb9a72b 100644
--- a/designer_v2/lib/common_views/form_buttons.dart
+++ b/designer_v2/lib/common_views/form_buttons.dart
@@ -46,7 +46,7 @@ class DismissButton extends StatelessWidget {
               Navigator.maybePop(context);
             }
           },
-        ));
+        ),);
   }
 }
 
@@ -56,8 +56,8 @@ List<Widget> buildFormButtons(FormViewModel formViewModel, FormMode formMode) {
         builder: (context, form, child) {
       return retainSizeInAppBar(DismissButton(
         onPressed: () => formViewModel.cancel().then((_) => Navigator.maybePop(context)),
-      ));
-    }),
+      ),);
+    },),
     ReactiveFormConsumer(// enable re-rendering based on form validation status
         builder: (context, form, child) {
       return retainSizeInAppBar(PrimaryButton(
@@ -68,9 +68,9 @@ List<Widget> buildFormButtons(FormViewModel formViewModel, FormMode formMode) {
         onPressedFuture: (formViewModel.isValid) ? () => formViewModel.save().then(
             // Close the form (side sheet or scaffold route) if future
             // completed successfully
-            (value) => Navigator.maybePop(context)) : null,
-      ));
-    }),
+            (value) => Navigator.maybePop(context),) : null,
+      ),);
+    },),
   ];
   final readonlyActionButtons = [
     ReactiveFormConsumer(// enable re-rendering based on form validation status
@@ -78,8 +78,8 @@ List<Widget> buildFormButtons(FormViewModel formViewModel, FormMode formMode) {
       return retainSizeInAppBar(DismissButton(
         text: tr.dialog_close,
         onPressed: () => Navigator.maybePop(context),
-      ));
-    }),
+      ),);
+    },),
   ];
 
   final defaultActionButtons = {
diff --git a/designer_v2/lib/common_views/form_consumer_widget.dart b/designer_v2/lib/common_views/form_consumer_widget.dart
index 02e5dfa7a..82319ac42 100644
--- a/designer_v2/lib/common_views/form_consumer_widget.dart
+++ b/designer_v2/lib/common_views/form_consumer_widget.dart
@@ -35,7 +35,7 @@ class _FormConsumerWidgetState extends State<FormConsumerWidget> {
   Widget build(BuildContext context) {
     return ReactiveFormConsumer(builder: (context, form, _) {
       return widget.build(context, form);
-    });
+    },);
   }
 }
 
@@ -55,6 +55,6 @@ class _FormConsumerRefWidgetState extends ConsumerState<FormConsumerRefWidget> {
   Widget build(BuildContext context) {
     return ReactiveFormConsumer(builder: (context, form, _) {
       return widget.build(context, form, ref);
-    });
+    },);
   }
 }
diff --git a/designer_v2/lib/common_views/form_control_label.dart b/designer_v2/lib/common_views/form_control_label.dart
index f8aa37554..38d9d2f4b 100644
--- a/designer_v2/lib/common_views/form_control_label.dart
+++ b/designer_v2/lib/common_views/form_control_label.dart
@@ -2,16 +2,19 @@ import 'package:flutter/material.dart';
 import 'package:reactive_forms/reactive_forms.dart';
 import 'package:studyu_designer_v2/common_views/mouse_events.dart';
 
-typedef FormControlVoidCallback<T> = void Function(AbstractControl<T> formControl);
+typedef FormControlVoidCallback<T> = void Function(
+  AbstractControl<T> formControl,
+);
 
 class FormControlLabel extends StatelessWidget {
-  const FormControlLabel(
-      {required this.formControl,
-      required this.text,
-      this.textStyle,
-      this.isClickable = true,
-      this.onClick,
-      super.key});
+  const FormControlLabel({
+    required this.formControl,
+    required this.text,
+    this.textStyle,
+    this.isClickable = true,
+    this.onClick,
+    super.key,
+  });
 
   final AbstractControl<dynamic> formControl;
   final String text;
@@ -22,13 +25,16 @@ class FormControlLabel extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final stateColorStyle = (formControl.disabled) ? TextStyle(color: theme.disabledColor) : null;
+    final stateColorStyle =
+        (formControl.disabled) ? TextStyle(color: theme.disabledColor) : null;
 
     return MouseEventsRegion(
       builder: (context, states) {
         return Text(
           text,
-          style: theme.textTheme.bodySmall?.merge(textStyle).merge(stateColorStyle),
+          style: theme.textTheme.bodySmall
+              ?.merge(textStyle)
+              .merge(stateColorStyle),
           overflow: TextOverflow.clip,
         );
       },
@@ -40,7 +46,8 @@ class FormControlLabel extends StatelessWidget {
               } else {
                 if (formControl is AbstractControl<bool>) {
                   // Auto-toggle boolean controls
-                  formControl.value = (formControl.value != null) ? !(formControl.value!) : true;
+                  formControl.value =
+                      formControl.value == null || !(formControl.value as bool);
                   formControl.markAsDirty();
                 } else {
                   // Otherwise just focus the control
diff --git a/designer_v2/lib/common_views/form_scaffold.dart b/designer_v2/lib/common_views/form_scaffold.dart
index 279ffd02f..7d8e09bb6 100644
--- a/designer_v2/lib/common_views/form_scaffold.dart
+++ b/designer_v2/lib/common_views/form_scaffold.dart
@@ -10,21 +10,24 @@ import 'package:studyu_designer_v2/theme.dart';
 
 /// Signature for a builder that renders the widget corresponding to the
 /// [FormViewModel] of type [T]
-typedef FormViewBuilder<T extends FormViewModel> = Widget Function(T formViewModel);
+typedef FormViewBuilder<T extends FormViewModel> = Widget Function(
+    T formViewModel,);
 
 /// Signature for a builder that resolves the [FormViewModel] of type [T]
 /// via a Riverpod [WidgetRef]
-typedef FormViewModelBuilder<T extends FormViewModel> = T Function(WidgetRef ref);
+typedef FormViewModelBuilder<T extends FormViewModel> = T Function(
+    WidgetRef ref,);
 
 class FormScaffold<T extends FormViewModel> extends ConsumerStatefulWidget {
-  const FormScaffold(
-      {required this.formViewModel,
-      required this.body,
-      this.actions,
-      this.drawer,
-      this.actionsSpacing = 8.0,
-      this.actionsPadding = 24.0,
-      super.key});
+  const FormScaffold({
+    required this.formViewModel,
+    required this.body,
+    this.actions,
+    this.drawer,
+    this.actionsSpacing = 8.0,
+    this.actionsPadding = 24.0,
+    super.key,
+  });
 
   final T formViewModel;
   final List<Widget>? actions;
@@ -37,7 +40,8 @@ class FormScaffold<T extends FormViewModel> extends ConsumerStatefulWidget {
   ConsumerState<FormScaffold<T>> createState() => _FormScaffoldState();
 }
 
-class _FormScaffoldState<T extends FormViewModel> extends ConsumerState<FormScaffold<T>> implements PopEntry {
+class _FormScaffoldState<T extends FormViewModel>
+    extends ConsumerState<FormScaffold<T>> implements PopEntry {
   T get formViewModel => widget.formViewModel;
 
   ModalRoute<dynamic>? _route;
@@ -87,36 +91,41 @@ class _FormScaffoldState<T extends FormViewModel> extends ConsumerState<FormScaf
 
   @override
   Widget build(BuildContext context) {
-    final defaultActionButtons = buildFormButtons(formViewModel, formViewModel.formMode);
+    final defaultActionButtons =
+        buildFormButtons(formViewModel, formViewModel.formMode);
 
     // Wraps the whole side sheet in a [ReactiveForm] widget
     Widget inForm(widget) {
       return ReactiveForm(
         formGroup: formViewModel.form,
-        child: widget,
+        child: widget as Widget,
       );
     }
 
     final theme = Theme.of(context);
 
-    return inForm(Scaffold(
-      appBar: AppBar(
-        iconTheme: theme.iconTheme,
-        // TODO: enable async title here
-        title: Text(formViewModel.title,
+    return inForm(
+      Scaffold(
+        appBar: AppBar(
+          iconTheme: theme.iconTheme,
+          // TODO: enable async title here
+          title: Text(
+            formViewModel.title,
             maxLines: 1,
             style: Theme.of(context).textTheme.titleSmall,
             overflow: TextOverflow.ellipsis,
-            softWrap: false),
-        actions: withSpacing(
-          widget.actions ?? defaultActionButtons,
-          spacing: widget.actionsSpacing,
-          paddingStart: widget.actionsPadding,
-          paddingEnd: widget.actionsPadding,
+            softWrap: false,
+          ),
+          actions: withSpacing(
+            widget.actions ?? defaultActionButtons,
+            spacing: widget.actionsSpacing,
+            paddingStart: widget.actionsPadding,
+            paddingEnd: widget.actionsPadding,
+          ),
         ),
+        body: widget.body,
+        drawer: widget.drawer,
       ),
-      body: widget.body,
-      drawer: widget.drawer,
-    ));
+    );
   }
 }
diff --git a/designer_v2/lib/common_views/form_table_layout.dart b/designer_v2/lib/common_views/form_table_layout.dart
index fb6c5a86e..12a1ccafa 100644
--- a/designer_v2/lib/common_views/form_table_layout.dart
+++ b/designer_v2/lib/common_views/form_table_layout.dart
@@ -65,7 +65,7 @@ class FormTableLayout extends StatelessWidget {
           ? row.labelBuilder!(context)
           : Wrap(
               children: [
-                (actualRowLayout == FormTableRowLayout.vertical) ? const SizedBox(width: 2.0) : const SizedBox.shrink(),
+                if (actualRowLayout == FormTableRowLayout.vertical) const SizedBox(width: 2.0) else const SizedBox.shrink(),
                 FormLabel(
                   labelText: row.label,
                   helpText: row.labelHelpText,
@@ -117,7 +117,7 @@ class FormTableLayout extends StatelessWidget {
                   ),
                 ],
               ),
-            )
+            ),
           ],
         );
       }
@@ -176,7 +176,7 @@ class FormSectionHeader extends StatelessWidget {
             0: IntrinsicColumnWidth(),
           },
         ),
-        (divider) ? const Divider() : const SizedBox.shrink(),
+        if (divider) const Divider() else const SizedBox.shrink(),
       ],
     );
   }
@@ -200,22 +200,16 @@ class FormLabel extends StatelessWidget {
   Widget build(BuildContext context) {
     return Wrap(
       children: [
-        (labelText != null && layout == FormTableRowLayout.vertical)
-            ? const SizedBox(width: 2.0)
-            : const SizedBox.shrink(),
-        (labelText != null)
-            ? Text(
+        if (labelText != null && layout == FormTableRowLayout.vertical) const SizedBox(width: 2.0) else const SizedBox.shrink(),
+        if (labelText != null) Text(
                 labelText!,
                 style: Theme.of(context).textTheme.bodySmall?.merge(labelTextStyle),
-              )
-            : const SizedBox.shrink(),
-        (helpText != null) ? const SizedBox(width: 8.0) : const SizedBox.shrink(),
-        (helpText != null)
-            ? Padding(
+              ) else const SizedBox.shrink(),
+        if (helpText != null) const SizedBox(width: 8.0) else const SizedBox.shrink(),
+        if (helpText != null) Padding(
                 padding: const EdgeInsets.only(top: 2.0),
                 child: HelpIcon(tooltipText: helpText),
-              )
-            : const SizedBox.shrink(),
+              ) else const SizedBox.shrink(),
       ],
     );
   }
diff --git a/designer_v2/lib/common_views/icon_picker.dart b/designer_v2/lib/common_views/icon_picker.dart
index e154e8bf9..f79621a7e 100644
--- a/designer_v2/lib/common_views/icon_picker.dart
+++ b/designer_v2/lib/common_views/icon_picker.dart
@@ -27,7 +27,10 @@ class IconPack {
     return iconOptions;
   }();
 
-  static IconOption? resolveIconByName(String? name, {List<IconOption>? iconPack}) {
+  static IconOption? resolveIconByName(
+    String? name, {
+    List<IconOption>? iconPack,
+  }) {
     iconPack ??= IconPack.defaultPack;
     if (name == null || name.isEmpty) {
       return null;
@@ -48,14 +51,15 @@ class IconOption extends Equatable {
   List<Object?> get props => [name];
 
   String toJson() => name;
-  static IconOption fromJson(String json) => IconOption(json);
+  IconOption fromJson(String json) => IconOption(json);
 }
 
-class ReactiveIconPicker extends ReactiveFocusableFormField<IconOption, IconOption> {
+class ReactiveIconPicker
+    extends ReactiveFocusableFormField<IconOption, IconOption> {
   ReactiveIconPicker({
-    required iconOptions,
-    selectedIconSize = 20.0,
-    galleryIconSize = 28.0,
+    required List<IconOption> iconOptions,
+    double? selectedIconSize = 20.0,
+    double? galleryIconSize = 28.0,
     bool readOnly = false,
     ReactiveFormFieldCallback<IconOption>? onSelect,
     super.formControl,
@@ -64,11 +68,12 @@ class ReactiveIconPicker extends ReactiveFocusableFormField<IconOption, IconOpti
     super.validationMessages,
     super.focusNode,
     super.key,
-  }) : super(builder: (ReactiveFormFieldState<IconOption, IconOption> field) {
-          // Unsupported: showErrors, validationMessages
-          final isDisabled = readOnly || field.control.disabled;
+  }) : super(
+          builder: (ReactiveFormFieldState<IconOption, IconOption> field) {
+            // Unsupported: showErrors, validationMessages
+            final isDisabled = readOnly || field.control.disabled;
 
-          return IconPicker(
+            return IconPicker(
               iconOptions: iconOptions,
               isDisabled: isDisabled,
               focusNode: focusNode,
@@ -79,8 +84,10 @@ class ReactiveIconPicker extends ReactiveFocusableFormField<IconOption, IconOpti
                 if (isDisabled) return;
                 field.didChange(iconOption);
                 onSelect?.call(field.control);
-              });
-        });
+              },
+            );
+          },
+        );
 }
 
 class IconPicker extends StatelessWidget {
@@ -121,15 +128,16 @@ class IconPicker extends StatelessWidget {
 }
 
 class IconPickerField extends StatelessWidget {
-  const IconPickerField(
-      {required this.iconOptions,
-      this.selectedOption,
-      this.selectedIconSize,
-      this.galleryIconSize,
-      this.onSelect,
-      this.isDisabled = false,
-      this.focusNode,
-      super.key});
+  const IconPickerField({
+    required this.iconOptions,
+    this.selectedOption,
+    this.selectedIconSize,
+    this.galleryIconSize,
+    this.onSelect,
+    this.isDisabled = false,
+    this.focusNode,
+    super.key,
+  });
 
   final List<IconOption> iconOptions;
 
@@ -144,25 +152,36 @@ class IconPickerField extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final actualGalleryIconSize = galleryIconSize ?? Theme.of(context).iconTheme.size ?? 24.0;
-    final actualSelectedIconSize = selectedIconSize ?? Theme.of(context).iconTheme.size ?? 16.0;
-
-    openIconPicker() => showIconPickerDialog(context,
-        iconOptions: iconOptions, galleryIconSize: actualGalleryIconSize, onSelect: onSelect);
+    final actualGalleryIconSize =
+        galleryIconSize ?? Theme.of(context).iconTheme.size ?? 24.0;
+    final actualSelectedIconSize =
+        selectedIconSize ?? Theme.of(context).iconTheme.size ?? 16.0;
+
+    Future<void> openIconPicker() => showIconPickerDialog(
+          context,
+          iconOptions: iconOptions,
+          galleryIconSize: actualGalleryIconSize,
+          onSelect: onSelect,
+        );
 
     if (selectedOption != null && !selectedOption!.isEmpty) {
-      final selectedIcon =
-          selectedOption?.icon ?? IconPack.resolveIconByName(selectedOption!.name, iconPack: iconOptions)!.icon;
+      final selectedIcon = selectedOption?.icon ??
+          IconPack.resolveIconByName(
+            selectedOption!.name,
+            iconPack: iconOptions,
+          )!
+              .icon;
       return IconButton(
-          tooltip: tr.iconpicker_nonempty_prompt,
-          splashRadius: actualSelectedIconSize,
-          onPressed: (isDisabled) ? null : openIconPicker,
-          focusNode: focusNode,
-          icon: Icon(selectedIcon, size: actualSelectedIconSize));
+        tooltip: tr.iconpicker_nonempty_prompt,
+        splashRadius: actualSelectedIconSize,
+        onPressed: isDisabled ? null : openIconPicker,
+        focusNode: focusNode,
+        icon: Icon(selectedIcon, size: actualSelectedIconSize),
+      );
     }
 
     return TextButton(
-      onPressed: (isDisabled) ? null : openIconPicker,
+      onPressed: isDisabled ? null : openIconPicker,
       focusNode: focusNode,
       child: Text(tr.iconpicker_empty_prompt),
     );
@@ -170,7 +189,12 @@ class IconPickerField extends StatelessWidget {
 }
 
 class IconPickerGallery extends StatelessWidget {
-  const IconPickerGallery({required this.iconOptions, required this.iconSize, this.onSelect, super.key});
+  const IconPickerGallery({
+    required this.iconOptions,
+    required this.iconSize,
+    this.onSelect,
+    super.key,
+  });
 
   final List<IconOption> iconOptions;
   final VoidCallbackOn<IconOption>? onSelect;
@@ -181,24 +205,28 @@ class IconPickerGallery extends StatelessWidget {
     final List<Widget> iconWidgets = [];
     for (final iconOption in iconOptions) {
       final iconWidget = MouseEventsRegion(
-          builder: (context, state) {
-            final isHovered = state.contains(WidgetState.hovered);
-            return Container(
-              color: isHovered ? Theme.of(context).colorScheme.primary.withOpacity(0.2) : null,
-              child: Icon(iconOption.icon!, size: iconSize),
-            );
-          },
-          onTap: () => Navigator.pop(context, iconOption));
+        builder: (context, state) {
+          final isHovered = state.contains(WidgetState.hovered);
+          return Container(
+            color: isHovered
+                ? Theme.of(context).colorScheme.primary.withOpacity(0.2)
+                : null,
+            child: Icon(iconOption.icon, size: iconSize),
+          );
+        },
+        onTap: () => Navigator.pop(context, iconOption),
+      );
       iconWidgets.add(iconWidget);
     }
 
     return GridView.extent(
-        primary: false,
-        maxCrossAxisExtent: iconSize * 2,
-        crossAxisSpacing: 4.0,
-        mainAxisSpacing: 4.0,
-        //padding: const EdgeInsets.all(12.0),
-        children: iconWidgets);
+      primary: false,
+      maxCrossAxisExtent: iconSize * 2,
+      crossAxisSpacing: 4.0,
+      mainAxisSpacing: 4.0,
+      //padding: const EdgeInsets.all(12.0),
+      children: iconWidgets,
+    );
   }
 }
 
@@ -207,10 +235,10 @@ Future<void> showIconPickerDialog(
   required List<IconOption> iconOptions,
   double? galleryIconSize,
   VoidCallbackOn<IconOption>? onSelect,
-  minWidth = 300,
-  minHeight = 300,
+  double minWidth = 300,
+  double minHeight = 300,
 }) async {
-  IconOption? iconPicked = await showDialog(
+  final IconOption? iconPicked = await showDialog(
     context: context,
     builder: (BuildContext context) {
       final theme = Theme.of(context);
@@ -218,18 +246,22 @@ Future<void> showIconPickerDialog(
       final dialogHeight = MediaQuery.of(context).size.height * 0.4;
 
       return StandardDialog(
-          body: SizedBox(
-            width: max(dialogWidth, minWidth),
-            height: max(dialogHeight, minHeight),
-            child: IconPickerGallery(iconOptions: iconOptions, iconSize: galleryIconSize ?? 48.0),
+        body: SizedBox(
+          width: max(dialogWidth, minWidth),
+          height: max(dialogHeight, minHeight),
+          child: IconPickerGallery(
+            iconOptions: iconOptions,
+            iconSize: galleryIconSize ?? 48.0,
+          ),
+        ),
+        title: SelectableText(
+          tr.iconpicker_dialog_title,
+          style: theme.textTheme.headlineSmall?.copyWith(
+            fontWeight: FontWeight.normal,
+            color: theme.colorScheme.onPrimaryContainer,
           ),
-          title: SelectableText(
-            tr.iconpicker_dialog_title,
-            style: theme.textTheme.headlineSmall?.copyWith(
-              fontWeight: FontWeight.normal,
-              color: theme.colorScheme.onPrimaryContainer,
-            ),
-          ));
+        ),
+      );
     },
   );
 
diff --git a/designer_v2/lib/common_views/layout_single_column.dart b/designer_v2/lib/common_views/layout_single_column.dart
index 62b68d5af..43317d269 100644
--- a/designer_v2/lib/common_views/layout_single_column.dart
+++ b/designer_v2/lib/common_views/layout_single_column.dart
@@ -1,4 +1,5 @@
 import 'dart:math';
+
 import 'package:flutter/material.dart';
 import 'package:studyu_designer_v2/common_views/layout_two_column.dart';
 import 'package:studyu_designer_v2/theme.dart';
@@ -38,11 +39,11 @@ class SingleColumnLayout extends StatefulWidget {
   final bool scroll;
   final EdgeInsets? padding;
 
-  static fromType({
+  factory SingleColumnLayout.fromType({
     required SingleColumnLayoutType type,
     required Widget body,
     required BuildContext context,
-    stickyHeader = false,
+    bool stickyHeader = false,
     Widget? header,
   }) {
     switch (type) {
@@ -75,7 +76,6 @@ class SingleColumnLayout extends StatefulWidget {
           body: body,
           header: header,
           stickyHeader: stickyHeader,
-          constraints: defaultConstraints,
         );
       case SingleColumnLayoutType.boundedNarrow:
         return SingleColumnLayout(
@@ -126,7 +126,8 @@ class _SingleColumnLayoutState extends State<SingleColumnLayout> {
       return Scrollbar(
         thumbVisibility: true,
         controller: _scrollController,
-        child: SingleChildScrollView(controller: _scrollController, child: child),
+        child:
+            SingleChildScrollView(controller: _scrollController, child: child),
       );
     }
 
@@ -136,7 +137,6 @@ class _SingleColumnLayoutState extends State<SingleColumnLayout> {
       }
       if (widget.header != null) {
         body = Column(
-          mainAxisAlignment: MainAxisAlignment.start,
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
             widget.header!,
@@ -150,7 +150,6 @@ class _SingleColumnLayoutState extends State<SingleColumnLayout> {
       // non-sticky header
       if (widget.header != null) {
         body = Column(
-          mainAxisAlignment: MainAxisAlignment.start,
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
             widget.header!,
diff --git a/designer_v2/lib/common_views/layout_two_column.dart b/designer_v2/lib/common_views/layout_two_column.dart
index 9d2d854a4..9fb86c0d6 100644
--- a/designer_v2/lib/common_views/layout_two_column.dart
+++ b/designer_v2/lib/common_views/layout_two_column.dart
@@ -8,7 +8,8 @@ class TwoColumnLayout extends StatefulWidget {
     this.headerWidget,
     this.dividerWidget = defaultDivider,
     this.flexLeft,
-    this.flexRight = 1, // expand right column to fill available space by default
+    this.flexRight =
+        1, // expand right column to fill available space by default
     this.constraintsLeft,
     this.constraintsRight,
     this.scrollLeft = true,
@@ -69,8 +70,8 @@ class TwoColumnLayout extends StatefulWidget {
     BoxConstraints? constraintsRight,
     bool scrollLeft = true,
     bool scrollRight = true,
-    final EdgeInsets? paddingLeft = TwoColumnLayout.defaultContentPadding,
-    final EdgeInsets? paddingRight = TwoColumnLayout.defaultContentPadding,
+    EdgeInsets? paddingLeft = TwoColumnLayout.defaultContentPadding,
+    EdgeInsets? paddingRight = TwoColumnLayout.defaultContentPadding,
   }) {
     return TwoColumnLayout(
       leftWidget: leftWidget,
@@ -112,101 +113,107 @@ class _TwoColumnLayoutState extends State<TwoColumnLayout> {
     }
 
     if (widget.backgroundColorLeft != null) {
-      leftWidget = Material(color: widget.backgroundColorLeft, child: leftWidget);
+      leftWidget =
+          Material(color: widget.backgroundColorLeft, child: leftWidget);
     }
     if (widget.backgroundColorRight != null) {
-      rightWidget = Material(color: widget.backgroundColorRight, child: rightWidget);
+      rightWidget =
+          Material(color: widget.backgroundColorRight, child: rightWidget);
     }
 
-    return LayoutBuilder(builder: (context, constraints) {
-      if (widget.stretchHeight) {
-        leftWidget = SizedBox(
-          height: constraints.maxHeight,
-          child: leftWidget,
-        );
-        rightWidget = SizedBox(
-          height: constraints.maxHeight,
-          child: rightWidget,
-        );
-      }
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        if (widget.stretchHeight) {
+          leftWidget = SizedBox(
+            height: constraints.maxHeight,
+            child: leftWidget,
+          );
+          rightWidget = SizedBox(
+            height: constraints.maxHeight,
+            child: rightWidget,
+          );
+        }
 
-      if (widget.scrollLeft) {
-        leftWidget = Scrollbar(
-          thumbVisibility: true,
-          controller: _scrollControllerLeft,
-          child: SingleChildScrollView(controller: _scrollControllerLeft, child: leftWidget),
-        );
-      }
-      if (widget.scrollRight) {
-        rightWidget = Scrollbar(
-          thumbVisibility: true,
-          controller: _scrollControllerRight,
-          child: SingleChildScrollView(controller: _scrollControllerRight, child: rightWidget),
-        );
-      }
+        if (widget.scrollLeft) {
+          leftWidget = Scrollbar(
+            thumbVisibility: true,
+            controller: _scrollControllerLeft,
+            child: SingleChildScrollView(
+                controller: _scrollControllerLeft, child: leftWidget,),
+          );
+        }
+        if (widget.scrollRight) {
+          rightWidget = Scrollbar(
+            thumbVisibility: true,
+            controller: _scrollControllerRight,
+            child: SingleChildScrollView(
+                controller: _scrollControllerRight, child: rightWidget,),
+          );
+        }
 
-      if (!(widget.constraintsLeft != null && widget.flexLeft != null)) {
-        if (widget.constraintsLeft != null) {
-          leftWidget = Container(constraints: widget.constraintsLeft!, child: leftWidget);
+        if (!(widget.constraintsLeft != null && widget.flexLeft != null)) {
+          if (widget.constraintsLeft != null) {
+            leftWidget = Container(
+                constraints: widget.constraintsLeft, child: leftWidget,);
+          }
+          if (widget.flexLeft != null) {
+            leftWidget = Flexible(flex: widget.flexLeft!, child: leftWidget);
+          }
         }
-        if (widget.flexLeft != null) {
-          leftWidget = Flexible(flex: widget.flexLeft!, child: leftWidget);
+
+        if (!(widget.constraintsRight != null && widget.flexRight != null)) {
+          if (widget.constraintsRight != null) {
+            rightWidget = Container(
+                constraints: widget.constraintsRight, child: rightWidget,);
+          }
+          if (widget.flexRight != null) {
+            rightWidget = Flexible(flex: widget.flexRight!, child: rightWidget);
+          }
         }
-      }
 
-      if (!(widget.constraintsRight != null && widget.flexRight != null)) {
-        if (widget.constraintsRight != null) {
-          rightWidget = Container(constraints: widget.constraintsRight!, child: rightWidget);
+        if (widget.constraintsLeft != null && widget.flexLeft != null) {
+          leftWidget = ConstrainedWidthFlexible(
+            minWidth: widget.constraintsLeft?.minWidth ?? double.infinity,
+            maxWidth: widget.constraintsLeft?.maxWidth ?? double.infinity,
+            flex: widget.flexLeft!,
+            flexSum: widget.flexLeft! + (widget.flexRight ?? 0),
+            outerConstraints: constraints,
+            child: leftWidget,
+          );
         }
-        if (widget.flexRight != null) {
-          rightWidget = Flexible(flex: widget.flexRight!, child: rightWidget);
+
+        if (widget.constraintsRight != null && widget.flexRight != null) {
+          rightWidget = ConstrainedWidthFlexible(
+            minWidth: widget.constraintsRight?.minWidth ?? double.infinity,
+            maxWidth: widget.constraintsRight?.maxWidth ?? double.infinity,
+            flex: widget.flexRight!,
+            flexSum: widget.flexRight! + (widget.flexLeft ?? 0),
+            outerConstraints: constraints,
+            child: rightWidget,
+          );
         }
-      }
-
-      if (widget.constraintsLeft != null && widget.flexLeft != null) {
-        leftWidget = ConstrainedWidthFlexible(
-          minWidth: widget.constraintsLeft?.minWidth ?? double.infinity,
-          maxWidth: widget.constraintsLeft?.maxWidth ?? double.infinity,
-          flex: widget.flexLeft!,
-          flexSum: widget.flexLeft! + (widget.flexRight ?? 0),
-          outerConstraints: constraints,
-          child: leftWidget,
-        );
-      }
-
-      if (widget.constraintsRight != null && widget.flexRight != null) {
-        rightWidget = ConstrainedWidthFlexible(
-          minWidth: widget.constraintsRight?.minWidth ?? double.infinity,
-          maxWidth: widget.constraintsRight?.maxWidth ?? double.infinity,
-          flex: widget.flexRight!,
-          flexSum: widget.flexRight! + (widget.flexLeft ?? 0),
-          outerConstraints: constraints,
-          child: rightWidget,
-        );
-      }
-
-      Widget body = Row(
-        mainAxisAlignment: MainAxisAlignment.start,
-        crossAxisAlignment: CrossAxisAlignment.stretch,
-        children: [
-          leftWidget,
-          widget.dividerWidget ?? const SizedBox.shrink(),
-          rightWidget,
-        ],
-      );
-
-      if (widget.headerWidget != null) {
-        body = Column(
-          mainAxisAlignment: MainAxisAlignment.start,
+
+        Widget body = Row(
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
-            widget.headerWidget!,
-            body,
+            leftWidget,
+            widget.dividerWidget ?? const SizedBox.shrink(),
+            rightWidget,
           ],
         );
-      }
 
-      return body;
-    });
+        if (widget.headerWidget != null) {
+          body = Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              widget.headerWidget!,
+              body,
+            ],
+          );
+        }
+
+        return body;
+      },
+    );
   }
 }
diff --git a/designer_v2/lib/common_views/mouse_events.dart b/designer_v2/lib/common_views/mouse_events.dart
index c5306de59..cbcdfcbe1 100644
--- a/designer_v2/lib/common_views/mouse_events.dart
+++ b/designer_v2/lib/common_views/mouse_events.dart
@@ -1,7 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
-typedef MouseEventsRegionBuilder = Widget Function(BuildContext context, Set<WidgetState> state);
+typedef MouseEventsRegionBuilder = Widget Function(
+    BuildContext context, Set<WidgetState> state);
 
 typedef MaterialStatesChangedCallback = void Function(Set<WidgetState> state);
 
@@ -9,16 +10,17 @@ typedef MaterialStatesChangedCallback = void Function(Set<WidgetState> state);
 /// for the widget it contains while exposing the current interaction state
 /// as a [WidgetInteractionState] to the child widget [builder]
 class MouseEventsRegion extends StatefulWidget {
-  const MouseEventsRegion(
-      {required this.builder,
-      this.onStateChanged,
-      this.onHover,
-      this.onTap,
-      this.onEnter,
-      this.onExit,
-      this.cursor = defaultCursor,
-      this.autoselectCursor = true,
-      super.key});
+  const MouseEventsRegion({
+    required this.builder,
+    this.onStateChanged,
+    this.onHover,
+    this.onTap,
+    this.onEnter,
+    this.onExit,
+    this.cursor = defaultCursor,
+    this.autoselectCursor = true,
+    super.key,
+  });
 
   final MouseEventsRegionBuilder builder;
   final MaterialStatesChangedCallback? onStateChanged;
@@ -50,9 +52,7 @@ class _MouseEventsRegionState extends State<MouseEventsRegion> {
   late final WidgetStatesController statesController;
 
   void handleStatesControllerChange() {
-    if (widget.onStateChanged != null) {
-      widget.onStateChanged!(statesController.value);
-    }
+    widget.onStateChanged?.call(statesController.value);
     // Force a rebuild to resolve MaterialStateProperty properties
     setState(() {});
   }
@@ -72,25 +72,20 @@ class _MouseEventsRegionState extends State<MouseEventsRegion> {
       onTapUp: (_) => statesController.update(WidgetState.pressed, false),
       onTapCancel: () => statesController.update(WidgetState.pressed, false),
       child: MouseRegion(
-          cursor: widget.autoCursor,
-          onHover: (e) {
-            if (widget.onHover != null) {
-              widget.onHover!(e);
-            }
-          },
-          onEnter: (e) {
-            statesController.update(WidgetState.hovered, true);
-            if (widget.onExit != null) {
-              widget.onEnter!(e);
-            }
-          },
-          onExit: (e) {
-            statesController.update(WidgetState.hovered, false);
-            if (widget.onExit != null) {
-              widget.onExit!(e);
-            }
-          },
-          child: widget.builder(context, statesController.value)),
+        cursor: widget.autoCursor,
+        onHover: (e) {
+          widget.onHover?.call(e);
+        },
+        onEnter: (e) {
+          statesController.update(WidgetState.hovered, true);
+          widget.onEnter?.call(e);
+        },
+        onExit: (e) {
+          statesController.update(WidgetState.hovered, false);
+          widget.onExit?.call(e);
+        },
+        child: widget.builder(context, statesController.value),
+      ),
     );
   }
 
diff --git a/designer_v2/lib/common_views/navbar_tabbed.dart b/designer_v2/lib/common_views/navbar_tabbed.dart
index 0e4a530e8..e54b77608 100644
--- a/designer_v2/lib/common_views/navbar_tabbed.dart
+++ b/designer_v2/lib/common_views/navbar_tabbed.dart
@@ -25,7 +25,10 @@ class NavbarTab {
   final bool enabled;
 }
 
-typedef OnTabSelectCallback<T extends NavbarTab> = void Function(int tabIdx, T tab);
+typedef OnTabSelectCallback<T extends NavbarTab> = void Function(
+  int tabIdx,
+  T tab,
+);
 
 class TabbedNavbar<T extends NavbarTab> extends ConsumerStatefulWidget {
   const TabbedNavbar({
@@ -64,10 +67,12 @@ class TabbedNavbar<T extends NavbarTab> extends ConsumerStatefulWidget {
   final Color? unselectedLabelColorHover;
 
   @override
-  ConsumerState<ConsumerStatefulWidget> createState() => _TabbedNavbarState<T>();
+  ConsumerState<ConsumerStatefulWidget> createState() =>
+      _TabbedNavbarState<T>();
 }
 
-class _TabbedNavbarState<T extends NavbarTab> extends ConsumerState<TabbedNavbar>
+class _TabbedNavbarState<T extends NavbarTab>
+    extends ConsumerState<TabbedNavbar>
     with TickerProviderStateMixin
     implements Listenable {
   /// A [TabController] that has its index synced to the currently selected
@@ -75,7 +80,8 @@ class _TabbedNavbarState<T extends NavbarTab> extends ConsumerState<TabbedNavbar
   /// via a router
   late final TabController _tabController;
 
-  late int _selectedTabIndex = widget.selectedTab?.index ?? _findFirstEnabledTabIndex();
+  late int _selectedTabIndex =
+      widget.selectedTab?.index ?? _findFirstEnabledTabIndex();
   int get selectedTabIndex => _selectedTabIndex;
   set selectedTabIndex(int idx) {
     final tab = widget.tabs[idx];
@@ -116,7 +122,7 @@ class _TabbedNavbarState<T extends NavbarTab> extends ConsumerState<TabbedNavbar
     }
   }
 
-  revalidateTabSelection() {
+  void revalidateTabSelection() {
     final currentIdx = selectedTabIndex;
     selectedTabIndex = currentIdx;
   }
@@ -173,16 +179,18 @@ class _TabbedNavbarState<T extends NavbarTab> extends ConsumerState<TabbedNavbar
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
 
-    decorateIfDisabled({required Widget tabContent, required T tab}) {
+    Widget decorateIfDisabled({required Widget tabContent, required T tab}) {
       if (tab.enabled) {
         return tabContent;
       }
       final disablePointerCursor = MouseEventsRegion(
         builder: (context, state) => tabContent,
-        cursor: SystemMouseCursors.basic,
       );
       if (widget.disabledTooltipText != null) {
-        return Tooltip(message: widget.disabledTooltipText!, child: disablePointerCursor);
+        return Tooltip(
+          message: widget.disabledTooltipText,
+          child: disablePointerCursor,
+        );
       }
       return disablePointerCursor;
     }
@@ -195,7 +203,7 @@ class _TabbedNavbarState<T extends NavbarTab> extends ConsumerState<TabbedNavbar
         labelPadding: widget.labelPadding,
         unselectedLabelColor: theme.colorScheme.onSurface.withOpacity(0.8),
         unselectedLabelStyle: theme.textTheme.labelLarge,
-        indicator: (widget.indicator ?? theme.tabBarTheme.indicator),
+        indicator: widget.indicator ?? theme.tabBarTheme.indicator,
         indicatorPadding: EdgeInsets.only(right: widget.labelSpacing ?? 0),
         indicatorSize: widget.indicatorSize,
         controller: _tabController,
@@ -213,9 +221,13 @@ class _TabbedNavbarState<T extends NavbarTab> extends ConsumerState<TabbedNavbar
     );
   }
 
-  Widget _buildTabContent(context, T t) {
+  Widget _buildTabContent(BuildContext context, T t) {
     final theme = Theme.of(context);
-    final indicatorHeight = (theme.tabBarTheme.indicator as BoxDecoration).border?.dimensions.vertical ?? 0.0;
+    final indicatorHeight = (theme.tabBarTheme.indicator! as BoxDecoration)
+            .border
+            ?.dimensions
+            .vertical ??
+        0.0;
 
     return Container(
       decoration: (!t.enabled)
@@ -231,30 +243,40 @@ class _TabbedNavbarState<T extends NavbarTab> extends ConsumerState<TabbedNavbar
               final isSelected = t.index == selectedTabIndex;
               final isHovered = states.contains(WidgetState.hovered);
 
-              TextStyle actualTextStyle = (isSelected)
-                  ? theme.tabBarTheme.labelStyle ?? TextStyle(color: theme.tabBarTheme.labelColor)
-                  : theme.tabBarTheme.unselectedLabelStyle ?? TextStyle(color: theme.tabBarTheme.unselectedLabelColor);
+              TextStyle actualTextStyle = isSelected
+                  ? theme.tabBarTheme.labelStyle ??
+                      TextStyle(color: theme.tabBarTheme.labelColor)
+                  : theme.tabBarTheme.unselectedLabelStyle ??
+                      TextStyle(color: theme.tabBarTheme.unselectedLabelColor);
 
-              final mergeColorStyle =
-                  TextStyle(color: (isSelected) ? widget.labelColorHover : widget.unselectedLabelColorHover);
-              actualTextStyle = (isHovered) ? actualTextStyle.merge(mergeColorStyle) : actualTextStyle;
+              final mergeColorStyle = TextStyle(
+                color: isSelected
+                    ? widget.labelColorHover
+                    : widget.unselectedLabelColorHover,
+              );
+              actualTextStyle = isHovered
+                  ? actualTextStyle.merge(mergeColorStyle)
+                  : actualTextStyle;
 
               return Align(
-                alignment: Alignment.center,
                 child: Text(
                   t.title,
-                  style: (!t.enabled) ? TextStyle(color: theme.disabledColor.faded(0.5)) : actualTextStyle,
+                  style: (!t.enabled)
+                      ? TextStyle(color: theme.disabledColor.faded(0.5))
+                      : actualTextStyle,
                 ),
               );
             },
             onTap: () => _onSelectTab(t.index), // pass through on-tap event
           ),
-          MouseEventsRegion(builder: (context, states) {
-            // wrap spacer in mouse region to disable pointer mouse cursor
-            return Container(
-              width: widget.labelSpacing,
-            );
-          }),
+          MouseEventsRegion(
+            builder: (context, states) {
+              // wrap spacer in mouse region to disable pointer mouse cursor
+              return Container(
+                width: widget.labelSpacing,
+              );
+            },
+          ),
         ],
       ),
     );
diff --git a/designer_v2/lib/common_views/primary_button.dart b/designer_v2/lib/common_views/primary_button.dart
index 6fb9bc09d..49bae0478 100644
--- a/designer_v2/lib/common_views/primary_button.dart
+++ b/designer_v2/lib/common_views/primary_button.dart
@@ -12,7 +12,8 @@ class PrimaryButton extends StatefulWidget {
     this.onPressedFuture,
     this.enabled = true,
     this.showLoadingEarliestAfterMs = 100,
-    this.innerPadding = const EdgeInsets.symmetric(horizontal: 4.0, vertical: 8.0),
+    this.innerPadding =
+        const EdgeInsets.symmetric(horizontal: 4.0, vertical: 8.0),
     this.minimumSize,
     super.key,
   });
@@ -39,7 +40,8 @@ class PrimaryButton extends StatefulWidget {
 
   final EdgeInsets innerPadding;
 
-  bool get isDisabled => !enabled || (onPressed == null && onPressedFuture == null);
+  bool get isDisabled =>
+      !enabled || (onPressed == null && onPressedFuture == null);
 
   final Size? minimumSize;
 
@@ -48,7 +50,7 @@ class PrimaryButton extends StatefulWidget {
 }
 
 class _PrimaryButtonState extends State<PrimaryButton> {
-  Future trackedFuture = Future.value(null);
+  Future trackedFuture = Future.value();
 
   @override
   Widget build(BuildContext context) {
@@ -59,19 +61,21 @@ class _PrimaryButtonState extends State<PrimaryButton> {
       minimumSize: widget.minimumSize,
     ).copyWith(elevation: ButtonStyleButton.allOrNull(0.0));
 
-    final tooltipMessage = (!widget.isDisabled) ? widget.tooltip : widget.tooltipDisabled;
+    final tooltipMessage =
+        (!widget.isDisabled) ? widget.tooltip : widget.tooltipDisabled;
 
-    onButtonPressed() {
+    void onButtonPressed() {
       widget.onPressed?.call();
       if (widget.onPressedFuture != null) {
         final future = widget.onPressedFuture!().whenComplete(() {
           if (mounted) {
             setState(() {
-              trackedFuture = Future.value(null);
+              trackedFuture = Future.value();
             });
           }
         });
-        Future.delayed(Duration(milliseconds: widget.showLoadingEarliestAfterMs), () {
+        Future.delayed(
+            Duration(milliseconds: widget.showLoadingEarliestAfterMs), () {
           if (mounted) {
             setState(() {
               trackedFuture = future;
@@ -92,16 +96,17 @@ class _PrimaryButtonState extends State<PrimaryButton> {
             child: Row(
               mainAxisSize: MainAxisSize.min,
               children: [
-                widget.isLoading
-                    ? SizedBox(
-                        width: theme.iconTheme.size ?? 14.0,
-                        height: theme.iconTheme.size ?? 14.0,
-                        child: const CircularProgressIndicator(
-                          color: Colors.white,
-                          strokeWidth: 2.0,
-                        ),
-                      )
-                    : Icon(widget.icon),
+                if (widget.isLoading)
+                  SizedBox(
+                    width: theme.iconTheme.size ?? 14.0,
+                    height: theme.iconTheme.size ?? 14.0,
+                    child: const CircularProgressIndicator(
+                      color: Colors.white,
+                      strokeWidth: 2.0,
+                    ),
+                  )
+                else
+                  Icon(widget.icon),
                 const SizedBox(width: 6.0),
                 Text(widget.text, textAlign: TextAlign.center),
               ],
@@ -112,23 +117,24 @@ class _PrimaryButtonState extends State<PrimaryButton> {
     }
 
     return Tooltip(
-        message: tooltipMessage,
-        child: ElevatedButton(
-          style: primaryStyle,
-          onPressed: widget.isDisabled ? null : onButtonPressed,
-          child: Padding(
-            padding: widget.innerPadding,
-            child: widget.isLoading
-                ? SizedBox(
-                    width: theme.iconTheme.size ?? 14.0,
-                    height: theme.iconTheme.size ?? 14.0,
-                    child: const CircularProgressIndicator(
-                      color: Colors.white,
-                      strokeWidth: 2.0,
-                    ),
-                  )
-                : Text(widget.text, textAlign: TextAlign.center),
-          ),
-        ));
+      message: tooltipMessage,
+      child: ElevatedButton(
+        style: primaryStyle,
+        onPressed: widget.isDisabled ? null : onButtonPressed,
+        child: Padding(
+          padding: widget.innerPadding,
+          child: widget.isLoading
+              ? SizedBox(
+                  width: theme.iconTheme.size ?? 14.0,
+                  height: theme.iconTheme.size ?? 14.0,
+                  child: const CircularProgressIndicator(
+                    color: Colors.white,
+                    strokeWidth: 2.0,
+                  ),
+                )
+              : Text(widget.text, textAlign: TextAlign.center),
+        ),
+      ),
+    );
   }
 }
diff --git a/designer_v2/lib/common_views/reactive_color_picker.dart b/designer_v2/lib/common_views/reactive_color_picker.dart
index c03f79245..5e949711e 100644
--- a/designer_v2/lib/common_views/reactive_color_picker.dart
+++ b/designer_v2/lib/common_views/reactive_color_picker.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:reactive_forms/reactive_forms.dart';
-
 import 'package:flutter_colorpicker/flutter_colorpicker.dart';
+import 'package:reactive_forms/reactive_forms.dart';
 import 'package:studyu_designer_v2/utils/color.dart';
 
 /// Adaption of [ReactiveColorPicker] from 'reactive_color_picker' package
@@ -38,25 +37,31 @@ class ReactiveCustomColorPicker<T> extends ReactiveFormField<T, Color> {
     super.formControlName,
     super.formControl,
     super.validationMessages,
-    ControlValueAccessor<T, double>? valueAccessor,
-    ShowErrorsFunction? showErrors,
     ////////////////////////////////////////////////////////////////////////////
     Color? contrastIconColorLight,
     Color contrastIconColorDark = Colors.white,
     InputDecoration? decoration,
     PaletteType paletteType = PaletteType.hsv,
     bool enableAlpha = true,
-    @Deprecated('Use empty list in [labelTypes] to disable label.') bool showLabel = true,
-    @Deprecated('Use Theme.of(context).textTheme.bodyText1 & 2 to alter text style.') TextStyle? labelTextStyle,
+    @Deprecated('Use empty list in [labelTypes] to disable label.')
+    bool showLabel = true,
+    @Deprecated(
+      'Use Theme.of(context).textTheme.bodyText1 & 2 to alter text style.',
+    )
+    TextStyle? labelTextStyle,
     bool displayThumbColor = false,
     bool portraitOnly = false,
     bool hexInputBar = false,
     double colorPickerWidth = 300.0,
     double pickerAreaHeightPercent = 1.0,
-    BorderRadius pickerAreaBorderRadius = const BorderRadius.all(Radius.zero),
+    BorderRadius pickerAreaBorderRadius = BorderRadius.zero,
     double disabledOpacity = 0.5,
     HSVColor? pickerHsvColor,
-    List<ColorLabelType> labelTypes = const [ColorLabelType.rgb, ColorLabelType.hsv, ColorLabelType.hsl],
+    List<ColorLabelType> labelTypes = const [
+      ColorLabelType.rgb,
+      ColorLabelType.hsv,
+      ColorLabelType.hsl,
+    ],
     TextEditingController? hexInputController,
     List<Color>? colorHistory,
     ValueChanged<List<Color>>? onHistoryChanged,
@@ -71,8 +76,8 @@ class ReactiveCustomColorPicker<T> extends ReactiveFormField<T, Color> {
                 context: context,
                 builder: (BuildContext context) {
                   return AlertDialog(
-                    titlePadding: const EdgeInsets.all(0.0),
-                    contentPadding: const EdgeInsets.all(0.0),
+                    titlePadding: EdgeInsets.zero,
+                    contentPadding: EdgeInsets.zero,
                     content: SingleChildScrollView(
                       child: ColorPicker(
                         pickerColor: pickerColor,
@@ -97,13 +102,16 @@ class ReactiveCustomColorPicker<T> extends ReactiveFormField<T, Color> {
               );
             }
 
-            final isEmptyValue = field.value == null || field.value.toString().isEmpty;
+            final isEmptyValue =
+                field.value == null || field.value.toString().isEmpty;
 
-            final InputDecoration effectiveDecoration =
-                (decoration ?? const InputDecoration()).applyDefaults(Theme.of(field.context).inputDecorationTheme);
+            final InputDecoration effectiveDecoration = (decoration ??
+                    const InputDecoration())
+                .applyDefaults(Theme.of(field.context).inputDecorationTheme);
 
-            final iconColor =
-                (field.value?.computeLuminance() ?? 0) < 0.2 ? contrastIconColorDark : contrastIconColorLight;
+            final iconColor = (field.value?.computeLuminance() ?? 0) < 0.2
+                ? contrastIconColorDark
+                : contrastIconColorLight;
 
             return IgnorePointer(
               ignoring: !field.control.enabled,
@@ -131,7 +139,9 @@ class ReactiveCustomColorPicker<T> extends ReactiveFormField<T, Color> {
                                   // Convert between non-serializable [Color]
                                   // superclass that color_picker expects &
                                   // the [SerializableColor] type of the control
-                                  field.didChange(SerializableColor(color.value));
+                                  field.didChange(
+                                    SerializableColor(color.value),
+                                  );
                                 },
                               );
                             },
@@ -149,7 +159,8 @@ class ReactiveCustomColorPicker<T> extends ReactiveFormField<T, Color> {
                         ],
                       ),
                     ),
-                    isEmpty: isEmptyValue && effectiveDecoration.hintText == null,
+                    isEmpty:
+                        isEmptyValue && effectiveDecoration.hintText == null,
                     child: Container(
                       color: field.value,
                     ),
diff --git a/designer_v2/lib/common_views/search.dart b/designer_v2/lib/common_views/search.dart
index 8bbcdee16..b77130b32 100644
--- a/designer_v2/lib/common_views/search.dart
+++ b/designer_v2/lib/common_views/search.dart
@@ -35,7 +35,7 @@ class SearchState extends State<Search> {
   }
 
   void _onSearchPressed() {
-    String query = _searchController.text.toLowerCase();
+    final String query = _searchController.text.toLowerCase();
     widget.onQueryChanged(query);
   }
 
diff --git a/designer_v2/lib/common_views/sidesheet/sidesheet.dart b/designer_v2/lib/common_views/sidesheet/sidesheet.dart
index d89ca4c2d..ee84b5861 100644
--- a/designer_v2/lib/common_views/sidesheet/sidesheet.dart
+++ b/designer_v2/lib/common_views/sidesheet/sidesheet.dart
@@ -31,7 +31,7 @@ class Sidesheet extends StatefulWidget {
     this.wrapContent,
     super.key,
   })  : assert((body != null && tabs == null) || (body == null && tabs != null),
-            "Must provide either body or tabs to build sidesheet content"),
+            "Must provide either body or tabs to build sidesheet content",),
         assert(tabs == null || tabs.length >= 1, "Must provide at least one tab to build sidesheet content");
 
   final String titleText;
@@ -83,13 +83,11 @@ class _SidesheetState extends State<Sidesheet> {
     return Align(
       alignment: Alignment.bottomLeft,
       child: Material(
-        elevation: 0,
         color: Colors.white,
         child: SizedBox(
           width: actualWidth,
           height: actualHeight,
           child: Scaffold(
-            appBar: null,
             backgroundColor: backgroundColor,
             body: widget.withCloseButton
                 ? Stack(
@@ -99,7 +97,7 @@ class _SidesheetState extends State<Sidesheet> {
                         top: 5,
                         right: 5,
                         child: CloseButton(),
-                      )
+                      ),
                     ],
                   )
                 : _build(context, widget.body, widget.tabs),
@@ -109,7 +107,7 @@ class _SidesheetState extends State<Sidesheet> {
     );
   }
 
-  _build(BuildContext context, Widget? body, List<SidesheetTab>? tabs) {
+  Container _build(BuildContext context, Widget? body, List<SidesheetTab>? tabs) {
     final theme = Theme.of(context);
     final backgroundColor = ThemeConfig.sidesheetBackgroundColor(Theme.of(context));
 
@@ -137,7 +135,6 @@ class _SidesheetState extends State<Sidesheet> {
       ),
       child: actualWrapContent(
         Column(
-          mainAxisAlignment: MainAxisAlignment.start,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Padding(
@@ -154,14 +151,11 @@ class _SidesheetState extends State<Sidesheet> {
                     widget.titleText,
                     style: theme.textTheme.headlineSmall!.copyWith(fontWeight: FontWeight.normal),
                   ),
-                  (widget.actionButtons != null)
-                      ? Wrap(spacing: 8.0, children: widget.actionButtons!)
-                      : const SizedBox.shrink(),
+                  if (widget.actionButtons != null) Wrap(spacing: 8.0, children: widget.actionButtons!) else const SizedBox.shrink(),
                 ],
               ),
             ),
-            (hasTabs && !isCollapsed)
-                ? Padding(
+            if (hasTabs && !isCollapsed) Padding(
                     padding: EdgeInsets.symmetric(horizontal: (widget.bodyPadding?.horizontal ?? 0) * 0.5),
                     child: TabbedNavbar<SidesheetTab>(
                       tabs: tabs,
@@ -178,16 +172,13 @@ class _SidesheetState extends State<Sidesheet> {
                       labelColorHover: tabBarLabelHoverColor,
                       unselectedLabelColorHover: tabBarLabelHoverColor,
                     ),
-                  )
-                : const SizedBox.shrink(),
-            (hasTabs && !isCollapsed) ? const Divider(height: 1) : const Divider(),
+                  ) else const SizedBox.shrink(),
+            if (hasTabs && !isCollapsed) const Divider(height: 1) else const Divider(),
             Flexible(
               child: SingleChildScrollView(
                 child: Column(
                   children: [
-                    (hasTabs && !isCollapsed) // compensate for divider height loss
-                        ? const SizedBox(height: 12.0)
-                        : const SizedBox.shrink(),
+                    if (hasTabs && !isCollapsed) const SizedBox(height: 12.0) else const SizedBox.shrink(),
                     Padding(
                       padding: EdgeInsets.fromLTRB(
                         (widget.bodyPadding?.horizontal ?? 0) * 0.5,
@@ -196,7 +187,7 @@ class _SidesheetState extends State<Sidesheet> {
                         (widget.bodyPadding?.vertical ?? 0) * 0.5,
                       ),
                       child: innerBody,
-                    )
+                    ),
                   ],
                 ),
               ),
diff --git a/designer_v2/lib/common_views/sidesheet/sidesheet_form.dart b/designer_v2/lib/common_views/sidesheet/sidesheet_form.dart
index de3fed73f..c74cc5bba 100644
--- a/designer_v2/lib/common_views/sidesheet/sidesheet_form.dart
+++ b/designer_v2/lib/common_views/sidesheet/sidesheet_form.dart
@@ -20,7 +20,7 @@ class FormSideSheetTab<T extends FormViewModel> extends NavbarTab {
   FormViewBuilder<T> formViewBuilder;
 }
 
-showFormSideSheet<T extends FormViewModel>({
+Future<Object?> showFormSideSheet<T extends FormViewModel>({
   required BuildContext context,
   required T formViewModel,
   FormViewBuilder<T>? formViewBuilder,
@@ -35,7 +35,7 @@ showFormSideSheet<T extends FormViewModel>({
   barrierColor ??= ThemeConfig.modalBarrierColor(Theme.of(context));
 
   // Wraps the whole side sheet in a [ReactiveForm] widget
-  Widget wrapInForm(widget) {
+  Widget wrapInForm(Widget widget) {
     return ReactiveForm(
       formGroup: formViewModel.form,
       child: widget,
@@ -44,12 +44,14 @@ showFormSideSheet<T extends FormViewModel>({
 
   // Bind the [formViewModel] to the [SidesheetTab]s' widget builder
   final List<SidesheetTab>? boundTabs = tabs
-      ?.map((t) => SidesheetTab(
-            title: t.title,
-            index: t.index,
-            enabled: t.enabled,
-            builder: (BuildContext context) => t.formViewBuilder(formViewModel),
-          ))
+      ?.map(
+        (t) => SidesheetTab(
+          title: t.title,
+          index: t.index,
+          enabled: t.enabled,
+          builder: (BuildContext context) => t.formViewBuilder(formViewModel),
+        ),
+      )
       .toList();
 
   return showModalSideSheet(
diff --git a/designer_v2/lib/common_views/standard_table.dart b/designer_v2/lib/common_views/standard_table.dart
index eb7190ac5..485bcc38d 100644
--- a/designer_v2/lib/common_views/standard_table.dart
+++ b/designer_v2/lib/common_views/standard_table.dart
@@ -11,10 +11,17 @@ import 'package:studyu_designer_v2/utils/model_action.dart';
 
 typedef OnSelectHandler<T> = void Function(T item);
 
-typedef StandardTableRowBuilder = TableRow Function(BuildContext context, List<StandardTableColumn> columns);
+typedef StandardTableRowBuilder = TableRow Function(
+  BuildContext context,
+  List<StandardTableColumn> columns,
+);
 
 typedef StandardTableCellsBuilder<T> = List<Widget> Function(
-    BuildContext context, T item, int rowIdx, Set<WidgetState> states);
+  BuildContext context,
+  T item,
+  int rowIdx,
+  Set<WidgetState> states,
+);
 
 enum StandardTableStyle { plain, material }
 
@@ -66,7 +73,10 @@ class StandardTable<T> extends StatefulWidget {
   }) {
     if (trailingActionsColumn == null) {
       this.inputTrailingActionsColumn = StandardTableColumn(
-          label: '', columnWidth: const MaxColumnWidth(IntrinsicColumnWidth(), FixedColumnWidth(65)));
+        label: '',
+        columnWidth:
+            const MaxColumnWidth(IntrinsicColumnWidth(), FixedColumnWidth(65)),
+      );
     } else {
       this.inputTrailingActionsColumn = trailingActionsColumn;
     }
@@ -150,14 +160,14 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
     super.didUpdateWidget(oldWidget);
   }
 
-  _initRowStates() {
+  void _initRowStates() {
     _rowStates.clear();
-    for (var _ in widget.items) {
+    for (final _ in widget.items) {
       _rowStates.add(<WidgetState>{});
     }
   }
 
-  _onRowStateChanged(int rowIdx, Set<WidgetState> states) {
+  void _onRowStateChanged(int rowIdx, Set<WidgetState> states) {
     setState(() {
       _rowStates[rowIdx] = states;
       // flag row for rebuild to reflect its current set of [MaterialStatus]
@@ -175,20 +185,24 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
     }
 
     final headerRow = _buildHeaderRow();
-    final tableHeaderRows = (widget.showTableHeader) ? [headerRow, paddingRow, paddingRow] : [];
+    final List<TableRow> tableHeaderRows =
+        (widget.showTableHeader) ? [headerRow, paddingRow, paddingRow] : [];
     final tableDataRows = _tableRows(theme);
 
     Widget tableWidget = Table(
-        columnWidths: columnWidths,
-        defaultVerticalAlignment: TableCellVerticalAlignment.middle,
-        children: [...tableHeaderRows, ...tableDataRows]);
+      columnWidths: columnWidths,
+      defaultVerticalAlignment: TableCellVerticalAlignment.middle,
+      children: [...tableHeaderRows, ...tableDataRows],
+    );
     if (widget.tableWrapper != null) {
       tableWidget = widget.tableWrapper!(tableWidget);
     }
 
     final isTableVisible = !(tableHeaderRows.isEmpty && tableDataRows.isEmpty);
 
-    if (tableDataRows.isEmpty && widget.emptyWidget != null && widget.hideLeadingTrailingWhenEmpty) {
+    if (tableDataRows.isEmpty &&
+        widget.emptyWidget != null &&
+        widget.hideLeadingTrailingWhenEmpty) {
       return widget.emptyWidget!;
     }
 
@@ -197,16 +211,23 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           widget.leadingWidget ?? const SizedBox.shrink(),
-          (widget.leadingWidget != null && widget.leadingWidgetSpacing != null)
-              ? SizedBox(height: widget.leadingWidgetSpacing!)
-              : const SizedBox.shrink(),
-          (isTableVisible) ? tableWidget : Container(),
-          (!isTableVisible && widget.emptyWidget != null && !widget.hideLeadingTrailingWhenEmpty)
-              ? widget.emptyWidget!
-              : const SizedBox.shrink(),
-          (widget.trailingWidget != null && widget.trailingWidgetSpacing != null)
-              ? SizedBox(height: widget.trailingWidgetSpacing!)
-              : const SizedBox.shrink(),
+          if (widget.leadingWidget != null &&
+              widget.leadingWidgetSpacing != null)
+            SizedBox(height: widget.leadingWidgetSpacing)
+          else
+            const SizedBox.shrink(),
+          if (isTableVisible) tableWidget else Container(),
+          if (!isTableVisible &&
+              widget.emptyWidget != null &&
+              !widget.hideLeadingTrailingWhenEmpty)
+            widget.emptyWidget!
+          else
+            const SizedBox.shrink(),
+          if (widget.trailingWidget != null &&
+              widget.trailingWidgetSpacing != null)
+            SizedBox(height: widget.trailingWidgetSpacing)
+          else
+            const SizedBox.shrink(),
           widget.trailingWidget ?? const SizedBox.shrink(),
         ],
       );
@@ -219,15 +240,25 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
     final sortAscending = widget.inputColumns[columnIndex].sortAscending;
 
     // Save default order to restore later
-    if (sortDefaultOrder == null || sortDefaultOrder!.length != widget.items.length) {
+    if (sortDefaultOrder == null ||
+        sortDefaultOrder!.length != widget.items.length) {
       sortDefaultOrder = List.from(widget.items);
     }
 
     if (sortAscending != null) {
       widget.items.sort((a, b) {
-        return _sortLogic(a, b, columnIndex: columnIndex, sortAscending: sortAscending);
+        return _sortLogic(
+          a,
+          b,
+          columnIndex: columnIndex,
+          sortAscending: sortAscending,
+        );
       });
-      _sortPinnedStudies(widget.items, columnIndex: columnIndex, sortAscending: sortAscending);
+      _sortPinnedStudies(
+        widget.items,
+        columnIndex: columnIndex,
+        sortAscending: sortAscending,
+      );
     } else {
       widget.items.clear();
       widget.items.addAll(sortDefaultOrder!);
@@ -236,20 +267,40 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
     _cachedRows.clear();
   }
 
-  void _sortPinnedStudies(List<T> items, {required int columnIndex, bool? sortAscending}) {
+  void _sortPinnedStudies(
+    List<T> items, {
+    required int columnIndex,
+    bool? sortAscending,
+  }) {
     // Extract and insert pinned items at the top
     if (widget.pinnedPredicates != null) {
       items.sort((a, b) {
-        int ret = widget.pinnedPredicates!(a, b);
+        final int ret = widget.pinnedPredicates!(a, b);
         // Fallback to default sorting algorithm
-        return ret == 0 ? _sortLogic(a, b, columnIndex: columnIndex, sortAscending: sortAscending) : ret;
+        return ret == 0
+            ? _sortLogic(
+                a,
+                b,
+                columnIndex: columnIndex,
+                sortAscending: sortAscending,
+              )
+            : ret;
       });
     }
   }
 
-  int _sortLogic(T a, T b, {required int columnIndex, required bool? sortAscending, bool? useSortPredicate}) {
+  int _sortLogic(
+    T a,
+    T b, {
+    required int columnIndex,
+    required bool? sortAscending,
+    bool? useSortPredicate,
+  }) {
     final sortPredicate = widget.sortColumnPredicates;
-    if (useSortPredicate != null && useSortPredicate && sortPredicate != null && sortPredicate[columnIndex] != null) {
+    if (useSortPredicate != null &&
+        useSortPredicate &&
+        sortPredicate != null &&
+        sortPredicate[columnIndex] != null) {
       final int res;
       if (sortAscending ?? true) {
         res = sortPredicate[columnIndex]!(a, b);
@@ -258,12 +309,20 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
       }
       if (res == 0) {
         // Fallback to default sorting algorithm
-        return _sortLogic(a, b, columnIndex: columnIndex, sortAscending: sortAscending, useSortPredicate: false);
+        return _sortLogic(
+          a,
+          b,
+          columnIndex: columnIndex,
+          sortAscending: sortAscending,
+          useSortPredicate: false,
+        );
       }
       return res;
     } else if (a is Comparable && b is Comparable) {
       // If sortPredicate is not provided, use default comparison logic
-      return sortAscending ?? true ? Comparable.compare(a, b) : Comparable.compare(b, a);
+      return sortAscending ?? true
+          ? Comparable.compare(a, b)
+          : Comparable.compare(b, a);
     } else {
       return 0;
     }
@@ -282,10 +341,13 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
     _cachedRows.addAll(rows);
 
     // Add padding after each row
-    return rows.map((dataRow) => [dataRow, paddingRow]).expand((element) => element).toList();
+    return rows
+        .map((dataRow) => [dataRow, paddingRow])
+        .expand((element) => element)
+        .toList();
   }
 
-  TableRow _useCachedOrRebuildRow(rowIdx) {
+  TableRow _useCachedOrRebuildRow(int rowIdx) {
     if (rowIdx >= _cachedRows.length) {
       // [_cachedRows] is empty when building for the first time
       return _buildDataRow(rowIdx);
@@ -299,8 +361,11 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
   }
 
   TableRow _buildPaddingRow() {
-    TableRow rowSpacer =
-        TableRow(children: widget.inputColumns.map((_) => SizedBox(height: widget.rowSpacing)).toList());
+    final TableRow rowSpacer = TableRow(
+      children: widget.inputColumns
+          .map((_) => SizedBox(height: widget.rowSpacing))
+          .toList(),
+    );
     return rowSpacer;
   }
 
@@ -309,21 +374,30 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
     return headerRowBuilder(context, widget.inputColumns);
   }
 
-  TableRow _defaultHeader(BuildContext context, List<StandardTableColumn> columns) {
+  TableRow _defaultHeader(
+    BuildContext context,
+    List<StandardTableColumn> columns,
+  ) {
     final theme = Theme.of(context);
 
     final List<Widget> headerCells = [];
     for (var i = 0; i < columns.length; i++) {
       final isLeading = i == 0;
       final isTrailing = i == columns.length - 1;
-      headerCells.add(MouseEventsRegion(
-        builder: (context, state) {
-          return Padding(
+      headerCells.add(
+        MouseEventsRegion(
+          builder: (context, state) {
+            return Padding(
               padding: EdgeInsets.fromLTRB(
-                  (isLeading || isTrailing) ? 2 * widget.cellSpacing : widget.cellSpacing,
-                  widget.cellSpacing,
-                  (isLeading || isTrailing) ? 2 * widget.cellSpacing : widget.cellSpacing,
-                  widget.cellSpacing),
+                (isLeading || isTrailing)
+                    ? 2 * widget.cellSpacing
+                    : widget.cellSpacing,
+                widget.cellSpacing,
+                (isLeading || isTrailing)
+                    ? 2 * widget.cellSpacing
+                    : widget.cellSpacing,
+                widget.cellSpacing,
+              ),
               child: Row(
                 children: [
                   Text(
@@ -335,16 +409,20 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
                       color: theme.colorScheme.onSurface.withOpacity(0.8),
                     ),
                   ),
-                  widget.inputColumns[i].sortable
-                      ? widget.inputColumns[i].sortableIcon ?? const SizedBox(width: 17)
-                      : const SizedBox.shrink(),
+                  if (widget.inputColumns[i].sortable)
+                    widget.inputColumns[i].sortableIcon ??
+                        const SizedBox(width: 17)
+                  else
+                    const SizedBox.shrink(),
                 ],
-              ));
-        },
-        onEnter: (event) => setState(() => sortAction(i, hover: event)),
-        onExit: (event) => setState(() => sortAction(i, hover: event)),
-        onTap: () => setState(() => sortAction(i)),
-      ));
+              ),
+            );
+          },
+          onEnter: (event) => setState(() => sortAction(i, hover: event)),
+          onExit: (event) => setState(() => sortAction(i, hover: event)),
+          onTap: () => setState(() => sortAction(i)),
+        ),
+      );
     }
     return TableRow(children: headerCells);
   }
@@ -362,21 +440,18 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
         switch (widget.inputColumns[i].sortAscending) {
           case null:
             // Reset all column sorting
-            for (StandardTableColumn c in widget.inputColumns) {
+            for (final StandardTableColumn c in widget.inputColumns) {
               c.sortAscending = null;
               c.sortableIcon = null;
             }
             widget.inputColumns[i].sortAscending = true;
             widget.inputColumns[i].sortableIcon = ascendingIcon;
-            break;
           case true:
             widget.inputColumns[i].sortAscending = false;
             widget.inputColumns[i].sortableIcon = descendingIcon;
-            break;
           case false:
             widget.inputColumns[i].sortAscending = null;
             widget.inputColumns[i].sortableIcon = null;
-            break;
         }
         _sortColumn(i);
         // No sorting icon is active or hovered
@@ -392,10 +467,11 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
 
   TableRow _buildDataRow(int rowIdx) {
     final item = widget.items[rowIdx];
-    final dataRowBuilder = widget.dataRowBuilder ?? _defaultDataRow;
     final rowStates = _rowStates[rowIdx];
 
-    return dataRowBuilder(context, item, rowIdx, rowStates);
+    return widget.dataRowBuilder != null
+        ? widget.dataRowBuilder!(context, widget.inputColumns)
+        : _defaultDataRow(context, item, rowIdx, rowStates);
   }
 
   TableRow _defaultDataRow(
@@ -407,12 +483,13 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
     final theme = Theme.of(context);
     final rowIsHovered = states.contains(WidgetState.hovered);
     final rowIsPressed = states.contains(WidgetState.pressed);
-    final rowColor =
-        (widget.rowStyle == StandardTableStyle.material) ? theme.colorScheme.onPrimary : Colors.transparent;
+    final rowColor = (widget.rowStyle == StandardTableStyle.material)
+        ? theme.colorScheme.onPrimary
+        : Colors.transparent;
 
-    Widget decorateCellInteractions(Widget child, {disableOnTap = false}) {
+    Widget decorateCellInteractions(Widget child, {bool disableOnTap = false}) {
       return MouseEventsRegion(
-        onTap: (disableOnTap) ? null : (() => widget.onSelectItem(item)),
+        onTap: disableOnTap ? null : (() => widget.onSelectItem(item)),
         onStateChanged: (states) => _onRowStateChanged(rowIdx, states),
         builder: (context, mouseEventState) => child,
       );
@@ -420,48 +497,57 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
 
     Widget decorateCell(
       Widget child, {
-      alignment = Alignment.centerLeft,
-      isLeading = false,
-      isTrailing = false,
-      disableOnTap = false,
+      Alignment alignment = Alignment.centerLeft,
+      bool isLeading = false,
+      bool isTrailing = false,
+      bool disableOnTap = false,
     }) {
       final content = Align(
         alignment: alignment,
         child: child,
       );
       final styledCell = Material(
-          color: rowColor,
-          child: Padding(
-            padding: EdgeInsets.fromLTRB(
-                (isLeading || isTrailing) ? 2 * widget.cellSpacing : widget.cellSpacing,
-                widget.cellSpacing,
-                (isLeading || isTrailing) ? 2 * widget.cellSpacing : widget.cellSpacing,
-                widget.cellSpacing),
-            child: (widget.minRowHeight != null)
-                ? SizedBox(
-                    height: widget.minRowHeight,
-                    child: content,
-                  )
-                : content,
-          ));
+        color: rowColor,
+        child: Padding(
+          padding: EdgeInsets.fromLTRB(
+            (isLeading || isTrailing)
+                ? 2 * widget.cellSpacing
+                : widget.cellSpacing,
+            widget.cellSpacing,
+            (isLeading || isTrailing)
+                ? 2 * widget.cellSpacing
+                : widget.cellSpacing,
+            widget.cellSpacing,
+          ),
+          child: (widget.minRowHeight != null)
+              ? SizedBox(
+                  height: widget.minRowHeight,
+                  child: content,
+                )
+              : content,
+        ),
+      );
 
       return (!widget.disableRowInteractions)
           ? decorateCellInteractions(styledCell, disableOnTap: disableOnTap)
           : styledCell;
     }
 
-    Widget applyColumnConfiguration(Widget cellWidget, StandardTableColumn column) {
+    Widget applyColumnConfiguration(
+      Widget cellWidget,
+      StandardTableColumn column,
+    ) {
       if (column.tooltip != null) {
-        cellWidget = Tooltip(
-          message: column.tooltip!,
+        return Tooltip(
+          message: column.tooltip,
           child: cellWidget,
         );
       }
-
       return cellWidget;
     }
 
-    final List<Widget> rawCells = widget.buildCellsAt(context, item, rowIdx, states);
+    final List<Widget> rawCells =
+        widget.buildCellsAt(context, item, rowIdx, states);
 
     if (widget.trailingActionsAt != null) {
       // Insert additional table cell to hold actions menu
@@ -482,7 +568,6 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
         cell,
         isLeading: isLeading,
         isTrailing: isTrailing,
-        disableOnTap: false,
       );
       cell = applyColumnConfiguration(cell, cellColumnConfig);
       dataCells.add(cell);
@@ -494,21 +579,22 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
             children: dataCells,
             decoration: BoxDecoration(
               border: Border.all(
-                color: (rowIsPressed)
+                color: rowIsPressed
                     ? theme.colorScheme.primary.withOpacity(0.7)
                     : theme.colorScheme.primaryContainer.withOpacity(0.9),
               ),
               borderRadius: const BorderRadius.all(Radius.circular(4)),
               boxShadow: [
                 BoxShadow(
-                    color: (rowIsPressed)
-                        ? theme.colorScheme.primary.withOpacity(0.15)
-                        : ((rowIsHovered)
-                            ? theme.colorScheme.onSurface.withOpacity(0.2)
-                            : theme.colorScheme.onSurface.withOpacity(0.1)),
-                    spreadRadius: 0,
-                    blurRadius: (rowIsHovered) ? 3 : 2,
-                    offset: (rowIsHovered) ? const Offset(1, 1) : const Offset(0, 1))
+                  color: rowIsPressed
+                      ? theme.colorScheme.primary.withOpacity(0.15)
+                      : (rowIsHovered
+                          ? theme.colorScheme.onSurface.withOpacity(0.2)
+                          : theme.colorScheme.onSurface.withOpacity(0.1)),
+                  blurRadius: rowIsHovered ? 3 : 2,
+                  offset:
+                      rowIsHovered ? const Offset(1, 1) : const Offset(0, 1),
+                ),
               ],
               color: theme.colorScheme.onPrimary,
             ),
@@ -516,7 +602,6 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
         : TableRow(
             key: ObjectKey(item),
             children: dataCells,
-            decoration: null,
           );
   }
 
@@ -531,7 +616,6 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
       final theme = Theme.of(context);
       actionMenuWidget = ActionPopUpMenuButton(
         actions: actions,
-        orientation: Axis.horizontal,
         triggerIconColor: ThemeConfig.bodyTextMuted(theme).color?.faded(0.6),
         triggerIconColorHover: theme.colorScheme.primary,
         disableSplashEffect: true,
diff --git a/designer_v2/lib/common_views/studyu_logo.dart b/designer_v2/lib/common_views/studyu_logo.dart
index 421460ba4..b0cd65472 100644
--- a/designer_v2/lib/common_views/studyu_logo.dart
+++ b/designer_v2/lib/common_views/studyu_logo.dart
@@ -25,6 +25,6 @@ class StudyULogo extends StatelessWidget {
             ),
           );
         },
-        onTap: onTap);
+        onTap: onTap,);
   }
 }
diff --git a/designer_v2/lib/common_views/styling_information.dart b/designer_v2/lib/common_views/styling_information.dart
index e435fcd54..2c51b3b2e 100644
--- a/designer_v2/lib/common_views/styling_information.dart
+++ b/designer_v2/lib/common_views/styling_information.dart
@@ -1,10 +1,9 @@
 import 'package:flutter/material.dart';
+import 'package:studyu_designer_v2/common_views/banner.dart';
 import 'package:studyu_designer_v2/common_views/text_hyperlink.dart';
 import 'package:studyu_designer_v2/common_views/text_paragraph.dart';
 import 'package:studyu_designer_v2/theme.dart';
 
-import 'banner.dart';
-
 class HtmlStylingBanner extends StatelessWidget {
   const HtmlStylingBanner({this.isDismissed = false, this.onDismissed, super.key});
 
@@ -43,43 +42,43 @@ class HtmlStylingBanner extends StatelessWidget {
                 children: [
                   TableRow(children: [
                     const Text('Make your text bold'),
-                    Text('<b>Bold text</b>', style: ThemeConfig.bodyTextMuted(theme))
-                  ]),
+                    Text('<b>Bold text</b>', style: ThemeConfig.bodyTextMuted(theme)),
+                  ],),
                   TableRow(children: [
                     const Text('Add a hyperlink'),
                     Text(
                       '<a href="http://example.org">A hyperlink</a>',
                       style: ThemeConfig.bodyTextMuted(theme),
-                    )
-                  ]),
+                    ),
+                  ],),
                   TableRow(children: [
                     const Text('Make your text colorful'),
                     Text(
                       '<span style="color: red">Red text</span>',
                       style: ThemeConfig.bodyTextMuted(theme),
                     ),
-                  ]),
+                  ],),
                   TableRow(children: [
                     const Text('Add an image'),
                     Text(
                       '<img width="100" src="<link>" />',
                       style: ThemeConfig.bodyTextMuted(theme),
-                    )
-                  ]),
+                    ),
+                  ],),
                   TableRow(children: [
                     const Text('Add a video'),
                     Text(
                       '<video controls width="100" src="<link>" />',
                       style: ThemeConfig.bodyTextMuted(theme),
                     ),
-                  ]),
+                  ],),
                   TableRow(children: [
                     const Text('Add an audio message'),
                     Text(
                       '<audio controls src="<link>" />',
                       style: ThemeConfig.bodyTextMuted(theme),
                     ),
-                  ]),
+                  ],),
                 ],
               ),
             ),
diff --git a/designer_v2/lib/common_views/sync_indicator.dart b/designer_v2/lib/common_views/sync_indicator.dart
index fb588fd91..fb7878792 100644
--- a/designer_v2/lib/common_views/sync_indicator.dart
+++ b/designer_v2/lib/common_views/sync_indicator.dart
@@ -42,7 +42,6 @@ class _SyncIndicatorState extends State<SyncIndicator> with SingleTickerProvider
     _animationController = AnimationController(
       vsync: this,
       duration: Duration(milliseconds: widget.animationDuration),
-      upperBound: 1,
     );
     _animation = Tween(begin: 0.0, end: 1.0).animate(_animationController);
 
@@ -82,7 +81,7 @@ class _SyncIndicatorState extends State<SyncIndicator> with SingleTickerProvider
     final theme = Theme.of(context);
     final isHovered = states.contains(WidgetState.hovered);
     double actualOpacity = (widget.state.isRefreshing) ? 0.5 : 0.2;
-    actualOpacity += (isHovered) ? 0.2 : 0.0;
+    actualOpacity += isHovered ? 0.2 : 0.0;
     final iconColor = theme.iconTheme.color!.withOpacity(actualOpacity);
 
     Widget dataWidget;
@@ -129,6 +128,6 @@ class _SyncIndicatorState extends State<SyncIndicator> with SingleTickerProvider
       ),
     );
 
-    return (shouldAnimate) ? refreshingWidget : dataWidget;
+    return shouldAnimate ? refreshingWidget : dataWidget;
   }
 }
diff --git a/designer_v2/lib/common_views/text_hyperlink.dart b/designer_v2/lib/common_views/text_hyperlink.dart
index 2c1f3d4cd..407744809 100644
--- a/designer_v2/lib/common_views/text_hyperlink.dart
+++ b/designer_v2/lib/common_views/text_hyperlink.dart
@@ -21,7 +21,7 @@ class Hyperlink extends StatefulWidget {
     this.iconSize,
     super.key,
   }) : assert((url != null && onClick == null) || (url == null && onClick != null),
-            "Must provide either url or onClick handler");
+            "Must provide either url or onClick handler",);
 
   final String text;
   final String? url;
@@ -74,11 +74,10 @@ class _HyperlinkState extends State<Hyperlink> {
 
         if (widget.icon != null) {
           return Row(
-            crossAxisAlignment: CrossAxisAlignment.center,
             children: [
               Icon(widget.icon, color: actualColor, size: widget.iconSize ?? (textTheme?.fontSize ?? 14.0) + 4.0),
               const SizedBox(width: 2.0),
-              textWidget
+              textWidget,
             ],
           );
         }
diff --git a/designer_v2/lib/common_views/under_construction.dart b/designer_v2/lib/common_views/under_construction.dart
index 1fbbc7860..64f28c30e 100644
--- a/designer_v2/lib/common_views/under_construction.dart
+++ b/designer_v2/lib/common_views/under_construction.dart
@@ -13,6 +13,6 @@ class UnderConstruction extends StatelessWidget {
           icon: Icons.construction_rounded,
           title: tr.under_construction,
           description: tr.under_construction_description,
-        ));
+        ),);
   }
 }
diff --git a/designer_v2/lib/domain/schedule.dart b/designer_v2/lib/domain/schedule.dart
index 2832406e6..a85db57de 100644
--- a/designer_v2/lib/domain/schedule.dart
+++ b/designer_v2/lib/domain/schedule.dart
@@ -33,7 +33,7 @@ extension ScheduleX on Schedule {
   String get instanceId => completionPeriods[0].id;
 
   static final unrestrictedTime = [
-    StudyUTimeOfDay(hour: 0, minute: 0),
+    StudyUTimeOfDay(),
     StudyUTimeOfDay(hour: 23, minute: 59),
   ];
 
diff --git a/designer_v2/lib/domain/study.dart b/designer_v2/lib/domain/study.dart
index 37aa3bc37..d9f93717c 100644
--- a/designer_v2/lib/domain/study.dart
+++ b/designer_v2/lib/domain/study.dart
@@ -1,5 +1,5 @@
-import 'package:studyu_core/core.dart';
 import 'package:studyu_core/core.dart' as core;
+import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/localization/string_hardcoded.dart';
 import 'package:studyu_designer_v2/utils/extensions.dart';
@@ -120,13 +120,16 @@ extension StudyDuplicateX on Study {
     // Generate a new random UUIDs
     const uuid = Uuid();
     copy.id = uuid.v4();
-    for (var intervention in copy.interventions) {
+    for (final intervention in copy.interventions) {
       intervention.id = uuid.v4();
     }
-    for (var observation in copy.observations) {
+    for (final observation in copy.observations) {
       observation.id = uuid.v4();
     }
-    for (var report in [copy.reportSpecification.primary, ...copy.reportSpecification.secondary]) {
+    for (final report in [
+      copy.reportSpecification.primary,
+      ...copy.reportSpecification.secondary,
+    ]) {
       report?.id = uuid.v4();
     }
 
@@ -141,7 +144,8 @@ extension StudyDuplicateX on Study {
     return copy;
   }
 
-  Study copyJsonIgnoredAttributes({required Study from, createdAt = false}) {
+  Study copyJsonIgnoredAttributes(
+      {required Study from, bool createdAt = false,}) {
     participantCount = from.participantCount;
     activeSubjectCount = from.activeSubjectCount;
     endedCount = from.endedCount;
diff --git a/designer_v2/lib/domain/study_export.dart b/designer_v2/lib/domain/study_export.dart
index 3c4307d8d..bf8f9bb78 100644
--- a/designer_v2/lib/domain/study_export.dart
+++ b/designer_v2/lib/domain/study_export.dart
@@ -39,8 +39,9 @@ extension StudyExportX on Study {
     final List<Map<String, dynamic>> interventionsData = [];
     final List<String> mediaData = [];
 
-    List<SubjectProgress> records = participantsProgress ?? [];
-    records.sort((b, a) => a.completedAt!.compareTo(b.completedAt!)); // descending
+    final List<SubjectProgress> records = participantsProgress ?? [];
+    records
+        .sort((b, a) => a.completedAt!.compareTo(b.completedAt!)); // descending
 
     // Key used as a placeholder for values that cannot be resolved by their
     // id anymore (e.g. because the study design has changed meanwhile)
@@ -48,8 +49,8 @@ extension StudyExportX on Study {
 
     // Build columns dynamically for each question in each survey
     final Map<String, dynamic> surveyColumns = {};
-    final responseColumnById = {};
-    final surveyAnsweredColumnById = {};
+    final Map<String, String> responseColumnById = {};
+    final Map<String, String> surveyAnsweredColumnById = {};
     final mediaIndices = [];
 
     for (var i = 1; i < observations.length + 1; i++) {
@@ -83,16 +84,20 @@ extension StudyExportX on Study {
                 .firstWhereOrNull((_) => true)
                 ?.inviteCode ??
             '',
-        'current_day_of_study': record.completedAt!.difference(record.startedAt!).inDays.toString(),
+        'current_day_of_study':
+            record.completedAt!.difference(record.startedAt!).inDays.toString(),
         'current_intervention_id': record.interventionId,
         'current_intervention_name': intervention?.name ?? invalidKey,
       };
 
-      final isMeasurement = MeasurementResultTypes.values.contains(record.resultType);
-      final isIntervention = InterventionResultTypes.values.contains(record.resultType);
+      final isMeasurement =
+          MeasurementResultTypes.values.contains(record.resultType);
+      final isIntervention =
+          InterventionResultTypes.values.contains(record.resultType);
 
       if (isMeasurement) {
-        final measurement = observations.firstWhereOrNull((o) => o.id == record.taskId);
+        final measurement =
+            observations.firstWhereOrNull((o) => o.id == record.taskId);
         final Map<String, dynamic> row = {
           'measurement_time': record.completedAt!.toString(),
           'measurement_id': record.taskId,
@@ -111,7 +116,8 @@ extension StudyExportX on Study {
           for (final questionAnswerPair in submittedQuestionAnswerPairs) {
             final questionId = questionAnswerPair.question;
             final questionResponseColumn = responseColumnById[questionId];
-            final surveyAnsweredColumn = surveyAnsweredColumnById[record.taskId];
+            final surveyAnsweredColumn =
+                surveyAnsweredColumnById[record.taskId]!;
             if (questionResponseColumn == null) {
               continue; // skip unresolvable questions (e.g. because study design has changed)
             }
@@ -127,7 +133,8 @@ extension StudyExportX on Study {
         }
         measurementsData.add(row);
       } else if (isIntervention) {
-        final task = intervention?.tasks.firstWhereOrNull((e) => e.id == record.taskId);
+        final task =
+            intervention?.tasks.firstWhereOrNull((e) => e.id == record.taskId);
         final Map<String, dynamic> row = {
           'intervention_task_time': record.completedAt!.toString(),
           'intervention_task_id': record.taskId,
diff --git a/designer_v2/lib/features/account/account_settings.dart b/designer_v2/lib/features/account/account_settings.dart
index 09cc88215..ec23f13db 100644
--- a/designer_v2/lib/features/account/account_settings.dart
+++ b/designer_v2/lib/features/account/account_settings.dart
@@ -17,12 +17,10 @@ class AccountSettingsDialog extends ConsumerWidget {
         child: StandardDialog(
       titleText: tr.navlink_account_settings,
       body: Column(
-        mainAxisAlignment: MainAxisAlignment.start,
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           const SizedBox(height: 16.0),
           FormTableLayout(
-            rowLayout: FormTableRowLayout.horizontal,
             rows: [
               FormTableRow(
                 label: tr.language,
@@ -36,6 +34,6 @@ class AccountSettingsDialog extends ConsumerWidget {
       minWidth: 650,
       maxWidth: 750,
       minHeight: 450,
-    ));
+    ),);
   }
 }
diff --git a/designer_v2/lib/features/analyze/study_analyze_controller.dart b/designer_v2/lib/features/analyze/study_analyze_controller.dart
index 098d21467..9bd3caa65 100644
--- a/designer_v2/lib/features/analyze/study_analyze_controller.dart
+++ b/designer_v2/lib/features/analyze/study_analyze_controller.dart
@@ -9,12 +9,13 @@ import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/utils/performance.dart';
 
-class StudyAnalyzeController extends StudyBaseController<StudyAnalyzeControllerState> {
+class StudyAnalyzeController
+    extends StudyBaseController<StudyAnalyzeControllerState> {
   StudyAnalyzeController({
     required super.studyId,
+    required super.currentUser,
     required super.studyRepository,
     required super.router,
-    required super.currentUser,
   }) : super(StudyAnalyzeControllerState(currentUser: currentUser)) {
     // Reload the study in case some data was generated meanwhile
     // studyRepository.fetch(studyId);
@@ -27,7 +28,8 @@ class StudyAnalyzeController extends StudyBaseController<StudyAnalyzeControllerS
 }
 
 final studyAnalyzeControllerProvider = StateNotifierProvider.autoDispose
-    .family<StudyAnalyzeController, StudyAnalyzeControllerState, StudyID>((ref, studyId) {
+    .family<StudyAnalyzeController, StudyAnalyzeControllerState, StudyID>(
+        (ref, studyId) {
   return StudyAnalyzeController(
     studyId: studyId,
     currentUser: ref.watch(authRepositoryProvider).currentUser,
diff --git a/designer_v2/lib/features/analyze/study_analyze_page.dart b/designer_v2/lib/features/analyze/study_analyze_page.dart
index beba6217e..6db3b6d02 100644
--- a/designer_v2/lib/features/analyze/study_analyze_page.dart
+++ b/designer_v2/lib/features/analyze/study_analyze_page.dart
@@ -20,14 +20,13 @@ class StudyAnalyzeScreen extends StudyPageWidget {
       return BannerBox(
           noPrefix: true,
           body: Column(
-              mainAxisAlignment: MainAxisAlignment.start,
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 TextParagraph(
                   text: tr.banner_text_study_analyze_draft,
                 ),
-              ]),
-          style: BannerStyle.info);
+              ],),
+          style: BannerStyle.info,);
     }
 
     return null;
@@ -73,7 +72,7 @@ class StudyAnalyzeScreen extends StudyPageWidget {
             height: 300,
             child: const Center(
               child: UnderConstruction(),
-            ))
+            ),),
       ],
     );
   }
diff --git a/designer_v2/lib/features/analyze/study_export_zip.dart b/designer_v2/lib/features/analyze/study_export_zip.dart
index f844a5442..59b2a7dcd 100644
--- a/designer_v2/lib/features/analyze/study_export_zip.dart
+++ b/designer_v2/lib/features/analyze/study_export_zip.dart
@@ -38,7 +38,7 @@ extension StudyExportZipX on StudyExportData {
 
   String get defaultFilename => '${study.title?.toKey() ?? ''}_${DateTime.now()}';
 
-  downloadAsZip({String? filename}) async {
+  Future downloadAsZip({String? filename}) async {
     filename ??= defaultFilename;
     return downloadBytes(
       bytes: (await encodedZip)!,
diff --git a/designer_v2/lib/features/app.dart b/designer_v2/lib/features/app.dart
index 798f3fcb2..48f6a5dec 100644
--- a/designer_v2/lib/features/app.dart
+++ b/designer_v2/lib/features/app.dart
@@ -44,7 +44,7 @@ class _AppContentState extends ConsumerState<AppContent> {
     sourceColor: const Color(0xff4845e5),
     //sourceColor: const Color(0xff2962ff),
     themeMode: ThemeMode.system,
-  ));
+  ),);
 
   @override
   void initState() {
diff --git a/designer_v2/lib/features/app_controller.dart b/designer_v2/lib/features/app_controller.dart
index d4d916b17..2d62eacf8 100644
--- a/designer_v2/lib/features/app_controller.dart
+++ b/designer_v2/lib/features/app_controller.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
+
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/features/app_controller_state.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 
@@ -10,8 +10,6 @@ abstract class IAppDelegate {
   Future<bool> onAppStart();
 }
 
-typedef _DelegateCallback = Future<bool> Function(IAppDelegate delegate);
-
 /// Main controller that's bound to the top-level application widget's state
 class AppController extends StateNotifier<AppControllerState> {
   /// List of listeners for app lifecycle events registered via Riverpod
@@ -19,22 +17,29 @@ class AppController extends StateNotifier<AppControllerState> {
 
   /// A dummy [Future] used for setting a lower bound on app initialization
   /// (so that the splash screen is shown during this time)
-  late final _delayedFuture = Future.delayed(const Duration(milliseconds: Config.minSplashTime), () => true);
+  late final _delayedFuture = Future.delayed(Duration.zero, () => true);
 
-  AppController({required this.appDelegates}) : super(const AppControllerState());
+  AppController({required this.appDelegates})
+      : super(const AppControllerState());
 
-  get isInitialized => state.status == AppStatus.initialized;
+  bool get isInitialized => state.status == AppStatus.initialized;
 
   Future<bool> onAppStart() async {
     // Forward onAppStart to all registered delegates so that they can
     // e.g. read some data from local storage for initialization
-    final result = await _callDelegates((delegate) => delegate.onAppStart(), withMinDelay: true);
+    final result = await _callDelegates(
+      (delegate) => delegate.onAppStart(),
+      withMinDelay: true,
+    );
     state = const AppControllerState(status: AppStatus.initialized);
     return result;
   }
 
   /// Executes the given callback for all registered delegates concurrently
-  Future<bool> _callDelegates(_DelegateCallback function, {withMinDelay = false}) async {
+  Future<bool> _callDelegates(
+    Future<bool> Function(IAppDelegate) function, {
+    bool withMinDelay = false,
+  }) async {
     final List<Future<bool>> delegateFutures = [];
     // Collect all delegated futures
     for (final delegate in appDelegates) {
@@ -46,16 +51,19 @@ class AppController extends StateNotifier<AppControllerState> {
       delegateFutures.add(_delayedFuture);
     }
     // Wait for all futures to be completed while executing concurrently
-    List<bool> results = await Future.wait(delegateFutures);
+    final List<bool> results = await Future.wait(delegateFutures);
     return !results.contains(false);
   }
 }
 
-final appControllerProvider = StateNotifierProvider<AppController, AppControllerState>((ref) {
-  final appController = AppController(appDelegates: [
-    /// Register [IAppDelegate]s here for invocation of app lifecycle methods
-    ref.watch(authRepositoryProvider),
-  ]);
+final appControllerProvider =
+    StateNotifierProvider<AppController, AppControllerState>((ref) {
+  final appController = AppController(
+    appDelegates: [
+      /// Register [IAppDelegate]s here for invocation of app lifecycle methods
+      ref.watch(authRepositoryProvider),
+    ],
+  );
   appController.addListener((state) {
     print("appController.state updated");
   });
diff --git a/designer_v2/lib/features/app_drawer.dart b/designer_v2/lib/features/app_drawer.dart
index ad28e316a..6dca491db 100644
--- a/designer_v2/lib/features/app_drawer.dart
+++ b/designer_v2/lib/features/app_drawer.dart
@@ -3,14 +3,13 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_designer_v2/assets.dart';
 import 'package:studyu_designer_v2/common_views/icons.dart';
 import 'package:studyu_designer_v2/common_views/utils.dart';
+import 'package:studyu_designer_v2/features/account/account_settings.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/routing/router_intent.dart';
 import 'package:studyu_designer_v2/routing/router_utils.dart';
 
-import 'account/account_settings.dart';
-
 typedef OnEntrySelectedCallback = void Function(BuildContext, WidgetRef);
 
 class DrawerEntry {
@@ -36,9 +35,7 @@ class DrawerEntry {
     if (autoCloseDrawer) {
       Navigator.pop(context);
     }
-    if (onSelected != null) {
-      onSelected!(context, ref);
-    }
+    onSelected?.call(context, ref);
   }
 }
 
@@ -56,7 +53,7 @@ class GoRouterDrawerEntry extends DrawerEntry {
   final void Function()? onNavigated;
 
   @override
-  onClick(BuildContext context, WidgetRef ref) {
+  void onClick(BuildContext context, WidgetRef ref) {
     super.onClick(context, ref);
     ref.read(routerProvider).dispatch(intent);
     onNavigated?.call();
@@ -96,7 +93,8 @@ class _AppDrawerState extends ConsumerState<AppDrawer> {
   /// List of sections with their corresponding menu entries
   late final List<List<DrawerEntry>> bottomEntries;
 
-  List<DrawerEntry> get allEntries => [...topEntries, ...bottomEntries].expand((e) => e).toList();
+  List<DrawerEntry> get allEntries =>
+      [...topEntries, ...bottomEntries].expand((e) => e).toList();
 
   /// Index of the currently selected [[NavigationGoRouterEntry]]
   /// Defaults to -1 if none of the entries is currently selected
@@ -137,12 +135,16 @@ class _AppDrawerState extends ConsumerState<AppDrawer> {
     bottomEntries = [
       [
         DrawerEntry(
-            localizedTitle: () => tr.navlink_account_settings,
-            autoCloseDrawer: widget.autoCloseDrawer,
-            icon: Icons.settings_rounded,
-            onSelected: (context, ref) {
-              showDialog(context: context, builder: (context) => const AccountSettingsDialog());
-            }),
+          localizedTitle: () => tr.navlink_account_settings,
+          autoCloseDrawer: widget.autoCloseDrawer,
+          icon: Icons.settings_rounded,
+          onSelected: (context, ref) {
+            showDialog(
+              context: context,
+              builder: (context) => const AccountSettingsDialog(),
+            );
+          },
+        ),
         DrawerEntry(
           localizedTitle: () => tr.navlink_logout,
           autoCloseDrawer: widget.autoCloseDrawer,
@@ -192,7 +194,6 @@ class _AppDrawerState extends ConsumerState<AppDrawer> {
       child: Drawer(
         width: widget.width.toDouble(),
         child: Column(
-          mainAxisSize: MainAxisSize.max,
           mainAxisAlignment: MainAxisAlignment.spaceAround,
           children: [
             Expanded(
@@ -202,7 +203,6 @@ class _AppDrawerState extends ConsumerState<AppDrawer> {
                 child: ListView(
                   // Important: Remove any padding from the ListView.
                   padding: EdgeInsets.zero,
-                  shrinkWrap: false,
                   children: [
                     _buildLogo(context),
                     ..._buildTopMenuItems(context),
@@ -213,7 +213,7 @@ class _AppDrawerState extends ConsumerState<AppDrawer> {
             Padding(
               padding: const EdgeInsets.only(bottom: 24.0),
               child: Column(children: _buildBottomMenuItems(context)),
-            )
+            ),
           ],
         ),
       ),
@@ -224,11 +224,17 @@ class _AppDrawerState extends ConsumerState<AppDrawer> {
     // final textTheme = Theme.of(context).textTheme;
 
     return Container(
-      constraints: BoxConstraints(minHeight: widget.logoSectionMinHeight, maxHeight: widget.logoSectionMaxHeight),
+      constraints: BoxConstraints(
+        minHeight: widget.logoSectionMinHeight,
+        maxHeight: widget.logoSectionMaxHeight,
+      ),
       child: Container(
         constraints: BoxConstraints(maxHeight: widget.logoMaxHeight),
         child: Padding(
-          padding: EdgeInsets.symmetric(horizontal: widget.logoPaddingHorizontal, vertical: widget.logoPaddingVertical),
+          padding: EdgeInsets.symmetric(
+            horizontal: widget.logoPaddingHorizontal,
+            vertical: widget.logoPaddingVertical,
+          ),
           child: GestureDetector(
             onTap: () => ref.read(routerProvider).dispatch(RoutingIntents.root),
             child: Container(
@@ -255,7 +261,7 @@ class _AppDrawerState extends ConsumerState<AppDrawer> {
     ); */
   }
 
-  _buildSections(List<List<DrawerEntry>> sections) {
+  List<Widget> _buildSections(List<List<DrawerEntry>> sections) {
     final List<Widget> widgets = [];
     for (final section in sections) {
       for (final entry in section) {
@@ -297,7 +303,7 @@ class _AppDrawerState extends ConsumerState<AppDrawer> {
       leading: Icon(
         entry.icon,
         size: theme.iconTheme.size! * 1.2,
-        color: (isSelected)
+        color: isSelected
             ? null
             : (entry.enabled)
                 ? theme.iconTheme.color!.faded(0.75)
diff --git a/designer_v2/lib/features/auth/auth_form_controller.dart b/designer_v2/lib/features/auth/auth_form_controller.dart
index 034feb869..ebc352e32 100644
--- a/designer_v2/lib/features/auth/auth_form_controller.dart
+++ b/designer_v2/lib/features/auth/auth_form_controller.dart
@@ -48,7 +48,8 @@ enum AuthFormKey {
   }
 }
 
-class AuthFormController extends StateNotifier<AsyncValue<void>> implements IFormGroupController {
+class AuthFormController extends StateNotifier<AsyncValue<void>>
+    implements IFormGroupController {
   AuthFormController({
     required this.authRepository,
     required this.notificationService,
@@ -70,10 +71,12 @@ class AuthFormController extends StateNotifier<AsyncValue<void>> implements IFor
   final FormControl<bool> termsOfServiceControl = FormControl(value: false);
 
   static final authValidationMessages = {
-    ValidationMessage.required: (error) => tr.form_field_required,
-    ValidationMessage.email: (error) => tr.form_field_email_invalid,
-    ValidationMessage.mustMatch: (error) => tr.form_field_password_mustmatch,
-    ValidationMessage.minLength: (error) => tr.form_field_password_minlength(error['requiredLength']),
+    ValidationMessage.required: (_) => tr.form_field_required,
+    ValidationMessage.email: (_) => tr.form_field_email_invalid,
+    ValidationMessage.mustMatch: (_) => tr.form_field_password_mustmatch,
+    ValidationMessage.minLength: (error) => tr.form_field_password_minlength(
+          (error as Map)['requiredLength'] as String,
+        ),
   };
 
   late final FormGroup loginForm = FormGroup({
@@ -81,27 +84,34 @@ class AuthFormController extends StateNotifier<AsyncValue<void>> implements IFor
     'password': passwordControl,
   });
 
-  late final FormGroup signupForm = FormGroup({
-    'email': emailControl,
-    'password': passwordControl,
-    'passwordConfirmation': passwordConfirmationControl,
-    'termsOfService': termsOfServiceControl,
-  }, validators: [
-    Validators.mustMatch('password', 'passwordConfirmation'),
-  ]);
+  late final FormGroup signupForm = FormGroup(
+    {
+      'email': emailControl,
+      'password': passwordControl,
+      'passwordConfirmation': passwordConfirmationControl,
+      'termsOfService': termsOfServiceControl,
+    },
+    validators: [
+      Validators.mustMatch('password', 'passwordConfirmation'),
+    ],
+  );
 
   late final FormGroup passwordForgotForm = FormGroup({
     'email': emailControl,
   });
 
-  late final FormGroup passwordRecoveryForm = FormGroup({
-    'password': passwordControl,
-    'passwordConfirmation': passwordConfirmationControl,
-  }, validators: [
-    Validators.mustMatch('password', 'passwordConfirmation'),
-  ]);
+  late final FormGroup passwordRecoveryForm = FormGroup(
+    {
+      'password': passwordControl,
+      'passwordConfirmation': passwordConfirmationControl,
+    },
+    validators: [
+      Validators.mustMatch('password', 'passwordConfirmation'),
+    ],
+  );
 
-  late final Map<AuthFormKey, Map<FormControl, List<Validator<dynamic>>>> controlValidatorsByForm = {
+  late final Map<AuthFormKey, Map<FormControl, List<Validator<dynamic>>>>
+      controlValidatorsByForm = {
     AuthFormKey.signup: {
       emailControl: [Validators.required, Validators.email],
       passwordControl: [Validators.minLength(8)],
@@ -138,9 +148,9 @@ class AuthFormController extends StateNotifier<AsyncValue<void>> implements IFor
   }
 
   @override
-  FormGroup get form => _getFormFor(formKey);
+  FormGroup get form => _getFormFor(formKey)!;
 
-  _getFormFor(AuthFormKey key) {
+  FormGroup? _getFormFor(AuthFormKey key) {
     switch (key) {
       case AuthFormKey.login:
         return loginForm;
@@ -155,11 +165,11 @@ class AuthFormController extends StateNotifier<AsyncValue<void>> implements IFor
     }
   }
 
-  _onChangeFormKey(AuthFormKey key) {
+  void _onChangeFormKey(AuthFormKey key) {
     resetControlsFor(key);
   }
 
-  resetControlsFor(AuthFormKey key) {
+  void resetControlsFor(AuthFormKey key) {
     final formControlValidators = controlValidatorsByForm[key];
     if (formControlValidators != null) {
       for (final entry in formControlValidators.entries) {
@@ -173,7 +183,7 @@ class AuthFormController extends StateNotifier<AsyncValue<void>> implements IFor
     form.updateValueAndValidity();
   }
 
-  _forceValidationMessages(AuthFormKey key) {
+  void _forceValidationMessages(AuthFormKey key) {
     _onChangeFormKey(key);
     for (final control in form.controls.values) {
       control.markAsTouched();
@@ -209,7 +219,9 @@ class AuthFormController extends StateNotifier<AsyncValue<void>> implements IFor
 
   Future<AuthResponse> signIn() async {
     _forceValidationMessages(AuthFormKey._loginSubmit);
-    if (!form.valid || emailControl.isNullOrEmpty || passwordControl.isNullOrEmpty) {
+    if (!form.valid ||
+        emailControl.isNullOrEmpty ||
+        passwordControl.isNullOrEmpty) {
       return Future.value(AuthResponse());
     }
     return await _signInWith(emailControl.value!, passwordControl.value!);
@@ -218,7 +230,8 @@ class AuthFormController extends StateNotifier<AsyncValue<void>> implements IFor
   Future<AuthResponse> _signInWith(String email, String password) async {
     try {
       state = const AsyncValue.loading();
-      final response = await authRepository.signInWith(email: email, password: password);
+      final response =
+          await authRepository.signInWith(email: email, password: password);
       return response;
     } catch (e) {
       state = AsyncValue.error(e, StackTrace.current);
@@ -252,7 +265,7 @@ class AuthFormController extends StateNotifier<AsyncValue<void>> implements IFor
 
   Future<void> sendPasswordResetLink() {
     if (!form.valid) {
-      return Future.value(null);
+      return Future.value();
     }
     return resetPasswordForEmail(emailControl.value!)
         .then((_) => notificationService.show(Notifications.passwordReset));
@@ -260,17 +273,20 @@ class AuthFormController extends StateNotifier<AsyncValue<void>> implements IFor
 
   Future<void> recoverPassword() async {
     if (!form.valid) {
-      return Future.value(null);
+      return Future.value();
     }
     return updateUser(passwordControl.value!)
-        .then((_) => notificationService.show(Notifications.passwordResetSuccess))
+        .then(
+          (_) => notificationService.show(Notifications.passwordResetSuccess),
+        )
         .then((_) => router.dispatch(RoutingIntents.studies));
   }
 
   Future<bool> updateUser(String newPassword) async {
     try {
       state = const AsyncValue.loading();
-      return (await authRepository.updateUser(newPassword: newPassword)).user != null;
+      return (await authRepository.updateUser(newPassword: newPassword)).user !=
+          null;
     } catch (e) {
       state = AsyncValue.error(e, StackTrace.current);
     } finally {
@@ -292,8 +308,8 @@ class AuthFormController extends StateNotifier<AsyncValue<void>> implements IFor
   }
 }
 
-final authFormControllerProvider =
-    StateNotifierProvider.autoDispose.family<AuthFormController, AsyncValue<void>, AuthFormKey>((ref, formKey) {
+final authFormControllerProvider = StateNotifierProvider.autoDispose
+    .family<AuthFormController, AsyncValue<void>, AuthFormKey>((ref, formKey) {
   final authFormController = AuthFormController(
     authRepository: ref.watch(authRepositoryProvider),
     notificationService: ref.watch(notificationServiceProvider),
@@ -304,14 +320,14 @@ final authFormControllerProvider =
   authFormController.addListener((state) {
     print("authFormController.state updated");
     if (state.hasError) {
-      final AuthException error = state.error as AuthException;
+      final AuthException error = state.error! as AuthException;
       switch (error.message) {
         case "Invalid login credentials":
-          authFormController.notificationService.show(Notifications.credentialsInvalid);
-          break;
+          authFormController.notificationService
+              .show(Notifications.credentialsInvalid);
         case "User already registered":
-          authFormController.notificationService.show(Notifications.userAlreadyRegistered);
-          break;
+          authFormController.notificationService
+              .show(Notifications.userAlreadyRegistered);
         default:
           authFormController.notificationService.showMessage(error.message);
       }
diff --git a/designer_v2/lib/features/auth/auth_form_fields.dart b/designer_v2/lib/features/auth/auth_form_fields.dart
index 919e3acd4..09e4c1208 100644
--- a/designer_v2/lib/features/auth/auth_form_fields.dart
+++ b/designer_v2/lib/features/auth/auth_form_fields.dart
@@ -5,13 +5,16 @@ import 'package:studyu_designer_v2/localization/app_translation.dart';
 
 class EmailTextField extends StatefulWidget {
   EmailTextField({
-    labelText,
     this.formControlName,
     this.formControl,
-    hintText,
+    String? labelText,
+    String? hintText,
     super.key,
-  })  : assert((formControlName != null && formControl == null) || (formControlName == null && formControl != null),
-            "Must provide either formControlName or formControl"),
+  })  : assert(
+          (formControlName != null && formControl == null) ||
+              (formControlName == null && formControl != null),
+          "Must provide either formControlName or formControl",
+        ),
         labelText = labelText ?? tr.form_field_email,
         hintText = hintText ?? tr.form_field_email_hint;
 
@@ -40,7 +43,7 @@ class _EmailTextFieldState extends State<EmailTextField> {
               hintText: widget.hintText,
             ),
           ),
-        )
+        ),
       ],
     );
   }
@@ -51,11 +54,14 @@ class PasswordTextField extends StatefulWidget {
     this.formControlName,
     this.formControl,
     this.onSubmitted,
-    labelText,
-    hintText,
+    String? labelText,
+    String? hintText,
     super.key,
-  })  : assert((formControlName != null && formControl == null) || (formControlName == null && formControl != null),
-            "Must provide either formControlName or formControl"),
+  })  : assert(
+          (formControlName != null && formControl == null) ||
+              (formControlName == null && formControl != null),
+          "Must provide either formControlName or formControl",
+        ),
         labelText = labelText ?? tr.form_field_password,
         hintText = hintText ?? tr.form_field_password_hint;
 
@@ -78,25 +84,28 @@ class _PasswordTextFieldState extends State<PasswordTextField> {
       rowLayout: FormTableRowLayout.vertical,
       rows: [
         FormTableRow(
-            input: ReactiveTextField(
-          formControl: widget.formControl,
-          formControlName: widget.formControlName,
-          obscureText: !passwordVisibility,
-          onSubmitted: widget.onSubmitted,
-          decoration: InputDecoration(
-            labelText: widget.labelText,
-            hintText: widget.hintText,
-            suffixIcon: InkWell(
-              onTap: () => setState(
-                () => passwordVisibility = !passwordVisibility,
-              ),
-              focusNode: FocusNode(skipTraversal: true),
-              child: Icon(
-                passwordVisibility ? Icons.visibility_outlined : Icons.visibility_off_outlined,
+          input: ReactiveTextField(
+            formControl: widget.formControl,
+            formControlName: widget.formControlName,
+            obscureText: !passwordVisibility,
+            onSubmitted: widget.onSubmitted,
+            decoration: InputDecoration(
+              labelText: widget.labelText,
+              hintText: widget.hintText,
+              suffixIcon: InkWell(
+                onTap: () => setState(
+                  () => passwordVisibility = !passwordVisibility,
+                ),
+                focusNode: FocusNode(skipTraversal: true),
+                child: Icon(
+                  passwordVisibility
+                      ? Icons.visibility_outlined
+                      : Icons.visibility_off_outlined,
+                ),
               ),
             ),
           ),
-        ))
+        ),
       ],
     );
   }
diff --git a/designer_v2/lib/features/auth/auth_scaffold.dart b/designer_v2/lib/features/auth/auth_scaffold.dart
index 115f58486..28566bfb2 100644
--- a/designer_v2/lib/features/auth/auth_scaffold.dart
+++ b/designer_v2/lib/features/auth/auth_scaffold.dart
@@ -50,7 +50,6 @@ class _AuthScaffoldState extends ConsumerState<AuthScaffold> {
     return Scaffold(
       key: RouterKeys.authKey,
       backgroundColor: Colors.white,
-      appBar: null,
       body: TwoColumnLayout(
         flexLeft: 6,
         flexRight: 7,
@@ -59,7 +58,6 @@ class _AuthScaffoldState extends ConsumerState<AuthScaffold> {
           child: ReactiveForm(
             formGroup: controller.form,
             child: Column(
-              mainAxisAlignment: MainAxisAlignment.start,
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Container(
@@ -72,30 +70,32 @@ class _AuthScaffoldState extends ConsumerState<AuthScaffold> {
                     // adjust for whitespace in logo
                     padding: const EdgeInsets.only(left: 12.0),
                     child: Container(
-                      constraints: BoxConstraints(maxWidth: widget.leftContentMinWidth - 24.0),
+                      constraints: BoxConstraints(
+                          maxWidth: widget.leftContentMinWidth - 24.0,),
                       child: Column(
-                        mainAxisAlignment: MainAxisAlignment.start,
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
                           SelectableText(
                             formKey.title,
-                            style: theme.textTheme.displaySmall!,
+                            style: theme.textTheme.displaySmall,
                           ),
                           const SizedBox(height: 8.0),
-                          (formKey.description != null)
-                              ? TextParagraph(
-                                  text: formKey.description,
-                                  style: ThemeConfig.bodyTextMuted(theme),
-                                )
-                              : const SizedBox.shrink(),
+                          if (formKey.description != null)
+                            TextParagraph(
+                              text: formKey.description,
+                              style: ThemeConfig.bodyTextMuted(theme),
+                            )
+                          else
+                            const SizedBox.shrink(),
                           const SizedBox(height: 24.0),
                           Flexible(
                             child: SingleChildScrollView(
-                                child: Padding(
-                              padding: const EdgeInsets.only(right: 24.0),
-                              child: widget.body,
-                            )),
-                          )
+                              child: Padding(
+                                padding: const EdgeInsets.only(right: 24.0),
+                                child: widget.body,
+                              ),
+                            ),
+                          ),
                         ],
                       ),
                     ),
@@ -106,10 +106,10 @@ class _AuthScaffoldState extends ConsumerState<AuthScaffold> {
                   // adjust for whitespace in logo
                   padding: const EdgeInsets.only(left: 12.0),
                   child: Container(
-                    constraints: BoxConstraints(maxWidth: widget.leftPanelMinWidth - 12 * 2),
+                    constraints: BoxConstraints(
+                        maxWidth: widget.leftPanelMinWidth - 12 * 2,),
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      crossAxisAlignment: CrossAxisAlignment.center,
                       children: [
                         SelectableText(
                           "© HPI Digital Health Cluster ${DateTime.now().year}",
@@ -119,17 +119,19 @@ class _AuthScaffoldState extends ConsumerState<AuthScaffold> {
                           children: [
                             LanguagePicker(
                               languagePickerType: LanguagePickerType.icon,
-                              iconColor: ThemeConfig.bodyTextBackground(theme).color!,
+                              iconColor:
+                                  ThemeConfig.bodyTextBackground(theme).color,
                               offset: const Offset(0, -60),
                             ),
                             const SizedBox(width: 12.0),
                             Hyperlink(
                               text: tr.imprint,
                               onClick: () => _onClickImprint(appConfig),
-                              linkColor: ThemeConfig.bodyTextBackground(theme).color!,
+                              linkColor:
+                                  ThemeConfig.bodyTextBackground(theme).color!,
                             ),
                           ],
-                        )
+                        ),
                       ],
                     ),
                   ),
@@ -149,7 +151,6 @@ class _AuthScaffoldState extends ConsumerState<AuthScaffold> {
             ),
           ],
         ),
-        headerWidget: null,
         backgroundColorLeft: ThemeConfig.bodyBackgroundColor(theme),
         backgroundColorRight: theme.colorScheme.primary,
         constraintsLeft: BoxConstraints(minWidth: widget.leftPanelMinWidth),
@@ -161,7 +162,7 @@ class _AuthScaffoldState extends ConsumerState<AuthScaffold> {
     );
   }
 
-  _onClickImprint(AppConfig? appConfig) {
+  Future<bool?> _onClickImprint(AppConfig? appConfig) {
     final locale = ref.watch(localeProvider);
     if (appConfig != null) {
       final imprintUri = appConfig.imprint[locale.languageCode];
@@ -169,5 +170,6 @@ class _AuthScaffoldState extends ConsumerState<AuthScaffold> {
         return launchUrl(Uri.parse(imprintUri));
       }
     }
+    return Future.value(false);
   }
 }
diff --git a/designer_v2/lib/features/auth/login_form_view.dart b/designer_v2/lib/features/auth/login_form_view.dart
index 3327146ed..a9e83f68a 100644
--- a/designer_v2/lib/features/auth/login_form_view.dart
+++ b/designer_v2/lib/features/auth/login_form_view.dart
@@ -13,10 +13,10 @@ import 'package:studyu_designer_v2/routing/router_intent.dart';
 class LoginForm extends FormConsumerRefWidget {
   const LoginForm({super.key});
 
-  final AuthFormKey formKey = AuthFormKey.login;
-
   @override
   Widget build(BuildContext context, FormGroup form, WidgetRef ref) {
+    const formKey = AuthFormKey.login;
+
     final theme = Theme.of(context);
     final state = ref.watch(authFormControllerProvider(formKey));
     final controller = ref.watch(authFormControllerProvider(formKey).notifier);
@@ -30,34 +30,44 @@ class LoginForm extends FormConsumerRefWidget {
         const SizedBox(height: 4.0),
         PasswordTextField(
           formControl: controller.passwordControl,
-          onSubmitted: (_) => form.valid ? ref.read(authFormControllerProvider(formKey).notifier).signIn() : null,
+          onSubmitted: (_) => form.valid
+              ? ref.read(authFormControllerProvider(formKey).notifier).signIn()
+              : null,
         ),
         const SizedBox(height: 8.0),
         Row(
           mainAxisAlignment: MainAxisAlignment.end,
-          crossAxisAlignment: CrossAxisAlignment.center,
           children: [
             Hyperlink(
               text: tr.link_forgot_password,
               style: TextStyle(fontSize: theme.textTheme.bodySmall!.fontSize),
-              onClick: () => ref.read(routerProvider).dispatch(RoutingIntents.passwordForgot),
+              onClick: () => ref
+                  .read(routerProvider)
+                  .dispatch(RoutingIntents.passwordForgot),
             ),
           ],
         ),
         const SizedBox(height: 24.0),
-        ReactiveFormConsumer(builder: (context, form, child) {
-          return Center(
-            child: PrimaryButton(
-              icon: Icons.login,
-              text: tr.action_button_login,
-              isLoading: state.isLoading,
-              enabled: form.valid,
-              onPressedFuture: () => ref.read(authFormControllerProvider(formKey).notifier).signIn(),
-              tooltipDisabled: tr.form_invalid_prompt,
-              innerPadding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 10.0),
-            ),
-          );
-        }),
+        ReactiveFormConsumer(
+          builder: (context, form, child) {
+            return Center(
+              child: PrimaryButton(
+                icon: Icons.login,
+                text: tr.action_button_login,
+                isLoading: state.isLoading,
+                enabled: form.valid,
+                onPressedFuture: () => ref
+                    .read(authFormControllerProvider(formKey).notifier)
+                    .signIn(),
+                tooltipDisabled: tr.form_invalid_prompt,
+                innerPadding: const EdgeInsets.symmetric(
+                  horizontal: 24.0,
+                  vertical: 10.0,
+                ),
+              ),
+            );
+          },
+        ),
         const SizedBox(height: 24.0),
         const Divider(height: 1),
         const SizedBox(height: 12.0),
@@ -68,10 +78,11 @@ class LoginForm extends FormConsumerRefWidget {
             const SizedBox(width: 4.0),
             Hyperlink(
               text: tr.link_signup,
-              onClick: () => ref.read(routerProvider).dispatch(RoutingIntents.signup),
+              onClick: () =>
+                  ref.read(routerProvider).dispatch(RoutingIntents.signup),
             ),
           ],
-        )
+        ),
       ],
     );
   }
diff --git a/designer_v2/lib/features/auth/password_forgot_form_view.dart b/designer_v2/lib/features/auth/password_forgot_form_view.dart
index 38b9770cc..0bb55b7b1 100644
--- a/designer_v2/lib/features/auth/password_forgot_form_view.dart
+++ b/designer_v2/lib/features/auth/password_forgot_form_view.dart
@@ -13,10 +13,10 @@ import 'package:studyu_designer_v2/routing/router_intent.dart';
 class PasswordForgotForm extends FormConsumerRefWidget {
   const PasswordForgotForm({super.key});
 
-  final AuthFormKey formKey = AuthFormKey.passwordForgot;
-
   @override
   Widget build(BuildContext context, FormGroup form, WidgetRef ref) {
+    const formKey = AuthFormKey.passwordForgot;
+
     final state = ref.watch(authFormControllerProvider(formKey));
     final controller = ref.watch(authFormControllerProvider(formKey).notifier);
 
@@ -27,19 +27,26 @@ class PasswordForgotForm extends FormConsumerRefWidget {
           formControl: controller.emailControl,
         ),
         const SizedBox(height: 24.0),
-        ReactiveFormConsumer(builder: (context, form, child) {
-          return Center(
-            child: PrimaryButton(
-              icon: null,
-              text: tr.action_button_password_reset,
-              isLoading: state.isLoading,
-              enabled: form.valid,
-              onPressedFuture: () => ref.read(authFormControllerProvider(formKey).notifier).sendPasswordResetLink(),
-              tooltipDisabled: tr.form_invalid_prompt,
-              innerPadding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 10.0),
-            ),
-          );
-        }),
+        ReactiveFormConsumer(
+          builder: (context, form, child) {
+            return Center(
+              child: PrimaryButton(
+                icon: null,
+                text: tr.action_button_password_reset,
+                isLoading: state.isLoading,
+                enabled: form.valid,
+                onPressedFuture: () => ref
+                    .read(authFormControllerProvider(formKey).notifier)
+                    .sendPasswordResetLink(),
+                tooltipDisabled: tr.form_invalid_prompt,
+                innerPadding: const EdgeInsets.symmetric(
+                  horizontal: 24.0,
+                  vertical: 10.0,
+                ),
+              ),
+            );
+          },
+        ),
         const SizedBox(height: 24.0),
         const Divider(height: 1),
         const SizedBox(height: 12.0),
@@ -50,10 +57,11 @@ class PasswordForgotForm extends FormConsumerRefWidget {
             const SizedBox(width: 4.0),
             Hyperlink(
               text: tr.link_login,
-              onClick: () => ref.read(routerProvider).dispatch(RoutingIntents.login),
+              onClick: () =>
+                  ref.read(routerProvider).dispatch(RoutingIntents.login),
             ),
           ],
-        )
+        ),
       ],
     );
   }
diff --git a/designer_v2/lib/features/auth/password_recovery_form_view.dart b/designer_v2/lib/features/auth/password_recovery_form_view.dart
index 3f0bdb89f..fd42199ff 100644
--- a/designer_v2/lib/features/auth/password_recovery_form_view.dart
+++ b/designer_v2/lib/features/auth/password_recovery_form_view.dart
@@ -13,10 +13,10 @@ import 'package:studyu_designer_v2/routing/router_intent.dart';
 class PasswordRecoveryForm extends FormConsumerRefWidget {
   const PasswordRecoveryForm({super.key});
 
-  final AuthFormKey formKey = AuthFormKey.passwordRecovery;
-
   @override
   Widget build(BuildContext context, FormGroup form, WidgetRef ref) {
+    const formKey = AuthFormKey.passwordRecovery;
+
     final state = ref.watch(authFormControllerProvider(formKey));
     final controller = ref.watch(authFormControllerProvider(formKey).notifier);
 
@@ -33,23 +33,33 @@ class PasswordRecoveryForm extends FormConsumerRefWidget {
           formControl: controller.passwordConfirmationControl,
           labelText: tr.form_field_password_new_confirm,
           hintText: tr.form_field_password_new_confirm_hint,
-          onSubmitted: (_) =>
-              form.valid ? ref.read(authFormControllerProvider(formKey).notifier).recoverPassword() : null,
+          onSubmitted: (_) => form.valid
+              ? ref
+                  .read(authFormControllerProvider(formKey).notifier)
+                  .recoverPassword()
+              : null,
         ),
         const SizedBox(height: 24.0),
-        ReactiveFormConsumer(builder: (context, form, child) {
-          return Center(
-            child: PrimaryButton(
-              icon: null,
-              text: tr.action_button_password_reset,
-              isLoading: state.isLoading,
-              enabled: form.valid,
-              onPressedFuture: () => ref.read(authFormControllerProvider(formKey).notifier).recoverPassword(),
-              tooltipDisabled: tr.form_invalid_prompt,
-              innerPadding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 10.0),
-            ),
-          );
-        }),
+        ReactiveFormConsumer(
+          builder: (context, form, child) {
+            return Center(
+              child: PrimaryButton(
+                icon: null,
+                text: tr.action_button_password_reset,
+                isLoading: state.isLoading,
+                enabled: form.valid,
+                onPressedFuture: () => ref
+                    .read(authFormControllerProvider(formKey).notifier)
+                    .recoverPassword(),
+                tooltipDisabled: tr.form_invalid_prompt,
+                innerPadding: const EdgeInsets.symmetric(
+                  horizontal: 24.0,
+                  vertical: 10.0,
+                ),
+              ),
+            );
+          },
+        ),
         const SizedBox(height: 24.0),
         const Divider(height: 1),
         const SizedBox(height: 12.0),
@@ -60,10 +70,11 @@ class PasswordRecoveryForm extends FormConsumerRefWidget {
             const SizedBox(width: 4.0),
             Hyperlink(
               text: tr.link_login,
-              onClick: () => ref.read(routerProvider).dispatch(RoutingIntents.login),
+              onClick: () =>
+                  ref.read(routerProvider).dispatch(RoutingIntents.login),
             ),
           ],
-        )
+        ),
       ],
     );
   }
diff --git a/designer_v2/lib/features/auth/signup_form_view.dart b/designer_v2/lib/features/auth/signup_form_view.dart
index 6e4989096..7538d489c 100644
--- a/designer_v2/lib/features/auth/signup_form_view.dart
+++ b/designer_v2/lib/features/auth/signup_form_view.dart
@@ -17,10 +17,10 @@ import 'package:url_launcher/url_launcher.dart';
 class SignupForm extends FormConsumerRefWidget {
   const SignupForm({super.key});
 
-  final AuthFormKey formKey = AuthFormKey.signup;
-
   @override
   Widget build(BuildContext context, FormGroup form, WidgetRef ref) {
+    const formKey = AuthFormKey.signup;
+
     final theme = Theme.of(context);
     final state = ref.watch(authFormControllerProvider(formKey));
     final controller = ref.watch(authFormControllerProvider(formKey).notifier);
@@ -42,11 +42,12 @@ class SignupForm extends FormConsumerRefWidget {
           formControl: controller.passwordConfirmationControl,
           labelText: tr.form_field_password_confirm,
           hintText: tr.form_field_password_confirm_hint,
-          onSubmitted: (_) => form.valid ? ref.read(authFormControllerProvider(formKey).notifier).signUp() : null,
+          onSubmitted: (_) => form.valid
+              ? ref.read(authFormControllerProvider(formKey).notifier).signUp()
+              : null,
         ),
         const SizedBox(height: 16.0),
         Row(
-          crossAxisAlignment: CrossAxisAlignment.center,
           children: [
             Align(
               alignment: Alignment.topLeft,
@@ -90,22 +91,29 @@ class SignupForm extends FormConsumerRefWidget {
                   ),
                 ],
               ),
-            )
+            ),
           ],
         ),
         const SizedBox(height: 24.0),
-        ReactiveFormConsumer(builder: (context, form, child) {
-          return Center(
-            child: PrimaryButton(
-              text: tr.action_button_signup,
-              isLoading: state.isLoading,
-              enabled: form.valid,
-              onPressedFuture: () => ref.read(authFormControllerProvider(formKey).notifier).signUp(),
-              tooltipDisabled: tr.form_invalid_prompt,
-              innerPadding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 10.0),
-            ),
-          );
-        }),
+        ReactiveFormConsumer(
+          builder: (context, form, child) {
+            return Center(
+              child: PrimaryButton(
+                text: tr.action_button_signup,
+                isLoading: state.isLoading,
+                enabled: form.valid,
+                onPressedFuture: () => ref
+                    .read(authFormControllerProvider(formKey).notifier)
+                    .signUp(),
+                tooltipDisabled: tr.form_invalid_prompt,
+                innerPadding: const EdgeInsets.symmetric(
+                  horizontal: 24.0,
+                  vertical: 10.0,
+                ),
+              ),
+            );
+          },
+        ),
         const SizedBox(height: 24.0),
         const Divider(height: 1),
         const SizedBox(height: 12.0),
@@ -116,31 +124,38 @@ class SignupForm extends FormConsumerRefWidget {
             const SizedBox(width: 4.0),
             Hyperlink(
               text: tr.link_login,
-              onClick: () => ref.read(routerProvider).dispatch(RoutingIntents.login),
+              onClick: () =>
+                  ref.read(routerProvider).dispatch(RoutingIntents.login),
             ),
           ],
-        )
+        ),
       ],
     );
   }
 
-  _onClickTermsOfUse(WidgetRef ref) {
+  void _onClickTermsOfUse(WidgetRef ref) {
     final appConfig = ref.watch(appConfigProvider);
     final locale = ref.watch(localeProvider);
 
-    launchUrl(appConfig.maybeWhen(
-      data: (value) => Uri.parse(value.designerTerms[locale.languageCode] ?? ""),
-      orElse: () => Uri.parse(''),
-    ));
+    launchUrl(
+      appConfig.maybeWhen(
+        data: (value) =>
+            Uri.parse(value.designerTerms[locale.languageCode] ?? ""),
+        orElse: () => Uri.parse(''),
+      ),
+    );
   }
 
-  _onClickPrivacyPolicy(WidgetRef ref) {
+  void _onClickPrivacyPolicy(WidgetRef ref) {
     final appConfig = ref.watch(appConfigProvider);
     final locale = ref.watch(localeProvider);
 
-    launchUrl(appConfig.maybeWhen(
-      data: (value) => Uri.parse(value.designerPrivacy[locale.languageCode] ?? ""),
-      orElse: () => Uri.parse(''),
-    ));
+    launchUrl(
+      appConfig.maybeWhen(
+        data: (value) =>
+            Uri.parse(value.designerPrivacy[locale.languageCode] ?? ""),
+        orElse: () => Uri.parse(''),
+      ),
+    );
   }
 }
diff --git a/designer_v2/lib/features/auth/studyu_jtbd.dart b/designer_v2/lib/features/auth/studyu_jtbd.dart
index d8059fa98..39553805e 100644
--- a/designer_v2/lib/features/auth/studyu_jtbd.dart
+++ b/designer_v2/lib/features/auth/studyu_jtbd.dart
@@ -13,10 +13,11 @@ class StudyUJobsToBeDone extends StatelessWidget {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           Padding(
-            padding: const EdgeInsets.only(left: 0 * 48.0),
+            padding: EdgeInsets.zero,
             child: Text(
               tr.navlink_learn,
-              style: theme.textTheme.displayLarge?.copyWith(color: Colors.white.withOpacity(1.5 * 0.04)),
+              style: theme.textTheme.displayLarge
+                  ?.copyWith(color: Colors.white.withOpacity(1.5 * 0.04)),
               softWrap: false,
               overflow: TextOverflow.clip,
             ),
@@ -25,7 +26,8 @@ class StudyUJobsToBeDone extends StatelessWidget {
             padding: const EdgeInsets.only(left: 1 * 48.0),
             child: Text(
               tr.navlink_study_design,
-              style: theme.textTheme.displayLarge?.copyWith(color: Colors.white.withOpacity(4 * 0.04)),
+              style: theme.textTheme.displayLarge
+                  ?.copyWith(color: Colors.white.withOpacity(4 * 0.04)),
               softWrap: false,
               overflow: TextOverflow.clip,
             ),
@@ -34,7 +36,8 @@ class StudyUJobsToBeDone extends StatelessWidget {
             padding: const EdgeInsets.only(left: 2 * 48.0),
             child: Text(
               tr.navlink_study_test,
-              style: theme.textTheme.displayLarge?.copyWith(color: Colors.white.withOpacity(3 * 0.04)),
+              style: theme.textTheme.displayLarge
+                  ?.copyWith(color: Colors.white.withOpacity(3 * 0.04)),
               softWrap: false,
               overflow: TextOverflow.clip,
             ),
@@ -43,7 +46,8 @@ class StudyUJobsToBeDone extends StatelessWidget {
             padding: const EdgeInsets.only(left: 3 * 48.0),
             child: Text(
               tr.navlink_study_monitor,
-              style: theme.textTheme.displayLarge?.copyWith(color: Colors.white.withOpacity(2 * 0.04)),
+              style: theme.textTheme.displayLarge
+                  ?.copyWith(color: Colors.white.withOpacity(2 * 0.04)),
               softWrap: false,
               overflow: TextOverflow.clip,
             ),
@@ -52,7 +56,8 @@ class StudyUJobsToBeDone extends StatelessWidget {
             padding: const EdgeInsets.only(left: 4 * 48.0),
             child: Text(
               tr.navlink_study_analyze,
-              style: theme.textTheme.displayLarge?.copyWith(color: Colors.white.withOpacity(4 * 0.04)),
+              style: theme.textTheme.displayLarge
+                  ?.copyWith(color: Colors.white.withOpacity(4 * 0.04)),
               softWrap: false,
               overflow: TextOverflow.clip,
             ),
@@ -61,7 +66,8 @@ class StudyUJobsToBeDone extends StatelessWidget {
             padding: const EdgeInsets.only(left: 5 * 48.0),
             child: Text(
               tr.navlink_share,
-              style: theme.textTheme.displayLarge?.copyWith(color: Colors.white.withOpacity(3 * 0.04)),
+              style: theme.textTheme.displayLarge
+                  ?.copyWith(color: Colors.white.withOpacity(3 * 0.04)),
               softWrap: false,
               overflow: TextOverflow.clip,
             ),
diff --git a/designer_v2/lib/features/dashboard/dashboard_controller.dart b/designer_v2/lib/features/dashboard/dashboard_controller.dart
index eb030d00d..73c1867ed 100644
--- a/designer_v2/lib/features/dashboard/dashboard_controller.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_controller.dart
@@ -1,9 +1,11 @@
 import 'dart:async';
+
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/common_views/search.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
+import 'package:studyu_designer_v2/features/dashboard/dashboard_state.dart';
 import 'package:studyu_designer_v2/features/dashboard/studies_filter.dart';
 import 'package:studyu_designer_v2/features/dashboard/studies_table.dart';
 import 'package:studyu_designer_v2/features/study/study_actions.dart';
@@ -15,9 +17,8 @@ import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/routing/router_intent.dart';
 import 'package:studyu_designer_v2/utils/model_action.dart';
 
-import 'dashboard_state.dart';
-
-class DashboardController extends StateNotifier<DashboardState> implements IModelActionProvider<Study> {
+class DashboardController extends StateNotifier<DashboardState>
+    implements IModelActionProvider<Study> {
   /// References to the data repositories injected by Riverpod
   final IStudyRepository studyRepository;
   final IAuthRepository authRepository;
@@ -40,34 +41,39 @@ class DashboardController extends StateNotifier<DashboardState> implements IMode
     _subscribeStudies();
   }
 
-  _subscribeStudies() {
-    _studiesSubscription = studyRepository.watchAll().listen((wrappedModels) {
-      print("studyRepository.update");
-      // Update the controller's state when new studies are available in the repository
-      final studies = wrappedModels.map((study) => study.model).toList();
-      state = state.copyWith(
-        studies: () => AsyncValue.data(studies),
-      );
-    }, onError: (error) {
-      state = state.copyWith(
-        studies: () => AsyncValue.error(error, StackTrace.current),
-      );
-    });
+  void _subscribeStudies() {
+    _studiesSubscription = studyRepository.watchAll().listen(
+      (wrappedModels) {
+        print("studyRepository.update");
+        // Update the controller's state when new studies are available in the repository
+        final studies = wrappedModels.map((study) => study.model).toList();
+        state = state.copyWith(
+          studies: () => AsyncValue.data(studies),
+        );
+      },
+      onError: (Object error) {
+        state = state.copyWith(
+          studies: () => AsyncValue.error(error, StackTrace.current),
+        );
+      },
+    );
   }
 
-  setSearchText(String? text) {
+  void setSearchText(String? text) {
     searchController.setText(text ?? state.query);
   }
 
-  setStudiesFilter(StudiesFilter? filter) {
-    state = state.copyWith(studiesFilter: () => filter ?? DashboardState.defaultFilter);
+  void setStudiesFilter(StudiesFilter? filter) {
+    state = state.copyWith(
+      studiesFilter: () => filter ?? DashboardState.defaultFilter,
+    );
   }
 
-  onSelectStudy(Study study) {
+  void onSelectStudy(Study study) {
     router.dispatch(RoutingIntents.studyEdit(study.id));
   }
 
-  onClickNewStudy() {
+  void onClickNewStudy() {
     router.dispatch(RoutingIntents.studyNew);
   }
 
@@ -82,17 +88,20 @@ class DashboardController extends StateNotifier<DashboardState> implements IMode
   }
 
   void setSorting(StudiesTableColumn sortByColumn, bool ascending) {
-    state = state.copyWith(sortByColumn: sortByColumn, sortAscending: ascending);
+    state =
+        state.copyWith(sortByColumn: sortByColumn, sortAscending: ascending);
   }
 
-  void filterStudies(String? query) async {
+  Future<void> filterStudies(String? query) async {
     state = state.copyWith(
       query: query,
     );
   }
 
-  void sortStudies() async {
-    final studies = state.sort(pinnedStudies: userRepository.user.preferences.pinnedStudies);
+  Future<void> sortStudies() async {
+    final studies = state.sort(
+      pinnedStudies: userRepository.user.preferences.pinnedStudies,
+    );
     state = state.copyWith(
       studies: () => AsyncValue.data(studies),
     );
@@ -126,7 +135,7 @@ class DashboardController extends StateNotifier<DashboardState> implements IMode
           await pinOffStudy(model.id);
         },
         isAvailable: isPinned(model),
-      )
+      ),
     ].where((action) => action.isAvailable).toList();
 
     return withIcons(
@@ -136,13 +145,15 @@ class DashboardController extends StateNotifier<DashboardState> implements IMode
   }
 
   @override
-  dispose() {
+  void dispose() {
     _studiesSubscription?.cancel();
     super.dispose();
   }
 }
 
-final dashboardControllerProvider = StateNotifierProvider.autoDispose<DashboardController, DashboardState>((ref) {
+final dashboardControllerProvider =
+    StateNotifierProvider.autoDispose<DashboardController, DashboardState>(
+        (ref) {
   final dashboardController = DashboardController(
     studyRepository: ref.watch(studyRepositoryProvider),
     authRepository: ref.watch(authRepositoryProvider),
diff --git a/designer_v2/lib/features/dashboard/dashboard_page.dart b/designer_v2/lib/features/dashboard/dashboard_page.dart
index cafd9c8a1..e47ee155c 100644
--- a/designer_v2/lib/features/dashboard/dashboard_page.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_page.dart
@@ -52,7 +52,6 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
 
     return DashboardScaffold(
       body: Column(
-        mainAxisAlignment: MainAxisAlignment.start,
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
           Row(
@@ -60,7 +59,6 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
               SizedBox(
                 height: 36.0,
                 child: PrimaryButton(
-                  icon: Icons.add,
                   text: tr.action_button_new_study,
                   onPressed: controller.onClickNewStudy,
                 ),
@@ -76,8 +74,8 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                         child: Search(
                             searchController: controller.searchController,
                             hintText: tr.search,
-                            onQueryChanged: (query) => controller.filterStudies(query)),
-                      ))),
+                            onQueryChanged: (query) => controller.filterStudies(query),),
+                      ),),),
             ],
           ),
           const SizedBox(height: 24.0), // spacing between body elements
@@ -114,10 +112,10 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                                         ),
                                       )
                                 : const SizedBox.shrink(),
-                          ));
+                          ),);
                 }
                 return const SizedBox.shrink();
-              }),
+              },),
         ],
       ),
     );
diff --git a/designer_v2/lib/features/dashboard/dashboard_scaffold.dart b/designer_v2/lib/features/dashboard/dashboard_scaffold.dart
index 5483c2dba..5b7140a3e 100644
--- a/designer_v2/lib/features/dashboard/dashboard_scaffold.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_scaffold.dart
@@ -33,8 +33,7 @@ class DashboardScaffold extends StatelessWidget {
             thickness: 0.3,
           ),
           scrollLeft: false,
-          scrollRight: true,
           paddingLeft: null,
-        ));
+        ),);
   }
 }
diff --git a/designer_v2/lib/features/dashboard/dashboard_state.dart b/designer_v2/lib/features/dashboard/dashboard_state.dart
index 4119b540f..d7fe6c5a5 100644
--- a/designer_v2/lib/features/dashboard/dashboard_state.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_state.dart
@@ -74,49 +74,42 @@ class DashboardState extends Equatable {
         } else {
           sortedStudies.sort((study, other) => other.title!.compareTo(study.title!));
         }
-        break;
       case StudiesTableColumn.status:
         if (sortAscending) {
           sortedStudies.sort((study, other) => study.status.index.compareTo(other.status.index));
         } else {
           sortedStudies.sort((study, other) => other.status.index.compareTo(study.status.index));
         }
-        break;
       case StudiesTableColumn.participation:
         if (sortAscending) {
           sortedStudies.sort((study, other) => study.participation.index.compareTo(other.participation.index));
         } else {
           sortedStudies.sort((study, other) => other.participation.index.compareTo(study.participation.index));
         }
-        break;
       case StudiesTableColumn.createdAt:
         if (sortAscending) {
           sortedStudies.sort((study, other) => study.createdAt!.compareTo(other.createdAt!));
         } else {
           sortedStudies.sort((study, other) => other.createdAt!.compareTo(study.createdAt!));
         }
-        break;
       case StudiesTableColumn.enrolled:
         if (sortAscending) {
           sortedStudies.sort((study, other) => study.participantCount.compareTo(other.participantCount));
         } else {
           sortedStudies.sort((study, other) => other.participantCount.compareTo(study.participantCount));
         }
-        break;
       case StudiesTableColumn.active:
         if (sortAscending) {
           sortedStudies.sort((study, other) => study.activeSubjectCount.compareTo(other.activeSubjectCount));
         } else {
           sortedStudies.sort((study, other) => other.activeSubjectCount.compareTo(study.activeSubjectCount));
         }
-        break;
       case StudiesTableColumn.completed:
         if (sortAscending) {
           sortedStudies.sort((study, other) => study.endedCount.compareTo(other.endedCount));
         } else {
           sortedStudies.sort((study, other) => other.endedCount.compareTo(study.endedCount));
         }
-        break;
       case StudiesTableColumn.pin:
       case StudiesTableColumn.action:
         break;
@@ -153,7 +146,7 @@ class DashboardState extends Equatable {
         currentUser: currentUser != null ? currentUser() : this.currentUser,
         query: query ?? this.query,
         sortByColumn: sortByColumn ?? this.sortByColumn,
-        sortAscending: sortAscending ?? this.sortAscending);
+        sortAscending: sortAscending ?? this.sortAscending,);
   }
 
   // - Equatable
diff --git a/designer_v2/lib/features/dashboard/studies_table.dart b/designer_v2/lib/features/dashboard/studies_table.dart
index f1ade151d..73145f22d 100644
--- a/designer_v2/lib/features/dashboard/studies_table.dart
+++ b/designer_v2/lib/features/dashboard/studies_table.dart
@@ -29,7 +29,7 @@ class StudiesTableColumnSize {
       return Expanded(flex: flex!, child: child);
     }
 
-    return SizedBox(width: width!, height: height, child: child);
+    return SizedBox(width: width, height: height, child: child);
   }
 }
 
@@ -105,7 +105,7 @@ class StudiesTable extends StatelessWidget {
               isCompact ? StudiesTableColumnSize.collapsed() : StudiesTableColumnSize.fixedWidth(statsColumnWidth),
           StudiesTableColumn.completed:
               isCompact ? StudiesTableColumnSize.collapsed() : StudiesTableColumnSize.fixedWidth(statsColumnWidth),
-          StudiesTableColumn.action: StudiesTableColumnSize.fixedWidth(itemHeight)
+          StudiesTableColumn.action: StudiesTableColumnSize.fixedWidth(itemHeight),
         };
         final columnDefinitions = columnDefinitionsMap.entries.toList();
 
@@ -177,7 +177,7 @@ class StudiesTable extends StatelessWidget {
                   onTap: (study) => onSelect.call(study),
                 );
               },
-            )
+            ),
           ],
         );
       },
@@ -189,29 +189,21 @@ class StudiesTable extends StatelessWidget {
     switch (column) {
       case StudiesTableColumn.title:
         title = tr.studies_list_header_title;
-        break;
       case StudiesTableColumn.status:
         title = tr.studies_list_header_status;
-        break;
       case StudiesTableColumn.participation:
         title = tr.studies_list_header_participation;
-        break;
       case StudiesTableColumn.createdAt:
         title = tr.studies_list_header_created_at;
-        break;
       case StudiesTableColumn.enrolled:
         title = tr.studies_list_header_participants_enrolled;
-        break;
       case StudiesTableColumn.active:
         title = tr.studies_list_header_participants_active;
-        break;
       case StudiesTableColumn.completed:
         title = tr.studies_list_header_participants_completed;
-        break;
       case StudiesTableColumn.pin:
       case StudiesTableColumn.action:
         title = '';
-        break;
     }
 
     final sortAscending = dashboardController.isSortAscending;
diff --git a/designer_v2/lib/features/dashboard/studies_table_column_header.dart b/designer_v2/lib/features/dashboard/studies_table_column_header.dart
index 674c1f221..624790408 100644
--- a/designer_v2/lib/features/dashboard/studies_table_column_header.dart
+++ b/designer_v2/lib/features/dashboard/studies_table_column_header.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 
-import '../../common_views/mouse_events.dart';
+import 'package:studyu_designer_v2/common_views/mouse_events.dart';
 
 class StudiesTableColumnHeader extends StatefulWidget {
   final String title;
@@ -11,7 +11,7 @@ class StudiesTableColumnHeader extends StatefulWidget {
   final void Function()? onSort;
 
   const StudiesTableColumnHeader(this.title,
-      {super.key, required this.sortable, required this.sortingActive, required this.sortAscending, this.onSort});
+      {super.key, required this.sortable, required this.sortingActive, required this.sortAscending, this.onSort,});
 
   @override
   State<StudiesTableColumnHeader> createState() => _StudiesTableColumnHeaderState();
@@ -37,8 +37,8 @@ class _StudiesTableColumnHeaderState extends State<StudiesTableColumnHeader> {
               style: theme.textTheme.bodySmall!.copyWith(
                 color: theme.colorScheme.onSurface.withOpacity(0.8),
               ),
-            )),
-            widget.sortable ? _getIcon() ?? const SizedBox(width: 17) : const SizedBox.shrink(),
+            ),),
+            if (widget.sortable) _getIcon() ?? const SizedBox(width: 17) else const SizedBox.shrink(),
           ],
         );
       },
diff --git a/designer_v2/lib/features/dashboard/studies_table_item.dart b/designer_v2/lib/features/dashboard/studies_table_item.dart
index 09a674a1a..26454f2fb 100644
--- a/designer_v2/lib/features/dashboard/studies_table_item.dart
+++ b/designer_v2/lib/features/dashboard/studies_table_item.dart
@@ -1,16 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:studyu_core/core.dart';
-import 'package:studyu_designer_v2/features/dashboard/studies_table.dart';
-
-import '../../common_views/action_popup_menu.dart';
-import '../../common_views/mouse_events.dart';
-import '../../theme.dart';
-import '../../utils/model_action.dart';
-import '../study/study_participation_badge.dart';
-import '../study/study_status_badge.dart';
+import 'package:studyu_designer_v2/common_views/action_popup_menu.dart';
+import 'package:studyu_designer_v2/common_views/mouse_events.dart';
 import 'package:studyu_designer_v2/common_views/utils.dart';
+import 'package:studyu_designer_v2/features/dashboard/studies_table.dart';
+import 'package:studyu_designer_v2/features/study/study_participation_badge.dart';
+import 'package:studyu_designer_v2/features/study/study_status_badge.dart';
+import 'package:studyu_designer_v2/theme.dart';
 import 'package:studyu_designer_v2/utils/extensions.dart';
+import 'package:studyu_designer_v2/utils/model_action.dart';
 
 class StudiesTableItem extends StatefulWidget {
   final Study study;
@@ -24,20 +23,19 @@ class StudiesTableItem extends StatefulWidget {
   final void Function(Study, bool)? onPinnedChanged;
   final void Function(Study)? onTap;
 
-  StudiesTableItem(
-      {super.key,
-      required this.study,
-      required this.actions,
-      required this.columnSizes,
-      required this.isPinned,
-      this.onPinnedChanged,
-      this.onTap,
-      this.itemHeight = 60.0,
-      this.itemPadding = 10.0,
-      this.rowSpacing = 9.0,
-      this.columnSpacing = 10.0}) {
-    assert(columnSizes.length == 9);
-  }
+  const StudiesTableItem({
+    super.key,
+    required this.study,
+    required this.actions,
+    required this.columnSizes,
+    required this.isPinned,
+    this.onPinnedChanged,
+    this.onTap,
+    this.itemHeight = 60.0,
+    this.itemPadding = 10.0,
+    this.rowSpacing = 9.0,
+    this.columnSpacing = 10.0,
+  }) : assert(columnSizes.length == 9);
 
   @override
   State<StudiesTableItem> createState() => _StudiesTableItemState();
@@ -74,99 +72,133 @@ class _StudiesTableItemState extends State<StudiesTableItem> {
     return Container(
       height: widget.itemHeight,
       margin: EdgeInsets.only(bottom: widget.rowSpacing),
-      child: LayoutBuilder(builder: (_, constraints) {
-        return Material(
-          color: theme.colorScheme.onPrimary,
-          shape: RoundedRectangleBorder(
-            borderRadius: const BorderRadius.all(Radius.circular(4)),
-            side:
-                BorderSide(color: theme.colorScheme.primaryContainer.withOpacity(0.9), width: isHovering ? 1.5 : 0.75),
-          ),
-          elevation: 0.0,
-          child: InkWell(
-            splashColor: Colors.transparent,
-            onTap: () => widget.onTap?.call(widget.study),
-            onHover: (hover) {
-              setState(() {
-                isHovering = hover;
-              });
-            },
-            hoverColor: theme.colorScheme.onPrimary,
-            child: Padding(
-              padding: EdgeInsets.symmetric(vertical: widget.itemPadding),
-              child: Row(
-                mainAxisSize: MainAxisSize.max,
-                mainAxisAlignment: MainAxisAlignment.start,
-                children: [
-                  widget.columnSizes[0].createContainer(
-                    height: widget.itemHeight,
-                    child: MouseEventsRegion(
-                      onTap: () => widget.onPinnedChanged?.call(widget.study, !widget.isPinned),
-                      onEnter: (_) => setState(() => isHoveringPin = true),
-                      onExit: (_) => setState(() => isHoveringPin = false),
-                      builder: (context, mouseEventState) {
-                        return getRespectivePinIcon(mouseEventState);
-                      },
+      child: LayoutBuilder(
+        builder: (_, constraints) {
+          return Material(
+            color: theme.colorScheme.onPrimary,
+            shape: RoundedRectangleBorder(
+              borderRadius: const BorderRadius.all(Radius.circular(4)),
+              side: BorderSide(
+                  color: theme.colorScheme.primaryContainer.withOpacity(0.9),
+                  width: isHovering ? 1.5 : 0.75,),
+            ),
+            child: InkWell(
+              splashColor: Colors.transparent,
+              onTap: () => widget.onTap?.call(widget.study),
+              onHover: (hover) {
+                setState(() {
+                  isHovering = hover;
+                });
+              },
+              hoverColor: theme.colorScheme.onPrimary,
+              child: Padding(
+                padding: EdgeInsets.symmetric(vertical: widget.itemPadding),
+                child: Row(
+                  children: [
+                    widget.columnSizes[0].createContainer(
+                      height: widget.itemHeight,
+                      child: MouseEventsRegion(
+                        onTap: () => widget.onPinnedChanged
+                            ?.call(widget.study, !widget.isPinned),
+                        onEnter: (_) => setState(() => isHoveringPin = true),
+                        onExit: (_) => setState(() => isHoveringPin = false),
+                        builder: (context, mouseEventState) {
+                          return getRespectivePinIcon(mouseEventState);
+                        },
+                      ),
+                    ),
+                    SizedBox(
+                        width: widget.columnSizes[0].collapsed
+                            ? 0
+                            : widget.columnSpacing,),
+                    widget.columnSizes[1].createContainer(
+                      child: Text(
+                        widget.study.title ?? '[Missing study title]',
+                        maxLines: 3,
+                        overflow: TextOverflow.fade,
+                      ),
                     ),
-                  ),
-                  SizedBox(width: widget.columnSizes[0].collapsed ? 0 : widget.columnSpacing),
-                  widget.columnSizes[1].createContainer(
-                    child: Text(
-                      widget.study.title ?? '[Missing study title]',
-                      maxLines: 3,
-                      overflow: TextOverflow.fade,
+                    SizedBox(
+                        width: widget.columnSizes[1].collapsed
+                            ? 0
+                            : widget.columnSpacing,),
+                    widget.columnSizes[2].createContainer(
+                      child: StudyStatusBadge(
+                        status: widget.study.status,
+                        showPrefixIcon: false,
+                        showTooltip: false,
+                      ),
                     ),
-                  ),
-                  SizedBox(width: widget.columnSizes[1].collapsed ? 0 : widget.columnSpacing),
-                  widget.columnSizes[2].createContainer(
-                    child: StudyStatusBadge(
-                      status: widget.study.status,
-                      showPrefixIcon: false,
-                      showTooltip: false,
+                    SizedBox(
+                        width: widget.columnSizes[2].collapsed
+                            ? 0
+                            : widget.columnSpacing,),
+                    widget.columnSizes[3].createContainer(
+                      child: StudyParticipationBadge(
+                        participation: widget.study.participation,
+                        center: false,
+                      ),
                     ),
-                  ),
-                  SizedBox(width: widget.columnSizes[2].collapsed ? 0 : widget.columnSpacing),
-                  widget.columnSizes[3].createContainer(
-                    child: StudyParticipationBadge(
-                      participation: widget.study.participation,
-                      center: false,
+                    SizedBox(
+                        width: widget.columnSizes[3].collapsed
+                            ? 0
+                            : widget.columnSpacing,),
+                    widget.columnSizes[4].createContainer(
+                      child: Text(
+                        widget.study.createdAt?.toTimeAgoString() ?? '',
+                        maxLines: 3,
+                        overflow: TextOverflow.fade,
+                      ),
                     ),
-                  ),
-                  SizedBox(width: widget.columnSizes[3].collapsed ? 0 : widget.columnSpacing),
-                  widget.columnSizes[4].createContainer(
+                    SizedBox(
+                        width: widget.columnSizes[4].collapsed
+                            ? 0
+                            : widget.columnSpacing,),
+                    widget.columnSizes[5].createContainer(
                       child: Text(
-                    widget.study.createdAt?.toTimeAgoString() ?? '',
-                    maxLines: 3,
-                    overflow: TextOverflow.fade,
-                  )),
-                  SizedBox(width: widget.columnSizes[4].collapsed ? 0 : widget.columnSpacing),
-                  widget.columnSizes[5].createContainer(
-                    child: Text(widget.study.participantCount.toString(),
-                        style: mutedTextStyleIfZero(widget.study.participantCount)),
-                  ),
-                  SizedBox(width: widget.columnSizes[5].collapsed ? 0 : widget.columnSpacing),
-                  widget.columnSizes[6].createContainer(
-                    child: Text(widget.study.activeSubjectCount.toString(),
-                        style: mutedTextStyleIfZero(widget.study.activeSubjectCount)),
-                  ),
-                  SizedBox(width: widget.columnSizes[6].collapsed ? 0 : widget.columnSpacing),
-                  widget.columnSizes[7].createContainer(
-                    child:
-                        Text(widget.study.endedCount.toString(), style: mutedTextStyleIfZero(widget.study.endedCount)),
-                  ),
-                  SizedBox(width: widget.columnSizes[7].collapsed ? 0 : widget.columnSpacing),
-                  widget.columnSizes[8].createContainer(
-                    child: _buildActionMenu(context, widget.actions),
-                  ),
-                  SizedBox(
-                    width: widget.columnSizes[8].collapsed ? 0 : widget.columnSpacing,
-                  ),
-                ],
+                        widget.study.participantCount.toString(),
+                        style:
+                            mutedTextStyleIfZero(widget.study.participantCount),
+                      ),
+                    ),
+                    SizedBox(
+                        width: widget.columnSizes[5].collapsed
+                            ? 0
+                            : widget.columnSpacing,),
+                    widget.columnSizes[6].createContainer(
+                      child: Text(
+                        widget.study.activeSubjectCount.toString(),
+                        style: mutedTextStyleIfZero(
+                            widget.study.activeSubjectCount,),
+                      ),
+                    ),
+                    SizedBox(
+                        width: widget.columnSizes[6].collapsed
+                            ? 0
+                            : widget.columnSpacing,),
+                    widget.columnSizes[7].createContainer(
+                      child: Text(widget.study.endedCount.toString(),
+                          style: mutedTextStyleIfZero(widget.study.endedCount),),
+                    ),
+                    SizedBox(
+                        width: widget.columnSizes[7].collapsed
+                            ? 0
+                            : widget.columnSpacing,),
+                    widget.columnSizes[8].createContainer(
+                      child: _buildActionMenu(context, widget.actions),
+                    ),
+                    SizedBox(
+                      width: widget.columnSizes[8].collapsed
+                          ? 0
+                          : widget.columnSpacing,
+                    ),
+                  ],
+                ),
               ),
             ),
-          ),
-        );
-      }),
+          );
+        },
+      ),
     );
   }
 
@@ -177,7 +209,6 @@ class _StudiesTableItemState extends State<StudiesTableItem> {
       alignment: Alignment.centerRight,
       child: ActionPopUpMenuButton(
         actions: actions,
-        orientation: Axis.horizontal,
         triggerIconColor: ThemeConfig.bodyTextMuted(theme).color?.faded(0.6),
         triggerIconColorHover: theme.colorScheme.primary,
         disableSplashEffect: true,
diff --git a/designer_v2/lib/features/design/enrollment/consent_item_form_controller.dart b/designer_v2/lib/features/design/enrollment/consent_item_form_controller.dart
index 9868a6e12..349d65efe 100644
--- a/designer_v2/lib/features/design/enrollment/consent_item_form_controller.dart
+++ b/designer_v2/lib/features/design/enrollment/consent_item_form_controller.dart
@@ -1,12 +1,12 @@
+import 'package:reactive_forms/reactive_forms.dart';
 import 'package:studyu_designer_v2/common_views/icon_picker.dart';
 import 'package:studyu_designer_v2/features/design/enrollment/consent_item_form_data.dart';
 import 'package:studyu_designer_v2/features/design/study_form_validation.dart';
 import 'package:studyu_designer_v2/features/forms/form_validation.dart';
+import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
 import 'package:studyu_designer_v2/features/forms/form_view_model_collection.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:uuid/uuid.dart';
-import 'package:reactive_forms/reactive_forms.dart';
-import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
 
 class ConsentItemFormViewModel extends ManagedFormViewModel<ConsentItemFormData> {
   ConsentItemFormViewModel({
@@ -31,16 +31,16 @@ class ConsentItemFormViewModel extends ManagedFormViewModel<ConsentItemFormData>
         StudyFormValidationSet.test: [titleRequired, descriptionRequired],
       };
 
-  get titleRequired => FormControlValidation(control: titleControl, validators: [
-        Validators.required
+  FormControlValidation get titleRequired => FormControlValidation(control: titleControl, validators: [
+        Validators.required,
       ], validationMessages: {
         ValidationMessage.required: (error) => tr.form_field_consent_title_required,
-      });
-  get descriptionRequired => FormControlValidation(control: descriptionControl, validators: [
-        Validators.required
+      },);
+  FormControlValidation get descriptionRequired => FormControlValidation(control: descriptionControl, validators: [
+        Validators.required,
       ], validationMessages: {
         ValidationMessage.required: (error) => tr.form_field_consent_text_required,
-      });
+      },);
 
   @override
   late final FormGroup form = FormGroup({
diff --git a/designer_v2/lib/features/design/enrollment/consent_item_form_view.dart b/designer_v2/lib/features/design/enrollment/consent_item_form_view.dart
index 1bfe3d539..70dcc7e49 100644
--- a/designer_v2/lib/features/design/enrollment/consent_item_form_view.dart
+++ b/designer_v2/lib/features/design/enrollment/consent_item_form_view.dart
@@ -22,7 +22,7 @@ class ConsentItemFormView extends StatefulWidget {
 class _ConsentItemFormViewState extends State<ConsentItemFormView> {
   bool isStylingInformationDismissed = true;
 
-  onDismissedCallback() => setState(() {
+  void onDismissedCallback() => setState(() {
         isStylingInformationDismissed = !isStylingInformationDismissed;
       });
 
@@ -65,14 +65,13 @@ class _ConsentItemFormViewState extends State<ConsentItemFormView> {
                         formControl: widget.formViewModel.iconControl,
                         iconOptions: IconPack.material,
                       ),
-                    )
+                    ),
                   ],
                 ),
               ),
               FormTableRow(
                 control: widget.formViewModel.descriptionControl,
                 labelBuilder: (context) => Row(
-                  mainAxisAlignment: MainAxisAlignment.start,
                   children: [
                     FormLabel(
                       labelText: tr.form_field_consent_text,
@@ -116,6 +115,6 @@ class _ConsentItemFormViewState extends State<ConsentItemFormView> {
           ),
         ],
       );
-    });
+    },);
   }
 }
diff --git a/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart b/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart
index 43f725d37..b539be3a8 100644
--- a/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart
+++ b/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart
@@ -25,11 +25,14 @@ import 'package:studyu_designer_v2/utils/model_action.dart';
 import 'package:studyu_designer_v2/utils/riverpod.dart';
 
 class EnrollmentFormViewModel extends FormViewModel<EnrollmentFormData>
-    with WithQuestionnaireControls<EnrollmentFormData, ScreenerQuestionFormViewModel>
+    with
+        WithQuestionnaireControls<EnrollmentFormData,
+            ScreenerQuestionFormViewModel>
     implements
         IFormViewModelDelegate<ScreenerQuestionFormViewModel>,
         IListActionProvider<ScreenerQuestionFormViewModel>,
-        IProviderArgsResolver<ScreenerQuestionFormViewModel, QuestionFormRouteArgs> {
+        IProviderArgsResolver<ScreenerQuestionFormViewModel,
+            QuestionFormRouteArgs> {
   EnrollmentFormViewModel({
     required this.study,
     required this.router,
@@ -56,13 +59,18 @@ class EnrollmentFormViewModel extends FormViewModel<EnrollmentFormData>
   final FormControl<Participation> enrollmentTypeControl = FormControl();
 
   List<FormControlOption<Participation>> get enrollmentTypeControlOptions =>
-      Participation.values.map((v) => FormControlOption(v, v.string, description: v.designDescription)).toList();
+      Participation.values
+          .map((v) =>
+              FormControlOption(v, v.string, description: v.designDescription),)
+          .toList();
 
   late final FormArray consentItemArray = FormArray([]);
-  late final FormViewModelCollection<ConsentItemFormViewModel, ConsentItemFormData> consentItemFormViewModels =
+  late final FormViewModelCollection<ConsentItemFormViewModel,
+          ConsentItemFormData> consentItemFormViewModels =
       FormViewModelCollection([], consentItemArray);
 
-  List<ConsentItemFormViewModel> get consentItemModels => consentItemFormViewModels.formViewModels;
+  List<ConsentItemFormViewModel> get consentItemModels =>
+      consentItemFormViewModels.formViewModels;
 
   @override
   FormValidationConfigSet get sharedValidationConfig => {
@@ -85,11 +93,13 @@ class EnrollmentFormViewModel extends FormViewModel<EnrollmentFormData>
 
     if (data.consentItemsFormData != null) {
       final viewModels = data.consentItemsFormData!
-          .map((data) => ConsentItemFormViewModel(
-                formData: data,
-                delegate: consentItemDelegate,
-                validationSet: validationSet,
-              ))
+          .map(
+            (data) => ConsentItemFormViewModel(
+              formData: data,
+              delegate: consentItemDelegate,
+              validationSet: validationSet,
+            ),
+          )
           .toList();
       consentItemFormViewModels.reset(viewModels);
     }
@@ -118,17 +128,21 @@ class EnrollmentFormViewModel extends FormViewModel<EnrollmentFormData>
 
   @override
   List<ModelAction> availableActions(ScreenerQuestionFormViewModel model) {
-    final actions = questionFormViewModels.availableActions(model, onEdit: onSelectItem, isReadOnly: isReadonly);
+    final actions = questionFormViewModels.availableActions(model,
+        onEdit: onSelectItem, isReadOnly: isReadonly,);
     return withIcons(actions, modelActionIcons);
   }
 
   List<ModelAction> availablePopupActions(ScreenerQuestionFormViewModel model) {
-    final actions = questionFormViewModels.availablePopupActions(model, isReadOnly: isReadonly);
+    final actions = questionFormViewModels.availablePopupActions(model,
+        isReadOnly: isReadonly,);
     return withIcons(actions, modelActionIcons);
   }
 
-  List<ModelAction> availableInlineActions(ScreenerQuestionFormViewModel model) {
-    final actions = questionFormViewModels.availableInlineActions(model, isReadOnly: isReadonly);
+  List<ModelAction> availableInlineActions(
+      ScreenerQuestionFormViewModel model,) {
+    final actions = questionFormViewModels.availableInlineActions(model,
+        isReadOnly: isReadonly,);
     return withIcons(actions, modelActionIcons);
   }
 
@@ -151,7 +165,8 @@ class EnrollmentFormViewModel extends FormViewModel<EnrollmentFormData>
     );
   }
 
-  ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs(QuestionFormViewModel model) {
+  ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs(
+      QuestionFormViewModel model,) {
     return ScreenerQuestionFormRouteArgs(
       studyId: study.id,
       questionId: model.questionId,
@@ -165,23 +180,29 @@ class EnrollmentFormViewModel extends FormViewModel<EnrollmentFormData>
     );
   }
 
-  ConsentItemFormRouteArgs buildConsentItemFormRouteArgs(ConsentItemFormViewModel model) {
+  ConsentItemFormRouteArgs buildConsentItemFormRouteArgs(
+      ConsentItemFormViewModel model,) {
     return ConsentItemFormRouteArgs(
       studyId: study.id,
       consentId: model.consentId,
     );
   }
 
-  testScreener() {
-    router.dispatch(RoutingIntents.studyTest(study.id, appRoute: TestAppRoutes.eligibility));
+  void testScreener() {
+    router.dispatch(RoutingIntents.studyTest(study.id,
+        appRoute: TestAppRoutes.eligibility,),);
   }
 
-  testConsent() {
-    router.dispatch(RoutingIntents.studyTest(study.id, appRoute: TestAppRoutes.consent));
+  void testConsent() {
+    router.dispatch(
+        RoutingIntents.studyTest(study.id, appRoute: TestAppRoutes.consent),);
   }
 
-  bool get canTestScreener => !questionsArray.disabled && (questionsArray.value?.isNotEmpty ?? false);
-  bool get canTestConsent => !consentItemArray.disabled && (consentItemArray.value?.isNotEmpty ?? false);
+  bool get canTestScreener =>
+      !questionsArray.disabled && (questionsArray.value?.isNotEmpty ?? false);
+  bool get canTestConsent =>
+      !consentItemArray.disabled &&
+      (consentItemArray.value?.isNotEmpty ?? false);
 
   @override
   Map<FormMode, LocalizedStringResolver> get questionTitles => {
@@ -191,7 +212,8 @@ class EnrollmentFormViewModel extends FormViewModel<EnrollmentFormData>
       };
 
   @override
-  ScreenerQuestionFormViewModel provideQuestionFormViewModel(QuestionFormData? formData) {
+  ScreenerQuestionFormViewModel provideQuestionFormViewModel(
+      QuestionFormData? formData,) {
     return ScreenerQuestionFormViewModel(
       formData: formData,
       delegate: this,
@@ -205,7 +227,8 @@ class EnrollmentFormConsentItemDelegate
     implements
         IFormViewModelDelegate<ConsentItemFormViewModel>,
         IListActionProvider<ConsentItemFormViewModel>,
-        IProviderArgsResolver<ConsentItemFormViewModel, ConsentItemFormRouteArgs> {
+        IProviderArgsResolver<ConsentItemFormViewModel,
+            ConsentItemFormRouteArgs> {
   EnrollmentFormConsentItemDelegate({
     required this.formViewModels,
     required this.owner,
@@ -213,7 +236,8 @@ class EnrollmentFormConsentItemDelegate
     this.propagateOnSave = true,
   });
 
-  final FormViewModelCollection<ConsentItemFormViewModel, ConsentItemFormData> formViewModels;
+  final FormViewModelCollection<ConsentItemFormViewModel, ConsentItemFormData>
+      formViewModels;
   final EnrollmentFormViewModel owner;
   final bool propagateOnSave;
   final FormValidationSetEnum? validationSet;
@@ -224,7 +248,8 @@ class EnrollmentFormConsentItemDelegate
   }
 
   @override
-  Future onSave(ConsentItemFormViewModel formViewModel, FormMode prevFormMode) async {
+  Future onSave(
+      ConsentItemFormViewModel formViewModel, FormMode prevFormMode,) async {
     if (prevFormMode == FormMode.create) {
       // Save the managed viewmodel that was eagerly added in [provide]
       formViewModels.commit(formViewModel);
@@ -242,7 +267,6 @@ class EnrollmentFormConsentItemDelegate
       // Eagerly add the managed viewmodel in case it needs to be [provide]d
       // to a child controller
       final viewModel = ConsentItemFormViewModel(
-        formData: null,
         delegate: this,
         validationSet: validationSet,
       );
@@ -250,7 +274,8 @@ class EnrollmentFormConsentItemDelegate
       return viewModel;
     }
 
-    final viewModel = formViewModels.findWhere((vm) => vm.consentId == args.consentId);
+    final viewModel =
+        formViewModels.findWhere((vm) => vm.consentId == args.consentId);
     if (viewModel == null) {
       throw ConsentItemNotFoundException(); // TODO handle 404 not found
     }
diff --git a/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart b/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart
index a2fc8cd5a..4cbeffa80 100644
--- a/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart
+++ b/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart
@@ -32,45 +32,54 @@ class StudyDesignEnrollmentFormView extends StudyDesignPageWidget {
     return AsyncValueWidget<Study>(
       value: state.study,
       data: (study) {
-        final formViewModel = ref.read(enrollmentFormViewModelProvider(studyId));
+        final formViewModel =
+            ref.read(enrollmentFormViewModelProvider(studyId));
         return ReactiveForm(
           formGroup: formViewModel.form,
           child: ReactiveFormConsumer(
             builder: (context, formGroup, child) => Column(
-              mainAxisAlignment: MainAxisAlignment.start,
               crossAxisAlignment: CrossAxisAlignment.start,
               children: <Widget>[
-                TextParagraph(text: tr.form_study_design_enrollment_description),
+                TextParagraph(
+                  text: tr.form_study_design_enrollment_description,
+                ),
                 const SizedBox(height: 24.0),
                 FormTableLayout(
                   rows: [
                     FormTableRow(
-                        control: formViewModel.enrollmentTypeControl,
-                        label: tr.form_field_enrollment_type,
-                        labelStyle: const TextStyle(fontWeight: FontWeight.bold),
-                        input: Column(
-                          children: formViewModel.enrollmentTypeControlOptions
-                              .map<Widget>((option) => ReactiveRadioListTile<Participation>(
-                                    formControl: formViewModel.enrollmentTypeControl,
-                                    value: option.value,
-                                    title: Column(
-                                      crossAxisAlignment: CrossAxisAlignment.start,
-                                      children: [
-                                        Text(option.value.whoShort, style: theme.textTheme.bodyLarge),
-                                        const SizedBox(height: 2.0),
-                                      ],
+                      control: formViewModel.enrollmentTypeControl,
+                      label: tr.form_field_enrollment_type,
+                      labelStyle: const TextStyle(fontWeight: FontWeight.bold),
+                      input: Column(
+                        children: formViewModel.enrollmentTypeControlOptions
+                            .map<Widget>(
+                              (option) => ReactiveRadioListTile<Participation>(
+                                formControl:
+                                    formViewModel.enrollmentTypeControl,
+                                value: option.value,
+                                title: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    Text(
+                                      option.value.whoShort,
+                                      style: theme.textTheme.bodyLarge,
                                     ),
-                                    subtitle: (option.description) != null
-                                        ? TextParagraph(
-                                            text: option.description!,
-                                            selectable: false,
-                                            style: ThemeConfig.bodyTextMuted(theme),
-                                          )
-                                        : null,
-                                  ))
-                              .toList()
-                              .separatedBy(() => const SizedBox(height: 8.0)),
-                        )),
+                                    const SizedBox(height: 2.0),
+                                  ],
+                                ),
+                                subtitle: (option.description) != null
+                                    ? TextParagraph(
+                                        text: option.description,
+                                        selectable: false,
+                                        style: ThemeConfig.bodyTextMuted(theme),
+                                      )
+                                    : null,
+                              ),
+                            )
+                            .toList()
+                            .separatedBy(() => const SizedBox(height: 8.0)),
+                      ),
+                    ),
                   ],
                   columnWidths: const {
                     0: FixedColumnWidth(130.0),
@@ -85,17 +94,30 @@ class StudyDesignEnrollmentFormView extends StudyDesignPageWidget {
                       control: formViewModel.questionsArray,
                       items: formViewModel.questionModels,
                       onSelectItem: (viewModel) {
-                        final routeArgs = formViewModel.buildScreenerQuestionFormRouteArgs(viewModel);
-                        _showScreenerQuestionSidesheetWithArgs(routeArgs, context, ref);
+                        final routeArgs = formViewModel
+                            .buildScreenerQuestionFormRouteArgs(viewModel);
+                        _showScreenerQuestionSidesheetWithArgs(
+                          routeArgs,
+                          context,
+                          ref,
+                        );
                       },
-                      getActionsAt: (viewModel, _) => formViewModel.availablePopupActions(viewModel),
+                      getActionsAt: (viewModel, _) =>
+                          formViewModel.availablePopupActions(viewModel),
                       onNewItem: () {
-                        final routeArgs = formViewModel.buildNewScreenerQuestionFormRouteArgs();
-                        _showScreenerQuestionSidesheetWithArgs(routeArgs, context, ref);
+                        final routeArgs = formViewModel
+                            .buildNewScreenerQuestionFormRouteArgs();
+                        _showScreenerQuestionSidesheetWithArgs(
+                          routeArgs,
+                          context,
+                          ref,
+                        );
                       },
-                      sectionDescription: tr.form_array_screener_questions_description,
+                      sectionDescription:
+                          tr.form_array_screener_questions_description,
                       onNewItemLabel: tr.form_array_screener_questions_new,
-                      rowTitle: (viewModel) => viewModel.formData?.questionText ?? '',
+                      rowTitle: (viewModel) =>
+                          viewModel.formData?.questionText ?? '',
                       leadingWidget: Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
@@ -103,16 +125,20 @@ class StudyDesignEnrollmentFormView extends StudyDesignPageWidget {
                             tr.form_array_screener_questions_title,
                             style: Theme.of(context).textTheme.titleLarge,
                           ),
-                          (formViewModel.canTestScreener)
-                              ? Opacity(
-                                  opacity: ThemeConfig.kMuteFadeFactor,
-                                  child: TextButton.icon(
-                                    onPressed: formViewModel.testScreener,
-                                    icon: const Icon(Icons.play_circle_outline_rounded),
-                                    label: Text(tr.form_array_screener_questions_test),
-                                  ),
-                                )
-                              : const SizedBox.shrink(),
+                          if (formViewModel.canTestScreener)
+                            Opacity(
+                              opacity: ThemeConfig.kMuteFadeFactor,
+                              child: TextButton.icon(
+                                onPressed: formViewModel.testScreener,
+                                icon: const Icon(
+                                  Icons.play_circle_outline_rounded,
+                                ),
+                                label:
+                                    Text(tr.form_array_screener_questions_test),
+                              ),
+                            )
+                          else
+                            const SizedBox.shrink(),
                         ],
                       ),
                       rowPrefix: (context, viewModel, rowIdx) {
@@ -122,8 +148,12 @@ class StudyDesignEnrollmentFormView extends StudyDesignPageWidget {
                               message: viewModel.questionType.string,
                               child: Icon(
                                 viewModel.questionType.icon,
-                                color: ThemeConfig.dropdownMenuItemTheme(theme).iconTheme!.color,
-                                size: ThemeConfig.dropdownMenuItemTheme(theme).iconTheme!.size,
+                                color: ThemeConfig.dropdownMenuItemTheme(theme)
+                                    .iconTheme!
+                                    .color,
+                                size: ThemeConfig.dropdownMenuItemTheme(theme)
+                                    .iconTheme!
+                                    .size,
                               ),
                             ),
                             const SizedBox(width: 16.0),
@@ -141,15 +171,28 @@ class StudyDesignEnrollmentFormView extends StudyDesignPageWidget {
                       control: formViewModel.consentItemArray,
                       items: formViewModel.consentItemModels,
                       onSelectItem: (viewModel) {
-                        final routeArgs = formViewModel.buildConsentItemFormRouteArgs(viewModel);
-                        _showConsentItemSidesheetWithArgs(routeArgs, context, ref);
+                        final routeArgs = formViewModel
+                            .buildConsentItemFormRouteArgs(viewModel);
+                        _showConsentItemSidesheetWithArgs(
+                          routeArgs,
+                          context,
+                          ref,
+                        );
                       },
-                      getActionsAt: (viewModel, _) => formViewModel.consentItemDelegate.availableActions(viewModel),
+                      getActionsAt: (viewModel, _) => formViewModel
+                          .consentItemDelegate
+                          .availableActions(viewModel),
                       onNewItem: () {
-                        final routeArgs = formViewModel.buildNewConsentItemFormRouteArgs();
-                        _showConsentItemSidesheetWithArgs(routeArgs, context, ref);
+                        final routeArgs =
+                            formViewModel.buildNewConsentItemFormRouteArgs();
+                        _showConsentItemSidesheetWithArgs(
+                          routeArgs,
+                          context,
+                          ref,
+                        );
                       },
-                      sectionDescription: tr.form_array_consent_items_description,
+                      sectionDescription:
+                          tr.form_array_consent_items_description,
                       onNewItemLabel: tr.form_array_consent_items_new,
                       rowTitle: (viewModel) => viewModel.formData?.title ?? '',
                       leadingWidget: Row(
@@ -159,16 +202,19 @@ class StudyDesignEnrollmentFormView extends StudyDesignPageWidget {
                             tr.form_array_consent_items_title,
                             style: Theme.of(context).textTheme.titleLarge,
                           ),
-                          (formViewModel.canTestConsent)
-                              ? Opacity(
-                                  opacity: ThemeConfig.kMuteFadeFactor,
-                                  child: TextButton.icon(
-                                    onPressed: formViewModel.testConsent,
-                                    icon: const Icon(Icons.play_circle_outline_rounded),
-                                    label: Text(tr.form_array_consent_items_test),
-                                  ),
-                                )
-                              : const SizedBox.shrink(),
+                          if (formViewModel.canTestConsent)
+                            Opacity(
+                              opacity: ThemeConfig.kMuteFadeFactor,
+                              child: TextButton.icon(
+                                onPressed: formViewModel.testConsent,
+                                icon: const Icon(
+                                  Icons.play_circle_outline_rounded,
+                                ),
+                                label: Text(tr.form_array_consent_items_test),
+                              ),
+                            )
+                          else
+                            const SizedBox.shrink(),
                         ],
                       ),
                     );
@@ -183,12 +229,13 @@ class StudyDesignEnrollmentFormView extends StudyDesignPageWidget {
   }
 
   // TODO: refactor to use [RoutingIntent] for sidesheet (so that it can be triggered from controller)
-  _showScreenerQuestionSidesheetWithArgs(
+  void _showScreenerQuestionSidesheetWithArgs(
     ScreenerQuestionFormRouteArgs routeArgs,
     BuildContext context,
     WidgetRef ref,
   ) {
-    final formViewModel = ref.read(screenerQuestionFormViewModelProvider(routeArgs));
+    final formViewModel =
+        ref.read(screenerQuestionFormViewModelProvider(routeArgs));
 
     showFormSideSheet<ScreenerQuestionFormViewModel>(
       context: context,
@@ -197,20 +244,23 @@ class StudyDesignEnrollmentFormView extends StudyDesignPageWidget {
         FormSideSheetTab(
           title: tr.navlink_screener_question_content,
           index: 0,
-          formViewBuilder: (formViewModel) =>
-              SurveyQuestionFormView(formViewModel: formViewModel, isHtmlStyleable: false),
+          formViewBuilder: (formViewModel) => SurveyQuestionFormView(
+            formViewModel: formViewModel,
+            isHtmlStyleable: false,
+          ),
         ),
         FormSideSheetTab(
           title: tr.navlink_screener_question_logic,
           index: 1,
-          formViewBuilder: (formViewModel) => ScreenerQuestionLogicFormView(formViewModel: formViewModel),
+          formViewBuilder: (formViewModel) =>
+              ScreenerQuestionLogicFormView(formViewModel: formViewModel),
         ),
       ],
     );
   }
 
   // TODO: refactor to use [RoutingIntent] for sidesheet (so that it can be triggered from controller)
-  _showConsentItemSidesheetWithArgs(
+  void _showConsentItemSidesheetWithArgs(
     ConsentItemFormRouteArgs routeArgs,
     BuildContext context,
     WidgetRef ref,
@@ -220,7 +270,8 @@ class StudyDesignEnrollmentFormView extends StudyDesignPageWidget {
     showFormSideSheet<ConsentItemFormViewModel>(
       context: context,
       formViewModel: formViewModel,
-      formViewBuilder: (formViewModel) => ConsentItemFormView(formViewModel: formViewModel),
+      formViewBuilder: (formViewModel) =>
+          ConsentItemFormView(formViewModel: formViewModel),
     );
   }
 }
diff --git a/designer_v2/lib/features/design/enrollment/screener_question_form_controller.dart b/designer_v2/lib/features/design/enrollment/screener_question_form_controller.dart
index 19f7cefb7..cb535bda0 100644
--- a/designer_v2/lib/features/design/enrollment/screener_question_form_controller.dart
+++ b/designer_v2/lib/features/design/enrollment/screener_question_form_controller.dart
@@ -33,7 +33,7 @@ class ScreenerQuestionFormViewModel extends QuestionFormViewModel implements ISc
 
   List<FormControlOption<bool>> get logicControlOptions => [
         FormControlOption(true, tr.form_screener_question_logic_qualify),
-        FormControlOption(false, tr.form_screener_question_logic_disqualify)
+        FormControlOption(false, tr.form_screener_question_logic_disqualify),
       ];
 
   late final _questionBaseControls = {
@@ -49,7 +49,7 @@ class ScreenerQuestionFormViewModel extends QuestionFormViewModel implements ISc
   late List<dynamic> prevResponseOptionValues = [];
 
   @override
-  onResponseOptionsChanged(List<AbstractControl> responseOptionControls) {
+  void onResponseOptionsChanged(List<AbstractControl> responseOptionControls) {
     if (formMode == FormMode.readonly) {
       return;
     }
@@ -120,7 +120,7 @@ class ScreenerQuestionFormViewModel extends QuestionFormViewModel implements ISc
         .map((control) => FormControl<String>(
               value: control.value?.toString() ?? '',
               disabled: control.disabled,
-            ))
+            ),)
         .toList();
   }
 
diff --git a/designer_v2/lib/features/design/enrollment/screener_question_logic_form_view.dart b/designer_v2/lib/features/design/enrollment/screener_question_logic_form_view.dart
index b79589ed3..8c5a03faf 100644
--- a/designer_v2/lib/features/design/enrollment/screener_question_logic_form_view.dart
+++ b/designer_v2/lib/features/design/enrollment/screener_question_logic_form_view.dart
@@ -44,7 +44,7 @@ class ScreenerQuestionLogicFormView extends FormConsumerWidget {
     );
   }
 
-  _buildInfoBanner(BuildContext context) {
+  SingleChildRenderObjectWidget _buildInfoBanner(BuildContext context) {
     return (!formViewModel.isReadonly && formViewModel.isDirtyOptionsBannerVisible)
         ? Padding(
             padding: const EdgeInsets.only(top: 12.0),
@@ -60,12 +60,12 @@ class ScreenerQuestionLogicFormView extends FormConsumerWidget {
         : const SizedBox.shrink();
   }
 
-  _buildAnswerOptionsLogicControls() {
+  Widget _buildAnswerOptionsLogicControls() {
     if (formViewModel.questionType.name == FreeTextQuestion.questionType) {
       // todo logic might check if field has content
       // todo logic might need that field is equal to a certain value
       return Text(tr.free_text_question_logic_not_supported,
-          style: const TextStyle(color: Colors.red), textAlign: TextAlign.center);
+          style: const TextStyle(color: Colors.red), textAlign: TextAlign.center,);
     }
 
     return ReactiveFormArray(
@@ -80,10 +80,10 @@ class ScreenerQuestionLogicFormView extends FormConsumerWidget {
             ),
             StandardTableColumn(
                 label: '', // don't care (showTableHeader=false)
-                columnWidth: const FlexColumnWidth(5)),
+                columnWidth: const FlexColumnWidth(5),),
             StandardTableColumn(
                 label: '', // don't care (showTableHeader=false)
-                columnWidth: const FlexColumnWidth(4)),
+                columnWidth: const FlexColumnWidth(4),),
           ],
           onSelectItem: (_) => {}, // no-op
           buildCellsAt: (context, item, rowIdx, __) {
@@ -103,7 +103,7 @@ class ScreenerQuestionLogicFormView extends FormConsumerWidget {
   }
 
   List<Widget> _buildOptionLogicRow(
-      BuildContext context, FormControl<dynamic> optionControl, FormControl<bool> logicControl) {
+      BuildContext context, FormControl<dynamic> optionControl, FormControl<bool> logicControl,) {
     final theme = Theme.of(context);
 
     // Use a UniqueKey to prevent carry-over of control states to other
diff --git a/designer_v2/lib/features/design/info/study_info_form_controller.dart b/designer_v2/lib/features/design/info/study_info_form_controller.dart
index 3cc081d68..3dc05f39c 100644
--- a/designer_v2/lib/features/design/info/study_info_form_controller.dart
+++ b/designer_v2/lib/features/design/info/study_info_form_controller.dart
@@ -14,7 +14,7 @@ class StudyInfoFormViewModel extends FormViewModel<StudyInfoFormData> {
     super.delegate,
     super.formData,
     super.autosave = true,
-    super.validationSet = StudyFormValidationSet,
+    super.validationSet,
   });
 
   final Study study;
@@ -45,7 +45,7 @@ class StudyInfoFormViewModel extends FormViewModel<StudyInfoFormData> {
     'email': emailControl,
     'website': websiteControl,
     'phone': phoneControl,
-    'additionalInfo': additionalInfoControl
+    'additionalInfo': additionalInfoControl,
   });
 
   @override
@@ -54,8 +54,10 @@ class StudyInfoFormViewModel extends FormViewModel<StudyInfoFormData> {
     iconControl.value = IconOption(data.iconName);
     descriptionControl.value = data.description;
     organizationControl.value = data.contactInfoFormData.organization;
-    reviewBoardControl.value = data.contactInfoFormData.institutionalReviewBoard;
-    reviewBoardNumberControl.value = data.contactInfoFormData.institutionalReviewBoardNumber;
+    reviewBoardControl.value =
+        data.contactInfoFormData.institutionalReviewBoard;
+    reviewBoardNumberControl.value =
+        data.contactInfoFormData.institutionalReviewBoardNumber;
     researchersControl.value = data.contactInfoFormData.researchers;
     emailControl.value = data.contactInfoFormData.email;
     websiteControl.value = data.contactInfoFormData.website;
@@ -66,19 +68,20 @@ class StudyInfoFormViewModel extends FormViewModel<StudyInfoFormData> {
   @override
   StudyInfoFormData buildFormData() {
     return StudyInfoFormData(
-        title: titleControl.value!, // required
-        iconName: iconControl.value?.name ?? '',
-        description: descriptionControl.value,
-        contactInfoFormData: StudyContactInfoFormData(
-          organization: organizationControl.value,
-          institutionalReviewBoard: reviewBoardControl.value,
-          institutionalReviewBoardNumber: reviewBoardNumberControl.value,
-          researchers: researchersControl.value,
-          email: emailControl.value,
-          website: websiteControl.value,
-          phone: phoneControl.value,
-          additionalInfo: additionalInfoControl.value,
-        ));
+      title: titleControl.value!, // required
+      iconName: iconControl.value?.name ?? '',
+      description: descriptionControl.value,
+      contactInfoFormData: StudyContactInfoFormData(
+        organization: organizationControl.value,
+        institutionalReviewBoard: reviewBoardControl.value,
+        institutionalReviewBoardNumber: reviewBoardNumberControl.value,
+        researchers: researchersControl.value,
+        email: emailControl.value,
+        website: websiteControl.value,
+        phone: phoneControl.value,
+        additionalInfo: additionalInfoControl.value,
+      ),
+    );
   }
 
   @override
@@ -89,7 +92,11 @@ class StudyInfoFormViewModel extends FormViewModel<StudyInfoFormData> {
   @override
   FormValidationConfigSet get sharedValidationConfig => {
         // TODO phoneFormat
-        StudyFormValidationSet.draft: [titleRequired, emailFormat, websiteFormat],
+        StudyFormValidationSet.draft: [
+          titleRequired,
+          emailFormat,
+          websiteFormat,
+        ],
         StudyFormValidationSet.publish: [
           titleRequired,
           descriptionRequired,
@@ -106,59 +113,112 @@ class StudyInfoFormViewModel extends FormViewModel<StudyInfoFormData> {
         StudyFormValidationSet.test: [titleRequired],
       };
 
-  get titleRequired => FormControlValidation(control: titleControl, validators: [
-        Validators.required
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_study_title_required,
-      });
-  get descriptionRequired => FormControlValidation(control: descriptionControl, validators: [
-        Validators.required
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_study_description_required,
-      });
-  get iconRequired => FormControlValidation(control: iconControl, validators: [
-        Validators.required
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_study_icon_required,
-      });
-  get organizationRequired => FormControlValidation(control: organizationControl, validators: [
-        Validators.required
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_organization_required,
-      });
-  get reviewBoardRequired => FormControlValidation(control: reviewBoardControl, validators: [
-        Validators.required
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_review_board_required,
-      });
-  get reviewBoardNumberRequired => FormControlValidation(control: reviewBoardNumberControl, validators: [
-        Validators.required
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_review_board_number_required,
-      });
-  get researchersRequired => FormControlValidation(control: researchersControl, validators: [
-        Validators.required
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_researchers_required,
-      });
-  get emailRequired => FormControlValidation(control: emailControl, validators: [
-        Validators.required
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_contact_email_required,
-      });
-  get phoneRequired => FormControlValidation(control: phoneControl, validators: [
-        Validators.required
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_contact_phone_required,
-      });
-  get emailFormat => FormControlValidation(control: emailControl, validators: [
-        Validators.email
-      ], validationMessages: {
-        'email': (error) => tr.form_field_contact_email_email,
-      });
-  get websiteFormat => FormControlValidation(control: websiteControl, validators: [
-        Validators.pattern(Patterns.url)
-      ], validationMessages: {
-        'pattern': (error) => tr.form_field_website_pattern,
-      });
+  FormControlValidation get titleRequired => FormControlValidation(
+        control: titleControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_study_title_required,
+        },
+      );
+  FormControlValidation get descriptionRequired => FormControlValidation(
+        control: descriptionControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_study_description_required,
+        },
+      );
+  FormControlValidation get iconRequired => FormControlValidation(
+        control: iconControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_study_icon_required,
+        },
+      );
+  FormControlValidation get organizationRequired => FormControlValidation(
+        control: organizationControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_organization_required,
+        },
+      );
+  FormControlValidation get reviewBoardRequired => FormControlValidation(
+        control: reviewBoardControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_review_board_required,
+        },
+      );
+  FormControlValidation get reviewBoardNumberRequired => FormControlValidation(
+        control: reviewBoardNumberControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_review_board_number_required,
+        },
+      );
+  FormControlValidation get researchersRequired => FormControlValidation(
+        control: researchersControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_researchers_required,
+        },
+      );
+  FormControlValidation get emailRequired => FormControlValidation(
+        control: emailControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_contact_email_required,
+        },
+      );
+  FormControlValidation get phoneRequired => FormControlValidation(
+        control: phoneControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_contact_phone_required,
+        },
+      );
+  FormControlValidation get emailFormat => FormControlValidation(
+        control: emailControl,
+        validators: [
+          Validators.email,
+        ],
+        validationMessages: {
+          'email': (error) => tr.form_field_contact_email_email,
+        },
+      );
+  FormControlValidation get websiteFormat => FormControlValidation(
+        control: websiteControl,
+        validators: [
+          Validators.pattern(Patterns.url),
+        ],
+        validationMessages: {
+          'pattern': (error) => tr.form_field_website_pattern,
+        },
+      );
 }
diff --git a/designer_v2/lib/features/design/info/study_info_form_view.dart b/designer_v2/lib/features/design/info/study_info_form_view.dart
index 6de75679c..1127012e7 100644
--- a/designer_v2/lib/features/design/info/study_info_form_view.dart
+++ b/designer_v2/lib/features/design/info/study_info_form_view.dart
@@ -27,7 +27,6 @@ class StudyDesignInfoFormView extends StudyDesignPageWidget {
         return ReactiveForm(
           formGroup: formViewModel.form,
           child: Column(
-            mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: <Widget>[
               TextParagraph(text: tr.form_study_design_info_description),
@@ -50,19 +49,19 @@ class StudyDesignInfoFormView extends StudyDesignPageWidget {
                           LengthLimitingTextInputFormatter(100),
                         ],
                         validationMessages: formViewModel.titleControl.validationMessages,
-                      )),
+                      ),),
                       ReactiveFormConsumer(builder: (context, form, child) {
                         return (formViewModel.iconControl.value != null)
                             ? const SizedBox(width: 4.0)
                             : const SizedBox(width: 8.0);
-                      }),
+                      },),
                       IntrinsicWidth(
                         child: ReactiveIconPicker(
                           formControl: formViewModel.iconControl,
                           iconOptions: IconPack.material,
                           validationMessages: formViewModel.iconControl.validationMessages,
                         ),
-                      )
+                      ),
                     ],
                   ),
                 ),
@@ -87,7 +86,7 @@ class StudyDesignInfoFormView extends StudyDesignPageWidget {
               ], columnWidths: const {
                 0: FixedColumnWidth(185.0),
                 1: FlexColumnWidth(),
-              }),
+              },),
               const SizedBox(height: 32.0),
               FormSectionHeader(title: tr.form_section_publisher),
               const SizedBox(height: 12.0),
@@ -209,7 +208,7 @@ class StudyDesignInfoFormView extends StudyDesignPageWidget {
               ], columnWidths: const {
                 0: FixedColumnWidth(180.0),
                 1: FlexColumnWidth(),
-              }),
+              },),
             ],
           ),
         );
diff --git a/designer_v2/lib/features/design/interventions/intervention_form_controller.dart b/designer_v2/lib/features/design/interventions/intervention_form_controller.dart
index 3c4d2d003..4167283e2 100644
--- a/designer_v2/lib/features/design/interventions/intervention_form_controller.dart
+++ b/designer_v2/lib/features/design/interventions/intervention_form_controller.dart
@@ -19,11 +19,13 @@ import 'package:studyu_designer_v2/utils/model_action.dart';
 import 'package:studyu_designer_v2/utils/riverpod.dart';
 import 'package:uuid/uuid.dart';
 
-class InterventionFormViewModel extends ManagedFormViewModel<InterventionFormData>
+class InterventionFormViewModel
+    extends ManagedFormViewModel<InterventionFormData>
     implements
         IFormViewModelDelegate<InterventionTaskFormViewModel>,
         IListActionProvider<InterventionTaskFormViewModel>,
-        IProviderArgsResolver<InterventionTaskFormViewModel, InterventionTaskFormRouteArgs> {
+        IProviderArgsResolver<InterventionTaskFormViewModel,
+            InterventionTaskFormRouteArgs> {
   InterventionFormViewModel({
     required this.study,
     super.delegate,
@@ -35,15 +37,18 @@ class InterventionFormViewModel extends ManagedFormViewModel<InterventionFormDat
 
   // - Form fields
 
-  final FormControl<InterventionID> interventionIdControl = FormControl(value: const Uuid().v4()); // hidden
-  final FormControl<String> interventionTitleControl = FormControl(value: InterventionFormData.kDefaultTitle);
+  final FormControl<InterventionID> interventionIdControl =
+      FormControl(value: const Uuid().v4()); // hidden
+  final FormControl<String> interventionTitleControl =
+      FormControl(value: InterventionFormData.kDefaultTitle);
   final FormControl<IconOption> interventionIconControl = FormControl();
   final FormControl<String> interventionDescriptionControl = FormControl();
 
   final FormArray interventionTasksArray = FormArray([]);
 
-  late final tasksCollection =
-      FormViewModelCollection<InterventionTaskFormViewModel, InterventionTaskFormData>([], interventionTasksArray);
+  late final tasksCollection = FormViewModelCollection<
+      InterventionTaskFormViewModel,
+      InterventionTaskFormData>([], interventionTasksArray);
 
   InterventionID get interventionId => interventionIdControl.value!;
 
@@ -60,18 +65,28 @@ class InterventionFormViewModel extends ManagedFormViewModel<InterventionFormDat
         ],
       };
 
-  get titleRequired => FormControlValidation(control: interventionTitleControl, validators: [
-        Validators.required
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_intervention_title_required,
-      });
+  FormControlValidation get titleRequired => FormControlValidation(
+        control: interventionTitleControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_intervention_title_required,
+        },
+      );
 
-  get atLeastOneTask => FormControlValidation(control: interventionTasksArray, validators: [
-        Validators.minLength(1)
-      ], validationMessages: {
-        ValidationMessage.minLength: (error) =>
-            tr.form_array_intervention_tasks_minlength((error as Map)['requiredLength']),
-      });
+  FormControlValidation get atLeastOneTask => FormControlValidation(
+        control: interventionTasksArray,
+        validators: [
+          Validators.minLength(1),
+        ],
+        validationMessages: {
+          ValidationMessage.minLength: (error) =>
+              tr.form_array_intervention_tasks_minlength(
+                  (error as Map)['requiredLength'] as num,),
+        },
+      );
 
   @override
   late final FormGroup form = FormGroup({
@@ -91,11 +106,13 @@ class InterventionFormViewModel extends ManagedFormViewModel<InterventionFormDat
 
     if (data.tasksData != null) {
       final viewModels = data.tasksData!
-          .map((data) => InterventionTaskFormViewModel(
-                formData: data,
-                delegate: this,
-                validationSet: validationSet,
-              ))
+          .map(
+            (data) => InterventionTaskFormViewModel(
+              formData: data,
+              delegate: this,
+              validationSet: validationSet,
+            ),
+          )
           .toList();
       tasksCollection.reset(viewModels);
     }
@@ -132,17 +149,21 @@ class InterventionFormViewModel extends ManagedFormViewModel<InterventionFormDat
 
   @override
   List<ModelAction> availableActions(InterventionTaskFormViewModel model) {
-    final actions = tasksCollection.availableActions(model, onEdit: onSelectItem, isReadOnly: isReadonly);
+    final actions = tasksCollection.availableActions(model,
+        onEdit: onSelectItem, isReadOnly: isReadonly,);
     return withIcons(actions, modelActionIcons);
   }
 
   List<ModelAction> availablePopupActions(InterventionTaskFormViewModel model) {
-    final actions = tasksCollection.availablePopupActions(model, isReadOnly: isReadonly);
+    final actions =
+        tasksCollection.availablePopupActions(model, isReadOnly: isReadonly);
     return withIcons(actions, modelActionIcons);
   }
 
-  List<ModelAction> availableInlineActions(InterventionTaskFormViewModel model) {
-    final actions = tasksCollection.availableInlineActions(model, isReadOnly: isReadonly);
+  List<ModelAction> availableInlineActions(
+      InterventionTaskFormViewModel model,) {
+    final actions =
+        tasksCollection.availableInlineActions(model, isReadOnly: isReadonly);
     return withIcons(actions, modelActionIcons);
   }
 
@@ -161,12 +182,14 @@ class InterventionFormViewModel extends ManagedFormViewModel<InterventionFormDat
   // - IFormViewModelDelegate
 
   @override
-  void onCancel(InterventionTaskFormViewModel formViewModel, FormMode prevFormMode) {
+  void onCancel(
+      InterventionTaskFormViewModel formViewModel, FormMode prevFormMode,) {
     return; // no-op
   }
 
   @override
-  Future onSave(InterventionTaskFormViewModel formViewModel, FormMode prevFormMode) async {
+  Future onSave(InterventionTaskFormViewModel formViewModel,
+      FormMode prevFormMode,) async {
     if (prevFormMode == FormMode.create) {
       // Save the managed viewmodel that was eagerly added in [provide]
       tasksCollection.commit(formViewModel);
@@ -183,7 +206,6 @@ class InterventionFormViewModel extends ManagedFormViewModel<InterventionFormDat
       // Eagerly add the managed viewmodel in case it needs to be [provide]d
       // to a child controller
       final viewModel = InterventionTaskFormViewModel(
-        formData: null,
         delegate: this,
         validationSet: validationSet,
       );
@@ -191,7 +213,8 @@ class InterventionFormViewModel extends ManagedFormViewModel<InterventionFormDat
       return viewModel;
     }
 
-    final viewModel = tasksCollection.findWhere((vm) => vm.taskId == args.taskId);
+    final viewModel =
+        tasksCollection.findWhere((vm) => vm.taskId == args.taskId);
     if (viewModel == null) {
       throw InterventionTaskNotFoundException(); // TODO handle 404 not found
     }
@@ -208,7 +231,8 @@ class InterventionFormViewModel extends ManagedFormViewModel<InterventionFormDat
     );
   }
 
-  InterventionTaskFormRouteArgs buildFormRouteArgs(InterventionTaskFormViewModel model) {
+  InterventionTaskFormRouteArgs buildFormRouteArgs(
+      InterventionTaskFormViewModel model,) {
     final args = InterventionTaskFormRouteArgs(
       studyId: study.id,
       interventionId: interventionId,
@@ -222,6 +246,10 @@ class InterventionFormViewModel extends ManagedFormViewModel<InterventionFormDat
   @override
   InterventionFormViewModel createDuplicate() {
     return InterventionFormViewModel(
-        study: study, delegate: delegate, formData: formData?.copy(), validationSet: validationSet);
+      study: study,
+      delegate: delegate,
+      formData: formData?.copy(),
+      validationSet: validationSet,
+    );
   }
 }
diff --git a/designer_v2/lib/features/design/interventions/intervention_form_data.dart b/designer_v2/lib/features/design/interventions/intervention_form_data.dart
index 59aed9bd1..9578d110d 100644
--- a/designer_v2/lib/features/design/interventions/intervention_form_data.dart
+++ b/designer_v2/lib/features/design/interventions/intervention_form_data.dart
@@ -1,16 +1,16 @@
+import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/intervention.dart';
 import 'package:studyu_designer_v2/features/design/interventions/intervention_task_form_data.dart';
 import 'package:studyu_designer_v2/features/forms/form_data.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
-import 'package:uuid/uuid.dart';
-import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/utils/extensions.dart';
+import 'package:uuid/uuid.dart';
 
 class InterventionFormData extends IFormData {
   static String get kDefaultTitle => tr.form_field_intervention_title_default;
 
   InterventionFormData(
-      {required this.interventionId, required this.title, this.description, this.tasksData, this.iconName});
+      {required this.interventionId, required this.title, this.description, this.tasksData, this.iconName,});
 
   final InterventionID interventionId;
   final String title;
diff --git a/designer_v2/lib/features/design/interventions/intervention_form_view.dart b/designer_v2/lib/features/design/interventions/intervention_form_view.dart
index 7bbe6d435..2198a7d0b 100644
--- a/designer_v2/lib/features/design/interventions/intervention_form_view.dart
+++ b/designer_v2/lib/features/design/interventions/intervention_form_view.dart
@@ -23,13 +23,14 @@ class InterventionFormView extends ConsumerStatefulWidget {
   final InterventionFormViewModel formViewModel;
 
   @override
-  ConsumerState<InterventionFormView> createState() => _InterventionFormViewState();
+  ConsumerState<InterventionFormView> createState() =>
+      _InterventionFormViewState();
 }
 
 class _InterventionFormViewState extends ConsumerState<InterventionFormView> {
   bool isStylingInformationDismissed = true;
 
-  onDismissedCallback() => setState(() {
+  void onDismissedCallback() => setState(() {
         isStylingInformationDismissed = !isStylingInformationDismissed;
       });
 
@@ -48,27 +49,33 @@ class _InterventionFormViewState extends ConsumerState<InterventionFormView> {
                   // TODO: responsive layout (input field gets too small)
                   Expanded(
                     child: ReactiveTextField(
-                      formControl: widget.formViewModel.interventionTitleControl,
+                      formControl:
+                          widget.formViewModel.interventionTitleControl,
                       decoration: InputDecoration(
                         hintText: tr.form_field_intervention_title,
                       ),
                       inputFormatters: [
                         LengthLimitingTextInputFormatter(200),
                       ],
-                      validationMessages: widget.formViewModel.interventionTitleControl.validationMessages,
+                      validationMessages: widget.formViewModel
+                          .interventionTitleControl.validationMessages,
                     ),
                   ),
-                  ReactiveFormConsumer(builder: (context, form, child) {
-                    return (widget.formViewModel.interventionIconControl.value != null)
-                        ? const SizedBox(width: 4.0)
-                        : const SizedBox(width: 8.0);
-                  }),
+                  ReactiveFormConsumer(
+                    builder: (context, form, child) {
+                      return (widget.formViewModel.interventionIconControl
+                                  .value !=
+                              null)
+                          ? const SizedBox(width: 4.0)
+                          : const SizedBox(width: 8.0);
+                    },
+                  ),
                   IntrinsicWidth(
                     child: ReactiveIconPicker(
                       formControl: widget.formViewModel.interventionIconControl,
                       iconOptions: IconPack.material,
                     ),
-                  )
+                  ),
                 ],
               ),
             ),
@@ -91,7 +98,8 @@ class _InterventionFormViewState extends ConsumerState<InterventionFormView> {
                         child: Hyperlink(
                           text: "styleable",
                           onClick: () => setState(() {
-                            isStylingInformationDismissed = !isStylingInformationDismissed;
+                            isStylingInformationDismissed =
+                                !isStylingInformationDismissed;
                           }),
                           visitedColor: null,
                         ),
@@ -101,14 +109,16 @@ class _InterventionFormViewState extends ConsumerState<InterventionFormView> {
                 ],
               ),
               input: ReactiveTextField(
-                formControl: widget.formViewModel.interventionDescriptionControl,
+                formControl:
+                    widget.formViewModel.interventionDescriptionControl,
                 decoration: InputDecoration(
                   hintText: tr.form_field_intervention_description_hint,
                 ),
                 inputFormatters: [
                   LengthLimitingTextInputFormatter(2000),
                 ],
-                validationMessages: widget.formViewModel.interventionDescriptionControl.validationMessages,
+                validationMessages: widget.formViewModel
+                    .interventionDescriptionControl.validationMessages,
                 keyboardType: TextInputType.multiline,
                 minLines: 5,
                 maxLines: 5,
@@ -122,51 +132,62 @@ class _InterventionFormViewState extends ConsumerState<InterventionFormView> {
         ),
         const SizedBox(height: 28.0),
         ReactiveFormConsumer(
-            // [ReactiveFormConsumer] is needed to to rerender when descendant controls are updated
-            // By default, ReactiveFormArray only updates when adding/removing controls
-            builder: (context, form, child) {
-          return ReactiveFormArray(
-            formArray: widget.formViewModel.interventionTasksArray,
-            builder: (context, formArray, child) {
-              return FormArrayTable<InterventionTaskFormViewModel>(
-                control: widget.formViewModel.interventionTasksArray,
-                items: widget.formViewModel.tasksCollection.formViewModels,
-                onSelectItem: (viewModel) => _onSelectItem(viewModel, context, ref),
-                getActionsAt: (viewModel, _) => widget.formViewModel.availablePopupActions(viewModel),
-                onNewItem: () => _onNewItem(context, ref),
-                onNewItemLabel: tr.form_array_intervention_tasks_new,
-                rowTitle: (viewModel) => viewModel.formData?.taskTitle ?? '',
-                sectionTitle: tr.form_array_intervention_tasks,
-                sectionDescription: tr.form_array_intervention_tasks_description,
-                emptyIcon: Icons.content_paste_off_rounded,
-                emptyTitle: tr.form_array_intervention_tasks_empty_title,
-                emptyDescription: tr.form_array_intervention_tasks_empty_description,
-              );
-            },
-          );
-        }),
+          // [ReactiveFormConsumer] is needed to to rerender when descendant controls are updated
+          // By default, ReactiveFormArray only updates when adding/removing controls
+          builder: (context, form, child) {
+            return ReactiveFormArray(
+              formArray: widget.formViewModel.interventionTasksArray,
+              builder: (context, formArray, child) {
+                return FormArrayTable<InterventionTaskFormViewModel>(
+                  control: widget.formViewModel.interventionTasksArray,
+                  items: widget.formViewModel.tasksCollection.formViewModels,
+                  onSelectItem: (viewModel) =>
+                      _onSelectItem(viewModel, context, ref),
+                  getActionsAt: (viewModel, _) =>
+                      widget.formViewModel.availablePopupActions(viewModel),
+                  onNewItem: () => _onNewItem(context, ref),
+                  onNewItemLabel: tr.form_array_intervention_tasks_new,
+                  rowTitle: (viewModel) => viewModel.formData?.taskTitle ?? '',
+                  sectionTitle: tr.form_array_intervention_tasks,
+                  sectionDescription:
+                      tr.form_array_intervention_tasks_description,
+                  emptyIcon: Icons.content_paste_off_rounded,
+                  emptyTitle: tr.form_array_intervention_tasks_empty_title,
+                  emptyDescription:
+                      tr.form_array_intervention_tasks_empty_description,
+                );
+              },
+            );
+          },
+        ),
       ],
     );
   }
 
-  _onNewItem(BuildContext context, WidgetRef ref) {
+  void _onNewItem(BuildContext context, WidgetRef ref) {
     final routeArgs = widget.formViewModel.buildNewFormRouteArgs();
     _showSidesheetWithArgs(routeArgs, context, ref);
   }
 
-  _onSelectItem(InterventionTaskFormViewModel item, BuildContext context, WidgetRef ref) {
+  void _onSelectItem(
+    InterventionTaskFormViewModel item,
+    BuildContext context,
+    WidgetRef ref,
+  ) {
     final routeArgs = widget.formViewModel.buildFormRouteArgs(item);
     _showSidesheetWithArgs(routeArgs, context, ref);
   }
 
   // TODO: refactor to use [RoutingIntent] for sidesheet (so that it can be triggered from controller)
-  _showSidesheetWithArgs(InterventionTaskFormRouteArgs routeArgs, BuildContext context, WidgetRef ref) {
-    final interventionTaskFormViewModel = ref.read(interventionTaskFormViewModelProvider(routeArgs));
+  void _showSidesheetWithArgs(InterventionTaskFormRouteArgs routeArgs,
+      BuildContext context, WidgetRef ref,) {
+    final interventionTaskFormViewModel =
+        ref.read(interventionTaskFormViewModelProvider(routeArgs));
     showFormSideSheet<InterventionTaskFormViewModel>(
       context: context,
       formViewModel: interventionTaskFormViewModel,
-      formViewBuilder: (formViewModel) => InterventionTaskFormView(formViewModel: formViewModel),
-      ignoreAppBar: true,
+      formViewBuilder: (formViewModel) =>
+          InterventionTaskFormView(formViewModel: formViewModel),
     );
   }
 }
diff --git a/designer_v2/lib/features/design/interventions/intervention_preview_view.dart b/designer_v2/lib/features/design/interventions/intervention_preview_view.dart
index d49959e2d..6f2f56fd7 100644
--- a/designer_v2/lib/features/design/interventions/intervention_preview_view.dart
+++ b/designer_v2/lib/features/design/interventions/intervention_preview_view.dart
@@ -11,9 +11,10 @@ class InterventionPreview extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    return Container(
-        color: Theme.of(context).colorScheme.primaryContainer.withOpacity(0.25),
-        child: Column(children: [
+    return ColoredBox(
+      color: Theme.of(context).colorScheme.primaryContainer.withOpacity(0.25),
+      child: Column(
+        children: [
           Stack(
             children: [
               Column(
@@ -25,6 +26,8 @@ class InterventionPreview extends ConsumerWidget {
               previewBanner(ref, routeArgs.studyId) ?? const SizedBox.shrink(),
             ],
           ),
-        ]));
+        ],
+      ),
+    );
   }
 }
diff --git a/designer_v2/lib/features/design/interventions/intervention_task_form_controller.dart b/designer_v2/lib/features/design/interventions/intervention_task_form_controller.dart
index 854c74e2f..8c7a07c47 100644
--- a/designer_v2/lib/features/design/interventions/intervention_task_form_controller.dart
+++ b/designer_v2/lib/features/design/interventions/intervention_task_form_controller.dart
@@ -45,14 +45,14 @@ class InterventionTaskFormViewModel extends ManagedFormViewModel<InterventionTas
     'taskTitle': taskTitleControl,
     'taskDescription': taskDescriptionControl,
     'markAsCompleted': markAsCompletedControl,
-    ...scheduleFormControls
+    ...scheduleFormControls,
   });
 
-  get titleRequired => FormControlValidation(control: taskTitleControl, validators: [
-        Validators.required
+  FormControlValidation get titleRequired => FormControlValidation(control: taskTitleControl, validators: [
+        Validators.required,
       ], validationMessages: {
         ValidationMessage.required: (error) => tr.form_field_intervention_task_title_required,
-      });
+      },);
 
   @override
   void setControlsFrom(InterventionTaskFormData data) {
diff --git a/designer_v2/lib/features/design/interventions/intervention_task_form_view.dart b/designer_v2/lib/features/design/interventions/intervention_task_form_view.dart
index 7d9cb2a1a..34c39a62b 100644
--- a/designer_v2/lib/features/design/interventions/intervention_task_form_view.dart
+++ b/designer_v2/lib/features/design/interventions/intervention_task_form_view.dart
@@ -23,7 +23,7 @@ class InterventionTaskFormView extends StatefulWidget {
 class _InterventionTaskFormViewState extends State<InterventionTaskFormView> {
   bool isStylingInformationDismissed = true;
 
-  onDismissedCallback() => setState(() {
+  void onDismissedCallback() => setState(() {
         isStylingInformationDismissed = !isStylingInformationDismissed;
       });
 
@@ -52,7 +52,6 @@ class _InterventionTaskFormViewState extends State<InterventionTaskFormView> {
             FormTableRow(
               control: widget.formViewModel.taskDescriptionControl,
               labelBuilder: (context) => Row(
-                mainAxisAlignment: MainAxisAlignment.start,
                 children: [
                   FormLabel(
                     labelText: tr.form_field_intervention_task_description,
@@ -91,7 +90,7 @@ class _InterventionTaskFormViewState extends State<InterventionTaskFormView> {
                 maxLines: 5,
               ),
             ),
-          ]),
+          ],),
           HtmlStylingBanner(
             isDismissed: isStylingInformationDismissed,
             onDismissed: onDismissedCallback,
@@ -107,8 +106,8 @@ class _InterventionTaskFormViewState extends State<InterventionTaskFormView> {
                 formControl: widget.formViewModel.markAsCompletedControl,
                 text: tr.form_field_intervention_task_mark_as_completed_label,
               ),
-            ]);
-          }),
+            ],);
+          },),
           const SizedBox(height: 24.0),
           ScheduleControls(formViewModel: widget.formViewModel),
         ],
diff --git a/designer_v2/lib/features/design/interventions/interventions_form_controller.dart b/designer_v2/lib/features/design/interventions/interventions_form_controller.dart
index d4034e91c..4fba9a539 100644
--- a/designer_v2/lib/features/design/interventions/interventions_form_controller.dart
+++ b/designer_v2/lib/features/design/interventions/interventions_form_controller.dart
@@ -21,11 +21,13 @@ import 'package:studyu_designer_v2/utils/model_action.dart';
 import 'package:studyu_designer_v2/utils/riverpod.dart';
 
 class InterventionsFormViewModel extends FormViewModel<InterventionsFormData>
-    with StudyScheduleControls
+    with
+        StudyScheduleControls
     implements
         IFormViewModelDelegate<InterventionFormViewModel>,
         IListActionProvider<InterventionFormViewModel>,
-        IProviderArgsResolver<InterventionFormViewModel, InterventionFormRouteArgs> {
+        IProviderArgsResolver<InterventionFormViewModel,
+            InterventionFormRouteArgs> {
   InterventionsFormViewModel({
     required this.study,
     required this.router,
@@ -42,7 +44,10 @@ class InterventionsFormViewModel extends FormViewModel<InterventionsFormData>
 
   final FormArray interventionsArray = FormArray([]);
   late final interventionsCollection =
-      FormViewModelCollection<InterventionFormViewModel, InterventionFormData>([], interventionsArray);
+      FormViewModelCollection<InterventionFormViewModel, InterventionFormData>(
+    [],
+    interventionsArray,
+  );
 
   @override
   late final FormGroup form = FormGroup({
@@ -67,21 +72,30 @@ class InterventionsFormViewModel extends FormViewModel<InterventionsFormData>
         ],
       };
 
-  get interventionsRequired => FormControlValidation(control: interventionsArray, validators: [
-        Validators.minLength(2)
-      ], validationMessages: {
-        ValidationMessage.minLength: (error) => tr.form_array_interventions_minlength((error as Map)['requiredLength']),
-      });
+  FormControlValidation get interventionsRequired => FormControlValidation(
+        control: interventionsArray,
+        validators: [
+          Validators.minLength(2),
+        ],
+        validationMessages: {
+          ValidationMessage.minLength: (error) =>
+              tr.form_array_interventions_minlength(
+                (error as Map)['requiredLength'] as num,
+              ),
+        },
+      );
 
   @override
   void setControlsFrom(InterventionsFormData data) {
     final viewModels = data.interventionsData
-        .map((data) => InterventionFormViewModel(
-              study: study,
-              formData: data,
-              delegate: this,
-              validationSet: validationSet,
-            ))
+        .map(
+          (data) => InterventionFormViewModel(
+            study: study,
+            formData: data,
+            delegate: this,
+            validationSet: validationSet,
+          ),
+        )
         .toList();
     interventionsCollection.reset(viewModels);
     setStudyScheduleControlsFrom(data.studyScheduleData);
@@ -108,17 +122,27 @@ class InterventionsFormViewModel extends FormViewModel<InterventionsFormData>
 
   @override
   List<ModelAction> availableActions(InterventionFormViewModel model) {
-    final actions = interventionsCollection.availableActions(model, onEdit: onSelectItem, isReadOnly: isReadonly);
+    final actions = interventionsCollection.availableActions(
+      model,
+      onEdit: onSelectItem,
+      isReadOnly: isReadonly,
+    );
     return withIcons(actions, modelActionIcons);
   }
 
   List<ModelAction> availablePopupActions(InterventionFormViewModel model) {
-    final actions = interventionsCollection.availablePopupActions(model, isReadOnly: isReadonly);
+    final actions = interventionsCollection.availablePopupActions(
+      model,
+      isReadOnly: isReadonly,
+    );
     return withIcons(actions, modelActionIcons);
   }
 
   List<ModelAction> availableInlineActions(InterventionFormViewModel model) {
-    final actions = interventionsCollection.availableInlineActions(model, isReadOnly: isReadonly);
+    final actions = interventionsCollection.availableInlineActions(
+      model,
+      isReadOnly: isReadonly,
+    );
     return withIcons(actions, modelActionIcons);
   }
 
@@ -126,13 +150,17 @@ class InterventionsFormViewModel extends FormViewModel<InterventionsFormData>
   void onSelectItem(InterventionFormViewModel item) {
     final studyId = study.id;
     final interventionId = item.interventionId;
-    router.dispatch(RoutingIntents.studyEditIntervention(studyId, interventionId));
+    router.dispatch(
+      RoutingIntents.studyEditIntervention(studyId, interventionId),
+    );
   }
 
   @override
   void onNewItem() {
     final studyId = study.id;
-    router.dispatch(RoutingIntents.studyEditIntervention(studyId, Config.newModelId));
+    router.dispatch(
+      RoutingIntents.studyEditIntervention(studyId, Config.newModelId),
+    );
   }
 
   // - IProviderArgsResolver
@@ -143,13 +171,17 @@ class InterventionsFormViewModel extends FormViewModel<InterventionsFormData>
     if (args.interventionId.isNewId) {
       // Eagerly add the managed viewmodel in case it needs to be [provide]d
       // to a child controller
-      final viewModel =
-          InterventionFormViewModel(study: study, formData: null, delegate: this, validationSet: validationSet);
+      final viewModel = InterventionFormViewModel(
+        study: study,
+        delegate: this,
+        validationSet: validationSet,
+      );
       interventionsCollection.stage(viewModel);
       return viewModel;
     }
 
-    final viewModel = interventionsCollection.findWhere((vm) => vm.interventionId == args.interventionId);
+    final viewModel = interventionsCollection
+        .findWhere((vm) => vm.interventionId == args.interventionId);
     if (viewModel == null) {
       throw InterventionNotFoundException(); // TODO handle 404 not found
     }
@@ -164,7 +196,10 @@ class InterventionsFormViewModel extends FormViewModel<InterventionsFormData>
   }
 
   @override
-  Future onSave(InterventionFormViewModel formViewModel, FormMode prevFormMode) async {
+  Future onSave(
+    InterventionFormViewModel formViewModel,
+    FormMode prevFormMode,
+  ) async {
     if (prevFormMode == FormMode.create) {
       // Commit the managed viewmodel that was eagerly added in [provide]
       interventionsCollection.commit(formViewModel);
@@ -174,11 +209,12 @@ class InterventionsFormViewModel extends FormViewModel<InterventionsFormData>
     await super.save();
   }
 
-  testStudySchedule() {
-    router.dispatch(RoutingIntents.studyTest(study.id, appRoute: TestAppRoutes.journey));
+  void testStudySchedule() {
+    router.dispatch(
+      RoutingIntents.studyTest(study.id, appRoute: TestAppRoutes.journey),
+    );
   }
 
   bool get canTestStudySchedule =>
-      !interventionsArray.disabled &&
-      ((interventionsArray.value != null) ? interventionsArray.value!.length >= 2 : false);
+      !interventionsArray.disabled && interventionsArray.value!.length >= 2;
 }
diff --git a/designer_v2/lib/features/design/interventions/interventions_form_view.dart b/designer_v2/lib/features/design/interventions/interventions_form_view.dart
index e45bb0c44..75b473329 100644
--- a/designer_v2/lib/features/design/interventions/interventions_form_view.dart
+++ b/designer_v2/lib/features/design/interventions/interventions_form_view.dart
@@ -5,11 +5,11 @@ import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/common_views/async_value_widget.dart';
 import 'package:studyu_designer_v2/common_views/text_hyperlink.dart';
 import 'package:studyu_designer_v2/common_views/text_paragraph.dart';
+import 'package:studyu_designer_v2/features/design/interventions/intervention_form_controller.dart';
 import 'package:studyu_designer_v2/features/design/interventions/study_schedule_form_view.dart';
 import 'package:studyu_designer_v2/features/design/study_design_page_view.dart';
-import 'package:studyu_designer_v2/features/forms/form_array_table.dart';
-import 'package:studyu_designer_v2/features/design/interventions/intervention_form_controller.dart';
 import 'package:studyu_designer_v2/features/design/study_form_providers.dart';
+import 'package:studyu_designer_v2/features/forms/form_array_table.dart';
 import 'package:studyu_designer_v2/features/study/study_controller.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/theme.dart';
@@ -30,7 +30,6 @@ class StudyDesignInterventionsFormView extends StudyDesignPageWidget {
         return ReactiveForm(
           formGroup: formViewModel.form,
           child: Column(
-            mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: <Widget>[
               TextParagraph(
@@ -80,7 +79,7 @@ class StudyDesignInterventionsFormView extends StudyDesignPageWidget {
                     );
                   },
                 );
-              }),
+              },),
               const SizedBox(height: 24.0),
               Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -89,16 +88,14 @@ class StudyDesignInterventionsFormView extends StudyDesignPageWidget {
                     tr.form_section_crossover_schedule,
                     style: Theme.of(context).textTheme.titleLarge,
                   ),
-                  (formViewModel.canTestStudySchedule)
-                      ? Opacity(
+                  if (formViewModel.canTestStudySchedule) Opacity(
                           opacity: ThemeConfig.kMuteFadeFactor,
                           child: TextButton.icon(
                             onPressed: formViewModel.testStudySchedule,
                             icon: const Icon(Icons.play_circle_outline_rounded),
                             label: Text(tr.navlink_crossover_schedule_test),
                           ),
-                        )
-                      : const SizedBox.shrink(),
+                        ) else const SizedBox.shrink(),
                 ],
               ),
               const Divider(),
diff --git a/designer_v2/lib/features/design/interventions/study_schedule_form_controller_mixin.dart b/designer_v2/lib/features/design/interventions/study_schedule_form_controller_mixin.dart
index 9fdb626fe..c743c2ebb 100644
--- a/designer_v2/lib/features/design/interventions/study_schedule_form_controller_mixin.dart
+++ b/designer_v2/lib/features/design/interventions/study_schedule_form_controller_mixin.dart
@@ -38,7 +38,7 @@ mixin StudyScheduleControls {
 
   static int kNumCyclesMin = 1;
   static int kNumCyclesMax = 9;
-  get numCyclesRange => FormControlValidation(
+  FormControlValidation get numCyclesRange => FormControlValidation(
         control: numCyclesControl,
         validators: [
           Validators.required,
@@ -57,7 +57,7 @@ mixin StudyScheduleControls {
 
   static int kPhaseDurationMin = 1;
   static int kPhaseDurationMax = 365;
-  get phaseDurationRange => FormControlValidation(
+  FormControlValidation get phaseDurationRange => FormControlValidation(
         control: phaseDurationControl,
         validators: [Validators.required, Validators.min(kPhaseDurationMin), Validators.max(kPhaseDurationMax)],
         validationMessages: {
@@ -70,11 +70,11 @@ mixin StudyScheduleControls {
         },
       );
 
-  get customSequenceRequired => FormControlValidation(control: sequenceTypeCustomControl, validators: [
-        Validators.required
+  FormControlValidation get customSequenceRequired => FormControlValidation(control: sequenceTypeCustomControl, validators: [
+        Validators.required,
       ], validationMessages: {
         ValidationMessage.required: (error) => 'Custom sequence needs to be specified.',
-      });
+      },);
 
   void setStudyScheduleControlsFrom(StudyScheduleFormData data) {
     sequenceTypeControl.value = data.sequenceType;
diff --git a/designer_v2/lib/features/design/interventions/study_schedule_form_data.dart b/designer_v2/lib/features/design/interventions/study_schedule_form_data.dart
index 049d2a16e..df9dee9e0 100644
--- a/designer_v2/lib/features/design/interventions/study_schedule_form_data.dart
+++ b/designer_v2/lib/features/design/interventions/study_schedule_form_data.dart
@@ -8,7 +8,7 @@ class StudyScheduleFormData implements IStudyFormData {
       required this.sequenceTypeCustom,
       required this.numCycles,
       required this.phaseDuration,
-      required this.includeBaseline});
+      required this.includeBaseline,});
 
   final PhaseSequence sequenceType;
   final String sequenceTypeCustom;
diff --git a/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart b/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart
index 77c6890f9..d00e744c9 100644
--- a/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart
+++ b/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart
@@ -33,7 +33,7 @@ class StudyScheduleFormView extends FormConsumerWidget {
               StudySequenceFormatter(),
             ],
             validationMessages: formViewModel.sequenceTypeCustomControl.validationMessages,
-          ));
+          ),);
     }
   }
 
@@ -58,7 +58,7 @@ class StudyScheduleFormView extends FormConsumerWidget {
                     .map((option) => DropdownMenuItem(
                           value: option.value,
                           child: Text(option.label),
-                        ))
+                        ),)
                     .toList(),
                 validationMessages: formViewModel.sequenceTypeControl.validationMessages,
               ),
diff --git a/designer_v2/lib/features/design/measurements/measurements_form_controller.dart b/designer_v2/lib/features/design/measurements/measurements_form_controller.dart
index 7c44618e4..2ab71bc17 100644
--- a/designer_v2/lib/features/design/measurements/measurements_form_controller.dart
+++ b/designer_v2/lib/features/design/measurements/measurements_form_controller.dart
@@ -2,13 +2,13 @@ import 'package:go_router/go_router.dart';
 import 'package:reactive_forms/reactive_forms.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/constants.dart';
+import 'package:studyu_designer_v2/features/design/measurements/measurements_form_data.dart';
+import 'package:studyu_designer_v2/features/design/measurements/survey/survey_form_controller.dart';
+import 'package:studyu_designer_v2/features/design/measurements/survey/survey_form_data.dart';
 import 'package:studyu_designer_v2/features/design/study_form_validation.dart';
 import 'package:studyu_designer_v2/features/forms/form_validation.dart';
 import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
 import 'package:studyu_designer_v2/features/forms/form_view_model_collection.dart';
-import 'package:studyu_designer_v2/features/design/measurements/measurements_form_data.dart';
-import 'package:studyu_designer_v2/features/design/measurements/survey/survey_form_data.dart';
-import 'package:studyu_designer_v2/features/design/measurements/survey/survey_form_controller.dart';
 import 'package:studyu_designer_v2/features/forms/form_view_model_collection_actions.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/repositories/api_client.dart';
@@ -22,7 +22,8 @@ class MeasurementsFormViewModel extends FormViewModel<MeasurementsFormData>
     implements
         IFormViewModelDelegate<MeasurementSurveyFormViewModel>,
         IListActionProvider<MeasurementSurveyFormViewModel>,
-        IProviderArgsResolver<MeasurementSurveyFormViewModel, MeasurementFormRouteArgs> {
+        IProviderArgsResolver<MeasurementSurveyFormViewModel,
+            MeasurementFormRouteArgs> {
   MeasurementsFormViewModel({
     required this.study,
     required this.router,
@@ -38,10 +39,12 @@ class MeasurementsFormViewModel extends FormViewModel<MeasurementsFormData>
   // - Form fields
 
   final FormArray measurementsArray = FormArray([]);
-  late final surveyMeasurementFormViewModels =
-      FormViewModelCollection<MeasurementSurveyFormViewModel, MeasurementSurveyFormData>([], measurementsArray);
+  late final surveyMeasurementFormViewModels = FormViewModelCollection<
+      MeasurementSurveyFormViewModel,
+      MeasurementSurveyFormData>([], measurementsArray);
 
-  List<MeasurementSurveyFormViewModel> get measurementViewModels => surveyMeasurementFormViewModels.formViewModels;
+  List<MeasurementSurveyFormViewModel> get measurementViewModels =>
+      surveyMeasurementFormViewModels.formViewModels;
 
   @override
   FormValidationConfigSet get sharedValidationConfig => {
@@ -50,11 +53,18 @@ class MeasurementsFormViewModel extends FormViewModel<MeasurementsFormData>
         StudyFormValidationSet.test: [],
       };
 
-  get measurementRequired => FormControlValidation(control: measurementsArray, validators: [
-        Validators.minLength(1)
-      ], validationMessages: {
-        ValidationMessage.minLength: (error) => tr.form_array_measurements_minlength((error as Map)['requiredLength']),
-      });
+  FormControlValidation get measurementRequired => FormControlValidation(
+        control: measurementsArray,
+        validators: [
+          Validators.minLength(1),
+        ],
+        validationMessages: {
+          ValidationMessage.minLength: (error) =>
+              tr.form_array_measurements_minlength(
+                (error as Map)['requiredLength'] as num,
+              ),
+        },
+      );
 
   @override
   late final FormGroup form = FormGroup({
@@ -70,12 +80,14 @@ class MeasurementsFormViewModel extends FormViewModel<MeasurementsFormData>
   @override
   void setControlsFrom(MeasurementsFormData data) {
     final viewModels = data.surveyMeasurements
-        .map((data) => MeasurementSurveyFormViewModel(
-              study: study,
-              formData: data,
-              delegate: this,
-              validationSet: validationSet,
-            ))
+        .map(
+          (data) => MeasurementSurveyFormViewModel(
+            study: study,
+            formData: data,
+            delegate: this,
+            validationSet: validationSet,
+          ),
+        )
         .toList();
     surveyMeasurementFormViewModels.reset(viewModels);
   }
@@ -95,18 +107,22 @@ class MeasurementsFormViewModel extends FormViewModel<MeasurementsFormData>
 
   @override
   List<ModelAction> availableActions(MeasurementSurveyFormViewModel model) {
-    final actions =
-        surveyMeasurementFormViewModels.availableActions(model, onEdit: onSelectItem, isReadOnly: isReadonly);
+    final actions = surveyMeasurementFormViewModels.availableActions(model,
+        onEdit: onSelectItem, isReadOnly: isReadonly,);
     return withIcons(actions, modelActionIcons);
   }
 
-  List<ModelAction> availablePopupActions(MeasurementSurveyFormViewModel model) {
-    final actions = surveyMeasurementFormViewModels.availablePopupActions(model, isReadOnly: isReadonly);
+  List<ModelAction> availablePopupActions(
+      MeasurementSurveyFormViewModel model,) {
+    final actions = surveyMeasurementFormViewModels.availablePopupActions(model,
+        isReadOnly: isReadonly,);
     return withIcons(actions, modelActionIcons);
   }
 
-  List<ModelAction> availableInlineActions(MeasurementSurveyFormViewModel model) {
-    final actions = surveyMeasurementFormViewModels.availableInlineActions(model, isReadOnly: isReadonly);
+  List<ModelAction> availableInlineActions(
+      MeasurementSurveyFormViewModel model,) {
+    final actions = surveyMeasurementFormViewModels
+        .availableInlineActions(model, isReadOnly: isReadonly);
     return withIcons(actions, modelActionIcons);
   }
 
@@ -114,13 +130,15 @@ class MeasurementsFormViewModel extends FormViewModel<MeasurementsFormData>
   void onSelectItem(MeasurementSurveyFormViewModel item) {
     final studyId = study.id;
     final measurementId = item.measurementId;
-    router.dispatch(RoutingIntents.studyEditMeasurement(studyId, measurementId));
+    router
+        .dispatch(RoutingIntents.studyEditMeasurement(studyId, measurementId));
   }
 
   @override
   void onNewItem() {
     final studyId = study.id;
-    router.dispatch(RoutingIntents.studyEditMeasurement(studyId, Config.newModelId));
+    router.dispatch(
+        RoutingIntents.studyEditMeasurement(studyId, Config.newModelId),);
   }
 
   // - IProviderArgsResolver
@@ -132,7 +150,6 @@ class MeasurementsFormViewModel extends FormViewModel<MeasurementsFormData>
       // to a child controller
       final viewModel = MeasurementSurveyFormViewModel(
         study: study,
-        formData: null,
         delegate: this,
         validationSet: validationSet,
       );
@@ -140,7 +157,8 @@ class MeasurementsFormViewModel extends FormViewModel<MeasurementsFormData>
       return viewModel;
     }
 
-    final viewModel = surveyMeasurementFormViewModels.findWhere((vm) => vm.measurementId == args.measurementId);
+    final viewModel = surveyMeasurementFormViewModels
+        .findWhere((vm) => vm.measurementId == args.measurementId);
     if (viewModel == null) {
       throw MeasurementNotFoundException(); // TODO handle 404 not found
     }
@@ -150,12 +168,14 @@ class MeasurementsFormViewModel extends FormViewModel<MeasurementsFormData>
   // - IFormViewModelDelegate
 
   @override
-  void onCancel(MeasurementSurveyFormViewModel formViewModel, FormMode formMode) {
+  void onCancel(
+      MeasurementSurveyFormViewModel formViewModel, FormMode formMode,) {
     return; // no-op
   }
 
   @override
-  Future onSave(MeasurementSurveyFormViewModel formViewModel, FormMode prevFormMode) async {
+  Future onSave(MeasurementSurveyFormViewModel formViewModel,
+      FormMode prevFormMode,) async {
     if (prevFormMode == FormMode.create) {
       // Commit the managed viewmodel that was eagerly added in [provide]
       surveyMeasurementFormViewModels.commit(formViewModel);
diff --git a/designer_v2/lib/features/design/measurements/measurements_form_data.dart b/designer_v2/lib/features/design/measurements/measurements_form_data.dart
index b1b97a843..eaf5760e3 100644
--- a/designer_v2/lib/features/design/measurements/measurements_form_data.dart
+++ b/designer_v2/lib/features/design/measurements/measurements_form_data.dart
@@ -12,9 +12,9 @@ class MeasurementsFormData implements IStudyFormData {
 
   factory MeasurementsFormData.fromStudy(Study study) {
     return MeasurementsFormData(
-        surveyMeasurements: (study.observations)
+        surveyMeasurements: study.observations
             .map((observation) => MeasurementSurveyFormData.fromDomainModel(observation as QuestionnaireTask))
-            .toList());
+            .toList(),);
   }
 
   @override
diff --git a/designer_v2/lib/features/design/measurements/measurements_form_view.dart b/designer_v2/lib/features/design/measurements/measurements_form_view.dart
index f93797bbf..2144fd71a 100644
--- a/designer_v2/lib/features/design/measurements/measurements_form_view.dart
+++ b/designer_v2/lib/features/design/measurements/measurements_form_view.dart
@@ -4,10 +4,10 @@ import 'package:reactive_forms/reactive_forms.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/common_views/async_value_widget.dart';
 import 'package:studyu_designer_v2/common_views/text_paragraph.dart';
+import 'package:studyu_designer_v2/features/design/measurements/survey/survey_form_controller.dart';
 import 'package:studyu_designer_v2/features/design/study_design_page_view.dart';
 import 'package:studyu_designer_v2/features/design/study_form_providers.dart';
 import 'package:studyu_designer_v2/features/forms/form_array_table.dart';
-import 'package:studyu_designer_v2/features/design/measurements/survey/survey_form_controller.dart';
 import 'package:studyu_designer_v2/features/study/study_controller.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 
@@ -25,7 +25,6 @@ class StudyDesignMeasurementsFormView extends StudyDesignPageWidget {
         return ReactiveForm(
           formGroup: formViewModel.form,
           child: Column(
-            mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: <Widget>[
               TextParagraph(text: tr.form_study_design_measurements_description),
@@ -54,7 +53,7 @@ class StudyDesignMeasurementsFormView extends StudyDesignPageWidget {
                     );
                   },
                 );
-              }),
+              },),
             ],
           ),
         );
diff --git a/designer_v2/lib/features/design/measurements/survey/survey_form_controller.dart b/designer_v2/lib/features/design/measurements/survey/survey_form_controller.dart
index 92096da44..c65a9bb49 100644
--- a/designer_v2/lib/features/design/measurements/survey/survey_form_controller.dart
+++ b/designer_v2/lib/features/design/measurements/survey/survey_form_controller.dart
@@ -18,7 +18,8 @@ import 'package:studyu_designer_v2/utils/model_action.dart';
 import 'package:studyu_designer_v2/utils/riverpod.dart';
 import 'package:uuid/uuid.dart';
 
-class MeasurementSurveyFormViewModel extends ManagedFormViewModel<MeasurementSurveyFormData>
+class MeasurementSurveyFormViewModel
+    extends ManagedFormViewModel<MeasurementSurveyFormData>
     with WithQuestionnaireControls, WithScheduleControls
     implements
         IFormViewModelDelegate<QuestionFormViewModel>,
@@ -35,9 +36,12 @@ class MeasurementSurveyFormViewModel extends ManagedFormViewModel<MeasurementSur
 
   // - Form fields
 
-  final FormControl<MeasurementID> measurementIdControl = FormControl(value: const Uuid().v4()); // hidden
-  final FormControl<MeasurementID> instanceIdControl = FormControl(value: const Uuid().v4()); // hidden
-  final FormControl<String> surveyTitleControl = FormControl(value: MeasurementSurveyFormData.kDefaultTitle);
+  final FormControl<MeasurementID> measurementIdControl =
+      FormControl(value: const Uuid().v4()); // hidden
+  final FormControl<MeasurementID> instanceIdControl =
+      FormControl(value: const Uuid().v4()); // hidden
+  final FormControl<String> surveyTitleControl =
+      FormControl(value: MeasurementSurveyFormData.kDefaultTitle);
   final FormControl<String> surveyIntroTextControl = FormControl(value: '');
   final FormControl<String> surveyOutroTextControl = FormControl(value: '');
 
@@ -51,18 +55,28 @@ class MeasurementSurveyFormViewModel extends ManagedFormViewModel<MeasurementSur
         StudyFormValidationSet.test: [titleRequired, atLeastOneQuestion],
       };
 
-  get titleRequired => FormControlValidation(control: surveyTitleControl, validators: [
-        Validators.required
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_measurement_survey_title_required,
-      });
-
-  get atLeastOneQuestion => FormControlValidation(control: questionsArray, validators: [
-        Validators.minLength(1)
-      ], validationMessages: {
-        ValidationMessage.minLength: (error) =>
-            tr.form_array_measurement_survey_questions_minlength((error as Map)['requiredLength']),
-      });
+  FormControlValidation get titleRequired => FormControlValidation(
+        control: surveyTitleControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_measurement_survey_title_required,
+        },
+      );
+
+  FormControlValidation get atLeastOneQuestion => FormControlValidation(
+        control: questionsArray,
+        validators: [
+          Validators.minLength(1),
+        ],
+        validationMessages: {
+          ValidationMessage.minLength: (error) =>
+              tr.form_array_measurement_survey_questions_minlength(
+                  (error as Map)['requiredLength'] as num,),
+        },
+      );
 
   @override
   late final FormGroup form = FormGroup({
@@ -105,7 +119,10 @@ class MeasurementSurveyFormViewModel extends ManagedFormViewModel<MeasurementSur
   }
 
   String get breadcrumbsTitle {
-    final components = [study.title, formData?.title ?? MeasurementSurveyFormData.kDefaultTitle];
+    final components = [
+      study.title,
+      formData?.title ?? MeasurementSurveyFormData.kDefaultTitle,
+    ];
     return components.join(kPathSeparator);
   }
 
@@ -120,17 +137,20 @@ class MeasurementSurveyFormViewModel extends ManagedFormViewModel<MeasurementSur
 
   @override
   List<ModelAction> availableActions(QuestionFormViewModel model) {
-    final actions = questionFormViewModels.availableActions(model, onEdit: onSelectItem, isReadOnly: isReadonly);
+    final actions = questionFormViewModels.availableActions(model,
+        onEdit: onSelectItem, isReadOnly: isReadonly,);
     return withIcons(actions, modelActionIcons);
   }
 
   List<ModelAction> availablePopupActions(QuestionFormViewModel model) {
-    final actions = questionFormViewModels.availablePopupActions(model, isReadOnly: isReadonly);
+    final actions = questionFormViewModels.availablePopupActions(model,
+        isReadOnly: isReadonly,);
     return withIcons(actions, modelActionIcons);
   }
 
   List<ModelAction> availableInlineActions(QuestionFormViewModel model) {
-    final actions = questionFormViewModels.availableInlineActions(model, isReadOnly: isReadonly);
+    final actions = questionFormViewModels.availableInlineActions(model,
+        isReadOnly: isReadonly,);
     return withIcons(actions, modelActionIcons);
   }
 
@@ -170,6 +190,10 @@ class MeasurementSurveyFormViewModel extends ManagedFormViewModel<MeasurementSur
   @override
   MeasurementSurveyFormViewModel createDuplicate() {
     return MeasurementSurveyFormViewModel(
-        study: study, delegate: delegate, formData: formData?.copy(), validationSet: validationSet);
+      study: study,
+      delegate: delegate,
+      formData: formData?.copy(),
+      validationSet: validationSet,
+    );
   }
 }
diff --git a/designer_v2/lib/features/design/measurements/survey/survey_form_view.dart b/designer_v2/lib/features/design/measurements/survey/survey_form_view.dart
index f7e78cf3d..7eb02bc03 100644
--- a/designer_v2/lib/features/design/measurements/survey/survey_form_view.dart
+++ b/designer_v2/lib/features/design/measurements/survey/survey_form_view.dart
@@ -23,13 +23,15 @@ class MeasurementSurveyFormView extends ConsumerStatefulWidget {
   final MeasurementSurveyFormViewModel formViewModel;
 
   @override
-  ConsumerState<MeasurementSurveyFormView> createState() => _MeasurementSurveyFormViewState();
+  ConsumerState<MeasurementSurveyFormView> createState() =>
+      _MeasurementSurveyFormViewState();
 }
 
-class _MeasurementSurveyFormViewState extends ConsumerState<MeasurementSurveyFormView> {
+class _MeasurementSurveyFormViewState
+    extends ConsumerState<MeasurementSurveyFormView> {
   bool isStylingInformationDismissed = true;
 
-  onDismissedCallback() => setState(() {
+  void onDismissedCallback() => setState(() {
         isStylingInformationDismissed = !isStylingInformationDismissed;
       });
 
@@ -38,171 +40,196 @@ class _MeasurementSurveyFormViewState extends ConsumerState<MeasurementSurveyFor
     final theme = Theme.of(context);
     return Column(
       children: [
-        FormTableLayout(rows: [
-          FormTableRow(
-            control: widget.formViewModel.surveyTitleControl,
-            label: tr.form_field_measurement_survey_title,
-            labelHelpText: tr.form_field_measurement_survey_title_tooltip,
-            input: ReactiveTextField(
-              formControl: widget.formViewModel.surveyTitleControl,
-              decoration: InputDecoration(
-                hintText: tr.form_field_measurement_survey_title,
+        FormTableLayout(
+          rows: [
+            FormTableRow(
+              control: widget.formViewModel.surveyTitleControl,
+              label: tr.form_field_measurement_survey_title,
+              labelHelpText: tr.form_field_measurement_survey_title_tooltip,
+              input: ReactiveTextField(
+                formControl: widget.formViewModel.surveyTitleControl,
+                decoration: InputDecoration(
+                  hintText: tr.form_field_measurement_survey_title,
+                ),
+                inputFormatters: [
+                  LengthLimitingTextInputFormatter(200),
+                ],
+                validationMessages:
+                    widget.formViewModel.surveyTitleControl.validationMessages,
               ),
-              inputFormatters: [
-                LengthLimitingTextInputFormatter(200),
-              ],
-              validationMessages: widget.formViewModel.surveyTitleControl.validationMessages,
             ),
-          ),
-          FormTableRow(
-            control: widget.formViewModel.surveyIntroTextControl,
-            labelBuilder: (context) => Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                FormLabel(
-                  labelText: tr.form_field_measurement_survey_intro_text,
-                  helpText: tr.form_field_measurement_survey_intro_text_tooltip,
-                ),
-                const SizedBox(height: 8),
-                Container(
-                  margin: const EdgeInsets.only(left: 3.0),
-                  child: Opacity(
-                    opacity: ThemeConfig.kMuteFadeFactor,
-                    child: Tooltip(
-                      message: "Use html to style your content",
-                      child: Hyperlink(
-                        text: "styleable",
-                        onClick: () => setState(() {
-                          isStylingInformationDismissed = !isStylingInformationDismissed;
-                        }),
-                        visitedColor: null,
+            FormTableRow(
+              control: widget.formViewModel.surveyIntroTextControl,
+              labelBuilder: (context) => Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  FormLabel(
+                    labelText: tr.form_field_measurement_survey_intro_text,
+                    helpText:
+                        tr.form_field_measurement_survey_intro_text_tooltip,
+                  ),
+                  const SizedBox(height: 8),
+                  Container(
+                    margin: const EdgeInsets.only(left: 3.0),
+                    child: Opacity(
+                      opacity: ThemeConfig.kMuteFadeFactor,
+                      child: Tooltip(
+                        message: "Use html to style your content",
+                        child: Hyperlink(
+                          text: "styleable",
+                          onClick: () => setState(() {
+                            isStylingInformationDismissed =
+                                !isStylingInformationDismissed;
+                          }),
+                          visitedColor: null,
+                        ),
                       ),
                     ),
                   ),
-                ),
-              ],
-            ),
-            input: ReactiveTextField(
-              formControl: widget.formViewModel.surveyIntroTextControl,
-              decoration: InputDecoration(hintText: tr.form_field_measurement_survey_intro_text_hint),
-              inputFormatters: [
-                LengthLimitingTextInputFormatter(2000),
-              ],
-              validationMessages: widget.formViewModel.surveyIntroTextControl.validationMessages,
-              keyboardType: TextInputType.multiline,
-              minLines: 5,
-              maxLines: 5,
+                ],
+              ),
+              input: ReactiveTextField(
+                formControl: widget.formViewModel.surveyIntroTextControl,
+                decoration: InputDecoration(
+                    hintText: tr.form_field_measurement_survey_intro_text_hint,),
+                inputFormatters: [
+                  LengthLimitingTextInputFormatter(2000),
+                ],
+                validationMessages: widget
+                    .formViewModel.surveyIntroTextControl.validationMessages,
+                keyboardType: TextInputType.multiline,
+                minLines: 5,
+                maxLines: 5,
+              ),
             ),
-          ),
-          FormTableRow(
-            control: widget.formViewModel.surveyOutroTextControl,
-            labelBuilder: (context) => Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                FormLabel(
-                  labelText: tr.form_field_measurement_survey_outro_text,
-                  helpText: tr.form_field_measurement_survey_outro_text_tooltip,
-                ),
-                const SizedBox(height: 8),
-                Container(
-                  margin: const EdgeInsets.only(left: 3.0),
-                  child: Opacity(
-                    opacity: ThemeConfig.kMuteFadeFactor,
-                    child: Tooltip(
-                      message: "Use html to style your content",
-                      child: Hyperlink(
-                        text: "styleable",
-                        onClick: () => setState(() {
-                          isStylingInformationDismissed = !isStylingInformationDismissed;
-                        }),
-                        visitedColor: null,
+            FormTableRow(
+              control: widget.formViewModel.surveyOutroTextControl,
+              labelBuilder: (context) => Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  FormLabel(
+                    labelText: tr.form_field_measurement_survey_outro_text,
+                    helpText:
+                        tr.form_field_measurement_survey_outro_text_tooltip,
+                  ),
+                  const SizedBox(height: 8),
+                  Container(
+                    margin: const EdgeInsets.only(left: 3.0),
+                    child: Opacity(
+                      opacity: ThemeConfig.kMuteFadeFactor,
+                      child: Tooltip(
+                        message: "Use html to style your content",
+                        child: Hyperlink(
+                          text: "styleable",
+                          onClick: () => setState(() {
+                            isStylingInformationDismissed =
+                                !isStylingInformationDismissed;
+                          }),
+                          visitedColor: null,
+                        ),
                       ),
                     ),
                   ),
-                ),
-              ],
-            ),
-            input: ReactiveTextField(
-              formControl: widget.formViewModel.surveyOutroTextControl,
-              decoration: InputDecoration(hintText: tr.form_field_measurement_survey_outro_text_hint),
-              inputFormatters: [
-                LengthLimitingTextInputFormatter(2000),
-              ],
-              validationMessages: widget.formViewModel.surveyOutroTextControl.validationMessages,
-              keyboardType: TextInputType.multiline,
-              minLines: 5,
-              maxLines: 5,
+                ],
+              ),
+              input: ReactiveTextField(
+                formControl: widget.formViewModel.surveyOutroTextControl,
+                decoration: InputDecoration(
+                    hintText: tr.form_field_measurement_survey_outro_text_hint,),
+                inputFormatters: [
+                  LengthLimitingTextInputFormatter(2000),
+                ],
+                validationMessages: widget
+                    .formViewModel.surveyOutroTextControl.validationMessages,
+                keyboardType: TextInputType.multiline,
+                minLines: 5,
+                maxLines: 5,
+              ),
             ),
-          ),
-        ]),
+          ],
+        ),
         HtmlStylingBanner(
           isDismissed: isStylingInformationDismissed,
           onDismissed: onDismissedCallback,
         ),
         const SizedBox(height: 28.0),
         ReactiveFormConsumer(
-            // [ReactiveFormConsumer] is needed to to re-render when descendant controls are updated
-            // By default, ReactiveFormArray only updates when adding/removing controls
-            builder: (context, form, child) {
-          return ReactiveFormArray(
-            formArray: widget.formViewModel.questionsArray,
-            builder: (context, formArray, child) {
-              return FormArrayTable<QuestionFormViewModel>(
-                control: widget.formViewModel.questionsArray,
-                items: widget.formViewModel.questionModels,
-                onSelectItem: (viewModel) => _onSelectItem(viewModel, context, ref),
-                getActionsAt: (viewModel, _) => widget.formViewModel.availablePopupActions(viewModel),
-                onNewItem: () => _onNewItem(context, ref),
-                onNewItemLabel: tr.form_array_measurement_survey_questions_new,
-                rowTitle: (viewModel) => viewModel.formData?.questionText ?? '',
-                sectionTitle: tr.form_array_measurement_survey_questions,
-                emptyIcon: Icons.content_paste_off_rounded,
-                emptyTitle: tr.form_array_measurement_survey_questions_empty_title,
-                emptyDescription: tr.form_array_measurement_survey_questions_empty_description,
-                hideLeadingTrailingWhenEmpty: true,
-                rowPrefix: (context, viewModel, rowIdx) {
-                  return Row(
-                    children: [
-                      Tooltip(
-                        message: viewModel.questionType.string,
-                        child: Icon(
-                          viewModel.questionType.icon,
-                          color: ThemeConfig.dropdownMenuItemTheme(theme).iconTheme!.color,
-                          size: ThemeConfig.dropdownMenuItemTheme(theme).iconTheme!.size,
+          // [ReactiveFormConsumer] is needed to to re-render when descendant controls are updated
+          // By default, ReactiveFormArray only updates when adding/removing controls
+          builder: (context, form, child) {
+            return ReactiveFormArray(
+              formArray: widget.formViewModel.questionsArray,
+              builder: (context, formArray, child) {
+                return FormArrayTable<QuestionFormViewModel>(
+                  control: widget.formViewModel.questionsArray,
+                  items: widget.formViewModel.questionModels,
+                  onSelectItem: (viewModel) =>
+                      _onSelectItem(viewModel, context, ref),
+                  getActionsAt: (viewModel, _) =>
+                      widget.formViewModel.availablePopupActions(viewModel),
+                  onNewItem: () => _onNewItem(context, ref),
+                  onNewItemLabel:
+                      tr.form_array_measurement_survey_questions_new,
+                  rowTitle: (viewModel) =>
+                      viewModel.formData?.questionText ?? '',
+                  sectionTitle: tr.form_array_measurement_survey_questions,
+                  emptyIcon: Icons.content_paste_off_rounded,
+                  emptyTitle:
+                      tr.form_array_measurement_survey_questions_empty_title,
+                  emptyDescription: tr
+                      .form_array_measurement_survey_questions_empty_description,
+                  hideLeadingTrailingWhenEmpty: true,
+                  rowPrefix: (context, viewModel, rowIdx) {
+                    return Row(
+                      children: [
+                        Tooltip(
+                          message: viewModel.questionType.string,
+                          child: Icon(
+                            viewModel.questionType.icon,
+                            color: ThemeConfig.dropdownMenuItemTheme(theme)
+                                .iconTheme!
+                                .color,
+                            size: ThemeConfig.dropdownMenuItemTheme(theme)
+                                .iconTheme!
+                                .size,
+                          ),
                         ),
-                      ),
-                      const SizedBox(width: 16.0),
-                    ],
-                  );
-                },
-              );
-            },
-          );
-        }),
+                        const SizedBox(width: 16.0),
+                      ],
+                    );
+                  },
+                );
+              },
+            );
+          },
+        ),
         const SizedBox(height: 28.0),
         ScheduleControls(formViewModel: widget.formViewModel),
       ],
     );
   }
 
-  _onNewItem(BuildContext context, WidgetRef ref) {
+  void _onNewItem(BuildContext context, WidgetRef ref) {
     final routeArgs = widget.formViewModel.buildNewFormRouteArgs();
     _showSidesheetWithArgs(routeArgs, context, ref);
   }
 
-  _onSelectItem(QuestionFormViewModel item, BuildContext context, WidgetRef ref) {
+  void _onSelectItem(
+      QuestionFormViewModel item, BuildContext context, WidgetRef ref,) {
     final routeArgs = widget.formViewModel.buildFormRouteArgs(item);
     _showSidesheetWithArgs(routeArgs, context, ref);
   }
 
   // TODO: refactor to use [RoutingIntent] for sidesheet (so that it can be triggered from controller)
-  _showSidesheetWithArgs(SurveyQuestionFormRouteArgs routeArgs, BuildContext context, WidgetRef ref) {
-    final surveyQuestionFormViewModel = ref.read(surveyQuestionFormViewModelProvider(routeArgs));
+  void _showSidesheetWithArgs(SurveyQuestionFormRouteArgs routeArgs,
+      BuildContext context, WidgetRef ref,) {
+    final surveyQuestionFormViewModel =
+        ref.read(surveyQuestionFormViewModelProvider(routeArgs));
     showFormSideSheet<QuestionFormViewModel>(
       context: context,
       formViewModel: surveyQuestionFormViewModel,
-      formViewBuilder: (formViewModel) => SurveyQuestionFormView(formViewModel: formViewModel),
-      ignoreAppBar: true,
+      formViewBuilder: (formViewModel) =>
+          SurveyQuestionFormView(formViewModel: formViewModel),
     );
   }
 }
diff --git a/designer_v2/lib/features/design/measurements/survey/survey_preview_view.dart b/designer_v2/lib/features/design/measurements/survey/survey_preview_view.dart
index fe1a71838..8e8f3c8d1 100644
--- a/designer_v2/lib/features/design/measurements/survey/survey_preview_view.dart
+++ b/designer_v2/lib/features/design/measurements/survey/survey_preview_view.dart
@@ -11,9 +11,10 @@ class SurveyPreview extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    return Container(
-        color: Theme.of(context).colorScheme.primaryContainer.withOpacity(0.25),
-        child: Column(children: [
+    return ColoredBox(
+      color: Theme.of(context).colorScheme.primaryContainer.withOpacity(0.25),
+      child: Column(
+        children: [
           Stack(
             children: [
               Column(
@@ -25,6 +26,8 @@ class SurveyPreview extends ConsumerWidget {
               previewBanner(ref, routeArgs.studyId) ?? const SizedBox.shrink(),
             ],
           ),
-        ]));
+        ],
+      ),
+    );
   }
 }
diff --git a/designer_v2/lib/features/design/reports/report_badge.dart b/designer_v2/lib/features/design/reports/report_badge.dart
index 5dc52ae5e..7105e8a7c 100644
--- a/designer_v2/lib/features/design/reports/report_badge.dart
+++ b/designer_v2/lib/features/design/reports/report_badge.dart
@@ -8,7 +8,7 @@ class ReportBadge extends StatelessWidget {
       this.type = study_badge.BadgeType.outlineFill,
       this.showPrefixIcon = true,
       this.showTooltip = true,
-      super.key});
+      super.key,});
 
   final ReportStatus? status;
   final study_badge.BadgeType type;
@@ -39,14 +39,14 @@ class ReportBadge extends StatelessWidget {
           color: colorScheme.primary,
           type: study_badge.BadgeType.outlineFill,
           icon: prefixIcon,
-        ));
+        ),);
       case ReportStatus.secondary:
         return inTooltip(study_badge.Badge(
           label: status!.string,
           color: colorScheme.secondary.withOpacity(0.75),
           type: study_badge.BadgeType.outlineFill,
           icon: prefixIcon,
-        ));
+        ),);
       default:
         return const SizedBox.shrink();
     }
diff --git a/designer_v2/lib/features/design/reports/reports_form_controller.dart b/designer_v2/lib/features/design/reports/reports_form_controller.dart
index df64f1094..eba7ba3b1 100644
--- a/designer_v2/lib/features/design/reports/reports_form_controller.dart
+++ b/designer_v2/lib/features/design/reports/reports_form_controller.dart
@@ -2,6 +2,8 @@ import 'package:go_router/go_router.dart';
 import 'package:reactive_forms/reactive_forms.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/constants.dart';
+import 'package:studyu_designer_v2/features/design/reports/reports_form_data.dart';
+import 'package:studyu_designer_v2/features/design/reports/section/report_item_form_controller.dart';
 import 'package:studyu_designer_v2/features/design/reports/section/report_item_form_data.dart';
 import 'package:studyu_designer_v2/features/design/study_form_validation.dart';
 import 'package:studyu_designer_v2/features/forms/form_validation.dart';
@@ -16,13 +18,11 @@ import 'package:studyu_designer_v2/utils/extensions.dart';
 import 'package:studyu_designer_v2/utils/model_action.dart';
 import 'package:studyu_designer_v2/utils/riverpod.dart';
 
-import 'reports_form_data.dart';
-import 'section/report_item_form_controller.dart';
-
 class ReportsFormViewModel extends FormViewModel<ReportsFormData>
     implements
         IFormViewModelDelegate<ReportItemFormViewModel>,
-        IProviderArgsResolver<ReportItemFormViewModel, ReportItemFormRouteArgs> {
+        IProviderArgsResolver<ReportItemFormViewModel,
+            ReportItemFormRouteArgs> {
   ReportsFormViewModel({
     required this.study,
     required this.router,
@@ -44,10 +44,12 @@ class ReportsFormViewModel extends FormViewModel<ReportsFormData>
   // - Form fields
 
   late final FormArray reportItemArray = FormArray([]);
-  late final FormViewModelCollection<ReportItemFormViewModel, ReportItemFormData> reportItemFormViewModels =
+  late final FormViewModelCollection<ReportItemFormViewModel,
+          ReportItemFormData> reportItemFormViewModels =
       FormViewModelCollection([], reportItemArray);
 
-  List<ReportItemFormViewModel> get reportItemModels => reportItemFormViewModels.formViewModels;
+  List<ReportItemFormViewModel> get reportItemModels =>
+      reportItemFormViewModels.formViewModels;
 
   @override
   FormValidationConfigSet get sharedValidationConfig => {
@@ -64,10 +66,12 @@ class ReportsFormViewModel extends FormViewModel<ReportsFormData>
   @override
   void setControlsFrom(ReportsFormData data) {
     final viewModels = data.reportItems
-        .map((data) => ReportItemFormViewModel(
-              formData: data,
-              delegate: reportItemDelegate,
-            ))
+        .map(
+          (data) => ReportItemFormViewModel(
+            formData: data,
+            delegate: reportItemDelegate,
+          ),
+        )
         .toList();
     reportItemFormViewModels.reset(viewModels);
   }
@@ -93,19 +97,24 @@ class ReportsFormViewModel extends FormViewModel<ReportsFormData>
     );
   }
 
-  ReportItemFormRouteArgs buildReportItemFormRouteArgs(ReportItemFormViewModel model) {
+  ReportItemFormRouteArgs buildReportItemFormRouteArgs(
+    ReportItemFormViewModel model,
+  ) {
     return ReportItemFormRouteArgs(
       studyId: study.id,
       sectionId: model.sectionId,
     );
   }
 
-  testReport() {
+  void testReport() {
     // todo
-    router.dispatch(RoutingIntents.studyTest(study.id, appRoute: TestAppRoutes.consent));
+    router.dispatch(
+      RoutingIntents.studyTest(study.id, appRoute: TestAppRoutes.consent),
+    );
   }
 
-  bool get canTestConsent => !reportItemArray.disabled && (reportItemArray.value?.isNotEmpty ?? false);
+  bool get canTestConsent =>
+      !reportItemArray.disabled && (reportItemArray.value?.isNotEmpty ?? false);
 
   @override
   void onCancel(ReportItemFormViewModel formViewModel, FormMode prevFormMode) {
@@ -121,14 +130,15 @@ class ReportsFormViewModel extends FormViewModel<ReportsFormData>
   ReportItemFormViewModel provide(ReportItemFormRouteArgs args) {
     if (args.sectionId.isNewId) {
       final viewModel = ReportItemFormViewModel(
-        formData: formData,
+        formData: formData as ReportItemFormData?,
         delegate: this,
       );
       reportItemFormViewModels.stage(viewModel);
       return viewModel;
     }
 
-    final viewModel = reportItemFormViewModels.findWhere((vm) => vm.sectionId == args.sectionId);
+    final viewModel = reportItemFormViewModels
+        .findWhere((vm) => vm.sectionId == args.sectionId);
     if (viewModel == null) {
       print("ReportSection not found");
       throw ReportSectionNotFoundException(); // TODO handle 404 not found
@@ -141,7 +151,8 @@ class ReportFormItemDelegate
     implements
         IFormViewModelDelegate<ReportItemFormViewModel>,
         IListActionProvider<ReportItemFormViewModel>,
-        IProviderArgsResolver<ReportItemFormViewModel, ReportItemFormRouteArgs> {
+        IProviderArgsResolver<ReportItemFormViewModel,
+            ReportItemFormRouteArgs> {
   ReportFormItemDelegate({
     required this.formViewModelCollection,
     required this.owner,
@@ -149,7 +160,8 @@ class ReportFormItemDelegate
     this.propagateOnSave = true,
   });
 
-  final FormViewModelCollection<ReportItemFormViewModel, ReportItemFormData> formViewModelCollection;
+  final FormViewModelCollection<ReportItemFormViewModel, ReportItemFormData>
+      formViewModelCollection;
   final ReportsFormViewModel owner;
   final bool propagateOnSave;
   final FormValidationSetEnum? validationSet;
@@ -160,7 +172,10 @@ class ReportFormItemDelegate
   }
 
   @override
-  Future onSave(ReportItemFormViewModel formViewModel, FormMode prevFormMode) async {
+  Future onSave(
+    ReportItemFormViewModel formViewModel,
+    FormMode prevFormMode,
+  ) async {
     if (prevFormMode == FormMode.create) {
       // Save the managed viewmodel that was eagerly added in [provide]
       formViewModelCollection.commit(formViewModel);
@@ -176,7 +191,6 @@ class ReportFormItemDelegate
   ReportItemFormViewModel provide(ReportItemFormRouteArgs args) {
     if (args.sectionId.isNewId) {
       final viewModel = ReportItemFormViewModel(
-        formData: null,
         delegate: this,
         validationSet: validationSet,
       );
@@ -184,7 +198,8 @@ class ReportFormItemDelegate
       return viewModel;
     }
 
-    final viewModel = formViewModelCollection.findWhere((vm) => vm.sectionId == args.sectionId);
+    final viewModel = formViewModelCollection
+        .findWhere((vm) => vm.sectionId == args.sectionId);
     if (viewModel == null) {
       throw ReportSectionNotFoundException(); // TODO handle 404 not found
     }
@@ -204,7 +219,7 @@ class ReportFormItemDelegate
       label: ModelActionType.primary.string,
       isAvailable: !owner.isReadonly,
       onExecute: () async {
-        for (var e in formViewModelCollection.formViewModels) {
+        for (final e in formViewModelCollection.formViewModels) {
           if (e.formData!.isPrimary) {
             e.formData!.isPrimary = false;
             e.buildFormData().isPrimary = false;
diff --git a/designer_v2/lib/features/design/reports/reports_form_data.dart b/designer_v2/lib/features/design/reports/reports_form_data.dart
index 7425c0801..eab7d0df1 100644
--- a/designer_v2/lib/features/design/reports/reports_form_data.dart
+++ b/designer_v2/lib/features/design/reports/reports_form_data.dart
@@ -19,7 +19,7 @@ class ReportsFormData implements IStudyFormData {
   @override
   Study apply(Study study) {
     study.reportSpecification.secondary = [];
-    for (ReportItemFormData itemFormData in reportItems) {
+    for (final ReportItemFormData itemFormData in reportItems) {
       if (itemFormData.isPrimary) {
         study.reportSpecification.primary = itemFormData.section;
       } else {
diff --git a/designer_v2/lib/features/design/reports/reports_form_view.dart b/designer_v2/lib/features/design/reports/reports_form_view.dart
index 164d7a1fc..434ef34da 100644
--- a/designer_v2/lib/features/design/reports/reports_form_view.dart
+++ b/designer_v2/lib/features/design/reports/reports_form_view.dart
@@ -7,6 +7,7 @@ import 'package:studyu_designer_v2/common_views/sidesheet/sidesheet_form.dart';
 import 'package:studyu_designer_v2/common_views/text_paragraph.dart';
 import 'package:studyu_designer_v2/features/design/reports/report_badge.dart';
 import 'package:studyu_designer_v2/features/design/reports/reports_form_data.dart';
+import 'package:studyu_designer_v2/features/design/reports/section/report_item_form_controller.dart';
 import 'package:studyu_designer_v2/features/design/reports/section/report_item_form_view.dart';
 import 'package:studyu_designer_v2/features/design/study_design_page_view.dart';
 import 'package:studyu_designer_v2/features/design/study_form_providers.dart';
@@ -17,8 +18,6 @@ import 'package:studyu_designer_v2/routing/router_config.dart';
 import 'package:studyu_designer_v2/theme.dart';
 import 'package:studyu_designer_v2/utils/extensions.dart';
 
-import 'section/report_item_form_controller.dart';
-
 class StudyDesignReportsFormView extends StudyDesignPageWidget {
   const StudyDesignReportsFormView(super.studyId, {super.key});
 
@@ -35,7 +34,6 @@ class StudyDesignReportsFormView extends StudyDesignPageWidget {
           formGroup: formViewModel.form,
           child: ReactiveFormConsumer(
             builder: (context, formGroup, child) => Column(
-              mainAxisAlignment: MainAxisAlignment.start,
               crossAxisAlignment: CrossAxisAlignment.start,
               children: <Widget>[
                 TextParagraph(text: tr.form_array_report_items_description),
@@ -47,15 +45,28 @@ class StudyDesignReportsFormView extends StudyDesignPageWidget {
                       control: formViewModel.reportItemArray,
                       items: formViewModel.reportItemModels,
                       onSelectItem: (viewModel) {
-                        final routeArgs = formViewModel.buildReportItemFormRouteArgs(viewModel);
-                        _showReportItemSidesheetWithArgs(routeArgs, context, ref);
+                        final routeArgs = formViewModel
+                            .buildReportItemFormRouteArgs(viewModel);
+                        _showReportItemSidesheetWithArgs(
+                          routeArgs,
+                          context,
+                          ref,
+                        );
                       },
-                      getActionsAt: (viewModel, _) => formViewModel.reportItemDelegate.availableActions(viewModel),
+                      getActionsAt: (viewModel, _) => formViewModel
+                          .reportItemDelegate
+                          .availableActions(viewModel),
                       onNewItem: () {
-                        final routeArgs = formViewModel.buildNewReportItemFormRouteArgs();
-                        _showReportItemSidesheetWithArgs(routeArgs, context, ref);
+                        final routeArgs =
+                            formViewModel.buildNewReportItemFormRouteArgs();
+                        _showReportItemSidesheetWithArgs(
+                          routeArgs,
+                          context,
+                          ref,
+                        );
                       },
-                      rowTitle: (viewModel) => viewModel.formData?.section.title ?? '',
+                      rowTitle: (viewModel) =>
+                          viewModel.formData?.section.title ?? '',
                       //rowTitle: (viewModel) => viewModel.formData?.title ?? '',
                       //sectionDescription: tr.form_array_report_items_description,
                       sectionTitleDivider: false,
@@ -70,7 +81,9 @@ class StudyDesignReportsFormView extends StudyDesignPageWidget {
                             Text(
                               ''.alphabetLetterFrom(rowIdx).toUpperCase(),
                               style: TextStyle(
-                                color: ThemeConfig.dropdownMenuItemTheme(theme).iconTheme!.color,
+                                color: ThemeConfig.dropdownMenuItemTheme(theme)
+                                    .iconTheme!
+                                    .color,
                               ),
                             ),
                             const SizedBox(width: 16.0),
@@ -81,9 +94,10 @@ class StudyDesignReportsFormView extends StudyDesignPageWidget {
                         return Row(
                           children: [
                             ReportBadge(
-                              status: (viewModel.formData!.isPrimary) ? ReportStatus.primary : ReportStatus.secondary,
+                              status: (viewModel.formData!.isPrimary)
+                                  ? ReportStatus.primary
+                                  : ReportStatus.secondary,
                               showPrefixIcon: false,
-                              showTooltip: true,
                             ),
                           ],
                         );
@@ -95,17 +109,20 @@ class StudyDesignReportsFormView extends StudyDesignPageWidget {
                             tr.form_array_report_items_title,
                             style: Theme.of(context).textTheme.titleLarge,
                           ),
-                          (formViewModel.canTestConsent) // todo
-                              ? Opacity(
-                                  opacity: ThemeConfig.kMuteFadeFactor,
-                                  child: TextButton.icon(
-                                    //onPressed: formViewModel.testReport,
-                                    onPressed: null,
-                                    icon: const Icon(Icons.play_circle_outline_rounded),
-                                    label: Text(tr.form_array_report_items_test),
-                                  ),
-                                )
-                              : const SizedBox.shrink(),
+                          if (formViewModel.canTestConsent)
+                            Opacity(
+                              opacity: ThemeConfig.kMuteFadeFactor,
+                              child: TextButton.icon(
+                                //onPressed: formViewModel.testReport,
+                                onPressed: null,
+                                icon: const Icon(
+                                  Icons.play_circle_outline_rounded,
+                                ),
+                                label: Text(tr.form_array_report_items_test),
+                              ),
+                            )
+                          else
+                            const SizedBox.shrink(),
                         ],
                       ),
                     );
@@ -120,7 +137,7 @@ class StudyDesignReportsFormView extends StudyDesignPageWidget {
   }
 
   // TODO: refactor to use [RoutingIntent] for sidesheet (so that it can be triggered from controller)
-  _showReportItemSidesheetWithArgs(
+  void _showReportItemSidesheetWithArgs(
     ReportItemFormRouteArgs routeArgs,
     BuildContext context,
     WidgetRef ref,
@@ -130,7 +147,8 @@ class StudyDesignReportsFormView extends StudyDesignPageWidget {
     showFormSideSheet<ReportItemFormViewModel>(
       context: context,
       formViewModel: formViewModel,
-      formViewBuilder: (formViewModel) => ReportItemFormView(formViewModel: formViewModel, studyId: studyId),
+      formViewBuilder: (formViewModel) =>
+          ReportItemFormView(formViewModel: formViewModel, studyId: studyId),
     );
   }
 }
diff --git a/designer_v2/lib/features/design/reports/section/report_item_form_controller.dart b/designer_v2/lib/features/design/reports/section/report_item_form_controller.dart
index 31361e225..c4ad540c3 100644
--- a/designer_v2/lib/features/design/reports/section/report_item_form_controller.dart
+++ b/designer_v2/lib/features/design/reports/section/report_item_form_controller.dart
@@ -23,35 +23,50 @@ class ReportItemFormViewModel extends ManagedFormViewModel<ReportItemFormData> {
   // - Form fields (any section type)
 
   String get sectionId => sectionIdControl.value!;
-  final FormControl<SectionID> sectionIdControl = FormControl(value: const Uuid().v4()); // hidden
-  late final FormControl<ReportSectionType> sectionTypeControl = CustomFormControl(
+  final FormControl<SectionID> sectionIdControl =
+      FormControl(value: const Uuid().v4()); // hidden
+  late final FormControl<ReportSectionType> sectionTypeControl =
+      CustomFormControl(
     value: defaultSectionType,
     onValueChanged: onSectionTypeChanged,
   );
   final FormControl<String> titleControl = FormControl();
   final FormControl<String> descriptionControl = FormControl();
 
-  final FormControl<ReportSection> sectionControl = CustomFormControl(value: AverageSection.withId());
+  final FormControl<ReportSection> sectionControl =
+      CustomFormControl(value: AverageSection.withId());
 
-  ReportSectionType get sectionType => sectionTypeControl.value ?? defaultSectionType;
+  ReportSectionType get sectionType =>
+      sectionTypeControl.value ?? defaultSectionType;
 
-  static List<FormControlOption<ReportSectionType>> get sectionTypeControlOptions =>
-      ReportSectionType.values.map((e) => FormControlOption(e, e.string)).toList();
+  static List<FormControlOption<ReportSectionType>>
+      get sectionTypeControlOptions => ReportSectionType.values
+          .map((e) => FormControlOption(e, e.string))
+          .toList();
 
   // DataReference might need to be section specific in the future
-  final FormControl<DataReferenceIdentifier<num>> dataReferenceControl = FormControl();
+  final FormControl<DataReferenceIdentifier<num>> dataReferenceControl =
+      FormControl();
 
   // - Form fields (section type-specific)
 
   // -- Average
-  static List<FormControlOption<TemporalAggregationFormatted>> get temporalAggregationControlOptions =>
-      TemporalAggregationFormatted.values.map((e) => FormControlOption(e, e.string)).toList();
-  final FormControl<TemporalAggregationFormatted> temporalAggregationControl = FormControl();
+  static List<FormControlOption<TemporalAggregationFormatted>>
+      get temporalAggregationControlOptions =>
+          TemporalAggregationFormatted.values
+              .map((e) => FormControlOption(e, e.string))
+              .toList();
+  final FormControl<TemporalAggregationFormatted> temporalAggregationControl =
+      FormControl();
 
   // -- LinearRegression
-  static List<FormControlOption<ImprovementDirectionFormatted>> get improvementDirectionControlOptions =>
-      ImprovementDirectionFormatted.values.map((e) => FormControlOption(e, e.string)).toList();
-  final FormControl<ImprovementDirectionFormatted> improvementDirectionControl = FormControl();
+  static List<FormControlOption<ImprovementDirectionFormatted>>
+      get improvementDirectionControlOptions =>
+          ImprovementDirectionFormatted.values
+              .map((e) => FormControlOption(e, e.string))
+              .toList();
+  final FormControl<ImprovementDirectionFormatted> improvementDirectionControl =
+      FormControl();
   final FormControl<double> alphaControl = FormControl();
 
   @override
@@ -72,73 +87,131 @@ class ReportItemFormViewModel extends ManagedFormViewModel<ReportItemFormData> {
   };
 
   late final FormValidationConfigSet _sharedValidationConfig = {
-    StudyFormValidationSet.draft: [titleRequired, descriptionRequired, dataReferenceRequired],
-    StudyFormValidationSet.publish: [titleRequired, descriptionRequired, dataReferenceRequired],
-    StudyFormValidationSet.test: [titleRequired, descriptionRequired, dataReferenceRequired],
+    StudyFormValidationSet.draft: [
+      titleRequired,
+      descriptionRequired,
+      dataReferenceRequired,
+    ],
+    StudyFormValidationSet.publish: [
+      titleRequired,
+      descriptionRequired,
+      dataReferenceRequired,
+    ],
+    StudyFormValidationSet.test: [
+      titleRequired,
+      descriptionRequired,
+      dataReferenceRequired,
+    ],
   };
 
-  late final Map<ReportSectionType, FormValidationConfigSet> _validationConfigsBySectionType = {
+  late final Map<ReportSectionType, FormValidationConfigSet>
+      _validationConfigsBySectionType = {
     ReportSectionType.average: {
       StudyFormValidationSet.draft: [aggregationRequired],
       StudyFormValidationSet.publish: [aggregationRequired],
       StudyFormValidationSet.test: [aggregationRequired],
     },
     ReportSectionType.linearRegression: {
-      StudyFormValidationSet.draft: [improvementDirectionRequired, alphaConfidenceRequired],
-      StudyFormValidationSet.publish: [improvementDirectionRequired, alphaConfidenceRequired],
-      StudyFormValidationSet.test: [improvementDirectionRequired, alphaConfidenceRequired],
+      StudyFormValidationSet.draft: [
+        improvementDirectionRequired,
+        alphaConfidenceRequired,
+      ],
+      StudyFormValidationSet.publish: [
+        improvementDirectionRequired,
+        alphaConfidenceRequired,
+      ],
+      StudyFormValidationSet.test: [
+        improvementDirectionRequired,
+        alphaConfidenceRequired,
+      ],
     },
   };
 
   @override
   FormValidationConfigSet get sharedValidationConfig => {
-        StudyFormValidationSet.draft: _getValidationConfig(StudyFormValidationSet.draft),
-        StudyFormValidationSet.publish: _getValidationConfig(StudyFormValidationSet.publish),
-        StudyFormValidationSet.test: _getValidationConfig(StudyFormValidationSet.test),
+        StudyFormValidationSet.draft:
+            _getValidationConfig(StudyFormValidationSet.draft),
+        StudyFormValidationSet.publish:
+            _getValidationConfig(StudyFormValidationSet.publish),
+        StudyFormValidationSet.test:
+            _getValidationConfig(StudyFormValidationSet.test),
       };
 
-  List<FormControlValidation> _getValidationConfig(StudyFormValidationSet validationSet) {
+  List<FormControlValidation> _getValidationConfig(
+      StudyFormValidationSet validationSet,) {
     return [
-      ...(_sharedValidationConfig[validationSet] ?? []),
-      ...(_validationConfigsBySectionType[sectionType]?[validationSet] ?? [])
+      ..._sharedValidationConfig[validationSet] ?? [],
+      ..._validationConfigsBySectionType[sectionType]?[validationSet] ?? [],
     ];
   }
 
-  get titleRequired => FormControlValidation(control: titleControl, validators: [
-        Validators.required
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_report_title_required,
-      });
-  get descriptionRequired => FormControlValidation(control: descriptionControl, validators: [
-        Validators.required
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_report_text_required,
-      });
-
-  get dataReferenceRequired => FormControlValidation(control: dataReferenceControl, validators: [
-        Validators.required
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_report_data_source_required,
-      });
+  FormControlValidation get titleRequired => FormControlValidation(
+        control: titleControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_report_title_required,
+        },
+      );
+  FormControlValidation get descriptionRequired => FormControlValidation(
+        control: descriptionControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_report_text_required,
+        },
+      );
+
+  FormControlValidation get dataReferenceRequired => FormControlValidation(
+        control: dataReferenceControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_report_data_source_required,
+        },
+      );
 
   // -- Average
-  get aggregationRequired => FormControlValidation(control: temporalAggregationControl, validators: [
-        Validators.required
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_report_temporalAggregation_required,
-      });
+  FormControlValidation get aggregationRequired => FormControlValidation(
+        control: temporalAggregationControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_report_temporalAggregation_required,
+        },
+      );
 
   // -- LinearRegression
-  get improvementDirectionRequired => FormControlValidation(control: improvementDirectionControl, validators: [
-        Validators.required
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_report_improvementDirection_required,
-      });
-  get alphaConfidenceRequired => FormControlValidation(control: alphaControl, validators: [
-        Validators.required // todo numeric but also support decimal numbers e.g. 0.2 or 0,2
-      ], validationMessages: {
-        ValidationMessage.number: (error) => tr.form_field_report_alphaConfidence_number,
-      });
+  FormControlValidation get improvementDirectionRequired =>
+      FormControlValidation(
+        control: improvementDirectionControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_report_improvementDirection_required,
+        },
+      );
+  FormControlValidation get alphaConfidenceRequired => FormControlValidation(
+        control: alphaControl,
+        validators: [
+          Validators
+              .required, // todo numeric but also support decimal numbers e.g. 0.2 or 0,2
+        ],
+        validationMessages: {
+          ValidationMessage.number: (error) =>
+              tr.form_field_report_alphaConfidence_number,
+        },
+      );
 
   late final Map<String, AbstractControl> sectionBaseControls = {
     'sectionId': sectionIdControl, // hidden
@@ -151,28 +224,29 @@ class ReportItemFormViewModel extends ManagedFormViewModel<ReportItemFormData> {
 
   @override
   ReportItemFormData buildFormData() {
-    buildSectionSpecific(ReportSectionType sectionType) {
+    ReportSection buildSectionSpecific(ReportSectionType sectionType) {
       switch (sectionType) {
         case ReportSectionType.average:
-          AverageSection averageSection = AverageSection();
+          final AverageSection averageSection = AverageSection();
           averageSection.aggregate = temporalAggregationControl.value!.value;
-          averageSection.resultProperty = dataReferenceControl.value!;
+          averageSection.resultProperty = dataReferenceControl.value;
           return averageSection;
         case ReportSectionType.linearRegression:
-          LinearRegressionSection linearSection = LinearRegressionSection();
+          final LinearRegressionSection linearSection =
+              LinearRegressionSection();
           linearSection.improvement = improvementDirectionControl.value!.value;
           linearSection.alpha = alphaControl.value!;
-          linearSection.resultProperty = dataReferenceControl.value!;
+          linearSection.resultProperty = dataReferenceControl.value;
           return linearSection;
       }
     }
 
     final sectionType = sectionTypeControl.value!;
-    ReportSection section = buildSectionSpecific(sectionType);
+    final ReportSection section = buildSectionSpecific(sectionType);
 
     section.id = sectionId;
-    section.title = titleControl.value!;
-    section.description = descriptionControl.value!;
+    section.title = titleControl.value;
+    section.description = descriptionControl.value;
 
     bool primaryStatus = false;
     if (formData != null) {
@@ -200,7 +274,7 @@ class ReportItemFormViewModel extends ManagedFormViewModel<ReportItemFormData> {
     ..._controlsBySectionType[sectionType]!.controls,
   });
 
-  onSectionTypeChanged(ReportSectionType? sectionType) {
+  void onSectionTypeChanged(ReportSectionType? sectionType) {
     _updateFormControls(sectionType);
   }
 
@@ -230,18 +304,22 @@ class ReportItemFormViewModel extends ManagedFormViewModel<ReportItemFormData> {
     // Type-specific controls
     switch (sectionType) {
       case ReportSectionType.average:
-        AverageSection averageSection = data.section as AverageSection;
-        temporalAggregationControl.value = TemporalAggregationFormatted(averageSection.aggregate!);
-        dataReferenceControl.value =
-            DataReferenceIdentifier(averageSection.resultProperty!.task, averageSection.resultProperty!.property);
-        break;
+        final AverageSection averageSection = data.section as AverageSection;
+        temporalAggregationControl.value =
+            TemporalAggregationFormatted(averageSection.aggregate!);
+        dataReferenceControl.value = DataReferenceIdentifier(
+            averageSection.resultProperty!.task,
+            averageSection.resultProperty!.property,);
       case ReportSectionType.linearRegression:
-        LinearRegressionSection linearRegressionSection = data.section as LinearRegressionSection;
-        improvementDirectionControl.value = ImprovementDirectionFormatted(linearRegressionSection.improvement!);
+        final LinearRegressionSection linearRegressionSection =
+            data.section as LinearRegressionSection;
+        improvementDirectionControl.value =
+            ImprovementDirectionFormatted(linearRegressionSection.improvement!);
         alphaControl.value = linearRegressionSection.alpha;
         dataReferenceControl.value = DataReferenceIdentifier(
-            linearRegressionSection.resultProperty!.task, linearRegressionSection.resultProperty!.property);
-        break;
+          linearRegressionSection.resultProperty!.task,
+          linearRegressionSection.resultProperty!.property,
+        );
     }
   }
 }
diff --git a/designer_v2/lib/features/design/reports/section/report_item_form_data.dart b/designer_v2/lib/features/design/reports/section/report_item_form_data.dart
index f834968ca..71013b10f 100644
--- a/designer_v2/lib/features/design/reports/section/report_item_form_data.dart
+++ b/designer_v2/lib/features/design/reports/section/report_item_form_data.dart
@@ -14,19 +14,19 @@ class ReportItemFormData extends IFormData {
   @override
   String get id => section.id;
 
-  static fromDomainModel(ReportSpecification reportSpecification) {
+  static List<ReportItemFormData> fromDomainModel(ReportSpecification reportSpecification) {
     final List<ReportItemFormData> reportsFormData = [];
     if (reportSpecification.primary != null) {
       reportsFormData.add(ReportItemFormData(
         isPrimary: true,
         section: reportSpecification.primary!,
-      ));
+      ),);
     }
-    for (ReportSection reportSection in reportSpecification.secondary) {
+    for (final ReportSection reportSection in reportSpecification.secondary) {
       reportsFormData.add(ReportItemFormData(
         isPrimary: false,
         section: reportSection,
-      ));
+      ),);
     }
     return reportsFormData;
   }
diff --git a/designer_v2/lib/features/design/reports/section/report_item_form_view.dart b/designer_v2/lib/features/design/reports/section/report_item_form_view.dart
index 7d421220c..fb9999e3d 100644
--- a/designer_v2/lib/features/design/reports/section/report_item_form_view.dart
+++ b/designer_v2/lib/features/design/reports/section/report_item_form_view.dart
@@ -18,7 +18,7 @@ class ReportItemFormView extends StatelessWidget {
   final ReportItemFormViewModel formViewModel;
   final StudyID studyId;
 
-  get reportSectionColumnWidth => const {
+  Map<int, TableColumnWidth> get reportSectionColumnWidth => const {
         0: FixedColumnWidth(180.0),
         1: FlexColumnWidth(),
       };
@@ -26,9 +26,9 @@ class ReportItemFormView extends StatelessWidget {
   WidgetBuilder get sectionTypeBodyBuilder {
     final Map<ReportSectionType, WidgetBuilder> sectionTypeWidgets = {
       ReportSectionType.average: (_) => AverageSectionFormView(
-          formViewModel: formViewModel, studyId: studyId, reportSectionColumnWidth: reportSectionColumnWidth),
+          formViewModel: formViewModel, studyId: studyId, reportSectionColumnWidth: reportSectionColumnWidth,),
       ReportSectionType.linearRegression: (_) => LinearRegressionSectionFormView(
-          formViewModel: formViewModel, studyId: studyId, reportSectionColumnWidth: reportSectionColumnWidth),
+          formViewModel: formViewModel, studyId: studyId, reportSectionColumnWidth: reportSectionColumnWidth,),
     };
     final sectionType = formViewModel.sectionType;
 
@@ -49,9 +49,9 @@ class ReportItemFormView extends StatelessWidget {
               _buildSectionTypeHeader(context),
               sectionTypeBodyBuilder(context),
             ],
-          ));
+          ),);
 
-  _buildSectionText(BuildContext context) {
+  FormTableLayout _buildSectionText(BuildContext context) {
     return FormTableLayout(
       rowLayout: FormTableRowLayout.vertical,
       rows: [
@@ -92,7 +92,7 @@ class ReportItemFormView extends StatelessWidget {
     );
   }
 
-  _buildSectionTypeHeader(BuildContext context) {
+  Column _buildSectionTypeHeader(BuildContext context) {
     final theme = Theme.of(context);
     return Column(
       children: [
@@ -116,12 +116,10 @@ class ReportItemFormView extends StatelessWidget {
                       value: option.value,
                       child: Row(
                         children: [
-                          (option.value.icon != null)
-                              ? Icon(option.value.icon,
-                                  size: iconTheme.size, color: iconTheme.color, shadows: iconTheme.shadows)
-                              : const SizedBox.shrink(),
+                          if (option.value.icon != null) Icon(option.value.icon,
+                                  size: iconTheme.size, color: iconTheme.color, shadows: iconTheme.shadows,) else const SizedBox.shrink(),
                           const SizedBox(width: 16.0),
-                          Text(option.label)
+                          Text(option.label),
                         ],
                       ),
                     );
diff --git a/designer_v2/lib/features/design/reports/section/types/average_section_form_view.dart b/designer_v2/lib/features/design/reports/section/types/average_section_form_view.dart
index 8adee34e3..c04fdf7d8 100644
--- a/designer_v2/lib/features/design/reports/section/types/average_section_form_view.dart
+++ b/designer_v2/lib/features/design/reports/section/types/average_section_form_view.dart
@@ -55,12 +55,10 @@ class AverageSectionFormView extends ConsumerWidget {
                       value: option.value,
                       child: Row(
                         children: [
-                          (option.value.icon != null)
-                              ? Icon(option.value.icon,
-                                  size: iconTheme.size, color: iconTheme.color, shadows: iconTheme.shadows)
-                              : const SizedBox.shrink(),
+                          if (option.value.icon != null) Icon(option.value.icon,
+                                  size: iconTheme.size, color: iconTheme.color, shadows: iconTheme.shadows,) else const SizedBox.shrink(),
                           const SizedBox(width: 16.0),
-                          Text(option.label)
+                          Text(option.label),
                         ],
                       ),
                     );
diff --git a/designer_v2/lib/features/design/reports/section/types/data_reference_editor.dart b/designer_v2/lib/features/design/reports/section/types/data_reference_editor.dart
index 5904ee826..b88d68ab5 100644
--- a/designer_v2/lib/features/design/reports/section/types/data_reference_editor.dart
+++ b/designer_v2/lib/features/design/reports/section/types/data_reference_editor.dart
@@ -2,11 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:reactive_forms/reactive_forms.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/common_views/form_table_layout.dart';
+import 'package:studyu_designer_v2/features/design/reports/section/types/data_reference_identifier.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/theme.dart';
 
-import 'data_reference_identifier.dart';
-
 class DataReferenceEditor<T> {
   const DataReferenceEditor({
     required this.formControl,
diff --git a/designer_v2/lib/features/design/reports/section/types/linear_regression_section_form_view.dart b/designer_v2/lib/features/design/reports/section/types/linear_regression_section_form_view.dart
index eb0a6d8da..38b8a23ef 100644
--- a/designer_v2/lib/features/design/reports/section/types/linear_regression_section_form_view.dart
+++ b/designer_v2/lib/features/design/reports/section/types/linear_regression_section_form_view.dart
@@ -14,7 +14,7 @@ import 'package:studyu_designer_v2/theme.dart';
 
 class LinearRegressionSectionFormView extends ConsumerWidget {
   const LinearRegressionSectionFormView(
-      {required this.formViewModel, required this.studyId, required this.reportSectionColumnWidth, super.key});
+      {required this.formViewModel, required this.studyId, required this.reportSectionColumnWidth, super.key,});
 
   final ReportItemFormViewModel formViewModel;
   final StudyID studyId;
@@ -49,12 +49,10 @@ class LinearRegressionSectionFormView extends ConsumerWidget {
                       value: option.value,
                       child: Row(
                         children: [
-                          (option.value.icon != null)
-                              ? Icon(option.value.icon,
-                                  size: iconTheme.size, color: iconTheme.color, shadows: iconTheme.shadows)
-                              : const SizedBox.shrink(),
+                          if (option.value.icon != null) Icon(option.value.icon,
+                                  size: iconTheme.size, color: iconTheme.color, shadows: iconTheme.shadows,) else const SizedBox.shrink(),
                           const SizedBox(width: 16.0),
-                          Text(option.label)
+                          Text(option.label),
                         ],
                       ),
                     );
diff --git a/designer_v2/lib/features/design/reports/section/types/section_type.dart b/designer_v2/lib/features/design/reports/section/types/section_type.dart
index e0d8a5200..d27687596 100644
--- a/designer_v2/lib/features/design/reports/section/types/section_type.dart
+++ b/designer_v2/lib/features/design/reports/section/types/section_type.dart
@@ -12,7 +12,9 @@ enum ReportSectionType {
       LinearRegressionSection.sectionType: ReportSectionType.linearRegression,
     };
     if (!typeMapping.containsKey(reportSection.type)) {
-      throw UnimplementedError("Missing ReportSectionType for reportSection of type: ${reportSection.type}");
+      throw UnimplementedError(
+        "Missing ReportSectionType for reportSection of type: ${reportSection.type}",
+      );
     }
     return typeMapping[reportSection.type]!;
   }
@@ -51,7 +53,9 @@ class TemporalAggregationFormatted {
   const TemporalAggregationFormatted(this._value);
 
   static List<TemporalAggregationFormatted> get values =>
-      TemporalAggregation.values.map((e) => TemporalAggregationFormatted(e)).toList();
+      TemporalAggregation.values
+          .map((e) => TemporalAggregationFormatted(e))
+          .toList();
   TemporalAggregation get value => TemporalAggregation.values.byName(toJson());
 
   String get string {
@@ -82,16 +86,17 @@ class TemporalAggregationFormatted {
 
   @override
   bool operator ==(Object other) =>
-      identical(this, other) || other is TemporalAggregationFormatted && _value == other._value;
+      identical(this, other) ||
+      other is TemporalAggregationFormatted && _value == other._value;
 
   @override
   int get hashCode => _value.hashCode;
 
   @override
-  toString() => toJson();
+  String toString() => toJson();
 
   String toJson() => _value.name;
-  static TemporalAggregationFormatted fromJson(String json) =>
+  TemporalAggregationFormatted fromJson(String json) =>
       TemporalAggregationFormatted(TemporalAggregation.values.byName(json));
 }
 
@@ -100,8 +105,11 @@ class ImprovementDirectionFormatted {
   const ImprovementDirectionFormatted(this._value);
 
   static List<ImprovementDirectionFormatted> get values =>
-      ImprovementDirection.values.map((e) => ImprovementDirectionFormatted(e)).toList();
-  ImprovementDirection get value => ImprovementDirection.values.byName(toJson());
+      ImprovementDirection.values
+          .map((e) => ImprovementDirectionFormatted(e))
+          .toList();
+  ImprovementDirection get value =>
+      ImprovementDirection.values.byName(toJson());
 
   String get string {
     switch (value) {
@@ -127,15 +135,16 @@ class ImprovementDirectionFormatted {
 
   @override
   bool operator ==(Object other) =>
-      identical(this, other) || other is ImprovementDirectionFormatted && _value == other._value;
+      identical(this, other) ||
+      other is ImprovementDirectionFormatted && _value == other._value;
 
   @override
   int get hashCode => _value.hashCode;
 
   @override
-  toString() => toJson();
+  String toString() => toJson();
 
   String toJson() => _value.name;
-  static ImprovementDirectionFormatted fromJson(String json) =>
+  ImprovementDirectionFormatted fromJson(String json) =>
       ImprovementDirectionFormatted(ImprovementDirection.values.byName(json));
 }
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/question_form_controller.dart b/designer_v2/lib/features/design/shared/questionnaire/question/question_form_controller.dart
index cdc0b995d..9dd276c46 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/question_form_controller.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/question_form_controller.dart
@@ -27,14 +27,20 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
     super.formData,
     super.delegate,
     super.validationSet = StudyFormValidationSet.draft,
-    titles,
+    Map<FormMode, String Function()>? titles,
   }) : _titles = titles {
-    boolResponseOptionsArray.onChanged((control) => onResponseOptionsChanged(control.controls));
-    choiceResponseOptionsArray.onChanged((control) => onResponseOptionsChanged(control.controls));
-    _scaleResponseOptionsArray.onChanged((control) => onResponseOptionsChanged(control.controls));
-    imageResponseOptionsArray.onChanged((control) => onResponseOptionsChanged(control.controls));
-    audioResponseOptionsArray.onChanged((control) => onResponseOptionsChanged(control.controls));
-    freeTextResponseOptionsArray.onChanged((control) => onResponseOptionsChanged(control.controls));
+    boolResponseOptionsArray
+        .onChanged((control) => onResponseOptionsChanged(control.controls));
+    choiceResponseOptionsArray
+        .onChanged((control) => onResponseOptionsChanged(control.controls));
+    _scaleResponseOptionsArray
+        .onChanged((control) => onResponseOptionsChanged(control.controls));
+    imageResponseOptionsArray
+        .onChanged((control) => onResponseOptionsChanged(control.controls));
+    audioResponseOptionsArray
+        .onChanged((control) => onResponseOptionsChanged(control.controls));
+    freeTextResponseOptionsArray
+        .onChanged((control) => onResponseOptionsChanged(control.controls));
   }
 
   /// Customized titles (if any) depending on the context of use
@@ -42,8 +48,10 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
 
   // - Form fields (any question type)
 
-  final FormControl<QuestionID> questionIdControl = FormControl(value: const Uuid().v4()); // hidden
-  late final FormControl<SurveyQuestionType> questionTypeControl = CustomFormControl(
+  final FormControl<QuestionID> questionIdControl =
+      FormControl(value: const Uuid().v4()); // hidden
+  late final FormControl<SurveyQuestionType> questionTypeControl =
+      CustomFormControl(
     value: defaultQuestionType,
     onValueChanged: onQuestionTypeChanged,
   );
@@ -52,11 +60,15 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
 
   QuestionID get questionId => questionIdControl.value!;
 
-  SurveyQuestionType get questionType => questionTypeControl.value ?? defaultQuestionType;
+  SurveyQuestionType get questionType =>
+      questionTypeControl.value ?? defaultQuestionType;
 
   List<FormControlOption<SurveyQuestionType>> get questionTypeControlOptions =>
       QuestionFormData.questionTypeFormDataFactories.keys
-          .map((questionType) => FormControlOption(questionType, questionType.string))
+          .map(
+            (questionType) =>
+                FormControlOption(questionType, questionType.string),
+          )
           .toList();
 
   late final Map<String, AbstractControl> questionBaseControls = {
@@ -69,14 +81,16 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
   // - Form fields (question type-specific)
 
   // Multiple Choice
-  final FormControl<bool> isMultipleChoiceControl = FormControl(validators: [Validators.required], value: false);
-  late final FormArray choiceResponseOptionsArray =
-      FormArray([for (int i = 0; i < customOptionsInitial; i++) FormControl(value: "")]);
+  final FormControl<bool> isMultipleChoiceControl =
+      FormControl(validators: [Validators.required], value: false);
+  late final FormArray<String> choiceResponseOptionsArray = FormArray(
+    [for (int i = 0; i < customOptionsInitial; i++) FormControl(value: "")],
+  );
   final int customOptionsMin = 2;
   final int customOptionsMax = 10;
   final int customOptionsInitial = 2;
 
-  FormArray get answerOptionsArray => {
+  FormArray<dynamic> get answerOptionsArray => {
         SurveyQuestionType.bool: boolResponseOptionsArray,
         SurveyQuestionType.choice: choiceResponseOptionsArray,
         SurveyQuestionType.scale: _scaleResponseOptionsArray,
@@ -85,13 +99,14 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
         SurveyQuestionType.freeText: freeTextResponseOptionsArray,
       }[questionType]!;
 
-  List<AbstractControl> get answerOptionsControls => answerOptionsArray.controls;
+  List<AbstractControl> get answerOptionsControls =>
+      answerOptionsArray.controls;
 
   List<String> get validAnswerOptions {
     final List<String> options = [];
-    for (final optionValue in (answerOptionsArray.value ?? [])) {
+    for (final optionValue in answerOptionsArray.value ?? []) {
       if (optionValue != null) {
-        options.add(optionValue);
+        options.add(optionValue as String);
       }
     }
     return options;
@@ -99,27 +114,37 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
 
   // Yes/no
   List<AbstractControl<String>> get boolOptions =>
-      BoolQuestionFormData.kResponseOptions.keys.map((e) => FormControl(value: e, disabled: true)).toList();
-  late final FormArray<String> boolResponseOptionsArray = FormArray(boolOptions);
+      BoolQuestionFormData.kResponseOptions.keys
+          .map((e) => FormControl(value: e, disabled: true))
+          .toList();
+  late final FormArray<String> boolResponseOptionsArray =
+      FormArray(boolOptions);
 
   // Image
   List<AbstractControl<String>> get imageOptions =>
-      BoolQuestionFormData.kResponseOptions.keys.map((e) => FormControl(value: e, disabled: true)).toList();
-  late final FormArray<String> imageResponseOptionsArray = FormArray(imageOptions);
+      BoolQuestionFormData.kResponseOptions.keys
+          .map((e) => FormControl(value: e, disabled: true))
+          .toList();
+  late final FormArray<String> imageResponseOptionsArray =
+      FormArray(imageOptions);
 
   // Audio
   static const int kDefaultMaxRecordingDurationSeconds = 60;
   static const int kMaxRecordingDurationSeconds = 3600;
   List<AbstractControl<String>> get audioOptions =>
-      AudioQuestionFormData.kResponseOptions.keys.map((e) => FormControl(value: e, disabled: true)).toList();
-  late final FormArray<String> audioResponseOptionsArray = FormArray(audioOptions);
+      AudioQuestionFormData.kResponseOptions.keys
+          .map((e) => FormControl(value: e, disabled: true))
+          .toList();
+  late final FormArray<String> audioResponseOptionsArray =
+      FormArray(audioOptions);
   final FormControl<int> maxRecordingDurationSecondsControl = FormControl(
-      value: kDefaultMaxRecordingDurationSeconds,
-      validators: [
-        Validators.number(allowNegatives: false),
-        Validators.min(1),
-        Validators.max(kMaxRecordingDurationSeconds)
-      ]);
+    value: kDefaultMaxRecordingDurationSeconds,
+    validators: [
+      Validators.number(allowNegatives: false),
+      Validators.min(1),
+      Validators.max(kMaxRecordingDurationSeconds),
+    ],
+  );
 
   // Scale
   static const int kDefaultScaleMinValue = 0;
@@ -137,12 +162,14 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
     onValueChanged: (_) => _onScaleRangeChanged(),
     onValueChangedDebounceTime: kMidValueDebounceMilliseconds,
   );
-  late final FormControl<int> _scaleRangeControl = FormControl(value: scaleRange); // hidden
+  late final FormControl<int> _scaleRangeControl =
+      FormControl(value: scaleRange); // hidden
   final FormControl<String> scaleMinLabelControl = FormControl();
   final FormControl<String> scaleMaxLabelControl = FormControl();
   final FormArray<int> scaleMidValueControls = FormArray([]);
   final FormArray<String?> scaleMidLabelControls = FormArray([]);
-  late final FormArray<int> _scaleResponseOptionsArray = FormArray([...scaleAllValueControls]);
+  late final FormArray<int> _scaleResponseOptionsArray =
+      FormArray([...scaleAllValueControls]);
 
   final FormControl<SerializableColor> scaleMinColorControl = FormControl();
   final FormControl<SerializableColor> scaleMaxColorControl = FormControl();
@@ -157,7 +184,7 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
 
   List<AbstractControl<int>> get scaleAllValueControls => [
         scaleMinValueControl,
-        ...(scaleMidValueControls.controls),
+        ...scaleMidValueControls.controls,
         scaleMaxValueControl,
       ];
 
@@ -169,7 +196,7 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
     return scaleMidLabelControls.value?[idx];
   }
 
-  _onScaleRangeChanged() {
+  void _onScaleRangeChanged() {
     if (formMode == FormMode.readonly) {
       return; // prevent change listener from firing in readonly mode
     }
@@ -180,18 +207,20 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
     _scaleResponseOptionsArray.addAll(scaleAllValueControls);
   }
 
-  _applyInputFormatters() {
+  void _applyInputFormatters() {
     // TODO refactor to FormControl extension or text field input formatters
     scaleMinValueControl.value ??= 0;
     scaleMaxValueControl.value ??= 0;
   }
 
-  _updateScaleMidValueControls() {
-    final int midValueStepSize = max((scaleMaxValue / kNumMidValueControls).ceil(), 1);
+  void _updateScaleMidValueControls() {
+    final int midValueStepSize =
+        max((scaleMaxValue / kNumMidValueControls).ceil(), 1);
     final List<int> midValues = [];
     final List<String> midLabels = [];
 
-    for (int midValue = scaleMinValue + kDefaultScaleMinValue + midValueStepSize;
+    for (int midValue =
+            scaleMinValue + kDefaultScaleMinValue + midValueStepSize;
         midValue < scaleMaxValue;
         midValue += midValueStepSize) {
       final prevLabel = scaleMidLabelAt(midValue);
@@ -218,17 +247,24 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
       FormControl<FreeTextQuestionType>(value: FreeTextQuestionType.any);
 
   final FormControl<String> customRegexControl = FormControl<String>();
-  late final FormArray freeTextResponseOptionsArray =
-      FormArray([freeTextLengthMin, freeTextLengthMax, freeTextTypeControl, customRegexControl]);
-  late final AbstractControl<int> freeTextLengthMin = FormControl(value: freeTextLengthControl.value!.start.toInt());
-  late final AbstractControl<int> freeTextLengthMax = FormControl(value: freeTextLengthControl.value!.end.toInt());
-  late final FormControl<String> freeTextExampleTextControl = FormControl<String>(
+  late final FormArray freeTextResponseOptionsArray = FormArray([
+    freeTextLengthMin,
+    freeTextLengthMax,
+    freeTextTypeControl,
+    customRegexControl,
+  ]);
+  late final AbstractControl<int> freeTextLengthMin =
+      FormControl(value: freeTextLengthControl.value!.start.toInt());
+  late final AbstractControl<int> freeTextLengthMax =
+      FormControl(value: freeTextLengthControl.value!.end.toInt());
+  late final FormControl<String> freeTextExampleTextControl =
+      FormControl<String>(
     value: '',
     validators: [Validators.delegate(_validateFreeText)],
   );
 
   Map<String, dynamic>? _validateFreeText(AbstractControl<dynamic> control) {
-    List<Validator> validators = [];
+    final List<Validator> validators = [];
     validators.add(Validators.minLength(freeTextLengthMin.value!));
     validators.add(Validators.maxLength(freeTextLengthMax.value!));
     switch (freeTextTypeControl.value) {
@@ -236,15 +272,12 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
         break;
       case FreeTextQuestionType.alphanumeric:
         validators.add(Validators.pattern(alphanumericPattern));
-        break;
       case FreeTextQuestionType.numeric:
         validators.add(Validators.number(allowNegatives: false));
-        break;
       case FreeTextQuestionType.custom:
         if (customRegexControl.value != null) {
-          validators.add(Validators.pattern(r'^' + customRegexControl.value! + r'$'));
+          validators.add(Validators.pattern('^${customRegexControl.value!}\$'));
         }
-        break;
       case null:
         return {'null': "freeTextTypeControl.value is null"};
     }
@@ -255,12 +288,16 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
   static const int kDefaultFreeTextMinLength = 0;
   static const int kDefaultFreeTextMaxLength = 120;
 
-  late final FormControl<RangeValues> freeTextLengthControl = CustomFormControl<RangeValues>(
-    value: RangeValues(kDefaultFreeTextMinLength.toDouble(), kDefaultFreeTextMaxLength.toDouble() / 2),
+  late final FormControl<RangeValues> freeTextLengthControl =
+      CustomFormControl<RangeValues>(
+    value: RangeValues(
+      kDefaultFreeTextMinLength.toDouble(),
+      kDefaultFreeTextMaxLength.toDouble() / 2,
+    ),
     onValueChanged: (_) => _onFreeTextLengthChanged(),
   );
 
-  _onFreeTextLengthChanged() {
+  void _onFreeTextLengthChanged() {
     if (formMode == FormMode.readonly) {
       return; // prevent change listener from firing in readonly mode
     }
@@ -306,7 +343,8 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
     StudyFormValidationSet.publish: [questionTextRequired],
   };
 
-  late final Map<SurveyQuestionType, FormValidationConfigSet> _validationConfigsByQuestionType = {
+  late final Map<SurveyQuestionType, FormValidationConfigSet>
+      _validationConfigsByQuestionType = {
     SurveyQuestionType.choice: {
       StudyFormValidationSet.draft: [numValidChoiceOptions],
       StudyFormValidationSet.publish: [numValidChoiceOptions],
@@ -323,58 +361,89 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
 
   @override
   FormValidationConfigSet get sharedValidationConfig => {
-        StudyFormValidationSet.draft: _getValidationConfig(StudyFormValidationSet.draft),
-        StudyFormValidationSet.publish: _getValidationConfig(StudyFormValidationSet.publish),
-        StudyFormValidationSet.test: _getValidationConfig(StudyFormValidationSet.test),
+        StudyFormValidationSet.draft:
+            _getValidationConfig(StudyFormValidationSet.draft),
+        StudyFormValidationSet.publish:
+            _getValidationConfig(StudyFormValidationSet.publish),
+        StudyFormValidationSet.test:
+            _getValidationConfig(StudyFormValidationSet.test),
       };
 
-  List<FormControlValidation> _getValidationConfig(StudyFormValidationSet validationSet) {
+  List<FormControlValidation> _getValidationConfig(
+    StudyFormValidationSet validationSet,
+  ) {
     return [
-      ...(_sharedValidationConfig[validationSet] ?? []),
-      ...(_validationConfigsByQuestionType[questionType]?[validationSet] ?? [])
+      ..._sharedValidationConfig[validationSet] ?? [],
+      ..._validationConfigsByQuestionType[questionType]?[validationSet] ?? [],
     ];
   }
 
-  get questionTextRequired => FormControlValidation(control: questionTextControl, validators: [
-        Validators.required,
-        Validators.minLength(1)
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_question_required,
-        ValidationMessage.minLength: (error) => tr.form_field_question_required,
-      });
-
-  get numValidChoiceOptions => FormControlValidation(control: choiceResponseOptionsArray, validators: [
-        CountWhereValidator<dynamic>((value) => value != null && value.isNotEmpty,
-            minCount: customOptionsMin, maxCount: customOptionsMax)
-      ], validationMessages: {
-        CountWhereValidator.kValidationMessageMaxCount: (error) =>
-            tr.form_array_response_options_choice_countmax(customOptionsMax),
-        CountWhereValidator.kValidationMessageMinCount: (error) =>
-            tr.form_array_response_options_choice_countmin(customOptionsMin),
-      });
-
-  get scaleRangeValid {
+  FormControlValidation get questionTextRequired => FormControlValidation(
+        control: questionTextControl,
+        validators: [
+          Validators.required,
+          Validators.minLength(1),
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_question_required,
+          ValidationMessage.minLength: (error) =>
+              tr.form_field_question_required,
+        },
+      );
+
+  FormControlValidation get numValidChoiceOptions => FormControlValidation(
+        control: choiceResponseOptionsArray,
+        validators: [
+          CountWhereValidator<dynamic>(
+            (dynamic value) => value != null,
+            minCount: customOptionsMin,
+            maxCount: customOptionsMax,
+          ),
+        ],
+        validationMessages: {
+          CountWhereValidator.kValidationMessageMaxCount: (error) =>
+              tr.form_array_response_options_choice_countmax(customOptionsMax),
+          CountWhereValidator.kValidationMessageMinCount: (error) =>
+              tr.form_array_response_options_choice_countmin(customOptionsMin),
+        },
+      );
+
+  FormControlValidation get scaleRangeValid {
     const int scaleRangeValidMax = 1000;
-    return FormControlValidation(control: _scaleRangeControl, validators: [
-      Validators.min(1),
-      Validators.max(scaleRangeValidMax),
-    ], validationMessages: {
-      'min': (error) => tr.form_array_response_options_scale_rangevalid_min,
-      'max': (error) => tr.form_array_response_options_scale_rangevalid_max(scaleRangeValidMax),
-    });
+    return FormControlValidation(
+      control: _scaleRangeControl,
+      validators: [
+        Validators.min(1),
+        Validators.max(scaleRangeValidMax),
+      ],
+      validationMessages: {
+        'min': (error) => tr.form_array_response_options_scale_rangevalid_min,
+        'max': (error) => tr.form_array_response_options_scale_rangevalid_max(
+              scaleRangeValidMax,
+            ),
+      },
+    );
   }
 
-  get maxRecordingDurationValid {
-    return FormControlValidation(control: maxRecordingDurationSecondsControl, validators: [
-      Validators.number(allowNegatives: false),
-      Validators.min(1),
-      Validators.max(kMaxRecordingDurationSeconds),
-    ], validationMessages: {
-      ValidationMessage.min: (error) => tr.audio_recording_max_duration_rangevalid_min,
-      ValidationMessage.max: (error) =>
-          tr.audio_recording_max_duration_rangevalid_max(QuestionFormViewModel.kMaxRecordingDurationSeconds),
-      ValidationMessage.number: (error) => tr.free_text_validation_number,
-    });
+  FormControlValidation get maxRecordingDurationValid {
+    return FormControlValidation(
+      control: maxRecordingDurationSecondsControl,
+      validators: [
+        Validators.number(allowNegatives: false),
+        Validators.min(1),
+        Validators.max(kMaxRecordingDurationSeconds),
+      ],
+      validationMessages: {
+        ValidationMessage.min: (error) =>
+            tr.audio_recording_max_duration_rangevalid_min,
+        ValidationMessage.max: (error) =>
+            tr.audio_recording_max_duration_rangevalid_max(
+              QuestionFormViewModel.kMaxRecordingDurationSeconds,
+            ),
+        ValidationMessage.number: (error) => tr.free_text_validation_number,
+      },
+    );
   }
 
   /// The form containing the controls for the currently selected
@@ -389,11 +458,11 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
     ..._controlsByQuestionType[questionType]!.controls,
   });
 
-  onQuestionTypeChanged(SurveyQuestionType? questionType) {
+  void onQuestionTypeChanged(SurveyQuestionType? questionType) {
     _updateFormControls(questionType);
   }
 
-  onResponseOptionsChanged(List<AbstractControl> responseOptionControls) {
+  void onResponseOptionsChanged(List<AbstractControl> responseOptionControls) {
     return; // subclass responsibility
   }
 
@@ -430,40 +499,42 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
       case SurveyQuestionType.image:
         break;
       case SurveyQuestionType.audio:
-        data = data as AudioQuestionFormData;
-        maxRecordingDurationSecondsControl.value = data.maxRecordingDurationSeconds;
-        break;
+        maxRecordingDurationSecondsControl.value =
+            (data as AudioQuestionFormData).maxRecordingDurationSeconds;
       case SurveyQuestionType.choice:
-        data = data as ChoiceQuestionFormData;
-        isMultipleChoiceControl.value = data.isMultipleChoice;
+        isMultipleChoiceControl.value =
+            (data as ChoiceQuestionFormData).isMultipleChoice;
         // Unfortunately needed because of how [FormArray.updateValue] is implemented
         // Note: `formArray.value = []` does not remove any controls!
         answerOptionsArray.clear();
         answerOptionsArray.value = data.answerOptions;
-        break;
       case SurveyQuestionType.scale:
-        data = data as ScaleQuestionFormData;
-        scaleMinValueControl.value = data.minValue.toInt();
+        scaleMinValueControl.value =
+            (data as ScaleQuestionFormData).minValue.toInt();
         scaleMaxValueControl.value = data.maxValue.toInt();
         scaleMinLabelControl.value = data.minLabel;
         scaleMaxLabelControl.value = data.maxLabel;
         scaleMidValueControls.clear();
-        scaleMidValueControls.value = data.midValues.map((v) => v?.toInt()).toList();
+        scaleMidValueControls.value =
+            data.midValues.map((v) => v?.toInt()).toList();
         scaleMidLabelControls.clear();
         scaleMidLabelControls.value = data.midLabels;
-        scaleMinColorControl.value = data.minColor != null ? SerializableColor(data.minColor!.value) : null;
-        scaleMaxColorControl.value = data.maxColor != null ? SerializableColor(data.maxColor!.value) : null;
+        scaleMinColorControl.value = data.minColor != null
+            ? SerializableColor(data.minColor!.value)
+            : null;
+        scaleMaxColorControl.value = data.maxColor != null
+            ? SerializableColor(data.maxColor!.value)
+            : null;
         _updateScaleMidValueControls();
-        // TODO scaleInitialValueControl
-        // TODO scaleStepSizeControl
-        break;
+      // TODO scaleInitialValueControl
+      // TODO scaleStepSizeControl
       case SurveyQuestionType.freeText:
-        data = data as FreeTextQuestionFormData;
-        freeTextLengthControl.value =
-            RangeValues(data.textLengthRange.first.toDouble(), data.textLengthRange.last.toDouble());
+        freeTextLengthControl.value = RangeValues(
+          (data as FreeTextQuestionFormData).textLengthRange.first.toDouble(),
+          data.textLengthRange.last.toDouble(),
+        );
         freeTextTypeControl.value = data.textType;
         customRegexControl.value = data.textTypeExpression;
-        break;
     }
   }
 
@@ -490,7 +561,8 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
           questionText: questionTextControl.value!, // required
           questionType: questionTypeControl.value!, // required
           questionInfoText: questionInfoTextControl.value,
-          maxRecordingDurationSeconds: maxRecordingDurationSecondsControl.value!,
+          maxRecordingDurationSeconds:
+              maxRecordingDurationSecondsControl.value!,
         );
       case SurveyQuestionType.choice:
         return ChoiceQuestionFormData(
@@ -518,7 +590,9 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
           // non-empty formatter
           minLabel: scaleMinLabelControl.value,
           maxLabel: scaleMaxLabelControl.value,
-          midValues: scaleMidValueControls.value?.map((v) => v?.toDouble()).toList() ?? [],
+          midValues:
+              scaleMidValueControls.value?.map((v) => v?.toDouble()).toList() ??
+                  [],
           midLabels: scaleMidLabelControls.value ?? [],
           minColor: scaleMinColorControl.value,
           maxColor: scaleMaxColorControl.value,
@@ -533,7 +607,7 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
           questionInfoText: questionInfoTextControl.value,
           textLengthRange: [
             freeTextLengthControl.value!.start.toInt(),
-            freeTextLengthControl.value!.end.toInt()
+            freeTextLengthControl.value!.end.toInt(),
           ], // required
           textType: freeTextTypeControl.value!,
           textTypeExpression: customRegexControl.value,
@@ -543,9 +617,11 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
 
   @override
   Map<FormMode, String> get titles => {
-        FormMode.create: _titles?[FormMode.create]?.call() ?? tr.form_question_create,
+        FormMode.create:
+            _titles?[FormMode.create]?.call() ?? tr.form_question_create,
         FormMode.edit: _titles?[FormMode.edit]?.call() ?? tr.form_question_edit,
-        FormMode.readonly: _titles?[FormMode.readonly]?.call() ?? tr.form_question_readonly,
+        FormMode.readonly:
+            _titles?[FormMode.readonly]?.call() ?? tr.form_question_readonly,
       };
 
   @override
@@ -597,9 +673,11 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
   }
 
   bool get isAddOptionButtonVisible =>
-      choiceResponseOptionsArray.value != null && choiceResponseOptionsArray.value!.length < customOptionsMax;
+      choiceResponseOptionsArray.value != null &&
+      choiceResponseOptionsArray.value!.length < customOptionsMax;
 
   // - IScaleQuestionFormViewModel
 
-  bool get isMidValuesClearedInfoVisible => prevMidValues != scaleMidValueControls.value;
+  bool get isMidValuesClearedInfoVisible =>
+      prevMidValues != scaleMidValueControls.value;
 }
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/question_form_data.dart b/designer_v2/lib/features/design/shared/questionnaire/question/question_form_data.dart
index 605f5cbfb..3c0456078 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/question_form_data.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/question_form_data.dart
@@ -8,39 +8,63 @@ import 'package:studyu_designer_v2/utils/extensions.dart';
 import 'package:uuid/uuid.dart';
 
 typedef SurveyQuestionFormDataFactory = QuestionFormData Function(
-    Question question, List<EligibilityCriterion> eligibilityCriteria);
+  Question question,
+  List<EligibilityCriterion> eligibilityCriteria,
+);
 
 abstract class QuestionFormData implements IFormData {
-  static Map<SurveyQuestionType, SurveyQuestionFormDataFactory> questionTypeFormDataFactories = {
+  static Map<SurveyQuestionType, SurveyQuestionFormDataFactory>
+      questionTypeFormDataFactories = {
     SurveyQuestionType.scale: (question, eligibilityCriteria) {
       switch (question) {
         // First check for general scale which implements the other interfaces
-        case ScaleQuestion scaleQuestion:
-          return ScaleQuestionFormData.fromDomainModel(scaleQuestion, eligibilityCriteria);
+        case final ScaleQuestion scaleQuestion:
+          return ScaleQuestionFormData.fromDomainModel(
+            scaleQuestion,
+            eligibilityCriteria,
+          );
         // Remain backward compatible with specialized scale types
-        case AnnotatedScaleQuestion annotatedScaleQuestion:
+        case final AnnotatedScaleQuestion annotatedScaleQuestion:
           return ScaleQuestionFormData.fromDomainModel(
             ScaleQuestion.fromAnnotatedScaleQuestion(annotatedScaleQuestion),
             eligibilityCriteria,
           );
-        case VisualAnalogueQuestion visualAnalogueQuestion:
+        case final VisualAnalogueQuestion visualAnalogueQuestion:
           return ScaleQuestionFormData.fromDomainModel(
             ScaleQuestion.fromVisualAnalogueQuestion(visualAnalogueQuestion),
             eligibilityCriteria,
           );
       }
-      return ScaleQuestionFormData.fromDomainModel(question as ScaleQuestion, eligibilityCriteria);
+      return ScaleQuestionFormData.fromDomainModel(
+        question as ScaleQuestion,
+        eligibilityCriteria,
+      );
     },
     SurveyQuestionType.bool: (question, eligibilityCriteria) =>
-        BoolQuestionFormData.fromDomainModel(question as BooleanQuestion, eligibilityCriteria),
+        BoolQuestionFormData.fromDomainModel(
+          question as BooleanQuestion,
+          eligibilityCriteria,
+        ),
     SurveyQuestionType.choice: (question, eligibilityCriteria) =>
-        ChoiceQuestionFormData.fromDomainModel(question as ChoiceQuestion, eligibilityCriteria),
+        ChoiceQuestionFormData.fromDomainModel(
+          question as ChoiceQuestion,
+          eligibilityCriteria,
+        ),
     SurveyQuestionType.image: (question, eligibilityCriteria) =>
-        ImageQuestionFormData.fromDomainModel(question as ImageCapturingQuestion, eligibilityCriteria),
+        ImageQuestionFormData.fromDomainModel(
+          question as ImageCapturingQuestion,
+          eligibilityCriteria,
+        ),
     SurveyQuestionType.audio: (question, eligibilityCriteria) =>
-        AudioQuestionFormData.fromDomainModel(question as AudioRecordingQuestion, eligibilityCriteria),
+        AudioQuestionFormData.fromDomainModel(
+          question as AudioRecordingQuestion,
+          eligibilityCriteria,
+        ),
     SurveyQuestionType.freeText: (question, eligibilityCriteria) =>
-        FreeTextQuestionFormData.fromDomainModel(question as FreeTextQuestion, eligibilityCriteria),
+        FreeTextQuestionFormData.fromDomainModel(
+          question as FreeTextQuestion,
+          eligibilityCriteria,
+        ),
   };
 
   QuestionFormData({
@@ -72,7 +96,10 @@ abstract class QuestionFormData implements IFormData {
       throw Exception("Failed to create SurveyQuestionFormData for unknown "
           "SurveyQuestionType: $surveyQuestionType");
     }
-    return questionTypeFormDataFactories[surveyQuestionType]!(question, eligibilityCriteria);
+    return questionTypeFormDataFactories[surveyQuestionType]!(
+      question,
+      eligibilityCriteria,
+    );
   }
 
   Question toQuestion(); // subclass responsibility
@@ -105,7 +132,9 @@ abstract class QuestionFormData implements IFormData {
   /// Determines the [responseOptionsValidity] in terms of qualify/disqualify
   /// by evaluating the given criteria for each response option on a new
   /// [QuestionnaireState] where the option is selected
-  setResponseOptionsValidityFrom(List<EligibilityCriterion> eligibilityCriteria) {
+  void setResponseOptionsValidityFrom(
+    List<EligibilityCriterion> eligibilityCriteria,
+  ) {
     final Map<dynamic, bool> result = {};
 
     for (final responseOption in responseOptions) {
@@ -117,7 +146,8 @@ abstract class QuestionFormData implements IFormData {
       // (as of now) if no criterion evaluates to true
       bool responseOptionValidity = false;
       for (final criterion in eligibilityCriteria) {
-        responseOptionValidity = responseOptionValidity || (criterion.condition.evaluate(questionnaireState) ?? false);
+        responseOptionValidity = responseOptionValidity ||
+            (criterion.condition.evaluate(questionnaireState) ?? false);
       }
       result[responseOption] = responseOptionValidity;
     }
@@ -195,9 +225,9 @@ class ChoiceQuestionFormData extends QuestionFormData {
   }
 
   @override
-  Answer constructAnswerFor(responseOption) {
+  Answer constructAnswerFor(dynamic responseOption) {
     final question = toQuestion() as ChoiceQuestion;
-    final choice = _buildChoiceForValue(responseOption);
+    final choice = _buildChoiceForValue(responseOption as String);
     return question.constructAnswer([choice]);
   }
 }
@@ -254,9 +284,9 @@ class BoolQuestionFormData extends QuestionFormData {
   }
 
   @override
-  Answer constructAnswerFor(responseOption) {
+  Answer constructAnswerFor(dynamic responseOption) {
     final question = toQuestion() as BooleanQuestion;
-    final value = kResponseOptions[responseOption] as bool;
+    final value = kResponseOptions[responseOption]!;
     return question.constructAnswer(value);
   }
 }
@@ -311,9 +341,9 @@ class ImageQuestionFormData extends QuestionFormData {
   }
 
   @override
-  Answer constructAnswerFor(responseOption) {
+  Answer constructAnswerFor(dynamic responseOption) {
     final question = toQuestion() as ImageCapturingQuestion;
-    final value = kResponseOptions[responseOption] as FutureBlobFile;
+    final value = kResponseOptions[responseOption]!;
     return question.constructAnswer(value);
   }
 }
@@ -352,7 +382,9 @@ class AudioQuestionFormData extends QuestionFormData {
 
   @override
   Question toQuestion() {
-    final question = AudioRecordingQuestion(maxRecordingDurationSeconds: maxRecordingDurationSeconds);
+    final question = AudioRecordingQuestion(
+      maxRecordingDurationSeconds: maxRecordingDurationSeconds,
+    );
     question.id = questionId;
     question.prompt = questionText;
     question.rationale = questionInfoText;
@@ -373,9 +405,9 @@ class AudioQuestionFormData extends QuestionFormData {
   }
 
   @override
-  Answer constructAnswerFor(responseOption) {
+  Answer constructAnswerFor(dynamic responseOption) {
     final question = toQuestion() as AudioRecordingQuestion;
-    final value = kResponseOptions[responseOption] as FutureBlobFile;
+    final value = kResponseOptions[responseOption]!;
     return question.constructAnswer(value);
   }
 }
@@ -396,7 +428,10 @@ class ScaleQuestionFormData extends QuestionFormData {
     this.stepSize = 0,
     this.minColor,
     this.maxColor,
-  }) : assert(midValues.length == midLabels.length, "midValues.length and midLabels.length must be equal");
+  }) : assert(
+          midValues.length == midLabels.length,
+          "midValues.length and midLabels.length must be equal",
+        );
 
   final double minValue;
   final double maxValue;
@@ -466,10 +501,10 @@ class ScaleQuestionFormData extends QuestionFormData {
       ..midAnnotations = midAnnotations;
 
     if (minLabel != null) {
-      question.minLabel = minLabel!;
+      question.minLabel = minLabel;
     }
     if (maxLabel != null) {
-      question.maxLabel = maxLabel!;
+      question.maxLabel = maxLabel;
     }
     return question;
   }
@@ -498,7 +533,7 @@ class ScaleQuestionFormData extends QuestionFormData {
   }
 
   @override
-  Answer constructAnswerFor(responseOption) {
+  Answer constructAnswerFor(dynamic responseOption) {
     final question = toQuestion();
     return question.constructAnswer(responseOption as double);
   }
@@ -541,8 +576,11 @@ class FreeTextQuestionFormData extends QuestionFormData {
 
   @override
   Question toQuestion() {
-    final question =
-        FreeTextQuestion(textType: textType, lengthRange: textLengthRange, customTypeExpression: textTypeExpression);
+    final question = FreeTextQuestion(
+      textType: textType,
+      lengthRange: textLengthRange,
+      customTypeExpression: textTypeExpression,
+    );
     question.id = questionId;
     question.prompt = questionText;
     question.rationale = questionInfoText;
@@ -565,7 +603,7 @@ class FreeTextQuestionFormData extends QuestionFormData {
   }
 
   @override
-  Answer constructAnswerFor(responseOption) {
+  Answer constructAnswerFor(dynamic responseOption) {
     final question = toQuestion() as FreeTextQuestion;
     final value = responseOption as String;
     return question.constructAnswer(value);
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/question_form_view.dart b/designer_v2/lib/features/design/shared/questionnaire/question/question_form_view.dart
index bba5d87e2..02f323c2d 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/question_form_view.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/question_form_view.dart
@@ -7,13 +7,13 @@ import 'package:studyu_designer_v2/common_views/styling_information.dart';
 import 'package:studyu_designer_v2/common_views/text_hyperlink.dart';
 import 'package:studyu_designer_v2/common_views/text_paragraph.dart';
 import 'package:studyu_designer_v2/features/design/shared/questionnaire/question/question_form_controller.dart';
+import 'package:studyu_designer_v2/features/design/shared/questionnaire/question/types/audio_recording_question_form_view.dart';
 import 'package:studyu_designer_v2/features/design/shared/questionnaire/question/types/bool_question_form_view.dart';
 import 'package:studyu_designer_v2/features/design/shared/questionnaire/question/types/choice_question_form_view.dart';
-import 'package:studyu_designer_v2/features/design/shared/questionnaire/question/types/image_capturing_question_form_view.dart';
 import 'package:studyu_designer_v2/features/design/shared/questionnaire/question/types/free_text_question_form_view.dart';
+import 'package:studyu_designer_v2/features/design/shared/questionnaire/question/types/image_capturing_question_form_view.dart';
 import 'package:studyu_designer_v2/features/design/shared/questionnaire/question/types/question_type.dart';
 import 'package:studyu_designer_v2/features/design/shared/questionnaire/question/types/scale_question_form_view.dart';
-import 'package:studyu_designer_v2/features/design/shared/questionnaire/question/types/audio_recording_question_form_view.dart';
 import 'package:studyu_designer_v2/features/forms/form_validation.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/theme.dart';
@@ -21,39 +21,53 @@ import 'package:studyu_designer_v2/theme.dart';
 /// Wrapper that dispatches to the appropriate widget for the corresponding
 /// [SurveyQuestionType] as given by [formViewModel.questionType]
 class SurveyQuestionFormView extends ConsumerStatefulWidget {
-  const SurveyQuestionFormView({required this.formViewModel, this.isHtmlStyleable = true, super.key});
+  const SurveyQuestionFormView({
+    required this.formViewModel,
+    this.isHtmlStyleable = true,
+    super.key,
+  });
 
   final QuestionFormViewModel formViewModel;
   final bool isHtmlStyleable;
 
   @override
-  ConsumerState<SurveyQuestionFormView> createState() => _SurveyQuestionFormViewState();
+  ConsumerState<SurveyQuestionFormView> createState() =>
+      _SurveyQuestionFormViewState();
 }
 
-class _SurveyQuestionFormViewState extends ConsumerState<SurveyQuestionFormView> {
+class _SurveyQuestionFormViewState
+    extends ConsumerState<SurveyQuestionFormView> {
   QuestionFormViewModel get formViewModel => widget.formViewModel;
 
-  late bool isQuestionHelpTextFieldVisible = formViewModel.questionInfoTextControl.value?.isNotEmpty ?? false;
+  late bool isQuestionHelpTextFieldVisible =
+      formViewModel.questionInfoTextControl.value?.isNotEmpty ?? false;
   bool isStylingInformationDismissed = true;
 
-  onDismissedCallback() => setState(() {
+  void onDismissedCallback() => setState(() {
         isStylingInformationDismissed = !isStylingInformationDismissed;
       });
 
   WidgetBuilder get questionTypeBodyBuilder {
     final Map<SurveyQuestionType, WidgetBuilder> questionTypeWidgets = {
-      SurveyQuestionType.choice: (_) => ChoiceQuestionFormView(formViewModel: formViewModel),
-      SurveyQuestionType.bool: (_) => BoolQuestionFormView(formViewModel: formViewModel),
-      SurveyQuestionType.scale: (_) => ScaleQuestionFormView(formViewModel: formViewModel),
-      SurveyQuestionType.image: (_) => ImageCapturingQuestionFormView(formViewModel: formViewModel),
-      SurveyQuestionType.audio: (_) => AudioRecordingQuestionFormView(formViewModel: formViewModel),
-      SurveyQuestionType.freeText: (_) => FreeTextQuestionFormView(formViewModel: formViewModel),
+      SurveyQuestionType.choice: (_) =>
+          ChoiceQuestionFormView(formViewModel: formViewModel),
+      SurveyQuestionType.bool: (_) =>
+          BoolQuestionFormView(formViewModel: formViewModel),
+      SurveyQuestionType.scale: (_) =>
+          ScaleQuestionFormView(formViewModel: formViewModel),
+      SurveyQuestionType.image: (_) =>
+          ImageCapturingQuestionFormView(formViewModel: formViewModel),
+      SurveyQuestionType.audio: (_) =>
+          AudioRecordingQuestionFormView(formViewModel: formViewModel),
+      SurveyQuestionType.freeText: (_) =>
+          FreeTextQuestionFormView(formViewModel: formViewModel),
     };
     final questionType = formViewModel.questionType;
 
     if (!questionTypeWidgets.containsKey(questionType)) {
-      throw Exception("Failed to build widget for SurveyQuestionType $questionType because"
-          "there is no registered WidgetBuilder");
+      throw Exception(
+        "Failed to build widget for SurveyQuestionType $questionType because there is no registered WidgetBuilder",
+      );
     }
     final builder = questionTypeWidgets[questionType]!;
     return builder;
@@ -61,40 +75,44 @@ class _SurveyQuestionFormViewState extends ConsumerState<SurveyQuestionFormView>
 
   @override
   Widget build(BuildContext context) {
-    return ReactiveFormConsumer(builder: (context, formGroup, child) {
-      // Wrap everything in a [ReactiveFormConsumer] for convenience so that the
-      // sidesheet content is re-rendered when the form changes
-      //
-      // Note: if this becomes a performance issue, remove the
-      // ReactiveFormConsumer here & use consumers / listeners selectively for
-      // the UI parts that need to be rebuild
-      return PointerInterceptor(
+    return ReactiveFormConsumer(
+      builder: (context, formGroup, child) {
+        // Wrap everything in a [ReactiveFormConsumer] for convenience so that the
+        // sidesheet content is re-rendered when the form changes
+        //
+        // Note: if this becomes a performance issue, remove the
+        // ReactiveFormConsumer here & use consumers / listeners selectively for
+        // the UI parts that need to be rebuild
+        return PointerInterceptor(
           child: Column(
-        children: [
-          _buildQuestionText(context),
-          (isQuestionHelpTextFieldVisible)
-              ? Column(
+            children: [
+              _buildQuestionText(context),
+              if (isQuestionHelpTextFieldVisible)
+                Column(
                   children: [
                     const SizedBox(height: 16.0),
                     _buildQuestionHelpText(context),
                   ],
                 )
-              : const SizedBox.shrink(),
-          if (widget.isHtmlStyleable)
-            HtmlStylingBanner(
-              isDismissed: isStylingInformationDismissed,
-              onDismissed: onDismissedCallback,
-            ),
-          const SizedBox(height: 24.0),
-          _buildResponseTypeHeader(context),
-          const SizedBox(height: 16.0),
-          questionTypeBodyBuilder(context),
-        ],
-      ));
-    });
+              else
+                const SizedBox.shrink(),
+              if (widget.isHtmlStyleable)
+                HtmlStylingBanner(
+                  isDismissed: isStylingInformationDismissed,
+                  onDismissed: onDismissedCallback,
+                ),
+              const SizedBox(height: 24.0),
+              _buildResponseTypeHeader(context),
+              const SizedBox(height: 16.0),
+              questionTypeBodyBuilder(context),
+            ],
+          ),
+        );
+      },
+    );
   }
 
-  _buildResponseTypeHeader(BuildContext context) {
+  Column _buildResponseTypeHeader(BuildContext context) {
     final theme = Theme.of(context);
     return Column(
       children: [
@@ -106,22 +124,32 @@ class _SurveyQuestionFormViewState extends ConsumerState<SurveyQuestionFormView>
               labelStyle: const TextStyle(fontWeight: FontWeight.bold),
               // TODO: extract custom dropdown component with theme + focus fix
               input: Theme(
-                data: theme.copyWith(inputDecorationTheme: ThemeConfig.dropdownInputDecorationTheme(theme)),
+                data: theme.copyWith(
+                  inputDecorationTheme:
+                      ThemeConfig.dropdownInputDecorationTheme(theme),
+                ),
                 child: ReactiveDropdownField<SurveyQuestionType>(
                   formControl: formViewModel.questionTypeControl,
                   items: formViewModel.questionTypeControlOptions.map((option) {
-                    final menuItemTheme = ThemeConfig.dropdownMenuItemTheme(theme);
-                    final iconTheme = menuItemTheme.iconTheme ?? theme.iconTheme;
+                    final menuItemTheme =
+                        ThemeConfig.dropdownMenuItemTheme(theme);
+                    final iconTheme =
+                        menuItemTheme.iconTheme ?? theme.iconTheme;
                     return DropdownMenuItem(
                       value: option.value,
                       child: Row(
                         children: [
-                          (option.value.icon != null)
-                              ? Icon(option.value.icon,
-                                  size: iconTheme.size, color: iconTheme.color, shadows: iconTheme.shadows)
-                              : const SizedBox.shrink(),
+                          if (option.value.icon != null)
+                            Icon(
+                              option.value.icon,
+                              size: iconTheme.size,
+                              color: iconTheme.color,
+                              shadows: iconTheme.shadows,
+                            )
+                          else
+                            const SizedBox.shrink(),
                           const SizedBox(width: 16.0),
-                          Text(option.label)
+                          Text(option.label),
                         ],
                       ),
                     );
@@ -135,12 +163,12 @@ class _SurveyQuestionFormViewState extends ConsumerState<SurveyQuestionFormView>
         TextParagraph(
           text: tr.form_field_question_response_options_description,
           style: ThemeConfig.bodyTextMuted(theme),
-        )
+        ),
       ],
     );
   }
 
-  _buildQuestionText(BuildContext context) {
+  FormTableLayout _buildQuestionText(BuildContext context) {
     return FormTableLayout(
       rowLayout: FormTableRowLayout.vertical,
       rows: [
@@ -149,42 +177,46 @@ class _SurveyQuestionFormViewState extends ConsumerState<SurveyQuestionFormView>
           labelBuilder: (context) => Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              Row(mainAxisAlignment: MainAxisAlignment.start, children: [
-                FormLabel(
-                  labelText: tr.form_field_question,
-                  helpText: tr.form_field_question_tooltip,
-                ),
-                if (widget.isHtmlStyleable) const SizedBox(width: 8),
-                if (widget.isHtmlStyleable)
-                  Opacity(
-                    opacity: ThemeConfig.kMuteFadeFactor,
-                    child: Tooltip(
-                      message: "Use html to style your content",
-                      child: Hyperlink(
-                        text: "styleable",
-                        onClick: () => setState(() {
-                          isStylingInformationDismissed = !isStylingInformationDismissed;
-                        }),
-                        visitedColor: null,
-                      ),
-                    ),
+              Row(
+                children: [
+                  FormLabel(
+                    labelText: tr.form_field_question,
+                    helpText: tr.form_field_question_tooltip,
                   ),
-              ]),
-              (!isQuestionHelpTextFieldVisible && !formViewModel.isReadonly)
-                  ? Opacity(
+                  if (widget.isHtmlStyleable) const SizedBox(width: 8),
+                  if (widget.isHtmlStyleable)
+                    Opacity(
                       opacity: ThemeConfig.kMuteFadeFactor,
                       child: Tooltip(
-                        message: tr.form_field_question_help_text_add_tooltip,
+                        message: "Use html to style your content",
                         child: Hyperlink(
-                          text: "+ ${tr.form_field_question_help_text_add}",
+                          text: "styleable",
                           onClick: () => setState(() {
-                            isQuestionHelpTextFieldVisible = true;
+                            isStylingInformationDismissed =
+                                !isStylingInformationDismissed;
                           }),
                           visitedColor: null,
                         ),
                       ),
-                    )
-                  : const SizedBox.shrink(),
+                    ),
+                ],
+              ),
+              if (!isQuestionHelpTextFieldVisible && !formViewModel.isReadonly)
+                Opacity(
+                  opacity: ThemeConfig.kMuteFadeFactor,
+                  child: Tooltip(
+                    message: tr.form_field_question_help_text_add_tooltip,
+                    child: Hyperlink(
+                      text: "+ ${tr.form_field_question_help_text_add}",
+                      onClick: () => setState(() {
+                        isQuestionHelpTextFieldVisible = true;
+                      }),
+                      visitedColor: null,
+                    ),
+                  ),
+                )
+              else
+                const SizedBox.shrink(),
             ],
           ),
           input: ReactiveTextField(
@@ -192,7 +224,8 @@ class _SurveyQuestionFormViewState extends ConsumerState<SurveyQuestionFormView>
             decoration: InputDecoration(
               hintText: tr.form_field_question,
             ),
-            validationMessages: formViewModel.questionTextControl.validationMessages,
+            validationMessages:
+                formViewModel.questionTextControl.validationMessages,
             minLines: 3,
             maxLines: 3,
           ),
@@ -201,7 +234,7 @@ class _SurveyQuestionFormViewState extends ConsumerState<SurveyQuestionFormView>
     );
   }
 
-  _buildQuestionHelpText(BuildContext context) {
+  FormTableLayout _buildQuestionHelpText(BuildContext context) {
     return FormTableLayout(
       rowLayout: FormTableRowLayout.vertical,
       rows: [
@@ -209,32 +242,39 @@ class _SurveyQuestionFormViewState extends ConsumerState<SurveyQuestionFormView>
           control: formViewModel.questionInfoTextControl,
           label: tr.form_field_question_help_text,
           labelHelpText: tr.form_field_question_help_text_tooltip,
-          labelBuilder: (context) => Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
-            Row(mainAxisAlignment: MainAxisAlignment.start, children: [
-              FormLabel(
-                labelText: tr.form_field_question_help_text,
-                helpText: tr.form_field_question_help_text_tooltip,
-              ),
-              if (widget.isHtmlStyleable) const SizedBox(width: 8),
-              if (widget.isHtmlStyleable)
-                Opacity(
-                  opacity: ThemeConfig.kMuteFadeFactor,
-                  child: Tooltip(
-                    message: "Use html to style your content",
-                    child: Hyperlink(
-                      text: "styleable",
-                      onClick: () => setState(() {
-                        isStylingInformationDismissed = !isStylingInformationDismissed;
-                      }),
-                      visitedColor: null,
-                    ),
+          labelBuilder: (context) => Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Row(
+                children: [
+                  FormLabel(
+                    labelText: tr.form_field_question_help_text,
+                    helpText: tr.form_field_question_help_text_tooltip,
                   ),
-                ),
-            ])
-          ]),
+                  if (widget.isHtmlStyleable) const SizedBox(width: 8),
+                  if (widget.isHtmlStyleable)
+                    Opacity(
+                      opacity: ThemeConfig.kMuteFadeFactor,
+                      child: Tooltip(
+                        message: "Use html to style your content",
+                        child: Hyperlink(
+                          text: "styleable",
+                          onClick: () => setState(() {
+                            isStylingInformationDismissed =
+                                !isStylingInformationDismissed;
+                          }),
+                          visitedColor: null,
+                        ),
+                      ),
+                    ),
+                ],
+              ),
+            ],
+          ),
           input: ReactiveTextField(
             formControl: formViewModel.questionInfoTextControl,
-            validationMessages: formViewModel.questionInfoTextControl.validationMessages,
+            validationMessages:
+                formViewModel.questionInfoTextControl.validationMessages,
             minLines: 3,
             maxLines: 3,
             decoration: InputDecoration(
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/types/bool_question_form_view.dart b/designer_v2/lib/features/design/shared/questionnaire/question/types/bool_question_form_view.dart
index 6818e4e1a..c5d0c2035 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/types/bool_question_form_view.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/types/bool_question_form_view.dart
@@ -24,11 +24,12 @@ class BoolQuestionFormView extends ConsumerWidget {
                 columnWidth: const FixedColumnWidth(32.0),
               ),
               StandardTableColumn(
-                  label: '', // don't care (showTableHeader=false)
-                  columnWidth: const FlexColumnWidth()),
+                label: '', // don't care (showTableHeader=false)),
+              ),
             ],
             onSelectItem: (_) => {}, // no-op
-            buildCellsAt: (context, control, _, __) => buildChoiceOptionRow(context, control),
+            buildCellsAt: (context, control, _, __) =>
+                buildChoiceOptionRow(context, control),
             trailingActionsAt: (control, _) => [],
             cellSpacing: 0.0,
             rowSpacing: 8.0,
@@ -36,7 +37,6 @@ class BoolQuestionFormView extends ConsumerWidget {
             showTableHeader: false,
             rowStyle: StandardTableStyle.plain,
             disableRowInteractions: true,
-            trailingWidget: null,
             trailingWidgetSpacing: 0,
           ),
         ),
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/types/choice_question_form_view.dart b/designer_v2/lib/features/design/shared/questionnaire/question/types/choice_question_form_view.dart
index 0f1e4f41c..1b7713e57 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/types/choice_question_form_view.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/types/choice_question_form_view.dart
@@ -18,15 +18,17 @@ class ChoiceQuestionFormView extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     return Column(
       children: [
-        FormTableLayout(rows: [
-          FormTableRow(
-            label: tr.form_field_response_choice_multiple,
-            labelHelpText: tr.form_field_response_choice_multiple_tooltip,
-            input: ReactiveSwitch(
-              formControl: formViewModel.isMultipleChoiceControl,
+        FormTableLayout(
+          rows: [
+            FormTableRow(
+              label: tr.form_field_response_choice_multiple,
+              labelHelpText: tr.form_field_response_choice_multiple_tooltip,
+              input: ReactiveSwitch(
+                formControl: formViewModel.isMultipleChoiceControl,
+              ),
             ),
-          ),
-        ]),
+          ],
+        ),
         const SizedBox(height: 12.0),
         ReactiveFormArray(
           formArray: formViewModel.answerOptionsArray,
@@ -39,13 +41,15 @@ class ChoiceQuestionFormView extends ConsumerWidget {
                   columnWidth: const FixedColumnWidth(32.0),
                 ),
                 StandardTableColumn(
-                    label: '', // don't care (showTableHeader=false)
-                    columnWidth: const FlexColumnWidth()),
+                  label: '', // don't care (showTableHeader=false),),
+                ),
               ],
               onSelectItem: (_) => {},
               // no-op
-              buildCellsAt: (context, control, _, __) => buildChoiceOptionRow(context, control),
-              trailingActionsAt: (control, _) => formViewModel.availableActions(control),
+              buildCellsAt: (context, control, _, __) =>
+                  buildChoiceOptionRow(context, control),
+              trailingActionsAt: (control, _) =>
+                  formViewModel.availableActions(control),
               cellSpacing: 0.0,
               rowSpacing: 8.0,
               minRowHeight: null,
@@ -53,13 +57,15 @@ class ChoiceQuestionFormView extends ConsumerWidget {
               rowStyle: StandardTableStyle.plain,
               trailingActionsMenuType: ActionMenuType.inline,
               disableRowInteractions: true,
-              trailingWidget: (formViewModel.isAddOptionButtonVisible && !formViewModel.isReadonly)
+              trailingWidget: (formViewModel.isAddOptionButtonVisible &&
+                      !formViewModel.isReadonly)
                   ? Padding(
                       padding: const EdgeInsets.only(top: 8.0),
                       child: Opacity(
                         opacity: ThemeConfig.kMuteFadeFactor,
                         child: Hyperlink(
-                          text: "+ ${tr.form_array_response_options_choice_new}",
+                          text:
+                              "+ ${tr.form_array_response_options_choice_new}",
                           visitedColor: null,
                           onClick: formViewModel.onNewItem,
                         ),
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/types/free_text_question_form_view.dart b/designer_v2/lib/features/design/shared/questionnaire/question/types/free_text_question_form_view.dart
index 7ceedf966..06ccde7d3 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/types/free_text_question_form_view.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/types/free_text_question_form_view.dart
@@ -34,20 +34,20 @@ class FreeTextQuestionFormView extends ConsumerWidget {
             input: disableOnReadonly(
               child: SliderTheme(
                   data: Theme.of(context).sliderTheme.copyWith(
-                      rangeThumbShape: IndicatorRangeSliderThumbShape(context, minLength.toInt(), maxLength.toInt()),
-                      showValueIndicator: ShowValueIndicator.never),
+                      rangeThumbShape: IndicatorRangeSliderThumbShape(context, minLength, maxLength),
+                      showValueIndicator: ShowValueIndicator.never,),
                   child: ReactiveRangeSlider<RangeValues>(
                     formControl: formViewModel.freeTextLengthControl,
                     min: QuestionFormViewModel.kDefaultFreeTextMinLength.toDouble(),
                     max: QuestionFormViewModel.kDefaultFreeTextMaxLength.toDouble(),
-                    divisions: QuestionFormViewModel.kDefaultFreeTextMaxLength.toInt() -
-                        QuestionFormViewModel.kDefaultFreeTextMinLength.toInt(),
+                    divisions: QuestionFormViewModel.kDefaultFreeTextMaxLength -
+                        QuestionFormViewModel.kDefaultFreeTextMinLength,
                     labelBuilder: (values) => RangeLabels(
                       values.start.round().toString(),
                       values.end.round().toString(),
                     ),
-                  )),
-            )),
+                  ),),
+            ),),
         const SizedBox(height: 16.0),
         generateRow(
           label: tr.free_text_type_label,
@@ -87,7 +87,7 @@ class FreeTextQuestionFormView extends ConsumerWidget {
               TextParagraph(
                 text: tr.free_text_type_custom_explanation,
                 style: ThemeConfig.bodyTextMuted(theme),
-              )
+              ),
             ],
           ),
         const SizedBox(height: 16.0),
@@ -131,8 +131,8 @@ class FreeTextQuestionFormView extends ConsumerWidget {
                               ValidationMessage.maxLength: (error) => tr.free_text_validation_max_length(maxLength),
                               ValidationMessage.pattern: (error) => tr.free_text_validation_pattern,
                               ValidationMessage.number: (error) => tr.free_text_validation_number,
-                            });
-                      }),
+                            },);
+                      },),
                 ),
               ],
             ),
@@ -143,7 +143,7 @@ class FreeTextQuestionFormView extends ConsumerWidget {
               return TextParagraph(text: tr.free_text_example_explanation(type, minLength, maxLength));
             },
           ),
-        ]),
+        ],),
       ],
     );
   }
@@ -156,7 +156,7 @@ class FreeTextQuestionFormView extends ConsumerWidget {
     }
   }
 
-  get generateLabelHelpTextMap {
+  Map<FreeTextQuestionType, String> get generateLabelHelpTextMap {
     return {
       FreeTextQuestionType.any: tr.free_text_question_type_any_explanation,
       FreeTextQuestionType.alphanumeric: tr.free_text_question_type_alphanumeric_explanation,
@@ -180,6 +180,6 @@ class FreeTextQuestionFormView extends ConsumerWidget {
           ],
         ),
       ),
-    ]);
+    ],);
   }
 }
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/types/scale_question_form_view.dart b/designer_v2/lib/features/design/shared/questionnaire/question/types/scale_question_form_view.dart
index 526ce1abc..01b1c28ab 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/types/scale_question_form_view.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/types/scale_question_form_view.dart
@@ -49,7 +49,6 @@ class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
           labelControlLabel: tr.form_field_response_scale_min_label,
           labelControlHelpText: tr.form_field_response_scale_min_label_tooltip,
           valueControlLabel: tr.form_field_response_scale_min_value,
-          valueControlHelpText: null,
         ),
         const SizedBox(height: 16.0),
         Collapsible(
@@ -64,19 +63,16 @@ class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
           labelControlLabel: tr.form_field_response_scale_max_label,
           labelControlHelpText: tr.form_field_response_scale_max_label_tooltip,
           valueControlLabel: tr.form_field_response_scale_max_value,
-          valueControlHelpText: null,
         ),
         const SizedBox(height: 16.0),
         const SizedBox(height: 8.0),
-        isMinMaxColorsVisible
-            ? Column(
+        if (isMinMaxColorsVisible) Column(
                 children: [
                   _buildVisualizationHeader(context),
                   const SizedBox(height: 12.0),
                   _buildMinMaxColorPickers(context),
                 ],
-              )
-            : (!formViewModel.isReadonly)
+              ) else (!formViewModel.isReadonly)
                 ? Opacity(
                     opacity: ThemeConfig.kMuteFadeFactor,
                     child: Hyperlink(
@@ -104,7 +100,7 @@ class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
         TextParagraph(
           text: tr.navlink_question_visuals_description,
           style: ThemeConfig.bodyTextMuted(theme),
-        )
+        ),
       ],
     );
   }
@@ -154,16 +150,14 @@ class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
             helpText: tr.form_field_response_scale_color_tooltip,
           ),
           const SizedBox(width: 24.0),
-          (control.value == null && !formViewModel.isReadonly)
-              ? Opacity(
+          if (control.value == null && !formViewModel.isReadonly) Opacity(
                   opacity: ThemeConfig.kMuteFadeFactor,
                   child: Hyperlink(
                     text: "+ ${tr.form_field_response_scale_color_add}",
                     onClick: () => control.value = SerializableColor(ThemeConfig.colorPickerInitialColor(theme).value),
                     visitedColor: null,
                   ),
-                )
-              : const SizedBox.shrink(),
+                ) else const SizedBox.shrink(),
         ],
       ),
       input: (control.value != null)
@@ -212,7 +206,6 @@ class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
               return const SizedBox.shrink();
             }
             return Column(
-              mainAxisAlignment: MainAxisAlignment.start,
               crossAxisAlignment: CrossAxisAlignment.start,
               children: List.generate(formArray.controls.length, (i) {
                 final valueControl = formViewModel.scaleMidValueControls.controls[i] as FormControl;
diff --git a/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_data.dart b/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_data.dart
index f11b192a2..2bc58099a 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_data.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_data.dart
@@ -17,7 +17,7 @@ class QuestionnaireFormData implements IFormData {
                 question,
                 // Collect all eligibility criteria for this question
                 eligibilityCriteria.where((c) => (c.condition as ValueExpression).target == question.id).toList(),
-              ))
+              ),)
           .toList(),
     );
   }
diff --git a/designer_v2/lib/features/design/shared/schedule/schedule_controls_view.dart b/designer_v2/lib/features/design/shared/schedule/schedule_controls_view.dart
index 46ee12556..886c98b34 100644
--- a/designer_v2/lib/features/design/shared/schedule/schedule_controls_view.dart
+++ b/designer_v2/lib/features/design/shared/schedule/schedule_controls_view.dart
@@ -78,13 +78,13 @@ class ScheduleControls extends FormConsumerWidget {
                                       splashRadius: 18.0,
                                       onPressed: picker.showPicker,
                                       icon: const Icon(Icons.access_time),
-                                    ))),
+                                    ),),),
                           );
                         },
-                      ))),
+                      ),),),
                     ],
                   ),
-                )
+                ),
               ],
             ),
           ),
@@ -97,7 +97,7 @@ class ScheduleControls extends FormConsumerWidget {
             ),
           ),
           ..._conditionalTimeRestrictions(context),
-        ]),
+        ],),
       ],
     );
   }
@@ -132,11 +132,11 @@ class ScheduleControls extends FormConsumerWidget {
                                     splashRadius: 18.0,
                                     onPressed: picker.showPicker,
                                     icon: const Icon(Icons.access_time),
-                                  )))
+                                  ),),)
                           : const InputDecoration(),
                     );
                   },
-                )),
+                ),),
               ),
               const SizedBox(width: 10.0),
               Flexible(
@@ -159,14 +159,14 @@ class ScheduleControls extends FormConsumerWidget {
                                     splashRadius: 18.0,
                                     onPressed: picker.showPicker,
                                     icon: const Icon(Icons.access_time),
-                                  )))
+                                  ),),)
                           : const InputDecoration(),
                     );
                   },
-                )),
-              )
+                ),),
+              ),
             ],
-          )),
+          ),),
     ];
   }
 }
diff --git a/designer_v2/lib/features/design/shared/schedule/schedule_form_controller_mixin.dart b/designer_v2/lib/features/design/shared/schedule/schedule_form_controller_mixin.dart
index c7cf52f59..71ead79d8 100644
--- a/designer_v2/lib/features/design/shared/schedule/schedule_form_controller_mixin.dart
+++ b/designer_v2/lib/features/design/shared/schedule/schedule_form_controller_mixin.dart
@@ -7,24 +7,29 @@ import 'package:studyu_designer_v2/features/design/shared/schedule/schedule_form
 import 'package:studyu_designer_v2/utils/time_of_day.dart';
 
 mixin WithScheduleControls {
-  final FormControl<bool> isTimeRestrictedControl = FormControl(validators: [Validators.required], value: false);
+  final FormControl<bool> isTimeRestrictedControl =
+      FormControl(validators: [Validators.required], value: false);
   final FormControl<String> instanceID = FormControl();
-  final FormControl<Time> restrictedTimeStartControl = FormControl(value: const Time(hour: 0, minute: 0));
+  final FormControl<Time> restrictedTimeStartControl =
+      FormControl(value: const Time(hour: 0, minute: 0));
   final FormControl<TimeOfDay> restrictedTimeStartPickerControl = FormControl();
-  final FormControl<Time> restrictedTimeEndControl = FormControl(value: const Time(hour: 23, minute: 59));
+  final FormControl<Time> restrictedTimeEndControl =
+      FormControl(value: const Time(hour: 23, minute: 59));
   final FormControl<TimeOfDay> restrictedTimeEndPickerControl = FormControl();
 
-  final FormControl<bool> hasReminderControl = FormControl(validators: [Validators.required], value: false);
+  final FormControl<bool> hasReminderControl =
+      FormControl(validators: [Validators.required], value: false);
   final FormControl<Time> reminderTimeControl = FormControl();
   final FormControl<TimeOfDay> reminderTimePickerControl = FormControl();
 
   bool get hasReminder => hasReminderControl.value!;
   bool get isTimeRestricted => isTimeRestrictedControl.value!;
 
-  List<Time>? get timeRestriction =>
-      (isTimeRestricted && restrictedTimeStartControl.value != null && restrictedTimeEndControl.value != null)
-          ? [restrictedTimeStartControl.value!, restrictedTimeEndControl.value!]
-          : null;
+  List<Time>? get timeRestriction => (isTimeRestricted &&
+          restrictedTimeStartControl.value != null &&
+          restrictedTimeEndControl.value != null)
+      ? [restrictedTimeStartControl.value!, restrictedTimeEndControl.value!]
+      : null;
 
   StreamSubscription? _reminderControlStream;
 
@@ -45,9 +50,10 @@ mixin WithScheduleControls {
     _initReminderControl();
   }
 
-  _initReminderControl() {
+  void _initReminderControl() {
     _reminderControlStream?.cancel();
-    _reminderControlStream = hasReminderControl.valueChanges.listen((hasReminder) {
+    _reminderControlStream =
+        hasReminderControl.valueChanges.listen((hasReminder) {
       if (hasReminder != null && !hasReminder) {
         reminderTimeControl.markAsDisabled();
       } else {
diff --git a/designer_v2/lib/features/design/shared/schedule/schedule_form_data.dart b/designer_v2/lib/features/design/shared/schedule/schedule_form_data.dart
index 059c6a53f..e0202d556 100644
--- a/designer_v2/lib/features/design/shared/schedule/schedule_form_data.dart
+++ b/designer_v2/lib/features/design/shared/schedule/schedule_form_data.dart
@@ -9,7 +9,7 @@ abstract class IFormDataWithSchedule implements IFormData {
       this.timeLockStart,
       this.timeLockEnd,
       required this.hasReminder,
-      this.reminderTime});
+      this.reminderTime,});
 
   final String instanceId;
   final bool isTimeLocked;
@@ -27,14 +27,14 @@ abstract class IFormDataWithSchedule implements IFormData {
                 id: instanceId,
                 // default unrestricted period
                 unlockTime: ScheduleX.unrestrictedTime[0],
-                lockTime: ScheduleX.unrestrictedTime[1])
+                lockTime: ScheduleX.unrestrictedTime[1],),
           ]
         : [
             CompletionPeriod(
                 id: instanceId,
                 // user-defined period
                 unlockTime: timeLockStart ?? ScheduleX.unrestrictedTime[0],
-                lockTime: timeLockEnd ?? ScheduleX.unrestrictedTime[1])
+                lockTime: timeLockEnd ?? ScheduleX.unrestrictedTime[1],),
           ];
     return schedule;
   }
diff --git a/designer_v2/lib/features/design/study_design_page_view.dart b/designer_v2/lib/features/design/study_design_page_view.dart
index 6db8c5110..f9580dd69 100644
--- a/designer_v2/lib/features/design/study_design_page_view.dart
+++ b/designer_v2/lib/features/design/study_design_page_view.dart
@@ -17,7 +17,6 @@ abstract class StudyDesignPageWidget extends StudyPageWidget {
       return BannerBox(
           noPrefix: true,
           body: Column(
-              mainAxisAlignment: MainAxisAlignment.start,
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 TextParagraph(
@@ -27,8 +26,8 @@ abstract class StudyDesignPageWidget extends StudyPageWidget {
                 TextParagraph(
                   text: tr.banner_study_readonly_description,
                 ),
-              ]),
-          style: BannerStyle.info);
+              ],),
+          style: BannerStyle.info,);
     }
 
     return null;
diff --git a/designer_v2/lib/features/design/study_form_controller.dart b/designer_v2/lib/features/design/study_form_controller.dart
index a1e1741a4..56c3f7065 100644
--- a/designer_v2/lib/features/design/study_form_controller.dart
+++ b/designer_v2/lib/features/design/study_form_controller.dart
@@ -24,7 +24,8 @@ import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
 
-class StudyFormViewModel extends FormViewModel<Study> implements IFormViewModelDelegate<FormViewModel> {
+class StudyFormViewModel extends FormViewModel<Study>
+    implements IFormViewModelDelegate<FormViewModel> {
   StudyFormViewModel({
     required this.router,
     required this.studyRepository,
@@ -44,16 +45,19 @@ class StudyFormViewModel extends FormViewModel<Study> implements IFormViewModelD
   final IAuthRepository authRepository;
   final GoRouter router;
 
-  bool get isStudyReadonly => formData?.isReadonly(authRepository.currentUser!) ?? false;
+  bool get isStudyReadonly =>
+      formData?.isReadonly(authRepository.currentUser!) ?? false;
 
-  late final StudyInfoFormViewModel studyInfoFormViewModel = StudyInfoFormViewModel(
+  late final StudyInfoFormViewModel studyInfoFormViewModel =
+      StudyInfoFormViewModel(
     formData: StudyInfoFormData.fromStudy(formData!),
     delegate: this,
     study: formData!,
     validationSet: validationSet,
   );
 
-  late final EnrollmentFormViewModel enrollmentFormViewModel = EnrollmentFormViewModel(
+  late final EnrollmentFormViewModel enrollmentFormViewModel =
+      EnrollmentFormViewModel(
     formData: EnrollmentFormData.fromStudy(formData!),
     delegate: this,
     study: formData!,
@@ -61,7 +65,8 @@ class StudyFormViewModel extends FormViewModel<Study> implements IFormViewModelD
     validationSet: validationSet,
   );
 
-  late final MeasurementsFormViewModel measurementsFormViewModel = MeasurementsFormViewModel(
+  late final MeasurementsFormViewModel measurementsFormViewModel =
+      MeasurementsFormViewModel(
     formData: MeasurementsFormData.fromStudy(formData!),
     delegate: this,
     study: formData!,
@@ -77,7 +82,8 @@ class StudyFormViewModel extends FormViewModel<Study> implements IFormViewModelD
     validationSet: validationSet,
   );
 
-  late final InterventionsFormViewModel interventionsFormViewModel = InterventionsFormViewModel(
+  late final InterventionsFormViewModel interventionsFormViewModel =
+      InterventionsFormViewModel(
     formData: InterventionsFormData.fromStudy(formData!),
     delegate: this,
     study: formData!,
@@ -118,7 +124,7 @@ class StudyFormViewModel extends FormViewModel<Study> implements IFormViewModelD
 
   @override
   Study buildFormData() {
-    final studyCopy = (formData as Study).exactDuplicate();
+    final studyCopy = (formData!).exactDuplicate();
     studyInfoFormViewModel.buildFormData().apply(studyCopy);
     enrollmentFormViewModel.buildFormData().apply(studyCopy);
     measurementsFormViewModel.buildFormData().apply(studyCopy);
@@ -146,14 +152,16 @@ class StudyFormViewModel extends FormViewModel<Study> implements IFormViewModelD
   @override
   Future onSave(FormViewModel formViewModel, FormMode prevFormMode) async {
     assert(prevFormMode == FormMode.edit);
-    await _applyAndSaveSubform(formViewModel.formData!);
+    await _applyAndSaveSubform(formViewModel.formData! as IStudyFormData);
   }
 
   Future _applyAndSaveSubform(IStudyFormData subformData) {
     studyDirtyCopy ??= formData!.exactDuplicate();
     subformData.apply(studyDirtyCopy!);
     // Flush the on-write study copy to the repository and clear it
-    return studyRepository.save(studyDirtyCopy!).then((study) => studyDirtyCopy = null);
+    return studyRepository
+        .save(studyDirtyCopy!)
+        .then((study) => studyDirtyCopy = null);
   }
 }
 
@@ -162,7 +170,8 @@ class StudyFormViewModel extends FormViewModel<Study> implements IFormViewModelD
 ///
 /// Note: This is not safe to use in widgets (or other providers) that are built
 /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
-final studyFormViewModelProvider = Provider.autoDispose.family<StudyFormViewModel, StudyID>((ref, studyId) {
+final studyFormViewModelProvider =
+    Provider.autoDispose.family<StudyFormViewModel, StudyID>((ref, studyId) {
   print("studyFormViewModelProvider");
   final state = ref.watch(studyControllerProvider(studyId));
   final formViewModel = StudyFormViewModel(
diff --git a/designer_v2/lib/features/design/study_form_data.dart b/designer_v2/lib/features/design/study_form_data.dart
index ab02e7cd0..d9c8d1736 100644
--- a/designer_v2/lib/features/design/study_form_data.dart
+++ b/designer_v2/lib/features/design/study_form_data.dart
@@ -2,7 +2,7 @@ import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/features/forms/form_data.dart';
 
 abstract class IStudyFormData implements IFormData {
-  factory IStudyFormData.fromStudy(Study study) {
+  factory IStudyFormData.fromStudy() {
     throw UnimplementedError("Subclass responsibility");
   }
 
diff --git a/designer_v2/lib/features/design/study_form_scaffold.dart b/designer_v2/lib/features/design/study_form_scaffold.dart
index 286875bcc..f539fbc47 100644
--- a/designer_v2/lib/features/design/study_form_scaffold.dart
+++ b/designer_v2/lib/features/design/study_form_scaffold.dart
@@ -2,13 +2,13 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_designer_v2/common_views/async_value_widget.dart';
 import 'package:studyu_designer_v2/common_views/form_scaffold.dart';
-import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
+import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
 import 'package:studyu_designer_v2/features/study/study_controller.dart';
 
 class StudyFormScaffold<T extends FormViewModel> extends ConsumerWidget {
   const StudyFormScaffold(
-      {required this.studyId, required this.formViewModelBuilder, required this.formViewBuilder, super.key});
+      {required this.studyId, required this.formViewModelBuilder, required this.formViewBuilder, super.key,});
 
   final StudyID studyId;
   final FormViewModelBuilder<T> formViewModelBuilder;
diff --git a/designer_v2/lib/features/forms/form_array_table.dart b/designer_v2/lib/features/forms/form_array_table.dart
index 5082209e6..8456eb70b 100644
--- a/designer_v2/lib/features/forms/form_array_table.dart
+++ b/designer_v2/lib/features/forms/form_array_table.dart
@@ -8,7 +8,8 @@ import 'package:studyu_designer_v2/common_views/standard_table.dart';
 import 'package:studyu_designer_v2/common_views/text_paragraph.dart';
 
 typedef FormArrayTableRowLabelProvider<T> = String Function(T item);
-typedef WidgetBuilderAt<T> = Widget Function(BuildContext context, T item, int rowIdx);
+typedef WidgetBuilderAt<T> = Widget Function(
+    BuildContext context, T item, int rowIdx,);
 
 class FormArrayTable<T> extends StatelessWidget {
   const FormArrayTable({
@@ -28,10 +29,11 @@ class FormArrayTable<T> extends StatelessWidget {
     this.emptyIcon,
     this.emptyTitle,
     this.emptyDescription,
-    this.itemsSectionPadding = const EdgeInsets.symmetric(vertical: 8.0, horizontal: 0.0),
+    this.itemsSectionPadding = const EdgeInsets.symmetric(vertical: 8.0),
     this.hideLeadingTrailingWhenEmpty = false,
     super.key,
-  }) : assert(sectionTitle == null || leadingWidget == null, "Cannot specify both sectionTitle and leadingWidget");
+  }) : assert(sectionTitle == null || leadingWidget == null,
+            "Cannot specify both sectionTitle and leadingWidget",);
 
   final AbstractControl control;
 
@@ -62,31 +64,45 @@ class FormArrayTable<T> extends StatelessWidget {
 
   static final List<StandardTableColumn> columns = [
     StandardTableColumn(
-        label: '', // don't care (showTableHeader=false)
-        columnWidth: const FlexColumnWidth()),
+      label: '', // don't care (showTableHeader=false),),
+    ),
   ];
 
   @override
   Widget build(BuildContext context) {
-    final hasEmptyWidget = emptyIcon != null || emptyTitle != null || emptyDescription != null;
-    final isSection = sectionTitle != null || sectionTitleDivider != null || sectionDescription != null;
+    final hasEmptyWidget =
+        emptyIcon != null || emptyTitle != null || emptyDescription != null;
+    final isSection = sectionTitle != null ||
+        sectionTitleDivider != null ||
+        sectionDescription != null;
 
     const leadingWidgetsSpacing = 4.0;
 
     final Widget leading = Column(
       children: [
-        (leadingWidget != null) ? leadingWidget! : const SizedBox.shrink(),
-        (sectionTitle != null && leadingWidget != null)
-            ? const SizedBox(height: leadingWidgetsSpacing)
-            : const SizedBox.shrink(),
-        (sectionTitle != null) ? FormSectionHeader(title: sectionTitle!, divider: false) : const SizedBox.shrink(),
-        (sectionTitleDivider == true && (sectionTitle != null || leadingWidget != null))
-            ? const Divider()
-            : const SizedBox.shrink(),
-        (sectionDescription != null && (sectionTitle != null || leadingWidget != null))
-            ? const SizedBox(height: leadingWidgetsSpacing)
-            : const SizedBox.shrink(),
-        (sectionDescription != null) ? TextParagraph(text: sectionDescription!) : const SizedBox.shrink(),
+        if (leadingWidget != null) leadingWidget! else const SizedBox.shrink(),
+        if (sectionTitle != null && leadingWidget != null)
+          const SizedBox(height: leadingWidgetsSpacing)
+        else
+          const SizedBox.shrink(),
+        if (sectionTitle != null)
+          FormSectionHeader(title: sectionTitle!, divider: false)
+        else
+          const SizedBox.shrink(),
+        if (sectionTitleDivider == true &&
+            (sectionTitle != null || leadingWidget != null))
+          const Divider()
+        else
+          const SizedBox.shrink(),
+        if (sectionDescription != null &&
+            (sectionTitle != null || leadingWidget != null))
+          const SizedBox(height: leadingWidgetsSpacing)
+        else
+          const SizedBox.shrink(),
+        if (sectionDescription != null)
+          TextParagraph(text: sectionDescription)
+        else
+          const SizedBox.shrink(),
       ],
     );
 
@@ -96,12 +112,13 @@ class FormArrayTable<T> extends StatelessWidget {
       onSelectItem: onSelectItem,
       buildCellsAt: _buildRow,
       trailingActionsAt: getActionsAt,
-      cellSpacing: 10.0,
       rowSpacing: 5.0,
       minRowHeight: 40.0,
       showTableHeader: false,
       tableWrapper: (table) => Padding(
-        padding: (items.isNotEmpty && itemsSectionPadding != null) ? itemsSectionPadding! : EdgeInsets.zero,
+        padding: (items.isNotEmpty && itemsSectionPadding != null)
+            ? itemsSectionPadding!
+            : EdgeInsets.zero,
         child: table,
       ),
       leadingWidget: leading,
@@ -114,9 +131,11 @@ class FormArrayTable<T> extends StatelessWidget {
           return _newItemButton();
         },
       ),
-      emptyWidget: (hasEmptyWidget)
+      emptyWidget: hasEmptyWidget
           ? Padding(
-              padding: (itemsSectionPadding != null && isSection) ? itemsSectionPadding! : EdgeInsets.zero,
+              padding: (itemsSectionPadding != null && isSection)
+                  ? itemsSectionPadding!
+                  : EdgeInsets.zero,
               child: EmptyBody(
                 icon: emptyIcon,
                 title: emptyTitle,
@@ -129,28 +148,39 @@ class FormArrayTable<T> extends StatelessWidget {
     );
   }
 
-  List<Widget> _buildRow(BuildContext context, T item, int rowIdx, Set<WidgetState> states) {
+  List<Widget> _buildRow(
+      BuildContext context, T item, int rowIdx, Set<WidgetState> states,) {
     final tableTextStyleSecondary = Theme.of(context).textTheme.bodyMedium;
     return [
-      CustomScrollView(physics: const NeverScrollableScrollPhysics(), scrollDirection: Axis.horizontal, slivers: [
-        SliverFillRemaining(
-          hasScrollBody: false,
-          child: Row(
-            children: [
-              (rowPrefix != null) ? rowPrefix!(context, item, rowIdx) : const SizedBox.shrink(),
-              Text(
-                rowTitle(item),
-                style: tableTextStyleSecondary?.copyWith(
-                  overflow: TextOverflow.ellipsis,
+      CustomScrollView(
+        physics: const NeverScrollableScrollPhysics(),
+        scrollDirection: Axis.horizontal,
+        slivers: [
+          SliverFillRemaining(
+            hasScrollBody: false,
+            child: Row(
+              children: [
+                if (rowPrefix != null)
+                  rowPrefix!(context, item, rowIdx)
+                else
+                  const SizedBox.shrink(),
+                Text(
+                  rowTitle(item),
+                  style: tableTextStyleSecondary?.copyWith(
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                  maxLines: 1,
                 ),
-                maxLines: 1,
-              ),
-              const Spacer(),
-              (rowSuffix != null) ? rowSuffix!(context, item, rowIdx) : const SizedBox.shrink(),
-            ],
+                const Spacer(),
+                if (rowSuffix != null)
+                  rowSuffix!(context, item, rowIdx)
+                else
+                  const SizedBox.shrink(),
+              ],
+            ),
           ),
-        ),
-      ]),
+        ],
+      ),
     ];
   }
 
@@ -159,7 +189,6 @@ class FormArrayTable<T> extends StatelessWidget {
       return const SizedBox.shrink();
     }
     return PrimaryButton(
-      icon: Icons.add,
       text: onNewItemLabel,
       onPressed: onNewItem,
     );
diff --git a/designer_v2/lib/features/forms/form_control.dart b/designer_v2/lib/features/forms/form_control.dart
index ad93e9805..f40355ac5 100644
--- a/designer_v2/lib/features/forms/form_control.dart
+++ b/designer_v2/lib/features/forms/form_control.dart
@@ -19,7 +19,8 @@ class CustomFormControl<T> extends FormControl<T> {
   }) : super() {
     if (onValueChanged != null) {
       final callback = (_onValueChangedDebouncer != null)
-          ? (value) => _onValueChangedDebouncer!(callback: () => onValueChanged!(value))
+          ? (T? value) =>
+              _onValueChangedDebouncer!(callback: () => onValueChanged!(value))
           : onValueChanged;
 
       valueChanges.listen(callback);
@@ -27,19 +28,23 @@ class CustomFormControl<T> extends FormControl<T> {
 
     if (onStatusChanged != null) {
       final callback = (_onStatusChangedDebouncer != null)
-          ? (value) => _onStatusChangedDebouncer!(callback: () => onStatusChanged!(value))
+          ? (ControlStatus value) => _onStatusChangedDebouncer!(
+              callback: () => onStatusChanged!(value),)
           : onStatusChanged;
 
       statusChanged.listen(callback);
     }
   }
 
-  late final Debouncer? _onValueChangedDebouncer = (onValueChangedDebounceTime != null)
-      ? Debouncer(milliseconds: onValueChangedDebounceTime!, leading: false)
-      : null;
-  late final Debouncer? _onStatusChangedDebouncer = (onStatusChangedDebounceTime != null)
-      ? Debouncer(milliseconds: onStatusChangedDebounceTime!, leading: false)
-      : null;
+  late final Debouncer? _onValueChangedDebouncer =
+      (onValueChangedDebounceTime != null)
+          ? Debouncer(milliseconds: onValueChangedDebounceTime!, leading: false)
+          : null;
+  late final Debouncer? _onStatusChangedDebouncer =
+      (onStatusChangedDebounceTime != null)
+          ? Debouncer(
+              milliseconds: onStatusChangedDebounceTime!, leading: false,)
+          : null;
 
   @override
   void dispose() {
diff --git a/designer_v2/lib/features/forms/form_validation.dart b/designer_v2/lib/features/forms/form_validation.dart
index a8fd76233..622b6254d 100644
--- a/designer_v2/lib/features/forms/form_validation.dart
+++ b/designer_v2/lib/features/forms/form_validation.dart
@@ -24,12 +24,16 @@ class FormControlValidation {
       return this;
     }
     if (control != other.control) {
-      throw Exception("Cannot merge FormControlValidationConfig for different controls.");
+      throw Exception(
+          "Cannot merge FormControlValidationConfig for different controls.",);
     }
     return FormControlValidation(
       control: control,
       validators: [...validators, ...other.validators],
-      asyncValidators: [...(asyncValidators ?? []), ...(other.asyncValidators ?? [])],
+      asyncValidators: [
+        ...asyncValidators ?? [],
+        ...other.asyncValidators ?? [],
+      ],
       validationMessages: {...validationMessages, ...other.validationMessages},
     );
   }
@@ -41,19 +45,24 @@ typedef FormValidationConfig = List<FormControlValidation>;
 /// [FormValidationSetEnum] which is used to look up the validator configuration
 /// to be applied based on the [FormViewModel]'s current
 /// [FormViewModel.validationSet].
-typedef FormValidationConfigSet = Map<FormValidationSetEnum, List<FormControlValidation>>;
+typedef FormValidationConfigSet
+    = Map<FormValidationSetEnum, List<FormControlValidation>>;
 
 /// Extension to get/set control-specific validation messages from the
 /// [AbstractControl] object itself
 extension AbstractControlX on AbstractControl {
-  static final Map<AbstractControl, Map<String, ValidationMessageFunction>> _controlValidationMessages = {};
+  static final Map<AbstractControl, Map<String, ValidationMessageFunction>>
+      _controlValidationMessages = {};
 
-  Map<String, ValidationMessageFunction> get validationMessages => _controlValidationMessages[this] ?? {};
-  set validationMessages(Map<String, ValidationMessageFunction> validationMessages) =>
+  Map<String, ValidationMessageFunction> get validationMessages =>
+      _controlValidationMessages[this] ?? {};
+  set validationMessages(
+          Map<String, ValidationMessageFunction> validationMessages,) =>
       _controlValidationMessages[this] = validationMessages;
 }
 
-List<Tuple<AbstractControl, String>> _collectValidationErrorMessages(AbstractControl control) {
+List<Tuple<AbstractControl, String>> _collectValidationErrorMessages(
+    AbstractControl control,) {
   final List<Tuple<AbstractControl, String>> allValidationErrorMessages = [];
 
   if (!control.enabled || !control.hasErrors) {
@@ -78,25 +87,27 @@ List<Tuple<AbstractControl, String>> _collectValidationErrorMessages(AbstractCon
     }
 
     final validationMessageFunc = control.validationMessages[error.key];
-    final String validationMessage = validationMessageFunc?.call(error.value) ?? '[${error.key}]';
+    final String validationMessage =
+        validationMessageFunc?.call(error.value) ?? '[${error.key}]';
     allValidationErrorMessages.add(Tuple(control, validationMessage));
   }
 
   return allValidationErrorMessages;
 }
 
-List<Tuple<AbstractControl, String>>? _getControlErrorMessages(AbstractControl control) {
+List<Tuple<AbstractControl, String>>? _getControlErrorMessages(
+    AbstractControl control,) {
   List<Tuple<AbstractControl, String>>? errorMessages;
   // Typecasting needed as a workaround because dynamic dispatch
   // is not working properly with extension methods
   if (control is FormControl) {
-    errorMessages = (control).validationErrorMessages;
+    errorMessages = control.validationErrorMessages;
   }
   if (control is FormArray) {
-    errorMessages = (control).validationErrorMessages;
+    errorMessages = control.validationErrorMessages;
   }
   if (control is FormGroup) {
-    errorMessages = (control).validationErrorMessages;
+    errorMessages = control.validationErrorMessages;
   }
   return errorMessages;
 }
@@ -109,7 +120,8 @@ extension FormControlXX on FormControl {
 
 extension FormArrayX on FormArray {
   List<Tuple<AbstractControl, String>> get validationErrorMessages {
-    final List<Tuple<AbstractControl, String>> allValidationErrorMessages = _collectValidationErrorMessages(this);
+    final List<Tuple<AbstractControl, String>> allValidationErrorMessages =
+        _collectValidationErrorMessages(this);
 
     for (final control in controls) {
       if (control.enabled && control.hasErrors) {
@@ -126,7 +138,8 @@ extension FormArrayX on FormArray {
 
 extension FormGroupX on FormGroup {
   List<Tuple<AbstractControl, String>> get validationErrorMessages {
-    final List<Tuple<AbstractControl, String>> allValidationErrorMessages = _collectValidationErrorMessages(this);
+    final List<Tuple<AbstractControl, String>> allValidationErrorMessages =
+        _collectValidationErrorMessages(this);
 
     controls.forEach((_, control) {
       if (control.enabled && control.hasErrors) {
@@ -140,12 +153,15 @@ extension FormGroupX on FormGroup {
     return allValidationErrorMessages;
   }
 
-  List<String> get formattedErrorMessages => validationErrorMessages.map((t) => t.second).toList();
+  List<String> get formattedErrorMessages =>
+      validationErrorMessages.map((t) => t.second).toList();
 
   String get validationErrorSummary => getValidationErrorSummary();
 
-  String getValidationErrorSummary({uniqueErrors = true}) {
-    final errorMessages = (uniqueErrors) ? {...formattedErrorMessages}.toList() : formattedErrorMessages;
+  String getValidationErrorSummary({bool uniqueErrors = true}) {
+    final errorMessages = uniqueErrors
+        ? {...formattedErrorMessages}.toList()
+        : formattedErrorMessages;
     return "- ${errorMessages.join("\n- ")}";
   }
 }
diff --git a/designer_v2/lib/features/forms/form_view_model.dart b/designer_v2/lib/features/forms/form_view_model.dart
index 21c4b8768..682ebb218 100644
--- a/designer_v2/lib/features/forms/form_view_model.dart
+++ b/designer_v2/lib/features/forms/form_view_model.dart
@@ -44,13 +44,15 @@ class FormControlOption<T> extends Equatable {
   List<Object?> get props => [value, label, description];
 }
 
-typedef FormControlUpdateFutureBuilder = Future Function(AbstractControl control);
+typedef FormControlUpdateFutureBuilder = Future Function(
+  AbstractControl control,
+);
 
 abstract class FormViewModel<T> implements IFormGroupController {
   FormViewModel({
-    formData,
+    T? formData,
     this.delegate,
-    validationSet,
+    FormValidationSetEnum? validationSet,
     this.autosave = false,
   })  : _validationSet = validationSet,
         _formData = formData,
@@ -110,7 +112,8 @@ abstract class FormViewModel<T> implements IFormGroupController {
 
   /// Map that stores the default [AbstractControl.validators] and
   /// [AbstractControl.asyncValidators] for each control in the [form]
-  final Map<String, Tuple<List<Validator>, List<AsyncValidator>>> _defaultControlValidators = {};
+  final Map<String, Tuple<List<Validator>, List<AsyncValidator>>>
+      _defaultControlValidators = {};
 
   /// Flag indicating whether the current [form] data is different from
   /// the most recently set [formData]
@@ -148,7 +151,7 @@ abstract class FormViewModel<T> implements IFormGroupController {
   /// Key used internally for storing properties of the [form] itself
   static const _formKey = '__form';
 
-  _setFormData(T? formData) {
+  void _setFormData(T? formData) {
     _formData = formData;
     if (formData != null) {
       setControlsFrom(formData); // update [form] controls automatically
@@ -157,7 +160,7 @@ abstract class FormViewModel<T> implements IFormGroupController {
     form.updateValueAndValidity();
   }
 
-  _rememberDefaultControlStates() {
+  void _rememberDefaultControlStates() {
     for (final entry in form.controls.entries) {
       final controlName = entry.key;
       final control = entry.value;
@@ -167,31 +170,38 @@ abstract class FormViewModel<T> implements IFormGroupController {
     }
   }
 
-  _rememberDefaultControlValidators() {
+  void _rememberDefaultControlValidators() {
     for (final entry in form.controls.entries) {
       final controlName = entry.key;
       final control = entry.value;
       if (!_defaultControlValidators.containsKey(controlName)) {
-        _defaultControlValidators[controlName] = Tuple(control.validators, control.asyncValidators);
+        _defaultControlValidators[controlName] =
+            Tuple(control.validators, control.asyncValidators);
       }
     }
     if (!_defaultControlValidators.containsKey(_formKey)) {
-      _defaultControlValidators[_formKey] = Tuple(form.validators, form.asyncValidators);
+      _defaultControlValidators[_formKey] =
+          Tuple(form.validators, form.asyncValidators);
     }
   }
 
-  Tuple<List<Validator>, List<AsyncValidator>>? _getDefaultValidators(String controlName) {
+  Tuple<List<Validator>, List<AsyncValidator>>? _getDefaultValidators(
+    String controlName,
+  ) {
     return _defaultControlValidators[controlName];
   }
 
-  _disableAllControls() {
+  void _disableAllControls() {
     for (final control in form.controls.values) {
       control.markAsDisabled();
     }
     assert(form.allControlsDisabled());
   }
 
-  _restoreControlStates({emitEvent = true, updateParent = true}) {
+  void _restoreControlStates({
+    bool emitEvent = true,
+    bool updateParent = true,
+  }) {
     for (final entry in form.controls.entries) {
       final controlName = entry.key;
       final control = entry.value;
@@ -199,25 +209,26 @@ abstract class FormViewModel<T> implements IFormGroupController {
       if (isEnabledByDefault) {
         control.markAsEnabled(emitEvent: emitEvent, updateParent: updateParent);
       } else {
-        control.markAsDisabled(emitEvent: emitEvent, updateParent: updateParent);
+        control.markAsDisabled(
+          emitEvent: emitEvent,
+          updateParent: updateParent,
+        );
       }
     }
   }
 
-  _formModeUpdated() {
+  void _formModeUpdated() {
     switch (formMode) {
       case FormMode.readonly:
         _rememberDefaultControlStates();
         _disableAllControls();
-        break;
       case FormMode.create:
       case FormMode.edit:
         _restoreControlStates();
-        break;
     }
   }
 
-  _restoreControlsFromFormData() {
+  void _restoreControlsFromFormData() {
     if (formData != null) {
       setControlsFrom(formData as T);
       form.updateValueAndValidity();
@@ -242,7 +253,9 @@ abstract class FormViewModel<T> implements IFormGroupController {
     }
     final formValidationConfig = sharedValidationConfig[validationSet];
     if (formValidationConfig == null) {
-      throw FormConfigException("Failed to lookup FormValidationConfig for key: $validationSet");
+      throw FormConfigException(
+        "Failed to lookup FormValidationConfig for key: $validationSet",
+      );
     }
 
     // Build mapping from control => merged config
@@ -258,14 +271,20 @@ abstract class FormViewModel<T> implements IFormGroupController {
     _rememberDefaultControlValidators();
 
     // Helper function to reset & change the validators on a single control
-    resetAndUpdateControlValidators(String controlName, AbstractControl control) {
+    void resetAndUpdateControlValidators(
+      String controlName,
+      AbstractControl control,
+    ) {
       // Reset the control validators to its cached defaults
       final defaultValidators = _getDefaultValidators(controlName);
       assert(defaultValidators?.first != null);
       assert(defaultValidators?.second != null);
 
       control.setValidators(defaultValidators?.first ?? [], emitEvent: false);
-      control.setAsyncValidators(defaultValidators?.second ?? [], emitEvent: false);
+      control.setAsyncValidators(
+        defaultValidators?.second ?? [],
+        emitEvent: false,
+      );
 
       // Apply control-specific config (if any)
       //
@@ -276,7 +295,10 @@ abstract class FormViewModel<T> implements IFormGroupController {
         final controlConfig = controlConfigs[control]!;
         control.setValidators(controlConfig.validators, emitEvent: false);
         if (controlConfig.asyncValidators != null) {
-          control.setAsyncValidators(controlConfig.asyncValidators!, emitEvent: false);
+          control.setAsyncValidators(
+            controlConfig.asyncValidators!,
+            emitEvent: false,
+          );
         }
         control.validationMessages = controlConfig.validationMessages;
       }
@@ -346,27 +368,34 @@ abstract class FormViewModel<T> implements IFormGroupController {
     }
     delegate?.onCancel(this, formMode);
 
-    return Future.value(null);
+    return Future.value();
   }
 
   void enableAutosave({
     int debounce = Config.formAutosaveDebounce,
-    onlyValid = true,
+    bool onlyValid = true,
   }) {
     if (_immediateFormChildrenSubscriptions.isNotEmpty) {
       return;
     }
-    listenToImmediateFormChildren((control) {
-      final saveFuture = save();
-      _autosaveOperation = CancelableOperation.fromFuture(saveFuture);
-      return saveFuture;
-    }, debounce: debounce);
+    listenToImmediateFormChildren(
+      (control) {
+        final saveFuture = save();
+        _autosaveOperation = CancelableOperation.fromFuture(saveFuture);
+        return saveFuture;
+      },
+      debounce: debounce,
+    );
   }
 
-  void listenToImmediateFormChildren(FormControlUpdateFutureBuilder futureBuilder, {int debounce = 1500}) {
+  void listenToImmediateFormChildren(
+    FormControlUpdateFutureBuilder futureBuilder, {
+    int debounce = 1500,
+  }) {
     // Initialize debounce helper if needed
     if (debounce != 0) {
-      _immediateFormChildrenListenerDebouncer ??= Debouncer(milliseconds: debounce, leading: false);
+      _immediateFormChildrenListenerDebouncer ??=
+          Debouncer(milliseconds: debounce, leading: false);
     }
 
     for (final control in form.controls.values) {
@@ -374,14 +403,17 @@ abstract class FormViewModel<T> implements IFormGroupController {
         if (debounce == 0) {
           futureBuilder(control);
         } else {
-          _immediateFormChildrenListenerDebouncer!(futureBuilder: () => futureBuilder(control));
+          _immediateFormChildrenListenerDebouncer!(
+            futureBuilder: () => futureBuilder(control),
+          );
         }
       }
 
       if (control is FormGroup) {
         continue; // don't listen to nested descendants
       } else if (control is FormArray) {
-        final collectionChanges = control.collectionChanges.listen(boundListener);
+        final collectionChanges =
+            control.collectionChanges.listen(boundListener);
         // don't subscribe to control.valueChanges
         _immediateFormChildrenSubscriptions.add(collectionChanges);
       } else if (control is FormControl) {
@@ -393,7 +425,7 @@ abstract class FormViewModel<T> implements IFormGroupController {
 
   /// Call after changing / adding / removing the child controls in [form]
   /// to perform necessary housekeeping
-  markFormGroupChanged() {
+  void markFormGroupChanged() {
     revalidate();
     _formModeUpdated();
     form.updateValueAndValidity();
diff --git a/designer_v2/lib/features/forms/form_view_model_collection.dart b/designer_v2/lib/features/forms/form_view_model_collection.dart
index 7651d94c4..b3b95492f 100644
--- a/designer_v2/lib/features/forms/form_view_model_collection.dart
+++ b/designer_v2/lib/features/forms/form_view_model_collection.dart
@@ -45,7 +45,7 @@ class FormViewModelCollection<T extends ManagedFormViewModel<D>, D extends IForm
 
   T remove(T formViewModel) {
     // Remove by index since we cannot rely on object identity of [formViewModel.form]
-    int idx = formViewModels.indexOf(formViewModel);
+    final int idx = formViewModels.indexOf(formViewModel);
     if (idx == -1) {
       throw FormViewModelNotFoundException();
     }
diff --git a/designer_v2/lib/features/forms/form_view_model_collection_actions.dart b/designer_v2/lib/features/forms/form_view_model_collection_actions.dart
index d30d2ba7e..73010cdba 100644
--- a/designer_v2/lib/features/forms/form_view_model_collection_actions.dart
+++ b/designer_v2/lib/features/forms/form_view_model_collection_actions.dart
@@ -5,12 +5,17 @@ import 'package:studyu_designer_v2/utils/typings.dart';
 
 /// Extension that implements a set of standard actions for elements of a
 /// [FormViewModelCollection]
-extension FormViewModelCollectionActions<T extends ManagedFormViewModel<D>, D extends IFormData>
-    on FormViewModelCollection<T, D> {
+extension FormViewModelCollectionActions<T extends ManagedFormViewModel<D>,
+    D extends IFormData> on FormViewModelCollection<T, D> {
   // implements IListActionProvider<T>
 
-  List<ModelAction> availableActions(T formViewModel,
-      {VoidCallbackOn<T>? onEdit, VoidCallbackOn<T>? onDuplicate, VoidCallbackOn<T>? onDelete, isReadOnly = false}) {
+  List<ModelAction> availableActions(
+    T formViewModel, {
+    VoidCallbackOn<T>? onEdit,
+    VoidCallbackOn<T>? onDuplicate,
+    VoidCallbackOn<T>? onDelete,
+    bool isReadOnly = false,
+  }) {
     final actions = [
       ModelAction(
         type: ModelActionType.edit,
@@ -24,7 +29,8 @@ extension FormViewModelCollectionActions<T extends ManagedFormViewModel<D>, D ex
         onExecute: (onDuplicate != null)
             ? () => onDuplicate(formViewModel)
             : () {
-                final duplicateFormViewModel = formViewModel.createDuplicate() as T;
+                final duplicateFormViewModel =
+                    formViewModel.createDuplicate() as T;
                 add(duplicateFormViewModel);
               },
         isAvailable: !isReadOnly,
@@ -45,13 +51,15 @@ extension FormViewModelCollectionActions<T extends ManagedFormViewModel<D>, D ex
     return actions;
   }
 
-  List<ModelAction> availablePopupActions(T formViewModel, {isReadOnly = false}) {
+  List<ModelAction> availablePopupActions(T formViewModel,
+      {bool isReadOnly = false,}) {
     return availableActions(formViewModel, isReadOnly: isReadOnly)
         .where((action) => action.type != ModelActionType.edit)
         .toList();
   }
 
-  List<ModelAction> availableInlineActions(T formViewModel, {isReadOnly = false}) {
+  List<ModelAction> availableInlineActions(T formViewModel,
+      {bool isReadOnly = false,}) {
     return availableActions(formViewModel, isReadOnly: isReadOnly)
         .where((action) => action.type == ModelActionType.edit)
         .toList();
diff --git a/designer_v2/lib/features/publish/study_publish_dialog.dart b/designer_v2/lib/features/publish/study_publish_dialog.dart
index d9efd69c1..d225cc5c8 100644
--- a/designer_v2/lib/features/publish/study_publish_dialog.dart
+++ b/designer_v2/lib/features/publish/study_publish_dialog.dart
@@ -21,7 +21,7 @@ class PublishDialog extends StudyPageWidget {
   }
 }
 
-showPublishDialog(BuildContext context, StudyID studyId) {
+Future showPublishDialog(BuildContext context, StudyID studyId) {
   final theme = Theme.of(context);
   return showDialog(
     context: context,
diff --git a/designer_v2/lib/features/publish/study_publish_dialog_confirm.dart b/designer_v2/lib/features/publish/study_publish_dialog_confirm.dart
index 95b3323cb..16d32ad1a 100644
--- a/designer_v2/lib/features/publish/study_publish_dialog_confirm.dart
+++ b/designer_v2/lib/features/publish/study_publish_dialog_confirm.dart
@@ -19,7 +19,8 @@ class PublishConfirmationDialog extends StudyPageWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final controller = ref.watch(studyControllerProvider(studyId).notifier);
     final state = ref.watch(studyControllerProvider(studyId));
-    final formViewModel = ref.watch(studySettingsFormViewModelProvider(studyId));
+    final formViewModel =
+        ref.watch(studySettingsFormViewModelProvider(studyId));
     formViewModel.setLaunchDefaults();
 
     final theme = Theme.of(context);
@@ -29,53 +30,57 @@ class PublishConfirmationDialog extends StudyPageWidget {
       child: StandardDialog(
         titleText: tr.study_launch_title,
         body: Column(
-          mainAxisAlignment: MainAxisAlignment.start,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Row(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Flexible(
-                    child: Column(
-                  mainAxisAlignment: MainAxisAlignment.start,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    RichText(
-                      text: TextSpan(
-                        text: tr.study_launch_participation_intro,
-                        children: [
-                          const TextSpan(text: ' '),
-                          TextSpan(
-                            text: state.studyParticipation!.asAdjective,
-                            style: const TextStyle(fontWeight: FontWeight.bold),
-                          ),
-                          const TextSpan(text: '.'),
-                          TextSpan(text: tr.study_launch_participation_outro),
-                        ],
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      RichText(
+                        text: TextSpan(
+                          text: tr.study_launch_participation_intro,
+                          children: [
+                            const TextSpan(text: ' '),
+                            TextSpan(
+                              text: state.studyParticipation!.asAdjective,
+                              style:
+                                  const TextStyle(fontWeight: FontWeight.bold),
+                            ),
+                            const TextSpan(text: '.'),
+                            TextSpan(text: tr.study_launch_participation_outro),
+                          ],
+                        ),
                       ),
-                    ),
-                    const SizedBox(height: 4.0),
-                    SelectableText(
-                      state.studyParticipation!.launchDescription,
-                      style: ThemeConfig.bodyTextMuted(theme).copyWith(
-                        fontStyle: FontStyle.italic,
+                      const SizedBox(height: 4.0),
+                      SelectableText(
+                        state.studyParticipation!.launchDescription,
+                        style: ThemeConfig.bodyTextMuted(theme).copyWith(
+                          fontStyle: FontStyle.italic,
+                        ),
                       ),
-                    ),
-                  ],
-                )),
+                    ],
+                  ),
+                ),
                 const SizedBox(width: 4.0),
                 Opacity(
                   opacity: ThemeConfig.kMuteFadeFactor,
                   child: TextButton(
                     child: Padding(
-                      padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 8.0),
+                      padding: const EdgeInsets.symmetric(
+                        vertical: 8.0,
+                        horizontal: 8.0,
+                      ),
                       child: Text(
                         tr.action_button_study_participation_change,
                         textAlign: TextAlign.center,
                       ),
                     ),
                     onPressed: () {
-                      Navigator.maybePop(context).then((_) => controller.onChangeStudyParticipation());
+                      Navigator.maybePop(context)
+                          .then((_) => controller.onChangeStudyParticipation());
                     },
                   ),
                 ),
@@ -84,43 +89,58 @@ class PublishConfirmationDialog extends StudyPageWidget {
             const SizedBox(height: 24.0),
             SelectableText(tr.study_launch_post_launch_intro),
             const SizedBox(height: 4.0),
-            SelectableText(tr.study_launch_post_launch_summary, style: const TextStyle(fontWeight: FontWeight.bold)),
+            SelectableText(
+              tr.study_launch_post_launch_summary,
+              style: const TextStyle(fontWeight: FontWeight.bold),
+            ),
             const SizedBox(height: 32.0),
-            ReactiveFormConsumer(builder: (context, form, child) {
-              return Container(
-                color: ThemeConfig.containerColor(theme),
-                child: Padding(
-                    padding: const EdgeInsets.symmetric(vertical: 12.0, horizontal: 8.0),
+            ReactiveFormConsumer(
+              builder: (context, form, child) {
+                return ColoredBox(
+                  color: ThemeConfig.containerColor(theme),
+                  child: Padding(
+                    padding: const EdgeInsets.symmetric(
+                      vertical: 12.0,
+                      horizontal: 8.0,
+                    ),
                     child: Row(
-                      mainAxisAlignment: MainAxisAlignment.start,
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         ReactiveCheckbox(
-                          formControl: formViewModel.isPublishedToRegistryControl,
+                          formControl:
+                              formViewModel.isPublishedToRegistryControl,
                         ),
                         const SizedBox(width: 8.0),
                         Flexible(
-                            child: FormControlLabel(
-                          formControl: formViewModel.isPublishedToRegistryControl,
-                          text: tr.study_settings_publish_study_launch_description,
-                        ))
+                          child: FormControlLabel(
+                            formControl:
+                                formViewModel.isPublishedToRegistryControl,
+                            text: tr
+                                .study_settings_publish_study_launch_description,
+                          ),
+                        ),
                       ],
-                    )),
-              );
-            }),
+                    ),
+                  ),
+                );
+              },
+            ),
           ],
         ),
         actionButtons: [
           const DismissButton(),
-          ReactiveFormConsumer(builder: (context, form, child) {
-            return PrimaryButton(
+          ReactiveFormConsumer(
+            builder: (context, form, child) {
+              return PrimaryButton(
                 text: tr.action_button_study_launch,
                 icon: null,
-                onPressedFuture: () =>
-                    controller.publishStudy(toRegistry: formViewModel.isPublishedToRegistryControl.value)
+                onPressedFuture: () => controller.publishStudy(
+                  toRegistry: formViewModel.isPublishedToRegistryControl.value!,
+                ),
                 //.whenComplete(() => Navigator.maybePop(context)),
-                );
-          }),
+              );
+            },
+          ),
         ],
         maxWidth: 650,
         minWidth: 610,
diff --git a/designer_v2/lib/features/publish/study_publish_dialog_success.dart b/designer_v2/lib/features/publish/study_publish_dialog_success.dart
index a7eac0be1..369099055 100644
--- a/designer_v2/lib/features/publish/study_publish_dialog_success.dart
+++ b/designer_v2/lib/features/publish/study_publish_dialog_success.dart
@@ -24,7 +24,7 @@ class PublishSuccessDialog extends StudyPageWidget {
             leading: Text("\u{1f389}".hardcoded,
                 style: theme.textTheme.displayLarge?.copyWith(
                   fontSize: (theme.textTheme.displayLarge?.fontSize ?? 48.0) * 1.5,
-                )),
+                ),),
             title: tr.study_launch_success_title,
             description: tr.study_launch_success_description,
           ),
@@ -34,7 +34,6 @@ class PublishSuccessDialog extends StudyPageWidget {
       actionButtons: [
         Expanded(
             child: Column(
-          crossAxisAlignment: CrossAxisAlignment.center,
           children: [
             PrimaryButton(
               text: tr.action_button_post_launch_followup,
@@ -50,9 +49,9 @@ class PublishSuccessDialog extends StudyPageWidget {
                 ),
                 onPressed: () => Navigator.maybePop(context),
               ),
-            )
+            ),
           ],
-        ))
+        ),),
       ],
       maxWidth: 450,
     );
diff --git a/designer_v2/lib/features/recruit/enrolled_badge.dart b/designer_v2/lib/features/recruit/enrolled_badge.dart
index c4d38a8cc..b7b361675 100644
--- a/designer_v2/lib/features/recruit/enrolled_badge.dart
+++ b/designer_v2/lib/features/recruit/enrolled_badge.dart
@@ -35,6 +35,6 @@ class EnrolledBadge extends StatelessWidget {
           label: (enrolledCount > 1) ? enrolledCount.toString() : "",
           color: Colors.green,
           labelStyle: TextStyle(fontSize: mutedTextStyle.fontSize! - 2),
-        ));
+        ),);
   }
 }
diff --git a/designer_v2/lib/features/recruit/invite_code_form_controller.dart b/designer_v2/lib/features/recruit/invite_code_form_controller.dart
index 34ac2d93f..51bad1309 100644
--- a/designer_v2/lib/features/recruit/invite_code_form_controller.dart
+++ b/designer_v2/lib/features/recruit/invite_code_form_controller.dart
@@ -1,17 +1,20 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:reactive_forms/reactive_forms.dart';
 import 'package:studyu_core/core.dart';
-import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/domain/study_invite.dart';
 import 'package:studyu_designer_v2/domain/study_schedule.dart';
+import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
 import 'package:studyu_designer_v2/features/study/study_controller.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/repositories/invite_code_repository.dart';
 import 'package:uuid/uuid.dart';
 
 class InviteCodeFormViewModel extends FormViewModel<StudyInvite> {
-  InviteCodeFormViewModel({required this.study, required this.inviteCodeRepository}) : super();
+  InviteCodeFormViewModel({
+    required this.study,
+    required this.inviteCodeRepository,
+  }) : super();
 
   final Study study;
   final IInviteCodeRepository inviteCodeRepository;
@@ -25,35 +28,55 @@ class InviteCodeFormViewModel extends FormViewModel<StudyInvite> {
   // - Form Fields
 
   late final codeControl = FormControl<String>(
-    validators: [Validators.required, Validators.minLength(8), Validators.maxLength(24)],
-    asyncValidators: [Validators.delegateAsync((control) => _uniqueInviteCode(control))],
+    validators: [
+      Validators.required,
+      Validators.minLength(8),
+      Validators.maxLength(24),
+    ],
+    asyncValidators: [
+      Validators.delegateAsync((control) => _uniqueInviteCode(control)),
+    ],
     asyncValidatorsDebounceTime: 200,
     touched: true,
   );
   final codeControlValidationMessages = {
-    ValidationMessage.required: (error) => tr.form_field_code_required,
-    ValidationMessage.minLength: (error) => tr.form_field_code_minlength(error['requiredLength']),
-    ValidationMessage.maxLength: (error) => tr.form_field_code_maxlength(error['requiredLength']),
-    'inviteCodeAlreadyUsed': (error) => tr.form_field_code_alreadyused,
+    ValidationMessage.required: (_) => tr.form_field_code_required,
+    ValidationMessage.minLength: (error) => tr
+        .form_field_code_minlength((error as Map)['requiredLength'] as String),
+    ValidationMessage.maxLength: (error) => tr
+        .form_field_code_maxlength((error as Map)['requiredLength'] as String),
+    'inviteCodeAlreadyUsed': (_) => tr.form_field_code_alreadyused,
   };
 
   final isPreconfiguredScheduleControl = FormControl<bool>(value: false);
-  final preconfiguredScheduleTypeControl = FormControl<PhaseSequence>(value: PhaseSequence.alternating);
+  final preconfiguredScheduleTypeControl =
+      FormControl<PhaseSequence>(value: PhaseSequence.alternating);
   final interventionAControl = FormControl<String>();
   final interventionBControl = FormControl<String>();
 
   List<FormControlOption<String>> get interventionControlOptions =>
-      study.interventions.map((intervention) => FormControlOption(intervention.id, intervention.name!)).toList();
+      study.interventions
+          .map(
+            (intervention) =>
+                FormControlOption(intervention.id, intervention.name!),
+          )
+          .toList();
 
   List<FormControlOption<PhaseSequence>> get preconfiguredScheduleTypeOptions =>
-      [FormControlOption(PhaseSequence.alternating, PhaseSequence.alternating.string)];
+      [
+        FormControlOption(
+          PhaseSequence.alternating,
+          PhaseSequence.alternating.string,
+        ),
+      ];
 
   bool get isPreconfiguredSchedule => isPreconfiguredScheduleControl.value!;
 
-  List<String>? get preconfiguredSchedule =>
-      (isPreconfiguredSchedule && interventionAControl.value != null && interventionBControl.value != null)
-          ? [interventionAControl.value!, interventionBControl.value!]
-          : null;
+  List<String>? get preconfiguredSchedule => (isPreconfiguredSchedule &&
+          interventionAControl.value != null &&
+          interventionBControl.value != null)
+      ? [interventionAControl.value!, interventionBControl.value!]
+      : null;
 
   @override
   late final form = FormGroup({
@@ -70,9 +93,12 @@ class InviteCodeFormViewModel extends FormViewModel<StudyInvite> {
 
   // - Validation
 
-  Future<Map<String, dynamic>?> _uniqueInviteCode(AbstractControl control) async {
-    final code = control.value;
-    final isCodeAlreadyUsed = await inviteCodeRepository.isCodeAlreadyUsed(code);
+  Future<Map<String, dynamic>?> _uniqueInviteCode(
+    AbstractControl control,
+  ) async {
+    final code = control.value as String;
+    final isCodeAlreadyUsed =
+        await inviteCodeRepository.isCodeAlreadyUsed(code);
     final error = {'inviteCodeAlreadyUsed': true};
 
     if (isCodeAlreadyUsed) {
@@ -95,7 +121,11 @@ class InviteCodeFormViewModel extends FormViewModel<StudyInvite> {
 
   @override
   StudyInvite buildFormData() {
-    return StudyInvite(codeControl.value!, study.id, preselectedInterventionIds: preconfiguredSchedule);
+    return StudyInvite(
+      codeControl.value!,
+      study.id,
+      preselectedInterventionIds: preconfiguredSchedule,
+    );
   }
 
   @override
@@ -109,8 +139,10 @@ class InviteCodeFormViewModel extends FormViewModel<StudyInvite> {
   }
 
   @override
-  Future<StudyInvite> save({updateState = true}) {
-    return inviteCodeRepository.save(buildFormData()).then((wrapped) => wrapped!.model);
+  Future<StudyInvite> save({bool updateState = true}) {
+    return inviteCodeRepository
+        .save(buildFormData())
+        .then((wrapped) => wrapped!.model);
   }
 }
 
@@ -118,10 +150,12 @@ class InviteCodeFormViewModel extends FormViewModel<StudyInvite> {
 ///
 /// Note: This is not safe to use in widgets (or other providers) that are built
 /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
-final inviteCodeFormViewModelProvider = Provider.autoDispose.family<InviteCodeFormViewModel, StudyID>((ref, studyId) {
+final inviteCodeFormViewModelProvider = Provider.autoDispose
+    .family<InviteCodeFormViewModel, StudyID>((ref, studyId) {
   print("inviteCodeFormViewModelProvider($studyId");
   // Reactively bind to and obtain [StudyController]'s current study
-  final study = ref.watch(studyControllerProvider(studyId).select((state) => state.study));
+  final study = ref
+      .watch(studyControllerProvider(studyId).select((state) => state.study));
   final inviteCodeRepository = ref.watch(inviteCodeRepositoryProvider(studyId));
 
   return InviteCodeFormViewModel(
diff --git a/designer_v2/lib/features/recruit/invite_code_form_view.dart b/designer_v2/lib/features/recruit/invite_code_form_view.dart
index 20ccea8a3..5fdbfcfad 100644
--- a/designer_v2/lib/features/recruit/invite_code_form_view.dart
+++ b/designer_v2/lib/features/recruit/invite_code_form_view.dart
@@ -34,7 +34,7 @@ class InviteCodeFormView extends FormConsumerWidget {
                             splashRadius: 18.0,
                             onPressed: formViewModel.regenerateCode,
                             icon: const Icon(Icons.refresh_rounded),
-                          )))
+                          ),),)
                   : const InputDecoration(),
             ),
           ),
@@ -45,13 +45,13 @@ class InviteCodeFormView extends FormConsumerWidget {
               formControl: formViewModel.isPreconfiguredScheduleControl,
             ),
           ),
-        ]),
+        ],),
         const SizedBox(height: 4.0),
         TextParagraph(text: tr.form_field_is_preconfigured_schedule_description),
         const SizedBox(height: 24.0),
         FormTableLayout(rows: [
           ..._conditionalInterventionRows(context),
-        ]),
+        ],),
       ],
     );
   }
@@ -72,7 +72,7 @@ class InviteCodeFormView extends FormConsumerWidget {
               .map((option) => DropdownMenuItem(
                     value: option.value,
                     child: Text(option.label),
-                  ))
+                  ),)
               .toList(),
         ),
       ),
@@ -86,7 +86,7 @@ class InviteCodeFormView extends FormConsumerWidget {
               .map((option) => DropdownMenuItem(
                     value: option.value,
                     child: Text(option.label),
-                  ))
+                  ),)
               .toList(),
         ),
       ),
@@ -100,10 +100,10 @@ class InviteCodeFormView extends FormConsumerWidget {
               .map((option) => DropdownMenuItem(
                     value: option.value,
                     child: Text(option.label),
-                  ))
+                  ),)
               .toList(),
         ),
-      )
+      ),
     ];
   }
 }
diff --git a/designer_v2/lib/features/recruit/invite_codes_table.dart b/designer_v2/lib/features/recruit/invite_codes_table.dart
index f4059ef84..46036a6c9 100644
--- a/designer_v2/lib/features/recruit/invite_codes_table.dart
+++ b/designer_v2/lib/features/recruit/invite_codes_table.dart
@@ -37,21 +37,20 @@ class StudyInvitesTable extends StatelessWidget {
         StandardTableColumn(label: '#', columnWidth: const FixedColumnWidth(60)),
         StandardTableColumn(
             label: tr.code_list_header_code,
-            columnWidth: const MaxColumnWidth(FixedColumnWidth(200), FlexColumnWidth(1.6))),
+            columnWidth: const MaxColumnWidth(FixedColumnWidth(200), FlexColumnWidth(1.6)),),
         StandardTableColumn(
-            label: tr.studies_list_header_participants_enrolled, columnWidth: const FixedColumnWidth(100)),
+            label: tr.studies_list_header_participants_enrolled, columnWidth: const FixedColumnWidth(100),),
         StandardTableColumn(
             label: tr.form_field_preconfigured_schedule_intervention_a,
-            columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth(1))),
+            columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth()),),
         StandardTableColumn(
             label: tr.form_field_preconfigured_schedule_intervention_b,
-            columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth(1))),
+            columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth()),),
         //StandardTableColumn(label: '', columnWidth: const FixedColumnWidth(60)),
       ],
       onSelectItem: onSelect,
       buildCellsAt: _buildRow,
       trailingActionsAt: (item, _) => getActions(item),
-      cellSpacing: 10.0,
       rowSpacing: 5.0,
       minRowHeight: 30.0,
     );
@@ -103,7 +102,7 @@ class StudyInvitesTable extends StatelessWidget {
               maxLines: 1,
             ),
             // TODO: support inline actions in standard table widget
-            ActionMenuInline(actions: getInlineActions(item))
+            ActionMenuInline(actions: getInlineActions(item)),
           ],
         ),
       ),
diff --git a/designer_v2/lib/features/recruit/study_recruit_controller.dart b/designer_v2/lib/features/recruit/study_recruit_controller.dart
index 909024b0a..6bb52fdd4 100644
--- a/designer_v2/lib/features/recruit/study_recruit_controller.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_controller.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
@@ -11,7 +12,8 @@ import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/utils/model_action.dart';
 
-class StudyRecruitController extends StudyBaseController<StudyRecruitControllerState>
+class StudyRecruitController
+    extends StudyBaseController<StudyRecruitControllerState>
     implements IModelActionProvider<StudyInvite> {
   StudyRecruitController({
     required super.studyId,
@@ -30,9 +32,10 @@ class StudyRecruitController extends StudyBaseController<StudyRecruitControllerS
 
   StreamSubscription<List<WrappedModel<StudyInvite>>>? _invitesSubscription;
 
-  _subscribeInvites() {
+  void _subscribeInvites() {
     print("StudyRecruitController.subscribe");
-    _invitesSubscription = inviteCodeRepository.watchAll().listen((wrappedModels) {
+    _invitesSubscription =
+        inviteCodeRepository.watchAll().listen((wrappedModels) {
       print("StudyRecruitController.listenUpdate");
       // Update the controller's state when new invites are available in the repository
       final invites = wrappedModels.map((invite) => invite.model).toList();
@@ -81,7 +84,8 @@ class StudyRecruitController extends StudyBaseController<StudyRecruitControllerS
 
 /// Use the [family] modifier to provide a controller parametrized by [StudyID]
 final studyRecruitControllerProvider = StateNotifierProvider.autoDispose
-    .family<StudyRecruitController, StudyRecruitControllerState, StudyID>((ref, studyId) {
+    .family<StudyRecruitController, StudyRecruitControllerState, StudyID>(
+        (ref, studyId) {
   return StudyRecruitController(
     studyId: studyId,
     studyRepository: ref.watch(studyRepositoryProvider),
diff --git a/designer_v2/lib/features/recruit/study_recruit_page.dart b/designer_v2/lib/features/recruit/study_recruit_page.dart
index 85f8497f0..ebe7ea8ae 100644
--- a/designer_v2/lib/features/recruit/study_recruit_page.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_page.dart
@@ -25,7 +25,6 @@ class StudyRecruitScreen extends StudyPageWidget {
     return AsyncValueWidget<List<StudyInvite>?>(
         value: state.invites,
         data: (studyInvites) => Column(
-              mainAxisAlignment: MainAxisAlignment.start,
               crossAxisAlignment: CrossAxisAlignment.start,
               children: <Widget>[
                 _inviteCodesSectionHeader(context, ref),
@@ -46,8 +45,8 @@ class StudyRecruitScreen extends StudyPageWidget {
                   icon: Icons.link_off_rounded,
                   title: tr.code_list_empty_title,
                   description: tr.code_list_empty_description,
-                  button: _newInviteCodeButton(context, ref)),
-            ));
+                  button: _newInviteCodeButton(context, ref),),
+            ),);
   }
 
   Widget _inviteCodesSectionHeader(BuildContext context, WidgetRef ref) {
@@ -63,7 +62,6 @@ class StudyRecruitScreen extends StudyPageWidget {
 
   Widget _newInviteCodeButton(BuildContext context, WidgetRef ref) {
     return PrimaryButton(
-      icon: Icons.add,
       text: tr.action_button_code_new,
       onPressed: () {
         final formViewModel = ref.read(inviteCodeFormViewModelProvider(studyId));
@@ -76,7 +74,7 @@ class StudyRecruitScreen extends StudyPageWidget {
     );
   }
 
-  _onSelectInvite(BuildContext context, WidgetRef ref) {
+  Null Function(StudyInvite invite) _onSelectInvite(BuildContext context, WidgetRef ref) {
     // TODO: refactor to use [RoutingIntent] for sidesheet (so that it can be triggered from controller)
     return (StudyInvite invite) {
       final formViewModel = ref.read(inviteCodeFormViewModelProvider(studyId));
diff --git a/designer_v2/lib/features/study/settings/study_settings_dialog.dart b/designer_v2/lib/features/study/settings/study_settings_dialog.dart
index a1b542984..331507035 100644
--- a/designer_v2/lib/features/study/settings/study_settings_dialog.dart
+++ b/designer_v2/lib/features/study/settings/study_settings_dialog.dart
@@ -21,7 +21,6 @@ class StudySettingsDialog extends StudyPageWidget {
       child: StandardDialog(
         titleText: tr.study_settings,
         body: Column(
-          mainAxisAlignment: MainAxisAlignment.start,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             const SizedBox(height: 12.0),
@@ -40,7 +39,7 @@ class StudySettingsDialog extends StudyPageWidget {
                         child: ReactiveSwitch(
                           formControl: formViewModel.isPublishedToRegistryControl,
                         ),
-                      )),
+                      ),),
                   FormTableRow(
                       label: tr.study_settings_publish_results,
                       labelHelpText: tr.study_settings_publish_results_tooltip,
@@ -49,14 +48,14 @@ class StudySettingsDialog extends StudyPageWidget {
                         child: ReactiveSwitch(
                           formControl: formViewModel.isPublishedToRegistryResultsControl,
                         ),
-                      )),
+                      ),),
                 ],
                 columnWidths: const {
                   0: IntrinsicColumnWidth(),
                   1: FlexColumnWidth(),
                 },
               );
-            }),
+            },),
             const SizedBox(height: 12.0),
           ],
         ),
diff --git a/designer_v2/lib/features/study/settings/study_settings_form_controller.dart b/designer_v2/lib/features/study/settings/study_settings_form_controller.dart
index 923c481bf..e47d2902e 100644
--- a/designer_v2/lib/features/study/settings/study_settings_form_controller.dart
+++ b/designer_v2/lib/features/study/settings/study_settings_form_controller.dart
@@ -1,8 +1,8 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:reactive_forms/reactive_forms.dart';
 import 'package:studyu_core/core.dart';
-import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
+import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
 import 'package:studyu_designer_v2/features/study/study_controller.dart';
 import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/utils/performance.dart';
@@ -22,8 +22,10 @@ class StudySettingsFormViewModel extends FormViewModel<Study> {
   static const defaultPublishedToRegistry = true;
   static const defaultPublishedToRegistryResults = false;
 
-  final FormControl<bool> isPublishedToRegistryControl = FormControl(value: defaultPublishedToRegistry);
-  final FormControl<bool> isPublishedToRegistryResultsControl = FormControl(value: defaultPublishedToRegistryResults);
+  final FormControl<bool> isPublishedToRegistryControl =
+      FormControl(value: defaultPublishedToRegistry);
+  final FormControl<bool> isPublishedToRegistryResultsControl =
+      FormControl(value: defaultPublishedToRegistryResults);
 
   @override
   late final FormGroup form = FormGroup({
@@ -42,12 +44,14 @@ class StudySettingsFormViewModel extends FormViewModel<Study> {
     final study = formData!.exactDuplicate();
 
     study.registryPublished = isPublishedToRegistryControl.value!;
-    study.resultSharing = (isPublishedToRegistryResultsControl.value!) ? ResultSharing.public : ResultSharing.private;
+    study.resultSharing = (isPublishedToRegistryResultsControl.value!)
+        ? ResultSharing.public
+        : ResultSharing.private;
 
     return study;
   }
 
-  keepControlsSynced() {
+  void keepControlsSynced() {
     // sync controls so that results cannot be published without publishing
     // the study design itself
     isPublishedToRegistryControl.valueChanges.listen((value) {
@@ -71,9 +75,10 @@ class StudySettingsFormViewModel extends FormViewModel<Study> {
   @override
   Map<FormMode, String> get titles => throw UnimplementedError(); // unused
 
-  setLaunchDefaults() {
+  void setLaunchDefaults() {
     isPublishedToRegistryControl.value = defaultPublishedToRegistry;
-    isPublishedToRegistryResultsControl.value = defaultPublishedToRegistryResults;
+    isPublishedToRegistryResultsControl.value =
+        defaultPublishedToRegistryResults;
   }
 }
 
@@ -81,8 +86,8 @@ class StudySettingsFormViewModel extends FormViewModel<Study> {
 ///
 /// Note: This is not safe to use in widgets (or other providers) that are built
 /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
-final studySettingsFormViewModelProvider =
-    Provider.autoDispose.family<StudySettingsFormViewModel, StudyID>((ref, studyId) {
+final studySettingsFormViewModelProvider = Provider.autoDispose
+    .family<StudySettingsFormViewModel, StudyID>((ref, studyId) {
   final state = ref.watch(studyControllerProvider(studyId));
   final formViewModel = StudySettingsFormViewModel(
     studyRepository: ref.watch(studyRepositoryProvider),
diff --git a/designer_v2/lib/features/study/study_base_controller.dart b/designer_v2/lib/features/study/study_base_controller.dart
index 30f30c5a0..8bf271f07 100644
--- a/designer_v2/lib/features/study/study_base_controller.dart
+++ b/designer_v2/lib/features/study/study_base_controller.dart
@@ -9,37 +9,41 @@ import 'package:studyu_designer_v2/repositories/api_client.dart';
 import 'package:studyu_designer_v2/repositories/model_repository.dart';
 import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/routing/router_intent.dart';
+import 'package:supabase_flutter/supabase_flutter.dart';
 
-class StudyBaseController<T extends StudyControllerBaseState> extends StateNotifier<T> {
+class StudyBaseController<T extends StudyControllerBaseState>
+    extends StateNotifier<T> {
   StudyBaseController(
     super.state, {
     required this.studyId,
     required this.studyRepository,
+    required this.currentUser,
     required this.router,
-    required currentUser,
   }) {
     subscribeStudy(studyId);
   }
 
   final StudyID studyId;
   final IStudyRepository studyRepository;
+  final User? currentUser;
   final GoRouter router;
 
   StreamSubscription<WrappedModel<Study>>? studySubscription;
 
-  subscribeStudy(StudyID studyId) {
+  void subscribeStudy(StudyID studyId) {
     if (studySubscription != null) {
       studySubscription!.cancel();
     }
-    studySubscription =
-        studyRepository.watch(studyId).listen(onStudySubscriptionUpdate, onError: onStudySubscriptionError);
+    studySubscription = studyRepository
+        .watch(studyId)
+        .listen(onStudySubscriptionUpdate, onError: onStudySubscriptionError);
   }
 
-  onStudySubscriptionUpdate(WrappedModel<Study> wrappedModel) {
+  void onStudySubscriptionUpdate(WrappedModel<Study> wrappedModel) {
     state = state.copyWith(studyWithMetadata: wrappedModel) as T;
   }
 
-  onStudySubscriptionError(Object error) {
+  void onStudySubscriptionError(Object error) {
     // TODO: improve error handling
     if (error is StudyNotFoundException) {
       /* TODO: figure out a way to resolve data dependencies for the current page
@@ -51,7 +55,7 @@ class StudyBaseController<T extends StudyControllerBaseState> extends StateNotif
   }
 
   @override
-  dispose() {
+  void dispose() {
     studySubscription?.cancel();
     super.dispose();
   }
diff --git a/designer_v2/lib/features/study/study_controller.dart b/designer_v2/lib/features/study/study_controller.dart
index 2edbd13dd..22028b3cc 100644
--- a/designer_v2/lib/features/study/study_controller.dart
+++ b/designer_v2/lib/features/study/study_controller.dart
@@ -30,11 +30,12 @@ class StudyController extends StudyBaseController<StudyControllerState> {
   final INotificationService notificationService;
   StreamSubscription<ModelEvent<Study>>? studyEventsSubscription;
 
-  syncStudyStatus() {
+  void syncStudyStatus() {
     if (studyEventsSubscription != null) {
       studyEventsSubscription?.cancel();
     }
-    studyEventsSubscription = studyRepository.watchChanges(studyId).listen((event) {
+    studyEventsSubscription =
+        studyRepository.watchChanges(studyId).listen((event) {
       if (event is IsSaving) {
         state = state.copyWith(
           syncState: const AsyncValue.loading(),
@@ -51,7 +52,7 @@ class StudyController extends StudyBaseController<StudyControllerState> {
   }
 
   @override
-  onStudySubscriptionUpdate(WrappedModel<Study> wrappedModel) {
+  void onStudySubscriptionUpdate(WrappedModel<Study> wrappedModel) {
     super.onStudySubscriptionUpdate(wrappedModel);
     final studyId = wrappedModel.model.id;
     _redirectNewToActualStudyID(studyId);
@@ -59,7 +60,7 @@ class StudyController extends StudyBaseController<StudyControllerState> {
 
   /// Redirect to the study-specific URL to avoid disposing a dirty controller
   /// when building subroutes
-  _redirectNewToActualStudyID(StudyID actualStudyId) {
+  void _redirectNewToActualStudyID(StudyID actualStudyId) {
     if (studyId == Config.newModelId) {
       router.dispatch(RoutingIntents.study(actualStudyId));
     }
@@ -72,11 +73,15 @@ class StudyController extends StudyBaseController<StudyControllerState> {
     }
     // filter out edit action since we are already editing the study
     return withIcons(
-        studyRepository.availableActions(study).where((action) => action.type != StudyActionType.edit).toList(),
-        studyActionIcons);
+      studyRepository
+          .availableActions(study)
+          .where((action) => action.type != StudyActionType.edit)
+          .toList(),
+      studyActionIcons,
+    );
   }
 
-  Future publishStudy({toRegistry = false}) {
+  Future publishStudy({bool toRegistry = false}) {
     final study = state.study.value!;
     study.registryPublished = toRegistry;
     return studyRepository.launch(study);
@@ -95,15 +100,15 @@ class StudyController extends StudyBaseController<StudyControllerState> {
   }
 
   @override
-  dispose() {
+  void dispose() {
     studyEventsSubscription?.cancel();
     super.dispose();
   }
 }
 
 /// Use the [family] modifier to provide a controller parametrized by [StudyID]
-final studyControllerProvider =
-    StateNotifierProvider.autoDispose.family<StudyController, StudyControllerState, StudyID>((ref, studyId) {
+final studyControllerProvider = StateNotifierProvider.autoDispose
+    .family<StudyController, StudyControllerState, StudyID>((ref, studyId) {
   print("studyControllerProvider($studyId)");
   final controller = StudyController(
     studyId: studyId,
diff --git a/designer_v2/lib/features/study/study_controller_state.dart b/designer_v2/lib/features/study/study_controller_state.dart
index 3c41c6566..91254cbf7 100644
--- a/designer_v2/lib/features/study/study_controller_state.dart
+++ b/designer_v2/lib/features/study/study_controller_state.dart
@@ -54,7 +54,7 @@ class StudyControllerState extends StudyControllerBaseState implements IStudyApp
       (study.value != null && (study.value!.canEdit(super.currentUser) || study.value!.publishedToRegistryResults));
 
   @override
-  get isSettingsEnabled => study.value != null && study.value!.canChangeSettings(super.currentUser!);
+  bool get isSettingsEnabled => study.value != null && study.value!.canChangeSettings(super.currentUser!);
 
   // - IStudyAppBarViewModel
 
diff --git a/designer_v2/lib/features/study/study_navbar.dart b/designer_v2/lib/features/study/study_navbar.dart
index 5cd8b7c5a..804628a7b 100644
--- a/designer_v2/lib/features/study/study_navbar.dart
+++ b/designer_v2/lib/features/study/study_navbar.dart
@@ -13,39 +13,40 @@ abstract class IStudyNavViewModel {
 }
 
 class StudyNav {
-  static tabs(StudyID studyId, IStudyNavViewModel viewModel) => <NavbarTab>[
+  static List<NavbarTab> tabs(StudyID studyId, IStudyNavViewModel viewModel) =>
+      <NavbarTab>[
         edit(studyId, enabled: viewModel.isEditTabEnabled),
         test(studyId, enabled: viewModel.isTestTabEnabled),
         recruit(studyId, enabled: viewModel.isRecruitTabEnabled),
         monitor(studyId, enabled: viewModel.isMonitorTabEnabled),
-        analyze(studyId, enabled: viewModel.isAnalyzeTabEnabled)
+        analyze(studyId, enabled: viewModel.isAnalyzeTabEnabled),
       ];
 
-  static edit(studyId, {enabled = true}) => NavbarTab(
+  static NavbarTab edit(StudyID studyId, {bool enabled = true}) => NavbarTab(
         index: 0,
         title: tr.navlink_study_design,
         intent: RoutingIntents.studyEdit(studyId),
         enabled: enabled,
       );
-  static test(studyId, {enabled = true}) => NavbarTab(
+  static NavbarTab test(StudyID studyId, {bool enabled = true}) => NavbarTab(
         index: 1,
         title: tr.navlink_study_test,
         intent: RoutingIntents.studyTest(studyId),
         enabled: enabled,
       );
-  static recruit(studyId, {enabled = true}) => NavbarTab(
+  static NavbarTab recruit(StudyID studyId, {bool enabled = true}) => NavbarTab(
         index: 2,
         title: tr.navlink_study_recruit,
         intent: RoutingIntents.studyRecruit(studyId),
         enabled: enabled,
       );
-  static monitor(studyId, {enabled = true}) => NavbarTab(
+  static NavbarTab monitor(StudyID studyId, {bool enabled = true}) => NavbarTab(
         index: 3,
         title: tr.navlink_study_monitor,
         intent: RoutingIntents.studyMonitor(studyId),
         enabled: enabled,
       );
-  static analyze(studyId, {enabled = true}) => NavbarTab(
+  static NavbarTab analyze(StudyID studyId, {bool enabled = true}) => NavbarTab(
         index: 4,
         title: tr.navlink_study_analyze,
         intent: RoutingIntents.studyAnalyze(studyId),
@@ -54,7 +55,7 @@ class StudyNav {
 }
 
 class StudyDesignNav {
-  static tabs(studyId) => <NavbarTab>[
+  static List<NavbarTab> tabs(StudyID studyId) => <NavbarTab>[
         info(studyId),
         enrollment(studyId),
         interventions(studyId),
@@ -62,13 +63,27 @@ class StudyDesignNav {
         reports(studyId),
       ];
 
-  static info(studyId) =>
-      NavbarTab(index: 0, title: tr.navlink_study_design_info, intent: RoutingIntents.studyEditInfo(studyId));
-  static enrollment(studyId) => NavbarTab(
-      index: 1, title: tr.navlink_study_design_enrollment, intent: RoutingIntents.studyEditEnrollment(studyId));
-  static interventions(studyId) => NavbarTab(
-      index: 2, title: tr.navlink_study_design_interventions, intent: RoutingIntents.studyEditInterventions(studyId));
-  static measurements(studyId) => NavbarTab(
-      index: 3, title: tr.navlink_study_design_measurements, intent: RoutingIntents.studyEditMeasurements(studyId));
-  static reports(studyId) => NavbarTab(index: 4, title: "Reports", intent: RoutingIntents.studyEditReports(studyId));
+  static NavbarTab info(StudyID studyId) => NavbarTab(
+      index: 0,
+      title: tr.navlink_study_design_info,
+      intent: RoutingIntents.studyEditInfo(studyId),);
+  static NavbarTab enrollment(StudyID studyId) => NavbarTab(
+        index: 1,
+        title: tr.navlink_study_design_enrollment,
+        intent: RoutingIntents.studyEditEnrollment(studyId),
+      );
+  static NavbarTab interventions(StudyID studyId) => NavbarTab(
+        index: 2,
+        title: tr.navlink_study_design_interventions,
+        intent: RoutingIntents.studyEditInterventions(studyId),
+      );
+  static NavbarTab measurements(StudyID studyId) => NavbarTab(
+        index: 3,
+        title: tr.navlink_study_design_measurements,
+        intent: RoutingIntents.studyEditMeasurements(studyId),
+      );
+  static NavbarTab reports(StudyID studyId) => NavbarTab(
+      index: 4,
+      title: "Reports",
+      intent: RoutingIntents.studyEditReports(studyId),);
 }
diff --git a/designer_v2/lib/features/study/study_participation_badge.dart b/designer_v2/lib/features/study/study_participation_badge.dart
index 1fba1655d..91ab92260 100644
--- a/designer_v2/lib/features/study/study_participation_badge.dart
+++ b/designer_v2/lib/features/study/study_participation_badge.dart
@@ -9,7 +9,7 @@ class StudyParticipationBadge extends StatelessWidget {
       this.type = studybadge.BadgeType.plain,
       this.showPrefixIcon = true,
       this.center = true,
-      super.key});
+      super.key,});
 
   final Participation participation;
   final studybadge.BadgeType type;
@@ -39,7 +39,7 @@ class StudyParticipationBadge extends StatelessWidget {
             color: colorScheme.primary.withOpacity(0.8),
             type: type,
             icon: showPrefixIcon ? Icons.people_rounded : null,
-            padding: const EdgeInsets.symmetric(horizontal: 4.0, vertical: 4.0)));
+            padding: const EdgeInsets.symmetric(horizontal: 4.0, vertical: 4.0),),);
       case Participation.invite:
         return inTooltip(studybadge.Badge(
           label: participation.whoShort,
@@ -48,7 +48,7 @@ class StudyParticipationBadge extends StatelessWidget {
           type: type,
           icon: showPrefixIcon ? Icons.lock_rounded : null,
           padding: const EdgeInsets.symmetric(horizontal: 4.0, vertical: 4.0),
-        ));
+        ),);
     }
   }
 }
diff --git a/designer_v2/lib/features/study/study_scaffold.dart b/designer_v2/lib/features/study/study_scaffold.dart
index 0a12c7c03..11a8c3eb7 100644
--- a/designer_v2/lib/features/study/study_scaffold.dart
+++ b/designer_v2/lib/features/study/study_scaffold.dart
@@ -21,7 +21,8 @@ import 'package:studyu_designer_v2/features/study/study_status_badge.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/theme.dart';
 
-abstract class IStudyAppBarViewModel implements IStudyStatusBadgeViewModel, IStudyNavViewModel {
+abstract class IStudyAppBarViewModel
+    implements IStudyStatusBadgeViewModel, IStudyNavViewModel {
   bool get isSyncIndicatorVisible;
   bool get isStatusBadgeVisible;
   bool get isPublishVisible;
@@ -87,24 +88,26 @@ class _StudyScaffoldState extends ConsumerState<StudyScaffold> {
         bottom: (widget.tabsSubnav != null)
             ? PreferredSize(
                 preferredSize: Size(double.infinity, widget.appbarSubnavHeight),
-                child: Container(
-                    //color: theme.colorScheme.primary.withOpacity(0.05),
-                    color: theme.scaffoldBackgroundColor.withOpacity(0.15),
-                    child: Row(
-                      children: [
-                        const SizedBox(width: 35.0),
-                        Container(
-                          constraints: const BoxConstraints(maxWidth: 750),
-                          child: TabbedNavbar(
-                            tabs: widget.tabsSubnav!,
-                            selectedTab: widget.selectedTabSubnav,
-                            height: widget.appbarSubnavHeight,
-                            indicator: const BoxDecoration(),
-                            isScrollable: true,
-                          ),
-                        )
-                      ],
-                    )))
+                child: ColoredBox(
+                  //color: theme.colorScheme.primary.withOpacity(0.05),
+                  color: theme.scaffoldBackgroundColor.withOpacity(0.15),
+                  child: Row(
+                    children: [
+                      const SizedBox(width: 35.0),
+                      Container(
+                        constraints: const BoxConstraints(maxWidth: 750),
+                        child: TabbedNavbar(
+                          tabs: widget.tabsSubnav!,
+                          selectedTab: widget.selectedTabSubnav,
+                          height: widget.appbarSubnavHeight,
+                          indicator: const BoxDecoration(),
+                          isScrollable: true,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              )
             : null,
         toolbarHeight: widget.appbarHeight,
         title: Row(
@@ -133,16 +136,20 @@ class _StudyScaffoldState extends ConsumerState<StudyScaffold> {
                         softWrap: false,
                       ),
                     ),
-                    (state.isSyncIndicatorVisible) ? const SizedBox(width: 8.0) : const SizedBox.shrink(),
-                    (state.isSyncIndicatorVisible)
-                        ? IntrinsicWidth(
-                            child: SyncIndicator(
-                              state: state.syncState,
-                              isDirty: state.isDirty,
-                              lastSynced: state.lastSynced,
-                            ),
-                          )
-                        : const SizedBox.shrink(),
+                    if (state.isSyncIndicatorVisible)
+                      const SizedBox(width: 8.0)
+                    else
+                      const SizedBox.shrink(),
+                    if (state.isSyncIndicatorVisible)
+                      IntrinsicWidth(
+                        child: SyncIndicator(
+                          state: state.syncState,
+                          isDirty: state.isDirty,
+                          lastSynced: state.lastSynced,
+                        ),
+                      )
+                    else
+                      const SizedBox.shrink(),
                   ],
                 ),
                 loading: () => Container(),
@@ -172,14 +179,17 @@ class _StudyScaffoldState extends ConsumerState<StudyScaffold> {
                     children: [
                       ...withSpacing(
                         [
-                          (state.isStatusBadgeVisible)
-                              ? StudyStatusBadge(
-                                  status: state.studyStatus,
-                                  participation: state.studyParticipation,
-                                  showPrefixIcon: true,
-                                )
-                              : const SizedBox.shrink(),
-                          (state.isStatusBadgeVisible) ? const SizedBox(width: 12.0) : const SizedBox.shrink(),
+                          if (state.isStatusBadgeVisible)
+                            StudyStatusBadge(
+                              status: state.studyStatus,
+                              participation: state.studyParticipation,
+                            )
+                          else
+                            const SizedBox.shrink(),
+                          if (state.isStatusBadgeVisible)
+                            const SizedBox(width: 12.0)
+                          else
+                            const SizedBox.shrink(),
                           ...actionButtons(context),
                         ],
                         spacing: widget.actionsSpacing,
@@ -210,40 +220,46 @@ class _StudyScaffoldState extends ConsumerState<StudyScaffold> {
   /// Note: This is not save to call until [StudyControllerState.study] is
   /// fully loaded (i.e. use inside of [AsyncValueWidget])
   List<Widget> actionButtons(BuildContext context) {
-    List<Widget> actionButtons = [];
+    final List<Widget> actionButtons = [];
 
     final theme = Theme.of(context);
-    final controller = ref.watch(studyControllerProvider(widget.studyId).notifier);
+    final controller =
+        ref.watch(studyControllerProvider(widget.studyId).notifier);
     final state = ref.watch(studyControllerProvider(widget.studyId));
 
     if (state.isPublishVisible) {
-      final formViewModel = ref.watch(studyPublishValidatorProvider(widget.studyId));
+      final formViewModel =
+          ref.watch(studyPublishValidatorProvider(widget.studyId));
       final publishButton = ReactiveForm(
         formGroup: formViewModel.form,
         child: ReactiveFormConsumer(
-            // enable re-rendering based on form validation status
-            builder: (context, form, child) {
-          return PrimaryButton(
-            text: tr.action_button_study_launch,
-            tooltipDisabled: "${tr.form_invalid_prompt}\n\n${form.validationErrorSummary}",
-            icon: null,
-            enabled: formViewModel.isValid,
-            onPressed: () => showPublishDialog(context, widget.studyId),
-          );
-        }),
+          // enable re-rendering based on form validation status
+          builder: (context, form, child) {
+            return PrimaryButton(
+              text: tr.action_button_study_launch,
+              tooltipDisabled:
+                  "${tr.form_invalid_prompt}\n\n${form.validationErrorSummary}",
+              icon: null,
+              enabled: formViewModel.isValid,
+              onPressed: () => showPublishDialog(context, widget.studyId),
+            );
+          },
+        ),
       );
       actionButtons.add(publishButton);
       actionButtons.add(const SizedBox(width: 12.0)); // padding
     }
 
     if (state.isSettingsEnabled) {
-      actionButtons.add(IconButton(
-        onPressed: controller.onSettingsPressed,
-        icon: Icon(Icons.settings_rounded, size: theme.iconTheme.size),
-        tooltip: tr.study_settings,
-        color: theme.iconTheme.color?.faded(0.8),
-        splashRadius: ThemeConfig.iconSplashRadius(theme),
-      ));
+      actionButtons.add(
+        IconButton(
+          onPressed: controller.onSettingsPressed,
+          icon: Icon(Icons.settings_rounded, size: theme.iconTheme.size),
+          tooltip: tr.study_settings,
+          color: theme.iconTheme.color?.faded(0.8),
+          splashRadius: ThemeConfig.iconSplashRadius(theme),
+        ),
+      );
     }
 
     actionButtons.add(
diff --git a/designer_v2/lib/features/study/study_status_badge.dart b/designer_v2/lib/features/study/study_status_badge.dart
index 7d0abca49..36d346bcd 100644
--- a/designer_v2/lib/features/study/study_status_badge.dart
+++ b/designer_v2/lib/features/study/study_status_badge.dart
@@ -16,7 +16,7 @@ class StudyStatusBadge extends StatelessWidget {
       this.type = studybadge.BadgeType.outlineFill,
       this.showPrefixIcon = true,
       this.showTooltip = true,
-      super.key});
+      super.key,});
 
   final Participation? participation;
   final StudyStatus? status;
@@ -29,7 +29,7 @@ class StudyStatusBadge extends StatelessWidget {
     final colorScheme = Theme.of(context).colorScheme;
     final prefixIcon = showPrefixIcon ? Icons.circle_rounded : null;
 
-    final tooltipMessage = ('${status?.description ?? ''}\n${participation?.description ?? ''}').trim();
+    final tooltipMessage = '${status?.description ?? ''}\n${participation?.description ?? ''}'.trim();
 
     Widget inTooltip(Widget child) {
       if (tooltipMessage.isNotEmpty && showTooltip) {
@@ -48,21 +48,21 @@ class StudyStatusBadge extends StatelessWidget {
           color: colorScheme.secondary.withOpacity(0.75),
           type: type,
           icon: prefixIcon,
-        ));
+        ),);
       case StudyStatus.closed:
         return inTooltip(studybadge.Badge(
           label: status!.string,
           color: colorScheme.primaryContainer,
           type: type,
           icon: prefixIcon,
-        ));
+        ),);
       case StudyStatus.running:
         return inTooltip(studybadge.Badge(
           label: status!.string,
           color: Colors.green,
           type: type,
           icon: prefixIcon,
-        ));
+        ),);
       default:
         return const SizedBox.shrink();
     }
diff --git a/designer_v2/lib/features/study/study_test_controller.dart b/designer_v2/lib/features/study/study_test_controller.dart
index 71d1cb81b..811670165 100644
--- a/designer_v2/lib/features/study/study_test_controller.dart
+++ b/designer_v2/lib/features/study/study_test_controller.dart
@@ -21,7 +21,7 @@ class StudyTestController extends StudyBaseController<StudyTestControllerState>
   }) : super(StudyTestControllerState(
           currentUser: currentUser,
           languageCode: languageCode,
-        )) {
+        ),) {
     state = state.copyWith(serializedSession: authRepository.serializedSession ?? '');
   }
 
diff --git a/designer_v2/lib/features/study/study_test_frame.dart b/designer_v2/lib/features/study/study_test_frame.dart
index 1c3c04a22..83fd43c33 100644
--- a/designer_v2/lib/features/study/study_test_frame.dart
+++ b/designer_v2/lib/features/study/study_test_frame.dart
@@ -20,10 +20,11 @@ class PreviewFrame extends ConsumerStatefulWidget {
     this.route,
     super.key,
   }) : assert(
-            (routeArgs != null && route == null) ||
-                (routeArgs == null && route != null) ||
-                (routeArgs == null && route == null),
-            "Must not specify both routeArgs and route");
+          (routeArgs != null && route == null) ||
+              (routeArgs == null && route != null) ||
+              (routeArgs == null && route == null),
+          "Must not specify both routeArgs and route",
+        );
 
   final StudyID studyId;
   final StudyFormRouteArgs? routeArgs;
@@ -48,18 +49,20 @@ class _PreviewFrameState extends ConsumerState<PreviewFrame> {
     super.didUpdateWidget(oldWidget);
   }
 
-  _subscribeStudyChanges() {
-    final formViewModelCurrent = ref.read(studyFormViewModelProvider(widget.studyId));
+  void _subscribeStudyChanges() {
+    final formViewModelCurrent =
+        ref.read(studyFormViewModelProvider(widget.studyId));
 
     formViewModelCurrent.form.valueChanges.listen((event) {
       if (frameController != null) {
-        final formJson = jsonEncode(formViewModelCurrent.buildFormData().toJson());
+        final formJson =
+            jsonEncode(formViewModelCurrent.buildFormData().toJson());
         frameController!.send(formJson);
       }
     });
   }
 
-  _updatePreviewRoute() {
+  void _updatePreviewRoute() {
     if (widget.route != null) {
       frameController!.generateUrl(route: widget.route);
     } else {
@@ -67,11 +70,17 @@ class _PreviewFrameState extends ConsumerState<PreviewFrame> {
 
       if (widget.routeArgs is InterventionFormRouteArgs) {
         route = 'intervention';
-        frameController!
-            .generateUrl(route: route, extra: (widget.routeArgs as InterventionFormRouteArgs).interventionId);
+        frameController!.generateUrl(
+          route: route,
+          extra:
+              (widget.routeArgs! as InterventionFormRouteArgs).interventionId,
+        );
       } else if (widget.routeArgs is MeasurementFormRouteArgs) {
         route = 'observation';
-        frameController!.generateUrl(route: route, extra: (widget.routeArgs as MeasurementFormRouteArgs).measurementId);
+        frameController!.generateUrl(
+          route: route,
+          extra: (widget.routeArgs! as MeasurementFormRouteArgs).measurementId,
+        );
       } else {
         frameController!.generateUrl();
       }
@@ -84,46 +93,51 @@ class _PreviewFrameState extends ConsumerState<PreviewFrame> {
     final formViewModel = ref.watch(studyTestValidatorProvider(widget.studyId));
 
     // Rebuild iframe component & url
-    frameController = ref.read(studyTestPlatformControllerProvider(widget.studyId));
+    frameController =
+        ref.read(studyTestPlatformControllerProvider(widget.studyId));
     _updatePreviewRoute();
     frameController!.activate();
     frameController!.listen();
 
-    return LayoutBuilder(builder: (context, constraints) {
-      if (constraints.maxWidth < PhoneContainer.defaultWidth) {
-        // Not enough space to render app preview
-        return Container();
-      }
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        if (constraints.maxWidth < PhoneContainer.defaultWidth) {
+          // Not enough space to render app preview
+          return Container();
+        }
 
-      return Stack(children: <Widget>[
-        Row(
-          mainAxisAlignment: MainAxisAlignment.center,
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            ReactiveForm(
-              formGroup: formViewModel.form,
-              child: ReactiveFormConsumer(
-                builder: (context, form, child) {
-                  if (formViewModel.form.hasErrors) {
-                    return const DisabledFrame();
-                  }
-                  return Column(
-                    children: [
-                      frameController!.frameWidget,
-                      const SizedBox(height: 8.0),
-                      FrameControlsWidget(
-                        onRefresh: () => frameController!.refresh(cmd: "reset"),
-                        onOpenNewTab: () => frameController!.openNewPage(),
-                        enabled: state.canTest,
-                      )
-                    ],
-                  );
-                },
-              ),
+        return Stack(
+          children: <Widget>[
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                ReactiveForm(
+                  formGroup: formViewModel.form,
+                  child: ReactiveFormConsumer(
+                    builder: (context, form, child) {
+                      if (formViewModel.form.hasErrors) {
+                        return const DisabledFrame();
+                      }
+                      return Column(
+                        children: [
+                          frameController!.frameWidget,
+                          const SizedBox(height: 8.0),
+                          FrameControlsWidget(
+                            onRefresh: () =>
+                                frameController!.refresh(cmd: "reset"),
+                            onOpenNewTab: () => frameController!.openNewPage(),
+                            enabled: state.canTest,
+                          ),
+                        ],
+                      );
+                    },
+                  ),
+                ),
+              ],
             ),
           ],
-        ),
-      ]);
-    });
+        );
+      },
+    );
   }
 }
diff --git a/designer_v2/lib/features/study/study_test_frame_controllers.dart b/designer_v2/lib/features/study/study_test_frame_controllers.dart
index 3cb395872..b453dae19 100644
--- a/designer_v2/lib/features/study/study_test_frame_controllers.dart
+++ b/designer_v2/lib/features/study/study_test_frame_controllers.dart
@@ -50,7 +50,7 @@ class WebController extends PlatformController {
   }
 
   @override
-  activate() {
+  void activate() {
     if (baseSrc == '') return;
     final key = UniqueKey();
     // print("Register view with: $previewSrc");
@@ -69,7 +69,7 @@ class WebController extends PlatformController {
   }
 
   @override
-  generateUrl({String? route, String? extra, String? cmd, String? data}) {
+  void generateUrl({String? route, String? extra, String? cmd, String? data}) {
     routeInformation = RouteInformation(route, extra, cmd, data);
     if (baseSrc == '') {
       previewSrc = '';
@@ -129,7 +129,7 @@ class WebController extends PlatformController {
   @override
   void listen() {
     html.window.onMessage.listen((event) {
-      var data = event.data;
+      final data = event.data;
       if (data == 'routeFinished') {
         print("Designer: Route finished");
         refresh();
diff --git a/designer_v2/lib/features/study/study_test_frame_views.dart b/designer_v2/lib/features/study/study_test_frame_views.dart
index f89e0dc67..98e7677b0 100644
--- a/designer_v2/lib/features/study/study_test_frame_views.dart
+++ b/designer_v2/lib/features/study/study_test_frame_views.dart
@@ -62,7 +62,7 @@ class PhoneContainer extends StatelessWidget {
       this.borderWidth = 8.0,
       this.borderRadius = 25.0,
       this.innerContentBackgroundColor = Colors.white,
-      super.key});
+      super.key,});
 
   final double width;
   final double height;
@@ -103,8 +103,7 @@ class PhoneContainer extends StatelessWidget {
                 child: Container(
                   decoration: BoxDecoration(
                       borderRadius: BorderRadius.all(Radius.circular(borderRadius)),
-                      border: Border.all(width: borderWidth, color: Colors.white),
-                      shape: BoxShape.rectangle),
+                      border: Border.all(width: borderWidth, color: Colors.white),),
                 ),
               ),
             ],
@@ -112,8 +111,7 @@ class PhoneContainer extends StatelessWidget {
           Container(
             decoration: BoxDecoration(
                 borderRadius: BorderRadius.all(Radius.circular(borderRadius)),
-                border: Border.all(width: borderWidth, color: borderColor),
-                shape: BoxShape.rectangle),
+                border: Border.all(width: borderWidth, color: borderColor),),
           ),
         ],
       ),
@@ -156,7 +154,7 @@ Widget? previewBanner(WidgetRef ref, String studyId) {
     return null;
   }
   return BannerBox(
-    body: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [
+    body: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
       TextParagraph(
         text: tr.banner_study_preview_unavailable,
         style: const TextStyle(fontWeight: FontWeight.bold),
@@ -167,8 +165,8 @@ Widget? previewBanner(WidgetRef ref, String studyId) {
             return TextParagraph(
               text: form.validationErrorSummary,
             );
-          })),
-    ]),
+          },),),
+    ],),
     style: BannerStyle.warning,
   );
 }
diff --git a/designer_v2/lib/features/study/study_test_page.dart b/designer_v2/lib/features/study/study_test_page.dart
index 802e33ca2..5834175ca 100644
--- a/designer_v2/lib/features/study/study_test_page.dart
+++ b/designer_v2/lib/features/study/study_test_page.dart
@@ -31,7 +31,8 @@ class StudyTestScreen extends StudyPageWidget {
     final formViewModel = ref.watch(studyTestValidatorProvider(studyId));
     final canTest = !formViewModel.form.hasErrors;
 
-    final frameController = ref.watch(studyTestPlatformControllerProvider(studyId));
+    final frameController =
+        ref.watch(studyTestPlatformControllerProvider(studyId));
     frameController.generateUrl();
     frameController.activate();
     load().then((hasHelped) => !hasHelped ? showHelp(ref, context) : null);
@@ -46,13 +47,15 @@ class StudyTestScreen extends StudyPageWidget {
               const SizedBox(height: 6.0),
               Text(tr.study_test_page_description),
               const SizedBox(height: 12.0),
-              Row(children: [
-                TextButton.icon(
-                  icon: const Icon(Icons.help),
-                  label: Text(tr.navlink_study_test_help),
-                  onPressed: () => showHelp(ref, context),
-                ),
-              ]),
+              Row(
+                children: [
+                  TextButton.icon(
+                    icon: const Icon(Icons.help),
+                    label: Text(tr.navlink_study_test_help),
+                    onPressed: () => showHelp(ref, context),
+                  ),
+                ],
+              ),
               const SizedBox(height: 24.0),
               Text(tr.study_test_app_nav_title),
               const SizedBox(height: 12.0),
@@ -71,7 +74,9 @@ class StudyTestScreen extends StudyPageWidget {
                 onPressed: (!canTest)
                     ? null
                     : () {
-                        frameController.navigate(route: TestAppRoutes.eligibility);
+                        frameController.navigate(
+                          route: TestAppRoutes.eligibility,
+                        );
                       },
               ),
               TextButton.icon(
@@ -80,7 +85,9 @@ class StudyTestScreen extends StudyPageWidget {
                 onPressed: (!canTest)
                     ? null
                     : () {
-                        frameController.navigate(route: TestAppRoutes.intervention);
+                        frameController.navigate(
+                          route: TestAppRoutes.intervention,
+                        );
                       },
               ),
               TextButton.icon(
@@ -107,7 +114,9 @@ class StudyTestScreen extends StudyPageWidget {
                 onPressed: (!canTest)
                     ? null
                     : () {
-                        frameController.navigate(route: TestAppRoutes.dashboard);
+                        frameController.navigate(
+                          route: TestAppRoutes.dashboard,
+                        );
                       },
               ),
             ],
@@ -115,12 +124,11 @@ class StudyTestScreen extends StudyPageWidget {
         ),
         Column(
           mainAxisAlignment: MainAxisAlignment.center,
-          crossAxisAlignment: CrossAxisAlignment.center,
           children: [
             Padding(
               padding: const EdgeInsets.symmetric(horizontal: 12.0),
               child: PreviewFrame(studyId, route: previewRoute),
-            )
+            ),
           ],
         ),
         Flexible(
@@ -137,26 +145,32 @@ class StudyTestScreen extends StudyPageWidget {
       return null;
     }
     return BannerBox(
-      body: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [
-        TextParagraph(
-          text: tr.banner_study_test_unavailable,
-          style: const TextStyle(fontWeight: FontWeight.bold),
-        ),
-        ReactiveForm(
+      body: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          TextParagraph(
+            text: tr.banner_study_test_unavailable,
+            style: const TextStyle(fontWeight: FontWeight.bold),
+          ),
+          ReactiveForm(
             formGroup: formViewModel.form,
-            child: ReactiveFormConsumer(builder: (context, form, child) {
-              return TextParagraph(
-                text: form.validationErrorSummary,
-              );
-            })),
-      ]),
+            child: ReactiveFormConsumer(
+              builder: (context, form, child) {
+                return TextParagraph(
+                  text: form.validationErrorSummary,
+                );
+              },
+            ),
+          ),
+        ],
+      ),
       style: BannerStyle.warning,
     );
   }
 
   Future<bool> load() async {
     try {
-      bool? visited = await SecureStorage.readBool('testScreenVisited');
+      final bool? visited = await SecureStorage.readBool('testScreenVisited');
       if (visited != null) {
         return visited;
       }
@@ -170,67 +184,70 @@ class StudyTestScreen extends StudyPageWidget {
     SecureStorage.write('testScreenVisited', "true");
   }
 
-  showHelp(WidgetRef ref, BuildContext context) {
+  void showHelp(WidgetRef ref, BuildContext context) {
     final theme = Theme.of(context);
-    Widget previewHelp = PointerInterceptor(
-        child: StandardDialog(
-      titleText: tr.dialog_study_test_help_title,
-      body: Column(
-        mainAxisAlignment: MainAxisAlignment.start,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          TextParagraph(text: tr.dialog_study_test_help_description),
-          Align(
+    final Widget previewHelp = PointerInterceptor(
+      child: StandardDialog(
+        titleText: tr.dialog_study_test_help_title,
+        body: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            TextParagraph(text: tr.dialog_study_test_help_description),
+            Align(
               alignment: Alignment.centerLeft,
               child: Text(
                 "\n${tr.dialog_study_test_section_tips}\n",
                 style: theme.textTheme.headlineSmall,
-              )),
-          Column(
-            mainAxisAlignment: MainAxisAlignment.start,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              TextParagraph(text: tr.dialog_study_test_section_tips_text),
-              Wrap(
-                alignment: WrapAlignment.start,
-                crossAxisAlignment: WrapCrossAlignment.center,
-                children: [
-                  TextParagraph(text: tr.dialog_study_test_download_url_intro),
-                  Hyperlink(
-                    text: tr.dialog_study_test_download_url_text,
-                    url: tr.dialog_study_test_download_url,
-                  ),
-                  TextParagraph(text: tr.dialog_study_test_download_url_outro),
-                ],
               ),
-            ],
-          ),
-          Align(
-            alignment: Alignment.centerLeft,
-            child: Text(
-              "\n${tr.dialog_study_test_section_notice}\n",
-              style: theme.textTheme.headlineSmall,
             ),
-          ),
-          Align(
-            alignment: Alignment.centerLeft,
-            child: TextParagraph(
-              text: tr.dialog_study_test_section_notice_text,
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                TextParagraph(text: tr.dialog_study_test_section_tips_text),
+                Wrap(
+                  crossAxisAlignment: WrapCrossAlignment.center,
+                  children: [
+                    TextParagraph(
+                      text: tr.dialog_study_test_download_url_intro,
+                    ),
+                    Hyperlink(
+                      text: tr.dialog_study_test_download_url_text,
+                      url: tr.dialog_study_test_download_url,
+                    ),
+                    TextParagraph(
+                      text: tr.dialog_study_test_download_url_outro,
+                    ),
+                  ],
+                ),
+              ],
+            ),
+            Align(
+              alignment: Alignment.centerLeft,
+              child: Text(
+                "\n${tr.dialog_study_test_section_notice}\n",
+                style: theme.textTheme.headlineSmall,
+              ),
+            ),
+            Align(
+              alignment: Alignment.centerLeft,
+              child: TextParagraph(
+                text: tr.dialog_study_test_section_notice_text,
+              ),
             ),
+          ],
+        ),
+        actionButtons: [
+          PrimaryButton(
+            text: tr.dialog_action_study_test_start,
+            icon: null,
+            onPressed: () => Navigator.pop(context),
           ),
         ],
+        maxWidth: 650,
+        minWidth: 550,
       ),
-      actionButtons: [
-        PrimaryButton(
-          text: tr.dialog_action_study_test_start,
-          icon: null,
-          onPressed: () => Navigator.pop(context),
-        )
-      ],
-      maxWidth: 650,
-      minWidth: 550,
-    ));
+    );
     showDialog(
       context: context,
       barrierColor: ThemeConfig.modalBarrierColor(theme),
diff --git a/designer_v2/lib/localization/app_translation.dart b/designer_v2/lib/localization/app_translation.dart
index 6e3de4376..d02691918 100644
--- a/designer_v2/lib/localization/app_translation.dart
+++ b/designer_v2/lib/localization/app_translation.dart
@@ -4,10 +4,10 @@ import 'package:studyu_designer_v2/localization/locale_providers.dart';
 
 // Use global variable tr for translation
 AppLocalizations get tr => _tr!;
-AppLocalizations? _tr;
+late AppLocalizations? _tr;
 
 class AppTranslation {
-  static init(WidgetRef ref) async {
+  static Future<void> init(WidgetRef ref) async {
     // Loads the currently selected locale from localeProvider and sets the localization
     _tr = await AppLocalizations.delegate.load(ref.watch(localeProvider));
   }
diff --git a/designer_v2/lib/localization/language_picker.dart b/designer_v2/lib/localization/language_picker.dart
index a4db6910f..f6c0c181a 100644
--- a/designer_v2/lib/localization/language_picker.dart
+++ b/designer_v2/lib/localization/language_picker.dart
@@ -50,7 +50,7 @@ class _LanguagePickerState extends ConsumerState<LanguagePicker> {
                 icon: Icon(Icons.language, color: widget.iconColor),
                 onChanged: (locale) => controller.setLocale(locale.value!),
               ),
-            ));
+            ),);
       case LanguagePickerType.icon:
         return PopupMenuButton<Locale>(
           tooltip: tr.language_select_tooltip,
@@ -65,26 +65,26 @@ class _LanguagePickerState extends ConsumerState<LanguagePicker> {
     }
   }
 
-  _buildLanguageOptionsIcon(BuildContext context) {
-    List<PopupMenuItem<Locale>> options = [];
+  List<PopupMenuItem<Locale>> _buildLanguageOptionsIcon(BuildContext context) {
+    final List<PopupMenuItem<Locale>> options = [];
     Config.supportedLocales.forEach((languageCode, countryCode) {
       final locale = Locale(languageCode, countryCode);
       options.add(PopupMenuItem(
         value: locale,
         child: Text('${getEmojiFlag(countryCode)}  ${translateLocaleName(locale: locale)}'),
-      ));
+      ),);
     });
     return options;
   }
 
-  _buildLanguageOptionsField(BuildContext context) {
-    List<DropdownMenuItem<Locale>> options = [];
+  List<DropdownMenuItem<Locale>> _buildLanguageOptionsField(BuildContext context) {
+    final List<DropdownMenuItem<Locale>> options = [];
     Config.supportedLocales.forEach((languageCode, countryCode) {
       final locale = Locale(languageCode, countryCode);
       options.add(DropdownMenuItem(
         value: locale,
         child: Text('${getEmojiFlag(countryCode)} ${translateLocaleName(locale: locale)}'),
-      ));
+      ),);
     });
     return options;
   }
diff --git a/designer_v2/lib/localization/locale_providers.dart b/designer_v2/lib/localization/locale_providers.dart
index 0810d079d..ad2949d89 100644
--- a/designer_v2/lib/localization/locale_providers.dart
+++ b/designer_v2/lib/localization/locale_providers.dart
@@ -2,15 +2,14 @@ import 'dart:ui';
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_designer_v2/constants.dart';
+import 'package:studyu_designer_v2/localization/locale_state.dart';
 import 'package:studyu_designer_v2/localization/platform_locale/platform_locale_interface.dart';
 
-import 'locale_state.dart';
-
 /// Platform Locale Provider
 /// Returns the locale of the Platform.localeName
 final platformLocaleProvider = Provider<Locale>((_) {
   // Get the platform language using platform specific implementations
-  Locale platformLocale = PlatformLocale().getPlatformLocale();
+  final Locale platformLocale = PlatformLocale().getPlatformLocale();
 
   return platformLocale;
 });
diff --git a/designer_v2/lib/localization/locale_state.dart b/designer_v2/lib/localization/locale_state.dart
index 6bbc561d1..24154d1e0 100644
--- a/designer_v2/lib/localization/locale_state.dart
+++ b/designer_v2/lib/localization/locale_state.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_designer_v2/constants.dart';
+import 'package:studyu_designer_v2/localization/locale_providers.dart';
 import 'package:studyu_flutter_common/studyu_flutter_common.dart';
 
-import 'locale_providers.dart';
-
-Locale fallbackLocale = Locale(Config.defaultLocale.first, Config.defaultLocale.last);
+Locale fallbackLocale =
+    Locale(Config.defaultLocale.first, Config.defaultLocale.last);
 
 @immutable
 class LocaleState {
@@ -30,7 +30,7 @@ class LocaleStateNotifier extends StateNotifier<LocaleState> {
   /// 2. IF no locale in storage, attempts to set local from the platform settings
   Future<void> initLocale() async {
     // Attempt to restore from storage
-    bool fromStorageSuccess = await restoreFromStorage();
+    final bool fromStorageSuccess = await restoreFromStorage();
 
     // If storage restore did not work, set from platform
     if (!fromStorageSuccess) {
@@ -43,7 +43,7 @@ class LocaleStateNotifier extends StateNotifier<LocaleState> {
   /// IF NOT: get the first locale that matches our language code and set that
   /// ELSE: do nothing.
   void setLocale(Locale locale) {
-    List<Locale> supportedLocales = ref.read(supportedLocalesProvider);
+    final List<Locale> supportedLocales = ref.read(supportedLocalesProvider);
 
     // Set the locale if it's in our list of supported locales
     if (supportedLocales.contains(locale)) {
@@ -53,7 +53,7 @@ class LocaleStateNotifier extends StateNotifier<LocaleState> {
 
     // Get the closest language locale and set that instead
     Locale? closestLocale;
-    for (Locale supportedLocale in supportedLocales) {
+    for (final Locale supportedLocale in supportedLocales) {
       if (supportedLocale.languageCode == locale.languageCode) {
         closestLocale = supportedLocale;
       }
@@ -66,21 +66,12 @@ class LocaleStateNotifier extends StateNotifier<LocaleState> {
 
   /// Restore Locale from Storage
   Future<bool> restoreFromStorage() async {
-    try {
-      LocaleState? state = await load();
-      if (state == null) {
-        return false;
-      }
-      state = state;
-      return true;
-    } catch (e) {
-      return false;
-    }
+    return (await load()) != null;
   }
 
   Future<LocaleState?> load() async {
     try {
-      String? locString = await SecureStorage.read(_localStorageKey);
+      final String? locString = await SecureStorage.read(_localStorageKey);
       if (locString != null) {
         final locale = locString.split('-');
         return LocaleState(Locale(locale.first, locale.last));
diff --git a/designer_v2/lib/localization/platform_locale/platform_locale_interface.dart b/designer_v2/lib/localization/platform_locale/platform_locale_interface.dart
index e6247fd44..293712fbc 100644
--- a/designer_v2/lib/localization/platform_locale/platform_locale_interface.dart
+++ b/designer_v2/lib/localization/platform_locale/platform_locale_interface.dart
@@ -1,6 +1,6 @@
 import 'dart:ui';
 
-import './platform_locale_stub.dart' // Stub implementation
+import 'package:studyu_designer_v2/localization/platform_locale/platform_locale_stub.dart' // Stub implementation
     if (dart.library.io) './platform_locale_mobile.dart' // dart:io implementation
     if (dart.library.html) './platform_locale_web.dart'; // dart:html implementation
 
diff --git a/designer_v2/lib/localization/platform_locale/platform_locale_mobile.dart b/designer_v2/lib/localization/platform_locale/platform_locale_mobile.dart
index af8adfbc5..11b833675 100644
--- a/designer_v2/lib/localization/platform_locale/platform_locale_mobile.dart
+++ b/designer_v2/lib/localization/platform_locale/platform_locale_mobile.dart
@@ -1,12 +1,12 @@
 import 'dart:io';
 import 'dart:ui';
 
-import 'platform_locale_interface.dart';
+import 'package:studyu_designer_v2/localization/platform_locale/platform_locale_interface.dart';
 
 class PlatformLocaleMobile implements PlatformLocale {
   @override
   Locale getPlatformLocale() {
-    String platformLocaleName = Platform.localeName;
+    final String platformLocaleName = Platform.localeName;
     print("Platform Locale Name (Mobile): $platformLocaleName");
 
     // Language code only
@@ -15,8 +15,8 @@ class PlatformLocaleMobile implements PlatformLocale {
     }
 
     // Language and country codes
-    String languageCode = platformLocaleName.substring(0, platformLocaleName.indexOf('_'));
-    String countryCode = platformLocaleName.substring(platformLocaleName.indexOf('_') + 1);
+    final String languageCode = platformLocaleName.substring(0, platformLocaleName.indexOf('_'));
+    final String countryCode = platformLocaleName.substring(platformLocaleName.indexOf('_') + 1);
 
     return Locale.fromSubtags(
       languageCode: languageCode,
diff --git a/designer_v2/lib/localization/platform_locale/platform_locale_stub.dart b/designer_v2/lib/localization/platform_locale/platform_locale_stub.dart
index 0f9028d84..9642f259a 100644
--- a/designer_v2/lib/localization/platform_locale/platform_locale_stub.dart
+++ b/designer_v2/lib/localization/platform_locale/platform_locale_stub.dart
@@ -1,4 +1,4 @@
-import 'platform_locale_interface.dart';
+import 'package:studyu_designer_v2/localization/platform_locale/platform_locale_interface.dart';
 
 PlatformLocale getImplementation() =>
     throw UnsupportedError('Cannot get Platform Locale without dart:html or package:shared_preferences');
diff --git a/designer_v2/lib/localization/platform_locale/platform_locale_web.dart b/designer_v2/lib/localization/platform_locale/platform_locale_web.dart
index 390141a61..0da8216fc 100644
--- a/designer_v2/lib/localization/platform_locale/platform_locale_web.dart
+++ b/designer_v2/lib/localization/platform_locale/platform_locale_web.dart
@@ -4,12 +4,12 @@ import 'dart:ui';
 
 import 'package:flutter/material.dart';
 
-import 'platform_locale_interface.dart';
+import 'package:studyu_designer_v2/localization/platform_locale/platform_locale_interface.dart';
 
 class PlatformLocaleWeb implements PlatformLocale {
   @override
   Locale getPlatformLocale() {
-    var platformLocaleName = html.window.navigator.language;
+    final platformLocaleName = html.window.navigator.language;
     print("Platform Locale Name (WEB): $platformLocaleName");
 
     // Language code only
@@ -18,8 +18,8 @@ class PlatformLocaleWeb implements PlatformLocale {
     }
 
     // Language and country codes
-    String languageCode = platformLocaleName.substring(0, platformLocaleName.indexOf('-'));
-    String countryCode = platformLocaleName.substring(platformLocaleName.indexOf('-') + 1);
+    final String languageCode = platformLocaleName.substring(0, platformLocaleName.indexOf('-'));
+    final String countryCode = platformLocaleName.substring(platformLocaleName.indexOf('-') + 1);
 
     return Locale.fromSubtags(
       languageCode: languageCode,
diff --git a/designer_v2/lib/main.dart b/designer_v2/lib/main.dart
index 4e198a408..789e5d7df 100644
--- a/designer_v2/lib/main.dart
+++ b/designer_v2/lib/main.dart
@@ -2,12 +2,11 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_web_plugins/url_strategy.dart';
 import 'package:studyu_designer_v2/features/app.dart';
 import 'package:studyu_designer_v2/utils/performance.dart';
 import 'package:studyu_flutter_common/studyu_flutter_common.dart';
 
-import 'package:flutter_web_plugins/url_strategy.dart';
-
 Future<void> main() async {
   /// See: https://stackoverflow.com/questions/57879455/flutter-catching-all-unhandled-exceptions
   await runZonedGuarded(() async {
@@ -18,18 +17,18 @@ Future<void> main() async {
 
     FlutterError.onError = (FlutterErrorDetails errorDetails) {
       // TODO: top-level error handling
-      print("Exception: ${errorDetails.exception.toString()}");
-      print("Stack: ${errorDetails.stack.toString()}");
+      print("Exception: ${errorDetails.exception}");
+      print("Stack: ${errorDetails.stack}");
     };
     // Turn off the # in the URLs on the web
     usePathUrlStrategy();
     runApp(
         // Make dependencies managed by Riverpod available in Widget.build methods
         // by wrapping the app in a [ProviderScope]
-        const ProviderScope(child: App()));
+        const ProviderScope(child: App()),);
   }, (error, stackTrace) {
     // TODO: top-level error handling
-    print("Exception: ${error.toString()}");
-    print("Stack: ${stackTrace.toString()}");
+    print("Exception: $error");
+    print("Stack: $stackTrace");
   });
 }
diff --git a/designer_v2/lib/repositories/api_client.dart b/designer_v2/lib/repositories/api_client.dart
index 0a6971a18..9db7af57d 100644
--- a/designer_v2/lib/repositories/api_client.dart
+++ b/designer_v2/lib/repositories/api_client.dart
@@ -16,7 +16,10 @@ abstract class StudyUApi {
   Future<StudyInvite> saveStudyInvite(StudyInvite invite);
   Future<StudyInvite> fetchStudyInvite(String code);
   Future<void> deleteStudyInvite(StudyInvite invite);
-  Future<List<StudySubject>> deleteParticipants(Study study, List<StudySubject> participants);
+  Future<List<StudySubject>> deleteParticipants(
+    Study study,
+    List<StudySubject> participants,
+  );
   /*
   Future<List<SubjectProgress>> deleteStudyProgress(
       Study study, List<SubjectProgress> records);
@@ -51,7 +54,9 @@ class StudyInviteNotFoundException extends APIException {}
 
 class UserNotFoundException extends APIException {}
 
-class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin implements StudyUApi {
+class StudyUApiClient extends SupabaseClientDependant
+    with SupabaseQueryMixin
+    implements StudyUApi {
   StudyUApiClient({
     required this.supabaseClient,
     this.testDelayMilliseconds = 0,
@@ -95,7 +100,10 @@ class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin im
   final int testDelayMilliseconds;
 
   @override
-  Future<List<StudySubject>> deleteParticipants(Study study, List<StudySubject> participants) async {
+  Future<List<StudySubject>> deleteParticipants(
+    Study study,
+    List<StudySubject> participants,
+  ) async {
     await _testDelay();
     if (participants.isEmpty) {
       return Future.value([]);
@@ -130,28 +138,38 @@ class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin im
   ///
   /// @return List<Study>
   @override
-  Future<List<Study>> getUserStudies({withParticipantActivity = false, forDashboardDisplay = true}) async {
+  Future<List<Study>> getUserStudies({
+    bool withParticipantActivity = false,
+    forDashboardDisplay = true,
+  }) async {
     await _testDelay();
     // TODO: fix Postgres policy for proper multi-tenancy
-    final columns = (withParticipantActivity)
+    final columns = withParticipantActivity
         ? studyWithParticipantActivityColumns
         : (forDashboardDisplay)
             ? studyDisplayColumns
             : studyColumns;
-
     final request = getAll<Study>(selectedColumns: columns);
     return _awaitGuarded(request);
   }
 
   @override
-  Future<Study> fetchStudy(StudyID studyId, {withParticipantActivity = true}) async {
+  Future<Study> fetchStudy(
+    StudyID studyId, {
+    bool withParticipantActivity = true,
+  }) async {
     await _testDelay();
-    final columns = (withParticipantActivity) ? studyWithParticipantActivityColumns : studyColumns;
+    final columns = withParticipantActivity
+        ? studyWithParticipantActivityColumns
+        : studyColumns;
     final request = getById<Study>(studyId, selectedColumns: columns);
-    return _awaitGuarded(request, onError: {
-      HttpStatus.notAcceptable: (e) => throw StudyNotFoundException(),
-      HttpStatus.notFound: (e) => throw StudyNotFoundException(),
-    });
+    return _awaitGuarded(
+      request,
+      onError: {
+        HttpStatus.notAcceptable: (e) => throw StudyNotFoundException(),
+        HttpStatus.notFound: (e) => throw StudyNotFoundException(),
+      },
+    );
   }
 
   @override
@@ -174,10 +192,13 @@ class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin im
   Future<StudyInvite> fetchStudyInvite(String code) async {
     await _testDelay();
     final request = getByColumn<StudyInvite>('code', code);
-    return _awaitGuarded(request, onError: {
-      HttpStatus.notAcceptable: (e) => throw StudyInviteNotFoundException(),
-      HttpStatus.notFound: (e) => throw StudyInviteNotFoundException(),
-    });
+    return _awaitGuarded(
+      request,
+      onError: {
+        HttpStatus.notAcceptable: (e) => throw StudyInviteNotFoundException(),
+        HttpStatus.notFound: (e) => throw StudyInviteNotFoundException(),
+      },
+    );
   }
 
   @override
@@ -205,10 +226,13 @@ class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin im
   Future<StudyUUser> fetchUser(String userId) async {
     await _testDelay();
     final request = getById<StudyUUser>(userId);
-    return _awaitGuarded(request, onError: {
-      HttpStatus.notAcceptable: (e) => throw UserNotFoundException(),
-      HttpStatus.notFound: (e) => throw UserNotFoundException(),
-    });
+    return _awaitGuarded(
+      request,
+      onError: {
+        HttpStatus.notAcceptable: (e) => throw UserNotFoundException(),
+        HttpStatus.notFound: (e) => throw UserNotFoundException(),
+      },
+    );
   }
 
   @override
@@ -225,7 +249,10 @@ class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin im
   /// domain-specific exception that bubbles up to the data layer.
   ///
   /// Raises a generic [APIException] for errors that cannot be handled.
-  Future<T> _awaitGuarded<T>(Future<T> future, {Map<int, SupabaseQueryExceptionHandler>? onError}) async {
+  Future<T> _awaitGuarded<T>(
+    Future<T> future, {
+    Map<int, SupabaseQueryExceptionHandler>? onError,
+  }) async {
     try {
       final result = await future;
       return result;
@@ -233,7 +260,8 @@ class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin im
       if (onError == null) {
         throw _apiException(error: e);
       }
-      if (e.statusCode == null || !onError.containsKey(int.parse(e.statusCode!))) {
+      if (e.statusCode == null ||
+          !onError.containsKey(int.parse(e.statusCode!))) {
         throw _apiException(error: e);
       }
       final errorHandler = onError[int.parse(e.statusCode!)]!;
@@ -242,11 +270,11 @@ class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin im
     throw _apiException();
   }
 
-  _apiException({SupabaseQueryError? error}) {
+  APIException _apiException({SupabaseQueryError? error}) {
     if (error != null) {
       debugLog("Supabase Exception encountered");
       debugLog(error.statusCode.toString());
-      debugLog(error.details);
+      debugLog(error.details.toString());
       debugLog(error.message);
     } else {
       debugLog("Unknown exception encountered");
@@ -254,11 +282,16 @@ class StudyUApiClient extends SupabaseClientDependant with SupabaseQueryMixin im
     return APIException();
   }
 
-  _testDelay() async {
-    await Future.delayed(Duration(milliseconds: testDelayMilliseconds), () => null);
+  Future<void> _testDelay() async {
+    await Future.delayed(
+      Duration(milliseconds: testDelayMilliseconds),
+      () => null,
+    );
   }
 }
 
-final apiClientProvider = riverpod.Provider<StudyUApi>((ref) => StudyUApiClient(
-      supabaseClient: ref.watch(supabaseClientProvider),
-    ));
+final apiClientProvider = riverpod.Provider<StudyUApi>(
+  (ref) => StudyUApiClient(
+    supabaseClient: ref.watch(supabaseClientProvider),
+  ),
+);
diff --git a/designer_v2/lib/repositories/auth_repository.dart b/designer_v2/lib/repositories/auth_repository.dart
index c1ea03484..d242c7a88 100644
--- a/designer_v2/lib/repositories/auth_repository.dart
+++ b/designer_v2/lib/repositories/auth_repository.dart
@@ -59,37 +59,29 @@ class AuthRepository implements IAuthRepository {
         case AuthChangeEvent.initialSession:
           print("authRepo initialSession");
           _authStateStreamController.add(authClient.currentUser);
-          break;
         case AuthChangeEvent.signedIn:
           print("authRepo signedIn");
           // Update stream with logged in user
           _authStateStreamController.add(authClient.currentUser);
-          break;
         case AuthChangeEvent.signedOut:
           print("authRepo signedOut");
           // Send null to indicate that no user is available (logged out)
           _authStateStreamController.add(null);
-          break;
         case AuthChangeEvent.userUpdated:
           print("authRepo userUpdated");
           // Update stream with new user object
           _authStateStreamController.add(authClient.currentUser);
-          break;
         case AuthChangeEvent.passwordRecovery:
           print("authRepo passwordRecovery");
           //router.dispatch(RoutingIntents.passwordRecovery);
           allowPasswordReset = true;
-          break;
         case AuthChangeEvent.tokenRefreshed:
           print("authRepo tokenRefreshed");
-          break;
         case AuthChangeEvent.userDeleted:
           print("authRepo userDeleted");
           _authStateStreamController.add(null);
-          break;
         case AuthChangeEvent.mfaChallengeVerified:
           print("authRepo mfaChallengeVerified");
-          break;
       }
     });
   }
@@ -107,8 +99,8 @@ class AuthRepository implements IAuthRepository {
   bool get isLoggedIn => currentUser != null;
 
   @override
-  BehaviorSubject<User?> watchAuthStateChanges({emitLastEvent = true}) =>
-      (emitLastEvent) ? _authStateStreamController : _authStateSuppressedController.subject;
+  BehaviorSubject<User?> watchAuthStateChanges({bool emitLastEvent = true}) =>
+      emitLastEvent ? _authStateStreamController : _authStateSuppressedController.subject;
 
   @override
   Future<AuthResponse> signUp({required String email, required String password}) async {
diff --git a/designer_v2/lib/repositories/invite_code_repository.dart b/designer_v2/lib/repositories/invite_code_repository.dart
index 6dcbd77e4..656dbe60e 100644
--- a/designer_v2/lib/repositories/invite_code_repository.dart
+++ b/designer_v2/lib/repositories/invite_code_repository.dart
@@ -17,15 +17,21 @@ abstract class IInviteCodeRepository implements ModelRepository<StudyInvite> {
   Future<bool> isCodeAlreadyUsed(String code);
 }
 
-class InviteCodeRepository extends ModelRepository<StudyInvite> implements IInviteCodeRepository {
+class InviteCodeRepository extends ModelRepository<StudyInvite>
+    implements IInviteCodeRepository {
   InviteCodeRepository({
     required this.studyId,
     required this.apiClient,
     required this.authRepository,
     required this.studyRepository,
     required this.ref,
-  }) : super(InviteCodeRepositoryDelegate(
-            study: studyRepository.get(studyId)!.model, apiClient: apiClient, studyRepository: studyRepository));
+  }) : super(
+          InviteCodeRepositoryDelegate(
+            study: studyRepository.get(studyId)!.model,
+            apiClient: apiClient,
+            studyRepository: studyRepository,
+          ),
+        );
 
   /// The [Study] this repository operates on
   final StudyID studyId;
@@ -60,36 +66,46 @@ class InviteCodeRepository extends ModelRepository<StudyInvite> implements IInvi
         type: ModelActionType.clipboard,
         label: ModelActionType.clipboard.string,
         onExecute: () => {
-          ref
-              .read(clipboardServiceProvider)
-              .copy(model.code)
-              .then((value) => ref.read(notificationServiceProvider).show(Notifications.inviteCodeClipped))
+          ref.read(clipboardServiceProvider).copy(model.code).then((value) =>
+              ref
+                  .read(notificationServiceProvider)
+                  .show(Notifications.inviteCodeClipped),),
         },
       ),
       ModelAction(
-          type: ModelActionType.delete,
-          label: ModelActionType.delete.string,
-          onExecute: () {
-            return delete(getKey(model))
-                .then((value) => ref.read(routerProvider).dispatch(RoutingIntents.studyRecruit(model.studyId)))
-                .then((value) => Future.delayed(const Duration(milliseconds: 200),
-                    () => ref.read(notificationServiceProvider).show(Notifications.inviteCodeDeleted)));
-          },
-          isAvailable: study.isOwner(authRepository.currentUser!),
-          isDestructive: true),
+        type: ModelActionType.delete,
+        label: ModelActionType.delete.string,
+        onExecute: () {
+          return delete(getKey(model))
+              .then((value) => ref
+                  .read(routerProvider)
+                  .dispatch(RoutingIntents.studyRecruit(model.studyId)),)
+              .then(
+                (value) => Future.delayed(
+                  const Duration(milliseconds: 200),
+                  () => ref
+                      .read(notificationServiceProvider)
+                      .show(Notifications.inviteCodeDeleted),
+                ),
+              );
+        },
+        isAvailable: study.isOwner(authRepository.currentUser),
+        isDestructive: true,
+      ),
     ];
 
     return actions.where((action) => action.isAvailable).toList();
   }
 
   @override
-  emitUpdate() {
+  void emitUpdate() {
     print("InviteCodeRepository.emitUpdate");
     super.emitUpdate();
   }
 }
 
-class InviteCodeRepositoryDelegate extends IModelRepositoryDelegate<StudyInvite> {
+class InviteCodeRepositoryDelegate
+    extends IModelRepositoryDelegate<StudyInvite> {
   InviteCodeRepositoryDelegate({
     required this.study,
     required this.apiClient,
@@ -119,7 +135,8 @@ class InviteCodeRepositoryDelegate extends IModelRepositoryDelegate<StudyInvite>
 
     final saveOperation = OptimisticUpdate(
       applyOptimistic: () {
-        final inviteIdx = study.invites!.indexWhere((i) => i.code == model.code);
+        final inviteIdx =
+            study.invites!.indexWhere((i) => i.code == model.code);
         if (inviteIdx == -1) {
           // add new code
           study.invites!.add(model);
@@ -171,7 +188,7 @@ class InviteCodeRepositoryDelegate extends IModelRepositoryDelegate<StudyInvite>
   }
 
   @override
-  onError(Object error, StackTrace? stackTrace) {
+  void onError(Object error, StackTrace? stackTrace) {
     return; // TODO
   }
 
@@ -186,7 +203,8 @@ class InviteCodeRepositoryDelegate extends IModelRepositoryDelegate<StudyInvite>
   }
 }
 
-final inviteCodeRepositoryProvider = Provider.autoDispose.family<IInviteCodeRepository, StudyID>((ref, studyId) {
+final inviteCodeRepositoryProvider =
+    Provider.autoDispose.family<IInviteCodeRepository, StudyID>((ref, studyId) {
   print("inviteCodeRepositoryProvider($studyId");
   // Initialize repository for a given study
   final repository = InviteCodeRepository(
diff --git a/designer_v2/lib/repositories/model_repository.dart b/designer_v2/lib/repositories/model_repository.dart
index c2415a57f..5ce73f4ea 100644
--- a/designer_v2/lib/repositories/model_repository.dart
+++ b/designer_v2/lib/repositories/model_repository.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:rxdart/subjects.dart';
 import 'package:studyu_designer_v2/constants.dart';
@@ -30,15 +31,16 @@ class WrappedModel<T> {
   DateTime? lastFetched;
   DateTime? lastUpdated;
 
-  markWithError(Object error, {StackTrace? stackTrace}) {
-    asyncValue = AsyncError<T>(error, StackTrace.current).copyWithPrevious(asyncValue);
+  void markWithError(Object error, {StackTrace? stackTrace}) {
+    asyncValue =
+        AsyncError<T>(error, StackTrace.current).copyWithPrevious(asyncValue);
   }
 
-  markAsLoading() {
+  void markAsLoading() {
     asyncValue = AsyncLoading<T>().copyWithPrevious(asyncValue);
   }
 
-  markAsFetched() {
+  void markAsFetched() {
     if (isDirty) {
       throw Exception("Dirty model marked as fetched, potentially resulting in "
           "loss of unsaved changes.");
@@ -47,7 +49,7 @@ class WrappedModel<T> {
     lastFetched = DateTime.now();
   }
 
-  markAsSaved() {
+  void markAsSaved() {
     isDirty = false;
     isLocalOnly = false;
     lastSaved = DateTime.now();
@@ -67,8 +69,11 @@ abstract class IModelRepository<T> implements IModelActionProvider<T> {
   Future<void> delete(ModelID modelId);
   Future<void> duplicateAndSave(T model);
   Future<void> duplicateAndSaveFromRemote(ModelID modelId);
-  Stream<WrappedModel<T>> watch(ModelID modelId, {fetchOnSubscribe = true});
-  Stream<List<WrappedModel<T>>> watchAll({fetchOnSubscribe = true});
+  Stream<WrappedModel<T>> watch(
+    ModelID modelId, {
+    bool fetchOnSubscribe = true,
+  });
+  Stream<List<WrappedModel<T>>> watchAll({bool fetchOnSubscribe = true});
   Stream<ModelEvent<T>> watchChanges(ModelID modelId);
   Stream<ModelEvent<T>> watchAllChanges();
   Future<WrappedModel<T>?> ensurePersisted(ModelID modelId);
@@ -84,7 +89,7 @@ abstract class IModelRepositoryDelegate<T> {
   // todo deleteAll(List<T> models);
   T createNewInstance();
   T createDuplicate(T model);
-  onError(Object error, StackTrace? stackTrace);
+  void onError(Object error, StackTrace? stackTrace);
 }
 
 // TODO: revisit user-facing error handling & flow
@@ -95,12 +100,16 @@ abstract class ModelRepository<T> extends IModelRepository<T> {
   final IModelRepositoryDelegate<T> delegate;
 
   /// Stream controller for broadcasting all models stored in the repository
-  final BehaviorSubject<List<WrappedModel<T>>> _allModelsStreamController = BehaviorSubject();
-  final BehaviorSubject<ModelEvent<T>> _allModelEventsStreamController = BehaviorSubject();
+  final BehaviorSubject<List<WrappedModel<T>>> _allModelsStreamController =
+      BehaviorSubject();
+  final BehaviorSubject<ModelEvent<T>> _allModelEventsStreamController =
+      BehaviorSubject();
 
   /// Stream controllers for subscriptions on individual models of type [T]
-  final Map<ModelID, BehaviorSubject<WrappedModel<T>>> modelStreamControllers = {};
-  final Map<ModelID, BehaviorSubject<ModelEvent<T>>> modelEventsStreamControllers = {};
+  final Map<ModelID, BehaviorSubject<WrappedModel<T>>> modelStreamControllers =
+      {};
+  final Map<ModelID, BehaviorSubject<ModelEvent<T>>>
+      modelEventsStreamControllers = {};
 
   /// Collection of all models of type [T]
   ///
@@ -162,14 +171,12 @@ abstract class ModelRepository<T> extends IModelRepository<T> {
         rethrow;
       }
     }
-
     emitUpdate();
-
     return wrappedModel!;
   }
 
   @override
-  Future<WrappedModel<T>?> save(T model, {runOptimistically = true}) {
+  Future<WrappedModel<T>?> save(T model, {bool runOptimistically = true}) {
     final modelId = getKey(model);
     final prevModel = get(modelId)?.model;
 
@@ -209,7 +216,7 @@ abstract class ModelRepository<T> extends IModelRepository<T> {
   }
 
   @override
-  Future<void> delete(ModelID modelId, {runOptimistically = true}) async {
+  Future<void> delete(ModelID modelId, {bool runOptimistically = true}) async {
     final wrappedModel = get(modelId);
     if (wrappedModel == null) {
       throw ModelNotFoundException();
@@ -228,7 +235,7 @@ abstract class ModelRepository<T> extends IModelRepository<T> {
         if (_allModels.containsKey(modelId)) {
           _allModels.remove(modelId);
         }
-        await emitModelEvent(IsDeleted(modelId, model));
+        emitModelEvent(IsDeleted(modelId, model));
       },
       rollback: () => wrappedModel.isDeleted = false,
       onUpdate: emitUpdate,
@@ -258,7 +265,7 @@ abstract class ModelRepository<T> extends IModelRepository<T> {
   }
 
   @override
-  Stream<List<WrappedModel<T>>> watchAll({fetchOnSubscribe = true}) {
+  Stream<List<WrappedModel<T>>> watchAll({bool fetchOnSubscribe = true}) {
     // Note: we don't use Stream.fromFuture here because it automatically
     // closes the stream when the future resolves
     if (fetchOnSubscribe) {
@@ -276,8 +283,13 @@ abstract class ModelRepository<T> extends IModelRepository<T> {
   /// If the requested [ModelId] is not available, the stream will be created
   /// anyway, but emit a [ModelNotFoundException] error event.
   @override
-  Stream<WrappedModel<T>> watch(ModelID modelId, {fetchOnSubscribe = true, emitLastEvent = true}) {
+  Stream<WrappedModel<T>> watch(
+    ModelID modelIdParam, {
+    bool fetchOnSubscribe = true,
+    bool emitLastEvent = true,
+  }) {
     WrappedModel<T>? wrappedModel;
+    ModelID modelId = modelIdParam;
 
     if (modelId == Config.newModelId) {
       // Create new model to subscribe to
@@ -298,20 +310,23 @@ abstract class ModelRepository<T> extends IModelRepository<T> {
       return null;
     }
 
-    final modelController =
-        _buildModelSpecificController(modelId, _allModelsStreamController, modelStreamControllers, selectModel);
+    final modelController = _buildModelSpecificController(
+      modelId,
+      _allModelsStreamController,
+      modelStreamControllers,
+      selectModel,
+    );
 
     if (fetchOnSubscribe) {
       if (!(wrappedModel != null && wrappedModel.isLocalOnly)) {
-        fetch(modelId).catchError((e) {
+        fetch(modelId).catchError((Object e) {
           if (!modelController.isClosed) {
             modelController.addError(e);
           }
-          return e;
+          return e as WrappedModel<T>;
         });
       }
     }
-
     return modelController;
   }
 
@@ -330,11 +345,15 @@ abstract class ModelRepository<T> extends IModelRepository<T> {
     }
 
     final modelEventsController = _buildModelSpecificController(
-        modelId, _allModelEventsStreamController, modelEventsStreamControllers, selectModelChangeEvent);
+      modelId,
+      _allModelEventsStreamController,
+      modelEventsStreamControllers,
+      selectModelChangeEvent,
+    );
     return modelEventsController;
   }
 
-  _buildModelSpecificController<A, M>(
+  BehaviorSubject<M> _buildModelSpecificController<A, M>(
     ModelID modelId,
     BehaviorSubject<A> allController,
     Map<ModelID, BehaviorSubject<M>> modelSpecificControllers,
@@ -385,7 +404,7 @@ abstract class ModelRepository<T> extends IModelRepository<T> {
     return Future.value(wrappedModel);
   }
 
-  WrappedModel<T> upsertLocally(T newModel, {emitUpdate = false}) {
+  WrappedModel<T> upsertLocally(T newModel, {bool emitUpdate = false}) {
     final newModelId = getKey(newModel);
     if (_allModels.containsKey(newModelId)) {
       // Model already exists, replace with the new object
@@ -401,10 +420,13 @@ abstract class ModelRepository<T> extends IModelRepository<T> {
     return _allModels[newModelId]!;
   }
 
-  List<WrappedModel<T>> upsertAllLocally(List<T> newModels, {emitUpdate = false}) {
-    List<WrappedModel<T>> wrappedModels = [];
+  List<WrappedModel<T>> upsertAllLocally(
+    List<T> newModels, {
+    bool emitUpdate = false,
+  }) {
+    final List<WrappedModel<T>> wrappedModels = [];
     for (final newModel in newModels) {
-      final wrapped = upsertLocally(newModel, emitUpdate: false);
+      final wrapped = upsertLocally(newModel);
       wrappedModels.add(wrapped);
     }
     if (emitUpdate) {
@@ -413,21 +435,26 @@ abstract class ModelRepository<T> extends IModelRepository<T> {
     return wrappedModels;
   }
 
-  emitUpdate() {
+  void emitUpdate() {
     if (!_allModelsStreamController.isClosed) {
       _allModelsStreamController.add(
-          // Filter out models marked as deleted
-          _allModels.values.where((model) => !model.isDeleted).toList());
+        // Filter out models marked as deleted
+        _allModels.values.where((model) => !model.isDeleted).toList(),
+      );
     }
   }
 
-  emitModelEvent(ModelEvent<T> event) {
+  void emitModelEvent(ModelEvent<T> event) {
     if (!_allModelEventsStreamController.isClosed) {
       _allModelEventsStreamController.add(event);
     }
   }
 
-  emitError(StreamController? controller, Object e, StackTrace? stackTrace) {
+  void emitError(
+    StreamController? controller,
+    Object e,
+    StackTrace? stackTrace,
+  ) {
     if (controller != null && !controller.isClosed) {
       controller.addError(e, stackTrace);
     }
@@ -435,7 +462,7 @@ abstract class ModelRepository<T> extends IModelRepository<T> {
   }
 
   @override
-  dispose() {
+  void dispose() {
     _allModelsStreamController.close();
     modelStreamControllers.forEach((_, controller) {
       controller.close();
diff --git a/designer_v2/lib/repositories/study_repository.dart b/designer_v2/lib/repositories/study_repository.dart
index c02dbbb9f..e159cbc7e 100644
--- a/designer_v2/lib/repositories/study_repository.dart
+++ b/designer_v2/lib/repositories/study_repository.dart
@@ -54,7 +54,7 @@ class StudyRepository extends ModelRepository<Study> implements IStudyRepository
       throw ModelNotFoundException();
     }
 
-    final List<StudySubject> participants = [...(study.participants ?? [])];
+    final List<StudySubject> participants = [...study.participants ?? []];
 
     final deleteParticipantsOperation = OptimisticUpdate(
       applyOptimistic: () => study.participants = [],
@@ -102,7 +102,7 @@ class StudyRepository extends ModelRepository<Study> implements IStudyRepository
     Future<void> onDeleteCallback() {
       return delete(model.id).then((value) => ref.read(routerProvider).dispatch(RoutingIntents.studies)).then((value) =>
           Future.delayed(const Duration(milliseconds: 200),
-              () => ref.read(notificationServiceProvider).show(Notifications.studyDeleted)));
+              () => ref.read(notificationServiceProvider).show(Notifications.studyDeleted),),);
     }
 
     final currentUser = authRepository.currentUser!;
@@ -162,8 +162,8 @@ class StudyRepository extends ModelRepository<Study> implements IStudyRepository
               .show(Notifications.studyDeleteConfirmation, // TODO: more severe confirmation for running studies
                   actions: [
                 NotificationAction(
-                    label: StudyActionType.delete.string, onSelect: onDeleteCallback, isDestructive: true),
-              ]);
+                    label: StudyActionType.delete.string, onSelect: onDeleteCallback, isDestructive: true,),
+              ],);
         },
         isAvailable: model.canDelete(currentUser),
         isDestructive: true,
@@ -201,7 +201,7 @@ class StudyRepositoryDelegate extends IModelRepositoryDelegate<Study> {
   }
 
   @override
-  onError(Object error, StackTrace? stackTrace) {
+  void onError(Object error, StackTrace? stackTrace) {
     return; // TODO
   }
 
diff --git a/designer_v2/lib/repositories/supabase_client.dart b/designer_v2/lib/repositories/supabase_client.dart
index 146bde635..47961ddd0 100644
--- a/designer_v2/lib/repositories/supabase_client.dart
+++ b/designer_v2/lib/repositories/supabase_client.dart
@@ -1,7 +1,7 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
 import 'package:studyu_core/core.dart';
 import 'package:studyu_core/env.dart' as env;
 import 'package:supabase_flutter/supabase_flutter.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
 
 // TODO: Transfer networking code to core package (+ update app if needed)
 
@@ -55,7 +55,7 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
   }
 
   Future<T> getByColumn<T extends SupabaseObject>(String colName, String value,
-      {List<String> selectedColumns = const ['*']}) async {
+      {List<String> selectedColumns = const ['*'],}) async {
     try {
       final data =
           await supabaseClient.from(tableName(T)).select(selectedColumns.join(',')).eq(colName, value).single();
@@ -69,7 +69,7 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
 
   List<T> deserializeList<T extends SupabaseObject>(dynamic data) {
     return List<T>.from(
-        List<Map<String, dynamic>>.from(data as List).map((json) => SupabaseObjectFunctions.fromJson<T>(json)));
+        List<Map<String, dynamic>>.from(data as List).map((json) => SupabaseObjectFunctions.fromJson<T>(json)),);
   }
 
   T deserializeObject<T extends SupabaseObject>(dynamic data) {
diff --git a/designer_v2/lib/repositories/user_repository.dart b/designer_v2/lib/repositories/user_repository.dart
index 21293958e..5adb15053 100644
--- a/designer_v2/lib/repositories/user_repository.dart
+++ b/designer_v2/lib/repositories/user_repository.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: join_return_with_assignment
+
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/repositories/api_client.dart';
@@ -8,16 +10,18 @@ abstract class IUserRepository {
   StudyUUser get user;
   Future<StudyUUser> fetchUser();
   Future<StudyUUser> saveUser();
-  Future<StudyUUser> updatePreferences(PreferenceAction pinAction, String modelId);
+  Future<StudyUUser> updatePreferences(
+      PreferenceAction pinAction, String modelId,);
 }
 
 enum PreferenceAction { pin, pinOff }
 
 class UserRepository implements IUserRepository {
-  UserRepository(
-      {required this.authRepository,
-      required this.apiClient,
-      required this.ref}); //: super(UserRepositoryDelegate(apiClient: apiClient));
+  UserRepository({
+    required this.authRepository,
+    required this.apiClient,
+    required this.ref,
+  }); //: super(UserRepositoryDelegate(apiClient: apiClient));
 
   final StudyUApi apiClient;
   final IAuthRepository authRepository;
@@ -39,15 +43,14 @@ class UserRepository implements IUserRepository {
   }
 
   @override
-  Future<StudyUUser> updatePreferences(PreferenceAction pinAction, String modelId) async {
+  Future<StudyUUser> updatePreferences(
+      PreferenceAction pinAction, String modelId,) async {
     final newPinnedStudies = Set<String>.from(user.preferences.pinnedStudies);
     switch (pinAction) {
       case PreferenceAction.pin:
         newPinnedStudies.add(modelId);
-        break;
       case PreferenceAction.pinOff:
         newPinnedStudies.remove(modelId);
-        break;
     }
     user.preferences.pinnedStudies = newPinnedStudies;
     return saveUser();
@@ -58,5 +61,6 @@ final userRepositoryProvider = Provider.autoDispose((ref) {
   print("userRepositoryProvider");
   final apiClient = ref.watch(apiClientProvider);
   final authRepository = ref.watch(authRepositoryProvider);
-  return UserRepository(apiClient: apiClient, ref: ref, authRepository: authRepository);
+  return UserRepository(
+      apiClient: apiClient, ref: ref, authRepository: authRepository,);
 });
diff --git a/designer_v2/lib/routing/router.dart b/designer_v2/lib/routing/router.dart
index 87be84e1b..c442602b7 100644
--- a/designer_v2/lib/routing/router.dart
+++ b/designer_v2/lib/routing/router.dart
@@ -6,10 +6,9 @@ import 'package:studyu_designer_v2/common_views/pages/error_page.dart';
 import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/features/app_controller.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
+import 'package:studyu_designer_v2/routing/router_config.dart';
 import 'package:studyu_designer_v2/utils/combined_stream_notifier.dart';
 
-import 'router_config.dart';
-
 /// How to create a new page & use it for navigation:
 ///
 /// 1. Add the [GoRoute] in router_config.dart and register it as
@@ -40,7 +39,7 @@ final routerProvider = Provider<GoRouter>((ref) {
 
     // Read most recent app state on re-evaluation (see refreshListenable)
     final isLoggedIn = authRepository.isLoggedIn;
-    var allowPasswordReset = authRepository.allowPasswordReset;
+    final allowPasswordReset = authRepository.allowPasswordReset;
     final isInitialized = appController.isInitialized;
 
     // Carry original location through the redirect flow so that we can
@@ -56,7 +55,7 @@ final routerProvider = Provider<GoRouter>((ref) {
       }
     }
     // Helper to generate routes carrying the 'from' param (if any)
-    namedLocForwarded(String name) {
+    String namedLocForwarded(String name) {
       final Map<String, String> qParams = {};
       if (from != null && from != '/') {
         // if (from != null && from != '/' && from != defaultLocation) {
@@ -67,7 +66,7 @@ final routerProvider = Provider<GoRouter>((ref) {
 
     if (!isInitialized) {
       // Redirect to splash screen while app is pending initialization
-      return (isOnSplashPage) ? null : namedLocForwarded(splashRouteName);
+      return isOnSplashPage ? null : namedLocForwarded(splashRouteName);
     }
 
     // Handle password recovery
@@ -92,7 +91,7 @@ final routerProvider = Provider<GoRouter>((ref) {
         }
       }
       // Redirect to login page as default
-      return (isOnLoginPage) ? null : namedLocForwarded(loginRouteName);
+      return isOnLoginPage ? null : namedLocForwarded(loginRouteName);
     } else {
       // If the user is authenticated, forward to where they were going initially...
       if (from != null && from != state.matchedLocation) {
@@ -111,7 +110,7 @@ final routerProvider = Provider<GoRouter>((ref) {
     refreshListenable: CombinedStreamNotifier([
       // Any stream registered here will trigger the router's redirect logic
       appController.stream, // initialization events
-      authRepository.watchAuthStateChanges() // authentication events
+      authRepository.watchAuthStateChanges(), // authentication events
     ]),
     routes: RouterConf.routes,
     errorBuilder: (context, state) => ErrorPage(error: state.error),
diff --git a/designer_v2/lib/routing/router_config.dart b/designer_v2/lib/routing/router_config.dart
index cfb010b18..2c691aaed 100644
--- a/designer_v2/lib/routing/router_config.dart
+++ b/designer_v2/lib/routing/router_config.dart
@@ -79,7 +79,7 @@ class RouterConf {
                 formKey: AuthFormKey.login,
                 body: LoginForm(),
               ),
-            )),
+            ),),
     GoRoute(
         path: "/signup",
         name: signupRouteName,
@@ -89,7 +89,7 @@ class RouterConf {
                 formKey: AuthFormKey.signup,
                 body: SignupForm(),
               ),
-            )),
+            ),),
     GoRoute(
         path: "/forgot_password",
         name: forgotPasswordRouteName,
@@ -99,11 +99,11 @@ class RouterConf {
                 formKey: AuthFormKey.passwordForgot,
                 body: PasswordForgotForm(),
               ),
-            )),
+            ),),
     GoRoute(
       path: "/error",
       name: errorRouteName,
-      builder: (context, state) => ErrorPage(error: state.extra as Exception),
+      builder: (context, state) => ErrorPage(error: state.extra! as Exception),
     ),
   ];
 
@@ -125,20 +125,20 @@ class RouterConf {
             .toList()
             .indexOf(state.uri.queryParameters[RouteParams.studiesFilter]!);
         return (idx != -1) ? StudiesFilter.values[idx] : null;
-      }() // call anonymous closure to resolve param to enum
+      }(), // call anonymous closure to resolve param to enum
           ),
     ),
     GoRoute(
       path: "/studies/:${RouteParams.studyId}",
       name: studyRouteName,
       redirect: (BuildContext context, GoRouterState state) => router.namedLocation('studyEdit',
-          pathParameters: {RouteParams.studyId: state.pathParameters[RouteParams.studyId]!}),
+          pathParameters: {RouteParams.studyId: state.pathParameters[RouteParams.studyId]!},),
     ),
     GoRoute(
       path: "/studies/:${RouteParams.studyId}/edit",
       name: studyEditRouteName,
       redirect: (BuildContext context, GoRouterState state) => router.namedLocation('studyEditInfo',
-          pathParameters: {RouteParams.studyId: state.pathParameters[RouteParams.studyId]!}),
+          pathParameters: {RouteParams.studyId: state.pathParameters[RouteParams.studyId]!},),
     ),
     GoRoute(
       path: "/studies/:${RouteParams.studyId}/edit/info",
@@ -154,7 +154,7 @@ class RouterConf {
               selectedTabSubnav: StudyDesignNav.info(studyId),
               body: StudyDesignInfoFormView(studyId),
               layoutType: SingleColumnLayoutType.boundedNarrow,
-            ));
+            ),);
       },
     ),
     GoRoute(
@@ -171,8 +171,8 @@ class RouterConf {
                 selectedTabSubnav: StudyDesignNav.enrollment(studyId),
                 body: StudyDesignEnrollmentFormView(studyId),
                 layoutType: SingleColumnLayoutType.boundedNarrow,
-              ));
-        }),
+              ),);
+        },),
     GoRoute(
         path: "/studies/:${RouteParams.studyId}/edit/interventions",
         name: studyEditInterventionsRouteName,
@@ -187,7 +187,7 @@ class RouterConf {
                 selectedTabSubnav: StudyDesignNav.interventions(studyId),
                 body: StudyDesignInterventionsFormView(studyId),
                 layoutType: SingleColumnLayoutType.boundedNarrow,
-              ));
+              ),);
         },
         routes: [
           GoRoute(
@@ -196,7 +196,7 @@ class RouterConf {
               pageBuilder: (context, state) {
                 final routeArgs = InterventionFormRouteArgs(
                     studyId: state.pathParameters[RouteParams.studyId]!,
-                    interventionId: state.pathParameters[RouteParams.interventionId]!);
+                    interventionId: state.pathParameters[RouteParams.interventionId]!,);
                 return MaterialPage(
                     child: StudyFormScaffold<InterventionFormViewModel>(
                   studyId: routeArgs.studyId,
@@ -205,15 +205,13 @@ class RouterConf {
                     leftWidget: InterventionFormView(formViewModel: formViewModel),
                     rightWidget: InterventionPreview(routeArgs: routeArgs),
                     flexLeft: 7,
-                    flexRight: 8,
                     constraintsLeft: const BoxConstraints(minWidth: 500.0),
-                    scrollLeft: true,
                     scrollRight: false,
                     paddingRight: null,
                   ),
-                ));
-              }),
-        ]),
+                ),);
+              },),
+        ],),
     GoRoute(
         path: "/studies/:${RouteParams.studyId}/edit/measurements",
         name: studyEditMeasurementsRouteName,
@@ -228,7 +226,7 @@ class RouterConf {
                 selectedTabSubnav: StudyDesignNav.measurements(studyId),
                 body: StudyDesignMeasurementsFormView(studyId),
                 layoutType: SingleColumnLayoutType.boundedNarrow,
-              ));
+              ),);
         },
         routes: [
           GoRoute(
@@ -237,7 +235,7 @@ class RouterConf {
               pageBuilder: (context, state) {
                 final routeArgs = MeasurementFormRouteArgs(
                     studyId: state.pathParameters[RouteParams.studyId]!,
-                    measurementId: state.pathParameters[RouteParams.measurementId]!);
+                    measurementId: state.pathParameters[RouteParams.measurementId]!,);
                 return MaterialPage(
                     child: StudyFormScaffold<MeasurementSurveyFormViewModel>(
                   studyId: routeArgs.studyId,
@@ -246,15 +244,13 @@ class RouterConf {
                     leftWidget: MeasurementSurveyFormView(formViewModel: formViewModel),
                     rightWidget: SurveyPreview(routeArgs: routeArgs),
                     flexLeft: 7,
-                    flexRight: 8,
                     constraintsLeft: const BoxConstraints(minWidth: 500.0),
-                    scrollLeft: true,
                     scrollRight: false,
                     paddingRight: null,
                   ),
-                ));
-              }),
-        ]),
+                ),);
+              },),
+        ],),
     GoRoute(
         path: "/studies/:${RouteParams.studyId}/edit/reports",
         name: studyEditReportsRouteName,
@@ -269,8 +265,8 @@ class RouterConf {
                 selectedTabSubnav: StudyDesignNav.reports(studyId),
                 body: StudyDesignReportsFormView(studyId),
                 layoutType: SingleColumnLayoutType.boundedNarrow,
-              ));
-        }),
+              ),);
+        },),
     GoRoute(
         path: "/studies/:${RouteParams.studyId}/test",
         name: studyTestRouteName,
@@ -284,8 +280,8 @@ class RouterConf {
                 selectedTab: StudyNav.test(studyId),
                 body: StudyTestScreen(studyId, previewRoute: appRoute),
                 layoutType: SingleColumnLayoutType.stretched,
-              ));
-        }),
+              ),);
+        },),
     GoRoute(
         path: "/studies/:${RouteParams.studyId}/recruit",
         name: studyRecruitRouteName,
@@ -298,8 +294,8 @@ class RouterConf {
                 selectedTab: StudyNav.recruit(studyId),
                 body: StudyRecruitScreen(studyId),
                 layoutType: SingleColumnLayoutType.boundedWide,
-              ));
-        }),
+              ),);
+        },),
     GoRoute(
         path: "/studies/:${RouteParams.studyId}/monitor",
         name: studyMonitorRouteName,
@@ -312,8 +308,8 @@ class RouterConf {
                 selectedTab: StudyNav.monitor(studyId),
                 body: StudyMonitorScreen(studyId),
                 layoutType: SingleColumnLayoutType.boundedWide,
-              ));
-        }),
+              ),);
+        },),
     GoRoute(
         path: "/studies/:${RouteParams.studyId}/analyze",
         name: studyAnalyzeRouteName,
@@ -326,8 +322,8 @@ class RouterConf {
                 selectedTab: StudyNav.analyze(studyId),
                 body: StudyAnalyzeScreen(studyId),
                 layoutType: SingleColumnLayoutType.boundedWide,
-              ));
-        }),
+              ),);
+        },),
     GoRoute(
         path: "/studies/:${RouteParams.studyId}/settings",
         name: studySettingsRouteName,
@@ -338,7 +334,7 @@ class RouterConf {
             state,
             StudySettingsDialog(studyId),
           );
-        }),
+        },),
     GoRoute(
         path: "/settings",
         name: accountSettingsRouteName,
@@ -348,7 +344,7 @@ class RouterConf {
             state,
             const AccountSettingsDialog(),
           );
-        }),
+        },),
     GoRoute(
         path: "/password_recovery",
         name: recoverPasswordRouteName,
@@ -358,17 +354,18 @@ class RouterConf {
                 formKey: AuthFormKey.passwordRecovery,
                 body: PasswordRecoveryForm(),
               ),
-            )),
+            ),),
   ];
 
   static GoRoute route(String name) {
-    searchRouteNames(List<GoRoute> subRoutes) {
+    GoRoute? searchRouteNames(List<GoRoute> subRoutes) {
       if (subRoutes.isEmpty) return null;
-      for (GoRoute route in subRoutes) {
+      for (final GoRoute route in subRoutes) {
         if (route.name == name) return route;
-        GoRoute? newRoute = searchRouteNames(List<GoRoute>.from(route.routes));
+        final GoRoute? newRoute = searchRouteNames(List<GoRoute>.from(route.routes));
         if (newRoute != null) return newRoute;
       }
+      return null;
     }
 
     return searchRouteNames(routes)!;
diff --git a/designer_v2/lib/routing/router_intent.dart b/designer_v2/lib/routing/router_intent.dart
index d4559b449..d4e1b623a 100644
--- a/designer_v2/lib/routing/router_intent.dart
+++ b/designer_v2/lib/routing/router_intent.dart
@@ -75,13 +75,14 @@ class RoutingIntents {
           RouteParams.studyId: studyId,
         },
       );
-  static final studyEditIntervention = (StudyID studyId, InterventionID interventionId) => RoutingIntent(
-        route: RouterConf.route(studyEditInterventionRouteName),
-        params: {
-          RouteParams.studyId: studyId,
-          RouteParams.interventionId: interventionId,
-        },
-      );
+  static final studyEditIntervention =
+      (StudyID studyId, InterventionID interventionId) => RoutingIntent(
+            route: RouterConf.route(studyEditInterventionRouteName),
+            params: {
+              RouteParams.studyId: studyId,
+              RouteParams.interventionId: interventionId,
+            },
+          );
   static final studyEditMeasurements = (StudyID studyId) => RoutingIntent(
         route: RouterConf.route(studyEditMeasurementsRouteName),
         params: {
@@ -94,29 +95,36 @@ class RoutingIntents {
           RouteParams.studyId: studyId,
         },
       );
-  static final studyEditMeasurement = (StudyID studyId, MeasurementID measurementId) => RoutingIntent(
-        route: RouterConf.route(studyEditMeasurementRouteName),
+  static final studyEditMeasurement =
+      (StudyID studyId, MeasurementID measurementId) => RoutingIntent(
+            route: RouterConf.route(studyEditMeasurementRouteName),
+            params: {
+              RouteParams.studyId: studyId,
+              RouteParams.measurementId: measurementId,
+            },
+          );
+  static final studyTest =
+      (StudyID studyId, {String? appRoute}) => RoutingIntent(
+            route: RouterConf.route(studyTestRouteName),
+            params: {
+              RouteParams.studyId: studyId,
+            },
+            queryParams: {
+              if (appRoute != null) RouteParams.testAppRoute: appRoute,
+            },
+          );
+  static final studyRecruit = (StudyID studyId) => RoutingIntent(
+        route: RouterConf.route(studyRecruitRouteName),
         params: {
           RouteParams.studyId: studyId,
-          RouteParams.measurementId: measurementId,
         },
       );
-  static final studyTest =
-      (StudyID studyId, {String? appRoute}) => RoutingIntent(route: RouterConf.route(studyTestRouteName), params: {
-            RouteParams.studyId: studyId,
-          }, queryParams: {
-            if (appRoute != null) RouteParams.testAppRoute: appRoute,
-          });
-  static final studyRecruit = (StudyID studyId) => RoutingIntent(
-        route: RouterConf.route(studyRecruitRouteName),
+  static final studyMonitor = (StudyID studyId) => RoutingIntent(
+        route: RouterConf.route(studyMonitorRouteName),
         params: {
           RouteParams.studyId: studyId,
         },
       );
-  static final studyMonitor =
-      (StudyID studyId) => RoutingIntent(route: RouterConf.route(studyMonitorRouteName), params: {
-            RouteParams.studyId: studyId,
-          });
   static final studyAnalyze = (StudyID studyId) => RoutingIntent(
         route: RouterConf.route(studyAnalyzeRouteName),
         params: {
@@ -137,12 +145,14 @@ class RoutingIntents {
   static final studyNew = studyEdit(Config.newStudyId);
   static final login = RoutingIntent(route: RouterConf.route(loginRouteName));
   static final signup = RoutingIntent(route: RouterConf.route(signupRouteName));
-  static final passwordForgot = RoutingIntent(route: RouterConf.route(forgotPasswordRouteName));
+  static final passwordForgot =
+      RoutingIntent(route: RouterConf.route(forgotPasswordRouteName));
   static final passwordForgot2 = (String email) => RoutingIntent(
         route: RouterConf.route(forgotPasswordRouteName),
         extra: email,
       );
-  static final passwordRecovery = RoutingIntent(route: RouterConf.route(recoverPasswordRouteName));
+  static final passwordRecovery =
+      RoutingIntent(route: RouterConf.route(recoverPasswordRouteName));
   static final error = (Exception error) => RoutingIntent(
         route: RouterConf.route(errorRouteName),
         extra: error,
@@ -182,7 +192,7 @@ class RoutingIntent extends Equatable {
   String get routeName => route.name!;
   Map<String, String> get arguments => {...params, ...queryParams};
 
-  _validateRoute() {
+  void _validateRoute() {
     if (route.name == null) {
       throw Exception("Failed to declare RoutingIntent for Route "
           "(path=${route.path}) because Route.name is not defined");
@@ -196,7 +206,7 @@ class RoutingIntent extends Equatable {
     if (settings.arguments is! Map) {
       return false;
     }
-    if (!mapEquals(settings.arguments as Map, arguments)) {
+    if (!mapEquals(settings.arguments! as Map, arguments)) {
       return false;
     }
     return true;
@@ -217,16 +227,26 @@ extension GoRouterX on GoRouter {
   void dispatch(RoutingIntent intent, {bool? push}) {
     const defaultDispatchMethod = RoutingIntentDispatch.go;
 
-    RoutingIntentDispatch dispatchMethod = (push != null)
-        ? ((push) ? RoutingIntentDispatch.push : RoutingIntentDispatch.go)
-        : ((intent.dispatch != null) ? intent.dispatch! : defaultDispatchMethod);
+    final RoutingIntentDispatch dispatchMethod = (push != null)
+        ? (push ? RoutingIntentDispatch.push : RoutingIntentDispatch.go)
+        : ((intent.dispatch != null)
+            ? intent.dispatch!
+            : defaultDispatchMethod);
 
     if (dispatchMethod == RoutingIntentDispatch.push) {
-      pushNamed(intent.route.name!,
-          pathParameters: intent.params, queryParameters: intent.queryParams, extra: intent.extra);
+      pushNamed(
+        intent.route.name!,
+        pathParameters: intent.params,
+        queryParameters: intent.queryParams,
+        extra: intent.extra,
+      );
     } else if (dispatchMethod == RoutingIntentDispatch.go) {
-      goNamed(intent.route.name!,
-          pathParameters: intent.params, queryParameters: intent.queryParams, extra: intent.extra);
+      goNamed(
+        intent.route.name!,
+        pathParameters: intent.params,
+        queryParameters: intent.queryParams,
+        extra: intent.extra,
+      );
     }
   }
 }
diff --git a/designer_v2/lib/routing/router_utils.dart b/designer_v2/lib/routing/router_utils.dart
index e7b43e170..3e9107a3e 100644
--- a/designer_v2/lib/routing/router_utils.dart
+++ b/designer_v2/lib/routing/router_utils.dart
@@ -3,7 +3,7 @@ import 'package:go_router/go_router.dart';
 import 'package:studyu_designer_v2/theme.dart';
 
 extension RouterConvencienceX on GoRouter {
-  get currentPath => routerDelegate.currentConfiguration.fullPath;
+  String get currentPath => routerDelegate.currentConfiguration.fullPath;
 
   bool isOn(String routeName) {
     return namedLocation(routeName) == currentPath;
diff --git a/designer_v2/lib/services/notification_dispatcher.dart b/designer_v2/lib/services/notification_dispatcher.dart
index 6a3f49ed9..5a1e69232 100644
--- a/designer_v2/lib/services/notification_dispatcher.dart
+++ b/designer_v2/lib/services/notification_dispatcher.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
-
 import 'dart:math' as math;
+
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_designer_v2/localization/string_hardcoded.dart';
@@ -10,15 +10,16 @@ import 'package:studyu_designer_v2/services/notification_types.dart';
 /// A wrapper widgets that is subscribed to the [NotificationService] and
 /// automatically dispatches its [NotificationIntent]s to show a Snackbar.
 class NotificationDispatcher extends ConsumerStatefulWidget {
-  const NotificationDispatcher(
-      {required this.child,
-      this.scaffoldMessengerKey,
-      this.navigatorKey,
-      this.snackbarWidth,
-      this.snackbarInnerPadding = 16.0,
-      this.snackbarBehavior = SnackBarBehavior.fixed,
-      this.snackbarDefaultDuration = 2500,
-      super.key});
+  const NotificationDispatcher({
+    required this.child,
+    this.scaffoldMessengerKey,
+    this.navigatorKey,
+    this.snackbarWidth,
+    this.snackbarInnerPadding = 16.0,
+    this.snackbarBehavior = SnackBarBehavior.fixed,
+    this.snackbarDefaultDuration = 2500,
+    super.key,
+  });
 
   /// Pass-through widget that is rendered as is
   final Widget? child;
@@ -39,10 +40,12 @@ class NotificationDispatcher extends ConsumerStatefulWidget {
   final int snackbarDefaultDuration;
 
   @override
-  ConsumerState<ConsumerStatefulWidget> createState() => _NotificationDispatcherState();
+  ConsumerState<ConsumerStatefulWidget> createState() =>
+      _NotificationDispatcherState();
 }
 
-class _NotificationDispatcherState extends ConsumerState<NotificationDispatcher> {
+class _NotificationDispatcherState
+    extends ConsumerState<NotificationDispatcher> {
   /// Subscription to a stream of [NotificationIntent]s to be dispatched
   late final StreamSubscription<NotificationIntent> _subscription;
 
@@ -51,7 +54,10 @@ class _NotificationDispatcherState extends ConsumerState<NotificationDispatcher>
   @override
   void initState() {
     super.initState();
-    _subscription = ref.read(notificationServiceProvider).watchNotifications().listen(_handleNotification);
+    _subscription = ref
+        .read(notificationServiceProvider)
+        .watchNotifications()
+        .listen(_handleNotification);
   }
 
   ScaffoldMessengerState _getMessengerState() {
@@ -83,7 +89,8 @@ class _NotificationDispatcherState extends ConsumerState<NotificationDispatcher>
         navigatorState = Navigator.of(context);
       }
     } catch (_) {
-      throw Exception("NotificationDispatcher context could not obtain reference to "
+      throw Exception(
+          "NotificationDispatcher context could not obtain reference to "
           "NavigatorState. Make sure the NotificationDispatcher is placed below "
           "a Navigator in the widget tree, or provide a reference via the "
           "navigatorKey global key.");
@@ -95,56 +102,70 @@ class _NotificationDispatcherState extends ConsumerState<NotificationDispatcher>
     switch (notification.type) {
       case NotificationType.snackbar:
         final messengerState = _getMessengerState();
-        messengerState.showSnackBar(_buildSnackbar(notification as SnackbarIntent, messengerState));
-        break;
+        messengerState.showSnackBar(
+            _buildSnackbar(notification as SnackbarIntent, messengerState));
       case NotificationType.alert:
         final navigatorState = _getNavigatorState()!;
         showDialog(
-            context: navigatorState.context,
-            builder: (BuildContext context) => _buildAlertDialog(notification as AlertIntent, navigatorState));
-        break;
+          context: navigatorState.context,
+          builder: (BuildContext context) =>
+              _buildAlertDialog(notification as AlertIntent, navigatorState),
+        );
       default:
-        throw UnimplementedError("Failed to handle NotificationIntent of unexpected type.");
+        throw UnimplementedError(
+            "Failed to handle NotificationIntent of unexpected type.");
     }
   }
 
-  AlertDialog _buildAlertDialog(AlertIntent notification, NavigatorState navigatorState) {
+  AlertDialog _buildAlertDialog(
+      AlertIntent notification, NavigatorState navigatorState) {
     final textTheme = Theme.of(context).textTheme;
 
     final List<Widget> actions = [];
     if (notification.actions != null) {
       for (final action in notification.actions!) {
-        actions.add(TextButton(
-          onPressed: () {
-            if (notification.dismissOnAction) {
-              // always pop & don't wait for [action.onSelect]
-              navigatorState.pop();
-            }
-            action.onSelect();
-          },
-          child: Text(action.label,
+        actions.add(
+          TextButton(
+            onPressed: () {
+              if (notification.dismissOnAction) {
+                // always pop & don't wait for [action.onSelect]
+                navigatorState.pop();
+              }
+              action.onSelect();
+            },
+            child: Text(
+              action.label,
               style: (action.isDestructive)
                   ? textTheme.labelLarge!.copyWith(color: Colors.redAccent)
-                  : textTheme.labelLarge!),
-        ));
+                  : textTheme.labelLarge!,
+            ),
+          ),
+        );
       }
     }
 
     return AlertDialog(
-      title: Row(mainAxisSize: MainAxisSize.min, children: [
-        Icon(notification.icon),
-        Text("️ ${notification.title}", style: textTheme.displaySmall),
-      ]),
+      title: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(notification.icon),
+          Text("️ ${notification.title}", style: textTheme.displaySmall),
+        ],
+      ),
       content: ConstrainedBox(
-          constraints: BoxConstraints(
-            minWidth: 300,
-            maxWidth: math.max(300, MediaQuery.of(context).size.width * 0.33),
-          ),
-          child: Row(children: [
+        constraints: BoxConstraints(
+          minWidth: 300,
+          maxWidth: math.max(300, MediaQuery.of(context).size.width * 0.33),
+        ),
+        child: Row(
+          children: [
             Flexible(
-              child: notificationContent(notification.message, notification.customContent),
+              child: notificationContent(
+                  notification.message, notification.customContent),
             ),
-          ])),
+          ],
+        ),
+      ),
       actions: actions,
     );
   }
@@ -157,28 +178,41 @@ class _NotificationDispatcherState extends ConsumerState<NotificationDispatcher>
     }
   }
 
-  SnackBar _buildSnackbar(SnackbarIntent notification, ScaffoldMessengerState messengerState) {
+  SnackBar _buildSnackbar(
+      SnackbarIntent notification, ScaffoldMessengerState messengerState) {
     final theme = Theme.of(context);
 
     return SnackBar(
-      width: (widget.snackbarBehavior == SnackBarBehavior.floating) ? widget.snackbarWidth : null,
+      width: (widget.snackbarBehavior == SnackBarBehavior.floating)
+          ? widget.snackbarWidth
+          : null,
       content: Row(
-        mainAxisAlignment: MainAxisAlignment.start,
-        crossAxisAlignment: CrossAxisAlignment.center,
         children: [
-          (notification.icon != null)
-              ? Padding(
-                  padding: EdgeInsets.all(0.5 * widget.snackbarInnerPadding),
-                  child: Icon(notification.icon,
-                      size: 2 / 3 * widget.snackbarInnerPadding, color: theme.snackBarTheme.actionTextColor),
-                )
-              : const SizedBox.shrink(),
-          Text(notification.message!, style: theme.textTheme.titleMedium!.copyWith(color: theme.colorScheme.onPrimary))
+          if (notification.icon != null)
+            Padding(
+              padding: EdgeInsets.all(0.5 * widget.snackbarInnerPadding),
+              child: Icon(
+                notification.icon,
+                size: 2 / 3 * widget.snackbarInnerPadding,
+                color: theme.snackBarTheme.actionTextColor,
+              ),
+            )
+          else
+            const SizedBox.shrink(),
+          Text(notification.message!,
+              style: theme.textTheme.titleMedium!
+                  .copyWith(color: theme.colorScheme.onPrimary)),
         ],
       ),
-      duration: Duration(milliseconds: notification.duration ?? widget.snackbarDefaultDuration),
-      padding: EdgeInsets.fromLTRB(2.5 * widget.snackbarInnerPadding, widget.snackbarInnerPadding,
-          1.5 * widget.snackbarInnerPadding, widget.snackbarInnerPadding),
+      duration: Duration(
+          milliseconds:
+              notification.duration ?? widget.snackbarDefaultDuration),
+      padding: EdgeInsets.fromLTRB(
+        2.5 * widget.snackbarInnerPadding,
+        widget.snackbarInnerPadding,
+        1.5 * widget.snackbarInnerPadding,
+        widget.snackbarInnerPadding,
+      ),
       behavior: widget.snackbarBehavior,
       action: SnackBarAction(
         label: "X".hardcoded,
@@ -203,7 +237,7 @@ class _NotificationDispatcherState extends ConsumerState<NotificationDispatcher>
       _getMessengerState();
       _getNavigatorState();
       // Remember validation for future builds avoiding setState during build
-      Future.delayed(const Duration(milliseconds: 0), () => setState(() => _isValidated = true));
+      Future.delayed(Duration.zero, () => setState(() => _isValidated = true));
     }
     return widget.child ?? Container();
   }
diff --git a/designer_v2/lib/services/notification_types.dart b/designer_v2/lib/services/notification_types.dart
index 95bf85b30..d14c26715 100644
--- a/designer_v2/lib/services/notification_types.dart
+++ b/designer_v2/lib/services/notification_types.dart
@@ -10,8 +10,15 @@ enum NotificationType { snackbar, alert, custom }
 ///   [SnackbarIntent] - renders the notification as a snackbar
 ///   [AlertIntent] - renders the notification as an alert dialog
 abstract class NotificationIntent {
-  NotificationIntent({this.message, this.customContent, this.icon, this.actions, required this.type}) {
-    if (message == null && customContent == null) throw Exception("Invalid AlertIntent");
+  NotificationIntent(
+      {this.message,
+      this.customContent,
+      this.icon,
+      this.actions,
+      required this.type,}) {
+    if (message == null && customContent == null) {
+      throw Exception("Invalid AlertIntent");
+    }
   }
 
   final String? message;
@@ -23,7 +30,8 @@ abstract class NotificationIntent {
   void register(NotificationAction action) {
     actions ??= [];
     // upsert action by its label
-    final existingIdx = actions!.map((action) => action.label).toList().indexOf(action.label);
+    final existingIdx =
+        actions!.map((action) => action.label).toList().indexOf(action.label);
     if (existingIdx != -1) {
       actions![existingIdx] = action;
     } else {
@@ -39,7 +47,10 @@ class NotificationAction {
   final FutureActionHandler onSelect;
   final bool isDestructive;
 
-  NotificationAction({required this.label, required this.onSelect, this.isDestructive = false});
+  NotificationAction(
+      {required this.label,
+      required this.onSelect,
+      this.isDestructive = false,});
 }
 
 /// Encapsulates a call to [showSnackbar]
@@ -68,5 +79,6 @@ class AlertIntent extends NotificationIntent {
   final String title;
   final bool dismissOnAction;
 
-  get isDestructive => (actions == null) ? false : actions!.any((action) => action.isDestructive);
+  bool get isDestructive =>
+      actions != null && actions!.any((action) => action.isDestructive);
 }
diff --git a/designer_v2/lib/services/notifications.dart b/designer_v2/lib/services/notifications.dart
index 88cfe6d48..966b5c9ba 100644
--- a/designer_v2/lib/services/notifications.dart
+++ b/designer_v2/lib/services/notifications.dart
@@ -28,7 +28,7 @@ class Notifications {
       title: tr.dialog_study_delete_title,
       message: tr.dialog_study_delete_description,
       icon: Icons.delete_rounded,
-      actions: [NotificationDefaultActions.cancel]);
+      actions: [NotificationDefaultActions.cancel],);
 }
 
 class NotificationDefaultActions {
diff --git a/designer_v2/lib/theme.dart b/designer_v2/lib/theme.dart
index 957020312..0b78d08d8 100644
--- a/designer_v2/lib/theme.dart
+++ b/designer_v2/lib/theme.dart
@@ -17,7 +17,7 @@ class ThemeConfig {
   static const double kHoverFadeFactor = 0.7;
   static const double kMuteFadeFactor = 0.8;
 
-  static bodyBackgroundColor(ThemeData theme) => theme.scaffoldBackgroundColor.faded(0.5);
+  static Color bodyBackgroundColor(ThemeData theme) => theme.scaffoldBackgroundColor.faded(0.5);
 
   static Color modalBarrierColor(ThemeData theme) => theme.colorScheme.secondary.withOpacity(0.4);
 
@@ -70,7 +70,7 @@ class WebTransitionBuilder extends PageTransitionsBuilder {
   const WebTransitionBuilder();
   @override
   Widget buildTransitions<T>(PageRoute<T> route, BuildContext context, Animation<double> animation,
-      Animation<double> secondaryAnimation, Widget child) {
+      Animation<double> secondaryAnimation, Widget child,) {
     final opacityOldTween = Tween(begin: 1.0, end: 0.0).chain(CurveTween(curve: Curves.easeIn));
     final opacityNewTween = Tween(begin: 0.0, end: 1.0).chain(CurveTween(curve: Curves.easeIn));
 
@@ -88,7 +88,7 @@ class ThemeSettingChange extends Notification {
 
 class ThemeProvider extends InheritedWidget {
   ThemeProvider(
-      {super.key, required this.settings, required this.lightDynamic, required this.darkDynamic, required super.child});
+      {super.key, required this.settings, required this.lightDynamic, required this.darkDynamic, required super.child,});
 
   final ValueNotifier<ThemeSettings> settings;
   final ColorScheme? lightDynamic;
@@ -135,7 +135,7 @@ class ThemeProvider extends InheritedWidget {
         sourceColorHct:
             dynamicPrimary != null ? Hct.fromInt(dynamicPrimary.value) : Hct.fromInt(source(targetColor).value),
         isDark: false,
-        contrastLevel: 0.0);
+        contrastLevel: 0.0,);
     final colorScheme = ColorScheme.fromSeed(
       seedColor: dynamicPrimary ?? source(targetColor),
       brightness: brightness,
@@ -268,35 +268,30 @@ class ThemeProvider extends InheritedWidget {
         borderRadius: BorderRadius.circular(5),
         borderSide: BorderSide(
           color: colors.surfaceContainerHighest.withOpacity(0.6),
-          width: 1.0,
         ),
       ),
       enabledBorder: OutlineInputBorder(
         borderRadius: BorderRadius.circular(5),
         borderSide: BorderSide(
           color: colors.surfaceContainerHighest.withOpacity(0.8),
-          width: 1.0,
         ),
       ),
       focusedBorder: OutlineInputBorder(
         borderRadius: BorderRadius.circular(5),
         borderSide: BorderSide(
           color: colors.primary,
-          width: 1.0,
         ),
       ),
       errorBorder: OutlineInputBorder(
         borderRadius: BorderRadius.circular(5),
         borderSide: BorderSide(
           color: colors.error,
-          width: 1.0,
         ),
       ),
       focusedErrorBorder: OutlineInputBorder(
         borderRadius: BorderRadius.circular(5),
         borderSide: BorderSide(
           color: colors.error,
-          width: 1.0,
         ),
       ),
     );
@@ -392,9 +387,8 @@ class ThemeProvider extends InheritedWidget {
         BoxShadow(
           color: colors.secondary.withOpacity(0.3),
           blurRadius: 3,
-          spreadRadius: 0,
-        )
-      ]),
+        ),
+      ],),
     );
   }
 
diff --git a/designer_v2/lib/utils/behaviour_subject.dart b/designer_v2/lib/utils/behaviour_subject.dart
index b82f56f6b..b58e4ce82 100644
--- a/designer_v2/lib/utils/behaviour_subject.dart
+++ b/designer_v2/lib/utils/behaviour_subject.dart
@@ -28,7 +28,7 @@ class SuppressedBehaviorSubject<T> {
     return controller;
   }
 
-  close() {
+  void close() {
     _controller.close();
   }
 }
diff --git a/designer_v2/lib/utils/color.dart b/designer_v2/lib/utils/color.dart
index 7922c2253..291034dae 100644
--- a/designer_v2/lib/utils/color.dart
+++ b/designer_v2/lib/utils/color.dart
@@ -8,7 +8,7 @@ class SerializableColor extends Color {
   JsonMap toJson() => {
         "value": super.value,
       };
-  static SerializableColor fromJson(JsonMap json) => SerializableColor(
+  SerializableColor fromJson(JsonMap json) => SerializableColor(
         int.parse(json["value"].toString()),
       );
 }
diff --git a/designer_v2/lib/utils/debouncer.dart b/designer_v2/lib/utils/debouncer.dart
index 15699e511..715f906e5 100644
--- a/designer_v2/lib/utils/debouncer.dart
+++ b/designer_v2/lib/utils/debouncer.dart
@@ -1,10 +1,9 @@
 import 'dart:async';
 
 import 'package:async/async.dart';
+import 'package:studyu_designer_v2/utils/performance.dart';
 import 'package:studyu_designer_v2/utils/typings.dart';
 
-import 'performance.dart';
-
 abstract class ExecutionLimiter {
   ExecutionLimiter({this.milliseconds = 300});
   final int milliseconds;
@@ -33,15 +32,17 @@ class Debouncer extends ExecutionLimiter {
 
   CancelableOperation? _uncompletedFutureOperation;
 
-  call({VoidCallback? callback, FutureFactory? futureBuilder}) {
-    if ((callback == null && futureBuilder == null) || (callback != null && futureBuilder != null)) {
-      throw Exception("Must call Debouncer with either callback or futureBuilder");
+  void call({VoidCallback? callback, FutureFactory? futureBuilder}) {
+    if ((callback == null && futureBuilder == null) ||
+        (callback != null && futureBuilder != null)) {
+      throw Exception(
+          "Must call Debouncer with either callback or futureBuilder",);
     }
 
     // Wrap the given callback so we can work with a future-based interface
     futureBuilder ??= () => runAsync(callback);
 
-    startFutureOperation() {
+    void startFutureOperation() {
       print("startFutureOperation");
       _uncompletedFutureOperation = CancelableOperation.fromFuture(
         futureBuilder!().then((_) => _uncompletedFutureOperation = null),
@@ -67,10 +68,11 @@ class Debouncer extends ExecutionLimiter {
 class Throttler extends ExecutionLimiter {
   Throttler({super.milliseconds = 300});
 
-  call(VoidCallback callback) {
+  void call(VoidCallback callback) {
     if (ExecutionLimiter._timer?.isActive ?? false) return;
     ExecutionLimiter._timer?.cancel();
     callback();
-    ExecutionLimiter._timer = Timer(Duration(milliseconds: milliseconds), () {});
+    ExecutionLimiter._timer =
+        Timer(Duration(milliseconds: milliseconds), () {});
   }
 }
diff --git a/designer_v2/lib/utils/extensions.dart b/designer_v2/lib/utils/extensions.dart
index d9c697460..a6258e6c0 100644
--- a/designer_v2/lib/utils/extensions.dart
+++ b/designer_v2/lib/utils/extensions.dart
@@ -19,23 +19,43 @@ extension StringX on String {
     label ??= kCopySuffix;
 
     final regexStr = r"\((?:" + label + r")\s*(\d*)\)$";
-    suffixFactory(n) => (n > 0) ? "($label ${n.toString()})" : "($label)";
+    String suffixFactory(int n) => (n > 0) ? "($label $n)" : "($label)";
     final regex = RegExp(regexStr);
 
-    Iterable<RegExpMatch> matches = regex.allMatches(this);
+    final Iterable<RegExpMatch> matches = regex.allMatches(this);
 
     if (matches.isNotEmpty) {
       final matchedSuffix = matches.last;
       final matchedIncrement = matchedSuffix.group(1);
-      final currentIncrement = (matchedIncrement == null || matchedIncrement == '') ? 0 : int.parse(matchedIncrement);
-      final strWithoutLabel = replaceRange(matchedSuffix.start, matchedSuffix.end, '').trim();
+      final currentIncrement =
+          (matchedIncrement == null || matchedIncrement == '')
+              ? 0
+              : int.parse(matchedIncrement);
+      final strWithoutLabel =
+          replaceRange(matchedSuffix.start, matchedSuffix.end, '').trim();
       return "$strWithoutLabel ${suffixFactory(currentIncrement + 1)}";
     }
     return "$this ${suffixFactory(0)}";
   }
 
   List<String> get alphabet {
-    return ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o'];
+    return [
+      'a',
+      'b',
+      'c',
+      'd',
+      'e',
+      'f',
+      'g',
+      'h',
+      'i',
+      'j',
+      'k',
+      'l',
+      'm',
+      'n',
+      'o',
+    ];
   }
 
   String alphabetLetterFrom(int idx) {
@@ -60,8 +80,8 @@ extension DurationX on Duration {
 }
 
 extension DateTimeAgoX on DateTime {
-  String _timeAgoFormatted({inSeconds = true}) {
-    Duration diff = DateTime.now().difference(this);
+  String _timeAgoFormatted({bool inSeconds = true}) {
+    final Duration diff = DateTime.now().difference(this);
 
     if (diff.inYears >= 1) {
       return tr.date_diff_years(diff.inYears);
@@ -85,7 +105,7 @@ extension DateTimeAgoX on DateTime {
   }
 
   String toTimeAgoStringPrecise() {
-    return _timeAgoFormatted(inSeconds: true);
+    return _timeAgoFormatted();
   }
 }
 
@@ -118,7 +138,7 @@ extension ListX<E> on List<E> {
 
 extension FirstWhereOrNullExtension<E> on Iterable<E> {
   E? firstWhereOrNull(bool Function(E) test) {
-    for (E element in this) {
+    for (final E element in this) {
       if (test(element)) return element;
     }
     return null;
diff --git a/designer_v2/lib/utils/file_download.dart b/designer_v2/lib/utils/file_download.dart
index a53b34cba..5926b7df6 100644
--- a/designer_v2/lib/utils/file_download.dart
+++ b/designer_v2/lib/utils/file_download.dart
@@ -1,23 +1,26 @@
 import 'dart:convert';
 // ignore: avoid_web_libraries_in_flutter
 import 'dart:html';
+
 import 'package:csv/csv.dart';
 import 'package:flutter/foundation.dart';
 import 'package:studyu_designer_v2/localization/string_hardcoded.dart';
 import 'package:studyu_designer_v2/utils/json_format.dart';
 import 'package:studyu_designer_v2/utils/performance.dart';
 
-downloadFile({required String fileContent, required String filename}) {
-  List<int> bytes = utf8.encode(fileContent);
+dynamic downloadFile({required String fileContent, required String filename}) {
+  final List<int> bytes = utf8.encode(fileContent);
   return downloadBytes(bytes: bytes, filename: filename);
 }
 
-downloadBytes({required List<int> bytes, required String filename}) {
+void downloadBytes({required List<int> bytes, required String filename}) {
   if (!kIsWeb) {
-    throw Exception("The StudyU designer only support the web platform".hardcoded);
+    throw Exception(
+        "The StudyU designer only support the web platform".hardcoded,);
   }
   final content = base64Encode(bytes);
-  final anchor = AnchorElement(href: "data:application/octet-stream;charset=utf-16le;base64,$content")
+  final anchor = AnchorElement(
+      href: "data:application/octet-stream;charset=utf-16le;base64,$content",)
     ..style.display = 'none'
     ..download = filename;
   document.body?.append(anchor);
@@ -32,7 +35,7 @@ abstract class FileFormatEncoder {
 
   String encode(List<Map<String, dynamic>> records);
 
-  call(List<Map<String, dynamic>> records) {
+  String call(List<Map<String, dynamic>> records) {
     return encode(records);
   }
 }
@@ -49,7 +52,8 @@ class CSVStringEncoder extends FileFormatEncoder {
     final dataRows = records.map((record) {
       final row = [];
       for (final columnName in headerRow) {
-        final cellValue = record[columnName] ?? ''; // fill missing columns with empty string
+        final cellValue =
+            record[columnName] ?? ''; // fill missing columns with empty string
         row.add(cellValue);
       }
       return row;
diff --git a/designer_v2/lib/utils/font.dart b/designer_v2/lib/utils/font.dart
index d1a1eefd8..e81af5c1c 100644
--- a/designer_v2/lib/utils/font.dart
+++ b/designer_v2/lib/utils/font.dart
@@ -1,11 +1,11 @@
 String getEmojiFlag(String country) {
-  country = country.toUpperCase();
+  final countryUpper = country.toUpperCase();
 
-  int flagOffset = 0x1F1E6;
-  int asciiOffset = 0x41;
+  const int flagOffset = 0x1F1E6;
+  const int asciiOffset = 0x41;
 
-  int firstChar = country.codeUnitAt(0) - asciiOffset + flagOffset;
-  int secondChar = country.codeUnitAt(1) - asciiOffset + flagOffset;
+  final int firstChar = countryUpper.codeUnitAt(0) - asciiOffset + flagOffset;
+  final int secondChar = countryUpper.codeUnitAt(1) - asciiOffset + flagOffset;
 
   return String.fromCharCode(firstChar) + String.fromCharCode(secondChar);
 }
diff --git a/designer_v2/lib/utils/json_file_loader.dart b/designer_v2/lib/utils/json_file_loader.dart
index 040831d9f..53591c150 100644
--- a/designer_v2/lib/utils/json_file_loader.dart
+++ b/designer_v2/lib/utils/json_file_loader.dart
@@ -1,6 +1,7 @@
-import 'package:studyu_designer_v2/utils/typings.dart';
 import 'dart:convert';
+
 import 'package:flutter/services.dart' show rootBundle;
+import 'package:studyu_designer_v2/utils/typings.dart';
 
 abstract class JsonFileLoader {
   /// Path to the directory containing the JSON files to be loaded
@@ -15,13 +16,13 @@ abstract class JsonFileLoader {
   // TODO: figure out Union types here for JsonMap | JsonList
   Future<JsonMap> parseJsonMapFromAssets(String filename) async {
     final jsonString = await rootBundle.loadString(jsonAssetsPath + filename);
-    final result = await jsonDecode(jsonString);
+    final result = await jsonDecode(jsonString) as JsonMap;
     return result;
   }
 
   Future<JsonList> parseJsonListFromAssets(String filename) async {
     final jsonString = await rootBundle.loadString(jsonAssetsPath + filename);
-    final result = await jsonDecode(jsonString);
+    final result = await jsonDecode(jsonString) as JsonList;
     return result;
   }
 }
diff --git a/designer_v2/lib/utils/json_format.dart b/designer_v2/lib/utils/json_format.dart
index d2cea0c4d..fc7986c09 100644
--- a/designer_v2/lib/utils/json_format.dart
+++ b/designer_v2/lib/utils/json_format.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 
 String prettyJson(dynamic json, {int indent = 2}) {
-  var spaces = ' ' * indent;
-  var encoder = JsonEncoder.withIndent(spaces);
+  final spaces = ' ' * indent;
+  final encoder = JsonEncoder.withIndent(spaces);
   return encoder.convert(json);
 }
 
diff --git a/designer_v2/lib/utils/model_action.dart b/designer_v2/lib/utils/model_action.dart
index 39e852d2b..cccb5a755 100644
--- a/designer_v2/lib/utils/model_action.dart
+++ b/designer_v2/lib/utils/model_action.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 
@@ -5,17 +7,18 @@ class ModelAction<T> {
   final T type;
   final String label;
   IconData? icon;
-  final Function onExecute;
+  final FutureOr<void> Function() onExecute;
   final bool isAvailable;
   final bool isDestructive;
 
-  ModelAction(
-      {required this.type,
-      required this.label,
-      required this.onExecute,
-      this.isAvailable = true,
-      this.isDestructive = false,
-      this.icon});
+  ModelAction({
+    required this.type,
+    required this.label,
+    required this.onExecute,
+    this.isAvailable = true,
+    this.isDestructive = false,
+    this.icon,
+  });
 }
 
 abstract class IModelActionProvider<V> {
@@ -69,7 +72,8 @@ Map<ModelActionType, IconData> modelActionIcons = {
 
 /// Decorates a list of [actions] with their corresponding icon
 /// Helps us keep presentational data & business logic separate
-List<ModelAction<T>> withIcons<T>(List<ModelAction<T>> actions, Map<T, IconData> iconMap) {
+List<ModelAction<T>> withIcons<T>(
+    List<ModelAction<T>> actions, Map<T, IconData> iconMap,) {
   for (final action in actions) {
     if (iconMap.containsKey(action.type)) {
       action.icon = iconMap[action.type];
diff --git a/designer_v2/lib/utils/optimistic_update.dart b/designer_v2/lib/utils/optimistic_update.dart
index 672a4d97a..437fd7770 100644
--- a/designer_v2/lib/utils/optimistic_update.dart
+++ b/designer_v2/lib/utils/optimistic_update.dart
@@ -47,9 +47,7 @@ class OptimisticUpdate {
       }
       _runUpdateHandlerIfAny();
     } catch (e, stackTrace) {
-      if (onError != null) {
-        onError!(e, stackTrace);
-      }
+      onError?.call(e, stackTrace);
       rollback();
       _runUpdateHandlerIfAny();
       if (rethrowErrors) {
@@ -59,8 +57,6 @@ class OptimisticUpdate {
   }
 
   void _runUpdateHandlerIfAny() {
-    if (onUpdate != null) {
-      onUpdate!();
-    }
+    onUpdate?.call();
   }
 }
diff --git a/designer_v2/lib/utils/performance.dart b/designer_v2/lib/utils/performance.dart
index fe135e336..7ad61d939 100644
--- a/designer_v2/lib/utils/performance.dart
+++ b/designer_v2/lib/utils/performance.dart
@@ -6,26 +6,33 @@ import 'package:flutter/material.dart';
 
 /// Prevents jank from lazy-loading system-specific emoji fonts
 /// See https://github.com/flutter/flutter/issues/42586
-prefetchEmojiFont() {
-  ParagraphBuilder pb = ParagraphBuilder(ParagraphStyle(locale: WidgetsBinding.instance.platformDispatcher.locale));
+void prefetchEmojiFont() {
+  final ParagraphBuilder pb = ParagraphBuilder(
+    ParagraphStyle(
+      locale: WidgetsBinding.instance.platformDispatcher.locale,
+    ),
+  );
   pb.addText('\ud83d\ude01'); // smiley face emoji
   pb.build().layout(const ParagraphConstraints(width: 100));
 }
 
-Future<T> runInBackground<T>(Function func) async {
+Future<T> runInBackground<T>(T Function() func) async {
   final p = ReceivePort();
 
-  await Isolate.spawn((SendPort sendPort) {
-    final T? result = func();
-    if (result != null) {
-      Isolate.exit(sendPort, result);
-    }
-  }, p.sendPort);
+  await Isolate.spawn(
+    (SendPort sendPort) {
+      final result = func();
+      if (result != null) {
+        Isolate.exit(sendPort, result);
+      }
+    },
+    p.sendPort,
+  );
 
   return await p.first as T;
 }
 
 /// Immediately queues up the [computation] in the event loop
 Future<T> runAsync<T>(FutureOr<T> Function()? computation) {
-  return Future.delayed(const Duration(milliseconds: 0), computation);
+  return Future.delayed(Duration.zero, computation);
 }
diff --git a/designer_v2/lib/utils/time_of_day.dart b/designer_v2/lib/utils/time_of_day.dart
index 2f9af8d21..5fe3e1fb7 100644
--- a/designer_v2/lib/utils/time_of_day.dart
+++ b/designer_v2/lib/utils/time_of_day.dart
@@ -6,13 +6,14 @@ import 'package:studyu_designer_v2/utils/typings.dart';
 class Time extends TimeOfDay {
   const Time({required super.hour, required super.minute});
 
-  static fromTimeOfDay(TimeOfDay timeOfDay) => Time(hour: timeOfDay.hour, minute: timeOfDay.minute);
+  Time.fromTimeOfDay(TimeOfDay timeOfDay)
+      : super(hour: timeOfDay.hour, minute: timeOfDay.minute);
 
   JsonMap toJson() => {
         "hour": super.hour,
         "minute": super.minute,
       };
-  static Time fromJson(JsonMap json) => Time(
+  Time fromJson(JsonMap json) => Time(
         hour: int.parse(json["hour"].toString()),
         minute: int.parse(json["minute"].toString()),
       );
@@ -22,7 +23,9 @@ class Time extends TimeOfDay {
 class TimeValueAccessor extends ControlValueAccessor<Time, String> {
   @override
   String modelToViewValue(Time? modelValue) {
-    return modelValue == null ? '' : '${modelValue.hour}:${_addLeadingZeroIfNeeded(modelValue.minute)}';
+    return modelValue == null
+        ? ''
+        : '${modelValue.hour}:${_addLeadingZeroIfNeeded(modelValue.minute)}';
   }
 
   @override
@@ -45,5 +48,6 @@ class TimeValueAccessor extends ControlValueAccessor<Time, String> {
     }
   }
 
-  String _addLeadingZeroIfNeeded(int value) => (value < 10) ? '0$value' : value.toString();
+  String _addLeadingZeroIfNeeded(int value) =>
+      (value < 10) ? '0$value' : value.toString();
 }
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 699474e79..78826fa82 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -516,6 +516,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.1"
+  lint:
+    dependency: "direct dev"
+    description:
+      name: lint
+      sha256: d758a5211fce7fd3f5e316f804daefecdc34c7e53559716125e6da7388ae8565
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.0"
   lints:
     dependency: transitive
     description:

From 7bfd8d4ae79e67f6a3d9b2303705a65695ebccbe Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 9 Jun 2024 16:52:45 +0200
Subject: [PATCH 159/314] chore: format

---
 app/lib/app.dart                              |  10 +-
 app/lib/constants.dart                        |   3 +-
 app/lib/main.dart                             |  15 +-
 app/lib/routes.dart                           |  59 +-
 app/lib/screens/app_onboarding/about.dart     |  36 +-
 .../app_onboarding/app_outdated_screen.dart   |  14 +-
 .../app_onboarding/loading_screen.dart        |  21 +-
 app/lib/screens/app_onboarding/preview.dart   |  16 +-
 app/lib/screens/app_onboarding/terms.dart     |  15 +-
 app/lib/screens/app_onboarding/welcome.dart   |  15 +-
 .../dashboard/contact_tab/contact_screen.dart |  28 +-
 .../study/dashboard/contact_tab/faq.dart      |  18 +-
 .../screens/study/dashboard/dashboard.dart    | 101 +++-
 app/lib/screens/study/dashboard/settings.dart |  30 +-
 .../task_overview_tab/progress_row.dart       |  32 +-
 .../dashboard/task_overview_tab/task_box.dart |  12 +-
 .../task_overview_tab/task_overview.dart      |  24 +-
 .../multimodal/capture_picture_screen.dart    |  17 +-
 app/lib/screens/study/onboarding/consent.dart |  65 ++-
 .../study/onboarding/eligibility_screen.dart  |  36 +-
 .../onboarding/intervention_selection.dart    |  21 +-
 .../study/onboarding/journey_overview.dart    |  21 +-
 app/lib/screens/study/onboarding/kickoff.dart |   8 +-
 .../study/onboarding/onboarding_progress.dart |   3 +-
 .../study/onboarding/study_overview.dart      |  22 +-
 .../study/onboarding/study_selection.dart     |  35 +-
 .../performance/performance_details.dart      |  44 +-
 .../performance/performance_section.dart      |  38 +-
 .../screens/study/report/report_details.dart  |  16 +-
 .../screens/study/report/report_history.dart  |  15 +-
 .../report/report_section_container.dart      |  12 +-
 .../sections/average_section_widget.dart      |  68 ++-
 .../intervention/checkmark_task_widget.dart   |  18 +-
 .../questionnaire_task_widget.dart            |  30 +-
 app/lib/screens/study/tasks/task_screen.dart  |  14 +-
 app/lib/util/app_analytics.dart               |   3 +-
 app/lib/util/cache.dart                       |  43 +-
 app/lib/util/color.dart                       |   3 +-
 app/lib/util/data_processing.dart             |  12 +-
 app/lib/util/intervention.dart                |   9 +-
 app/lib/util/notifications.dart               |  76 ++-
 app/lib/util/save_pdf.dart                    |   6 +-
 app/lib/util/schedule_notifications.dart      |  53 +-
 app/lib/util/study_subject_extension.dart     |   8 +-
 app/lib/util/temporary_storage_handler.dart   |  19 +-
 app/lib/widgets/html_text.dart                |   6 +-
 app/lib/widgets/intervention_card.dart        |  52 +-
 .../audio_recording_question_widget.dart      |  28 +-
 .../widgets/questionnaire/custom_slider.dart  |  32 +-
 .../image_capturing_question_widget.dart      |  16 +-
 .../questionnaire/question_container.dart     |  15 +-
 .../questionnaire/questionnaire_widget.dart   |  35 +-
 .../annotated_scale_question_widget.dart      |   9 +-
 .../questions/choice_question_widget.dart     |   8 +-
 .../questions/free_text_question_widget.dart  |  12 +-
 .../questions/scale_question_widget.dart      |  21 +-
 .../visual_analogue_question_widget.dart      |  20 +-
 app/lib/widgets/selectable_button.dart        |   6 +-
 app/lib/widgets/study_tile.dart               |  14 +-
 core/lib/src/models/consent/consent_item.dart |   3 +-
 core/lib/src/models/contact.dart              |   3 +-
 core/lib/src/models/data/data_reference.dart  |  13 +-
 .../eligibility/eligibility_criterion.dart    |   3 +-
 .../src/models/expressions/expression.dart    |   3 +-
 .../expressions/types/boolean_expression.dart |   3 +-
 .../expressions/types/choice_expression.dart  |   3 +-
 .../expressions/types/not_expression.dart     |   3 +-
 .../expressions/types/value_expression.dart   |   4 +-
 .../models/interventions/intervention.dart    |   3 +-
 .../interventions/intervention_task.dart      |   6 +-
 .../interventions/tasks/checkmark_task.dart   |   9 +-
 .../src/models/observations/observation.dart  |   3 +-
 .../tasks/questionnaire_task.dart             |  22 +-
 core/lib/src/models/questionnaire/answer.dart |   6 +-
 .../src/models/questionnaire/question.dart    |  15 +-
 .../questionnaire/question_conditional.dart   |   9 +-
 .../models/questionnaire/questionnaire.dart   |   8 +-
 .../questionnaire/questionnaire_state.dart    |   6 +-
 .../questions/annotated_scale_question.dart   |   6 +-
 .../questions/audio_recording_question.dart   |  12 +-
 .../questions/boolean_question.dart           |   6 +-
 .../questions/choice_question.dart            |   3 +-
 .../questions/free_text_question.dart         |  16 +-
 .../questions/image_capturing_question.dart   |   6 +-
 .../questions/scale_question.dart             |  33 +-
 .../questions/slider_question.dart            |   3 +-
 .../questions/visual_analogue_question.dart   |   3 +-
 .../lib/src/models/report/report_section.dart |   6 +-
 .../models/report/report_specification.dart   |   3 +-
 .../report/sections/average_section.dart      |   3 +-
 .../sections/linear_regression_section.dart   |   3 +-
 core/lib/src/models/results/result.dart       |  13 +-
 .../results/intervention_result.dart          |  10 +-
 .../study_results/results/numeric_result.dart |  19 +-
 .../models/study_results/study_result.dart    |   3 +-
 .../models/study_schedule/study_schedule.dart |  13 +-
 core/lib/src/models/tables/app_config.dart    |   3 +-
 core/lib/src/models/tables/repo.dart          |   3 +-
 core/lib/src/models/tables/study.dart         |  53 +-
 core/lib/src/models/tables/study_invite.dart  |   3 +-
 core/lib/src/models/tables/study_subject.dart |  98 ++--
 .../src/models/tables/subject_progress.dart   |   3 +-
 core/lib/src/models/tables/user.dart          |  11 +-
 core/lib/src/models/tasks/schedule.dart       |  12 +-
 core/lib/src/models/tasks/task.dart           |   3 +-
 core/lib/src/models/tasks/task_instance.dart  |  24 +-
 core/lib/src/util/analytics.dart              |   6 +-
 core/lib/src/util/extensions.dart             |   7 +-
 .../util/multimodal/blob_storage_handler.dart |  12 +-
 core/lib/src/util/supabase_object.dart        |  41 +-
 .../study_schedule/study_schedule_test.dart   |  15 +-
 designer_v2/integration_test/app_test.dart    |  24 +-
 .../integration_test/robots/auth_robot.dart   |   8 +-
 .../robots/study_info_robot.dart              |  91 +--
 .../robots/study_interventions_robot.dart     |  46 +-
 .../robots/study_measurements_robot.dart      |  65 ++-
 .../lib/common_views/action_popup_menu.dart   | 117 ++--
 .../lib/common_views/async_value_widget.dart  |  11 +-
 designer_v2/lib/common_views/badge.dart       |  77 +--
 designer_v2/lib/common_views/collapse.dart    |  17 +-
 .../common_views/constrained_flexible.dart    |  17 +-
 designer_v2/lib/common_views/dialog.dart      |  10 +-
 .../lib/common_views/form_buttons.dart        | 102 ++--
 .../common_views/form_consumer_widget.dart    |  19 +-
 .../lib/common_views/form_scaffold.dart       |   6 +-
 .../lib/common_views/form_table_layout.dart   |  68 ++-
 designer_v2/lib/common_views/icons.dart       |   3 +-
 .../lib/common_views/layout_two_column.dart   |  16 +-
 .../lib/common_views/mouse_events.dart        |   4 +-
 .../lib/common_views/pages/error_page.dart    |   3 +-
 .../lib/common_views/range_slider.dart        |  19 +-
 .../lib/common_views/secondary_button.dart    |   4 +-
 .../lib/common_views/sidesheet/sidesheet.dart |  97 ++--
 designer_v2/lib/common_views/studyu_logo.dart |  34 +-
 .../lib/common_views/styling_information.dart |  94 ++--
 .../lib/common_views/sync_indicator.dart      |   6 +-
 .../lib/common_views/text_hyperlink.dart      |  27 +-
 .../lib/common_views/text_paragraph.dart      |   3 +-
 .../lib/common_views/under_construction.dart  |  13 +-
 designer_v2/lib/common_views/utils.dart       |   3 +-
 designer_v2/lib/domain/study.dart             |   6 +-
 designer_v2/lib/domain/study_invite.dart      |   4 +-
 .../features/account/account_settings.dart    |  43 +-
 .../study_analyze_controller_state.dart       |   3 +-
 .../features/analyze/study_analyze_page.dart  |  39 +-
 .../features/analyze/study_export_zip.dart    |   6 +-
 designer_v2/lib/features/app.dart             |  19 +-
 .../lib/features/auth/auth_scaffold.dart      |   6 +-
 .../features/dashboard/dashboard_page.dart    | 103 ++--
 .../dashboard/dashboard_scaffold.dart         |  43 +-
 .../features/dashboard/dashboard_state.dart   |  72 ++-
 .../features/dashboard/studies_filter.dart    |   6 +-
 .../lib/features/dashboard/studies_table.dart | 134 +++--
 .../studies_table_column_header.dart          |  41 +-
 .../dashboard/studies_table_item.dart         |  70 ++-
 .../consent_item_form_controller.dart         |  36 +-
 .../enrollment/consent_item_form_view.dart    | 164 +++---
 .../enrollment_form_controller.dart           |  52 +-
 .../enrollment/enrollment_form_data.dart      |  16 +-
 .../screener_question_form_controller.dart    |  62 +-
 .../screener_question_logic_form_view.dart    |  38 +-
 .../design/info/study_info_form_data.dart     |  13 +-
 .../design/info/study_info_form_view.dart     | 321 ++++++-----
 .../intervention_form_controller.dart         |  26 +-
 .../interventions/intervention_form_data.dart |  19 +-
 .../interventions/intervention_form_view.dart |   7 +-
 .../intervention_task_form_controller.dart    |  36 +-
 .../intervention_task_form_view.dart          | 140 ++---
 .../interventions_form_data.dart              |  15 +-
 .../interventions_form_view.dart              | 102 ++--
 .../study_schedule_form_controller_mixin.dart |  63 ++-
 .../study_schedule_form_data.dart             |  16 +-
 .../study_schedule_form_view.dart             |  66 ++-
 .../measurements_form_controller.dart         |  32 +-
 .../measurements/measurements_form_data.dart  |  16 +-
 .../measurements/measurements_form_view.dart  |  59 +-
 .../survey/survey_form_controller.dart        |  22 +-
 .../measurements/survey/survey_form_data.dart |   9 +-
 .../measurements/survey/survey_form_view.dart |  18 +-
 .../features/design/reports/report_badge.dart |  41 +-
 .../design/reports/reports_form_data.dart     |   6 +-
 .../section/report_item_form_controller.dart  |   8 +-
 .../section/report_item_form_data.dart        |  23 +-
 .../section/report_item_form_view.dart        |  63 ++-
 .../types/average_section_form_view.dart      |  28 +-
 .../section/types/data_reference_editor.dart  |   8 +-
 .../linear_regression_section_form_view.dart  |  39 +-
 .../audio_recording_question_form_view.dart   |  14 +-
 .../types/free_text_question_form_view.dart   | 199 ++++---
 .../image_capturing_question_form_view.dart   |   3 +-
 .../question/types/question_type.dart         |   3 +-
 .../types/scale_question_form_view.dart       |  84 +--
 .../questionnaire_form_controller_mixin.dart  |  17 +-
 .../questionnaire_form_data.dart              |  20 +-
 .../schedule/schedule_controls_view.dart      | 230 ++++----
 .../shared/schedule/schedule_form_data.dart   |  51 +-
 .../design/study_design_page_view.dart        |  28 +-
 .../features/design/study_form_providers.dart |  62 +-
 .../features/design/study_form_scaffold.dart  |   8 +-
 .../lib/features/forms/form_array_table.dart  |  17 +-
 .../lib/features/forms/form_control.dart      |   7 +-
 .../lib/features/forms/form_validation.dart   |  12 +-
 .../forms/form_view_model_collection.dart     |  12 +-
 .../form_view_model_collection_actions.dart   |  12 +-
 .../publish/study_publish_dialog_success.dart |  48 +-
 .../lib/features/recruit/enrolled_badge.dart  |  17 +-
 .../recruit/invite_code_form_view.dart        |  91 +--
 .../features/recruit/invite_codes_table.dart  |  31 +-
 .../features/recruit/study_recruit_page.dart  |  70 ++-
 .../study/settings/study_settings_dialog.dart |  41 +-
 .../study/study_controller_state.dart         |  22 +-
 .../lib/features/study/study_navbar.dart      |  14 +-
 .../study/study_participation_badge.dart      |  38 +-
 .../features/study/study_status_badge.dart    |  61 +-
 .../features/study/study_test_controller.dart |  26 +-
 .../study/study_test_frame_controllers.dart   |   8 +-
 .../study/study_test_frame_views.dart         |  66 ++-
 .../lib/localization/language_picker.dart     |  53 +-
 .../lib/localization/locale_providers.dart    |   8 +-
 .../platform_locale_mobile.dart               |   6 +-
 .../platform_locale/platform_locale_stub.dart |   4 +-
 .../platform_locale/platform_locale_web.dart  |   6 +-
 designer_v2/lib/main.dart                     |   7 +-
 .../lib/repositories/auth_repository.dart     |  25 +-
 .../repositories/invite_code_repository.dart  |  17 +-
 .../lib/repositories/study_repository.dart    |  53 +-
 .../lib/repositories/supabase_client.dart     |  57 +-
 .../lib/repositories/user_repository.dart     |  13 +-
 designer_v2/lib/routing/router.dart           |  15 +-
 designer_v2/lib/routing/router_config.dart    | 529 ++++++++++--------
 designer_v2/lib/routing/router_utils.dart     |   3 +-
 designer_v2/lib/services/clipboard.dart       |   3 +-
 .../lib/services/notification_dispatcher.dart |  30 +-
 .../lib/services/notification_service.dart    |  12 +-
 .../lib/services/notification_types.dart      |  22 +-
 designer_v2/lib/services/notifications.dart   |   9 +-
 designer_v2/lib/theme.dart                    | 149 +++--
 designer_v2/lib/utils/debouncer.dart          |   3 +-
 designer_v2/lib/utils/file_download.dart      |   6 +-
 designer_v2/lib/utils/input_formatter.dart    |   4 +-
 designer_v2/lib/utils/model_action.dart       |   4 +-
 designer_v2/lib/utils/validation.dart         |   9 +-
 flutter_common/lib/src/utils/env_loader.dart  |   3 +-
 .../lib/src/utils/retry_future_builder.dart   |   9 +-
 flutter_common/lib/src/utils/storage.dart     |   6 +-
 flutter_common/lib/src/utils/user.dart        |   9 +-
 246 files changed, 4747 insertions(+), 2820 deletions(-)

diff --git a/app/lib/app.dart b/app/lib/app.dart
index 3c5d63835..b9631cf66 100644
--- a/app/lib/app.dart
+++ b/app/lib/app.dart
@@ -12,7 +12,8 @@ import 'routes.dart';
 import 'theme.dart';
 
 class MyApp extends StatefulWidget {
-  const MyApp(this.queryParameters, this.appConfig, {super.key, required this.initialRoute});
+  const MyApp(this.queryParameters, this.appConfig,
+      {super.key, required this.initialRoute});
   final Map<String, String> queryParameters;
   final AppConfig? appConfig;
   final String initialRoute;
@@ -31,7 +32,9 @@ class _MyAppState extends State<MyApp> {
   Widget build(BuildContext context) {
     return MultiProvider(
       providers: [
-        ChangeNotifierProvider<AppLanguage>(create: (context) => AppLanguage(AppLocalizations.supportedLocales)),
+        ChangeNotifierProvider<AppLanguage>(
+            create: (context) =>
+                AppLanguage(AppLocalizations.supportedLocales)),
         ChangeNotifierProvider<AppState>(create: (context) => AppState()),
       ],
       child: Consumer<AppLanguage>(
@@ -50,7 +53,8 @@ class _MyAppState extends State<MyApp> {
             ],
             localeListResolutionCallback: (locales, supportedLocales) {
               // print('device locales=$locales supported locales=$supportedLocales');
-              final supportedLanguageCodes = supportedLocales.map((e) => e.languageCode);
+              final supportedLanguageCodes =
+                  supportedLocales.map((e) => e.languageCode);
               if (locales != null) {
                 for (final locale in locales) {
                   if (supportedLanguageCodes.contains(locale.languageCode)) {
diff --git a/app/lib/constants.dart b/app/lib/constants.dart
index 1d5f7292b..0b755bb22 100644
--- a/app/lib/constants.dart
+++ b/app/lib/constants.dart
@@ -1,2 +1,3 @@
-const String playStoreUrl = 'https://play.google.com/store/apps/details?id=health.studyu.app';
+const String playStoreUrl =
+    'https://play.google.com/store/apps/details?id=health.studyu.app';
 const String appstoreUrl = 'https://itunes.apple.com/app/id1571991198';
diff --git a/app/lib/main.dart b/app/lib/main.dart
index a061af6a9..805c17258 100644
--- a/app/lib/main.dart
+++ b/app/lib/main.dart
@@ -24,11 +24,13 @@ void notificationTapBackground(NotificationResponse notificationResponse) {
       ' payload: ${notificationResponse.payload}');
   if (notificationResponse.input?.isNotEmpty ?? false) {
     // ignore: avoid_print
-    print('notification action tapped with input: ${notificationResponse.input}');
+    print(
+        'notification action tapped with input: ${notificationResponse.input}');
   }
 }
 
-GlobalKey<NavigatorState> navigatorKey = GlobalKey(debugLabel: 'Main Navigator');
+GlobalKey<NavigatorState> navigatorKey =
+    GlobalKey(debugLabel: 'Main Navigator');
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -52,7 +54,8 @@ Future<void> main() async {
 
   await AppAnalytics.init();
   if (!kDebugMode && AppAnalytics.isUserEnabled) {
-    AppAnalytics.start(appConfig, MyApp(queryParameters, appConfig, initialRoute: initialRoute));
+    AppAnalytics.start(appConfig,
+        MyApp(queryParameters, appConfig, initialRoute: initialRoute));
   } else {
     runApp(MyApp(queryParameters, appConfig, initialRoute: initialRoute));
   }
@@ -69,7 +72,8 @@ Future<void> main() async {
       if (currentRoute == Routes.appOutdated) return;
       final appConfig = await AppConfig.getAppConfig();
       if (await isAppOutdated(appConfig)) {
-        await navigatorState.pushNamedAndRemoveUntil(Routes.appOutdated, (route) => false);
+        await navigatorState.pushNamedAndRemoveUntil(
+            Routes.appOutdated, (route) => false);
       }
     } catch (error) {
       // device could be offline
@@ -92,7 +96,8 @@ Future<bool> isAppOutdated(AppConfig appConfig) async {
   final minVersionMajor = int.parse(minVersionParts[0]);
   final minVersionMinor = int.parse(minVersionParts[1]);
 
-  return appVersionMajor < minVersionMajor || (appVersionMajor == minVersionMajor && appVersionMinor < minVersionMinor);
+  return appVersionMajor < minVersionMajor ||
+      (appVersionMajor == minVersionMajor && appVersionMinor < minVersionMinor);
 }
 
 /// This is needed for flutter_local_notifications
diff --git a/app/lib/routes.dart b/app/lib/routes.dart
index 6af899e7f..ed4a3a9d7 100644
--- a/app/lib/routes.dart
+++ b/app/lib/routes.dart
@@ -47,7 +47,8 @@ class Routes {
           child: Center(
             child: Padding(
               padding: const EdgeInsets.all(16),
-              child: Text('No route defined for ${settings.name}.\nThe developers should fix this 👩‍💻'),
+              child: Text(
+                  'No route defined for ${settings.name}.\nThe developers should fix this 👩‍💻'),
             ),
           ),
         ),
@@ -55,43 +56,63 @@ class Routes {
     );
   }
 
-  static Route<dynamic>? generateRoute(RouteSettings settings, Map<String, String> queryParameters) {
+  static Route<dynamic>? generateRoute(
+      RouteSettings settings, Map<String, String> queryParameters) {
     final uri = Uri.parse(settings.name!);
     switch (uri.path) {
       case loading:
-        return MaterialPageRoute(builder: (_) => const LoadingScreen(), settings: settings);
+        return MaterialPageRoute(
+            builder: (_) => const LoadingScreen(), settings: settings);
       case preview:
-        return MaterialPageRoute(builder: (_) => LoadingScreen(queryParameters: queryParameters), settings: settings);
+        return MaterialPageRoute(
+            builder: (_) => LoadingScreen(queryParameters: queryParameters),
+            settings: settings);
       case appOutdated:
-        return MaterialPageRoute(builder: (_) => const AppOutdatedScreen(), settings: settings);
+        return MaterialPageRoute(
+            builder: (_) => const AppOutdatedScreen(), settings: settings);
       case dashboard:
-        return MaterialPageRoute(builder: (_) => const DashboardScreen(), settings: settings);
+        return MaterialPageRoute(
+            builder: (_) => const DashboardScreen(), settings: settings);
       case welcome:
-        return MaterialPageRoute(builder: (_) => const WelcomeScreen(), settings: settings);
+        return MaterialPageRoute(
+            builder: (_) => const WelcomeScreen(), settings: settings);
       case about:
-        return MaterialPageRoute(builder: (_) => const AboutScreen(), settings: settings);
+        return MaterialPageRoute(
+            builder: (_) => const AboutScreen(), settings: settings);
       case terms:
-        return MaterialPageRoute(builder: (_) => const TermsScreen(), settings: settings);
+        return MaterialPageRoute(
+            builder: (_) => const TermsScreen(), settings: settings);
       case studySelection:
-        return MaterialPageRoute(builder: (_) => const StudySelectionScreen(), settings: settings);
+        return MaterialPageRoute(
+            builder: (_) => const StudySelectionScreen(), settings: settings);
       case studyOverview:
-        return MaterialPageRoute(builder: (_) => const StudyOverviewScreen(), settings: settings);
+        return MaterialPageRoute(
+            builder: (_) => const StudyOverviewScreen(), settings: settings);
       case interventionSelection:
-        return MaterialPageRoute(builder: (_) => const InterventionSelectionScreen(), settings: settings);
+        return MaterialPageRoute(
+            builder: (_) => const InterventionSelectionScreen(),
+            settings: settings);
       case journey:
-        return MaterialPageRoute(builder: (_) => const JourneyOverviewScreen(), settings: settings);
+        return MaterialPageRoute(
+            builder: (_) => const JourneyOverviewScreen(), settings: settings);
       case consent:
-        return MaterialPageRoute<bool>(builder: (_) => const ConsentScreen(), settings: settings);
+        return MaterialPageRoute<bool>(
+            builder: (_) => const ConsentScreen(), settings: settings);
       case kickoff:
-        return MaterialPageRoute(builder: (_) => const KickoffScreen(), settings: settings);
+        return MaterialPageRoute(
+            builder: (_) => const KickoffScreen(), settings: settings);
       case contact:
-        return MaterialPageRoute(builder: (_) => const ContactScreen(), settings: settings);
+        return MaterialPageRoute(
+            builder: (_) => const ContactScreen(), settings: settings);
       case faq:
-        return MaterialPageRoute(builder: (_) => const FAQ(), settings: settings);
+        return MaterialPageRoute(
+            builder: (_) => const FAQ(), settings: settings);
       case appSettings:
-        return MaterialPageRoute(builder: (_) => const Settings(), settings: settings);
+        return MaterialPageRoute(
+            builder: (_) => const Settings(), settings: settings);
       case reportHistory:
-        return MaterialPageRoute(builder: (_) => const ReportHistoryScreen(), settings: settings);
+        return MaterialPageRoute(
+            builder: (_) => const ReportHistoryScreen(), settings: settings);
       default:
         //final potentialSessionString = Uri.decodeComponent(settings.name.replaceFirst('/', ''));
         //return MaterialPageRoute(builder: (_) => LoadingScreen(sessionString: potentialSessionString));
diff --git a/app/lib/screens/app_onboarding/about.dart b/app/lib/screens/app_onboarding/about.dart
index 1c7bae717..e37a7b7c3 100644
--- a/app/lib/screens/app_onboarding/about.dart
+++ b/app/lib/screens/app_onboarding/about.dart
@@ -30,10 +30,12 @@ class AboutScreen extends StatelessWidget {
                       child: Icon(MdiIcons.food, size: 80, color: Colors.black),
                     ),
                     Expanded(
-                      child: Icon(MdiIcons.equal, size: 80, color: Colors.black),
+                      child:
+                          Icon(MdiIcons.equal, size: 80, color: Colors.black),
                     ),
                     Expanded(
-                      child: Icon(MdiIcons.sleepOff, size: 80, color: Colors.black),
+                      child: Icon(MdiIcons.sleepOff,
+                          size: 80, color: Colors.black),
                     ),
                   ],
                 ),
@@ -69,7 +71,8 @@ class AboutScreen extends StatelessWidget {
                 Row(
                   children: [
                     Expanded(
-                      child: Icon(MdiIcons.help, size: 80, color: Colors.orange),
+                      child:
+                          Icon(MdiIcons.help, size: 80, color: Colors.orange),
                     ),
                   ],
                 ),
@@ -105,7 +108,8 @@ class AboutScreen extends StatelessWidget {
                 Row(
                   children: [
                     Expanded(
-                      child: Icon(MdiIcons.accountQuestion, size: 80, color: Colors.blue),
+                      child: Icon(MdiIcons.accountQuestion,
+                          size: 80, color: Colors.blue),
                     ),
                   ],
                 ),
@@ -141,7 +145,8 @@ class AboutScreen extends StatelessWidget {
                 Row(
                   children: [
                     Expanded(
-                      child: Icon(MdiIcons.exclamationThick, size: 80, color: Colors.blue),
+                      child: Icon(MdiIcons.exclamationThick,
+                          size: 80, color: Colors.blue),
                     )
                   ],
                 ),
@@ -177,7 +182,8 @@ class AboutScreen extends StatelessWidget {
                 Row(
                   children: [
                     Expanded(
-                      child: Icon(MdiIcons.alphaNBoxOutline, size: 80, color: Colors.blue),
+                      child: Icon(MdiIcons.alphaNBoxOutline,
+                          size: 80, color: Colors.blue),
                     ),
                     const Expanded(
                       child: Text(
@@ -187,7 +193,8 @@ class AboutScreen extends StatelessWidget {
                       ),
                     ),
                     Expanded(
-                      child: Icon(MdiIcons.numeric1BoxOutline, size: 80, color: Colors.blue),
+                      child: Icon(MdiIcons.numeric1BoxOutline,
+                          size: 80, color: Colors.blue),
                     ),
                   ],
                 ),
@@ -223,7 +230,8 @@ class AboutScreen extends StatelessWidget {
                 Row(
                   children: [
                     Expanded(
-                      child: Icon(MdiIcons.notebookOutline, size: 80, color: Colors.blue),
+                      child: Icon(MdiIcons.notebookOutline,
+                          size: 80, color: Colors.blue),
                     ),
                   ],
                 ),
@@ -259,7 +267,8 @@ class AboutScreen extends StatelessWidget {
                 Row(
                   children: [
                     Expanded(
-                      child: Icon(MdiIcons.alignVerticalBottom, size: 80, color: Colors.blue),
+                      child: Icon(MdiIcons.alignVerticalBottom,
+                          size: 80, color: Colors.blue),
                     ),
                   ],
                 ),
@@ -295,7 +304,8 @@ class AboutScreen extends StatelessWidget {
                 Row(
                   children: [
                     Expanded(
-                      child: Icon(MdiIcons.progressCheck, size: 80, color: Colors.blue),
+                      child: Icon(MdiIcons.progressCheck,
+                          size: 80, color: Colors.blue),
                     ),
                   ],
                 ),
@@ -327,7 +337,8 @@ class AboutScreen extends StatelessWidget {
               mainAxisSize: MainAxisSize.min,
               mainAxisAlignment: MainAxisAlignment.center,
               children: <Widget>[
-                const Image(image: AssetImage('assets/icon/logo.png'), height: 200),
+                const Image(
+                    image: AssetImage('assets/icon/logo.png'), height: 200),
                 const SizedBox(height: 50),
                 Text(
                   AppLocalizations.of(context)!.description_part9,
@@ -339,7 +350,8 @@ class AboutScreen extends StatelessWidget {
                   OutlinedButton.icon(
                     icon: Icon(MdiIcons.rocket),
                     onPressed: () => Navigator.pushNamed(context, Routes.terms),
-                    label: Text(AppLocalizations.of(context)!.get_started, style: const TextStyle(fontSize: 20)),
+                    label: Text(AppLocalizations.of(context)!.get_started,
+                        style: const TextStyle(fontSize: 20)),
                   ),
               ],
             ),
diff --git a/app/lib/screens/app_onboarding/app_outdated_screen.dart b/app/lib/screens/app_onboarding/app_outdated_screen.dart
index 61e18288c..b8950a391 100644
--- a/app/lib/screens/app_onboarding/app_outdated_screen.dart
+++ b/app/lib/screens/app_onboarding/app_outdated_screen.dart
@@ -29,21 +29,25 @@ class AppOutdatedScreen extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.center,
             children: <Widget>[
               const Spacer(),
-              const Image(image: AssetImage('assets/icon/logo.png'), height: 200),
+              const Image(
+                  image: AssetImage('assets/icon/logo.png'), height: 200),
               const SizedBox(height: 20),
               Padding(
                 padding: const EdgeInsets.all(20),
-                child:
-                    Text(loc.app_outdated_message, textAlign: TextAlign.center, style: const TextStyle(fontSize: 20)),
+                child: Text(loc.app_outdated_message,
+                    textAlign: TextAlign.center,
+                    style: const TextStyle(fontSize: 20)),
               ),
               const Spacer(),
               storeUrl != null && storeIcon != null
                   ? OutlinedButton.icon(
                       icon: Icon(storeIcon),
                       onPressed: () async {
-                        await launchUrl(Uri.parse(storeUrl!), mode: LaunchMode.externalNonBrowserApplication);
+                        await launchUrl(Uri.parse(storeUrl!),
+                            mode: LaunchMode.externalNonBrowserApplication);
                       },
-                      label: Text(loc.update_now, style: const TextStyle(fontSize: 20)),
+                      label: Text(loc.update_now,
+                          style: const TextStyle(fontSize: 20)),
                     )
                   : const SizedBox.shrink(),
               const Spacer(),
diff --git a/app/lib/screens/app_onboarding/loading_screen.dart b/app/lib/screens/app_onboarding/loading_screen.dart
index a719cfefb..e625a05a7 100644
--- a/app/lib/screens/app_onboarding/loading_screen.dart
+++ b/app/lib/screens/app_onboarding/loading_screen.dart
@@ -71,7 +71,8 @@ class _LoadingScreenState extends State<LoadingScreen> {
     try {
       subject = await _fetchRemoteSubject(selectedStudyObjectId);
     } catch (exception) {
-      StudyULogger.warning("Could not retrieve subject, maybe JWT is expired, try logging in: ${exception.toString()}");
+      StudyULogger.warning(
+          "Could not retrieve subject, maybe JWT is expired, try logging in: ${exception.toString()}");
       try {
         // Try signing in again. Needed if JWT is expired
         if (await signInParticipant()) {
@@ -102,9 +103,11 @@ class _LoadingScreenState extends State<LoadingScreen> {
 
   _initPreview(AppState state) async {
     if (state.isPreview) previewSubjectIdKey();
-    if (widget.queryParameters == null || widget.queryParameters!.isEmpty) return;
+    if (widget.queryParameters == null || widget.queryParameters!.isEmpty)
+      return;
 
-    StudyULogger.info("Preview: Found query parameters ${widget.queryParameters}");
+    StudyULogger.info(
+        "Preview: Found query parameters ${widget.queryParameters}");
     var lang = context.watch<AppLanguage>();
     final preview = Preview(
       widget.queryParameters,
@@ -131,7 +134,8 @@ class _LoadingScreenState extends State<LoadingScreen> {
       if (preview.selectedRoute == '/eligibilityCheck') {
         if (!mounted) return;
         // if we remove the await, we can push multiple times. warning: do not run in while(true)
-        await Navigator.push<EligibilityResult>(context, EligibilityScreen.routeFor(study: preview.study));
+        await Navigator.push<EligibilityResult>(
+            context, EligibilityScreen.routeFor(study: preview.study));
         // either do the same navigator push again or --> send a message back to designer and let it reload the whole page <--
         iFrameHelper.postRouteFinished();
         return;
@@ -145,7 +149,8 @@ class _LoadingScreenState extends State<LoadingScreen> {
         return;
       }
 
-      state.activeSubject = await preview.getStudySubject(state, createSubject: true);
+      state.activeSubject =
+          await preview.getStudySubject(state, createSubject: true);
 
       // CONSENT
       if (preview.selectedRoute == Routes.consent) {
@@ -188,13 +193,15 @@ class _LoadingScreenState extends State<LoadingScreen> {
       if (preview.selectedRoute == '/observation') {
         print(state.selectedStudy!.observations.first.id);
         final tasks = <Task>[
-          ...state.selectedStudy!.observations.where((observation) => observation.id == preview.extra),
+          ...state.selectedStudy!.observations
+              .where((observation) => observation.id == preview.extra),
         ];
         if (!mounted) return;
         await Navigator.push<bool>(
             context,
             TaskScreen.routeFor(
-                taskInstance: TaskInstance(tasks.first, tasks.first.schedule.completionPeriods.first.id)));
+                taskInstance: TaskInstance(tasks.first,
+                    tasks.first.schedule.completionPeriods.first.id)));
         iFrameHelper.postRouteFinished();
         return;
       }
diff --git a/app/lib/screens/app_onboarding/preview.dart b/app/lib/screens/app_onboarding/preview.dart
index 8ce71c21a..4f88f2d40 100644
--- a/app/lib/screens/app_onboarding/preview.dart
+++ b/app/lib/screens/app_onboarding/preview.dart
@@ -50,7 +50,8 @@ class Preview {
     }
 
     if (containsQuery('data')) {
-      final data = jsonDecode(queryParameters!['data']!) as Map<String, dynamic>;
+      final data =
+          jsonDecode(queryParameters!['data']!) as Map<String, dynamic>;
       study = Study.fromJson(data);
     } else {
       study = await SupabaseQuery.getById<Study>(queryParameters!['studyid']!);
@@ -108,7 +109,8 @@ class Preview {
   }
 
   bool containsQuery(String key) {
-    return queryParameters!.containsKey(key) && queryParameters![key]!.isNotEmpty;
+    return queryParameters!.containsKey(key) &&
+        queryParameters![key]!.isNotEmpty;
   }
 
   bool containsQueryPair(String key, String value) {
@@ -116,7 +118,8 @@ class Preview {
   }
 
   /// createSubject: If true, the method will return a new StudySubject if none can be found. Otherwise, null is returned
-  Future<StudySubject?> getStudySubject(AppState state, {bool createSubject = false}) async {
+  Future<StudySubject?> getStudySubject(AppState state,
+      {bool createSubject = false}) async {
     if (selectedStudyObjectId != null) {
       try {
         if (selectedRoute == '/intervention') {
@@ -134,10 +137,13 @@ class Preview {
             (foundSubject) {
               // todo baseline
               foundSubject.study.schedule.includeBaseline = false;
-              return foundSubject.userId == Supabase.instance.client.auth.currentUser!.id &&
+              return foundSubject.userId ==
+                      Supabase.instance.client.auth.currentUser!.id &&
                   foundSubject.studyId == study!.id &&
                   listEquals(
-                    foundSubject.selectedInterventions.map((i) => i.id).toList(),
+                    foundSubject.selectedInterventions
+                        .map((i) => i.id)
+                        .toList(),
                     getInterventionIds(),
                   );
             },
diff --git a/app/lib/screens/app_onboarding/terms.dart b/app/lib/screens/app_onboarding/terms.dart
index 11f299ffd..966f2aaf4 100644
--- a/app/lib/screens/app_onboarding/terms.dart
+++ b/app/lib/screens/app_onboarding/terms.dart
@@ -31,7 +31,8 @@ class _TermsScreenState extends State<TermsScreen> {
         child: Center(
           child: RetryFutureBuilder<AppConfig>(
               tryFunction: AppConfig.getAppConfig,
-              successBuilder: (BuildContext context, AppConfig? appConfig) => legalSection(context, appConfig)),
+              successBuilder: (BuildContext context, AppConfig? appConfig) =>
+                  legalSection(context, appConfig)),
         ),
       ),
       bottomNavigationBar: BottomOnboardingNavigation(
@@ -81,7 +82,8 @@ class _TermsScreenState extends State<TermsScreen> {
             OutlinedButton.icon(
               icon: Icon(MdiIcons.scaleBalance),
               onPressed: () async {
-                final uri = Uri.parse(appConfig.imprint[appLocale.languageCode.toString()]!);
+                final uri = Uri.parse(
+                    appConfig.imprint[appLocale.languageCode.toString()]!);
                 if (await canLaunchUrl(uri)) {
                   launchUrl(uri, mode: LaunchMode.externalApplication);
                 }
@@ -122,7 +124,9 @@ class LegalSection extends StatelessWidget {
     final theme = Theme.of(context);
     return Column(
       children: [
-        Text(title!, style: theme.textTheme.headlineMedium!.copyWith(color: theme.primaryColor)),
+        Text(title!,
+            style: theme.textTheme.headlineMedium!
+                .copyWith(color: theme.primaryColor)),
         const SizedBox(height: 20),
         Text(description!),
         const SizedBox(height: 20),
@@ -136,7 +140,10 @@ class LegalSection extends StatelessWidget {
           },
           label: Text(pdfUrlLabel!),
         ),
-        CheckboxListTile(title: Text(acknowledgment!), value: isChecked, onChanged: onChange),
+        CheckboxListTile(
+            title: Text(acknowledgment!),
+            value: isChecked,
+            onChanged: onChange),
       ],
     );
   }
diff --git a/app/lib/screens/app_onboarding/welcome.dart b/app/lib/screens/app_onboarding/welcome.dart
index 48b17429c..d407cf316 100644
--- a/app/lib/screens/app_onboarding/welcome.dart
+++ b/app/lib/screens/app_onboarding/welcome.dart
@@ -16,30 +16,35 @@ class WelcomeScreen extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.center,
             children: <Widget>[
               const Spacer(),
-              const Image(image: AssetImage('assets/icon/logo.png'), height: 200),
+              const Image(
+                  image: AssetImage('assets/icon/logo.png'), height: 200),
               const SizedBox(height: 20),
               OutlinedButton.icon(
                 icon: const Icon(Icons.info),
                 onPressed: () => Navigator.pushNamed(context, Routes.about),
-                label: Text(AppLocalizations.of(context)!.what_is_studyu, style: const TextStyle(fontSize: 20)),
+                label: Text(AppLocalizations.of(context)!.what_is_studyu,
+                    style: const TextStyle(fontSize: 20)),
               ),
               const SizedBox(height: 20),
               OutlinedButton.icon(
                 icon: Icon(MdiIcons.accountBox),
                 onPressed: () => Navigator.pushNamed(context, Routes.contact),
-                label: Text(AppLocalizations.of(context)!.contact, style: const TextStyle(fontSize: 20)),
+                label: Text(AppLocalizations.of(context)!.contact,
+                    style: const TextStyle(fontSize: 20)),
               ),
               const SizedBox(height: 20),
               OutlinedButton.icon(
                 icon: Icon(MdiIcons.frequentlyAskedQuestions),
                 onPressed: () => Navigator.pushNamed(context, Routes.faq),
-                label: Text(AppLocalizations.of(context)!.faq, style: const TextStyle(fontSize: 20)),
+                label: Text(AppLocalizations.of(context)!.faq,
+                    style: const TextStyle(fontSize: 20)),
               ),
               const Spacer(),
               OutlinedButton.icon(
                 icon: Icon(MdiIcons.rocket, size: 30),
                 onPressed: () => Navigator.pushNamed(context, Routes.terms),
-                label: Text(AppLocalizations.of(context)!.get_started, style: const TextStyle(fontSize: 20)),
+                label: Text(AppLocalizations.of(context)!.get_started,
+                    style: const TextStyle(fontSize: 20)),
               ),
               const Spacer()
             ],
diff --git a/app/lib/screens/study/dashboard/contact_tab/contact_screen.dart b/app/lib/screens/study/dashboard/contact_tab/contact_screen.dart
index 0302741ba..ba2356e4d 100644
--- a/app/lib/screens/study/dashboard/contact_tab/contact_screen.dart
+++ b/app/lib/screens/study/dashboard/contact_tab/contact_screen.dart
@@ -42,7 +42,9 @@ class _ContactScreenState extends State<ContactScreen> {
           ),
           RetryFutureBuilder<Contact>(
             tryFunction: AppConfig.getAppContact,
-            successBuilder: (BuildContext context, Contact? appSupportContact) => ContactWidget(
+            successBuilder:
+                (BuildContext context, Contact? appSupportContact) =>
+                    ContactWidget(
               contact: appSupportContact,
               title: AppLocalizations.of(context)!.app_support,
               subtitle: AppLocalizations.of(context)!.app_support_text,
@@ -68,7 +70,12 @@ class ContactWidget extends StatelessWidget {
   final String? subtitle;
   final Color color;
 
-  const ContactWidget({required this.contact, required this.title, required this.color, this.subtitle, super.key});
+  const ContactWidget(
+      {required this.contact,
+      required this.title,
+      required this.color,
+      this.subtitle,
+      super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -77,9 +84,12 @@ class ContactWidget extends StatelessWidget {
       return Container();
     }
 
-    final titles = [Text(title, style: theme.textTheme.titleLarge!.copyWith(color: color))];
+    final titles = [
+      Text(title, style: theme.textTheme.titleLarge!.copyWith(color: color))
+    ];
     if (subtitle != null && subtitle!.isNotEmpty) {
-      titles.add(Text(subtitle!, style: theme.textTheme.titleMedium!.copyWith(fontSize: 14)));
+      titles.add(Text(subtitle!,
+          style: theme.textTheme.titleMedium!.copyWith(fontSize: 14)));
     }
 
     return Column(
@@ -98,7 +108,9 @@ class ContactWidget extends StatelessWidget {
           ContactItem(
             itemName: AppLocalizations.of(context)!.irb,
             itemValue: contact!.institutionalReviewBoard! +
-                (contact?.institutionalReviewBoardNumber != null ? ': ${contact?.institutionalReviewBoardNumber}' : ''),
+                (contact?.institutionalReviewBoardNumber != null
+                    ? ': ${contact?.institutionalReviewBoardNumber}'
+                    : ''),
             iconData: MdiIcons.clipboardCheck,
             iconColor: color,
           ),
@@ -164,7 +176,8 @@ class ContactItem extends StatelessWidget {
       Uri uri;
       switch (type) {
         case ContactItemType.website:
-          if (!itemValue!.startsWith('http://') && !itemValue!.startsWith('https://')) {
+          if (!itemValue!.startsWith('http://') &&
+              !itemValue!.startsWith('https://')) {
             uri = Uri.parse('http://$itemValue');
           } else {
             uri = Uri.parse(itemValue!);
@@ -195,7 +208,8 @@ class ContactItem extends StatelessWidget {
     return ListTile(
       title: Text(itemName),
       subtitle: SelectableText(itemValue!),
-      leading: Icon(iconData, color: iconColor ?? Theme.of(context).primaryColor, size: iconSize),
+      leading: Icon(iconData,
+          color: iconColor ?? Theme.of(context).primaryColor, size: iconSize),
       onTap: type != null ? launchContact : null,
     );
   }
diff --git a/app/lib/screens/study/dashboard/contact_tab/faq.dart b/app/lib/screens/study/dashboard/contact_tab/faq.dart
index 997cc04f3..aee4830fc 100644
--- a/app/lib/screens/study/dashboard/contact_tab/faq.dart
+++ b/app/lib/screens/study/dashboard/contact_tab/faq.dart
@@ -7,7 +7,8 @@ class FAQ extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     // TODO(Manisha): Transfer strings to translation files
-    if (AppLocalizations.of(context)!.faq_full == 'Frequently Asked Questions') {
+    if (AppLocalizations.of(context)!.faq_full ==
+        'Frequently Asked Questions') {
       return Scaffold(
         appBar: AppBar(
           title: Text(AppLocalizations.of(context)!.faq_full),
@@ -68,7 +69,8 @@ final List<Entry> data_en = <Entry>[
       Entry(
         'How long will the study take to finish?',
         <Entry>[
-          Entry('The duration of each study is mentioned during initial study selection.'),
+          Entry(
+              'The duration of each study is mentioned during initial study selection.'),
         ],
       ),
       Entry(
@@ -93,7 +95,8 @@ final List<Entry> data_en = <Entry>[
       Entry(
         'How can I Opt out from the current study?',
         <Entry>[
-          Entry('You can do so by going to the Settings tab located on the Dashboard and clicking on "Opt-out" '),
+          Entry(
+              'You can do so by going to the Settings tab located on the Dashboard and clicking on "Opt-out" '),
         ],
       ),
     ],
@@ -120,7 +123,8 @@ final List<Entry> data_en = <Entry>[
       Entry(
         'How can I keep track of my activities?',
         <Entry>[
-          Entry('You can get an overview of your daily tasks and health status in the "Reports History section"'),
+          Entry(
+              'You can get an overview of your daily tasks and health status in the "Reports History section"'),
         ],
       ),
       Entry(
@@ -159,7 +163,8 @@ final data_de = <Entry>[
       Entry(
         'Welche persönlichen Daten sammelt die App?',
         <Entry>[
-          Entry('Die App sammelt keine persönlichen Daten des Benutzers, muss jedoch auf Zeit und Ort zugreifen.'),
+          Entry(
+              'Die App sammelt keine persönlichen Daten des Benutzers, muss jedoch auf Zeit und Ort zugreifen.'),
         ],
       ),
     ],
@@ -170,7 +175,8 @@ final data_de = <Entry>[
       Entry(
         'Wie lange dauert es, bis die Studie abgeschlossen ist?',
         <Entry>[
-          Entry('Die Dauer jeder Studie wird bei der ersten Studienauswahl angegeben.'),
+          Entry(
+              'Die Dauer jeder Studie wird bei der ersten Studienauswahl angegeben.'),
         ],
       ),
       Entry(
diff --git a/app/lib/screens/study/dashboard/dashboard.dart b/app/lib/screens/study/dashboard/dashboard.dart
index 90041fc96..a06725c44 100644
--- a/app/lib/screens/study/dashboard/dashboard.dart
+++ b/app/lib/screens/study/dashboard/dashboard.dart
@@ -37,11 +37,14 @@ class OverflowMenuItem {
   OverflowMenuItem(this.name, this.icon, {this.routeName, this.onTap});
 }
 
-class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingObserver {
+class _DashboardScreenState extends State<DashboardScreen>
+    with WidgetsBindingObserver {
   StudySubject? subject;
   List<TaskInstance>? scheduleToday;
 
-  get showNextDay => (kDebugMode || context.read<AppState>().isPreview) && !subject!.completedStudy;
+  get showNextDay =>
+      (kDebugMode || context.read<AppState>().isPreview) &&
+      !subject!.completedStudy;
 
   @override
   void initState() {
@@ -76,7 +79,8 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
       scheduleToday = subject!.scheduleFor(DateTime.now());
       if (widget.error != null) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
-          ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(widget.error!)));
+          ScaffoldMessenger.of(context)
+              .showSnackBar(SnackBar(content: Text(widget.error!)));
         });
       }
     }
@@ -96,7 +100,8 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
   Widget build(BuildContext context) {
     if (subject == null) {
       SchedulerBinding.instance.addPostFrameCallback((_) {
-        Navigator.pushNamedAndRemoveUntil(context, Routes.loading, (_) => false);
+        Navigator.pushNamedAndRemoveUntil(
+            context, Routes.loading, (_) => false);
       });
       return const SizedBox.shrink();
     }
@@ -117,7 +122,8 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
           IconButton(
             tooltip: 'Current report', // todo tr
             icon: Icon(MdiIcons.chartBar),
-            onPressed: () => Navigator.push(context, ReportDetailsScreen.routeFor(subject: subject!)),
+            onPressed: () => Navigator.push(
+                context, ReportDetailsScreen.routeFor(subject: subject!)),
           ),
           PopupMenuButton<OverflowMenuItem>(
             onSelected: (value) {
@@ -139,7 +145,9 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
                   MdiIcons.frequentlyAskedQuestions,
                   routeName: Routes.faq,
                 ),
-                OverflowMenuItem(AppLocalizations.of(context)!.settings, Icons.settings, routeName: Routes.appSettings),
+                OverflowMenuItem(
+                    AppLocalizations.of(context)!.settings, Icons.settings,
+                    routeName: Routes.appSettings),
                 OverflowMenuItem(
                   AppLocalizations.of(context)!.what_is_studyu,
                   MdiIcons.helpCircleOutline,
@@ -150,7 +158,8 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
                   MdiIcons.informationOutline,
                   onTap: () async {
                     final iconAuthors = ['Kiranshastry'];
-                    final PackageInfo packageInfo = await PackageInfo.fromPlatform();
+                    final PackageInfo packageInfo =
+                        await PackageInfo.fromPlatform();
                     if (!context.mounted) return;
                     showAboutDialog(
                       context: context,
@@ -159,17 +168,21 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
                           showDialog(
                               context: context,
                               builder: (_) => AlertDialog(
-                                    title: const SelectableText('Notification Log'),
+                                    title: const SelectableText(
+                                        'Notification Log'),
                                     content: Column(
                                       children: [
                                         ElevatedButton(
                                           onPressed: () {
                                             final Uri emailLaunchUri = Uri(
                                                 scheme: 'mailto',
-                                                path: subject!.study.contact.email,
+                                                path: subject!
+                                                    .study.contact.email,
                                                 queryParameters: {
-                                                  'subject': '[StudyU] Debug Information',
-                                                  'body': StudyNotifications.scheduledNotificationsDebug,
+                                                  'subject':
+                                                      '[StudyU] Debug Information',
+                                                  'body': StudyNotifications
+                                                      .scheduledNotificationsDebug,
                                                 });
                                             launchUrl(emailLaunchUri);
                                           },
@@ -177,26 +190,33 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
                                         ),
                                         FutureBuilder<bool>(
                                             future: receivePermission(),
-                                            builder: (context, AsyncSnapshot<bool> snapshot) {
+                                            builder: (context,
+                                                AsyncSnapshot<bool> snapshot) {
                                               if (snapshot.hasData) {
-                                                String data = "ignoreBatteryOptimizations: ${snapshot.data.toString()}";
-                                                StudyNotifications.scheduledNotificationsDebug =
+                                                String data =
+                                                    "ignoreBatteryOptimizations: ${snapshot.data.toString()}";
+                                                StudyNotifications
+                                                        .scheduledNotificationsDebug =
                                                     "${StudyNotifications.scheduledNotificationsDebug}\n\n$data\n";
                                                 return Text(data);
                                               } else {
                                                 return const CircularProgressIndicator();
                                               }
                                             }),
-                                        SelectableText(StudyNotifications.scheduledNotificationsDebug!),
+                                        SelectableText(StudyNotifications
+                                            .scheduledNotificationsDebug!),
                                       ],
                                     ),
                                     scrollable: true,
                                   ));
                           testNotifications(context);
                         },
-                        child: const Image(image: AssetImage('assets/icon/icon.png'), height: 32),
+                        child: const Image(
+                            image: AssetImage('assets/icon/icon.png'),
+                            height: 32),
                       ),
-                      applicationVersion: '${packageInfo.version} - ${packageInfo.buildNumber}',
+                      applicationVersion:
+                          '${packageInfo.version} - ${packageInfo.buildNumber}',
                       children: [
                         RichText(
                           text: TextSpan(
@@ -208,7 +228,8 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
                                 text: 'www.flaticon.com',
                                 recognizer: TapGestureRecognizer()
                                   ..onTap = () {
-                                    launchUrl(Uri.parse('https://www.flaticon.com/'));
+                                    launchUrl(
+                                        Uri.parse('https://www.flaticon.com/'));
                                   },
                               ),
                               const TextSpan(text: ' made by'),
@@ -243,7 +264,11 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
                 return PopupMenuItem<OverflowMenuItem>(
                   value: choice,
                   child: Row(
-                    children: [Icon(choice.icon, color: Colors.black), const SizedBox(width: 8), Text(choice.name)],
+                    children: [
+                      Icon(choice.icon, color: Colors.black),
+                      const SizedBox(width: 8),
+                      Text(choice.name)
+                    ],
                   ),
                 );
               }).toList();
@@ -252,7 +277,9 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
         ],
       ),
       body: Padding(
-        padding: showNextDay ? EdgeInsets.only(bottom: MediaQuery.of(context).size.height / 10) : EdgeInsets.zero,
+        padding: showNextDay
+            ? EdgeInsets.only(bottom: MediaQuery.of(context).size.height / 10)
+            : EdgeInsets.zero,
         child: _buildBody(),
       ),
       bottomSheet: showNextDay
@@ -286,12 +313,17 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
       return Center(
           child: Padding(
               padding: const EdgeInsets.fromLTRB(32, 32, 32, 32),
-              child: Column(mainAxisAlignment: MainAxisAlignment.center, children: [
-                Text(
-                  AppLocalizations.of(context)!.study_not_started,
-                  style: TextStyle(fontSize: 20, color: theme.primaryColor, fontWeight: FontWeight.bold),
-                )
-              ])));
+              child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Text(
+                      AppLocalizations.of(context)!.study_not_started,
+                      style: TextStyle(
+                          fontSize: 20,
+                          color: theme.primaryColor,
+                          fontWeight: FontWeight.bold),
+                    )
+                  ])));
     } else {
       return TaskOverview(
         subject: subject,
@@ -320,19 +352,26 @@ class StudyFinishedPlaceholder extends StatelessWidget {
           children: [
             Text(
               AppLocalizations.of(context)!.completed_study,
-              style: TextStyle(fontSize: 20, color: theme.primaryColor, fontWeight: FontWeight.bold),
+              style: TextStyle(
+                  fontSize: 20,
+                  color: theme.primaryColor,
+                  fontWeight: FontWeight.bold),
             ),
             space,
             OutlinedButton.icon(
-              onPressed: () => Navigator.pushNamed(context, Routes.reportHistory),
+              onPressed: () =>
+                  Navigator.pushNamed(context, Routes.reportHistory),
               icon: Icon(MdiIcons.history, size: fontSize),
-              label: Text(AppLocalizations.of(context)!.report_history, style: textStyle),
+              label: Text(AppLocalizations.of(context)!.report_history,
+                  style: textStyle),
             ),
             space,
             OutlinedButton.icon(
-              onPressed: () => Navigator.pushNamed(context, Routes.studySelection),
+              onPressed: () =>
+                  Navigator.pushNamed(context, Routes.studySelection),
               icon: Icon(MdiIcons.clipboardArrowRightOutline, size: fontSize),
-              label: Text(AppLocalizations.of(context)!.study_selection, style: textStyle),
+              label: Text(AppLocalizations.of(context)!.study_selection,
+                  style: textStyle),
             ),
           ],
         ),
diff --git a/app/lib/screens/study/dashboard/settings.dart b/app/lib/screens/study/dashboard/settings.dart
index 6e0eaafee..5dc43fe24 100644
--- a/app/lib/screens/study/dashboard/settings.dart
+++ b/app/lib/screens/study/dashboard/settings.dart
@@ -123,7 +123,9 @@ class _SettingsState extends State<Settings> {
                 backgroundColor: Colors.orange[800],
               ),
               onPressed: () {
-                showDialog(context: context, builder: (_) => OptOutAlertDialog(subject: subject));
+                showDialog(
+                    context: context,
+                    builder: (_) => OptOutAlertDialog(subject: subject));
               },
             ),
             const SizedBox(height: 24),
@@ -132,7 +134,9 @@ class _SettingsState extends State<Settings> {
               label: Text(AppLocalizations.of(context)!.delete_data),
               style: ElevatedButton.styleFrom(backgroundColor: Colors.red),
               onPressed: () {
-                showDialog(context: context, builder: (_) => DeleteAlertDialog(subject: subject));
+                showDialog(
+                    context: context,
+                    builder: (_) => DeleteAlertDialog(subject: subject));
               },
             )
           ],
@@ -160,7 +164,10 @@ class OptOutAlertDialog extends StatelessWidget {
             const TextSpan(text: 'You will lose your progress in '),
             TextSpan(
               text: subject!.study.title,
-              style: TextStyle(color: theme.primaryColor, fontWeight: FontWeight.bold, fontSize: 16),
+              style: TextStyle(
+                  color: theme.primaryColor,
+                  fontWeight: FontWeight.bold,
+                  fontSize: 16),
             ),
             const TextSpan(
               text: " and won't be able to recover it. Previously completed "
@@ -179,11 +186,15 @@ class OptOutAlertDialog extends StatelessWidget {
             await subject!.softDelete();
             await deleteActiveStudyReference();
             if (context.mounted) {
-              final studyNotifications = context.read<AppState>().studyNotifications?.flutterLocalNotificationsPlugin;
+              final studyNotifications = context
+                  .read<AppState>()
+                  .studyNotifications
+                  ?.flutterLocalNotificationsPlugin;
               await studyNotifications?.cancelAll();
             }
             if (context.mounted) {
-              Navigator.pushNamedAndRemoveUntil(context, Routes.studySelection, (_) => false);
+              Navigator.pushNamedAndRemoveUntil(
+                  context, Routes.studySelection, (_) => false);
             }
           },
         )
@@ -216,12 +227,15 @@ class DeleteAlertDialog extends StatelessWidget {
                 await subject!.delete(); // hard-delete
                 await deleteLocalData();
                 if (context.mounted) {
-                  final studyNotifications =
-                      context.read<AppState>().studyNotifications?.flutterLocalNotificationsPlugin;
+                  final studyNotifications = context
+                      .read<AppState>()
+                      .studyNotifications
+                      ?.flutterLocalNotificationsPlugin;
                   await studyNotifications?.cancelAll();
                 }
                 if (context.mounted) {
-                  Navigator.pushNamedAndRemoveUntil(context, Routes.welcome, (_) => false);
+                  Navigator.pushNamedAndRemoveUntil(
+                      context, Routes.welcome, (_) => false);
                 }
               } on SocketException catch (_) {}
             },
diff --git a/app/lib/screens/study/dashboard/task_overview_tab/progress_row.dart b/app/lib/screens/study/dashboard/task_overview_tab/progress_row.dart
index 994d9cb6b..b93ca6d28 100644
--- a/app/lib/screens/study/dashboard/task_overview_tab/progress_row.dart
+++ b/app/lib/screens/study/dashboard/task_overview_tab/progress_row.dart
@@ -21,7 +21,8 @@ class _ProgressRowState extends State<ProgressRow> {
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
 
-    final currentPhase = widget.subject!.getInterventionIndexForDate(DateTime.now());
+    final currentPhase =
+        widget.subject!.getInterventionIndexForDate(DateTime.now());
 
     return Padding(
       padding: const EdgeInsets.all(8),
@@ -39,17 +40,25 @@ class _ProgressRowState extends State<ProgressRow> {
                     indent: 5,
                     endIndent: 5,
                     thickness: 3,
-                    color: currentPhase > index ? theme.primaryColor : theme.disabledColor,
+                    color: currentPhase > index
+                        ? theme.primaryColor
+                        : theme.disabledColor,
                   ),
                 ),
-                widget.subject!.getInterventionsInOrder().asMap().entries.map((entry) {
+                widget.subject!
+                    .getInterventionsInOrder()
+                    .asMap()
+                    .entries
+                    .map((entry) {
                   return InterventionSegment(
                     intervention: entry.value,
                     isCurrent: currentPhase == entry.key,
                     isFuture: currentPhase < entry.key,
                     phaseDuration: widget.subject!.study.schedule.phaseDuration,
-                    percentCompleted: widget.subject!.percentCompletedForPhase(entry.key),
-                    percentMissed: widget.subject!.percentMissedForPhase(entry.key, DateTime.now()),
+                    percentCompleted:
+                        widget.subject!.percentCompletedForPhase(entry.key),
+                    percentMissed: widget.subject!
+                        .percentMissedForPhase(entry.key, DateTime.now()),
                   );
                 }),
               ),
@@ -109,10 +118,13 @@ class InterventionSegment extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final color = isFuture ? Colors.grey : (isCurrent ? theme.colorScheme.secondary : theme.primaryColor);
+    final color = isFuture
+        ? Colors.grey
+        : (isCurrent ? theme.colorScheme.secondary : theme.primaryColor);
 
     final emptyColor = Color.alphaBlend(theme.dividerColor, Colors.white);
-    final activeColor = Color.alphaBlend(theme.colorScheme.secondary, Colors.white);
+    final activeColor =
+        Color.alphaBlend(theme.colorScheme.secondary, Colors.white);
     final completedColor = Color.alphaBlend(theme.primaryColor, Colors.white);
 
     return Expanded(
@@ -163,7 +175,8 @@ class InterventionSegment extends StatelessWidget {
             },
             elevation: 0,
             fillColor: color,
-            shape: const CircleBorder(side: BorderSide(color: Colors.white, width: 2)),
+            shape: const CircleBorder(
+                side: BorderSide(color: Colors.white, width: 2)),
             child: interventionIcon(intervention),
           ),
         ],
@@ -172,7 +185,8 @@ class InterventionSegment extends StatelessWidget {
   }
 }
 
-Iterable<T> intersperseIndexed<T>(T Function(int) generator, Iterable<T> iterable) sync* {
+Iterable<T> intersperseIndexed<T>(
+    T Function(int) generator, Iterable<T> iterable) sync* {
   final iterator = iterable.iterator;
   var index = 0;
   if (iterator.moveNext()) {
diff --git a/app/lib/screens/study/dashboard/task_overview_tab/task_box.dart b/app/lib/screens/study/dashboard/task_overview_tab/task_box.dart
index 9dbd18b3c..d1794d4fa 100644
--- a/app/lib/screens/study/dashboard/task_overview_tab/task_box.dart
+++ b/app/lib/screens/study/dashboard/task_overview_tab/task_box.dart
@@ -29,7 +29,8 @@ class _TaskBoxState extends State<TaskBox> {
   Future<void> _navigateToTaskScreen() async {
     await Navigator.push<bool>(
       context,
-      MaterialPageRoute(builder: (context) => TaskScreen(taskInstance: widget.taskInstance)),
+      MaterialPageRoute(
+          builder: (context) => TaskScreen(taskInstance: widget.taskInstance)),
     );
     widget.onCompleted();
     // Rebuild widget
@@ -42,9 +43,11 @@ class _TaskBoxState extends State<TaskBox> {
     final completed = context
         .watch<AppState>()
         .activeSubject!
-        .completedTaskInstanceForDay(widget.taskInstance.task.id, widget.taskInstance.completionPeriod, DateTime.now());
+        .completedTaskInstanceForDay(widget.taskInstance.task.id,
+            widget.taskInstance.completionPeriod, DateTime.now());
     final isPreview = context.read<AppState>().isPreview;
-    final isInsidePeriod = widget.taskInstance.completionPeriod.contains(StudyUTimeOfDay.now());
+    final isInsidePeriod =
+        widget.taskInstance.completionPeriod.contains(StudyUTimeOfDay.now());
     final isTaskOpen = !completed && isInsidePeriod || isPreview || kDebugMode;
     return Card(
       elevation: 2,
@@ -62,7 +65,8 @@ class _TaskBoxState extends State<TaskBox> {
             if (isInsidePeriod || isPreview || completed)
               RoundCheckbox(
                 value: completed, //_isCompleted,
-                onChanged: (value) => isTaskOpen ? _navigateToTaskScreen() : () {},
+                onChanged: (value) =>
+                    isTaskOpen ? _navigateToTaskScreen() : () {},
               )
             else
               Padding(
diff --git a/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart b/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart
index 6c3fd9529..b2f098d97 100644
--- a/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart
+++ b/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart
@@ -14,7 +14,11 @@ class TaskOverview extends StatefulWidget {
   final List<TaskInstance>? scheduleToday;
   final String? interventionIcon;
 
-  const TaskOverview({required this.subject, required this.scheduleToday, super.key, this.interventionIcon});
+  const TaskOverview(
+      {required this.subject,
+      required this.scheduleToday,
+      super.key,
+      this.interventionIcon});
 
   @override
   State<TaskOverview> createState() => _TaskOverviewState();
@@ -24,7 +28,8 @@ class _TaskOverviewState extends State<TaskOverview> {
   void _navigateToReportIfStudyCompleted(BuildContext context) {
     if (widget.subject!.completedStudy) {
       // Workaround to reload dashboard
-      Navigator.pushNamedAndRemoveUntil(context, Routes.dashboard, (_) => false);
+      Navigator.pushNamedAndRemoveUntil(
+          context, Routes.dashboard, (_) => false);
     }
   }
 
@@ -42,7 +47,8 @@ class _TaskOverviewState extends State<TaskOverview> {
                 const SizedBox(width: 8),
                 Text(
                   taskInstance.completionPeriod.formatted(),
-                  style: theme.textTheme.titleSmall!.copyWith(fontSize: 16, color: theme.primaryColor),
+                  style: theme.textTheme.titleSmall!
+                      .copyWith(fontSize: 16, color: theme.primaryColor),
                 ),
               ],
             ),
@@ -80,8 +86,9 @@ class _TaskOverviewState extends State<TaskOverview> {
               Row(
                 children: [
                   Expanded(
-                      child:
-                          Text(AppLocalizations.of(context)!.intervention_current, style: theme.textTheme.titleLarge)),
+                      child: Text(
+                          AppLocalizations.of(context)!.intervention_current,
+                          style: theme.textTheme.titleLarge)),
                   const Spacer(),
                   Text(
                     '${widget.subject!.daysLeftForPhase(widget.subject!.getInterventionIndexForDate(DateTime.now()))} ${AppLocalizations.of(context)!.days_left}',
@@ -90,9 +97,12 @@ class _TaskOverviewState extends State<TaskOverview> {
                 ],
               ),
               const SizedBox(height: 8),
-              InterventionCardTitle(intervention: widget.subject!.getInterventionForDate(DateTime.now())),
+              InterventionCardTitle(
+                  intervention:
+                      widget.subject!.getInterventionForDate(DateTime.now())),
               const SizedBox(height: 8),
-              Text(AppLocalizations.of(context)!.today_tasks, style: theme.textTheme.titleLarge)
+              Text(AppLocalizations.of(context)!.today_tasks,
+                  style: theme.textTheme.titleLarge)
             ],
           ),
         ),
diff --git a/app/lib/screens/study/multimodal/capture_picture_screen.dart b/app/lib/screens/study/multimodal/capture_picture_screen.dart
index 28178e527..e5be1ec60 100644
--- a/app/lib/screens/study/multimodal/capture_picture_screen.dart
+++ b/app/lib/screens/study/multimodal/capture_picture_screen.dart
@@ -10,13 +10,15 @@ class CapturePictureScreen extends StatefulWidget {
   final String userId;
   final String studyId;
 
-  const CapturePictureScreen({super.key, required this.userId, required this.studyId});
+  const CapturePictureScreen(
+      {super.key, required this.userId, required this.studyId});
 
   @override
   State<CapturePictureScreen> createState() => _CapturePictureScreenState();
 }
 
-class _CapturePictureScreenState extends State<CapturePictureScreen> with WidgetsBindingObserver {
+class _CapturePictureScreenState extends State<CapturePictureScreen>
+    with WidgetsBindingObserver {
   CameraController? _cameraController;
   List<CameraDescription>? _cameras;
   int _jumpToNextCameraTaps = 0;
@@ -116,7 +118,9 @@ class _CapturePictureScreenState extends State<CapturePictureScreen> with Widget
 
   Future<void> _tryCapturePicture() async {
     final cameraController = _cameraController;
-    if (cameraController == null || !cameraController.value.isInitialized || cameraController.value.isTakingPicture) {
+    if (cameraController == null ||
+        !cameraController.value.isInitialized ||
+        cameraController.value.isTakingPicture) {
       return;
     }
 
@@ -176,7 +180,8 @@ class _CapturePictureScreenState extends State<CapturePictureScreen> with Widget
                               children: [
                                 const CircularProgressIndicator(),
                                 const SizedBox(height: 16),
-                                Text(AppLocalizations.of(context)!.take_a_photo),
+                                Text(
+                                    AppLocalizations.of(context)!.take_a_photo),
                               ],
                             ),
                           ),
@@ -203,7 +208,9 @@ class _CapturePictureScreenState extends State<CapturePictureScreen> with Widget
               margin: const EdgeInsets.all(10),
               child: FloatingActionButton(
                 heroTag: "jumpToNextCamera",
-                onPressed: cameraController != null && !_isTakingPicture ? () async => await _jumpToNextCamera() : null,
+                onPressed: cameraController != null && !_isTakingPicture
+                    ? () async => await _jumpToNextCamera()
+                    : null,
                 child: const Icon(Icons.autorenew),
               ),
             )
diff --git a/app/lib/screens/study/onboarding/consent.dart b/app/lib/screens/study/onboarding/consent.dart
index f297edda8..13ac10b55 100644
--- a/app/lib/screens/study/onboarding/consent.dart
+++ b/app/lib/screens/study/onboarding/consent.dart
@@ -43,15 +43,19 @@ class _ConsentScreenState extends State<ConsentScreen> {
   }
 
   Future<List<pw.Widget>> generatePdfContent() async {
-    final ttf = pw.Font.ttf(await rootBundle.load('assets/fonts/Roboto-Regular.ttf'));
+    final ttf =
+        pw.Font.ttf(await rootBundle.load('assets/fonts/Roboto-Regular.ttf'));
     return consentList
         .map(
           (consentItem) => [
             pw.Header(
               level: 0,
-              child: pw.Text(consentItem.title ?? '', textScaleFactor: 2, style: pw.TextStyle(font: ttf)),
+              child: pw.Text(consentItem.title ?? '',
+                  textScaleFactor: 2, style: pw.TextStyle(font: ttf)),
             ),
-            pw.Paragraph(text: consentItem.description ?? '', style: pw.TextStyle(font: ttf)),
+            pw.Paragraph(
+                text: consentItem.description ?? '',
+                style: pw.TextStyle(font: ttf)),
           ],
         )
         .expand((element) => element)
@@ -75,19 +79,23 @@ class _ConsentScreenState extends State<ConsentScreen> {
                   context: context,
                   builder: (context) => AlertDialog(
                     elevation: 24,
-                    title: Text(AppLocalizations.of(context)!.save_not_supported),
-                    content: Text(AppLocalizations.of(context)!.save_not_supported_description),
+                    title:
+                        Text(AppLocalizations.of(context)!.save_not_supported),
+                    content: Text(AppLocalizations.of(context)!
+                        .save_not_supported_description),
                   ),
                 );
               }
               final pdfContent = await generatePdfContent();
               if (!context.mounted) return;
-              final savedFilePath = await savePDF(context, '${subject!.study.title}_consent', pdfContent);
+              final savedFilePath = await savePDF(
+                  context, '${subject!.study.title}_consent', pdfContent);
               if (savedFilePath != null) {
                 if (!context.mounted) return;
                 ScaffoldMessenger.of(context).showSnackBar(
                   SnackBar(
-                    content: Text('${AppLocalizations.of(context)!.was_saved_to}$savedFilePath.'),
+                    content: Text(
+                        '${AppLocalizations.of(context)!.was_saved_to}$savedFilePath.'),
                   ),
                 );
               }
@@ -114,13 +122,16 @@ class _ConsentScreenState extends State<ConsentScreen> {
                         style: theme.textTheme.titleMedium,
                       ),
                       TextSpan(
-                        text: AppLocalizations.of(context)!.please_give_consent_why,
-                        style: theme.textTheme.titleSmall!.copyWith(color: theme.primaryColor),
+                        text: AppLocalizations.of(context)!
+                            .please_give_consent_why,
+                        style: theme.textTheme.titleSmall!
+                            .copyWith(color: theme.primaryColor),
                         recognizer: TapGestureRecognizer()
                           ..onTap = () => showDialog(
                                 context: context,
                                 builder: (context) => AlertDialog(
-                                  content: Text(AppLocalizations.of(context)!.please_give_consent_reason),
+                                  content: Text(AppLocalizations.of(context)!
+                                      .please_give_consent_reason),
                                 ),
                               ),
                       )
@@ -130,7 +141,8 @@ class _ConsentScreenState extends State<ConsentScreen> {
                 Flexible(
                   child: GridView.builder(
                     shrinkWrap: true,
-                    gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                    gridDelegate:
+                        const SliverGridDelegateWithFixedCrossAxisCount(
                       crossAxisCount: 2,
                       crossAxisSpacing: 10,
                       mainAxisSpacing: 10,
@@ -156,10 +168,13 @@ class _ConsentScreenState extends State<ConsentScreen> {
       bottomNavigationBar: BottomOnboardingNavigation(
         backLabel: AppLocalizations.of(context)!.decline,
         backIcon: const Icon(Icons.close),
-        onBack: () => Navigator.popUntil(context, ModalRoute.withName(Routes.studySelection)),
+        onBack: () => Navigator.popUntil(
+            context, ModalRoute.withName(Routes.studySelection)),
         nextLabel: AppLocalizations.of(context)!.accept,
         nextIcon: const Icon(Icons.check),
-        onNext: boxLogic.every((element) => element) || kDebugMode ? () => Navigator.pop(context, true) : null,
+        onNext: boxLogic.every((element) => element) || kDebugMode
+            ? () => Navigator.pop(context, true)
+            : null,
         progress: const OnboardingProgress(stage: 2, progress: 2.5),
       ),
     );
@@ -172,7 +187,12 @@ class ConsentCard extends StatelessWidget {
   final Function(int) onTapped;
   final bool? isChecked;
 
-  const ConsentCard({super.key, this.consent, this.index, required this.onTapped, this.isChecked});
+  const ConsentCard(
+      {super.key,
+      this.consent,
+      this.index,
+      required this.onTapped,
+      this.isChecked});
 
   @override
   Widget build(BuildContext context) {
@@ -195,9 +215,12 @@ class ConsentCard extends StatelessWidget {
               title: Row(
                 children: [
                   consent!.iconName.isNotEmpty
-                      ? Icon(MdiIcons.fromString(consent!.iconName), color: theme.primaryColor)
+                      ? Icon(MdiIcons.fromString(consent!.iconName),
+                          color: theme.primaryColor)
+                      : const SizedBox.shrink(),
+                  consent!.iconName.isNotEmpty
+                      ? const SizedBox(width: 8)
                       : const SizedBox.shrink(),
-                  consent!.iconName.isNotEmpty ? const SizedBox(width: 8) : const SizedBox.shrink(),
                   Expanded(child: Text(consent!.title!)),
                   IconButton(
                     icon: const Icon(Icons.close),
@@ -217,9 +240,12 @@ class ConsentCard extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
               consent!.iconName.isNotEmpty
-                  ? Icon(MdiIcons.fromString(consent!.iconName), size: 60, color: Colors.blue)
+                  ? Icon(MdiIcons.fromString(consent!.iconName),
+                      size: 60, color: Colors.blue)
+                  : const SizedBox.shrink(),
+              consent!.iconName.isNotEmpty
+                  ? const SizedBox(height: 10)
                   : const SizedBox.shrink(),
-              consent!.iconName.isNotEmpty ? const SizedBox(height: 10) : const SizedBox.shrink(),
               Flexible(
                 child: Text(
                   consent!.title!,
@@ -242,5 +268,6 @@ class ConsentElement {
   final String acknowledgmentText;
   final IconData icon;
 
-  ConsentElement(this.title, this.descriptionText, this.acknowledgmentText, this.icon);
+  ConsentElement(
+      this.title, this.descriptionText, this.acknowledgmentText, this.icon);
 }
diff --git a/app/lib/screens/study/onboarding/eligibility_screen.dart b/app/lib/screens/study/onboarding/eligibility_screen.dart
index 22bf5f07b..4bb45e2fe 100644
--- a/app/lib/screens/study/onboarding/eligibility_screen.dart
+++ b/app/lib/screens/study/onboarding/eligibility_screen.dart
@@ -19,7 +19,9 @@ class EligibilityResult {
 class EligibilityScreen extends StatefulWidget {
   final Study? study;
 
-  static MaterialPageRoute<EligibilityResult> routeFor({required Study? study}) => MaterialPageRoute(
+  static MaterialPageRoute<EligibilityResult> routeFor(
+          {required Study? study}) =>
+      MaterialPageRoute(
         builder: (_) => EligibilityScreen(study: study),
         settings: const RouteSettings(name: '/eligibilityCheck'),
       );
@@ -48,13 +50,15 @@ class _EligibilityScreenState extends State<EligibilityScreen> {
 
   bool _checkContinuation(QuestionnaireState qs) {
     final criteria = widget.study!.eligibilityCriteria;
-    EligibilityCriterion? failingResult = criteria.firstWhereOrNull((element) => element.isViolated(qs));
+    EligibilityCriterion? failingResult =
+        criteria.firstWhereOrNull((element) => element.isViolated(qs));
     if (failingResult == null) return true;
     // freetext quickfix start
     failingResult = _isFreeTextCriterion(failingResult) ? null : failingResult;
     // freetext quickfix end
     setState(() {
-      activeResult = EligibilityResult(qs, eligible: false, firstFailed: failingResult);
+      activeResult =
+          EligibilityResult(qs, eligible: false, firstFailed: failingResult);
     });
     return false;
   }
@@ -73,8 +77,10 @@ class _EligibilityScreenState extends State<EligibilityScreen> {
       if (conditionResult) {
         activeResult = EligibilityResult(qs, eligible: conditionResult);
       } else {
-        final firstFailed = criteria.firstWhere((criterion) => criterion.isViolated(qs));
-        activeResult = EligibilityResult(qs, eligible: conditionResult, firstFailed: firstFailed);
+        final firstFailed =
+            criteria.firstWhere((criterion) => criterion.isViolated(qs));
+        activeResult = EligibilityResult(qs,
+            eligible: conditionResult, firstFailed: firstFailed);
       }
     });
   }
@@ -84,7 +90,8 @@ class _EligibilityScreenState extends State<EligibilityScreen> {
   bool _isFreeTextCriterion(EligibilityCriterion criterion) {
     return widget.study?.questionnaire.questions.any((element) {
           if (criterion.condition.type == ChoiceExpression.expressionType) {
-            ChoiceExpression choiceExpression = criterion.condition as ChoiceExpression;
+            ChoiceExpression choiceExpression =
+                criterion.condition as ChoiceExpression;
             return element.id == choiceExpression.target!;
           }
           return false;
@@ -102,7 +109,8 @@ class _EligibilityScreenState extends State<EligibilityScreen> {
           color: Colors.green,
           size: 32,
         ),
-        content: Text(AppLocalizations.of(context)!.eligible_yes, style: Theme.of(context).textTheme.titleMedium),
+        content: Text(AppLocalizations.of(context)!.eligible_yes,
+            style: Theme.of(context).textTheme.titleMedium),
         actions: [Container()],
         forceActionsBelow: true,
         backgroundColor: Colors.green[50],
@@ -117,13 +125,17 @@ class _EligibilityScreenState extends State<EligibilityScreen> {
         content: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text(AppLocalizations.of(context)!.eligible_no, style: Theme.of(context).textTheme.titleMedium),
+            Text(AppLocalizations.of(context)!.eligible_no,
+                style: Theme.of(context).textTheme.titleMedium),
             const SizedBox(height: 4),
             if (activeResult?.firstFailed?.reason != null)
               Text(activeResult!.firstFailed!.reason!)
             else
               const SizedBox.shrink(),
-            if (activeResult?.firstFailed?.reason != null) const SizedBox(height: 4) else const SizedBox.shrink(),
+            if (activeResult?.firstFailed?.reason != null)
+              const SizedBox(height: 4)
+            else
+              const SizedBox.shrink(),
             Text(AppLocalizations.of(context)!.eligible_mistake),
           ],
         ),
@@ -137,14 +149,16 @@ class _EligibilityScreenState extends State<EligibilityScreen> {
         backgroundColor: Colors.red[50],
       );
 
-  Widget _constructResultBanner() => activeResult!.eligible ? _constructPassBanner() : _constructFailBanner();
+  Widget _constructResultBanner() =>
+      activeResult!.eligible ? _constructPassBanner() : _constructFailBanner();
 
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
     return Scaffold(
       appBar: AppBar(
-        title: Text(AppLocalizations.of(context)!.eligibility_questionnaire_title),
+        title:
+            Text(AppLocalizations.of(context)!.eligibility_questionnaire_title),
         leading: Icon(MdiIcons.clipboardList),
       ),
       body: Column(
diff --git a/app/lib/screens/study/onboarding/intervention_selection.dart b/app/lib/screens/study/onboarding/intervention_selection.dart
index e9c70d938..ae99d61d6 100644
--- a/app/lib/screens/study/onboarding/intervention_selection.dart
+++ b/app/lib/screens/study/onboarding/intervention_selection.dart
@@ -15,10 +15,12 @@ class InterventionSelectionScreen extends StatefulWidget {
   const InterventionSelectionScreen({super.key});
 
   @override
-  State<InterventionSelectionScreen> createState() => _InterventionSelectionScreenState();
+  State<InterventionSelectionScreen> createState() =>
+      _InterventionSelectionScreenState();
 }
 
-class _InterventionSelectionScreenState extends State<InterventionSelectionScreen> {
+class _InterventionSelectionScreenState
+    extends State<InterventionSelectionScreen> {
   final List<String> selectedInterventionIds = [];
   Study? selectedStudy;
 
@@ -39,8 +41,10 @@ class _InterventionSelectionScreenState extends State<InterventionSelectionScree
           ),
           const SizedBox(height: 8),
           Text(
-            AppLocalizations.of(context)!.please_select_interventions_description,
-            style: theme.textTheme.bodyMedium!.copyWith(color: theme.textTheme.bodySmall!.color),
+            AppLocalizations.of(context)!
+                .please_select_interventions_description,
+            style: theme.textTheme.bodyMedium!
+                .copyWith(color: theme.textTheme.bodySmall!.color),
           ),
         ],
       ),
@@ -62,7 +66,8 @@ class _InterventionSelectionScreenState extends State<InterventionSelectionScree
           interventions[index],
           showCheckbox: true,
           showDescription: false,
-          selected: selectedInterventionIds.any((interventionId) => interventionId == interventions[index].id),
+          selected: selectedInterventionIds.any(
+              (interventionId) => interventionId == interventions[index].id),
           onTap: () => onSelect(interventions[index].id),
         ),
       ),
@@ -73,7 +78,8 @@ class _InterventionSelectionScreenState extends State<InterventionSelectionScree
     setState(() {
       if (!selectedInterventionIds.contains(interventionId)) {
         selectedInterventionIds.add(interventionId);
-        if (selectedInterventionIds.length > 2) selectedInterventionIds.removeAt(0);
+        if (selectedInterventionIds.length > 2)
+          selectedInterventionIds.removeAt(0);
       } else {
         selectedInterventionIds.removeWhere((id) => id == interventionId);
       }
@@ -116,7 +122,8 @@ class _InterventionSelectionScreenState extends State<InterventionSelectionScree
       ),
       bottomNavigationBar: BottomOnboardingNavigation(
         onNext: selectedInterventionIds.length == 2 ? onFinished : null,
-        progress: OnboardingProgress(stage: 1, progress: selectedInterventionIds.length / 2),
+        progress: OnboardingProgress(
+            stage: 1, progress: selectedInterventionIds.length / 2),
       ),
     );
   }
diff --git a/app/lib/screens/study/onboarding/journey_overview.dart b/app/lib/screens/study/onboarding/journey_overview.dart
index c14a2ec4b..c6bd437e9 100644
--- a/app/lib/screens/study/onboarding/journey_overview.dart
+++ b/app/lib/screens/study/onboarding/journey_overview.dart
@@ -34,7 +34,8 @@ class _JourneyOverviewScreen extends State<JourneyOverviewScreen> {
     } else {
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
-          content: Text(AppLocalizations.of(context)!.user_did_not_give_consent),
+          content:
+              Text(AppLocalizations.of(context)!.user_did_not_give_consent),
           duration: const Duration(seconds: 30),
         ),
       );
@@ -94,8 +95,11 @@ class Timeline extends StatelessWidget {
           return InterventionTile(
             title: intervention.name,
             iconName: intervention.icon,
-            color: intervention.isBaseline() ? Colors.grey : theme.colorScheme.secondary,
-            date: now.add(Duration(days: index * subject!.study.schedule.phaseDuration)),
+            color: intervention.isBaseline()
+                ? Colors.grey
+                : theme.colorScheme.secondary,
+            date: now.add(
+                Duration(days: index * subject!.study.schedule.phaseDuration)),
             isFirst: index == 0,
           );
         }),
@@ -146,10 +150,13 @@ class InterventionTile extends StatelessWidget {
       beforeLineStyle: LineStyle(color: theme.primaryColor),
       afterLineStyle: LineStyle(color: theme.primaryColor),
       endChild: TimelineChild(
-        child: Text(title!, style: theme.textTheme.titleLarge!.copyWith(color: theme.primaryColor)),
+        child: Text(title!,
+            style: theme.textTheme.titleLarge!
+                .copyWith(color: theme.primaryColor)),
       ),
       startChild: TimelineChild(
-        child: Text(DateFormat('dd-MM-yyyy').format(date), style: const TextStyle(fontWeight: FontWeight.bold)),
+        child: Text(DateFormat('dd-MM-yyyy').format(date),
+            style: const TextStyle(fontWeight: FontWeight.bold)),
       ),
     );
   }
@@ -164,7 +171,9 @@ class IconIndicator extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return DecoratedBox(
-      decoration: BoxDecoration(shape: BoxShape.circle, color: color ?? Theme.of(context).colorScheme.secondary),
+      decoration: BoxDecoration(
+          shape: BoxShape.circle,
+          color: color ?? Theme.of(context).colorScheme.secondary),
       child: Center(
         child: Icon(MdiIcons.fromString(iconName), color: Colors.white),
       ),
diff --git a/app/lib/screens/study/onboarding/kickoff.dart b/app/lib/screens/study/onboarding/kickoff.dart
index b46b652aa..891d05103 100644
--- a/app/lib/screens/study/onboarding/kickoff.dart
+++ b/app/lib/screens/study/onboarding/kickoff.dart
@@ -33,7 +33,8 @@ class _KickoffScreen extends State<KickoffScreen> {
       await storeActiveSubjectId(subject!.id);
       if (!context.mounted) return;
       setState(() => ready = true);
-      Navigator.pushNamedAndRemoveUntil(context, Routes.dashboard, (_) => false);
+      Navigator.pushNamedAndRemoveUntil(
+          context, Routes.dashboard, (_) => false);
     } catch (e) {
       StudyULogger.fatal('Failed creating subject: $e');
     }
@@ -58,8 +59,9 @@ class _KickoffScreen extends State<KickoffScreen> {
           size: 64,
         );
 
-  String _getStatusText(BuildContext context) =>
-      !ready ? AppLocalizations.of(context)!.setting_up_study : AppLocalizations.of(context)!.good_to_go;
+  String _getStatusText(BuildContext context) => !ready
+      ? AppLocalizations.of(context)!.setting_up_study
+      : AppLocalizations.of(context)!.good_to_go;
 
   @override
   Widget build(BuildContext context) {
diff --git a/app/lib/screens/study/onboarding/onboarding_progress.dart b/app/lib/screens/study/onboarding/onboarding_progress.dart
index 97556a10b..4ced4be59 100644
--- a/app/lib/screens/study/onboarding/onboarding_progress.dart
+++ b/app/lib/screens/study/onboarding/onboarding_progress.dart
@@ -4,7 +4,8 @@ class OnboardingProgress extends StatelessWidget {
   final int stage;
   final double progress;
 
-  const OnboardingProgress({required this.stage, required this.progress, super.key});
+  const OnboardingProgress(
+      {required this.stage, required this.progress, super.key});
 
   double _getProgressForStage(int stage) {
     if (stage < this.stage) return 1;
diff --git a/app/lib/screens/study/onboarding/study_overview.dart b/app/lib/screens/study/onboarding/study_overview.dart
index 16d4148e9..d17efcdde 100644
--- a/app/lib/screens/study/onboarding/study_overview.dart
+++ b/app/lib/screens/study/onboarding/study_overview.dart
@@ -54,7 +54,8 @@ class _StudyOverviewScreen extends State<StudyOverviewScreen> {
 
   Future<void> navigateToEligibilityCheck(BuildContext context) async {
     final study = context.read<AppState>().selectedStudy;
-    final result = await Navigator.push<EligibilityResult>(context, EligibilityScreen.routeFor(study: study));
+    final result = await Navigator.push<EligibilityResult>(
+        context, EligibilityScreen.routeFor(study: study));
     if (result == null) return;
 
     if (!context.mounted) return;
@@ -103,20 +104,27 @@ class StudyDetailsView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final baselineLength = study!.schedule.includeBaseline ? study!.schedule.phaseDuration : 0;
+    final baselineLength =
+        study!.schedule.includeBaseline ? study!.schedule.phaseDuration : 0;
     final studyLength = baselineLength +
-        study!.schedule.phaseDuration * study!.schedule.numberOfCycles * StudySchedule.numberOfInterventions;
+        study!.schedule.phaseDuration *
+            study!.schedule.numberOfCycles *
+            StudySchedule.numberOfInterventions;
     return Column(
       children: [
         ListTile(
-          title: Text(AppLocalizations.of(context)!.intervention_phase_duration),
-          subtitle: Text('${study!.schedule.phaseDuration} ${AppLocalizations.of(context)!.days}'),
-          leading: Icon(MdiIcons.clock, color: theme.primaryColor, size: iconSize),
+          title:
+              Text(AppLocalizations.of(context)!.intervention_phase_duration),
+          subtitle: Text(
+              '${study!.schedule.phaseDuration} ${AppLocalizations.of(context)!.days}'),
+          leading:
+              Icon(MdiIcons.clock, color: theme.primaryColor, size: iconSize),
         ),
         ListTile(
           title: Text(AppLocalizations.of(context)!.study_length),
           subtitle: Text('$studyLength ${AppLocalizations.of(context)!.days}'),
-          leading: Icon(MdiIcons.calendar, color: theme.primaryColor, size: iconSize),
+          leading: Icon(MdiIcons.calendar,
+              color: theme.primaryColor, size: iconSize),
         ),
         const SizedBox(height: 16),
         ContactWidget(
diff --git a/app/lib/screens/study/onboarding/study_selection.dart b/app/lib/screens/study/onboarding/study_selection.dart
index 35f072a74..7bee68a74 100644
--- a/app/lib/screens/study/onboarding/study_selection.dart
+++ b/app/lib/screens/study/onboarding/study_selection.dart
@@ -30,7 +30,8 @@ Future<void> showAppOutdatedDialog(BuildContext context) async {
   await showDialog(
     context: context,
     builder: (context) => AlertDialog(
-      title: Text(AppLocalizations.of(context)!.study_selection_unsupported_title),
+      title:
+          Text(AppLocalizations.of(context)!.study_selection_unsupported_title),
       content: Text(AppLocalizations.of(context)!.study_selection_unsupported),
       actions: [
         TextButton(
@@ -74,7 +75,8 @@ class _StudySelectionScreenState extends State<StudySelectionScreen> {
                       text: TextSpan(
                         children: [
                           TextSpan(
-                            text: AppLocalizations.of(context)!.study_selection_single,
+                            text: AppLocalizations.of(context)!
+                                .study_selection_single,
                             style: theme.textTheme.titleSmall,
                           ),
                           TextSpan(
@@ -82,13 +84,17 @@ class _StudySelectionScreenState extends State<StudySelectionScreen> {
                             style: theme.textTheme.titleSmall,
                           ),
                           TextSpan(
-                            text: AppLocalizations.of(context)!.study_selection_single_why,
-                            style: theme.textTheme.titleSmall!.copyWith(color: theme.primaryColor),
+                            text: AppLocalizations.of(context)!
+                                .study_selection_single_why,
+                            style: theme.textTheme.titleSmall!
+                                .copyWith(color: theme.primaryColor),
                             recognizer: TapGestureRecognizer()
                               ..onTap = () => showDialog(
                                     context: context,
                                     builder: (context) => AlertDialog(
-                                      content: Text(AppLocalizations.of(context)!.study_selection_single_reason),
+                                      content: Text(
+                                          AppLocalizations.of(context)!
+                                              .study_selection_single_reason),
                                     ),
                                   ),
                           )
@@ -109,7 +115,8 @@ class _StudySelectionScreenState extends State<StudySelectionScreen> {
                             size: 32,
                           ),
                           content: Text(
-                            AppLocalizations.of(context)!.study_selection_hidden_studies,
+                            AppLocalizations.of(context)!
+                                .study_selection_hidden_studies,
                             style: Theme.of(context).textTheme.titleSmall,
                           ),
                           actions: const [SizedBox.shrink()],
@@ -122,12 +129,14 @@ class _StudySelectionScreenState extends State<StudySelectionScreen> {
               Expanded(
                 child: RetryFutureBuilder<ExtractionResult<Study>>(
                   tryFunction: () async => publishedStudies,
-                  successBuilder: (BuildContext context, ExtractionResult<Study>? extractionResult) {
+                  successBuilder: (BuildContext context,
+                      ExtractionResult<Study>? extractionResult) {
                     final studies = extractionResult!.extracted;
                     if (extractionResult is ExtractionFailedException<Study>) {
                       WidgetsBinding.instance.addPostFrameCallback((_) {
                         if (_hiddenStudies) return;
-                        debugPrint('${extractionResult.notExtracted.length} studies could not be extracted.');
+                        debugPrint(
+                            '${extractionResult.notExtracted.length} studies could not be extracted.');
                         setState(() {
                           _hiddenStudies = true;
                         });
@@ -158,7 +167,9 @@ class _StudySelectionScreenState extends State<StudySelectionScreen> {
                 child: OutlinedButton.icon(
                   icon: Icon(MdiIcons.key),
                   onPressed: () async {
-                    await showDialog(context: context, builder: (_) => const InviteCodeDialog());
+                    await showDialog(
+                        context: context,
+                        builder: (_) => const InviteCodeDialog());
                   },
                   label: Text(AppLocalizations.of(context)!.invite_code_button),
                 ),
@@ -198,7 +209,8 @@ class _InviteCodeDialogState extends State<InviteCodeDialog> {
           controller: _controller,
           validator: (_) => _errorMessage,
           autovalidateMode: AutovalidateMode.always,
-          decoration: InputDecoration(labelText: AppLocalizations.of(context)!.invite_code),
+          decoration: InputDecoration(
+              labelText: AppLocalizations.of(context)!.invite_code),
         ),
         actions: [
           OutlinedButton.icon(
@@ -223,7 +235,8 @@ class _InviteCodeDialogState extends State<InviteCodeDialog> {
 
               if (result == null) {
                 setState(() {
-                  _errorMessage = AppLocalizations.of(context)!.invalid_invite_code;
+                  _errorMessage =
+                      AppLocalizations.of(context)!.invalid_invite_code;
                 });
               } else {
                 setState(() {
diff --git a/app/lib/screens/study/report/performance/performance_details.dart b/app/lib/screens/study/report/performance/performance_details.dart
index ed9c71fe8..caae2ce18 100644
--- a/app/lib/screens/study/report/performance/performance_details.dart
+++ b/app/lib/screens/study/report/performance/performance_details.dart
@@ -8,7 +8,8 @@ import '../../../../widgets/intervention_card.dart';
 class PerformanceDetailsScreen extends StatelessWidget {
   final StudySubject? reportSubject;
 
-  static MaterialPageRoute routeFor({required StudySubject? subject}) => MaterialPageRoute(
+  static MaterialPageRoute routeFor({required StudySubject? subject}) =>
+      MaterialPageRoute(
         builder: (_) => PerformanceDetailsScreen(subject),
         settings: const RouteSettings(name: Routes.performanceDetails),
       );
@@ -18,8 +19,9 @@ class PerformanceDetailsScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final interventions =
-        reportSubject!.selectedInterventions.where((intervention) => !intervention.isBaseline()).toList();
+    final interventions = reportSubject!.selectedInterventions
+        .where((intervention) => !intervention.isBaseline())
+        .toList();
 
     return Scaffold(
       appBar: AppBar(
@@ -35,15 +37,19 @@ class PerformanceDetailsScreen extends StatelessWidget {
               children: <Widget>[
                 Padding(
                   padding: const EdgeInsets.all(8),
-                  child: Text(AppLocalizations.of(context)!.performance_overview, style: theme.textTheme.titleMedium),
+                  child: Text(
+                      AppLocalizations.of(context)!.performance_overview,
+                      style: theme.textTheme.titleMedium),
                 ),
                 Padding(
                   padding: const EdgeInsets.all(8),
                   child: Align(
                     alignment: Alignment.centerLeft,
                     child: Text(
-                      AppLocalizations.of(context)!.performance_overview_interventions,
-                      style: theme.textTheme.titleLarge!.copyWith(color: theme.primaryColor),
+                      AppLocalizations.of(context)!
+                          .performance_overview_interventions,
+                      style: theme.textTheme.titleLarge!
+                          .copyWith(color: theme.primaryColor),
                     ),
                   ),
                 ),
@@ -51,16 +57,19 @@ class PerformanceDetailsScreen extends StatelessWidget {
                   physics: const NeverScrollableScrollPhysics(),
                   shrinkWrap: true,
                   itemCount: interventions.length,
-                  itemBuilder: (context, index) =>
-                      InterventionPerformanceBar(subject: reportSubject, intervention: interventions[index]),
+                  itemBuilder: (context, index) => InterventionPerformanceBar(
+                      subject: reportSubject,
+                      intervention: interventions[index]),
                 ),
                 Padding(
                   padding: const EdgeInsets.all(8),
                   child: Align(
                     alignment: Alignment.centerLeft,
                     child: Text(
-                      AppLocalizations.of(context)!.performance_overview_observations,
-                      style: theme.textTheme.titleLarge!.copyWith(color: theme.primaryColor),
+                      AppLocalizations.of(context)!
+                          .performance_overview_observations,
+                      style: theme.textTheme.titleLarge!
+                          .copyWith(color: theme.primaryColor),
                     ),
                   ),
                 ),
@@ -86,7 +95,8 @@ class InterventionPerformanceBar extends StatelessWidget {
   final Intervention intervention;
   final StudySubject? subject;
 
-  const InterventionPerformanceBar({required this.intervention, required this.subject, super.key});
+  const InterventionPerformanceBar(
+      {required this.intervention, required this.subject, super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -95,7 +105,8 @@ class InterventionPerformanceBar extends StatelessWidget {
         padding: const EdgeInsets.all(16),
         child: Column(
           children: [
-            InterventionCard(intervention, showTasks: false, showDescription: false),
+            InterventionCard(intervention,
+                showTasks: false, showDescription: false),
             const SizedBox(height: 8),
             ...intervention.tasks.map(
               (task) => PerformanceBar(
@@ -115,7 +126,8 @@ class ObservationPerformanceBar extends StatelessWidget {
   final Observation observation;
   final StudySubject? subject;
 
-  const ObservationPerformanceBar({required this.observation, required this.subject, super.key});
+  const ObservationPerformanceBar(
+      {required this.observation, required this.subject, super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -137,7 +149,11 @@ class PerformanceBar extends StatelessWidget {
   final int completed;
   final int total;
 
-  const PerformanceBar({required this.task, required this.completed, required this.total, super.key});
+  const PerformanceBar(
+      {required this.task,
+      required this.completed,
+      required this.total,
+      super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/app/lib/screens/study/report/performance/performance_section.dart b/app/lib/screens/study/report/performance/performance_section.dart
index 41dec298b..bd27768bc 100644
--- a/app/lib/screens/study/report/performance/performance_section.dart
+++ b/app/lib/screens/study/report/performance/performance_section.dart
@@ -17,13 +17,18 @@ class PerformanceSection extends GenericSection {
 
   @override
   Widget buildContent(BuildContext context) {
-    final interventions =
-        subject!.selectedInterventions.where((intervention) => intervention.id != Study.baselineID).toList();
+    final interventions = subject!.selectedInterventions
+        .where((intervention) => intervention.id != Study.baselineID)
+        .toList();
     final interventionProgress = interventions.map((intervention) {
-      final countableInterventions = getCountableObservationAmount(intervention);
-      return min<double>(countableInterventions == 0 ? 0 : countableInterventions / maximum, 1);
+      final countableInterventions =
+          getCountableObservationAmount(intervention);
+      return min<double>(
+          countableInterventions == 0 ? 0 : countableInterventions / maximum,
+          1);
     }).toList();
-    return interventions.length != 2 || subject!.study.reportSpecification.primary == null
+    return interventions.length != 2 ||
+            subject!.study.reportSpecification.primary == null
         ? Center(
             child: Text(AppLocalizations.of(context)!.performance),
           )
@@ -64,7 +69,8 @@ class PerformanceSection extends GenericSection {
           );
   }
 
-  String getPowerLevelDescription(BuildContext context, List<num> interventionProgress) {
+  String getPowerLevelDescription(
+      BuildContext context, List<num> interventionProgress) {
     if (interventionProgress.any((progress) => progress < minimumRatio)) {
       return AppLocalizations.of(context)!.not_enough_data;
     } else if (interventionProgress.any((progress) => progress < 1)) {
@@ -81,13 +87,18 @@ class PerformanceSection extends GenericSection {
     }
 
     var countable = 0;
-    subject!.getResultsByDate(interventionId: intervention.id).values.forEach((progress) {
+    subject!
+        .getResultsByDate(interventionId: intervention.id)
+        .values
+        .forEach((progress) {
       if (progress
-              .where((result) => intervention.tasks.any((interventionTask) => interventionTask.id == result.taskId))
+              .where((result) => intervention.tasks.any(
+                  (interventionTask) => interventionTask.id == result.taskId))
               .length ==
           interventionsPerDay) {
         countable += progress
-            .where((result) => subject!.study.observations.any((observation) => observation.id == result.taskId))
+            .where((result) => subject!.study.observations
+                .any((observation) => observation.id == result.taskId))
             .length;
       }
     });
@@ -126,12 +137,17 @@ class PerformanceBar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final rainbow = Rainbow(spectrum: [Colors.red, Colors.yellow, Colors.green], rangeStart: 0, rangeEnd: 1);
+    final rainbow = Rainbow(
+        spectrum: [Colors.red, Colors.yellow, Colors.green],
+        rangeStart: 0,
+        rangeEnd: 1);
     final fullSpectrum = List<double>.generate(3, (index) => index * 0.5)
         .map<Color>((index) => rainbow[index].withOpacity(0.4))
         .toList();
     final colorSamples =
-        List<double>.generate(11, (index) => index * 0.1 * progress).map<Color>((index) => rainbow[index]).toList();
+        List<double>.generate(11, (index) => index * 0.1 * progress)
+            .map<Color>((index) => rainbow[index])
+            .toList();
 
     final spacing = (minimum! * 1000).floor();
 
diff --git a/app/lib/screens/study/report/report_details.dart b/app/lib/screens/study/report/report_details.dart
index 5ae98fde1..0fba1e75b 100644
--- a/app/lib/screens/study/report/report_details.dart
+++ b/app/lib/screens/study/report/report_details.dart
@@ -13,7 +13,8 @@ import 'report_section_container.dart';
 class ReportDetailsScreen extends StatelessWidget {
   final StudySubject subject;
 
-  static MaterialPageRoute routeFor({required StudySubject subject}) => MaterialPageRoute(
+  static MaterialPageRoute routeFor({required StudySubject subject}) =>
+      MaterialPageRoute(
         builder: (_) => ReportDetailsScreen(subject),
         settings: const RouteSettings(name: Routes.reportDetails),
       );
@@ -43,17 +44,20 @@ class ReportDetailsScreen extends StatelessWidget {
             DisclaimerSection(subject),
             PerformanceSection(
               subject,
-              onTap: () => Navigator.push(context, PerformanceDetailsScreen.routeFor(subject: subject)),
+              onTap: () => Navigator.push(
+                  context, PerformanceDetailsScreen.routeFor(subject: subject)),
             ),
-            if (subject.study.reportSpecification.primary != null && (subject.completedStudy || kDebugMode))
+            if (subject.study.reportSpecification.primary != null &&
+                (subject.completedStudy || kDebugMode))
               ReportSectionContainer(
                 subject.study.reportSpecification.primary!,
                 subject: subject,
                 primary: true,
               ),
-            if (subject.study.reportSpecification.secondary.isNotEmpty && (subject.completedStudy || kDebugMode))
-              ...subject.study.reportSpecification.secondary
-                  .map((section) => ReportSectionContainer(section, subject: subject))
+            if (subject.study.reportSpecification.secondary.isNotEmpty &&
+                (subject.completedStudy || kDebugMode))
+              ...subject.study.reportSpecification.secondary.map((section) =>
+                  ReportSectionContainer(section, subject: subject))
           ],
         ),
       ),
diff --git a/app/lib/screens/study/report/report_history.dart b/app/lib/screens/study/report/report_history.dart
index 7fcd689e7..a03bf847b 100644
--- a/app/lib/screens/study/report/report_history.dart
+++ b/app/lib/screens/study/report/report_history.dart
@@ -21,8 +21,10 @@ class ReportHistoryScreen extends StatelessWidget {
         ),
       ),
       body: RetryFutureBuilder<List<StudySubject>>(
-        tryFunction: () => StudySubject.getStudyHistory(Supabase.instance.client.auth.currentUser!.id),
-        successBuilder: (BuildContext context, List<StudySubject>? pastStudies) {
+        tryFunction: () => StudySubject.getStudyHistory(
+            Supabase.instance.client.auth.currentUser!.id),
+        successBuilder:
+            (BuildContext context, List<StudySubject>? pastStudies) {
           return ListView.builder(
             itemCount: pastStudies!.length,
             itemBuilder: (context, index) {
@@ -49,7 +51,8 @@ class ReportHistoryItem extends StatelessWidget {
       color: isActiveStudy ? Colors.green[600] : theme.cardColor,
       child: InkWell(
         onTap: () {
-          Navigator.push(context, ReportDetailsScreen.routeFor(subject: subject));
+          Navigator.push(
+              context, ReportDetailsScreen.routeFor(subject: subject));
         },
         child: Padding(
           padding: const EdgeInsets.all(20),
@@ -58,14 +61,16 @@ class ReportHistoryItem extends StatelessWidget {
               mainAxisAlignment: MainAxisAlignment.spaceAround,
               children: [
                 Icon(
-                  MdiIcons.fromString(subject.study.iconName) ?? MdiIcons.accountHeart,
+                  MdiIcons.fromString(subject.study.iconName) ??
+                      MdiIcons.accountHeart,
                   color: isActiveStudy ? Colors.white : Colors.black,
                 ),
                 const SizedBox(width: 16),
                 Expanded(
                   child: Text(
                     subject.study.title!,
-                    style: theme.textTheme.headlineSmall!.copyWith(color: isActiveStudy ? Colors.white : Colors.black),
+                    style: theme.textTheme.headlineSmall!.copyWith(
+                        color: isActiveStudy ? Colors.white : Colors.black),
                   ),
                 ),
               ],
diff --git a/app/lib/screens/study/report/report_section_container.dart b/app/lib/screens/study/report/report_section_container.dart
index ef8bfb5ca..cfc942acc 100644
--- a/app/lib/screens/study/report/report_section_container.dart
+++ b/app/lib/screens/study/report/report_section_container.dart
@@ -6,7 +6,8 @@ import 'package:studyu_core/core.dart';
 
 import 'report_section_widget.dart';
 
-typedef SectionBuilder = ReportSectionWidget Function(ReportSection section, StudySubject subject);
+typedef SectionBuilder = ReportSectionWidget Function(
+    ReportSection section, StudySubject subject);
 
 class ReportSectionContainer extends StatelessWidget {
   final ReportSection section;
@@ -14,10 +15,12 @@ class ReportSectionContainer extends StatelessWidget {
   final bool primary;
   final GestureTapCallback? onTap;
 
-  const ReportSectionContainer(this.section, {super.key, required this.subject, this.onTap, this.primary = false});
+  const ReportSectionContainer(this.section,
+      {super.key, required this.subject, this.onTap, this.primary = false});
 
   ReportSectionWidget buildContents(BuildContext context) => switch (section) {
-        AverageSection averageSection => AverageSectionWidget(subject, averageSection),
+        AverageSection averageSection =>
+          AverageSectionWidget(subject, averageSection),
         LinearRegressionSection linearRegressionSection =>
           LinearRegressionSectionWidget(subject, linearRegressionSection),
         _ => throw ArgumentError('Section type ${section.type} not supported.'),
@@ -26,7 +29,8 @@ class ReportSectionContainer extends StatelessWidget {
   List<Widget> buildPrimaryHeader(BuildContext context, ThemeData theme) => [
         Text(
           AppLocalizations.of(context)!.report_primary_result.toUpperCase(),
-          style: theme.textTheme.labelSmall!.copyWith(color: theme.colorScheme.secondary),
+          style: theme.textTheme.labelSmall!
+              .copyWith(color: theme.colorScheme.secondary),
         ),
         const SizedBox(height: 4),
       ];
diff --git a/app/lib/screens/study/report/sections/average_section_widget.dart b/app/lib/screens/study/report/sections/average_section_widget.dart
index ad68f675f..6e6bd4c9d 100644
--- a/app/lib/screens/study/report/sections/average_section_widget.dart
+++ b/app/lib/screens/study/report/sections/average_section_widget.dart
@@ -17,13 +17,18 @@ class AverageSectionWidget extends ReportSectionWidget {
   @override
   Widget build(BuildContext context) {
     final data = getAggregatedData().toList();
-    final taskTitle =
-        subject.study.observations.firstWhereOrNull((element) => element.id == section.resultProperty!.task)?.title;
+    final taskTitle = subject.study.observations
+        .firstWhereOrNull(
+            (element) => element.id == section.resultProperty!.task)
+        ?.title;
 
     return Column(
       mainAxisSize: MainAxisSize.min,
       children: [
-        if (taskTitle != null) Text(taskTitle, style: theme.textTheme.bodyLarge!.copyWith(fontWeight: FontWeight.bold)),
+        if (taskTitle != null)
+          Text(taskTitle,
+              style: theme.textTheme.bodyLarge!
+                  .copyWith(fontWeight: FontWeight.bold)),
         const SizedBox(height: 8),
         getLegend(context, data),
         const SizedBox(height: 8),
@@ -36,21 +41,25 @@ class AverageSectionWidget extends ReportSectionWidget {
     final numberOfPhases = subject.interventionOrder.length;
     final phaseDuration = subject.study.schedule.phaseDuration;
     return Iterable<int>.generate(numberOfPhases)
-        .map((i) => (((i + 1) * phaseDuration - ((phaseDuration / 2) - 1)) - 1).floor())
+        .map((i) =>
+            (((i + 1) * phaseDuration - ((phaseDuration / 2) - 1)) - 1).floor())
         .toList();
   }
 
   List<int> get phasePos {
     final numberOfPhases = subject.interventionOrder.length;
     final phaseDuration = subject.study.schedule.phaseDuration;
-    return Iterable<int>.generate(numberOfPhases).map((i) => (i + 1) * phaseDuration).toList();
+    return Iterable<int>.generate(numberOfPhases)
+        .map((i) => (i + 1) * phaseDuration)
+        .toList();
   }
 
   Widget getLegend(BuildContext context, List<DiagramDatum> data) {
     final interventionNames = getInterventionNames(context);
     final legends = {
       for (var entry in data)
-        interventionNames[entry.intervention]!: Legend(interventionNames[entry.intervention]!, getColor(entry))
+        interventionNames[entry.intervention]!:
+            Legend(interventionNames[entry.intervention]!, getColor(entry))
     };
     return LegendsListWidget(legends: legends.values.toList());
   }
@@ -65,12 +74,18 @@ class AverageSectionWidget extends ReportSectionWidget {
 
   BarChartData getChartData(BuildContext context, List<DiagramDatum> data) {
     final barGroups = getBarGroups(context, data);
-    final maxY = ((data.sortedBy((entry) => entry.value).toList().lastOrNull?.value ?? 0) * 1.1).ceilToDouble();
+    final maxY =
+        ((data.sortedBy((entry) => entry.value).toList().lastOrNull?.value ??
+                    0) *
+                1.1)
+            .ceilToDouble();
     return BarChartData(
       titlesData: FlTitlesData(
           bottomTitles: AxisTitles(
               axisNameWidget:
-                  (section.aggregate != TemporalAggregation.intervention) ? const Text("Phase") : const Text(""),
+                  (section.aggregate != TemporalAggregation.intervention)
+                      ? const Text("Phase")
+                      : const Text(""),
               sideTitles: SideTitles(
                 showTitles: true,
                 getTitlesWidget: getTitles,
@@ -112,7 +127,8 @@ class AverageSectionWidget extends ReportSectionWidget {
     }
   }
 
-  List<BarChartGroupData> getBarGroups(BuildContext context, List<DiagramDatum> data) {
+  List<BarChartGroupData> getBarGroups(
+      BuildContext context, List<DiagramDatum> data) {
     if (data.isEmpty) return [BarChartGroupData(x: 0)];
 
     int barCount = 0;
@@ -122,7 +138,8 @@ class AverageSectionWidget extends ReportSectionWidget {
       case TemporalAggregation.phase:
         barCount = subject.interventionOrder.length;
       case TemporalAggregation.intervention:
-        barCount = subject.selectedInterventionIds.length + (subject.study.schedule.includeBaseline ? 1 : 0);
+        barCount = subject.selectedInterventionIds.length +
+            (subject.study.schedule.includeBaseline ? 1 : 0);
       default:
     }
 
@@ -144,7 +161,8 @@ class AverageSectionWidget extends ReportSectionWidget {
 
     var starter = List<BarChartGroupData>.generate(barCount, barGenerator);
     for (var entry in data) {
-      starter[entry.x.round()] = barGenerator(entry.x.round(), y: entry.value.toDouble(), color: getColor(entry));
+      starter[entry.x.round()] = barGenerator(entry.x.round(),
+          y: entry.value.toDouble(), color: getColor(entry));
     }
     return starter;
   }
@@ -164,7 +182,9 @@ class AverageSectionWidget extends ReportSectionWidget {
     final lineCount = barGroups.length * 2;
     bool drawLine(double val) {
       // draw when we are at the border between two phases
-      return (val * lineCount % (2 * subject.study.schedule.phaseDuration)).toInt() == 0;
+      return (val * lineCount % (2 * subject.study.schedule.phaseDuration))
+              .toInt() ==
+          0;
     }
 
     return FlGridData(
@@ -183,23 +203,31 @@ class AverageSectionWidget extends ReportSectionWidget {
     switch (section.aggregate) {
       case TemporalAggregation.day:
         //c = colors[subject.interventionOrder.indexOf(diagram.intervention)];
-        if (subject.study.schedule.includeBaseline && diagram.x < subject.study.schedule.phaseDuration) {
+        if (subject.study.schedule.includeBaseline &&
+            diagram.x < subject.study.schedule.phaseDuration) {
           // if id == "_baseline"
           c = baselineColor;
         } else {
-          c = colors[subject.selectedInterventions.map((e) => e.id).toList().indexOf(diagram.intervention)];
+          c = colors[subject.selectedInterventions
+              .map((e) => e.id)
+              .toList()
+              .indexOf(diagram.intervention)];
         }
       case TemporalAggregation.phase:
         if (subject.study.schedule.includeBaseline && diagram.x == 0) {
           c = baselineColor;
         } else {
-          c = colors[subject.selectedInterventions.map((e) => e.id).toList().indexOf(diagram.intervention)];
+          c = colors[subject.selectedInterventions
+              .map((e) => e.id)
+              .toList()
+              .indexOf(diagram.intervention)];
         }
       case TemporalAggregation.intervention:
         if (subject.study.schedule.includeBaseline && diagram.x == 0) {
           c = baselineColor;
         } else {
-          c = colors[diagram.x.round() - (subject.study.schedule.includeBaseline ? 1 : 0)];
+          c = colors[diagram.x.round() -
+              (subject.study.schedule.includeBaseline ? 1 : 0)];
         }
       default:
     }
@@ -207,7 +235,8 @@ class AverageSectionWidget extends ReportSectionWidget {
   }
 
   int getDayIndex(DateTime key) {
-    if (subject.study.schedule.includeBaseline) return subject.getDayOfStudyFor(key);
+    if (subject.study.schedule.includeBaseline)
+      return subject.getDayOfStudyFor(key);
     final schedule = subject.scheduleFor(subject.startedAt!);
     // this always has to be found because studies have to have at least 2
     // interventions
@@ -267,7 +296,10 @@ class AverageSectionWidget extends ReportSectionWidget {
   }
 
   Map<String, String?> getInterventionNames(BuildContext context) {
-    final names = {for (var intervention in subject.study.interventions) intervention.id: intervention.name};
+    final names = {
+      for (var intervention in subject.study.interventions)
+        intervention.id: intervention.name
+    };
     names[Study.baselineID] = AppLocalizations.of(context)!.baseline;
     return names;
   }
diff --git a/app/lib/screens/study/tasks/intervention/checkmark_task_widget.dart b/app/lib/screens/study/tasks/intervention/checkmark_task_widget.dart
index 75321a435..e5d8d94ce 100644
--- a/app/lib/screens/study/tasks/intervention/checkmark_task_widget.dart
+++ b/app/lib/screens/study/tasks/intervention/checkmark_task_widget.dart
@@ -26,7 +26,8 @@ class _CheckmarkTaskWidgetState extends State<CheckmarkTaskWidget> {
     return ElevatedButton.icon(
       style: ButtonStyle(
           backgroundColor: WidgetStateProperty.all<Color>(Colors.green),
-          textStyle: WidgetStateProperty.all<TextStyle>(const TextStyle(color: Colors.white))),
+          textStyle: WidgetStateProperty.all<TextStyle>(
+              const TextStyle(color: Colors.white))),
       onPressed: () async {
         if (isRedundantClick(loginClickTime)) return;
         setState(() {
@@ -34,11 +35,16 @@ class _CheckmarkTaskWidgetState extends State<CheckmarkTaskWidget> {
         });
         await handleTaskCompletion(context, (StudySubject? subject) async {
           try {
-            await subject!
-                .addResult<bool>(taskId: widget.task!.id, periodId: widget.completionPeriod!.id, result: true);
+            await subject!.addResult<bool>(
+                taskId: widget.task!.id,
+                periodId: widget.completionPeriod!.id,
+                result: true);
           } on SocketException catch (_) {
             await subject!.addResult<bool>(
-                taskId: widget.task!.id, periodId: widget.completionPeriod!.id, result: true, offline: true);
+                taskId: widget.task!.id,
+                periodId: widget.completionPeriod!.id,
+                result: true,
+                offline: true);
             rethrow;
           }
         });
@@ -48,7 +54,9 @@ class _CheckmarkTaskWidgetState extends State<CheckmarkTaskWidget> {
         if (!context.mounted) return;
         Navigator.pop(context, true);
       },
-      icon: _isLoading ? const CircularProgressIndicator(color: Colors.white) : const Icon(Icons.check),
+      icon: _isLoading
+          ? const CircularProgressIndicator(color: Colors.white)
+          : const Icon(Icons.check),
       label: Text(AppLocalizations.of(context)!.complete),
     );
   }
diff --git a/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart b/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart
index 55d24b076..defc98f48 100644
--- a/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart
+++ b/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart
@@ -13,10 +13,12 @@ class QuestionnaireTaskWidget extends StatefulWidget {
   final QuestionnaireTask task;
   final CompletionPeriod completionPeriod;
 
-  const QuestionnaireTaskWidget({required this.task, required this.completionPeriod, super.key});
+  const QuestionnaireTaskWidget(
+      {required this.task, required this.completionPeriod, super.key});
 
   @override
-  State<QuestionnaireTaskWidget> createState() => _QuestionnaireTaskWidgetState();
+  State<QuestionnaireTaskWidget> createState() =>
+      _QuestionnaireTaskWidgetState();
 }
 
 class _QuestionnaireTaskWidgetState extends State<QuestionnaireTaskWidget> {
@@ -26,13 +28,20 @@ class _QuestionnaireTaskWidgetState extends State<QuestionnaireTaskWidget> {
   bool _isLoading = false;
   final GlobalKey<FormState> formKey = GlobalKey<FormState>();
 
-  Future<void> _addQuestionnaireResult<T>(T response, BuildContext context) async {
+  Future<void> _addQuestionnaireResult<T>(
+      T response, BuildContext context) async {
     await handleTaskCompletion(context, (StudySubject? subject) async {
       try {
-        await subject!.addResult<T>(taskId: widget.task.id, periodId: widget.completionPeriod.id, result: response);
+        await subject!.addResult<T>(
+            taskId: widget.task.id,
+            periodId: widget.completionPeriod.id,
+            result: response);
       } on SocketException catch (_) {
         await subject!.addResult<T>(
-            taskId: widget.task.id, periodId: widget.completionPeriod.id, result: response, offline: true);
+            taskId: widget.task.id,
+            periodId: widget.completionPeriod.id,
+            result: response,
+            offline: true);
         rethrow;
       }
     });
@@ -66,7 +75,9 @@ class _QuestionnaireTaskWidgetState extends State<QuestionnaireTaskWidget> {
         ),
         response != null && responseValidator
             ? ElevatedButton.icon(
-                style: ButtonStyle(backgroundColor: WidgetStateProperty.all<Color>(Colors.green)),
+                style: ButtonStyle(
+                    backgroundColor:
+                        WidgetStateProperty.all<Color>(Colors.green)),
                 onPressed: () async {
                   if (isRedundantClick(loginClickTime)) {
                     return;
@@ -79,14 +90,17 @@ class _QuestionnaireTaskWidgetState extends State<QuestionnaireTaskWidget> {
                   });
                   switch (response) {
                     case QuestionnaireState questionnaireState:
-                      await _addQuestionnaireResult<QuestionnaireState>(questionnaireState, context);
+                      await _addQuestionnaireResult<QuestionnaireState>(
+                          questionnaireState, context);
                       break;
                   }
                   setState(() {
                     _isLoading = false;
                   });
                 },
-                icon: _isLoading ? const CircularProgressIndicator(color: Colors.white) : const Icon(Icons.check),
+                icon: _isLoading
+                    ? const CircularProgressIndicator(color: Colors.white)
+                    : const Icon(Icons.check),
                 label: Text(AppLocalizations.of(context)!.complete),
               )
             : const SizedBox.shrink(),
diff --git a/app/lib/screens/study/tasks/task_screen.dart b/app/lib/screens/study/tasks/task_screen.dart
index 04a66b34d..4b490fd97 100644
--- a/app/lib/screens/study/tasks/task_screen.dart
+++ b/app/lib/screens/study/tasks/task_screen.dart
@@ -13,7 +13,9 @@ import 'observation/questionnaire_task_widget.dart';
 class TaskScreen extends StatefulWidget {
   final TaskInstance taskInstance;
 
-  static MaterialPageRoute<bool> routeFor({required TaskInstance taskInstance}) => MaterialPageRoute(
+  static MaterialPageRoute<bool> routeFor(
+          {required TaskInstance taskInstance}) =>
+      MaterialPageRoute(
         builder: (_) => TaskScreen(taskInstance: taskInstance),
       );
 
@@ -31,7 +33,8 @@ class _TaskScreenState extends State<TaskScreen> {
   void didChangeDependencies() {
     super.didChangeDependencies();
     subject = context.watch<AppState>().activeSubject;
-    taskInstance = TaskInstance.fromInstanceId(widget.taskInstance.id, study: subject!.study);
+    taskInstance = TaskInstance.fromInstanceId(widget.taskInstance.id,
+        study: subject!.study);
   }
 
   Widget _buildTask() {
@@ -77,7 +80,8 @@ class _TaskScreenState extends State<TaskScreen> {
   }
 }
 
-handleTaskCompletion(BuildContext context, Function(StudySubject?) completionCallback) async {
+handleTaskCompletion(
+    BuildContext context, Function(StudySubject?) completionCallback) async {
   final state = context.read<AppState>();
   final activeSubject = state.activeSubject;
   try {
@@ -93,7 +97,9 @@ handleTaskCompletion(BuildContext context, Function(StudySubject?) completionCal
       SnackBar(
         content: Text(AppLocalizations.of(context)!.could_not_save_results),
         duration: const Duration(seconds: 10),
-        action: SnackBarAction(label: 'Retry', onPressed: () => handleTaskCompletion(context, completionCallback)),
+        action: SnackBarAction(
+            label: 'Retry',
+            onPressed: () => handleTaskCompletion(context, completionCallback)),
       ),
     );
     rethrow;
diff --git a/app/lib/util/app_analytics.dart b/app/lib/util/app_analytics.dart
index 2d11c4481..5519fc0af 100644
--- a/app/lib/util/app_analytics.dart
+++ b/app/lib/util/app_analytics.dart
@@ -35,7 +35,8 @@ class AppAnalytics /*extends Analytics*/ {
 
   static Future<void> start(AppConfig? appConfig, MyApp myApp) async {
     StudyUAnalytics? studyUAnalytics;
-    if (appConfig == null || appConfig.analytics != null && appConfig.analytics!.dsn.isEmpty) {
+    if (appConfig == null ||
+        appConfig.analytics != null && appConfig.analytics!.dsn.isEmpty) {
       final cachedAnalytics = (await Cache.loadAnalytics());
       if (cachedAnalytics != null) {
         studyUAnalytics = cachedAnalytics;
diff --git a/app/lib/util/cache.dart b/app/lib/util/cache.dart
index 751d6c9ab..07eebfe2c 100644
--- a/app/lib/util/cache.dart
+++ b/app/lib/util/cache.dart
@@ -19,19 +19,22 @@ class Cache {
   static Future<StudySubject> loadSubject() async {
     // debugPrint("Load subject from cache");
     if (await SecureStorage.containsKey(cacheSubjectKey)) {
-      return StudySubject.fromJson(jsonDecode((await SecureStorage.read(cacheSubjectKey))!));
+      return StudySubject.fromJson(
+          jsonDecode((await SecureStorage.read(cacheSubjectKey))!));
     } else {
       throw Exception("No cached subject found");
     }
   }
 
   static Future<void> storeAnalytics(StudyUAnalytics analytics) async {
-    SecureStorage.write(StudyUAnalytics.keyStudyUAnalytics, jsonEncode(analytics.toJson()));
+    SecureStorage.write(
+        StudyUAnalytics.keyStudyUAnalytics, jsonEncode(analytics.toJson()));
   }
 
   static Future<StudyUAnalytics?> loadAnalytics() async {
     if (await SecureStorage.containsKey(cacheSubjectKey)) {
-      return StudyUAnalytics.fromJson(jsonDecode((await SecureStorage.read(StudyUAnalytics.keyStudyUAnalytics))!));
+      return StudyUAnalytics.fromJson(jsonDecode(
+          (await SecureStorage.read(StudyUAnalytics.keyStudyUAnalytics))!));
     }
     return null;
   }
@@ -45,7 +48,8 @@ class Cache {
     final blobStorageHandler = BlobStorageHandler();
     final futureBlobFiles = await TemporaryStorageHandler.getFutureBlobFiles();
     for (final futureBlobFile in futureBlobFiles) {
-      await blobStorageHandler.uploadObservation(futureBlobFile.futureBlobId, File(futureBlobFile.localFilePath));
+      await blobStorageHandler.uploadObservation(
+          futureBlobFile.futureBlobId, File(futureBlobFile.localFilePath));
       await File(futureBlobFile.localFilePath).delete();
     }
   }
@@ -53,12 +57,15 @@ class Cache {
   static Future<StudySubject> synchronize(StudySubject remoteSubject) async {
     if (isSynchronizing) return remoteSubject;
     // No local subject found
-    if (!(await SecureStorage.containsKey(cacheSubjectKey))) return remoteSubject;
+    if (!(await SecureStorage.containsKey(cacheSubjectKey)))
+      return remoteSubject;
     final localSubject = await loadSubject();
     // local and remote subject are equal, nothing to synchronize
     if (localSubject == remoteSubject) return remoteSubject;
     // remote subject belongs to a different study
-    if (!kDebugMode && remoteSubject.startedAt!.isAfter(localSubject.startedAt!)) return remoteSubject;
+    if (!kDebugMode &&
+        remoteSubject.startedAt!.isAfter(localSubject.startedAt!))
+      return remoteSubject;
 
     debugPrint("Synchronize subject with cache");
     isSynchronizing = true;
@@ -82,17 +89,25 @@ class Cache {
         newProgress = localSubject.progress;
       }*/
         // save new progress
-        final List<SubjectProgress> newProgress = [...localSubject.progress, ...remoteSubject.progress];
-        newProgress.removeWhere(
-            (element) => localSubject.progress.contains(element) && remoteSubject.progress.contains(element));
+        final List<SubjectProgress> newProgress = [
+          ...localSubject.progress,
+          ...remoteSubject.progress
+        ];
+        newProgress.removeWhere((element) =>
+            localSubject.progress.contains(element) &&
+            remoteSubject.progress.contains(element));
         for (var p in newProgress) {
           await p.save();
         }
 
         // merge local and remote progress and remove duplicates
-        final List<SubjectProgress> finalProgress = [...localSubject.progress, ...remoteSubject.progress];
+        final List<SubjectProgress> finalProgress = [
+          ...localSubject.progress,
+          ...remoteSubject.progress
+        ];
         final duplicates = <DateTime?>{};
-        finalProgress.retainWhere((element) => duplicates.add(element.completedAt));
+        finalProgress
+            .retainWhere((element) => duplicates.add(element.completedAt));
         // replace remote progress with our merge
         remoteSubject.progress = finalProgress;
         await remoteSubject.save();
@@ -101,10 +116,12 @@ class Cache {
         // We can either drop local or overwrite remote
         // ... for now do nothing
         if (!kDebugMode && localSubject.startedAt == remoteSubject.startedAt) {
-          StudyULogger.fatal("Cache synchronization found local changes that cannot be merged");
+          StudyULogger.fatal(
+              "Cache synchronization found local changes that cannot be merged");
           StudyUDiagnostics.captureMessage(
               "localSubject: ${localSubject.toFullJson()} \nremoteSubject: ${remoteSubject.toFullJson()}");
-          StudyUDiagnostics.captureException(Exception("CacheSynchronizationException"));
+          StudyUDiagnostics.captureException(
+              Exception("CacheSynchronizationException"));
         }
       }
     } catch (exception) {
diff --git a/app/lib/util/color.dart b/app/lib/util/color.dart
index c5fce8538..5dcf665e8 100644
--- a/app/lib/util/color.dart
+++ b/app/lib/util/color.dart
@@ -5,7 +5,8 @@ extension ColorBrightness on Color {
     assert(amount >= 0 && amount <= 1);
 
     final hsl = HSLColor.fromColor(this);
-    final hslLight = hsl.withLightness((hsl.lightness + amount).clamp(0.0, 1.0).toDouble());
+    final hslLight =
+        hsl.withLightness((hsl.lightness + amount).clamp(0.0, 1.0).toDouble());
 
     return hslLight.toColor();
   }
diff --git a/app/lib/util/data_processing.dart b/app/lib/util/data_processing.dart
index 82495e134..18bc12615 100644
--- a/app/lib/util/data_processing.dart
+++ b/app/lib/util/data_processing.dart
@@ -15,7 +15,8 @@ class GroupedIterable<K, V> extends Iterable<MapEntry<K, Iterable<V>>> {
   Iterable<MapEntry<K, R>> aggregate<R>(FoldAggregator<V, R> aggregator) =>
       map((entry) => MapEntry(entry.key, aggregator(entry.value)));
 
-  Iterable<MapEntry<K, R>> aggregateWithKey<R>(KeyedAggregator<K, V, R> aggregator) =>
+  Iterable<MapEntry<K, R>> aggregateWithKey<R>(
+          KeyedAggregator<K, V, R> aggregator) =>
       map((entry) => MapEntry(entry.key, aggregator(entry.value, entry.key)));
 }
 
@@ -30,14 +31,17 @@ FoldAggregator<V, V> foldAggregateMedian<V extends Comparable>() => (values) {
 FoldAggregator<V, V> foldAggregateMax<V extends Comparable>() =>
     (values) => values.reduce((a, b) => a.compareTo(b) > 0 ? a : b);
 
-FoldAggregator<num, num> foldAggregateSum() => (values) => values.reduce((value, element) => value + element);
+FoldAggregator<num, num> foldAggregateSum() =>
+    (values) => values.reduce((value, element) => value + element);
 
-FoldAggregator<num, num> foldAggregateMean() => (values) => foldAggregateSum()(values) / values.length;
+FoldAggregator<num, num> foldAggregateMean() =>
+    (values) => foldAggregateSum()(values) / values.length;
 
 extension GroupByIterable<V> on Iterable<V> {
   GroupedIterable<K, V> groupBy<K>(KeyAccessor<K, V> key) {
     final result = <K, List<V>>{};
-    forEach((element) => result.putIfAbsent(key(element), () => []).add(element));
+    forEach(
+        (element) => result.putIfAbsent(key(element), () => []).add(element));
     return GroupedIterable.from(result);
   }
 }
diff --git a/app/lib/util/intervention.dart b/app/lib/util/intervention.dart
index de63c04f3..82e3d397f 100644
--- a/app/lib/util/intervention.dart
+++ b/app/lib/util/intervention.dart
@@ -3,12 +3,15 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart
 import 'package:studyu_core/core.dart';
 
 Widget interventionIcon(Intervention intervention, {Color? color}) {
-  if (intervention.isBaseline()) return Icon(MdiIcons.rayStart, color: color ?? Colors.white);
+  if (intervention.isBaseline())
+    return Icon(MdiIcons.rayStart, color: color ?? Colors.white);
 
   return intervention.icon.isNotEmpty
-      ? Icon(MdiIcons.fromString(intervention.icon), color: color ?? Colors.white)
+      ? Icon(MdiIcons.fromString(intervention.icon),
+          color: color ?? Colors.white)
       : Text(
           intervention.name![0].toUpperCase(),
-          style: TextStyle(fontWeight: FontWeight.bold, color: color ?? Colors.white),
+          style: TextStyle(
+              fontWeight: FontWeight.bold, color: color ?? Colors.white),
         );
 }
diff --git a/app/lib/util/notifications.dart b/app/lib/util/notifications.dart
index ca38fd6c8..2a173add7 100644
--- a/app/lib/util/notifications.dart
+++ b/app/lib/util/notifications.dart
@@ -19,20 +19,23 @@ class NotificationValidators {
   bool wasNotificationActionHandled = false;
   bool wasNotificationActionCompleted = false;
 
-  NotificationValidators(
-      this.didNotificationLaunchApp, this.wasNotificationActionHandled, this.wasNotificationActionCompleted);
+  NotificationValidators(this.didNotificationLaunchApp,
+      this.wasNotificationActionHandled, this.wasNotificationActionCompleted);
 }
 
 class StudyNotifications {
   StudySubject? subject;
   late FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin;
   BuildContext context;
-  final StreamController<ReceivedNotification> didReceiveLocalNotificationStream =
+  final StreamController<ReceivedNotification>
+      didReceiveLocalNotificationStream =
       StreamController<ReceivedNotification>.broadcast();
-  final StreamController<String?> selectNotificationStream = StreamController<String?>.broadcast();
+  final StreamController<String?> selectNotificationStream =
+      StreamController<String?>.broadcast();
   // String? _taskCannotBeCompleted;
 
-  static final NotificationValidators validator = NotificationValidators(false, false, false);
+  static final NotificationValidators validator =
+      NotificationValidators(false, false, false);
 
   static const bool debug = false; //kDebugMode;
   static String? scheduledNotificationsDebug;
@@ -53,15 +56,18 @@ class StudyNotifications {
     BuildContext context,
   ) async {
     final notifications = StudyNotifications._create(activeSubject, context);
-    final NotificationAppLaunchDetails? notificationAppLaunchDetails = !kIsWeb && Platform.isLinux
-        ? null
-        : await notifications.flutterLocalNotificationsPlugin.getNotificationAppLaunchDetails();
+    final NotificationAppLaunchDetails? notificationAppLaunchDetails =
+        !kIsWeb && Platform.isLinux
+            ? null
+            : await notifications.flutterLocalNotificationsPlugin
+                .getNotificationAppLaunchDetails();
     StudyNotifications.validator.didNotificationLaunchApp =
         notificationAppLaunchDetails?.didNotificationLaunchApp ?? false;
     if (StudyNotifications.validator.didNotificationLaunchApp &&
         !StudyNotifications.validator.wasNotificationActionHandled) {
       StudyNotifications.validator.wasNotificationActionHandled = true;
-      final selectedNotificationPayload = notificationAppLaunchDetails!.notificationResponse!.payload!;
+      final selectedNotificationPayload =
+          notificationAppLaunchDetails!.notificationResponse!.payload!;
       notifications.handleNotificationResponse(selectedNotificationPayload);
     }
     return notifications;
@@ -71,7 +77,8 @@ class StudyNotifications {
     if (Platform.isAndroid) {
       //final bool granted =
       await flutterLocalNotificationsPlugin
-          .resolvePlatformSpecificImplementation<AndroidFlutterLocalNotificationsPlugin>()!
+          .resolvePlatformSpecificImplementation<
+              AndroidFlutterLocalNotificationsPlugin>()!
           .areNotificationsEnabled();
     }
   }
@@ -79,14 +86,16 @@ class StudyNotifications {
   Future<void> _requestPermissions() async {
     if (Platform.isIOS || Platform.isMacOS) {
       await flutterLocalNotificationsPlugin
-          .resolvePlatformSpecificImplementation<IOSFlutterLocalNotificationsPlugin>()
+          .resolvePlatformSpecificImplementation<
+              IOSFlutterLocalNotificationsPlugin>()
           ?.requestPermissions(
             alert: true,
             badge: true,
             sound: true,
           );
       await flutterLocalNotificationsPlugin
-          .resolvePlatformSpecificImplementation<MacOSFlutterLocalNotificationsPlugin>()
+          .resolvePlatformSpecificImplementation<
+              MacOSFlutterLocalNotificationsPlugin>()
           ?.requestPermissions(
             alert: true,
             badge: true,
@@ -94,10 +103,12 @@ class StudyNotifications {
           );
     } else if (Platform.isAndroid) {
       // todo look into this further if notifications are not received on Android
-      final AndroidFlutterLocalNotificationsPlugin? androidImplementation = flutterLocalNotificationsPlugin
-          .resolvePlatformSpecificImplementation<AndroidFlutterLocalNotificationsPlugin>();
+      final AndroidFlutterLocalNotificationsPlugin? androidImplementation =
+          flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<
+              AndroidFlutterLocalNotificationsPlugin>();
 
-      /*final bool granted =*/ await androidImplementation?.requestNotificationsPermission();
+      /*final bool granted =*/ await androidImplementation
+          ?.requestNotificationsPermission();
 
       var status = await Permission.ignoreBatteryOptimizations.status;
       if (status.isDenied) {
@@ -111,12 +122,17 @@ class StudyNotifications {
   }
 
   void _configureDidReceiveLocalNotificationSubject() {
-    didReceiveLocalNotificationStream.stream.listen((ReceivedNotification receivedNotification) async {
+    didReceiveLocalNotificationStream.stream
+        .listen((ReceivedNotification receivedNotification) async {
       await showDialog(
         context: context,
         builder: (BuildContext context) => CupertinoAlertDialog(
-          title: receivedNotification.title != null ? Text(receivedNotification.title!) : null,
-          content: receivedNotification.body != null ? Text(receivedNotification.body!) : null,
+          title: receivedNotification.title != null
+              ? Text(receivedNotification.title!)
+              : null,
+          content: receivedNotification.body != null
+              ? Text(receivedNotification.body!)
+              : null,
           actions: <Widget>[
             CupertinoDialogAction(
               isDefaultAction: true,
@@ -146,7 +162,8 @@ class StudyNotifications {
     flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
     const AndroidInitializationSettings initializationSettingsAndroid =
         AndroidInitializationSettings('@drawable/ic_notification');
-    final DarwinInitializationSettings initializationSettingsDarwin = DarwinInitializationSettings(
+    final DarwinInitializationSettings initializationSettingsDarwin =
+        DarwinInitializationSettings(
       onDidReceiveLocalNotification: (
         int id,
         String? title,
@@ -163,10 +180,12 @@ class StudyNotifications {
         );
       },
     );
-    const LinuxInitializationSettings initializationSettingsLinux = LinuxInitializationSettings(
+    const LinuxInitializationSettings initializationSettingsLinux =
+        LinuxInitializationSettings(
       defaultActionName: 'Open notification',
     );
-    final InitializationSettings initializationSettings = InitializationSettings(
+    final InitializationSettings initializationSettings =
+        InitializationSettings(
       android: initializationSettingsAndroid,
       iOS: initializationSettingsDarwin,
       macOS: initializationSettingsDarwin,
@@ -174,7 +193,8 @@ class StudyNotifications {
     );
     flutterLocalNotificationsPlugin.initialize(
       initializationSettings,
-      onDidReceiveNotificationResponse: (NotificationResponse notificationResponse) {
+      onDidReceiveNotificationResponse:
+          (NotificationResponse notificationResponse) {
         switch (notificationResponse.notificationResponseType) {
           case NotificationResponseType.selectedNotification:
             selectNotificationStream.add(notificationResponse.payload);
@@ -192,7 +212,8 @@ class StudyNotifications {
 
   Future handleNotificationResponse(String taskInstanceId) async {
     final nowDt = DateTime.now();
-    final taskToRun = TaskInstance.fromInstanceId(taskInstanceId, subject: subject);
+    final taskToRun =
+        TaskInstance.fromInstanceId(taskInstanceId, subject: subject);
 
     final completed = subject!.completedTaskInstanceForDay(
       taskToRun.task.id,
@@ -201,14 +222,16 @@ class StudyNotifications {
     );
 
     //if (taskToRun != null) {
-    final isInsidePeriod = taskToRun.completionPeriod.contains(StudyUTimeOfDay.now());
+    final isInsidePeriod =
+        taskToRun.completionPeriod.contains(StudyUTimeOfDay.now());
     if (!completed && isInsidePeriod) {
       await navigatorKey.currentState!.push(
         MaterialPageRoute(
           builder: (_) => TaskScreen(taskInstance: taskToRun),
         ),
       );
-      navigatorKey.currentState!.pushNamedAndRemoveUntil(Routes.loading, (_) => false);
+      navigatorKey.currentState!
+          .pushNamedAndRemoveUntil(Routes.loading, (_) => false);
       // todo error management after null safety
       /*} else {
         navigatorKey.currentState!.push(
@@ -222,7 +245,8 @@ class StudyNotifications {
       navigatorKey.currentState!.push(
         // todo translate
         MaterialPageRoute(
-          builder: (_) => const DashboardScreen(error: 'Task could not be found'),
+          builder: (_) =>
+              const DashboardScreen(error: 'Task could not be found'),
         ),
       );
     }
diff --git a/app/lib/util/save_pdf.dart b/app/lib/util/save_pdf.dart
index d04bba411..5a0b09b53 100644
--- a/app/lib/util/save_pdf.dart
+++ b/app/lib/util/save_pdf.dart
@@ -4,9 +4,11 @@ import 'package:flutter_file_dialog/flutter_file_dialog.dart';
 import 'package:pdf/pdf.dart';
 import 'package:pdf/widgets.dart' as pw;
 
-Future<String?> savePDF(BuildContext context, String title, List<pw.Widget> content) async {
+Future<String?> savePDF(
+    BuildContext context, String title, List<pw.Widget> content) async {
   final doc = pw.Document();
-  final logo = pw.MemoryImage((await rootBundle.load('assets/icon/logo.png')).buffer.asUint8List());
+  final logo = pw.MemoryImage(
+      (await rootBundle.load('assets/icon/logo.png')).buffer.asUint8List());
   doc.addPage(
     pw.MultiPage(
       pageFormat: PdfPageFormat.a4,
diff --git a/app/lib/util/schedule_notifications.dart b/app/lib/util/schedule_notifications.dart
index ac9942724..62d89efa6 100644
--- a/app/lib/util/schedule_notifications.dart
+++ b/app/lib/util/schedule_notifications.dart
@@ -9,17 +9,24 @@ import 'package:timezone/timezone.dart' as tz;
 import '../models/app_state.dart';
 import 'notifications.dart';
 
-Future<int> scheduleReminderForDate(FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin, int id,
-    String body, StudyNotification studyNotification, NotificationDetails notificationDetails) async {
+Future<int> scheduleReminderForDate(
+    FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin,
+    int id,
+    String body,
+    StudyNotification studyNotification,
+    NotificationDetails notificationDetails) async {
   var currentId = id;
   final task = studyNotification.taskInstance.task;
   final date = studyNotification.date;
   for (final reminder in task.schedule.reminders) {
     // unlock time:  ${task.schedule.completionPeriods.firstWhere((cp) => cp.unlockTime.earlierThan(reminder)).lockTime}
-    final reminderTime = tz.TZDateTime(tz.local, date.year, date.month, date.day, reminder.hour, reminder.minute);
+    final reminderTime = tz.TZDateTime(tz.local, date.year, date.month,
+        date.day, reminder.hour, reminder.minute);
     if (date.isSameDate(DateTime.now()) &&
-        !StudyUTimeOfDay(hour: date.hour, minute: date.minute).earlierThan(reminder, exact: true)) {
-      String debugStr = 'Skipped #$currentId: $reminderTime, ${task.title}, ${studyNotification.taskInstance.id}';
+        !StudyUTimeOfDay(hour: date.hour, minute: date.minute)
+            .earlierThan(reminder, exact: true)) {
+      String debugStr =
+          'Skipped #$currentId: $reminderTime, ${task.title}, ${studyNotification.taskInstance.id}';
       //StudyNotifications.scheduledNotificationsDebug += '\n\n$debugStr';
       if (StudyNotifications.debug) {
         print(debugStr);
@@ -43,7 +50,8 @@ Future<int> scheduleReminderForDate(FlutterLocalNotificationsPlugin flutterLocal
       reminderTime,
       notificationDetails,
       payload: studyNotification.taskInstance.id,
-      uiLocalNotificationDateInterpretation: UILocalNotificationDateInterpretation.wallClockTime,
+      uiLocalNotificationDateInterpretation:
+          UILocalNotificationDateInterpretation.wallClockTime,
       // exactAllowWhileIdle only works if the exact alarm permission has been granted
       androidScheduleMode: AndroidScheduleMode.inexactAllowWhileIdle,
     );
@@ -60,8 +68,10 @@ Future<int> scheduleReminderForDate(FlutterLocalNotificationsPlugin flutterLocal
         );
       }*/
     // DEBUG: List scheduled notifications
-    String debugStr = 'Scheduled #$currentId: $reminderTime, ${task.title}, ${studyNotification.taskInstance.id}';
-    StudyNotifications.scheduledNotificationsDebug = '${StudyNotifications.scheduledNotificationsDebug}\n\n$debugStr';
+    String debugStr =
+        'Scheduled #$currentId: $reminderTime, ${task.title}, ${studyNotification.taskInstance.id}';
+    StudyNotifications.scheduledNotificationsDebug =
+        '${StudyNotifications.scheduledNotificationsDebug}\n\n$debugStr';
     if (StudyNotifications.debug) {
       print(debugStr);
     }
@@ -70,7 +80,8 @@ Future<int> scheduleReminderForDate(FlutterLocalNotificationsPlugin flutterLocal
   return currentId;
 }
 
-const notificationDetails = NotificationDetails(android: AndroidNotificationDetails('0', 'StudyU'));
+const notificationDetails =
+    NotificationDetails(android: AndroidNotificationDetails('0', 'StudyU'));
 
 Future<void> scheduleNotifications(BuildContext context) async {
   if (StudyNotifications.debug) {
@@ -85,9 +96,11 @@ Future<void> scheduleNotifications(BuildContext context) async {
   final appState = context.read<AppState>();
   final subject = appState.activeSubject!;
   final body = AppLocalizations.of(context)!.study_notification_body;
-  final studyNotifications = appState.studyNotifications ?? await StudyNotifications.create(subject, context);
+  final studyNotifications = appState.studyNotifications ??
+      await StudyNotifications.create(subject, context);
 
-  final notificationsPlugin = studyNotifications.flutterLocalNotificationsPlugin;
+  final notificationsPlugin =
+      studyNotifications.flutterLocalNotificationsPlugin;
   await notificationsPlugin.cancelAll();
 
   StudyNotifications.scheduledNotificationsDebug =
@@ -101,22 +114,27 @@ Future<void> scheduleNotifications(BuildContext context) async {
   }
   var id = 0;
   for (final StudyNotification notification in studyNotificationList) {
-    final currentId = await scheduleReminderForDate(notificationsPlugin, id, body, notification, notificationDetails);
+    final currentId = await scheduleReminderForDate(
+        notificationsPlugin, id, body, notification, notificationDetails);
     id = currentId;
   }
 }
 
-List<StudyNotification> _buildNotificationList(StudySubject subject, DateTime date, List<TaskInstance> tasks) {
+List<StudyNotification> _buildNotificationList(
+    StudySubject subject, DateTime date, List<TaskInstance> tasks) {
   List<StudyNotification> taskNotifications = [];
   for (TaskInstance taskInstance in tasks) {
     if (taskInstance.task.title == null || taskInstance.task.title!.isEmpty) {
       return [];
     }
-    if (!subject.completedTaskInstanceForDay(taskInstance.task.id, taskInstance.completionPeriod, date)) {
+    if (!subject.completedTaskInstanceForDay(
+        taskInstance.task.id, taskInstance.completionPeriod, date)) {
       taskNotifications.add(StudyNotification(taskInstance, date));
     } else {
-      String debugStr = 'TaskInstance already completed: ${taskInstance.completionPeriod}, ${taskInstance.task.title}';
-      StudyNotifications.scheduledNotificationsDebug = '${StudyNotifications.scheduledNotificationsDebug}\n\n$debugStr';
+      String debugStr =
+          'TaskInstance already completed: ${taskInstance.completionPeriod}, ${taskInstance.task.title}';
+      StudyNotifications.scheduledNotificationsDebug =
+          '${StudyNotifications.scheduledNotificationsDebug}\n\n$debugStr';
     }
   }
   return taskNotifications;
@@ -127,7 +145,8 @@ void testNotifications(BuildContext context) async {
   if (kIsWeb) return;
   final appState = context.read<AppState>();
   final subject = appState.activeSubject;
-  final studyNotifications = appState.studyNotifications ?? await StudyNotifications.create(subject, context);
+  final studyNotifications = appState.studyNotifications ??
+      await StudyNotifications.create(subject, context);
   await studyNotifications.flutterLocalNotificationsPlugin.show(
     /*******************/
     99,
diff --git a/app/lib/util/study_subject_extension.dart b/app/lib/util/study_subject_extension.dart
index a8c12d5fe..a7cea5906 100644
--- a/app/lib/util/study_subject_extension.dart
+++ b/app/lib/util/study_subject_extension.dart
@@ -12,7 +12,8 @@ extension StudySubjectExtension on StudySubject {
     bool offline = false,
   }) async {
     final Result<T> resultObject = switch (result) {
-      QuestionnaireState() => Result<T>.app(type: 'QuestionnaireState', periodId: periodId, result: result),
+      QuestionnaireState() => Result<T>.app(
+          type: 'QuestionnaireState', periodId: periodId, result: result),
       bool() => Result<T>.app(type: 'bool', periodId: periodId, result: result),
       _ => Result<T>.app(type: 'unknown', periodId: periodId, result: result),
     };
@@ -34,8 +35,9 @@ extension StudySubjectExtension on StudySubject {
                 futureBlobFile.localFilePath, futureBlobFile.futureBlobId);
 
             // Replaces Answer<FutureBlobFile> with Answer<String>
-            questionnaireState.answers[answerEntry.key] = Answer<String>(answer.question, answer.timestamp)
-              ..response = futureBlobFile.futureBlobId;
+            questionnaireState.answers[answerEntry.key] =
+                Answer<String>(answer.question, answer.timestamp)
+                  ..response = futureBlobFile.futureBlobId;
           }
         }
       }
diff --git a/app/lib/util/temporary_storage_handler.dart b/app/lib/util/temporary_storage_handler.dart
index 588293810..2747a5ce9 100644
--- a/app/lib/util/temporary_storage_handler.dart
+++ b/app/lib/util/temporary_storage_handler.dart
@@ -23,19 +23,22 @@ class TemporaryStorageHandler {
 
   static Future<Directory> _getMultimodalTempDirectory() async {
     final tempAppData = await getTemporaryDirectory();
-    final multimodalTempDirectory = Directory("${tempAppData.path}/multimodal-temp");
+    final multimodalTempDirectory =
+        Directory("${tempAppData.path}/multimodal-temp");
     await multimodalTempDirectory.create(recursive: true);
     return multimodalTempDirectory;
   }
 
   static Future<Directory> _getMultimodalUploadDirectory() async {
     final appData = await getApplicationDocumentsDirectory();
-    final multimodalUploadDirectory = Directory("${appData.path}/multimodal-upload");
+    final multimodalUploadDirectory =
+        Directory("${appData.path}/multimodal-upload");
     await multimodalUploadDirectory.create(recursive: true);
     return multimodalUploadDirectory;
   }
 
-  static Future<void> moveStagingFileToUploadDirectory(String stagingFilePath, String blobId) async {
+  static Future<void> moveStagingFileToUploadDirectory(
+      String stagingFilePath, String blobId) async {
     final stagingFile = File(stagingFilePath);
     final uploadDirectory = await _getMultimodalUploadDirectory();
     final uploadFile = File(path.join(
@@ -67,7 +70,8 @@ class TemporaryStorageHandler {
         TemporaryStorageHandler._audioFileType,
       ].join(),
     );
-    final futureBlobId = [fileName, TemporaryStorageHandler._audioFileType].join();
+    final futureBlobId =
+        [fileName, TemporaryStorageHandler._audioFileType].join();
     return FutureBlobFile(localFilePath, futureBlobId);
   }
 
@@ -82,7 +86,8 @@ class TemporaryStorageHandler {
         TemporaryStorageHandler._imageFileType,
       ].join(),
     );
-    final futureBlobId = [fileName, TemporaryStorageHandler._imageFileType].join();
+    final futureBlobId =
+        [fileName, TemporaryStorageHandler._imageFileType].join();
     return FutureBlobFile(localFilePath, futureBlobId);
   }
 
@@ -90,7 +95,9 @@ class TemporaryStorageHandler {
     final temporaryMultimodalDirectory = await _getMultimodalTempDirectory();
     for (final file in await temporaryMultimodalDirectory
         .list()
-        .where((f) => path.basename(f.path).startsWith(TemporaryStorageHandler._stagingBaseNamePrefix))
+        .where((f) => path
+            .basename(f.path)
+            .startsWith(TemporaryStorageHandler._stagingBaseNamePrefix))
         .toList()) {
       await file.delete();
     }
diff --git a/app/lib/widgets/html_text.dart b/app/lib/widgets/html_text.dart
index e0e455778..03b6c5bd4 100644
--- a/app/lib/widgets/html_text.dart
+++ b/app/lib/widgets/html_text.dart
@@ -21,8 +21,10 @@ class HtmlText extends StatelessWidget {
       // these callbacks are called when a complicated element is loading
       // or failed to render allowing the app to render progress indicator
       // and fallback widget
-      onErrorBuilder: (context, element, error) => Text('$element Error: $error'),
-      onLoadingBuilder: (context, element, loadingProgress) => const CircularProgressIndicator(),
+      onErrorBuilder: (context, element, error) =>
+          Text('$element Error: $error'),
+      onLoadingBuilder: (context, element, loadingProgress) =>
+          const CircularProgressIndicator(),
     );
 
     return SingleChildScrollView(
diff --git a/app/lib/widgets/intervention_card.dart b/app/lib/widgets/intervention_card.dart
index b60d16433..4f3abbee4 100644
--- a/app/lib/widgets/intervention_card.dart
+++ b/app/lib/widgets/intervention_card.dart
@@ -35,8 +35,10 @@ class InterventionCard extends StatelessWidget {
           onTap: onTap,
           selected: selected,
         ),
-        if (showDescription) InterventionCardDescription(intervention: intervention),
-        if (showTasks && intervention.tasks.isNotEmpty) _TaskList(tasks: intervention.tasks)
+        if (showDescription)
+          InterventionCardDescription(intervention: intervention),
+        if (showTasks && intervention.tasks.isNotEmpty)
+          _TaskList(tasks: intervention.tasks)
       ],
     );
   }
@@ -63,17 +65,21 @@ class InterventionCardTitle extends StatelessWidget {
     final theme = Theme.of(context);
     return ListTile(
       onTap: onTap,
-      leading: Icon(MdiIcons.fromString(intervention!.icon), color: theme.colorScheme.secondary),
+      leading: Icon(MdiIcons.fromString(intervention!.icon),
+          color: theme.colorScheme.secondary),
       trailing: showCheckbox
           ? Checkbox(
               value: selected,
-              onChanged: (_) => onTap!(), // Needed so Checkbox can be clicked and has color
+              onChanged: (_) =>
+                  onTap!(), // Needed so Checkbox can be clicked and has color
             )
           : null,
       dense: true,
       title: Row(
         children: [
-          Expanded(child: Text(intervention!.name!, style: theme.textTheme.titleLarge)),
+          Expanded(
+              child:
+                  Text(intervention!.name!, style: theme.textTheme.titleLarge)),
           if (showDescriptionButton)
             IconButton(
               icon: const Icon(Icons.info_outline),
@@ -85,9 +91,11 @@ class InterventionCardTitle extends StatelessWidget {
                       : intervention!.description;
                   return AlertDialog(
                     title: ListTile(
-                      leading: Icon(MdiIcons.fromString(intervention!.icon), color: theme.colorScheme.secondary),
+                      leading: Icon(MdiIcons.fromString(intervention!.icon),
+                          color: theme.colorScheme.secondary),
                       dense: true,
-                      title: Text(intervention!.name!, style: theme.textTheme.titleLarge),
+                      title: Text(intervention!.name!,
+                          style: theme.textTheme.titleLarge),
                     ),
                     content: HtmlText(description),
                   );
@@ -109,15 +117,17 @@ class InterventionCardDescription extends StatelessWidget {
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
 
-    final description =
-        intervention.isBaseline() ? AppLocalizations.of(context)!.baseline_description : intervention.description;
+    final description = intervention.isBaseline()
+        ? AppLocalizations.of(context)!.baseline_description
+        : intervention.description;
     if (description == null) return Container();
 
     return Padding(
       padding: const EdgeInsets.fromLTRB(16, 4, 16, 8),
       child: Text(
         description,
-        style: theme.textTheme.bodyMedium!.copyWith(color: theme.textTheme.bodySmall!.color),
+        style: theme.textTheme.bodyMedium!
+            .copyWith(color: theme.textTheme.bodySmall!.color),
       ),
     );
   }
@@ -130,7 +140,8 @@ class _TaskList extends StatelessWidget {
 
   String scheduleString(List<CompletionPeriod> schedules) {
     return schedules
-        .map((completionPeriod) => '${completionPeriod.unlockTime} - ${completionPeriod.lockTime}')
+        .map((completionPeriod) =>
+            '${completionPeriod.unlockTime} - ${completionPeriod.lockTime}')
         .join(',');
   }
 
@@ -144,7 +155,8 @@ class _TaskList extends StatelessWidget {
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              Text(AppLocalizations.of(context)!.tasks_daily, style: theme.textTheme.bodyMedium),
+              Text(AppLocalizations.of(context)!.tasks_daily,
+                  style: theme.textTheme.bodyMedium),
             ],
           ),
         ),
@@ -156,18 +168,24 @@ class _TaskList extends StatelessWidget {
           children: tasks
               .map(
                 (task) => Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+                  padding:
+                      const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
                   child: Row(
                     children: [
-                      Expanded(child: Text(task.title!, style: theme.textTheme.bodyMedium)),
+                      Expanded(
+                          child: Text(task.title!,
+                              style: theme.textTheme.bodyMedium)),
                       Row(
                         children: [
-                          Icon(Icons.access_time, size: 16, color: theme.textTheme.bodySmall!.color),
+                          Icon(Icons.access_time,
+                              size: 16,
+                              color: theme.textTheme.bodySmall!.color),
                           const SizedBox(width: 4),
                           Text(
                             scheduleString(task.schedule.completionPeriods),
-                            style: theme.textTheme.bodyMedium!
-                                .copyWith(fontSize: 12, color: theme.textTheme.bodySmall!.color),
+                            style: theme.textTheme.bodyMedium!.copyWith(
+                                fontSize: 12,
+                                color: theme.textTheme.bodySmall!.color),
                           ),
                         ],
                       ),
diff --git a/app/lib/widgets/questionnaire/audio_recording_question_widget.dart b/app/lib/widgets/questionnaire/audio_recording_question_widget.dart
index 8466f9d81..d2f4256bc 100644
--- a/app/lib/widgets/questionnaire/audio_recording_question_widget.dart
+++ b/app/lib/widgets/questionnaire/audio_recording_question_widget.dart
@@ -15,13 +15,16 @@ class AudioRecordingQuestionWidget extends QuestionWidget {
   final AudioRecordingQuestion question;
   final Function(Answer<FutureBlobFile>)? onDone;
 
-  const AudioRecordingQuestionWidget({super.key, required this.question, this.onDone});
+  const AudioRecordingQuestionWidget(
+      {super.key, required this.question, this.onDone});
 
   @override
-  State<AudioRecordingQuestionWidget> createState() => _AudioRecordingQuestionWidgetState();
+  State<AudioRecordingQuestionWidget> createState() =>
+      _AudioRecordingQuestionWidgetState();
 }
 
-class _AudioRecordingQuestionWidgetState extends State<AudioRecordingQuestionWidget> {
+class _AudioRecordingQuestionWidgetState
+    extends State<AudioRecordingQuestionWidget> {
   bool _isRecording = false;
   bool _hasRecorded = false;
   late final AudioRecorder _audioRecorder;
@@ -47,13 +50,15 @@ class _AudioRecordingQuestionWidgetState extends State<AudioRecordingQuestionWid
     final theme = Theme.of(context);
     final loc = AppLocalizations.of(context)!;
     final appState = context.read<AppState>();
-    final maxRecordingDurationSeconds = widget.question.maxRecordingDurationSeconds;
+    final maxRecordingDurationSeconds =
+        widget.question.maxRecordingDurationSeconds;
     return Row(children: [
       Expanded(
           child: OutlinedButton(
         style: OutlinedButton.styleFrom(
           backgroundColor: _isRecording ? Colors.red.shade600 : null,
-          foregroundColor: _isRecording ? Colors.white : theme.colorScheme.primary,
+          foregroundColor:
+              _isRecording ? Colors.white : theme.colorScheme.primary,
           side: BorderSide(
               width: 1.0,
               color: _hasRecorded
@@ -67,7 +72,8 @@ class _AudioRecordingQuestionWidgetState extends State<AudioRecordingQuestionWid
                 if (_isRecording) {
                   await _stopRecording();
                 } else {
-                  await _startRecording(appState.activeSubject!.studyId, appState.activeSubject!.userId);
+                  await _startRecording(appState.activeSubject!.studyId,
+                      appState.activeSubject!.userId);
                 }
               }
             : null,
@@ -114,12 +120,15 @@ class _AudioRecordingQuestionWidgetState extends State<AudioRecordingQuestionWid
         style: const TextStyle(fontSize: 16),
       ),
       const SizedBox(width: 8.0),
-      _isRecording && _recordDurationSeconds > 0 && _recordDurationSeconds < maxRecordingDurationSeconds
+      _isRecording &&
+              _recordDurationSeconds > 0 &&
+              _recordDurationSeconds < maxRecordingDurationSeconds
           ? SizedBox(
               width: 16,
               height: 16,
               child: CircularProgressIndicator(
-                value: 1.0 - (_recordDurationSeconds / maxRecordingDurationSeconds),
+                value: 1.0 -
+                    (_recordDurationSeconds / maxRecordingDurationSeconds),
                 strokeWidth: 2.5,
               ))
           : const SizedBox.shrink(),
@@ -188,7 +197,8 @@ class _AudioRecordingQuestionWidgetState extends State<AudioRecordingQuestionWid
 
     _timer = Timer.periodic(const Duration(seconds: 1), (Timer t) async {
       setState(() => _recordDurationSeconds++);
-      if (_recordDurationSeconds >= widget.question.maxRecordingDurationSeconds) {
+      if (_recordDurationSeconds >=
+          widget.question.maxRecordingDurationSeconds) {
         await _stopRecording();
       }
     });
diff --git a/app/lib/widgets/questionnaire/custom_slider.dart b/app/lib/widgets/questionnaire/custom_slider.dart
index 72791237b..e9dc5a3bf 100644
--- a/app/lib/widgets/questionnaire/custom_slider.dart
+++ b/app/lib/widgets/questionnaire/custom_slider.dart
@@ -47,11 +47,13 @@ class CustomSlider extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final allocatedHeight = MediaQuery.of(context).size.height;
-    final allocatedWidth = MediaQuery.of(context).size.width - 32; // -32 horizontal padding
+    final allocatedWidth =
+        MediaQuery.of(context).size.width - 32; // -32 horizontal padding
     final divisions = (steps!.maximum - steps!.minimum) ~/ steps!.step;
     //final divisions = steps.annotations.length; // (majorTick - 1) * minorTick + majorTick;
     // final double valueHeight = allocatedHeight * 0.05 < 41 ? 41 : allocatedHeight * 0.05;
-    final double tickHeight = allocatedHeight * 0.0125 < 20 ? 20 : allocatedHeight * 0.0125;
+    final double tickHeight =
+        allocatedHeight * 0.0125 < 20 ? 20 : allocatedHeight * 0.0125;
     // todo finetune label positions
     final labelOffset = (allocatedWidth / (divisions + 2)) * 0.5;
 
@@ -83,7 +85,8 @@ class CustomSlider extends StatelessWidget {
     }
 
     String annotation(index) => annotations
-        .firstWhere((annotation) => annotation.value == index + minValue!, orElse: () => Annotation())
+        .firstWhere((annotation) => annotation.value == index + minValue!,
+            orElse: () => Annotation())
         .annotation;
 
     return Column(
@@ -101,7 +104,8 @@ class CustomSlider extends StatelessWidget {
                 },
                 child: Column(
                   children: [
-                    index % (minorTick! + 1) == 0 && annotation(index).isNotEmpty
+                    index % (minorTick! + 1) == 0 &&
+                            annotation(index).isNotEmpty
                         ? Container(
                             alignment: Alignment.bottomCenter,
                             //height: valueHeight,
@@ -110,8 +114,10 @@ class CustomSlider extends StatelessWidget {
                               //  ? (index / (divisions - 1) * maxValue).toStringAsFixed(tickValuePrecision)
                               /*:*/
                               annotation(index),
-                              style: labelTextStyle!
-                                  .copyWith(fontWeight: isValueSelected(index) ? FontWeight.bold : FontWeight.normal),
+                              style: labelTextStyle!.copyWith(
+                                  fontWeight: isValueSelected(index)
+                                      ? FontWeight.bold
+                                      : FontWeight.normal),
                               textAlign: TextAlign.center,
                             ))
                         : const SizedBox.shrink(),
@@ -121,7 +127,9 @@ class CustomSlider extends StatelessWidget {
                       child: VerticalDivider(
                         indent: index % (minorTick! + 1) == 0 ? 2 : 6,
                         thickness: 1.8,
-                        color: isValueSelected(index) ? thumbColor ?? primaryColor : Colors.grey.shade300,
+                        color: isValueSelected(index)
+                            ? thumbColor ?? primaryColor
+                            : Colors.grey.shade300,
                       ),
                     ),
                   ],
@@ -134,7 +142,8 @@ class CustomSlider extends StatelessWidget {
           padding: EdgeInsets.symmetric(horizontal: labelOffset),
           child: SliderTheme(
             data: SliderThemeData(
-              trackHeight: allocatedHeight * 0.0125 < 9 ? 9 : allocatedHeight * 0.0125,
+              trackHeight:
+                  allocatedHeight * 0.0125 < 9 ? 9 : allocatedHeight * 0.0125,
               inactiveTickMarkColor: isColored ? activeColor : null,
               activeTrackColor: activeColor,
               inactiveTrackColor: inactiveColor,
@@ -152,7 +161,9 @@ class CustomSlider extends StatelessWidget {
               children: [
                 if (isColored)
                   Container(
-                    height: allocatedHeight * 0.0125 < 9 ? 9 : allocatedHeight * 0.0125,
+                    height: allocatedHeight * 0.0125 < 9
+                        ? 9
+                        : allocatedHeight * 0.0125,
                     decoration: BoxDecoration(
                       borderRadius: const BorderRadius.all(Radius.circular(8)),
                       gradient: LinearGradient(
@@ -191,7 +202,8 @@ class CustomTrackShape extends RoundedRectSliderTrackShape {
   }) {
     final double trackHeight = sliderTheme.trackHeight!;
     final double trackLeft = offset.dx;
-    final double trackTop = offset.dy + (parentBox.size.height - trackHeight) / 2;
+    final double trackTop =
+        offset.dy + (parentBox.size.height - trackHeight) / 2;
     final double trackWidth = parentBox.size.width;
     return Rect.fromLTWH(trackLeft, trackTop, trackWidth, trackHeight);
   }
diff --git a/app/lib/widgets/questionnaire/image_capturing_question_widget.dart b/app/lib/widgets/questionnaire/image_capturing_question_widget.dart
index c6484766b..70afd5311 100644
--- a/app/lib/widgets/questionnaire/image_capturing_question_widget.dart
+++ b/app/lib/widgets/questionnaire/image_capturing_question_widget.dart
@@ -12,13 +12,16 @@ class ImageCapturingQuestionWidget extends QuestionWidget {
   final ImageCapturingQuestion question;
   final Function(Answer<FutureBlobFile>)? onDone;
 
-  const ImageCapturingQuestionWidget({super.key, required this.question, this.onDone});
+  const ImageCapturingQuestionWidget(
+      {super.key, required this.question, this.onDone});
 
   @override
-  State<ImageCapturingQuestionWidget> createState() => _ImageCapturingQuestionWidgetState();
+  State<ImageCapturingQuestionWidget> createState() =>
+      _ImageCapturingQuestionWidgetState();
 }
 
-class _ImageCapturingQuestionWidgetState extends State<ImageCapturingQuestionWidget> {
+class _ImageCapturingQuestionWidgetState
+    extends State<ImageCapturingQuestionWidget> {
   bool _hasCaptured = false;
 
   @override
@@ -34,7 +37,9 @@ class _ImageCapturingQuestionWidgetState extends State<ImageCapturingQuestionWid
       style: OutlinedButton.styleFrom(
         backgroundColor: null,
         foregroundColor: theme.colorScheme.primary,
-        side: BorderSide(width: 1.0, color: _hasCaptured ? Colors.black38 : theme.colorScheme.primary),
+        side: BorderSide(
+            width: 1.0,
+            color: _hasCaptured ? Colors.black38 : theme.colorScheme.primary),
       ),
       onPressed: !_hasCaptured
           ? () async {
@@ -52,7 +57,8 @@ class _ImageCapturingQuestionWidgetState extends State<ImageCapturingQuestionWid
               padding: const EdgeInsets.all(4.0),
               child: Icon(
                 _hasCaptured ? MdiIcons.checkCircleOutline : MdiIcons.camera,
-                color: _hasCaptured ? Colors.black38 : theme.colorScheme.primary,
+                color:
+                    _hasCaptured ? Colors.black38 : theme.colorScheme.primary,
                 size: 24,
               ),
             ),
diff --git a/app/lib/widgets/questionnaire/question_container.dart b/app/lib/widgets/questionnaire/question_container.dart
index 2493fd7bf..61ce88577 100644
--- a/app/lib/widgets/questionnaire/question_container.dart
+++ b/app/lib/widgets/questionnaire/question_container.dart
@@ -18,13 +18,18 @@ class QuestionContainer extends StatefulWidget {
   final Question question;
   final int index;
 
-  const QuestionContainer({required this.onDone, required this.question, required this.index, super.key});
+  const QuestionContainer(
+      {required this.onDone,
+      required this.question,
+      required this.index,
+      super.key});
 
   @override
   State<StatefulWidget> createState() => _QuestionContainerState();
 }
 
-class _QuestionContainerState extends State<QuestionContainer> with AutomaticKeepAliveClientMixin {
+class _QuestionContainerState extends State<QuestionContainer>
+    with AutomaticKeepAliveClientMixin {
   void _onDone(Answer answer) {
     widget.onDone(answer, widget.index);
   }
@@ -35,7 +40,8 @@ class _QuestionContainerState extends State<QuestionContainer> with AutomaticKee
         return ChoiceQuestionWidget(
           question: choiceQuestion,
           onDone: _onDone,
-          multiSelectionText: AppLocalizations.of(context)!.eligible_choice_multi_selection,
+          multiSelectionText:
+              AppLocalizations.of(context)!.eligible_choice_multi_selection,
         );
       case BooleanQuestion booleanQuestion:
         return BooleanQuestionWidget(
@@ -75,7 +81,8 @@ class _QuestionContainerState extends State<QuestionContainer> with AutomaticKee
           onDone: _onDone,
         );
       default:
-        throw ArgumentError('Question type ${widget.question.type} not supported');
+        throw ArgumentError(
+            'Question type ${widget.question.type} not supported');
     }
   }
 
diff --git a/app/lib/widgets/questionnaire/questionnaire_widget.dart b/app/lib/widgets/questionnaire/questionnaire_widget.dart
index d7d67f0a6..23022da2b 100644
--- a/app/lib/widgets/questionnaire/questionnaire_widget.dart
+++ b/app/lib/widgets/questionnaire/questionnaire_widget.dart
@@ -40,13 +40,17 @@ class _QuestionnaireWidgetState extends State<QuestionnaireWidget> {
   final QuestionnaireState qs = QuestionnaireState();
   int _nextQuestionIndex = 1;
 
-  void _finishQuestionnaire(QuestionnaireState result) => widget.onComplete?.call(result);
+  void _finishQuestionnaire(QuestionnaireState result) =>
+      widget.onComplete?.call(result);
 
   // if question with lower index than current question is answered, remove all downstream answers
   void _invalidateDownstreamAnswers(int index) {
     if (index < shownQuestions.length - 1) {
-      final startIndex = widget.questions.indexWhere((question) => question.id == shownQuestions[index].question.id);
-      widget.questions.skip(startIndex + 1).forEach((question) => qs.answers.remove(question.id));
+      final startIndex = widget.questions.indexWhere(
+          (question) => question.id == shownQuestions[index].question.id);
+      widget.questions
+          .skip(startIndex + 1)
+          .forEach((question) => qs.answers.remove(question.id));
       while (index + 1 < shownQuestions.length) {
         final end = shownQuestions.length;
         final lastQuestion = shownQuestions.removeLast();
@@ -73,13 +77,16 @@ class _QuestionnaireWidgetState extends State<QuestionnaireWidget> {
   }
 
   void _onQuestionDone(Answer answer, int index) {
-    _nextQuestionIndex = widget.questions.indexWhere((question) => question.id == answer.question) + 1;
+    _nextQuestionIndex = widget.questions
+            .indexWhere((question) => question.id == answer.question) +
+        1;
     qs.answers[answer.question] = answer;
     widget.onChange?.call(qs);
 
     final shouldContinue = widget.shouldContinue?.call(qs);
     // only invalidate if there is a conditional question or if answers do not allow to continue
-    if (shownQuestions.any((element) => element.question.conditional != null) || shouldContinue == false) {
+    if (shownQuestions.any((element) => element.question.conditional != null) ||
+        shouldContinue == false) {
       _invalidateDownstreamAnswers(index);
     }
 
@@ -94,11 +101,14 @@ class _QuestionnaireWidgetState extends State<QuestionnaireWidget> {
 
       // check for conditional questions
       if (!widget.questions[_nextQuestionIndex].shouldBeShown(qs)) {
-        _onQuestionDone(widget.questions[_nextQuestionIndex].getDefaultAnswer()!, shownQuestions.length);
+        _onQuestionDone(
+            widget.questions[_nextQuestionIndex].getDefaultAnswer()!,
+            shownQuestions.length);
         return;
       }
       _insertQuestion(widget.questions[_nextQuestionIndex]);
-      _listKey.currentState!.insertItem(shownQuestions.length - 1, duration: const Duration(milliseconds: 300));
+      _listKey.currentState!.insertItem(shownQuestions.length - 1,
+          duration: const Duration(milliseconds: 300));
       _nextQuestionIndex++;
     } else {
       // we ran out of questions
@@ -129,11 +139,16 @@ class _QuestionnaireWidgetState extends State<QuestionnaireWidget> {
       initialItemCount: shownQuestions.length + 2,
       itemBuilder: (context, index, animation) {
         if (index == 0) {
-          return widget.header != null && widget.header!.isNotEmpty ? HtmlTextBox(widget.header) : Container();
+          return widget.header != null && widget.header!.isNotEmpty
+              ? HtmlTextBox(widget.header)
+              : Container();
         }
         index -= 1;
-        if (index == widget.questions.length && qs.answers.length == widget.questions.length) {
-          return widget.footer != null && widget.footer!.isNotEmpty ? HtmlTextBox(widget.footer) : Container();
+        if (index == widget.questions.length &&
+            qs.answers.length == widget.questions.length) {
+          return widget.footer != null && widget.footer!.isNotEmpty
+              ? HtmlTextBox(widget.footer)
+              : Container();
         }
         if (index > shownQuestions.length - 1) {
           return Container();
diff --git a/app/lib/widgets/questionnaire/questions/annotated_scale_question_widget.dart b/app/lib/widgets/questionnaire/questions/annotated_scale_question_widget.dart
index ff98fd931..0f57b656b 100644
--- a/app/lib/widgets/questionnaire/questions/annotated_scale_question_widget.dart
+++ b/app/lib/widgets/questionnaire/questions/annotated_scale_question_widget.dart
@@ -9,13 +9,16 @@ class AnnotatedScaleQuestionWidget extends QuestionWidget {
   final AnnotatedScaleQuestion question;
   final Function(Answer)? onDone;
 
-  const AnnotatedScaleQuestionWidget({super.key, required this.question, this.onDone});
+  const AnnotatedScaleQuestionWidget(
+      {super.key, required this.question, this.onDone});
 
   @override
-  State<AnnotatedScaleQuestionWidget> createState() => _AnnotatedScaleQuestionWidgetState();
+  State<AnnotatedScaleQuestionWidget> createState() =>
+      _AnnotatedScaleQuestionWidgetState();
 }
 
-class _AnnotatedScaleQuestionWidgetState extends State<AnnotatedScaleQuestionWidget> {
+class _AnnotatedScaleQuestionWidgetState
+    extends State<AnnotatedScaleQuestionWidget> {
   double? value;
   late bool sliderTouched;
 
diff --git a/app/lib/widgets/questionnaire/questions/choice_question_widget.dart b/app/lib/widgets/questionnaire/questions/choice_question_widget.dart
index fe125fcec..9139e9e73 100644
--- a/app/lib/widgets/questionnaire/questions/choice_question_widget.dart
+++ b/app/lib/widgets/questionnaire/questions/choice_question_widget.dart
@@ -10,7 +10,10 @@ class ChoiceQuestionWidget extends QuestionWidget {
   final String multiSelectionText;
 
   const ChoiceQuestionWidget(
-      {super.key, required this.question, required this.onDone, required this.multiSelectionText});
+      {super.key,
+      required this.question,
+      required this.onDone,
+      required this.multiSelectionText});
 
   @override
   State<ChoiceQuestionWidget> createState() => _ChoiceQuestionWidgetState();
@@ -61,7 +64,8 @@ class _ChoiceQuestionWidgetState extends State<ChoiceQuestionWidget> {
         OutlinedButton(
           onPressed: confirm,
           style: ButtonStyle(
-            backgroundColor: WidgetStateProperty.all<Color>(Theme.of(context).colorScheme.secondary),
+            backgroundColor: WidgetStateProperty.all<Color>(
+                Theme.of(context).colorScheme.secondary),
             foregroundColor: WidgetStateProperty.all<Color>(Colors.white),
           ),
           child: Text(AppLocalizations.of(context)!.confirm),
diff --git a/app/lib/widgets/questionnaire/questions/free_text_question_widget.dart b/app/lib/widgets/questionnaire/questions/free_text_question_widget.dart
index 5d3e558d4..4ac3953c7 100644
--- a/app/lib/widgets/questionnaire/questions/free_text_question_widget.dart
+++ b/app/lib/widgets/questionnaire/questions/free_text_question_widget.dart
@@ -7,7 +7,8 @@ class FreeTextQuestionWidget extends QuestionWidget {
   final FreeTextQuestion question;
   final Function(Answer)? onDone;
 
-  const FreeTextQuestionWidget({super.key, required this.question, this.onDone});
+  const FreeTextQuestionWidget(
+      {super.key, required this.question, this.onDone});
 
   @override
   State<FreeTextQuestionWidget> createState() => _FreeTextQuestionWidgetState();
@@ -44,9 +45,11 @@ class _FreeTextQuestionWidgetState extends State<FreeTextQuestionWidget> {
       },
       validator: (value) {
         if (value!.length < question.lengthRange.first) {
-          return AppLocalizations.of(context)!.free_text_min_length_error(question.lengthRange.first);
+          return AppLocalizations.of(context)!
+              .free_text_min_length_error(question.lengthRange.first);
         } else if (value.length > question.lengthRange.last) {
-          return AppLocalizations.of(context)!.free_text_max_length_error(question.lengthRange.last);
+          return AppLocalizations.of(context)!
+              .free_text_max_length_error(question.lengthRange.last);
         }
         switch (question.textType) {
           case FreeTextQuestionType.any:
@@ -67,7 +70,8 @@ class _FreeTextQuestionWidgetState extends State<FreeTextQuestionWidget> {
             if (RegExp(question.customTypeExpression!).hasMatch(value)) {
               return null;
             } else {
-              return AppLocalizations.of(context)!.free_text_custom_error(question.customTypeExpression!);
+              return AppLocalizations.of(context)!
+                  .free_text_custom_error(question.customTypeExpression!);
             }
         }
       },
diff --git a/app/lib/widgets/questionnaire/questions/scale_question_widget.dart b/app/lib/widgets/questionnaire/questions/scale_question_widget.dart
index 89d5de6ee..cae375e0e 100644
--- a/app/lib/widgets/questionnaire/questions/scale_question_widget.dart
+++ b/app/lib/widgets/questionnaire/questions/scale_question_widget.dart
@@ -29,10 +29,15 @@ class _ScaleQuestionWidgetState extends State<ScaleQuestionWidget> {
 
   @override
   Widget build(BuildContext context) {
-    final sliderRange = (widget.question.maximum - widget.question.minimum).abs();
+    final sliderRange =
+        (widget.question.maximum - widget.question.minimum).abs();
 
-    Color? minColor = widget.question.minColor != null ? Color(widget.question.minColor!) : null;
-    Color? maxColor = widget.question.maxColor != null ? Color(widget.question.maxColor!) : null;
+    Color? minColor = widget.question.minColor != null
+        ? Color(widget.question.minColor!)
+        : null;
+    Color? maxColor = widget.question.maxColor != null
+        ? Color(widget.question.maxColor!)
+        : null;
 
     final isColored = minColor != null || maxColor != null;
     if (isColored) {
@@ -44,10 +49,14 @@ class _ScaleQuestionWidgetState extends State<ScaleQuestionWidget> {
     final theme = Theme.of(context);
     final coloredSliderTheme = ThemeConfig.coloredSliderTheme(theme);
     final thumbColor = isColored
-        ? Color.lerp(minColor, maxColor, (value! - widget.question.minimum) / sliderRange)!.withOpacity(1)
+        ? Color.lerp(minColor, maxColor,
+                (value! - widget.question.minimum) / sliderRange)!
+            .withOpacity(1)
         : null;
-    final activeTrackColor = isColored ? coloredSliderTheme.activeTrackColor : null;
-    final inactiveTrackColor = isColored ? coloredSliderTheme.inactiveTrackColor : null;
+    final activeTrackColor =
+        isColored ? coloredSliderTheme.activeTrackColor : null;
+    final inactiveTrackColor =
+        isColored ? coloredSliderTheme.inactiveTrackColor : null;
 
     return Column(
       children: [
diff --git a/app/lib/widgets/questionnaire/questions/visual_analogue_question_widget.dart b/app/lib/widgets/questionnaire/questions/visual_analogue_question_widget.dart
index 98e260b52..46a1e7c51 100644
--- a/app/lib/widgets/questionnaire/questions/visual_analogue_question_widget.dart
+++ b/app/lib/widgets/questionnaire/questions/visual_analogue_question_widget.dart
@@ -9,14 +9,17 @@ class VisualAnalogueQuestionWidget extends QuestionWidget {
   final VisualAnalogueQuestion question;
   final Function(Answer)? onDone;
 
-  const VisualAnalogueQuestionWidget({super.key, required this.question, this.onDone});
+  const VisualAnalogueQuestionWidget(
+      {super.key, required this.question, this.onDone});
 
   @override
-  State<VisualAnalogueQuestionWidget> createState() => _VisualAnalogueQuestionWidgetState();
+  State<VisualAnalogueQuestionWidget> createState() =>
+      _VisualAnalogueQuestionWidgetState();
 }
 
 @Deprecated('Use [_AnnotatedScaleQuestionWidgetState]')
-class _VisualAnalogueQuestionWidgetState extends State<VisualAnalogueQuestionWidget> {
+class _VisualAnalogueQuestionWidgetState
+    extends State<VisualAnalogueQuestionWidget> {
   late double value;
 
   @override
@@ -46,7 +49,10 @@ class _VisualAnalogueQuestionWidgetState extends State<VisualAnalogueQuestionWid
             Container(
               decoration: BoxDecoration(
                 gradient: LinearGradient(
-                  colors: [Color(widget.question.minimumColor), Color(widget.question.maximumColor)],
+                  colors: [
+                    Color(widget.question.minimumColor),
+                    Color(widget.question.maximumColor)
+                  ],
                 ),
               ),
               constraints: const BoxConstraints.expand(height: 4),
@@ -58,12 +64,14 @@ class _VisualAnalogueQuestionWidgetState extends State<VisualAnalogueQuestionWid
           onChanged: changed,
           min: widget.question.minimum,
           max: widget.question.maximum,
-          divisions: (widget.question.maximum - widget.question.minimum) ~/ widget.question.step,
+          divisions: (widget.question.maximum - widget.question.minimum) ~/
+              widget.question.step,
         ),
         SizedBox(
           width: double.infinity,
           child: OutlinedButton(
-            onPressed: () => widget.onDone!(widget.question.constructAnswer(value)),
+            onPressed: () =>
+                widget.onDone!(widget.question.constructAnswer(value)),
             child: Text(AppLocalizations.of(context)!.done),
           ),
         )
diff --git a/app/lib/widgets/selectable_button.dart b/app/lib/widgets/selectable_button.dart
index 7d601013a..a6ed0f571 100644
--- a/app/lib/widgets/selectable_button.dart
+++ b/app/lib/widgets/selectable_button.dart
@@ -5,9 +5,11 @@ class SelectableButton extends StatelessWidget {
   final bool selected;
   final Function()? onTap;
 
-  const SelectableButton({super.key, required this.child, this.selected = false, this.onTap});
+  const SelectableButton(
+      {super.key, required this.child, this.selected = false, this.onTap});
 
-  Color _getFillColor(ThemeData theme) => selected ? theme.primaryColor : theme.cardColor;
+  Color _getFillColor(ThemeData theme) =>
+      selected ? theme.primaryColor : theme.cardColor;
 
   Color _getTextColor(ThemeData theme) => selected ? Colors.white : Colors.blue;
 
diff --git a/app/lib/widgets/study_tile.dart b/app/lib/widgets/study_tile.dart
index 4a050426b..41169743b 100644
--- a/app/lib/widgets/study_tile.dart
+++ b/app/lib/widgets/study_tile.dart
@@ -20,7 +20,11 @@ class StudyTile extends StatelessWidget {
     super.key,
   });
 
-  StudyTile.fromStudy({required Study study, this.onTap, this.contentPadding = const EdgeInsets.all(16), super.key})
+  StudyTile.fromStudy(
+      {required Study study,
+      this.onTap,
+      this.contentPadding = const EdgeInsets.all(16),
+      super.key})
       : title = study.title,
         description = study.description,
         iconName = study.iconName;
@@ -43,9 +47,13 @@ class StudyTile extends StatelessWidget {
         ListTile(
           contentPadding: contentPadding,
           onTap: onTap,
-          title: Center(child: Text(title!, style: theme.textTheme.titleLarge!.copyWith(color: theme.primaryColor))),
+          title: Center(
+              child: Text(title!,
+                  style: theme.textTheme.titleLarge!
+                      .copyWith(color: theme.primaryColor))),
           subtitle: Center(child: Text(description ?? '')),
-          leading: Icon(MdiIcons.fromString(iconName), color: theme.primaryColor),
+          leading:
+              Icon(MdiIcons.fromString(iconName), color: theme.primaryColor),
         ),
       ],
     );
diff --git a/core/lib/src/models/consent/consent_item.dart b/core/lib/src/models/consent/consent_item.dart
index 1a340e531..82a22a1d4 100644
--- a/core/lib/src/models/consent/consent_item.dart
+++ b/core/lib/src/models/consent/consent_item.dart
@@ -14,7 +14,8 @@ class ConsentItem {
 
   ConsentItem.withId() : id = const Uuid().v4();
 
-  factory ConsentItem.fromJson(Map<String, dynamic> json) => _$ConsentItemFromJson(json);
+  factory ConsentItem.fromJson(Map<String, dynamic> json) =>
+      _$ConsentItemFromJson(json);
   Map<String, dynamic> toJson() => _$ConsentItemToJson(this);
 
   @override
diff --git a/core/lib/src/models/contact.dart b/core/lib/src/models/contact.dart
index 63ac7d4ad..b4013c718 100644
--- a/core/lib/src/models/contact.dart
+++ b/core/lib/src/models/contact.dart
@@ -15,7 +15,8 @@ class Contact {
 
   Contact();
 
-  factory Contact.fromJson(Map<String, dynamic> json) => _$ContactFromJson(json);
+  factory Contact.fromJson(Map<String, dynamic> json) =>
+      _$ContactFromJson(json);
 
   Map<String, dynamic> toJson() => _$ContactToJson(this);
 
diff --git a/core/lib/src/models/data/data_reference.dart b/core/lib/src/models/data/data_reference.dart
index ffc83e9c9..f944e261b 100644
--- a/core/lib/src/models/data/data_reference.dart
+++ b/core/lib/src/models/data/data_reference.dart
@@ -12,7 +12,8 @@ class DataReference<T> {
 
   DataReference(this.task, this.property);
 
-  factory DataReference.fromJson(Map<String, dynamic> json) => _$DataReferenceFromJson(json);
+  factory DataReference.fromJson(Map<String, dynamic> json) =>
+      _$DataReferenceFromJson(json);
 
   Map<String, dynamic> toJson() => _$DataReferenceToJson(this);
 
@@ -20,9 +21,13 @@ class DataReference<T> {
   String toString() => toJson().toString();
 
   Map<DateTime, T> retrieveFromResults(StudySubject subject) {
-    final Task? sourceTask = subject.study.observations.firstWhereOrNull((task) => task.id == this.task) ??
-        subject.selectedInterventions.expand((i) => i.tasks).firstWhereOrNull((task) => task.id == this.task);
-    if (sourceTask == null) throw ArgumentError("Could not find a task with the id '$task'.");
+    final Task? sourceTask = subject.study.observations
+            .firstWhereOrNull((task) => task.id == this.task) ??
+        subject.selectedInterventions
+            .expand((i) => i.tasks)
+            .firstWhereOrNull((task) => task.id == this.task);
+    if (sourceTask == null)
+      throw ArgumentError("Could not find a task with the id '$task'.");
 
     final List<SubjectProgress> sourceResults = subject.resultsFor(task);
 
diff --git a/core/lib/src/models/eligibility/eligibility_criterion.dart b/core/lib/src/models/eligibility/eligibility_criterion.dart
index af22a56b2..783f724bb 100644
--- a/core/lib/src/models/eligibility/eligibility_criterion.dart
+++ b/core/lib/src/models/eligibility/eligibility_criterion.dart
@@ -18,7 +18,8 @@ class EligibilityCriterion {
       : id = const Uuid().v4(),
         condition = BooleanExpression();
 
-  factory EligibilityCriterion.fromJson(Map<String, dynamic> data) => _$EligibilityCriterionFromJson(data);
+  factory EligibilityCriterion.fromJson(Map<String, dynamic> data) =>
+      _$EligibilityCriterionFromJson(data);
   Map<String, dynamic> toJson() => _$EligibilityCriterionToJson(this);
 
   bool isSatisfied(QuestionnaireState qs) => condition.evaluate(qs) == true;
diff --git a/core/lib/src/models/expressions/expression.dart b/core/lib/src/models/expressions/expression.dart
index 48690f935..52625cd0d 100644
--- a/core/lib/src/models/expressions/expression.dart
+++ b/core/lib/src/models/expressions/expression.dart
@@ -10,7 +10,8 @@ abstract class Expression {
 
   Expression(this.type);
 
-  factory Expression.fromJson(Map<String, dynamic> data) => switch (data[keyType]) {
+  factory Expression.fromJson(Map<String, dynamic> data) =>
+      switch (data[keyType]) {
         BooleanExpression.expressionType => BooleanExpression.fromJson(data),
         ChoiceExpression.expressionType => ChoiceExpression.fromJson(data),
         NotExpression.expressionType => NotExpression.fromJson(data),
diff --git a/core/lib/src/models/expressions/types/boolean_expression.dart b/core/lib/src/models/expressions/types/boolean_expression.dart
index 40ad18430..0ee205121 100644
--- a/core/lib/src/models/expressions/types/boolean_expression.dart
+++ b/core/lib/src/models/expressions/types/boolean_expression.dart
@@ -10,7 +10,8 @@ class BooleanExpression extends ValueExpression<bool> {
 
   BooleanExpression() : super(expressionType);
 
-  factory BooleanExpression.fromJson(Map<String, dynamic> json) => _$BooleanExpressionFromJson(json);
+  factory BooleanExpression.fromJson(Map<String, dynamic> json) =>
+      _$BooleanExpressionFromJson(json);
   @override
   Map<String, dynamic> toJson() => _$BooleanExpressionToJson(this);
 
diff --git a/core/lib/src/models/expressions/types/choice_expression.dart b/core/lib/src/models/expressions/types/choice_expression.dart
index 5983dc55f..17949d604 100644
--- a/core/lib/src/models/expressions/types/choice_expression.dart
+++ b/core/lib/src/models/expressions/types/choice_expression.dart
@@ -13,7 +13,8 @@ class ChoiceExpression extends ValueExpression<dynamic> {
 
   ChoiceExpression.withId() : super(expressionType);
 
-  factory ChoiceExpression.fromJson(Map<String, dynamic> json) => _$ChoiceExpressionFromJson(json);
+  factory ChoiceExpression.fromJson(Map<String, dynamic> json) =>
+      _$ChoiceExpressionFromJson(json);
 
   @override
   Map<String, dynamic> toJson() => _$ChoiceExpressionToJson(this);
diff --git a/core/lib/src/models/expressions/types/not_expression.dart b/core/lib/src/models/expressions/types/not_expression.dart
index 679ac97e4..44d9d8443 100644
--- a/core/lib/src/models/expressions/types/not_expression.dart
+++ b/core/lib/src/models/expressions/types/not_expression.dart
@@ -17,7 +17,8 @@ class NotExpression extends Expression {
       : expression = BooleanExpression(),
         super(expressionType);
 
-  factory NotExpression.fromJson(Map<String, dynamic> json) => _$NotExpressionFromJson(json);
+  factory NotExpression.fromJson(Map<String, dynamic> json) =>
+      _$NotExpressionFromJson(json);
 
   @override
   Map<String, dynamic> toJson() => _$NotExpressionToJson(this);
diff --git a/core/lib/src/models/expressions/types/value_expression.dart b/core/lib/src/models/expressions/types/value_expression.dart
index 371efe173..67fc8e66a 100644
--- a/core/lib/src/models/expressions/types/value_expression.dart
+++ b/core/lib/src/models/expressions/types/value_expression.dart
@@ -11,6 +11,8 @@ abstract class ValueExpression<V> extends Expression {
 
   @override
   bool? evaluate(QuestionnaireState state) {
-    return state.hasAnswer<V>(target!) ? checkValue(state.getAnswer<V>(target!)) : null;
+    return state.hasAnswer<V>(target!)
+        ? checkValue(state.getAnswer<V>(target!))
+        : null;
   }
 }
diff --git a/core/lib/src/models/interventions/intervention.dart b/core/lib/src/models/interventions/intervention.dart
index f1f841c97..0adec2258 100644
--- a/core/lib/src/models/interventions/intervention.dart
+++ b/core/lib/src/models/interventions/intervention.dart
@@ -17,7 +17,8 @@ class Intervention {
 
   Intervention.withId() : id = const Uuid().v4();
 
-  factory Intervention.fromJson(Map<String, dynamic> data) => _$InterventionFromJson(data);
+  factory Intervention.fromJson(Map<String, dynamic> data) =>
+      _$InterventionFromJson(data);
 
   Map<String, dynamic> toJson() => _$InterventionToJson(this);
 
diff --git a/core/lib/src/models/interventions/intervention_task.dart b/core/lib/src/models/interventions/intervention_task.dart
index fb227cb4b..127d13ac5 100644
--- a/core/lib/src/models/interventions/intervention_task.dart
+++ b/core/lib/src/models/interventions/intervention_task.dart
@@ -2,14 +2,16 @@ import 'package:studyu_core/src/models/interventions/tasks/checkmark_task.dart';
 import 'package:studyu_core/src/models/tasks/task.dart';
 import 'package:studyu_core/src/models/unknown_json_type_error.dart';
 
-typedef InterventionTaskParser = InterventionTask Function(Map<String, dynamic> data);
+typedef InterventionTaskParser = InterventionTask Function(
+    Map<String, dynamic> data);
 
 abstract class InterventionTask extends Task {
   InterventionTask(super.type);
 
   InterventionTask.withId(super.type) : super.withId();
 
-  factory InterventionTask.fromJson(Map<String, dynamic> data) => switch (data[Task.keyType]) {
+  factory InterventionTask.fromJson(Map<String, dynamic> data) =>
+      switch (data[Task.keyType]) {
         CheckmarkTask.taskType => CheckmarkTask.fromJson(data),
         _ => throw UnknownJsonTypeError(data[Task.keyType]),
       };
diff --git a/core/lib/src/models/interventions/tasks/checkmark_task.dart b/core/lib/src/models/interventions/tasks/checkmark_task.dart
index 383d408ff..e46a9826b 100644
--- a/core/lib/src/models/interventions/tasks/checkmark_task.dart
+++ b/core/lib/src/models/interventions/tasks/checkmark_task.dart
@@ -13,14 +13,17 @@ class CheckmarkTask extends InterventionTask {
 
   CheckmarkTask.withId() : super.withId(taskType);
 
-  factory CheckmarkTask.fromJson(Map<String, dynamic> json) => _$CheckmarkTaskFromJson(json);
+  factory CheckmarkTask.fromJson(Map<String, dynamic> json) =>
+      _$CheckmarkTaskFromJson(json);
 
   @override
   Map<String, dynamic> toJson() => _$CheckmarkTaskToJson(this);
 
   @override
-  Map<DateTime, T> extractPropertyResults<T>(String property, List<SubjectProgress> sourceResults) {
-    throw ArgumentError("$runtimeType does not have a property named '$property'.");
+  Map<DateTime, T> extractPropertyResults<T>(
+      String property, List<SubjectProgress> sourceResults) {
+    throw ArgumentError(
+        "$runtimeType does not have a property named '$property'.");
   }
 
   @override
diff --git a/core/lib/src/models/observations/observation.dart b/core/lib/src/models/observations/observation.dart
index cb61e4440..257fbf8f5 100644
--- a/core/lib/src/models/observations/observation.dart
+++ b/core/lib/src/models/observations/observation.dart
@@ -9,7 +9,8 @@ abstract class Observation extends Task {
 
   Observation.withId(super.type) : super.withId();
 
-  factory Observation.fromJson(Map<String, dynamic> data) => switch (data[Task.keyType]) {
+  factory Observation.fromJson(Map<String, dynamic> data) =>
+      switch (data[Task.keyType]) {
         QuestionnaireTask.taskType => QuestionnaireTask.fromJson(data),
         _ => throw UnknownJsonTypeError(data[Task.keyType]),
       };
diff --git a/core/lib/src/models/observations/tasks/questionnaire_task.dart b/core/lib/src/models/observations/tasks/questionnaire_task.dart
index a4cd85d5f..f2e4fb0dd 100644
--- a/core/lib/src/models/observations/tasks/questionnaire_task.dart
+++ b/core/lib/src/models/observations/tasks/questionnaire_task.dart
@@ -15,25 +15,33 @@ class QuestionnaireTask extends Observation {
 
   QuestionnaireTask.withId() : super.withId(taskType);
 
-  factory QuestionnaireTask.fromJson(Map<String, dynamic> json) => _$QuestionnaireTaskFromJson(json);
+  factory QuestionnaireTask.fromJson(Map<String, dynamic> json) =>
+      _$QuestionnaireTaskFromJson(json);
 
   @override
   Map<String, dynamic> toJson() => _$QuestionnaireTaskToJson(this);
 
   @override
-  Map<DateTime, T> extractPropertyResults<T>(String property, List<SubjectProgress> sourceResults) {
-    final Question? targetQuestion = questions.questions.firstWhereOrNull((q) => q.id == property);
+  Map<DateTime, T> extractPropertyResults<T>(
+      String property, List<SubjectProgress> sourceResults) {
+    final Question? targetQuestion =
+        questions.questions.firstWhereOrNull((q) => q.id == property);
     if (targetQuestion == null) {
-      throw ArgumentError("Questionnaire '$id' does not have a question with '$property'.");
+      throw ArgumentError(
+          "Questionnaire '$id' does not have a question with '$property'.");
     }
     return Map.fromEntries(
-      sourceResults
-          .map((e) => MapEntry(e.completedAt!, (e.result as Result<QuestionnaireState>).result.getAnswer<T>(property))),
+      sourceResults.map((e) => MapEntry(
+          e.completedAt!,
+          (e.result as Result<QuestionnaireState>)
+              .result
+              .getAnswer<T>(property))),
     );
   }
 
   @override
-  Map<String, Type> getAvailableProperties() => {for (final q in questions.questions) q.id: q.getAnswerType()};
+  Map<String, Type> getAvailableProperties() =>
+      {for (final q in questions.questions) q.id: q.getAnswerType()};
 
   @override
   String? getHumanReadablePropertyName(String property) =>
diff --git a/core/lib/src/models/questionnaire/answer.dart b/core/lib/src/models/questionnaire/answer.dart
index 8598b6b0c..3e904ebda 100644
--- a/core/lib/src/models/questionnaire/answer.dart
+++ b/core/lib/src/models/questionnaire/answer.dart
@@ -20,9 +20,11 @@ class Answer<V> {
       : question = question.id,
         timestamp = DateTime.now();
 
-  factory Answer.parseJson(Map<String, dynamic> json) => _$AnswerFromJson(json)..response = json[keyResponse] as V;
+  factory Answer.parseJson(Map<String, dynamic> json) =>
+      _$AnswerFromJson(json)..response = json[keyResponse] as V;
 
-  Map<String, dynamic> toJson() => mergeMaps<String, dynamic>(_$AnswerToJson(this), {keyResponse: response});
+  Map<String, dynamic> toJson() =>
+      mergeMaps<String, dynamic>(_$AnswerToJson(this), {keyResponse: response});
 
   static Answer fromJson(Map<String, dynamic> data) {
     final dynamic value = data[keyResponse];
diff --git a/core/lib/src/models/questionnaire/question.dart b/core/lib/src/models/questionnaire/question.dart
index 910fdfdb2..a35120fbd 100644
--- a/core/lib/src/models/questionnaire/question.dart
+++ b/core/lib/src/models/questionnaire/question.dart
@@ -21,14 +21,19 @@ abstract class Question<V> {
 
   Question.withId(this.type) : id = const Uuid().v4();
 
-  factory Question.fromJson(Map<String, dynamic> data) => switch (data[keyType]) {
+  factory Question.fromJson(Map<String, dynamic> data) =>
+      switch (data[keyType]) {
         BooleanQuestion.questionType => BooleanQuestion.fromJson(data),
         ChoiceQuestion.questionType => ChoiceQuestion.fromJson(data),
         ScaleQuestion.questionType => ScaleQuestion.fromJson(data),
-        AnnotatedScaleQuestion.questionType => AnnotatedScaleQuestion.fromJson(data),
-        VisualAnalogueQuestion.questionType => VisualAnalogueQuestion.fromJson(data),
-        ImageCapturingQuestion.questionType => ImageCapturingQuestion.fromJson(data),
-        AudioRecordingQuestion.questionType => AudioRecordingQuestion.fromJson(data),
+        AnnotatedScaleQuestion.questionType =>
+          AnnotatedScaleQuestion.fromJson(data),
+        VisualAnalogueQuestion.questionType =>
+          VisualAnalogueQuestion.fromJson(data),
+        ImageCapturingQuestion.questionType =>
+          ImageCapturingQuestion.fromJson(data),
+        AudioRecordingQuestion.questionType =>
+          AudioRecordingQuestion.fromJson(data),
         FreeTextQuestion.questionType => FreeTextQuestion.fromJson(data),
         _ => throw UnknownJsonTypeError(data[keyType]),
       } as Question<V>;
diff --git a/core/lib/src/models/questionnaire/question_conditional.dart b/core/lib/src/models/questionnaire/question_conditional.dart
index ce19e1ba9..3816daa9e 100644
--- a/core/lib/src/models/questionnaire/question_conditional.dart
+++ b/core/lib/src/models/questionnaire/question_conditional.dart
@@ -13,10 +13,13 @@ class QuestionConditional<V> {
 
   QuestionConditional();
 
-  factory QuestionConditional.fromJson(Map<String, dynamic> json) => _fromJson(json);
+  factory QuestionConditional.fromJson(Map<String, dynamic> json) =>
+      _fromJson(json);
 
   static QuestionConditional<V> _fromJson<K, V>(Map<String, dynamic> json) =>
-      _$QuestionConditionalFromJson<V>(json)..defaultValue = json[keyDefaultValue] as V?;
+      _$QuestionConditionalFromJson<V>(json)
+        ..defaultValue = json[keyDefaultValue] as V?;
 
-  Map<String, dynamic> toJson() => _$QuestionConditionalToJson<V>(this)..[keyDefaultValue] = defaultValue;
+  Map<String, dynamic> toJson() =>
+      _$QuestionConditionalToJson<V>(this)..[keyDefaultValue] = defaultValue;
 }
diff --git a/core/lib/src/models/questionnaire/questionnaire.dart b/core/lib/src/models/questionnaire/questionnaire.dart
index 2dcaf98b5..a82979f43 100644
--- a/core/lib/src/models/questionnaire/questionnaire.dart
+++ b/core/lib/src/models/questionnaire/questionnaire.dart
@@ -7,7 +7,11 @@ class StudyUQuestionnaire {
   StudyUQuestionnaire();
 
   factory StudyUQuestionnaire.fromJson(List<dynamic> data) =>
-      StudyUQuestionnaire()..questions = data.map((entry) => Question.fromJson(entry as Map<String, dynamic>)).toList();
+      StudyUQuestionnaire()
+        ..questions = data
+            .map((entry) => Question.fromJson(entry as Map<String, dynamic>))
+            .toList();
 
-  List<dynamic> toJson() => questions.map((question) => question.toJson()).toList();
+  List<dynamic> toJson() =>
+      questions.map((question) => question.toJson()).toList();
 }
diff --git a/core/lib/src/models/questionnaire/questionnaire_state.dart b/core/lib/src/models/questionnaire/questionnaire_state.dart
index a6ec625ac..49df8acdc 100644
--- a/core/lib/src/models/questionnaire/questionnaire_state.dart
+++ b/core/lib/src/models/questionnaire/questionnaire_state.dart
@@ -10,7 +10,8 @@ class QuestionnaireState {
           json.map<Answer>(Answer.fromJson),
           key: (answer) => (answer as Answer).question,
         );
-  List<Map<String, dynamic>> toJson() => answers.values.map((answer) => answer.toJson()).toList();
+  List<Map<String, dynamic>> toJson() =>
+      answers.values.map((answer) => answer.toJson()).toList();
 
   bool hasAnswer<T>(String question) {
     return answers[question] is Answer<T>;
@@ -21,7 +22,8 @@ class QuestionnaireState {
     if (answer is Answer<T>) {
       return answer.response;
     } else {
-      throw ArgumentError("'Answer<$T>' requested but found '${answer.runtimeType}'.");
+      throw ArgumentError(
+          "'Answer<$T>' requested but found '${answer.runtimeType}'.");
     }
   }
 }
diff --git a/core/lib/src/models/questionnaire/questions/annotated_scale_question.dart b/core/lib/src/models/questionnaire/questions/annotated_scale_question.dart
index 02cbd7f8b..ad8e1320a 100644
--- a/core/lib/src/models/questionnaire/questions/annotated_scale_question.dart
+++ b/core/lib/src/models/questionnaire/questions/annotated_scale_question.dart
@@ -15,7 +15,8 @@ class AnnotatedScaleQuestion extends SliderQuestion {
 
   AnnotatedScaleQuestion.withId() : super.withId(questionType);
 
-  factory AnnotatedScaleQuestion.fromJson(Map<String, dynamic> json) => _$AnnotatedScaleQuestionFromJson(json);
+  factory AnnotatedScaleQuestion.fromJson(Map<String, dynamic> json) =>
+      _$AnnotatedScaleQuestionFromJson(json);
 
   @override
   Map<String, dynamic> toJson() => _$AnnotatedScaleQuestionToJson(this);
@@ -28,7 +29,8 @@ class Annotation {
 
   Annotation();
 
-  factory Annotation.fromJson(Map<String, dynamic> json) => _$AnnotationFromJson(json);
+  factory Annotation.fromJson(Map<String, dynamic> json) =>
+      _$AnnotationFromJson(json);
 
   Map<String, dynamic> toJson() => _$AnnotationToJson(this);
 }
diff --git a/core/lib/src/models/questionnaire/questions/audio_recording_question.dart b/core/lib/src/models/questionnaire/questions/audio_recording_question.dart
index c88e41001..9d53591ba 100644
--- a/core/lib/src/models/questionnaire/questions/audio_recording_question.dart
+++ b/core/lib/src/models/questionnaire/questions/audio_recording_question.dart
@@ -12,13 +12,17 @@ class AudioRecordingQuestion extends Question<AudioRecordingQuestion> {
   @JsonKey(name: 'maxRecordingDurationSeconds')
   final int maxRecordingDurationSeconds;
 
-  AudioRecordingQuestion({required this.maxRecordingDurationSeconds}) : super(questionType);
+  AudioRecordingQuestion({required this.maxRecordingDurationSeconds})
+      : super(questionType);
 
-  AudioRecordingQuestion.withId(this.maxRecordingDurationSeconds) : super.withId(questionType);
+  AudioRecordingQuestion.withId(this.maxRecordingDurationSeconds)
+      : super.withId(questionType);
 
-  factory AudioRecordingQuestion.fromJson(Map<String, dynamic> json) => _$AudioRecordingQuestionFromJson(json);
+  factory AudioRecordingQuestion.fromJson(Map<String, dynamic> json) =>
+      _$AudioRecordingQuestionFromJson(json);
   @override
   Map<String, dynamic> toJson() => _$AudioRecordingQuestionToJson(this);
 
-  Answer<FutureBlobFile> constructAnswer(FutureBlobFile response) => Answer.forQuestion(this, response);
+  Answer<FutureBlobFile> constructAnswer(FutureBlobFile response) =>
+      Answer.forQuestion(this, response);
 }
diff --git a/core/lib/src/models/questionnaire/questions/boolean_question.dart b/core/lib/src/models/questionnaire/questions/boolean_question.dart
index b7eea0389..ca81b6843 100644
--- a/core/lib/src/models/questionnaire/questions/boolean_question.dart
+++ b/core/lib/src/models/questionnaire/questions/boolean_question.dart
@@ -14,10 +14,12 @@ class BooleanQuestion extends Question<bool> {
 
   BooleanQuestion.withId() : super.withId(questionType);
 
-  factory BooleanQuestion.fromJson(Map<String, dynamic> json) => _$BooleanQuestionFromJson(json);
+  factory BooleanQuestion.fromJson(Map<String, dynamic> json) =>
+      _$BooleanQuestionFromJson(json);
   @override
   Map<String, dynamic> toJson() => _$BooleanQuestionToJson(this);
 
   // ignore: avoid_positional_boolean_parameters
-  Answer<bool> constructAnswer(bool response) => Answer.forQuestion(this, response);
+  Answer<bool> constructAnswer(bool response) =>
+      Answer.forQuestion(this, response);
 }
diff --git a/core/lib/src/models/questionnaire/questions/choice_question.dart b/core/lib/src/models/questionnaire/questions/choice_question.dart
index c24ddf1e6..ac0271b90 100644
--- a/core/lib/src/models/questionnaire/questions/choice_question.dart
+++ b/core/lib/src/models/questionnaire/questions/choice_question.dart
@@ -17,7 +17,8 @@ class ChoiceQuestion extends Question<List<String>> {
 
   ChoiceQuestion.withId() : super.withId(questionType);
 
-  factory ChoiceQuestion.fromJson(Map<String, dynamic> json) => _$ChoiceQuestionFromJson(json);
+  factory ChoiceQuestion.fromJson(Map<String, dynamic> json) =>
+      _$ChoiceQuestionFromJson(json);
 
   @override
   Map<String, dynamic> toJson() => _$ChoiceQuestionToJson(this);
diff --git a/core/lib/src/models/questionnaire/questions/free_text_question.dart b/core/lib/src/models/questionnaire/questions/free_text_question.dart
index e1971b8ad..0afe37e49 100644
--- a/core/lib/src/models/questionnaire/questions/free_text_question.dart
+++ b/core/lib/src/models/questionnaire/questions/free_text_question.dart
@@ -19,17 +19,25 @@ class FreeTextQuestion extends Question<String> {
   @JsonKey(name: 'customTypeExpression')
   String? customTypeExpression;
 
-  FreeTextQuestion({required this.textType, required this.lengthRange, this.customTypeExpression})
+  FreeTextQuestion(
+      {required this.textType,
+      required this.lengthRange,
+      this.customTypeExpression})
       : super(questionType);
 
-  FreeTextQuestion.withId({required this.textType, required this.lengthRange, this.customTypeExpression})
+  FreeTextQuestion.withId(
+      {required this.textType,
+      required this.lengthRange,
+      this.customTypeExpression})
       : super.withId(questionType);
 
-  factory FreeTextQuestion.fromJson(Map<String, dynamic> json) => _$FreeTextQuestionFromJson(json);
+  factory FreeTextQuestion.fromJson(Map<String, dynamic> json) =>
+      _$FreeTextQuestionFromJson(json);
   @override
   Map<String, dynamic> toJson() => _$FreeTextQuestionToJson(this);
 
-  Answer<String> constructAnswer(String response) => Answer.forQuestion(this, response);
+  Answer<String> constructAnswer(String response) =>
+      Answer.forQuestion(this, response);
 }
 
 enum FreeTextQuestionType {
diff --git a/core/lib/src/models/questionnaire/questions/image_capturing_question.dart b/core/lib/src/models/questionnaire/questions/image_capturing_question.dart
index fa5b06359..f527a76cb 100644
--- a/core/lib/src/models/questionnaire/questions/image_capturing_question.dart
+++ b/core/lib/src/models/questionnaire/questions/image_capturing_question.dart
@@ -13,9 +13,11 @@ class ImageCapturingQuestion extends Question<ImageCapturingQuestion> {
 
   ImageCapturingQuestion.withId() : super.withId(questionType);
 
-  factory ImageCapturingQuestion.fromJson(Map<String, dynamic> json) => _$ImageCapturingQuestionFromJson(json);
+  factory ImageCapturingQuestion.fromJson(Map<String, dynamic> json) =>
+      _$ImageCapturingQuestionFromJson(json);
   @override
   Map<String, dynamic> toJson() => _$ImageCapturingQuestionToJson(this);
 
-  Answer<FutureBlobFile> constructAnswer(FutureBlobFile response) => Answer.forQuestion(this, response);
+  Answer<FutureBlobFile> constructAnswer(FutureBlobFile response) =>
+      Answer.forQuestion(this, response);
 }
diff --git a/core/lib/src/models/questionnaire/questions/scale_question.dart b/core/lib/src/models/questionnaire/questions/scale_question.dart
index 0345f968e..c40014f92 100644
--- a/core/lib/src/models/questionnaire/questions/scale_question.dart
+++ b/core/lib/src/models/questionnaire/questions/scale_question.dart
@@ -9,7 +9,8 @@ import 'package:studyu_core/src/models/questionnaire/question_conditional.dart';
 part 'scale_question.g.dart';
 
 @JsonSerializable()
-class ScaleQuestion extends SliderQuestion implements AnnotatedScaleQuestion, VisualAnalogueQuestion {
+class ScaleQuestion extends SliderQuestion
+    implements AnnotatedScaleQuestion, VisualAnalogueQuestion {
   static const String questionType = 'scale';
 
   @override
@@ -40,7 +41,8 @@ class ScaleQuestion extends SliderQuestion implements AnnotatedScaleQuestion, Vi
 
   ScaleQuestion.withId() : super.withId(questionType);
 
-  factory ScaleQuestion.fromJson(Map<String, dynamic> json) => _$ScaleQuestionFromJson(json);
+  factory ScaleQuestion.fromJson(Map<String, dynamic> json) =>
+      _$ScaleQuestionFromJson(json);
 
   factory ScaleQuestion.fromAnnotatedScaleQuestion(
     AnnotatedScaleQuestion question,
@@ -81,7 +83,8 @@ class ScaleQuestion extends SliderQuestion implements AnnotatedScaleQuestion, Vi
   Map<String, dynamic> toJson() => _$ScaleQuestionToJson(this);
 
   @JsonKey(includeToJson: false, includeFromJson: false)
-  List<Annotation> get annotationsSorted => annotations.sorted((a, b) => a.value.compareTo(b.value));
+  List<Annotation> get annotationsSorted =>
+      annotations.sorted((a, b) => a.value.compareTo(b.value));
 
   @JsonKey(includeToJson: false, includeFromJson: false)
   Annotation? get minAnnotation {
@@ -128,8 +131,9 @@ class ScaleQuestion extends SliderQuestion implements AnnotatedScaleQuestion, Vi
   }
 
   @JsonKey(includeToJson: false, includeFromJson: false)
-  List<Annotation> get midAnnotations =>
-      annotationsSorted.where((a) => a.value != minimum && a.value != maximum).toList();
+  List<Annotation> get midAnnotations => annotationsSorted
+      .where((a) => a.value != minimum && a.value != maximum)
+      .toList();
 
   set midAnnotations(List<Annotation> annotations) {
     final prevMinAnnotation = minAnnotation;
@@ -148,10 +152,12 @@ class ScaleQuestion extends SliderQuestion implements AnnotatedScaleQuestion, Vi
   }
 
   @JsonKey(includeToJson: false, includeFromJson: false)
-  List<String> get midLabels => midAnnotations.map((a) => a.annotation).toList();
+  List<String> get midLabels =>
+      midAnnotations.map((a) => a.annotation).toList();
 
   @JsonKey(includeToJson: false, includeFromJson: false)
-  List<double> get midValues => midAnnotations.map((a) => a.value.toDouble()).toList();
+  List<double> get midValues =>
+      midAnnotations.map((a) => a.value.toDouble()).toList();
 
   Annotation addAnnotation({required int value, required String label}) {
     final annotation = Annotation()
@@ -191,11 +197,13 @@ class ScaleQuestion extends SliderQuestion implements AnnotatedScaleQuestion, Vi
 
   @override
   @JsonKey(includeToJson: false, includeFromJson: false)
-  String get minimumAnnotation => minAnnotation?.annotation ?? minimum.toString();
+  String get minimumAnnotation =>
+      minAnnotation?.annotation ?? minimum.toString();
 
   @override
   @JsonKey(includeToJson: false, includeFromJson: false)
-  String get maximumAnnotation => maxAnnotation?.annotation ?? maximum.toString();
+  String get maximumAnnotation =>
+      maxAnnotation?.annotation ?? maximum.toString();
 
   @override
   @JsonKey(includeToJson: false, includeFromJson: false)
@@ -243,10 +251,13 @@ class ScaleQuestion extends SliderQuestion implements AnnotatedScaleQuestion, Vi
     required int scaleMaxValue,
     int numValuesGenerated = 10,
   }) {
-    final int midValueStepSize = getAutostepSize(scaleMaxValue: scaleMinValue, numValuesGenerated: numValuesGenerated);
+    final int midValueStepSize = getAutostepSize(
+        scaleMaxValue: scaleMinValue, numValuesGenerated: numValuesGenerated);
     final List<int> midValues = [];
 
-    for (int midValue = scaleMinValue + midValueStepSize; midValue < scaleMaxValue; midValue += midValueStepSize) {
+    for (int midValue = scaleMinValue + midValueStepSize;
+        midValue < scaleMaxValue;
+        midValue += midValueStepSize) {
       midValues.add(midValue);
       if (midValues.length >= numValuesGenerated) {
         break;
diff --git a/core/lib/src/models/questionnaire/questions/slider_question.dart b/core/lib/src/models/questionnaire/questions/slider_question.dart
index b3bc6ece8..714381220 100644
--- a/core/lib/src/models/questionnaire/questions/slider_question.dart
+++ b/core/lib/src/models/questionnaire/questions/slider_question.dart
@@ -19,5 +19,6 @@ abstract class SliderQuestion extends Question<num> {
 
   SliderQuestion.withId(super.type) : super.withId();
 
-  Answer<num> constructAnswer(double response) => Answer.forQuestion(this, response);
+  Answer<num> constructAnswer(double response) =>
+      Answer.forQuestion(this, response);
 }
diff --git a/core/lib/src/models/questionnaire/questions/visual_analogue_question.dart b/core/lib/src/models/questionnaire/questions/visual_analogue_question.dart
index 7cce9fa46..a36fb5de0 100644
--- a/core/lib/src/models/questionnaire/questions/visual_analogue_question.dart
+++ b/core/lib/src/models/questionnaire/questions/visual_analogue_question.dart
@@ -19,7 +19,8 @@ class VisualAnalogueQuestion extends SliderQuestion {
 
   VisualAnalogueQuestion.withId() : super.withId(questionType);
 
-  factory VisualAnalogueQuestion.fromJson(Map<String, dynamic> json) => _$VisualAnalogueQuestionFromJson(json);
+  factory VisualAnalogueQuestion.fromJson(Map<String, dynamic> json) =>
+      _$VisualAnalogueQuestionFromJson(json);
 
   @override
   Map<String, dynamic> toJson() => _$VisualAnalogueQuestionToJson(this);
diff --git a/core/lib/src/models/report/report_section.dart b/core/lib/src/models/report/report_section.dart
index b6b0b25ac..fb9bfa082 100644
--- a/core/lib/src/models/report/report_section.dart
+++ b/core/lib/src/models/report/report_section.dart
@@ -16,9 +16,11 @@ abstract class ReportSection {
 
   ReportSection.withId(this.type) : id = const Uuid().v4();
 
-  factory ReportSection.fromJson(Map<String, dynamic> data) => switch (data[keyType]) {
+  factory ReportSection.fromJson(Map<String, dynamic> data) =>
+      switch (data[keyType]) {
         AverageSection.sectionType => AverageSection.fromJson(data),
-        LinearRegressionSection.sectionType => LinearRegressionSection.fromJson(data),
+        LinearRegressionSection.sectionType =>
+          LinearRegressionSection.fromJson(data),
         _ => throw UnknownJsonTypeError(data[keyType]),
       };
   Map<String, dynamic> toJson();
diff --git a/core/lib/src/models/report/report_specification.dart b/core/lib/src/models/report/report_specification.dart
index 23a89392b..1d6a3b899 100644
--- a/core/lib/src/models/report/report_specification.dart
+++ b/core/lib/src/models/report/report_specification.dart
@@ -11,7 +11,8 @@ class ReportSpecification {
 
   ReportSpecification();
 
-  factory ReportSpecification.fromJson(Map<String, dynamic> json) => _$ReportSpecificationFromJson(json);
+  factory ReportSpecification.fromJson(Map<String, dynamic> json) =>
+      _$ReportSpecificationFromJson(json);
   Map<String, dynamic> toJson() => _$ReportSpecificationToJson(this);
 
   @override
diff --git a/core/lib/src/models/report/sections/average_section.dart b/core/lib/src/models/report/sections/average_section.dart
index 6e1ebdf91..5cbebb81b 100644
--- a/core/lib/src/models/report/sections/average_section.dart
+++ b/core/lib/src/models/report/sections/average_section.dart
@@ -17,7 +17,8 @@ class AverageSection extends ReportSection {
 
   AverageSection.withId() : super.withId(sectionType);
 
-  factory AverageSection.fromJson(Map<String, dynamic> json) => _$AverageSectionFromJson(json);
+  factory AverageSection.fromJson(Map<String, dynamic> json) =>
+      _$AverageSectionFromJson(json);
   @override
   Map<String, dynamic> toJson() => _$AverageSectionToJson(this);
 }
diff --git a/core/lib/src/models/report/sections/linear_regression_section.dart b/core/lib/src/models/report/sections/linear_regression_section.dart
index 2e984402d..0a837a1d8 100644
--- a/core/lib/src/models/report/sections/linear_regression_section.dart
+++ b/core/lib/src/models/report/sections/linear_regression_section.dart
@@ -19,7 +19,8 @@ class LinearRegressionSection extends ReportSection {
 
   LinearRegressionSection.withId() : super.withId(sectionType);
 
-  factory LinearRegressionSection.fromJson(Map<String, dynamic> json) => _$LinearRegressionSectionFromJson(json);
+  factory LinearRegressionSection.fromJson(Map<String, dynamic> json) =>
+      _$LinearRegressionSectionFromJson(json);
 
   @override
   Map<String, dynamic> toJson() => _$LinearRegressionSectionToJson(this);
diff --git a/core/lib/src/models/results/result.dart b/core/lib/src/models/results/result.dart
index fcac02dda..901f4157d 100644
--- a/core/lib/src/models/results/result.dart
+++ b/core/lib/src/models/results/result.dart
@@ -19,20 +19,25 @@ class Result<T> {
 
   Result(this.type);
 
-  Result.app({required this.type, required this.periodId, required this.result});
+  Result.app(
+      {required this.type, required this.periodId, required this.result});
 
   factory Result.parseJson(Map<String, dynamic> json) => _$ResultFromJson(json);
 
   factory Result.fromJson(Map<String, dynamic> json) => switch (json[keyType]) {
         'QuestionnaireState' => Result<QuestionnaireState>.parseJson(json)
-          ..result = QuestionnaireState.fromJson(List<Map<String, dynamic>>.from(json[keyResult] as List)),
-        'bool' => Result<bool>.parseJson(json)..result = json[keyResult] as bool,
+          ..result = QuestionnaireState.fromJson(
+              List<Map<String, dynamic>>.from(json[keyResult] as List)),
+        'bool' => Result<bool>.parseJson(json)
+          ..result = json[keyResult] as bool,
         _ => throw UnknownJsonTypeError(json[keyType]),
       } as Result<T>;
 
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> resultMap = switch (type) {
-      'QuestionnaireState' => {keyResult: (result as QuestionnaireState).toJson()},
+      'QuestionnaireState' => {
+          keyResult: (result as QuestionnaireState).toJson()
+        },
       'bool' => {keyResult: result},
       _ => throw ArgumentError('Unknown result type $type'),
     };
diff --git a/core/lib/src/models/study_results/results/intervention_result.dart b/core/lib/src/models/study_results/results/intervention_result.dart
index be8c6c13c..0eb3367fa 100644
--- a/core/lib/src/models/study_results/results/intervention_result.dart
+++ b/core/lib/src/models/study_results/results/intervention_result.dart
@@ -13,7 +13,8 @@ class InterventionResult extends StudyResult {
 
   InterventionResult.withId() : super.withId(studyResultType);
 
-  factory InterventionResult.fromJson(Map<String, dynamic> json) => _$InterventionResultFromJson(json);
+  factory InterventionResult.fromJson(Map<String, dynamic> json) =>
+      _$InterventionResultFromJson(json);
 
   @override
   Map<String, dynamic> toJson() => _$InterventionResultToJson(this);
@@ -22,13 +23,16 @@ class InterventionResult extends StudyResult {
   List<String> getHeaders(Study studySpec) {
     final schedule = studySpec.schedule;
     final numberOfDays = schedule.getNumberOfPhases() * schedule.phaseDuration;
-    return Iterable<int>.generate(numberOfDays).map((e) => e.toString()).toList();
+    return Iterable<int>.generate(numberOfDays)
+        .map((e) => e.toString())
+        .toList();
   }
 
   @override
   List getValues(StudySubject subject) {
     return subject.interventionOrder
-        .expand((intervention) => List<String>.filled(subject.study.schedule.phaseDuration, intervention))
+        .expand((intervention) => List<String>.filled(
+            subject.study.schedule.phaseDuration, intervention))
         .toList();
   }
 }
diff --git a/core/lib/src/models/study_results/results/numeric_result.dart b/core/lib/src/models/study_results/results/numeric_result.dart
index 14182359a..24031df6f 100644
--- a/core/lib/src/models/study_results/results/numeric_result.dart
+++ b/core/lib/src/models/study_results/results/numeric_result.dart
@@ -16,7 +16,8 @@ class NumericResult extends StudyResult {
 
   NumericResult.withId() : super.withId(studyResultType);
 
-  factory NumericResult.fromJson(Map<String, dynamic> json) => _$NumericResultFromJson(json);
+  factory NumericResult.fromJson(Map<String, dynamic> json) =>
+      _$NumericResultFromJson(json);
 
   @override
   Map<String, dynamic> toJson() => _$NumericResultToJson(this);
@@ -25,15 +26,19 @@ class NumericResult extends StudyResult {
   List<String> getHeaders(Study studySpec) {
     final schedule = studySpec.schedule;
     final numberOfDays = schedule.getNumberOfPhases() * schedule.phaseDuration;
-    return Iterable<int>.generate(numberOfDays).map((e) => e.toString()).toList();
+    return Iterable<int>.generate(numberOfDays)
+        .map((e) => e.toString())
+        .toList();
   }
 
   @override
   List getValues(StudySubject subject) {
-    final resultSet = resultProperty
-        .retrieveFromResults(subject)
-        .map<int, num>((key, value) => MapEntry(subject.getDayOfStudyFor(key), value));
-    final numberOfDays = subject.study.schedule.getNumberOfPhases() * subject.study.schedule.phaseDuration;
-    return Iterable<int>.generate(numberOfDays).map((day) => resultSet[day]).toList();
+    final resultSet = resultProperty.retrieveFromResults(subject).map<int, num>(
+        (key, value) => MapEntry(subject.getDayOfStudyFor(key), value));
+    final numberOfDays = subject.study.schedule.getNumberOfPhases() *
+        subject.study.schedule.phaseDuration;
+    return Iterable<int>.generate(numberOfDays)
+        .map((day) => resultSet[day])
+        .toList();
   }
 }
diff --git a/core/lib/src/models/study_results/study_result.dart b/core/lib/src/models/study_results/study_result.dart
index 80f8ee1ac..966b16f94 100644
--- a/core/lib/src/models/study_results/study_result.dart
+++ b/core/lib/src/models/study_results/study_result.dart
@@ -17,7 +17,8 @@ abstract class StudyResult {
 
   StudyResult.withId(this.type) : id = const Uuid().v4();
 
-  factory StudyResult.fromJson(Map<String, dynamic> data) => switch (data[keyType]) {
+  factory StudyResult.fromJson(Map<String, dynamic> data) =>
+      switch (data[keyType]) {
         InterventionResult.studyResultType => InterventionResult.fromJson(data),
         NumericResult.studyResultType => NumericResult.fromJson(data),
         _ => throw UnknownJsonTypeError(data[keyType]),
diff --git a/core/lib/src/models/study_schedule/study_schedule.dart b/core/lib/src/models/study_schedule/study_schedule.dart
index 1b841edb7..8d484ed9c 100644
--- a/core/lib/src/models/study_schedule/study_schedule.dart
+++ b/core/lib/src/models/study_schedule/study_schedule.dart
@@ -16,16 +16,20 @@ class StudySchedule {
     this.sequenceCustom = 'ABAB',
   });
 
-  factory StudySchedule.fromJson(Map<String, dynamic> json) => _$StudyScheduleFromJson(json);
+  factory StudySchedule.fromJson(Map<String, dynamic> json) =>
+      _$StudyScheduleFromJson(json);
   Map<String, dynamic> toJson() => _$StudyScheduleToJson(this);
 
-  int getNumberOfPhases() => numberOfCycles * numberOfInterventions + (includeBaseline ? 1 : 0);
+  int getNumberOfPhases() =>
+      numberOfCycles * numberOfInterventions + (includeBaseline ? 1 : 0);
 
   int get length => getNumberOfPhases() * phaseDuration;
 
   List<int> generateWith(int firstIntervention) {
     final cycles = Iterable<int>.generate(numberOfCycles);
-    final phases = cycles.expand((cycle) => _generateCycle(firstIntervention, cycle)).toList();
+    final phases = cycles
+        .expand((cycle) => _generateCycle(firstIntervention, cycle))
+        .toList();
     return phases;
   }
 
@@ -46,7 +50,8 @@ class StudySchedule {
     }
   }
 
-  List<int> _generateAlternatingCycle(int first, int cycle) => [first, _nextIntervention(first)];
+  List<int> _generateAlternatingCycle(int first, int cycle) =>
+      [first, _nextIntervention(first)];
 
   List<int> _generateCounterBalancedCycle(int first, int cycle) {
     final shift = ((cycle + 1) ~/ 2) % 2;
diff --git a/core/lib/src/models/tables/app_config.dart b/core/lib/src/models/tables/app_config.dart
index 020097540..36a3fe17d 100644
--- a/core/lib/src/models/tables/app_config.dart
+++ b/core/lib/src/models/tables/app_config.dart
@@ -38,7 +38,8 @@ class AppConfig extends SupabaseObjectFunctions<AppConfig> {
     required this.analytics,
   });
 
-  factory AppConfig.fromJson(Map<String, dynamic> json) => _$AppConfigFromJson(json);
+  factory AppConfig.fromJson(Map<String, dynamic> json) =>
+      _$AppConfigFromJson(json);
 
   @override
   Map<String, dynamic> toJson() => _$AppConfigToJson(this);
diff --git a/core/lib/src/models/tables/repo.dart b/core/lib/src/models/tables/repo.dart
index d681fbfe6..6f946390b 100644
--- a/core/lib/src/models/tables/repo.dart
+++ b/core/lib/src/models/tables/repo.dart
@@ -26,7 +26,8 @@ class Repo extends SupabaseObjectFunctions<Repo> {
   @JsonKey(name: 'git_url')
   String? gitUrl;
 
-  Repo(this.projectId, this.userId, this.studyId, this.provider, this.webUrl, this.gitUrl);
+  Repo(this.projectId, this.userId, this.studyId, this.provider, this.webUrl,
+      this.gitUrl);
 
   factory Repo.fromJson(Map<String, dynamic> json) => _$RepoFromJson(json);
 
diff --git a/core/lib/src/models/tables/study.dart b/core/lib/src/models/tables/study.dart
index 55bbc7e6e..b5ac0ef6c 100644
--- a/core/lib/src/models/tables/study.dart
+++ b/core/lib/src/models/tables/study.dart
@@ -35,7 +35,8 @@ enum ResultSharing {
 }
 
 @JsonSerializable()
-class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study> {
+class Study extends SupabaseObjectFunctions<Study>
+    implements Comparable<Study> {
   static const String tableName = 'study';
 
   @override
@@ -145,25 +146,31 @@ class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study>
 
     final List? repo = json['repo'] as List?;
     if (repo != null && repo.isNotEmpty) {
-      study.repo = Repo.fromJson((json['repo'] as List)[0] as Map<String, dynamic>);
+      study.repo =
+          Repo.fromJson((json['repo'] as List)[0] as Map<String, dynamic>);
     }
 
     final List? invites = json['study_invite'] as List?;
     if (invites != null) {
-      study.invites = invites.map((json) => StudyInvite.fromJson(json as Map<String, dynamic>)).toList();
+      study.invites = invites
+          .map((json) => StudyInvite.fromJson(json as Map<String, dynamic>))
+          .toList();
     }
 
     final List? participants = json['study_subject'] as List?;
     if (participants != null) {
-      study.participants = participants.map((json) => StudySubject.fromJson(json as Map<String, dynamic>)).toList();
+      study.participants = participants
+          .map((json) => StudySubject.fromJson(json as Map<String, dynamic>))
+          .toList();
     }
 
     List? participantsProgress = json['study_progress'] as List?;
     participantsProgress = json['study_progress_export'] as List?;
     participantsProgress ??= json['subject_progress'] as List?;
     if (participantsProgress != null) {
-      study.participantsProgress =
-          participantsProgress.map((json) => SubjectProgress.fromJson(json as Map<String, dynamic>)).toList();
+      study.participantsProgress = participantsProgress
+          .map((json) => SubjectProgress.fromJson(json as Map<String, dynamic>))
+          .toList();
     }
 
     final int? participantCount = json['study_participant_count'] as int?;
@@ -198,7 +205,8 @@ class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study>
   Map<String, dynamic> toJson() => _$StudyToJson(this);
 
   // TODO: Add null checks in fromJson to allow selecting columns
-  static Future<List<Study>> getResearcherDashboardStudies() async => SupabaseQuery.getAll<Study>(
+  static Future<List<Study>> getResearcherDashboardStudies() async =>
+      SupabaseQuery.getAll<Study>(
         selectedColumns: [
           '*',
           'repo(*)',
@@ -229,8 +237,10 @@ class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study>
   static Future<ExtractionResult<Study>> publishedPublicStudies() async {
     ExtractionResult<Study> result;
     try {
-      final response = await env.client.from(tableName).select().eq('participation', 'open');
-      final extracted = SupabaseQuery.extractSupabaseList<Study>(List<Map<String, dynamic>>.from(response));
+      final response =
+          await env.client.from(tableName).select().eq('participation', 'open');
+      final extracted = SupabaseQuery.extractSupabaseList<Study>(
+          List<Map<String, dynamic>>.from(response));
       result = ExtractionSuccess<Study>(extracted);
     } on ExtractionFailedException<Study> catch (error) {
       result = error;
@@ -243,22 +253,30 @@ class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study>
 
   bool isOwner(User? user) => user != null && userId == user.id;
 
-  bool isEditor(User? user) => user != null && collaboratorEmails.contains(user.email);
+  bool isEditor(User? user) =>
+      user != null && collaboratorEmails.contains(user.email);
 
   bool canEdit(User? user) => user != null && (isOwner(user) || isEditor(user));
 
-  bool get hasEligibilityCheck => eligibilityCriteria.isNotEmpty && questionnaire.questions.isNotEmpty;
+  bool get hasEligibilityCheck =>
+      eligibilityCriteria.isNotEmpty && questionnaire.questions.isNotEmpty;
 
   bool get hasConsentCheck => consent.isNotEmpty;
 
-  int get totalMissedDays => missedDays.isNotEmpty ? missedDays.reduce((total, days) => total += days) : 0;
+  int get totalMissedDays => missedDays.isNotEmpty
+      ? missedDays.reduce((total, days) => total += days)
+      : 0;
 
-  double get percentageMissedDays => totalMissedDays / (participantCount * schedule.length);
+  double get percentageMissedDays =>
+      totalMissedDays / (participantCount * schedule.length);
 
   static Future<String> fetchResultsCSVTable(String studyId) async {
     final List res;
     try {
-      res = await env.client.from('study_progress').select().eq('study_id', studyId);
+      res = await env.client
+          .from('study_progress')
+          .select()
+          .eq('study_id', studyId);
     } catch (error, stacktrace) {
       SupabaseQuery.catchSupabaseException(error, stacktrace);
       rethrow;
@@ -269,7 +287,8 @@ class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study>
     final tableHeadersSet = jsonList[0].keys.toSet();
     final flattenedQuestions = jsonList.map((progress) {
       if (progress['result_type'] == 'QuestionnaireState') {
-        for (final result in List<Map<String, dynamic>>.from(progress['result'] as List)) {
+        for (final result
+            in List<Map<String, dynamic>>.from(progress['result'] as List)) {
           progress[result['question'] as String] = result['response'];
           tableHeadersSet.add(result['question'] as String);
         }
@@ -282,7 +301,9 @@ class Study extends SupabaseObjectFunctions<Study> implements Comparable<Study>
     final resultsTable = [
       tableHeaders,
       ...flattenedQuestions.map(
-        (progress) => tableHeaders.map((header) => progress[header] ?? '').toList(growable: false),
+        (progress) => tableHeaders
+            .map((header) => progress[header] ?? '')
+            .toList(growable: false),
       ),
     ];
     return const ListToCsvConverter().convert(resultsTable);
diff --git a/core/lib/src/models/tables/study_invite.dart b/core/lib/src/models/tables/study_invite.dart
index fbf91bd38..bd47e93a2 100644
--- a/core/lib/src/models/tables/study_invite.dart
+++ b/core/lib/src/models/tables/study_invite.dart
@@ -20,7 +20,8 @@ class StudyInvite extends SupabaseObjectFunctions<StudyInvite> {
 
   StudyInvite(this.code, this.studyId, {this.preselectedInterventionIds});
 
-  factory StudyInvite.fromJson(Map<String, dynamic> json) => _$StudyInviteFromJson(json);
+  factory StudyInvite.fromJson(Map<String, dynamic> json) =>
+      _$StudyInviteFromJson(json);
 
   @override
   Map<String, dynamic> toJson() => _$StudyInviteToJson(this);
diff --git a/core/lib/src/models/tables/study_subject.dart b/core/lib/src/models/tables/study_subject.dart
index 8f41558b3..70d4e9163 100644
--- a/core/lib/src/models/tables/study_subject.dart
+++ b/core/lib/src/models/tables/study_subject.dart
@@ -39,7 +39,8 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   @JsonKey(includeToJson: false, includeFromJson: false)
   late List<SubjectProgress> progress = [];
 
-  StudySubject(this.id, this.studyId, this.userId, this.selectedInterventionIds);
+  StudySubject(
+      this.id, this.studyId, this.userId, this.selectedInterventionIds);
 
   factory StudySubject.fromJson(Map<String, dynamic> json) {
     final subject = _$StudySubjectFromJson(json);
@@ -51,7 +52,9 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
 
     final List? progress = json['subject_progress'] as List?;
     if (progress != null) {
-      subject.progress = progress.map((json) => SubjectProgress.fromJson(json as Map<String, dynamic>)).toList();
+      subject.progress = progress
+          .map((json) => SubjectProgress.fromJson(json as Map<String, dynamic>))
+          .toList();
     }
 
     return subject;
@@ -60,20 +63,23 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   @override
   Map<String, dynamic> toJson() => _$StudySubjectToJson(this);
 
-  StudySubject.fromStudy(this.study, this.userId, this.selectedInterventionIds, this.inviteCode)
+  StudySubject.fromStudy(
+      this.study, this.userId, this.selectedInterventionIds, this.inviteCode)
       : id = const Uuid().v4(),
         studyId = study.id;
 
   List<String> get interventionOrder => [
         if (study.schedule.includeBaseline) Study.baselineID,
-        ...study.schedule.generateWith(0).map<String>((int index) => selectedInterventionIds[index]),
+        ...study.schedule
+            .generateWith(0)
+            .map<String>((int index) => selectedInterventionIds[index]),
       ];
 
   List<Intervention> get selectedInterventions {
     final selectedInterventions = selectedInterventionIds
         .map(
-          (selectedInterventionId) =>
-              study.interventions.singleWhere((intervention) => intervention.id == selectedInterventionId),
+          (selectedInterventionId) => study.interventions.singleWhere(
+              (intervention) => intervention.id == selectedInterventionId),
         )
         .toList();
     if (study.schedule.includeBaseline) {
@@ -86,12 +92,15 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
     return selectedInterventions;
   }
 
-  int get daysPerIntervention => study.schedule.numberOfCycles * study.schedule.phaseDuration;
+  int get daysPerIntervention =>
+      study.schedule.numberOfCycles * study.schedule.phaseDuration;
 
-  Map<DateTime, List<SubjectProgress>> getResultsByDate({required String interventionId}) {
+  Map<DateTime, List<SubjectProgress>> getResultsByDate(
+      {required String interventionId}) {
     final resultsByDate = <DateTime, List<SubjectProgress>>{};
     progress.where((p) => p.interventionId == interventionId).forEach((p) {
-      final date = DateTime(p.completedAt!.year, p.completedAt!.month, p.completedAt!.day);
+      final date = DateTime(
+          p.completedAt!.year, p.completedAt!.month, p.completedAt!.day);
       resultsByDate.putIfAbsent(date, () => []);
       resultsByDate[date]!.add(p);
     });
@@ -99,7 +108,8 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   }
 
   // Day after last intervention
-  DateTime endDate(DateTime dt) => dt.add(Duration(days: interventionOrder.length * study.schedule.phaseDuration));
+  DateTime endDate(DateTime dt) => dt.add(
+      Duration(days: interventionOrder.length * study.schedule.phaseDuration));
 
   int getDayOfStudyFor(DateTime date) {
     return date.differenceInDays(startedAt!);
@@ -117,20 +127,25 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
       return null;
     }
     final interventionId = interventionOrder[index];
-    return selectedInterventions.firstWhereOrNull((intervention) => intervention.id == interventionId);
+    return selectedInterventions
+        .firstWhereOrNull((intervention) => intervention.id == interventionId);
   }
 
   List<Intervention> getInterventionsInOrder() {
     return interventionOrder
-        .map((key) => selectedInterventions.firstWhere((intervention) => intervention.id == key))
+        .map((key) => selectedInterventions
+            .firstWhere((intervention) => intervention.id == key))
         .toList();
   }
 
-  DateTime startOfPhase(int index) => startedAt!.add(Duration(days: study.schedule.phaseDuration * index));
+  DateTime startOfPhase(int index) =>
+      startedAt!.add(Duration(days: study.schedule.phaseDuration * index));
 
-  DateTime dayAfterEndOfPhase(int index) => startOfPhase(index).add(Duration(days: study.schedule.phaseDuration));
+  DateTime dayAfterEndOfPhase(int index) =>
+      startOfPhase(index).add(Duration(days: study.schedule.phaseDuration));
 
-  List<SubjectProgress> resultsFor(String taskId) => progress.where((p) => p.taskId == taskId).toList();
+  List<SubjectProgress> resultsFor(String taskId) =>
+      progress.where((p) => p.taskId == taskId).toList();
 
   int completedForPhase(int index) {
     final start = startOfPhase(index);
@@ -145,7 +160,8 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
 
   int daysLeftForPhase(int index) {
     final start = startOfPhase(index);
-    return study.schedule.phaseDuration - DateTime.now().differenceInDays(start);
+    return study.schedule.phaseDuration -
+        DateTime.now().differenceInDays(start);
   }
 
   double percentCompletedForPhase(int index) {
@@ -155,12 +171,14 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   double percentMissedForPhase(int index, DateTime date) {
     if (startOfPhase(index).isAfter(date)) return 0;
 
-    final missedInPhase =
-        min(date.differenceInDays(startOfPhase(index)), study.schedule.phaseDuration) - completedForPhase(index);
+    final missedInPhase = min(date.differenceInDays(startOfPhase(index)),
+            study.schedule.phaseDuration) -
+        completedForPhase(index);
     return missedInPhase / study.schedule.phaseDuration;
   }
 
-  List<SubjectProgress> getTaskProgressForDay(String taskId, DateTime dateTime) {
+  List<SubjectProgress> getTaskProgressForDay(
+      String taskId, DateTime dateTime) {
     final List<SubjectProgress> thisTaskProgressToday = [];
     for (final SubjectProgress sp in resultsFor(taskId)) {
       if (sp.subjectId == id && sp.completedAt!.isSameDate(dateTime)) {
@@ -173,7 +191,8 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   /// Check if a task instance is completed
   /// returns true if a given task has been completed for a specific
   /// completionPeriod on a given day
-  bool completedTaskInstanceForDay(String taskId, CompletionPeriod completionPeriod, DateTime dateTime) {
+  bool completedTaskInstanceForDay(
+      String taskId, CompletionPeriod completionPeriod, DateTime dateTime) {
     return getTaskProgressForDay(taskId, dateTime).any(
       (progress) {
         if (progress.result.periodId == null) {
@@ -189,12 +208,10 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   /// returns true if a given task has been completed for all of its
   /// completionPeriods on a given day
   bool completedTaskForDay(String taskId, DateTime dateTime) {
-    return [...selectedInterventions.expand((e) => e.tasks), ...study.observations]
-        .where((task) => task.id == taskId)
-        .single
-        .schedule
-        .completionPeriods
-        .any(
+    return [
+      ...selectedInterventions.expand((e) => e.tasks),
+      ...study.observations
+    ].where((task) => task.id == taskId).single.schedule.completionPeriods.any(
           (period) => completedTaskInstanceForDay(taskId, period, dateTime),
         );
   }
@@ -221,7 +238,8 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   int totalTaskCountFor(Task task) {
     var daysCount = daysPerIntervention;
     if (task is Observation) {
-      daysCount = 2 * daysCount + (study.schedule.includeBaseline ? study.schedule.phaseDuration : 0);
+      daysCount = 2 * daysCount +
+          (study.schedule.includeBaseline ? study.schedule.phaseDuration : 0);
     }
     return daysCount * task.schedule.completionPeriods.length;
   }
@@ -257,8 +275,10 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   @override
   Future<StudySubject> save() async {
     try {
-      final response = await env.client.from(tableName).upsert(toJson()).select();
-      final json = toFullJson(partialJson: List<Map<String, dynamic>>.from(response).single);
+      final response =
+          await env.client.from(tableName).upsert(toJson()).select();
+      final json = toFullJson(
+          partialJson: List<Map<String, dynamic>>.from(response).single);
       final newSubject = StudySubject.fromJson(json);
       _controller.add(newSubject);
       // print("Saving study subject");
@@ -280,7 +300,10 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
 
   Future<void> deleteProgress() async {
     try {
-      await env.client.from(SubjectProgress.tableName).delete().eq('subject_id', id);
+      await env.client
+          .from(SubjectProgress.tableName)
+          .delete()
+          .eq('subject_id', id);
     } catch (error, stacktrace) {
       SupabaseQuery.catchSupabaseException(error, stacktrace);
       rethrow;
@@ -292,7 +315,9 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
         .map((p) => (p.result.result as QuestionnaireState).answers.values)
         .expand((answers) => answers)
         .where(
-          (e) => e.question == AudioRecordingQuestion.questionType || e.question == ImageCapturingQuestion.questionType,
+          (e) =>
+              e.question == AudioRecordingQuestion.questionType ||
+              e.question == ImageCapturingQuestion.questionType,
         )
         .map((e) => e.response!.toString())
         .toList();
@@ -306,7 +331,12 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   Future<StudySubject> delete() async {
     await deleteProgress();
     try {
-      final response = await env.client.from(tableName).delete().eq('id', id).select().single();
+      final response = await env.client
+          .from(tableName)
+          .delete()
+          .eq('id', id)
+          .select()
+          .single();
       response['study'] = study.toJson();
       return StudySubject.fromJson(response);
     } catch (error, stacktrace) {
@@ -322,7 +352,9 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
 
   static Future<List<StudySubject>> getStudyHistory(String userId) async {
     return SupabaseQuery.extractSupabaseList<StudySubject>(
-      await env.client.from(tableName).select('*,study!study_subject_studyId_fkey(*),subject_progress(*)'),
+      await env.client
+          .from(tableName)
+          .select('*,study!study_subject_studyId_fkey(*),subject_progress(*)'),
     );
   }
 
diff --git a/core/lib/src/models/tables/subject_progress.dart b/core/lib/src/models/tables/subject_progress.dart
index 8ec968c4f..8f2e6211b 100644
--- a/core/lib/src/models/tables/subject_progress.dart
+++ b/core/lib/src/models/tables/subject_progress.dart
@@ -11,7 +11,8 @@ class SubjectProgress extends SupabaseObjectFunctions<SubjectProgress> {
   static const String tableName = 'subject_progress';
 
   @override
-  Map<String, Object> get primaryKeys => {'completed_at': completedAt!, 'subject_id': subjectId};
+  Map<String, Object> get primaryKeys =>
+      {'completed_at': completedAt!, 'subject_id': subjectId};
 
   // stored in UTC format, be careful when comparing dates
   @JsonKey(name: 'completed_at')
diff --git a/core/lib/src/models/tables/user.dart b/core/lib/src/models/tables/user.dart
index 08a35866c..00510cc2e 100644
--- a/core/lib/src/models/tables/user.dart
+++ b/core/lib/src/models/tables/user.dart
@@ -21,7 +21,8 @@ class StudyUUser extends SupabaseObjectFunctions<StudyUUser> {
   StudyUUser({required this.id, required this.email, Preferences? preferences})
       : preferences = preferences ?? Preferences();
 
-  factory StudyUUser.fromJson(Map<String, dynamic> json) => _$StudyUUserFromJson(json);
+  factory StudyUUser.fromJson(Map<String, dynamic> json) =>
+      _$StudyUUserFromJson(json);
 
   @override
   Map<String, dynamic> toJson() => _$StudyUUserToJson(this);
@@ -38,13 +39,17 @@ class Preferences {
 
   Preferences({this.language = '', this.pinnedStudies = const {}});
 
-  factory Preferences.fromJson(Map<String, dynamic> json) => _$PreferencesFromJson(json);
+  factory Preferences.fromJson(Map<String, dynamic> json) =>
+      _$PreferencesFromJson(json);
 
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> json = _$PreferencesToJson(this);
     // Remove empty fields from the JSON map
     json.removeWhere(
-      (key, value) => value == null || value is String && value.isEmpty || value is Set && value.isEmpty,
+      (key, value) =>
+          value == null ||
+          value is String && value.isEmpty ||
+          value is Set && value.isEmpty,
     );
     return json;
   }
diff --git a/core/lib/src/models/tasks/schedule.dart b/core/lib/src/models/tasks/schedule.dart
index b5aae370b..566ec3a34 100644
--- a/core/lib/src/models/tasks/schedule.dart
+++ b/core/lib/src/models/tasks/schedule.dart
@@ -17,7 +17,8 @@ class Schedule {
 
   Schedule();
 
-  factory Schedule.fromJson(Map<String, dynamic> json) => _$ScheduleFromJson(json);
+  factory Schedule.fromJson(Map<String, dynamic> json) =>
+      _$ScheduleFromJson(json);
 
   Map<String, dynamic> toJson() => _$ScheduleToJson(this);
 
@@ -33,11 +34,14 @@ class CompletionPeriod {
   final StudyUTimeOfDay unlockTime;
   final StudyUTimeOfDay lockTime;
 
-  CompletionPeriod({required this.id, required this.unlockTime, required this.lockTime});
+  CompletionPeriod(
+      {required this.id, required this.unlockTime, required this.lockTime});
 
-  CompletionPeriod.noId({required this.unlockTime, required this.lockTime}) : id = const Uuid().v4();
+  CompletionPeriod.noId({required this.unlockTime, required this.lockTime})
+      : id = const Uuid().v4();
 
-  factory CompletionPeriod.fromJson(Map<String, dynamic> json) => _$CompletionPeriodFromJson(json);
+  factory CompletionPeriod.fromJson(Map<String, dynamic> json) =>
+      _$CompletionPeriodFromJson(json);
 
   Map<String, dynamic> toJson() => _$CompletionPeriodToJson(this);
 
diff --git a/core/lib/src/models/tasks/task.dart b/core/lib/src/models/tasks/task.dart
index cb796d149..fc7b1da5f 100644
--- a/core/lib/src/models/tasks/task.dart
+++ b/core/lib/src/models/tasks/task.dart
@@ -24,7 +24,8 @@ abstract class Task {
     return toJson().toString();
   }
 
-  Map<DateTime, T> extractPropertyResults<T>(String property, List<SubjectProgress> sourceResults);
+  Map<DateTime, T> extractPropertyResults<T>(
+      String property, List<SubjectProgress> sourceResults);
 
   Map<String, Type> getAvailableProperties();
 
diff --git a/core/lib/src/models/tasks/task_instance.dart b/core/lib/src/models/tasks/task_instance.dart
index 921a4d72a..e2454b0af 100644
--- a/core/lib/src/models/tasks/task_instance.dart
+++ b/core/lib/src/models/tasks/task_instance.dart
@@ -6,7 +6,8 @@ class TaskInstance {
 
   TaskInstance(this.task, this.id) : assert(task.id != id);
 
-  factory TaskInstance.fromInstanceId(String taskInstanceId, {StudySubject? subject, Study? study, DateTime? date}) {
+  factory TaskInstance.fromInstanceId(String taskInstanceId,
+      {StudySubject? subject, Study? study, DateTime? date}) {
     date ??= DateTime.now();
     final Task tempTask;
     if (subject != null) {
@@ -20,22 +21,31 @@ class TaskInstance {
     return TaskInstance(tempTask, taskInstanceId);
   }
 
-  static Task _taskFromStudy(String taskInstanceId, Study study, DateTime date) {
+  static Task _taskFromStudy(
+      String taskInstanceId, Study study, DateTime date) {
     final tasks = <Task>[
       ...study.observations,
-      ...study.interventions.map((intervention) => intervention.tasks).expand((element) => element),
+      ...study.interventions
+          .map((intervention) => intervention.tasks)
+          .expand((element) => element),
     ];
     return tasks.firstWhere((task) {
-      if (task.schedule.completionPeriods.any((completionPeriod) => completionPeriod.id == taskInstanceId)) {
+      if (task.schedule.completionPeriods
+          .any((completionPeriod) => completionPeriod.id == taskInstanceId)) {
         return true;
       }
       return false;
     });
   }
 
-  static Task _taskFromSubject(String taskInstanceId, StudySubject subject, DateTime now) {
-    return subject.scheduleFor(now).firstWhere((element) => element.id == taskInstanceId).task;
+  static Task _taskFromSubject(
+      String taskInstanceId, StudySubject subject, DateTime now) {
+    return subject
+        .scheduleFor(now)
+        .firstWhere((element) => element.id == taskInstanceId)
+        .task;
   }
 
-  CompletionPeriod get completionPeriod => task.schedule.completionPeriods.firstWhere((element) => element.id == id);
+  CompletionPeriod get completionPeriod =>
+      task.schedule.completionPeriods.firstWhere((element) => element.id == id);
 }
diff --git a/core/lib/src/util/analytics.dart b/core/lib/src/util/analytics.dart
index 35f2b511e..541dd98dc 100644
--- a/core/lib/src/util/analytics.dart
+++ b/core/lib/src/util/analytics.dart
@@ -39,7 +39,8 @@ class StudyUDiagnostics {
     await Sentry.captureMessage(message);
   }
 
-  static void addBreadcrumb({required String message, required String category}) {
+  static void addBreadcrumb(
+      {required String message, required String category}) {
     print("[Breadcrumb] $category: $message");
     Sentry.addBreadcrumb(Breadcrumb(message: message, category: category));
   }
@@ -118,7 +119,8 @@ class StudyUAnalytics {
 
   StudyUAnalytics(this.enabled, this.dsn, this.samplingRate);
 
-  factory StudyUAnalytics.fromJson(Map<String, dynamic> json) => _$StudyUAnalyticsFromJson(json);
+  factory StudyUAnalytics.fromJson(Map<String, dynamic> json) =>
+      _$StudyUAnalyticsFromJson(json);
 
   Map<String, dynamic> toJson() => _$StudyUAnalyticsToJson(this);
 }
diff --git a/core/lib/src/util/extensions.dart b/core/lib/src/util/extensions.dart
index 05418facd..1f862fe91 100644
--- a/core/lib/src/util/extensions.dart
+++ b/core/lib/src/util/extensions.dart
@@ -1,7 +1,9 @@
 extension DateOnlyCompare on DateTime {
   bool isSameDate(DateTime other) {
     final otherUtc = other.toUtc();
-    return toUtc().year == otherUtc.year && toUtc().month == otherUtc.month && toUtc().day == otherUtc.day;
+    return toUtc().year == otherUtc.year &&
+        toUtc().month == otherUtc.month &&
+        toUtc().day == otherUtc.day;
   }
 
   bool isEarlierDateThan(DateTime other) {
@@ -21,7 +23,8 @@ extension DateOnlyCompare on DateTime {
   }
 
   bool isLaterDateThan(DateTime other) {
-    return !(toUtc().isSameDate(other.toUtc()) || toUtc().isEarlierDateThan(other.toUtc()));
+    return !(toUtc().isSameDate(other.toUtc()) ||
+        toUtc().isEarlierDateThan(other.toUtc()));
   }
 
   int differenceInDays(DateTime other) {
diff --git a/core/lib/src/util/multimodal/blob_storage_handler.dart b/core/lib/src/util/multimodal/blob_storage_handler.dart
index 083f98602..33de4eea9 100644
--- a/core/lib/src/util/multimodal/blob_storage_handler.dart
+++ b/core/lib/src/util/multimodal/blob_storage_handler.dart
@@ -8,14 +8,20 @@ class BlobStorageHandler {
   static const String _observationsBucketName = 'observations';
 
   Future<void> uploadObservation(String blobPath, File file) async {
-    await env.client.storage.from(_observationsBucketName).upload(blobPath, file);
+    await env.client.storage
+        .from(_observationsBucketName)
+        .upload(blobPath, file);
   }
 
   Future<Uint8List> downloadObservation(String blobPath) async {
-    return await env.client.storage.from(_observationsBucketName).download(blobPath);
+    return await env.client.storage
+        .from(_observationsBucketName)
+        .download(blobPath);
   }
 
   Future<List<FileObject>> removeObservation(List<String> blobPaths) async {
-    return await env.client.storage.from(_observationsBucketName).remove(blobPaths);
+    return await env.client.storage
+        .from(_observationsBucketName)
+        .remove(blobPaths);
   }
 }
diff --git a/core/lib/src/util/supabase_object.dart b/core/lib/src/util/supabase_object.dart
index b204076db..242b80292 100644
--- a/core/lib/src/util/supabase_object.dart
+++ b/core/lib/src/util/supabase_object.dart
@@ -21,8 +21,10 @@ String tableName(Type cls) => switch (cls) {
       _ => throw ArgumentError('$cls is not a supported Supabase type'),
     };
 
-abstract class SupabaseObjectFunctions<T extends SupabaseObject> implements SupabaseObject {
-  static T fromJson<T extends SupabaseObject>(Map<String, dynamic> json) => switch (T) {
+abstract class SupabaseObjectFunctions<T extends SupabaseObject>
+    implements SupabaseObject {
+  static T fromJson<T extends SupabaseObject>(Map<String, dynamic> json) =>
+      switch (T) {
         == Study => Study.fromJson(json) as T,
         == StudySubject => StudySubject.fromJson(json) as T,
         == SubjectProgress => SubjectProgress.fromJson(json) as T,
@@ -34,11 +36,17 @@ abstract class SupabaseObjectFunctions<T extends SupabaseObject> implements Supa
       };
 
   Future<T> delete() async => SupabaseQuery.extractSupabaseSingleRow<T>(
-        await env.client.from(tableName(T)).delete().primaryKeys(primaryKeys).select().single(),
+        await env.client
+            .from(tableName(T))
+            .delete()
+            .primaryKeys(primaryKeys)
+            .select()
+            .single(),
       );
 
   Future<T> save() async {
-    return SupabaseQuery.extractSupabaseList<T>(await env.client.from(tableName(T)).upsert(this.toJson()).select())
+    return SupabaseQuery.extractSupabaseList<T>(
+            await env.client.from(tableName(T)).upsert(this.toJson()).select())
         .single;
   }
 }
@@ -49,17 +57,24 @@ class SupabaseQuery {
     List<String> selectedColumns = const ['*'],
   }) async {
     try {
-      return extractSupabaseList(await env.client.from(tableName(T)).select(selectedColumns.join(',')));
+      return extractSupabaseList(await env.client
+          .from(tableName(T))
+          .select(selectedColumns.join(',')));
     } catch (error, stacktrace) {
       catchSupabaseException(error, stacktrace);
       rethrow;
     }
   }
 
-  static Future<T> getById<T extends SupabaseObject>(String id, {List<String> selectedColumns = const ['*']}) async {
+  static Future<T> getById<T extends SupabaseObject>(String id,
+      {List<String> selectedColumns = const ['*']}) async {
     try {
       return extractSupabaseSingleRow(
-        await env.client.from(tableName(T)).select(selectedColumns.join(',')).eq('id', id).single(),
+        await env.client
+            .from(tableName(T))
+            .select(selectedColumns.join(','))
+            .eq('id', id)
+            .single(),
       );
     } catch (error, stacktrace) {
       catchSupabaseException(error, stacktrace);
@@ -71,7 +86,8 @@ class SupabaseQuery {
     List<Map<String, dynamic>> batchJson,
   ) async {
     try {
-      return SupabaseQuery.extractSupabaseList<T>(await env.client.from(tableName(T)).upsert(batchJson).select());
+      return SupabaseQuery.extractSupabaseList<T>(
+          await env.client.from(tableName(T)).upsert(batchJson).select());
     } catch (error, stacktrace) {
       catchSupabaseException(error, stacktrace);
       rethrow;
@@ -104,14 +120,16 @@ class SupabaseQuery {
     return extracted;
   }
 
-  static T extractSupabaseSingleRow<T extends SupabaseObject>(Map<String, dynamic> response) {
+  static T extractSupabaseSingleRow<T extends SupabaseObject>(
+      Map<String, dynamic> response) {
     return SupabaseObjectFunctions.fromJson<T>(response);
   }
 
   static void catchSupabaseException(Object error, StackTrace stacktrace) {
     StudyUDiagnostics.captureException(error, stackTrace: stacktrace);
     if (error is PostgrestException) {
-      StudyULogger.fatal('Caught Postgrest Error: $error\nStacktrace: $stacktrace');
+      StudyULogger.fatal(
+          'Caught Postgrest Error: $error\nStacktrace: $stacktrace');
       throw error;
     } else if (error is SocketException) {
       // StudyULogger.info("App is suspected to be offline");
@@ -143,7 +161,8 @@ class ExtractionSuccess<T> extends ExtractionResult<T> {
   ExtractionSuccess(super.extracted);
 }
 
-class ExtractionFailedException<T> extends ExtractionResult<T> implements Exception {
+class ExtractionFailedException<T> extends ExtractionResult<T>
+    implements Exception {
   final List<JsonWithError> notExtracted;
 
   ExtractionFailedException(super.extracted, this.notExtracted);
diff --git a/core/test/model/study_schedule/study_schedule_test.dart b/core/test/model/study_schedule/study_schedule_test.dart
index 3f4ed1ee8..beb2bbe34 100644
--- a/core/test/model/study_schedule/study_schedule_test.dart
+++ b/core/test/model/study_schedule/study_schedule_test.dart
@@ -15,8 +15,10 @@ void main() {
 
         final result = schedule.generateWith(0);
 
-        expect(result.sublist(0).take(2).toSet().length, 2, reason: 'A cycle was not complete');
-        expect(result.sublist(2).take(2).toSet().length, 2, reason: 'A cycle was not complete');
+        expect(result.sublist(0).take(2).toSet().length, 2,
+            reason: 'A cycle was not complete');
+        expect(result.sublist(2).take(2).toSet().length, 2,
+            reason: 'A cycle was not complete');
       });
 
       test('respects the first intervention', () {
@@ -25,8 +27,10 @@ void main() {
           ..phaseDuration = 7
           ..includeBaseline = false;
 
-        expect(schedule.generateWith(0).first, 0, reason: 'Did not respect first intervention');
-        expect(schedule.generateWith(1).first, 1, reason: 'Did not respect first intervention');
+        expect(schedule.generateWith(0).first, 0,
+            reason: 'Did not respect first intervention');
+        expect(schedule.generateWith(1).first, 1,
+            reason: 'Did not respect first intervention');
       });
     }
 
@@ -43,7 +47,8 @@ void main() {
         void checkAlternating(int first) {
           final result = schedule.generateWith(first);
           for (var i = 0; i < result.length - 1; i++) {
-            expect(result[i], isNot(equals(result[i + 1])), reason: 'Phase $i and ${i + 1} have the same intervention');
+            expect(result[i], isNot(equals(result[i + 1])),
+                reason: 'Phase $i and ${i + 1} have the same intervention');
           }
         }
 
diff --git a/designer_v2/integration_test/app_test.dart b/designer_v2/integration_test/app_test.dart
index de622cd95..1e55e29a2 100644
--- a/designer_v2/integration_test/app_test.dart
+++ b/designer_v2/integration_test/app_test.dart
@@ -175,9 +175,11 @@ void main() {
       await studyInfoRobot.validateOnStudyInfoScreen();
       await studyInfoRobot.enterStudyDescription('Test study description');
       await studyInfoRobot.enterResponsibleOrg('Test Organization, Inc.');
-      await studyInfoRobot.enterInstitutionalReviewBoard('IRB of Test Organization, Inc.');
+      await studyInfoRobot
+          .enterInstitutionalReviewBoard('IRB of Test Organization, Inc.');
       await studyInfoRobot.enterIRBProtocolNumber('456-112-324');
-      await studyInfoRobot.enterResponsiblePerson('Test First Name, Test Last Name');
+      await studyInfoRobot
+          .enterResponsiblePerson('Test First Name, Test Last Name');
       await studyInfoRobot.enterWebsite('test-study.org');
       await studyInfoRobot.enterContactEmail('test@email.com');
       await studyInfoRobot.enterContactPhone('+491112221122');
@@ -189,21 +191,27 @@ void main() {
       await studyDesignRobot.navigateToInterventionsScreen();
       // Repeat twice for two interventions
       await studyInterventionsRobot.tapAddInterventionButton();
-      await studyInterventionsRobot.enterInterventionName('Test Intervention A');
-      await studyInterventionsRobot.enterInterventionDesciption('Test Intervention Description A');
+      await studyInterventionsRobot
+          .enterInterventionName('Test Intervention A');
+      await studyInterventionsRobot
+          .enterInterventionDesciption('Test Intervention Description A');
       await studyInterventionsRobot.tapAddInterventionTaskButton();
       await studyInterventionsRobot.enterInterventionTaskName('Task 1A');
-      await studyInterventionsRobot.enterInterventionTaskDescription('Task 1A Description');
+      await studyInterventionsRobot
+          .enterInterventionTaskDescription('Task 1A Description');
       await studyInterventionsRobot.tapSaveInterventionTaskButton();
       await studyInterventionsRobot.tapSaveInterventionButton();
       await studyDesignRobot.validateChangesSaved();
 
       await studyInterventionsRobot.tapAddInterventionButton();
-      await studyInterventionsRobot.enterInterventionName('Test Intervention B');
-      await studyInterventionsRobot.enterInterventionDesciption('Test Intervention Description B');
+      await studyInterventionsRobot
+          .enterInterventionName('Test Intervention B');
+      await studyInterventionsRobot
+          .enterInterventionDesciption('Test Intervention Description B');
       await studyInterventionsRobot.tapAddInterventionTaskButton();
       await studyInterventionsRobot.enterInterventionTaskName('Task 1B');
-      await studyInterventionsRobot.enterInterventionTaskDescription('Task 1B Description');
+      await studyInterventionsRobot
+          .enterInterventionTaskDescription('Task 1B Description');
       await studyInterventionsRobot.tapSaveInterventionTaskButton();
       await studyInterventionsRobot.tapSaveInterventionButton();
       await studyDesignRobot.validateChangesSaved();
diff --git a/designer_v2/integration_test/robots/auth_robot.dart b/designer_v2/integration_test/robots/auth_robot.dart
index 35e2be55a..80cf87e76 100644
--- a/designer_v2/integration_test/robots/auth_robot.dart
+++ b/designer_v2/integration_test/robots/auth_robot.dart
@@ -13,11 +13,15 @@ class AuthRobot {
   }
 
   Future<void> enterPassword(String password) async {
-    await $(ReactiveTextField).containing(tr.form_field_password).enterText(password);
+    await $(ReactiveTextField)
+        .containing(tr.form_field_password)
+        .enterText(password);
   }
 
   Future<void> enterPasswordConfirmation(String confirmPassword) async {
-    await $(ReactiveTextField).containing(tr.form_field_password_confirm).enterText(confirmPassword);
+    await $(ReactiveTextField)
+        .containing(tr.form_field_password_confirm)
+        .enterText(confirmPassword);
   }
 
   Future<void> tapTermsCheckbox() async {
diff --git a/designer_v2/integration_test/robots/study_info_robot.dart b/designer_v2/integration_test/robots/study_info_robot.dart
index 85944e89b..619faa960 100644
--- a/designer_v2/integration_test/robots/study_info_robot.dart
+++ b/designer_v2/integration_test/robots/study_info_robot.dart
@@ -14,90 +14,109 @@ class StudyInfoRobot {
 
   Future<void> enterStudyName(String studyName) async {
     await $(TextField)
-        .which<TextField>((widget) =>
-            widget.decoration is InputDecoration &&
-            widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_study_title,)
+        .which<TextField>(
+          (widget) =>
+              widget.decoration is InputDecoration &&
+              widget.decoration!.hintText != null &&
+              widget.decoration!.hintText! == tr.form_field_study_title,
+        )
         .scrollTo()
         .enterText(studyName);
   }
 
   Future<void> enterStudyDescription(String studyDescription) async {
     await $(TextField)
-        .which<TextField>((widget) =>
-            widget.decoration is InputDecoration &&
-            widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_study_description_hint,)
+        .which<TextField>(
+          (widget) =>
+              widget.decoration is InputDecoration &&
+              widget.decoration!.hintText != null &&
+              widget.decoration!.hintText! ==
+                  tr.form_field_study_description_hint,
+        )
         .scrollTo()
         .enterText(studyDescription);
   }
 
   Future<void> enterResponsibleOrg(String orgName) async {
     await $(TextField)
-        .which<TextField>((widget) =>
-            widget.decoration is InputDecoration &&
-            widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_organization,)
+        .which<TextField>(
+          (widget) =>
+              widget.decoration is InputDecoration &&
+              widget.decoration!.hintText != null &&
+              widget.decoration!.hintText! == tr.form_field_organization,
+        )
         .scrollTo()
         .enterText(orgName);
   }
 
   Future<void> enterInstitutionalReviewBoard(String irbName) async {
     await $(TextField)
-        .which<TextField>((widget) =>
-            widget.decoration is InputDecoration &&
-            widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_review_board,)
+        .which<TextField>(
+          (widget) =>
+              widget.decoration is InputDecoration &&
+              widget.decoration!.hintText != null &&
+              widget.decoration!.hintText! == tr.form_field_review_board,
+        )
         .scrollTo()
         .enterText(irbName);
   }
 
   Future<void> enterIRBProtocolNumber(String irbNumber) async {
     await $(TextField)
-        .which<TextField>((widget) =>
-            widget.decoration is InputDecoration &&
-            widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_review_board_number,)
+        .which<TextField>(
+          (widget) =>
+              widget.decoration is InputDecoration &&
+              widget.decoration!.hintText != null &&
+              widget.decoration!.hintText! == tr.form_field_review_board_number,
+        )
         .scrollTo()
         .enterText(irbNumber);
   }
 
   Future<void> enterResponsiblePerson(String personName) async {
     await $(TextField)
-        .which<TextField>((widget) =>
-            widget.decoration is InputDecoration &&
-            widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_researchers,)
+        .which<TextField>(
+          (widget) =>
+              widget.decoration is InputDecoration &&
+              widget.decoration!.hintText != null &&
+              widget.decoration!.hintText! == tr.form_field_researchers,
+        )
         .scrollTo()
         .enterText(personName);
   }
 
   Future<void> enterWebsite(String website) async {
     await $(TextField)
-        .which<TextField>((widget) =>
-            widget.decoration is InputDecoration &&
-            widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_website,)
+        .which<TextField>(
+          (widget) =>
+              widget.decoration is InputDecoration &&
+              widget.decoration!.hintText != null &&
+              widget.decoration!.hintText! == tr.form_field_website,
+        )
         .scrollTo()
         .enterText(website);
   }
 
   Future<void> enterContactEmail(String emailAddress) async {
     await $(TextField)
-        .which<TextField>((widget) =>
-            widget.decoration is InputDecoration &&
-            widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_contact_email,)
+        .which<TextField>(
+          (widget) =>
+              widget.decoration is InputDecoration &&
+              widget.decoration!.hintText != null &&
+              widget.decoration!.hintText! == tr.form_field_contact_email,
+        )
         .scrollTo()
         .enterText(emailAddress);
   }
 
   Future<void> enterContactPhone(String phoneNumber) async {
     await $(TextField)
-        .which<TextField>((widget) =>
-            widget.decoration is InputDecoration &&
-            widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_contact_phone,)
+        .which<TextField>(
+          (widget) =>
+              widget.decoration is InputDecoration &&
+              widget.decoration!.hintText != null &&
+              widget.decoration!.hintText! == tr.form_field_contact_phone,
+        )
         .scrollTo()
         .enterText(phoneNumber);
   }
diff --git a/designer_v2/integration_test/robots/study_interventions_robot.dart b/designer_v2/integration_test/robots/study_interventions_robot.dart
index ebbeebb8d..2d093ae07 100644
--- a/designer_v2/integration_test/robots/study_interventions_robot.dart
+++ b/designer_v2/integration_test/robots/study_interventions_robot.dart
@@ -26,40 +26,52 @@ class StudyInterventionsRobot {
 
   Future<void> enterInterventionName(String interventionName) async {
     await $(TextField)
-        .which<TextField>((widget) =>
-            widget.decoration is InputDecoration &&
-            widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_intervention_title,)
+        .which<TextField>(
+          (widget) =>
+              widget.decoration is InputDecoration &&
+              widget.decoration!.hintText != null &&
+              widget.decoration!.hintText! == tr.form_field_intervention_title,
+        )
         .scrollTo()
         .enterText(interventionName);
   }
 
-  Future<void> enterInterventionDesciption(String interventionDescription) async {
+  Future<void> enterInterventionDesciption(
+      String interventionDescription) async {
     await $(TextField)
-        .which<TextField>((widget) =>
-            widget.decoration is InputDecoration &&
-            widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_intervention_description_hint,)
+        .which<TextField>(
+          (widget) =>
+              widget.decoration is InputDecoration &&
+              widget.decoration!.hintText != null &&
+              widget.decoration!.hintText! ==
+                  tr.form_field_intervention_description_hint,
+        )
         .scrollTo()
         .enterText(interventionDescription);
   }
 
   Future<void> enterInterventionTaskName(String taskName) async {
     await $(TextField)
-        .which<TextField>((widget) =>
-            widget.decoration is InputDecoration &&
-            widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_intervention_task_title,)
+        .which<TextField>(
+          (widget) =>
+              widget.decoration is InputDecoration &&
+              widget.decoration!.hintText != null &&
+              widget.decoration!.hintText! ==
+                  tr.form_field_intervention_task_title,
+        )
         .scrollTo()
         .enterText(taskName);
   }
 
   Future<void> enterInterventionTaskDescription(String taskDescription) async {
     await $(TextField)
-        .which<TextField>((widget) =>
-            widget.decoration is InputDecoration &&
-            widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_intervention_task_description_hint,)
+        .which<TextField>(
+          (widget) =>
+              widget.decoration is InputDecoration &&
+              widget.decoration!.hintText != null &&
+              widget.decoration!.hintText! ==
+                  tr.form_field_intervention_task_description_hint,
+        )
         .scrollTo()
         .enterText(taskDescription);
   }
diff --git a/designer_v2/integration_test/robots/study_measurements_robot.dart b/designer_v2/integration_test/robots/study_measurements_robot.dart
index 900d34327..263a41123 100644
--- a/designer_v2/integration_test/robots/study_measurements_robot.dart
+++ b/designer_v2/integration_test/robots/study_measurements_robot.dart
@@ -26,50 +26,64 @@ class StudyMeasurementsRobot {
 
   Future<void> enterSurveyName(String surveyName) async {
     await $(TextField)
-        .which<TextField>((widget) =>
-            widget.decoration is InputDecoration &&
-            widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_measurement_survey_title,)
+        .which<TextField>(
+          (widget) =>
+              widget.decoration is InputDecoration &&
+              widget.decoration!.hintText != null &&
+              widget.decoration!.hintText! ==
+                  tr.form_field_measurement_survey_title,
+        )
         .scrollTo()
         .enterText(surveyName);
   }
 
   Future<void> enterSurveyIntroText(String introText) async {
     await $(TextField)
-        .which<TextField>((widget) =>
-            widget.decoration is InputDecoration &&
-            widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_measurement_survey_intro_text_hint,)
+        .which<TextField>(
+          (widget) =>
+              widget.decoration is InputDecoration &&
+              widget.decoration!.hintText != null &&
+              widget.decoration!.hintText! ==
+                  tr.form_field_measurement_survey_intro_text_hint,
+        )
         .scrollTo()
         .enterText(introText);
   }
 
   Future<void> enterSurveyOutroText(String outroText) async {
     await $(TextField)
-        .which<TextField>((widget) =>
-            widget.decoration is InputDecoration &&
-            widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_measurement_survey_outro_text_hint,)
+        .which<TextField>(
+          (widget) =>
+              widget.decoration is InputDecoration &&
+              widget.decoration!.hintText != null &&
+              widget.decoration!.hintText! ==
+                  tr.form_field_measurement_survey_outro_text_hint,
+        )
         .scrollTo()
         .enterText(outroText);
   }
 
   Future<void> enterSurveyQuestionText(String questionText) async {
     await $(TextField)
-        .which<TextField>((widget) =>
-            widget.decoration is InputDecoration &&
-            widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_field_question,)
+        .which<TextField>(
+          (widget) =>
+              widget.decoration is InputDecoration &&
+              widget.decoration!.hintText != null &&
+              widget.decoration!.hintText! == tr.form_field_question,
+        )
         .scrollTo()
         .enterText(questionText);
   }
 
   Future<void> enterSurveyQuestionOption1(String optionText) async {
     await $(TextField)
-        .which<TextField>((widget) =>
-            widget.decoration is InputDecoration &&
-            widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_array_response_options_choice_hint,)
+        .which<TextField>(
+          (widget) =>
+              widget.decoration is InputDecoration &&
+              widget.decoration!.hintText != null &&
+              widget.decoration!.hintText! ==
+                  tr.form_array_response_options_choice_hint,
+        )
         .at(0)
         .scrollTo()
         .enterText(optionText);
@@ -77,10 +91,13 @@ class StudyMeasurementsRobot {
 
   Future<void> enterSurveyQuestionOption2(String optionText) async {
     await $(TextField)
-        .which<TextField>((widget) =>
-            widget.decoration is InputDecoration &&
-            widget.decoration!.hintText != null &&
-            widget.decoration!.hintText! == tr.form_array_response_options_choice_hint,)
+        .which<TextField>(
+          (widget) =>
+              widget.decoration is InputDecoration &&
+              widget.decoration!.hintText != null &&
+              widget.decoration!.hintText! ==
+                  tr.form_array_response_options_choice_hint,
+        )
         .at(1)
         .scrollTo()
         .enterText(optionText);
diff --git a/designer_v2/lib/common_views/action_popup_menu.dart b/designer_v2/lib/common_views/action_popup_menu.dart
index b312f89b8..9dd5ff8bf 100644
--- a/designer_v2/lib/common_views/action_popup_menu.dart
+++ b/designer_v2/lib/common_views/action_popup_menu.dart
@@ -7,19 +7,20 @@ typedef ActionsProviderFor<T> = List<ModelAction> Function(T from);
 typedef ActionsProviderAt<T> = List<ModelAction> Function(T from, int idx);
 
 class ActionPopUpMenuButton extends StatelessWidget {
-  const ActionPopUpMenuButton(
-      {required this.actions,
-      this.orientation = Axis.horizontal,
-      this.elevation = 5,
-      this.splashRadius = 24.0,
-      this.triggerIconSize = 18.0,
-      this.position = PopupMenuPosition.under,
-      this.triggerIconColor,
-      this.triggerIconColorHover,
-      this.disableSplashEffect = false,
-      this.hideOnEmpty = true,
-      this.enabled = true,
-      super.key,});
+  const ActionPopUpMenuButton({
+    required this.actions,
+    this.orientation = Axis.horizontal,
+    this.elevation = 5,
+    this.splashRadius = 24.0,
+    this.triggerIconSize = 18.0,
+    this.position = PopupMenuPosition.under,
+    this.triggerIconColor,
+    this.triggerIconColorHover,
+    this.disableSplashEffect = false,
+    this.hideOnEmpty = true,
+    this.enabled = true,
+    super.key,
+  });
 
   final List<ModelAction> actions;
   final Color? triggerIconColor;
@@ -39,57 +40,71 @@ class ActionPopUpMenuButton extends StatelessWidget {
       return const SizedBox.shrink();
     }
 
-    return MouseEventsRegion(builder: (context, state) {
-      Widget widget = _buildPopupMenu(context, state);
+    return MouseEventsRegion(
+      builder: (context, state) {
+        Widget widget = _buildPopupMenu(context, state);
 
-      if (disableSplashEffect) {
-        final popupMenu = widget;
-        widget = Theme(
+        if (disableSplashEffect) {
+          final popupMenu = widget;
+          widget = Theme(
             data: Theme.of(context).copyWith(
               splashColor: Colors.transparent,
               highlightColor: Colors.transparent,
               hoverColor: Colors.transparent,
             ),
-            child: popupMenu,);
-      }
+            child: popupMenu,
+          );
+        }
 
-      return widget;
-    },);
+        return widget;
+      },
+    );
   }
 
   Widget _buildPopupMenu(BuildContext context, Set<WidgetState> state) {
     final theme = Theme.of(context);
     final isHovered = state.contains(WidgetState.hovered);
-    final iconColorDefault = triggerIconColor ?? theme.iconTheme.color!.withOpacity(0.7);
-    final iconColorHover = triggerIconColorHover ?? theme.iconTheme.color!.withOpacity(0.7);
-    final triggerIcon = (orientation == Axis.vertical) ? Icons.more_vert_rounded : Icons.more_horiz_rounded;
+    final iconColorDefault =
+        triggerIconColor ?? theme.iconTheme.color!.withOpacity(0.7);
+    final iconColorHover =
+        triggerIconColorHover ?? theme.iconTheme.color!.withOpacity(0.7);
+    final triggerIcon = (orientation == Axis.vertical)
+        ? Icons.more_vert_rounded
+        : Icons.more_horiz_rounded;
 
     return PopupMenuButton(
-        icon: Icon(triggerIcon, size: triggerIconSize, color: isHovered ? iconColorHover : iconColorDefault),
-        enabled: enabled,
-        elevation: elevation,
-        splashRadius: splashRadius,
-        position: position,
-        onSelected: (ModelAction action) => action.onExecute(),
-        itemBuilder: (BuildContext context) {
-          final textTheme = theme.textTheme.labelMedium!;
-          return actions.map((action) {
-            return PopupMenuItem(
-              value: action,
-              child: ListTile(
-                contentPadding: const EdgeInsets.symmetric(horizontal: 8.0),
-                horizontalTitleGap: 4.0,
-                leading: (action.icon == null)
-                    ? const SizedBox.shrink()
-                    : Icon(action.icon,
-                        size: theme.iconTheme.size ?? 14.0,
-                        color: action.isDestructive ? Colors.red : iconColorDefault,),
-                title: action.isDestructive
-                    ? Text(action.label, style: textTheme.copyWith(color: Colors.red))
-                    : Text(action.label, style: textTheme),
-              ),
-            );
-          }).toList();
-        },);
+      icon: Icon(triggerIcon,
+          size: triggerIconSize,
+          color: isHovered ? iconColorHover : iconColorDefault),
+      enabled: enabled,
+      elevation: elevation,
+      splashRadius: splashRadius,
+      position: position,
+      onSelected: (ModelAction action) => action.onExecute(),
+      itemBuilder: (BuildContext context) {
+        final textTheme = theme.textTheme.labelMedium!;
+        return actions.map((action) {
+          return PopupMenuItem(
+            value: action,
+            child: ListTile(
+              contentPadding: const EdgeInsets.symmetric(horizontal: 8.0),
+              horizontalTitleGap: 4.0,
+              leading: (action.icon == null)
+                  ? const SizedBox.shrink()
+                  : Icon(
+                      action.icon,
+                      size: theme.iconTheme.size ?? 14.0,
+                      color:
+                          action.isDestructive ? Colors.red : iconColorDefault,
+                    ),
+              title: action.isDestructive
+                  ? Text(action.label,
+                      style: textTheme.copyWith(color: Colors.red))
+                  : Text(action.label, style: textTheme),
+            ),
+          );
+        }).toList();
+      },
+    );
   }
 }
diff --git a/designer_v2/lib/common_views/async_value_widget.dart b/designer_v2/lib/common_views/async_value_widget.dart
index 63f732bfe..03a963ade 100644
--- a/designer_v2/lib/common_views/async_value_widget.dart
+++ b/designer_v2/lib/common_views/async_value_widget.dart
@@ -4,7 +4,13 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 /// Simple wrapper around [AsyncValue] to render standardized
 /// widgets for different states (loading, error, empty)
 class AsyncValueWidget<T> extends StatelessWidget {
-  const AsyncValueWidget({super.key, required this.value, required this.data, this.error, this.loading, this.empty});
+  const AsyncValueWidget(
+      {super.key,
+      required this.value,
+      required this.data,
+      this.error,
+      this.loading,
+      this.empty});
 
   final AsyncValue<T> value;
   final Widget Function(T) data;
@@ -28,7 +34,8 @@ class AsyncValueWidget<T> extends StatelessWidget {
       // Always render data widget if no empty state specified
       return data(unwrappedData);
     }
-    if (unwrappedData == null || (unwrappedData is List && unwrappedData.isEmpty)) {
+    if (unwrappedData == null ||
+        (unwrappedData is List && unwrappedData.isEmpty)) {
       return empty!();
     }
     return data(unwrappedData);
diff --git a/designer_v2/lib/common_views/badge.dart b/designer_v2/lib/common_views/badge.dart
index de46b62d3..ac7f021f2 100644
--- a/designer_v2/lib/common_views/badge.dart
+++ b/designer_v2/lib/common_views/badge.dart
@@ -32,47 +32,58 @@ class Badge extends StatelessWidget {
     final theme = Theme.of(context);
 
     return IntrinsicWidth(
-        child: Container(
-      decoration: BoxDecoration(
-        color: Colors.white, // solid background to paint over
-        borderRadius: BorderRadius.all(Radius.circular(borderRadius)),
-      ),
       child: Container(
         decoration: BoxDecoration(
-          color: _getBackgroundColor(theme),
+          color: Colors.white, // solid background to paint over
           borderRadius: BorderRadius.all(Radius.circular(borderRadius)),
-          border: Border.all(color: _getBorderColor(theme)),
         ),
-        child: Padding(
-          padding: padding,
-          child: Row(
-            mainAxisAlignment: center ? MainAxisAlignment.center : MainAxisAlignment.start,
-            children: [
-              if (icon != null) Icon(
-                      icon,
-                      size: iconSize ?? ((theme.iconTheme.size ?? 14.0) * 0.8),
-                      color: _getLabelColor(theme)?.faded(0.65),
-                    ) else const SizedBox.shrink(),
-              if (icon != null) const SizedBox(width: 8.0) else const SizedBox.shrink(),
-              Expanded(
+        child: Container(
+          decoration: BoxDecoration(
+            color: _getBackgroundColor(theme),
+            borderRadius: BorderRadius.all(Radius.circular(borderRadius)),
+            border: Border.all(color: _getBorderColor(theme)),
+          ),
+          child: Padding(
+            padding: padding,
+            child: Row(
+              mainAxisAlignment:
+                  center ? MainAxisAlignment.center : MainAxisAlignment.start,
+              children: [
+                if (icon != null)
+                  Icon(
+                    icon,
+                    size: iconSize ?? ((theme.iconTheme.size ?? 14.0) * 0.8),
+                    color: _getLabelColor(theme)?.faded(0.65),
+                  )
+                else
+                  const SizedBox.shrink(),
+                if (icon != null)
+                  const SizedBox(width: 8.0)
+                else
+                  const SizedBox.shrink(),
+                Expanded(
                   child: Text(
-                label,
-                softWrap: false,
-                maxLines: 1,
-                textAlign: TextAlign.center,
-                style: theme.textTheme.bodySmall
-                    ?.copyWith(
-                      fontSize: (theme.textTheme.bodySmall?.fontSize ?? 14.0) * 0.95,
-                      color: _getLabelColor(theme),
-                      fontWeight: FontWeight.bold,
-                    )
-                    .merge(labelStyle),
-              ),),
-            ],
+                    label,
+                    softWrap: false,
+                    maxLines: 1,
+                    textAlign: TextAlign.center,
+                    style: theme.textTheme.bodySmall
+                        ?.copyWith(
+                          fontSize:
+                              (theme.textTheme.bodySmall?.fontSize ?? 14.0) *
+                                  0.95,
+                          color: _getLabelColor(theme),
+                          fontWeight: FontWeight.bold,
+                        )
+                        .merge(labelStyle),
+                  ),
+                ),
+              ],
+            ),
           ),
         ),
       ),
-    ),);
+    );
   }
 
   Color? _getBackgroundColor(ThemeData theme) {
diff --git a/designer_v2/lib/common_views/collapse.dart b/designer_v2/lib/common_views/collapse.dart
index d1940047f..3905758ac 100644
--- a/designer_v2/lib/common_views/collapse.dart
+++ b/designer_v2/lib/common_views/collapse.dart
@@ -5,7 +5,8 @@ import 'package:studyu_designer_v2/common_views/utils.dart';
 
 import 'package:studyu_designer_v2/theme.dart';
 
-typedef CollapsibleSectionBuilder = Widget Function(BuildContext context, bool isCollapsed);
+typedef CollapsibleSectionBuilder = Widget Function(
+    BuildContext context, bool isCollapsed);
 
 /// Simple non-animated & more customizable alternative to [ExpansionPanel]
 /// and [ExpansionTile]
@@ -21,8 +22,11 @@ class Collapsible extends StatefulWidget {
     this.isCollapsed = true,
     this.maintainState = true,
     super.key,
-  }) : assert((headerBuilder != null && title == null) || (headerBuilder == null && title != null),
-            "Must provide either headerBuilder or title",);
+  }) : assert(
+          (headerBuilder != null && title == null) ||
+              (headerBuilder == null && title != null),
+          "Must provide either headerBuilder or title",
+        );
 
   final CollapsibleSectionBuilder contentBuilder;
   final CollapsibleSectionBuilder? headerBuilder;
@@ -62,8 +66,11 @@ class _CollapsibleState extends State<Collapsible> {
                   ),
                   const SizedBox(width: 4.0),
                   Icon(
-                    isCollapsed ? Icons.keyboard_arrow_right_rounded : Icons.keyboard_arrow_down_rounded,
-                    color: theme.tabBarTheme.labelColor?.faded(ThemeConfig.kMuteFadeFactor),
+                    isCollapsed
+                        ? Icons.keyboard_arrow_right_rounded
+                        : Icons.keyboard_arrow_down_rounded,
+                    color: theme.tabBarTheme.labelColor
+                        ?.faded(ThemeConfig.kMuteFadeFactor),
                   ),
                 ],
               ),
diff --git a/designer_v2/lib/common_views/constrained_flexible.dart b/designer_v2/lib/common_views/constrained_flexible.dart
index 0441f9033..01343db43 100644
--- a/designer_v2/lib/common_views/constrained_flexible.dart
+++ b/designer_v2/lib/common_views/constrained_flexible.dart
@@ -3,14 +3,15 @@ import 'package:flutter/widgets.dart';
 /// Taken from
 /// https://stackoverflow.com/questions/56417186/specific-min-and-max-size-for-expanded-widgets-in-column
 class ConstrainedWidthFlexible extends StatelessWidget {
-  const ConstrainedWidthFlexible(
-      {required this.minWidth,
-      required this.maxWidth,
-      required this.flex,
-      required this.flexSum,
-      required this.outerConstraints,
-      required this.child,
-      super.key,});
+  const ConstrainedWidthFlexible({
+    required this.minWidth,
+    required this.maxWidth,
+    required this.flex,
+    required this.flexSum,
+    required this.outerConstraints,
+    required this.child,
+    super.key,
+  });
 
   final double minWidth;
   final double maxWidth;
diff --git a/designer_v2/lib/common_views/dialog.dart b/designer_v2/lib/common_views/dialog.dart
index 579200342..54109da1a 100644
--- a/designer_v2/lib/common_views/dialog.dart
+++ b/designer_v2/lib/common_views/dialog.dart
@@ -93,8 +93,14 @@ class StandardDialog extends StatelessWidget {
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    if (titleWidget != null) titleWidget else const SizedBox.shrink(),
-                    if (titleWidget != null) SizedBox(height: padding.top * 2 / 3) else const SizedBox.shrink(),
+                    if (titleWidget != null)
+                      titleWidget
+                    else
+                      const SizedBox.shrink(),
+                    if (titleWidget != null)
+                      SizedBox(height: padding.top * 2 / 3)
+                    else
+                      const SizedBox.shrink(),
                     Expanded(
                       child: SingleChildScrollView(child: body),
                     ),
diff --git a/designer_v2/lib/common_views/form_buttons.dart b/designer_v2/lib/common_views/form_buttons.dart
index fdcb9a72b..3ed9b3d22 100644
--- a/designer_v2/lib/common_views/form_buttons.dart
+++ b/designer_v2/lib/common_views/form_buttons.dart
@@ -28,58 +28,76 @@ class DismissButton extends StatelessWidget {
   Widget build(BuildContext context) {
     assert(debugCheckHasMaterialLocalizations(context));
     return KeyboardListener(
-        focusNode: FocusNode(),
-        autofocus: true,
-        onKeyEvent: (key) {
-          if (key.logicalKey.keyLabel == "Escape") {
+      focusNode: FocusNode(),
+      autofocus: true,
+      onKeyEvent: (key) {
+        if (key.logicalKey.keyLabel == "Escape") {
+          Navigator.maybePop(context);
+        }
+      },
+      child: SecondaryButton(
+        text: text ?? tr.dialog_cancel,
+        icon: null,
+        //tooltip: MaterialLocalizations.of(context).closeButtonTooltip,
+        onPressed: () {
+          if (onPressed != null) {
+            onPressed!();
+          } else {
             Navigator.maybePop(context);
           }
         },
-        child: SecondaryButton(
-          text: text ?? tr.dialog_cancel,
-          icon: null,
-          //tooltip: MaterialLocalizations.of(context).closeButtonTooltip,
-          onPressed: () {
-            if (onPressed != null) {
-              onPressed!();
-            } else {
-              Navigator.maybePop(context);
-            }
-          },
-        ),);
+      ),
+    );
   }
 }
 
 List<Widget> buildFormButtons(FormViewModel formViewModel, FormMode formMode) {
   final modifyActionButtons = [
-    ReactiveFormConsumer(// enable re-rendering based on form validation status
-        builder: (context, form, child) {
-      return retainSizeInAppBar(DismissButton(
-        onPressed: () => formViewModel.cancel().then((_) => Navigator.maybePop(context)),
-      ),);
-    },),
-    ReactiveFormConsumer(// enable re-rendering based on form validation status
-        builder: (context, form, child) {
-      return retainSizeInAppBar(PrimaryButton(
-        text: tr.dialog_save,
-        tooltipDisabled: "${tr.form_invalid_prompt}\n\n${formViewModel.form.validationErrorSummary}",
-        icon: null,
-        enabled: formViewModel.isValid,
-        onPressedFuture: (formViewModel.isValid) ? () => formViewModel.save().then(
-            // Close the form (side sheet or scaffold route) if future
-            // completed successfully
-            (value) => Navigator.maybePop(context),) : null,
-      ),);
-    },),
+    ReactiveFormConsumer(
+      // enable re-rendering based on form validation status
+      builder: (context, form, child) {
+        return retainSizeInAppBar(
+          DismissButton(
+            onPressed: () =>
+                formViewModel.cancel().then((_) => Navigator.maybePop(context)),
+          ),
+        );
+      },
+    ),
+    ReactiveFormConsumer(
+      // enable re-rendering based on form validation status
+      builder: (context, form, child) {
+        return retainSizeInAppBar(
+          PrimaryButton(
+            text: tr.dialog_save,
+            tooltipDisabled:
+                "${tr.form_invalid_prompt}\n\n${formViewModel.form.validationErrorSummary}",
+            icon: null,
+            enabled: formViewModel.isValid,
+            onPressedFuture: (formViewModel.isValid)
+                ? () => formViewModel.save().then(
+                      // Close the form (side sheet or scaffold route) if future
+                      // completed successfully
+                      (value) => Navigator.maybePop(context),
+                    )
+                : null,
+          ),
+        );
+      },
+    ),
   ];
   final readonlyActionButtons = [
-    ReactiveFormConsumer(// enable re-rendering based on form validation status
-        builder: (context, form, child) {
-      return retainSizeInAppBar(DismissButton(
-        text: tr.dialog_close,
-        onPressed: () => Navigator.maybePop(context),
-      ),);
-    },),
+    ReactiveFormConsumer(
+      // enable re-rendering based on form validation status
+      builder: (context, form, child) {
+        return retainSizeInAppBar(
+          DismissButton(
+            text: tr.dialog_close,
+            onPressed: () => Navigator.maybePop(context),
+          ),
+        );
+      },
+    ),
   ];
 
   final defaultActionButtons = {
diff --git a/designer_v2/lib/common_views/form_consumer_widget.dart b/designer_v2/lib/common_views/form_consumer_widget.dart
index 82319ac42..3e27f4660 100644
--- a/designer_v2/lib/common_views/form_consumer_widget.dart
+++ b/designer_v2/lib/common_views/form_consumer_widget.dart
@@ -33,9 +33,11 @@ abstract class FormConsumerWidget extends StatefulWidget {
 class _FormConsumerWidgetState extends State<FormConsumerWidget> {
   @override
   Widget build(BuildContext context) {
-    return ReactiveFormConsumer(builder: (context, form, _) {
-      return widget.build(context, form);
-    },);
+    return ReactiveFormConsumer(
+      builder: (context, form, _) {
+        return widget.build(context, form);
+      },
+    );
   }
 }
 
@@ -47,14 +49,17 @@ abstract class FormConsumerRefWidget extends ConsumerStatefulWidget {
   Widget build(BuildContext context, FormGroup form, WidgetRef ref);
 
   @override
-  ConsumerState<FormConsumerRefWidget> createState() => _FormConsumerRefWidgetState();
+  ConsumerState<FormConsumerRefWidget> createState() =>
+      _FormConsumerRefWidgetState();
 }
 
 class _FormConsumerRefWidgetState extends ConsumerState<FormConsumerRefWidget> {
   @override
   Widget build(BuildContext context) {
-    return ReactiveFormConsumer(builder: (context, form, _) {
-      return widget.build(context, form, ref);
-    },);
+    return ReactiveFormConsumer(
+      builder: (context, form, _) {
+        return widget.build(context, form, ref);
+      },
+    );
   }
 }
diff --git a/designer_v2/lib/common_views/form_scaffold.dart b/designer_v2/lib/common_views/form_scaffold.dart
index 7d8e09bb6..d956618f3 100644
--- a/designer_v2/lib/common_views/form_scaffold.dart
+++ b/designer_v2/lib/common_views/form_scaffold.dart
@@ -11,12 +11,14 @@ import 'package:studyu_designer_v2/theme.dart';
 /// Signature for a builder that renders the widget corresponding to the
 /// [FormViewModel] of type [T]
 typedef FormViewBuilder<T extends FormViewModel> = Widget Function(
-    T formViewModel,);
+  T formViewModel,
+);
 
 /// Signature for a builder that resolves the [FormViewModel] of type [T]
 /// via a Riverpod [WidgetRef]
 typedef FormViewModelBuilder<T extends FormViewModel> = T Function(
-    WidgetRef ref,);
+  WidgetRef ref,
+);
 
 class FormScaffold<T extends FormViewModel> extends ConsumerStatefulWidget {
   const FormScaffold({
diff --git a/designer_v2/lib/common_views/form_table_layout.dart b/designer_v2/lib/common_views/form_table_layout.dart
index 12a1ccafa..eb16e38b0 100644
--- a/designer_v2/lib/common_views/form_table_layout.dart
+++ b/designer_v2/lib/common_views/form_table_layout.dart
@@ -57,19 +57,25 @@ class FormTableLayout extends StatelessWidget {
       final isTrailing = i == rows.length - 1;
 
       final bottomSpacing = (!isTrailing) ? 10.0 : 0.0;
-      final stateColorStyle =
-          (row.control != null && row.control!.disabled) ? TextStyle(color: theme.disabledColor) : null;
-      final actualRowLayout = row.layout ?? rowLayout ?? FormTableRowLayout.horizontal;
+      final stateColorStyle = (row.control != null && row.control!.disabled)
+          ? TextStyle(color: theme.disabledColor)
+          : null;
+      final actualRowLayout =
+          row.layout ?? rowLayout ?? FormTableRowLayout.horizontal;
 
       final labelWidget = (row.labelBuilder != null)
           ? row.labelBuilder!(context)
           : Wrap(
               children: [
-                if (actualRowLayout == FormTableRowLayout.vertical) const SizedBox(width: 2.0) else const SizedBox.shrink(),
+                if (actualRowLayout == FormTableRowLayout.vertical)
+                  const SizedBox(width: 2.0)
+                else
+                  const SizedBox.shrink(),
                 FormLabel(
                   labelText: row.label,
                   helpText: row.labelHelpText,
-                  labelTextStyle: rowLabelStyle?.merge(row.labelStyle) ?? row.labelStyle,
+                  labelTextStyle:
+                      rowLabelStyle?.merge(row.labelStyle) ?? row.labelStyle,
                   layout: row.layout,
                 ),
               ],
@@ -80,7 +86,9 @@ class FormTableLayout extends StatelessWidget {
         // Unfortunately need to override the theme here as a workaround to
         // change the text color for disabled controls
         child: Theme(
-          data: theme.copyWith(textTheme: TextTheme(titleMedium: inputTextTheme.merge(stateColorStyle))),
+          data: theme.copyWith(
+              textTheme: TextTheme(
+                  titleMedium: inputTextTheme.merge(stateColorStyle))),
           child: row.input,
         ),
       );
@@ -91,7 +99,8 @@ class FormTableLayout extends StatelessWidget {
         tableRow = TableRow(
           children: [
             Padding(
-              padding: EdgeInsets.only(top: 8.0, right: 8.0, bottom: bottomSpacing),
+              padding:
+                  EdgeInsets.only(top: 8.0, right: 8.0, bottom: bottomSpacing),
               child: labelWidget,
             ),
             Padding(
@@ -130,12 +139,13 @@ class FormTableLayout extends StatelessWidget {
     }
 
     return Table(
-      columnWidths: (rowLayout != null && rowLayout == FormTableRowLayout.vertical)
-          ? const {
-              0: FlexColumnWidth(),
-              1: FixedColumnWidth(0.0),
-            }
-          : columnWidths,
+      columnWidths:
+          (rowLayout != null && rowLayout == FormTableRowLayout.vertical)
+              ? const {
+                  0: FlexColumnWidth(),
+                  1: FixedColumnWidth(0.0),
+                }
+              : columnWidths,
       children: tableRows,
     );
   }
@@ -200,16 +210,28 @@ class FormLabel extends StatelessWidget {
   Widget build(BuildContext context) {
     return Wrap(
       children: [
-        if (labelText != null && layout == FormTableRowLayout.vertical) const SizedBox(width: 2.0) else const SizedBox.shrink(),
-        if (labelText != null) Text(
-                labelText!,
-                style: Theme.of(context).textTheme.bodySmall?.merge(labelTextStyle),
-              ) else const SizedBox.shrink(),
-        if (helpText != null) const SizedBox(width: 8.0) else const SizedBox.shrink(),
-        if (helpText != null) Padding(
-                padding: const EdgeInsets.only(top: 2.0),
-                child: HelpIcon(tooltipText: helpText),
-              ) else const SizedBox.shrink(),
+        if (labelText != null && layout == FormTableRowLayout.vertical)
+          const SizedBox(width: 2.0)
+        else
+          const SizedBox.shrink(),
+        if (labelText != null)
+          Text(
+            labelText!,
+            style: Theme.of(context).textTheme.bodySmall?.merge(labelTextStyle),
+          )
+        else
+          const SizedBox.shrink(),
+        if (helpText != null)
+          const SizedBox(width: 8.0)
+        else
+          const SizedBox.shrink(),
+        if (helpText != null)
+          Padding(
+            padding: const EdgeInsets.only(top: 2.0),
+            child: HelpIcon(tooltipText: helpText),
+          )
+        else
+          const SizedBox.shrink(),
       ],
     );
   }
diff --git a/designer_v2/lib/common_views/icons.dart b/designer_v2/lib/common_views/icons.dart
index 0dbc58a16..735cb07b5 100644
--- a/designer_v2/lib/common_views/icons.dart
+++ b/designer_v2/lib/common_views/icons.dart
@@ -14,7 +14,8 @@ class HelpIcon extends StatelessWidget {
       message: tooltipText,
       child: MouseEventsRegion(
         builder: (context, states) {
-          final iconColor = theme.iconTheme.color?.withOpacity((states.contains(WidgetState.hovered)) ? 0.6 : 0.35) ??
+          final iconColor = theme.iconTheme.color?.withOpacity(
+                  (states.contains(WidgetState.hovered)) ? 0.6 : 0.35) ??
               theme.colorScheme.onSurface.withOpacity(0.3);
           return Icon(
             Icons.help_outline_rounded,
diff --git a/designer_v2/lib/common_views/layout_two_column.dart b/designer_v2/lib/common_views/layout_two_column.dart
index 9fb86c0d6..05777f2c7 100644
--- a/designer_v2/lib/common_views/layout_two_column.dart
+++ b/designer_v2/lib/common_views/layout_two_column.dart
@@ -139,7 +139,9 @@ class _TwoColumnLayoutState extends State<TwoColumnLayout> {
             thumbVisibility: true,
             controller: _scrollControllerLeft,
             child: SingleChildScrollView(
-                controller: _scrollControllerLeft, child: leftWidget,),
+              controller: _scrollControllerLeft,
+              child: leftWidget,
+            ),
           );
         }
         if (widget.scrollRight) {
@@ -147,14 +149,18 @@ class _TwoColumnLayoutState extends State<TwoColumnLayout> {
             thumbVisibility: true,
             controller: _scrollControllerRight,
             child: SingleChildScrollView(
-                controller: _scrollControllerRight, child: rightWidget,),
+              controller: _scrollControllerRight,
+              child: rightWidget,
+            ),
           );
         }
 
         if (!(widget.constraintsLeft != null && widget.flexLeft != null)) {
           if (widget.constraintsLeft != null) {
             leftWidget = Container(
-                constraints: widget.constraintsLeft, child: leftWidget,);
+              constraints: widget.constraintsLeft,
+              child: leftWidget,
+            );
           }
           if (widget.flexLeft != null) {
             leftWidget = Flexible(flex: widget.flexLeft!, child: leftWidget);
@@ -164,7 +170,9 @@ class _TwoColumnLayoutState extends State<TwoColumnLayout> {
         if (!(widget.constraintsRight != null && widget.flexRight != null)) {
           if (widget.constraintsRight != null) {
             rightWidget = Container(
-                constraints: widget.constraintsRight, child: rightWidget,);
+              constraints: widget.constraintsRight,
+              child: rightWidget,
+            );
           }
           if (widget.flexRight != null) {
             rightWidget = Flexible(flex: widget.flexRight!, child: rightWidget);
diff --git a/designer_v2/lib/common_views/mouse_events.dart b/designer_v2/lib/common_views/mouse_events.dart
index cbcdfcbe1..6863caf3e 100644
--- a/designer_v2/lib/common_views/mouse_events.dart
+++ b/designer_v2/lib/common_views/mouse_events.dart
@@ -2,7 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 typedef MouseEventsRegionBuilder = Widget Function(
-    BuildContext context, Set<WidgetState> state);
+  BuildContext context,
+  Set<WidgetState> state,
+);
 
 typedef MaterialStatesChangedCallback = void Function(Set<WidgetState> state);
 
diff --git a/designer_v2/lib/common_views/pages/error_page.dart b/designer_v2/lib/common_views/pages/error_page.dart
index 6666f42a0..d74f49fe1 100644
--- a/designer_v2/lib/common_views/pages/error_page.dart
+++ b/designer_v2/lib/common_views/pages/error_page.dart
@@ -17,7 +17,8 @@ class ErrorPage extends ConsumerWidget {
         children: [
           SelectableText(error.toString()),
           TextButton(
-            onPressed: () => ref.read(routerProvider).dispatch(RoutingIntents.studies),
+            onPressed: () =>
+                ref.read(routerProvider).dispatch(RoutingIntents.studies),
             child: Text(tr.navlink_error_home),
           ),
         ],
diff --git a/designer_v2/lib/common_views/range_slider.dart b/designer_v2/lib/common_views/range_slider.dart
index 8d484a08a..ea0b32f34 100644
--- a/designer_v2/lib/common_views/range_slider.dart
+++ b/designer_v2/lib/common_views/range_slider.dart
@@ -31,7 +31,8 @@ class IndicatorRangeSliderThumbShape<T> extends RangeSliderThumbShape {
     if (thumb == null) return;
 
     final Canvas canvas = context.canvas;
-    canvas.drawCircle(center, 9, Paint()..color = Theme.of(buildContext).colorScheme.primary);
+    canvas.drawCircle(
+        center, 9, Paint()..color = Theme.of(buildContext).colorScheme.primary);
     final value = thumb == Thumb.start ? start : end;
 
     // Customize the box style
@@ -48,8 +49,10 @@ class IndicatorRangeSliderThumbShape<T> extends RangeSliderThumbShape {
 
     // Calculate text size and position
     final text = value.toString();
-    final textSpan = TextSpan(text: text, style: const TextStyle(color: Colors.white));
-    final textPainter = TextPainter(text: textSpan, textDirection: textDirection ?? TextDirection.ltr);
+    final textSpan =
+        TextSpan(text: text, style: const TextStyle(color: Colors.white));
+    final textPainter = TextPainter(
+        text: textSpan, textDirection: textDirection ?? TextDirection.ltr);
     textPainter.layout();
 
     // Calculate the box size with padding
@@ -60,10 +63,14 @@ class IndicatorRangeSliderThumbShape<T> extends RangeSliderThumbShape {
     final textOffset = center + Offset(-textPainter.width / 2, 15);
 
     // Draw the rounded rectangle box with border centered around the text
-    final boxOffset = textOffset + Offset(textPainter.width / 2 - boxWidth / 2, textPainter.height / 2 - boxHeight / 2);
-    final boxRect = Rect.fromLTWH(boxOffset.dx, boxOffset.dy, boxWidth, boxHeight);
+    final boxOffset = textOffset +
+        Offset(textPainter.width / 2 - boxWidth / 2,
+            textPainter.height / 2 - boxHeight / 2);
+    final boxRect =
+        Rect.fromLTWH(boxOffset.dx, boxOffset.dy, boxWidth, boxHeight);
     canvas.drawRRect(RRect.fromRectAndRadius(boxRect, borderRadius), boxPaint);
-    canvas.drawRRect(RRect.fromRectAndRadius(boxRect, borderRadius), borderPaint);
+    canvas.drawRRect(
+        RRect.fromRectAndRadius(boxRect, borderRadius), borderPaint);
 
     // Draw the text inside the box
     textPainter.paint(canvas, textOffset);
diff --git a/designer_v2/lib/common_views/secondary_button.dart b/designer_v2/lib/common_views/secondary_button.dart
index e61cbdb6e..8d6372003 100644
--- a/designer_v2/lib/common_views/secondary_button.dart
+++ b/designer_v2/lib/common_views/secondary_button.dart
@@ -41,7 +41,9 @@ class SecondaryButton extends StatelessWidget {
     return OutlinedButton(
       style: secondaryStyle,
       onPressed: onPressed,
-      child: isLoading ? const CircularProgressIndicator() : Text(text, textAlign: TextAlign.center),
+      child: isLoading
+          ? const CircularProgressIndicator()
+          : Text(text, textAlign: TextAlign.center),
     );
   }
 }
diff --git a/designer_v2/lib/common_views/sidesheet/sidesheet.dart b/designer_v2/lib/common_views/sidesheet/sidesheet.dart
index ee84b5861..fbfcaf090 100644
--- a/designer_v2/lib/common_views/sidesheet/sidesheet.dart
+++ b/designer_v2/lib/common_views/sidesheet/sidesheet.dart
@@ -27,12 +27,16 @@ class Sidesheet extends StatefulWidget {
     this.withCloseButton = false,
     this.ignoreAppBar = true,
     this.collapseSingleTab = false,
-    this.bodyPadding = const EdgeInsets.symmetric(vertical: 32.0, horizontal: 48.0),
+    this.bodyPadding =
+        const EdgeInsets.symmetric(vertical: 32.0, horizontal: 48.0),
     this.wrapContent,
     super.key,
-  })  : assert((body != null && tabs == null) || (body == null && tabs != null),
-            "Must provide either body or tabs to build sidesheet content",),
-        assert(tabs == null || tabs.length >= 1, "Must provide at least one tab to build sidesheet content");
+  })  : assert(
+          (body != null && tabs == null) || (body == null && tabs != null),
+          "Must provide either body or tabs to build sidesheet content",
+        ),
+        assert(tabs == null || tabs.length >= 1,
+            "Must provide at least one tab to build sidesheet content");
 
   final String titleText;
   final Widget? body;
@@ -78,7 +82,8 @@ class _SidesheetState extends State<Sidesheet> {
         : 0;
     final actualHeight = screen.size.height - exceptionalHeight;
 
-    final backgroundColor = ThemeConfig.sidesheetBackgroundColor(Theme.of(context));
+    final backgroundColor =
+        ThemeConfig.sidesheetBackgroundColor(Theme.of(context));
 
     return Align(
       alignment: Alignment.bottomLeft,
@@ -107,12 +112,15 @@ class _SidesheetState extends State<Sidesheet> {
     );
   }
 
-  Container _build(BuildContext context, Widget? body, List<SidesheetTab>? tabs) {
+  Container _build(
+      BuildContext context, Widget? body, List<SidesheetTab>? tabs) {
     final theme = Theme.of(context);
-    final backgroundColor = ThemeConfig.sidesheetBackgroundColor(Theme.of(context));
+    final backgroundColor =
+        ThemeConfig.sidesheetBackgroundColor(Theme.of(context));
 
     final hasTabs = tabs != null;
-    final isCollapsed = tabs != null && tabs.length == 1 && widget.collapseSingleTab;
+    final isCollapsed =
+        tabs != null && tabs.length == 1 && widget.collapseSingleTab;
 
     final innerBody = (body != null)
         ? body
@@ -120,16 +128,19 @@ class _SidesheetState extends State<Sidesheet> {
             ? selectedTab!.builder(context)
             : const SizedBox.shrink();
 
-    final actualWrapContent = widget.wrapContent ?? (widget) => widget; // default to identity no-op
+    final actualWrapContent =
+        widget.wrapContent ?? (widget) => widget; // default to identity no-op
 
     final tabBarLabelHoverColor =
-        (theme.tabBarTheme.labelColor ?? theme.tabBarTheme.labelStyle?.color)?.faded(ThemeConfig.kHoverFadeFactor);
+        (theme.tabBarTheme.labelColor ?? theme.tabBarTheme.labelStyle?.color)
+            ?.faded(ThemeConfig.kHoverFadeFactor);
 
     return Container(
       decoration: BoxDecoration(
         border: Border(
           left: BorderSide(
-            color: (theme.dividerTheme.color ?? theme.dividerColor).withOpacity(0.1),
+            color: (theme.dividerTheme.color ?? theme.dividerColor)
+                .withOpacity(0.1),
           ),
         ),
       ),
@@ -149,36 +160,50 @@ class _SidesheetState extends State<Sidesheet> {
                 children: [
                   SelectableText(
                     widget.titleText,
-                    style: theme.textTheme.headlineSmall!.copyWith(fontWeight: FontWeight.normal),
+                    style: theme.textTheme.headlineSmall!
+                        .copyWith(fontWeight: FontWeight.normal),
                   ),
-                  if (widget.actionButtons != null) Wrap(spacing: 8.0, children: widget.actionButtons!) else const SizedBox.shrink(),
+                  if (widget.actionButtons != null)
+                    Wrap(spacing: 8.0, children: widget.actionButtons!)
+                  else
+                    const SizedBox.shrink(),
                 ],
               ),
             ),
-            if (hasTabs && !isCollapsed) Padding(
-                    padding: EdgeInsets.symmetric(horizontal: (widget.bodyPadding?.horizontal ?? 0) * 0.5),
-                    child: TabbedNavbar<SidesheetTab>(
-                      tabs: tabs,
-                      height: 38.0,
-                      onSelect: _onTabChange,
-                      labelPadding: EdgeInsets.zero,
-                      labelSpacing: 24.0,
-                      isScrollable: true,
-                      indicatorSize: TabBarIndicatorSize.label,
-                      backgroundColor: backgroundColor,
-                      overlayColor: WidgetStateColor.resolveWith(
-                        (states) => Colors.transparent,
-                      ),
-                      labelColorHover: tabBarLabelHoverColor,
-                      unselectedLabelColorHover: tabBarLabelHoverColor,
-                    ),
-                  ) else const SizedBox.shrink(),
-            if (hasTabs && !isCollapsed) const Divider(height: 1) else const Divider(),
+            if (hasTabs && !isCollapsed)
+              Padding(
+                padding: EdgeInsets.symmetric(
+                    horizontal: (widget.bodyPadding?.horizontal ?? 0) * 0.5),
+                child: TabbedNavbar<SidesheetTab>(
+                  tabs: tabs,
+                  height: 38.0,
+                  onSelect: _onTabChange,
+                  labelPadding: EdgeInsets.zero,
+                  labelSpacing: 24.0,
+                  isScrollable: true,
+                  indicatorSize: TabBarIndicatorSize.label,
+                  backgroundColor: backgroundColor,
+                  overlayColor: WidgetStateColor.resolveWith(
+                    (states) => Colors.transparent,
+                  ),
+                  labelColorHover: tabBarLabelHoverColor,
+                  unselectedLabelColorHover: tabBarLabelHoverColor,
+                ),
+              )
+            else
+              const SizedBox.shrink(),
+            if (hasTabs && !isCollapsed)
+              const Divider(height: 1)
+            else
+              const Divider(),
             Flexible(
               child: SingleChildScrollView(
                 child: Column(
                   children: [
-                    if (hasTabs && !isCollapsed) const SizedBox(height: 12.0) else const SizedBox.shrink(),
+                    if (hasTabs && !isCollapsed)
+                      const SizedBox(height: 12.0)
+                    else
+                      const SizedBox.shrink(),
                     Padding(
                       padding: EdgeInsets.fromLTRB(
                         (widget.bodyPadding?.horizontal ?? 0) * 0.5,
@@ -219,7 +244,8 @@ Future<T?> showModalSideSheet<T extends Object?>({
   assert(!barrierDismissible || barrierLabel != null);
   return showGeneralDialog(
     barrierDismissible: barrierDismissible,
-    barrierColor: barrierColor ?? ThemeConfig.modalBarrierColor(Theme.of(context)),
+    barrierColor:
+        barrierColor ?? ThemeConfig.modalBarrierColor(Theme.of(context)),
     transitionDuration: transitionDuration,
     barrierLabel: barrierLabel,
     useRootNavigator: useRootNavigator,
@@ -237,7 +263,8 @@ Future<T?> showModalSideSheet<T extends Object?>({
     ),
     transitionBuilder: (_, animation, __, child) {
       return SlideTransition(
-        position: Tween<Offset>(begin: const Offset(-1, 0), end: Offset.zero).animate(animation),
+        position: Tween<Offset>(begin: const Offset(-1, 0), end: Offset.zero)
+            .animate(animation),
         child: child,
       );
     },
diff --git a/designer_v2/lib/common_views/studyu_logo.dart b/designer_v2/lib/common_views/studyu_logo.dart
index b0cd65472..810f14e2e 100644
--- a/designer_v2/lib/common_views/studyu_logo.dart
+++ b/designer_v2/lib/common_views/studyu_logo.dart
@@ -10,21 +10,25 @@ class StudyULogo extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return MouseEventsRegion(
-        builder: (context, states) {
-          final isHovered = states.contains(WidgetState.hovered);
-          final colorBlendFactor = isHovered ? 0.5 : 0.6;
+      builder: (context, states) {
+        final isHovered = states.contains(WidgetState.hovered);
+        final colorBlendFactor = isHovered ? 0.5 : 0.6;
 
-          return Container(
-            foregroundDecoration: BoxDecoration(
-              color: Theme.of(context).colorScheme.primary.withOpacity(colorBlendFactor),
-              backgroundBlendMode: BlendMode.color,
-            ),
-            child: Image.asset(
-              Assets.logoWide,
-              fit: BoxFit.scaleDown,
-            ),
-          );
-        },
-        onTap: onTap,);
+        return Container(
+          foregroundDecoration: BoxDecoration(
+            color: Theme.of(context)
+                .colorScheme
+                .primary
+                .withOpacity(colorBlendFactor),
+            backgroundBlendMode: BlendMode.color,
+          ),
+          child: Image.asset(
+            Assets.logoWide,
+            fit: BoxFit.scaleDown,
+          ),
+        );
+      },
+      onTap: onTap,
+    );
   }
 }
diff --git a/designer_v2/lib/common_views/styling_information.dart b/designer_v2/lib/common_views/styling_information.dart
index 2c51b3b2e..e6ceb0ae5 100644
--- a/designer_v2/lib/common_views/styling_information.dart
+++ b/designer_v2/lib/common_views/styling_information.dart
@@ -5,7 +5,8 @@ import 'package:studyu_designer_v2/common_views/text_paragraph.dart';
 import 'package:studyu_designer_v2/theme.dart';
 
 class HtmlStylingBanner extends StatelessWidget {
-  const HtmlStylingBanner({this.isDismissed = false, this.onDismissed, super.key});
+  const HtmlStylingBanner(
+      {this.isDismissed = false, this.onDismissed, super.key});
 
   final bool isDismissed;
   final Function()? onDismissed;
@@ -40,45 +41,58 @@ class HtmlStylingBanner extends StatelessWidget {
                 },
                 defaultVerticalAlignment: TableCellVerticalAlignment.middle,
                 children: [
-                  TableRow(children: [
-                    const Text('Make your text bold'),
-                    Text('<b>Bold text</b>', style: ThemeConfig.bodyTextMuted(theme)),
-                  ],),
-                  TableRow(children: [
-                    const Text('Add a hyperlink'),
-                    Text(
-                      '<a href="http://example.org">A hyperlink</a>',
-                      style: ThemeConfig.bodyTextMuted(theme),
-                    ),
-                  ],),
-                  TableRow(children: [
-                    const Text('Make your text colorful'),
-                    Text(
-                      '<span style="color: red">Red text</span>',
-                      style: ThemeConfig.bodyTextMuted(theme),
-                    ),
-                  ],),
-                  TableRow(children: [
-                    const Text('Add an image'),
-                    Text(
-                      '<img width="100" src="<link>" />',
-                      style: ThemeConfig.bodyTextMuted(theme),
-                    ),
-                  ],),
-                  TableRow(children: [
-                    const Text('Add a video'),
-                    Text(
-                      '<video controls width="100" src="<link>" />',
-                      style: ThemeConfig.bodyTextMuted(theme),
-                    ),
-                  ],),
-                  TableRow(children: [
-                    const Text('Add an audio message'),
-                    Text(
-                      '<audio controls src="<link>" />',
-                      style: ThemeConfig.bodyTextMuted(theme),
-                    ),
-                  ],),
+                  TableRow(
+                    children: [
+                      const Text('Make your text bold'),
+                      Text('<b>Bold text</b>',
+                          style: ThemeConfig.bodyTextMuted(theme)),
+                    ],
+                  ),
+                  TableRow(
+                    children: [
+                      const Text('Add a hyperlink'),
+                      Text(
+                        '<a href="http://example.org">A hyperlink</a>',
+                        style: ThemeConfig.bodyTextMuted(theme),
+                      ),
+                    ],
+                  ),
+                  TableRow(
+                    children: [
+                      const Text('Make your text colorful'),
+                      Text(
+                        '<span style="color: red">Red text</span>',
+                        style: ThemeConfig.bodyTextMuted(theme),
+                      ),
+                    ],
+                  ),
+                  TableRow(
+                    children: [
+                      const Text('Add an image'),
+                      Text(
+                        '<img width="100" src="<link>" />',
+                        style: ThemeConfig.bodyTextMuted(theme),
+                      ),
+                    ],
+                  ),
+                  TableRow(
+                    children: [
+                      const Text('Add a video'),
+                      Text(
+                        '<video controls width="100" src="<link>" />',
+                        style: ThemeConfig.bodyTextMuted(theme),
+                      ),
+                    ],
+                  ),
+                  TableRow(
+                    children: [
+                      const Text('Add an audio message'),
+                      Text(
+                        '<audio controls src="<link>" />',
+                        style: ThemeConfig.bodyTextMuted(theme),
+                      ),
+                    ],
+                  ),
                 ],
               ),
             ),
diff --git a/designer_v2/lib/common_views/sync_indicator.dart b/designer_v2/lib/common_views/sync_indicator.dart
index fb7878792..3388da6f4 100644
--- a/designer_v2/lib/common_views/sync_indicator.dart
+++ b/designer_v2/lib/common_views/sync_indicator.dart
@@ -30,7 +30,8 @@ class SyncIndicator<T> extends StatefulWidget {
   State<SyncIndicator> createState() => _SyncIndicatorState();
 }
 
-class _SyncIndicatorState extends State<SyncIndicator> with SingleTickerProviderStateMixin {
+class _SyncIndicatorState extends State<SyncIndicator>
+    with SingleTickerProviderStateMixin {
   late final AnimationController _animationController;
   late final Animation<double> _animation;
 
@@ -88,7 +89,8 @@ class _SyncIndicatorState extends State<SyncIndicator> with SingleTickerProvider
 
     if (!widget.isDirty && widget.lastSynced != null) {
       dataWidget = Tooltip(
-        message: "${tr.sync_done}\n\n${tr.sync_last_saved}: ${widget.lastSynced!.toTimeAgoStringPrecise()}",
+        message:
+            "${tr.sync_done}\n\n${tr.sync_last_saved}: ${widget.lastSynced!.toTimeAgoStringPrecise()}",
         child: Icon(
           Icons.check_circle_rounded,
           size: widget.iconSize,
diff --git a/designer_v2/lib/common_views/text_hyperlink.dart b/designer_v2/lib/common_views/text_hyperlink.dart
index 407744809..235055b53 100644
--- a/designer_v2/lib/common_views/text_hyperlink.dart
+++ b/designer_v2/lib/common_views/text_hyperlink.dart
@@ -20,8 +20,10 @@ class Hyperlink extends StatefulWidget {
     this.icon,
     this.iconSize,
     super.key,
-  }) : assert((url != null && onClick == null) || (url == null && onClick != null),
-            "Must provide either url or onClick handler",);
+  }) : assert(
+          (url != null && onClick == null) || (url == null && onClick != null),
+          "Must provide either url or onClick handler",
+        );
 
   final String text;
   final String? url;
@@ -54,14 +56,19 @@ class _HyperlinkState extends State<Hyperlink> {
         final isHovered = states.contains(WidgetState.hovered);
 
         final visitedColor = widget.visitedColor ?? widget.linkColor;
-        final visitedHoverColor = widget.hoverColor ?? visitedColor.faded(ThemeConfig.kHoverFadeFactor);
-        final hoverColor = widget.hoverColor ?? widget.linkColor.faded(ThemeConfig.kHoverFadeFactor);
+        final visitedHoverColor = widget.hoverColor ??
+            visitedColor.faded(ThemeConfig.kHoverFadeFactor);
+        final hoverColor = widget.hoverColor ??
+            widget.linkColor.faded(ThemeConfig.kHoverFadeFactor);
 
-        final actualColor =
-            isVisited ? (isHovered ? visitedHoverColor : visitedColor) : (isHovered ? hoverColor : widget.linkColor);
+        final actualColor = isVisited
+            ? (isHovered ? visitedHoverColor : visitedColor)
+            : (isHovered ? hoverColor : widget.linkColor);
 
-        final textTheme = theme.textTheme.titleSmall ?? theme.textTheme.bodyLarge;
-        TextStyle? actualStyle = textTheme?.copyWith(color: actualColor).merge(widget.style);
+        final textTheme =
+            theme.textTheme.titleSmall ?? theme.textTheme.bodyLarge;
+        TextStyle? actualStyle =
+            textTheme?.copyWith(color: actualColor).merge(widget.style);
 
         if (isVisited) {
           actualStyle = actualStyle?.merge(widget.visitedStyle);
@@ -75,7 +82,9 @@ class _HyperlinkState extends State<Hyperlink> {
         if (widget.icon != null) {
           return Row(
             children: [
-              Icon(widget.icon, color: actualColor, size: widget.iconSize ?? (textTheme?.fontSize ?? 14.0) + 4.0),
+              Icon(widget.icon,
+                  color: actualColor,
+                  size: widget.iconSize ?? (textTheme?.fontSize ?? 14.0) + 4.0),
               const SizedBox(width: 2.0),
               textWidget,
             ],
diff --git a/designer_v2/lib/common_views/text_paragraph.dart b/designer_v2/lib/common_views/text_paragraph.dart
index 895dd4277..5a3185497 100644
--- a/designer_v2/lib/common_views/text_paragraph.dart
+++ b/designer_v2/lib/common_views/text_paragraph.dart
@@ -1,7 +1,8 @@
 import 'package:flutter/material.dart';
 
 class TextParagraph extends StatelessWidget {
-  TextParagraph({this.text, this.style, this.selectable = true, this.span, super.key}) {
+  TextParagraph(
+      {this.text, this.style, this.selectable = true, this.span, super.key}) {
     if (text == null && span == null) {
       throw Exception("Either text or TextSpan has to be provided");
     }
diff --git a/designer_v2/lib/common_views/under_construction.dart b/designer_v2/lib/common_views/under_construction.dart
index 64f28c30e..512318833 100644
--- a/designer_v2/lib/common_views/under_construction.dart
+++ b/designer_v2/lib/common_views/under_construction.dart
@@ -8,11 +8,12 @@ class UnderConstruction extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Opacity(
-        opacity: 0.7,
-        child: EmptyBody(
-          icon: Icons.construction_rounded,
-          title: tr.under_construction,
-          description: tr.under_construction_description,
-        ),);
+      opacity: 0.7,
+      child: EmptyBody(
+        icon: Icons.construction_rounded,
+        title: tr.under_construction,
+        description: tr.under_construction_description,
+      ),
+    );
   }
 }
diff --git a/designer_v2/lib/common_views/utils.dart b/designer_v2/lib/common_views/utils.dart
index c80672e00..dc98d1530 100644
--- a/designer_v2/lib/common_views/utils.dart
+++ b/designer_v2/lib/common_views/utils.dart
@@ -2,7 +2,8 @@ import 'package:flutter/widgets.dart';
 
 typedef WidgetDecorator = Widget Function(Widget widget);
 
-List<Widget> withSpacing(List<Widget> widgets, {required double spacing, double? paddingStart, double? paddingEnd}) {
+List<Widget> withSpacing(List<Widget> widgets,
+    {required double spacing, double? paddingStart, double? paddingEnd}) {
   final List<Widget> results = [];
   if (paddingStart != null) {
     results.add(SizedBox(height: paddingStart, width: paddingStart));
diff --git a/designer_v2/lib/domain/study.dart b/designer_v2/lib/domain/study.dart
index d9f93717c..92e1ed23a 100644
--- a/designer_v2/lib/domain/study.dart
+++ b/designer_v2/lib/domain/study.dart
@@ -144,8 +144,10 @@ extension StudyDuplicateX on Study {
     return copy;
   }
 
-  Study copyJsonIgnoredAttributes(
-      {required Study from, bool createdAt = false,}) {
+  Study copyJsonIgnoredAttributes({
+    required Study from,
+    bool createdAt = false,
+  }) {
     participantCount = from.participantCount;
     activeSubjectCount = from.activeSubjectCount;
     endedCount = from.endedCount;
diff --git a/designer_v2/lib/domain/study_invite.dart b/designer_v2/lib/domain/study_invite.dart
index 371fbad74..85f1b3a77 100644
--- a/designer_v2/lib/domain/study_invite.dart
+++ b/designer_v2/lib/domain/study_invite.dart
@@ -1,5 +1,7 @@
 import 'package:studyu_core/core.dart';
 
 extension StudyInviteX on StudyInvite {
-  bool get hasPreconfiguredSchedule => preselectedInterventionIds != null && preselectedInterventionIds!.isNotEmpty;
+  bool get hasPreconfiguredSchedule =>
+      preselectedInterventionIds != null &&
+      preselectedInterventionIds!.isNotEmpty;
 }
diff --git a/designer_v2/lib/features/account/account_settings.dart b/designer_v2/lib/features/account/account_settings.dart
index ec23f13db..626296332 100644
--- a/designer_v2/lib/features/account/account_settings.dart
+++ b/designer_v2/lib/features/account/account_settings.dart
@@ -14,26 +14,29 @@ class AccountSettingsDialog extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return PointerInterceptor(
-        child: StandardDialog(
-      titleText: tr.navlink_account_settings,
-      body: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          const SizedBox(height: 16.0),
-          FormTableLayout(
-            rows: [
-              FormTableRow(
-                label: tr.language,
-                input: const Align(alignment: Alignment.centerRight, child: LanguagePicker()),
-              ),
-            ],
-          ),
-        ],
+      child: StandardDialog(
+        titleText: tr.navlink_account_settings,
+        body: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            const SizedBox(height: 16.0),
+            FormTableLayout(
+              rows: [
+                FormTableRow(
+                  label: tr.language,
+                  input: const Align(
+                      alignment: Alignment.centerRight,
+                      child: LanguagePicker()),
+                ),
+              ],
+            ),
+          ],
+        ),
+        actionButtons: [DismissButton(text: tr.dialog_close)],
+        minWidth: 650,
+        maxWidth: 750,
+        minHeight: 450,
       ),
-      actionButtons: [DismissButton(text: tr.dialog_close)],
-      minWidth: 650,
-      maxWidth: 750,
-      minHeight: 450,
-    ),);
+    );
   }
 }
diff --git a/designer_v2/lib/features/analyze/study_analyze_controller_state.dart b/designer_v2/lib/features/analyze/study_analyze_controller_state.dart
index bdb75c239..92b9a0a5e 100644
--- a/designer_v2/lib/features/analyze/study_analyze_controller_state.dart
+++ b/designer_v2/lib/features/analyze/study_analyze_controller_state.dart
@@ -11,7 +11,8 @@ class StudyAnalyzeControllerState extends StudyControllerBaseState {
 
   bool get canExport => study.value?.canExport(currentUser!) ?? false;
 
-  String get exportDisabledReason => study.value?.exportDisabledReason(currentUser!) ?? '';
+  String get exportDisabledReason =>
+      study.value?.exportDisabledReason(currentUser!) ?? '';
 
   @override
   StudyAnalyzeControllerState copyWith({
diff --git a/designer_v2/lib/features/analyze/study_analyze_page.dart b/designer_v2/lib/features/analyze/study_analyze_page.dart
index 6db3b6d02..6d9f16b72 100644
--- a/designer_v2/lib/features/analyze/study_analyze_page.dart
+++ b/designer_v2/lib/features/analyze/study_analyze_page.dart
@@ -18,15 +18,17 @@ class StudyAnalyzeScreen extends StudyPageWidget {
 
     if (state.isDraft) {
       return BannerBox(
-          noPrefix: true,
-          body: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                TextParagraph(
-                  text: tr.banner_text_study_analyze_draft,
-                ),
-              ],),
-          style: BannerStyle.info,);
+        noPrefix: true,
+        body: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            TextParagraph(
+              text: tr.banner_text_study_analyze_draft,
+            ),
+          ],
+        ),
+        style: BannerStyle.info,
+      );
     }
 
     return null;
@@ -35,7 +37,8 @@ class StudyAnalyzeScreen extends StudyPageWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final theme = Theme.of(context);
-    final controller = ref.watch(studyAnalyzeControllerProvider(studyId).notifier);
+    final controller =
+        ref.watch(studyAnalyzeControllerProvider(studyId).notifier);
     final state = ref.watch(studyAnalyzeControllerProvider(studyId));
 
     return Column(
@@ -45,7 +48,8 @@ class StudyAnalyzeScreen extends StudyPageWidget {
           color: ThemeConfig.containerColor(theme),
           width: double.infinity,
           child: Padding(
-            padding: const EdgeInsets.symmetric(vertical: 18.0, horizontal: 48.0),
+            padding:
+                const EdgeInsets.symmetric(vertical: 18.0, horizontal: 48.0),
             child: Wrap(
               crossAxisAlignment: WrapCrossAlignment.center,
               children: [
@@ -67,12 +71,13 @@ class StudyAnalyzeScreen extends StudyPageWidget {
         ),
         const SizedBox(height: 32.0),
         Container(
-            width: double.infinity,
-            color: theme.colorScheme.secondary.withOpacity(0.03),
-            height: 300,
-            child: const Center(
-              child: UnderConstruction(),
-            ),),
+          width: double.infinity,
+          color: theme.colorScheme.secondary.withOpacity(0.03),
+          height: 300,
+          child: const Center(
+            child: UnderConstruction(),
+          ),
+        ),
       ],
     );
   }
diff --git a/designer_v2/lib/features/analyze/study_export_zip.dart b/designer_v2/lib/features/analyze/study_export_zip.dart
index 59b2a7dcd..00e04776a 100644
--- a/designer_v2/lib/features/analyze/study_export_zip.dart
+++ b/designer_v2/lib/features/analyze/study_export_zip.dart
@@ -36,7 +36,8 @@ extension StudyExportZipX on StudyExportData {
 
   Future<List<int>?> get encodedZip async => ZipEncoder().encode(await archive);
 
-  String get defaultFilename => '${study.title?.toKey() ?? ''}_${DateTime.now()}';
+  String get defaultFilename =>
+      '${study.title?.toKey() ?? ''}_${DateTime.now()}';
 
   Future downloadAsZip({String? filename}) async {
     filename ??= defaultFilename;
@@ -48,7 +49,8 @@ extension StudyExportZipX on StudyExportData {
 }
 
 extension StudyExportX on Study {
-  bool canExport(User user) => !exportData.isEmpty && (canEdit(user) || publishedToRegistryResults);
+  bool canExport(User user) =>
+      !exportData.isEmpty && (canEdit(user) || publishedToRegistryResults);
 
   String? exportDisabledReason(User user) {
     if (canExport(user)) return null;
diff --git a/designer_v2/lib/features/app.dart b/designer_v2/lib/features/app.dart
index 48f6a5dec..7d741854e 100644
--- a/designer_v2/lib/features/app.dart
+++ b/designer_v2/lib/features/app.dart
@@ -38,13 +38,15 @@ class AppContent extends ConsumerStatefulWidget {
 class _AppContentState extends ConsumerState<AppContent> {
   late final AppController appController;
 
-  final settings = ValueNotifier(ThemeSettings(
-    //sourceColor: Color(0xff2a4fda),
-    //sourceColor: Color(0xff583aee),
-    sourceColor: const Color(0xff4845e5),
-    //sourceColor: const Color(0xff2962ff),
-    themeMode: ThemeMode.system,
-  ),);
+  final settings = ValueNotifier(
+    ThemeSettings(
+      //sourceColor: Color(0xff2a4fda),
+      //sourceColor: Color(0xff583aee),
+      sourceColor: const Color(0xff4845e5),
+      //sourceColor: const Color(0xff2962ff),
+      themeMode: ThemeMode.system,
+    ),
+  );
 
   @override
   void initState() {
@@ -60,7 +62,8 @@ class _AppContentState extends ConsumerState<AppContent> {
 
   @override
   Widget build(BuildContext context) {
-    AppTranslation.init(ref); // todo Refactor this into initState locale delegate if possible
+    AppTranslation.init(
+        ref); // todo Refactor this into initState locale delegate if possible
     final router = ref.watch(routerProvider);
 
     return DynamicColorBuilder(
diff --git a/designer_v2/lib/features/auth/auth_scaffold.dart b/designer_v2/lib/features/auth/auth_scaffold.dart
index 28566bfb2..e55c42cbf 100644
--- a/designer_v2/lib/features/auth/auth_scaffold.dart
+++ b/designer_v2/lib/features/auth/auth_scaffold.dart
@@ -71,7 +71,8 @@ class _AuthScaffoldState extends ConsumerState<AuthScaffold> {
                     padding: const EdgeInsets.only(left: 12.0),
                     child: Container(
                       constraints: BoxConstraints(
-                          maxWidth: widget.leftContentMinWidth - 24.0,),
+                        maxWidth: widget.leftContentMinWidth - 24.0,
+                      ),
                       child: Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
@@ -107,7 +108,8 @@ class _AuthScaffoldState extends ConsumerState<AuthScaffold> {
                   padding: const EdgeInsets.only(left: 12.0),
                   child: Container(
                     constraints: BoxConstraints(
-                        maxWidth: widget.leftPanelMinWidth - 12 * 2,),
+                      maxWidth: widget.leftPanelMinWidth - 12 * 2,
+                    ),
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
diff --git a/designer_v2/lib/features/dashboard/dashboard_page.dart b/designer_v2/lib/features/dashboard/dashboard_page.dart
index e47ee155c..8f45277f5 100644
--- a/designer_v2/lib/features/dashboard/dashboard_page.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_page.dart
@@ -64,58 +64,69 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                 ),
               ),
               const SizedBox(width: 28.0),
-              SelectableText(state.visibleListTitle, style: theme.textTheme.headlineMedium),
+              SelectableText(state.visibleListTitle,
+                  style: theme.textTheme.headlineMedium),
               const SizedBox(width: 28.0),
               Expanded(
-                  child: Align(
-                      alignment: Alignment.centerRight,
-                      child: Container(
-                        constraints: const BoxConstraints(maxWidth: 400),
-                        child: Search(
-                            searchController: controller.searchController,
-                            hintText: tr.search,
-                            onQueryChanged: (query) => controller.filterStudies(query),),
-                      ),),),
+                child: Align(
+                  alignment: Alignment.centerRight,
+                  child: Container(
+                    constraints: const BoxConstraints(maxWidth: 400),
+                    child: Search(
+                      searchController: controller.searchController,
+                      hintText: tr.search,
+                      onQueryChanged: (query) =>
+                          controller.filterStudies(query),
+                    ),
+                  ),
+                ),
+              ),
             ],
           ),
           const SizedBox(height: 24.0), // spacing between body elements
           FutureBuilder<StudyUUser>(
-              future: userRepo.fetchUser(), // todo cache this with ModelRepository
-              builder: (context, snapshot) {
-                if (snapshot.hasData) {
-                  return AsyncValueWidget<List<Study>>(
-                      value: state.displayedStudies(snapshot.data!.preferences.pinnedStudies, state.query),
-                      data: (visibleStudies) => StudiesTable(
-                            studies: visibleStudies,
-                            pinnedStudies: snapshot.data!.preferences.pinnedStudies,
-                            dashboardController: ref.read(dashboardControllerProvider.notifier),
-                            onSelect: controller.onSelectStudy,
-                            getActions: controller.availableActions,
-                            emptyWidget: (widget.filter == null || widget.filter == StudiesFilter.owned)
-                                ? (state.query.isNotEmpty)
-                                    ? Padding(
-                                        padding: const EdgeInsets.only(top: 24.0),
-                                        child: EmptyBody(
-                                          icon: Icons.content_paste_search_rounded,
-                                          title: tr.studies_not_found,
-                                          description: tr.modify_query,
-                                        ),
-                                      )
-                                    : Padding(
-                                        padding: const EdgeInsets.only(top: 24.0),
-                                        child: EmptyBody(
-                                          icon: Icons.content_paste_search_rounded,
-                                          title: tr.studies_empty,
-                                          description: tr.studies_empty_description,
-                                          // "...or create a new draft copy from an already published study!",
-                                          /* button: PrimaryButton(text: "From template",); */
-                                        ),
-                                      )
-                                : const SizedBox.shrink(),
-                          ),);
-                }
-                return const SizedBox.shrink();
-              },),
+            future:
+                userRepo.fetchUser(), // todo cache this with ModelRepository
+            builder: (context, snapshot) {
+              if (snapshot.hasData) {
+                return AsyncValueWidget<List<Study>>(
+                  value: state.displayedStudies(
+                      snapshot.data!.preferences.pinnedStudies, state.query),
+                  data: (visibleStudies) => StudiesTable(
+                    studies: visibleStudies,
+                    pinnedStudies: snapshot.data!.preferences.pinnedStudies,
+                    dashboardController:
+                        ref.read(dashboardControllerProvider.notifier),
+                    onSelect: controller.onSelectStudy,
+                    getActions: controller.availableActions,
+                    emptyWidget: (widget.filter == null ||
+                            widget.filter == StudiesFilter.owned)
+                        ? (state.query.isNotEmpty)
+                            ? Padding(
+                                padding: const EdgeInsets.only(top: 24.0),
+                                child: EmptyBody(
+                                  icon: Icons.content_paste_search_rounded,
+                                  title: tr.studies_not_found,
+                                  description: tr.modify_query,
+                                ),
+                              )
+                            : Padding(
+                                padding: const EdgeInsets.only(top: 24.0),
+                                child: EmptyBody(
+                                  icon: Icons.content_paste_search_rounded,
+                                  title: tr.studies_empty,
+                                  description: tr.studies_empty_description,
+                                  // "...or create a new draft copy from an already published study!",
+                                  /* button: PrimaryButton(text: "From template",); */
+                                ),
+                              )
+                        : const SizedBox.shrink(),
+                  ),
+                );
+              }
+              return const SizedBox.shrink();
+            },
+          ),
         ],
       ),
     );
diff --git a/designer_v2/lib/features/dashboard/dashboard_scaffold.dart b/designer_v2/lib/features/dashboard/dashboard_scaffold.dart
index 5b7140a3e..fa9a1e1a7 100644
--- a/designer_v2/lib/features/dashboard/dashboard_scaffold.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_scaffold.dart
@@ -15,25 +15,28 @@ class DashboardScaffold extends StatelessWidget {
     final size = MediaQuery.of(context).size;
     final isCompact = size.width < compactWidthThreshold;
     return Scaffold(
-        backgroundColor: Theme.of(context).scaffoldBackgroundColor.faded(0.75),
-        appBar: isCompact
-            ? AppBar(
-                title: Image.asset(
-                  Assets.logoWide,
-                  height: 40,
-                ),
-              )
-            : null,
-        drawer: isCompact ? const AppDrawer() : null,
-        body: TwoColumnLayout(
-          leftWidget: isCompact ? const SizedBox.shrink() : const AppDrawer(autoCloseDrawer: false),
-          rightWidget: body,
-          dividerWidget: const VerticalDivider(
-            width: 1,
-            thickness: 0.3,
-          ),
-          scrollLeft: false,
-          paddingLeft: null,
-        ),);
+      backgroundColor: Theme.of(context).scaffoldBackgroundColor.faded(0.75),
+      appBar: isCompact
+          ? AppBar(
+              title: Image.asset(
+                Assets.logoWide,
+                height: 40,
+              ),
+            )
+          : null,
+      drawer: isCompact ? const AppDrawer() : null,
+      body: TwoColumnLayout(
+        leftWidget: isCompact
+            ? const SizedBox.shrink()
+            : const AppDrawer(autoCloseDrawer: false),
+        rightWidget: body,
+        dividerWidget: const VerticalDivider(
+          width: 1,
+          thickness: 0.3,
+        ),
+        scrollLeft: false,
+        paddingLeft: null,
+      ),
+    );
   }
 }
diff --git a/designer_v2/lib/features/dashboard/dashboard_state.dart b/designer_v2/lib/features/dashboard/dashboard_state.dart
index d7fe6c5a5..1eea47767 100644
--- a/designer_v2/lib/features/dashboard/dashboard_state.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_state.dart
@@ -44,12 +44,15 @@ class DashboardState extends Equatable {
   ///
   /// Wrapped in an [AsyncValue] that mirrors the [studies]' async states,
   /// but resolves to a different subset of studies based on the [studiesFilter]
-  AsyncValue<List<Study>> displayedStudies(Set<String> pinnedStudies, String query) {
+  AsyncValue<List<Study>> displayedStudies(
+      Set<String> pinnedStudies, String query) {
     return studies.when(
       data: (studies) {
-        List<Study> updatedStudies = studiesFilter.apply(studies: studies, user: currentUser).toList();
+        List<Study> updatedStudies =
+            studiesFilter.apply(studies: studies, user: currentUser).toList();
         updatedStudies = filter(studiesToFilter: updatedStudies);
-        updatedStudies = sort(pinnedStudies: pinnedStudies, studiesToSort: updatedStudies);
+        updatedStudies =
+            sort(pinnedStudies: pinnedStudies, studiesToSort: updatedStudies);
         return AsyncValue.data(updatedStudies);
       },
       error: (error, _) => AsyncValue.error(error, StackTrace.current),
@@ -60,55 +63,72 @@ class DashboardState extends Equatable {
   List<Study> filter({List<Study>? studiesToFilter}) {
     final filteredStudies = studiesToFilter ?? studies.value!;
     if (query.isNotEmpty) {
-      return filteredStudies.where((s) => s.title!.toLowerCase().contains(query)).toList();
+      return filteredStudies
+          .where((s) => s.title!.toLowerCase().contains(query))
+          .toList();
     }
     return filteredStudies;
   }
 
-  List<Study> sort({required Set<String> pinnedStudies, List<Study>? studiesToSort}) {
+  List<Study> sort(
+      {required Set<String> pinnedStudies, List<Study>? studiesToSort}) {
     final sortedStudies = studiesToSort ?? studies.value!;
     switch (sortByColumn) {
       case StudiesTableColumn.title:
         if (sortAscending) {
-          sortedStudies.sort((study, other) => study.title!.compareTo(other.title!));
+          sortedStudies
+              .sort((study, other) => study.title!.compareTo(other.title!));
         } else {
-          sortedStudies.sort((study, other) => other.title!.compareTo(study.title!));
+          sortedStudies
+              .sort((study, other) => other.title!.compareTo(study.title!));
         }
       case StudiesTableColumn.status:
         if (sortAscending) {
-          sortedStudies.sort((study, other) => study.status.index.compareTo(other.status.index));
+          sortedStudies.sort((study, other) =>
+              study.status.index.compareTo(other.status.index));
         } else {
-          sortedStudies.sort((study, other) => other.status.index.compareTo(study.status.index));
+          sortedStudies.sort((study, other) =>
+              other.status.index.compareTo(study.status.index));
         }
       case StudiesTableColumn.participation:
         if (sortAscending) {
-          sortedStudies.sort((study, other) => study.participation.index.compareTo(other.participation.index));
+          sortedStudies.sort((study, other) =>
+              study.participation.index.compareTo(other.participation.index));
         } else {
-          sortedStudies.sort((study, other) => other.participation.index.compareTo(study.participation.index));
+          sortedStudies.sort((study, other) =>
+              other.participation.index.compareTo(study.participation.index));
         }
       case StudiesTableColumn.createdAt:
         if (sortAscending) {
-          sortedStudies.sort((study, other) => study.createdAt!.compareTo(other.createdAt!));
+          sortedStudies.sort(
+              (study, other) => study.createdAt!.compareTo(other.createdAt!));
         } else {
-          sortedStudies.sort((study, other) => other.createdAt!.compareTo(study.createdAt!));
+          sortedStudies.sort(
+              (study, other) => other.createdAt!.compareTo(study.createdAt!));
         }
       case StudiesTableColumn.enrolled:
         if (sortAscending) {
-          sortedStudies.sort((study, other) => study.participantCount.compareTo(other.participantCount));
+          sortedStudies.sort((study, other) =>
+              study.participantCount.compareTo(other.participantCount));
         } else {
-          sortedStudies.sort((study, other) => other.participantCount.compareTo(study.participantCount));
+          sortedStudies.sort((study, other) =>
+              other.participantCount.compareTo(study.participantCount));
         }
       case StudiesTableColumn.active:
         if (sortAscending) {
-          sortedStudies.sort((study, other) => study.activeSubjectCount.compareTo(other.activeSubjectCount));
+          sortedStudies.sort((study, other) =>
+              study.activeSubjectCount.compareTo(other.activeSubjectCount));
         } else {
-          sortedStudies.sort((study, other) => other.activeSubjectCount.compareTo(study.activeSubjectCount));
+          sortedStudies.sort((study, other) =>
+              other.activeSubjectCount.compareTo(study.activeSubjectCount));
         }
       case StudiesTableColumn.completed:
         if (sortAscending) {
-          sortedStudies.sort((study, other) => study.endedCount.compareTo(other.endedCount));
+          sortedStudies.sort(
+              (study, other) => study.endedCount.compareTo(other.endedCount));
         } else {
-          sortedStudies.sort((study, other) => other.endedCount.compareTo(study.endedCount));
+          sortedStudies.sort(
+              (study, other) => other.endedCount.compareTo(study.endedCount));
         }
       case StudiesTableColumn.pin:
       case StudiesTableColumn.action:
@@ -141,12 +161,14 @@ class DashboardState extends Equatable {
     bool? sortAscending,
   }) {
     return DashboardState(
-        studies: studies != null ? studies() : this.studies,
-        studiesFilter: studiesFilter != null ? studiesFilter() : this.studiesFilter,
-        currentUser: currentUser != null ? currentUser() : this.currentUser,
-        query: query ?? this.query,
-        sortByColumn: sortByColumn ?? this.sortByColumn,
-        sortAscending: sortAscending ?? this.sortAscending,);
+      studies: studies != null ? studies() : this.studies,
+      studiesFilter:
+          studiesFilter != null ? studiesFilter() : this.studiesFilter,
+      currentUser: currentUser != null ? currentUser() : this.currentUser,
+      query: query ?? this.query,
+      sortByColumn: sortByColumn ?? this.sortByColumn,
+      sortAscending: sortAscending ?? this.sortAscending,
+    );
   }
 
   // - Equatable
diff --git a/designer_v2/lib/features/dashboard/studies_filter.dart b/designer_v2/lib/features/dashboard/studies_filter.dart
index 78d0ae8d5..5e9482494 100644
--- a/designer_v2/lib/features/dashboard/studies_filter.dart
+++ b/designer_v2/lib/features/dashboard/studies_filter.dart
@@ -5,7 +5,8 @@ import 'package:supabase_flutter/supabase_flutter.dart';
 enum StudiesFilter with GoRouteParamEnum { all, owned, shared, public }
 
 extension StudiesFilterByUser on StudiesFilter {
-  Iterable<Study> apply({required Iterable<Study> studies, required User user}) {
+  Iterable<Study> apply(
+      {required Iterable<Study> studies, required User user}) {
     switch (this) {
       case StudiesFilter.all:
         return studies;
@@ -15,7 +16,8 @@ extension StudiesFilterByUser on StudiesFilter {
         return studies.where((s) => s.isEditor(user));
       case StudiesFilter.public:
         // show studies published to registry irrespective of their status
-        return studies.where((s) => s.registryPublished || s.resultSharing == ResultSharing.public);
+        return studies.where((s) =>
+            s.registryPublished || s.resultSharing == ResultSharing.public);
     }
   }
 }
diff --git a/designer_v2/lib/features/dashboard/studies_table.dart b/designer_v2/lib/features/dashboard/studies_table.dart
index 73145f22d..09b6ab5d6 100644
--- a/designer_v2/lib/features/dashboard/studies_table.dart
+++ b/designer_v2/lib/features/dashboard/studies_table.dart
@@ -9,7 +9,17 @@ import 'package:studyu_designer_v2/features/dashboard/studies_table_column_heade
 import 'package:studyu_designer_v2/features/dashboard/studies_table_item.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 
-enum StudiesTableColumn { pin, title, status, participation, createdAt, enrolled, active, completed, action }
+enum StudiesTableColumn {
+  pin,
+  title,
+  status,
+  participation,
+  createdAt,
+  enrolled,
+  active,
+  completed,
+  action
+}
 
 class StudiesTableColumnSize {
   final bool collapsed;
@@ -74,38 +84,53 @@ class StudiesTable extends StatelessWidget {
     return LayoutBuilder(
       builder: (context, constraints) {
         final isCompact = constraints.maxWidth < compactWidthThreshold;
-        final isSuperCompact = constraints.maxWidth < superCompactWidthThreshold;
-        final isCompactStatTitle = constraints.maxWidth < compactStatTitleThreshold;
+        final isSuperCompact =
+            constraints.maxWidth < superCompactWidthThreshold;
+        final isCompactStatTitle =
+            constraints.maxWidth < compactStatTitleThreshold;
         // Calculate the minimum stat column width
-        final int maxStatTitleLength =
-            isCompactStatTitle ? "Completed".length : tr.studies_list_header_participants_completed.length;
+        final int maxStatTitleLength = isCompactStatTitle
+            ? "Completed".length
+            : tr.studies_list_header_participants_completed.length;
         final double statsColumnWidth = maxStatTitleLength * 9.9;
 
         // Calculate the minimum status column width
         int maxStatusLength = "Entwurf".length;
-        maxStatusLength = max(maxStatusLength, tr.studies_list_header_status.length);
+        maxStatusLength =
+            max(maxStatusLength, tr.studies_list_header_status.length);
         final double statusColumnWidth = maxStatusLength * 11.5;
 
         // Calculate the minimum participation column width
-        final int maxParticipationLength = isCompact ? "Invite-only".length : tr.participation_invite_who.length;
-        maxStatusLength = max(maxStatusLength, tr.studies_list_header_participation.length);
-        final double participationColumnWidth = 20 + (maxParticipationLength * 7.5);
+        final int maxParticipationLength = isCompact
+            ? "Invite-only".length
+            : tr.participation_invite_who.length;
+        maxStatusLength =
+            max(maxStatusLength, tr.studies_list_header_participation.length);
+        final double participationColumnWidth =
+            20 + (maxParticipationLength * 7.5);
 
         // Set column definitions
         final columnDefinitionsMap = {
           StudiesTableColumn.pin: StudiesTableColumnSize.fixedWidth(itemHeight),
           StudiesTableColumn.title: StudiesTableColumnSize.flexWidth(24),
-          StudiesTableColumn.status: StudiesTableColumnSize.fixedWidth(statusColumnWidth),
-          StudiesTableColumn.participation: StudiesTableColumnSize.fixedWidth(participationColumnWidth),
-          StudiesTableColumn.createdAt:
-              isSuperCompact ? StudiesTableColumnSize.collapsed() : StudiesTableColumnSize.flexWidth(10),
-          StudiesTableColumn.enrolled:
-              isCompact ? StudiesTableColumnSize.collapsed() : StudiesTableColumnSize.fixedWidth(statsColumnWidth),
-          StudiesTableColumn.active:
-              isCompact ? StudiesTableColumnSize.collapsed() : StudiesTableColumnSize.fixedWidth(statsColumnWidth),
-          StudiesTableColumn.completed:
-              isCompact ? StudiesTableColumnSize.collapsed() : StudiesTableColumnSize.fixedWidth(statsColumnWidth),
-          StudiesTableColumn.action: StudiesTableColumnSize.fixedWidth(itemHeight),
+          StudiesTableColumn.status:
+              StudiesTableColumnSize.fixedWidth(statusColumnWidth),
+          StudiesTableColumn.participation:
+              StudiesTableColumnSize.fixedWidth(participationColumnWidth),
+          StudiesTableColumn.createdAt: isSuperCompact
+              ? StudiesTableColumnSize.collapsed()
+              : StudiesTableColumnSize.flexWidth(10),
+          StudiesTableColumn.enrolled: isCompact
+              ? StudiesTableColumnSize.collapsed()
+              : StudiesTableColumnSize.fixedWidth(statsColumnWidth),
+          StudiesTableColumn.active: isCompact
+              ? StudiesTableColumnSize.collapsed()
+              : StudiesTableColumnSize.fixedWidth(statsColumnWidth),
+          StudiesTableColumn.completed: isCompact
+              ? StudiesTableColumnSize.collapsed()
+              : StudiesTableColumnSize.fixedWidth(statsColumnWidth),
+          StudiesTableColumn.action:
+              StudiesTableColumnSize.fixedWidth(itemHeight),
         };
         final columnDefinitions = columnDefinitionsMap.entries.toList();
 
@@ -115,41 +140,68 @@ class StudiesTable extends StatelessWidget {
               height: itemHeight,
               child: Row(
                 children: [
-                  columnDefinitions[0].value.createContainer(child: _buildColumnHeader(columnDefinitions[0].key)),
+                  columnDefinitions[0].value.createContainer(
+                      child: _buildColumnHeader(columnDefinitions[0].key)),
                   SizedBox(
-                    width: columnDefinitions[0].value.collapsed ? 0 : columnSpacing,
+                    width: columnDefinitions[0].value.collapsed
+                        ? 0
+                        : columnSpacing,
                   ),
-                  columnDefinitions[1].value.createContainer(child: _buildColumnHeader(columnDefinitions[1].key)),
+                  columnDefinitions[1].value.createContainer(
+                      child: _buildColumnHeader(columnDefinitions[1].key)),
                   SizedBox(
-                    width: columnDefinitions[1].value.collapsed ? 0 : columnSpacing,
+                    width: columnDefinitions[1].value.collapsed
+                        ? 0
+                        : columnSpacing,
                   ),
-                  columnDefinitions[2].value.createContainer(child: _buildColumnHeader(columnDefinitions[2].key)),
+                  columnDefinitions[2].value.createContainer(
+                      child: _buildColumnHeader(columnDefinitions[2].key)),
                   SizedBox(
-                    width: columnDefinitions[2].value.collapsed ? 0 : columnSpacing,
+                    width: columnDefinitions[2].value.collapsed
+                        ? 0
+                        : columnSpacing,
                   ),
-                  columnDefinitions[3].value.createContainer(child: _buildColumnHeader(columnDefinitions[3].key)),
+                  columnDefinitions[3].value.createContainer(
+                      child: _buildColumnHeader(columnDefinitions[3].key)),
                   SizedBox(
-                    width: columnDefinitions[3].value.collapsed ? 0 : columnSpacing,
+                    width: columnDefinitions[3].value.collapsed
+                        ? 0
+                        : columnSpacing,
                   ),
-                  columnDefinitions[4].value.createContainer(child: _buildColumnHeader(columnDefinitions[4].key)),
+                  columnDefinitions[4].value.createContainer(
+                      child: _buildColumnHeader(columnDefinitions[4].key)),
                   SizedBox(
-                    width: columnDefinitions[4].value.collapsed ? 0 : columnSpacing,
+                    width: columnDefinitions[4].value.collapsed
+                        ? 0
+                        : columnSpacing,
                   ),
-                  columnDefinitions[5].value.createContainer(child: _buildColumnHeader(columnDefinitions[5].key)),
+                  columnDefinitions[5].value.createContainer(
+                      child: _buildColumnHeader(columnDefinitions[5].key)),
                   SizedBox(
-                    width: columnDefinitions[5].value.collapsed ? 0 : columnSpacing,
+                    width: columnDefinitions[5].value.collapsed
+                        ? 0
+                        : columnSpacing,
                   ),
-                  columnDefinitions[6].value.createContainer(child: _buildColumnHeader(columnDefinitions[6].key)),
+                  columnDefinitions[6].value.createContainer(
+                      child: _buildColumnHeader(columnDefinitions[6].key)),
                   SizedBox(
-                    width: columnDefinitions[6].value.collapsed ? 0 : columnSpacing,
+                    width: columnDefinitions[6].value.collapsed
+                        ? 0
+                        : columnSpacing,
                   ),
-                  columnDefinitions[7].value.createContainer(child: _buildColumnHeader(columnDefinitions[7].key)),
+                  columnDefinitions[7].value.createContainer(
+                      child: _buildColumnHeader(columnDefinitions[7].key)),
                   SizedBox(
-                    width: columnDefinitions[7].value.collapsed ? 0 : columnSpacing,
+                    width: columnDefinitions[7].value.collapsed
+                        ? 0
+                        : columnSpacing,
                   ),
-                  columnDefinitions[8].value.createContainer(child: _buildColumnHeader(columnDefinitions[8].key)),
+                  columnDefinitions[8].value.createContainer(
+                      child: _buildColumnHeader(columnDefinitions[8].key)),
                   SizedBox(
-                    width: columnDefinitions[8].value.collapsed ? 0 : columnSpacing,
+                    width: columnDefinitions[8].value.collapsed
+                        ? 0
+                        : columnSpacing,
                   ),
                 ],
               ),
@@ -207,7 +259,8 @@ class StudiesTable extends StatelessWidget {
     }
 
     final sortAscending = dashboardController.isSortAscending;
-    final sortable = !(column == StudiesTableColumn.pin || column == StudiesTableColumn.action);
+    final sortable = !(column == StudiesTableColumn.pin ||
+        column == StudiesTableColumn.action);
     final sortingActive = dashboardController.isSortingActiveForColumn(column);
 
     return StudiesTableColumnHeader(
@@ -217,7 +270,8 @@ class StudiesTable extends StatelessWidget {
       sortAscending: sortAscending,
       onSort: sortable
           ? () {
-              dashboardController.setSorting(column, sortingActive ? !sortAscending : sortAscending);
+              dashboardController.setSorting(
+                  column, sortingActive ? !sortAscending : sortAscending);
             }
           : null,
     );
diff --git a/designer_v2/lib/features/dashboard/studies_table_column_header.dart b/designer_v2/lib/features/dashboard/studies_table_column_header.dart
index 624790408..6a56e505e 100644
--- a/designer_v2/lib/features/dashboard/studies_table_column_header.dart
+++ b/designer_v2/lib/features/dashboard/studies_table_column_header.dart
@@ -10,11 +10,18 @@ class StudiesTableColumnHeader extends StatefulWidget {
   final bool sortingActive;
   final void Function()? onSort;
 
-  const StudiesTableColumnHeader(this.title,
-      {super.key, required this.sortable, required this.sortingActive, required this.sortAscending, this.onSort,});
+  const StudiesTableColumnHeader(
+    this.title, {
+    super.key,
+    required this.sortable,
+    required this.sortingActive,
+    required this.sortAscending,
+    this.onSort,
+  });
 
   @override
-  State<StudiesTableColumnHeader> createState() => _StudiesTableColumnHeaderState();
+  State<StudiesTableColumnHeader> createState() =>
+      _StudiesTableColumnHeaderState();
 }
 
 class _StudiesTableColumnHeaderState extends State<StudiesTableColumnHeader> {
@@ -29,16 +36,20 @@ class _StudiesTableColumnHeaderState extends State<StudiesTableColumnHeader> {
         return Row(
           children: [
             Flexible(
-                child: Text(
-              widget.title,
-              maxLines: 1,
-              overflow: TextOverflow.fade,
-              softWrap: false,
-              style: theme.textTheme.bodySmall!.copyWith(
-                color: theme.colorScheme.onSurface.withOpacity(0.8),
+              child: Text(
+                widget.title,
+                maxLines: 1,
+                overflow: TextOverflow.fade,
+                softWrap: false,
+                style: theme.textTheme.bodySmall!.copyWith(
+                  color: theme.colorScheme.onSurface.withOpacity(0.8),
+                ),
               ),
-            ),),
-            if (widget.sortable) _getIcon() ?? const SizedBox(width: 17) else const SizedBox.shrink(),
+            ),
+            if (widget.sortable)
+              _getIcon() ?? const SizedBox(width: 17)
+            else
+              const SizedBox.shrink(),
           ],
         );
       },
@@ -59,7 +70,11 @@ class _StudiesTableColumnHeaderState extends State<StudiesTableColumnHeader> {
     }
 
     if (!widget.sortingActive) {
-      return isHovering ? (widget.sortAscending ? hoveredAscendingIcon : hoveredDescendingIcon) : null;
+      return isHovering
+          ? (widget.sortAscending
+              ? hoveredAscendingIcon
+              : hoveredDescendingIcon)
+          : null;
     }
 
     return widget.sortAscending ? ascendingIcon : descendingIcon;
diff --git a/designer_v2/lib/features/dashboard/studies_table_item.dart b/designer_v2/lib/features/dashboard/studies_table_item.dart
index 26454f2fb..cb9c7e6e9 100644
--- a/designer_v2/lib/features/dashboard/studies_table_item.dart
+++ b/designer_v2/lib/features/dashboard/studies_table_item.dart
@@ -79,8 +79,9 @@ class _StudiesTableItemState extends State<StudiesTableItem> {
             shape: RoundedRectangleBorder(
               borderRadius: const BorderRadius.all(Radius.circular(4)),
               side: BorderSide(
-                  color: theme.colorScheme.primaryContainer.withOpacity(0.9),
-                  width: isHovering ? 1.5 : 0.75,),
+                color: theme.colorScheme.primaryContainer.withOpacity(0.9),
+                width: isHovering ? 1.5 : 0.75,
+              ),
             ),
             child: InkWell(
               splashColor: Colors.transparent,
@@ -108,9 +109,10 @@ class _StudiesTableItemState extends State<StudiesTableItem> {
                       ),
                     ),
                     SizedBox(
-                        width: widget.columnSizes[0].collapsed
-                            ? 0
-                            : widget.columnSpacing,),
+                      width: widget.columnSizes[0].collapsed
+                          ? 0
+                          : widget.columnSpacing,
+                    ),
                     widget.columnSizes[1].createContainer(
                       child: Text(
                         widget.study.title ?? '[Missing study title]',
@@ -119,9 +121,10 @@ class _StudiesTableItemState extends State<StudiesTableItem> {
                       ),
                     ),
                     SizedBox(
-                        width: widget.columnSizes[1].collapsed
-                            ? 0
-                            : widget.columnSpacing,),
+                      width: widget.columnSizes[1].collapsed
+                          ? 0
+                          : widget.columnSpacing,
+                    ),
                     widget.columnSizes[2].createContainer(
                       child: StudyStatusBadge(
                         status: widget.study.status,
@@ -130,9 +133,10 @@ class _StudiesTableItemState extends State<StudiesTableItem> {
                       ),
                     ),
                     SizedBox(
-                        width: widget.columnSizes[2].collapsed
-                            ? 0
-                            : widget.columnSpacing,),
+                      width: widget.columnSizes[2].collapsed
+                          ? 0
+                          : widget.columnSpacing,
+                    ),
                     widget.columnSizes[3].createContainer(
                       child: StudyParticipationBadge(
                         participation: widget.study.participation,
@@ -140,9 +144,10 @@ class _StudiesTableItemState extends State<StudiesTableItem> {
                       ),
                     ),
                     SizedBox(
-                        width: widget.columnSizes[3].collapsed
-                            ? 0
-                            : widget.columnSpacing,),
+                      width: widget.columnSizes[3].collapsed
+                          ? 0
+                          : widget.columnSpacing,
+                    ),
                     widget.columnSizes[4].createContainer(
                       child: Text(
                         widget.study.createdAt?.toTimeAgoString() ?? '',
@@ -151,9 +156,10 @@ class _StudiesTableItemState extends State<StudiesTableItem> {
                       ),
                     ),
                     SizedBox(
-                        width: widget.columnSizes[4].collapsed
-                            ? 0
-                            : widget.columnSpacing,),
+                      width: widget.columnSizes[4].collapsed
+                          ? 0
+                          : widget.columnSpacing,
+                    ),
                     widget.columnSizes[5].createContainer(
                       child: Text(
                         widget.study.participantCount.toString(),
@@ -162,28 +168,34 @@ class _StudiesTableItemState extends State<StudiesTableItem> {
                       ),
                     ),
                     SizedBox(
-                        width: widget.columnSizes[5].collapsed
-                            ? 0
-                            : widget.columnSpacing,),
+                      width: widget.columnSizes[5].collapsed
+                          ? 0
+                          : widget.columnSpacing,
+                    ),
                     widget.columnSizes[6].createContainer(
                       child: Text(
                         widget.study.activeSubjectCount.toString(),
                         style: mutedTextStyleIfZero(
-                            widget.study.activeSubjectCount,),
+                          widget.study.activeSubjectCount,
+                        ),
                       ),
                     ),
                     SizedBox(
-                        width: widget.columnSizes[6].collapsed
-                            ? 0
-                            : widget.columnSpacing,),
+                      width: widget.columnSizes[6].collapsed
+                          ? 0
+                          : widget.columnSpacing,
+                    ),
                     widget.columnSizes[7].createContainer(
-                      child: Text(widget.study.endedCount.toString(),
-                          style: mutedTextStyleIfZero(widget.study.endedCount),),
+                      child: Text(
+                        widget.study.endedCount.toString(),
+                        style: mutedTextStyleIfZero(widget.study.endedCount),
+                      ),
                     ),
                     SizedBox(
-                        width: widget.columnSizes[7].collapsed
-                            ? 0
-                            : widget.columnSpacing,),
+                      width: widget.columnSizes[7].collapsed
+                          ? 0
+                          : widget.columnSpacing,
+                    ),
                     widget.columnSizes[8].createContainer(
                       child: _buildActionMenu(context, widget.actions),
                     ),
diff --git a/designer_v2/lib/features/design/enrollment/consent_item_form_controller.dart b/designer_v2/lib/features/design/enrollment/consent_item_form_controller.dart
index 349d65efe..278547253 100644
--- a/designer_v2/lib/features/design/enrollment/consent_item_form_controller.dart
+++ b/designer_v2/lib/features/design/enrollment/consent_item_form_controller.dart
@@ -8,7 +8,8 @@ import 'package:studyu_designer_v2/features/forms/form_view_model_collection.dar
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:uuid/uuid.dart';
 
-class ConsentItemFormViewModel extends ManagedFormViewModel<ConsentItemFormData> {
+class ConsentItemFormViewModel
+    extends ManagedFormViewModel<ConsentItemFormData> {
   ConsentItemFormViewModel({
     super.formData,
     super.delegate,
@@ -17,7 +18,8 @@ class ConsentItemFormViewModel extends ManagedFormViewModel<ConsentItemFormData>
 
   // - Form fields
 
-  final FormControl<String> consentIdControl = FormControl(value: const Uuid().v4()); // hidden
+  final FormControl<String> consentIdControl =
+      FormControl(value: const Uuid().v4()); // hidden
   final FormControl<String> titleControl = FormControl();
   final FormControl<String> descriptionControl = FormControl();
   final FormControl<IconOption> iconControl = FormControl();
@@ -31,16 +33,26 @@ class ConsentItemFormViewModel extends ManagedFormViewModel<ConsentItemFormData>
         StudyFormValidationSet.test: [titleRequired, descriptionRequired],
       };
 
-  FormControlValidation get titleRequired => FormControlValidation(control: titleControl, validators: [
-        Validators.required,
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_consent_title_required,
-      },);
-  FormControlValidation get descriptionRequired => FormControlValidation(control: descriptionControl, validators: [
-        Validators.required,
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_consent_text_required,
-      },);
+  FormControlValidation get titleRequired => FormControlValidation(
+        control: titleControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_consent_title_required,
+        },
+      );
+  FormControlValidation get descriptionRequired => FormControlValidation(
+        control: descriptionControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_consent_text_required,
+        },
+      );
 
   @override
   late final FormGroup form = FormGroup({
diff --git a/designer_v2/lib/features/design/enrollment/consent_item_form_view.dart b/designer_v2/lib/features/design/enrollment/consent_item_form_view.dart
index 70dcc7e49..affe68996 100644
--- a/designer_v2/lib/features/design/enrollment/consent_item_form_view.dart
+++ b/designer_v2/lib/features/design/enrollment/consent_item_form_view.dart
@@ -28,93 +28,99 @@ class _ConsentItemFormViewState extends State<ConsentItemFormView> {
 
   @override
   Widget build(BuildContext context) {
-    return ReactiveFormConsumer(builder: (context, formGroup, child) {
-      return Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          FormTableLayout(
-            rowLayout: FormTableRowLayout.vertical,
-            rows: [
-              FormTableRow(
-                control: widget.formViewModel.titleControl,
-                label: tr.form_field_consent_title,
-                labelHelpText: tr.form_field_consent_title_tooltip,
-                input: Row(
-                  children: [
-                    Expanded(
-                      child: ReactiveTextField(
-                        formControl: widget.formViewModel.titleControl,
-                        inputFormatters: [
-                          LengthLimitingTextInputFormatter(100),
-                        ],
-                        validationMessages: widget.formViewModel.titleControl.validationMessages,
-                        decoration: InputDecoration(
-                          hintText: tr.form_field_consent_title_hint,
+    return ReactiveFormConsumer(
+      builder: (context, formGroup, child) {
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            FormTableLayout(
+              rowLayout: FormTableRowLayout.vertical,
+              rows: [
+                FormTableRow(
+                  control: widget.formViewModel.titleControl,
+                  label: tr.form_field_consent_title,
+                  labelHelpText: tr.form_field_consent_title_tooltip,
+                  input: Row(
+                    children: [
+                      Expanded(
+                        child: ReactiveTextField(
+                          formControl: widget.formViewModel.titleControl,
+                          inputFormatters: [
+                            LengthLimitingTextInputFormatter(100),
+                          ],
+                          validationMessages: widget
+                              .formViewModel.titleControl.validationMessages,
+                          decoration: InputDecoration(
+                            hintText: tr.form_field_consent_title_hint,
+                          ),
                         ),
                       ),
-                    ),
-                    ReactiveFormConsumer(
-                      builder: (context, form, child) {
-                        return (widget.formViewModel.iconControl.value != null)
-                            ? const SizedBox(width: 4.0)
-                            : const SizedBox(width: 8.0);
-                      },
-                    ),
-                    IntrinsicWidth(
-                      child: ReactiveIconPicker(
-                        formControl: widget.formViewModel.iconControl,
-                        iconOptions: IconPack.material,
+                      ReactiveFormConsumer(
+                        builder: (context, form, child) {
+                          return (widget.formViewModel.iconControl.value !=
+                                  null)
+                              ? const SizedBox(width: 4.0)
+                              : const SizedBox(width: 8.0);
+                        },
                       ),
-                    ),
-                  ],
+                      IntrinsicWidth(
+                        child: ReactiveIconPicker(
+                          formControl: widget.formViewModel.iconControl,
+                          iconOptions: IconPack.material,
+                        ),
+                      ),
+                    ],
+                  ),
                 ),
-              ),
-              FormTableRow(
-                control: widget.formViewModel.descriptionControl,
-                labelBuilder: (context) => Row(
-                  children: [
-                    FormLabel(
-                      labelText: tr.form_field_consent_text,
-                      helpText: tr.form_field_consent_text_tooltip,
-                    ),
-                    const SizedBox(width: 8),
-                    Opacity(
-                      opacity: ThemeConfig.kMuteFadeFactor,
-                      child: Tooltip(
-                        message: "Use html to style your content",
-                        child: Hyperlink(
-                          text: "styleable",
-                          onClick: () => setState(() {
-                            isStylingInformationDismissed = !isStylingInformationDismissed;
-                          }),
-                          visitedColor: null,
+                FormTableRow(
+                  control: widget.formViewModel.descriptionControl,
+                  labelBuilder: (context) => Row(
+                    children: [
+                      FormLabel(
+                        labelText: tr.form_field_consent_text,
+                        helpText: tr.form_field_consent_text_tooltip,
+                      ),
+                      const SizedBox(width: 8),
+                      Opacity(
+                        opacity: ThemeConfig.kMuteFadeFactor,
+                        child: Tooltip(
+                          message: "Use html to style your content",
+                          child: Hyperlink(
+                            text: "styleable",
+                            onClick: () => setState(() {
+                              isStylingInformationDismissed =
+                                  !isStylingInformationDismissed;
+                            }),
+                            visitedColor: null,
+                          ),
                         ),
                       ),
+                    ],
+                  ),
+                  input: ReactiveTextField(
+                    formControl: widget.formViewModel.descriptionControl,
+                    inputFormatters: [
+                      LengthLimitingTextInputFormatter(10000),
+                    ],
+                    validationMessages: widget
+                        .formViewModel.descriptionControl.validationMessages,
+                    keyboardType: TextInputType.multiline,
+                    minLines: 10,
+                    maxLines: 30,
+                    decoration: InputDecoration(
+                      hintText: tr.form_field_consent_text_hint,
                     ),
-                  ],
-                ),
-                input: ReactiveTextField(
-                  formControl: widget.formViewModel.descriptionControl,
-                  inputFormatters: [
-                    LengthLimitingTextInputFormatter(10000),
-                  ],
-                  validationMessages: widget.formViewModel.descriptionControl.validationMessages,
-                  keyboardType: TextInputType.multiline,
-                  minLines: 10,
-                  maxLines: 30,
-                  decoration: InputDecoration(
-                    hintText: tr.form_field_consent_text_hint,
                   ),
                 ),
-              ),
-            ],
-          ),
-          HtmlStylingBanner(
-            isDismissed: isStylingInformationDismissed,
-            onDismissed: onDismissedCallback,
-          ),
-        ],
-      );
-    },);
+              ],
+            ),
+            HtmlStylingBanner(
+              isDismissed: isStylingInformationDismissed,
+              onDismissed: onDismissedCallback,
+            ),
+          ],
+        );
+      },
+    );
   }
 }
diff --git a/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart b/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart
index b539be3a8..3fa941f56 100644
--- a/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart
+++ b/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart
@@ -60,8 +60,10 @@ class EnrollmentFormViewModel extends FormViewModel<EnrollmentFormData>
 
   List<FormControlOption<Participation>> get enrollmentTypeControlOptions =>
       Participation.values
-          .map((v) =>
-              FormControlOption(v, v.string, description: v.designDescription),)
+          .map(
+            (v) => FormControlOption(v, v.string,
+                description: v.designDescription),
+          )
           .toList();
 
   late final FormArray consentItemArray = FormArray([]);
@@ -128,21 +130,29 @@ class EnrollmentFormViewModel extends FormViewModel<EnrollmentFormData>
 
   @override
   List<ModelAction> availableActions(ScreenerQuestionFormViewModel model) {
-    final actions = questionFormViewModels.availableActions(model,
-        onEdit: onSelectItem, isReadOnly: isReadonly,);
+    final actions = questionFormViewModels.availableActions(
+      model,
+      onEdit: onSelectItem,
+      isReadOnly: isReadonly,
+    );
     return withIcons(actions, modelActionIcons);
   }
 
   List<ModelAction> availablePopupActions(ScreenerQuestionFormViewModel model) {
-    final actions = questionFormViewModels.availablePopupActions(model,
-        isReadOnly: isReadonly,);
+    final actions = questionFormViewModels.availablePopupActions(
+      model,
+      isReadOnly: isReadonly,
+    );
     return withIcons(actions, modelActionIcons);
   }
 
   List<ModelAction> availableInlineActions(
-      ScreenerQuestionFormViewModel model,) {
-    final actions = questionFormViewModels.availableInlineActions(model,
-        isReadOnly: isReadonly,);
+    ScreenerQuestionFormViewModel model,
+  ) {
+    final actions = questionFormViewModels.availableInlineActions(
+      model,
+      isReadOnly: isReadonly,
+    );
     return withIcons(actions, modelActionIcons);
   }
 
@@ -166,7 +176,8 @@ class EnrollmentFormViewModel extends FormViewModel<EnrollmentFormData>
   }
 
   ScreenerQuestionFormRouteArgs buildScreenerQuestionFormRouteArgs(
-      QuestionFormViewModel model,) {
+    QuestionFormViewModel model,
+  ) {
     return ScreenerQuestionFormRouteArgs(
       studyId: study.id,
       questionId: model.questionId,
@@ -181,7 +192,8 @@ class EnrollmentFormViewModel extends FormViewModel<EnrollmentFormData>
   }
 
   ConsentItemFormRouteArgs buildConsentItemFormRouteArgs(
-      ConsentItemFormViewModel model,) {
+    ConsentItemFormViewModel model,
+  ) {
     return ConsentItemFormRouteArgs(
       studyId: study.id,
       consentId: model.consentId,
@@ -189,13 +201,18 @@ class EnrollmentFormViewModel extends FormViewModel<EnrollmentFormData>
   }
 
   void testScreener() {
-    router.dispatch(RoutingIntents.studyTest(study.id,
-        appRoute: TestAppRoutes.eligibility,),);
+    router.dispatch(
+      RoutingIntents.studyTest(
+        study.id,
+        appRoute: TestAppRoutes.eligibility,
+      ),
+    );
   }
 
   void testConsent() {
     router.dispatch(
-        RoutingIntents.studyTest(study.id, appRoute: TestAppRoutes.consent),);
+      RoutingIntents.studyTest(study.id, appRoute: TestAppRoutes.consent),
+    );
   }
 
   bool get canTestScreener =>
@@ -213,7 +230,8 @@ class EnrollmentFormViewModel extends FormViewModel<EnrollmentFormData>
 
   @override
   ScreenerQuestionFormViewModel provideQuestionFormViewModel(
-      QuestionFormData? formData,) {
+    QuestionFormData? formData,
+  ) {
     return ScreenerQuestionFormViewModel(
       formData: formData,
       delegate: this,
@@ -249,7 +267,9 @@ class EnrollmentFormConsentItemDelegate
 
   @override
   Future onSave(
-      ConsentItemFormViewModel formViewModel, FormMode prevFormMode,) async {
+    ConsentItemFormViewModel formViewModel,
+    FormMode prevFormMode,
+  ) async {
     if (prevFormMode == FormMode.create) {
       // Save the managed viewmodel that was eagerly added in [provide]
       formViewModels.commit(formViewModel);
diff --git a/designer_v2/lib/features/design/enrollment/enrollment_form_data.dart b/designer_v2/lib/features/design/enrollment/enrollment_form_data.dart
index 9da6ad298..b3ee24dc9 100644
--- a/designer_v2/lib/features/design/enrollment/enrollment_form_data.dart
+++ b/designer_v2/lib/features/design/enrollment/enrollment_form_data.dart
@@ -19,9 +19,12 @@ class EnrollmentFormData implements IStudyFormData {
   factory EnrollmentFormData.fromStudy(Study study) {
     return EnrollmentFormData(
       enrollmentType: study.participation,
-      questionnaireFormData: QuestionnaireFormData.fromDomainModel(study.questionnaire, study.eligibilityCriteria),
-      consentItemsFormData:
-          study.consent.map((consentItem) => ConsentItemFormData.fromDomainModel(consentItem)).toList(),
+      questionnaireFormData: QuestionnaireFormData.fromDomainModel(
+          study.questionnaire, study.eligibilityCriteria),
+      consentItemsFormData: study.consent
+          .map(
+              (consentItem) => ConsentItemFormData.fromDomainModel(consentItem))
+          .toList(),
     );
   }
 
@@ -30,14 +33,17 @@ class EnrollmentFormData implements IStudyFormData {
     study.participation = enrollmentType;
     study.questionnaire = questionnaireFormData.toQuestionnaire();
     study.consent = (consentItemsFormData != null)
-        ? consentItemsFormData!.map((formData) => formData.toConsentItem()).toList()
+        ? consentItemsFormData!
+            .map((formData) => formData.toConsentItem())
+            .toList()
         : [];
     study.eligibilityCriteria = questionnaireFormData.toEligibilityCriteria();
     return study;
   }
 
   @override
-  String get id => throw UnimplementedError(); // not needed for top-level form data
+  String get id =>
+      throw UnimplementedError(); // not needed for top-level form data
 
   @override
   EnrollmentFormData copy() {
diff --git a/designer_v2/lib/features/design/enrollment/screener_question_form_controller.dart b/designer_v2/lib/features/design/enrollment/screener_question_form_controller.dart
index cb535bda0..1dcc03019 100644
--- a/designer_v2/lib/features/design/enrollment/screener_question_form_controller.dart
+++ b/designer_v2/lib/features/design/enrollment/screener_question_form_controller.dart
@@ -7,7 +7,8 @@ import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/utils/extensions.dart';
 
-class ScreenerQuestionFormViewModel extends QuestionFormViewModel implements IScreenerQuestionLogicFormViewModel {
+class ScreenerQuestionFormViewModel extends QuestionFormViewModel
+    implements IScreenerQuestionLogicFormViewModel {
   ScreenerQuestionFormViewModel({
     super.formData,
     super.delegate,
@@ -23,13 +24,16 @@ class ScreenerQuestionFormViewModel extends QuestionFormViewModel implements ISc
   late final FormArray responseOptionsDisabledArray =
       FormArray(_copyFormControls(answerOptionsArray.controls), disabled: true);
   late final FormArray<bool> responseOptionsLogicControls = FormArray(
-    List.generate(answerOptionsArray.controls.length, (index) => FormControl(value: defaultResponseOptionValidity)),
+    List.generate(answerOptionsArray.controls.length,
+        (index) => FormControl(value: defaultResponseOptionValidity)),
   );
-  late final FormArray<String> responseOptionsLogicDescriptionControls = FormArray(
+  late final FormArray<String> responseOptionsLogicDescriptionControls =
+      FormArray(
     List.generate(answerOptionsArray.controls.length, (index) => FormControl()),
   );
 
-  List<AbstractControl> get responseOptionsDisabledControls => responseOptionsDisabledArray.controls;
+  List<AbstractControl> get responseOptionsDisabledControls =>
+      responseOptionsDisabledArray.controls;
 
   List<FormControlOption<bool>> get logicControlOptions => [
         FormControlOption(true, tr.form_screener_question_logic_qualify),
@@ -43,7 +47,8 @@ class ScreenerQuestionFormViewModel extends QuestionFormViewModel implements ISc
   };
 
   @override
-  Map<String, AbstractControl> get questionBaseControls => _questionBaseControls;
+  Map<String, AbstractControl> get questionBaseControls =>
+      _questionBaseControls;
 
   List<AbstractControl> prevResponseOptionControls = [];
   late List<dynamic> prevResponseOptionValues = [];
@@ -57,17 +62,29 @@ class ScreenerQuestionFormViewModel extends QuestionFormViewModel implements ISc
     // Build new form arrays consolidated with previous values (if any)
     final newLogicControls = responseOptionControls.map((newControl) {
       // Consolidate with previous value (if any)
-      final idx = prevResponseOptionControls.map((c) => c.value).toList().indexOf(newControl.value);
-      final newValue = (idx != -1) ? responseOptionsLogicControls.controls[idx].value : defaultResponseOptionValidity;
+      final idx = prevResponseOptionControls
+          .map((c) => c.value)
+          .toList()
+          .indexOf(newControl.value);
+      final newValue = (idx != -1)
+          ? responseOptionsLogicControls.controls[idx].value
+          : defaultResponseOptionValidity;
       return FormControl<bool>(value: newValue);
     }).toList();
-    final newLogicDescriptionControls = responseOptionControls.map((newControl) {
+    final newLogicDescriptionControls =
+        responseOptionControls.map((newControl) {
       // Consolidate with previous value (if any)
-      final idx = prevResponseOptionControls.map((c) => c.value).toList().indexOf(newControl.value);
-      final newValue = (idx != -1) ? responseOptionsLogicDescriptionControls.controls[idx].value : null;
+      final idx = prevResponseOptionControls
+          .map((c) => c.value)
+          .toList()
+          .indexOf(newControl.value);
+      final newValue = (idx != -1)
+          ? responseOptionsLogicDescriptionControls.controls[idx].value
+          : null;
       return FormControl<String>(value: newValue);
     }).toList();
-    final newResponseOptionsControls = _copyFormControls(responseOptionControls);
+    final newResponseOptionsControls =
+        _copyFormControls(responseOptionControls);
 
     // Keep disabled controls in sync with actual response option controls
     responseOptionsDisabledArray.clear();
@@ -75,7 +92,8 @@ class ScreenerQuestionFormViewModel extends QuestionFormViewModel implements ISc
     responseOptionsDisabledArray.markAsDisabled();
 
     // Reset logic controls to new consolidated ones
-    prevResponseOptionValues = prevResponseOptionControls.map((c) => c.value).toList();
+    prevResponseOptionValues =
+        prevResponseOptionControls.map((c) => c.value).toList();
     responseOptionsLogicControls.clear();
     responseOptionsLogicControls.addAll(newLogicControls);
     responseOptionsLogicDescriptionControls.clear();
@@ -93,7 +111,8 @@ class ScreenerQuestionFormViewModel extends QuestionFormViewModel implements ISc
     for (final entry in data.responseOptionsValidity.entries) {
       final responseOption = entry.key;
       final responseValidity = entry.value;
-      final logicControl = _findAssociatedLogicControlFor(responseOption: responseOption);
+      final logicControl =
+          _findAssociatedLogicControlFor(responseOption: responseOption);
       if (logicControl != null) {
         logicControl.value = responseValidity;
       }
@@ -108,7 +127,8 @@ class ScreenerQuestionFormViewModel extends QuestionFormViewModel implements ISc
     for (var i = 0; i < answerOptionsControls.length; i++) {
       final optionControl = answerOptionsControls[i];
       final logicControl = responseOptionsLogicControls.controls[i];
-      responseOptionsValidity[optionControl.value] = logicControl.value ?? defaultResponseOptionValidity;
+      responseOptionsValidity[optionControl.value] =
+          logicControl.value ?? defaultResponseOptionValidity;
     }
     data.responseOptionsValidity = responseOptionsValidity;
 
@@ -117,10 +137,12 @@ class ScreenerQuestionFormViewModel extends QuestionFormViewModel implements ISc
 
   List<FormControl> _copyFormControls(List<AbstractControl> controls) {
     return controls
-        .map((control) => FormControl<String>(
-              value: control.value?.toString() ?? '',
-              disabled: control.disabled,
-            ),)
+        .map(
+          (control) => FormControl<String>(
+            value: control.value?.toString() ?? '',
+            disabled: control.disabled,
+          ),
+        )
         .toList();
   }
 
@@ -159,6 +181,6 @@ class ScreenerQuestionFormViewModel extends QuestionFormViewModel implements ISc
   // - IScreenerQuestionLogicFormViewModel
 
   @override
-  bool get isDirtyOptionsBannerVisible =>
-      !prevResponseOptionValues.equals(answerOptionsControls.map((c) => c.value).toList());
+  bool get isDirtyOptionsBannerVisible => !prevResponseOptionValues
+      .equals(answerOptionsControls.map((c) => c.value).toList());
 }
diff --git a/designer_v2/lib/features/design/enrollment/screener_question_logic_form_view.dart b/designer_v2/lib/features/design/enrollment/screener_question_logic_form_view.dart
index 8c5a03faf..dbce1d7f4 100644
--- a/designer_v2/lib/features/design/enrollment/screener_question_logic_form_view.dart
+++ b/designer_v2/lib/features/design/enrollment/screener_question_logic_form_view.dart
@@ -45,13 +45,16 @@ class ScreenerQuestionLogicFormView extends FormConsumerWidget {
   }
 
   SingleChildRenderObjectWidget _buildInfoBanner(BuildContext context) {
-    return (!formViewModel.isReadonly && formViewModel.isDirtyOptionsBannerVisible)
+    return (!formViewModel.isReadonly &&
+            formViewModel.isDirtyOptionsBannerVisible)
         ? Padding(
             padding: const EdgeInsets.only(top: 12.0),
             child: BannerBox(
               style: BannerStyle.info,
-              body: TextParagraph(text: tr.form_array_screener_question_logic_dirty_banner),
-              padding: const EdgeInsets.symmetric(horizontal: 18.0, vertical: 12.0),
+              body: TextParagraph(
+                  text: tr.form_array_screener_question_logic_dirty_banner),
+              padding:
+                  const EdgeInsets.symmetric(horizontal: 18.0, vertical: 12.0),
               noPrefix: true,
               isDismissed: !formViewModel.isMidValuesClearedInfoVisible,
               dismissIconSize: Theme.of(context).iconTheme.size ?? 14.0,
@@ -64,8 +67,11 @@ class ScreenerQuestionLogicFormView extends FormConsumerWidget {
     if (formViewModel.questionType.name == FreeTextQuestion.questionType) {
       // todo logic might check if field has content
       // todo logic might need that field is equal to a certain value
-      return Text(tr.free_text_question_logic_not_supported,
-          style: const TextStyle(color: Colors.red), textAlign: TextAlign.center,);
+      return Text(
+        tr.free_text_question_logic_not_supported,
+        style: const TextStyle(color: Colors.red),
+        textAlign: TextAlign.center,
+      );
     }
 
     return ReactiveFormArray(
@@ -79,16 +85,19 @@ class ScreenerQuestionLogicFormView extends FormConsumerWidget {
               columnWidth: const FixedColumnWidth(32.0),
             ),
             StandardTableColumn(
-                label: '', // don't care (showTableHeader=false)
-                columnWidth: const FlexColumnWidth(5),),
+              label: '', // don't care (showTableHeader=false)
+              columnWidth: const FlexColumnWidth(5),
+            ),
             StandardTableColumn(
-                label: '', // don't care (showTableHeader=false)
-                columnWidth: const FlexColumnWidth(4),),
+              label: '', // don't care (showTableHeader=false)
+              columnWidth: const FlexColumnWidth(4),
+            ),
           ],
           onSelectItem: (_) => {}, // no-op
           buildCellsAt: (context, item, rowIdx, __) {
             final optionControl = item as FormControl<dynamic>;
-            final logicControl = formViewModel.responseOptionsLogicControls.controls[rowIdx] as FormControl<bool>;
+            final logicControl = formViewModel.responseOptionsLogicControls
+                .controls[rowIdx] as FormControl<bool>;
             return _buildOptionLogicRow(context, optionControl, logicControl);
           },
           cellSpacing: 4.0,
@@ -103,7 +112,10 @@ class ScreenerQuestionLogicFormView extends FormConsumerWidget {
   }
 
   List<Widget> _buildOptionLogicRow(
-      BuildContext context, FormControl<dynamic> optionControl, FormControl<bool> logicControl,) {
+    BuildContext context,
+    FormControl<dynamic> optionControl,
+    FormControl<bool> logicControl,
+  ) {
     final theme = Theme.of(context);
 
     // Use a UniqueKey to prevent carry-over of control states to other
@@ -112,7 +124,9 @@ class ScreenerQuestionLogicFormView extends FormConsumerWidget {
     final iconWidget = optionCells[0];
     final optionWidget = optionCells[1];
     final logicWidget = Theme(
-      data: theme.copyWith(inputDecorationTheme: ThemeConfig.dropdownInputDecorationTheme(theme)),
+      data: theme.copyWith(
+          inputDecorationTheme:
+              ThemeConfig.dropdownInputDecorationTheme(theme)),
       child: ReactiveDropdownField<bool>(
         formControl: logicControl,
         items: formViewModel.logicControlOptions.map((option) {
diff --git a/designer_v2/lib/features/design/info/study_info_form_data.dart b/designer_v2/lib/features/design/info/study_info_form_data.dart
index a3169b94c..59b7915d0 100644
--- a/designer_v2/lib/features/design/info/study_info_form_data.dart
+++ b/designer_v2/lib/features/design/info/study_info_form_data.dart
@@ -33,7 +33,8 @@ class StudyInfoFormData implements IStudyFormData {
   }
 
   @override
-  String get id => throw UnimplementedError(); // not needed for top-level form data
+  String get id =>
+      throw UnimplementedError(); // not needed for top-level form data
 
   @override
   StudyInfoFormData copy() {
@@ -67,7 +68,8 @@ class StudyContactInfoFormData implements IStudyFormData {
     return StudyContactInfoFormData(
       organization: contact.organization,
       institutionalReviewBoard: contact.institutionalReviewBoard ?? '',
-      institutionalReviewBoardNumber: contact.institutionalReviewBoardNumber ?? '',
+      institutionalReviewBoardNumber:
+          contact.institutionalReviewBoardNumber ?? '',
       researchers: contact.researchers ?? '',
       email: contact.email,
       website: contact.website,
@@ -86,13 +88,16 @@ class StudyContactInfoFormData implements IStudyFormData {
     contact.email = email ?? '';
     contact.website = website ?? '';
     contact.phone = phone ?? '';
-    contact.additionalInfo = (additionalInfo == null || additionalInfo!.isEmpty) ? null : additionalInfo;
+    contact.additionalInfo = (additionalInfo == null || additionalInfo!.isEmpty)
+        ? null
+        : additionalInfo;
     study.contact = contact;
     return study;
   }
 
   @override
-  String get id => throw UnimplementedError(); // not needed for top-level form data
+  String get id =>
+      throw UnimplementedError(); // not needed for top-level form data
 
   @override
   StudyInfoFormData copy() {
diff --git a/designer_v2/lib/features/design/info/study_info_form_view.dart b/designer_v2/lib/features/design/info/study_info_form_view.dart
index 1127012e7..9b77b2ac5 100644
--- a/designer_v2/lib/features/design/info/study_info_form_view.dart
+++ b/designer_v2/lib/features/design/info/study_info_form_view.dart
@@ -31,184 +31,203 @@ class StudyDesignInfoFormView extends StudyDesignPageWidget {
             children: <Widget>[
               TextParagraph(text: tr.form_study_design_info_description),
               const SizedBox(height: 24.0),
-              FormTableLayout(rows: [
-                FormTableRow(
-                  control: formViewModel.titleControl,
-                  label: tr.form_field_study_title,
-                  labelHelpText: tr.form_field_study_title_tooltip,
-                  input: Row(
-                    children: [
-                      // TODO: responsive layout (input field gets too small)
-                      Expanded(
+              FormTableLayout(
+                rows: [
+                  FormTableRow(
+                    control: formViewModel.titleControl,
+                    label: tr.form_field_study_title,
+                    labelHelpText: tr.form_field_study_title_tooltip,
+                    input: Row(
+                      children: [
+                        // TODO: responsive layout (input field gets too small)
+                        Expanded(
                           child: ReactiveTextField(
-                        formControl: formViewModel.titleControl,
-                        decoration: InputDecoration(
-                          hintText: tr.form_field_study_title,
+                            formControl: formViewModel.titleControl,
+                            decoration: InputDecoration(
+                              hintText: tr.form_field_study_title,
+                            ),
+                            inputFormatters: [
+                              LengthLimitingTextInputFormatter(100),
+                            ],
+                            validationMessages:
+                                formViewModel.titleControl.validationMessages,
+                          ),
                         ),
-                        inputFormatters: [
-                          LengthLimitingTextInputFormatter(100),
-                        ],
-                        validationMessages: formViewModel.titleControl.validationMessages,
-                      ),),
-                      ReactiveFormConsumer(builder: (context, form, child) {
-                        return (formViewModel.iconControl.value != null)
-                            ? const SizedBox(width: 4.0)
-                            : const SizedBox(width: 8.0);
-                      },),
-                      IntrinsicWidth(
-                        child: ReactiveIconPicker(
-                          formControl: formViewModel.iconControl,
-                          iconOptions: IconPack.material,
-                          validationMessages: formViewModel.iconControl.validationMessages,
+                        ReactiveFormConsumer(
+                          builder: (context, form, child) {
+                            return (formViewModel.iconControl.value != null)
+                                ? const SizedBox(width: 4.0)
+                                : const SizedBox(width: 8.0);
+                          },
                         ),
-                      ),
-                    ],
+                        IntrinsicWidth(
+                          child: ReactiveIconPicker(
+                            formControl: formViewModel.iconControl,
+                            iconOptions: IconPack.material,
+                            validationMessages:
+                                formViewModel.iconControl.validationMessages,
+                          ),
+                        ),
+                      ],
+                    ),
                   ),
-                ),
-                FormTableRow(
-                  control: formViewModel.descriptionControl,
-                  label: tr.form_field_study_description,
-                  labelHelpText: tr.form_field_study_description_tooltip,
-                  input: ReactiveTextField(
-                    formControl: formViewModel.descriptionControl,
-                    decoration: InputDecoration(
-                      hintText: tr.form_field_study_description_hint,
+                  FormTableRow(
+                    control: formViewModel.descriptionControl,
+                    label: tr.form_field_study_description,
+                    labelHelpText: tr.form_field_study_description_tooltip,
+                    input: ReactiveTextField(
+                      formControl: formViewModel.descriptionControl,
+                      decoration: InputDecoration(
+                        hintText: tr.form_field_study_description_hint,
+                      ),
+                      validationMessages:
+                          formViewModel.descriptionControl.validationMessages,
+                      keyboardType: TextInputType.multiline,
+                      minLines: 5,
+                      maxLines: 5,
+                      inputFormatters: [
+                        LengthLimitingTextInputFormatter(500),
+                      ],
                     ),
-                    validationMessages: formViewModel.descriptionControl.validationMessages,
-                    keyboardType: TextInputType.multiline,
-                    minLines: 5,
-                    maxLines: 5,
-                    inputFormatters: [
-                      LengthLimitingTextInputFormatter(500),
-                    ],
                   ),
-                ),
-              ], columnWidths: const {
-                0: FixedColumnWidth(185.0),
-                1: FlexColumnWidth(),
-              },),
+                ],
+                columnWidths: const {
+                  0: FixedColumnWidth(185.0),
+                  1: FlexColumnWidth(),
+                },
+              ),
               const SizedBox(height: 32.0),
               FormSectionHeader(title: tr.form_section_publisher),
               const SizedBox(height: 12.0),
               TextParagraph(text: tr.form_section_publisher_description),
               const SizedBox(height: 24.0),
-              FormTableLayout(rows: [
-                FormTableRow(
-                  control: formViewModel.organizationControl,
-                  label: tr.form_field_organization,
-                  input: ReactiveTextField(
-                    formControl: formViewModel.organizationControl,
-                    decoration: InputDecoration(
-                      hintText: tr.form_field_organization,
+              FormTableLayout(
+                rows: [
+                  FormTableRow(
+                    control: formViewModel.organizationControl,
+                    label: tr.form_field_organization,
+                    input: ReactiveTextField(
+                      formControl: formViewModel.organizationControl,
+                      decoration: InputDecoration(
+                        hintText: tr.form_field_organization,
+                      ),
+                      inputFormatters: [
+                        LengthLimitingTextInputFormatter(100),
+                      ],
+                      validationMessages:
+                          formViewModel.organizationControl.validationMessages,
                     ),
-                    inputFormatters: [
-                      LengthLimitingTextInputFormatter(100),
-                    ],
-                    validationMessages: formViewModel.organizationControl.validationMessages,
                   ),
-                ),
-                FormTableRow(
-                  control: formViewModel.reviewBoardControl,
-                  label: tr.form_field_review_board,
-                  input: ReactiveTextField(
-                    formControl: formViewModel.reviewBoardControl,
-                    decoration: InputDecoration(
-                      hintText: tr.form_field_review_board,
+                  FormTableRow(
+                    control: formViewModel.reviewBoardControl,
+                    label: tr.form_field_review_board,
+                    input: ReactiveTextField(
+                      formControl: formViewModel.reviewBoardControl,
+                      decoration: InputDecoration(
+                        hintText: tr.form_field_review_board,
+                      ),
+                      inputFormatters: [
+                        LengthLimitingTextInputFormatter(100),
+                      ],
+                      validationMessages:
+                          formViewModel.reviewBoardControl.validationMessages,
                     ),
-                    inputFormatters: [
-                      LengthLimitingTextInputFormatter(100),
-                    ],
-                    validationMessages: formViewModel.reviewBoardControl.validationMessages,
                   ),
-                ),
-                FormTableRow(
-                  control: formViewModel.reviewBoardNumberControl,
-                  label: tr.form_field_review_board_number,
-                  input: ReactiveTextField(
-                    formControl: formViewModel.reviewBoardNumberControl,
-                    decoration: InputDecoration(
-                      hintText: tr.form_field_review_board_number,
+                  FormTableRow(
+                    control: formViewModel.reviewBoardNumberControl,
+                    label: tr.form_field_review_board_number,
+                    input: ReactiveTextField(
+                      formControl: formViewModel.reviewBoardNumberControl,
+                      decoration: InputDecoration(
+                        hintText: tr.form_field_review_board_number,
+                      ),
+                      inputFormatters: [
+                        LengthLimitingTextInputFormatter(100),
+                      ],
+                      validationMessages: formViewModel
+                          .reviewBoardNumberControl.validationMessages,
                     ),
-                    inputFormatters: [
-                      LengthLimitingTextInputFormatter(100),
-                    ],
-                    validationMessages: formViewModel.reviewBoardNumberControl.validationMessages,
                   ),
-                ),
-                FormTableRow(
-                  control: formViewModel.researchersControl,
-                  label: tr.form_field_researchers,
-                  input: ReactiveTextField(
-                    formControl: formViewModel.researchersControl,
-                    decoration: InputDecoration(
-                      hintText: tr.form_field_researchers,
+                  FormTableRow(
+                    control: formViewModel.researchersControl,
+                    label: tr.form_field_researchers,
+                    input: ReactiveTextField(
+                      formControl: formViewModel.researchersControl,
+                      decoration: InputDecoration(
+                        hintText: tr.form_field_researchers,
+                      ),
+                      inputFormatters: [
+                        LengthLimitingTextInputFormatter(100),
+                      ],
+                      validationMessages:
+                          formViewModel.researchersControl.validationMessages,
                     ),
-                    inputFormatters: [
-                      LengthLimitingTextInputFormatter(100),
-                    ],
-                    validationMessages: formViewModel.researchersControl.validationMessages,
                   ),
-                ),
-                FormTableRow(
-                  control: formViewModel.websiteControl,
-                  label: tr.form_field_website,
-                  input: ReactiveTextField(
-                    formControl: formViewModel.websiteControl,
-                    decoration: InputDecoration(
-                      hintText: tr.form_field_website,
+                  FormTableRow(
+                    control: formViewModel.websiteControl,
+                    label: tr.form_field_website,
+                    input: ReactiveTextField(
+                      formControl: formViewModel.websiteControl,
+                      decoration: InputDecoration(
+                        hintText: tr.form_field_website,
+                      ),
+                      inputFormatters: [
+                        LengthLimitingTextInputFormatter(300),
+                      ],
+                      validationMessages:
+                          formViewModel.websiteControl.validationMessages,
                     ),
-                    inputFormatters: [
-                      LengthLimitingTextInputFormatter(300),
-                    ],
-                    validationMessages: formViewModel.websiteControl.validationMessages,
                   ),
-                ),
-                FormTableRow(
-                  control: formViewModel.emailControl,
-                  label: tr.form_field_contact_email,
-                  input: ReactiveTextField(
-                    formControl: formViewModel.emailControl,
-                    decoration: InputDecoration(
-                      hintText: tr.form_field_contact_email,
+                  FormTableRow(
+                    control: formViewModel.emailControl,
+                    label: tr.form_field_contact_email,
+                    input: ReactiveTextField(
+                      formControl: formViewModel.emailControl,
+                      decoration: InputDecoration(
+                        hintText: tr.form_field_contact_email,
+                      ),
+                      inputFormatters: [
+                        LengthLimitingTextInputFormatter(100),
+                      ],
+                      validationMessages:
+                          formViewModel.emailControl.validationMessages,
                     ),
-                    inputFormatters: [
-                      LengthLimitingTextInputFormatter(100),
-                    ],
-                    validationMessages: formViewModel.emailControl.validationMessages,
                   ),
-                ),
-                FormTableRow(
-                  control: formViewModel.phoneControl,
-                  label: tr.form_field_contact_phone,
-                  input: ReactiveTextField(
-                    formControl: formViewModel.phoneControl,
-                    decoration: InputDecoration(
-                      hintText: tr.form_field_contact_phone,
+                  FormTableRow(
+                    control: formViewModel.phoneControl,
+                    label: tr.form_field_contact_phone,
+                    input: ReactiveTextField(
+                      formControl: formViewModel.phoneControl,
+                      decoration: InputDecoration(
+                        hintText: tr.form_field_contact_phone,
+                      ),
+                      inputFormatters: [
+                        LengthLimitingTextInputFormatter(50),
+                      ],
+                      validationMessages:
+                          formViewModel.phoneControl.validationMessages,
                     ),
-                    inputFormatters: [
-                      LengthLimitingTextInputFormatter(50),
-                    ],
-                    validationMessages: formViewModel.phoneControl.validationMessages,
                   ),
-                ),
-                FormTableRow(
-                  control: formViewModel.additionalInfoControl,
-                  label: tr.form_field_contact_additional_info,
-                  input: ReactiveTextField(
-                    formControl: formViewModel.additionalInfoControl,
-                    decoration: InputDecoration(
-                      hintText: tr.form_field_contact_additional_info,
+                  FormTableRow(
+                    control: formViewModel.additionalInfoControl,
+                    label: tr.form_field_contact_additional_info,
+                    input: ReactiveTextField(
+                      formControl: formViewModel.additionalInfoControl,
+                      decoration: InputDecoration(
+                        hintText: tr.form_field_contact_additional_info,
+                      ),
+                      keyboardType: TextInputType.multiline,
+                      minLines: 5,
+                      maxLines: 5,
+                      inputFormatters: [LengthLimitingTextInputFormatter(500)],
                     ),
-                    keyboardType: TextInputType.multiline,
-                    minLines: 5,
-                    maxLines: 5,
-                    inputFormatters: [LengthLimitingTextInputFormatter(500)],
                   ),
-                ),
-              ], columnWidths: const {
-                0: FixedColumnWidth(180.0),
-                1: FlexColumnWidth(),
-              },),
+                ],
+                columnWidths: const {
+                  0: FixedColumnWidth(180.0),
+                  1: FlexColumnWidth(),
+                },
+              ),
             ],
           ),
         );
diff --git a/designer_v2/lib/features/design/interventions/intervention_form_controller.dart b/designer_v2/lib/features/design/interventions/intervention_form_controller.dart
index 4167283e2..84902b2f2 100644
--- a/designer_v2/lib/features/design/interventions/intervention_form_controller.dart
+++ b/designer_v2/lib/features/design/interventions/intervention_form_controller.dart
@@ -84,7 +84,8 @@ class InterventionFormViewModel
         validationMessages: {
           ValidationMessage.minLength: (error) =>
               tr.form_array_intervention_tasks_minlength(
-                  (error as Map)['requiredLength'] as num,),
+                (error as Map)['requiredLength'] as num,
+              ),
         },
       );
 
@@ -149,8 +150,11 @@ class InterventionFormViewModel
 
   @override
   List<ModelAction> availableActions(InterventionTaskFormViewModel model) {
-    final actions = tasksCollection.availableActions(model,
-        onEdit: onSelectItem, isReadOnly: isReadonly,);
+    final actions = tasksCollection.availableActions(
+      model,
+      onEdit: onSelectItem,
+      isReadOnly: isReadonly,
+    );
     return withIcons(actions, modelActionIcons);
   }
 
@@ -161,7 +165,8 @@ class InterventionFormViewModel
   }
 
   List<ModelAction> availableInlineActions(
-      InterventionTaskFormViewModel model,) {
+    InterventionTaskFormViewModel model,
+  ) {
     final actions =
         tasksCollection.availableInlineActions(model, isReadOnly: isReadonly);
     return withIcons(actions, modelActionIcons);
@@ -183,13 +188,17 @@ class InterventionFormViewModel
 
   @override
   void onCancel(
-      InterventionTaskFormViewModel formViewModel, FormMode prevFormMode,) {
+    InterventionTaskFormViewModel formViewModel,
+    FormMode prevFormMode,
+  ) {
     return; // no-op
   }
 
   @override
-  Future onSave(InterventionTaskFormViewModel formViewModel,
-      FormMode prevFormMode,) async {
+  Future onSave(
+    InterventionTaskFormViewModel formViewModel,
+    FormMode prevFormMode,
+  ) async {
     if (prevFormMode == FormMode.create) {
       // Save the managed viewmodel that was eagerly added in [provide]
       tasksCollection.commit(formViewModel);
@@ -232,7 +241,8 @@ class InterventionFormViewModel
   }
 
   InterventionTaskFormRouteArgs buildFormRouteArgs(
-      InterventionTaskFormViewModel model,) {
+    InterventionTaskFormViewModel model,
+  ) {
     final args = InterventionTaskFormRouteArgs(
       studyId: study.id,
       interventionId: interventionId,
diff --git a/designer_v2/lib/features/design/interventions/intervention_form_data.dart b/designer_v2/lib/features/design/interventions/intervention_form_data.dart
index 9578d110d..064b99e1c 100644
--- a/designer_v2/lib/features/design/interventions/intervention_form_data.dart
+++ b/designer_v2/lib/features/design/interventions/intervention_form_data.dart
@@ -9,8 +9,13 @@ import 'package:uuid/uuid.dart';
 class InterventionFormData extends IFormData {
   static String get kDefaultTitle => tr.form_field_intervention_title_default;
 
-  InterventionFormData(
-      {required this.interventionId, required this.title, this.description, this.tasksData, this.iconName,});
+  InterventionFormData({
+    required this.interventionId,
+    required this.title,
+    this.description,
+    this.tasksData,
+    this.iconName,
+  });
 
   final InterventionID interventionId;
   final String title;
@@ -26,8 +31,10 @@ class InterventionFormData extends IFormData {
       interventionId: intervention.id,
       title: intervention.name ?? '',
       description: intervention.description,
-      tasksData:
-          intervention.tasks.map((task) => InterventionTaskFormData.fromDomainModel(task as CheckmarkTask)).toList(),
+      tasksData: intervention.tasks
+          .map((task) =>
+              InterventionTaskFormData.fromDomainModel(task as CheckmarkTask))
+          .toList(),
       iconName: intervention.icon,
     );
   }
@@ -35,7 +42,9 @@ class InterventionFormData extends IFormData {
   Intervention toIntervention() {
     final intervention = Intervention(interventionId, title);
     intervention.description = description;
-    intervention.tasks = (tasksData != null) ? tasksData!.map((formData) => formData.toTask()).toList() : [];
+    intervention.tasks = (tasksData != null)
+        ? tasksData!.map((formData) => formData.toTask()).toList()
+        : [];
     intervention.icon = iconName ?? '';
     return intervention;
   }
diff --git a/designer_v2/lib/features/design/interventions/intervention_form_view.dart b/designer_v2/lib/features/design/interventions/intervention_form_view.dart
index 2198a7d0b..8dfff180b 100644
--- a/designer_v2/lib/features/design/interventions/intervention_form_view.dart
+++ b/designer_v2/lib/features/design/interventions/intervention_form_view.dart
@@ -179,8 +179,11 @@ class _InterventionFormViewState extends ConsumerState<InterventionFormView> {
   }
 
   // TODO: refactor to use [RoutingIntent] for sidesheet (so that it can be triggered from controller)
-  void _showSidesheetWithArgs(InterventionTaskFormRouteArgs routeArgs,
-      BuildContext context, WidgetRef ref,) {
+  void _showSidesheetWithArgs(
+    InterventionTaskFormRouteArgs routeArgs,
+    BuildContext context,
+    WidgetRef ref,
+  ) {
     final interventionTaskFormViewModel =
         ref.read(interventionTaskFormViewModelProvider(routeArgs));
     showFormSideSheet<InterventionTaskFormViewModel>(
diff --git a/designer_v2/lib/features/design/interventions/intervention_task_form_controller.dart b/designer_v2/lib/features/design/interventions/intervention_task_form_controller.dart
index 8c7a07c47..0d7274a8c 100644
--- a/designer_v2/lib/features/design/interventions/intervention_task_form_controller.dart
+++ b/designer_v2/lib/features/design/interventions/intervention_task_form_controller.dart
@@ -12,20 +12,26 @@ import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/utils/performance.dart';
 import 'package:uuid/uuid.dart';
 
-class InterventionTaskFormViewModel extends ManagedFormViewModel<InterventionTaskFormData> with WithScheduleControls {
+class InterventionTaskFormViewModel
+    extends ManagedFormViewModel<InterventionTaskFormData>
+    with WithScheduleControls {
   InterventionTaskFormViewModel({
     super.formData,
     super.delegate,
     super.validationSet = StudyFormValidationSet.draft,
   }) {
-    runAsync(() => markAsCompletedControl.markAsDisabled()); // TODO not yet supported
+    runAsync(() =>
+        markAsCompletedControl.markAsDisabled()); // TODO not yet supported
   }
 
   // - Form fields
 
-  final FormControl<TaskID> taskIdControl = FormControl(value: const Uuid().v4()); // hidden
-  final FormControl<InstanceID> instanceIdControl = FormControl(value: const Uuid().v4()); // hidden
-  final FormControl<String> taskTitleControl = FormControl(value: InterventionTaskFormData.kDefaultTitle);
+  final FormControl<TaskID> taskIdControl =
+      FormControl(value: const Uuid().v4()); // hidden
+  final FormControl<InstanceID> instanceIdControl =
+      FormControl(value: const Uuid().v4()); // hidden
+  final FormControl<String> taskTitleControl =
+      FormControl(value: InterventionTaskFormData.kDefaultTitle);
   final FormControl<String> taskDescriptionControl = FormControl();
   final FormControl<bool> markAsCompletedControl = FormControl(value: true);
 
@@ -48,11 +54,16 @@ class InterventionTaskFormViewModel extends ManagedFormViewModel<InterventionTas
     ...scheduleFormControls,
   });
 
-  FormControlValidation get titleRequired => FormControlValidation(control: taskTitleControl, validators: [
-        Validators.required,
-      ], validationMessages: {
-        ValidationMessage.required: (error) => tr.form_field_intervention_task_title_required,
-      },);
+  FormControlValidation get titleRequired => FormControlValidation(
+        control: taskTitleControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              tr.form_field_intervention_task_title_required,
+        },
+      );
 
   @override
   void setControlsFrom(InterventionTaskFormData data) {
@@ -88,6 +99,9 @@ class InterventionTaskFormViewModel extends ManagedFormViewModel<InterventionTas
 
   @override
   InterventionTaskFormViewModel createDuplicate() {
-    return InterventionTaskFormViewModel(delegate: delegate, formData: formData?.copy(), validationSet: validationSet);
+    return InterventionTaskFormViewModel(
+        delegate: delegate,
+        formData: formData?.copy(),
+        validationSet: validationSet);
   }
 }
diff --git a/designer_v2/lib/features/design/interventions/intervention_task_form_view.dart b/designer_v2/lib/features/design/interventions/intervention_task_form_view.dart
index 34c39a62b..69dc27301 100644
--- a/designer_v2/lib/features/design/interventions/intervention_task_form_view.dart
+++ b/designer_v2/lib/features/design/interventions/intervention_task_form_view.dart
@@ -17,7 +17,8 @@ class InterventionTaskFormView extends StatefulWidget {
 
   final InterventionTaskFormViewModel formViewModel;
   @override
-  State<InterventionTaskFormView> createState() => _InterventionTaskFormViewState();
+  State<InterventionTaskFormView> createState() =>
+      _InterventionTaskFormViewState();
 }
 
 class _InterventionTaskFormViewState extends State<InterventionTaskFormView> {
@@ -33,81 +34,94 @@ class _InterventionTaskFormViewState extends State<InterventionTaskFormView> {
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          FormTableLayout(rowLayout: FormTableRowLayout.vertical, rows: [
-            FormTableRow(
-              control: widget.formViewModel.taskTitleControl,
-              label: tr.form_field_intervention_task_title,
-              labelHelpText: tr.form_field_intervention_task_title_tooltip,
-              input: ReactiveTextField(
-                formControl: widget.formViewModel.taskTitleControl,
-                decoration: InputDecoration(
-                  hintText: tr.form_field_intervention_task_title,
+          FormTableLayout(
+            rowLayout: FormTableRowLayout.vertical,
+            rows: [
+              FormTableRow(
+                control: widget.formViewModel.taskTitleControl,
+                label: tr.form_field_intervention_task_title,
+                labelHelpText: tr.form_field_intervention_task_title_tooltip,
+                input: ReactiveTextField(
+                  formControl: widget.formViewModel.taskTitleControl,
+                  decoration: InputDecoration(
+                    hintText: tr.form_field_intervention_task_title,
+                  ),
+                  inputFormatters: [
+                    LengthLimitingTextInputFormatter(200),
+                  ],
+                  validationMessages:
+                      widget.formViewModel.taskTitleControl.validationMessages,
                 ),
-                inputFormatters: [
-                  LengthLimitingTextInputFormatter(200),
-                ],
-                validationMessages: widget.formViewModel.taskTitleControl.validationMessages,
               ),
-            ),
-            FormTableRow(
-              control: widget.formViewModel.taskDescriptionControl,
-              labelBuilder: (context) => Row(
-                children: [
-                  FormLabel(
-                    labelText: tr.form_field_intervention_task_description,
-                    helpText: tr.form_field_intervention_task_description_tooltip,
-                  ),
-                  const SizedBox(height: 8),
-                  Container(
-                    margin: const EdgeInsets.only(left: 3.0),
-                    child: Opacity(
-                      opacity: ThemeConfig.kMuteFadeFactor,
-                      child: Tooltip(
-                        message: "Use html to style your content",
-                        child: Hyperlink(
-                          text: "styleable",
-                          onClick: () => setState(() {
-                            isStylingInformationDismissed = !isStylingInformationDismissed;
-                          }),
-                          visitedColor: null,
+              FormTableRow(
+                control: widget.formViewModel.taskDescriptionControl,
+                labelBuilder: (context) => Row(
+                  children: [
+                    FormLabel(
+                      labelText: tr.form_field_intervention_task_description,
+                      helpText:
+                          tr.form_field_intervention_task_description_tooltip,
+                    ),
+                    const SizedBox(height: 8),
+                    Container(
+                      margin: const EdgeInsets.only(left: 3.0),
+                      child: Opacity(
+                        opacity: ThemeConfig.kMuteFadeFactor,
+                        child: Tooltip(
+                          message: "Use html to style your content",
+                          child: Hyperlink(
+                            text: "styleable",
+                            onClick: () => setState(() {
+                              isStylingInformationDismissed =
+                                  !isStylingInformationDismissed;
+                            }),
+                            visitedColor: null,
+                          ),
                         ),
                       ),
                     ),
+                  ],
+                ),
+                input: ReactiveTextField(
+                  formControl: widget.formViewModel.taskDescriptionControl,
+                  decoration: InputDecoration(
+                    hintText: tr.form_field_intervention_task_description_hint,
                   ),
-                ],
-              ),
-              input: ReactiveTextField(
-                formControl: widget.formViewModel.taskDescriptionControl,
-                decoration: InputDecoration(
-                  hintText: tr.form_field_intervention_task_description_hint,
+                  inputFormatters: [
+                    LengthLimitingTextInputFormatter(2000),
+                  ],
+                  validationMessages: widget
+                      .formViewModel.taskDescriptionControl.validationMessages,
+                  keyboardType: TextInputType.multiline,
+                  minLines: 5,
+                  maxLines: 5,
                 ),
-                inputFormatters: [
-                  LengthLimitingTextInputFormatter(2000),
-                ],
-                validationMessages: widget.formViewModel.taskDescriptionControl.validationMessages,
-                keyboardType: TextInputType.multiline,
-                minLines: 5,
-                maxLines: 5,
               ),
-            ),
-          ],),
+            ],
+          ),
           HtmlStylingBanner(
             isDismissed: isStylingInformationDismissed,
             onDismissed: onDismissedCallback,
           ),
           const SizedBox(height: 12.0),
-          ReactiveFormConsumer(builder: (context, form, child) {
-            return Wrap(crossAxisAlignment: WrapCrossAlignment.center, children: [
-              ReactiveCheckbox(
-                formControl: widget.formViewModel.markAsCompletedControl,
-              ),
-              const SizedBox(width: 3.0),
-              FormControlLabel(
-                formControl: widget.formViewModel.markAsCompletedControl,
-                text: tr.form_field_intervention_task_mark_as_completed_label,
-              ),
-            ],);
-          },),
+          ReactiveFormConsumer(
+            builder: (context, form, child) {
+              return Wrap(
+                crossAxisAlignment: WrapCrossAlignment.center,
+                children: [
+                  ReactiveCheckbox(
+                    formControl: widget.formViewModel.markAsCompletedControl,
+                  ),
+                  const SizedBox(width: 3.0),
+                  FormControlLabel(
+                    formControl: widget.formViewModel.markAsCompletedControl,
+                    text:
+                        tr.form_field_intervention_task_mark_as_completed_label,
+                  ),
+                ],
+              );
+            },
+          ),
           const SizedBox(height: 24.0),
           ScheduleControls(formViewModel: widget.formViewModel),
         ],
diff --git a/designer_v2/lib/features/design/interventions/interventions_form_data.dart b/designer_v2/lib/features/design/interventions/interventions_form_data.dart
index 332bc2fe7..b85f66173 100644
--- a/designer_v2/lib/features/design/interventions/interventions_form_data.dart
+++ b/designer_v2/lib/features/design/interventions/interventions_form_data.dart
@@ -4,25 +4,30 @@ import 'package:studyu_designer_v2/features/design/interventions/study_schedule_
 import 'package:studyu_designer_v2/features/design/study_form_data.dart';
 
 class InterventionsFormData implements IStudyFormData {
-  InterventionsFormData({required this.interventionsData, required this.studyScheduleData});
+  InterventionsFormData(
+      {required this.interventionsData, required this.studyScheduleData});
 
   final List<InterventionFormData> interventionsData;
   final StudyScheduleFormData studyScheduleData;
 
   @override
-  String get id => throw UnimplementedError(); // not needed for top-level form data
+  String get id =>
+      throw UnimplementedError(); // not needed for top-level form data
 
   factory InterventionsFormData.fromStudy(Study study) {
     return InterventionsFormData(
-      interventionsData:
-          study.interventions.map((intervention) => InterventionFormData.fromDomainModel(intervention)).toList(),
+      interventionsData: study.interventions
+          .map((intervention) =>
+              InterventionFormData.fromDomainModel(intervention))
+          .toList(),
       studyScheduleData: StudyScheduleFormData.fromDomainModel(study.schedule),
     );
   }
 
   @override
   Study apply(Study study) {
-    final List<Intervention> interventions = interventionsData.map((formData) => formData.toIntervention()).toList();
+    final List<Intervention> interventions =
+        interventionsData.map((formData) => formData.toIntervention()).toList();
     study.interventions = interventions;
 
     studyScheduleData.apply(study);
diff --git a/designer_v2/lib/features/design/interventions/interventions_form_view.dart b/designer_v2/lib/features/design/interventions/interventions_form_view.dart
index 75b473329..ea863ae02 100644
--- a/designer_v2/lib/features/design/interventions/interventions_form_view.dart
+++ b/designer_v2/lib/features/design/interventions/interventions_form_view.dart
@@ -26,7 +26,8 @@ class StudyDesignInterventionsFormView extends StudyDesignPageWidget {
     return AsyncValueWidget<Study>(
       value: state.study,
       data: (study) {
-        final formViewModel = ref.read(interventionsFormViewModelProvider(studyId));
+        final formViewModel =
+            ref.read(interventionsFormViewModelProvider(studyId));
         return ReactiveForm(
           formGroup: formViewModel.form,
           child: Column(
@@ -43,43 +44,51 @@ class StudyDesignInterventionsFormView extends StudyDesignPageWidget {
               ),
               const SizedBox(height: 24.0),
               ReactiveFormConsumer(
-                  // [ReactiveFormConsumer] is needed to to rerender when descendant controls are updated
-                  // By default, ReactiveFormArray only updates when adding/removing controls
-                  builder: (context, form, child) {
-                return ReactiveFormArray(
-                  formArray: formViewModel.interventionsArray,
-                  builder: (context, formArray, child) {
-                    return FormArrayTable<InterventionFormViewModel>(
-                      control: formViewModel.interventionsArray,
-                      items: formViewModel.interventionsCollection.formViewModels,
-                      onSelectItem: formViewModel.onSelectItem,
-                      getActionsAt: (viewModel, _) => formViewModel.availablePopupActions(viewModel),
-                      onNewItem: formViewModel.onNewItem,
-                      onNewItemLabel: tr.form_array_interventions_new,
-                      rowTitle: (viewModel) => viewModel.formData?.title ?? '',
-                      sectionTitle: tr.form_array_interventions,
-                      sectionTitleDivider: false,
-                      emptyIcon: Icons.content_paste_off_rounded,
-                      emptyTitle: tr.form_array_interventions_empty_title,
-                      emptyDescription: tr.form_array_interventions_empty_description,
-                      hideLeadingTrailingWhenEmpty: true,
-                      rowPrefix: (context, viewModel, rowIdx) {
-                        return Row(
-                          children: [
-                            Text(
-                              ''.alphabetLetterFrom(rowIdx).toUpperCase(),
-                              style: TextStyle(
-                                color: ThemeConfig.dropdownMenuItemTheme(theme).iconTheme!.color,
+                // [ReactiveFormConsumer] is needed to to rerender when descendant controls are updated
+                // By default, ReactiveFormArray only updates when adding/removing controls
+                builder: (context, form, child) {
+                  return ReactiveFormArray(
+                    formArray: formViewModel.interventionsArray,
+                    builder: (context, formArray, child) {
+                      return FormArrayTable<InterventionFormViewModel>(
+                        control: formViewModel.interventionsArray,
+                        items: formViewModel
+                            .interventionsCollection.formViewModels,
+                        onSelectItem: formViewModel.onSelectItem,
+                        getActionsAt: (viewModel, _) =>
+                            formViewModel.availablePopupActions(viewModel),
+                        onNewItem: formViewModel.onNewItem,
+                        onNewItemLabel: tr.form_array_interventions_new,
+                        rowTitle: (viewModel) =>
+                            viewModel.formData?.title ?? '',
+                        sectionTitle: tr.form_array_interventions,
+                        sectionTitleDivider: false,
+                        emptyIcon: Icons.content_paste_off_rounded,
+                        emptyTitle: tr.form_array_interventions_empty_title,
+                        emptyDescription:
+                            tr.form_array_interventions_empty_description,
+                        hideLeadingTrailingWhenEmpty: true,
+                        rowPrefix: (context, viewModel, rowIdx) {
+                          return Row(
+                            children: [
+                              Text(
+                                ''.alphabetLetterFrom(rowIdx).toUpperCase(),
+                                style: TextStyle(
+                                  color:
+                                      ThemeConfig.dropdownMenuItemTheme(theme)
+                                          .iconTheme!
+                                          .color,
+                                ),
                               ),
-                            ),
-                            const SizedBox(width: 16.0),
-                          ],
-                        );
-                      },
-                    );
-                  },
-                );
-              },),
+                              const SizedBox(width: 16.0),
+                            ],
+                          );
+                        },
+                      );
+                    },
+                  );
+                },
+              ),
               const SizedBox(height: 24.0),
               Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -88,14 +97,17 @@ class StudyDesignInterventionsFormView extends StudyDesignPageWidget {
                     tr.form_section_crossover_schedule,
                     style: Theme.of(context).textTheme.titleLarge,
                   ),
-                  if (formViewModel.canTestStudySchedule) Opacity(
-                          opacity: ThemeConfig.kMuteFadeFactor,
-                          child: TextButton.icon(
-                            onPressed: formViewModel.testStudySchedule,
-                            icon: const Icon(Icons.play_circle_outline_rounded),
-                            label: Text(tr.navlink_crossover_schedule_test),
-                          ),
-                        ) else const SizedBox.shrink(),
+                  if (formViewModel.canTestStudySchedule)
+                    Opacity(
+                      opacity: ThemeConfig.kMuteFadeFactor,
+                      child: TextButton.icon(
+                        onPressed: formViewModel.testStudySchedule,
+                        icon: const Icon(Icons.play_circle_outline_rounded),
+                        label: Text(tr.navlink_crossover_schedule_test),
+                      ),
+                    )
+                  else
+                    const SizedBox.shrink(),
                 ],
               ),
               const Divider(),
diff --git a/designer_v2/lib/features/design/interventions/study_schedule_form_controller_mixin.dart b/designer_v2/lib/features/design/interventions/study_schedule_form_controller_mixin.dart
index c743c2ebb..a012bb4b6 100644
--- a/designer_v2/lib/features/design/interventions/study_schedule_form_controller_mixin.dart
+++ b/designer_v2/lib/features/design/interventions/study_schedule_form_controller_mixin.dart
@@ -13,10 +13,14 @@ mixin StudyScheduleControls {
   static const defaultNumCycles = 2;
   static const defaultPeriodLength = 7;
 
-  final FormControl<PhaseSequence> sequenceTypeControl = FormControl(value: defaultScheduleType);
-  final FormControl<String> sequenceTypeCustomControl = FormControl(value: defaultScheduleTypeSequence);
-  final FormControl<int> phaseDurationControl = FormControl(value: defaultPeriodLength);
-  final FormControl<int> numCyclesControl = FormControl(value: defaultNumCycles);
+  final FormControl<PhaseSequence> sequenceTypeControl =
+      FormControl(value: defaultScheduleType);
+  final FormControl<String> sequenceTypeCustomControl =
+      FormControl(value: defaultScheduleTypeSequence);
+  final FormControl<int> phaseDurationControl =
+      FormControl(value: defaultPeriodLength);
+  final FormControl<int> numCyclesControl =
+      FormControl(value: defaultNumCycles);
   final FormControl<bool> includeBaselineControl = FormControl(value: true);
 
   List<FormControlOption<PhaseSequence>> get sequenceTypeControlOptions =>
@@ -32,8 +36,16 @@ mixin StudyScheduleControls {
 
   FormValidationConfigSet get studyScheduleValidationConfig => {
         StudyFormValidationSet.draft: [],
-        StudyFormValidationSet.publish: [customSequenceRequired, numCyclesRange, phaseDurationRange],
-        StudyFormValidationSet.test: [customSequenceRequired, numCyclesRange, phaseDurationRange],
+        StudyFormValidationSet.publish: [
+          customSequenceRequired,
+          numCyclesRange,
+          phaseDurationRange
+        ],
+        StudyFormValidationSet.test: [
+          customSequenceRequired,
+          numCyclesRange,
+          phaseDurationRange
+        ],
       };
 
   static int kNumCyclesMin = 1;
@@ -47,11 +59,14 @@ mixin StudyScheduleControls {
         ],
         validationMessages: {
           ValidationMessage.required: (error) =>
-              tr.form_field_crossover_schedule_num_cycles_range(kNumCyclesMin, kNumCyclesMax),
+              tr.form_field_crossover_schedule_num_cycles_range(
+                  kNumCyclesMin, kNumCyclesMax),
           ValidationMessage.min: (error) =>
-              tr.form_field_crossover_schedule_num_cycles_range(kNumCyclesMin, kNumCyclesMax),
+              tr.form_field_crossover_schedule_num_cycles_range(
+                  kNumCyclesMin, kNumCyclesMax),
           ValidationMessage.max: (error) =>
-              tr.form_field_crossover_schedule_num_cycles_range(kNumCyclesMin, kNumCyclesMax),
+              tr.form_field_crossover_schedule_num_cycles_range(
+                  kNumCyclesMin, kNumCyclesMax),
         },
       );
 
@@ -59,22 +74,34 @@ mixin StudyScheduleControls {
   static int kPhaseDurationMax = 365;
   FormControlValidation get phaseDurationRange => FormControlValidation(
         control: phaseDurationControl,
-        validators: [Validators.required, Validators.min(kPhaseDurationMin), Validators.max(kPhaseDurationMax)],
+        validators: [
+          Validators.required,
+          Validators.min(kPhaseDurationMin),
+          Validators.max(kPhaseDurationMax)
+        ],
         validationMessages: {
           ValidationMessage.required: (error) =>
-              tr.form_field_crossover_schedule_phase_length_range(kPhaseDurationMin, kPhaseDurationMax),
+              tr.form_field_crossover_schedule_phase_length_range(
+                  kPhaseDurationMin, kPhaseDurationMax),
           ValidationMessage.min: (error) =>
-              tr.form_field_crossover_schedule_phase_length_range(kPhaseDurationMin, kPhaseDurationMax),
+              tr.form_field_crossover_schedule_phase_length_range(
+                  kPhaseDurationMin, kPhaseDurationMax),
           ValidationMessage.max: (error) =>
-              tr.form_field_crossover_schedule_phase_length_range(kPhaseDurationMin, kPhaseDurationMax),
+              tr.form_field_crossover_schedule_phase_length_range(
+                  kPhaseDurationMin, kPhaseDurationMax),
         },
       );
 
-  FormControlValidation get customSequenceRequired => FormControlValidation(control: sequenceTypeCustomControl, validators: [
-        Validators.required,
-      ], validationMessages: {
-        ValidationMessage.required: (error) => 'Custom sequence needs to be specified.',
-      },);
+  FormControlValidation get customSequenceRequired => FormControlValidation(
+        control: sequenceTypeCustomControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) =>
+              'Custom sequence needs to be specified.',
+        },
+      );
 
   void setStudyScheduleControlsFrom(StudyScheduleFormData data) {
     sequenceTypeControl.value = data.sequenceType;
diff --git a/designer_v2/lib/features/design/interventions/study_schedule_form_data.dart b/designer_v2/lib/features/design/interventions/study_schedule_form_data.dart
index df9dee9e0..5dc0911cc 100644
--- a/designer_v2/lib/features/design/interventions/study_schedule_form_data.dart
+++ b/designer_v2/lib/features/design/interventions/study_schedule_form_data.dart
@@ -3,12 +3,13 @@ import 'package:studyu_designer_v2/features/design/study_form_data.dart';
 import 'package:studyu_designer_v2/features/forms/form_data.dart';
 
 class StudyScheduleFormData implements IStudyFormData {
-  StudyScheduleFormData(
-      {required this.sequenceType,
-      required this.sequenceTypeCustom,
-      required this.numCycles,
-      required this.phaseDuration,
-      required this.includeBaseline,});
+  StudyScheduleFormData({
+    required this.sequenceType,
+    required this.sequenceTypeCustom,
+    required this.numCycles,
+    required this.phaseDuration,
+    required this.includeBaseline,
+  });
 
   final PhaseSequence sequenceType;
   final String sequenceTypeCustom;
@@ -48,5 +49,6 @@ class StudyScheduleFormData implements IStudyFormData {
   }
 
   @override
-  FormDataID get id => throw UnimplementedError(); // not needed for top-level form data
+  FormDataID get id =>
+      throw UnimplementedError(); // not needed for top-level form data
 }
diff --git a/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart b/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart
index d00e744c9..a1a3f724e 100644
--- a/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart
+++ b/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart
@@ -19,21 +19,23 @@ class StudyScheduleFormView extends FormConsumerWidget {
       return FormTableRow(input: const SizedBox.shrink());
     } else {
       return FormTableRow(
-          control: formViewModel.sequenceTypeCustomControl,
-          label: "Custom Sequence",
-          // todo translate
-          labelHelpText: "Enter a custom sequence by using the letters A and B",
-          // todo translate
-          input: ReactiveTextField(
-            formControl: formViewModel.sequenceTypeCustomControl,
-            keyboardType: TextInputType.text,
-            inputFormatters: <TextInputFormatter>[
-              FilteringTextInputFormatter.singleLineFormatter,
-              LengthLimitingTextInputFormatter(10),
-              StudySequenceFormatter(),
-            ],
-            validationMessages: formViewModel.sequenceTypeCustomControl.validationMessages,
-          ),);
+        control: formViewModel.sequenceTypeCustomControl,
+        label: "Custom Sequence",
+        // todo translate
+        labelHelpText: "Enter a custom sequence by using the letters A and B",
+        // todo translate
+        input: ReactiveTextField(
+          formControl: formViewModel.sequenceTypeCustomControl,
+          keyboardType: TextInputType.text,
+          inputFormatters: <TextInputFormatter>[
+            FilteringTextInputFormatter.singleLineFormatter,
+            LengthLimitingTextInputFormatter(10),
+            StudySequenceFormatter(),
+          ],
+          validationMessages:
+              formViewModel.sequenceTypeCustomControl.validationMessages,
+        ),
+      );
     }
   }
 
@@ -51,23 +53,28 @@ class StudyScheduleFormView extends FormConsumerWidget {
               input: ReactiveDropdownField(
                 formControl: formViewModel.sequenceTypeControl,
                 decoration: InputDecoration(
-                  helperText: tr.form_field_crossover_schedule_sequence_description,
+                  helperText:
+                      tr.form_field_crossover_schedule_sequence_description,
                   helperMaxLines: 5,
                 ),
                 items: formViewModel.sequenceTypeControlOptions
-                    .map((option) => DropdownMenuItem(
-                          value: option.value,
-                          child: Text(option.label),
-                        ),)
+                    .map(
+                      (option) => DropdownMenuItem(
+                        value: option.value,
+                        child: Text(option.label),
+                      ),
+                    )
                     .toList(),
-                validationMessages: formViewModel.sequenceTypeControl.validationMessages,
+                validationMessages:
+                    formViewModel.sequenceTypeControl.validationMessages,
               ),
             ),
             _renderCustomSequence(),
             FormTableRow(
               control: formViewModel.phaseDurationControl,
               label: tr.form_field_crossover_schedule_phase_length,
-              labelHelpText: tr.form_field_crossover_schedule_phase_length_tooltip,
+              labelHelpText:
+                  tr.form_field_crossover_schedule_phase_length_tooltip,
               input: Row(
                 children: [
                   Container(
@@ -83,7 +90,8 @@ class StudyScheduleFormView extends FormConsumerWidget {
                           max: StudyScheduleControls.kPhaseDurationMax,
                         ),
                       ],
-                      validationMessages: formViewModel.phaseDurationControl.validationMessages,
+                      validationMessages:
+                          formViewModel.phaseDurationControl.validationMessages,
                     ),
                   ),
                   const SizedBox(width: 8.0),
@@ -97,7 +105,8 @@ class StudyScheduleFormView extends FormConsumerWidget {
             FormTableRow(
               control: formViewModel.numCyclesControl,
               label: tr.form_field_crossover_schedule_num_cycles,
-              labelHelpText: tr.form_field_crossover_schedule_num_cycles_tooltip,
+              labelHelpText:
+                  tr.form_field_crossover_schedule_num_cycles_tooltip,
               input: Row(
                 children: [
                   Container(
@@ -113,7 +122,8 @@ class StudyScheduleFormView extends FormConsumerWidget {
                           max: StudyScheduleControls.kNumCyclesMax,
                         ),
                       ],
-                      validationMessages: formViewModel.numCyclesControl.validationMessages,
+                      validationMessages:
+                          formViewModel.numCyclesControl.validationMessages,
                     ),
                   ),
                   const SizedBox(width: 8.0),
@@ -127,7 +137,8 @@ class StudyScheduleFormView extends FormConsumerWidget {
             FormTableRow(
               control: formViewModel.includeBaselineControl,
               label: tr.form_field_crossover_schedule_include_baseline,
-              labelHelpText: tr.form_field_crossover_schedule_include_baseline_tooltip,
+              labelHelpText:
+                  tr.form_field_crossover_schedule_include_baseline_tooltip,
               input: Row(
                 children: [
                   Container(
@@ -139,7 +150,8 @@ class StudyScheduleFormView extends FormConsumerWidget {
                   const SizedBox(width: 8.0),
                   FormControlLabel(
                     formControl: formViewModel.includeBaselineControl,
-                    text: tr.form_field_crossover_schedule_include_baseline_label,
+                    text:
+                        tr.form_field_crossover_schedule_include_baseline_label,
                   ),
                 ],
               ),
diff --git a/designer_v2/lib/features/design/measurements/measurements_form_controller.dart b/designer_v2/lib/features/design/measurements/measurements_form_controller.dart
index 2ab71bc17..3b9ab3546 100644
--- a/designer_v2/lib/features/design/measurements/measurements_form_controller.dart
+++ b/designer_v2/lib/features/design/measurements/measurements_form_controller.dart
@@ -107,20 +107,27 @@ class MeasurementsFormViewModel extends FormViewModel<MeasurementsFormData>
 
   @override
   List<ModelAction> availableActions(MeasurementSurveyFormViewModel model) {
-    final actions = surveyMeasurementFormViewModels.availableActions(model,
-        onEdit: onSelectItem, isReadOnly: isReadonly,);
+    final actions = surveyMeasurementFormViewModels.availableActions(
+      model,
+      onEdit: onSelectItem,
+      isReadOnly: isReadonly,
+    );
     return withIcons(actions, modelActionIcons);
   }
 
   List<ModelAction> availablePopupActions(
-      MeasurementSurveyFormViewModel model,) {
-    final actions = surveyMeasurementFormViewModels.availablePopupActions(model,
-        isReadOnly: isReadonly,);
+    MeasurementSurveyFormViewModel model,
+  ) {
+    final actions = surveyMeasurementFormViewModels.availablePopupActions(
+      model,
+      isReadOnly: isReadonly,
+    );
     return withIcons(actions, modelActionIcons);
   }
 
   List<ModelAction> availableInlineActions(
-      MeasurementSurveyFormViewModel model,) {
+    MeasurementSurveyFormViewModel model,
+  ) {
     final actions = surveyMeasurementFormViewModels
         .availableInlineActions(model, isReadOnly: isReadonly);
     return withIcons(actions, modelActionIcons);
@@ -138,7 +145,8 @@ class MeasurementsFormViewModel extends FormViewModel<MeasurementsFormData>
   void onNewItem() {
     final studyId = study.id;
     router.dispatch(
-        RoutingIntents.studyEditMeasurement(studyId, Config.newModelId),);
+      RoutingIntents.studyEditMeasurement(studyId, Config.newModelId),
+    );
   }
 
   // - IProviderArgsResolver
@@ -169,13 +177,17 @@ class MeasurementsFormViewModel extends FormViewModel<MeasurementsFormData>
 
   @override
   void onCancel(
-      MeasurementSurveyFormViewModel formViewModel, FormMode formMode,) {
+    MeasurementSurveyFormViewModel formViewModel,
+    FormMode formMode,
+  ) {
     return; // no-op
   }
 
   @override
-  Future onSave(MeasurementSurveyFormViewModel formViewModel,
-      FormMode prevFormMode,) async {
+  Future onSave(
+    MeasurementSurveyFormViewModel formViewModel,
+    FormMode prevFormMode,
+  ) async {
     if (prevFormMode == FormMode.create) {
       // Commit the managed viewmodel that was eagerly added in [provide]
       surveyMeasurementFormViewModels.commit(formViewModel);
diff --git a/designer_v2/lib/features/design/measurements/measurements_form_data.dart b/designer_v2/lib/features/design/measurements/measurements_form_data.dart
index eaf5760e3..00596922a 100644
--- a/designer_v2/lib/features/design/measurements/measurements_form_data.dart
+++ b/designer_v2/lib/features/design/measurements/measurements_form_data.dart
@@ -8,19 +8,23 @@ class MeasurementsFormData implements IStudyFormData {
   final List<MeasurementSurveyFormData> surveyMeasurements;
 
   @override
-  String get id => throw UnimplementedError(); // not needed for top-level form data
+  String get id =>
+      throw UnimplementedError(); // not needed for top-level form data
 
   factory MeasurementsFormData.fromStudy(Study study) {
     return MeasurementsFormData(
-        surveyMeasurements: study.observations
-            .map((observation) => MeasurementSurveyFormData.fromDomainModel(observation as QuestionnaireTask))
-            .toList(),);
+      surveyMeasurements: study.observations
+          .map((observation) => MeasurementSurveyFormData.fromDomainModel(
+              observation as QuestionnaireTask))
+          .toList(),
+    );
   }
 
   @override
   Study apply(Study study) {
-    final List<QuestionnaireTask> surveys =
-        surveyMeasurements.map((formData) => formData.toQuestionnaireTask()).toList();
+    final List<QuestionnaireTask> surveys = surveyMeasurements
+        .map((formData) => formData.toQuestionnaireTask())
+        .toList();
     study.observations = surveys;
     return study;
   }
diff --git a/designer_v2/lib/features/design/measurements/measurements_form_view.dart b/designer_v2/lib/features/design/measurements/measurements_form_view.dart
index 2144fd71a..502a0e26b 100644
--- a/designer_v2/lib/features/design/measurements/measurements_form_view.dart
+++ b/designer_v2/lib/features/design/measurements/measurements_form_view.dart
@@ -21,39 +21,46 @@ class StudyDesignMeasurementsFormView extends StudyDesignPageWidget {
     return AsyncValueWidget<Study>(
       value: state.study,
       data: (study) {
-        final formViewModel = ref.read(measurementsFormViewModelProvider(studyId));
+        final formViewModel =
+            ref.read(measurementsFormViewModelProvider(studyId));
         return ReactiveForm(
           formGroup: formViewModel.form,
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: <Widget>[
-              TextParagraph(text: tr.form_study_design_measurements_description),
+              TextParagraph(
+                  text: tr.form_study_design_measurements_description),
               const SizedBox(height: 32.0),
               ReactiveFormConsumer(
-                  // [ReactiveFormConsumer] is needed to to rerender when descendant controls are updated
-                  // By default, ReactiveFormArray only updates when adding/removing controls
-                  builder: (context, form, child) {
-                return ReactiveFormArray(
-                  formArray: formViewModel.measurementsArray,
-                  builder: (context, formArray, child) {
-                    return FormArrayTable<MeasurementSurveyFormViewModel>(
-                      control: formViewModel.measurementsArray,
-                      items: formViewModel.measurementViewModels,
-                      onSelectItem: formViewModel.onSelectItem,
-                      getActionsAt: (viewModel, _) => formViewModel.availablePopupActions(viewModel),
-                      onNewItem: formViewModel.onNewItem,
-                      onNewItemLabel: tr.form_array_measurements_surveys_new,
-                      rowTitle: (viewModel) => viewModel.formData?.title ?? '',
-                      sectionTitle: tr.form_array_measurements_surveys,
-                      sectionTitleDivider: false,
-                      emptyIcon: Icons.content_paste_off_rounded,
-                      emptyTitle: tr.form_array_measurements_surveys_empty_title,
-                      emptyDescription: tr.form_array_measurements_surveys_empty_description,
-                      hideLeadingTrailingWhenEmpty: true,
-                    );
-                  },
-                );
-              },),
+                // [ReactiveFormConsumer] is needed to to rerender when descendant controls are updated
+                // By default, ReactiveFormArray only updates when adding/removing controls
+                builder: (context, form, child) {
+                  return ReactiveFormArray(
+                    formArray: formViewModel.measurementsArray,
+                    builder: (context, formArray, child) {
+                      return FormArrayTable<MeasurementSurveyFormViewModel>(
+                        control: formViewModel.measurementsArray,
+                        items: formViewModel.measurementViewModels,
+                        onSelectItem: formViewModel.onSelectItem,
+                        getActionsAt: (viewModel, _) =>
+                            formViewModel.availablePopupActions(viewModel),
+                        onNewItem: formViewModel.onNewItem,
+                        onNewItemLabel: tr.form_array_measurements_surveys_new,
+                        rowTitle: (viewModel) =>
+                            viewModel.formData?.title ?? '',
+                        sectionTitle: tr.form_array_measurements_surveys,
+                        sectionTitleDivider: false,
+                        emptyIcon: Icons.content_paste_off_rounded,
+                        emptyTitle:
+                            tr.form_array_measurements_surveys_empty_title,
+                        emptyDescription: tr
+                            .form_array_measurements_surveys_empty_description,
+                        hideLeadingTrailingWhenEmpty: true,
+                      );
+                    },
+                  );
+                },
+              ),
             ],
           ),
         );
diff --git a/designer_v2/lib/features/design/measurements/survey/survey_form_controller.dart b/designer_v2/lib/features/design/measurements/survey/survey_form_controller.dart
index c65a9bb49..ea57e0d36 100644
--- a/designer_v2/lib/features/design/measurements/survey/survey_form_controller.dart
+++ b/designer_v2/lib/features/design/measurements/survey/survey_form_controller.dart
@@ -74,7 +74,8 @@ class MeasurementSurveyFormViewModel
         validationMessages: {
           ValidationMessage.minLength: (error) =>
               tr.form_array_measurement_survey_questions_minlength(
-                  (error as Map)['requiredLength'] as num,),
+                (error as Map)['requiredLength'] as num,
+              ),
         },
       );
 
@@ -137,20 +138,27 @@ class MeasurementSurveyFormViewModel
 
   @override
   List<ModelAction> availableActions(QuestionFormViewModel model) {
-    final actions = questionFormViewModels.availableActions(model,
-        onEdit: onSelectItem, isReadOnly: isReadonly,);
+    final actions = questionFormViewModels.availableActions(
+      model,
+      onEdit: onSelectItem,
+      isReadOnly: isReadonly,
+    );
     return withIcons(actions, modelActionIcons);
   }
 
   List<ModelAction> availablePopupActions(QuestionFormViewModel model) {
-    final actions = questionFormViewModels.availablePopupActions(model,
-        isReadOnly: isReadonly,);
+    final actions = questionFormViewModels.availablePopupActions(
+      model,
+      isReadOnly: isReadonly,
+    );
     return withIcons(actions, modelActionIcons);
   }
 
   List<ModelAction> availableInlineActions(QuestionFormViewModel model) {
-    final actions = questionFormViewModels.availableInlineActions(model,
-        isReadOnly: isReadonly,);
+    final actions = questionFormViewModels.availableInlineActions(
+      model,
+      isReadOnly: isReadonly,
+    );
     return withIcons(actions, modelActionIcons);
   }
 
diff --git a/designer_v2/lib/features/design/measurements/survey/survey_form_data.dart b/designer_v2/lib/features/design/measurements/survey/survey_form_data.dart
index f6cdcb442..f26b42a09 100644
--- a/designer_v2/lib/features/design/measurements/survey/survey_form_data.dart
+++ b/designer_v2/lib/features/design/measurements/survey/survey_form_data.dart
@@ -9,7 +9,8 @@ import 'package:studyu_designer_v2/utils/extensions.dart';
 import 'package:uuid/uuid.dart';
 
 class MeasurementSurveyFormData extends IFormDataWithSchedule {
-  static String get kDefaultTitle => tr.form_field_measurement_survey_title_default;
+  static String get kDefaultTitle =>
+      tr.form_field_measurement_survey_title_default;
 
   MeasurementSurveyFormData({
     required this.measurementId,
@@ -34,13 +35,15 @@ class MeasurementSurveyFormData extends IFormDataWithSchedule {
   @override
   FormDataID get id => measurementId;
 
-  factory MeasurementSurveyFormData.fromDomainModel(QuestionnaireTask questionnaireTask) {
+  factory MeasurementSurveyFormData.fromDomainModel(
+      QuestionnaireTask questionnaireTask) {
     return MeasurementSurveyFormData(
       measurementId: questionnaireTask.id,
       title: questionnaireTask.title ?? '',
       introText: questionnaireTask.header,
       outroText: questionnaireTask.footer,
-      questionnaireFormData: QuestionnaireFormData.fromDomainModel(questionnaireTask.questions, []),
+      questionnaireFormData: QuestionnaireFormData.fromDomainModel(
+          questionnaireTask.questions, []),
       isTimeLocked: questionnaireTask.schedule.isTimeRestricted,
       timeLockStart: questionnaireTask.schedule.restrictedTimeStart,
       timeLockEnd: questionnaireTask.schedule.restrictedTimeEnd,
diff --git a/designer_v2/lib/features/design/measurements/survey/survey_form_view.dart b/designer_v2/lib/features/design/measurements/survey/survey_form_view.dart
index 7eb02bc03..eb19f7c3e 100644
--- a/designer_v2/lib/features/design/measurements/survey/survey_form_view.dart
+++ b/designer_v2/lib/features/design/measurements/survey/survey_form_view.dart
@@ -91,7 +91,8 @@ class _MeasurementSurveyFormViewState
               input: ReactiveTextField(
                 formControl: widget.formViewModel.surveyIntroTextControl,
                 decoration: InputDecoration(
-                    hintText: tr.form_field_measurement_survey_intro_text_hint,),
+                  hintText: tr.form_field_measurement_survey_intro_text_hint,
+                ),
                 inputFormatters: [
                   LengthLimitingTextInputFormatter(2000),
                 ],
@@ -135,7 +136,8 @@ class _MeasurementSurveyFormViewState
               input: ReactiveTextField(
                 formControl: widget.formViewModel.surveyOutroTextControl,
                 decoration: InputDecoration(
-                    hintText: tr.form_field_measurement_survey_outro_text_hint,),
+                  hintText: tr.form_field_measurement_survey_outro_text_hint,
+                ),
                 inputFormatters: [
                   LengthLimitingTextInputFormatter(2000),
                 ],
@@ -215,14 +217,20 @@ class _MeasurementSurveyFormViewState
   }
 
   void _onSelectItem(
-      QuestionFormViewModel item, BuildContext context, WidgetRef ref,) {
+    QuestionFormViewModel item,
+    BuildContext context,
+    WidgetRef ref,
+  ) {
     final routeArgs = widget.formViewModel.buildFormRouteArgs(item);
     _showSidesheetWithArgs(routeArgs, context, ref);
   }
 
   // TODO: refactor to use [RoutingIntent] for sidesheet (so that it can be triggered from controller)
-  void _showSidesheetWithArgs(SurveyQuestionFormRouteArgs routeArgs,
-      BuildContext context, WidgetRef ref,) {
+  void _showSidesheetWithArgs(
+    SurveyQuestionFormRouteArgs routeArgs,
+    BuildContext context,
+    WidgetRef ref,
+  ) {
     final surveyQuestionFormViewModel =
         ref.read(surveyQuestionFormViewModelProvider(routeArgs));
     showFormSideSheet<QuestionFormViewModel>(
diff --git a/designer_v2/lib/features/design/reports/report_badge.dart b/designer_v2/lib/features/design/reports/report_badge.dart
index 7105e8a7c..3affe9e70 100644
--- a/designer_v2/lib/features/design/reports/report_badge.dart
+++ b/designer_v2/lib/features/design/reports/report_badge.dart
@@ -3,12 +3,13 @@ import 'package:studyu_designer_v2/common_views/badge.dart' as study_badge;
 import 'package:studyu_designer_v2/features/design/reports/reports_form_data.dart';
 
 class ReportBadge extends StatelessWidget {
-  const ReportBadge(
-      {required this.status,
-      this.type = study_badge.BadgeType.outlineFill,
-      this.showPrefixIcon = true,
-      this.showTooltip = true,
-      super.key,});
+  const ReportBadge({
+    required this.status,
+    this.type = study_badge.BadgeType.outlineFill,
+    this.showPrefixIcon = true,
+    this.showTooltip = true,
+    super.key,
+  });
 
   final ReportStatus? status;
   final study_badge.BadgeType type;
@@ -34,19 +35,23 @@ class ReportBadge extends StatelessWidget {
 
     switch (status) {
       case ReportStatus.primary:
-        return inTooltip(study_badge.Badge(
-          label: status!.string,
-          color: colorScheme.primary,
-          type: study_badge.BadgeType.outlineFill,
-          icon: prefixIcon,
-        ),);
+        return inTooltip(
+          study_badge.Badge(
+            label: status!.string,
+            color: colorScheme.primary,
+            type: study_badge.BadgeType.outlineFill,
+            icon: prefixIcon,
+          ),
+        );
       case ReportStatus.secondary:
-        return inTooltip(study_badge.Badge(
-          label: status!.string,
-          color: colorScheme.secondary.withOpacity(0.75),
-          type: study_badge.BadgeType.outlineFill,
-          icon: prefixIcon,
-        ),);
+        return inTooltip(
+          study_badge.Badge(
+            label: status!.string,
+            color: colorScheme.secondary.withOpacity(0.75),
+            type: study_badge.BadgeType.outlineFill,
+            icon: prefixIcon,
+          ),
+        );
       default:
         return const SizedBox.shrink();
     }
diff --git a/designer_v2/lib/features/design/reports/reports_form_data.dart b/designer_v2/lib/features/design/reports/reports_form_data.dart
index eab7d0df1..efec84631 100644
--- a/designer_v2/lib/features/design/reports/reports_form_data.dart
+++ b/designer_v2/lib/features/design/reports/reports_form_data.dart
@@ -12,7 +12,8 @@ class ReportsFormData implements IStudyFormData {
 
   factory ReportsFormData.fromStudy(Study study) {
     return ReportsFormData(
-      reportItems: ReportItemFormData.fromDomainModel(study.reportSpecification),
+      reportItems:
+          ReportItemFormData.fromDomainModel(study.reportSpecification),
     );
   }
 
@@ -35,7 +36,8 @@ class ReportsFormData implements IStudyFormData {
   }
 
   @override
-  String get id => throw UnimplementedError(); // not needed for top-level form data
+  String get id =>
+      throw UnimplementedError(); // not needed for top-level form data
 
   @override
   ReportsFormData copy() {
diff --git a/designer_v2/lib/features/design/reports/section/report_item_form_controller.dart b/designer_v2/lib/features/design/reports/section/report_item_form_controller.dart
index c4ad540c3..187e8f2f5 100644
--- a/designer_v2/lib/features/design/reports/section/report_item_form_controller.dart
+++ b/designer_v2/lib/features/design/reports/section/report_item_form_controller.dart
@@ -138,7 +138,8 @@ class ReportItemFormViewModel extends ManagedFormViewModel<ReportItemFormData> {
       };
 
   List<FormControlValidation> _getValidationConfig(
-      StudyFormValidationSet validationSet,) {
+    StudyFormValidationSet validationSet,
+  ) {
     return [
       ..._sharedValidationConfig[validationSet] ?? [],
       ..._validationConfigsBySectionType[sectionType]?[validationSet] ?? [],
@@ -308,8 +309,9 @@ class ReportItemFormViewModel extends ManagedFormViewModel<ReportItemFormData> {
         temporalAggregationControl.value =
             TemporalAggregationFormatted(averageSection.aggregate!);
         dataReferenceControl.value = DataReferenceIdentifier(
-            averageSection.resultProperty!.task,
-            averageSection.resultProperty!.property,);
+          averageSection.resultProperty!.task,
+          averageSection.resultProperty!.property,
+        );
       case ReportSectionType.linearRegression:
         final LinearRegressionSection linearRegressionSection =
             data.section as LinearRegressionSection;
diff --git a/designer_v2/lib/features/design/reports/section/report_item_form_data.dart b/designer_v2/lib/features/design/reports/section/report_item_form_data.dart
index 71013b10f..6a4f4d4d3 100644
--- a/designer_v2/lib/features/design/reports/section/report_item_form_data.dart
+++ b/designer_v2/lib/features/design/reports/section/report_item_form_data.dart
@@ -14,19 +14,24 @@ class ReportItemFormData extends IFormData {
   @override
   String get id => section.id;
 
-  static List<ReportItemFormData> fromDomainModel(ReportSpecification reportSpecification) {
+  static List<ReportItemFormData> fromDomainModel(
+      ReportSpecification reportSpecification) {
     final List<ReportItemFormData> reportsFormData = [];
     if (reportSpecification.primary != null) {
-      reportsFormData.add(ReportItemFormData(
-        isPrimary: true,
-        section: reportSpecification.primary!,
-      ),);
+      reportsFormData.add(
+        ReportItemFormData(
+          isPrimary: true,
+          section: reportSpecification.primary!,
+        ),
+      );
     }
     for (final ReportSection reportSection in reportSpecification.secondary) {
-      reportsFormData.add(ReportItemFormData(
-        isPrimary: false,
-        section: reportSection,
-      ),);
+      reportsFormData.add(
+        ReportItemFormData(
+          isPrimary: false,
+          section: reportSection,
+        ),
+      );
     }
     return reportsFormData;
   }
diff --git a/designer_v2/lib/features/design/reports/section/report_item_form_view.dart b/designer_v2/lib/features/design/reports/section/report_item_form_view.dart
index fb9999e3d..236cf7ea1 100644
--- a/designer_v2/lib/features/design/reports/section/report_item_form_view.dart
+++ b/designer_v2/lib/features/design/reports/section/report_item_form_view.dart
@@ -13,7 +13,8 @@ import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/theme.dart';
 
 class ReportItemFormView extends StatelessWidget {
-  const ReportItemFormView({required this.formViewModel, required this.studyId, super.key});
+  const ReportItemFormView(
+      {required this.formViewModel, required this.studyId, super.key});
 
   final ReportItemFormViewModel formViewModel;
   final StudyID studyId;
@@ -26,14 +27,22 @@ class ReportItemFormView extends StatelessWidget {
   WidgetBuilder get sectionTypeBodyBuilder {
     final Map<ReportSectionType, WidgetBuilder> sectionTypeWidgets = {
       ReportSectionType.average: (_) => AverageSectionFormView(
-          formViewModel: formViewModel, studyId: studyId, reportSectionColumnWidth: reportSectionColumnWidth,),
-      ReportSectionType.linearRegression: (_) => LinearRegressionSectionFormView(
-          formViewModel: formViewModel, studyId: studyId, reportSectionColumnWidth: reportSectionColumnWidth,),
+            formViewModel: formViewModel,
+            studyId: studyId,
+            reportSectionColumnWidth: reportSectionColumnWidth,
+          ),
+      ReportSectionType.linearRegression: (_) =>
+          LinearRegressionSectionFormView(
+            formViewModel: formViewModel,
+            studyId: studyId,
+            reportSectionColumnWidth: reportSectionColumnWidth,
+          ),
     };
     final sectionType = formViewModel.sectionType;
 
     if (!sectionTypeWidgets.containsKey(sectionType)) {
-      throw Exception("Failed to build widget for ReportSectionType $sectionType "
+      throw Exception(
+          "Failed to build widget for ReportSectionType $sectionType "
           "because there is no registered WidgetBuilder");
     }
     final builder = sectionTypeWidgets[sectionType]!;
@@ -42,14 +51,15 @@ class ReportItemFormView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) => ReactiveFormConsumer(
-      builder: (context, formGroup, child) => Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              _buildSectionText(context),
-              _buildSectionTypeHeader(context),
-              sectionTypeBodyBuilder(context),
-            ],
-          ),);
+        builder: (context, formGroup, child) => Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            _buildSectionText(context),
+            _buildSectionTypeHeader(context),
+            sectionTypeBodyBuilder(context),
+          ],
+        ),
+      );
 
   FormTableLayout _buildSectionText(BuildContext context) {
     return FormTableLayout(
@@ -79,7 +89,8 @@ class ReportItemFormView extends StatelessWidget {
             inputFormatters: [
               LengthLimitingTextInputFormatter(10000),
             ],
-            validationMessages: formViewModel.descriptionControl.validationMessages,
+            validationMessages:
+                formViewModel.descriptionControl.validationMessages,
             keyboardType: TextInputType.multiline,
             minLines: 10,
             maxLines: 30,
@@ -106,18 +117,30 @@ class ReportItemFormView extends StatelessWidget {
               labelStyle: const TextStyle(fontWeight: FontWeight.bold),
               // TODO: extract custom dropdown component with theme + focus fix
               input: Theme(
-                data: theme.copyWith(inputDecorationTheme: ThemeConfig.dropdownInputDecorationTheme(theme)),
+                data: theme.copyWith(
+                    inputDecorationTheme:
+                        ThemeConfig.dropdownInputDecorationTheme(theme)),
                 child: ReactiveDropdownField<ReportSectionType>(
                   formControl: formViewModel.sectionTypeControl,
-                  items: ReportItemFormViewModel.sectionTypeControlOptions.map((option) {
-                    final menuItemTheme = ThemeConfig.dropdownMenuItemTheme(theme);
-                    final iconTheme = menuItemTheme.iconTheme ?? theme.iconTheme;
+                  items: ReportItemFormViewModel.sectionTypeControlOptions
+                      .map((option) {
+                    final menuItemTheme =
+                        ThemeConfig.dropdownMenuItemTheme(theme);
+                    final iconTheme =
+                        menuItemTheme.iconTheme ?? theme.iconTheme;
                     return DropdownMenuItem(
                       value: option.value,
                       child: Row(
                         children: [
-                          if (option.value.icon != null) Icon(option.value.icon,
-                                  size: iconTheme.size, color: iconTheme.color, shadows: iconTheme.shadows,) else const SizedBox.shrink(),
+                          if (option.value.icon != null)
+                            Icon(
+                              option.value.icon,
+                              size: iconTheme.size,
+                              color: iconTheme.color,
+                              shadows: iconTheme.shadows,
+                            )
+                          else
+                            const SizedBox.shrink(),
                           const SizedBox(width: 16.0),
                           Text(option.label),
                         ],
diff --git a/designer_v2/lib/features/design/reports/section/types/average_section_form_view.dart b/designer_v2/lib/features/design/reports/section/types/average_section_form_view.dart
index c04fdf7d8..dd454f6e6 100644
--- a/designer_v2/lib/features/design/reports/section/types/average_section_form_view.dart
+++ b/designer_v2/lib/features/design/reports/section/types/average_section_form_view.dart
@@ -41,22 +41,36 @@ class AverageSectionFormView extends ConsumerWidget {
           rows: [
             FormTableRow(
               label: tr.form_field_report_average_temporalAggregation_title,
-              labelHelpText: tr.form_field_report_average_temporalAggregation_tooltip,
+              labelHelpText:
+                  tr.form_field_report_average_temporalAggregation_tooltip,
               // TODO: extract custom dropdown component with theme + focus fix
               input: Theme(
-                data: theme.copyWith(inputDecorationTheme: ThemeConfig.dropdownInputDecorationTheme(theme)),
+                data: theme.copyWith(
+                    inputDecorationTheme:
+                        ThemeConfig.dropdownInputDecorationTheme(theme)),
                 child: ReactiveDropdownField<TemporalAggregationFormatted>(
                   formControl: formViewModel.temporalAggregationControl,
                   hint: const Text("Select an aggregation value"),
-                  items: ReportItemFormViewModel.temporalAggregationControlOptions.map((option) {
-                    final menuItemTheme = ThemeConfig.dropdownMenuItemTheme(theme);
-                    final iconTheme = menuItemTheme.iconTheme ?? theme.iconTheme;
+                  items: ReportItemFormViewModel
+                      .temporalAggregationControlOptions
+                      .map((option) {
+                    final menuItemTheme =
+                        ThemeConfig.dropdownMenuItemTheme(theme);
+                    final iconTheme =
+                        menuItemTheme.iconTheme ?? theme.iconTheme;
                     return DropdownMenuItem(
                       value: option.value,
                       child: Row(
                         children: [
-                          if (option.value.icon != null) Icon(option.value.icon,
-                                  size: iconTheme.size, color: iconTheme.color, shadows: iconTheme.shadows,) else const SizedBox.shrink(),
+                          if (option.value.icon != null)
+                            Icon(
+                              option.value.icon,
+                              size: iconTheme.size,
+                              color: iconTheme.color,
+                              shadows: iconTheme.shadows,
+                            )
+                          else
+                            const SizedBox.shrink(),
                           const SizedBox(width: 16.0),
                           Text(option.label),
                         ],
diff --git a/designer_v2/lib/features/design/reports/section/types/data_reference_editor.dart b/designer_v2/lib/features/design/reports/section/types/data_reference_editor.dart
index b88d68ab5..868f657e4 100644
--- a/designer_v2/lib/features/design/reports/section/types/data_reference_editor.dart
+++ b/designer_v2/lib/features/design/reports/section/types/data_reference_editor.dart
@@ -21,7 +21,9 @@ class DataReferenceEditor<T> {
       formControl: formControl,
       items: items,
       isExpanded: true,
-      hint: items.isNotEmpty ? const Text("Select a data source") : const Text("No scale survey question defined"),
+      hint: items.isNotEmpty
+          ? const Text("Select a data source")
+          : const Text("No scale survey question defined"),
     );
   }
 
@@ -30,7 +32,9 @@ class DataReferenceEditor<T> {
         labelHelpText: tr.form_field_report_data_source_tooltip,
         // TODO: extract custom dropdown component with theme + focus fix
         input: Theme(
-          data: theme.copyWith(inputDecorationTheme: ThemeConfig.dropdownInputDecorationTheme(theme)),
+          data: theme.copyWith(
+              inputDecorationTheme:
+                  ThemeConfig.dropdownInputDecorationTheme(theme)),
           child: buildReactiveDropdownField,
         ),
       );
diff --git a/designer_v2/lib/features/design/reports/section/types/linear_regression_section_form_view.dart b/designer_v2/lib/features/design/reports/section/types/linear_regression_section_form_view.dart
index 38b8a23ef..6ac69d167 100644
--- a/designer_v2/lib/features/design/reports/section/types/linear_regression_section_form_view.dart
+++ b/designer_v2/lib/features/design/reports/section/types/linear_regression_section_form_view.dart
@@ -13,8 +13,12 @@ import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/theme.dart';
 
 class LinearRegressionSectionFormView extends ConsumerWidget {
-  const LinearRegressionSectionFormView(
-      {required this.formViewModel, required this.studyId, required this.reportSectionColumnWidth, super.key,});
+  const LinearRegressionSectionFormView({
+    required this.formViewModel,
+    required this.studyId,
+    required this.reportSectionColumnWidth,
+    super.key,
+  });
 
   final ReportItemFormViewModel formViewModel;
   final StudyID studyId;
@@ -38,19 +42,32 @@ class LinearRegressionSectionFormView extends ConsumerWidget {
               labelHelpText: tr.form_field_report_improvementDirection_tooltip,
               // TODO: extract custom dropdown component with theme + focus fix
               input: Theme(
-                data: theme.copyWith(inputDecorationTheme: ThemeConfig.dropdownInputDecorationTheme(theme)),
+                data: theme.copyWith(
+                    inputDecorationTheme:
+                        ThemeConfig.dropdownInputDecorationTheme(theme)),
                 child: ReactiveDropdownField<ImprovementDirectionFormatted>(
                   formControl: formViewModel.improvementDirectionControl,
                   hint: const Text("Select an improvement direction"),
-                  items: ReportItemFormViewModel.improvementDirectionControlOptions.map((option) {
-                    final menuItemTheme = ThemeConfig.dropdownMenuItemTheme(theme);
-                    final iconTheme = menuItemTheme.iconTheme ?? theme.iconTheme;
+                  items: ReportItemFormViewModel
+                      .improvementDirectionControlOptions
+                      .map((option) {
+                    final menuItemTheme =
+                        ThemeConfig.dropdownMenuItemTheme(theme);
+                    final iconTheme =
+                        menuItemTheme.iconTheme ?? theme.iconTheme;
                     return DropdownMenuItem(
                       value: option.value,
                       child: Row(
                         children: [
-                          if (option.value.icon != null) Icon(option.value.icon,
-                                  size: iconTheme.size, color: iconTheme.color, shadows: iconTheme.shadows,) else const SizedBox.shrink(),
+                          if (option.value.icon != null)
+                            Icon(
+                              option.value.icon,
+                              size: iconTheme.size,
+                              color: iconTheme.color,
+                              shadows: iconTheme.shadows,
+                            )
+                          else
+                            const SizedBox.shrink(),
                           const SizedBox(width: 16.0),
                           Text(option.label),
                         ],
@@ -63,10 +80,12 @@ class LinearRegressionSectionFormView extends ConsumerWidget {
             FormTableRow(
               control: formViewModel.alphaControl,
               label: tr.form_field_report_linearRegression_alpha_title,
-              labelHelpText: tr.form_field_report_linearRegression_alpha_tooltip,
+              labelHelpText:
+                  tr.form_field_report_linearRegression_alpha_tooltip,
               input: ReactiveTextField(
                 formControl: formViewModel.alphaControl,
-                validationMessages: formViewModel.alphaControl.validationMessages,
+                validationMessages:
+                    formViewModel.alphaControl.validationMessages,
                 decoration: InputDecoration(
                   hintText: tr.form_field_report_linearRegression_alpha_hint,
                 ),
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/types/audio_recording_question_form_view.dart b/designer_v2/lib/features/design/shared/questionnaire/question/types/audio_recording_question_form_view.dart
index 3e22d8c0b..b47daf70d 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/types/audio_recording_question_form_view.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/types/audio_recording_question_form_view.dart
@@ -6,7 +6,8 @@ import 'package:studyu_designer_v2/features/design/shared/questionnaire/question
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 
 class AudioRecordingQuestionFormView extends ConsumerWidget {
-  const AudioRecordingQuestionFormView({required this.formViewModel, super.key});
+  const AudioRecordingQuestionFormView(
+      {required this.formViewModel, super.key});
 
   final QuestionFormViewModel formViewModel;
 
@@ -24,10 +25,13 @@ class AudioRecordingQuestionFormView extends ConsumerWidget {
                 formControl: formViewModel.maxRecordingDurationSecondsControl,
                 keyboardType: TextInputType.number,
                 validationMessages: {
-                  ValidationMessage.min: (error) => tr.audio_recording_max_duration_rangevalid_min,
-                  ValidationMessage.max: (error) => tr
-                      .audio_recording_max_duration_rangevalid_max(QuestionFormViewModel.kMaxRecordingDurationSeconds),
-                  ValidationMessage.number: (error) => tr.free_text_validation_number,
+                  ValidationMessage.min: (error) =>
+                      tr.audio_recording_max_duration_rangevalid_min,
+                  ValidationMessage.max: (error) =>
+                      tr.audio_recording_max_duration_rangevalid_max(
+                          QuestionFormViewModel.kMaxRecordingDurationSeconds),
+                  ValidationMessage.number: (error) =>
+                      tr.free_text_validation_number,
                 },
               ),
             ),
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/types/free_text_question_form_view.dart b/designer_v2/lib/features/design/shared/questionnaire/question/types/free_text_question_form_view.dart
index 06ccde7d3..7997f80db 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/types/free_text_question_form_view.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/types/free_text_question_form_view.dart
@@ -23,40 +23,47 @@ class FreeTextQuestionFormView extends ConsumerWidget {
     final minLength = formViewModel.freeTextLengthControl.value!.start.toInt();
     final maxLength = formViewModel.freeTextLengthControl.value!.end.toInt();
     final type = formViewModel.freeTextTypeControl.value!.string;
-    formViewModel.freeTextLengthControl
-        .onChanged((_) => formViewModel.freeTextExampleTextControl.updateValueAndValidity());
+    formViewModel.freeTextLengthControl.onChanged((_) =>
+        formViewModel.freeTextExampleTextControl.updateValueAndValidity());
 
     return Column(
       children: [
         generateRow(
-            label: tr.free_text_range_label,
-            labelHelpText: tr.free_text_range_label_helper,
-            input: disableOnReadonly(
-              child: SliderTheme(
-                  data: Theme.of(context).sliderTheme.copyWith(
-                      rangeThumbShape: IndicatorRangeSliderThumbShape(context, minLength, maxLength),
-                      showValueIndicator: ShowValueIndicator.never,),
-                  child: ReactiveRangeSlider<RangeValues>(
-                    formControl: formViewModel.freeTextLengthControl,
-                    min: QuestionFormViewModel.kDefaultFreeTextMinLength.toDouble(),
-                    max: QuestionFormViewModel.kDefaultFreeTextMaxLength.toDouble(),
-                    divisions: QuestionFormViewModel.kDefaultFreeTextMaxLength -
-                        QuestionFormViewModel.kDefaultFreeTextMinLength,
-                    labelBuilder: (values) => RangeLabels(
-                      values.start.round().toString(),
-                      values.end.round().toString(),
-                    ),
-                  ),),
-            ),),
+          label: tr.free_text_range_label,
+          labelHelpText: tr.free_text_range_label_helper,
+          input: disableOnReadonly(
+            child: SliderTheme(
+              data: Theme.of(context).sliderTheme.copyWith(
+                    rangeThumbShape: IndicatorRangeSliderThumbShape(
+                        context, minLength, maxLength),
+                    showValueIndicator: ShowValueIndicator.never,
+                  ),
+              child: ReactiveRangeSlider<RangeValues>(
+                formControl: formViewModel.freeTextLengthControl,
+                min: QuestionFormViewModel.kDefaultFreeTextMinLength.toDouble(),
+                max: QuestionFormViewModel.kDefaultFreeTextMaxLength.toDouble(),
+                divisions: QuestionFormViewModel.kDefaultFreeTextMaxLength -
+                    QuestionFormViewModel.kDefaultFreeTextMinLength,
+                labelBuilder: (values) => RangeLabels(
+                  values.start.round().toString(),
+                  values.end.round().toString(),
+                ),
+              ),
+            ),
+          ),
+        ),
         const SizedBox(height: 16.0),
         generateRow(
           label: tr.free_text_type_label,
           labelHelpText: tr.free_text_type_label_helper,
           input: ReactiveDropdownField(
             formControl: formViewModel.freeTextTypeControl,
-            items: FreeTextQuestionType.values.map((e) => DropdownMenuItem(value: e, child: Text(e.string))).toList(),
+            items: FreeTextQuestionType.values
+                .map((e) => DropdownMenuItem(value: e, child: Text(e.string)))
+                .toList(),
             decoration: InputDecoration(
-              helperText: generateLabelHelpTextMap[formViewModel.freeTextTypeControl.value],
+              helperText: generateLabelHelpTextMap[
+                  formViewModel.freeTextTypeControl.value],
             ),
             onChanged: (_) {
               formViewModel.freeTextExampleTextControl.updateValueAndValidity();
@@ -65,7 +72,8 @@ class FreeTextQuestionFormView extends ConsumerWidget {
         ),
         const SizedBox(height: 16.0),
         // Show additional text field when custom is selected
-        if (formViewModel.freeTextTypeControl.value == FreeTextQuestionType.custom)
+        if (formViewModel.freeTextTypeControl.value ==
+            FreeTextQuestionType.custom)
           Column(
             children: [
               generateRow(
@@ -79,7 +87,8 @@ class FreeTextQuestionFormView extends ConsumerWidget {
                     suffix: const Text('\$'),
                   ),
                   onChanged: (_) {
-                    formViewModel.freeTextExampleTextControl.updateValueAndValidity();
+                    formViewModel.freeTextExampleTextControl
+                        .updateValueAndValidity();
                   },
                 ),
               ),
@@ -94,56 +103,70 @@ class FreeTextQuestionFormView extends ConsumerWidget {
         // generate line
         const Divider(thickness: 2.0),
         const SizedBox(height: 16.0),
-        Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-          generateRow(
-            label: tr.free_text_example_label,
-            labelHelpText: tr.free_text_example_label_helper,
-            input: Row(
-              children: [
-                Expanded(
-                  child: ReactiveValueListenableBuilder(
+        Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            generateRow(
+              label: tr.free_text_example_label,
+              labelHelpText: tr.free_text_example_label_helper,
+              input: Row(
+                children: [
+                  Expanded(
+                    child: ReactiveValueListenableBuilder(
                       formControl: formViewModel.freeTextExampleTextControl,
                       builder: (context, formControl, child) {
                         final borderColor = (formControl.dirty)
                             ? Colors.green
-                            : theme.inputDecorationTheme.enabledBorder?.borderSide.color ?? Colors.yellow;
+                            : theme.inputDecorationTheme.enabledBorder
+                                    ?.borderSide.color ??
+                                Colors.yellow;
                         return ReactiveTextField(
-                            formControl: formViewModel.freeTextExampleTextControl,
-                            maxLines: null,
-                            decoration: InputDecoration(
-                              helperText: (formControl.dirty && formControl.valid)
-                                  ? tr.free_text_example_valid
-                                  : tr.free_text_example_default_helper,
-                              focusedBorder: OutlineInputBorder(
-                                borderSide: BorderSide(
-                                  color: borderColor,
-                                ),
+                          formControl: formViewModel.freeTextExampleTextControl,
+                          maxLines: null,
+                          decoration: InputDecoration(
+                            helperText: (formControl.dirty && formControl.valid)
+                                ? tr.free_text_example_valid
+                                : tr.free_text_example_default_helper,
+                            focusedBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: borderColor,
                               ),
-                              enabledBorder: OutlineInputBorder(
-                                borderSide: BorderSide(
-                                  color: borderColor,
-                                ),
+                            ),
+                            enabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: borderColor,
                               ),
                             ),
-                            showErrors: (control) => control.invalid && control.dirty,
-                            validationMessages: {
-                              ValidationMessage.minLength: (error) => tr.free_text_validation_min_length(minLength),
-                              ValidationMessage.maxLength: (error) => tr.free_text_validation_max_length(maxLength),
-                              ValidationMessage.pattern: (error) => tr.free_text_validation_pattern,
-                              ValidationMessage.number: (error) => tr.free_text_validation_number,
-                            },);
-                      },),
-                ),
-              ],
+                          ),
+                          showErrors: (control) =>
+                              control.invalid && control.dirty,
+                          validationMessages: {
+                            ValidationMessage.minLength: (error) =>
+                                tr.free_text_validation_min_length(minLength),
+                            ValidationMessage.maxLength: (error) =>
+                                tr.free_text_validation_max_length(maxLength),
+                            ValidationMessage.pattern: (error) =>
+                                tr.free_text_validation_pattern,
+                            ValidationMessage.number: (error) =>
+                                tr.free_text_validation_number,
+                          },
+                        );
+                      },
+                    ),
+                  ),
+                ],
+              ),
             ),
-          ),
-          const SizedBox(height: 16.0),
-          ReactiveFormConsumer(
-            builder: (context, formGroup, child) {
-              return TextParagraph(text: tr.free_text_example_explanation(type, minLength, maxLength));
-            },
-          ),
-        ],),
+            const SizedBox(height: 16.0),
+            ReactiveFormConsumer(
+              builder: (context, formGroup, child) {
+                return TextParagraph(
+                    text: tr.free_text_example_explanation(
+                        type, minLength, maxLength));
+              },
+            ),
+          ],
+        ),
       ],
     );
   }
@@ -159,27 +182,35 @@ class FreeTextQuestionFormView extends ConsumerWidget {
   Map<FreeTextQuestionType, String> get generateLabelHelpTextMap {
     return {
       FreeTextQuestionType.any: tr.free_text_question_type_any_explanation,
-      FreeTextQuestionType.alphanumeric: tr.free_text_question_type_alphanumeric_explanation,
-      FreeTextQuestionType.numeric: tr.free_text_question_type_numeric_explanation,
-      FreeTextQuestionType.custom: tr.free_text_question_type_custom_explanation,
+      FreeTextQuestionType.alphanumeric:
+          tr.free_text_question_type_alphanumeric_explanation,
+      FreeTextQuestionType.numeric:
+          tr.free_text_question_type_numeric_explanation,
+      FreeTextQuestionType.custom:
+          tr.free_text_question_type_custom_explanation,
     };
   }
 
-  Widget generateRow({required String label, required String labelHelpText, required Widget input}) {
-    return Row(children: [
-      Flexible(
-        flex: 5,
-        child: FormTableLayout(
-          rowLayout: FormTableRowLayout.vertical,
-          rows: [
-            FormTableRow(
-              label: label,
-              labelHelpText: labelHelpText,
-              input: input,
-            ),
-          ],
+  Widget generateRow(
+      {required String label,
+      required String labelHelpText,
+      required Widget input}) {
+    return Row(
+      children: [
+        Flexible(
+          flex: 5,
+          child: FormTableLayout(
+            rowLayout: FormTableRowLayout.vertical,
+            rows: [
+              FormTableRow(
+                label: label,
+                labelHelpText: labelHelpText,
+                input: input,
+              ),
+            ],
+          ),
         ),
-      ),
-    ],);
+      ],
+    );
   }
 }
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/types/image_capturing_question_form_view.dart b/designer_v2/lib/features/design/shared/questionnaire/question/types/image_capturing_question_form_view.dart
index ea5bfd799..e2709c65f 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/types/image_capturing_question_form_view.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/types/image_capturing_question_form_view.dart
@@ -3,7 +3,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_designer_v2/features/design/shared/questionnaire/question/question_form_controller.dart';
 
 class ImageCapturingQuestionFormView extends ConsumerWidget {
-  const ImageCapturingQuestionFormView({required this.formViewModel, super.key});
+  const ImageCapturingQuestionFormView(
+      {required this.formViewModel, super.key});
 
   final QuestionFormViewModel formViewModel;
 
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/types/question_type.dart b/designer_v2/lib/features/design/shared/questionnaire/question/types/question_type.dart
index 65bbafd3d..2ff2664d0 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/types/question_type.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/types/question_type.dart
@@ -22,7 +22,8 @@ enum SurveyQuestionType {
       AudioRecordingQuestion.questionType: SurveyQuestionType.audio,
     };
     if (!typeMapping.containsKey(question.type)) {
-      throw UnimplementedError("Missing SurveyQuestionType for question of type: ${question.type}");
+      throw UnimplementedError(
+          "Missing SurveyQuestionType for question of type: ${question.type}");
     }
     return typeMapping[question.type]!;
   }
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/types/scale_question_form_view.dart b/designer_v2/lib/features/design/shared/questionnaire/question/types/scale_question_form_view.dart
index 01b1c28ab..9799bdc57 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/types/scale_question_form_view.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/types/scale_question_form_view.dart
@@ -28,14 +28,16 @@ class ScaleQuestionFormView extends ConsumerStatefulWidget {
   final QuestionFormViewModel formViewModel;
 
   @override
-  ConsumerState<ScaleQuestionFormView> createState() => _ScaleQuestionFormViewState();
+  ConsumerState<ScaleQuestionFormView> createState() =>
+      _ScaleQuestionFormViewState();
 }
 
 class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
   QuestionFormViewModel get formViewModel => widget.formViewModel;
 
   late bool isMinMaxColorsVisible =
-      formViewModel.scaleMinColorControl.value != null || formViewModel.scaleMaxColorControl.value != null;
+      formViewModel.scaleMinColorControl.value != null ||
+          formViewModel.scaleMaxColorControl.value != null;
 
   @override
   Widget build(BuildContext context) {
@@ -66,24 +68,27 @@ class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
         ),
         const SizedBox(height: 16.0),
         const SizedBox(height: 8.0),
-        if (isMinMaxColorsVisible) Column(
-                children: [
-                  _buildVisualizationHeader(context),
-                  const SizedBox(height: 12.0),
-                  _buildMinMaxColorPickers(context),
-                ],
-              ) else (!formViewModel.isReadonly)
-                ? Opacity(
-                    opacity: ThemeConfig.kMuteFadeFactor,
-                    child: Hyperlink(
-                      text: "+ ${tr.form_field_response_scale_colors_add}",
-                      onClick: () => setState(() {
-                        isMinMaxColorsVisible = true;
-                      }),
-                      visitedColor: null,
-                    ),
-                  )
-                : const SizedBox.shrink(),
+        if (isMinMaxColorsVisible)
+          Column(
+            children: [
+              _buildVisualizationHeader(context),
+              const SizedBox(height: 12.0),
+              _buildMinMaxColorPickers(context),
+            ],
+          )
+        else
+          (!formViewModel.isReadonly)
+              ? Opacity(
+                  opacity: ThemeConfig.kMuteFadeFactor,
+                  child: Hyperlink(
+                    text: "+ ${tr.form_field_response_scale_colors_add}",
+                    onClick: () => setState(() {
+                      isMinMaxColorsVisible = true;
+                    }),
+                    visitedColor: null,
+                  ),
+                )
+              : const SizedBox.shrink(),
       ],
     );
   }
@@ -139,7 +144,8 @@ class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
     );
   }
 
-  FormTableRow _buildColorControlRow(BuildContext context, FormControl<Color> control, String labelText) {
+  FormTableRow _buildColorControlRow(
+      BuildContext context, FormControl<Color> control, String labelText) {
     final theme = Theme.of(context);
     return FormTableRow(
       control: control,
@@ -150,14 +156,18 @@ class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
             helpText: tr.form_field_response_scale_color_tooltip,
           ),
           const SizedBox(width: 24.0),
-          if (control.value == null && !formViewModel.isReadonly) Opacity(
-                  opacity: ThemeConfig.kMuteFadeFactor,
-                  child: Hyperlink(
-                    text: "+ ${tr.form_field_response_scale_color_add}",
-                    onClick: () => control.value = SerializableColor(ThemeConfig.colorPickerInitialColor(theme).value),
-                    visitedColor: null,
-                  ),
-                ) else const SizedBox.shrink(),
+          if (control.value == null && !formViewModel.isReadonly)
+            Opacity(
+              opacity: ThemeConfig.kMuteFadeFactor,
+              child: Hyperlink(
+                text: "+ ${tr.form_field_response_scale_color_add}",
+                onClick: () => control.value = SerializableColor(
+                    ThemeConfig.colorPickerInitialColor(theme).value),
+                visitedColor: null,
+              ),
+            )
+          else
+            const SizedBox.shrink(),
         ],
       ),
       input: (control.value != null)
@@ -166,7 +176,8 @@ class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
               //hexInputBar: true,
               enableAlpha: false,
               labelTypes: const [],
-              pickerHsvColor: HSVColor.fromColor(control.value ?? ThemeConfig.colorPickerInitialColor(theme)),
+              pickerHsvColor: HSVColor.fromColor(
+                  control.value ?? ThemeConfig.colorPickerInitialColor(theme)),
             )
           : Opacity(
               // prevent layout shift with disabled hidden placeholder
@@ -189,8 +200,11 @@ class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
                     padding: const EdgeInsets.only(top: 12.0),
                     child: BannerBox(
                       style: BannerStyle.info,
-                      body: TextParagraph(text: tr.form_array_response_scale_mid_values_dirty_banner),
-                      padding: const EdgeInsets.symmetric(horizontal: 18.0, vertical: 12.0),
+                      body: TextParagraph(
+                          text: tr
+                              .form_array_response_scale_mid_values_dirty_banner),
+                      padding: const EdgeInsets.symmetric(
+                          horizontal: 18.0, vertical: 12.0),
                       noPrefix: true,
                       isDismissed: !formViewModel.isMidValuesClearedInfoVisible,
                       dismissIconSize: Theme.of(context).iconTheme.size ?? 14.0,
@@ -208,8 +222,10 @@ class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
             return Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: List.generate(formArray.controls.length, (i) {
-                final valueControl = formViewModel.scaleMidValueControls.controls[i] as FormControl;
-                final labelControl = formViewModel.scaleMidLabelControls.controls[i] as FormControl;
+                final valueControl = formViewModel
+                    .scaleMidValueControls.controls[i] as FormControl;
+                final labelControl = formViewModel
+                    .scaleMidLabelControls.controls[i] as FormControl;
 
                 return _buildLabelValueControlsPair(
                   labelControl: labelControl,
diff --git a/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_controller_mixin.dart b/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_controller_mixin.dart
index 0880c4ca1..ad9f30130 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_controller_mixin.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_controller_mixin.dart
@@ -10,10 +10,14 @@ import 'package:studyu_designer_v2/routing/router_config.dart';
 import 'package:studyu_designer_v2/utils/extensions.dart';
 import 'package:studyu_designer_v2/utils/riverpod.dart';
 
-mixin WithQuestionnaireControls<D, Q extends QuestionFormViewModel> on FormViewModel<D>
-    implements IFormViewModelDelegate<Q>, IProviderArgsResolver<Q, QuestionFormRouteArgs> {
+mixin WithQuestionnaireControls<D, Q extends QuestionFormViewModel>
+    on FormViewModel<D>
+    implements
+        IFormViewModelDelegate<Q>,
+        IProviderArgsResolver<Q, QuestionFormRouteArgs> {
   late final FormArray questionsArray = FormArray([]);
-  late final questionFormViewModels = FormViewModelCollection<Q, QuestionFormData>([], questionsArray);
+  late final questionFormViewModels =
+      FormViewModelCollection<Q, QuestionFormData>([], questionsArray);
 
   List<Q> get questionModels => questionFormViewModels.formViewModels;
 
@@ -23,7 +27,9 @@ mixin WithQuestionnaireControls<D, Q extends QuestionFormViewModel> on FormViewM
 
   void setQuestionnaireControlsFrom(QuestionnaireFormData data) {
     if (data.questionsData != null) {
-      final viewModels = data.questionsData!.map((data) => provideQuestionFormViewModel(data)).toList();
+      final viewModels = data.questionsData!
+          .map((data) => provideQuestionFormViewModel(data))
+          .toList();
       questionFormViewModels.reset(viewModels);
     }
   }
@@ -79,7 +85,8 @@ mixin WithQuestionnaireControls<D, Q extends QuestionFormViewModel> on FormViewM
       return viewModel;
     }
 
-    final viewModel = questionFormViewModels.findWhere((vm) => vm.questionId == args.questionId);
+    final viewModel = questionFormViewModels
+        .findWhere((vm) => vm.questionId == args.questionId);
     if (viewModel == null) {
       throw QuestionNotFoundException(); // TODO handle 404 not found
     }
diff --git a/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_data.dart b/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_data.dart
index 2bc58099a..bbef36cc9 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_data.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_data.dart
@@ -13,19 +13,25 @@ class QuestionnaireFormData implements IFormData {
   ) {
     return QuestionnaireFormData(
       questionsData: questionnaire.questions
-          .map((question) => QuestionFormData.fromDomainModel(
-                question,
-                // Collect all eligibility criteria for this question
-                eligibilityCriteria.where((c) => (c.condition as ValueExpression).target == question.id).toList(),
-              ),)
+          .map(
+            (question) => QuestionFormData.fromDomainModel(
+              question,
+              // Collect all eligibility criteria for this question
+              eligibilityCriteria
+                  .where((c) =>
+                      (c.condition as ValueExpression).target == question.id)
+                  .toList(),
+            ),
+          )
           .toList(),
     );
   }
 
   StudyUQuestionnaire toQuestionnaire() {
     final questionnaire = StudyUQuestionnaire();
-    questionnaire.questions =
-        (questionsData != null) ? questionsData!.map((formData) => formData.toQuestion()).toList() : [];
+    questionnaire.questions = (questionsData != null)
+        ? questionsData!.map((formData) => formData.toQuestion()).toList()
+        : [];
     return questionnaire;
   }
 
diff --git a/designer_v2/lib/features/design/shared/schedule/schedule_controls_view.dart b/designer_v2/lib/features/design/shared/schedule/schedule_controls_view.dart
index 886c98b34..30183cc30 100644
--- a/designer_v2/lib/features/design/shared/schedule/schedule_controls_view.dart
+++ b/designer_v2/lib/features/design/shared/schedule/schedule_controls_view.dart
@@ -17,17 +17,18 @@ class ScheduleControls extends FormConsumerWidget {
   @override
   Widget build(BuildContext context, FormGroup form) {
     formViewModel.reminderTimePickerControl.valueChanges.listen((event) {
-      formViewModel.reminderTimeControl.value = Time.fromTimeOfDay(formViewModel.reminderTimePickerControl.value!);
+      formViewModel.reminderTimeControl.value =
+          Time.fromTimeOfDay(formViewModel.reminderTimePickerControl.value!);
     });
 
     formViewModel.restrictedTimeStartPickerControl.valueChanges.listen((event) {
-      formViewModel.restrictedTimeStartControl.value =
-          Time.fromTimeOfDay(formViewModel.restrictedTimeStartPickerControl.value!);
+      formViewModel.restrictedTimeStartControl.value = Time.fromTimeOfDay(
+          formViewModel.restrictedTimeStartPickerControl.value!);
     });
 
     formViewModel.restrictedTimeEndPickerControl.valueChanges.listen((event) {
-      formViewModel.restrictedTimeEndControl.value =
-          Time.fromTimeOfDay(formViewModel.restrictedTimeEndPickerControl.value!);
+      formViewModel.restrictedTimeEndControl.value = Time.fromTimeOfDay(
+          formViewModel.restrictedTimeEndPickerControl.value!);
     });
 
     return Column(
@@ -39,65 +40,75 @@ class ScheduleControls extends FormConsumerWidget {
         const SizedBox(height: 4.0),
         TextParagraph(text: tr.form_section_scheduling_description),
         const SizedBox(height: 16.0),
-        FormTableLayout(rows: [
-          FormTableRow(
-            control: formViewModel.hasReminderControl,
-            label: tr.form_field_has_reminder,
-            labelHelpText: tr.form_field_has_reminder_tooltip,
-            input: Wrap(
-              crossAxisAlignment: WrapCrossAlignment.center,
-              children: [
-                ReactiveCheckbox(
-                  formControl: formViewModel.hasReminderControl,
-                ),
-                const SizedBox(width: 3.0),
-                FormControlLabel(
-                  formControl: formViewModel.hasReminderControl,
-                  text: tr.form_field_has_reminder_label,
-                ),
-                const SizedBox(width: 8.0),
-                Opacity(
-                  opacity: (formViewModel.hasReminder) ? 1 : 0.5,
-                  child: Wrap(
-                    crossAxisAlignment: WrapCrossAlignment.center,
-                    children: [
-                      IntrinsicWidth(
+        FormTableLayout(
+          rows: [
+            FormTableRow(
+              control: formViewModel.hasReminderControl,
+              label: tr.form_field_has_reminder,
+              labelHelpText: tr.form_field_has_reminder_tooltip,
+              input: Wrap(
+                crossAxisAlignment: WrapCrossAlignment.center,
+                children: [
+                  ReactiveCheckbox(
+                    formControl: formViewModel.hasReminderControl,
+                  ),
+                  const SizedBox(width: 3.0),
+                  FormControlLabel(
+                    formControl: formViewModel.hasReminderControl,
+                    text: tr.form_field_has_reminder_label,
+                  ),
+                  const SizedBox(width: 8.0),
+                  Opacity(
+                    opacity: (formViewModel.hasReminder) ? 1 : 0.5,
+                    child: Wrap(
+                      crossAxisAlignment: WrapCrossAlignment.center,
+                      children: [
+                        IntrinsicWidth(
                           child: PointerInterceptor(
-                              child: ReactiveTimePicker(
-                        formControl: formViewModel.reminderTimePickerControl,
-                        initialEntryMode: TimePickerEntryMode.input,
-                        builder: (BuildContext context, ReactiveTimePickerDelegate picker, Widget? child) {
-                          return ReactiveTextField<Time>(
-                            formControl: formViewModel.reminderTimeControl,
-                            valueAccessor: TimeValueAccessor(),
-                            decoration: InputDecoration(
-                                hintText: tr.form_field_time_of_day_hint,
-                                suffixIcon: Material(
-                                    color: Colors.transparent,
-                                    child: IconButton(
-                                      splashRadius: 18.0,
-                                      onPressed: picker.showPicker,
-                                      icon: const Icon(Icons.access_time),
-                                    ),),),
-                          );
-                        },
-                      ),),),
-                    ],
+                            child: ReactiveTimePicker(
+                              formControl:
+                                  formViewModel.reminderTimePickerControl,
+                              initialEntryMode: TimePickerEntryMode.input,
+                              builder: (BuildContext context,
+                                  ReactiveTimePickerDelegate picker,
+                                  Widget? child) {
+                                return ReactiveTextField<Time>(
+                                  formControl:
+                                      formViewModel.reminderTimeControl,
+                                  valueAccessor: TimeValueAccessor(),
+                                  decoration: InputDecoration(
+                                    hintText: tr.form_field_time_of_day_hint,
+                                    suffixIcon: Material(
+                                      color: Colors.transparent,
+                                      child: IconButton(
+                                        splashRadius: 18.0,
+                                        onPressed: picker.showPicker,
+                                        icon: const Icon(Icons.access_time),
+                                      ),
+                                    ),
+                                  ),
+                                );
+                              },
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
                   ),
-                ),
-              ],
+                ],
+              ),
             ),
-          ),
-          FormTableRow(
-            control: formViewModel.isTimeRestrictedControl,
-            label: tr.form_field_time_restriction,
-            labelHelpText: tr.form_field_time_restriction_tooltip,
-            input: ReactiveSwitch(
-              formControl: formViewModel.isTimeRestrictedControl,
+            FormTableRow(
+              control: formViewModel.isTimeRestrictedControl,
+              label: tr.form_field_time_restriction,
+              labelHelpText: tr.form_field_time_restriction_tooltip,
+              input: ReactiveSwitch(
+                formControl: formViewModel.isTimeRestrictedControl,
+              ),
             ),
-          ),
-          ..._conditionalTimeRestrictions(context),
-        ],),
+            ..._conditionalTimeRestrictions(context),
+          ],
+        ),
       ],
     );
   }
@@ -108,65 +119,78 @@ class ScheduleControls extends FormConsumerWidget {
     }
     return [
       FormTableRow(
-          control: formViewModel.restrictedTimeStartControl,
-          label: " ",
-          input: Row(
-            children: [
-              Flexible(
-                child: PointerInterceptor(
-                    child: ReactiveTimePicker(
+        control: formViewModel.restrictedTimeStartControl,
+        label: " ",
+        input: Row(
+          children: [
+            Flexible(
+              child: PointerInterceptor(
+                child: ReactiveTimePicker(
                   formControl: formViewModel.restrictedTimeStartPickerControl,
                   initialEntryMode: TimePickerEntryMode.input,
-                  builder: (BuildContext context, ReactiveTimePickerDelegate picker, Widget? child) {
+                  builder: (BuildContext context,
+                      ReactiveTimePickerDelegate picker, Widget? child) {
                     return ReactiveTextField<Time>(
                       formControl: formViewModel.restrictedTimeStartControl,
                       valueAccessor: TimeValueAccessor(),
-                      decoration: (formViewModel.restrictedTimeStartControl.enabled)
-                          ? InputDecoration(
-                              labelText: tr.form_field_time_restriction_start_hint,
-                              helperText: "",
-                              hintText: tr.form_field_time_of_day_hint,
-                              suffixIcon: Material(
-                                  color: Colors.transparent,
-                                  child: IconButton(
-                                    splashRadius: 18.0,
-                                    onPressed: picker.showPicker,
-                                    icon: const Icon(Icons.access_time),
-                                  ),),)
-                          : const InputDecoration(),
+                      decoration:
+                          (formViewModel.restrictedTimeStartControl.enabled)
+                              ? InputDecoration(
+                                  labelText:
+                                      tr.form_field_time_restriction_start_hint,
+                                  helperText: "",
+                                  hintText: tr.form_field_time_of_day_hint,
+                                  suffixIcon: Material(
+                                    color: Colors.transparent,
+                                    child: IconButton(
+                                      splashRadius: 18.0,
+                                      onPressed: picker.showPicker,
+                                      icon: const Icon(Icons.access_time),
+                                    ),
+                                  ),
+                                )
+                              : const InputDecoration(),
                     );
                   },
-                ),),
+                ),
               ),
-              const SizedBox(width: 10.0),
-              Flexible(
-                child: PointerInterceptor(
-                    child: ReactiveTimePicker(
+            ),
+            const SizedBox(width: 10.0),
+            Flexible(
+              child: PointerInterceptor(
+                child: ReactiveTimePicker(
                   formControl: formViewModel.restrictedTimeEndPickerControl,
                   initialEntryMode: TimePickerEntryMode.input,
-                  builder: (BuildContext context, ReactiveTimePickerDelegate picker, Widget? child) {
+                  builder: (BuildContext context,
+                      ReactiveTimePickerDelegate picker, Widget? child) {
                     return ReactiveTextField<Time>(
                       formControl: formViewModel.restrictedTimeEndControl,
                       valueAccessor: TimeValueAccessor(),
-                      decoration: (formViewModel.restrictedTimeEndControl.enabled)
-                          ? InputDecoration(
-                              labelText: tr.form_field_time_restriction_end_hint,
-                              helperText: "",
-                              hintText: tr.form_field_time_of_day_hint,
-                              suffixIcon: Material(
-                                  color: Colors.transparent,
-                                  child: IconButton(
-                                    splashRadius: 18.0,
-                                    onPressed: picker.showPicker,
-                                    icon: const Icon(Icons.access_time),
-                                  ),),)
-                          : const InputDecoration(),
+                      decoration:
+                          (formViewModel.restrictedTimeEndControl.enabled)
+                              ? InputDecoration(
+                                  labelText:
+                                      tr.form_field_time_restriction_end_hint,
+                                  helperText: "",
+                                  hintText: tr.form_field_time_of_day_hint,
+                                  suffixIcon: Material(
+                                    color: Colors.transparent,
+                                    child: IconButton(
+                                      splashRadius: 18.0,
+                                      onPressed: picker.showPicker,
+                                      icon: const Icon(Icons.access_time),
+                                    ),
+                                  ),
+                                )
+                              : const InputDecoration(),
                     );
                   },
-                ),),
+                ),
               ),
-            ],
-          ),),
+            ),
+          ],
+        ),
+      ),
     ];
   }
 }
diff --git a/designer_v2/lib/features/design/shared/schedule/schedule_form_data.dart b/designer_v2/lib/features/design/shared/schedule/schedule_form_data.dart
index e0202d556..52ec8f50b 100644
--- a/designer_v2/lib/features/design/shared/schedule/schedule_form_data.dart
+++ b/designer_v2/lib/features/design/shared/schedule/schedule_form_data.dart
@@ -3,13 +3,14 @@ import 'package:studyu_designer_v2/domain/schedule.dart';
 import 'package:studyu_designer_v2/features/forms/form_data.dart';
 
 abstract class IFormDataWithSchedule implements IFormData {
-  IFormDataWithSchedule(
-      {required this.instanceId,
-      required this.isTimeLocked,
-      this.timeLockStart,
-      this.timeLockEnd,
-      required this.hasReminder,
-      this.reminderTime,});
+  IFormDataWithSchedule({
+    required this.instanceId,
+    required this.isTimeLocked,
+    this.timeLockStart,
+    this.timeLockEnd,
+    required this.hasReminder,
+    this.reminderTime,
+  });
 
   final String instanceId;
   final bool isTimeLocked;
@@ -20,22 +21,26 @@ abstract class IFormDataWithSchedule implements IFormData {
 
   Schedule toSchedule() {
     final schedule = Schedule();
-    schedule.reminders = (!hasReminder || reminderTime == null) ? [] : [reminderTime!];
-    schedule.completionPeriods = (!isTimeLocked || (timeLockStart == null && timeLockEnd == null))
-        ? [
-            CompletionPeriod(
-                id: instanceId,
-                // default unrestricted period
-                unlockTime: ScheduleX.unrestrictedTime[0],
-                lockTime: ScheduleX.unrestrictedTime[1],),
-          ]
-        : [
-            CompletionPeriod(
-                id: instanceId,
-                // user-defined period
-                unlockTime: timeLockStart ?? ScheduleX.unrestrictedTime[0],
-                lockTime: timeLockEnd ?? ScheduleX.unrestrictedTime[1],),
-          ];
+    schedule.reminders =
+        (!hasReminder || reminderTime == null) ? [] : [reminderTime!];
+    schedule.completionPeriods =
+        (!isTimeLocked || (timeLockStart == null && timeLockEnd == null))
+            ? [
+                CompletionPeriod(
+                  id: instanceId,
+                  // default unrestricted period
+                  unlockTime: ScheduleX.unrestrictedTime[0],
+                  lockTime: ScheduleX.unrestrictedTime[1],
+                ),
+              ]
+            : [
+                CompletionPeriod(
+                  id: instanceId,
+                  // user-defined period
+                  unlockTime: timeLockStart ?? ScheduleX.unrestrictedTime[0],
+                  lockTime: timeLockEnd ?? ScheduleX.unrestrictedTime[1],
+                ),
+              ];
     return schedule;
   }
 }
diff --git a/designer_v2/lib/features/design/study_design_page_view.dart b/designer_v2/lib/features/design/study_design_page_view.dart
index f9580dd69..43fbec4d1 100644
--- a/designer_v2/lib/features/design/study_design_page_view.dart
+++ b/designer_v2/lib/features/design/study_design_page_view.dart
@@ -15,19 +15,21 @@ abstract class StudyDesignPageWidget extends StudyPageWidget {
 
     if (viewModel.isStudyReadonly) {
       return BannerBox(
-          noPrefix: true,
-          body: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                TextParagraph(
-                  text: tr.banner_study_readonly_title,
-                  style: const TextStyle(fontWeight: FontWeight.bold),
-                ),
-                TextParagraph(
-                  text: tr.banner_study_readonly_description,
-                ),
-              ],),
-          style: BannerStyle.info,);
+        noPrefix: true,
+        body: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            TextParagraph(
+              text: tr.banner_study_readonly_title,
+              style: const TextStyle(fontWeight: FontWeight.bold),
+            ),
+            TextParagraph(
+              text: tr.banner_study_readonly_description,
+            ),
+          ],
+        ),
+        style: BannerStyle.info,
+      );
     }
 
     return null;
diff --git a/designer_v2/lib/features/design/study_form_providers.dart b/designer_v2/lib/features/design/study_form_providers.dart
index 9688f2aab..f0b8fa3c1 100644
--- a/designer_v2/lib/features/design/study_form_providers.dart
+++ b/designer_v2/lib/features/design/study_form_providers.dart
@@ -22,74 +22,84 @@ import 'package:studyu_designer_v2/routing/router_config.dart';
 
 // - Study Info
 
-final studyInfoFormViewModelProvider = Provider.autoDispose.family<StudyInfoFormViewModel, StudyID>((ref, studyId) {
+final studyInfoFormViewModelProvider = Provider.autoDispose
+    .family<StudyInfoFormViewModel, StudyID>((ref, studyId) {
   return ref.watch(studyFormViewModelProvider(studyId)).studyInfoFormViewModel;
 });
 
 // - Enrollment
 
-final enrollmentFormViewModelProvider = Provider.autoDispose.family<EnrollmentFormViewModel, StudyID>((ref, studyId) {
+final enrollmentFormViewModelProvider = Provider.autoDispose
+    .family<EnrollmentFormViewModel, StudyID>((ref, studyId) {
   return ref.watch(studyFormViewModelProvider(studyId)).enrollmentFormViewModel;
 });
 
-final screenerQuestionFormViewModelProvider =
-    Provider.autoDispose.family<ScreenerQuestionFormViewModel, ScreenerQuestionFormRouteArgs>((ref, args) {
+final screenerQuestionFormViewModelProvider = Provider.autoDispose
+    .family<ScreenerQuestionFormViewModel, ScreenerQuestionFormRouteArgs>(
+        (ref, args) {
   final owner = ref.watch(enrollmentFormViewModelProvider(args.studyId));
   return owner.provide(args);
 });
 
-final consentItemFormViewModelProvider =
-    Provider.autoDispose.family<ConsentItemFormViewModel, ConsentItemFormRouteArgs>((ref, args) {
+final consentItemFormViewModelProvider = Provider.autoDispose
+    .family<ConsentItemFormViewModel, ConsentItemFormRouteArgs>((ref, args) {
   final owner = ref.watch(enrollmentFormViewModelProvider(args.studyId));
   return owner.consentItemDelegate.provide(args);
 });
 
 // - Interventions
 
-final interventionsFormViewModelProvider =
-    Provider.autoDispose.family<InterventionsFormViewModel, StudyID>((ref, studyId) {
-  return ref.watch(studyFormViewModelProvider(studyId)).interventionsFormViewModel;
+final interventionsFormViewModelProvider = Provider.autoDispose
+    .family<InterventionsFormViewModel, StudyID>((ref, studyId) {
+  return ref
+      .watch(studyFormViewModelProvider(studyId))
+      .interventionsFormViewModel;
 });
 
-final interventionFormViewModelProvider =
-    Provider.autoDispose.family<InterventionFormViewModel, InterventionFormRouteArgs>((ref, args) {
+final interventionFormViewModelProvider = Provider.autoDispose
+    .family<InterventionFormViewModel, InterventionFormRouteArgs>((ref, args) {
   final owner = ref.watch(interventionsFormViewModelProvider(args.studyId));
   return owner.provide(args);
 });
 
-final interventionTaskFormViewModelProvider =
-    Provider.autoDispose.family<InterventionTaskFormViewModel, InterventionTaskFormRouteArgs>((ref, args) {
+final interventionTaskFormViewModelProvider = Provider.autoDispose
+    .family<InterventionTaskFormViewModel, InterventionTaskFormRouteArgs>(
+        (ref, args) {
   final owner = ref.watch(interventionFormViewModelProvider(args));
   return owner.provide(args);
 });
 
 // - Measurements
 
-final measurementsFormViewModelProvider =
-    Provider.autoDispose.family<MeasurementsFormViewModel, StudyID>((ref, studyId) {
-  return ref.watch(studyFormViewModelProvider(studyId)).measurementsFormViewModel;
+final measurementsFormViewModelProvider = Provider.autoDispose
+    .family<MeasurementsFormViewModel, StudyID>((ref, studyId) {
+  return ref
+      .watch(studyFormViewModelProvider(studyId))
+      .measurementsFormViewModel;
 });
 
-final surveyFormViewModelProvider =
-    Provider.autoDispose.family<MeasurementSurveyFormViewModel, MeasurementFormRouteArgs>((ref, args) {
+final surveyFormViewModelProvider = Provider.autoDispose
+    .family<MeasurementSurveyFormViewModel, MeasurementFormRouteArgs>(
+        (ref, args) {
   final owner = ref.watch(measurementsFormViewModelProvider(args.studyId));
   return owner.provide(args);
 });
 
-final surveyQuestionFormViewModelProvider =
-    Provider.autoDispose.family<QuestionFormViewModel, SurveyQuestionFormRouteArgs>((ref, args) {
+final surveyQuestionFormViewModelProvider = Provider.autoDispose
+    .family<QuestionFormViewModel, SurveyQuestionFormRouteArgs>((ref, args) {
   final owner = ref.watch(surveyFormViewModelProvider(args));
   return owner.provide(args);
 });
 
 // - Reports
 
-final reportsFormViewModelProvider = Provider.autoDispose.family<ReportsFormViewModel, StudyID>((ref, studyId) {
+final reportsFormViewModelProvider =
+    Provider.autoDispose.family<ReportsFormViewModel, StudyID>((ref, studyId) {
   return ref.watch(studyFormViewModelProvider(studyId)).reportsFormViewModel;
 });
 
-final reportItemFormViewModelProvider =
-    Provider.autoDispose.family<ReportItemFormViewModel, ReportItemFormRouteArgs>((ref, args) {
+final reportItemFormViewModelProvider = Provider.autoDispose
+    .family<ReportItemFormViewModel, ReportItemFormRouteArgs>((ref, args) {
   final owner = ref.watch(reportsFormViewModelProvider(args.studyId));
   return owner.reportItemDelegate.provide(args);
 });
@@ -98,7 +108,8 @@ final reportItemFormViewModelProvider =
 
 /// Provides the [StudyFormViewModel] for validation purposes with
 /// a [StudyFormValidationSet.publish]
-final studyPublishValidatorProvider = Provider.autoDispose.family<StudyFormViewModel, StudyID>((ref, studyId) {
+final studyPublishValidatorProvider =
+    Provider.autoDispose.family<StudyFormViewModel, StudyID>((ref, studyId) {
   final state = ref.watch(studyControllerProvider(studyId));
   final formViewModel = StudyFormViewModel(
     router: ref.watch(routerProvider),
@@ -115,7 +126,8 @@ final studyPublishValidatorProvider = Provider.autoDispose.family<StudyFormViewM
 
 /// Provides the [StudyFormViewModel] for validation purposes with
 /// a [StudyFormValidationSet.test]
-final studyTestValidatorProvider = Provider.autoDispose.family<StudyFormViewModel, StudyID>((ref, studyId) {
+final studyTestValidatorProvider =
+    Provider.autoDispose.family<StudyFormViewModel, StudyID>((ref, studyId) {
   final state = ref.watch(studyControllerProvider(studyId));
   final formViewModel = StudyFormViewModel(
     router: ref.watch(routerProvider),
diff --git a/designer_v2/lib/features/design/study_form_scaffold.dart b/designer_v2/lib/features/design/study_form_scaffold.dart
index f539fbc47..9526c7653 100644
--- a/designer_v2/lib/features/design/study_form_scaffold.dart
+++ b/designer_v2/lib/features/design/study_form_scaffold.dart
@@ -7,8 +7,12 @@ import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
 import 'package:studyu_designer_v2/features/study/study_controller.dart';
 
 class StudyFormScaffold<T extends FormViewModel> extends ConsumerWidget {
-  const StudyFormScaffold(
-      {required this.studyId, required this.formViewModelBuilder, required this.formViewBuilder, super.key,});
+  const StudyFormScaffold({
+    required this.studyId,
+    required this.formViewModelBuilder,
+    required this.formViewBuilder,
+    super.key,
+  });
 
   final StudyID studyId;
   final FormViewModelBuilder<T> formViewModelBuilder;
diff --git a/designer_v2/lib/features/forms/form_array_table.dart b/designer_v2/lib/features/forms/form_array_table.dart
index 8456eb70b..f1b5ba267 100644
--- a/designer_v2/lib/features/forms/form_array_table.dart
+++ b/designer_v2/lib/features/forms/form_array_table.dart
@@ -9,7 +9,10 @@ import 'package:studyu_designer_v2/common_views/text_paragraph.dart';
 
 typedef FormArrayTableRowLabelProvider<T> = String Function(T item);
 typedef WidgetBuilderAt<T> = Widget Function(
-    BuildContext context, T item, int rowIdx,);
+  BuildContext context,
+  T item,
+  int rowIdx,
+);
 
 class FormArrayTable<T> extends StatelessWidget {
   const FormArrayTable({
@@ -32,8 +35,10 @@ class FormArrayTable<T> extends StatelessWidget {
     this.itemsSectionPadding = const EdgeInsets.symmetric(vertical: 8.0),
     this.hideLeadingTrailingWhenEmpty = false,
     super.key,
-  }) : assert(sectionTitle == null || leadingWidget == null,
-            "Cannot specify both sectionTitle and leadingWidget",);
+  }) : assert(
+          sectionTitle == null || leadingWidget == null,
+          "Cannot specify both sectionTitle and leadingWidget",
+        );
 
   final AbstractControl control;
 
@@ -149,7 +154,11 @@ class FormArrayTable<T> extends StatelessWidget {
   }
 
   List<Widget> _buildRow(
-      BuildContext context, T item, int rowIdx, Set<WidgetState> states,) {
+    BuildContext context,
+    T item,
+    int rowIdx,
+    Set<WidgetState> states,
+  ) {
     final tableTextStyleSecondary = Theme.of(context).textTheme.bodyMedium;
     return [
       CustomScrollView(
diff --git a/designer_v2/lib/features/forms/form_control.dart b/designer_v2/lib/features/forms/form_control.dart
index f40355ac5..62e27524f 100644
--- a/designer_v2/lib/features/forms/form_control.dart
+++ b/designer_v2/lib/features/forms/form_control.dart
@@ -29,7 +29,8 @@ class CustomFormControl<T> extends FormControl<T> {
     if (onStatusChanged != null) {
       final callback = (_onStatusChangedDebouncer != null)
           ? (ControlStatus value) => _onStatusChangedDebouncer!(
-              callback: () => onStatusChanged!(value),)
+                callback: () => onStatusChanged!(value),
+              )
           : onStatusChanged;
 
       statusChanged.listen(callback);
@@ -43,7 +44,9 @@ class CustomFormControl<T> extends FormControl<T> {
   late final Debouncer? _onStatusChangedDebouncer =
       (onStatusChangedDebounceTime != null)
           ? Debouncer(
-              milliseconds: onStatusChangedDebounceTime!, leading: false,)
+              milliseconds: onStatusChangedDebounceTime!,
+              leading: false,
+            )
           : null;
 
   @override
diff --git a/designer_v2/lib/features/forms/form_validation.dart b/designer_v2/lib/features/forms/form_validation.dart
index 622b6254d..44de401bb 100644
--- a/designer_v2/lib/features/forms/form_validation.dart
+++ b/designer_v2/lib/features/forms/form_validation.dart
@@ -25,7 +25,8 @@ class FormControlValidation {
     }
     if (control != other.control) {
       throw Exception(
-          "Cannot merge FormControlValidationConfig for different controls.",);
+        "Cannot merge FormControlValidationConfig for different controls.",
+      );
     }
     return FormControlValidation(
       control: control,
@@ -57,12 +58,14 @@ extension AbstractControlX on AbstractControl {
   Map<String, ValidationMessageFunction> get validationMessages =>
       _controlValidationMessages[this] ?? {};
   set validationMessages(
-          Map<String, ValidationMessageFunction> validationMessages,) =>
+    Map<String, ValidationMessageFunction> validationMessages,
+  ) =>
       _controlValidationMessages[this] = validationMessages;
 }
 
 List<Tuple<AbstractControl, String>> _collectValidationErrorMessages(
-    AbstractControl control,) {
+  AbstractControl control,
+) {
   final List<Tuple<AbstractControl, String>> allValidationErrorMessages = [];
 
   if (!control.enabled || !control.hasErrors) {
@@ -96,7 +99,8 @@ List<Tuple<AbstractControl, String>> _collectValidationErrorMessages(
 }
 
 List<Tuple<AbstractControl, String>>? _getControlErrorMessages(
-    AbstractControl control,) {
+  AbstractControl control,
+) {
   List<Tuple<AbstractControl, String>>? errorMessages;
   // Typecasting needed as a workaround because dynamic dispatch
   // is not working properly with extension methods
diff --git a/designer_v2/lib/features/forms/form_view_model_collection.dart b/designer_v2/lib/features/forms/form_view_model_collection.dart
index b3b95492f..3bbc4f7c7 100644
--- a/designer_v2/lib/features/forms/form_view_model_collection.dart
+++ b/designer_v2/lib/features/forms/form_view_model_collection.dart
@@ -4,11 +4,13 @@ import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
 
 /// Parent class for [FormViewModel]s that are managed in a [FormViewModelCollection]
 abstract class ManagedFormViewModel<T> extends FormViewModel<T> {
-  ManagedFormViewModel({super.delegate, super.formData, super.autosave, super.validationSet});
+  ManagedFormViewModel(
+      {super.delegate, super.formData, super.autosave, super.validationSet});
   ManagedFormViewModel<T> createDuplicate();
 }
 
-typedef FormViewModelCollectionIterablePredicate<T extends FormViewModel> = bool Function(T formViewModel);
+typedef FormViewModelCollectionIterablePredicate<T extends FormViewModel> = bool
+    Function(T formViewModel);
 
 class FormViewModelNotFoundException implements Exception {}
 
@@ -17,7 +19,8 @@ class FormViewModelNotFoundException implements Exception {}
 ///
 /// Enables reactive re-rendering of forms containing a [FormArray] that is
 /// derived from a list of [FormViewModel]s
-class FormViewModelCollection<T extends ManagedFormViewModel<D>, D extends IFormData> {
+class FormViewModelCollection<T extends ManagedFormViewModel<D>,
+    D extends IFormData> {
   FormViewModelCollection(this.formViewModels, this.formArray);
 
   List<T> formViewModels;
@@ -33,7 +36,8 @@ class FormViewModelCollection<T extends ManagedFormViewModel<D>, D extends IForm
 
   List<T> get retrievableViewModels => [...formViewModels, ...stagedViewModels];
 
-  List<D> get formData => formViewModels.map((vm) => vm.buildFormData()).toList();
+  List<D> get formData =>
+      formViewModels.map((vm) => vm.buildFormData()).toList();
 
   void add(T formViewModel) {
     if (formViewModels.contains(formViewModel)) {
diff --git a/designer_v2/lib/features/forms/form_view_model_collection_actions.dart b/designer_v2/lib/features/forms/form_view_model_collection_actions.dart
index 73010cdba..3bed67b07 100644
--- a/designer_v2/lib/features/forms/form_view_model_collection_actions.dart
+++ b/designer_v2/lib/features/forms/form_view_model_collection_actions.dart
@@ -51,15 +51,19 @@ extension FormViewModelCollectionActions<T extends ManagedFormViewModel<D>,
     return actions;
   }
 
-  List<ModelAction> availablePopupActions(T formViewModel,
-      {bool isReadOnly = false,}) {
+  List<ModelAction> availablePopupActions(
+    T formViewModel, {
+    bool isReadOnly = false,
+  }) {
     return availableActions(formViewModel, isReadOnly: isReadOnly)
         .where((action) => action.type != ModelActionType.edit)
         .toList();
   }
 
-  List<ModelAction> availableInlineActions(T formViewModel,
-      {bool isReadOnly = false,}) {
+  List<ModelAction> availableInlineActions(
+    T formViewModel, {
+    bool isReadOnly = false,
+  }) {
     return availableActions(formViewModel, isReadOnly: isReadOnly)
         .where((action) => action.type == ModelActionType.edit)
         .toList();
diff --git a/designer_v2/lib/features/publish/study_publish_dialog_success.dart b/designer_v2/lib/features/publish/study_publish_dialog_success.dart
index 369099055..5cfc9049d 100644
--- a/designer_v2/lib/features/publish/study_publish_dialog_success.dart
+++ b/designer_v2/lib/features/publish/study_publish_dialog_success.dart
@@ -21,10 +21,13 @@ class PublishSuccessDialog extends StudyPageWidget {
         children: [
           const SizedBox(height: 24.0),
           EmptyBody(
-            leading: Text("\u{1f389}".hardcoded,
-                style: theme.textTheme.displayLarge?.copyWith(
-                  fontSize: (theme.textTheme.displayLarge?.fontSize ?? 48.0) * 1.5,
-                ),),
+            leading: Text(
+              "\u{1f389}".hardcoded,
+              style: theme.textTheme.displayLarge?.copyWith(
+                fontSize:
+                    (theme.textTheme.displayLarge?.fontSize ?? 48.0) * 1.5,
+              ),
+            ),
             title: tr.study_launch_success_title,
             description: tr.study_launch_success_description,
           ),
@@ -33,25 +36,28 @@ class PublishSuccessDialog extends StudyPageWidget {
       ),
       actionButtons: [
         Expanded(
-            child: Column(
-          children: [
-            PrimaryButton(
-              text: tr.action_button_post_launch_followup,
-              onPressed: () => Navigator.maybePop(context).whenComplete(() => controller.onAddParticipants()),
-            ),
-            const SizedBox(height: 8.0),
-            Opacity(
-              opacity: 0.75,
-              child: TextButton(
-                child: Padding(
-                  padding: const EdgeInsets.symmetric(vertical: 4.0, horizontal: 8.0),
-                  child: Text(tr.action_button_post_launch_followup_skip),
+          child: Column(
+            children: [
+              PrimaryButton(
+                text: tr.action_button_post_launch_followup,
+                onPressed: () => Navigator.maybePop(context)
+                    .whenComplete(() => controller.onAddParticipants()),
+              ),
+              const SizedBox(height: 8.0),
+              Opacity(
+                opacity: 0.75,
+                child: TextButton(
+                  child: Padding(
+                    padding: const EdgeInsets.symmetric(
+                        vertical: 4.0, horizontal: 8.0),
+                    child: Text(tr.action_button_post_launch_followup_skip),
+                  ),
+                  onPressed: () => Navigator.maybePop(context),
                 ),
-                onPressed: () => Navigator.maybePop(context),
               ),
-            ),
-          ],
-        ),),
+            ],
+          ),
+        ),
       ],
       maxWidth: 450,
     );
diff --git a/designer_v2/lib/features/recruit/enrolled_badge.dart b/designer_v2/lib/features/recruit/enrolled_badge.dart
index b7b361675..eaa12de76 100644
--- a/designer_v2/lib/features/recruit/enrolled_badge.dart
+++ b/designer_v2/lib/features/recruit/enrolled_badge.dart
@@ -28,13 +28,14 @@ class EnrolledBadge extends StatelessWidget {
     }
 
     return Tooltip(
-        message: tr.enrolled_count_tooltip(enrolledCount),
-        child: studybadge.Badge(
-          icon: Icons.check_circle_rounded,
-          iconSize: theme.iconTheme.size,
-          label: (enrolledCount > 1) ? enrolledCount.toString() : "",
-          color: Colors.green,
-          labelStyle: TextStyle(fontSize: mutedTextStyle.fontSize! - 2),
-        ),);
+      message: tr.enrolled_count_tooltip(enrolledCount),
+      child: studybadge.Badge(
+        icon: Icons.check_circle_rounded,
+        iconSize: theme.iconTheme.size,
+        label: (enrolledCount > 1) ? enrolledCount.toString() : "",
+        color: Colors.green,
+        labelStyle: TextStyle(fontSize: mutedTextStyle.fontSize! - 2),
+      ),
+    );
   }
 }
diff --git a/designer_v2/lib/features/recruit/invite_code_form_view.dart b/designer_v2/lib/features/recruit/invite_code_form_view.dart
index 5fdbfcfad..12835e01d 100644
--- a/designer_v2/lib/features/recruit/invite_code_form_view.dart
+++ b/designer_v2/lib/features/recruit/invite_code_form_view.dart
@@ -16,42 +16,49 @@ class InviteCodeFormView extends FormConsumerWidget {
   Widget build(BuildContext context, FormGroup form) {
     return Column(
       children: [
-        FormTableLayout(rows: [
-          FormTableRow(
-            label: tr.form_field_code,
-            labelStyle: const TextStyle(fontWeight: FontWeight.bold),
-            labelHelpText: tr.form_field_code_tooltip,
-            control: formViewModel.codeControl,
-            input: ReactiveTextField(
-              formControl: formViewModel.codeControl,
-              validationMessages: formViewModel.codeControlValidationMessages,
-              decoration: (formViewModel.codeControl.enabled)
-                  ? InputDecoration(
-                      helperText: "",
-                      suffixIcon: Material(
+        FormTableLayout(
+          rows: [
+            FormTableRow(
+              label: tr.form_field_code,
+              labelStyle: const TextStyle(fontWeight: FontWeight.bold),
+              labelHelpText: tr.form_field_code_tooltip,
+              control: formViewModel.codeControl,
+              input: ReactiveTextField(
+                formControl: formViewModel.codeControl,
+                validationMessages: formViewModel.codeControlValidationMessages,
+                decoration: (formViewModel.codeControl.enabled)
+                    ? InputDecoration(
+                        helperText: "",
+                        suffixIcon: Material(
                           color: Colors.transparent,
                           child: IconButton(
                             splashRadius: 18.0,
                             onPressed: formViewModel.regenerateCode,
                             icon: const Icon(Icons.refresh_rounded),
-                          ),),)
-                  : const InputDecoration(),
+                          ),
+                        ),
+                      )
+                    : const InputDecoration(),
+              ),
             ),
-          ),
-          FormTableRow(
-            label: tr.form_field_is_preconfigured_schedule,
-            labelStyle: const TextStyle(fontWeight: FontWeight.bold),
-            input: ReactiveSwitch(
-              formControl: formViewModel.isPreconfiguredScheduleControl,
+            FormTableRow(
+              label: tr.form_field_is_preconfigured_schedule,
+              labelStyle: const TextStyle(fontWeight: FontWeight.bold),
+              input: ReactiveSwitch(
+                formControl: formViewModel.isPreconfiguredScheduleControl,
+              ),
             ),
-          ),
-        ],),
+          ],
+        ),
         const SizedBox(height: 4.0),
-        TextParagraph(text: tr.form_field_is_preconfigured_schedule_description),
+        TextParagraph(
+            text: tr.form_field_is_preconfigured_schedule_description),
         const SizedBox(height: 24.0),
-        FormTableLayout(rows: [
-          ..._conditionalInterventionRows(context),
-        ],),
+        FormTableLayout(
+          rows: [
+            ..._conditionalInterventionRows(context),
+          ],
+        ),
       ],
     );
   }
@@ -69,10 +76,12 @@ class InviteCodeFormView extends FormConsumerWidget {
           //decoration: const NullHelperDecoration(),
           readOnly: true,
           items: formViewModel.preconfiguredScheduleTypeOptions
-              .map((option) => DropdownMenuItem(
-                    value: option.value,
-                    child: Text(option.label),
-                  ),)
+              .map(
+                (option) => DropdownMenuItem(
+                  value: option.value,
+                  child: Text(option.label),
+                ),
+              )
               .toList(),
         ),
       ),
@@ -83,10 +92,12 @@ class InviteCodeFormView extends FormConsumerWidget {
           hint: Text(tr.form_field_preconfigured_schedule_intervention_hint),
           //decoration: const NullHelperDecoration(),
           items: formViewModel.interventionControlOptions
-              .map((option) => DropdownMenuItem(
-                    value: option.value,
-                    child: Text(option.label),
-                  ),)
+              .map(
+                (option) => DropdownMenuItem(
+                  value: option.value,
+                  child: Text(option.label),
+                ),
+              )
               .toList(),
         ),
       ),
@@ -97,10 +108,12 @@ class InviteCodeFormView extends FormConsumerWidget {
           hint: Text(tr.form_field_preconfigured_schedule_intervention_hint),
           //decoration: const NullHelperDecoration(),
           items: formViewModel.interventionControlOptions
-              .map((option) => DropdownMenuItem(
-                    value: option.value,
-                    child: Text(option.label),
-                  ),)
+              .map(
+                (option) => DropdownMenuItem(
+                  value: option.value,
+                  child: Text(option.label),
+                ),
+              )
               .toList(),
         ),
       ),
diff --git a/designer_v2/lib/features/recruit/invite_codes_table.dart b/designer_v2/lib/features/recruit/invite_codes_table.dart
index 46036a6c9..c2ec9d3bc 100644
--- a/designer_v2/lib/features/recruit/invite_codes_table.dart
+++ b/designer_v2/lib/features/recruit/invite_codes_table.dart
@@ -34,18 +34,27 @@ class StudyInvitesTable extends StatelessWidget {
     return StandardTable<StudyInvite>(
       items: invites,
       columns: [
-        StandardTableColumn(label: '#', columnWidth: const FixedColumnWidth(60)),
         StandardTableColumn(
-            label: tr.code_list_header_code,
-            columnWidth: const MaxColumnWidth(FixedColumnWidth(200), FlexColumnWidth(1.6)),),
+            label: '#', columnWidth: const FixedColumnWidth(60)),
         StandardTableColumn(
-            label: tr.studies_list_header_participants_enrolled, columnWidth: const FixedColumnWidth(100),),
+          label: tr.code_list_header_code,
+          columnWidth:
+              const MaxColumnWidth(FixedColumnWidth(200), FlexColumnWidth(1.6)),
+        ),
         StandardTableColumn(
-            label: tr.form_field_preconfigured_schedule_intervention_a,
-            columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth()),),
+          label: tr.studies_list_header_participants_enrolled,
+          columnWidth: const FixedColumnWidth(100),
+        ),
         StandardTableColumn(
-            label: tr.form_field_preconfigured_schedule_intervention_b,
-            columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth()),),
+          label: tr.form_field_preconfigured_schedule_intervention_a,
+          columnWidth:
+              const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth()),
+        ),
+        StandardTableColumn(
+          label: tr.form_field_preconfigured_schedule_intervention_b,
+          columnWidth:
+              const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth()),
+        ),
         //StandardTableColumn(label: '', columnWidth: const FixedColumnWidth(60)),
       ],
       onSelectItem: onSelect,
@@ -56,14 +65,16 @@ class StudyInvitesTable extends StatelessWidget {
     );
   }
 
-  List<Widget> _buildRow(BuildContext context, StudyInvite item, int rowIdx, Set<WidgetState> states) {
+  List<Widget> _buildRow(BuildContext context, StudyInvite item, int rowIdx,
+      Set<WidgetState> states) {
     final theme = Theme.of(context);
     final mutedTextStyle = ThemeConfig.bodyTextBackground(theme);
 
     Intervention? interventionA;
     Intervention? interventionB;
 
-    if (item.preselectedInterventionIds != null && item.preselectedInterventionIds!.isNotEmpty) {
+    if (item.preselectedInterventionIds != null &&
+        item.preselectedInterventionIds!.isNotEmpty) {
       interventionA = getIntervention(item.preselectedInterventionIds![0]);
       interventionB = getIntervention(item.preselectedInterventionIds![1]);
     }
diff --git a/designer_v2/lib/features/recruit/study_recruit_page.dart b/designer_v2/lib/features/recruit/study_recruit_page.dart
index ebe7ea8ae..5ba14261d 100644
--- a/designer_v2/lib/features/recruit/study_recruit_page.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_page.dart
@@ -20,39 +20,45 @@ class StudyRecruitScreen extends StudyPageWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final state = ref.watch(studyRecruitControllerProvider(studyId));
-    final controller = ref.watch(studyRecruitControllerProvider(studyId).notifier);
+    final controller =
+        ref.watch(studyRecruitControllerProvider(studyId).notifier);
 
     return AsyncValueWidget<List<StudyInvite>?>(
-        value: state.invites,
-        data: (studyInvites) => Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: <Widget>[
-                _inviteCodesSectionHeader(context, ref),
-                const SizedBox(height: 24.0), // spacing between body elements
-                StudyInvitesTable(
-                  invites: studyInvites!, // otherwise falls through to [AsyncValueWidget.empty]
-                  onSelect: _onSelectInvite(context, ref),
-                  getActions: controller.availableActions,
-                  getInlineActions: controller.availableInlineActions,
-                  getIntervention: controller.getIntervention,
-                  getParticipantCountForInvite: controller.getParticipantCountForInvite,
-                ),
-              ],
-            ),
-        empty: () => Padding(
-              padding: const EdgeInsets.only(top: 24),
-              child: EmptyBody(
-                  icon: Icons.link_off_rounded,
-                  title: tr.code_list_empty_title,
-                  description: tr.code_list_empty_description,
-                  button: _newInviteCodeButton(context, ref),),
-            ),);
+      value: state.invites,
+      data: (studyInvites) => Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: <Widget>[
+          _inviteCodesSectionHeader(context, ref),
+          const SizedBox(height: 24.0), // spacing between body elements
+          StudyInvitesTable(
+            invites:
+                studyInvites!, // otherwise falls through to [AsyncValueWidget.empty]
+            onSelect: _onSelectInvite(context, ref),
+            getActions: controller.availableActions,
+            getInlineActions: controller.availableInlineActions,
+            getIntervention: controller.getIntervention,
+            getParticipantCountForInvite:
+                controller.getParticipantCountForInvite,
+          ),
+        ],
+      ),
+      empty: () => Padding(
+        padding: const EdgeInsets.only(top: 24),
+        child: EmptyBody(
+          icon: Icons.link_off_rounded,
+          title: tr.code_list_empty_title,
+          description: tr.code_list_empty_description,
+          button: _newInviteCodeButton(context, ref),
+        ),
+      ),
+    );
   }
 
   Widget _inviteCodesSectionHeader(BuildContext context, WidgetRef ref) {
     return Row(
       children: [
-        SelectableText(tr.code_list_section_title, style: Theme.of(context).textTheme.headlineSmall),
+        SelectableText(tr.code_list_section_title,
+            style: Theme.of(context).textTheme.headlineSmall),
         Container(width: 32.0),
         _newInviteCodeButton(context, ref),
         Container(width: 32.0),
@@ -64,17 +70,20 @@ class StudyRecruitScreen extends StudyPageWidget {
     return PrimaryButton(
       text: tr.action_button_code_new,
       onPressed: () {
-        final formViewModel = ref.read(inviteCodeFormViewModelProvider(studyId));
+        final formViewModel =
+            ref.read(inviteCodeFormViewModelProvider(studyId));
         showFormSideSheet<InviteCodeFormViewModel>(
           context: context,
           formViewModel: formViewModel,
-          formViewBuilder: (formViewModel) => InviteCodeFormView(formViewModel: formViewModel),
+          formViewBuilder: (formViewModel) =>
+              InviteCodeFormView(formViewModel: formViewModel),
         );
       },
     );
   }
 
-  Null Function(StudyInvite invite) _onSelectInvite(BuildContext context, WidgetRef ref) {
+  Null Function(StudyInvite invite) _onSelectInvite(
+      BuildContext context, WidgetRef ref) {
     // TODO: refactor to use [RoutingIntent] for sidesheet (so that it can be triggered from controller)
     return (StudyInvite invite) {
       final formViewModel = ref.read(inviteCodeFormViewModelProvider(studyId));
@@ -82,7 +91,8 @@ class StudyRecruitScreen extends StudyPageWidget {
       showFormSideSheet<InviteCodeFormViewModel>(
         context: context,
         formViewModel: formViewModel,
-        formViewBuilder: (formViewModel) => InviteCodeFormView(formViewModel: formViewModel),
+        formViewBuilder: (formViewModel) =>
+            InviteCodeFormView(formViewModel: formViewModel),
       );
     };
   }
diff --git a/designer_v2/lib/features/study/settings/study_settings_dialog.dart b/designer_v2/lib/features/study/settings/study_settings_dialog.dart
index 331507035..60eb2cde6 100644
--- a/designer_v2/lib/features/study/settings/study_settings_dialog.dart
+++ b/designer_v2/lib/features/study/settings/study_settings_dialog.dart
@@ -14,7 +14,8 @@ class StudySettingsDialog extends StudyPageWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final formViewModel = ref.watch(studySettingsFormViewModelProvider(studyId));
+    final formViewModel =
+        ref.watch(studySettingsFormViewModelProvider(studyId));
 
     return ReactiveForm(
       formGroup: formViewModel.form,
@@ -28,34 +29,40 @@ class StudySettingsDialog extends StudyPageWidget {
             const SizedBox(height: 6.0),
             TextParagraph(text: tr.navlink_public_studies_description),
             const SizedBox(height: 24.0),
-            ReactiveFormConsumer(builder: (context, form, child) {
-              return FormTableLayout(
-                rows: [
-                  FormTableRow(
+            ReactiveFormConsumer(
+              builder: (context, form, child) {
+                return FormTableLayout(
+                  rows: [
+                    FormTableRow(
                       label: tr.study_settings_publish_study,
                       labelHelpText: tr.study_settings_publish_study_tooltip,
                       input: Align(
                         alignment: Alignment.centerRight,
                         child: ReactiveSwitch(
-                          formControl: formViewModel.isPublishedToRegistryControl,
+                          formControl:
+                              formViewModel.isPublishedToRegistryControl,
                         ),
-                      ),),
-                  FormTableRow(
+                      ),
+                    ),
+                    FormTableRow(
                       label: tr.study_settings_publish_results,
                       labelHelpText: tr.study_settings_publish_results_tooltip,
                       input: Align(
                         alignment: Alignment.centerRight,
                         child: ReactiveSwitch(
-                          formControl: formViewModel.isPublishedToRegistryResultsControl,
+                          formControl:
+                              formViewModel.isPublishedToRegistryResultsControl,
                         ),
-                      ),),
-                ],
-                columnWidths: const {
-                  0: IntrinsicColumnWidth(),
-                  1: FlexColumnWidth(),
-                },
-              );
-            },),
+                      ),
+                    ),
+                  ],
+                  columnWidths: const {
+                    0: IntrinsicColumnWidth(),
+                    1: FlexColumnWidth(),
+                  },
+                );
+              },
+            ),
             const SizedBox(height: 12.0),
           ],
         ),
diff --git a/designer_v2/lib/features/study/study_controller_state.dart b/designer_v2/lib/features/study/study_controller_state.dart
index 91254cbf7..cac87e3d3 100644
--- a/designer_v2/lib/features/study/study_controller_state.dart
+++ b/designer_v2/lib/features/study/study_controller_state.dart
@@ -6,7 +6,8 @@ import 'package:studyu_designer_v2/features/study/study_base_state.dart';
 import 'package:studyu_designer_v2/features/study/study_scaffold.dart';
 import 'package:studyu_designer_v2/repositories/model_repository.dart';
 
-class StudyControllerState extends StudyControllerBaseState implements IStudyAppBarViewModel, ISyncIndicatorViewModel {
+class StudyControllerState extends StudyControllerBaseState
+    implements IStudyAppBarViewModel, ISyncIndicatorViewModel {
   const StudyControllerState({
     required super.currentUser,
     super.studyWithMetadata,
@@ -43,7 +44,8 @@ class StudyControllerState extends StudyControllerBaseState implements IStudyApp
 
   @override
   bool get isRecruitTabEnabled =>
-      study.value == null || (study.value != null && study.value!.canEdit(super.currentUser));
+      study.value == null ||
+      (study.value != null && study.value!.canEdit(super.currentUser));
 
   @override
   bool get isMonitorTabEnabled => isRecruitTabEnabled;
@@ -51,21 +53,27 @@ class StudyControllerState extends StudyControllerBaseState implements IStudyApp
   @override
   bool get isAnalyzeTabEnabled =>
       study.value == null ||
-      (study.value != null && (study.value!.canEdit(super.currentUser) || study.value!.publishedToRegistryResults));
+      (study.value != null &&
+          (study.value!.canEdit(super.currentUser) ||
+              study.value!.publishedToRegistryResults));
 
   @override
-  bool get isSettingsEnabled => study.value != null && study.value!.canChangeSettings(super.currentUser!);
+  bool get isSettingsEnabled =>
+      study.value != null && study.value!.canChangeSettings(super.currentUser!);
 
   // - IStudyAppBarViewModel
 
   @override
-  bool get isStatusBadgeVisible => studyStatus != null && studyStatus != StudyStatus.draft;
+  bool get isStatusBadgeVisible =>
+      studyStatus != null && studyStatus != StudyStatus.draft;
 
   @override
-  bool get isSyncIndicatorVisible => studyStatus != null && studyStatus == StudyStatus.draft;
+  bool get isSyncIndicatorVisible =>
+      studyStatus != null && studyStatus == StudyStatus.draft;
 
   @override
-  bool get isPublishVisible => studyWithMetadata?.model.status == StudyStatus.draft;
+  bool get isPublishVisible =>
+      studyWithMetadata?.model.status == StudyStatus.draft;
 
   @override
   StudyStatus? get studyStatus => study.value?.status;
diff --git a/designer_v2/lib/features/study/study_navbar.dart b/designer_v2/lib/features/study/study_navbar.dart
index 804628a7b..c912ce114 100644
--- a/designer_v2/lib/features/study/study_navbar.dart
+++ b/designer_v2/lib/features/study/study_navbar.dart
@@ -64,9 +64,10 @@ class StudyDesignNav {
       ];
 
   static NavbarTab info(StudyID studyId) => NavbarTab(
-      index: 0,
-      title: tr.navlink_study_design_info,
-      intent: RoutingIntents.studyEditInfo(studyId),);
+        index: 0,
+        title: tr.navlink_study_design_info,
+        intent: RoutingIntents.studyEditInfo(studyId),
+      );
   static NavbarTab enrollment(StudyID studyId) => NavbarTab(
         index: 1,
         title: tr.navlink_study_design_enrollment,
@@ -83,7 +84,8 @@ class StudyDesignNav {
         intent: RoutingIntents.studyEditMeasurements(studyId),
       );
   static NavbarTab reports(StudyID studyId) => NavbarTab(
-      index: 4,
-      title: "Reports",
-      intent: RoutingIntents.studyEditReports(studyId),);
+        index: 4,
+        title: "Reports",
+        intent: RoutingIntents.studyEditReports(studyId),
+      );
 }
diff --git a/designer_v2/lib/features/study/study_participation_badge.dart b/designer_v2/lib/features/study/study_participation_badge.dart
index 91ab92260..3db9fb67f 100644
--- a/designer_v2/lib/features/study/study_participation_badge.dart
+++ b/designer_v2/lib/features/study/study_participation_badge.dart
@@ -4,12 +4,13 @@ import 'package:studyu_designer_v2/common_views/badge.dart' as studybadge;
 import 'package:studyu_designer_v2/domain/participation.dart';
 
 class StudyParticipationBadge extends StatelessWidget {
-  const StudyParticipationBadge(
-      {required this.participation,
-      this.type = studybadge.BadgeType.plain,
-      this.showPrefixIcon = true,
-      this.center = true,
-      super.key,});
+  const StudyParticipationBadge({
+    required this.participation,
+    this.type = studybadge.BadgeType.plain,
+    this.showPrefixIcon = true,
+    this.center = true,
+    super.key,
+  });
 
   final Participation participation;
   final studybadge.BadgeType type;
@@ -33,22 +34,27 @@ class StudyParticipationBadge extends StatelessWidget {
 
     switch (participation) {
       case Participation.open:
-        return inTooltip(studybadge.Badge(
+        return inTooltip(
+          studybadge.Badge(
             label: participation.whoShort,
             center: center,
             color: colorScheme.primary.withOpacity(0.8),
             type: type,
             icon: showPrefixIcon ? Icons.people_rounded : null,
-            padding: const EdgeInsets.symmetric(horizontal: 4.0, vertical: 4.0),),);
+            padding: const EdgeInsets.symmetric(horizontal: 4.0, vertical: 4.0),
+          ),
+        );
       case Participation.invite:
-        return inTooltip(studybadge.Badge(
-          label: participation.whoShort,
-          center: center,
-          color: colorScheme.onPrimaryContainer.withOpacity(0.6),
-          type: type,
-          icon: showPrefixIcon ? Icons.lock_rounded : null,
-          padding: const EdgeInsets.symmetric(horizontal: 4.0, vertical: 4.0),
-        ),);
+        return inTooltip(
+          studybadge.Badge(
+            label: participation.whoShort,
+            center: center,
+            color: colorScheme.onPrimaryContainer.withOpacity(0.6),
+            type: type,
+            icon: showPrefixIcon ? Icons.lock_rounded : null,
+            padding: const EdgeInsets.symmetric(horizontal: 4.0, vertical: 4.0),
+          ),
+        );
     }
   }
 }
diff --git a/designer_v2/lib/features/study/study_status_badge.dart b/designer_v2/lib/features/study/study_status_badge.dart
index 36d346bcd..17a005119 100644
--- a/designer_v2/lib/features/study/study_status_badge.dart
+++ b/designer_v2/lib/features/study/study_status_badge.dart
@@ -10,13 +10,14 @@ abstract class IStudyStatusBadgeViewModel {
 }
 
 class StudyStatusBadge extends StatelessWidget {
-  const StudyStatusBadge(
-      {required this.status,
-      this.participation,
-      this.type = studybadge.BadgeType.outlineFill,
-      this.showPrefixIcon = true,
-      this.showTooltip = true,
-      super.key,});
+  const StudyStatusBadge({
+    required this.status,
+    this.participation,
+    this.type = studybadge.BadgeType.outlineFill,
+    this.showPrefixIcon = true,
+    this.showTooltip = true,
+    super.key,
+  });
 
   final Participation? participation;
   final StudyStatus? status;
@@ -29,7 +30,9 @@ class StudyStatusBadge extends StatelessWidget {
     final colorScheme = Theme.of(context).colorScheme;
     final prefixIcon = showPrefixIcon ? Icons.circle_rounded : null;
 
-    final tooltipMessage = '${status?.description ?? ''}\n${participation?.description ?? ''}'.trim();
+    final tooltipMessage =
+        '${status?.description ?? ''}\n${participation?.description ?? ''}'
+            .trim();
 
     Widget inTooltip(Widget child) {
       if (tooltipMessage.isNotEmpty && showTooltip) {
@@ -43,26 +46,32 @@ class StudyStatusBadge extends StatelessWidget {
 
     switch (status) {
       case StudyStatus.draft:
-        return inTooltip(studybadge.Badge(
-          label: status!.string,
-          color: colorScheme.secondary.withOpacity(0.75),
-          type: type,
-          icon: prefixIcon,
-        ),);
+        return inTooltip(
+          studybadge.Badge(
+            label: status!.string,
+            color: colorScheme.secondary.withOpacity(0.75),
+            type: type,
+            icon: prefixIcon,
+          ),
+        );
       case StudyStatus.closed:
-        return inTooltip(studybadge.Badge(
-          label: status!.string,
-          color: colorScheme.primaryContainer,
-          type: type,
-          icon: prefixIcon,
-        ),);
+        return inTooltip(
+          studybadge.Badge(
+            label: status!.string,
+            color: colorScheme.primaryContainer,
+            type: type,
+            icon: prefixIcon,
+          ),
+        );
       case StudyStatus.running:
-        return inTooltip(studybadge.Badge(
-          label: status!.string,
-          color: Colors.green,
-          type: type,
-          icon: prefixIcon,
-        ),);
+        return inTooltip(
+          studybadge.Badge(
+            label: status!.string,
+            color: Colors.green,
+            type: type,
+            icon: prefixIcon,
+          ),
+        );
       default:
         return const SizedBox.shrink();
     }
diff --git a/designer_v2/lib/features/study/study_test_controller.dart b/designer_v2/lib/features/study/study_test_controller.dart
index 811670165..70f53b48e 100644
--- a/designer_v2/lib/features/study/study_test_controller.dart
+++ b/designer_v2/lib/features/study/study_test_controller.dart
@@ -10,7 +10,8 @@ import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
 
-class StudyTestController extends StudyBaseController<StudyTestControllerState> {
+class StudyTestController
+    extends StudyBaseController<StudyTestControllerState> {
   StudyTestController({
     required super.studyId,
     required super.studyRepository,
@@ -18,11 +19,14 @@ class StudyTestController extends StudyBaseController<StudyTestControllerState>
     required super.router,
     required this.authRepository,
     required this.languageCode,
-  }) : super(StudyTestControllerState(
-          currentUser: currentUser,
-          languageCode: languageCode,
-        ),) {
-    state = state.copyWith(serializedSession: authRepository.serializedSession ?? '');
+  }) : super(
+          StudyTestControllerState(
+            currentUser: currentUser,
+            languageCode: languageCode,
+          ),
+        ) {
+    state = state.copyWith(
+        serializedSession: authRepository.serializedSession ?? '');
   }
 
   final IAuthRepository authRepository;
@@ -30,8 +34,8 @@ class StudyTestController extends StudyBaseController<StudyTestControllerState>
 }
 
 /// Use the [family] modifier to provide a controller parametrized by [StudyID]
-final studyTestControllerProvider =
-    StateNotifierProvider.family<StudyTestController, StudyTestControllerState, StudyID>((ref, studyId) {
+final studyTestControllerProvider = StateNotifierProvider.family<
+    StudyTestController, StudyTestControllerState, StudyID>((ref, studyId) {
   final studyRepository = ref.watch(studyRepositoryProvider);
   final controller = StudyTestController(
     studyId: studyId,
@@ -53,13 +57,15 @@ final studyTestControllerProvider =
   return controller;
 });
 
-final studyTestPlatformControllerProvider = Provider.family<PlatformController, StudyID>((ref, studyId) {
+final studyTestPlatformControllerProvider =
+    Provider.family<PlatformController, StudyID>((ref, studyId) {
   final state = ref.watch(studyTestControllerProvider(studyId));
 
   PlatformController platformController;
   if (!kIsWeb) {
     // Mobile could be built with the webview_flutter package
-    throw Exception("The StudyU designer only support the web platform".hardcoded);
+    throw Exception(
+        "The StudyU designer only support the web platform".hardcoded);
   } else {
     // Desktop and Web
     platformController = WebController(state.appUrl, studyId);
diff --git a/designer_v2/lib/features/study/study_test_frame_controllers.dart b/designer_v2/lib/features/study/study_test_frame_controllers.dart
index b453dae19..4fe04e609 100644
--- a/designer_v2/lib/features/study/study_test_frame_controllers.dart
+++ b/designer_v2/lib/features/study/study_test_frame_controllers.dart
@@ -65,7 +65,8 @@ class WebController extends PlatformController {
       ..src = previewSrc
       ..style.border = 'none';
 
-    ui_web.platformViewRegistry.registerViewFactory('$studyId$key', (int viewId) => iFrameElement);
+    ui_web.platformViewRegistry
+        .registerViewFactory('$studyId$key', (int viewId) => iFrameElement);
   }
 
   @override
@@ -111,7 +112,10 @@ class WebController extends PlatformController {
   void refresh({String? cmd}) {
     if (routeInformation.route != null) {
       if (routeInformation.extra != null) {
-        navigate(route: routeInformation.route, extra: routeInformation.extra, cmd: cmd);
+        navigate(
+            route: routeInformation.route,
+            extra: routeInformation.extra,
+            cmd: cmd);
         return;
       }
       navigate(route: routeInformation.route, cmd: cmd);
diff --git a/designer_v2/lib/features/study/study_test_frame_views.dart b/designer_v2/lib/features/study/study_test_frame_views.dart
index 98e7677b0..535bff00d 100644
--- a/designer_v2/lib/features/study/study_test_frame_views.dart
+++ b/designer_v2/lib/features/study/study_test_frame_views.dart
@@ -22,7 +22,8 @@ class WebFrame extends StatelessWidget {
     return PhoneContainer(
       innerContent: HtmlElementView(key: key, viewType: '$studyId$key'),
       borderColor: theme.colorScheme.secondary.withOpacity(0.4),
-      innerContentBackgroundColor: theme.colorScheme.secondary.withOpacity(0.025),
+      innerContentBackgroundColor:
+          theme.colorScheme.secondary.withOpacity(0.025),
     );
   }
 }
@@ -45,7 +46,8 @@ class DisabledFrame extends StatelessWidget {
         ),
       ),
       borderColor: theme.colorScheme.secondary.withOpacity(0.3),
-      innerContentBackgroundColor: theme.colorScheme.secondary.withOpacity(0.03),
+      innerContentBackgroundColor:
+          theme.colorScheme.secondary.withOpacity(0.03),
     );
   }
 }
@@ -54,15 +56,16 @@ class PhoneContainer extends StatelessWidget {
   static const double defaultWidth = 300.0;
   static const double defaultHeight = 600.0;
 
-  const PhoneContainer(
-      {required this.innerContent,
-      this.width = PhoneContainer.defaultWidth,
-      this.height = PhoneContainer.defaultHeight,
-      this.borderColor = Colors.black,
-      this.borderWidth = 8.0,
-      this.borderRadius = 25.0,
-      this.innerContentBackgroundColor = Colors.white,
-      super.key,});
+  const PhoneContainer({
+    required this.innerContent,
+    this.width = PhoneContainer.defaultWidth,
+    this.height = PhoneContainer.defaultHeight,
+    this.borderColor = Colors.black,
+    this.borderWidth = 8.0,
+    this.borderRadius = 25.0,
+    this.innerContentBackgroundColor = Colors.white,
+    super.key,
+  });
 
   final double width;
   final double height;
@@ -102,16 +105,19 @@ class PhoneContainer extends StatelessWidget {
                 borderRadius: BorderRadius.all(Radius.circular(borderRadius)),
                 child: Container(
                   decoration: BoxDecoration(
-                      borderRadius: BorderRadius.all(Radius.circular(borderRadius)),
-                      border: Border.all(width: borderWidth, color: Colors.white),),
+                    borderRadius:
+                        BorderRadius.all(Radius.circular(borderRadius)),
+                    border: Border.all(width: borderWidth, color: Colors.white),
+                  ),
                 ),
               ),
             ],
           ),
           Container(
             decoration: BoxDecoration(
-                borderRadius: BorderRadius.all(Radius.circular(borderRadius)),
-                border: Border.all(width: borderWidth, color: borderColor),),
+              borderRadius: BorderRadius.all(Radius.circular(borderRadius)),
+              border: Border.all(width: borderWidth, color: borderColor),
+            ),
           ),
         ],
       ),
@@ -154,19 +160,25 @@ Widget? previewBanner(WidgetRef ref, String studyId) {
     return null;
   }
   return BannerBox(
-    body: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-      TextParagraph(
-        text: tr.banner_study_preview_unavailable,
-        style: const TextStyle(fontWeight: FontWeight.bold),
-      ),
-      ReactiveForm(
+    body: Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        TextParagraph(
+          text: tr.banner_study_preview_unavailable,
+          style: const TextStyle(fontWeight: FontWeight.bold),
+        ),
+        ReactiveForm(
           formGroup: formViewModel.form,
-          child: ReactiveFormConsumer(builder: (context, form, child) {
-            return TextParagraph(
-              text: form.validationErrorSummary,
-            );
-          },),),
-    ],),
+          child: ReactiveFormConsumer(
+            builder: (context, form, child) {
+              return TextParagraph(
+                text: form.validationErrorSummary,
+              );
+            },
+          ),
+        ),
+      ],
+    ),
     style: BannerStyle.warning,
   );
 }
diff --git a/designer_v2/lib/localization/language_picker.dart b/designer_v2/lib/localization/language_picker.dart
index f6c0c181a..13aaf59ad 100644
--- a/designer_v2/lib/localization/language_picker.dart
+++ b/designer_v2/lib/localization/language_picker.dart
@@ -29,7 +29,8 @@ class _LanguagePickerState extends ConsumerState<LanguagePicker> {
   @override
   Widget build(BuildContext context) {
     final controller = ref.watch(localeStateProvider.notifier);
-    final currentLocalization = ref.watch(localeProvider.select((value) => value));
+    final currentLocalization =
+        ref.watch(localeProvider.select((value) => value));
     switch (widget.languagePickerType) {
       case LanguagePickerType.field:
         final FormGroup localeForm = FormGroup({
@@ -39,18 +40,19 @@ class _LanguagePickerState extends ConsumerState<LanguagePicker> {
           ),
         });
         return SizedBox(
-            width: 250,
-            child: ReactiveForm(
-              formGroup: localeForm,
-              child: ReactiveDropdownField<Locale>(
-                formControlName: 'localization',
-                //isExpanded: false,
-                //isDense: true,
-                items: _buildLanguageOptionsField(context),
-                icon: Icon(Icons.language, color: widget.iconColor),
-                onChanged: (locale) => controller.setLocale(locale.value!),
-              ),
-            ),);
+          width: 250,
+          child: ReactiveForm(
+            formGroup: localeForm,
+            child: ReactiveDropdownField<Locale>(
+              formControlName: 'localization',
+              //isExpanded: false,
+              //isDense: true,
+              items: _buildLanguageOptionsField(context),
+              icon: Icon(Icons.language, color: widget.iconColor),
+              onChanged: (locale) => controller.setLocale(locale.value!),
+            ),
+          ),
+        );
       case LanguagePickerType.icon:
         return PopupMenuButton<Locale>(
           tooltip: tr.language_select_tooltip,
@@ -69,22 +71,29 @@ class _LanguagePickerState extends ConsumerState<LanguagePicker> {
     final List<PopupMenuItem<Locale>> options = [];
     Config.supportedLocales.forEach((languageCode, countryCode) {
       final locale = Locale(languageCode, countryCode);
-      options.add(PopupMenuItem(
-        value: locale,
-        child: Text('${getEmojiFlag(countryCode)}  ${translateLocaleName(locale: locale)}'),
-      ),);
+      options.add(
+        PopupMenuItem(
+          value: locale,
+          child: Text(
+              '${getEmojiFlag(countryCode)}  ${translateLocaleName(locale: locale)}'),
+        ),
+      );
     });
     return options;
   }
 
-  List<DropdownMenuItem<Locale>> _buildLanguageOptionsField(BuildContext context) {
+  List<DropdownMenuItem<Locale>> _buildLanguageOptionsField(
+      BuildContext context) {
     final List<DropdownMenuItem<Locale>> options = [];
     Config.supportedLocales.forEach((languageCode, countryCode) {
       final locale = Locale(languageCode, countryCode);
-      options.add(DropdownMenuItem(
-        value: locale,
-        child: Text('${getEmojiFlag(countryCode)} ${translateLocaleName(locale: locale)}'),
-      ),);
+      options.add(
+        DropdownMenuItem(
+          value: locale,
+          child: Text(
+              '${getEmojiFlag(countryCode)} ${translateLocaleName(locale: locale)}'),
+        ),
+      );
     });
     return options;
   }
diff --git a/designer_v2/lib/localization/locale_providers.dart b/designer_v2/lib/localization/locale_providers.dart
index ad2949d89..652b0057a 100644
--- a/designer_v2/lib/localization/locale_providers.dart
+++ b/designer_v2/lib/localization/locale_providers.dart
@@ -16,7 +16,9 @@ final platformLocaleProvider = Provider<Locale>((_) {
 
 /// Supported Locales Provider
 final supportedLocalesProvider = Provider<List<Locale>>((_) {
-  return Config.supportedLocales.entries.map((e) => Locale(e.key, e.value)).toList();
+  return Config.supportedLocales.entries
+      .map((e) => Locale(e.key, e.value))
+      .toList();
 });
 
 /// Locale Provider
@@ -25,4 +27,6 @@ final localeProvider = Provider<Locale>((ref) {
   return ref.watch(localeStateProvider).locale;
 });
 
-final localeStateProvider = StateNotifierProvider<LocaleStateNotifier, LocaleState>((ref) => LocaleStateNotifier(ref));
+final localeStateProvider =
+    StateNotifierProvider<LocaleStateNotifier, LocaleState>(
+        (ref) => LocaleStateNotifier(ref));
diff --git a/designer_v2/lib/localization/platform_locale/platform_locale_mobile.dart b/designer_v2/lib/localization/platform_locale/platform_locale_mobile.dart
index 11b833675..a24b8de80 100644
--- a/designer_v2/lib/localization/platform_locale/platform_locale_mobile.dart
+++ b/designer_v2/lib/localization/platform_locale/platform_locale_mobile.dart
@@ -15,8 +15,10 @@ class PlatformLocaleMobile implements PlatformLocale {
     }
 
     // Language and country codes
-    final String languageCode = platformLocaleName.substring(0, platformLocaleName.indexOf('_'));
-    final String countryCode = platformLocaleName.substring(platformLocaleName.indexOf('_') + 1);
+    final String languageCode =
+        platformLocaleName.substring(0, platformLocaleName.indexOf('_'));
+    final String countryCode =
+        platformLocaleName.substring(platformLocaleName.indexOf('_') + 1);
 
     return Locale.fromSubtags(
       languageCode: languageCode,
diff --git a/designer_v2/lib/localization/platform_locale/platform_locale_stub.dart b/designer_v2/lib/localization/platform_locale/platform_locale_stub.dart
index 9642f259a..2532fd882 100644
--- a/designer_v2/lib/localization/platform_locale/platform_locale_stub.dart
+++ b/designer_v2/lib/localization/platform_locale/platform_locale_stub.dart
@@ -1,4 +1,4 @@
 import 'package:studyu_designer_v2/localization/platform_locale/platform_locale_interface.dart';
 
-PlatformLocale getImplementation() =>
-    throw UnsupportedError('Cannot get Platform Locale without dart:html or package:shared_preferences');
+PlatformLocale getImplementation() => throw UnsupportedError(
+    'Cannot get Platform Locale without dart:html or package:shared_preferences');
diff --git a/designer_v2/lib/localization/platform_locale/platform_locale_web.dart b/designer_v2/lib/localization/platform_locale/platform_locale_web.dart
index 0da8216fc..c4f20491e 100644
--- a/designer_v2/lib/localization/platform_locale/platform_locale_web.dart
+++ b/designer_v2/lib/localization/platform_locale/platform_locale_web.dart
@@ -18,8 +18,10 @@ class PlatformLocaleWeb implements PlatformLocale {
     }
 
     // Language and country codes
-    final String languageCode = platformLocaleName.substring(0, platformLocaleName.indexOf('-'));
-    final String countryCode = platformLocaleName.substring(platformLocaleName.indexOf('-') + 1);
+    final String languageCode =
+        platformLocaleName.substring(0, platformLocaleName.indexOf('-'));
+    final String countryCode =
+        platformLocaleName.substring(platformLocaleName.indexOf('-') + 1);
 
     return Locale.fromSubtags(
       languageCode: languageCode,
diff --git a/designer_v2/lib/main.dart b/designer_v2/lib/main.dart
index 789e5d7df..b442de611 100644
--- a/designer_v2/lib/main.dart
+++ b/designer_v2/lib/main.dart
@@ -23,9 +23,10 @@ Future<void> main() async {
     // Turn off the # in the URLs on the web
     usePathUrlStrategy();
     runApp(
-        // Make dependencies managed by Riverpod available in Widget.build methods
-        // by wrapping the app in a [ProviderScope]
-        const ProviderScope(child: App()),);
+      // Make dependencies managed by Riverpod available in Widget.build methods
+      // by wrapping the app in a [ProviderScope]
+      const ProviderScope(child: App()),
+    );
   }, (error, stackTrace) {
     // TODO: top-level error handling
     print("Exception: $error");
diff --git a/designer_v2/lib/repositories/auth_repository.dart b/designer_v2/lib/repositories/auth_repository.dart
index d242c7a88..da26d716a 100644
--- a/designer_v2/lib/repositories/auth_repository.dart
+++ b/designer_v2/lib/repositories/auth_repository.dart
@@ -16,8 +16,10 @@ abstract class IAuthRepository extends IAppDelegate {
   String? get serializedSession;
   late bool allowPasswordReset = false;
   Stream<User?> watchAuthStateChanges({bool emitLastEvent});
-  Future<AuthResponse> signUp({required String email, required String password});
-  Future<AuthResponse> signInWith({required String email, required String password});
+  Future<AuthResponse> signUp(
+      {required String email, required String password});
+  Future<AuthResponse> signInWith(
+      {required String email, required String password});
   Future<void> signOut();
   Future<void> resetPasswordForEmail({required String email});
   Future<UserResponse> updateUser({required String newPassword});
@@ -31,8 +33,10 @@ class AuthRepository implements IAuthRepository {
 
   /// A stream controller for broadcasting the currently logged in user
   /// Broadcasts null if the user is logged out
-  final BehaviorSubject<User?> _authStateStreamController = BehaviorSubject.seeded(null);
-  late final _authStateSuppressedController = SuppressedBehaviorSubject(_authStateStreamController);
+  final BehaviorSubject<User?> _authStateStreamController =
+      BehaviorSubject.seeded(null);
+  late final _authStateSuppressedController =
+      SuppressedBehaviorSubject(_authStateStreamController);
 
   /// Private subscription for synchronizing with [SupabaseClient] auth state
   late final StreamSubscription<AuthState> _authSubscription;
@@ -100,16 +104,21 @@ class AuthRepository implements IAuthRepository {
 
   @override
   BehaviorSubject<User?> watchAuthStateChanges({bool emitLastEvent = true}) =>
-      emitLastEvent ? _authStateStreamController : _authStateSuppressedController.subject;
+      emitLastEvent
+          ? _authStateStreamController
+          : _authStateSuppressedController.subject;
 
   @override
-  Future<AuthResponse> signUp({required String email, required String password}) async {
+  Future<AuthResponse> signUp(
+      {required String email, required String password}) async {
     return await authClient.signUp(email: email, password: password);
   }
 
   @override
-  Future<AuthResponse> signInWith({required String email, required String password}) async {
-    return await authClient.signInWithPassword(email: email, password: password);
+  Future<AuthResponse> signInWith(
+      {required String email, required String password}) async {
+    return await authClient.signInWithPassword(
+        email: email, password: password);
   }
 
   @override
diff --git a/designer_v2/lib/repositories/invite_code_repository.dart b/designer_v2/lib/repositories/invite_code_repository.dart
index 656dbe60e..4bb579660 100644
--- a/designer_v2/lib/repositories/invite_code_repository.dart
+++ b/designer_v2/lib/repositories/invite_code_repository.dart
@@ -66,10 +66,11 @@ class InviteCodeRepository extends ModelRepository<StudyInvite>
         type: ModelActionType.clipboard,
         label: ModelActionType.clipboard.string,
         onExecute: () => {
-          ref.read(clipboardServiceProvider).copy(model.code).then((value) =>
-              ref
-                  .read(notificationServiceProvider)
-                  .show(Notifications.inviteCodeClipped),),
+          ref.read(clipboardServiceProvider).copy(model.code).then(
+                (value) => ref
+                    .read(notificationServiceProvider)
+                    .show(Notifications.inviteCodeClipped),
+              ),
         },
       ),
       ModelAction(
@@ -77,9 +78,11 @@ class InviteCodeRepository extends ModelRepository<StudyInvite>
         label: ModelActionType.delete.string,
         onExecute: () {
           return delete(getKey(model))
-              .then((value) => ref
-                  .read(routerProvider)
-                  .dispatch(RoutingIntents.studyRecruit(model.studyId)),)
+              .then(
+                (value) => ref
+                    .read(routerProvider)
+                    .dispatch(RoutingIntents.studyRecruit(model.studyId)),
+              )
               .then(
                 (value) => Future.delayed(
                   const Duration(milliseconds: 200),
diff --git a/designer_v2/lib/repositories/study_repository.dart b/designer_v2/lib/repositories/study_repository.dart
index e159cbc7e..9900ea64b 100644
--- a/designer_v2/lib/repositories/study_repository.dart
+++ b/designer_v2/lib/repositories/study_repository.dart
@@ -23,13 +23,15 @@ abstract class IStudyRepository implements ModelRepository<Study> {
   // Future<void> deleteProgress(Study study);
 }
 
-class StudyRepository extends ModelRepository<Study> implements IStudyRepository {
+class StudyRepository extends ModelRepository<Study>
+    implements IStudyRepository {
   StudyRepository({
     this.sortCallback,
     required this.apiClient,
     required this.authRepository,
     required this.ref,
-  }) : super(StudyRepositoryDelegate(apiClient: apiClient, authRepository: authRepository));
+  }) : super(StudyRepositoryDelegate(
+            apiClient: apiClient, authRepository: authRepository));
 
   /// Reference to the StudyU API injected via Riverpod
   final StudyUApi apiClient;
@@ -100,9 +102,17 @@ class StudyRepository extends ModelRepository<Study> implements IStudyRepository
   @override
   List<ModelAction> availableActions(Study model) {
     Future<void> onDeleteCallback() {
-      return delete(model.id).then((value) => ref.read(routerProvider).dispatch(RoutingIntents.studies)).then((value) =>
-          Future.delayed(const Duration(milliseconds: 200),
-              () => ref.read(notificationServiceProvider).show(Notifications.studyDeleted),),);
+      return delete(model.id)
+          .then((value) =>
+              ref.read(routerProvider).dispatch(RoutingIntents.studies))
+          .then(
+            (value) => Future.delayed(
+              const Duration(milliseconds: 200),
+              () => ref
+                  .read(notificationServiceProvider)
+                  .show(Notifications.studyDeleted),
+            ),
+          );
     }
 
     final currentUser = authRepository.currentUser!;
@@ -122,17 +132,21 @@ class StudyRepository extends ModelRepository<Study> implements IStudyRepository
         type: StudyActionType.duplicateDraft,
         label: StudyActionType.duplicateDraft.string,
         onExecute: () {
-          return duplicateAndSave(model).then((value) => ref.read(routerProvider).dispatch(RoutingIntents.studies));
+          return duplicateAndSave(model).then((value) =>
+              ref.read(routerProvider).dispatch(RoutingIntents.studies));
         },
-        isAvailable: model.status != StudyStatus.draft && model.canCopy(currentUser),
+        isAvailable:
+            model.status != StudyStatus.draft && model.canCopy(currentUser),
       ),
       ModelAction(
         type: StudyActionType.duplicate,
         label: StudyActionType.duplicate.string,
         onExecute: () {
-          return duplicateAndSave(model).then((value) => ref.read(routerProvider).dispatch(RoutingIntents.studies));
+          return duplicateAndSave(model).then((value) =>
+              ref.read(routerProvider).dispatch(RoutingIntents.studies));
         },
-        isAvailable: model.status == StudyStatus.draft && model.canCopy(currentUser),
+        isAvailable:
+            model.status == StudyStatus.draft && model.canCopy(currentUser),
       ),
       /*
       TODO re-implement this properly
@@ -157,13 +171,17 @@ class StudyRepository extends ModelRepository<Study> implements IStudyRepository
         type: StudyActionType.delete,
         label: StudyActionType.delete.string,
         onExecute: () {
-          return ref
-              .read(notificationServiceProvider)
-              .show(Notifications.studyDeleteConfirmation, // TODO: more severe confirmation for running studies
-                  actions: [
-                NotificationAction(
-                    label: StudyActionType.delete.string, onSelect: onDeleteCallback, isDestructive: true,),
-              ],);
+          return ref.read(notificationServiceProvider).show(
+            Notifications
+                .studyDeleteConfirmation, // TODO: more severe confirmation for running studies
+            actions: [
+              NotificationAction(
+                label: StudyActionType.delete.string,
+                onSelect: onDeleteCallback,
+                isDestructive: true,
+              ),
+            ],
+          );
         },
         isAvailable: model.canDelete(currentUser),
         isDestructive: true,
@@ -175,7 +193,8 @@ class StudyRepository extends ModelRepository<Study> implements IStudyRepository
 }
 
 class StudyRepositoryDelegate extends IModelRepositoryDelegate<Study> {
-  StudyRepositoryDelegate({required this.apiClient, required this.authRepository});
+  StudyRepositoryDelegate(
+      {required this.apiClient, required this.authRepository});
 
   final StudyUApi apiClient;
   final IAuthRepository authRepository;
diff --git a/designer_v2/lib/repositories/supabase_client.dart b/designer_v2/lib/repositories/supabase_client.dart
index 47961ddd0..a99f48123 100644
--- a/designer_v2/lib/repositories/supabase_client.dart
+++ b/designer_v2/lib/repositories/supabase_client.dart
@@ -13,7 +13,8 @@ abstract class SupabaseClientDependant {
 /// An exception that is thrown when Supabase returns a [PostgrestResponse]
 /// with an associated [PostgrestError]
 class SupabaseQueryError implements Exception {
-  SupabaseQueryError({required this.statusCode, required this.message, this.details});
+  SupabaseQueryError(
+      {required this.statusCode, required this.message, this.details});
 
   /// Status code of the erroneous [PostgrestResponse]
   final String? statusCode;
@@ -31,37 +32,60 @@ typedef PostgrestDataCallback = Object Function(dynamic data);
 mixin SupabaseQueryMixin on SupabaseClientDependant {
   // - Networking
 
-  Future<List<T>> deleteAll<T extends SupabaseObject>(Map<String, Object> selectionCriteria) async {
+  Future<List<T>> deleteAll<T extends SupabaseObject>(
+      Map<String, Object> selectionCriteria) async {
     try {
-      final data = await supabaseClient.from(tableName(T)).delete().match(selectionCriteria);
+      final data = await supabaseClient
+          .from(tableName(T))
+          .delete()
+          .match(selectionCriteria);
       if (data == null) return [];
       return deserializeList<T>(data);
     } on PostgrestException catch (error) {
-      throw SupabaseQueryError(statusCode: error.code, message: error.message, details: error.details);
+      throw SupabaseQueryError(
+          statusCode: error.code,
+          message: error.message,
+          details: error.details);
     }
   }
 
-  Future<List<T>> getAll<T extends SupabaseObject>({List<String> selectedColumns = const ['*']}) async {
+  Future<List<T>> getAll<T extends SupabaseObject>(
+      {List<String> selectedColumns = const ['*']}) async {
     try {
-      final data = await supabaseClient.from(tableName(T)).select(selectedColumns.join(','));
+      final data = await supabaseClient
+          .from(tableName(T))
+          .select(selectedColumns.join(','));
       return deserializeList<T>(data);
     } on PostgrestException catch (error) {
-      throw SupabaseQueryError(statusCode: error.code, message: error.message, details: error.details);
+      throw SupabaseQueryError(
+          statusCode: error.code,
+          message: error.message,
+          details: error.details);
     }
   }
 
-  Future<T> getById<T extends SupabaseObject>(String id, {List<String> selectedColumns = const ['*']}) async {
+  Future<T> getById<T extends SupabaseObject>(String id,
+      {List<String> selectedColumns = const ['*']}) async {
     return getByColumn('id', id, selectedColumns: selectedColumns);
   }
 
-  Future<T> getByColumn<T extends SupabaseObject>(String colName, String value,
-      {List<String> selectedColumns = const ['*'],}) async {
+  Future<T> getByColumn<T extends SupabaseObject>(
+    String colName,
+    String value, {
+    List<String> selectedColumns = const ['*'],
+  }) async {
     try {
-      final data =
-          await supabaseClient.from(tableName(T)).select(selectedColumns.join(',')).eq(colName, value).single();
+      final data = await supabaseClient
+          .from(tableName(T))
+          .select(selectedColumns.join(','))
+          .eq(colName, value)
+          .single();
       return deserializeObject<T>(data);
     } on PostgrestException catch (error) {
-      throw SupabaseQueryError(statusCode: error.code, message: error.message, details: error.details);
+      throw SupabaseQueryError(
+          statusCode: error.code,
+          message: error.message,
+          details: error.details);
     }
   }
 
@@ -69,7 +93,9 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
 
   List<T> deserializeList<T extends SupabaseObject>(dynamic data) {
     return List<T>.from(
-        List<Map<String, dynamic>>.from(data as List).map((json) => SupabaseObjectFunctions.fromJson<T>(json)),);
+      List<Map<String, dynamic>>.from(data as List)
+          .map((json) => SupabaseObjectFunctions.fromJson<T>(json)),
+    );
   }
 
   T deserializeObject<T extends SupabaseObject>(dynamic data) {
@@ -78,4 +104,5 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
 }
 
 // Re-expose the global client object via Riverpod
-final supabaseClientProvider = riverpod.Provider<SupabaseClient>((ref) => env.client);
+final supabaseClientProvider =
+    riverpod.Provider<SupabaseClient>((ref) => env.client);
diff --git a/designer_v2/lib/repositories/user_repository.dart b/designer_v2/lib/repositories/user_repository.dart
index 5adb15053..a2a55d898 100644
--- a/designer_v2/lib/repositories/user_repository.dart
+++ b/designer_v2/lib/repositories/user_repository.dart
@@ -11,7 +11,9 @@ abstract class IUserRepository {
   Future<StudyUUser> fetchUser();
   Future<StudyUUser> saveUser();
   Future<StudyUUser> updatePreferences(
-      PreferenceAction pinAction, String modelId,);
+    PreferenceAction pinAction,
+    String modelId,
+  );
 }
 
 enum PreferenceAction { pin, pinOff }
@@ -44,7 +46,9 @@ class UserRepository implements IUserRepository {
 
   @override
   Future<StudyUUser> updatePreferences(
-      PreferenceAction pinAction, String modelId,) async {
+    PreferenceAction pinAction,
+    String modelId,
+  ) async {
     final newPinnedStudies = Set<String>.from(user.preferences.pinnedStudies);
     switch (pinAction) {
       case PreferenceAction.pin:
@@ -62,5 +66,8 @@ final userRepositoryProvider = Provider.autoDispose((ref) {
   final apiClient = ref.watch(apiClientProvider);
   final authRepository = ref.watch(authRepositoryProvider);
   return UserRepository(
-      apiClient: apiClient, ref: ref, authRepository: authRepository,);
+    apiClient: apiClient,
+    ref: ref,
+    authRepository: authRepository,
+  );
 });
diff --git a/designer_v2/lib/routing/router.dart b/designer_v2/lib/routing/router.dart
index c442602b7..d457afa7a 100644
--- a/designer_v2/lib/routing/router.dart
+++ b/designer_v2/lib/routing/router.dart
@@ -29,13 +29,17 @@ final routerProvider = Provider<GoRouter>((ref) {
     final loginLocation = router.namedLocation(loginRouteName);
     final signupLocation = router.namedLocation(signupRouteName);
     final splashLocation = router.namedLocation(splashRouteName);
-    final passwordRecoveryLocation = router.namedLocation(recoverPasswordRouteName);
-    final isOnDefaultPage = state.matchedLocation == router.namedLocation(defaultLocation);
+    final passwordRecoveryLocation =
+        router.namedLocation(recoverPasswordRouteName);
+    final isOnDefaultPage =
+        state.matchedLocation == router.namedLocation(defaultLocation);
     final isOnLoginPage = state.matchedLocation == loginLocation;
     final isOnSignupPage = state.matchedLocation == signupLocation;
     final isOnSplashPage = state.matchedLocation == splashLocation;
-    final isOnPasswordRecoveryPage = state.matchedLocation == passwordRecoveryLocation;
-    final isOnPublicPage = RouterConf.publicRoutes.any((element) => element.path == state.matchedLocation);
+    final isOnPasswordRecoveryPage =
+        state.matchedLocation == passwordRecoveryLocation;
+    final isOnPublicPage = RouterConf.publicRoutes
+        .any((element) => element.path == state.matchedLocation);
 
     // Read most recent app state on re-evaluation (see refreshListenable)
     final isLoggedIn = authRepository.isLoggedIn;
@@ -48,7 +52,8 @@ final routerProvider = Provider<GoRouter>((ref) {
     if (state.uri.queryParameters.containsKey('from')) {
       from = state.uri.queryParameters['from'];
     } else {
-      if (state.matchedLocation.isNotEmpty && !(isOnDefaultPage | isOnSplashPage)) {
+      if (state.matchedLocation.isNotEmpty &&
+          !(isOnDefaultPage | isOnSplashPage)) {
         from = state.matchedLocation;
       } else {
         from = null;
diff --git a/designer_v2/lib/routing/router_config.dart b/designer_v2/lib/routing/router_config.dart
index 2c691aaed..79d01b3a5 100644
--- a/designer_v2/lib/routing/router_config.dart
+++ b/designer_v2/lib/routing/router_config.dart
@@ -71,35 +71,38 @@ class RouterConf {
       builder: (context, state) => const SplashPage(),
     ),
     GoRoute(
-        path: "/login",
-        name: loginRouteName,
-        pageBuilder: (context, state) => const MaterialPage(
-              key: RouterKeys.authKey,
-              child: AuthScaffold(
-                formKey: AuthFormKey.login,
-                body: LoginForm(),
-              ),
-            ),),
+      path: "/login",
+      name: loginRouteName,
+      pageBuilder: (context, state) => const MaterialPage(
+        key: RouterKeys.authKey,
+        child: AuthScaffold(
+          formKey: AuthFormKey.login,
+          body: LoginForm(),
+        ),
+      ),
+    ),
     GoRoute(
-        path: "/signup",
-        name: signupRouteName,
-        pageBuilder: (context, state) => const MaterialPage(
-              key: RouterKeys.authKey,
-              child: AuthScaffold(
-                formKey: AuthFormKey.signup,
-                body: SignupForm(),
-              ),
-            ),),
+      path: "/signup",
+      name: signupRouteName,
+      pageBuilder: (context, state) => const MaterialPage(
+        key: RouterKeys.authKey,
+        child: AuthScaffold(
+          formKey: AuthFormKey.signup,
+          body: SignupForm(),
+        ),
+      ),
+    ),
     GoRoute(
-        path: "/forgot_password",
-        name: forgotPasswordRouteName,
-        pageBuilder: (context, state) => const MaterialPage(
-              key: RouterKeys.authKey,
-              child: AuthScaffold(
-                formKey: AuthFormKey.passwordForgot,
-                body: PasswordForgotForm(),
-              ),
-            ),),
+      path: "/forgot_password",
+      name: forgotPasswordRouteName,
+      pageBuilder: (context, state) => const MaterialPage(
+        key: RouterKeys.authKey,
+        child: AuthScaffold(
+          formKey: AuthFormKey.passwordForgot,
+          body: PasswordForgotForm(),
+        ),
+      ),
+    ),
     GoRoute(
       path: "/error",
       name: errorRouteName,
@@ -111,34 +114,46 @@ class RouterConf {
     GoRoute(
       path: "/",
       name: rootRouteName,
-      redirect: (BuildContext context, GoRouterState state) => context.namedLocation('studies'),
+      redirect: (BuildContext context, GoRouterState state) =>
+          context.namedLocation('studies'),
     ),
     GoRoute(
       path: "/studies",
       name: studiesRouteName,
-      builder: (context, state) => DashboardScreen(filter: () {
-        if (state.uri.queryParameters[RouteParams.studiesFilter] == null) {
-          return null;
-        }
-        final idx = StudiesFilter.values
-            .map((v) => v.toShortString())
-            .toList()
-            .indexOf(state.uri.queryParameters[RouteParams.studiesFilter]!);
-        return (idx != -1) ? StudiesFilter.values[idx] : null;
-      }(), // call anonymous closure to resolve param to enum
-          ),
+      builder: (context, state) => DashboardScreen(
+        filter: () {
+          if (state.uri.queryParameters[RouteParams.studiesFilter] == null) {
+            return null;
+          }
+          final idx = StudiesFilter.values
+              .map((v) => v.toShortString())
+              .toList()
+              .indexOf(state.uri.queryParameters[RouteParams.studiesFilter]!);
+          return (idx != -1) ? StudiesFilter.values[idx] : null;
+        }(), // call anonymous closure to resolve param to enum
+      ),
     ),
     GoRoute(
       path: "/studies/:${RouteParams.studyId}",
       name: studyRouteName,
-      redirect: (BuildContext context, GoRouterState state) => router.namedLocation('studyEdit',
-          pathParameters: {RouteParams.studyId: state.pathParameters[RouteParams.studyId]!},),
+      redirect: (BuildContext context, GoRouterState state) =>
+          router.namedLocation(
+        'studyEdit',
+        pathParameters: {
+          RouteParams.studyId: state.pathParameters[RouteParams.studyId]!
+        },
+      ),
     ),
     GoRoute(
       path: "/studies/:${RouteParams.studyId}/edit",
       name: studyEditRouteName,
-      redirect: (BuildContext context, GoRouterState state) => router.namedLocation('studyEditInfo',
-          pathParameters: {RouteParams.studyId: state.pathParameters[RouteParams.studyId]!},),
+      redirect: (BuildContext context, GoRouterState state) =>
+          router.namedLocation(
+        'studyEditInfo',
+        pathParameters: {
+          RouteParams.studyId: state.pathParameters[RouteParams.studyId]!
+        },
+      ),
     ),
     GoRoute(
       path: "/studies/:${RouteParams.studyId}/edit/info",
@@ -146,215 +161,245 @@ class RouterConf {
       pageBuilder: (context, state) {
         final studyId = state.pathParameters[RouteParams.studyId]!;
         return MaterialPage(
-            key: RouterKeys.studyKey,
-            child: StudyScaffold(
-              studyId: studyId,
-              tabsSubnav: StudyDesignNav.tabs(studyId),
-              selectedTab: StudyNav.edit(studyId),
-              selectedTabSubnav: StudyDesignNav.info(studyId),
-              body: StudyDesignInfoFormView(studyId),
-              layoutType: SingleColumnLayoutType.boundedNarrow,
-            ),);
+          key: RouterKeys.studyKey,
+          child: StudyScaffold(
+            studyId: studyId,
+            tabsSubnav: StudyDesignNav.tabs(studyId),
+            selectedTab: StudyNav.edit(studyId),
+            selectedTabSubnav: StudyDesignNav.info(studyId),
+            body: StudyDesignInfoFormView(studyId),
+            layoutType: SingleColumnLayoutType.boundedNarrow,
+          ),
+        );
       },
     ),
     GoRoute(
-        path: "/studies/:${RouteParams.studyId}/edit/enrollment",
-        name: studyEditEnrollmentRouteName,
-        pageBuilder: (context, state) {
-          final studyId = state.pathParameters[RouteParams.studyId]!;
-          return MaterialPage(
-              key: RouterKeys.studyKey,
-              child: StudyScaffold(
-                studyId: studyId,
-                tabsSubnav: StudyDesignNav.tabs(studyId),
-                selectedTab: StudyNav.edit(studyId),
-                selectedTabSubnav: StudyDesignNav.enrollment(studyId),
-                body: StudyDesignEnrollmentFormView(studyId),
-                layoutType: SingleColumnLayoutType.boundedNarrow,
-              ),);
-        },),
+      path: "/studies/:${RouteParams.studyId}/edit/enrollment",
+      name: studyEditEnrollmentRouteName,
+      pageBuilder: (context, state) {
+        final studyId = state.pathParameters[RouteParams.studyId]!;
+        return MaterialPage(
+          key: RouterKeys.studyKey,
+          child: StudyScaffold(
+            studyId: studyId,
+            tabsSubnav: StudyDesignNav.tabs(studyId),
+            selectedTab: StudyNav.edit(studyId),
+            selectedTabSubnav: StudyDesignNav.enrollment(studyId),
+            body: StudyDesignEnrollmentFormView(studyId),
+            layoutType: SingleColumnLayoutType.boundedNarrow,
+          ),
+        );
+      },
+    ),
     GoRoute(
-        path: "/studies/:${RouteParams.studyId}/edit/interventions",
-        name: studyEditInterventionsRouteName,
-        pageBuilder: (context, state) {
-          final studyId = state.pathParameters[RouteParams.studyId]!;
-          return MaterialPage(
-              key: RouterKeys.studyKey,
-              child: StudyScaffold(
-                studyId: studyId,
-                tabsSubnav: StudyDesignNav.tabs(studyId),
-                selectedTab: StudyNav.edit(studyId),
-                selectedTabSubnav: StudyDesignNav.interventions(studyId),
-                body: StudyDesignInterventionsFormView(studyId),
-                layoutType: SingleColumnLayoutType.boundedNarrow,
-              ),);
-        },
-        routes: [
-          GoRoute(
-              path: ":${RouteParams.interventionId}",
-              name: studyEditInterventionRouteName,
-              pageBuilder: (context, state) {
-                final routeArgs = InterventionFormRouteArgs(
-                    studyId: state.pathParameters[RouteParams.studyId]!,
-                    interventionId: state.pathParameters[RouteParams.interventionId]!,);
-                return MaterialPage(
-                    child: StudyFormScaffold<InterventionFormViewModel>(
-                  studyId: routeArgs.studyId,
-                  formViewModelBuilder: (ref) => ref.read(interventionFormViewModelProvider(routeArgs)),
-                  formViewBuilder: (formViewModel) => TwoColumnLayout.split(
-                    leftWidget: InterventionFormView(formViewModel: formViewModel),
-                    rightWidget: InterventionPreview(routeArgs: routeArgs),
-                    flexLeft: 7,
-                    constraintsLeft: const BoxConstraints(minWidth: 500.0),
-                    scrollRight: false,
-                    paddingRight: null,
-                  ),
-                ),);
-              },),
-        ],),
+      path: "/studies/:${RouteParams.studyId}/edit/interventions",
+      name: studyEditInterventionsRouteName,
+      pageBuilder: (context, state) {
+        final studyId = state.pathParameters[RouteParams.studyId]!;
+        return MaterialPage(
+          key: RouterKeys.studyKey,
+          child: StudyScaffold(
+            studyId: studyId,
+            tabsSubnav: StudyDesignNav.tabs(studyId),
+            selectedTab: StudyNav.edit(studyId),
+            selectedTabSubnav: StudyDesignNav.interventions(studyId),
+            body: StudyDesignInterventionsFormView(studyId),
+            layoutType: SingleColumnLayoutType.boundedNarrow,
+          ),
+        );
+      },
+      routes: [
+        GoRoute(
+          path: ":${RouteParams.interventionId}",
+          name: studyEditInterventionRouteName,
+          pageBuilder: (context, state) {
+            final routeArgs = InterventionFormRouteArgs(
+              studyId: state.pathParameters[RouteParams.studyId]!,
+              interventionId: state.pathParameters[RouteParams.interventionId]!,
+            );
+            return MaterialPage(
+              child: StudyFormScaffold<InterventionFormViewModel>(
+                studyId: routeArgs.studyId,
+                formViewModelBuilder: (ref) =>
+                    ref.read(interventionFormViewModelProvider(routeArgs)),
+                formViewBuilder: (formViewModel) => TwoColumnLayout.split(
+                  leftWidget:
+                      InterventionFormView(formViewModel: formViewModel),
+                  rightWidget: InterventionPreview(routeArgs: routeArgs),
+                  flexLeft: 7,
+                  constraintsLeft: const BoxConstraints(minWidth: 500.0),
+                  scrollRight: false,
+                  paddingRight: null,
+                ),
+              ),
+            );
+          },
+        ),
+      ],
+    ),
     GoRoute(
-        path: "/studies/:${RouteParams.studyId}/edit/measurements",
-        name: studyEditMeasurementsRouteName,
-        pageBuilder: (context, state) {
-          final studyId = state.pathParameters[RouteParams.studyId]!;
-          return MaterialPage(
-              key: RouterKeys.studyKey,
-              child: StudyScaffold(
-                studyId: studyId,
-                tabsSubnav: StudyDesignNav.tabs(studyId),
-                selectedTab: StudyNav.edit(studyId),
-                selectedTabSubnav: StudyDesignNav.measurements(studyId),
-                body: StudyDesignMeasurementsFormView(studyId),
-                layoutType: SingleColumnLayoutType.boundedNarrow,
-              ),);
-        },
-        routes: [
-          GoRoute(
-              path: ":${RouteParams.measurementId}",
-              name: studyEditMeasurementRouteName,
-              pageBuilder: (context, state) {
-                final routeArgs = MeasurementFormRouteArgs(
-                    studyId: state.pathParameters[RouteParams.studyId]!,
-                    measurementId: state.pathParameters[RouteParams.measurementId]!,);
-                return MaterialPage(
-                    child: StudyFormScaffold<MeasurementSurveyFormViewModel>(
-                  studyId: routeArgs.studyId,
-                  formViewModelBuilder: (ref) => ref.read(surveyFormViewModelProvider(routeArgs)),
-                  formViewBuilder: (formViewModel) => TwoColumnLayout.split(
-                    leftWidget: MeasurementSurveyFormView(formViewModel: formViewModel),
-                    rightWidget: SurveyPreview(routeArgs: routeArgs),
-                    flexLeft: 7,
-                    constraintsLeft: const BoxConstraints(minWidth: 500.0),
-                    scrollRight: false,
-                    paddingRight: null,
-                  ),
-                ),);
-              },),
-        ],),
+      path: "/studies/:${RouteParams.studyId}/edit/measurements",
+      name: studyEditMeasurementsRouteName,
+      pageBuilder: (context, state) {
+        final studyId = state.pathParameters[RouteParams.studyId]!;
+        return MaterialPage(
+          key: RouterKeys.studyKey,
+          child: StudyScaffold(
+            studyId: studyId,
+            tabsSubnav: StudyDesignNav.tabs(studyId),
+            selectedTab: StudyNav.edit(studyId),
+            selectedTabSubnav: StudyDesignNav.measurements(studyId),
+            body: StudyDesignMeasurementsFormView(studyId),
+            layoutType: SingleColumnLayoutType.boundedNarrow,
+          ),
+        );
+      },
+      routes: [
+        GoRoute(
+          path: ":${RouteParams.measurementId}",
+          name: studyEditMeasurementRouteName,
+          pageBuilder: (context, state) {
+            final routeArgs = MeasurementFormRouteArgs(
+              studyId: state.pathParameters[RouteParams.studyId]!,
+              measurementId: state.pathParameters[RouteParams.measurementId]!,
+            );
+            return MaterialPage(
+              child: StudyFormScaffold<MeasurementSurveyFormViewModel>(
+                studyId: routeArgs.studyId,
+                formViewModelBuilder: (ref) =>
+                    ref.read(surveyFormViewModelProvider(routeArgs)),
+                formViewBuilder: (formViewModel) => TwoColumnLayout.split(
+                  leftWidget:
+                      MeasurementSurveyFormView(formViewModel: formViewModel),
+                  rightWidget: SurveyPreview(routeArgs: routeArgs),
+                  flexLeft: 7,
+                  constraintsLeft: const BoxConstraints(minWidth: 500.0),
+                  scrollRight: false,
+                  paddingRight: null,
+                ),
+              ),
+            );
+          },
+        ),
+      ],
+    ),
     GoRoute(
-        path: "/studies/:${RouteParams.studyId}/edit/reports",
-        name: studyEditReportsRouteName,
-        pageBuilder: (context, state) {
-          final studyId = state.pathParameters[RouteParams.studyId]!;
-          return MaterialPage(
-              key: RouterKeys.studyKey,
-              child: StudyScaffold(
-                studyId: studyId,
-                tabsSubnav: StudyDesignNav.tabs(studyId),
-                selectedTab: StudyNav.edit(studyId),
-                selectedTabSubnav: StudyDesignNav.reports(studyId),
-                body: StudyDesignReportsFormView(studyId),
-                layoutType: SingleColumnLayoutType.boundedNarrow,
-              ),);
-        },),
+      path: "/studies/:${RouteParams.studyId}/edit/reports",
+      name: studyEditReportsRouteName,
+      pageBuilder: (context, state) {
+        final studyId = state.pathParameters[RouteParams.studyId]!;
+        return MaterialPage(
+          key: RouterKeys.studyKey,
+          child: StudyScaffold(
+            studyId: studyId,
+            tabsSubnav: StudyDesignNav.tabs(studyId),
+            selectedTab: StudyNav.edit(studyId),
+            selectedTabSubnav: StudyDesignNav.reports(studyId),
+            body: StudyDesignReportsFormView(studyId),
+            layoutType: SingleColumnLayoutType.boundedNarrow,
+          ),
+        );
+      },
+    ),
     GoRoute(
-        path: "/studies/:${RouteParams.studyId}/test",
-        name: studyTestRouteName,
-        pageBuilder: (context, state) {
-          final studyId = state.pathParameters[RouteParams.studyId]!;
-          final appRoute = state.uri.queryParameters[RouteParams.testAppRoute];
-          return MaterialPage(
-              key: RouterKeys.studyKey,
-              child: StudyScaffold(
-                studyId: studyId,
-                selectedTab: StudyNav.test(studyId),
-                body: StudyTestScreen(studyId, previewRoute: appRoute),
-                layoutType: SingleColumnLayoutType.stretched,
-              ),);
-        },),
+      path: "/studies/:${RouteParams.studyId}/test",
+      name: studyTestRouteName,
+      pageBuilder: (context, state) {
+        final studyId = state.pathParameters[RouteParams.studyId]!;
+        final appRoute = state.uri.queryParameters[RouteParams.testAppRoute];
+        return MaterialPage(
+          key: RouterKeys.studyKey,
+          child: StudyScaffold(
+            studyId: studyId,
+            selectedTab: StudyNav.test(studyId),
+            body: StudyTestScreen(studyId, previewRoute: appRoute),
+            layoutType: SingleColumnLayoutType.stretched,
+          ),
+        );
+      },
+    ),
     GoRoute(
-        path: "/studies/:${RouteParams.studyId}/recruit",
-        name: studyRecruitRouteName,
-        pageBuilder: (context, state) {
-          final studyId = state.pathParameters[RouteParams.studyId]!;
-          return MaterialPage(
-              key: RouterKeys.studyKey,
-              child: StudyScaffold(
-                studyId: studyId,
-                selectedTab: StudyNav.recruit(studyId),
-                body: StudyRecruitScreen(studyId),
-                layoutType: SingleColumnLayoutType.boundedWide,
-              ),);
-        },),
+      path: "/studies/:${RouteParams.studyId}/recruit",
+      name: studyRecruitRouteName,
+      pageBuilder: (context, state) {
+        final studyId = state.pathParameters[RouteParams.studyId]!;
+        return MaterialPage(
+          key: RouterKeys.studyKey,
+          child: StudyScaffold(
+            studyId: studyId,
+            selectedTab: StudyNav.recruit(studyId),
+            body: StudyRecruitScreen(studyId),
+            layoutType: SingleColumnLayoutType.boundedWide,
+          ),
+        );
+      },
+    ),
     GoRoute(
-        path: "/studies/:${RouteParams.studyId}/monitor",
-        name: studyMonitorRouteName,
-        pageBuilder: (context, state) {
-          final studyId = state.pathParameters[RouteParams.studyId]!;
-          return MaterialPage(
-              key: RouterKeys.studyKey,
-              child: StudyScaffold(
-                studyId: studyId,
-                selectedTab: StudyNav.monitor(studyId),
-                body: StudyMonitorScreen(studyId),
-                layoutType: SingleColumnLayoutType.boundedWide,
-              ),);
-        },),
+      path: "/studies/:${RouteParams.studyId}/monitor",
+      name: studyMonitorRouteName,
+      pageBuilder: (context, state) {
+        final studyId = state.pathParameters[RouteParams.studyId]!;
+        return MaterialPage(
+          key: RouterKeys.studyKey,
+          child: StudyScaffold(
+            studyId: studyId,
+            selectedTab: StudyNav.monitor(studyId),
+            body: StudyMonitorScreen(studyId),
+            layoutType: SingleColumnLayoutType.boundedWide,
+          ),
+        );
+      },
+    ),
     GoRoute(
-        path: "/studies/:${RouteParams.studyId}/analyze",
-        name: studyAnalyzeRouteName,
-        pageBuilder: (context, state) {
-          final studyId = state.pathParameters[RouteParams.studyId]!;
-          return MaterialPage(
-              key: RouterKeys.studyKey,
-              child: StudyScaffold(
-                studyId: studyId,
-                selectedTab: StudyNav.analyze(studyId),
-                body: StudyAnalyzeScreen(studyId),
-                layoutType: SingleColumnLayoutType.boundedWide,
-              ),);
-        },),
+      path: "/studies/:${RouteParams.studyId}/analyze",
+      name: studyAnalyzeRouteName,
+      pageBuilder: (context, state) {
+        final studyId = state.pathParameters[RouteParams.studyId]!;
+        return MaterialPage(
+          key: RouterKeys.studyKey,
+          child: StudyScaffold(
+            studyId: studyId,
+            selectedTab: StudyNav.analyze(studyId),
+            body: StudyAnalyzeScreen(studyId),
+            layoutType: SingleColumnLayoutType.boundedWide,
+          ),
+        );
+      },
+    ),
     GoRoute(
-        path: "/studies/:${RouteParams.studyId}/settings",
-        name: studySettingsRouteName,
-        pageBuilder: (context, state) {
-          final studyId = state.pathParameters[RouteParams.studyId]!;
-          return buildModalTransitionPage(
-            context,
-            state,
-            StudySettingsDialog(studyId),
-          );
-        },),
+      path: "/studies/:${RouteParams.studyId}/settings",
+      name: studySettingsRouteName,
+      pageBuilder: (context, state) {
+        final studyId = state.pathParameters[RouteParams.studyId]!;
+        return buildModalTransitionPage(
+          context,
+          state,
+          StudySettingsDialog(studyId),
+        );
+      },
+    ),
     GoRoute(
-        path: "/settings",
-        name: accountSettingsRouteName,
-        pageBuilder: (BuildContext context, GoRouterState state) {
-          return buildModalTransitionPage(
-            context,
-            state,
-            const AccountSettingsDialog(),
-          );
-        },),
+      path: "/settings",
+      name: accountSettingsRouteName,
+      pageBuilder: (BuildContext context, GoRouterState state) {
+        return buildModalTransitionPage(
+          context,
+          state,
+          const AccountSettingsDialog(),
+        );
+      },
+    ),
     GoRoute(
-        path: "/password_recovery",
-        name: recoverPasswordRouteName,
-        pageBuilder: (context, state) => const MaterialPage(
-              key: RouterKeys.authKey,
-              child: AuthScaffold(
-                formKey: AuthFormKey.passwordRecovery,
-                body: PasswordRecoveryForm(),
-              ),
-            ),),
+      path: "/password_recovery",
+      name: recoverPasswordRouteName,
+      pageBuilder: (context, state) => const MaterialPage(
+        key: RouterKeys.authKey,
+        child: AuthScaffold(
+          formKey: AuthFormKey.passwordRecovery,
+          body: PasswordRecoveryForm(),
+        ),
+      ),
+    ),
   ];
 
   static GoRoute route(String name) {
@@ -362,7 +407,8 @@ class RouterConf {
       if (subRoutes.isEmpty) return null;
       for (final GoRoute route in subRoutes) {
         if (route.name == name) return route;
-        final GoRoute? newRoute = searchRouteNames(List<GoRoute>.from(route.routes));
+        final GoRoute? newRoute =
+            searchRouteNames(List<GoRoute>.from(route.routes));
         if (newRoute != null) return newRoute;
       }
       return null;
@@ -414,7 +460,8 @@ class MeasurementFormRouteArgs extends StudyFormRouteArgs {
   final MeasurementID measurementId;
 }
 
-class SurveyQuestionFormRouteArgs extends MeasurementFormRouteArgs implements QuestionFormRouteArgs {
+class SurveyQuestionFormRouteArgs extends MeasurementFormRouteArgs
+    implements QuestionFormRouteArgs {
   SurveyQuestionFormRouteArgs({
     required this.questionId,
     required super.studyId,
diff --git a/designer_v2/lib/routing/router_utils.dart b/designer_v2/lib/routing/router_utils.dart
index 3e9107a3e..e2d960394 100644
--- a/designer_v2/lib/routing/router_utils.dart
+++ b/designer_v2/lib/routing/router_utils.dart
@@ -30,7 +30,8 @@ RouteSettings readCurrentRouteSettingsFrom(BuildContext context) {
   return currentRouteSettings;
 }
 
-CustomTransitionPage<void> buildModalTransitionPage(BuildContext context, GoRouterState state, Widget body) {
+CustomTransitionPage<void> buildModalTransitionPage(
+    BuildContext context, GoRouterState state, Widget body) {
   final theme = Theme.of(context);
 
   return CustomTransitionPage<void>(
diff --git a/designer_v2/lib/services/clipboard.dart b/designer_v2/lib/services/clipboard.dart
index c928af02f..ee9588d73 100644
--- a/designer_v2/lib/services/clipboard.dart
+++ b/designer_v2/lib/services/clipboard.dart
@@ -13,4 +13,5 @@ class ClipboardService implements IClipboardService {
   }
 }
 
-final clipboardServiceProvider = Provider<IClipboardService>((ref) => ClipboardService());
+final clipboardServiceProvider =
+    Provider<IClipboardService>((ref) => ClipboardService());
diff --git a/designer_v2/lib/services/notification_dispatcher.dart b/designer_v2/lib/services/notification_dispatcher.dart
index 5a1e69232..09b2e5b4c 100644
--- a/designer_v2/lib/services/notification_dispatcher.dart
+++ b/designer_v2/lib/services/notification_dispatcher.dart
@@ -103,7 +103,8 @@ class _NotificationDispatcherState
       case NotificationType.snackbar:
         final messengerState = _getMessengerState();
         messengerState.showSnackBar(
-            _buildSnackbar(notification as SnackbarIntent, messengerState));
+          _buildSnackbar(notification as SnackbarIntent, messengerState),
+        );
       case NotificationType.alert:
         final navigatorState = _getNavigatorState()!;
         showDialog(
@@ -113,12 +114,15 @@ class _NotificationDispatcherState
         );
       default:
         throw UnimplementedError(
-            "Failed to handle NotificationIntent of unexpected type.");
+          "Failed to handle NotificationIntent of unexpected type.",
+        );
     }
   }
 
   AlertDialog _buildAlertDialog(
-      AlertIntent notification, NavigatorState navigatorState) {
+    AlertIntent notification,
+    NavigatorState navigatorState,
+  ) {
     final textTheme = Theme.of(context).textTheme;
 
     final List<Widget> actions = [];
@@ -161,7 +165,9 @@ class _NotificationDispatcherState
           children: [
             Flexible(
               child: notificationContent(
-                  notification.message, notification.customContent),
+                notification.message,
+                notification.customContent,
+              ),
             ),
           ],
         ),
@@ -179,7 +185,9 @@ class _NotificationDispatcherState
   }
 
   SnackBar _buildSnackbar(
-      SnackbarIntent notification, ScaffoldMessengerState messengerState) {
+    SnackbarIntent notification,
+    ScaffoldMessengerState messengerState,
+  ) {
     final theme = Theme.of(context);
 
     return SnackBar(
@@ -199,14 +207,16 @@ class _NotificationDispatcherState
             )
           else
             const SizedBox.shrink(),
-          Text(notification.message!,
-              style: theme.textTheme.titleMedium!
-                  .copyWith(color: theme.colorScheme.onPrimary)),
+          Text(
+            notification.message!,
+            style: theme.textTheme.titleMedium!
+                .copyWith(color: theme.colorScheme.onPrimary),
+          ),
         ],
       ),
       duration: Duration(
-          milliseconds:
-              notification.duration ?? widget.snackbarDefaultDuration),
+        milliseconds: notification.duration ?? widget.snackbarDefaultDuration,
+      ),
       padding: EdgeInsets.fromLTRB(
         2.5 * widget.snackbarInnerPadding,
         widget.snackbarInnerPadding,
diff --git a/designer_v2/lib/services/notification_service.dart b/designer_v2/lib/services/notification_service.dart
index d83219469..132ddea4c 100644
--- a/designer_v2/lib/services/notification_service.dart
+++ b/designer_v2/lib/services/notification_service.dart
@@ -4,8 +4,10 @@ import 'package:rxdart/subjects.dart';
 import 'package:studyu_designer_v2/services/notification_types.dart';
 
 abstract class INotificationService {
-  void showMessage(String notificationText, {List<NotificationAction>? actions});
-  void show(NotificationIntent notification, {List<NotificationAction>? actions});
+  void showMessage(String notificationText,
+      {List<NotificationAction>? actions});
+  void show(NotificationIntent notification,
+      {List<NotificationAction>? actions});
   Stream<NotificationIntent> watchNotifications();
   // - Lifecycle
   void dispose();
@@ -19,7 +21,8 @@ abstract class INotificationService {
 class NotificationService implements INotificationService {
   /// A stream controller that exposes a stream of [Notifications]s that
   /// are consumed & dispatched by a [NotificationDispatcher] widget
-  final BehaviorSubject<NotificationIntent> _streamController = BehaviorSubject();
+  final BehaviorSubject<NotificationIntent> _streamController =
+      BehaviorSubject();
 
   @override
   Stream<NotificationIntent> watchNotifications() => _streamController;
@@ -30,7 +33,8 @@ class NotificationService implements INotificationService {
   }
 
   @override
-  void show(NotificationIntent notification, {List<NotificationAction>? actions}) {
+  void show(NotificationIntent notification,
+      {List<NotificationAction>? actions}) {
     // Register any additional actions passed as callbacks by the calling code
     if (actions != null) {
       for (final action in actions) {
diff --git a/designer_v2/lib/services/notification_types.dart b/designer_v2/lib/services/notification_types.dart
index d14c26715..77b19b177 100644
--- a/designer_v2/lib/services/notification_types.dart
+++ b/designer_v2/lib/services/notification_types.dart
@@ -10,12 +10,13 @@ enum NotificationType { snackbar, alert, custom }
 ///   [SnackbarIntent] - renders the notification as a snackbar
 ///   [AlertIntent] - renders the notification as an alert dialog
 abstract class NotificationIntent {
-  NotificationIntent(
-      {this.message,
-      this.customContent,
-      this.icon,
-      this.actions,
-      required this.type,}) {
+  NotificationIntent({
+    this.message,
+    this.customContent,
+    this.icon,
+    this.actions,
+    required this.type,
+  }) {
     if (message == null && customContent == null) {
       throw Exception("Invalid AlertIntent");
     }
@@ -47,10 +48,11 @@ class NotificationAction {
   final FutureActionHandler onSelect;
   final bool isDestructive;
 
-  NotificationAction(
-      {required this.label,
-      required this.onSelect,
-      this.isDestructive = false,});
+  NotificationAction({
+    required this.label,
+    required this.onSelect,
+    this.isDestructive = false,
+  });
 }
 
 /// Encapsulates a call to [showSnackbar]
diff --git a/designer_v2/lib/services/notifications.dart b/designer_v2/lib/services/notifications.dart
index 966b5c9ba..0c2be12d1 100644
--- a/designer_v2/lib/services/notifications.dart
+++ b/designer_v2/lib/services/notifications.dart
@@ -25,10 +25,11 @@ class Notifications {
     message: tr.notification_code_clipboard,
   );
   static final studyDeleteConfirmation = AlertIntent(
-      title: tr.dialog_study_delete_title,
-      message: tr.dialog_study_delete_description,
-      icon: Icons.delete_rounded,
-      actions: [NotificationDefaultActions.cancel],);
+    title: tr.dialog_study_delete_title,
+    message: tr.dialog_study_delete_description,
+    icon: Icons.delete_rounded,
+    actions: [NotificationDefaultActions.cancel],
+  );
 }
 
 class NotificationDefaultActions {
diff --git a/designer_v2/lib/theme.dart b/designer_v2/lib/theme.dart
index 0b78d08d8..90233ae85 100644
--- a/designer_v2/lib/theme.dart
+++ b/designer_v2/lib/theme.dart
@@ -17,13 +17,17 @@ class ThemeConfig {
   static const double kHoverFadeFactor = 0.7;
   static const double kMuteFadeFactor = 0.8;
 
-  static Color bodyBackgroundColor(ThemeData theme) => theme.scaffoldBackgroundColor.faded(0.5);
+  static Color bodyBackgroundColor(ThemeData theme) =>
+      theme.scaffoldBackgroundColor.faded(0.5);
 
-  static Color modalBarrierColor(ThemeData theme) => theme.colorScheme.secondary.withOpacity(0.4);
+  static Color modalBarrierColor(ThemeData theme) =>
+      theme.colorScheme.secondary.withOpacity(0.4);
 
-  static Color containerColor(ThemeData theme) => theme.colorScheme.secondaryContainer.withOpacity(0.3);
+  static Color containerColor(ThemeData theme) =>
+      theme.colorScheme.secondaryContainer.withOpacity(0.3);
 
-  static Color colorPickerInitialColor(ThemeData theme) => theme.colorScheme.primary;
+  static Color colorPickerInitialColor(ThemeData theme) =>
+      theme.colorScheme.primary;
 
   static TextStyle bodyTextMuted(ThemeData theme) => TextStyle(
         fontSize: 14.0,
@@ -31,18 +35,23 @@ class ThemeConfig {
         color: theme.textTheme.bodyLarge?.color?.faded(0.65),
       );
 
-  static TextStyle bodyTextBackground(ThemeData theme) =>
-      TextStyle(fontSize: 14.0, height: 1.35, color: theme.colorScheme.onSurface.withOpacity(0.25));
+  static TextStyle bodyTextBackground(ThemeData theme) => TextStyle(
+      fontSize: 14.0,
+      height: 1.35,
+      color: theme.colorScheme.onSurface.withOpacity(0.25));
 
   static double iconSplashRadius(ThemeData theme) => 24.0;
 
-  static Color sidesheetBackgroundColor(ThemeData theme) => theme.scaffoldBackgroundColor.withOpacity(0.15);
+  static Color sidesheetBackgroundColor(ThemeData theme) =>
+      theme.scaffoldBackgroundColor.withOpacity(0.15);
 
-  static InputDecorationTheme dropdownInputDecorationTheme(ThemeData theme) => theme.inputDecorationTheme.copyWith(
+  static InputDecorationTheme dropdownInputDecorationTheme(ThemeData theme) =>
+      theme.inputDecorationTheme.copyWith(
         contentPadding: const EdgeInsets.fromLTRB(14.0, 14.0, 14.0, 14.0),
       );
 
-  static DropdownMenuItemTheme dropdownMenuItemTheme(ThemeData theme) => DropdownMenuItemTheme(
+  static DropdownMenuItemTheme dropdownMenuItemTheme(ThemeData theme) =>
+      DropdownMenuItemTheme(
         iconTheme: IconThemeData(
           color: theme.textTheme.bodyLarge?.color?.faded(0.4),
           // theme.iconTheme.color?.faded(0.75)
@@ -69,14 +78,22 @@ class NoAnimationPageTransitionsBuilder extends PageTransitionsBuilder {
 class WebTransitionBuilder extends PageTransitionsBuilder {
   const WebTransitionBuilder();
   @override
-  Widget buildTransitions<T>(PageRoute<T> route, BuildContext context, Animation<double> animation,
-      Animation<double> secondaryAnimation, Widget child,) {
-    final opacityOldTween = Tween(begin: 1.0, end: 0.0).chain(CurveTween(curve: Curves.easeIn));
-    final opacityNewTween = Tween(begin: 0.0, end: 1.0).chain(CurveTween(curve: Curves.easeIn));
+  Widget buildTransitions<T>(
+    PageRoute<T> route,
+    BuildContext context,
+    Animation<double> animation,
+    Animation<double> secondaryAnimation,
+    Widget child,
+  ) {
+    final opacityOldTween =
+        Tween(begin: 1.0, end: 0.0).chain(CurveTween(curve: Curves.easeIn));
+    final opacityNewTween =
+        Tween(begin: 0.0, end: 1.0).chain(CurveTween(curve: Curves.easeIn));
 
     return FadeTransition(
       opacity: opacityOldTween.animate(secondaryAnimation),
-      child: FadeTransition(opacity: opacityNewTween.animate(animation), child: child),
+      child: FadeTransition(
+          opacity: opacityNewTween.animate(animation), child: child),
     );
   }
 }
@@ -87,8 +104,13 @@ class ThemeSettingChange extends Notification {
 }
 
 class ThemeProvider extends InheritedWidget {
-  ThemeProvider(
-      {super.key, required this.settings, required this.lightDynamic, required this.darkDynamic, required super.child,});
+  ThemeProvider({
+    super.key,
+    required this.settings,
+    required this.lightDynamic,
+    required this.darkDynamic,
+    required super.child,
+  });
 
   final ValueNotifier<ThemeSettings> settings;
   final ColorScheme? lightDynamic;
@@ -98,7 +120,8 @@ class ThemeProvider extends InheritedWidget {
     builders: kIsWeb
         ? <TargetPlatform, PageTransitionsBuilder>{
             // Animation when running on Web
-            for (final platform in TargetPlatform.values) platform: const WebTransitionBuilder(),
+            for (final platform in TargetPlatform.values)
+              platform: const WebTransitionBuilder(),
           }
         : const <TargetPlatform, PageTransitionsBuilder>{
             TargetPlatform.android: FadeUpwardsPageTransitionsBuilder(),
@@ -118,7 +141,8 @@ class ThemeProvider extends InheritedWidget {
   }
 
   Color blend(Color targetColor) {
-    return Color(Blend.harmonize(targetColor.value, settings.value.sourceColor.value));
+    return Color(
+        Blend.harmonize(targetColor.value, settings.value.sourceColor.value));
   }
 
   Color source(Color? target) {
@@ -130,12 +154,16 @@ class ThemeProvider extends InheritedWidget {
   }
 
   ColorScheme colors(Brightness brightness, Color? targetColor) {
-    final dynamicPrimary = brightness == Brightness.light ? lightDynamic?.primary : darkDynamic?.primary;
+    final dynamicPrimary = brightness == Brightness.light
+        ? lightDynamic?.primary
+        : darkDynamic?.primary;
     final scheme = SchemeFidelity(
-        sourceColorHct:
-            dynamicPrimary != null ? Hct.fromInt(dynamicPrimary.value) : Hct.fromInt(source(targetColor).value),
-        isDark: false,
-        contrastLevel: 0.0,);
+      sourceColorHct: dynamicPrimary != null
+          ? Hct.fromInt(dynamicPrimary.value)
+          : Hct.fromInt(source(targetColor).value),
+      isDark: false,
+      contrastLevel: 0.0,
+    );
     final colorScheme = ColorScheme.fromSeed(
       seedColor: dynamicPrimary ?? source(targetColor),
       brightness: brightness,
@@ -303,17 +331,36 @@ class ThemeProvider extends InheritedWidget {
     final headlineColor = colors.onSurfaceVariant;
 
     return TextTheme(
-      labelLarge: TextStyle(fontSize: 14.0, color: colors.onSurface.withOpacity(0.9)),
-      bodySmall: TextStyle(fontSize: 14.0, height: 1.35, color: colors.onSurface.withOpacity(0.9)), // Form Labels
-      titleMedium: TextStyle(fontSize: 14.0, height: 1.35, color: colors.onSurface.withOpacity(0.9)), // TextInput
-      bodyLarge: TextStyle(fontSize: 14.0, height: 1.35, color: colors.onSurface.withOpacity(0.9)),
-      bodyMedium: TextStyle(fontSize: 14.0, height: 1.35, color: colors.onSurface.withOpacity(0.8)),
-      titleLarge: TextStyle(fontSize: 15.0, color: headlineColor, fontWeight: FontWeight.bold),
-      headlineSmall: TextStyle(fontSize: 18.0, color: headlineColor, fontWeight: FontWeight.bold),
-      headlineMedium: TextStyle(fontSize: 22.0, color: headlineColor, fontWeight: FontWeight.bold),
-      displaySmall: TextStyle(fontSize: 26.0, color: headlineColor, fontWeight: FontWeight.bold),
-      displayMedium: TextStyle(fontSize: 36.0, color: headlineColor, fontWeight: FontWeight.bold),
-      displayLarge: TextStyle(fontSize: 48.0, color: headlineColor, fontWeight: FontWeight.bold),
+      labelLarge:
+          TextStyle(fontSize: 14.0, color: colors.onSurface.withOpacity(0.9)),
+      bodySmall: TextStyle(
+          fontSize: 14.0,
+          height: 1.35,
+          color: colors.onSurface.withOpacity(0.9)), // Form Labels
+      titleMedium: TextStyle(
+          fontSize: 14.0,
+          height: 1.35,
+          color: colors.onSurface.withOpacity(0.9)), // TextInput
+      bodyLarge: TextStyle(
+          fontSize: 14.0,
+          height: 1.35,
+          color: colors.onSurface.withOpacity(0.9)),
+      bodyMedium: TextStyle(
+          fontSize: 14.0,
+          height: 1.35,
+          color: colors.onSurface.withOpacity(0.8)),
+      titleLarge: TextStyle(
+          fontSize: 15.0, color: headlineColor, fontWeight: FontWeight.bold),
+      headlineSmall: TextStyle(
+          fontSize: 18.0, color: headlineColor, fontWeight: FontWeight.bold),
+      headlineMedium: TextStyle(
+          fontSize: 22.0, color: headlineColor, fontWeight: FontWeight.bold),
+      displaySmall: TextStyle(
+          fontSize: 26.0, color: headlineColor, fontWeight: FontWeight.bold),
+      displayMedium: TextStyle(
+          fontSize: 36.0, color: headlineColor, fontWeight: FontWeight.bold),
+      displayLarge: TextStyle(
+          fontSize: 48.0, color: headlineColor, fontWeight: FontWeight.bold),
     );
   }
 
@@ -361,7 +408,8 @@ class ThemeProvider extends InheritedWidget {
   RadioThemeData radioTheme(ColorScheme colors) {
     return RadioThemeData(
       splashRadius: 18.0,
-      fillColor: WidgetStateProperty.resolveWith<Color?>((Set<WidgetState> states) {
+      fillColor:
+          WidgetStateProperty.resolveWith<Color?>((Set<WidgetState> states) {
         if (states.contains(WidgetState.disabled)) {
           return null;
         }
@@ -377,18 +425,21 @@ class ThemeProvider extends InheritedWidget {
     return TooltipThemeData(
       padding: const EdgeInsets.symmetric(vertical: 7.0, horizontal: 11.0),
       textStyle: textTheme(colors).bodySmall!.copyWith(color: colors.onPrimary),
-      decoration:
-          BoxDecoration(color: colors.secondary.withOpacity(0.9), borderRadius: BorderRadius.circular(2.0), boxShadow: [
-        BoxShadow(
-          color: colors.primaryContainer.withOpacity(0.1),
-          blurRadius: 1,
-          spreadRadius: 2,
-        ),
-        BoxShadow(
-          color: colors.secondary.withOpacity(0.3),
-          blurRadius: 3,
-        ),
-      ],),
+      decoration: BoxDecoration(
+        color: colors.secondary.withOpacity(0.9),
+        borderRadius: BorderRadius.circular(2.0),
+        boxShadow: [
+          BoxShadow(
+            color: colors.primaryContainer.withOpacity(0.1),
+            blurRadius: 1,
+            spreadRadius: 2,
+          ),
+          BoxShadow(
+            color: colors.secondary.withOpacity(0.3),
+            blurRadius: 3,
+          ),
+        ],
+      ),
     );
   }
 
@@ -455,7 +506,9 @@ class ThemeProvider extends InheritedWidget {
 
   ThemeData theme(BuildContext context, [Color? targetColor]) {
     final brightness = MediaQuery.of(context).platformBrightness;
-    return brightness == Brightness.light ? light(targetColor) : dark(targetColor);
+    return brightness == Brightness.light
+        ? light(targetColor)
+        : dark(targetColor);
   }
 
   static ThemeProvider of(BuildContext context) {
diff --git a/designer_v2/lib/utils/debouncer.dart b/designer_v2/lib/utils/debouncer.dart
index 715f906e5..84c36f863 100644
--- a/designer_v2/lib/utils/debouncer.dart
+++ b/designer_v2/lib/utils/debouncer.dart
@@ -36,7 +36,8 @@ class Debouncer extends ExecutionLimiter {
     if ((callback == null && futureBuilder == null) ||
         (callback != null && futureBuilder != null)) {
       throw Exception(
-          "Must call Debouncer with either callback or futureBuilder",);
+        "Must call Debouncer with either callback or futureBuilder",
+      );
     }
 
     // Wrap the given callback so we can work with a future-based interface
diff --git a/designer_v2/lib/utils/file_download.dart b/designer_v2/lib/utils/file_download.dart
index 5926b7df6..1e7514b5a 100644
--- a/designer_v2/lib/utils/file_download.dart
+++ b/designer_v2/lib/utils/file_download.dart
@@ -16,11 +16,13 @@ dynamic downloadFile({required String fileContent, required String filename}) {
 void downloadBytes({required List<int> bytes, required String filename}) {
   if (!kIsWeb) {
     throw Exception(
-        "The StudyU designer only support the web platform".hardcoded,);
+      "The StudyU designer only support the web platform".hardcoded,
+    );
   }
   final content = base64Encode(bytes);
   final anchor = AnchorElement(
-      href: "data:application/octet-stream;charset=utf-16le;base64,$content",)
+    href: "data:application/octet-stream;charset=utf-16le;base64,$content",
+  )
     ..style.display = 'none'
     ..download = filename;
   document.body?.append(anchor);
diff --git a/designer_v2/lib/utils/input_formatter.dart b/designer_v2/lib/utils/input_formatter.dart
index cbf549ea3..3b4b19de3 100644
--- a/designer_v2/lib/utils/input_formatter.dart
+++ b/designer_v2/lib/utils/input_formatter.dart
@@ -35,7 +35,9 @@ class StudySequenceFormatter extends TextInputFormatter {
   ) {
     if (newValue.text == '') {
       return newValue.copyWith(text: newValue.text.toUpperCase());
-    } else if (newValue.text.replaceAll(' ', '').contains(RegExp(r'^[abAB]+$'))) {
+    } else if (newValue.text
+        .replaceAll(' ', '')
+        .contains(RegExp(r'^[abAB]+$'))) {
       return newValue.copyWith(text: newValue.text.toUpperCase());
     } else {
       return oldValue;
diff --git a/designer_v2/lib/utils/model_action.dart b/designer_v2/lib/utils/model_action.dart
index cccb5a755..6d3253e72 100644
--- a/designer_v2/lib/utils/model_action.dart
+++ b/designer_v2/lib/utils/model_action.dart
@@ -73,7 +73,9 @@ Map<ModelActionType, IconData> modelActionIcons = {
 /// Decorates a list of [actions] with their corresponding icon
 /// Helps us keep presentational data & business logic separate
 List<ModelAction<T>> withIcons<T>(
-    List<ModelAction<T>> actions, Map<T, IconData> iconMap,) {
+  List<ModelAction<T>> actions,
+  Map<T, IconData> iconMap,
+) {
   for (final action in actions) {
     if (iconMap.containsKey(action.type)) {
       action.icon = iconMap[action.type];
diff --git a/designer_v2/lib/utils/validation.dart b/designer_v2/lib/utils/validation.dart
index 528d630a2..e8127e16c 100644
--- a/designer_v2/lib/utils/validation.dart
+++ b/designer_v2/lib/utils/validation.dart
@@ -24,7 +24,8 @@ class CountWhereValidator<T> extends Validator<T> {
       return null;
     }
     if (control is! FormArray<T>) {
-      throw Exception("CountWhereValidator must be used with AbstractControl of "
+      throw Exception(
+          "CountWhereValidator must be used with AbstractControl of "
           "type FormArray.");
     }
 
@@ -56,6 +57,8 @@ class Patterns {
   /// Regex pattern for hh:mm time format (with or without leading zero)
   //static const timeFormatString = r'^([0-1]?[0-9]|2[0-3]):[0-5][0-9]$';
   static const timeFormatString = r'^[ab]$';
-  static const emailFormatString = r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9]+\.[a-zA-Z]+";
-  static const url = r'[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)';
+  static const emailFormatString =
+      r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9]+\.[a-zA-Z]+";
+  static const url =
+      r'[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)';
 }
diff --git a/flutter_common/lib/src/utils/env_loader.dart b/flutter_common/lib/src/utils/env_loader.dart
index c4e6886a5..811b4df56 100644
--- a/flutter_common/lib/src/utils/env_loader.dart
+++ b/flutter_common/lib/src/utils/env_loader.dart
@@ -12,7 +12,8 @@ String envFilePath() {
 }
 
 String? getEnv(String name) {
-  return dotenv.env[name] ?? (bool.hasEnvironment(name) ? String.fromEnvironment(name) : null);
+  return dotenv.env[name] ??
+      (bool.hasEnvironment(name) ? String.fromEnvironment(name) : null);
 }
 
 Future<void> loadEnv() async {
diff --git a/flutter_common/lib/src/utils/retry_future_builder.dart b/flutter_common/lib/src/utils/retry_future_builder.dart
index a49df507a..6a32397a2 100644
--- a/flutter_common/lib/src/utils/retry_future_builder.dart
+++ b/flutter_common/lib/src/utils/retry_future_builder.dart
@@ -24,7 +24,8 @@ SOFTWARE.
 
 import 'package:flutter/material.dart';
 
-typedef CustomErrorWidgetBuilder = Widget Function(BuildContext context, dynamic error, void Function() reload);
+typedef CustomErrorWidgetBuilder = Widget Function(
+    BuildContext context, dynamic error, void Function() reload);
 
 class RetryFutureBuilder<T> extends StatefulWidget {
   static RetryFutureBuilderState? of(BuildContext context) =>
@@ -93,7 +94,8 @@ class RetryFutureBuilderState<T> extends State<RetryFutureBuilder<T>> {
             if (snapshot.hasError) {
               // ignore: only_throw_errors
               if (widget.errorWidgetBuilder != null) {
-                return widget.errorWidgetBuilder!(context, snapshot.error, reload);
+                return widget.errorWidgetBuilder!(
+                    context, snapshot.error, reload);
               }
               return buildErrorView(context, snapshot.error);
             }
@@ -124,7 +126,8 @@ class RetryFutureBuilderState<T> extends State<RetryFutureBuilder<T>> {
               icon: const Icon(Icons.sync),
               // todo translate
               label: const Text('Retry'),
-              style: ElevatedButton.styleFrom(backgroundColor: theme.colorScheme.secondary),
+              style: ElevatedButton.styleFrom(
+                  backgroundColor: theme.colorScheme.secondary),
             ),
             ...widget.extraWidgets
           ],
diff --git a/flutter_common/lib/src/utils/storage.dart b/flutter_common/lib/src/utils/storage.dart
index f14d48c28..0220a28ff 100755
--- a/flutter_common/lib/src/utils/storage.dart
+++ b/flutter_common/lib/src/utils/storage.dart
@@ -22,7 +22,8 @@ class SupabaseStorage extends LocalStorage {
 
   @override
   Future<void> persistSession(String persistSessionString) async {
-    return await SecureStorage.write(supabasePersistSessionKey, persistSessionString);
+    return await SecureStorage.write(
+        supabasePersistSessionKey, persistSessionString);
   }
 
   @override
@@ -87,7 +88,8 @@ class SecureStorage {
       if (value is String || value is bool) {
         await storage.write(key: key, value: value.toString());
         await prefs.remove(key);
-        StudyULogger.info("Migrated key $key from SharedPreferences to FlutterSecureStorage.");
+        StudyULogger.info(
+            "Migrated key $key from SharedPreferences to FlutterSecureStorage.");
       }
     }
   }
diff --git a/flutter_common/lib/src/utils/user.dart b/flutter_common/lib/src/utils/user.dart
index f7e5e664b..a4e08171d 100644
--- a/flutter_common/lib/src/utils/user.dart
+++ b/flutter_common/lib/src/utils/user.dart
@@ -10,7 +10,8 @@ const userEmailKey = 'user_email';
 const userPasswordKey = 'user_password';
 const cacheSubjectKey = "cache_subject";
 
-Future<void> storeFakeUserEmailAndPassword(String email, String password) async {
+Future<void> storeFakeUserEmailAndPassword(
+    String email, String password) async {
   await SecureStorage.write(userEmailKey, email);
   await SecureStorage.write(userPasswordKey, password);
 }
@@ -22,7 +23,8 @@ Future<bool> signInParticipant() async {
     try {
       final fakeEmail = await getFakeUserEmail();
       final fakePassword = await getFakeUserPassword();
-      final authResponse = await Supabase.instance.client.auth.signInWithPassword(
+      final authResponse =
+          await Supabase.instance.client.auth.signInWithPassword(
         email: fakeEmail!,
         password: fakePassword!,
       );
@@ -39,7 +41,8 @@ Future<bool> anonymousSignUp() async {
   final fakeUserEmail = '${const Uuid().v4()}@$fakeStudyUEmailDomain';
   final fakeUserPassword = const Uuid().v4();
   try {
-    final authResponse = await Supabase.instance.client.auth.signUp(email: fakeUserEmail, password: fakeUserPassword);
+    final authResponse = await Supabase.instance.client.auth
+        .signUp(email: fakeUserEmail, password: fakeUserPassword);
     await storeFakeUserEmailAndPassword(fakeUserEmail, fakeUserPassword);
     return authResponse.session != null ? true : await signInParticipant();
   } catch (error, stacktrace) {

From f0464c96e305476e7d2428c5a96245b8346f7ddd Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 9 Jun 2024 16:54:44 +0200
Subject: [PATCH 160/314] chore: fix

---
 core/lib/src/models/data/data_reference.dart  |  3 +-
 .../interventions/intervention_task.dart      |  2 +-
 .../interventions/tasks/checkmark_task.dart   |  4 +--
 .../tasks/questionnaire_task.dart             |  6 ++--
 .../questionnaire/questionnaire_state.dart    |  2 +-
 .../questions/free_text_question.dart         |  4 +--
 .../questions/scale_question.dart             |  2 +-
 core/lib/src/models/results/result.dart       |  6 ++--
 .../results/intervention_result.dart          |  2 +-
 .../study_results/results/numeric_result.dart |  2 +-
 core/lib/src/models/tables/repo.dart          |  2 +-
 core/lib/src/models/tables/study.dart         |  2 +-
 core/lib/src/models/tables/study_subject.dart | 24 ++++++++--------
 core/lib/src/models/tasks/schedule.dart       |  2 +-
 core/lib/src/models/tasks/task.dart           |  2 +-
 core/lib/src/models/tasks/task_instance.dart  |  6 ++--
 core/lib/src/util/analytics.dart              |  2 +-
 core/lib/src/util/supabase_object.dart        | 12 ++++----
 .../study_schedule/study_schedule_test.dart   | 10 +++----
 .../robots/study_interventions_robot.dart     |  2 +-
 .../lib/common_views/action_popup_menu.dart   |  4 +--
 .../lib/common_views/async_value_widget.dart  |  2 +-
 designer_v2/lib/common_views/collapse.dart    |  2 +-
 .../lib/common_views/form_table_layout.dart   |  2 +-
 designer_v2/lib/common_views/icons.dart       |  2 +-
 .../lib/common_views/range_slider.dart        |  8 +++---
 .../lib/common_views/sidesheet/sidesheet.dart |  6 ++--
 .../lib/common_views/styling_information.dart |  4 +--
 .../lib/common_views/text_hyperlink.dart      |  2 +-
 .../lib/common_views/text_paragraph.dart      |  2 +-
 designer_v2/lib/common_views/utils.dart       |  2 +-
 .../features/account/account_settings.dart    |  2 +-
 designer_v2/lib/features/app.dart             |  2 +-
 .../features/dashboard/dashboard_page.dart    |  4 +--
 .../features/dashboard/dashboard_state.dart   | 28 +++++++++----------
 .../features/dashboard/studies_filter.dart    |  4 +--
 .../lib/features/dashboard/studies_table.dart | 20 ++++++-------
 .../enrollment_form_controller.dart           |  2 +-
 .../enrollment/enrollment_form_data.dart      |  4 +--
 .../screener_question_form_controller.dart    |  2 +-
 .../screener_question_logic_form_view.dart    |  4 +--
 .../interventions/intervention_form_data.dart |  2 +-
 .../intervention_task_form_controller.dart    |  4 +--
 .../interventions_form_data.dart              |  4 +--
 .../study_schedule_form_controller_mixin.dart | 18 ++++++------
 .../measurements/measurements_form_data.dart  |  2 +-
 .../measurements/measurements_form_view.dart  |  2 +-
 .../measurements/survey/survey_form_data.dart |  4 +--
 .../section/report_item_form_data.dart        |  2 +-
 .../section/report_item_form_view.dart        |  4 +--
 .../types/average_section_form_view.dart      |  2 +-
 .../section/types/data_reference_editor.dart  |  2 +-
 .../linear_regression_section_form_view.dart  |  2 +-
 .../audio_recording_question_form_view.dart   |  4 +--
 .../types/free_text_question_form_view.dart   |  8 +++---
 .../image_capturing_question_form_view.dart   |  2 +-
 .../question/types/question_type.dart         |  2 +-
 .../types/scale_question_form_view.dart       | 10 +++----
 .../questionnaire_form_data.dart              |  2 +-
 .../schedule/schedule_controls_view.dart      | 10 +++----
 .../forms/form_view_model_collection.dart     |  2 +-
 .../publish/study_publish_dialog_success.dart |  2 +-
 .../recruit/invite_code_form_view.dart        |  2 +-
 .../features/recruit/invite_codes_table.dart  |  4 +--
 .../features/recruit/study_recruit_page.dart  |  4 +--
 .../features/study/study_test_controller.dart |  4 +--
 .../study/study_test_frame_controllers.dart   |  2 +-
 .../lib/localization/language_picker.dart     |  6 ++--
 .../lib/localization/locale_providers.dart    |  2 +-
 .../platform_locale/platform_locale_stub.dart |  2 +-
 .../lib/repositories/auth_repository.dart     | 10 +++----
 .../lib/repositories/study_repository.dart    | 10 +++----
 .../lib/repositories/supabase_client.dart     | 14 +++++-----
 designer_v2/lib/routing/router_config.dart    |  4 +--
 designer_v2/lib/routing/router_utils.dart     |  2 +-
 .../lib/services/notification_service.dart    |  6 ++--
 designer_v2/lib/theme.dart                    | 26 ++++++++---------
 77 files changed, 197 insertions(+), 196 deletions(-)

diff --git a/core/lib/src/models/data/data_reference.dart b/core/lib/src/models/data/data_reference.dart
index f944e261b..eded38996 100644
--- a/core/lib/src/models/data/data_reference.dart
+++ b/core/lib/src/models/data/data_reference.dart
@@ -26,8 +26,9 @@ class DataReference<T> {
         subject.selectedInterventions
             .expand((i) => i.tasks)
             .firstWhereOrNull((task) => task.id == this.task);
-    if (sourceTask == null)
+    if (sourceTask == null) {
       throw ArgumentError("Could not find a task with the id '$task'.");
+    }
 
     final List<SubjectProgress> sourceResults = subject.resultsFor(task);
 
diff --git a/core/lib/src/models/interventions/intervention_task.dart b/core/lib/src/models/interventions/intervention_task.dart
index 127d13ac5..4fdb6581f 100644
--- a/core/lib/src/models/interventions/intervention_task.dart
+++ b/core/lib/src/models/interventions/intervention_task.dart
@@ -3,7 +3,7 @@ import 'package:studyu_core/src/models/tasks/task.dart';
 import 'package:studyu_core/src/models/unknown_json_type_error.dart';
 
 typedef InterventionTaskParser = InterventionTask Function(
-    Map<String, dynamic> data);
+    Map<String, dynamic> data,);
 
 abstract class InterventionTask extends Task {
   InterventionTask(super.type);
diff --git a/core/lib/src/models/interventions/tasks/checkmark_task.dart b/core/lib/src/models/interventions/tasks/checkmark_task.dart
index e46a9826b..6330fd2b6 100644
--- a/core/lib/src/models/interventions/tasks/checkmark_task.dart
+++ b/core/lib/src/models/interventions/tasks/checkmark_task.dart
@@ -21,9 +21,9 @@ class CheckmarkTask extends InterventionTask {
 
   @override
   Map<DateTime, T> extractPropertyResults<T>(
-      String property, List<SubjectProgress> sourceResults) {
+      String property, List<SubjectProgress> sourceResults,) {
     throw ArgumentError(
-        "$runtimeType does not have a property named '$property'.");
+        "$runtimeType does not have a property named '$property'.",);
   }
 
   @override
diff --git a/core/lib/src/models/observations/tasks/questionnaire_task.dart b/core/lib/src/models/observations/tasks/questionnaire_task.dart
index f2e4fb0dd..01b188cc0 100644
--- a/core/lib/src/models/observations/tasks/questionnaire_task.dart
+++ b/core/lib/src/models/observations/tasks/questionnaire_task.dart
@@ -23,19 +23,19 @@ class QuestionnaireTask extends Observation {
 
   @override
   Map<DateTime, T> extractPropertyResults<T>(
-      String property, List<SubjectProgress> sourceResults) {
+      String property, List<SubjectProgress> sourceResults,) {
     final Question? targetQuestion =
         questions.questions.firstWhereOrNull((q) => q.id == property);
     if (targetQuestion == null) {
       throw ArgumentError(
-          "Questionnaire '$id' does not have a question with '$property'.");
+          "Questionnaire '$id' does not have a question with '$property'.",);
     }
     return Map.fromEntries(
       sourceResults.map((e) => MapEntry(
           e.completedAt!,
           (e.result as Result<QuestionnaireState>)
               .result
-              .getAnswer<T>(property))),
+              .getAnswer<T>(property),),),
     );
   }
 
diff --git a/core/lib/src/models/questionnaire/questionnaire_state.dart b/core/lib/src/models/questionnaire/questionnaire_state.dart
index 49df8acdc..f7a9a95e7 100644
--- a/core/lib/src/models/questionnaire/questionnaire_state.dart
+++ b/core/lib/src/models/questionnaire/questionnaire_state.dart
@@ -23,7 +23,7 @@ class QuestionnaireState {
       return answer.response;
     } else {
       throw ArgumentError(
-          "'Answer<$T>' requested but found '${answer.runtimeType}'.");
+          "'Answer<$T>' requested but found '${answer.runtimeType}'.",);
     }
   }
 }
diff --git a/core/lib/src/models/questionnaire/questions/free_text_question.dart b/core/lib/src/models/questionnaire/questions/free_text_question.dart
index 0afe37e49..0f76fa7ea 100644
--- a/core/lib/src/models/questionnaire/questions/free_text_question.dart
+++ b/core/lib/src/models/questionnaire/questions/free_text_question.dart
@@ -22,13 +22,13 @@ class FreeTextQuestion extends Question<String> {
   FreeTextQuestion(
       {required this.textType,
       required this.lengthRange,
-      this.customTypeExpression})
+      this.customTypeExpression,})
       : super(questionType);
 
   FreeTextQuestion.withId(
       {required this.textType,
       required this.lengthRange,
-      this.customTypeExpression})
+      this.customTypeExpression,})
       : super.withId(questionType);
 
   factory FreeTextQuestion.fromJson(Map<String, dynamic> json) =>
diff --git a/core/lib/src/models/questionnaire/questions/scale_question.dart b/core/lib/src/models/questionnaire/questions/scale_question.dart
index c40014f92..fa8d97ab9 100644
--- a/core/lib/src/models/questionnaire/questions/scale_question.dart
+++ b/core/lib/src/models/questionnaire/questions/scale_question.dart
@@ -252,7 +252,7 @@ class ScaleQuestion extends SliderQuestion
     int numValuesGenerated = 10,
   }) {
     final int midValueStepSize = getAutostepSize(
-        scaleMaxValue: scaleMinValue, numValuesGenerated: numValuesGenerated);
+        scaleMaxValue: scaleMinValue, numValuesGenerated: numValuesGenerated,);
     final List<int> midValues = [];
 
     for (int midValue = scaleMinValue + midValueStepSize;
diff --git a/core/lib/src/models/results/result.dart b/core/lib/src/models/results/result.dart
index 901f4157d..4c9c80df6 100644
--- a/core/lib/src/models/results/result.dart
+++ b/core/lib/src/models/results/result.dart
@@ -20,14 +20,14 @@ class Result<T> {
   Result(this.type);
 
   Result.app(
-      {required this.type, required this.periodId, required this.result});
+      {required this.type, required this.periodId, required this.result,});
 
   factory Result.parseJson(Map<String, dynamic> json) => _$ResultFromJson(json);
 
   factory Result.fromJson(Map<String, dynamic> json) => switch (json[keyType]) {
         'QuestionnaireState' => Result<QuestionnaireState>.parseJson(json)
           ..result = QuestionnaireState.fromJson(
-              List<Map<String, dynamic>>.from(json[keyResult] as List)),
+              List<Map<String, dynamic>>.from(json[keyResult] as List),),
         'bool' => Result<bool>.parseJson(json)
           ..result = json[keyResult] as bool,
         _ => throw UnknownJsonTypeError(json[keyType]),
@@ -36,7 +36,7 @@ class Result<T> {
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> resultMap = switch (type) {
       'QuestionnaireState' => {
-          keyResult: (result as QuestionnaireState).toJson()
+          keyResult: (result as QuestionnaireState).toJson(),
         },
       'bool' => {keyResult: result},
       _ => throw ArgumentError('Unknown result type $type'),
diff --git a/core/lib/src/models/study_results/results/intervention_result.dart b/core/lib/src/models/study_results/results/intervention_result.dart
index 0eb3367fa..28305365c 100644
--- a/core/lib/src/models/study_results/results/intervention_result.dart
+++ b/core/lib/src/models/study_results/results/intervention_result.dart
@@ -32,7 +32,7 @@ class InterventionResult extends StudyResult {
   List getValues(StudySubject subject) {
     return subject.interventionOrder
         .expand((intervention) => List<String>.filled(
-            subject.study.schedule.phaseDuration, intervention))
+            subject.study.schedule.phaseDuration, intervention,),)
         .toList();
   }
 }
diff --git a/core/lib/src/models/study_results/results/numeric_result.dart b/core/lib/src/models/study_results/results/numeric_result.dart
index 24031df6f..c4b81999f 100644
--- a/core/lib/src/models/study_results/results/numeric_result.dart
+++ b/core/lib/src/models/study_results/results/numeric_result.dart
@@ -34,7 +34,7 @@ class NumericResult extends StudyResult {
   @override
   List getValues(StudySubject subject) {
     final resultSet = resultProperty.retrieveFromResults(subject).map<int, num>(
-        (key, value) => MapEntry(subject.getDayOfStudyFor(key), value));
+        (key, value) => MapEntry(subject.getDayOfStudyFor(key), value),);
     final numberOfDays = subject.study.schedule.getNumberOfPhases() *
         subject.study.schedule.phaseDuration;
     return Iterable<int>.generate(numberOfDays)
diff --git a/core/lib/src/models/tables/repo.dart b/core/lib/src/models/tables/repo.dart
index 6f946390b..8db1dea80 100644
--- a/core/lib/src/models/tables/repo.dart
+++ b/core/lib/src/models/tables/repo.dart
@@ -27,7 +27,7 @@ class Repo extends SupabaseObjectFunctions<Repo> {
   String? gitUrl;
 
   Repo(this.projectId, this.userId, this.studyId, this.provider, this.webUrl,
-      this.gitUrl);
+      this.gitUrl,);
 
   factory Repo.fromJson(Map<String, dynamic> json) => _$RepoFromJson(json);
 
diff --git a/core/lib/src/models/tables/study.dart b/core/lib/src/models/tables/study.dart
index b5ac0ef6c..37b728a6f 100644
--- a/core/lib/src/models/tables/study.dart
+++ b/core/lib/src/models/tables/study.dart
@@ -240,7 +240,7 @@ class Study extends SupabaseObjectFunctions<Study>
       final response =
           await env.client.from(tableName).select().eq('participation', 'open');
       final extracted = SupabaseQuery.extractSupabaseList<Study>(
-          List<Map<String, dynamic>>.from(response));
+          List<Map<String, dynamic>>.from(response),);
       result = ExtractionSuccess<Study>(extracted);
     } on ExtractionFailedException<Study> catch (error) {
       result = error;
diff --git a/core/lib/src/models/tables/study_subject.dart b/core/lib/src/models/tables/study_subject.dart
index 70d4e9163..e2826d59b 100644
--- a/core/lib/src/models/tables/study_subject.dart
+++ b/core/lib/src/models/tables/study_subject.dart
@@ -40,7 +40,7 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   late List<SubjectProgress> progress = [];
 
   StudySubject(
-      this.id, this.studyId, this.userId, this.selectedInterventionIds);
+      this.id, this.studyId, this.userId, this.selectedInterventionIds,);
 
   factory StudySubject.fromJson(Map<String, dynamic> json) {
     final subject = _$StudySubjectFromJson(json);
@@ -64,7 +64,7 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   Map<String, dynamic> toJson() => _$StudySubjectToJson(this);
 
   StudySubject.fromStudy(
-      this.study, this.userId, this.selectedInterventionIds, this.inviteCode)
+      this.study, this.userId, this.selectedInterventionIds, this.inviteCode,)
       : id = const Uuid().v4(),
         studyId = study.id;
 
@@ -79,7 +79,7 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
     final selectedInterventions = selectedInterventionIds
         .map(
           (selectedInterventionId) => study.interventions.singleWhere(
-              (intervention) => intervention.id == selectedInterventionId),
+              (intervention) => intervention.id == selectedInterventionId,),
         )
         .toList();
     if (study.schedule.includeBaseline) {
@@ -96,11 +96,11 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
       study.schedule.numberOfCycles * study.schedule.phaseDuration;
 
   Map<DateTime, List<SubjectProgress>> getResultsByDate(
-      {required String interventionId}) {
+      {required String interventionId,}) {
     final resultsByDate = <DateTime, List<SubjectProgress>>{};
     progress.where((p) => p.interventionId == interventionId).forEach((p) {
       final date = DateTime(
-          p.completedAt!.year, p.completedAt!.month, p.completedAt!.day);
+          p.completedAt!.year, p.completedAt!.month, p.completedAt!.day,);
       resultsByDate.putIfAbsent(date, () => []);
       resultsByDate[date]!.add(p);
     });
@@ -109,7 +109,7 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
 
   // Day after last intervention
   DateTime endDate(DateTime dt) => dt.add(
-      Duration(days: interventionOrder.length * study.schedule.phaseDuration));
+      Duration(days: interventionOrder.length * study.schedule.phaseDuration),);
 
   int getDayOfStudyFor(DateTime date) {
     return date.differenceInDays(startedAt!);
@@ -134,7 +134,7 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   List<Intervention> getInterventionsInOrder() {
     return interventionOrder
         .map((key) => selectedInterventions
-            .firstWhere((intervention) => intervention.id == key))
+            .firstWhere((intervention) => intervention.id == key),)
         .toList();
   }
 
@@ -172,13 +172,13 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
     if (startOfPhase(index).isAfter(date)) return 0;
 
     final missedInPhase = min(date.differenceInDays(startOfPhase(index)),
-            study.schedule.phaseDuration) -
+            study.schedule.phaseDuration,) -
         completedForPhase(index);
     return missedInPhase / study.schedule.phaseDuration;
   }
 
   List<SubjectProgress> getTaskProgressForDay(
-      String taskId, DateTime dateTime) {
+      String taskId, DateTime dateTime,) {
     final List<SubjectProgress> thisTaskProgressToday = [];
     for (final SubjectProgress sp in resultsFor(taskId)) {
       if (sp.subjectId == id && sp.completedAt!.isSameDate(dateTime)) {
@@ -192,7 +192,7 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   /// returns true if a given task has been completed for a specific
   /// completionPeriod on a given day
   bool completedTaskInstanceForDay(
-      String taskId, CompletionPeriod completionPeriod, DateTime dateTime) {
+      String taskId, CompletionPeriod completionPeriod, DateTime dateTime,) {
     return getTaskProgressForDay(taskId, dateTime).any(
       (progress) {
         if (progress.result.periodId == null) {
@@ -210,7 +210,7 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   bool completedTaskForDay(String taskId, DateTime dateTime) {
     return [
       ...selectedInterventions.expand((e) => e.tasks),
-      ...study.observations
+      ...study.observations,
     ].where((task) => task.id == taskId).single.schedule.completionPeriods.any(
           (period) => completedTaskInstanceForDay(taskId, period, dateTime),
         );
@@ -278,7 +278,7 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
       final response =
           await env.client.from(tableName).upsert(toJson()).select();
       final json = toFullJson(
-          partialJson: List<Map<String, dynamic>>.from(response).single);
+          partialJson: List<Map<String, dynamic>>.from(response).single,);
       final newSubject = StudySubject.fromJson(json);
       _controller.add(newSubject);
       // print("Saving study subject");
diff --git a/core/lib/src/models/tasks/schedule.dart b/core/lib/src/models/tasks/schedule.dart
index 566ec3a34..d18d37853 100644
--- a/core/lib/src/models/tasks/schedule.dart
+++ b/core/lib/src/models/tasks/schedule.dart
@@ -35,7 +35,7 @@ class CompletionPeriod {
   final StudyUTimeOfDay lockTime;
 
   CompletionPeriod(
-      {required this.id, required this.unlockTime, required this.lockTime});
+      {required this.id, required this.unlockTime, required this.lockTime,});
 
   CompletionPeriod.noId({required this.unlockTime, required this.lockTime})
       : id = const Uuid().v4();
diff --git a/core/lib/src/models/tasks/task.dart b/core/lib/src/models/tasks/task.dart
index fc7b1da5f..80570ae30 100644
--- a/core/lib/src/models/tasks/task.dart
+++ b/core/lib/src/models/tasks/task.dart
@@ -25,7 +25,7 @@ abstract class Task {
   }
 
   Map<DateTime, T> extractPropertyResults<T>(
-      String property, List<SubjectProgress> sourceResults);
+      String property, List<SubjectProgress> sourceResults,);
 
   Map<String, Type> getAvailableProperties();
 
diff --git a/core/lib/src/models/tasks/task_instance.dart b/core/lib/src/models/tasks/task_instance.dart
index e2454b0af..ae5dafb87 100644
--- a/core/lib/src/models/tasks/task_instance.dart
+++ b/core/lib/src/models/tasks/task_instance.dart
@@ -7,7 +7,7 @@ class TaskInstance {
   TaskInstance(this.task, this.id) : assert(task.id != id);
 
   factory TaskInstance.fromInstanceId(String taskInstanceId,
-      {StudySubject? subject, Study? study, DateTime? date}) {
+      {StudySubject? subject, Study? study, DateTime? date,}) {
     date ??= DateTime.now();
     final Task tempTask;
     if (subject != null) {
@@ -22,7 +22,7 @@ class TaskInstance {
   }
 
   static Task _taskFromStudy(
-      String taskInstanceId, Study study, DateTime date) {
+      String taskInstanceId, Study study, DateTime date,) {
     final tasks = <Task>[
       ...study.observations,
       ...study.interventions
@@ -39,7 +39,7 @@ class TaskInstance {
   }
 
   static Task _taskFromSubject(
-      String taskInstanceId, StudySubject subject, DateTime now) {
+      String taskInstanceId, StudySubject subject, DateTime now,) {
     return subject
         .scheduleFor(now)
         .firstWhere((element) => element.id == taskInstanceId)
diff --git a/core/lib/src/util/analytics.dart b/core/lib/src/util/analytics.dart
index 541dd98dc..d0b00ae95 100644
--- a/core/lib/src/util/analytics.dart
+++ b/core/lib/src/util/analytics.dart
@@ -40,7 +40,7 @@ class StudyUDiagnostics {
   }
 
   static void addBreadcrumb(
-      {required String message, required String category}) {
+      {required String message, required String category,}) {
     print("[Breadcrumb] $category: $message");
     Sentry.addBreadcrumb(Breadcrumb(message: message, category: category));
   }
diff --git a/core/lib/src/util/supabase_object.dart b/core/lib/src/util/supabase_object.dart
index 242b80292..61afb5f0f 100644
--- a/core/lib/src/util/supabase_object.dart
+++ b/core/lib/src/util/supabase_object.dart
@@ -46,7 +46,7 @@ abstract class SupabaseObjectFunctions<T extends SupabaseObject>
 
   Future<T> save() async {
     return SupabaseQuery.extractSupabaseList<T>(
-            await env.client.from(tableName(T)).upsert(this.toJson()).select())
+            await env.client.from(tableName(T)).upsert(this.toJson()).select(),)
         .single;
   }
 }
@@ -59,7 +59,7 @@ class SupabaseQuery {
     try {
       return extractSupabaseList(await env.client
           .from(tableName(T))
-          .select(selectedColumns.join(',')));
+          .select(selectedColumns.join(',')),);
     } catch (error, stacktrace) {
       catchSupabaseException(error, stacktrace);
       rethrow;
@@ -67,7 +67,7 @@ class SupabaseQuery {
   }
 
   static Future<T> getById<T extends SupabaseObject>(String id,
-      {List<String> selectedColumns = const ['*']}) async {
+      {List<String> selectedColumns = const ['*'],}) async {
     try {
       return extractSupabaseSingleRow(
         await env.client
@@ -87,7 +87,7 @@ class SupabaseQuery {
   ) async {
     try {
       return SupabaseQuery.extractSupabaseList<T>(
-          await env.client.from(tableName(T)).upsert(batchJson).select());
+          await env.client.from(tableName(T)).upsert(batchJson).select(),);
     } catch (error, stacktrace) {
       catchSupabaseException(error, stacktrace);
       rethrow;
@@ -121,7 +121,7 @@ class SupabaseQuery {
   }
 
   static T extractSupabaseSingleRow<T extends SupabaseObject>(
-      Map<String, dynamic> response) {
+      Map<String, dynamic> response,) {
     return SupabaseObjectFunctions.fromJson<T>(response);
   }
 
@@ -129,7 +129,7 @@ class SupabaseQuery {
     StudyUDiagnostics.captureException(error, stackTrace: stacktrace);
     if (error is PostgrestException) {
       StudyULogger.fatal(
-          'Caught Postgrest Error: $error\nStacktrace: $stacktrace');
+          'Caught Postgrest Error: $error\nStacktrace: $stacktrace',);
       throw error;
     } else if (error is SocketException) {
       // StudyULogger.info("App is suspected to be offline");
diff --git a/core/test/model/study_schedule/study_schedule_test.dart b/core/test/model/study_schedule/study_schedule_test.dart
index beb2bbe34..69775f99e 100644
--- a/core/test/model/study_schedule/study_schedule_test.dart
+++ b/core/test/model/study_schedule/study_schedule_test.dart
@@ -16,9 +16,9 @@ void main() {
         final result = schedule.generateWith(0);
 
         expect(result.sublist(0).take(2).toSet().length, 2,
-            reason: 'A cycle was not complete');
+            reason: 'A cycle was not complete',);
         expect(result.sublist(2).take(2).toSet().length, 2,
-            reason: 'A cycle was not complete');
+            reason: 'A cycle was not complete',);
       });
 
       test('respects the first intervention', () {
@@ -28,9 +28,9 @@ void main() {
           ..includeBaseline = false;
 
         expect(schedule.generateWith(0).first, 0,
-            reason: 'Did not respect first intervention');
+            reason: 'Did not respect first intervention',);
         expect(schedule.generateWith(1).first, 1,
-            reason: 'Did not respect first intervention');
+            reason: 'Did not respect first intervention',);
       });
     }
 
@@ -48,7 +48,7 @@ void main() {
           final result = schedule.generateWith(first);
           for (var i = 0; i < result.length - 1; i++) {
             expect(result[i], isNot(equals(result[i + 1])),
-                reason: 'Phase $i and ${i + 1} have the same intervention');
+                reason: 'Phase $i and ${i + 1} have the same intervention',);
           }
         }
 
diff --git a/designer_v2/integration_test/robots/study_interventions_robot.dart b/designer_v2/integration_test/robots/study_interventions_robot.dart
index 2d093ae07..4b0509b43 100644
--- a/designer_v2/integration_test/robots/study_interventions_robot.dart
+++ b/designer_v2/integration_test/robots/study_interventions_robot.dart
@@ -37,7 +37,7 @@ class StudyInterventionsRobot {
   }
 
   Future<void> enterInterventionDesciption(
-      String interventionDescription) async {
+      String interventionDescription,) async {
     await $(TextField)
         .which<TextField>(
           (widget) =>
diff --git a/designer_v2/lib/common_views/action_popup_menu.dart b/designer_v2/lib/common_views/action_popup_menu.dart
index 9dd5ff8bf..c7bdaf825 100644
--- a/designer_v2/lib/common_views/action_popup_menu.dart
+++ b/designer_v2/lib/common_views/action_popup_menu.dart
@@ -75,7 +75,7 @@ class ActionPopUpMenuButton extends StatelessWidget {
     return PopupMenuButton(
       icon: Icon(triggerIcon,
           size: triggerIconSize,
-          color: isHovered ? iconColorHover : iconColorDefault),
+          color: isHovered ? iconColorHover : iconColorDefault,),
       enabled: enabled,
       elevation: elevation,
       splashRadius: splashRadius,
@@ -99,7 +99,7 @@ class ActionPopUpMenuButton extends StatelessWidget {
                     ),
               title: action.isDestructive
                   ? Text(action.label,
-                      style: textTheme.copyWith(color: Colors.red))
+                      style: textTheme.copyWith(color: Colors.red),)
                   : Text(action.label, style: textTheme),
             ),
           );
diff --git a/designer_v2/lib/common_views/async_value_widget.dart b/designer_v2/lib/common_views/async_value_widget.dart
index 03a963ade..b9041a1ac 100644
--- a/designer_v2/lib/common_views/async_value_widget.dart
+++ b/designer_v2/lib/common_views/async_value_widget.dart
@@ -10,7 +10,7 @@ class AsyncValueWidget<T> extends StatelessWidget {
       required this.data,
       this.error,
       this.loading,
-      this.empty});
+      this.empty,});
 
   final AsyncValue<T> value;
   final Widget Function(T) data;
diff --git a/designer_v2/lib/common_views/collapse.dart b/designer_v2/lib/common_views/collapse.dart
index 3905758ac..9c303bc49 100644
--- a/designer_v2/lib/common_views/collapse.dart
+++ b/designer_v2/lib/common_views/collapse.dart
@@ -6,7 +6,7 @@ import 'package:studyu_designer_v2/common_views/utils.dart';
 import 'package:studyu_designer_v2/theme.dart';
 
 typedef CollapsibleSectionBuilder = Widget Function(
-    BuildContext context, bool isCollapsed);
+    BuildContext context, bool isCollapsed,);
 
 /// Simple non-animated & more customizable alternative to [ExpansionPanel]
 /// and [ExpansionTile]
diff --git a/designer_v2/lib/common_views/form_table_layout.dart b/designer_v2/lib/common_views/form_table_layout.dart
index eb16e38b0..71bd78b5c 100644
--- a/designer_v2/lib/common_views/form_table_layout.dart
+++ b/designer_v2/lib/common_views/form_table_layout.dart
@@ -88,7 +88,7 @@ class FormTableLayout extends StatelessWidget {
         child: Theme(
           data: theme.copyWith(
               textTheme: TextTheme(
-                  titleMedium: inputTextTheme.merge(stateColorStyle))),
+                  titleMedium: inputTextTheme.merge(stateColorStyle),),),
           child: row.input,
         ),
       );
diff --git a/designer_v2/lib/common_views/icons.dart b/designer_v2/lib/common_views/icons.dart
index 735cb07b5..f7034e661 100644
--- a/designer_v2/lib/common_views/icons.dart
+++ b/designer_v2/lib/common_views/icons.dart
@@ -15,7 +15,7 @@ class HelpIcon extends StatelessWidget {
       child: MouseEventsRegion(
         builder: (context, states) {
           final iconColor = theme.iconTheme.color?.withOpacity(
-                  (states.contains(WidgetState.hovered)) ? 0.6 : 0.35) ??
+                  (states.contains(WidgetState.hovered)) ? 0.6 : 0.35,) ??
               theme.colorScheme.onSurface.withOpacity(0.3);
           return Icon(
             Icons.help_outline_rounded,
diff --git a/designer_v2/lib/common_views/range_slider.dart b/designer_v2/lib/common_views/range_slider.dart
index ea0b32f34..be043d431 100644
--- a/designer_v2/lib/common_views/range_slider.dart
+++ b/designer_v2/lib/common_views/range_slider.dart
@@ -32,7 +32,7 @@ class IndicatorRangeSliderThumbShape<T> extends RangeSliderThumbShape {
 
     final Canvas canvas = context.canvas;
     canvas.drawCircle(
-        center, 9, Paint()..color = Theme.of(buildContext).colorScheme.primary);
+        center, 9, Paint()..color = Theme.of(buildContext).colorScheme.primary,);
     final value = thumb == Thumb.start ? start : end;
 
     // Customize the box style
@@ -52,7 +52,7 @@ class IndicatorRangeSliderThumbShape<T> extends RangeSliderThumbShape {
     final textSpan =
         TextSpan(text: text, style: const TextStyle(color: Colors.white));
     final textPainter = TextPainter(
-        text: textSpan, textDirection: textDirection ?? TextDirection.ltr);
+        text: textSpan, textDirection: textDirection ?? TextDirection.ltr,);
     textPainter.layout();
 
     // Calculate the box size with padding
@@ -65,12 +65,12 @@ class IndicatorRangeSliderThumbShape<T> extends RangeSliderThumbShape {
     // Draw the rounded rectangle box with border centered around the text
     final boxOffset = textOffset +
         Offset(textPainter.width / 2 - boxWidth / 2,
-            textPainter.height / 2 - boxHeight / 2);
+            textPainter.height / 2 - boxHeight / 2,);
     final boxRect =
         Rect.fromLTWH(boxOffset.dx, boxOffset.dy, boxWidth, boxHeight);
     canvas.drawRRect(RRect.fromRectAndRadius(boxRect, borderRadius), boxPaint);
     canvas.drawRRect(
-        RRect.fromRectAndRadius(boxRect, borderRadius), borderPaint);
+        RRect.fromRectAndRadius(boxRect, borderRadius), borderPaint,);
 
     // Draw the text inside the box
     textPainter.paint(canvas, textOffset);
diff --git a/designer_v2/lib/common_views/sidesheet/sidesheet.dart b/designer_v2/lib/common_views/sidesheet/sidesheet.dart
index fbfcaf090..2f85068ba 100644
--- a/designer_v2/lib/common_views/sidesheet/sidesheet.dart
+++ b/designer_v2/lib/common_views/sidesheet/sidesheet.dart
@@ -36,7 +36,7 @@ class Sidesheet extends StatefulWidget {
           "Must provide either body or tabs to build sidesheet content",
         ),
         assert(tabs == null || tabs.length >= 1,
-            "Must provide at least one tab to build sidesheet content");
+            "Must provide at least one tab to build sidesheet content",);
 
   final String titleText;
   final Widget? body;
@@ -113,7 +113,7 @@ class _SidesheetState extends State<Sidesheet> {
   }
 
   Container _build(
-      BuildContext context, Widget? body, List<SidesheetTab>? tabs) {
+      BuildContext context, Widget? body, List<SidesheetTab>? tabs,) {
     final theme = Theme.of(context);
     final backgroundColor =
         ThemeConfig.sidesheetBackgroundColor(Theme.of(context));
@@ -173,7 +173,7 @@ class _SidesheetState extends State<Sidesheet> {
             if (hasTabs && !isCollapsed)
               Padding(
                 padding: EdgeInsets.symmetric(
-                    horizontal: (widget.bodyPadding?.horizontal ?? 0) * 0.5),
+                    horizontal: (widget.bodyPadding?.horizontal ?? 0) * 0.5,),
                 child: TabbedNavbar<SidesheetTab>(
                   tabs: tabs,
                   height: 38.0,
diff --git a/designer_v2/lib/common_views/styling_information.dart b/designer_v2/lib/common_views/styling_information.dart
index e6ceb0ae5..312a9abb0 100644
--- a/designer_v2/lib/common_views/styling_information.dart
+++ b/designer_v2/lib/common_views/styling_information.dart
@@ -6,7 +6,7 @@ import 'package:studyu_designer_v2/theme.dart';
 
 class HtmlStylingBanner extends StatelessWidget {
   const HtmlStylingBanner(
-      {this.isDismissed = false, this.onDismissed, super.key});
+      {this.isDismissed = false, this.onDismissed, super.key,});
 
   final bool isDismissed;
   final Function()? onDismissed;
@@ -45,7 +45,7 @@ class HtmlStylingBanner extends StatelessWidget {
                     children: [
                       const Text('Make your text bold'),
                       Text('<b>Bold text</b>',
-                          style: ThemeConfig.bodyTextMuted(theme)),
+                          style: ThemeConfig.bodyTextMuted(theme),),
                     ],
                   ),
                   TableRow(
diff --git a/designer_v2/lib/common_views/text_hyperlink.dart b/designer_v2/lib/common_views/text_hyperlink.dart
index 235055b53..03df43f24 100644
--- a/designer_v2/lib/common_views/text_hyperlink.dart
+++ b/designer_v2/lib/common_views/text_hyperlink.dart
@@ -84,7 +84,7 @@ class _HyperlinkState extends State<Hyperlink> {
             children: [
               Icon(widget.icon,
                   color: actualColor,
-                  size: widget.iconSize ?? (textTheme?.fontSize ?? 14.0) + 4.0),
+                  size: widget.iconSize ?? (textTheme?.fontSize ?? 14.0) + 4.0,),
               const SizedBox(width: 2.0),
               textWidget,
             ],
diff --git a/designer_v2/lib/common_views/text_paragraph.dart b/designer_v2/lib/common_views/text_paragraph.dart
index 5a3185497..6af70525d 100644
--- a/designer_v2/lib/common_views/text_paragraph.dart
+++ b/designer_v2/lib/common_views/text_paragraph.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 
 class TextParagraph extends StatelessWidget {
   TextParagraph(
-      {this.text, this.style, this.selectable = true, this.span, super.key}) {
+      {this.text, this.style, this.selectable = true, this.span, super.key,}) {
     if (text == null && span == null) {
       throw Exception("Either text or TextSpan has to be provided");
     }
diff --git a/designer_v2/lib/common_views/utils.dart b/designer_v2/lib/common_views/utils.dart
index dc98d1530..7af2afe19 100644
--- a/designer_v2/lib/common_views/utils.dart
+++ b/designer_v2/lib/common_views/utils.dart
@@ -3,7 +3,7 @@ import 'package:flutter/widgets.dart';
 typedef WidgetDecorator = Widget Function(Widget widget);
 
 List<Widget> withSpacing(List<Widget> widgets,
-    {required double spacing, double? paddingStart, double? paddingEnd}) {
+    {required double spacing, double? paddingStart, double? paddingEnd,}) {
   final List<Widget> results = [];
   if (paddingStart != null) {
     results.add(SizedBox(height: paddingStart, width: paddingStart));
diff --git a/designer_v2/lib/features/account/account_settings.dart b/designer_v2/lib/features/account/account_settings.dart
index 626296332..b42ebcbe3 100644
--- a/designer_v2/lib/features/account/account_settings.dart
+++ b/designer_v2/lib/features/account/account_settings.dart
@@ -26,7 +26,7 @@ class AccountSettingsDialog extends ConsumerWidget {
                   label: tr.language,
                   input: const Align(
                       alignment: Alignment.centerRight,
-                      child: LanguagePicker()),
+                      child: LanguagePicker(),),
                 ),
               ],
             ),
diff --git a/designer_v2/lib/features/app.dart b/designer_v2/lib/features/app.dart
index 7d741854e..883b8ec50 100644
--- a/designer_v2/lib/features/app.dart
+++ b/designer_v2/lib/features/app.dart
@@ -63,7 +63,7 @@ class _AppContentState extends ConsumerState<AppContent> {
   @override
   Widget build(BuildContext context) {
     AppTranslation.init(
-        ref); // todo Refactor this into initState locale delegate if possible
+        ref,); // todo Refactor this into initState locale delegate if possible
     final router = ref.watch(routerProvider);
 
     return DynamicColorBuilder(
diff --git a/designer_v2/lib/features/dashboard/dashboard_page.dart b/designer_v2/lib/features/dashboard/dashboard_page.dart
index 8f45277f5..98c337221 100644
--- a/designer_v2/lib/features/dashboard/dashboard_page.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_page.dart
@@ -65,7 +65,7 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
               ),
               const SizedBox(width: 28.0),
               SelectableText(state.visibleListTitle,
-                  style: theme.textTheme.headlineMedium),
+                  style: theme.textTheme.headlineMedium,),
               const SizedBox(width: 28.0),
               Expanded(
                 child: Align(
@@ -91,7 +91,7 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
               if (snapshot.hasData) {
                 return AsyncValueWidget<List<Study>>(
                   value: state.displayedStudies(
-                      snapshot.data!.preferences.pinnedStudies, state.query),
+                      snapshot.data!.preferences.pinnedStudies, state.query,),
                   data: (visibleStudies) => StudiesTable(
                     studies: visibleStudies,
                     pinnedStudies: snapshot.data!.preferences.pinnedStudies,
diff --git a/designer_v2/lib/features/dashboard/dashboard_state.dart b/designer_v2/lib/features/dashboard/dashboard_state.dart
index 1eea47767..cfe2a63a4 100644
--- a/designer_v2/lib/features/dashboard/dashboard_state.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_state.dart
@@ -45,7 +45,7 @@ class DashboardState extends Equatable {
   /// Wrapped in an [AsyncValue] that mirrors the [studies]' async states,
   /// but resolves to a different subset of studies based on the [studiesFilter]
   AsyncValue<List<Study>> displayedStudies(
-      Set<String> pinnedStudies, String query) {
+      Set<String> pinnedStudies, String query,) {
     return studies.when(
       data: (studies) {
         List<Study> updatedStudies =
@@ -71,7 +71,7 @@ class DashboardState extends Equatable {
   }
 
   List<Study> sort(
-      {required Set<String> pinnedStudies, List<Study>? studiesToSort}) {
+      {required Set<String> pinnedStudies, List<Study>? studiesToSort,}) {
     final sortedStudies = studiesToSort ?? studies.value!;
     switch (sortByColumn) {
       case StudiesTableColumn.title:
@@ -85,50 +85,50 @@ class DashboardState extends Equatable {
       case StudiesTableColumn.status:
         if (sortAscending) {
           sortedStudies.sort((study, other) =>
-              study.status.index.compareTo(other.status.index));
+              study.status.index.compareTo(other.status.index),);
         } else {
           sortedStudies.sort((study, other) =>
-              other.status.index.compareTo(study.status.index));
+              other.status.index.compareTo(study.status.index),);
         }
       case StudiesTableColumn.participation:
         if (sortAscending) {
           sortedStudies.sort((study, other) =>
-              study.participation.index.compareTo(other.participation.index));
+              study.participation.index.compareTo(other.participation.index),);
         } else {
           sortedStudies.sort((study, other) =>
-              other.participation.index.compareTo(study.participation.index));
+              other.participation.index.compareTo(study.participation.index),);
         }
       case StudiesTableColumn.createdAt:
         if (sortAscending) {
           sortedStudies.sort(
-              (study, other) => study.createdAt!.compareTo(other.createdAt!));
+              (study, other) => study.createdAt!.compareTo(other.createdAt!),);
         } else {
           sortedStudies.sort(
-              (study, other) => other.createdAt!.compareTo(study.createdAt!));
+              (study, other) => other.createdAt!.compareTo(study.createdAt!),);
         }
       case StudiesTableColumn.enrolled:
         if (sortAscending) {
           sortedStudies.sort((study, other) =>
-              study.participantCount.compareTo(other.participantCount));
+              study.participantCount.compareTo(other.participantCount),);
         } else {
           sortedStudies.sort((study, other) =>
-              other.participantCount.compareTo(study.participantCount));
+              other.participantCount.compareTo(study.participantCount),);
         }
       case StudiesTableColumn.active:
         if (sortAscending) {
           sortedStudies.sort((study, other) =>
-              study.activeSubjectCount.compareTo(other.activeSubjectCount));
+              study.activeSubjectCount.compareTo(other.activeSubjectCount),);
         } else {
           sortedStudies.sort((study, other) =>
-              other.activeSubjectCount.compareTo(study.activeSubjectCount));
+              other.activeSubjectCount.compareTo(study.activeSubjectCount),);
         }
       case StudiesTableColumn.completed:
         if (sortAscending) {
           sortedStudies.sort(
-              (study, other) => study.endedCount.compareTo(other.endedCount));
+              (study, other) => study.endedCount.compareTo(other.endedCount),);
         } else {
           sortedStudies.sort(
-              (study, other) => other.endedCount.compareTo(study.endedCount));
+              (study, other) => other.endedCount.compareTo(study.endedCount),);
         }
       case StudiesTableColumn.pin:
       case StudiesTableColumn.action:
diff --git a/designer_v2/lib/features/dashboard/studies_filter.dart b/designer_v2/lib/features/dashboard/studies_filter.dart
index 5e9482494..636d569a8 100644
--- a/designer_v2/lib/features/dashboard/studies_filter.dart
+++ b/designer_v2/lib/features/dashboard/studies_filter.dart
@@ -6,7 +6,7 @@ enum StudiesFilter with GoRouteParamEnum { all, owned, shared, public }
 
 extension StudiesFilterByUser on StudiesFilter {
   Iterable<Study> apply(
-      {required Iterable<Study> studies, required User user}) {
+      {required Iterable<Study> studies, required User user,}) {
     switch (this) {
       case StudiesFilter.all:
         return studies;
@@ -17,7 +17,7 @@ extension StudiesFilterByUser on StudiesFilter {
       case StudiesFilter.public:
         // show studies published to registry irrespective of their status
         return studies.where((s) =>
-            s.registryPublished || s.resultSharing == ResultSharing.public);
+            s.registryPublished || s.resultSharing == ResultSharing.public,);
     }
   }
 }
diff --git a/designer_v2/lib/features/dashboard/studies_table.dart b/designer_v2/lib/features/dashboard/studies_table.dart
index 09b6ab5d6..6d84a21f9 100644
--- a/designer_v2/lib/features/dashboard/studies_table.dart
+++ b/designer_v2/lib/features/dashboard/studies_table.dart
@@ -141,63 +141,63 @@ class StudiesTable extends StatelessWidget {
               child: Row(
                 children: [
                   columnDefinitions[0].value.createContainer(
-                      child: _buildColumnHeader(columnDefinitions[0].key)),
+                      child: _buildColumnHeader(columnDefinitions[0].key),),
                   SizedBox(
                     width: columnDefinitions[0].value.collapsed
                         ? 0
                         : columnSpacing,
                   ),
                   columnDefinitions[1].value.createContainer(
-                      child: _buildColumnHeader(columnDefinitions[1].key)),
+                      child: _buildColumnHeader(columnDefinitions[1].key),),
                   SizedBox(
                     width: columnDefinitions[1].value.collapsed
                         ? 0
                         : columnSpacing,
                   ),
                   columnDefinitions[2].value.createContainer(
-                      child: _buildColumnHeader(columnDefinitions[2].key)),
+                      child: _buildColumnHeader(columnDefinitions[2].key),),
                   SizedBox(
                     width: columnDefinitions[2].value.collapsed
                         ? 0
                         : columnSpacing,
                   ),
                   columnDefinitions[3].value.createContainer(
-                      child: _buildColumnHeader(columnDefinitions[3].key)),
+                      child: _buildColumnHeader(columnDefinitions[3].key),),
                   SizedBox(
                     width: columnDefinitions[3].value.collapsed
                         ? 0
                         : columnSpacing,
                   ),
                   columnDefinitions[4].value.createContainer(
-                      child: _buildColumnHeader(columnDefinitions[4].key)),
+                      child: _buildColumnHeader(columnDefinitions[4].key),),
                   SizedBox(
                     width: columnDefinitions[4].value.collapsed
                         ? 0
                         : columnSpacing,
                   ),
                   columnDefinitions[5].value.createContainer(
-                      child: _buildColumnHeader(columnDefinitions[5].key)),
+                      child: _buildColumnHeader(columnDefinitions[5].key),),
                   SizedBox(
                     width: columnDefinitions[5].value.collapsed
                         ? 0
                         : columnSpacing,
                   ),
                   columnDefinitions[6].value.createContainer(
-                      child: _buildColumnHeader(columnDefinitions[6].key)),
+                      child: _buildColumnHeader(columnDefinitions[6].key),),
                   SizedBox(
                     width: columnDefinitions[6].value.collapsed
                         ? 0
                         : columnSpacing,
                   ),
                   columnDefinitions[7].value.createContainer(
-                      child: _buildColumnHeader(columnDefinitions[7].key)),
+                      child: _buildColumnHeader(columnDefinitions[7].key),),
                   SizedBox(
                     width: columnDefinitions[7].value.collapsed
                         ? 0
                         : columnSpacing,
                   ),
                   columnDefinitions[8].value.createContainer(
-                      child: _buildColumnHeader(columnDefinitions[8].key)),
+                      child: _buildColumnHeader(columnDefinitions[8].key),),
                   SizedBox(
                     width: columnDefinitions[8].value.collapsed
                         ? 0
@@ -271,7 +271,7 @@ class StudiesTable extends StatelessWidget {
       onSort: sortable
           ? () {
               dashboardController.setSorting(
-                  column, sortingActive ? !sortAscending : sortAscending);
+                  column, sortingActive ? !sortAscending : sortAscending,);
             }
           : null,
     );
diff --git a/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart b/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart
index 3fa941f56..9f0c9ffd9 100644
--- a/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart
+++ b/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart
@@ -62,7 +62,7 @@ class EnrollmentFormViewModel extends FormViewModel<EnrollmentFormData>
       Participation.values
           .map(
             (v) => FormControlOption(v, v.string,
-                description: v.designDescription),
+                description: v.designDescription,),
           )
           .toList();
 
diff --git a/designer_v2/lib/features/design/enrollment/enrollment_form_data.dart b/designer_v2/lib/features/design/enrollment/enrollment_form_data.dart
index b3ee24dc9..f022c7b48 100644
--- a/designer_v2/lib/features/design/enrollment/enrollment_form_data.dart
+++ b/designer_v2/lib/features/design/enrollment/enrollment_form_data.dart
@@ -20,10 +20,10 @@ class EnrollmentFormData implements IStudyFormData {
     return EnrollmentFormData(
       enrollmentType: study.participation,
       questionnaireFormData: QuestionnaireFormData.fromDomainModel(
-          study.questionnaire, study.eligibilityCriteria),
+          study.questionnaire, study.eligibilityCriteria,),
       consentItemsFormData: study.consent
           .map(
-              (consentItem) => ConsentItemFormData.fromDomainModel(consentItem))
+              (consentItem) => ConsentItemFormData.fromDomainModel(consentItem),)
           .toList(),
     );
   }
diff --git a/designer_v2/lib/features/design/enrollment/screener_question_form_controller.dart b/designer_v2/lib/features/design/enrollment/screener_question_form_controller.dart
index 1dcc03019..f1042e911 100644
--- a/designer_v2/lib/features/design/enrollment/screener_question_form_controller.dart
+++ b/designer_v2/lib/features/design/enrollment/screener_question_form_controller.dart
@@ -25,7 +25,7 @@ class ScreenerQuestionFormViewModel extends QuestionFormViewModel
       FormArray(_copyFormControls(answerOptionsArray.controls), disabled: true);
   late final FormArray<bool> responseOptionsLogicControls = FormArray(
     List.generate(answerOptionsArray.controls.length,
-        (index) => FormControl(value: defaultResponseOptionValidity)),
+        (index) => FormControl(value: defaultResponseOptionValidity),),
   );
   late final FormArray<String> responseOptionsLogicDescriptionControls =
       FormArray(
diff --git a/designer_v2/lib/features/design/enrollment/screener_question_logic_form_view.dart b/designer_v2/lib/features/design/enrollment/screener_question_logic_form_view.dart
index dbce1d7f4..ffbc1a1a7 100644
--- a/designer_v2/lib/features/design/enrollment/screener_question_logic_form_view.dart
+++ b/designer_v2/lib/features/design/enrollment/screener_question_logic_form_view.dart
@@ -52,7 +52,7 @@ class ScreenerQuestionLogicFormView extends FormConsumerWidget {
             child: BannerBox(
               style: BannerStyle.info,
               body: TextParagraph(
-                  text: tr.form_array_screener_question_logic_dirty_banner),
+                  text: tr.form_array_screener_question_logic_dirty_banner,),
               padding:
                   const EdgeInsets.symmetric(horizontal: 18.0, vertical: 12.0),
               noPrefix: true,
@@ -126,7 +126,7 @@ class ScreenerQuestionLogicFormView extends FormConsumerWidget {
     final logicWidget = Theme(
       data: theme.copyWith(
           inputDecorationTheme:
-              ThemeConfig.dropdownInputDecorationTheme(theme)),
+              ThemeConfig.dropdownInputDecorationTheme(theme),),
       child: ReactiveDropdownField<bool>(
         formControl: logicControl,
         items: formViewModel.logicControlOptions.map((option) {
diff --git a/designer_v2/lib/features/design/interventions/intervention_form_data.dart b/designer_v2/lib/features/design/interventions/intervention_form_data.dart
index 064b99e1c..025c9e8d3 100644
--- a/designer_v2/lib/features/design/interventions/intervention_form_data.dart
+++ b/designer_v2/lib/features/design/interventions/intervention_form_data.dart
@@ -33,7 +33,7 @@ class InterventionFormData extends IFormData {
       description: intervention.description,
       tasksData: intervention.tasks
           .map((task) =>
-              InterventionTaskFormData.fromDomainModel(task as CheckmarkTask))
+              InterventionTaskFormData.fromDomainModel(task as CheckmarkTask),)
           .toList(),
       iconName: intervention.icon,
     );
diff --git a/designer_v2/lib/features/design/interventions/intervention_task_form_controller.dart b/designer_v2/lib/features/design/interventions/intervention_task_form_controller.dart
index 0d7274a8c..b0ec19395 100644
--- a/designer_v2/lib/features/design/interventions/intervention_task_form_controller.dart
+++ b/designer_v2/lib/features/design/interventions/intervention_task_form_controller.dart
@@ -21,7 +21,7 @@ class InterventionTaskFormViewModel
     super.validationSet = StudyFormValidationSet.draft,
   }) {
     runAsync(() =>
-        markAsCompletedControl.markAsDisabled()); // TODO not yet supported
+        markAsCompletedControl.markAsDisabled(),); // TODO not yet supported
   }
 
   // - Form fields
@@ -102,6 +102,6 @@ class InterventionTaskFormViewModel
     return InterventionTaskFormViewModel(
         delegate: delegate,
         formData: formData?.copy(),
-        validationSet: validationSet);
+        validationSet: validationSet,);
   }
 }
diff --git a/designer_v2/lib/features/design/interventions/interventions_form_data.dart b/designer_v2/lib/features/design/interventions/interventions_form_data.dart
index b85f66173..918f33481 100644
--- a/designer_v2/lib/features/design/interventions/interventions_form_data.dart
+++ b/designer_v2/lib/features/design/interventions/interventions_form_data.dart
@@ -5,7 +5,7 @@ import 'package:studyu_designer_v2/features/design/study_form_data.dart';
 
 class InterventionsFormData implements IStudyFormData {
   InterventionsFormData(
-      {required this.interventionsData, required this.studyScheduleData});
+      {required this.interventionsData, required this.studyScheduleData,});
 
   final List<InterventionFormData> interventionsData;
   final StudyScheduleFormData studyScheduleData;
@@ -18,7 +18,7 @@ class InterventionsFormData implements IStudyFormData {
     return InterventionsFormData(
       interventionsData: study.interventions
           .map((intervention) =>
-              InterventionFormData.fromDomainModel(intervention))
+              InterventionFormData.fromDomainModel(intervention),)
           .toList(),
       studyScheduleData: StudyScheduleFormData.fromDomainModel(study.schedule),
     );
diff --git a/designer_v2/lib/features/design/interventions/study_schedule_form_controller_mixin.dart b/designer_v2/lib/features/design/interventions/study_schedule_form_controller_mixin.dart
index a012bb4b6..966e625a3 100644
--- a/designer_v2/lib/features/design/interventions/study_schedule_form_controller_mixin.dart
+++ b/designer_v2/lib/features/design/interventions/study_schedule_form_controller_mixin.dart
@@ -39,12 +39,12 @@ mixin StudyScheduleControls {
         StudyFormValidationSet.publish: [
           customSequenceRequired,
           numCyclesRange,
-          phaseDurationRange
+          phaseDurationRange,
         ],
         StudyFormValidationSet.test: [
           customSequenceRequired,
           numCyclesRange,
-          phaseDurationRange
+          phaseDurationRange,
         ],
       };
 
@@ -60,13 +60,13 @@ mixin StudyScheduleControls {
         validationMessages: {
           ValidationMessage.required: (error) =>
               tr.form_field_crossover_schedule_num_cycles_range(
-                  kNumCyclesMin, kNumCyclesMax),
+                  kNumCyclesMin, kNumCyclesMax,),
           ValidationMessage.min: (error) =>
               tr.form_field_crossover_schedule_num_cycles_range(
-                  kNumCyclesMin, kNumCyclesMax),
+                  kNumCyclesMin, kNumCyclesMax,),
           ValidationMessage.max: (error) =>
               tr.form_field_crossover_schedule_num_cycles_range(
-                  kNumCyclesMin, kNumCyclesMax),
+                  kNumCyclesMin, kNumCyclesMax,),
         },
       );
 
@@ -77,18 +77,18 @@ mixin StudyScheduleControls {
         validators: [
           Validators.required,
           Validators.min(kPhaseDurationMin),
-          Validators.max(kPhaseDurationMax)
+          Validators.max(kPhaseDurationMax),
         ],
         validationMessages: {
           ValidationMessage.required: (error) =>
               tr.form_field_crossover_schedule_phase_length_range(
-                  kPhaseDurationMin, kPhaseDurationMax),
+                  kPhaseDurationMin, kPhaseDurationMax,),
           ValidationMessage.min: (error) =>
               tr.form_field_crossover_schedule_phase_length_range(
-                  kPhaseDurationMin, kPhaseDurationMax),
+                  kPhaseDurationMin, kPhaseDurationMax,),
           ValidationMessage.max: (error) =>
               tr.form_field_crossover_schedule_phase_length_range(
-                  kPhaseDurationMin, kPhaseDurationMax),
+                  kPhaseDurationMin, kPhaseDurationMax,),
         },
       );
 
diff --git a/designer_v2/lib/features/design/measurements/measurements_form_data.dart b/designer_v2/lib/features/design/measurements/measurements_form_data.dart
index 00596922a..cf6f7220a 100644
--- a/designer_v2/lib/features/design/measurements/measurements_form_data.dart
+++ b/designer_v2/lib/features/design/measurements/measurements_form_data.dart
@@ -15,7 +15,7 @@ class MeasurementsFormData implements IStudyFormData {
     return MeasurementsFormData(
       surveyMeasurements: study.observations
           .map((observation) => MeasurementSurveyFormData.fromDomainModel(
-              observation as QuestionnaireTask))
+              observation as QuestionnaireTask,),)
           .toList(),
     );
   }
diff --git a/designer_v2/lib/features/design/measurements/measurements_form_view.dart b/designer_v2/lib/features/design/measurements/measurements_form_view.dart
index 502a0e26b..0532845ed 100644
--- a/designer_v2/lib/features/design/measurements/measurements_form_view.dart
+++ b/designer_v2/lib/features/design/measurements/measurements_form_view.dart
@@ -29,7 +29,7 @@ class StudyDesignMeasurementsFormView extends StudyDesignPageWidget {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: <Widget>[
               TextParagraph(
-                  text: tr.form_study_design_measurements_description),
+                  text: tr.form_study_design_measurements_description,),
               const SizedBox(height: 32.0),
               ReactiveFormConsumer(
                 // [ReactiveFormConsumer] is needed to to rerender when descendant controls are updated
diff --git a/designer_v2/lib/features/design/measurements/survey/survey_form_data.dart b/designer_v2/lib/features/design/measurements/survey/survey_form_data.dart
index f26b42a09..7b02aec72 100644
--- a/designer_v2/lib/features/design/measurements/survey/survey_form_data.dart
+++ b/designer_v2/lib/features/design/measurements/survey/survey_form_data.dart
@@ -36,14 +36,14 @@ class MeasurementSurveyFormData extends IFormDataWithSchedule {
   FormDataID get id => measurementId;
 
   factory MeasurementSurveyFormData.fromDomainModel(
-      QuestionnaireTask questionnaireTask) {
+      QuestionnaireTask questionnaireTask,) {
     return MeasurementSurveyFormData(
       measurementId: questionnaireTask.id,
       title: questionnaireTask.title ?? '',
       introText: questionnaireTask.header,
       outroText: questionnaireTask.footer,
       questionnaireFormData: QuestionnaireFormData.fromDomainModel(
-          questionnaireTask.questions, []),
+          questionnaireTask.questions, [],),
       isTimeLocked: questionnaireTask.schedule.isTimeRestricted,
       timeLockStart: questionnaireTask.schedule.restrictedTimeStart,
       timeLockEnd: questionnaireTask.schedule.restrictedTimeEnd,
diff --git a/designer_v2/lib/features/design/reports/section/report_item_form_data.dart b/designer_v2/lib/features/design/reports/section/report_item_form_data.dart
index 6a4f4d4d3..1d08d9cb3 100644
--- a/designer_v2/lib/features/design/reports/section/report_item_form_data.dart
+++ b/designer_v2/lib/features/design/reports/section/report_item_form_data.dart
@@ -15,7 +15,7 @@ class ReportItemFormData extends IFormData {
   String get id => section.id;
 
   static List<ReportItemFormData> fromDomainModel(
-      ReportSpecification reportSpecification) {
+      ReportSpecification reportSpecification,) {
     final List<ReportItemFormData> reportsFormData = [];
     if (reportSpecification.primary != null) {
       reportsFormData.add(
diff --git a/designer_v2/lib/features/design/reports/section/report_item_form_view.dart b/designer_v2/lib/features/design/reports/section/report_item_form_view.dart
index 236cf7ea1..f48fdf366 100644
--- a/designer_v2/lib/features/design/reports/section/report_item_form_view.dart
+++ b/designer_v2/lib/features/design/reports/section/report_item_form_view.dart
@@ -14,7 +14,7 @@ import 'package:studyu_designer_v2/theme.dart';
 
 class ReportItemFormView extends StatelessWidget {
   const ReportItemFormView(
-      {required this.formViewModel, required this.studyId, super.key});
+      {required this.formViewModel, required this.studyId, super.key,});
 
   final ReportItemFormViewModel formViewModel;
   final StudyID studyId;
@@ -119,7 +119,7 @@ class ReportItemFormView extends StatelessWidget {
               input: Theme(
                 data: theme.copyWith(
                     inputDecorationTheme:
-                        ThemeConfig.dropdownInputDecorationTheme(theme)),
+                        ThemeConfig.dropdownInputDecorationTheme(theme),),
                 child: ReactiveDropdownField<ReportSectionType>(
                   formControl: formViewModel.sectionTypeControl,
                   items: ReportItemFormViewModel.sectionTypeControlOptions
diff --git a/designer_v2/lib/features/design/reports/section/types/average_section_form_view.dart b/designer_v2/lib/features/design/reports/section/types/average_section_form_view.dart
index dd454f6e6..31798bf2b 100644
--- a/designer_v2/lib/features/design/reports/section/types/average_section_form_view.dart
+++ b/designer_v2/lib/features/design/reports/section/types/average_section_form_view.dart
@@ -47,7 +47,7 @@ class AverageSectionFormView extends ConsumerWidget {
               input: Theme(
                 data: theme.copyWith(
                     inputDecorationTheme:
-                        ThemeConfig.dropdownInputDecorationTheme(theme)),
+                        ThemeConfig.dropdownInputDecorationTheme(theme),),
                 child: ReactiveDropdownField<TemporalAggregationFormatted>(
                   formControl: formViewModel.temporalAggregationControl,
                   hint: const Text("Select an aggregation value"),
diff --git a/designer_v2/lib/features/design/reports/section/types/data_reference_editor.dart b/designer_v2/lib/features/design/reports/section/types/data_reference_editor.dart
index 868f657e4..91f45987b 100644
--- a/designer_v2/lib/features/design/reports/section/types/data_reference_editor.dart
+++ b/designer_v2/lib/features/design/reports/section/types/data_reference_editor.dart
@@ -34,7 +34,7 @@ class DataReferenceEditor<T> {
         input: Theme(
           data: theme.copyWith(
               inputDecorationTheme:
-                  ThemeConfig.dropdownInputDecorationTheme(theme)),
+                  ThemeConfig.dropdownInputDecorationTheme(theme),),
           child: buildReactiveDropdownField,
         ),
       );
diff --git a/designer_v2/lib/features/design/reports/section/types/linear_regression_section_form_view.dart b/designer_v2/lib/features/design/reports/section/types/linear_regression_section_form_view.dart
index 6ac69d167..603050747 100644
--- a/designer_v2/lib/features/design/reports/section/types/linear_regression_section_form_view.dart
+++ b/designer_v2/lib/features/design/reports/section/types/linear_regression_section_form_view.dart
@@ -44,7 +44,7 @@ class LinearRegressionSectionFormView extends ConsumerWidget {
               input: Theme(
                 data: theme.copyWith(
                     inputDecorationTheme:
-                        ThemeConfig.dropdownInputDecorationTheme(theme)),
+                        ThemeConfig.dropdownInputDecorationTheme(theme),),
                 child: ReactiveDropdownField<ImprovementDirectionFormatted>(
                   formControl: formViewModel.improvementDirectionControl,
                   hint: const Text("Select an improvement direction"),
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/types/audio_recording_question_form_view.dart b/designer_v2/lib/features/design/shared/questionnaire/question/types/audio_recording_question_form_view.dart
index b47daf70d..3165a9662 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/types/audio_recording_question_form_view.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/types/audio_recording_question_form_view.dart
@@ -7,7 +7,7 @@ import 'package:studyu_designer_v2/localization/app_translation.dart';
 
 class AudioRecordingQuestionFormView extends ConsumerWidget {
   const AudioRecordingQuestionFormView(
-      {required this.formViewModel, super.key});
+      {required this.formViewModel, super.key,});
 
   final QuestionFormViewModel formViewModel;
 
@@ -29,7 +29,7 @@ class AudioRecordingQuestionFormView extends ConsumerWidget {
                       tr.audio_recording_max_duration_rangevalid_min,
                   ValidationMessage.max: (error) =>
                       tr.audio_recording_max_duration_rangevalid_max(
-                          QuestionFormViewModel.kMaxRecordingDurationSeconds),
+                          QuestionFormViewModel.kMaxRecordingDurationSeconds,),
                   ValidationMessage.number: (error) =>
                       tr.free_text_validation_number,
                 },
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/types/free_text_question_form_view.dart b/designer_v2/lib/features/design/shared/questionnaire/question/types/free_text_question_form_view.dart
index 7997f80db..5f8fbdd14 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/types/free_text_question_form_view.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/types/free_text_question_form_view.dart
@@ -24,7 +24,7 @@ class FreeTextQuestionFormView extends ConsumerWidget {
     final maxLength = formViewModel.freeTextLengthControl.value!.end.toInt();
     final type = formViewModel.freeTextTypeControl.value!.string;
     formViewModel.freeTextLengthControl.onChanged((_) =>
-        formViewModel.freeTextExampleTextControl.updateValueAndValidity());
+        formViewModel.freeTextExampleTextControl.updateValueAndValidity(),);
 
     return Column(
       children: [
@@ -35,7 +35,7 @@ class FreeTextQuestionFormView extends ConsumerWidget {
             child: SliderTheme(
               data: Theme.of(context).sliderTheme.copyWith(
                     rangeThumbShape: IndicatorRangeSliderThumbShape(
-                        context, minLength, maxLength),
+                        context, minLength, maxLength,),
                     showValueIndicator: ShowValueIndicator.never,
                   ),
               child: ReactiveRangeSlider<RangeValues>(
@@ -162,7 +162,7 @@ class FreeTextQuestionFormView extends ConsumerWidget {
               builder: (context, formGroup, child) {
                 return TextParagraph(
                     text: tr.free_text_example_explanation(
-                        type, minLength, maxLength));
+                        type, minLength, maxLength,),);
               },
             ),
           ],
@@ -194,7 +194,7 @@ class FreeTextQuestionFormView extends ConsumerWidget {
   Widget generateRow(
       {required String label,
       required String labelHelpText,
-      required Widget input}) {
+      required Widget input,}) {
     return Row(
       children: [
         Flexible(
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/types/image_capturing_question_form_view.dart b/designer_v2/lib/features/design/shared/questionnaire/question/types/image_capturing_question_form_view.dart
index e2709c65f..6be5213b8 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/types/image_capturing_question_form_view.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/types/image_capturing_question_form_view.dart
@@ -4,7 +4,7 @@ import 'package:studyu_designer_v2/features/design/shared/questionnaire/question
 
 class ImageCapturingQuestionFormView extends ConsumerWidget {
   const ImageCapturingQuestionFormView(
-      {required this.formViewModel, super.key});
+      {required this.formViewModel, super.key,});
 
   final QuestionFormViewModel formViewModel;
 
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/types/question_type.dart b/designer_v2/lib/features/design/shared/questionnaire/question/types/question_type.dart
index 2ff2664d0..d3e38a6da 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/types/question_type.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/types/question_type.dart
@@ -23,7 +23,7 @@ enum SurveyQuestionType {
     };
     if (!typeMapping.containsKey(question.type)) {
       throw UnimplementedError(
-          "Missing SurveyQuestionType for question of type: ${question.type}");
+          "Missing SurveyQuestionType for question of type: ${question.type}",);
     }
     return typeMapping[question.type]!;
   }
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/types/scale_question_form_view.dart b/designer_v2/lib/features/design/shared/questionnaire/question/types/scale_question_form_view.dart
index 9799bdc57..e99ab8227 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/types/scale_question_form_view.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/types/scale_question_form_view.dart
@@ -145,7 +145,7 @@ class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
   }
 
   FormTableRow _buildColorControlRow(
-      BuildContext context, FormControl<Color> control, String labelText) {
+      BuildContext context, FormControl<Color> control, String labelText,) {
     final theme = Theme.of(context);
     return FormTableRow(
       control: control,
@@ -162,7 +162,7 @@ class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
               child: Hyperlink(
                 text: "+ ${tr.form_field_response_scale_color_add}",
                 onClick: () => control.value = SerializableColor(
-                    ThemeConfig.colorPickerInitialColor(theme).value),
+                    ThemeConfig.colorPickerInitialColor(theme).value,),
                 visitedColor: null,
               ),
             )
@@ -177,7 +177,7 @@ class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
               enableAlpha: false,
               labelTypes: const [],
               pickerHsvColor: HSVColor.fromColor(
-                  control.value ?? ThemeConfig.colorPickerInitialColor(theme)),
+                  control.value ?? ThemeConfig.colorPickerInitialColor(theme),),
             )
           : Opacity(
               // prevent layout shift with disabled hidden placeholder
@@ -202,9 +202,9 @@ class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
                       style: BannerStyle.info,
                       body: TextParagraph(
                           text: tr
-                              .form_array_response_scale_mid_values_dirty_banner),
+                              .form_array_response_scale_mid_values_dirty_banner,),
                       padding: const EdgeInsets.symmetric(
-                          horizontal: 18.0, vertical: 12.0),
+                          horizontal: 18.0, vertical: 12.0,),
                       noPrefix: true,
                       isDismissed: !formViewModel.isMidValuesClearedInfoVisible,
                       dismissIconSize: Theme.of(context).iconTheme.size ?? 14.0,
diff --git a/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_data.dart b/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_data.dart
index bbef36cc9..00986d308 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_data.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_data.dart
@@ -19,7 +19,7 @@ class QuestionnaireFormData implements IFormData {
               // Collect all eligibility criteria for this question
               eligibilityCriteria
                   .where((c) =>
-                      (c.condition as ValueExpression).target == question.id)
+                      (c.condition as ValueExpression).target == question.id,)
                   .toList(),
             ),
           )
diff --git a/designer_v2/lib/features/design/shared/schedule/schedule_controls_view.dart b/designer_v2/lib/features/design/shared/schedule/schedule_controls_view.dart
index 30183cc30..f44cd512c 100644
--- a/designer_v2/lib/features/design/shared/schedule/schedule_controls_view.dart
+++ b/designer_v2/lib/features/design/shared/schedule/schedule_controls_view.dart
@@ -23,12 +23,12 @@ class ScheduleControls extends FormConsumerWidget {
 
     formViewModel.restrictedTimeStartPickerControl.valueChanges.listen((event) {
       formViewModel.restrictedTimeStartControl.value = Time.fromTimeOfDay(
-          formViewModel.restrictedTimeStartPickerControl.value!);
+          formViewModel.restrictedTimeStartPickerControl.value!,);
     });
 
     formViewModel.restrictedTimeEndPickerControl.valueChanges.listen((event) {
       formViewModel.restrictedTimeEndControl.value = Time.fromTimeOfDay(
-          formViewModel.restrictedTimeEndPickerControl.value!);
+          formViewModel.restrictedTimeEndPickerControl.value!,);
     });
 
     return Column(
@@ -71,7 +71,7 @@ class ScheduleControls extends FormConsumerWidget {
                               initialEntryMode: TimePickerEntryMode.input,
                               builder: (BuildContext context,
                                   ReactiveTimePickerDelegate picker,
-                                  Widget? child) {
+                                  Widget? child,) {
                                 return ReactiveTextField<Time>(
                                   formControl:
                                       formViewModel.reminderTimeControl,
@@ -129,7 +129,7 @@ class ScheduleControls extends FormConsumerWidget {
                   formControl: formViewModel.restrictedTimeStartPickerControl,
                   initialEntryMode: TimePickerEntryMode.input,
                   builder: (BuildContext context,
-                      ReactiveTimePickerDelegate picker, Widget? child) {
+                      ReactiveTimePickerDelegate picker, Widget? child,) {
                     return ReactiveTextField<Time>(
                       formControl: formViewModel.restrictedTimeStartControl,
                       valueAccessor: TimeValueAccessor(),
@@ -162,7 +162,7 @@ class ScheduleControls extends FormConsumerWidget {
                   formControl: formViewModel.restrictedTimeEndPickerControl,
                   initialEntryMode: TimePickerEntryMode.input,
                   builder: (BuildContext context,
-                      ReactiveTimePickerDelegate picker, Widget? child) {
+                      ReactiveTimePickerDelegate picker, Widget? child,) {
                     return ReactiveTextField<Time>(
                       formControl: formViewModel.restrictedTimeEndControl,
                       valueAccessor: TimeValueAccessor(),
diff --git a/designer_v2/lib/features/forms/form_view_model_collection.dart b/designer_v2/lib/features/forms/form_view_model_collection.dart
index 3bbc4f7c7..088fd1304 100644
--- a/designer_v2/lib/features/forms/form_view_model_collection.dart
+++ b/designer_v2/lib/features/forms/form_view_model_collection.dart
@@ -5,7 +5,7 @@ import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
 /// Parent class for [FormViewModel]s that are managed in a [FormViewModelCollection]
 abstract class ManagedFormViewModel<T> extends FormViewModel<T> {
   ManagedFormViewModel(
-      {super.delegate, super.formData, super.autosave, super.validationSet});
+      {super.delegate, super.formData, super.autosave, super.validationSet,});
   ManagedFormViewModel<T> createDuplicate();
 }
 
diff --git a/designer_v2/lib/features/publish/study_publish_dialog_success.dart b/designer_v2/lib/features/publish/study_publish_dialog_success.dart
index 5cfc9049d..14a25ddf8 100644
--- a/designer_v2/lib/features/publish/study_publish_dialog_success.dart
+++ b/designer_v2/lib/features/publish/study_publish_dialog_success.dart
@@ -49,7 +49,7 @@ class PublishSuccessDialog extends StudyPageWidget {
                 child: TextButton(
                   child: Padding(
                     padding: const EdgeInsets.symmetric(
-                        vertical: 4.0, horizontal: 8.0),
+                        vertical: 4.0, horizontal: 8.0,),
                     child: Text(tr.action_button_post_launch_followup_skip),
                   ),
                   onPressed: () => Navigator.maybePop(context),
diff --git a/designer_v2/lib/features/recruit/invite_code_form_view.dart b/designer_v2/lib/features/recruit/invite_code_form_view.dart
index 12835e01d..23e582c15 100644
--- a/designer_v2/lib/features/recruit/invite_code_form_view.dart
+++ b/designer_v2/lib/features/recruit/invite_code_form_view.dart
@@ -52,7 +52,7 @@ class InviteCodeFormView extends FormConsumerWidget {
         ),
         const SizedBox(height: 4.0),
         TextParagraph(
-            text: tr.form_field_is_preconfigured_schedule_description),
+            text: tr.form_field_is_preconfigured_schedule_description,),
         const SizedBox(height: 24.0),
         FormTableLayout(
           rows: [
diff --git a/designer_v2/lib/features/recruit/invite_codes_table.dart b/designer_v2/lib/features/recruit/invite_codes_table.dart
index c2ec9d3bc..827ae2be9 100644
--- a/designer_v2/lib/features/recruit/invite_codes_table.dart
+++ b/designer_v2/lib/features/recruit/invite_codes_table.dart
@@ -35,7 +35,7 @@ class StudyInvitesTable extends StatelessWidget {
       items: invites,
       columns: [
         StandardTableColumn(
-            label: '#', columnWidth: const FixedColumnWidth(60)),
+            label: '#', columnWidth: const FixedColumnWidth(60),),
         StandardTableColumn(
           label: tr.code_list_header_code,
           columnWidth:
@@ -66,7 +66,7 @@ class StudyInvitesTable extends StatelessWidget {
   }
 
   List<Widget> _buildRow(BuildContext context, StudyInvite item, int rowIdx,
-      Set<WidgetState> states) {
+      Set<WidgetState> states,) {
     final theme = Theme.of(context);
     final mutedTextStyle = ThemeConfig.bodyTextBackground(theme);
 
diff --git a/designer_v2/lib/features/recruit/study_recruit_page.dart b/designer_v2/lib/features/recruit/study_recruit_page.dart
index 5ba14261d..227e7aa13 100644
--- a/designer_v2/lib/features/recruit/study_recruit_page.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_page.dart
@@ -58,7 +58,7 @@ class StudyRecruitScreen extends StudyPageWidget {
     return Row(
       children: [
         SelectableText(tr.code_list_section_title,
-            style: Theme.of(context).textTheme.headlineSmall),
+            style: Theme.of(context).textTheme.headlineSmall,),
         Container(width: 32.0),
         _newInviteCodeButton(context, ref),
         Container(width: 32.0),
@@ -83,7 +83,7 @@ class StudyRecruitScreen extends StudyPageWidget {
   }
 
   Null Function(StudyInvite invite) _onSelectInvite(
-      BuildContext context, WidgetRef ref) {
+      BuildContext context, WidgetRef ref,) {
     // TODO: refactor to use [RoutingIntent] for sidesheet (so that it can be triggered from controller)
     return (StudyInvite invite) {
       final formViewModel = ref.read(inviteCodeFormViewModelProvider(studyId));
diff --git a/designer_v2/lib/features/study/study_test_controller.dart b/designer_v2/lib/features/study/study_test_controller.dart
index 70f53b48e..b298ebb4c 100644
--- a/designer_v2/lib/features/study/study_test_controller.dart
+++ b/designer_v2/lib/features/study/study_test_controller.dart
@@ -26,7 +26,7 @@ class StudyTestController
           ),
         ) {
     state = state.copyWith(
-        serializedSession: authRepository.serializedSession ?? '');
+        serializedSession: authRepository.serializedSession ?? '',);
   }
 
   final IAuthRepository authRepository;
@@ -65,7 +65,7 @@ final studyTestPlatformControllerProvider =
   if (!kIsWeb) {
     // Mobile could be built with the webview_flutter package
     throw Exception(
-        "The StudyU designer only support the web platform".hardcoded);
+        "The StudyU designer only support the web platform".hardcoded,);
   } else {
     // Desktop and Web
     platformController = WebController(state.appUrl, studyId);
diff --git a/designer_v2/lib/features/study/study_test_frame_controllers.dart b/designer_v2/lib/features/study/study_test_frame_controllers.dart
index 4fe04e609..b5f21a72e 100644
--- a/designer_v2/lib/features/study/study_test_frame_controllers.dart
+++ b/designer_v2/lib/features/study/study_test_frame_controllers.dart
@@ -115,7 +115,7 @@ class WebController extends PlatformController {
         navigate(
             route: routeInformation.route,
             extra: routeInformation.extra,
-            cmd: cmd);
+            cmd: cmd,);
         return;
       }
       navigate(route: routeInformation.route, cmd: cmd);
diff --git a/designer_v2/lib/localization/language_picker.dart b/designer_v2/lib/localization/language_picker.dart
index 13aaf59ad..5ee3cad1b 100644
--- a/designer_v2/lib/localization/language_picker.dart
+++ b/designer_v2/lib/localization/language_picker.dart
@@ -75,7 +75,7 @@ class _LanguagePickerState extends ConsumerState<LanguagePicker> {
         PopupMenuItem(
           value: locale,
           child: Text(
-              '${getEmojiFlag(countryCode)}  ${translateLocaleName(locale: locale)}'),
+              '${getEmojiFlag(countryCode)}  ${translateLocaleName(locale: locale)}',),
         ),
       );
     });
@@ -83,7 +83,7 @@ class _LanguagePickerState extends ConsumerState<LanguagePicker> {
   }
 
   List<DropdownMenuItem<Locale>> _buildLanguageOptionsField(
-      BuildContext context) {
+      BuildContext context,) {
     final List<DropdownMenuItem<Locale>> options = [];
     Config.supportedLocales.forEach((languageCode, countryCode) {
       final locale = Locale(languageCode, countryCode);
@@ -91,7 +91,7 @@ class _LanguagePickerState extends ConsumerState<LanguagePicker> {
         DropdownMenuItem(
           value: locale,
           child: Text(
-              '${getEmojiFlag(countryCode)} ${translateLocaleName(locale: locale)}'),
+              '${getEmojiFlag(countryCode)} ${translateLocaleName(locale: locale)}',),
         ),
       );
     });
diff --git a/designer_v2/lib/localization/locale_providers.dart b/designer_v2/lib/localization/locale_providers.dart
index 652b0057a..17db240fe 100644
--- a/designer_v2/lib/localization/locale_providers.dart
+++ b/designer_v2/lib/localization/locale_providers.dart
@@ -29,4 +29,4 @@ final localeProvider = Provider<Locale>((ref) {
 
 final localeStateProvider =
     StateNotifierProvider<LocaleStateNotifier, LocaleState>(
-        (ref) => LocaleStateNotifier(ref));
+        (ref) => LocaleStateNotifier(ref),);
diff --git a/designer_v2/lib/localization/platform_locale/platform_locale_stub.dart b/designer_v2/lib/localization/platform_locale/platform_locale_stub.dart
index 2532fd882..694451300 100644
--- a/designer_v2/lib/localization/platform_locale/platform_locale_stub.dart
+++ b/designer_v2/lib/localization/platform_locale/platform_locale_stub.dart
@@ -1,4 +1,4 @@
 import 'package:studyu_designer_v2/localization/platform_locale/platform_locale_interface.dart';
 
 PlatformLocale getImplementation() => throw UnsupportedError(
-    'Cannot get Platform Locale without dart:html or package:shared_preferences');
+    'Cannot get Platform Locale without dart:html or package:shared_preferences',);
diff --git a/designer_v2/lib/repositories/auth_repository.dart b/designer_v2/lib/repositories/auth_repository.dart
index da26d716a..e4bf33201 100644
--- a/designer_v2/lib/repositories/auth_repository.dart
+++ b/designer_v2/lib/repositories/auth_repository.dart
@@ -17,9 +17,9 @@ abstract class IAuthRepository extends IAppDelegate {
   late bool allowPasswordReset = false;
   Stream<User?> watchAuthStateChanges({bool emitLastEvent});
   Future<AuthResponse> signUp(
-      {required String email, required String password});
+      {required String email, required String password,});
   Future<AuthResponse> signInWith(
-      {required String email, required String password});
+      {required String email, required String password,});
   Future<void> signOut();
   Future<void> resetPasswordForEmail({required String email});
   Future<UserResponse> updateUser({required String newPassword});
@@ -110,15 +110,15 @@ class AuthRepository implements IAuthRepository {
 
   @override
   Future<AuthResponse> signUp(
-      {required String email, required String password}) async {
+      {required String email, required String password,}) async {
     return await authClient.signUp(email: email, password: password);
   }
 
   @override
   Future<AuthResponse> signInWith(
-      {required String email, required String password}) async {
+      {required String email, required String password,}) async {
     return await authClient.signInWithPassword(
-        email: email, password: password);
+        email: email, password: password,);
   }
 
   @override
diff --git a/designer_v2/lib/repositories/study_repository.dart b/designer_v2/lib/repositories/study_repository.dart
index 9900ea64b..798d8dc0a 100644
--- a/designer_v2/lib/repositories/study_repository.dart
+++ b/designer_v2/lib/repositories/study_repository.dart
@@ -31,7 +31,7 @@ class StudyRepository extends ModelRepository<Study>
     required this.authRepository,
     required this.ref,
   }) : super(StudyRepositoryDelegate(
-            apiClient: apiClient, authRepository: authRepository));
+            apiClient: apiClient, authRepository: authRepository,),);
 
   /// Reference to the StudyU API injected via Riverpod
   final StudyUApi apiClient;
@@ -104,7 +104,7 @@ class StudyRepository extends ModelRepository<Study>
     Future<void> onDeleteCallback() {
       return delete(model.id)
           .then((value) =>
-              ref.read(routerProvider).dispatch(RoutingIntents.studies))
+              ref.read(routerProvider).dispatch(RoutingIntents.studies),)
           .then(
             (value) => Future.delayed(
               const Duration(milliseconds: 200),
@@ -133,7 +133,7 @@ class StudyRepository extends ModelRepository<Study>
         label: StudyActionType.duplicateDraft.string,
         onExecute: () {
           return duplicateAndSave(model).then((value) =>
-              ref.read(routerProvider).dispatch(RoutingIntents.studies));
+              ref.read(routerProvider).dispatch(RoutingIntents.studies),);
         },
         isAvailable:
             model.status != StudyStatus.draft && model.canCopy(currentUser),
@@ -143,7 +143,7 @@ class StudyRepository extends ModelRepository<Study>
         label: StudyActionType.duplicate.string,
         onExecute: () {
           return duplicateAndSave(model).then((value) =>
-              ref.read(routerProvider).dispatch(RoutingIntents.studies));
+              ref.read(routerProvider).dispatch(RoutingIntents.studies),);
         },
         isAvailable:
             model.status == StudyStatus.draft && model.canCopy(currentUser),
@@ -194,7 +194,7 @@ class StudyRepository extends ModelRepository<Study>
 
 class StudyRepositoryDelegate extends IModelRepositoryDelegate<Study> {
   StudyRepositoryDelegate(
-      {required this.apiClient, required this.authRepository});
+      {required this.apiClient, required this.authRepository,});
 
   final StudyUApi apiClient;
   final IAuthRepository authRepository;
diff --git a/designer_v2/lib/repositories/supabase_client.dart b/designer_v2/lib/repositories/supabase_client.dart
index a99f48123..a1ad0974c 100644
--- a/designer_v2/lib/repositories/supabase_client.dart
+++ b/designer_v2/lib/repositories/supabase_client.dart
@@ -14,7 +14,7 @@ abstract class SupabaseClientDependant {
 /// with an associated [PostgrestError]
 class SupabaseQueryError implements Exception {
   SupabaseQueryError(
-      {required this.statusCode, required this.message, this.details});
+      {required this.statusCode, required this.message, this.details,});
 
   /// Status code of the erroneous [PostgrestResponse]
   final String? statusCode;
@@ -33,7 +33,7 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
   // - Networking
 
   Future<List<T>> deleteAll<T extends SupabaseObject>(
-      Map<String, Object> selectionCriteria) async {
+      Map<String, Object> selectionCriteria,) async {
     try {
       final data = await supabaseClient
           .from(tableName(T))
@@ -45,12 +45,12 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
       throw SupabaseQueryError(
           statusCode: error.code,
           message: error.message,
-          details: error.details);
+          details: error.details,);
     }
   }
 
   Future<List<T>> getAll<T extends SupabaseObject>(
-      {List<String> selectedColumns = const ['*']}) async {
+      {List<String> selectedColumns = const ['*'],}) async {
     try {
       final data = await supabaseClient
           .from(tableName(T))
@@ -60,12 +60,12 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
       throw SupabaseQueryError(
           statusCode: error.code,
           message: error.message,
-          details: error.details);
+          details: error.details,);
     }
   }
 
   Future<T> getById<T extends SupabaseObject>(String id,
-      {List<String> selectedColumns = const ['*']}) async {
+      {List<String> selectedColumns = const ['*'],}) async {
     return getByColumn('id', id, selectedColumns: selectedColumns);
   }
 
@@ -85,7 +85,7 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
       throw SupabaseQueryError(
           statusCode: error.code,
           message: error.message,
-          details: error.details);
+          details: error.details,);
     }
   }
 
diff --git a/designer_v2/lib/routing/router_config.dart b/designer_v2/lib/routing/router_config.dart
index 79d01b3a5..0a3a253fc 100644
--- a/designer_v2/lib/routing/router_config.dart
+++ b/designer_v2/lib/routing/router_config.dart
@@ -140,7 +140,7 @@ class RouterConf {
           router.namedLocation(
         'studyEdit',
         pathParameters: {
-          RouteParams.studyId: state.pathParameters[RouteParams.studyId]!
+          RouteParams.studyId: state.pathParameters[RouteParams.studyId]!,
         },
       ),
     ),
@@ -151,7 +151,7 @@ class RouterConf {
           router.namedLocation(
         'studyEditInfo',
         pathParameters: {
-          RouteParams.studyId: state.pathParameters[RouteParams.studyId]!
+          RouteParams.studyId: state.pathParameters[RouteParams.studyId]!,
         },
       ),
     ),
diff --git a/designer_v2/lib/routing/router_utils.dart b/designer_v2/lib/routing/router_utils.dart
index e2d960394..ddf6b823a 100644
--- a/designer_v2/lib/routing/router_utils.dart
+++ b/designer_v2/lib/routing/router_utils.dart
@@ -31,7 +31,7 @@ RouteSettings readCurrentRouteSettingsFrom(BuildContext context) {
 }
 
 CustomTransitionPage<void> buildModalTransitionPage(
-    BuildContext context, GoRouterState state, Widget body) {
+    BuildContext context, GoRouterState state, Widget body,) {
   final theme = Theme.of(context);
 
   return CustomTransitionPage<void>(
diff --git a/designer_v2/lib/services/notification_service.dart b/designer_v2/lib/services/notification_service.dart
index 132ddea4c..e03200814 100644
--- a/designer_v2/lib/services/notification_service.dart
+++ b/designer_v2/lib/services/notification_service.dart
@@ -5,9 +5,9 @@ import 'package:studyu_designer_v2/services/notification_types.dart';
 
 abstract class INotificationService {
   void showMessage(String notificationText,
-      {List<NotificationAction>? actions});
+      {List<NotificationAction>? actions,});
   void show(NotificationIntent notification,
-      {List<NotificationAction>? actions});
+      {List<NotificationAction>? actions,});
   Stream<NotificationIntent> watchNotifications();
   // - Lifecycle
   void dispose();
@@ -34,7 +34,7 @@ class NotificationService implements INotificationService {
 
   @override
   void show(NotificationIntent notification,
-      {List<NotificationAction>? actions}) {
+      {List<NotificationAction>? actions,}) {
     // Register any additional actions passed as callbacks by the calling code
     if (actions != null) {
       for (final action in actions) {
diff --git a/designer_v2/lib/theme.dart b/designer_v2/lib/theme.dart
index 90233ae85..d52e8ae3f 100644
--- a/designer_v2/lib/theme.dart
+++ b/designer_v2/lib/theme.dart
@@ -38,7 +38,7 @@ class ThemeConfig {
   static TextStyle bodyTextBackground(ThemeData theme) => TextStyle(
       fontSize: 14.0,
       height: 1.35,
-      color: theme.colorScheme.onSurface.withOpacity(0.25));
+      color: theme.colorScheme.onSurface.withOpacity(0.25),);
 
   static double iconSplashRadius(ThemeData theme) => 24.0;
 
@@ -93,7 +93,7 @@ class WebTransitionBuilder extends PageTransitionsBuilder {
     return FadeTransition(
       opacity: opacityOldTween.animate(secondaryAnimation),
       child: FadeTransition(
-          opacity: opacityNewTween.animate(animation), child: child),
+          opacity: opacityNewTween.animate(animation), child: child,),
     );
   }
 }
@@ -142,7 +142,7 @@ class ThemeProvider extends InheritedWidget {
 
   Color blend(Color targetColor) {
     return Color(
-        Blend.harmonize(targetColor.value, settings.value.sourceColor.value));
+        Blend.harmonize(targetColor.value, settings.value.sourceColor.value),);
   }
 
   Color source(Color? target) {
@@ -336,31 +336,31 @@ class ThemeProvider extends InheritedWidget {
       bodySmall: TextStyle(
           fontSize: 14.0,
           height: 1.35,
-          color: colors.onSurface.withOpacity(0.9)), // Form Labels
+          color: colors.onSurface.withOpacity(0.9),), // Form Labels
       titleMedium: TextStyle(
           fontSize: 14.0,
           height: 1.35,
-          color: colors.onSurface.withOpacity(0.9)), // TextInput
+          color: colors.onSurface.withOpacity(0.9),), // TextInput
       bodyLarge: TextStyle(
           fontSize: 14.0,
           height: 1.35,
-          color: colors.onSurface.withOpacity(0.9)),
+          color: colors.onSurface.withOpacity(0.9),),
       bodyMedium: TextStyle(
           fontSize: 14.0,
           height: 1.35,
-          color: colors.onSurface.withOpacity(0.8)),
+          color: colors.onSurface.withOpacity(0.8),),
       titleLarge: TextStyle(
-          fontSize: 15.0, color: headlineColor, fontWeight: FontWeight.bold),
+          fontSize: 15.0, color: headlineColor, fontWeight: FontWeight.bold,),
       headlineSmall: TextStyle(
-          fontSize: 18.0, color: headlineColor, fontWeight: FontWeight.bold),
+          fontSize: 18.0, color: headlineColor, fontWeight: FontWeight.bold,),
       headlineMedium: TextStyle(
-          fontSize: 22.0, color: headlineColor, fontWeight: FontWeight.bold),
+          fontSize: 22.0, color: headlineColor, fontWeight: FontWeight.bold,),
       displaySmall: TextStyle(
-          fontSize: 26.0, color: headlineColor, fontWeight: FontWeight.bold),
+          fontSize: 26.0, color: headlineColor, fontWeight: FontWeight.bold,),
       displayMedium: TextStyle(
-          fontSize: 36.0, color: headlineColor, fontWeight: FontWeight.bold),
+          fontSize: 36.0, color: headlineColor, fontWeight: FontWeight.bold,),
       displayLarge: TextStyle(
-          fontSize: 48.0, color: headlineColor, fontWeight: FontWeight.bold),
+          fontSize: 48.0, color: headlineColor, fontWeight: FontWeight.bold,),
     );
   }
 

From 79642c6be372cd6873406c13a78ca49b9145062d Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 9 Jun 2024 16:55:04 +0200
Subject: [PATCH 161/314] chore: format

---
 .../interventions/intervention_task.dart      |  3 +-
 .../interventions/tasks/checkmark_task.dart   |  7 +-
 .../tasks/questionnaire_task.dart             | 14 ++--
 .../questionnaire/questionnaire_state.dart    |  3 +-
 .../questions/free_text_question.dart         | 22 +++---
 .../questions/scale_question.dart             |  4 +-
 core/lib/src/models/results/result.dart       | 10 ++-
 .../results/intervention_result.dart          |  8 ++-
 .../study_results/results/numeric_result.dart |  3 +-
 core/lib/src/models/tables/repo.dart          | 10 ++-
 core/lib/src/models/tables/study.dart         |  3 +-
 core/lib/src/models/tables/study_subject.dart | 53 ++++++++++----
 core/lib/src/models/tasks/schedule.dart       |  7 +-
 core/lib/src/models/tasks/task.dart           |  4 +-
 core/lib/src/models/tasks/task_instance.dart  | 18 +++--
 core/lib/src/util/analytics.dart              |  6 +-
 core/lib/src/util/supabase_object.dart        | 25 ++++---
 .../study_schedule/study_schedule_test.dart   | 35 ++++++---
 .../robots/study_interventions_robot.dart     |  3 +-
 .../lib/common_views/action_popup_menu.dart   | 14 ++--
 .../lib/common_views/async_value_widget.dart  | 15 ++--
 designer_v2/lib/common_views/collapse.dart    |  4 +-
 .../lib/common_views/form_table_layout.dart   |  6 +-
 designer_v2/lib/common_views/icons.dart       |  3 +-
 .../lib/common_views/range_slider.dart        | 19 +++--
 .../lib/common_views/sidesheet/sidesheet.dart | 14 ++--
 .../lib/common_views/styling_information.dart | 13 ++--
 .../lib/common_views/text_hyperlink.dart      |  8 ++-
 .../lib/common_views/text_paragraph.dart      |  9 ++-
 designer_v2/lib/common_views/utils.dart       |  8 ++-
 .../features/account/account_settings.dart    |  5 +-
 designer_v2/lib/features/app.dart             |  3 +-
 .../features/dashboard/dashboard_page.dart    | 10 ++-
 .../features/dashboard/dashboard_state.dart   | 68 ++++++++++++------
 .../features/dashboard/studies_filter.dart    | 11 +--
 .../lib/features/dashboard/studies_table.dart | 31 +++++---
 .../enrollment_form_controller.dart           |  7 +-
 .../enrollment/enrollment_form_data.dart      |  7 +-
 .../screener_question_form_controller.dart    |  6 +-
 .../screener_question_logic_form_view.dart    |  7 +-
 .../interventions/intervention_form_data.dart |  6 +-
 .../intervention_task_form_controller.dart    | 12 ++--
 .../interventions_form_data.dart              | 12 ++--
 .../study_schedule_form_controller_mixin.dart | 24 +++++--
 .../measurements/measurements_form_data.dart  |  7 +-
 .../measurements/measurements_form_view.dart  |  3 +-
 .../measurements/survey/survey_form_data.dart |  7 +-
 .../section/report_item_form_data.dart        |  3 +-
 .../section/report_item_form_view.dart        | 12 ++--
 .../types/average_section_form_view.dart      |  5 +-
 .../section/types/data_reference_editor.dart  |  5 +-
 .../linear_regression_section_form_view.dart  |  5 +-
 .../audio_recording_question_form_view.dart   |  9 ++-
 .../types/free_text_question_form_view.dart   | 27 ++++---
 .../image_capturing_question_form_view.dart   |  6 +-
 .../question/types/question_type.dart         |  3 +-
 .../types/scale_question_form_view.dart       | 20 ++++--
 .../questionnaire_form_data.dart              |  6 +-
 .../schedule/schedule_controls_view.dart      | 28 +++++---
 .../forms/form_view_model_collection.dart     |  8 ++-
 .../publish/study_publish_dialog_success.dart |  4 +-
 .../recruit/invite_code_form_view.dart        |  3 +-
 .../features/recruit/invite_codes_table.dart  | 12 +++-
 .../features/recruit/study_recruit_page.dart  | 10 ++-
 .../features/study/study_test_controller.dart |  6 +-
 .../study/study_test_frame_controllers.dart   |  7 +-
 .../lib/localization/language_picker.dart     |  9 ++-
 .../lib/localization/locale_providers.dart    |  3 +-
 .../platform_locale/platform_locale_stub.dart |  3 +-
 .../lib/repositories/auth_repository.dart     | 28 +++++---
 .../lib/repositories/study_repository.dart    | 32 ++++++---
 .../lib/repositories/supabase_client.dart     | 42 ++++++-----
 designer_v2/lib/routing/router_utils.dart     |  5 +-
 .../lib/services/notification_service.dart    | 18 +++--
 designer_v2/lib/theme.dart                    | 72 +++++++++++++------
 75 files changed, 656 insertions(+), 312 deletions(-)

diff --git a/core/lib/src/models/interventions/intervention_task.dart b/core/lib/src/models/interventions/intervention_task.dart
index 4fdb6581f..b637b2aaf 100644
--- a/core/lib/src/models/interventions/intervention_task.dart
+++ b/core/lib/src/models/interventions/intervention_task.dart
@@ -3,7 +3,8 @@ import 'package:studyu_core/src/models/tasks/task.dart';
 import 'package:studyu_core/src/models/unknown_json_type_error.dart';
 
 typedef InterventionTaskParser = InterventionTask Function(
-    Map<String, dynamic> data,);
+  Map<String, dynamic> data,
+);
 
 abstract class InterventionTask extends Task {
   InterventionTask(super.type);
diff --git a/core/lib/src/models/interventions/tasks/checkmark_task.dart b/core/lib/src/models/interventions/tasks/checkmark_task.dart
index 6330fd2b6..df5d86fbc 100644
--- a/core/lib/src/models/interventions/tasks/checkmark_task.dart
+++ b/core/lib/src/models/interventions/tasks/checkmark_task.dart
@@ -21,9 +21,12 @@ class CheckmarkTask extends InterventionTask {
 
   @override
   Map<DateTime, T> extractPropertyResults<T>(
-      String property, List<SubjectProgress> sourceResults,) {
+    String property,
+    List<SubjectProgress> sourceResults,
+  ) {
     throw ArgumentError(
-        "$runtimeType does not have a property named '$property'.",);
+      "$runtimeType does not have a property named '$property'.",
+    );
   }
 
   @override
diff --git a/core/lib/src/models/observations/tasks/questionnaire_task.dart b/core/lib/src/models/observations/tasks/questionnaire_task.dart
index 01b188cc0..6a77136dd 100644
--- a/core/lib/src/models/observations/tasks/questionnaire_task.dart
+++ b/core/lib/src/models/observations/tasks/questionnaire_task.dart
@@ -23,19 +23,25 @@ class QuestionnaireTask extends Observation {
 
   @override
   Map<DateTime, T> extractPropertyResults<T>(
-      String property, List<SubjectProgress> sourceResults,) {
+    String property,
+    List<SubjectProgress> sourceResults,
+  ) {
     final Question? targetQuestion =
         questions.questions.firstWhereOrNull((q) => q.id == property);
     if (targetQuestion == null) {
       throw ArgumentError(
-          "Questionnaire '$id' does not have a question with '$property'.",);
+        "Questionnaire '$id' does not have a question with '$property'.",
+      );
     }
     return Map.fromEntries(
-      sourceResults.map((e) => MapEntry(
+      sourceResults.map(
+        (e) => MapEntry(
           e.completedAt!,
           (e.result as Result<QuestionnaireState>)
               .result
-              .getAnswer<T>(property),),),
+              .getAnswer<T>(property),
+        ),
+      ),
     );
   }
 
diff --git a/core/lib/src/models/questionnaire/questionnaire_state.dart b/core/lib/src/models/questionnaire/questionnaire_state.dart
index f7a9a95e7..76aa90241 100644
--- a/core/lib/src/models/questionnaire/questionnaire_state.dart
+++ b/core/lib/src/models/questionnaire/questionnaire_state.dart
@@ -23,7 +23,8 @@ class QuestionnaireState {
       return answer.response;
     } else {
       throw ArgumentError(
-          "'Answer<$T>' requested but found '${answer.runtimeType}'.",);
+        "'Answer<$T>' requested but found '${answer.runtimeType}'.",
+      );
     }
   }
 }
diff --git a/core/lib/src/models/questionnaire/questions/free_text_question.dart b/core/lib/src/models/questionnaire/questions/free_text_question.dart
index 0f76fa7ea..c3b8a351e 100644
--- a/core/lib/src/models/questionnaire/questions/free_text_question.dart
+++ b/core/lib/src/models/questionnaire/questions/free_text_question.dart
@@ -19,17 +19,17 @@ class FreeTextQuestion extends Question<String> {
   @JsonKey(name: 'customTypeExpression')
   String? customTypeExpression;
 
-  FreeTextQuestion(
-      {required this.textType,
-      required this.lengthRange,
-      this.customTypeExpression,})
-      : super(questionType);
-
-  FreeTextQuestion.withId(
-      {required this.textType,
-      required this.lengthRange,
-      this.customTypeExpression,})
-      : super.withId(questionType);
+  FreeTextQuestion({
+    required this.textType,
+    required this.lengthRange,
+    this.customTypeExpression,
+  }) : super(questionType);
+
+  FreeTextQuestion.withId({
+    required this.textType,
+    required this.lengthRange,
+    this.customTypeExpression,
+  }) : super.withId(questionType);
 
   factory FreeTextQuestion.fromJson(Map<String, dynamic> json) =>
       _$FreeTextQuestionFromJson(json);
diff --git a/core/lib/src/models/questionnaire/questions/scale_question.dart b/core/lib/src/models/questionnaire/questions/scale_question.dart
index fa8d97ab9..23912cf7b 100644
--- a/core/lib/src/models/questionnaire/questions/scale_question.dart
+++ b/core/lib/src/models/questionnaire/questions/scale_question.dart
@@ -252,7 +252,9 @@ class ScaleQuestion extends SliderQuestion
     int numValuesGenerated = 10,
   }) {
     final int midValueStepSize = getAutostepSize(
-        scaleMaxValue: scaleMinValue, numValuesGenerated: numValuesGenerated,);
+      scaleMaxValue: scaleMinValue,
+      numValuesGenerated: numValuesGenerated,
+    );
     final List<int> midValues = [];
 
     for (int midValue = scaleMinValue + midValueStepSize;
diff --git a/core/lib/src/models/results/result.dart b/core/lib/src/models/results/result.dart
index 4c9c80df6..885248d3e 100644
--- a/core/lib/src/models/results/result.dart
+++ b/core/lib/src/models/results/result.dart
@@ -19,15 +19,19 @@ class Result<T> {
 
   Result(this.type);
 
-  Result.app(
-      {required this.type, required this.periodId, required this.result,});
+  Result.app({
+    required this.type,
+    required this.periodId,
+    required this.result,
+  });
 
   factory Result.parseJson(Map<String, dynamic> json) => _$ResultFromJson(json);
 
   factory Result.fromJson(Map<String, dynamic> json) => switch (json[keyType]) {
         'QuestionnaireState' => Result<QuestionnaireState>.parseJson(json)
           ..result = QuestionnaireState.fromJson(
-              List<Map<String, dynamic>>.from(json[keyResult] as List),),
+            List<Map<String, dynamic>>.from(json[keyResult] as List),
+          ),
         'bool' => Result<bool>.parseJson(json)
           ..result = json[keyResult] as bool,
         _ => throw UnknownJsonTypeError(json[keyType]),
diff --git a/core/lib/src/models/study_results/results/intervention_result.dart b/core/lib/src/models/study_results/results/intervention_result.dart
index 28305365c..36b946831 100644
--- a/core/lib/src/models/study_results/results/intervention_result.dart
+++ b/core/lib/src/models/study_results/results/intervention_result.dart
@@ -31,8 +31,12 @@ class InterventionResult extends StudyResult {
   @override
   List getValues(StudySubject subject) {
     return subject.interventionOrder
-        .expand((intervention) => List<String>.filled(
-            subject.study.schedule.phaseDuration, intervention,),)
+        .expand(
+          (intervention) => List<String>.filled(
+            subject.study.schedule.phaseDuration,
+            intervention,
+          ),
+        )
         .toList();
   }
 }
diff --git a/core/lib/src/models/study_results/results/numeric_result.dart b/core/lib/src/models/study_results/results/numeric_result.dart
index c4b81999f..8529e998a 100644
--- a/core/lib/src/models/study_results/results/numeric_result.dart
+++ b/core/lib/src/models/study_results/results/numeric_result.dart
@@ -34,7 +34,8 @@ class NumericResult extends StudyResult {
   @override
   List getValues(StudySubject subject) {
     final resultSet = resultProperty.retrieveFromResults(subject).map<int, num>(
-        (key, value) => MapEntry(subject.getDayOfStudyFor(key), value),);
+          (key, value) => MapEntry(subject.getDayOfStudyFor(key), value),
+        );
     final numberOfDays = subject.study.schedule.getNumberOfPhases() *
         subject.study.schedule.phaseDuration;
     return Iterable<int>.generate(numberOfDays)
diff --git a/core/lib/src/models/tables/repo.dart b/core/lib/src/models/tables/repo.dart
index 8db1dea80..830825d94 100644
--- a/core/lib/src/models/tables/repo.dart
+++ b/core/lib/src/models/tables/repo.dart
@@ -26,8 +26,14 @@ class Repo extends SupabaseObjectFunctions<Repo> {
   @JsonKey(name: 'git_url')
   String? gitUrl;
 
-  Repo(this.projectId, this.userId, this.studyId, this.provider, this.webUrl,
-      this.gitUrl,);
+  Repo(
+    this.projectId,
+    this.userId,
+    this.studyId,
+    this.provider,
+    this.webUrl,
+    this.gitUrl,
+  );
 
   factory Repo.fromJson(Map<String, dynamic> json) => _$RepoFromJson(json);
 
diff --git a/core/lib/src/models/tables/study.dart b/core/lib/src/models/tables/study.dart
index 37b728a6f..4035bf495 100644
--- a/core/lib/src/models/tables/study.dart
+++ b/core/lib/src/models/tables/study.dart
@@ -240,7 +240,8 @@ class Study extends SupabaseObjectFunctions<Study>
       final response =
           await env.client.from(tableName).select().eq('participation', 'open');
       final extracted = SupabaseQuery.extractSupabaseList<Study>(
-          List<Map<String, dynamic>>.from(response),);
+        List<Map<String, dynamic>>.from(response),
+      );
       result = ExtractionSuccess<Study>(extracted);
     } on ExtractionFailedException<Study> catch (error) {
       result = error;
diff --git a/core/lib/src/models/tables/study_subject.dart b/core/lib/src/models/tables/study_subject.dart
index e2826d59b..ceb568f24 100644
--- a/core/lib/src/models/tables/study_subject.dart
+++ b/core/lib/src/models/tables/study_subject.dart
@@ -40,7 +40,11 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   late List<SubjectProgress> progress = [];
 
   StudySubject(
-      this.id, this.studyId, this.userId, this.selectedInterventionIds,);
+    this.id,
+    this.studyId,
+    this.userId,
+    this.selectedInterventionIds,
+  );
 
   factory StudySubject.fromJson(Map<String, dynamic> json) {
     final subject = _$StudySubjectFromJson(json);
@@ -64,8 +68,11 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   Map<String, dynamic> toJson() => _$StudySubjectToJson(this);
 
   StudySubject.fromStudy(
-      this.study, this.userId, this.selectedInterventionIds, this.inviteCode,)
-      : id = const Uuid().v4(),
+    this.study,
+    this.userId,
+    this.selectedInterventionIds,
+    this.inviteCode,
+  )   : id = const Uuid().v4(),
         studyId = study.id;
 
   List<String> get interventionOrder => [
@@ -79,7 +86,8 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
     final selectedInterventions = selectedInterventionIds
         .map(
           (selectedInterventionId) => study.interventions.singleWhere(
-              (intervention) => intervention.id == selectedInterventionId,),
+            (intervention) => intervention.id == selectedInterventionId,
+          ),
         )
         .toList();
     if (study.schedule.includeBaseline) {
@@ -95,12 +103,16 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   int get daysPerIntervention =>
       study.schedule.numberOfCycles * study.schedule.phaseDuration;
 
-  Map<DateTime, List<SubjectProgress>> getResultsByDate(
-      {required String interventionId,}) {
+  Map<DateTime, List<SubjectProgress>> getResultsByDate({
+    required String interventionId,
+  }) {
     final resultsByDate = <DateTime, List<SubjectProgress>>{};
     progress.where((p) => p.interventionId == interventionId).forEach((p) {
       final date = DateTime(
-          p.completedAt!.year, p.completedAt!.month, p.completedAt!.day,);
+        p.completedAt!.year,
+        p.completedAt!.month,
+        p.completedAt!.day,
+      );
       resultsByDate.putIfAbsent(date, () => []);
       resultsByDate[date]!.add(p);
     });
@@ -109,7 +121,8 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
 
   // Day after last intervention
   DateTime endDate(DateTime dt) => dt.add(
-      Duration(days: interventionOrder.length * study.schedule.phaseDuration),);
+        Duration(days: interventionOrder.length * study.schedule.phaseDuration),
+      );
 
   int getDayOfStudyFor(DateTime date) {
     return date.differenceInDays(startedAt!);
@@ -133,8 +146,10 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
 
   List<Intervention> getInterventionsInOrder() {
     return interventionOrder
-        .map((key) => selectedInterventions
-            .firstWhere((intervention) => intervention.id == key),)
+        .map(
+          (key) => selectedInterventions
+              .firstWhere((intervention) => intervention.id == key),
+        )
         .toList();
   }
 
@@ -171,14 +186,18 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   double percentMissedForPhase(int index, DateTime date) {
     if (startOfPhase(index).isAfter(date)) return 0;
 
-    final missedInPhase = min(date.differenceInDays(startOfPhase(index)),
-            study.schedule.phaseDuration,) -
+    final missedInPhase = min(
+          date.differenceInDays(startOfPhase(index)),
+          study.schedule.phaseDuration,
+        ) -
         completedForPhase(index);
     return missedInPhase / study.schedule.phaseDuration;
   }
 
   List<SubjectProgress> getTaskProgressForDay(
-      String taskId, DateTime dateTime,) {
+    String taskId,
+    DateTime dateTime,
+  ) {
     final List<SubjectProgress> thisTaskProgressToday = [];
     for (final SubjectProgress sp in resultsFor(taskId)) {
       if (sp.subjectId == id && sp.completedAt!.isSameDate(dateTime)) {
@@ -192,7 +211,10 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   /// returns true if a given task has been completed for a specific
   /// completionPeriod on a given day
   bool completedTaskInstanceForDay(
-      String taskId, CompletionPeriod completionPeriod, DateTime dateTime,) {
+    String taskId,
+    CompletionPeriod completionPeriod,
+    DateTime dateTime,
+  ) {
     return getTaskProgressForDay(taskId, dateTime).any(
       (progress) {
         if (progress.result.periodId == null) {
@@ -278,7 +300,8 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
       final response =
           await env.client.from(tableName).upsert(toJson()).select();
       final json = toFullJson(
-          partialJson: List<Map<String, dynamic>>.from(response).single,);
+        partialJson: List<Map<String, dynamic>>.from(response).single,
+      );
       final newSubject = StudySubject.fromJson(json);
       _controller.add(newSubject);
       // print("Saving study subject");
diff --git a/core/lib/src/models/tasks/schedule.dart b/core/lib/src/models/tasks/schedule.dart
index d18d37853..b8ca80110 100644
--- a/core/lib/src/models/tasks/schedule.dart
+++ b/core/lib/src/models/tasks/schedule.dart
@@ -34,8 +34,11 @@ class CompletionPeriod {
   final StudyUTimeOfDay unlockTime;
   final StudyUTimeOfDay lockTime;
 
-  CompletionPeriod(
-      {required this.id, required this.unlockTime, required this.lockTime,});
+  CompletionPeriod({
+    required this.id,
+    required this.unlockTime,
+    required this.lockTime,
+  });
 
   CompletionPeriod.noId({required this.unlockTime, required this.lockTime})
       : id = const Uuid().v4();
diff --git a/core/lib/src/models/tasks/task.dart b/core/lib/src/models/tasks/task.dart
index 80570ae30..1ef7dc641 100644
--- a/core/lib/src/models/tasks/task.dart
+++ b/core/lib/src/models/tasks/task.dart
@@ -25,7 +25,9 @@ abstract class Task {
   }
 
   Map<DateTime, T> extractPropertyResults<T>(
-      String property, List<SubjectProgress> sourceResults,);
+    String property,
+    List<SubjectProgress> sourceResults,
+  );
 
   Map<String, Type> getAvailableProperties();
 
diff --git a/core/lib/src/models/tasks/task_instance.dart b/core/lib/src/models/tasks/task_instance.dart
index ae5dafb87..b57a59821 100644
--- a/core/lib/src/models/tasks/task_instance.dart
+++ b/core/lib/src/models/tasks/task_instance.dart
@@ -6,8 +6,12 @@ class TaskInstance {
 
   TaskInstance(this.task, this.id) : assert(task.id != id);
 
-  factory TaskInstance.fromInstanceId(String taskInstanceId,
-      {StudySubject? subject, Study? study, DateTime? date,}) {
+  factory TaskInstance.fromInstanceId(
+    String taskInstanceId, {
+    StudySubject? subject,
+    Study? study,
+    DateTime? date,
+  }) {
     date ??= DateTime.now();
     final Task tempTask;
     if (subject != null) {
@@ -22,7 +26,10 @@ class TaskInstance {
   }
 
   static Task _taskFromStudy(
-      String taskInstanceId, Study study, DateTime date,) {
+    String taskInstanceId,
+    Study study,
+    DateTime date,
+  ) {
     final tasks = <Task>[
       ...study.observations,
       ...study.interventions
@@ -39,7 +46,10 @@ class TaskInstance {
   }
 
   static Task _taskFromSubject(
-      String taskInstanceId, StudySubject subject, DateTime now,) {
+    String taskInstanceId,
+    StudySubject subject,
+    DateTime now,
+  ) {
     return subject
         .scheduleFor(now)
         .firstWhere((element) => element.id == taskInstanceId)
diff --git a/core/lib/src/util/analytics.dart b/core/lib/src/util/analytics.dart
index d0b00ae95..b02d60489 100644
--- a/core/lib/src/util/analytics.dart
+++ b/core/lib/src/util/analytics.dart
@@ -39,8 +39,10 @@ class StudyUDiagnostics {
     await Sentry.captureMessage(message);
   }
 
-  static void addBreadcrumb(
-      {required String message, required String category,}) {
+  static void addBreadcrumb({
+    required String message,
+    required String category,
+  }) {
     print("[Breadcrumb] $category: $message");
     Sentry.addBreadcrumb(Breadcrumb(message: message, category: category));
   }
diff --git a/core/lib/src/util/supabase_object.dart b/core/lib/src/util/supabase_object.dart
index 61afb5f0f..fbe2b3894 100644
--- a/core/lib/src/util/supabase_object.dart
+++ b/core/lib/src/util/supabase_object.dart
@@ -46,8 +46,8 @@ abstract class SupabaseObjectFunctions<T extends SupabaseObject>
 
   Future<T> save() async {
     return SupabaseQuery.extractSupabaseList<T>(
-            await env.client.from(tableName(T)).upsert(this.toJson()).select(),)
-        .single;
+      await env.client.from(tableName(T)).upsert(this.toJson()).select(),
+    ).single;
   }
 }
 
@@ -57,17 +57,19 @@ class SupabaseQuery {
     List<String> selectedColumns = const ['*'],
   }) async {
     try {
-      return extractSupabaseList(await env.client
-          .from(tableName(T))
-          .select(selectedColumns.join(',')),);
+      return extractSupabaseList(
+        await env.client.from(tableName(T)).select(selectedColumns.join(',')),
+      );
     } catch (error, stacktrace) {
       catchSupabaseException(error, stacktrace);
       rethrow;
     }
   }
 
-  static Future<T> getById<T extends SupabaseObject>(String id,
-      {List<String> selectedColumns = const ['*'],}) async {
+  static Future<T> getById<T extends SupabaseObject>(
+    String id, {
+    List<String> selectedColumns = const ['*'],
+  }) async {
     try {
       return extractSupabaseSingleRow(
         await env.client
@@ -87,7 +89,8 @@ class SupabaseQuery {
   ) async {
     try {
       return SupabaseQuery.extractSupabaseList<T>(
-          await env.client.from(tableName(T)).upsert(batchJson).select(),);
+        await env.client.from(tableName(T)).upsert(batchJson).select(),
+      );
     } catch (error, stacktrace) {
       catchSupabaseException(error, stacktrace);
       rethrow;
@@ -121,7 +124,8 @@ class SupabaseQuery {
   }
 
   static T extractSupabaseSingleRow<T extends SupabaseObject>(
-      Map<String, dynamic> response,) {
+    Map<String, dynamic> response,
+  ) {
     return SupabaseObjectFunctions.fromJson<T>(response);
   }
 
@@ -129,7 +133,8 @@ class SupabaseQuery {
     StudyUDiagnostics.captureException(error, stackTrace: stacktrace);
     if (error is PostgrestException) {
       StudyULogger.fatal(
-          'Caught Postgrest Error: $error\nStacktrace: $stacktrace',);
+        'Caught Postgrest Error: $error\nStacktrace: $stacktrace',
+      );
       throw error;
     } else if (error is SocketException) {
       // StudyULogger.info("App is suspected to be offline");
diff --git a/core/test/model/study_schedule/study_schedule_test.dart b/core/test/model/study_schedule/study_schedule_test.dart
index 69775f99e..da8638139 100644
--- a/core/test/model/study_schedule/study_schedule_test.dart
+++ b/core/test/model/study_schedule/study_schedule_test.dart
@@ -15,10 +15,16 @@ void main() {
 
         final result = schedule.generateWith(0);
 
-        expect(result.sublist(0).take(2).toSet().length, 2,
-            reason: 'A cycle was not complete',);
-        expect(result.sublist(2).take(2).toSet().length, 2,
-            reason: 'A cycle was not complete',);
+        expect(
+          result.sublist(0).take(2).toSet().length,
+          2,
+          reason: 'A cycle was not complete',
+        );
+        expect(
+          result.sublist(2).take(2).toSet().length,
+          2,
+          reason: 'A cycle was not complete',
+        );
       });
 
       test('respects the first intervention', () {
@@ -27,10 +33,16 @@ void main() {
           ..phaseDuration = 7
           ..includeBaseline = false;
 
-        expect(schedule.generateWith(0).first, 0,
-            reason: 'Did not respect first intervention',);
-        expect(schedule.generateWith(1).first, 1,
-            reason: 'Did not respect first intervention',);
+        expect(
+          schedule.generateWith(0).first,
+          0,
+          reason: 'Did not respect first intervention',
+        );
+        expect(
+          schedule.generateWith(1).first,
+          1,
+          reason: 'Did not respect first intervention',
+        );
       });
     }
 
@@ -47,8 +59,11 @@ void main() {
         void checkAlternating(int first) {
           final result = schedule.generateWith(first);
           for (var i = 0; i < result.length - 1; i++) {
-            expect(result[i], isNot(equals(result[i + 1])),
-                reason: 'Phase $i and ${i + 1} have the same intervention',);
+            expect(
+              result[i],
+              isNot(equals(result[i + 1])),
+              reason: 'Phase $i and ${i + 1} have the same intervention',
+            );
           }
         }
 
diff --git a/designer_v2/integration_test/robots/study_interventions_robot.dart b/designer_v2/integration_test/robots/study_interventions_robot.dart
index 4b0509b43..efbea9078 100644
--- a/designer_v2/integration_test/robots/study_interventions_robot.dart
+++ b/designer_v2/integration_test/robots/study_interventions_robot.dart
@@ -37,7 +37,8 @@ class StudyInterventionsRobot {
   }
 
   Future<void> enterInterventionDesciption(
-      String interventionDescription,) async {
+    String interventionDescription,
+  ) async {
     await $(TextField)
         .which<TextField>(
           (widget) =>
diff --git a/designer_v2/lib/common_views/action_popup_menu.dart b/designer_v2/lib/common_views/action_popup_menu.dart
index c7bdaf825..ccdaf7aa7 100644
--- a/designer_v2/lib/common_views/action_popup_menu.dart
+++ b/designer_v2/lib/common_views/action_popup_menu.dart
@@ -73,9 +73,11 @@ class ActionPopUpMenuButton extends StatelessWidget {
         : Icons.more_horiz_rounded;
 
     return PopupMenuButton(
-      icon: Icon(triggerIcon,
-          size: triggerIconSize,
-          color: isHovered ? iconColorHover : iconColorDefault,),
+      icon: Icon(
+        triggerIcon,
+        size: triggerIconSize,
+        color: isHovered ? iconColorHover : iconColorDefault,
+      ),
       enabled: enabled,
       elevation: elevation,
       splashRadius: splashRadius,
@@ -98,8 +100,10 @@ class ActionPopUpMenuButton extends StatelessWidget {
                           action.isDestructive ? Colors.red : iconColorDefault,
                     ),
               title: action.isDestructive
-                  ? Text(action.label,
-                      style: textTheme.copyWith(color: Colors.red),)
+                  ? Text(
+                      action.label,
+                      style: textTheme.copyWith(color: Colors.red),
+                    )
                   : Text(action.label, style: textTheme),
             ),
           );
diff --git a/designer_v2/lib/common_views/async_value_widget.dart b/designer_v2/lib/common_views/async_value_widget.dart
index b9041a1ac..680a46dff 100644
--- a/designer_v2/lib/common_views/async_value_widget.dart
+++ b/designer_v2/lib/common_views/async_value_widget.dart
@@ -4,13 +4,14 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 /// Simple wrapper around [AsyncValue] to render standardized
 /// widgets for different states (loading, error, empty)
 class AsyncValueWidget<T> extends StatelessWidget {
-  const AsyncValueWidget(
-      {super.key,
-      required this.value,
-      required this.data,
-      this.error,
-      this.loading,
-      this.empty,});
+  const AsyncValueWidget({
+    super.key,
+    required this.value,
+    required this.data,
+    this.error,
+    this.loading,
+    this.empty,
+  });
 
   final AsyncValue<T> value;
   final Widget Function(T) data;
diff --git a/designer_v2/lib/common_views/collapse.dart b/designer_v2/lib/common_views/collapse.dart
index 9c303bc49..8b38f9ce8 100644
--- a/designer_v2/lib/common_views/collapse.dart
+++ b/designer_v2/lib/common_views/collapse.dart
@@ -6,7 +6,9 @@ import 'package:studyu_designer_v2/common_views/utils.dart';
 import 'package:studyu_designer_v2/theme.dart';
 
 typedef CollapsibleSectionBuilder = Widget Function(
-    BuildContext context, bool isCollapsed,);
+  BuildContext context,
+  bool isCollapsed,
+);
 
 /// Simple non-animated & more customizable alternative to [ExpansionPanel]
 /// and [ExpansionTile]
diff --git a/designer_v2/lib/common_views/form_table_layout.dart b/designer_v2/lib/common_views/form_table_layout.dart
index 71bd78b5c..64976e95f 100644
--- a/designer_v2/lib/common_views/form_table_layout.dart
+++ b/designer_v2/lib/common_views/form_table_layout.dart
@@ -87,8 +87,10 @@ class FormTableLayout extends StatelessWidget {
         // change the text color for disabled controls
         child: Theme(
           data: theme.copyWith(
-              textTheme: TextTheme(
-                  titleMedium: inputTextTheme.merge(stateColorStyle),),),
+            textTheme: TextTheme(
+              titleMedium: inputTextTheme.merge(stateColorStyle),
+            ),
+          ),
           child: row.input,
         ),
       );
diff --git a/designer_v2/lib/common_views/icons.dart b/designer_v2/lib/common_views/icons.dart
index f7034e661..9169783df 100644
--- a/designer_v2/lib/common_views/icons.dart
+++ b/designer_v2/lib/common_views/icons.dart
@@ -15,7 +15,8 @@ class HelpIcon extends StatelessWidget {
       child: MouseEventsRegion(
         builder: (context, states) {
           final iconColor = theme.iconTheme.color?.withOpacity(
-                  (states.contains(WidgetState.hovered)) ? 0.6 : 0.35,) ??
+                (states.contains(WidgetState.hovered)) ? 0.6 : 0.35,
+              ) ??
               theme.colorScheme.onSurface.withOpacity(0.3);
           return Icon(
             Icons.help_outline_rounded,
diff --git a/designer_v2/lib/common_views/range_slider.dart b/designer_v2/lib/common_views/range_slider.dart
index be043d431..e0ea2bd3f 100644
--- a/designer_v2/lib/common_views/range_slider.dart
+++ b/designer_v2/lib/common_views/range_slider.dart
@@ -32,7 +32,10 @@ class IndicatorRangeSliderThumbShape<T> extends RangeSliderThumbShape {
 
     final Canvas canvas = context.canvas;
     canvas.drawCircle(
-        center, 9, Paint()..color = Theme.of(buildContext).colorScheme.primary,);
+      center,
+      9,
+      Paint()..color = Theme.of(buildContext).colorScheme.primary,
+    );
     final value = thumb == Thumb.start ? start : end;
 
     // Customize the box style
@@ -52,7 +55,9 @@ class IndicatorRangeSliderThumbShape<T> extends RangeSliderThumbShape {
     final textSpan =
         TextSpan(text: text, style: const TextStyle(color: Colors.white));
     final textPainter = TextPainter(
-        text: textSpan, textDirection: textDirection ?? TextDirection.ltr,);
+      text: textSpan,
+      textDirection: textDirection ?? TextDirection.ltr,
+    );
     textPainter.layout();
 
     // Calculate the box size with padding
@@ -64,13 +69,17 @@ class IndicatorRangeSliderThumbShape<T> extends RangeSliderThumbShape {
 
     // Draw the rounded rectangle box with border centered around the text
     final boxOffset = textOffset +
-        Offset(textPainter.width / 2 - boxWidth / 2,
-            textPainter.height / 2 - boxHeight / 2,);
+        Offset(
+          textPainter.width / 2 - boxWidth / 2,
+          textPainter.height / 2 - boxHeight / 2,
+        );
     final boxRect =
         Rect.fromLTWH(boxOffset.dx, boxOffset.dy, boxWidth, boxHeight);
     canvas.drawRRect(RRect.fromRectAndRadius(boxRect, borderRadius), boxPaint);
     canvas.drawRRect(
-        RRect.fromRectAndRadius(boxRect, borderRadius), borderPaint,);
+      RRect.fromRectAndRadius(boxRect, borderRadius),
+      borderPaint,
+    );
 
     // Draw the text inside the box
     textPainter.paint(canvas, textOffset);
diff --git a/designer_v2/lib/common_views/sidesheet/sidesheet.dart b/designer_v2/lib/common_views/sidesheet/sidesheet.dart
index 2f85068ba..2c258073a 100644
--- a/designer_v2/lib/common_views/sidesheet/sidesheet.dart
+++ b/designer_v2/lib/common_views/sidesheet/sidesheet.dart
@@ -35,8 +35,10 @@ class Sidesheet extends StatefulWidget {
           (body != null && tabs == null) || (body == null && tabs != null),
           "Must provide either body or tabs to build sidesheet content",
         ),
-        assert(tabs == null || tabs.length >= 1,
-            "Must provide at least one tab to build sidesheet content",);
+        assert(
+          tabs == null || tabs.length >= 1,
+          "Must provide at least one tab to build sidesheet content",
+        );
 
   final String titleText;
   final Widget? body;
@@ -113,7 +115,10 @@ class _SidesheetState extends State<Sidesheet> {
   }
 
   Container _build(
-      BuildContext context, Widget? body, List<SidesheetTab>? tabs,) {
+    BuildContext context,
+    Widget? body,
+    List<SidesheetTab>? tabs,
+  ) {
     final theme = Theme.of(context);
     final backgroundColor =
         ThemeConfig.sidesheetBackgroundColor(Theme.of(context));
@@ -173,7 +178,8 @@ class _SidesheetState extends State<Sidesheet> {
             if (hasTabs && !isCollapsed)
               Padding(
                 padding: EdgeInsets.symmetric(
-                    horizontal: (widget.bodyPadding?.horizontal ?? 0) * 0.5,),
+                  horizontal: (widget.bodyPadding?.horizontal ?? 0) * 0.5,
+                ),
                 child: TabbedNavbar<SidesheetTab>(
                   tabs: tabs,
                   height: 38.0,
diff --git a/designer_v2/lib/common_views/styling_information.dart b/designer_v2/lib/common_views/styling_information.dart
index 312a9abb0..e7d563aac 100644
--- a/designer_v2/lib/common_views/styling_information.dart
+++ b/designer_v2/lib/common_views/styling_information.dart
@@ -5,8 +5,11 @@ import 'package:studyu_designer_v2/common_views/text_paragraph.dart';
 import 'package:studyu_designer_v2/theme.dart';
 
 class HtmlStylingBanner extends StatelessWidget {
-  const HtmlStylingBanner(
-      {this.isDismissed = false, this.onDismissed, super.key,});
+  const HtmlStylingBanner({
+    this.isDismissed = false,
+    this.onDismissed,
+    super.key,
+  });
 
   final bool isDismissed;
   final Function()? onDismissed;
@@ -44,8 +47,10 @@ class HtmlStylingBanner extends StatelessWidget {
                   TableRow(
                     children: [
                       const Text('Make your text bold'),
-                      Text('<b>Bold text</b>',
-                          style: ThemeConfig.bodyTextMuted(theme),),
+                      Text(
+                        '<b>Bold text</b>',
+                        style: ThemeConfig.bodyTextMuted(theme),
+                      ),
                     ],
                   ),
                   TableRow(
diff --git a/designer_v2/lib/common_views/text_hyperlink.dart b/designer_v2/lib/common_views/text_hyperlink.dart
index 03df43f24..7f6e263d3 100644
--- a/designer_v2/lib/common_views/text_hyperlink.dart
+++ b/designer_v2/lib/common_views/text_hyperlink.dart
@@ -82,9 +82,11 @@ class _HyperlinkState extends State<Hyperlink> {
         if (widget.icon != null) {
           return Row(
             children: [
-              Icon(widget.icon,
-                  color: actualColor,
-                  size: widget.iconSize ?? (textTheme?.fontSize ?? 14.0) + 4.0,),
+              Icon(
+                widget.icon,
+                color: actualColor,
+                size: widget.iconSize ?? (textTheme?.fontSize ?? 14.0) + 4.0,
+              ),
               const SizedBox(width: 2.0),
               textWidget,
             ],
diff --git a/designer_v2/lib/common_views/text_paragraph.dart b/designer_v2/lib/common_views/text_paragraph.dart
index 6af70525d..2d33c09bb 100644
--- a/designer_v2/lib/common_views/text_paragraph.dart
+++ b/designer_v2/lib/common_views/text_paragraph.dart
@@ -1,8 +1,13 @@
 import 'package:flutter/material.dart';
 
 class TextParagraph extends StatelessWidget {
-  TextParagraph(
-      {this.text, this.style, this.selectable = true, this.span, super.key,}) {
+  TextParagraph({
+    this.text,
+    this.style,
+    this.selectable = true,
+    this.span,
+    super.key,
+  }) {
     if (text == null && span == null) {
       throw Exception("Either text or TextSpan has to be provided");
     }
diff --git a/designer_v2/lib/common_views/utils.dart b/designer_v2/lib/common_views/utils.dart
index 7af2afe19..dff1af1e5 100644
--- a/designer_v2/lib/common_views/utils.dart
+++ b/designer_v2/lib/common_views/utils.dart
@@ -2,8 +2,12 @@ import 'package:flutter/widgets.dart';
 
 typedef WidgetDecorator = Widget Function(Widget widget);
 
-List<Widget> withSpacing(List<Widget> widgets,
-    {required double spacing, double? paddingStart, double? paddingEnd,}) {
+List<Widget> withSpacing(
+  List<Widget> widgets, {
+  required double spacing,
+  double? paddingStart,
+  double? paddingEnd,
+}) {
   final List<Widget> results = [];
   if (paddingStart != null) {
     results.add(SizedBox(height: paddingStart, width: paddingStart));
diff --git a/designer_v2/lib/features/account/account_settings.dart b/designer_v2/lib/features/account/account_settings.dart
index b42ebcbe3..508779dfd 100644
--- a/designer_v2/lib/features/account/account_settings.dart
+++ b/designer_v2/lib/features/account/account_settings.dart
@@ -25,8 +25,9 @@ class AccountSettingsDialog extends ConsumerWidget {
                 FormTableRow(
                   label: tr.language,
                   input: const Align(
-                      alignment: Alignment.centerRight,
-                      child: LanguagePicker(),),
+                    alignment: Alignment.centerRight,
+                    child: LanguagePicker(),
+                  ),
                 ),
               ],
             ),
diff --git a/designer_v2/lib/features/app.dart b/designer_v2/lib/features/app.dart
index 883b8ec50..ebe98e2cb 100644
--- a/designer_v2/lib/features/app.dart
+++ b/designer_v2/lib/features/app.dart
@@ -63,7 +63,8 @@ class _AppContentState extends ConsumerState<AppContent> {
   @override
   Widget build(BuildContext context) {
     AppTranslation.init(
-        ref,); // todo Refactor this into initState locale delegate if possible
+      ref,
+    ); // todo Refactor this into initState locale delegate if possible
     final router = ref.watch(routerProvider);
 
     return DynamicColorBuilder(
diff --git a/designer_v2/lib/features/dashboard/dashboard_page.dart b/designer_v2/lib/features/dashboard/dashboard_page.dart
index 98c337221..2f6c1873a 100644
--- a/designer_v2/lib/features/dashboard/dashboard_page.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_page.dart
@@ -64,8 +64,10 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                 ),
               ),
               const SizedBox(width: 28.0),
-              SelectableText(state.visibleListTitle,
-                  style: theme.textTheme.headlineMedium,),
+              SelectableText(
+                state.visibleListTitle,
+                style: theme.textTheme.headlineMedium,
+              ),
               const SizedBox(width: 28.0),
               Expanded(
                 child: Align(
@@ -91,7 +93,9 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
               if (snapshot.hasData) {
                 return AsyncValueWidget<List<Study>>(
                   value: state.displayedStudies(
-                      snapshot.data!.preferences.pinnedStudies, state.query,),
+                    snapshot.data!.preferences.pinnedStudies,
+                    state.query,
+                  ),
                   data: (visibleStudies) => StudiesTable(
                     studies: visibleStudies,
                     pinnedStudies: snapshot.data!.preferences.pinnedStudies,
diff --git a/designer_v2/lib/features/dashboard/dashboard_state.dart b/designer_v2/lib/features/dashboard/dashboard_state.dart
index cfe2a63a4..bdb1afb77 100644
--- a/designer_v2/lib/features/dashboard/dashboard_state.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_state.dart
@@ -45,7 +45,9 @@ class DashboardState extends Equatable {
   /// Wrapped in an [AsyncValue] that mirrors the [studies]' async states,
   /// but resolves to a different subset of studies based on the [studiesFilter]
   AsyncValue<List<Study>> displayedStudies(
-      Set<String> pinnedStudies, String query,) {
+    Set<String> pinnedStudies,
+    String query,
+  ) {
     return studies.when(
       data: (studies) {
         List<Study> updatedStudies =
@@ -70,8 +72,10 @@ class DashboardState extends Equatable {
     return filteredStudies;
   }
 
-  List<Study> sort(
-      {required Set<String> pinnedStudies, List<Study>? studiesToSort,}) {
+  List<Study> sort({
+    required Set<String> pinnedStudies,
+    List<Study>? studiesToSort,
+  }) {
     final sortedStudies = studiesToSort ?? studies.value!;
     switch (sortByColumn) {
       case StudiesTableColumn.title:
@@ -84,51 +88,69 @@ class DashboardState extends Equatable {
         }
       case StudiesTableColumn.status:
         if (sortAscending) {
-          sortedStudies.sort((study, other) =>
-              study.status.index.compareTo(other.status.index),);
+          sortedStudies.sort(
+            (study, other) => study.status.index.compareTo(other.status.index),
+          );
         } else {
-          sortedStudies.sort((study, other) =>
-              other.status.index.compareTo(study.status.index),);
+          sortedStudies.sort(
+            (study, other) => other.status.index.compareTo(study.status.index),
+          );
         }
       case StudiesTableColumn.participation:
         if (sortAscending) {
-          sortedStudies.sort((study, other) =>
-              study.participation.index.compareTo(other.participation.index),);
+          sortedStudies.sort(
+            (study, other) =>
+                study.participation.index.compareTo(other.participation.index),
+          );
         } else {
-          sortedStudies.sort((study, other) =>
-              other.participation.index.compareTo(study.participation.index),);
+          sortedStudies.sort(
+            (study, other) =>
+                other.participation.index.compareTo(study.participation.index),
+          );
         }
       case StudiesTableColumn.createdAt:
         if (sortAscending) {
           sortedStudies.sort(
-              (study, other) => study.createdAt!.compareTo(other.createdAt!),);
+            (study, other) => study.createdAt!.compareTo(other.createdAt!),
+          );
         } else {
           sortedStudies.sort(
-              (study, other) => other.createdAt!.compareTo(study.createdAt!),);
+            (study, other) => other.createdAt!.compareTo(study.createdAt!),
+          );
         }
       case StudiesTableColumn.enrolled:
         if (sortAscending) {
-          sortedStudies.sort((study, other) =>
-              study.participantCount.compareTo(other.participantCount),);
+          sortedStudies.sort(
+            (study, other) =>
+                study.participantCount.compareTo(other.participantCount),
+          );
         } else {
-          sortedStudies.sort((study, other) =>
-              other.participantCount.compareTo(study.participantCount),);
+          sortedStudies.sort(
+            (study, other) =>
+                other.participantCount.compareTo(study.participantCount),
+          );
         }
       case StudiesTableColumn.active:
         if (sortAscending) {
-          sortedStudies.sort((study, other) =>
-              study.activeSubjectCount.compareTo(other.activeSubjectCount),);
+          sortedStudies.sort(
+            (study, other) =>
+                study.activeSubjectCount.compareTo(other.activeSubjectCount),
+          );
         } else {
-          sortedStudies.sort((study, other) =>
-              other.activeSubjectCount.compareTo(study.activeSubjectCount),);
+          sortedStudies.sort(
+            (study, other) =>
+                other.activeSubjectCount.compareTo(study.activeSubjectCount),
+          );
         }
       case StudiesTableColumn.completed:
         if (sortAscending) {
           sortedStudies.sort(
-              (study, other) => study.endedCount.compareTo(other.endedCount),);
+            (study, other) => study.endedCount.compareTo(other.endedCount),
+          );
         } else {
           sortedStudies.sort(
-              (study, other) => other.endedCount.compareTo(study.endedCount),);
+            (study, other) => other.endedCount.compareTo(study.endedCount),
+          );
         }
       case StudiesTableColumn.pin:
       case StudiesTableColumn.action:
diff --git a/designer_v2/lib/features/dashboard/studies_filter.dart b/designer_v2/lib/features/dashboard/studies_filter.dart
index 636d569a8..5e322e627 100644
--- a/designer_v2/lib/features/dashboard/studies_filter.dart
+++ b/designer_v2/lib/features/dashboard/studies_filter.dart
@@ -5,8 +5,10 @@ import 'package:supabase_flutter/supabase_flutter.dart';
 enum StudiesFilter with GoRouteParamEnum { all, owned, shared, public }
 
 extension StudiesFilterByUser on StudiesFilter {
-  Iterable<Study> apply(
-      {required Iterable<Study> studies, required User user,}) {
+  Iterable<Study> apply({
+    required Iterable<Study> studies,
+    required User user,
+  }) {
     switch (this) {
       case StudiesFilter.all:
         return studies;
@@ -16,8 +18,9 @@ extension StudiesFilterByUser on StudiesFilter {
         return studies.where((s) => s.isEditor(user));
       case StudiesFilter.public:
         // show studies published to registry irrespective of their status
-        return studies.where((s) =>
-            s.registryPublished || s.resultSharing == ResultSharing.public,);
+        return studies.where(
+          (s) => s.registryPublished || s.resultSharing == ResultSharing.public,
+        );
     }
   }
 }
diff --git a/designer_v2/lib/features/dashboard/studies_table.dart b/designer_v2/lib/features/dashboard/studies_table.dart
index 6d84a21f9..6003af0f2 100644
--- a/designer_v2/lib/features/dashboard/studies_table.dart
+++ b/designer_v2/lib/features/dashboard/studies_table.dart
@@ -141,63 +141,72 @@ class StudiesTable extends StatelessWidget {
               child: Row(
                 children: [
                   columnDefinitions[0].value.createContainer(
-                      child: _buildColumnHeader(columnDefinitions[0].key),),
+                        child: _buildColumnHeader(columnDefinitions[0].key),
+                      ),
                   SizedBox(
                     width: columnDefinitions[0].value.collapsed
                         ? 0
                         : columnSpacing,
                   ),
                   columnDefinitions[1].value.createContainer(
-                      child: _buildColumnHeader(columnDefinitions[1].key),),
+                        child: _buildColumnHeader(columnDefinitions[1].key),
+                      ),
                   SizedBox(
                     width: columnDefinitions[1].value.collapsed
                         ? 0
                         : columnSpacing,
                   ),
                   columnDefinitions[2].value.createContainer(
-                      child: _buildColumnHeader(columnDefinitions[2].key),),
+                        child: _buildColumnHeader(columnDefinitions[2].key),
+                      ),
                   SizedBox(
                     width: columnDefinitions[2].value.collapsed
                         ? 0
                         : columnSpacing,
                   ),
                   columnDefinitions[3].value.createContainer(
-                      child: _buildColumnHeader(columnDefinitions[3].key),),
+                        child: _buildColumnHeader(columnDefinitions[3].key),
+                      ),
                   SizedBox(
                     width: columnDefinitions[3].value.collapsed
                         ? 0
                         : columnSpacing,
                   ),
                   columnDefinitions[4].value.createContainer(
-                      child: _buildColumnHeader(columnDefinitions[4].key),),
+                        child: _buildColumnHeader(columnDefinitions[4].key),
+                      ),
                   SizedBox(
                     width: columnDefinitions[4].value.collapsed
                         ? 0
                         : columnSpacing,
                   ),
                   columnDefinitions[5].value.createContainer(
-                      child: _buildColumnHeader(columnDefinitions[5].key),),
+                        child: _buildColumnHeader(columnDefinitions[5].key),
+                      ),
                   SizedBox(
                     width: columnDefinitions[5].value.collapsed
                         ? 0
                         : columnSpacing,
                   ),
                   columnDefinitions[6].value.createContainer(
-                      child: _buildColumnHeader(columnDefinitions[6].key),),
+                        child: _buildColumnHeader(columnDefinitions[6].key),
+                      ),
                   SizedBox(
                     width: columnDefinitions[6].value.collapsed
                         ? 0
                         : columnSpacing,
                   ),
                   columnDefinitions[7].value.createContainer(
-                      child: _buildColumnHeader(columnDefinitions[7].key),),
+                        child: _buildColumnHeader(columnDefinitions[7].key),
+                      ),
                   SizedBox(
                     width: columnDefinitions[7].value.collapsed
                         ? 0
                         : columnSpacing,
                   ),
                   columnDefinitions[8].value.createContainer(
-                      child: _buildColumnHeader(columnDefinitions[8].key),),
+                        child: _buildColumnHeader(columnDefinitions[8].key),
+                      ),
                   SizedBox(
                     width: columnDefinitions[8].value.collapsed
                         ? 0
@@ -271,7 +280,9 @@ class StudiesTable extends StatelessWidget {
       onSort: sortable
           ? () {
               dashboardController.setSorting(
-                  column, sortingActive ? !sortAscending : sortAscending,);
+                column,
+                sortingActive ? !sortAscending : sortAscending,
+              );
             }
           : null,
     );
diff --git a/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart b/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart
index 9f0c9ffd9..f1bc0956b 100644
--- a/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart
+++ b/designer_v2/lib/features/design/enrollment/enrollment_form_controller.dart
@@ -61,8 +61,11 @@ class EnrollmentFormViewModel extends FormViewModel<EnrollmentFormData>
   List<FormControlOption<Participation>> get enrollmentTypeControlOptions =>
       Participation.values
           .map(
-            (v) => FormControlOption(v, v.string,
-                description: v.designDescription,),
+            (v) => FormControlOption(
+              v,
+              v.string,
+              description: v.designDescription,
+            ),
           )
           .toList();
 
diff --git a/designer_v2/lib/features/design/enrollment/enrollment_form_data.dart b/designer_v2/lib/features/design/enrollment/enrollment_form_data.dart
index f022c7b48..f82c7a1cd 100644
--- a/designer_v2/lib/features/design/enrollment/enrollment_form_data.dart
+++ b/designer_v2/lib/features/design/enrollment/enrollment_form_data.dart
@@ -20,10 +20,13 @@ class EnrollmentFormData implements IStudyFormData {
     return EnrollmentFormData(
       enrollmentType: study.participation,
       questionnaireFormData: QuestionnaireFormData.fromDomainModel(
-          study.questionnaire, study.eligibilityCriteria,),
+        study.questionnaire,
+        study.eligibilityCriteria,
+      ),
       consentItemsFormData: study.consent
           .map(
-              (consentItem) => ConsentItemFormData.fromDomainModel(consentItem),)
+            (consentItem) => ConsentItemFormData.fromDomainModel(consentItem),
+          )
           .toList(),
     );
   }
diff --git a/designer_v2/lib/features/design/enrollment/screener_question_form_controller.dart b/designer_v2/lib/features/design/enrollment/screener_question_form_controller.dart
index f1042e911..d199b28bf 100644
--- a/designer_v2/lib/features/design/enrollment/screener_question_form_controller.dart
+++ b/designer_v2/lib/features/design/enrollment/screener_question_form_controller.dart
@@ -24,8 +24,10 @@ class ScreenerQuestionFormViewModel extends QuestionFormViewModel
   late final FormArray responseOptionsDisabledArray =
       FormArray(_copyFormControls(answerOptionsArray.controls), disabled: true);
   late final FormArray<bool> responseOptionsLogicControls = FormArray(
-    List.generate(answerOptionsArray.controls.length,
-        (index) => FormControl(value: defaultResponseOptionValidity),),
+    List.generate(
+      answerOptionsArray.controls.length,
+      (index) => FormControl(value: defaultResponseOptionValidity),
+    ),
   );
   late final FormArray<String> responseOptionsLogicDescriptionControls =
       FormArray(
diff --git a/designer_v2/lib/features/design/enrollment/screener_question_logic_form_view.dart b/designer_v2/lib/features/design/enrollment/screener_question_logic_form_view.dart
index ffbc1a1a7..107caaeba 100644
--- a/designer_v2/lib/features/design/enrollment/screener_question_logic_form_view.dart
+++ b/designer_v2/lib/features/design/enrollment/screener_question_logic_form_view.dart
@@ -52,7 +52,8 @@ class ScreenerQuestionLogicFormView extends FormConsumerWidget {
             child: BannerBox(
               style: BannerStyle.info,
               body: TextParagraph(
-                  text: tr.form_array_screener_question_logic_dirty_banner,),
+                text: tr.form_array_screener_question_logic_dirty_banner,
+              ),
               padding:
                   const EdgeInsets.symmetric(horizontal: 18.0, vertical: 12.0),
               noPrefix: true,
@@ -125,8 +126,8 @@ class ScreenerQuestionLogicFormView extends FormConsumerWidget {
     final optionWidget = optionCells[1];
     final logicWidget = Theme(
       data: theme.copyWith(
-          inputDecorationTheme:
-              ThemeConfig.dropdownInputDecorationTheme(theme),),
+        inputDecorationTheme: ThemeConfig.dropdownInputDecorationTheme(theme),
+      ),
       child: ReactiveDropdownField<bool>(
         formControl: logicControl,
         items: formViewModel.logicControlOptions.map((option) {
diff --git a/designer_v2/lib/features/design/interventions/intervention_form_data.dart b/designer_v2/lib/features/design/interventions/intervention_form_data.dart
index 025c9e8d3..4f7a6a329 100644
--- a/designer_v2/lib/features/design/interventions/intervention_form_data.dart
+++ b/designer_v2/lib/features/design/interventions/intervention_form_data.dart
@@ -32,8 +32,10 @@ class InterventionFormData extends IFormData {
       title: intervention.name ?? '',
       description: intervention.description,
       tasksData: intervention.tasks
-          .map((task) =>
-              InterventionTaskFormData.fromDomainModel(task as CheckmarkTask),)
+          .map(
+            (task) =>
+                InterventionTaskFormData.fromDomainModel(task as CheckmarkTask),
+          )
           .toList(),
       iconName: intervention.icon,
     );
diff --git a/designer_v2/lib/features/design/interventions/intervention_task_form_controller.dart b/designer_v2/lib/features/design/interventions/intervention_task_form_controller.dart
index b0ec19395..6cb882da4 100644
--- a/designer_v2/lib/features/design/interventions/intervention_task_form_controller.dart
+++ b/designer_v2/lib/features/design/interventions/intervention_task_form_controller.dart
@@ -20,8 +20,9 @@ class InterventionTaskFormViewModel
     super.delegate,
     super.validationSet = StudyFormValidationSet.draft,
   }) {
-    runAsync(() =>
-        markAsCompletedControl.markAsDisabled(),); // TODO not yet supported
+    runAsync(
+      () => markAsCompletedControl.markAsDisabled(),
+    ); // TODO not yet supported
   }
 
   // - Form fields
@@ -100,8 +101,9 @@ class InterventionTaskFormViewModel
   @override
   InterventionTaskFormViewModel createDuplicate() {
     return InterventionTaskFormViewModel(
-        delegate: delegate,
-        formData: formData?.copy(),
-        validationSet: validationSet,);
+      delegate: delegate,
+      formData: formData?.copy(),
+      validationSet: validationSet,
+    );
   }
 }
diff --git a/designer_v2/lib/features/design/interventions/interventions_form_data.dart b/designer_v2/lib/features/design/interventions/interventions_form_data.dart
index 918f33481..cafdf4da3 100644
--- a/designer_v2/lib/features/design/interventions/interventions_form_data.dart
+++ b/designer_v2/lib/features/design/interventions/interventions_form_data.dart
@@ -4,8 +4,10 @@ import 'package:studyu_designer_v2/features/design/interventions/study_schedule_
 import 'package:studyu_designer_v2/features/design/study_form_data.dart';
 
 class InterventionsFormData implements IStudyFormData {
-  InterventionsFormData(
-      {required this.interventionsData, required this.studyScheduleData,});
+  InterventionsFormData({
+    required this.interventionsData,
+    required this.studyScheduleData,
+  });
 
   final List<InterventionFormData> interventionsData;
   final StudyScheduleFormData studyScheduleData;
@@ -17,8 +19,10 @@ class InterventionsFormData implements IStudyFormData {
   factory InterventionsFormData.fromStudy(Study study) {
     return InterventionsFormData(
       interventionsData: study.interventions
-          .map((intervention) =>
-              InterventionFormData.fromDomainModel(intervention),)
+          .map(
+            (intervention) =>
+                InterventionFormData.fromDomainModel(intervention),
+          )
           .toList(),
       studyScheduleData: StudyScheduleFormData.fromDomainModel(study.schedule),
     );
diff --git a/designer_v2/lib/features/design/interventions/study_schedule_form_controller_mixin.dart b/designer_v2/lib/features/design/interventions/study_schedule_form_controller_mixin.dart
index 966e625a3..509fcd0b5 100644
--- a/designer_v2/lib/features/design/interventions/study_schedule_form_controller_mixin.dart
+++ b/designer_v2/lib/features/design/interventions/study_schedule_form_controller_mixin.dart
@@ -60,13 +60,19 @@ mixin StudyScheduleControls {
         validationMessages: {
           ValidationMessage.required: (error) =>
               tr.form_field_crossover_schedule_num_cycles_range(
-                  kNumCyclesMin, kNumCyclesMax,),
+                kNumCyclesMin,
+                kNumCyclesMax,
+              ),
           ValidationMessage.min: (error) =>
               tr.form_field_crossover_schedule_num_cycles_range(
-                  kNumCyclesMin, kNumCyclesMax,),
+                kNumCyclesMin,
+                kNumCyclesMax,
+              ),
           ValidationMessage.max: (error) =>
               tr.form_field_crossover_schedule_num_cycles_range(
-                  kNumCyclesMin, kNumCyclesMax,),
+                kNumCyclesMin,
+                kNumCyclesMax,
+              ),
         },
       );
 
@@ -82,13 +88,19 @@ mixin StudyScheduleControls {
         validationMessages: {
           ValidationMessage.required: (error) =>
               tr.form_field_crossover_schedule_phase_length_range(
-                  kPhaseDurationMin, kPhaseDurationMax,),
+                kPhaseDurationMin,
+                kPhaseDurationMax,
+              ),
           ValidationMessage.min: (error) =>
               tr.form_field_crossover_schedule_phase_length_range(
-                  kPhaseDurationMin, kPhaseDurationMax,),
+                kPhaseDurationMin,
+                kPhaseDurationMax,
+              ),
           ValidationMessage.max: (error) =>
               tr.form_field_crossover_schedule_phase_length_range(
-                  kPhaseDurationMin, kPhaseDurationMax,),
+                kPhaseDurationMin,
+                kPhaseDurationMax,
+              ),
         },
       );
 
diff --git a/designer_v2/lib/features/design/measurements/measurements_form_data.dart b/designer_v2/lib/features/design/measurements/measurements_form_data.dart
index cf6f7220a..0e6023704 100644
--- a/designer_v2/lib/features/design/measurements/measurements_form_data.dart
+++ b/designer_v2/lib/features/design/measurements/measurements_form_data.dart
@@ -14,8 +14,11 @@ class MeasurementsFormData implements IStudyFormData {
   factory MeasurementsFormData.fromStudy(Study study) {
     return MeasurementsFormData(
       surveyMeasurements: study.observations
-          .map((observation) => MeasurementSurveyFormData.fromDomainModel(
-              observation as QuestionnaireTask,),)
+          .map(
+            (observation) => MeasurementSurveyFormData.fromDomainModel(
+              observation as QuestionnaireTask,
+            ),
+          )
           .toList(),
     );
   }
diff --git a/designer_v2/lib/features/design/measurements/measurements_form_view.dart b/designer_v2/lib/features/design/measurements/measurements_form_view.dart
index 0532845ed..15485ec99 100644
--- a/designer_v2/lib/features/design/measurements/measurements_form_view.dart
+++ b/designer_v2/lib/features/design/measurements/measurements_form_view.dart
@@ -29,7 +29,8 @@ class StudyDesignMeasurementsFormView extends StudyDesignPageWidget {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: <Widget>[
               TextParagraph(
-                  text: tr.form_study_design_measurements_description,),
+                text: tr.form_study_design_measurements_description,
+              ),
               const SizedBox(height: 32.0),
               ReactiveFormConsumer(
                 // [ReactiveFormConsumer] is needed to to rerender when descendant controls are updated
diff --git a/designer_v2/lib/features/design/measurements/survey/survey_form_data.dart b/designer_v2/lib/features/design/measurements/survey/survey_form_data.dart
index 7b02aec72..cf8263b8e 100644
--- a/designer_v2/lib/features/design/measurements/survey/survey_form_data.dart
+++ b/designer_v2/lib/features/design/measurements/survey/survey_form_data.dart
@@ -36,14 +36,17 @@ class MeasurementSurveyFormData extends IFormDataWithSchedule {
   FormDataID get id => measurementId;
 
   factory MeasurementSurveyFormData.fromDomainModel(
-      QuestionnaireTask questionnaireTask,) {
+    QuestionnaireTask questionnaireTask,
+  ) {
     return MeasurementSurveyFormData(
       measurementId: questionnaireTask.id,
       title: questionnaireTask.title ?? '',
       introText: questionnaireTask.header,
       outroText: questionnaireTask.footer,
       questionnaireFormData: QuestionnaireFormData.fromDomainModel(
-          questionnaireTask.questions, [],),
+        questionnaireTask.questions,
+        [],
+      ),
       isTimeLocked: questionnaireTask.schedule.isTimeRestricted,
       timeLockStart: questionnaireTask.schedule.restrictedTimeStart,
       timeLockEnd: questionnaireTask.schedule.restrictedTimeEnd,
diff --git a/designer_v2/lib/features/design/reports/section/report_item_form_data.dart b/designer_v2/lib/features/design/reports/section/report_item_form_data.dart
index 1d08d9cb3..f531edb3a 100644
--- a/designer_v2/lib/features/design/reports/section/report_item_form_data.dart
+++ b/designer_v2/lib/features/design/reports/section/report_item_form_data.dart
@@ -15,7 +15,8 @@ class ReportItemFormData extends IFormData {
   String get id => section.id;
 
   static List<ReportItemFormData> fromDomainModel(
-      ReportSpecification reportSpecification,) {
+    ReportSpecification reportSpecification,
+  ) {
     final List<ReportItemFormData> reportsFormData = [];
     if (reportSpecification.primary != null) {
       reportsFormData.add(
diff --git a/designer_v2/lib/features/design/reports/section/report_item_form_view.dart b/designer_v2/lib/features/design/reports/section/report_item_form_view.dart
index f48fdf366..0d1bfa007 100644
--- a/designer_v2/lib/features/design/reports/section/report_item_form_view.dart
+++ b/designer_v2/lib/features/design/reports/section/report_item_form_view.dart
@@ -13,8 +13,11 @@ import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/theme.dart';
 
 class ReportItemFormView extends StatelessWidget {
-  const ReportItemFormView(
-      {required this.formViewModel, required this.studyId, super.key,});
+  const ReportItemFormView({
+    required this.formViewModel,
+    required this.studyId,
+    super.key,
+  });
 
   final ReportItemFormViewModel formViewModel;
   final StudyID studyId;
@@ -118,8 +121,9 @@ class ReportItemFormView extends StatelessWidget {
               // TODO: extract custom dropdown component with theme + focus fix
               input: Theme(
                 data: theme.copyWith(
-                    inputDecorationTheme:
-                        ThemeConfig.dropdownInputDecorationTheme(theme),),
+                  inputDecorationTheme:
+                      ThemeConfig.dropdownInputDecorationTheme(theme),
+                ),
                 child: ReactiveDropdownField<ReportSectionType>(
                   formControl: formViewModel.sectionTypeControl,
                   items: ReportItemFormViewModel.sectionTypeControlOptions
diff --git a/designer_v2/lib/features/design/reports/section/types/average_section_form_view.dart b/designer_v2/lib/features/design/reports/section/types/average_section_form_view.dart
index 31798bf2b..6dca7a595 100644
--- a/designer_v2/lib/features/design/reports/section/types/average_section_form_view.dart
+++ b/designer_v2/lib/features/design/reports/section/types/average_section_form_view.dart
@@ -46,8 +46,9 @@ class AverageSectionFormView extends ConsumerWidget {
               // TODO: extract custom dropdown component with theme + focus fix
               input: Theme(
                 data: theme.copyWith(
-                    inputDecorationTheme:
-                        ThemeConfig.dropdownInputDecorationTheme(theme),),
+                  inputDecorationTheme:
+                      ThemeConfig.dropdownInputDecorationTheme(theme),
+                ),
                 child: ReactiveDropdownField<TemporalAggregationFormatted>(
                   formControl: formViewModel.temporalAggregationControl,
                   hint: const Text("Select an aggregation value"),
diff --git a/designer_v2/lib/features/design/reports/section/types/data_reference_editor.dart b/designer_v2/lib/features/design/reports/section/types/data_reference_editor.dart
index 91f45987b..38fe32c45 100644
--- a/designer_v2/lib/features/design/reports/section/types/data_reference_editor.dart
+++ b/designer_v2/lib/features/design/reports/section/types/data_reference_editor.dart
@@ -33,8 +33,9 @@ class DataReferenceEditor<T> {
         // TODO: extract custom dropdown component with theme + focus fix
         input: Theme(
           data: theme.copyWith(
-              inputDecorationTheme:
-                  ThemeConfig.dropdownInputDecorationTheme(theme),),
+            inputDecorationTheme:
+                ThemeConfig.dropdownInputDecorationTheme(theme),
+          ),
           child: buildReactiveDropdownField,
         ),
       );
diff --git a/designer_v2/lib/features/design/reports/section/types/linear_regression_section_form_view.dart b/designer_v2/lib/features/design/reports/section/types/linear_regression_section_form_view.dart
index 603050747..1a46f9dbd 100644
--- a/designer_v2/lib/features/design/reports/section/types/linear_regression_section_form_view.dart
+++ b/designer_v2/lib/features/design/reports/section/types/linear_regression_section_form_view.dart
@@ -43,8 +43,9 @@ class LinearRegressionSectionFormView extends ConsumerWidget {
               // TODO: extract custom dropdown component with theme + focus fix
               input: Theme(
                 data: theme.copyWith(
-                    inputDecorationTheme:
-                        ThemeConfig.dropdownInputDecorationTheme(theme),),
+                  inputDecorationTheme:
+                      ThemeConfig.dropdownInputDecorationTheme(theme),
+                ),
                 child: ReactiveDropdownField<ImprovementDirectionFormatted>(
                   formControl: formViewModel.improvementDirectionControl,
                   hint: const Text("Select an improvement direction"),
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/types/audio_recording_question_form_view.dart b/designer_v2/lib/features/design/shared/questionnaire/question/types/audio_recording_question_form_view.dart
index 3165a9662..5df76a73e 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/types/audio_recording_question_form_view.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/types/audio_recording_question_form_view.dart
@@ -6,8 +6,10 @@ import 'package:studyu_designer_v2/features/design/shared/questionnaire/question
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 
 class AudioRecordingQuestionFormView extends ConsumerWidget {
-  const AudioRecordingQuestionFormView(
-      {required this.formViewModel, super.key,});
+  const AudioRecordingQuestionFormView({
+    required this.formViewModel,
+    super.key,
+  });
 
   final QuestionFormViewModel formViewModel;
 
@@ -29,7 +31,8 @@ class AudioRecordingQuestionFormView extends ConsumerWidget {
                       tr.audio_recording_max_duration_rangevalid_min,
                   ValidationMessage.max: (error) =>
                       tr.audio_recording_max_duration_rangevalid_max(
-                          QuestionFormViewModel.kMaxRecordingDurationSeconds,),
+                        QuestionFormViewModel.kMaxRecordingDurationSeconds,
+                      ),
                   ValidationMessage.number: (error) =>
                       tr.free_text_validation_number,
                 },
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/types/free_text_question_form_view.dart b/designer_v2/lib/features/design/shared/questionnaire/question/types/free_text_question_form_view.dart
index 5f8fbdd14..ccdb9d5e5 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/types/free_text_question_form_view.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/types/free_text_question_form_view.dart
@@ -23,8 +23,9 @@ class FreeTextQuestionFormView extends ConsumerWidget {
     final minLength = formViewModel.freeTextLengthControl.value!.start.toInt();
     final maxLength = formViewModel.freeTextLengthControl.value!.end.toInt();
     final type = formViewModel.freeTextTypeControl.value!.string;
-    formViewModel.freeTextLengthControl.onChanged((_) =>
-        formViewModel.freeTextExampleTextControl.updateValueAndValidity(),);
+    formViewModel.freeTextLengthControl.onChanged(
+      (_) => formViewModel.freeTextExampleTextControl.updateValueAndValidity(),
+    );
 
     return Column(
       children: [
@@ -35,7 +36,10 @@ class FreeTextQuestionFormView extends ConsumerWidget {
             child: SliderTheme(
               data: Theme.of(context).sliderTheme.copyWith(
                     rangeThumbShape: IndicatorRangeSliderThumbShape(
-                        context, minLength, maxLength,),
+                      context,
+                      minLength,
+                      maxLength,
+                    ),
                     showValueIndicator: ShowValueIndicator.never,
                   ),
               child: ReactiveRangeSlider<RangeValues>(
@@ -161,8 +165,12 @@ class FreeTextQuestionFormView extends ConsumerWidget {
             ReactiveFormConsumer(
               builder: (context, formGroup, child) {
                 return TextParagraph(
-                    text: tr.free_text_example_explanation(
-                        type, minLength, maxLength,),);
+                  text: tr.free_text_example_explanation(
+                    type,
+                    minLength,
+                    maxLength,
+                  ),
+                );
               },
             ),
           ],
@@ -191,10 +199,11 @@ class FreeTextQuestionFormView extends ConsumerWidget {
     };
   }
 
-  Widget generateRow(
-      {required String label,
-      required String labelHelpText,
-      required Widget input,}) {
+  Widget generateRow({
+    required String label,
+    required String labelHelpText,
+    required Widget input,
+  }) {
     return Row(
       children: [
         Flexible(
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/types/image_capturing_question_form_view.dart b/designer_v2/lib/features/design/shared/questionnaire/question/types/image_capturing_question_form_view.dart
index 6be5213b8..4cdb51329 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/types/image_capturing_question_form_view.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/types/image_capturing_question_form_view.dart
@@ -3,8 +3,10 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_designer_v2/features/design/shared/questionnaire/question/question_form_controller.dart';
 
 class ImageCapturingQuestionFormView extends ConsumerWidget {
-  const ImageCapturingQuestionFormView(
-      {required this.formViewModel, super.key,});
+  const ImageCapturingQuestionFormView({
+    required this.formViewModel,
+    super.key,
+  });
 
   final QuestionFormViewModel formViewModel;
 
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/types/question_type.dart b/designer_v2/lib/features/design/shared/questionnaire/question/types/question_type.dart
index d3e38a6da..416f1adee 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/types/question_type.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/types/question_type.dart
@@ -23,7 +23,8 @@ enum SurveyQuestionType {
     };
     if (!typeMapping.containsKey(question.type)) {
       throw UnimplementedError(
-          "Missing SurveyQuestionType for question of type: ${question.type}",);
+        "Missing SurveyQuestionType for question of type: ${question.type}",
+      );
     }
     return typeMapping[question.type]!;
   }
diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/types/scale_question_form_view.dart b/designer_v2/lib/features/design/shared/questionnaire/question/types/scale_question_form_view.dart
index e99ab8227..68b51dfa1 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/types/scale_question_form_view.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/types/scale_question_form_view.dart
@@ -145,7 +145,10 @@ class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
   }
 
   FormTableRow _buildColorControlRow(
-      BuildContext context, FormControl<Color> control, String labelText,) {
+    BuildContext context,
+    FormControl<Color> control,
+    String labelText,
+  ) {
     final theme = Theme.of(context);
     return FormTableRow(
       control: control,
@@ -162,7 +165,8 @@ class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
               child: Hyperlink(
                 text: "+ ${tr.form_field_response_scale_color_add}",
                 onClick: () => control.value = SerializableColor(
-                    ThemeConfig.colorPickerInitialColor(theme).value,),
+                  ThemeConfig.colorPickerInitialColor(theme).value,
+                ),
                 visitedColor: null,
               ),
             )
@@ -177,7 +181,8 @@ class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
               enableAlpha: false,
               labelTypes: const [],
               pickerHsvColor: HSVColor.fromColor(
-                  control.value ?? ThemeConfig.colorPickerInitialColor(theme),),
+                control.value ?? ThemeConfig.colorPickerInitialColor(theme),
+              ),
             )
           : Opacity(
               // prevent layout shift with disabled hidden placeholder
@@ -201,10 +206,13 @@ class _ScaleQuestionFormViewState extends ConsumerState<ScaleQuestionFormView> {
                     child: BannerBox(
                       style: BannerStyle.info,
                       body: TextParagraph(
-                          text: tr
-                              .form_array_response_scale_mid_values_dirty_banner,),
+                        text: tr
+                            .form_array_response_scale_mid_values_dirty_banner,
+                      ),
                       padding: const EdgeInsets.symmetric(
-                          horizontal: 18.0, vertical: 12.0,),
+                        horizontal: 18.0,
+                        vertical: 12.0,
+                      ),
                       noPrefix: true,
                       isDismissed: !formViewModel.isMidValuesClearedInfoVisible,
                       dismissIconSize: Theme.of(context).iconTheme.size ?? 14.0,
diff --git a/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_data.dart b/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_data.dart
index 00986d308..9d21c871c 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_data.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/questionnaire_form_data.dart
@@ -18,8 +18,10 @@ class QuestionnaireFormData implements IFormData {
               question,
               // Collect all eligibility criteria for this question
               eligibilityCriteria
-                  .where((c) =>
-                      (c.condition as ValueExpression).target == question.id,)
+                  .where(
+                    (c) =>
+                        (c.condition as ValueExpression).target == question.id,
+                  )
                   .toList(),
             ),
           )
diff --git a/designer_v2/lib/features/design/shared/schedule/schedule_controls_view.dart b/designer_v2/lib/features/design/shared/schedule/schedule_controls_view.dart
index f44cd512c..99a1da5c5 100644
--- a/designer_v2/lib/features/design/shared/schedule/schedule_controls_view.dart
+++ b/designer_v2/lib/features/design/shared/schedule/schedule_controls_view.dart
@@ -23,12 +23,14 @@ class ScheduleControls extends FormConsumerWidget {
 
     formViewModel.restrictedTimeStartPickerControl.valueChanges.listen((event) {
       formViewModel.restrictedTimeStartControl.value = Time.fromTimeOfDay(
-          formViewModel.restrictedTimeStartPickerControl.value!,);
+        formViewModel.restrictedTimeStartPickerControl.value!,
+      );
     });
 
     formViewModel.restrictedTimeEndPickerControl.valueChanges.listen((event) {
       formViewModel.restrictedTimeEndControl.value = Time.fromTimeOfDay(
-          formViewModel.restrictedTimeEndPickerControl.value!,);
+        formViewModel.restrictedTimeEndPickerControl.value!,
+      );
     });
 
     return Column(
@@ -69,9 +71,11 @@ class ScheduleControls extends FormConsumerWidget {
                               formControl:
                                   formViewModel.reminderTimePickerControl,
                               initialEntryMode: TimePickerEntryMode.input,
-                              builder: (BuildContext context,
-                                  ReactiveTimePickerDelegate picker,
-                                  Widget? child,) {
+                              builder: (
+                                BuildContext context,
+                                ReactiveTimePickerDelegate picker,
+                                Widget? child,
+                              ) {
                                 return ReactiveTextField<Time>(
                                   formControl:
                                       formViewModel.reminderTimeControl,
@@ -128,8 +132,11 @@ class ScheduleControls extends FormConsumerWidget {
                 child: ReactiveTimePicker(
                   formControl: formViewModel.restrictedTimeStartPickerControl,
                   initialEntryMode: TimePickerEntryMode.input,
-                  builder: (BuildContext context,
-                      ReactiveTimePickerDelegate picker, Widget? child,) {
+                  builder: (
+                    BuildContext context,
+                    ReactiveTimePickerDelegate picker,
+                    Widget? child,
+                  ) {
                     return ReactiveTextField<Time>(
                       formControl: formViewModel.restrictedTimeStartControl,
                       valueAccessor: TimeValueAccessor(),
@@ -161,8 +168,11 @@ class ScheduleControls extends FormConsumerWidget {
                 child: ReactiveTimePicker(
                   formControl: formViewModel.restrictedTimeEndPickerControl,
                   initialEntryMode: TimePickerEntryMode.input,
-                  builder: (BuildContext context,
-                      ReactiveTimePickerDelegate picker, Widget? child,) {
+                  builder: (
+                    BuildContext context,
+                    ReactiveTimePickerDelegate picker,
+                    Widget? child,
+                  ) {
                     return ReactiveTextField<Time>(
                       formControl: formViewModel.restrictedTimeEndControl,
                       valueAccessor: TimeValueAccessor(),
diff --git a/designer_v2/lib/features/forms/form_view_model_collection.dart b/designer_v2/lib/features/forms/form_view_model_collection.dart
index 088fd1304..c49a62aae 100644
--- a/designer_v2/lib/features/forms/form_view_model_collection.dart
+++ b/designer_v2/lib/features/forms/form_view_model_collection.dart
@@ -4,8 +4,12 @@ import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
 
 /// Parent class for [FormViewModel]s that are managed in a [FormViewModelCollection]
 abstract class ManagedFormViewModel<T> extends FormViewModel<T> {
-  ManagedFormViewModel(
-      {super.delegate, super.formData, super.autosave, super.validationSet,});
+  ManagedFormViewModel({
+    super.delegate,
+    super.formData,
+    super.autosave,
+    super.validationSet,
+  });
   ManagedFormViewModel<T> createDuplicate();
 }
 
diff --git a/designer_v2/lib/features/publish/study_publish_dialog_success.dart b/designer_v2/lib/features/publish/study_publish_dialog_success.dart
index 14a25ddf8..a32e8105b 100644
--- a/designer_v2/lib/features/publish/study_publish_dialog_success.dart
+++ b/designer_v2/lib/features/publish/study_publish_dialog_success.dart
@@ -49,7 +49,9 @@ class PublishSuccessDialog extends StudyPageWidget {
                 child: TextButton(
                   child: Padding(
                     padding: const EdgeInsets.symmetric(
-                        vertical: 4.0, horizontal: 8.0,),
+                      vertical: 4.0,
+                      horizontal: 8.0,
+                    ),
                     child: Text(tr.action_button_post_launch_followup_skip),
                   ),
                   onPressed: () => Navigator.maybePop(context),
diff --git a/designer_v2/lib/features/recruit/invite_code_form_view.dart b/designer_v2/lib/features/recruit/invite_code_form_view.dart
index 23e582c15..523198651 100644
--- a/designer_v2/lib/features/recruit/invite_code_form_view.dart
+++ b/designer_v2/lib/features/recruit/invite_code_form_view.dart
@@ -52,7 +52,8 @@ class InviteCodeFormView extends FormConsumerWidget {
         ),
         const SizedBox(height: 4.0),
         TextParagraph(
-            text: tr.form_field_is_preconfigured_schedule_description,),
+          text: tr.form_field_is_preconfigured_schedule_description,
+        ),
         const SizedBox(height: 24.0),
         FormTableLayout(
           rows: [
diff --git a/designer_v2/lib/features/recruit/invite_codes_table.dart b/designer_v2/lib/features/recruit/invite_codes_table.dart
index 827ae2be9..48e7415f0 100644
--- a/designer_v2/lib/features/recruit/invite_codes_table.dart
+++ b/designer_v2/lib/features/recruit/invite_codes_table.dart
@@ -35,7 +35,9 @@ class StudyInvitesTable extends StatelessWidget {
       items: invites,
       columns: [
         StandardTableColumn(
-            label: '#', columnWidth: const FixedColumnWidth(60),),
+          label: '#',
+          columnWidth: const FixedColumnWidth(60),
+        ),
         StandardTableColumn(
           label: tr.code_list_header_code,
           columnWidth:
@@ -65,8 +67,12 @@ class StudyInvitesTable extends StatelessWidget {
     );
   }
 
-  List<Widget> _buildRow(BuildContext context, StudyInvite item, int rowIdx,
-      Set<WidgetState> states,) {
+  List<Widget> _buildRow(
+    BuildContext context,
+    StudyInvite item,
+    int rowIdx,
+    Set<WidgetState> states,
+  ) {
     final theme = Theme.of(context);
     final mutedTextStyle = ThemeConfig.bodyTextBackground(theme);
 
diff --git a/designer_v2/lib/features/recruit/study_recruit_page.dart b/designer_v2/lib/features/recruit/study_recruit_page.dart
index 227e7aa13..fe5841d2b 100644
--- a/designer_v2/lib/features/recruit/study_recruit_page.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_page.dart
@@ -57,8 +57,10 @@ class StudyRecruitScreen extends StudyPageWidget {
   Widget _inviteCodesSectionHeader(BuildContext context, WidgetRef ref) {
     return Row(
       children: [
-        SelectableText(tr.code_list_section_title,
-            style: Theme.of(context).textTheme.headlineSmall,),
+        SelectableText(
+          tr.code_list_section_title,
+          style: Theme.of(context).textTheme.headlineSmall,
+        ),
         Container(width: 32.0),
         _newInviteCodeButton(context, ref),
         Container(width: 32.0),
@@ -83,7 +85,9 @@ class StudyRecruitScreen extends StudyPageWidget {
   }
 
   Null Function(StudyInvite invite) _onSelectInvite(
-      BuildContext context, WidgetRef ref,) {
+    BuildContext context,
+    WidgetRef ref,
+  ) {
     // TODO: refactor to use [RoutingIntent] for sidesheet (so that it can be triggered from controller)
     return (StudyInvite invite) {
       final formViewModel = ref.read(inviteCodeFormViewModelProvider(studyId));
diff --git a/designer_v2/lib/features/study/study_test_controller.dart b/designer_v2/lib/features/study/study_test_controller.dart
index b298ebb4c..f410c4b5b 100644
--- a/designer_v2/lib/features/study/study_test_controller.dart
+++ b/designer_v2/lib/features/study/study_test_controller.dart
@@ -26,7 +26,8 @@ class StudyTestController
           ),
         ) {
     state = state.copyWith(
-        serializedSession: authRepository.serializedSession ?? '',);
+      serializedSession: authRepository.serializedSession ?? '',
+    );
   }
 
   final IAuthRepository authRepository;
@@ -65,7 +66,8 @@ final studyTestPlatformControllerProvider =
   if (!kIsWeb) {
     // Mobile could be built with the webview_flutter package
     throw Exception(
-        "The StudyU designer only support the web platform".hardcoded,);
+      "The StudyU designer only support the web platform".hardcoded,
+    );
   } else {
     // Desktop and Web
     platformController = WebController(state.appUrl, studyId);
diff --git a/designer_v2/lib/features/study/study_test_frame_controllers.dart b/designer_v2/lib/features/study/study_test_frame_controllers.dart
index b5f21a72e..36003b7c1 100644
--- a/designer_v2/lib/features/study/study_test_frame_controllers.dart
+++ b/designer_v2/lib/features/study/study_test_frame_controllers.dart
@@ -113,9 +113,10 @@ class WebController extends PlatformController {
     if (routeInformation.route != null) {
       if (routeInformation.extra != null) {
         navigate(
-            route: routeInformation.route,
-            extra: routeInformation.extra,
-            cmd: cmd,);
+          route: routeInformation.route,
+          extra: routeInformation.extra,
+          cmd: cmd,
+        );
         return;
       }
       navigate(route: routeInformation.route, cmd: cmd);
diff --git a/designer_v2/lib/localization/language_picker.dart b/designer_v2/lib/localization/language_picker.dart
index 5ee3cad1b..e880ace76 100644
--- a/designer_v2/lib/localization/language_picker.dart
+++ b/designer_v2/lib/localization/language_picker.dart
@@ -75,7 +75,8 @@ class _LanguagePickerState extends ConsumerState<LanguagePicker> {
         PopupMenuItem(
           value: locale,
           child: Text(
-              '${getEmojiFlag(countryCode)}  ${translateLocaleName(locale: locale)}',),
+            '${getEmojiFlag(countryCode)}  ${translateLocaleName(locale: locale)}',
+          ),
         ),
       );
     });
@@ -83,7 +84,8 @@ class _LanguagePickerState extends ConsumerState<LanguagePicker> {
   }
 
   List<DropdownMenuItem<Locale>> _buildLanguageOptionsField(
-      BuildContext context,) {
+    BuildContext context,
+  ) {
     final List<DropdownMenuItem<Locale>> options = [];
     Config.supportedLocales.forEach((languageCode, countryCode) {
       final locale = Locale(languageCode, countryCode);
@@ -91,7 +93,8 @@ class _LanguagePickerState extends ConsumerState<LanguagePicker> {
         DropdownMenuItem(
           value: locale,
           child: Text(
-              '${getEmojiFlag(countryCode)} ${translateLocaleName(locale: locale)}',),
+            '${getEmojiFlag(countryCode)} ${translateLocaleName(locale: locale)}',
+          ),
         ),
       );
     });
diff --git a/designer_v2/lib/localization/locale_providers.dart b/designer_v2/lib/localization/locale_providers.dart
index 17db240fe..176ae84e4 100644
--- a/designer_v2/lib/localization/locale_providers.dart
+++ b/designer_v2/lib/localization/locale_providers.dart
@@ -29,4 +29,5 @@ final localeProvider = Provider<Locale>((ref) {
 
 final localeStateProvider =
     StateNotifierProvider<LocaleStateNotifier, LocaleState>(
-        (ref) => LocaleStateNotifier(ref),);
+  (ref) => LocaleStateNotifier(ref),
+);
diff --git a/designer_v2/lib/localization/platform_locale/platform_locale_stub.dart b/designer_v2/lib/localization/platform_locale/platform_locale_stub.dart
index 694451300..4193831b5 100644
--- a/designer_v2/lib/localization/platform_locale/platform_locale_stub.dart
+++ b/designer_v2/lib/localization/platform_locale/platform_locale_stub.dart
@@ -1,4 +1,5 @@
 import 'package:studyu_designer_v2/localization/platform_locale/platform_locale_interface.dart';
 
 PlatformLocale getImplementation() => throw UnsupportedError(
-    'Cannot get Platform Locale without dart:html or package:shared_preferences',);
+      'Cannot get Platform Locale without dart:html or package:shared_preferences',
+    );
diff --git a/designer_v2/lib/repositories/auth_repository.dart b/designer_v2/lib/repositories/auth_repository.dart
index e4bf33201..72a7a614c 100644
--- a/designer_v2/lib/repositories/auth_repository.dart
+++ b/designer_v2/lib/repositories/auth_repository.dart
@@ -16,10 +16,14 @@ abstract class IAuthRepository extends IAppDelegate {
   String? get serializedSession;
   late bool allowPasswordReset = false;
   Stream<User?> watchAuthStateChanges({bool emitLastEvent});
-  Future<AuthResponse> signUp(
-      {required String email, required String password,});
-  Future<AuthResponse> signInWith(
-      {required String email, required String password,});
+  Future<AuthResponse> signUp({
+    required String email,
+    required String password,
+  });
+  Future<AuthResponse> signInWith({
+    required String email,
+    required String password,
+  });
   Future<void> signOut();
   Future<void> resetPasswordForEmail({required String email});
   Future<UserResponse> updateUser({required String newPassword});
@@ -109,16 +113,22 @@ class AuthRepository implements IAuthRepository {
           : _authStateSuppressedController.subject;
 
   @override
-  Future<AuthResponse> signUp(
-      {required String email, required String password,}) async {
+  Future<AuthResponse> signUp({
+    required String email,
+    required String password,
+  }) async {
     return await authClient.signUp(email: email, password: password);
   }
 
   @override
-  Future<AuthResponse> signInWith(
-      {required String email, required String password,}) async {
+  Future<AuthResponse> signInWith({
+    required String email,
+    required String password,
+  }) async {
     return await authClient.signInWithPassword(
-        email: email, password: password,);
+      email: email,
+      password: password,
+    );
   }
 
   @override
diff --git a/designer_v2/lib/repositories/study_repository.dart b/designer_v2/lib/repositories/study_repository.dart
index 798d8dc0a..45aaf8e4f 100644
--- a/designer_v2/lib/repositories/study_repository.dart
+++ b/designer_v2/lib/repositories/study_repository.dart
@@ -30,8 +30,12 @@ class StudyRepository extends ModelRepository<Study>
     required this.apiClient,
     required this.authRepository,
     required this.ref,
-  }) : super(StudyRepositoryDelegate(
-            apiClient: apiClient, authRepository: authRepository,),);
+  }) : super(
+          StudyRepositoryDelegate(
+            apiClient: apiClient,
+            authRepository: authRepository,
+          ),
+        );
 
   /// Reference to the StudyU API injected via Riverpod
   final StudyUApi apiClient;
@@ -103,8 +107,10 @@ class StudyRepository extends ModelRepository<Study>
   List<ModelAction> availableActions(Study model) {
     Future<void> onDeleteCallback() {
       return delete(model.id)
-          .then((value) =>
-              ref.read(routerProvider).dispatch(RoutingIntents.studies),)
+          .then(
+            (value) =>
+                ref.read(routerProvider).dispatch(RoutingIntents.studies),
+          )
           .then(
             (value) => Future.delayed(
               const Duration(milliseconds: 200),
@@ -132,8 +138,10 @@ class StudyRepository extends ModelRepository<Study>
         type: StudyActionType.duplicateDraft,
         label: StudyActionType.duplicateDraft.string,
         onExecute: () {
-          return duplicateAndSave(model).then((value) =>
-              ref.read(routerProvider).dispatch(RoutingIntents.studies),);
+          return duplicateAndSave(model).then(
+            (value) =>
+                ref.read(routerProvider).dispatch(RoutingIntents.studies),
+          );
         },
         isAvailable:
             model.status != StudyStatus.draft && model.canCopy(currentUser),
@@ -142,8 +150,10 @@ class StudyRepository extends ModelRepository<Study>
         type: StudyActionType.duplicate,
         label: StudyActionType.duplicate.string,
         onExecute: () {
-          return duplicateAndSave(model).then((value) =>
-              ref.read(routerProvider).dispatch(RoutingIntents.studies),);
+          return duplicateAndSave(model).then(
+            (value) =>
+                ref.read(routerProvider).dispatch(RoutingIntents.studies),
+          );
         },
         isAvailable:
             model.status == StudyStatus.draft && model.canCopy(currentUser),
@@ -193,8 +203,10 @@ class StudyRepository extends ModelRepository<Study>
 }
 
 class StudyRepositoryDelegate extends IModelRepositoryDelegate<Study> {
-  StudyRepositoryDelegate(
-      {required this.apiClient, required this.authRepository,});
+  StudyRepositoryDelegate({
+    required this.apiClient,
+    required this.authRepository,
+  });
 
   final StudyUApi apiClient;
   final IAuthRepository authRepository;
diff --git a/designer_v2/lib/repositories/supabase_client.dart b/designer_v2/lib/repositories/supabase_client.dart
index a1ad0974c..82c1c0ab7 100644
--- a/designer_v2/lib/repositories/supabase_client.dart
+++ b/designer_v2/lib/repositories/supabase_client.dart
@@ -13,8 +13,11 @@ abstract class SupabaseClientDependant {
 /// An exception that is thrown when Supabase returns a [PostgrestResponse]
 /// with an associated [PostgrestError]
 class SupabaseQueryError implements Exception {
-  SupabaseQueryError(
-      {required this.statusCode, required this.message, this.details,});
+  SupabaseQueryError({
+    required this.statusCode,
+    required this.message,
+    this.details,
+  });
 
   /// Status code of the erroneous [PostgrestResponse]
   final String? statusCode;
@@ -33,7 +36,8 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
   // - Networking
 
   Future<List<T>> deleteAll<T extends SupabaseObject>(
-      Map<String, Object> selectionCriteria,) async {
+    Map<String, Object> selectionCriteria,
+  ) async {
     try {
       final data = await supabaseClient
           .from(tableName(T))
@@ -43,14 +47,16 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
       return deserializeList<T>(data);
     } on PostgrestException catch (error) {
       throw SupabaseQueryError(
-          statusCode: error.code,
-          message: error.message,
-          details: error.details,);
+        statusCode: error.code,
+        message: error.message,
+        details: error.details,
+      );
     }
   }
 
-  Future<List<T>> getAll<T extends SupabaseObject>(
-      {List<String> selectedColumns = const ['*'],}) async {
+  Future<List<T>> getAll<T extends SupabaseObject>({
+    List<String> selectedColumns = const ['*'],
+  }) async {
     try {
       final data = await supabaseClient
           .from(tableName(T))
@@ -58,14 +64,17 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
       return deserializeList<T>(data);
     } on PostgrestException catch (error) {
       throw SupabaseQueryError(
-          statusCode: error.code,
-          message: error.message,
-          details: error.details,);
+        statusCode: error.code,
+        message: error.message,
+        details: error.details,
+      );
     }
   }
 
-  Future<T> getById<T extends SupabaseObject>(String id,
-      {List<String> selectedColumns = const ['*'],}) async {
+  Future<T> getById<T extends SupabaseObject>(
+    String id, {
+    List<String> selectedColumns = const ['*'],
+  }) async {
     return getByColumn('id', id, selectedColumns: selectedColumns);
   }
 
@@ -83,9 +92,10 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
       return deserializeObject<T>(data);
     } on PostgrestException catch (error) {
       throw SupabaseQueryError(
-          statusCode: error.code,
-          message: error.message,
-          details: error.details,);
+        statusCode: error.code,
+        message: error.message,
+        details: error.details,
+      );
     }
   }
 
diff --git a/designer_v2/lib/routing/router_utils.dart b/designer_v2/lib/routing/router_utils.dart
index ddf6b823a..55d3e0666 100644
--- a/designer_v2/lib/routing/router_utils.dart
+++ b/designer_v2/lib/routing/router_utils.dart
@@ -31,7 +31,10 @@ RouteSettings readCurrentRouteSettingsFrom(BuildContext context) {
 }
 
 CustomTransitionPage<void> buildModalTransitionPage(
-    BuildContext context, GoRouterState state, Widget body,) {
+  BuildContext context,
+  GoRouterState state,
+  Widget body,
+) {
   final theme = Theme.of(context);
 
   return CustomTransitionPage<void>(
diff --git a/designer_v2/lib/services/notification_service.dart b/designer_v2/lib/services/notification_service.dart
index e03200814..11620a165 100644
--- a/designer_v2/lib/services/notification_service.dart
+++ b/designer_v2/lib/services/notification_service.dart
@@ -4,10 +4,14 @@ import 'package:rxdart/subjects.dart';
 import 'package:studyu_designer_v2/services/notification_types.dart';
 
 abstract class INotificationService {
-  void showMessage(String notificationText,
-      {List<NotificationAction>? actions,});
-  void show(NotificationIntent notification,
-      {List<NotificationAction>? actions,});
+  void showMessage(
+    String notificationText, {
+    List<NotificationAction>? actions,
+  });
+  void show(
+    NotificationIntent notification, {
+    List<NotificationAction>? actions,
+  });
   Stream<NotificationIntent> watchNotifications();
   // - Lifecycle
   void dispose();
@@ -33,8 +37,10 @@ class NotificationService implements INotificationService {
   }
 
   @override
-  void show(NotificationIntent notification,
-      {List<NotificationAction>? actions,}) {
+  void show(
+    NotificationIntent notification, {
+    List<NotificationAction>? actions,
+  }) {
     // Register any additional actions passed as callbacks by the calling code
     if (actions != null) {
       for (final action in actions) {
diff --git a/designer_v2/lib/theme.dart b/designer_v2/lib/theme.dart
index d52e8ae3f..c9f9bba40 100644
--- a/designer_v2/lib/theme.dart
+++ b/designer_v2/lib/theme.dart
@@ -36,9 +36,10 @@ class ThemeConfig {
       );
 
   static TextStyle bodyTextBackground(ThemeData theme) => TextStyle(
-      fontSize: 14.0,
-      height: 1.35,
-      color: theme.colorScheme.onSurface.withOpacity(0.25),);
+        fontSize: 14.0,
+        height: 1.35,
+        color: theme.colorScheme.onSurface.withOpacity(0.25),
+      );
 
   static double iconSplashRadius(ThemeData theme) => 24.0;
 
@@ -93,7 +94,9 @@ class WebTransitionBuilder extends PageTransitionsBuilder {
     return FadeTransition(
       opacity: opacityOldTween.animate(secondaryAnimation),
       child: FadeTransition(
-          opacity: opacityNewTween.animate(animation), child: child,),
+        opacity: opacityNewTween.animate(animation),
+        child: child,
+      ),
     );
   }
 }
@@ -142,7 +145,8 @@ class ThemeProvider extends InheritedWidget {
 
   Color blend(Color targetColor) {
     return Color(
-        Blend.harmonize(targetColor.value, settings.value.sourceColor.value),);
+      Blend.harmonize(targetColor.value, settings.value.sourceColor.value),
+    );
   }
 
   Color source(Color? target) {
@@ -334,33 +338,55 @@ class ThemeProvider extends InheritedWidget {
       labelLarge:
           TextStyle(fontSize: 14.0, color: colors.onSurface.withOpacity(0.9)),
       bodySmall: TextStyle(
-          fontSize: 14.0,
-          height: 1.35,
-          color: colors.onSurface.withOpacity(0.9),), // Form Labels
+        fontSize: 14.0,
+        height: 1.35,
+        color: colors.onSurface.withOpacity(0.9),
+      ), // Form Labels
       titleMedium: TextStyle(
-          fontSize: 14.0,
-          height: 1.35,
-          color: colors.onSurface.withOpacity(0.9),), // TextInput
+        fontSize: 14.0,
+        height: 1.35,
+        color: colors.onSurface.withOpacity(0.9),
+      ), // TextInput
       bodyLarge: TextStyle(
-          fontSize: 14.0,
-          height: 1.35,
-          color: colors.onSurface.withOpacity(0.9),),
+        fontSize: 14.0,
+        height: 1.35,
+        color: colors.onSurface.withOpacity(0.9),
+      ),
       bodyMedium: TextStyle(
-          fontSize: 14.0,
-          height: 1.35,
-          color: colors.onSurface.withOpacity(0.8),),
+        fontSize: 14.0,
+        height: 1.35,
+        color: colors.onSurface.withOpacity(0.8),
+      ),
       titleLarge: TextStyle(
-          fontSize: 15.0, color: headlineColor, fontWeight: FontWeight.bold,),
+        fontSize: 15.0,
+        color: headlineColor,
+        fontWeight: FontWeight.bold,
+      ),
       headlineSmall: TextStyle(
-          fontSize: 18.0, color: headlineColor, fontWeight: FontWeight.bold,),
+        fontSize: 18.0,
+        color: headlineColor,
+        fontWeight: FontWeight.bold,
+      ),
       headlineMedium: TextStyle(
-          fontSize: 22.0, color: headlineColor, fontWeight: FontWeight.bold,),
+        fontSize: 22.0,
+        color: headlineColor,
+        fontWeight: FontWeight.bold,
+      ),
       displaySmall: TextStyle(
-          fontSize: 26.0, color: headlineColor, fontWeight: FontWeight.bold,),
+        fontSize: 26.0,
+        color: headlineColor,
+        fontWeight: FontWeight.bold,
+      ),
       displayMedium: TextStyle(
-          fontSize: 36.0, color: headlineColor, fontWeight: FontWeight.bold,),
+        fontSize: 36.0,
+        color: headlineColor,
+        fontWeight: FontWeight.bold,
+      ),
       displayLarge: TextStyle(
-          fontSize: 48.0, color: headlineColor, fontWeight: FontWeight.bold,),
+        fontSize: 48.0,
+        color: headlineColor,
+        fontWeight: FontWeight.bold,
+      ),
     );
   }
 

From 6e7d55cbbe5f707dbfc5bcfcd8d64aa965224b2f Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 9 Jun 2024 17:04:05 +0200
Subject: [PATCH 162/314] chore: melos description

---
 melos.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/melos.yaml b/melos.yaml
index 4ce51f49b..436b8db86 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -27,7 +27,7 @@ scripts:
     run: |
       melos exec -c 6 -- \
         "dart format ."
-    description: Format all code and markdown files
+    description: Format all code files
 
   format:ci:
     run: |

From bedee3e767c80933f650be7ae61589f606ab3e66 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 9 Jun 2024 17:29:29 +0200
Subject: [PATCH 163/314] chore: revert build.yaml

---
 core/build.yaml                               |  3 +-
 .../src/models/consent/consent_item.g.dart    | 23 +++++---
 core/lib/src/models/contact.g.dart            | 31 +++++++----
 .../eligibility/eligibility_criterion.g.dart  | 21 +++++---
 .../types/boolean_expression.g.dart           | 18 +++++--
 .../types/choice_expression.g.dart            | 20 ++++---
 .../expressions/types/not_expression.g.dart   | 18 +++++--
 .../models/interventions/intervention.g.dart  | 25 ++++++---
 .../interventions/tasks/checkmark_task.g.dart | 27 ++++++----
 .../tasks/questionnaire_task.g.dart           | 29 ++++++----
 .../questionnaire/question_conditional.g.dart |  2 +-
 .../questions/annotated_scale_question.g.dart | 35 +++++++-----
 .../questions/audio_recording_question.g.dart | 27 ++++++----
 .../questions/boolean_question.g.dart         | 25 ++++++---
 .../questions/choice_question.g.dart          | 29 ++++++----
 .../questions/free_text_question.g.dart       | 31 +++++++----
 .../questions/image_capturing_question.g.dart | 25 ++++++---
 .../questions/scale_question.g.dart           | 39 ++++++++------
 .../questions/visual_analogue_question.g.dart | 41 ++++++++------
 .../models/report/report_specification.g.dart | 19 ++++---
 .../report/sections/average_section.g.dart    | 27 ++++++----
 .../sections/linear_regression_section.g.dart | 30 +++++++----
 core/lib/src/models/results/result.g.dart     | 18 +++++--
 .../results/numeric_result.g.dart             |  2 +-
 .../study_schedule/study_schedule.g.dart      |  2 +-
 core/lib/src/models/tables/app_config.g.dart  | 32 +++++++----
 core/lib/src/models/tables/repo.g.dart        | 26 ++++++---
 core/lib/src/models/tables/study.g.dart       | 53 +++++++++++--------
 .../lib/src/models/tables/study_invite.g.dart | 22 +++++---
 .../src/models/tables/study_subject.g.dart    | 29 ++++++----
 .../src/models/tables/subject_progress.g.dart | 26 +++++----
 core/lib/src/models/tables/user.g.dart        |  2 +-
 core/lib/src/models/tasks/schedule.g.dart     |  9 ++--
 core/lib/src/util/analytics.g.dart            | 21 +++++---
 34 files changed, 521 insertions(+), 266 deletions(-)

diff --git a/core/build.yaml b/core/build.yaml
index 31fe4a55c..c30e6f373 100644
--- a/core/build.yaml
+++ b/core/build.yaml
@@ -4,5 +4,4 @@ targets:
       json_serializable:
         options:
           explicit_to_json: true
-          field_rename: none
-          include_if_null: false
\ No newline at end of file
+          include_if_null: false
diff --git a/core/lib/src/models/consent/consent_item.g.dart b/core/lib/src/models/consent/consent_item.g.dart
index 5adf71a9a..ab84c211e 100644
--- a/core/lib/src/models/consent/consent_item.g.dart
+++ b/core/lib/src/models/consent/consent_item.g.dart
@@ -13,10 +13,19 @@ ConsentItem _$ConsentItemFromJson(Map<String, dynamic> json) => ConsentItem(
       ..description = json['description'] as String?
       ..iconName = json['iconName'] as String;
 
-Map<String, dynamic> _$ConsentItemToJson(ConsentItem instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'title': instance.title,
-      'description': instance.description,
-      'iconName': instance.iconName,
-    };
+Map<String, dynamic> _$ConsentItemToJson(ConsentItem instance) {
+  final val = <String, dynamic>{
+    'id': instance.id,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('title', instance.title);
+  writeNotNull('description', instance.description);
+  val['iconName'] = instance.iconName;
+  return val;
+}
diff --git a/core/lib/src/models/contact.g.dart b/core/lib/src/models/contact.g.dart
index 3dec28717..9ce399e8d 100644
--- a/core/lib/src/models/contact.g.dart
+++ b/core/lib/src/models/contact.g.dart
@@ -17,13 +17,24 @@ Contact _$ContactFromJson(Map<String, dynamic> json) => Contact()
   ..phone = json['phone'] as String
   ..additionalInfo = json['additionalInfo'] as String?;
 
-Map<String, dynamic> _$ContactToJson(Contact instance) => <String, dynamic>{
-      'organization': instance.organization,
-      'institutionalReviewBoard': instance.institutionalReviewBoard,
-      'institutionalReviewBoardNumber': instance.institutionalReviewBoardNumber,
-      'researchers': instance.researchers,
-      'email': instance.email,
-      'website': instance.website,
-      'phone': instance.phone,
-      'additionalInfo': instance.additionalInfo,
-    };
+Map<String, dynamic> _$ContactToJson(Contact instance) {
+  final val = <String, dynamic>{
+    'organization': instance.organization,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('institutionalReviewBoard', instance.institutionalReviewBoard);
+  writeNotNull('institutionalReviewBoardNumber',
+      instance.institutionalReviewBoardNumber);
+  writeNotNull('researchers', instance.researchers);
+  val['email'] = instance.email;
+  val['website'] = instance.website;
+  val['phone'] = instance.phone;
+  writeNotNull('additionalInfo', instance.additionalInfo);
+  return val;
+}
diff --git a/core/lib/src/models/eligibility/eligibility_criterion.g.dart b/core/lib/src/models/eligibility/eligibility_criterion.g.dart
index 9b7681a7a..ad35bd974 100644
--- a/core/lib/src/models/eligibility/eligibility_criterion.g.dart
+++ b/core/lib/src/models/eligibility/eligibility_criterion.g.dart
@@ -16,9 +16,18 @@ EligibilityCriterion _$EligibilityCriterionFromJson(
           Expression.fromJson(json['condition'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$EligibilityCriterionToJson(
-        EligibilityCriterion instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'reason': instance.reason,
-      'condition': instance.condition,
-    };
+    EligibilityCriterion instance) {
+  final val = <String, dynamic>{
+    'id': instance.id,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('reason', instance.reason);
+  val['condition'] = instance.condition.toJson();
+  return val;
+}
diff --git a/core/lib/src/models/expressions/types/boolean_expression.g.dart b/core/lib/src/models/expressions/types/boolean_expression.g.dart
index d1e111774..3328aae56 100644
--- a/core/lib/src/models/expressions/types/boolean_expression.g.dart
+++ b/core/lib/src/models/expressions/types/boolean_expression.g.dart
@@ -11,8 +11,16 @@ BooleanExpression _$BooleanExpressionFromJson(Map<String, dynamic> json) =>
       ..type = json['type'] as String?
       ..target = json['target'] as String?;
 
-Map<String, dynamic> _$BooleanExpressionToJson(BooleanExpression instance) =>
-    <String, dynamic>{
-      'type': instance.type,
-      'target': instance.target,
-    };
+Map<String, dynamic> _$BooleanExpressionToJson(BooleanExpression instance) {
+  final val = <String, dynamic>{};
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('type', instance.type);
+  writeNotNull('target', instance.target);
+  return val;
+}
diff --git a/core/lib/src/models/expressions/types/choice_expression.g.dart b/core/lib/src/models/expressions/types/choice_expression.g.dart
index e8da4fa7e..3e1c40902 100644
--- a/core/lib/src/models/expressions/types/choice_expression.g.dart
+++ b/core/lib/src/models/expressions/types/choice_expression.g.dart
@@ -12,9 +12,17 @@ ChoiceExpression _$ChoiceExpressionFromJson(Map<String, dynamic> json) =>
       ..target = json['target'] as String?
       ..choices = (json['choices'] as List<dynamic>).toSet();
 
-Map<String, dynamic> _$ChoiceExpressionToJson(ChoiceExpression instance) =>
-    <String, dynamic>{
-      'type': instance.type,
-      'target': instance.target,
-      'choices': instance.choices.toList(),
-    };
+Map<String, dynamic> _$ChoiceExpressionToJson(ChoiceExpression instance) {
+  final val = <String, dynamic>{};
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('type', instance.type);
+  writeNotNull('target', instance.target);
+  val['choices'] = instance.choices.toList();
+  return val;
+}
diff --git a/core/lib/src/models/expressions/types/not_expression.g.dart b/core/lib/src/models/expressions/types/not_expression.g.dart
index 34a584147..84704e8cf 100644
--- a/core/lib/src/models/expressions/types/not_expression.g.dart
+++ b/core/lib/src/models/expressions/types/not_expression.g.dart
@@ -12,8 +12,16 @@ NotExpression _$NotExpressionFromJson(Map<String, dynamic> json) =>
       ..expression =
           Expression.fromJson(json['expression'] as Map<String, dynamic>);
 
-Map<String, dynamic> _$NotExpressionToJson(NotExpression instance) =>
-    <String, dynamic>{
-      'type': instance.type,
-      'expression': instance.expression,
-    };
+Map<String, dynamic> _$NotExpressionToJson(NotExpression instance) {
+  final val = <String, dynamic>{};
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('type', instance.type);
+  val['expression'] = instance.expression.toJson();
+  return val;
+}
diff --git a/core/lib/src/models/interventions/intervention.g.dart b/core/lib/src/models/interventions/intervention.g.dart
index e561962b8..6e62e92fa 100644
--- a/core/lib/src/models/interventions/intervention.g.dart
+++ b/core/lib/src/models/interventions/intervention.g.dart
@@ -16,11 +16,20 @@ Intervention _$InterventionFromJson(Map<String, dynamic> json) => Intervention(
           .map((e) => InterventionTask.fromJson(e as Map<String, dynamic>))
           .toList();
 
-Map<String, dynamic> _$InterventionToJson(Intervention instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'name': instance.name,
-      'description': instance.description,
-      'icon': instance.icon,
-      'tasks': instance.tasks,
-    };
+Map<String, dynamic> _$InterventionToJson(Intervention instance) {
+  final val = <String, dynamic>{
+    'id': instance.id,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('name', instance.name);
+  writeNotNull('description', instance.description);
+  val['icon'] = instance.icon;
+  val['tasks'] = instance.tasks.map((e) => e.toJson()).toList();
+  return val;
+}
diff --git a/core/lib/src/models/interventions/tasks/checkmark_task.g.dart b/core/lib/src/models/interventions/tasks/checkmark_task.g.dart
index 1539d81c2..d7db031af 100644
--- a/core/lib/src/models/interventions/tasks/checkmark_task.g.dart
+++ b/core/lib/src/models/interventions/tasks/checkmark_task.g.dart
@@ -15,12 +15,21 @@ CheckmarkTask _$CheckmarkTaskFromJson(Map<String, dynamic> json) =>
       ..footer = json['footer'] as String?
       ..schedule = Schedule.fromJson(json['schedule'] as Map<String, dynamic>);
 
-Map<String, dynamic> _$CheckmarkTaskToJson(CheckmarkTask instance) =>
-    <String, dynamic>{
-      'type': instance.type,
-      'id': instance.id,
-      'title': instance.title,
-      'header': instance.header,
-      'footer': instance.footer,
-      'schedule': instance.schedule,
-    };
+Map<String, dynamic> _$CheckmarkTaskToJson(CheckmarkTask instance) {
+  final val = <String, dynamic>{
+    'type': instance.type,
+    'id': instance.id,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('title', instance.title);
+  writeNotNull('header', instance.header);
+  writeNotNull('footer', instance.footer);
+  val['schedule'] = instance.schedule.toJson();
+  return val;
+}
diff --git a/core/lib/src/models/observations/tasks/questionnaire_task.g.dart b/core/lib/src/models/observations/tasks/questionnaire_task.g.dart
index a4cc3590f..9f86bb97a 100644
--- a/core/lib/src/models/observations/tasks/questionnaire_task.g.dart
+++ b/core/lib/src/models/observations/tasks/questionnaire_task.g.dart
@@ -17,13 +17,22 @@ QuestionnaireTask _$QuestionnaireTaskFromJson(Map<String, dynamic> json) =>
       ..questions =
           StudyUQuestionnaire.fromJson(json['questions'] as List<dynamic>);
 
-Map<String, dynamic> _$QuestionnaireTaskToJson(QuestionnaireTask instance) =>
-    <String, dynamic>{
-      'type': instance.type,
-      'id': instance.id,
-      'title': instance.title,
-      'header': instance.header,
-      'footer': instance.footer,
-      'schedule': instance.schedule,
-      'questions': instance.questions,
-    };
+Map<String, dynamic> _$QuestionnaireTaskToJson(QuestionnaireTask instance) {
+  final val = <String, dynamic>{
+    'type': instance.type,
+    'id': instance.id,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('title', instance.title);
+  writeNotNull('header', instance.header);
+  writeNotNull('footer', instance.footer);
+  val['schedule'] = instance.schedule.toJson();
+  val['questions'] = instance.questions.toJson();
+  return val;
+}
diff --git a/core/lib/src/models/questionnaire/question_conditional.g.dart b/core/lib/src/models/questionnaire/question_conditional.g.dart
index eb7704d09..4a9effa84 100644
--- a/core/lib/src/models/questionnaire/question_conditional.g.dart
+++ b/core/lib/src/models/questionnaire/question_conditional.g.dart
@@ -15,5 +15,5 @@ QuestionConditional<V> _$QuestionConditionalFromJson<V>(
 Map<String, dynamic> _$QuestionConditionalToJson<V>(
         QuestionConditional<V> instance) =>
     <String, dynamic>{
-      'condition': instance.condition,
+      'condition': instance.condition.toJson(),
     };
diff --git a/core/lib/src/models/questionnaire/questions/annotated_scale_question.g.dart b/core/lib/src/models/questionnaire/questions/annotated_scale_question.g.dart
index e8ec497c2..1de91484b 100644
--- a/core/lib/src/models/questionnaire/questions/annotated_scale_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/annotated_scale_question.g.dart
@@ -26,19 +26,28 @@ AnnotatedScaleQuestion _$AnnotatedScaleQuestionFromJson(
           .toList();
 
 Map<String, dynamic> _$AnnotatedScaleQuestionToJson(
-        AnnotatedScaleQuestion instance) =>
-    <String, dynamic>{
-      'type': instance.type,
-      'id': instance.id,
-      'prompt': instance.prompt,
-      'rationale': instance.rationale,
-      'conditional': instance.conditional,
-      'minimum': instance.minimum,
-      'maximum': instance.maximum,
-      'step': instance.step,
-      'initial': instance.initial,
-      'annotations': instance.annotations,
-    };
+    AnnotatedScaleQuestion instance) {
+  final val = <String, dynamic>{
+    'type': instance.type,
+    'id': instance.id,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('prompt', instance.prompt);
+  writeNotNull('rationale', instance.rationale);
+  writeNotNull('conditional', instance.conditional?.toJson());
+  val['minimum'] = instance.minimum;
+  val['maximum'] = instance.maximum;
+  val['step'] = instance.step;
+  val['initial'] = instance.initial;
+  val['annotations'] = instance.annotations.map((e) => e.toJson()).toList();
+  return val;
+}
 
 Annotation _$AnnotationFromJson(Map<String, dynamic> json) => Annotation()
   ..value = (json['value'] as num).toInt()
diff --git a/core/lib/src/models/questionnaire/questions/audio_recording_question.g.dart b/core/lib/src/models/questionnaire/questions/audio_recording_question.g.dart
index 08c0d5af8..c09581df9 100644
--- a/core/lib/src/models/questionnaire/questions/audio_recording_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/audio_recording_question.g.dart
@@ -22,12 +22,21 @@ AudioRecordingQuestion _$AudioRecordingQuestionFromJson(
               json['conditional'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$AudioRecordingQuestionToJson(
-        AudioRecordingQuestion instance) =>
-    <String, dynamic>{
-      'type': instance.type,
-      'id': instance.id,
-      'prompt': instance.prompt,
-      'rationale': instance.rationale,
-      'conditional': instance.conditional,
-      'maxRecordingDurationSeconds': instance.maxRecordingDurationSeconds,
-    };
+    AudioRecordingQuestion instance) {
+  final val = <String, dynamic>{
+    'type': instance.type,
+    'id': instance.id,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('prompt', instance.prompt);
+  writeNotNull('rationale', instance.rationale);
+  writeNotNull('conditional', instance.conditional?.toJson());
+  val['maxRecordingDurationSeconds'] = instance.maxRecordingDurationSeconds;
+  return val;
+}
diff --git a/core/lib/src/models/questionnaire/questions/boolean_question.g.dart b/core/lib/src/models/questionnaire/questions/boolean_question.g.dart
index b052d3105..c20af6101 100644
--- a/core/lib/src/models/questionnaire/questions/boolean_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/boolean_question.g.dart
@@ -17,11 +17,20 @@ BooleanQuestion _$BooleanQuestionFromJson(Map<String, dynamic> json) =>
           : QuestionConditional<bool>.fromJson(
               json['conditional'] as Map<String, dynamic>);
 
-Map<String, dynamic> _$BooleanQuestionToJson(BooleanQuestion instance) =>
-    <String, dynamic>{
-      'type': instance.type,
-      'id': instance.id,
-      'prompt': instance.prompt,
-      'rationale': instance.rationale,
-      'conditional': instance.conditional,
-    };
+Map<String, dynamic> _$BooleanQuestionToJson(BooleanQuestion instance) {
+  final val = <String, dynamic>{
+    'type': instance.type,
+    'id': instance.id,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('prompt', instance.prompt);
+  writeNotNull('rationale', instance.rationale);
+  writeNotNull('conditional', instance.conditional?.toJson());
+  return val;
+}
diff --git a/core/lib/src/models/questionnaire/questions/choice_question.g.dart b/core/lib/src/models/questionnaire/questions/choice_question.g.dart
index e8ada08fd..6fd59f733 100644
--- a/core/lib/src/models/questionnaire/questions/choice_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/choice_question.g.dart
@@ -21,16 +21,25 @@ ChoiceQuestion _$ChoiceQuestionFromJson(Map<String, dynamic> json) =>
           .map((e) => Choice.fromJson(e as Map<String, dynamic>))
           .toList();
 
-Map<String, dynamic> _$ChoiceQuestionToJson(ChoiceQuestion instance) =>
-    <String, dynamic>{
-      'type': instance.type,
-      'id': instance.id,
-      'prompt': instance.prompt,
-      'rationale': instance.rationale,
-      'conditional': instance.conditional,
-      'multiple': instance.multiple,
-      'choices': instance.choices,
-    };
+Map<String, dynamic> _$ChoiceQuestionToJson(ChoiceQuestion instance) {
+  final val = <String, dynamic>{
+    'type': instance.type,
+    'id': instance.id,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('prompt', instance.prompt);
+  writeNotNull('rationale', instance.rationale);
+  writeNotNull('conditional', instance.conditional?.toJson());
+  val['multiple'] = instance.multiple;
+  val['choices'] = instance.choices.map((e) => e.toJson()).toList();
+  return val;
+}
 
 Choice _$ChoiceFromJson(Map<String, dynamic> json) => Choice(
       json['id'] as String,
diff --git a/core/lib/src/models/questionnaire/questions/free_text_question.g.dart b/core/lib/src/models/questionnaire/questions/free_text_question.g.dart
index 322c5845b..4a6865334 100644
--- a/core/lib/src/models/questionnaire/questions/free_text_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/free_text_question.g.dart
@@ -23,17 +23,26 @@ FreeTextQuestion _$FreeTextQuestionFromJson(Map<String, dynamic> json) =>
           : QuestionConditional<String>.fromJson(
               json['conditional'] as Map<String, dynamic>);
 
-Map<String, dynamic> _$FreeTextQuestionToJson(FreeTextQuestion instance) =>
-    <String, dynamic>{
-      'type': instance.type,
-      'id': instance.id,
-      'prompt': instance.prompt,
-      'rationale': instance.rationale,
-      'conditional': instance.conditional,
-      'lengthRange': instance.lengthRange,
-      'textType': instance.textType,
-      'customTypeExpression': instance.customTypeExpression,
-    };
+Map<String, dynamic> _$FreeTextQuestionToJson(FreeTextQuestion instance) {
+  final val = <String, dynamic>{
+    'type': instance.type,
+    'id': instance.id,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('prompt', instance.prompt);
+  writeNotNull('rationale', instance.rationale);
+  writeNotNull('conditional', instance.conditional?.toJson());
+  val['lengthRange'] = instance.lengthRange;
+  val['textType'] = instance.textType.toJson();
+  writeNotNull('customTypeExpression', instance.customTypeExpression);
+  return val;
+}
 
 const _$FreeTextQuestionTypeEnumMap = {
   FreeTextQuestionType.any: 'any',
diff --git a/core/lib/src/models/questionnaire/questions/image_capturing_question.g.dart b/core/lib/src/models/questionnaire/questions/image_capturing_question.g.dart
index 6858d4e64..b06b088d5 100644
--- a/core/lib/src/models/questionnaire/questions/image_capturing_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/image_capturing_question.g.dart
@@ -19,11 +19,20 @@ ImageCapturingQuestion _$ImageCapturingQuestionFromJson(
               json['conditional'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$ImageCapturingQuestionToJson(
-        ImageCapturingQuestion instance) =>
-    <String, dynamic>{
-      'type': instance.type,
-      'id': instance.id,
-      'prompt': instance.prompt,
-      'rationale': instance.rationale,
-      'conditional': instance.conditional,
-    };
+    ImageCapturingQuestion instance) {
+  final val = <String, dynamic>{
+    'type': instance.type,
+    'id': instance.id,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('prompt', instance.prompt);
+  writeNotNull('rationale', instance.rationale);
+  writeNotNull('conditional', instance.conditional?.toJson());
+  return val;
+}
diff --git a/core/lib/src/models/questionnaire/questions/scale_question.g.dart b/core/lib/src/models/questionnaire/questions/scale_question.g.dart
index ef62e5eaa..e69c71d08 100644
--- a/core/lib/src/models/questionnaire/questions/scale_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/scale_question.g.dart
@@ -26,18 +26,27 @@ ScaleQuestion _$ScaleQuestionFromJson(Map<String, dynamic> json) =>
       ..maxColor = (json['max_color'] as num?)?.toInt()
       ..step = (json['step'] as num).toDouble();
 
-Map<String, dynamic> _$ScaleQuestionToJson(ScaleQuestion instance) =>
-    <String, dynamic>{
-      'type': instance.type,
-      'id': instance.id,
-      'prompt': instance.prompt,
-      'rationale': instance.rationale,
-      'conditional': instance.conditional,
-      'minimum': instance.minimum,
-      'maximum': instance.maximum,
-      'initial': instance.initial,
-      'annotations': instance.annotations,
-      'min_color': instance.minColor,
-      'max_color': instance.maxColor,
-      'step': instance.step,
-    };
+Map<String, dynamic> _$ScaleQuestionToJson(ScaleQuestion instance) {
+  final val = <String, dynamic>{
+    'type': instance.type,
+    'id': instance.id,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('prompt', instance.prompt);
+  writeNotNull('rationale', instance.rationale);
+  writeNotNull('conditional', instance.conditional?.toJson());
+  val['minimum'] = instance.minimum;
+  val['maximum'] = instance.maximum;
+  val['initial'] = instance.initial;
+  val['annotations'] = instance.annotations.map((e) => e.toJson()).toList();
+  writeNotNull('min_color', instance.minColor);
+  writeNotNull('max_color', instance.maxColor);
+  val['step'] = instance.step;
+  return val;
+}
diff --git a/core/lib/src/models/questionnaire/questions/visual_analogue_question.g.dart b/core/lib/src/models/questionnaire/questions/visual_analogue_question.g.dart
index 8c0a83a93..2c2a2b505 100644
--- a/core/lib/src/models/questionnaire/questions/visual_analogue_question.g.dart
+++ b/core/lib/src/models/questionnaire/questions/visual_analogue_question.g.dart
@@ -27,19 +27,28 @@ VisualAnalogueQuestion _$VisualAnalogueQuestionFromJson(
       ..maximumAnnotation = json['maximumAnnotation'] as String;
 
 Map<String, dynamic> _$VisualAnalogueQuestionToJson(
-        VisualAnalogueQuestion instance) =>
-    <String, dynamic>{
-      'type': instance.type,
-      'id': instance.id,
-      'prompt': instance.prompt,
-      'rationale': instance.rationale,
-      'conditional': instance.conditional,
-      'minimum': instance.minimum,
-      'maximum': instance.maximum,
-      'step': instance.step,
-      'initial': instance.initial,
-      'minimumColor': instance.minimumColor,
-      'maximumColor': instance.maximumColor,
-      'minimumAnnotation': instance.minimumAnnotation,
-      'maximumAnnotation': instance.maximumAnnotation,
-    };
+    VisualAnalogueQuestion instance) {
+  final val = <String, dynamic>{
+    'type': instance.type,
+    'id': instance.id,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('prompt', instance.prompt);
+  writeNotNull('rationale', instance.rationale);
+  writeNotNull('conditional', instance.conditional?.toJson());
+  val['minimum'] = instance.minimum;
+  val['maximum'] = instance.maximum;
+  val['step'] = instance.step;
+  val['initial'] = instance.initial;
+  val['minimumColor'] = instance.minimumColor;
+  val['maximumColor'] = instance.maximumColor;
+  val['minimumAnnotation'] = instance.minimumAnnotation;
+  val['maximumAnnotation'] = instance.maximumAnnotation;
+  return val;
+}
diff --git a/core/lib/src/models/report/report_specification.g.dart b/core/lib/src/models/report/report_specification.g.dart
index 70634fb92..ed596a611 100644
--- a/core/lib/src/models/report/report_specification.g.dart
+++ b/core/lib/src/models/report/report_specification.g.dart
@@ -15,9 +15,16 @@ ReportSpecification _$ReportSpecificationFromJson(Map<String, dynamic> json) =>
           .map((e) => ReportSection.fromJson(e as Map<String, dynamic>))
           .toList();
 
-Map<String, dynamic> _$ReportSpecificationToJson(
-        ReportSpecification instance) =>
-    <String, dynamic>{
-      'primary': instance.primary,
-      'secondary': instance.secondary,
-    };
+Map<String, dynamic> _$ReportSpecificationToJson(ReportSpecification instance) {
+  final val = <String, dynamic>{};
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('primary', instance.primary?.toJson());
+  val['secondary'] = instance.secondary.map((e) => e.toJson()).toList();
+  return val;
+}
diff --git a/core/lib/src/models/report/sections/average_section.g.dart b/core/lib/src/models/report/sections/average_section.g.dart
index e646742a8..21fd5f5f4 100644
--- a/core/lib/src/models/report/sections/average_section.g.dart
+++ b/core/lib/src/models/report/sections/average_section.g.dart
@@ -19,15 +19,24 @@ AverageSection _$AverageSectionFromJson(Map<String, dynamic> json) =>
           : DataReference<num>.fromJson(
               json['resultProperty'] as Map<String, dynamic>);
 
-Map<String, dynamic> _$AverageSectionToJson(AverageSection instance) =>
-    <String, dynamic>{
-      'type': instance.type,
-      'id': instance.id,
-      'title': instance.title,
-      'description': instance.description,
-      'aggregate': _$TemporalAggregationEnumMap[instance.aggregate],
-      'resultProperty': instance.resultProperty,
-    };
+Map<String, dynamic> _$AverageSectionToJson(AverageSection instance) {
+  final val = <String, dynamic>{
+    'type': instance.type,
+    'id': instance.id,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('title', instance.title);
+  writeNotNull('description', instance.description);
+  writeNotNull('aggregate', _$TemporalAggregationEnumMap[instance.aggregate]);
+  writeNotNull('resultProperty', instance.resultProperty?.toJson());
+  return val;
+}
 
 const _$TemporalAggregationEnumMap = {
   TemporalAggregation.day: 'day',
diff --git a/core/lib/src/models/report/sections/linear_regression_section.g.dart b/core/lib/src/models/report/sections/linear_regression_section.g.dart
index 0ee0c7645..977a7209b 100644
--- a/core/lib/src/models/report/sections/linear_regression_section.g.dart
+++ b/core/lib/src/models/report/sections/linear_regression_section.g.dart
@@ -22,16 +22,26 @@ LinearRegressionSection _$LinearRegressionSectionFromJson(
           _$ImprovementDirectionEnumMap, json['improvement']);
 
 Map<String, dynamic> _$LinearRegressionSectionToJson(
-        LinearRegressionSection instance) =>
-    <String, dynamic>{
-      'type': instance.type,
-      'id': instance.id,
-      'title': instance.title,
-      'description': instance.description,
-      'resultProperty': instance.resultProperty,
-      'alpha': instance.alpha,
-      'improvement': _$ImprovementDirectionEnumMap[instance.improvement],
-    };
+    LinearRegressionSection instance) {
+  final val = <String, dynamic>{
+    'type': instance.type,
+    'id': instance.id,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('title', instance.title);
+  writeNotNull('description', instance.description);
+  writeNotNull('resultProperty', instance.resultProperty?.toJson());
+  val['alpha'] = instance.alpha;
+  writeNotNull(
+      'improvement', _$ImprovementDirectionEnumMap[instance.improvement]);
+  return val;
+}
 
 const _$ImprovementDirectionEnumMap = {
   ImprovementDirection.positive: 'positive',
diff --git a/core/lib/src/models/results/result.g.dart b/core/lib/src/models/results/result.g.dart
index 836732dd8..ce6de6834 100644
--- a/core/lib/src/models/results/result.g.dart
+++ b/core/lib/src/models/results/result.g.dart
@@ -10,7 +10,17 @@ Result<T> _$ResultFromJson<T>(Map<String, dynamic> json) => Result<T>(
       json['type'] as String,
     )..periodId = json['periodId'] as String?;
 
-Map<String, dynamic> _$ResultToJson<T>(Result<T> instance) => <String, dynamic>{
-      'type': instance.type,
-      'periodId': instance.periodId,
-    };
+Map<String, dynamic> _$ResultToJson<T>(Result<T> instance) {
+  final val = <String, dynamic>{
+    'type': instance.type,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('periodId', instance.periodId);
+  return val;
+}
diff --git a/core/lib/src/models/study_results/results/numeric_result.g.dart b/core/lib/src/models/study_results/results/numeric_result.g.dart
index 449f4ba30..b6a5fd1d0 100644
--- a/core/lib/src/models/study_results/results/numeric_result.g.dart
+++ b/core/lib/src/models/study_results/results/numeric_result.g.dart
@@ -19,5 +19,5 @@ Map<String, dynamic> _$NumericResultToJson(NumericResult instance) =>
       'type': instance.type,
       'id': instance.id,
       'filename': instance.filename,
-      'resultProperty': instance.resultProperty,
+      'resultProperty': instance.resultProperty.toJson(),
     };
diff --git a/core/lib/src/models/study_schedule/study_schedule.g.dart b/core/lib/src/models/study_schedule/study_schedule.g.dart
index abb4ffa92..ae103a19d 100644
--- a/core/lib/src/models/study_schedule/study_schedule.g.dart
+++ b/core/lib/src/models/study_schedule/study_schedule.g.dart
@@ -20,7 +20,7 @@ Map<String, dynamic> _$StudyScheduleToJson(StudySchedule instance) =>
       'numberOfCycles': instance.numberOfCycles,
       'phaseDuration': instance.phaseDuration,
       'includeBaseline': instance.includeBaseline,
-      'sequence': instance.sequence,
+      'sequence': instance.sequence.toJson(),
       'sequenceCustom': instance.sequenceCustom,
     };
 
diff --git a/core/lib/src/models/tables/app_config.g.dart b/core/lib/src/models/tables/app_config.g.dart
index 7f1e01df8..34f42d78b 100644
--- a/core/lib/src/models/tables/app_config.g.dart
+++ b/core/lib/src/models/tables/app_config.g.dart
@@ -21,14 +21,24 @@ AppConfig _$AppConfigFromJson(Map<String, dynamic> json) => AppConfig(
           : StudyUAnalytics.fromJson(json['analytics'] as Map<String, dynamic>),
     );
 
-Map<String, dynamic> _$AppConfigToJson(AppConfig instance) => <String, dynamic>{
-      'id': instance.id,
-      'app_min_version': instance.appMinVersion,
-      'app_privacy': instance.appPrivacy,
-      'app_terms': instance.appTerms,
-      'designer_privacy': instance.designerPrivacy,
-      'designer_terms': instance.designerTerms,
-      'imprint': instance.imprint,
-      'contact': instance.contact,
-      'analytics': instance.analytics,
-    };
+Map<String, dynamic> _$AppConfigToJson(AppConfig instance) {
+  final val = <String, dynamic>{
+    'id': instance.id,
+    'app_min_version': instance.appMinVersion,
+    'app_privacy': instance.appPrivacy,
+    'app_terms': instance.appTerms,
+    'designer_privacy': instance.designerPrivacy,
+    'designer_terms': instance.designerTerms,
+    'imprint': instance.imprint,
+    'contact': instance.contact.toJson(),
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('analytics', instance.analytics?.toJson());
+  return val;
+}
diff --git a/core/lib/src/models/tables/repo.g.dart b/core/lib/src/models/tables/repo.g.dart
index 55f466f3b..1f653769c 100644
--- a/core/lib/src/models/tables/repo.g.dart
+++ b/core/lib/src/models/tables/repo.g.dart
@@ -15,14 +15,24 @@ Repo _$RepoFromJson(Map<String, dynamic> json) => Repo(
       json['git_url'] as String?,
     );
 
-Map<String, dynamic> _$RepoToJson(Repo instance) => <String, dynamic>{
-      'project_id': instance.projectId,
-      'user_id': instance.userId,
-      'study_id': instance.studyId,
-      'provider': _$GitProviderEnumMap[instance.provider]!,
-      'web_url': instance.webUrl,
-      'git_url': instance.gitUrl,
-    };
+Map<String, dynamic> _$RepoToJson(Repo instance) {
+  final val = <String, dynamic>{
+    'project_id': instance.projectId,
+    'user_id': instance.userId,
+    'study_id': instance.studyId,
+    'provider': _$GitProviderEnumMap[instance.provider]!,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('web_url', instance.webUrl);
+  writeNotNull('git_url', instance.gitUrl);
+  return val;
+}
 
 const _$GitProviderEnumMap = {
   GitProvider.gitlab: 'gitlab',
diff --git a/core/lib/src/models/tables/study.g.dart b/core/lib/src/models/tables/study.g.dart
index 99cb0e329..e1b6daece 100644
--- a/core/lib/src/models/tables/study.g.dart
+++ b/core/lib/src/models/tables/study.g.dart
@@ -47,27 +47,38 @@ Study _$StudyFromJson(Map<String, dynamic> json) => Study(
           []
       ..registryPublished = json['registry_published'] as bool? ?? false;
 
-Map<String, dynamic> _$StudyToJson(Study instance) => <String, dynamic>{
-      'id': instance.id,
-      'title': instance.title,
-      'description': instance.description,
-      'user_id': instance.userId,
-      'participation': instance.participation,
-      'result_sharing': instance.resultSharing,
-      'contact': instance.contact,
-      'icon_name': instance.iconName,
-      'published': instance.published,
-      'questionnaire': instance.questionnaire,
-      'eligibility_criteria': instance.eligibilityCriteria,
-      'consent': instance.consent,
-      'interventions': instance.interventions,
-      'observations': instance.observations,
-      'schedule': instance.schedule,
-      'report_specification': instance.reportSpecification,
-      'results': instance.results,
-      'collaborator_emails': instance.collaboratorEmails,
-      'registry_published': instance.registryPublished,
-    };
+Map<String, dynamic> _$StudyToJson(Study instance) {
+  final val = <String, dynamic>{
+    'id': instance.id,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('title', instance.title);
+  writeNotNull('description', instance.description);
+  val['user_id'] = instance.userId;
+  val['participation'] = instance.participation.toJson();
+  val['result_sharing'] = instance.resultSharing.toJson();
+  val['contact'] = instance.contact.toJson();
+  val['icon_name'] = instance.iconName;
+  val['published'] = instance.published;
+  val['questionnaire'] = instance.questionnaire.toJson();
+  val['eligibility_criteria'] =
+      instance.eligibilityCriteria.map((e) => e.toJson()).toList();
+  val['consent'] = instance.consent.map((e) => e.toJson()).toList();
+  val['interventions'] = instance.interventions.map((e) => e.toJson()).toList();
+  val['observations'] = instance.observations.map((e) => e.toJson()).toList();
+  val['schedule'] = instance.schedule.toJson();
+  val['report_specification'] = instance.reportSpecification.toJson();
+  val['results'] = instance.results.map((e) => e.toJson()).toList();
+  val['collaborator_emails'] = instance.collaboratorEmails;
+  val['registry_published'] = instance.registryPublished;
+  return val;
+}
 
 const _$ParticipationEnumMap = {
   Participation.open: 'open',
diff --git a/core/lib/src/models/tables/study_invite.g.dart b/core/lib/src/models/tables/study_invite.g.dart
index 4a9c8102a..006ba6254 100644
--- a/core/lib/src/models/tables/study_invite.g.dart
+++ b/core/lib/src/models/tables/study_invite.g.dart
@@ -15,9 +15,19 @@ StudyInvite _$StudyInviteFromJson(Map<String, dynamic> json) => StudyInvite(
               .toList(),
     );
 
-Map<String, dynamic> _$StudyInviteToJson(StudyInvite instance) =>
-    <String, dynamic>{
-      'code': instance.code,
-      'study_id': instance.studyId,
-      'preselected_intervention_ids': instance.preselectedInterventionIds,
-    };
+Map<String, dynamic> _$StudyInviteToJson(StudyInvite instance) {
+  final val = <String, dynamic>{
+    'code': instance.code,
+    'study_id': instance.studyId,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull(
+      'preselected_intervention_ids', instance.preselectedInterventionIds);
+  return val;
+}
diff --git a/core/lib/src/models/tables/study_subject.g.dart b/core/lib/src/models/tables/study_subject.g.dart
index d36af0389..bf851a5a8 100644
--- a/core/lib/src/models/tables/study_subject.g.dart
+++ b/core/lib/src/models/tables/study_subject.g.dart
@@ -20,13 +20,22 @@ StudySubject _$StudySubjectFromJson(Map<String, dynamic> json) => StudySubject(
       ..inviteCode = json['invite_code'] as String?
       ..isDeleted = json['is_deleted'] as bool;
 
-Map<String, dynamic> _$StudySubjectToJson(StudySubject instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'study_id': instance.studyId,
-      'user_id': instance.userId,
-      'started_at': instance.startedAt?.toIso8601String(),
-      'selected_intervention_ids': instance.selectedInterventionIds,
-      'invite_code': instance.inviteCode,
-      'is_deleted': instance.isDeleted,
-    };
+Map<String, dynamic> _$StudySubjectToJson(StudySubject instance) {
+  final val = <String, dynamic>{
+    'id': instance.id,
+    'study_id': instance.studyId,
+    'user_id': instance.userId,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('started_at', instance.startedAt?.toIso8601String());
+  val['selected_intervention_ids'] = instance.selectedInterventionIds;
+  writeNotNull('invite_code', instance.inviteCode);
+  val['is_deleted'] = instance.isDeleted;
+  return val;
+}
diff --git a/core/lib/src/models/tables/subject_progress.g.dart b/core/lib/src/models/tables/subject_progress.g.dart
index 47d7fb451..0b5d8ff49 100644
--- a/core/lib/src/models/tables/subject_progress.g.dart
+++ b/core/lib/src/models/tables/subject_progress.g.dart
@@ -17,12 +17,20 @@ SubjectProgress _$SubjectProgressFromJson(Map<String, dynamic> json) =>
         ? null
         : DateTime.parse(json['completed_at'] as String);
 
-Map<String, dynamic> _$SubjectProgressToJson(SubjectProgress instance) =>
-    <String, dynamic>{
-      'completed_at': instance.completedAt?.toIso8601String(),
-      'subject_id': instance.subjectId,
-      'intervention_id': instance.interventionId,
-      'task_id': instance.taskId,
-      'result_type': instance.resultType,
-      'result': instance.result,
-    };
+Map<String, dynamic> _$SubjectProgressToJson(SubjectProgress instance) {
+  final val = <String, dynamic>{};
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('completed_at', instance.completedAt?.toIso8601String());
+  val['subject_id'] = instance.subjectId;
+  val['intervention_id'] = instance.interventionId;
+  val['task_id'] = instance.taskId;
+  val['result_type'] = instance.resultType;
+  val['result'] = instance.result.toJson();
+  return val;
+}
diff --git a/core/lib/src/models/tables/user.g.dart b/core/lib/src/models/tables/user.g.dart
index 54c1d0f1d..fe2299aa4 100644
--- a/core/lib/src/models/tables/user.g.dart
+++ b/core/lib/src/models/tables/user.g.dart
@@ -18,7 +18,7 @@ Map<String, dynamic> _$StudyUUserToJson(StudyUUser instance) =>
     <String, dynamic>{
       'id': instance.id,
       'email': instance.email,
-      'preferences': instance.preferences,
+      'preferences': instance.preferences.toJson(),
     };
 
 Preferences _$PreferencesFromJson(Map<String, dynamic> json) => Preferences(
diff --git a/core/lib/src/models/tasks/schedule.g.dart b/core/lib/src/models/tasks/schedule.g.dart
index 371ee3aed..b9645deb8 100644
--- a/core/lib/src/models/tasks/schedule.g.dart
+++ b/core/lib/src/models/tasks/schedule.g.dart
@@ -15,8 +15,9 @@ Schedule _$ScheduleFromJson(Map<String, dynamic> json) => Schedule()
       .toList();
 
 Map<String, dynamic> _$ScheduleToJson(Schedule instance) => <String, dynamic>{
-      'completionPeriods': instance.completionPeriods,
-      'reminders': instance.reminders,
+      'completionPeriods':
+          instance.completionPeriods.map((e) => e.toJson()).toList(),
+      'reminders': instance.reminders.map((e) => e.toJson()).toList(),
     };
 
 CompletionPeriod _$CompletionPeriodFromJson(Map<String, dynamic> json) =>
@@ -29,6 +30,6 @@ CompletionPeriod _$CompletionPeriodFromJson(Map<String, dynamic> json) =>
 Map<String, dynamic> _$CompletionPeriodToJson(CompletionPeriod instance) =>
     <String, dynamic>{
       'id': instance.id,
-      'unlockTime': instance.unlockTime,
-      'lockTime': instance.lockTime,
+      'unlockTime': instance.unlockTime.toJson(),
+      'lockTime': instance.lockTime.toJson(),
     };
diff --git a/core/lib/src/util/analytics.g.dart b/core/lib/src/util/analytics.g.dart
index 139c61ba4..c512b03a3 100644
--- a/core/lib/src/util/analytics.g.dart
+++ b/core/lib/src/util/analytics.g.dart
@@ -13,9 +13,18 @@ StudyUAnalytics _$StudyUAnalyticsFromJson(Map<String, dynamic> json) =>
       (json['samplingRate'] as num?)?.toDouble(),
     );
 
-Map<String, dynamic> _$StudyUAnalyticsToJson(StudyUAnalytics instance) =>
-    <String, dynamic>{
-      'enabled': instance.enabled,
-      'dsn': instance.dsn,
-      'samplingRate': instance.samplingRate,
-    };
+Map<String, dynamic> _$StudyUAnalyticsToJson(StudyUAnalytics instance) {
+  final val = <String, dynamic>{
+    'enabled': instance.enabled,
+    'dsn': instance.dsn,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('samplingRate', instance.samplingRate);
+  return val;
+}

From 50c4ba6319a819a666fe7dc70cd5987bc7ccc136 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 9 Jun 2024 17:53:52 +0200
Subject: [PATCH 164/314] chore: supabase gitignore

---
 supabase/.gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/supabase/.gitignore b/supabase/.gitignore
index a3ad88055..e80a51a22 100644
--- a/supabase/.gitignore
+++ b/supabase/.gitignore
@@ -1,4 +1,4 @@
 # Supabase
-.branches
-.temp
+.branches/
+.temp/
 .env

From 1e825c45bd0f147f5f145ff67b2a8cb68408e837 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 9 Jun 2024 18:02:19 +0200
Subject: [PATCH 165/314] chore: currentuser nullpointer

---
 designer_v2/lib/repositories/study_repository.dart | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/designer_v2/lib/repositories/study_repository.dart b/designer_v2/lib/repositories/study_repository.dart
index 45aaf8e4f..448bd7abc 100644
--- a/designer_v2/lib/repositories/study_repository.dart
+++ b/designer_v2/lib/repositories/study_repository.dart
@@ -121,7 +121,8 @@ class StudyRepository extends ModelRepository<Study>
           );
     }
 
-    final currentUser = authRepository.currentUser!;
+    final currentUser = authRepository.currentUser;
+    if (currentUser == null) return [];
 
     // TODO: review Postgres policies to match [ModelAction.isAvailable]
     final actions = [

From b17c787ef8fa6633d82ea1208c9d6208839cba6c Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 9 Jun 2024 18:20:38 +0200
Subject: [PATCH 166/314] chore: format

---
 designer_v2/lib/common_views/form_scaffold.dart | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/designer_v2/lib/common_views/form_scaffold.dart b/designer_v2/lib/common_views/form_scaffold.dart
index d956618f3..d5b0e3cf2 100644
--- a/designer_v2/lib/common_views/form_scaffold.dart
+++ b/designer_v2/lib/common_views/form_scaffold.dart
@@ -71,7 +71,9 @@ class _FormScaffoldState<T extends FormViewModel>
     return (bool value) async {
       final backNavigationAllowed = await _promptBackNavigationConfirmation();
       if (backNavigationAllowed) {
-        if (mounted && Navigator.of(context).canPop()) Navigator.of(context).pop();
+        if (mounted && Navigator.of(context).canPop()) {
+          Navigator.of(context).pop();
+        }
       }
     };
   }

From 5fd4582b79bbe0649082395fcb998e050cc62460 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 9 Jun 2024 23:15:14 +0200
Subject: [PATCH 167/314] chore(release): publish packages

 - studyu_app@2.7.6-dev.1
 - studyu_designer_v2@1.8.1-dev.1
---
 CHANGELOG.md             | 28 ++++++++++++++++++++++++++++
 app/CHANGELOG.md         |  6 ++++++
 app/pubspec.yaml         |  2 +-
 designer_v2/CHANGELOG.md |  4 ++++
 designer_v2/pubspec.yaml |  2 +-
 5 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1db85e632..ecf0c4b57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2024-06-09
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`studyu_app` - `v2.7.6-dev.1`](#studyu_app---v276-dev1)
+ - [`studyu_designer_v2` - `v1.8.1-dev.1`](#studyu_designer_v2---v181-dev1)
+
+---
+
+#### `studyu_app` - `v2.7.6-dev.1`
+
+ - **FIX**(app): update android deployment.
+ - **FIX**(app): update ios deployment.
+ - **FIX**(app): update android deployment.
+
+#### `studyu_designer_v2` - `v1.8.1-dev.1`
+
+ - **FIX**: add emojis again.
+
+
 ## 2024-06-07
 
 ### Changes
diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md
index 04fa5959a..70a4072d2 100644
--- a/app/CHANGELOG.md
+++ b/app/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.7.6-dev.1
+
+ - **FIX**(app): update android deployment.
+ - **FIX**(app): update ios deployment.
+ - **FIX**(app): update android deployment.
+
 ## 2.7.6-dev.0
 
  - **FIX**: upgrade deps.
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index efb8e574b..6ceb19ef9 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_app
-version: 2.7.6-dev.0
+version: 2.7.6-dev.1
 description: Partake in digital N-of-1 trials with the innovative StudyU Health App
 publish_to: none
 homepage: https://studyu.health
diff --git a/designer_v2/CHANGELOG.md b/designer_v2/CHANGELOG.md
index 8c8e14f82..ede9b6201 100644
--- a/designer_v2/CHANGELOG.md
+++ b/designer_v2/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.8.1-dev.1
+
+ - **FIX**: add emojis again.
+
 ## 1.8.1-dev.0
 
  - **FIX**: integration test sign out.
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 6d917e59b..197611fa5 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_designer_v2
-version: 1.8.1-dev.0
+version: 1.8.1-dev.1
 description: Implement digital N-of-1 studies seamlessly with the StudyU Health Designer
 publish_to: none
 homepage: https://studyu.health

From 56c862f28fc480b17baacaff6e38a68ddffd5762 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 12 Jun 2024 09:56:08 +0200
Subject: [PATCH 168/314] chore: format

---
 designer_v2/lib/repositories/api_client.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer_v2/lib/repositories/api_client.dart b/designer_v2/lib/repositories/api_client.dart
index 9db7af57d..bac273373 100644
--- a/designer_v2/lib/repositories/api_client.dart
+++ b/designer_v2/lib/repositories/api_client.dart
@@ -140,13 +140,13 @@ class StudyUApiClient extends SupabaseClientDependant
   @override
   Future<List<Study>> getUserStudies({
     bool withParticipantActivity = false,
-    forDashboardDisplay = true,
+    bool forDashboardDisplay = true,
   }) async {
     await _testDelay();
     // TODO: fix Postgres policy for proper multi-tenancy
     final columns = withParticipantActivity
         ? studyWithParticipantActivityColumns
-        : (forDashboardDisplay)
+        : forDashboardDisplay
             ? studyDisplayColumns
             : studyColumns;
     final request = getAll<Study>(selectedColumns: columns);

From daf1a2cffa9a3c3c108fdb3704ee2f988a3139bd Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 12 Jun 2024 09:57:41 +0200
Subject: [PATCH 169/314] chore: upgrade deps

---
 app/pubspec.lock            | 60 ++++++++++++++++++-------------------
 app/pubspec.yaml            |  6 ++--
 core/pubspec.lock           |  8 ++---
 core/pubspec.yaml           |  2 +-
 designer_v2/pubspec.lock    | 12 ++++----
 designer_v2/pubspec.yaml    |  4 +--
 flutter_common/pubspec.lock | 16 +++++-----
 flutter_common/pubspec.yaml |  2 +-
 pubspec.lock                |  4 +--
 pubspec.yaml                |  2 +-
 10 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index f1b37c873..cc2c9b3ed 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -441,18 +441,18 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_widget_from_html
-      sha256: b931148824bcfc24c7be6f2daeabf549e237c9e617e93cd63256d924884ce423
+      sha256: e79144d8a37b7d1075fc1fdebc32708bd142ad9fdf1c7d9444f5e964cc03158b
       url: "https://pub.dev"
     source: hosted
-    version: "0.15.0"
+    version: "0.15.1"
   flutter_widget_from_html_core:
     dependency: transitive
     description:
       name: flutter_widget_from_html_core
-      sha256: cc1d9be3d187ce668ee02091cd5442dfb050cdaf98e0ab9a4d12ad008f966979
+      sha256: df7c7c9e5ea144f7ab0adfbad733b4d4f7d408ab733c94e6e9fdcb327af92aa1
       url: "https://pub.dev"
     source: hosted
-    version: "0.14.12"
+    version: "0.15.1"
   functions_client:
     dependency: transitive
     description:
@@ -465,58 +465,58 @@ packages:
     dependency: transitive
     description:
       name: fwfh_cached_network_image
-      sha256: "952aea958a5fda7d616cc297ba4bc08427e381459e75526fa375d6d8345630d3"
+      sha256: "8e44226801bfba27930673953afce8af44da7e92573be93f60385d9865a089dd"
       url: "https://pub.dev"
     source: hosted
-    version: "0.14.2"
+    version: "0.14.3"
   fwfh_chewie:
     dependency: transitive
     description:
       name: fwfh_chewie
-      sha256: bbb036cd322ab77dc0edd34cbbf76181681f5e414987ece38745dc4f3d7408ed
+      sha256: "37bde9cedfb6dc5546176f7f0c56af1e814966cb33ec58f16c9565ed93ccb704"
       url: "https://pub.dev"
     source: hosted
-    version: "0.14.7"
+    version: "0.14.8"
   fwfh_just_audio:
     dependency: transitive
     description:
       name: fwfh_just_audio
-      sha256: "209cf9644599e37b0edb6961c4f30ce80d156f5a53a50355f75fb4a22f9fdb0a"
+      sha256: "4ff7927619ff4855567a61e126269e1fef985a9fe7e78682592da17bf658aabb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.14.3"
+    version: "0.15.1"
   fwfh_svg:
     dependency: transitive
     description:
       name: fwfh_svg
-      sha256: "3fd83926b7245d287f133a437ef430befd99d3b00ba8c600f26cc324af281f72"
+      sha256: c6bb6b513f7ce2766aba76d7276caf9a96b6fee729ac3a492c366a42f82ef02e
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.1"
+    version: "0.8.2"
   fwfh_url_launcher:
     dependency: transitive
     description:
       name: fwfh_url_launcher
-      sha256: "2a526c9819f74b4106ba2fba4dac79f0082deecd8d2c7011cd0471cb710e3eff"
+      sha256: b9f5d55a5ae2c2c07243ba33f7ba49ac9544bdb2f4c16d8139df9ccbebe3449c
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.0+4"
+    version: "0.9.1"
   fwfh_webview:
     dependency: transitive
     description:
       name: fwfh_webview
-      sha256: "63fa69577d5cbed5603cc91d6a7eca62472a852db14225da2f4ec6839c2f59e6"
+      sha256: "2cd2b1e463ddaf26b7d4f74e1a855126c4a836fdaff9551636693e07a07422b6"
       url: "https://pub.dev"
     source: hosted
-    version: "0.15.0"
+    version: "0.15.1"
   gotrue:
     dependency: transitive
     description:
       name: gotrue
-      sha256: aaefc58b168723f8b5ca2a70ee8c0a051cba16f112be50f41c1ff8fb96b6a6df
+      sha256: b7324a9113bb21c354fd52531d9a9dba6570a9c37b2fc6b424865feb19974476
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.0"
+    version: "2.8.0"
   gtk:
     dependency: transitive
     description:
@@ -825,10 +825,10 @@ packages:
     dependency: transitive
     description:
       name: permission_handler_android
-      sha256: "8bb852cd759488893805c3161d0b2b5db55db52f773dbb014420b304055ba2c5"
+      sha256: b29a799ca03be9f999aa6c39f7de5209482d638e6f857f6b93b0875c618b7e54
       url: "https://pub.dev"
     source: hosted
-    version: "12.0.6"
+    version: "12.0.7"
   permission_handler_apple:
     dependency: transitive
     description:
@@ -873,10 +873,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
+      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.4"
+    version: "3.1.5"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -1188,18 +1188,18 @@ packages:
     dependency: "direct main"
     description:
       name: supabase
-      sha256: "4555658031af0a8b38c7375f28e4b35312291f4aab0ca504dd76661381ce134f"
+      sha256: "1133466d2ec9441e7cff6bf73943f0a6e17cbb5044f6327ca93e3dddc567c882"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
   supabase_flutter:
     dependency: "direct main"
     description:
       name: supabase_flutter
-      sha256: "1d6fb4ffaf50fc6f60507ab8ebf0b7dedbe6fabfbd8066db6f2a6552ddd0ea8c"
+      sha256: "521de6a72fefc0447bd052b0a33be30ed429ac8c39d9028dfbf0f9af2c4c93b2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.4"
+    version: "2.5.5"
   synchronized:
     dependency: transitive
     description:
@@ -1372,18 +1372,18 @@ packages:
     dependency: transitive
     description:
       name: video_player
-      sha256: db6a72d8f4fd155d0189845678f55ad2fd54b02c10dcafd11c068dbb631286c0
+      sha256: aced48e701e24c02b0b7f881a8819e4937794e46b5a5821005e2bf3b40a324cc
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.6"
+    version: "2.8.7"
   video_player_android:
     dependency: transitive
     description:
       name: video_player_android
-      sha256: b7ee816fc517d4029dbeb4ff3a124fb30e644f059abe3ec88b7a1138d487d735
+      sha256: "9529001630e42988f755772972d5014d30121610700e8e502278a245939f8fc8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.17"
+    version: "2.5.0"
   video_player_avfoundation:
     dependency: transitive
     description:
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 6ceb19ef9..58f2bd293 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -23,7 +23,7 @@ dependencies:
   flutter_timezone: ^1.0.8
   flutter_web_plugins:
     sdk: flutter
-  flutter_widget_from_html: ^0.15.0
+  flutter_widget_from_html: ^0.15.1
   intersperse: ^2.0.0
   intl: ^0.19.0
   material_design_icons_flutter: ^7.0.7296
@@ -41,8 +41,8 @@ dependencies:
   shared_preferences: ^2.2.3
   studyu_core: ^4.4.3-dev.0
   studyu_flutter_common: ^1.8.4-dev.0
-  supabase: ^2.2.0
-  supabase_flutter: ^2.5.4
+  supabase: ^2.2.1
+  supabase_flutter: ^2.5.5
   timeline_tile: ^2.0.0
   timezone: ^0.9.3
   universal_html: ^2.2.4
diff --git a/core/pubspec.lock b/core/pubspec.lock
index bd10eb6d5..890bbe4e0 100644
--- a/core/pubspec.lock
+++ b/core/pubspec.lock
@@ -218,10 +218,10 @@ packages:
     dependency: transitive
     description:
       name: gotrue
-      sha256: aaefc58b168723f8b5ca2a70ee8c0a051cba16f112be50f41c1ff8fb96b6a6df
+      sha256: b7324a9113bb21c354fd52531d9a9dba6570a9c37b2fc6b424865feb19974476
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.0"
+    version: "2.8.0"
   graphs:
     dependency: transitive
     description:
@@ -570,10 +570,10 @@ packages:
     dependency: "direct main"
     description:
       name: supabase
-      sha256: "4555658031af0a8b38c7375f28e4b35312291f4aab0ca504dd76661381ce134f"
+      sha256: "1133466d2ec9441e7cff6bf73943f0a6e17cbb5044f6327ca93e3dddc567c882"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
   term_glyph:
     dependency: transitive
     description:
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index 71b920c99..906a38ef0 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
   logger: ^2.3.0
   quiver: ^3.2.1
   sentry: ^8.2.0
-  supabase: ^2.2.0
+  supabase: ^2.2.1
   uuid: ^4.4.0
 
 dev_dependencies:
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 78826fa82..cf52db3eb 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -395,10 +395,10 @@ packages:
     dependency: transitive
     description:
       name: gotrue
-      sha256: aaefc58b168723f8b5ca2a70ee8c0a051cba16f112be50f41c1ff8fb96b6a6df
+      sha256: b7324a9113bb21c354fd52531d9a9dba6570a9c37b2fc6b424865feb19974476
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.0"
+    version: "2.8.0"
   gtk:
     dependency: transitive
     description:
@@ -1059,18 +1059,18 @@ packages:
     dependency: "direct main"
     description:
       name: supabase
-      sha256: "4555658031af0a8b38c7375f28e4b35312291f4aab0ca504dd76661381ce134f"
+      sha256: "1133466d2ec9441e7cff6bf73943f0a6e17cbb5044f6327ca93e3dddc567c882"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
   supabase_flutter:
     dependency: "direct main"
     description:
       name: supabase_flutter
-      sha256: "1d6fb4ffaf50fc6f60507ab8ebf0b7dedbe6fabfbd8066db6f2a6552ddd0ea8c"
+      sha256: "521de6a72fefc0447bd052b0a33be30ed429ac8c39d9028dfbf0f9af2c4c93b2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.4"
+    version: "2.5.5"
   sync_http:
     dependency: transitive
     description:
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 197611fa5..99b632c2d 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -34,8 +34,8 @@ dependencies:
   rxdart: ^0.27.7
   studyu_core: ^4.4.3-dev.0
   studyu_flutter_common: ^1.8.4-dev.0
-  supabase: ^2.2.0
-  supabase_flutter: ^2.5.4
+  supabase: ^2.2.1
+  supabase_flutter: ^2.5.5
   url_launcher: ^6.3.0
   uuid: ^4.4.0
 
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index 4a88183fe..94edb1fdd 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -188,10 +188,10 @@ packages:
     dependency: transitive
     description:
       name: gotrue
-      sha256: aaefc58b168723f8b5ca2a70ee8c0a051cba16f112be50f41c1ff8fb96b6a6df
+      sha256: b7324a9113bb21c354fd52531d9a9dba6570a9c37b2fc6b424865feb19974476
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.0"
+    version: "2.8.0"
   gtk:
     dependency: transitive
     description:
@@ -372,10 +372,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
+      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.4"
+    version: "3.1.5"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -552,18 +552,18 @@ packages:
     dependency: transitive
     description:
       name: supabase
-      sha256: "4555658031af0a8b38c7375f28e4b35312291f4aab0ca504dd76661381ce134f"
+      sha256: "1133466d2ec9441e7cff6bf73943f0a6e17cbb5044f6327ca93e3dddc567c882"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
   supabase_flutter:
     dependency: "direct main"
     description:
       name: supabase_flutter
-      sha256: "1d6fb4ffaf50fc6f60507ab8ebf0b7dedbe6fabfbd8066db6f2a6552ddd0ea8c"
+      sha256: "521de6a72fefc0447bd052b0a33be30ed429ac8c39d9028dfbf0f9af2c4c93b2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.4"
+    version: "2.5.5"
   synchronized:
     dependency: "direct main"
     description:
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index 97e4a4f30..4ae9574e8 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
   flutter_secure_storage: ^9.2.2
   shared_preferences: ^2.2.3 # Can be removed after migrating phase
   studyu_core: ^4.4.3-dev.0
-  supabase_flutter: ^2.5.4
+  supabase_flutter: ^2.5.5
   synchronized: ^3.1.0+1
   uuid: ^4.4.0
 
diff --git a/pubspec.lock b/pubspec.lock
index 255782ece..1763e538e 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -181,10 +181,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
+      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.4"
+    version: "3.1.5"
   pool:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 7e9cec361..f26ed10cf 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: none
 version: 0.4.0
 
 environment:
-  sdk: ">=2.18.0 <3.0.0"
+  sdk: '>=3.0.0 <4.0.0'
 
 dev_dependencies:
   lint: ^2.3.0

From 858a93fc87b0717a186431481d1963de72e3e830 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 12 Jun 2024 10:04:58 +0200
Subject: [PATCH 170/314] chore: lockfiles

---
 app/android/Gemfile.lock | 4 ++--
 app/ios/Gemfile.lock     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/android/Gemfile.lock b/app/android/Gemfile.lock
index 6102ebb87..daec0568f 100644
--- a/app/android/Gemfile.lock
+++ b/app/android/Gemfile.lock
@@ -10,7 +10,7 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.941.0)
+    aws-partitions (1.943.0)
     aws-sdk-core (3.197.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
@@ -19,7 +19,7 @@ GEM
     aws-sdk-kms (1.83.0)
       aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.0)
+    aws-sdk-s3 (1.152.1)
       aws-sdk-core (~> 3, >= 3.197.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
diff --git a/app/ios/Gemfile.lock b/app/ios/Gemfile.lock
index 6102ebb87..daec0568f 100644
--- a/app/ios/Gemfile.lock
+++ b/app/ios/Gemfile.lock
@@ -10,7 +10,7 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.941.0)
+    aws-partitions (1.943.0)
     aws-sdk-core (3.197.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
@@ -19,7 +19,7 @@ GEM
     aws-sdk-kms (1.83.0)
       aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.0)
+    aws-sdk-s3 (1.152.1)
       aws-sdk-core (~> 3, >= 3.197.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)

From 82ac010de02068a9ce79ee6edbef7f680a914af8 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 12 Jun 2024 10:29:14 +0200
Subject: [PATCH 171/314] chore: ios deployment

---
 app/ios/Runner.xcodeproj/project.pbxproj | 203 ++++++++++++-----------
 1 file changed, 107 insertions(+), 96 deletions(-)

diff --git a/app/ios/Runner.xcodeproj/project.pbxproj b/app/ios/Runner.xcodeproj/project.pbxproj
index 32da88680..277b82799 100644
--- a/app/ios/Runner.xcodeproj/project.pbxproj
+++ b/app/ios/Runner.xcodeproj/project.pbxproj
@@ -8,14 +8,14 @@
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		2C0B37CAA7639B0F0E17EC9E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4054400FD08195D6D039426B /* Pods_RunnerTests.framework */; };
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
-		B4D3D9481EDF0C2BD0964E3E /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F115AD174C4ABDE2642BA57E /* Pods_Runner.framework */; };
+		DE4118BD26316093944BB547 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE547177D29B8D213743F79 /* Pods_RunnerTests.framework */; };
+		FC481FC0442D5BFCD045B2A4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08D7BE2B1AE5B4F163FA205D /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -42,37 +42,36 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		068983464CF7CDD3590832BA /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		0478E8710A337E13C25553BB /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		08D7BE2B1AE5B4F163FA205D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		24A7CEAF7A5088D16B69966D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		4054400FD08195D6D039426B /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		53C2C7121DC855633D5FEB06 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
-		5DB7F232F74A09A72F6AD57F /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		8AA78B79C4823734C6A0AE13 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
-		9011E63D7F66016CEDA6A1F7 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
-		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		E8DED1FBAADC53ADE2681E37 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
-		F115AD174C4ABDE2642BA57E /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		A2DFB344666DB82893BA7FC6 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		B460FAC5445920DDC9850928 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
+		BA7676A230E68AD3052DD1FC /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
+		DCE547177D29B8D213743F79 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		EECA26449F4B4D025A92396E /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		526870A4F4835F50D09866E7 /* Frameworks */ = {
+		5E6821C3162E0BA77F37A0B6 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2C0B37CAA7639B0F0E17EC9E /* Pods_RunnerTests.framework in Frameworks */,
+				DE4118BD26316093944BB547 /* Pods_RunnerTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -80,13 +79,22 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B4D3D9481EDF0C2BD0964E3E /* Pods_Runner.framework in Frameworks */,
+				FC481FC0442D5BFCD045B2A4 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		23971B813AD3D63C4CE72982 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				08D7BE2B1AE5B4F163FA205D /* Pods_Runner.framework */,
+				DCE547177D29B8D213743F79 /* Pods_RunnerTests.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		331C8082294A63A400263BE5 /* RunnerTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -95,13 +103,25 @@
 			path = RunnerTests;
 			sourceTree = "<group>";
 		};
+		6502177C35D2F3021D741B69 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				24A7CEAF7A5088D16B69966D /* Pods-Runner.debug.xcconfig */,
+				0478E8710A337E13C25553BB /* Pods-Runner.release.xcconfig */,
+				A2DFB344666DB82893BA7FC6 /* Pods-Runner.profile.xcconfig */,
+				BA7676A230E68AD3052DD1FC /* Pods-RunnerTests.debug.xcconfig */,
+				B460FAC5445920DDC9850928 /* Pods-RunnerTests.release.xcconfig */,
+				EECA26449F4B4D025A92396E /* Pods-RunnerTests.profile.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
-				9740EEB31CF90195004384FC /* Generated.xcconfig */,
 			);
 			name = Flutter;
 			sourceTree = "<group>";
@@ -113,8 +133,8 @@
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
 				331C8082294A63A400263BE5 /* RunnerTests */,
-				C4FA2E59E94821951CF50F29 /* Pods */,
-				CFDC1B1E68702D22D28FF4A6 /* Frameworks */,
+				6502177C35D2F3021D741B69 /* Pods */,
+				23971B813AD3D63C4CE72982 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -142,29 +162,6 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
-		C4FA2E59E94821951CF50F29 /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				068983464CF7CDD3590832BA /* Pods-Runner.debug.xcconfig */,
-				5DB7F232F74A09A72F6AD57F /* Pods-Runner.release.xcconfig */,
-				53C2C7121DC855633D5FEB06 /* Pods-Runner.profile.xcconfig */,
-				E8DED1FBAADC53ADE2681E37 /* Pods-RunnerTests.debug.xcconfig */,
-				9011E63D7F66016CEDA6A1F7 /* Pods-RunnerTests.release.xcconfig */,
-				8AA78B79C4823734C6A0AE13 /* Pods-RunnerTests.profile.xcconfig */,
-			);
-			name = Pods;
-			path = Pods;
-			sourceTree = "<group>";
-		};
-		CFDC1B1E68702D22D28FF4A6 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				F115AD174C4ABDE2642BA57E /* Pods_Runner.framework */,
-				4054400FD08195D6D039426B /* Pods_RunnerTests.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -172,10 +169,10 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
 			buildPhases = (
-				2DE1FE9399C152E151A275B9 /* [CP] Check Pods Manifest.lock */,
+				981263AE3167A46D87159B77 /* [CP] Check Pods Manifest.lock */,
 				331C807D294A63A400263BE5 /* Sources */,
 				331C807F294A63A400263BE5 /* Resources */,
-				526870A4F4835F50D09866E7 /* Frameworks */,
+				5E6821C3162E0BA77F37A0B6 /* Frameworks */,
 			);
 			buildRules = (
 			);
@@ -191,15 +188,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				9629C3DEB1E88775B661C61C /* [CP] Check Pods Manifest.lock */,
+				4D1CF857AD8F68E56E755C00 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				6F4EA73A919628CAFDE30C92 /* [CP] Embed Pods Frameworks */,
-				860B6597EF246AC3E75A1AFB /* [CP] Copy Pods Resources */,
+				C2C30BD0C13D89C7E793B3B1 /* [CP] Embed Pods Frameworks */,
+				C5D6FA130EE6A24643B63C2A /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -231,7 +228,7 @@
 				};
 			};
 			buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
-			compatibilityVersion = "Xcode 9.3";
+			compatibilityVersion = "Xcode 15.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -271,7 +268,23 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		2DE1FE9399C152E151A275B9 /* [CP] Check Pods Manifest.lock */ = {
+		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
+			);
+			name = "Thin Binary";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+		};
+		4D1CF857AD8F68E56E755C00 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -286,100 +299,84 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
-			name = "Thin Binary";
+			name = "Run Script";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
-		6F4EA73A919628CAFDE30C92 /* [CP] Embed Pods Frameworks */ = {
+		981263AE3167A46D87159B77 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Embed Pods Frameworks";
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		860B6597EF246AC3E75A1AFB /* [CP] Copy Pods Resources */ = {
+		C2C30BD0C13D89C7E793B3B1 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Copy Pods Resources";
+			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		9629C3DEB1E88775B661C61C /* [CP] Check Pods Manifest.lock */ = {
+		C5D6FA130EE6A24643B63C2A /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -434,7 +431,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -464,7 +460,6 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -488,15 +483,23 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = PG566C9XUK;
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = PG566C9XUK;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = health.studyu.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "match AppStore health.studyu.app";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore health.studyu.app";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -505,7 +508,7 @@
 		};
 		331C8088294A63A400263BE5 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E8DED1FBAADC53ADE2681E37 /* Pods-RunnerTests.debug.xcconfig */;
+			baseConfigurationReference = BA7676A230E68AD3052DD1FC /* Pods-RunnerTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -523,7 +526,7 @@
 		};
 		331C8089294A63A400263BE5 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9011E63D7F66016CEDA6A1F7 /* Pods-RunnerTests.release.xcconfig */;
+			baseConfigurationReference = B460FAC5445920DDC9850928 /* Pods-RunnerTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -539,7 +542,7 @@
 		};
 		331C808A294A63A400263BE5 /* Profile */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 8AA78B79C4823734C6A0AE13 /* Pods-RunnerTests.profile.xcconfig */;
+			baseConfigurationReference = EECA26449F4B4D025A92396E /* Pods-RunnerTests.profile.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -557,7 +560,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -587,7 +589,6 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -614,7 +615,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -644,7 +644,6 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -670,15 +669,21 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = PG566C9XUK;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = health.studyu.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "match AppStore health.studyu.app";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -692,15 +697,21 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = PG566C9XUK;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = health.studyu.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "match AppStore health.studyu.app";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";

From eb30ce64228f34fbf75285f8ad4591448a3674ec Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 12 Jun 2024 10:30:08 +0200
Subject: [PATCH 172/314] style: linter deps

---
 app/analysis_options.yaml            | 5 +++++
 app/pubspec.lock                     | 8 ++++++++
 app/pubspec.yaml                     | 1 +
 core/analysis_options.yaml           | 5 +++++
 flutter_common/analysis_options.yaml | 5 +++++
 flutter_common/pubspec.lock          | 8 ++++++++
 flutter_common/pubspec.yaml          | 1 +
 7 files changed, 33 insertions(+)
 create mode 100644 app/analysis_options.yaml
 create mode 100644 core/analysis_options.yaml
 create mode 100644 flutter_common/analysis_options.yaml

diff --git a/app/analysis_options.yaml b/app/analysis_options.yaml
new file mode 100644
index 000000000..0310d91c6
--- /dev/null
+++ b/app/analysis_options.yaml
@@ -0,0 +1,5 @@
+include: ../analysis_options.yaml
+
+analyzer:
+  plugins:
+    - custom_lint
diff --git a/app/pubspec.lock b/app/pubspec.lock
index cc2c9b3ed..4c6f843f7 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -645,6 +645,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.1"
+  lint:
+    dependency: "direct dev"
+    description:
+      name: lint
+      sha256: d758a5211fce7fd3f5e316f804daefecdc34c7e53559716125e6da7388ae8565
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.0"
   lints:
     dependency: transitive
     description:
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 58f2bd293..354692dfd 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -55,6 +55,7 @@ dev_dependencies:
   flutter_lints: ^4.0.0
   flutter_test:
     sdk: flutter
+  lint: ^2.3.0
 
 dependency_overrides:
   intl: ^0.19.0
diff --git a/core/analysis_options.yaml b/core/analysis_options.yaml
new file mode 100644
index 000000000..0310d91c6
--- /dev/null
+++ b/core/analysis_options.yaml
@@ -0,0 +1,5 @@
+include: ../analysis_options.yaml
+
+analyzer:
+  plugins:
+    - custom_lint
diff --git a/flutter_common/analysis_options.yaml b/flutter_common/analysis_options.yaml
new file mode 100644
index 000000000..0310d91c6
--- /dev/null
+++ b/flutter_common/analysis_options.yaml
@@ -0,0 +1,5 @@
+include: ../analysis_options.yaml
+
+analyzer:
+  plugins:
+    - custom_lint
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index 94edb1fdd..c48f1497e 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -264,6 +264,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.1"
+  lint:
+    dependency: "direct main"
+    description:
+      name: lint
+      sha256: d758a5211fce7fd3f5e316f804daefecdc34c7e53559716125e6da7388ae8565
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.0"
   lints:
     dependency: transitive
     description:
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index 4ae9574e8..60ebd4864 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -12,6 +12,7 @@ dependencies:
     sdk: flutter
   flutter_dotenv: ^5.1.0
   flutter_secure_storage: ^9.2.2
+  lint: ^2.3.0
   shared_preferences: ^2.2.3 # Can be removed after migrating phase
   studyu_core: ^4.4.3-dev.0
   supabase_flutter: ^2.5.5

From b4665c734ea9722d04667b7d228e098e162cc503 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 12 Jun 2024 11:04:36 +0200
Subject: [PATCH 173/314] fix: formatting issues

---
 app/analysis_options.yaml                     |   2 +
 app/lib/app.dart                              |  13 +-
 app/lib/main.dart                             |  60 +++---
 app/lib/models/app_state.dart                 |   2 +-
 app/lib/routes.dart                           |  71 ++++---
 app/lib/screens/app_onboarding/about.dart     |  22 +--
 .../app_onboarding/app_outdated_screen.dart   |  14 +-
 .../app_onboarding/loading_screen.dart        |  37 ++--
 app/lib/screens/app_onboarding/preview.dart   |   2 +-
 app/lib/screens/app_onboarding/terms.dart     |  19 +-
 app/lib/screens/app_onboarding/welcome.dart   |  14 +-
 .../dashboard/contact_tab/contact_screen.dart |  14 +-
 .../study/dashboard/contact_tab/faq.dart      |  10 +-
 .../screens/study/dashboard/dashboard.dart    | 187 ++++++++++--------
 app/lib/screens/study/dashboard/settings.dart |  20 +-
 .../task_overview_tab/progress_row.dart       |  11 +-
 .../dashboard/task_overview_tab/task_box.dart |  17 +-
 .../task_overview_tab/task_overview.dart      |  21 +-
 .../multimodal/capture_picture_screen.dart    |  21 +-
 app/lib/screens/study/onboarding/consent.dart |  53 +++--
 .../study/onboarding/eligibility_screen.dart  |  19 +-
 .../onboarding/intervention_selection.dart    |  18 +-
 .../study/onboarding/journey_overview.dart    |  19 +-
 app/lib/screens/study/onboarding/kickoff.dart |   7 +-
 .../study/onboarding/onboarding_progress.dart |   2 +-
 .../study/onboarding/study_overview.dart      |  19 +-
 .../study/onboarding/study_selection.dart     |  33 ++--
 .../study/report/disclaimer_section.dart      |   2 +-
 .../study/report/general_details_section.dart |   5 +-
 .../performance/performance_details.dart      |  23 ++-
 .../performance/performance_section.dart      |  15 +-
 .../screens/study/report/report_details.dart  |  17 +-
 .../screens/study/report/report_history.dart  |  11 +-
 .../report/report_section_container.dart      |  11 +-
 .../sections/average_section_widget.dart      |  82 ++++----
 .../study/report/util/plot_utilities.dart     |   2 +-
 app/lib/screens/study/tasks/task_screen.dart  |  23 ++-
 app/lib/util/app_analytics.dart               |  15 +-
 app/lib/util/cache.dart                       |  48 +++--
 app/lib/util/color.dart                       |   2 +-
 app/lib/util/data_processing.dart             |   4 +-
 app/lib/util/intervention.dart                |   7 +-
 app/lib/util/notifications.dart               |  12 +-
 app/lib/util/save_pdf.dart                    |   4 +-
 app/lib/util/schedule_notifications.dart      |  29 ++-
 app/lib/util/study_subject_extension.dart     |   7 +-
 app/lib/util/temporary_storage_handler.dart   |   6 +-
 .../widgets/bottom_onboarding_navigation.dart |   2 +-
 app/lib/widgets/html_text.dart                |   2 +-
 app/lib/widgets/intervention_card.dart        |  20 +-
 .../audio_recording_question_widget.dart      | 179 +++++++++--------
 .../widgets/questionnaire/custom_slider.dart  |  88 +++++----
 .../image_capturing_question_widget.dart      |  12 +-
 .../questionnaire/question_container.dart     |  35 ++--
 .../questionnaire/question_header.dart        |   2 +-
 .../questionnaire/questionnaire_widget.dart   |  10 +-
 .../annotated_scale_question_widget.dart      |   9 +-
 .../questions/boolean_question_widget.dart    |   5 +-
 .../questions/choice_question_widget.dart     |   4 +-
 .../questions/free_text_question_widget.dart  |   2 +-
 .../questions/scale_question_widget.dart      |  11 +-
 .../visual_analogue_question_widget.dart      |  15 +-
 app/lib/widgets/selectable_button.dart        |   2 +-
 app/lib/widgets/study_tile.dart               |   4 +-
 core/analysis_options.yaml                    |   2 +
 flutter_common/analysis_options.yaml          |   2 +
 .../lib/src/utils/retry_future_builder.dart   |   8 +-
 flutter_common/lib/src/utils/storage.dart     |   4 +-
 flutter_common/lib/src/utils/user.dart        |  11 +-
 69 files changed, 759 insertions(+), 722 deletions(-)

diff --git a/app/analysis_options.yaml b/app/analysis_options.yaml
index 0310d91c6..f689b7b48 100644
--- a/app/analysis_options.yaml
+++ b/app/analysis_options.yaml
@@ -1,5 +1,7 @@
 include: ../analysis_options.yaml
 
 analyzer:
+  errors:
+    avoid_classes_with_only_static_members: ignore
   plugins:
     - custom_lint
diff --git a/app/lib/app.dart b/app/lib/app.dart
index b9631cf66..755c4336b 100644
--- a/app/lib/app.dart
+++ b/app/lib/app.dart
@@ -2,18 +2,17 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:provider/provider.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
+import 'package:studyu_app/main.dart';
+import 'package:studyu_app/models/app_state.dart';
+import 'package:studyu_app/routes.dart';
+import 'package:studyu_app/theme.dart';
 import 'package:studyu_app/util/app_analytics.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_flutter_common/studyu_flutter_common.dart';
 
-import 'main.dart';
-import 'models/app_state.dart';
-import 'routes.dart';
-import 'theme.dart';
-
 class MyApp extends StatefulWidget {
   const MyApp(this.queryParameters, this.appConfig,
-      {super.key, required this.initialRoute});
+      {super.key, required this.initialRoute,});
   final Map<String, String> queryParameters;
   final AppConfig? appConfig;
   final String initialRoute;
@@ -34,7 +33,7 @@ class _MyAppState extends State<MyApp> {
       providers: [
         ChangeNotifierProvider<AppLanguage>(
             create: (context) =>
-                AppLanguage(AppLocalizations.supportedLocales)),
+                AppLanguage(AppLocalizations.supportedLocales),),
         ChangeNotifierProvider<AppState>(create: (context) => AppState()),
       ],
       child: Consumer<AppLanguage>(
diff --git a/app/lib/main.dart b/app/lib/main.dart
index 805c17258..9de88a085 100644
--- a/app/lib/main.dart
+++ b/app/lib/main.dart
@@ -7,6 +7,7 @@ import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:flutter_timezone/flutter_timezone.dart';
 import 'package:flutter_web_plugins/url_strategy.dart';
 import 'package:package_info_plus/package_info_plus.dart';
+import 'package:studyu_app/app.dart';
 import 'package:studyu_app/routes.dart';
 import 'package:studyu_app/util/app_analytics.dart';
 import 'package:studyu_core/core.dart';
@@ -14,8 +15,6 @@ import 'package:studyu_flutter_common/studyu_flutter_common.dart';
 import 'package:timezone/data/latest_all.dart' as tz;
 import 'package:timezone/timezone.dart' as tz;
 
-import 'app.dart';
-
 @pragma('vm:entry-point')
 void notificationTapBackground(NotificationResponse notificationResponse) {
   // ignore: avoid_print
@@ -25,7 +24,8 @@ void notificationTapBackground(NotificationResponse notificationResponse) {
   if (notificationResponse.input?.isNotEmpty ?? false) {
     // ignore: avoid_print
     print(
-        'notification action tapped with input: ${notificationResponse.input}');
+      'notification action tapped with input: ${notificationResponse.input}',
+    );
   }
 }
 
@@ -53,39 +53,47 @@ Future<void> main() async {
   }
 
   await AppAnalytics.init();
-  if (!kDebugMode && AppAnalytics.isUserEnabled) {
-    AppAnalytics.start(appConfig,
-        MyApp(queryParameters, appConfig, initialRoute: initialRoute));
+  if (!kDebugMode &&
+      AppAnalytics.isUserEnabled != null &&
+      AppAnalytics.isUserEnabled!) {
+    AppAnalytics.start(
+      appConfig,
+      MyApp(queryParameters, appConfig, initialRoute: initialRoute),
+    );
   } else {
     runApp(MyApp(queryParameters, appConfig, initialRoute: initialRoute));
   }
 
-  AppLifecycleListener(onResume: () async {
-    try {
-      final navigatorState = navigatorKey.currentState;
-      if (navigatorState == null) return;
-      String? currentRoute;
-      navigatorState.popUntil((route) {
-        currentRoute = route.settings.name;
-        return true;
-      });
-      if (currentRoute == Routes.appOutdated) return;
-      final appConfig = await AppConfig.getAppConfig();
-      if (await isAppOutdated(appConfig)) {
-        await navigatorState.pushNamedAndRemoveUntil(
-            Routes.appOutdated, (route) => false);
+  AppLifecycleListener(
+    onResume: () async {
+      try {
+        final navigatorState = navigatorKey.currentState;
+        if (navigatorState == null) return;
+        String? currentRoute;
+        navigatorState.popUntil((route) {
+          currentRoute = route.settings.name;
+          return true;
+        });
+        if (currentRoute == Routes.appOutdated) return;
+        final appConfig = await AppConfig.getAppConfig();
+        if (await isAppOutdated(appConfig)) {
+          await navigatorState.pushNamedAndRemoveUntil(
+            Routes.appOutdated,
+            (route) => false,
+          );
+        }
+      } catch (error) {
+        // device could be offline
+        debugPrint('Error fetching app config: $error');
       }
-    } catch (error) {
-      // device could be offline
-      debugPrint('Error fetching app config: $error');
-    }
-  });
+    },
+  );
 }
 
 /// Checks major and minor version of the app against the minimum version required by the backend
 /// Returns true if the app is outdated
 Future<bool> isAppOutdated(AppConfig appConfig) async {
-  PackageInfo packageInfo = await PackageInfo.fromPlatform();
+  final PackageInfo packageInfo = await PackageInfo.fromPlatform();
   final appVersion = packageInfo.version;
   final appVersionParts = appVersion.split('.');
   final minVersionParts = appConfig.appMinVersion.split('.');
diff --git a/app/lib/models/app_state.dart b/app/lib/models/app_state.dart
index 6a4096129..0070628bb 100644
--- a/app/lib/models/app_state.dart
+++ b/app/lib/models/app_state.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:studyu_app/util/app_analytics.dart';
-import 'package:studyu_app/util/notifications.dart';
 import 'package:studyu_app/util/cache.dart';
+import 'package:studyu_app/util/notifications.dart';
 import 'package:studyu_app/util/schedule_notifications.dart';
 import 'package:studyu_core/core.dart';
 
diff --git a/app/lib/routes.dart b/app/lib/routes.dart
index ed4a3a9d7..f5928ef85 100644
--- a/app/lib/routes.dart
+++ b/app/lib/routes.dart
@@ -1,22 +1,21 @@
 // ignore_for_file: avoid_classes_with_only_static_members
 import 'package:flutter/material.dart';
-
-import 'screens/app_onboarding/about.dart';
-import 'screens/app_onboarding/loading_screen.dart';
-import 'screens/app_onboarding/terms.dart';
-import 'screens/app_onboarding/welcome.dart';
-import 'screens/app_onboarding/app_outdated_screen.dart';
-import 'screens/study/dashboard/contact_tab/contact_screen.dart';
-import 'screens/study/dashboard/contact_tab/faq.dart';
-import 'screens/study/dashboard/dashboard.dart';
-import 'screens/study/dashboard/settings.dart';
-import 'screens/study/onboarding/consent.dart';
-import 'screens/study/onboarding/intervention_selection.dart';
-import 'screens/study/onboarding/journey_overview.dart';
-import 'screens/study/onboarding/kickoff.dart';
-import 'screens/study/onboarding/study_overview.dart';
-import 'screens/study/onboarding/study_selection.dart';
-import 'screens/study/report/report_history.dart';
+import 'package:studyu_app/screens/app_onboarding/about.dart';
+import 'package:studyu_app/screens/app_onboarding/app_outdated_screen.dart';
+import 'package:studyu_app/screens/app_onboarding/loading_screen.dart';
+import 'package:studyu_app/screens/app_onboarding/terms.dart';
+import 'package:studyu_app/screens/app_onboarding/welcome.dart';
+import 'package:studyu_app/screens/study/dashboard/contact_tab/contact_screen.dart';
+import 'package:studyu_app/screens/study/dashboard/contact_tab/faq.dart';
+import 'package:studyu_app/screens/study/dashboard/dashboard.dart';
+import 'package:studyu_app/screens/study/dashboard/settings.dart';
+import 'package:studyu_app/screens/study/onboarding/consent.dart';
+import 'package:studyu_app/screens/study/onboarding/intervention_selection.dart';
+import 'package:studyu_app/screens/study/onboarding/journey_overview.dart';
+import 'package:studyu_app/screens/study/onboarding/kickoff.dart';
+import 'package:studyu_app/screens/study/onboarding/study_overview.dart';
+import 'package:studyu_app/screens/study/onboarding/study_selection.dart';
+import 'package:studyu_app/screens/study/report/report_history.dart';
 
 class Routes {
   static const String loading = '/loading';
@@ -48,7 +47,7 @@ class Routes {
             child: Padding(
               padding: const EdgeInsets.all(16),
               child: Text(
-                  'No route defined for ${settings.name}.\nThe developers should fix this 👩‍💻'),
+                  'No route defined for ${settings.name}.\nThe developers should fix this 👩‍💻',),
             ),
           ),
         ),
@@ -57,62 +56,62 @@ class Routes {
   }
 
   static Route<dynamic>? generateRoute(
-      RouteSettings settings, Map<String, String> queryParameters) {
+      RouteSettings settings, Map<String, String> queryParameters,) {
     final uri = Uri.parse(settings.name!);
     switch (uri.path) {
       case loading:
         return MaterialPageRoute(
-            builder: (_) => const LoadingScreen(), settings: settings);
+            builder: (_) => const LoadingScreen(), settings: settings,);
       case preview:
         return MaterialPageRoute(
             builder: (_) => LoadingScreen(queryParameters: queryParameters),
-            settings: settings);
+            settings: settings,);
       case appOutdated:
         return MaterialPageRoute(
-            builder: (_) => const AppOutdatedScreen(), settings: settings);
+            builder: (_) => const AppOutdatedScreen(), settings: settings,);
       case dashboard:
         return MaterialPageRoute(
-            builder: (_) => const DashboardScreen(), settings: settings);
+            builder: (_) => const DashboardScreen(), settings: settings,);
       case welcome:
         return MaterialPageRoute(
-            builder: (_) => const WelcomeScreen(), settings: settings);
+            builder: (_) => const WelcomeScreen(), settings: settings,);
       case about:
         return MaterialPageRoute(
-            builder: (_) => const AboutScreen(), settings: settings);
+            builder: (_) => const AboutScreen(), settings: settings,);
       case terms:
         return MaterialPageRoute(
-            builder: (_) => const TermsScreen(), settings: settings);
+            builder: (_) => const TermsScreen(), settings: settings,);
       case studySelection:
         return MaterialPageRoute(
-            builder: (_) => const StudySelectionScreen(), settings: settings);
+            builder: (_) => const StudySelectionScreen(), settings: settings,);
       case studyOverview:
         return MaterialPageRoute(
-            builder: (_) => const StudyOverviewScreen(), settings: settings);
+            builder: (_) => const StudyOverviewScreen(), settings: settings,);
       case interventionSelection:
         return MaterialPageRoute(
             builder: (_) => const InterventionSelectionScreen(),
-            settings: settings);
+            settings: settings,);
       case journey:
         return MaterialPageRoute(
-            builder: (_) => const JourneyOverviewScreen(), settings: settings);
+            builder: (_) => const JourneyOverviewScreen(), settings: settings,);
       case consent:
         return MaterialPageRoute<bool>(
-            builder: (_) => const ConsentScreen(), settings: settings);
+            builder: (_) => const ConsentScreen(), settings: settings,);
       case kickoff:
         return MaterialPageRoute(
-            builder: (_) => const KickoffScreen(), settings: settings);
+            builder: (_) => const KickoffScreen(), settings: settings,);
       case contact:
         return MaterialPageRoute(
-            builder: (_) => const ContactScreen(), settings: settings);
+            builder: (_) => const ContactScreen(), settings: settings,);
       case faq:
         return MaterialPageRoute(
-            builder: (_) => const FAQ(), settings: settings);
+            builder: (_) => const FAQ(), settings: settings,);
       case appSettings:
         return MaterialPageRoute(
-            builder: (_) => const Settings(), settings: settings);
+            builder: (_) => const Settings(), settings: settings,);
       case reportHistory:
         return MaterialPageRoute(
-            builder: (_) => const ReportHistoryScreen(), settings: settings);
+            builder: (_) => const ReportHistoryScreen(), settings: settings,);
       default:
         //final potentialSessionString = Uri.decodeComponent(settings.name.replaceFirst('/', ''));
         //return MaterialPageRoute(builder: (_) => LoadingScreen(sessionString: potentialSessionString));
diff --git a/app/lib/screens/app_onboarding/about.dart b/app/lib/screens/app_onboarding/about.dart
index e37a7b7c3..e5c3e086d 100644
--- a/app/lib/screens/app_onboarding/about.dart
+++ b/app/lib/screens/app_onboarding/about.dart
@@ -35,7 +35,7 @@ class AboutScreen extends StatelessWidget {
                     ),
                     Expanded(
                       child: Icon(MdiIcons.sleepOff,
-                          size: 80, color: Colors.black),
+                          size: 80, color: Colors.black,),
                     ),
                   ],
                 ),
@@ -109,7 +109,7 @@ class AboutScreen extends StatelessWidget {
                   children: [
                     Expanded(
                       child: Icon(MdiIcons.accountQuestion,
-                          size: 80, color: Colors.blue),
+                          size: 80, color: Colors.blue,),
                     ),
                   ],
                 ),
@@ -146,8 +146,8 @@ class AboutScreen extends StatelessWidget {
                   children: [
                     Expanded(
                       child: Icon(MdiIcons.exclamationThick,
-                          size: 80, color: Colors.blue),
-                    )
+                          size: 80, color: Colors.blue,),
+                    ),
                   ],
                 ),
                 const SizedBox(height: 50),
@@ -183,7 +183,7 @@ class AboutScreen extends StatelessWidget {
                   children: [
                     Expanded(
                       child: Icon(MdiIcons.alphaNBoxOutline,
-                          size: 80, color: Colors.blue),
+                          size: 80, color: Colors.blue,),
                     ),
                     const Expanded(
                       child: Text(
@@ -194,7 +194,7 @@ class AboutScreen extends StatelessWidget {
                     ),
                     Expanded(
                       child: Icon(MdiIcons.numeric1BoxOutline,
-                          size: 80, color: Colors.blue),
+                          size: 80, color: Colors.blue,),
                     ),
                   ],
                 ),
@@ -231,7 +231,7 @@ class AboutScreen extends StatelessWidget {
                   children: [
                     Expanded(
                       child: Icon(MdiIcons.notebookOutline,
-                          size: 80, color: Colors.blue),
+                          size: 80, color: Colors.blue,),
                     ),
                   ],
                 ),
@@ -268,7 +268,7 @@ class AboutScreen extends StatelessWidget {
                   children: [
                     Expanded(
                       child: Icon(MdiIcons.alignVerticalBottom,
-                          size: 80, color: Colors.blue),
+                          size: 80, color: Colors.blue,),
                     ),
                   ],
                 ),
@@ -305,7 +305,7 @@ class AboutScreen extends StatelessWidget {
                   children: [
                     Expanded(
                       child: Icon(MdiIcons.progressCheck,
-                          size: 80, color: Colors.blue),
+                          size: 80, color: Colors.blue,),
                     ),
                   ],
                 ),
@@ -338,7 +338,7 @@ class AboutScreen extends StatelessWidget {
               mainAxisAlignment: MainAxisAlignment.center,
               children: <Widget>[
                 const Image(
-                    image: AssetImage('assets/icon/logo.png'), height: 200),
+                    image: AssetImage('assets/icon/logo.png'), height: 200,),
                 const SizedBox(height: 50),
                 Text(
                   AppLocalizations.of(context)!.description_part9,
@@ -351,7 +351,7 @@ class AboutScreen extends StatelessWidget {
                     icon: Icon(MdiIcons.rocket),
                     onPressed: () => Navigator.pushNamed(context, Routes.terms),
                     label: Text(AppLocalizations.of(context)!.get_started,
-                        style: const TextStyle(fontSize: 20)),
+                        style: const TextStyle(fontSize: 20),),
                   ),
               ],
             ),
diff --git a/app/lib/screens/app_onboarding/app_outdated_screen.dart b/app/lib/screens/app_onboarding/app_outdated_screen.dart
index b8950a391..959d9df15 100644
--- a/app/lib/screens/app_onboarding/app_outdated_screen.dart
+++ b/app/lib/screens/app_onboarding/app_outdated_screen.dart
@@ -30,26 +30,24 @@ class AppOutdatedScreen extends StatelessWidget {
             children: <Widget>[
               const Spacer(),
               const Image(
-                  image: AssetImage('assets/icon/logo.png'), height: 200),
+                  image: AssetImage('assets/icon/logo.png'), height: 200,),
               const SizedBox(height: 20),
               Padding(
                 padding: const EdgeInsets.all(20),
                 child: Text(loc.app_outdated_message,
                     textAlign: TextAlign.center,
-                    style: const TextStyle(fontSize: 20)),
+                    style: const TextStyle(fontSize: 20),),
               ),
               const Spacer(),
-              storeUrl != null && storeIcon != null
-                  ? OutlinedButton.icon(
+              if (storeUrl != null && storeIcon != null) OutlinedButton.icon(
                       icon: Icon(storeIcon),
                       onPressed: () async {
                         await launchUrl(Uri.parse(storeUrl!),
-                            mode: LaunchMode.externalNonBrowserApplication);
+                            mode: LaunchMode.externalNonBrowserApplication,);
                       },
                       label: Text(loc.update_now,
-                          style: const TextStyle(fontSize: 20)),
-                    )
-                  : const SizedBox.shrink(),
+                          style: const TextStyle(fontSize: 20),),
+                    ) else const SizedBox.shrink(),
               const Spacer(),
             ],
           ),
diff --git a/app/lib/screens/app_onboarding/loading_screen.dart b/app/lib/screens/app_onboarding/loading_screen.dart
index e625a05a7..2b218d67f 100644
--- a/app/lib/screens/app_onboarding/loading_screen.dart
+++ b/app/lib/screens/app_onboarding/loading_screen.dart
@@ -3,15 +3,15 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:provider/provider.dart';
+import 'package:studyu_app/models/app_state.dart';
+import 'package:studyu_app/routes.dart';
 import 'package:studyu_app/screens/app_onboarding/iframe_helper.dart';
+import 'package:studyu_app/screens/app_onboarding/preview.dart';
 import 'package:studyu_app/screens/study/onboarding/eligibility_screen.dart';
 import 'package:studyu_app/screens/study/tasks/task_screen.dart';
 import 'package:studyu_app/util/cache.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_flutter_common/studyu_flutter_common.dart';
-import 'package:studyu_app/models/app_state.dart';
-import 'package:studyu_app/routes.dart';
-import 'preview.dart';
 
 class LoadingScreen extends StatefulWidget {
   final String? sessionString;
@@ -72,7 +72,8 @@ class _LoadingScreenState extends State<LoadingScreen> {
       subject = await _fetchRemoteSubject(selectedStudyObjectId);
     } catch (exception) {
       StudyULogger.warning(
-          "Could not retrieve subject, maybe JWT is expired, try logging in: ${exception.toString()}");
+        "Could not retrieve subject, maybe JWT is expired, try logging in: $exception",
+      );
       try {
         // Try signing in again. Needed if JWT is expired
         if (await signInParticipant()) {
@@ -91,7 +92,7 @@ class _LoadingScreenState extends State<LoadingScreen> {
           // 4. Open the app but do not join a study
           // 5. Restart the app. Either only this error shows up, worst case is
           // app hangs and is unresponsive
-          StudyULogger.fatal('Could not login and retrieve the study subject.'
+          StudyULogger.fatal('Could not login and retrieve the study subject. '
               'One reason for this might be that the study subject is no '
               'longer available and only resides in app backup');
           throw Exception("Remote subject not found");
@@ -101,14 +102,16 @@ class _LoadingScreenState extends State<LoadingScreen> {
     return subject;
   }
 
-  _initPreview(AppState state) async {
+  Future<void> _initPreview(AppState state) async {
     if (state.isPreview) previewSubjectIdKey();
-    if (widget.queryParameters == null || widget.queryParameters!.isEmpty)
+    if (widget.queryParameters == null || widget.queryParameters!.isEmpty) {
       return;
+    }
 
     StudyULogger.info(
-        "Preview: Found query parameters ${widget.queryParameters}");
-    var lang = context.watch<AppLanguage>();
+      "Preview: Found query parameters ${widget.queryParameters}",
+    );
+    final lang = context.watch<AppLanguage>();
     final preview = Preview(
       widget.queryParameters,
       lang,
@@ -135,7 +138,9 @@ class _LoadingScreenState extends State<LoadingScreen> {
         if (!mounted) return;
         // if we remove the await, we can push multiple times. warning: do not run in while(true)
         await Navigator.push<EligibilityResult>(
-            context, EligibilityScreen.routeFor(study: preview.study));
+          context,
+          EligibilityScreen.routeFor(study: preview.study),
+        );
         // either do the same navigator push again or --> send a message back to designer and let it reload the whole page <--
         iFrameHelper.postRouteFinished();
         return;
@@ -198,10 +203,14 @@ class _LoadingScreenState extends State<LoadingScreen> {
         ];
         if (!mounted) return;
         await Navigator.push<bool>(
-            context,
-            TaskScreen.routeFor(
-                taskInstance: TaskInstance(tasks.first,
-                    tasks.first.schedule.completionPeriods.first.id)));
+          context,
+          TaskScreen.routeFor(
+            taskInstance: TaskInstance(
+              tasks.first,
+              tasks.first.schedule.completionPeriods.first.id,
+            ),
+          ),
+        );
         iFrameHelper.postRouteFinished();
         return;
       }
diff --git a/app/lib/screens/app_onboarding/preview.dart b/app/lib/screens/app_onboarding/preview.dart
index 4f88f2d40..35cf54c85 100644
--- a/app/lib/screens/app_onboarding/preview.dart
+++ b/app/lib/screens/app_onboarding/preview.dart
@@ -119,7 +119,7 @@ class Preview {
 
   /// createSubject: If true, the method will return a new StudySubject if none can be found. Otherwise, null is returned
   Future<StudySubject?> getStudySubject(AppState state,
-      {bool createSubject = false}) async {
+      {bool createSubject = false,}) async {
     if (selectedStudyObjectId != null) {
       try {
         if (selectedRoute == '/intervention') {
diff --git a/app/lib/screens/app_onboarding/terms.dart b/app/lib/screens/app_onboarding/terms.dart
index 966f2aaf4..3dd3a026d 100644
--- a/app/lib/screens/app_onboarding/terms.dart
+++ b/app/lib/screens/app_onboarding/terms.dart
@@ -2,13 +2,12 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
+import 'package:studyu_app/routes.dart';
+import 'package:studyu_app/widgets/bottom_onboarding_navigation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_flutter_common/studyu_flutter_common.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import '../../routes.dart';
-import '../../widgets/bottom_onboarding_navigation.dart';
-
 class TermsScreen extends StatefulWidget {
   const TermsScreen({super.key});
 
@@ -32,7 +31,7 @@ class _TermsScreenState extends State<TermsScreen> {
           child: RetryFutureBuilder<AppConfig>(
               tryFunction: AppConfig.getAppConfig,
               successBuilder: (BuildContext context, AppConfig? appConfig) =>
-                  legalSection(context, appConfig)),
+                  legalSection(context, appConfig),),
         ),
       ),
       bottomNavigationBar: BottomOnboardingNavigation(
@@ -64,7 +63,7 @@ class _TermsScreenState extends State<TermsScreen> {
               onChange: (val) => setState(() => _acceptedTerms = val!),
               isChecked: _acceptedTerms,
               icon: Icon(MdiIcons.fileDocumentEdit),
-              pdfUrl: appConfig!.appTerms[appLocale.languageCode.toString()],
+              pdfUrl: appConfig!.appTerms[appLocale.languageCode],
               pdfUrlLabel: AppLocalizations.of(context)!.terms_read,
             ),
             const SizedBox(height: 20),
@@ -75,7 +74,7 @@ class _TermsScreenState extends State<TermsScreen> {
               onChange: (val) => setState(() => _acceptedPrivacy = val!),
               isChecked: _acceptedPrivacy,
               icon: Icon(MdiIcons.shieldLock),
-              pdfUrl: appConfig.appPrivacy[appLocale.languageCode.toString()],
+              pdfUrl: appConfig.appPrivacy[appLocale.languageCode],
               pdfUrlLabel: AppLocalizations.of(context)!.privacy_read,
             ),
             const SizedBox(height: 30),
@@ -83,7 +82,7 @@ class _TermsScreenState extends State<TermsScreen> {
               icon: Icon(MdiIcons.scaleBalance),
               onPressed: () async {
                 final uri = Uri.parse(
-                    appConfig.imprint[appLocale.languageCode.toString()]!);
+                    appConfig.imprint[appLocale.languageCode]!,);
                 if (await canLaunchUrl(uri)) {
                   launchUrl(uri, mode: LaunchMode.externalApplication);
                 }
@@ -126,12 +125,12 @@ class LegalSection extends StatelessWidget {
       children: [
         Text(title!,
             style: theme.textTheme.headlineMedium!
-                .copyWith(color: theme.primaryColor)),
+                .copyWith(color: theme.primaryColor),),
         const SizedBox(height: 20),
         Text(description!),
         const SizedBox(height: 20),
         OutlinedButton.icon(
-          icon: icon!,
+          icon: icon,
           onPressed: () async {
             final uri = Uri.parse(pdfUrl!);
             if (await canLaunchUrl(uri)) {
@@ -143,7 +142,7 @@ class LegalSection extends StatelessWidget {
         CheckboxListTile(
             title: Text(acknowledgment!),
             value: isChecked,
-            onChanged: onChange),
+            onChanged: onChange,),
       ],
     );
   }
diff --git a/app/lib/screens/app_onboarding/welcome.dart b/app/lib/screens/app_onboarding/welcome.dart
index d407cf316..5709656e2 100644
--- a/app/lib/screens/app_onboarding/welcome.dart
+++ b/app/lib/screens/app_onboarding/welcome.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 
-import '../../routes.dart';
+import 'package:studyu_app/routes.dart';
 
 class WelcomeScreen extends StatelessWidget {
   const WelcomeScreen({super.key});
@@ -17,36 +17,36 @@ class WelcomeScreen extends StatelessWidget {
             children: <Widget>[
               const Spacer(),
               const Image(
-                  image: AssetImage('assets/icon/logo.png'), height: 200),
+                  image: AssetImage('assets/icon/logo.png'), height: 200,),
               const SizedBox(height: 20),
               OutlinedButton.icon(
                 icon: const Icon(Icons.info),
                 onPressed: () => Navigator.pushNamed(context, Routes.about),
                 label: Text(AppLocalizations.of(context)!.what_is_studyu,
-                    style: const TextStyle(fontSize: 20)),
+                    style: const TextStyle(fontSize: 20),),
               ),
               const SizedBox(height: 20),
               OutlinedButton.icon(
                 icon: Icon(MdiIcons.accountBox),
                 onPressed: () => Navigator.pushNamed(context, Routes.contact),
                 label: Text(AppLocalizations.of(context)!.contact,
-                    style: const TextStyle(fontSize: 20)),
+                    style: const TextStyle(fontSize: 20),),
               ),
               const SizedBox(height: 20),
               OutlinedButton.icon(
                 icon: Icon(MdiIcons.frequentlyAskedQuestions),
                 onPressed: () => Navigator.pushNamed(context, Routes.faq),
                 label: Text(AppLocalizations.of(context)!.faq,
-                    style: const TextStyle(fontSize: 20)),
+                    style: const TextStyle(fontSize: 20),),
               ),
               const Spacer(),
               OutlinedButton.icon(
                 icon: Icon(MdiIcons.rocket, size: 30),
                 onPressed: () => Navigator.pushNamed(context, Routes.terms),
                 label: Text(AppLocalizations.of(context)!.get_started,
-                    style: const TextStyle(fontSize: 20)),
+                    style: const TextStyle(fontSize: 20),),
               ),
-              const Spacer()
+              const Spacer(),
             ],
           ),
         ),
diff --git a/app/lib/screens/study/dashboard/contact_tab/contact_screen.dart b/app/lib/screens/study/dashboard/contact_tab/contact_screen.dart
index ba2356e4d..2b8855ca0 100644
--- a/app/lib/screens/study/dashboard/contact_tab/contact_screen.dart
+++ b/app/lib/screens/study/dashboard/contact_tab/contact_screen.dart
@@ -2,12 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:provider/provider.dart';
+import 'package:studyu_app/models/app_state.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_flutter_common/studyu_flutter_common.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import '../../../../models/app_state.dart';
-
 class ContactScreen extends StatefulWidget {
   const ContactScreen({super.key});
 
@@ -75,7 +74,7 @@ class ContactWidget extends StatelessWidget {
       required this.title,
       required this.color,
       this.subtitle,
-      super.key});
+      super.key,});
 
   @override
   Widget build(BuildContext context) {
@@ -85,11 +84,11 @@ class ContactWidget extends StatelessWidget {
     }
 
     final titles = [
-      Text(title, style: theme.textTheme.titleLarge!.copyWith(color: color))
+      Text(title, style: theme.textTheme.titleLarge!.copyWith(color: color)),
     ];
     if (subtitle != null && subtitle!.isNotEmpty) {
       titles.add(Text(subtitle!,
-          style: theme.textTheme.titleMedium!.copyWith(fontSize: 14)));
+          style: theme.textTheme.titleMedium!.copyWith(fontSize: 14),),);
     }
 
     return Column(
@@ -182,13 +181,10 @@ class ContactItem extends StatelessWidget {
           } else {
             uri = Uri.parse(itemValue!);
           }
-          break;
         case ContactItemType.email:
           uri = Uri.parse('mailto:$itemValue');
-          break;
         case ContactItemType.phone:
           uri = Uri.parse('tel:$itemValue');
-          break;
         default:
           uri = Uri.parse(itemValue!);
       }
@@ -209,7 +205,7 @@ class ContactItem extends StatelessWidget {
       title: Text(itemName),
       subtitle: SelectableText(itemValue!),
       leading: Icon(iconData,
-          color: iconColor ?? Theme.of(context).primaryColor, size: iconSize),
+          color: iconColor ?? Theme.of(context).primaryColor, size: iconSize,),
       onTap: type != null ? launchContact : null,
     );
   }
diff --git a/app/lib/screens/study/dashboard/contact_tab/faq.dart b/app/lib/screens/study/dashboard/contact_tab/faq.dart
index aee4830fc..cc53fb34d 100644
--- a/app/lib/screens/study/dashboard/contact_tab/faq.dart
+++ b/app/lib/screens/study/dashboard/contact_tab/faq.dart
@@ -70,7 +70,7 @@ final List<Entry> data_en = <Entry>[
         'How long will the study take to finish?',
         <Entry>[
           Entry(
-              'The duration of each study is mentioned during initial study selection.'),
+              'The duration of each study is mentioned during initial study selection.',),
         ],
       ),
       Entry(
@@ -96,7 +96,7 @@ final List<Entry> data_en = <Entry>[
         'How can I Opt out from the current study?',
         <Entry>[
           Entry(
-              'You can do so by going to the Settings tab located on the Dashboard and clicking on "Opt-out" '),
+              'You can do so by going to the Settings tab located on the Dashboard and clicking on "Opt-out" ',),
         ],
       ),
     ],
@@ -124,7 +124,7 @@ final List<Entry> data_en = <Entry>[
         'How can I keep track of my activities?',
         <Entry>[
           Entry(
-              'You can get an overview of your daily tasks and health status in the "Reports History section"'),
+              'You can get an overview of your daily tasks and health status in the "Reports History section"',),
         ],
       ),
       Entry(
@@ -164,7 +164,7 @@ final data_de = <Entry>[
         'Welche persönlichen Daten sammelt die App?',
         <Entry>[
           Entry(
-              'Die App sammelt keine persönlichen Daten des Benutzers, muss jedoch auf Zeit und Ort zugreifen.'),
+              'Die App sammelt keine persönlichen Daten des Benutzers, muss jedoch auf Zeit und Ort zugreifen.',),
         ],
       ),
     ],
@@ -176,7 +176,7 @@ final data_de = <Entry>[
         'Wie lange dauert es, bis die Studie abgeschlossen ist?',
         <Entry>[
           Entry(
-              'Die Dauer jeder Studie wird bei der ersten Studienauswahl angegeben.'),
+              'Die Dauer jeder Studie wird bei der ersten Studienauswahl angegeben.',),
         ],
       ),
       Entry(
diff --git a/app/lib/screens/study/dashboard/dashboard.dart b/app/lib/screens/study/dashboard/dashboard.dart
index a06725c44..108970a69 100644
--- a/app/lib/screens/study/dashboard/dashboard.dart
+++ b/app/lib/screens/study/dashboard/dashboard.dart
@@ -9,16 +9,15 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:provider/provider.dart';
+import 'package:studyu_app/models/app_state.dart';
+import 'package:studyu_app/routes.dart';
+import 'package:studyu_app/screens/study/dashboard/task_overview_tab/task_overview.dart';
+import 'package:studyu_app/screens/study/report/report_details.dart';
 import 'package:studyu_app/util/notifications.dart';
 import 'package:studyu_app/util/schedule_notifications.dart';
 import 'package:studyu_core/core.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import '../../../models/app_state.dart';
-import '../../../routes.dart';
-import '../report/report_details.dart';
-import 'task_overview_tab/task_overview.dart';
-
 class DashboardScreen extends StatefulWidget {
   final String? error;
 
@@ -42,7 +41,7 @@ class _DashboardScreenState extends State<DashboardScreen>
   StudySubject? subject;
   List<TaskInstance>? scheduleToday;
 
-  get showNextDay =>
+  bool get showNextDay =>
       (kDebugMode || context.read<AppState>().isPreview) &&
       !subject!.completedStudy;
 
@@ -59,7 +58,6 @@ class _DashboardScreenState extends State<DashboardScreen>
         setState(() {
           scheduleToday = subject!.scheduleFor(DateTime.now());
         });
-        break;
       case AppLifecycleState.inactive:
         break;
       case AppLifecycleState.paused:
@@ -101,7 +99,10 @@ class _DashboardScreenState extends State<DashboardScreen>
     if (subject == null) {
       SchedulerBinding.instance.addPostFrameCallback((_) {
         Navigator.pushNamedAndRemoveUntil(
-            context, Routes.loading, (_) => false);
+          context,
+          Routes.loading,
+          (_) => false,
+        );
       });
       return const SizedBox.shrink();
     }
@@ -123,14 +124,16 @@ class _DashboardScreenState extends State<DashboardScreen>
             tooltip: 'Current report', // todo tr
             icon: Icon(MdiIcons.chartBar),
             onPressed: () => Navigator.push(
-                context, ReportDetailsScreen.routeFor(subject: subject!)),
+              context,
+              ReportDetailsScreen.routeFor(subject: subject!),
+            ),
           ),
           PopupMenuButton<OverflowMenuItem>(
             onSelected: (value) {
               if (value.routeName != null) {
                 Navigator.pushNamed(context, value.routeName!);
-              } else if (value.onTap != null) {
-                value.onTap!();
+              } else {
+                value.onTap?.call();
               }
             },
             itemBuilder: (context) {
@@ -146,8 +149,10 @@ class _DashboardScreenState extends State<DashboardScreen>
                   routeName: Routes.faq,
                 ),
                 OverflowMenuItem(
-                    AppLocalizations.of(context)!.settings, Icons.settings,
-                    routeName: Routes.appSettings),
+                  AppLocalizations.of(context)!.settings,
+                  Icons.settings,
+                  routeName: Routes.appSettings,
+                ),
                 OverflowMenuItem(
                   AppLocalizations.of(context)!.what_is_studyu,
                   MdiIcons.helpCircleOutline,
@@ -166,54 +171,62 @@ class _DashboardScreenState extends State<DashboardScreen>
                       applicationIcon: GestureDetector(
                         onDoubleTap: () {
                           showDialog(
-                              context: context,
-                              builder: (_) => AlertDialog(
-                                    title: const SelectableText(
-                                        'Notification Log'),
-                                    content: Column(
-                                      children: [
-                                        ElevatedButton(
-                                          onPressed: () {
-                                            final Uri emailLaunchUri = Uri(
-                                                scheme: 'mailto',
-                                                path: subject!
-                                                    .study.contact.email,
-                                                queryParameters: {
-                                                  'subject':
-                                                      '[StudyU] Debug Information',
-                                                  'body': StudyNotifications
-                                                      .scheduledNotificationsDebug,
-                                                });
-                                            launchUrl(emailLaunchUri);
-                                          },
-                                          child: const Text('Send via email'),
-                                        ),
-                                        FutureBuilder<bool>(
-                                            future: receivePermission(),
-                                            builder: (context,
-                                                AsyncSnapshot<bool> snapshot) {
-                                              if (snapshot.hasData) {
-                                                String data =
-                                                    "ignoreBatteryOptimizations: ${snapshot.data.toString()}";
-                                                StudyNotifications
-                                                        .scheduledNotificationsDebug =
-                                                    "${StudyNotifications.scheduledNotificationsDebug}\n\n$data\n";
-                                                return Text(data);
-                                              } else {
-                                                return const CircularProgressIndicator();
-                                              }
-                                            }),
-                                        SelectableText(StudyNotifications
-                                            .scheduledNotificationsDebug!),
-                                      ],
-                                    ),
-                                    scrollable: true,
-                                  ));
+                            context: context,
+                            builder: (_) => AlertDialog(
+                              title: const SelectableText(
+                                'Notification Log',
+                              ),
+                              content: Column(
+                                children: [
+                                  ElevatedButton(
+                                    onPressed: () {
+                                      final Uri emailLaunchUri = Uri(
+                                        scheme: 'mailto',
+                                        path: subject!.study.contact.email,
+                                        queryParameters: {
+                                          'subject':
+                                              '[StudyU] Debug Information',
+                                          'body': StudyNotifications
+                                              .scheduledNotificationsDebug,
+                                        },
+                                      );
+                                      launchUrl(emailLaunchUri);
+                                    },
+                                    child: const Text('Send via email'),
+                                  ),
+                                  FutureBuilder<bool>(
+                                    future: receivePermission(),
+                                    builder: (
+                                      context,
+                                      AsyncSnapshot<bool> snapshot,
+                                    ) {
+                                      if (snapshot.hasData) {
+                                        final String data =
+                                            "ignoreBatteryOptimizations: ${snapshot.data}";
+                                        StudyNotifications
+                                                .scheduledNotificationsDebug =
+                                            "${StudyNotifications.scheduledNotificationsDebug}\n\n$data\n";
+                                        return Text(data);
+                                      } else {
+                                        return const CircularProgressIndicator();
+                                      }
+                                    },
+                                  ),
+                                  SelectableText(
+                                    StudyNotifications
+                                        .scheduledNotificationsDebug!,
+                                  ),
+                                ],
+                              ),
+                              scrollable: true,
+                            ),
+                          );
                           testNotifications(context);
                         },
                         child: const Image(
-                            image: AssetImage('assets/icon/icon.png'),
-                            height: 32),
+                          image: AssetImage('assets/icon/icon.png'),
+                          height: 32,
+                        ),
                       ),
                       applicationVersion:
                           '${packageInfo.version} - ${packageInfo.buildNumber}',
@@ -229,7 +242,8 @@ class _DashboardScreenState extends State<DashboardScreen>
                                 recognizer: TapGestureRecognizer()
                                   ..onTap = () {
                                     launchUrl(
-                                        Uri.parse('https://www.flaticon.com/'));
+                                      Uri.parse('https://www.flaticon.com/'),
+                                    );
                                   },
                               ),
                               const TextSpan(text: ' made by'),
@@ -255,11 +269,11 @@ class _DashboardScreenState extends State<DashboardScreen>
                                 ),
                               )
                               .toList(),
-                        )
+                        ),
                       ],
                     );
                   },
-                )
+                ),
               ].map((choice) {
                 return PopupMenuItem<OverflowMenuItem>(
                   value: choice,
@@ -267,7 +281,7 @@ class _DashboardScreenState extends State<DashboardScreen>
                     children: [
                       Icon(choice.icon, color: Colors.black),
                       const SizedBox(width: 8),
-                      Text(choice.name)
+                      Text(choice.name),
                     ],
                   ),
                 );
@@ -311,19 +325,23 @@ class _DashboardScreenState extends State<DashboardScreen>
     } else if (subject!.startedAt!.isAfter(DateTime.now())) {
       final theme = Theme.of(context);
       return Center(
-          child: Padding(
-              padding: const EdgeInsets.fromLTRB(32, 32, 32, 32),
-              child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    Text(
-                      AppLocalizations.of(context)!.study_not_started,
-                      style: TextStyle(
-                          fontSize: 20,
-                          color: theme.primaryColor,
-                          fontWeight: FontWeight.bold),
-                    )
-                  ])));
+        child: Padding(
+          padding: const EdgeInsets.fromLTRB(32, 32, 32, 32),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Text(
+                AppLocalizations.of(context)!.study_not_started,
+                style: TextStyle(
+                  fontSize: 20,
+                  color: theme.primaryColor,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+            ],
+          ),
+        ),
+      );
     } else {
       return TaskOverview(
         subject: subject,
@@ -353,25 +371,30 @@ class StudyFinishedPlaceholder extends StatelessWidget {
             Text(
               AppLocalizations.of(context)!.completed_study,
               style: TextStyle(
-                  fontSize: 20,
-                  color: theme.primaryColor,
-                  fontWeight: FontWeight.bold),
+                fontSize: 20,
+                color: theme.primaryColor,
+                fontWeight: FontWeight.bold,
+              ),
             ),
             space,
             OutlinedButton.icon(
               onPressed: () =>
                   Navigator.pushNamed(context, Routes.reportHistory),
               icon: Icon(MdiIcons.history, size: fontSize),
-              label: Text(AppLocalizations.of(context)!.report_history,
-                  style: textStyle),
+              label: Text(
+                AppLocalizations.of(context)!.report_history,
+                style: textStyle,
+              ),
             ),
             space,
             OutlinedButton.icon(
               onPressed: () =>
                   Navigator.pushNamed(context, Routes.studySelection),
               icon: Icon(MdiIcons.clipboardArrowRightOutline, size: fontSize),
-              label: Text(AppLocalizations.of(context)!.study_selection,
-                  style: textStyle),
+              label: Text(
+                AppLocalizations.of(context)!.study_selection,
+                style: textStyle,
+              ),
             ),
           ],
         ),
diff --git a/app/lib/screens/study/dashboard/settings.dart b/app/lib/screens/study/dashboard/settings.dart
index 5dc43fe24..7b295699e 100644
--- a/app/lib/screens/study/dashboard/settings.dart
+++ b/app/lib/screens/study/dashboard/settings.dart
@@ -91,8 +91,8 @@ class _SettingsState extends State<Settings> {
                   _analyticsValue = value;
                 });
                 AppAnalytics.setEnabled(value);
-              }),
-        ])
+              },),
+        ],),
       ],
     );
   }
@@ -125,7 +125,7 @@ class _SettingsState extends State<Settings> {
               onPressed: () {
                 showDialog(
                     context: context,
-                    builder: (_) => OptOutAlertDialog(subject: subject));
+                    builder: (_) => OptOutAlertDialog(subject: subject),);
               },
             ),
             const SizedBox(height: 24),
@@ -136,9 +136,9 @@ class _SettingsState extends State<Settings> {
               onPressed: () {
                 showDialog(
                     context: context,
-                    builder: (_) => DeleteAlertDialog(subject: subject));
+                    builder: (_) => DeleteAlertDialog(subject: subject),);
               },
-            )
+            ),
           ],
         ),
       ),
@@ -167,7 +167,7 @@ class OptOutAlertDialog extends StatelessWidget {
               style: TextStyle(
                   color: theme.primaryColor,
                   fontWeight: FontWeight.bold,
-                  fontSize: 16),
+                  fontSize: 16,),
             ),
             const TextSpan(
               text: " and won't be able to recover it. Previously completed "
@@ -194,10 +194,10 @@ class OptOutAlertDialog extends StatelessWidget {
             }
             if (context.mounted) {
               Navigator.pushNamedAndRemoveUntil(
-                  context, Routes.studySelection, (_) => false);
+                  context, Routes.studySelection, (_) => false,);
             }
           },
-        )
+        ),
       ],
     );
   }
@@ -235,11 +235,11 @@ class DeleteAlertDialog extends StatelessWidget {
                 }
                 if (context.mounted) {
                   Navigator.pushNamedAndRemoveUntil(
-                      context, Routes.welcome, (_) => false);
+                      context, Routes.welcome, (_) => false,);
                 }
               } on SocketException catch (_) {}
             },
-          )
+          ),
         ],
       );
 }
diff --git a/app/lib/screens/study/dashboard/task_overview_tab/progress_row.dart b/app/lib/screens/study/dashboard/task_overview_tab/progress_row.dart
index b93ca6d28..0d27e6417 100644
--- a/app/lib/screens/study/dashboard/task_overview_tab/progress_row.dart
+++ b/app/lib/screens/study/dashboard/task_overview_tab/progress_row.dart
@@ -2,11 +2,10 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
+import 'package:studyu_app/util/intervention.dart';
+import 'package:studyu_app/widgets/intervention_card.dart';
 import 'package:studyu_core/core.dart';
 
-import '../../../../util/intervention.dart';
-import '../../../../widgets/intervention_card.dart';
-
 class ProgressRow extends StatefulWidget {
   final StudySubject? subject;
 
@@ -105,7 +104,7 @@ class InterventionSegment extends StatelessWidget {
                   width: 8,
                   height: 10,
                   color: Colors.white,
-                )
+                ),
               ],
             ),
           ),
@@ -176,7 +175,7 @@ class InterventionSegment extends StatelessWidget {
             elevation: 0,
             fillColor: color,
             shape: const CircleBorder(
-                side: BorderSide(color: Colors.white, width: 2)),
+                side: BorderSide(color: Colors.white, width: 2),),
             child: interventionIcon(intervention),
           ),
         ],
@@ -186,7 +185,7 @@ class InterventionSegment extends StatelessWidget {
 }
 
 Iterable<T> intersperseIndexed<T>(
-    T Function(int) generator, Iterable<T> iterable) sync* {
+    T Function(int) generator, Iterable<T> iterable,) sync* {
   final iterator = iterable.iterator;
   var index = 0;
   if (iterator.moveNext()) {
diff --git a/app/lib/screens/study/dashboard/task_overview_tab/task_box.dart b/app/lib/screens/study/dashboard/task_overview_tab/task_box.dart
index d1794d4fa..ffc25ec5a 100644
--- a/app/lib/screens/study/dashboard/task_overview_tab/task_box.dart
+++ b/app/lib/screens/study/dashboard/task_overview_tab/task_box.dart
@@ -1,14 +1,13 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:studyu_app/models/app_state.dart';
+import 'package:studyu_app/screens/study/tasks/task_screen.dart';
+import 'package:studyu_app/theme.dart';
 import 'package:studyu_app/util/schedule_notifications.dart';
+import 'package:studyu_app/widgets/round_checkbox.dart';
 import 'package:studyu_core/core.dart';
 
-import '../../../../models/app_state.dart';
-import '../../../../theme.dart';
-import '../../../../widgets/round_checkbox.dart';
-import '../../tasks/task_screen.dart';
-
 class TaskBox extends StatefulWidget {
   final TaskInstance taskInstance;
   final Icon icon;
@@ -30,7 +29,7 @@ class _TaskBoxState extends State<TaskBox> {
     await Navigator.push<bool>(
       context,
       MaterialPageRoute(
-          builder: (context) => TaskScreen(taskInstance: widget.taskInstance)),
+          builder: (context) => TaskScreen(taskInstance: widget.taskInstance),),
     );
     widget.onCompleted();
     // Rebuild widget
@@ -44,7 +43,7 @@ class _TaskBoxState extends State<TaskBox> {
         .watch<AppState>()
         .activeSubject!
         .completedTaskInstanceForDay(widget.taskInstance.task.id,
-            widget.taskInstance.completionPeriod, DateTime.now());
+            widget.taskInstance.completionPeriod, DateTime.now(),);
     final isPreview = context.read<AppState>().isPreview;
     final isInsidePeriod =
         widget.taskInstance.completionPeriod.contains(StudyUTimeOfDay.now());
@@ -52,7 +51,7 @@ class _TaskBoxState extends State<TaskBox> {
     return Card(
       elevation: 2,
       child: InkWell(
-        onTap: (isTaskOpen) ? _navigateToTaskScreen : () {},
+        onTap: isTaskOpen ? _navigateToTaskScreen : () {},
         child: Row(
           children: [
             Expanded(
@@ -72,7 +71,7 @@ class _TaskBoxState extends State<TaskBox> {
               Padding(
                 padding: const EdgeInsets.fromLTRB(0, 0, 8, 0),
                 child: Icon(Icons.lock, color: theme.colorScheme.secondary),
-              )
+              ),
           ],
         ),
       ),
diff --git a/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart b/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart
index b2f098d97..bab34a1c0 100644
--- a/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart
+++ b/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart
@@ -1,14 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
+import 'package:studyu_app/routes.dart';
+import 'package:studyu_app/screens/study/dashboard/task_overview_tab/progress_row.dart';
+import 'package:studyu_app/screens/study/dashboard/task_overview_tab/task_box.dart';
 import 'package:studyu_app/theme.dart';
+import 'package:studyu_app/widgets/intervention_card.dart';
 import 'package:studyu_core/core.dart';
 
-import '../../../../routes.dart';
-import '../../../../widgets/intervention_card.dart';
-import 'progress_row.dart';
-import 'task_box.dart';
-
 class TaskOverview extends StatefulWidget {
   final StudySubject? subject;
   final List<TaskInstance>? scheduleToday;
@@ -18,7 +17,7 @@ class TaskOverview extends StatefulWidget {
       {required this.subject,
       required this.scheduleToday,
       super.key,
-      this.interventionIcon});
+      this.interventionIcon,});
 
   @override
   State<TaskOverview> createState() => _TaskOverviewState();
@@ -29,7 +28,7 @@ class _TaskOverviewState extends State<TaskOverview> {
     if (widget.subject!.completedStudy) {
       // Workaround to reload dashboard
       Navigator.pushNamedAndRemoveUntil(
-          context, Routes.dashboard, (_) => false);
+          context, Routes.dashboard, (_) => false,);
     }
   }
 
@@ -88,21 +87,21 @@ class _TaskOverviewState extends State<TaskOverview> {
                   Expanded(
                       child: Text(
                           AppLocalizations.of(context)!.intervention_current,
-                          style: theme.textTheme.titleLarge)),
+                          style: theme.textTheme.titleLarge,),),
                   const Spacer(),
                   Text(
                     '${widget.subject!.daysLeftForPhase(widget.subject!.getInterventionIndexForDate(DateTime.now()))} ${AppLocalizations.of(context)!.days_left}',
                     style: const TextStyle(color: primaryColor),
-                  )
+                  ),
                 ],
               ),
               const SizedBox(height: 8),
               InterventionCardTitle(
                   intervention:
-                      widget.subject!.getInterventionForDate(DateTime.now())),
+                      widget.subject!.getInterventionForDate(DateTime.now()),),
               const SizedBox(height: 8),
               Text(AppLocalizations.of(context)!.today_tasks,
-                  style: theme.textTheme.titleLarge)
+                  style: theme.textTheme.titleLarge,),
             ],
           ),
         ),
diff --git a/app/lib/screens/study/multimodal/capture_picture_screen.dart b/app/lib/screens/study/multimodal/capture_picture_screen.dart
index e5be1ec60..0fbba8c0f 100644
--- a/app/lib/screens/study/multimodal/capture_picture_screen.dart
+++ b/app/lib/screens/study/multimodal/capture_picture_screen.dart
@@ -11,7 +11,7 @@ class CapturePictureScreen extends StatefulWidget {
   final String studyId;
 
   const CapturePictureScreen(
-      {super.key, required this.userId, required this.studyId});
+      {super.key, required this.userId, required this.studyId,});
 
   @override
   State<CapturePictureScreen> createState() => _CapturePictureScreenState();
@@ -41,7 +41,7 @@ class _CapturePictureScreenState extends State<CapturePictureScreen>
   }
 
   @override
-  void didChangeAppLifecycleState(AppLifecycleState state) async {
+  Future<void> didChangeAppLifecycleState(AppLifecycleState state) async {
     final CameraController? cameraController = _cameraController;
 
     // App state changed before we got the chance to initialize.
@@ -87,10 +87,8 @@ class _CapturePictureScreenState extends State<CapturePictureScreen>
           case 'CameraAccessDeniedWithoutPrompt':
           case 'CameraAccessRestricted':
             errorText = AppLocalizations.of(context)!.camera_access_denied;
-            break;
           case 'NoCameraAvailable':
             errorText = AppLocalizations.of(context)!.no_camera_available;
-            break;
         }
       }
 
@@ -107,7 +105,7 @@ class _CapturePictureScreenState extends State<CapturePictureScreen>
     return (await availableCameras())
         .where((CameraDescription aCameraDescription) =>
             aCameraDescription.lensDirection == CameraLensDirection.back ||
-            aCameraDescription.lensDirection == CameraLensDirection.front)
+            aCameraDescription.lensDirection == CameraLensDirection.front,)
         .toList();
   }
 
@@ -165,8 +163,7 @@ class _CapturePictureScreenState extends State<CapturePictureScreen>
             : Stack(
                 children: [
                   CameraPreview(cameraController),
-                  _isTakingPicture
-                      ? Container(
+                  if (_isTakingPicture) Container(
                           color: Colors.black.withOpacity(0.5),
                           alignment: Alignment.center,
                           child: Container(
@@ -181,16 +178,14 @@ class _CapturePictureScreenState extends State<CapturePictureScreen>
                                 const CircularProgressIndicator(),
                                 const SizedBox(height: 16),
                                 Text(
-                                    AppLocalizations.of(context)!.take_a_photo),
+                                    AppLocalizations.of(context)!.take_a_photo,),
                               ],
                             ),
                           ),
-                        )
-                      : const SizedBox.shrink(),
+                        ) else const SizedBox.shrink(),
                 ],
               ),
         floatingActionButton: Wrap(
-          direction: Axis.horizontal,
           children: [
             Container(
               margin: const EdgeInsets.all(10),
@@ -213,8 +208,8 @@ class _CapturePictureScreenState extends State<CapturePictureScreen>
                     : null,
                 child: const Icon(Icons.autorenew),
               ),
-            )
+            ),
           ],
-        ));
+        ),);
   }
 }
diff --git a/app/lib/screens/study/onboarding/consent.dart b/app/lib/screens/study/onboarding/consent.dart
index 13ac10b55..bad2d28e8 100644
--- a/app/lib/screens/study/onboarding/consent.dart
+++ b/app/lib/screens/study/onboarding/consent.dart
@@ -6,15 +6,14 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:pdf/widgets.dart' as pw;
 import 'package:provider/provider.dart';
+import 'package:studyu_app/models/app_state.dart';
+import 'package:studyu_app/routes.dart';
+import 'package:studyu_app/screens/study/onboarding/onboarding_progress.dart';
+import 'package:studyu_app/util/save_pdf.dart';
+import 'package:studyu_app/widgets/bottom_onboarding_navigation.dart';
 import 'package:studyu_app/widgets/html_text.dart';
 import 'package:studyu_core/core.dart';
 
-import '../../../models/app_state.dart';
-import '../../../routes.dart';
-import '../../../util/save_pdf.dart';
-import '../../../widgets/bottom_onboarding_navigation.dart';
-import 'onboarding_progress.dart';
-
 class ConsentScreen extends StatefulWidget {
   const ConsentScreen({super.key});
 
@@ -51,11 +50,11 @@ class _ConsentScreenState extends State<ConsentScreen> {
             pw.Header(
               level: 0,
               child: pw.Text(consentItem.title ?? '',
-                  textScaleFactor: 2, style: pw.TextStyle(font: ttf)),
+                  textScaleFactor: 2, style: pw.TextStyle(font: ttf),),
             ),
             pw.Paragraph(
                 text: consentItem.description ?? '',
-                style: pw.TextStyle(font: ttf)),
+                style: pw.TextStyle(font: ttf),),
           ],
         )
         .expand((element) => element)
@@ -82,20 +81,20 @@ class _ConsentScreenState extends State<ConsentScreen> {
                     title:
                         Text(AppLocalizations.of(context)!.save_not_supported),
                     content: Text(AppLocalizations.of(context)!
-                        .save_not_supported_description),
+                        .save_not_supported_description,),
                   ),
                 );
               }
               final pdfContent = await generatePdfContent();
               if (!context.mounted) return;
               final savedFilePath = await savePDF(
-                  context, '${subject!.study.title}_consent', pdfContent);
+                  context, '${subject!.study.title}_consent', pdfContent,);
               if (savedFilePath != null) {
                 if (!context.mounted) return;
                 ScaffoldMessenger.of(context).showSnackBar(
                   SnackBar(
                     content: Text(
-                        '${AppLocalizations.of(context)!.was_saved_to}$savedFilePath.'),
+                        '${AppLocalizations.of(context)!.was_saved_to}$savedFilePath.',),
                   ),
                 );
               }
@@ -131,10 +130,10 @@ class _ConsentScreenState extends State<ConsentScreen> {
                                 context: context,
                                 builder: (context) => AlertDialog(
                                   content: Text(AppLocalizations.of(context)!
-                                      .please_give_consent_reason),
+                                      .please_give_consent_reason,),
                                 ),
                               ),
-                      )
+                      ),
                     ],
                   ),
                 ),
@@ -169,7 +168,7 @@ class _ConsentScreenState extends State<ConsentScreen> {
         backLabel: AppLocalizations.of(context)!.decline,
         backIcon: const Icon(Icons.close),
         onBack: () => Navigator.popUntil(
-            context, ModalRoute.withName(Routes.studySelection)),
+            context, ModalRoute.withName(Routes.studySelection),),
         nextLabel: AppLocalizations.of(context)!.accept,
         nextIcon: const Icon(Icons.check),
         onNext: boxLogic.every((element) => element) || kDebugMode
@@ -192,7 +191,7 @@ class ConsentCard extends StatelessWidget {
       this.consent,
       this.index,
       required this.onTapped,
-      this.isChecked});
+      this.isChecked,});
 
   @override
   Widget build(BuildContext context) {
@@ -214,18 +213,14 @@ class ConsentCard extends StatelessWidget {
             builder: (context) => AlertDialog(
               title: Row(
                 children: [
-                  consent!.iconName.isNotEmpty
-                      ? Icon(MdiIcons.fromString(consent!.iconName),
-                          color: theme.primaryColor)
-                      : const SizedBox.shrink(),
-                  consent!.iconName.isNotEmpty
-                      ? const SizedBox(width: 8)
-                      : const SizedBox.shrink(),
+                  if (consent!.iconName.isNotEmpty) Icon(MdiIcons.fromString(consent!.iconName),
+                          color: theme.primaryColor,) else const SizedBox.shrink(),
+                  if (consent!.iconName.isNotEmpty) const SizedBox(width: 8) else const SizedBox.shrink(),
                   Expanded(child: Text(consent!.title!)),
                   IconButton(
                     icon: const Icon(Icons.close),
                     onPressed: () => Navigator.pop(context),
-                  )
+                  ),
                 ],
               ),
               content: HtmlText(consent!.description),
@@ -239,13 +234,9 @@ class ConsentCard extends StatelessWidget {
             mainAxisSize: MainAxisSize.min,
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              consent!.iconName.isNotEmpty
-                  ? Icon(MdiIcons.fromString(consent!.iconName),
-                      size: 60, color: Colors.blue)
-                  : const SizedBox.shrink(),
-              consent!.iconName.isNotEmpty
-                  ? const SizedBox(height: 10)
-                  : const SizedBox.shrink(),
+              if (consent!.iconName.isNotEmpty) Icon(MdiIcons.fromString(consent!.iconName),
+                      size: 60, color: Colors.blue,) else const SizedBox.shrink(),
+              if (consent!.iconName.isNotEmpty) const SizedBox(height: 10) else const SizedBox.shrink(),
               Flexible(
                 child: Text(
                   consent!.title!,
@@ -269,5 +260,5 @@ class ConsentElement {
   final IconData icon;
 
   ConsentElement(
-      this.title, this.descriptionText, this.acknowledgmentText, this.icon);
+      this.title, this.descriptionText, this.acknowledgmentText, this.icon,);
 }
diff --git a/app/lib/screens/study/onboarding/eligibility_screen.dart b/app/lib/screens/study/onboarding/eligibility_screen.dart
index 4bb45e2fe..b201bd6c7 100644
--- a/app/lib/screens/study/onboarding/eligibility_screen.dart
+++ b/app/lib/screens/study/onboarding/eligibility_screen.dart
@@ -2,12 +2,11 @@ import 'package:collection/collection.dart' show IterableExtension;
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
+import 'package:studyu_app/screens/study/onboarding/onboarding_progress.dart';
+import 'package:studyu_app/widgets/bottom_onboarding_navigation.dart';
+import 'package:studyu_app/widgets/questionnaire/questionnaire_widget.dart';
 import 'package:studyu_core/core.dart';
 
-import '../../../widgets/bottom_onboarding_navigation.dart';
-import '../../../widgets/questionnaire/questionnaire_widget.dart';
-import 'onboarding_progress.dart';
-
 class EligibilityResult {
   final bool eligible;
   final QuestionnaireState answers;
@@ -20,7 +19,7 @@ class EligibilityScreen extends StatefulWidget {
   final Study? study;
 
   static MaterialPageRoute<EligibilityResult> routeFor(
-          {required Study? study}) =>
+          {required Study? study,}) =>
       MaterialPageRoute(
         builder: (_) => EligibilityScreen(study: study),
         settings: const RouteSettings(name: '/eligibilityCheck'),
@@ -80,7 +79,7 @@ class _EligibilityScreenState extends State<EligibilityScreen> {
         final firstFailed =
             criteria.firstWhere((criterion) => criterion.isViolated(qs));
         activeResult = EligibilityResult(qs,
-            eligible: conditionResult, firstFailed: firstFailed);
+            eligible: conditionResult, firstFailed: firstFailed,);
       }
     });
   }
@@ -90,7 +89,7 @@ class _EligibilityScreenState extends State<EligibilityScreen> {
   bool _isFreeTextCriterion(EligibilityCriterion criterion) {
     return widget.study?.questionnaire.questions.any((element) {
           if (criterion.condition.type == ChoiceExpression.expressionType) {
-            ChoiceExpression choiceExpression =
+            final ChoiceExpression choiceExpression =
                 criterion.condition as ChoiceExpression;
             return element.id == choiceExpression.target!;
           }
@@ -110,7 +109,7 @@ class _EligibilityScreenState extends State<EligibilityScreen> {
           size: 32,
         ),
         content: Text(AppLocalizations.of(context)!.eligible_yes,
-            style: Theme.of(context).textTheme.titleMedium),
+            style: Theme.of(context).textTheme.titleMedium,),
         actions: [Container()],
         forceActionsBelow: true,
         backgroundColor: Colors.green[50],
@@ -126,7 +125,7 @@ class _EligibilityScreenState extends State<EligibilityScreen> {
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Text(AppLocalizations.of(context)!.eligible_no,
-                style: Theme.of(context).textTheme.titleMedium),
+                style: Theme.of(context).textTheme.titleMedium,),
             const SizedBox(height: 4),
             if (activeResult?.firstFailed?.reason != null)
               Text(activeResult!.firstFailed!.reason!)
@@ -143,7 +142,7 @@ class _EligibilityScreenState extends State<EligibilityScreen> {
           TextButton(
             onPressed: _finish,
             child: Text(AppLocalizations.of(context)!.eligible_back),
-          )
+          ),
         ],
         forceActionsBelow: true,
         backgroundColor: Colors.red[50],
diff --git a/app/lib/screens/study/onboarding/intervention_selection.dart b/app/lib/screens/study/onboarding/intervention_selection.dart
index ae99d61d6..c1e584403 100644
--- a/app/lib/screens/study/onboarding/intervention_selection.dart
+++ b/app/lib/screens/study/onboarding/intervention_selection.dart
@@ -2,15 +2,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:provider/provider.dart';
+import 'package:studyu_app/models/app_state.dart';
+import 'package:studyu_app/routes.dart';
+import 'package:studyu_app/screens/study/onboarding/onboarding_progress.dart';
+import 'package:studyu_app/widgets/bottom_onboarding_navigation.dart';
+import 'package:studyu_app/widgets/intervention_card.dart';
 import 'package:studyu_core/core.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 
-import '../../../models/app_state.dart';
-import '../../../routes.dart';
-import '../../../widgets/bottom_onboarding_navigation.dart';
-import '../../../widgets/intervention_card.dart';
-import 'onboarding_progress.dart';
-
 class InterventionSelectionScreen extends StatefulWidget {
   const InterventionSelectionScreen({super.key});
 
@@ -67,7 +66,7 @@ class _InterventionSelectionScreenState
           showCheckbox: true,
           showDescription: false,
           selected: selectedInterventionIds.any(
-              (interventionId) => interventionId == interventions[index].id),
+              (interventionId) => interventionId == interventions[index].id,),
           onTap: () => onSelect(interventions[index].id),
         ),
       ),
@@ -78,8 +77,9 @@ class _InterventionSelectionScreenState
     setState(() {
       if (!selectedInterventionIds.contains(interventionId)) {
         selectedInterventionIds.add(interventionId);
-        if (selectedInterventionIds.length > 2)
+        if (selectedInterventionIds.length > 2) {
           selectedInterventionIds.removeAt(0);
+        }
       } else {
         selectedInterventionIds.removeWhere((id) => id == interventionId);
       }
@@ -123,7 +123,7 @@ class _InterventionSelectionScreenState
       bottomNavigationBar: BottomOnboardingNavigation(
         onNext: selectedInterventionIds.length == 2 ? onFinished : null,
         progress: OnboardingProgress(
-            stage: 1, progress: selectedInterventionIds.length / 2),
+            stage: 1, progress: selectedInterventionIds.length / 2,),
       ),
     );
   }
diff --git a/app/lib/screens/study/onboarding/journey_overview.dart b/app/lib/screens/study/onboarding/journey_overview.dart
index c6bd437e9..dfc58b73d 100644
--- a/app/lib/screens/study/onboarding/journey_overview.dart
+++ b/app/lib/screens/study/onboarding/journey_overview.dart
@@ -3,14 +3,13 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:intl/intl.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:provider/provider.dart';
+import 'package:studyu_app/models/app_state.dart';
+import 'package:studyu_app/routes.dart';
+import 'package:studyu_app/screens/study/onboarding/onboarding_progress.dart';
+import 'package:studyu_app/widgets/bottom_onboarding_navigation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:timeline_tile/timeline_tile.dart';
 
-import '../../../models/app_state.dart';
-import '../../../routes.dart';
-import '../../../widgets/bottom_onboarding_navigation.dart';
-import 'onboarding_progress.dart';
-
 class JourneyOverviewScreen extends StatefulWidget {
   const JourneyOverviewScreen({super.key});
 
@@ -99,7 +98,7 @@ class Timeline extends StatelessWidget {
                 ? Colors.grey
                 : theme.colorScheme.secondary,
             date: now.add(
-                Duration(days: index * subject!.study.schedule.phaseDuration)),
+                Duration(days: index * subject!.study.schedule.phaseDuration),),
             isFirst: index == 0,
           );
         }),
@@ -109,7 +108,7 @@ class Timeline extends StatelessWidget {
           color: Colors.green,
           isLast: true,
           date: subject!.endDate(now),
-        )
+        ),
       ],
     );
   }
@@ -152,11 +151,11 @@ class InterventionTile extends StatelessWidget {
       endChild: TimelineChild(
         child: Text(title!,
             style: theme.textTheme.titleLarge!
-                .copyWith(color: theme.primaryColor)),
+                .copyWith(color: theme.primaryColor),),
       ),
       startChild: TimelineChild(
         child: Text(DateFormat('dd-MM-yyyy').format(date),
-            style: const TextStyle(fontWeight: FontWeight.bold)),
+            style: const TextStyle(fontWeight: FontWeight.bold),),
       ),
     );
   }
@@ -173,7 +172,7 @@ class IconIndicator extends StatelessWidget {
     return DecoratedBox(
       decoration: BoxDecoration(
           shape: BoxShape.circle,
-          color: color ?? Theme.of(context).colorScheme.secondary),
+          color: color ?? Theme.of(context).colorScheme.secondary,),
       child: Center(
         child: Icon(MdiIcons.fromString(iconName), color: Colors.white),
       ),
diff --git a/app/lib/screens/study/onboarding/kickoff.dart b/app/lib/screens/study/onboarding/kickoff.dart
index 891d05103..71c7e4c7d 100644
--- a/app/lib/screens/study/onboarding/kickoff.dart
+++ b/app/lib/screens/study/onboarding/kickoff.dart
@@ -2,13 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:provider/provider.dart';
+import 'package:studyu_app/models/app_state.dart';
+import 'package:studyu_app/routes.dart';
 import 'package:studyu_app/util/cache.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_flutter_common/studyu_flutter_common.dart';
 
-import '../../../models/app_state.dart';
-import '../../../routes.dart';
-
 class KickoffScreen extends StatefulWidget {
   const KickoffScreen({super.key});
 
@@ -34,7 +33,7 @@ class _KickoffScreen extends State<KickoffScreen> {
       if (!context.mounted) return;
       setState(() => ready = true);
       Navigator.pushNamedAndRemoveUntil(
-          context, Routes.dashboard, (_) => false);
+          context, Routes.dashboard, (_) => false,);
     } catch (e) {
       StudyULogger.fatal('Failed creating subject: $e');
     }
diff --git a/app/lib/screens/study/onboarding/onboarding_progress.dart b/app/lib/screens/study/onboarding/onboarding_progress.dart
index 4ced4be59..41ec0cadd 100644
--- a/app/lib/screens/study/onboarding/onboarding_progress.dart
+++ b/app/lib/screens/study/onboarding/onboarding_progress.dart
@@ -5,7 +5,7 @@ class OnboardingProgress extends StatelessWidget {
   final double progress;
 
   const OnboardingProgress(
-      {required this.stage, required this.progress, super.key});
+      {required this.stage, required this.progress, super.key,});
 
   double _getProgressForStage(int stage) {
     if (stage < this.stage) return 1;
diff --git a/app/lib/screens/study/onboarding/study_overview.dart b/app/lib/screens/study/onboarding/study_overview.dart
index d17efcdde..91dcdea81 100644
--- a/app/lib/screens/study/onboarding/study_overview.dart
+++ b/app/lib/screens/study/onboarding/study_overview.dart
@@ -2,16 +2,15 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:provider/provider.dart';
+import 'package:studyu_app/models/app_state.dart';
+import 'package:studyu_app/routes.dart';
+import 'package:studyu_app/screens/study/dashboard/contact_tab/contact_screen.dart';
+import 'package:studyu_app/screens/study/onboarding/eligibility_screen.dart';
+import 'package:studyu_app/widgets/bottom_onboarding_navigation.dart';
+import 'package:studyu_app/widgets/study_tile.dart';
 import 'package:studyu_core/core.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 
-import '../../../models/app_state.dart';
-import '../../../routes.dart';
-import '../../../widgets/bottom_onboarding_navigation.dart';
-import '../../../widgets/study_tile.dart';
-import '../dashboard/contact_tab/contact_screen.dart';
-import 'eligibility_screen.dart';
-
 class StudyOverviewScreen extends StatefulWidget {
   const StudyOverviewScreen({super.key});
 
@@ -55,7 +54,7 @@ class _StudyOverviewScreen extends State<StudyOverviewScreen> {
   Future<void> navigateToEligibilityCheck(BuildContext context) async {
     final study = context.read<AppState>().selectedStudy;
     final result = await Navigator.push<EligibilityResult>(
-        context, EligibilityScreen.routeFor(study: study));
+        context, EligibilityScreen.routeFor(study: study),);
     if (result == null) return;
 
     if (!context.mounted) return;
@@ -116,7 +115,7 @@ class StudyDetailsView extends StatelessWidget {
           title:
               Text(AppLocalizations.of(context)!.intervention_phase_duration),
           subtitle: Text(
-              '${study!.schedule.phaseDuration} ${AppLocalizations.of(context)!.days}'),
+              '${study!.schedule.phaseDuration} ${AppLocalizations.of(context)!.days}',),
           leading:
               Icon(MdiIcons.clock, color: theme.primaryColor, size: iconSize),
         ),
@@ -124,7 +123,7 @@ class StudyDetailsView extends StatelessWidget {
           title: Text(AppLocalizations.of(context)!.study_length),
           subtitle: Text('$studyLength ${AppLocalizations.of(context)!.days}'),
           leading: Icon(MdiIcons.calendar,
-              color: theme.primaryColor, size: iconSize),
+              color: theme.primaryColor, size: iconSize,),
         ),
         const SizedBox(height: 16),
         ContactWidget(
diff --git a/app/lib/screens/study/onboarding/study_selection.dart b/app/lib/screens/study/onboarding/study_selection.dart
index 7bee68a74..b3474fdc2 100644
--- a/app/lib/screens/study/onboarding/study_selection.dart
+++ b/app/lib/screens/study/onboarding/study_selection.dart
@@ -5,15 +5,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:provider/provider.dart';
+import 'package:studyu_app/models/app_state.dart';
+import 'package:studyu_app/routes.dart';
+import 'package:studyu_app/widgets/bottom_onboarding_navigation.dart';
+import 'package:studyu_app/widgets/study_tile.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_flutter_common/studyu_flutter_common.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 
-import '../../../models/app_state.dart';
-import '../../../routes.dart';
-import '../../../widgets/bottom_onboarding_navigation.dart';
-import '../../../widgets/study_tile.dart';
-
 Future<void> navigateToStudyOverview(
   BuildContext context,
   Study study, {
@@ -94,18 +93,17 @@ class _StudySelectionScreenState extends State<StudySelectionScreen> {
                                     builder: (context) => AlertDialog(
                                       content: Text(
                                           AppLocalizations.of(context)!
-                                              .study_selection_single_reason),
+                                              .study_selection_single_reason,),
                                     ),
                                   ),
-                          )
+                          ),
                         ],
                       ),
                     ),
                   ],
                 ),
               ),
-              _hiddenStudies
-                  ? Column(
+              if (_hiddenStudies) Column(
                       children: [
                         MaterialBanner(
                           padding: const EdgeInsets.all(8),
@@ -124,19 +122,18 @@ class _StudySelectionScreenState extends State<StudySelectionScreen> {
                         ),
                         const SizedBox(height: 16),
                       ],
-                    )
-                  : const SizedBox.shrink(),
+                    ) else const SizedBox.shrink(),
               Expanded(
                 child: RetryFutureBuilder<ExtractionResult<Study>>(
                   tryFunction: () async => publishedStudies,
                   successBuilder: (BuildContext context,
-                      ExtractionResult<Study>? extractionResult) {
+                      ExtractionResult<Study>? extractionResult,) {
                     final studies = extractionResult!.extracted;
                     if (extractionResult is ExtractionFailedException<Study>) {
                       WidgetsBinding.instance.addPostFrameCallback((_) {
                         if (_hiddenStudies) return;
                         debugPrint(
-                            '${extractionResult.notExtracted.length} studies could not be extracted.');
+                            '${extractionResult.notExtracted.length} studies could not be extracted.',);
                         setState(() {
                           _hiddenStudies = true;
                         });
@@ -169,7 +166,7 @@ class _StudySelectionScreenState extends State<StudySelectionScreen> {
                   onPressed: () async {
                     await showDialog(
                         context: context,
-                        builder: (_) => const InviteCodeDialog());
+                        builder: (_) => const InviteCodeDialog(),);
                   },
                   label: Text(AppLocalizations.of(context)!.invite_code_button),
                 ),
@@ -210,7 +207,7 @@ class _InviteCodeDialogState extends State<InviteCodeDialog> {
           validator: (_) => _errorMessage,
           autovalidateMode: AutovalidateMode.always,
           decoration: InputDecoration(
-              labelText: AppLocalizations.of(context)!.invite_code),
+              labelText: AppLocalizations.of(context)!.invite_code,),
         ),
         actions: [
           OutlinedButton.icon(
@@ -245,10 +242,10 @@ class _InviteCodeDialogState extends State<InviteCodeDialog> {
 
                 Map<String, dynamic>? studyResult;
                 try {
-                  studyResult = await (Supabase.instance.client.rpc(
+                  studyResult = await Supabase.instance.client.rpc(
                     'get_study_record_from_invite',
                     params: {'invite_code': _controller.text},
-                  ).single());
+                  ).single();
                 } on PostgrestException catch (error) {
                   print(error.message);
                   setState(() {
@@ -294,7 +291,7 @@ class _InviteCodeDialogState extends State<InviteCodeDialog> {
                 }
               }
             },
-          )
+          ),
         ],
       );
 }
diff --git a/app/lib/screens/study/report/disclaimer_section.dart b/app/lib/screens/study/report/disclaimer_section.dart
index 16950dfe3..f13956207 100644
--- a/app/lib/screens/study/report/disclaimer_section.dart
+++ b/app/lib/screens/study/report/disclaimer_section.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-import 'generic_section.dart';
+import 'package:studyu_app/screens/study/report/generic_section.dart';
 
 class DisclaimerSection extends GenericSection {
   const DisclaimerSection(super.subject, {super.key, super.onTap});
diff --git a/app/lib/screens/study/report/general_details_section.dart b/app/lib/screens/study/report/general_details_section.dart
index cb9bd8ab9..6bc44226f 100644
--- a/app/lib/screens/study/report/general_details_section.dart
+++ b/app/lib/screens/study/report/general_details_section.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
-
-import '../../../widgets/study_tile.dart';
-import 'generic_section.dart';
+import 'package:studyu_app/screens/study/report/generic_section.dart';
+import 'package:studyu_app/widgets/study_tile.dart';
 
 class GeneralDetailsSection extends GenericSection {
   const GeneralDetailsSection(super.subject, {super.key, super.onTap});
diff --git a/app/lib/screens/study/report/performance/performance_details.dart b/app/lib/screens/study/report/performance/performance_details.dart
index caae2ce18..8a9c8ac5a 100644
--- a/app/lib/screens/study/report/performance/performance_details.dart
+++ b/app/lib/screens/study/report/performance/performance_details.dart
@@ -1,10 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:studyu_app/routes.dart';
+import 'package:studyu_app/widgets/intervention_card.dart';
 import 'package:studyu_core/core.dart';
 
-import '../../../../routes.dart';
-import '../../../../widgets/intervention_card.dart';
-
 class PerformanceDetailsScreen extends StatelessWidget {
   final StudySubject? reportSubject;
 
@@ -39,7 +38,7 @@ class PerformanceDetailsScreen extends StatelessWidget {
                   padding: const EdgeInsets.all(8),
                   child: Text(
                       AppLocalizations.of(context)!.performance_overview,
-                      style: theme.textTheme.titleMedium),
+                      style: theme.textTheme.titleMedium,),
                 ),
                 Padding(
                   padding: const EdgeInsets.all(8),
@@ -59,7 +58,7 @@ class PerformanceDetailsScreen extends StatelessWidget {
                   itemCount: interventions.length,
                   itemBuilder: (context, index) => InterventionPerformanceBar(
                       subject: reportSubject,
-                      intervention: interventions[index]),
+                      intervention: interventions[index],),
                 ),
                 Padding(
                   padding: const EdgeInsets.all(8),
@@ -96,7 +95,7 @@ class InterventionPerformanceBar extends StatelessWidget {
   final StudySubject? subject;
 
   const InterventionPerformanceBar(
-      {required this.intervention, required this.subject, super.key});
+      {required this.intervention, required this.subject, super.key,});
 
   @override
   Widget build(BuildContext context) {
@@ -106,7 +105,7 @@ class InterventionPerformanceBar extends StatelessWidget {
         child: Column(
           children: [
             InterventionCard(intervention,
-                showTasks: false, showDescription: false),
+                showTasks: false, showDescription: false,),
             const SizedBox(height: 8),
             ...intervention.tasks.map(
               (task) => PerformanceBar(
@@ -114,7 +113,7 @@ class InterventionPerformanceBar extends StatelessWidget {
                 completed: subject!.completedTasksFor(task),
                 total: subject!.totalTaskCountFor(task),
               ),
-            )
+            ),
           ],
         ),
       ),
@@ -127,7 +126,7 @@ class ObservationPerformanceBar extends StatelessWidget {
   final StudySubject? subject;
 
   const ObservationPerformanceBar(
-      {required this.observation, required this.subject, super.key});
+      {required this.observation, required this.subject, super.key,});
 
   @override
   Widget build(BuildContext context) {
@@ -153,7 +152,7 @@ class PerformanceBar extends StatelessWidget {
       {required this.task,
       required this.completed,
       required this.total,
-      super.key});
+      super.key,});
 
   @override
   Widget build(BuildContext context) {
@@ -179,9 +178,9 @@ class PerformanceBar extends StatelessWidget {
                 '${(completed / total * 100).toStringAsFixed(2).replaceAll('.00', '')} %',
                 style: const TextStyle(fontWeight: FontWeight.bold),
               ),
-            )
+            ),
           ],
-        )
+        ),
       ],
     );
   }
diff --git a/app/lib/screens/study/report/performance/performance_section.dart b/app/lib/screens/study/report/performance/performance_section.dart
index bd27768bc..fba905865 100644
--- a/app/lib/screens/study/report/performance/performance_section.dart
+++ b/app/lib/screens/study/report/performance/performance_section.dart
@@ -3,10 +3,9 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:rainbow_color/rainbow_color.dart';
+import 'package:studyu_app/screens/study/report/generic_section.dart';
 import 'package:studyu_core/core.dart';
 
-import '../generic_section.dart';
-
 class PerformanceSection extends GenericSection {
   const PerformanceSection(super.subject, {super.key, super.onTap});
 
@@ -25,7 +24,7 @@ class PerformanceSection extends GenericSection {
           getCountableObservationAmount(intervention);
       return min<double>(
           countableInterventions == 0 ? 0 : countableInterventions / maximum,
-          1);
+          1,);
     }).toList();
     return interventions.length != 2 ||
             subject!.study.reportSpecification.primary == null
@@ -70,7 +69,7 @@ class PerformanceSection extends GenericSection {
   }
 
   String getPowerLevelDescription(
-      BuildContext context, List<num> interventionProgress) {
+      BuildContext context, List<num> interventionProgress,) {
     if (interventionProgress.any((progress) => progress < minimumRatio)) {
       return AppLocalizations.of(context)!.not_enough_data;
     } else if (interventionProgress.any((progress) => progress < 1)) {
@@ -93,12 +92,12 @@ class PerformanceSection extends GenericSection {
         .forEach((progress) {
       if (progress
               .where((result) => intervention.tasks.any(
-                  (interventionTask) => interventionTask.id == result.taskId))
+                  (interventionTask) => interventionTask.id == result.taskId,),)
               .length ==
           interventionsPerDay) {
         countable += progress
             .where((result) => subject!.study.observations
-                .any((observation) => observation.id == result.taskId))
+                .any((observation) => observation.id == result.taskId),)
             .length;
       }
     });
@@ -140,7 +139,7 @@ class PerformanceBar extends StatelessWidget {
     final rainbow = Rainbow(
         spectrum: [Colors.red, Colors.yellow, Colors.green],
         rangeStart: 0,
-        rangeEnd: 1);
+        rangeEnd: 1,);
     final fullSpectrum = List<double>.generate(3, (index) => index * 0.5)
         .map<Color>((index) => rainbow[index].withOpacity(0.4))
         .toList();
@@ -188,7 +187,7 @@ class PerformanceBar extends StatelessWidget {
                     Container(
                       width: 2,
                       color: Colors.grey[600],
-                    )
+                    ),
                   ],
                 ),
               ],
diff --git a/app/lib/screens/study/report/report_details.dart b/app/lib/screens/study/report/report_details.dart
index 0fba1e75b..0a30b30d4 100644
--- a/app/lib/screens/study/report/report_details.dart
+++ b/app/lib/screens/study/report/report_details.dart
@@ -1,15 +1,14 @@
 import 'package:flutter/foundation.dart' show kDebugMode;
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:studyu_app/routes.dart';
+import 'package:studyu_app/screens/study/report/disclaimer_section.dart';
+import 'package:studyu_app/screens/study/report/general_details_section.dart';
+import 'package:studyu_app/screens/study/report/performance/performance_details.dart';
+import 'package:studyu_app/screens/study/report/performance/performance_section.dart';
+import 'package:studyu_app/screens/study/report/report_section_container.dart';
 import 'package:studyu_core/core.dart';
 
-import '../../../routes.dart';
-import 'disclaimer_section.dart';
-import 'general_details_section.dart';
-import 'performance/performance_details.dart';
-import 'performance/performance_section.dart';
-import 'report_section_container.dart';
-
 class ReportDetailsScreen extends StatelessWidget {
   final StudySubject subject;
 
@@ -45,7 +44,7 @@ class ReportDetailsScreen extends StatelessWidget {
             PerformanceSection(
               subject,
               onTap: () => Navigator.push(
-                  context, PerformanceDetailsScreen.routeFor(subject: subject)),
+                  context, PerformanceDetailsScreen.routeFor(subject: subject),),
             ),
             if (subject.study.reportSpecification.primary != null &&
                 (subject.completedStudy || kDebugMode))
@@ -57,7 +56,7 @@ class ReportDetailsScreen extends StatelessWidget {
             if (subject.study.reportSpecification.secondary.isNotEmpty &&
                 (subject.completedStudy || kDebugMode))
               ...subject.study.reportSpecification.secondary.map((section) =>
-                  ReportSectionContainer(section, subject: subject))
+                  ReportSectionContainer(section, subject: subject),),
           ],
         ),
       ),
diff --git a/app/lib/screens/study/report/report_history.dart b/app/lib/screens/study/report/report_history.dart
index a03bf847b..ce5b28f69 100644
--- a/app/lib/screens/study/report/report_history.dart
+++ b/app/lib/screens/study/report/report_history.dart
@@ -2,13 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:provider/provider.dart';
+import 'package:studyu_app/models/app_state.dart';
+import 'package:studyu_app/screens/study/report/report_details.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_flutter_common/studyu_flutter_common.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 
-import '../../../models/app_state.dart';
-import 'report_details.dart';
-
 class ReportHistoryScreen extends StatelessWidget {
   const ReportHistoryScreen({super.key});
 
@@ -22,7 +21,7 @@ class ReportHistoryScreen extends StatelessWidget {
       ),
       body: RetryFutureBuilder<List<StudySubject>>(
         tryFunction: () => StudySubject.getStudyHistory(
-            Supabase.instance.client.auth.currentUser!.id),
+            Supabase.instance.client.auth.currentUser!.id,),
         successBuilder:
             (BuildContext context, List<StudySubject>? pastStudies) {
           return ListView.builder(
@@ -52,7 +51,7 @@ class ReportHistoryItem extends StatelessWidget {
       child: InkWell(
         onTap: () {
           Navigator.push(
-              context, ReportDetailsScreen.routeFor(subject: subject));
+              context, ReportDetailsScreen.routeFor(subject: subject),);
         },
         child: Padding(
           padding: const EdgeInsets.all(20),
@@ -70,7 +69,7 @@ class ReportHistoryItem extends StatelessWidget {
                   child: Text(
                     subject.study.title!,
                     style: theme.textTheme.headlineSmall!.copyWith(
-                        color: isActiveStudy ? Colors.white : Colors.black),
+                        color: isActiveStudy ? Colors.white : Colors.black,),
                   ),
                 ),
               ],
diff --git a/app/lib/screens/study/report/report_section_container.dart b/app/lib/screens/study/report/report_section_container.dart
index cfc942acc..7c7db37f5 100644
--- a/app/lib/screens/study/report/report_section_container.dart
+++ b/app/lib/screens/study/report/report_section_container.dart
@@ -1,13 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:studyu_app/screens/study/report/report_section_widget.dart';
 import 'package:studyu_app/screens/study/report/sections/average_section_widget.dart';
 import 'package:studyu_app/screens/study/report/sections/linear_regression_section_widget.dart';
 import 'package:studyu_core/core.dart';
 
-import 'report_section_widget.dart';
-
 typedef SectionBuilder = ReportSectionWidget Function(
-    ReportSection section, StudySubject subject);
+    ReportSection section, StudySubject subject,);
 
 class ReportSectionContainer extends StatelessWidget {
   final ReportSection section;
@@ -16,12 +15,12 @@ class ReportSectionContainer extends StatelessWidget {
   final GestureTapCallback? onTap;
 
   const ReportSectionContainer(this.section,
-      {super.key, required this.subject, this.onTap, this.primary = false});
+      {super.key, required this.subject, this.onTap, this.primary = false,});
 
   ReportSectionWidget buildContents(BuildContext context) => switch (section) {
-        AverageSection averageSection =>
+        final AverageSection averageSection =>
           AverageSectionWidget(subject, averageSection),
-        LinearRegressionSection linearRegressionSection =>
+        final LinearRegressionSection linearRegressionSection =>
           LinearRegressionSectionWidget(subject, linearRegressionSection),
         _ => throw ArgumentError('Section type ${section.type} not supported.'),
       };
diff --git a/app/lib/screens/study/report/sections/average_section_widget.dart b/app/lib/screens/study/report/sections/average_section_widget.dart
index 6e6bd4c9d..bf949f7d7 100644
--- a/app/lib/screens/study/report/sections/average_section_widget.dart
+++ b/app/lib/screens/study/report/sections/average_section_widget.dart
@@ -1,14 +1,13 @@
 import 'package:collection/collection.dart';
 import 'package:fl_chart/fl_chart.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:studyu_app/screens/study/report/report_section_widget.dart';
+import 'package:studyu_app/screens/study/report/util/plot_utilities.dart';
 import 'package:studyu_app/theme.dart';
+import 'package:studyu_app/util/data_processing.dart';
 import 'package:studyu_core/core.dart';
 
-import '../../../../util/data_processing.dart';
-import '../report_section_widget.dart';
-import '../util/plot_utilities.dart';
-
 class AverageSectionWidget extends ReportSectionWidget {
   final AverageSection section;
 
@@ -19,16 +18,19 @@ class AverageSectionWidget extends ReportSectionWidget {
     final data = getAggregatedData().toList();
     final taskTitle = subject.study.observations
         .firstWhereOrNull(
-            (element) => element.id == section.resultProperty!.task)
+          (element) => element.id == section.resultProperty!.task,
+        )
         ?.title;
 
     return Column(
       mainAxisSize: MainAxisSize.min,
       children: [
         if (taskTitle != null)
-          Text(taskTitle,
-              style: theme.textTheme.bodyLarge!
-                  .copyWith(fontWeight: FontWeight.bold)),
+          Text(
+            taskTitle,
+            style: theme.textTheme.bodyLarge!
+                .copyWith(fontWeight: FontWeight.bold),
+          ),
         const SizedBox(height: 8),
         getLegend(context, data),
         const SizedBox(height: 8),
@@ -41,8 +43,10 @@ class AverageSectionWidget extends ReportSectionWidget {
     final numberOfPhases = subject.interventionOrder.length;
     final phaseDuration = subject.study.schedule.phaseDuration;
     return Iterable<int>.generate(numberOfPhases)
-        .map((i) =>
-            (((i + 1) * phaseDuration - ((phaseDuration / 2) - 1)) - 1).floor())
+        .map(
+          (i) => (((i + 1) * phaseDuration - ((phaseDuration / 2) - 1)) - 1)
+              .floor(),
+        )
         .toList();
   }
 
@@ -57,9 +61,9 @@ class AverageSectionWidget extends ReportSectionWidget {
   Widget getLegend(BuildContext context, List<DiagramDatum> data) {
     final interventionNames = getInterventionNames(context);
     final legends = {
-      for (var entry in data)
+      for (final entry in data)
         interventionNames[entry.intervention]!:
-            Legend(interventionNames[entry.intervention]!, getColor(entry))
+            Legend(interventionNames[entry.intervention]!, getColor(entry)),
     };
     return LegendsListWidget(legends: legends.values.toList());
   }
@@ -67,8 +71,6 @@ class AverageSectionWidget extends ReportSectionWidget {
   Widget getDiagram(BuildContext context, List<DiagramDatum> data) {
     return BarChart(
       getChartData(context, data),
-      swapAnimationDuration: const Duration(milliseconds: 150), // Optional
-      swapAnimationCurve: Curves.linear, // Optional
     );
   }
 
@@ -81,19 +83,18 @@ class AverageSectionWidget extends ReportSectionWidget {
             .ceilToDouble();
     return BarChartData(
       titlesData: FlTitlesData(
-          bottomTitles: AxisTitles(
-              axisNameWidget:
-                  (section.aggregate != TemporalAggregation.intervention)
-                      ? const Text("Phase")
-                      : const Text(""),
-              sideTitles: SideTitles(
-                showTitles: true,
-                getTitlesWidget: getTitles,
-              )),
-          topTitles: const AxisTitles(
-              sideTitles: SideTitles(
-            showTitles: false,
-          ))),
+        bottomTitles: AxisTitles(
+          axisNameWidget:
+              (section.aggregate != TemporalAggregation.intervention)
+                  ? const Text("Phase")
+                  : const Text(""),
+          sideTitles: SideTitles(
+            showTitles: true,
+            getTitlesWidget: getTitles,
+          ),
+        ),
+        topTitles: const AxisTitles(),
+      ),
       gridData: getGridData(barGroups),
       alignment: BarChartAlignment.spaceAround,
       barGroups: barGroups,
@@ -128,7 +129,9 @@ class AverageSectionWidget extends ReportSectionWidget {
   }
 
   List<BarChartGroupData> getBarGroups(
-      BuildContext context, List<DiagramDatum> data) {
+    BuildContext context,
+    List<DiagramDatum> data,
+  ) {
     if (data.isEmpty) return [BarChartGroupData(x: 0)];
 
     int barCount = 0;
@@ -159,10 +162,13 @@ class AverageSectionWidget extends ReportSectionWidget {
       return BarChartGroupData(x: index, barsSpace: 0, barRods: [rod]);
     }
 
-    var starter = List<BarChartGroupData>.generate(barCount, barGenerator);
-    for (var entry in data) {
-      starter[entry.x.round()] = barGenerator(entry.x.round(),
-          y: entry.value.toDouble(), color: getColor(entry));
+    final starter = List<BarChartGroupData>.generate(barCount, barGenerator);
+    for (final entry in data) {
+      starter[entry.x.round()] = barGenerator(
+        entry.x.round(),
+        y: entry.value.toDouble(),
+        color: getColor(entry),
+      );
     }
     return starter;
   }
@@ -189,7 +195,6 @@ class AverageSectionWidget extends ReportSectionWidget {
 
     return FlGridData(
       drawHorizontalLine: false,
-      drawVerticalLine: true,
       checkToShowVerticalLine: drawLine,
       verticalInterval: 1 / lineCount,
     );
@@ -235,8 +240,9 @@ class AverageSectionWidget extends ReportSectionWidget {
   }
 
   int getDayIndex(DateTime key) {
-    if (subject.study.schedule.includeBaseline)
+    if (subject.study.schedule.includeBaseline) {
       return subject.getDayOfStudyFor(key);
+    }
     final schedule = subject.scheduleFor(subject.startedAt!);
     // this always has to be found because studies have to have at least 2
     // interventions
@@ -285,7 +291,7 @@ class AverageSectionWidget extends ReportSectionWidget {
           .groupBy((e) => e.intervention)
           .aggregateWithKey(
             (data, intervention) => DiagramDatum(
-              order[intervention] as num,
+              order[intervention]! as num,
               foldAggregateMean()(data.map((e) => e.value)),
               null,
               intervention,
@@ -297,8 +303,8 @@ class AverageSectionWidget extends ReportSectionWidget {
 
   Map<String, String?> getInterventionNames(BuildContext context) {
     final names = {
-      for (var intervention in subject.study.interventions)
-        intervention.id: intervention.name
+      for (final intervention in subject.study.interventions)
+        intervention.id: intervention.name,
     };
     names[Study.baselineID] = AppLocalizations.of(context)!.baseline;
     return names;
diff --git a/app/lib/screens/study/report/util/plot_utilities.dart b/app/lib/screens/study/report/util/plot_utilities.dart
index eddb3cad0..34294da77 100644
--- a/app/lib/screens/study/report/util/plot_utilities.dart
+++ b/app/lib/screens/study/report/util/plot_utilities.dart
@@ -3,7 +3,7 @@ import 'package:studyu_core/core.dart';
 
 Map<String, int> getInterventionPositions(List<Intervention> interventions) {
   final order = <String, int>{};
-  for (var intervention in interventions) {
+  for (final intervention in interventions) {
     if (!order.containsKey(intervention.id)) {
       order[intervention.id] = order.length;
     }
diff --git a/app/lib/screens/study/tasks/task_screen.dart b/app/lib/screens/study/tasks/task_screen.dart
index 4b490fd97..2027d050d 100644
--- a/app/lib/screens/study/tasks/task_screen.dart
+++ b/app/lib/screens/study/tasks/task_screen.dart
@@ -1,20 +1,20 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:provider/provider.dart';
 import 'package:studyu_app/models/app_state.dart';
+import 'package:studyu_app/screens/study/tasks/intervention/checkmark_task_widget.dart';
+import 'package:studyu_app/screens/study/tasks/observation/questionnaire_task_widget.dart';
 import 'package:studyu_app/util/cache.dart';
 import 'package:studyu_app/widgets/html_text.dart';
 import 'package:studyu_core/core.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'intervention/checkmark_task_widget.dart';
-import 'observation/questionnaire_task_widget.dart';
 
 class TaskScreen extends StatefulWidget {
   final TaskInstance taskInstance;
 
   static MaterialPageRoute<bool> routeFor(
-          {required TaskInstance taskInstance}) =>
+          {required TaskInstance taskInstance,}) =>
       MaterialPageRoute(
         builder: (_) => TaskScreen(taskInstance: taskInstance),
       );
@@ -34,17 +34,16 @@ class _TaskScreenState extends State<TaskScreen> {
     super.didChangeDependencies();
     subject = context.watch<AppState>().activeSubject;
     taskInstance = TaskInstance.fromInstanceId(widget.taskInstance.id,
-        study: subject!.study);
+        study: subject!.study,);
   }
 
   Widget _buildTask() {
     switch (taskInstance.task) {
-      case CheckmarkTask checkmarkTask:
+      case final CheckmarkTask checkmarkTask:
         return SingleChildScrollView(
           child: SizedBox(
             width: MediaQuery.of(context).size.width,
             child: Column(
-              crossAxisAlignment: CrossAxisAlignment.center,
               children: [
                 HtmlText(taskInstance.task.header, centered: true),
                 const SizedBox(height: 20),
@@ -52,12 +51,12 @@ class _TaskScreenState extends State<TaskScreen> {
                   task: checkmarkTask,
                   key: UniqueKey(),
                   completionPeriod: taskInstance.completionPeriod,
-                )
+                ),
               ],
             ),
           ),
         );
-      case QuestionnaireTask questionnaireTask:
+      case final QuestionnaireTask questionnaireTask:
         return QuestionnaireTaskWidget(
           task: questionnaireTask,
           key: UniqueKey(),
@@ -80,8 +79,8 @@ class _TaskScreenState extends State<TaskScreen> {
   }
 }
 
-handleTaskCompletion(
-    BuildContext context, Function(StudySubject?) completionCallback) async {
+Future<void> handleTaskCompletion(
+    BuildContext context, Function(StudySubject?) completionCallback,) async {
   final state = context.read<AppState>();
   final activeSubject = state.activeSubject;
   try {
@@ -99,7 +98,7 @@ handleTaskCompletion(
         duration: const Duration(seconds: 10),
         action: SnackBarAction(
             label: 'Retry',
-            onPressed: () => handleTaskCompletion(context, completionCallback)),
+            onPressed: () => handleTaskCompletion(context, completionCallback),),
       ),
     );
     rethrow;
diff --git a/app/lib/util/app_analytics.dart b/app/lib/util/app_analytics.dart
index 5519fc0af..069163c75 100644
--- a/app/lib/util/app_analytics.dart
+++ b/app/lib/util/app_analytics.dart
@@ -4,11 +4,10 @@ import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:sentry_logging/sentry_logging.dart';
 import 'package:studyu_app/app.dart';
 import 'package:studyu_app/models/app_state.dart';
+import 'package:studyu_app/util/cache.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_flutter_common/studyu_flutter_common.dart';
 
-import 'cache.dart';
-
 class AppAnalytics /*extends Analytics*/ {
   static bool? _userEnabled;
 
@@ -37,7 +36,7 @@ class AppAnalytics /*extends Analytics*/ {
     StudyUAnalytics? studyUAnalytics;
     if (appConfig == null ||
         appConfig.analytics != null && appConfig.analytics!.dsn.isEmpty) {
-      final cachedAnalytics = (await Cache.loadAnalytics());
+      final cachedAnalytics = await Cache.loadAnalytics();
       if (cachedAnalytics != null) {
         studyUAnalytics = cachedAnalytics;
       }
@@ -55,19 +54,19 @@ class AppAnalytics /*extends Analytics*/ {
       // We recommend adjusting this value in production.
       options.tracesSampleRate = studyUAnalytics.samplingRate ?? 1.0;
       options.addIntegration(LoggingIntegration());
-    }, appRunner: () => runApp(myApp));
+    }, appRunner: () => runApp(myApp),);
     Cache.storeAnalytics(StudyUAnalytics(
       studyUAnalytics.enabled,
       studyUAnalytics.dsn,
       studyUAnalytics.samplingRate,
-    ));
+    ),);
   }
 
-  static get isUserEnabled {
+  static bool? get isUserEnabled {
     return _userEnabled;
   }
 
-  static void setEnabled(bool newEnabled) async {
+  static Future<void> setEnabled(bool newEnabled) async {
     await SecureStorage.write(keyAnalyticsUserEnable, newEnabled.toString());
     if (!newEnabled) {
       // a restart of the app will be necessary to enable sentry again
@@ -93,7 +92,7 @@ class AppAnalytics /*extends Analytics*/ {
     Sentry.configureScope((scope) {
       scope.setUser(SentryUser(
         id: subject!.userId,
-      ));
+      ),);
       final advancedContext = {
         'subjectId': subject!.id,
         'studyId': state.selectedStudy!.id,
diff --git a/app/lib/util/cache.dart b/app/lib/util/cache.dart
index 07eebfe2c..4747459b6 100644
--- a/app/lib/util/cache.dart
+++ b/app/lib/util/cache.dart
@@ -20,7 +20,9 @@ class Cache {
     // debugPrint("Load subject from cache");
     if (await SecureStorage.containsKey(cacheSubjectKey)) {
       return StudySubject.fromJson(
-          jsonDecode((await SecureStorage.read(cacheSubjectKey))!));
+        jsonDecode((await SecureStorage.read(cacheSubjectKey))!)
+            as Map<String, dynamic>,
+      );
     } else {
       throw Exception("No cached subject found");
     }
@@ -28,13 +30,18 @@ class Cache {
 
   static Future<void> storeAnalytics(StudyUAnalytics analytics) async {
     SecureStorage.write(
-        StudyUAnalytics.keyStudyUAnalytics, jsonEncode(analytics.toJson()));
+      StudyUAnalytics.keyStudyUAnalytics,
+      jsonEncode(analytics.toJson()),
+    );
   }
 
   static Future<StudyUAnalytics?> loadAnalytics() async {
     if (await SecureStorage.containsKey(cacheSubjectKey)) {
-      return StudyUAnalytics.fromJson(jsonDecode(
-          (await SecureStorage.read(StudyUAnalytics.keyStudyUAnalytics))!));
+      return StudyUAnalytics.fromJson(
+        jsonDecode(
+          (await SecureStorage.read(StudyUAnalytics.keyStudyUAnalytics))!,
+        ) as Map<String, dynamic>,
+      );
     }
     return null;
   }
@@ -49,7 +56,9 @@ class Cache {
     final futureBlobFiles = await TemporaryStorageHandler.getFutureBlobFiles();
     for (final futureBlobFile in futureBlobFiles) {
       await blobStorageHandler.uploadObservation(
-          futureBlobFile.futureBlobId, File(futureBlobFile.localFilePath));
+        futureBlobFile.futureBlobId,
+        File(futureBlobFile.localFilePath),
+      );
       await File(futureBlobFile.localFilePath).delete();
     }
   }
@@ -57,15 +66,17 @@ class Cache {
   static Future<StudySubject> synchronize(StudySubject remoteSubject) async {
     if (isSynchronizing) return remoteSubject;
     // No local subject found
-    if (!(await SecureStorage.containsKey(cacheSubjectKey)))
+    if (!(await SecureStorage.containsKey(cacheSubjectKey))) {
       return remoteSubject;
+    }
     final localSubject = await loadSubject();
     // local and remote subject are equal, nothing to synchronize
     if (localSubject == remoteSubject) return remoteSubject;
     // remote subject belongs to a different study
     if (!kDebugMode &&
-        remoteSubject.startedAt!.isAfter(localSubject.startedAt!))
+        remoteSubject.startedAt!.isAfter(localSubject.startedAt!)) {
       return remoteSubject;
+    }
 
     debugPrint("Synchronize subject with cache");
     isSynchronizing = true;
@@ -91,19 +102,21 @@ class Cache {
         // save new progress
         final List<SubjectProgress> newProgress = [
           ...localSubject.progress,
-          ...remoteSubject.progress
+          ...remoteSubject.progress,
         ];
-        newProgress.removeWhere((element) =>
-            localSubject.progress.contains(element) &&
-            remoteSubject.progress.contains(element));
-        for (var p in newProgress) {
+        newProgress.removeWhere(
+          (element) =>
+              localSubject.progress.contains(element) &&
+              remoteSubject.progress.contains(element),
+        );
+        for (final p in newProgress) {
           await p.save();
         }
 
         // merge local and remote progress and remove duplicates
         final List<SubjectProgress> finalProgress = [
           ...localSubject.progress,
-          ...remoteSubject.progress
+          ...remoteSubject.progress,
         ];
         final duplicates = <DateTime?>{};
         finalProgress
@@ -117,11 +130,14 @@ class Cache {
         // ... for now do nothing
         if (!kDebugMode && localSubject.startedAt == remoteSubject.startedAt) {
           StudyULogger.fatal(
-              "Cache synchronization found local changes that cannot be merged");
+            "Cache synchronization found local changes that cannot be merged",
+          );
           StudyUDiagnostics.captureMessage(
-              "localSubject: ${localSubject.toFullJson()} \nremoteSubject: ${remoteSubject.toFullJson()}");
+            "localSubject: ${localSubject.toFullJson()} \nremoteSubject: ${remoteSubject.toFullJson()}",
+          );
           StudyUDiagnostics.captureException(
-              Exception("CacheSynchronizationException"));
+            Exception("CacheSynchronizationException"),
+          );
         }
       }
     } catch (exception) {
diff --git a/app/lib/util/color.dart b/app/lib/util/color.dart
index 5dcf665e8..b83855db1 100644
--- a/app/lib/util/color.dart
+++ b/app/lib/util/color.dart
@@ -6,7 +6,7 @@ extension ColorBrightness on Color {
 
     final hsl = HSLColor.fromColor(this);
     final hslLight =
-        hsl.withLightness((hsl.lightness + amount).clamp(0.0, 1.0).toDouble());
+        hsl.withLightness((hsl.lightness + amount).clamp(0.0, 1.0));
 
     return hslLight.toColor();
   }
diff --git a/app/lib/util/data_processing.dart b/app/lib/util/data_processing.dart
index 18bc12615..2e17a66ce 100644
--- a/app/lib/util/data_processing.dart
+++ b/app/lib/util/data_processing.dart
@@ -16,7 +16,7 @@ class GroupedIterable<K, V> extends Iterable<MapEntry<K, Iterable<V>>> {
       map((entry) => MapEntry(entry.key, aggregator(entry.value)));
 
   Iterable<MapEntry<K, R>> aggregateWithKey<R>(
-          KeyedAggregator<K, V, R> aggregator) =>
+          KeyedAggregator<K, V, R> aggregator,) =>
       map((entry) => MapEntry(entry.key, aggregator(entry.value, entry.key)));
 }
 
@@ -41,7 +41,7 @@ extension GroupByIterable<V> on Iterable<V> {
   GroupedIterable<K, V> groupBy<K>(KeyAccessor<K, V> key) {
     final result = <K, List<V>>{};
     forEach(
-        (element) => result.putIfAbsent(key(element), () => []).add(element));
+        (element) => result.putIfAbsent(key(element), () => []).add(element),);
     return GroupedIterable.from(result);
   }
 }
diff --git a/app/lib/util/intervention.dart b/app/lib/util/intervention.dart
index 82e3d397f..b7bc0630f 100644
--- a/app/lib/util/intervention.dart
+++ b/app/lib/util/intervention.dart
@@ -3,15 +3,16 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart
 import 'package:studyu_core/core.dart';
 
 Widget interventionIcon(Intervention intervention, {Color? color}) {
-  if (intervention.isBaseline())
+  if (intervention.isBaseline()) {
     return Icon(MdiIcons.rayStart, color: color ?? Colors.white);
+  }
 
   return intervention.icon.isNotEmpty
       ? Icon(MdiIcons.fromString(intervention.icon),
-          color: color ?? Colors.white)
+          color: color ?? Colors.white,)
       : Text(
           intervention.name![0].toUpperCase(),
           style: TextStyle(
-              fontWeight: FontWeight.bold, color: color ?? Colors.white),
+              fontWeight: FontWeight.bold, color: color ?? Colors.white,),
         );
 }
diff --git a/app/lib/util/notifications.dart b/app/lib/util/notifications.dart
index 2a173add7..8c195b8d8 100644
--- a/app/lib/util/notifications.dart
+++ b/app/lib/util/notifications.dart
@@ -6,13 +6,12 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:permission_handler/permission_handler.dart';
+import 'package:studyu_app/main.dart';
 import 'package:studyu_app/routes.dart';
 import 'package:studyu_app/screens/study/dashboard/dashboard.dart';
+import 'package:studyu_app/screens/study/tasks/task_screen.dart';
 import 'package:studyu_core/core.dart';
 
-import '../main.dart';
-import '../screens/study/tasks/task_screen.dart';
-
 class NotificationValidators {
   bool didNotificationLaunchApp = false;
   // do not launch notification action twice if user subscribes to a new study
@@ -20,7 +19,7 @@ class NotificationValidators {
   bool wasNotificationActionCompleted = false;
 
   NotificationValidators(this.didNotificationLaunchApp,
-      this.wasNotificationActionHandled, this.wasNotificationActionCompleted);
+      this.wasNotificationActionHandled, this.wasNotificationActionCompleted,);
 }
 
 class StudyNotifications {
@@ -110,7 +109,7 @@ class StudyNotifications {
       /*final bool granted =*/ await androidImplementation
           ?.requestNotificationsPermission();
 
-      var status = await Permission.ignoreBatteryOptimizations.status;
+      final status = await Permission.ignoreBatteryOptimizations.status;
       if (status.isDenied) {
         if (await Permission.ignoreBatteryOptimizations.request().isGranted) {
           // print("Ignore battery optimization Permission is granted");
@@ -145,7 +144,7 @@ class StudyNotifications {
                 );
               },
               child: const Text('Ok'),
-            )
+            ),
           ],
         ),
       );
@@ -198,7 +197,6 @@ class StudyNotifications {
         switch (notificationResponse.notificationResponseType) {
           case NotificationResponseType.selectedNotification:
             selectNotificationStream.add(notificationResponse.payload);
-            break;
           case NotificationResponseType.selectedNotificationAction:
             /*if (notificationResponse.actionId == navigationActionId) {
               selectNotificationStream.add(notificationResponse.payload);
diff --git a/app/lib/util/save_pdf.dart b/app/lib/util/save_pdf.dart
index 5a0b09b53..9b7ec26c9 100644
--- a/app/lib/util/save_pdf.dart
+++ b/app/lib/util/save_pdf.dart
@@ -5,10 +5,10 @@ import 'package:pdf/pdf.dart';
 import 'package:pdf/widgets.dart' as pw;
 
 Future<String?> savePDF(
-    BuildContext context, String title, List<pw.Widget> content) async {
+    BuildContext context, String title, List<pw.Widget> content,) async {
   final doc = pw.Document();
   final logo = pw.MemoryImage(
-      (await rootBundle.load('assets/icon/logo.png')).buffer.asUint8List());
+      (await rootBundle.load('assets/icon/logo.png')).buffer.asUint8List(),);
   doc.addPage(
     pw.MultiPage(
       pageFormat: PdfPageFormat.a4,
diff --git a/app/lib/util/schedule_notifications.dart b/app/lib/util/schedule_notifications.dart
index 62d89efa6..fdc452978 100644
--- a/app/lib/util/schedule_notifications.dart
+++ b/app/lib/util/schedule_notifications.dart
@@ -3,29 +3,28 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:provider/provider.dart';
+import 'package:studyu_app/models/app_state.dart';
+import 'package:studyu_app/util/notifications.dart';
 import 'package:studyu_core/core.dart';
 import 'package:timezone/timezone.dart' as tz;
 
-import '../models/app_state.dart';
-import 'notifications.dart';
-
 Future<int> scheduleReminderForDate(
     FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin,
     int id,
     String body,
     StudyNotification studyNotification,
-    NotificationDetails notificationDetails) async {
+    NotificationDetails notificationDetails,) async {
   var currentId = id;
   final task = studyNotification.taskInstance.task;
   final date = studyNotification.date;
   for (final reminder in task.schedule.reminders) {
     // unlock time:  ${task.schedule.completionPeriods.firstWhere((cp) => cp.unlockTime.earlierThan(reminder)).lockTime}
     final reminderTime = tz.TZDateTime(tz.local, date.year, date.month,
-        date.day, reminder.hour, reminder.minute);
+        date.day, reminder.hour, reminder.minute,);
     if (date.isSameDate(DateTime.now()) &&
         !StudyUTimeOfDay(hour: date.hour, minute: date.minute)
             .earlierThan(reminder, exact: true)) {
-      String debugStr =
+      final String debugStr =
           'Skipped #$currentId: $reminderTime, ${task.title}, ${studyNotification.taskInstance.id}';
       //StudyNotifications.scheduledNotificationsDebug += '\n\n$debugStr';
       if (StudyNotifications.debug) {
@@ -68,7 +67,7 @@ Future<int> scheduleReminderForDate(
         );
       }*/
     // DEBUG: List scheduled notifications
-    String debugStr =
+    final String debugStr =
         'Scheduled #$currentId: $reminderTime, ${task.title}, ${studyNotification.taskInstance.id}';
     StudyNotifications.scheduledNotificationsDebug =
         '${StudyNotifications.scheduledNotificationsDebug}\n\n$debugStr';
@@ -104,7 +103,7 @@ Future<void> scheduleNotifications(BuildContext context) async {
   await notificationsPlugin.cancelAll();
 
   StudyNotifications.scheduledNotificationsDebug =
-      "Timestamp: ${DateTime.now().toString()}\nSubject ID: ${subject.id}\n";
+      "Timestamp: ${DateTime.now()}\nSubject ID: ${subject.id}\n";
   final List<StudyNotification> studyNotificationList = [];
 
   for (int index = 0; index <= 3; index++) {
@@ -115,23 +114,23 @@ Future<void> scheduleNotifications(BuildContext context) async {
   var id = 0;
   for (final StudyNotification notification in studyNotificationList) {
     final currentId = await scheduleReminderForDate(
-        notificationsPlugin, id, body, notification, notificationDetails);
+        notificationsPlugin, id, body, notification, notificationDetails,);
     id = currentId;
   }
 }
 
 List<StudyNotification> _buildNotificationList(
-    StudySubject subject, DateTime date, List<TaskInstance> tasks) {
-  List<StudyNotification> taskNotifications = [];
-  for (TaskInstance taskInstance in tasks) {
+    StudySubject subject, DateTime date, List<TaskInstance> tasks,) {
+  final List<StudyNotification> taskNotifications = [];
+  for (final TaskInstance taskInstance in tasks) {
     if (taskInstance.task.title == null || taskInstance.task.title!.isEmpty) {
       return [];
     }
     if (!subject.completedTaskInstanceForDay(
-        taskInstance.task.id, taskInstance.completionPeriod, date)) {
+        taskInstance.task.id, taskInstance.completionPeriod, date,)) {
       taskNotifications.add(StudyNotification(taskInstance, date));
     } else {
-      String debugStr =
+      final String debugStr =
           'TaskInstance already completed: ${taskInstance.completionPeriod}, ${taskInstance.task.title}';
       StudyNotifications.scheduledNotificationsDebug =
           '${StudyNotifications.scheduledNotificationsDebug}\n\n$debugStr';
@@ -140,7 +139,7 @@ List<StudyNotification> _buildNotificationList(
   return taskNotifications;
 }
 
-void testNotifications(BuildContext context) async {
+Future<void> testNotifications(BuildContext context) async {
   // Notifications not supported on web
   if (kIsWeb) return;
   final appState = context.read<AppState>();
diff --git a/app/lib/util/study_subject_extension.dart b/app/lib/util/study_subject_extension.dart
index a7cea5906..dc7f2ef04 100644
--- a/app/lib/util/study_subject_extension.dart
+++ b/app/lib/util/study_subject_extension.dart
@@ -1,9 +1,8 @@
 import 'package:flutter/foundation.dart';
+import 'package:studyu_app/util/cache.dart';
 import 'package:studyu_app/util/temporary_storage_handler.dart';
 import 'package:studyu_core/core.dart';
 
-import 'cache.dart';
-
 extension StudySubjectExtension on StudySubject {
   Future<void> addResult<T>({
     required String taskId,
@@ -13,7 +12,7 @@ extension StudySubjectExtension on StudySubject {
   }) async {
     final Result<T> resultObject = switch (result) {
       QuestionnaireState() => Result<T>.app(
-          type: 'QuestionnaireState', periodId: periodId, result: result),
+          type: 'QuestionnaireState', periodId: periodId, result: result,),
       bool() => Result<T>.app(type: 'bool', periodId: periodId, result: result),
       _ => Result<T>.app(type: 'unknown', periodId: periodId, result: result),
     };
@@ -32,7 +31,7 @@ extension StudySubjectExtension on StudySubject {
           if (answer.response is FutureBlobFile) {
             final futureBlobFile = answer.response as FutureBlobFile;
             await TemporaryStorageHandler.moveStagingFileToUploadDirectory(
-                futureBlobFile.localFilePath, futureBlobFile.futureBlobId);
+                futureBlobFile.localFilePath, futureBlobFile.futureBlobId,);
 
             // Replaces Answer<FutureBlobFile> with Answer<String>
             questionnaireState.answers[answerEntry.key] =
diff --git a/app/lib/util/temporary_storage_handler.dart b/app/lib/util/temporary_storage_handler.dart
index 2747a5ce9..9f8a9eca1 100644
--- a/app/lib/util/temporary_storage_handler.dart
+++ b/app/lib/util/temporary_storage_handler.dart
@@ -38,14 +38,14 @@ class TemporaryStorageHandler {
   }
 
   static Future<void> moveStagingFileToUploadDirectory(
-      String stagingFilePath, String blobId) async {
+      String stagingFilePath, String blobId,) async {
     final stagingFile = File(stagingFilePath);
     final uploadDirectory = await _getMultimodalUploadDirectory();
     final uploadFile = File(path.join(
         uploadDirectory.path,
         [
           blobId,
-        ].join()));
+        ].join(),),);
     await stagingFile.rename(uploadFile.path);
   }
 
@@ -97,7 +97,7 @@ class TemporaryStorageHandler {
         .list()
         .where((f) => path
             .basename(f.path)
-            .startsWith(TemporaryStorageHandler._stagingBaseNamePrefix))
+            .startsWith(TemporaryStorageHandler._stagingBaseNamePrefix),)
         .toList()) {
       await file.delete();
     }
diff --git a/app/lib/widgets/bottom_onboarding_navigation.dart b/app/lib/widgets/bottom_onboarding_navigation.dart
index 423405738..6dfb0d023 100644
--- a/app/lib/widgets/bottom_onboarding_navigation.dart
+++ b/app/lib/widgets/bottom_onboarding_navigation.dart
@@ -42,7 +42,7 @@ class BottomOnboardingNavigation extends StatelessWidget {
             if (progress != null) ...[
               const SizedBox(width: 8),
               Expanded(child: progress!),
-              const SizedBox(width: 8)
+              const SizedBox(width: 8),
             ] else
               const Spacer(),
             Visibility(
diff --git a/app/lib/widgets/html_text.dart b/app/lib/widgets/html_text.dart
index 03b6c5bd4..dcc961608 100644
--- a/app/lib/widgets/html_text.dart
+++ b/app/lib/widgets/html_text.dart
@@ -15,7 +15,7 @@ class HtmlText extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    Widget htmlWidget = HtmlWidget(
+    final Widget htmlWidget = HtmlWidget(
       text ?? '',
       textStyle: style,
       // these callbacks are called when a complicated element is loading
diff --git a/app/lib/widgets/intervention_card.dart b/app/lib/widgets/intervention_card.dart
index 4f3abbee4..4a342fc14 100644
--- a/app/lib/widgets/intervention_card.dart
+++ b/app/lib/widgets/intervention_card.dart
@@ -38,7 +38,7 @@ class InterventionCard extends StatelessWidget {
         if (showDescription)
           InterventionCardDescription(intervention: intervention),
         if (showTasks && intervention.tasks.isNotEmpty)
-          _TaskList(tasks: intervention.tasks)
+          _TaskList(tasks: intervention.tasks),
       ],
     );
   }
@@ -66,7 +66,7 @@ class InterventionCardTitle extends StatelessWidget {
     return ListTile(
       onTap: onTap,
       leading: Icon(MdiIcons.fromString(intervention!.icon),
-          color: theme.colorScheme.secondary),
+          color: theme.colorScheme.secondary,),
       trailing: showCheckbox
           ? Checkbox(
               value: selected,
@@ -79,7 +79,7 @@ class InterventionCardTitle extends StatelessWidget {
         children: [
           Expanded(
               child:
-                  Text(intervention!.name!, style: theme.textTheme.titleLarge)),
+                  Text(intervention!.name!, style: theme.textTheme.titleLarge),),
           if (showDescriptionButton)
             IconButton(
               icon: const Icon(Icons.info_outline),
@@ -92,10 +92,10 @@ class InterventionCardTitle extends StatelessWidget {
                   return AlertDialog(
                     title: ListTile(
                       leading: Icon(MdiIcons.fromString(intervention!.icon),
-                          color: theme.colorScheme.secondary),
+                          color: theme.colorScheme.secondary,),
                       dense: true,
                       title: Text(intervention!.name!,
-                          style: theme.textTheme.titleLarge),
+                          style: theme.textTheme.titleLarge,),
                     ),
                     content: HtmlText(description),
                   );
@@ -141,7 +141,7 @@ class _TaskList extends StatelessWidget {
   String scheduleString(List<CompletionPeriod> schedules) {
     return schedules
         .map((completionPeriod) =>
-            '${completionPeriod.unlockTime} - ${completionPeriod.lockTime}')
+            '${completionPeriod.unlockTime} - ${completionPeriod.lockTime}',)
         .join(',');
   }
 
@@ -156,7 +156,7 @@ class _TaskList extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
               Text(AppLocalizations.of(context)!.tasks_daily,
-                  style: theme.textTheme.bodyMedium),
+                  style: theme.textTheme.bodyMedium,),
             ],
           ),
         ),
@@ -174,18 +174,18 @@ class _TaskList extends StatelessWidget {
                     children: [
                       Expanded(
                           child: Text(task.title!,
-                              style: theme.textTheme.bodyMedium)),
+                              style: theme.textTheme.bodyMedium,),),
                       Row(
                         children: [
                           Icon(Icons.access_time,
                               size: 16,
-                              color: theme.textTheme.bodySmall!.color),
+                              color: theme.textTheme.bodySmall!.color,),
                           const SizedBox(width: 4),
                           Text(
                             scheduleString(task.schedule.completionPeriods),
                             style: theme.textTheme.bodyMedium!.copyWith(
                                 fontSize: 12,
-                                color: theme.textTheme.bodySmall!.color),
+                                color: theme.textTheme.bodySmall!.color,),
                           ),
                         ],
                       ),
diff --git a/app/lib/widgets/questionnaire/audio_recording_question_widget.dart b/app/lib/widgets/questionnaire/audio_recording_question_widget.dart
index d2f4256bc..7afbedd20 100644
--- a/app/lib/widgets/questionnaire/audio_recording_question_widget.dart
+++ b/app/lib/widgets/questionnaire/audio_recording_question_widget.dart
@@ -2,8 +2,8 @@ import 'dart:async';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:record/record.dart';
 import 'package:studyu_app/models/app_state.dart';
@@ -15,8 +15,11 @@ class AudioRecordingQuestionWidget extends QuestionWidget {
   final AudioRecordingQuestion question;
   final Function(Answer<FutureBlobFile>)? onDone;
 
-  const AudioRecordingQuestionWidget(
-      {super.key, required this.question, this.onDone});
+  const AudioRecordingQuestionWidget({
+    super.key,
+    required this.question,
+    this.onDone,
+  });
 
   @override
   State<AudioRecordingQuestionWidget> createState() =>
@@ -52,94 +55,103 @@ class _AudioRecordingQuestionWidgetState
     final appState = context.read<AppState>();
     final maxRecordingDurationSeconds =
         widget.question.maxRecordingDurationSeconds;
-    return Row(children: [
-      Expanded(
+    return Row(
+      children: [
+        Expanded(
           child: OutlinedButton(
-        style: OutlinedButton.styleFrom(
-          backgroundColor: _isRecording ? Colors.red.shade600 : null,
-          foregroundColor:
-              _isRecording ? Colors.white : theme.colorScheme.primary,
-          side: BorderSide(
-              width: 1.0,
-              color: _hasRecorded
-                  ? Colors.black38
-                  : _isRecording
-                      ? Colors.red.shade600
-                      : theme.colorScheme.primary),
-        ),
-        onPressed: !_hasRecorded
-            ? () async {
-                if (_isRecording) {
-                  await _stopRecording();
-                } else {
-                  await _startRecording(appState.activeSubject!.studyId,
-                      appState.activeSubject!.userId);
-                }
-              }
-            : null,
-        child: Padding(
-          padding: const EdgeInsets.symmetric(
-            vertical: 8.0,
-            horizontal: 2.0,
-          ),
-          child: Row(
-            children: [
-              Padding(
-                padding: const EdgeInsets.all(4.0),
-                child: Icon(
-                  _hasRecorded
-                      ? MdiIcons.checkCircleOutline
-                      : _isRecording
-                          ? MdiIcons.stop
-                          : MdiIcons.microphone,
-                  color: _hasRecorded
-                      ? Colors.black38
-                      : _isRecording
-                          ? Colors.white
-                          : theme.colorScheme.primary,
-                  size: 24,
-                ),
-              ),
-              const Spacer(),
-              Text(
-                _hasRecorded
-                    ? loc.audio_recorded
+            style: OutlinedButton.styleFrom(
+              backgroundColor: _isRecording ? Colors.red.shade600 : null,
+              foregroundColor:
+                  _isRecording ? Colors.white : theme.colorScheme.primary,
+              side: BorderSide(
+                color: _hasRecorded
+                    ? Colors.black38
                     : _isRecording
-                        ? loc.stop_recording
-                        : loc.start_recording,
-                style: const TextStyle(fontSize: 16),
+                        ? Colors.red.shade600
+                        : theme.colorScheme.primary,
+              ),
+            ),
+            onPressed: !_hasRecorded
+                ? () async {
+                    if (_isRecording) {
+                      await _stopRecording();
+                    } else {
+                      await _startRecording(
+                        appState.activeSubject!.studyId,
+                        appState.activeSubject!.userId,
+                      );
+                    }
+                  }
+                : null,
+            child: Padding(
+              padding: const EdgeInsets.symmetric(
+                vertical: 8.0,
+                horizontal: 2.0,
               ),
-              const Spacer(),
-            ],
+              child: Row(
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.all(4.0),
+                    child: Icon(
+                      _hasRecorded
+                          ? MdiIcons.checkCircleOutline
+                          : _isRecording
+                              ? MdiIcons.stop
+                              : MdiIcons.microphone,
+                      color: _hasRecorded
+                          ? Colors.black38
+                          : _isRecording
+                              ? Colors.white
+                              : theme.colorScheme.primary,
+                      size: 24,
+                    ),
+                  ),
+                  const Spacer(),
+                  Text(
+                    _hasRecorded
+                        ? loc.audio_recorded
+                        : _isRecording
+                            ? loc.stop_recording
+                            : loc.start_recording,
+                    style: const TextStyle(fontSize: 16),
+                  ),
+                  const Spacer(),
+                ],
+              ),
+            ),
           ),
         ),
-      )),
-      const SizedBox(width: 16.0),
-      Text(
-        '${_formatNumber(_recordDurationSeconds ~/ 60)}:${_formatNumber(_recordDurationSeconds % 60)}',
-        style: const TextStyle(fontSize: 16),
-      ),
-      const SizedBox(width: 8.0),
-      _isRecording &&
-              _recordDurationSeconds > 0 &&
-              _recordDurationSeconds < maxRecordingDurationSeconds
-          ? SizedBox(
-              width: 16,
-              height: 16,
-              child: CircularProgressIndicator(
-                value: 1.0 -
-                    (_recordDurationSeconds / maxRecordingDurationSeconds),
-                strokeWidth: 2.5,
-              ))
-          : const SizedBox.shrink(),
-    ]);
+        const SizedBox(width: 16.0),
+        Text(
+          '${_formatNumber(_recordDurationSeconds ~/ 60)}:${_formatNumber(_recordDurationSeconds % 60)}',
+          style: const TextStyle(fontSize: 16),
+        ),
+        const SizedBox(width: 8.0),
+        if (_isRecording &&
+            _recordDurationSeconds > 0 &&
+            _recordDurationSeconds < maxRecordingDurationSeconds)
+          SizedBox(
+            width: 16,
+            height: 16,
+            child: CircularProgressIndicator(
+              value:
+                  1.0 - (_recordDurationSeconds / maxRecordingDurationSeconds),
+              strokeWidth: 2.5,
+            ),
+          )
+        else
+          const SizedBox.shrink(),
+      ],
+    );
   }
 
   Future<void> _startRecording(String studyId, String userId) async {
     if (kIsWeb) {
-      ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-        content: Text(AppLocalizations.of(context)!.multimodal_not_supported),
-      ));
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(AppLocalizations.of(context)!.multimodal_not_supported),
+        ),
+      );
       return;
     }
 
@@ -157,8 +169,7 @@ class _AudioRecordingQuestionWidgetState
       }
 
       final storage = TemporaryStorageHandler(studyId, userId);
-      const encoder = AudioEncoder.aacLc;
-      const config = RecordConfig(encoder: encoder, numChannels: 1);
+      const config = RecordConfig(numChannels: 1);
       _recordedFile = await storage.getStagingAudio();
       await _audioRecorder.start(config, path: _recordedFile!.localFilePath);
       _startTimer();
diff --git a/app/lib/widgets/questionnaire/custom_slider.dart b/app/lib/widgets/questionnaire/custom_slider.dart
index e9dc5a3bf..7c5c371da 100644
--- a/app/lib/widgets/questionnaire/custom_slider.dart
+++ b/app/lib/widgets/questionnaire/custom_slider.dart
@@ -22,27 +22,28 @@ class CustomSlider extends StatelessWidget {
   final bool linearStep;
   final AnnotatedScaleQuestion? steps; // nullable
 
-  const CustomSlider(
-      {super.key,
-      // required
-      this.value,
-      this.minValue,
-      this.maxValue,
-      //this.majorTick,
-      this.minorTick,
-      this.onChanged,
-      this.onChangeEnd,
-      // not required
-      this.activeColor,
-      this.inactiveColor,
-      this.minColor,
-      this.maxColor,
-      this.thumbColor,
-      this.isColored = false,
-      this.labelValuePrecision = 2,
-      this.tickValuePrecision = 1,
-      this.linearStep = true,
-      this.steps});
+  const CustomSlider({
+    super.key,
+    // required
+    this.value,
+    this.minValue,
+    this.maxValue,
+    //this.majorTick,
+    this.minorTick,
+    this.onChanged,
+    this.onChangeEnd,
+    // not required
+    this.activeColor,
+    this.inactiveColor,
+    this.minColor,
+    this.maxColor,
+    this.thumbColor,
+    this.isColored = false,
+    this.labelValuePrecision = 2,
+    this.tickValuePrecision = 1,
+    this.linearStep = true,
+    this.steps,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -84,9 +85,11 @@ class CustomSlider extends StatelessWidget {
       return index + minValue! == value;
     }
 
-    String annotation(index) => annotations
-        .firstWhere((annotation) => annotation.value == index + minValue!,
-            orElse: () => Annotation())
+    String annotation(int index) => annotations
+        .firstWhere(
+          (annotation) => annotation.value == index + minValue!,
+          orElse: () => Annotation(),
+        )
         .annotation;
 
     return Column(
@@ -104,23 +107,26 @@ class CustomSlider extends StatelessWidget {
                 },
                 child: Column(
                   children: [
-                    index % (minorTick! + 1) == 0 &&
-                            annotation(index).isNotEmpty
-                        ? Container(
-                            alignment: Alignment.bottomCenter,
-                            //height: valueHeight,
-                            child: Text(
-                              //linearStep
-                              //  ? (index / (divisions - 1) * maxValue).toStringAsFixed(tickValuePrecision)
-                              /*:*/
-                              annotation(index),
-                              style: labelTextStyle!.copyWith(
-                                  fontWeight: isValueSelected(index)
-                                      ? FontWeight.bold
-                                      : FontWeight.normal),
-                              textAlign: TextAlign.center,
-                            ))
-                        : const SizedBox.shrink(),
+                    if (index % (minorTick! + 1) == 0 &&
+                        annotation(index).isNotEmpty)
+                      Container(
+                        alignment: Alignment.bottomCenter,
+                        //height: valueHeight,
+                        child: Text(
+                          //linearStep
+                          //  ? (index / (divisions - 1) * maxValue).toStringAsFixed(tickValuePrecision)
+                          /*:*/
+                          annotation(index),
+                          style: labelTextStyle!.copyWith(
+                            fontWeight: isValueSelected(index)
+                                ? FontWeight.bold
+                                : FontWeight.normal,
+                          ),
+                          textAlign: TextAlign.center,
+                        ),
+                      )
+                    else
+                      const SizedBox.shrink(),
                     Container(
                       alignment: Alignment.bottomCenter,
                       height: tickHeight,
diff --git a/app/lib/widgets/questionnaire/image_capturing_question_widget.dart b/app/lib/widgets/questionnaire/image_capturing_question_widget.dart
index 70afd5311..105c8d2bd 100644
--- a/app/lib/widgets/questionnaire/image_capturing_question_widget.dart
+++ b/app/lib/widgets/questionnaire/image_capturing_question_widget.dart
@@ -13,7 +13,7 @@ class ImageCapturingQuestionWidget extends QuestionWidget {
   final Function(Answer<FutureBlobFile>)? onDone;
 
   const ImageCapturingQuestionWidget(
-      {super.key, required this.question, this.onDone});
+      {super.key, required this.question, this.onDone,});
 
   @override
   State<ImageCapturingQuestionWidget> createState() =>
@@ -35,11 +35,9 @@ class _ImageCapturingQuestionWidgetState
     final theme = Theme.of(context);
     return OutlinedButton(
       style: OutlinedButton.styleFrom(
-        backgroundColor: null,
         foregroundColor: theme.colorScheme.primary,
         side: BorderSide(
-            width: 1.0,
-            color: _hasCaptured ? Colors.black38 : theme.colorScheme.primary),
+            color: _hasCaptured ? Colors.black38 : theme.colorScheme.primary,),
       ),
       onPressed: !_hasCaptured
           ? () async {
@@ -78,18 +76,18 @@ class _ImageCapturingQuestionWidgetState
     if (kIsWeb) {
       ScaffoldMessenger.of(context).showSnackBar(SnackBar(
         content: Text(AppLocalizations.of(context)!.multimodal_not_supported),
-      ));
+      ),);
       return;
     }
     final appState = context.read<AppState>();
-    FutureBlobFile? imageFile = await Navigator.push(context, MaterialPageRoute(
+    final FutureBlobFile? imageFile = await Navigator.push(context, MaterialPageRoute(
       builder: (context) {
         return CapturePictureScreen(
           studyId: appState.activeSubject!.studyId,
           userId: appState.activeSubject!.userId,
         );
       },
-    ));
+    ),);
     if (imageFile != null) {
       setState(() {
         _hasCaptured = true;
diff --git a/app/lib/widgets/questionnaire/question_container.dart b/app/lib/widgets/questionnaire/question_container.dart
index 61ce88577..2b325648d 100644
--- a/app/lib/widgets/questionnaire/question_container.dart
+++ b/app/lib/widgets/questionnaire/question_container.dart
@@ -1,18 +1,17 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:studyu_app/widgets/questionnaire/audio_recording_question_widget.dart';
+import 'package:studyu_app/widgets/questionnaire/image_capturing_question_widget.dart';
+import 'package:studyu_app/widgets/questionnaire/question_header.dart';
+import 'package:studyu_app/widgets/questionnaire/questions/annotated_scale_question_widget.dart';
+import 'package:studyu_app/widgets/questionnaire/questions/boolean_question_widget.dart';
 import 'package:studyu_app/widgets/questionnaire/questions/choice_question_widget.dart';
 import 'package:studyu_app/widgets/questionnaire/questions/free_text_question_widget.dart';
+import 'package:studyu_app/widgets/questionnaire/questions/question_widget.dart';
 import 'package:studyu_app/widgets/questionnaire/questions/scale_question_widget.dart';
-import 'package:studyu_app/widgets/questionnaire/image_capturing_question_widget.dart';
-import 'package:studyu_app/widgets/questionnaire/audio_recording_question_widget.dart';
+import 'package:studyu_app/widgets/questionnaire/questions/visual_analogue_question_widget.dart';
 import 'package:studyu_core/core.dart';
 
-import 'questions/annotated_scale_question_widget.dart';
-import 'questions/boolean_question_widget.dart';
-import 'question_header.dart';
-import 'questions/question_widget.dart';
-import 'questions/visual_analogue_question_widget.dart';
-
 class QuestionContainer extends StatefulWidget {
   final Function(Answer, int) onDone;
   final Question question;
@@ -22,7 +21,7 @@ class QuestionContainer extends StatefulWidget {
       {required this.onDone,
       required this.question,
       required this.index,
-      super.key});
+      super.key,});
 
   @override
   State<StatefulWidget> createState() => _QuestionContainerState();
@@ -36,53 +35,53 @@ class _QuestionContainerState extends State<QuestionContainer>
 
   QuestionWidget getQuestionBody(BuildContext context) {
     switch (widget.question) {
-      case ChoiceQuestion choiceQuestion:
+      case final ChoiceQuestion choiceQuestion:
         return ChoiceQuestionWidget(
           question: choiceQuestion,
           onDone: _onDone,
           multiSelectionText:
               AppLocalizations.of(context)!.eligible_choice_multi_selection,
         );
-      case BooleanQuestion booleanQuestion:
+      case final BooleanQuestion booleanQuestion:
         return BooleanQuestionWidget(
           question: booleanQuestion,
           onDone: _onDone,
         );
-      case ScaleQuestion scaleQuestion:
+      case final ScaleQuestion scaleQuestion:
         return ScaleQuestionWidget(
           question: scaleQuestion,
           onDone: _onDone,
         );
-      case ImageCapturingQuestion imageCapturingQuestion:
+      case final ImageCapturingQuestion imageCapturingQuestion:
         return ImageCapturingQuestionWidget(
           question: imageCapturingQuestion,
           onDone: _onDone,
         );
-      case AudioRecordingQuestion audioRecordingQuestion:
+      case final AudioRecordingQuestion audioRecordingQuestion:
         return AudioRecordingQuestionWidget(
           question: audioRecordingQuestion,
           onDone: _onDone,
         );
-      case VisualAnalogueQuestion visualAnalogueQuestion:
+      case final VisualAnalogueQuestion visualAnalogueQuestion:
         // todo remove this when older studies are finished
         // ignore: deprecated_member_use_from_same_package
         return VisualAnalogueQuestionWidget(
           question: visualAnalogueQuestion,
           onDone: _onDone,
         );
-      case AnnotatedScaleQuestion annotatedScaleQuestion:
+      case final AnnotatedScaleQuestion annotatedScaleQuestion:
         return AnnotatedScaleQuestionWidget(
           question: annotatedScaleQuestion,
           onDone: _onDone,
         );
-      case FreeTextQuestion freeTextQuestion:
+      case final FreeTextQuestion freeTextQuestion:
         return FreeTextQuestionWidget(
           question: freeTextQuestion,
           onDone: _onDone,
         );
       default:
         throw ArgumentError(
-            'Question type ${widget.question.type} not supported');
+            'Question type ${widget.question.type} not supported',);
     }
   }
 
diff --git a/app/lib/widgets/questionnaire/question_header.dart b/app/lib/widgets/questionnaire/question_header.dart
index c340978c9..797c45d49 100644
--- a/app/lib/widgets/questionnaire/question_header.dart
+++ b/app/lib/widgets/questionnaire/question_header.dart
@@ -30,7 +30,7 @@ class QuestionHeader extends StatelessWidget {
             content: HtmlText(rationale),
           ),
         ),
-      )
+      ),
     ];
   }
 
diff --git a/app/lib/widgets/questionnaire/questionnaire_widget.dart b/app/lib/widgets/questionnaire/questionnaire_widget.dart
index 23022da2b..152a09e94 100644
--- a/app/lib/widgets/questionnaire/questionnaire_widget.dart
+++ b/app/lib/widgets/questionnaire/questionnaire_widget.dart
@@ -1,10 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:studyu_app/widgets/html_text.dart';
+import 'package:studyu_app/widgets/questionnaire/question_container.dart';
 import 'package:studyu_core/core.dart';
 
-import 'question_container.dart';
-
 typedef StateHandler = void Function(QuestionnaireState);
 typedef ContinuationPredicate = bool Function(QuestionnaireState);
 
@@ -47,7 +46,7 @@ class _QuestionnaireWidgetState extends State<QuestionnaireWidget> {
   void _invalidateDownstreamAnswers(int index) {
     if (index < shownQuestions.length - 1) {
       final startIndex = widget.questions.indexWhere(
-          (question) => question.id == shownQuestions[index].question.id);
+          (question) => question.id == shownQuestions[index].question.id,);
       widget.questions
           .skip(startIndex + 1)
           .forEach((question) => qs.answers.remove(question.id));
@@ -103,12 +102,11 @@ class _QuestionnaireWidgetState extends State<QuestionnaireWidget> {
       if (!widget.questions[_nextQuestionIndex].shouldBeShown(qs)) {
         _onQuestionDone(
             widget.questions[_nextQuestionIndex].getDefaultAnswer()!,
-            shownQuestions.length);
+            shownQuestions.length,);
         return;
       }
       _insertQuestion(widget.questions[_nextQuestionIndex]);
-      _listKey.currentState!.insertItem(shownQuestions.length - 1,
-          duration: const Duration(milliseconds: 300));
+      _listKey.currentState!.insertItem(shownQuestions.length - 1,);
       _nextQuestionIndex++;
     } else {
       // we ran out of questions
diff --git a/app/lib/widgets/questionnaire/questions/annotated_scale_question_widget.dart b/app/lib/widgets/questionnaire/questions/annotated_scale_question_widget.dart
index 0f57b656b..129c96699 100644
--- a/app/lib/widgets/questionnaire/questions/annotated_scale_question_widget.dart
+++ b/app/lib/widgets/questionnaire/questions/annotated_scale_question_widget.dart
@@ -1,16 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:studyu_app/widgets/questionnaire/custom_slider.dart';
+import 'package:studyu_app/widgets/questionnaire/questions/question_widget.dart';
 import 'package:studyu_core/core.dart';
 
-import '../custom_slider.dart';
-import 'question_widget.dart';
-
 class AnnotatedScaleQuestionWidget extends QuestionWidget {
   final AnnotatedScaleQuestion question;
   final Function(Answer)? onDone;
 
   const AnnotatedScaleQuestionWidget(
-      {super.key, required this.question, this.onDone});
+      {super.key, required this.question, this.onDone,});
 
   @override
   State<AnnotatedScaleQuestionWidget> createState() =>
@@ -68,7 +67,7 @@ class _AnnotatedScaleQuestionWidgetState
               },
               child: Text(AppLocalizations.of(context)!.done),
             ),
-          )
+          ),
       ],
     );
   }
diff --git a/app/lib/widgets/questionnaire/questions/boolean_question_widget.dart b/app/lib/widgets/questionnaire/questions/boolean_question_widget.dart
index d6f8a2dc5..ce32f8ab0 100644
--- a/app/lib/widgets/questionnaire/questions/boolean_question_widget.dart
+++ b/app/lib/widgets/questionnaire/questions/boolean_question_widget.dart
@@ -1,11 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:studyu_app/widgets/questionnaire/questions/question_widget.dart';
+import 'package:studyu_app/widgets/selectable_button.dart';
 import 'package:studyu_core/core.dart';
 
-import '../../selectable_button.dart';
-import 'question_widget.dart';
-
 class BooleanQuestionWidget extends QuestionWidget {
   final BooleanQuestion question;
   final Function(Answer)? onDone;
diff --git a/app/lib/widgets/questionnaire/questions/choice_question_widget.dart b/app/lib/widgets/questionnaire/questions/choice_question_widget.dart
index 9139e9e73..af3772623 100644
--- a/app/lib/widgets/questionnaire/questions/choice_question_widget.dart
+++ b/app/lib/widgets/questionnaire/questions/choice_question_widget.dart
@@ -13,7 +13,7 @@ class ChoiceQuestionWidget extends QuestionWidget {
       {super.key,
       required this.question,
       required this.onDone,
-      required this.multiSelectionText});
+      required this.multiSelectionText,});
 
   @override
   State<ChoiceQuestionWidget> createState() => _ChoiceQuestionWidgetState();
@@ -65,7 +65,7 @@ class _ChoiceQuestionWidgetState extends State<ChoiceQuestionWidget> {
           onPressed: confirm,
           style: ButtonStyle(
             backgroundColor: WidgetStateProperty.all<Color>(
-                Theme.of(context).colorScheme.secondary),
+                Theme.of(context).colorScheme.secondary,),
             foregroundColor: WidgetStateProperty.all<Color>(Colors.white),
           ),
           child: Text(AppLocalizations.of(context)!.confirm),
diff --git a/app/lib/widgets/questionnaire/questions/free_text_question_widget.dart b/app/lib/widgets/questionnaire/questions/free_text_question_widget.dart
index 4ac3953c7..7e5e5f4f8 100644
--- a/app/lib/widgets/questionnaire/questions/free_text_question_widget.dart
+++ b/app/lib/widgets/questionnaire/questions/free_text_question_widget.dart
@@ -8,7 +8,7 @@ class FreeTextQuestionWidget extends QuestionWidget {
   final Function(Answer)? onDone;
 
   const FreeTextQuestionWidget(
-      {super.key, required this.question, this.onDone});
+      {super.key, required this.question, this.onDone,});
 
   @override
   State<FreeTextQuestionWidget> createState() => _FreeTextQuestionWidgetState();
diff --git a/app/lib/widgets/questionnaire/questions/scale_question_widget.dart b/app/lib/widgets/questionnaire/questions/scale_question_widget.dart
index cae375e0e..20efe2d20 100644
--- a/app/lib/widgets/questionnaire/questions/scale_question_widget.dart
+++ b/app/lib/widgets/questionnaire/questions/scale_question_widget.dart
@@ -1,11 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:studyu_app/theme.dart';
+import 'package:studyu_app/widgets/questionnaire/custom_slider.dart';
+import 'package:studyu_app/widgets/questionnaire/questions/question_widget.dart';
 import 'package:studyu_core/core.dart';
 
-import '../custom_slider.dart';
-import 'question_widget.dart';
-
 class ScaleQuestionWidget extends QuestionWidget {
   final ScaleQuestion question;
   final Function(Answer)? onDone;
@@ -50,7 +49,7 @@ class _ScaleQuestionWidgetState extends State<ScaleQuestionWidget> {
     final coloredSliderTheme = ThemeConfig.coloredSliderTheme(theme);
     final thumbColor = isColored
         ? Color.lerp(minColor, maxColor,
-                (value! - widget.question.minimum) / sliderRange)!
+                (value! - widget.question.minimum) / sliderRange,)!
             .withOpacity(1)
         : null;
     final activeTrackColor =
@@ -94,7 +93,7 @@ class _ScaleQuestionWidgetState extends State<ScaleQuestionWidget> {
                   isColored: isColored,
                   linearStep: false,
                   steps: widget.question,
-                )),
+                ),),
           ],
         ),
         if (!sliderTouched)
@@ -109,7 +108,7 @@ class _ScaleQuestionWidgetState extends State<ScaleQuestionWidget> {
               },
               child: Text(AppLocalizations.of(context)!.done),
             ),
-          )
+          ),
       ],
     );
   }
diff --git a/app/lib/widgets/questionnaire/questions/visual_analogue_question_widget.dart b/app/lib/widgets/questionnaire/questions/visual_analogue_question_widget.dart
index 46a1e7c51..04f96fbc9 100644
--- a/app/lib/widgets/questionnaire/questions/visual_analogue_question_widget.dart
+++ b/app/lib/widgets/questionnaire/questions/visual_analogue_question_widget.dart
@@ -1,16 +1,19 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:studyu_app/widgets/questionnaire/questions/question_widget.dart';
 import 'package:studyu_core/core.dart';
 
-import 'question_widget.dart';
-
 @Deprecated('Use [AnnotatedScaleQuestionWidget]')
 class VisualAnalogueQuestionWidget extends QuestionWidget {
   final VisualAnalogueQuestion question;
   final Function(Answer)? onDone;
 
-  const VisualAnalogueQuestionWidget(
-      {super.key, required this.question, this.onDone});
+  @Deprecated('Use [AnnotatedScaleQuestionWidget]')
+  const VisualAnalogueQuestionWidget({
+    super.key,
+    required this.question,
+    this.onDone,
+  });
 
   @override
   State<VisualAnalogueQuestionWidget> createState() =>
@@ -51,7 +54,7 @@ class _VisualAnalogueQuestionWidgetState
                 gradient: LinearGradient(
                   colors: [
                     Color(widget.question.minimumColor),
-                    Color(widget.question.maximumColor)
+                    Color(widget.question.maximumColor),
                   ],
                 ),
               ),
@@ -74,7 +77,7 @@ class _VisualAnalogueQuestionWidgetState
                 widget.onDone!(widget.question.constructAnswer(value)),
             child: Text(AppLocalizations.of(context)!.done),
           ),
-        )
+        ),
       ],
     );
   }
diff --git a/app/lib/widgets/selectable_button.dart b/app/lib/widgets/selectable_button.dart
index a6ed0f571..d5c74084b 100644
--- a/app/lib/widgets/selectable_button.dart
+++ b/app/lib/widgets/selectable_button.dart
@@ -6,7 +6,7 @@ class SelectableButton extends StatelessWidget {
   final Function()? onTap;
 
   const SelectableButton(
-      {super.key, required this.child, this.selected = false, this.onTap});
+      {super.key, required this.child, this.selected = false, this.onTap,});
 
   Color _getFillColor(ThemeData theme) =>
       selected ? theme.primaryColor : theme.cardColor;
diff --git a/app/lib/widgets/study_tile.dart b/app/lib/widgets/study_tile.dart
index 41169743b..965badb09 100644
--- a/app/lib/widgets/study_tile.dart
+++ b/app/lib/widgets/study_tile.dart
@@ -24,7 +24,7 @@ class StudyTile extends StatelessWidget {
       {required Study study,
       this.onTap,
       this.contentPadding = const EdgeInsets.all(16),
-      super.key})
+      super.key,})
       : title = study.title,
         description = study.description,
         iconName = study.iconName;
@@ -50,7 +50,7 @@ class StudyTile extends StatelessWidget {
           title: Center(
               child: Text(title!,
                   style: theme.textTheme.titleLarge!
-                      .copyWith(color: theme.primaryColor))),
+                      .copyWith(color: theme.primaryColor),),),
           subtitle: Center(child: Text(description ?? '')),
           leading:
               Icon(MdiIcons.fromString(iconName), color: theme.primaryColor),
diff --git a/core/analysis_options.yaml b/core/analysis_options.yaml
index 0310d91c6..f689b7b48 100644
--- a/core/analysis_options.yaml
+++ b/core/analysis_options.yaml
@@ -1,5 +1,7 @@
 include: ../analysis_options.yaml
 
 analyzer:
+  errors:
+    avoid_classes_with_only_static_members: ignore
   plugins:
     - custom_lint
diff --git a/flutter_common/analysis_options.yaml b/flutter_common/analysis_options.yaml
index 0310d91c6..f689b7b48 100644
--- a/flutter_common/analysis_options.yaml
+++ b/flutter_common/analysis_options.yaml
@@ -1,5 +1,7 @@
 include: ../analysis_options.yaml
 
 analyzer:
+  errors:
+    avoid_classes_with_only_static_members: ignore
   plugins:
     - custom_lint
diff --git a/flutter_common/lib/src/utils/retry_future_builder.dart b/flutter_common/lib/src/utils/retry_future_builder.dart
index 6a32397a2..02deffb59 100644
--- a/flutter_common/lib/src/utils/retry_future_builder.dart
+++ b/flutter_common/lib/src/utils/retry_future_builder.dart
@@ -25,7 +25,7 @@ SOFTWARE.
 import 'package:flutter/material.dart';
 
 typedef CustomErrorWidgetBuilder = Widget Function(
-    BuildContext context, dynamic error, void Function() reload);
+    BuildContext context, dynamic error, void Function() reload,);
 
 class RetryFutureBuilder<T> extends StatefulWidget {
   static RetryFutureBuilderState? of(BuildContext context) =>
@@ -95,7 +95,7 @@ class RetryFutureBuilderState<T> extends State<RetryFutureBuilder<T>> {
               // ignore: only_throw_errors
               if (widget.errorWidgetBuilder != null) {
                 return widget.errorWidgetBuilder!(
-                    context, snapshot.error, reload);
+                    context, snapshot.error, reload,);
               }
               return buildErrorView(context, snapshot.error);
             }
@@ -127,9 +127,9 @@ class RetryFutureBuilderState<T> extends State<RetryFutureBuilder<T>> {
               // todo translate
               label: const Text('Retry'),
               style: ElevatedButton.styleFrom(
-                  backgroundColor: theme.colorScheme.secondary),
+                  backgroundColor: theme.colorScheme.secondary,),
             ),
-            ...widget.extraWidgets
+            ...widget.extraWidgets,
           ],
         ),
       ),
diff --git a/flutter_common/lib/src/utils/storage.dart b/flutter_common/lib/src/utils/storage.dart
index 0220a28ff..027e3f0cd 100755
--- a/flutter_common/lib/src/utils/storage.dart
+++ b/flutter_common/lib/src/utils/storage.dart
@@ -23,7 +23,7 @@ class SupabaseStorage extends LocalStorage {
   @override
   Future<void> persistSession(String persistSessionString) async {
     return await SecureStorage.write(
-        supabasePersistSessionKey, persistSessionString);
+        supabasePersistSessionKey, persistSessionString,);
   }
 
   @override
@@ -89,7 +89,7 @@ class SecureStorage {
         await storage.write(key: key, value: value.toString());
         await prefs.remove(key);
         StudyULogger.info(
-            "Migrated key $key from SharedPreferences to FlutterSecureStorage.");
+            "Migrated key $key from SharedPreferences to FlutterSecureStorage.",);
       }
     }
   }
diff --git a/flutter_common/lib/src/utils/user.dart b/flutter_common/lib/src/utils/user.dart
index a4e08171d..94b900bd1 100644
--- a/flutter_common/lib/src/utils/user.dart
+++ b/flutter_common/lib/src/utils/user.dart
@@ -1,9 +1,8 @@
 import 'package:studyu_core/core.dart';
+import 'package:studyu_flutter_common/studyu_flutter_common.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:uuid/uuid.dart';
 
-import 'package:studyu_flutter_common/studyu_flutter_common.dart';
-
 const fakeStudyUEmailDomain = 'fake-studyu-email-domain.com';
 String selectedSubjectIdKey = 'selected_study_object_id';
 const userEmailKey = 'user_email';
@@ -11,7 +10,9 @@ const userPasswordKey = 'user_password';
 const cacheSubjectKey = "cache_subject";
 
 Future<void> storeFakeUserEmailAndPassword(
-    String email, String password) async {
+  String email,
+  String password,
+) async {
   await SecureStorage.write(userEmailKey, email);
   await SecureStorage.write(userPasswordKey, password);
 }
@@ -25,7 +26,7 @@ Future<bool> signInParticipant() async {
       final fakePassword = await getFakeUserPassword();
       final authResponse =
           await Supabase.instance.client.auth.signInWithPassword(
-        email: fakeEmail!,
+        email: fakeEmail,
         password: fakePassword!,
       );
       return authResponse.session != null;
@@ -44,7 +45,7 @@ Future<bool> anonymousSignUp() async {
     final authResponse = await Supabase.instance.client.auth
         .signUp(email: fakeUserEmail, password: fakeUserPassword);
     await storeFakeUserEmailAndPassword(fakeUserEmail, fakeUserPassword);
-    return authResponse.session != null ? true : await signInParticipant();
+    return authResponse.session != null || await signInParticipant();
   } catch (error, stacktrace) {
     SupabaseQuery.catchSupabaseException(error, stacktrace);
     return false;

From 55c5f53ad57deb31fee7c1b9bbdfaf63fae372cc Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 12 Jun 2024 11:04:49 +0200
Subject: [PATCH 174/314] chore: adapt isRedundantClick

---
 .../intervention/checkmark_task_widget.dart   | 29 +++---
 .../questionnaire_task_widget.dart            | 94 ++++++++++---------
 app/lib/util/misc.dart                        | 20 ++--
 3 files changed, 76 insertions(+), 67 deletions(-)

diff --git a/app/lib/screens/study/tasks/intervention/checkmark_task_widget.dart b/app/lib/screens/study/tasks/intervention/checkmark_task_widget.dart
index e5d8d94ce..a363ca969 100644
--- a/app/lib/screens/study/tasks/intervention/checkmark_task_widget.dart
+++ b/app/lib/screens/study/tasks/intervention/checkmark_task_widget.dart
@@ -18,33 +18,38 @@ class CheckmarkTaskWidget extends StatefulWidget {
 }
 
 class _CheckmarkTaskWidgetState extends State<CheckmarkTaskWidget> {
-  DateTime? loginClickTime;
+  DateTime _lastClickTime = DateTime.now();
   bool _isLoading = false;
 
   @override
   Widget build(BuildContext context) {
     return ElevatedButton.icon(
       style: ButtonStyle(
-          backgroundColor: WidgetStateProperty.all<Color>(Colors.green),
-          textStyle: WidgetStateProperty.all<TextStyle>(
-              const TextStyle(color: Colors.white))),
+        backgroundColor: WidgetStateProperty.all<Color>(Colors.green),
+        textStyle: WidgetStateProperty.all<TextStyle>(
+          const TextStyle(color: Colors.white),
+        ),
+      ),
       onPressed: () async {
-        if (isRedundantClick(loginClickTime)) return;
+        if (isRedundantClick(_lastClickTime)) return;
         setState(() {
           _isLoading = true;
+          _lastClickTime = DateTime.now();
         });
         await handleTaskCompletion(context, (StudySubject? subject) async {
           try {
             await subject!.addResult<bool>(
-                taskId: widget.task!.id,
-                periodId: widget.completionPeriod!.id,
-                result: true);
+              taskId: widget.task!.id,
+              periodId: widget.completionPeriod!.id,
+              result: true,
+            );
           } on SocketException catch (_) {
             await subject!.addResult<bool>(
-                taskId: widget.task!.id,
-                periodId: widget.completionPeriod!.id,
-                result: true,
-                offline: true);
+              taskId: widget.task!.id,
+              periodId: widget.completionPeriod!.id,
+              result: true,
+              offline: true,
+            );
             rethrow;
           }
         });
diff --git a/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart b/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart
index defc98f48..699d8a347 100644
--- a/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart
+++ b/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart
@@ -13,8 +13,11 @@ class QuestionnaireTaskWidget extends StatefulWidget {
   final QuestionnaireTask task;
   final CompletionPeriod completionPeriod;
 
-  const QuestionnaireTaskWidget(
-      {required this.task, required this.completionPeriod, super.key});
+  const QuestionnaireTaskWidget({
+    required this.task,
+    required this.completionPeriod,
+    super.key,
+  });
 
   @override
   State<QuestionnaireTaskWidget> createState() =>
@@ -24,24 +27,28 @@ class QuestionnaireTaskWidget extends StatefulWidget {
 class _QuestionnaireTaskWidgetState extends State<QuestionnaireTaskWidget> {
   dynamic response;
   late bool responseValidator;
-  DateTime? loginClickTime;
+  DateTime _lastClickTime = DateTime.now();
   bool _isLoading = false;
   final GlobalKey<FormState> formKey = GlobalKey<FormState>();
 
   Future<void> _addQuestionnaireResult<T>(
-      T response, BuildContext context) async {
+    T response,
+    BuildContext context,
+  ) async {
     await handleTaskCompletion(context, (StudySubject? subject) async {
       try {
         await subject!.addResult<T>(
-            taskId: widget.task.id,
-            periodId: widget.completionPeriod.id,
-            result: response);
+          taskId: widget.task.id,
+          periodId: widget.completionPeriod.id,
+          result: response,
+        );
       } on SocketException catch (_) {
         await subject!.addResult<T>(
-            taskId: widget.task.id,
-            periodId: widget.completionPeriod.id,
-            result: response,
-            offline: true);
+          taskId: widget.task.id,
+          periodId: widget.completionPeriod.id,
+          result: response,
+          offline: true,
+        );
         rethrow;
       }
     });
@@ -73,37 +80,40 @@ class _QuestionnaireTaskWidgetState extends State<QuestionnaireTaskWidget> {
             ),
           ),
         ),
-        response != null && responseValidator
-            ? ElevatedButton.icon(
-                style: ButtonStyle(
-                    backgroundColor:
-                        WidgetStateProperty.all<Color>(Colors.green)),
-                onPressed: () async {
-                  if (isRedundantClick(loginClickTime)) {
-                    return;
-                  }
-                  if (!formKey.currentState!.validate()) {
-                    return;
-                  }
-                  setState(() {
-                    _isLoading = true;
-                  });
-                  switch (response) {
-                    case QuestionnaireState questionnaireState:
-                      await _addQuestionnaireResult<QuestionnaireState>(
-                          questionnaireState, context);
-                      break;
-                  }
-                  setState(() {
-                    _isLoading = false;
-                  });
-                },
-                icon: _isLoading
-                    ? const CircularProgressIndicator(color: Colors.white)
-                    : const Icon(Icons.check),
-                label: Text(AppLocalizations.of(context)!.complete),
-              )
-            : const SizedBox.shrink(),
+        if (response != null && responseValidator)
+          ElevatedButton.icon(
+            style: ButtonStyle(
+              backgroundColor: WidgetStateProperty.all<Color>(Colors.green),
+            ),
+            onPressed: () async {
+              if (isRedundantClick(_lastClickTime)) {
+                return;
+              }
+              if (!formKey.currentState!.validate()) {
+                return;
+              }
+              setState(() {
+                _isLoading = true;
+                _lastClickTime = DateTime.now();
+              });
+              switch (response) {
+                case final QuestionnaireState questionnaireState:
+                  await _addQuestionnaireResult<QuestionnaireState>(
+                    questionnaireState,
+                    context,
+                  );
+              }
+              setState(() {
+                _isLoading = false;
+              });
+            },
+            icon: _isLoading
+                ? const CircularProgressIndicator(color: Colors.white)
+                : const Icon(Icons.check),
+            label: Text(AppLocalizations.of(context)!.complete),
+          )
+        else
+          const SizedBox.shrink(),
       ],
     );
   }
diff --git a/app/lib/util/misc.dart b/app/lib/util/misc.dart
index c66346d85..e0ab7bce5 100644
--- a/app/lib/util/misc.dart
+++ b/app/lib/util/misc.dart
@@ -1,16 +1,10 @@
-bool isRedundantClick(DateTime? loginClickTime) {
-  final currentTime = DateTime.now();
-  if (loginClickTime == null) {
-    loginClickTime = currentTime;
+bool isRedundantClick(
+  DateTime lastClickTime, {
+  Duration interval = const Duration(seconds: 2),
+}) {
+  final now = DateTime.now();
+  if (now.difference(lastClickTime) > interval) {
     return false;
   }
-  int secondsUntilClicked = currentTime.difference(loginClickTime).inSeconds;
-  // timeout submit button to disable multiple clicks
-  if (secondsUntilClicked < 3) {
-    print('complete button is still frozen');
-    return true;
-  }
-
-  loginClickTime = currentTime;
-  return false;
+  return true;
 }

From 9ae50cf0e9091e1ef88953c1ce1ea80a39d8e79b Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 12 Jun 2024 11:27:47 +0200
Subject: [PATCH 175/314] chore: ios push

---
 app/ios/Runner/Runner.entitlements | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 app/ios/Runner/Runner.entitlements

diff --git a/app/ios/Runner/Runner.entitlements b/app/ios/Runner/Runner.entitlements
new file mode 100644
index 000000000..951769cc4
--- /dev/null
+++ b/app/ios/Runner/Runner.entitlements
@@ -0,0 +1,7 @@
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>production</string>
+</dict>
+</plist>

From 7cb4de09082cb7816ff96b13adc08999105261d4 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 12 Jun 2024 11:47:38 +0200
Subject: [PATCH 176/314] chore: remove integrated melos commands from
 melos.yaml

---
 .github/workflows/all_packages.yml |  4 ++--
 melos.yaml                         | 28 ++++------------------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/all_packages.yml b/.github/workflows/all_packages.yml
index 9716b42e2..ab7f22858 100644
--- a/.github/workflows/all_packages.yml
+++ b/.github/workflows/all_packages.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Init workspace
         uses: ./.github/workflows/init-workspace
       - name: Run analyze
-        run: melos run analyze
+        run: melos analyze
 
   format:
     runs-on: ubuntu-latest
@@ -38,7 +38,7 @@ jobs:
       - name: Init workspace
         uses: ./.github/workflows/init-workspace
       - name: Run format
-        run: melos run format:ci
+        run: melos format --set-exit-if-changed
 
   test:
     runs-on: ubuntu-latest
diff --git a/melos.yaml b/melos.yaml
index 436b8db86..47dace816 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -9,32 +9,12 @@ packages:
   - flutter_common
 
 scripts:
-  analyze:
-    run: |
-      melos exec -c 6 -- \
-        "flutter analyze --fatal-infos ."
-    description: |
-      Run `dart analyze` in all packages.
-       - Note: you can also rely on your IDEs Dart Analysis / Issues window.
-
   fix:
     run: |
       melos exec -c 6 -- \
         "dart fix --apply"
     description: Fix auto-fixable lint errors
 
-  format:
-    run: |
-      melos exec -c 6 -- \
-        "dart format ."
-    description: Format all code files
-
-  format:ci:
-    run: |
-      melos exec -c 6 -- \
-        "dart format . --set-exit-if-changed"
-    description: Format all code without generated files
-
   outdated:
     run: |
       melos exec -c 6 --fail-fast -- \
@@ -77,7 +57,7 @@ scripts:
       melos exec -c 1 -- \
         "flutter run -d chrome --web-port 8080"
     packageFilters:
-        scope: studyu_app
+      scope: studyu_app
     description: Runs StudyU App with default environment
 
   designer_v2:
@@ -85,7 +65,7 @@ scripts:
       melos exec -c 1 -- \
         "flutter run -d chrome --web-port 8081"
     packageFilters:
-        scope: studyu_designer_v2
+      scope: studyu_designer_v2
     description: Runs StudyU Designer with default environment
 
   dev:app:
@@ -142,7 +122,7 @@ scripts:
         "flutter build web"
     description: Build app for Web.
     packageFilters:
-      scope: [studyu_app, studyu_designer_v2]
+      scope: [ studyu_app, studyu_designer_v2 ]
       dirExists: web
 
   build:web:app:
@@ -167,7 +147,7 @@ scripts:
         "flutter build web --web-renderer auto --dart-define=STUDYU_ENV=.env.dev"
     description: Build web dev.
     packageFilters:
-      scope: [studyu_app, studyu_designer_v2]
+      scope: [ studyu_app, studyu_designer_v2 ]
       dirExists: web
 
   build:web:app:dev:

From 50995e88af6cb8af8471e99610020f7b0d0c00c3 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 12 Jun 2024 11:47:44 +0200
Subject: [PATCH 177/314] chore: melos format

---
 app/lib/app.dart                              |  12 +-
 app/lib/routes.dart                           |  77 ++++++++---
 app/lib/screens/app_onboarding/about.dart     |  66 +++++++---
 .../app_onboarding/app_outdated_screen.dart   |  37 ++++--
 app/lib/screens/app_onboarding/preview.dart   |   6 +-
 app/lib/screens/app_onboarding/terms.dart     |  25 ++--
 app/lib/screens/app_onboarding/welcome.dart   |  28 ++--
 .../dashboard/contact_tab/contact_screen.dart |  28 ++--
 .../study/dashboard/contact_tab/faq.dart      |  15 ++-
 app/lib/screens/study/dashboard/settings.dart |  63 +++++----
 .../task_overview_tab/progress_row.dart       |   7 +-
 .../dashboard/task_overview_tab/task_box.dart |  14 +-
 .../task_overview_tab/task_overview.dart      |  35 +++--
 .../multimodal/capture_picture_screen.dart    | 122 ++++++++++--------
 app/lib/screens/study/onboarding/consent.dart |  84 ++++++++----
 .../study/onboarding/eligibility_screen.dart  |  24 ++--
 .../onboarding/intervention_selection.dart    |   7 +-
 .../study/onboarding/journey_overview.dart    |  22 ++--
 app/lib/screens/study/onboarding/kickoff.dart |   5 +-
 .../study/onboarding/onboarding_progress.dart |   7 +-
 .../study/onboarding/study_overview.dart      |  14 +-
 .../study/onboarding/study_selection.dart     |  65 ++++++----
 .../performance/performance_details.dart      |  42 +++---
 .../performance/performance_section.dart      |  29 +++--
 .../screens/study/report/report_details.dart  |   9 +-
 .../screens/study/report/report_history.dart  |  10 +-
 .../report/report_section_container.dart      |  13 +-
 app/lib/screens/study/tasks/task_screen.dart  |  20 ++-
 app/lib/util/app_analytics.dart               |  37 +++---
 app/lib/util/data_processing.dart             |   6 +-
 app/lib/util/intervention.dart                |  10 +-
 app/lib/util/notifications.dart               |   7 +-
 app/lib/util/save_pdf.dart                    |   8 +-
 app/lib/util/schedule_notifications.dart      |  38 ++++--
 app/lib/util/study_subject_extension.dart     |   9 +-
 app/lib/util/temporary_storage_handler.dart   |  19 ++-
 app/lib/widgets/intervention_card.dart        |  54 +++++---
 .../image_capturing_question_widget.dart      |  37 ++++--
 .../questionnaire/question_container.dart     |  14 +-
 .../questionnaire/questionnaire_widget.dart   |  12 +-
 .../annotated_scale_question_widget.dart      |   7 +-
 .../questions/choice_question_widget.dart     |  14 +-
 .../questions/free_text_question_widget.dart  |   7 +-
 .../questions/scale_question_widget.dart      |  72 ++++++-----
 app/lib/widgets/selectable_button.dart        |   8 +-
 app/lib/widgets/study_tile.dart               |  21 +--
 .../lib/src/utils/retry_future_builder.dart   |  13 +-
 flutter_common/lib/src/utils/storage.dart     |   7 +-
 48 files changed, 828 insertions(+), 458 deletions(-)

diff --git a/app/lib/app.dart b/app/lib/app.dart
index 755c4336b..293d87437 100644
--- a/app/lib/app.dart
+++ b/app/lib/app.dart
@@ -11,8 +11,12 @@ import 'package:studyu_core/core.dart';
 import 'package:studyu_flutter_common/studyu_flutter_common.dart';
 
 class MyApp extends StatefulWidget {
-  const MyApp(this.queryParameters, this.appConfig,
-      {super.key, required this.initialRoute,});
+  const MyApp(
+    this.queryParameters,
+    this.appConfig, {
+    super.key,
+    required this.initialRoute,
+  });
   final Map<String, String> queryParameters;
   final AppConfig? appConfig;
   final String initialRoute;
@@ -32,8 +36,8 @@ class _MyAppState extends State<MyApp> {
     return MultiProvider(
       providers: [
         ChangeNotifierProvider<AppLanguage>(
-            create: (context) =>
-                AppLanguage(AppLocalizations.supportedLocales),),
+          create: (context) => AppLanguage(AppLocalizations.supportedLocales),
+        ),
         ChangeNotifierProvider<AppState>(create: (context) => AppState()),
       ],
       child: Consumer<AppLanguage>(
diff --git a/app/lib/routes.dart b/app/lib/routes.dart
index f5928ef85..a0b9e0969 100644
--- a/app/lib/routes.dart
+++ b/app/lib/routes.dart
@@ -47,7 +47,8 @@ class Routes {
             child: Padding(
               padding: const EdgeInsets.all(16),
               child: Text(
-                  'No route defined for ${settings.name}.\nThe developers should fix this 👩‍💻',),
+                'No route defined for ${settings.name}.\nThe developers should fix this 👩‍💻',
+              ),
             ),
           ),
         ),
@@ -56,62 +57,96 @@ class Routes {
   }
 
   static Route<dynamic>? generateRoute(
-      RouteSettings settings, Map<String, String> queryParameters,) {
+    RouteSettings settings,
+    Map<String, String> queryParameters,
+  ) {
     final uri = Uri.parse(settings.name!);
     switch (uri.path) {
       case loading:
         return MaterialPageRoute(
-            builder: (_) => const LoadingScreen(), settings: settings,);
+          builder: (_) => const LoadingScreen(),
+          settings: settings,
+        );
       case preview:
         return MaterialPageRoute(
-            builder: (_) => LoadingScreen(queryParameters: queryParameters),
-            settings: settings,);
+          builder: (_) => LoadingScreen(queryParameters: queryParameters),
+          settings: settings,
+        );
       case appOutdated:
         return MaterialPageRoute(
-            builder: (_) => const AppOutdatedScreen(), settings: settings,);
+          builder: (_) => const AppOutdatedScreen(),
+          settings: settings,
+        );
       case dashboard:
         return MaterialPageRoute(
-            builder: (_) => const DashboardScreen(), settings: settings,);
+          builder: (_) => const DashboardScreen(),
+          settings: settings,
+        );
       case welcome:
         return MaterialPageRoute(
-            builder: (_) => const WelcomeScreen(), settings: settings,);
+          builder: (_) => const WelcomeScreen(),
+          settings: settings,
+        );
       case about:
         return MaterialPageRoute(
-            builder: (_) => const AboutScreen(), settings: settings,);
+          builder: (_) => const AboutScreen(),
+          settings: settings,
+        );
       case terms:
         return MaterialPageRoute(
-            builder: (_) => const TermsScreen(), settings: settings,);
+          builder: (_) => const TermsScreen(),
+          settings: settings,
+        );
       case studySelection:
         return MaterialPageRoute(
-            builder: (_) => const StudySelectionScreen(), settings: settings,);
+          builder: (_) => const StudySelectionScreen(),
+          settings: settings,
+        );
       case studyOverview:
         return MaterialPageRoute(
-            builder: (_) => const StudyOverviewScreen(), settings: settings,);
+          builder: (_) => const StudyOverviewScreen(),
+          settings: settings,
+        );
       case interventionSelection:
         return MaterialPageRoute(
-            builder: (_) => const InterventionSelectionScreen(),
-            settings: settings,);
+          builder: (_) => const InterventionSelectionScreen(),
+          settings: settings,
+        );
       case journey:
         return MaterialPageRoute(
-            builder: (_) => const JourneyOverviewScreen(), settings: settings,);
+          builder: (_) => const JourneyOverviewScreen(),
+          settings: settings,
+        );
       case consent:
         return MaterialPageRoute<bool>(
-            builder: (_) => const ConsentScreen(), settings: settings,);
+          builder: (_) => const ConsentScreen(),
+          settings: settings,
+        );
       case kickoff:
         return MaterialPageRoute(
-            builder: (_) => const KickoffScreen(), settings: settings,);
+          builder: (_) => const KickoffScreen(),
+          settings: settings,
+        );
       case contact:
         return MaterialPageRoute(
-            builder: (_) => const ContactScreen(), settings: settings,);
+          builder: (_) => const ContactScreen(),
+          settings: settings,
+        );
       case faq:
         return MaterialPageRoute(
-            builder: (_) => const FAQ(), settings: settings,);
+          builder: (_) => const FAQ(),
+          settings: settings,
+        );
       case appSettings:
         return MaterialPageRoute(
-            builder: (_) => const Settings(), settings: settings,);
+          builder: (_) => const Settings(),
+          settings: settings,
+        );
       case reportHistory:
         return MaterialPageRoute(
-            builder: (_) => const ReportHistoryScreen(), settings: settings,);
+          builder: (_) => const ReportHistoryScreen(),
+          settings: settings,
+        );
       default:
         //final potentialSessionString = Uri.decodeComponent(settings.name.replaceFirst('/', ''));
         //return MaterialPageRoute(builder: (_) => LoadingScreen(sessionString: potentialSessionString));
diff --git a/app/lib/screens/app_onboarding/about.dart b/app/lib/screens/app_onboarding/about.dart
index e5c3e086d..3f8606448 100644
--- a/app/lib/screens/app_onboarding/about.dart
+++ b/app/lib/screens/app_onboarding/about.dart
@@ -34,8 +34,11 @@ class AboutScreen extends StatelessWidget {
                           Icon(MdiIcons.equal, size: 80, color: Colors.black),
                     ),
                     Expanded(
-                      child: Icon(MdiIcons.sleepOff,
-                          size: 80, color: Colors.black,),
+                      child: Icon(
+                        MdiIcons.sleepOff,
+                        size: 80,
+                        color: Colors.black,
+                      ),
                     ),
                   ],
                 ),
@@ -108,8 +111,11 @@ class AboutScreen extends StatelessWidget {
                 Row(
                   children: [
                     Expanded(
-                      child: Icon(MdiIcons.accountQuestion,
-                          size: 80, color: Colors.blue,),
+                      child: Icon(
+                        MdiIcons.accountQuestion,
+                        size: 80,
+                        color: Colors.blue,
+                      ),
                     ),
                   ],
                 ),
@@ -145,8 +151,11 @@ class AboutScreen extends StatelessWidget {
                 Row(
                   children: [
                     Expanded(
-                      child: Icon(MdiIcons.exclamationThick,
-                          size: 80, color: Colors.blue,),
+                      child: Icon(
+                        MdiIcons.exclamationThick,
+                        size: 80,
+                        color: Colors.blue,
+                      ),
                     ),
                   ],
                 ),
@@ -182,8 +191,11 @@ class AboutScreen extends StatelessWidget {
                 Row(
                   children: [
                     Expanded(
-                      child: Icon(MdiIcons.alphaNBoxOutline,
-                          size: 80, color: Colors.blue,),
+                      child: Icon(
+                        MdiIcons.alphaNBoxOutline,
+                        size: 80,
+                        color: Colors.blue,
+                      ),
                     ),
                     const Expanded(
                       child: Text(
@@ -193,8 +205,11 @@ class AboutScreen extends StatelessWidget {
                       ),
                     ),
                     Expanded(
-                      child: Icon(MdiIcons.numeric1BoxOutline,
-                          size: 80, color: Colors.blue,),
+                      child: Icon(
+                        MdiIcons.numeric1BoxOutline,
+                        size: 80,
+                        color: Colors.blue,
+                      ),
                     ),
                   ],
                 ),
@@ -230,8 +245,11 @@ class AboutScreen extends StatelessWidget {
                 Row(
                   children: [
                     Expanded(
-                      child: Icon(MdiIcons.notebookOutline,
-                          size: 80, color: Colors.blue,),
+                      child: Icon(
+                        MdiIcons.notebookOutline,
+                        size: 80,
+                        color: Colors.blue,
+                      ),
                     ),
                   ],
                 ),
@@ -267,8 +285,11 @@ class AboutScreen extends StatelessWidget {
                 Row(
                   children: [
                     Expanded(
-                      child: Icon(MdiIcons.alignVerticalBottom,
-                          size: 80, color: Colors.blue,),
+                      child: Icon(
+                        MdiIcons.alignVerticalBottom,
+                        size: 80,
+                        color: Colors.blue,
+                      ),
                     ),
                   ],
                 ),
@@ -304,8 +325,11 @@ class AboutScreen extends StatelessWidget {
                 Row(
                   children: [
                     Expanded(
-                      child: Icon(MdiIcons.progressCheck,
-                          size: 80, color: Colors.blue,),
+                      child: Icon(
+                        MdiIcons.progressCheck,
+                        size: 80,
+                        color: Colors.blue,
+                      ),
                     ),
                   ],
                 ),
@@ -338,7 +362,9 @@ class AboutScreen extends StatelessWidget {
               mainAxisAlignment: MainAxisAlignment.center,
               children: <Widget>[
                 const Image(
-                    image: AssetImage('assets/icon/logo.png'), height: 200,),
+                  image: AssetImage('assets/icon/logo.png'),
+                  height: 200,
+                ),
                 const SizedBox(height: 50),
                 Text(
                   AppLocalizations.of(context)!.description_part9,
@@ -350,8 +376,10 @@ class AboutScreen extends StatelessWidget {
                   OutlinedButton.icon(
                     icon: Icon(MdiIcons.rocket),
                     onPressed: () => Navigator.pushNamed(context, Routes.terms),
-                    label: Text(AppLocalizations.of(context)!.get_started,
-                        style: const TextStyle(fontSize: 20),),
+                    label: Text(
+                      AppLocalizations.of(context)!.get_started,
+                      style: const TextStyle(fontSize: 20),
+                    ),
                   ),
               ],
             ),
diff --git a/app/lib/screens/app_onboarding/app_outdated_screen.dart b/app/lib/screens/app_onboarding/app_outdated_screen.dart
index 959d9df15..876ecf49e 100644
--- a/app/lib/screens/app_onboarding/app_outdated_screen.dart
+++ b/app/lib/screens/app_onboarding/app_outdated_screen.dart
@@ -30,24 +30,35 @@ class AppOutdatedScreen extends StatelessWidget {
             children: <Widget>[
               const Spacer(),
               const Image(
-                  image: AssetImage('assets/icon/logo.png'), height: 200,),
+                image: AssetImage('assets/icon/logo.png'),
+                height: 200,
+              ),
               const SizedBox(height: 20),
               Padding(
                 padding: const EdgeInsets.all(20),
-                child: Text(loc.app_outdated_message,
-                    textAlign: TextAlign.center,
-                    style: const TextStyle(fontSize: 20),),
+                child: Text(
+                  loc.app_outdated_message,
+                  textAlign: TextAlign.center,
+                  style: const TextStyle(fontSize: 20),
+                ),
               ),
               const Spacer(),
-              if (storeUrl != null && storeIcon != null) OutlinedButton.icon(
-                      icon: Icon(storeIcon),
-                      onPressed: () async {
-                        await launchUrl(Uri.parse(storeUrl!),
-                            mode: LaunchMode.externalNonBrowserApplication,);
-                      },
-                      label: Text(loc.update_now,
-                          style: const TextStyle(fontSize: 20),),
-                    ) else const SizedBox.shrink(),
+              if (storeUrl != null && storeIcon != null)
+                OutlinedButton.icon(
+                  icon: Icon(storeIcon),
+                  onPressed: () async {
+                    await launchUrl(
+                      Uri.parse(storeUrl!),
+                      mode: LaunchMode.externalNonBrowserApplication,
+                    );
+                  },
+                  label: Text(
+                    loc.update_now,
+                    style: const TextStyle(fontSize: 20),
+                  ),
+                )
+              else
+                const SizedBox.shrink(),
               const Spacer(),
             ],
           ),
diff --git a/app/lib/screens/app_onboarding/preview.dart b/app/lib/screens/app_onboarding/preview.dart
index 35cf54c85..709c25fd6 100644
--- a/app/lib/screens/app_onboarding/preview.dart
+++ b/app/lib/screens/app_onboarding/preview.dart
@@ -118,8 +118,10 @@ class Preview {
   }
 
   /// createSubject: If true, the method will return a new StudySubject if none can be found. Otherwise, null is returned
-  Future<StudySubject?> getStudySubject(AppState state,
-      {bool createSubject = false,}) async {
+  Future<StudySubject?> getStudySubject(
+    AppState state, {
+    bool createSubject = false,
+  }) async {
     if (selectedStudyObjectId != null) {
       try {
         if (selectedRoute == '/intervention') {
diff --git a/app/lib/screens/app_onboarding/terms.dart b/app/lib/screens/app_onboarding/terms.dart
index 3dd3a026d..1cc933944 100644
--- a/app/lib/screens/app_onboarding/terms.dart
+++ b/app/lib/screens/app_onboarding/terms.dart
@@ -29,9 +29,10 @@ class _TermsScreenState extends State<TermsScreen> {
       body: SafeArea(
         child: Center(
           child: RetryFutureBuilder<AppConfig>(
-              tryFunction: AppConfig.getAppConfig,
-              successBuilder: (BuildContext context, AppConfig? appConfig) =>
-                  legalSection(context, appConfig),),
+            tryFunction: AppConfig.getAppConfig,
+            successBuilder: (BuildContext context, AppConfig? appConfig) =>
+                legalSection(context, appConfig),
+          ),
         ),
       ),
       bottomNavigationBar: BottomOnboardingNavigation(
@@ -82,7 +83,8 @@ class _TermsScreenState extends State<TermsScreen> {
               icon: Icon(MdiIcons.scaleBalance),
               onPressed: () async {
                 final uri = Uri.parse(
-                    appConfig.imprint[appLocale.languageCode]!,);
+                  appConfig.imprint[appLocale.languageCode]!,
+                );
                 if (await canLaunchUrl(uri)) {
                   launchUrl(uri, mode: LaunchMode.externalApplication);
                 }
@@ -123,9 +125,11 @@ class LegalSection extends StatelessWidget {
     final theme = Theme.of(context);
     return Column(
       children: [
-        Text(title!,
-            style: theme.textTheme.headlineMedium!
-                .copyWith(color: theme.primaryColor),),
+        Text(
+          title!,
+          style: theme.textTheme.headlineMedium!
+              .copyWith(color: theme.primaryColor),
+        ),
         const SizedBox(height: 20),
         Text(description!),
         const SizedBox(height: 20),
@@ -140,9 +144,10 @@ class LegalSection extends StatelessWidget {
           label: Text(pdfUrlLabel!),
         ),
         CheckboxListTile(
-            title: Text(acknowledgment!),
-            value: isChecked,
-            onChanged: onChange,),
+          title: Text(acknowledgment!),
+          value: isChecked,
+          onChanged: onChange,
+        ),
       ],
     );
   }
diff --git a/app/lib/screens/app_onboarding/welcome.dart b/app/lib/screens/app_onboarding/welcome.dart
index 5709656e2..175f5c04a 100644
--- a/app/lib/screens/app_onboarding/welcome.dart
+++ b/app/lib/screens/app_onboarding/welcome.dart
@@ -17,34 +17,44 @@ class WelcomeScreen extends StatelessWidget {
             children: <Widget>[
               const Spacer(),
               const Image(
-                  image: AssetImage('assets/icon/logo.png'), height: 200,),
+                image: AssetImage('assets/icon/logo.png'),
+                height: 200,
+              ),
               const SizedBox(height: 20),
               OutlinedButton.icon(
                 icon: const Icon(Icons.info),
                 onPressed: () => Navigator.pushNamed(context, Routes.about),
-                label: Text(AppLocalizations.of(context)!.what_is_studyu,
-                    style: const TextStyle(fontSize: 20),),
+                label: Text(
+                  AppLocalizations.of(context)!.what_is_studyu,
+                  style: const TextStyle(fontSize: 20),
+                ),
               ),
               const SizedBox(height: 20),
               OutlinedButton.icon(
                 icon: Icon(MdiIcons.accountBox),
                 onPressed: () => Navigator.pushNamed(context, Routes.contact),
-                label: Text(AppLocalizations.of(context)!.contact,
-                    style: const TextStyle(fontSize: 20),),
+                label: Text(
+                  AppLocalizations.of(context)!.contact,
+                  style: const TextStyle(fontSize: 20),
+                ),
               ),
               const SizedBox(height: 20),
               OutlinedButton.icon(
                 icon: Icon(MdiIcons.frequentlyAskedQuestions),
                 onPressed: () => Navigator.pushNamed(context, Routes.faq),
-                label: Text(AppLocalizations.of(context)!.faq,
-                    style: const TextStyle(fontSize: 20),),
+                label: Text(
+                  AppLocalizations.of(context)!.faq,
+                  style: const TextStyle(fontSize: 20),
+                ),
               ),
               const Spacer(),
               OutlinedButton.icon(
                 icon: Icon(MdiIcons.rocket, size: 30),
                 onPressed: () => Navigator.pushNamed(context, Routes.terms),
-                label: Text(AppLocalizations.of(context)!.get_started,
-                    style: const TextStyle(fontSize: 20),),
+                label: Text(
+                  AppLocalizations.of(context)!.get_started,
+                  style: const TextStyle(fontSize: 20),
+                ),
               ),
               const Spacer(),
             ],
diff --git a/app/lib/screens/study/dashboard/contact_tab/contact_screen.dart b/app/lib/screens/study/dashboard/contact_tab/contact_screen.dart
index 2b8855ca0..a2d9da904 100644
--- a/app/lib/screens/study/dashboard/contact_tab/contact_screen.dart
+++ b/app/lib/screens/study/dashboard/contact_tab/contact_screen.dart
@@ -69,12 +69,13 @@ class ContactWidget extends StatelessWidget {
   final String? subtitle;
   final Color color;
 
-  const ContactWidget(
-      {required this.contact,
-      required this.title,
-      required this.color,
-      this.subtitle,
-      super.key,});
+  const ContactWidget({
+    required this.contact,
+    required this.title,
+    required this.color,
+    this.subtitle,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -87,8 +88,12 @@ class ContactWidget extends StatelessWidget {
       Text(title, style: theme.textTheme.titleLarge!.copyWith(color: color)),
     ];
     if (subtitle != null && subtitle!.isNotEmpty) {
-      titles.add(Text(subtitle!,
-          style: theme.textTheme.titleMedium!.copyWith(fontSize: 14),),);
+      titles.add(
+        Text(
+          subtitle!,
+          style: theme.textTheme.titleMedium!.copyWith(fontSize: 14),
+        ),
+      );
     }
 
     return Column(
@@ -204,8 +209,11 @@ class ContactItem extends StatelessWidget {
     return ListTile(
       title: Text(itemName),
       subtitle: SelectableText(itemValue!),
-      leading: Icon(iconData,
-          color: iconColor ?? Theme.of(context).primaryColor, size: iconSize,),
+      leading: Icon(
+        iconData,
+        color: iconColor ?? Theme.of(context).primaryColor,
+        size: iconSize,
+      ),
       onTap: type != null ? launchContact : null,
     );
   }
diff --git a/app/lib/screens/study/dashboard/contact_tab/faq.dart b/app/lib/screens/study/dashboard/contact_tab/faq.dart
index cc53fb34d..97e1cfc5a 100644
--- a/app/lib/screens/study/dashboard/contact_tab/faq.dart
+++ b/app/lib/screens/study/dashboard/contact_tab/faq.dart
@@ -70,7 +70,8 @@ final List<Entry> data_en = <Entry>[
         'How long will the study take to finish?',
         <Entry>[
           Entry(
-              'The duration of each study is mentioned during initial study selection.',),
+            'The duration of each study is mentioned during initial study selection.',
+          ),
         ],
       ),
       Entry(
@@ -96,7 +97,8 @@ final List<Entry> data_en = <Entry>[
         'How can I Opt out from the current study?',
         <Entry>[
           Entry(
-              'You can do so by going to the Settings tab located on the Dashboard and clicking on "Opt-out" ',),
+            'You can do so by going to the Settings tab located on the Dashboard and clicking on "Opt-out" ',
+          ),
         ],
       ),
     ],
@@ -124,7 +126,8 @@ final List<Entry> data_en = <Entry>[
         'How can I keep track of my activities?',
         <Entry>[
           Entry(
-              'You can get an overview of your daily tasks and health status in the "Reports History section"',),
+            'You can get an overview of your daily tasks and health status in the "Reports History section"',
+          ),
         ],
       ),
       Entry(
@@ -164,7 +167,8 @@ final data_de = <Entry>[
         'Welche persönlichen Daten sammelt die App?',
         <Entry>[
           Entry(
-              'Die App sammelt keine persönlichen Daten des Benutzers, muss jedoch auf Zeit und Ort zugreifen.',),
+            'Die App sammelt keine persönlichen Daten des Benutzers, muss jedoch auf Zeit und Ort zugreifen.',
+          ),
         ],
       ),
     ],
@@ -176,7 +180,8 @@ final data_de = <Entry>[
         'Wie lange dauert es, bis die Studie abgeschlossen ist?',
         <Entry>[
           Entry(
-              'Die Dauer jeder Studie wird bei der ersten Studienauswahl angegeben.',),
+            'Die Dauer jeder Studie wird bei der ersten Studienauswahl angegeben.',
+          ),
         ],
       ),
       Entry(
diff --git a/app/lib/screens/study/dashboard/settings.dart b/app/lib/screens/study/dashboard/settings.dart
index 7b295699e..485666fb9 100644
--- a/app/lib/screens/study/dashboard/settings.dart
+++ b/app/lib/screens/study/dashboard/settings.dart
@@ -70,29 +70,33 @@ class _SettingsState extends State<Settings> {
             ),
           ],
         ),
-        Row(mainAxisSize: MainAxisSize.min, children: <Widget>[
-          Text('${AppLocalizations.of(context)!.allow_analytics}: '),
-          Tooltip(
-            triggerMode: TooltipTriggerMode.tap,
-            showDuration: const Duration(milliseconds: 10000),
-            margin: const EdgeInsets.fromLTRB(30, 0, 30, 0),
-            message: AppLocalizations.of(context)!.allow_analytics_desc,
-            child: const Icon(
-              Icons.info,
+        Row(
+          mainAxisSize: MainAxisSize.min,
+          children: <Widget>[
+            Text('${AppLocalizations.of(context)!.allow_analytics}: '),
+            Tooltip(
+              triggerMode: TooltipTriggerMode.tap,
+              showDuration: const Duration(milliseconds: 10000),
+              margin: const EdgeInsets.fromLTRB(30, 0, 30, 0),
+              message: AppLocalizations.of(context)!.allow_analytics_desc,
+              child: const Icon(
+                Icons.info,
+              ),
             ),
-          ),
-          const SizedBox(
-            width: 5,
-          ),
-          Switch(
+            const SizedBox(
+              width: 5,
+            ),
+            Switch(
               value: _analyticsValue!,
               onChanged: (value) {
                 setState(() {
                   _analyticsValue = value;
                 });
                 AppAnalytics.setEnabled(value);
-              },),
-        ],),
+              },
+            ),
+          ],
+        ),
       ],
     );
   }
@@ -124,8 +128,9 @@ class _SettingsState extends State<Settings> {
               ),
               onPressed: () {
                 showDialog(
-                    context: context,
-                    builder: (_) => OptOutAlertDialog(subject: subject),);
+                  context: context,
+                  builder: (_) => OptOutAlertDialog(subject: subject),
+                );
               },
             ),
             const SizedBox(height: 24),
@@ -135,8 +140,9 @@ class _SettingsState extends State<Settings> {
               style: ElevatedButton.styleFrom(backgroundColor: Colors.red),
               onPressed: () {
                 showDialog(
-                    context: context,
-                    builder: (_) => DeleteAlertDialog(subject: subject),);
+                  context: context,
+                  builder: (_) => DeleteAlertDialog(subject: subject),
+                );
               },
             ),
           ],
@@ -165,9 +171,10 @@ class OptOutAlertDialog extends StatelessWidget {
             TextSpan(
               text: subject!.study.title,
               style: TextStyle(
-                  color: theme.primaryColor,
-                  fontWeight: FontWeight.bold,
-                  fontSize: 16,),
+                color: theme.primaryColor,
+                fontWeight: FontWeight.bold,
+                fontSize: 16,
+              ),
             ),
             const TextSpan(
               text: " and won't be able to recover it. Previously completed "
@@ -194,7 +201,10 @@ class OptOutAlertDialog extends StatelessWidget {
             }
             if (context.mounted) {
               Navigator.pushNamedAndRemoveUntil(
-                  context, Routes.studySelection, (_) => false,);
+                context,
+                Routes.studySelection,
+                (_) => false,
+              );
             }
           },
         ),
@@ -235,7 +245,10 @@ class DeleteAlertDialog extends StatelessWidget {
                 }
                 if (context.mounted) {
                   Navigator.pushNamedAndRemoveUntil(
-                      context, Routes.welcome, (_) => false,);
+                    context,
+                    Routes.welcome,
+                    (_) => false,
+                  );
                 }
               } on SocketException catch (_) {}
             },
diff --git a/app/lib/screens/study/dashboard/task_overview_tab/progress_row.dart b/app/lib/screens/study/dashboard/task_overview_tab/progress_row.dart
index 0d27e6417..54f8d337a 100644
--- a/app/lib/screens/study/dashboard/task_overview_tab/progress_row.dart
+++ b/app/lib/screens/study/dashboard/task_overview_tab/progress_row.dart
@@ -175,7 +175,8 @@ class InterventionSegment extends StatelessWidget {
             elevation: 0,
             fillColor: color,
             shape: const CircleBorder(
-                side: BorderSide(color: Colors.white, width: 2),),
+              side: BorderSide(color: Colors.white, width: 2),
+            ),
             child: interventionIcon(intervention),
           ),
         ],
@@ -185,7 +186,9 @@ class InterventionSegment extends StatelessWidget {
 }
 
 Iterable<T> intersperseIndexed<T>(
-    T Function(int) generator, Iterable<T> iterable,) sync* {
+  T Function(int) generator,
+  Iterable<T> iterable,
+) sync* {
   final iterator = iterable.iterator;
   var index = 0;
   if (iterator.moveNext()) {
diff --git a/app/lib/screens/study/dashboard/task_overview_tab/task_box.dart b/app/lib/screens/study/dashboard/task_overview_tab/task_box.dart
index ffc25ec5a..6b659f621 100644
--- a/app/lib/screens/study/dashboard/task_overview_tab/task_box.dart
+++ b/app/lib/screens/study/dashboard/task_overview_tab/task_box.dart
@@ -29,7 +29,8 @@ class _TaskBoxState extends State<TaskBox> {
     await Navigator.push<bool>(
       context,
       MaterialPageRoute(
-          builder: (context) => TaskScreen(taskInstance: widget.taskInstance),),
+        builder: (context) => TaskScreen(taskInstance: widget.taskInstance),
+      ),
     );
     widget.onCompleted();
     // Rebuild widget
@@ -39,11 +40,12 @@ class _TaskBoxState extends State<TaskBox> {
 
   @override
   Widget build(BuildContext context) {
-    final completed = context
-        .watch<AppState>()
-        .activeSubject!
-        .completedTaskInstanceForDay(widget.taskInstance.task.id,
-            widget.taskInstance.completionPeriod, DateTime.now(),);
+    final completed =
+        context.watch<AppState>().activeSubject!.completedTaskInstanceForDay(
+              widget.taskInstance.task.id,
+              widget.taskInstance.completionPeriod,
+              DateTime.now(),
+            );
     final isPreview = context.read<AppState>().isPreview;
     final isInsidePeriod =
         widget.taskInstance.completionPeriod.contains(StudyUTimeOfDay.now());
diff --git a/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart b/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart
index bab34a1c0..c43a28a49 100644
--- a/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart
+++ b/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart
@@ -13,11 +13,12 @@ class TaskOverview extends StatefulWidget {
   final List<TaskInstance>? scheduleToday;
   final String? interventionIcon;
 
-  const TaskOverview(
-      {required this.subject,
-      required this.scheduleToday,
-      super.key,
-      this.interventionIcon,});
+  const TaskOverview({
+    required this.subject,
+    required this.scheduleToday,
+    super.key,
+    this.interventionIcon,
+  });
 
   @override
   State<TaskOverview> createState() => _TaskOverviewState();
@@ -28,7 +29,10 @@ class _TaskOverviewState extends State<TaskOverview> {
     if (widget.subject!.completedStudy) {
       // Workaround to reload dashboard
       Navigator.pushNamedAndRemoveUntil(
-          context, Routes.dashboard, (_) => false,);
+        context,
+        Routes.dashboard,
+        (_) => false,
+      );
     }
   }
 
@@ -85,9 +89,11 @@ class _TaskOverviewState extends State<TaskOverview> {
               Row(
                 children: [
                   Expanded(
-                      child: Text(
-                          AppLocalizations.of(context)!.intervention_current,
-                          style: theme.textTheme.titleLarge,),),
+                    child: Text(
+                      AppLocalizations.of(context)!.intervention_current,
+                      style: theme.textTheme.titleLarge,
+                    ),
+                  ),
                   const Spacer(),
                   Text(
                     '${widget.subject!.daysLeftForPhase(widget.subject!.getInterventionIndexForDate(DateTime.now()))} ${AppLocalizations.of(context)!.days_left}',
@@ -97,11 +103,14 @@ class _TaskOverviewState extends State<TaskOverview> {
               ),
               const SizedBox(height: 8),
               InterventionCardTitle(
-                  intervention:
-                      widget.subject!.getInterventionForDate(DateTime.now()),),
+                intervention:
+                    widget.subject!.getInterventionForDate(DateTime.now()),
+              ),
               const SizedBox(height: 8),
-              Text(AppLocalizations.of(context)!.today_tasks,
-                  style: theme.textTheme.titleLarge,),
+              Text(
+                AppLocalizations.of(context)!.today_tasks,
+                style: theme.textTheme.titleLarge,
+              ),
             ],
           ),
         ),
diff --git a/app/lib/screens/study/multimodal/capture_picture_screen.dart b/app/lib/screens/study/multimodal/capture_picture_screen.dart
index 0fbba8c0f..547940347 100644
--- a/app/lib/screens/study/multimodal/capture_picture_screen.dart
+++ b/app/lib/screens/study/multimodal/capture_picture_screen.dart
@@ -10,8 +10,11 @@ class CapturePictureScreen extends StatefulWidget {
   final String userId;
   final String studyId;
 
-  const CapturePictureScreen(
-      {super.key, required this.userId, required this.studyId,});
+  const CapturePictureScreen({
+    super.key,
+    required this.userId,
+    required this.studyId,
+  });
 
   @override
   State<CapturePictureScreen> createState() => _CapturePictureScreenState();
@@ -103,9 +106,11 @@ class _CapturePictureScreenState extends State<CapturePictureScreen>
 
   Future<List<CameraDescription>> _getAvailableCameras() async {
     return (await availableCameras())
-        .where((CameraDescription aCameraDescription) =>
-            aCameraDescription.lensDirection == CameraLensDirection.back ||
-            aCameraDescription.lensDirection == CameraLensDirection.front,)
+        .where(
+          (CameraDescription aCameraDescription) =>
+              aCameraDescription.lensDirection == CameraLensDirection.back ||
+              aCameraDescription.lensDirection == CameraLensDirection.front,
+        )
         .toList();
   }
 
@@ -157,59 +162,64 @@ class _CapturePictureScreenState extends State<CapturePictureScreen>
   Widget build(BuildContext context) {
     final cameraController = _cameraController;
     return Scaffold(
-        appBar: AppBar(title: Text(AppLocalizations.of(context)!.take_a_photo)),
-        body: cameraController == null
-            ? const Center(child: CircularProgressIndicator())
-            : Stack(
-                children: [
-                  CameraPreview(cameraController),
-                  if (_isTakingPicture) Container(
-                          color: Colors.black.withOpacity(0.5),
-                          alignment: Alignment.center,
-                          child: Container(
-                            decoration: BoxDecoration(
-                              color: Theme.of(context).dialogBackgroundColor,
-                              borderRadius: BorderRadius.circular(10),
-                            ),
-                            padding: const EdgeInsets.all(20.0),
-                            child: Column(
-                              mainAxisSize: MainAxisSize.min,
-                              children: [
-                                const CircularProgressIndicator(),
-                                const SizedBox(height: 16),
-                                Text(
-                                    AppLocalizations.of(context)!.take_a_photo,),
-                              ],
-                            ),
+      appBar: AppBar(title: Text(AppLocalizations.of(context)!.take_a_photo)),
+      body: cameraController == null
+          ? const Center(child: CircularProgressIndicator())
+          : Stack(
+              children: [
+                CameraPreview(cameraController),
+                if (_isTakingPicture)
+                  Container(
+                    color: Colors.black.withOpacity(0.5),
+                    alignment: Alignment.center,
+                    child: Container(
+                      decoration: BoxDecoration(
+                        color: Theme.of(context).dialogBackgroundColor,
+                        borderRadius: BorderRadius.circular(10),
+                      ),
+                      padding: const EdgeInsets.all(20.0),
+                      child: Column(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          const CircularProgressIndicator(),
+                          const SizedBox(height: 16),
+                          Text(
+                            AppLocalizations.of(context)!.take_a_photo,
                           ),
-                        ) else const SizedBox.shrink(),
-                ],
-              ),
-        floatingActionButton: Wrap(
-          children: [
-            Container(
-              margin: const EdgeInsets.all(10),
-              child: FloatingActionButton(
-                heroTag: "captureImage",
-                onPressed: cameraController != null && !_isTakingPicture
-                    ? () async {
-                        await _tryCapturePicture();
-                      }
-                    : null,
-                child: const Icon(Icons.camera_alt),
-              ),
+                        ],
+                      ),
+                    ),
+                  )
+                else
+                  const SizedBox.shrink(),
+              ],
             ),
-            Container(
-              margin: const EdgeInsets.all(10),
-              child: FloatingActionButton(
-                heroTag: "jumpToNextCamera",
-                onPressed: cameraController != null && !_isTakingPicture
-                    ? () async => await _jumpToNextCamera()
-                    : null,
-                child: const Icon(Icons.autorenew),
-              ),
+      floatingActionButton: Wrap(
+        children: [
+          Container(
+            margin: const EdgeInsets.all(10),
+            child: FloatingActionButton(
+              heroTag: "captureImage",
+              onPressed: cameraController != null && !_isTakingPicture
+                  ? () async {
+                      await _tryCapturePicture();
+                    }
+                  : null,
+              child: const Icon(Icons.camera_alt),
             ),
-          ],
-        ),);
+          ),
+          Container(
+            margin: const EdgeInsets.all(10),
+            child: FloatingActionButton(
+              heroTag: "jumpToNextCamera",
+              onPressed: cameraController != null && !_isTakingPicture
+                  ? () async => await _jumpToNextCamera()
+                  : null,
+              child: const Icon(Icons.autorenew),
+            ),
+          ),
+        ],
+      ),
+    );
   }
 }
diff --git a/app/lib/screens/study/onboarding/consent.dart b/app/lib/screens/study/onboarding/consent.dart
index bad2d28e8..f45b2ffcb 100644
--- a/app/lib/screens/study/onboarding/consent.dart
+++ b/app/lib/screens/study/onboarding/consent.dart
@@ -49,12 +49,16 @@ class _ConsentScreenState extends State<ConsentScreen> {
           (consentItem) => [
             pw.Header(
               level: 0,
-              child: pw.Text(consentItem.title ?? '',
-                  textScaleFactor: 2, style: pw.TextStyle(font: ttf),),
+              child: pw.Text(
+                consentItem.title ?? '',
+                textScaleFactor: 2,
+                style: pw.TextStyle(font: ttf),
+              ),
             ),
             pw.Paragraph(
-                text: consentItem.description ?? '',
-                style: pw.TextStyle(font: ttf),),
+              text: consentItem.description ?? '',
+              style: pw.TextStyle(font: ttf),
+            ),
           ],
         )
         .expand((element) => element)
@@ -80,21 +84,27 @@ class _ConsentScreenState extends State<ConsentScreen> {
                     elevation: 24,
                     title:
                         Text(AppLocalizations.of(context)!.save_not_supported),
-                    content: Text(AppLocalizations.of(context)!
-                        .save_not_supported_description,),
+                    content: Text(
+                      AppLocalizations.of(context)!
+                          .save_not_supported_description,
+                    ),
                   ),
                 );
               }
               final pdfContent = await generatePdfContent();
               if (!context.mounted) return;
               final savedFilePath = await savePDF(
-                  context, '${subject!.study.title}_consent', pdfContent,);
+                context,
+                '${subject!.study.title}_consent',
+                pdfContent,
+              );
               if (savedFilePath != null) {
                 if (!context.mounted) return;
                 ScaffoldMessenger.of(context).showSnackBar(
                   SnackBar(
                     content: Text(
-                        '${AppLocalizations.of(context)!.was_saved_to}$savedFilePath.',),
+                      '${AppLocalizations.of(context)!.was_saved_to}$savedFilePath.',
+                    ),
                   ),
                 );
               }
@@ -129,8 +139,10 @@ class _ConsentScreenState extends State<ConsentScreen> {
                           ..onTap = () => showDialog(
                                 context: context,
                                 builder: (context) => AlertDialog(
-                                  content: Text(AppLocalizations.of(context)!
-                                      .please_give_consent_reason,),
+                                  content: Text(
+                                    AppLocalizations.of(context)!
+                                        .please_give_consent_reason,
+                                  ),
                                 ),
                               ),
                       ),
@@ -168,7 +180,9 @@ class _ConsentScreenState extends State<ConsentScreen> {
         backLabel: AppLocalizations.of(context)!.decline,
         backIcon: const Icon(Icons.close),
         onBack: () => Navigator.popUntil(
-            context, ModalRoute.withName(Routes.studySelection),),
+          context,
+          ModalRoute.withName(Routes.studySelection),
+        ),
         nextLabel: AppLocalizations.of(context)!.accept,
         nextIcon: const Icon(Icons.check),
         onNext: boxLogic.every((element) => element) || kDebugMode
@@ -186,12 +200,13 @@ class ConsentCard extends StatelessWidget {
   final Function(int) onTapped;
   final bool? isChecked;
 
-  const ConsentCard(
-      {super.key,
-      this.consent,
-      this.index,
-      required this.onTapped,
-      this.isChecked,});
+  const ConsentCard({
+    super.key,
+    this.consent,
+    this.index,
+    required this.onTapped,
+    this.isChecked,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -213,9 +228,17 @@ class ConsentCard extends StatelessWidget {
             builder: (context) => AlertDialog(
               title: Row(
                 children: [
-                  if (consent!.iconName.isNotEmpty) Icon(MdiIcons.fromString(consent!.iconName),
-                          color: theme.primaryColor,) else const SizedBox.shrink(),
-                  if (consent!.iconName.isNotEmpty) const SizedBox(width: 8) else const SizedBox.shrink(),
+                  if (consent!.iconName.isNotEmpty)
+                    Icon(
+                      MdiIcons.fromString(consent!.iconName),
+                      color: theme.primaryColor,
+                    )
+                  else
+                    const SizedBox.shrink(),
+                  if (consent!.iconName.isNotEmpty)
+                    const SizedBox(width: 8)
+                  else
+                    const SizedBox.shrink(),
                   Expanded(child: Text(consent!.title!)),
                   IconButton(
                     icon: const Icon(Icons.close),
@@ -234,9 +257,18 @@ class ConsentCard extends StatelessWidget {
             mainAxisSize: MainAxisSize.min,
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              if (consent!.iconName.isNotEmpty) Icon(MdiIcons.fromString(consent!.iconName),
-                      size: 60, color: Colors.blue,) else const SizedBox.shrink(),
-              if (consent!.iconName.isNotEmpty) const SizedBox(height: 10) else const SizedBox.shrink(),
+              if (consent!.iconName.isNotEmpty)
+                Icon(
+                  MdiIcons.fromString(consent!.iconName),
+                  size: 60,
+                  color: Colors.blue,
+                )
+              else
+                const SizedBox.shrink(),
+              if (consent!.iconName.isNotEmpty)
+                const SizedBox(height: 10)
+              else
+                const SizedBox.shrink(),
               Flexible(
                 child: Text(
                   consent!.title!,
@@ -260,5 +292,9 @@ class ConsentElement {
   final IconData icon;
 
   ConsentElement(
-      this.title, this.descriptionText, this.acknowledgmentText, this.icon,);
+    this.title,
+    this.descriptionText,
+    this.acknowledgmentText,
+    this.icon,
+  );
 }
diff --git a/app/lib/screens/study/onboarding/eligibility_screen.dart b/app/lib/screens/study/onboarding/eligibility_screen.dart
index b201bd6c7..c0325f2b6 100644
--- a/app/lib/screens/study/onboarding/eligibility_screen.dart
+++ b/app/lib/screens/study/onboarding/eligibility_screen.dart
@@ -18,8 +18,9 @@ class EligibilityResult {
 class EligibilityScreen extends StatefulWidget {
   final Study? study;
 
-  static MaterialPageRoute<EligibilityResult> routeFor(
-          {required Study? study,}) =>
+  static MaterialPageRoute<EligibilityResult> routeFor({
+    required Study? study,
+  }) =>
       MaterialPageRoute(
         builder: (_) => EligibilityScreen(study: study),
         settings: const RouteSettings(name: '/eligibilityCheck'),
@@ -78,8 +79,11 @@ class _EligibilityScreenState extends State<EligibilityScreen> {
       } else {
         final firstFailed =
             criteria.firstWhere((criterion) => criterion.isViolated(qs));
-        activeResult = EligibilityResult(qs,
-            eligible: conditionResult, firstFailed: firstFailed,);
+        activeResult = EligibilityResult(
+          qs,
+          eligible: conditionResult,
+          firstFailed: firstFailed,
+        );
       }
     });
   }
@@ -108,8 +112,10 @@ class _EligibilityScreenState extends State<EligibilityScreen> {
           color: Colors.green,
           size: 32,
         ),
-        content: Text(AppLocalizations.of(context)!.eligible_yes,
-            style: Theme.of(context).textTheme.titleMedium,),
+        content: Text(
+          AppLocalizations.of(context)!.eligible_yes,
+          style: Theme.of(context).textTheme.titleMedium,
+        ),
         actions: [Container()],
         forceActionsBelow: true,
         backgroundColor: Colors.green[50],
@@ -124,8 +130,10 @@ class _EligibilityScreenState extends State<EligibilityScreen> {
         content: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text(AppLocalizations.of(context)!.eligible_no,
-                style: Theme.of(context).textTheme.titleMedium,),
+            Text(
+              AppLocalizations.of(context)!.eligible_no,
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
             const SizedBox(height: 4),
             if (activeResult?.firstFailed?.reason != null)
               Text(activeResult!.firstFailed!.reason!)
diff --git a/app/lib/screens/study/onboarding/intervention_selection.dart b/app/lib/screens/study/onboarding/intervention_selection.dart
index c1e584403..b2261a423 100644
--- a/app/lib/screens/study/onboarding/intervention_selection.dart
+++ b/app/lib/screens/study/onboarding/intervention_selection.dart
@@ -66,7 +66,8 @@ class _InterventionSelectionScreenState
           showCheckbox: true,
           showDescription: false,
           selected: selectedInterventionIds.any(
-              (interventionId) => interventionId == interventions[index].id,),
+            (interventionId) => interventionId == interventions[index].id,
+          ),
           onTap: () => onSelect(interventions[index].id),
         ),
       ),
@@ -123,7 +124,9 @@ class _InterventionSelectionScreenState
       bottomNavigationBar: BottomOnboardingNavigation(
         onNext: selectedInterventionIds.length == 2 ? onFinished : null,
         progress: OnboardingProgress(
-            stage: 1, progress: selectedInterventionIds.length / 2,),
+          stage: 1,
+          progress: selectedInterventionIds.length / 2,
+        ),
       ),
     );
   }
diff --git a/app/lib/screens/study/onboarding/journey_overview.dart b/app/lib/screens/study/onboarding/journey_overview.dart
index dfc58b73d..8f2eebad0 100644
--- a/app/lib/screens/study/onboarding/journey_overview.dart
+++ b/app/lib/screens/study/onboarding/journey_overview.dart
@@ -98,7 +98,8 @@ class Timeline extends StatelessWidget {
                 ? Colors.grey
                 : theme.colorScheme.secondary,
             date: now.add(
-                Duration(days: index * subject!.study.schedule.phaseDuration),),
+              Duration(days: index * subject!.study.schedule.phaseDuration),
+            ),
             isFirst: index == 0,
           );
         }),
@@ -149,13 +150,17 @@ class InterventionTile extends StatelessWidget {
       beforeLineStyle: LineStyle(color: theme.primaryColor),
       afterLineStyle: LineStyle(color: theme.primaryColor),
       endChild: TimelineChild(
-        child: Text(title!,
-            style: theme.textTheme.titleLarge!
-                .copyWith(color: theme.primaryColor),),
+        child: Text(
+          title!,
+          style:
+              theme.textTheme.titleLarge!.copyWith(color: theme.primaryColor),
+        ),
       ),
       startChild: TimelineChild(
-        child: Text(DateFormat('dd-MM-yyyy').format(date),
-            style: const TextStyle(fontWeight: FontWeight.bold),),
+        child: Text(
+          DateFormat('dd-MM-yyyy').format(date),
+          style: const TextStyle(fontWeight: FontWeight.bold),
+        ),
       ),
     );
   }
@@ -171,8 +176,9 @@ class IconIndicator extends StatelessWidget {
   Widget build(BuildContext context) {
     return DecoratedBox(
       decoration: BoxDecoration(
-          shape: BoxShape.circle,
-          color: color ?? Theme.of(context).colorScheme.secondary,),
+        shape: BoxShape.circle,
+        color: color ?? Theme.of(context).colorScheme.secondary,
+      ),
       child: Center(
         child: Icon(MdiIcons.fromString(iconName), color: Colors.white),
       ),
diff --git a/app/lib/screens/study/onboarding/kickoff.dart b/app/lib/screens/study/onboarding/kickoff.dart
index 71c7e4c7d..d59c681a9 100644
--- a/app/lib/screens/study/onboarding/kickoff.dart
+++ b/app/lib/screens/study/onboarding/kickoff.dart
@@ -33,7 +33,10 @@ class _KickoffScreen extends State<KickoffScreen> {
       if (!context.mounted) return;
       setState(() => ready = true);
       Navigator.pushNamedAndRemoveUntil(
-          context, Routes.dashboard, (_) => false,);
+        context,
+        Routes.dashboard,
+        (_) => false,
+      );
     } catch (e) {
       StudyULogger.fatal('Failed creating subject: $e');
     }
diff --git a/app/lib/screens/study/onboarding/onboarding_progress.dart b/app/lib/screens/study/onboarding/onboarding_progress.dart
index 41ec0cadd..12bfb89fa 100644
--- a/app/lib/screens/study/onboarding/onboarding_progress.dart
+++ b/app/lib/screens/study/onboarding/onboarding_progress.dart
@@ -4,8 +4,11 @@ class OnboardingProgress extends StatelessWidget {
   final int stage;
   final double progress;
 
-  const OnboardingProgress(
-      {required this.stage, required this.progress, super.key,});
+  const OnboardingProgress({
+    required this.stage,
+    required this.progress,
+    super.key,
+  });
 
   double _getProgressForStage(int stage) {
     if (stage < this.stage) return 1;
diff --git a/app/lib/screens/study/onboarding/study_overview.dart b/app/lib/screens/study/onboarding/study_overview.dart
index 91dcdea81..732aa6ae1 100644
--- a/app/lib/screens/study/onboarding/study_overview.dart
+++ b/app/lib/screens/study/onboarding/study_overview.dart
@@ -54,7 +54,9 @@ class _StudyOverviewScreen extends State<StudyOverviewScreen> {
   Future<void> navigateToEligibilityCheck(BuildContext context) async {
     final study = context.read<AppState>().selectedStudy;
     final result = await Navigator.push<EligibilityResult>(
-        context, EligibilityScreen.routeFor(study: study),);
+      context,
+      EligibilityScreen.routeFor(study: study),
+    );
     if (result == null) return;
 
     if (!context.mounted) return;
@@ -115,15 +117,19 @@ class StudyDetailsView extends StatelessWidget {
           title:
               Text(AppLocalizations.of(context)!.intervention_phase_duration),
           subtitle: Text(
-              '${study!.schedule.phaseDuration} ${AppLocalizations.of(context)!.days}',),
+            '${study!.schedule.phaseDuration} ${AppLocalizations.of(context)!.days}',
+          ),
           leading:
               Icon(MdiIcons.clock, color: theme.primaryColor, size: iconSize),
         ),
         ListTile(
           title: Text(AppLocalizations.of(context)!.study_length),
           subtitle: Text('$studyLength ${AppLocalizations.of(context)!.days}'),
-          leading: Icon(MdiIcons.calendar,
-              color: theme.primaryColor, size: iconSize,),
+          leading: Icon(
+            MdiIcons.calendar,
+            color: theme.primaryColor,
+            size: iconSize,
+          ),
         ),
         const SizedBox(height: 16),
         ContactWidget(
diff --git a/app/lib/screens/study/onboarding/study_selection.dart b/app/lib/screens/study/onboarding/study_selection.dart
index b3474fdc2..8a4899540 100644
--- a/app/lib/screens/study/onboarding/study_selection.dart
+++ b/app/lib/screens/study/onboarding/study_selection.dart
@@ -92,8 +92,9 @@ class _StudySelectionScreenState extends State<StudySelectionScreen> {
                                     context: context,
                                     builder: (context) => AlertDialog(
                                       content: Text(
-                                          AppLocalizations.of(context)!
-                                              .study_selection_single_reason,),
+                                        AppLocalizations.of(context)!
+                                            .study_selection_single_reason,
+                                      ),
                                     ),
                                   ),
                           ),
@@ -103,37 +104,43 @@ class _StudySelectionScreenState extends State<StudySelectionScreen> {
                   ],
                 ),
               ),
-              if (_hiddenStudies) Column(
-                      children: [
-                        MaterialBanner(
-                          padding: const EdgeInsets.all(8),
-                          leading: Icon(
-                            MdiIcons.exclamationThick,
-                            color: Colors.orange,
-                            size: 32,
-                          ),
-                          content: Text(
-                            AppLocalizations.of(context)!
-                                .study_selection_hidden_studies,
-                            style: Theme.of(context).textTheme.titleSmall,
-                          ),
-                          actions: const [SizedBox.shrink()],
-                          backgroundColor: Colors.yellow[100],
-                        ),
-                        const SizedBox(height: 16),
-                      ],
-                    ) else const SizedBox.shrink(),
+              if (_hiddenStudies)
+                Column(
+                  children: [
+                    MaterialBanner(
+                      padding: const EdgeInsets.all(8),
+                      leading: Icon(
+                        MdiIcons.exclamationThick,
+                        color: Colors.orange,
+                        size: 32,
+                      ),
+                      content: Text(
+                        AppLocalizations.of(context)!
+                            .study_selection_hidden_studies,
+                        style: Theme.of(context).textTheme.titleSmall,
+                      ),
+                      actions: const [SizedBox.shrink()],
+                      backgroundColor: Colors.yellow[100],
+                    ),
+                    const SizedBox(height: 16),
+                  ],
+                )
+              else
+                const SizedBox.shrink(),
               Expanded(
                 child: RetryFutureBuilder<ExtractionResult<Study>>(
                   tryFunction: () async => publishedStudies,
-                  successBuilder: (BuildContext context,
-                      ExtractionResult<Study>? extractionResult,) {
+                  successBuilder: (
+                    BuildContext context,
+                    ExtractionResult<Study>? extractionResult,
+                  ) {
                     final studies = extractionResult!.extracted;
                     if (extractionResult is ExtractionFailedException<Study>) {
                       WidgetsBinding.instance.addPostFrameCallback((_) {
                         if (_hiddenStudies) return;
                         debugPrint(
-                            '${extractionResult.notExtracted.length} studies could not be extracted.',);
+                          '${extractionResult.notExtracted.length} studies could not be extracted.',
+                        );
                         setState(() {
                           _hiddenStudies = true;
                         });
@@ -165,8 +172,9 @@ class _StudySelectionScreenState extends State<StudySelectionScreen> {
                   icon: Icon(MdiIcons.key),
                   onPressed: () async {
                     await showDialog(
-                        context: context,
-                        builder: (_) => const InviteCodeDialog(),);
+                      context: context,
+                      builder: (_) => const InviteCodeDialog(),
+                    );
                   },
                   label: Text(AppLocalizations.of(context)!.invite_code_button),
                 ),
@@ -207,7 +215,8 @@ class _InviteCodeDialogState extends State<InviteCodeDialog> {
           validator: (_) => _errorMessage,
           autovalidateMode: AutovalidateMode.always,
           decoration: InputDecoration(
-              labelText: AppLocalizations.of(context)!.invite_code,),
+            labelText: AppLocalizations.of(context)!.invite_code,
+          ),
         ),
         actions: [
           OutlinedButton.icon(
diff --git a/app/lib/screens/study/report/performance/performance_details.dart b/app/lib/screens/study/report/performance/performance_details.dart
index 8a9c8ac5a..28b5210ca 100644
--- a/app/lib/screens/study/report/performance/performance_details.dart
+++ b/app/lib/screens/study/report/performance/performance_details.dart
@@ -37,8 +37,9 @@ class PerformanceDetailsScreen extends StatelessWidget {
                 Padding(
                   padding: const EdgeInsets.all(8),
                   child: Text(
-                      AppLocalizations.of(context)!.performance_overview,
-                      style: theme.textTheme.titleMedium,),
+                    AppLocalizations.of(context)!.performance_overview,
+                    style: theme.textTheme.titleMedium,
+                  ),
                 ),
                 Padding(
                   padding: const EdgeInsets.all(8),
@@ -57,8 +58,9 @@ class PerformanceDetailsScreen extends StatelessWidget {
                   shrinkWrap: true,
                   itemCount: interventions.length,
                   itemBuilder: (context, index) => InterventionPerformanceBar(
-                      subject: reportSubject,
-                      intervention: interventions[index],),
+                    subject: reportSubject,
+                    intervention: interventions[index],
+                  ),
                 ),
                 Padding(
                   padding: const EdgeInsets.all(8),
@@ -94,8 +96,11 @@ class InterventionPerformanceBar extends StatelessWidget {
   final Intervention intervention;
   final StudySubject? subject;
 
-  const InterventionPerformanceBar(
-      {required this.intervention, required this.subject, super.key,});
+  const InterventionPerformanceBar({
+    required this.intervention,
+    required this.subject,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -104,8 +109,11 @@ class InterventionPerformanceBar extends StatelessWidget {
         padding: const EdgeInsets.all(16),
         child: Column(
           children: [
-            InterventionCard(intervention,
-                showTasks: false, showDescription: false,),
+            InterventionCard(
+              intervention,
+              showTasks: false,
+              showDescription: false,
+            ),
             const SizedBox(height: 8),
             ...intervention.tasks.map(
               (task) => PerformanceBar(
@@ -125,8 +133,11 @@ class ObservationPerformanceBar extends StatelessWidget {
   final Observation observation;
   final StudySubject? subject;
 
-  const ObservationPerformanceBar(
-      {required this.observation, required this.subject, super.key,});
+  const ObservationPerformanceBar({
+    required this.observation,
+    required this.subject,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -148,11 +159,12 @@ class PerformanceBar extends StatelessWidget {
   final int completed;
   final int total;
 
-  const PerformanceBar(
-      {required this.task,
-      required this.completed,
-      required this.total,
-      super.key,});
+  const PerformanceBar({
+    required this.task,
+    required this.completed,
+    required this.total,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/app/lib/screens/study/report/performance/performance_section.dart b/app/lib/screens/study/report/performance/performance_section.dart
index fba905865..da07b1105 100644
--- a/app/lib/screens/study/report/performance/performance_section.dart
+++ b/app/lib/screens/study/report/performance/performance_section.dart
@@ -23,8 +23,9 @@ class PerformanceSection extends GenericSection {
       final countableInterventions =
           getCountableObservationAmount(intervention);
       return min<double>(
-          countableInterventions == 0 ? 0 : countableInterventions / maximum,
-          1,);
+        countableInterventions == 0 ? 0 : countableInterventions / maximum,
+        1,
+      );
     }).toList();
     return interventions.length != 2 ||
             subject!.study.reportSpecification.primary == null
@@ -69,7 +70,9 @@ class PerformanceSection extends GenericSection {
   }
 
   String getPowerLevelDescription(
-      BuildContext context, List<num> interventionProgress,) {
+    BuildContext context,
+    List<num> interventionProgress,
+  ) {
     if (interventionProgress.any((progress) => progress < minimumRatio)) {
       return AppLocalizations.of(context)!.not_enough_data;
     } else if (interventionProgress.any((progress) => progress < 1)) {
@@ -91,13 +94,18 @@ class PerformanceSection extends GenericSection {
         .values
         .forEach((progress) {
       if (progress
-              .where((result) => intervention.tasks.any(
-                  (interventionTask) => interventionTask.id == result.taskId,),)
+              .where(
+                (result) => intervention.tasks.any(
+                  (interventionTask) => interventionTask.id == result.taskId,
+                ),
+              )
               .length ==
           interventionsPerDay) {
         countable += progress
-            .where((result) => subject!.study.observations
-                .any((observation) => observation.id == result.taskId),)
+            .where(
+              (result) => subject!.study.observations
+                  .any((observation) => observation.id == result.taskId),
+            )
             .length;
       }
     });
@@ -137,9 +145,10 @@ class PerformanceBar extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final rainbow = Rainbow(
-        spectrum: [Colors.red, Colors.yellow, Colors.green],
-        rangeStart: 0,
-        rangeEnd: 1,);
+      spectrum: [Colors.red, Colors.yellow, Colors.green],
+      rangeStart: 0,
+      rangeEnd: 1,
+    );
     final fullSpectrum = List<double>.generate(3, (index) => index * 0.5)
         .map<Color>((index) => rainbow[index].withOpacity(0.4))
         .toList();
diff --git a/app/lib/screens/study/report/report_details.dart b/app/lib/screens/study/report/report_details.dart
index 0a30b30d4..32bf3b03e 100644
--- a/app/lib/screens/study/report/report_details.dart
+++ b/app/lib/screens/study/report/report_details.dart
@@ -44,7 +44,9 @@ class ReportDetailsScreen extends StatelessWidget {
             PerformanceSection(
               subject,
               onTap: () => Navigator.push(
-                  context, PerformanceDetailsScreen.routeFor(subject: subject),),
+                context,
+                PerformanceDetailsScreen.routeFor(subject: subject),
+              ),
             ),
             if (subject.study.reportSpecification.primary != null &&
                 (subject.completedStudy || kDebugMode))
@@ -55,8 +57,9 @@ class ReportDetailsScreen extends StatelessWidget {
               ),
             if (subject.study.reportSpecification.secondary.isNotEmpty &&
                 (subject.completedStudy || kDebugMode))
-              ...subject.study.reportSpecification.secondary.map((section) =>
-                  ReportSectionContainer(section, subject: subject),),
+              ...subject.study.reportSpecification.secondary.map(
+                (section) => ReportSectionContainer(section, subject: subject),
+              ),
           ],
         ),
       ),
diff --git a/app/lib/screens/study/report/report_history.dart b/app/lib/screens/study/report/report_history.dart
index ce5b28f69..2250a7346 100644
--- a/app/lib/screens/study/report/report_history.dart
+++ b/app/lib/screens/study/report/report_history.dart
@@ -21,7 +21,8 @@ class ReportHistoryScreen extends StatelessWidget {
       ),
       body: RetryFutureBuilder<List<StudySubject>>(
         tryFunction: () => StudySubject.getStudyHistory(
-            Supabase.instance.client.auth.currentUser!.id,),
+          Supabase.instance.client.auth.currentUser!.id,
+        ),
         successBuilder:
             (BuildContext context, List<StudySubject>? pastStudies) {
           return ListView.builder(
@@ -51,7 +52,9 @@ class ReportHistoryItem extends StatelessWidget {
       child: InkWell(
         onTap: () {
           Navigator.push(
-              context, ReportDetailsScreen.routeFor(subject: subject),);
+            context,
+            ReportDetailsScreen.routeFor(subject: subject),
+          );
         },
         child: Padding(
           padding: const EdgeInsets.all(20),
@@ -69,7 +72,8 @@ class ReportHistoryItem extends StatelessWidget {
                   child: Text(
                     subject.study.title!,
                     style: theme.textTheme.headlineSmall!.copyWith(
-                        color: isActiveStudy ? Colors.white : Colors.black,),
+                      color: isActiveStudy ? Colors.white : Colors.black,
+                    ),
                   ),
                 ),
               ],
diff --git a/app/lib/screens/study/report/report_section_container.dart b/app/lib/screens/study/report/report_section_container.dart
index 7c7db37f5..df4539b35 100644
--- a/app/lib/screens/study/report/report_section_container.dart
+++ b/app/lib/screens/study/report/report_section_container.dart
@@ -6,7 +6,9 @@ import 'package:studyu_app/screens/study/report/sections/linear_regression_secti
 import 'package:studyu_core/core.dart';
 
 typedef SectionBuilder = ReportSectionWidget Function(
-    ReportSection section, StudySubject subject,);
+  ReportSection section,
+  StudySubject subject,
+);
 
 class ReportSectionContainer extends StatelessWidget {
   final ReportSection section;
@@ -14,8 +16,13 @@ class ReportSectionContainer extends StatelessWidget {
   final bool primary;
   final GestureTapCallback? onTap;
 
-  const ReportSectionContainer(this.section,
-      {super.key, required this.subject, this.onTap, this.primary = false,});
+  const ReportSectionContainer(
+    this.section, {
+    super.key,
+    required this.subject,
+    this.onTap,
+    this.primary = false,
+  });
 
   ReportSectionWidget buildContents(BuildContext context) => switch (section) {
         final AverageSection averageSection =>
diff --git a/app/lib/screens/study/tasks/task_screen.dart b/app/lib/screens/study/tasks/task_screen.dart
index 2027d050d..53301b424 100644
--- a/app/lib/screens/study/tasks/task_screen.dart
+++ b/app/lib/screens/study/tasks/task_screen.dart
@@ -13,8 +13,9 @@ import 'package:studyu_core/core.dart';
 class TaskScreen extends StatefulWidget {
   final TaskInstance taskInstance;
 
-  static MaterialPageRoute<bool> routeFor(
-          {required TaskInstance taskInstance,}) =>
+  static MaterialPageRoute<bool> routeFor({
+    required TaskInstance taskInstance,
+  }) =>
       MaterialPageRoute(
         builder: (_) => TaskScreen(taskInstance: taskInstance),
       );
@@ -33,8 +34,10 @@ class _TaskScreenState extends State<TaskScreen> {
   void didChangeDependencies() {
     super.didChangeDependencies();
     subject = context.watch<AppState>().activeSubject;
-    taskInstance = TaskInstance.fromInstanceId(widget.taskInstance.id,
-        study: subject!.study,);
+    taskInstance = TaskInstance.fromInstanceId(
+      widget.taskInstance.id,
+      study: subject!.study,
+    );
   }
 
   Widget _buildTask() {
@@ -80,7 +83,9 @@ class _TaskScreenState extends State<TaskScreen> {
 }
 
 Future<void> handleTaskCompletion(
-    BuildContext context, Function(StudySubject?) completionCallback,) async {
+  BuildContext context,
+  Function(StudySubject?) completionCallback,
+) async {
   final state = context.read<AppState>();
   final activeSubject = state.activeSubject;
   try {
@@ -97,8 +102,9 @@ Future<void> handleTaskCompletion(
         content: Text(AppLocalizations.of(context)!.could_not_save_results),
         duration: const Duration(seconds: 10),
         action: SnackBarAction(
-            label: 'Retry',
-            onPressed: () => handleTaskCompletion(context, completionCallback),),
+          label: 'Retry',
+          onPressed: () => handleTaskCompletion(context, completionCallback),
+        ),
       ),
     );
     rethrow;
diff --git a/app/lib/util/app_analytics.dart b/app/lib/util/app_analytics.dart
index 069163c75..32871a838 100644
--- a/app/lib/util/app_analytics.dart
+++ b/app/lib/util/app_analytics.dart
@@ -48,18 +48,23 @@ class AppAnalytics /*extends Analytics*/ {
       runApp(myApp);
       return;
     }
-    await SentryFlutter.init((options) {
-      options.dsn = studyUAnalytics!.dsn;
-      // Set tracesSampleRate to 1.0 to capture 100% of transactions for performance monitoring.
-      // We recommend adjusting this value in production.
-      options.tracesSampleRate = studyUAnalytics.samplingRate ?? 1.0;
-      options.addIntegration(LoggingIntegration());
-    }, appRunner: () => runApp(myApp),);
-    Cache.storeAnalytics(StudyUAnalytics(
-      studyUAnalytics.enabled,
-      studyUAnalytics.dsn,
-      studyUAnalytics.samplingRate,
-    ),);
+    await SentryFlutter.init(
+      (options) {
+        options.dsn = studyUAnalytics!.dsn;
+        // Set tracesSampleRate to 1.0 to capture 100% of transactions for performance monitoring.
+        // We recommend adjusting this value in production.
+        options.tracesSampleRate = studyUAnalytics.samplingRate ?? 1.0;
+        options.addIntegration(LoggingIntegration());
+      },
+      appRunner: () => runApp(myApp),
+    );
+    Cache.storeAnalytics(
+      StudyUAnalytics(
+        studyUAnalytics.enabled,
+        studyUAnalytics.dsn,
+        studyUAnalytics.samplingRate,
+      ),
+    );
   }
 
   static bool? get isUserEnabled {
@@ -90,9 +95,11 @@ class AppAnalytics /*extends Analytics*/ {
 
   void initAdvanced() {
     Sentry.configureScope((scope) {
-      scope.setUser(SentryUser(
-        id: subject!.userId,
-      ),);
+      scope.setUser(
+        SentryUser(
+          id: subject!.userId,
+        ),
+      );
       final advancedContext = {
         'subjectId': subject!.id,
         'studyId': state.selectedStudy!.id,
diff --git a/app/lib/util/data_processing.dart b/app/lib/util/data_processing.dart
index 2e17a66ce..16487ddb5 100644
--- a/app/lib/util/data_processing.dart
+++ b/app/lib/util/data_processing.dart
@@ -16,7 +16,8 @@ class GroupedIterable<K, V> extends Iterable<MapEntry<K, Iterable<V>>> {
       map((entry) => MapEntry(entry.key, aggregator(entry.value)));
 
   Iterable<MapEntry<K, R>> aggregateWithKey<R>(
-          KeyedAggregator<K, V, R> aggregator,) =>
+    KeyedAggregator<K, V, R> aggregator,
+  ) =>
       map((entry) => MapEntry(entry.key, aggregator(entry.value, entry.key)));
 }
 
@@ -41,7 +42,8 @@ extension GroupByIterable<V> on Iterable<V> {
   GroupedIterable<K, V> groupBy<K>(KeyAccessor<K, V> key) {
     final result = <K, List<V>>{};
     forEach(
-        (element) => result.putIfAbsent(key(element), () => []).add(element),);
+      (element) => result.putIfAbsent(key(element), () => []).add(element),
+    );
     return GroupedIterable.from(result);
   }
 }
diff --git a/app/lib/util/intervention.dart b/app/lib/util/intervention.dart
index b7bc0630f..17f064344 100644
--- a/app/lib/util/intervention.dart
+++ b/app/lib/util/intervention.dart
@@ -8,11 +8,15 @@ Widget interventionIcon(Intervention intervention, {Color? color}) {
   }
 
   return intervention.icon.isNotEmpty
-      ? Icon(MdiIcons.fromString(intervention.icon),
-          color: color ?? Colors.white,)
+      ? Icon(
+          MdiIcons.fromString(intervention.icon),
+          color: color ?? Colors.white,
+        )
       : Text(
           intervention.name![0].toUpperCase(),
           style: TextStyle(
-              fontWeight: FontWeight.bold, color: color ?? Colors.white,),
+            fontWeight: FontWeight.bold,
+            color: color ?? Colors.white,
+          ),
         );
 }
diff --git a/app/lib/util/notifications.dart b/app/lib/util/notifications.dart
index 8c195b8d8..92716fcd7 100644
--- a/app/lib/util/notifications.dart
+++ b/app/lib/util/notifications.dart
@@ -18,8 +18,11 @@ class NotificationValidators {
   bool wasNotificationActionHandled = false;
   bool wasNotificationActionCompleted = false;
 
-  NotificationValidators(this.didNotificationLaunchApp,
-      this.wasNotificationActionHandled, this.wasNotificationActionCompleted,);
+  NotificationValidators(
+    this.didNotificationLaunchApp,
+    this.wasNotificationActionHandled,
+    this.wasNotificationActionCompleted,
+  );
 }
 
 class StudyNotifications {
diff --git a/app/lib/util/save_pdf.dart b/app/lib/util/save_pdf.dart
index 9b7ec26c9..ebdc3d861 100644
--- a/app/lib/util/save_pdf.dart
+++ b/app/lib/util/save_pdf.dart
@@ -5,10 +5,14 @@ import 'package:pdf/pdf.dart';
 import 'package:pdf/widgets.dart' as pw;
 
 Future<String?> savePDF(
-    BuildContext context, String title, List<pw.Widget> content,) async {
+  BuildContext context,
+  String title,
+  List<pw.Widget> content,
+) async {
   final doc = pw.Document();
   final logo = pw.MemoryImage(
-      (await rootBundle.load('assets/icon/logo.png')).buffer.asUint8List(),);
+    (await rootBundle.load('assets/icon/logo.png')).buffer.asUint8List(),
+  );
   doc.addPage(
     pw.MultiPage(
       pageFormat: PdfPageFormat.a4,
diff --git a/app/lib/util/schedule_notifications.dart b/app/lib/util/schedule_notifications.dart
index fdc452978..a87613953 100644
--- a/app/lib/util/schedule_notifications.dart
+++ b/app/lib/util/schedule_notifications.dart
@@ -9,18 +9,25 @@ import 'package:studyu_core/core.dart';
 import 'package:timezone/timezone.dart' as tz;
 
 Future<int> scheduleReminderForDate(
-    FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin,
-    int id,
-    String body,
-    StudyNotification studyNotification,
-    NotificationDetails notificationDetails,) async {
+  FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin,
+  int id,
+  String body,
+  StudyNotification studyNotification,
+  NotificationDetails notificationDetails,
+) async {
   var currentId = id;
   final task = studyNotification.taskInstance.task;
   final date = studyNotification.date;
   for (final reminder in task.schedule.reminders) {
     // unlock time:  ${task.schedule.completionPeriods.firstWhere((cp) => cp.unlockTime.earlierThan(reminder)).lockTime}
-    final reminderTime = tz.TZDateTime(tz.local, date.year, date.month,
-        date.day, reminder.hour, reminder.minute,);
+    final reminderTime = tz.TZDateTime(
+      tz.local,
+      date.year,
+      date.month,
+      date.day,
+      reminder.hour,
+      reminder.minute,
+    );
     if (date.isSameDate(DateTime.now()) &&
         !StudyUTimeOfDay(hour: date.hour, minute: date.minute)
             .earlierThan(reminder, exact: true)) {
@@ -114,20 +121,31 @@ Future<void> scheduleNotifications(BuildContext context) async {
   var id = 0;
   for (final StudyNotification notification in studyNotificationList) {
     final currentId = await scheduleReminderForDate(
-        notificationsPlugin, id, body, notification, notificationDetails,);
+      notificationsPlugin,
+      id,
+      body,
+      notification,
+      notificationDetails,
+    );
     id = currentId;
   }
 }
 
 List<StudyNotification> _buildNotificationList(
-    StudySubject subject, DateTime date, List<TaskInstance> tasks,) {
+  StudySubject subject,
+  DateTime date,
+  List<TaskInstance> tasks,
+) {
   final List<StudyNotification> taskNotifications = [];
   for (final TaskInstance taskInstance in tasks) {
     if (taskInstance.task.title == null || taskInstance.task.title!.isEmpty) {
       return [];
     }
     if (!subject.completedTaskInstanceForDay(
-        taskInstance.task.id, taskInstance.completionPeriod, date,)) {
+      taskInstance.task.id,
+      taskInstance.completionPeriod,
+      date,
+    )) {
       taskNotifications.add(StudyNotification(taskInstance, date));
     } else {
       final String debugStr =
diff --git a/app/lib/util/study_subject_extension.dart b/app/lib/util/study_subject_extension.dart
index dc7f2ef04..edd51c827 100644
--- a/app/lib/util/study_subject_extension.dart
+++ b/app/lib/util/study_subject_extension.dart
@@ -12,7 +12,10 @@ extension StudySubjectExtension on StudySubject {
   }) async {
     final Result<T> resultObject = switch (result) {
       QuestionnaireState() => Result<T>.app(
-          type: 'QuestionnaireState', periodId: periodId, result: result,),
+          type: 'QuestionnaireState',
+          periodId: periodId,
+          result: result,
+        ),
       bool() => Result<T>.app(type: 'bool', periodId: periodId, result: result),
       _ => Result<T>.app(type: 'unknown', periodId: periodId, result: result),
     };
@@ -31,7 +34,9 @@ extension StudySubjectExtension on StudySubject {
           if (answer.response is FutureBlobFile) {
             final futureBlobFile = answer.response as FutureBlobFile;
             await TemporaryStorageHandler.moveStagingFileToUploadDirectory(
-                futureBlobFile.localFilePath, futureBlobFile.futureBlobId,);
+              futureBlobFile.localFilePath,
+              futureBlobFile.futureBlobId,
+            );
 
             // Replaces Answer<FutureBlobFile> with Answer<String>
             questionnaireState.answers[answerEntry.key] =
diff --git a/app/lib/util/temporary_storage_handler.dart b/app/lib/util/temporary_storage_handler.dart
index 9f8a9eca1..b2c35017b 100644
--- a/app/lib/util/temporary_storage_handler.dart
+++ b/app/lib/util/temporary_storage_handler.dart
@@ -38,14 +38,19 @@ class TemporaryStorageHandler {
   }
 
   static Future<void> moveStagingFileToUploadDirectory(
-      String stagingFilePath, String blobId,) async {
+    String stagingFilePath,
+    String blobId,
+  ) async {
     final stagingFile = File(stagingFilePath);
     final uploadDirectory = await _getMultimodalUploadDirectory();
-    final uploadFile = File(path.join(
+    final uploadFile = File(
+      path.join(
         uploadDirectory.path,
         [
           blobId,
-        ].join(),),);
+        ].join(),
+      ),
+    );
     await stagingFile.rename(uploadFile.path);
   }
 
@@ -95,9 +100,11 @@ class TemporaryStorageHandler {
     final temporaryMultimodalDirectory = await _getMultimodalTempDirectory();
     for (final file in await temporaryMultimodalDirectory
         .list()
-        .where((f) => path
-            .basename(f.path)
-            .startsWith(TemporaryStorageHandler._stagingBaseNamePrefix),)
+        .where(
+          (f) => path
+              .basename(f.path)
+              .startsWith(TemporaryStorageHandler._stagingBaseNamePrefix),
+        )
         .toList()) {
       await file.delete();
     }
diff --git a/app/lib/widgets/intervention_card.dart b/app/lib/widgets/intervention_card.dart
index 4a342fc14..326c5cf34 100644
--- a/app/lib/widgets/intervention_card.dart
+++ b/app/lib/widgets/intervention_card.dart
@@ -65,8 +65,10 @@ class InterventionCardTitle extends StatelessWidget {
     final theme = Theme.of(context);
     return ListTile(
       onTap: onTap,
-      leading: Icon(MdiIcons.fromString(intervention!.icon),
-          color: theme.colorScheme.secondary,),
+      leading: Icon(
+        MdiIcons.fromString(intervention!.icon),
+        color: theme.colorScheme.secondary,
+      ),
       trailing: showCheckbox
           ? Checkbox(
               value: selected,
@@ -78,8 +80,8 @@ class InterventionCardTitle extends StatelessWidget {
       title: Row(
         children: [
           Expanded(
-              child:
-                  Text(intervention!.name!, style: theme.textTheme.titleLarge),),
+            child: Text(intervention!.name!, style: theme.textTheme.titleLarge),
+          ),
           if (showDescriptionButton)
             IconButton(
               icon: const Icon(Icons.info_outline),
@@ -91,11 +93,15 @@ class InterventionCardTitle extends StatelessWidget {
                       : intervention!.description;
                   return AlertDialog(
                     title: ListTile(
-                      leading: Icon(MdiIcons.fromString(intervention!.icon),
-                          color: theme.colorScheme.secondary,),
+                      leading: Icon(
+                        MdiIcons.fromString(intervention!.icon),
+                        color: theme.colorScheme.secondary,
+                      ),
                       dense: true,
-                      title: Text(intervention!.name!,
-                          style: theme.textTheme.titleLarge,),
+                      title: Text(
+                        intervention!.name!,
+                        style: theme.textTheme.titleLarge,
+                      ),
                     ),
                     content: HtmlText(description),
                   );
@@ -140,8 +146,10 @@ class _TaskList extends StatelessWidget {
 
   String scheduleString(List<CompletionPeriod> schedules) {
     return schedules
-        .map((completionPeriod) =>
-            '${completionPeriod.unlockTime} - ${completionPeriod.lockTime}',)
+        .map(
+          (completionPeriod) =>
+              '${completionPeriod.unlockTime} - ${completionPeriod.lockTime}',
+        )
         .join(',');
   }
 
@@ -155,8 +163,10 @@ class _TaskList extends StatelessWidget {
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              Text(AppLocalizations.of(context)!.tasks_daily,
-                  style: theme.textTheme.bodyMedium,),
+              Text(
+                AppLocalizations.of(context)!.tasks_daily,
+                style: theme.textTheme.bodyMedium,
+              ),
             ],
           ),
         ),
@@ -173,19 +183,25 @@ class _TaskList extends StatelessWidget {
                   child: Row(
                     children: [
                       Expanded(
-                          child: Text(task.title!,
-                              style: theme.textTheme.bodyMedium,),),
+                        child: Text(
+                          task.title!,
+                          style: theme.textTheme.bodyMedium,
+                        ),
+                      ),
                       Row(
                         children: [
-                          Icon(Icons.access_time,
-                              size: 16,
-                              color: theme.textTheme.bodySmall!.color,),
+                          Icon(
+                            Icons.access_time,
+                            size: 16,
+                            color: theme.textTheme.bodySmall!.color,
+                          ),
                           const SizedBox(width: 4),
                           Text(
                             scheduleString(task.schedule.completionPeriods),
                             style: theme.textTheme.bodyMedium!.copyWith(
-                                fontSize: 12,
-                                color: theme.textTheme.bodySmall!.color,),
+                              fontSize: 12,
+                              color: theme.textTheme.bodySmall!.color,
+                            ),
                           ),
                         ],
                       ),
diff --git a/app/lib/widgets/questionnaire/image_capturing_question_widget.dart b/app/lib/widgets/questionnaire/image_capturing_question_widget.dart
index 105c8d2bd..1378bcbf1 100644
--- a/app/lib/widgets/questionnaire/image_capturing_question_widget.dart
+++ b/app/lib/widgets/questionnaire/image_capturing_question_widget.dart
@@ -12,8 +12,11 @@ class ImageCapturingQuestionWidget extends QuestionWidget {
   final ImageCapturingQuestion question;
   final Function(Answer<FutureBlobFile>)? onDone;
 
-  const ImageCapturingQuestionWidget(
-      {super.key, required this.question, this.onDone,});
+  const ImageCapturingQuestionWidget({
+    super.key,
+    required this.question,
+    this.onDone,
+  });
 
   @override
   State<ImageCapturingQuestionWidget> createState() =>
@@ -37,7 +40,8 @@ class _ImageCapturingQuestionWidgetState
       style: OutlinedButton.styleFrom(
         foregroundColor: theme.colorScheme.primary,
         side: BorderSide(
-            color: _hasCaptured ? Colors.black38 : theme.colorScheme.primary,),
+          color: _hasCaptured ? Colors.black38 : theme.colorScheme.primary,
+        ),
       ),
       onPressed: !_hasCaptured
           ? () async {
@@ -74,20 +78,25 @@ class _ImageCapturingQuestionWidgetState
 
   Future<void> _captureImage() async {
     if (kIsWeb) {
-      ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-        content: Text(AppLocalizations.of(context)!.multimodal_not_supported),
-      ),);
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(AppLocalizations.of(context)!.multimodal_not_supported),
+        ),
+      );
       return;
     }
     final appState = context.read<AppState>();
-    final FutureBlobFile? imageFile = await Navigator.push(context, MaterialPageRoute(
-      builder: (context) {
-        return CapturePictureScreen(
-          studyId: appState.activeSubject!.studyId,
-          userId: appState.activeSubject!.userId,
-        );
-      },
-    ),);
+    final FutureBlobFile? imageFile = await Navigator.push(
+      context,
+      MaterialPageRoute(
+        builder: (context) {
+          return CapturePictureScreen(
+            studyId: appState.activeSubject!.studyId,
+            userId: appState.activeSubject!.userId,
+          );
+        },
+      ),
+    );
     if (imageFile != null) {
       setState(() {
         _hasCaptured = true;
diff --git a/app/lib/widgets/questionnaire/question_container.dart b/app/lib/widgets/questionnaire/question_container.dart
index 2b325648d..47002622d 100644
--- a/app/lib/widgets/questionnaire/question_container.dart
+++ b/app/lib/widgets/questionnaire/question_container.dart
@@ -17,11 +17,12 @@ class QuestionContainer extends StatefulWidget {
   final Question question;
   final int index;
 
-  const QuestionContainer(
-      {required this.onDone,
-      required this.question,
-      required this.index,
-      super.key,});
+  const QuestionContainer({
+    required this.onDone,
+    required this.question,
+    required this.index,
+    super.key,
+  });
 
   @override
   State<StatefulWidget> createState() => _QuestionContainerState();
@@ -81,7 +82,8 @@ class _QuestionContainerState extends State<QuestionContainer>
         );
       default:
         throw ArgumentError(
-            'Question type ${widget.question.type} not supported',);
+          'Question type ${widget.question.type} not supported',
+        );
     }
   }
 
diff --git a/app/lib/widgets/questionnaire/questionnaire_widget.dart b/app/lib/widgets/questionnaire/questionnaire_widget.dart
index 152a09e94..c0f12d7f5 100644
--- a/app/lib/widgets/questionnaire/questionnaire_widget.dart
+++ b/app/lib/widgets/questionnaire/questionnaire_widget.dart
@@ -46,7 +46,8 @@ class _QuestionnaireWidgetState extends State<QuestionnaireWidget> {
   void _invalidateDownstreamAnswers(int index) {
     if (index < shownQuestions.length - 1) {
       final startIndex = widget.questions.indexWhere(
-          (question) => question.id == shownQuestions[index].question.id,);
+        (question) => question.id == shownQuestions[index].question.id,
+      );
       widget.questions
           .skip(startIndex + 1)
           .forEach((question) => qs.answers.remove(question.id));
@@ -101,12 +102,15 @@ class _QuestionnaireWidgetState extends State<QuestionnaireWidget> {
       // check for conditional questions
       if (!widget.questions[_nextQuestionIndex].shouldBeShown(qs)) {
         _onQuestionDone(
-            widget.questions[_nextQuestionIndex].getDefaultAnswer()!,
-            shownQuestions.length,);
+          widget.questions[_nextQuestionIndex].getDefaultAnswer()!,
+          shownQuestions.length,
+        );
         return;
       }
       _insertQuestion(widget.questions[_nextQuestionIndex]);
-      _listKey.currentState!.insertItem(shownQuestions.length - 1,);
+      _listKey.currentState!.insertItem(
+        shownQuestions.length - 1,
+      );
       _nextQuestionIndex++;
     } else {
       // we ran out of questions
diff --git a/app/lib/widgets/questionnaire/questions/annotated_scale_question_widget.dart b/app/lib/widgets/questionnaire/questions/annotated_scale_question_widget.dart
index 129c96699..deeceb822 100644
--- a/app/lib/widgets/questionnaire/questions/annotated_scale_question_widget.dart
+++ b/app/lib/widgets/questionnaire/questions/annotated_scale_question_widget.dart
@@ -8,8 +8,11 @@ class AnnotatedScaleQuestionWidget extends QuestionWidget {
   final AnnotatedScaleQuestion question;
   final Function(Answer)? onDone;
 
-  const AnnotatedScaleQuestionWidget(
-      {super.key, required this.question, this.onDone,});
+  const AnnotatedScaleQuestionWidget({
+    super.key,
+    required this.question,
+    this.onDone,
+  });
 
   @override
   State<AnnotatedScaleQuestionWidget> createState() =>
diff --git a/app/lib/widgets/questionnaire/questions/choice_question_widget.dart b/app/lib/widgets/questionnaire/questions/choice_question_widget.dart
index af3772623..17171df6a 100644
--- a/app/lib/widgets/questionnaire/questions/choice_question_widget.dart
+++ b/app/lib/widgets/questionnaire/questions/choice_question_widget.dart
@@ -9,11 +9,12 @@ class ChoiceQuestionWidget extends QuestionWidget {
   final Function(Answer) onDone;
   final String multiSelectionText;
 
-  const ChoiceQuestionWidget(
-      {super.key,
-      required this.question,
-      required this.onDone,
-      required this.multiSelectionText,});
+  const ChoiceQuestionWidget({
+    super.key,
+    required this.question,
+    required this.onDone,
+    required this.multiSelectionText,
+  });
 
   @override
   State<ChoiceQuestionWidget> createState() => _ChoiceQuestionWidgetState();
@@ -65,7 +66,8 @@ class _ChoiceQuestionWidgetState extends State<ChoiceQuestionWidget> {
           onPressed: confirm,
           style: ButtonStyle(
             backgroundColor: WidgetStateProperty.all<Color>(
-                Theme.of(context).colorScheme.secondary,),
+              Theme.of(context).colorScheme.secondary,
+            ),
             foregroundColor: WidgetStateProperty.all<Color>(Colors.white),
           ),
           child: Text(AppLocalizations.of(context)!.confirm),
diff --git a/app/lib/widgets/questionnaire/questions/free_text_question_widget.dart b/app/lib/widgets/questionnaire/questions/free_text_question_widget.dart
index 7e5e5f4f8..cf5a71d6c 100644
--- a/app/lib/widgets/questionnaire/questions/free_text_question_widget.dart
+++ b/app/lib/widgets/questionnaire/questions/free_text_question_widget.dart
@@ -7,8 +7,11 @@ class FreeTextQuestionWidget extends QuestionWidget {
   final FreeTextQuestion question;
   final Function(Answer)? onDone;
 
-  const FreeTextQuestionWidget(
-      {super.key, required this.question, this.onDone,});
+  const FreeTextQuestionWidget({
+    super.key,
+    required this.question,
+    this.onDone,
+  });
 
   @override
   State<FreeTextQuestionWidget> createState() => _FreeTextQuestionWidgetState();
diff --git a/app/lib/widgets/questionnaire/questions/scale_question_widget.dart b/app/lib/widgets/questionnaire/questions/scale_question_widget.dart
index 20efe2d20..7cb147592 100644
--- a/app/lib/widgets/questionnaire/questions/scale_question_widget.dart
+++ b/app/lib/widgets/questionnaire/questions/scale_question_widget.dart
@@ -48,8 +48,11 @@ class _ScaleQuestionWidgetState extends State<ScaleQuestionWidget> {
     final theme = Theme.of(context);
     final coloredSliderTheme = ThemeConfig.coloredSliderTheme(theme);
     final thumbColor = isColored
-        ? Color.lerp(minColor, maxColor,
-                (value! - widget.question.minimum) / sliderRange,)!
+        ? Color.lerp(
+            minColor,
+            maxColor,
+            (value! - widget.question.minimum) / sliderRange,
+          )!
             .withOpacity(1)
         : null;
     final activeTrackColor =
@@ -62,38 +65,39 @@ class _ScaleQuestionWidgetState extends State<ScaleQuestionWidget> {
         Stack(
           children: [
             Theme(
-                data: isColored
-                    ? theme.copyWith(
-                        sliderTheme: SliderThemeData(
-                          overlayColor: thumbColor!.withOpacity(0.5),
-                        ),
-                      )
-                    : theme,
-                child: CustomSlider(
-                  minValue: widget.question.minimum,
-                  maxValue: widget.question.maximum,
-                  value: value,
-                  minorTick: 0,
-                  labelValuePrecision: 0,
-                  tickValuePrecision: 0,
-                  onChanged: (val) => setState(() {
-                    value = val;
-                    //print('Slider value (linear): $value');
-                  }),
-                  onChangeEnd: (val) => setState(() {
-                    value = val;
-                    sliderTouched = true;
-                    widget.onDone!(widget.question.constructAnswer(value!));
-                  }),
-                  activeColor: activeTrackColor,
-                  inactiveColor: inactiveTrackColor,
-                  thumbColor: thumbColor,
-                  minColor: minColor,
-                  maxColor: maxColor,
-                  isColored: isColored,
-                  linearStep: false,
-                  steps: widget.question,
-                ),),
+              data: isColored
+                  ? theme.copyWith(
+                      sliderTheme: SliderThemeData(
+                        overlayColor: thumbColor!.withOpacity(0.5),
+                      ),
+                    )
+                  : theme,
+              child: CustomSlider(
+                minValue: widget.question.minimum,
+                maxValue: widget.question.maximum,
+                value: value,
+                minorTick: 0,
+                labelValuePrecision: 0,
+                tickValuePrecision: 0,
+                onChanged: (val) => setState(() {
+                  value = val;
+                  //print('Slider value (linear): $value');
+                }),
+                onChangeEnd: (val) => setState(() {
+                  value = val;
+                  sliderTouched = true;
+                  widget.onDone!(widget.question.constructAnswer(value!));
+                }),
+                activeColor: activeTrackColor,
+                inactiveColor: inactiveTrackColor,
+                thumbColor: thumbColor,
+                minColor: minColor,
+                maxColor: maxColor,
+                isColored: isColored,
+                linearStep: false,
+                steps: widget.question,
+              ),
+            ),
           ],
         ),
         if (!sliderTouched)
diff --git a/app/lib/widgets/selectable_button.dart b/app/lib/widgets/selectable_button.dart
index d5c74084b..b6d5c0e89 100644
--- a/app/lib/widgets/selectable_button.dart
+++ b/app/lib/widgets/selectable_button.dart
@@ -5,8 +5,12 @@ class SelectableButton extends StatelessWidget {
   final bool selected;
   final Function()? onTap;
 
-  const SelectableButton(
-      {super.key, required this.child, this.selected = false, this.onTap,});
+  const SelectableButton({
+    super.key,
+    required this.child,
+    this.selected = false,
+    this.onTap,
+  });
 
   Color _getFillColor(ThemeData theme) =>
       selected ? theme.primaryColor : theme.cardColor;
diff --git a/app/lib/widgets/study_tile.dart b/app/lib/widgets/study_tile.dart
index 965badb09..9650ec40b 100644
--- a/app/lib/widgets/study_tile.dart
+++ b/app/lib/widgets/study_tile.dart
@@ -20,12 +20,12 @@ class StudyTile extends StatelessWidget {
     super.key,
   });
 
-  StudyTile.fromStudy(
-      {required Study study,
-      this.onTap,
-      this.contentPadding = const EdgeInsets.all(16),
-      super.key,})
-      : title = study.title,
+  StudyTile.fromStudy({
+    required Study study,
+    this.onTap,
+    this.contentPadding = const EdgeInsets.all(16),
+    super.key,
+  })  : title = study.title,
         description = study.description,
         iconName = study.iconName;
 
@@ -48,9 +48,12 @@ class StudyTile extends StatelessWidget {
           contentPadding: contentPadding,
           onTap: onTap,
           title: Center(
-              child: Text(title!,
-                  style: theme.textTheme.titleLarge!
-                      .copyWith(color: theme.primaryColor),),),
+            child: Text(
+              title!,
+              style: theme.textTheme.titleLarge!
+                  .copyWith(color: theme.primaryColor),
+            ),
+          ),
           subtitle: Center(child: Text(description ?? '')),
           leading:
               Icon(MdiIcons.fromString(iconName), color: theme.primaryColor),
diff --git a/flutter_common/lib/src/utils/retry_future_builder.dart b/flutter_common/lib/src/utils/retry_future_builder.dart
index 02deffb59..6f643b608 100644
--- a/flutter_common/lib/src/utils/retry_future_builder.dart
+++ b/flutter_common/lib/src/utils/retry_future_builder.dart
@@ -25,7 +25,10 @@ SOFTWARE.
 import 'package:flutter/material.dart';
 
 typedef CustomErrorWidgetBuilder = Widget Function(
-    BuildContext context, dynamic error, void Function() reload,);
+  BuildContext context,
+  dynamic error,
+  void Function() reload,
+);
 
 class RetryFutureBuilder<T> extends StatefulWidget {
   static RetryFutureBuilderState? of(BuildContext context) =>
@@ -95,7 +98,10 @@ class RetryFutureBuilderState<T> extends State<RetryFutureBuilder<T>> {
               // ignore: only_throw_errors
               if (widget.errorWidgetBuilder != null) {
                 return widget.errorWidgetBuilder!(
-                    context, snapshot.error, reload,);
+                  context,
+                  snapshot.error,
+                  reload,
+                );
               }
               return buildErrorView(context, snapshot.error);
             }
@@ -127,7 +133,8 @@ class RetryFutureBuilderState<T> extends State<RetryFutureBuilder<T>> {
               // todo translate
               label: const Text('Retry'),
               style: ElevatedButton.styleFrom(
-                  backgroundColor: theme.colorScheme.secondary,),
+                backgroundColor: theme.colorScheme.secondary,
+              ),
             ),
             ...widget.extraWidgets,
           ],
diff --git a/flutter_common/lib/src/utils/storage.dart b/flutter_common/lib/src/utils/storage.dart
index 027e3f0cd..04d8de141 100755
--- a/flutter_common/lib/src/utils/storage.dart
+++ b/flutter_common/lib/src/utils/storage.dart
@@ -23,7 +23,9 @@ class SupabaseStorage extends LocalStorage {
   @override
   Future<void> persistSession(String persistSessionString) async {
     return await SecureStorage.write(
-        supabasePersistSessionKey, persistSessionString,);
+      supabasePersistSessionKey,
+      persistSessionString,
+    );
   }
 
   @override
@@ -89,7 +91,8 @@ class SecureStorage {
         await storage.write(key: key, value: value.toString());
         await prefs.remove(key);
         StudyULogger.info(
-            "Migrated key $key from SharedPreferences to FlutterSecureStorage.",);
+          "Migrated key $key from SharedPreferences to FlutterSecureStorage.",
+        );
       }
     }
   }

From 4df9ecf504f04a9e01970b7af860c9d5e27a5966 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 12 Jun 2024 11:48:25 +0200
Subject: [PATCH 178/314] chore(release): publish packages

 - studyu_app@2.7.6-dev.2
 - studyu_core@4.4.3-dev.1
 - studyu_designer_v2@1.8.1-dev.2
 - studyu_flutter_common@1.8.4-dev.1
---
 CHANGELOG.md                | 53 +++++++++++++++++++++++++++++++++++++
 app/CHANGELOG.md            | 12 +++++++++
 app/pubspec.yaml            |  6 ++---
 core/CHANGELOG.md           |  6 +++++
 core/pubspec.yaml           |  2 +-
 designer_v2/CHANGELOG.md    | 11 ++++++++
 designer_v2/pubspec.yaml    |  6 ++---
 flutter_common/CHANGELOG.md |  4 +++
 flutter_common/pubspec.yaml |  4 +--
 9 files changed, 95 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecf0c4b57..1dcb3ad06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,59 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2024-06-12
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`studyu_app` - `v2.7.6-dev.2`](#studyu_app---v276-dev2)
+ - [`studyu_core` - `v4.4.3-dev.1`](#studyu_core---v443-dev1)
+ - [`studyu_designer_v2` - `v1.8.1-dev.2`](#studyu_designer_v2---v181-dev2)
+ - [`studyu_flutter_common` - `v1.8.4-dev.1`](#studyu_flutter_common---v184-dev1)
+
+---
+
+#### `studyu_app` - `v2.7.6-dev.2`
+
+ - **FIX**: formatting issues.
+ - **FIX**(app): update ios deployment.
+ - **FIX**(app): update android deployment.
+ - **FIX**: upgrade deps.
+ - **FIX**(app): update ios deployment.
+ - **FIX**(app): update android deployment.
+ - **FIX**(app): update android deployment.
+ - **FIX**(app): update ios deployment.
+ - **FIX**(app): update android deployment.
+
+#### `studyu_core` - `v4.4.3-dev.1`
+
+ - **PERF**: improve dashboard study fetching.
+ - **FIX**: formatting issues.
+ - **FIX**: upgrade deps.
+
+#### `studyu_designer_v2` - `v1.8.1-dev.2`
+
+ - **PERF**: added comments to the getUserStudies function.
+ - **PERF**: improve dashboard study fetching.
+ - **FIX**: add emojis again.
+ - **FIX**: integration test sign out.
+ - **FIX**: check if canPop.
+ - **FIX**: upgrade deps.
+ - **FIX**: add compatibility for emoji font with flutter >= 3.22.
+ - **FIX**: Flutter 3.22 arg error.
+
+#### `studyu_flutter_common` - `v1.8.4-dev.1`
+
+ - **FIX**: formatting issues.
+
+
 ## 2024-06-09
 
 ### Changes
diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md
index 70a4072d2..7530e8eea 100644
--- a/app/CHANGELOG.md
+++ b/app/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 2.7.6-dev.2
+
+ - **FIX**: formatting issues.
+ - **FIX**(app): update ios deployment.
+ - **FIX**(app): update android deployment.
+ - **FIX**: upgrade deps.
+ - **FIX**(app): update ios deployment.
+ - **FIX**(app): update android deployment.
+ - **FIX**(app): update android deployment.
+ - **FIX**(app): update ios deployment.
+ - **FIX**(app): update android deployment.
+
 ## 2.7.6-dev.1
 
  - **FIX**(app): update android deployment.
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 354692dfd..9e253d580 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_app
-version: 2.7.6-dev.1
+version: 2.7.6-dev.2
 description: Partake in digital N-of-1 trials with the innovative StudyU Health App
 publish_to: none
 homepage: https://studyu.health
@@ -39,8 +39,8 @@ dependencies:
   sentry_flutter: ^8.2.0
   sentry_logging: ^8.2.0
   shared_preferences: ^2.2.3
-  studyu_core: ^4.4.3-dev.0
-  studyu_flutter_common: ^1.8.4-dev.0
+  studyu_core: ^4.4.3-dev.1
+  studyu_flutter_common: ^1.8.4-dev.1
   supabase: ^2.2.1
   supabase_flutter: ^2.5.5
   timeline_tile: ^2.0.0
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index e0bc5355a..7ab7608e7 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 4.4.3-dev.1
+
+ - **PERF**: improve dashboard study fetching.
+ - **FIX**: formatting issues.
+ - **FIX**: upgrade deps.
+
 ## 4.4.3-dev.0
 
  - **FIX**: upgrade deps.
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index 906a38ef0..4ce8cb6b3 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_core
-version: 4.4.3-dev.0
+version: 4.4.3-dev.1
 description: This package contains StudyU models and common functions for the app and designer packages
 homepage: https://studyu.health
 repository: https://github.com/hpi-studyu/studyu
diff --git a/designer_v2/CHANGELOG.md b/designer_v2/CHANGELOG.md
index ede9b6201..290a2e136 100644
--- a/designer_v2/CHANGELOG.md
+++ b/designer_v2/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 1.8.1-dev.2
+
+ - **PERF**: added comments to the getUserStudies function.
+ - **PERF**: improve dashboard study fetching.
+ - **FIX**: add emojis again.
+ - **FIX**: integration test sign out.
+ - **FIX**: check if canPop.
+ - **FIX**: upgrade deps.
+ - **FIX**: add compatibility for emoji font with flutter >= 3.22.
+ - **FIX**: Flutter 3.22 arg error.
+
 ## 1.8.1-dev.1
 
  - **FIX**: add emojis again.
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 99b632c2d..bdb64b94d 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_designer_v2
-version: 1.8.1-dev.1
+version: 1.8.1-dev.2
 description: Implement digital N-of-1 studies seamlessly with the StudyU Health Designer
 publish_to: none
 homepage: https://studyu.health
@@ -32,8 +32,8 @@ dependencies:
   reactive_multi_select_flutter: ^2.0.1
   reactive_range_slider: ^2.1.0
   rxdart: ^0.27.7
-  studyu_core: ^4.4.3-dev.0
-  studyu_flutter_common: ^1.8.4-dev.0
+  studyu_core: ^4.4.3-dev.1
+  studyu_flutter_common: ^1.8.4-dev.1
   supabase: ^2.2.1
   supabase_flutter: ^2.5.5
   url_launcher: ^6.3.0
diff --git a/flutter_common/CHANGELOG.md b/flutter_common/CHANGELOG.md
index aed61c52d..8270fbf4e 100644
--- a/flutter_common/CHANGELOG.md
+++ b/flutter_common/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.8.4-dev.1
+
+ - **FIX**: formatting issues.
+
 ## 1.8.4-dev.0
 
  - **FIX**: upgrade deps.
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index 60ebd4864..ecbf64418 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_flutter_common
-version: 1.8.4-dev.0
+version: 1.8.4-dev.1
 description: StudyU common flutter components and functions for app and designer
 homepage: https://studyu.health
 repository: https://github.com/hpi-studyu/studyu
@@ -14,7 +14,7 @@ dependencies:
   flutter_secure_storage: ^9.2.2
   lint: ^2.3.0
   shared_preferences: ^2.2.3 # Can be removed after migrating phase
-  studyu_core: ^4.4.3-dev.0
+  studyu_core: ^4.4.3-dev.1
   supabase_flutter: ^2.5.5
   synchronized: ^3.1.0+1
   uuid: ^4.4.0

From bfa53a0590acbd2804c503252a665da036f60f7a Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 12 Jun 2024 11:49:03 +0200
Subject: [PATCH 179/314] chore: lock files

---
 app/pubspec.lock            | 4 ++--
 designer_v2/pubspec.lock    | 4 ++--
 flutter_common/pubspec.lock | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index 4c6f843f7..1beac440d 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -1184,14 +1184,14 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.3-dev.0"
+    version: "4.4.3-dev.1"
   studyu_flutter_common:
     dependency: "direct main"
     description:
       path: "../flutter_common"
       relative: true
     source: path
-    version: "1.8.4-dev.0"
+    version: "1.8.4-dev.1"
   supabase:
     dependency: "direct main"
     description:
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index cf52db3eb..4e039e46f 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -1047,14 +1047,14 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.3-dev.0"
+    version: "4.4.3-dev.1"
   studyu_flutter_common:
     dependency: "direct main"
     description:
       path: "../flutter_common"
       relative: true
     source: path
-    version: "1.8.4-dev.0"
+    version: "1.8.4-dev.1"
   supabase:
     dependency: "direct main"
     description:
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index c48f1497e..85000a2c7 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -555,7 +555,7 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.3-dev.0"
+    version: "4.4.3-dev.1"
   supabase:
     dependency: transitive
     description:

From 7d50c118d8dfecdad1d70380195d0f1ef939d8f6 Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Wed, 12 Jun 2024 14:57:52 +0200
Subject: [PATCH 180/314] chore: remove heading

---
 .../lib/features/monitor/participant_details_view.dart       | 5 -----
 designer_v2/pubspec.yaml                                     | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index f65209b71..a3afcc54d 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -24,11 +24,6 @@ class ParticipantDetailsView extends ConsumerWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text(
-          tr.participant_details_study_days_overview,
-          style: Theme.of(context).textTheme.titleLarge,
-        ),
-        const SizedBox(height: 8.0),
         _buildParticipantInfo(languageCode),
         const SizedBox(height: 8.0),
         const Divider(),
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 53cef975d..dcc7e8624 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -11,7 +11,7 @@ environment:
 dependencies:
   archive: ^3.5.1
   async: ^2.11.0
-  collection:
+  collection: ^1.18.0
   csv: ^6.0.0
   cupertino_icons: ^1.0.8
   dynamic_color:

From 704273f0000d943ef0b15f7601b1d91fa196cf68 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 12 Jun 2024 14:51:33 +0200
Subject: [PATCH 181/314] chore: format

---
 .../study/tasks/observation/questionnaire_task_widget.dart    | 2 +-
 core/lib/src/models/tables/study.dart                         | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart b/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart
index 699d8a347..fe551f9d5 100644
--- a/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart
+++ b/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart
@@ -6,8 +6,8 @@ import 'package:studyu_app/screens/study/tasks/task_screen.dart';
 import 'package:studyu_app/util/misc.dart';
 import 'package:studyu_app/util/study_subject_extension.dart';
 import 'package:studyu_app/util/temporary_storage_handler.dart';
-import 'package:studyu_core/core.dart';
 import 'package:studyu_app/widgets/questionnaire/questionnaire_widget.dart';
+import 'package:studyu_core/core.dart';
 
 class QuestionnaireTaskWidget extends StatefulWidget {
   final QuestionnaireTask task;
diff --git a/core/lib/src/models/tables/study.dart b/core/lib/src/models/tables/study.dart
index 4035bf495..9a5106c7c 100644
--- a/core/lib/src/models/tables/study.dart
+++ b/core/lib/src/models/tables/study.dart
@@ -110,7 +110,9 @@ class Study extends SupabaseObjectFunctions<Study>
     if (json == null) {
       return [];
     }
-    return (json as List).map((e) => EligibilityCriterion.fromJson(e as Map<String, dynamic>)).toList();
+    return (json as List)
+        .map((e) => EligibilityCriterion.fromJson(e as Map<String, dynamic>))
+        .toList();
   }
 
   static Contact _contactFromJson(dynamic json) {

From e27a58027240ffd52906ba61c3f938b1d6c369a0 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 12 Jun 2024 15:30:48 +0200
Subject: [PATCH 182/314] chore: format

---
 core/lib/src/models/tables/study.dart         |  7 ++++--
 core/lib/src/models/tables/study_subject.dart |  4 +++-
 .../lib/common_views/action_popup_menu.dart   | 24 +++++++++----------
 .../close/study_close_dialog_confirm.dart     |  3 ++-
 .../close/study_close_dialog_success.dart     |  3 ++-
 .../lib/features/dialogs/study_dialogs.dart   | 11 ++++++---
 .../features/recruit/study_recruit_page.dart  |  4 ++--
 .../study/study_controller_state.dart         |  9 ++++---
 .../lib/features/study/study_scaffold.dart    | 11 +++++----
 .../features/study/study_status_badge.dart    |  1 -
 designer_v2/lib/utils/model_action.dart       |  7 +++---
 11 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/core/lib/src/models/tables/study.dart b/core/lib/src/models/tables/study.dart
index b59c87ecc..c08a5acb8 100644
--- a/core/lib/src/models/tables/study.dart
+++ b/core/lib/src/models/tables/study.dart
@@ -241,8 +241,11 @@ class Study extends SupabaseObjectFunctions<Study>
   static Future<ExtractionResult<Study>> publishedPublicStudies() async {
     ExtractionResult<Study> result;
     try {
-      final response =
-          await env.client.from(tableName).select().eq('participation', 'open').neq('status', StudyStatus.closed.name);
+      final response = await env.client
+          .from(tableName)
+          .select()
+          .eq('participation', 'open')
+          .neq('status', StudyStatus.closed.name);
       final extracted = SupabaseQuery.extractSupabaseList<Study>(
         List<Map<String, dynamic>>.from(response),
       );
diff --git a/core/lib/src/models/tables/study_subject.dart b/core/lib/src/models/tables/study_subject.dart
index 9e90e86f9..5fe742721 100644
--- a/core/lib/src/models/tables/study_subject.dart
+++ b/core/lib/src/models/tables/study_subject.dart
@@ -298,7 +298,9 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   Future<StudySubject> save({bool onlyUpdate = false}) async {
     try {
       final tableQuery = env.client.from(tableName);
-      final query = onlyUpdate ? tableQuery.update(toJson()).eq("id", id) : tableQuery.upsert(toJson());
+      final query = onlyUpdate
+          ? tableQuery.update(toJson()).eq("id", id)
+          : tableQuery.upsert(toJson());
       final response = await query.select();
       final json = toFullJson(
         partialJson: List<Map<String, dynamic>>.from(response).single,
diff --git a/designer_v2/lib/common_views/action_popup_menu.dart b/designer_v2/lib/common_views/action_popup_menu.dart
index 7f1aa602a..e4144f23b 100644
--- a/designer_v2/lib/common_views/action_popup_menu.dart
+++ b/designer_v2/lib/common_views/action_popup_menu.dart
@@ -86,15 +86,15 @@ class ActionPopUpMenuButton extends StatelessWidget {
       itemBuilder: (BuildContext context) {
         final textTheme = theme.textTheme.labelMedium!;
         final List<PopupMenuEntry> popupList = [];
-          for (final action in actions) {
-            if (action.isSeparator) {
-              popupList.add(const PopupMenuDivider());
-              continue;
-            }
-            popupList.add(PopupMenuItem(
-              value: action,
-              child: ListTile(
-                contentPadding: const EdgeInsets.symmetric(horizontal: 8.0),
+        for (final action in actions) {
+          if (action.isSeparator) {
+            popupList.add(const PopupMenuDivider());
+            continue;
+          }
+          popupList.add(PopupMenuItem(
+            value: action,
+            child: ListTile(
+              contentPadding: const EdgeInsets.symmetric(horizontal: 8.0),
               horizontalTitleGap: 4.0,
               leading: (action.icon == null)
                   ? const SizedBox.shrink()
@@ -112,9 +112,9 @@ class ActionPopUpMenuButton extends StatelessWidget {
                   : Text(action.label, style: textTheme),
             ),
           ));
-            continue;
-          }
-          return popupList;
+          continue;
+        }
+        return popupList;
       },
     );
   }
diff --git a/designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart b/designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart
index d0ddf8ca9..b80bf76ce 100644
--- a/designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart
+++ b/designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart
@@ -15,7 +15,8 @@ class CloseConfirmationDialog extends StudyPageWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final controller = ref.watch(studyControllerProvider(studyId).notifier);
-    final formViewModel = ref.watch(studySettingsFormViewModelProvider(studyId));
+    final formViewModel =
+        ref.watch(studySettingsFormViewModelProvider(studyId));
 
     return ReactiveForm(
       formGroup: formViewModel.form,
diff --git a/designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart b/designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart
index 47e852758..435d71b9e 100644
--- a/designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart
+++ b/designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart
@@ -21,7 +21,8 @@ class CloseSuccessDialog extends StudyPageWidget {
           EmptyBody(
             leading: Text("\u{1f512}".hardcoded,
                 style: theme.textTheme.displayLarge?.copyWith(
-                  fontSize: (theme.textTheme.displayLarge?.fontSize ?? 48.0) * 1.5,
+                  fontSize:
+                      (theme.textTheme.displayLarge?.fontSize ?? 48.0) * 1.5,
                 )),
             title: tr.notification_study_closed,
             description: tr.notification_study_closed_description,
diff --git a/designer_v2/lib/features/dialogs/study_dialogs.dart b/designer_v2/lib/features/dialogs/study_dialogs.dart
index bd22ccf7e..8919b08a1 100644
--- a/designer_v2/lib/features/dialogs/study_dialogs.dart
+++ b/designer_v2/lib/features/dialogs/study_dialogs.dart
@@ -22,14 +22,19 @@ class StudyDialog extends StudyPageWidget {
 
     switch (dialogType) {
       case StudyDialogType.publish:
-        return state.isPublished ? PublishSuccessDialog(studyId) : PublishConfirmationDialog(studyId);
+        return state.isPublished
+            ? PublishSuccessDialog(studyId)
+            : PublishConfirmationDialog(studyId);
       case StudyDialogType.close:
-        return state.isClosed ? CloseSuccessDialog(studyId) : CloseConfirmationDialog(studyId);
+        return state.isClosed
+            ? CloseSuccessDialog(studyId)
+            : CloseConfirmationDialog(studyId);
     }
   }
 }
 
-showStudyDialog(BuildContext context, StudyID studyId, StudyDialogType dialogType) {
+showStudyDialog(
+    BuildContext context, StudyID studyId, StudyDialogType dialogType) {
   final theme = Theme.of(context);
   return showDialog(
     context: context,
diff --git a/designer_v2/lib/features/recruit/study_recruit_page.dart b/designer_v2/lib/features/recruit/study_recruit_page.dart
index ba7d7863f..51e0eefa7 100644
--- a/designer_v2/lib/features/recruit/study_recruit_page.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_page.dart
@@ -105,12 +105,12 @@ class StudyRecruitScreen extends StudyPageWidget {
           ? null
           : () {
               final formViewModel =
-            ref.read(inviteCodeFormViewModelProvider(studyId));
+                  ref.read(inviteCodeFormViewModelProvider(studyId));
               showFormSideSheet<InviteCodeFormViewModel>(
                 context: context,
                 formViewModel: formViewModel,
                 formViewBuilder: (formViewModel) =>
-              InviteCodeFormView(formViewModel: formViewModel),
+                    InviteCodeFormView(formViewModel: formViewModel),
               );
             },
     );
diff --git a/designer_v2/lib/features/study/study_controller_state.dart b/designer_v2/lib/features/study/study_controller_state.dart
index c0edb56e1..9cb3278aa 100644
--- a/designer_v2/lib/features/study/study_controller_state.dart
+++ b/designer_v2/lib/features/study/study_controller_state.dart
@@ -16,9 +16,11 @@ class StudyControllerState extends StudyControllerBaseState
     this.lastSynced,
   });
 
-  bool get isPublished => study.value != null && study.value!.status == StudyStatus.running;
+  bool get isPublished =>
+      study.value != null && study.value!.status == StudyStatus.running;
 
-  bool get isClosed => study.value != null && study.value!.status == StudyStatus.closed;
+  bool get isClosed =>
+      study.value != null && study.value!.status == StudyStatus.closed;
 
   // - ISyncIndicatorViewModel
 
@@ -79,7 +81,8 @@ class StudyControllerState extends StudyControllerBaseState
 
   @override
   bool get isClosedVisible =>
-      studyWithMetadata?.model.status == StudyStatus.running && studyWithMetadata!.model.canEdit(super.currentUser);
+      studyWithMetadata?.model.status == StudyStatus.running &&
+      studyWithMetadata!.model.canEdit(super.currentUser);
 
   @override
   StudyStatus? get studyStatus => study.value?.status;
diff --git a/designer_v2/lib/features/study/study_scaffold.dart b/designer_v2/lib/features/study/study_scaffold.dart
index 3e48a5d72..3bfaaaaca 100644
--- a/designer_v2/lib/features/study/study_scaffold.dart
+++ b/designer_v2/lib/features/study/study_scaffold.dart
@@ -12,6 +12,7 @@ import 'package:studyu_designer_v2/common_views/utils.dart';
 import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/features/app_drawer.dart';
 import 'package:studyu_designer_v2/features/design/study_form_providers.dart';
+import 'package:studyu_designer_v2/features/dialogs/study_dialogs.dart';
 import 'package:studyu_designer_v2/features/forms/form_validation.dart';
 import 'package:studyu_designer_v2/features/study/study_controller.dart';
 import 'package:studyu_designer_v2/features/study/study_controller_state.dart';
@@ -20,7 +21,6 @@ import 'package:studyu_designer_v2/features/study/study_page_view.dart';
 import 'package:studyu_designer_v2/features/study/study_status_badge.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/theme.dart';
-import 'package:studyu_designer_v2/features/dialogs/study_dialogs.dart';
 
 abstract class IStudyAppBarViewModel
     implements IStudyStatusBadgeViewModel, IStudyNavViewModel {
@@ -243,7 +243,8 @@ class _StudyScaffoldState extends ConsumerState<StudyScaffold> {
                   "${tr.form_invalid_prompt}\n\n${form.validationErrorSummary}",
               icon: null,
               enabled: formViewModel.isValid,
-              onPressed: () => showStudyDialog(context, widget.studyId, StudyDialogType.publish),
+              onPressed: () => showStudyDialog(
+                  context, widget.studyId, StudyDialogType.publish),
             );
           },
         ),
@@ -253,7 +254,8 @@ class _StudyScaffoldState extends ConsumerState<StudyScaffold> {
     }
 
     if (state.isClosedVisible) {
-      final formViewModel = ref.watch(studyPublishValidatorProvider(widget.studyId));
+      final formViewModel =
+          ref.watch(studyPublishValidatorProvider(widget.studyId));
       final closeButton = ReactiveForm(
         formGroup: formViewModel.form,
         child: ReactiveFormConsumer(
@@ -262,7 +264,8 @@ class _StudyScaffoldState extends ConsumerState<StudyScaffold> {
           return SecondaryButton(
             text: tr.action_button_study_close,
             icon: null,
-            onPressed: () => showStudyDialog(context, widget.studyId, StudyDialogType.close),
+            onPressed: () =>
+                showStudyDialog(context, widget.studyId, StudyDialogType.close),
           );
         }),
       );
diff --git a/designer_v2/lib/features/study/study_status_badge.dart b/designer_v2/lib/features/study/study_status_badge.dart
index 97bd1e34e..b2418c4fa 100644
--- a/designer_v2/lib/features/study/study_status_badge.dart
+++ b/designer_v2/lib/features/study/study_status_badge.dart
@@ -32,7 +32,6 @@ class StudyStatusBadge extends StatelessWidget {
 
     final tooltipMessage =
         '${status?.description ?? ''}\n${(status == StudyStatus.closed ? null : participation?.description) ?? ''}'
-
             .trim();
 
     Widget inTooltip(Widget child) {
diff --git a/designer_v2/lib/utils/model_action.dart b/designer_v2/lib/utils/model_action.dart
index c80b12926..67c9b273c 100644
--- a/designer_v2/lib/utils/model_action.dart
+++ b/designer_v2/lib/utils/model_action.dart
@@ -17,9 +17,10 @@ class ModelAction<T> {
     required this.label,
     required this.onExecute,
     this.isSeparator = false,
-      this.isAvailable = true,
-      this.isDestructive = false,
-      this.icon,});
+    this.isAvailable = true,
+    this.isDestructive = false,
+    this.icon,
+  });
 
   static ModelAction addSeparator() {
     return ModelAction(

From dad913eb09baa3007977dea0d30cf3805fa040ad Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 12 Jun 2024 15:32:59 +0200
Subject: [PATCH 183/314] chore: format

---
 .../lib/common_views/action_popup_menu.dart   | 43 ++++++++++---------
 .../close/study_close_dialog_confirm.dart     | 37 ++++++++--------
 .../close/study_close_dialog_success.dart     | 12 +++---
 .../lib/features/dialogs/study_dialogs.dart   |  7 ++-
 .../features/recruit/study_recruit_page.dart  | 33 +++++++-------
 .../lib/features/study/study_scaffold.dart    | 24 ++++++-----
 designer_v2/lib/services/notifications.dart   |  9 ++--
 7 files changed, 90 insertions(+), 75 deletions(-)

diff --git a/designer_v2/lib/common_views/action_popup_menu.dart b/designer_v2/lib/common_views/action_popup_menu.dart
index e4144f23b..a85ed4ee2 100644
--- a/designer_v2/lib/common_views/action_popup_menu.dart
+++ b/designer_v2/lib/common_views/action_popup_menu.dart
@@ -91,27 +91,30 @@ class ActionPopUpMenuButton extends StatelessWidget {
             popupList.add(const PopupMenuDivider());
             continue;
           }
-          popupList.add(PopupMenuItem(
-            value: action,
-            child: ListTile(
-              contentPadding: const EdgeInsets.symmetric(horizontal: 8.0),
-              horizontalTitleGap: 4.0,
-              leading: (action.icon == null)
-                  ? const SizedBox.shrink()
-                  : Icon(
-                      action.icon,
-                      size: theme.iconTheme.size ?? 14.0,
-                      color:
-                          action.isDestructive ? Colors.red : iconColorDefault,
-                    ),
-              title: action.isDestructive
-                  ? Text(
-                      action.label,
-                      style: textTheme.copyWith(color: Colors.red),
-                    )
-                  : Text(action.label, style: textTheme),
+          popupList.add(
+            PopupMenuItem(
+              value: action,
+              child: ListTile(
+                contentPadding: const EdgeInsets.symmetric(horizontal: 8.0),
+                horizontalTitleGap: 4.0,
+                leading: (action.icon == null)
+                    ? const SizedBox.shrink()
+                    : Icon(
+                        action.icon,
+                        size: theme.iconTheme.size ?? 14.0,
+                        color: action.isDestructive
+                            ? Colors.red
+                            : iconColorDefault,
+                      ),
+                title: action.isDestructive
+                    ? Text(
+                        action.label,
+                        style: textTheme.copyWith(color: Colors.red),
+                      )
+                    : Text(action.label, style: textTheme),
+              ),
             ),
-          ));
+          );
           continue;
         }
         return popupList;
diff --git a/designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart b/designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart
index b80bf76ce..4d5bd5352 100644
--- a/designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart
+++ b/designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart
@@ -23,37 +23,38 @@ class CloseConfirmationDialog extends StudyPageWidget {
       child: StandardDialog(
         titleText: tr.dialog_study_close_title,
         body: Column(
-          mainAxisAlignment: MainAxisAlignment.start,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Row(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Flexible(
-                    child: Column(
-                  mainAxisAlignment: MainAxisAlignment.start,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    RichText(
-                      text: TextSpan(
-                        text: tr.dialog_study_close_description,
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      RichText(
+                        text: TextSpan(
+                          text: tr.dialog_study_close_description,
+                        ),
                       ),
-                    ),
-                  ],
-                )),
+                    ],
+                  ),
+                ),
               ],
             ),
           ],
         ),
         actionButtons: [
           const DismissButton(),
-          ReactiveFormConsumer(builder: (context, form, child) {
-            return PrimaryButton(
-              text: tr.dialog_close,
-              icon: null,
-              onPressedFuture: () => controller.closeStudy(),
-            );
-          }),
+          ReactiveFormConsumer(
+            builder: (context, form, child) {
+              return PrimaryButton(
+                text: tr.dialog_close,
+                icon: null,
+                onPressedFuture: () => controller.closeStudy(),
+              );
+            },
+          ),
         ],
         maxWidth: 650,
         minWidth: 610,
diff --git a/designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart b/designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart
index 435d71b9e..f3a50ff85 100644
--- a/designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart
+++ b/designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart
@@ -19,11 +19,13 @@ class CloseSuccessDialog extends StudyPageWidget {
         children: [
           const SizedBox(height: 24.0),
           EmptyBody(
-            leading: Text("\u{1f512}".hardcoded,
-                style: theme.textTheme.displayLarge?.copyWith(
-                  fontSize:
-                      (theme.textTheme.displayLarge?.fontSize ?? 48.0) * 1.5,
-                )),
+            leading: Text(
+              "\u{1f512}".hardcoded,
+              style: theme.textTheme.displayLarge?.copyWith(
+                fontSize:
+                    (theme.textTheme.displayLarge?.fontSize ?? 48.0) * 1.5,
+              ),
+            ),
             title: tr.notification_study_closed,
             description: tr.notification_study_closed_description,
           ),
diff --git a/designer_v2/lib/features/dialogs/study_dialogs.dart b/designer_v2/lib/features/dialogs/study_dialogs.dart
index 8919b08a1..2176249e7 100644
--- a/designer_v2/lib/features/dialogs/study_dialogs.dart
+++ b/designer_v2/lib/features/dialogs/study_dialogs.dart
@@ -33,8 +33,11 @@ class StudyDialog extends StudyPageWidget {
   }
 }
 
-showStudyDialog(
-    BuildContext context, StudyID studyId, StudyDialogType dialogType) {
+Future showStudyDialog(
+  BuildContext context,
+  StudyID studyId,
+  StudyDialogType dialogType,
+) {
   final theme = Theme.of(context);
   return showDialog(
     context: context,
diff --git a/designer_v2/lib/features/recruit/study_recruit_page.dart b/designer_v2/lib/features/recruit/study_recruit_page.dart
index 51e0eefa7..5395f3c83 100644
--- a/designer_v2/lib/features/recruit/study_recruit_page.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_page.dart
@@ -33,8 +33,8 @@ class StudyRecruitScreen extends StudyPageWidget {
           _inviteCodesSectionHeader(context, ref),
           const SizedBox(height: 24.0), // spacing between body elements
           StudyInvitesTable(
-            invites:
-                studyInvites!, // otherwise falls through to [AsyncValueWidget.empty]
+            invites: studyInvites!,
+            // otherwise falls through to [AsyncValueWidget.empty]
             onSelect: _onSelectInvite(context, ref),
             getActions: controller.availableActions,
             getInlineActions: controller.availableInlineActions,
@@ -63,20 +63,21 @@ class StudyRecruitScreen extends StudyPageWidget {
 
     if (isStudyClosed ?? false) {
       return BannerBox(
-          noPrefix: true,
-          body: Column(
-              mainAxisAlignment: MainAxisAlignment.start,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                TextParagraph(
-                  text: tr.banner_study_closed_title,
-                  style: const TextStyle(fontWeight: FontWeight.bold),
-                ),
-                TextParagraph(
-                  text: tr.banner_study_closed_description,
-                ),
-              ]),
-          style: BannerStyle.info);
+        noPrefix: true,
+        body: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            TextParagraph(
+              text: tr.banner_study_closed_title,
+              style: const TextStyle(fontWeight: FontWeight.bold),
+            ),
+            TextParagraph(
+              text: tr.banner_study_closed_description,
+            ),
+          ],
+        ),
+        style: BannerStyle.info,
+      );
     }
     return null;
   }
diff --git a/designer_v2/lib/features/study/study_scaffold.dart b/designer_v2/lib/features/study/study_scaffold.dart
index 3bfaaaaca..86299497d 100644
--- a/designer_v2/lib/features/study/study_scaffold.dart
+++ b/designer_v2/lib/features/study/study_scaffold.dart
@@ -244,7 +244,10 @@ class _StudyScaffoldState extends ConsumerState<StudyScaffold> {
               icon: null,
               enabled: formViewModel.isValid,
               onPressed: () => showStudyDialog(
-                  context, widget.studyId, StudyDialogType.publish),
+                context,
+                widget.studyId,
+                StudyDialogType.publish,
+              ),
             );
           },
         ),
@@ -259,15 +262,16 @@ class _StudyScaffoldState extends ConsumerState<StudyScaffold> {
       final closeButton = ReactiveForm(
         formGroup: formViewModel.form,
         child: ReactiveFormConsumer(
-            // enable re-rendering based on form validation status
-            builder: (context, form, child) {
-          return SecondaryButton(
-            text: tr.action_button_study_close,
-            icon: null,
-            onPressed: () =>
-                showStudyDialog(context, widget.studyId, StudyDialogType.close),
-          );
-        }),
+          // enable re-rendering based on form validation status
+          builder: (context, form, child) {
+            return SecondaryButton(
+              text: tr.action_button_study_close,
+              icon: null,
+              onPressed: () => showStudyDialog(
+                  context, widget.studyId, StudyDialogType.close),
+            );
+          },
+        ),
       );
       actionButtons.add(closeButton);
       actionButtons.add(const SizedBox(width: 12.0)); // padding
diff --git a/designer_v2/lib/services/notifications.dart b/designer_v2/lib/services/notifications.dart
index f2876d9ee..5d9141362 100644
--- a/designer_v2/lib/services/notifications.dart
+++ b/designer_v2/lib/services/notifications.dart
@@ -32,10 +32,11 @@ class Notifications {
     actions: [NotificationDefaultActions.cancel],
   );
   static final studyCloseConfirmation = AlertIntent(
-      title: tr.dialog_study_close_title,
-      message: tr.dialog_study_close_description,
-      icon: MdiIcons.accountLock,
-      actions: [NotificationDefaultActions.cancel]);
+    title: tr.dialog_study_close_title,
+    message: tr.dialog_study_close_description,
+    icon: MdiIcons.accountLock,
+    actions: [NotificationDefaultActions.cancel],
+  );
 }
 
 class NotificationDefaultActions {

From f71382eca52c633bb43514eb7e2db4a44c921f3e Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Wed, 12 Jun 2024 21:56:29 +0200
Subject: [PATCH 184/314] chore: typo fix

---
 designer_v2/lib/localization/app_de.arb | 2 +-
 designer_v2/lib/localization/app_en.arb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index 4072827fe..8b402b8c7 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -487,7 +487,7 @@
   "participant_details_title": "Teilnehmerdetails",
   "participant_details_study_days_overview": "Übersicht über Studientage",
   "participant_details_study_days_description": "Dieser Abschnitt bietet einen Überblick über die Studientage des Teilnehmers.",
-  "participant_details_color_legend_title": "Farblegende:",
+  "participant_details_color_legend_title": "Farblegende",
   "participant_details_color_legend_completed": "Abgeschlossen",
   "participant_details_color_legend_partially_completed": "Teilweise abgeschlossen",
   "participant_details_color_legend_missed": "Verpasst",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index 289110056..6e1334352 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -534,7 +534,7 @@
   "participant_details_title": "Participant Details",
   "participant_details_study_days_overview": "Study days overview",
   "participant_details_study_days_description": "This section provides an overview of the participant's study days.",
-  "participant_details_color_legend_title": "Color Legend:",
+  "participant_details_color_legend_title": "Color Legend",
   "participant_details_color_legend_completed": "Completed",
   "participant_details_color_legend_partially_completed": "Partially Completed",
   "participant_details_color_legend_missed": "Missed",

From 4d8001ef906d96ae6d9b1f0a97c7f0e611f1a6e0 Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahim.ozkn@outlook.com>
Date: Thu, 13 Jun 2024 00:28:31 +0200
Subject: [PATCH 185/314] refactor: migrated dashboard_controller.dart to
 riverpod v2

---
 .../dashboard/dashboard_controller.dart       | 66 +++++++++----------
 .../dashboard/dashboard_controller.g.dart     | 27 ++++++++
 2 files changed, 58 insertions(+), 35 deletions(-)
 create mode 100644 designer_v2/lib/features/dashboard/dashboard_controller.g.dart

diff --git a/designer_v2/lib/features/dashboard/dashboard_controller.dart b/designer_v2/lib/features/dashboard/dashboard_controller.dart
index eb030d00d..3b7723398 100644
--- a/designer_v2/lib/features/dashboard/dashboard_controller.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_controller.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/common_views/search.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
@@ -17,29 +18,44 @@ import 'package:studyu_designer_v2/utils/model_action.dart';
 
 import 'dashboard_state.dart';
 
-class DashboardController extends StateNotifier<DashboardState> implements IModelActionProvider<Study> {
+part 'dashboard_controller.g.dart';
+
+@riverpod
+class DashboardController extends _$DashboardController implements IModelActionProvider<Study> {
+
+  @override
+  DashboardState build(){
+    studyRepository = ref.watch(studyRepositoryProvider);
+    authRepository = ref.watch(authRepositoryProvider);
+    userRepository = ref.watch(userRepositoryProvider);
+    router = ref.watch(routerProvider);
+
+    ref.onDispose(() {
+      print("dashboardControllerProvider.DISPOSE");
+      _studiesSubscription?.cancel();
+    });
+
+    ref.listenSelf((previous, next) {
+      print("dashboardController.state updated");
+    });
+
+    _subscribeStudies();
+    return DashboardState(currentUser: authRepository.currentUser!);
+  }
+
   /// References to the data repositories injected by Riverpod
-  final IStudyRepository studyRepository;
-  final IAuthRepository authRepository;
-  final IUserRepository userRepository;
+  late final IStudyRepository studyRepository;
+  late final IAuthRepository authRepository;
+  late final IUserRepository userRepository;
 
   /// Reference to services injected via Riverpod
-  final GoRouter router;
+  late final GoRouter router;
 
   /// A subscription for synchronizing state between the repository and the controller
   StreamSubscription<List<WrappedModel<Study>>>? _studiesSubscription;
 
   final SearchController searchController = SearchController();
 
-  DashboardController({
-    required this.studyRepository,
-    required this.authRepository,
-    required this.userRepository,
-    required this.router,
-  }) : super(DashboardState(currentUser: authRepository.currentUser!)) {
-    _subscribeStudies();
-  }
-
   _subscribeStudies() {
     _studiesSubscription = studyRepository.watchAll().listen((wrappedModels) {
       print("studyRepository.update");
@@ -135,25 +151,5 @@ class DashboardController extends StateNotifier<DashboardState> implements IMode
     );
   }
 
-  @override
-  dispose() {
-    _studiesSubscription?.cancel();
-    super.dispose();
-  }
-}
 
-final dashboardControllerProvider = StateNotifierProvider.autoDispose<DashboardController, DashboardState>((ref) {
-  final dashboardController = DashboardController(
-    studyRepository: ref.watch(studyRepositoryProvider),
-    authRepository: ref.watch(authRepositoryProvider),
-    userRepository: ref.watch(userRepositoryProvider),
-    router: ref.watch(routerProvider),
-  );
-  dashboardController.addListener((state) {
-    print("dashboardController.state updated");
-  });
-  ref.onDispose(() {
-    print("dashboardControllerProvider.DISPOSE");
-  });
-  return dashboardController;
-});
+}
diff --git a/designer_v2/lib/features/dashboard/dashboard_controller.g.dart b/designer_v2/lib/features/dashboard/dashboard_controller.g.dart
new file mode 100644
index 000000000..74914b509
--- /dev/null
+++ b/designer_v2/lib/features/dashboard/dashboard_controller.g.dart
@@ -0,0 +1,27 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'dashboard_controller.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$dashboardControllerHash() =>
+    r'fca1f90b69e57979c77fccf0309d60a6f9ee153c';
+
+/// See also [DashboardController].
+@ProviderFor(DashboardController)
+final dashboardControllerProvider =
+    AutoDisposeNotifierProvider<DashboardController, DashboardState>.internal(
+  DashboardController.new,
+  name: r'dashboardControllerProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$dashboardControllerHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef _$DashboardController = AutoDisposeNotifier<DashboardState>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

From cdcbca5f027de0ccc54617c5aef4ad737c4d3342 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 13 Jun 2024 09:26:37 +0200
Subject: [PATCH 186/314] style: rephrase translation

---
 designer_v2/lib/localization/app_en.arb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index 8e428367a..46b676dd9 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -80,7 +80,8 @@
   "phase_sequence_alternating": "Alternating (AB AB)",
   "phase_sequence_counterbalanced": "Counterbalanced (AB BA)",
   "phase_sequence_random": "Random",
-"phase_sequence_custom": "Custom",  "form_enrollment_option_open": "Open",
+  "phase_sequence_custom": "Custom",
+  "form_enrollment_option_open": "Open",
   "form_enrollment_option_invite": "Private (Invite-only)",
   "notification_code_deleted": "Access code deleted",
   "notification_code_clipboard": "Code copied to clipboard",
@@ -123,7 +124,7 @@
   "notification_study_closed": "Study was closed",
   "notification_study_closed_description": "New participants can no longer enroll in this study.",
   "dialog_study_close_title": "Close participation?",
-  "dialog_study_close_description": "Are you sure that you want to close participation for this study? New participants can no longer enroll, but enrolled participants can continue to participate.",
+  "dialog_study_close_description": "Are you sure that you want to stop new enrollments for this study? New participants can no longer join, but those who are already enrolled can still continue.",
   "dialog_study_delete_title": "Permanently delete?",
   "dialog_study_delete_description": "Are you sure you want to delete this study? You will permanently lose the study and all data that has been collected.",
   "@__________________STUDYPAGE_DESIGN_SHARED__________________": {},
@@ -242,8 +243,6 @@
   "free_text_question_type_alphanumeric_explanation": "Alphanumeric input includes letters and numbers only.",
   "free_text_question_type_numeric_explanation": "Numeric input includes numbers without special characters.",
   "free_text_question_type_custom_explanation": "The input must match the specified regular expression.",
-
-
   "banner_study_readonly_title": "This study cannot be edited.",
   "banner_study_readonly_description": "You can only make changes to studies where you are an owner or collaborator. Studies that have been launched cannot be changed by anyone.",
   "banner_study_closed_title": "This study is closed.",

From 9b66d338ac1407aff9c7a038ef758816f3f6461c Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 13 Jun 2024 10:12:07 +0200
Subject: [PATCH 187/314] feat: new severe close confirmation

---
 .../close/study_close_dialog_confirm.dart     | 91 +++++++++++--------
 .../close/study_close_dialog_success.dart     |  3 +-
 .../lib/features/study/study_scaffold.dart    |  8 +-
 designer_v2/lib/localization/app_de.arb       |  3 +-
 designer_v2/lib/localization/app_en.arb       |  2 +-
 5 files changed, 61 insertions(+), 46 deletions(-)

diff --git a/designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart b/designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart
index 4d5bd5352..1f5099883 100644
--- a/designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart
+++ b/designer_v2/lib/features/dialogs/close/study_close_dialog_confirm.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:reactive_forms/reactive_forms.dart';
+import 'package:studyu_core/core.dart';
+import 'package:studyu_designer_v2/common_views/async_value_widget.dart';
 import 'package:studyu_designer_v2/common_views/dialog.dart';
 import 'package:studyu_designer_v2/common_views/form_buttons.dart';
 import 'package:studyu_designer_v2/common_views/primary_button.dart';
-import 'package:studyu_designer_v2/features/study/settings/study_settings_form_controller.dart';
 import 'package:studyu_designer_v2/features/study/study_controller.dart';
 import 'package:studyu_designer_v2/features/study/study_page_view.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
@@ -15,51 +15,62 @@ class CloseConfirmationDialog extends StudyPageWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final controller = ref.watch(studyControllerProvider(studyId).notifier);
-    final formViewModel =
-        ref.watch(studySettingsFormViewModelProvider(studyId));
+    final state = ref.watch(studyControllerProvider(studyId));
+    final formKey = GlobalKey<FormState>();
+    String? inputStudyName;
 
-    return ReactiveForm(
-      formGroup: formViewModel.form,
-      child: StandardDialog(
-        titleText: tr.dialog_study_close_title,
-        body: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.start,
+    return AsyncValueWidget<Study>(
+      value: state.study,
+      data: (Study study) {
+        return StandardDialog(
+          titleText: tr.dialog_study_close_title,
+          body: Form(
+            key: formKey,
+            child: Column(
               children: [
-                Flexible(
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      RichText(
-                        text: TextSpan(
-                          text: tr.dialog_study_close_description,
-                        ),
-                      ),
-                    ],
+                Text(tr.dialog_study_close_description),
+                const SizedBox(height: 16.0),
+                SelectableText(
+                  'Enter the title of the study "${study.title}" to confirm that you want to close it:',
+                ),
+                const SizedBox(height: 16.0),
+                TextFormField(
+                  decoration: const InputDecoration(
+                    labelText: 'Title of the study to close',
                   ),
+                  validator: (value) {
+                    if (value == null || value != study.title) {
+                      return 'Study title does not match';
+                    }
+                    return null;
+                  },
+                  onSaved: (value) {
+                    inputStudyName = value;
+                  },
                 ),
               ],
             ),
-          ],
-        ),
-        actionButtons: [
-          const DismissButton(),
-          ReactiveFormConsumer(
-            builder: (context, form, child) {
-              return PrimaryButton(
-                text: tr.dialog_close,
-                icon: null,
-                onPressedFuture: () => controller.closeStudy(),
-              );
-            },
           ),
-        ],
-        maxWidth: 650,
-        minWidth: 610,
-        minHeight: 200,
-      ),
+          actionButtons: [
+            const DismissButton(),
+            PrimaryButton(
+              text: tr.dialog_close,
+              icon: null,
+              onPressedFuture: () async {
+                if (formKey.currentState!.validate()) {
+                  formKey.currentState!.save();
+                  if (inputStudyName == study.title) {
+                    await controller.closeStudy();
+                  }
+                }
+              },
+            ),
+          ],
+          maxWidth: 650,
+          minWidth: 610,
+          minHeight: 200,
+        );
+      },
     );
   }
 }
diff --git a/designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart b/designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart
index f3a50ff85..3fc04196f 100644
--- a/designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart
+++ b/designer_v2/lib/features/dialogs/close/study_close_dialog_success.dart
@@ -13,7 +13,6 @@ class CloseSuccessDialog extends StudyPageWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final theme = Theme.of(context);
-
     return StandardDialog(
       body: Column(
         children: [
@@ -34,7 +33,7 @@ class CloseSuccessDialog extends StudyPageWidget {
       ),
       actionButtons: [
         PrimaryButton(
-          text: tr.action_button_study_close,
+          text: tr.dialog_close,
           icon: null,
           onPressedFuture: () => Navigator.maybePop(context),
         ),
diff --git a/designer_v2/lib/features/study/study_scaffold.dart b/designer_v2/lib/features/study/study_scaffold.dart
index 86299497d..0e0dd305f 100644
--- a/designer_v2/lib/features/study/study_scaffold.dart
+++ b/designer_v2/lib/features/study/study_scaffold.dart
@@ -25,8 +25,11 @@ import 'package:studyu_designer_v2/theme.dart';
 abstract class IStudyAppBarViewModel
     implements IStudyStatusBadgeViewModel, IStudyNavViewModel {
   bool get isSyncIndicatorVisible;
+
   bool get isStatusBadgeVisible;
+
   bool get isPublishVisible;
+
   bool get isClosedVisible;
 }
 
@@ -268,7 +271,10 @@ class _StudyScaffoldState extends ConsumerState<StudyScaffold> {
               text: tr.action_button_study_close,
               icon: null,
               onPressed: () => showStudyDialog(
-                  context, widget.studyId, StudyDialogType.close),
+                context,
+                widget.studyId,
+                StudyDialogType.close,
+              ),
             );
           },
         ),
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index b69ad6487..e192b7a2e 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -73,7 +73,6 @@
   "phase_sequence_counterbalanced": "Ausgeglichen (AB BA)",
   "phase_sequence_random": "Zufällig",
   "phase_sequence_custom": "Benutzerdefiniert",
-
   "form_enrollment_option_open": "Open",
   "form_enrollment_option_invite": "Private (Invite-only)",
   "@__________________NAV_DRAWER__________________": {},
@@ -123,7 +122,7 @@
   "notification_study_closed": "Die Studie wurde geschlossen",
   "notification_study_closed_description": "Neue Teilnehmer können sich nicht mehr einschreiben",
   "dialog_study_close_title": "Teilnahme schließen?",
-  "dialog_study_close_description": "Bist du sicher, dass die Teilnahme an der Studie geschlossen werden soll? Es können keine neuen Teilnehmer mehr eingeschrieben werden, aber bereits angemeldete Teilnehmer können die Studie weiterhin durchführen.",
+  "dialog_study_close_description": "Bist du sicher, dass die Teilnahme an der Studie geschlossen werden soll? Dadurch können keine neuen Teilnehmer mehr aufgenommen werden. Bereits eingeschriebene Teilnehmer werden die Studie weiterhin durchführen können. Das Schließen einer Studie kann nicht rückgängig gemacht werden.",
   "dialog_study_delete_title": "Dauerhaft löschen?",
   "dialog_study_delete_description": "Bist du sicher, dass die Studie gelöscht werden soll? Die Studie und alle gesammelten Daten gehen dabei unwiderruflich verloren.",
   "@__________________STUDYPAGE_DESIGN_SHARED__________________": {},
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index 46b676dd9..fca92717e 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -124,7 +124,7 @@
   "notification_study_closed": "Study was closed",
   "notification_study_closed_description": "New participants can no longer enroll in this study.",
   "dialog_study_close_title": "Close participation?",
-  "dialog_study_close_description": "Are you sure that you want to stop new enrollments for this study? New participants can no longer join, but those who are already enrolled can still continue.",
+  "dialog_study_close_description": "Are you sure that you want to stop new enrollments for this study? New participants can no longer join, but those who are already enrolled can still continue. This action cannot be undone.",
   "dialog_study_delete_title": "Permanently delete?",
   "dialog_study_delete_description": "Are you sure you want to delete this study? You will permanently lose the study and all data that has been collected.",
   "@__________________STUDYPAGE_DESIGN_SHARED__________________": {},

From 97037d44b951ced8f45804e8f48308c086fc4008 Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahim.ozkn@outlook.com>
Date: Thu, 13 Jun 2024 18:19:29 +0200
Subject: [PATCH 188/314] fix: missing intervention and measurement data when
 study is being duplicated

---
 designer_v2/lib/repositories/api_client.dart       |  1 +
 designer_v2/lib/repositories/study_repository.dart | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/designer_v2/lib/repositories/api_client.dart b/designer_v2/lib/repositories/api_client.dart
index bac273373..f9079ae0a 100644
--- a/designer_v2/lib/repositories/api_client.dart
+++ b/designer_v2/lib/repositories/api_client.dart
@@ -89,6 +89,7 @@ class StudyUApiClient extends SupabaseClientDependant
     'study_ended_count',
     'active_subject_count',
     'contact',
+    'created_at',
   ];
 
   static final studyWithParticipantActivityColumns = [
diff --git a/designer_v2/lib/repositories/study_repository.dart b/designer_v2/lib/repositories/study_repository.dart
index 448bd7abc..a2a9aa320 100644
--- a/designer_v2/lib/repositories/study_repository.dart
+++ b/designer_v2/lib/repositories/study_repository.dart
@@ -103,6 +103,17 @@ class StudyRepository extends ModelRepository<Study>
     return publishOperation.execute();
   }
 
+  /// This method fetches the full study object, duplicates it and saves it as a draft.
+  /// Since the Study object in the dashboard is fetched with limited columns (no intervention or measurement data),
+  /// we need to fetch the full columns in order to duplicate it correctly.
+  @override
+  Future<void> duplicateAndSave(Study model) async {
+    final Study completeModel = await apiClient.fetchStudy(model.id);
+    final duplicate =
+    completeModel.duplicateAsDraft(authRepository.currentUser!.id);
+    await save(duplicate);
+  }
+
   @override
   List<ModelAction> availableActions(Study model) {
     Future<void> onDeleteCallback() {

From f1b96f59433ff4eaa36afc6c1e7b825ce1bb266e Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 14 Jun 2024 09:12:09 +0200
Subject: [PATCH 189/314] style: format

---
 designer_v2/lib/repositories/study_repository.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_v2/lib/repositories/study_repository.dart b/designer_v2/lib/repositories/study_repository.dart
index a2a9aa320..ee5dd8d71 100644
--- a/designer_v2/lib/repositories/study_repository.dart
+++ b/designer_v2/lib/repositories/study_repository.dart
@@ -110,7 +110,7 @@ class StudyRepository extends ModelRepository<Study>
   Future<void> duplicateAndSave(Study model) async {
     final Study completeModel = await apiClient.fetchStudy(model.id);
     final duplicate =
-    completeModel.duplicateAsDraft(authRepository.currentUser!.id);
+        completeModel.duplicateAsDraft(authRepository.currentUser!.id);
     await save(duplicate);
   }
 

From 8dad7c33499ebc95fd76091e3fe5e41c018efa2c Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 14 Jun 2024 09:26:15 +0200
Subject: [PATCH 190/314] chore: Merge origin/dev

---
 core/lib/src/models/tables/study.dart         |  7 +++--
 core/lib/src/models/tables/study_subject.dart |  4 ++-
 .../lib/common_views/action_popup_menu.dart   | 26 +++++++++----------
 .../features/recruit/study_recruit_page.dart  |  9 +++----
 .../features/study/study_status_badge.dart    |  1 -
 .../lib/repositories/study_repository.dart    | 25 +++++++++++++-----
 designer_v2/lib/services/notifications.dart   |  2 +-
 7 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/core/lib/src/models/tables/study.dart b/core/lib/src/models/tables/study.dart
index 3f5183a99..c7ba9cd53 100644
--- a/core/lib/src/models/tables/study.dart
+++ b/core/lib/src/models/tables/study.dart
@@ -241,8 +241,11 @@ class Study extends SupabaseObjectFunctions<Study>
   static Future<ExtractionResult<Study>> publishedPublicStudies() async {
     ExtractionResult<Study> result;
     try {
-      final response =
-          await env.client.from(tableName).select().eq('participation', 'open').eq("is_closed", false);
+      final response = await env.client
+          .from(tableName)
+          .select()
+          .eq('participation', 'open')
+          .eq("is_closed", false);
       final extracted = SupabaseQuery.extractSupabaseList<Study>(
         List<Map<String, dynamic>>.from(response),
       );
diff --git a/core/lib/src/models/tables/study_subject.dart b/core/lib/src/models/tables/study_subject.dart
index 9e90e86f9..5fe742721 100644
--- a/core/lib/src/models/tables/study_subject.dart
+++ b/core/lib/src/models/tables/study_subject.dart
@@ -298,7 +298,9 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   Future<StudySubject> save({bool onlyUpdate = false}) async {
     try {
       final tableQuery = env.client.from(tableName);
-      final query = onlyUpdate ? tableQuery.update(toJson()).eq("id", id) : tableQuery.upsert(toJson());
+      final query = onlyUpdate
+          ? tableQuery.update(toJson()).eq("id", id)
+          : tableQuery.upsert(toJson());
       final response = await query.select();
       final json = toFullJson(
         partialJson: List<Map<String, dynamic>>.from(response).single,
diff --git a/designer_v2/lib/common_views/action_popup_menu.dart b/designer_v2/lib/common_views/action_popup_menu.dart
index 7f1aa602a..ec0f59e77 100644
--- a/designer_v2/lib/common_views/action_popup_menu.dart
+++ b/designer_v2/lib/common_views/action_popup_menu.dart
@@ -86,15 +86,15 @@ class ActionPopUpMenuButton extends StatelessWidget {
       itemBuilder: (BuildContext context) {
         final textTheme = theme.textTheme.labelMedium!;
         final List<PopupMenuEntry> popupList = [];
-          for (final action in actions) {
-            if (action.isSeparator) {
-              popupList.add(const PopupMenuDivider());
-              continue;
-            }
-            popupList.add(PopupMenuItem(
-              value: action,
-              child: ListTile(
-                contentPadding: const EdgeInsets.symmetric(horizontal: 8.0),
+        for (final action in actions) {
+          if (action.isSeparator) {
+            popupList.add(const PopupMenuDivider());
+            continue;
+          }
+          popupList.add(PopupMenuItem(
+            value: action,
+            child: ListTile(
+              contentPadding: const EdgeInsets.symmetric(horizontal: 8.0),
               horizontalTitleGap: 4.0,
               leading: (action.icon == null)
                   ? const SizedBox.shrink()
@@ -111,10 +111,10 @@ class ActionPopUpMenuButton extends StatelessWidget {
                     )
                   : Text(action.label, style: textTheme),
             ),
-          ));
-            continue;
-          }
-          return popupList;
+          ),);
+          continue;
+        }
+        return popupList;
       },
     );
   }
diff --git a/designer_v2/lib/features/recruit/study_recruit_page.dart b/designer_v2/lib/features/recruit/study_recruit_page.dart
index c76a34fd8..c577a59df 100644
--- a/designer_v2/lib/features/recruit/study_recruit_page.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_page.dart
@@ -65,7 +65,6 @@ class StudyRecruitScreen extends StudyPageWidget {
       return BannerBox(
           noPrefix: true,
           body: Column(
-              mainAxisAlignment: MainAxisAlignment.start,
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 TextParagraph(
@@ -75,8 +74,8 @@ class StudyRecruitScreen extends StudyPageWidget {
                 TextParagraph(
                   text: tr.banner_study_closed_description,
                 ),
-              ]),
-          style: BannerStyle.info);
+              ],),
+          style: BannerStyle.info,);
     }
 
     return null;
@@ -106,12 +105,12 @@ class StudyRecruitScreen extends StudyPageWidget {
           ? null
           : () {
               final formViewModel =
-            ref.read(inviteCodeFormViewModelProvider(studyId));
+                  ref.read(inviteCodeFormViewModelProvider(studyId));
               showFormSideSheet<InviteCodeFormViewModel>(
                 context: context,
                 formViewModel: formViewModel,
                 formViewBuilder: (formViewModel) =>
-              InviteCodeFormView(formViewModel: formViewModel),
+                    InviteCodeFormView(formViewModel: formViewModel),
               );
             },
     );
diff --git a/designer_v2/lib/features/study/study_status_badge.dart b/designer_v2/lib/features/study/study_status_badge.dart
index 97bd1e34e..b2418c4fa 100644
--- a/designer_v2/lib/features/study/study_status_badge.dart
+++ b/designer_v2/lib/features/study/study_status_badge.dart
@@ -32,7 +32,6 @@ class StudyStatusBadge extends StatelessWidget {
 
     final tooltipMessage =
         '${status?.description ?? ''}\n${(status == StudyStatus.closed ? null : participation?.description) ?? ''}'
-
             .trim();
 
     Widget inTooltip(Widget child) {
diff --git a/designer_v2/lib/repositories/study_repository.dart b/designer_v2/lib/repositories/study_repository.dart
index 8b6189bfe..84b1bbd62 100644
--- a/designer_v2/lib/repositories/study_repository.dart
+++ b/designer_v2/lib/repositories/study_repository.dart
@@ -123,9 +123,14 @@ class StudyRepository extends ModelRepository<Study>
 
     Future<void> onCloseCallback() {
       model.isClosed = true;
-      return save(model).then((value) => ref.read(routerProvider).dispatch(RoutingIntents.studies)).then((value) =>
-          Future.delayed(const Duration(milliseconds: 200),
-              () => ref.read(notificationServiceProvider).show(Notifications.studyClosed)));
+      return save(model)
+          .then((value) =>
+              ref.read(routerProvider).dispatch(RoutingIntents.studies),)
+          .then((value) => Future.delayed(
+              const Duration(milliseconds: 200),
+              () => ref
+                  .read(notificationServiceProvider)
+                  .show(Notifications.studyClosed),),);
     }
 
     final currentUser = authRepository.currentUser;
@@ -190,11 +195,17 @@ class StudyRepository extends ModelRepository<Study>
         type: StudyActionType.close,
         label: StudyActionType.close.string,
         onExecute: () {
-          return ref.read(notificationServiceProvider).show(Notifications.studyCloseConfirmation, actions: [
-            NotificationAction(label: StudyActionType.close.string, onSelect: onCloseCallback, isDestructive: true),
-          ]);
+          return ref
+              .read(notificationServiceProvider)
+              .show(Notifications.studyCloseConfirmation, actions: [
+            NotificationAction(
+                label: StudyActionType.close.string,
+                onSelect: onCloseCallback,
+                isDestructive: true,),
+          ],);
         },
-        isAvailable: model.canClose(currentUser) && model.status == StudyStatus.running,
+        isAvailable:
+            model.canClose(currentUser) && model.status == StudyStatus.running,
       ),
       ModelAction(
         type: StudyActionType.delete,
diff --git a/designer_v2/lib/services/notifications.dart b/designer_v2/lib/services/notifications.dart
index 780540b32..6a6bcbd9f 100644
--- a/designer_v2/lib/services/notifications.dart
+++ b/designer_v2/lib/services/notifications.dart
@@ -38,7 +38,7 @@ class Notifications {
       title: tr.dialog_study_close_title,
       message: tr.dialog_study_close_description,
       icon: MdiIcons.accountLock,
-      actions: [NotificationDefaultActions.cancel]);
+      actions: [NotificationDefaultActions.cancel],);
 }
 
 class NotificationDefaultActions {

From 1299c234e448444875381c606886bcb2e9882325 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 16 Jun 2024 15:46:04 +0200
Subject: [PATCH 191/314] Merge dev

---
 designer_v2/lib/features/app.dart             |  1 -
 designer_v2/lib/features/app_controller.dart  |  3 ++-
 .../features/auth/auth_form_controller.dart   |  7 +++--
 .../dashboard/dashboard_controller.dart       |  8 +++---
 .../design/study_form_controller.dart         |  3 ++-
 .../recruit/invite_code_form_controller.dart  |  3 ++-
 .../recruit/study_recruit_controller.dart     | 11 ++++----
 .../features/study/study_base_controller.dart |  3 ++-
 .../lib/features/study/study_controller.dart  | 16 ++++++-----
 .../study/study_controller_state.dart         | 27 ++++++++++---------
 .../features/study/study_test_controller.dart |  6 +++--
 .../lib/localization/locale_state.dart        |  3 ++-
 .../repositories/invite_code_repository.dart  |  3 ++-
 .../lib/repositories/supabase_client.dart     | 11 +++++---
 14 files changed, 58 insertions(+), 47 deletions(-)

diff --git a/designer_v2/lib/features/app.dart b/designer_v2/lib/features/app.dart
index 7569fae09..88d18f43d 100644
--- a/designer_v2/lib/features/app.dart
+++ b/designer_v2/lib/features/app.dart
@@ -36,7 +36,6 @@ class AppContent extends ConsumerStatefulWidget {
 }
 
 class _AppContentState extends ConsumerState<AppContent> {
-
   final settings = ValueNotifier(
     ThemeSettings(
       //sourceColor: Color(0xff2a4fda),
diff --git a/designer_v2/lib/features/app_controller.dart b/designer_v2/lib/features/app_controller.dart
index 570f4d2d0..bd84d5d55 100644
--- a/designer_v2/lib/features/app_controller.dart
+++ b/designer_v2/lib/features/app_controller.dart
@@ -39,7 +39,8 @@ class AppController extends _$AppController {
   /// A dummy [Future] used for setting a lower bound on app initialization
   /// (so that the splash screen is shown during this time)
   // TODO MERGE
-  late final _delayedFuture = Future.delayed(const Duration(milliseconds: Config.minSplashTime), () => true);
+  late final _delayedFuture = Future.delayed(
+      const Duration(milliseconds: Config.minSplashTime), () => true);
 
   /// Executes the given callback for all registered delegates concurrently
   // TODO merge where to call this?
diff --git a/designer_v2/lib/features/auth/auth_form_controller.dart b/designer_v2/lib/features/auth/auth_form_controller.dart
index 4f3ed71ab..e16d0e114 100644
--- a/designer_v2/lib/features/auth/auth_form_controller.dart
+++ b/designer_v2/lib/features/auth/auth_form_controller.dart
@@ -54,8 +54,8 @@ enum AuthFormKey {
 }
 
 @riverpod
-class AuthFormController extends _$AuthFormController implements IFormGroupController {
-
+class AuthFormController extends _$AuthFormController
+    implements IFormGroupController {
   @override
   AsyncValue<void> build(AuthFormKey formKey) {
     authRepository = ref.watch(authRepositoryProvider);
@@ -91,7 +91,6 @@ class AuthFormController extends _$AuthFormController implements IFormGroupContr
     return AsyncValue.data(null);
   }
 
-
   late final IAuthRepository authRepository;
   late final INotificationService notificationService;
   late final GoRouter router;
@@ -270,7 +269,7 @@ class AuthFormController extends _$AuthFormController implements IFormGroupContr
     } catch (e) {
       state = AsyncValue.error(e, StackTrace.current);
     } finally {
-      state =  const AsyncValue.data(null);
+      state = const AsyncValue.data(null);
     }
     return Future.value(AuthResponse());
   }
diff --git a/designer_v2/lib/features/dashboard/dashboard_controller.dart b/designer_v2/lib/features/dashboard/dashboard_controller.dart
index 509e23d56..5bc310138 100644
--- a/designer_v2/lib/features/dashboard/dashboard_controller.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_controller.dart
@@ -23,10 +23,10 @@ import 'dashboard_state.dart';
 part 'dashboard_controller.g.dart';
 
 @riverpod
-class DashboardController extends _$DashboardController implements IModelActionProvider<Study> {
-
+class DashboardController extends _$DashboardController
+    implements IModelActionProvider<Study> {
   @override
-  DashboardState build(){
+  DashboardState build() {
     studyRepository = ref.watch(studyRepositoryProvider);
     authRepository = ref.watch(authRepositoryProvider);
     userRepository = ref.watch(userRepositoryProvider);
@@ -157,6 +157,4 @@ class DashboardController extends _$DashboardController implements IModelActionP
       studyActionIcons,
     );
   }
-
-
 }
diff --git a/designer_v2/lib/features/design/study_form_controller.dart b/designer_v2/lib/features/design/study_form_controller.dart
index fae8ab565..0d89a6880 100644
--- a/designer_v2/lib/features/design/study_form_controller.dart
+++ b/designer_v2/lib/features/design/study_form_controller.dart
@@ -173,7 +173,8 @@ class StudyFormViewModel extends FormViewModel<Study>
 /// Note: This is not safe to use in widgets (or other providers) that are built
 /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
 @riverpod
-StudyFormViewModel studyFormViewModel(StudyFormViewModelRef ref, StudyID studyId) {
+StudyFormViewModel studyFormViewModel(
+    StudyFormViewModelRef ref, StudyID studyId) {
   print("studyFormViewModel");
   final state = ref.watch(studyControllerProvider(studyId));
   return StudyFormViewModel(
diff --git a/designer_v2/lib/features/recruit/invite_code_form_controller.dart b/designer_v2/lib/features/recruit/invite_code_form_controller.dart
index 0faeebee2..529e88181 100644
--- a/designer_v2/lib/features/recruit/invite_code_form_controller.dart
+++ b/designer_v2/lib/features/recruit/invite_code_form_controller.dart
@@ -153,7 +153,8 @@ class InviteCodeFormViewModel extends FormViewModel<StudyInvite> {
 /// Note: This is not safe to use in widgets (or other providers) that are built
 /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
 @riverpod
-InviteCodeFormViewModel inviteCodeFormViewModel(InviteCodeFormViewModelRef ref, StudyID studyId) {
+InviteCodeFormViewModel inviteCodeFormViewModel(
+    InviteCodeFormViewModelRef ref, StudyID studyId) {
   print("inviteCodeFormViewModelProvider($studyId");
   // Reactively bind to and obtain [StudyController]'s current study
   final study = ref
diff --git a/designer_v2/lib/features/recruit/study_recruit_controller.dart b/designer_v2/lib/features/recruit/study_recruit_controller.dart
index 42c61b73d..9733d886d 100644
--- a/designer_v2/lib/features/recruit/study_recruit_controller.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_controller.dart
@@ -14,16 +14,17 @@ import 'package:studyu_designer_v2/utils/model_action.dart';
 part 'study_recruit_controller.g.dart';
 
 @riverpod
-class StudyRecruitController
-    extends _$StudyRecruitController implements IModelActionProvider<StudyInvite> {
-
+class StudyRecruitController extends _$StudyRecruitController
+    implements IModelActionProvider<StudyInvite> {
   /// [inviteCodeRepository] Reference to the repository for invite codes (resolved dynamically via Riverpod when the [state.study] becomes available)
   @override
   StudyRecruitControllerState build(StudyID studyId) {
     print("StudyRecruitController.constructor");
     _subscribeInvites();
-    ref.onDispose(() {print("StudyRecruitController.dispose");
-    _invitesSubscription?.cancel();});
+    ref.onDispose(() {
+      print("StudyRecruitController.dispose");
+      _invitesSubscription?.cancel();
+    });
     return StudyRecruitControllerState(
       studyId: studyId,
       studyRepository: ref.watch(studyRepositoryProvider),
diff --git a/designer_v2/lib/features/study/study_base_controller.dart b/designer_v2/lib/features/study/study_base_controller.dart
index 9ccf10bad..0fcf64ca5 100644
--- a/designer_v2/lib/features/study/study_base_controller.dart
+++ b/designer_v2/lib/features/study/study_base_controller.dart
@@ -15,7 +15,8 @@ import 'package:supabase_flutter/supabase_flutter.dart';
 part 'study_base_controller.g.dart';
 
 @riverpod
-class StudyBaseController<T extends StudyControllerBaseState> extends _$StudyBaseController {
+class StudyBaseController<T extends StudyControllerBaseState>
+    extends _$StudyBaseController {
   @override
   StudyControllerBaseState build(StudyID studyId) {
     subscribeStudy(studyId);
diff --git a/designer_v2/lib/features/study/study_controller.dart b/designer_v2/lib/features/study/study_controller.dart
index 2759be910..98ce248f2 100644
--- a/designer_v2/lib/features/study/study_controller.dart
+++ b/designer_v2/lib/features/study/study_controller.dart
@@ -23,11 +23,10 @@ class StudyController extends _$StudyController {
     syncStudyStatus();
     ref.onDispose(() => _studyEventsSubscription?.cancel());
     return StudyControllerState(
-      studyId: studyId,
-      studyRepository: ref.watch(studyRepositoryProvider),
-      router: ref.watch(routerProvider),
-      currentUser: ref.watch(authRepositoryProvider).currentUser
-    );
+        studyId: studyId,
+        studyRepository: ref.watch(studyRepositoryProvider),
+        router: ref.watch(routerProvider),
+        currentUser: ref.watch(authRepositoryProvider).currentUser);
   }
 
   StreamSubscription<ModelEvent<Study>>? _studyEventsSubscription;
@@ -36,7 +35,8 @@ class StudyController extends _$StudyController {
     if (_studyEventsSubscription != null) {
       _studyEventsSubscription?.cancel();
     }
-    _studyEventsSubscription = state.studyRepository.watchChanges(state.studyId).listen((event) {
+    _studyEventsSubscription =
+        state.studyRepository.watchChanges(state.studyId).listen((event) {
       if (event is IsSaving) {
         state = state.copyWith(
           syncState: const AsyncValue.loading(),
@@ -53,7 +53,9 @@ class StudyController extends _$StudyController {
   }
 
   onStudySubscriptionUpdate(WrappedModel<Study> wrappedModel) {
-    ref.watch(studyBaseControllerProvider(state.studyId).notifier).onStudySubscriptionUpdate(wrappedModel);
+    ref
+        .watch(studyBaseControllerProvider(state.studyId).notifier)
+        .onStudySubscriptionUpdate(wrappedModel);
     final studyId = wrappedModel.model.id;
     _redirectNewToActualStudyID(studyId);
   }
diff --git a/designer_v2/lib/features/study/study_controller_state.dart b/designer_v2/lib/features/study/study_controller_state.dart
index 6785c7033..3874d08d0 100644
--- a/designer_v2/lib/features/study/study_controller_state.dart
+++ b/designer_v2/lib/features/study/study_controller_state.dart
@@ -11,16 +11,15 @@ import '../../utils/model_action.dart';
 
 class StudyControllerState extends StudyControllerBaseState
     implements IStudyAppBarViewModel, ISyncIndicatorViewModel {
-  const StudyControllerState({
-    required super.studyId,
-    required super.studyRepository,
-    required super.router,
-    required super.currentUser,
-    super.studyWithMetadata,
-    this.isDirty = false,
-    this.syncState = const AsyncValue<void>.data(null),
-    this.lastSynced
-  });
+  const StudyControllerState(
+      {required super.studyId,
+      required super.studyRepository,
+      required super.router,
+      required super.currentUser,
+      super.studyWithMetadata,
+      this.isDirty = false,
+      this.syncState = const AsyncValue<void>.data(null),
+      this.lastSynced});
 
   bool get isPublished => study.value != null && study.value!.published;
 
@@ -31,9 +30,11 @@ class StudyControllerState extends StudyControllerBaseState
     }
     // filter out edit action since we are already editing the study
     return withIcons(
-        studyRepository.availableActions(studyVal).where((action) => action.type != StudyActionType.edit).toList(),
-        studyActionIcons
-    );
+        studyRepository
+            .availableActions(studyVal)
+            .where((action) => action.type != StudyActionType.edit)
+            .toList(),
+        studyActionIcons);
   }
 
   // - ISyncIndicatorViewModel
diff --git a/designer_v2/lib/features/study/study_test_controller.dart b/designer_v2/lib/features/study/study_test_controller.dart
index c8ec2dd55..a75bb1ec3 100644
--- a/designer_v2/lib/features/study/study_test_controller.dart
+++ b/designer_v2/lib/features/study/study_test_controller.dart
@@ -30,7 +30,8 @@ class StudyTestController extends _$StudyTestController {
       studyRepository: ref.watch(studyRepositoryProvider),
       router: ref.watch(routerProvider),
       currentUser: ref.watch(authRepositoryProvider).currentUser,
-      serializedSession: ref.watch(authRepositoryProvider).serializedSession ?? '',
+      serializedSession:
+          ref.watch(authRepositoryProvider).serializedSession ?? '',
       languageCode: ref.watch(localeProvider).languageCode,
     );
   }
@@ -39,7 +40,8 @@ class StudyTestController extends _$StudyTestController {
 /// Provide a controller parametrized by [StudyID]
 
 @riverpod
-PlatformController studyTestPlatformController(StudyTestPlatformControllerRef ref, StudyID studyId) {
+PlatformController studyTestPlatformController(
+    StudyTestPlatformControllerRef ref, StudyID studyId) {
   final state = ref.watch(studyTestControllerProvider(studyId));
   PlatformController platformController;
   if (!kIsWeb) {
diff --git a/designer_v2/lib/localization/locale_state.dart b/designer_v2/lib/localization/locale_state.dart
index 89867d9e7..c60fc0744 100644
--- a/designer_v2/lib/localization/locale_state.dart
+++ b/designer_v2/lib/localization/locale_state.dart
@@ -8,7 +8,8 @@ import 'locale_providers.dart';
 
 part 'locale_state.g.dart';
 
-Locale fallbackLocale = Locale(Config.defaultLocale.first, Config.defaultLocale.last);
+Locale fallbackLocale =
+    Locale(Config.defaultLocale.first, Config.defaultLocale.last);
 
 @immutable
 class LocaleState {
diff --git a/designer_v2/lib/repositories/invite_code_repository.dart b/designer_v2/lib/repositories/invite_code_repository.dart
index 3553bd188..27e977664 100644
--- a/designer_v2/lib/repositories/invite_code_repository.dart
+++ b/designer_v2/lib/repositories/invite_code_repository.dart
@@ -209,7 +209,8 @@ class InviteCodeRepositoryDelegate
 }
 
 @riverpod
-InviteCodeRepository inviteCodeRepository(InviteCodeRepositoryRef ref, StudyID studyId) {
+InviteCodeRepository inviteCodeRepository(
+    InviteCodeRepositoryRef ref, StudyID studyId) {
   print("inviteCodeRepositoryProvider($studyId");
   // Initialize repository for a given study
   final repository = InviteCodeRepository(
diff --git a/designer_v2/lib/repositories/supabase_client.dart b/designer_v2/lib/repositories/supabase_client.dart
index 84cf01d3a..db299255f 100644
--- a/designer_v2/lib/repositories/supabase_client.dart
+++ b/designer_v2/lib/repositories/supabase_client.dart
@@ -1,5 +1,5 @@
-import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_core/env.dart' as env;
 import 'package:supabase_flutter/supabase_flutter.dart';
@@ -42,7 +42,8 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
     Map<String, Object> selectionCriteria,
   ) async {
     try {
-      final data = await this.supabaseClient
+      final data = await this
+          .supabaseClient
           .from(tableName(T))
           .delete()
           .match(selectionCriteria);
@@ -61,7 +62,8 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
     List<String> selectedColumns = const ['*'],
   }) async {
     try {
-      final data = await this.supabaseClient
+      final data = await this
+          .supabaseClient
           .from(tableName(T))
           .select(selectedColumns.join(','));
       return deserializeList<T>(data);
@@ -87,7 +89,8 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
     List<String> selectedColumns = const ['*'],
   }) async {
     try {
-      final data = await this.supabaseClient
+      final data = await this
+          .supabaseClient
           .from(tableName(T))
           .select(selectedColumns.join(','))
           .eq(colName, value)

From 437c0d9b2ccb9391c92052a866f76fef957735cf Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 16 Jun 2024 16:13:41 +0200
Subject: [PATCH 192/314] fix: merge dev fixes

---
 designer_v2/lib/features/app.dart             |   3 +-
 designer_v2/lib/features/app_controller.dart  |  16 +--
 .../lib/features/app_controller.g.dart        |   2 +-
 .../lib/features/app_controller_state.dart    |   2 +-
 .../features/auth/auth_form_controller.dart   |  11 +-
 .../features/auth/auth_form_controller.g.dart |  40 ++++---
 .../dashboard/dashboard_controller.dart       |   9 +-
 .../dashboard/dashboard_controller.g.dart     |   2 +-
 .../design/study_form_controller.dart         |   2 +-
 .../recruit/invite_code_form_controller.dart  |   2 +-
 .../recruit/study_recruit_controller.dart     |   1 -
 .../recruit/study_recruit_controller.g.dart   |   2 +-
 .../features/study/study_base_controller.dart |   7 --
 .../study/study_base_controller.g.dart        |   2 +-
 .../lib/features/study/study_controller.dart  |  16 +--
 .../features/study/study_controller.g.dart    |   2 +-
 .../study/study_controller_state.dart         |   6 +-
 .../features/study/study_test_controller.dart |   9 +-
 .../lib/localization/app_translation.dart     |   2 +-
 .../lib/localization/language_picker.dart     |   3 +-
 .../lib/localization/locale_providers.dart    |   2 -
 .../lib/localization/locale_state.dart        |  22 +---
 .../lib/localization/locale_state.g.dart      |   2 +-
 .../lib/repositories/auth_repository.dart     |   2 +-
 .../repositories/invite_code_repository.dart  |   2 +-
 .../lib/repositories/supabase_client.dart     |   4 +-
 .../lib/repositories/supabase_client.g.dart   |   2 +-
 designer_v2/lib/routing/router.dart           |   2 -
 designer_v2/lib/routing/router.g.dart         |   2 +-
 designer_v2/pubspec.lock                      | 112 ++++++++++++++++++
 30 files changed, 187 insertions(+), 104 deletions(-)

diff --git a/designer_v2/lib/features/app.dart b/designer_v2/lib/features/app.dart
index 88d18f43d..adfee289b 100644
--- a/designer_v2/lib/features/app.dart
+++ b/designer_v2/lib/features/app.dart
@@ -4,13 +4,12 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
+import 'package:studyu_designer_v2/localization/locale_providers.dart';
 import 'package:studyu_designer_v2/localization/string_hardcoded.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/services/notification_dispatcher.dart';
 import 'package:studyu_designer_v2/theme.dart';
 
-import '../localization/locale_providers.dart';
-
 final GlobalKey<ScaffoldMessengerState> scaffoldMessengerKey = GlobalKey();
 
 /// Entry widget of the app.
diff --git a/designer_v2/lib/features/app_controller.dart b/designer_v2/lib/features/app_controller.dart
index bd84d5d55..944f1aeb6 100644
--- a/designer_v2/lib/features/app_controller.dart
+++ b/designer_v2/lib/features/app_controller.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/features/app_controller_state.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 
@@ -12,8 +13,6 @@ abstract class IAppDelegate {
   Future<bool> onAppStart();
 }
 
-typedef _DelegateCallback = Future<bool> Function(IAppDelegate delegate);
-
 /// Main controller that's bound to the top-level application widget's state
 @riverpod
 class AppController extends _$AppController {
@@ -26,10 +25,12 @@ class AppController extends _$AppController {
     ref.listenSelf((previous, next) {
       print("APP CONTROLLER STATE CHANGED: $next");
     });
-    //ref.read(routerProvider).refresh();
     // Forward onAppStart to all registered delegates so that they can
     // e.g. read some data from local storage for initialization
-    //await _callDelegates((delegate) => delegate.onAppStart(), withMinDelay: true);
+    await _callDelegates(
+      (delegate) => delegate.onAppStart(),
+      withMinDelay: true,
+    );
     return const AppControllerState(status: AppStatus.initialized);
   }
 
@@ -38,12 +39,13 @@ class AppController extends _$AppController {
 
   /// A dummy [Future] used for setting a lower bound on app initialization
   /// (so that the splash screen is shown during this time)
-  // TODO MERGE
   late final _delayedFuture = Future.delayed(
-      const Duration(milliseconds: Config.minSplashTime), () => true);
+    // ignore: avoid_redundant_argument_values, use_named_constants
+    const Duration(milliseconds: Config.minSplashTime),
+    () => true,
+  );
 
   /// Executes the given callback for all registered delegates concurrently
-  // TODO merge where to call this?
   Future<bool> _callDelegates(
     Future<bool> Function(IAppDelegate) function, {
     bool withMinDelay = false,
diff --git a/designer_v2/lib/features/app_controller.g.dart b/designer_v2/lib/features/app_controller.g.dart
index ce14e1321..0db5fb3c9 100644
--- a/designer_v2/lib/features/app_controller.g.dart
+++ b/designer_v2/lib/features/app_controller.g.dart
@@ -6,7 +6,7 @@ part of 'app_controller.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$appControllerHash() => r'fe83de481e31f72f7a492084d62f04373130fb1e';
+String _$appControllerHash() => r'bbe9d711818ec2ae14174b269317d11c5c987dbd';
 
 /// Main controller that's bound to the top-level application widget's state
 ///
diff --git a/designer_v2/lib/features/app_controller_state.dart b/designer_v2/lib/features/app_controller_state.dart
index 5183f31f8..38498c828 100644
--- a/designer_v2/lib/features/app_controller_state.dart
+++ b/designer_v2/lib/features/app_controller_state.dart
@@ -9,7 +9,7 @@ class AppControllerState extends Equatable {
 
   final AppStatus status;
 
-  get isInitialized => status == AppStatus.initialized;
+  bool get isInitialized => status == AppStatus.initialized;
 
   @override
   List<Object?> get props => [status];
diff --git a/designer_v2/lib/features/auth/auth_form_controller.dart b/designer_v2/lib/features/auth/auth_form_controller.dart
index e16d0e114..17e18c355 100644
--- a/designer_v2/lib/features/auth/auth_form_controller.dart
+++ b/designer_v2/lib/features/auth/auth_form_controller.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:reactive_forms/reactive_forms.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -57,25 +56,23 @@ enum AuthFormKey {
 class AuthFormController extends _$AuthFormController
     implements IFormGroupController {
   @override
-  AsyncValue<void> build(AuthFormKey formKey) {
+  AsyncValue<void> build(AuthFormKey formKeyArg) {
     authRepository = ref.watch(authRepositoryProvider);
     notificationService = ref.watch(notificationServiceProvider);
     router = ref.watch(routerProvider);
 
-    formKey = formKey;
+    formKey = formKeyArg;
     resetControlsFor(formKey);
 
     ref.listenSelf((previous, next) {
       print("authFormController.state updated");
       if (state.hasError) {
-        final AuthException error = state.error as AuthException;
+        final AuthException error = state.error! as AuthException;
         switch (error.message) {
           case "Invalid login credentials":
             notificationService.show(Notifications.credentialsInvalid);
-            break;
           case "User already registered":
             notificationService.show(Notifications.userAlreadyRegistered);
-            break;
           default:
             notificationService.showMessage(error.message);
         }
@@ -88,7 +85,7 @@ class AuthFormController extends _$AuthFormController
     _readDebugUser();
     _onChangeFormKey(formKey);
 
-    return AsyncValue.data(null);
+    return const AsyncValue.data(null);
   }
 
   late final IAuthRepository authRepository;
diff --git a/designer_v2/lib/features/auth/auth_form_controller.g.dart b/designer_v2/lib/features/auth/auth_form_controller.g.dart
index 9fc00fa8b..014571aa9 100644
--- a/designer_v2/lib/features/auth/auth_form_controller.g.dart
+++ b/designer_v2/lib/features/auth/auth_form_controller.g.dart
@@ -7,7 +7,7 @@ part of 'auth_form_controller.dart';
 // **************************************************************************
 
 String _$authFormControllerHash() =>
-    r'536f61faf22e316334e07415d09389bff1c76b45';
+    r'd2cbe152c9e265eee89031208b3df027beb183be';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -32,10 +32,10 @@ class _SystemHash {
 
 abstract class _$AuthFormController
     extends BuildlessAutoDisposeNotifier<AsyncValue<void>> {
-  late final AuthFormKey formKey;
+  late final AuthFormKey formKeyArg;
 
   AsyncValue<void> build(
-    AuthFormKey formKey,
+    AuthFormKey formKeyArg,
   );
 }
 
@@ -50,10 +50,10 @@ class AuthFormControllerFamily extends Family<AsyncValue<void>> {
 
   /// See also [AuthFormController].
   AuthFormControllerProvider call(
-    AuthFormKey formKey,
+    AuthFormKey formKeyArg,
   ) {
     return AuthFormControllerProvider(
-      formKey,
+      formKeyArg,
     );
   }
 
@@ -62,7 +62,7 @@ class AuthFormControllerFamily extends Family<AsyncValue<void>> {
     covariant AuthFormControllerProvider provider,
   ) {
     return call(
-      provider.formKey,
+      provider.formKeyArg,
     );
   }
 
@@ -86,9 +86,9 @@ class AuthFormControllerProvider extends AutoDisposeNotifierProviderImpl<
     AuthFormController, AsyncValue<void>> {
   /// See also [AuthFormController].
   AuthFormControllerProvider(
-    AuthFormKey formKey,
+    AuthFormKey formKeyArg,
   ) : this._internal(
-          () => AuthFormController()..formKey = formKey,
+          () => AuthFormController()..formKeyArg = formKeyArg,
           from: authFormControllerProvider,
           name: r'authFormControllerProvider',
           debugGetCreateSourceHash:
@@ -98,7 +98,7 @@ class AuthFormControllerProvider extends AutoDisposeNotifierProviderImpl<
           dependencies: AuthFormControllerFamily._dependencies,
           allTransitiveDependencies:
               AuthFormControllerFamily._allTransitiveDependencies,
-          formKey: formKey,
+          formKeyArg: formKeyArg,
         );
 
   AuthFormControllerProvider._internal(
@@ -108,17 +108,17 @@ class AuthFormControllerProvider extends AutoDisposeNotifierProviderImpl<
     required super.allTransitiveDependencies,
     required super.debugGetCreateSourceHash,
     required super.from,
-    required this.formKey,
+    required this.formKeyArg,
   }) : super.internal();
 
-  final AuthFormKey formKey;
+  final AuthFormKey formKeyArg;
 
   @override
   AsyncValue<void> runNotifierBuild(
     covariant AuthFormController notifier,
   ) {
     return notifier.build(
-      formKey,
+      formKeyArg,
     );
   }
 
@@ -127,13 +127,13 @@ class AuthFormControllerProvider extends AutoDisposeNotifierProviderImpl<
     return ProviderOverride(
       origin: this,
       override: AuthFormControllerProvider._internal(
-        () => create()..formKey = formKey,
+        () => create()..formKeyArg = formKeyArg,
         from: from,
         name: null,
         dependencies: null,
         allTransitiveDependencies: null,
         debugGetCreateSourceHash: null,
-        formKey: formKey,
+        formKeyArg: formKeyArg,
       ),
     );
   }
@@ -146,13 +146,14 @@ class AuthFormControllerProvider extends AutoDisposeNotifierProviderImpl<
 
   @override
   bool operator ==(Object other) {
-    return other is AuthFormControllerProvider && other.formKey == formKey;
+    return other is AuthFormControllerProvider &&
+        other.formKeyArg == formKeyArg;
   }
 
   @override
   int get hashCode {
     var hash = _SystemHash.combine(0, runtimeType.hashCode);
-    hash = _SystemHash.combine(hash, formKey.hashCode);
+    hash = _SystemHash.combine(hash, formKeyArg.hashCode);
 
     return _SystemHash.finish(hash);
   }
@@ -160,8 +161,8 @@ class AuthFormControllerProvider extends AutoDisposeNotifierProviderImpl<
 
 mixin AuthFormControllerRef
     on AutoDisposeNotifierProviderRef<AsyncValue<void>> {
-  /// The parameter `formKey` of this provider.
-  AuthFormKey get formKey;
+  /// The parameter `formKeyArg` of this provider.
+  AuthFormKey get formKeyArg;
 }
 
 class _AuthFormControllerProviderElement
@@ -170,7 +171,8 @@ class _AuthFormControllerProviderElement
   _AuthFormControllerProviderElement(super.provider);
 
   @override
-  AuthFormKey get formKey => (origin as AuthFormControllerProvider).formKey;
+  AuthFormKey get formKeyArg =>
+      (origin as AuthFormControllerProvider).formKeyArg;
 }
 // ignore_for_file: type=lint
 // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/features/dashboard/dashboard_controller.dart b/designer_v2/lib/features/dashboard/dashboard_controller.dart
index 5bc310138..bdfc14603 100644
--- a/designer_v2/lib/features/dashboard/dashboard_controller.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_controller.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
@@ -18,8 +17,6 @@ import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/routing/router_intent.dart';
 import 'package:studyu_designer_v2/utils/model_action.dart';
 
-import 'dashboard_state.dart';
-
 part 'dashboard_controller.g.dart';
 
 @riverpod
@@ -58,7 +55,7 @@ class DashboardController extends _$DashboardController
 
   final SearchController searchController = SearchController();
 
-  _subscribeStudies() {
+  void _subscribeStudies() {
     _studiesSubscription = studyRepository.watchAll().listen((wrappedModels) {
       print("studyRepository.update");
       // Update the controller's state when new studies are available in the repository
@@ -66,11 +63,11 @@ class DashboardController extends _$DashboardController
       state = state.copyWith(
         studies: () => AsyncValue.data(studies),
       );
-    }, onError: (error) {
+    }, onError: (Object error) {
       state = state.copyWith(
         studies: () => AsyncValue.error(error, StackTrace.current),
       );
-    });
+    },);
   }
 
   void setSearchText(String? text) {
diff --git a/designer_v2/lib/features/dashboard/dashboard_controller.g.dart b/designer_v2/lib/features/dashboard/dashboard_controller.g.dart
index 74914b509..96ca59be1 100644
--- a/designer_v2/lib/features/dashboard/dashboard_controller.g.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_controller.g.dart
@@ -7,7 +7,7 @@ part of 'dashboard_controller.dart';
 // **************************************************************************
 
 String _$dashboardControllerHash() =>
-    r'fca1f90b69e57979c77fccf0309d60a6f9ee153c';
+    r'2310b394163e63741253dd431a9131917a4a0853';
 
 /// See also [DashboardController].
 @ProviderFor(DashboardController)
diff --git a/designer_v2/lib/features/design/study_form_controller.dart b/designer_v2/lib/features/design/study_form_controller.dart
index 0d89a6880..4427f78f9 100644
--- a/designer_v2/lib/features/design/study_form_controller.dart
+++ b/designer_v2/lib/features/design/study_form_controller.dart
@@ -174,7 +174,7 @@ class StudyFormViewModel extends FormViewModel<Study>
 /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
 @riverpod
 StudyFormViewModel studyFormViewModel(
-    StudyFormViewModelRef ref, StudyID studyId) {
+    StudyFormViewModelRef ref, StudyID studyId,) {
   print("studyFormViewModel");
   final state = ref.watch(studyControllerProvider(studyId));
   return StudyFormViewModel(
diff --git a/designer_v2/lib/features/recruit/invite_code_form_controller.dart b/designer_v2/lib/features/recruit/invite_code_form_controller.dart
index 529e88181..5fab5272b 100644
--- a/designer_v2/lib/features/recruit/invite_code_form_controller.dart
+++ b/designer_v2/lib/features/recruit/invite_code_form_controller.dart
@@ -154,7 +154,7 @@ class InviteCodeFormViewModel extends FormViewModel<StudyInvite> {
 /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
 @riverpod
 InviteCodeFormViewModel inviteCodeFormViewModel(
-    InviteCodeFormViewModelRef ref, StudyID studyId) {
+    InviteCodeFormViewModelRef ref, StudyID studyId,) {
   print("inviteCodeFormViewModelProvider($studyId");
   // Reactively bind to and obtain [StudyController]'s current study
   final study = ref
diff --git a/designer_v2/lib/features/recruit/study_recruit_controller.dart b/designer_v2/lib/features/recruit/study_recruit_controller.dart
index 9733d886d..1c5bfc934 100644
--- a/designer_v2/lib/features/recruit/study_recruit_controller.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_controller.dart
@@ -31,7 +31,6 @@ class StudyRecruitController extends _$StudyRecruitController
       router: ref.watch(routerProvider),
       currentUser: ref.watch(authRepositoryProvider).currentUser,
       inviteCodeRepository: ref.watch(inviteCodeRepositoryProvider(studyId)),
-      invites: const AsyncValue.loading(),
     );
   }
 
diff --git a/designer_v2/lib/features/recruit/study_recruit_controller.g.dart b/designer_v2/lib/features/recruit/study_recruit_controller.g.dart
index e1ea441d9..13a7ffb53 100644
--- a/designer_v2/lib/features/recruit/study_recruit_controller.g.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_controller.g.dart
@@ -7,7 +7,7 @@ part of 'study_recruit_controller.dart';
 // **************************************************************************
 
 String _$studyRecruitControllerHash() =>
-    r'8dc8092f83dbab107eadaa274ad0cdfc09d79e38';
+    r'56f67622dfd42191e84c8b323cb73bbf175c55be';
 
 /// Copied from Dart SDK
 class _SystemHash {
diff --git a/designer_v2/lib/features/study/study_base_controller.dart b/designer_v2/lib/features/study/study_base_controller.dart
index 0fcf64ca5..be1af134e 100644
--- a/designer_v2/lib/features/study/study_base_controller.dart
+++ b/designer_v2/lib/features/study/study_base_controller.dart
@@ -10,7 +10,6 @@ import 'package:studyu_designer_v2/repositories/model_repository.dart';
 import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/routing/router_intent.dart';
-import 'package:supabase_flutter/supabase_flutter.dart';
 
 part 'study_base_controller.g.dart';
 
@@ -28,12 +27,6 @@ class StudyBaseController<T extends StudyControllerBaseState>
     );
   }
 
-  // TODO MERGE
-  /*final StudyID studyId;
-  final IStudyRepository studyRepository;
-  final User? currentUser;
-  final GoRouter router;*/
-
   StreamSubscription<WrappedModel<Study>>? studySubscription;
 
   void subscribeStudy(StudyID studyId) {
diff --git a/designer_v2/lib/features/study/study_base_controller.g.dart b/designer_v2/lib/features/study/study_base_controller.g.dart
index e906e67ee..22e0550bf 100644
--- a/designer_v2/lib/features/study/study_base_controller.g.dart
+++ b/designer_v2/lib/features/study/study_base_controller.g.dart
@@ -7,7 +7,7 @@ part of 'study_base_controller.dart';
 // **************************************************************************
 
 String _$studyBaseControllerHash() =>
-    r'1277944be2302e5d8f5d0c9bdc36e05a05d2d104';
+    r'eee64a32d8b5b1277ee6e793df29400508bd54fc';
 
 /// Copied from Dart SDK
 class _SystemHash {
diff --git a/designer_v2/lib/features/study/study_controller.dart b/designer_v2/lib/features/study/study_controller.dart
index 98ce248f2..7bc583a2f 100644
--- a/designer_v2/lib/features/study/study_controller.dart
+++ b/designer_v2/lib/features/study/study_controller.dart
@@ -9,11 +9,10 @@ import 'package:studyu_designer_v2/features/study/study_controller_state.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/repositories/model_repository.dart';
 import 'package:studyu_designer_v2/repositories/model_repository_events.dart';
+import 'package:studyu_designer_v2/repositories/study_repository.dart';
+import 'package:studyu_designer_v2/routing/router.dart';
 import 'package:studyu_designer_v2/routing/router_intent.dart';
 
-import '../../repositories/study_repository.dart';
-import '../../routing/router.dart';
-
 part 'study_controller.g.dart';
 
 @riverpod
@@ -23,10 +22,11 @@ class StudyController extends _$StudyController {
     syncStudyStatus();
     ref.onDispose(() => _studyEventsSubscription?.cancel());
     return StudyControllerState(
-        studyId: studyId,
-        studyRepository: ref.watch(studyRepositoryProvider),
-        router: ref.watch(routerProvider),
-        currentUser: ref.watch(authRepositoryProvider).currentUser);
+      studyId: studyId,
+      studyRepository: ref.watch(studyRepositoryProvider),
+      router: ref.watch(routerProvider),
+      currentUser: ref.watch(authRepositoryProvider).currentUser,
+    );
   }
 
   StreamSubscription<ModelEvent<Study>>? _studyEventsSubscription;
@@ -52,7 +52,7 @@ class StudyController extends _$StudyController {
     });
   }
 
-  onStudySubscriptionUpdate(WrappedModel<Study> wrappedModel) {
+  void onStudySubscriptionUpdate(WrappedModel<Study> wrappedModel) {
     ref
         .watch(studyBaseControllerProvider(state.studyId).notifier)
         .onStudySubscriptionUpdate(wrappedModel);
diff --git a/designer_v2/lib/features/study/study_controller.g.dart b/designer_v2/lib/features/study/study_controller.g.dart
index cff6c09e7..92266c29f 100644
--- a/designer_v2/lib/features/study/study_controller.g.dart
+++ b/designer_v2/lib/features/study/study_controller.g.dart
@@ -6,7 +6,7 @@ part of 'study_controller.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$studyControllerHash() => r'23bdef67597ce483a453b46c962f93804fca09b2';
+String _$studyControllerHash() => r'65427ca5137b4388e81b0e230014c900c541beb0';
 
 /// Copied from Dart SDK
 class _SystemHash {
diff --git a/designer_v2/lib/features/study/study_controller_state.dart b/designer_v2/lib/features/study/study_controller_state.dart
index 3874d08d0..f94a067b1 100644
--- a/designer_v2/lib/features/study/study_controller_state.dart
+++ b/designer_v2/lib/features/study/study_controller_state.dart
@@ -7,7 +7,7 @@ import 'package:studyu_designer_v2/features/study/study_base_state.dart';
 import 'package:studyu_designer_v2/features/study/study_scaffold.dart';
 import 'package:studyu_designer_v2/repositories/model_repository.dart';
 
-import '../../utils/model_action.dart';
+import 'package:studyu_designer_v2/utils/model_action.dart';
 
 class StudyControllerState extends StudyControllerBaseState
     implements IStudyAppBarViewModel, ISyncIndicatorViewModel {
@@ -19,7 +19,7 @@ class StudyControllerState extends StudyControllerBaseState
       super.studyWithMetadata,
       this.isDirty = false,
       this.syncState = const AsyncValue<void>.data(null),
-      this.lastSynced});
+      this.lastSynced,});
 
   bool get isPublished => study.value != null && study.value!.published;
 
@@ -34,7 +34,7 @@ class StudyControllerState extends StudyControllerBaseState
             .availableActions(studyVal)
             .where((action) => action.type != StudyActionType.edit)
             .toList(),
-        studyActionIcons);
+        studyActionIcons,);
   }
 
   // - ISyncIndicatorViewModel
diff --git a/designer_v2/lib/features/study/study_test_controller.dart b/designer_v2/lib/features/study/study_test_controller.dart
index a75bb1ec3..f62aa8448 100644
--- a/designer_v2/lib/features/study/study_test_controller.dart
+++ b/designer_v2/lib/features/study/study_test_controller.dart
@@ -3,12 +3,11 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/features/study/study_test_controller_state.dart';
 import 'package:studyu_designer_v2/features/study/study_test_frame_controllers.dart';
+import 'package:studyu_designer_v2/localization/locale_providers.dart';
 import 'package:studyu_designer_v2/localization/string_hardcoded.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
-
-import '../../localization/locale_providers.dart';
-import '../../repositories/study_repository.dart';
-import '../../routing/router.dart';
+import 'package:studyu_designer_v2/repositories/study_repository.dart';
+import 'package:studyu_designer_v2/routing/router.dart';
 
 part 'study_test_controller.g.dart';
 
@@ -41,7 +40,7 @@ class StudyTestController extends _$StudyTestController {
 
 @riverpod
 PlatformController studyTestPlatformController(
-    StudyTestPlatformControllerRef ref, StudyID studyId) {
+    StudyTestPlatformControllerRef ref, StudyID studyId,) {
   final state = ref.watch(studyTestControllerProvider(studyId));
   PlatformController platformController;
   if (!kIsWeb) {
diff --git a/designer_v2/lib/localization/app_translation.dart b/designer_v2/lib/localization/app_translation.dart
index 0dadd0784..52529d2f7 100644
--- a/designer_v2/lib/localization/app_translation.dart
+++ b/designer_v2/lib/localization/app_translation.dart
@@ -7,7 +7,7 @@ AppLocalizations get tr => _tr!;
 late AppLocalizations? _tr;
 
 class AppTranslation {
-  static Future<void> init(WidgetRef ref) {
+  static Future<void> init(WidgetRef ref) async {
     // Loads the currently selected locale and sets the localization
     _tr = lookupAppLocalizations(ref.watch(localeProvider));
   }
diff --git a/designer_v2/lib/localization/language_picker.dart b/designer_v2/lib/localization/language_picker.dart
index 2dec07d1c..3d9ac6585 100644
--- a/designer_v2/lib/localization/language_picker.dart
+++ b/designer_v2/lib/localization/language_picker.dart
@@ -4,11 +4,10 @@ import 'package:reactive_forms/reactive_forms.dart';
 import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/localization/locale_providers.dart';
+import 'package:studyu_designer_v2/localization/locale_state.dart';
 import 'package:studyu_designer_v2/localization/locale_translate_name.dart';
 import 'package:studyu_designer_v2/utils/font.dart';
 
-import 'locale_state.dart';
-
 enum LanguagePickerType { field, icon }
 
 class LanguagePicker extends ConsumerStatefulWidget {
diff --git a/designer_v2/lib/localization/locale_providers.dart b/designer_v2/lib/localization/locale_providers.dart
index c83ed9122..75bfa7efc 100644
--- a/designer_v2/lib/localization/locale_providers.dart
+++ b/designer_v2/lib/localization/locale_providers.dart
@@ -5,8 +5,6 @@ import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/localization/locale_state.dart';
 import 'package:studyu_designer_v2/localization/platform_locale/platform_locale_interface.dart';
 
-import 'locale_state.dart';
-
 part 'locale_providers.g.dart';
 
 /// Platform Locale Provider
diff --git a/designer_v2/lib/localization/locale_state.dart b/designer_v2/lib/localization/locale_state.dart
index c60fc0744..992de9858 100644
--- a/designer_v2/lib/localization/locale_state.dart
+++ b/designer_v2/lib/localization/locale_state.dart
@@ -4,8 +4,6 @@ import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/localization/locale_providers.dart';
 import 'package:studyu_flutter_common/studyu_flutter_common.dart';
 
-import 'locale_providers.dart';
-
 part 'locale_state.g.dart';
 
 Locale fallbackLocale =
@@ -31,13 +29,7 @@ class LocaleStateNotifier extends _$LocaleStateNotifier {
     /// 1. Attempts to restore locale from storage
     /// 2. IF no locale in storage, attempts to set local from the platform settings
     // Attempt to restore from storage
-    final bool fromStorageSuccess = restoreFromStorage();
-
-    // TODO MERGE
-    // If storage restore did not work, set from platform
-    if (!fromStorageSuccess) {
-      setLocale(ref.read(platformLocaleProvider));
-    }
+    restoreFromStorage();
     return LocaleState(fallbackLocale);
   }
 
@@ -47,14 +39,12 @@ class LocaleStateNotifier extends _$LocaleStateNotifier {
   /// Attempts to set the locale if it's in our list of supported locales.
   /// IF NOT: get the first locale that matches our language code and set that
   /// ELSE: do nothing.
-  void setLocale(Locale locale) async {
+  Future<void> setLocale(Locale locale) async {
     final List<Locale> supportedLocales = ref.watch(supportedLocalesProvider);
 
     // Set the locale if it's in our list of supported locales
     if (supportedLocales.contains(locale)) {
       state = state.copyWith(locale: locale);
-      // TODO MERGE
-      // save();
     }
 
     // Get the closest language locale and set that instead
@@ -72,10 +62,8 @@ class LocaleStateNotifier extends _$LocaleStateNotifier {
 
   /// Restore Locale from Storage
   Future<bool> restoreFromStorage() async {
-    // TODO MERGE
-    return (await load()) != null;
-    /*try {
-      LocaleState? loadedState = await load();
+    try {
+      final LocaleState? loadedState = await load();
       if (loadedState != null) {
         state = loadedState;
         return true;
@@ -85,7 +73,7 @@ class LocaleStateNotifier extends _$LocaleStateNotifier {
     }
     // If storage restore did not work, set from platform
     setLocale(ref.watch(platformLocaleProvider));
-    return false;*/
+    return false;
   }
 
   Future<LocaleState?> load() async {
diff --git a/designer_v2/lib/localization/locale_state.g.dart b/designer_v2/lib/localization/locale_state.g.dart
index 69fa9100a..32cbbf45f 100644
--- a/designer_v2/lib/localization/locale_state.g.dart
+++ b/designer_v2/lib/localization/locale_state.g.dart
@@ -7,7 +7,7 @@ part of 'locale_state.dart';
 // **************************************************************************
 
 String _$localeStateNotifierHash() =>
-    r'33481e3cb3540bd28ad8ad47668e6f9d1d1c5594';
+    r'b46bc9c75e031b5fb7fea260827e94ca4522bd2f';
 
 /// See also [LocaleStateNotifier].
 @ProviderFor(LocaleStateNotifier)
diff --git a/designer_v2/lib/repositories/auth_repository.dart b/designer_v2/lib/repositories/auth_repository.dart
index 476801a60..e028d881d 100644
--- a/designer_v2/lib/repositories/auth_repository.dart
+++ b/designer_v2/lib/repositories/auth_repository.dart
@@ -169,4 +169,4 @@ AuthRepository authRepository(AuthRepositoryRef ref) {
     supabaseClient: ref.watch(supabaseClientProvider),
   );
   return authRepository;
-}
\ No newline at end of file
+}
diff --git a/designer_v2/lib/repositories/invite_code_repository.dart b/designer_v2/lib/repositories/invite_code_repository.dart
index 27e977664..7453fe7a5 100644
--- a/designer_v2/lib/repositories/invite_code_repository.dart
+++ b/designer_v2/lib/repositories/invite_code_repository.dart
@@ -210,7 +210,7 @@ class InviteCodeRepositoryDelegate
 
 @riverpod
 InviteCodeRepository inviteCodeRepository(
-    InviteCodeRepositoryRef ref, StudyID studyId) {
+    InviteCodeRepositoryRef ref, StudyID studyId,) {
   print("inviteCodeRepositoryProvider($studyId");
   // Initialize repository for a given study
   final repository = InviteCodeRepository(
diff --git a/designer_v2/lib/repositories/supabase_client.dart b/designer_v2/lib/repositories/supabase_client.dart
index db299255f..619f4b132 100644
--- a/designer_v2/lib/repositories/supabase_client.dart
+++ b/designer_v2/lib/repositories/supabase_client.dart
@@ -1,4 +1,3 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_core/env.dart' as env;
@@ -121,4 +120,5 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
 
 // Re-expose the global client object via Riverpod
 @riverpod
-SupabaseClient supabaseClient(SupabaseClientRef ref) => env.client;
+SupabaseClient supabaseClient(AutoDisposeProviderRef<SupabaseClient> ref) =>
+    env.client;
diff --git a/designer_v2/lib/repositories/supabase_client.g.dart b/designer_v2/lib/repositories/supabase_client.g.dart
index c4f4bb378..6b045a168 100644
--- a/designer_v2/lib/repositories/supabase_client.g.dart
+++ b/designer_v2/lib/repositories/supabase_client.g.dart
@@ -6,7 +6,7 @@ part of 'supabase_client.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$supabaseClientHash() => r'a3bca1b178af5002bfaaa08960ce5520580da5c9';
+String _$supabaseClientHash() => r'0495fe5018c2413148c8c0381a3095ec37bddfff';
 
 /// See also [supabaseClient].
 @ProviderFor(supabaseClient)
diff --git a/designer_v2/lib/routing/router.dart b/designer_v2/lib/routing/router.dart
index a077ab52d..b36a1295f 100644
--- a/designer_v2/lib/routing/router.dart
+++ b/designer_v2/lib/routing/router.dart
@@ -8,8 +8,6 @@ import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/routing/router_config.dart';
 import 'package:studyu_designer_v2/utils/combined_stream_notifier.dart';
 
-import 'router_config.dart';
-
 part 'router.g.dart';
 
 /// How to create a new page & use it for navigation:
diff --git a/designer_v2/lib/routing/router.g.dart b/designer_v2/lib/routing/router.g.dart
index dcb8481ee..aae7af10b 100644
--- a/designer_v2/lib/routing/router.g.dart
+++ b/designer_v2/lib/routing/router.g.dart
@@ -6,7 +6,7 @@ part of 'router.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$routerHash() => r'886e6d20b787c9de54b15fa4dbeb51079e829937';
+String _$routerHash() => r'a50ae258d96a8f7c2bec1945352920fcd92426d2';
 
 /// How to create a new page & use it for navigation:
 ///
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 4e039e46f..7031cf84f 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -65,6 +65,70 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
+  build:
+    dependency: transitive
+    description:
+      name: build
+      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  build_config:
+    dependency: transitive
+    description:
+      name: build_config
+      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
+  build_daemon:
+    dependency: transitive
+    description:
+      name: build_daemon
+      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.2"
+  build_resolvers:
+    dependency: transitive
+    description:
+      name: build_resolvers
+      sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2"
+  build_runner:
+    dependency: "direct dev"
+    description:
+      name: build_runner
+      sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.11"
+  build_runner_core:
+    dependency: transitive
+    description:
+      name: build_runner_core
+      sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.3.1"
+  built_collection:
+    dependency: transitive
+    description:
+      name: built_collection
+      sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.1.1"
+  built_value:
+    dependency: transitive
+    description:
+      name: built_value
+      sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.9.2"
   characters:
     dependency: transitive
     description:
@@ -105,6 +169,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
+  code_builder:
+    dependency: transitive
+    description:
+      name: code_builder
+      sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.10.0"
   collection:
     dependency: transitive
     description:
@@ -399,6 +471,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.8.0"
+  graphs:
+    dependency: transitive
+    description:
+      name: graphs
+      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.1"
   gtk:
     dependency: transitive
     description:
@@ -844,6 +924,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.5.1"
+  riverpod_annotation:
+    dependency: "direct main"
+    description:
+      name: riverpod_annotation
+      sha256: e5e796c0eba4030c704e9dae1b834a6541814963292839dcf9638d53eba84f5c
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.5"
+  riverpod_generator:
+    dependency: "direct dev"
+    description:
+      name: riverpod_generator
+      sha256: d451608bf17a372025fc36058863737636625dfdb7e3cbf6142e0dfeb366ab22
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.0"
   riverpod_lint:
     dependency: "direct dev"
     description:
@@ -961,6 +1057,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.99"
+  source_gen:
+    dependency: transitive
+    description:
+      name: source_gen
+      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.0"
   source_map_stack_trace:
     dependency: transitive
     description:
@@ -1119,6 +1223,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.6.0"
+  timing:
+    dependency: transitive
+    description:
+      name: timing
+      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
   typed_data:
     dependency: transitive
     description:

From 1643dc3fefb8c4ba5935acec3061093889984122 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 16 Jun 2024 17:55:02 +0200
Subject: [PATCH 193/314] chore: add todo

---
 designer_v2/lib/routing/router.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_v2/lib/routing/router.dart b/designer_v2/lib/routing/router.dart
index b36a1295f..7c035458e 100644
--- a/designer_v2/lib/routing/router.dart
+++ b/designer_v2/lib/routing/router.dart
@@ -69,7 +69,7 @@ GoRouter router(RouterRef ref) {
       return router.namedLocation(name, queryParameters: qParams);
     }
 
-    // TODO MERGE
+    // Todo can we implement splash screen as part of the Flutter initialization process?
     /*if (!isInitialized) {
       // Redirect to splash screen while app is pending initialization
       return isOnSplashPage ? null : namedLocForwarded(splashRouteName);

From 161b8c9ec8cbe3847c423a15d701ce3704db89ac Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 16 Jun 2024 17:56:33 +0200
Subject: [PATCH 194/314] chore: generate format fix

---
 .../lib/features/app_controller.g.dart        |  2 +-
 .../features/auth/auth_form_controller.g.dart |  2 +-
 .../dashboard/dashboard_controller.dart       | 27 +++---
 .../design/study_form_controller.dart         |  4 +-
 .../features/design/study_form_providers.dart | 96 +++++++++++++++----
 .../recruit/invite_code_form_controller.dart  |  4 +-
 .../study/study_controller_state.dart         | 30 +++---
 .../features/study/study_test_controller.dart |  4 +-
 .../repositories/invite_code_repository.dart  |  4 +-
 .../lib/repositories/study_repository.dart    |  8 +-
 10 files changed, 125 insertions(+), 56 deletions(-)

diff --git a/designer_v2/lib/features/app_controller.g.dart b/designer_v2/lib/features/app_controller.g.dart
index 0db5fb3c9..16300035d 100644
--- a/designer_v2/lib/features/app_controller.g.dart
+++ b/designer_v2/lib/features/app_controller.g.dart
@@ -6,7 +6,7 @@ part of 'app_controller.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$appControllerHash() => r'bbe9d711818ec2ae14174b269317d11c5c987dbd';
+String _$appControllerHash() => r'8d6b7414b146ea917e5bd4b6bc853bfdf5768716';
 
 /// Main controller that's bound to the top-level application widget's state
 ///
diff --git a/designer_v2/lib/features/auth/auth_form_controller.g.dart b/designer_v2/lib/features/auth/auth_form_controller.g.dart
index 014571aa9..737b30dbe 100644
--- a/designer_v2/lib/features/auth/auth_form_controller.g.dart
+++ b/designer_v2/lib/features/auth/auth_form_controller.g.dart
@@ -7,7 +7,7 @@ part of 'auth_form_controller.dart';
 // **************************************************************************
 
 String _$authFormControllerHash() =>
-    r'd2cbe152c9e265eee89031208b3df027beb183be';
+    r'57c06256128a6e7e04aacf180f5f8dbcbfd0413b';
 
 /// Copied from Dart SDK
 class _SystemHash {
diff --git a/designer_v2/lib/features/dashboard/dashboard_controller.dart b/designer_v2/lib/features/dashboard/dashboard_controller.dart
index bdfc14603..426c8800f 100644
--- a/designer_v2/lib/features/dashboard/dashboard_controller.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_controller.dart
@@ -56,18 +56,21 @@ class DashboardController extends _$DashboardController
   final SearchController searchController = SearchController();
 
   void _subscribeStudies() {
-    _studiesSubscription = studyRepository.watchAll().listen((wrappedModels) {
-      print("studyRepository.update");
-      // Update the controller's state when new studies are available in the repository
-      final studies = wrappedModels.map((study) => study.model).toList();
-      state = state.copyWith(
-        studies: () => AsyncValue.data(studies),
-      );
-    }, onError: (Object error) {
-      state = state.copyWith(
-        studies: () => AsyncValue.error(error, StackTrace.current),
-      );
-    },);
+    _studiesSubscription = studyRepository.watchAll().listen(
+      (wrappedModels) {
+        print("studyRepository.update");
+        // Update the controller's state when new studies are available in the repository
+        final studies = wrappedModels.map((study) => study.model).toList();
+        state = state.copyWith(
+          studies: () => AsyncValue.data(studies),
+        );
+      },
+      onError: (Object error) {
+        state = state.copyWith(
+          studies: () => AsyncValue.error(error, StackTrace.current),
+        );
+      },
+    );
   }
 
   void setSearchText(String? text) {
diff --git a/designer_v2/lib/features/design/study_form_controller.dart b/designer_v2/lib/features/design/study_form_controller.dart
index 4427f78f9..042128a4d 100644
--- a/designer_v2/lib/features/design/study_form_controller.dart
+++ b/designer_v2/lib/features/design/study_form_controller.dart
@@ -174,7 +174,9 @@ class StudyFormViewModel extends FormViewModel<Study>
 /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
 @riverpod
 StudyFormViewModel studyFormViewModel(
-    StudyFormViewModelRef ref, StudyID studyId,) {
+  StudyFormViewModelRef ref,
+  StudyID studyId,
+) {
   print("studyFormViewModel");
   final state = ref.watch(studyControllerProvider(studyId));
   return StudyFormViewModel(
diff --git a/designer_v2/lib/features/design/study_form_providers.dart b/designer_v2/lib/features/design/study_form_providers.dart
index b6353cbac..df0e8e90f 100644
--- a/designer_v2/lib/features/design/study_form_providers.dart
+++ b/designer_v2/lib/features/design/study_form_providers.dart
@@ -25,71 +25,121 @@ part 'study_form_providers.g.dart';
 // - Study Info
 
 @riverpod
-StudyInfoFormViewModel studyInfoFormViewModel(StudyInfoFormViewModelRef ref, StudyID studyId) {
+StudyInfoFormViewModel studyInfoFormViewModel(
+  StudyInfoFormViewModelRef ref,
+  StudyID studyId,
+) {
   return ref.watch(studyFormViewModelProvider(studyId)).studyInfoFormViewModel;
 }
 
 // - Enrollment
 
 @riverpod
-EnrollmentFormViewModel enrollmentFormViewModel(EnrollmentFormViewModelRef ref, StudyID studyId) {
+EnrollmentFormViewModel enrollmentFormViewModel(
+  EnrollmentFormViewModelRef ref,
+  StudyID studyId,
+) {
   return ref.watch(studyFormViewModelProvider(studyId)).enrollmentFormViewModel;
 }
 
 @riverpod
-ScreenerQuestionFormViewModel screenerQuestionFormViewModel(ScreenerQuestionFormViewModelRef ref, ScreenerQuestionFormRouteArgs args) {
+ScreenerQuestionFormViewModel screenerQuestionFormViewModel(
+  ScreenerQuestionFormViewModelRef ref,
+  ScreenerQuestionFormRouteArgs args,
+) {
   return ref.watch(enrollmentFormViewModelProvider(args.studyId)).provide(args);
 }
 
 @riverpod
-ConsentItemFormViewModel consentItemFormViewModel(ConsentItemFormViewModelRef ref, ConsentItemFormRouteArgs args) {
-  return ref.watch(enrollmentFormViewModelProvider(args.studyId)).consentItemDelegate.provide(args);
+ConsentItemFormViewModel consentItemFormViewModel(
+  ConsentItemFormViewModelRef ref,
+  ConsentItemFormRouteArgs args,
+) {
+  return ref
+      .watch(enrollmentFormViewModelProvider(args.studyId))
+      .consentItemDelegate
+      .provide(args);
 }
 
 // - Interventions
 
 @riverpod
-InterventionsFormViewModel interventionsFormViewModel(InterventionsFormViewModelRef ref, StudyID studyId) {
-  return ref.watch(studyFormViewModelProvider(studyId)).interventionsFormViewModel;
+InterventionsFormViewModel interventionsFormViewModel(
+  InterventionsFormViewModelRef ref,
+  StudyID studyId,
+) {
+  return ref
+      .watch(studyFormViewModelProvider(studyId))
+      .interventionsFormViewModel;
 }
 
 @riverpod
-InterventionFormViewModel interventionFormViewModel(InterventionFormViewModelRef ref, InterventionFormRouteArgs args) {
-  return ref.watch(interventionsFormViewModelProvider(args.studyId)).provide(args);
+InterventionFormViewModel interventionFormViewModel(
+  InterventionFormViewModelRef ref,
+  InterventionFormRouteArgs args,
+) {
+  return ref
+      .watch(interventionsFormViewModelProvider(args.studyId))
+      .provide(args);
 }
 
 @riverpod
-InterventionTaskFormViewModel interventionTaskFormViewModel(InterventionTaskFormViewModelRef ref, InterventionTaskFormRouteArgs args) {
+InterventionTaskFormViewModel interventionTaskFormViewModel(
+  InterventionTaskFormViewModelRef ref,
+  InterventionTaskFormRouteArgs args,
+) {
   return ref.watch(interventionFormViewModelProvider(args)).provide(args);
 }
 
 // - Measurements
 
 @riverpod
-MeasurementsFormViewModel measurementsFormViewModel(MeasurementsFormViewModelRef ref, StudyID studyId) {
-  return ref.watch(studyFormViewModelProvider(studyId)).measurementsFormViewModel;
+MeasurementsFormViewModel measurementsFormViewModel(
+  MeasurementsFormViewModelRef ref,
+  StudyID studyId,
+) {
+  return ref
+      .watch(studyFormViewModelProvider(studyId))
+      .measurementsFormViewModel;
 }
 
 @riverpod
-MeasurementSurveyFormViewModel surveyFormViewModel(SurveyFormViewModelRef ref, MeasurementFormRouteArgs args) {
-  return ref.watch(measurementsFormViewModelProvider(args.studyId)).provide(args);
+MeasurementSurveyFormViewModel surveyFormViewModel(
+  SurveyFormViewModelRef ref,
+  MeasurementFormRouteArgs args,
+) {
+  return ref
+      .watch(measurementsFormViewModelProvider(args.studyId))
+      .provide(args);
 }
 
 @riverpod
-QuestionFormViewModel surveyQuestionFormViewModel(SurveyQuestionFormViewModelRef ref, SurveyQuestionFormRouteArgs args) {
+QuestionFormViewModel surveyQuestionFormViewModel(
+  SurveyQuestionFormViewModelRef ref,
+  SurveyQuestionFormRouteArgs args,
+) {
   return ref.watch(surveyFormViewModelProvider(args)).provide(args);
 }
 
 // - Reports
 
 @riverpod
-ReportsFormViewModel reportsFormViewModel(ReportsFormViewModelRef ref, StudyID studyId) {
+ReportsFormViewModel reportsFormViewModel(
+  ReportsFormViewModelRef ref,
+  StudyID studyId,
+) {
   return ref.watch(studyFormViewModelProvider(studyId)).reportsFormViewModel;
 }
 
 @riverpod
-ReportItemFormViewModel reportItemFormViewModel(ReportItemFormViewModelRef ref, ReportItemFormRouteArgs args) {
-  return ref.watch(reportsFormViewModelProvider(args.studyId)).reportItemDelegate.provide(args);
+ReportItemFormViewModel reportItemFormViewModel(
+  ReportItemFormViewModelRef ref,
+  ReportItemFormRouteArgs args,
+) {
+  return ref
+      .watch(reportsFormViewModelProvider(args.studyId))
+      .reportItemDelegate
+      .provide(args);
 }
 
 // - Validators
@@ -97,7 +147,10 @@ ReportItemFormViewModel reportItemFormViewModel(ReportItemFormViewModelRef ref,
 /// Provides the [StudyFormViewModel] for validation purposes with
 /// a [StudyFormValidationSet.publish]
 @riverpod
-StudyFormViewModel studyPublishValidator(StudyPublishValidatorRef ref, StudyID studyId) {
+StudyFormViewModel studyPublishValidator(
+  StudyPublishValidatorRef ref,
+  StudyID studyId,
+) {
   final state = ref.watch(studyControllerProvider(studyId));
   return StudyFormViewModel(
     router: ref.watch(routerProvider),
@@ -111,7 +164,10 @@ StudyFormViewModel studyPublishValidator(StudyPublishValidatorRef ref, StudyID s
 /// Provides the [StudyFormViewModel] for validation purposes with
 /// a [StudyFormValidationSet.test]
 @riverpod
-StudyFormViewModel studyTestValidator(StudyTestValidatorRef ref, StudyID studyId) {
+StudyFormViewModel studyTestValidator(
+  StudyTestValidatorRef ref,
+  StudyID studyId,
+) {
   final state = ref.watch(studyControllerProvider(studyId));
   return StudyFormViewModel(
     router: ref.watch(routerProvider),
diff --git a/designer_v2/lib/features/recruit/invite_code_form_controller.dart b/designer_v2/lib/features/recruit/invite_code_form_controller.dart
index 5fab5272b..e521db638 100644
--- a/designer_v2/lib/features/recruit/invite_code_form_controller.dart
+++ b/designer_v2/lib/features/recruit/invite_code_form_controller.dart
@@ -154,7 +154,9 @@ class InviteCodeFormViewModel extends FormViewModel<StudyInvite> {
 /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
 @riverpod
 InviteCodeFormViewModel inviteCodeFormViewModel(
-    InviteCodeFormViewModelRef ref, StudyID studyId,) {
+  InviteCodeFormViewModelRef ref,
+  StudyID studyId,
+) {
   print("inviteCodeFormViewModelProvider($studyId");
   // Reactively bind to and obtain [StudyController]'s current study
   final study = ref
diff --git a/designer_v2/lib/features/study/study_controller_state.dart b/designer_v2/lib/features/study/study_controller_state.dart
index f94a067b1..f0f4749d0 100644
--- a/designer_v2/lib/features/study/study_controller_state.dart
+++ b/designer_v2/lib/features/study/study_controller_state.dart
@@ -11,15 +11,16 @@ import 'package:studyu_designer_v2/utils/model_action.dart';
 
 class StudyControllerState extends StudyControllerBaseState
     implements IStudyAppBarViewModel, ISyncIndicatorViewModel {
-  const StudyControllerState(
-      {required super.studyId,
-      required super.studyRepository,
-      required super.router,
-      required super.currentUser,
-      super.studyWithMetadata,
-      this.isDirty = false,
-      this.syncState = const AsyncValue<void>.data(null),
-      this.lastSynced,});
+  const StudyControllerState({
+    required super.studyId,
+    required super.studyRepository,
+    required super.router,
+    required super.currentUser,
+    super.studyWithMetadata,
+    this.isDirty = false,
+    this.syncState = const AsyncValue<void>.data(null),
+    this.lastSynced,
+  });
 
   bool get isPublished => study.value != null && study.value!.published;
 
@@ -30,11 +31,12 @@ class StudyControllerState extends StudyControllerBaseState
     }
     // filter out edit action since we are already editing the study
     return withIcons(
-        studyRepository
-            .availableActions(studyVal)
-            .where((action) => action.type != StudyActionType.edit)
-            .toList(),
-        studyActionIcons,);
+      studyRepository
+          .availableActions(studyVal)
+          .where((action) => action.type != StudyActionType.edit)
+          .toList(),
+      studyActionIcons,
+    );
   }
 
   // - ISyncIndicatorViewModel
diff --git a/designer_v2/lib/features/study/study_test_controller.dart b/designer_v2/lib/features/study/study_test_controller.dart
index f62aa8448..8d57450c3 100644
--- a/designer_v2/lib/features/study/study_test_controller.dart
+++ b/designer_v2/lib/features/study/study_test_controller.dart
@@ -40,7 +40,9 @@ class StudyTestController extends _$StudyTestController {
 
 @riverpod
 PlatformController studyTestPlatformController(
-    StudyTestPlatformControllerRef ref, StudyID studyId,) {
+  StudyTestPlatformControllerRef ref,
+  StudyID studyId,
+) {
   final state = ref.watch(studyTestControllerProvider(studyId));
   PlatformController platformController;
   if (!kIsWeb) {
diff --git a/designer_v2/lib/repositories/invite_code_repository.dart b/designer_v2/lib/repositories/invite_code_repository.dart
index 7453fe7a5..9589fefac 100644
--- a/designer_v2/lib/repositories/invite_code_repository.dart
+++ b/designer_v2/lib/repositories/invite_code_repository.dart
@@ -210,7 +210,9 @@ class InviteCodeRepositoryDelegate
 
 @riverpod
 InviteCodeRepository inviteCodeRepository(
-    InviteCodeRepositoryRef ref, StudyID studyId,) {
+  InviteCodeRepositoryRef ref,
+  StudyID studyId,
+) {
   print("inviteCodeRepositoryProvider($studyId");
   // Initialize repository for a given study
   final repository = InviteCodeRepository(
diff --git a/designer_v2/lib/repositories/study_repository.dart b/designer_v2/lib/repositories/study_repository.dart
index 582a7bdf0..470934a52 100644
--- a/designer_v2/lib/repositories/study_repository.dart
+++ b/designer_v2/lib/repositories/study_repository.dart
@@ -263,7 +263,7 @@ class StudyRepositoryDelegate extends IModelRepositoryDelegate<Study> {
 
 @riverpod
 StudyRepository studyRepository(StudyRepositoryRef ref) => StudyRepository(
-    apiClient: ref.watch(apiClientProvider),
-    authRepository: ref.watch(authRepositoryProvider),
-    ref: ref,
-  );
+      apiClient: ref.watch(apiClientProvider),
+      authRepository: ref.watch(authRepositoryProvider),
+      ref: ref,
+    );

From b99f0ebfca52d2ae5035d143c470d7f6c2a4ea7a Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 17 Jun 2024 11:29:36 +0200
Subject: [PATCH 195/314] fix: initialization route and splash page

---
 .../lib/common_views/pages/splash_page.dart   |  2 +-
 designer_v2/lib/features/app_controller.dart  | 21 +++++++++++++++++--
 .../lib/features/app_controller.g.dart        |  6 +++---
 designer_v2/lib/routing/router.dart           | 10 +++++----
 designer_v2/lib/routing/router.g.dart         |  2 +-
 5 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/designer_v2/lib/common_views/pages/splash_page.dart b/designer_v2/lib/common_views/pages/splash_page.dart
index 64368c9a2..35d43cc40 100644
--- a/designer_v2/lib/common_views/pages/splash_page.dart
+++ b/designer_v2/lib/common_views/pages/splash_page.dart
@@ -5,6 +5,6 @@ class SplashPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Container();
+    return const Center(child: CircularProgressIndicator());
   }
 }
diff --git a/designer_v2/lib/features/app_controller.dart b/designer_v2/lib/features/app_controller.dart
index 944f1aeb6..74d575057 100644
--- a/designer_v2/lib/features/app_controller.dart
+++ b/designer_v2/lib/features/app_controller.dart
@@ -17,7 +17,7 @@ abstract class IAppDelegate {
 @riverpod
 class AppController extends _$AppController {
   @override
-  Future<AppControllerState> build() async {
+  Stream<AppControllerState> build() {
     _appDelegates = [
       /// Register [IAppDelegate]s here for invocation of app lifecycle methods
       ref.watch(authRepositoryProvider),
@@ -25,15 +25,32 @@ class AppController extends _$AppController {
     ref.listenSelf((previous, next) {
       print("APP CONTROLLER STATE CHANGED: $next");
     });
+    ref.onDispose(() {
+      _stateController.close();
+    });
+    _initDeleagates();
+    return _stateController.stream;
+  }
+
+  Future<void> _initDeleagates() async {
     // Forward onAppStart to all registered delegates so that they can
     // e.g. read some data from local storage for initialization
     await _callDelegates(
       (delegate) => delegate.onAppStart(),
       withMinDelay: true,
     );
-    return const AppControllerState(status: AppStatus.initialized);
+    //if (!state.hasValue || state.hasValue && !state.value!.isInitialized) {
+    _stateController
+        .add(const AppControllerState(status: AppStatus.initialized));
+    //}
   }
 
+  Stream get stream => _stateController.stream;
+  final StreamController<AppControllerState> _stateController =
+      StreamController<AppControllerState>.broadcast();
+
+  bool get isInitialized => state.value?.status == AppStatus.initialized;
+
   /// List of listeners for app lifecycle events registered via Riverpod
   late final List<IAppDelegate> _appDelegates;
 
diff --git a/designer_v2/lib/features/app_controller.g.dart b/designer_v2/lib/features/app_controller.g.dart
index 16300035d..69f658505 100644
--- a/designer_v2/lib/features/app_controller.g.dart
+++ b/designer_v2/lib/features/app_controller.g.dart
@@ -6,13 +6,13 @@ part of 'app_controller.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$appControllerHash() => r'8d6b7414b146ea917e5bd4b6bc853bfdf5768716';
+String _$appControllerHash() => r'21b1c01db4c963e5ec1c534eaa31664a99f228be';
 
 /// Main controller that's bound to the top-level application widget's state
 ///
 /// Copied from [AppController].
 @ProviderFor(AppController)
-final appControllerProvider = AutoDisposeAsyncNotifierProvider<AppController,
+final appControllerProvider = AutoDisposeStreamNotifierProvider<AppController,
     AppControllerState>.internal(
   AppController.new,
   name: r'appControllerProvider',
@@ -23,6 +23,6 @@ final appControllerProvider = AutoDisposeAsyncNotifierProvider<AppController,
   allTransitiveDependencies: null,
 );
 
-typedef _$AppController = AutoDisposeAsyncNotifier<AppControllerState>;
+typedef _$AppController = AutoDisposeStreamNotifier<AppControllerState>;
 // ignore_for_file: type=lint
 // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/designer_v2/lib/routing/router.dart b/designer_v2/lib/routing/router.dart
index 7c035458e..5de8f6487 100644
--- a/designer_v2/lib/routing/router.dart
+++ b/designer_v2/lib/routing/router.dart
@@ -4,6 +4,7 @@ import 'package:go_router/go_router.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/common_views/pages/error_page.dart';
 import 'package:studyu_designer_v2/constants.dart';
+import 'package:studyu_designer_v2/features/app_controller.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/routing/router_config.dart';
 import 'package:studyu_designer_v2/utils/combined_stream_notifier.dart';
@@ -23,6 +24,7 @@ part 'router.g.dart';
 @riverpod
 GoRouter router(RouterRef ref) {
   final authRepository = ref.watch(authRepositoryProvider);
+  final appController = ref.watch(appControllerProvider.notifier);
   const defaultLocation = studiesRouteName;
   late final GoRouter router;
 
@@ -45,6 +47,7 @@ GoRouter router(RouterRef ref) {
     // Read most recent app state on re-evaluation (see refreshListenable)
     final isLoggedIn = authRepository.isLoggedIn;
     final allowPasswordReset = authRepository.allowPasswordReset;
+    final isInitialized = appController.isInitialized;
 
     // Carry original location through the redirect flow so that we can
     // redirect the user to where they came from after initialization
@@ -69,11 +72,10 @@ GoRouter router(RouterRef ref) {
       return router.namedLocation(name, queryParameters: qParams);
     }
 
-    // Todo can we implement splash screen as part of the Flutter initialization process?
-    /*if (!isInitialized) {
+    if (!isInitialized) {
       // Redirect to splash screen while app is pending initialization
       return isOnSplashPage ? null : namedLocForwarded(splashRouteName);
-    }*/
+    }
 
     // Handle password recovery
     if (allowPasswordReset) {
@@ -115,7 +117,7 @@ GoRouter router(RouterRef ref) {
   router = GoRouter(
     refreshListenable: CombinedStreamNotifier([
       // Any stream registered here will trigger the router's redirect logic
-      // appController.stream, // initialization events
+      appController.stream, // initialization events
       authRepository.watchAuthStateChanges(), // authentication events
     ]),
     routes: RouterConf.routes,
diff --git a/designer_v2/lib/routing/router.g.dart b/designer_v2/lib/routing/router.g.dart
index aae7af10b..e0954a71a 100644
--- a/designer_v2/lib/routing/router.g.dart
+++ b/designer_v2/lib/routing/router.g.dart
@@ -6,7 +6,7 @@ part of 'router.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$routerHash() => r'a50ae258d96a8f7c2bec1945352920fcd92426d2';
+String _$routerHash() => r'd7ad1119514bbeb51e6fb6dcc24b7df70485827d';
 
 /// How to create a new page & use it for navigation:
 ///

From 04f9515c7a7db9ce6f1295ae833b64cf39ffcac5 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 17 Jun 2024 12:16:40 +0200
Subject: [PATCH 196/314] fix: study controller no longer extends study base
 controller due to riverpod v2

---
 .../analyze/study_analyze_controller.dart     |  3 ++
 .../analyze/study_analyze_controller.g.dart   |  2 +-
 .../study_analyze_controller_state.dart       |  2 +-
 .../recruit/study_recruit_controller.dart     | 17 ++++---
 .../recruit/study_recruit_controller.g.dart   |  2 +-
 .../study_recruit_controller_state.dart       |  2 +-
 .../features/study/study_base_controller.dart | 25 ++++++++--
 .../study/study_base_controller.g.dart        |  2 +-
 .../lib/features/study/study_base_state.dart  |  2 +-
 .../lib/features/study/study_controller.dart  | 48 +++----------------
 .../features/study/study_controller.g.dart    |  2 +-
 .../features/study/study_test_controller.dart |  3 ++
 .../study/study_test_controller.g.dart        |  2 +-
 .../study/study_test_controller_state.dart    |  2 +-
 designer_v2/lib/routing/router.g.dart         |  2 +-
 15 files changed, 54 insertions(+), 62 deletions(-)

diff --git a/designer_v2/lib/features/analyze/study_analyze_controller.dart b/designer_v2/lib/features/analyze/study_analyze_controller.dart
index e6f960a31..c462b4fdb 100644
--- a/designer_v2/lib/features/analyze/study_analyze_controller.dart
+++ b/designer_v2/lib/features/analyze/study_analyze_controller.dart
@@ -3,6 +3,7 @@ import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/domain/study_export.dart';
 import 'package:studyu_designer_v2/features/analyze/study_analyze_controller_state.dart';
 import 'package:studyu_designer_v2/features/analyze/study_export_zip.dart';
+import 'package:studyu_designer_v2/features/study/study_controller.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
@@ -17,6 +18,8 @@ class StudyAnalyzeController extends _$StudyAnalyzeController {
     return StudyAnalyzeControllerState(
       studyId: studyId,
       studyRepository: ref.watch(studyRepositoryProvider),
+      studyWithMetadata:
+          ref.watch(studyControllerProvider(studyId)).studyWithMetadata,
       router: ref.watch(routerProvider),
       currentUser: ref.watch(authRepositoryProvider).currentUser,
     );
diff --git a/designer_v2/lib/features/analyze/study_analyze_controller.g.dart b/designer_v2/lib/features/analyze/study_analyze_controller.g.dart
index 32580e7d4..fe4d19025 100644
--- a/designer_v2/lib/features/analyze/study_analyze_controller.g.dart
+++ b/designer_v2/lib/features/analyze/study_analyze_controller.g.dart
@@ -7,7 +7,7 @@ part of 'study_analyze_controller.dart';
 // **************************************************************************
 
 String _$studyAnalyzeControllerHash() =>
-    r'b8b807673ff3f1e9ab65007220edfa3c8da32a49';
+    r'35cd3286b97372b300d4d3e871e3d86040913837';
 
 /// Copied from Dart SDK
 class _SystemHash {
diff --git a/designer_v2/lib/features/analyze/study_analyze_controller_state.dart b/designer_v2/lib/features/analyze/study_analyze_controller_state.dart
index 9bcf69319..b75cf8c6e 100644
--- a/designer_v2/lib/features/analyze/study_analyze_controller_state.dart
+++ b/designer_v2/lib/features/analyze/study_analyze_controller_state.dart
@@ -9,7 +9,7 @@ class StudyAnalyzeControllerState extends StudyControllerBaseState {
     required super.studyRepository,
     required super.router,
     required super.currentUser,
-    super.studyWithMetadata,
+    required super.studyWithMetadata,
   });
 
   bool get canExport => study.value?.canExport(currentUser!) ?? false;
diff --git a/designer_v2/lib/features/recruit/study_recruit_controller.dart b/designer_v2/lib/features/recruit/study_recruit_controller.dart
index 1c5bfc934..acadcc2f6 100644
--- a/designer_v2/lib/features/recruit/study_recruit_controller.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_controller.dart
@@ -4,6 +4,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/features/recruit/study_recruit_controller_state.dart';
+import 'package:studyu_designer_v2/features/study/study_controller.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 import 'package:studyu_designer_v2/repositories/invite_code_repository.dart';
 import 'package:studyu_designer_v2/repositories/model_repository.dart';
@@ -19,19 +20,21 @@ class StudyRecruitController extends _$StudyRecruitController
   /// [inviteCodeRepository] Reference to the repository for invite codes (resolved dynamically via Riverpod when the [state.study] becomes available)
   @override
   StudyRecruitControllerState build(StudyID studyId) {
-    print("StudyRecruitController.constructor");
-    _subscribeInvites();
-    ref.onDispose(() {
-      print("StudyRecruitController.dispose");
-      _invitesSubscription?.cancel();
-    });
-    return StudyRecruitControllerState(
+    state = StudyRecruitControllerState(
       studyId: studyId,
       studyRepository: ref.watch(studyRepositoryProvider),
+      studyWithMetadata:
+          ref.watch(studyControllerProvider(studyId)).studyWithMetadata,
       router: ref.watch(routerProvider),
       currentUser: ref.watch(authRepositoryProvider).currentUser,
       inviteCodeRepository: ref.watch(inviteCodeRepositoryProvider(studyId)),
     );
+    ref.onDispose(() {
+      print("StudyRecruitController.dispose");
+      _invitesSubscription?.cancel();
+    });
+    _subscribeInvites();
+    return state;
   }
 
   StreamSubscription<List<WrappedModel<StudyInvite>>>? _invitesSubscription;
diff --git a/designer_v2/lib/features/recruit/study_recruit_controller.g.dart b/designer_v2/lib/features/recruit/study_recruit_controller.g.dart
index 13a7ffb53..0f91cfa17 100644
--- a/designer_v2/lib/features/recruit/study_recruit_controller.g.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_controller.g.dart
@@ -7,7 +7,7 @@ part of 'study_recruit_controller.dart';
 // **************************************************************************
 
 String _$studyRecruitControllerHash() =>
-    r'56f67622dfd42191e84c8b323cb73bbf175c55be';
+    r'd17692a01616fc9a347f47b04494e97bdb95ff1b';
 
 /// Copied from Dart SDK
 class _SystemHash {
diff --git a/designer_v2/lib/features/recruit/study_recruit_controller_state.dart b/designer_v2/lib/features/recruit/study_recruit_controller_state.dart
index 8c9552c93..4efe4917c 100644
--- a/designer_v2/lib/features/recruit/study_recruit_controller_state.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_controller_state.dart
@@ -10,7 +10,7 @@ class StudyRecruitControllerState extends StudyControllerBaseState {
     required super.studyRepository,
     required super.router,
     required super.currentUser,
-    super.studyWithMetadata,
+    required super.studyWithMetadata,
     required this.inviteCodeRepository,
     this.invites = const AsyncValue.loading(),
   });
diff --git a/designer_v2/lib/features/study/study_base_controller.dart b/designer_v2/lib/features/study/study_base_controller.dart
index be1af134e..d98f4219d 100644
--- a/designer_v2/lib/features/study/study_base_controller.dart
+++ b/designer_v2/lib/features/study/study_base_controller.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
+import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/features/study/study_base_state.dart';
 import 'package:studyu_designer_v2/repositories/api_client.dart';
@@ -18,13 +19,15 @@ class StudyBaseController<T extends StudyControllerBaseState>
     extends _$StudyBaseController {
   @override
   StudyControllerBaseState build(StudyID studyId) {
-    subscribeStudy(studyId);
-    return StudyControllerBaseState(
+    state = StudyControllerBaseState(
       studyId: studyId,
       studyRepository: ref.watch(studyRepositoryProvider),
       router: ref.watch(routerProvider),
       currentUser: ref.watch(authRepositoryProvider).currentUser,
+      studyWithMetadata: null,
     );
+    subscribeStudy(studyId);
+    return state;
   }
 
   StreamSubscription<WrappedModel<Study>>? studySubscription;
@@ -39,7 +42,15 @@ class StudyBaseController<T extends StudyControllerBaseState>
   }
 
   void onStudySubscriptionUpdate(WrappedModel<Study> wrappedModel) {
-    state = state.copyWith(studyWithMetadata: wrappedModel) as T;
+    final studyId = wrappedModel.model.id;
+    _redirectNewToActualStudyID(studyId);
+    state = StudyControllerBaseState(
+      studyId: wrappedModel.model.id,
+      studyRepository: state.studyRepository,
+      router: state.router,
+      currentUser: state.currentUser,
+      studyWithMetadata: wrappedModel,
+    );
   }
 
   void onStudySubscriptionError(Object error) {
@@ -52,4 +63,12 @@ class StudyBaseController<T extends StudyControllerBaseState>
       state.router.dispatch(RoutingIntents.error(error));
     }
   }
+
+  /// Redirect to the study-specific URL to avoid disposing a dirty controller
+  /// when building subroutes
+  void _redirectNewToActualStudyID(StudyID actualStudyId) {
+    if (state.studyId == Config.newModelId) {
+      state.router.dispatch(RoutingIntents.study(actualStudyId));
+    }
+  }
 }
diff --git a/designer_v2/lib/features/study/study_base_controller.g.dart b/designer_v2/lib/features/study/study_base_controller.g.dart
index 22e0550bf..2bbeb11a1 100644
--- a/designer_v2/lib/features/study/study_base_controller.g.dart
+++ b/designer_v2/lib/features/study/study_base_controller.g.dart
@@ -7,7 +7,7 @@ part of 'study_base_controller.dart';
 // **************************************************************************
 
 String _$studyBaseControllerHash() =>
-    r'eee64a32d8b5b1277ee6e793df29400508bd54fc';
+    r'b6b47d4bf2d14f973df3669ed97ea27f62778c4b';
 
 /// Copied from Dart SDK
 class _SystemHash {
diff --git a/designer_v2/lib/features/study/study_base_state.dart b/designer_v2/lib/features/study/study_base_state.dart
index 88080c7fb..4238135f1 100644
--- a/designer_v2/lib/features/study/study_base_state.dart
+++ b/designer_v2/lib/features/study/study_base_state.dart
@@ -13,7 +13,7 @@ class StudyControllerBaseState extends Equatable {
     required this.studyRepository,
     required this.router,
     required this.currentUser,
-    this.studyWithMetadata,
+    required this.studyWithMetadata,
   });
 
   final StudyID studyId;
diff --git a/designer_v2/lib/features/study/study_controller.dart b/designer_v2/lib/features/study/study_controller.dart
index 7bc583a2f..27f9000ab 100644
--- a/designer_v2/lib/features/study/study_controller.dart
+++ b/designer_v2/lib/features/study/study_controller.dart
@@ -2,12 +2,10 @@ import 'dart:async';
 
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
-import 'package:studyu_designer_v2/constants.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/features/study/study_base_controller.dart';
 import 'package:studyu_designer_v2/features/study/study_controller_state.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
-import 'package:studyu_designer_v2/repositories/model_repository.dart';
 import 'package:studyu_designer_v2/repositories/model_repository_events.dart';
 import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/routing/router.dart';
@@ -19,14 +17,17 @@ part 'study_controller.g.dart';
 class StudyController extends _$StudyController {
   @override
   StudyControllerState build(StudyID studyId) {
-    syncStudyStatus();
-    ref.onDispose(() => _studyEventsSubscription?.cancel());
-    return StudyControllerState(
+    state = StudyControllerState(
       studyId: studyId,
       studyRepository: ref.watch(studyRepositoryProvider),
       router: ref.watch(routerProvider),
       currentUser: ref.watch(authRepositoryProvider).currentUser,
+      studyWithMetadata:
+          ref.watch(studyBaseControllerProvider(studyId)).studyWithMetadata,
     );
+    ref.onDispose(() => _studyEventsSubscription?.cancel());
+    syncStudyStatus();
+    return state;
   }
 
   StreamSubscription<ModelEvent<Study>>? _studyEventsSubscription;
@@ -52,22 +53,6 @@ class StudyController extends _$StudyController {
     });
   }
 
-  void onStudySubscriptionUpdate(WrappedModel<Study> wrappedModel) {
-    ref
-        .watch(studyBaseControllerProvider(state.studyId).notifier)
-        .onStudySubscriptionUpdate(wrappedModel);
-    final studyId = wrappedModel.model.id;
-    _redirectNewToActualStudyID(studyId);
-  }
-
-  /// Redirect to the study-specific URL to avoid disposing a dirty controller
-  /// when building subroutes
-  void _redirectNewToActualStudyID(StudyID actualStudyId) {
-    if (state.studyId == Config.newModelId) {
-      state.router.dispatch(RoutingIntents.study(actualStudyId));
-    }
-  }
-
   Future publishStudy({bool toRegistry = false}) {
     final study = state.study.value!;
     study.registryPublished = toRegistry;
@@ -86,24 +71,3 @@ class StudyController extends _$StudyController {
     state.router.dispatch(RoutingIntents.studySettings(state.studyId));
   }
 }
-
-/// Use the [family] modifier to provide a controller parametrized by [StudyID]
-/*final studyControllerProvider = StateNotifierProvider.autoDispose
-    .family<StudyController, StudyControllerState, StudyID>((ref, studyId) {
-  print("studyControllerProvider($studyId)");
-  final controller = StudyController(
-    studyId: studyId,
-    studyRepository: ref.watch(studyRepositoryProvider),
-    currentUser: ref.watch(authRepositoryProvider).currentUser,
-    router: ref.watch(routerProvider),
-    notificationService: ref.watch(notificationServiceProvider),
-    //ref: ref,
-  );
-  controller.addListener((state) {
-    print("studyController.state updated");
-  });
-  ref.onDispose(() {
-    print("studyControllerProvider($studyId).DISPOSE");
-  });
-  return controller;
-});*/
diff --git a/designer_v2/lib/features/study/study_controller.g.dart b/designer_v2/lib/features/study/study_controller.g.dart
index 92266c29f..edf874717 100644
--- a/designer_v2/lib/features/study/study_controller.g.dart
+++ b/designer_v2/lib/features/study/study_controller.g.dart
@@ -6,7 +6,7 @@ part of 'study_controller.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$studyControllerHash() => r'65427ca5137b4388e81b0e230014c900c541beb0';
+String _$studyControllerHash() => r'3d3b2a0281cd9ae846d1bd46b007033335ed0fe9';
 
 /// Copied from Dart SDK
 class _SystemHash {
diff --git a/designer_v2/lib/features/study/study_test_controller.dart b/designer_v2/lib/features/study/study_test_controller.dart
index 8d57450c3..17b4b4e51 100644
--- a/designer_v2/lib/features/study/study_test_controller.dart
+++ b/designer_v2/lib/features/study/study_test_controller.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
+import 'package:studyu_designer_v2/features/study/study_controller.dart';
 import 'package:studyu_designer_v2/features/study/study_test_controller_state.dart';
 import 'package:studyu_designer_v2/features/study/study_test_frame_controllers.dart';
 import 'package:studyu_designer_v2/localization/locale_providers.dart';
@@ -27,6 +28,8 @@ class StudyTestController extends _$StudyTestController {
     return StudyTestControllerState(
       studyId: studyId,
       studyRepository: ref.watch(studyRepositoryProvider),
+      studyWithMetadata:
+          ref.watch(studyControllerProvider(studyId)).studyWithMetadata,
       router: ref.watch(routerProvider),
       currentUser: ref.watch(authRepositoryProvider).currentUser,
       serializedSession:
diff --git a/designer_v2/lib/features/study/study_test_controller.g.dart b/designer_v2/lib/features/study/study_test_controller.g.dart
index b85891216..a534621f2 100644
--- a/designer_v2/lib/features/study/study_test_controller.g.dart
+++ b/designer_v2/lib/features/study/study_test_controller.g.dart
@@ -173,7 +173,7 @@ class _StudyTestPlatformControllerProviderElement
 }
 
 String _$studyTestControllerHash() =>
-    r'efc5f63d1d743edd57af6689308075f1c2cf3131';
+    r'f69bde5557423c578adb2659c8521e05bf635712';
 
 abstract class _$StudyTestController
     extends BuildlessAutoDisposeNotifier<StudyTestControllerState> {
diff --git a/designer_v2/lib/features/study/study_test_controller_state.dart b/designer_v2/lib/features/study/study_test_controller_state.dart
index 09b8c3790..48ade1616 100644
--- a/designer_v2/lib/features/study/study_test_controller_state.dart
+++ b/designer_v2/lib/features/study/study_test_controller_state.dart
@@ -9,7 +9,7 @@ class StudyTestControllerState extends StudyControllerBaseState {
     required super.studyRepository,
     required super.router,
     required super.currentUser,
-    super.studyWithMetadata,
+    required super.studyWithMetadata,
     this.serializedSession = '',
     this.languageCode = 'en',
   });
diff --git a/designer_v2/lib/routing/router.g.dart b/designer_v2/lib/routing/router.g.dart
index e0954a71a..a339be105 100644
--- a/designer_v2/lib/routing/router.g.dart
+++ b/designer_v2/lib/routing/router.g.dart
@@ -6,7 +6,7 @@ part of 'router.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$routerHash() => r'd7ad1119514bbeb51e6fb6dcc24b7df70485827d';
+String _$routerHash() => r'4823ca87e814f1c807b04a0e6bdfbd55462ee325';
 
 /// How to create a new page & use it for navigation:
 ///

From 761c367fff03a866d4c9b7724d33b9ecac89748b Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 17 Jun 2024 16:14:49 +0200
Subject: [PATCH 197/314] fix: dashbaord user load once

---
 .../lib/common_views/pages/splash_page.dart   |  3 ++-
 designer_v2/lib/features/app_controller.dart  |  9 +++----
 .../lib/features/app_controller.g.dart        |  2 +-
 .../features/dashboard/dashboard_page.dart    | 18 ++++++-------
 .../lib/repositories/user_repository.dart     | 26 ++++++++++---------
 .../lib/repositories/user_repository.g.dart   | 25 ++++++++++++++++++
 6 files changed, 55 insertions(+), 28 deletions(-)
 create mode 100644 designer_v2/lib/repositories/user_repository.g.dart

diff --git a/designer_v2/lib/common_views/pages/splash_page.dart b/designer_v2/lib/common_views/pages/splash_page.dart
index 35d43cc40..e31179466 100644
--- a/designer_v2/lib/common_views/pages/splash_page.dart
+++ b/designer_v2/lib/common_views/pages/splash_page.dart
@@ -5,6 +5,7 @@ class SplashPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return const Center(child: CircularProgressIndicator());
+    return const SizedBox();
+    //return const Center(child: CircularProgressIndicator());
   }
 }
diff --git a/designer_v2/lib/features/app_controller.dart b/designer_v2/lib/features/app_controller.dart
index 74d575057..87412fa8c 100644
--- a/designer_v2/lib/features/app_controller.dart
+++ b/designer_v2/lib/features/app_controller.dart
@@ -18,31 +18,30 @@ abstract class IAppDelegate {
 class AppController extends _$AppController {
   @override
   Stream<AppControllerState> build() {
+    state = const AsyncValue<AppControllerState>.data(AppControllerState());
     _appDelegates = [
       /// Register [IAppDelegate]s here for invocation of app lifecycle methods
       ref.watch(authRepositoryProvider),
     ];
     ref.listenSelf((previous, next) {
-      print("APP CONTROLLER STATE CHANGED: $next");
+      print('AppController changed: $next');
     });
     ref.onDispose(() {
       _stateController.close();
     });
-    _initDeleagates();
+    _initDelegates();
     return _stateController.stream;
   }
 
-  Future<void> _initDeleagates() async {
+  Future<void> _initDelegates() async {
     // Forward onAppStart to all registered delegates so that they can
     // e.g. read some data from local storage for initialization
     await _callDelegates(
       (delegate) => delegate.onAppStart(),
       withMinDelay: true,
     );
-    //if (!state.hasValue || state.hasValue && !state.value!.isInitialized) {
     _stateController
         .add(const AppControllerState(status: AppStatus.initialized));
-    //}
   }
 
   Stream get stream => _stateController.stream;
diff --git a/designer_v2/lib/features/app_controller.g.dart b/designer_v2/lib/features/app_controller.g.dart
index 69f658505..0a42b8814 100644
--- a/designer_v2/lib/features/app_controller.g.dart
+++ b/designer_v2/lib/features/app_controller.g.dart
@@ -6,7 +6,7 @@ part of 'app_controller.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$appControllerHash() => r'21b1c01db4c963e5ec1c534eaa31664a99f228be';
+String _$appControllerHash() => r'5f5e1353e3c33dd56d2cf83a2451587ec4000ea0';
 
 /// Main controller that's bound to the top-level application widget's state
 ///
diff --git a/designer_v2/lib/features/dashboard/dashboard_page.dart b/designer_v2/lib/features/dashboard/dashboard_page.dart
index 2f6c1873a..2ff9f9e02 100644
--- a/designer_v2/lib/features/dashboard/dashboard_page.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_page.dart
@@ -24,21 +24,21 @@ class DashboardScreen extends ConsumerStatefulWidget {
 }
 
 class _DashboardScreenState extends ConsumerState<DashboardScreen> {
-  late final DashboardController controller;
-  late final DashboardState state;
+  late Future<StudyUUser> user;
 
   @override
   void initState() {
     super.initState();
-    controller = ref.read(dashboardControllerProvider.notifier);
-    state = ref.read(dashboardControllerProvider);
+    final controller = ref.read(dashboardControllerProvider.notifier);
     runAsync(() => controller.setStudiesFilter(widget.filter));
+    user = runAsync(() => ref.watch(userRepositoryProvider).fetchUser());
   }
 
   @override
   void didUpdateWidget(DashboardScreen oldWidget) {
     super.didUpdateWidget(oldWidget);
     if (oldWidget.filter != widget.filter) {
+      final controller = ref.read(dashboardControllerProvider.notifier);
       runAsync(() => controller.setStudiesFilter(widget.filter));
     }
   }
@@ -48,7 +48,6 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
     final theme = Theme.of(context);
     final controller = ref.read(dashboardControllerProvider.notifier);
     final state = ref.watch(dashboardControllerProvider);
-    final userRepo = ref.watch(userRepositoryProvider);
 
     return DashboardScaffold(
       body: Column(
@@ -87,11 +86,12 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
           ),
           const SizedBox(height: 24.0), // spacing between body elements
           FutureBuilder<StudyUUser>(
-            future:
-                userRepo.fetchUser(), // todo cache this with ModelRepository
+            future: user,
             builder: (context, snapshot) {
               if (snapshot.hasData) {
                 return AsyncValueWidget<List<Study>>(
+                  loading: () =>
+                      const Center(child: CircularProgressIndicator()),
                   value: state.displayedStudies(
                     snapshot.data!.preferences.pinnedStudies,
                     state.query,
@@ -100,7 +100,7 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                     studies: visibleStudies,
                     pinnedStudies: snapshot.data!.preferences.pinnedStudies,
                     dashboardController:
-                        ref.read(dashboardControllerProvider.notifier),
+                        ref.watch(dashboardControllerProvider.notifier),
                     onSelect: controller.onSelectStudy,
                     getActions: controller.availableActions,
                     emptyWidget: (widget.filter == null ||
@@ -128,7 +128,7 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                   ),
                 );
               }
-              return const SizedBox.shrink();
+              return const Center(child: CircularProgressIndicator());
             },
           ),
         ],
diff --git a/designer_v2/lib/repositories/user_repository.dart b/designer_v2/lib/repositories/user_repository.dart
index a2a55d898..91a362d08 100644
--- a/designer_v2/lib/repositories/user_repository.dart
+++ b/designer_v2/lib/repositories/user_repository.dart
@@ -1,11 +1,13 @@
 // ignore_for_file: join_return_with_assignment
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/repositories/api_client.dart';
 import 'package:studyu_designer_v2/repositories/auth_repository.dart';
 
-// todo implements ModelRepository<StudyUUser>
+part 'user_repository.g.dart';
+
 abstract class IUserRepository {
   StudyUUser get user;
   Future<StudyUUser> fetchUser();
@@ -23,24 +25,26 @@ class UserRepository implements IUserRepository {
     required this.authRepository,
     required this.apiClient,
     required this.ref,
-  }); //: super(UserRepositoryDelegate(apiClient: apiClient));
+  });
 
   final StudyUApi apiClient;
   final IAuthRepository authRepository;
   final Ref ref;
+  StudyUUser? _user;
   @override
-  late StudyUUser user;
+  StudyUUser get user => _user!;
 
   @override
   Future<StudyUUser> fetchUser() async {
+    if (_user != null) return user;
     final userId = ref.read(authRepositoryProvider).currentUser!.id;
-    user = await apiClient.fetchUser(userId);
+    _user = await apiClient.fetchUser(userId);
     return user;
   }
 
   @override
   Future<StudyUUser> saveUser() async {
-    user = await apiClient.saveUser(user);
+    _user = await apiClient.saveUser(user);
     return user;
   }
 
@@ -61,13 +65,11 @@ class UserRepository implements IUserRepository {
   }
 }
 
-final userRepositoryProvider = Provider.autoDispose((ref) {
-  print("userRepositoryProvider");
-  final apiClient = ref.watch(apiClientProvider);
-  final authRepository = ref.watch(authRepositoryProvider);
+@riverpod
+UserRepository userRepository(UserRepositoryRef ref) {
   return UserRepository(
-    apiClient: apiClient,
+    authRepository: ref.read(authRepositoryProvider),
+    apiClient: ref.read(apiClientProvider),
     ref: ref,
-    authRepository: authRepository,
   );
-});
+}
diff --git a/designer_v2/lib/repositories/user_repository.g.dart b/designer_v2/lib/repositories/user_repository.g.dart
new file mode 100644
index 000000000..4a66db0cd
--- /dev/null
+++ b/designer_v2/lib/repositories/user_repository.g.dart
@@ -0,0 +1,25 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'user_repository.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$userRepositoryHash() => r'8e996be46b2f6f9d7ba53f5e6576c6cd5cefc538';
+
+/// See also [userRepository].
+@ProviderFor(userRepository)
+final userRepositoryProvider = AutoDisposeProvider<UserRepository>.internal(
+  userRepository,
+  name: r'userRepositoryProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$userRepositoryHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef UserRepositoryRef = AutoDisposeProviderRef<UserRepository>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

From 7fc8deb9b5900ce94b05c215aea1f7a031e6ee4d Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 18 Jun 2024 09:44:18 +0200
Subject: [PATCH 198/314] fix: explicitly type formcontrol when adding multiple
 choice field

---
 .../questionnaire/question/question_form_controller.dart      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/question_form_controller.dart b/designer_v2/lib/features/design/shared/questionnaire/question/question_form_controller.dart
index 9dd276c46..64f4f36ec 100644
--- a/designer_v2/lib/features/design/shared/questionnaire/question/question_form_controller.dart
+++ b/designer_v2/lib/features/design/shared/questionnaire/question/question_form_controller.dart
@@ -90,7 +90,7 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
   final int customOptionsMax = 10;
   final int customOptionsInitial = 2;
 
-  FormArray<dynamic> get answerOptionsArray => {
+  FormArray get answerOptionsArray => {
         SurveyQuestionType.bool: boolResponseOptionsArray,
         SurveyQuestionType.choice: choiceResponseOptionsArray,
         SurveyQuestionType.scale: _scaleResponseOptionsArray,
@@ -645,7 +645,7 @@ class QuestionFormViewModel extends ManagedFormViewModel<QuestionFormData>
 
   @override
   void onNewItem() {
-    answerOptionsArray.add(FormControl());
+    answerOptionsArray.add(FormControl<String>());
   }
 
   @override

From 89bba68d7ff7bf8fbeadcd4dcf12bac8a6c95490 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 18 Jun 2024 11:19:11 +0200
Subject: [PATCH 199/314] fix: cannot use ref before provider rebuilt

---
 .../features/study/study_test_controller.dart   |  8 +++++---
 .../lib/features/study/study_test_frame.dart    | 17 +++++------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/designer_v2/lib/features/study/study_test_controller.dart b/designer_v2/lib/features/study/study_test_controller.dart
index 17b4b4e51..8b715c936 100644
--- a/designer_v2/lib/features/study/study_test_controller.dart
+++ b/designer_v2/lib/features/study/study_test_controller.dart
@@ -16,14 +16,17 @@ part 'study_test_controller.g.dart';
 class StudyTestController extends _$StudyTestController {
   @override
   StudyTestControllerState build(StudyID studyId) {
+    // final studyRepo = ref.read(studyRepositoryProvider);
     ref.onDispose(() {
       // Reload the study after disposing the test controller so that any
       // data changes resulting from testing are reflected in the study for
       // other parts of the app (e.g. test data that was generated)
       //
       // Ideally, we would stream changes from the backend/database directly,
-      // but this is a sufficient workaround for now
-      ref.watch(studyRepositoryProvider).fetch(studyId);
+      // but this is a sufficient workaround for now.
+
+      // TODO test if this is needed or the study gets already updated after closing the test view
+      // studyRepo.fetch(studyId);
     });
     return StudyTestControllerState(
       studyId: studyId,
@@ -40,7 +43,6 @@ class StudyTestController extends _$StudyTestController {
 }
 
 /// Provide a controller parametrized by [StudyID]
-
 @riverpod
 PlatformController studyTestPlatformController(
   StudyTestPlatformControllerRef ref,
diff --git a/designer_v2/lib/features/study/study_test_frame.dart b/designer_v2/lib/features/study/study_test_frame.dart
index 83fd43c33..ce7fa7db7 100644
--- a/designer_v2/lib/features/study/study_test_frame.dart
+++ b/designer_v2/lib/features/study/study_test_frame.dart
@@ -37,22 +37,15 @@ class PreviewFrame extends ConsumerStatefulWidget {
 class _PreviewFrameState extends ConsumerState<PreviewFrame> {
   PlatformController? frameController;
 
-  @override
-  void initState() {
-    super.initState();
-    runAsync(() => _subscribeStudyChanges());
-  }
-
   @override
   void didUpdateWidget(PreviewFrame oldWidget) {
-    if (mounted) runAsync(() => _subscribeStudyChanges());
     super.didUpdateWidget(oldWidget);
-  }
-
-  void _subscribeStudyChanges() {
     final formViewModelCurrent =
         ref.read(studyFormViewModelProvider(widget.studyId));
+    runAsync(() => _subscribeStudyChanges(formViewModelCurrent));
+  }
 
+  void _subscribeStudyChanges(StudyFormViewModel formViewModelCurrent) {
     formViewModelCurrent.form.valueChanges.listen((event) {
       if (frameController != null) {
         final formJson =
@@ -92,9 +85,9 @@ class _PreviewFrameState extends ConsumerState<PreviewFrame> {
     final state = ref.watch(studyTestControllerProvider(widget.studyId));
     final formViewModel = ref.watch(studyTestValidatorProvider(widget.studyId));
 
-    // Rebuild iframe component & url
+    // Rebuild iframe component and url
     frameController =
-        ref.read(studyTestPlatformControllerProvider(widget.studyId));
+        ref.watch(studyTestPlatformControllerProvider(widget.studyId));
     _updatePreviewRoute();
     frameController!.activate();
     frameController!.listen();

From 8f9cb544ff9dc8269c2f6cc787b209d1bcb2f63c Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 18 Jun 2024 11:27:50 +0200
Subject: [PATCH 200/314] chore: generate

---
 designer_v2/lib/features/study/study_test_controller.g.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_v2/lib/features/study/study_test_controller.g.dart b/designer_v2/lib/features/study/study_test_controller.g.dart
index a534621f2..e9250ea82 100644
--- a/designer_v2/lib/features/study/study_test_controller.g.dart
+++ b/designer_v2/lib/features/study/study_test_controller.g.dart
@@ -173,7 +173,7 @@ class _StudyTestPlatformControllerProviderElement
 }
 
 String _$studyTestControllerHash() =>
-    r'f69bde5557423c578adb2659c8521e05bf635712';
+    r'e641cf6a4a10ee56345f815eebc4a9e95dc3bf33';
 
 abstract class _$StudyTestController
     extends BuildlessAutoDisposeNotifier<StudyTestControllerState> {

From a4c34ccc792ae50a37bf005eded43dbdf45ef9a3 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 19 Jun 2024 13:06:17 +0200
Subject: [PATCH 201/314] chore: remove todo

---
 .../20240526_migrate_close_study.sql          | 42 -------------------
 1 file changed, 42 deletions(-)

diff --git a/database/migration/20240526_migrate_close_study.sql b/database/migration/20240526_migrate_close_study.sql
index 5451cbfa7..253067857 100644
--- a/database/migration/20240526_migrate_close_study.sql
+++ b/database/migration/20240526_migrate_close_study.sql
@@ -1,5 +1,3 @@
--- todo move to studyu-schema.sql
-
 CREATE TYPE public.study_status AS ENUM (
     'draft',
     'running',
@@ -26,27 +24,9 @@ DROP POLICY "Everybody can view designated published studies" ON public.study;
 CREATE POLICY "Study visibility" ON public.study FOR SELECT
 USING ((status = 'running'::public.study_status OR status = 'closed'::public.study_status)
 AND (registry_published = true OR participation = 'open'::public.participation OR result_sharing = 'public'::public.result_sharing));
--- todo should we allow draft studies in registry if they have been published?
 
 CREATE POLICY "Editors can view their studies" ON public.study FOR SELECT USING (auth.uid() = user_id);
 
---CREATE POLICY "Editor can control their draft studies" ON public.study
-    -- old --USING (public.can_edit(auth.uid(), study.*) AND status = 'draft'::public.study_status);
---    USING (public.can_edit(auth.uid(), study.*));
-
--- Editors can only update registry_published and resultSharing
---grant update (registry_published, result_sharing) on public.study USING (public.can_edit(auth.uid(), study.*);
---CREATE POLICY "Editors can only update registry_published and resultSharing" ON public.study
---    FOR UPDATE
---    USING (public.can_edit(auth.uid(), study.*))
---    WITH CHECK ((new.*) IS NOT DISTINCT FROM (old.* EXCEPT registry_published, result_sharing));
--- t odo solve with trigger or function
--- or create view with only updatable columns and provide permission on view see https://dba.stackexchange.com/questions/298931/allow-users-to-modify-only-some-but-not-all-fields-in-a-postgresql-table-with
-
--- https://stackoverflow.com/questions/72756376/supabase-solutions-for-column-level-security
-
--- https://github.com/orgs/supabase/discussions/656#discussioncomment-5594653
-
 CREATE OR REPLACE FUNCTION public.allow_updating_only_study()
  RETURNS trigger
  LANGUAGE plpgsql
@@ -124,28 +104,6 @@ CREATE OR REPLACE TRIGGER study_status_update_permissions
   ON public.study
   FOR EACH ROW
   EXECUTE FUNCTION public.allow_updating_only_study('updated_at', 'status', 'registry_published', 'result_sharing');
-  -- todo also add participation?
-
--- Owners can update status
---CREATE FUNCTION public.update_study_status(study_param public.study) RETURNS VOID
---    LANGUAGE plpgsql -- SECURITY DEFINER
---    AS $$
---BEGIN
-    --IF study_param.user_id != auth.uid() THEN
-    --    RAISE EXCEPTION 'Only the owner can update the status';
-    --END IF;
-    -- Increment the study.status
---    UPDATE public.study
---    SET status = CASE
---        WHEN study_param.status = 'draft'::public.study_status THEN 'running'::public.study_status
---        WHEN study_param.status = 'running'::public.study_status THEN 'closed'::public.study_status
---        ELSE study_param.status
---    END
---    WHERE id = study_param.id;
---END;
---$$;
-
---ALTER FUNCTION public.update_study_status(public.study) OWNER TO postgres;
 
 CREATE POLICY "Joining a closed study should not be possible" ON public.study_subject
     AS RESTRICTIVE

From ededac1751873b58343846ec605808a398a0142e Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 19 Jun 2024 13:29:56 +0200
Subject: [PATCH 202/314] fix: migrate close study feature

---
 designer_v2/lib/features/study/study_controller.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_v2/lib/features/study/study_controller.dart b/designer_v2/lib/features/study/study_controller.dart
index c4696907f..ecc186cb0 100644
--- a/designer_v2/lib/features/study/study_controller.dart
+++ b/designer_v2/lib/features/study/study_controller.dart
@@ -61,7 +61,7 @@ class StudyController extends _$StudyController {
 
   Future closeStudy() {
     final study = state.study.value!;
-    return studyRepository.close(study);
+    return ref.read(studyRepositoryProvider).close(study);
   }
 
   void onChangeStudyParticipation() {

From 50656ac070e4ca64cd0ca301b78fb0c798758941 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 19 Jun 2024 13:42:03 +0200
Subject: [PATCH 203/314] fix: empty description init value

---
 core/lib/src/models/tables/study.dart                  | 2 +-
 designer_v2/lib/features/study/study_controller.g.dart | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/lib/src/models/tables/study.dart b/core/lib/src/models/tables/study.dart
index c08a5acb8..5bf87ee39 100644
--- a/core/lib/src/models/tables/study.dart
+++ b/core/lib/src/models/tables/study.dart
@@ -45,7 +45,7 @@ class Study extends SupabaseObjectFunctions<Study>
   static const String baselineID = '__baseline';
   String id;
   String? title;
-  String? description;
+  String? description = '';
   @JsonKey(name: 'user_id')
   String userId;
   Participation participation = Participation.invite;
diff --git a/designer_v2/lib/features/study/study_controller.g.dart b/designer_v2/lib/features/study/study_controller.g.dart
index f39da774c..83edf4450 100644
--- a/designer_v2/lib/features/study/study_controller.g.dart
+++ b/designer_v2/lib/features/study/study_controller.g.dart
@@ -6,7 +6,7 @@ part of 'study_controller.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$studyControllerHash() => r'b9e7f58e87636a2ef0278725a4bf9e0572252fb4';
+String _$studyControllerHash() => r'03c1b9b529c50b109c9313fdb22cb2d5d896ee7e';
 
 /// Copied from Dart SDK
 class _SystemHash {

From db5ea2b96eca35ea4ecbbe977df2d0b7527b4e90 Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahim.ozkn@outlook.com>
Date: Wed, 19 Jun 2024 18:42:10 +0200
Subject: [PATCH 204/314] refactor: migrate appConfig FutureProvider

---
 .../lib/repositories/app_repository.dart      |  9 ++++---
 .../lib/repositories/app_repository.g.dart    | 24 +++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 designer_v2/lib/repositories/app_repository.g.dart

diff --git a/designer_v2/lib/repositories/app_repository.dart b/designer_v2/lib/repositories/app_repository.dart
index 94463bab8..7af7cd742 100644
--- a/designer_v2/lib/repositories/app_repository.dart
+++ b/designer_v2/lib/repositories/app_repository.dart
@@ -1,7 +1,9 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/repositories/api_client.dart';
 
+part 'app_repository.g.dart';
+
 abstract class IAppRepository {
   Future<AppConfig> fetchAppConfig();
   void dispose();
@@ -24,7 +26,8 @@ class AppRepository implements IAppRepository {
   }
 }
 
-final appConfigProvider = FutureProvider.autoDispose<AppConfig>((ref) async {
+@riverpod
+Future<AppConfig> appConfig(AppConfigRef ref) async {
   final apiClient = ref.watch(apiClientProvider);
   return await AppRepository(apiClient).fetchAppConfig();
-});
+}
diff --git a/designer_v2/lib/repositories/app_repository.g.dart b/designer_v2/lib/repositories/app_repository.g.dart
new file mode 100644
index 000000000..cc0dcc346
--- /dev/null
+++ b/designer_v2/lib/repositories/app_repository.g.dart
@@ -0,0 +1,24 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'app_repository.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$appConfigHash() => r'f9938393122c65a65bb28ba607ae65ce54ed8dfa';
+
+/// See also [appConfig].
+@ProviderFor(appConfig)
+final appConfigProvider = AutoDisposeFutureProvider<AppConfig>.internal(
+  appConfig,
+  name: r'appConfigProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product') ? null : _$appConfigHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef AppConfigRef = AutoDisposeFutureProviderRef<AppConfig>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

From bc21a8f3586043a729b4b42e02ffb4571b5dda51 Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahim.ozkn@outlook.com>
Date: Wed, 19 Jun 2024 19:03:13 +0200
Subject: [PATCH 205/314] refactor: migrate StudySettingsFormViewModel Provider

---
 .../study_settings_form_controller.dart       |  21 +-
 .../study_settings_form_controller.g.dart     | 195 ++++++++++++++++++
 2 files changed, 213 insertions(+), 3 deletions(-)
 create mode 100644 designer_v2/lib/features/study/settings/study_settings_form_controller.g.dart

diff --git a/designer_v2/lib/features/study/settings/study_settings_form_controller.dart b/designer_v2/lib/features/study/settings/study_settings_form_controller.dart
index e47d2902e..ed7892290 100644
--- a/designer_v2/lib/features/study/settings/study_settings_form_controller.dart
+++ b/designer_v2/lib/features/study/settings/study_settings_form_controller.dart
@@ -1,5 +1,5 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:reactive_forms/reactive_forms.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
@@ -7,6 +7,8 @@ import 'package:studyu_designer_v2/features/study/study_controller.dart';
 import 'package:studyu_designer_v2/repositories/study_repository.dart';
 import 'package:studyu_designer_v2/utils/performance.dart';
 
+part 'study_settings_form_controller.g.dart';
+
 class StudySettingsFormViewModel extends FormViewModel<Study> {
   StudySettingsFormViewModel({
     required this.studyRepository,
@@ -86,7 +88,7 @@ class StudySettingsFormViewModel extends FormViewModel<Study> {
 ///
 /// Note: This is not safe to use in widgets (or other providers) that are built
 /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
-final studySettingsFormViewModelProvider = Provider.autoDispose
+/*final studySettingsFormViewModelProvider = Provider.autoDispose
     .family<StudySettingsFormViewModel, StudyID>((ref, studyId) {
   final state = ref.watch(studyControllerProvider(studyId));
   final formViewModel = StudySettingsFormViewModel(
@@ -97,4 +99,17 @@ final studySettingsFormViewModelProvider = Provider.autoDispose
     print("studySettingsFormViewModelProvider.DISPOSE");
   });
   return formViewModel;
-});
+});*/
+@riverpod
+StudySettingsFormViewModel studySettingsFormViewModel(
+    StudySettingsFormViewModelRef ref, String studyId) {
+  final state = ref.watch(studyControllerProvider(studyId));
+  final formViewModel = StudySettingsFormViewModel(
+    studyRepository: ref.watch(studyRepositoryProvider),
+    study: state.study,
+  );
+  ref.onDispose(() {
+    print("studySettingsFormViewModelProvider.DISPOSE");
+  });
+  return formViewModel;
+}
diff --git a/designer_v2/lib/features/study/settings/study_settings_form_controller.g.dart b/designer_v2/lib/features/study/settings/study_settings_form_controller.g.dart
new file mode 100644
index 000000000..1ef9c5115
--- /dev/null
+++ b/designer_v2/lib/features/study/settings/study_settings_form_controller.g.dart
@@ -0,0 +1,195 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'study_settings_form_controller.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$studySettingsFormViewModelHash() =>
+    r'499d2fa25006ac8781e60bcd208a2cb6c05cacb9';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+/// Provides the [FormViewModel] responsible for managing the study settings.
+///
+/// Note: This is not safe to use in widgets (or other providers) that are built
+/// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+///
+/// Copied from [studySettingsFormViewModel].
+@ProviderFor(studySettingsFormViewModel)
+const studySettingsFormViewModelProvider = StudySettingsFormViewModelFamily();
+
+/// Provides the [FormViewModel] responsible for managing the study settings.
+///
+/// Note: This is not safe to use in widgets (or other providers) that are built
+/// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+///
+/// Copied from [studySettingsFormViewModel].
+class StudySettingsFormViewModelFamily
+    extends Family<StudySettingsFormViewModel> {
+  /// Provides the [FormViewModel] responsible for managing the study settings.
+  ///
+  /// Note: This is not safe to use in widgets (or other providers) that are built
+  /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+  ///
+  /// Copied from [studySettingsFormViewModel].
+  const StudySettingsFormViewModelFamily();
+
+  /// Provides the [FormViewModel] responsible for managing the study settings.
+  ///
+  /// Note: This is not safe to use in widgets (or other providers) that are built
+  /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+  ///
+  /// Copied from [studySettingsFormViewModel].
+  StudySettingsFormViewModelProvider call(
+    String studyId,
+  ) {
+    return StudySettingsFormViewModelProvider(
+      studyId,
+    );
+  }
+
+  @override
+  StudySettingsFormViewModelProvider getProviderOverride(
+    covariant StudySettingsFormViewModelProvider provider,
+  ) {
+    return call(
+      provider.studyId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'studySettingsFormViewModelProvider';
+}
+
+/// Provides the [FormViewModel] responsible for managing the study settings.
+///
+/// Note: This is not safe to use in widgets (or other providers) that are built
+/// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+///
+/// Copied from [studySettingsFormViewModel].
+class StudySettingsFormViewModelProvider
+    extends AutoDisposeProvider<StudySettingsFormViewModel> {
+  /// Provides the [FormViewModel] responsible for managing the study settings.
+  ///
+  /// Note: This is not safe to use in widgets (or other providers) that are built
+  /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
+  ///
+  /// Copied from [studySettingsFormViewModel].
+  StudySettingsFormViewModelProvider(
+    String studyId,
+  ) : this._internal(
+          (ref) => studySettingsFormViewModel(
+            ref as StudySettingsFormViewModelRef,
+            studyId,
+          ),
+          from: studySettingsFormViewModelProvider,
+          name: r'studySettingsFormViewModelProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$studySettingsFormViewModelHash,
+          dependencies: StudySettingsFormViewModelFamily._dependencies,
+          allTransitiveDependencies:
+              StudySettingsFormViewModelFamily._allTransitiveDependencies,
+          studyId: studyId,
+        );
+
+  StudySettingsFormViewModelProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.studyId,
+  }) : super.internal();
+
+  final String studyId;
+
+  @override
+  Override overrideWith(
+    StudySettingsFormViewModel Function(StudySettingsFormViewModelRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: StudySettingsFormViewModelProvider._internal(
+        (ref) => create(ref as StudySettingsFormViewModelRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        studyId: studyId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeProviderElement<StudySettingsFormViewModel> createElement() {
+    return _StudySettingsFormViewModelProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StudySettingsFormViewModelProvider &&
+        other.studyId == studyId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, studyId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin StudySettingsFormViewModelRef
+    on AutoDisposeProviderRef<StudySettingsFormViewModel> {
+  /// The parameter `studyId` of this provider.
+  String get studyId;
+}
+
+class _StudySettingsFormViewModelProviderElement
+    extends AutoDisposeProviderElement<StudySettingsFormViewModel>
+    with StudySettingsFormViewModelRef {
+  _StudySettingsFormViewModelProviderElement(super.provider);
+
+  @override
+  String get studyId => (origin as StudySettingsFormViewModelProvider).studyId;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

From 735f1272c42b91a7d902f0a168b4923a6281ab4c Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 19 Jun 2024 21:51:09 +0200
Subject: [PATCH 206/314] fix: catch invite code not existing and better
 APIException output

---
 designer_v2/lib/repositories/api_client.dart | 39 +++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/designer_v2/lib/repositories/api_client.dart b/designer_v2/lib/repositories/api_client.dart
index e20115cd3..ea0682207 100644
--- a/designer_v2/lib/repositories/api_client.dart
+++ b/designer_v2/lib/repositories/api_client.dart
@@ -1,5 +1,3 @@
-import 'dart:io';
-
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
@@ -56,6 +54,10 @@ class StudyInviteNotFoundException extends APIException {}
 
 class UserNotFoundException extends APIException {}
 
+abstract class PostgrestErrorCodes {
+  static const String isNotSingleItem = 'PGRST116';
+}
+
 class StudyUApiClient extends SupabaseClientDependant
     with SupabaseQueryMixin
     implements StudyUApi {
@@ -169,8 +171,8 @@ class StudyUApiClient extends SupabaseClientDependant
     return _awaitGuarded(
       request,
       onError: {
-        HttpStatus.notAcceptable: (e) => throw StudyNotFoundException(),
-        HttpStatus.notFound: (e) => throw StudyNotFoundException(),
+        PostgrestErrorCodes.isNotSingleItem: (e) =>
+            throw StudyNotFoundException(),
       },
     );
   }
@@ -198,8 +200,8 @@ class StudyUApiClient extends SupabaseClientDependant
     return _awaitGuarded(
       request,
       onError: {
-        HttpStatus.notAcceptable: (e) => throw StudyInviteNotFoundException(),
-        HttpStatus.notFound: (e) => throw StudyInviteNotFoundException(),
+        PostgrestErrorCodes.isNotSingleItem: (e) =>
+            throw StudyInviteNotFoundException(),
       },
     );
   }
@@ -232,8 +234,8 @@ class StudyUApiClient extends SupabaseClientDependant
     return _awaitGuarded(
       request,
       onError: {
-        HttpStatus.notAcceptable: (e) => throw UserNotFoundException(),
-        HttpStatus.notFound: (e) => throw UserNotFoundException(),
+        PostgrestErrorCodes.isNotSingleItem: (e) =>
+            throw UserNotFoundException(),
       },
     );
   }
@@ -254,33 +256,34 @@ class StudyUApiClient extends SupabaseClientDependant
   /// Raises a generic [APIException] for errors that cannot be handled.
   Future<T> _awaitGuarded<T>(
     Future<T> future, {
-    Map<int, SupabaseQueryExceptionHandler>? onError,
+    Map<String, SupabaseQueryExceptionHandler>? onError,
   }) async {
     try {
       final result = await future;
       return result;
     } on SupabaseQueryError catch (e) {
-      if (onError == null) {
+      if (onError == null || e.statusCode == null) {
         throw _apiException(error: e);
       }
-      if (e.statusCode == null ||
-          !onError.containsKey(int.parse(e.statusCode!))) {
-        throw _apiException(error: e);
-      }
-      final errorHandler = onError[int.parse(e.statusCode!)]!;
+      final errorHandler = onError[e.statusCode]!;
       errorHandler(e);
+    } catch (e) {
+      throw _apiException(error: e);
     }
     throw _apiException();
   }
 
-  APIException _apiException({SupabaseQueryError? error}) {
-    if (error != null) {
+  APIException _apiException({Object? error}) {
+    if (error != null && error is SupabaseQueryError) {
       debugLog("Supabase Exception encountered");
       debugLog(error.statusCode.toString());
       debugLog(error.details.toString());
       debugLog(error.message);
-    } else {
+    } else if (error != null) {
       debugLog("Unknown exception encountered");
+      debugLog(error.toString());
+    } else {
+      debugLog("Unknown exception encountered. No error provided.");
     }
     return APIException();
   }

From e512d85966e1c8ff96db879a37fa38e83efb2a99 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 19 Jun 2024 21:54:31 +0200
Subject: [PATCH 207/314] fix: type

---
 .../lib/features/recruit/invite_code_form_controller.dart | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/designer_v2/lib/features/recruit/invite_code_form_controller.dart b/designer_v2/lib/features/recruit/invite_code_form_controller.dart
index e521db638..79b4a62a1 100644
--- a/designer_v2/lib/features/recruit/invite_code_form_controller.dart
+++ b/designer_v2/lib/features/recruit/invite_code_form_controller.dart
@@ -43,10 +43,10 @@ class InviteCodeFormViewModel extends FormViewModel<StudyInvite> {
   );
   final codeControlValidationMessages = {
     ValidationMessage.required: (_) => tr.form_field_code_required,
-    ValidationMessage.minLength: (error) => tr
-        .form_field_code_minlength((error as Map)['requiredLength'] as String),
-    ValidationMessage.maxLength: (error) => tr
-        .form_field_code_maxlength((error as Map)['requiredLength'] as String),
+    ValidationMessage.minLength: (error) =>
+        tr.form_field_code_minlength((error as Map)['requiredLength'] as int),
+    ValidationMessage.maxLength: (error) =>
+        tr.form_field_code_maxlength((error as Map)['requiredLength'] as int),
     'inviteCodeAlreadyUsed': (_) => tr.form_field_code_alreadyused,
   };
 

From 2436af1c18865218a7ea6c175579972bb7d9ddb5 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 19 Jun 2024 22:45:10 +0200
Subject: [PATCH 208/314] fix: app preview stuck at AppLanguage

---
 app/lib/screens/app_onboarding/loading_screen.dart | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/lib/screens/app_onboarding/loading_screen.dart b/app/lib/screens/app_onboarding/loading_screen.dart
index 2b218d67f..71dc43705 100644
--- a/app/lib/screens/app_onboarding/loading_screen.dart
+++ b/app/lib/screens/app_onboarding/loading_screen.dart
@@ -111,7 +111,8 @@ class _LoadingScreenState extends State<LoadingScreen> {
     StudyULogger.info(
       "Preview: Found query parameters ${widget.queryParameters}",
     );
-    final lang = context.watch<AppLanguage>();
+    //final lang = context.watch<AppLanguage>();
+    final lang = AppLanguage(AppLocalizations.supportedLocales);
     final preview = Preview(
       widget.queryParameters,
       lang,

From 238e5d3cc856a70da826044a2dc231a4a63bf30d Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 19 Jun 2024 22:45:26 +0200
Subject: [PATCH 209/314] chore: format

---
 .../study/settings/study_settings_form_controller.dart        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/designer_v2/lib/features/study/settings/study_settings_form_controller.dart b/designer_v2/lib/features/study/settings/study_settings_form_controller.dart
index ed7892290..38aec1a0d 100644
--- a/designer_v2/lib/features/study/settings/study_settings_form_controller.dart
+++ b/designer_v2/lib/features/study/settings/study_settings_form_controller.dart
@@ -102,7 +102,9 @@ class StudySettingsFormViewModel extends FormViewModel<Study> {
 });*/
 @riverpod
 StudySettingsFormViewModel studySettingsFormViewModel(
-    StudySettingsFormViewModelRef ref, String studyId) {
+  StudySettingsFormViewModelRef ref,
+  String studyId,
+) {
   final state = ref.watch(studyControllerProvider(studyId));
   final formViewModel = StudySettingsFormViewModel(
     studyRepository: ref.watch(studyRepositoryProvider),

From 104f450d6399b81e908d29fc5983966b69ddb3e1 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 19 Jun 2024 23:22:22 +0200
Subject: [PATCH 210/314] fix: test frame live preview

---
 .../lib/features/study/study_test_frame.dart      | 15 ++++++++-------
 .../study/study_test_frame_controllers.dart       | 12 +++++++-----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/designer_v2/lib/features/study/study_test_frame.dart b/designer_v2/lib/features/study/study_test_frame.dart
index ce7fa7db7..6ccee55d8 100644
--- a/designer_v2/lib/features/study/study_test_frame.dart
+++ b/designer_v2/lib/features/study/study_test_frame.dart
@@ -11,7 +11,7 @@ import 'package:studyu_designer_v2/features/study/study_test_controls.dart';
 import 'package:studyu_designer_v2/features/study/study_test_frame_controllers.dart';
 import 'package:studyu_designer_v2/features/study/study_test_frame_views.dart';
 import 'package:studyu_designer_v2/routing/router_config.dart';
-import 'package:studyu_designer_v2/utils/performance.dart';
+import 'package:studyu_designer_v2/utils/debug_print.dart';
 
 class PreviewFrame extends ConsumerStatefulWidget {
   const PreviewFrame(
@@ -38,14 +38,15 @@ class _PreviewFrameState extends ConsumerState<PreviewFrame> {
   PlatformController? frameController;
 
   @override
-  void didUpdateWidget(PreviewFrame oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    final formViewModelCurrent =
-        ref.read(studyFormViewModelProvider(widget.studyId));
-    runAsync(() => _subscribeStudyChanges(formViewModelCurrent));
+  void initState() {
+    super.initState();
+    _subscribeStudyChanges();
   }
 
-  void _subscribeStudyChanges(StudyFormViewModel formViewModelCurrent) {
+  void _subscribeStudyChanges() {
+    debugLog('Subscribing to form changes in test frame');
+    final formViewModelCurrent =
+        ref.read(studyFormViewModelProvider(widget.studyId));
     formViewModelCurrent.form.valueChanges.listen((event) {
       if (frameController != null) {
         final formJson =
diff --git a/designer_v2/lib/features/study/study_test_frame_controllers.dart b/designer_v2/lib/features/study/study_test_frame_controllers.dart
index 36003b7c1..eef954a57 100644
--- a/designer_v2/lib/features/study/study_test_frame_controllers.dart
+++ b/designer_v2/lib/features/study/study_test_frame_controllers.dart
@@ -7,6 +7,7 @@ import 'dart:ui_web' as ui_web;
 import 'package:flutter/material.dart';
 import 'package:studyu_core/env.dart' as env;
 import 'package:studyu_designer_v2/features/study/study_test_frame_views.dart';
+import 'package:studyu_designer_v2/utils/debug_print.dart';
 
 class RouteInformation {
   String? route;
@@ -53,7 +54,7 @@ class WebController extends PlatformController {
   void activate() {
     if (baseSrc == '') return;
     final key = UniqueKey();
-    // print("Register view with: $previewSrc");
+    debugLog("Register view with: $previewSrc");
     registerViews(key);
     frameWidget = WebFrame(previewSrc, studyId, key: key);
   }
@@ -99,7 +100,7 @@ class WebController extends PlatformController {
     //if (frame != null) {
     // iFrameElement = frame;
     if (iFrameElement.src != previewSrc) {
-      print("*********NAVIGATE TO: $previewSrc");
+      debugLog("*********NAVIGATE TO: $previewSrc");
       iFrameElement.src = previewSrc;
       //iFrameElement.src = newPrev;
     } /* else {
@@ -136,7 +137,7 @@ class WebController extends PlatformController {
     html.window.onMessage.listen((event) {
       final data = event.data;
       if (data == 'routeFinished') {
-        print("Designer: Route finished");
+        debugLog("Preview route finished");
         refresh();
       }
     });
@@ -144,8 +145,9 @@ class WebController extends PlatformController {
 
   @override
   void send(String message) {
-    // For debug purposes: postMessage(message, '*')
-    // print("[Preview]: Sent message: " + message);
+    debugLog("Send updated study to client");
+    // Send to all windows for debugging
+    // iFrameElement.contentWindow?.postMessage(message, '*');
     iFrameElement.contentWindow?.postMessage(message, env.appUrl ?? '');
   }
 }

From a978c604c101551be4d8d9fbc5e383f4fc763c36 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 20 Jun 2024 13:05:55 +0200
Subject: [PATCH 211/314] chore: remove logs

---
 designer_v2/lib/features/study/study_test_frame.dart     | 3 +--
 .../lib/features/study/study_test_frame_controllers.dart | 9 ++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/designer_v2/lib/features/study/study_test_frame.dart b/designer_v2/lib/features/study/study_test_frame.dart
index 6ccee55d8..ab930db09 100644
--- a/designer_v2/lib/features/study/study_test_frame.dart
+++ b/designer_v2/lib/features/study/study_test_frame.dart
@@ -11,7 +11,6 @@ import 'package:studyu_designer_v2/features/study/study_test_controls.dart';
 import 'package:studyu_designer_v2/features/study/study_test_frame_controllers.dart';
 import 'package:studyu_designer_v2/features/study/study_test_frame_views.dart';
 import 'package:studyu_designer_v2/routing/router_config.dart';
-import 'package:studyu_designer_v2/utils/debug_print.dart';
 
 class PreviewFrame extends ConsumerStatefulWidget {
   const PreviewFrame(
@@ -44,7 +43,7 @@ class _PreviewFrameState extends ConsumerState<PreviewFrame> {
   }
 
   void _subscribeStudyChanges() {
-    debugLog('Subscribing to form changes in test frame');
+    // debugLog('Subscribing to form changes in test frame');
     final formViewModelCurrent =
         ref.read(studyFormViewModelProvider(widget.studyId));
     formViewModelCurrent.form.valueChanges.listen((event) {
diff --git a/designer_v2/lib/features/study/study_test_frame_controllers.dart b/designer_v2/lib/features/study/study_test_frame_controllers.dart
index eef954a57..50e92834c 100644
--- a/designer_v2/lib/features/study/study_test_frame_controllers.dart
+++ b/designer_v2/lib/features/study/study_test_frame_controllers.dart
@@ -7,7 +7,6 @@ import 'dart:ui_web' as ui_web;
 import 'package:flutter/material.dart';
 import 'package:studyu_core/env.dart' as env;
 import 'package:studyu_designer_v2/features/study/study_test_frame_views.dart';
-import 'package:studyu_designer_v2/utils/debug_print.dart';
 
 class RouteInformation {
   String? route;
@@ -54,7 +53,7 @@ class WebController extends PlatformController {
   void activate() {
     if (baseSrc == '') return;
     final key = UniqueKey();
-    debugLog("Register view with: $previewSrc");
+    // debugLog("Register view with: $previewSrc");
     registerViews(key);
     frameWidget = WebFrame(previewSrc, studyId, key: key);
   }
@@ -100,7 +99,7 @@ class WebController extends PlatformController {
     //if (frame != null) {
     // iFrameElement = frame;
     if (iFrameElement.src != previewSrc) {
-      debugLog("*********NAVIGATE TO: $previewSrc");
+      // debugLog("*********NAVIGATE TO: $previewSrc");
       iFrameElement.src = previewSrc;
       //iFrameElement.src = newPrev;
     } /* else {
@@ -137,7 +136,7 @@ class WebController extends PlatformController {
     html.window.onMessage.listen((event) {
       final data = event.data;
       if (data == 'routeFinished') {
-        debugLog("Preview route finished");
+        // debugLog("Preview route finished");
         refresh();
       }
     });
@@ -145,7 +144,7 @@ class WebController extends PlatformController {
 
   @override
   void send(String message) {
-    debugLog("Send updated study to client");
+    // debugLog("Send updated study to client");
     // Send to all windows for debugging
     // iFrameElement.contentWindow?.postMessage(message, '*');
     iFrameElement.contentWindow?.postMessage(message, env.appUrl ?? '');

From 825ea7fb269412f2afb26bae998288d984167174 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 20 Jun 2024 13:06:20 +0200
Subject: [PATCH 212/314] fix: enable atLeastOneTask for intervention again

---
 .../interventions/intervention_form_controller.dart  | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/designer_v2/lib/features/design/interventions/intervention_form_controller.dart b/designer_v2/lib/features/design/interventions/intervention_form_controller.dart
index 84902b2f2..a9271fe85 100644
--- a/designer_v2/lib/features/design/interventions/intervention_form_controller.dart
+++ b/designer_v2/lib/features/design/interventions/intervention_form_controller.dart
@@ -54,15 +54,9 @@ class InterventionFormViewModel
 
   @override
   FormValidationConfigSet get sharedValidationConfig => {
-        StudyFormValidationSet.draft: [
-          titleRequired, /*atLeastOneTask*/
-        ],
-        StudyFormValidationSet.publish: [
-          titleRequired, /*atLeastOneTask*/
-        ],
-        StudyFormValidationSet.test: [
-          titleRequired, /*atLeastOneTask*/
-        ],
+        StudyFormValidationSet.draft: [titleRequired, atLeastOneTask],
+        StudyFormValidationSet.publish: [titleRequired, atLeastOneTask],
+        StudyFormValidationSet.test: [titleRequired, atLeastOneTask],
       };
 
   FormControlValidation get titleRequired => FormControlValidation(

From 8f1275496446633f6f57748c1425f2ca9ed0925b Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 20 Jun 2024 13:01:45 +0200
Subject: [PATCH 213/314] fix: do not autosave on formarray

---
 designer_v2/lib/features/forms/form_view_model.dart | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/designer_v2/lib/features/forms/form_view_model.dart b/designer_v2/lib/features/forms/form_view_model.dart
index 682ebb218..e07b9c7f0 100644
--- a/designer_v2/lib/features/forms/form_view_model.dart
+++ b/designer_v2/lib/features/forms/form_view_model.dart
@@ -412,10 +412,9 @@ abstract class FormViewModel<T> implements IFormGroupController {
       if (control is FormGroup) {
         continue; // don't listen to nested descendants
       } else if (control is FormArray) {
-        final collectionChanges =
-            control.collectionChanges.listen(boundListener);
-        // don't subscribe to control.valueChanges
-        _immediateFormChildrenSubscriptions.add(collectionChanges);
+        continue; // don't listen to nested descendants
+        // final collectionChanges = control.collectionChanges.listen(boundListener); // don't subscribe to control.valueChanges
+        // _immediateFormChildrenSubscriptions.add(collectionChanges);
       } else if (control is FormControl) {
         final valueChanges = control.valueChanges.listen(boundListener);
         _immediateFormChildrenSubscriptions.add(valueChanges);

From c327da7aea27936917e569e764c528aea3961585 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 20 Jun 2024 15:15:36 +0200
Subject: [PATCH 214/314] Revert "fix: do not autosave on formarray"

This reverts commit 8f1275496446633f6f57748c1425f2ca9ed0925b.
---
 designer_v2/lib/features/forms/form_view_model.dart | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/designer_v2/lib/features/forms/form_view_model.dart b/designer_v2/lib/features/forms/form_view_model.dart
index e07b9c7f0..682ebb218 100644
--- a/designer_v2/lib/features/forms/form_view_model.dart
+++ b/designer_v2/lib/features/forms/form_view_model.dart
@@ -412,9 +412,10 @@ abstract class FormViewModel<T> implements IFormGroupController {
       if (control is FormGroup) {
         continue; // don't listen to nested descendants
       } else if (control is FormArray) {
-        continue; // don't listen to nested descendants
-        // final collectionChanges = control.collectionChanges.listen(boundListener); // don't subscribe to control.valueChanges
-        // _immediateFormChildrenSubscriptions.add(collectionChanges);
+        final collectionChanges =
+            control.collectionChanges.listen(boundListener);
+        // don't subscribe to control.valueChanges
+        _immediateFormChildrenSubscriptions.add(collectionChanges);
       } else if (control is FormControl) {
         final valueChanges = control.valueChanges.listen(boundListener);
         _immediateFormChildrenSubscriptions.add(valueChanges);

From a30df53d15fdb5855d22af15ae42049c9fd35e2f Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 20 Jun 2024 16:07:54 +0200
Subject: [PATCH 215/314] fix: remove warming pad from db seed

---
 supabase/seed.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supabase/seed.sql b/supabase/seed.sql
index c4f606cdc..c7e6c1ed6 100644
--- a/supabase/seed.sql
+++ b/supabase/seed.sql
@@ -53,7 +53,7 @@ BEGIN
       'running',
       -- registry_published
       true,
-      '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "car-seat-heater", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
+      '[{"id": "recent_back_pain", "type": "boolean", "prompt": "Have you had back pain in the last 12 weeks?", "rationale": ""}, {"id": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "type": "boolean", "prompt": "Are you pregnant?", "rationale": ""}, {"id": "afeac253-4bfe-47fe-9384-4236ded1bd50", "type": "choice", "prompt": "Does any of the following apply to you and has not been examined by a doctor yet?", "choices": [{"id": "start_of_symptoms_after_spinal_surgery", "text": "Start of symptoms after spinal surgery"}, {"id": "start_of_symptoms_after_diagnosis_of_cancer", "text": "Start of symptoms after diagnosis of cancer"}, {"id": "unexpected_significant_weight_loss", "text": "Unexpected significant weight loss"}, {"id": "start_of_symptoms_after_trauma", "text": "Start of symptoms after trauma"}, {"id": "accompanying_numbness_of_your_legs", "text": "Accompanying numbness of your legs"}], "multiple": true, "rationale": "This question is asked to ensure that you are not suffering from any critical illness."}]','[{"id": "b47d07d8-eb98-4fce-86ab-945bc7c2f2d0", "condition": {"type": "choice", "target": "recent_back_pain", "choices": [true]}}, {"id": "acb368b0-0ca2-496d-98e1-be9fefbe5e89", "condition": {"type": "choice", "target": "f70386c8-f517-4e62-a5fa-ca4badfd4b60", "choices": [false]}}, {"id": "d7c3445e-b5b1-43d1-93a6-5637e0cfd44f", "condition": {"type": "choice", "target": "afeac253-4bfe-47fe-9384-4236ded1bd50", "choices": []}}]','[{"id": "rate_your_day", "type": "questionnaire", "title": "Rate your day", "footer": "", "header": "", "schedule": {"reminders": ["19:00"], "completionPeriods": [{"id": "50d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "8:00"}]}, "questions": [{"id": "pain", "step": 1, "type": "visualAnalogue", "prompt": "Rate your pain.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "Well, guess I die now", "minimumAnnotation": "no pain"}, {"id": "painkillers", "type": "boolean", "prompt": "Have you taken any painkillers in the last 24 hours?"}, {"id": "sleep", "step": 1, "type": "visualAnalogue", "prompt": "Rate your sleep.", "initial": 0, "maximum": 10, "minimum": 0, "maximumColor": 4294901760, "minimumColor": 4294967295, "maximumAnnotation": "terrible", "minimumAnnotation": "no problems"}, {"id": "mood", "step": 1, "type": "annotatedScale", "prompt": "Rate your mood.", "initial": 5, "maximum": 10, "minimum": 0, "annotations": [{"value": 0, "annotation": "☠"}, {"value": 5, "annotation": "😐"}, {"value": 10, "annotation": "😀"}]}]}]','[{"id": "willow_bark_tea", "icon": "coffee", "name": "Willow-Bark tea", "tasks": [{"id": "drink_tea", "type": "checkmark", "title": "Drink a cup of Willow-Bark tea twice a day.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "54d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Willow bark contains powerful anti-inflamatory compunds such as flavonoids and salicin that help relieve the pain."}, {"id": "arnika", "icon": "leaf", "name": "Arnika", "tasks": [{"id": "apply_arnika", "type": "checkmark", "title": "Apply a dime sized amount of Arnica gel to your lower back and massage for 10 mins.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "55d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Arnika gel has been proven to soothe muscle soreness, strain and reduce swelling when rubbed on the affected area."}, {"id": "warming_pad", "icon": "", "name": "Warming Pad", "tasks": [{"id": "use_pad", "type": "checkmark", "title": "Apply warming pad to your lower back for 5 minutes.", "schedule": {"reminders": ["18:00"], "completionPeriods": [{"id": "56d114f3-e692-4283-9610-17e23edf8f70", "lockTime": "20:00", "unlockTime": "6:00"}]}}], "description": "Applying a warming pad is a quick and easy way to soothe sore muscles and joints."}]','[{"id": "Need", "title": "Why Consent Is Needed", "iconName": "featureSearch", "description": "We need your explicit consent because you are going to enroll to a research study. Therefore, we have to provide you all the information that could potentially have an impact on your decision whether or not you take part in the study. This is study-specific so please go through it carefully. Participation is entirely voluntary."}, {"id": "Risk_benefit", "title": "Risks & Benefits", "iconName": "signCaution", "description": "The main risks to you if you choose to participate are allergic reactions to one of the interventions you are going to apply. If you feel uncomfortable, suffer from itching or rash please pause the study until you have seen a doctor. It is important to know that you may not get any benefit from taking part in this research. Others may not benefit either. However, study results may help you to understand if one of the offered interventions has a positive effect on one of the investigated observations for you."}, {"id": "Data", "title": "Data Handling & Use", "iconName": "databaseExport", "description": "By giving your consent you accept that researchers are allowed to process anonymized data collected from you during this study for research purposes. If you stop being in the research study, already transmitted information may not be removed from the research study database because re-identification is not possible. It will continue to be used to complete the research analysis."}, {"id": "Issues", "title": "Issues to Consider", "iconName": "mapClock", "description": "For being able to use your results for research we need you to actively participate for the indicated minimum study duration. After reaching this you will be able to unlock results but we encourage you to take part at least until you reach the recommended level on the progress bar. Otherwise it might be the case that results can indeed be used for research but are not meaningful for you personally. Note that if you decide to take part in this research study you will be responsible for buying the needed aids."}, {"id": "Rights", "title": "Participant Rights", "iconName": "gavel", "description": "You may stop taking part in this research study at any time without any penalty. If you have any questions, concerns, or complaints at any time about this research, or you think the research has harmed you, please contact the office of the research team. You can find the contact details in your personal study dashboard."}, {"id": "Future", "title": "Future Research", "iconName": "binoculars", "description": "The purpose of this research study is to help you find the most effective supporting agent or behavior. The aim is not to treat your symptom causally. In a broader perspective the purpose of this study is also to get insights which group of persons benefits most from which intervention."}]','{"sequence": "alternating", "phaseDuration": 7, "numberOfCycles": 2, "sequenceCustom": "ABAB", "includeBaseline": true}','{"primary": {"id": "average", "type": "average", "title": "Average", "aggregate": "day", "description": "Average", "resultProperty": {"task": "rate_your_day", "property": "pain"}}, "secondary": []}',
       '[]',
       '2021-04-13 18:19:49.000',
       '2023-05-11 12:46:06.018',

From fb4f0e85e0e536db9fe0c21d5e86e63cda3403ad Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahim.ozkn@outlook.com>
Date: Fri, 21 Jun 2024 02:57:55 +0200
Subject: [PATCH 216/314] refactor: update designer study data after test
 controller is disposed

---
 designer_v2/lib/features/study/study_test_controller.dart | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/designer_v2/lib/features/study/study_test_controller.dart b/designer_v2/lib/features/study/study_test_controller.dart
index 8b715c936..c924e8843 100644
--- a/designer_v2/lib/features/study/study_test_controller.dart
+++ b/designer_v2/lib/features/study/study_test_controller.dart
@@ -16,7 +16,7 @@ part 'study_test_controller.g.dart';
 class StudyTestController extends _$StudyTestController {
   @override
   StudyTestControllerState build(StudyID studyId) {
-    // final studyRepo = ref.read(studyRepositoryProvider);
+    final studyRepo = ref.read(studyRepositoryProvider);
     ref.onDispose(() {
       // Reload the study after disposing the test controller so that any
       // data changes resulting from testing are reflected in the study for
@@ -24,9 +24,8 @@ class StudyTestController extends _$StudyTestController {
       //
       // Ideally, we would stream changes from the backend/database directly,
       // but this is a sufficient workaround for now.
-
-      // TODO test if this is needed or the study gets already updated after closing the test view
-      // studyRepo.fetch(studyId);
+      studyRepo.fetch(studyId);
+      print('StudyTestController.dispose');
     });
     return StudyTestControllerState(
       studyId: studyId,

From 271b074fb29d2ae5f392bb2f52cbdb167961a816 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 21 Jun 2024 08:25:28 +0200
Subject: [PATCH 217/314] docs: add function documentation

---
 .../design/study_form_controller.dart         |  2 +-
 .../lib/features/forms/form_view_model.dart   | 54 +++++++++++++++++++
 designer_v2/lib/utils/behaviour_subject.dart  |  5 ++
 .../lib/utils/combined_stream_notifier.dart   |  3 ++
 designer_v2/lib/utils/debouncer.dart          | 16 ++++++
 5 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/designer_v2/lib/features/design/study_form_controller.dart b/designer_v2/lib/features/design/study_form_controller.dart
index 042128a4d..55c5f8962 100644
--- a/designer_v2/lib/features/design/study_form_controller.dart
+++ b/designer_v2/lib/features/design/study_form_controller.dart
@@ -168,7 +168,7 @@ class StudyFormViewModel extends FormViewModel<Study>
 }
 
 /// Provides the [FormViewModel] that is responsible for displaying and
-/// editing the survey design form.
+/// editing the study design form.
 ///
 /// Note: This is not safe to use in widgets (or other providers) that are built
 /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
diff --git a/designer_v2/lib/features/forms/form_view_model.dart b/designer_v2/lib/features/forms/form_view_model.dart
index 682ebb218..795ed7bc7 100644
--- a/designer_v2/lib/features/forms/form_view_model.dart
+++ b/designer_v2/lib/features/forms/form_view_model.dart
@@ -48,6 +48,14 @@ typedef FormControlUpdateFutureBuilder = Future Function(
   AbstractControl control,
 );
 
+/// This class represents a form view model.
+///
+/// It provides methods and properties to manage the state of a form,
+/// including validation, autosave, and form mode (create, edit, readonly).
+/// It also provides methods to save and cancel changes to the form.
+///
+/// This class is designed to be extended by other classes that provide
+/// specific implementations for different types of forms.
 abstract class FormViewModel<T> implements IFormGroupController {
   FormViewModel({
     T? formData,
@@ -151,6 +159,18 @@ abstract class FormViewModel<T> implements IFormGroupController {
   /// Key used internally for storing properties of the [form] itself
   static const _formKey = '__form';
 
+  /// Sets the form data and updates the form controls.
+  ///
+  /// This method is used to set the form data (`_formData`) and then update the form controls
+  /// to reflect the new data. It does this by calling the `setControlsFrom` method, which
+  /// is responsible for updating the form controls based on the provided data.
+  ///
+  /// After updating the form controls, it also updates the `prevFormValue` property to store
+  /// the current state of the form. This is used later to determine if the form is dirty
+  /// (i.e., if the form data has changed since it was last set).
+  ///
+  /// Finally, it calls the `form.updateValueAndValidity` method to ensure that the form's
+  /// value and validity state are correctly updated after the form controls have been changed.
   void _setFormData(T? formData) {
     _formData = formData;
     if (formData != null) {
@@ -198,6 +218,24 @@ abstract class FormViewModel<T> implements IFormGroupController {
     assert(form.allControlsDisabled());
   }
 
+  /// Restores the enabled/disabled state of each form control.
+  ///
+  /// This method is used to restore the enabled/disabled state of each form control
+  /// to its default state. It does this by iterating over each control in the form
+  /// and checking the `_defaultControlStates` map, which stores the default state
+  /// for each control.
+  ///
+  /// If a control's default state is enabled, it calls `control.markAsEnabled`.
+  /// If a control's default state is disabled, it calls `control.markAsDisabled`.
+  ///
+  /// This method is typically called when the form mode changes. For example, when
+  /// switching from edit mode to read-only mode, all controls are disabled. When
+  /// switching back to edit mode, this method is used to restore the controls to
+  /// their original states.
+  ///
+  /// The `emitEvent` and `updateParent` parameters are used to control whether
+  /// changing the state of a control should emit an event and whether it should
+  /// update the state of its parent control.
   void _restoreControlStates({
     bool emitEvent = true,
     bool updateParent = true,
@@ -371,6 +409,22 @@ abstract class FormViewModel<T> implements IFormGroupController {
     return Future.value();
   }
 
+  /// Enables the autosave functionality for the form.
+  ///
+  /// This method sets up the form to automatically save its data whenever any changes are made to the form controls.
+  /// It does this by setting up a listener for each form control's `valueChanges` stream and initiating a save operation
+  /// whenever a form control's value changes.
+  ///
+  /// The `debounce` parameter is used to specify the delay (in milliseconds) before the save operation is triggered
+  /// after the last change to the form controls. This is useful to prevent excessive save operations if the form controls
+  /// are being updated frequently.
+  ///
+  /// The `onlyValid` parameter is not used in the current implementation.
+  ///
+  /// If there are any existing subscriptions to the form control's value changes (i.e., if autosave has already been enabled),
+  /// this method returns immediately to avoid setting up autosave multiple times.
+  ///
+  /// The save operation is wrapped in a `CancelableOperation` to allow it to be cancelled if necessary.
   void enableAutosave({
     int debounce = Config.formAutosaveDebounce,
     bool onlyValid = true,
diff --git a/designer_v2/lib/utils/behaviour_subject.dart b/designer_v2/lib/utils/behaviour_subject.dart
index b58e4ce82..0f492a67e 100644
--- a/designer_v2/lib/utils/behaviour_subject.dart
+++ b/designer_v2/lib/utils/behaviour_subject.dart
@@ -2,6 +2,11 @@ import 'dart:async';
 
 import 'package:rxdart/subjects.dart';
 
+/// A BehaviorSubject that suppresses its initial event.
+///
+/// This class wraps a [BehaviorSubject] and suppresses the initial event
+/// that is emitted upon subscription. All subsequent events are emitted
+/// as usual.
 class SuppressedBehaviorSubject<T> {
   SuppressedBehaviorSubject(this.subject);
 
diff --git a/designer_v2/lib/utils/combined_stream_notifier.dart b/designer_v2/lib/utils/combined_stream_notifier.dart
index 8be7e6a90..6e94ff93a 100644
--- a/designer_v2/lib/utils/combined_stream_notifier.dart
+++ b/designer_v2/lib/utils/combined_stream_notifier.dart
@@ -1,6 +1,9 @@
 import 'dart:async';
+
 import 'package:flutter/material.dart';
 
+/// A [ChangeNotifier] that reacts to events from multiple streams.
+///
 /// Inspired by [GoRouterRefreshStream]
 /// This class can be used to make [GoRouter]'s `refreshListenable` react to
 /// to events from multiple source streams.
diff --git a/designer_v2/lib/utils/debouncer.dart b/designer_v2/lib/utils/debouncer.dart
index 84c36f863..e70842a83 100644
--- a/designer_v2/lib/utils/debouncer.dart
+++ b/designer_v2/lib/utils/debouncer.dart
@@ -4,6 +4,12 @@ import 'package:async/async.dart';
 import 'package:studyu_designer_v2/utils/performance.dart';
 import 'package:studyu_designer_v2/utils/typings.dart';
 
+/// Limits the rate of execution of a function.
+///
+/// This class provides a mechanism to limit the rate at which a function
+/// is executed. This is useful in scenarios where a function might be
+/// called frequently, but it is not necessary or desirable for it to
+/// execute on every call.
 abstract class ExecutionLimiter {
   ExecutionLimiter({this.milliseconds = 300});
   final int milliseconds;
@@ -14,6 +20,11 @@ abstract class ExecutionLimiter {
   }
 }
 
+/// A debouncer that limits the rate of execution of a function.
+///
+/// This class extends [ExecutionLimiter] to provide a debouncing mechanism.
+/// This means that if the function is called multiple times in quick
+/// succession, it will only be executed once after a certain delay.
 class Debouncer extends ExecutionLimiter {
   Debouncer({
     super.milliseconds = 300,
@@ -66,6 +77,11 @@ class Debouncer extends ExecutionLimiter {
   }
 }
 
+/// A throttler that limits the rate of execution of a function.
+///
+/// This class extends [ExecutionLimiter] to provide a throttling mechanism.
+/// This means that the function will not be executed if it has been called
+/// recently, ensuring a minimum delay between executions.
 class Throttler extends ExecutionLimiter {
   Throttler({super.milliseconds = 300});
 

From c5a80f9a49771cfea51cf2c26ae8c942117edb28 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 21 Jun 2024 08:25:41 +0200
Subject: [PATCH 218/314] chore: new env vm anon key

---
 flutter_common/lib/envs/.env.dev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flutter_common/lib/envs/.env.dev b/flutter_common/lib/envs/.env.dev
index 6a58c0cf4..6c52fc1cc 100644
--- a/flutter_common/lib/envs/.env.dev
+++ b/flutter_common/lib/envs/.env.dev
@@ -1,5 +1,5 @@
 STUDYU_SUPABASE_URL=https://studyu-02.dhc-lab.hpi.de
-STUDYU_SUPABASE_PUBLIC_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.ewogICJyb2xlIjogImFub24iLAogICJpc3MiOiAic3VwYWJhc2UiLAogICJpYXQiOiAxNjk4MDEyMDAwLAogICJleHAiOiAxODU1ODY0ODAwCn0.GOKP4uA275ptfAxf64NGezY2q-a0LfBtsoOlS5Sn60c
+STUDYU_SUPABASE_PUBLIC_ANON_KEY=eyJhbGciOiAiSFMyNTYiLCJ0eXAiOiAiSldUIn0.eyJyb2xlIjogImFub24iLCJpc3MiOiAic3VwYWJhc2UiLCJpYXQiOiAxNzE4OTE0MTQ3LCJleHAiOiAxNzUwNDUwMTQ3fQ.w_bMxZSiBXWDIKu16-v9wuzqoQ6a6MnRGUKfehSkPJ0
 STUDYU_PROJECT_GENERATOR_URL=
 STUDYU_APP_URL=https://app.dev.studyu.health
 STUDYU_DESIGNER_URL=https://designer.dev.studyu.health

From 21b63b1c163581943f3bf425210e314d07ffc283 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sat, 22 Jun 2024 14:44:40 +0200
Subject: [PATCH 219/314] chore: analyzer fix

---
 .../lib/common_views/standard_table.dart      |  3 ++-
 designer_v2/lib/domain/study_monitoring.dart  | 10 ++++----
 .../monitor/participant_details_view.dart     | 22 +++++++++---------
 .../features/monitor/study_monitor_page.dart  | 23 ++++++++-----------
 .../features/monitor/study_monitor_table.dart |  8 +++----
 designer_v2/lib/utils/extensions.dart         |  2 +-
 designer_v2/pubspec.yaml                      |  2 +-
 7 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/designer_v2/lib/common_views/standard_table.dart b/designer_v2/lib/common_views/standard_table.dart
index de37d57f6..558b61cb0 100644
--- a/designer_v2/lib/common_views/standard_table.dart
+++ b/designer_v2/lib/common_views/standard_table.dart
@@ -261,7 +261,8 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
     _cachedRows.clear();
   }
 
-  int _sortLogic(T a, T b, {required int columnIndex, required bool? sortAscending}) {
+  int _sortLogic(T a, T b,
+      {required int columnIndex, required bool? sortAscending,}) {
     final sortPredicate = widget.sortColumnPredicates;
     if (sortPredicate != null && sortPredicate[columnIndex] != null) {
       if (sortAscending ?? true) {
diff --git a/designer_v2/lib/domain/study_monitoring.dart b/designer_v2/lib/domain/study_monitoring.dart
index ad49fca9a..374027d8d 100644
--- a/designer_v2/lib/domain/study_monitoring.dart
+++ b/designer_v2/lib/domain/study_monitoring.dart
@@ -82,7 +82,7 @@ extension StudyMonitoringX on Study {
           .where((progress) => progress.subjectId == participant.id)
           .toList();
       progresses.sort(
-          (b, a) => a.completedAt!.compareTo(b.completedAt!)); // descending
+          (b, a) => a.completedAt!.compareTo(b.completedAt!),); // descending
       final interventionOrder = schedule
           .generateInterventionIdsInOrder(participant.selectedInterventionIds);
       final lastActivityAt = progresses.isNotEmpty
@@ -90,7 +90,7 @@ extension StudyMonitoringX on Study {
           : participant.startedAt!;
       final studyDurationInDays = schedule.length;
       final currentDayOfStudy = min(studyDurationInDays,
-          DateTime.now().toUtc().difference(participant.startedAt!).inDays);
+          DateTime.now().toUtc().difference(participant.startedAt!).inDays,);
       final daysInBaseline =
           schedule.includeBaseline ? schedule.phaseDuration : 0;
 
@@ -121,7 +121,7 @@ extension StudyMonitoringX on Study {
                 p.completedAt!
                     .isAfter(participant.startedAt!.add(Duration(days: day))) &&
                 p.completedAt!.isBefore(
-                    participant.startedAt!.add(Duration(days: day + 1))))
+                    participant.startedAt!.add(Duration(days: day + 1)),),)
             .map((p) => p.taskId)
             .toSet();
 
@@ -161,7 +161,7 @@ extension StudyMonitoringX on Study {
         droppedOut: participant.isDeleted,
         missedTasksPerDay: missedTasksPerDay,
         completedTasksPerDay: completedTasksPerDay,
-      ));
+      ),);
     }
 
     final activeParticipants = items.where((item) {
@@ -177,7 +177,7 @@ extension StudyMonitoringX on Study {
         .length;
 
     assert(activeParticipants + dropoutParticipants + completedParticipants ==
-        items.length);
+        items.length,);
 
     return StudyMonitorData(
       activeParticipants: activeParticipants,
diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index a3afcc54d..da3610730 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -12,7 +12,7 @@ class ParticipantDetailsView extends ConsumerWidget {
       {required this.monitorItem,
       required this.interventions,
       required this.observations,
-      super.key});
+      super.key,});
 
   final StudyMonitorItem monitorItem;
   final List<Intervention> interventions;
@@ -44,9 +44,9 @@ class ParticipantDetailsView extends ConsumerWidget {
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         _buildInfoRow(tr.monitoring_table_column_participant_id,
-            monitorItem.participantId),
+            monitorItem.participantId,),
         _buildInfoRow(tr.monitoring_table_column_invite_code,
-            monitorItem.inviteCode ?? '-'),
+            monitorItem.inviteCode ?? '-',),
         _buildInfoRow(
           tr.monitoring_table_column_enrolled,
           monitorItem.startedAt
@@ -74,12 +74,12 @@ class ParticipantDetailsView extends ConsumerWidget {
 
   Widget _buildPerDayStatus() {
     assert(monitorItem.missedTasksPerDay.length ==
-        monitorItem.completedTasksPerDay.length);
+        monitorItem.completedTasksPerDay.length,);
     return Wrap(
       children: monitorItem.missedTasksPerDay
           .mapIndexed((index, missed) => Tooltip(
                 message: _getTooltipText(
-                    missed, monitorItem.completedTasksPerDay[index]),
+                    missed, monitorItem.completedTasksPerDay[index],),
                 child: Container(
                   height: 50,
                   width: 50,
@@ -96,17 +96,17 @@ class ParticipantDetailsView extends ConsumerWidget {
                     child: Text(
                       (index + 1).toString(),
                       style: const TextStyle(
-                          color: Colors.white, fontWeight: FontWeight.bold),
+                          color: Colors.white, fontWeight: FontWeight.bold,),
                     ),
                   ),
                 ),
-              ))
+              ),)
           .toList(),
     );
   }
 
   String _getTooltipText(
-      Set<String> missedTaskIds, Set<String> completedTaskIds) {
+      Set<String> missedTaskIds, Set<String> completedTaskIds,) {
     final sb = StringBuffer();
     for (final intervention in interventions) {
       for (final task in intervention.tasks) {
@@ -139,13 +139,13 @@ class ParticipantDetailsView extends ConsumerWidget {
         Row(
           children: [
             _buildLegendItem(
-                Colors.green, tr.participant_details_color_legend_completed),
+                Colors.green, tr.participant_details_color_legend_completed,),
             const SizedBox(width: 16.0),
             _buildLegendItem(Colors.orange,
-                tr.participant_details_color_legend_partially_completed),
+                tr.participant_details_color_legend_partially_completed,),
             const SizedBox(width: 16.0),
             _buildLegendItem(
-                Colors.red, tr.participant_details_color_legend_missed),
+                Colors.red, tr.participant_details_color_legend_missed,),
           ],
         ),
       ],
diff --git a/designer_v2/lib/features/monitor/study_monitor_page.dart b/designer_v2/lib/features/monitor/study_monitor_page.dart
index bb3cbee6b..7fddf2c0c 100644
--- a/designer_v2/lib/features/monitor/study_monitor_page.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_page.dart
@@ -24,24 +24,21 @@ class StudyMonitorScreen extends StudyPageWidget {
         data: (study) {
           final studyMonitorData = study.monitorData;
           return Column(
-            mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: <Widget>[
               _monitorSectionHeader(context, studyMonitorData),
               const SizedBox(height: 40.0), // spacing between body elements
-              studyMonitorData.items.isNotEmpty
-                  ? StudyMonitorTable(
+              if (studyMonitorData.items.isNotEmpty) StudyMonitorTable(
                       ref: ref,
                       studyMonitorItems: studyMonitorData.items,
                       onSelectItem: (item) => _onSelectParticipant(context, ref, item, study),
-                    )
-                  : EmptyBody(
+                    ) else EmptyBody(
                       icon: Icons.person_off_rounded,
                       title: tr.monitoring_no_participants_title,
-                      description: tr.monitoring_no_participants_description),
+                      description: tr.monitoring_no_participants_description,),
             ],
           );
-        });
+        },);
   }
 
   Widget _monitorSectionHeader(BuildContext context, StudyMonitorData monitorData) {
@@ -57,15 +54,15 @@ class StudyMonitorScreen extends StudyPageWidget {
             children: [
               Expanded(
                   child: _buildStat(context, tr.monitoring_active, tr.monitoring_active_tooltip,
-                      monitorData.activeParticipants, enrolled)),
+                      monitorData.activeParticipants, enrolled,),),
               const SizedBox(width: 20.0),
               Expanded(
                   child: _buildStat(context, tr.monitoring_dropout, tr.monitoring_dropout_tooltip,
-                      monitorData.dropoutParticipants, enrolled)),
+                      monitorData.dropoutParticipants, enrolled,),),
               const SizedBox(width: 20.0),
               Expanded(
                   child: _buildStat(context, tr.monitoring_completed, tr.monitoring_completed_tooltip,
-                      monitorData.completedParticipants, enrolled)),
+                      monitorData.completedParticipants, enrolled,),),
             ],
           ),
         ),
@@ -92,7 +89,7 @@ class StudyMonitorScreen extends StudyPageWidget {
                 value: total <= 0 ? 0 : value / total,
                 backgroundColor: theme.colorScheme.secondary.withOpacity(0.2),
                 valueColor: AlwaysStoppedAnimation(theme.colorScheme.secondary),
-              )),
+              ),),
         ],
       ),
     );
@@ -104,12 +101,12 @@ class StudyMonitorScreen extends StudyPageWidget {
       context: context,
       title: tr.participant_details_title,
       body: ParticipantDetailsView(
-          monitorItem: item, interventions: study.interventions, observations: study.observations),
+          monitorItem: item, interventions: study.interventions, observations: study.observations,),
       actionButtons: [
         retainSizeInAppBar(DismissButton(
           text: tr.dialog_close,
           onPressed: () => Navigator.maybePop(context),
-        ))
+        ),),
       ],
     );
   }
diff --git a/designer_v2/lib/features/monitor/study_monitor_table.dart b/designer_v2/lib/features/monitor/study_monitor_table.dart
index 4a389daa3..1dee8509c 100644
--- a/designer_v2/lib/features/monitor/study_monitor_table.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_table.dart
@@ -3,8 +3,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_designer_v2/common_views/standard_table.dart';
 import 'package:studyu_designer_v2/domain/study_monitoring.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
-import 'package:studyu_designer_v2/utils/extensions.dart';
 import 'package:studyu_designer_v2/localization/locale_providers.dart';
+import 'package:studyu_designer_v2/utils/extensions.dart';
 
 class StudyMonitorTable extends ConsumerWidget {
   final WidgetRef ref;
@@ -71,7 +71,6 @@ class StudyMonitorTable extends ConsumerWidget {
         ),
       ],
       buildCellsAt: _buildRow,
-      cellSpacing: 10.0,
       rowSpacing: 5.0,
       minRowHeight: 30.0,
       headerMaxLines: 2,
@@ -80,7 +79,7 @@ class StudyMonitorTable extends ConsumerWidget {
   }
 
   List<Widget> _buildRow(BuildContext context, StudyMonitorItem item,
-      int rowIdx, Set<MaterialState> states) {
+      int rowIdx, Set<WidgetState> states,) {
     final languageCode = ref.watch(localeProvider).languageCode;
     return [
       Tooltip(
@@ -130,9 +129,8 @@ class StudyMonitorTable extends ConsumerWidget {
           ),
         ),
         Align(
-          alignment: Alignment.center,
           child: Text("$progress/$total",
-              style: TextStyle(color: theme.colorScheme.onPrimary, fontWeight: FontWeight.bold)),
+              style: TextStyle(color: theme.colorScheme.onPrimary, fontWeight: FontWeight.bold),),
         ),
       ],
     );
diff --git a/designer_v2/lib/utils/extensions.dart b/designer_v2/lib/utils/extensions.dart
index 2d482a42f..326ba9880 100644
--- a/designer_v2/lib/utils/extensions.dart
+++ b/designer_v2/lib/utils/extensions.dart
@@ -109,7 +109,7 @@ extension DateTimeAgoX on DateTime {
     return _timeAgoFormatted();
   }
 
-  toLocalizedString({required String locale, showTime = true}) {
+  String toLocalizedString({required String locale, bool showTime = true}) {
     final time = toLocal();
     final formatter = DateFormat.yMMMMd(locale);
     if (showTime) {
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 30032dc3c..ba731deae 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -25,7 +25,7 @@ dependencies:
   flutter_web_plugins:
     sdk: flutter
   go_router: ^14.1.4
-  intl: ^0.18.1
+  intl: ^0.19.0
   material_color_utilities: 0.8.0 # integration_test
   material_design_icons_flutter: ^7.0.7296
   pointer_interceptor: ^0.10.1+1

From 8ef4423863469613e52223990509af0601363f48 Mon Sep 17 00:00:00 2001
From: ahmed10 <ahmed10@uni-potsdam.de>
Date: Sat, 22 Jun 2024 01:51:57 +0200
Subject: [PATCH 220/314] feat: progress bar

---
 designer_v2/lib/constants.dart                |   6 +-
 designer_v2/lib/domain/study_monitoring.dart  | 123 +++++++---
 .../features/monitor/study_monitor_page.dart  | 228 +++++++++++++-----
 designer_v2/lib/localization/app_de.arb       |   3 +
 designer_v2/lib/localization/app_en.arb       |   3 +
 5 files changed, 266 insertions(+), 97 deletions(-)

diff --git a/designer_v2/lib/constants.dart b/designer_v2/lib/constants.dart
index 91a22c62c..c14b94e79 100644
--- a/designer_v2/lib/constants.dart
+++ b/designer_v2/lib/constants.dart
@@ -46,5 +46,7 @@ const String signupRouteName = 'signup';
 const String forgotPasswordRouteName = 'forgotPassword';
 const String recoverPasswordRouteName = 'recoverPassword';
 const String errorRouteName = 'error';
-final DateTime participantDropoutDuration = DateTime.now().subtract(const Duration(days: 7));
-
+final DateTime participantDropoutDuration =
+    DateTime.now().subtract(const Duration(days: 5));
+final DateTime participantInactiveDuration =
+    DateTime.now().subtract(const Duration(days: 3));
diff --git a/designer_v2/lib/domain/study_monitoring.dart b/designer_v2/lib/domain/study_monitoring.dart
index 374027d8d..cc66b21aa 100644
--- a/designer_v2/lib/domain/study_monitoring.dart
+++ b/designer_v2/lib/domain/study_monitoring.dart
@@ -9,6 +9,9 @@ class StudyMonitorData {
   /// Active means that the the study has not ended yet and the participant did not drop out
   final int activeParticipants;
 
+  // Number of participants who are currently inactive in the study for more than 3 days in a row
+  final int inactiveParticipants;
+
   /// Number of participants who dropped out of the study before the study ended
   /// Hint: The is_deleted flag in the study_subject database table marks a participant as dropped out
   /// Note: If the participant's last activity exceeds 7 days, they will also be counted as a dropout
@@ -23,6 +26,7 @@ class StudyMonitorData {
 
   const StudyMonitorData({
     required this.activeParticipants,
+    required this.inactiveParticipants,
     required this.dropoutParticipants,
     required this.completedParticipants,
     required this.items,
@@ -82,15 +86,18 @@ extension StudyMonitoringX on Study {
           .where((progress) => progress.subjectId == participant.id)
           .toList();
       progresses.sort(
-          (b, a) => a.completedAt!.compareTo(b.completedAt!),); // descending
+        (b, a) => a.completedAt!.compareTo(b.completedAt!),
+      ); // descending
       final interventionOrder = schedule
           .generateInterventionIdsInOrder(participant.selectedInterventionIds);
       final lastActivityAt = progresses.isNotEmpty
           ? progresses.first.completedAt!
           : participant.startedAt!;
       final studyDurationInDays = schedule.length;
-      final currentDayOfStudy = min(studyDurationInDays,
-          DateTime.now().toUtc().difference(participant.startedAt!).inDays,);
+      final currentDayOfStudy = min(
+        studyDurationInDays,
+        DateTime.now().toUtc().difference(participant.startedAt!).inDays,
+      );
       final daysInBaseline =
           schedule.includeBaseline ? schedule.phaseDuration : 0;
 
@@ -117,11 +124,14 @@ extension StudyMonitoringX on Study {
             requiredInterventionTaskIds.union(requiredSurveyTaskIds);
 
         final completedTaskIds = progresses
-            .where((p) =>
-                p.completedAt!
-                    .isAfter(participant.startedAt!.add(Duration(days: day))) &&
-                p.completedAt!.isBefore(
-                    participant.startedAt!.add(Duration(days: day + 1)),),)
+            .where(
+              (p) =>
+                  p.completedAt!.isAfter(
+                      participant.startedAt!.add(Duration(days: day))) &&
+                  p.completedAt!.isBefore(
+                    participant.startedAt!.add(Duration(days: day + 1)),
+                  ),
+            )
             .map((p) => p.taskId)
             .toSet();
 
@@ -147,40 +157,79 @@ extension StudyMonitoringX on Study {
       final missedInterventions = totalInterventions - completedInterventions;
       final missedSurveys = totalSurveys - completedSurveys;
 
-      items.add(StudyMonitorItem(
-        participantId: participant.id,
-        inviteCode: participant.inviteCode,
-        startedAt: participant.startedAt!,
-        lastActivityAt: lastActivityAt,
-        currentDayOfStudy: currentDayOfStudy,
-        studyDurationInDays: studyDurationInDays,
-        completedInterventions: completedInterventions,
-        missedInterventions: missedInterventions,
-        completedSurveys: completedSurveys,
-        missedSurveys: missedSurveys,
-        droppedOut: participant.isDeleted,
-        missedTasksPerDay: missedTasksPerDay,
-        completedTasksPerDay: completedTasksPerDay,
-      ),);
+      items.add(
+        StudyMonitorItem(
+          participantId: participant.id,
+          inviteCode: participant.inviteCode,
+          startedAt: participant.startedAt!,
+          lastActivityAt: lastActivityAt,
+          currentDayOfStudy: currentDayOfStudy,
+          studyDurationInDays: studyDurationInDays,
+          completedInterventions: completedInterventions,
+          missedInterventions: missedInterventions,
+          completedSurveys: completedSurveys,
+          missedSurveys: missedSurveys,
+          droppedOut: participant.isDeleted,
+          missedTasksPerDay: missedTasksPerDay,
+          completedTasksPerDay: completedTasksPerDay,
+        ),
+      );
     }
 
-    final activeParticipants = items.where((item) {
-      return !item.droppedOut &&
-          item.currentDayOfStudy < item.studyDurationInDays &&
-          item.lastActivityAt.isAfter(participantDropoutDuration);
-    }).length;
-    final dropoutParticipants = items.where((item) {
-      return item.droppedOut && item.lastActivityAt.isBefore(participantDropoutDuration);
-    }).length;
-    final completedParticipants = items
-        .where((item) => item.currentDayOfStudy >= item.studyDurationInDays)
-        .length;
-
-    assert(activeParticipants + dropoutParticipants + completedParticipants ==
-        items.length,);
+    int activeParticipants = 0;
+    int inactiveParticipants = 0;
+    int dropoutParticipants = 0;
+    int completedParticipants = 0;
+
+    items.forEach((item) {
+      if (!item.droppedOut) {
+        if (item.currentDayOfStudy < item.studyDurationInDays) {
+          if (item.lastActivityAt.isAfter(participantInactiveDuration)) {
+            activeParticipants += 1; // Active
+          } else {
+            inactiveParticipants += 1; // Inactive
+          }
+        } else {
+          completedParticipants += 1; // Completed
+        }
+      } else {
+        if (item.currentDayOfStudy < item.studyDurationInDays) {
+          if (item.lastActivityAt.isBefore(participantDropoutDuration)) {
+            dropoutParticipants += 1; // Dropout
+          }
+        } else {
+          dropoutParticipants += 1; // Dropout
+        }
+      }
+    });
+
+    print({'debug', dropoutParticipants});
+    print({
+      'debug',
+      {'active', activeParticipants},
+      {'inactive', inactiveParticipants},
+      {'dropout', dropoutParticipants},
+      {'completed', completedParticipants}
+    });
+    print({'debug:total', items.length});
+    print({
+      'debug:item': items.where((item) {
+        print({'item', item.currentDayOfStudy});
+        return true;
+      })
+    });
+
+    assert(
+      activeParticipants +
+              inactiveParticipants +
+              dropoutParticipants +
+              completedParticipants ==
+          items.length,
+    );
 
     return StudyMonitorData(
       activeParticipants: activeParticipants,
+      inactiveParticipants: inactiveParticipants,
       dropoutParticipants: dropoutParticipants,
       completedParticipants: completedParticipants,
       items: items,
diff --git a/designer_v2/lib/features/monitor/study_monitor_page.dart b/designer_v2/lib/features/monitor/study_monitor_page.dart
index 7fddf2c0c..d60444588 100644
--- a/designer_v2/lib/features/monitor/study_monitor_page.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_page.dart
@@ -20,49 +20,147 @@ class StudyMonitorScreen extends StudyPageWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final state = ref.watch(studyControllerProvider(studyId));
     return AsyncValueWidget<Study>(
-        value: state.study,
-        data: (study) {
-          final studyMonitorData = study.monitorData;
-          return Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: <Widget>[
-              _monitorSectionHeader(context, studyMonitorData),
-              const SizedBox(height: 40.0), // spacing between body elements
-              if (studyMonitorData.items.isNotEmpty) StudyMonitorTable(
-                      ref: ref,
-                      studyMonitorItems: studyMonitorData.items,
-                      onSelectItem: (item) => _onSelectParticipant(context, ref, item, study),
-                    ) else EmptyBody(
-                      icon: Icons.person_off_rounded,
-                      title: tr.monitoring_no_participants_title,
-                      description: tr.monitoring_no_participants_description,),
-            ],
-          );
-        },);
+      value: state.study,
+      data: (study) {
+        final studyMonitorData = study.monitorData;
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: <Widget>[
+            _monitorSectionHeader(context, studyMonitorData),
+            const SizedBox(height: 40.0), // spacing between body elements
+            if (studyMonitorData.items.isNotEmpty)
+              StudyMonitorTable(
+                ref: ref,
+                studyMonitorItems: studyMonitorData.items,
+                onSelectItem: (item) =>
+                    _onSelectParticipant(context, ref, item, study),
+              )
+            else
+              EmptyBody(
+                icon: Icons.person_off_rounded,
+                title: tr.monitoring_no_participants_title,
+                description: tr.monitoring_no_participants_description,
+              ),
+          ],
+        );
+      },
+    );
   }
 
-  Widget _monitorSectionHeader(BuildContext context, StudyMonitorData monitorData) {
-    final enrolled =
-        monitorData.activeParticipants + monitorData.dropoutParticipants + monitorData.completedParticipants;
+  Widget _monitorSectionHeader(
+      BuildContext context, StudyMonitorData monitorData) {
+    final int total = monitorData.items.length;
+    const double minPercentage = 0.05; // Minimum percentage for visibility
+
+    double activePercentage = monitorData.activeParticipants / total;
+    double inactivePercentage = monitorData.inactiveParticipants / total;
+    double dropoutPercentage = monitorData.dropoutParticipants / total;
+    double completedPercentage = monitorData.completedParticipants / total;
+
+    // Adjust for minimum percentage visibility
+    if (monitorData.activeParticipants == 0) activePercentage = minPercentage;
+    if (monitorData.inactiveParticipants == 0) {
+      inactivePercentage = minPercentage;
+    }
+    if (monitorData.dropoutParticipants == 0) dropoutPercentage = minPercentage;
+    if (monitorData.completedParticipants == 0) {
+      completedPercentage = minPercentage;
+    }
+
+    // Normalize the percentages so they add up to 1.0
+    final double sumOfPercentages = activePercentage +
+        inactivePercentage +
+        dropoutPercentage +
+        completedPercentage;
+
+    activePercentage /= sumOfPercentages;
+    inactivePercentage /= sumOfPercentages;
+    dropoutPercentage /= sumOfPercentages;
+    completedPercentage /= sumOfPercentages;
+
+    const Color activeColor = Color(0xFF2ECC71);
+    const Color inactiveColor = Color(0xFFE74C3C);
+    const Color dropoutColor = Color(0xFFF39C12);
+    const Color completedColor = Color(0xFFF1C40F);
     return Row(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        SelectableText(tr.monitoring_participants_title, style: Theme.of(context).textTheme.headlineSmall),
+        SelectableText(tr.monitoring_participants_title,
+            style: Theme.of(context).textTheme.headlineSmall),
         const Spacer(),
-        Expanded(
-          child: Row(
+        SizedBox(
+          width: 420,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.end,
             children: [
-              Expanded(
-                  child: _buildStat(context, tr.monitoring_active, tr.monitoring_active_tooltip,
-                      monitorData.activeParticipants, enrolled,),),
-              const SizedBox(width: 20.0),
-              Expanded(
-                  child: _buildStat(context, tr.monitoring_dropout, tr.monitoring_dropout_tooltip,
-                      monitorData.dropoutParticipants, enrolled,),),
-              const SizedBox(width: 20.0),
-              Expanded(
-                  child: _buildStat(context, tr.monitoring_completed, tr.monitoring_completed_tooltip,
-                      monitorData.completedParticipants, enrolled,),),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.end,
+                children: [
+                  Positioned(
+                    right: 0,
+                    top: 0,
+                    child: Text('${tr.monitoring_total}: $total'),
+                  ),
+                ],
+              ),
+              Stack(
+                children: [
+                  Row(
+                    children: [
+                      const Spacer(),
+                      _buildStat(
+                        percentage: activePercentage,
+                        color: activeColor,
+                        tooltip: tr.monitoring_active,
+                      ),
+                      _buildStat(
+                        percentage: inactivePercentage,
+                        color: inactiveColor,
+                        tooltip: tr.monitoring_inactive,
+                      ),
+                      _buildStat(
+                        percentage: dropoutPercentage,
+                        color: dropoutColor,
+                        tooltip: tr.monitoring_dropout,
+                      ),
+                      _buildStat(
+                        percentage: completedPercentage,
+                        color: completedColor,
+                        tooltip: tr.monitoring_completed,
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+              const SizedBox(height: 10),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  _buildLegend(
+                      color: activeColor,
+                      text:
+                          '${tr.monitoring_active}: ${monitorData.activeParticipants}',
+                      tooltip: tr.monitoring_active_tooltip),
+                  const SizedBox(width: 10),
+                  _buildLegend(
+                      color: inactiveColor,
+                      text:
+                          '${tr.monitoring_inactive}: ${monitorData.inactiveParticipants}',
+                      tooltip: tr.monitoring_inactive_tooltip),
+                  const SizedBox(width: 10),
+                  _buildLegend(
+                      color: dropoutColor,
+                      text:
+                          '${tr.monitoring_dropout}: ${monitorData.dropoutParticipants}',
+                      tooltip: tr.monitoring_dropout_tooltip),
+                  const SizedBox(width: 10),
+                  _buildLegend(
+                      color: completedColor,
+                      text:
+                          '${tr.monitoring_completed}: ${monitorData.completedParticipants}',
+                      tooltip: tr.monitoring_completed_tooltip),
+                ],
+              ),
             ],
           ),
         ),
@@ -70,43 +168,57 @@ class StudyMonitorScreen extends StudyPageWidget {
     );
   }
 
-  Widget _buildStat(BuildContext context, String title, String tooltip, int value, int total) {
-    final theme = Theme.of(context);
+  Widget _buildStat(
+      {required double percentage,
+      required Color color,
+      required String tooltip}) {
+    return Expanded(
+        flex: (percentage * 1000).toInt(),
+        child: Tooltip(
+          message: tooltip,
+          child: Container(
+            height: 20,
+            color: color,
+          ),
+        ));
+  }
+
+  Widget _buildLegend(
+      {required Color color, required String text, required String tooltip}) {
     return Tooltip(
       message: tooltip,
-      child: Column(
+      child: Row(
         children: [
-          Row(
-            children: [
-              Text("$title:"),
-              const SizedBox(width: 8.0),
-              Text("$value/$total", style: theme.textTheme.headlineSmall),
-            ],
+          Container(
+            width: 15,
+            height: 15,
+            color: color,
           ),
-          SizedBox(
-              height: 4.0,
-              child: LinearProgressIndicator(
-                value: total <= 0 ? 0 : value / total,
-                backgroundColor: theme.colorScheme.secondary.withOpacity(0.2),
-                valueColor: AlwaysStoppedAnimation(theme.colorScheme.secondary),
-              ),),
+          const SizedBox(width: 5),
+          Text(text),
         ],
       ),
     );
   }
 
-  _onSelectParticipant(BuildContext context, WidgetRef ref, StudyMonitorItem item, Study study) {
+  _onSelectParticipant(
+      BuildContext context, WidgetRef ref, StudyMonitorItem item, Study study) {
     // TODO: refactor to use [RoutingIntent] for sidesheet (so that it can be triggered from controller)
     showModalSideSheet(
       context: context,
       title: tr.participant_details_title,
       body: ParticipantDetailsView(
-          monitorItem: item, interventions: study.interventions, observations: study.observations,),
+        monitorItem: item,
+        interventions: study.interventions,
+        observations: study.observations,
+      ),
       actionButtons: [
-        retainSizeInAppBar(DismissButton(
-          text: tr.dialog_close,
-          onPressed: () => Navigator.maybePop(context),
-        ),),
+        retainSizeInAppBar(
+          DismissButton(
+            text: tr.dialog_close,
+            onPressed: () => Navigator.maybePop(context),
+          ),
+        ),
       ],
     );
   }
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index 542929220..eaf8a8381 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -500,8 +500,11 @@
   "monitoring_no_participants_title": "Es gibt noch keine Teilnehmer in dieser Studie",
   "monitoring_no_participants_description": "Sobald Teilnehmer in Ihrer Studie eingeschrieben sind, können Sie hier deren Fortschritt überwachen und ihre Daten einsehen.",
   "monitoring_participants_title": "Teilnehmer",
+  "monitoring_total": "Gesamt",
   "monitoring_active": "Aktiv",
   "monitoring_active_tooltip": "Anzahl der Teilnehmer, die derzeit in der Studie sind",
+  "monitoring_inactive": "Inaktiv",
+  "monitoring_inactive_tooltip": "Anzahl der Teilnehmer, die 3 Tage hintereinander inaktiv sind",
   "monitoring_dropout": "Dropout",
   "monitoring_dropout_tooltip": "Anzahl der Teilnehmer, die die Studie vorzeitig abgebrochen haben",
   "monitoring_completed": "Abgeschlossen",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index 0390831e2..330a18c3f 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -547,8 +547,11 @@
   "monitoring_no_participants_title": "There are no participants in this study yet",
   "monitoring_no_participants_description": "Once participants have enrolled in your study, you can monitor their progress and view their data here.",
   "monitoring_participants_title": "Participants",
+  "monitoring_total": "Total",
   "monitoring_active": "Active",
   "monitoring_active_tooltip": "Number of participants who are currently in the study",
+  "monitoring_inactive": "Inactive",
+  "monitoring_inactive_tooltip": "Number of participants who are inactive 3 days in a row",
   "monitoring_dropout": "Dropout",
   "monitoring_dropout_tooltip": "Number of participants who have dropped out before the end of the study",
   "monitoring_completed": "Completed",

From d63d757b395b5c143c8f1e3ecee3f6212391ca14 Mon Sep 17 00:00:00 2001
From: ahmed10 <ahmed10@uni-potsdam.de>
Date: Sat, 22 Jun 2024 02:00:09 +0200
Subject: [PATCH 221/314] fix: colorblind friendly color

---
 designer_v2/lib/features/monitor/study_monitor_page.dart | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/designer_v2/lib/features/monitor/study_monitor_page.dart b/designer_v2/lib/features/monitor/study_monitor_page.dart
index d60444588..a99337350 100644
--- a/designer_v2/lib/features/monitor/study_monitor_page.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_page.dart
@@ -78,10 +78,10 @@ class StudyMonitorScreen extends StudyPageWidget {
     dropoutPercentage /= sumOfPercentages;
     completedPercentage /= sumOfPercentages;
 
-    const Color activeColor = Color(0xFF2ECC71);
-    const Color inactiveColor = Color(0xFFE74C3C);
-    const Color dropoutColor = Color(0xFFF39C12);
-    const Color completedColor = Color(0xFFF1C40F);
+    const Color activeColor = Color(0xFF0072B2);
+    const Color inactiveColor = Color(0xFFD55E00);
+    const Color dropoutColor = Color(0xFFCC79A7);
+    const Color completedColor = Color(0xFF009E73);
     return Row(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [

From 0160f5974c0e421dfa8d7b971a7f5a4ec058a9dd Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sat, 22 Jun 2024 14:53:35 +0200
Subject: [PATCH 222/314] chore: analyzer

---
 core/lib/src/models/tables/study_subject.dart |  4 +-
 .../lib/common_views/standard_table.dart      |  8 +-
 designer_v2/lib/domain/study_monitoring.dart  | 11 ++-
 .../monitor/participant_details_view.dart     | 95 +++++++++++--------
 .../features/monitor/study_monitor_page.dart  | 85 ++++++++++-------
 .../features/monitor/study_monitor_table.dart | 46 ++++++---
 6 files changed, 155 insertions(+), 94 deletions(-)

diff --git a/core/lib/src/models/tables/study_subject.dart b/core/lib/src/models/tables/study_subject.dart
index 9e5120d3a..5a2d0136d 100644
--- a/core/lib/src/models/tables/study_subject.dart
+++ b/core/lib/src/models/tables/study_subject.dart
@@ -75,8 +75,8 @@ class StudySubject extends SupabaseObjectFunctions<StudySubject> {
   )   : id = const Uuid().v4(),
         studyId = study.id;
 
-  List<String> get interventionOrder => study.schedule
-            .generateInterventionIdsInOrder(selectedInterventionIds);
+  List<String> get interventionOrder =>
+      study.schedule.generateInterventionIdsInOrder(selectedInterventionIds);
 
   List<Intervention> get selectedInterventions {
     final selectedInterventions = selectedInterventionIds
diff --git a/designer_v2/lib/common_views/standard_table.dart b/designer_v2/lib/common_views/standard_table.dart
index 558b61cb0..eb32c3f9a 100644
--- a/designer_v2/lib/common_views/standard_table.dart
+++ b/designer_v2/lib/common_views/standard_table.dart
@@ -261,8 +261,12 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
     _cachedRows.clear();
   }
 
-  int _sortLogic(T a, T b,
-      {required int columnIndex, required bool? sortAscending,}) {
+  int _sortLogic(
+    T a,
+    T b, {
+    required int columnIndex,
+    required bool? sortAscending,
+  }) {
     final sortPredicate = widget.sortColumnPredicates;
     if (sortPredicate != null && sortPredicate[columnIndex] != null) {
       if (sortAscending ?? true) {
diff --git a/designer_v2/lib/domain/study_monitoring.dart b/designer_v2/lib/domain/study_monitoring.dart
index cc66b21aa..18ccdd031 100644
--- a/designer_v2/lib/domain/study_monitoring.dart
+++ b/designer_v2/lib/domain/study_monitoring.dart
@@ -127,7 +127,8 @@ extension StudyMonitoringX on Study {
             .where(
               (p) =>
                   p.completedAt!.isAfter(
-                      participant.startedAt!.add(Duration(days: day))) &&
+                    participant.startedAt!.add(Duration(days: day)),
+                  ) &&
                   p.completedAt!.isBefore(
                     participant.startedAt!.add(Duration(days: day + 1)),
                   ),
@@ -181,7 +182,7 @@ extension StudyMonitoringX on Study {
     int dropoutParticipants = 0;
     int completedParticipants = 0;
 
-    items.forEach((item) {
+    for (final item in items) {
       if (!item.droppedOut) {
         if (item.currentDayOfStudy < item.studyDurationInDays) {
           if (item.lastActivityAt.isAfter(participantInactiveDuration)) {
@@ -201,7 +202,7 @@ extension StudyMonitoringX on Study {
           dropoutParticipants += 1; // Dropout
         }
       }
-    });
+    }
 
     print({'debug', dropoutParticipants});
     print({
@@ -209,14 +210,14 @@ extension StudyMonitoringX on Study {
       {'active', activeParticipants},
       {'inactive', inactiveParticipants},
       {'dropout', dropoutParticipants},
-      {'completed', completedParticipants}
+      {'completed', completedParticipants},
     });
     print({'debug:total', items.length});
     print({
       'debug:item': items.where((item) {
         print({'item', item.currentDayOfStudy});
         return true;
-      })
+      }),
     });
 
     assert(
diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index da3610730..1c320425b 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -8,11 +8,12 @@ import 'package:studyu_designer_v2/localization/locale_providers.dart';
 import 'package:studyu_designer_v2/utils/extensions.dart';
 
 class ParticipantDetailsView extends ConsumerWidget {
-  const ParticipantDetailsView(
-      {required this.monitorItem,
-      required this.interventions,
-      required this.observations,
-      super.key,});
+  const ParticipantDetailsView({
+    required this.monitorItem,
+    required this.interventions,
+    required this.observations,
+    super.key,
+  });
 
   final StudyMonitorItem monitorItem;
   final List<Intervention> interventions;
@@ -43,10 +44,14 @@ class ParticipantDetailsView extends ConsumerWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        _buildInfoRow(tr.monitoring_table_column_participant_id,
-            monitorItem.participantId,),
-        _buildInfoRow(tr.monitoring_table_column_invite_code,
-            monitorItem.inviteCode ?? '-',),
+        _buildInfoRow(
+          tr.monitoring_table_column_participant_id,
+          monitorItem.participantId,
+        ),
+        _buildInfoRow(
+          tr.monitoring_table_column_invite_code,
+          monitorItem.inviteCode ?? '-',
+        ),
         _buildInfoRow(
           tr.monitoring_table_column_enrolled,
           monitorItem.startedAt
@@ -73,40 +78,50 @@ class ParticipantDetailsView extends ConsumerWidget {
   }
 
   Widget _buildPerDayStatus() {
-    assert(monitorItem.missedTasksPerDay.length ==
-        monitorItem.completedTasksPerDay.length,);
+    assert(
+      monitorItem.missedTasksPerDay.length ==
+          monitorItem.completedTasksPerDay.length,
+    );
     return Wrap(
       children: monitorItem.missedTasksPerDay
-          .mapIndexed((index, missed) => Tooltip(
-                message: _getTooltipText(
-                    missed, monitorItem.completedTasksPerDay[index],),
-                child: Container(
-                  height: 50,
-                  width: 50,
-                  margin: const EdgeInsets.fromLTRB(0, 0, 8, 8),
-                  decoration: BoxDecoration(
-                    color: missed.isEmpty
-                        ? Colors.green
-                        : (monitorItem.completedTasksPerDay[index].isEmpty
-                            ? Colors.red
-                            : Colors.orange),
-                    borderRadius: BorderRadius.circular(8),
-                  ),
-                  child: Center(
-                    child: Text(
-                      (index + 1).toString(),
-                      style: const TextStyle(
-                          color: Colors.white, fontWeight: FontWeight.bold,),
+          .mapIndexed(
+            (index, missed) => Tooltip(
+              message: _getTooltipText(
+                missed,
+                monitorItem.completedTasksPerDay[index],
+              ),
+              child: Container(
+                height: 50,
+                width: 50,
+                margin: const EdgeInsets.fromLTRB(0, 0, 8, 8),
+                decoration: BoxDecoration(
+                  color: missed.isEmpty
+                      ? Colors.green
+                      : (monitorItem.completedTasksPerDay[index].isEmpty
+                          ? Colors.red
+                          : Colors.orange),
+                  borderRadius: BorderRadius.circular(8),
+                ),
+                child: Center(
+                  child: Text(
+                    (index + 1).toString(),
+                    style: const TextStyle(
+                      color: Colors.white,
+                      fontWeight: FontWeight.bold,
                     ),
                   ),
                 ),
-              ),)
+              ),
+            ),
+          )
           .toList(),
     );
   }
 
   String _getTooltipText(
-      Set<String> missedTaskIds, Set<String> completedTaskIds,) {
+    Set<String> missedTaskIds,
+    Set<String> completedTaskIds,
+  ) {
     final sb = StringBuffer();
     for (final intervention in interventions) {
       for (final task in intervention.tasks) {
@@ -139,13 +154,19 @@ class ParticipantDetailsView extends ConsumerWidget {
         Row(
           children: [
             _buildLegendItem(
-                Colors.green, tr.participant_details_color_legend_completed,),
+              Colors.green,
+              tr.participant_details_color_legend_completed,
+            ),
             const SizedBox(width: 16.0),
-            _buildLegendItem(Colors.orange,
-                tr.participant_details_color_legend_partially_completed,),
+            _buildLegendItem(
+              Colors.orange,
+              tr.participant_details_color_legend_partially_completed,
+            ),
             const SizedBox(width: 16.0),
             _buildLegendItem(
-                Colors.red, tr.participant_details_color_legend_missed,),
+              Colors.red,
+              tr.participant_details_color_legend_missed,
+            ),
           ],
         ),
       ],
diff --git a/designer_v2/lib/features/monitor/study_monitor_page.dart b/designer_v2/lib/features/monitor/study_monitor_page.dart
index a99337350..83302ec90 100644
--- a/designer_v2/lib/features/monitor/study_monitor_page.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_page.dart
@@ -48,7 +48,9 @@ class StudyMonitorScreen extends StudyPageWidget {
   }
 
   Widget _monitorSectionHeader(
-      BuildContext context, StudyMonitorData monitorData) {
+    BuildContext context,
+    StudyMonitorData monitorData,
+  ) {
     final int total = monitorData.items.length;
     const double minPercentage = 0.05; // Minimum percentage for visibility
 
@@ -85,8 +87,10 @@ class StudyMonitorScreen extends StudyPageWidget {
     return Row(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        SelectableText(tr.monitoring_participants_title,
-            style: Theme.of(context).textTheme.headlineSmall),
+        SelectableText(
+          tr.monitoring_participants_title,
+          style: Theme.of(context).textTheme.headlineSmall,
+        ),
         const Spacer(),
         SizedBox(
           width: 420,
@@ -137,28 +141,32 @@ class StudyMonitorScreen extends StudyPageWidget {
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
                   _buildLegend(
-                      color: activeColor,
-                      text:
-                          '${tr.monitoring_active}: ${monitorData.activeParticipants}',
-                      tooltip: tr.monitoring_active_tooltip),
+                    color: activeColor,
+                    text:
+                        '${tr.monitoring_active}: ${monitorData.activeParticipants}',
+                    tooltip: tr.monitoring_active_tooltip,
+                  ),
                   const SizedBox(width: 10),
                   _buildLegend(
-                      color: inactiveColor,
-                      text:
-                          '${tr.monitoring_inactive}: ${monitorData.inactiveParticipants}',
-                      tooltip: tr.monitoring_inactive_tooltip),
+                    color: inactiveColor,
+                    text:
+                        '${tr.monitoring_inactive}: ${monitorData.inactiveParticipants}',
+                    tooltip: tr.monitoring_inactive_tooltip,
+                  ),
                   const SizedBox(width: 10),
                   _buildLegend(
-                      color: dropoutColor,
-                      text:
-                          '${tr.monitoring_dropout}: ${monitorData.dropoutParticipants}',
-                      tooltip: tr.monitoring_dropout_tooltip),
+                    color: dropoutColor,
+                    text:
+                        '${tr.monitoring_dropout}: ${monitorData.dropoutParticipants}',
+                    tooltip: tr.monitoring_dropout_tooltip,
+                  ),
                   const SizedBox(width: 10),
                   _buildLegend(
-                      color: completedColor,
-                      text:
-                          '${tr.monitoring_completed}: ${monitorData.completedParticipants}',
-                      tooltip: tr.monitoring_completed_tooltip),
+                    color: completedColor,
+                    text:
+                        '${tr.monitoring_completed}: ${monitorData.completedParticipants}',
+                    tooltip: tr.monitoring_completed_tooltip,
+                  ),
                 ],
               ),
             ],
@@ -168,23 +176,28 @@ class StudyMonitorScreen extends StudyPageWidget {
     );
   }
 
-  Widget _buildStat(
-      {required double percentage,
-      required Color color,
-      required String tooltip}) {
+  Widget _buildStat({
+    required double percentage,
+    required Color color,
+    required String tooltip,
+  }) {
     return Expanded(
-        flex: (percentage * 1000).toInt(),
-        child: Tooltip(
-          message: tooltip,
-          child: Container(
-            height: 20,
-            color: color,
-          ),
-        ));
+      flex: (percentage * 1000).toInt(),
+      child: Tooltip(
+        message: tooltip,
+        child: Container(
+          height: 20,
+          color: color,
+        ),
+      ),
+    );
   }
 
-  Widget _buildLegend(
-      {required Color color, required String text, required String tooltip}) {
+  Widget _buildLegend({
+    required Color color,
+    required String text,
+    required String tooltip,
+  }) {
     return Tooltip(
       message: tooltip,
       child: Row(
@@ -202,7 +215,11 @@ class StudyMonitorScreen extends StudyPageWidget {
   }
 
   _onSelectParticipant(
-      BuildContext context, WidgetRef ref, StudyMonitorItem item, Study study) {
+    BuildContext context,
+    WidgetRef ref,
+    StudyMonitorItem item,
+    Study study,
+  ) {
     // TODO: refactor to use [RoutingIntent] for sidesheet (so that it can be triggered from controller)
     showModalSideSheet(
       context: context,
diff --git a/designer_v2/lib/features/monitor/study_monitor_table.dart b/designer_v2/lib/features/monitor/study_monitor_table.dart
index 1dee8509c..31c10e96d 100644
--- a/designer_v2/lib/features/monitor/study_monitor_table.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_table.dart
@@ -36,38 +36,45 @@ class StudyMonitorTable extends ConsumerWidget {
         StandardTableColumn(
           sortable: true,
           label: tr.monitoring_table_column_participant_id,
-          columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth(1.6)),
+          columnWidth:
+              const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth(1.6)),
         ),
         StandardTableColumn(
           sortable: true,
           label: tr.monitoring_table_column_invite_code,
-          columnWidth: const MaxColumnWidth(FixedColumnWidth(200), FlexColumnWidth(1.6)),
+          columnWidth:
+              const MaxColumnWidth(FixedColumnWidth(200), FlexColumnWidth(1.6)),
         ),
         StandardTableColumn(
           sortable: true,
           label: tr.monitoring_table_column_enrolled,
-          columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth(1.6)),
+          columnWidth:
+              const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth(1.6)),
         ),
         StandardTableColumn(
           sortable: true,
           label: tr.monitoring_table_column_last_activity,
-          columnWidth: const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth(1.6)),
+          columnWidth:
+              const MaxColumnWidth(FixedColumnWidth(150), FlexColumnWidth(1.6)),
         ),
         StandardTableColumn(
           sortable: true,
           label: tr.monitoring_table_column_day_in_study,
-          columnWidth: const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.6)),
+          columnWidth:
+              const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.6)),
         ),
         StandardTableColumn(
           sortable: true,
           label: tr.monitoring_table_column_completed_interventions,
           tooltip: tr.monitoring_table_completed_interventions_header_tooltip,
-          columnWidth: const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.6)),
+          columnWidth:
+              const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.6)),
         ),
         StandardTableColumn(
           sortable: true,
           label: tr.monitoring_table_column_completed_surveys,
-          columnWidth: const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.7)),
+          columnWidth:
+              const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.7)),
         ),
       ],
       buildCellsAt: _buildRow,
@@ -78,8 +85,12 @@ class StudyMonitorTable extends ConsumerWidget {
     );
   }
 
-  List<Widget> _buildRow(BuildContext context, StudyMonitorItem item,
-      int rowIdx, Set<WidgetState> states,) {
+  List<Widget> _buildRow(
+    BuildContext context,
+    StudyMonitorItem item,
+    int rowIdx,
+    Set<WidgetState> states,
+  ) {
     final languageCode = ref.watch(localeProvider).languageCode;
     return [
       Tooltip(
@@ -111,9 +122,12 @@ class StudyMonitorTable extends ConsumerWidget {
           ],
         ),
       ),
-      _buildProgressCell(context, item.currentDayOfStudy, item.studyDurationInDays),
-      _buildProgressCell(context, item.completedInterventions, item.completedInterventions + item.missedInterventions),
-      _buildProgressCell(context, item.completedSurveys, item.completedSurveys + item.missedSurveys),
+      _buildProgressCell(
+          context, item.currentDayOfStudy, item.studyDurationInDays),
+      _buildProgressCell(context, item.completedInterventions,
+          item.completedInterventions + item.missedInterventions),
+      _buildProgressCell(context, item.completedSurveys,
+          item.completedSurveys + item.missedSurveys),
     ];
   }
 
@@ -129,8 +143,12 @@ class StudyMonitorTable extends ConsumerWidget {
           ),
         ),
         Align(
-          child: Text("$progress/$total",
-              style: TextStyle(color: theme.colorScheme.onPrimary, fontWeight: FontWeight.bold),),
+          child: Text(
+            "$progress/$total",
+            style: TextStyle(
+                color: theme.colorScheme.onPrimary,
+                fontWeight: FontWeight.bold),
+          ),
         ),
       ],
     );

From fab72bf842e16ee7946b14bfc706cd9664fa584b Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 24 Jun 2024 17:36:00 +0200
Subject: [PATCH 223/314] chore: toString

---
 .../models/eligibility/eligibility_criterion.dart    |  5 +++++
 .../lib/features/design/study_form_controller.g.dart | 12 ++++++------
 .../lib/features/study/study_test_controller.g.dart  |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/core/lib/src/models/eligibility/eligibility_criterion.dart b/core/lib/src/models/eligibility/eligibility_criterion.dart
index 783f724bb..ce6062b33 100644
--- a/core/lib/src/models/eligibility/eligibility_criterion.dart
+++ b/core/lib/src/models/eligibility/eligibility_criterion.dart
@@ -24,4 +24,9 @@ class EligibilityCriterion {
 
   bool isSatisfied(QuestionnaireState qs) => condition.evaluate(qs) == true;
   bool isViolated(QuestionnaireState qs) => condition.evaluate(qs) == false;
+
+  @override
+  String toString() {
+    return 'EligibilityCriterion{id: $id, reason: $reason, condition: $condition}';
+  }
 }
diff --git a/designer_v2/lib/features/design/study_form_controller.g.dart b/designer_v2/lib/features/design/study_form_controller.g.dart
index b194bf36c..ab0df7610 100644
--- a/designer_v2/lib/features/design/study_form_controller.g.dart
+++ b/designer_v2/lib/features/design/study_form_controller.g.dart
@@ -31,7 +31,7 @@ class _SystemHash {
 }
 
 /// Provides the [FormViewModel] that is responsible for displaying and
-/// editing the survey design form.
+/// editing the study design form.
 ///
 /// Note: This is not safe to use in widgets (or other providers) that are built
 /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
@@ -41,7 +41,7 @@ class _SystemHash {
 const studyFormViewModelProvider = StudyFormViewModelFamily();
 
 /// Provides the [FormViewModel] that is responsible for displaying and
-/// editing the survey design form.
+/// editing the study design form.
 ///
 /// Note: This is not safe to use in widgets (or other providers) that are built
 /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
@@ -49,7 +49,7 @@ const studyFormViewModelProvider = StudyFormViewModelFamily();
 /// Copied from [studyFormViewModel].
 class StudyFormViewModelFamily extends Family<StudyFormViewModel> {
   /// Provides the [FormViewModel] that is responsible for displaying and
-  /// editing the survey design form.
+  /// editing the study design form.
   ///
   /// Note: This is not safe to use in widgets (or other providers) that are built
   /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
@@ -58,7 +58,7 @@ class StudyFormViewModelFamily extends Family<StudyFormViewModel> {
   const StudyFormViewModelFamily();
 
   /// Provides the [FormViewModel] that is responsible for displaying and
-  /// editing the survey design form.
+  /// editing the study design form.
   ///
   /// Note: This is not safe to use in widgets (or other providers) that are built
   /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
@@ -97,7 +97,7 @@ class StudyFormViewModelFamily extends Family<StudyFormViewModel> {
 }
 
 /// Provides the [FormViewModel] that is responsible for displaying and
-/// editing the survey design form.
+/// editing the study design form.
 ///
 /// Note: This is not safe to use in widgets (or other providers) that are built
 /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
@@ -106,7 +106,7 @@ class StudyFormViewModelFamily extends Family<StudyFormViewModel> {
 class StudyFormViewModelProvider
     extends AutoDisposeProvider<StudyFormViewModel> {
   /// Provides the [FormViewModel] that is responsible for displaying and
-  /// editing the survey design form.
+  /// editing the study design form.
   ///
   /// Note: This is not safe to use in widgets (or other providers) that are built
   /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
diff --git a/designer_v2/lib/features/study/study_test_controller.g.dart b/designer_v2/lib/features/study/study_test_controller.g.dart
index e9250ea82..887128f29 100644
--- a/designer_v2/lib/features/study/study_test_controller.g.dart
+++ b/designer_v2/lib/features/study/study_test_controller.g.dart
@@ -173,7 +173,7 @@ class _StudyTestPlatformControllerProviderElement
 }
 
 String _$studyTestControllerHash() =>
-    r'e641cf6a4a10ee56345f815eebc4a9e95dc3bf33';
+    r'0ebe19693d34df91af1b7022ed45b26c1d764f3c';
 
 abstract class _$StudyTestController
     extends BuildlessAutoDisposeNotifier<StudyTestControllerState> {

From 1b5e8abedecf1401ab796b13c322fb72e2a98fa8 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 24 Jun 2024 18:38:24 +0200
Subject: [PATCH 224/314] fix: disable reactive for enrollment radio tile

---
 .../features/design/enrollment/enrollment_form_view.dart  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart b/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart
index 4cbeffa80..9faa1c30c 100644
--- a/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart
+++ b/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart
@@ -53,9 +53,11 @@ class StudyDesignEnrollmentFormView extends StudyDesignPageWidget {
                       input: Column(
                         children: formViewModel.enrollmentTypeControlOptions
                             .map<Widget>(
-                              (option) => ReactiveRadioListTile<Participation>(
-                                formControl:
-                                    formViewModel.enrollmentTypeControl,
+                              (option) => RadioListTile<Participation>(
+                                groupValue:
+                                    formViewModel.enrollmentTypeControl.value,
+                                onChanged: (value) => formViewModel
+                                    .enrollmentTypeControl.value = option.value,
                                 value: option.value,
                                 title: Column(
                                   crossAxisAlignment: CrossAxisAlignment.start,

From ca2bb8f0cc324561a8c4cae5491e2a558d2f0a50 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 25 Jun 2024 10:15:04 +0200
Subject: [PATCH 225/314] Revert "fix: disable reactive for enrollment radio
 tile"

This reverts commit 1b5e8abedecf1401ab796b13c322fb72e2a98fa8.
---
 .../features/design/enrollment/enrollment_form_view.dart  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart b/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart
index 9faa1c30c..4cbeffa80 100644
--- a/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart
+++ b/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart
@@ -53,11 +53,9 @@ class StudyDesignEnrollmentFormView extends StudyDesignPageWidget {
                       input: Column(
                         children: formViewModel.enrollmentTypeControlOptions
                             .map<Widget>(
-                              (option) => RadioListTile<Participation>(
-                                groupValue:
-                                    formViewModel.enrollmentTypeControl.value,
-                                onChanged: (value) => formViewModel
-                                    .enrollmentTypeControl.value = option.value,
+                              (option) => ReactiveRadioListTile<Participation>(
+                                formControl:
+                                    formViewModel.enrollmentTypeControl,
                                 value: option.value,
                                 title: Column(
                                   crossAxisAlignment: CrossAxisAlignment.start,

From 40914973360df983f269e018bfc8fe7945a51e19 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 25 Jun 2024 10:23:38 +0200
Subject: [PATCH 226/314] fix: keep eligibility criterion

---
 .../models/eligibility/eligibility_criterion.dart    | 12 ++++++++++++
 core/lib/src/models/expressions/expression.dart      | 10 ++++++++++
 .../design/enrollment/enrollment_form_data.dart      |  9 ++++++++-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/core/lib/src/models/eligibility/eligibility_criterion.dart b/core/lib/src/models/eligibility/eligibility_criterion.dart
index ce6062b33..1e06b2afe 100644
--- a/core/lib/src/models/eligibility/eligibility_criterion.dart
+++ b/core/lib/src/models/eligibility/eligibility_criterion.dart
@@ -25,6 +25,18 @@ class EligibilityCriterion {
   bool isSatisfied(QuestionnaireState qs) => condition.evaluate(qs) == true;
   bool isViolated(QuestionnaireState qs) => condition.evaluate(qs) == false;
 
+  // does not compare id
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is EligibilityCriterion &&
+          runtimeType == other.runtimeType &&
+          reason == other.reason &&
+          condition == other.condition;
+
+  @override
+  int get hashCode => reason.hashCode ^ condition.hashCode;
+
   @override
   String toString() {
     return 'EligibilityCriterion{id: $id, reason: $reason, condition: $condition}';
diff --git a/core/lib/src/models/expressions/expression.dart b/core/lib/src/models/expressions/expression.dart
index 52625cd0d..d150f4503 100644
--- a/core/lib/src/models/expressions/expression.dart
+++ b/core/lib/src/models/expressions/expression.dart
@@ -20,6 +20,16 @@ abstract class Expression {
 
   Map<String, dynamic> toJson();
 
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is Expression &&
+          runtimeType == other.runtimeType &&
+          type == other.type;
+
+  @override
+  int get hashCode => type.hashCode;
+
   @override
   String toString() {
     return toJson().toString();
diff --git a/designer_v2/lib/features/design/enrollment/enrollment_form_data.dart b/designer_v2/lib/features/design/enrollment/enrollment_form_data.dart
index f82c7a1cd..2ad619889 100644
--- a/designer_v2/lib/features/design/enrollment/enrollment_form_data.dart
+++ b/designer_v2/lib/features/design/enrollment/enrollment_form_data.dart
@@ -40,7 +40,14 @@ class EnrollmentFormData implements IStudyFormData {
             .map((formData) => formData.toConsentItem())
             .toList()
         : [];
-    study.eligibilityCriteria = questionnaireFormData.toEligibilityCriteria();
+    // Only update eligibility criteria if they have changed
+    final newEligibilityCriteria =
+        questionnaireFormData.toEligibilityCriteria();
+    if (study.eligibilityCriteria.length != newEligibilityCriteria.length ||
+        !study.eligibilityCriteria
+            .every((c) => newEligibilityCriteria.contains(c))) {
+      study.eligibilityCriteria = newEligibilityCriteria;
+    }
     return study;
   }
 

From ccd31102a08422ce0db0bed6077d2e9179759889 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 25 Jun 2024 10:27:42 +0200
Subject: [PATCH 227/314] fix: let autosave not listen to formarray anymore

---
 designer_v2/lib/features/forms/form_view_model.dart       | 7 +++++--
 .../forms/form_view_model_collection_actions.dart         | 8 ++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/designer_v2/lib/features/forms/form_view_model.dart b/designer_v2/lib/features/forms/form_view_model.dart
index 795ed7bc7..270fdff2e 100644
--- a/designer_v2/lib/features/forms/form_view_model.dart
+++ b/designer_v2/lib/features/forms/form_view_model.dart
@@ -466,10 +466,13 @@ abstract class FormViewModel<T> implements IFormGroupController {
       if (control is FormGroup) {
         continue; // don't listen to nested descendants
       } else if (control is FormArray) {
-        final collectionChanges =
+        // FormArrays are getting saved directly, because control.collectionChanges
+        // triggers on first load, even though the control has not been changed
+        continue;
+        /* final collectionChanges =
             control.collectionChanges.listen(boundListener);
         // don't subscribe to control.valueChanges
-        _immediateFormChildrenSubscriptions.add(collectionChanges);
+        _immediateFormChildrenSubscriptions.add(collectionChanges);*/
       } else if (control is FormControl) {
         final valueChanges = control.valueChanges.listen(boundListener);
         _immediateFormChildrenSubscriptions.add(valueChanges);
diff --git a/designer_v2/lib/features/forms/form_view_model_collection_actions.dart b/designer_v2/lib/features/forms/form_view_model_collection_actions.dart
index 3bed67b07..9f42bdd52 100644
--- a/designer_v2/lib/features/forms/form_view_model_collection_actions.dart
+++ b/designer_v2/lib/features/forms/form_view_model_collection_actions.dart
@@ -32,6 +32,7 @@ extension FormViewModelCollectionActions<T extends ManagedFormViewModel<D>,
                 final duplicateFormViewModel =
                     formViewModel.createDuplicate() as T;
                 add(duplicateFormViewModel);
+                formViewModel.save();
               },
         isAvailable: !isReadOnly,
       ),
@@ -41,9 +42,12 @@ extension FormViewModelCollectionActions<T extends ManagedFormViewModel<D>,
         isDestructive: true,
         onExecute: (onDelete != null)
             ? () => onDelete(formViewModel)
-            : () => removeWhere((e) {
+            : () {
+                removeWhere((e) {
                   return formViewModel.formData!.id == e.formData?.id;
-                }),
+                });
+                formViewModel.save();
+              },
         isAvailable: !isReadOnly,
       ),
     ].where((action) => action.isAvailable).toList();

From 4924896357c5b45e2efce5625e320beb6b606a36 Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahim.ozkn@outlook.com>
Date: Tue, 25 Jun 2024 11:10:13 +0200
Subject: [PATCH 228/314] fix: Login/register notifications (wrong password,
 etc.) are not showing

---
 designer_v2/lib/features/auth/auth_form_controller.dart   | 1 +
 designer_v2/lib/features/auth/auth_form_controller.g.dart | 2 +-
 designer_v2/lib/services/notification_dispatcher.dart     | 1 +
 designer_v2/lib/services/notification_service.dart        | 5 ++++-
 designer_v2/lib/services/notification_service.g.dart      | 7 +++----
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/designer_v2/lib/features/auth/auth_form_controller.dart b/designer_v2/lib/features/auth/auth_form_controller.dart
index 17e18c355..879bf15b7 100644
--- a/designer_v2/lib/features/auth/auth_form_controller.dart
+++ b/designer_v2/lib/features/auth/auth_form_controller.dart
@@ -70,6 +70,7 @@ class AuthFormController extends _$AuthFormController
         final AuthException error = state.error! as AuthException;
         switch (error.message) {
           case "Invalid login credentials":
+            print("authFormController.state listen self");
             notificationService.show(Notifications.credentialsInvalid);
           case "User already registered":
             notificationService.show(Notifications.userAlreadyRegistered);
diff --git a/designer_v2/lib/features/auth/auth_form_controller.g.dart b/designer_v2/lib/features/auth/auth_form_controller.g.dart
index 737b30dbe..96f013d91 100644
--- a/designer_v2/lib/features/auth/auth_form_controller.g.dart
+++ b/designer_v2/lib/features/auth/auth_form_controller.g.dart
@@ -7,7 +7,7 @@ part of 'auth_form_controller.dart';
 // **************************************************************************
 
 String _$authFormControllerHash() =>
-    r'57c06256128a6e7e04aacf180f5f8dbcbfd0413b';
+    r'ec0403816c82f8bd036f544e19f1c11ff44a2d4a';
 
 /// Copied from Dart SDK
 class _SystemHash {
diff --git a/designer_v2/lib/services/notification_dispatcher.dart b/designer_v2/lib/services/notification_dispatcher.dart
index 09b2e5b4c..5464c5760 100644
--- a/designer_v2/lib/services/notification_dispatcher.dart
+++ b/designer_v2/lib/services/notification_dispatcher.dart
@@ -54,6 +54,7 @@ class _NotificationDispatcherState
   @override
   void initState() {
     super.initState();
+    print("NotificationDispatcher: initState");
     _subscription = ref
         .read(notificationServiceProvider)
         .watchNotifications()
diff --git a/designer_v2/lib/services/notification_service.dart b/designer_v2/lib/services/notification_service.dart
index d2839edae..52064270f 100644
--- a/designer_v2/lib/services/notification_service.dart
+++ b/designer_v2/lib/services/notification_service.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:rxdart/subjects.dart';
 import 'package:studyu_designer_v2/services/notification_types.dart';
@@ -58,7 +59,9 @@ class NotificationService implements INotificationService {
   }
 }
 
-@riverpod
+@Riverpod(keepAlive: true)
 NotificationService notificationService(NotificationServiceRef ref) {
+  ref.onDispose((() => print('NotificationService disposed')));
+
   return NotificationService();
 }
diff --git a/designer_v2/lib/services/notification_service.g.dart b/designer_v2/lib/services/notification_service.g.dart
index 0cb507bc6..e76f627a1 100644
--- a/designer_v2/lib/services/notification_service.g.dart
+++ b/designer_v2/lib/services/notification_service.g.dart
@@ -7,12 +7,11 @@ part of 'notification_service.dart';
 // **************************************************************************
 
 String _$notificationServiceHash() =>
-    r'6db295591da0ebe2efdebffe326d89912af46b5a';
+    r'ff781fe4d64e728cf8acb99b9938485b16acc3bb';
 
 /// See also [notificationService].
 @ProviderFor(notificationService)
-final notificationServiceProvider =
-    AutoDisposeProvider<NotificationService>.internal(
+final notificationServiceProvider = Provider<NotificationService>.internal(
   notificationService,
   name: r'notificationServiceProvider',
   debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
@@ -22,6 +21,6 @@ final notificationServiceProvider =
   allTransitiveDependencies: null,
 );
 
-typedef NotificationServiceRef = AutoDisposeProviderRef<NotificationService>;
+typedef NotificationServiceRef = ProviderRef<NotificationService>;
 // ignore_for_file: type=lint
 // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

From 61ca6e693b1749bfccc467ef04c6b34d81690d13 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 25 Jun 2024 10:43:31 +0200
Subject: [PATCH 229/314] fix: translate study schedule

---
 .../design/interventions/study_schedule_form_view.dart      | 6 ++----
 designer_v2/lib/localization/app_de.arb                     | 2 ++
 designer_v2/lib/localization/app_en.arb                     | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart b/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart
index a1a3f724e..870e8eda8 100644
--- a/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart
+++ b/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart
@@ -20,10 +20,8 @@ class StudyScheduleFormView extends FormConsumerWidget {
     } else {
       return FormTableRow(
         control: formViewModel.sequenceTypeCustomControl,
-        label: "Custom Sequence",
-        // todo translate
-        labelHelpText: "Enter a custom sequence by using the letters A and B",
-        // todo translate
+        label: tr.phase_sequence_custom_label,
+        labelHelpText: tr.phase_sequence_custom_label_help,
         input: ReactiveTextField(
           formControl: formViewModel.sequenceTypeCustomControl,
           keyboardType: TextInputType.text,
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index e192b7a2e..2e4172ec6 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -73,6 +73,8 @@
   "phase_sequence_counterbalanced": "Ausgeglichen (AB BA)",
   "phase_sequence_random": "Zufällig",
   "phase_sequence_custom": "Benutzerdefiniert",
+  "phase_sequence_custom_label": "Benutzerdefinierte Abfolge",
+  "phase_sequence_custom_label_help": "Gib die Abfolge der Interventionsphasen an, z.B. ABBA",
   "form_enrollment_option_open": "Open",
   "form_enrollment_option_invite": "Private (Invite-only)",
   "@__________________NAV_DRAWER__________________": {},
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index fca92717e..8bb360103 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -81,6 +81,8 @@
   "phase_sequence_counterbalanced": "Counterbalanced (AB BA)",
   "phase_sequence_random": "Random",
   "phase_sequence_custom": "Custom",
+  "phase_sequence_custom_label": "Custom sequence",
+  "phase_sequence_custom_label_help": "Enter a sequence of interventions by using the letters A and B",
   "form_enrollment_option_open": "Open",
   "form_enrollment_option_invite": "Private (Invite-only)",
   "notification_code_deleted": "Access code deleted",

From ecc4b6e2fce4ed35f1fa7f9abaabc1f641a6704c Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 24 Jun 2024 18:38:24 +0200
Subject: [PATCH 230/314] fix: disable reactive for enrollment radio tile

---
 .../features/design/enrollment/enrollment_form_view.dart  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart b/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart
index 4cbeffa80..9faa1c30c 100644
--- a/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart
+++ b/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart
@@ -53,9 +53,11 @@ class StudyDesignEnrollmentFormView extends StudyDesignPageWidget {
                       input: Column(
                         children: formViewModel.enrollmentTypeControlOptions
                             .map<Widget>(
-                              (option) => ReactiveRadioListTile<Participation>(
-                                formControl:
-                                    formViewModel.enrollmentTypeControl,
+                              (option) => RadioListTile<Participation>(
+                                groupValue:
+                                    formViewModel.enrollmentTypeControl.value,
+                                onChanged: (value) => formViewModel
+                                    .enrollmentTypeControl.value = option.value,
                                 value: option.value,
                                 title: Column(
                                   crossAxisAlignment: CrossAxisAlignment.start,

From e6f7fc4c15b432a77745322f73c9231507e1e25e Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 24 Jun 2024 18:38:24 +0200
Subject: [PATCH 231/314] fix: disable reactive for schedule intervention
 screen

---
 .../study_schedule_form_view.dart             | 71 ++++++++++++++-----
 .../lib/services/notification_service.dart    |  2 +-
 .../lib/services/notification_service.g.dart  |  2 +-
 3 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart b/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart
index 870e8eda8..0bd6dff8e 100644
--- a/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart
+++ b/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart
@@ -5,7 +5,6 @@ import 'package:studyu_designer_v2/common_views/form_consumer_widget.dart';
 import 'package:studyu_designer_v2/common_views/form_control_label.dart';
 import 'package:studyu_designer_v2/common_views/form_table_layout.dart';
 import 'package:studyu_designer_v2/features/design/interventions/study_schedule_form_controller_mixin.dart';
-import 'package:studyu_designer_v2/features/forms/form_validation.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/utils/input_formatter.dart';
 
@@ -22,16 +21,24 @@ class StudyScheduleFormView extends FormConsumerWidget {
         control: formViewModel.sequenceTypeCustomControl,
         label: tr.phase_sequence_custom_label,
         labelHelpText: tr.phase_sequence_custom_label_help,
-        input: ReactiveTextField(
-          formControl: formViewModel.sequenceTypeCustomControl,
+        input: TextField(
+          onChanged: (value) =>
+              formViewModel.sequenceTypeCustomControl.value = value,
+          controller: TextEditingController()
+            ..value = TextEditingValue(
+              text: formViewModel.sequenceTypeCustomControl.value!,
+              selection: TextSelection.collapsed(
+                offset: formViewModel.sequenceTypeCustomControl.value!.length,
+              ),
+            ),
+          //formControl: formViewModel.sequenceTypeCustomControl,
           keyboardType: TextInputType.text,
           inputFormatters: <TextInputFormatter>[
             FilteringTextInputFormatter.singleLineFormatter,
             LengthLimitingTextInputFormatter(10),
             StudySequenceFormatter(),
           ],
-          validationMessages:
-              formViewModel.sequenceTypeCustomControl.validationMessages,
+          //validationMessages: formViewModel.sequenceTypeCustomControl.validationMessages,
         ),
       );
     }
@@ -48,8 +55,11 @@ class StudyScheduleFormView extends FormConsumerWidget {
               control: formViewModel.sequenceTypeControl,
               label: tr.form_field_crossover_schedule_sequence,
               labelHelpText: tr.form_field_crossover_schedule_sequence_tooltip,
-              input: ReactiveDropdownField(
-                formControl: formViewModel.sequenceTypeControl,
+              input: DropdownButtonFormField(
+                //formControl: formViewModel.sequenceTypeControl,
+                onChanged: (value) =>
+                    formViewModel.sequenceTypeControl.value = value,
+                value: formViewModel.sequenceTypeControl.value,
                 decoration: InputDecoration(
                   helperText:
                       tr.form_field_crossover_schedule_sequence_description,
@@ -63,8 +73,7 @@ class StudyScheduleFormView extends FormConsumerWidget {
                       ),
                     )
                     .toList(),
-                validationMessages:
-                    formViewModel.sequenceTypeControl.validationMessages,
+                //validationMessages: formViewModel.sequenceTypeControl.validationMessages,
               ),
             ),
             _renderCustomSequence(),
@@ -77,8 +86,20 @@ class StudyScheduleFormView extends FormConsumerWidget {
                 children: [
                   Container(
                     constraints: const BoxConstraints(maxWidth: 70),
-                    child: ReactiveTextField(
-                      formControl: formViewModel.phaseDurationControl,
+                    child: TextField(
+                      controller: TextEditingController()
+                        ..value = TextEditingValue(
+                          text: formViewModel.phaseDurationControl.value
+                              .toString(),
+                          selection: TextSelection.collapsed(
+                            offset: formViewModel.phaseDurationControl.value
+                                .toString()
+                                .length,
+                          ),
+                        ),
+                      //formControl: formViewModel.phaseDurationControl,
+                      onChanged: (value) => formViewModel
+                          .phaseDurationControl.value = int.parse(value),
                       keyboardType: TextInputType.number,
                       inputFormatters: <TextInputFormatter>[
                         FilteringTextInputFormatter.digitsOnly,
@@ -88,8 +109,7 @@ class StudyScheduleFormView extends FormConsumerWidget {
                           max: StudyScheduleControls.kPhaseDurationMax,
                         ),
                       ],
-                      validationMessages:
-                          formViewModel.phaseDurationControl.validationMessages,
+                      //validationMessages: formViewModel.phaseDurationControl.validationMessages,
                     ),
                   ),
                   const SizedBox(width: 8.0),
@@ -109,8 +129,19 @@ class StudyScheduleFormView extends FormConsumerWidget {
                 children: [
                   Container(
                     constraints: const BoxConstraints(maxWidth: 70),
-                    child: ReactiveTextField(
-                      formControl: formViewModel.numCyclesControl,
+                    child: TextField(
+                      //formControl: formViewModel.numCyclesControl,
+                      onChanged: (value) => formViewModel
+                          .numCyclesControl.value = int.parse(value),
+                      controller: TextEditingController()
+                        ..value = TextEditingValue(
+                          text: formViewModel.numCyclesControl.value.toString(),
+                          selection: TextSelection.collapsed(
+                            offset: formViewModel.numCyclesControl.value
+                                .toString()
+                                .length,
+                          ),
+                        ),
                       keyboardType: TextInputType.number,
                       inputFormatters: <TextInputFormatter>[
                         FilteringTextInputFormatter.digitsOnly,
@@ -120,8 +151,7 @@ class StudyScheduleFormView extends FormConsumerWidget {
                           max: StudyScheduleControls.kNumCyclesMax,
                         ),
                       ],
-                      validationMessages:
-                          formViewModel.numCyclesControl.validationMessages,
+                      //validationMessages: formViewModel.numCyclesControl.validationMessages,
                     ),
                   ),
                   const SizedBox(width: 8.0),
@@ -141,8 +171,11 @@ class StudyScheduleFormView extends FormConsumerWidget {
                 children: [
                   Container(
                     constraints: const BoxConstraints(maxWidth: 70),
-                    child: ReactiveCheckbox(
-                      formControl: formViewModel.includeBaselineControl,
+                    child: Checkbox(
+                      value: formViewModel.includeBaselineControl.value,
+                      onChanged: (value) =>
+                          formViewModel.includeBaselineControl.value = value,
+                      //formControl: formViewModel.includeBaselineControl,
                     ),
                   ),
                   const SizedBox(width: 8.0),
diff --git a/designer_v2/lib/services/notification_service.dart b/designer_v2/lib/services/notification_service.dart
index 52064270f..daa7f65ae 100644
--- a/designer_v2/lib/services/notification_service.dart
+++ b/designer_v2/lib/services/notification_service.dart
@@ -61,7 +61,7 @@ class NotificationService implements INotificationService {
 
 @Riverpod(keepAlive: true)
 NotificationService notificationService(NotificationServiceRef ref) {
-  ref.onDispose((() => print('NotificationService disposed')));
+  ref.onDispose(() => print('NotificationService disposed'));
 
   return NotificationService();
 }
diff --git a/designer_v2/lib/services/notification_service.g.dart b/designer_v2/lib/services/notification_service.g.dart
index e76f627a1..61ea678bd 100644
--- a/designer_v2/lib/services/notification_service.g.dart
+++ b/designer_v2/lib/services/notification_service.g.dart
@@ -7,7 +7,7 @@ part of 'notification_service.dart';
 // **************************************************************************
 
 String _$notificationServiceHash() =>
-    r'ff781fe4d64e728cf8acb99b9938485b16acc3bb';
+    r'7f7841dbc9dff0769e015e97e1a6b85ed6b962ec';
 
 /// See also [notificationService].
 @ProviderFor(notificationService)

From 03bb729e751853386fa7dfce57cdf36b1d7032c5 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 25 Jun 2024 16:43:33 +0200
Subject: [PATCH 232/314] chore: cleanup

---
 app/lib/models/app_state.dart                        |  1 -
 app/lib/screens/app_onboarding/loading_screen.dart   |  1 -
 .../lib/features/auth/auth_form_controller.dart      |  1 -
 designer_v2/lib/features/forms/form_view_model.dart  |  6 ++++--
 .../settings/study_settings_form_controller.dart     | 12 ------------
 5 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/app/lib/models/app_state.dart b/app/lib/models/app_state.dart
index 99638b8ef..0070628bb 100644
--- a/app/lib/models/app_state.dart
+++ b/app/lib/models/app_state.dart
@@ -5,7 +5,6 @@ import 'package:studyu_app/util/notifications.dart';
 import 'package:studyu_app/util/schedule_notifications.dart';
 import 'package:studyu_core/core.dart';
 
-// @riverpod
 class AppState with ChangeNotifier {
   Study? selectedStudy;
   List<Intervention>? selectedInterventions;
diff --git a/app/lib/screens/app_onboarding/loading_screen.dart b/app/lib/screens/app_onboarding/loading_screen.dart
index 71dc43705..2f9ef0a96 100644
--- a/app/lib/screens/app_onboarding/loading_screen.dart
+++ b/app/lib/screens/app_onboarding/loading_screen.dart
@@ -111,7 +111,6 @@ class _LoadingScreenState extends State<LoadingScreen> {
     StudyULogger.info(
       "Preview: Found query parameters ${widget.queryParameters}",
     );
-    //final lang = context.watch<AppLanguage>();
     final lang = AppLanguage(AppLocalizations.supportedLocales);
     final preview = Preview(
       widget.queryParameters,
diff --git a/designer_v2/lib/features/auth/auth_form_controller.dart b/designer_v2/lib/features/auth/auth_form_controller.dart
index 879bf15b7..6b52d2610 100644
--- a/designer_v2/lib/features/auth/auth_form_controller.dart
+++ b/designer_v2/lib/features/auth/auth_form_controller.dart
@@ -238,7 +238,6 @@ class AuthFormController extends _$AuthFormController
     }
     try {
       state = const AsyncValue.loading();
-      print("authRepository.signUp");
       return await authRepository.signUp(email: email, password: password);
     } catch (e) {
       state = AsyncValue.error(e, StackTrace.current);
diff --git a/designer_v2/lib/features/forms/form_view_model.dart b/designer_v2/lib/features/forms/form_view_model.dart
index 270fdff2e..e8e18ce75 100644
--- a/designer_v2/lib/features/forms/form_view_model.dart
+++ b/designer_v2/lib/features/forms/form_view_model.dart
@@ -466,8 +466,10 @@ abstract class FormViewModel<T> implements IFormGroupController {
       if (control is FormGroup) {
         continue; // don't listen to nested descendants
       } else if (control is FormArray) {
-        // FormArrays are getting saved directly, because control.collectionChanges
-        // triggers on first load, even though the control has not been changed
+        // We do not listen to FormArray changes. Instead the study is getting
+        // saved directly through the respective menu action.
+        // There seems to be a bug related to control.collectionChanges because
+        // it triggers on first load, even though the length of the array has not changed
         continue;
         /* final collectionChanges =
             control.collectionChanges.listen(boundListener);
diff --git a/designer_v2/lib/features/study/settings/study_settings_form_controller.dart b/designer_v2/lib/features/study/settings/study_settings_form_controller.dart
index 38aec1a0d..b6227c953 100644
--- a/designer_v2/lib/features/study/settings/study_settings_form_controller.dart
+++ b/designer_v2/lib/features/study/settings/study_settings_form_controller.dart
@@ -88,18 +88,6 @@ class StudySettingsFormViewModel extends FormViewModel<Study> {
 ///
 /// Note: This is not safe to use in widgets (or other providers) that are built
 /// before the [StudyController]'s [Study] is available (see also: [AsyncValue])
-/*final studySettingsFormViewModelProvider = Provider.autoDispose
-    .family<StudySettingsFormViewModel, StudyID>((ref, studyId) {
-  final state = ref.watch(studyControllerProvider(studyId));
-  final formViewModel = StudySettingsFormViewModel(
-    studyRepository: ref.watch(studyRepositoryProvider),
-    study: state.study,
-  );
-  ref.onDispose(() {
-    print("studySettingsFormViewModelProvider.DISPOSE");
-  });
-  return formViewModel;
-});*/
 @riverpod
 StudySettingsFormViewModel studySettingsFormViewModel(
   StudySettingsFormViewModelRef ref,

From 0f277e08f81abf47c64694ae3127f21b05027559 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 26 Jun 2024 08:20:01 +0200
Subject: [PATCH 233/314] perf: replace read with watch

---
 designer_v2/lib/features/dashboard/dashboard_page.dart     | 2 +-
 .../features/design/enrollment/enrollment_form_view.dart   | 7 ++++---
 .../lib/features/design/info/study_info_form_view.dart     | 3 ++-
 .../design/interventions/intervention_form_view.dart       | 2 +-
 .../design/interventions/interventions_form_view.dart      | 2 +-
 .../design/measurements/measurements_form_view.dart        | 2 +-
 .../design/measurements/survey/survey_form_view.dart       | 2 +-
 .../lib/features/design/reports/reports_form_view.dart     | 4 ++--
 designer_v2/lib/features/recruit/study_recruit_page.dart   | 4 ++--
 designer_v2/lib/features/study/study_test_controller.dart  | 2 +-
 designer_v2/lib/repositories/user_repository.dart          | 4 ++--
 designer_v2/lib/routing/router_config.dart                 | 4 ++--
 12 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/designer_v2/lib/features/dashboard/dashboard_page.dart b/designer_v2/lib/features/dashboard/dashboard_page.dart
index 2ff9f9e02..242c2deb8 100644
--- a/designer_v2/lib/features/dashboard/dashboard_page.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_page.dart
@@ -46,7 +46,7 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final controller = ref.read(dashboardControllerProvider.notifier);
+    final controller = ref.watch(dashboardControllerProvider.notifier);
     final state = ref.watch(dashboardControllerProvider);
 
     return DashboardScaffold(
diff --git a/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart b/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart
index 9faa1c30c..d4877569c 100644
--- a/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart
+++ b/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart
@@ -33,7 +33,7 @@ class StudyDesignEnrollmentFormView extends StudyDesignPageWidget {
       value: state.study,
       data: (study) {
         final formViewModel =
-            ref.read(enrollmentFormViewModelProvider(studyId));
+            ref.watch(enrollmentFormViewModelProvider(studyId));
         return ReactiveForm(
           formGroup: formViewModel.form,
           child: ReactiveFormConsumer(
@@ -237,7 +237,7 @@ class StudyDesignEnrollmentFormView extends StudyDesignPageWidget {
     WidgetRef ref,
   ) {
     final formViewModel =
-        ref.read(screenerQuestionFormViewModelProvider(routeArgs));
+        ref.watch(screenerQuestionFormViewModelProvider(routeArgs));
 
     showFormSideSheet<ScreenerQuestionFormViewModel>(
       context: context,
@@ -267,7 +267,8 @@ class StudyDesignEnrollmentFormView extends StudyDesignPageWidget {
     BuildContext context,
     WidgetRef ref,
   ) {
-    final formViewModel = ref.read(consentItemFormViewModelProvider(routeArgs));
+    final formViewModel =
+        ref.watch(consentItemFormViewModelProvider(routeArgs));
 
     showFormSideSheet<ConsentItemFormViewModel>(
       context: context,
diff --git a/designer_v2/lib/features/design/info/study_info_form_view.dart b/designer_v2/lib/features/design/info/study_info_form_view.dart
index 9b77b2ac5..294ddfca3 100644
--- a/designer_v2/lib/features/design/info/study_info_form_view.dart
+++ b/designer_v2/lib/features/design/info/study_info_form_view.dart
@@ -23,7 +23,8 @@ class StudyDesignInfoFormView extends StudyDesignPageWidget {
     return AsyncValueWidget<Study>(
       value: state.study,
       data: (study) {
-        final formViewModel = ref.read(studyInfoFormViewModelProvider(studyId));
+        final formViewModel =
+            ref.watch(studyInfoFormViewModelProvider(studyId));
         return ReactiveForm(
           formGroup: formViewModel.form,
           child: Column(
diff --git a/designer_v2/lib/features/design/interventions/intervention_form_view.dart b/designer_v2/lib/features/design/interventions/intervention_form_view.dart
index 8dfff180b..8b5a08775 100644
--- a/designer_v2/lib/features/design/interventions/intervention_form_view.dart
+++ b/designer_v2/lib/features/design/interventions/intervention_form_view.dart
@@ -185,7 +185,7 @@ class _InterventionFormViewState extends ConsumerState<InterventionFormView> {
     WidgetRef ref,
   ) {
     final interventionTaskFormViewModel =
-        ref.read(interventionTaskFormViewModelProvider(routeArgs));
+        ref.watch(interventionTaskFormViewModelProvider(routeArgs));
     showFormSideSheet<InterventionTaskFormViewModel>(
       context: context,
       formViewModel: interventionTaskFormViewModel,
diff --git a/designer_v2/lib/features/design/interventions/interventions_form_view.dart b/designer_v2/lib/features/design/interventions/interventions_form_view.dart
index ea863ae02..bedf14852 100644
--- a/designer_v2/lib/features/design/interventions/interventions_form_view.dart
+++ b/designer_v2/lib/features/design/interventions/interventions_form_view.dart
@@ -27,7 +27,7 @@ class StudyDesignInterventionsFormView extends StudyDesignPageWidget {
       value: state.study,
       data: (study) {
         final formViewModel =
-            ref.read(interventionsFormViewModelProvider(studyId));
+            ref.watch(interventionsFormViewModelProvider(studyId));
         return ReactiveForm(
           formGroup: formViewModel.form,
           child: Column(
diff --git a/designer_v2/lib/features/design/measurements/measurements_form_view.dart b/designer_v2/lib/features/design/measurements/measurements_form_view.dart
index 15485ec99..ed5248ef5 100644
--- a/designer_v2/lib/features/design/measurements/measurements_form_view.dart
+++ b/designer_v2/lib/features/design/measurements/measurements_form_view.dart
@@ -22,7 +22,7 @@ class StudyDesignMeasurementsFormView extends StudyDesignPageWidget {
       value: state.study,
       data: (study) {
         final formViewModel =
-            ref.read(measurementsFormViewModelProvider(studyId));
+            ref.watch(measurementsFormViewModelProvider(studyId));
         return ReactiveForm(
           formGroup: formViewModel.form,
           child: Column(
diff --git a/designer_v2/lib/features/design/measurements/survey/survey_form_view.dart b/designer_v2/lib/features/design/measurements/survey/survey_form_view.dart
index eb19f7c3e..34511a6aa 100644
--- a/designer_v2/lib/features/design/measurements/survey/survey_form_view.dart
+++ b/designer_v2/lib/features/design/measurements/survey/survey_form_view.dart
@@ -232,7 +232,7 @@ class _MeasurementSurveyFormViewState
     WidgetRef ref,
   ) {
     final surveyQuestionFormViewModel =
-        ref.read(surveyQuestionFormViewModelProvider(routeArgs));
+        ref.watch(surveyQuestionFormViewModelProvider(routeArgs));
     showFormSideSheet<QuestionFormViewModel>(
       context: context,
       formViewModel: surveyQuestionFormViewModel,
diff --git a/designer_v2/lib/features/design/reports/reports_form_view.dart b/designer_v2/lib/features/design/reports/reports_form_view.dart
index 434ef34da..a6b06ce28 100644
--- a/designer_v2/lib/features/design/reports/reports_form_view.dart
+++ b/designer_v2/lib/features/design/reports/reports_form_view.dart
@@ -29,7 +29,7 @@ class StudyDesignReportsFormView extends StudyDesignPageWidget {
     return AsyncValueWidget<Study>(
       value: state.study,
       data: (study) {
-        final formViewModel = ref.read(reportsFormViewModelProvider(studyId));
+        final formViewModel = ref.watch(reportsFormViewModelProvider(studyId));
         return ReactiveForm(
           formGroup: formViewModel.form,
           child: ReactiveFormConsumer(
@@ -142,7 +142,7 @@ class StudyDesignReportsFormView extends StudyDesignPageWidget {
     BuildContext context,
     WidgetRef ref,
   ) {
-    final formViewModel = ref.read(reportItemFormViewModelProvider(routeArgs));
+    final formViewModel = ref.watch(reportItemFormViewModelProvider(routeArgs));
 
     showFormSideSheet<ReportItemFormViewModel>(
       context: context,
diff --git a/designer_v2/lib/features/recruit/study_recruit_page.dart b/designer_v2/lib/features/recruit/study_recruit_page.dart
index 5395f3c83..08eeb3d00 100644
--- a/designer_v2/lib/features/recruit/study_recruit_page.dart
+++ b/designer_v2/lib/features/recruit/study_recruit_page.dart
@@ -106,7 +106,7 @@ class StudyRecruitScreen extends StudyPageWidget {
           ? null
           : () {
               final formViewModel =
-                  ref.read(inviteCodeFormViewModelProvider(studyId));
+                  ref.watch(inviteCodeFormViewModelProvider(studyId));
               showFormSideSheet<InviteCodeFormViewModel>(
                 context: context,
                 formViewModel: formViewModel,
@@ -123,7 +123,7 @@ class StudyRecruitScreen extends StudyPageWidget {
   ) {
     // TODO: refactor to use [RoutingIntent] for sidesheet (so that it can be triggered from controller)
     return (StudyInvite invite) {
-      final formViewModel = ref.read(inviteCodeFormViewModelProvider(studyId));
+      final formViewModel = ref.watch(inviteCodeFormViewModelProvider(studyId));
       formViewModel.read(invite);
       showFormSideSheet<InviteCodeFormViewModel>(
         context: context,
diff --git a/designer_v2/lib/features/study/study_test_controller.dart b/designer_v2/lib/features/study/study_test_controller.dart
index c924e8843..4702b4efc 100644
--- a/designer_v2/lib/features/study/study_test_controller.dart
+++ b/designer_v2/lib/features/study/study_test_controller.dart
@@ -16,7 +16,7 @@ part 'study_test_controller.g.dart';
 class StudyTestController extends _$StudyTestController {
   @override
   StudyTestControllerState build(StudyID studyId) {
-    final studyRepo = ref.read(studyRepositoryProvider);
+    final studyRepo = ref.watch(studyRepositoryProvider);
     ref.onDispose(() {
       // Reload the study after disposing the test controller so that any
       // data changes resulting from testing are reflected in the study for
diff --git a/designer_v2/lib/repositories/user_repository.dart b/designer_v2/lib/repositories/user_repository.dart
index 91a362d08..216ed3f68 100644
--- a/designer_v2/lib/repositories/user_repository.dart
+++ b/designer_v2/lib/repositories/user_repository.dart
@@ -68,8 +68,8 @@ class UserRepository implements IUserRepository {
 @riverpod
 UserRepository userRepository(UserRepositoryRef ref) {
   return UserRepository(
-    authRepository: ref.read(authRepositoryProvider),
-    apiClient: ref.read(apiClientProvider),
+    authRepository: ref.watch(authRepositoryProvider),
+    apiClient: ref.watch(apiClientProvider),
     ref: ref,
   );
 }
diff --git a/designer_v2/lib/routing/router_config.dart b/designer_v2/lib/routing/router_config.dart
index 0a3a253fc..bd0fba643 100644
--- a/designer_v2/lib/routing/router_config.dart
+++ b/designer_v2/lib/routing/router_config.dart
@@ -221,7 +221,7 @@ class RouterConf {
               child: StudyFormScaffold<InterventionFormViewModel>(
                 studyId: routeArgs.studyId,
                 formViewModelBuilder: (ref) =>
-                    ref.read(interventionFormViewModelProvider(routeArgs)),
+                    ref.watch(interventionFormViewModelProvider(routeArgs)),
                 formViewBuilder: (formViewModel) => TwoColumnLayout.split(
                   leftWidget:
                       InterventionFormView(formViewModel: formViewModel),
@@ -267,7 +267,7 @@ class RouterConf {
               child: StudyFormScaffold<MeasurementSurveyFormViewModel>(
                 studyId: routeArgs.studyId,
                 formViewModelBuilder: (ref) =>
-                    ref.read(surveyFormViewModelProvider(routeArgs)),
+                    ref.watch(surveyFormViewModelProvider(routeArgs)),
                 formViewBuilder: (formViewModel) => TwoColumnLayout.split(
                   leftWidget:
                       MeasurementSurveyFormView(formViewModel: formViewModel),

From 8f3f10c7cfb98034b8078483fd90a4a7680fc450 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 26 Jun 2024 10:41:46 +0200
Subject: [PATCH 234/314] fix: migrate iFrameElement

---
 .../lib/features/study/study_test_frame_controllers.dart  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/designer_v2/lib/features/study/study_test_frame_controllers.dart b/designer_v2/lib/features/study/study_test_frame_controllers.dart
index 50e92834c..3f9e17927 100644
--- a/designer_v2/lib/features/study/study_test_frame_controllers.dart
+++ b/designer_v2/lib/features/study/study_test_frame_controllers.dart
@@ -65,8 +65,12 @@ class WebController extends PlatformController {
       ..src = previewSrc
       ..style.border = 'none';
 
-    ui_web.platformViewRegistry
-        .registerViewFactory('$studyId$key', (int viewId) => iFrameElement);
+    ui_web.platformViewRegistry.registerViewFactory(
+      '$studyId$key',
+      (int viewId) => iFrameElement
+        ..style.width = '100%'
+        ..style.height = '100%',
+    );
   }
 
   @override

From 99ec4ea4e4e759fefca400c430d244c03b019d94 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 26 Jun 2024 11:06:49 +0200
Subject: [PATCH 235/314] chore: style

---
 .../lib/features/design/study_form_controller.dart   |  2 +-
 designer_v2/lib/features/forms/form_view_model.dart  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/designer_v2/lib/features/design/study_form_controller.dart b/designer_v2/lib/features/design/study_form_controller.dart
index 55c5f8962..697c12d6b 100644
--- a/designer_v2/lib/features/design/study_form_controller.dart
+++ b/designer_v2/lib/features/design/study_form_controller.dart
@@ -177,7 +177,7 @@ StudyFormViewModel studyFormViewModel(
   StudyFormViewModelRef ref,
   StudyID studyId,
 ) {
-  print("studyFormViewModel");
+  // print("studyFormViewModel");
   final state = ref.watch(studyControllerProvider(studyId));
   return StudyFormViewModel(
     router: ref.watch(routerProvider),
diff --git a/designer_v2/lib/features/forms/form_view_model.dart b/designer_v2/lib/features/forms/form_view_model.dart
index e8e18ce75..7a2436747 100644
--- a/designer_v2/lib/features/forms/form_view_model.dart
+++ b/designer_v2/lib/features/forms/form_view_model.dart
@@ -346,14 +346,14 @@ abstract class FormViewModel<T> implements IFormGroupController {
       control.updateValueAndValidity(updateParent: false, emitEvent: false);
     }
 
-    // Reset & update the validators of all direct child controls
+    // Reset and update the validators of all direct child controls
     for (final entry in form.controls.entries) {
       final controlName = entry.key;
       final control = entry.value;
       resetAndUpdateControlValidators(controlName, control);
     }
 
-    // Reset & update the validators of the form itself
+    // Reset and update the validators of the form itself
     resetAndUpdateControlValidators(_formKey, form);
   }
 
@@ -388,7 +388,7 @@ abstract class FormViewModel<T> implements IFormGroupController {
       // and [setControlsFrom] internally. Calling [setControlsFrom] may result
       // in update events emitted by the reactive controls as their values are
       // re-initialized, which re-triggers the valueChanges stream subscription
-      // used for autosaving (entering the infinite loop)
+      // used for auto-saving (entering the infinite loop)
     }
     await delegate?.onSave(this, prevFormMode);
 
@@ -409,7 +409,7 @@ abstract class FormViewModel<T> implements IFormGroupController {
     return Future.value();
   }
 
-  /// Enables the autosave functionality for the form.
+  /// Enables the auto-save functionality for the form.
   ///
   /// This method sets up the form to automatically save its data whenever any changes are made to the form controls.
   /// It does this by setting up a listener for each form control's `valueChanges` stream and initiating a save operation
@@ -421,8 +421,8 @@ abstract class FormViewModel<T> implements IFormGroupController {
   ///
   /// The `onlyValid` parameter is not used in the current implementation.
   ///
-  /// If there are any existing subscriptions to the form control's value changes (i.e., if autosave has already been enabled),
-  /// this method returns immediately to avoid setting up autosave multiple times.
+  /// If there are any existing subscriptions to the form control's value changes (i.e., if auto-save has already been enabled),
+  /// this method returns immediately to avoid setting up auto-save multiple times.
   ///
   /// The save operation is wrapped in a `CancelableOperation` to allow it to be cancelled if necessary.
   void enableAutosave({

From 4c80086b350147381ea012f04a6e434e9d4c07b4 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 26 Jun 2024 11:12:15 +0200
Subject: [PATCH 236/314] perf: remove await for onSave

---
 designer_v2/lib/features/forms/form_view_model.dart | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/designer_v2/lib/features/forms/form_view_model.dart b/designer_v2/lib/features/forms/form_view_model.dart
index 7a2436747..3818c010f 100644
--- a/designer_v2/lib/features/forms/form_view_model.dart
+++ b/designer_v2/lib/features/forms/form_view_model.dart
@@ -390,23 +390,19 @@ abstract class FormViewModel<T> implements IFormGroupController {
       // re-initialized, which re-triggers the valueChanges stream subscription
       // used for auto-saving (entering the infinite loop)
     }
-    await delegate?.onSave(this, prevFormMode);
+    delegate?.onSave(this, prevFormMode);
 
     // Put form into edit mode with saved data
     if (prevFormMode == FormMode.create) {
       formMode = FormMode.edit;
     }
-
-    return Future.value(true);
   }
 
-  Future<void> cancel() {
+  Future cancel() async {
     if (formMode != FormMode.readonly) {
       _restoreControlsFromFormData();
     }
     delegate?.onCancel(this, formMode);
-
-    return Future.value();
   }
 
   /// Enables the auto-save functionality for the form.

From 5b07d826e5882f2a24b875ae0a23783f91d82bfc Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 26 Jun 2024 13:05:01 +0200
Subject: [PATCH 237/314] chore: generate

---
 designer_v2/lib/features/auth/auth_form_controller.g.dart    | 2 +-
 designer_v2/lib/features/design/study_form_controller.g.dart | 2 +-
 designer_v2/lib/features/study/study_test_controller.g.dart  | 2 +-
 designer_v2/lib/repositories/user_repository.g.dart          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/designer_v2/lib/features/auth/auth_form_controller.g.dart b/designer_v2/lib/features/auth/auth_form_controller.g.dart
index 96f013d91..d28483065 100644
--- a/designer_v2/lib/features/auth/auth_form_controller.g.dart
+++ b/designer_v2/lib/features/auth/auth_form_controller.g.dart
@@ -7,7 +7,7 @@ part of 'auth_form_controller.dart';
 // **************************************************************************
 
 String _$authFormControllerHash() =>
-    r'ec0403816c82f8bd036f544e19f1c11ff44a2d4a';
+    r'b3695b285937d7ae904911290a737e97d3e9553d';
 
 /// Copied from Dart SDK
 class _SystemHash {
diff --git a/designer_v2/lib/features/design/study_form_controller.g.dart b/designer_v2/lib/features/design/study_form_controller.g.dart
index ab0df7610..46a75779b 100644
--- a/designer_v2/lib/features/design/study_form_controller.g.dart
+++ b/designer_v2/lib/features/design/study_form_controller.g.dart
@@ -7,7 +7,7 @@ part of 'study_form_controller.dart';
 // **************************************************************************
 
 String _$studyFormViewModelHash() =>
-    r'1701792c105e122475442c914b567e7568bf85e8';
+    r'614ff706b954df7093b09931e7c694d1b3cdbb1a';
 
 /// Copied from Dart SDK
 class _SystemHash {
diff --git a/designer_v2/lib/features/study/study_test_controller.g.dart b/designer_v2/lib/features/study/study_test_controller.g.dart
index 887128f29..aa2201051 100644
--- a/designer_v2/lib/features/study/study_test_controller.g.dart
+++ b/designer_v2/lib/features/study/study_test_controller.g.dart
@@ -173,7 +173,7 @@ class _StudyTestPlatformControllerProviderElement
 }
 
 String _$studyTestControllerHash() =>
-    r'0ebe19693d34df91af1b7022ed45b26c1d764f3c';
+    r'04c70c8adf5371517cf9d91c02a69efb91c1e037';
 
 abstract class _$StudyTestController
     extends BuildlessAutoDisposeNotifier<StudyTestControllerState> {
diff --git a/designer_v2/lib/repositories/user_repository.g.dart b/designer_v2/lib/repositories/user_repository.g.dart
index 4a66db0cd..76338e790 100644
--- a/designer_v2/lib/repositories/user_repository.g.dart
+++ b/designer_v2/lib/repositories/user_repository.g.dart
@@ -6,7 +6,7 @@ part of 'user_repository.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$userRepositoryHash() => r'8e996be46b2f6f9d7ba53f5e6576c6cd5cefc538';
+String _$userRepositoryHash() => r'6c7ef7577cb270f32eb19c991e93d7ba0bf4b474';
 
 /// See also [userRepository].
 @ProviderFor(userRepository)

From 7a7d604876abd065c654bfbef17872b7fd322778 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 26 Jun 2024 14:54:31 +0200
Subject: [PATCH 238/314] chore: upgrade deps

---
 app/pubspec.lock            | 76 ++++++++++++++++++++++++-------------
 app/pubspec.yaml            | 14 +++----
 core/pubspec.lock           | 28 +++++++-------
 core/pubspec.yaml           |  6 +--
 designer_v2/pubspec.lock    | 52 ++++++++++++++++++-------
 designer_v2/pubspec.yaml    | 14 +++----
 flutter_common/pubspec.lock | 48 +++++++++++++++++------
 flutter_common/pubspec.yaml |  2 +-
 pubspec.lock                | 30 +++++++++++----
 pubspec.yaml                |  2 +-
 10 files changed, 180 insertions(+), 92 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index 1beac440d..72fc44ad7 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -5,10 +5,34 @@ packages:
     dependency: transitive
     description:
       name: app_links
-      sha256: "96e677810b83707ff5e10fac11e4839daa0ea4e0123c35864c092699165eb3db"
+      sha256: a9905d6a60e814503fabc7523a9ed161b812d7ca69c99ad8ceea14279dc4f06b
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.1"
+    version: "6.1.3"
+  app_links_linux:
+    dependency: transitive
+    description:
+      name: app_links_linux
+      sha256: "567139eca3ca9fb113f2082f3aaa75a26f30f0ebdbe5fa7f09a3913c5bebd630"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
+  app_links_platform_interface:
+    dependency: transitive
+    description:
+      name: app_links_platform_interface
+      sha256: "58cff6f11df59b0e514dd5e4a61e988348ad5662f0e75d45d4e214ebea55c94c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
+  app_links_web:
+    dependency: transitive
+    description:
+      name: app_links_web
+      sha256: "74586ed5f3c4786341e82a0fa43c39ec3f13108a550f74e80d8bf68aa11349d1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.3"
   archive:
     dependency: transitive
     description:
@@ -101,10 +125,10 @@ packages:
     dependency: transitive
     description:
       name: camera_android_camerax
-      sha256: "7d84815edbb8304b51c10deba3c20f44eef80aa46ff156ec45428ed16600b49a"
+      sha256: "7abb0faddbf103c59365e805ad9a30ab4d602b2eb7a8de469697945fd4a69daa"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.5+5"
+    version: "0.6.5+6"
   camera_avfoundation:
     dependency: transitive
     description:
@@ -513,10 +537,10 @@ packages:
     dependency: transitive
     description:
       name: gotrue
-      sha256: b7324a9113bb21c354fd52531d9a9dba6570a9c37b2fc6b424865feb19974476
+      sha256: "65c8c47afb8230218bc295e6edcb948b117e39801f91c4a4bcb94dfd26b57134"
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.0"
+    version: "2.8.1"
   gtk:
     dependency: transitive
     description:
@@ -777,10 +801,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "9c96da072b421e98183f9ea7464898428e764bc0ce5567f27ec8693442e72514"
+      sha256: bca87b0165ffd7cdb9cad8edd22d18d2201e886d9a9f19b4fb3452ea7df3a72a
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.5"
+    version: "2.2.6"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -817,10 +841,10 @@ packages:
     dependency: "direct main"
     description:
       name: pdf
-      sha256: "243f05342fc0bdf140eba5b069398985cdbdd3dbb1d776cf43d5ea29cc570ba6"
+      sha256: "81d5522bddc1ef5c28e8f0ee40b71708761753c163e0c93a40df56fd515ea0f0"
       url: "https://pub.dev"
     source: hosted
-    version: "3.10.8"
+    version: "3.11.0"
   permission_handler:
     dependency: "direct main"
     description:
@@ -953,26 +977,26 @@ packages:
     dependency: "direct main"
     description:
       name: record
-      sha256: "78353d3d55fa145ffe1db1f63232ad0a0cd4c773e9f7d161210ce796ba1c94f9"
+      sha256: "4a5cf4d083d1ee49e0878823c4397d073f8eb0a775f31215d388e2bc47a9e867"
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.1"
+    version: "5.1.2"
   record_android:
     dependency: transitive
     description:
       name: record_android
-      sha256: fe83beefc8ac81b9dd02ca9365e8685755e3f12be1d442964082f1d5b618183d
+      sha256: c15d7faffbbb8d3414e3062534fc125b445d2590327dc930636e7c70b8217733
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
+    version: "1.2.3"
   record_darwin:
     dependency: transitive
     description:
       name: record_darwin
-      sha256: "2210da0fde7c86b4048cccfe2cd19b25fc7adf1ada7d50ec4a5ab4af2a863739"
+      sha256: b038c26d1066eb81f4e7433bfb85f0d450ca3fac0002a7216b83a21b775ecf21
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   record_linux:
     dependency: transitive
     description:
@@ -1025,26 +1049,26 @@ packages:
     dependency: transitive
     description:
       name: sentry
-      sha256: fd1fbfe860c05f5c52820ec4dbf2b6473789e83ead26cfc18bca4fe80bf3f008
+      sha256: "7342ef4c18932881730ac941a07a6e4cf76fe99cd1ea3bef06e53a6a1402dec0"
       url: "https://pub.dev"
     source: hosted
-    version: "8.2.0"
+    version: "8.3.0"
   sentry_flutter:
     dependency: "direct main"
     description:
       name: sentry_flutter
-      sha256: c64f0aec5332bec87083b61514d1b6b29e435b9045d03ce1575861192b9a5680
+      sha256: "475cf49682e4d1eb48caa2577502721bcfdcbb63f215de57b3b246d52f4f7914"
       url: "https://pub.dev"
     source: hosted
-    version: "8.2.0"
+    version: "8.3.0"
   sentry_logging:
     dependency: "direct main"
     description:
       name: sentry_logging
-      sha256: edfc054d65f0257303540f9fe76820005a710440eee062052efdff5252ecc121
+      sha256: "8eea0f30487d6d67351a2ee2277cffd460130266d6c7de100a4d0afd716852ed"
       url: "https://pub.dev"
     source: hosted
-    version: "8.2.0"
+    version: "8.3.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -1196,18 +1220,18 @@ packages:
     dependency: "direct main"
     description:
       name: supabase
-      sha256: "1133466d2ec9441e7cff6bf73943f0a6e17cbb5044f6327ca93e3dddc567c882"
+      sha256: "073aabf6a9f6ada2ebb77082222e1104949afb9f7f181017d0643d99bda0efe3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.2.2"
   supabase_flutter:
     dependency: "direct main"
     description:
       name: supabase_flutter
-      sha256: "521de6a72fefc0447bd052b0a33be30ed429ac8c39d9028dfbf0f9af2c4c93b2"
+      sha256: ae56c20924fadd62f0a83f0570c22cec85f4b093768fbd0e049c4e1741a109a7
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.5"
+    version: "2.5.6"
   synchronized:
     dependency: transitive
     description:
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 9e253d580..f844b317b 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -10,7 +10,7 @@ environment:
 
 dependencies:
   camera: ^0.11.0+1
-  collection: ^1.18.0
+  collection: ^1.18.0 # flutter_test
   cross_file: ^0.3.4+1
   cupertino_icons: ^1.0.8
   fl_chart: ^0.68.0
@@ -30,19 +30,19 @@ dependencies:
   package_info_plus: ^8.0.0
   path: ^1.9.0
   path_provider: ^2.1.3
-  pdf: ^3.10.8
+  pdf: ^3.11.0
   permission_handler: ^11.3.1
   provider: ^6.1.2
   quiver: ^3.2.1
   rainbow_color: ^2.0.1
-  record: ^5.1.1
-  sentry_flutter: ^8.2.0
-  sentry_logging: ^8.2.0
+  record: ^5.1.2
+  sentry_flutter: ^8.3.0
+  sentry_logging: ^8.3.0
   shared_preferences: ^2.2.3
   studyu_core: ^4.4.3-dev.1
   studyu_flutter_common: ^1.8.4-dev.1
-  supabase: ^2.2.1
-  supabase_flutter: ^2.5.5
+  supabase: ^2.2.2
+  supabase_flutter: ^2.5.6
   timeline_tile: ^2.0.0
   timezone: ^0.9.3
   universal_html: ^2.2.4
diff --git a/core/pubspec.lock b/core/pubspec.lock
index 890bbe4e0..a692ab97e 100644
--- a/core/pubspec.lock
+++ b/core/pubspec.lock
@@ -130,10 +130,10 @@ packages:
     dependency: "direct main"
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
   convert:
     dependency: transitive
     description:
@@ -218,10 +218,10 @@ packages:
     dependency: transitive
     description:
       name: gotrue
-      sha256: b7324a9113bb21c354fd52531d9a9dba6570a9c37b2fc6b424865feb19974476
+      sha256: "65c8c47afb8230218bc295e6edcb948b117e39801f91c4a4bcb94dfd26b57134"
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.0"
+    version: "2.8.1"
   graphs:
     dependency: transitive
     description:
@@ -250,10 +250,10 @@ packages:
     dependency: transitive
     description:
       name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      sha256: "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.1.0"
   io:
     dependency: transitive
     description:
@@ -442,18 +442,18 @@ packages:
     dependency: "direct main"
     description:
       name: sentry
-      sha256: fd1fbfe860c05f5c52820ec4dbf2b6473789e83ead26cfc18bca4fe80bf3f008
+      sha256: "7342ef4c18932881730ac941a07a6e4cf76fe99cd1ea3bef06e53a6a1402dec0"
       url: "https://pub.dev"
     source: hosted
-    version: "8.2.0"
+    version: "8.3.0"
   shelf:
     dependency: transitive
     description:
       name: shelf
-      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
+      sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
+    version: "1.4.2"
   shelf_packages_handler:
     dependency: transitive
     description:
@@ -570,10 +570,10 @@ packages:
     dependency: "direct main"
     description:
       name: supabase
-      sha256: "1133466d2ec9441e7cff6bf73943f0a6e17cbb5044f6327ca93e3dddc567c882"
+      sha256: "073aabf6a9f6ada2ebb77082222e1104949afb9f7f181017d0643d99bda0efe3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.2.2"
   term_glyph:
     dependency: transitive
     description:
@@ -634,10 +634,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "360c4271613beb44db559547d02f8b0dc044741d0eeb9aa6ccdb47e8ec54c63a"
+      sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.3"
+    version: "14.2.4"
   watcher:
     dependency: transitive
     description:
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index 4ce8cb6b3..b98057f99 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -8,13 +8,13 @@ environment:
   sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
-  collection: ^1.18.0
+  collection: ^1.18.0 # flutter_test
   csv: ^6.0.0
   json_annotation: ^4.9.0
   logger: ^2.3.0
   quiver: ^3.2.1
-  sentry: ^8.2.0
-  supabase: ^2.2.1
+  sentry: ^8.3.0
+  supabase: ^2.2.2
   uuid: ^4.4.0
 
 dev_dependencies:
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 7031cf84f..4e14d4dbe 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -29,10 +29,34 @@ packages:
     dependency: transitive
     description:
       name: app_links
-      sha256: "96e677810b83707ff5e10fac11e4839daa0ea4e0123c35864c092699165eb3db"
+      sha256: a9905d6a60e814503fabc7523a9ed161b812d7ca69c99ad8ceea14279dc4f06b
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.1"
+    version: "6.1.3"
+  app_links_linux:
+    dependency: transitive
+    description:
+      name: app_links_linux
+      sha256: "567139eca3ca9fb113f2082f3aaa75a26f30f0ebdbe5fa7f09a3913c5bebd630"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
+  app_links_platform_interface:
+    dependency: transitive
+    description:
+      name: app_links_platform_interface
+      sha256: "58cff6f11df59b0e514dd5e4a61e988348ad5662f0e75d45d4e214ebea55c94c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
+  app_links_web:
+    dependency: transitive
+    description:
+      name: app_links_web
+      sha256: "74586ed5f3c4786341e82a0fa43c39ec3f13108a550f74e80d8bf68aa11349d1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.3"
   archive:
     dependency: "direct main"
     description:
@@ -459,18 +483,18 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: abec47eb8c8c36ebf41d0a4c64dbbe7f956e39a012b3aafc530e951bdc12fe3f
+      sha256: cdae1b9c8bd7efadcef6112e81c903662ef2ce105cbd220a04bbb7c3425b5554
       url: "https://pub.dev"
     source: hosted
-    version: "14.1.4"
+    version: "14.2.0"
   gotrue:
     dependency: transitive
     description:
       name: gotrue
-      sha256: b7324a9113bb21c354fd52531d9a9dba6570a9c37b2fc6b424865feb19974476
+      sha256: "65c8c47afb8230218bc295e6edcb948b117e39801f91c4a4bcb94dfd26b57134"
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.0"
+    version: "2.8.1"
   graphs:
     dependency: transitive
     description:
@@ -712,10 +736,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "9c96da072b421e98183f9ea7464898428e764bc0ce5567f27ec8693442e72514"
+      sha256: bca87b0165ffd7cdb9cad8edd22d18d2201e886d9a9f19b4fb3452ea7df3a72a
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.5"
+    version: "2.2.6"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -960,10 +984,10 @@ packages:
     dependency: transitive
     description:
       name: sentry
-      sha256: fd1fbfe860c05f5c52820ec4dbf2b6473789e83ead26cfc18bca4fe80bf3f008
+      sha256: "7342ef4c18932881730ac941a07a6e4cf76fe99cd1ea3bef06e53a6a1402dec0"
       url: "https://pub.dev"
     source: hosted
-    version: "8.2.0"
+    version: "8.3.0"
   shared_preferences:
     dependency: transitive
     description:
@@ -1163,18 +1187,18 @@ packages:
     dependency: "direct main"
     description:
       name: supabase
-      sha256: "1133466d2ec9441e7cff6bf73943f0a6e17cbb5044f6327ca93e3dddc567c882"
+      sha256: "073aabf6a9f6ada2ebb77082222e1104949afb9f7f181017d0643d99bda0efe3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.2.2"
   supabase_flutter:
     dependency: "direct main"
     description:
       name: supabase_flutter
-      sha256: "521de6a72fefc0447bd052b0a33be30ed429ac8c39d9028dfbf0f9af2c4c93b2"
+      sha256: ae56c20924fadd62f0a83f0570c22cec85f4b093768fbd0e049c4e1741a109a7
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.5"
+    version: "2.5.6"
   sync_http:
     dependency: transitive
     description:
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index fd9a06625..985731ab4 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -23,7 +23,7 @@ dependencies:
   flutter_riverpod: ^2.5.1
   flutter_web_plugins:
     sdk: flutter
-  go_router: ^14.1.4
+  go_router: ^14.2.0
   material_color_utilities: 0.8.0 # integration_test
   material_design_icons_flutter: ^7.0.7296
   pointer_interceptor: ^0.10.1+1
@@ -32,16 +32,16 @@ dependencies:
   reactive_multi_select_flutter: ^2.0.1
   reactive_range_slider: ^2.1.0
   riverpod_annotation: ^2.3.5
-  rxdart: ^0.27.7
+  rxdart: ^0.27.7 # custom_lint 0.6.4
   studyu_core: ^4.4.3-dev.1
   studyu_flutter_common: ^1.8.4-dev.1
-  supabase: ^2.2.1
-  supabase_flutter: ^2.5.5
+  supabase: ^2.2.2
+  supabase_flutter: ^2.5.6
   url_launcher: ^6.3.0
   uuid: ^4.4.0
 
 dev_dependencies:
-  build_runner: ^2.4.9
+  build_runner: ^2.4.11
   custom_lint: ^0.6.4
   flutter_launcher_icons: ^0.13.1
   flutter_lints: ^4.0.0
@@ -51,8 +51,8 @@ dev_dependencies:
     sdk: flutter
   lint: ^2.3.0
   patrol_finders: ^2.1.2
-  riverpod_generator: ^2.4.0
-  riverpod_lint: ^2.3.10
+  riverpod_generator: ^2.4.0 # flutter_test
+  riverpod_lint: ^2.3.10  # flutter_test
   test: ^1.24.9 # integration_test
 
 flutter:
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index 85000a2c7..8babe5315 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -5,10 +5,34 @@ packages:
     dependency: transitive
     description:
       name: app_links
-      sha256: "96e677810b83707ff5e10fac11e4839daa0ea4e0123c35864c092699165eb3db"
+      sha256: a9905d6a60e814503fabc7523a9ed161b812d7ca69c99ad8ceea14279dc4f06b
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.1"
+    version: "6.1.3"
+  app_links_linux:
+    dependency: transitive
+    description:
+      name: app_links_linux
+      sha256: "567139eca3ca9fb113f2082f3aaa75a26f30f0ebdbe5fa7f09a3913c5bebd630"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
+  app_links_platform_interface:
+    dependency: transitive
+    description:
+      name: app_links_platform_interface
+      sha256: "58cff6f11df59b0e514dd5e4a61e988348ad5662f0e75d45d4e214ebea55c94c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
+  app_links_web:
+    dependency: transitive
+    description:
+      name: app_links_web
+      sha256: "74586ed5f3c4786341e82a0fa43c39ec3f13108a550f74e80d8bf68aa11349d1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.3"
   async:
     dependency: transitive
     description:
@@ -188,10 +212,10 @@ packages:
     dependency: transitive
     description:
       name: gotrue
-      sha256: b7324a9113bb21c354fd52531d9a9dba6570a9c37b2fc6b424865feb19974476
+      sha256: "65c8c47afb8230218bc295e6edcb948b117e39801f91c4a4bcb94dfd26b57134"
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.0"
+    version: "2.8.1"
   gtk:
     dependency: transitive
     description:
@@ -340,10 +364,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "9c96da072b421e98183f9ea7464898428e764bc0ce5567f27ec8693442e72514"
+      sha256: bca87b0165ffd7cdb9cad8edd22d18d2201e886d9a9f19b4fb3452ea7df3a72a
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.5"
+    version: "2.2.6"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -436,10 +460,10 @@ packages:
     dependency: transitive
     description:
       name: sentry
-      sha256: fd1fbfe860c05f5c52820ec4dbf2b6473789e83ead26cfc18bca4fe80bf3f008
+      sha256: "7342ef4c18932881730ac941a07a6e4cf76fe99cd1ea3bef06e53a6a1402dec0"
       url: "https://pub.dev"
     source: hosted
-    version: "8.2.0"
+    version: "8.3.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -560,18 +584,18 @@ packages:
     dependency: transitive
     description:
       name: supabase
-      sha256: "1133466d2ec9441e7cff6bf73943f0a6e17cbb5044f6327ca93e3dddc567c882"
+      sha256: "073aabf6a9f6ada2ebb77082222e1104949afb9f7f181017d0643d99bda0efe3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.2.2"
   supabase_flutter:
     dependency: "direct main"
     description:
       name: supabase_flutter
-      sha256: "521de6a72fefc0447bd052b0a33be30ed429ac8c39d9028dfbf0f9af2c4c93b2"
+      sha256: ae56c20924fadd62f0a83f0570c22cec85f4b093768fbd0e049c4e1741a109a7
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.5"
+    version: "2.5.6"
   synchronized:
     dependency: "direct main"
     description:
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index ecbf64418..93b446f2b 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -15,7 +15,7 @@ dependencies:
   lint: ^2.3.0
   shared_preferences: ^2.2.3 # Can be removed after migrating phase
   studyu_core: ^4.4.3-dev.1
-  supabase_flutter: ^2.5.5
+  supabase_flutter: ^2.5.6
   synchronized: ^3.1.0+1
   uuid: ^4.4.0
 
diff --git a/pubspec.lock b/pubspec.lock
index 1763e538e..220224ca0 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -57,14 +57,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.4.1"
+  clock:
+    dependency: transitive
+    description:
+      name: clock
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
   collection:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
   conventional_commit:
     dependency: transitive
     description:
@@ -109,10 +117,18 @@ packages:
     dependency: transitive
     description:
       name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      sha256: "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.0"
+  intl:
+    dependency: transitive
+    description:
+      name: intl
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "0.19.0"
   io:
     dependency: transitive
     description:
@@ -149,10 +165,10 @@ packages:
     dependency: "direct dev"
     description:
       name: melos
-      sha256: f9a6fc4f4842b7edfca2e00ab3b5b06928584f24bdc3d776ab0b30be7d599450
+      sha256: a3f06ed871e0348cb99909ad5ddf5f8b53cc61d894c302b5417d2db1ee7ec381
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.0"
+    version: "6.1.0"
   meta:
     dependency: transitive
     description:
@@ -330,4 +346,4 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
+  dart: ">=3.4.0 <4.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index f26ed10cf..e088dabb9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -8,4 +8,4 @@ environment:
 
 dev_dependencies:
   lint: ^2.3.0
-  melos: ^6.0.0
+  melos: ^6.1.0

From 1398eaac822d1cb1ad70222261b5751d16999264 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 26 Jun 2024 14:54:44 +0200
Subject: [PATCH 239/314] test: cleanup a bit

---
 designer_v2/integration_test/app_test.dart    | 200 +++++-------------
 .../robots/studies_robot.dart                 |   3 +-
 .../robots/study_interventions_robot.dart     |  18 +-
 3 files changed, 67 insertions(+), 154 deletions(-)

diff --git a/designer_v2/integration_test/app_test.dart b/designer_v2/integration_test/app_test.dart
index 1e55e29a2..075aa605b 100644
--- a/designer_v2/integration_test/app_test.dart
+++ b/designer_v2/integration_test/app_test.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: dead_code
+
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -23,138 +25,46 @@ void main() {
     await SecureStorage.deleteAll();
   });
 
-  group('end-to-end tests', () {
-    // NOTE:
-    //  the hydration of user is inconsistent and derails the tests
-    //  thus, we need to clear the storage so that the
-    //  hydration does not happen
-    // When 'Remember me is added, this method can be removed - but
-    //  it could be a good practice to keep it so that the test instances
-    //  do not share any information in the app cache
-    setUp(() async => await SecureStorage.deleteAll()); // RM
-
-    // todo Find a way to run tests consecutively
-
-    // Disable semantics because of known Flutter test issue:
-    // https://github.com/flutter/flutter/issues/97606
-    /*
-    patrolWidgetTest('Sign up -> Sign out flow test', semanticsEnabled: false, ($) async {
-      final appRobot = AppRobot($);
-      final authRobot = AuthRobot($);
-      final studiesRobot = StudiesRobot($);
-
-      await $.pumpWidgetAndSettle(const ProviderScope(child: App()));
-      await appRobot.validateOnLoginScreen();
-      await authRobot.navigateToSignUpScreen();
-      await authRobot.enterEmail('test@email.com');
-      await authRobot.enterPassword('password');
-      await authRobot.enterPasswordConfirmation('password');
-      await authRobot.tapTermsCheckbox();
-      await authRobot.tapSignUpButton();
-
-      await studiesRobot.validateOnStudiesScreen();
-      await studiesRobot.tapSignOutButton();
+  group('Test all', () {
+    const randomTest = true;
+    final email = randomTest
+        ? '${DateTime.now().millisecondsSinceEpoch}@studyu.health'
+        : 'test@studyu.health';
+    const password = 'password';
 
-      await appRobot.validateOnLoginScreen();
-    });
-
-    patrolWidgetTest('Sign in test', semanticsEnabled: false, ($) async {
-      final appRobot = AppRobot($);
+    patrolWidgetTest('TestAll', (PatrolTester $) async {
       final authRobot = AuthRobot($);
       final studiesRobot = StudiesRobot($);
-
-      await $.pumpWidgetAndSettle(const ProviderScope(child: App()));
-      await appRobot.validateOnLoginScreen();
-      await authRobot.enterEmail('test@email.com');
-      await authRobot.enterPassword('password');
-      await authRobot.tapSignInButton();
-
-      await studiesRobot.validateOnStudiesScreen();
-      await studiesRobot.tapSignOutButton(); // RM
-    });
-    */
-    /* NOTE: 
-        * remove skip value when remember me is implemented
-        * also remove all lines marked by RM
-       The hope is that the Session key will persist across test app instances
-       and the user will stay logged in 
-    */
-    /*
-    patrolWidgetTest('Remember me function test', semanticsEnabled: false, skip: true, ($) async {
-      final studiesRobot = StudiesRobot($);
-
-      await $.pumpWidgetAndSettle(const ProviderScope(child: App()));
-
-      studiesRobot.validateOnStudiesScreen();
-    });
-
-    patrolWidgetTest('Create a study/rename it test', semanticsEnabled: false, ($) async {
-      final appRobot = AppRobot($); // RM
-      final authRobot = AuthRobot($); // RM
-      final studiesRobot = StudiesRobot($);
-      final studyDesignRobot = StudyDesignRobot($);
-      final studyInfoRobot = StudyInfoRobot($);
-
-      await $.pumpWidgetAndSettle(const ProviderScope(child: App()));
-      await appRobot.validateOnLoginScreen(); // RM
-      await authRobot.enterEmail('test@email.com'); // RM
-      await authRobot.enterPassword('password'); // RM
-      await authRobot.tapSignInButton(); // RM
-
-      //await studiesRobot.validateNoStudiesFound();
-      await studiesRobot.tapNewStudyButton();
-
-      await studyDesignRobot.validateOnDesignScreen();
-      await studyInfoRobot.validateOnStudyInfoScreen();
-      await studyInfoRobot.enterStudyName('Create Test Study');
-
-      await studyDesignRobot.validateChangesSaved();
-      await studyDesignRobot.tapLeftDrawerButton();
-      await studyDesignRobot.tapMyStudiesButton();
-
-      await studiesRobot.validateOnStudiesScreen();
-      await studiesRobot.validateStudyDraftExists();
-
-      await studiesRobot.tapSignOutButton(); // RM
-    });
-    */
-    // We start with a new account and study here, since tests run asynchronously and
-    // previous tests might not have been completed when running this one
-    patrolWidgetTest('Publish a study', (PatrolTester $) async {
-      final appRobot = AppRobot($); // RM
-      final authRobot = AuthRobot($); // RM
-      final studiesRobot = StudiesRobot($);
       final studyDesignRobot = StudyDesignRobot($);
       final studyInfoRobot = StudyInfoRobot($);
       final studyInterventionsRobot = StudyInterventionsRobot($);
       final studyMeasurementsRobot = StudyMeasurementsRobot($);
 
-      await $.pumpWidgetAndSettle(const ProviderScope(child: App()));
-
-      /* START SIGN UP */
-      await appRobot.validateOnLoginScreen();
-      await authRobot.navigateToSignUpScreen();
-      await authRobot.enterEmail('test@email.com');
-      await authRobot.enterPassword('password');
-      await authRobot.enterPasswordConfirmation('password');
-      await authRobot.tapTermsCheckbox();
-      await authRobot.tapSignUpButton();
-      await studiesRobot.validateOnStudiesScreen();
-      await studiesRobot.tapSignOutButton();
-      /* FINISH SIGN UP */
-
-      /* START SIGN IN */
-      await appRobot.validateOnLoginScreen();
-      await authRobot.enterEmail('test@email.com');
-      await authRobot.enterPassword('password');
+      await $.pumpWidgetAndSettle(
+        const ExcludeSemantics(child: ProviderScope(child: App())),
+      );
+
+      if (randomTest) {
+        // START SIGN UP
+        await authRobot.navigateToSignUpScreen();
+        await authRobot.enterEmail(email);
+        await authRobot.enterPassword(password);
+        await authRobot.enterPasswordConfirmation(password);
+        await authRobot.tapTermsCheckbox();
+        await authRobot.tapSignUpButton();
+        await studiesRobot.tapSignOutButton();
+        // FINISH SIGN UP
+      }
+
+      // START SIGN IN
+      await authRobot.enterEmail(email);
+      await authRobot.enterPassword(password);
       await authRobot.tapSignInButton();
-      /* FINISH SIGN IN */
+      // FINISH SIGN IN
 
       // START CREATE STUDY
       await studiesRobot.tapNewStudyButton();
 
-      await studyDesignRobot.validateOnDesignScreen();
-      await studyInfoRobot.validateOnStudyInfoScreen();
       await studyInfoRobot.enterStudyName('Publish Test Study');
 
       await $.pump(const Duration(milliseconds: 1500));
@@ -165,14 +75,9 @@ void main() {
       // FINISH CREATE STUDY
 
       // START FILL AND PUBLISH STUDY
-      await studiesRobot.validateOnStudiesScreen();
-      await studiesRobot.validateStudyDraftExists();
       // todo specify the exact study that should be tapped by name
       await studiesRobot.tapOnExistingStudy();
 
-      await studyDesignRobot.validateOnDesignScreen();
-
-      await studyInfoRobot.validateOnStudyInfoScreen();
       await studyInfoRobot.enterStudyDescription('Test study description');
       await studyInfoRobot.enterResponsibleOrg('Test Organization, Inc.');
       await studyInfoRobot
@@ -189,33 +94,24 @@ void main() {
       // NO-OP because exception in participation screening questionnaire
 
       await studyDesignRobot.navigateToInterventionsScreen();
-      // Repeat twice for two interventions
-      await studyInterventionsRobot.tapAddInterventionButton();
-      await studyInterventionsRobot
-          .enterInterventionName('Test Intervention A');
-      await studyInterventionsRobot
-          .enterInterventionDesciption('Test Intervention Description A');
-      await studyInterventionsRobot.tapAddInterventionTaskButton();
-      await studyInterventionsRobot.enterInterventionTaskName('Task 1A');
-      await studyInterventionsRobot
-          .enterInterventionTaskDescription('Task 1A Description');
-      await studyInterventionsRobot.tapSaveInterventionTaskButton();
-      await studyInterventionsRobot.tapSaveInterventionButton();
-      await studyDesignRobot.validateChangesSaved();
 
-      await studyInterventionsRobot.tapAddInterventionButton();
-      await studyInterventionsRobot
-          .enterInterventionName('Test Intervention B');
-      await studyInterventionsRobot
-          .enterInterventionDesciption('Test Intervention Description B');
-      await studyInterventionsRobot.tapAddInterventionTaskButton();
-      await studyInterventionsRobot.enterInterventionTaskName('Task 1B');
-      await studyInterventionsRobot
-          .enterInterventionTaskDescription('Task 1B Description');
-      await studyInterventionsRobot.tapSaveInterventionTaskButton();
-      await studyInterventionsRobot.tapSaveInterventionButton();
+      // Create two interventions
+      await studyInterventionsRobot.createIntervention(
+        interventionName: 'Test Intervention A',
+        interventionDescription: 'Test Intervention Description A',
+        taskName: 'Task 1A',
+        taskDescription: 'Task 1A Description',
+      );
+
       await studyDesignRobot.validateChangesSaved();
 
+      await studyInterventionsRobot.createIntervention(
+        interventionName: 'Test Intervention B',
+        interventionDescription: 'Test Intervention Description B',
+        taskName: 'Task 1B',
+        taskDescription: 'Task 1B Description',
+      );
+
       await studyDesignRobot.navigateToMeasurementsScreen();
       await studyMeasurementsRobot.tapAddSurveyButton();
       await studyMeasurementsRobot.enterSurveyName('Test Survey');
@@ -237,11 +133,13 @@ void main() {
 
       await studyDesignRobot.tapLeftDrawerButton();
       await studyDesignRobot.tapMyStudiesButton();
-      await studiesRobot.validateOnStudiesScreen();
 
-      await studiesRobot.tapSignOutButton();
+      /*env.client.from('study').select().then((value) {
+        print(value);
+        // todo parse and validate
+      });*/
 
-      // todo dump database data and validate its state
+      //await studiesRobot.tapSignOutButton();
     });
   });
 }
diff --git a/designer_v2/integration_test/robots/studies_robot.dart b/designer_v2/integration_test/robots/studies_robot.dart
index 56e32f8a2..e21634498 100644
--- a/designer_v2/integration_test/robots/studies_robot.dart
+++ b/designer_v2/integration_test/robots/studies_robot.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:patrol_finders/patrol_finders.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
@@ -33,6 +32,6 @@ class StudiesRobot {
   }
 
   Future<void> tapSignOutButton() async {
-    await $(Icons.logout_rounded).tap();
+    await $(tr.navlink_logout).tap();
   }
 }
diff --git a/designer_v2/integration_test/robots/study_interventions_robot.dart b/designer_v2/integration_test/robots/study_interventions_robot.dart
index efbea9078..d1c8fe633 100644
--- a/designer_v2/integration_test/robots/study_interventions_robot.dart
+++ b/designer_v2/integration_test/robots/study_interventions_robot.dart
@@ -8,6 +8,22 @@ class StudyInterventionsRobot {
 
   final PatrolTester $;
 
+  Future<void> createIntervention({
+    required String interventionName,
+    required String interventionDescription,
+    required String taskName,
+    required String taskDescription,
+  }) async {
+    await tapAddInterventionButton();
+    await enterInterventionName(interventionName);
+    await enterInterventionDescription(interventionDescription);
+    await tapAddInterventionTaskButton();
+    await enterInterventionTaskName(taskName);
+    await enterInterventionTaskDescription(taskDescription);
+    await tapSaveInterventionTaskButton();
+    await tapSaveInterventionButton();
+  }
+
   Future<void> tapAddInterventionButton() async {
     await $(tr.form_array_interventions_new).tap();
   }
@@ -36,7 +52,7 @@ class StudyInterventionsRobot {
         .enterText(interventionName);
   }
 
-  Future<void> enterInterventionDesciption(
+  Future<void> enterInterventionDescription(
     String interventionDescription,
   ) async {
     await $(TextField)

From 0877b25943b663bf5a4ce685736fe5b49cec5512 Mon Sep 17 00:00:00 2001
From: ahmed10 <ahmed10@uni-potsdam.de>
Date: Thu, 27 Jun 2024 00:18:30 +0200
Subject: [PATCH 240/314] fix: tooltip and header

---
 designer_v2/lib/constants.dart                |  6 ++---
 designer_v2/lib/domain/study_monitoring.dart  | 23 ++++--------------
 .../features/monitor/study_monitor_page.dart  | 21 ++++++++--------
 .../features/monitor/study_monitor_table.dart |  2 ++
 designer_v2/lib/localization/app_de.arb       |  4 +++-
 designer_v2/lib/localization/app_en.arb       | 24 ++++++++++---------
 6 files changed, 36 insertions(+), 44 deletions(-)

diff --git a/designer_v2/lib/constants.dart b/designer_v2/lib/constants.dart
index c14b94e79..f84ac181e 100644
--- a/designer_v2/lib/constants.dart
+++ b/designer_v2/lib/constants.dart
@@ -46,7 +46,5 @@ const String signupRouteName = 'signup';
 const String forgotPasswordRouteName = 'forgotPassword';
 const String recoverPasswordRouteName = 'recoverPassword';
 const String errorRouteName = 'error';
-final DateTime participantDropoutDuration =
-    DateTime.now().subtract(const Duration(days: 5));
-final DateTime participantInactiveDuration =
-    DateTime.now().subtract(const Duration(days: 3));
+const participantDropoutDuration = 5;
+const participantInactiveDuration = 3;
diff --git a/designer_v2/lib/domain/study_monitoring.dart b/designer_v2/lib/domain/study_monitoring.dart
index 18ccdd031..a498bd548 100644
--- a/designer_v2/lib/domain/study_monitoring.dart
+++ b/designer_v2/lib/domain/study_monitoring.dart
@@ -182,10 +182,13 @@ extension StudyMonitoringX on Study {
     int dropoutParticipants = 0;
     int completedParticipants = 0;
 
+    final participantInactiveDays = DateTime.now().subtract(const Duration(days: participantInactiveDuration));
+    final participantDropoutDays = DateTime.now().subtract(const Duration(days: participantDropoutDuration));
+
     for (final item in items) {
       if (!item.droppedOut) {
         if (item.currentDayOfStudy < item.studyDurationInDays) {
-          if (item.lastActivityAt.isAfter(participantInactiveDuration)) {
+          if (item.lastActivityAt.isAfter(participantInactiveDays)) {
             activeParticipants += 1; // Active
           } else {
             inactiveParticipants += 1; // Inactive
@@ -195,7 +198,7 @@ extension StudyMonitoringX on Study {
         }
       } else {
         if (item.currentDayOfStudy < item.studyDurationInDays) {
-          if (item.lastActivityAt.isBefore(participantDropoutDuration)) {
+          if (item.lastActivityAt.isBefore(participantDropoutDays)) {
             dropoutParticipants += 1; // Dropout
           }
         } else {
@@ -204,22 +207,6 @@ extension StudyMonitoringX on Study {
       }
     }
 
-    print({'debug', dropoutParticipants});
-    print({
-      'debug',
-      {'active', activeParticipants},
-      {'inactive', inactiveParticipants},
-      {'dropout', dropoutParticipants},
-      {'completed', completedParticipants},
-    });
-    print({'debug:total', items.length});
-    print({
-      'debug:item': items.where((item) {
-        print({'item', item.currentDayOfStudy});
-        return true;
-      }),
-    });
-
     assert(
       activeParticipants +
               inactiveParticipants +
diff --git a/designer_v2/lib/features/monitor/study_monitor_page.dart b/designer_v2/lib/features/monitor/study_monitor_page.dart
index 83302ec90..3fce07b22 100644
--- a/designer_v2/lib/features/monitor/study_monitor_page.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_page.dart
@@ -28,14 +28,18 @@ class StudyMonitorScreen extends StudyPageWidget {
           children: <Widget>[
             _monitorSectionHeader(context, studyMonitorData),
             const SizedBox(height: 40.0), // spacing between body elements
-            if (studyMonitorData.items.isNotEmpty)
+            if (studyMonitorData.items.isNotEmpty) ...[
+              SelectableText(
+                tr.monitoring_participants_title,
+                style: Theme.of(context).textTheme.headlineSmall,
+              ),
               StudyMonitorTable(
                 ref: ref,
                 studyMonitorItems: studyMonitorData.items,
                 onSelectItem: (item) =>
                     _onSelectParticipant(context, ref, item, study),
-              )
-            else
+              ),
+            ] else
               EmptyBody(
                 icon: Icons.person_off_rounded,
                 title: tr.monitoring_no_participants_title,
@@ -51,8 +55,9 @@ class StudyMonitorScreen extends StudyPageWidget {
     BuildContext context,
     StudyMonitorData monitorData,
   ) {
+    final theme = Theme.of(context);
     final int total = monitorData.items.length;
-    const double minPercentage = 0.05; // Minimum percentage for visibility
+    const double minPercentage = 0.01; // Minimum percentage for visibility
 
     double activePercentage = monitorData.activeParticipants / total;
     double inactivePercentage = monitorData.inactiveParticipants / total;
@@ -80,17 +85,13 @@ class StudyMonitorScreen extends StudyPageWidget {
     dropoutPercentage /= sumOfPercentages;
     completedPercentage /= sumOfPercentages;
 
-    const Color activeColor = Color(0xFF0072B2);
+    final Color activeColor = theme.primaryColor;
     const Color inactiveColor = Color(0xFFD55E00);
-    const Color dropoutColor = Color(0xFFCC79A7);
+    const Color dropoutColor = Color(0xFF0072B2);
     const Color completedColor = Color(0xFF009E73);
     return Row(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        SelectableText(
-          tr.monitoring_participants_title,
-          style: Theme.of(context).textTheme.headlineSmall,
-        ),
         const Spacer(),
         SizedBox(
           width: 420,
diff --git a/designer_v2/lib/features/monitor/study_monitor_table.dart b/designer_v2/lib/features/monitor/study_monitor_table.dart
index 31c10e96d..21b92c37a 100644
--- a/designer_v2/lib/features/monitor/study_monitor_table.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_table.dart
@@ -60,6 +60,7 @@ class StudyMonitorTable extends ConsumerWidget {
         StandardTableColumn(
           sortable: true,
           label: tr.monitoring_table_column_day_in_study,
+          tooltip: tr.monitoring_table_days_in_study_header_tooltip,
           columnWidth:
               const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.6)),
         ),
@@ -73,6 +74,7 @@ class StudyMonitorTable extends ConsumerWidget {
         StandardTableColumn(
           sortable: true,
           label: tr.monitoring_table_column_completed_surveys,
+          tooltip: tr.monitoring_table_completed_surveys_header_tooltip,
           columnWidth:
               const MaxColumnWidth(FixedColumnWidth(125), FlexColumnWidth(1.7)),
         ),
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index eaf8a8381..1e47a1d1a 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -500,7 +500,7 @@
   "monitoring_no_participants_title": "Es gibt noch keine Teilnehmer in dieser Studie",
   "monitoring_no_participants_description": "Sobald Teilnehmer in Ihrer Studie eingeschrieben sind, können Sie hier deren Fortschritt überwachen und ihre Daten einsehen.",
   "monitoring_participants_title": "Teilnehmer",
-  "monitoring_total": "Gesamt",
+  "monitoring_total": "Gesamtzahl der Teilnehmer",
   "monitoring_active": "Aktiv",
   "monitoring_active_tooltip": "Anzahl der Teilnehmer, die derzeit in der Studie sind",
   "monitoring_inactive": "Inaktiv",
@@ -517,7 +517,9 @@
   "monitoring_table_column_completed_interventions": "Abgeschlossene\nInterventionen",
   "monitoring_table_column_completed_surveys": "Abgeschlossene\nFragebögen",
   "monitoring_table_row_tooltip_dropout": "Dieser Teilnehmer ist ausgeschieden und es wird keine neue Aktivität hinzugefügt",
+  "monitoring_table_days_in_study_header_tooltip":"Anzahl der im Studienzeitraum vergangenen Tage",
   "monitoring_table_completed_interventions_header_tooltip": "Die Intervention ist erst abgeschlossen, wenn alle Aufgaben erledigt sind",
+  "monitoring_table_completed_surveys_header_tooltip":"Die Umfrage ist erst abgeschlossen, wenn alle Aufgaben des Tages erledigt wurden",
   "@__________________STUDYPAGE_ANALYZE__________________": {},
   "banner_text_study_analyze_draft": "Solange die Studie noch nicht live ist, basieren die Ergebnisse hier auf dem letzten Testlauf der Studie (siehe Testmodus).\nDie Ergebnisdaten werden automatisch zurückgesetzt sobald die Studie mit echten Teilnehmern startet.",
   "action_button_study_export": "Daten exportieren",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index 330a18c3f..7e9d5f2ec 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -537,34 +537,36 @@
   "code_list_header_code": "Code",
   "action_button_code_new": "New code",
   "@__________________STUDYPAGE_MONITOR__________________": {},
-  "participant_details_title": "Participant Details",
+  "participant_details_title": "Participant details",
   "participant_details_study_days_overview": "Study days overview",
   "participant_details_study_days_description": "This section provides an overview of the participant's study days.",
-  "participant_details_color_legend_title": "Color Legend",
+  "participant_details_color_legend_title": "Color legend",
   "participant_details_color_legend_completed": "Completed",
-  "participant_details_color_legend_partially_completed": "Partially Completed",
+  "participant_details_color_legend_partially_completed": "Partially completed",
   "participant_details_color_legend_missed": "Missed",
   "monitoring_no_participants_title": "There are no participants in this study yet",
   "monitoring_no_participants_description": "Once participants have enrolled in your study, you can monitor their progress and view their data here.",
   "monitoring_participants_title": "Participants",
-  "monitoring_total": "Total",
+  "monitoring_total": "Total number of participants",
   "monitoring_active": "Active",
   "monitoring_active_tooltip": "Number of participants who are currently in the study",
   "monitoring_inactive": "Inactive",
   "monitoring_inactive_tooltip": "Number of participants who are inactive 3 days in a row",
   "monitoring_dropout": "Dropout",
-  "monitoring_dropout_tooltip": "Number of participants who have dropped out before the end of the study",
+  "monitoring_dropout_tooltip": "Number of participants dropped out before the end of the study or inactive 5 days in a row",
   "monitoring_completed": "Completed",
   "monitoring_completed_tooltip": "Number of participants who reached the end of the study",
   "monitoring_table_column_participant_id": "Participant ID",
-  "monitoring_table_column_invite_code": "Invite Code",
-  "monitoring_table_column_enrolled": "Started At",
-  "monitoring_table_column_last_activity": "Last Activity",
-  "monitoring_table_column_day_in_study": "Day in Study",
-  "monitoring_table_column_completed_interventions": "Completed\nInterventions",
-  "monitoring_table_column_completed_surveys": "Completed\nSurveys",
+  "monitoring_table_column_invite_code": "Invite code",
+  "monitoring_table_column_enrolled": "Started at",
+  "monitoring_table_column_last_activity": "Last activity",
+  "monitoring_table_column_day_in_study": "Day in study",
+  "monitoring_table_column_completed_interventions": "Completed\ninterventions",
+  "monitoring_table_column_completed_surveys": "Completed\nsurveys",
   "monitoring_table_row_tooltip_dropout": "This participant has dropped out and no new activity will be added",
+  "monitoring_table_days_in_study_header_tooltip":"Number of days passed in study period",
   "monitoring_table_completed_interventions_header_tooltip": "Intervention is only completed, if all tasks have been completed",
+  "monitoring_table_completed_surveys_header_tooltip":"The survey is only completed, if all tasks have been completed of the day",
   "@__________________STUDYPAGE_ANALYZE__________________": {},
   "banner_text_study_analyze_draft": "Because this study has not been launched yet, this page is currently based on the data generated during study testing (only the latest test session).\nThe data on this page will be reset once you launch the study with real participants.",
   "action_button_study_export": "Export data",

From 700ff2ad51d67c1caa24f654a5b7a78d46d21da0 Mon Sep 17 00:00:00 2001
From: ahmed10 <ahmed10@uni-potsdam.de>
Date: Thu, 27 Jun 2024 00:19:19 +0200
Subject: [PATCH 241/314] chore:format

---
 designer_v2/lib/domain/study_monitoring.dart | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/designer_v2/lib/domain/study_monitoring.dart b/designer_v2/lib/domain/study_monitoring.dart
index a498bd548..7d405a966 100644
--- a/designer_v2/lib/domain/study_monitoring.dart
+++ b/designer_v2/lib/domain/study_monitoring.dart
@@ -182,8 +182,10 @@ extension StudyMonitoringX on Study {
     int dropoutParticipants = 0;
     int completedParticipants = 0;
 
-    final participantInactiveDays = DateTime.now().subtract(const Duration(days: participantInactiveDuration));
-    final participantDropoutDays = DateTime.now().subtract(const Duration(days: participantDropoutDuration));
+    final participantInactiveDays = DateTime.now()
+        .subtract(const Duration(days: participantInactiveDuration));
+    final participantDropoutDays = DateTime.now()
+        .subtract(const Duration(days: participantDropoutDuration));
 
     for (final item in items) {
       if (!item.droppedOut) {

From 0657928e5ee0866e41bc19d912679089be47860c Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 27 Jun 2024 20:11:53 +0200
Subject: [PATCH 242/314] chore: cleanup

---
 core/lib/src/models/tables/study.dart                 | 5 -----
 designer_v2/lib/features/app_controller.g.dart        | 2 +-
 designer_v2/lib/services/notification_dispatcher.dart | 1 -
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/core/lib/src/models/tables/study.dart b/core/lib/src/models/tables/study.dart
index 5bf87ee39..3e8ef4faa 100644
--- a/core/lib/src/models/tables/study.dart
+++ b/core/lib/src/models/tables/study.dart
@@ -327,11 +327,6 @@ class Study extends SupabaseObjectFunctions<Study>
     return status != StudyStatus.draft || !canEdit(user);
   }
 
-  @override
-  String toString() {
-    return 'Study{id: $id, title: $title, description: $description, userId: $userId, participation: $participation, resultSharing: $resultSharing, contact: $contact, iconName: $iconName, published: <deprecated>, status: $status, questionnaire: $questionnaire, eligibilityCriteria: $eligibilityCriteria, consent: $consent, interventions: $interventions, observations: $observations, schedule: $schedule, reportSpecification: $reportSpecification, results: $results, collaboratorEmails: $collaboratorEmails, registryPublished: $registryPublished, participantCount: $participantCount, endedCount: $endedCount, activeSubjectCount: $activeSubjectCount, missedDays: $missedDays, repo: $repo, invites: $invites, participants: $participants, participantsProgress: $participantsProgress, createdAt: $createdAt}';
-  }
-
   @override
   int compareTo(Study other) {
     return id.compareTo(other.id);
diff --git a/designer_v2/lib/features/app_controller.g.dart b/designer_v2/lib/features/app_controller.g.dart
index 0a42b8814..2888bae08 100644
--- a/designer_v2/lib/features/app_controller.g.dart
+++ b/designer_v2/lib/features/app_controller.g.dart
@@ -6,7 +6,7 @@ part of 'app_controller.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$appControllerHash() => r'5f5e1353e3c33dd56d2cf83a2451587ec4000ea0';
+String _$appControllerHash() => r'312b721b74a25c04cc5b5c5cdca0bad788994611';
 
 /// Main controller that's bound to the top-level application widget's state
 ///
diff --git a/designer_v2/lib/services/notification_dispatcher.dart b/designer_v2/lib/services/notification_dispatcher.dart
index 5464c5760..09b2e5b4c 100644
--- a/designer_v2/lib/services/notification_dispatcher.dart
+++ b/designer_v2/lib/services/notification_dispatcher.dart
@@ -54,7 +54,6 @@ class _NotificationDispatcherState
   @override
   void initState() {
     super.initState();
-    print("NotificationDispatcher: initState");
     _subscription = ref
         .read(notificationServiceProvider)
         .watchNotifications()

From a017eecc2d0390679d733e5f8327e6492e05d9a1 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 27 Jun 2024 20:12:00 +0200
Subject: [PATCH 243/314] test: improved integration test architecture

---
 designer_v2/integration_test/app_test.dart    | 122 +---------------
 .../{ => controller}/robots/app_robot.dart    |   0
 .../{ => controller}/robots/auth_robot.dart   |   0
 .../{ => controller}/robots/robots.dart       |   1 +
 .../robots/studies_robot.dart                 |   0
 .../robots/study_design_robot.dart            |   3 +
 .../robots/study_info_robot.dart              |   0
 .../robots/study_interventions_robot.dart     |   0
 .../robots/study_measurements_robot.dart      |  22 +++
 .../controller/robots/study_robots.dart       |  23 +++
 .../study_integration_controller.dart         | 138 ++++++++++++++++++
 .../controller/study_validator.dart           |  70 +++++++++
 .../mockup/mockup_loader.dart                 |  45 ++++++
 .../mockup/mockup_studies.dart                |  82 +++++++++++
 .../tests/study_base_test.dart                |  39 +++++
 .../integration_test/tests/test_1.dart        |  82 +++++++++++
 designer_v2/lib/features/app_controller.dart  |   3 -
 designer_v2/pubspec.lock                      |  16 ++
 designer_v2/pubspec.yaml                      |   1 +
 19 files changed, 526 insertions(+), 121 deletions(-)
 rename designer_v2/integration_test/{ => controller}/robots/app_robot.dart (100%)
 rename designer_v2/integration_test/{ => controller}/robots/auth_robot.dart (100%)
 rename designer_v2/integration_test/{ => controller}/robots/robots.dart (89%)
 rename designer_v2/integration_test/{ => controller}/robots/studies_robot.dart (100%)
 rename designer_v2/integration_test/{ => controller}/robots/study_design_robot.dart (91%)
 rename designer_v2/integration_test/{ => controller}/robots/study_info_robot.dart (100%)
 rename designer_v2/integration_test/{ => controller}/robots/study_interventions_robot.dart (100%)
 rename designer_v2/integration_test/{ => controller}/robots/study_measurements_robot.dart (82%)
 create mode 100644 designer_v2/integration_test/controller/robots/study_robots.dart
 create mode 100644 designer_v2/integration_test/controller/study_integration_controller.dart
 create mode 100644 designer_v2/integration_test/controller/study_validator.dart
 create mode 100644 designer_v2/integration_test/mockup/mockup_loader.dart
 create mode 100644 designer_v2/integration_test/mockup/mockup_studies.dart
 create mode 100644 designer_v2/integration_test/tests/study_base_test.dart
 create mode 100644 designer_v2/integration_test/tests/test_1.dart

diff --git a/designer_v2/integration_test/app_test.dart b/designer_v2/integration_test/app_test.dart
index 075aa605b..5b226b66e 100644
--- a/designer_v2/integration_test/app_test.dart
+++ b/designer_v2/integration_test/app_test.dart
@@ -1,17 +1,14 @@
 // ignore_for_file: dead_code
-
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_web_plugins/url_strategy.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:patrol_finders/patrol_finders.dart';
-import 'package:studyu_designer_v2/features/app.dart';
 import 'package:studyu_designer_v2/utils/performance.dart';
 import 'package:studyu_flutter_common/studyu_flutter_common.dart';
 
-import 'robots/robots.dart';
+import 'tests/test_1.dart';
 
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
@@ -26,120 +23,9 @@ void main() {
   });
 
   group('Test all', () {
-    const randomTest = true;
-    final email = randomTest
-        ? '${DateTime.now().millisecondsSinceEpoch}@studyu.health'
-        : 'test@studyu.health';
-    const password = 'password';
-
-    patrolWidgetTest('TestAll', (PatrolTester $) async {
-      final authRobot = AuthRobot($);
-      final studiesRobot = StudiesRobot($);
-      final studyDesignRobot = StudyDesignRobot($);
-      final studyInfoRobot = StudyInfoRobot($);
-      final studyInterventionsRobot = StudyInterventionsRobot($);
-      final studyMeasurementsRobot = StudyMeasurementsRobot($);
-
-      await $.pumpWidgetAndSettle(
-        const ExcludeSemantics(child: ProviderScope(child: App())),
-      );
-
-      if (randomTest) {
-        // START SIGN UP
-        await authRobot.navigateToSignUpScreen();
-        await authRobot.enterEmail(email);
-        await authRobot.enterPassword(password);
-        await authRobot.enterPasswordConfirmation(password);
-        await authRobot.tapTermsCheckbox();
-        await authRobot.tapSignUpButton();
-        await studiesRobot.tapSignOutButton();
-        // FINISH SIGN UP
-      }
-
-      // START SIGN IN
-      await authRobot.enterEmail(email);
-      await authRobot.enterPassword(password);
-      await authRobot.tapSignInButton();
-      // FINISH SIGN IN
-
-      // START CREATE STUDY
-      await studiesRobot.tapNewStudyButton();
-
-      await studyInfoRobot.enterStudyName('Publish Test Study');
-
-      await $.pump(const Duration(milliseconds: 1500));
-
-      await studyDesignRobot.validateChangesSaved();
-      await studyDesignRobot.tapLeftDrawerButton();
-      await studyDesignRobot.tapMyStudiesButton();
-      // FINISH CREATE STUDY
-
-      // START FILL AND PUBLISH STUDY
-      // todo specify the exact study that should be tapped by name
-      await studiesRobot.tapOnExistingStudy();
-
-      await studyInfoRobot.enterStudyDescription('Test study description');
-      await studyInfoRobot.enterResponsibleOrg('Test Organization, Inc.');
-      await studyInfoRobot
-          .enterInstitutionalReviewBoard('IRB of Test Organization, Inc.');
-      await studyInfoRobot.enterIRBProtocolNumber('456-112-324');
-      await studyInfoRobot
-          .enterResponsiblePerson('Test First Name, Test Last Name');
-      await studyInfoRobot.enterWebsite('test-study.org');
-      await studyInfoRobot.enterContactEmail('test@email.com');
-      await studyInfoRobot.enterContactPhone('+491112221122');
-      await studyDesignRobot.validateChangesSaved();
-
-      await studyDesignRobot.navigateToParticipationScreen();
-      // NO-OP because exception in participation screening questionnaire
-
-      await studyDesignRobot.navigateToInterventionsScreen();
-
-      // Create two interventions
-      await studyInterventionsRobot.createIntervention(
-        interventionName: 'Test Intervention A',
-        interventionDescription: 'Test Intervention Description A',
-        taskName: 'Task 1A',
-        taskDescription: 'Task 1A Description',
-      );
-
-      await studyDesignRobot.validateChangesSaved();
-
-      await studyInterventionsRobot.createIntervention(
-        interventionName: 'Test Intervention B',
-        interventionDescription: 'Test Intervention Description B',
-        taskName: 'Task 1B',
-        taskDescription: 'Task 1B Description',
-      );
-
-      await studyDesignRobot.navigateToMeasurementsScreen();
-      await studyMeasurementsRobot.tapAddSurveyButton();
-      await studyMeasurementsRobot.enterSurveyName('Test Survey');
-      await studyMeasurementsRobot.enterSurveyIntroText('Test Intro');
-      await studyMeasurementsRobot.enterSurveyOutroText('Test Outro');
-      await studyMeasurementsRobot.tapAddSurveyQuestionButton();
-      await studyMeasurementsRobot.enterSurveyQuestionText('Test Question');
-      await studyMeasurementsRobot.enterSurveyQuestionOption1('Test Option 1');
-      await studyMeasurementsRobot.enterSurveyQuestionOption2('Test Option 2');
-      await studyMeasurementsRobot.tapSaveSurveyQuestionButton();
-      await studyMeasurementsRobot.tapSaveSurveyButton();
-      await studyDesignRobot.validateChangesSaved();
-
-      await studyDesignRobot.tapPublishButton();
-      await studyDesignRobot.tapConfirmPublishButton();
-      await studyDesignRobot.tapSkipForNowButton();
-      await studyDesignRobot.validateStudyPublished();
-      // FINISH FILL AND PUBLISH STUDY
-
-      await studyDesignRobot.tapLeftDrawerButton();
-      await studyDesignRobot.tapMyStudiesButton();
-
-      /*env.client.from('study').select().then((value) {
-        print(value);
-        // todo parse and validate
-      });*/
-
-      //await studiesRobot.tapSignOutButton();
+    patrolWidgetTest('Create study', (PatrolTester $) async {
+      print("GO!");
+      await Test1.go($).init();
     });
   });
 }
diff --git a/designer_v2/integration_test/robots/app_robot.dart b/designer_v2/integration_test/controller/robots/app_robot.dart
similarity index 100%
rename from designer_v2/integration_test/robots/app_robot.dart
rename to designer_v2/integration_test/controller/robots/app_robot.dart
diff --git a/designer_v2/integration_test/robots/auth_robot.dart b/designer_v2/integration_test/controller/robots/auth_robot.dart
similarity index 100%
rename from designer_v2/integration_test/robots/auth_robot.dart
rename to designer_v2/integration_test/controller/robots/auth_robot.dart
diff --git a/designer_v2/integration_test/robots/robots.dart b/designer_v2/integration_test/controller/robots/robots.dart
similarity index 89%
rename from designer_v2/integration_test/robots/robots.dart
rename to designer_v2/integration_test/controller/robots/robots.dart
index 9aef69168..8e85b1b11 100644
--- a/designer_v2/integration_test/robots/robots.dart
+++ b/designer_v2/integration_test/controller/robots/robots.dart
@@ -5,3 +5,4 @@ export 'study_design_robot.dart';
 export 'study_info_robot.dart';
 export 'study_interventions_robot.dart';
 export 'study_measurements_robot.dart';
+export 'study_robots.dart';
diff --git a/designer_v2/integration_test/robots/studies_robot.dart b/designer_v2/integration_test/controller/robots/studies_robot.dart
similarity index 100%
rename from designer_v2/integration_test/robots/studies_robot.dart
rename to designer_v2/integration_test/controller/robots/studies_robot.dart
diff --git a/designer_v2/integration_test/robots/study_design_robot.dart b/designer_v2/integration_test/controller/robots/study_design_robot.dart
similarity index 91%
rename from designer_v2/integration_test/robots/study_design_robot.dart
rename to designer_v2/integration_test/controller/robots/study_design_robot.dart
index b0092c7cc..732c2beb6 100644
--- a/designer_v2/integration_test/robots/study_design_robot.dart
+++ b/designer_v2/integration_test/controller/robots/study_design_robot.dart
@@ -13,6 +13,9 @@ class StudyDesignRobot {
   }
 
   Future<void> validateChangesSaved() async {
+    // wait for 1s with future
+    //await Future.delayed(const Duration(seconds: 1));
+    //await $.pumpAndSettle(duration: const Duration(seconds: 1));
     await $(Icons.check_circle_rounded).waitUntilVisible();
   }
 
diff --git a/designer_v2/integration_test/robots/study_info_robot.dart b/designer_v2/integration_test/controller/robots/study_info_robot.dart
similarity index 100%
rename from designer_v2/integration_test/robots/study_info_robot.dart
rename to designer_v2/integration_test/controller/robots/study_info_robot.dart
diff --git a/designer_v2/integration_test/robots/study_interventions_robot.dart b/designer_v2/integration_test/controller/robots/study_interventions_robot.dart
similarity index 100%
rename from designer_v2/integration_test/robots/study_interventions_robot.dart
rename to designer_v2/integration_test/controller/robots/study_interventions_robot.dart
diff --git a/designer_v2/integration_test/robots/study_measurements_robot.dart b/designer_v2/integration_test/controller/robots/study_measurements_robot.dart
similarity index 82%
rename from designer_v2/integration_test/robots/study_measurements_robot.dart
rename to designer_v2/integration_test/controller/robots/study_measurements_robot.dart
index 263a41123..c90306980 100644
--- a/designer_v2/integration_test/robots/study_measurements_robot.dart
+++ b/designer_v2/integration_test/controller/robots/study_measurements_robot.dart
@@ -102,4 +102,26 @@ class StudyMeasurementsRobot {
         .scrollTo()
         .enterText(optionText);
   }
+
+  Future<void> createObservation({
+    required String observationTitle,
+    required String observationHeader,
+    required String observationFooter,
+  }) async {
+    await tapAddSurveyButton();
+    await enterSurveyName(observationTitle);
+    await enterSurveyIntroText(observationHeader);
+    await enterSurveyOutroText(observationFooter);
+  }
+
+  Future<void> createObservationQuestion({
+    required String questionText,
+    required String option1,
+    required String option2,
+  }) async {
+    await tapAddSurveyQuestionButton();
+    await enterSurveyQuestionText(questionText);
+    await enterSurveyQuestionOption1(option1);
+    await enterSurveyQuestionOption2(option2);
+  }
 }
diff --git a/designer_v2/integration_test/controller/robots/study_robots.dart b/designer_v2/integration_test/controller/robots/study_robots.dart
new file mode 100644
index 000000000..0b5d1af1e
--- /dev/null
+++ b/designer_v2/integration_test/controller/robots/study_robots.dart
@@ -0,0 +1,23 @@
+import 'package:patrol_finders/patrol_finders.dart';
+
+import 'robots.dart';
+
+abstract class StudyRobots {
+  final PatrolTester $;
+  final AppRobot appRobot;
+  final AuthRobot authRobot;
+  final StudiesRobot studiesRobot;
+  final StudyDesignRobot studyDesignRobot;
+  final StudyInfoRobot studyInfoRobot;
+  final StudyInterventionsRobot studyInterventionsRobot;
+  final StudyMeasurementsRobot studyMeasurementsRobot;
+
+  StudyRobots(this.$)
+      : appRobot = AppRobot($),
+        authRobot = AuthRobot($),
+        studiesRobot = StudiesRobot($),
+        studyDesignRobot = StudyDesignRobot($),
+        studyInfoRobot = StudyInfoRobot($),
+        studyInterventionsRobot = StudyInterventionsRobot($),
+        studyMeasurementsRobot = StudyMeasurementsRobot($);
+}
diff --git a/designer_v2/integration_test/controller/study_integration_controller.dart b/designer_v2/integration_test/controller/study_integration_controller.dart
new file mode 100644
index 000000000..1fe00ab24
--- /dev/null
+++ b/designer_v2/integration_test/controller/study_integration_controller.dart
@@ -0,0 +1,138 @@
+import 'package:studyu_core/core.dart';
+
+import '../mockup/mockup_loader.dart';
+import '../mockup/mockup_studies.dart';
+import 'robots/robots.dart';
+import 'study_validator.dart';
+
+abstract class StudyIntegrationActions {
+  Future<void> fillTitle();
+  Future<void> fillInfoPage();
+  Future<void> fillInterventions(
+    List<Intervention> Function(List<Intervention> interventionList)
+        interventionsToCreate,
+  );
+  Future<void> fillObservations(
+    List<Observation> Function(List<Observation> observationList)
+        observationsToCreate,
+  );
+}
+
+class StudyIntegrationController extends StudyRobots
+    implements StudyIntegrationActions {
+  final Study Function() _mockStudyRef;
+
+  // Only available after login
+  late final String userID;
+  late final MockupLoader mockupLoader;
+  late final Study _intermediateMockStudy;
+  late final Study mockStudy;
+
+  StudyIntegrationController(
+    super.$,
+    this._mockStudyRef,
+  );
+
+  Future<void> init(String userID_) async {
+    userID = userID_;
+    mockupLoader = MockupLoader(userID, _mockStudyRef);
+    _intermediateMockStudy = mockupLoader.emptyMockupStudy();
+    mockStudy = MockupStudies.study;
+  }
+
+  @override
+  Future<void> fillTitle() async {
+    await studyInfoRobot.enterStudyName(mockStudy.title!);
+
+    _intermediateMockStudy.title = mockStudy.title;
+    // await _endActions(); // does not work
+    await studyDesignRobot.validateChangesSaved();
+  }
+
+  @override
+  Future<void> fillInfoPage() async {
+    await studyInfoRobot.enterStudyDescription(mockStudy.description!);
+    await studyInfoRobot.enterResponsibleOrg(mockStudy.contact.organization);
+    await studyInfoRobot.enterInstitutionalReviewBoard(
+      mockStudy.contact.institutionalReviewBoard!,
+    );
+    await studyInfoRobot.enterIRBProtocolNumber(
+      mockStudy.contact.institutionalReviewBoardNumber!,
+    );
+    await studyInfoRobot.enterResponsiblePerson(mockStudy.contact.researchers!);
+    await studyInfoRobot.enterWebsite(mockStudy.contact.website);
+    await studyInfoRobot.enterContactEmail(mockStudy.contact.email);
+    await studyInfoRobot.enterContactPhone(mockStudy.contact.phone);
+
+    _intermediateMockStudy.contact = mockStudy.contact;
+    await _endActions();
+  }
+
+  @override
+  Future<void> fillInterventions(
+    List<Intervention> Function(List<Intervention> interventionList)
+        interventionsToCreate,
+  ) async {
+    final interventions = interventionsToCreate(mockStudy.interventions);
+
+    for (final intervention in interventions) {
+      await studyInterventionsRobot.createIntervention(
+        interventionName: intervention.name!,
+        interventionDescription: intervention.description!,
+        taskName: intervention.tasks[0].title!,
+        taskDescription: intervention.tasks[0].header!,
+      );
+    }
+
+    _intermediateMockStudy.interventions.addAll(interventions);
+    await _endActions();
+  }
+
+  @override
+  Future<void> fillObservations(
+    List<Observation> Function(List<Observation> observationList)
+        observationsToCreate,
+  ) async {
+    final observations = observationsToCreate(mockStudy.observations);
+
+    for (final observation in observations) {
+      await studyMeasurementsRobot.createObservation(
+        observationTitle: observation.title!,
+        observationHeader: observation.header!,
+        observationFooter: observation.footer!,
+      );
+      // todo support other question types
+      for (final (question as ChoiceQuestion)
+          in (observation as QuestionnaireTask).questions.questions) {
+        await studyMeasurementsRobot.createObservationQuestion(
+          questionText: question.prompt!,
+          option1: question.choices[0].text,
+          option2: question.choices[1].text,
+        );
+      }
+    }
+    await studyMeasurementsRobot.tapSaveSurveyQuestionButton();
+    await studyMeasurementsRobot.tapSaveSurveyButton();
+
+    _intermediateMockStudy.observations.addAll(observations);
+    await _endActions();
+  }
+
+  Future<void> _endActions() async {
+    await studyDesignRobot.validateChangesSaved();
+    // todo find a way to validate the changes directly after auto-save
+    // await validateIntermediate();
+  }
+
+  Future<bool> validateIntermediate() {
+    return StudyValidator(userID).compare(_intermediateMockStudy);
+  }
+
+  Future<bool> validateFinal() async {
+    final res = await StudyValidator(userID).compare(mockStudy);
+    if (res) {
+      print('Final validation succeeded!');
+    }
+    return res;
+  }
+}
diff --git a/designer_v2/integration_test/controller/study_validator.dart b/designer_v2/integration_test/controller/study_validator.dart
new file mode 100644
index 000000000..75faf05df
--- /dev/null
+++ b/designer_v2/integration_test/controller/study_validator.dart
@@ -0,0 +1,70 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:json_diff/json_diff.dart';
+import 'package:studyu_core/core.dart';
+
+class StudyValidator {
+  final String userID;
+
+  StudyValidator(this.userID);
+
+  Future<Study> _fetchCurrentStudy() async {
+    final studies = await SupabaseQuery.getAll<Study>(selectedColumns: ['*']);
+    studies.removeWhere(
+      (Study s) => s.userId != userID,
+    );
+    expect(studies.length, 1, reason: 'One study should be created');
+    final study = studies.single;
+    return study;
+  }
+
+  Future<bool> compare(Study studyToCompare) async {
+    bool bfsDiffNode(DiffNode root) {
+      // Create a queue and add the root node
+      final List<DiffNode> queue = [root];
+
+      while (queue.isNotEmpty) {
+        // Dequeue a node from the front of the queue
+        final DiffNode currentNode = queue.removeAt(0);
+
+        // We do not compare IDs, because they are not known in advance
+        if (currentNode.changed.containsKey('id')) {
+          currentNode.changed.remove('id');
+        }
+
+        // Print the current node
+        /*print('Node path: ${currentNode.path}');
+        print('Added: ${currentNode.added}');
+        print('Removed: ${currentNode.removed}');
+        print('Changed: ${currentNode.changed}');
+        print('----------------');*/
+
+        if (currentNode.changed.isNotEmpty ||
+            currentNode.added.isNotEmpty ||
+            currentNode.removed.isNotEmpty) {
+          return false;
+        }
+
+        // Enqueue all child nodes
+        queue.addAll(currentNode.node.values);
+      }
+      return true;
+    }
+
+    final fetchedStudy = await _fetchCurrentStudy();
+
+    final studyDiff =
+        JsonDiffer.fromJson(studyToCompare.toJson(), fetchedStudy.toJson())
+            .diff();
+
+    final res = bfsDiffNode(studyDiff);
+    if (!res) {
+      // todo why is this not printing?
+      print("Mockup Study: ${studyToCompare.toJson()}");
+      print("Fetched Study: ${fetchedStudy.toJson()}");
+      print("Differences Detected: $studyDiff");
+      print("Study Validation: FAILED");
+    }
+    expect(res, true, reason: 'Study validation failed: $studyDiff');
+    return res;
+  }
+}
diff --git a/designer_v2/integration_test/mockup/mockup_loader.dart b/designer_v2/integration_test/mockup/mockup_loader.dart
new file mode 100644
index 000000000..eb533f64f
--- /dev/null
+++ b/designer_v2/integration_test/mockup/mockup_loader.dart
@@ -0,0 +1,45 @@
+import 'package:studyu_core/core.dart';
+
+import 'mockup_studies.dart';
+
+class MockupLoader extends MockupStudies {
+  final String userID;
+
+  MockupLoader(this.userID, Study Function() studyRef) {
+    MockupStudies.init(userID);
+    studyRef();
+    resetStudy(MockupStudies.study);
+  }
+
+  Study emptyMockupStudy() {
+    final mockupStudy = Study.withId(userID);
+    resetStudy(mockupStudy);
+    return mockupStudy;
+  }
+
+  /// Resets a study to the expected defaults of the Designer package after it has been created
+  void resetStudy(Study studyToReset) {
+    void resetSchedule(List<Task> tasks) {
+      for (final task in tasks) {
+        task.schedule = Schedule()
+          ..completionPeriods = [
+            CompletionPeriod.noId(
+              unlockTime: StudyUTimeOfDay(),
+              lockTime: StudyUTimeOfDay(hour: 23, minute: 59),
+            ),
+          ];
+      }
+    }
+
+    // The Designer package overrides the defaults set in the core package
+    // so that's why we need to do the same here
+    studyToReset
+      ..iconName = ''
+      ..interventions.forEach((intervention) {
+        resetSchedule(intervention.tasks);
+      })
+      ..observations.forEach((observation) {
+        resetSchedule([observation]);
+      });
+  }
+}
diff --git a/designer_v2/integration_test/mockup/mockup_studies.dart b/designer_v2/integration_test/mockup/mockup_studies.dart
new file mode 100644
index 000000000..1a8b8401a
--- /dev/null
+++ b/designer_v2/integration_test/mockup/mockup_studies.dart
@@ -0,0 +1,82 @@
+import 'package:studyu_core/core.dart';
+
+class MockupStudies {
+  static late Study study;
+
+  static void init(String userID) {
+    study = Study.withId(userID);
+  }
+
+  static Study study1() {
+    final mockContact = Contact()
+      ..organization = 'Test Organization, Inc.'
+      ..institutionalReviewBoard = 'IRB of Test Organization, Inc.'
+      ..institutionalReviewBoardNumber = '456-112-324'
+      ..researchers = 'Test First Name, Test Last Name'
+      ..email = 'test@email.com'
+      ..website = 'test-study.org'
+      ..phone = '+491112221122';
+
+    final mockInterventions = List<Intervention>.of(
+      [
+        Intervention.withId()
+          ..name = 'Test Intervention A'
+          ..description = 'Test Intervention Description A'
+          ..tasks = [
+            CheckmarkTask.withId()
+              ..title = 'Task A1'
+              ..header = 'Task A1 Description',
+          ],
+        Intervention.withId()
+          ..name = 'Test Intervention B'
+          ..description = 'Test Intervention Description B'
+          ..tasks = [
+            CheckmarkTask.withId()
+              ..title = 'Task B1'
+              ..header = 'Task B1 Description',
+          ],
+      ],
+    );
+
+    final mockQuestionnaireB = StudyUQuestionnaire()
+      ..questions = [
+        ChoiceQuestion.withId()
+          ..prompt = 'Test Question B'
+          ..rationale = ''
+          ..choices = [
+            Choice.withId()..text = 'Test Option B1',
+            Choice.withId()..text = 'Test Option B2',
+          ],
+      ];
+
+    final mockObserations = List<Observation>.of([
+      QuestionnaireTask.withId()
+        ..questions = mockQuestionnaireB
+        ..title = 'Test Survey'
+        ..header = 'Test Intro'
+        ..footer = 'Test Outro',
+    ]);
+
+    study
+      ..title = 'Publish Test Study'
+      ..description = 'Test study description'
+      // ..participation = Participation.invite
+      // ..resultSharing
+      ..contact = mockContact
+      //..iconName
+      ..status = StudyStatus.running
+      ..registryPublished = true
+      //..questionnaire = mockQuestionnaireA
+      //..eligibilityCriteria
+      //..consent
+      ..interventions = mockInterventions
+      ..observations = mockObserations;
+    //...schedule
+    //..reportSpecification
+    //..results
+    //..collaboratorEmails
+    //..registryPublished
+
+    return study;
+  }
+}
diff --git a/designer_v2/integration_test/tests/study_base_test.dart b/designer_v2/integration_test/tests/study_base_test.dart
new file mode 100644
index 000000000..b26278b42
--- /dev/null
+++ b/designer_v2/integration_test/tests/study_base_test.dart
@@ -0,0 +1,39 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:studyu_core/core.dart';
+import 'package:studyu_designer_v2/features/app.dart';
+
+import '../controller/robots/robots.dart';
+import '../controller/study_integration_controller.dart';
+
+abstract class StudyBaseTest extends StudyRobots {
+  final bool randomTest = true;
+  final Study Function() selectedMockupStudy;
+  final StudyIntegrationController controller;
+
+  StudyBaseTest.go(super.$, this.selectedMockupStudy)
+      : controller = StudyIntegrationController($, selectedMockupStudy);
+
+  Future<void> init() async {
+    final email = randomTest
+        ? '${DateTime.now().millisecondsSinceEpoch}@studyu.health'
+        : 'test@studyu.health';
+    const password = 'password';
+
+    await super.$.pumpWidgetAndSettle(
+          const ExcludeSemantics(child: ProviderScope(child: App())),
+        );
+
+    await execute(email, password);
+    await finish();
+  }
+
+  Future<void> execute(String email, String password) async {}
+
+  Future<void> finish() async {
+    expect(await controller.validateFinal(), true);
+    // todo navigate to sign out
+    //await studiesRobot.tapSignOutButton();
+  }
+}
diff --git a/designer_v2/integration_test/tests/test_1.dart b/designer_v2/integration_test/tests/test_1.dart
new file mode 100644
index 000000000..708b2b544
--- /dev/null
+++ b/designer_v2/integration_test/tests/test_1.dart
@@ -0,0 +1,82 @@
+import 'package:patrol_finders/src/custom_finders/patrol_tester.dart';
+import 'package:studyu_core/src/env/env.dart' as env;
+
+import '../mockup/mockup_studies.dart';
+import 'study_base_test.dart';
+
+class Test1 extends StudyBaseTest {
+  Test1.go(PatrolTester $) : super.go($, MockupStudies.study1);
+
+  @override
+  Future<void> execute(String email, String password) async {
+    if (randomTest) {
+      // START SIGN UP
+      await authRobot.navigateToSignUpScreen();
+      await authRobot.enterEmail(email);
+      await authRobot.enterPassword(password);
+      await authRobot.enterPasswordConfirmation(password);
+      await authRobot.tapTermsCheckbox();
+      await authRobot.tapSignUpButton();
+      await studiesRobot.tapSignOutButton();
+      // FINISH SIGN UP
+    }
+
+    // START SIGN IN
+    await authRobot.enterEmail(email);
+    await authRobot.enterPassword(password);
+    await authRobot.tapSignInButton();
+    // FINISH SIGN IN
+
+    print('User signed in');
+
+    // UserID is only available after login
+    controller.init(env.client.auth.currentUser!.id);
+
+    print("Controller created");
+
+    // START CREATE STUDY
+    await studiesRobot.tapNewStudyButton();
+
+    await controller.fillTitle();
+
+    print("Title filled");
+
+    await studyDesignRobot.tapLeftDrawerButton();
+    await studyDesignRobot.tapMyStudiesButton();
+    // FINISH CREATE STUDY
+
+    print("Study created");
+
+    // START FILL AND PUBLISH STUDY
+    // todo specify the exact study that should be tapped by name
+    await studiesRobot.tapOnExistingStudy();
+
+    await controller.fillInfoPage();
+
+    print("Info page filled");
+
+    await studyDesignRobot.navigateToParticipationScreen();
+    // todo implement participation screen tests
+
+    await studyDesignRobot.navigateToInterventionsScreen();
+
+    // Create interventions
+    await controller
+        .fillInterventions((interventionList) => [interventionList.first]);
+    await controller
+        .fillInterventions((interventionList) => [interventionList.last]);
+
+    await studyDesignRobot.navigateToMeasurementsScreen();
+
+    await controller.fillObservations((observationList) => observationList);
+
+    await studyDesignRobot.tapPublishButton();
+    await studyDesignRobot.tapConfirmPublishButton();
+    await studyDesignRobot.tapSkipForNowButton();
+    await studyDesignRobot.validateStudyPublished();
+    // FINISH FILL AND PUBLISH STUDY
+
+    await studyDesignRobot.tapLeftDrawerButton();
+    await studyDesignRobot.tapMyStudiesButton();
+  }
+}
diff --git a/designer_v2/lib/features/app_controller.dart b/designer_v2/lib/features/app_controller.dart
index 87412fa8c..ba09489a6 100644
--- a/designer_v2/lib/features/app_controller.dart
+++ b/designer_v2/lib/features/app_controller.dart
@@ -23,9 +23,6 @@ class AppController extends _$AppController {
       /// Register [IAppDelegate]s here for invocation of app lifecycle methods
       ref.watch(authRepositoryProvider),
     ];
-    ref.listenSelf((previous, next) {
-      print('AppController changed: $next');
-    });
     ref.onDispose(() {
       _stateController.close();
     });
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 4e14d4dbe..875ecf815 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -281,6 +281,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.6"
+  diff_match_patch:
+    dependency: transitive
+    description:
+      name: diff_match_patch
+      sha256: "2efc9e6e8f449d0abe15be240e2c2a3bcd977c8d126cfd70598aee60af35c0a4"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.1"
   dynamic_color:
     dependency: "direct main"
     description:
@@ -588,6 +596,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.9.0"
+  json_diff:
+    dependency: "direct dev"
+    description:
+      name: json_diff
+      sha256: "10d82dd4455109bc4dd66335db2d34b4bdf4441dc8fdd6ad6fb914395b9f9e95"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.1"
   jwt_decode:
     dependency: transitive
     description:
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 985731ab4..7cea97a46 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -49,6 +49,7 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     sdk: flutter
+  json_diff: ^0.2.1
   lint: ^2.3.0
   patrol_finders: ^2.1.2
   riverpod_generator: ^2.4.0 # flutter_test

From fe7a9645bde1aeef063a6b83cbca344804626ce1 Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahim.ozkn@outlook.com>
Date: Sun, 30 Jun 2024 13:41:53 +0200
Subject: [PATCH 244/314] fix: Incorrect type casting occurs when an
 insufficient number of characters entered to password field on the
 registration page.

---
 designer_v2/lib/features/auth/auth_form_controller.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_v2/lib/features/auth/auth_form_controller.dart b/designer_v2/lib/features/auth/auth_form_controller.dart
index 6b52d2610..31fbbfd9d 100644
--- a/designer_v2/lib/features/auth/auth_form_controller.dart
+++ b/designer_v2/lib/features/auth/auth_form_controller.dart
@@ -105,7 +105,7 @@ class AuthFormController extends _$AuthFormController
     ValidationMessage.email: (_) => tr.form_field_email_invalid,
     ValidationMessage.mustMatch: (_) => tr.form_field_password_mustmatch,
     ValidationMessage.minLength: (error) => tr.form_field_password_minlength(
-          (error as Map)['requiredLength'] as String,
+          (error as Map)['requiredLength'].toString(),
         ),
   };
 

From 938ceb33166c77b9ccfeb4f0239b3101f5b7b04d Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 30 Jun 2024 13:58:39 +0200
Subject: [PATCH 245/314] fix: delay fetching studyRepo

---
 designer_v2/lib/features/study/study_test_controller.dart | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/designer_v2/lib/features/study/study_test_controller.dart b/designer_v2/lib/features/study/study_test_controller.dart
index 4702b4efc..cd6bf76e2 100644
--- a/designer_v2/lib/features/study/study_test_controller.dart
+++ b/designer_v2/lib/features/study/study_test_controller.dart
@@ -24,7 +24,10 @@ class StudyTestController extends _$StudyTestController {
       //
       // Ideally, we would stream changes from the backend/database directly,
       // but this is a sufficient workaround for now.
-      studyRepo.fetch(studyId);
+      Future.delayed(
+        const Duration(milliseconds: 100),
+        () => studyRepo.fetch(studyId),
+      );
       print('StudyTestController.dispose');
     });
     return StudyTestControllerState(

From cbac18e4546f7e36db6828f7e975ae68314adc3f Mon Sep 17 00:00:00 2001
From: ahmed10 <ahmed10@uni-potsdam.de>
Date: Sun, 30 Jun 2024 14:21:38 +0200
Subject: [PATCH 246/314] fix: dropout logic fix

---
 designer_v2/lib/domain/study_monitoring.dart | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/designer_v2/lib/domain/study_monitoring.dart b/designer_v2/lib/domain/study_monitoring.dart
index 7d405a966..f21312ae7 100644
--- a/designer_v2/lib/domain/study_monitoring.dart
+++ b/designer_v2/lib/domain/study_monitoring.dart
@@ -193,19 +193,17 @@ extension StudyMonitoringX on Study {
           if (item.lastActivityAt.isAfter(participantInactiveDays)) {
             activeParticipants += 1; // Active
           } else {
-            inactiveParticipants += 1; // Inactive
+            if (item.lastActivityAt.isBefore(participantDropoutDays)) {
+              dropoutParticipants += 1; //dropout
+            } else {
+              inactiveParticipants += 1; // Inactive
+            }
           }
         } else {
           completedParticipants += 1; // Completed
         }
       } else {
-        if (item.currentDayOfStudy < item.studyDurationInDays) {
-          if (item.lastActivityAt.isBefore(participantDropoutDays)) {
-            dropoutParticipants += 1; // Dropout
-          }
-        } else {
-          dropoutParticipants += 1; // Dropout
-        }
+        dropoutParticipants += 1; // Dropout
       }
     }
 

From 2a0a796ea2c655336deee10ec68909fe3aac796f Mon Sep 17 00:00:00 2001
From: ahmed10 <ahmed10@uni-potsdam.de>
Date: Sun, 30 Jun 2024 14:37:06 +0200
Subject: [PATCH 247/314] fix: position order widget

---
 .../features/monitor/study_monitor_page.dart  | 58 ++++++++-----------
 1 file changed, 23 insertions(+), 35 deletions(-)

diff --git a/designer_v2/lib/features/monitor/study_monitor_page.dart b/designer_v2/lib/features/monitor/study_monitor_page.dart
index 3fce07b22..4173ce6a9 100644
--- a/designer_v2/lib/features/monitor/study_monitor_page.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_page.dart
@@ -89,51 +89,39 @@ class StudyMonitorScreen extends StudyPageWidget {
     const Color inactiveColor = Color(0xFFD55E00);
     const Color dropoutColor = Color(0xFF0072B2);
     const Color completedColor = Color(0xFF009E73);
+
     return Row(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         const Spacer(),
         SizedBox(
-          width: 420,
+          width: 400,
           child: Column(
-            mainAxisAlignment: MainAxisAlignment.end,
+            crossAxisAlignment: CrossAxisAlignment.end,
             children: [
+              Text('${tr.monitoring_total}: $total', textAlign: TextAlign.end),
+              const SizedBox(height: 10),
               Row(
-                mainAxisAlignment: MainAxisAlignment.end,
                 children: [
-                  Positioned(
-                    right: 0,
-                    top: 0,
-                    child: Text('${tr.monitoring_total}: $total'),
+                  _buildStat(
+                    percentage: activePercentage,
+                    color: activeColor,
+                    tooltip: tr.monitoring_active,
                   ),
-                ],
-              ),
-              Stack(
-                children: [
-                  Row(
-                    children: [
-                      const Spacer(),
-                      _buildStat(
-                        percentage: activePercentage,
-                        color: activeColor,
-                        tooltip: tr.monitoring_active,
-                      ),
-                      _buildStat(
-                        percentage: inactivePercentage,
-                        color: inactiveColor,
-                        tooltip: tr.monitoring_inactive,
-                      ),
-                      _buildStat(
-                        percentage: dropoutPercentage,
-                        color: dropoutColor,
-                        tooltip: tr.monitoring_dropout,
-                      ),
-                      _buildStat(
-                        percentage: completedPercentage,
-                        color: completedColor,
-                        tooltip: tr.monitoring_completed,
-                      ),
-                    ],
+                  _buildStat(
+                    percentage: inactivePercentage,
+                    color: inactiveColor,
+                    tooltip: tr.monitoring_inactive,
+                  ),
+                  _buildStat(
+                    percentage: dropoutPercentage,
+                    color: dropoutColor,
+                    tooltip: tr.monitoring_dropout,
+                  ),
+                  _buildStat(
+                    percentage: completedPercentage,
+                    color: completedColor,
+                    tooltip: tr.monitoring_completed,
                   ),
                 ],
               ),

From d92b7dcc00247ba7ab36452830bb7f345f57d5f9 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 30 Jun 2024 15:04:46 +0200
Subject: [PATCH 248/314] chore: generate

---
 designer_v2/lib/features/auth/auth_form_controller.g.dart   | 2 +-
 designer_v2/lib/features/study/study_test_controller.g.dart | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer_v2/lib/features/auth/auth_form_controller.g.dart b/designer_v2/lib/features/auth/auth_form_controller.g.dart
index d28483065..eb934157d 100644
--- a/designer_v2/lib/features/auth/auth_form_controller.g.dart
+++ b/designer_v2/lib/features/auth/auth_form_controller.g.dart
@@ -7,7 +7,7 @@ part of 'auth_form_controller.dart';
 // **************************************************************************
 
 String _$authFormControllerHash() =>
-    r'b3695b285937d7ae904911290a737e97d3e9553d';
+    r'5c21da6a6915af9ed2889e06ea6aba6c26af72d9';
 
 /// Copied from Dart SDK
 class _SystemHash {
diff --git a/designer_v2/lib/features/study/study_test_controller.g.dart b/designer_v2/lib/features/study/study_test_controller.g.dart
index aa2201051..a682becfe 100644
--- a/designer_v2/lib/features/study/study_test_controller.g.dart
+++ b/designer_v2/lib/features/study/study_test_controller.g.dart
@@ -173,7 +173,7 @@ class _StudyTestPlatformControllerProviderElement
 }
 
 String _$studyTestControllerHash() =>
-    r'04c70c8adf5371517cf9d91c02a69efb91c1e037';
+    r'de261192453a0cf58ca8fa1c996a71d09bc4778c';
 
 abstract class _$StudyTestController
     extends BuildlessAutoDisposeNotifier<StudyTestControllerState> {

From 4901eb21bd88e30b2521b7089232036b7d9e7d51 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 1 Jul 2024 18:30:32 +0200
Subject: [PATCH 249/314] chore: upgrade deps

---
 app/android/Gemfile.lock | 24 ++++++++++++------------
 app/ios/Podfile.lock     | 12 ++++++------
 app/pubspec.lock         | 20 ++++++++++----------
 app/pubspec.yaml         |  2 +-
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/app/android/Gemfile.lock b/app/android/Gemfile.lock
index daec0568f..18c97dc20 100644
--- a/app/android/Gemfile.lock
+++ b/app/android/Gemfile.lock
@@ -5,22 +5,22 @@ GEM
       base64
       nkf
       rexml
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.943.0)
-    aws-sdk-core (3.197.0)
+    aws-partitions (1.949.0)
+    aws-sdk-core (3.200.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.83.0)
-      aws-sdk-core (~> 3, >= 3.197.0)
+    aws-sdk-kms (1.87.0)
+      aws-sdk-core (~> 3, >= 3.199.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.1)
-      aws-sdk-core (~> 3, >= 3.197.0)
+    aws-sdk-s3 (1.155.0)
+      aws-sdk-core (~> 3, >= 3.199.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -68,7 +68,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.220.0)
+    fastlane (2.221.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -152,9 +152,9 @@ GEM
     httpclient (2.8.3)
     jmespath (1.6.2)
     json (2.7.2)
-    jwt (2.8.1)
+    jwt (2.8.2)
       base64
-    mini_magick (4.12.0)
+    mini_magick (4.13.1)
     mini_mime (1.1.5)
     multi_json (1.15.0)
     multipart-post (2.4.1)
@@ -164,7 +164,7 @@ GEM
     optparse (0.5.0)
     os (1.1.4)
     plist (3.7.1)
-    public_suffix (5.0.5)
+    public_suffix (6.0.0)
     rake (13.2.1)
     representable (3.2.0)
       declarative (< 0.1.0)
diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock
index 209989e65..33fa60c09 100644
--- a/app/ios/Podfile.lock
+++ b/app/ios/Podfile.lock
@@ -26,11 +26,11 @@ PODS:
   - record_darwin (1.0.0):
     - Flutter
     - FlutterMacOS
-  - Sentry/HybridSDK (8.25.2)
-  - sentry_flutter (8.2.0):
+  - Sentry/HybridSDK (8.29.0)
+  - sentry_flutter (8.3.0):
     - Flutter
     - FlutterMacOS
-    - Sentry/HybridSDK (= 8.25.2)
+    - Sentry/HybridSDK (= 8.29.0)
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -128,9 +128,9 @@ SPEC CHECKSUMS:
   package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
-  record_darwin: 1f6619f2abac4d1ca91d3eeab038c980d76f1517
-  Sentry: 51b056d96914a741f63eca774d118678b1eb05a1
-  sentry_flutter: e8397d13e297a5d4b6be8a752e33140b21c5cc97
+  record_darwin: df0a677188e5fed18472550298e675f19ddaffbe
+  Sentry: 016de45ee5ce5fca2a829996f1bfafeb5e62e8b4
+  sentry_flutter: 5fb57c5b7e6427a9dc1fedde4269eb65823982d4
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
diff --git a/app/pubspec.lock b/app/pubspec.lock
index 72fc44ad7..f26297a2d 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -354,10 +354,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: "40e6fbd2da7dcc7ed78432c5cdab1559674b4af035fddbfb2f9a8f9c2112fcef"
+      sha256: ced76d337f54de33d7d9f06092137b4ac2da5079e00cee8a11a1794ffc7c61c6
       url: "https://pub.dev"
     source: hosted
-    version: "17.1.2"
+    version: "17.2.1"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
@@ -370,10 +370,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_local_notifications_platform_interface
-      sha256: "340abf67df238f7f0ef58f4a26d2a83e1ab74c77ab03cd2b2d5018ac64db30b7"
+      sha256: "85f8d07fe708c1bdcf45037f2c0109753b26ae077e9d9e899d55971711a4ea66"
       url: "https://pub.dev"
     source: hosted
-    version: "7.1.0"
+    version: "7.2.0"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -1001,10 +1001,10 @@ packages:
     dependency: transitive
     description:
       name: record_linux
-      sha256: "7d0e70cd51635128fe9d37d89bafd6011d7cbba9af8dc323079ae60f23546aef"
+      sha256: "74d41a9ebb1eb498a38e9a813dd524e8f0b4fdd627270bda9756f437b110a3e3"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.1"
+    version: "0.7.2"
   record_platform_interface:
     dependency: transitive
     description:
@@ -1404,18 +1404,18 @@ packages:
     dependency: transitive
     description:
       name: video_player
-      sha256: aced48e701e24c02b0b7f881a8819e4937794e46b5a5821005e2bf3b40a324cc
+      sha256: e30df0d226c4ef82e2c150ebf6834b3522cf3f654d8e2f9419d376cdc071425d
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.7"
+    version: "2.9.1"
   video_player_android:
     dependency: transitive
     description:
       name: video_player_android
-      sha256: "9529001630e42988f755772972d5014d30121610700e8e502278a245939f8fc8"
+      sha256: "3ff2da7e5a9274bef9b5deb9084f73a77920211c463e0e836361b14146e67339"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.5.1"
   video_player_avfoundation:
     dependency: transitive
     description:
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index f844b317b..ca9e77f55 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -17,7 +17,7 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_file_dialog: ^3.0.2
-  flutter_local_notifications: ^17.1.2
+  flutter_local_notifications: ^17.2.1
   flutter_localizations:
     sdk: flutter
   flutter_timezone: ^1.0.8

From e9bcb31367793e18a2612d1f0d5b264255354853 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 1 Jul 2024 18:32:49 +0200
Subject: [PATCH 250/314] chore(release): publish packages

 - studyu_app@2.7.6-dev.3
 - studyu_core@4.4.3-dev.2
 - studyu_designer_v2@1.8.1-dev.3
 - studyu_flutter_common@1.8.4-dev.2
---
 CHANGELOG.md                | 112 ++++++++++++++++++++++++++++++++++++
 app/CHANGELOG.md            |  14 +++++
 app/pubspec.yaml            |   6 +-
 core/CHANGELOG.md           |  13 +++++
 core/pubspec.yaml           |   2 +-
 designer_v2/CHANGELOG.md    |  59 +++++++++++++++++++
 designer_v2/pubspec.yaml    |   6 +-
 flutter_common/CHANGELOG.md |   6 ++
 flutter_common/pubspec.yaml |   4 +-
 9 files changed, 213 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dcb3ad06..355173969 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,118 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2024-07-01
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`studyu_app` - `v2.7.6-dev.3`](#studyu_app---v276-dev3)
+ - [`studyu_core` - `v4.4.3-dev.2`](#studyu_core---v443-dev2)
+ - [`studyu_designer_v2` - `v1.8.1-dev.3`](#studyu_designer_v2---v181-dev3)
+ - [`studyu_flutter_common` - `v1.8.4-dev.2`](#studyu_flutter_common---v184-dev2)
+
+---
+
+#### `studyu_app` - `v2.7.6-dev.3`
+
+ - **REFACTOR**: migrate to riverpod code generation 2.
+ - **FIX**: app preview stuck at AppLanguage.
+ - **FIX**: formatting issues.
+ - **FIX**: formatting issues.
+ - **FIX**: users not able to continue closed study.
+ - **FIX**(app): update ios deployment.
+ - **FIX**(app): update android deployment.
+ - **FIX**: upgrade deps.
+ - **FEAT**: deprecate published for study_status.
+ - **FEAT**: close study using is_closed column.
+ - **FEAT**: close study.
+
+#### `studyu_core` - `v4.4.3-dev.2`
+
+ - **FIX**: keep eligibility criterion.
+ - **FIX**: empty description init value.
+ - **FIX**: formatting issues.
+ - **FIX**: formatting issues.
+ - **FIX**: migrate app to status.
+ - **FIX**: users not able to continue closed study.
+ - **FIX**: upgrade deps.
+ - **FEAT**: deprecate published for study_status.
+ - **FEAT**: close study using is_closed column.
+ - **FEAT**: close study.
+
+#### `studyu_designer_v2` - `v1.8.1-dev.3`
+
+ - **REFACTOR**: migrated auth_form_controller.dart to riverpod v2.
+ - **REFACTOR**: migrate to riverpod code generation 2.
+ - **REFACTOR**: update designer study data after test controller is disposed.
+ - **REFACTOR**: migrate StudySettingsFormViewModel Provider.
+ - **REFACTOR**: migrate appConfig FutureProvider.
+ - **REFACTOR**: migrated dashboard_controller.dart to riverpod v2.
+ - **REFACTOR**: migrate to riverpod code generation.
+ - **PERF**: remove await for onSave.
+ - **PERF**: replace read with watch.
+ - **FIX**: test frame live preview.
+ - **FIX**: keep eligibility criterion.
+ - **FIX**: disable reactive for enrollment radio tile".
+ - **FIX**: disable reactive for enrollment radio tile.
+ - **FIX**: migrate iFrameElement.
+ - **FIX**: Incorrect type casting occurs when an insufficient number of characters entered to password field on the registration page.
+ - **FIX**: do not autosave on formarray".
+ - **FIX**: do not autosave on formarray.
+ - **FIX**: enable atLeastOneTask for intervention again.
+ - **FIX**: delay fetching studyRepo.
+ - **FIX**: type.
+ - **FIX**: catch invite code not existing and better APIException output.
+ - **FIX**: disable reactive for schedule intervention screen.
+ - **FIX**: disable reactive for enrollment radio tile.
+ - **FIX**: empty description init value.
+ - **FIX**: migrate close study feature.
+ - **FIX**: cannot use ref before provider rebuilt.
+ - **FIX**: explicitly type formcontrol when adding multiple choice field.
+ - **FIX**: dashbaord user load once.
+ - **FIX**: study controller no longer extends study base controller due to riverpod v2.
+ - **FIX**: initialization route and splash page.
+ - **FIX**: merge dev fixes.
+ - **FIX**: missing intervention and measurement data when study is being duplicated.
+ - **FIX**: Flutter 3.22 arg error.
+ - **FIX**: translate study schedule.
+ - **FIX**: add closed success description.
+ - **FIX**: only show close button for editors.
+ - **FIX**: Login/register notifications (wrong password, etc.) are not showing.
+ - **FIX**: potential isClosed error.
+ - **FIX**: merge dashboard refactor pr.
+ - **FIX**: add compatibility for emoji font with flutter >= 3.22.
+ - **FIX**: upgrade deps.
+ - **FIX**: let autosave not listen to formarray anymore.
+ - **FIX**: check if canPop.
+ - **FIX**: typo / grammar.
+ - **FIX**: integration test sign out.
+ - **FIX**: do not show separator if no delete item shown.
+ - **FIX**: add emojis again.
+ - **FEAT**: close study.
+ - **FEAT**: fix duplicate and designer updates for study closing.
+ - **FEAT**: small fixes for study closing.
+ - **FEAT**: add separators to model action popup.
+ - **FEAT**: deprecate published for study_status.
+ - **FEAT**: study close button.
+ - **FEAT**: new severe close confirmation.
+ - **FEAT**: close study using is_closed column.
+ - **DOCS**: add function documentation.
+
+#### `studyu_flutter_common` - `v1.8.4-dev.2`
+
+ - **FIX**: formatting issues.
+ - **FIX**: formatting issues.
+ - **FIX**: upgrade deps.
+
+
 ## 2024-06-12
 
 ### Changes
diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md
index 7530e8eea..01c444077 100644
--- a/app/CHANGELOG.md
+++ b/app/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 2.7.6-dev.3
+
+ - **REFACTOR**: migrate to riverpod code generation 2.
+ - **FIX**: app preview stuck at AppLanguage.
+ - **FIX**: formatting issues.
+ - **FIX**: formatting issues.
+ - **FIX**: users not able to continue closed study.
+ - **FIX**(app): update ios deployment.
+ - **FIX**(app): update android deployment.
+ - **FIX**: upgrade deps.
+ - **FEAT**: deprecate published for study_status.
+ - **FEAT**: close study using is_closed column.
+ - **FEAT**: close study.
+
 ## 2.7.6-dev.2
 
  - **FIX**: formatting issues.
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index ca9e77f55..7f0998b50 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_app
-version: 2.7.6-dev.2
+version: 2.7.6-dev.3
 description: Partake in digital N-of-1 trials with the innovative StudyU Health App
 publish_to: none
 homepage: https://studyu.health
@@ -39,8 +39,8 @@ dependencies:
   sentry_flutter: ^8.3.0
   sentry_logging: ^8.3.0
   shared_preferences: ^2.2.3
-  studyu_core: ^4.4.3-dev.1
-  studyu_flutter_common: ^1.8.4-dev.1
+  studyu_core: ^4.4.3-dev.2
+  studyu_flutter_common: ^1.8.4-dev.2
   supabase: ^2.2.2
   supabase_flutter: ^2.5.6
   timeline_tile: ^2.0.0
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 7ab7608e7..342eeb886 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 4.4.3-dev.2
+
+ - **FIX**: keep eligibility criterion.
+ - **FIX**: empty description init value.
+ - **FIX**: formatting issues.
+ - **FIX**: formatting issues.
+ - **FIX**: migrate app to status.
+ - **FIX**: users not able to continue closed study.
+ - **FIX**: upgrade deps.
+ - **FEAT**: deprecate published for study_status.
+ - **FEAT**: close study using is_closed column.
+ - **FEAT**: close study.
+
 ## 4.4.3-dev.1
 
  - **PERF**: improve dashboard study fetching.
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index b98057f99..7603db1e7 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_core
-version: 4.4.3-dev.1
+version: 4.4.3-dev.2
 description: This package contains StudyU models and common functions for the app and designer packages
 homepage: https://studyu.health
 repository: https://github.com/hpi-studyu/studyu
diff --git a/designer_v2/CHANGELOG.md b/designer_v2/CHANGELOG.md
index 290a2e136..70e092164 100644
--- a/designer_v2/CHANGELOG.md
+++ b/designer_v2/CHANGELOG.md
@@ -1,3 +1,62 @@
+## 1.8.1-dev.3
+
+ - **REFACTOR**: migrated auth_form_controller.dart to riverpod v2.
+ - **REFACTOR**: migrate to riverpod code generation 2.
+ - **REFACTOR**: update designer study data after test controller is disposed.
+ - **REFACTOR**: migrate StudySettingsFormViewModel Provider.
+ - **REFACTOR**: migrate appConfig FutureProvider.
+ - **REFACTOR**: migrated dashboard_controller.dart to riverpod v2.
+ - **REFACTOR**: migrate to riverpod code generation.
+ - **PERF**: remove await for onSave.
+ - **PERF**: replace read with watch.
+ - **FIX**: test frame live preview.
+ - **FIX**: keep eligibility criterion.
+ - **FIX**: disable reactive for enrollment radio tile".
+ - **FIX**: disable reactive for enrollment radio tile.
+ - **FIX**: migrate iFrameElement.
+ - **FIX**: Incorrect type casting occurs when an insufficient number of characters entered to password field on the registration page.
+ - **FIX**: do not autosave on formarray".
+ - **FIX**: do not autosave on formarray.
+ - **FIX**: enable atLeastOneTask for intervention again.
+ - **FIX**: delay fetching studyRepo.
+ - **FIX**: type.
+ - **FIX**: catch invite code not existing and better APIException output.
+ - **FIX**: disable reactive for schedule intervention screen.
+ - **FIX**: disable reactive for enrollment radio tile.
+ - **FIX**: empty description init value.
+ - **FIX**: migrate close study feature.
+ - **FIX**: cannot use ref before provider rebuilt.
+ - **FIX**: explicitly type formcontrol when adding multiple choice field.
+ - **FIX**: dashbaord user load once.
+ - **FIX**: study controller no longer extends study base controller due to riverpod v2.
+ - **FIX**: initialization route and splash page.
+ - **FIX**: merge dev fixes.
+ - **FIX**: missing intervention and measurement data when study is being duplicated.
+ - **FIX**: Flutter 3.22 arg error.
+ - **FIX**: translate study schedule.
+ - **FIX**: add closed success description.
+ - **FIX**: only show close button for editors.
+ - **FIX**: Login/register notifications (wrong password, etc.) are not showing.
+ - **FIX**: potential isClosed error.
+ - **FIX**: merge dashboard refactor pr.
+ - **FIX**: add compatibility for emoji font with flutter >= 3.22.
+ - **FIX**: upgrade deps.
+ - **FIX**: let autosave not listen to formarray anymore.
+ - **FIX**: check if canPop.
+ - **FIX**: typo / grammar.
+ - **FIX**: integration test sign out.
+ - **FIX**: do not show separator if no delete item shown.
+ - **FIX**: add emojis again.
+ - **FEAT**: close study.
+ - **FEAT**: fix duplicate and designer updates for study closing.
+ - **FEAT**: small fixes for study closing.
+ - **FEAT**: add separators to model action popup.
+ - **FEAT**: deprecate published for study_status.
+ - **FEAT**: study close button.
+ - **FEAT**: new severe close confirmation.
+ - **FEAT**: close study using is_closed column.
+ - **DOCS**: add function documentation.
+
 ## 1.8.1-dev.2
 
  - **PERF**: added comments to the getUserStudies function.
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 7cea97a46..a36947ba1 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_designer_v2
-version: 1.8.1-dev.2
+version: 1.8.1-dev.3
 description: Implement digital N-of-1 studies seamlessly with the StudyU Health Designer
 publish_to: none
 homepage: https://studyu.health
@@ -33,8 +33,8 @@ dependencies:
   reactive_range_slider: ^2.1.0
   riverpod_annotation: ^2.3.5
   rxdart: ^0.27.7 # custom_lint 0.6.4
-  studyu_core: ^4.4.3-dev.1
-  studyu_flutter_common: ^1.8.4-dev.1
+  studyu_core: ^4.4.3-dev.2
+  studyu_flutter_common: ^1.8.4-dev.2
   supabase: ^2.2.2
   supabase_flutter: ^2.5.6
   url_launcher: ^6.3.0
diff --git a/flutter_common/CHANGELOG.md b/flutter_common/CHANGELOG.md
index 8270fbf4e..0dae1fb3b 100644
--- a/flutter_common/CHANGELOG.md
+++ b/flutter_common/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.8.4-dev.2
+
+ - **FIX**: formatting issues.
+ - **FIX**: formatting issues.
+ - **FIX**: upgrade deps.
+
 ## 1.8.4-dev.1
 
  - **FIX**: formatting issues.
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index 93b446f2b..85bc98819 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_flutter_common
-version: 1.8.4-dev.1
+version: 1.8.4-dev.2
 description: StudyU common flutter components and functions for app and designer
 homepage: https://studyu.health
 repository: https://github.com/hpi-studyu/studyu
@@ -14,7 +14,7 @@ dependencies:
   flutter_secure_storage: ^9.2.2
   lint: ^2.3.0
   shared_preferences: ^2.2.3 # Can be removed after migrating phase
-  studyu_core: ^4.4.3-dev.1
+  studyu_core: ^4.4.3-dev.2
   supabase_flutter: ^2.5.6
   synchronized: ^3.1.0+1
   uuid: ^4.4.0

From 37a0941ad630c127d926bae8d68d4ef93cb1521f Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 1 Jul 2024 18:38:43 +0200
Subject: [PATCH 251/314] chore: lockfiles

---
 app/pubspec.lock            | 4 ++--
 designer_v2/pubspec.lock    | 4 ++--
 flutter_common/pubspec.lock | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index f26297a2d..ba6ff4173 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -1208,14 +1208,14 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.3-dev.1"
+    version: "4.4.3-dev.2"
   studyu_flutter_common:
     dependency: "direct main"
     description:
       path: "../flutter_common"
       relative: true
     source: path
-    version: "1.8.4-dev.1"
+    version: "1.8.4-dev.2"
   supabase:
     dependency: "direct main"
     description:
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 875ecf815..5d2486f58 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -1191,14 +1191,14 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.3-dev.1"
+    version: "4.4.3-dev.2"
   studyu_flutter_common:
     dependency: "direct main"
     description:
       path: "../flutter_common"
       relative: true
     source: path
-    version: "1.8.4-dev.1"
+    version: "1.8.4-dev.2"
   supabase:
     dependency: "direct main"
     description:
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index 8babe5315..bdd3c69c8 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -579,7 +579,7 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.3-dev.1"
+    version: "4.4.3-dev.2"
   supabase:
     dependency: transitive
     description:

From 948055d6c1a18bd14ef36879ba07890cf395a9a7 Mon Sep 17 00:00:00 2001
From: ahmed10 <ahmed10@uni-potsdam.de>
Date: Tue, 2 Jul 2024 00:06:52 +0200
Subject: [PATCH 252/314] fix: merge conflict

---
 designer_v2/pubspec.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index e43551eed..6c2323d9d 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -565,7 +565,7 @@ packages:
     source: sdk
     version: "0.0.0"
   intl:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: intl
       sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf

From f8627f599d8e999dbc634f78ffd48c8166433a47 Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Wed, 3 Jul 2024 22:04:19 +0200
Subject: [PATCH 253/314] feat: group by intervention phase

---
 .../models/study_schedule/study_schedule.dart |   2 +
 .../monitor/participant_details_view.dart     | 133 +++++++++++++-----
 2 files changed, 103 insertions(+), 32 deletions(-)

diff --git a/core/lib/src/models/study_schedule/study_schedule.dart b/core/lib/src/models/study_schedule/study_schedule.dart
index 85ae581b0..615d9363c 100644
--- a/core/lib/src/models/study_schedule/study_schedule.dart
+++ b/core/lib/src/models/study_schedule/study_schedule.dart
@@ -26,6 +26,8 @@ class StudySchedule {
 
   int get length => getNumberOfPhases() * phaseDuration;
 
+  int get baselineLength => includeBaseline ? phaseDuration : 0;
+
   List<int> generateWith(int firstIntervention) {
     final cycles = Iterable<int>.generate(numberOfCycles);
     final phases = cycles
diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index 1c320425b..9761b4999 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -78,43 +78,105 @@ class ParticipantDetailsView extends ConsumerWidget {
   }
 
   Widget _buildPerDayStatus() {
+    final studySchedule = StudySchedule();
+    final int totalCompletedDays = monitorItem.missedTasksPerDay.length;
+
+    final phases = <StudyPhase>[];
+
+    if (studySchedule.includeBaseline) {
+      phases.add(StudyPhase(
+          name: 'Baseline',
+          missedTasksPerDay: monitorItem.missedTasksPerDay.sublist(
+              0,
+              totalCompletedDays > studySchedule.baselineLength
+                  ? studySchedule.baselineLength
+                  : totalCompletedDays)));
+    }
+
+    final String sequence = studySchedule.nameOfSequence;
+
+    for (var i = 0; i < studySchedule.numberOfCycles * 2; i++) {
+      final int phaseDuration = studySchedule.phaseDuration;
+      final bool includeBaseline = studySchedule.includeBaseline;
+      final int baselineAdjustmentStart =
+          includeBaseline ? (i + 1) * phaseDuration : i * phaseDuration;
+      final int baselineAdjustmentEnd =
+          includeBaseline ? (i + 2) * phaseDuration : (i + 1) * phaseDuration;
+
+      if (baselineAdjustmentStart >= totalCompletedDays) break;
+
+      final int start = totalCompletedDays > baselineAdjustmentStart
+          ? baselineAdjustmentStart
+          : totalCompletedDays;
+
+      final int end = totalCompletedDays > baselineAdjustmentEnd
+          ? baselineAdjustmentEnd
+          : totalCompletedDays;
+
+      final String interventionName =
+          sequence[i] == "A" ? interventions[0].name! : interventions[1].name!;
+
+      phases.add(StudyPhase(
+          name: interventionName,
+          missedTasksPerDay:
+              monitorItem.missedTasksPerDay.sublist(start, end)));
+    }
+
     assert(
       monitorItem.missedTasksPerDay.length ==
           monitorItem.completedTasksPerDay.length,
     );
-    return Wrap(
-      children: monitorItem.missedTasksPerDay
-          .mapIndexed(
-            (index, missed) => Tooltip(
-              message: _getTooltipText(
-                missed,
-                monitorItem.completedTasksPerDay[index],
-              ),
-              child: Container(
-                height: 50,
-                width: 50,
-                margin: const EdgeInsets.fromLTRB(0, 0, 8, 8),
-                decoration: BoxDecoration(
-                  color: missed.isEmpty
-                      ? Colors.green
-                      : (monitorItem.completedTasksPerDay[index].isEmpty
-                          ? Colors.red
-                          : Colors.orange),
-                  borderRadius: BorderRadius.circular(8),
-                ),
-                child: Center(
-                  child: Text(
-                    (index + 1).toString(),
-                    style: const TextStyle(
-                      color: Colors.white,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ),
-              ),
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: phases.mapIndexed((phaseIndex, phase) {
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              phase.name,
+              style: const TextStyle(fontWeight: FontWeight.bold),
+            ),
+            Wrap(
+              children: phase.missedTasksPerDay
+                  .mapIndexed((index, missed) => _buildSquare(index, missed,
+                      (phaseIndex * studySchedule.phaseDuration) + index + 1))
+                  .toList(),
             ),
-          )
-          .toList(),
+            const SizedBox(height: 10),
+          ],
+        );
+      }).toList(),
+    );
+  }
+
+  Widget _buildSquare(int index, Set<String> missed, int numberOfTheDay) {
+    return Tooltip(
+      message: _getTooltipText(
+        missed,
+        monitorItem.completedTasksPerDay[index],
+      ),
+      child: Container(
+        height: 50,
+        width: 50,
+        margin: const EdgeInsets.fromLTRB(0, 0, 8, 8),
+        decoration: BoxDecoration(
+          color: missed.isEmpty
+              ? Colors.green
+              : (monitorItem.completedTasksPerDay[index].isEmpty
+                  ? Colors.red
+                  : Colors.orange),
+          borderRadius: BorderRadius.circular(8),
+        ),
+        child: Center(
+          child: Text(
+            numberOfTheDay.toString(),
+            style: const TextStyle(
+              color: Colors.white,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+        ),
+      ),
     );
   }
 
@@ -190,3 +252,10 @@ class ParticipantDetailsView extends ConsumerWidget {
     );
   }
 }
+
+class StudyPhase {
+  final String name;
+  final List<Set<String>> missedTasksPerDay;
+
+  StudyPhase({required this.name, required this.missedTasksPerDay});
+}

From 59d5b95e88ffc66eb5fb8954f70edff7423dc3c5 Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Wed, 3 Jul 2024 22:17:26 +0200
Subject: [PATCH 254/314] fix: colorblind friendly color

---
 .../monitor/participant_details_view.dart       | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index 9761b4999..d49093ed2 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -19,6 +19,10 @@ class ParticipantDetailsView extends ConsumerWidget {
   final List<Intervention> interventions;
   final List<Observation> observations;
 
+  static const Color incompleteColor = Color(0xFFD55E00);
+    static const Color partiallyComplete = Color(0xFF0072B2);
+    static const Color completeColor = Color(0xFF009E73);
+
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final languageCode = ref.watch(localeProvider).languageCode;
@@ -150,6 +154,7 @@ class ParticipantDetailsView extends ConsumerWidget {
   }
 
   Widget _buildSquare(int index, Set<String> missed, int numberOfTheDay) {
+     
     return Tooltip(
       message: _getTooltipText(
         missed,
@@ -161,10 +166,10 @@ class ParticipantDetailsView extends ConsumerWidget {
         margin: const EdgeInsets.fromLTRB(0, 0, 8, 8),
         decoration: BoxDecoration(
           color: missed.isEmpty
-              ? Colors.green
+              ? completeColor
               : (monitorItem.completedTasksPerDay[index].isEmpty
-                  ? Colors.red
-                  : Colors.orange),
+                  ? incompleteColor
+                  : partiallyComplete),
           borderRadius: BorderRadius.circular(8),
         ),
         child: Center(
@@ -216,17 +221,17 @@ class ParticipantDetailsView extends ConsumerWidget {
         Row(
           children: [
             _buildLegendItem(
-              Colors.green,
+              completeColor,
               tr.participant_details_color_legend_completed,
             ),
             const SizedBox(width: 16.0),
             _buildLegendItem(
-              Colors.orange,
+              partiallyComplete,
               tr.participant_details_color_legend_partially_completed,
             ),
             const SizedBox(width: 16.0),
             _buildLegendItem(
-              Colors.red,
+              incompleteColor,
               tr.participant_details_color_legend_missed,
             ),
           ],

From b8ecad36c406791060890f8ba039d2906831eb65 Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Wed, 3 Jul 2024 22:18:28 +0200
Subject: [PATCH 255/314] chore: format

---
 .../lib/features/monitor/participant_details_view.dart       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index d49093ed2..44a285c30 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -20,8 +20,8 @@ class ParticipantDetailsView extends ConsumerWidget {
   final List<Observation> observations;
 
   static const Color incompleteColor = Color(0xFFD55E00);
-    static const Color partiallyComplete = Color(0xFF0072B2);
-    static const Color completeColor = Color(0xFF009E73);
+  static const Color partiallyComplete = Color(0xFF0072B2);
+  static const Color completeColor = Color(0xFF009E73);
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -154,7 +154,6 @@ class ParticipantDetailsView extends ConsumerWidget {
   }
 
   Widget _buildSquare(int index, Set<String> missed, int numberOfTheDay) {
-     
     return Tooltip(
       message: _getTooltipText(
         missed,

From 70d77e984a13bc3a85c40aba1068e101894053bd Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Sat, 6 Jul 2024 01:47:56 +0200
Subject: [PATCH 256/314] fix: box changed to paterns

---
 .../monitor/participant_details_view.dart     | 47 +++++++++++++------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index 44a285c30..e15912962 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -19,9 +19,9 @@ class ParticipantDetailsView extends ConsumerWidget {
   final List<Intervention> interventions;
   final List<Observation> observations;
 
-  static const Color incompleteColor = Color(0xFFD55E00);
-  static const Color partiallyComplete = Color(0xFF0072B2);
-  static const Color completeColor = Color(0xFF009E73);
+  static const Color incompleteColor = Color.fromARGB(255, 234, 234, 234);
+  static const Color partiallyComplete = Color.fromARGB(255, 93, 145, 238);
+  static const Color completeColor = Color.fromARGB(255, 10, 153, 255);
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -168,15 +168,20 @@ class ParticipantDetailsView extends ConsumerWidget {
               ? completeColor
               : (monitorItem.completedTasksPerDay[index].isEmpty
                   ? incompleteColor
-                  : partiallyComplete),
+                  : null), // Set color to null when using gradient
+          gradient:
+              monitorItem.completedTasksPerDay[index].isEmpty || missed.isEmpty
+                  ? null
+                  : _buildGradient(),
           borderRadius: BorderRadius.circular(8),
         ),
         child: Center(
           child: Text(
             numberOfTheDay.toString(),
-            style: const TextStyle(
-              color: Colors.white,
+            style: TextStyle(
+              color: missed.isEmpty ? Colors.white : Colors.black,
               fontWeight: FontWeight.bold,
+              fontSize: 20
             ),
           ),
         ),
@@ -224,10 +229,9 @@ class ParticipantDetailsView extends ConsumerWidget {
               tr.participant_details_color_legend_completed,
             ),
             const SizedBox(width: 16.0),
-            _buildLegendItem(
-              partiallyComplete,
-              tr.participant_details_color_legend_partially_completed,
-            ),
+            _buildLegendItem(partiallyComplete,
+                tr.participant_details_color_legend_partially_completed,
+                gradient: true),
             const SizedBox(width: 16.0),
             _buildLegendItem(
               incompleteColor,
@@ -239,22 +243,37 @@ class ParticipantDetailsView extends ConsumerWidget {
     );
   }
 
-  Widget _buildLegendItem(Color color, String text) {
+  Widget _buildLegendItem(Color color, String text, {bool gradient = false}) {
     return Row(
       children: [
         Container(
           width: 20.0,
           height: 20.0,
           decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(3),
-            color: color,
-          ),
+              borderRadius: BorderRadius.circular(3),
+              color: color,
+              gradient: gradient ? _buildGradient() :null ),
         ),
         const SizedBox(width: 8.0),
         Text(text),
       ],
     );
   }
+
+  LinearGradient _buildGradient() {
+    return const LinearGradient(
+      begin: Alignment.topRight,
+      end: Alignment(0.5, -0.4),
+      stops: [0.0, 0.5, 0.5, 1],
+      colors: [
+        partiallyComplete,
+        partiallyComplete,
+        incompleteColor,
+        incompleteColor,
+      ],
+      tileMode: TileMode.repeated,
+    );
+  }
 }
 
 class StudyPhase {

From d017e7ae9071f986d946acd6aec9036a67e9f3f5 Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Sat, 6 Jul 2024 01:51:25 +0200
Subject: [PATCH 257/314] fix: vertical height adjustment

---
 designer_v2/lib/features/monitor/participant_details_view.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index e15912962..7f9f82d93 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -140,6 +140,7 @@ class ParticipantDetailsView extends ConsumerWidget {
               phase.name,
               style: const TextStyle(fontWeight: FontWeight.bold),
             ),
+            const SizedBox(height: 5,),
             Wrap(
               children: phase.missedTasksPerDay
                   .mapIndexed((index, missed) => _buildSquare(index, missed,

From 1821be9f0488315490b45a372dd183a73c36eb97 Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Sat, 6 Jul 2024 02:16:48 +0200
Subject: [PATCH 258/314] feat: add tooltip message to the legends

---
 .../monitor/participant_details_view.dart     | 59 +++++++++++--------
 designer_v2/lib/localization/app_de.arb       |  3 +
 designer_v2/lib/localization/app_en.arb       |  3 +
 3 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index 7f9f82d93..b0b5bd220 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -140,7 +140,9 @@ class ParticipantDetailsView extends ConsumerWidget {
               phase.name,
               style: const TextStyle(fontWeight: FontWeight.bold),
             ),
-            const SizedBox(height: 5,),
+            const SizedBox(
+              height: 5,
+            ),
             Wrap(
               children: phase.missedTasksPerDay
                   .mapIndexed((index, missed) => _buildSquare(index, missed,
@@ -180,10 +182,9 @@ class ParticipantDetailsView extends ConsumerWidget {
           child: Text(
             numberOfTheDay.toString(),
             style: TextStyle(
-              color: missed.isEmpty ? Colors.white : Colors.black,
-              fontWeight: FontWeight.bold,
-              fontSize: 20
-            ),
+                color: missed.isEmpty ? Colors.white : Colors.black,
+                fontWeight: FontWeight.bold,
+                fontSize: 20),
           ),
         ),
       ),
@@ -226,38 +227,44 @@ class ParticipantDetailsView extends ConsumerWidget {
         Row(
           children: [
             _buildLegendItem(
-              completeColor,
-              tr.participant_details_color_legend_completed,
-            ),
+                completeColor,
+                tr.participant_details_color_legend_completed,
+                tr.participant_details_partially_completed_legend_tooltip),
             const SizedBox(width: 16.0),
-            _buildLegendItem(partiallyComplete,
+            _buildLegendItem(
+                partiallyComplete,
                 tr.participant_details_color_legend_partially_completed,
+                tr.participant_details_partially_completed_legend_tooltip,
                 gradient: true),
             const SizedBox(width: 16.0),
             _buildLegendItem(
-              incompleteColor,
-              tr.participant_details_color_legend_missed,
-            ),
+                incompleteColor,
+                tr.participant_details_color_legend_missed,
+                tr.participant_details_incomplete_legend_tooltip),
           ],
         ),
       ],
     );
   }
 
-  Widget _buildLegendItem(Color color, String text, {bool gradient = false}) {
-    return Row(
-      children: [
-        Container(
-          width: 20.0,
-          height: 20.0,
-          decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(3),
-              color: color,
-              gradient: gradient ? _buildGradient() :null ),
-        ),
-        const SizedBox(width: 8.0),
-        Text(text),
-      ],
+  Widget _buildLegendItem(Color color, String text, String tooltipMessage,
+      {bool gradient = false}) {
+    return Tooltip(
+      message: tooltipMessage,
+      child: Row(
+        children: [
+          Container(
+            width: 20.0,
+            height: 20.0,
+            decoration: BoxDecoration(
+                borderRadius: BorderRadius.circular(3),
+                color: color,
+                gradient: gradient ? _buildGradient() : null),
+          ),
+          const SizedBox(width: 8.0),
+          Text(text),
+        ],
+      ),
     );
   }
 
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index 85ca1b134..8dfdf9897 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -499,6 +499,9 @@
   "participant_details_color_legend_completed": "Abgeschlossen",
   "participant_details_color_legend_partially_completed": "Teilweise abgeschlossen",
   "participant_details_color_legend_missed": "Verpasst",
+  "participant_details_completed_legend_tooltip": "Alle Aufgaben (einschließlich Intervention und Umfragen) sind erledigt",
+  "participant_details_partially_completed_legend_tooltip": "Einige Aufgaben (Interventionen und/oder Umfragen) werden erledigt",
+  "participant_details_incomplete_legend_tooltip": "Es wurden keine Aufgaben (Interventionen oder Umfragen) abgeschlossen",
   "monitoring_no_participants_title": "Es gibt noch keine Teilnehmer in dieser Studie",
   "monitoring_no_participants_description": "Sobald Teilnehmer in Ihrer Studie eingeschrieben sind, können Sie hier deren Fortschritt überwachen und ihre Daten einsehen.",
   "monitoring_participants_title": "Teilnehmer",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index 88c885e25..83ef81694 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -546,6 +546,9 @@
   "participant_details_color_legend_completed": "Completed",
   "participant_details_color_legend_partially_completed": "Partially completed",
   "participant_details_color_legend_missed": "Missed",
+  "participant_details_completed_legend_tooltip": "All tasks (including intervention and surveys) are done",
+  "participant_details_partially_completed_legend_tooltip": "Some tasks (interventions and/or surveys) are done",
+  "participant_details_incomplete_legend_tooltip": "No tasks (interventions or surveys) are completed",
   "monitoring_no_participants_title": "There are no participants in this study yet",
   "monitoring_no_participants_description": "Once participants have enrolled in your study, you can monitor their progress and view their data here.",
   "monitoring_participants_title": "Participants",

From 0c3bd72e66ed573af2738cf8a819b7769cf83c68 Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahim.ozkn@outlook.com>
Date: Mon, 8 Jul 2024 00:34:30 +0200
Subject: [PATCH 259/314] fix: make free text field optional

---
 .../questionnaire/questions/free_text_question_widget.dart   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/lib/widgets/questionnaire/questions/free_text_question_widget.dart b/app/lib/widgets/questionnaire/questions/free_text_question_widget.dart
index cf5a71d6c..afddf5bfc 100644
--- a/app/lib/widgets/questionnaire/questions/free_text_question_widget.dart
+++ b/app/lib/widgets/questionnaire/questions/free_text_question_widget.dart
@@ -24,6 +24,11 @@ class _FreeTextQuestionWidgetState extends State<FreeTextQuestionWidget> {
   @override
   void initState() {
     super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (widget.question.lengthRange[0] == 0) {
+        widget.onDone!(widget.question.constructAnswer(""));
+      }
+    });
   }
 
   @override

From 3abe7daa2dc53b1644430bd37236dd8ca36725f8 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 8 Jul 2024 20:19:37 +0200
Subject: [PATCH 260/314] fix: translation

---
 designer_v2/lib/localization/app_en.arb | 30 ++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index 83ef81694..393a59775 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -70,9 +70,9 @@
   "study_status_closed": "Closed",
   "study_status_closed_description": "This study has been completed.\nNew participants can no longer enroll.",
   "participation_open_who": "Everyone",
-  "participation_open_who_description": "All StudyU users may enroll to the study in the StudyU app.",
+  "participation_open_who_description": "All StudyU users may enroll to the study in the StudyU App.",
   "participation_invite_who": "Invite-only",
-  "participation_invite_who_description": "Only participants with an access code can enroll in the StudyU app.",
+  "participation_invite_who_description": "Only participants with an access code can enroll in the StudyU App.",
   "participation_open_as_adjective": "open to everyone",
   "participation_invite_as_adjective": "invite-only",
   "participation_open_launch_description": "Once launched, all users of the StudyU platform can enroll in your study as long as they meet your screening criteria.",
@@ -251,7 +251,7 @@
   "form_section_scheduling": "Scheduling and Compliance",
   "form_section_scheduling_description": "To improve compliance, you can set a limited window of time for participants to complete the task & send a reminder notification at the specified time.",
   "form_field_has_reminder": "App reminder",
-  "form_field_has_reminder_tooltip": "Select this option to send a reminder notification from the StudyU app to the participant's phone at the time specified.",
+  "form_field_has_reminder_tooltip": "Select this option to send a reminder notification from the StudyU App to the participant's phone at the time specified.",
   "form_field_has_reminder_label": "Send notification",
   "form_field_time_of_day_hint": "hh:mm",
   "form_field_time_restriction": "Time restriction",
@@ -261,7 +261,7 @@
   "@__________________STUDYPAGE_DESIGN_INFO__________________": {},
   "form_study_design_info_description": "Provide general information about your study to participants. If you decide to make your study available in the study registry, this information will be available to other researchers & clinicians as well.",
   "form_field_study_title": "Study title",
-  "form_field_study_title_tooltip": "Provide the title of the study as it should be displayed in the StudyU app",
+  "form_field_study_title_tooltip": "Provide the title of the study as it should be displayed in the StudyU App",
   "form_field_study_title_required": "The study title must not be empty",
   "form_field_study_title_default": "Unnamed study",
   "form_field_study_description": "Description",
@@ -275,7 +275,7 @@
   "form_field_study_tags_helper": "Select up to {count} tags from the list or add your own.",
   "form_field_study_icon_required": "You must select an icon for your study",
   "form_section_publisher": "Publisher and Contact Information",
-  "form_section_publisher_description": "Participants will be able to contact you via the StudyU app using this information. Other clinicians or researchers will only be able to contact you if you agree to publish your study to the study registry.",
+  "form_section_publisher_description": "Participants will be able to contact you via the StudyU App using this information. Other clinicians or researchers will only be able to contact you if you agree to publish your study to the study registry.",
   "form_field_organization": "Responsible organization",
   "form_field_organization_required": "The responsible organization must not be empty",
   "form_field_review_board": "Institutional Review Board",
@@ -302,7 +302,7 @@
   "form_array_screener_questions_new": "Add screener question",
   "form_array_screener_questions_test": "Test screener",
   "form_array_consent_items_title": "Participant consent",
-  "form_array_consent_items_description": "Provide the terms that participants have to consent to when enrolling in your study via the StudyU app. You may choose not to add any terms here if you obtain your participants' consent by some other method before recruiting them to your study on StudyU.",
+  "form_array_consent_items_description": "Provide the terms that participants have to consent to when enrolling in your study via the StudyU App. You may choose not to add any terms here if you obtain your participants' consent by some other method before recruiting them to your study on StudyU.",
   "form_array_consent_items_new": "Add consent text",
   "form_array_consent_items_test": "Test consent",
   "form_screener_question_create": "New Screener Question",
@@ -344,12 +344,12 @@
   "form_field_intervention_title": "Title",
   "form_field_intervention_title_required": "The intervention title must not be empty",
   "form_field_intervention_title_default": "Unnamed intervention",
-  "form_field_intervention_title_tooltip": "Provide the title of the intervention phase as it should be displayed in the StudyU app",
+  "form_field_intervention_title_tooltip": "Provide the title of the intervention phase as it should be displayed in the StudyU App",
   "form_field_intervention_description": "Description",
   "form_field_intervention_description_tooltip": "Enter an explanation text that is shown when the intervention phase starts or when the participant\nclicks on the respective phase in the study plan",
   "form_field_intervention_description_hint": "Describe the intervention phase to participants",
   "form_array_intervention_tasks": "Intervention tasks",
-  "form_array_intervention_tasks_description": "Define one or more tasks that participants should complete during this intervention phase. Every day, participants will be prompted to complete these tasks in the StudyU app.",
+  "form_array_intervention_tasks_description": "Define one or more tasks that participants should complete during this intervention phase. Every day, participants will be prompted to complete these tasks in the StudyU App.",
   "form_array_intervention_tasks_new": "Add intervention task",
   "form_array_intervention_tasks_empty_title": "No intervention tasks defined",
   "form_array_intervention_tasks_empty_description": "You must define at least one task for participants to complete during this intervention phase.",
@@ -364,10 +364,10 @@
   "form_intervention_task_readonly": "View Intervention Task",
   "form_field_intervention_task_title": "Title",
   "form_field_intervention_task_default": "Unnamed task",
-  "form_field_intervention_task_title_tooltip": "Provide the title of the intervention task for the daily prompt in the StudyU app",
+  "form_field_intervention_task_title_tooltip": "Provide the title of the intervention task for the daily prompt in the StudyU App",
   "form_field_intervention_task_title_required": "The intervention task title must not be empty",
   "form_field_intervention_task_description": "Description",
-  "form_field_intervention_task_description_tooltip": "Enter a detailed description that is shown when clicking on the daily prompt in the StudyU app",
+  "form_field_intervention_task_description_tooltip": "Enter a detailed description that is shown when clicking on the daily prompt in the StudyU App",
   "form_field_intervention_task_description_hint": "Give a detailed description of the task to be performed, link to a video instruction, etc.",
   "form_field_intervention_task_mark_as_completed_label": "Require participants to \"Mark as completed\"",
   "form_section_crossover_schedule": "Study schedule",
@@ -399,7 +399,7 @@
   "form_field_crossover_schedule_include_baseline_tooltip": "Add an intervention-free baseline phase at the beginning of your study",
   "form_field_crossover_schedule_include_baseline_label": "Include in schedule",
   "@__________________STUDYPAGE_DESIGN_MEASUREMENTS__________________": {},
-  "form_study_design_measurements_description": "Define the data that you want to gather from participants during the study - primarily to evaluate the effect of your interventions. The data will be self-reported by participants in one or more surveys served via the StudyU app on a daily basis. The collected data and results will be available on the Analyze page when the study is launched.",
+  "form_study_design_measurements_description": "Define the data that you want to gather from participants during the study - primarily to evaluate the effect of your interventions. The data will be self-reported by participants in one or more surveys served via the StudyU App on a daily basis. The collected data and results will be available on the Analyze page when the study is launched.",
   "form_array_measurements_minlength": "{count,plural, =1{You need to define at least one survey to determine the effect of your intervention(s).} other{form_array_measurements_minlength}}",
   "@form_array_measurements_minlength": {
     "placeholders": {
@@ -413,7 +413,7 @@
   "form_field_measurement_survey_title": "Survey title",
   "form_field_measurement_survey_title_required": "The survey title must not be empty",
   "form_field_measurement_survey_title_default": "Unnamed survey",
-  "form_field_measurement_survey_title_tooltip": "Provide the title of the survey as it should be displayed in the StudyU app",
+  "form_field_measurement_survey_title_tooltip": "Provide the title of the survey as it should be displayed in the StudyU App",
   "form_field_measurement_survey_intro_text": "Intro text",
   "form_field_measurement_survey_intro_text_tooltip": "Enter a text that is shown at the very beginning of the survey",
   "form_field_measurement_survey_intro_text_hint": "e.g. welcome & introduce participants to the survey",
@@ -496,10 +496,10 @@
   "dialog_study_test_section_tips_text": "• Use the menu in the top-left to quickly preview and jump to different parts of your study\n• Fast-forward through the participant's schedule by clicking 'next day' on the app's dashboard page\n• Preview what your results will look like by exporting and analyzing the data from your latest test session (via the Analyze tab)\n• To get a fresh experience, you can reset all data and enroll as a new test user",
   "dialog_study_test_download_url_intro": "• You can also",
   "dialog_study_test_download_url": "https://github.com/hpi-studyu/studyu#app-stores",
-  "dialog_study_test_download_url_text": "download the StudyU app",
+  "dialog_study_test_download_url_text": "download the StudyU App",
   "dialog_study_test_download_url_outro": " on your phone for testing",
   "dialog_study_test_section_notice": "⚠️ Please note",
-  "dialog_study_test_section_notice_text": "• All test users and their data will be reset one you launch the study",
+  "dialog_study_test_section_notice_text": "• All test users and their data will be reset once you launch the study",
   "dialog_action_study_test_start": "Start testing",
   "@__________________STUDYPAGE_RECRUIT__________________": {},
   "enrolled_count_tooltip": "{count,plural, =0{Nobody has enrolled in the study with this code yet} =1{{count} participant is enrolled in the study with this code} other{{count} participants are enrolled in the study with this code}}",
@@ -585,7 +585,7 @@
   "study_launch_post_launch_intro": "After launching your study:",
   "study_launch_post_launch_summary": "- The study design will be locked and you won’t be able to make any changes\n- All data from test runs will be reset (incl. test users, their tasks and results)",
   "study_launch_success_title": "Your study is live!",
-  "study_launch_success_description": "Next, you can start inviting and enrolling your participants in the StudyU app.",
+  "study_launch_success_description": "Next, you can start inviting and enrolling your participants in the StudyU App.",
   "action_button_post_launch_followup": "Add participants",
   "action_button_post_launch_followup_skip": "Skip for now",
   "action_button_study_participation_change": "Change\nparticipation",

From 9ffdddf3dfe36adc60996428287fc6845a7b9170 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 8 Jul 2024 21:44:37 +0200
Subject: [PATCH 261/314] fix: improve translations

---
 designer_v2/lib/localization/app_de.arb | 32 ++++++++++-----------
 designer_v2/lib/localization/app_en.arb | 38 ++++++++++++-------------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index 8dfdf9897..16e3f701a 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -494,37 +494,37 @@
   "@__________________STUDYPAGE_MONITOR__________________": {},
   "participant_details_title": "Teilnehmerdetails",
   "participant_details_study_days_overview": "Übersicht über Studientage",
-  "participant_details_study_days_description": "Dieser Abschnitt bietet einen Überblick über die Studientage des Teilnehmers.",
+  "participant_details_study_days_description": "Dieser Abschnitt bietet einen Überblick über die täglichen Aktivitäten des Teilnehmers in der Studie. Die Farblegende zeigt den Status der täglichen Aufgaben an. Bewege den Mauszeiger über die Studientage, um mehr Details über die tägliche Aktivität des Teilnehmers zu erfahren.",
   "participant_details_color_legend_title": "Farblegende",
-  "participant_details_color_legend_completed": "Abgeschlossen",
-  "participant_details_color_legend_partially_completed": "Teilweise abgeschlossen",
-  "participant_details_color_legend_missed": "Verpasst",
-  "participant_details_completed_legend_tooltip": "Alle Aufgaben (einschließlich Intervention und Umfragen) sind erledigt",
-  "participant_details_partially_completed_legend_tooltip": "Einige Aufgaben (Interventionen und/oder Umfragen) werden erledigt",
-  "participant_details_incomplete_legend_tooltip": "Es wurden keine Aufgaben (Interventionen oder Umfragen) abgeschlossen",
+"participant_details_color_legend_completed": "Alle Aufgaben abgeschlossen",
+"participant_details_color_legend_partially_completed": "Einige Aufgaben unvollständig",
+"participant_details_color_legend_missed": "Alle Aufgaben verpasst",
+"participant_details_completed_legend_tooltip": "Alle Interventions- und Umfrageaufgaben wurden abgeschlossen",
+"participant_details_partially_completed_legend_tooltip": "Nicht alle Interventions- oder Umfrageaufgaben wurden abgeschlossen",
+"participant_details_incomplete_legend_tooltip": "Keine Interventions- oder Umfrageaufgaben wurden abgeschlossen",
   "monitoring_no_participants_title": "Es gibt noch keine Teilnehmer in dieser Studie",
-  "monitoring_no_participants_description": "Sobald Teilnehmer in Ihrer Studie eingeschrieben sind, können Sie hier deren Fortschritt überwachen und ihre Daten einsehen.",
-  "monitoring_participants_title": "Teilnehmer",
+  "monitoring_no_participants_description": "Sobald Teilnehmer in der Studie eingeschrieben sind, kann hier deren Fortschritt überwacht werden.",
+  "monitoring_participants_title": "Teilnehmerübersicht",
   "monitoring_total": "Gesamtzahl der Teilnehmer",
   "monitoring_active": "Aktiv",
   "monitoring_active_tooltip": "Anzahl der Teilnehmer, die derzeit in der Studie sind",
   "monitoring_inactive": "Inaktiv",
-  "monitoring_inactive_tooltip": "Anzahl der Teilnehmer, die 3 Tage hintereinander inaktiv sind",
+  "monitoring_inactive_tooltip": "Anzahl der Teilnehmer, die 3 Tage hintereinander keine Aktivität in der Studie gezeigt haben",
   "monitoring_dropout": "Dropout",
-  "monitoring_dropout_tooltip": "Anzahl der Teilnehmer, die die Studie vorzeitig abgebrochen haben",
+  "monitoring_dropout_tooltip": "Anzahl der Teilnehmer, die die Studie vorzeitig abgebrochen haben oder für 5 Tage hintereinander keine Aktivität in der Studie gezeigt haben",
   "monitoring_completed": "Abgeschlossen",
   "monitoring_completed_tooltip": "Anzahl der Teilnehmer, die das Ende der Studie erreicht haben",
-  "monitoring_table_column_participant_id": "Teilnehmer-ID",
+  "monitoring_table_column_participant_id": "ID",
   "monitoring_table_column_invite_code": "Einladungscode",
   "monitoring_table_column_enrolled": "Studienstart",
   "monitoring_table_column_last_activity": "Letzte Aktivität",
   "monitoring_table_column_day_in_study": "Studientag",
   "monitoring_table_column_completed_interventions": "Abgeschlossene\nInterventionen",
   "monitoring_table_column_completed_surveys": "Abgeschlossene\nFragebögen",
-  "monitoring_table_row_tooltip_dropout": "Dieser Teilnehmer ist ausgeschieden und es wird keine neue Aktivität hinzugefügt",
-  "monitoring_table_days_in_study_header_tooltip":"Anzahl der im Studienzeitraum vergangenen Tage",
-  "monitoring_table_completed_interventions_header_tooltip": "Die Intervention ist erst abgeschlossen, wenn alle Aufgaben erledigt sind",
-  "monitoring_table_completed_surveys_header_tooltip":"Die Umfrage ist erst abgeschlossen, wenn alle Aufgaben des Tages erledigt wurden",
+  "monitoring_table_row_tooltip_dropout": "Dieser Teilnehmer hat die Studie verlassen und es wird keine neue Aktivität hinzugefügt",
+  "monitoring_table_days_in_study_header_tooltip":"Die Anzahl der Tage, die der Teilnehmer in der Studie verbracht hat",
+  "monitoring_table_completed_interventions_header_tooltip": "Eine Intervention zählt als abgeschlossen, wenn alle Aufgaben für den Tag erledigt wurden",
+  "monitoring_table_completed_surveys_header_tooltip":"Die Umfrage zählt als abgeschlossen, wenn alle Aufgaben für den Tag erledigt wurden",
   "@__________________STUDYPAGE_ANALYZE__________________": {},
   "banner_text_study_analyze_draft": "Solange die Studie noch nicht live ist, basieren die Ergebnisse hier auf dem letzten Testlauf der Studie (siehe Testmodus).\nDie Ergebnisdaten werden automatisch zurückgesetzt sobald die Studie mit echten Teilnehmern startet.",
   "action_button_study_export": "Daten exportieren",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index 393a59775..864d393aa 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -259,7 +259,7 @@
   "form_field_time_restriction_start_hint": "From",
   "form_field_time_restriction_end_hint": "To",
   "@__________________STUDYPAGE_DESIGN_INFO__________________": {},
-  "form_study_design_info_description": "Provide general information about your study to participants. If you decide to make your study available in the study registry, this information will be available to other researchers & clinicians as well.",
+  "form_study_design_info_description": "Provide general information about your study to participants. If you decide to make your study available in the study registry, this information will be available to other researchers and clinicians as well.",
   "form_field_study_title": "Study title",
   "form_field_study_title_tooltip": "Provide the title of the study as it should be displayed in the StudyU App",
   "form_field_study_title_required": "The study title must not be empty",
@@ -527,13 +527,13 @@
   },
   "form_field_code_alreadyused": "This code is already in use",
   "form_field_is_preconfigured_schedule": "Predefined Schedule",
-  "form_field_is_preconfigured_schedule_description": "You can predefine the phases & interventions for any participant who joins your study via this access code. If enabled, these settings will override the default schedule defined in your study design.",
+  "form_field_is_preconfigured_schedule_description": "You can predefine the phases and interventions for any participant who joins your study via this access code. If enabled, these settings will override the default schedule defined in your study design.",
   "form_field_preconfigured_schedule_type": "Schedule",
   "form_field_preconfigured_schedule_intervention_a": "Intervention A",
   "form_field_preconfigured_schedule_intervention_b": "Intervention B",
   "form_field_preconfigured_schedule_intervention_default": "Default",
   "form_field_preconfigured_schedule_intervention_hint": "Select intervention...",
-  "code_list_section_title": "Access Codes",
+  "code_list_section_title": "Access codes",
   "code_list_empty_title": "You haven't invited anyone yet",
   "code_list_empty_description": "Add participants to your study via access codes.",
   "code_list_header_code": "Code",
@@ -541,37 +541,37 @@
   "@__________________STUDYPAGE_MONITOR__________________": {},
   "participant_details_title": "Participant details",
   "participant_details_study_days_overview": "Study days overview",
-  "participant_details_study_days_description": "This section provides an overview of the participant's study days.",
+  "participant_details_study_days_description": "This section provides an overview of the participant's progress in the study. The color coding indicates the status of the participant's tasks on each day. Hover over each day to see more details about the participant's activity.",
   "participant_details_color_legend_title": "Color legend",
-  "participant_details_color_legend_completed": "Completed",
-  "participant_details_color_legend_partially_completed": "Partially completed",
-  "participant_details_color_legend_missed": "Missed",
-  "participant_details_completed_legend_tooltip": "All tasks (including intervention and surveys) are done",
-  "participant_details_partially_completed_legend_tooltip": "Some tasks (interventions and/or surveys) are done",
-  "participant_details_incomplete_legend_tooltip": "No tasks (interventions or surveys) are completed",
+  "participant_details_color_legend_completed": "Completed all tasks",
+  "participant_details_color_legend_partially_completed": "Some tasks incomplete",
+  "participant_details_color_legend_missed": "Missed all tasks",
+  "participant_details_completed_legend_tooltip": "All intervention and survey tasks have been completed for this day",
+  "participant_details_partially_completed_legend_tooltip": "Not all intervention or survey tasks have been completed for this day",
+  "participant_details_incomplete_legend_tooltip": "No intervention or survey tasks have been completed for this day",
   "monitoring_no_participants_title": "There are no participants in this study yet",
   "monitoring_no_participants_description": "Once participants have enrolled in your study, you can monitor their progress and view their data here.",
-  "monitoring_participants_title": "Participants",
+  "monitoring_participants_title": "Participant overview",
   "monitoring_total": "Total number of participants",
   "monitoring_active": "Active",
   "monitoring_active_tooltip": "Number of participants who are currently in the study",
   "monitoring_inactive": "Inactive",
-  "monitoring_inactive_tooltip": "Number of participants who are inactive 3 days in a row",
+  "monitoring_inactive_tooltip": "Number of participants who have not completed a task for more than 3 days in a row",
   "monitoring_dropout": "Dropout",
-  "monitoring_dropout_tooltip": "Number of participants dropped out before the end of the study or inactive 5 days in a row",
+  "monitoring_dropout_tooltip": "Number of participants who have left the study before the end or are inactive more than 5 days in a row",
   "monitoring_completed": "Completed",
-  "monitoring_completed_tooltip": "Number of participants who reached the end of the study",
-  "monitoring_table_column_participant_id": "Participant ID",
+  "monitoring_completed_tooltip": "Number of participants who have reached the end of the study",
+  "monitoring_table_column_participant_id": "ID",
   "monitoring_table_column_invite_code": "Invite code",
   "monitoring_table_column_enrolled": "Started at",
   "monitoring_table_column_last_activity": "Last activity",
   "monitoring_table_column_day_in_study": "Day in study",
   "monitoring_table_column_completed_interventions": "Completed\ninterventions",
   "monitoring_table_column_completed_surveys": "Completed\nsurveys",
-  "monitoring_table_row_tooltip_dropout": "This participant has dropped out and no new activity will be added",
-  "monitoring_table_days_in_study_header_tooltip":"Number of days passed in study period",
-  "monitoring_table_completed_interventions_header_tooltip": "Intervention is only completed, if all tasks have been completed",
-  "monitoring_table_completed_surveys_header_tooltip":"The survey is only completed, if all tasks have been completed of the day",
+  "monitoring_table_row_tooltip_dropout": "This participant has dropped out of the study and no new activity will be added",
+  "monitoring_table_days_in_study_header_tooltip":"The number of days the participant has been in the study",
+  "monitoring_table_completed_interventions_header_tooltip": "An intervention is completed, if all of its tasks have been completed for that day",
+  "monitoring_table_completed_surveys_header_tooltip":"A survey is completed, if all of its tasks have been completed for that day",
   "@__________________STUDYPAGE_ANALYZE__________________": {},
   "banner_text_study_analyze_draft": "Because this study has not been launched yet, this page is currently based on the data generated during study testing (only the latest test session).\nThe data on this page will be reset once you launch the study with real participants.",
   "action_button_study_export": "Export data",

From b3ca8790afea04ab51df22ea17f37ca6b55fc48b Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 8 Jul 2024 21:44:51 +0200
Subject: [PATCH 262/314] fix: various QoL fixes

---
 designer_v2/lib/domain/study_monitoring.dart  |   8 +-
 .../monitor/participant_details_view.dart     | 148 ++++++++++--------
 .../features/monitor/study_monitor_page.dart  |  17 +-
 .../features/monitor/study_monitor_table.dart |  35 ++++-
 designer_v2/pubspec.lock                      |   2 +-
 designer_v2/pubspec.yaml                      |   1 +
 6 files changed, 128 insertions(+), 83 deletions(-)

diff --git a/designer_v2/lib/domain/study_monitoring.dart b/designer_v2/lib/domain/study_monitoring.dart
index f21312ae7..51b9e192c 100644
--- a/designer_v2/lib/domain/study_monitoring.dart
+++ b/designer_v2/lib/domain/study_monitoring.dart
@@ -48,7 +48,7 @@ class StudyMonitorItem extends Equatable {
   final List<Set<String>> missedTasksPerDay;
   final List<Set<String>> completedTasksPerDay;
 
-  StudyMonitorItem({
+  const StudyMonitorItem({
     required this.participantId,
     required this.inviteCode,
     required this.startedAt,
@@ -62,10 +62,8 @@ class StudyMonitorItem extends Equatable {
     required this.droppedOut,
     required this.missedTasksPerDay,
     required this.completedTasksPerDay,
-  }) {
-    assert(missedTasksPerDay.length == currentDayOfStudy);
-    assert(completedTasksPerDay.length == currentDayOfStudy);
-  }
+  })  : assert(missedTasksPerDay.length == currentDayOfStudy),
+        assert(completedTasksPerDay.length == currentDayOfStudy);
 
   @override
   List<Object?> get props => [participantId];
diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index b0b5bd220..9ec39b68f 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -2,6 +2,8 @@ import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_core/core.dart';
+import 'package:studyu_designer_v2/common_views/text_paragraph.dart';
+import 'package:studyu_designer_v2/common_views/utils.dart';
 import 'package:studyu_designer_v2/domain/study_monitoring.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/localization/locale_providers.dart';
@@ -20,8 +22,9 @@ class ParticipantDetailsView extends ConsumerWidget {
   final List<Observation> observations;
 
   static const Color incompleteColor = Color.fromARGB(255, 234, 234, 234);
-  static const Color partiallyComplete = Color.fromARGB(255, 93, 145, 238);
-  static const Color completeColor = Color.fromARGB(255, 10, 153, 255);
+  // Add transparency to increase the readability of the text
+  static Color partiallyComplete = Colors.lightBlue.faded(0.75);
+  static const Color completeColor = Colors.lightBlue;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -32,9 +35,8 @@ class ParticipantDetailsView extends ConsumerWidget {
         _buildParticipantInfo(languageCode),
         const SizedBox(height: 8.0),
         const Divider(),
-        Text(
-          tr.participant_details_study_days_description,
-          style: const TextStyle(fontSize: 16.0, color: Colors.black54),
+        TextParagraph(
+          text: tr.participant_details_study_days_description,
         ),
         const SizedBox(height: 16.0),
         _buildPerDayStatus(),
@@ -45,27 +47,29 @@ class ParticipantDetailsView extends ConsumerWidget {
   }
 
   Widget _buildParticipantInfo(String languageCode) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        _buildInfoRow(
-          tr.monitoring_table_column_participant_id,
-          monitorItem.participantId,
-        ),
-        _buildInfoRow(
-          tr.monitoring_table_column_invite_code,
-          monitorItem.inviteCode ?? '-',
-        ),
-        _buildInfoRow(
-          tr.monitoring_table_column_enrolled,
-          monitorItem.startedAt
-              .toLocalizedString(locale: languageCode, showTime: false),
-        ),
-        _buildInfoRow(
-          tr.monitoring_table_column_last_activity,
-          monitorItem.lastActivityAt.toLocalizedString(locale: languageCode),
-        ),
-      ],
+    return SelectionArea(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          _buildInfoRow(
+            tr.monitoring_table_column_participant_id,
+            monitorItem.participantId,
+          ),
+          _buildInfoRow(
+            tr.monitoring_table_column_invite_code,
+            monitorItem.inviteCode ?? 'N/A',
+          ),
+          _buildInfoRow(
+            tr.monitoring_table_column_enrolled,
+            monitorItem.startedAt
+                .toLocalizedString(locale: languageCode, showTime: false),
+          ),
+          _buildInfoRow(
+            tr.monitoring_table_column_last_activity,
+            monitorItem.lastActivityAt.toLocalizedString(locale: languageCode),
+          ),
+        ],
+      ),
     );
   }
 
@@ -88,18 +92,22 @@ class ParticipantDetailsView extends ConsumerWidget {
     final phases = <StudyPhase>[];
 
     if (studySchedule.includeBaseline) {
-      phases.add(StudyPhase(
+      phases.add(
+        StudyPhase(
           name: 'Baseline',
           missedTasksPerDay: monitorItem.missedTasksPerDay.sublist(
-              0,
-              totalCompletedDays > studySchedule.baselineLength
-                  ? studySchedule.baselineLength
-                  : totalCompletedDays)));
+            0,
+            totalCompletedDays > studySchedule.baselineLength
+                ? studySchedule.baselineLength
+                : totalCompletedDays,
+          ),
+        ),
+      );
     }
 
     final String sequence = studySchedule.nameOfSequence;
 
-    for (var i = 0; i < studySchedule.numberOfCycles * 2; i++) {
+    for (int i = 0; i < studySchedule.numberOfCycles * 2; i++) {
       final int phaseDuration = studySchedule.phaseDuration;
       final bool includeBaseline = studySchedule.includeBaseline;
       final int baselineAdjustmentStart =
@@ -120,10 +128,12 @@ class ParticipantDetailsView extends ConsumerWidget {
       final String interventionName =
           sequence[i] == "A" ? interventions[0].name! : interventions[1].name!;
 
-      phases.add(StudyPhase(
+      phases.add(
+        StudyPhase(
           name: interventionName,
-          missedTasksPerDay:
-              monitorItem.missedTasksPerDay.sublist(start, end)));
+          missedTasksPerDay: monitorItem.missedTasksPerDay.sublist(start, end),
+        ),
+      );
     }
 
     assert(
@@ -140,13 +150,16 @@ class ParticipantDetailsView extends ConsumerWidget {
               phase.name,
               style: const TextStyle(fontWeight: FontWeight.bold),
             ),
-            const SizedBox(
-              height: 5,
-            ),
+            const SizedBox(height: 10),
             Wrap(
               children: phase.missedTasksPerDay
-                  .mapIndexed((index, missed) => _buildSquare(index, missed,
-                      (phaseIndex * studySchedule.phaseDuration) + index + 1))
+                  .mapIndexed(
+                    (index, missed) => _buildSquare(
+                      index,
+                      missed,
+                      (phaseIndex * studySchedule.phaseDuration) + index + 1,
+                    ),
+                  )
                   .toList(),
             ),
             const SizedBox(height: 10),
@@ -182,9 +195,10 @@ class ParticipantDetailsView extends ConsumerWidget {
           child: Text(
             numberOfTheDay.toString(),
             style: TextStyle(
-                color: missed.isEmpty ? Colors.white : Colors.black,
-                fontWeight: FontWeight.bold,
-                fontSize: 20),
+              color: missed.isEmpty ? Colors.white : Colors.black,
+              fontWeight: FontWeight.bold,
+              fontSize: 20,
+            ),
           ),
         ),
       ),
@@ -207,9 +221,9 @@ class ParticipantDetailsView extends ConsumerWidget {
     }
     for (final observation in observations) {
       if (missedTaskIds.contains(observation.id)) {
-        sb.writeln('\u{274C} ${observation.title}');
+        sb.write('\u{274C} ${observation.title}');
       } else if (completedTaskIds.contains(observation.id)) {
-        sb.writeln('\u{2705} ${observation.title}');
+        sb.write('\u{2705} ${observation.title}');
       }
     }
     return sb.toString();
@@ -227,28 +241,35 @@ class ParticipantDetailsView extends ConsumerWidget {
         Row(
           children: [
             _buildLegendItem(
-                completeColor,
-                tr.participant_details_color_legend_completed,
-                tr.participant_details_partially_completed_legend_tooltip),
+              completeColor,
+              tr.participant_details_color_legend_completed,
+              tr.participant_details_completed_legend_tooltip,
+            ),
             const SizedBox(width: 16.0),
             _buildLegendItem(
-                partiallyComplete,
-                tr.participant_details_color_legend_partially_completed,
-                tr.participant_details_partially_completed_legend_tooltip,
-                gradient: true),
+              partiallyComplete,
+              tr.participant_details_color_legend_partially_completed,
+              tr.participant_details_partially_completed_legend_tooltip,
+              gradient: true,
+            ),
             const SizedBox(width: 16.0),
             _buildLegendItem(
-                incompleteColor,
-                tr.participant_details_color_legend_missed,
-                tr.participant_details_incomplete_legend_tooltip),
+              incompleteColor,
+              tr.participant_details_color_legend_missed,
+              tr.participant_details_incomplete_legend_tooltip,
+            ),
           ],
         ),
       ],
     );
   }
 
-  Widget _buildLegendItem(Color color, String text, String tooltipMessage,
-      {bool gradient = false}) {
+  Widget _buildLegendItem(
+    Color color,
+    String text,
+    String tooltipMessage, {
+    bool gradient = false,
+  }) {
     return Tooltip(
       message: tooltipMessage,
       child: Row(
@@ -257,9 +278,10 @@ class ParticipantDetailsView extends ConsumerWidget {
             width: 20.0,
             height: 20.0,
             decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(3),
-                color: color,
-                gradient: gradient ? _buildGradient() : null),
+              borderRadius: BorderRadius.circular(3),
+              color: color,
+              gradient: gradient ? _buildGradient() : null,
+            ),
           ),
           const SizedBox(width: 8.0),
           Text(text),
@@ -269,10 +291,10 @@ class ParticipantDetailsView extends ConsumerWidget {
   }
 
   LinearGradient _buildGradient() {
-    return const LinearGradient(
+    return LinearGradient(
       begin: Alignment.topRight,
-      end: Alignment(0.5, -0.4),
-      stops: [0.0, 0.5, 0.5, 1],
+      end: const Alignment(0.5, -0.4),
+      stops: const [0.0, 0.5, 0.5, 1],
       colors: [
         partiallyComplete,
         partiallyComplete,
diff --git a/designer_v2/lib/features/monitor/study_monitor_page.dart b/designer_v2/lib/features/monitor/study_monitor_page.dart
index 4173ce6a9..e2a67f1dd 100644
--- a/designer_v2/lib/features/monitor/study_monitor_page.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_page.dart
@@ -27,12 +27,13 @@ class StudyMonitorScreen extends StudyPageWidget {
           crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[
             _monitorSectionHeader(context, studyMonitorData),
-            const SizedBox(height: 40.0), // spacing between body elements
+            const SizedBox(height: 32.0),
             if (studyMonitorData.items.isNotEmpty) ...[
               SelectableText(
                 tr.monitoring_participants_title,
                 style: Theme.of(context).textTheme.headlineSmall,
               ),
+              Container(width: 32.0),
               StudyMonitorTable(
                 ref: ref,
                 studyMonitorItems: studyMonitorData.items,
@@ -106,22 +107,26 @@ class StudyMonitorScreen extends StudyPageWidget {
                   _buildStat(
                     percentage: activePercentage,
                     color: activeColor,
-                    tooltip: tr.monitoring_active,
+                    tooltip:
+                        '${tr.monitoring_active}: ${monitorData.activeParticipants}',
                   ),
                   _buildStat(
                     percentage: inactivePercentage,
                     color: inactiveColor,
-                    tooltip: tr.monitoring_inactive,
+                    tooltip:
+                        '${tr.monitoring_inactive}: ${monitorData.inactiveParticipants}',
                   ),
                   _buildStat(
                     percentage: dropoutPercentage,
                     color: dropoutColor,
-                    tooltip: tr.monitoring_dropout,
+                    tooltip:
+                        '${tr.monitoring_dropout}: ${monitorData.dropoutParticipants}',
                   ),
                   _buildStat(
                     percentage: completedPercentage,
                     color: completedColor,
-                    tooltip: tr.monitoring_completed,
+                    tooltip:
+                        '${tr.monitoring_completed}: ${monitorData.completedParticipants}',
                   ),
                 ],
               ),
@@ -203,7 +208,7 @@ class StudyMonitorScreen extends StudyPageWidget {
     );
   }
 
-  _onSelectParticipant(
+  void _onSelectParticipant(
     BuildContext context,
     WidgetRef ref,
     StudyMonitorItem item,
diff --git a/designer_v2/lib/features/monitor/study_monitor_table.dart b/designer_v2/lib/features/monitor/study_monitor_table.dart
index 21b92c37a..6b07e6ad9 100644
--- a/designer_v2/lib/features/monitor/study_monitor_table.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_table.dart
@@ -1,9 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_designer_v2/common_views/standard_table.dart';
+import 'package:studyu_designer_v2/common_views/text_paragraph.dart';
 import 'package:studyu_designer_v2/domain/study_monitoring.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/localization/locale_providers.dart';
+import 'package:studyu_designer_v2/theme.dart';
 import 'package:studyu_designer_v2/utils/extensions.dart';
 
 class StudyMonitorTable extends ConsumerWidget {
@@ -94,12 +96,19 @@ class StudyMonitorTable extends ConsumerWidget {
     Set<WidgetState> states,
   ) {
     final languageCode = ref.watch(localeProvider).languageCode;
+    final theme = Theme.of(context);
     return [
       Tooltip(
         message: item.participantId,
         child: Text(item.participantId.split("-").first),
       ),
-      Text(item.inviteCode ?? "-"),
+      if (item.inviteCode != null)
+        Text(item.inviteCode!)
+      else
+        TextParagraph(
+          text: item.inviteCode ?? 'N/A',
+          style: ThemeConfig.bodyTextMuted(theme),
+        ),
       Tooltip(
         message: item.startedAt
             .toLocalizedString(locale: languageCode, showTime: false),
@@ -125,11 +134,20 @@ class StudyMonitorTable extends ConsumerWidget {
         ),
       ),
       _buildProgressCell(
-          context, item.currentDayOfStudy, item.studyDurationInDays),
-      _buildProgressCell(context, item.completedInterventions,
-          item.completedInterventions + item.missedInterventions),
-      _buildProgressCell(context, item.completedSurveys,
-          item.completedSurveys + item.missedSurveys),
+        context,
+        item.currentDayOfStudy,
+        item.studyDurationInDays,
+      ),
+      _buildProgressCell(
+        context,
+        item.completedInterventions,
+        item.completedInterventions + item.missedInterventions,
+      ),
+      _buildProgressCell(
+        context,
+        item.completedSurveys,
+        item.completedSurveys + item.missedSurveys,
+      ),
     ];
   }
 
@@ -148,8 +166,9 @@ class StudyMonitorTable extends ConsumerWidget {
           child: Text(
             "$progress/$total",
             style: TextStyle(
-                color: theme.colorScheme.onPrimary,
-                fontWeight: FontWeight.bold),
+              color: theme.colorScheme.onPrimary,
+              fontWeight: FontWeight.bold,
+            ),
           ),
         ),
       ],
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 6c2323d9d..e43551eed 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -565,7 +565,7 @@ packages:
     source: sdk
     version: "0.0.0"
   intl:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: intl
       sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 708ee0768..8ce2cad22 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -25,6 +25,7 @@ dependencies:
   flutter_web_plugins:
     sdk: flutter
   go_router: ^14.2.0
+  intl: ^0.19.0
   material_color_utilities: 0.8.0 # integration_test
   material_design_icons_flutter: ^7.0.7296
   pointer_interceptor: ^0.10.1+1

From a3640d3ee287b574730a41d116623d93279023b0 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 9 Jul 2024 13:37:29 +0200
Subject: [PATCH 263/314] fix: localization

---
 designer_v2/lib/localization/app_de.arb | 5 +++--
 designer_v2/lib/localization/app_en.arb | 9 ++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index 2e4172ec6..af425e6e0 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -151,6 +151,7 @@
   "form_array_response_options_bool_yes": "Ja",
   "form_array_response_options_bool_no": "No",
   "form_field_response_image": "Bild",
+  "form_field_response_audio": "Audio",
   "form_field_response_audio_max_duration_label": "Maximale Aufnahmedauer in Sekunden",
   "form_field_response_choice_multiple": "Mehrfachauswahl",
   "form_field_response_choice_multiple_tooltip": "Erlaubt die Auswahl von mehreren Antwortoptionen gleichzeitig,\nansonsten kann nur eine einzige Option ausgewählt werden",
@@ -462,7 +463,7 @@
   "form_code_create": "Neuer Teilnahmecode",
   "form_code_readonly": "Teilnahmecode",
   "form_field_code": "Code",
-  "form_field_code_tooltip": "TODO",
+  "form_field_code_tooltip": "Gib einen eindeutigen Code ein, den Teilnehmer zur Anmeldung in der StudyU App verwenden können",
   "form_field_code_required": "Der Code darf nicht leer sein",
   "form_field_code_minlength": "Der Code muss mindestens {minLength} Zeichen lang sein",
   "@form_field_code_minlength": {
@@ -478,7 +479,7 @@
   },
   "form_field_code_alreadyused": "Dieser Code wird bereits verwendet",
   "form_field_is_preconfigured_schedule": "Vordefinierter Zeitplan",
-  "form_field_is_preconfigured_schedule_description": "Du kannst die Phasen und Interventionen für jeden Teilnehmer, der über diesen Code an der Studie teilnimmt, vordefinieren. Die hier festgelegten Einstellungen haben Vorrang gegenüber den Standard-Einstellungen der Studie.",
+  "form_field_is_preconfigured_schedule_description": "Du kannst die Phasen und Interventionen für jeden Teilnehmer vordefinieren, der über diesen Code an der Studie teilnimmt. Die hier festgelegten Einstellungen haben Vorrang gegenüber den Standard-Einstellungen der Studie.",
   "form_field_preconfigured_schedule_type": "Zeitplan",
   "form_field_preconfigured_schedule_intervention_a": "Intervention A",
   "form_field_preconfigured_schedule_intervention_b": "Intervention B",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index 8bb360103..6e5dbd4f0 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -153,10 +153,9 @@
   "form_array_response_options_bool_yes": "Yes",
   "form_array_response_options_bool_no": "No",
   "form_field_response_image": "Image",
-  "form_field_response_choice_multiple": "Select multiple",
-  "form_field_response_image": "Provide directions for capturing image",
-  "form_field_response_audio": "Provide directions for recording audio",
+  "form_field_response_audio": "Audio",
   "form_field_response_audio_max_duration_label": "Maximum recording duration in seconds",
+  "form_field_response_choice_multiple": "Select multiple",
   "form_field_response_choice_multiple_tooltip": "Allow the participant to select multiple response options. Otherwise only a single option can be selected.",
   "form_array_response_options_choice_new": "Add option",
   "form_array_response_options_choice_hint": "Option",
@@ -512,7 +511,7 @@
   "form_code_create": "New Access Code",
   "form_code_readonly": "Access Code",
   "form_field_code": "Code",
-  "form_field_code_tooltip": "TODO",
+  "form_field_code_tooltip": "Enter a unique code that participants can use to enroll in your study",
   "form_field_code_required": "The code must not be empty",
   "form_field_code_minlength": "The code must have at least {minLength} characters",
   "@form_field_code_minlength": {
@@ -528,7 +527,7 @@
   },
   "form_field_code_alreadyused": "This code is already in use",
   "form_field_is_preconfigured_schedule": "Predefined Schedule",
-  "form_field_is_preconfigured_schedule_description": "You can predefine the phases & interventions for any participant who joins your study via this access code. If enabled, these settings will override the default schedule defined in your study design.",
+  "form_field_is_preconfigured_schedule_description": "You can predefine the phases and interventions for any participant who joins your study via this access code. If enabled, these settings will override the default schedule defined in your study design.",
   "form_field_preconfigured_schedule_type": "Schedule",
   "form_field_preconfigured_schedule_intervention_a": "Intervention A",
   "form_field_preconfigured_schedule_intervention_b": "Intervention B",

From b263c4d3d476198f11855ce563dd1d9e41e8683c Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 9 Jul 2024 13:37:50 +0200
Subject: [PATCH 264/314] style

---
 designer_v2/lib/features/forms/form_view_model.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer_v2/lib/features/forms/form_view_model.dart b/designer_v2/lib/features/forms/form_view_model.dart
index 3818c010f..5dc6192e8 100644
--- a/designer_v2/lib/features/forms/form_view_model.dart
+++ b/designer_v2/lib/features/forms/form_view_model.dart
@@ -97,7 +97,7 @@ abstract class FormViewModel<T> implements IFormGroupController {
   ///
   /// If null, the [AbstractControl]s contained in the [form] will be validated
   /// using their default configuration. Otherwise, the default configuration
-  /// is discarded & replaced by the respective [FormValidationConfig].
+  /// is discarded and replaced by the respective [FormValidationConfig].
   FormValidationSetEnum? get validationSet => _validationSet;
   FormValidationSetEnum? _validationSet;
   set validationSet(FormValidationSetEnum? validationSet) {
@@ -277,7 +277,7 @@ abstract class FormViewModel<T> implements IFormGroupController {
     _applyValidationSet(validationSet);
   }
 
-  /// Updates & re-evaluates [AbstractControl.validators] and
+  /// Updates and re-evaluates [AbstractControl.validators] and
   /// [AbstractControl.asyncValidators] for all [FormControl]'s in the
   /// current [form] (or the [FormGroup] itself) with the validators of
   /// the [FormValidationConfig] corresponding to the given [validationSet]

From c50f911ac2b2954cf866e8ec4976d7a25fd81025 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Tue, 9 Jul 2024 13:38:05 +0200
Subject: [PATCH 265/314] fix: invite code validation logic

---
 designer_v2/l10n-missing.txt                  |  1 -
 .../recruit/invite_code_form_controller.dart  | 67 +++++++++++++------
 .../invite_code_form_controller.g.dart        |  2 +-
 .../recruit/invite_code_form_view.dart        |  4 +-
 4 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/designer_v2/l10n-missing.txt b/designer_v2/l10n-missing.txt
index f0f2a3c8b..53ec61b09 100644
--- a/designer_v2/l10n-missing.txt
+++ b/designer_v2/l10n-missing.txt
@@ -1,6 +1,5 @@
 {
   "de": [
-    "form_field_response_audio",
     "report_status_primary",
     "report_status_secondary",
     "report_status_primary_description",
diff --git a/designer_v2/lib/features/recruit/invite_code_form_controller.dart b/designer_v2/lib/features/recruit/invite_code_form_controller.dart
index 79b4a62a1..ee48be8d0 100644
--- a/designer_v2/lib/features/recruit/invite_code_form_controller.dart
+++ b/designer_v2/lib/features/recruit/invite_code_form_controller.dart
@@ -4,6 +4,8 @@ import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/domain/study.dart';
 import 'package:studyu_designer_v2/domain/study_invite.dart';
 import 'package:studyu_designer_v2/domain/study_schedule.dart';
+import 'package:studyu_designer_v2/features/design/study_form_validation.dart';
+import 'package:studyu_designer_v2/features/forms/form_validation.dart';
 import 'package:studyu_designer_v2/features/forms/form_view_model.dart';
 import 'package:studyu_designer_v2/features/study/study_controller.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
@@ -16,7 +18,10 @@ class InviteCodeFormViewModel extends FormViewModel<StudyInvite> {
   InviteCodeFormViewModel({
     required this.study,
     required this.inviteCodeRepository,
-  }) : super();
+    super.formData,
+    super.delegate,
+    super.validationSet = StudyFormValidationSet.draft,
+  });
 
   final Study study;
   final IInviteCodeRepository inviteCodeRepository;
@@ -29,33 +34,56 @@ class InviteCodeFormViewModel extends FormViewModel<StudyInvite> {
 
   // - Form Fields
 
-  late final codeControl = FormControl<String>(
-    validators: [
-      Validators.required,
-      Validators.minLength(8),
-      Validators.maxLength(24),
-    ],
-    asyncValidators: [
-      Validators.delegateAsync((control) => _uniqueInviteCode(control)),
-    ],
+  final codeControl = FormControl<String>(
     asyncValidatorsDebounceTime: 200,
     touched: true,
   );
-  final codeControlValidationMessages = {
-    ValidationMessage.required: (_) => tr.form_field_code_required,
-    ValidationMessage.minLength: (error) =>
-        tr.form_field_code_minlength((error as Map)['requiredLength'] as int),
-    ValidationMessage.maxLength: (error) =>
-        tr.form_field_code_maxlength((error as Map)['requiredLength'] as int),
-    'inviteCodeAlreadyUsed': (_) => tr.form_field_code_alreadyused,
-  };
-
   final isPreconfiguredScheduleControl = FormControl<bool>(value: false);
   final preconfiguredScheduleTypeControl =
       FormControl<PhaseSequence>(value: PhaseSequence.alternating);
   final interventionAControl = FormControl<String>();
   final interventionBControl = FormControl<String>();
 
+  // todo add validation for preconfigured schedule if enabled
+  @override
+  FormValidationConfigSet get sharedValidationConfig => {
+        StudyFormValidationSet.draft: [codeValidation],
+        StudyFormValidationSet.test: [codeValidation],
+        StudyFormValidationSet.publish: [codeValidation],
+      };
+
+  FormControlValidation get codeRequired => FormControlValidation(
+        control: codeControl,
+        validators: [
+          Validators.required,
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) => tr.form_field_code_required,
+        },
+      );
+
+  FormControlValidation get codeValidation => FormControlValidation(
+        control: codeControl,
+        validators: [
+          Validators.required,
+          Validators.minLength(8),
+          Validators.maxLength(24),
+        ],
+        asyncValidators: [
+          Validators.delegateAsync((control) => _uniqueInviteCode(control)),
+        ],
+        validationMessages: {
+          ValidationMessage.required: (error) => tr.form_field_code_required,
+          ValidationMessage.minLength: (error) => tr.form_field_code_minlength(
+                (error as Map)['requiredLength'] as int,
+              ),
+          ValidationMessage.maxLength: (error) => tr.form_field_code_maxlength(
+                (error as Map)['requiredLength'] as int,
+              ),
+          'inviteCodeAlreadyUsed': (_) => tr.form_field_code_alreadyused,
+        },
+      );
+
   List<FormControlOption<String>> get interventionControlOptions =>
       study.interventions
           .map(
@@ -157,7 +185,6 @@ InviteCodeFormViewModel inviteCodeFormViewModel(
   InviteCodeFormViewModelRef ref,
   StudyID studyId,
 ) {
-  print("inviteCodeFormViewModelProvider($studyId");
   // Reactively bind to and obtain [StudyController]'s current study
   final study = ref
       .watch(studyControllerProvider(studyId).select((state) => state.study));
diff --git a/designer_v2/lib/features/recruit/invite_code_form_controller.g.dart b/designer_v2/lib/features/recruit/invite_code_form_controller.g.dart
index c11202adf..7ca6d10a0 100644
--- a/designer_v2/lib/features/recruit/invite_code_form_controller.g.dart
+++ b/designer_v2/lib/features/recruit/invite_code_form_controller.g.dart
@@ -7,7 +7,7 @@ part of 'invite_code_form_controller.dart';
 // **************************************************************************
 
 String _$inviteCodeFormViewModelHash() =>
-    r'e3de1f19dc318e720664ee06c884a2d193b4c688';
+    r'a7e83058dad45cd50142d9430f3c8907b5653c99';
 
 /// Copied from Dart SDK
 class _SystemHash {
diff --git a/designer_v2/lib/features/recruit/invite_code_form_view.dart b/designer_v2/lib/features/recruit/invite_code_form_view.dart
index 523198651..e745297fb 100644
--- a/designer_v2/lib/features/recruit/invite_code_form_view.dart
+++ b/designer_v2/lib/features/recruit/invite_code_form_view.dart
@@ -4,6 +4,7 @@ import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/common_views/form_consumer_widget.dart';
 import 'package:studyu_designer_v2/common_views/form_table_layout.dart';
 import 'package:studyu_designer_v2/common_views/text_paragraph.dart';
+import 'package:studyu_designer_v2/features/forms/form_validation.dart';
 import 'package:studyu_designer_v2/features/recruit/invite_code_form_controller.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 
@@ -25,7 +26,8 @@ class InviteCodeFormView extends FormConsumerWidget {
               control: formViewModel.codeControl,
               input: ReactiveTextField(
                 formControl: formViewModel.codeControl,
-                validationMessages: formViewModel.codeControlValidationMessages,
+                validationMessages:
+                    formViewModel.codeControl.validationMessages,
                 decoration: (formViewModel.codeControl.enabled)
                     ? InputDecoration(
                         helperText: "",

From ee3e93df5fc240322247cbd40d0e8db85b5999a0 Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahim.ozkn@outlook.com>
Date: Tue, 9 Jul 2024 22:57:58 +0200
Subject: [PATCH 266/314] fix: designer read only fields

---
 .../design/enrollment/enrollment_form_view.dart   |  7 +++++--
 .../interventions/study_schedule_form_view.dart   | 15 +++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart b/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart
index d4877569c..0ef94e1b5 100644
--- a/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart
+++ b/designer_v2/lib/features/design/enrollment/enrollment_form_view.dart
@@ -56,8 +56,11 @@ class StudyDesignEnrollmentFormView extends StudyDesignPageWidget {
                               (option) => RadioListTile<Participation>(
                                 groupValue:
                                     formViewModel.enrollmentTypeControl.value,
-                                onChanged: (value) => formViewModel
-                                    .enrollmentTypeControl.value = option.value,
+                                onChanged: formViewModel.isReadonly
+                                    ? null
+                                    : (value) => formViewModel
+                                        .enrollmentTypeControl
+                                        .value = option.value,
                                 value: option.value,
                                 title: Column(
                                   crossAxisAlignment: CrossAxisAlignment.start,
diff --git a/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart b/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart
index 0bd6dff8e..a54aea1d2 100644
--- a/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart
+++ b/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:reactive_forms/reactive_forms.dart';
+import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/common_views/form_consumer_widget.dart';
 import 'package:studyu_designer_v2/common_views/form_control_label.dart';
 import 'package:studyu_designer_v2/common_views/form_table_layout.dart';
@@ -57,8 +58,10 @@ class StudyScheduleFormView extends FormConsumerWidget {
               labelHelpText: tr.form_field_crossover_schedule_sequence_tooltip,
               input: DropdownButtonFormField(
                 //formControl: formViewModel.sequenceTypeControl,
-                onChanged: (value) =>
-                    formViewModel.sequenceTypeControl.value = value,
+                onChanged: formViewModel.sequenceTypeControl.disabled
+                    ? null
+                    : (PhaseSequence? value) =>
+                        formViewModel.sequenceTypeControl.value = value,
                 value: formViewModel.sequenceTypeControl.value,
                 decoration: InputDecoration(
                   helperText:
@@ -87,6 +90,7 @@ class StudyScheduleFormView extends FormConsumerWidget {
                   Container(
                     constraints: const BoxConstraints(maxWidth: 70),
                     child: TextField(
+                      readOnly: formViewModel.phaseDurationControl.disabled,
                       controller: TextEditingController()
                         ..value = TextEditingValue(
                           text: formViewModel.phaseDurationControl.value
@@ -130,6 +134,7 @@ class StudyScheduleFormView extends FormConsumerWidget {
                   Container(
                     constraints: const BoxConstraints(maxWidth: 70),
                     child: TextField(
+                      readOnly: formViewModel.numCyclesControl.disabled,
                       //formControl: formViewModel.numCyclesControl,
                       onChanged: (value) => formViewModel
                           .numCyclesControl.value = int.parse(value),
@@ -173,8 +178,10 @@ class StudyScheduleFormView extends FormConsumerWidget {
                     constraints: const BoxConstraints(maxWidth: 70),
                     child: Checkbox(
                       value: formViewModel.includeBaselineControl.value,
-                      onChanged: (value) =>
-                          formViewModel.includeBaselineControl.value = value,
+                      onChanged: formViewModel.includeBaselineControl.disabled
+                          ? null
+                          : (value) => formViewModel
+                              .includeBaselineControl.value = value,
                       //formControl: formViewModel.includeBaselineControl,
                     ),
                   ),

From f9a59855329479056f221b71b4aad5f3f31baedb Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Tue, 9 Jul 2024 23:20:34 +0200
Subject: [PATCH 267/314] fix: schedule missmatch

---
 designer_v2/lib/features/monitor/participant_details_view.dart | 3 ++-
 designer_v2/lib/features/monitor/study_monitor_page.dart       | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index 9ec39b68f..b278cb9fe 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -14,12 +14,14 @@ class ParticipantDetailsView extends ConsumerWidget {
     required this.monitorItem,
     required this.interventions,
     required this.observations,
+    required this.studySchedule,
     super.key,
   });
 
   final StudyMonitorItem monitorItem;
   final List<Intervention> interventions;
   final List<Observation> observations;
+  final StudySchedule studySchedule;
 
   static const Color incompleteColor = Color.fromARGB(255, 234, 234, 234);
   // Add transparency to increase the readability of the text
@@ -86,7 +88,6 @@ class ParticipantDetailsView extends ConsumerWidget {
   }
 
   Widget _buildPerDayStatus() {
-    final studySchedule = StudySchedule();
     final int totalCompletedDays = monitorItem.missedTasksPerDay.length;
 
     final phases = <StudyPhase>[];
diff --git a/designer_v2/lib/features/monitor/study_monitor_page.dart b/designer_v2/lib/features/monitor/study_monitor_page.dart
index e2a67f1dd..87bb7f042 100644
--- a/designer_v2/lib/features/monitor/study_monitor_page.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_page.dart
@@ -222,6 +222,7 @@ class StudyMonitorScreen extends StudyPageWidget {
         monitorItem: item,
         interventions: study.interventions,
         observations: study.observations,
+        studySchedule: study.schedule,
       ),
       actionButtons: [
         retainSizeInAppBar(

From 18034f9754d2b2a9e5ad75306de7228cbf6acd1a Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Tue, 9 Jul 2024 23:49:30 +0200
Subject: [PATCH 268/314] feat: add message when no progress available

---
 .../features/monitor/participant_details_view.dart  | 11 ++++++++++-
 designer_v2/lib/localization/app_de.arb             | 13 +++++++------
 designer_v2/lib/localization/app_en.arb             |  1 +
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index b278cb9fe..033663e33 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -9,6 +9,8 @@ import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/localization/locale_providers.dart';
 import 'package:studyu_designer_v2/utils/extensions.dart';
 
+import '../../common_views/empty_body.dart';
+
 class ParticipantDetailsView extends ConsumerWidget {
   const ParticipantDetailsView({
     required this.monitorItem,
@@ -41,7 +43,14 @@ class ParticipantDetailsView extends ConsumerWidget {
           text: tr.participant_details_study_days_description,
         ),
         const SizedBox(height: 16.0),
-        _buildPerDayStatus(),
+        if (monitorItem.missedTasksPerDay.isNotEmpty)
+          _buildPerDayStatus()
+        else
+          EmptyBody(
+            icon: Icons.hourglass_empty,
+            title: tr.participant_details_progress_empty_title,
+            description: "",
+          ),
         const SizedBox(height: 16.0),
         _buildColorLegend(),
       ],
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index 16e3f701a..f7d3cb0fb 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -496,12 +496,13 @@
   "participant_details_study_days_overview": "Übersicht über Studientage",
   "participant_details_study_days_description": "Dieser Abschnitt bietet einen Überblick über die täglichen Aktivitäten des Teilnehmers in der Studie. Die Farblegende zeigt den Status der täglichen Aufgaben an. Bewege den Mauszeiger über die Studientage, um mehr Details über die tägliche Aktivität des Teilnehmers zu erfahren.",
   "participant_details_color_legend_title": "Farblegende",
-"participant_details_color_legend_completed": "Alle Aufgaben abgeschlossen",
-"participant_details_color_legend_partially_completed": "Einige Aufgaben unvollständig",
-"participant_details_color_legend_missed": "Alle Aufgaben verpasst",
-"participant_details_completed_legend_tooltip": "Alle Interventions- und Umfrageaufgaben wurden abgeschlossen",
-"participant_details_partially_completed_legend_tooltip": "Nicht alle Interventions- oder Umfrageaufgaben wurden abgeschlossen",
-"participant_details_incomplete_legend_tooltip": "Keine Interventions- oder Umfrageaufgaben wurden abgeschlossen",
+  "participant_details_color_legend_completed": "Alle Aufgaben abgeschlossen",
+  "participant_details_color_legend_partially_completed": "Einige Aufgaben unvollständig",
+  "participant_details_color_legend_missed": "Alle Aufgaben verpasst",
+  "participant_details_completed_legend_tooltip": "Alle Interventions- und Umfrageaufgaben wurden abgeschlossen",
+  "participant_details_partially_completed_legend_tooltip": "Nicht alle Interventions- oder Umfrageaufgaben wurden abgeschlossen",
+  "participant_details_incomplete_legend_tooltip": "Keine Interventions- oder Umfrageaufgaben wurden abgeschlossen",
+  "participant_details_progress_empty_title":"Es sind noch keine Fortschrittsdaten verfügbar",
   "monitoring_no_participants_title": "Es gibt noch keine Teilnehmer in dieser Studie",
   "monitoring_no_participants_description": "Sobald Teilnehmer in der Studie eingeschrieben sind, kann hier deren Fortschritt überwacht werden.",
   "monitoring_participants_title": "Teilnehmerübersicht",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index 864d393aa..2fc32fdb3 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -549,6 +549,7 @@
   "participant_details_completed_legend_tooltip": "All intervention and survey tasks have been completed for this day",
   "participant_details_partially_completed_legend_tooltip": "Not all intervention or survey tasks have been completed for this day",
   "participant_details_incomplete_legend_tooltip": "No intervention or survey tasks have been completed for this day",
+  "participant_details_progress_empty_title":"No progress data is available yet",
   "monitoring_no_participants_title": "There are no participants in this study yet",
   "monitoring_no_participants_description": "Once participants have enrolled in your study, you can monitor their progress and view their data here.",
   "monitoring_participants_title": "Participant overview",

From 01e2f0da539eb51dfc329f8e1b51ef19c7121dec Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Wed, 10 Jul 2024 10:50:22 +0200
Subject: [PATCH 269/314] chore: format

---
 designer_v2/lib/features/monitor/participant_details_view.dart | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index 033663e33..15a9a98d5 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -2,6 +2,7 @@ import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:studyu_core/core.dart';
+import 'package:studyu_designer_v2/common_views/empty_body.dart';
 import 'package:studyu_designer_v2/common_views/text_paragraph.dart';
 import 'package:studyu_designer_v2/common_views/utils.dart';
 import 'package:studyu_designer_v2/domain/study_monitoring.dart';
@@ -9,8 +10,6 @@ import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/localization/locale_providers.dart';
 import 'package:studyu_designer_v2/utils/extensions.dart';
 
-import '../../common_views/empty_body.dart';
-
 class ParticipantDetailsView extends ConsumerWidget {
   const ParticipantDetailsView({
     required this.monitorItem,

From a0158df9c14bedc65a2e1cc1c7ddf119a07d2ab7 Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Wed, 10 Jul 2024 14:27:19 +0200
Subject: [PATCH 270/314] fix: sequence > 3 cycle

---
 .../lib/features/monitor/participant_details_view.dart    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index 15a9a98d5..1b2af63a2 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -134,8 +134,12 @@ class ParticipantDetailsView extends ConsumerWidget {
           ? baselineAdjustmentEnd
           : totalCompletedDays;
 
-      final String interventionName =
-          sequence[i] == "A" ? interventions[0].name! : interventions[1].name!;
+      var sequenceIndex = i;
+      if (sequenceIndex > 3) sequenceIndex = i % 4;
+
+      final String interventionName = sequence[sequenceIndex] == "A"
+          ? interventions[0].name!
+          : interventions[1].name!;
 
       phases.add(
         StudyPhase(

From 2a3ab92d9314c8f83b9bd1381cb9470bdd4d1f72 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 10 Jul 2024 15:22:19 +0200
Subject: [PATCH 271/314] fix: improve translations

---
 designer_v2/l10n-missing.txt            | 50 +------------------------
 designer_v2/lib/localization/app_de.arb |  3 +-
 designer_v2/lib/localization/app_en.arb |  3 +-
 3 files changed, 5 insertions(+), 51 deletions(-)

diff --git a/designer_v2/l10n-missing.txt b/designer_v2/l10n-missing.txt
index 53ec61b09..9e26dfeeb 100644
--- a/designer_v2/l10n-missing.txt
+++ b/designer_v2/l10n-missing.txt
@@ -1,49 +1 @@
-{
-  "de": [
-    "report_status_primary",
-    "report_status_secondary",
-    "report_status_primary_description",
-    "report_status_secondary_description",
-    "form_report_create",
-    "form_report_edit",
-    "form_report_readonly",
-    "form_field_report_title_required",
-    "form_field_report_text_required",
-    "form_array_reports_empty_title",
-    "form_array_report_items_title",
-    "form_array_report_items_description",
-    "form_array_report_items_test",
-    "form_array_reports_empty_description",
-    "form_array_reports_new",
-    "form_field_report_title",
-    "form_field_report_title_tooltip",
-    "form_field_report_title_hint",
-    "form_field_report_text",
-    "form_field_report_text_tooltip",
-    "form_field_report_text_hint",
-    "form_field_report_section_type",
-    "form_field_report_section_type_tooltip",
-    "form_field_report_section_type_description",
-    "form_field_report_improvementDirection_title",
-    "form_field_report_improvementDirection_tooltip",
-    "reportSection_type_average",
-    "form_field_report_average_temporalAggregation_title",
-    "form_field_report_average_temporalAggregation_tooltip",
-    "reportSection_type_temporalAggregation_day",
-    "reportSection_type_temporalAggregation_phase",
-    "reportSection_type_temporalAggregation_intervention",
-    "form_field_report_temporalAggregation_required",
-    "reportSection_type_linearRegression",
-    "reportSection_type_improvementDirection_positive",
-    "reportSection_type_improvementDirection_negative",
-    "form_field_report_improvementDirection_required",
-    "form_field_report_linearRegression_alpha_title",
-    "form_field_report_linearRegression_alpha_tooltip",
-    "form_field_report_linearRegression_alpha_hint",
-    "form_field_report_alphaConfidence_required",
-    "form_field_report_alphaConfidence_number",
-    "form_field_report_data_source_title",
-    "form_field_report_data_source_tooltip",
-    "form_field_report_data_source_required"
-  ]
-}
+{}
\ No newline at end of file
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index f16c6015a..2099b2d91 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -503,7 +503,8 @@
   "participant_details_completed_legend_tooltip": "Alle Interventions- und Umfrageaufgaben wurden abgeschlossen",
   "participant_details_partially_completed_legend_tooltip": "Nicht alle Interventions- oder Umfrageaufgaben wurden abgeschlossen",
   "participant_details_incomplete_legend_tooltip": "Keine Interventions- oder Umfrageaufgaben wurden abgeschlossen",
-  "participant_details_progress_empty_title":"Es sind noch keine Fortschrittsdaten verfügbar",
+  "participant_details_progress_empty_title": "Keine Daten verfügbar",
+  "participant_details_progress_empty_description": "Sobald der Teilnehmer mit der Studie beginnt, werden hier tägliche Aktivitäten angezeigt.",
   "monitoring_no_participants_title": "Es gibt noch keine Teilnehmer in dieser Studie",
   "monitoring_no_participants_description": "Sobald Teilnehmer in der Studie eingeschrieben sind, kann hier deren Fortschritt überwacht werden.",
   "monitoring_participants_title": "Teilnehmerübersicht",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index c2fe45d9c..0ea0491c8 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -549,7 +549,8 @@
   "participant_details_completed_legend_tooltip": "All intervention and survey tasks have been completed for this day",
   "participant_details_partially_completed_legend_tooltip": "Not all intervention or survey tasks have been completed for this day",
   "participant_details_incomplete_legend_tooltip": "No intervention or survey tasks have been completed for this day",
-  "participant_details_progress_empty_title":"No progress data is available yet",
+  "participant_details_progress_empty_title":"No progress data available yet",
+  "participant_details_progress_empty_description":"Once the participant has started the study, you can monitor their progress here.",
   "monitoring_no_participants_title": "There are no participants in this study yet",
   "monitoring_no_participants_description": "Once participants have enrolled in your study, you can monitor their progress and view their data here.",
   "monitoring_participants_title": "Participant overview",

From d8284b33c19a3bc04e66c91a5204e684f090f9d3 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 10 Jul 2024 15:53:59 +0200
Subject: [PATCH 272/314] fix: spacing

---
 .../monitor/participant_details_view.dart     | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index 1b2af63a2..c65a59905 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -38,20 +38,26 @@ class ParticipantDetailsView extends ConsumerWidget {
         _buildParticipantInfo(languageCode),
         const SizedBox(height: 8.0),
         const Divider(),
-        TextParagraph(
-          text: tr.participant_details_study_days_description,
-        ),
-        const SizedBox(height: 16.0),
+        const SizedBox(height: 8.0),
         if (monitorItem.missedTasksPerDay.isNotEmpty)
-          _buildPerDayStatus()
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              TextParagraph(
+                text: tr.participant_details_study_days_description,
+              ),
+              const SizedBox(height: 16.0),
+              _buildPerDayStatus(),
+              const SizedBox(height: 16.0),
+              _buildColorLegend(),
+            ],
+          )
         else
           EmptyBody(
             icon: Icons.hourglass_empty,
             title: tr.participant_details_progress_empty_title,
-            description: "",
+            description: tr.participant_details_progress_empty_description,
           ),
-        const SizedBox(height: 16.0),
-        _buildColorLegend(),
       ],
     );
   }
@@ -175,7 +181,7 @@ class ParticipantDetailsView extends ConsumerWidget {
                   )
                   .toList(),
             ),
-            const SizedBox(height: 10),
+            if (phaseIndex < phases.length - 1) const SizedBox(height: 10),
           ],
         );
       }).toList(),

From f76a757b8e15051e92adc9bad040abf178cce561 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 10 Jul 2024 15:54:51 +0200
Subject: [PATCH 273/314] fix: more translations

---
 designer_v2/lib/localization/app_de.arb | 48 ++++++++++++++++++++++++-
 designer_v2/lib/localization/app_en.arb |  2 +-
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index 2099b2d91..8657e746c 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -428,6 +428,52 @@
       "count": {}
     }
   },
+  "@__________________STUDYPAGE_DESIGN_REPORTS__________________": {},
+  "report_status_primary": "Primär",
+  "report_status_secondary": "Sekundär",
+  "report_status_primary_description": "Primärbericht",
+  "report_status_secondary_description": "Sekundärbericht",
+  "form_report_create": "Neuer Bericht",
+  "form_report_edit": "Bericht bearbeiten",
+  "form_report_readonly": "Bericht ansehen",
+  "form_field_report_title_required": "Du musst einen Titel für deinen Bericht angeben",
+  "form_field_report_text_required": "Die Beschreibung für deinen Bericht darf nicht leer sein",
+  "form_array_reports_empty_title": "Keine Berichte definiert",
+  "form_array_report_items_title": "Berichte",
+  "form_array_report_items_description": "Definiere, wie der Bericht, den deine Teilnehmer erhalten, aussehen soll. Ein Bericht umfasst verschiedene Abschnitte, wobei der erste der primäre Abschnitt ist. Für jeden Abschnitt kannst du definieren, ob die Daten als Durchschnitt oder über eine lineare Regression der Benutzerdaten berichtet werden sollen. Du kannst wählen, ob die Daten für einzelne Tage, Phasen oder für jede Intervention berichtet werden. Die Datenquelle definiert, auf welcher Beobachtung der Berichtsabschnitt basiert.",
+  "form_array_report_items_test": "Berichte testen (tba)",
+  "form_array_reports_empty_description": "Du musst mindestens einen Bericht definieren, um deinen Teilnehmern Feedback zu geben.",
+  "form_array_reports_new": "Neuen Bericht hinzufügen",
+  "form_field_report_title": "Titel",
+  "form_field_report_title_tooltip": "Gib einen kurzen Titel für den Bericht ein.",
+  "form_field_report_title_hint": "Kurzen Titel eingeben",
+  "form_field_report_text": "Berichtsbeschreibung",
+  "form_field_report_text_tooltip": "Gib eine Beschreibung für den Bericht ein",
+  "form_field_report_text_hint": "Berichtsbeschreibung eingeben",
+  "form_field_report_section_type": "Berichtstyp",
+  "form_field_report_section_type_tooltip": "Wähle einen Berichtstyp",
+  "form_field_report_section_type_description": "Wähle den Berichtstyp, der zu deinem Bericht passt.",
+  "form_field_report_improvementDirection_title": "Verbesserungsrichtung",
+  "form_field_report_improvementDirection_tooltip": "Definiere die Verbesserungsrichtung",
+  "reportSection_type_average": "Durchschnitt",
+  "form_field_report_average_temporalAggregation_title": "Zeitliche Aggregation",
+  "form_field_report_average_temporalAggregation_tooltip": "Definiere die zeitliche Aggregation",
+  "reportSection_type_temporalAggregation_day": "Tag",
+  "reportSection_type_temporalAggregation_phase": "Phase",
+  "reportSection_type_temporalAggregation_intervention": "Intervention",
+  "form_field_report_temporalAggregation_required": "Ein Wert für die zeitliche Aggregation muss definiert werden",
+  "reportSection_type_linearRegression": "Lineare Regression",
+  "reportSection_type_improvementDirection_positive": "Positiv",
+  "reportSection_type_improvementDirection_negative": "Negativ",
+  "form_field_report_improvementDirection_required": "Eine Verbesserungsrichtung muss definiert werden",
+  "form_field_report_linearRegression_alpha_title": "Alpha-Vertrauensniveau",
+  "form_field_report_linearRegression_alpha_tooltip": "Definiere das Alpha-Vertrauensniveau",
+  "form_field_report_linearRegression_alpha_hint": "Gib einen numerischen Wert ein",
+  "form_field_report_alphaConfidence_required": "Ein Alpha-Vertrauenswert muss definiert werden",
+  "form_field_report_alphaConfidence_number": "Der Alpha-Vertrauenswert muss eine numerische Zahl sein",
+  "form_field_report_data_source_title": "Datenquelle",
+  "form_field_report_data_source_tooltip": "Die Datenquelle definiert, auf welcher Beobachtung der Berichtsabschnitt basiert. Die Beobachtung muss eine Frage mit einem numerischen Ergebnis sein, z.B. eine Skalenfrage.",
+  "form_field_report_data_source_required": "Eine Datenquelle muss definiert werden",
   "@__________________STUDYPAGE_TEST__________________": {},
   "study_test_page_description": "Im Testmodus kannst du die Studie aus Teilnehmersicht testen.",
   "navlink_study_test_help": "Wie funktioniert's?",
@@ -441,7 +487,7 @@
   "action_button_study_test_reset": "Zurücksetzen",
   "action_button_study_test_open_new_tab": "In neuem Fenster öffnen",
   "banner_study_test_unavailable": "Um den Testmodus nutzen zu können, gib bitte folgende Informationen korrekt & vollständig ein:",
-  "banner_study_preview_unavailable": "Um die Vorschau nutzen zu können, gib bitte folgende Informationen korrekt & vollständig ein:",
+  "banner_study_preview_unavailable": "Um die Vorschau nutzen zu können, gib bitte folgende Informationen korrekt und vollständig ein:",
   "dialog_study_test_help_title": "Teste deine Studie!",
   "dialog_study_test_help_description": "Im Testmodus siehst du deine Studie aus Teilnehmersicht in der StudyU App, sodass du sie für deine Zwecke anpassen & sicherstellen kannst, dass alles wie vorgesehen funktioniert.",
   "dialog_study_test_section_tips": "⭐ Profi-Tipps",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index 0ea0491c8..d29e9700c 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -444,7 +444,7 @@
   "form_array_report_items_title": "Reports",
   "form_array_report_items_description": "Define how the report that your participants receive should look like. A report includes various sections, the first of which is the primary section. For each section you can define if the data should be reported as average or via a linear regression of the user's data. You can choose whether the data is reported for individual days, phases or for each intervention. The data source defines which observation the report section is based on.",
   "form_array_report_items_test": "Test Reports (tba)",
-  "form_array_reports_empty_description": "Define a report for your study participants",
+  "form_array_reports_empty_description": "You need to define at least one report to provide feedback to your participants.",
   "form_array_reports_new": "Add new report",
   "form_field_report_title": "Title",
   "form_field_report_title_tooltip": "Enter a short title for the report.",

From dbd47f496979036965ac49ddd5ae1c28896cade3 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 10 Jul 2024 16:38:54 +0200
Subject: [PATCH 274/314] fix: provide legend for missed and completed symbols

---
 .../monitor/participant_details_view.dart     | 79 +++++++++++++------
 designer_v2/lib/localization/app_de.arb       |  6 +-
 designer_v2/lib/localization/app_en.arb       |  6 +-
 3 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index c65a59905..a5540ecd2 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -257,25 +257,46 @@ class ParticipantDetailsView extends ConsumerWidget {
           style: const TextStyle(fontWeight: FontWeight.bold),
         ),
         const SizedBox(height: 8.0),
-        Row(
+        Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            _buildLegendItem(
-              completeColor,
-              tr.participant_details_color_legend_completed,
-              tr.participant_details_completed_legend_tooltip,
-            ),
-            const SizedBox(width: 16.0),
-            _buildLegendItem(
-              partiallyComplete,
-              tr.participant_details_color_legend_partially_completed,
-              tr.participant_details_partially_completed_legend_tooltip,
-              gradient: true,
+            Row(
+              children: [
+                _buildLegendItem(
+                  color: completeColor,
+                  tr.participant_details_color_legend_completed,
+                  tr.participant_details_completed_legend_tooltip,
+                ),
+                const SizedBox(width: 16.0),
+                _buildLegendItem(
+                  color: partiallyComplete,
+                  tr.participant_details_color_legend_partially_completed,
+                  tr.participant_details_partially_completed_legend_tooltip,
+                  gradient: true,
+                ),
+                const SizedBox(width: 16.0),
+                _buildLegendItem(
+                  color: incompleteColor,
+                  tr.participant_details_color_legend_missed,
+                  tr.participant_details_incomplete_legend_tooltip,
+                ),
+              ],
             ),
-            const SizedBox(width: 16.0),
-            _buildLegendItem(
-              incompleteColor,
-              tr.participant_details_color_legend_missed,
-              tr.participant_details_incomplete_legend_tooltip,
+            const SizedBox(height: 8.0),
+            Row(
+              children: [
+                _buildLegendItem(
+                  widget: const Text('\u{2705}'),
+                  tr.participant_details_color_legend_completed_task,
+                  tr.participant_details_color_legend_completed_task_tooltip,
+                ),
+                const SizedBox(width: 16.0),
+                _buildLegendItem(
+                  widget: const Text('\u{274C}'),
+                  tr.participant_details_color_legend_missed_task,
+                  tr.participant_details_color_legend_missed_task_tooltip,
+                ),
+              ],
             ),
           ],
         ),
@@ -284,24 +305,30 @@ class ParticipantDetailsView extends ConsumerWidget {
   }
 
   Widget _buildLegendItem(
-    Color color,
     String text,
     String tooltipMessage, {
+    Color? color,
+    Widget? widget,
     bool gradient = false,
   }) {
+    if (color == null && widget == null) {
+      throw ArgumentError('Only color or widget can be provided.');
+    }
     return Tooltip(
       message: tooltipMessage,
       child: Row(
         children: [
-          Container(
-            width: 20.0,
-            height: 20.0,
-            decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(3),
-              color: color,
-              gradient: gradient ? _buildGradient() : null,
+          if (color != null)
+            Container(
+              width: 20.0,
+              height: 20.0,
+              decoration: BoxDecoration(
+                borderRadius: BorderRadius.circular(3),
+                color: color,
+                gradient: gradient ? _buildGradient() : null,
+              ),
             ),
-          ),
+          if (widget != null) widget,
           const SizedBox(width: 8.0),
           Text(text),
         ],
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index 8657e746c..5353aa488 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -542,7 +542,11 @@
   "participant_details_title": "Teilnehmerdetails",
   "participant_details_study_days_overview": "Übersicht über Studientage",
   "participant_details_study_days_description": "Dieser Abschnitt bietet einen Überblick über die täglichen Aktivitäten des Teilnehmers in der Studie. Die Farblegende zeigt den Status der täglichen Aufgaben an. Bewege den Mauszeiger über die Studientage, um mehr Details über die tägliche Aktivität des Teilnehmers zu erfahren.",
-  "participant_details_color_legend_title": "Farblegende",
+  "participant_details_color_legend_title": "Legende",
+  "participant_details_color_legend_completed_task": "Completed task",
+  "participant_details_color_legend_completed_task_tooltip": "The participant has completed this task",
+  "participant_details_color_legend_missed_task": "Missed task",
+  "participant_details_color_legend_missed_task_tooltip": "The participant has missed this task",
   "participant_details_color_legend_completed": "Alle Aufgaben abgeschlossen",
   "participant_details_color_legend_partially_completed": "Einige Aufgaben unvollständig",
   "participant_details_color_legend_missed": "Alle Aufgaben verpasst",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index d29e9700c..f95d86771 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -542,7 +542,11 @@
   "participant_details_title": "Participant details",
   "participant_details_study_days_overview": "Study days overview",
   "participant_details_study_days_description": "This section provides an overview of the participant's progress in the study. The color coding indicates the status of the participant's tasks on each day. Hover over each day to see more details about the participant's activity.",
-  "participant_details_color_legend_title": "Color legend",
+  "participant_details_color_legend_title": "Legend",
+  "participant_details_color_legend_completed_task": "Completed task",
+  "participant_details_color_legend_completed_task_tooltip": "The participant has completed this task",
+  "participant_details_color_legend_missed_task": "Missed task",
+  "participant_details_color_legend_missed_task_tooltip": "The participant has missed this task",
   "participant_details_color_legend_completed": "Completed all tasks",
   "participant_details_color_legend_partially_completed": "Some tasks incomplete",
   "participant_details_color_legend_missed": "Missed all tasks",

From 4385b35344c6eee0a7319d8aee9a253f53adbf38 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 11 Jul 2024 01:32:54 +0200
Subject: [PATCH 275/314] fix: adapt phase calculation logic for custom study

---
 core/lib/src/models/study_schedule/study_schedule.dart | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/lib/src/models/study_schedule/study_schedule.dart b/core/lib/src/models/study_schedule/study_schedule.dart
index 615d9363c..2a191a276 100644
--- a/core/lib/src/models/study_schedule/study_schedule.dart
+++ b/core/lib/src/models/study_schedule/study_schedule.dart
@@ -22,7 +22,13 @@ class StudySchedule {
   Map<String, dynamic> toJson() => _$StudyScheduleToJson(this);
 
   int getNumberOfPhases() =>
-      numberOfCycles * numberOfInterventions + (includeBaseline ? 1 : 0);
+      numberOfCycles *
+          (sequence == PhaseSequence.customized
+              ? sequenceCustom.length
+              : StudySchedule.numberOfInterventions) +
+      (includeBaseline ? 1 : 0);
+
+  int get numberOfPhases => getNumberOfPhases();
 
   int get length => getNumberOfPhases() * phaseDuration;
 

From 46ad2d1de2002d8813d9290b493a50c3eb331d6b Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 11 Jul 2024 01:33:38 +0200
Subject: [PATCH 276/314] feat: adapt phase calculation logic, style todos

---
 designer_v2/lib/common_views/utils.dart       |  19 ++-
 designer_v2/lib/constants.dart                |   5 +-
 designer_v2/lib/domain/study_monitoring.dart  | 132 ++++++++----------
 .../interventions_form_view.dart              |  22 +--
 .../monitor/participant_details_view.dart     |  74 ++++++----
 .../features/monitor/study_monitor_page.dart  |  42 +++---
 6 files changed, 149 insertions(+), 145 deletions(-)

diff --git a/designer_v2/lib/common_views/utils.dart b/designer_v2/lib/common_views/utils.dart
index dff1af1e5..2c729e3fd 100644
--- a/designer_v2/lib/common_views/utils.dart
+++ b/designer_v2/lib/common_views/utils.dart
@@ -1,4 +1,6 @@
-import 'package:flutter/widgets.dart';
+import 'package:flutter/material.dart';
+import 'package:studyu_designer_v2/theme.dart';
+import 'package:studyu_designer_v2/utils/extensions.dart';
 
 typedef WidgetDecorator = Widget Function(Widget widget);
 
@@ -43,3 +45,18 @@ extension ColorX on Color {
     return withAlpha((alphaScaleFactor * alpha).round());
   }
 }
+
+Widget interventionPrefix(int rowIdx, BuildContext context) {
+  final theme = Theme.of(context);
+  return Row(
+    children: [
+      Text(
+        ''.alphabetLetterFrom(rowIdx).toUpperCase(),
+        style: TextStyle(
+          color: ThemeConfig.dropdownMenuItemTheme(theme).iconTheme!.color,
+        ),
+      ),
+      const SizedBox(width: 16.0),
+    ],
+  );
+}
diff --git a/designer_v2/lib/constants.dart b/designer_v2/lib/constants.dart
index f84ac181e..7e484948f 100644
--- a/designer_v2/lib/constants.dart
+++ b/designer_v2/lib/constants.dart
@@ -19,6 +19,9 @@ class Config {
   static const minSplashTime = 0;
 
   static const formAutosaveDebounce = 1000;
+
+  static const participantDropoutDuration = 5;
+  static const participantInactiveDuration = 3;
 }
 
 const kPathSeparator = '   /   ';
@@ -46,5 +49,3 @@ const String signupRouteName = 'signup';
 const String forgotPasswordRouteName = 'forgotPassword';
 const String recoverPasswordRouteName = 'recoverPassword';
 const String errorRouteName = 'error';
-const participantDropoutDuration = 5;
-const participantInactiveDuration = 3;
diff --git a/designer_v2/lib/domain/study_monitoring.dart b/designer_v2/lib/domain/study_monitoring.dart
index 51b9e192c..e80d27c7c 100644
--- a/designer_v2/lib/domain/study_monitoring.dart
+++ b/designer_v2/lib/domain/study_monitoring.dart
@@ -1,39 +1,12 @@
 import 'dart:math';
 
+import 'package:collection/collection.dart';
 import 'package:equatable/equatable.dart';
 import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/constants.dart';
 
-class StudyMonitorData {
-  /// Number of participants who are currently active in the study
-  /// Active means that the the study has not ended yet and the participant did not drop out
-  final int activeParticipants;
-
-  // Number of participants who are currently inactive in the study for more than 3 days in a row
-  final int inactiveParticipants;
-
-  /// Number of participants who dropped out of the study before the study ended
-  /// Hint: The is_deleted flag in the study_subject database table marks a participant as dropped out
-  /// Note: If the participant's last activity exceeds 7 days, they will also be counted as a dropout
-  final int dropoutParticipants;
-
-  /// Number of participants who completed the study
-  /// Completed means that the participant has reached the end of the study
-  final int completedParticipants;
-
-  /// List of all participants with their monitoring data
-  final List<StudyMonitorItem> items;
-
-  const StudyMonitorData({
-    required this.activeParticipants,
-    required this.inactiveParticipants,
-    required this.dropoutParticipants,
-    required this.completedParticipants,
-    required this.items,
-  });
-}
-
 class StudyMonitorItem extends Equatable {
+  final StudySubject studySubject;
   final String participantId;
   final String? inviteCode;
   final DateTime startedAt;
@@ -49,6 +22,7 @@ class StudyMonitorItem extends Equatable {
   final List<Set<String>> completedTasksPerDay;
 
   const StudyMonitorItem({
+    required this.studySubject,
     required this.participantId,
     required this.inviteCode,
     required this.startedAt,
@@ -70,7 +44,7 @@ class StudyMonitorItem extends Equatable {
 }
 
 extension StudyMonitoringX on Study {
-  StudyMonitorData get monitorData {
+  List<StudyMonitorItem> get monitorData {
     final List<StudyMonitorItem> items = [];
 
     final participants = this.participants ?? [];
@@ -158,6 +132,7 @@ extension StudyMonitoringX on Study {
 
       items.add(
         StudyMonitorItem(
+          studySubject: participant,
           participantId: participant.id,
           inviteCode: participant.inviteCode,
           startedAt: participant.startedAt!,
@@ -175,50 +150,59 @@ extension StudyMonitoringX on Study {
       );
     }
 
-    int activeParticipants = 0;
-    int inactiveParticipants = 0;
-    int dropoutParticipants = 0;
-    int completedParticipants = 0;
-
-    final participantInactiveDays = DateTime.now()
-        .subtract(const Duration(days: participantInactiveDuration));
-    final participantDropoutDays = DateTime.now()
-        .subtract(const Duration(days: participantDropoutDuration));
-
-    for (final item in items) {
-      if (!item.droppedOut) {
-        if (item.currentDayOfStudy < item.studyDurationInDays) {
-          if (item.lastActivityAt.isAfter(participantInactiveDays)) {
-            activeParticipants += 1; // Active
-          } else {
-            if (item.lastActivityAt.isBefore(participantDropoutDays)) {
-              dropoutParticipants += 1; //dropout
-            } else {
-              inactiveParticipants += 1; // Inactive
-            }
-          }
-        } else {
-          completedParticipants += 1; // Completed
-        }
-      } else {
-        dropoutParticipants += 1; // Dropout
-      }
-    }
+    final participantCategories = items.activeParticipants.toList() +
+        items.inactiveParticipants.toList() +
+        items.dropoutParticipants.toList() +
+        items.completedParticipants.toList();
+    final deepEq = const DeepCollectionEquality.unordered().equals;
+    assert(deepEq(items, participantCategories));
 
-    assert(
-      activeParticipants +
-              inactiveParticipants +
-              dropoutParticipants +
-              completedParticipants ==
-          items.length,
-    );
-
-    return StudyMonitorData(
-      activeParticipants: activeParticipants,
-      inactiveParticipants: inactiveParticipants,
-      dropoutParticipants: dropoutParticipants,
-      completedParticipants: completedParticipants,
-      items: items,
-    );
+    return items;
   }
 }
+
+extension ListX on List<StudyMonitorItem> {
+  static final inactiveDate = DateTime.now()
+      .subtract(const Duration(days: Config.participantInactiveDuration));
+  static final dropoutDate = DateTime.now()
+      .subtract(const Duration(days: Config.participantDropoutDuration));
+
+  static bool Function(StudyMonitorItem p) get studyStillRunning =>
+      (StudyMonitorItem p) => p.currentDayOfStudy < p.studyDurationInDays;
+
+  static bool Function(StudyMonitorItem p) get inactive => (p) =>
+      p.lastActivityAt.isBefore(inactiveDate) &&
+      p.lastActivityAt.isAfter(dropoutDate);
+
+  static bool Function(StudyMonitorItem p) get dropout =>
+      (p) => p.droppedOut || dropoutByDuration(p) && studyStillRunning(p);
+
+  static bool Function(StudyMonitorItem p) get dropoutByDuration =>
+      (p) => p.lastActivityAt.isBefore(dropoutDate);
+
+  /// Number of participants who are currently active in the study
+  /// Active means that the the study has not ended yet and the participant
+  /// did not drop out
+  Iterable<StudyMonitorItem> get activeParticipants =>
+      where((p) => !dropout(p) && !inactive(p) && studyStillRunning(p));
+
+  /// Number of participants who are currently inactive in the study for more
+  /// than [participantDropoutDuration] days in a row
+  Iterable<StudyMonitorItem> get inactiveParticipants => where(
+        (p) => !dropout(p) && inactive(p) && studyStillRunning(p),
+      );
+
+  /// Number of participants who dropped out of the study before the study ended
+  /// Hint: The is_deleted flag in the study_subject database table marks a
+  /// participant as dropped out
+  /// Note: If the participant's last activity exceeds
+  /// [participantDropoutDuration] days, they will also be counted as a dropout
+  Iterable<StudyMonitorItem> get dropoutParticipants => where(
+        (p) => dropout(p),
+      );
+
+  /// Number of participants who completed the study
+  /// Completed means that the participant has reached the end of the study
+  Iterable<StudyMonitorItem> get completedParticipants =>
+      where((p) => !dropout(p) && !studyStillRunning(p));
+}
diff --git a/designer_v2/lib/features/design/interventions/interventions_form_view.dart b/designer_v2/lib/features/design/interventions/interventions_form_view.dart
index bedf14852..bc11a1728 100644
--- a/designer_v2/lib/features/design/interventions/interventions_form_view.dart
+++ b/designer_v2/lib/features/design/interventions/interventions_form_view.dart
@@ -5,6 +5,7 @@ import 'package:studyu_core/core.dart';
 import 'package:studyu_designer_v2/common_views/async_value_widget.dart';
 import 'package:studyu_designer_v2/common_views/text_hyperlink.dart';
 import 'package:studyu_designer_v2/common_views/text_paragraph.dart';
+import 'package:studyu_designer_v2/common_views/utils.dart';
 import 'package:studyu_designer_v2/features/design/interventions/intervention_form_controller.dart';
 import 'package:studyu_designer_v2/features/design/interventions/study_schedule_form_view.dart';
 import 'package:studyu_designer_v2/features/design/study_design_page_view.dart';
@@ -13,7 +14,6 @@ import 'package:studyu_designer_v2/features/forms/form_array_table.dart';
 import 'package:studyu_designer_v2/features/study/study_controller.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/theme.dart';
-import 'package:studyu_designer_v2/utils/extensions.dart';
 
 class StudyDesignInterventionsFormView extends StudyDesignPageWidget {
   const StudyDesignInterventionsFormView(super.studyId, {super.key});
@@ -21,8 +21,6 @@ class StudyDesignInterventionsFormView extends StudyDesignPageWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final state = ref.watch(studyControllerProvider(studyId));
-    final theme = Theme.of(context);
-
     return AsyncValueWidget<Study>(
       value: state.study,
       data: (study) {
@@ -68,22 +66,8 @@ class StudyDesignInterventionsFormView extends StudyDesignPageWidget {
                         emptyDescription:
                             tr.form_array_interventions_empty_description,
                         hideLeadingTrailingWhenEmpty: true,
-                        rowPrefix: (context, viewModel, rowIdx) {
-                          return Row(
-                            children: [
-                              Text(
-                                ''.alphabetLetterFrom(rowIdx).toUpperCase(),
-                                style: TextStyle(
-                                  color:
-                                      ThemeConfig.dropdownMenuItemTheme(theme)
-                                          .iconTheme!
-                                          .color,
-                                ),
-                              ),
-                              const SizedBox(width: 16.0),
-                            ],
-                          );
-                        },
+                        rowPrefix: (context, viewModel, rowIdx) =>
+                            interventionPrefix(rowIdx, context),
                       );
                     },
                   );
diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
index a5540ecd2..ab6aa9bbb 100644
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant_details_view.dart
@@ -11,18 +11,19 @@ import 'package:studyu_designer_v2/localization/locale_providers.dart';
 import 'package:studyu_designer_v2/utils/extensions.dart';
 
 class ParticipantDetailsView extends ConsumerWidget {
-  const ParticipantDetailsView({
+  ParticipantDetailsView({
     required this.monitorItem,
-    required this.interventions,
-    required this.observations,
-    required this.studySchedule,
+    required this.study,
     super.key,
-  });
+  })  : studySchedule = study.schedule,
+        interventions = study.interventions,
+        observations = study.observations;
 
   final StudyMonitorItem monitorItem;
+  final Study study;
+  final StudySchedule studySchedule;
   final List<Intervention> interventions;
   final List<Observation> observations;
-  final StudySchedule studySchedule;
 
   static const Color incompleteColor = Color.fromARGB(255, 234, 234, 234);
   // Add transparency to increase the readability of the text
@@ -47,7 +48,7 @@ class ParticipantDetailsView extends ConsumerWidget {
                 text: tr.participant_details_study_days_description,
               ),
               const SizedBox(height: 16.0),
-              _buildPerDayStatus(),
+              _buildPerDayStatus(context),
               const SizedBox(height: 16.0),
               _buildColorLegend(),
             ],
@@ -101,9 +102,8 @@ class ParticipantDetailsView extends ConsumerWidget {
     );
   }
 
-  Widget _buildPerDayStatus() {
-    final int totalCompletedDays = monitorItem.missedTasksPerDay.length;
-
+  Widget _buildPerDayStatus(BuildContext context) {
+    final totalCompletedDays = monitorItem.missedTasksPerDay.length;
     final phases = <StudyPhase>[];
 
     if (studySchedule.includeBaseline) {
@@ -120,9 +120,11 @@ class ParticipantDetailsView extends ConsumerWidget {
       );
     }
 
-    final String sequence = studySchedule.nameOfSequence;
-
-    for (int i = 0; i < studySchedule.numberOfCycles * 2; i++) {
+    final numberOfInterventionPhases = studySchedule.numberOfCycles *
+        (studySchedule.sequence == PhaseSequence.customized
+            ? studySchedule.sequenceCustom.length
+            : StudySchedule.numberOfInterventions);
+    for (int i = 0; i < numberOfInterventionPhases; i++) {
       final int phaseDuration = studySchedule.phaseDuration;
       final bool includeBaseline = studySchedule.includeBaseline;
       final int baselineAdjustmentStart =
@@ -140,16 +142,15 @@ class ParticipantDetailsView extends ConsumerWidget {
           ? baselineAdjustmentEnd
           : totalCompletedDays;
 
-      var sequenceIndex = i;
-      if (sequenceIndex > 3) sequenceIndex = i % 4;
-
-      final String interventionName = sequence[sequenceIndex] == "A"
-          ? interventions[0].name!
-          : interventions[1].name!;
+      monitorItem.studySubject.study = study;
+      final intervention = monitorItem.studySubject
+          .getInterventionsInOrder()[i + (includeBaseline ? 1 : 0)];
+      final interventionIdx = study.interventions.indexOf(intervention);
 
       phases.add(
         StudyPhase(
-          name: interventionName,
+          name: intervention.name!,
+          prefix: interventionPrefix(interventionIdx, context),
           missedTasksPerDay: monitorItem.missedTasksPerDay.sublist(start, end),
         ),
       );
@@ -165,9 +166,15 @@ class ParticipantDetailsView extends ConsumerWidget {
         return Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text(
-              phase.name,
-              style: const TextStyle(fontWeight: FontWeight.bold),
+            Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                if (phase.prefix != null) phase.prefix!,
+                Text(
+                  phase.name,
+                  style: const TextStyle(fontWeight: FontWeight.bold),
+                ),
+              ],
             ),
             const SizedBox(height: 10),
             Wrap(
@@ -232,20 +239,24 @@ class ParticipantDetailsView extends ConsumerWidget {
     for (final intervention in interventions) {
       for (final task in intervention.tasks) {
         if (missedTaskIds.contains(task.id)) {
-          sb.writeln('\u{274C} ${intervention.name} - ${task.title}');
+          sb.writeln('\u{274C} ${task.title}');
         } else if (completedTaskIds.contains(task.id)) {
-          sb.writeln('\u{2705} ${intervention.name} - ${task.title}');
+          sb.writeln('\u{2705} ${task.title}');
         }
       }
     }
     for (final observation in observations) {
       if (missedTaskIds.contains(observation.id)) {
-        sb.write('\u{274C} ${observation.title}');
+        sb.writeln('\u{274C} ${observation.title}');
       } else if (completedTaskIds.contains(observation.id)) {
-        sb.write('\u{2705} ${observation.title}');
+        sb.writeln('\u{2705} ${observation.title}');
       }
     }
-    return sb.toString();
+    String str = sb.toString();
+    if (str.isNotEmpty) {
+      str = sb.toString().substring(0, sb.length - 1);
+    }
+    return str;
   }
 
   Widget _buildColorLegend() {
@@ -354,7 +365,12 @@ class ParticipantDetailsView extends ConsumerWidget {
 
 class StudyPhase {
   final String name;
+  final Widget? prefix;
   final List<Set<String>> missedTasksPerDay;
 
-  StudyPhase({required this.name, required this.missedTasksPerDay});
+  StudyPhase({
+    required this.name,
+    this.prefix,
+    required this.missedTasksPerDay,
+  });
 }
diff --git a/designer_v2/lib/features/monitor/study_monitor_page.dart b/designer_v2/lib/features/monitor/study_monitor_page.dart
index 87bb7f042..d3c2b485b 100644
--- a/designer_v2/lib/features/monitor/study_monitor_page.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_page.dart
@@ -28,7 +28,7 @@ class StudyMonitorScreen extends StudyPageWidget {
           children: <Widget>[
             _monitorSectionHeader(context, studyMonitorData),
             const SizedBox(height: 32.0),
-            if (studyMonitorData.items.isNotEmpty) ...[
+            if (studyMonitorData.isNotEmpty) ...[
               SelectableText(
                 tr.monitoring_participants_title,
                 style: Theme.of(context).textTheme.headlineSmall,
@@ -36,7 +36,7 @@ class StudyMonitorScreen extends StudyPageWidget {
               Container(width: 32.0),
               StudyMonitorTable(
                 ref: ref,
-                studyMonitorItems: studyMonitorData.items,
+                studyMonitorItems: studyMonitorData,
                 onSelectItem: (item) =>
                     _onSelectParticipant(context, ref, item, study),
               ),
@@ -54,24 +54,29 @@ class StudyMonitorScreen extends StudyPageWidget {
 
   Widget _monitorSectionHeader(
     BuildContext context,
-    StudyMonitorData monitorData,
+    List<StudyMonitorItem> monitorData,
   ) {
     final theme = Theme.of(context);
-    final int total = monitorData.items.length;
+    final int total = monitorData.length;
     const double minPercentage = 0.01; // Minimum percentage for visibility
 
-    double activePercentage = monitorData.activeParticipants / total;
-    double inactivePercentage = monitorData.inactiveParticipants / total;
-    double dropoutPercentage = monitorData.dropoutParticipants / total;
-    double completedPercentage = monitorData.completedParticipants / total;
+    double activePercentage = monitorData.activeParticipants.length / total;
+    double inactivePercentage = monitorData.inactiveParticipants.length / total;
+    double dropoutPercentage = monitorData.dropoutParticipants.length / total;
+    double completedPercentage =
+        monitorData.completedParticipants.length / total;
 
     // Adjust for minimum percentage visibility
-    if (monitorData.activeParticipants == 0) activePercentage = minPercentage;
-    if (monitorData.inactiveParticipants == 0) {
+    if (monitorData.activeParticipants.isEmpty) {
+      activePercentage = minPercentage;
+    }
+    if (monitorData.inactiveParticipants.isEmpty) {
       inactivePercentage = minPercentage;
     }
-    if (monitorData.dropoutParticipants == 0) dropoutPercentage = minPercentage;
-    if (monitorData.completedParticipants == 0) {
+    if (monitorData.dropoutParticipants.isEmpty) {
+      dropoutPercentage = minPercentage;
+    }
+    if (monitorData.completedParticipants.isEmpty) {
       completedPercentage = minPercentage;
     }
 
@@ -137,28 +142,28 @@ class StudyMonitorScreen extends StudyPageWidget {
                   _buildLegend(
                     color: activeColor,
                     text:
-                        '${tr.monitoring_active}: ${monitorData.activeParticipants}',
+                        '${tr.monitoring_active}: ${monitorData.activeParticipants.length}',
                     tooltip: tr.monitoring_active_tooltip,
                   ),
                   const SizedBox(width: 10),
                   _buildLegend(
                     color: inactiveColor,
                     text:
-                        '${tr.monitoring_inactive}: ${monitorData.inactiveParticipants}',
+                        '${tr.monitoring_inactive}: ${monitorData.inactiveParticipants.length}',
                     tooltip: tr.monitoring_inactive_tooltip,
                   ),
                   const SizedBox(width: 10),
                   _buildLegend(
                     color: dropoutColor,
                     text:
-                        '${tr.monitoring_dropout}: ${monitorData.dropoutParticipants}',
+                        '${tr.monitoring_dropout}: ${monitorData.dropoutParticipants.length}',
                     tooltip: tr.monitoring_dropout_tooltip,
                   ),
                   const SizedBox(width: 10),
                   _buildLegend(
                     color: completedColor,
                     text:
-                        '${tr.monitoring_completed}: ${monitorData.completedParticipants}',
+                        '${tr.monitoring_completed}: ${monitorData.completedParticipants.length}',
                     tooltip: tr.monitoring_completed_tooltip,
                   ),
                 ],
@@ -214,15 +219,12 @@ class StudyMonitorScreen extends StudyPageWidget {
     StudyMonitorItem item,
     Study study,
   ) {
-    // TODO: refactor to use [RoutingIntent] for sidesheet (so that it can be triggered from controller)
     showModalSideSheet(
       context: context,
       title: tr.participant_details_title,
       body: ParticipantDetailsView(
         monitorItem: item,
-        interventions: study.interventions,
-        observations: study.observations,
-        studySchedule: study.schedule,
+        study: study,
       ),
       actionButtons: [
         retainSizeInAppBar(

From 60a2876e42b4529fc6dd246f9f63c0afc7e8e887 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 11 Jul 2024 11:44:21 +0200
Subject: [PATCH 277/314] fix: use latest user for dashboard study table

---
 designer_v2/lib/features/dashboard/dashboard_page.dart  | 5 +----
 designer_v2/lib/features/dashboard/dashboard_state.dart | 7 ++++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/designer_v2/lib/features/dashboard/dashboard_page.dart b/designer_v2/lib/features/dashboard/dashboard_page.dart
index 242c2deb8..dc6100af9 100644
--- a/designer_v2/lib/features/dashboard/dashboard_page.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_page.dart
@@ -24,14 +24,11 @@ class DashboardScreen extends ConsumerStatefulWidget {
 }
 
 class _DashboardScreenState extends ConsumerState<DashboardScreen> {
-  late Future<StudyUUser> user;
-
   @override
   void initState() {
     super.initState();
     final controller = ref.read(dashboardControllerProvider.notifier);
     runAsync(() => controller.setStudiesFilter(widget.filter));
-    user = runAsync(() => ref.watch(userRepositoryProvider).fetchUser());
   }
 
   @override
@@ -86,7 +83,7 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
           ),
           const SizedBox(height: 24.0), // spacing between body elements
           FutureBuilder<StudyUUser>(
-            future: user,
+            future: ref.read(userRepositoryProvider).fetchUser(),
             builder: (context, snapshot) {
               if (snapshot.hasData) {
                 return AsyncValueWidget<List<Study>>(
diff --git a/designer_v2/lib/features/dashboard/dashboard_state.dart b/designer_v2/lib/features/dashboard/dashboard_state.dart
index bdb1afb77..eeca8de8f 100644
--- a/designer_v2/lib/features/dashboard/dashboard_state.dart
+++ b/designer_v2/lib/features/dashboard/dashboard_state.dart
@@ -52,9 +52,10 @@ class DashboardState extends Equatable {
       data: (studies) {
         List<Study> updatedStudies =
             studiesFilter.apply(studies: studies, user: currentUser).toList();
-        updatedStudies = filter(studiesToFilter: updatedStudies);
-        updatedStudies =
-            sort(pinnedStudies: pinnedStudies, studiesToSort: updatedStudies);
+        updatedStudies = sort(
+          pinnedStudies: pinnedStudies,
+          studiesToSort: filter(studiesToFilter: updatedStudies),
+        );
         return AsyncValue.data(updatedStudies);
       },
       error: (error, _) => AsyncValue.error(error, StackTrace.current),

From 73649cc844bf1a05a094244e77f1f3dd2507f924 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 11 Jul 2024 12:08:29 +0200
Subject: [PATCH 278/314] fix: redundant click prevention bug

---
 .../tasks/intervention/checkmark_task_widget.dart      |  2 +-
 .../tasks/observation/questionnaire_task_widget.dart   | 10 +++-------
 app/lib/util/misc.dart                                 |  5 +++--
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/lib/screens/study/tasks/intervention/checkmark_task_widget.dart b/app/lib/screens/study/tasks/intervention/checkmark_task_widget.dart
index a363ca969..4bd496479 100644
--- a/app/lib/screens/study/tasks/intervention/checkmark_task_widget.dart
+++ b/app/lib/screens/study/tasks/intervention/checkmark_task_widget.dart
@@ -18,7 +18,7 @@ class CheckmarkTaskWidget extends StatefulWidget {
 }
 
 class _CheckmarkTaskWidgetState extends State<CheckmarkTaskWidget> {
-  DateTime _lastClickTime = DateTime.now();
+  DateTime? _lastClickTime;
   bool _isLoading = false;
 
   @override
diff --git a/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart b/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart
index fe551f9d5..95b889813 100644
--- a/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart
+++ b/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart
@@ -27,7 +27,7 @@ class QuestionnaireTaskWidget extends StatefulWidget {
 class _QuestionnaireTaskWidgetState extends State<QuestionnaireTaskWidget> {
   dynamic response;
   late bool responseValidator;
-  DateTime _lastClickTime = DateTime.now();
+  DateTime? _lastClickTime;
   bool _isLoading = false;
   final GlobalKey<FormState> formKey = GlobalKey<FormState>();
 
@@ -86,12 +86,8 @@ class _QuestionnaireTaskWidgetState extends State<QuestionnaireTaskWidget> {
               backgroundColor: WidgetStateProperty.all<Color>(Colors.green),
             ),
             onPressed: () async {
-              if (isRedundantClick(_lastClickTime)) {
-                return;
-              }
-              if (!formKey.currentState!.validate()) {
-                return;
-              }
+              if (isRedundantClick(_lastClickTime)) return;
+              if (!formKey.currentState!.validate()) return;
               setState(() {
                 _isLoading = true;
                 _lastClickTime = DateTime.now();
diff --git a/app/lib/util/misc.dart b/app/lib/util/misc.dart
index e0ab7bce5..56104d22c 100644
--- a/app/lib/util/misc.dart
+++ b/app/lib/util/misc.dart
@@ -1,7 +1,8 @@
 bool isRedundantClick(
-  DateTime lastClickTime, {
-  Duration interval = const Duration(seconds: 2),
+  DateTime? lastClickTime, {
+  Duration interval = const Duration(seconds: 1),
 }) {
+  if (lastClickTime == null) return false;
   final now = DateTime.now();
   if (now.difference(lastClickTime) > interval) {
     return false;

From 946b70d9354422081f3c4cf41d20b2572091b3c4 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Fri, 12 Jul 2024 13:14:21 +0200
Subject: [PATCH 279/314] refactor: monitor participant section

---
 .../lib/common_views/striped_gradient.dart    |  19 +
 designer_v2/lib/common_views/utils.dart       |   3 +-
 .../interventions_form_view.dart              |   4 +-
 .../features/monitor/participant/colors.dart  |   9 +
 .../participant/participant_details_view.dart |  60 +++
 .../monitor/participant/participant_info.dart |  60 +++
 .../participant/participant_legend.dart       | 107 +++++
 .../participant/participant_square.dart       |  89 +++++
 .../participant/participant_squares.dart      | 141 +++++++
 .../monitor/participant_details_view.dart     | 376 ------------------
 .../features/monitor/study_monitor_page.dart  |   2 +-
 11 files changed, 490 insertions(+), 380 deletions(-)
 create mode 100644 designer_v2/lib/common_views/striped_gradient.dart
 create mode 100644 designer_v2/lib/features/monitor/participant/colors.dart
 create mode 100644 designer_v2/lib/features/monitor/participant/participant_details_view.dart
 create mode 100644 designer_v2/lib/features/monitor/participant/participant_info.dart
 create mode 100644 designer_v2/lib/features/monitor/participant/participant_legend.dart
 create mode 100644 designer_v2/lib/features/monitor/participant/participant_square.dart
 create mode 100644 designer_v2/lib/features/monitor/participant/participant_squares.dart
 delete mode 100644 designer_v2/lib/features/monitor/participant_details_view.dart

diff --git a/designer_v2/lib/common_views/striped_gradient.dart b/designer_v2/lib/common_views/striped_gradient.dart
new file mode 100644
index 000000000..92c458bb0
--- /dev/null
+++ b/designer_v2/lib/common_views/striped_gradient.dart
@@ -0,0 +1,19 @@
+import 'package:flutter/material.dart';
+
+class StripedGradient {
+  StripedGradient({
+    required this.colors,
+  });
+
+  final List<Color> colors;
+
+  LinearGradient get gradient {
+    return LinearGradient(
+      begin: Alignment.topRight,
+      end: const Alignment(0.5, -0.4),
+      stops: const [0.0, 0.5, 0.5, 1],
+      colors: colors,
+      tileMode: TileMode.repeated,
+    );
+  }
+}
diff --git a/designer_v2/lib/common_views/utils.dart b/designer_v2/lib/common_views/utils.dart
index 2c729e3fd..7e56bc4d0 100644
--- a/designer_v2/lib/common_views/utils.dart
+++ b/designer_v2/lib/common_views/utils.dart
@@ -46,8 +46,7 @@ extension ColorX on Color {
   }
 }
 
-Widget interventionPrefix(int rowIdx, BuildContext context) {
-  final theme = Theme.of(context);
+Widget interventionPrefix(int rowIdx, ThemeData theme) {
   return Row(
     children: [
       Text(
diff --git a/designer_v2/lib/features/design/interventions/interventions_form_view.dart b/designer_v2/lib/features/design/interventions/interventions_form_view.dart
index bc11a1728..e6ed2edbd 100644
--- a/designer_v2/lib/features/design/interventions/interventions_form_view.dart
+++ b/designer_v2/lib/features/design/interventions/interventions_form_view.dart
@@ -26,6 +26,8 @@ class StudyDesignInterventionsFormView extends StudyDesignPageWidget {
       data: (study) {
         final formViewModel =
             ref.watch(interventionsFormViewModelProvider(studyId));
+        final theme = Theme.of(context);
+
         return ReactiveForm(
           formGroup: formViewModel.form,
           child: Column(
@@ -67,7 +69,7 @@ class StudyDesignInterventionsFormView extends StudyDesignPageWidget {
                             tr.form_array_interventions_empty_description,
                         hideLeadingTrailingWhenEmpty: true,
                         rowPrefix: (context, viewModel, rowIdx) =>
-                            interventionPrefix(rowIdx, context),
+                            interventionPrefix(rowIdx, theme),
                       );
                     },
                   );
diff --git a/designer_v2/lib/features/monitor/participant/colors.dart b/designer_v2/lib/features/monitor/participant/colors.dart
new file mode 100644
index 000000000..039a6c5d8
--- /dev/null
+++ b/designer_v2/lib/features/monitor/participant/colors.dart
@@ -0,0 +1,9 @@
+import 'package:flutter/material.dart';
+import 'package:studyu_designer_v2/common_views/utils.dart';
+
+const Color incompleteColor = Color.fromARGB(255, 234, 234, 234);
+
+// Add transparency to increase the readability of the text
+Color partiallyCompleteColor = Colors.lightBlue.faded(0.75);
+
+const Color completeColor = Colors.lightBlue;
diff --git a/designer_v2/lib/features/monitor/participant/participant_details_view.dart b/designer_v2/lib/features/monitor/participant/participant_details_view.dart
new file mode 100644
index 000000000..dbcf64ce3
--- /dev/null
+++ b/designer_v2/lib/features/monitor/participant/participant_details_view.dart
@@ -0,0 +1,60 @@
+import 'package:flutter/material.dart';
+import 'package:studyu_core/core.dart';
+import 'package:studyu_designer_v2/common_views/empty_body.dart';
+import 'package:studyu_designer_v2/common_views/text_paragraph.dart';
+import 'package:studyu_designer_v2/domain/study_monitoring.dart';
+import 'package:studyu_designer_v2/features/monitor/participant/participant_info.dart';
+import 'package:studyu_designer_v2/features/monitor/participant/participant_legend.dart';
+import 'package:studyu_designer_v2/features/monitor/participant/participant_squares.dart';
+import 'package:studyu_designer_v2/localization/app_translation.dart';
+
+class ParticipantDetailsView extends StatelessWidget {
+  const ParticipantDetailsView({
+    required this.monitorItem,
+    required this.study,
+    super.key,
+  });
+
+  final StudyMonitorItem monitorItem;
+  final Study study;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        ParticipantInfo(
+          participantId: monitorItem.participantId,
+          inviteCode: monitorItem.inviteCode,
+          startedAt: monitorItem.startedAt,
+          lastActivityAt: monitorItem.lastActivityAt,
+        ),
+        const SizedBox(height: 8.0),
+        const Divider(),
+        const SizedBox(height: 8.0),
+        if (monitorItem.missedTasksPerDay.isNotEmpty)
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              TextParagraph(
+                text: tr.participant_details_study_days_description,
+              ),
+              const SizedBox(height: 16.0),
+              ParticipantSquares(
+                monitorItem: monitorItem,
+                study: study,
+              ),
+              const SizedBox(height: 16.0),
+              const ParticipantLegend(),
+            ],
+          )
+        else
+          EmptyBody(
+            icon: Icons.hourglass_empty,
+            title: tr.participant_details_progress_empty_title,
+            description: tr.participant_details_progress_empty_description,
+          ),
+      ],
+    );
+  }
+}
diff --git a/designer_v2/lib/features/monitor/participant/participant_info.dart b/designer_v2/lib/features/monitor/participant/participant_info.dart
new file mode 100644
index 000000000..8739525ef
--- /dev/null
+++ b/designer_v2/lib/features/monitor/participant/participant_info.dart
@@ -0,0 +1,60 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:studyu_designer_v2/localization/app_translation.dart';
+import 'package:studyu_designer_v2/localization/locale_providers.dart';
+import 'package:studyu_designer_v2/utils/extensions.dart';
+
+class ParticipantInfo extends ConsumerWidget {
+  const ParticipantInfo({
+    required this.participantId,
+    required this.inviteCode,
+    required this.startedAt,
+    required this.lastActivityAt,
+    super.key,
+  });
+
+  final String participantId;
+  final String? inviteCode;
+  final DateTime startedAt;
+  final DateTime lastActivityAt;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final languageCode = ref.watch(localeProvider).languageCode;
+    return SelectionArea(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          _buildInfoRow(
+            tr.monitoring_table_column_participant_id,
+            participantId,
+          ),
+          _buildInfoRow(
+            tr.monitoring_table_column_invite_code,
+            inviteCode ?? 'N/A',
+          ),
+          _buildInfoRow(
+            tr.monitoring_table_column_enrolled,
+            startedAt.toLocalizedString(locale: languageCode, showTime: false),
+          ),
+          _buildInfoRow(
+            tr.monitoring_table_column_last_activity,
+            lastActivityAt.toLocalizedString(locale: languageCode),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildInfoRow(String label, String value) {
+    return Row(
+      children: [
+        Text(
+          '$label: ',
+          style: const TextStyle(fontWeight: FontWeight.bold),
+        ),
+        Text(value),
+      ],
+    );
+  }
+}
diff --git a/designer_v2/lib/features/monitor/participant/participant_legend.dart b/designer_v2/lib/features/monitor/participant/participant_legend.dart
new file mode 100644
index 000000000..5cb5e38a0
--- /dev/null
+++ b/designer_v2/lib/features/monitor/participant/participant_legend.dart
@@ -0,0 +1,107 @@
+import 'package:flutter/material.dart';
+import 'package:studyu_designer_v2/common_views/striped_gradient.dart';
+import 'package:studyu_designer_v2/localization/app_translation.dart';
+
+import 'colors.dart';
+
+class ParticipantLegend extends StatelessWidget {
+  const ParticipantLegend();
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          tr.participant_details_color_legend_title,
+          style: const TextStyle(fontWeight: FontWeight.bold),
+        ),
+        const SizedBox(height: 8.0),
+        Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                _buildLegendItem(
+                  color: completeColor,
+                  tr.participant_details_color_legend_completed,
+                  tr.participant_details_completed_legend_tooltip,
+                ),
+                const SizedBox(width: 16.0),
+                _buildLegendItem(
+                  color: partiallyCompleteColor,
+                  tr.participant_details_color_legend_partially_completed,
+                  tr.participant_details_partially_completed_legend_tooltip,
+                  gradient: true,
+                ),
+                const SizedBox(width: 16.0),
+                _buildLegendItem(
+                  color: incompleteColor,
+                  tr.participant_details_color_legend_missed,
+                  tr.participant_details_incomplete_legend_tooltip,
+                ),
+              ],
+            ),
+            const SizedBox(height: 8.0),
+            Row(
+              children: [
+                _buildLegendItem(
+                  widget: const Text('\u{2705}'),
+                  tr.participant_details_color_legend_completed_task,
+                  tr.participant_details_color_legend_completed_task_tooltip,
+                ),
+                const SizedBox(width: 16.0),
+                _buildLegendItem(
+                  widget: const Text('\u{274C}'),
+                  tr.participant_details_color_legend_missed_task,
+                  tr.participant_details_color_legend_missed_task_tooltip,
+                ),
+              ],
+            ),
+          ],
+        ),
+      ],
+    );
+  }
+
+  Widget _buildLegendItem(
+    String text,
+    String tooltipMessage, {
+    Color? color,
+    Widget? widget,
+    bool gradient = false,
+  }) {
+    if (color == null && widget == null) {
+      throw ArgumentError('Only color or widget can be provided.');
+    }
+    return Tooltip(
+      message: tooltipMessage,
+      child: Row(
+        children: [
+          if (color != null)
+            Container(
+              width: 20.0,
+              height: 20.0,
+              decoration: BoxDecoration(
+                borderRadius: BorderRadius.circular(3),
+                color: color,
+                gradient: gradient
+                    ? StripedGradient(
+                        colors: [
+                          partiallyCompleteColor,
+                          partiallyCompleteColor,
+                          incompleteColor,
+                          incompleteColor,
+                        ],
+                      ).gradient
+                    : null,
+              ),
+            ),
+          if (widget != null) widget,
+          const SizedBox(width: 8.0),
+          Text(text),
+        ],
+      ),
+    );
+  }
+}
diff --git a/designer_v2/lib/features/monitor/participant/participant_square.dart b/designer_v2/lib/features/monitor/participant/participant_square.dart
new file mode 100644
index 000000000..713210c5d
--- /dev/null
+++ b/designer_v2/lib/features/monitor/participant/participant_square.dart
@@ -0,0 +1,89 @@
+import 'package:flutter/material.dart';
+import 'package:studyu_core/core.dart';
+import 'package:studyu_designer_v2/common_views/striped_gradient.dart';
+import 'package:studyu_designer_v2/domain/study_monitoring.dart';
+import 'package:studyu_designer_v2/features/monitor/participant/colors.dart';
+
+class ParticipantSquare extends StatelessWidget {
+  final int index;
+  final Set<String> missed;
+  final int numberOfTheDay;
+  final StudyMonitorItem monitorItem;
+  final Study study;
+
+  const ParticipantSquare({
+    super.key,
+    required this.index,
+    required this.missed,
+    required this.numberOfTheDay,
+    required this.monitorItem,
+    required this.study,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Tooltip(
+      message: _getTooltipText(),
+      child: Container(
+        height: 50,
+        width: 50,
+        margin: const EdgeInsets.fromLTRB(0, 0, 8, 8),
+        decoration: BoxDecoration(
+          color: missed.isEmpty
+              ? completeColor
+              : (monitorItem.completedTasksPerDay[index].isEmpty
+                  ? incompleteColor
+                  : null), // Set color to null when using gradient
+          gradient:
+              monitorItem.completedTasksPerDay[index].isEmpty || missed.isEmpty
+                  ? null
+                  : StripedGradient(
+                      colors: [
+                        partiallyCompleteColor,
+                        partiallyCompleteColor,
+                        incompleteColor,
+                        incompleteColor,
+                      ],
+                    ).gradient,
+          borderRadius: BorderRadius.circular(8),
+        ),
+        child: Center(
+          child: Text(
+            numberOfTheDay.toString(),
+            style: TextStyle(
+              color: missed.isEmpty ? Colors.white : Colors.black,
+              fontWeight: FontWeight.bold,
+              fontSize: 20,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  String _getTooltipText() {
+    final sb = StringBuffer();
+    for (final intervention in study.interventions) {
+      for (final task in intervention.tasks) {
+        if (missed.contains(task.id)) {
+          sb.writeln('\u{274C} ${task.title}');
+        } else if (monitorItem.completedTasksPerDay[index].contains(task.id)) {
+          sb.writeln('\u{2705} ${task.title}');
+        }
+      }
+    }
+    for (final observation in study.observations) {
+      if (missed.contains(observation.id)) {
+        sb.writeln('\u{274C} ${observation.title}');
+      } else if (monitorItem.completedTasksPerDay[index]
+          .contains(observation.id)) {
+        sb.writeln('\u{2705} ${observation.title}');
+      }
+    }
+    String str = sb.toString();
+    if (str.isNotEmpty) {
+      str = str.substring(0, str.length - 1);
+    }
+    return str;
+  }
+}
diff --git a/designer_v2/lib/features/monitor/participant/participant_squares.dart b/designer_v2/lib/features/monitor/participant/participant_squares.dart
new file mode 100644
index 000000000..8a451f8a4
--- /dev/null
+++ b/designer_v2/lib/features/monitor/participant/participant_squares.dart
@@ -0,0 +1,141 @@
+import 'package:collection/collection.dart';
+import 'package:flutter/material.dart';
+import 'package:studyu_core/core.dart';
+import 'package:studyu_designer_v2/common_views/utils.dart';
+import 'package:studyu_designer_v2/domain/study_monitoring.dart';
+import 'package:studyu_designer_v2/features/monitor/participant/participant_square.dart';
+
+class ParticipantSquares extends StatelessWidget {
+  const ParticipantSquares({
+    required this.monitorItem,
+    required this.study,
+    super.key,
+  });
+
+  final StudyMonitorItem monitorItem;
+  final Study study;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final phases = _buildPhases();
+
+    print(phases);
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: phases.mapIndexed((phaseIndex, phase) {
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                if (!phase.intervention.isBaseline())
+                  interventionPrefix(
+                    study.interventions.indexOf(phase.intervention),
+                    theme,
+                  ),
+                Text(
+                  phase.intervention.name!,
+                  style: const TextStyle(fontWeight: FontWeight.bold),
+                ),
+              ],
+            ),
+            const SizedBox(height: 10),
+            Wrap(
+              children: phase.missedTasksPerDay
+                  .mapIndexed(
+                    (index, missed) => ParticipantSquare(
+                      index: index,
+                      missed: missed,
+                      numberOfTheDay:
+                          (phaseIndex * study.schedule.phaseDuration) +
+                              index +
+                              1,
+                      monitorItem: monitorItem,
+                      study: study,
+                    ),
+                  )
+                  .toList(),
+            ),
+            if (phaseIndex < phases.length - 1) const SizedBox(height: 10),
+          ],
+        );
+      }).toList(),
+    );
+  }
+
+  List<StudyPhase> _buildPhases() {
+    final totalCompletedDays = monitorItem.missedTasksPerDay.length;
+    final phases = <StudyPhase>[];
+
+    if (study.schedule.includeBaseline) {
+      phases.add(
+        StudyPhase(
+          intervention: Intervention.withId()..name = 'Baseline',
+          missedTasksPerDay: monitorItem.missedTasksPerDay.sublist(
+            0,
+            totalCompletedDays > study.schedule.baselineLength
+                ? study.schedule.baselineLength
+                : totalCompletedDays,
+          ),
+        ),
+      );
+    }
+
+    final numberOfInterventionPhases = study.schedule.numberOfCycles *
+        (study.schedule.sequence == PhaseSequence.customized
+            ? study.schedule.sequenceCustom.length
+            : StudySchedule.numberOfInterventions);
+    for (int i = 0; i < numberOfInterventionPhases; i++) {
+      final int phaseDuration = study.schedule.phaseDuration;
+      final bool includeBaseline = study.schedule.includeBaseline;
+      final int baselineAdjustmentStart =
+          includeBaseline ? (i + 1) * phaseDuration : i * phaseDuration;
+      final int baselineAdjustmentEnd =
+          includeBaseline ? (i + 2) * phaseDuration : (i + 1) * phaseDuration;
+
+      if (baselineAdjustmentStart >= totalCompletedDays) break;
+
+      final int start = totalCompletedDays > baselineAdjustmentStart
+          ? baselineAdjustmentStart
+          : totalCompletedDays;
+
+      final int end = totalCompletedDays > baselineAdjustmentEnd
+          ? baselineAdjustmentEnd
+          : totalCompletedDays;
+
+      monitorItem.studySubject.study = study;
+      final intervention = monitorItem.studySubject
+          .getInterventionsInOrder()[i + (includeBaseline ? 1 : 0)];
+
+      phases.add(
+        StudyPhase(
+          intervention: intervention,
+          missedTasksPerDay: monitorItem.missedTasksPerDay.sublist(start, end),
+        ),
+      );
+    }
+
+    assert(
+      monitorItem.missedTasksPerDay.length ==
+          monitorItem.completedTasksPerDay.length,
+    );
+    return phases;
+  }
+}
+
+class StudyPhase {
+  final Intervention intervention;
+  final List<Set<String>> missedTasksPerDay;
+
+  StudyPhase({
+    required this.intervention,
+    required this.missedTasksPerDay,
+  });
+
+  @override
+  String toString() {
+    return 'StudyPhase{intervention: $intervention, missedTasksPerDay: $missedTasksPerDay}';
+  }
+}
diff --git a/designer_v2/lib/features/monitor/participant_details_view.dart b/designer_v2/lib/features/monitor/participant_details_view.dart
deleted file mode 100644
index ab6aa9bbb..000000000
--- a/designer_v2/lib/features/monitor/participant_details_view.dart
+++ /dev/null
@@ -1,376 +0,0 @@
-import 'package:collection/collection.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:studyu_core/core.dart';
-import 'package:studyu_designer_v2/common_views/empty_body.dart';
-import 'package:studyu_designer_v2/common_views/text_paragraph.dart';
-import 'package:studyu_designer_v2/common_views/utils.dart';
-import 'package:studyu_designer_v2/domain/study_monitoring.dart';
-import 'package:studyu_designer_v2/localization/app_translation.dart';
-import 'package:studyu_designer_v2/localization/locale_providers.dart';
-import 'package:studyu_designer_v2/utils/extensions.dart';
-
-class ParticipantDetailsView extends ConsumerWidget {
-  ParticipantDetailsView({
-    required this.monitorItem,
-    required this.study,
-    super.key,
-  })  : studySchedule = study.schedule,
-        interventions = study.interventions,
-        observations = study.observations;
-
-  final StudyMonitorItem monitorItem;
-  final Study study;
-  final StudySchedule studySchedule;
-  final List<Intervention> interventions;
-  final List<Observation> observations;
-
-  static const Color incompleteColor = Color.fromARGB(255, 234, 234, 234);
-  // Add transparency to increase the readability of the text
-  static Color partiallyComplete = Colors.lightBlue.faded(0.75);
-  static const Color completeColor = Colors.lightBlue;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final languageCode = ref.watch(localeProvider).languageCode;
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        _buildParticipantInfo(languageCode),
-        const SizedBox(height: 8.0),
-        const Divider(),
-        const SizedBox(height: 8.0),
-        if (monitorItem.missedTasksPerDay.isNotEmpty)
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              TextParagraph(
-                text: tr.participant_details_study_days_description,
-              ),
-              const SizedBox(height: 16.0),
-              _buildPerDayStatus(context),
-              const SizedBox(height: 16.0),
-              _buildColorLegend(),
-            ],
-          )
-        else
-          EmptyBody(
-            icon: Icons.hourglass_empty,
-            title: tr.participant_details_progress_empty_title,
-            description: tr.participant_details_progress_empty_description,
-          ),
-      ],
-    );
-  }
-
-  Widget _buildParticipantInfo(String languageCode) {
-    return SelectionArea(
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          _buildInfoRow(
-            tr.monitoring_table_column_participant_id,
-            monitorItem.participantId,
-          ),
-          _buildInfoRow(
-            tr.monitoring_table_column_invite_code,
-            monitorItem.inviteCode ?? 'N/A',
-          ),
-          _buildInfoRow(
-            tr.monitoring_table_column_enrolled,
-            monitorItem.startedAt
-                .toLocalizedString(locale: languageCode, showTime: false),
-          ),
-          _buildInfoRow(
-            tr.monitoring_table_column_last_activity,
-            monitorItem.lastActivityAt.toLocalizedString(locale: languageCode),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildInfoRow(String label, String value) {
-    return Row(
-      children: [
-        Text(
-          '$label: ',
-          style: const TextStyle(fontWeight: FontWeight.bold),
-        ),
-        Text(value),
-      ],
-    );
-  }
-
-  Widget _buildPerDayStatus(BuildContext context) {
-    final totalCompletedDays = monitorItem.missedTasksPerDay.length;
-    final phases = <StudyPhase>[];
-
-    if (studySchedule.includeBaseline) {
-      phases.add(
-        StudyPhase(
-          name: 'Baseline',
-          missedTasksPerDay: monitorItem.missedTasksPerDay.sublist(
-            0,
-            totalCompletedDays > studySchedule.baselineLength
-                ? studySchedule.baselineLength
-                : totalCompletedDays,
-          ),
-        ),
-      );
-    }
-
-    final numberOfInterventionPhases = studySchedule.numberOfCycles *
-        (studySchedule.sequence == PhaseSequence.customized
-            ? studySchedule.sequenceCustom.length
-            : StudySchedule.numberOfInterventions);
-    for (int i = 0; i < numberOfInterventionPhases; i++) {
-      final int phaseDuration = studySchedule.phaseDuration;
-      final bool includeBaseline = studySchedule.includeBaseline;
-      final int baselineAdjustmentStart =
-          includeBaseline ? (i + 1) * phaseDuration : i * phaseDuration;
-      final int baselineAdjustmentEnd =
-          includeBaseline ? (i + 2) * phaseDuration : (i + 1) * phaseDuration;
-
-      if (baselineAdjustmentStart >= totalCompletedDays) break;
-
-      final int start = totalCompletedDays > baselineAdjustmentStart
-          ? baselineAdjustmentStart
-          : totalCompletedDays;
-
-      final int end = totalCompletedDays > baselineAdjustmentEnd
-          ? baselineAdjustmentEnd
-          : totalCompletedDays;
-
-      monitorItem.studySubject.study = study;
-      final intervention = monitorItem.studySubject
-          .getInterventionsInOrder()[i + (includeBaseline ? 1 : 0)];
-      final interventionIdx = study.interventions.indexOf(intervention);
-
-      phases.add(
-        StudyPhase(
-          name: intervention.name!,
-          prefix: interventionPrefix(interventionIdx, context),
-          missedTasksPerDay: monitorItem.missedTasksPerDay.sublist(start, end),
-        ),
-      );
-    }
-
-    assert(
-      monitorItem.missedTasksPerDay.length ==
-          monitorItem.completedTasksPerDay.length,
-    );
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: phases.mapIndexed((phaseIndex, phase) {
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                if (phase.prefix != null) phase.prefix!,
-                Text(
-                  phase.name,
-                  style: const TextStyle(fontWeight: FontWeight.bold),
-                ),
-              ],
-            ),
-            const SizedBox(height: 10),
-            Wrap(
-              children: phase.missedTasksPerDay
-                  .mapIndexed(
-                    (index, missed) => _buildSquare(
-                      index,
-                      missed,
-                      (phaseIndex * studySchedule.phaseDuration) + index + 1,
-                    ),
-                  )
-                  .toList(),
-            ),
-            if (phaseIndex < phases.length - 1) const SizedBox(height: 10),
-          ],
-        );
-      }).toList(),
-    );
-  }
-
-  Widget _buildSquare(int index, Set<String> missed, int numberOfTheDay) {
-    return Tooltip(
-      message: _getTooltipText(
-        missed,
-        monitorItem.completedTasksPerDay[index],
-      ),
-      child: Container(
-        height: 50,
-        width: 50,
-        margin: const EdgeInsets.fromLTRB(0, 0, 8, 8),
-        decoration: BoxDecoration(
-          color: missed.isEmpty
-              ? completeColor
-              : (monitorItem.completedTasksPerDay[index].isEmpty
-                  ? incompleteColor
-                  : null), // Set color to null when using gradient
-          gradient:
-              monitorItem.completedTasksPerDay[index].isEmpty || missed.isEmpty
-                  ? null
-                  : _buildGradient(),
-          borderRadius: BorderRadius.circular(8),
-        ),
-        child: Center(
-          child: Text(
-            numberOfTheDay.toString(),
-            style: TextStyle(
-              color: missed.isEmpty ? Colors.white : Colors.black,
-              fontWeight: FontWeight.bold,
-              fontSize: 20,
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
-  String _getTooltipText(
-    Set<String> missedTaskIds,
-    Set<String> completedTaskIds,
-  ) {
-    final sb = StringBuffer();
-    for (final intervention in interventions) {
-      for (final task in intervention.tasks) {
-        if (missedTaskIds.contains(task.id)) {
-          sb.writeln('\u{274C} ${task.title}');
-        } else if (completedTaskIds.contains(task.id)) {
-          sb.writeln('\u{2705} ${task.title}');
-        }
-      }
-    }
-    for (final observation in observations) {
-      if (missedTaskIds.contains(observation.id)) {
-        sb.writeln('\u{274C} ${observation.title}');
-      } else if (completedTaskIds.contains(observation.id)) {
-        sb.writeln('\u{2705} ${observation.title}');
-      }
-    }
-    String str = sb.toString();
-    if (str.isNotEmpty) {
-      str = sb.toString().substring(0, sb.length - 1);
-    }
-    return str;
-  }
-
-  Widget _buildColorLegend() {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(
-          tr.participant_details_color_legend_title,
-          style: const TextStyle(fontWeight: FontWeight.bold),
-        ),
-        const SizedBox(height: 8.0),
-        Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Row(
-              children: [
-                _buildLegendItem(
-                  color: completeColor,
-                  tr.participant_details_color_legend_completed,
-                  tr.participant_details_completed_legend_tooltip,
-                ),
-                const SizedBox(width: 16.0),
-                _buildLegendItem(
-                  color: partiallyComplete,
-                  tr.participant_details_color_legend_partially_completed,
-                  tr.participant_details_partially_completed_legend_tooltip,
-                  gradient: true,
-                ),
-                const SizedBox(width: 16.0),
-                _buildLegendItem(
-                  color: incompleteColor,
-                  tr.participant_details_color_legend_missed,
-                  tr.participant_details_incomplete_legend_tooltip,
-                ),
-              ],
-            ),
-            const SizedBox(height: 8.0),
-            Row(
-              children: [
-                _buildLegendItem(
-                  widget: const Text('\u{2705}'),
-                  tr.participant_details_color_legend_completed_task,
-                  tr.participant_details_color_legend_completed_task_tooltip,
-                ),
-                const SizedBox(width: 16.0),
-                _buildLegendItem(
-                  widget: const Text('\u{274C}'),
-                  tr.participant_details_color_legend_missed_task,
-                  tr.participant_details_color_legend_missed_task_tooltip,
-                ),
-              ],
-            ),
-          ],
-        ),
-      ],
-    );
-  }
-
-  Widget _buildLegendItem(
-    String text,
-    String tooltipMessage, {
-    Color? color,
-    Widget? widget,
-    bool gradient = false,
-  }) {
-    if (color == null && widget == null) {
-      throw ArgumentError('Only color or widget can be provided.');
-    }
-    return Tooltip(
-      message: tooltipMessage,
-      child: Row(
-        children: [
-          if (color != null)
-            Container(
-              width: 20.0,
-              height: 20.0,
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(3),
-                color: color,
-                gradient: gradient ? _buildGradient() : null,
-              ),
-            ),
-          if (widget != null) widget,
-          const SizedBox(width: 8.0),
-          Text(text),
-        ],
-      ),
-    );
-  }
-
-  LinearGradient _buildGradient() {
-    return LinearGradient(
-      begin: Alignment.topRight,
-      end: const Alignment(0.5, -0.4),
-      stops: const [0.0, 0.5, 0.5, 1],
-      colors: [
-        partiallyComplete,
-        partiallyComplete,
-        incompleteColor,
-        incompleteColor,
-      ],
-      tileMode: TileMode.repeated,
-    );
-  }
-}
-
-class StudyPhase {
-  final String name;
-  final Widget? prefix;
-  final List<Set<String>> missedTasksPerDay;
-
-  StudyPhase({
-    required this.name,
-    this.prefix,
-    required this.missedTasksPerDay,
-  });
-}
diff --git a/designer_v2/lib/features/monitor/study_monitor_page.dart b/designer_v2/lib/features/monitor/study_monitor_page.dart
index d3c2b485b..8f64484cd 100644
--- a/designer_v2/lib/features/monitor/study_monitor_page.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_page.dart
@@ -7,7 +7,7 @@ import 'package:studyu_designer_v2/common_views/form_buttons.dart';
 import 'package:studyu_designer_v2/common_views/sidesheet/sidesheet.dart';
 import 'package:studyu_designer_v2/common_views/utils.dart';
 import 'package:studyu_designer_v2/domain/study_monitoring.dart';
-import 'package:studyu_designer_v2/features/monitor/participant_details_view.dart';
+import 'package:studyu_designer_v2/features/monitor/participant/participant_details_view.dart';
 import 'package:studyu_designer_v2/features/monitor/study_monitor_table.dart';
 import 'package:studyu_designer_v2/features/study/study_controller.dart';
 import 'package:studyu_designer_v2/features/study/study_page_view.dart';

From 4e2f02fcd793bcd8da58fcce9a64dca90f818c5c Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Sat, 13 Jul 2024 15:55:19 +0200
Subject: [PATCH 280/314] fix: square per day

---
 designer_v2/lib/domain/study_monitoring.dart  |  1 +
 .../participant/participant_square.dart       | 10 +++---
 .../participant/participant_squares.dart      | 31 ++++++++++++-------
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/designer_v2/lib/domain/study_monitoring.dart b/designer_v2/lib/domain/study_monitoring.dart
index e80d27c7c..ab783794e 100644
--- a/designer_v2/lib/domain/study_monitoring.dart
+++ b/designer_v2/lib/domain/study_monitoring.dart
@@ -107,6 +107,7 @@ extension StudyMonitoringX on Study {
             )
             .map((p) => p.taskId)
             .toSet();
+        print(progresses.toString());
 
         final missedTaskIds = requiredTaskIds.difference(completedTaskIds);
         missedTasksPerDay.add(missedTaskIds);
diff --git a/designer_v2/lib/features/monitor/participant/participant_square.dart b/designer_v2/lib/features/monitor/participant/participant_square.dart
index 713210c5d..79d29a76f 100644
--- a/designer_v2/lib/features/monitor/participant/participant_square.dart
+++ b/designer_v2/lib/features/monitor/participant/participant_square.dart
@@ -7,6 +7,7 @@ import 'package:studyu_designer_v2/features/monitor/participant/colors.dart';
 class ParticipantSquare extends StatelessWidget {
   final int index;
   final Set<String> missed;
+  final Set<String> completed;
   final int numberOfTheDay;
   final StudyMonitorItem monitorItem;
   final Study study;
@@ -15,6 +16,7 @@ class ParticipantSquare extends StatelessWidget {
     super.key,
     required this.index,
     required this.missed,
+    required this.completed,
     required this.numberOfTheDay,
     required this.monitorItem,
     required this.study,
@@ -31,11 +33,11 @@ class ParticipantSquare extends StatelessWidget {
         decoration: BoxDecoration(
           color: missed.isEmpty
               ? completeColor
-              : (monitorItem.completedTasksPerDay[index].isEmpty
+              : (completed.isEmpty
                   ? incompleteColor
                   : null), // Set color to null when using gradient
           gradient:
-              monitorItem.completedTasksPerDay[index].isEmpty || missed.isEmpty
+              completed.isEmpty || missed.isEmpty
                   ? null
                   : StripedGradient(
                       colors: [
@@ -67,7 +69,7 @@ class ParticipantSquare extends StatelessWidget {
       for (final task in intervention.tasks) {
         if (missed.contains(task.id)) {
           sb.writeln('\u{274C} ${task.title}');
-        } else if (monitorItem.completedTasksPerDay[index].contains(task.id)) {
+        } else if (completed.contains(task.id)) {
           sb.writeln('\u{2705} ${task.title}');
         }
       }
@@ -75,7 +77,7 @@ class ParticipantSquare extends StatelessWidget {
     for (final observation in study.observations) {
       if (missed.contains(observation.id)) {
         sb.writeln('\u{274C} ${observation.title}');
-      } else if (monitorItem.completedTasksPerDay[index]
+      } else if (completed
           .contains(observation.id)) {
         sb.writeln('\u{2705} ${observation.title}');
       }
diff --git a/designer_v2/lib/features/monitor/participant/participant_squares.dart b/designer_v2/lib/features/monitor/participant/participant_squares.dart
index 8a451f8a4..aa106855c 100644
--- a/designer_v2/lib/features/monitor/participant/participant_squares.dart
+++ b/designer_v2/lib/features/monitor/participant/participant_squares.dart
@@ -48,6 +48,7 @@ class ParticipantSquares extends StatelessWidget {
                     (index, missed) => ParticipantSquare(
                       index: index,
                       missed: missed,
+                      completed: phase.completedTasksPerDay[index],
                       numberOfTheDay:
                           (phaseIndex * study.schedule.phaseDuration) +
                               index +
@@ -70,16 +71,20 @@ class ParticipantSquares extends StatelessWidget {
     final phases = <StudyPhase>[];
 
     if (study.schedule.includeBaseline) {
+      const startInx = 0;
+      final endInx = totalCompletedDays > study.schedule.baselineLength
+          ? study.schedule.baselineLength
+          : totalCompletedDays;
       phases.add(
         StudyPhase(
-          intervention: Intervention.withId()..name = 'Baseline',
-          missedTasksPerDay: monitorItem.missedTasksPerDay.sublist(
-            0,
-            totalCompletedDays > study.schedule.baselineLength
-                ? study.schedule.baselineLength
-                : totalCompletedDays,
-          ),
-        ),
+            intervention: Intervention.withId()..name = 'Baseline',
+            missedTasksPerDay: monitorItem.missedTasksPerDay.sublist(
+              startInx,
+              endInx,
+            ),
+            completedTasksPerDay: monitorItem.completedTasksPerDay.sublist(
+              startInx,endInx
+            )),
       );
     }
 
@@ -113,6 +118,7 @@ class ParticipantSquares extends StatelessWidget {
         StudyPhase(
           intervention: intervention,
           missedTasksPerDay: monitorItem.missedTasksPerDay.sublist(start, end),
+          completedTasksPerDay: monitorItem.completedTasksPerDay.sublist(start,end)
         ),
       );
     }
@@ -128,11 +134,12 @@ class ParticipantSquares extends StatelessWidget {
 class StudyPhase {
   final Intervention intervention;
   final List<Set<String>> missedTasksPerDay;
+  final List<Set<String>> completedTasksPerDay;
 
-  StudyPhase({
-    required this.intervention,
-    required this.missedTasksPerDay,
-  });
+  StudyPhase(
+      {required this.intervention,
+      required this.missedTasksPerDay,
+      required this.completedTasksPerDay});
 
   @override
   String toString() {

From 01b3e753048702610634d587607631fa0ea7a872 Mon Sep 17 00:00:00 2001
From: Md Raju Ahmed <rajucse1705@gmail.com>
Date: Sat, 13 Jul 2024 15:56:09 +0200
Subject: [PATCH 281/314] chore: format

---
 .../participant/participant_square.dart       | 24 +++++++++----------
 .../participant/participant_squares.dart      | 14 +++++------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/designer_v2/lib/features/monitor/participant/participant_square.dart b/designer_v2/lib/features/monitor/participant/participant_square.dart
index 79d29a76f..c19d27151 100644
--- a/designer_v2/lib/features/monitor/participant/participant_square.dart
+++ b/designer_v2/lib/features/monitor/participant/participant_square.dart
@@ -36,17 +36,16 @@ class ParticipantSquare extends StatelessWidget {
               : (completed.isEmpty
                   ? incompleteColor
                   : null), // Set color to null when using gradient
-          gradient:
-              completed.isEmpty || missed.isEmpty
-                  ? null
-                  : StripedGradient(
-                      colors: [
-                        partiallyCompleteColor,
-                        partiallyCompleteColor,
-                        incompleteColor,
-                        incompleteColor,
-                      ],
-                    ).gradient,
+          gradient: completed.isEmpty || missed.isEmpty
+              ? null
+              : StripedGradient(
+                  colors: [
+                    partiallyCompleteColor,
+                    partiallyCompleteColor,
+                    incompleteColor,
+                    incompleteColor,
+                  ],
+                ).gradient,
           borderRadius: BorderRadius.circular(8),
         ),
         child: Center(
@@ -77,8 +76,7 @@ class ParticipantSquare extends StatelessWidget {
     for (final observation in study.observations) {
       if (missed.contains(observation.id)) {
         sb.writeln('\u{274C} ${observation.title}');
-      } else if (completed
-          .contains(observation.id)) {
+      } else if (completed.contains(observation.id)) {
         sb.writeln('\u{2705} ${observation.title}');
       }
     }
diff --git a/designer_v2/lib/features/monitor/participant/participant_squares.dart b/designer_v2/lib/features/monitor/participant/participant_squares.dart
index aa106855c..19f744e8f 100644
--- a/designer_v2/lib/features/monitor/participant/participant_squares.dart
+++ b/designer_v2/lib/features/monitor/participant/participant_squares.dart
@@ -82,9 +82,8 @@ class ParticipantSquares extends StatelessWidget {
               startInx,
               endInx,
             ),
-            completedTasksPerDay: monitorItem.completedTasksPerDay.sublist(
-              startInx,endInx
-            )),
+            completedTasksPerDay:
+                monitorItem.completedTasksPerDay.sublist(startInx, endInx)),
       );
     }
 
@@ -116,10 +115,11 @@ class ParticipantSquares extends StatelessWidget {
 
       phases.add(
         StudyPhase(
-          intervention: intervention,
-          missedTasksPerDay: monitorItem.missedTasksPerDay.sublist(start, end),
-          completedTasksPerDay: monitorItem.completedTasksPerDay.sublist(start,end)
-        ),
+            intervention: intervention,
+            missedTasksPerDay:
+                monitorItem.missedTasksPerDay.sublist(start, end),
+            completedTasksPerDay:
+                monitorItem.completedTasksPerDay.sublist(start, end)),
       );
     }
 

From b50c26383ae808e9c5560665d0842d1ad9b2e15a Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 14 Jul 2024 09:02:20 +0200
Subject: [PATCH 282/314] feat: make table wrappable

---
 .../lib/common_views/standard_table.dart       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/designer_v2/lib/common_views/standard_table.dart b/designer_v2/lib/common_views/standard_table.dart
index eb32c3f9a..e5b8915a7 100644
--- a/designer_v2/lib/common_views/standard_table.dart
+++ b/designer_v2/lib/common_views/standard_table.dart
@@ -59,6 +59,7 @@ class StandardTable<T> extends StatefulWidget {
     this.rowSpacing = 9.0,
     this.minRowHeight = 60.0,
     this.headerMaxLines = 1,
+    this.softWrapHeader = false,
     this.showTableHeader = true,
     this.tableWrapper,
     this.leadingWidget,
@@ -108,6 +109,7 @@ class StandardTable<T> extends StatefulWidget {
   final double? minRowHeight;
 
   final int headerMaxLines;
+  final bool softWrapHeader;
   final bool showTableHeader;
   final bool hideLeadingTrailingWhenEmpty;
 
@@ -355,13 +357,15 @@ class _StandardTableState<T> extends State<StandardTable<T>> {
               ),
               child: Row(
                 children: [
-                  Text(
-                    columns[i].label,
-                    overflow: TextOverflow.visible,
-                    maxLines: widget.headerMaxLines,
-                    softWrap: false,
-                    style: theme.textTheme.bodySmall!.copyWith(
-                      color: theme.colorScheme.onSurface.withOpacity(0.8),
+                  Flexible(
+                    child: Text(
+                      columns[i].label,
+                      overflow: TextOverflow.visible,
+                      maxLines: widget.headerMaxLines,
+                      softWrap: widget.softWrapHeader,
+                      style: theme.textTheme.bodySmall!.copyWith(
+                        color: theme.colorScheme.onSurface.withOpacity(0.8),
+                      ),
                     ),
                   ),
                   if (widget.inputColumns[i].sortable)

From 47a9de1cef8f294b352c6df64b8f46a0bd9d7c96 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 14 Jul 2024 09:02:58 +0200
Subject: [PATCH 283/314] chore: cleanup

---
 designer_v2/lib/domain/study_monitoring.dart     |  1 -
 .../monitor/participant/participant_squares.dart | 16 +++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/designer_v2/lib/domain/study_monitoring.dart b/designer_v2/lib/domain/study_monitoring.dart
index ab783794e..e80d27c7c 100644
--- a/designer_v2/lib/domain/study_monitoring.dart
+++ b/designer_v2/lib/domain/study_monitoring.dart
@@ -107,7 +107,6 @@ extension StudyMonitoringX on Study {
             )
             .map((p) => p.taskId)
             .toSet();
-        print(progresses.toString());
 
         final missedTaskIds = requiredTaskIds.difference(completedTaskIds);
         missedTasksPerDay.add(missedTaskIds);
diff --git a/designer_v2/lib/features/monitor/participant/participant_squares.dart b/designer_v2/lib/features/monitor/participant/participant_squares.dart
index 19f744e8f..7e6fb94eb 100644
--- a/designer_v2/lib/features/monitor/participant/participant_squares.dart
+++ b/designer_v2/lib/features/monitor/participant/participant_squares.dart
@@ -20,7 +20,6 @@ class ParticipantSquares extends StatelessWidget {
     final theme = Theme.of(context);
     final phases = _buildPhases();
 
-    print(phases);
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: phases.mapIndexed((phaseIndex, phase) {
@@ -122,7 +121,6 @@ class ParticipantSquares extends StatelessWidget {
                 monitorItem.completedTasksPerDay.sublist(start, end)),
       );
     }
-
     assert(
       monitorItem.missedTasksPerDay.length ==
           monitorItem.completedTasksPerDay.length,
@@ -136,13 +134,9 @@ class StudyPhase {
   final List<Set<String>> missedTasksPerDay;
   final List<Set<String>> completedTasksPerDay;
 
-  StudyPhase(
-      {required this.intervention,
-      required this.missedTasksPerDay,
-      required this.completedTasksPerDay});
-
-  @override
-  String toString() {
-    return 'StudyPhase{intervention: $intervention, missedTasksPerDay: $missedTasksPerDay}';
-  }
+  StudyPhase({
+    required this.intervention,
+    required this.missedTasksPerDay,
+    required this.completedTasksPerDay,
+  });
 }

From 3306a4c4ad31c5303802a679304305a6192c9c16 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 14 Jul 2024 09:03:48 +0200
Subject: [PATCH 284/314] fix: wrap monitor table

---
 designer_v2/lib/features/monitor/study_monitor_table.dart | 1 +
 designer_v2/lib/localization/app_de.arb                   | 4 ++--
 designer_v2/lib/localization/app_en.arb                   | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/designer_v2/lib/features/monitor/study_monitor_table.dart b/designer_v2/lib/features/monitor/study_monitor_table.dart
index 6b07e6ad9..70fce141f 100644
--- a/designer_v2/lib/features/monitor/study_monitor_table.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_table.dart
@@ -85,6 +85,7 @@ class StudyMonitorTable extends ConsumerWidget {
       rowSpacing: 5.0,
       minRowHeight: 30.0,
       headerMaxLines: 2,
+      softWrapHeader: true,
       onSelectItem: onSelectItem,
     );
   }
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index 5353aa488..6edc8f738 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -572,8 +572,8 @@
   "monitoring_table_column_enrolled": "Studienstart",
   "monitoring_table_column_last_activity": "Letzte Aktivität",
   "monitoring_table_column_day_in_study": "Studientag",
-  "monitoring_table_column_completed_interventions": "Abgeschlossene\nInterventionen",
-  "monitoring_table_column_completed_surveys": "Abgeschlossene\nFragebögen",
+  "monitoring_table_column_completed_interventions": "Abgeschlossene Interventionen",
+  "monitoring_table_column_completed_surveys": "Abgeschlossene Fragebögen",
   "monitoring_table_row_tooltip_dropout": "Dieser Teilnehmer hat die Studie verlassen und es wird keine neue Aktivität hinzugefügt",
   "monitoring_table_days_in_study_header_tooltip":"Die Anzahl der Tage, die der Teilnehmer in der Studie verbracht hat",
   "monitoring_table_completed_interventions_header_tooltip": "Eine Intervention zählt als abgeschlossen, wenn alle Aufgaben für den Tag erledigt wurden",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index f95d86771..2537e647e 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -572,8 +572,8 @@
   "monitoring_table_column_enrolled": "Started at",
   "monitoring_table_column_last_activity": "Last activity",
   "monitoring_table_column_day_in_study": "Day in study",
-  "monitoring_table_column_completed_interventions": "Completed\ninterventions",
-  "monitoring_table_column_completed_surveys": "Completed\nsurveys",
+  "monitoring_table_column_completed_interventions": "Completed interventions",
+  "monitoring_table_column_completed_surveys": "Completed surveys",
   "monitoring_table_row_tooltip_dropout": "This participant has dropped out of the study and no new activity will be added",
   "monitoring_table_days_in_study_header_tooltip":"The number of days the participant has been in the study",
   "monitoring_table_completed_interventions_header_tooltip": "An intervention is completed, if all of its tasks have been completed for that day",

From 2f79ee107f835bb1c049c97789fc2c0eb95373a2 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 14 Jul 2024 09:04:09 +0200
Subject: [PATCH 285/314] fix: analyze test translation

---
 designer_v2/lib/localization/app_de.arb | 2 +-
 designer_v2/lib/localization/app_en.arb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index 6edc8f738..dd02207c3 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -579,7 +579,7 @@
   "monitoring_table_completed_interventions_header_tooltip": "Eine Intervention zählt als abgeschlossen, wenn alle Aufgaben für den Tag erledigt wurden",
   "monitoring_table_completed_surveys_header_tooltip":"Die Umfrage zählt als abgeschlossen, wenn alle Aufgaben für den Tag erledigt wurden",
   "@__________________STUDYPAGE_ANALYZE__________________": {},
-  "banner_text_study_analyze_draft": "Solange die Studie noch nicht live ist, basieren die Ergebnisse hier auf dem letzten Testlauf der Studie (siehe Testmodus).\nDie Ergebnisdaten werden automatisch zurückgesetzt sobald die Studie mit echten Teilnehmern startet.",
+  "banner_text_study_analyze_draft": "Solange die Studie noch nicht live ist, basieren die Ergebnisse hier auf den Daten aus den Testläufen der Studie.\nDie Ergebnisdaten werden automatisch zurückgesetzt sobald die Studie mit echten Teilnehmern startet.",
   "action_button_study_export": "Daten exportieren",
   "action_button_study_export_prompt": "Möchtest du deine eigene Analyse durchführen?",
   "study_export_unavailable_empty_tooltip": "Es sind noch keine Ergebnisdaten verfügbar",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index 2537e647e..f23f56a42 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -579,7 +579,7 @@
   "monitoring_table_completed_interventions_header_tooltip": "An intervention is completed, if all of its tasks have been completed for that day",
   "monitoring_table_completed_surveys_header_tooltip":"A survey is completed, if all of its tasks have been completed for that day",
   "@__________________STUDYPAGE_ANALYZE__________________": {},
-  "banner_text_study_analyze_draft": "Because this study has not been launched yet, this page is currently based on the data generated during study testing (only the latest test session).\nThe data on this page will be reset once you launch the study with real participants.",
+  "banner_text_study_analyze_draft": "Because this study has not been launched yet, this page is currently based on the data generated during study testing.\nThe data on this page will be reset once you launch the study with real participants.",
   "action_button_study_export": "Export data",
   "action_button_study_export_prompt": "Want to run your own analysis?",
   "study_export_unavailable_empty_tooltip": "There is no data available yet",

From 59d70f85bab2113d956016546135ad5b46e85500 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 14 Jul 2024 09:04:26 +0200
Subject: [PATCH 286/314] fix: print additional details in participant info

---
 .../participant/participant_details_view.dart |  5 +--
 .../monitor/participant/participant_info.dart | 34 ++++++++++++-------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/designer_v2/lib/features/monitor/participant/participant_details_view.dart b/designer_v2/lib/features/monitor/participant/participant_details_view.dart
index dbcf64ce3..60cd48883 100644
--- a/designer_v2/lib/features/monitor/participant/participant_details_view.dart
+++ b/designer_v2/lib/features/monitor/participant/participant_details_view.dart
@@ -24,10 +24,7 @@ class ParticipantDetailsView extends StatelessWidget {
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         ParticipantInfo(
-          participantId: monitorItem.participantId,
-          inviteCode: monitorItem.inviteCode,
-          startedAt: monitorItem.startedAt,
-          lastActivityAt: monitorItem.lastActivityAt,
+          monitorItem: monitorItem,
         ),
         const SizedBox(height: 8.0),
         const Divider(),
diff --git a/designer_v2/lib/features/monitor/participant/participant_info.dart b/designer_v2/lib/features/monitor/participant/participant_info.dart
index 8739525ef..3b67ad17e 100644
--- a/designer_v2/lib/features/monitor/participant/participant_info.dart
+++ b/designer_v2/lib/features/monitor/participant/participant_info.dart
@@ -1,22 +1,17 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:studyu_designer_v2/domain/study_monitoring.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/localization/locale_providers.dart';
 import 'package:studyu_designer_v2/utils/extensions.dart';
 
 class ParticipantInfo extends ConsumerWidget {
   const ParticipantInfo({
-    required this.participantId,
-    required this.inviteCode,
-    required this.startedAt,
-    required this.lastActivityAt,
+    required this.monitorItem,
     super.key,
   });
 
-  final String participantId;
-  final String? inviteCode;
-  final DateTime startedAt;
-  final DateTime lastActivityAt;
+  final StudyMonitorItem monitorItem;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -27,19 +22,33 @@ class ParticipantInfo extends ConsumerWidget {
         children: [
           _buildInfoRow(
             tr.monitoring_table_column_participant_id,
-            participantId,
+            monitorItem.participantId,
           ),
           _buildInfoRow(
             tr.monitoring_table_column_invite_code,
-            inviteCode ?? 'N/A',
+            monitorItem.inviteCode ?? 'N/A',
           ),
           _buildInfoRow(
             tr.monitoring_table_column_enrolled,
-            startedAt.toLocalizedString(locale: languageCode, showTime: false),
+            monitorItem.startedAt
+                .toLocalizedString(locale: languageCode, showTime: false),
           ),
           _buildInfoRow(
             tr.monitoring_table_column_last_activity,
-            lastActivityAt.toLocalizedString(locale: languageCode),
+            monitorItem.lastActivityAt.toLocalizedString(locale: languageCode),
+          ),
+          const SizedBox(height: 8.0),
+          _buildInfoRow(
+            tr.monitoring_table_column_day_in_study,
+            '${monitorItem.currentDayOfStudy}/${monitorItem.studyDurationInDays}',
+          ),
+          _buildInfoRow(
+            tr.monitoring_table_column_completed_interventions,
+            '${monitorItem.completedInterventions}/${monitorItem.completedInterventions + monitorItem.missedInterventions}',
+          ),
+          _buildInfoRow(
+            tr.monitoring_table_column_completed_surveys,
+            '${monitorItem.completedSurveys}/${monitorItem.completedSurveys + monitorItem.missedSurveys}',
           ),
         ],
       ),
@@ -48,6 +57,7 @@ class ParticipantInfo extends ConsumerWidget {
 
   Widget _buildInfoRow(String label, String value) {
     return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Text(
           '$label: ',

From 31fe183ec6884b7154be5097fc5f36a3b25f3555 Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahim.ozkn@outlook.com>
Date: Sun, 14 Jul 2024 19:57:36 +0200
Subject: [PATCH 287/314] fix: monitor section header tooltip participants list
 display fix

---
 designer_v2/lib/features/monitor/study_monitor_page.dart | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/designer_v2/lib/features/monitor/study_monitor_page.dart b/designer_v2/lib/features/monitor/study_monitor_page.dart
index 8f64484cd..cf0524ad5 100644
--- a/designer_v2/lib/features/monitor/study_monitor_page.dart
+++ b/designer_v2/lib/features/monitor/study_monitor_page.dart
@@ -113,25 +113,25 @@ class StudyMonitorScreen extends StudyPageWidget {
                     percentage: activePercentage,
                     color: activeColor,
                     tooltip:
-                        '${tr.monitoring_active}: ${monitorData.activeParticipants}',
+                        '${tr.monitoring_active}: ${monitorData.activeParticipants.map((e) => e.participantId)}',
                   ),
                   _buildStat(
                     percentage: inactivePercentage,
                     color: inactiveColor,
                     tooltip:
-                        '${tr.monitoring_inactive}: ${monitorData.inactiveParticipants}',
+                        '${tr.monitoring_inactive}: ${monitorData.inactiveParticipants.map((e) => e.participantId)}',
                   ),
                   _buildStat(
                     percentage: dropoutPercentage,
                     color: dropoutColor,
                     tooltip:
-                        '${tr.monitoring_dropout}: ${monitorData.dropoutParticipants}',
+                        '${tr.monitoring_dropout}: ${monitorData.dropoutParticipants.map((e) => e.participantId)}',
                   ),
                   _buildStat(
                     percentage: completedPercentage,
                     color: completedColor,
                     tooltip:
-                        '${tr.monitoring_completed}: ${monitorData.completedParticipants}',
+                        '${tr.monitoring_completed}: ${monitorData.completedParticipants.map((e) => e.participantId)}',
                   ),
                 ],
               ),

From 190db38ed963788017adbe5b34e98511ccc1301c Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahim.ozkn@outlook.com>
Date: Mon, 15 Jul 2024 12:50:53 +0200
Subject: [PATCH 288/314] fix: added legend for participant activity tooltip

---
 .../participant/participant_legend.dart       | 76 +++++++++----------
 designer_v2/lib/localization/app_de.arb       |  1 +
 designer_v2/lib/localization/app_en.arb       |  1 +
 3 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/designer_v2/lib/features/monitor/participant/participant_legend.dart b/designer_v2/lib/features/monitor/participant/participant_legend.dart
index 5cb5e38a0..21e30b56a 100644
--- a/designer_v2/lib/features/monitor/participant/participant_legend.dart
+++ b/designer_v2/lib/features/monitor/participant/participant_legend.dart
@@ -17,46 +17,46 @@ class ParticipantLegend extends StatelessWidget {
           style: const TextStyle(fontWeight: FontWeight.bold),
         ),
         const SizedBox(height: 8.0),
-        Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
+        Row(
           children: [
-            Row(
-              children: [
-                _buildLegendItem(
-                  color: completeColor,
-                  tr.participant_details_color_legend_completed,
-                  tr.participant_details_completed_legend_tooltip,
-                ),
-                const SizedBox(width: 16.0),
-                _buildLegendItem(
-                  color: partiallyCompleteColor,
-                  tr.participant_details_color_legend_partially_completed,
-                  tr.participant_details_partially_completed_legend_tooltip,
-                  gradient: true,
-                ),
-                const SizedBox(width: 16.0),
-                _buildLegendItem(
-                  color: incompleteColor,
-                  tr.participant_details_color_legend_missed,
-                  tr.participant_details_incomplete_legend_tooltip,
-                ),
-              ],
+            _buildLegendItem(
+              color: completeColor,
+              tr.participant_details_color_legend_completed,
+              tr.participant_details_completed_legend_tooltip,
             ),
-            const SizedBox(height: 8.0),
-            Row(
-              children: [
-                _buildLegendItem(
-                  widget: const Text('\u{2705}'),
-                  tr.participant_details_color_legend_completed_task,
-                  tr.participant_details_color_legend_completed_task_tooltip,
-                ),
-                const SizedBox(width: 16.0),
-                _buildLegendItem(
-                  widget: const Text('\u{274C}'),
-                  tr.participant_details_color_legend_missed_task,
-                  tr.participant_details_color_legend_missed_task_tooltip,
-                ),
-              ],
+            const SizedBox(width: 16.0),
+            _buildLegendItem(
+              color: partiallyCompleteColor,
+              tr.participant_details_color_legend_partially_completed,
+              tr.participant_details_partially_completed_legend_tooltip,
+              gradient: true,
+            ),
+            const SizedBox(width: 16.0),
+            _buildLegendItem(
+              color: incompleteColor,
+              tr.participant_details_color_legend_missed,
+              tr.participant_details_incomplete_legend_tooltip,
+            ),
+          ],
+        ),
+        const SizedBox(height: 16.0),
+        Text(
+          tr.participant_details_color_tooltip_legend_title,
+          style: const TextStyle(fontWeight: FontWeight.bold),
+        ),
+        const SizedBox(height: 8.0),
+        Row(
+          children: [
+            _buildLegendItem(
+              widget: const Text('\u{2705}'),
+              tr.participant_details_color_legend_completed_task,
+              tr.participant_details_color_legend_completed_task_tooltip,
+            ),
+            const SizedBox(width: 16.0),
+            _buildLegendItem(
+              widget: const Text('\u{274C}'),
+              tr.participant_details_color_legend_missed_task,
+              tr.participant_details_color_legend_missed_task_tooltip,
             ),
           ],
         ),
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
index dd02207c3..1023f5263 100644
--- a/designer_v2/lib/localization/app_de.arb
+++ b/designer_v2/lib/localization/app_de.arb
@@ -543,6 +543,7 @@
   "participant_details_study_days_overview": "Übersicht über Studientage",
   "participant_details_study_days_description": "Dieser Abschnitt bietet einen Überblick über die täglichen Aktivitäten des Teilnehmers in der Studie. Die Farblegende zeigt den Status der täglichen Aufgaben an. Bewege den Mauszeiger über die Studientage, um mehr Details über die tägliche Aktivität des Teilnehmers zu erfahren.",
   "participant_details_color_legend_title": "Legende",
+  "participant_details_color_tooltip_legend_title": "Aktivitätsdetail Legende",
   "participant_details_color_legend_completed_task": "Completed task",
   "participant_details_color_legend_completed_task_tooltip": "The participant has completed this task",
   "participant_details_color_legend_missed_task": "Missed task",
diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
index f23f56a42..2d2263f0a 100644
--- a/designer_v2/lib/localization/app_en.arb
+++ b/designer_v2/lib/localization/app_en.arb
@@ -543,6 +543,7 @@
   "participant_details_study_days_overview": "Study days overview",
   "participant_details_study_days_description": "This section provides an overview of the participant's progress in the study. The color coding indicates the status of the participant's tasks on each day. Hover over each day to see more details about the participant's activity.",
   "participant_details_color_legend_title": "Legend",
+  "participant_details_color_tooltip_legend_title": "Activity Detail Legend",
   "participant_details_color_legend_completed_task": "Completed task",
   "participant_details_color_legend_completed_task_tooltip": "The participant has completed this task",
   "participant_details_color_legend_missed_task": "Missed task",

From 9fdff11bb87ce5e09ebdd3b2ce02175c2de031d1 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 14 Jul 2024 09:22:04 +0200
Subject: [PATCH 289/314] fix: upgrade deps

---
 app/android/Gemfile.lock    | 20 ++++----
 app/ios/Gemfile.lock        | 30 ++++++------
 app/ios/Podfile.lock        |  4 +-
 app/pubspec.lock            | 96 ++++++++++++++++++-------------------
 app/pubspec.yaml            | 12 ++---
 core/pubspec.lock           | 32 ++++++-------
 core/pubspec.yaml           |  6 +--
 designer_v2/pubspec.lock    | 52 ++++++++++----------
 designer_v2/pubspec.yaml    | 10 ++--
 flutter_common/pubspec.lock | 44 ++++++++---------
 flutter_common/pubspec.yaml |  4 +-
 pubspec.lock                |  8 ++--
 12 files changed, 159 insertions(+), 159 deletions(-)

diff --git a/app/android/Gemfile.lock b/app/android/Gemfile.lock
index 18c97dc20..550f7ffaa 100644
--- a/app/android/Gemfile.lock
+++ b/app/android/Gemfile.lock
@@ -10,19 +10,19 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.949.0)
-    aws-sdk-core (3.200.0)
+    aws-partitions (1.956.0)
+    aws-sdk-core (3.201.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.87.0)
-      aws-sdk-core (~> 3, >= 3.199.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.155.0)
-      aws-sdk-core (~> 3, >= 3.199.0)
+    aws-sdk-kms (1.88.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.156.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
+      aws-sigv4 (~> 1.5)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
@@ -38,7 +38,7 @@ GEM
     domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.110.0)
+    excon (0.111.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -154,7 +154,7 @@ GEM
     json (2.7.2)
     jwt (2.8.2)
       base64
-    mini_magick (4.13.1)
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
     multi_json (1.15.0)
     multipart-post (2.4.1)
diff --git a/app/ios/Gemfile.lock b/app/ios/Gemfile.lock
index daec0568f..550f7ffaa 100644
--- a/app/ios/Gemfile.lock
+++ b/app/ios/Gemfile.lock
@@ -5,24 +5,24 @@ GEM
       base64
       nkf
       rexml
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.943.0)
-    aws-sdk-core (3.197.0)
+    aws-partitions (1.956.0)
+    aws-sdk-core (3.201.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.83.0)
-      aws-sdk-core (~> 3, >= 3.197.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.1)
-      aws-sdk-core (~> 3, >= 3.197.0)
+    aws-sdk-kms (1.88.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.156.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
+      aws-sigv4 (~> 1.5)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
@@ -38,7 +38,7 @@ GEM
     domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.110.0)
+    excon (0.111.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -68,7 +68,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.220.0)
+    fastlane (2.221.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -152,9 +152,9 @@ GEM
     httpclient (2.8.3)
     jmespath (1.6.2)
     json (2.7.2)
-    jwt (2.8.1)
+    jwt (2.8.2)
       base64
-    mini_magick (4.12.0)
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
     multi_json (1.15.0)
     multipart-post (2.4.1)
@@ -164,7 +164,7 @@ GEM
     optparse (0.5.0)
     os (1.1.4)
     plist (3.7.1)
-    public_suffix (5.0.5)
+    public_suffix (6.0.0)
     rake (13.2.1)
     representable (3.2.0)
       declarative (< 0.1.0)
diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock
index 33fa60c09..83ef751ab 100644
--- a/app/ios/Podfile.lock
+++ b/app/ios/Podfile.lock
@@ -118,7 +118,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   app_links: e70ca16b4b0f88253b3b3660200d4a10b4ea9795
   audio_session: 088d2483ebd1dc43f51d253d4a1c517d9a2e7207
-  camera_avfoundation: 759172d1a77ae7be0de08fc104cfb79738b8a59e
+  camera_avfoundation: dd002b0330f4981e1bbcb46ae9b62829237459a4
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_file_dialog: 4c014a45b105709a27391e266c277d7e588e9299
   flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
@@ -136,7 +136,7 @@ SPEC CHECKSUMS:
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
   video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
   wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
-  webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36
+  webview_flutter_wkwebview: 2a23822e9039b7b1bc52e5add778e5d89ad488d1
 
 PODFILE CHECKSUM: 666752a84cc2c75e2476eadd0afa8f31ee5056b0
 
diff --git a/app/pubspec.lock b/app/pubspec.lock
index ba6ff4173..67d65260c 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -5,26 +5,26 @@ packages:
     dependency: transitive
     description:
       name: app_links
-      sha256: a9905d6a60e814503fabc7523a9ed161b812d7ca69c99ad8ceea14279dc4f06b
+      sha256: ae5f9a1b7d40d26178f605414be81ed4260350b4fae8259fe5ca4f89fe70c4af
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.3"
+    version: "6.1.4"
   app_links_linux:
     dependency: transitive
     description:
       name: app_links_linux
-      sha256: "567139eca3ca9fb113f2082f3aaa75a26f30f0ebdbe5fa7f09a3913c5bebd630"
+      sha256: f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   app_links_platform_interface:
     dependency: transitive
     description:
       name: app_links_platform_interface
-      sha256: "58cff6f11df59b0e514dd5e4a61e988348ad5662f0e75d45d4e214ebea55c94c"
+      sha256: "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.2"
   app_links_web:
     dependency: transitive
     description:
@@ -61,10 +61,10 @@ packages:
     dependency: transitive
     description:
       name: audio_session
-      sha256: a49af9981eec5d7cd73b37bacb6ee73f8143a6a9f9bd5b6021e6c346b9b6cf4e
+      sha256: "4012d798e25a0ebfd4ad7203fefe7e386fdfedd2243afc52fa700b8bde6a3a4f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.19"
+    version: "0.1.20"
   barcode:
     dependency: transitive
     description:
@@ -125,34 +125,34 @@ packages:
     dependency: transitive
     description:
       name: camera_android_camerax
-      sha256: "7abb0faddbf103c59365e805ad9a30ab4d602b2eb7a8de469697945fd4a69daa"
+      sha256: "7c03940cb8c92eb5b184952674a07cc4a73c6ba2b3568aad70255ad4cb913660"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.5+6"
+    version: "0.6.7+1"
   camera_avfoundation:
     dependency: transitive
     description:
       name: camera_avfoundation
-      sha256: "7d021e8cd30d9b71b8b92b4ad669e80af432d722d18d6aac338572754a786c15"
+      sha256: "95c2f40b4d06cdb0fd2ad893c762d1f2c931a5e370793ec34c939eb4fcbf96bb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.16"
+    version: "0.9.17"
   camera_platform_interface:
     dependency: transitive
     description:
       name: camera_platform_interface
-      sha256: a250314a48ea337b35909a4c9d5416a208d736dcb01d0b02c6af122be66660b0
+      sha256: b3ede1f171532e0d83111fe0980b46d17f1aa9788a07a2fbed07366bbdbb9061
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.4"
+    version: "2.8.0"
   camera_web:
     dependency: transitive
     description:
       name: camera_web
-      sha256: "9e9aba2fbab77ce2472924196ff8ac4dd8f9126c4f9a3096171cd1d870d6b26c"
+      sha256: b9235ec0a2ce949daec546f1f3d86f05c3921ed31c7d9ab6b7c03214d152fc2d
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.3"
+    version: "0.3.4"
   characters:
     dependency: transitive
     description:
@@ -354,18 +354,18 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: ced76d337f54de33d7d9f06092137b4ac2da5079e00cee8a11a1794ffc7c61c6
+      sha256: dd6676d8c2926537eccdf9f72128bbb2a9d0814689527b17f92c248ff192eaf3
       url: "https://pub.dev"
     source: hosted
-    version: "17.2.1"
+    version: "17.2.1+2"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
       name: flutter_local_notifications_linux
-      sha256: "33f741ef47b5f63cc7f78fe75eeeac7e19f171ff3c3df054d84c1e38bedb6a03"
+      sha256: c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0+1"
+    version: "4.0.1"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
@@ -452,10 +452,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_timezone
-      sha256: "06b35132c98fa188db3c4b654b7e1af7ccd01dfe12a004d58be423357605fb24"
+      sha256: f9c328f66d58cd2af8a0cbd2f84d0c211fda8b7332b5e458d9848bd9ec936120
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.8"
+    version: "2.0.1"
   flutter_web_plugins:
     dependency: "direct main"
     description: flutter
@@ -537,10 +537,10 @@ packages:
     dependency: transitive
     description:
       name: gotrue
-      sha256: "65c8c47afb8230218bc295e6edcb948b117e39801f91c4a4bcb94dfd26b57134"
+      sha256: a8784341bcc08f88ba7a4b04a40a37059c7e71c315f058d45c31d09e8a951194
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.1"
+    version: "2.8.3"
   gtk:
     dependency: transitive
     description:
@@ -617,10 +617,10 @@ packages:
     dependency: transitive
     description:
       name: just_audio
-      sha256: "5abfab1d199e01ab5beffa61b3e782350df5dad036cb8c83b79fa45fc656614e"
+      sha256: ee50602364ba83fa6308f5512dd560c713ec3e1f2bc75f0db43618f0d82ef71a
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.38"
+    version: "0.9.39"
   just_audio_platform_interface:
     dependency: transitive
     description:
@@ -801,10 +801,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: bca87b0165ffd7cdb9cad8edd22d18d2201e886d9a9f19b4fb3452ea7df3a72a
+      sha256: "30c5aa827a6ae95ce2853cdc5fe3971daaac00f6f081c419c013f7f57bff2f5e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.6"
+    version: "2.2.7"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -833,10 +833,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.3.0"
   pdf:
     dependency: "direct main"
     description:
@@ -969,10 +969,10 @@ packages:
     dependency: transitive
     description:
       name: realtime_client
-      sha256: cd44fa21407a2e217d674f1c1a33b36c49ad0d8aea0349bf5b66594db06c80fb
+      sha256: a99b7817e203c57ada746e9fe113820410cf84d9029f4310c57737aae890b0f7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   record:
     dependency: "direct main"
     description:
@@ -985,10 +985,10 @@ packages:
     dependency: transitive
     description:
       name: record_android
-      sha256: c15d7faffbbb8d3414e3062534fc125b445d2590327dc930636e7c70b8217733
+      sha256: "9ccf6a206dc72b486cf37893690e70c17610e8f05dba8da1a808e73dc2f49a04"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.3"
+    version: "1.2.4"
   record_darwin:
     dependency: transitive
     description:
@@ -1220,18 +1220,18 @@ packages:
     dependency: "direct main"
     description:
       name: supabase
-      sha256: "073aabf6a9f6ada2ebb77082222e1104949afb9f7f181017d0643d99bda0efe3"
+      sha256: "7d2ca0499a6933b9aed2f4ff9eff4cbc4107f54006be35c42c8e1db70e99438e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.4"
   supabase_flutter:
     dependency: "direct main"
     description:
       name: supabase_flutter
-      sha256: ae56c20924fadd62f0a83f0570c22cec85f4b093768fbd0e049c4e1741a109a7
+      sha256: "048d9377a76e43b95039d67e26b4bb2326fc8818df8d2f4bd63b4fdfc79f8f50"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.6"
+    version: "2.5.8"
   synchronized:
     dependency: transitive
     description:
@@ -1268,10 +1268,10 @@ packages:
     dependency: "direct main"
     description:
       name: timezone
-      sha256: a6ccda4a69a442098b602c44e61a1e2b4bf6f5516e875bbf0f427d5df14745d5
+      sha256: "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.3"
+    version: "0.9.4"
   typed_data:
     dependency: transitive
     description:
@@ -1316,10 +1316,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
+      sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.0"
+    version: "6.3.1"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -1364,10 +1364,10 @@ packages:
     dependency: "direct main"
     description:
       name: uuid
-      sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8"
+      sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90"
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.0"
+    version: "4.4.2"
   vector_graphics:
     dependency: transitive
     description:
@@ -1412,10 +1412,10 @@ packages:
     dependency: transitive
     description:
       name: video_player_android
-      sha256: "3ff2da7e5a9274bef9b5deb9084f73a77920211c463e0e836361b14146e67339"
+      sha256: fdc0331ce9f808cc2714014cb8126bd6369943affefd54f8fdab0ea0bb617b7f
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.1"
+    version: "2.5.2"
   video_player_avfoundation:
     dependency: transitive
     description:
@@ -1508,10 +1508,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: "7affdf9d680c015b11587181171d3cad8093e449db1f7d9f0f08f4f33d24f9a0"
+      sha256: "9c62cc46fa4f2d41e10ab81014c1de470a6c6f26051a2de32111b2ee55287feb"
       url: "https://pub.dev"
     source: hosted
-    version: "3.13.1"
+    version: "3.14.0"
   win32:
     dependency: transitive
     description:
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 7f0998b50..c84346211 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -17,10 +17,10 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_file_dialog: ^3.0.2
-  flutter_local_notifications: ^17.2.1
+  flutter_local_notifications: ^17.2.1+2
   flutter_localizations:
     sdk: flutter
-  flutter_timezone: ^1.0.8
+  flutter_timezone: ^2.0.1
   flutter_web_plugins:
     sdk: flutter
   flutter_widget_from_html: ^0.15.1
@@ -41,13 +41,13 @@ dependencies:
   shared_preferences: ^2.2.3
   studyu_core: ^4.4.3-dev.2
   studyu_flutter_common: ^1.8.4-dev.2
-  supabase: ^2.2.2
-  supabase_flutter: ^2.5.6
+  supabase: ^2.2.4
+  supabase_flutter: ^2.5.8
   timeline_tile: ^2.0.0
-  timezone: ^0.9.3
+  timezone: ^0.9.4
   universal_html: ^2.2.4
   url_launcher: ^6.3.0
-  uuid: ^4.4.0
+  uuid: ^4.4.2
   wakelock_plus: ^1.2.5
 
 dev_dependencies:
diff --git a/core/pubspec.lock b/core/pubspec.lock
index a692ab97e..b905e7032 100644
--- a/core/pubspec.lock
+++ b/core/pubspec.lock
@@ -218,10 +218,10 @@ packages:
     dependency: transitive
     description:
       name: gotrue
-      sha256: "65c8c47afb8230218bc295e6edcb948b117e39801f91c4a4bcb94dfd26b57134"
+      sha256: a8784341bcc08f88ba7a4b04a40a37059c7e71c315f058d45c31d09e8a951194
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.1"
+    version: "2.8.3"
   graphs:
     dependency: transitive
     description:
@@ -418,10 +418,10 @@ packages:
     dependency: transitive
     description:
       name: realtime_client
-      sha256: cd44fa21407a2e217d674f1c1a33b36c49ad0d8aea0349bf5b66594db06c80fb
+      sha256: a99b7817e203c57ada746e9fe113820410cf84d9029f4310c57737aae890b0f7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   retry:
     dependency: transitive
     description:
@@ -562,18 +562,18 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   supabase:
     dependency: "direct main"
     description:
       name: supabase
-      sha256: "073aabf6a9f6ada2ebb77082222e1104949afb9f7f181017d0643d99bda0efe3"
+      sha256: "7d2ca0499a6933b9aed2f4ff9eff4cbc4107f54006be35c42c8e1db70e99438e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.4"
   term_glyph:
     dependency: transitive
     description:
@@ -586,26 +586,26 @@ packages:
     dependency: "direct dev"
     description:
       name: test
-      sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e"
+      sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f"
       url: "https://pub.dev"
     source: hosted
-    version: "1.25.7"
+    version: "1.25.8"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.3"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696"
+      sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.4"
+    version: "0.6.5"
   timing:
     dependency: transitive
     description:
@@ -626,10 +626,10 @@ packages:
     dependency: "direct main"
     description:
       name: uuid
-      sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8"
+      sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90"
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.0"
+    version: "4.4.2"
   vm_service:
     dependency: transitive
     description:
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index 7603db1e7..fd93127ba 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -14,11 +14,11 @@ dependencies:
   logger: ^2.3.0
   quiver: ^3.2.1
   sentry: ^8.3.0
-  supabase: ^2.2.2
-  uuid: ^4.4.0
+  supabase: ^2.2.4
+  uuid: ^4.4.2
 
 dev_dependencies:
   build_runner: ^2.4.11
   json_serializable: ^6.8.0
   lint: ^2.3.0
-  test: ^1.25.7
+  test: ^1.25.8
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index e43551eed..93c0583d9 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -29,26 +29,26 @@ packages:
     dependency: transitive
     description:
       name: app_links
-      sha256: a9905d6a60e814503fabc7523a9ed161b812d7ca69c99ad8ceea14279dc4f06b
+      sha256: ae5f9a1b7d40d26178f605414be81ed4260350b4fae8259fe5ca4f89fe70c4af
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.3"
+    version: "6.1.4"
   app_links_linux:
     dependency: transitive
     description:
       name: app_links_linux
-      sha256: "567139eca3ca9fb113f2082f3aaa75a26f30f0ebdbe5fa7f09a3913c5bebd630"
+      sha256: f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   app_links_platform_interface:
     dependency: transitive
     description:
       name: app_links_platform_interface
-      sha256: "58cff6f11df59b0e514dd5e4a61e988348ad5662f0e75d45d4e214ebea55c94c"
+      sha256: "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.2"
   app_links_web:
     dependency: transitive
     description:
@@ -454,10 +454,10 @@ packages:
     dependency: transitive
     description:
       name: freezed_annotation
-      sha256: c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d
+      sha256: f9f6597ac43cc262fa7d7f2e65259a6060c23a560525d1f2631be374540f2a9b
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.3"
   frontend_server_client:
     dependency: transitive
     description:
@@ -491,18 +491,18 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: cdae1b9c8bd7efadcef6112e81c903662ef2ce105cbd220a04bbb7c3425b5554
+      sha256: "39dd52168d6c59984454183148dc3a5776960c61083adfc708cc79a7b3ce1ba8"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.0"
+    version: "14.2.1"
   gotrue:
     dependency: transitive
     description:
       name: gotrue
-      sha256: "65c8c47afb8230218bc295e6edcb948b117e39801f91c4a4bcb94dfd26b57134"
+      sha256: a8784341bcc08f88ba7a4b04a40a37059c7e71c315f058d45c31d09e8a951194
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.1"
+    version: "2.8.3"
   graphs:
     dependency: transitive
     description:
@@ -752,10 +752,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: bca87b0165ffd7cdb9cad8edd22d18d2201e886d9a9f19b4fb3452ea7df3a72a
+      sha256: "30c5aa827a6ae95ce2853cdc5fe3971daaac00f6f081c419c013f7f57bff2f5e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.6"
+    version: "2.2.7"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -784,10 +784,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.3.0"
   patrol_finders:
     dependency: "direct dev"
     description:
@@ -936,10 +936,10 @@ packages:
     dependency: transitive
     description:
       name: realtime_client
-      sha256: cd44fa21407a2e217d674f1c1a33b36c49ad0d8aea0349bf5b66594db06c80fb
+      sha256: a99b7817e203c57ada746e9fe113820410cf84d9029f4310c57737aae890b0f7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   retry:
     dependency: transitive
     description:
@@ -1203,18 +1203,18 @@ packages:
     dependency: "direct main"
     description:
       name: supabase
-      sha256: "073aabf6a9f6ada2ebb77082222e1104949afb9f7f181017d0643d99bda0efe3"
+      sha256: "7d2ca0499a6933b9aed2f4ff9eff4cbc4107f54006be35c42c8e1db70e99438e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.4"
   supabase_flutter:
     dependency: "direct main"
     description:
       name: supabase_flutter
-      sha256: ae56c20924fadd62f0a83f0570c22cec85f4b093768fbd0e049c4e1741a109a7
+      sha256: "048d9377a76e43b95039d67e26b4bb2326fc8818df8d2f4bd63b4fdfc79f8f50"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.6"
+    version: "2.5.8"
   sync_http:
     dependency: transitive
     description:
@@ -1299,10 +1299,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
+      sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.0"
+    version: "6.3.1"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -1347,10 +1347,10 @@ packages:
     dependency: "direct main"
     description:
       name: uuid
-      sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8"
+      sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90"
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.0"
+    version: "4.4.2"
   vector_math:
     dependency: transitive
     description:
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index 8ce2cad22..d93bf123e 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -11,7 +11,7 @@ environment:
 dependencies:
   archive: ^3.6.1
   async: ^2.11.0
-  collection: ^1.18.0
+  collection: ^1.18.0 # flutter_test
   csv: ^6.0.0
   cupertino_icons: ^1.0.8
   dynamic_color: ^1.7.0
@@ -24,7 +24,7 @@ dependencies:
   flutter_riverpod: ^2.5.1
   flutter_web_plugins:
     sdk: flutter
-  go_router: ^14.2.0
+  go_router: ^14.2.1
   intl: ^0.19.0
   material_color_utilities: 0.8.0 # integration_test
   material_design_icons_flutter: ^7.0.7296
@@ -37,10 +37,10 @@ dependencies:
   rxdart: ^0.27.7 # custom_lint 0.6.4
   studyu_core: ^4.4.3-dev.2
   studyu_flutter_common: ^1.8.4-dev.2
-  supabase: ^2.2.2
-  supabase_flutter: ^2.5.6
+  supabase: ^2.2.4
+  supabase_flutter: ^2.5.8
   url_launcher: ^6.3.0
-  uuid: ^4.4.0
+  uuid: ^4.4.2
 
 dev_dependencies:
   build_runner: ^2.4.11
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index bdd3c69c8..b814dd620 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -5,26 +5,26 @@ packages:
     dependency: transitive
     description:
       name: app_links
-      sha256: a9905d6a60e814503fabc7523a9ed161b812d7ca69c99ad8ceea14279dc4f06b
+      sha256: ae5f9a1b7d40d26178f605414be81ed4260350b4fae8259fe5ca4f89fe70c4af
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.3"
+    version: "6.1.4"
   app_links_linux:
     dependency: transitive
     description:
       name: app_links_linux
-      sha256: "567139eca3ca9fb113f2082f3aaa75a26f30f0ebdbe5fa7f09a3913c5bebd630"
+      sha256: f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   app_links_platform_interface:
     dependency: transitive
     description:
       name: app_links_platform_interface
-      sha256: "58cff6f11df59b0e514dd5e4a61e988348ad5662f0e75d45d4e214ebea55c94c"
+      sha256: "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.2"
   app_links_web:
     dependency: transitive
     description:
@@ -212,10 +212,10 @@ packages:
     dependency: transitive
     description:
       name: gotrue
-      sha256: "65c8c47afb8230218bc295e6edcb948b117e39801f91c4a4bcb94dfd26b57134"
+      sha256: a8784341bcc08f88ba7a4b04a40a37059c7e71c315f058d45c31d09e8a951194
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.1"
+    version: "2.8.3"
   gtk:
     dependency: transitive
     description:
@@ -364,10 +364,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: bca87b0165ffd7cdb9cad8edd22d18d2201e886d9a9f19b4fb3452ea7df3a72a
+      sha256: "30c5aa827a6ae95ce2853cdc5fe3971daaac00f6f081c419c013f7f57bff2f5e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.6"
+    version: "2.2.7"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -396,10 +396,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.3.0"
   platform:
     dependency: transitive
     description:
@@ -436,10 +436,10 @@ packages:
     dependency: transitive
     description:
       name: realtime_client
-      sha256: cd44fa21407a2e217d674f1c1a33b36c49ad0d8aea0349bf5b66594db06c80fb
+      sha256: a99b7817e203c57ada746e9fe113820410cf84d9029f4310c57737aae890b0f7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   retry:
     dependency: transitive
     description:
@@ -584,18 +584,18 @@ packages:
     dependency: transitive
     description:
       name: supabase
-      sha256: "073aabf6a9f6ada2ebb77082222e1104949afb9f7f181017d0643d99bda0efe3"
+      sha256: "7d2ca0499a6933b9aed2f4ff9eff4cbc4107f54006be35c42c8e1db70e99438e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.4"
   supabase_flutter:
     dependency: "direct main"
     description:
       name: supabase_flutter
-      sha256: ae56c20924fadd62f0a83f0570c22cec85f4b093768fbd0e049c4e1741a109a7
+      sha256: "048d9377a76e43b95039d67e26b4bb2326fc8818df8d2f4bd63b4fdfc79f8f50"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.6"
+    version: "2.5.8"
   synchronized:
     dependency: "direct main"
     description:
@@ -648,10 +648,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
+      sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.0"
+    version: "6.3.1"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -696,10 +696,10 @@ packages:
     dependency: "direct main"
     description:
       name: uuid
-      sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8"
+      sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90"
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.0"
+    version: "4.4.2"
   vector_math:
     dependency: transitive
     description:
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index 85bc98819..8f733f80c 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -15,9 +15,9 @@ dependencies:
   lint: ^2.3.0
   shared_preferences: ^2.2.3 # Can be removed after migrating phase
   studyu_core: ^4.4.3-dev.2
-  supabase_flutter: ^2.5.6
+  supabase_flutter: ^2.5.8
   synchronized: ^3.1.0+1
-  uuid: ^4.4.0
+  uuid: ^4.4.2
 
 dev_dependencies:
   flutter_lints: ^4.0.0
diff --git a/pubspec.lock b/pubspec.lock
index 220224ca0..1a9e5770d 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -285,10 +285,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   term_glyph:
     dependency: transitive
     description:
@@ -301,10 +301,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.3"
   typed_data:
     dependency: transitive
     description:

From 6e513202ac009a4615d8fe3b5b899af09aed8286 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 14 Jul 2024 09:24:58 +0200
Subject: [PATCH 290/314] chore(release): publish packages

 - studyu_app@2.7.6
 - studyu_core@4.4.3
 - studyu_designer_v2@1.8.1
 - studyu_flutter_common@1.8.4
---
 CHANGELOG.md                | 35 +++++++++++++++++++++++++++++++++++
 app/CHANGELOG.md            |  4 ++++
 app/pubspec.yaml            |  6 +++---
 core/CHANGELOG.md           |  4 ++++
 core/pubspec.yaml           |  2 +-
 designer_v2/CHANGELOG.md    |  4 ++++
 designer_v2/pubspec.yaml    |  6 +++---
 flutter_common/CHANGELOG.md |  4 ++++
 flutter_common/pubspec.yaml |  4 ++--
 9 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 355173969..ff96786ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2024-07-14
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - [`studyu_app` - `v2.7.6`](#studyu_app---v276)
+ - [`studyu_core` - `v4.4.3`](#studyu_core---v443)
+ - [`studyu_designer_v2` - `v1.8.1`](#studyu_designer_v2---v181)
+ - [`studyu_flutter_common` - `v1.8.4`](#studyu_flutter_common---v184)
+
+Packages with other changes:
+
+ - There are no other changes in this release.
+
+Packages graduated to a stable release (see pre-releases prior to the stable version for changelog entries):
+
+ - `studyu_app` - `v2.7.6`
+ - `studyu_core` - `v4.4.3`
+ - `studyu_designer_v2` - `v1.8.1`
+ - `studyu_flutter_common` - `v1.8.4`
+
+---
+
+#### `studyu_app` - `v2.7.6`
+
+#### `studyu_core` - `v4.4.3`
+
+#### `studyu_designer_v2` - `v1.8.1`
+
+#### `studyu_flutter_common` - `v1.8.4`
+
+
 ## 2024-07-01
 
 ### Changes
diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md
index 01c444077..088190757 100644
--- a/app/CHANGELOG.md
+++ b/app/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.7.6
+
+ - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
+
 ## 2.7.6-dev.3
 
  - **REFACTOR**: migrate to riverpod code generation 2.
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index c84346211..31eb02c10 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_app
-version: 2.7.6-dev.3
+version: 2.7.6
 description: Partake in digital N-of-1 trials with the innovative StudyU Health App
 publish_to: none
 homepage: https://studyu.health
@@ -39,8 +39,8 @@ dependencies:
   sentry_flutter: ^8.3.0
   sentry_logging: ^8.3.0
   shared_preferences: ^2.2.3
-  studyu_core: ^4.4.3-dev.2
-  studyu_flutter_common: ^1.8.4-dev.2
+  studyu_core: ^4.4.3
+  studyu_flutter_common: ^1.8.4
   supabase: ^2.2.4
   supabase_flutter: ^2.5.8
   timeline_tile: ^2.0.0
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 342eeb886..473263d25 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.4.3
+
+ - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
+
 ## 4.4.3-dev.2
 
  - **FIX**: keep eligibility criterion.
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index fd93127ba..ea9ef6869 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_core
-version: 4.4.3-dev.2
+version: 4.4.3
 description: This package contains StudyU models and common functions for the app and designer packages
 homepage: https://studyu.health
 repository: https://github.com/hpi-studyu/studyu
diff --git a/designer_v2/CHANGELOG.md b/designer_v2/CHANGELOG.md
index 70e092164..c1d178d31 100644
--- a/designer_v2/CHANGELOG.md
+++ b/designer_v2/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.8.1
+
+ - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
+
 ## 1.8.1-dev.3
 
  - **REFACTOR**: migrated auth_form_controller.dart to riverpod v2.
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index d93bf123e..ad1a8f78a 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_designer_v2
-version: 1.8.1-dev.3
+version: 1.8.1
 description: Implement digital N-of-1 studies seamlessly with the StudyU Health Designer
 publish_to: none
 homepage: https://studyu.health
@@ -35,8 +35,8 @@ dependencies:
   reactive_range_slider: ^2.1.0
   riverpod_annotation: ^2.3.5
   rxdart: ^0.27.7 # custom_lint 0.6.4
-  studyu_core: ^4.4.3-dev.2
-  studyu_flutter_common: ^1.8.4-dev.2
+  studyu_core: ^4.4.3
+  studyu_flutter_common: ^1.8.4
   supabase: ^2.2.4
   supabase_flutter: ^2.5.8
   url_launcher: ^6.3.0
diff --git a/flutter_common/CHANGELOG.md b/flutter_common/CHANGELOG.md
index 0dae1fb3b..cd9ce3984 100644
--- a/flutter_common/CHANGELOG.md
+++ b/flutter_common/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.8.4
+
+ - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
+
 ## 1.8.4-dev.2
 
  - **FIX**: formatting issues.
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index 8f733f80c..35ca0f9f9 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_flutter_common
-version: 1.8.4-dev.2
+version: 1.8.4
 description: StudyU common flutter components and functions for app and designer
 homepage: https://studyu.health
 repository: https://github.com/hpi-studyu/studyu
@@ -14,7 +14,7 @@ dependencies:
   flutter_secure_storage: ^9.2.2
   lint: ^2.3.0
   shared_preferences: ^2.2.3 # Can be removed after migrating phase
-  studyu_core: ^4.4.3-dev.2
+  studyu_core: ^4.4.3
   supabase_flutter: ^2.5.8
   synchronized: ^3.1.0+1
   uuid: ^4.4.2

From c90343e2a4cf2df3716655b0601c9271c5f87dc1 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 14 Jul 2024 09:27:10 +0200
Subject: [PATCH 291/314] chore: lockfiles

---
 app/pubspec.lock            | 4 ++--
 designer_v2/pubspec.lock    | 4 ++--
 flutter_common/pubspec.lock | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index 67d65260c..feecdb1c7 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -1208,14 +1208,14 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.3-dev.2"
+    version: "4.4.3"
   studyu_flutter_common:
     dependency: "direct main"
     description:
       path: "../flutter_common"
       relative: true
     source: path
-    version: "1.8.4-dev.2"
+    version: "1.8.4"
   supabase:
     dependency: "direct main"
     description:
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 93c0583d9..1911ca8ea 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -1191,14 +1191,14 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.3-dev.2"
+    version: "4.4.3"
   studyu_flutter_common:
     dependency: "direct main"
     description:
       path: "../flutter_common"
       relative: true
     source: path
-    version: "1.8.4-dev.2"
+    version: "1.8.4"
   supabase:
     dependency: "direct main"
     description:
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index b814dd620..39b81769c 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -579,7 +579,7 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.3-dev.2"
+    version: "4.4.3"
   supabase:
     dependency: transitive
     description:

From 2462b62f193395e318997b365f75d578aa3bbee3 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 15 Jul 2024 14:05:52 +0200
Subject: [PATCH 292/314] chore(release): publish packages

 - studyu_app@2.7.7
 - studyu_core@4.4.4
 - studyu_designer_v2@1.8.2
 - studyu_flutter_common@1.8.5
---
 CHANGELOG.md                | 42 +++++++++++++++++++++++++++++++++++++
 app/CHANGELOG.md            |  5 +++++
 app/pubspec.yaml            |  6 +++---
 core/CHANGELOG.md           |  5 +++++
 core/pubspec.yaml           |  2 +-
 designer_v2/CHANGELOG.md    |  7 +++++++
 designer_v2/pubspec.yaml    |  6 +++---
 flutter_common/CHANGELOG.md |  5 +++++
 flutter_common/pubspec.yaml |  4 ++--
 9 files changed, 73 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff96786ca..8118ce19c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,48 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2024-07-15
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`studyu_app` - `v2.7.7`](#studyu_app---v277)
+ - [`studyu_core` - `v4.4.4`](#studyu_core---v444)
+ - [`studyu_designer_v2` - `v1.8.2`](#studyu_designer_v2---v182)
+ - [`studyu_flutter_common` - `v1.8.5`](#studyu_flutter_common---v185)
+
+---
+
+#### `studyu_app` - `v2.7.7`
+
+ - **FIX**: upgrade deps.
+ - **FIX**: upgrade deps.
+
+#### `studyu_core` - `v4.4.4`
+
+ - **FIX**: upgrade deps.
+ - **FIX**: upgrade deps.
+
+#### `studyu_designer_v2` - `v1.8.2`
+
+ - **FIX**: upgrade deps.
+ - **FIX**: added legend for participant activity tooltip.
+ - **FIX**: monitor section header tooltip participants list display fix.
+ - **FIX**: upgrade deps.
+
+#### `studyu_flutter_common` - `v1.8.5`
+
+ - **FIX**: upgrade deps.
+ - **FIX**: upgrade deps.
+
+
 ## 2024-07-14
 
 ### Changes
diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md
index 088190757..85b6144d8 100644
--- a/app/CHANGELOG.md
+++ b/app/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.7.7
+
+ - **FIX**: upgrade deps.
+ - **FIX**: upgrade deps.
+
 ## 2.7.6
 
  - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 31eb02c10..2c4eec9c7 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_app
-version: 2.7.6
+version: 2.7.7
 description: Partake in digital N-of-1 trials with the innovative StudyU Health App
 publish_to: none
 homepage: https://studyu.health
@@ -39,8 +39,8 @@ dependencies:
   sentry_flutter: ^8.3.0
   sentry_logging: ^8.3.0
   shared_preferences: ^2.2.3
-  studyu_core: ^4.4.3
-  studyu_flutter_common: ^1.8.4
+  studyu_core: ^4.4.4
+  studyu_flutter_common: ^1.8.5
   supabase: ^2.2.4
   supabase_flutter: ^2.5.8
   timeline_tile: ^2.0.0
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 473263d25..4cebbd4ab 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 4.4.4
+
+ - **FIX**: upgrade deps.
+ - **FIX**: upgrade deps.
+
 ## 4.4.3
 
  - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index ea9ef6869..a88df2b77 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_core
-version: 4.4.3
+version: 4.4.4
 description: This package contains StudyU models and common functions for the app and designer packages
 homepage: https://studyu.health
 repository: https://github.com/hpi-studyu/studyu
diff --git a/designer_v2/CHANGELOG.md b/designer_v2/CHANGELOG.md
index c1d178d31..ba91a69b8 100644
--- a/designer_v2/CHANGELOG.md
+++ b/designer_v2/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 1.8.2
+
+ - **FIX**: upgrade deps.
+ - **FIX**: added legend for participant activity tooltip.
+ - **FIX**: monitor section header tooltip participants list display fix.
+ - **FIX**: upgrade deps.
+
 ## 1.8.1
 
  - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index ad1a8f78a..ac695507c 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_designer_v2
-version: 1.8.1
+version: 1.8.2
 description: Implement digital N-of-1 studies seamlessly with the StudyU Health Designer
 publish_to: none
 homepage: https://studyu.health
@@ -35,8 +35,8 @@ dependencies:
   reactive_range_slider: ^2.1.0
   riverpod_annotation: ^2.3.5
   rxdart: ^0.27.7 # custom_lint 0.6.4
-  studyu_core: ^4.4.3
-  studyu_flutter_common: ^1.8.4
+  studyu_core: ^4.4.4
+  studyu_flutter_common: ^1.8.5
   supabase: ^2.2.4
   supabase_flutter: ^2.5.8
   url_launcher: ^6.3.0
diff --git a/flutter_common/CHANGELOG.md b/flutter_common/CHANGELOG.md
index cd9ce3984..74c36227b 100644
--- a/flutter_common/CHANGELOG.md
+++ b/flutter_common/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.8.5
+
+ - **FIX**: upgrade deps.
+ - **FIX**: upgrade deps.
+
 ## 1.8.4
 
  - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index 35ca0f9f9..c155378e3 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_flutter_common
-version: 1.8.4
+version: 1.8.5
 description: StudyU common flutter components and functions for app and designer
 homepage: https://studyu.health
 repository: https://github.com/hpi-studyu/studyu
@@ -14,7 +14,7 @@ dependencies:
   flutter_secure_storage: ^9.2.2
   lint: ^2.3.0
   shared_preferences: ^2.2.3 # Can be removed after migrating phase
-  studyu_core: ^4.4.3
+  studyu_core: ^4.4.4
   supabase_flutter: ^2.5.8
   synchronized: ^3.1.0+1
   uuid: ^4.4.2

From 8891aaad048c0cab51bfedd35893a795372b820f Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 15 Jul 2024 14:06:27 +0200
Subject: [PATCH 293/314] chore: lockfiles

---
 app/pubspec.lock            | 4 ++--
 designer_v2/pubspec.lock    | 4 ++--
 flutter_common/pubspec.lock | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index feecdb1c7..1ec47c7f7 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -1208,14 +1208,14 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.3"
+    version: "4.4.4"
   studyu_flutter_common:
     dependency: "direct main"
     description:
       path: "../flutter_common"
       relative: true
     source: path
-    version: "1.8.4"
+    version: "1.8.5"
   supabase:
     dependency: "direct main"
     description:
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 1911ca8ea..63d0610b8 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -1191,14 +1191,14 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.3"
+    version: "4.4.4"
   studyu_flutter_common:
     dependency: "direct main"
     description:
       path: "../flutter_common"
       relative: true
     source: path
-    version: "1.8.4"
+    version: "1.8.5"
   supabase:
     dependency: "direct main"
     description:
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index 39b81769c..cbf9ff11b 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -579,7 +579,7 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.3"
+    version: "4.4.4"
   supabase:
     dependency: transitive
     description:

From d459f0bab7e1c08aabde134114f9d375c820f3c4 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 18 Jul 2024 15:27:52 +0200
Subject: [PATCH 294/314] fix: upgrade deps

---
 app/ios/Podfile.lock        | 10 +++++-----
 app/pubspec.lock            | 40 ++++++++++++++++++-------------------
 core/pubspec.lock           | 12 +++++------
 core/pubspec.yaml           |  4 ++--
 designer_v2/pubspec.lock    | 20 +++++++++----------
 flutter_common/pubspec.lock | 16 +++++++--------
 pubspec.lock                |  8 ++++----
 7 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock
index 83ef751ab..659bbee7e 100644
--- a/app/ios/Podfile.lock
+++ b/app/ios/Podfile.lock
@@ -26,11 +26,11 @@ PODS:
   - record_darwin (1.0.0):
     - Flutter
     - FlutterMacOS
-  - Sentry/HybridSDK (8.29.0)
-  - sentry_flutter (8.3.0):
+  - Sentry/HybridSDK (8.30.1)
+  - sentry_flutter (8.4.0):
     - Flutter
     - FlutterMacOS
-    - Sentry/HybridSDK (= 8.29.0)
+    - Sentry/HybridSDK (= 8.30.1)
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -129,8 +129,8 @@ SPEC CHECKSUMS:
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
   record_darwin: df0a677188e5fed18472550298e675f19ddaffbe
-  Sentry: 016de45ee5ce5fca2a829996f1bfafeb5e62e8b4
-  sentry_flutter: 5fb57c5b7e6427a9dc1fedde4269eb65823982d4
+  Sentry: 514a3ea653886e9a48c6287d8b7bf05ec24bf3be
+  sentry_flutter: edc037f7af0dc1512d6c33a5c2c7c838bd0d6806
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
diff --git a/app/pubspec.lock b/app/pubspec.lock
index 1ec47c7f7..c6b9a3cc5 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -61,10 +61,10 @@ packages:
     dependency: transitive
     description:
       name: audio_session
-      sha256: "4012d798e25a0ebfd4ad7203fefe7e386fdfedd2243afc52fa700b8bde6a3a4f"
+      sha256: "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.20"
+    version: "0.1.21"
   barcode:
     dependency: transitive
     description:
@@ -133,10 +133,10 @@ packages:
     dependency: transitive
     description:
       name: camera_avfoundation
-      sha256: "95c2f40b4d06cdb0fd2ad893c762d1f2c931a5e370793ec34c939eb4fcbf96bb"
+      sha256: b5093a82537b64bb88d4244f8e00b5ba69e822a5994f47b31d11400e1db975e5
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.17"
+    version: "0.9.17+1"
   camera_platform_interface:
     dependency: transitive
     description:
@@ -452,10 +452,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_timezone
-      sha256: f9c328f66d58cd2af8a0cbd2f84d0c211fda8b7332b5e458d9848bd9ec936120
+      sha256: "0cb5498dedfaac615c779138194052f04524c31d958fab33d378f22b6cc14686"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.1.0"
   flutter_web_plugins:
     dependency: "direct main"
     description: flutter
@@ -561,10 +561,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
+      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   http_parser:
     dependency: transitive
     description:
@@ -689,10 +689,10 @@ packages:
     dependency: transitive
     description:
       name: logger
-      sha256: af05cc8714f356fd1f3888fb6741cbe9fbe25cdb6eedbab80e1a6db21047d4a4
+      sha256: "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
   logging:
     dependency: transitive
     description:
@@ -937,10 +937,10 @@ packages:
     dependency: transitive
     description:
       name: qr
-      sha256: "64957a3930367bf97cc211a5af99551d630f2f4625e38af10edd6b19131b64b3"
+      sha256: "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   quiver:
     dependency: "direct main"
     description:
@@ -1049,26 +1049,26 @@ packages:
     dependency: transitive
     description:
       name: sentry
-      sha256: "7342ef4c18932881730ac941a07a6e4cf76fe99cd1ea3bef06e53a6a1402dec0"
+      sha256: cbc29cbdd8a047aab3df42f826daf07e58dfb2e1d550895d1021a6d4e618b00d
       url: "https://pub.dev"
     source: hosted
-    version: "8.3.0"
+    version: "8.4.0"
   sentry_flutter:
     dependency: "direct main"
     description:
       name: sentry_flutter
-      sha256: "475cf49682e4d1eb48caa2577502721bcfdcbb63f215de57b3b246d52f4f7914"
+      sha256: "96ce085e1be6c9963d93d42d6ba5c67484c076c59d25c94a7ba906549dc6c635"
       url: "https://pub.dev"
     source: hosted
-    version: "8.3.0"
+    version: "8.4.0"
   sentry_logging:
     dependency: "direct main"
     description:
       name: sentry_logging
-      sha256: "8eea0f30487d6d67351a2ee2277cffd460130266d6c7de100a4d0afd716852ed"
+      sha256: "1c8a99fadbf4851b075857d8f81ca73331bed9d44a4284ffa256be04e1dc0e13"
       url: "https://pub.dev"
     source: hosted
-    version: "8.3.0"
+    version: "8.4.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -1308,10 +1308,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf
+      sha256: eac82dc8e5f48818054f46021e9e5f34c239f8d301e7e29165b977c8d1189fed
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.3"
+    version: "6.3.4"
   url_launcher_ios:
     dependency: transitive
     description:
diff --git a/core/pubspec.lock b/core/pubspec.lock
index b905e7032..b224d0bd0 100644
--- a/core/pubspec.lock
+++ b/core/pubspec.lock
@@ -234,10 +234,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
+      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   http_multi_server:
     dependency: transitive
     description:
@@ -306,10 +306,10 @@ packages:
     dependency: "direct main"
     description:
       name: logger
-      sha256: af05cc8714f356fd1f3888fb6741cbe9fbe25cdb6eedbab80e1a6db21047d4a4
+      sha256: "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
   logging:
     dependency: transitive
     description:
@@ -442,10 +442,10 @@ packages:
     dependency: "direct main"
     description:
       name: sentry
-      sha256: "7342ef4c18932881730ac941a07a6e4cf76fe99cd1ea3bef06e53a6a1402dec0"
+      sha256: cbc29cbdd8a047aab3df42f826daf07e58dfb2e1d550895d1021a6d4e618b00d
       url: "https://pub.dev"
     source: hosted
-    version: "8.3.0"
+    version: "8.4.0"
   shelf:
     dependency: transitive
     description:
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index a88df2b77..c7648d2b3 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -11,9 +11,9 @@ dependencies:
   collection: ^1.18.0 # flutter_test
   csv: ^6.0.0
   json_annotation: ^4.9.0
-  logger: ^2.3.0
+  logger: ^2.4.0
   quiver: ^3.2.1
-  sentry: ^8.3.0
+  sentry: ^8.4.0
   supabase: ^2.2.4
   uuid: ^4.4.2
 
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 63d0610b8..5bc88cde4 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -454,10 +454,10 @@ packages:
     dependency: transitive
     description:
       name: freezed_annotation
-      sha256: f9f6597ac43cc262fa7d7f2e65259a6060c23a560525d1f2631be374540f2a9b
+      sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.3"
+    version: "2.4.4"
   frontend_server_client:
     dependency: transitive
     description:
@@ -531,10 +531,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
+      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   http_multi_server:
     dependency: transitive
     description:
@@ -656,10 +656,10 @@ packages:
     dependency: transitive
     description:
       name: logger
-      sha256: af05cc8714f356fd1f3888fb6741cbe9fbe25cdb6eedbab80e1a6db21047d4a4
+      sha256: "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
   logging:
     dependency: transitive
     description:
@@ -1000,10 +1000,10 @@ packages:
     dependency: transitive
     description:
       name: sentry
-      sha256: "7342ef4c18932881730ac941a07a6e4cf76fe99cd1ea3bef06e53a6a1402dec0"
+      sha256: cbc29cbdd8a047aab3df42f826daf07e58dfb2e1d550895d1021a6d4e618b00d
       url: "https://pub.dev"
     source: hosted
-    version: "8.3.0"
+    version: "8.4.0"
   shared_preferences:
     dependency: transitive
     description:
@@ -1291,10 +1291,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf
+      sha256: eac82dc8e5f48818054f46021e9e5f34c239f8d301e7e29165b977c8d1189fed
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.3"
+    version: "6.3.4"
   url_launcher_ios:
     dependency: transitive
     description:
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index cbf9ff11b..8d1459afa 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -228,10 +228,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
+      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   http_parser:
     dependency: transitive
     description:
@@ -308,10 +308,10 @@ packages:
     dependency: transitive
     description:
       name: logger
-      sha256: af05cc8714f356fd1f3888fb6741cbe9fbe25cdb6eedbab80e1a6db21047d4a4
+      sha256: "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
   matcher:
     dependency: transitive
     description:
@@ -460,10 +460,10 @@ packages:
     dependency: transitive
     description:
       name: sentry
-      sha256: "7342ef4c18932881730ac941a07a6e4cf76fe99cd1ea3bef06e53a6a1402dec0"
+      sha256: cbc29cbdd8a047aab3df42f826daf07e58dfb2e1d550895d1021a6d4e618b00d
       url: "https://pub.dev"
     source: hosted
-    version: "8.3.0"
+    version: "8.4.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -640,10 +640,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf
+      sha256: eac82dc8e5f48818054f46021e9e5f34c239f8d301e7e29165b977c8d1189fed
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.3"
+    version: "6.3.4"
   url_launcher_ios:
     dependency: transitive
     description:
diff --git a/pubspec.lock b/pubspec.lock
index 1a9e5770d..a902d7924 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -109,10 +109,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
+      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   http_parser:
     dependency: transitive
     description:
@@ -325,10 +325,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
+      sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "1.0.0"
   yaml:
     dependency: transitive
     description:

From fe61c2f3f42282d0243de2425fd5e7c54696bfa0 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sat, 20 Jul 2024 15:29:23 +0200
Subject: [PATCH 295/314] chore: include fvm tool

---
 .fvmrc          |  3 +++
 .gitignore      |  3 +++
 CONTRIBUTING.md | 14 +++++++++++++-
 melos.yaml      |  2 +-
 4 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 .fvmrc

diff --git a/.fvmrc b/.fvmrc
new file mode 100644
index 000000000..cf7449069
--- /dev/null
+++ b/.fvmrc
@@ -0,0 +1,3 @@
+{
+  "flutter": "3.22.3"
+}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 281657cd5..86286736e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -161,3 +161,6 @@ generated/
 
 # Megalinter
 megalinter-reports/
+
+# FVM Version Cache
+.fvm/
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2245ff520..169f99921 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,7 +3,7 @@
 ## Getting Started
 
 1. [Setup Flutter](https://flutter.dev/docs/get-started/install)
-2. Make sure both flutter and dart are in your PATH. Run `dart --version` and
+2. Make sure `flutter` and `dart` are both in your PATH. Run `dart --version` and
    `flutter --version` to check.
 3. Clone this repository and `cd` into it.
 4. Install [Melos](https://melos.invertase.dev/) by running: `dart pub global
@@ -90,6 +90,18 @@ features or bug fixes, create a new branch and open a pull request.
 
 Please make sure to follow these guidelines when contributing to the project.
 
+## Flutter Version Management
+
+The StudyU monorepo uses the [FVM](https://fvm.app/) tool to manage the Flutter
+SDK version. This allows us to have a consistent Flutter version across all
+packages. The Flutter SDK version is specified in the `.fvm` file in the root
+directory. To install the Flutter SDK version, run `fvm install` in the root directory. 
+You might also want to integrate FVM within your IDE. For Android Studio you can change the Flutter
+SDK path in the settings for the Flutter plugin. Open the Android Studio settings and navigate to 
+Languages & Frameworks -> Flutter -> Flutter SDK path and set  the path to the FVM Flutter SDK
+(`<path to the studyu repository>/.fvm/flutter_sdk`). For VS Code, have a look at
+the [FVM documentation](https://fvm.app/documentation/guides/vscode).
+
 ## Database and Backend
 
 We are using a self-hosted instance of [Supabase](https://supabase.com/) as a
diff --git a/melos.yaml b/melos.yaml
index 2450bc0d3..9132358c8 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -1,6 +1,6 @@
 name: studyu
-
 repository: https://github.com/hpi-studyu/studyu
+sdkPath: .fvm/flutter_sdk
 
 packages:
   - app

From 84e0d4731c434fcaca8fdd7b1b6b88d4d0e29f61 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sat, 20 Jul 2024 15:36:43 +0200
Subject: [PATCH 296/314] chore: flutter v3.22.3 update

---
 app/android/Gemfile.lock                      |  4 +--
 app/pubspec.lock                              |  8 +++---
 app/pubspec.yaml                              |  6 ++---
 core/pubspec.lock                             |  4 +--
 .../participant/participant_legend.dart       |  3 +--
 .../participant/participant_squares.dart      | 25 ++++++++++---------
 designer_v2/pubspec.lock                      | 12 ++++-----
 flutter_common/pubspec.lock                   |  8 +++---
 pubspec.lock                                  |  4 +--
 9 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/app/android/Gemfile.lock b/app/android/Gemfile.lock
index 550f7ffaa..24ee86810 100644
--- a/app/android/Gemfile.lock
+++ b/app/android/Gemfile.lock
@@ -10,8 +10,8 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.956.0)
-    aws-sdk-core (3.201.1)
+    aws-partitions (1.957.0)
+    aws-sdk-core (3.201.2)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
diff --git a/app/pubspec.lock b/app/pubspec.lock
index c6b9a3cc5..edb8376e6 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -1105,10 +1105,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b"
+      sha256: "034650b71e73629ca08a0bd789fd1d83cc63c2d1e405946f7cef7bc37432f93a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
   shared_preferences_web:
     dependency: transitive
     description:
@@ -1308,10 +1308,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: eac82dc8e5f48818054f46021e9e5f34c239f8d301e7e29165b977c8d1189fed
+      sha256: "95d8027db36a0e52caf55680f91e33ea6aa12a3ce608c90b06f4e429a21067ac"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.4"
+    version: "6.3.5"
   url_launcher_ios:
     dependency: transitive
     description:
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 2c4eec9c7..18b5145e9 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -20,7 +20,7 @@ dependencies:
   flutter_local_notifications: ^17.2.1+2
   flutter_localizations:
     sdk: flutter
-  flutter_timezone: ^2.0.1
+  flutter_timezone: ^2.1.0
   flutter_web_plugins:
     sdk: flutter
   flutter_widget_from_html: ^0.15.1
@@ -36,8 +36,8 @@ dependencies:
   quiver: ^3.2.1
   rainbow_color: ^2.0.1
   record: ^5.1.2
-  sentry_flutter: ^8.3.0
-  sentry_logging: ^8.3.0
+  sentry_flutter: ^8.4.0
+  sentry_logging: ^8.4.0
   shared_preferences: ^2.2.3
   studyu_core: ^4.4.4
   studyu_flutter_common: ^1.8.5
diff --git a/core/pubspec.lock b/core/pubspec.lock
index b224d0bd0..35073fc8d 100644
--- a/core/pubspec.lock
+++ b/core/pubspec.lock
@@ -226,10 +226,10 @@ packages:
     dependency: transitive
     description:
       name: graphs
-      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   http:
     dependency: transitive
     description:
diff --git a/designer_v2/lib/features/monitor/participant/participant_legend.dart b/designer_v2/lib/features/monitor/participant/participant_legend.dart
index 21e30b56a..190aad98a 100644
--- a/designer_v2/lib/features/monitor/participant/participant_legend.dart
+++ b/designer_v2/lib/features/monitor/participant/participant_legend.dart
@@ -1,9 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:studyu_designer_v2/common_views/striped_gradient.dart';
+import 'package:studyu_designer_v2/features/monitor/participant/colors.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 
-import 'colors.dart';
-
 class ParticipantLegend extends StatelessWidget {
   const ParticipantLegend();
 
diff --git a/designer_v2/lib/features/monitor/participant/participant_squares.dart b/designer_v2/lib/features/monitor/participant/participant_squares.dart
index 7e6fb94eb..312d8cf49 100644
--- a/designer_v2/lib/features/monitor/participant/participant_squares.dart
+++ b/designer_v2/lib/features/monitor/participant/participant_squares.dart
@@ -76,13 +76,14 @@ class ParticipantSquares extends StatelessWidget {
           : totalCompletedDays;
       phases.add(
         StudyPhase(
-            intervention: Intervention.withId()..name = 'Baseline',
-            missedTasksPerDay: monitorItem.missedTasksPerDay.sublist(
-              startInx,
-              endInx,
-            ),
-            completedTasksPerDay:
-                monitorItem.completedTasksPerDay.sublist(startInx, endInx)),
+          intervention: Intervention.withId()..name = 'Baseline',
+          missedTasksPerDay: monitorItem.missedTasksPerDay.sublist(
+            startInx,
+            endInx,
+          ),
+          completedTasksPerDay:
+              monitorItem.completedTasksPerDay.sublist(startInx, endInx),
+        ),
       );
     }
 
@@ -114,11 +115,11 @@ class ParticipantSquares extends StatelessWidget {
 
       phases.add(
         StudyPhase(
-            intervention: intervention,
-            missedTasksPerDay:
-                monitorItem.missedTasksPerDay.sublist(start, end),
-            completedTasksPerDay:
-                monitorItem.completedTasksPerDay.sublist(start, end)),
+          intervention: intervention,
+          missedTasksPerDay: monitorItem.missedTasksPerDay.sublist(start, end),
+          completedTasksPerDay:
+              monitorItem.completedTasksPerDay.sublist(start, end),
+        ),
       );
     }
     assert(
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 5bc88cde4..81298002b 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -507,10 +507,10 @@ packages:
     dependency: transitive
     description:
       name: graphs
-      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   gtk:
     dependency: transitive
     description:
@@ -1040,10 +1040,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b"
+      sha256: "034650b71e73629ca08a0bd789fd1d83cc63c2d1e405946f7cef7bc37432f93a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
   shared_preferences_web:
     dependency: transitive
     description:
@@ -1291,10 +1291,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: eac82dc8e5f48818054f46021e9e5f34c239f8d301e7e29165b977c8d1189fed
+      sha256: "95d8027db36a0e52caf55680f91e33ea6aa12a3ce608c90b06f4e429a21067ac"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.4"
+    version: "6.3.5"
   url_launcher_ios:
     dependency: transitive
     description:
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index 8d1459afa..abf763e1e 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -500,10 +500,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b"
+      sha256: "034650b71e73629ca08a0bd789fd1d83cc63c2d1e405946f7cef7bc37432f93a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
   shared_preferences_web:
     dependency: transitive
     description:
@@ -640,10 +640,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: eac82dc8e5f48818054f46021e9e5f34c239f8d301e7e29165b977c8d1189fed
+      sha256: "95d8027db36a0e52caf55680f91e33ea6aa12a3ce608c90b06f4e429a21067ac"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.4"
+    version: "6.3.5"
   url_launcher_ios:
     dependency: transitive
     description:
diff --git a/pubspec.lock b/pubspec.lock
index a902d7924..1100f981c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -101,10 +101,10 @@ packages:
     dependency: transitive
     description:
       name: graphs
-      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   http:
     dependency: transitive
     description:

From 9472b430bc1ea317573d58f08e2a47b7196d9cb1 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sat, 20 Jul 2024 15:47:59 +0200
Subject: [PATCH 297/314] ci: add fvm config action

---
 .github/workflows/init-workspace/action.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/init-workspace/action.yml b/.github/workflows/init-workspace/action.yml
index 565c0c76e..3f2dc5aa3 100644
--- a/.github/workflows/init-workspace/action.yml
+++ b/.github/workflows/init-workspace/action.yml
@@ -5,12 +5,20 @@ description: Initialize workspace for all packages
 runs:
   using: "composite"
   steps:
-    - name: Set up Flutter
-      uses: subosito/flutter-action@v2
+    - uses: kuhnroyal/flutter-fvm-config-action@v2
+      id: fvm-config-action
+
+    - uses: subosito/flutter-action@v2
       with:
-        channel: stable
-        # Increase this version manually when we add support for a new Flutter release
-        flutter-version: '3.22.x'
+        flutter-version: ${{ steps.fvm-config-action.outputs.FLUTTER_VERSION }}
+        channel: ${{ steps.fvm-config-action.outputs.FLUTTER_CHANNEL }}
+      id: flutter-action
+
+    - run: |
+        echo CACHE-PATH=${{ steps.flutter-action.outputs.CACHE-PATH }}
+        mkdir -p .fvm
+        ln -s ${{ steps.flutter-action.outputs.CACHE-PATH }} .fvm/flutter_sdk
+      shell: bash
 
     - name: Install melos
       run: dart pub global activate melos

From fb4059c39a1f2972b44ee7d6cd3d3e1c5c7148df Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Sun, 21 Jul 2024 12:54:07 +0200
Subject: [PATCH 298/314] ci: fix e2e_tests.yml push trigger

---
 .github/workflows/e2e_tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
index a6f2c9094..a43b84dda 100644
--- a/.github/workflows/e2e_tests.yml
+++ b/.github/workflows/e2e_tests.yml
@@ -4,6 +4,7 @@ on:
   push:
     paths:
       - ".github/workflows/e2e_tests.yml"
+      - ".github/workflows/init-workspace/action.yml"
       - 'designer_v2/**'
       - 'core/**'
       - 'flutter_common/**'

From 5e9826745d911af25dc995ff6273172dcef6ab54 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 22 Jul 2024 20:12:48 +0200
Subject: [PATCH 299/314] ci: final newline action

---
 .github/workflows/linter.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .github/workflows/linter.yml

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
new file mode 100644
index 000000000..138bf041e
--- /dev/null
+++ b/.github/workflows/linter.yml
@@ -0,0 +1,18 @@
+name: Linter
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+    linter:
+      runs-on: ubuntu-latest
+      permissions:
+        contents: write
+      steps:
+        - name: Checkout code
+          uses: actions/checkout@v4
+          with:
+            fetch-depth: 0
+        - name: Check final newline
+          uses: johannesvedder/check-final-newline@dev

From 3d9d6f9c77be9aab009854e6f4adb18f119571e5 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 22 Jul 2024 20:13:02 +0200
Subject: [PATCH 300/314] ci: replace static macos-14

---
 .github/workflows/deploy-apps.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-apps.yml b/.github/workflows/deploy-apps.yml
index 0b28996ad..3f3f485ed 100644
--- a/.github/workflows/deploy-apps.yml
+++ b/.github/workflows/deploy-apps.yml
@@ -67,7 +67,7 @@ jobs:
 
   app-store-release:
     name: Create App Store Release
-    runs-on: macos-14 # macos-latest
+    runs-on: macos-latest
     steps:
       - name: Await potential publishing on Pub.dev
         uses: johannesvedder/await-workflow@v1

From b9d5ebc81006d2d0581423eb6f4261abdcb5c164 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 22 Jul 2024 20:13:25 +0200
Subject: [PATCH 301/314] ci: fix static analysis issues automatically

---
 .github/workflows/all_packages.yml            | 35 +++++++++++++------
 .../workflows/check-uncomitted-changes.yml    | 34 ------------------
 2 files changed, 24 insertions(+), 45 deletions(-)
 delete mode 100644 .github/workflows/check-uncomitted-changes.yml

diff --git a/.github/workflows/all_packages.yml b/.github/workflows/all_packages.yml
index ab7f22858..5a5be735b 100644
--- a/.github/workflows/all_packages.yml
+++ b/.github/workflows/all_packages.yml
@@ -7,6 +7,10 @@ on:
       - "core/**"
       - "designer_v2/**"
       - "flutter_common/**"
+      - '*.gitignore'
+      - 'melos.yaml'
+      - 'pubspec.yaml'
+      - 'pubspec.lock'
       - ".github/workflows/all_packages.yml"
       - ".github/workflows/init-workspace/**"
   workflow_dispatch:
@@ -16,29 +20,38 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  analyze:
+  static_analysis:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+
       - name: Init workspace
         uses: ./.github/workflows/init-workspace
+
+      - name: Run generate
+        run: melos run generate
+
+      - name: Run fix
+        run: melos run fix
+
+      - name: Run bootstrap
+        run: melos bootstrap
+
+      - name: Run format
+        run: melos format
+
       - name: Run analyze
         run: melos analyze
 
-  format:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - name: Commit changes if any
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          fetch-depth: 0
-      - name: Init workspace
-        uses: ./.github/workflows/init-workspace
-      - name: Run format
-        run: melos format --set-exit-if-changed
+          commit_message: "chore: static analysis"
 
   test:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/check-uncomitted-changes.yml b/.github/workflows/check-uncomitted-changes.yml
deleted file mode 100644
index 52135dce5..000000000
--- a/.github/workflows/check-uncomitted-changes.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Check Uncommitted Changes
-
-on:
-  push:
-    paths:
-      - '*.gitignore'
-      - 'melos.yaml'
-      - 'pubspec.yaml'
-      - 'pubspec.lock'
-      - 'core/**'
-      - 'flutter_common/**'
-      - 'app/**'
-      - 'designer_v2/**'
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.ref }}-uncommitted-changes
-  cancel-in-progress: true
-
-jobs:
-  check_changes:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Init workspace
-        uses: ./.github/workflows/init-workspace
-      - name: Generate code
-        run: melos run generate
-      - name: Check for uncommitted changes
-        run: git diff --exit-code

From 0b235ffccd8e28e501ef42a2d5dcd468ce74432b Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 22 Jul 2024 20:23:00 +0200
Subject: [PATCH 302/314] ci: rename ready_to_merge job

---
 .github/workflows/ready_to_merge.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ready_to_merge.yml b/.github/workflows/ready_to_merge.yml
index 9da546d6f..a42199dbe 100644
--- a/.github/workflows/ready_to_merge.yml
+++ b/.github/workflows/ready_to_merge.yml
@@ -8,10 +8,10 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  check_commit_status:
+  ready_to_merge:
     runs-on: ubuntu-latest
     steps:
-      - name: Check if PR is mergeable
+      - name: Check if PR is ready to merge
         uses: actions/github-script@v7
         with:
           script: |

From 32770e628dd6ba14dd791b719c5764ffb86181e9 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 22 Jul 2024 20:23:08 +0200
Subject: [PATCH 303/314] ci: linter enable auto-commit

---
 .github/workflows/linter.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 138bf041e..0c8e3e357 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -2,7 +2,6 @@ name: Linter
 
 on:
   push:
-  workflow_dispatch:
 
 jobs:
     linter:
@@ -16,3 +15,8 @@ jobs:
             fetch-depth: 0
         - name: Check final newline
           uses: johannesvedder/check-final-newline@dev
+          with:
+            commit_changes: 'true'
+            commit_name: 'StudyU Action Bot'
+            commit_email: 'noreply@studyu.health'
+            commit_message: 'lint: append newlines to end of files'

From 6d835b618a9dae1bb0815f12d53f2c6a31e3c3af Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 22 Jul 2024 20:24:45 +0200
Subject: [PATCH 304/314] ci: add linter to ready_to_merge.yml

---
 .github/workflows/ready_to_merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ready_to_merge.yml b/.github/workflows/ready_to_merge.yml
index a42199dbe..bd9310a11 100644
--- a/.github/workflows/ready_to_merge.yml
+++ b/.github/workflows/ready_to_merge.yml
@@ -18,7 +18,7 @@ jobs:
             // Define a list of workflows that need to finish successfully if run before merging  
             workflows_to_check = [
               "all_packages.yml",
-              "check-uncommitted-changes.yml",
+              "linter.yml",
               "mega-linter.yml",
               "e2e_tests.yml",
               "supabase-test.yml",

From 49985298a6bd2860a2ee721dc67c130317acb359 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 22 Jul 2024 20:26:32 +0200
Subject: [PATCH 305/314] ci: rename message

---
 .github/workflows/all_packages.yml | 2 +-
 .github/workflows/linter.yml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/all_packages.yml b/.github/workflows/all_packages.yml
index 5a5be735b..14454a6bd 100644
--- a/.github/workflows/all_packages.yml
+++ b/.github/workflows/all_packages.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Commit changes if any
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          commit_message: "chore: static analysis"
+          commit_message: "chore: Apply static analysis changes"
 
   test:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 0c8e3e357..864114fdd 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -19,4 +19,4 @@ jobs:
             commit_changes: 'true'
             commit_name: 'StudyU Action Bot'
             commit_email: 'noreply@studyu.health'
-            commit_message: 'lint: append newlines to end of files'
+            commit_message: 'lint: Append newlines to end of files'

From f0d15999c61662a7a34bf6e5bb911ee57d82525c Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 22 Jul 2024 20:37:46 +0200
Subject: [PATCH 306/314] ci: use main branch for linter.yml

---
 .github/workflows/linter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 864114fdd..f0b4e0514 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -14,7 +14,7 @@ jobs:
           with:
             fetch-depth: 0
         - name: Check final newline
-          uses: johannesvedder/check-final-newline@dev
+          uses: johannesvedder/check-final-newline@main
           with:
             commit_changes: 'true'
             commit_name: 'StudyU Action Bot'

From 0e63ad0119f84b52970f5df7f38567459f7430e4 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Mon, 22 Jul 2024 20:43:06 +0200
Subject: [PATCH 307/314] ci: linter.yml use auto-commit

---
 .github/workflows/all_packages.yml |  2 +-
 .github/workflows/linter.yml       | 15 +++++++++++----
 README.md                          |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/all_packages.yml b/.github/workflows/all_packages.yml
index 14454a6bd..dd8c3602b 100644
--- a/.github/workflows/all_packages.yml
+++ b/.github/workflows/all_packages.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Commit changes if any
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          commit_message: "chore: Apply static analysis changes"
+          commit_message: 'chore: Apply static analysis changes'
 
   test:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index f0b4e0514..58038a794 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -13,10 +13,17 @@ jobs:
           uses: actions/checkout@v4
           with:
             fetch-depth: 0
+
         - name: Check final newline
           uses: johannesvedder/check-final-newline@main
           with:
-            commit_changes: 'true'
-            commit_name: 'StudyU Action Bot'
-            commit_email: 'noreply@studyu.health'
-            commit_message: 'lint: Append newlines to end of files'
+            fail_on_missing_newline: 'false'
+
+        - name: Restore ignored files
+          run: |
+            git checkout -- **/l10n-missing.txt
+
+        - name: Commit changes if any
+          uses: stefanzweifel/git-auto-commit-action@v5
+          with:
+            commit_message: 'lint: Apply final newline changes'
diff --git a/README.md b/README.md
index c87fd03ca..337e09a69 100644
--- a/README.md
+++ b/README.md
@@ -76,4 +76,4 @@ Henschel F, Manaswini M, Pottbäcker F, Edelman JA, Owoyele B, Danieletto M,
 Golden E, Zweig M, Nadkarni G, Böttinger E (2020).
 StudyU: a platform for designing and conducting innovative digital N-of-1
 trials. arXiv: 2012.1420.  
-[https://arxiv.org/abs/2012.14201](https://arxiv.org/abs/2012.14201).
+[https://arxiv.org/abs/2012.14201](https://arxiv.org/abs/2012.14201)
\ No newline at end of file

From 9463a73669cc447845d298e35eff3a5251a93e03 Mon Sep 17 00:00:00 2001
From: johannesvedder <johannesvedder@users.noreply.github.com>
Date: Mon, 22 Jul 2024 19:41:24 +0000
Subject: [PATCH 308/314] lint: Apply final newline changes

---
 .fvmrc                                                          | 2 +-
 .gitignore                                                      | 2 +-
 .markdown_link_check.yml                                        | 2 +-
 README.md                                                       | 2 +-
 app/.gitignore                                                  | 2 +-
 .../fastlane/metadata/android/en-US/full_description.txt        | 2 +-
 .../fastlane/metadata/android/en-US/short_description.txt       | 2 +-
 app/android/fastlane/metadata/android/en-US/title.txt           | 2 +-
 app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md   | 2 +-
 .../Runner/Assets.xcassets/AppIcon.appiconset/Contents.json     | 2 +-
 app/web/manifest.json                                           | 2 +-
 database/migration/20230630_migrate-v2_6.sql                    | 2 +-
 database/migration/20231011_migrate_db.sql                      | 2 +-
 designer_v2/web/manifest.json                                   | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.fvmrc b/.fvmrc
index cf7449069..9a54a40c9 100644
--- a/.fvmrc
+++ b/.fvmrc
@@ -1,3 +1,3 @@
 {
   "flutter": "3.22.3"
-}
\ No newline at end of file
+}
diff --git a/.gitignore b/.gitignore
index 86286736e..0d11b4e06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -163,4 +163,4 @@ generated/
 megalinter-reports/
 
 # FVM Version Cache
-.fvm/
\ No newline at end of file
+.fvm/
diff --git a/.markdown_link_check.yml b/.markdown_link_check.yml
index a1944cb3f..500840922 100644
--- a/.markdown_link_check.yml
+++ b/.markdown_link_check.yml
@@ -4,4 +4,4 @@
       "pattern": "localhost"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/README.md b/README.md
index 337e09a69..823e45be4 100644
--- a/README.md
+++ b/README.md
@@ -76,4 +76,4 @@ Henschel F, Manaswini M, Pottbäcker F, Edelman JA, Owoyele B, Danieletto M,
 Golden E, Zweig M, Nadkarni G, Böttinger E (2020).
 StudyU: a platform for designing and conducting innovative digital N-of-1
 trials. arXiv: 2012.1420.  
-[https://arxiv.org/abs/2012.14201](https://arxiv.org/abs/2012.14201)
\ No newline at end of file
+[https://arxiv.org/abs/2012.14201](https://arxiv.org/abs/2012.14201)
diff --git a/app/.gitignore b/app/.gitignore
index f95ca2239..cec80fc6e 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -161,4 +161,4 @@ app.*.symbols
 # snapshot generated screenshots
 **/fastlane/screenshots
 # scan temporary files
-**/fastlane/test_output
\ No newline at end of file
+**/fastlane/test_output
diff --git a/app/android/fastlane/metadata/android/en-US/full_description.txt b/app/android/fastlane/metadata/android/en-US/full_description.txt
index feba463d7..245578c9f 100644
--- a/app/android/fastlane/metadata/android/en-US/full_description.txt
+++ b/app/android/fastlane/metadata/android/en-US/full_description.txt
@@ -1 +1 @@
-The StudyU Health app is part of the StudyU platform, together with the StudyU designer. With the StudyU designer, scientists are given a web application to digitally specify, publish, and conduct N-of-1 trials. The StudyU app is a smartphone application with innovative user-centric elements for participants to partake in the published trials and assess the effects of different interventions on their health. Thereby, the StudyU platform allows clinicians and researchers worldwide to easily design and conduct digital N-of-1 trials in a safe manner. StudyU has the potential to change the landscape of personalized treatments both for patients and healthy individuals, as a free collaborative tool for researchers, and as a tool that can be integrated in clinical practice.
\ No newline at end of file
+The StudyU Health app is part of the StudyU platform, together with the StudyU designer. With the StudyU designer, scientists are given a web application to digitally specify, publish, and conduct N-of-1 trials. The StudyU app is a smartphone application with innovative user-centric elements for participants to partake in the published trials and assess the effects of different interventions on their health. Thereby, the StudyU platform allows clinicians and researchers worldwide to easily design and conduct digital N-of-1 trials in a safe manner. StudyU has the potential to change the landscape of personalized treatments both for patients and healthy individuals, as a free collaborative tool for researchers, and as a tool that can be integrated in clinical practice.
diff --git a/app/android/fastlane/metadata/android/en-US/short_description.txt b/app/android/fastlane/metadata/android/en-US/short_description.txt
index 3dfb343e7..9ab97e6d9 100644
--- a/app/android/fastlane/metadata/android/en-US/short_description.txt
+++ b/app/android/fastlane/metadata/android/en-US/short_description.txt
@@ -1 +1 @@
-Find out the effects of different interventions on your health in a medial study
\ No newline at end of file
+Find out the effects of different interventions on your health in a medial study
diff --git a/app/android/fastlane/metadata/android/en-US/title.txt b/app/android/fastlane/metadata/android/en-US/title.txt
index 4174ebf23..a0b819f62 100644
--- a/app/android/fastlane/metadata/android/en-US/title.txt
+++ b/app/android/fastlane/metadata/android/en-US/title.txt
@@ -1 +1 @@
-StudyU Health
\ No newline at end of file
+StudyU Health
diff --git a/app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
index 89c2725b7..b5b843ad3 100644
--- a/app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
+++ b/app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
@@ -2,4 +2,4 @@
 
 You can customize the launch screen with your own desired assets by replacing the image files in this directory.
 
-You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.
\ No newline at end of file
+You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.
diff --git a/app/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/app/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
index 96d3fee1a..9f754994e 100644
--- a/app/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/app/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -65,4 +65,4 @@
             "scale": "2x"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/app/web/manifest.json b/app/web/manifest.json
index ccf1829d0..054713f11 100644
--- a/app/web/manifest.json
+++ b/app/web/manifest.json
@@ -32,4 +32,4 @@
             "purpose": "maskable"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/database/migration/20230630_migrate-v2_6.sql b/database/migration/20230630_migrate-v2_6.sql
index 8ea1cad24..23319b301 100644
--- a/database/migration/20230630_migrate-v2_6.sql
+++ b/database/migration/20230630_migrate-v2_6.sql
@@ -2,4 +2,4 @@ ALTER TABLE public.app_config
 ADD COLUMN analytics jsonb;
 
 ALTER TABLE public.study
-DROP COLUMN fhir_questionnaire;
\ No newline at end of file
+DROP COLUMN fhir_questionnaire;
diff --git a/database/migration/20231011_migrate_db.sql b/database/migration/20231011_migrate_db.sql
index 12c82943f..0fe2b16dc 100644
--- a/database/migration/20231011_migrate_db.sql
+++ b/database/migration/20231011_migrate_db.sql
@@ -5,4 +5,4 @@ CREATE OR REPLACE FUNCTION public.migrate_db(participant_user_id uuid, participa
 AS $function$begin
   UPDATE study_subject SET user_id = participant_user_id WHERE id = participant_subject_id;
 end;$function$
-;
\ No newline at end of file
+;
diff --git a/designer_v2/web/manifest.json b/designer_v2/web/manifest.json
index 9aded1150..b8a627725 100644
--- a/designer_v2/web/manifest.json
+++ b/designer_v2/web/manifest.json
@@ -32,4 +32,4 @@
             "purpose": "maskable"
         }
     ]
-}
\ No newline at end of file
+}

From 7ce484ffd7858ae52993aa2bba356b9e31c0d886 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 18 Jul 2024 14:17:05 +0200
Subject: [PATCH 309/314] fix: outdated cached subject

---
 .../app_onboarding/loading_screen.dart        |  2 ++
 app/lib/util/cache.dart                       | 28 +++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/app/lib/screens/app_onboarding/loading_screen.dart b/app/lib/screens/app_onboarding/loading_screen.dart
index 2f9ef0a96..eab436d62 100644
--- a/app/lib/screens/app_onboarding/loading_screen.dart
+++ b/app/lib/screens/app_onboarding/loading_screen.dart
@@ -80,6 +80,8 @@ class _LoadingScreenState extends State<LoadingScreen> {
           subject = await _fetchRemoteSubject(selectedStudyObjectId);
         }
       } catch (exception) {
+        debugPrint(
+            "Could not login and retrieve the study subject: $exception");
         if (exception is SocketException) {
           subject = await Cache.loadSubject();
           StudyULogger.info("Offline mode with cached subject: $subject");
diff --git a/app/lib/util/cache.dart b/app/lib/util/cache.dart
index 6ec61c131..47d57fdbe 100644
--- a/app/lib/util/cache.dart
+++ b/app/lib/util/cache.dart
@@ -16,13 +16,29 @@ class Cache {
     assert(subject == (await loadSubject()));
   }
 
-  static Future<StudySubject> loadSubject() async {
+  static Future<StudySubject> loadSubject({StudySubject? backupSubject}) async {
     // debugPrint("Load subject from cache");
     if (await SecureStorage.containsKey(cacheSubjectKey)) {
-      return StudySubject.fromJson(
-        jsonDecode((await SecureStorage.read(cacheSubjectKey))!)
-            as Map<String, dynamic>,
-      );
+      final cachedSubjectStr = await SecureStorage.read(cacheSubjectKey);
+      final cachedSubject =
+          jsonDecode(cachedSubjectStr!) as Map<String, dynamic>;
+      try {
+        return StudySubject.fromJson(cachedSubject);
+      } catch (e) {
+        StudyULogger.warning(
+          "Failed to parse cached subject: $cachedSubjectStr",
+        );
+        if (backupSubject != null) {
+          // Only take progress from cached subject and rest from backup,
+          // as the cached subject might be outdated or corrupted
+          final cachedProgress = (cachedSubject['progress'] as List?)
+              ?.map((e) => SubjectProgress.fromJson(e as Map<String, dynamic>))
+              .toList();
+          backupSubject.progress = cachedProgress ?? backupSubject.progress;
+          return backupSubject;
+        }
+        throw Exception("No backup subject provided");
+      }
     } else {
       throw Exception("No cached subject found");
     }
@@ -69,7 +85,7 @@ class Cache {
     if (!(await SecureStorage.containsKey(cacheSubjectKey))) {
       return remoteSubject;
     }
-    final localSubject = await loadSubject();
+    final localSubject = await loadSubject(backupSubject: remoteSubject);
     // local and remote subject are equal, nothing to synchronize
     if (localSubject == remoteSubject) return remoteSubject;
     // remote subject belongs to a different study

From 978807c2f4177b7ac7eddaa30d25f622472ffaca Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Thu, 18 Jul 2024 14:32:52 +0200
Subject: [PATCH 310/314] fix: safety check

---
 app/lib/util/cache.dart | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/lib/util/cache.dart b/app/lib/util/cache.dart
index 47d57fdbe..ecae7de21 100644
--- a/app/lib/util/cache.dart
+++ b/app/lib/util/cache.dart
@@ -31,6 +31,14 @@ class Cache {
         if (backupSubject != null) {
           // Only take progress from cached subject and rest from backup,
           // as the cached subject might be outdated or corrupted
+
+          // compare IDs to make sure we are not mixing up subjects
+          // If IDs do not match we should not use the cached subject
+          if (backupSubject.id != cachedSubject['id']) {
+            throw Exception(
+              "Cached subject ID does not match remote subject ID",
+            );
+          }
           final cachedProgress = (cachedSubject['progress'] as List?)
               ?.map((e) => SubjectProgress.fromJson(e as Map<String, dynamic>))
               .toList();

From a1f56ee4e6821c15e38a8d3eb3aa7c99005c0b06 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <104295301+johannesvedder@users.noreply.github.com>
Date: Mon, 22 Jul 2024 23:18:28 +0200
Subject: [PATCH 311/314] ci: add token

---
 .github/workflows/all_packages.yml | 1 +
 .github/workflows/linter.yml       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/all_packages.yml b/.github/workflows/all_packages.yml
index dd8c3602b..f23553910 100644
--- a/.github/workflows/all_packages.yml
+++ b/.github/workflows/all_packages.yml
@@ -29,6 +29,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          token: ${{ secrets.READY_TO_MERGE_TOKEN }}
 
       - name: Init workspace
         uses: ./.github/workflows/init-workspace
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 58038a794..dd792bf07 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -13,6 +13,7 @@ jobs:
           uses: actions/checkout@v4
           with:
             fetch-depth: 0
+            token: ${{ secrets.READY_TO_MERGE_TOKEN }}
 
         - name: Check final newline
           uses: johannesvedder/check-final-newline@main

From f6e5369323c49c9d1e39e9afb2793635e28b7e2f Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 24 Jul 2024 11:20:19 +0200
Subject: [PATCH 312/314] ci: temp remove melos fix

---
 .github/workflows/all_packages.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/all_packages.yml b/.github/workflows/all_packages.yml
index f23553910..f3180a47e 100644
--- a/.github/workflows/all_packages.yml
+++ b/.github/workflows/all_packages.yml
@@ -37,8 +37,8 @@ jobs:
       - name: Run generate
         run: melos run generate
 
-      - name: Run fix
-        run: melos run fix
+      # - name: Run fix # remove until flutter_gen issue is fixed
+      #   run: melos run fix
 
       - name: Run bootstrap
         run: melos bootstrap

From 26044ecbb2ce0a9f18fec73553212fe9fb0000ba Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 24 Jul 2024 13:29:47 +0200
Subject: [PATCH 313/314] chore(release): publish packages

 - studyu_app@2.7.8
 - studyu_core@4.4.5
 - studyu_designer_v2@1.8.3
 - studyu_flutter_common@1.8.6
---
 CHANGELOG.md                | 38 +++++++++++++++++++++++++++++++++++++
 app/CHANGELOG.md            |  6 ++++++
 app/pubspec.yaml            |  6 +++---
 core/CHANGELOG.md           |  4 ++++
 core/pubspec.yaml           |  2 +-
 designer_v2/CHANGELOG.md    |  4 ++++
 designer_v2/pubspec.yaml    |  6 +++---
 flutter_common/CHANGELOG.md |  4 ++++
 flutter_common/pubspec.yaml |  4 ++--
 9 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8118ce19c..dd21707d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2024-07-24
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`studyu_app` - `v2.7.8`](#studyu_app---v278)
+ - [`studyu_core` - `v4.4.5`](#studyu_core---v445)
+ - [`studyu_designer_v2` - `v1.8.3`](#studyu_designer_v2---v183)
+ - [`studyu_flutter_common` - `v1.8.6`](#studyu_flutter_common---v186)
+
+---
+
+#### `studyu_app` - `v2.7.8`
+
+ - **FIX**: safety check.
+ - **FIX**: outdated cached subject.
+ - **FIX**: upgrade deps.
+
+#### `studyu_core` - `v4.4.5`
+
+ - **FIX**: upgrade deps.
+
+#### `studyu_designer_v2` - `v1.8.3`
+
+ - **FIX**: upgrade deps.
+
+#### `studyu_flutter_common` - `v1.8.6`
+
+ - **FIX**: upgrade deps.
+
+
 ## 2024-07-15
 
 ### Changes
diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md
index 85b6144d8..6d7f4a764 100644
--- a/app/CHANGELOG.md
+++ b/app/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.7.8
+
+ - **FIX**: safety check.
+ - **FIX**: outdated cached subject.
+ - **FIX**: upgrade deps.
+
 ## 2.7.7
 
  - **FIX**: upgrade deps.
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 18b5145e9..d7218586b 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_app
-version: 2.7.7
+version: 2.7.8
 description: Partake in digital N-of-1 trials with the innovative StudyU Health App
 publish_to: none
 homepage: https://studyu.health
@@ -39,8 +39,8 @@ dependencies:
   sentry_flutter: ^8.4.0
   sentry_logging: ^8.4.0
   shared_preferences: ^2.2.3
-  studyu_core: ^4.4.4
-  studyu_flutter_common: ^1.8.5
+  studyu_core: ^4.4.5
+  studyu_flutter_common: ^1.8.6
   supabase: ^2.2.4
   supabase_flutter: ^2.5.8
   timeline_tile: ^2.0.0
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 4cebbd4ab..863fd3cdd 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.4.5
+
+ - **FIX**: upgrade deps.
+
 ## 4.4.4
 
  - **FIX**: upgrade deps.
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index c7648d2b3..d93489a44 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_core
-version: 4.4.4
+version: 4.4.5
 description: This package contains StudyU models and common functions for the app and designer packages
 homepage: https://studyu.health
 repository: https://github.com/hpi-studyu/studyu
diff --git a/designer_v2/CHANGELOG.md b/designer_v2/CHANGELOG.md
index ba91a69b8..73e4ca2b2 100644
--- a/designer_v2/CHANGELOG.md
+++ b/designer_v2/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.8.3
+
+ - **FIX**: upgrade deps.
+
 ## 1.8.2
 
  - **FIX**: upgrade deps.
diff --git a/designer_v2/pubspec.yaml b/designer_v2/pubspec.yaml
index ac695507c..31e950153 100644
--- a/designer_v2/pubspec.yaml
+++ b/designer_v2/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_designer_v2
-version: 1.8.2
+version: 1.8.3
 description: Implement digital N-of-1 studies seamlessly with the StudyU Health Designer
 publish_to: none
 homepage: https://studyu.health
@@ -35,8 +35,8 @@ dependencies:
   reactive_range_slider: ^2.1.0
   riverpod_annotation: ^2.3.5
   rxdart: ^0.27.7 # custom_lint 0.6.4
-  studyu_core: ^4.4.4
-  studyu_flutter_common: ^1.8.5
+  studyu_core: ^4.4.5
+  studyu_flutter_common: ^1.8.6
   supabase: ^2.2.4
   supabase_flutter: ^2.5.8
   url_launcher: ^6.3.0
diff --git a/flutter_common/CHANGELOG.md b/flutter_common/CHANGELOG.md
index 74c36227b..bae83dfc2 100644
--- a/flutter_common/CHANGELOG.md
+++ b/flutter_common/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.8.6
+
+ - **FIX**: upgrade deps.
+
 ## 1.8.5
 
  - **FIX**: upgrade deps.
diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
index c155378e3..2f78fa60c 100644
--- a/flutter_common/pubspec.yaml
+++ b/flutter_common/pubspec.yaml
@@ -1,5 +1,5 @@
 name: studyu_flutter_common
-version: 1.8.5
+version: 1.8.6
 description: StudyU common flutter components and functions for app and designer
 homepage: https://studyu.health
 repository: https://github.com/hpi-studyu/studyu
@@ -14,7 +14,7 @@ dependencies:
   flutter_secure_storage: ^9.2.2
   lint: ^2.3.0
   shared_preferences: ^2.2.3 # Can be removed after migrating phase
-  studyu_core: ^4.4.4
+  studyu_core: ^4.4.5
   supabase_flutter: ^2.5.8
   synchronized: ^3.1.0+1
   uuid: ^4.4.2

From e668c64ed0a34a2bb0438feb7070631bd860d7f5 Mon Sep 17 00:00:00 2001
From: Johannes Vedder <hallo@johannesvedder.de>
Date: Wed, 24 Jul 2024 13:30:22 +0200
Subject: [PATCH 314/314] chore: lock files

---
 app/pubspec.lock            | 4 ++--
 designer_v2/pubspec.lock    | 4 ++--
 flutter_common/pubspec.lock | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/pubspec.lock b/app/pubspec.lock
index edb8376e6..60b91fbde 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -1208,14 +1208,14 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.4"
+    version: "4.4.5"
   studyu_flutter_common:
     dependency: "direct main"
     description:
       path: "../flutter_common"
       relative: true
     source: path
-    version: "1.8.5"
+    version: "1.8.6"
   supabase:
     dependency: "direct main"
     description:
diff --git a/designer_v2/pubspec.lock b/designer_v2/pubspec.lock
index 81298002b..97f0c0ecb 100644
--- a/designer_v2/pubspec.lock
+++ b/designer_v2/pubspec.lock
@@ -1191,14 +1191,14 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.4"
+    version: "4.4.5"
   studyu_flutter_common:
     dependency: "direct main"
     description:
       path: "../flutter_common"
       relative: true
     source: path
-    version: "1.8.5"
+    version: "1.8.6"
   supabase:
     dependency: "direct main"
     description:
diff --git a/flutter_common/pubspec.lock b/flutter_common/pubspec.lock
index abf763e1e..eb03dfb27 100644
--- a/flutter_common/pubspec.lock
+++ b/flutter_common/pubspec.lock
@@ -579,7 +579,7 @@ packages:
       path: "../core"
       relative: true
     source: path
-    version: "4.4.4"
+    version: "4.4.5"
   supabase:
     dependency: transitive
     description: